diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 65bd9cf2c58..b0af076d06a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: 'kind/bug report'
+labels: 'bug'
 assignees: ''
 
 ---
@@ -26,12 +26,12 @@ A clear and concise description of what actually happened.
 **Config/Logs/Screenshots**
 If applicable, please attach your node configuration, logs or any screenshots.
 
-**EventStore details**
- - EventStore server version:
+**KurrentDB details**
+ - KurrentDB server version:
 
  - Operating system:
 
- - EventStore client library and version (if applicable):
+ - KurrentDB client library and version (if applicable):
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 641ae4589eb..19f881377d6 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: kind/enhancement
+labels: enhancement
 assignees: ''
 
 ---
diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 00000000000..6972e76d29b
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,17 @@
+# Add 'documentation' label if all changes are in the docs directory or to the README file
+documentation:
+  - all:
+    - changed-files:
+      - all-globs-to-all-files:
+        - docs/*
+        - README.md
+
+# Add 'ignore-for-release' label if all changes are:
+#    - changes to workflows, codeowners, etc (.github)
+#    - changes to tests (*.Tests)
+ignore-for-release:
+  - all:
+    - changed-files:
+      - all-globs-to-all-files:
+        - .github/*
+        - src/*.Tests/*
diff --git a/.github/release.yml b/.github/release.yml
new file mode 100644
index 00000000000..e49cb2836a9
--- /dev/null
+++ b/.github/release.yml
@@ -0,0 +1,23 @@
+changelog:
+  exclude:
+    labels:
+      - ignore-for-release
+  categories:
+    - title: Added
+      labels:
+        - enhancement
+    - title: Fixed
+      labels:
+        - bug
+    - title: Changed
+      labels:
+        - "*"
+    - title: Deprecated
+      labels:
+        - deprecated
+    - title: Breaking Changes
+      labels:
+        - breaking
+    - title: Documentation
+      labels:
+        - documentation
\ No newline at end of file
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
deleted file mode 100644
index 5f9e856db74..00000000000
--- a/.github/workflows/benchmark.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Request Benchmark
-
-on:
-  pull_request:
-    types:
-      - labeled
-
-jobs:
-  request_benchmark:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Request Benchmark
-        if: ${{ contains(github.event.pull_request.labels.*.name, 'Benchmark') && github.event.repository.fork == 'false' }}
-        run: |
-          curl -X POST "https://api.github.com/repos/EventStore/grpc-tcp-benchmark/dispatches" \
-          -H 'Accept: application/vnd.github.everest-preview+json' \
-          -u ${{ secrets.GH_PAT }} \
-          --data '{"event_type": "benchmark_deployment", "client_payload": {"pr_no":  ${{ github.event.number }}, actor : ${{ github.actor }} }}'
-           
-      - name: Benchmark is not available on forked repos.
-        if: ${{ github.event.repository.fork == 'true' }}
-        run: echo "Benchmark is not available on forked repos." && exit 1
diff --git a/.github/workflows/build-container-alpine.yml b/.github/workflows/build-container-alpine.yml
index 5a86091ca20..63e12fb2503 100644
--- a/.github/workflows/build-container-alpine.yml
+++ b/.github/workflows/build-container-alpine.yml
@@ -9,9 +9,10 @@ on:
   push:
     branches:
       - master
-      - release/oss-v*
+      - release/*
     tags:
       - oss-v*
+      - v*
     paths-ignore:
       - "docs/**"
       - "samples/**"
diff --git a/.github/workflows/build-container-bookworm-slim.yml b/.github/workflows/build-container-bookworm-slim.yml
index e6a0767d990..adb8e5ac096 100644
--- a/.github/workflows/build-container-bookworm-slim.yml
+++ b/.github/workflows/build-container-bookworm-slim.yml
@@ -9,9 +9,10 @@ on:
   push:
     branches:
       - master
-      - release/oss-v*
+      - release/*
     tags:
       - oss-v*
+      - v*
     paths-ignore:
       - "docs/**"
       - "samples/**"
diff --git a/.github/workflows/build-container-jammy.yml b/.github/workflows/build-container-jammy.yml
index d45733e5231..f032d7204d7 100644
--- a/.github/workflows/build-container-jammy.yml
+++ b/.github/workflows/build-container-jammy.yml
@@ -9,9 +9,10 @@ on:
   push:
     branches:
       - master
-      - release/oss-v*
+      - release/*
     tags:
       - oss-v*
+      - v*
     paths-ignore:
       - "docs/**"
       - "samples/**"
diff --git a/.github/workflows/build-container-reusable.yml b/.github/workflows/build-container-reusable.yml
index ad33f13a273..5ceeecf3da8 100644
--- a/.github/workflows/build-container-reusable.yml
+++ b/.github/workflows/build-container-reusable.yml
@@ -55,37 +55,44 @@ jobs:
       with:
         context: .
         load: true
-        tags: eventstore
+        tags: kurrentdb
         build-args: |
           CONTAINER_RUNTIME=${{ inputs.container-runtime }}
           RUNTIME=${{ steps.variables.outputs.runtime }}
     - name: Verify Build
       run: |
-        docker run --rm eventstore --insecure --what-if
+        docker run --rm kurrentdb --insecure --what-if
     - name: Build Test Container
       uses: docker/build-push-action@v4
       with:
         context: .
         load: true
         target: test
-        tags: eventstore-test
+        tags: kurrentdb-test
         build-args: |
           CONTAINER_RUNTIME=${{ inputs.container-runtime }}
           RUNTIME=${{ steps.variables.outputs.runtime }}
+    # pass env vars so that GitHubActionsTestLogger can populate GitHub job summary 
     - name: Run Tests
-      run: |
-          docker run \
-          --volume $(pwd)/test-results:/build/test-results \
-          --rm \
-          eventstore-test
+      run: >
+        docker run
+        --volume $(pwd)/test-results:/build/test-results
+        --volume ${{ github.step_summary }}:/build/step-summary
+        --rm
+        --env GITHUB_STEP_SUMMARY=/build/step-summary
+        --env GITHUB_SERVER_URL=${{ github.server_url }}
+        --env GITHUB_REPOSITORY=${{ github.repository }}
+        --env GITHUB_WORKSPACE=${{ github.workspace }}
+        --env GITHUB_SHA=${{ github.sha }}
+        kurrentdb-test
     - name: Publish Test Results (HTML)
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: always()
       with:
         path: test-results/test-results.html
         name: test-results-${{ inputs.container-runtime }}.html
     - name: Publish Test Results (All)
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: always()
       with:
         name: test-results-${{ inputs.container-runtime }}
diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
new file mode 100644
index 00000000000..e6e79d806ba
--- /dev/null
+++ b/.github/workflows/build-docs.yml
@@ -0,0 +1,14 @@
+name: Build Production Site
+
+on:
+  push:
+    branches: [release/*]
+    paths:
+      - '**.md'
+
+jobs:
+  dispatch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger build
+        run: curl -X POST -d {} "${{ secrets.CLOUDFLARE_BUILD_HOOK }}"
diff --git a/.github/workflows/build-reusable.yml b/.github/workflows/build-reusable.yml
index 86ffb6b240d..580fdec5065 100644
--- a/.github/workflows/build-reusable.yml
+++ b/.github/workflows/build-reusable.yml
@@ -23,6 +23,12 @@ jobs:
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
+    - name: Login to Cloudsmith
+      uses: docker/login-action@v3
+      with:
+        registry: docker.kurrent.io
+        username: ${{ secrets.CLOUDSMITH_CICD_USER }}
+        password: ${{ secrets.CLOUDSMITH_CICD_TOKEN }}
     - name: Install netcoreapp3.1
       uses: actions/setup-dotnet@v3
       with:
@@ -42,30 +48,40 @@ jobs:
     - name: Compile
       shell: bash
       run: |
-        dotnet build --configuration ${{ matrix.configuration }} -p:Platform=${{ inputs.arch }} src/EventStore.sln
+        dotnet build --configuration ${{ matrix.configuration }} -p:Platform=${{ inputs.arch }} src/KurrentDB.sln
     - name: Verify Build
       shell: bash
       run: |
-        dotnet run --project src/EventStore.ClusterNode --configuration ${{ matrix.configuration }} -- --insecure --what-if
+        dotnet run --project src/KurrentDB --configuration ${{ matrix.configuration }} -- --insecure --what-if
     - name: Run Tests
       shell: bash
-      run: |
-        find ./src -maxdepth 1 -type d -name "*.Tests"  -print0 \
-          | xargs -I{} -0 -n1 bash -c \
-          'dotnet test --configuration ${{ matrix.configuration }} -p:Platform=${{ inputs.arch }} --blame --blame-hang-timeout 5min --blame-hang-dump-type mini --settings ./ci/ci.runsettings --logger:GitHubActions --logger:html --logger:trx --logger:"console;verbosity=normal" --results-directory=$(pwd)/test-results/$1 $1' - '{}'
+      run: >
+        dotnet test
+        --configuration ${{ matrix.configuration }}
+        -p:Platform=${{ inputs.arch }}
+        --blame
+        --blame-hang-timeout 5min
+        --blame-hang-dump-type mini
+        --settings ./ci/ci.runsettings
+        --logger:GitHubActions
+        --logger:html
+        --logger:trx
+        --logger:"console;verbosity=normal"
+        --results-directory=$(pwd)/test-results
+        src/KurrentDB.sln
     - name: Collect Test Results
       shell: bash
       if: always()
       run: |
         echo $(find ./test-results -name "*.html" | xargs cat) > test-results.html
     - name: Publish Test Results (HTML)
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: always()
       with:
         path: test-results.html
         name: test-results-${{ matrix.configuration }}-${{ inputs.os }}.html
     - name: Publish Test Results (All)
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: always()
       with:
         name: test-results-${{ matrix.configuration }}-${{ inputs.os }}
diff --git a/.github/workflows/build-ubuntu-20.04-arm64.yml b/.github/workflows/build-ubuntu-20.04-arm64.yml
index 4008d9d1a2b..ad5e1fcd667 100644
--- a/.github/workflows/build-ubuntu-20.04-arm64.yml
+++ b/.github/workflows/build-ubuntu-20.04-arm64.yml
@@ -8,9 +8,10 @@ on:
   push:
     branches:
       - master
-      - release/oss-v*
+      - release/*
     tags:
       - oss-v*
+      - v*
     paths-ignore:
       - "docs/**"
       - "samples/**"
@@ -22,3 +23,4 @@ jobs:
     with:
       os: ubuntu-20.04-arm64
       arch: arm64
+    secrets: inherit
diff --git a/.github/workflows/build-ubuntu-22.04.yml b/.github/workflows/build-ubuntu-22.04.yml
index 20d2cfd4441..a5bc3d3c780 100644
--- a/.github/workflows/build-ubuntu-22.04.yml
+++ b/.github/workflows/build-ubuntu-22.04.yml
@@ -9,9 +9,10 @@ on:
   push:
     branches:
       - master
-      - release/oss-v*
+      - release/*
     tags:
       - oss-v*
+      - v*
     paths-ignore:
       - "docs/**"
       - "samples/**"
@@ -23,3 +24,4 @@ jobs:
     with:
       os: ubuntu-22.04
       arch: x64
+    secrets: inherit
diff --git a/.github/workflows/build-windows-2019.yml b/.github/workflows/build-windows-2019.yml
index 401ea1f0409..7221ee6ae9c 100644
--- a/.github/workflows/build-windows-2019.yml
+++ b/.github/workflows/build-windows-2019.yml
@@ -9,9 +9,10 @@ on:
   push:
     branches:
       - master
-      - release/oss-v*
+      - release/*
     tags:
       - oss-v*
+      - v*
     paths-ignore:
       - "docs/**"
       - "samples/**"
@@ -23,3 +24,4 @@ jobs:
     with:
       os: windows-2019
       arch: x64
+    secrets: inherit
diff --git a/.github/workflows/cherry-pick-pr-for-label.yml b/.github/workflows/cherry-pick-pr-for-label.yml
index 693dad7bfc4..f7fa3d2b9da 100644
--- a/.github/workflows/cherry-pick-pr-for-label.yml
+++ b/.github/workflows/cherry-pick-pr-for-label.yml
@@ -9,6 +9,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Cherry Pick PR for label
-        uses: EventStore/Automations/cherry-pick-pr-for-label@master
+        uses: kurrent-io/Automations/cherry-pick-pr-for-label@master
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml
index 5c1f1a9df6b..35028df04dd 100644
--- a/.github/workflows/common.yml
+++ b/.github/workflows/common.yml
@@ -9,9 +9,10 @@ on:
   push:
     branches:
       - master
-      - release/oss-v*
+      - release/*
     tags:
       - oss-v*
+      - v*
     paths-ignore:
       - "docs/**"
       - "samples/**"
@@ -58,7 +59,7 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
     - name: Docker Compose Smoke Test
       run: |
-        docker compose build
+        RUNTIME=linux-amd64 docker compose build
         docker compose up --detach
         printf 'Waiting for cluster'
         timeout 60 bash -c -- 'until $(curl --output /dev/null --silent --insecure --fail https://localhost:2113/health/live); do printf '.'; sleep 2; done'
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
new file mode 100644
index 00000000000..e3ecf923f01
--- /dev/null
+++ b/.github/workflows/labeler.yml
@@ -0,0 +1,12 @@
+name: "Pull Request Labeler"
+on:
+- pull_request_target
+
+jobs:
+  labeler:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@v5
\ No newline at end of file
diff --git a/.github/workflows/pull-request-check.yml b/.github/workflows/pull-request-check.yml
deleted file mode 100644
index 41dca4580d7..00000000000
--- a/.github/workflows/pull-request-check.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Pull Request check
-on:
-  pull_request:
-    paths-ignore:
-      - "src/*.Tests/**"
-      - "docs/**"
-      - "samples/**"
-      - "**.md"
-    types: [opened, edited]
-jobs:
-  checkPullRequest:
-    name: Pull Request check
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Check pull requests
-        uses: EventStore/Automations/pr-check@master
-        with:
-          include: 'src'
-          exclude: 'src/EventStore.UI'
diff --git a/.github/workflows/release-client.yml b/.github/workflows/release-client.yml
deleted file mode 100644
index 9c3f8fbd4f5..00000000000
--- a/.github/workflows/release-client.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Initiate Client Release
- 
-on:
-  push:
-    tags:
-      - "dotnet-client-v*"
- 
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get the version
-        id: get_version
-        run: echo "version=${GITHUB_REF:25}" >> $GITHUB_OUTPUT
-      - name: Perform Release 
-        run: |
-          curl -X POST https://api.github.com/repos/EventStore/TrainStation/dispatches \
-          -H 'Accept: application/vnd.github.everest-preview+json' \
-          -u ${{ secrets.GH_PAT }} \
-          --data '{"event_type": "client-release", "client_payload": { "repository": "'"$GITHUB_REPOSITORY"'", "version": "${{ steps.get_version.outputs.version }}" }}'
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 5dea555d2fa..00000000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Initiate Release
- 
-on:
-  push:
-    tags:
-      - "oss-v*"
- 
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get the version
-        id: get_version
-        run: echo "version=${GITHUB_REF:15}" >> $GITHUB_OUTPUT
-
-      - name: Perform Release 
-        run: |
-          curl -X POST https://api.github.com/repos/EventStore/TrainStation/dispatches \
-          -H 'Accept: application/vnd.github.everest-preview+json' \
-          -u ${{ secrets.GH_PAT }} \
-          --data '{"event_type": "release", "client_payload": { "repository": "'"$GITHUB_REPOSITORY"'", "version": "${{ steps.get_version.outputs.version }}" }}'
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 1d795090cb9..e69de29bb2d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "src/EventStore.UI"]
-	path = src/EventStore.UI
-	url = https://github.com/EventStore/EventStore.UI.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f775ad65ac..4acdfb147cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,103 @@
 # Changelog
-All notable changes to this project will be documented in this file.
 
-## [Unreleased]
+**Note:** Changelog updates are no longer tracked in this file. Future changelog updates can be found in [Releases](https://github.com/EventStore/EventStore/releases).
+
+## [24.10.0] - 2024-11-13
+
+### Fixed
+- Fixed potential partial read in TFChunk. [EventStore#4608](https://github.com/EventStore/EventStore/pull/4608)
+- Runtime information log on startup [EventStore#4572](https://github.com/EventStore/EventStore/pull/4572)
+- Enhance shutdown service to handle pre-terminated services. [EventStore#4563](https://github.com/EventStore/EventStore/pull/4563)
+- Explicitly deny stream operations in fallback policy. [EventStore#4567](https://github.com/EventStore/EventStore/pull/4567)
+- Don't time out projection manager reads. [EventStore#4557](https://github.com/EventStore/EventStore/pull/4557)
+- Only use the fallback policy for stream access. Revert to the legacy policy for endpoint access. [EventStore#4537](https://github.com/EventStore/EventStore/pull/4537)
+- Fix authorization policy registry being loaded in insecure mode. [EventStore#4530](https://github.com/EventStore/EventStore/pull/4530)
+- If the scavenge is unable to write a scavenge point it will now error rather than stall. [EventStore#4512](https://github.com/EventStore/EventStore/pull/4512)
+- Reverted free mem stat to be MemAvailable rather than MemFree on linux. [EventStore#4509](https://github.com/EventStore/EventStore/pull/4509)
+- Missing BSD-3 attribution since the recent license change. [EventStore#4493](https://github.com/EventStore/EventStore/pull/4493)
+- Don't write the database default `ProjectionExecutionTimeout` in the projection persisted state on creation. [EventStore#4432](https://github.com/EventStore/EventStore/pull/4432)
+- Ignore dlls that are not .NET assemblies when loading plugins. [EventStore#4380](https://github.com/EventStore/EventStore/pull/4380)
+- Gossip on single node. [EventStore#4367](https://github.com/EventStore/EventStore/pull/4367)
+- Optimize CPU usage of the timer service when the database is idle. [EventStore#4224](https://github.com/EventStore/EventStore/pull/4224) - thanks [@taspeotis](https://github.com/taspeotis)!
+- Redaction: Return the chunk's `MinCompatibleVersion` instead of `Version` when retrieving event positions. [EventStore#4354](https://github.com/EventStore/EventStore/pull/4354)
+- Avoid replaying deleted events from the source stream when replaying parked messages for a persistent subscription. [EventStore#4300](https://github.com/EventStore/EventStore/pull/4300)
+- LeaderId and Epoch number would sometimes be empty (Guid.empty) for a follower node or a read only replica that would join a cluster whose leader is already elected. https://eventstore.aha.io/develop/requirements/DB-26-4 . [Linear Issue](https://linear.app/eventstore/issue/DB-611/leaderid-sometimes-guidempty-in-telemetry) [EventStore#4256](https://github.com/EventStore/EventStore/pull/4256)
+- Remove redundant check which is always true. [EventStore#4265](https://github.com/EventStore/EventStore/pull/4265)
+- Typos in option descriptions. [EventStore#4215](https://github.com/EventStore/EventStore/pull/4215)
+
+### Added
+- ReadOnlyReplica and archiver flags to machine metadata in license. [EventStore#4597](https://github.com/EventStore/EventStore/pull/4597)
+- License error to `/license` endpoint. [EventStore#4549](https://github.com/EventStore/EventStore/pull/4549)
+- Log warning on startup about removed "Plugins" configuration subsection. [EventStore#4540](https://github.com/EventStore/EventStore/pull/4540)
+- Telemetry configuration section to telemetry that is sent. [EventStore#4532](https://github.com/EventStore/EventStore/pull/4532)
+- License headers to files. [EventStore#4487](https://github.com/EventStore/EventStore/pull/4487)
+- Make sure all systems that require a shutdown process complete before exiting. [EventStore#4403](https://github.com/EventStore/EventStore/pull/4403)
+- Licence header to source files. [EventStore#4455](https://github.com/EventStore/EventStore/pull/4455)
+- Chunk read distribution metric. [EventStore#4445](https://github.com/EventStore/EventStore/pull/4445)
+- Operating System to telemetry. [EventStore#4443](https://github.com/EventStore/EventStore/pull/4443)
+- `GET /admin/scavenge/last` endpoint. [EventStore#4419](https://github.com/EventStore/EventStore/pull/4419)
+- Groundwork for Archive. [EventStore#4427](https://github.com/EventStore/EventStore/pull/4427) and [EventStore#4417](https://github.com/EventStore/EventStore/pull/4417)
+- Handling for missing labels in `metricsconfig.json`. [EventStore#4420](https://github.com/EventStore/EventStore/pull/4420)
+- Facilitate node-to-node communication over HTTP for plugins. [EventStore#4409](https://github.com/EventStore/EventStore/pull/4409)
+- License and Notices to build output. [EventStore#4404](https://github.com/EventStore/EventStore/pull/4404)
+- License mappings for Qodana. [EventStore#4398](https://github.com/EventStore/EventStore/pull/4398)
+- Qodana to CI. [EventStore#4392](https://github.com/EventStore/EventStore/pull/4392)
+- A log for which auth policy plugin is being used. [EventStore#4377](https://github.com/EventStore/EventStore/pull/4377)
+- Padding after the SourceContext in the console log output. [EventStore#4376](https://github.com/EventStore/EventStore/pull/4376)
+- Allow loading multiple policies for authorization. [EventStore#4305](https://github.com/EventStore/EventStore/pull/4305)
+- A banner linking to Event Store Navigator in the UI. [EventStore#4323](https://github.com/EventStore/EventStore/pull/4323)
+- Support for chunk data transformation plugins. [EventStore#4258](https://github.com/EventStore/EventStore/pull/4258)
+- Chunk version 4 (`Transformed`) file format. [EventStore#4289](https://github.com/EventStore/EventStore/pull/4289)
+- Support for forward compatibility in chunks. [EventStore#4289](https://github.com/EventStore/EventStore/pull/4289)
+- Added librdkafka redist package. [EventStore#4378](https://github.com/EventStore/EventStore/pull/4378)
+
+### Changed
+- Only use `AuthorizationPolicyRegistryFactory` when the `internal` authorization plugin is enabled. [EventStore#4594](https://github.com/EventStore/EventStore/pull/4594)
+- Internal changes to allow bundling of MD5 plugin. [EventStore#4582](https://github.com/EventStore/EventStore/pull/4582)
+- Restrict Subscriptions.ProcessMessages operations in the fallback policy. [EventStore#4570](https://github.com/EventStore/EventStore/pull/4570)
+- Improved shutdown logging on license validation error. [EventStore#4565](https://github.com/EventStore/EventStore/pull/4565)
+- Upgraded to [Jint v4](https://github.com/sebastienros/jint/releases/tag/v4.0.0). [EventStore#4339](https://github.com/EventStore/EventStore/pull/4339) - thanks [@lahma](https://github.com/lahma)!
+- `Authorization:PolicyType` option to `Authorization:DefaultPolicyType`. [EventStore#4545](https://github.com/EventStore/EventStore/pull/4545)
+- Improved shutdown logging. [EventStore#4548](https://github.com/EventStore/EventStore/pull/4548)
+- Notices file to reflect package upgrades. [EventStore#4517](https://github.com/EventStore/EventStore/pull/4517)
+- gRPC log level to fatal (actually keeping the same behaviour as previous versions). [EventStore#4521](https://github.com/EventStore/EventStore/pull/4521)
+- Moved plugable components out of 'Plugins' section in telemetry. [EventStore#4474](https://github.com/EventStore/EventStore/pull/4474)
+- Plugin configuration to no longer be nested in `Plugins` section. [EventStore#4471](https://github.com/EventStore/EventStore/pull/4471)
+- (All) plugins can now be configured from the main yaml config file. [EventStore#4470](https://github.com/EventStore/EventStore/pull/4470)
+- Software License to [ESLv2](https://www.eventstore.com/blog/introducing-event-store-license-v2-eslv2). [EventStore#4452](https://github.com/EventStore/EventStore/pull/4452)
+- Cosmetic changes to modernize the code base. [EventStore#4429](https://github.com/EventStore/EventStore/pull/4429)
+- Refactor projections to use `IPublisher` and `ISubscriber` instead of `IQueuedHandler` and `IBus`. [EventStore#4413](https://github.com/EventStore/EventStore/pull/4413)
+- `InMemoryBus` becomes asynchronous dispatcher. Async handlers now can use `IAsyncHandle<T>` interface to enable async execution. [EventStore#4408](https://github.com/EventStore/EventStore/pull/4408)
+- Group projection processing classes into namespaces. [EventStore#4412](https://github.com/EventStore/EventStore/pull/4412)
+- Internal message bus is changed to be lock-free for better performance. Also, the change drives further perf improvements. [EventStore#4390](https://github.com/EventStore/EventStore/pull/4390)
+- 3rd party license notices now in NOTICE.html. [EventStore#4402](https://github.com/EventStore/EventStore/pull/4402)
+- Take whether a leader is resigning into account before the node priority when selecting the best candidate for an election. [EventStore#4371](https://github.com/EventStore/EventStore/pull/4371)
+- Upgraded all serilog packages. [EventStore#4341](https://github.com/EventStore/EventStore/pull/4341)
+- Disabled logger init check when debugging. [EventStore#4341](https://github.com/EventStore/EventStore/pull/4341)
+- Console logging now includes SourceContext with component name. [EventStore#4341](https://github.com/EventStore/EventStore/pull/4341)
+- Default log uses `EventStore` as the name. [EventStore#4341](https://github.com/EventStore/EventStore/pull/4341)
+- When adding serilog to the host we now correctly clear all existing providers. [EventStore#4341](https://github.com/EventStore/EventStore/pull/4341)
+- If debug, no exception is thrown if logging was not initialized. [EventStore#4341](https://github.com/EventStore/EventStore/pull/4341)
+- If debug, any background service exception stops the host. [EventStore#4341](https://github.com/EventStore/EventStore/pull/4341)
+- If debug, configuration tries to load appsettings.json and appsettings.Development.json. [EventStore#4341](https://github.com/EventStore/EventStore/pull/4341)
+- Separated persistent subscription metrics into multiple instruments. [EventStore#4315](https://github.com/EventStore/EventStore/pull/4315)
+- Separated projections metrics into multiple instruments. [EventStore#4312](https://github.com/EventStore/EventStore/pull/4312)
+- Unit tests use TCP as a plugin. [EventStore#4210](https://github.com/EventStore/EventStore/pull/4210)
+
+### Removed
+- Byte order marks from source code. [EventStore#4450](https://github.com/EventStore/EventStore/pull/4450)
+- Support for extremely old (V1) PTables. [EventStore#4447](https://github.com/EventStore/EventStore/pull/4447)
+- Unused `TimeoutScheduler` from projections. [EventStore#4434](https://github.com/EventStore/EventStore/pull/4434)
+- `IBus` interface is removed with no replacement to clearly distinguish roles of message dispatcher and message scheduler. Removed unused schedulers and related tests. [EventStore#4408](https://github.com/EventStore/EventStore/pull/4408)
+- Replace the generic `PublishSubscribeDisptacher` with a more specific `ReaderSubscriptionDispatcher` in projections. [EventStore#4413](https://github.com/EventStore/EventStore/pull/4413)
+- `/histogram/{name}` endpoint [EventStore#4394](https://github.com/EventStore/EventStore/pull/4394)
+
+### Breaking Changes
+- The `/histogram/{name}` endpoint has been removed. [EventStore#4394](https://github.com/EventStore/EventStore/pull/4394)
+- Support v1 PTables has been removed. [EventStore#4447](https://github.com/EventStore/EventStore/pull/4447)
+- Otel Exporter commercial plugin configuration has changed to be nested within the `EventStore` subsection for consistency with the other plugins. [Upgrade guide](https://developers.eventstore.com/server/v24.10/quick-start/upgrade-guide.html#breaking-changes)
+- User certificates commercial plugin configuration is no longer nested in a `Plugins` subsection. [Upgrade guide](https://developers.eventstore.com/server/v24.10/quick-start/upgrade-guide.html#breaking-changes)
+- External TCP API and related configuration settings have been removed. [Upgrade guide](https://developers.eventstore.com/server/v24.10/quick-start/upgrade-guide.html#breaking-changes)
 
 ## [23.10.3] - 2024-09-18
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c0faa1db3a4..bc68b5dc723 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,52 +1,55 @@
-# Contributing to EventStoreDB
+# Contributing to KurrentDB
 
 ## Working with the Git
 
-We're using `master` as the main development branch. It contains all changes to the upcoming release. Older releases have dedicated feature branches with the format `release/oss-{version}`. E.g. `release/oss-v5`, `release/oss-v20.10`, `release/oss-v21.2`. Specific releases are tagged from the release branches commits. 
+KurrentDB uses `master` as the main development branch. It contains all changes to the upcoming release. Older releases of KurrentDB have dedicated feature branches with the format `release/v{version}`. E.g., `release/v25.0`. Specific releases are tagged from the release branch commits.
 
-We attempt to do our best to ensure that the history remains clean and to do so, we generally ask contributors to squash their commits into a set or single logical commit.
+Releases of EventStoreDB have feature branches with the format `release/oss-v{version}`. E.g. `release/oss-v24.10`.
 
-To contribute to EventStoreDB:
+We do our best to ensure a clean history. To do so, commits are automatically squashed into a single logical commit when pull requests are merged.
+
+**To contribute to KurrentDB**:
 
 1. Fork the repository.
 2. Create a feature branch from the `master` (or release) branch.
-3. It's recommended using rebase strategy for feature branches (see more in [Git documentation](https://git-scm.com/book/en/v2/Git-Branching-Rebasing)). Having that, we highly recommend using clear commit messages. Commits should also represent the unit of change.
-4. Before sending PR to ensure that you rebased the latest source branch from the main repository.
-5. When you're ready to create the [Pull Request on GitHub](https://github.com/EventStore/EventStore/compare).
+3. It's recommended that feature branches use a rebase strategy (see more in [Git documentation](https://git-scm.com/book/en/v2/Git-Branching-Rebasing)). We also highly recommend using clear commit messages that represent the unit of change.
+4. Rebase the latest source branch from the main repository before sending PR.
+5. When ready to create the Pull Request on GitHub [check to see what has previously changed](https://github.com/kurrent-io/KurrentDB/compare).
 
 ## Documentation
 
-Documentation is located in the [`docs`](/docs) folder. It's orchestrated in the separate [documentation repository](https://github.com/EventStore/documentation). It's available online at https://developers.eventstore.com/.
+Documentation files are in the [`docs`](/docs) folder. They're orchestrated in the separate [documentation repository](https://github.com/kurrent-io/documentation). The Kurrent Documentation site is publicly accessible at https://docs.kurrent.io/.
 
 It's recommended to have documentation changes be put together with code changes.
 
-We're supporting multiple versions of the documentation. Versions are kept in:
-- the main (`master`) branch: all changes that refer to the upcoming release should be put there. That includes both non-released changes and enhancements to documentation for existing features.
-- specific release branches - the last version and older release are kept there (e.g. `release/oss-v5`, `release/oss-v20.10`, `release/oss-v21.2`). We aim to keep the up to date documentation for the last LTS releases and all further. Read more on the release strategy: [link](https://www.eventstore.com/blog/eventstoredb-20.10-lts-has-been-released).
+Kurrent supports multiple versions of the documentation. Versions are kept in:
+- The main (`master`) branch: The `master` branch should contain all changes related to the upcoming release. This includes both non-released changes and enhancements to documentation for existing features.
+- Specific release branches: The latest and previous releases are maintained in specific branches (e.g. `release/v25.0`, `release/oss-v24.10`). We aim to keep the documentation up to date for the latest and previous LTS releases and any STS releases that occur in this timeline. For example, when v24.10 is released, Documentation will continue to be updated for v24.10 and v23.10 (whereas v22.10 will be updated on a "as time allows" basis). Read more on the release strategy [in the docs](https://docs.kurrent.io/server/latest/release-schedule/).
 
-To update the specific database version's docs, it's recommended to create a feature branch based on the particular version release branch. For instance, if you want to change documentation in the `21.2` version, then you should:
-- checkout the latest `release/oss-v21.2`,
-- create a new branch and add your changes,
-- create pull request targeting the `release/oss-v21.2` branch.
+To update a specific database version's docs, we recommended creating a feature branch based on that versions release branch. For instance, if you want to change documentation in the `25.0` version, you would:
+- Checkout `release/v25.0`
+- Create a new branch and add your changes
+- Create a pull request targeting the `release/v25.0` branch.
 
-If you're unsure which branch to select, the safe choice is the main branch (`master`). 
+If you're unsure which branch to select, the safe choice is the main branch (`master`).
 
-It's not needed to send multiple pull requests if your change should be reflected in multiple database versions documentation. Contributors reviewing the pull request should mark it with proper labels (e.g. as `cherry-pick:release/oss-v20.10`). We're using the [GitHub action](/.github/workflows/cherry-pick-pr-for-label.yml) based on the labels that should create pull requests with cherry-picks to the target branches. Action will inform about success or failure via the review comments to the initial pull request tagging the person that merged the pull request. It's recommended for contributors to monitor those notifications and make sure that cherry-picks succeeded. Read more in [action documentation](https://github.com/EventStore/Automations/tree/master/cherry-pick-pr-for-label).
+Multiple pull requests are not required for changes that should be reflected in multiple database version documentation. Contributors reviewing the pull request should label it (e.g., `cherry-pick:release/v25.0`). KurrentDB uses the [GitHub action](/.github/workflows/cherry-pick-pr-for-label.yml) based on the labels that create pull requests with cherry-picks to the target branches. It's recommended that contributors monitor notifications and make sure that cherry-picks succeed. Read more in [action documentation](https://github.com/kurrent-io/Automations/tree/master/cherry-pick-pr-for-label).
 
-Taking the previous example. You sent a pull request targeting the `release/oss-v21.2`. You'd like to have it also for the upcoming release and version `20.10`. Contributor should label your pull request with:
+Using the previous example, assume a pull request targeting the `release/oss-v24.10` was committed. The changes should also be reflected in the upcoming release and version `25.0`. The contributor should add labels to the pull request for:
 - `cherry-pick:master`,
-- `cherry-pick:release/oss-v20.10`.
+- `cherry-pick:release/v25.0`.
 
 _**Note:** Cherry-pick action requires changes to be rebased. If there is a merge commit, then cherry-pick will fail. It will also fail if there is a conflict with the target branch (so `target_branch` from label suffix). If those cases happen then, it's needed to do manual cherry-picks._
 
 ## Code style
 
-Coding rules are set up in the [.editorconfig file](/src/.editorconfig). This file is supported by all popular IDE (e.g. Microsoft Visual Studio, Rider, Visual Studio Code). Unless you disabled it manually, it should be automatically applied after opening the solution. We also recommend turning automatic formatting on saving to have all the rules applied.
+Coding rules are described in the [.editorconfig file](/src/.editorconfig). This file is supported by all popular IDEs (e.g., Microsoft Visual Studio, Rider, and Visual Studio Code). Unless disabled manually, it should be automatically applied after opening the solution. We also recommend turning automatic formatting on saving to have all the rules applied.
 
 ## Licensing and legal rights
 
-By contributing to EventStoreDB:
+By contributing to KurrentDB:
 
-1. You assert that contribution is your original work.
-2. You assert that you have the right to assign the copyright for the work.
-3. You are accepting the [License](LICENSE.md).
+1. You assert that contribution is your original work
+2. You assert that you have the right to assign the copyright for the work
+3. You accept the [Contributor License Agreement](https://gist.github.com/eventstore-bot/7a1e56c21e81f44a625a7462403298bf) (CLA) for your contribution
+4. You accept the [License](LICENSE.md)
diff --git a/Dockerfile b/Dockerfile
index 59d3ecc1af7..2968b8a72f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,20 @@
 # "build" image
 ARG CONTAINER_RUNTIME=jammy
+# NOT A BUG: we can't build on alpine so we use jammy as a base image
 FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build
 ARG RUNTIME=linux-x64
 
 WORKDIR /build
 COPY ./LICENSE.md .
+COPY ./LICENSE_CONTRIBUTIONS.md .
 COPY ./NOTICE.html .
+COPY ./docker ./scripts
 
 WORKDIR /build/ci
 COPY ./ci ./
 
 WORKDIR /build/src
-COPY ./src/EventStore.sln ./src/*/*.csproj ./src/Directory.Build.* ./
+COPY ./src/KurrentDB.sln ./src/*/*.csproj ./src/Directory.Build.* ./
 RUN for file in $(ls *.csproj); do mkdir -p ./${file%.*}/ && mv $file ./${file%.*}/; done
 RUN dotnet restore --runtime=${RUNTIME}
 COPY ./src .
@@ -19,34 +22,25 @@ COPY ./src .
 WORKDIR /build/.git
 COPY ./.git/ .
 
-WORKDIR /build/src
-RUN find /build/src -maxdepth 1 -type d -name "*.Tests" -print0 | xargs -I{} -0 -n1 sh -c \
-    'dotnet publish --runtime=${RUNTIME} --no-self-contained --configuration Release --output /build/published-tests/`basename $1` $1' - '{}'
+RUN /build/scripts/build.sh /build/src /build/published-tests
 
 # "test" image
 FROM mcr.microsoft.com/dotnet/sdk:8.0-${CONTAINER_RUNTIME} as test
 WORKDIR /build
 COPY --from=build ./build/published-tests ./published-tests
 COPY --from=build ./build/ci ./ci
-COPY --from=build ./build/src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/ca/ca.crt /usr/local/share/ca-certificates/ca_eventstore_test.crt
+COPY --from=build ./build/scripts ./scripts
+COPY --from=build ./build/src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/ca/ca.crt /usr/local/share/ca-certificates/ca_kurrentdb_test.crt
 RUN mkdir ./test-results
-RUN printf '#!/usr/bin/env sh\n\
-update-ca-certificates\n\
-find /build/published-tests -maxdepth 1 -type d -name "*.Tests" -print0 | xargs -I{} -0 -n1 sh -c '"'"'proj=`basename $1` && dotnet test --blame --blame-hang-timeout 5min --settings /build/ci/ci.runsettings --logger:"GitHubActions;report-warnings=false" --logger:html --logger:trx --logger:"console;verbosity=normal" --results-directory /build/test-results/$proj $1/$proj.dll'"'"' - '"'"'{}'"'"'\n\
-exit_code=$?\n\
-echo $(find /build/test-results -name "*.html" | xargs cat) > /build/test-results/test-results.html\n\
-exit $exit_code' \
-    >> /build/test.sh && \
-    chmod +x /build/test.sh
 
-CMD ["/build/test.sh"]
+CMD ["/build/scripts/test.sh"]
 
 # "publish" image
 FROM build as publish
 ARG RUNTIME=linux-x64
 
 RUN dotnet publish --configuration=Release --runtime=${RUNTIME} --self-contained \
-     --framework=net8.0 --output /publish EventStore.ClusterNode
+     --framework=net8.0 --output /publish /build/src/KurrentDB
 
 # "runtime" image
 FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-${CONTAINER_RUNTIME} AS runtime
@@ -66,34 +60,34 @@ RUN if [[ "${RUNTIME}" = "linux-musl-x64" ]];\
         rm -rf /var/lib/apt/lists/*; \
     fi
 
-WORKDIR /opt/eventstore
+WORKDIR /opt/kurrentdb
 
-RUN addgroup --gid ${GID} "eventstore" && \
+RUN addgroup --gid ${GID} "kurrent" && \
     adduser \
     --disabled-password \
     --gecos "" \
-    --ingroup "eventstore" \
+    --ingroup "kurrent" \
     --no-create-home \
     --uid ${UID} \
-    "eventstore"
+    "kurrent"
 
-COPY --chown=eventstore:eventstore --from=publish /publish ./
+COPY --chown=kurrent:kurrent --from=publish /publish ./
 
-RUN mkdir -p /var/lib/eventstore && \
-    mkdir -p /var/log/eventstore && \
-    mkdir -p /etc/eventstore && \
-    chown -R eventstore:eventstore /var/lib/eventstore /var/log/eventstore /etc/eventstore
+RUN mkdir -p /var/lib/kurrentdb && \
+    mkdir -p /var/log/kurrentdb && \
+    mkdir -p /etc/kurrentdb && \
+    chown -R kurrent:kurrent /var/lib/kurrentdb /var/log/kurrentdb /etc/kurrentdb
 
-USER eventstore
+USER kurrent
 
 RUN printf "NodeIp: 0.0.0.0\n\
-ReplicationIp: 0.0.0.0" >> /etc/eventstore/eventstore.conf
+ReplicationIp: 0.0.0.0" >> /etc/kurrentdb/kurrentdb.conf
 
-VOLUME /var/lib/eventstore /var/log/eventstore
+VOLUME /var/lib/kurrentdb /var/log/kurrentdb
 
 EXPOSE 1112/tcp 1113/tcp 2113/tcp
 
 HEALTHCHECK --interval=5s --timeout=5s --retries=24 \
     CMD curl --fail --insecure https://localhost:2113/health/live || curl --fail http://localhost:2113/health/live || exit 1
 
-ENTRYPOINT ["/opt/eventstore/EventStore.ClusterNode"]
+ENTRYPOINT ["/opt/kurrentdb/KurrentDB"]
diff --git a/KurrentLogo-Black.png b/KurrentLogo-Black.png
new file mode 100644
index 00000000000..0ff9694f953
Binary files /dev/null and b/KurrentLogo-Black.png differ
diff --git a/KurrentLogo-Plum.png b/KurrentLogo-Plum.png
new file mode 100644
index 00000000000..a27a816472b
Binary files /dev/null and b/KurrentLogo-Plum.png differ
diff --git a/KurrentLogo-White.png b/KurrentLogo-White.png
new file mode 100644
index 00000000000..e49bfb08f8b
Binary files /dev/null and b/KurrentLogo-White.png differ
diff --git a/LICENSE.md b/LICENSE.md
index 6a4fdf559bb..6fd6bf5a20d 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,28 +1,57 @@
-# EventStoreDB License
-
-Copyright (c) 2011-2024, Event Store Ltd. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright notice, this
-list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
-
-Neither the name of Event Store Ltd nor the names of its contributors may be
-used to endorse or promote products derived from this software without specific
-prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Kurrent License v1
+
+Copyright (c) 2011-2025, Kurrent, Inc. All rights reserved.
+
+### Acceptance
+
+By using the software, you agree to all of the terms and conditions below.
+
+### Copyright License
+
+The licensor grants you a non-exclusive, royalty-free, worldwide, non-sublicensable, non-transferable license to use, copy, distribute, make available, and prepare derivative works of the software, in each case subject to the limitations and conditions below.
+
+### Limitations
+
+You may not provide the software to third parties as a hosted or managed service, where the service provides users with access to any substantial set of the features or functionality of the software.
+
+Unless authorized in writing by the licensor, you may not move, change, disable, interfere with, or circumvent the license mechanisms in the software, and you may not remove or obscure any functionality in the software that is protected by the license mechanisms.
+
+You may not alter, remove, or obscure any licensing, copyright, or other notices of the licensor in the software. Any use of the licensor’s trademarks is subject to applicable law.
+
+### Patents
+
+The licensor grants you a license, under any patent claims the licensor can license, or becomes able to license, to make, have made, use, sell, offer for sale, import and have imported the software, in each case subject to the limitations and conditions in this license. This license does not cover any patent claims that you cause to be infringed by modifications or additions to the software. If you or your company make any written claim that the software infringes or contributes to infringement of any patent, your patent license for the software granted under these terms ends immediately. If your company makes such a claim, your patent license ends immediately for work on behalf of your company.
+
+### Notices
+
+You must ensure that anyone who gets a copy of any part of the software from you also gets a copy of these terms.
+
+If you modify the software, you must include in any modified copies of the software prominent notices stating that you have modified the software.
+
+### No Other Rights
+
+These terms do not imply any licenses other than those expressly granted in these terms.
+
+### Termination
+
+If you use the software in violation of these terms, such use is not licensed, and your licenses will automatically terminate. If the licensor provides you with a notice of your violation, and you cease all violation of this license no later than 30 days after you receive that notice, your licenses will be reinstated retroactively. However, if you violate these terms after such reinstatement, any additional violation of these terms will cause your licenses to terminate automatically and permanently.
+
+### No Liability
+
+***As far as the law allows, the software comes as is, without any warranty or condition, and the licensor will not be liable to you for any damages arising out of these terms or the use or nature of the software, under any kind of legal claim.***
+
+### Definitions
+
+The **licensor** is the entity offering these terms, and the **software** is the software the licensor makes available under these terms, including any portion of it.
+
+**licensing mechanisms** refers to functionality that restricts use of the software based on whether you possess a valid license key, including functionality to validate license keys and audit usage of the software to ensure license compliance.
+
+**you** refers to the individual or entity agreeing to these terms.
+
+**your company** is any legal entity, sole proprietorship, or other kind of organization that you work for, plus all organizations that have control over, are under the control of, or are under common control with that organization. **control** means ownership of substantially all the assets of an entity, or the power to direct its management and policies by vote, contract, or otherwise. Control can be direct or indirect.
+
+**your licenses** are all the licenses granted to you for the software under these terms.
+
+**use** means anything you do with the software requiring one of your licenses.
+
+**trademark** means trademarks, service marks, and similar rights.
diff --git a/LICENSE_CONTRIBUTIONS.md b/LICENSE_CONTRIBUTIONS.md
new file mode 100644
index 00000000000..e21611f37cf
--- /dev/null
+++ b/LICENSE_CONTRIBUTIONS.md
@@ -0,0 +1,32 @@
+KurrentDB code and EventStoreDB code after versions 24.6.x is generally subject to the terms of the Kurrent License v1 
+(KLv1, see License.md), however, some parts of the code remain subject to the terms of the Event Store License, which 
+they were contributed under.
+
+# Event Store License
+
+Copyright (c) 2011-2024, Event Store Ltd. and Contributors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+Neither the name of Event Store Ltd nor the names of its contributors may be
+used to endorse or promote products derived from this software without specific
+prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/NOTICE.html b/NOTICE.html
index 164ee3ebcb6..ce7f5af5dcc 100644
--- a/NOTICE.html
+++ b/NOTICE.html
@@ -15,6 +15,41 @@ <h1>Third-party software list</h1>
         </tr>
       </thead>
       <tbody>
+        <tr>
+          <td><a href="https://github.com/aws/aws-sdk-net/">AWSSDK.Core</a></td><td>3.7.304</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/aws/aws-sdk-net/">AWSSDK.S3</a></td><td>3.7.307.32</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/aws/aws-sdk-net/">AWSSDK.SQS</a></td><td>3.7.301.3</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/aws/aws-sdk-net/">AWSSDK.SecurityToken</a></td><td>3.7.300.91</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/adams85/acornima">Acornima</a></td><td>1.1.0</td><td>
+            <div>
+              <a href="http://www.opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a>
+            </div>
+          </td><td>Adam Simon</td>
+        </tr>
         <tr>
           <td><a href="https://github.com/dotnet/BenchmarkDotNet">BenchmarkDotNet.Annotations</a></td><td>0.13.10</td><td>
             <div>
@@ -37,52 +72,60 @@ <h1>Third-party software list</h1>
           </td><td>Copyright (c) 2005 - 2020 Giacomo Stelluti Scala &amp; Contributors</td>
         </tr>
         <tr>
-          <td><a href="https://dotnet.github.io/dotNext/">DotNext.IO</a></td><td>5.4.0</td><td>
+          <td><a href="https://dotnet.github.io/dotNext/">DotNext.IO</a></td><td>5.18.2</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>Copyright &copy; .NET Foundation and Contributors</td>
         </tr>
         <tr>
-          <td><a href="https://dotnet.github.io/dotNext/">DotNext.Threading</a></td><td>5.4.0</td><td>
+          <td><a href="https://dotnet.github.io/dotNext/">DotNext.Threading</a></td><td>5.18.1</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>Copyright &copy; .NET Foundation and Contributors</td>
         </tr>
         <tr>
-          <td><a href="https://dotnet.github.io/dotNext/">DotNext.Unsafe</a></td><td>5.3.0</td><td>
+          <td><a href="https://dotnet.github.io/dotNext/">DotNext.Unsafe</a></td><td>5.18.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>Copyright &copy; .NET Foundation and Contributors</td>
         </tr>
         <tr>
-          <td><a href="https://dotnet.github.io/dotNext/">DotNext</a></td><td>5.3.1</td><td>
+          <td><a href="https://dotnet.github.io/dotNext/">DotNext</a></td><td>5.18.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>Copyright &copy; .NET Foundation and Contributors</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/sebastienros/esprima-dotnet">Esprima</a></td><td>3.0.4</td><td>
+          <td><a href="https://eventstore.com/">EventStore.Plugins</a></td><td>25.2.5</td><td>
             <div>
-              <a href="http://www.opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a>
+              <a href="https://github.com/EventStore/EventStore/blob/master/LICENSE.md">Kurrent-1.0</a>
             </div>
-          </td><td>Sebastien Ros</td>
+          </td><td></td>
         </tr>
         <tr>
-          <td><a href="https://eventstore.com/">EventStore.Plugins</a></td><td>24.10.0</td><td>
+          <td><a href="https://github.com/0phois/MudBlazor.StaticInput">Extensions.MudBlazor.StaticInput</a></td><td>3.2.0</td><td>
             <div>
-              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
+          </td><td>Copyright 2024 Ophois</td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/robinrodricks/FluentStorage">FluentStorage.AWS</a></td><td>5.5.0</td><td>
             <div>
-              <a href="http://www.opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
+          </td><td>Copyright (c) 2023 Robin Rodricks and FluentStorage Contributors</td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/robinrodricks/FluentStorage">FluentStorage</a></td><td>5.6.0</td><td>
             <div>
-              <a>OTHER-PERMISSIVE</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>Copyright 2012-2024 Event Store Ltd</td>
+          </td><td>Copyright (c) 2023 Robin Rodricks and FluentStorage Contributors</td>
         </tr>
         <tr>
           <td><a href="https://github.com/9ee1/Capstone.NET">Gee.External.Capstone</a></td><td>2.3.0</td><td>
@@ -173,612 +216,1074 @@ <h1>Third-party software list</h1>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://www.jetbrains.com/help/resharper/Code_Analysis__Code_Annotations.html">JetBrains.Annotations</a></td><td>2024.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
           </td><td>Copyright (c) 2016-2024 JetBrains s.r.o.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/sebastienros/jint">Jint</a></td><td>3.0.0</td><td>
+          <td><a href="https://github.com/sebastienros/jint">Jint</a></td><td>4.0.3</td><td>
             <div>
               <a href="http://www.opensource.org/licenses/BSD-2-Clause">BSD-2-Clause</a>
             </div>
           </td><td>Sebastien Ros</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.Bcl.AsyncInterfaces</a></td><td>6.0.0</td><td>
+          <td><a href="https://github.com/lunet-io/markdig">Markdig</a></td><td>0.40.0</td><td>
             <div>
-              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+              <a href="http://www.opensource.org/licenses/BSD-2-Clause">BSD-2-Clause</a>
             </div>
-          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+          </td><td>Alexandre Mutel</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/dotnet/corefx">Microsoft.CSharp</a></td><td>4.7.0</td><td>
+          <td><a href="https://asp.net/">Microsoft.AspNetCore.Authentication.OpenIdConnect</a></td><td>8.0.13</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/dotnet/roslyn-analyzers">Microsoft.CodeAnalysis.Analyzers</a></td><td>3.3.3</td><td>
+          <td><a href="https://asp.net/">Microsoft.AspNetCore.Authorization</a></td><td>8.0.13</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/dotnet/roslyn-analyzers">Microsoft.CodeAnalysis.Analyzers</a></td><td>3.3.4</td><td>
+          <td><a href="https://asp.net/">Microsoft.AspNetCore.Components.Analyzers</a></td><td>8.0.13</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/dotnet/roslyn">Microsoft.CodeAnalysis.CSharp</a></td><td>4.1.0</td><td>
+          <td><a href="https://asp.net/">Microsoft.AspNetCore.Components.Authorization</a></td><td>8.0.13</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/dotnet/roslyn">Microsoft.CodeAnalysis.CSharp</a></td><td>4.7.0</td><td>
+          <td><a href="https://asp.net/">Microsoft.AspNetCore.Components.Forms</a></td><td>8.0.13</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/dotnet/roslyn">Microsoft.CodeAnalysis.Common</a></td><td>4.1.0</td><td>
+          <td><a href="https://asp.net/">Microsoft.AspNetCore.Components.Web</a></td><td>8.0.13</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/dotnet/roslyn">Microsoft.CodeAnalysis.Common</a></td><td>4.7.0</td><td>
+          <td><a href="https://asp.net/">Microsoft.AspNetCore.Components.WebAssembly.Authentication</a></td><td>8.0.13</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://docs.microsoft.com/dotnet/standard/data/sqlite/">Microsoft.Data.Sqlite.Core</a></td><td>8.0.0</td><td>
+          <td><a href="https://asp.net/">Microsoft.AspNetCore.Components.WebAssembly.Server</a></td><td>8.0.13</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://docs.microsoft.com/dotnet/standard/data/sqlite/">Microsoft.Data.Sqlite</a></td><td>8.0.0</td><td>
+          <td><a href="https://asp.net/">Microsoft.AspNetCore.Components.WebAssembly</a></td><td>8.0.13</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/dotnet/diagnostics">Microsoft.Diagnostics.NETCore.Client</a></td><td>0.2.452401</td><td>
+          <td><a href="https://asp.net/">Microsoft.AspNetCore.Components</a></td><td>8.0.13</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/Microsoft/clrmd">Microsoft.Diagnostics.Runtime</a></td><td>2.2.332302</td><td>
+          <td><a href="https://asp.net/">Microsoft.AspNetCore.Http.Abstractions</a></td><td>2.3.0</td><td>
             <div>
-              <a href="https://www.nuget.org/packages/Microsoft.Diagnostics.Runtime/2.2.332302">MIT</a>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
             </div>
-          </td><td>Copyright (c) .NET Foundation and Contributors</td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/Microsoft/perfview">Microsoft.Diagnostics.Tracing.TraceEvent</a></td><td>3.1.6</td><td>
+          <td><a href="https://asp.net/">Microsoft.AspNetCore.Http.Features</a></td><td>2.3.0</td><td>
             <div>
-              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.DotNet.PlatformAbstractions</a></td><td>3.1.6</td><td>
+          <td><a href="https://asp.net/">Microsoft.AspNetCore.Metadata</a></td><td>8.0.13</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.Extensions.Configuration.Abstractions</a></td><td>8.0.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Bcl.AsyncInterfaces</a></td><td>6.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.Extensions.Configuration.Binder</a></td><td>8.0.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Bcl.Memory</a></td><td>9.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://asp.net/">Microsoft.Extensions.Configuration.EnvironmentVariables</a></td><td>3.1.0</td><td>
+          <td><a href="https://github.com/dotnet/corefx">Microsoft.CSharp</a></td><td>4.7.0</td><td>
             <div>
-              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.Extensions.Configuration.FileExtensions</a></td><td>8.0.0</td><td>
+          <td><a href="https://github.com/dotnet/roslyn-analyzers">Microsoft.CodeAnalysis.Analyzers</a></td><td>3.3.3</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.Extensions.Configuration.Json</a></td><td>8.0.0</td><td>
+          <td><a href="https://github.com/dotnet/roslyn-analyzers">Microsoft.CodeAnalysis.Analyzers</a></td><td>3.3.4</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.Extensions.Configuration</a></td><td>8.0.0</td><td>
+          <td><a href="https://github.com/dotnet/roslyn">Microsoft.CodeAnalysis.CSharp</a></td><td>4.1.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.Extensions.DependencyInjection.Abstractions</a></td><td>8.0.0</td><td>
+          <td><a href="https://github.com/dotnet/roslyn">Microsoft.CodeAnalysis.CSharp</a></td><td>4.7.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.Extensions.DependencyInjection</a></td><td>8.0.0</td><td>
+          <td><a href="https://github.com/dotnet/roslyn">Microsoft.CodeAnalysis.Common</a></td><td>4.1.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.Extensions.DependencyModel</a></td><td>8.0.1</td><td>
+          <td><a href="https://github.com/dotnet/roslyn">Microsoft.CodeAnalysis.Common</a></td><td>4.7.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.Extensions.FileProviders.Abstractions</a></td><td>8.0.0</td><td>
+          <td><a href="https://docs.microsoft.com/dotnet/standard/data/sqlite/">Microsoft.Data.Sqlite.Core</a></td><td>8.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.Extensions.FileProviders.Composite</a></td><td>8.0.0</td><td>
+          <td><a href="https://docs.microsoft.com/dotnet/standard/data/sqlite/">Microsoft.Data.Sqlite</a></td><td>8.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://asp.net/">Microsoft.Extensions.FileProviders.Embedded</a></td><td>8.0.0</td><td>
+          <td><a href="https://github.com/dotnet/diagnostics">Microsoft.Diagnostics.NETCore.Client</a></td><td>0.2.553101</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.Extensions.FileProviders.Physical</a></td><td>8.0.0</td><td>
+          <td><a href="https://github.com/Microsoft/clrmd">Microsoft.Diagnostics.Runtime</a></td><td>2.2.332302</td><td>
             <div>
-              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+              <a href="https://www.nuget.org/packages/Microsoft.Diagnostics.Runtime/2.2.332302">MIT</a>
             </div>
-          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+          </td><td></td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.Extensions.FileSystemGlobbing</a></td><td>8.0.0</td><td>
+          <td><a href="https://github.com/Microsoft/perfview">Microsoft.Diagnostics.Tracing.TraceEvent</a></td><td>3.1.19</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://asp.net/">Microsoft.Extensions.Hosting.Abstractions</a></td><td>2.1.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.DotNet.PlatformAbstractions</a></td><td>3.1.6</td><td>
             <div>
-              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.Extensions.Http</a></td><td>6.0.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Configuration.Abstractions</a></td><td>8.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.Extensions.Logging.Abstractions</a></td><td>8.0.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Configuration.Abstractions</a></td><td>9.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://asp.net/">Microsoft.Extensions.Logging.Configuration</a></td><td>3.1.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Configuration.Binder</a></td><td>8.0.0</td><td>
             <div>
-              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.Extensions.Logging</a></td><td>8.0.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Configuration.Binder</a></td><td>8.0.2</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://asp.net/">Microsoft.Extensions.ObjectPool</a></td><td>6.0.16</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Configuration.Binder</a></td><td>9.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://asp.net/">Microsoft.Extensions.Options.ConfigurationExtensions</a></td><td>3.1.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Configuration.FileExtensions</a></td><td>8.0.0</td><td>
             <div>
-              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.Extensions.Options</a></td><td>8.0.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Configuration.FileExtensions</a></td><td>8.0.1</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.Extensions.Primitives</a></td><td>8.0.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Configuration.Json</a></td><td>8.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/microsoft/FASTER">Microsoft.FASTER.Core</a></td><td>1.9.16</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Configuration.Json</a></td><td>8.0.1</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet">Microsoft.IdentityModel.Abstractions</a></td><td>7.6.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Configuration</a></td><td>8.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet">Microsoft.IdentityModel.JsonWebTokens</a></td><td>7.6.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Configuration</a></td><td>9.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet">Microsoft.IdentityModel.Logging</a></td><td>7.6.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.DependencyInjection.Abstractions</a></td><td>8.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet">Microsoft.IdentityModel.Tokens</a></td><td>7.6.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.DependencyInjection.Abstractions</a></td><td>8.0.2</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.NETCore.Platforms</a></td><td>1.1.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.DependencyInjection.Abstractions</a></td><td>9.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.NETCore.Platforms</a></td><td>1.1.1</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.DependencyInjection</a></td><td>8.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.NETCore.Platforms</a></td><td>2.0.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.DependencyInjection</a></td><td>8.0.1</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/dotnet/runtime">Microsoft.NETCore.Platforms</a></td><td>5.0.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.DependencyInjection</a></td><td>9.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.NETCore.Targets</a></td><td>1.1.3</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.DependencyModel</a></td><td>8.0.1</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://asp.net/">Microsoft.Net.Http.Headers</a></td><td>8.0.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.DependencyModel</a></td><td>8.0.2</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">Microsoft.Win32.Registry</a></td><td>4.4.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Diagnostics.Abstractions</a></td><td>9.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/dotnet/runtime">Microsoft.Win32.Registry</a></td><td>5.0.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.FileProviders.Abstractions</a></td><td>8.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://go.microsoft.com/fwlink/?linkid=869051">Mono.Posix.NETStandard</a></td><td>1.0.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.FileProviders.Abstractions</a></td><td>9.0.0</td><td>
             <div>
-              <a href="https://github.com/mono/mono/blob/main/LICENSE">MIT</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td></td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">NETStandard.Library</a></td><td>2.0.3</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.FileProviders.Composite</a></td><td>8.0.0</td><td>
             <div>
-              <a href="https://nuget.info/packages/NETStandard.Library/2.0.3">MIT</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>Copyright (c) .NET Foundation and Contributors</td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://www.newtonsoft.com/json">Newtonsoft.Json</a></td><td>13.0.3</td><td>
+          <td><a href="https://asp.net/">Microsoft.Extensions.FileProviders.Embedded</a></td><td>8.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>Copyright &copy; James Newton-King 2008</td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://www.nuget.org/packages/OpenTelemetry.Api">OpenTelemetry.Api</a></td><td>1.4.0-rc.1</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.FileProviders.Physical</a></td><td>8.0.0</td><td>
             <div>
-              <a href="https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/LICENSE.TXT">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>Copyright The OpenTelemetry Authors</td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://www.nuget.org/packages/OpenTelemetry.Exporter.Prometheus.AspNetCore">OpenTelemetry.Exporter.Prometheus.AspNetCore</a></td><td>1.4.0-rc.1</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.FileSystemGlobbing</a></td><td>8.0.0</td><td>
             <div>
-              <a href="https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/LICENSE.TXT">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>Copyright The OpenTelemetry Authors</td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://www.nuget.org/packages/OpenTelemetry.Extensions.DependencyInjection">OpenTelemetry.Extensions.DependencyInjection</a></td><td>1.4.0-rc.1</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Hosting.Abstractions</a></td><td>9.0.0</td><td>
             <div>
-              <a href="https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/LICENSE.TXT">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>Copyright The OpenTelemetry Authors</td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://www.nuget.org/packages/OpenTelemetry.Extensions.Hosting">OpenTelemetry.Extensions.Hosting</a></td><td>1.4.0-rc.1</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Http</a></td><td>6.0.0</td><td>
             <div>
-              <a href="https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/LICENSE.TXT">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>Copyright The OpenTelemetry Authors</td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://www.nuget.org/packages/OpenTelemetry">OpenTelemetry</a></td><td>1.4.0-rc.1</td><td>
+          <td><a href="https://asp.net/">Microsoft.Extensions.Localization.Abstractions</a></td><td>8.0.12</td><td>
             <div>
-              <a href="https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/LICENSE.TXT">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>Copyright The OpenTelemetry Authors</td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/AndreyAkinshin/perfolizer">Perfolizer</a></td><td>0.2.1</td><td>
+          <td><a href="https://asp.net/">Microsoft.Extensions.Localization</a></td><td>8.0.12</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>Copyright (C) 2020 Andrey Akinshin</td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://www.nuget.org/packages/Quickenshtein">Quickenshtein</a></td><td>1.5.1</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Logging.Abstractions</a></td><td>8.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>Copyright (c) 2020 James Turner</td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://www.nuget.org/packages/SQLitePCLRaw.bundle_e_sqlite3">SQLitePCLRaw.bundle_e_sqlite3</a></td><td>2.1.6</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Logging.Abstractions</a></td><td>8.0.3</td><td>
             <div>
-              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>Copyright 2014-2023 SourceGear, LLC</td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://www.nuget.org/packages/SQLitePCLRaw.core">SQLitePCLRaw.core</a></td><td>2.1.6</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Logging.Abstractions</a></td><td>9.0.0</td><td>
             <div>
-              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>Copyright 2014-2023 SourceGear, LLC</td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://www.nuget.org/packages/SQLitePCLRaw.lib.e_sqlite3">SQLitePCLRaw.lib.e_sqlite3</a></td><td>2.1.6</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Logging.Configuration</a></td><td>9.0.0</td><td>
             <div>
-              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>Copyright 2014-2023 SourceGear, LLC</td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://www.nuget.org/packages/SQLitePCLRaw.provider.e_sqlite3">SQLitePCLRaw.provider.e_sqlite3</a></td><td>2.1.6</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Logging</a></td><td>8.0.0</td><td>
             <div>
-              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>Copyright 2014-2023 SourceGear, LLC</td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="http://serilog.net/">Serilog.Enrichers.Process</a></td><td>3.0.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Logging</a></td><td>8.0.1</td><td>
             <div>
-              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td></td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="http://serilog.net/">Serilog.Enrichers.Thread</a></td><td>4.0.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Logging</a></td><td>9.0.0</td><td>
             <div>
-              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td></td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/serilog/serilog-expressions">Serilog.Expressions</a></td><td>5.0.0</td><td>
+          <td><a href="https://asp.net/">Microsoft.Extensions.ObjectPool</a></td><td>6.0.16</td><td>
             <div>
-              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td></td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/serilog/serilog-extensions-logging">Serilog.Extensions.Logging</a></td><td>8.0.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Options.ConfigurationExtensions</a></td><td>9.0.0</td><td>
             <div>
-              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td></td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/serilog/serilog-settings-configuration">Serilog.Settings.Configuration</a></td><td>8.0.2</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Options</a></td><td>8.0.0</td><td>
             <div>
-              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td></td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://serilog.net/">Serilog.Sinks.Async</a></td><td>2.0.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Options</a></td><td>8.0.2</td><td>
             <div>
-              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td></td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/serilog/serilog-sinks-console">Serilog.Sinks.Console</a></td><td>6.0.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Options</a></td><td>9.0.0</td><td>
             <div>
-              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td></td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/serilog/serilog-sinks-file">Serilog.Sinks.File</a></td><td>6.0.0</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Primitives</a></td><td>8.0.0</td><td>
             <div>
-              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td></td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://serilog.net/">Serilog</a></td><td>4.0.1</td><td>
+          <td><a href="https://dot.net/">Microsoft.Extensions.Primitives</a></td><td>9.0.0</td><td>
             <div>
-              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>Copyright &copy; 2013-24 Serilog Contributors</td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/vipentti/SharpDotYaml">SharpDotYaml.Extensions.Configuration</a></td><td>0.3.0</td><td>
+          <td><a href="https://github.com/microsoft/FASTER">Microsoft.FASTER.Core</a></td><td>1.9.16</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>Copyright &copy; 2023 Ville Penttinen</td>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">System.Buffers</a></td><td>4.5.1</td><td>
+          <td><a href="https://github.com/Microsoft/Microsoft.IO.RecyclableMemoryStream">Microsoft.IO.RecyclableMemoryStream</a></td><td>3.0.1</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/dotnet/runtime">System.CodeDom</a></td><td>5.0.0</td><td>
+          <td><a href="https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet">Microsoft.IdentityModel.Abstractions</a></td><td>7.6.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/dotnet/runtime">System.Collections.Immutable</a></td><td>5.0.0</td><td>
+          <td><a href="https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet">Microsoft.IdentityModel.Abstractions</a></td><td>8.6.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">System.Collections.Immutable</a></td><td>7.0.0</td><td>
+          <td><a href="https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet">Microsoft.IdentityModel.JsonWebTokens</a></td><td>7.6.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">System.ComponentModel.Composition</a></td><td>8.0.0</td><td>
+          <td><a href="https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet">Microsoft.IdentityModel.JsonWebTokens</a></td><td>8.6.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">System.Configuration.ConfigurationManager</a></td><td>8.0.0</td><td>
+          <td><a href="https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet">Microsoft.IdentityModel.Logging</a></td><td>7.6.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet">Microsoft.IdentityModel.Logging</a></td><td>8.6.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet">Microsoft.IdentityModel.Protocols.OpenIdConnect</a></td><td>8.6.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet">Microsoft.IdentityModel.Protocols</a></td><td>8.6.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet">Microsoft.IdentityModel.Tokens</a></td><td>7.6.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet">Microsoft.IdentityModel.Tokens</a></td><td>8.6.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://asp.net/">Microsoft.JSInterop.WebAssembly</a></td><td>8.0.13</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://asp.net/">Microsoft.JSInterop</a></td><td>8.0.13</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">Microsoft.NET.ILLink.Tasks</a></td><td>8.0.5</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">Microsoft.NET.Sdk.WebAssembly.Pack</a></td><td>8.0.5</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">Microsoft.NETCore.Platforms</a></td><td>1.1.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">Microsoft.NETCore.Platforms</a></td><td>1.1.1</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/dotnet/runtime">Microsoft.NETCore.Platforms</a></td><td>5.0.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">Microsoft.NETCore.Targets</a></td><td>1.1.3</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://asp.net/">Microsoft.Net.Http.Headers</a></td><td>8.0.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/dotnet/runtime">Microsoft.Win32.Registry</a></td><td>5.0.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://go.microsoft.com/fwlink/?linkid=869051">Mono.Posix.NETStandard</a></td><td>1.0.0</td><td>
+            <div>
+              <a href="https://github.com/mono/mono/blob/main/LICENSE">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://mudblazor.com/">MudBlazor.Markdown</a></td><td>8.0.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>Copyright &copy; 2024 MyNihongo</td>
+        </tr>
+        <tr>
+          <td><a href="https://mudblazor.com/">MudBlazor</a></td><td>8.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>Copyright 2024 MudBlazor</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">NETStandard.Library</a></td><td>2.0.3</td><td>
+            <div>
+              <a href="https://nuget.info/packages/NETStandard.Library/2.0.3">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/andrewlock/NetEscapades.Configuration/tree/master/src/NetEscapades.Configuration.Yaml">NetEscapades.Configuration.Yaml</a></td><td>3.1.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://www.newtonsoft.com/json">Newtonsoft.Json</a></td><td>13.0.3</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>Copyright &copy; James Newton-King 2008</td>
+        </tr>
+        <tr>
+          <td><a href="https://opentelemetry.io/">OpenTelemetry.Api.ProviderBuilderExtensions</a></td><td>1.11.2</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td>Copyright The OpenTelemetry Authors</td>
+        </tr>
+        <tr>
+          <td><a href="https://opentelemetry.io/">OpenTelemetry.Api</a></td><td>1.11.2</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td>Copyright The OpenTelemetry Authors</td>
+        </tr>
+        <tr>
+          <td><a href="https://opentelemetry.io/">OpenTelemetry.Exporter.OpenTelemetryProtocol</a></td><td>1.11.2</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td>Copyright The OpenTelemetry Authors</td>
+        </tr>
+        <tr>
+          <td><a href="https://www.nuget.org/packages/OpenTelemetry.Exporter.Prometheus.AspNetCore">OpenTelemetry.Exporter.Prometheus.AspNetCore</a></td><td>1.11.2-beta.1</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://opentelemetry.io/">OpenTelemetry.Extensions.Hosting</a></td><td>1.11.2</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td>Copyright The OpenTelemetry Authors</td>
+        </tr>
+        <tr>
+          <td><a href="https://opentelemetry.io/">OpenTelemetry</a></td><td>1.11.2</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td>Copyright The OpenTelemetry Authors</td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/AndreyAkinshin/perfolizer">Perfolizer</a></td><td>0.2.1</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>Copyright (C) 2020 Andrey Akinshin</td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/App-vNext/Polly">Polly.Core</a></td><td>8.5.2</td><td>
+            <div>
+              <a href="http://www.opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a>
+            </div>
+          </td><td>Copyright (c) 2025, App vNext</td>
+        </tr>
+        <tr>
+          <td><a href="https://www.nuget.org/packages/Quickenshtein">Quickenshtein</a></td><td>1.5.1</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://restsharp.dev/">RestSharp</a></td><td>112.1.0</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://www.nuget.org/packages/SQLitePCLRaw.bundle_e_sqlite3">SQLitePCLRaw.bundle_e_sqlite3</a></td><td>2.1.6</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td>Copyright 2014-2023 SourceGear, LLC</td>
+        </tr>
+        <tr>
+          <td><a href="https://www.nuget.org/packages/SQLitePCLRaw.core">SQLitePCLRaw.core</a></td><td>2.1.6</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td>Copyright 2014-2023 SourceGear, LLC</td>
+        </tr>
+        <tr>
+          <td><a href="https://www.nuget.org/packages/SQLitePCLRaw.lib.e_sqlite3">SQLitePCLRaw.lib.e_sqlite3</a></td><td>2.1.6</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td>Copyright 2014-2023 SourceGear, LLC</td>
+        </tr>
+        <tr>
+          <td><a href="https://www.nuget.org/packages/SQLitePCLRaw.provider.e_sqlite3">SQLitePCLRaw.provider.e_sqlite3</a></td><td>2.1.6</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td>Copyright 2014-2023 SourceGear, LLC</td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/khellang/Scrutor">Scrutor</a></td><td>5.0.2</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="http://serilog.net/">Serilog.Enrichers.Process</a></td><td>3.0.0</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="http://serilog.net/">Serilog.Enrichers.Thread</a></td><td>4.0.0</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/serilog/serilog-expressions">Serilog.Expressions</a></td><td>5.0.0</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/serilog/serilog-extensions-logging">Serilog.Extensions.Logging</a></td><td>8.0.0</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/serilog/serilog-settings-configuration">Serilog.Settings.Configuration</a></td><td>8.0.2</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://serilog.net/">Serilog.Sinks.Async</a></td><td>2.0.0</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/serilog/serilog-sinks-console">Serilog.Sinks.Console</a></td><td>6.0.0</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/serilog/serilog-sinks-file">Serilog.Sinks.File</a></td><td>6.0.0</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://serilog.net/">Serilog</a></td><td>4.0.1</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td>Copyright &copy; 2013-24 Serilog Contributors</td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/vipentti/SharpDotYaml">SharpDotYaml.Extensions.Configuration</a></td><td>0.3.1</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>Copyright &copy; 2023-2024 Ville Penttinen</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Buffers</a></td><td>4.5.1</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/dotnet/runtime">System.CodeDom</a></td><td>5.0.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Collections.Concurrent</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Collections.Immutable</a></td><td>7.0.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Collections.Immutable</a></td><td>8.0.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Collections</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.ComponentModel.Composition</a></td><td>8.0.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Configuration.ConfigurationManager</a></td><td>8.0.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Diagnostics.Debug</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Diagnostics.DiagnosticSource</a></td><td>8.0.1</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Diagnostics.DiagnosticSource</a></td><td>9.0.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Diagnostics.DiagnosticSource</a></td><td>9.0.1</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Diagnostics.EventLog</a></td><td>8.0.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Diagnostics.PerformanceCounter</a></td><td>8.0.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Diagnostics.Tracing</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Formats.Asn1</a></td><td>8.0.1</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Globalization.Calendars</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Globalization.Extensions</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Globalization</a></td><td>4.3.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">System.Diagnostics.DiagnosticSource</a></td><td>8.0.1</td><td>
+          <td><a href="https://dot.net/">System.IO.FileSystem.Primitives</a></td><td>4.3.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">System.Diagnostics.EventLog</a></td><td>8.0.0</td><td>
+          <td><a href="https://dot.net/">System.IO.FileSystem</a></td><td>4.3.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">System.Diagnostics.PerformanceCounter</a></td><td>8.0.0</td><td>
+          <td><a href="https://dot.net/">System.IO.Hashing</a></td><td>8.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">System.Formats.Asn1</a></td><td>8.0.1</td><td>
+          <td><a href="https://dot.net/">System.IO.Pipelines</a></td><td>8.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">System.IO.Hashing</a></td><td>8.0.0</td><td>
+          <td><a href="https://dot.net/">System.IO</a></td><td>4.3.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">System.IO.Pipelines</a></td><td>8.0.0</td><td>
+          <td><a href="https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet">System.IdentityModel.Tokens.Jwt</a></td><td>8.6.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
@@ -798,6 +1303,13 @@ <h1>Third-party software list</h1>
             </div>
           </td><td>Copyright (c) .NET Foundation and Contributors.</td>
         </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Linq</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
         <tr>
           <td><a href="https://github.com/dotnet/runtime">System.Management</a></td><td>5.0.0</td><td>
             <div>
@@ -826,6 +1338,20 @@ <h1>Third-party software list</h1>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Net.Http</a></td><td>4.3.4</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Net.Primitives</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
         <tr>
           <td><a href="https://dot.net/">System.Numerics.Vectors</a></td><td>4.4.0</td><td>
             <div>
@@ -833,6 +1359,13 @@ <h1>Third-party software list</h1>
             </div>
           </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
         </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Private.Uri</a></td><td>4.3.2</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
         <tr>
           <td><a href="https://github.com/dotnet/reactive">System.Reactive</a></td><td>6.0.1</td><td>
             <div>
@@ -841,26 +1374,47 @@ <h1>Third-party software list</h1>
           </td><td>Copyright (c) .NET Foundation and Contributors.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/dotnet/runtime">System.Reflection.Metadata</a></td><td>5.0.0</td><td>
+          <td><a href="https://dot.net/">System.Reflection.Metadata</a></td><td>7.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">System.Reflection.Metadata</a></td><td>7.0.0</td><td>
+          <td><a href="https://dot.net/">System.Reflection.Metadata</a></td><td>8.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://github.com/dotnet/runtime">System.Runtime.CompilerServices.Unsafe</a></td><td>5.0.0</td><td>
+          <td><a href="https://dot.net/">System.Reflection.Primitives</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/dotnet/corefx">System.Reflection.TypeExtensions</a></td><td>4.7.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Reflection</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Resources.ResourceManager</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
         <tr>
           <td><a href="https://dot.net/">System.Runtime.CompilerServices.Unsafe</a></td><td>6.0.0</td><td>
             <div>
@@ -869,19 +1423,40 @@ <h1>Third-party software list</h1>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">System.Runtime</a></td><td>4.3.1</td><td>
+          <td><a href="https://dot.net/">System.Runtime.Extensions</a></td><td>4.3.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Runtime.Handles</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Runtime.InteropServices</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">System.Security.AccessControl</a></td><td>4.4.0</td><td>
+          <td><a href="https://dot.net/">System.Runtime.Numerics</a></td><td>4.3.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
         </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Runtime</a></td><td>4.3.1</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
         <tr>
           <td><a href="https://github.com/dotnet/runtime">System.Security.AccessControl</a></td><td>5.0.0</td><td>
             <div>
@@ -889,6 +1464,41 @@ <h1>Third-party software list</h1>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Security.Cryptography.Algorithms</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Security.Cryptography.Cng</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Security.Cryptography.Csp</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Security.Cryptography.Encoding</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Security.Cryptography.OpenSsl</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
         <tr>
           <td><a href="https://dot.net/">System.Security.Cryptography.Pkcs</a></td><td>8.0.0</td><td>
             <div>
@@ -897,26 +1507,33 @@ <h1>Third-party software list</h1>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">System.Security.Cryptography.ProtectedData</a></td><td>8.0.0</td><td>
+          <td><a href="https://dot.net/">System.Security.Cryptography.Primitives</a></td><td>4.3.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">System.Security.Cryptography.Xml</a></td><td>8.0.0</td><td>
+          <td><a href="https://dot.net/">System.Security.Cryptography.ProtectedData</a></td><td>8.0.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">System.Security.Principal.Windows</a></td><td>4.4.0</td><td>
+          <td><a href="https://dot.net/">System.Security.Cryptography.X509Certificates</a></td><td>4.3.0</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
           </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
         </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Security.Cryptography.Xml</a></td><td>8.0.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
+        </tr>
         <tr>
           <td><a href="https://github.com/dotnet/runtime">System.Security.Principal.Windows</a></td><td>5.0.0</td><td>
             <div>
@@ -952,6 +1569,13 @@ <h1>Third-party software list</h1>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Text.Encoding</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
         <tr>
           <td><a href="https://dot.net/">System.Text.Encodings.Web</a></td><td>8.0.0</td><td>
             <div>
@@ -960,7 +1584,7 @@ <h1>Third-party software list</h1>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">System.Text.Json</a></td><td>8.0.4</td><td>
+          <td><a href="https://dot.net/">System.Text.Json</a></td><td>8.0.5</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
@@ -974,7 +1598,7 @@ <h1>Third-party software list</h1>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
         <tr>
-          <td><a href="https://dot.net/">System.Threading.Channels</a></td><td>8.0.0</td><td>
+          <td><a href="https://dot.net/">System.Threading.Channels</a></td><td>9.0.1</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
@@ -987,6 +1611,41 @@ <h1>Third-party software list</h1>
             </div>
           </td><td>&copy; Microsoft Corporation. All rights reserved.</td>
         </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Threading.Tasks</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Threading.Thread</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">System.Threading</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/TestableIO/System.IO.Abstractions">TestableIO.System.IO.Abstractions.Wrappers</a></td><td>21.0.22</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>Copyright &copy; Tatham Oddie &amp; friends 2010-2024</td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/TestableIO/System.IO.Abstractions">TestableIO.System.IO.Abstractions</a></td><td>21.0.22</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>Copyright &copy; Tatham Oddie &amp; friends 2010-2024</td>
+        </tr>
         <tr>
           <td><a href="https://clarius.org/ThisAssembly">ThisAssembly.Constants</a></td><td>1.4.1</td><td>
             <div>
@@ -999,14 +1658,14 @@ <h1>Third-party software list</h1>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Antoine Aubry and contributors</td>
+          </td><td></td>
         </tr>
         <tr>
           <td><a href="https://github.com/aaubry/YamlDotNet/wiki">YamlDotnet</a></td><td>13.7.1</td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Antoine Aubry and contributors</td>
+          </td><td></td>
         </tr>
         <tr>
           <td><a href="https://github.com/confluentinc/librdkafka">librdkafka.redist</a></td><td>2.5.0</td><td>
@@ -1015,12 +1674,117 @@ <h1>Third-party software list</h1>
             </div>
           </td><td>Copyright 2012-2023</td>
         </tr>
+        <tr>
+          <td><a href="https://dot.net/">runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl</a></td><td>4.3.2</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl</a></td><td>4.3.2</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl</a></td><td>4.3.2</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">runtime.native.System.Net.Http</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">runtime.native.System.Security.Cryptography.Apple</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">runtime.native.System.Security.Cryptography.OpenSsl</a></td><td>4.3.2</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">runtime.native.System</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl</a></td><td>4.3.2</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl</a></td><td>4.3.2</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple</a></td><td>4.3.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl</a></td><td>4.3.2</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl</a></td><td>4.3.2</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl</a></td><td>4.3.2</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl</a></td><td>4.3.2</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
+        <tr>
+          <td><a href="https://dot.net/">runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl</a></td><td>4.3.2</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td>&copy; Microsoft Corporation.  All rights reserved.</td>
+        </tr>
         <tr>
           <td><a href="">system.uritemplate</a></td><td></td><td>
             <div>
               <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
             </div>
-          </td><td>© Microsoft Corporation. All rights reserved.</td>
+          </td><td></td>
         </tr>
       </tbody>
     </table>
diff --git a/README.md b/README.md
index f6f1ffece56..ad5047299a0 100644
--- a/README.md
+++ b/README.md
@@ -1,112 +1,125 @@
-<a href="https://www.eventstore.com/"><img src="https://lh3.googleusercontent.com/G6tLxSbJvFodjR_FHrsXs5WOIls0VfuXkWgv60vbRB0WSuJoe-m1cADCsroUHQgJUQMcwp_HNKCLfiTWuCfVwlT607G8niENuGfq5DsnEmWUx_4Szx3GAWI6X1GKRA5iwv_loW0T75cWCAZsRZm3DL4" height=50% width=50% alt="EventStoreDB" /></a>
-
-EventStoreDB is the event-native database, where business events are immutably stored and streamed. Designed for event-sourced, event-driven, and microservices architectures
-
-- [What is EventStoreDB ](#what-is-eventstoredb)
-- [What is EventStore Cloud ](#what-is-event-store-cloud)
+<a href="https://kurrent.io">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="./KurrentLogo-White.png">
+    <source media="(prefers-color-scheme: light)" srcset="./KurrentLogo-Black.png">
+    <img alt="Kurrent" src="./KurrentLogo-Plum.png" height="50%" width="50%">
+  </picture>
+</a>
+
+- [What is Kurrent](#what-is-kurrent)
+- [What is KurrentDB](#what-is-kurrentdb)
+- [What is Kurrent Cloud](#what-is-kurrent-cloud)
 - [Licensing](#licensing)
 - [Documentation](#docs)
-- [Getting started with EventStoreDB ](#getting-started-with-eventstoredb)
-- [Getting started with EventStore Cloud ](#getting-started-with-eventstoredb)
+- [Getting started with KurrentDB](#getting-started-with-kurrentdb)
+- [Getting started with Kurrent Cloud](#getting-started-with-kurrent-cloud)
 - [Client libraries](#client-libraries)
 - [Deployment](#deployment)
 - [Communities](#communities)
 - [Contributing](#contributing)
-- [Building EventStoreDB](#building-eventstoredb)
-- [Need help?](#need-help)
+- [Building KurrentDB](#building-kurrentdb)
+- [More resources](#more-resources)
+
+## What is Kurrent
 
-## What is EventStoreDB
+Event Store – the company and the product – are rebranding as Kurrent.
 
-EventStoreDB is a new category of operational database that has evolved from the Event Sourcing community. Powered by the state-transition data model, events are stored with the context of why they have happened. Providing flexible, real-time data insights in the language your business understands.
+- The flagship product will be referred to as “the Kurrent event-native data platform” or “the Kurrent platform” or simply “Kurrent"
+- EventStoreDB will be referred to as KurrentDB
+- Event Store Cloud will now be called Kurrent Cloud
 
-<p align="center">
-  <a href='https://www.youtube.com/embed/IxPXizeHJM4'> <img src='https://user-images.githubusercontent.com/5140165/232470679-4716b5bb-0814-4bec-958f-0f20fc2b9586.png' width='75%'> </a>
-</p>
+Read more about the rebrand in the [rebrand FAQ](https://www.kurrent.io/blog/kurrent-re-brand-faq).
 
-Download the [latest version](https://www.eventstore.com/downloads).
-For more product information visit [the website](https://www.eventstore.com/eventstoredb).
+## What is KurrentDB
 
-## What is Event Store Cloud?
+KurrentDB is a database that's engineered for modern software applications and event-driven architectures. Its event-native design simplifies data modeling and preserves data integrity while the integrated streaming engine solves distributed messaging challenges and ensures data consistency.
 
-Event Store Cloud is a fully managed cloud offering that's designed to make it easy for developers to build and run highly available and secure applications that incorporate EventStoreDB without having to worry about managing the underlying infrastructure. You can provision EventStoreDB clusters in AWS, Azure, and GCP, and connect these services securely to your own cloud resources.
+Download the [latest version](https://kurrent.io/downloads).
+For more product information visit [the website](https://kurrent.io/kurrent).
 
-For more details visit [the website](https://www.eventstore.com/event-store-cloud).
+## What is Kurrent Cloud?
+
+ Kurrent Cloud is a fully managed cloud offering that's designed to make it easy for developers to build and run highly available and secure applications that incorporate KurrentDB without having to worry about managing the underlying infrastructure. You can provision KurrentDB clusters in AWS, Azure, and GCP, and connect these services securely to your own cloud resources.
+
+For more details visit [the website](https://kurrent.io/kurrent-cloud).
 
 ## Licensing
 
-View [Event Store Ltd's licensing information](https://github.com/EventStore/EventStore/blob/master/LICENSE.md).
+View [KurrentDB's licensing information](https://github.com/kurrent-io/KurrentDB/blob/master/LICENSE.md).
 
 ## Docs
 
-For guidance on installation, development, deployment, and administration, see the [User Documentation](https://developers.eventstore.com/).
+For guidance on installation, development, deployment, and administration, see the [User Documentation](https://docs.kurrent.io/).
 
-## Getting started with EventStoreDB
+## Getting started with KurrentDB
 
-Follow the [getting started guide](https://developers.eventstore.com/latest.html).
+Follow the [getting started guide](https://docs.kurrent.io/latest.html).
 
-## Getting started with Event Store Cloud
+## Getting started with Kurrent Cloud
 
-Event Store can manage EventStoreDB for you, so you don't have to run your own clusters.
-See the online documentation: [Getting started with Event Store Cloud](https://developers.eventstore.com/cloud/).
+Kurrent can manage KurrentDB for you, so you don't have to run your own clusters.
+See the online documentation: [Getting started with Kurrent Cloud](https://docs.kurrent.io/cloud/).
 
 ## Client libraries
 
-This guide shows you how to get started with EventStoreDB by setting up an instance or cluster and configuring it.
-EventStoreDB supports two protocols: gRPC and TCP(legacy).
+[This guide](https://docs.kurrent.io/clients/grpc/getting-started.html) shows you how to get started with KurrentDB by setting up an instance or cluster and configuring it.
+KurrentDB supports the gRPC protocol.
 
-EventStoreDB supported gRPC clients
+### KurrentDB supported clients
 
 - Python: [pyeventsourcing/esdbclient](https://pypi.org/project/esdbclient/)
-- Node.js (javascript/typescript): [EventStore/EventStore-Client-NodeJS](https://github.com/EventStore/EventStore-Client-NodeJS)
-- Java: [(EventStore/EventStoreDB-Client-Java](https://github.com/EventStore/EventStoreDB-Client-Java)
-- .NET: [EventStore/EventStore-Client-Dotnet](https://github.com/EventStore/EventStore-Client-Dotnet)
-- Go: [EventStore/EventStore-Client-Go](https://github.com/EventStore/EventStore-Client-Go)
-- Rust: [EventStore/EventStoreDB-Client-Rust](https://github.com/EventStore/EventStoreDB-Client-Rust)
-- Read more in the [gRPC clients documentation](https://developers.eventstore.com/clients/grpc)
+- Node.js (javascript/typescript): [kurrent-io/KurrentDB-Client-NodeJS](https://github.com/kurrent-io/KurrentDB-Client-NodeJS)
+- Java: [(kurrent-io/KurrentDB-Client-Java](https://github.com/kurrent-io/KurrentDB-Client-Java)
+- .NET: [kurrent-io/EventStore-Client-Dotnet](https://github.com/kurrent-io/EventStore-Client-Dotnet)
+- Go: [kurrent-io/KurrentDB-Client-Go](https://github.com/kurrent-io/KurrentDB-Client-Go)
+- Rust: [kurrent-io/KurrentDB-Client-Rust](https://github.com/kurrent-io/KurrentDB-Client-Rust)
+- Read more in the [gRPC clients documentation](https://docs.kurrent.io/clients/grpc)
 
-Community supported gRPC clients
+### Community supported clients
 
 - Elixir: [NFIBrokerage/spear](https://github.com/NFIBrokerage/spear)
 - Ruby: [yousty/event_store_client](https://github.com/yousty/event_store_client)
 
-Read more in the [documentation](https://developers.eventstore.com/server/v22.10/#protocols-clients-and-sdks).
+Read more in the [documentation](https://docs.kurrent.io/server/latest/quick-start/#protocols-clients-and-sdks).
 
-Legacy TCP Clients (support ends with 23.10 LTS)
+### Legacy clients (support ends with EventStoreDB v23.10 LTS)
 
-- .Net: [EventStoreDB-Client-Dotnet-Legacy](https://github.com/EventStore/EventStoreDB-Client-Dotnet-Legacy)
+- .NET: [EventStoreDB-Client-Dotnet-Legacy](https://github.com/kurrent-io/EventStoreDB-Client-Dotnet-Legacy)
 
 ## Deployment
 
-- Event Store Cloud - [steps to get started in Cloud](https://developers.eventstore.com/cloud/).
-- Self-managed - [steps to host EventStoreDB yourself](https://developers.eventstore.com/server/v22.10/#getting-started).
+- Kurrent Cloud - [steps to get started in Kurrent Cloud](https://docs.kurrent.io/cloud/).
+- Self-managed - [steps to host KurrentDB yourself](https://docs.kurrent.io/latest/quick-start/installation).
 
 ## Communities
 
-- [Discuss](https://discuss.eventstore.com/)
-- [Discord (Event Store)](https://discord.gg/Phn9pmCw3t)
+[Join our global community](https://www.kurrent.io/community) of developers.
+
+- [Discuss](https://discuss.kurrent.io/)
+- [Discord (Kurrent)](https://discord.gg/Phn9pmCw3t)
 - [Discord (ddd-cqrs-es)](https://discord.com/invite/sEZGSHNNbH)
 
 ## Contributing
 
 Development is done on the `master` branch.
-We attempt to do our best to ensure that the history remains clean and to do so, we generally ask contributors to squash their commits into a set or single logical commit.
+We attempt to do our best to ensure that the history remains clean and to do so, commits are automatically squashed into a single logical commit when pull requests are merged.
 
-If you want to switch to a particular release, you can check out the release branch for that particular release. For example:  
-`git checkout release/oss-v22.10`
+If you want to switch to a particular release, you can check out the release branch for that particular release. For example:
+`git checkout release/v25.0`
 
-- [Create an issue](https://github.com/EventStore/EventStore/issues)
-- [Documentation](https://developers.eventstore.com/)
-- [Contributing guide](https://github.com/EventStore/EventStore/blob/master/CONTRIBUTING.md)
+- [Create an issue](https://github.com/kurrent-io/KurrentDB/issues)
+- [Documentation](https://docs.kurrent.io/)
+- [Contributing guide](CONTRIBUTING.md)
 
-## Building EventStoreDB
+## Building KurrentDB
 
-EventStoreDB is written in a mixture of C# and JavaScript. It can run on Windows, Linux and macOS (using Docker) using the .NET Core runtime.
+KurrentDB is written in a mixture of C# and JavaScript. It can run on Windows, Linux and macOS (using Docker) using the .NET Core runtime.
 
 **Prerequisites**
 
-- [.NET Core SDK 8.0](https://dotnet.microsoft.com/download/dotnet/8.0)
+- [.NET SDK 8.0](https://dotnet.microsoft.com/download/dotnet/8.0)
 
-Once you've installed the prerequisites for your system, you can launch a `Release` build of EventStore as follows:
+Once you've installed the prerequisites for your system, you can launch a `Release` build of KurrentDB as follows:
 
 ```
 dotnet build -c Release src
@@ -117,7 +130,7 @@ The build scripts: `build.sh` and `build.ps1` are also available for Linux and W
 To start a single node, you can then run:
 
 ```
-dotnet ./src/EventStore.ClusterNode/bin/x64/Release/net8.0/EventStore.ClusterNode.dll --dev --db ./tmp/data --index ./tmp/index --log ./tmp/log
+dotnet ./src/KurrentDB/bin/Release/net8.0/KurrentDB.dll --dev --db ./tmp/data --index ./tmp/index --log ./tmp/log
 ```
 
 ### Running the tests
@@ -125,15 +138,15 @@ dotnet ./src/EventStore.ClusterNode/bin/x64/Release/net8.0/EventStore.ClusterNod
 You can launch the tests as follows:
 
 ```
-dotnet test src/EventStore.sln
+dotnet test src/KurrentDB.sln
 ```
 
-### Build EventStoreDB Docker image
+### Build KurrentDB Docker image
 
 You can also build a Docker image by running the command:
 
 ```
-docker build --tag myeventstore . \
+docker build --tag mykurrentdb . \
 --build-arg CONTAINER_RUNTIME={container-runtime}
 --build-arg RUNTIME={runtime}
 ```
@@ -141,7 +154,7 @@ docker build --tag myeventstore . \
 For instance:
 
 ```
-docker build --tag myeventstore . \
+docker build --tag mykurrentdb . \
 --build-arg CONTAINER_RUNTIME=bookworm-slim \
 --build-arg RUNTIME=linux-x64
 ```
@@ -149,7 +162,7 @@ docker build --tag myeventstore . \
 **_Note:_** Because of the [Docker issue](https://github.com/moby/buildkit/issues/1900), if you're building a Docker image on Windows, you may need to set the `DOCKER_BUILDKIT=0` environment variable. For instance, running in PowerShell:
 
 ```
-$env:DOCKER_BUILDKIT=0; docker build --tag myeventstore . `
+$env:DOCKER_BUILDKIT=0; docker build --tag mykurrentdb . `
 --build-arg CONTAINER_RUNTIME=bookworm-slim `
 --build-arg RUNTIME=linux-x64
 ```
@@ -174,13 +187,13 @@ Currently, we support the following configurations:
 You can verify the built image by running:
 
 ```
-docker run --rm myeventstore --insecure --what-if
+docker run --rm mykurrentdb --insecure --what-if
 ```
 
-## Need help?
+## More resources
 
-- [Release notes ](https://www.eventstore.com/blog/release-notes)
-- [Beginners Guide to Event Sourcing](https://www.eventstore.com/event-sourcing)
-- [Articles](https://www.eventstore.com/blog)
-- [Webinars ](https://www.eventstore.com/webinars)
-- [Contact us](https://www.eventstore.com/contact)
+- [Release notes](https://docs.kurrent.io/server/latest/release-schedule/release-notes.html)
+- [Beginners Guide to Event Sourcing](https://kurrent.io/event-sourcing)
+- [Articles](https://kurrent.io/blog)
+- [Webinars](https://kurrent.io/webinars)
+- [Contact us](https://kurrent.io/contact)
diff --git a/SECURITY.md b/SECURITY.md
index 27237b3b2b3..5bd160867ea 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,3 +1,3 @@
 If you find a vulnerability in our software, please contact us.
-You can find how to reach out us and report it at https://www.eventstore.com/security#security
+You can find how to reach out us and report it at https://www.kurrent.io/security#security
 Thank you very much for supporting our software.
diff --git a/build.cmd b/build.cmd
index 75284ca55d0..1054e205086 100644
--- a/build.cmd
+++ b/build.cmd
@@ -12,8 +12,7 @@ exit /B %errorlevel%
 :help
 
 echo Usage:
-echo build.cmd ^[-Version=0.0.0.0^] ^[-Configuration=Debug^|Release^] ^[-BuildUI=yes^|no^]
+echo build.cmd ^[-Version=0.0.0.0^] ^[-Configuration=Debug^|Release^]
 echo.
 echo Prerequisites:
-echo Building EventStore database requires .NET Core SDK 5.0.4
-echo Building the UI requires Node.js (v8.11.4+)
+echo Building KurrentDB database requires .NET Core SDK 8.0
diff --git a/build.ps1 b/build.ps1
index fdc5234cafc..41eb7a5a5c8 100644
--- a/build.ps1
+++ b/build.ps1
@@ -5,9 +5,6 @@ Param(
     [Parameter(HelpMessage="Configuration (Debug, Release)")]
     [ValidateSet("Debug","Release")]
     [string]$Configuration = "Release",
-    [Parameter(HelpMessage="Build UI (yes,no)")]
-    [ValidateSet("yes","no")]
-    [string]$BuildUI = "no",
     [Parameter(HelpMessage="Run Tests (yes,no)")]
     [ValidateSet("yes","no")]
     [string]$RunTests = "no"
@@ -45,11 +42,7 @@ Function Start-Build{
     $baseDirectory = $PSScriptRoot
     $srcDirectory = Join-Path $baseDirectory "src"
     $binDirectory = Join-Path $baseDirectory "bin"
-    $libsDirectory = Join-Path $srcDirectory "libs"
-    $eventStoreSolution = Join-Path $srcDirectory "EventStore.sln"
-
-    $uiSrcDirectory = Join-Path $srcDirectory "EventStore.UI\"
-    $uiDistDirectory = Join-Path $srcDirectory "EventStore.ClusterNode.Web\clusternode-web\"
+    $kurrentDbSolution = Join-Path $srcDirectory "KurrentDB.sln"
 
     Write-Info "Build Configuration"
     Write-Info "-------------------"
@@ -57,34 +50,14 @@ Function Start-Build{
     Write-Info "Version: $Version"
     Write-Info "Platform: $platform"
     Write-Info "Configuration: $Configuration"
-    Write-Info "Build UI: $BuildUI"
     Write-Info "Run Tests: $RunTests"
 
-    #Build Event Store UI
-    if ($BuildUI -eq "yes") {
-        #Build the UI    
-        if (Test-Path $uiDistDirectory) {
-            Remove-Item -Recurse -Force $uiDistDirectory
-        }
-        Push-Location $uiSrcDirectory
-            if(-Not (Test-Path (Join-Path $uiSrcDirectory "package.json"))) {
-                Exec { git submodule update --init ./ }
-            }
-            Exec { npm install bower@~1.8.14 -g }
-            Exec { bower install --allow-root }
-            Exec { npm install gulp-cli -g }
-            Exec { npm install }
-            Exec { gulp dist }
-            Exec { mv es-dist $uiDistDirectory }
-        Pop-Location
-    }
-
-    #Build Event Store (Patch AssemblyInfo, Build, Revert AssemblyInfo)
+    #Build KurrentDB (Patch AssemblyInfo, Build, Revert AssemblyInfo)
     Remove-Item -Force -Recurse $binDirectory -ErrorAction SilentlyContinue > $null
 
-    $versionInfoFile = Resolve-Path (Join-Path $srcDirectory (Join-Path "EventStore.Common" (Join-Path "Utils" "VersionInfo.cs"))) -Relative
+    $versionInfoFile = Resolve-Path (Join-Path $srcDirectory (Join-Path "KurrentDB.Common" (Join-Path "Utils" "VersionInfo.cs"))) -Relative
     try {
-        Exec { dotnet build -c $configuration /p:Version=$Version /p:Platform=x64 $eventStoreSolution }
+        Exec { dotnet build -c $configuration /p:Version=$Version /p:Platform=x64 $kurrentDbSolution }
     } finally {
         Write-Info "Reverting $versionInfoFile to original state."
         & { git checkout --quiet $versionInfoFile }
diff --git a/build.sh b/build.sh
index 163c7f4ab63..ba5e4eb3beb 100755
--- a/build.sh
+++ b/build.sh
@@ -1,28 +1,25 @@
 #!/usr/bin/env bash
 
 BASE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-PRODUCTNAME="Event Store Open Source"
-COMPANYNAME="Event Store Ltd"
-COPYRIGHT="Copyright 2021 Event Store Ltd. All rights reserved."
+PRODUCTNAME="KurrentDB"
+COMPANYNAME="Kurrent, Inc"
+COPYRIGHT="Copyright 2025 Kurrent, Inc. All rights reserved."
 
 
 # ------------ End of configuration -------------
 
 CONFIGURATION="Release"
-BUILD_UI="no"
 NET_FRAMEWORK="net8.0"
 
 function usage() {    
 cat <<EOF
 Usage:
-  $0 [<version=0.0.0.0>] [<configuration=Debug|Release>] [<build_ui=yes|no>]
+  $0 [<version=0.0.0.0>] [<configuration=Debug|Release>]
 
-version: EventStore build version. Versions must be complete four part identifiers valid for use on a .NET assembly.
+version: KurrentDB build version. Versions must be complete four part identifiers valid for use on a .NET assembly.
 
 configuration: Build configuration. Valid configurations are: Debug, Release
 
-build_ui: Whether or not to build the EventStore UI. Building the UI requires an installation of Node.js (v8.11.4+)
-
 EOF
     exit 1
 }
@@ -49,9 +46,8 @@ function checkParams() {
 
     version=$1
     configuration=$2
-    build_ui=$3
 
-    [[ $# -gt 3 ]] && usage
+    [[ $# -gt 2 ]] && usage
 
     if [[ "$version" == "" ]] ; then
         VERSIONSTRING="0.0.0.0"
@@ -73,19 +69,6 @@ function checkParams() {
             usage
         fi
     fi
-
-    if [[ "$build_ui" == "" ]]; then
-        BUILD_UI="no"
-        echo "Build UI defaulted to: $BUILD_UI"
-    else
-        if [[ "$build_ui" == "yes" || "$build_ui" == "no" ]]; then
-            BUILD_UI=$build_ui
-            echo "Build UI set to: $BUILD_UI"
-        else
-            echo "Invalid Build UI value: $build_ui"
-            usage
-        fi
-    fi
 }
 
 function revertVersionInfo() {
@@ -135,32 +118,10 @@ function patchVersionInfo {
     done
 }
 
-function buildUI {
-    if [[ "$BUILD_UI" != "yes" ]] ; then
-        echo "Skipping UI Build"
-        return
-    fi
-
-    rm -rf src/EventStore.ClusterNode.Web/clusternode-web/
-    pushd src/EventStore.UI
-
-    if [ ! -f ./package.json ]; then
-        git submodule update --init ./
-    fi
-
-    npm install bower@~1.8.14 -g
-    bower install --allow-root
-    npm install gulp-cli -g
-    npm install
-    gulp dist
-    mv es-dist ../EventStore.ClusterNode.Web/clusternode-web/
-    popd
-}
-
-function buildEventStore {
+function buildKurrentDB {
     patchVersionInfo
     rm -rf bin/
-    dotnet build -c $CONFIGURATION /p:Platform=x64 /p:Version=$VERSIONSTRING --framework=$NET_FRAMEWORK src/EventStore.sln || err
+    dotnet build -c $CONFIGURATION /p:Platform=x64 /p:Version=$VERSIONSTRING --framework=$NET_FRAMEWORK src/KurrentDB.sln || err
     revertVersionInfo
 }
 
@@ -170,8 +131,7 @@ function exitWithError {
 }
 
 detectOS
-checkParams "$1" "$2" "$3"
+checkParams "$1" "$2"
 
 echo "Running from base directory: $BASE_DIR"
-buildUI
-buildEventStore
+buildKurrentDB
diff --git a/ci/README.md b/ci/README.md
deleted file mode 100644
index 13024280cfa..00000000000
--- a/ci/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# CI scripts
-This directory contains scripts used by our CI pipeline
-
-## Docker images
-The following docker image repositories are used for linux builds:  
-CentOS builds: https://github.com/EventStore/eventstore-ci-centos7  
-Ubuntu builds: https://github.com/EventStore/eventstore-ci-ubuntu-14.04  
-
-These images are hosted at https://hub.docker.com/r/eventstore/
\ No newline at end of file
diff --git a/ci/ap-build-linux.sh b/ci/ap-build-linux.sh
deleted file mode 100755
index a5761f64a14..00000000000
--- a/ci/ap-build-linux.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set -o errexit
-set -o pipefail
-set -o xtrace
-
-dotnet build -c $EventStoreBuildConfig src/EventStore.sln
\ No newline at end of file
diff --git a/ci/ap-setup-osx.sh b/ci/ap-setup-osx.sh
deleted file mode 100755
index b667bb8753c..00000000000
--- a/ci/ap-setup-osx.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-set -o errexit
-set -o pipefail
-set -o xtrace
-
-# Install Mono
-curl https://download.mono-project.com/archive/5.16.0/macos-10-universal/MonoFramework-MDK-5.16.0.220.macos10.xamarin.universal.pkg -o mono.pkg
-sudo installer -store -pkg mono.pkg -target /
-
-# Print the versions of mono and dotnet which are on PATH
-mono --version
-dotnet --version
-
-# Ensure the "first run experience" isn't co-mingled with build output but does get
-# run. It appears that if it is _not_ run, builds fail.
-cd "${TMPDIR}" && dotnet new
\ No newline at end of file
diff --git a/ci/ap-test-linux.sh b/ci/ap-test-linux.sh
deleted file mode 100755
index df640d3d3bb..00000000000
--- a/ci/ap-test-linux.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set -o errexit
-set -o pipefail
-set -o xtrace
-
-find ./src -maxdepth 1 -type d -name '*.Tests' -print0| xargs -0 -n1 dotnet test -v normal -c $EventStoreBuildConfig --logger trx
\ No newline at end of file
diff --git a/ci/ci.runsettings b/ci/ci.runsettings
index 01ecc95a28a..7bc9c1c6fc7 100644
--- a/ci/ci.runsettings
+++ b/ci/ci.runsettings
@@ -6,6 +6,6 @@
 		<AssemblySelectLimit>2147483647</AssemblySelectLimit>
 	</NUnit>
 	<RunConfiguration>
-		<TestCaseFilter>FullyQualifiedName!~EventStore.Core.Tests.LogFormat+V3</TestCaseFilter>
+		<TestCaseFilter>(FullyQualifiedName!~EventStore.Core.Tests.LogFormat+V3) &amp; (FullyQualifiedName!~KurrentDB.Core.Tests.LogFormat+V3)</TestCaseFilter>
 	</RunConfiguration>
 </RunSettings>
diff --git a/docker-compose.yml b/docker-compose.yml
index a80c992566c..8c9c7ca3608 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,74 +24,83 @@ services:
       - volumes-provisioner
 
   esdb-node1:
-    build: ./
+    build: 
+      context: .
+      args:
+        RUNTIME: ${RUNTIME}
     env_file:
       - shared.env
     environment:
-      - EVENTSTORE_GOSSIP_SEED=172.30.240.12:2113,172.30.240.13:2113
-      - EVENTSTORE_INT_IP=172.30.240.11
-      - EVENTSTORE_CERTIFICATE_FILE=/etc/eventstore/certs/node1/node.crt
-      - EVENTSTORE_CERTIFICATE_PRIVATE_KEY_FILE=/etc/eventstore/certs/node1/node.key
-      - EVENTSTORE_ADVERTISE_HOST_TO_CLIENT_AS=127.0.0.1
-      - EVENTSTORE_ADVERTISE_HTTP_PORT_TO_CLIENT_AS=2111
+      - KURRENTDB_GOSSIP_SEED=172.30.240.12:2113,172.30.240.13:2113
+      - KURRENTDB_REPLICATION_IP=172.30.240.11
+      - KURRENTDB_CERTIFICATE_FILE=/etc/kurrentdb/certs/node1/node.crt
+      - KURRENTDB_CERTIFICATE_PRIVATE_KEY_FILE=/etc/kurrentdb/certs/node1/node.key
+      - KURRENTDB_ADVERTISE_HOST_TO_CLIENT_AS=127.0.0.1
+      - KURRENTDB_ADVERTISE_NODE_PORT_TO_CLIENT_AS=2111
     ports:
       - 2111:2113
     networks:
       clusternetwork:
         ipv4_address: 172.30.240.11
     volumes:
-      - ./certs:/etc/eventstore/certs
+      - ./certs:/etc/kurrentdb/certs
     restart: unless-stopped
     depends_on:
       - cert-gen
 
   esdb-node2:
-    build: ./
+    build: 
+      context: .
+      args:
+        RUNTIME: ${RUNTIME}
     env_file:
       - shared.env
     environment:
-      - EVENTSTORE_GOSSIP_SEED=172.30.240.11:2113,172.30.240.13:2113
-      - EVENTSTORE_INT_IP=172.30.240.12
-      - EVENTSTORE_CERTIFICATE_FILE=/etc/eventstore/certs/node2/node.crt
-      - EVENTSTORE_CERTIFICATE_PRIVATE_KEY_FILE=/etc/eventstore/certs/node2/node.key
-      - EVENTSTORE_ADVERTISE_HOST_TO_CLIENT_AS=127.0.0.1
-      - EVENTSTORE_ADVERTISE_HTTP_PORT_TO_CLIENT_AS=2112
+      - KURRENTDB_GOSSIP_SEED=172.30.240.11:2113,172.30.240.13:2113
+      - KURRENTDB_REPLICATION_IP=172.30.240.12
+      - KURRENTDB_CERTIFICATE_FILE=/etc/kurrentdb/certs/node2/node.crt
+      - KURRENTDB_CERTIFICATE_PRIVATE_KEY_FILE=/etc/kurrentdb/certs/node2/node.key
+      - KURRENTDB_ADVERTISE_HOST_TO_CLIENT_AS=127.0.0.1
+      - KURRENTDB_ADVERTISE_NODE_PORT_TO_CLIENT_AS=2112
     ports:
       - 2112:2113
     networks:
       clusternetwork:
         ipv4_address: 172.30.240.12
     volumes:
-      - ./certs:/etc/eventstore/certs
+      - ./certs:/etc/kurrentdb/certs
     restart: unless-stopped
     depends_on:
       - cert-gen
 
   esdb-node3:
-    build: ./
+    build: 
+      context: .
+      args:
+        RUNTIME: ${RUNTIME}
     env_file:
       - shared.env
     environment:
-      - EVENTSTORE_GOSSIP_SEED=172.30.240.11:2113,172.30.240.12:2113
-      - EVENTSTORE_INT_IP=172.30.240.13
-      - EVENTSTORE_CERTIFICATE_FILE=/etc/eventstore/certs/node3/node.crt
-      - EVENTSTORE_CERTIFICATE_PRIVATE_KEY_FILE=/etc/eventstore/certs/node3/node.key
-      - EVENTSTORE_ADVERTISE_HOST_TO_CLIENT_AS=127.0.0.1
-      - EVENTSTORE_ADVERTISE_HTTP_PORT_TO_CLIENT_AS=2113
+      - KURRENTDB_GOSSIP_SEED=172.30.240.11:2113,172.30.240.12:2113
+      - KURRENTDB_REPLICATION_IP=172.30.240.13
+      - KURRENTDB_CERTIFICATE_FILE=/etc/kurrentdb/certs/node3/node.crt
+      - KURRENTDB_CERTIFICATE_PRIVATE_KEY_FILE=/etc/kurrentdb/certs/node3/node.key
+      - KURRENTDB_ADVERTISE_HOST_TO_CLIENT_AS=127.0.0.1
+      - KURRENTDB_ADVERTISE_NODE_PORT_TO_CLIENT_AS=2113
     ports:
       - 2113:2113
     networks:
       clusternetwork:
         ipv4_address: 172.30.240.13
     volumes:
-      - ./certs:/etc/eventstore/certs
+      - ./certs:/etc/kurrentdb/certs
     restart: unless-stopped
     depends_on:
       - cert-gen
 
 networks:
   clusternetwork:
-    name: eventstoredb.local
+    name: kurrentdb.local
     driver: bridge
     ipam:
       driver: default
diff --git a/docker/build.sh b/docker/build.sh
new file mode 100755
index 00000000000..e8d058e800b
--- /dev/null
+++ b/docker/build.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env sh
+
+set -e
+set -x
+
+source_directory=$1
+output_directory=$2
+
+tests=$(find "$source_directory" -maxdepth 1 -type d -name "*.Tests")
+
+# Publish tests
+for test in $tests; do
+    echo Publishing tests for $test
+
+    dotnet publish \
+      --runtime="$RUNTIME" \
+      --no-self-contained \
+      --configuration Release \
+      --output "$output_directory/$(basename "$test")" \
+      "$test"
+done
+
+cp "$source_directory"/*.sln "$output_directory"
diff --git a/docker/test.sh b/docker/test.sh
new file mode 100755
index 00000000000..bf568e03d7e
--- /dev/null
+++ b/docker/test.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env sh
+set -e
+
+tests_directory=/build/published-tests
+settings=/build/ci/ci.runsettings
+output_directory=/build/test-results
+
+tests=$(find "$tests_directory" -maxdepth 1 -type d -name "*.Tests")
+
+for test in $tests; do
+    proj=$(basename "$test")
+
+    dotnet test \
+      --blame \
+      --blame-hang-timeout 5min \
+      --settings "$settings" \
+      --logger:"GitHubActions;report-warnings=false" \
+      --logger:html \
+      --logger:trx \
+      --logger:"console;verbosity=normal" \
+      --results-directory "$output_directory/$proj" "$test/$proj.dll"
+
+    html_files=$(find "$output_directory/$proj" -name "*.html")
+
+    for html in $html_files; do
+      cat "$html" > "$output_directory/test-results.html"
+    done
+done
diff --git a/docs/.eslintignore b/docs/.eslintignore
new file mode 100644
index 00000000000..f4e822b6f58
--- /dev/null
+++ b/docs/.eslintignore
@@ -0,0 +1,6 @@
+!.vuepress/
+!.*.js
+.cache/
+.temp/
+node_modules/
+dist/
\ No newline at end of file
diff --git a/docs/.eslintrc.cjs b/docs/.eslintrc.cjs
new file mode 100644
index 00000000000..92de49d892a
--- /dev/null
+++ b/docs/.eslintrc.cjs
@@ -0,0 +1,13 @@
+module.exports = {
+    root: true,
+    extends: 'vuepress',
+    overrides: [
+        {
+            files: ['*.ts', '*.vue'],
+            extends: 'vuepress-typescript',
+            parserOptions: {
+                project: ['tsconfig.json'],
+            },
+        },
+    ],
+}
\ No newline at end of file
diff --git a/docs/.node-version b/docs/.node-version
new file mode 100644
index 00000000000..2edeafb09db
--- /dev/null
+++ b/docs/.node-version
@@ -0,0 +1 @@
+20
\ No newline at end of file
diff --git a/docs/.vuepress/client.ts b/docs/.vuepress/client.ts
new file mode 100644
index 00000000000..3c187a0c265
--- /dev/null
+++ b/docs/.vuepress/client.ts
@@ -0,0 +1,18 @@
+import type {Router} from "vue-router";
+import {defineClientConfig} from 'vuepress/client';
+import CloudBanner from "./components/CloudBanner.vue";
+
+interface ClientConfig {
+    enhance?: (context: {
+        app: any;
+        router: Router;
+        siteData: any;
+    }) => void | Promise<void>;
+    setup?: () => void;
+}
+
+export default defineClientConfig({
+    enhance({app, router, siteData}) {
+        app.component("CloudBanner", CloudBanner);
+    }
+} satisfies ClientConfig);
\ No newline at end of file
diff --git a/docs/.vuepress/components/CloudBanner.vue b/docs/.vuepress/components/CloudBanner.vue
new file mode 100644
index 00000000000..87053f9303a
--- /dev/null
+++ b/docs/.vuepress/components/CloudBanner.vue
@@ -0,0 +1,17 @@
+<template>
+  <VPBanner
+      title="Kurrent Cloud"
+      content="Spin up a managed instance of EventStoreDB and start building in minutes. Available in AWS, Azure or GCP."
+      logo="/cloud.png"
+      :actions='[
+    {
+        text: "Sign up for free",
+        link:"https://www.kurrent.io/kurrent-cloud",
+    },
+    {
+        text: "Documentation",
+        link: "/cloud/introduction.html",
+        type: "default",
+    },]'
+  />
+</template>
\ No newline at end of file
diff --git a/docs/.vuepress/config.ts b/docs/.vuepress/config.ts
index 85fe5bd6a0e..55bc1a1f139 100644
--- a/docs/.vuepress/config.ts
+++ b/docs/.vuepress/config.ts
@@ -1,19 +1,22 @@
+import { dl } from "@mdit/plugin-dl";
+import viteBundler from "@vuepress/bundler-vite";
+import vueDevTools from 'vite-plugin-vue-devtools'
 import {defineUserConfig} from "vuepress";
-import containers from "./lib/containers";
-import {importCodePlugin} from "./markdown/xode/importCodePlugin";
+import {fs} from "vuepress/utils";
+import {hopeTheme} from "vuepress-theme-hope";
 import {resolveMultiSamplesPath} from "./lib/samples";
 import {linkCheckPlugin} from "./markdown/linkCheck";
 import {replaceLinkPlugin} from "./markdown/replaceLink";
-import viteBundler from "@vuepress/bundler-vite";
-import {defaultTheme} from "@vuepress/theme-default";
-import {containerPlugin} from "@vuepress/plugin-container";
+import {importCodePlugin} from "./markdown/xode/importCodePlugin";
 
 const projectionSamplesPath = "https://raw.githubusercontent.com/EventStore/EventStore/53f84e55ea56ccfb981aff0e432581d72c23fbf6/samples/http-api/data/";
 
 export default defineUserConfig({
-    title: "EventStoreDB Documentation",
-    description: "The stream database built for Event Sourcing",
-    bundler: viteBundler(),
+    base: "/",
+    dest: "public",
+    title: "KurrentDB Docs",
+    description: "Event-native database",
+    bundler: viteBundler({viteOptions: {plugins: [vueDevTools(),],}}),
     markdown: {importCode: false},
     extendsMarkdown: md => {
         md.use(importCodePlugin, {
@@ -22,43 +25,60 @@ export default defineUserConfig({
         md.use(linkCheckPlugin);
         md.use(replaceLinkPlugin, {
             replaceLink: (link: string, _) => link
-                .replace("@server", "")
+                .replace("@server", "/server")
                 .replace("@clients/http-api/", "/http-api/")
                 .replace("@clients/httpapi/", "/http-api/")
                 .replace("@httpapi/data/", projectionSamplesPath)
                 .replace("@httpapi", "/http-api")
         });
+        md.use(dl);
     },
-    theme: defaultTheme({
-        sidebarDepth: 2,
+    theme: hopeTheme({
+        logo: "/eventstore-dev-logo-dark.svg",
+        logoDark: "/eventstore-logo-alt.svg",
         docsDir: ".",
+        toc: true,
         sidebar: {
-            "/": require("../sidebar"),
-            "/http-api/": require("../http-api/sidebar")
+            "/server/": "structure",
+            "/http-api/": "structure"
         },
         navbar: [
             {
                 text: "Server",
-                link: "/",
+                link: "/server/quick-start/",
             },
             {
                 text: "HTTP API",
                 link: "/http-api/"
             }
-        ]
+        ],
+        markdown: {
+            figure: true,
+            imgLazyload: true,
+            imgMark: true,
+            imgSize: true,
+            tabs: true,
+            codeTabs: true,
+            component: true,
+            mermaid: true,
+            highlighter: {
+                type: "shiki",
+                themes: {
+                    light: "one-light",
+                    dark: "one-dark-pro",
+                }
+            }
+        },
+        plugins: {
+            search: {},
+            sitemap:{
+                devServer: process.env.NODE_ENV === 'development',
+                modifyTimeGetter: (page, app) =>
+                    fs.statSync(app.dir.source(page.filePathRelative!)).mtime.toISOString()
+            },
+            components: {
+                components: ["Badge", "VPBanner", "VPCard", "VidStack"]
+            },
+        }
     }),
-    plugins: [
-        containers("tabs", "TabView", type => `${type ? ` type='${type}'` : ""}`),
-        containers("tab", "TabPanel", label => `header="${label}"`),
-        containerPlugin( {
-            type: "note",
-            before: title => `<div class="custom-container note"><p class="custom-container-title">${title === "" ? "NOTE" : title}</p>`,
-            after: _ => `</div>`
-        }),
-        containerPlugin ({
-            type: "card",
-            before: _ => `<Card><template #content>`,
-            after: _ => `</template></Card>`
-        }),
-    ],
 });
diff --git a/docs/.vuepress/lib/containers.ts b/docs/.vuepress/lib/containers.ts
deleted file mode 100644
index 131487df955..00000000000
--- a/docs/.vuepress/lib/containers.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import {containerPlugin} from "@vuepress/plugin-container";
-import type {Plugin} from "vuepress";
-
-type getAttr = (t: string) => string;
-
-export default function (name: string, tag: string, attr: getAttr): Plugin {
-    return containerPlugin(
-        {
-            type: name,
-            before: x => `<${tag}${attr ? " " + attr(x) : ""}>`,
-            after: _ => `</${tag}>`,
-        });
-}
diff --git a/docs/.vuepress/lib/log.ts b/docs/.vuepress/lib/log.ts
new file mode 100644
index 00000000000..92b3140b2b9
--- /dev/null
+++ b/docs/.vuepress/lib/log.ts
@@ -0,0 +1,12 @@
+export default {
+    error(message: string) {
+        console.log("\x1b[41m%s\x1b[0m", ' ERROR ', `${message}\n`)
+        process.exit(0)
+    },
+    info(message: string) {
+        console.log("\x1b[44m%s\x1b[0m", ' INFO ', `${message}\n`)
+    },
+    success(message: string) {
+        console.log("\x1b[42m\x1b[30m%s\x1b[0m", ' DONE ', `${message}\n`)
+    }
+}
diff --git a/docs/.vuepress/lib/samples.ts b/docs/.vuepress/lib/samples.ts
index 96ed0008bfd..c0ce2a66567 100644
--- a/docs/.vuepress/lib/samples.ts
+++ b/docs/.vuepress/lib/samples.ts
@@ -1,6 +1,6 @@
 import {type ResolvedImport} from "../markdown/xode/types";
 import version from "./version";
-import {path} from "@vuepress/utils";
+import {path} from "vuepress/utils";
 
 const base = "../../samples";
 
diff --git a/docs/.vuepress/lib/types.ts b/docs/.vuepress/lib/types.ts
new file mode 100644
index 00000000000..3520540782e
--- /dev/null
+++ b/docs/.vuepress/lib/types.ts
@@ -0,0 +1,18 @@
+import type {NavItemOptions, SidebarLinkOptions} from "vuepress-theme-hope";
+
+export interface EsSidebarGroupOptions extends NavItemOptions {
+    group?: string;
+    collapsible?: boolean;
+    title?: string;
+    version?: string;
+    prefix?: string;
+    link?: string;
+    children: EsSidebarItemOptions[] | string[];
+}
+
+export type EsSidebarItemOptions = SidebarLinkOptions | EsSidebarGroupOptions | string;
+export type EsSidebarArrayOptions = EsSidebarItemOptions[];
+export type EsSidebarObjectOptions = Record<string, EsSidebarArrayOptions | "structure">;
+export type EsSidebarOptions = EsSidebarArrayOptions | EsSidebarObjectOptions;
+
+export type ImportedSidebarArrayOptions = EsSidebarGroupOptions[];
\ No newline at end of file
diff --git a/docs/.vuepress/lib/version.ts b/docs/.vuepress/lib/version.ts
index 6a950a90d3a..92fcbf59dc1 100644
--- a/docs/.vuepress/lib/version.ts
+++ b/docs/.vuepress/lib/version.ts
@@ -1,5 +1,15 @@
-const versionRegex = /(v?)((\d+\.)?(\d+\.)?(\*|\d+))/;
-export default {
+const versionRegex = /v((\d+\.)?(\d+\.)?(\*|\d+))/;
+const nightly = "nightly";
+const v = {
     isVersion: (v: string) => versionRegex.test(v),
-    parseVersion: (v: string) => versionRegex.exec(v)
-}
+    parseVersion: (v: string) => versionRegex.exec(v),
+    getVersion: (path: string): string | undefined => {
+        if (path.includes(nightly)) {
+            return nightly;
+        }
+        const ref = path.split("#")[0];
+        const split = ref.split("/");
+        return split.find(x => v.isVersion(x));
+    }
+};
+export default v;
diff --git a/docs/.vuepress/lib/versioning.ts b/docs/.vuepress/lib/versioning.ts
new file mode 100644
index 00000000000..ea5eb033444
--- /dev/null
+++ b/docs/.vuepress/lib/versioning.ts
@@ -0,0 +1,135 @@
+import * as fs from "fs";
+import {path} from 'vuepress/utils';
+import log from "./log";
+import {createRequire} from 'node:module';
+// import references from "../versions.json";
+import type {
+    EsSidebarGroupOptions, EsSidebarObjectOptions,
+    ImportedSidebarArrayOptions
+} from "./types";
+
+interface VersionDetail {
+    version: string,
+    path: string,
+    startPage: string
+}
+
+interface Version {
+    id: string,
+    group: string,
+    basePath: string,
+    versions: VersionDetail[]
+}
+
+const createSidebarItem = (item: EsSidebarGroupOptions, path: string, version: string, group: string): EsSidebarGroupOptions => {
+    const xp = `/${path}/`;
+    let ch = item.children as string[];
+    if (item.collapsible !== undefined) {
+        ch = ch.map(x => !x.startsWith('../') ? '../' + x : x);
+    }
+    const childPath = item.prefix ? `/${path}${item.prefix}` : xp;
+    const children = ch.map(x => x.split(xp).join(""));
+    return {
+        ...item,
+        children: children.map(x => `${childPath}${x}`),
+        prefix: undefined,
+        group,
+        version,
+        text: item.text || item.title || ""
+    }
+}
+
+export class versioning {
+    versions: Version[] = [];
+
+    constructor() {
+        // const require = createRequire(import.meta.url)
+        // references.forEach(p => {
+        //     const fileName = path.resolve(__dirname, p);
+        //     if (fs.existsSync(fileName)) {
+        //         log.info(`Importing versions from ${fileName}`);
+        //         const list: Version[] = require(fileName);
+        //         list.forEach(v => {
+        //             const existing = this.versions.find(x => x.id === v.id);
+        //             if (existing === undefined) {
+        //                 this.versions.push(v);
+        //             } else {
+        //                 existing.versions.push(...v.versions);
+        //             }
+        //         });
+        //     } else {
+        //         log.info(`File ${fileName} doesn't exist, ignoring`);
+        //     }
+        // });
+    }
+
+    get latestSemver(): string {
+        const serverDocs = this.versions.find(v => v.id === "server");
+        if (!serverDocs) {
+            throw new Error("Server docs not found");
+        }
+        return serverDocs.versions[0].path;
+    }
+
+    // latest stable release
+    get latest(): string {
+        const serverDocs = this.versions.find(v => v.id === "server");
+        if (!serverDocs) {
+            throw new Error("Server docs not found");
+        }
+        return `${serverDocs.basePath}/${serverDocs.versions[0].path}`;
+    }
+
+    get all() {
+        return this.versions
+    }
+
+    // Generate a single object that represents all versions from each sidebar
+    getSidebars() {
+        let sidebars: EsSidebarObjectOptions = {};
+        const require = createRequire(import.meta.url);
+
+        this.versions.forEach(version => {
+            version.versions.forEach(v => {
+                const p = `${version.basePath}/${v.path}`;
+                const sidebarPath = path.resolve(__dirname, `../../${p}`);
+                const sidebarBase = path.join(sidebarPath, "sidebar");
+                const sidebarJs = `${sidebarBase}.js`;
+                const sidebarCjs = `${sidebarBase}.cjs`;
+                fs.copyFileSync(sidebarJs, sidebarCjs);
+                log.info(`Importing sidebar from ${sidebarJs}`);
+                const sidebar: ImportedSidebarArrayOptions = require(sidebarCjs);
+                sidebars[`/${p}/`] = sidebar.map(item => createSidebarItem(item, p, v.version, version.group));
+                fs.rmSync(sidebarCjs);
+            });
+        })
+
+        console.log(JSON.stringify(sidebars, null, 2));
+        return sidebars;
+    }
+
+    version(id: string) {
+        const ret = this.versions.find(x => x.id === id);
+        if (ret === undefined) log.error(`Version ${id} not defined`);
+        return ret;
+    }
+
+    // Build dropdown items for each version
+    linksFor(id: string, url?: string) {
+        const links: { text: string, link: string }[] = [];
+        const version = this.version(id);
+        if (version === undefined) return links;
+
+        version.versions.forEach(v => {
+            const path = `${version.basePath}/${v.path}`;
+            const pageUrl = (url ? url : v.startPage ? v.startPage : "");
+            const link = `/${path}/${pageUrl}`;
+            const item = {text: v.version, link: link};
+            links.push(item);
+        });
+
+        return links;
+    }
+}
+
+export const instance: versioning = new versioning();
diff --git a/docs/.vuepress/markdown/resolver.ts b/docs/.vuepress/markdown/resolver.ts
new file mode 100644
index 00000000000..b7078695411
--- /dev/null
+++ b/docs/.vuepress/markdown/resolver.ts
@@ -0,0 +1,30 @@
+import {logger, path} from "vuepress/utils";
+import version from "../lib/version";
+import {instance} from "../lib/versioning";
+
+export const resolveVersionedPath = (importPath: string, filePath: string | null | undefined) => {
+    let importFilePath = importPath;
+    let error: string | null = null;
+
+    if (!path.isAbsolute(importPath)) {
+        // if the importPath is a relative path, we need to resolve it
+        // according to the markdown filePath
+        if (!filePath) {
+            logger.error(`Unable to resolve code path: ${filePath}`);
+            return {
+                importFilePath: null,
+                error: 'Error when resolving path',
+            };
+        }
+        importFilePath = path.resolve(filePath, '..', importPath);
+    }
+
+    // if (importFilePath.includes("{version}")) {
+    //     const ver = version.getVersion(filePath!) ?? instance.latestSemver;
+    //     if (ver) {
+    //         importFilePath = importFilePath.replace("{version}", ver);
+    //     }
+    // }
+
+    return {importFilePath, error};
+}
\ No newline at end of file
diff --git a/docs/.vuepress/markdown/xode/createImportCodeBlockRule.ts b/docs/.vuepress/markdown/xode/createImportCodeBlockRule.ts
index 7017743b28f..69fdaf01c7e 100644
--- a/docs/.vuepress/markdown/xode/createImportCodeBlockRule.ts
+++ b/docs/.vuepress/markdown/xode/createImportCodeBlockRule.ts
@@ -1,8 +1,8 @@
-// @ts-ignore
-import type {RuleBlock} from "markdown-it/lib/parser_block"
 import {path} from "vuepress/utils"
 import type {ExtendedCodeImportPluginOptions, ImportCodeTokenMeta, ResolvedImport} from "./types";
 // @ts-ignore
+import type {RuleBlock} from "markdown-it/lib/parser_block";
+// @ts-ignore
 import type {StateBlock} from "markdown-it";
 
 // min length of the import code syntax, i.e. '@[code]()'
@@ -19,6 +19,8 @@ const replaceKnownPrismExtensions = (ext: string): string => knownPrismIssues[ex
 // regexp to match the import syntax
 const SYNTAX_RE = /^@\[code(?:{(\d+)?-(\d+)?})?(?:{(.+)?})?(?: ([^\]]+))?]\(([^)]*)\)/;
 
+const name = "tabs";
+
 export const createImportCodeBlockRule = ({
                                               handleImportPath = (str) => [{importPath: str}],
                                           }: ExtendedCodeImportPluginOptions): RuleBlock => (
@@ -53,7 +55,7 @@ export const createImportCodeBlockRule = ({
 
     const resolvedImports = handleImportPath(importPath);
 
-    const addBlock = (r: ResolvedImport) => {
+    const addCodeBlock = (r: ResolvedImport) => {
         const meta: ImportCodeTokenMeta = {
             importPath: r.importPath,
             lineStart: lineStart ? Number.parseInt(lineStart, 10) : 0,
@@ -61,7 +63,7 @@ export const createImportCodeBlockRule = ({
             region: region
         };
 
-        // create a import_code token
+        // create an import_code token
         const token = state.push('import_code', 'code', 0);
 
         // use user specified info, or fallback to file ext
@@ -72,28 +74,30 @@ export const createImportCodeBlockRule = ({
         token.meta = meta;
     }
 
-    const addGroup = (r: ResolvedImport) => {
-        const token = state.push('container_code-group-item', "CodeGroupItem", 1);
+    const addGroupItem = (r: ResolvedImport) => {
+        const token = state.push(`${name}_tab_open`, "", 1);
         token.block = true;
-        token.attrSet("title", r.label);
+        token.info = r.label;
+        token.meta = {active: false};
 
-        addBlock(r);
+        addCodeBlock(r);
 
-        state.push('container_code-group-item', "CodeGroupItem", -1);
+        state.push(`${name}_tab_close`, "", -1);
     }
 
     const experiment = resolvedImports.length > 1;
     if (experiment) {
-        const token = state.push('container_code-group_open', "div", 1);
-        token.block = true;
+        const token = state.push(`${name}_tabs_open`, "", 1);
+        token.info = name;
+        token.meta = {id: "code"};
 
         for (const resolved of resolvedImports) {
-            addGroup(resolved);
+            addGroupItem(resolved);
         }
 
-        state.push('container_code-group_close', "div", -1);
+        state.push(`${name}_tabs_close`, "", -1);
     } else {
-        addBlock(resolvedImports[0]);
+        addCodeBlock(resolvedImports[0]);
     }
 
     state.line = startLine + 1;
diff --git a/docs/.vuepress/markdown/xode/resolveImportCode.ts b/docs/.vuepress/markdown/xode/resolveImportCode.ts
index ad47b969956..93b8f56591a 100644
--- a/docs/.vuepress/markdown/xode/resolveImportCode.ts
+++ b/docs/.vuepress/markdown/xode/resolveImportCode.ts
@@ -1,6 +1,7 @@
-import {fs, path, logger} from "vuepress/utils";
+import {fs} from "vuepress/utils";
 import type {MarkdownEnv} from "../types";
 import type {ImportCodeTokenMeta} from "./types";
+import {resolveVersionedPath} from "../resolver";
 
 function testLine(line: string, regexp: RegExp, regionName: string, end = false) {
     const [full, tag, name] = regexp.exec(line.trim()) || [];
@@ -21,7 +22,7 @@ function findRegion(lines: string[] | null, regionName: string) {
         /^<!-- #?((?:end)?region) ([\w*-]+) -->$/, // HTML, markdown
         /^#(End Region) ([\w*-]+)$/, // Visual Basic
         /^::#(endregion) ([\w*-]+)$/, // Bat
-        /^# ?((?:end)?region) ([\w*-]+)$/ // C#, PHP, Powershell, Python, perl & misc
+        /^# ?((?:end)?region) ([\w*-]+)$/ // C#, PHP, PowerShell, Python, perl & misc
     ];
 
     let regexp = null;
@@ -51,28 +52,9 @@ export const resolveImportCode = (
     importFilePath: string | null
     importCode: string
 } => {
-    let importFilePath = importPath;
-
-    if (!path.isAbsolute(importPath)) {
-        // if the importPath is relative path, we need to resolve it
-        // according to the markdown filePath
-        if (!filePath) {
-            logger.error(`Unable to resolve code path: ${filePath}`);
-            return {
-                importFilePath: null,
-                importCode: 'Error when resolving path',
-            };
-        }
-        importFilePath = path.resolve(filePath, '..', importPath);
-    }
-
-    // check file existence
-    if (!fs.existsSync(importFilePath)) {
-        logger.error(`Code file can't be found: ${importFilePath}`);
-        return {
-            importFilePath,
-            importCode: 'File not found!',
-        };
+    const {importFilePath, error} = resolveVersionedPath(importPath, filePath);
+    if (importFilePath === null || error !== null){
+        return {importFilePath, importCode: error!};
     }
 
     // read file content
@@ -82,10 +64,11 @@ export const resolveImportCode = (
         if (l.length === 0) return l;
         const spaces = l[0].length - l[0].trimStart().length;
         if (spaces === 0) return l;
-        return l.map((v, i) => v.substr(spaces));
+        return l.map(v => v.substr(spaces));
     }
 
-    const allLines = fileContent.split('\n');
+    const allLines = (fileContent != null) ? fileContent.split('\n') : null;
+    if (!allLines) return {importFilePath, importCode: "Code is empty"};
     if (region) {
         const reg = findRegion(allLines, region);
         if (reg) {
diff --git a/docs/.vuepress/markdown/xode/types.ts b/docs/.vuepress/markdown/xode/types.ts
index c1ebff2b90b..f3a34d621b3 100644
--- a/docs/.vuepress/markdown/xode/types.ts
+++ b/docs/.vuepress/markdown/xode/types.ts
@@ -4,6 +4,7 @@ export interface ImportCodeTokenMeta {
     lineEnd?: number;
     region?: string;
 }
+
 export interface ResolvedImport {
     label?: string;
     importPath: string;
diff --git a/docs/.vuepress/public/cloud.png b/docs/.vuepress/public/cloud.png
new file mode 100644
index 00000000000..c9c61b8f5bf
Binary files /dev/null and b/docs/.vuepress/public/cloud.png differ
diff --git a/docs/.vuepress/public/eventstore-dev-logo-dark.svg b/docs/.vuepress/public/eventstore-dev-logo-dark.svg
new file mode 100644
index 00000000000..6df513cb180
--- /dev/null
+++ b/docs/.vuepress/public/eventstore-dev-logo-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 432.5 86.4"><defs><style>.a{fill:#5ab552;}.b,.c{fill:#435261;}.b{fill-rule:evenodd;}</style></defs><path class="a" d="M68.3,28.2l4.8-12.5a40.9,40.9,0,0,0-7-6.8,42.9,42.9,0,0,0-13.8-7C49.9,1.3,47.4.8,45,.4L39.7,0a65.3,65.3,0,0,0-8.8.3l9.8,11.1L36.2,23a20.6,20.6,0,0,1,3.5.2,28.2,28.2,0,0,1,14.5,5.6,5.2,5.2,0,0,1,1.1,1Z"/><path class="a" d="M23.8,9.9A35.8,35.8,0,0,0,19,12.3l6.2,2.4.7,6.2.7-.4a35,35,0,0,1,10.3-4l1.9-4.7L34.7,7.1A38.1,38.1,0,0,0,23.8,9.9Z"/><path class="a" d="M23.6,15.9l-6.4-2.5a45.9,45.9,0,0,0-6,4.9A37.3,37.3,0,0,0,3.8,29l7.4-1.6,4.5,5.5.5-1A26.1,26.1,0,0,1,24.3,22Z"/><path class="a" d="M59.6,56.8a19.5,19.5,0,0,0,1.7-3.6l7,8.5L80,59.1a37.6,37.6,0,0,1-2.3,5.5,43.1,43.1,0,0,1-9.6,12.1,37,37,0,0,1-13.6,7.5h-.3L45.6,77l2.2-10H48A23.9,23.9,0,0,0,59.6,56.8Z"/><path class="a" d="M76.3,20.4a32.8,32.8,0,0,0-2-3.1L69.6,29.8,56.9,31.3a20,20,0,0,1,5.3,10.3,21.1,21.1,0,0,1-.2,9.7l7,8.5,11.7-2.5a62,62,0,0,0,1.6-7.2,46.1,46.1,0,0,0-.4-15.3A45,45,0,0,0,76.3,20.4Z"/><path class="a" d="M3,30.9l7.5-1.6L15,34.7a25.2,25.2,0,0,0-1.1,12.2c.2,1.2.5,2.3.8,3.5L6.8,48.6,1,55.3a39.9,39.9,0,0,1-1-9.2A41.4,41.4,0,0,1,2.9,31,.1.1,0,0,1,3,30.9Z"/><path class="a" d="M20.4,60.6a25.7,25.7,0,0,1-5-8.4l-8-1.8L1.5,57.3c.4,1.4.9,2.7,1.4,4.1a38.6,38.6,0,0,0,8.5,12.9,34.4,34.4,0,0,0,7.2,5.9l-.5-10.3L26,65.3A24.6,24.6,0,0,1,20.4,60.6Z"/><path class="a" d="M27.8,66.3a24.7,24.7,0,0,0,5.4,1.9,22.8,22.8,0,0,0,12.7-.5l-2.2,9.9,8.6,7.3a44.9,44.9,0,0,1-13.2,1.4A39.4,39.4,0,0,1,24,83a25.3,25.3,0,0,1-3.7-1.8l-.4-10.4Z"/><path class="b" d="M296.3,36.6c0,9-3,20.2-8.5,25.8a13,13,0,0,1-9.4,4c-9.1,0-10.4-9.1-10.4-13.8,0-8.5,2.9-19.8,8.8-25.5a12.9,12.9,0,0,1,9.2-3.9C295.2,23.2,296.3,31.6,296.3,36.6Zm-14.2-5.2c-3.8,4-6,15.7-6,22,0,2.4.3,6.1,3.5,6.1a3.7,3.7,0,0,0,2.6-1.2c4.2-4.2,6-17.8,6-22.3,0-2.7-.4-5.9-3.2-5.9A4.1,4.1,0,0,0,282.1,31.4Z"/><path class="c" d="M226.2,57.9a12.1,12.1,0,0,0,5.8,1.4c3.6.2,6.1-2,6.1-5.4s-1.6-4.4-4.2-7-5-6.5-5-10.2c0-7.9,5.5-13.4,13.7-13.4,3.3,0,5.4.7,6.4,1.4l-2.2,6.7a8.6,8.6,0,0,0-4.5-1.1c-3.4,0-5.6,2.1-5.7,5.4s.8,3.5,4.2,6.5,5.1,6.8,5.1,10.2c0,8.7-5.8,13.9-13.8,13.9-4.2,0-6.9-1-7.9-1.6Z"/><path class="c" d="M116.3,47.2H107L104.7,59h10.7L114,65.9H95.6l8.1-42.2h17.6l-1.4,6.9h-9.7l-2,10h9.4Z"/><path class="c" d="M123.3,65.9,122,23.7h8.7l-.6,21.4c-.1,3.8-.4,8.7-.6,11.9h.1c.9-3.2,2.3-8.2,3.6-11.9l7.6-21.4h8.7L131.8,65.9Z"/><path class="c" d="M154.4,47.2h9.3l1.3-6.6h-9.4l2-10h9.7l1.4-6.9H151.1L143,65.9h18.4l1.4-6.9H152.1Z"/><path class="c" d="M165.4,65.9l8.1-42.2h7.1l3.3,16.8c1,5.6,1.7,9.6,2,13.1h.2l.3-2.6h0c.5-4.5,1.2-10.5,2.3-16.3l2.1-11h6.7l-8,42.2h-6.7l-3.4-15.7a98.2,98.2,0,0,1-2.2-14h-.1c-.5,4.2-1.5,11.2-2.9,18.5l-2.1,11.2Z"/><path class="c" d="M197.6,31.1h7.3l-6.6,34.8h7.8l6.6-34.8H220l1.5-7.4H199Z"/><path class="c" d="M249.2,31.1h7.3l-6.6,34.8h7.8l6.7-34.8h7.3l1.4-7.4H250.6Z"/><path class="b" d="M311.5,23.5a46,46,0,0,0-8.4.8l-8,41.6h7.7L305.9,49h1.3c2.6,0,3.7,1.7,3.7,6.8s.1,8.9.3,10.1h7.9c-.4-1.5-.5-6.4-.7-11v-.5c-.1-4.6-1.1-7.1-3.4-8.2h0a13.3,13.3,0,0,0,8.6-12.7,9.7,9.7,0,0,0-2.8-7C318.6,24.2,315.1,23.5,311.5,23.5ZM309,42.9h-1.8l2.4-13.1h2.1c2.9,0,3.8,2.3,3.8,4.6C315.5,38.7,312.9,42.9,309,42.9Z"/><path class="c" d="M342.5,47.2h-9.2L331,59h10.6l-1.4,6.9H321.8l8.1-42.2h17.7l-1.4,6.9h-9.7l-2.1,10h9.5Z"/><path class="b" d="M349.5,60.9v3.6h.9V63.2h.8a.2.2,0,0,1,.2.2,2,2,0,0,1,.1.5v.5h.9v-.5a1.1,1.1,0,0,0-.3-.8l-.6-.2.7-.2a1.4,1.4,0,0,0,.2-.7c0-.4-.1-.7-.5-.8l-.7-.2h-1.7Zm1.2.6h.5c.2.1.3.2.3.4a.5.5,0,0,1-.2.4h-.9v-1Z"/><path class="b" d="M350.9,65.9a3.3,3.3,0,0,0,2.3-.9,3.4,3.4,0,0,0,0-4.6,2.9,2.9,0,0,0-2.3-1,3.1,3.1,0,0,0-2.2.9,3,3,0,0,0-1,2.4,3.3,3.3,0,0,0,.9,2.3A3.2,3.2,0,0,0,350.9,65.9Zm-2.7-3.2a2.6,2.6,0,0,1,.8-1.9,2.7,2.7,0,0,1,3.8,0,2.6,2.6,0,0,1,.8,1.9,2.9,2.9,0,0,1-.8,1.9,2.7,2.7,0,0,1-3.8,0A2.9,2.9,0,0,1,348.2,62.7Z"/><path class="a" d="M431.8,58.8a2.5,2.5,0,0,0-1.7-.6H400.8a2.5,2.5,0,0,0-1.7.6,2.6,2.6,0,0,0-.7,1.7v3.1a2.4,2.4,0,0,0,.7,1.6,2.2,2.2,0,0,0,1.7.7h29.3a2.2,2.2,0,0,0,1.7-.7,2.4,2.4,0,0,0,.7-1.6V60.5A2.6,2.6,0,0,0,431.8,58.8Z"/><path class="a" d="M370.5,61.4a2.2,2.2,0,0,0,.7,1.7l2.2,2.1a2.6,2.6,0,0,0,1.7.7,2.4,2.4,0,0,0,1.6-.7l18.7-18.8a1.9,1.9,0,0,0,.7-1.6,2,2,0,0,0-.7-1.6L376.7,24.4a2.4,2.4,0,0,0-1.6-.7,2.6,2.6,0,0,0-1.7.7l-2.2,2.1a2.2,2.2,0,0,0-.7,1.7,2,2,0,0,0,.7,1.6l14.9,15-14.9,15A2,2,0,0,0,370.5,61.4Z"/></svg>
\ No newline at end of file
diff --git a/docs/.vuepress/public/eventstore-logo-alt.svg b/docs/.vuepress/public/eventstore-logo-alt.svg
new file mode 100644
index 00000000000..100a664a88b
--- /dev/null
+++ b/docs/.vuepress/public/eventstore-logo-alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80.1 16"><defs><style>.a{fill:#5ab552;}.b,.c{fill:#fff;}.b{fill-rule:evenodd;}</style></defs><path class="a" d="M12.7,5.2l.8-2.3a5.3,5.3,0,0,0-1.3-1.3A5.8,5.8,0,0,0,9.7.4,3.5,3.5,0,0,0,8.3.1H5.7l1.8,2L6.7,4.3h.7a4.9,4.9,0,0,1,2.6,1l.3.2Z" transform="translate(0 0)"/><path class="a" d="M4.4,1.8l-.9.5,1.2.4V3.9h.1a4.9,4.9,0,0,1,1.9-.7l.4-.9-.8-.9Z" transform="translate(0 0)"/><path class="a" d="M4.4,2.9,3.2,2.5a3.1,3.1,0,0,0-1.1.9,5.6,5.6,0,0,0-1.4,2l1.4-.3.8,1V5.9A6.5,6.5,0,0,1,4.5,4.1Z" transform="translate(0 0)"/><path class="a" d="M11,10.5l.4-.6,1.3,1.5,2.1-.4-.4,1a9.6,9.6,0,0,1-1.8,2.2,7.7,7.7,0,0,1-2.5,1.4H10L8.4,14.3l.5-1.9h0A4.3,4.3,0,0,0,11,10.5Z" transform="translate(0 0)"/><path class="a" d="M14.1,3.8l-.3-.6-.9,2.3-2.4.3a3.5,3.5,0,0,1,1,1.9,5.4,5.4,0,0,1,0,1.8l1.3,1.6,2.1-.5a3.1,3.1,0,0,0,.3-1.3,7.1,7.1,0,0,0,0-2.9A8.5,8.5,0,0,0,14.1,3.8Z" transform="translate(0 0)"/><path class="a" d="M.5,5.7l1.4-.3.9,1a4.5,4.5,0,0,0-.2,2.3c0,.2.1.4.1.6L1.3,9,.2,10.2A8.8,8.8,0,0,1,0,8.5,9.2,9.2,0,0,1,.5,5.7Z" transform="translate(0 0)"/><path class="a" d="M3.8,11.2a7.8,7.8,0,0,1-1-1.5L1.4,9.3.3,10.6l.2.8a7.8,7.8,0,0,0,1.6,2.4l1.3,1.1v-2l1.4-.8A2.8,2.8,0,0,1,3.8,11.2Z" transform="translate(0 0)"/><path class="a" d="M5.1,12.3a4.5,4.5,0,0,0,1.1.3,3.6,3.6,0,0,0,2.3-.1l-.4,1.9,1.6,1.3a10.1,10.1,0,0,1-2.5.3,6.3,6.3,0,0,1-2.7-.6L3.8,15V13.1Z" transform="translate(0 0)"/><path class="b" d="M54.9,6.8a7.9,7.9,0,0,1-1.6,4.8,2.6,2.6,0,0,1-1.7.7c-1.7,0-2-1.7-2-2.6A7.3,7.3,0,0,1,51.3,5,2.4,2.4,0,0,1,53,4.3C54.7,4.3,54.9,5.9,54.9,6.8Zm-2.6-1c-.8.7-1.2,2.9-1.2,4.1s.1,1.1.7,1.1l.5-.2c.7-.8,1.1-3.3,1.1-4.1s-.1-1.1-.6-1.1Z" transform="translate(0 0)"/><path class="c" d="M41.9,10.7A2,2,0,0,0,43,11a1,1,0,0,0,1.1-1c0-.5-.3-.8-.8-1.3a2.6,2.6,0,0,1-.9-1.9,2.4,2.4,0,0,1,2.5-2.5,2.5,2.5,0,0,1,1.2.3l-.4,1.2-.8-.2a1,1,0,0,0-1.1,1c0,.4.2.7.8,1.2a2.8,2.8,0,0,1,.9,1.9A2.4,2.4,0,0,1,43,12.3a3.4,3.4,0,0,1-1.5-.3Z" transform="translate(0 0)"/><path class="c" d="M21.5,8.8H19.8l-.4,2.1h2l-.3,1.3H17.7l1.5-7.8h3.3l-.3,1.3H20.4L20,7.5h1.8Z" transform="translate(0 0)"/><path class="c" d="M22.8,12.2l-.2-7.8h1.6V8.3c0,.8-.1,1.7-.1,2.3h0c.2-.6.4-1.6.7-2.3l1.4-3.9h1.6l-3.3,7.8Z" transform="translate(0 0)"/><path class="c" d="M28.6,8.8h1.7l.3-1.3H28.8l.4-1.8H31l.2-1.3H28l-1.5,7.8h3.4l.2-1.3H28.2Z" transform="translate(0 0)"/><path class="c" d="M30.6,12.2l1.5-7.8h1.4l.6,3.1a12.9,12.9,0,0,1,.3,2.4h.1V9.4h0c.1-.8.3-1.9.5-3l.3-2h1.3l-1.5,7.8H33.9l-.7-2.9c-.2-1.1-.3-1.6-.4-2.6h0c-.1.8-.3,2.1-.5,3.4l-.4,2.1Z" transform="translate(0 0)"/><path class="c" d="M36.6,5.8H38l-1.3,6.4h1.5l1.2-6.4h1.4L41,4.4H36.9Z" transform="translate(0 0)"/><path class="c" d="M46.2,5.8h1.3l-1.2,6.4h1.4L49,5.8h1.3l.3-1.4H46.4Z" transform="translate(0 0)"/><path class="b" d="M57.7,4.4H56.1l-1.4,7.7h1.4l.6-3.1h.2c.5,0,.7.3.7,1.2a8.2,8.2,0,0,0,.1,1.9h1.4a10.4,10.4,0,0,1-.1-2h0c0-.9-.2-1.3-.7-1.5h0a2.4,2.4,0,0,0,1.6-2.3,1.9,1.9,0,0,0-.5-1.3A2.3,2.3,0,0,0,57.7,4.4ZM57.2,8h-.3l.4-2.5h.4c.6,0,.7.4.7.9S58,8,57.2,8Z" transform="translate(0 0)"/><path class="c" d="M63.5,8.8H61.7l-.4,2.1h2L63,12.2H59.6l1.5-7.8h3.3l-.3,1.3H62.3l-.4,1.8h1.8Z" transform="translate(0 0)"/><path class="b" d="M64.7,11.3v.6h.2v-.2H65c.1,0,.1,0,.1.1h.2a.1.1,0,0,0-.1-.1h.1c0-.1,0-.2-.1-.2h-.5Zm.3.1h-.1v-.2Z" transform="translate(0 0)"/><path class="b" d="M65,12.2c.2,0,.3,0,.4-.2a.5.5,0,0,0,0-.8L65,11l-.4.2a.5.5,0,0,0,0,.8Zm-.5-.6v-.3l.4-.2.4.2v.3a.8.8,0,0,1-.2.4h-.6A.8.8,0,0,1,64.5,11.6Z" transform="translate(0 0)"/><path class="a" d="M73.2,8.7l-3.5,3.5c0,.1-.1.1-.3.1h-.3l-.4-.4a.5.5,0,0,1,0-.6l2.8-2.8L68.7,5.6c-.1,0-.1-.1-.1-.3a.4.4,0,0,1,.1-.3l.4-.4h.6l3.5,3.5.2.3ZM80.1,12l-.2.3h-6a.4.4,0,0,1-.1-.3v-.6a.4.4,0,0,1,.1-.3h6l.2.3Z" transform="translate(0 0)"/></svg>
\ No newline at end of file
diff --git a/docs/.vuepress/public/eventstore-logo.svg b/docs/.vuepress/public/eventstore-logo.svg
new file mode 100644
index 00000000000..6df513cb180
--- /dev/null
+++ b/docs/.vuepress/public/eventstore-logo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 432.5 86.4"><defs><style>.a{fill:#5ab552;}.b,.c{fill:#435261;}.b{fill-rule:evenodd;}</style></defs><path class="a" d="M68.3,28.2l4.8-12.5a40.9,40.9,0,0,0-7-6.8,42.9,42.9,0,0,0-13.8-7C49.9,1.3,47.4.8,45,.4L39.7,0a65.3,65.3,0,0,0-8.8.3l9.8,11.1L36.2,23a20.6,20.6,0,0,1,3.5.2,28.2,28.2,0,0,1,14.5,5.6,5.2,5.2,0,0,1,1.1,1Z"/><path class="a" d="M23.8,9.9A35.8,35.8,0,0,0,19,12.3l6.2,2.4.7,6.2.7-.4a35,35,0,0,1,10.3-4l1.9-4.7L34.7,7.1A38.1,38.1,0,0,0,23.8,9.9Z"/><path class="a" d="M23.6,15.9l-6.4-2.5a45.9,45.9,0,0,0-6,4.9A37.3,37.3,0,0,0,3.8,29l7.4-1.6,4.5,5.5.5-1A26.1,26.1,0,0,1,24.3,22Z"/><path class="a" d="M59.6,56.8a19.5,19.5,0,0,0,1.7-3.6l7,8.5L80,59.1a37.6,37.6,0,0,1-2.3,5.5,43.1,43.1,0,0,1-9.6,12.1,37,37,0,0,1-13.6,7.5h-.3L45.6,77l2.2-10H48A23.9,23.9,0,0,0,59.6,56.8Z"/><path class="a" d="M76.3,20.4a32.8,32.8,0,0,0-2-3.1L69.6,29.8,56.9,31.3a20,20,0,0,1,5.3,10.3,21.1,21.1,0,0,1-.2,9.7l7,8.5,11.7-2.5a62,62,0,0,0,1.6-7.2,46.1,46.1,0,0,0-.4-15.3A45,45,0,0,0,76.3,20.4Z"/><path class="a" d="M3,30.9l7.5-1.6L15,34.7a25.2,25.2,0,0,0-1.1,12.2c.2,1.2.5,2.3.8,3.5L6.8,48.6,1,55.3a39.9,39.9,0,0,1-1-9.2A41.4,41.4,0,0,1,2.9,31,.1.1,0,0,1,3,30.9Z"/><path class="a" d="M20.4,60.6a25.7,25.7,0,0,1-5-8.4l-8-1.8L1.5,57.3c.4,1.4.9,2.7,1.4,4.1a38.6,38.6,0,0,0,8.5,12.9,34.4,34.4,0,0,0,7.2,5.9l-.5-10.3L26,65.3A24.6,24.6,0,0,1,20.4,60.6Z"/><path class="a" d="M27.8,66.3a24.7,24.7,0,0,0,5.4,1.9,22.8,22.8,0,0,0,12.7-.5l-2.2,9.9,8.6,7.3a44.9,44.9,0,0,1-13.2,1.4A39.4,39.4,0,0,1,24,83a25.3,25.3,0,0,1-3.7-1.8l-.4-10.4Z"/><path class="b" d="M296.3,36.6c0,9-3,20.2-8.5,25.8a13,13,0,0,1-9.4,4c-9.1,0-10.4-9.1-10.4-13.8,0-8.5,2.9-19.8,8.8-25.5a12.9,12.9,0,0,1,9.2-3.9C295.2,23.2,296.3,31.6,296.3,36.6Zm-14.2-5.2c-3.8,4-6,15.7-6,22,0,2.4.3,6.1,3.5,6.1a3.7,3.7,0,0,0,2.6-1.2c4.2-4.2,6-17.8,6-22.3,0-2.7-.4-5.9-3.2-5.9A4.1,4.1,0,0,0,282.1,31.4Z"/><path class="c" d="M226.2,57.9a12.1,12.1,0,0,0,5.8,1.4c3.6.2,6.1-2,6.1-5.4s-1.6-4.4-4.2-7-5-6.5-5-10.2c0-7.9,5.5-13.4,13.7-13.4,3.3,0,5.4.7,6.4,1.4l-2.2,6.7a8.6,8.6,0,0,0-4.5-1.1c-3.4,0-5.6,2.1-5.7,5.4s.8,3.5,4.2,6.5,5.1,6.8,5.1,10.2c0,8.7-5.8,13.9-13.8,13.9-4.2,0-6.9-1-7.9-1.6Z"/><path class="c" d="M116.3,47.2H107L104.7,59h10.7L114,65.9H95.6l8.1-42.2h17.6l-1.4,6.9h-9.7l-2,10h9.4Z"/><path class="c" d="M123.3,65.9,122,23.7h8.7l-.6,21.4c-.1,3.8-.4,8.7-.6,11.9h.1c.9-3.2,2.3-8.2,3.6-11.9l7.6-21.4h8.7L131.8,65.9Z"/><path class="c" d="M154.4,47.2h9.3l1.3-6.6h-9.4l2-10h9.7l1.4-6.9H151.1L143,65.9h18.4l1.4-6.9H152.1Z"/><path class="c" d="M165.4,65.9l8.1-42.2h7.1l3.3,16.8c1,5.6,1.7,9.6,2,13.1h.2l.3-2.6h0c.5-4.5,1.2-10.5,2.3-16.3l2.1-11h6.7l-8,42.2h-6.7l-3.4-15.7a98.2,98.2,0,0,1-2.2-14h-.1c-.5,4.2-1.5,11.2-2.9,18.5l-2.1,11.2Z"/><path class="c" d="M197.6,31.1h7.3l-6.6,34.8h7.8l6.6-34.8H220l1.5-7.4H199Z"/><path class="c" d="M249.2,31.1h7.3l-6.6,34.8h7.8l6.7-34.8h7.3l1.4-7.4H250.6Z"/><path class="b" d="M311.5,23.5a46,46,0,0,0-8.4.8l-8,41.6h7.7L305.9,49h1.3c2.6,0,3.7,1.7,3.7,6.8s.1,8.9.3,10.1h7.9c-.4-1.5-.5-6.4-.7-11v-.5c-.1-4.6-1.1-7.1-3.4-8.2h0a13.3,13.3,0,0,0,8.6-12.7,9.7,9.7,0,0,0-2.8-7C318.6,24.2,315.1,23.5,311.5,23.5ZM309,42.9h-1.8l2.4-13.1h2.1c2.9,0,3.8,2.3,3.8,4.6C315.5,38.7,312.9,42.9,309,42.9Z"/><path class="c" d="M342.5,47.2h-9.2L331,59h10.6l-1.4,6.9H321.8l8.1-42.2h17.7l-1.4,6.9h-9.7l-2.1,10h9.5Z"/><path class="b" d="M349.5,60.9v3.6h.9V63.2h.8a.2.2,0,0,1,.2.2,2,2,0,0,1,.1.5v.5h.9v-.5a1.1,1.1,0,0,0-.3-.8l-.6-.2.7-.2a1.4,1.4,0,0,0,.2-.7c0-.4-.1-.7-.5-.8l-.7-.2h-1.7Zm1.2.6h.5c.2.1.3.2.3.4a.5.5,0,0,1-.2.4h-.9v-1Z"/><path class="b" d="M350.9,65.9a3.3,3.3,0,0,0,2.3-.9,3.4,3.4,0,0,0,0-4.6,2.9,2.9,0,0,0-2.3-1,3.1,3.1,0,0,0-2.2.9,3,3,0,0,0-1,2.4,3.3,3.3,0,0,0,.9,2.3A3.2,3.2,0,0,0,350.9,65.9Zm-2.7-3.2a2.6,2.6,0,0,1,.8-1.9,2.7,2.7,0,0,1,3.8,0,2.6,2.6,0,0,1,.8,1.9,2.9,2.9,0,0,1-.8,1.9,2.7,2.7,0,0,1-3.8,0A2.9,2.9,0,0,1,348.2,62.7Z"/><path class="a" d="M431.8,58.8a2.5,2.5,0,0,0-1.7-.6H400.8a2.5,2.5,0,0,0-1.7.6,2.6,2.6,0,0,0-.7,1.7v3.1a2.4,2.4,0,0,0,.7,1.6,2.2,2.2,0,0,0,1.7.7h29.3a2.2,2.2,0,0,0,1.7-.7,2.4,2.4,0,0,0,.7-1.6V60.5A2.6,2.6,0,0,0,431.8,58.8Z"/><path class="a" d="M370.5,61.4a2.2,2.2,0,0,0,.7,1.7l2.2,2.1a2.6,2.6,0,0,0,1.7.7,2.4,2.4,0,0,0,1.6-.7l18.7-18.8a1.9,1.9,0,0,0,.7-1.6,2,2,0,0,0-.7-1.6L376.7,24.4a2.4,2.4,0,0,0-1.6-.7,2.6,2.6,0,0,0-1.7.7l-2.2,2.1a2.2,2.2,0,0,0-.7,1.7,2,2,0,0,0,.7,1.6l14.9,15-14.9,15A2,2,0,0,0,370.5,61.4Z"/></svg>
\ No newline at end of file
diff --git a/docs/.vuepress/public/fonts/Solina-Bold.woff b/docs/.vuepress/public/fonts/Solina-Bold.woff
new file mode 100644
index 00000000000..83746eecdd1
Binary files /dev/null and b/docs/.vuepress/public/fonts/Solina-Bold.woff differ
diff --git a/docs/.vuepress/public/fonts/Solina-Bold.woff2 b/docs/.vuepress/public/fonts/Solina-Bold.woff2
new file mode 100644
index 00000000000..813770ef1b2
Binary files /dev/null and b/docs/.vuepress/public/fonts/Solina-Bold.woff2 differ
diff --git a/docs/.vuepress/public/fonts/Solina-Light.woff b/docs/.vuepress/public/fonts/Solina-Light.woff
new file mode 100644
index 00000000000..236d5011ce7
Binary files /dev/null and b/docs/.vuepress/public/fonts/Solina-Light.woff differ
diff --git a/docs/.vuepress/public/fonts/Solina-Light.woff2 b/docs/.vuepress/public/fonts/Solina-Light.woff2
new file mode 100644
index 00000000000..3566766cf5d
Binary files /dev/null and b/docs/.vuepress/public/fonts/Solina-Light.woff2 differ
diff --git a/docs/.vuepress/public/fonts/Solina-Medium.woff b/docs/.vuepress/public/fonts/Solina-Medium.woff
new file mode 100644
index 00000000000..e9d8fc9b33e
Binary files /dev/null and b/docs/.vuepress/public/fonts/Solina-Medium.woff differ
diff --git a/docs/.vuepress/public/fonts/Solina-Medium.woff2 b/docs/.vuepress/public/fonts/Solina-Medium.woff2
new file mode 100644
index 00000000000..8598d1216ef
Binary files /dev/null and b/docs/.vuepress/public/fonts/Solina-Medium.woff2 differ
diff --git a/docs/.vuepress/public/fonts/Solina-Regular.woff b/docs/.vuepress/public/fonts/Solina-Regular.woff
new file mode 100644
index 00000000000..2753ec2fd2d
Binary files /dev/null and b/docs/.vuepress/public/fonts/Solina-Regular.woff differ
diff --git a/docs/.vuepress/public/fonts/Solina-Regular.woff2 b/docs/.vuepress/public/fonts/Solina-Regular.woff2
new file mode 100644
index 00000000000..29565392eed
Binary files /dev/null and b/docs/.vuepress/public/fonts/Solina-Regular.woff2 differ
diff --git a/docs/.vuepress/styles/index.scss b/docs/.vuepress/styles/index.scss
index 9c1564fb023..1b7ae2f3025 100644
--- a/docs/.vuepress/styles/index.scss
+++ b/docs/.vuepress/styles/index.scss
@@ -1,21 +1,139 @@
-:root {
-  --content-width: 940px;
+@use "vuepress-theme-hope/presets/shinning-feature-panel";
+
+@font-face {
+    font-family: "Solina";
+    src: url("/fonts/Solina-Light.woff2") format("woff2"), url("/fonts/Solina-Light.woff") format("woff");
+    font-weight: 400;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: "Solina";
+    src: url("/fonts/Solina-Regular.woff2") format("woff2"), url("/fonts/Solina-Regular.woff") format("woff");
+    font-weight: 450;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: "Solina";
+    src: url("/fonts/Solina-Medium.woff2") format("woff2"), url("/fonts/Solina-Medium.woff") format("woff");
+    font-weight: 500;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: "Solina";
+    src: url("/fonts/Solina-Bold.woff2") format("woff2"), url("/fonts/Solina-Bold.woff") format("woff");
+    font-weight: 700;
+    font-style: normal;
+}
+
+/* VuePress changes to match our style*/
+
+.vp-site-name {
+    display: none;
+}
+
+body,
+html {
+    font-size: 16px;
+}
+
+body:has(#kapa-widget-container) .vp-back-to-top-button {
+    bottom: 7.5rem !important;
+}
+
+.vp-feature-title .icon {
+    font-size: 1.5em;
+    vertical-align: middle;
+}
+
+.vp-nav-links {
+    font-size: 1rem;
+}
+
+.theme-hope-content:not(.custom) > p,
+.theme-hope-content:not(.custom) > ol p,
+.theme-hope-content:not(.custom) > ul p {
+    text-align: left;
+}
+
+html[data-theme="dark"] #kapa-widget-portal {
+    code {
+        background: rgba(127, 127, 127, 0.12);
+    }
+
+    blockquote {
+        border-color: #eee;
+    }
+}
+
+/* Fix for center-alignment issue on `.not-found` pages */
+.vp-page.not-found .theme-hope-content,
+.vp-page.not-found .vp-breadcrumb,
+.vp-page.not-found .vp-page-title,
+.vp-page.not-found .vp-toc-placeholder {
+    text-align: initial;
+    width: var(--content-width, 740px);
+}
+
+.vp-hero-info {
+    text-align: center;
 }
 
-.custom-container.note {
-  border-color: var(--nprogress-color);
-  background-color: var(--c-tip-bg);
-  color: var(--c-tip-text);
-  padding: 0.1rem 1.5rem;
-  border-left-width: 0.5rem;
-  border-left-style: solid;
-  margin: 1rem 0;
+.DocSearch-Button-Keys {
+    display: none;
 }
 
-.custom-container-title {
-  color: var(--c-tip-title);
+.DocSearch-Button-Placeholder {
+    padding-right: 30px;
 }
 
-.site-name {
-  display: none;
-}
\ No newline at end of file
+#main-description {
+    max-width: 50rem;
+}
+
+.vp-highlight-header {
+    text-align: center;
+}
+
+.vp-highlight-info-wrapper:only-child {
+    flex: 1;
+}
+
+/*Remove deprecation notice*/
+div[style*="z-index: 2147483647"] {
+    display: none !important;
+    visibility: hidden !important;
+    opacity: 0 !important;
+    position: absolute !important;
+    pointer-events: none !important;
+}
+
+.vp-hero-title {
+    margin: 0.5rem 0;
+    background: linear-gradient( 120deg, var(--vp-c-accent-hover), var(--vp-c-accent) 30%, var(--end-gradient) 120% );
+    -webkit-background-clip: text;
+    background-clip: text;
+    font-weight: bold;
+    font-size: 3.6rem;
+    font-family: var(--vp-font);
+    line-height: 1.5;
+    -webkit-text-fill-color: transparent;
+}
+
+.vp-highlight-item {
+    list-style: none;
+}
+
+@media screen and (max-width: 480px) {
+    .vp-action,
+    .custom-class-kapa,
+    .kapa-container {
+        display: none;
+    }
+}
+
+.vp-highlight-title {
+    font-size: 1.4rem;
+}
diff --git a/docs/.vuepress/styles/palette.scss b/docs/.vuepress/styles/palette.scss
index e69de29bb2d..f87d09207dd 100644
--- a/docs/.vuepress/styles/palette.scss
+++ b/docs/.vuepress/styles/palette.scss
@@ -0,0 +1,193 @@
+@use 'sass:color';
+
+/* Primary colors */
+$main-color: #631b3a;
+$secondary-color: #B75781;
+
+/* Light Theme Colors */
+$color-background-light: #ffffff;
+$color-foreground-light: #000000;
+$color-link-light: #479bff;
+$color-title-light: $main-color;
+
+/* Dark Theme Colors */
+$color-background-dark: #080b0d;
+$color-foreground-dark: #f0f0f0;
+$color-title-dark: #f0f0f0;
+
+$theme-color-light: color.mix(black, $main-color, 10%); // Darken by 10%
+$theme-color-soft: #{color.scale(#631b3a, $lightness: 85%)};
+$theme-color-dark: color.mix(white, $main-color, 10%); // Lighten by 10%
+$theme-color-mask: color.adjust( $secondary-color, $alpha: -0.85 ); // Reduce opacity
+
+/* CSS Variable Definitions */
+:root {
+    --main-color: #{$main-color};
+    --secondary-color: #{$secondary-color};
+    --end-gradient: #{$secondary-color};
+    --color-link: #{$color-link-light};
+    --theme-name: light;
+    --theme-shade: light;
+    --theme-contrast: low;
+    --color-background: #{$color-background-light};
+    --color-foreground: #{$color-foreground-light};
+    --color-title: var(--main-color);
+    --color-title-contrast: #ffffff;
+    --color-highlight: var(--main-color);
+    --color-highlight-contrast: #ffffff;
+    --color-focus: #8d5fff;
+    --color-focus-contrast: #ffffff;
+    --color-error: #b75781;
+    --color-error-contrast: #ffffff;
+    --color-error-alt: #dbabc0;
+    --color-error-alt-contrast: #000000;
+    --color-warning: #7d6f05;
+    --color-warning-contrast: #ffffff;
+    --color-warning-alt: #fcf29b;
+    --color-warning-alt-contrast: #000000;
+    --color-success: #2c667d;
+    --color-success-contrast: #ffffff;
+    --color-success-alt: #dbf9ee;
+    --color-success-alt-contrast: #000000;
+    --color-info: #4855a7;
+    --color-info-contrast: #ffffff;
+    --color-info-alt: #edf1fc;
+    --color-info-alt-contrast: #000000;
+    --color-shade-10: #f5f8f9;
+    --color-shade-20: #ecf1f3;
+    --color-shade-30: #e3eaed;
+    --color-shade-40: #d9e3e8;
+    --color-shade-50: #d0dce2;
+    --color-shade-60: #b4c8d1;
+    --color-overlay: #a79ab8;
+    --color-overlay-alpha: 0.75;
+    --color-disabled: #ecf1f3;
+    --color-disabled-border: #ecf1f3;
+    --color-disabled-contrast: #000000;
+    --code-fg: #383a42;
+    --code-bg: #fffffe;
+    --code-literal: #0184bc;
+    --code-symbol: #4078f2;
+    --code-keyword: #a626a4;
+    --code-string: #50a14f;
+    --code-error: #e45649;
+    --code-variable: #986801;
+    --code-class: #c18401;
+    --code-comment: #6f7f90;
+}
+
+/* Dark Theme */
+@media (prefers-color-scheme: dark) {
+    :root {
+        --theme-name: dark;
+        --theme-shade: dark;
+        --theme-contrast: low;
+        --end-gradient: #{$main-color};
+        --color-background: #{$color-background-dark};
+        --color-foreground: #{$color-foreground-dark};
+        --theme-name: dark;
+        --theme-shade: dark;
+        --theme-contrast: low;
+        --color-background: #080b0d;
+        --color-foreground: #f0f0f0;
+        --color-title: #f0f0f0;
+        --color-title-contrast: #080b0d;
+        --color-highlight: #64edbb;
+        --color-highlight-contrast: #080b0d;
+        --color-link: #479bff;
+        --color-link-contrast: #080b0d;
+        --color-focus: #8d5fff;
+        --color-focus-contrast: #080b0d;
+        --color-error: #ff4a80;
+        --color-error-contrast: #080b0d;
+        --color-error-alt: #631b3a;
+        --color-error-alt-contrast: #ffffff;
+        --color-warning: #ffed4e;
+        --color-warning-contrast: #080b0d;
+        --color-warning-alt: #7d6f05;
+        --color-warning-alt-contrast: #ffffff;
+        --color-success: #64edbb;
+        --color-success-contrast: #080b0d;
+        --color-success-alt: #2c667d;
+        --color-success-alt-contrast: #ffffff;
+        --color-info: #479bff;
+        --color-info-contrast: #080b0d;
+        --color-info-alt: #4855a7;
+        --color-info-alt-contrast: #ffffff;
+        --color-shade-10: #161c1e;
+        --color-shade-20: #1e2528;
+        --color-shade-30: #262e31;
+        --color-shade-40: #2e383b;
+        --color-shade-50: #364146;
+        --color-shade-60: #3f4c50;
+        --color-overlay: #2c667d;
+        --color-overlay-alpha: 0.75;
+        --color-disabled: #1e2528;
+        --color-disabled-border: #1e2528;
+        --color-disabled-contrast: #f0f0f0;
+        --code-fg: #d7dae0;
+        --code-bg: #313440;
+        --code-literal: #e5c07b;
+        --code-symbol: #56b6c2;
+        --code-keyword: #c678dd;
+        --code-string: #98c379;
+        --code-error: #e05252;
+        --code-variable: #e06c75;
+        --code-class: #e5c07b;
+        --code-comment: #5c6370;
+    }
+}
+
+$vp-font: 'Solina, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, "Helvetica Neue", Arial, "Noto Sans", STHeiti, "Microsoft YaHei", SimSun, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"';
+$vp-font-heading: 'Solina, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", STHeiti, "Microsoft YaHei", SimSun, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"';
+
+html[data-theme="dark"] {
+    --theme-color: var(--secondary-color);
+    --vp-c-accent-hover: var(--secondary-color);
+    --vp-c-accent: var(--secondary-color);
+    --vp-c-accent-bg: var(--secondary-color);
+    --vp-c-accent-soft: var(--main-color);
+    --theme-color-light: #{$theme-color-light};
+    --theme-color-dark: #{$theme-color-dark};
+    --theme-color-mask: #{$theme-color-mask};
+    --end-gradient: #{$main-color};
+}
+
+html[data-theme="light"] {
+    --theme-color: var(--main-color);
+    --vp-c-accent-hover: var(--main-color);
+    --vp-c-accent: var(--main-color);
+    --vp-c-accent-bg: var(--main-color);
+    --vp-c-accent-soft: #{$theme-color-soft};
+    --theme-color-light: #{$theme-color-light};
+    --theme-color-dark: #{$theme-color-dark};
+    --theme-color-mask: #{$theme-color-mask};
+}
+
+$vp-c-bg: ( light: #fff, dark: #080b0d, );
+
+$vp-c-bg-elv-soft: ( light: #fff, dark: #080b0d, );
+
+$font-body: 15px;
+
+/* Override Code Block Background */
+$sidebar-width: 18rem;
+
+$vp-c-text: ( light: #000, dark: #f0f0f0, );
+
+.hint-container.important a,
+.hint-container.info a,
+.hint-container.note a,
+.hint-container.tip a,
+.hint-container.warning a,
+.hint-container.caution a {
+    color: var(--color-link-light);
+
+    html[data-theme="dark"] & {
+        color: var(--color-link);
+    }
+}
+
+.vp-feature-item {
+    flex-basis: 21%;
+}
diff --git a/docs/README.md b/docs/README.md
deleted file mode 100644
index ea06495eef9..00000000000
--- a/docs/README.md
+++ /dev/null
@@ -1,81 +0,0 @@
-# Introduction
-
-Welcome to the EventStoreDB documentation.
-
-EventStoreDB is a database designed for [Event Sourcing](https://eventstore.com/blog/what-is-event-sourcing/). This documentation introduces key concepts of EventStoreDB and explains its installation, configuration, and operational concerns.
-
-EventStoreDB is available in both an Open-Source and a Commercial version:
-
-- EventStoreDB OSS is the [open-source](https://github.com/EventStore/EventStore) and free-to-use edition of EventStoreDB.
-- EventStoreDB Commercial is available for customers with an EventStoreDB [paid support subscription](https://eventstore.com/support/). EventStoreDB Commercial adds enterprise-focused features such as LDAP and X.509 authentication, OpenTelemetry Exporter, correlation event sequence visualisation, and management CLI tool.
-
-## What's new
-
-Find out [what's new](whatsnew.md) in this release to get details on new features and other changes.
-
-## Getting started
-
-Check the [getting started guide](/getting-started.md) for resources on the principles of EventStoreDB, Event Sourcing, database installation guidelines and choosing a client SDK.
-
-## Support
-
-### EventStoreDB community
-
-Users of EventStoreDB OSS can use the [community forum](https://discuss.eventstore.com) for questions, discussions and getting help from community members.
-
-### Enterprise customers
-
-Customers with the paid [support plan](https://eventstore.com/support/) can open tickets using the [support portal](https://eventstore.freshdesk.com).
-
-### Issues
-
-Since EventStoreDB is an open-source product, we track most of the issues openly in the EventStoreDB [repository on GitHub](https://github.com/EventStore/EventStore). Before opening an issue, please ensure that a similar issue hasn't been opened already. Also, try searching closed issues that might contain a solution or workaround for your problem.
-
-When opening an issue, follow our [guidelines](https://github.com/EventStore/EventStore/blob/master/CONTRIBUTING.md) for bug reports and feature requests. By doing so, you will greatly help us to solve your concerns most efficiently.
-
-## Protocols, clients, and SDKs
-
-EventStoreDB supports one client protocol, which is described below. The older TCP client API has been deprecated in version 20.2 and removed in version 24.2. The final version with TCP API support is 23.10. More information can be found in our [blog post](https://www.eventstore.com/blog/sunsetting-eventstoredb-tcp-based-client-protocol).
-
-Since version 24.6, the legacy protocol is available as a [commercial plugin](networking.md#external-tcp) available for Event Store customers.
-
-### Client protocol
-
-The client protocol is based on [open standards](https://grpc.io/) and is widely supported by many programming languages. EventStoreDB uses gRPC to communicate between the cluster nodes as well as for client-server communication.
-
-When developing software that uses EventStoreDB, we recommend using one of the official SDKs.
-
-#### EventStoreDB supported clients
-
-- Python: [pyeventsourcing/esdbclient](https://pypi.org/project/esdbclient/)
-- Node.js (JavaScript/TypeScript): [EventStore/EventStore-Client-NodeJS](https://github.com/EventStore/EventStore-Client-NodeJS)
-- Java: [(EventStore/EventStoreDB-Client-Java](https://github.com/EventStore/EventStoreDB-Client-Java)
-- .NET: [EventStore/EventStore-Client-Dotnet](https://github.com/EventStore/EventStore-Client-Dotnet)
-- Go: [EventStore/EventStore-Client-Go](https://github.com/EventStore/EventStore-Client-Go)
-- Rust: [EventStore/EventStoreDB-Client-Rust](https://github.com/EventStore/EventStoreDB-Client-Rust)
-
-Read more in the [gRPC clients documentation](@clients/grpc/README.md).
-
-#### Community developed clients
-
-- [Ruby (yousty/event_store_client)](https://github.com/yousty/event_store_client)
-- [Elixir (NFIBrokerage/spear)](https://github.com/NFIBrokerage/spear)
-
-### HTTP
-
-EventStoreDB also offers an HTTP-based interface. It consists of the REST-oriented API, and a realtime subscription feature based on the [AtomPub protocol](https://datatracker.ietf.org/doc/html/rfc5023). As it operates over HTTP, this is less efficient, but nearly every environment supports it.
-
-Find out more about configuring the HTTP protocol on the [HTTP configuration](networking.md#http-configuration) page.
-
-::: warning Deprecation Note
-The current AtomPub-based HTTP application API is disabled by default since v20 of EventStoreDB. You can enable it by adding an [option](networking.md#atompub) to the server configuration. Although we plan to remove AtomPub support from future server versions, the server management HTTP API will remain available.
-You need to enable the AtomPub protocol to have a fully functioning database user interface.
-:::
-
-Learn more about the EventStoreDB HTTP interface in the [HTTP documentation](@clients/http-api/README.md). 
-
-
-#### Community developed clients
-
-- [PHP (prooph/event-store-http-client)](https://github.com/prooph/event-store-http-client/)
-- [Ruby (yousty/event_store_client)](https://github.com/yousty/event_store_client)
diff --git a/docs/admin-ui.md b/docs/admin-ui.md
deleted file mode 100644
index 864dbde9588..00000000000
--- a/docs/admin-ui.md
+++ /dev/null
@@ -1,111 +0,0 @@
----
-title: Admin UI
----
-
-# Admin UI
-
-The EventStoreDB Admin UI is available at _SERVER_IP:2113_ and helps you interact with and manage a cluster in a visual way. This guide explains the tabs of the interface and what they do.
-
-::: tip
-The embedded EventStoreDB web interface is reaching its end of life. We are working on a replacement, and you can try using the Early Preview of [Event Store Navigator](https://learn.eventstore.com/event-store-navigator-preview) app instead. It doesn't have full feature parity with the embedded web UI, but it already has usability improvements compared to it.
-:::
-
-## Dashboard
-
-![Web admin interface dashboard](./images/wai-dashboard.png)
-
-The _Dashboard_ tab shows an overview of active queues with associated statistics in the top half. The _+_ icon indicates a queue group, click it to reveal the queues that are part of the group.
-
-The second half of the tab shows active connections to EventStoreDB and information about them.
-
-Click the _Snapshot_ button in the top right to output a snapshot of all queue statistics at the time you clicked the button.
-
-## Stream browser
-
-![Web admin interface stream browser tab](./images/wai-stream-browser.png)
-
-The _Stream Browser_ tab gives an overview of recently created and changed streams, clicking on an individual stream shows details about the individual stream.
-
-### Event stream
-
-![Web admin interface stream details](./images/wai-stream-details.png)
-
-Each stream shows pages of the events in a stream with an overview of the event. Click the _Name_ to see the EventId, and _JSON_ to see the event data. The buttons above change depending on what you are viewing in the interface. The _Back_ button takes you to the parent screen.
-
-The buttons on the top right when you are viewing an event stream are:
-
-- _Pause_: Stop showing events arriving into this stream.
-- _Resume_: Resume showing events arriving into this stream.
-- _Edit ACL_: Edit [the access control lists](security.md#access-control-lists) for a stream.
-- _Add Event_: [Add a new event](@clients/http-api/README.md#appending-events) to the stream.
-- _Delete_: [Delete a stream](@clients/http-api/README.md#deleting-a-stream) to the stream.
-- _Query_:
-
-The buttons on the left above the events when you are viewing an event stream are:
-
-- _self_: Takes you to the overview of the stream.
-- _first_: Takes you to the first page of events in a stream.
-- _previous_: Takes you to the previous page of events in a stream.
-- _metadata_: Shows the metadata of a stream.
-  - On the metadata screen, click _Add New Like This_ to add a new event to the stream.
-
-## Projections
-
-![Web admin interface projections tab](./images/wai-projections.png)
-
-The _Projections_ tab shows system and user created projections defined in EventStoreDB, the buttons above the list do the following:
-
-- _Disable All_: Disable all running projections.
-- _Enable All_: Enable all stopped projections.
-- _Include Queries_: Toggle displaying queries in the Projections table.
-- _New Projection_: [Create a user-defined projection](projections.md#user-defined-projections) with the Admin UI.
-
-Clicking an individual projection shows further details.
-
-![Web admin interface projection details](./images/wai-projection-details.jpg)
-
-On the left is the projection definition. On the right are the stats, results, and state of the projection. The buttons above the details do the following:
-
-- _Start_: Start a stopped projection.
-- _Stop_: Stop a running projection.
-- _Edit_: Edit the projection definition.
-- _Config_: [Set configuration options](projections.md#configuring-projections) for a projection.
-- _Debug_: Opens [the debugging interface](projections.md#debugging) to debug what effect a projection is having on events.
-- _Delete_: Delete a projection.
-- _Reset_: Reset a projection.
-- _Back_: Returns you to the parent screen.
-
-## Query
-
-The _Query_ tab has a code editor field where you can create transient and short-lived projections for quick analysis of your event streams.
-
-![Web admin interface query details](./images/wai-query-details.png)
-
-## Persistent subscriptions
-
-The _Persistent Subscriptions_ tab shows an overview of [persistent subscriptions](persistent-subscriptions.md) configured on streams. The button above the list does the following:
-
-- _New Subscription_: Create a new subscription.
-
-Clicking the _+_ icon next to a stream name reveals the subscription name and more buttons. The _Back_ button takes you to the parent screen.
-
-- _Edit_: Edit the subscription.
-- _Delete_: Delete the subscription.
-- _Detail_: Shows the subscription configuration options.
-- _Replay Parked Messages_: Replay events in subscription to return state.
-
-## Admin
-
-![Web admin interface projections tab](./images/wai-admin.png)
-
-The _Admin_ tab shows subsystems enabled (currently only [projections](projections.md)) on EventStoreDB and [scavenges](operations.md#scavenging) run. You can start a new scavenge operation by clicking the _Scavenge_ button, and shut EventStoreDB down by clicking the _Shutdown Server_ button.
-
-## Users
-
-![Web admin interface projections tab](./images/wai-users.png)
-
-The _Users_ tab shows [the users defined in EventStoreDB](security.md#authentication), clicking an individual user shows a JSON representation of that user's details.
-
-## Log out
-
-Logs you out of the Admin UI interface.
diff --git a/docs/cluster.md b/docs/cluster.md
deleted file mode 100644
index 283e9acd7e2..00000000000
--- a/docs/cluster.md
+++ /dev/null
@@ -1,247 +0,0 @@
----
-title: Clustering
----
-
-## Highly-available cluster
-
-EventStoreDB allows you to run more than one node in a cluster for high availability.
-
-::: info Cluster member authentication
-EventStoreDB starts in secure mode by default, which requires configuration [settings for certificates](security.md#certificates-configuration).
-Cluster members authenticate each other using the certificate Common Name. All the cluster nodes must have the same common name in their certificates.
-:::
-
-### Cluster nodes
-
-EventStoreDB clusters follow a "shared nothing" philosophy, meaning that clustering requires no shared disks. Instead, each node has a copy of the data to ensure it is not lost in case of a drive failure or a node crashing. 
-
-::: tip
-Lean more about [node roles](#node-roles).
-:::
-
-EventStoreDB uses a quorum-based replication model, in which a majority of nodes in the cluster must acknowledge that they have received a copy of the write before the write is acknowledged to the client. This means that to be able to tolerate the failure of _n_ nodes, the cluster must be of size _(2n + 1)_. A three node cluster can continue to accept writes if one node is unavailable. A five node cluster can continue to accept writes if two nodes are unavailable, and so forth.
-
-### Cluster size
-
-For any cluster configuration, you first need to decide how many nodes you want, provision each node and set the cluster size option on each node.
-
-The cluster size is a pre-defined value. The cluster expects the number of nodes to match this predefined number, otherwise the cluster would be incomplete and therefore unhealthy.
-
-The cluster cannot be dynamically scaled. If you need to change the number of cluster nodes, the cluster size setting must be changed on all nodes before the new node can join.
-
-Use the `ClusterSize` option to tell each cluster node about how many nodes the cluster should have.
-
-| Format               | Syntax                    |
-|:---------------------|:--------------------------|
-| Command line         | `--cluster-size`          |
-| YAML                 | `ClusterSize`             |
-| Environment variable | `EVENTSTORE_CLUSTER_SIZE` |
-
-**Default**: `1` (single node, no high-availability).
-
-Common values for the `ClusterSize` setting are three or five (to have a majority of two nodes and a majority of three nodes). We recommended setting this to an odd number of nodes to minimise the chance of a tie during elections, which would lengthen the election process.
-
-### Discovering cluster members
-
-Cluster nodes use the gossip protocol to discover each other and elect the cluster leader.
-
-Cluster nodes need to know about one another to gossip. To start this process, you provide gossip seeds for each node. 
-
-Configure cluster nodes to discover other nodes in one of two ways:
-- [via a DNS entry](#cluster-with-dns) and a well-known [gossip port](#gossip-port)
-- [via a list of addresses](#cluster-with-gossip-seeds) of other cluster nodes
-
-The multi-address DNS name cluster discovery only works for clusters that use certificates signed by a private certificate authority, or run insecure. For other scenarios you need to provide the gossip seed using hostnames of other cluster nodes.
-
-### Internal communication
-
-When setting up a cluster, the nodes must be able to reach each other over both the HTTP channel, and the internal TCP channel. You should ensure that these ports are open on firewalls on the machines and between the machines.
-
-Learn more about [internal TCP configuration](networking.md#replication-protocol) and [HTTP configuration](networking.md#http-configuration) to set up the cluster properly.
-
-## Cluster with DNS
-
-When you tell EventStoreDB to use DNS for its gossip, the server will resolve the DNS name to a list of IP addresses and connect to each of those addresses to find other nodes. This method is very flexible because you can change the list of nodes on your DNS server without changing the cluster configuration. The DNS method is also useful in automated deployment scenarios when you control both the cluster deployment and the DNS server from your infrastructure-as-code scripts.
-
-To use DNS discovery, you need to set the `ClusterDns` option to the DNS name that allows making an HTTP call to it. When the server starts, it will attempt to make a gRPC call using the `https://<cluster-dns>:<gossip-port>` URL (`http` if the cluster is insecure).
-
-When using a certificate signed by a publicly trusted CA, you'd normally use the wildcard certificate. Ensure that the cluster DNS name fits the wildcard, otherwise the request will fail on SSL check.
-
-When using certificates signed by a private CA, the cluster DNS name must be included to the certificate of each node as SAN (subject alternative name).
-
-You also need to have the `DiscoverViaDns` option to be set to `true` but it is its default value.
-
-| Format               | Syntax                   |
-|:---------------------|:-------------------------|
-| Command line         | `--cluster-dns`          |
-| YAML                 | `ClusterDns`             |
-| Environment variable | `EVENTSTORE_CLUSTER_DNS` |
-
-**Default**: `fake.dns`, which doesn't resolve to anything. You have to set it to a proper DNS name when used in combination to the DNS discovery (next setting).
-
-| Format               | Syntax                        |
-|:---------------------|:------------------------------|
-| Command line         | `--discover-via-dns`          |
-| YAML                 | `DiscoverViaDns`              |
-| Environment variable | `EVENTSTORE_DISCOVER_VIA_DNS` |
-
-**Default**: `true`, the DNS discovery is enabled by default.
-
-It will be used only if the cluster has more than one node. You must set the `ClusterDns` setting to a proper DNS name.
-
-When using DNS for cluster gossip, you might need to set the `GossipPort` setting to the HTTP port if the external HTTP port setting is not set to `2113` default port. Refer to [gossip port](#gossip-port) option documentation to learn more.
-
-## Cluster with gossip seeds
-
-If you don't want or cannot use the DNS-based configuration, it is possible to tell cluster nodes to call other nodes using their IP addresses. This method is a bit more cumbersome, because each node has to have the list of addresses for other nodes configured, but not its own address.
-
-The setting accepts a comma-separated list of IP addresses or host names with their gossip port values.
-
-| Format               | Syntax                   |
-|:---------------------|:-------------------------|
-| Command line         | `--gossip-seed`          |
-| YAML                 | `GossipSeed`             |
-| Environment variable | `EVENTSTORE_GOSSIP_SEED` |
-
-## Gossip protocol
-
-EventStoreDB uses a quorum-based replication model. When working normally, a cluster has one node known as a leader, and the remaining nodes are followers. The leader node is responsible for coordinating writes while it is the leader. Cluster nodes use a consensus algorithm to determine which node should be the leader and which should be followers. EventStoreDB bases the decision as to which node should be the leader on a number of factors.
-
-For a cluster node to have this information available to them, the nodes gossip with other nodes in the cluster. Gossip runs over HTTP interfaces of cluster nodes.
-
-The gossip protocol configuration can be changed using the settings listed below. Pay attention to the settings related to time, like intervals and timeouts, when running in a cloud environment.
-
-### Gossip port
-
-The gossip port is used for constructing the URL for making a gossip request to other nodes that are discovered via DNS. It is not used when using gossip seeds, because in that case the list contains IP addresses and the port.
-
-::: warning
-Normally, the cluster gossip port is the same as the HTTP port, so you don't need to change this setting.
-:::
-
-| Format               | Syntax                           |
-|:---------------------|:---------------------------------|
-| Command line         | `--cluster-gossip-port`          |
-| YAML                 | `ClusterGossipPort`              |
-| Environment variable | `EVENTSTORE_CLUSTER_GOSSIP_PORT` |
-
-**Default**: HTTP port
-
-### Gossip interval
-
-Cluster nodes try to ensure that the communication with their neighbour nodes is not broken. They use the gossip protocol and call each other after a specified period of time. This period is called the gossip interval. You can change the `GossipInvervalMs` setting so cluster nodes check in with each other more or less frequently.
-
-The default value is two seconds (2000 ms).
-
-| Format               | Syntax                          |
-|:---------------------|:--------------------------------|
-| Command line         | `--gossip-interval-ms`          |
-| YAML                 | `GossipIntervalMs`              |
-| Environment variable | `EVENTSTORE_GOSSIP_INTERVAL_MS` |
-
-**Default**: `2000` (in milliseconds), which is two seconds.
-
-### Time difference toleration
-
-EventStoreDB expects the time on cluster nodes to be in sync within a given tolerance.
-
-If different nodes have their clock out of sync for a number of milliseconds that exceeds the value of this setting, the gossip is rejected and the node will not be accepted as a cluster member.
-
-| Format               | Syntax                                    |
-|:---------------------|:------------------------------------------|
-| Command line         | `--gossip-allowed-difference-ms`          |
-| YAML                 | `GossipAllowedDifferenceMs`               |
-| Environment variable | `EVENTSTORE_GOSSIP_ALLOWED_DIFFERENCE_MS` |
-
-**Default**: `60000` (in milliseconds), which is one minute.
-
-### Gossip timeout
-
-When nodes call each other using the gossip protocol to understand the cluster status, a busy node might delay the response. When a node is not getting a response from another node, it might consider that other node as dead. Such a situation might trigger the election process.
-
-If your cluster network is congested, you might increase the gossip timeout using the `GossipTimeoutMs` setting, so nodes will be more tolerant to delayed gossip responses. The default value is 2.5 seconds (2500 ms).
-
-| Format               | Syntax                         |
-|:---------------------|:-------------------------------|
-| Command line         | `--gossip-timeout-ms`          |
-| YAML                 | `GossipTimeoutMs`              |
-| Environment variable | `EVENTSTORE_GOSSIP_TIMEOUT_MS` |
-
-**Default**: `2500` (in milliseconds).
-
-### Gossip on single node
-
-You can connect using gossip seeds regardless of whether you have a cluster or not. In the previous versions of EventStoreDB gossip on a single node was disabled. Starting from 21.2 it is enabled by default.
-
-::: warning
-Please note that the `GossipOnSingleNode` option is deprecated and will be removed in a future version. The gossip endpoint is now unconditionally available for any deployment topology.
-:::
-
-| Format               | Syntax                             |
-|:---------------------|:-----------------------------------|
-| Command line         | `--gossip-on-single-node`          |
-| YAML                 | `GossipOnSingleNode`               |
-| Environment variable | `EVENTSTORE_GOSSIP_ON_SINGLE_NODE` |
-
-**Default**: `true`
-
-### Leader election timeout
-
-The leader elections are separate to the node gossip, and are used to elect a node as Leader.
-
-In some cases the leader election messages may be delayed, which can result in elections taking longer than they should. If you start seeing election timeouts in the logs or if you have needed to increase the gossip timeout due to a congested network, then you should consider increasing the leader election timeout as well.
-
-| Format               | Syntax                                  |
-|:---------------------|:----------------------------------------|
-| Command line         | `--leader-election-timeout-ms`          |
-| YAML                 | `LeaderElectionTimeoutMs`               |
-| Environment variable | `EVENTSTORE_LEADER_ELECTION_TIMEOUT_MS` |
-
-**Default**: `1000` (in milliseconds).
-
-## Node roles
-
-Every node in a stable EventStoreDB deployment settles into one of three roles: Leader, Follower, and ReadOnlyReplica. The cluster is composed of the Leader and Followers.
-
-### Leader
-
-The leader ensures that writes are persisted to its own disk, replicated to a majority of cluster nodes, and indexed on the leader so that they can be read from the leader, before acknowledging the write as successful to the client.
-
-### Follower
-
-A cluster assigns the follower role based on an election process. A cluster uses one or more nodes with the follower role to form the quorum, or the majority of nodes necessary to confirm that the write is persisted.
-
-### Read-only replica
-
-You can add read-only replica nodes, which will not become cluster members and will not take part in elections. Read-only replicas can be used for scaling up reads if you have many catch-up subscriptions and want to off-load cluster members.
-
-A cluster asynchronously replicates data one way to a node with the read-only replica role. The read-only replica node is not part of the cluster, so does not add to the replication requirements needed to acknowledge a write. For this reason a node with a read-only replica role does not add much overhead to the other nodes.
-
-You need to explicitly configure the node as a read-only replica using this setting:
-
-| Format               | Syntax                         |
-|:---------------------|:-------------------------------|
-| Command line         | `--read-only-replica`          |
-| YAML                 | `ReadOnlyReplica`              |
-| Environment variable | `EVENTSTORE_READ_ONLY_REPLICA` |
-
-**Default**: `false`, set to `true` for a read-only replica node.
-
-The replica node needs to have the cluster gossip DNS or seed configured. For the gossip seed, use DNS names or IP addresses of all other cluster nodes, except read-only replicas.
-
-### Node priority
-
-You can control which clones the cluster promotes with the `NodePriority` setting. The default value is `0`, and the cluster is more likely to promote nodes with higher values.
-
-| Format               | Syntax                    |
-|:---------------------|:--------------------------|
-| Command line         | `--node-priority`         |
-| YAML                 | `NodePriority`            |
-| Environment variable | `EVENTSTORE_NODE_PRORITY` |
-
-**Default**: `0`.
-
-::: tip
-Changing `NodePriority` does not guarantee that the cluster will not promote the node. It is only one of the criteria that the Election Service considers.
-:::
-
diff --git a/docs/configuration.md b/docs/configuration.md
deleted file mode 100644
index 6b8110e6bda..00000000000
--- a/docs/configuration.md
+++ /dev/null
@@ -1,418 +0,0 @@
----
-title: "How-to"
----
-
-## Configuration options
-
-EventStoreDB has a number of configuration options that can be changed. You can find all the options described
-in details in this section.
-
-When you don't change the configuration, EventStoreDB will use sensible defaults, but they might not suit your
-needs. You can always instruct EventStoreDB to use a different set of options. There are multiple ways to
-configure EventStoreDB server, described below.
-
-### Version and help
-
-You can check what version of EventStoreDB you have installed by using the `--version` parameter in the
-command line. For example:
-
-:::: code-group
-::: code Linux
-```bash
-```bash:no-line-numbers
-$ eventstored --version
-EventStoreDB version 24.6.0.0 (oss-v24.6.0-alpha-16-g8e06f9f77/8e06f9f77, 2023-10-24T22:05:57-05:00)
-```
-:::
-::: code Windows
-```
-> EventStore.ClusterNode.exe --version
-EventStoreDB version 24.6.0.0 (oss-v24.6.0-alpha-16-g8e06f9f77/8e06f9f77, 2023-10-24T22:05:57-05:00)
-```
-:::
-::::
-
-The full list of available options is available from the currently installed server by using the `--help`
-option in the command line.
-
-### Configuration file
-
-You would use the configuration file when you want the server to run with the same set of options every time.
-YAML files are better for large installations as you can centrally distribute and manage them, or generate
-them from a configuration management system.
-
-The default configuration file name is `eventstore.conf` and it's located in
-- **Linux:** `/etc/eventstore/`
-- **Windows:** EventStoreDB installation directory
-
-The configuration file has YAML-compatible format. The basic format of the YAML configuration file is as
-follows:
-
-```yaml:no-line-numbers
----
-Db: "/volumes/data"
-Log: "/esdb/logs"
-```
-
-::: tip 
-You need to use the three dashes and spacing in your YAML file.
-:::
-
-The default configuration file name is `eventstore.conf`. It is located in `/etc/eventstore/` on Linux and the
-server installation directory on Windows. You can either change this file or create another file and instruct
-EventStoreDB to use it.
-
-To tell the EventStoreDB server to use a different configuration file, you pass the file path on the command
-line with `--config=filename`, or use the `CONFIG`
-environment variable.
-
-### Environment variables
-
-You can also set all arguments with environment variables. All variables are prefixed with `EVENTSTORE_` and
-normally follow the pattern `EVENTSTORE_{option}`. For example, setting the `EVENTSTORE_LOG`
-variable would instruct the server to use a custom location for log files.
-
-Environment variables override all the options specified in configuration files.
-
-### Command line
-
-You can also override options from both configuration files and environment variables using the command line.
-
-For example, starting EventStoreDB with the `--log` option will override the default log files location:
-
-:::: code-group
-::: code-group-item Linux
-```bash:no-line-numbers
-eventstored --log /tmp/eventstore/logs
-```
-:::
-::: code-group-item Windows
-```bash:no-line-numbers
-EventStore.ClusterNode.exe --log C:\Temp\EventStore\Logs
-```
-:::
-::::
-
-### Testing the configuration
-
-If more than one method is used to configure the server, it might be hard to find out what the effective
-configuration will be when the server starts. To help to find out just that, you can use the `--what-if`
-option.
-
-When you run EventStoreDB with this option, it will print out the effective configuration applied from all
-available sources (default and custom configuration file, environment variables and command line parameters)
-and print it out to the console.
-
-::: details Click here to see a WhatIf example
-
-```
-$ eventstored --what-if
-[68443, 1,17:38:39.178,INF] 
-[68443, 1,17:38:39.186,INF] "OS ARCHITECTURE:"        X64 
-[68443, 1,17:38:39.207,INF] "OS:"                     Linux ("Unix 5.19.0.1025")
-[68443, 1,17:38:39.210,INF] "RUNTIME:"                ".NET 6.0.21/e40b3abf1" (64-bit)
-[68443, 1,17:38:39.211,INF] "GC:"                     "3 GENERATIONS" "IsServerGC: False" "Latency Mode: Interactive"
-[68443, 1,17:38:39.212,INF] "LOGS:"                   "/var/log/eventstore"
-[68443, 1,17:38:39.251,INF] 
-MODIFIED OPTIONS:
-    Application Options:
-         WHAT IF:                                 true (Command Line)
-
-
-DEFAULT OPTIONS:
-    Application Options:
-         ALLOW ANONYMOUS ENDPOINT ACCESS:         True (<DEFAULT>)
-         ALLOW ANONYMOUS STREAM ACCESS:           True (<DEFAULT>)
-         ALLOW UNKNOWN OPTIONS:                   False (<DEFAULT>)
-         CONFIG:                                  /etc/eventstore/eventstore.conf (<DEFAULT>)
-         DISABLE HTTP CACHING:                    False (<DEFAULT>)
-         HELP:                                    False (<DEFAULT>)
-         LOG FAILED AUTHENTICATION ATTEMPTS:      False (<DEFAULT>)
-         LOG HTTP REQUESTS:                       False (<DEFAULT>)
-         MAX APPEND SIZE:                         1048576 (<DEFAULT>)
-         SKIP INDEX SCAN ON READS:                False (<DEFAULT>)
-         STATS PERIOD SEC:                        30 (<DEFAULT>)
-         VERSION:                                 False (<DEFAULT>)
-         WORKER THREADS:                          0 (<DEFAULT>)
-
-    Authentication/Authorization Options:
-         AUTHENTICATION CONFIG:                   <empty> (<DEFAULT>)
-         AUTHENTICATION TYPE:                     internal (<DEFAULT>)
-         AUTHORIZATION CONFIG:                    <empty> (<DEFAULT>)
-         AUTHORIZATION TYPE:                      internal (<DEFAULT>)
-         DISABLE FIRST LEVEL HTTP AUTHORIZATION:  False (<DEFAULT>)
-
-    Certificate Options:
-         CERTIFICATE RESERVED NODE COMMON NAME:   eventstoredb-node (<DEFAULT>)
-         TRUSTED ROOT CERTIFICATES PATH:          /etc/ssl/certs (<DEFAULT>)
-
-    Certificate Options (from file):
-         CERTIFICATE FILE:                        <empty> (<DEFAULT>)
-         CERTIFICATE PASSWORD:                    <empty> (<DEFAULT>)
-         CERTIFICATE PRIVATE KEY FILE:            <empty> (<DEFAULT>)
-         CERTIFICATE PRIVATE KEY PASSWORD:        <empty> (<DEFAULT>)
-
-    Certificate Options (from store):
-         CERTIFICATE STORE LOCATION:              <empty> (<DEFAULT>)
-         CERTIFICATE STORE NAME:                  <empty> (<DEFAULT>)
-         CERTIFICATE SUBJECT NAME:                <empty> (<DEFAULT>)
-         CERTIFICATE THUMBPRINT:                  <empty> (<DEFAULT>)
-         TRUSTED ROOT CERTIFICATE STORE LOCATION: <empty> (<DEFAULT>)
-         TRUSTED ROOT CERTIFICATE STORE NAME:     <empty> (<DEFAULT>)
-         TRUSTED ROOT CERTIFICATE SUBJECT NAME:   <empty> (<DEFAULT>)
-         TRUSTED ROOT CERTIFICATE THUMBPRINT:     <empty> (<DEFAULT>)
-
-    Cluster Options:
-         CLUSTER DNS:                             fake.dns (<DEFAULT>)
-         CLUSTER GOSSIP PORT:                     2113 (<DEFAULT>)
-         CLUSTER SIZE:                            1 (<DEFAULT>)
-         DEAD MEMBER REMOVAL PERIOD SEC:          1800 (<DEFAULT>)
-         DISCOVER VIA DNS:                        True (<DEFAULT>)
-         GOSSIP ALLOWED DIFFERENCE MS:            60000 (<DEFAULT>)
-         GOSSIP INTERVAL MS:                      2000 (<DEFAULT>)
-         GOSSIP SEED:                             <empty> (<DEFAULT>)
-         GOSSIP TIMEOUT MS:                       2500 (<DEFAULT>)
-         LEADER ELECTION TIMEOUT MS:              1000 (<DEFAULT>)
-         NODE PRIORITY:                           0 (<DEFAULT>)
-         QUORUM SIZE:                             1 (<DEFAULT>)
-         READ ONLY REPLICA:                       False (<DEFAULT>)
-         STREAM INFO CACHE CAPACITY:              0 (<DEFAULT>)
-         UNSAFE ALLOW SURPLUS NODES:              False (<DEFAULT>)
-
-    Database Options:
-         ALWAYS KEEP SCAVENGED:                   False (<DEFAULT>)
-         CACHED CHUNKS:                           -1 (<DEFAULT>)
-         CHUNK INITIAL READER COUNT:              5 (<DEFAULT>)
-         CHUNK SIZE:                              268435456 (<DEFAULT>)
-         CHUNKS CACHE SIZE:                       536871424 (<DEFAULT>)
-         COMMIT TIMEOUT MS:                       2000 (<DEFAULT>)
-         DB:                                      /var/lib/eventstore (<DEFAULT>)
-         DB LOG FORMAT:                           V2 (<DEFAULT>)
-         DISABLE SCAVENGE MERGING:                False (<DEFAULT>)
-         HASH COLLISION READ LIMIT:               100 (<DEFAULT>)
-         INDEX:                                   <empty> (<DEFAULT>)
-         INDEX CACHE DEPTH:                       16 (<DEFAULT>)
-         INDEX CACHE SIZE:                        0 (<DEFAULT>)
-         INITIALIZATION THREADS:                  1 (<DEFAULT>)
-         MAX AUTO MERGE INDEX LEVEL:              2147483647 (<DEFAULT>)
-         MAX MEM TABLE SIZE:                      1000000 (<DEFAULT>)
-         MAX TRUNCATION:                          268435456 (<DEFAULT>)
-         MEM DB:                                  False (<DEFAULT>)
-         MIN FLUSH DELAY MS:                      2 (<DEFAULT>)
-         OPTIMIZE INDEX MERGE:                    False (<DEFAULT>)
-         PREPARE TIMEOUT MS:                      2000 (<DEFAULT>)
-         READER THREADS COUNT:                    0 (<DEFAULT>)
-         REDUCE FILE CACHE PRESSURE:              False (<DEFAULT>)
-         SCAVENGE BACKEND CACHE SIZE:             67108864 (<DEFAULT>)
-         SCAVENGE BACKEND PAGE SIZE:              16384 (<DEFAULT>)
-         SCAVENGE HASH USERS CACHE CAPACITY:      100000 (<DEFAULT>)
-         SCAVENGE HISTORY MAX AGE:                30 (<DEFAULT>)
-         SKIP DB VERIFY:                          False (<DEFAULT>)
-         SKIP INDEX VERIFY:                       False (<DEFAULT>)
-         STATS STORAGE:                           File (<DEFAULT>)
-         STREAM EXISTENCE FILTER SIZE:            256000000 (<DEFAULT>)
-         UNBUFFERED:                              False (<DEFAULT>)
-         UNSAFE DISABLE FLUSH TO DISK:            False (<DEFAULT>)
-         UNSAFE IGNORE HARD DELETE:               False (<DEFAULT>)
-         USE INDEX BLOOM FILTERS:                 True (<DEFAULT>)
-         WRITE STATS TO DB:                       False (<DEFAULT>)
-         WRITE THROUGH:                           False (<DEFAULT>)
-         WRITE TIMEOUT MS:                        2000 (<DEFAULT>)
-
-    Default User Options:
-         DEFAULT ADMIN PASSWORD:                  **** (<DEFAULT>)
-         DEFAULT OPS PASSWORD:                    **** (<DEFAULT>)
-
-    Dev mode Options:
-         DEV:                                     False (<DEFAULT>)
-         REMOVE DEV CERTS:                        False (<DEFAULT>)
-
-    gRPC Options:
-         KEEP ALIVE INTERVAL:                     10000 (<DEFAULT>)
-         KEEP ALIVE TIMEOUT:                      10000 (<DEFAULT>)
-
-    Interface Options:
-         ADVERTISE HOST TO CLIENT AS:             <empty> (<DEFAULT>)
-         ADVERTISE HTTP PORT TO CLIENT AS:        0 (<DEFAULT>)
-         ADVERTISE NODE PORT TO CLIENT AS:        0 (<DEFAULT>)
-         CONNECTION PENDING SEND BYTES THRESHOLD: 10485760 (<DEFAULT>)
-         CONNECTION QUEUE SIZE THRESHOLD:         50000 (<DEFAULT>)
-         DISABLE ADMIN UI:                        False (<DEFAULT>)
-         DISABLE GOSSIP ON HTTP:                  False (<DEFAULT>)
-         DISABLE INTERNAL TCP TLS:                False (<DEFAULT>)
-         DISABLE STATS ON HTTP:                   False (<DEFAULT>)
-         ENABLE ATOM PUB OVER HTTP:               False (<DEFAULT>)
-         ENABLE TRUSTED AUTH:                     False (<DEFAULT>)
-         ENABLE UNIX SOCKET:                      False (<DEFAULT>)
-         EXT HOST ADVERTISE AS:                   <empty> (<DEFAULT>)
-         EXT IP:                                  127.0.0.1 (<DEFAULT>)
-         GOSSIP ON SINGLE NODE:                   <empty> (<DEFAULT>)
-         HTTP PORT:                               2113 (<DEFAULT>)
-         HTTP PORT ADVERTISE AS:                  0 (<DEFAULT>)
-         INT HOST ADVERTISE AS:                   <empty> (<DEFAULT>)
-         INT IP:                                  127.0.0.1 (<DEFAULT>)
-         INT TCP HEARTBEAT INTERVAL:              700 (<DEFAULT>)
-         INT TCP HEARTBEAT TIMEOUT:               700 (<DEFAULT>)
-         INT TCP PORT:                            1112 (<DEFAULT>)
-         INT TCP PORT ADVERTISE AS:               0 (<DEFAULT>)
-         NODE HEARTBEAT INTERVAL:                 2000 (<DEFAULT>)
-         NODE HEARTBEAT TIMEOUT:                  1000 (<DEFAULT>)
-         NODE HOST ADVERTISE AS:                  <empty> (<DEFAULT>)
-         NODE IP:                                 127.0.0.1 (<DEFAULT>)
-         NODE PORT:                               2113 (<DEFAULT>)
-         NODE PORT ADVERTISE AS:                  0 (<DEFAULT>)
-         REPLICATION HEARTBEAT INTERVAL:          700 (<DEFAULT>)
-         REPLICATION HEARTBEAT TIMEOUT:           700 (<DEFAULT>)
-         REPLICATION HOST ADVERTISE AS:           <empty> (<DEFAULT>)
-         REPLICATION IP:                          127.0.0.1 (<DEFAULT>)
-         REPLICATION PORT:                        1112 (<DEFAULT>)
-         REPLICATION TCP PORT ADVERTISE AS:       0 (<DEFAULT>)
-
-    Logging Options:
-         DISABLE LOG FILE:                        False (<DEFAULT>)
-         LOG:                                     /var/log/eventstore (<DEFAULT>)
-         LOG CONFIG:                              logconfig.json (<DEFAULT>)
-         LOG CONSOLE FORMAT:                      Plain (<DEFAULT>)
-         LOG FILE INTERVAL:                       Day (<DEFAULT>)
-         LOG FILE RETENTION COUNT:                31 (<DEFAULT>)
-         LOG FILE SIZE:                           1073741824 (<DEFAULT>)
-         LOG LEVEL:                               Default (<DEFAULT>)
-
-    Projection Options:
-         FAULT OUT OF ORDER PROJECTIONS:          False (<DEFAULT>)
-         PROJECTION COMPILATION TIMEOUT:          500 (<DEFAULT>)
-         PROJECTION EXECUTION TIMEOUT:            250 (<DEFAULT>)
-         PROJECTION THREADS:                      3 (<DEFAULT>)
-         PROJECTIONS QUERY EXPIRY:                5 (<DEFAULT>)
-         RUN PROJECTIONS:                         None (<DEFAULT>)
-         START STANDARD PROJECTIONS:              False (<DEFAULT>)
-
-```
-:::
-
-::: note 
-Version 21.6 introduced a stricter configuration check: the server will _not start_ when an unknown
-configuration options is passed in either the configuration file, environment variable or command line.
-
-E.g: the following will prevent the server from starting:
-
-* `--UnknownConfig` on the command line
-* `EVENTSTORE_UnknownConfig` through environment variable
-* `UnknownConfig: value` in the config file
-
-And will output on `stdout`
-only: _Error while parsing options: The option UnknownConfig is not a known option. (Parameter 'UnknownConfig')_.
-:::
-
-## Autoconfigured options
-
-Some options are configured at startup to make better use of the available resources on larger instances or
-machines.
-
-These options are `StreamInfoCacheCapacity`, `ReaderThreadsCount`, and `WorkerThreads`.
-
-Autoconfiguration does not apply in containerized environments.
-
-### StreamInfoCacheCapacity
-
-This option sets the maximum number of entries to keep in the stream info cache. This is the lookup that
-contains the information of any stream that has recently been read or written to. Having entries in this cache
-significantly improves write and read performance to cached streams on larger databases.
-
-By default, the cache dynamically resizes according to the amount of free memory. The minimum that it can be set to is 100,000 entries.
-
-| Format               | Syntax                                  |
-|:---------------------|:----------------------------------------|
-| Command line         | `--stream-info-cache-capacity`          |
-| YAML                 | `StreamInfoCacheCapacity`               |
-| Environment variable | `EVENTSTORE_STREAM_INFO_CACHE_CAPACITY` |
-
-The option is set to 0 by default, which enables dynamic resizing. The default on previous versions of
-EventStoreDb was 100,000 entries.
-
-::: note
-The default value of 0 for `StreamInfoCacheCapacity` might not always be the best value for optimal performance. Ideally, it should be set to double the number of streams in the anticipated working set.
-
-The total number of streams can be obtained by checking the event count in the `$streams` system stream. This stream is created by the [$streams system projection](projections.md#streams-projection).
-
-It should be noted that the total number of streams does not necessarily give you the anticipated working set. The working set of streams is the set of streams that you intend on actively reading, writing, and/or subscribing to. This can be much lower than the total number of streams in certain cases, especially in systems that have many short-lived streams.
-:::
-
-### ReaderThreadsCount
-
-This option configures the number of reader threads available to EventStoreDb. Having more reader threads
-allows more concurrent reads to be processed.
-
-The reader threads count will be set at startup to twice the number of available processors, with a minimum of
-4 and a maximum of 16 threads.
-
-| Format               | Syntax                            |
-|:---------------------|:----------------------------------|
-| Command line         | `--reader-threads-count`          |
-| YAML                 | `ReaderThreadsCount`              |
-| Environment variable | `EVENTSTORE_READER_THREADS_COUNT` |
-
-The option is set to 0 by default, which enables autoconfiguration. The default on previous versions of
-EventStoreDb was 4 threads.
-
-::: warning 
-Increasing the reader threads count too high can cause read timeouts if your disk cannot handle the
-increased load.
-:::
-
-### WorkerThreads
-
-The `WorkerThreads` option configures the number of threads available to the pool of worker services.
-
-At startup the number of worker threads will be set to 10 if there are more than 4 reader threads. Otherwise,
-it will be set to have 5 threads available.
-
-| Format               | Syntax                      |
-|:---------------------|:----------------------------|
-| Command line         | `--worker-threads`          |
-| YAML                 | `WorkerThreads`             |
-| Environment variable | `EVENTSTORE_WORKER_THREADS` |
-
-The option is set to 0 by default, which enables autoconfiguration. The default on previous versions of
-EventStoreDb was 5 threads.
-
-## Plugins configuration
-
-The commercial edition of EventStoreDB ships with several plugins that augment the behavior of the open source server. Each plugin is documented in relevant sections. For example, under Security, you will find the User Certificates plugin documentation.
-
-The plugins (apart from the `ldap` plugin) are configured separately to the main server configuration and can be configured via `json` files and `environment variables`.
-
-Environment variables take precedence.
-
-#### JSON files
-
-Each configurable plugin comes with a sample JSON file in the `<installation-directory>/plugins/<plugin-name>` directory.
-Here is an example file called `user-certificates-plugin-example.json` to enable the user certificates plugin.
-
-```json
-{
-  "EventStore": {
-    "Plugins": {
-      "UserCertificates": {
-        "Enabled": true
-      }
-    }
-  }
-}
-```
-
-The system looks for JSON configuration files in a `<installation-directory>/config/` directory, and on Linux and OS X, the server additionally looks in `/etc/eventstore/config/`. To take effect, JSON configuration must be saved to one of these locations.
-
-The JSON configuration may be split across multiple files or combined into a single file. Apart from the `.json` extension, the names of the files is not important.
-
-#### Environment variables
-
-Any configuration can alternatively be provided via environment variables.
-
-Use `__` as the level delimiter.
-
-For example, the key configured above in json can also be set with the following environment variable:
-
-```:no-line-numbers
-EventStore__Plugins__UserCertificates__Enabled
-```
diff --git a/docs/db-config.md b/docs/db-config.md
deleted file mode 100644
index 11ff3274dc3..00000000000
--- a/docs/db-config.md
+++ /dev/null
@@ -1,171 +0,0 @@
----
-title: Database
----
-
-## Database settings
-
-On this page, you find settings that tune the database server behaviour. Only modify these settings if you know what you are doing or when requested by Event Store support personnel.
-
-### Database location
-
-EventStoreDB has a single database, which is spread across ever-growing number of physical files on the file system. Those files are called chunks and new data is always appended to the end of the latest chunk. When the chunk grows over 256 MiB, the server closes the chunk and opens a new one.
-
-Normally, you'd want to keep the database files separated from the OS and other application files. The `Db` setting tells EventStoreDB where to put those chunk files. If the database server doesn't find anything at the specified location, it will create a new database.
-
-| Format               | Syntax          |
-|:---------------------|:----------------|
-| Command line         | `--db`          |
-| YAML                 | `Db`            |
-| Environment variable | `EVENTSTORE_DB` |
-
-**Default**: the default database location is platform specific. On Windows, the database will be stored in the `data` directory inside the EventStoreDB installation location. On Linux, it will be `/var/lib/eventstore`.
-
-### In-memory database
-
-When running EventStoreDB for educational purposes or in an automated test environment, you might want to prevent it from saving any data to the disk. EventStoreDB can keep the data in memory as soon as it has enough available RAM. When you shut down the instance that uses in-memory database, all the data will be lost.
-
-| Format               | Syntax              |
-|:---------------------|:--------------------|
-| Command line         | `--mem-db`          |
-| YAML                 | `MemDb`             |
-| Environment variable | `EVENTSTORE_MEM_DB` |
-
-**Default**: `false`
-
-### Skip database verification
-
-When the database node restarts, it checks the database files to ensure they aren't corrupted. It is a lengthy process and can take hours on a large database. EventStoreDB normally flushes every write to disk, so database files are unlikely to get corrupted. In an environment where nodes restart often for some reason, you might want to disable the database verification to allow faster startup of the node.
-
-| Format               | Syntax                      |
-|:---------------------|:----------------------------|
-| Command line         | `--skip-db-verify`          |
-| YAML                 | `SkipDbVerify`              |
-| Environment variable | `EVENTSTORE_SKIP_DB_VERIFY` |
-
-**Default**: `false`
-
-### Chunk cache
-
-You can increase the number of chunk files that are cached if you have free memory on the nodes.
-
-The [stats response](diagnostics/README.md#statistics) contains two fields: `es-readIndex-cachedRecord` and `es-readIndex-notCachedRecord`. Statistic values for those fields tell you how many times a chunk file was retrieved from the cache and from the disk. We expect the two most recent chunks (the current chunk and the previous one) to be most frequently accessed and therefore cached.
-
-If you observe that the `es-readIndex-notCachedRecord` stats value gets significantly higher than the `es-readIndex-cachedRecord`, you can try adjusting the chunk cache.
-
-The setting `ChunkCacheSize` tells the server how much memory it can use to cache chunks (in bytes). The chunk size is 256 MiB max, so the default cache size (two chunks) is 0.5 GiB. To increase the cache size to four chunks, you can set the value to 1 GiB (`1073741824` bytes).
-
-Remember that only the latest chunks get cached. Also consider that the OS has its own file cache and increasing the chunk cache might not bring the desired performance benefit.
-
-| Format               | Syntax                         |
-|:---------------------|:-------------------------------|
-| Command line         | `--chunks-cache-size`          |
-| YAML                 | `ChunksCacheSize `             |
-| Environment variable | `EVENTSTORE_CHUNKS_CACHE_SIZE` |
-
-**Default**: `536871424`
-
-You would also need to adjust the `CachedChunks` setting to tell the server how many chunk files you want to keep in cache. For example, to double the number of cached chunks, set the `CachedChunks` setting to `4`.
-
-| Format               | Syntax                     |
-|:---------------------|:---------------------------|
-| Command line         | `--cached-chunks`          |
-| YAML                 | `CachedChunks `            |
-| Environment variable | `EVENTSTORE_CACHED_CHUNKS` |
-
-**Default**: `-1` (all)
-
-### Prepare and Commit timeouts
-
-Having prepare and commit timeouts of 2000 ms (default) means that any write done on the cluster may take up to 2000 ms before the server replies to the client that this write has timed out.
-
-Depending on your client operation timeout settings (default is 7 seconds), increasing the timeout may block a client for up to the minimum of those two timeouts which may reduce the throughput if set to a large value. The server also needs to keep track of all these writes and retries in memory until the time out is over. If a large number of them accumulate, it may slow things down.
-
-| Format               | Syntax                          |
-|:---------------------|:--------------------------------|
-| Command line         | `--prepare-timeout-ms`          |
-| YAML                 | `PrepareTimeoutMs`              |
-| Environment variable | `EVENTSTORE_PREPARE_TIMEOUT_MS` |
-
-**Default**: `2000` (in milliseconds)
-
-| Format               | Syntax                         |
-|:---------------------|:-------------------------------|
-| Command line         | `--commit-timeout-ms`          |
-| YAML                 | `CommitTimeoutMs`              |
-| Environment variable | `EVENTSTORE_COMMIT_TIMEOUT_MS` |
-
-**Default**: `2000` (in milliseconds)
-
-### Disable flush to disk
-
-:::warning
-Using this option might cause data loss.
-:::
-
-This will prevent EventStoreDB from forcing the flush to disk after writes. Please note that this is unsafe in case of a power outage.
-
-With this option enabled, EventStoreDB will still write data to the disk at the application level but not necessarily at the OS level. Usually, the OS should flush its buffers at regular intervals or when a process exits but it is something that's opaque to EventStoreDB.
-
-| Format               | Syntax                                    |
-|:---------------------|:------------------------------------------|
-| Command line         | `--unsafe-disable-flush-to-disk`          |
-| YAML                 | `UnsafeDisableFlushToDisk`                |
-| Environment variable | `EVENTSTORE_UNSAFE_DISABLE_FLUSH_TO_DISK` |
-
-**Default**: `false`
-
-### Minimum flush delay
-
-The minimum flush delay in milliseconds.
-
-<!-- TODO -->
-
-| Format               | Syntax                           |
-|:---------------------|:---------------------------------|
-| Command line         | `--min-flush-delay-ms`           |
-| YAML                 | `MinFlushDelayMs`                |
-| Environment variable | `EVENTSTORE_MIN_FLUSH_DELAY_MS ` |
-
-**Default**: `2` (ms)
-
-## Threading
-
-### Worker threads
-
-A variety of undifferentiated work is carried out on general purpose worker threads, including sending over a network, authentication, and completion of HTTP requests.
-
-Increasing the number of threads beyond that necessary to satisfy the workload generated by other components in the system may result in additional unnecessary context switching overhead.
-
-| Format               | Syntax                      |
-|:---------------------|:----------------------------|
-| Command line         | `--worker-threads`          |
-| YAML                 | `WorkerThreads`             |
-| Environment variable | `EVENTSTORE_WORKER_THREADS` |
-
-**Default**: `5`
-
-### Reader threads count
-
-Reader threads are used for all read operations on data files - whether the requests originate from the client or internal requests to the database. There are a number of things that cause operations to be dispatched to reader threads, including:
-
-- All index reads, including those to service stream and event number-based reads and for idempotent handling of write operations when an expected version is specified.
-- Data to service requests originating from either the HTTP or client APIs.
-- Projections needing to read data for processing.
-- Authorization needing to read access control lists from stream metadata.
-
-| Format               | Syntax                            |
-|:---------------------|:----------------------------------|
-| Command line         | `--reader-threads-count`          |
-| YAML                 | `ReaderThreadsCount`              |
-| Environment variable | `EVENTSTORE_READER_THREADS_COUNT` |
-
-**Default**: `4`
-
-Reads are queued until a reader thread becomes available to service them. If an operation doesn't complete within an internal deadline window, a disk operation is not dispatched by the worker thread which processes the operation.
-
-The size of read operations is dependent on the size of the events appended, not on the database chunk size, which has a fixed logical size. Larger reads (subject to the operating system page size) result in more time being spent in system calls and less availability of reader threads.
-
-A higher reader count can be useful, if disks are able to support more concurrent operations. Context switching incurs additional costs in terms of performance. If disks are already saturated, adding more reader threads can exacerbate that issue and lead to more failed requests.
-
-Increasing the count of reader threads can improve performance up to a point, but it is likely to rapidly tail off once that limit is reached.
-
diff --git a/docs/diagnostics/README.md b/docs/diagnostics/README.md
deleted file mode 100644
index 55861dda6e1..00000000000
--- a/docs/diagnostics/README.md
+++ /dev/null
@@ -1,365 +0,0 @@
-# Diagnostics
-
-EventStoreDB provides several ways to diagnose and troubleshoot issues.
-
-- [Logging](logs.md): structured or plain-text logs on the console and in log files.
-- [Metrics](metrics.md): collect standard metrics using Prometheus or OpenTelemetry.
-- [Stats](#statistics): stats collection and HTTP endpoint.
-
-You can also use external tools to measure the performance of EventStoreDB and monitor the cluster health. Learn more on the [Integrations](./integrations.md) page.
-
-## Statistics
-
-EventStoreDB servers collect internal statistics and make it available via HTTP over
-the `https://<host>:2113/stats` in JSON format. Here, `2113` is the default HTTP port. Monitoring applications
-and metric collectors can use this endpoint to gather the information about the cluster node. The `stats`
-endpoint only exposes information about the node where you fetch it from and doesn't contain any cluster
-information.
-
-What you see in the `stats` endpoint response is the last collected state of the server. The server collects
-this information using events that are appended to the statistics stream. Each node has one. We use a reserved
-name for the stats stream, `$stats-<host:port>`. For example, for a single node running locally the stream
-name would be `$stats-127.0.0.1:2113`.
-
-As all other events, stats events are also linked in the `$all` stream. These events have a reserved event
-type `$statsCollected`.
-
-::: details Click here to see an example of a stats event
-
-```json
-{
-  "proc-startTime": "2020-06-25T10:13:26.8281750Z",
-  "proc-id": 5465,
-  "proc-mem": 118648832,
-  "proc-cpu": 2.44386363,
-  "proc-cpuScaled": 0.152741477,
-  "proc-threadsCount": 10,
-  "proc-contentionsRate": 0.9012223,
-  "proc-thrownExceptionsRate": 0.0,
-  "sys-cpu": 100.0,
-  "sys-freeMem": 25100288,
-  "proc-gc-allocationSpeed": 0.0,
-  "proc-gc-gen0ItemsCount": 8,
-  "proc-gc-gen0Size": 0,
-  "proc-gc-gen1ItemsCount": 2,
-  "proc-gc-gen1Size": 0,
-  "proc-gc-gen2ItemsCount": 0,
-  "proc-gc-gen2Size": 0,
-  "proc-gc-largeHeapSize": 0,
-  "proc-gc-timeInGc": 0.0,
-  "proc-gc-totalBytesInHeaps": 0,
-  "proc-tcp-connections": 0,
-  "proc-tcp-receivingSpeed": 0.0,
-  "proc-tcp-sendingSpeed": 0.0,
-  "proc-tcp-inSend": 0,
-  "proc-tcp-measureTime": "00:00:19.0534210",
-  "proc-tcp-pendingReceived": 0,
-  "proc-tcp-pendingSend": 0,
-  "proc-tcp-receivedBytesSinceLastRun": 0,
-  "proc-tcp-receivedBytesTotal": 0,
-  "proc-tcp-sentBytesSinceLastRun": 0,
-  "proc-tcp-sentBytesTotal": 0,
-  "es-checksum": 1613144,
-  "es-checksumNonFlushed": 1613144,
-  "sys-drive-/System/Volumes/Data-availableBytes": 545628151808,
-  "sys-drive-/System/Volumes/Data-totalBytes": 2000481927168,
-  "sys-drive-/System/Volumes/Data-usage": "72%",
-  "sys-drive-/System/Volumes/Data-usedBytes": 1454853775360,
-  "es-queue-Index Committer-queueName": "Index Committer",
-  "es-queue-Index Committer-groupName": "",
-  "es-queue-Index Committer-avgItemsPerSecond": 0,
-  "es-queue-Index Committer-avgProcessingTime": 0.0,
-  "es-queue-Index Committer-currentIdleTime": "0:00:00:29.9895180",
-  "es-queue-Index Committer-currentItemProcessingTime": null,
-  "es-queue-Index Committer-idleTimePercent": 100.0,
-  "es-queue-Index Committer-length": 0,
-  "es-queue-Index Committer-lengthCurrentTryPeak": 0,
-  "es-queue-Index Committer-lengthLifetimePeak": 0,
-  "es-queue-Index Committer-totalItemsProcessed": 0,
-  "es-queue-Index Committer-inProgressMessage": "<none>",
-  "es-queue-Index Committer-lastProcessedMessage": "<none>",
-  "es-queue-MainQueue-queueName": "MainQueue",
-  "es-queue-MainQueue-groupName": "",
-  "es-queue-MainQueue-avgItemsPerSecond": 14,
-  "es-queue-MainQueue-avgProcessingTime": 0.0093527972027972021,
-  "es-queue-MainQueue-currentIdleTime": "0:00:00:00.8050567",
-  "es-queue-MainQueue-currentItemProcessingTime": null,
-  "es-queue-MainQueue-idleTimePercent": 99.986616840364917,
-  "es-queue-MainQueue-length": 0,
-  "es-queue-MainQueue-lengthCurrentTryPeak": 3,
-  "es-queue-MainQueue-lengthLifetimePeak": 6,
-  "es-queue-MainQueue-totalItemsProcessed": 452,
-  "es-queue-MainQueue-inProgressMessage": "<none>",
-  "es-queue-MainQueue-lastProcessedMessage": "Schedule",
-  "es-queue-MonitoringQueue-queueName": "MonitoringQueue",
-  "es-queue-MonitoringQueue-groupName": "",
-  "es-queue-MonitoringQueue-avgItemsPerSecond": 0,
-  "es-queue-MonitoringQueue-avgProcessingTime": 1.94455,
-  "es-queue-MonitoringQueue-currentIdleTime": "0:00:00:19.0601186",
-  "es-queue-MonitoringQueue-currentItemProcessingTime": null,
-  "es-queue-MonitoringQueue-idleTimePercent": 99.980537727681721,
-  "es-queue-MonitoringQueue-length": 0,
-  "es-queue-MonitoringQueue-lengthCurrentTryPeak": 0,
-  "es-queue-MonitoringQueue-lengthLifetimePeak": 0,
-  "es-queue-MonitoringQueue-totalItemsProcessed": 14,
-  "es-queue-MonitoringQueue-inProgressMessage": "<none>",
-  "es-queue-MonitoringQueue-lastProcessedMessage": "GetFreshTcpConnectionStats",
-  "es-queue-PersistentSubscriptions-queueName": "PersistentSubscriptions",
-  "es-queue-PersistentSubscriptions-groupName": "",
-  "es-queue-PersistentSubscriptions-avgItemsPerSecond": 1,
-  "es-queue-PersistentSubscriptions-avgProcessingTime": 0.010400000000000001,
-  "es-queue-PersistentSubscriptions-currentIdleTime": "0:00:00:00.8052015",
-  "es-queue-PersistentSubscriptions-currentItemProcessingTime": null,
-  "es-queue-PersistentSubscriptions-idleTimePercent": 99.998954276430226,
-  "es-queue-PersistentSubscriptions-length": 0,
-  "es-queue-PersistentSubscriptions-lengthCurrentTryPeak": 0,
-  "es-queue-PersistentSubscriptions-lengthLifetimePeak": 0,
-  "es-queue-PersistentSubscriptions-totalItemsProcessed": 32,
-  "es-queue-PersistentSubscriptions-inProgressMessage": "<none>",
-  "es-queue-PersistentSubscriptions-lastProcessedMessage": "PersistentSubscriptionTimerTick",
-  "es-queue-Projection Core #0-queueName": "Projection Core #0",
-  "es-queue-Projection Core #0-groupName": "Projection Core",
-  "es-queue-Projection Core #0-avgItemsPerSecond": 0,
-  "es-queue-Projection Core #0-avgProcessingTime": 0.0,
-  "es-queue-Projection Core #0-currentIdleTime": "0:00:00:29.9480513",
-  "es-queue-Projection Core #0-currentItemProcessingTime": null,
-  "es-queue-Projection Core #0-idleTimePercent": 100.0,
-  "es-queue-Projection Core #0-length": 0,
-  "es-queue-Projection Core #0-lengthCurrentTryPeak": 0,
-  "es-queue-Projection Core #0-lengthLifetimePeak": 0,
-  "es-queue-Projection Core #0-totalItemsProcessed": 2,
-  "es-queue-Projection Core #0-inProgressMessage": "<none>",
-  "es-queue-Projection Core #0-lastProcessedMessage": "SubComponentStarted",
-  "es-queue-Projections Master-queueName": "Projections Master",
-  "es-queue-Projections Master-groupName": "",
-  "es-queue-Projections Master-avgItemsPerSecond": 0,
-  "es-queue-Projections Master-avgProcessingTime": 0.0,
-  "es-queue-Projections Master-currentIdleTime": "0:00:00:29.8467445",
-  "es-queue-Projections Master-currentItemProcessingTime": null,
-  "es-queue-Projections Master-idleTimePercent": 100.0,
-  "es-queue-Projections Master-length": 0,
-  "es-queue-Projections Master-lengthCurrentTryPeak": 0,
-  "es-queue-Projections Master-lengthLifetimePeak": 3,
-  "es-queue-Projections Master-totalItemsProcessed": 10,
-  "es-queue-Projections Master-inProgressMessage": "<none>",
-  "es-queue-Projections Master-lastProcessedMessage": "RegularTimeout",
-  "es-queue-Storage Chaser-queueName": "Storage Chaser",
-  "es-queue-Storage Chaser-groupName": "",
-  "es-queue-Storage Chaser-avgItemsPerSecond": 94,
-  "es-queue-Storage Chaser-avgProcessingTime": 0.0043385023898035047,
-  "es-queue-Storage Chaser-currentIdleTime": "0:00:00:00.0002530",
-  "es-queue-Storage Chaser-currentItemProcessingTime": null,
-  "es-queue-Storage Chaser-idleTimePercent": 99.959003031702224,
-  "es-queue-Storage Chaser-length": 0,
-  "es-queue-Storage Chaser-lengthCurrentTryPeak": 0,
-  "es-queue-Storage Chaser-lengthLifetimePeak": 0,
-  "es-queue-Storage Chaser-totalItemsProcessed": 2835,
-  "es-queue-Storage Chaser-inProgressMessage": "<none>",
-  "es-queue-Storage Chaser-lastProcessedMessage": "ChaserCheckpointFlush",
-  "es-queue-StorageReaderQueue #1-queueName": "StorageReaderQueue #1",
-  "es-queue-StorageReaderQueue #1-groupName": "StorageReaderQueue",
-  "es-queue-StorageReaderQueue #1-avgItemsPerSecond": 0,
-  "es-queue-StorageReaderQueue #1-avgProcessingTime": 0.22461000000000003,
-  "es-queue-StorageReaderQueue #1-currentIdleTime": "0:00:00:00.9863988",
-  "es-queue-StorageReaderQueue #1-currentItemProcessingTime": null,
-  "es-queue-StorageReaderQueue #1-idleTimePercent": 99.988756844383616,
-  "es-queue-StorageReaderQueue #1-length": 0,
-  "es-queue-StorageReaderQueue #1-lengthCurrentTryPeak": 0,
-  "es-queue-StorageReaderQueue #1-lengthLifetimePeak": 0,
-  "es-queue-StorageReaderQueue #1-totalItemsProcessed": 15,
-  "es-queue-StorageReaderQueue #1-inProgressMessage": "<none>",
-  "es-queue-StorageReaderQueue #1-lastProcessedMessage": "ReadStreamEventsBackward",
-  "es-queue-StorageReaderQueue #2-queueName": "StorageReaderQueue #2",
-  "es-queue-StorageReaderQueue #2-groupName": "StorageReaderQueue",
-  "es-queue-StorageReaderQueue #2-avgItemsPerSecond": 0,
-  "es-queue-StorageReaderQueue #2-avgProcessingTime": 8.83216,
-  "es-queue-StorageReaderQueue #2-currentIdleTime": "0:00:00:00.8051068",
-  "es-queue-StorageReaderQueue #2-currentItemProcessingTime": null,
-  "es-queue-StorageReaderQueue #2-idleTimePercent": 99.557874170777851,
-  "es-queue-StorageReaderQueue #2-length": 0,
-  "es-queue-StorageReaderQueue #2-lengthCurrentTryPeak": 0,
-  "es-queue-StorageReaderQueue #2-lengthLifetimePeak": 0,
-  "es-queue-StorageReaderQueue #2-totalItemsProcessed": 16,
-  "es-queue-StorageReaderQueue #2-inProgressMessage": "<none>",
-  "es-queue-StorageReaderQueue #2-lastProcessedMessage": "ReadStreamEventsForward",
-  "es-queue-StorageReaderQueue #3-queueName": "StorageReaderQueue #3",
-  "es-queue-StorageReaderQueue #3-groupName": "StorageReaderQueue",
-  "es-queue-StorageReaderQueue #3-avgItemsPerSecond": 0,
-  "es-queue-StorageReaderQueue #3-avgProcessingTime": 6.4189888888888893,
-  "es-queue-StorageReaderQueue #3-currentIdleTime": "0:00:00:02.8228372",
-  "es-queue-StorageReaderQueue #3-currentItemProcessingTime": null,
-  "es-queue-StorageReaderQueue #3-idleTimePercent": 99.710808119472517,
-  "es-queue-StorageReaderQueue #3-length": 0,
-  "es-queue-StorageReaderQueue #3-lengthCurrentTryPeak": 0,
-  "es-queue-StorageReaderQueue #3-lengthLifetimePeak": 0,
-  "es-queue-StorageReaderQueue #3-totalItemsProcessed": 14,
-  "es-queue-StorageReaderQueue #3-inProgressMessage": "<none>",
-  "es-queue-StorageReaderQueue #3-lastProcessedMessage": "ReadStreamEventsForward",
-  "es-queue-StorageReaderQueue #4-queueName": "StorageReaderQueue #4",
-  "es-queue-StorageReaderQueue #4-groupName": "StorageReaderQueue",
-  "es-queue-StorageReaderQueue #4-avgItemsPerSecond": 0,
-  "es-queue-StorageReaderQueue #4-avgProcessingTime": 0.36447,
-  "es-queue-StorageReaderQueue #4-currentIdleTime": "0:00:00:01.8144419",
-  "es-queue-StorageReaderQueue #4-currentItemProcessingTime": null,
-  "es-queue-StorageReaderQueue #4-idleTimePercent": 99.981747643099709,
-  "es-queue-StorageReaderQueue #4-length": 0,
-  "es-queue-StorageReaderQueue #4-lengthCurrentTryPeak": 0,
-  "es-queue-StorageReaderQueue #4-lengthLifetimePeak": 0,
-  "es-queue-StorageReaderQueue #4-totalItemsProcessed": 14,
-  "es-queue-StorageReaderQueue #4-inProgressMessage": "<none>",
-  "es-queue-StorageReaderQueue #4-lastProcessedMessage": "ReadStreamEventsForward",
-  "es-queue-StorageWriterQueue-queueName": "StorageWriterQueue",
-  "es-queue-StorageWriterQueue-groupName": "",
-  "es-queue-StorageWriterQueue-avgItemsPerSecond": 0,
-  "es-queue-StorageWriterQueue-avgProcessingTime": 0.0,
-  "es-queue-StorageWriterQueue-currentIdleTime": "0:00:00:29.9437790",
-  "es-queue-StorageWriterQueue-currentItemProcessingTime": null,
-  "es-queue-StorageWriterQueue-idleTimePercent": 100.0,
-  "es-queue-StorageWriterQueue-length": 0,
-  "es-queue-StorageWriterQueue-lengthCurrentTryPeak": 0,
-  "es-queue-StorageWriterQueue-lengthLifetimePeak": 0,
-  "es-queue-StorageWriterQueue-totalItemsProcessed": 6,
-  "es-queue-StorageWriterQueue-inProgressMessage": "<none>",
-  "es-queue-StorageWriterQueue-lastProcessedMessage": "WritePrepares",
-  "es-queue-Subscriptions-queueName": "Subscriptions",
-  "es-queue-Subscriptions-groupName": "",
-  "es-queue-Subscriptions-avgItemsPerSecond": 1,
-  "es-queue-Subscriptions-avgProcessingTime": 0.057019047619047622,
-  "es-queue-Subscriptions-currentIdleTime": "0:00:00:00.8153708",
-  "es-queue-Subscriptions-currentItemProcessingTime": null,
-  "es-queue-Subscriptions-idleTimePercent": 99.993992971356,
-  "es-queue-Subscriptions-length": 0,
-  "es-queue-Subscriptions-lengthCurrentTryPeak": 0,
-  "es-queue-Subscriptions-lengthLifetimePeak": 0,
-  "es-queue-Subscriptions-totalItemsProcessed": 31,
-  "es-queue-Subscriptions-inProgressMessage": "<none>",
-  "es-queue-Subscriptions-lastProcessedMessage": "CheckPollTimeout",
-  "es-queue-Timer-queueName": "Timer",
-  "es-queue-Timer-groupName": "",
-  "es-queue-Timer-avgItemsPerSecond": 14,
-  "es-queue-Timer-avgProcessingTime": 0.038568989547038329,
-  "es-queue-Timer-currentIdleTime": "0:00:00:00.0002752",
-  "es-queue-Timer-currentItemProcessingTime": null,
-  "es-queue-Timer-idleTimePercent": 99.94364205726194,
-  "es-queue-Timer-length": 17,
-  "es-queue-Timer-lengthCurrentTryPeak": 17,
-  "es-queue-Timer-lengthLifetimePeak": 17,
-  "es-queue-Timer-totalItemsProcessed": 419,
-  "es-queue-Timer-inProgressMessage": "<none>",
-  "es-queue-Timer-lastProcessedMessage": "ExecuteScheduledTasks",
-  "es-queue-Worker #1-queueName": "Worker #1",
-  "es-queue-Worker #1-groupName": "Workers",
-  "es-queue-Worker #1-avgItemsPerSecond": 2,
-  "es-queue-Worker #1-avgProcessingTime": 0.076058695652173922,
-  "es-queue-Worker #1-currentIdleTime": "0:00:00:00.8050943",
-  "es-queue-Worker #1-currentItemProcessingTime": null,
-  "es-queue-Worker #1-idleTimePercent": 99.982484504768721,
-  "es-queue-Worker #1-length": 0,
-  "es-queue-Worker #1-lengthCurrentTryPeak": 0,
-  "es-queue-Worker #1-lengthLifetimePeak": 0,
-  "es-queue-Worker #1-totalItemsProcessed": 73,
-  "es-queue-Worker #1-inProgressMessage": "<none>",
-  "es-queue-Worker #1-lastProcessedMessage": "ReadStreamEventsForwardCompleted",
-  "es-queue-Worker #2-queueName": "Worker #2",
-  "es-queue-Worker #2-groupName": "Workers",
-  "es-queue-Worker #2-avgItemsPerSecond": 2,
-  "es-queue-Worker #2-avgProcessingTime": 0.19399347826086957,
-  "es-queue-Worker #2-currentIdleTime": "0:00:00:00.8356863",
-  "es-queue-Worker #2-currentItemProcessingTime": null,
-  "es-queue-Worker #2-idleTimePercent": 99.955350254886739,
-  "es-queue-Worker #2-length": 0,
-  "es-queue-Worker #2-lengthCurrentTryPeak": 0,
-  "es-queue-Worker #2-lengthLifetimePeak": 0,
-  "es-queue-Worker #2-totalItemsProcessed": 69,
-  "es-queue-Worker #2-inProgressMessage": "<none>",
-  "es-queue-Worker #2-lastProcessedMessage": "PurgeTimedOutRequests",
-  "es-queue-Worker #3-queueName": "Worker #3",
-  "es-queue-Worker #3-groupName": "Workers",
-  "es-queue-Worker #3-avgItemsPerSecond": 2,
-  "es-queue-Worker #3-avgProcessingTime": 0.068475555555555567,
-  "es-queue-Worker #3-currentIdleTime": "0:00:00:00.8356754",
-  "es-queue-Worker #3-currentItemProcessingTime": null,
-  "es-queue-Worker #3-idleTimePercent": 99.984583460721979,
-  "es-queue-Worker #3-length": 0,
-  "es-queue-Worker #3-lengthCurrentTryPeak": 0,
-  "es-queue-Worker #3-lengthLifetimePeak": 0,
-  "es-queue-Worker #3-totalItemsProcessed": 68,
-  "es-queue-Worker #3-inProgressMessage": "<none>",
-  "es-queue-Worker #3-lastProcessedMessage": "PurgeTimedOutRequests",
-  "es-queue-Worker #4-queueName": "Worker #4",
-  "es-queue-Worker #4-groupName": "Workers",
-  "es-queue-Worker #4-avgItemsPerSecond": 2,
-  "es-queue-Worker #4-avgProcessingTime": 0.040221428571428575,
-  "es-queue-Worker #4-currentIdleTime": "0:00:00:00.8356870",
-  "es-queue-Worker #4-currentItemProcessingTime": null,
-  "es-queue-Worker #4-idleTimePercent": 99.99154911144629,
-  "es-queue-Worker #4-length": 0,
-  "es-queue-Worker #4-lengthCurrentTryPeak": 0,
-  "es-queue-Worker #4-lengthLifetimePeak": 0,
-  "es-queue-Worker #4-totalItemsProcessed": 65,
-  "es-queue-Worker #4-inProgressMessage": "<none>",
-  "es-queue-Worker #4-lastProcessedMessage": "PurgeTimedOutRequests",
-  "es-queue-Worker #5-queueName": "Worker #5",
-  "es-queue-Worker #5-groupName": "Workers",
-  "es-queue-Worker #5-avgItemsPerSecond": 2,
-  "es-queue-Worker #5-avgProcessingTime": 0.17759268292682928,
-  "es-queue-Worker #5-currentIdleTime": "0:00:00:00.8052165",
-  "es-queue-Worker #5-currentItemProcessingTime": null,
-  "es-queue-Worker #5-idleTimePercent": 99.9635548548067,
-  "es-queue-Worker #5-length": 0,
-  "es-queue-Worker #5-lengthCurrentTryPeak": 0,
-  "es-queue-Worker #5-lengthLifetimePeak": 0,
-  "es-queue-Worker #5-totalItemsProcessed": 70,
-  "es-queue-Worker #5-inProgressMessage": "<none>",
-  "es-queue-Worker #5-lastProcessedMessage": "IODispatcherDelayedMessage",
-  "es-writer-lastFlushSize": 0,
-  "es-writer-lastFlushDelayMs": 0.0134,
-  "es-writer-meanFlushSize": 0,
-  "es-writer-meanFlushDelayMs": 0.0134,
-  "es-writer-maxFlushSize": 0,
-  "es-writer-maxFlushDelayMs": 0.0134,
-  "es-writer-queuedFlushMessages": 0,
-  "es-readIndex-cachedRecord": 676,
-  "es-readIndex-notCachedRecord": 0,
-  "es-readIndex-cachedStreamInfo": 171,
-  "es-readIndex-notCachedStreamInfo": 32,
-  "es-readIndex-cachedTransInfo": 0,
-  "es-readIndex-notCachedTransInfo": 0
-}
-```
-
-:::
-
-Stats stream has the max time-to-live set to 24 hours, so all the events that are older than 24 hours will be
-deleted.
-
-### Stats period
-
-Using this setting you can control how often stats events are generated. By default, the node will produce one
-event in 30 seconds. If you want to decrease network pressure on subscribers to the `$all` stream, you can
-tell EventStoreDB to produce stats less often.
-
-| Format               | Syntax                        |
-| :------------------- | :---------------------------- |
-| Command line         | `--stats-period-sec`          |
-| YAML                 | `StatsPeriodSec`              |
-| Environment variable | `EVENTSTORE_STATS_PERIOD_SEC` |
-
-**Default**: `30`
-
-### Write stats to database
-
-As mentioned before, stats events are quite large and whilst it is sometimes beneficial to keep the stats
-history, it is most of the time not necessary. Therefore, we do not write stats events to the database by
-default. When this option is set to `true`, all the stats events will be persisted.
-
-As mentioned before, stats events have a TTL of 24 hours and when writing stats to the database is enabled,
-you'd need to scavenge more often to release the disk space.
-
-| Format               | Syntax                         |
-| :------------------- | :----------------------------- |
-| Command line         | `--write-stats-to-db`          |
-| YAML                 | `WriteStatsToDb`               |
-| Environment variable | `EVENTSTORE_WRITE_STATS_TO_DB` |
-
-**Default**: `false`
diff --git a/docs/diagnostics/integrations.md b/docs/diagnostics/integrations.md
deleted file mode 100644
index 2cc1a4d4fdc..00000000000
--- a/docs/diagnostics/integrations.md
+++ /dev/null
@@ -1,371 +0,0 @@
----
-title: "Integrations"
----
-
-# Monitoring integrations
-
-EventStoreDB supports several methods to integrate with external monitoring and observability tools. Those include:
-
-- [OpenTelemetry](#opentelemetry-exporter): export metrics to an OpenTelemetry-compatible endpoint
-- [Prometheus](#prometheus): collect metrics in Prometheus
-- [Datadog](#datadog): monitor and measure the cluster with Datadog
-- [ElasticSearch](#elasticsearch): this section describes how to collect EventStoreDB logs in ElasticSearch
-- [Vector](#vector): collect metrics and logs to your APM tool using Vector
-
-## Prometheus
-
-You can collect EventStoreDB metrics to Prometheus and configure Grafana dashboards to monitor your deployment.
-Event Store provides Prometheus support out of the box since version 23.6. Refer to [metrics](metrics.md) documentation to learn more.
-
-Older versions can be monitored by Prometheus using the community-supported exporter available in the [GitHub repository](https://github.com/marcinbudny/eventstore_exporter).
-
-## OpenTelemetry Exporter
-
-<wbr><Badge type="warning" vertical="middle" text="Commercial"/>
-
-EventStoreDB passively exposes metrics for scraping on the `/metrics` endpoint. If you would like EventStoreDB to actively export the metrics, the _OpenTelemetry Exporter Plugin_ can be used.
-
-The OpenTelemetry Exporter plugin allows you to export EventStoreDB metrics to a specified endpoint using the [OpenTelemetry Protocol](https://opentelemetry.io/docs/specs/otel/protocol/) (OTLP). The following instructions will help you set up the exporter and customize its configuration, so you can receive, process, export and monitor metrics as needed.
-
-A number of APM providers natively support ingesting metrics using the OTLP protocol, so you might be able to directly use the OpenTelemetry Exporter to send metrics to your APM provider. Alternatively, you can export metrics to the OpenTelemetry Collector, which can then be configured to send metrics to a variety of backends. You can find out more about the [OpenTelemetry collector](https://opentelemetry.io/docs/collector/).
-
-### Configuration
-
-Refer to the general [plugins configuration](../configuration.md#plugins-configuration) guide to see how to configure plugins with JSON files and environment variables.
-
-Sample JSON configuration:
-```json
-{
-  "OpenTelemetry": {
-    "Otlp": {
-      "Endpoint": "http://localhost:4317",
-      "Headers": ""
-    }
-  }
-}
-```
-
-The configuration can specify:
-
-| Name                          | Description                                            |
-|-------------------------------|--------------------------------------------------------|
-| OpenTelemetry__Otlp__Endpoint | Destination where the OTLP exporter will send the data |
-| OpenTelemetry__Otlp__Headers  | Optional headers for the connection                    |
-
-Headers are key-value pairs separated by commas. For example:
-```:no-line-numbers
-"Headers": "api-key=value,other-config-value=value"
-```
-
-EventStoreDB will log a message on startup confirming the metrics export to your specified endpoint:
-```:no-line-numbers
-OtlpExporter: Exporting metrics to http://localhost:4317/ every 15.0 seconds
-```
-
-The interval is taken from the `ExpectedScrapeIntervalSeconds` value in `metricsconfig.json` in the server installation directory:
-
-```:no-line-numbers
-"ExpectedScrapeIntervalSeconds": 15
-```
-
-### Troubleshooting
-
-| Symptom                                                                      | Solution                                                                                                                                                                                                                                                                                    |
-|------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| The OpenTelemetry Exporter plugin is not loaded                              | The OpenTelemetry Exporter plugin is only available in commercial editions. Check that it is present in `<installation-directory>/plugins`. <br/><br/> If it is present, on startup the server will log a message similar to: `Loaded SubsystemsPlugin plugin: "otlp-exporter" "24.6.0.0".` |
-| EventStoreDB logs a message on startup that it cannot find the configuration | The server logs a message: `OtlpExporter: No OpenTelemetry:Otlp configuration found. Not exporting metrics.`.<br/><br/> Check the configuration steps above.                                                                                                                                |
-
-## Datadog
-
-The best way to integrate EventStoreDB metrics with Datadog today is by using the [OpenTelemetry exporter]() built-in to the commercial version of the database. We currently don't support exporting logs via the exporter.
-
-You can use the community-supported integration to collect EventStoreDB logs and metrics in Datadog.
-
-Find out more details about the integration
-in [Datadog documentation](https://docs.datadoghq.com/integrations/eventstore/).
-
-## Vector
-
-> Vector is a lightweight and ultra-fast tool for building observability pipelines.
-> (from Vector website)
-
-You can use [Vector] for extracting metrics or logs from your self-managed EventStore server.
-
-It's also possible to collect metrics from the Event Store Cloud managed cluster or instance, as long as the
-Vector agent is running on a machine that has a direct connection to the EventStoreDB server. You cannot,
-however, fetch logs from Event Store Cloud using your own Vector agent.
-
-### Installation
-
-Follow the [installation instructions](https://vector.dev/docs/setup/installation/) provided by Vector to
-deploy the agent. You can deploy and run it on the same machine where you run EventStoreDB server. If you run
-EventStoreDB in Kubernetes, you can run Vector as a sidecar for each of the EventStoreDB pods.
-
-### Configuration
-
-Each Vector instance needs to be configured with sources and sinks. When configured properly, it will collect
-information from each source, apply the necessary transformation (if needed), and send the transformed
-information to the configured sink.
-
-[Vector] provides [many different sinks], you most probably will find your preferred monitoring platform among
-those sinks.
-
-#### Collecting metrics
-
-There is an official [EventStoreDB source] that you can use to pull relevant metrics from your database.
-
-Below you can find an example that you can use in your `vector.toml` configuration file:
-
-```toml
-[sources.eventstoredb_metrics]
-type = "eventstoredb_metrics"
-endpoint = "https://{hostname}:{http_port}/stats"
-scrape_interval_secs = 3
-```
-
-Here `hostname` is the EventStoreDB node hostname or the cluster DNS name, and `http_port` is the configured
-HTTP port, which is `2113` by default.
-
-#### Collecting logs
-
-To collect logs, you can use the [file source] and configure it to target EventStoreDB log file. For log
-collection, Vector must run on the same machine as EventStoreDB server as it collects the logs from files on
-the local file system.
-
-```toml
-[sources.eventstoredb_logs]
-type = "file"
-# If you changed the default log location, please update the filepath accordingly.
-include = ["/var/log/eventstore"]
-read_from = "end"
-```
-
-#### Example
-
-In this example, Vector runs on the same machine as EventStoreDB, collects metrics and logs, and then sends them to Datadog. Notice that despite the EventStoreDB HTTP is, in theory, accessible via `localhost`, it won't work if the server SSL certificate doesn't have `localhost` in the certificate CN or SAN.
-
-```toml
-[sources.eventstoredb_metrics]
-type = "eventstoredb_metrics"
-endpoint = "https://node1.esdb.acme.company:2113/stats"
-scrape_interval_secs = 10
-
-[sources.eventstoredb_logs]
-type = "file"
-include = ["/var/log/eventstore"]
-read_from = "end"
-
-[sinks.dd_metrics]
-type = "datadog_metrics"
-inputs = ["eventstoredb_metrics"]
-api_key = "${DD_API_KEY}"
-default_namespace = "service"
-
-[sinks.dd_logs]
-type = "datadog_logs"
-inputs = ["sources.eventstoredb_logs"]
-default_api_key = "${DD_API_KEY}"
-compression = "gzip"
-```
-
-## ElasticSearch
-
-Elastic Stack is one of the most popular tools for ingesting and analyzing logs and statistics:
-- [Elasticsearch](https://www.elastic.co/guide/en/elasticsearch/reference/8.2/index.html) was built for advanced filtering and text analysis.
-- [Filebeat](https://www.elastic.co/guide/en/beats/filebeat/8.2/index.html) allow tailing files efficiently.
-- [Logstash](https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html) enables log transformations and processing pipelines.
-- [Kibana](https://www.elastic.co/guide/en/kibana/8.2/index.html) is a dashboard and visualization UI for Elasticsearch data.
-
-EventStoreDB exposes structured information through its logs and statistics, allowing straightforward integration with mentioned tooling.
-
-### Logstash
-
-Logstash is the plugin based data processing component of the Elastic Stack which sends incoming data to Elasticsearch. It's excellent for building a text-based processing pipeline. It can also gather logs from files (although Elastic recommends now Filebeat for that, see more in the following paragraphs). Logstash needs to either be installed on the EventStoreDB node or have access to logs storage. The processing pipeline can be configured through the configuration file (e.g. `logstash.conf`). This file contains the three essential building blocks:
-- input - source of logs, e.g. log files, system output, Filebeat.
-- filter - processing pipeline, e.g. to modify, enrich, tag log data,
-- output - place where we'd like to put transformed logs. Typically that contains Elasticsearch configuration.
-
-See the sample Logstash 8.2 configuration file. It shows how to take the EventStoreDB log files, split them based on the log type (regular and stats) and output them to separate indices to Elasticsearch:
-
-```ruby
-#######################################################
-#  EventStoreDB logs file input
-#######################################################
-input {
-  file {
-    path => "/var/log/eventstore/*/log*.json"
-    start_position => "beginning"
-    codec => json
-  }
-}
-
-#######################################################
-#  Filter out stats from regular logs
-#  add respecting field with log type
-#######################################################
-filter {
-  # check if log path includes "log-stats"
-  # so pattern for stats
-  if [log][file][path] =~ "log-stats" {
-    mutate {
-      add_field => {
-        "log_type" => "stats"
-      }
-    }
-  }
-  else {
-    mutate {
-      add_field => {
-        "log_type" => "logs"
-      }
-    }
-  }
-}
-
-#######################################################
-#  Send logs to Elastic
-#  Create separate indexes for stats and regular logs
-#  using field defined in the filter transformation
-#######################################################
-output {
-  elasticsearch {
-    hosts => [ "elasticsearch:9200" ]
-    index => 'eventstoredb-%{[log_type]}'
-  }
-}
-```
-
-You can play with such configuration through the [sample docker-compose](https://github.com/EventStore/samples/blob/2829b0a90a6488e1eee73fad0be33a3ded7d13d2/Logging/Elastic/Logstash/docker-compose.yml).
-
-### Filebeat
-
-Logstash was an initial attempt by Elastic to provide a log harvester tool. However, it appeared to have performance limitations. Elastic came up with the [Beats family](https://www.elastic.co/beats/), which allows gathering data from various specialized sources (files, metrics, network data, etc.). Elastic recommends Filebeat as the log collection and shipment tool off the host servers. Filebeat uses a backpressure-sensitive protocol when sending data to Logstash or Elasticsearch to account for higher volumes of data.
-
-Filebeat can pipe logs directly to Elasticsearch and set up a Kibana data view.
-
-Filebeat needs to either be installed on the EventStoreDB node or have access to logs storage. The processing pipeline can be configured through the configuration file (e.g. `filebeat.yml`). This file contains the three essential building blocks:
-- input - configuration for file source, e.g. if stored in JSON format.
-- output - place where we'd like to put transformed logs, e.g. Elasticsearch, Logstash,
-- setup - additional setup and simple transformations (e.g. Elasticsearch indices template, Kibana data view).
-
-See the sample Filebeat 8.2 configuration file. It shows how to take the EventStoreDB log files, output them to Elasticsearch prefixing index with `eventstoredb` and create a Kibana data view:
-
-```yml
-#######################################################
-#  EventStoreDB logs file input
-#######################################################
-filebeat.inputs:
-  - type: log
-    paths:
-      - /var/log/eventstore/*/log*.json
-    json.keys_under_root: true
-    json.add_error_key: true
-
-#######################################################
-#  ElasticSearch direct output
-#######################################################
-output.elasticsearch:
-  index: "eventstoredb-%{[agent.version]}"
-  hosts: ["elasticsearch:9200"]
-
-#######################################################
-#  ElasticSearch dashboard configuration
-#  (index pattern and data view)
-#######################################################
-setup.dashboards:
-  enabled: true
-  index: "eventstoredb-*"
-
-setup.template:
-  name: "eventstoredb"
-  pattern: "eventstoredb-%{[agent.version]}"
-
-#######################################################
-#  Kibana dashboard configuration
-#######################################################
-setup.kibana:
-  host: "kibana:5601"
-
-```
-
-You can play with such configuration through the [sample docker-compose](https://github.com/EventStore/samples/blob/2829b0a90a6488e1eee73fad0be33a3ded7d13d2/Logging/Elastic/Filebeat/docker-compose.yml).
-
-### Filebeat with Logstash
-
-Even though Filebeat can pipe logs directly to Elasticsearch and do a basic Kibana setup, you'd like to have more control and expand the processing pipeline. That's why for production, it's recommended to use both. Multiple Filebeat instances (e.g. from different EventStoreDB clusters) can collect logs and pipe them to Logstash, which will play an aggregator role. Filebeat can output logs to Logstash, and Logstash can receive and process these logs with the Beats input. Logstash can transform and route logs to Elasticsearch instance(s).
-
-In that configuration, Filebeat should be installed on the EventStoreDB node (or have access to file logs) and define Logstash as output. See the sample Filebeat 8.2 configuration file.
-
-```yml
-#######################################################
-#  EventStoreDB logs file input
-#######################################################
-filebeat.inputs:
-  - type: log
-    paths:
-      - /var/log/eventstore/*/log*.json
-    json.keys_under_root: true
-    json.add_error_key: true
-
-#######################################################
-#  Logstash output to transform and prepare logs
-#######################################################
-output.logstash:
-  hosts: ["logstash:5044"]
-```
-
-Then the sample Logstash 8.2 configuration file will look like the below. It shows how to take the EventStoreDB logs from Filebeat, split them based on the log type (regular and stats) and output them to separate indices to Elasticsearch:
-
-```ruby
-#######################################################
-#  Filebeat input 
-#######################################################
-input {
-  beats {
-    port => 5044
-  }
-}
-
-#######################################################
-#  Filter out stats from regular logs
-#  add respecting field with log type
-#######################################################
-filter {
-  # check if log path includes "log-stats"
-  # so pattern for stats
-  if [log][file][path] =~ "log-stats" {
-    mutate {
-      add_field => {
-        "log_type" => "stats"
-      }
-    }
-  }
-  else {
-    mutate {
-      add_field => {
-        "log_type" => "logs"
-      }
-    }
-  }
-}
-
-#######################################################
-#  Send logs to Elastic
-#  Create separate indexes for stats and regular logs
-#  using field defined in the filter transformation
-#######################################################
-output {
-  elasticsearch {
-    hosts => [ "elasticsearch:9200" ]
-    index => 'eventstoredb-%{[log_type]}'
-  }
-}
-```
-
-You can play with such configuration through the [sample docker-compose](https://github.com/EventStore/samples/blob/2829b0a90a6488e1eee73fad0be33a3ded7d13d2/Logging/Elastic/FilebeatWithLogstash/docker-compose.yml).
-
-[Vector]: https://vector.dev/docs/
-[EventStoreDB source]: https://vector.dev/docs/reference/configuration/sources/eventstoredb_metrics/
-[file source]: https://vector.dev/docs/reference/configuration/sources/file/
-[many different sinks]: https://vector.dev/docs/reference/configuration/sinks/
-[Console]: https://vector.dev/docs/reference/configuration/sinks/console/
diff --git a/docs/diagnostics/logs.md b/docs/diagnostics/logs.md
deleted file mode 100644
index a063b857dd1..00000000000
--- a/docs/diagnostics/logs.md
+++ /dev/null
@@ -1,291 +0,0 @@
----
-title: "Logs"
----
-
-# Database logs
-
-EventStoreDB logs its internal operations to the console (stdout) and to log files. The default location of
-the log files and the way to change it is described [below](#logs-location).
-
-There are a few options to change the way how EventStoreDB produces logs and how detailed the logs should be.
-
-::: warning
-The EventStoreDB logs may contain sensitive information such as stream names, usernames, and projection definitions.
-:::
-
-## Log format
-
-EventStoreDB uses the structured logging in JSON format that is more machine-friendly and can be ingested by
-vendor-specific tools like Logstash or Datadog agent.
-
-Here is how the structured log looks like:
-
-```json
-{
-  "PID": "6940",
-  "ThreadID": "23",
-  "Date": "2020-06-16T16:14:02.052976Z",
-  "Level": "Debug",
-  "Logger": "ProjectionManager",
-  "Message": "PROJECTIONS: Starting Projections Manager. (Node State : {state})",
-  "EventProperties": {
-    "state": "Master"
-  }
-}
-{
-  "PID": "6940",
-  "ThreadID": "15",
-  "Date": "2020-06-16T16:14:02.052976Z",
-  "Level": "Info",
-  "Logger": "ClusterVNodeController",
-  "Message": "========== [{internalHttp}] Sub System '{subSystemName}' initialized.",
-  "EventProperties": {
-    "internalHttp": "127.0.0.1:2112",
-    "subSystemName": "Projections"
-  }
-}
-{
-  "PID": "6940",
-  "ThreadID": "23",
-  "Date": "2020-06-16T16:14:02.052976Z",
-  "Level": "Debug",
-  "Logger": "MultiStreamMessageWriter",
-  "Message": "PROJECTIONS: Resetting Worker Writer",
-  "EventProperties": {}
-}
-{
-  "PID": "6940",
-  "ThreadID": "23",
-  "Date": "2020-06-16T16:14:02.055000Z",
-  "Level": "Debug",
-  "Logger": "ProjectionCoreCoordinator",
-  "Message": "PROJECTIONS: SubComponent Started: {subComponent}",
-  "EventProperties": {
-    "subComponent": "EventReaderCoreService"
-  }
-}
-```
-
-This format is aligned with [Serilog Compact JSON format](https://github.com/serilog/serilog-formatting-compact).
-
-## Logs location
-
-Log files are located in `/var/log/eventstore` for Linux and macOS, and in the `logs` subdirectory of the
-EventStoreDB installation directory on Windows. You can change the log files location using the `Log`
-configuration option.
-
-::: tip
-Moving logs to a separate storage might improve the database performance if you keep the default
-verbose log level.
-:::
-
-| Format               | Syntax           |
-|:---------------------|:-----------------|
-| Command line         | `--log`          |
-| YAML                 | `Log`            |
-| Environment variable | `EVENTSTORE_LOG` |
-
-For example, adding this line to the `eventstore.conf` file will force writing logs to
-the `/tmp/eventstore/logs` directory:
-
-```text:no-line-numbers
-Log: /tmp/eventstore/logs
-```
-
-## Log level
-
-You can change the level using the `LogLevel` setting:
-
-| Format               | Syntax                 |
-|:---------------------|:-----------------------|
-| Command line         | `--log-level`          |
-| YAML                 | `LogLevel`             |
-| Environment variable | `EVENTSTORE_LOG_LEVEL` |
-
-Acceptable values are: `Default`, `Verbose`, `Debug`, `Information`, `Warning`, `Error`, and `Fatal`.
-
-## Logging options
-
-You can tune the EventStoreDB logging further by using the logging options described below.
-
-### Log configuration file
-
-Specifies the location of the file which configures the logging levels of various components.
-
-| Format               | Syntax                  |
-|:---------------------|:------------------------|
-| Command line         | `--log-config`          |
-| YAML                 | `LogConfig`             |
-| Environment variable | `EVENTSTORE_LOG_CONFIG` |
-
-By default, the application directory (and `/etc/eventstore` on Linux and Mac) are checked. You may specify a
-full path.
-
-### HTTP requests logging
-
-EventStoreDB can also log all the incoming HTTP requests, like many HTTP servers do. Requests are logged
-before being processed, so unsuccessful requests are logged too.
-
-Use one of the following ways to enable the HTTP requests logging:
-
-| Format               | Syntax                         |
-|:---------------------|:-------------------------------|
-| Command line         | `--log-http-requests`          |
-| YAML                 | `LogHttpRequests`              |
-| Environment variable | `EVENTSTORE_LOG_HTTP_REQUESTS` |
-
-**Default**: `false`, logging HTTP requests is disabled by default.
-
-### Log failed authentication
-
-For security monitoring, you can enable logging failed authentication attempts by
-setting `LogFailedAuthenticationAttempts` setting to true.
-
-| Format               | Syntax                                          |
-|:---------------------|:------------------------------------------------|
-| Command line         | `--log-failed-authentication-attempts`          |
-| YAML                 | `LogFailedAuthenticationAttempts`               |
-| Environment variable | `EVENTSTORE_LOG_FAILED_AUTHENTICATION_ATTEMPTS` |
-
-**Default**: `false`
-
-### Log console format
-
-The format of the console logger. Use `Json` for structured log output.
-
-| Format               | Syntax                          |
-|:---------------------|:--------------------------------|
-| Command line         | `--log-console-format`          |
-| YAML                 | `LogConsoleFormat`              |
-| Environment variable | `EVENTSTORE_LOG_CONSOLE_FORMAT` |
-
-Acceptable values are: `Plain`, `Json`
-
-**Default**: `Plain`
-
-### Log file size
-
-The maximum size of each log file, in bytes.
-
-| Format               | Syntax                     |
-|:---------------------|:---------------------------|
-| Command line         | `--log-file-size`          |
-| YAML                 | `LogFileSize`              |
-| Environment variable | `EVENTSTORE_LOG_FILE_SIZE` |
-
-**Default**: `1GB`
-
-### Log file interval
-
-How often to rotate logs.
-
-| Format               | Syntax                         |
-|:---------------------|:-------------------------------|
-| Command line         | `--log-file-interval`          |
-| YAML                 | `LogFileInterval`              |
-| Environment variable | `EVENTSTORE_LOG_FILE_INTERVAL` |
-
-Acceptable values are: `Minute`, `Hour`, `Day`, `Week`, `Month`, `Year`
-
-**Default**: `Day`
-
-### Log file retention count
-
-Defines how many log files need to be kept on disk. By default, logs for the last month are available. Tune this setting if you need to have more history in the logs, or you need to save disk space. 
-
-| Format               | Syntax                           |
-|:---------------------|:---------------------------------|
-| Command line         | `--log-file-retention-count`     |
-| YAML                 | `LogFileRetentionCount`          |
-| Environment variable | `EVENTSTORE_LOG_RETENTION_COUNT` |
-
-**Default**: `31`
-
-#### Disable log file
-
-You can completely disable logging to a file by changing the `DisableLogFile` option.
-
-| Format               | Syntax                        |
-|:---------------------|:------------------------------|
-| Command line         | `--disable-log-file`          |
-| YAML                 | `DisableLogFile`              |
-| Environment variable | `EVENTSTORE_DISABLE_LOG_FILE` |
-
-**Default**: `false`
-
-## Logs download <Badge type="warning" vertical="middle" text="Commercial"/>
-
-The _Logs Download Plugin_ provides HTTP access to EventStoreDB logs so that they can be viewed without requiring file system access.
-
-::: tip
-You can use this API to download log files from your managed EventStoreDB clusters in Event Store Cloud.
-:::
-
-On startup the server will log a message similar to:
-```:no-line-numbers
-LogsEndpoint: Serving logs from "<FULL-PATH-TO-LOGS>" at endpoint "/admin/logs"
-```
-
-Access the logs via the `/admin/logs` endpoint on your server. Construct the full URL as follows:
-
-```:no-line-numbers
-http(s)://<node ip or hostname>:<node port>/admin/logs
-```
-
-Example:
-```:no-line-numbers
-https://localhost:2113/admin/logs
-```
-
-Only authenticated users belonging to the `$admins` or `$ops` groups can use this endpoint.
-
-### Listing log files
-
-To list the current log files, issue a `GET` to the `/admin/logs` endpoint
-
-Example:
-```bash:no-line-numbers
-curl https://user:password@localhost:2113/admin/logs | jq
-```
-
-Sample response:
-```json
-[
-  {
-    "name": "log-stats20240205.json",
-    "lastModified": "2024-02-05T13:14:14.2789475+00:00",
-    "size": 1058614
-  },
-  {
-    "name": "log20240205.json",
-    "lastModified": "2024-02-05T13:14:37.0781601+00:00",
-    "size": 158542
-  }
-]
-```
-
-The response is ordered from most recent change first, is limited to a maximum of 1000 items, and includes:
-
-| Name         | Description                                                                                                                                                                                                                                       |
-|--------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| name         | File name of the log file                                                                                                                                                                                                                         |
-| createdAt    | Timestamp of when the log file was created in [round-trip format](https://learn.microsoft.com/en-us/dotnet/standard/base-types/standard-date-and-time-format-strings#the-round-trip-o-o-format-specifier) (local time with time zone information) |
-| lastModified | Timestamp of the last modification in [round-trip format](https://learn.microsoft.com/en-us/dotnet/standard/base-types/standard-date-and-time-format-strings#the-round-trip-o-o-format-specifier) (local time with time zone information)         |
-| size         | Size of the log file in bytes                                                                                                                                                                                                                     |
-
-### Downloading log files
-
-To download a specific log file, append its name to the URL:
-
-Example:
-```bash:no-line-numbers
-curl https://user:password@localhost:2113/admin/logs/log20240205.json --output log20240205.json
-```
-
-### Troubleshooting
-
-- **404 Not Found:** The plugin is only available in commercial editions. Verify the plugin is loaded by checking the server startup logs.
-
-- **401 Unauthorized:** Confirm the credentials are correct and the user belongs to the `$ops` or `$admins` group.
-
-- **Log Files Directory Not Found:** Check the `NodeIp` and `NodePort` settings are current and not using the deprecated settings `HttpIp` or `HttpPort`.
diff --git a/docs/diagnostics/metrics.md b/docs/diagnostics/metrics.md
deleted file mode 100644
index 3b5482730ab..00000000000
--- a/docs/diagnostics/metrics.md
+++ /dev/null
@@ -1,586 +0,0 @@
-# Metrics
-
-EventStoreDB collects metrics in [Prometheus format](https://prometheus.io/docs/instrumenting/exposition_formats/#text-based-format), available on the `/metrics` endpoint. Prometheus can be configured to scrape this endpoint directly. The metrics are configured in `metricsconfig.json`. 
-
-In addition, EventStoreDB can actively export metrics to a specified endpoint using the [OpenTelemetry Protocol](https://opentelemetry.io/docs/specs/otel/protocol/) (OTLP). <Badge type="warning" text="Commercial" vertical="middle"></Badge>
-
-## Metrics reference
-
-### Caches
-
-#### Cache hits and misses
-
-EventStoreDB tracks cache hits/misses metrics for `stream-info` and `chunk` caches.
-
-| Time series                                                                | Type                     | Description                             |
-|:---------------------------------------------------------------------------|:-------------------------|:----------------------------------------|
-| `eventstore_cache_hits_misses{cache=<CACHE_NAME>,kind=<"hits"\|"misses">}` | [Counter](#common-types) | Total hits/misses on _CACHE_NAME_ cache |
-
-Example configuration:
-```json
-"CacheHitsMisses": {
-  "StreamInfo": true,
-  "Chunk": false
-}
-```
-
-Example output:
-```
-# TYPE eventstore_cache_hits_misses counter
-eventstore_cache_hits_misses{cache="stream-info",kind="hits"} 104329 1688157489545
-eventstore_cache_hits_misses{cache="stream-info",kind="misses"} 117 1688157489545
-```
-
-#### Dynamic cache resources
-
-Certain caches that EventStoreDB uses are dynamic in nature i.e. their capacity scales up/down during their lifetime. EventStoreDB records metrics for resources being used by each such dynamic cache.
-
-| Time series                                                                      | Type                   | Description                                          |
-|:---------------------------------------------------------------------------------|:-----------------------|:-----------------------------------------------------|
-| `eventstore_cache_resources_bytes{cache=<CACHE_NAME>,kind=<"capacity"\|"size">}` | [Gauge](#common-types) | Current capacity/size of _CACHE_NAME_ cache in bytes |
-| `eventstore_cache_resources_entries{cache=<CACHE_NAME>,kind="count"}`            | [Gauge](#common-types) | Current number of entries in _CACHE_NAME_ cache      |
-
-Example configuration:
-```json
-"CacheResources": true
-```
-
-Example output:
-```
-# TYPE eventstore_cache_resources_bytes gauge
-# UNIT eventstore_cache_resources_bytes bytes
-eventstore_cache_resources_bytes{cache="LastEventNumber",kind="capacity"} 50000000 1688157491029
-eventstore_cache_resources_bytes{cache="LastEventNumber",kind="size"} 15804 1688157491029
-
-# TYPE eventstore_cache_resources_entries gauge
-# UNIT eventstore_cache_resources_entries entries
-eventstore_cache_resources_entries{cache="LastEventNumber",kind="count"} 75 1688157491029
-```
-
-### Checkpoints
-
-| Time series                                                         | Type                   | Description                            |
-|:--------------------------------------------------------------------|:-----------------------|:---------------------------------------|
-| `eventstore_checkpoints{name=<CHECKPOINT_NAME>,read="non-flushed"}` | [Gauge](#common-types) | Value for _CHECKPOINT_NAME_ checkpoint |
-
-Example configuration:
-```json
-"Checkpoints": {
-  "Replication": true,
-  "Chaser": false,
-  "Epoch": false,
-  "Index": false,
-  "Proposal": false,
-  "Truncate": false,
-  "Writer": false,
-  "StreamExistenceFilter": false
-}
-```
-
-Example output:
-```
-# TYPE eventstore_checkpoints gauge
-eventstore_checkpoints{name="replication",read="non-flushed"} 613363 1688054162478
-```
-
-### Elections Count
-
-This metric tracks the number of elections that have been completed.
-
-| Time series                  | Type                     | Description                  |
-|:-----------------------------|:-------------------------|:-----------------------------|
-| `eventstore_elections_count` | [Counter](#common-types) | Elections count in a cluster |
-
-Example configuration:
-```json
-"ElectionsCount": true
-```
-
-Example output:
-```
-# TYPE eventstore_elections_count counter
-eventstore_elections_count 0 1710188996949
-```
-
-### Events
-
-These metrics track events written to and read from the server, including reads from caches.
-
-| Time series                                          | Type                     | Description         |
-|:-----------------------------------------------------|:-------------------------|:--------------------|
-| `eventstore_io_bytes{activity="read"}`               | [Counter](#common-types) | Event bytes read    |
-| `eventstore_io_events{activity=<"read"\|"written">}` | [Counter](#common-types) | Events read/written |
-
-Example configuration:
-```json
-"Events": {
-  "Read": false,
-  "Written": true
-}
-```
-
-Example output:
-```
-# TYPE eventstore_io_events counter
-# UNIT eventstore_io_events events
-eventstore_io_events{activity="written"} 320 1687963622074
-```
-
-### Gossip
-
-Measures the round trip latency and processing time of gossip.
-Usually a node pushes new gossip to other nodes periodically or when its view of the cluster changes. Sometimes nodes pull gossip from each other if there is a suspected network problem. 
-
-#### Gossip latency
-
-| Time series                                                                                                         | Type                       | Description                                                                                  |
-|:--------------------------------------------------------------------------------------------------------------------|:---------------------------|:---------------------------------------------------------------------------------------------|
-| `eventstore_gossip_latency_seconds_bucket{activity="pull-from-peer",status=<"successful"\|"failed">,le=<DURATION>}` | [Histogram](#common-types) | Number of gossips pulled from peers with latency less than or equal to _DURATION_ in seconds |
-| `eventstore_gossip_latency_seconds_bucket{activity="push-to-peer",status=<"successful"\|"failed">,le=<DURATION>}`   | [Histogram](#common-types) | Number of gossips pushed to peers with latency less than or equal to _DURATION_ in seconds   |
-
-#### Gossip processing
-
-| Time Series                                                                                                                                                    | Type                       | Description                                                                                                  |
-|:---------------------------------------------------------------------------------------------------------------------------------------------------------------|:---------------------------|:-------------------------------------------------------------------------------------------------------------|
-| `eventstore_gossip_processing_duration_seconds_bucket{`<br/>`activity="push-from-peer",`<br/>`status=<"successful"\|"failed">,`<br/>`le=<DURATION>}`           | [Histogram](#common-types) | Number of gossips pushed from peers that took less than or equal to _DURATION_ in seconds to process         |
-| `eventstore_gossip_processing_duration_seconds_bucket{`<br/>`activity="request-from-peer",`<br/>`status=<"successful"\|"failed">,`<br/>`le=<DURATION>}`        | [Histogram](#common-types) | Number of gossip requests from peers that took less than or equal to _DURATION_ in seconds to process        |
-| `eventstore_gossip_processing_duration_seconds_bucket{`<br/>`activity="request-from-grpc-client",`<br/>`status=<"successful"\|"failed">,`<br/>`le=<DURATION>}` | [Histogram](#common-types) | Number of gossip requests from gRPC clients that took less than or equal to _DURATION_ in seconds to process |
-| `eventstore_gossip_processing_duration_seconds_bucket{`<br/>`activity="request-from-http-client",`<br/>`status=<"successful"\|"failed">,`<br/>`le=<DURATION>}` | [Histogram](#common-types) | Number of gossip requests from HTTP clients that took less than or equal to _DURATION_ in seconds to process |
-
-Example configuration:
-```json
-"Gossip": {
-  "PullFromPeer": false,
-  "PushToPeer": true,
-  "ProcessingPushFromPeer": false,
-  "ProcessingRequestFromPeer": false,
-  "ProcessingRequestFromGrpcClient": false,
-  "ProcessingRequestFromHttpClient": false
-}
-```
-
-Example output:
-```
-# TYPE eventstore_gossip_latency_seconds histogram
-# UNIT eventstore_gossip_latency_seconds seconds
-eventstore_gossip_latency_seconds_bucket{activity="push-to-peer",status="successful",le="0.005"} 8 1687972306948
-```
-
-### Incoming gRPC calls
-
-| Time series                                                       | Type                     | Description                                                                                |
-|:------------------------------------------------------------------|:-------------------------|:-------------------------------------------------------------------------------------------|
-| `eventstore_current_incoming_grpc_calls`                          | [Gauge](#common-types)   | Inflight gRPC calls i.e. gRPC requests that have started on the server but not yet stopped |
-| `eventstore_incoming_grpc_calls{kind="total"}`                    | [Counter](#common-types) | Total gRPC requests served                                                                 |
-| `eventstore_incoming_grpc_calls{kind="failed"}`                   | [Counter](#common-types) | Total gRPC requests failed                                                                 |
-| `eventstore_incoming_grpc_calls{`<br/>`kind="unimplemented"}`     | [Counter](#common-types) | Total gRPC requests made to unimplemented methods                                          |
-| `eventstore_incoming_grpc_calls{`<br/>`kind="deadline-exceeded"}` | [Counter](#common-types) | Total gRPC requests for which deadline have exceeded                                       |
-
-Example configuration:
-```json
-"IncomingGrpcCalls": {
-  "Current": true,
-  "Total": false,
-  "Failed": true,
-  "Unimplemented": false,
-  "DeadlineExceeded": false
-}
-```
-
-Example output:
-```
-# TYPE eventstore_current_incoming_grpc_calls gauge
-eventstore_current_incoming_grpc_calls 1 1687963622074
-
-# TYPE eventstore_incoming_grpc_calls counter
-eventstore_incoming_grpc_calls{kind="failed"} 1 1687962877623
-```
-
-#### Client protocol gRPC methods
-
-In addition, EventStoreDB also records metrics for each of client protocol gRPC methods: `StreamRead`, `StreamAppend`, `StreamBatchAppend`, `StreamDelete` and `StreamTombstone`. They are grouped together according to the mapping defined in the configuration.
-
-| Time series                                                                                                    | Type                       | Description                                                                                      |
-|:---------------------------------------------------------------------------------------------------------------|:---------------------------|:-------------------------------------------------------------------------------------------------|
-| `eventstore_grpc_method_duration_seconds_bucket{`<br/>`activity=<LABEL>,`<br/>`status="successful"\|"failed",`<br/>`le=<DURATION>}` | [Histogram](#common-types) | Number of _LABEL_ gRPC requests that took less than or equal to _DURATION_ in seconds to process |
-
-Example configuration:
-```json
-"GrpcMethods": {
-  "StreamAppend": "append",
-  "StreamBatchAppend": "append",
-  // leaving label as blank will disable metric collection
-  "StreamRead": "",
-  "StreamDelete": "",
-  "StreamTombstone": ""
-}
-```
-
-Example output:
-```
-# TYPE eventstore_grpc_method_duration_seconds histogram
-# UNIT eventstore_grpc_method_duration_seconds seconds
-eventstore_grpc_method_duration_seconds_bucket{activity="append",status="successful",le="1E-06"} 0 1688157491029
-eventstore_grpc_method_duration_seconds_bucket{activity="append",status="successful",le="1E-05"} 0 1688157491029
-eventstore_grpc_method_duration_seconds_bucket{activity="append",status="successful",le="0.0001"} 129 1688157491029
-eventstore_grpc_method_duration_seconds_bucket{activity="append",status="successful",le="0.001"} 143 1688157491029
-eventstore_grpc_method_duration_seconds_bucket{activity="append",status="successful",le="0.01"} 168 1688157491029
-eventstore_grpc_method_duration_seconds_bucket{activity="append",status="successful",le="0.1"} 169 1688157491029
-eventstore_grpc_method_duration_seconds_bucket{activity="append",status="successful",le="1"} 169 1688157491029
-eventstore_grpc_method_duration_seconds_bucket{activity="append",status="successful",le="10"} 169 1688157491029
-eventstore_grpc_method_duration_seconds_bucket{activity="append",status="successful",le="+Inf"} 169 1688157491029
-```
-
-### Kestrel
-
-| Time series                      | Type                   | Description                        |
-|:---------------------------------|:-----------------------|:-----------------------------------|
-| `eventstore_kestrel_connections` | [Gauge](#common-types) | Number of open kestrel connections |
-
-Example configuration:
-```json
-"Kestrel": {
-  "ConnectionCount": true
-}
-```
-
-Example output:
-```
-# TYPE eventstore_kestrel_connections gauge
-eventstore_kestrel_connections 1 1688070655500
-```
-
-### Persistent Subscriptions
-
-Persistent subscription metrics track the statistics for the persistent subscriptions.
-
-| Time series                                                                                                           | Type                     | Description                                                    |
-|:----------------------------------------------------------------------------------------------------------------------|:-------------------------|:---------------------------------------------------------------|
-| `eventstore_persistent_sub_connections{event_stream_id=<STREAM_NAME>,group_name=<GROUP_NAME>}`                        | [Gauge](#common-types)   | Number of connections                                          |
-| `eventstore_persistent_sub_parked_messages{event_stream_id=<STREAM_NAME>,group_name=<GROUP_NAME>}`                    | [Gauge](#common-types)   | Number of parked messages                                      |
-| `eventstore_persistent_sub_in_flight_messages{event_stream_id=<STREAM_NAME>,group_name=<GROUP_NAME>}`                 | [Gauge](#common-types)   | Number of messages in flight                                   |
-| `eventstore_persistent_sub_oldest_parked_message_seconds{event_stream_id=<STREAM_NAME>,group_name=<GROUP_NAME>}`      | [Gauge](#common-types)   | Oldest parked message age in seconds                           |
-| `eventstore_persistent_sub_items_processed{event_stream_id=<STREAM_NAME>,group_name=<GROUP_NAME>}`                    | [Counter](#common-types) | Total items processed                                          |
-| `eventstore_persistent_sub_last_known_event_number{event_stream_id=<STREAM_NAME>,group_name=<GROUP_NAME>}`            | [Counter](#common-types) | Last known event number (streams other than `$all`)            |
-| `eventstore_persistent_sub_last_known_event_commit_position{event_stream_id=<STREAM_NAME>,group_name=<GROUP_NAME>}`   | [Counter](#common-types) | Last known event's commit position (`$all` stream only)        |
-| `eventstore_persistent_sub_checkpointed_event_number{event_stream_id=<STREAM_NAME>,group_name=<GROUP_NAME>}`          | [Counter](#common-types) | Last checkpointed event number (streams other than `$all)`     |
-| `eventstore_persistent_sub_checkpointed_event_commit_position{event_stream_id=<STREAM_NAME>,group_name=<GROUP_NAME>}` | [Counter](#common-types) | Last checkpointed event's commit position (`$all` stream only) |
-
-Example configuration:
-
-```json
-"PersistentSubscriptionStats": true,
-```
-
-Example output:
-
-```
-# TYPE eventstore_persistent_sub_connections gauge
-eventstore_persistent_sub_connections{event_stream_id="test-stream",group_name="group1"} 1 1720172078179
-eventstore_persistent_sub_connections{event_stream_id="$all",group_name="group1"} 1 1720172078179
-
-# TYPE eventstore_persistent_sub_parked_messages gauge
-eventstore_persistent_sub_parked_messages{event_stream_id="test-stream",group_name="group1"} 0 1720172078179
-eventstore_persistent_sub_parked_messages{event_stream_id="$all",group_name="group1"} 0 1720172078179
-
-# TYPE eventstore_persistent_sub_in_flight_messages gauge
-eventstore_persistent_sub_in_flight_messages{event_stream_id="test-stream",group_name="group1"} 0 1720172078179
-eventstore_persistent_sub_in_flight_messages{event_stream_id="$all",group_name="group1"} 0 1720172078179
-
-# TYPE eventstore_persistent_sub_oldest_parked_message_seconds gauge
-eventstore_persistent_sub_oldest_parked_message_seconds{event_stream_id="test-stream",group_name="group1"} 0 1720172078179
-eventstore_persistent_sub_oldest_parked_message_seconds{event_stream_id="$all",group_name="group1"} 0 1720172078179
-
-# TYPE eventstore_persistent_sub_items_processed counter
-eventstore_persistent_sub_items_processed{event_stream_id="test-stream",group_name="group1"} 0 1720172078179
-eventstore_persistent_sub_items_processed{event_stream_id="$all",group_name="group1"} 5 1720172078179
-
-# TYPE eventstore_persistent_sub_last_known_event_number counter
-eventstore_persistent_sub_last_known_event_number{event_stream_id="test-stream",group_name="group1"} 0 1720172078179
-
-# TYPE eventstore_persistent_sub_last_known_event_commit_position counter
-eventstore_persistent_sub_last_known_event_commit_position{event_stream_id="$all",group_name="group1"} 4113 1720172078179
-
-# TYPE eventstore_persistent_sub_checkpointed_event_number counter
-eventstore_persistent_sub_checkpointed_event_number{event_stream_id="test-stream",group_name="group1"} 0 1720172078179
-
-# TYPE eventstore_persistent_sub_checkpointed_event_commit_position counter
-eventstore_persistent_sub_checkpointed_event_commit_position{event_stream_id="$all",group_name="group1"} 4013 1720172078179
-```
-
-### Process
-
-EventStoreDB collects key metrics about the running process.
-
-| Time Series                                                                              | Type                     | Description                                                                                                                                                                                                                                                                                                                                                                          |
-|:-----------------------------------------------------------------------------------------|:-------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `eventstore_proc_up_time{pid=<PID>}`                                                     | [Counter](#common-types) | Time in seconds this process has been running for. _PID_ is process Id of EventStoreDB process                                                                                                                                                                                                                                                                                       |
-| `eventstore_proc_cpu`                                                                    | [Gauge](#common-types)   | Process CPU usage                                                                                                                                                                                                                                                                                                                                                                    |
-| `eventstore_proc_thread_count`                                                           | [Gauge](#common-types)   | Current number of threadpool threads ([ThreadPool.ThreadCount](https://learn.microsoft.com/en-us/dotnet/api/system.threading.threadpool.threadcount?view=net-6.0))                                                                                                                                                                                                                   |
-| `eventstore_proc_thread_pool_pending_work_item_count`                                    | [Gauge](#common-types)   | Current number of items that are queued to be processed by threadpool threads ([ThreadPool.PendingWorkItemCount](https://learn.microsoft.com/en-us/dotnet/api/system.threading.threadpool.pendingworkitemcount?view=net-6.0))                                                                                                                                                        |
-| `eventstore_proc_contention_count`                                                       | [Counter](#common-types) | Total number of times there was contention when trying to take monitor's lock ([Monitor.LockContentionCount](https://learn.microsoft.com/en-us/dotnet/api/system.threading.monitor.lockcontentioncount?view=net-6.0))                                                                                                                                                                |
-| `eventstore_proc_exception_count`                                                        | [Counter](#common-types) | Total number of exceptions thrown                                                                                                                                                                                                                                                                                                                                                    |
-| `eventstore_gc_time_in_gc`                                                               | [Gauge](#common-types)   | Percentage of CPU time spent collecting garbage during last garbage collection                                                                                                                                                                                                                                                                                                       |
-| `eventstore_gc_heap_size_bytes`                                                          | [Gauge](#common-types)   | [Heap size in bytes](https://learn.microsoft.com/en-us/dotnet/api/system.gcmemoryinfo.heapsizebytes?view=net-6.0)                                                                                                                                                                                                                                                                    |
-| `eventstore_gc_heap_fragmentation`                                                       | [Gauge](#common-types)   | Percentage of heap [fragmentation](https://learn.microsoft.com/en-us/dotnet/api/system.gcmemoryinfo.fragmentedbytes?view=net-6.0) during last garbage collection                                                                                                                                                                                                                     |
-| `eventstore_gc_total_allocated`                                                          | [Counter](#common-types) | [Total allocated bytes](https://learn.microsoft.com/en-us/dotnet/api/system.gc.gettotalallocatedbytes?view=net-6.0) over the lifetime of this process                                                                                                                                                                                                                                |
-| `eventstore_gc_pause_duration_max_seconds{`<br/>`range=<RANGE>}`                         | [RecentMax](#recentmax)  | Recent maximum garbage collection pause in seconds. This measures the times that the execution engine is paused for GC                                                                                                                                                                                                                                                               |
-| `eventstore_gc_generation_size_bytes{`<br/>`generation=<"gen0"\|"gen1"\|"gen2"\|"loh">}` | [Gauge](#common-types)   | Size of each generation in bytes                                                                                                                                                                                                                                                                                                                                                     |
-| `eventstore_gc_collection_count{`<br/>`generation=<"gen0"\|"gen1"\|"gen2">}`             | [Counter](#common-types) | [Number of garbage collections](https://learn.microsoft.com/en-us/dotnet/api/system.gc.collectioncount?view=net-6.0) from each generation                                                                                                                                                                                                                                            |
-| `eventstore_proc_mem_bytes{`<br/>`kind=<"working-set"\|"paged-bytes"\|"virtual-bytes">}` | [Gauge](#common-types)   | Size in bytes of the [working set](https://learn.microsoft.com/en-us/dotnet/api/system.diagnostics.process.workingset64?view=net-6.0), [paged](https://learn.microsoft.com/en-us/dotnet/api/system.diagnostics.process.pagedmemorysize64?view=net-6.0) or [virtual](https://learn.microsoft.com/en-us/dotnet/api/system.diagnostics.process.virtualmemorysize64?view=net-6.0) memory |
-| `eventstore_disk_io_bytes{`<br/>`activity=<"read"\|"written">}`                          | [Counter](#common-types) | Number of bytes read from/written to the disk                                                                                                                                                                                                                                                                                                                                        |
-| `eventstore_disk_io_operations{`<br/>`activity=<"read"\|"written">}`                     | [Counter](#common-types) | Number of OS read/write operations issued to the disk                                                                                                                                                                                                                                                                                                                                |
-
-Example configuration:
-```json
-"Process": {
-  "UpTime": false,
-  "Cpu": false,
-  "MemWorkingSet": false,
-  "MemPagedBytes": false,
-  "MemVirtualBytes": false,
-  "ThreadCount": true,
-  "ThreadPoolPendingWorkItemCount": false,
-  "LockContentionCount": true,
-  "ExceptionCount": false,
-  "Gen0CollectionCount": false,
-  "Gen1CollectionCount": false,
-  "Gen2CollectionCount": false,
-  "Gen0Size": false,
-  "Gen1Size": false,
-  "Gen2Size": false,
-  "LohSize": false,
-  "TimeInGc": false,
-  "GcPauseDuration": true,
-  "HeapSize": false,
-  "HeapFragmentation": false,
-  "TotalAllocatedBytes": false,
-  "DiskReadBytes": false,
-  "DiskReadOps": false,
-  "DiskWrittenBytes": false,
-  "DiskWrittenOps": false
-}
-```
-
-Example output:
-```
-# TYPE eventstore_proc_thread_count gauge
-eventstore_proc_thread_count 15 1688070655500
-
-# TYPE eventstore_proc_contention_count counter
-eventstore_proc_contention_count 297 1688147136862
-
-# TYPE eventstore_gc_pause_duration_max_seconds gauge
-# UNIT eventstore_gc_pause_duration_max_seconds seconds
-eventstore_gc_pause_duration_max_seconds{range="16-20 seconds"} 0.0485873 1688147136862
-```
-
-### Projections
-
-Projection metrics track the statistics for projections.
-
-| Time series                                                                                | Type                     | Description                                                      |
-|:-------------------------------------------------------------------------------------------|:-------------------------|:-----------------------------------------------------------------|
-| `eventstore_projection_events_processed_after_restart_total{projection=<PROJECTION_NAME>}` | [Counter](#common-types) | Projection event processed count after restart                   |
-| `eventstore_projection_progress{projection=<PROJECTION_NAME>}`                             | [Gauge](#common-types)   | Projection progress 0 - 1, where 1 = projection progress at 100% |
-| `eventstore_projection_running{projection=<PROJECTION_NAME>}`                              | [Gauge](#common-types)   | If 1, projection is in 'Running' state                           |
-| `eventstore_projection_status{projection=<PROJECTION_NAME>,status=<PROJECTION_STATUS>}`    | [Gauge](#common-types)   | If 1, projection is in specified state                           |
-
-`Status` can have one of the following statuses:
-
-- Running
-- Faulted
-- Stopped
-
-Example configuration:
-
-```json
-"ProjectionStats": true
-```
-
-Example output:
-
-```
-# TYPE eventstore_projection_events_processed_after_restart_total counter
-eventstore_projection_events_processed_after_restart_total{projection="$by_category"} 83 1719526306309
-
-# TYPE eventstore_projection_progress gauge
-eventstore_projection_progress{projection="$stream_by_category"} 1 1719526306309
-
-# TYPE eventstore_projection_running gauge
-eventstore_projection_running{projection="$by_category"} 1 1719526306309
-
-# TYPE eventstore_projection_status gauge
-eventstore_projection_status{projection="$by_category",status="Running"} 1 1719526306309
-eventstore_projection_status{projection="$by_category",status="Faulted"} 0 1719526306309
-eventstore_projection_status{projection="$by_category",status="Stopped"} 0 1719526306309
-```
-
-### Queues
-
-EventStoreDB uses various queues for asynchronous processing for which it also collects different metrics. In addition, EventStoreDB allows users to group queues and monitor them as a unit.
-
-| Time series                                                                                                         | Type                       | Description                                                                                                                                                                                      |
-|:--------------------------------------------------------------------------------------------------------------------|:---------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `eventstore_queue_busy_seconds{queue=<QUEUE_GROUP>}`                                                                | [Counter](#common-types)   | Total time spent processing in seconds, averaged across the queues in the _QUEUE_GROUP_. The rate of this metric is therefore the average busyness of the group during the period (from 0-1 s/s) |
-| `eventstore_queue_queueing_duration_max_seconds{`<br/>`name=<QUEUE_GROUP>,range=<RANGE>}`                           | [RecentMax](#recentmax)    | Recent maximum time in seconds for which any item was queued in queues belonging to the _QUEUE_GROUP_. This is essentially the length of the longest queue in the group in seconds               |
-| `eventstore_queue_processing_duration_seconds_bucket{`<br/>`message_type=<TYPE>,queue=<QUEUE_GROUP>,le=<DURATION>}` | [Histogram](#common-types) | Number of messages of type _TYPE_ processed by _QUEUE_GROUP_ group that took less than or equal to _DURATION_ in seconds                                                                         |
-
-`QueueLabels` setting within `metricsconfig.json` can be used to group queues, based on regex which gets matched on queue names, and label them for metrics reporting. Capture groups are also supported. Message types can be grouped in the same way in the `MessageTypes` setting in `metricsconfig.json`.
-
-::: note
-Enabling `Queues.Processing` can cause a lot more time series to be generated, according to the `QueueLabels` and `MessageTypes` configuration.
-:::
-
-Example configuration:
-```json
-"Queues": {
-  "Busy": true,
-  "Length": true,
-  "Processing": false
-}
-
-"QueueLabels": [
-  {
-    "Regex": "StorageReaderQueue #.*",
-    "Label": "Readers"
-  },
-  {
-    "Regex": ".*",
-    "Label": "Others"
-  }
-]
-```
-
-Example output:
-```
-# TYPE eventstore_queue_busy_seconds counter
-# UNIT eventstore_queue_busy_seconds seconds
-eventstore_queue_busy_seconds{queue="Readers"} 1.04568158125 1688157491029
-eventstore_queue_busy_seconds{queue="Others"} 0 1688157491029
-
-# TYPE eventstore_queue_queueing_duration_max_seconds gauge
-# UNIT eventstore_queue_queueing_duration_max_seconds seconds
-eventstore_queue_queueing_duration_max_seconds{name="Readers",range="16-20 seconds"} 0.06434454 1688157489545
-eventstore_queue_queueing_duration_max_seconds{name="Others",range="16-20 seconds"} 0 1688157489545
-```
-
-### Status
-
-EventStoreDB tracks the current status of the `Node` role  as well as  progress of  `Index`, and `Scavenge` processes.
-
-| Time series                                        | Type                   | Description                                                                              |
-|:---------------------------------------------------|:-----------------------|:-----------------------------------------------------------------------------------------|
-| `eventstore_statuses{name=<NAME>,status=<STATUS>}` | [Gauge](#common-types) | Number of seconds since the 1970 epoch when _NAME_ most recently had the status _STATUS_ |
-
-For a given _NAME_, the current status can be determined by taking the max of all the time series with that name.
-
-`Index` can have one of the following statuses:
-- Opening (loading/verifying the PTables)
-- Rebuilding (indexing previously written records on start up)
-- Initializing (initializing any other parts of the index e.g. StreamExistenceFilter on start up)
-- Merging
-- Scavenging
-- Idle
-
-`Scavenge` can have one of the following statuses:
-- Accumulation
-- Calculation
-- Chunk Execution
-- Chunk Merging
-- Index Execution
-- Cleaning
-- Idle
-
-`Node` can be one of the [node roles](../cluster.md#node-roles).
-
-Example configuration:
-```json
-"Statuses": {
-  "Index": true,
-  "Node": false,
-  "Scavenge": false
-}
-```
-
-Example output:
-```
-# TYPE eventstore_checkpoints gauge
-eventstore_statuses{name="Index",status="Idle"} 1688054162 1688054162477
-```
-
-### Storage Writer
-
-| Time series                                                   | Type                    | Description                              |
-|:--------------------------------------------------------------|:------------------------|:-----------------------------------------|
-| `eventstore_writer_flush_size_max{range=<RANGE>}`             | [RecentMax](#recentmax) | Recent maximum flush size in bytes       |
-| `eventstore_writer_flush_duration_max_seconds{range=<RANGE>}` | [RecentMax](#recentmax) | Recent maximum flush duration in seconds |
-
-Example configuration:
-```json
-"Writer": {
-  "FlushSize": true,
-  "FlushDuration": false
-}
-```
-
-Example output:
-```
-# TYPE eventstore_writer_flush_size_max gauge
-eventstore_writer_flush_size_max{range="16-20 seconds"} 410 1688056823193
-```
-
-### System
-
-| Time series                                                            | Type                   | Description                                                                                                 |
-|:-----------------------------------------------------------------------|:-----------------------|:------------------------------------------------------------------------------------------------------------|
-| `eventstore_sys_load_avg{period=<"1m"\|"5m"\|"15m">}`                  | [Gauge](#common-types) | Average system load in last `1`, `5`, and `15` minutes. This metric is only available for Unix-like systems |
-| `eventstore_sys_cpu`                                                   | [Gauge](#common-types) | Current CPU usage in percentage. This metric is unavailable for Unix-like systems                           |
-| `eventstore_sys_mem_bytes{kind=<"free"\|"total">}`                     | [Gauge](#common-types) | Current free/total memory in bytes                                                                          |
-| `eventstore_sys_disk_bytes{disk=<MOUNT_POINT>,kind=<"used"\|"total">}` | [Gauge](#common-types) | Current used/total bytes of disk mounted at _MOUNT_POINT_                                                   |
-
-Example configuration:
-```json
-"System": {
-  "Cpu": false,
-  "LoadAverage1m": false,
-  "LoadAverage5m": false,
-  "LoadAverage15m": false,
-  "FreeMem": false,
-  "TotalMem": false,
-  "DriveTotalBytes": false,
-  "DriveUsedBytes": true
-}
-```
-
-Example output:
-```
-# TYPE eventstore_sys_disk_bytes gauge
-# UNIT eventstore_sys_disk_bytes bytes
-eventstore_sys_disk_bytes{disk="/home",kind="used"} 38947205120 1688070655500
-```
-
-## Metric types
-
-### Common types
-
-Please refer to [Prometheus documentation](https://prometheus.io/docs/concepts/metric_types/) for explanation of common metric types (`Gauge`, `Counter` and `Histogram`).
-
-### RecentMax
-
-A gauge whose value represents the maximum out of a set of _recent_ measurements. Its purpose is to capture spikes that would otherwise have fallen in-between scrapes.
-
-::: note
-The `ExpectedScrapeIntervalSeconds` setting within `metricsconfig.json` can be used to control the size of the window that the max is calculated over. It represents the expected interval between scrapes by a consumer such as Prometheus. It can only take specific values: `0`, `1`, `5`, `10` or multiples of `15`.
-
-Setting the expected scape interval correctly ensures that spikes in the time series will be captured by at least one scrape and at most two.
-:::
-
-Example output:
-Following metric is reported when `ExpectedScrapeIntervalSeconds` is set to `15` seconds
-```
-# TYPE eventstore_writer_flush_size_max gauge
-eventstore_writer_flush_size_max{range="16-20 seconds"} 1854 1688070655500
-```
-In above example, maximum reported is `1854`. It is not a maximum measurement in last `15s` but rather maximum measurement in last `16` to last `20` seconds i.e. the maximum measurement could have been recorded in last `16s`, last `17s`, …, upto last `20s`.
-
diff --git a/docs/http-api/README.md b/docs/http-api/README.md
index 56a1111d143..dcb56e803ed 100644
--- a/docs/http-api/README.md
+++ b/docs/http-api/README.md
@@ -1,765 +1,7 @@
-# Introduction 
+---
+index: false
+---
 
-## Overview
+Reference documentation of HTTP API for KurrentDB v25.0
 
-EventStoreDB provides a native interface of AtomPub over HTTP. AtomPub is a RESTful protocol that can reuse many existing components, for example reverse proxies and a client's native HTTP caching. Since events stored in EventStoreDB are immutable, cache expiration can be infinite. EventStoreDB leverages content type negotiation and you can access appropriately serialised events can as JSON or XML according to the request headers.
-
-### Compatibility with AtomPub
-
-EventStoreDB v5 is fully compatible with the [1.0 version of the Atom Protocol](https://datatracker.ietf.org/doc/html/rfc4287). EventStoreDB adds extensions to the protocol, such as headers for control and custom `rel` links.
-
-::: warning
-The latest versions of EventStoreDB (v20+) have the AtomPub protocol disabled by default. We do not advise creating new applications using AtomPub as we plan to deprecate it. Please explore our new gRPC protocol available in v20. It provides more reliable real-time event streaming with wide range of platforms and language supported.
-:::
-
-#### Existing implementations
-
-Many environments have already implemented the AtomPub protocol, which simplifies the process.
-
-| Library   | Description                                        |
-|-----------|----------------------------------------------------|
-| NET (BCL) | `System.ServiceModel.SyndicationServices`          |
-| JVM       | <http://java-source.net/open-source/rss-rdf-tools> |
-| PHP       | <http://simplepie.org/>                            |
-| Ruby      | <https://github.com/cardmagic/simple-rss>          |
-| Clojure   | <https://github.com/scsibug/feedparser-clj>        |
-| Python    | <http://code.google.com/p/feedparser/>             |
-| node.js   | <https://github.com/danmactough/node-feedparser>   |
-
-::: warning
-These are not officially supported by EventStoreDB.
-:::
-
-#### Content types
-
-The preferred way of determining which content type responses EventStoreDB serves is to set the `Accept` header on the request. As some clients do not deal well with HTTP headers when caching, appending a format parameter to the URL is also supported, for example, `?format=xml`.
-
-The accepted content types for POST requests are:
-
-- `application/xml`
-- `application/vnd.eventstore.events+xml`
-- `application/json`
-- `application/vnd.eventstore.events+json`
-- `text/xml`
-
-The accepted content types for GET requests are:
-
-- `application/xml`
-- `application/atom+xml`
-- `application/json`
-- `application/vnd.eventstore.atom+json`
-- `text/xml`
-- `text/html`
-- `application/vnd.eventstore.streamdesc+json`
-
-## Appending Events
-
-You append to a stream over HTTP using a `POST` request to the resource of the stream. If the stream does not exist then the stream is implicitly created.
-
-### EventStoreDB media types
-
-EventStoreDB supports a custom media type for posting events, `application/vnd.eventstore.events+json` or `application/vnd.eventstore.events+xml`. This format allows for extra functionality that posting events as `application/json` or `application/xml` does not. For example it allows you to post multiple events in a single batch.
-
-<!-- TODO: And more? Why not use it? And why are these examples not using it? -->
-
-The format represents data with the following jschema (`eventId` must be a UUID).
-
-```json
-[
-    {
-      "eventId"    : "string",
-      "eventType"  : "string",
-      "data"       : "object",
-      "metadata"   : "object"
-    }
-]
-```
-
-### Appending a single event to a new stream
-
-If you issue a `POST` request with data to a stream and the correct content type set it appends the event to the stream, and generates a `201` response from the server, giving you the location of the event. Using the following event, which [you can also download as a file](https://raw.githubusercontent.com/EventStore/EventStore/c948d32302414b456b42a73e0ce212f264ccb30a/samples/http-api/event.json):
-
-@[code](@httpapi/event.json)
-
-`POST` the following request to create a stream and add an event to it:
-
-:::: code-group
-::: code-group-item Request
-@[code{curl}](@httpapi/append-event-to-new-stream.sh)
-:::
-::: code-group-item Response
-@[code{response}](@httpapi/append-event-to-new-stream.sh)
-:::
-::::
-
-Some clients may not be able to generate a unique identifier (or may not want to) for the event ID. You need this ID for idempotence purposes and EventStoreDB can generate it for you.
-
-If you leave off the `ES-EventId` header you see different behavior:
-
-:::: code-group
-::: code-group-item Request
-@[code{curl}](@httpapi/append-event-no-id.sh)
-:::
-::: code-group-item Response
-@[code{response}](@httpapi/append-event-no-id.sh)
-:::
-::::
-
-In this case EventStoreDB has responded with a `307 Temporary Redirect`. The location points to another URI that you can post the event to. This new URI is idempotent for posting, even without an event ID.
-
-:::: code-group
-::: code-group-item Request
-@[code{curl}](@httpapi/append-event-follow.sh)
-:::
-::: code-group-item Response
-@[code{response}](@httpapi/append-event-follow.sh)
-:::
-::::
-
-It's generally recommended to include an event ID if possible as it results in fewer round trips between the client and the server.
-
-When posting to either the stream or to the returned redirect, clients must include the `EventType` header. If you forget to include the header you receive an error.
-
-:::: code-group
-::: code-group-item Request
-@[code{curl}](@httpapi/append-event-no-type.sh)
-:::
-::: code-group-item Response
-@[code{response}](@httpapi/append-event-no-type.sh)
-:::
-::::
-
-### Batch append operation
-
-You can append more than one event in a single post by placing multiple events inside the array representing the events, including metadata.
-
-For example, the below has two events:
-
-@[code](@httpapi/multiple-events.json)
-
-When you append multiple events in a single post, EventStoreDB treats them as one transaction, it appends all events together or fails.
-
-:::: code-group
-::: code-group-item Request
-@[code{curl}](@httpapi/append-multiple-events.sh)
-:::
-::: code-group-item Response
-@[code{response}](@httpapi/append-multiple-events.sh)
-:::
-::::
-
-#### Appending events
-
-To append events, issue a `POST` request to the same resource with a new `eventId`:
-
-@[code](@httpapi/event-append.json)
-
-:::: code-group
-::: code-group-item Request
-@[code{curl}](@httpapi/append-event.sh)
-:::
-::: code-group-item Response
-@[code{curl}](@httpapi/append-event.sh)
-:::
-::::
-
-### Data-only events
-
-Version 3.7.0 of EventStoreDB added support for the `application/octet-stream` content type to support data-only binary events. When creating these events, you need to provide the `ES-EventType` and `ES-EventId` headers and cannot have metadata associated with the event. In the example below `SGVsbG8gV29ybGQ=` is the data you `POST` to the stream:
-
-:::: code-group
-::: code-group-item Request
-@[code{curl}](@httpapi/append-data-event.sh)
-:::
-::: code-group-item Response
-@[code{response}](@httpapi/append-data-event.sh)
-:::
-::::
-
-### Expected version header
-
-The expected version header represents the version of the stream you expect.
-
-For example if you append to a stream at version 1, then you expect it to be at version 1 next time you append. This can allow for optimistic locking when multiple applications are reading/appending to streams.
-
-If your expected version is not the current version you receive an HTTP status code of 400.
-
-::: warning
-See the idempotence section below, if you post the same event twice it is idempotent and won't return a version error.
-:::
-
-First append an event to a stream, setting a version:
-
-@[code](@httpapi/event-version.json)
-
-:::: code-group
-::: code-group-item Request
-@[code{curl}](@httpapi/append-event-version.sh)
-:::
-::: code-group-item Response
-@[code{response}](@httpapi/append-event-version.sh)
-:::
-::::
-
-If you now append to the stream with the incorrect version, you receive an HTTP status code 400 error.
-
-:::: code-group
-::: code-group-item Request
-@[code{curl}](@httpapi/append-event-wrong-version.sh)
-:::
-::: code-group-item Response
-@[code{response}](@httpapi/append-event-wrong-version.sh)
-:::
-::::
-
-There are special values you can use in the expected version header:
-
--   `-2` states that this append operation should never conflict and should **always** succeed.
--   `-1` states that the stream should not exist at the time of the appending (this append operation creates it).
--   `0` states that the stream should exist but should be empty.
-
-### Idempotence
-
-Appends to streams are idempotent based upon the `EventId` assigned in your post. If you were to re-run the last command it returns the same value again.
-
-This is important behaviour as it's how you implement error handling. If you receive a timeout, broken connection, no answer, etc from your HTTP `POST` then it's your responsibility to retry the post. You must also keep the same UUID that you assigned to the event in the first `POST`.
-
-If you are using the expected version parameter with your post, then EventStoreDB is 100% idempotent. If you use `-2` as your expected version value, EventStoreDB does its best to keep events idempotent but cannot assure that everything is fully idempotent and you end up in 'at-least-once' messaging. [Read this guide](#idempotence) for more details on idempotence.
-
-## Reading streams and events
-
-### Reading a stream
-
-EventStoreDB exposes streams as a resource located at `http(s)://{yourdomain.com}:{port}/streams/{stream}`. If you issue a simple `GET` request to this resource, you receive a standard AtomFeed document as a response.
-
-:::: code-group
-::: code-group-item Request
-
-@[code{curl}](@httpapi/read-stream.sh)
-:::
-::: code-group-item Response
-
-@[code{response}](@httpapi/read-stream.sh)
-:::
-::::
-
-### Reading an event from a stream
-
-The feed has one item in it, and if there are more than one, then items are sorted from newest to oldest.
-
-For each entry, there are a series of links to the actual events, [we cover embedding data into a stream later](#embedding-data-into-streams-in-json-format). To `GET` an event, follow the `alternate` link and set your `Accept` headers to the mime type you would like the event in.
-
-The accepted content types for `GET` requests are:
-
-- `application/xml`
-- `application/atom+xml`
-- `application/json`
-- `application/vnd.eventstore.atom+json`
-- `text/xml`
-- `text/html`
-
-The non-atom version of the event has fewer details about the event.
-
-:::: code-group
-::: code-group-item Request
-@[code{curl}](@httpapi/read-event.sh)
-:::
-::: code-group-item Response
-@[code{response}](@httpapi/read-event.sh)
-:::
-::::
-
-### Feed paging
-
-The next step in understanding how to read a stream is the `first`/`last`/`previous`/`next` links within a stream. EventStoreDB supplies these links, so you can read through a stream, and they follow the pattern defined in [RFC 5005](https://datatracker.ietf.org/doc/html/rfc5005).
-
-In the example above the server returned the following `links` as part of its result:
-
-:::: code-group
-::: code-group-item Request
-@[code{curl}](@httpapi/read-stream.sh)
-:::
-::: code-group-item Response
-@[code{response}](@httpapi/read-stream.sh)
-:::
-::::
-
-This shows that there is not a `next` URL as all the information is in this request and that the URL requested is the first link. When dealing with these URLs, there are two ways of reading the data in the stream.
-
-- You `GET` the `last` link and move backwards following `previous` links, or
-- You `GET` the `first` link and follow the `next` links, and the final item will not have a `next` link.
-
-If you want to follow a live stream, then you keep following the `previous` links. When you reach the end of a stream, you receive an empty document with no entries or `previous` link. You then continue polling this URI (in the future a document will appear). You can see this by trying the `previous` link from the above feed.
-
-:::: code-group
-::: code-group-item Request
-
-@[code{curl}](@httpapi/read-stream-forwards.sh)
-:::
-::: code-group-item Response
-
-@[code{response}](@httpapi/read-stream-forwards.sh)
-:::
-::::
-
-When parsing an atom subscription, the IDs of events always stay the same. This is important for figuring out if you are referring to the same event.
-
-### Paging through events
-
-Let's now try an example with more than a single page. First create the multiple events:
-
-:::: code-group
-::: code-group-item Request
-
-@[code{curl}](@httpapi/append-paging-events.sh)
-:::
-::: code-group-item Response
-
-@[code{response}](@httpapi/append-paging-events.sh)
-:::
-::::
-
-If you request the stream of events, you see a series of links above the events:
-
-:::: code-group
-::: code-group-item Request
-
-@[code{curl}](@httpapi/request-paging-events.sh)
-:::
-::: code-group-item Response
-
-@[code{response}](@httpapi/request-paging-events.sh)
-:::
-::::
-
-Using the links in the stream of events, you can traverse through all the events in the stream by going to the `last` URL and following `previous` links, or by following `next` links from the `first` link.
-
-For example, if you request the `last` link from above:
-
-:::: code-group
-::: code-group-item Request
-
-@[code{curl}](@httpapi/request-last-link.sh)
-:::
-::: code-group-item Response
-
-@[code{response}](@httpapi/request-last-link.sh)
-:::
-::::
-
-You then follow `previous` links until you are back to the head of the stream, where you can continue reading events in real time by polling the `previous` link.
-
-::: tip
-All links except the head link are fully cacheable as you can see in the HTTP header `Cache-Control: max-age=31536000, public`. This is important when discussing intermediaries and performance as you commonly replay a stream from storage. You should **never** bookmark links aside from the head of the stream resource, and always follow links. We may in the future change how internal links work, and bookmarking links other than the head may break.
-:::
-
-### Reading all events
-
-`$all` is a special paged stream for all events. You can use the same paged form of reading described above to read all events for a node by pointing the stream at _/streams/\$all_. As it's a stream like any other, you can perform all operations, except posting to it.
-
-::: tip
-To access the `$all` stream, you must use admin details. Find more information on the [security](security.md) page.
-:::
-
-:::: code-group
-::: code-group-item Request
-
-@[code{curl}](@httpapi/read-all-events.sh)
-:::
-::: code-group-item Response
-
-@[code{response}](@httpapi/read-all-events.sh)
-:::
-::::
-
-### Conditional GETs
-
-The head link supports conditional `GET`s with the use of [ETAGS](http://en.wikipedia.org/wiki/HTTP_ETag), a well-known HTTP construct. You can include the ETAG of your last request and issue a conditional `GET` to the server. If nothing has changed, it won't return the full feed. For example the earlier response has an ETAG:
-
-@[code{responseHeader}](@httpapi/request-paging-events.sh)
-
-You can use this in your next request when polling the stream for changes by putting it in the `If-None-Match` header. This tells the server to check if the response is the one you already know and returning a '304 not modified' response. If the tags have changed, the server returns a '200 OK' response. You can use this method to optimise your application by not sending large streams if there are no changes.
-
-:::: code-group
-::: code-group-item Request
-
-@[code{curl}](@httpapi/request-etag.sh)
-:::
-::: code-group-item Response
-
-@[code{response}](@httpapi/request-etag.sh)
-:::
-::::
-
-::: tip
-You create Etags using the version of the stream and the media type of the stream you are reading. You can't read an Etag from a stream in one media type and use it with another media type.
-:::
-
-### Embedding data into streams in JSON format
-
-So far in this guide, the feeds returned have contained links that refer to the actual event data. This is normally a preferable mechanism for several reasons:
-
-- They can be in a different media type than the feed, and you can negotiate them separately from the feed itself (for example, the feed in JSON, the event in XML). You can cache the event data separately from the feed, and you can point it to different feeds. If you use a `linkTo()` in your [projection](projections.md) this is what happens in your atom feeds.
-- If you are using JSON, you can embed the events into the atom feed events. This can help cut down on the number of requests in some situations, but the messages are larger.
-
-There are ways of embedding events and further metadata into your stream by using the `embed` parameter.
-
-#### Rich embed mode
-
-The `rich` embed mode returns more properties about the event (`eventtype`, `streamid`, `position`, and so on) as you can see in the following request.
-
-:::: code-group
-::: code-group-item Request
-
-@[code{curl}](@httpapi/read-stream-rich.sh)
-:::
-::: code-group-item Response
-
-@[code{response}](@httpapi/read-stream-rich.sh)
-:::
-::::
-
-#### Body embed mode
-
-The `body` embed mode returns the JSON/XML body of the events into the feed as well, depending on the type of the feed. You can see this in the request below:
-
-:::: code-group
-::: code-group-item Request
-
-@[code{curl}](@httpapi/read-stream-body.sh)
-:::
-::: code-group-item Response
-
-@[code{response}](@httpapi/read-stream-body.sh)
-:::
-::::
-
-##### Variants of body embed mode
-
-Two other modes are variants of `body`:
-
-- `PrettyBody` tries to reformat the JSON to make it "pretty to read".
-- `TryHarder` works harder to try to parse and reformat the JSON from an event to return it in the feed. These do not include further information and are focused on how the feed looks.
-
-## Deleting a stream
-
-### Soft deleting
-
-To delete a stream over the Atom interface, issue a `DELETE` request to the resource.
-
-:::: code-group
-::: code-group-item Request
-@[code](@httpapi/delete-stream/delete-stream.sh)
-:::
-::: code-group-item Response
-@[code](@httpapi/delete-stream/delete-stream-response.http)
-:::
-::::
-
-By default when you delete a stream, EventStoreDB soft deletes it. This means you can recreate it later by setting the `$tb` metadata section in the stream. If you try to `GET` a soft deleted stream you receive a 404 response:
-
-:::: code-group
-::: code-group-item Request
-@[code](@httpapi/delete-stream/get-deleted-stream.sh)
-:::
-::: code-group-item Response
-@[code](@httpapi/delete-stream/get-deleted-stream-response.http)
-:::
-::::
-
-You can recreate the stream by appending new events to it (like creating a new stream):
-
-:::: code-group
-::: code-group-item Request
-@[code{curl}](@httpapi/append-event.sh)
-:::
-::: code-group-item Response
-@[code](@httpapi/append-event.http)
-:::
-::::
-
-The version numbers do not start at zero but at where you soft deleted the stream from
-
-### Hard deleting
-
-You can hard delete a stream. To issue a permanent delete use the `ES-HardDelete` header.
-
-::: warning
-A hard delete is permanent and the stream is not removed during a scavenge. If you hard delete a stream, you cannot recreate the stream.
-:::
-
-Issue the `DELETE` as before but with the permanent delete header:
-
-:::: code-group
-::: code-group-item Request
-@[code](@httpapi/delete-stream/hard-delete-stream.sh)
-:::
-::: code-group-item Response
-@[code](@httpapi/delete-stream/hard-delete-stream.http)
-:::
-::::
-
-The stream is now permanently deleted, and now the response is a `410`.
-
-:::: code-group
-::: code-group-item Request
-@[code{curl}](@httpapi/delete-stream/get-deleted-stream.sh)
-:::
-::: code-group-item Response
-@[code](@httpapi/delete-stream/get-deleted-stream-response.http)
-:::
-::::
-
-If you try to recreate the stream as in the above example you also receive a `410` response.
-
-:::: code-group
-::: code-group-item Request
-@[code{curl}](@httpapi/delete-stream/append-event-deleted.sh)
-:::
-::: code-group-item Response
-@[code{response}](@httpapi/delete-stream/append-event-deleted.sh)
-:::
-::::
-
-## Description document
-
-<!-- TODO: Combine with CC pages?  -->
-
-With the addition of Competing Consumers, which is another way of reading streams, the need arose to expose these different methods to consumers.
-
-The introduction of the description document has some benefits:
-
--   Clients can rely on the keys (streams, streamSubscription) in the description document to remain unchanged across versions of EventStoreDB and you can rely on it as a lookup for the particular method of reading a stream.
--   Allows the restructuring of URIs underneath without breaking clients. e.g., `/streams/newstream` -> `/streams/newstream/atom`.
-
-### Fetching the description document
-
-There are three ways in which EventStoreDB returns the description document.
-
-- Attempting to read a stream with an unsupported media type.
-- Attempting to read a stream with no accept header.
-- Requesting the description document explicitly.
-
-The client is able to request the description document by passing `application/vnd.eventstore.streamdesc+json` in the `accept` header, for example:
-
-:::: code-group
-::: code-group-item Request
-@[code{curl}](@httpapi/get-dd.sh)
-:::
-::: code-group-item Response
-@[code{response}](@httpapi/get-dd.sh)
-:::
-::::
-
-In the example above, the client requested the description document for the stream called `newstream` which has a set of links describing the supported methods and content types. The document also includes additional methods available such as the `streamSubscription`. If there are no subscriptions to the `newstream`, the `streamSubscription` key is absent.
-
-## Optimistic concurrency and idempotence
-
-### Idempotence
-
-All operations on the HTTP interface are idempotent (unless the [expected version](#expected-version-header) is ignored). It is the responsibility of the client to retry operations under failure conditions, ensuring that the event IDs of the events posted are the same as the first attempt.
-
-Provided the client maintains this EventStoreDB will treat all operations as idempotent.
-
-For example:
-
-:::: code-group
-::: code-group-item Request
-
-```bash
-curl -i -d @event.txt "http://127.0.0.1:2113/streams/newstream"
-```
-:::
-::: code-group-item Response
-
-```http
-HTTP/1.1 201 Created
-Access-Control-Allow-Origin: *
-Access-Control-Allow-Methods: POST, GET, PUT, DELETE
-Location: http://127.0.0.1:2113/streams/newstream444/1
-Content-Type: application/json
-Server: Mono-HTTPAPI/1.0
-Date: Thu, 06 Sep 2012 19:49:37 GMT
-Content-Length: 107
-Keep-Alive: timeout=15,max=100
-```
-:::
-::::
-
-Assuming you were posting to a new stream you would get the event appended once (and the stream created). The second event returns as the first but not write again.
-
-::: tip
-This allows the client rule of “if you get an unknown condition, retry” to work.
-:::
-
-For example:
-
-:::: code-group
-::: code-group-item Request
-
-```bash
-curl -i "http://127.0.0.1:2113/streams/newstream444"
-```
-:::
-::: code-group-item Response
-
-```http
-HTTP/1.1 200 OK
-Access-Control-Allow-Origin: *
-Access-Control-Allow-Methods: POST, GET, PUT, DELETE
-Content-Type: application/json
-Server: Mono-HTTPAPI/1.0
-Date: Thu, 06 Sep 2012 19:50:30 GMT
-Content-Length: 2131
-Keep-Alive: timeout=15,max=100
-
-{
-	"title": "Event stream 'newstream444'",
-	"id": "http://127.0.0.1:2113/streams/newstream444",
-	"updated": "2012-09-06T16:39:44.695643Z",
-	"author": {
-		"name": "EventStore"
-	},
-	"links": [
-		{
-			"uri": "http://127.0.0.1:2113/streams/newstream444",
-			"relation": "self"
-		},
-		{
-			"uri": "http://127.0.0.1:2113/streams/newstream444",
-			"relation": "first"
-		}
-	],
-	"entries": [
-		{
-			"title": "newstream444 #1",
-			"id": "http://127.0.0.1:2113/streams/newstream444/1",
-			"updated": "2012-09-06T16:39:44.695643Z",
-			"author": {
-				"name": "EventStore"
-			},
-			"summary": "Entry #1",
-			"links": [
-				{
-					"uri": "http://127.0.0.1:2113/streams/newstream444/1",
-					"relation": "edit"
-				},
-				{
-					"uri": "http://127.0.0.1:2113/streams/newstream444/event/1?format=text",
-					"type": "text/plain"
-				},
-				{
-					"uri": "http://127.0.0.1:2113/streams/newstream444/event/1?format=json",
-					"relation": "alternate",
-					"type": "application/json"
-				},
-				{
-					"uri": "http://127.0.0.1:2113/streams/newstream444/event/1?format=xml",
-					"relation": "alternate",
-					"type": "text/xml"
-				}
-			]
-		},
-		{
-			"title": "newstream444 #0",
-			"id": "http://127.0.0.1:2113/streams/newstream444/0",
-			"updated": "2012-09-06T16:39:44.695631Z",
-			"author": {
-				"name": "EventStore"
-			},
-			"summary": "Entry #0",
-			"links": [
-				{
-					"uri": "http://127.0.0.1:2113/streams/newstream444/0",
-					"relation": "edit"
-				},
-				{
-					"uri": "http://127.0.0.1:2113/streams/newstream444/event/0?format=text",
-					"type": "text/plain"
-				},
-				{
-					"uri": "http://127.0.0.1:2113/streams/newstream444/event/0?format=json",
-					"relation": "alternate",
-					"type": "application/json"
-				},
-				{
-					"uri": "http://127.0.0.1:2113/streams/newstream444/event/0?format=xml",
-					"relation": "alternate",
-					"type": "text/xml"
-				}
-			]
-		}
-	]
-}
-```
-:::
-::::
-
-## Stream metadata
-
-Every stream in EventStoreDB has metadata stream associated with it, prefixed by `$$`, so the metadata stream from a stream called `foo` is `$$foo`. Internally, the metadata includes information such as the ACL of the stream, the maximum count and age for the events in the stream. Client code can also add information into stream metadata for use with projections or the client API.
-
-Stream metadata is stored internally as JSON, and you can access it over the HTTP API.
-
-### Reading stream metadata
-
-To read the metadata, issue a `GET` request to the attached metadata resource, which is typically of the form:
-
-```http
-http://{eventstore-ip-address}/streams/{stream-name}/metadata
-```
-
-You should not access metadata by constructing this URL yourself, as the right to change the resource address is reserved. Instead, you should follow the link from the stream itself, which enables your client to tolerate future changes to the addressing structure.
-
-:::: code-group
-::: code-group-item Request
-@[code{curl}](@httpapi/read-metadata.sh)
-:::
-::: code-group-item Response
-@[code{response}](@httpapi/read-metadata.sh)
-:::
-::::
-
-Once you have the URI of the metadata stream, issue a `GET` request to retrieve the metadata:
-
-```bash
-curl -i -H "Accept:application/vnd.eventstore.atom+json" http://127.0.0.1:2113/streams/%24users/metadata --user admin:changeit
-```
-
-If you have security enabled, reading metadata may require that you pass credentials, as in the examples above. If credentials are required and you do not pass them, then you receive a `401 Unauthorized` response.
-
-:::: code-group
-::: code-group-item Request
-@[code{curl}](@httpapi/missing-credentials.sh)
-:::
-::: code-group-item Response
-@[code{response}](@httpapi/missing-credentials.sh)
-:::
-::::
-
-### Writing metadata
-
-To update the metadata for a stream, issue a `POST` request to the metadata resource.
-
-Inside a file named _metadata.json_:
-
-@[code](@httpapi/metadata.json)
-
-You can also add user-specified metadata here. Some examples user-specified metadata are:
-
--   Which adapter populates a stream.
--   Which projection created a stream.
--   A correlation ID to a business process.
-
-You then post this information is then posted to the stream:
-
-:::: code-group
-::: code-group-item Request
-@[code{curl}](@httpapi/update-metadata.sh)
-:::
-::: code-group-item Response
-@[code{response}](@httpapi/update-metadata.sh)
-:::
-::::
-
-If the specified user does not have permissions to write to the stream metadata, you receive a '401 Unauthorized' response.
+<Catalog/>
\ No newline at end of file
diff --git a/docs/http-api/api.md b/docs/http-api/api.md
index 90749345d7d..d1a162f2b63 100644
--- a/docs/http-api/api.md
+++ b/docs/http-api/api.md
@@ -2,7 +2,7 @@
 
 # HTTP API Reference
 
-The Base URL used in this documentation is <a href="https://eventstore.com">https://eventstore.com</a>, you should replace it with the same url you use to view the administration UI
+The Base URL used in this documentation is <a href="https://kurrent.io">https://kurrent.io</a>, you should replace it with the same url you use to view the administration UI.
 
 ## Authentication
 
@@ -19,12 +19,12 @@ Endpoints for Stream operations
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/streams/{stream}
+curl -X GET https://kurrent.io/streams/{stream}
 
 ```
 
  `GET /streams/{stream}`
-*Reads a stream*
+ *Read a stream*
 
 Read a stream, receiving a standard AtomFeed document as a response.
 
@@ -52,9 +52,11 @@ Read a stream, receiving a standard AtomFeed document as a response.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Append to a stream
@@ -65,12 +67,12 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/streams/{stream} \
+curl -X POST https://kurrent.io/streams/{stream} \
   -H 'Content-Type: application/json' \
-  -H 'ES-ExpectedVersion: 0' \
-  -H 'ES-EventType: string' \
-  -H 'ES-EventId: 0' \
-  -H 'ES-RequiresMaster: true'
+  -H 'Kurrent-ExpectedVersion: 0' \
+  -H 'Kurrent-EventType: string' \
+  -H 'Kurrent-EventId: 0' \
+  -H 'Kurrent-RequireLeader: true'
 
 ```
 
@@ -92,10 +94,10 @@ Append to a stream.
 |Name|In|Type|Required|Description|
 |---|---|---|---|---|
 |stream|path|string|true|The name of the stream|
-|ES-ExpectedVersion|header|integer|false|Expected stream version|
-|ES-EventType|header|string|false|The event type associated to a posted body|
-|ES-EventId|header|GUID|false|Event ID associated to a posted body|
-|ES-RequiresMaster|header|boolean|false|Wether to run on a master node|
+|Kurrent-ExpectedVersion|header|integer|false|Expected stream version|
+|Kurrent-EventType|header|string|false|The event type associated to a posted body|
+|Kurrent-EventId|header|GUID|false|Event ID associated to a posted body|
+|Kurrent-RequireLeader|header|boolean|false|Wether to run on a leader node|
 |body|body|[streamData](#schemastreamdata)|true|Stream events to create|
 
 <h3 id="append-to-a-stream-responses">Responses</h3>
@@ -105,9 +107,11 @@ Append to a stream.
 |201|[Created](https://tools.ietf.org/html/rfc7231#section-6.3.2)|New stream created|None|
 |307|[Temporary Redirect](https://tools.ietf.org/html/rfc7231#section-6.4.7)|Temporary Redirect|None|
 |400|[Bad Request](https://tools.ietf.org/html/rfc7231#section-6.5.1)|Append request body invalid|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Delete a stream
@@ -118,7 +122,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X DELETE https://eventstore.com/streams/{stream}
+curl -X DELETE https://kurrent.io/streams/{stream}
 
 ```
 
@@ -138,9 +142,11 @@ Delete specified stream
 |Status|Meaning|Description|Schema|
 |---|---|---|---|
 |204|[No Content](https://tools.ietf.org/html/rfc7231#section-6.3.5)|Stream deleted|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Alternative stream URL
@@ -151,14 +157,14 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/streams/{stream}/incoming/{guid}
+curl -X POST https://kurrent.io/streams/{stream}/incoming/{guid}
 
 ```
 
  `POST /streams/{stream}/incoming/{guid}`
 *An alternative URL to post events to*
 
-A URL generated by EventStoreDB if you don't supply an ID when creating a stream. You then use this URL to post events to.
+A URL generated by KurrentDB if you don't supply an ID when creating a stream. You then post events to this URL.
 
 <h3 id="alternative-stream-url-parameters">Parameters</h3>
 
@@ -173,9 +179,11 @@ A URL generated by EventStoreDB if you don't supply an ID when creating a stream
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|New event created|None|
 |400|[Bad Request](https://tools.ietf.org/html/rfc7231#section-6.5.1)|Bad request|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Read stream event
@@ -186,7 +194,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/streams/{stream}/{event}
+curl -X GET https://kurrent.io/streams/{stream}/{event}
 
 ```
 
@@ -220,9 +228,11 @@ Reads a single event from a stream.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Get {n} events
@@ -233,7 +243,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/streams/{stream}/{event}/{count}
+curl -X GET https://kurrent.io/streams/{stream}/{event}/{count}
 
 ```
 
@@ -268,9 +278,11 @@ Paginate backwards though stream events by a specified amount.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Page back through events
@@ -281,7 +293,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/streams/{stream}/{event}/backward/{count}
+curl -X GET https://kurrent.io/streams/{stream}/{event}/backward/{count}
 
 ```
 
@@ -316,9 +328,11 @@ Paginate backwards though stream events by a specified amount.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Page forward through events
@@ -329,7 +343,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/streams/{stream}/{event}/forward/{count}
+curl -X GET https://kurrent.io/streams/{stream}/{event}/forward/{count}
 
 ```
 
@@ -364,9 +378,11 @@ Paginate forwards though stream events by a specified amount.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Read stream metadata
@@ -377,7 +393,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/streams/{stream}/metadata
+curl -X GET https://kurrent.io/streams/{stream}/metadata
 
 ```
 
@@ -409,9 +425,11 @@ Returns metadata of a stream, typically information associated with an event tha
 |Status|Meaning|Description|Schema|
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Update stream metadata
@@ -422,7 +440,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/streams/{stream}/metadata \
+curl -X POST https://kurrent.io/streams/{stream}/metadata \
   -H 'Content-Type: application/json'
 
 ```
@@ -467,9 +485,11 @@ Update the metadata of a stream.
 |---|---|---|---|
 |201|[Created](https://tools.ietf.org/html/rfc7231#section-6.3.2)|New stream created|None|
 |400|[Bad Request](https://tools.ietf.org/html/rfc7231#section-6.5.1)|Bad request|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Get all events
@@ -480,7 +500,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/streams/$all
+curl -X GET https://kurrent.io/streams/$all
 
 ```
 
@@ -512,9 +532,11 @@ Returns all events from all streams, you must provide user details.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ## Subscriptions
@@ -529,7 +551,7 @@ Endpoints for Subscription operations
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/subscriptions
+curl -X GET https://kurrent.io/subscriptions
 
 ```
 
@@ -544,9 +566,11 @@ Returns all subscriptions from all streams.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|New persistant subscription|None|
 |400|[Bad Request](https://tools.ietf.org/html/rfc7231#section-6.5.1)|bad input parameter|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Get subscription stream information
@@ -557,7 +581,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/subscriptions/{stream}
+curl -X GET https://kurrent.io/subscriptions/{stream}
 
 ```
 
@@ -577,9 +601,11 @@ Needed
 |Status|Meaning|Description|Schema|
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Get subscription information
@@ -590,7 +616,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/subscriptions/{stream}/{subscription}/info
+curl -X GET https://kurrent.io/subscriptions/{stream}/{subscription}/info
 
 ```
 
@@ -611,9 +637,11 @@ Needed
 |Status|Meaning|Description|Schema|
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Get a stream
@@ -624,7 +652,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/subscriptions/{stream}/{subscription}
+curl -X GET https://kurrent.io/subscriptions/{stream}/{subscription}
 
 ```
 
@@ -657,9 +685,11 @@ Read a specified stream by a persistent subscription.
 |Status|Meaning|Description|Schema|
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Update subscription
@@ -670,7 +700,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/subscriptions/{stream}/{subscription} \
+curl -X POST https://kurrent.io/subscriptions/{stream}/{subscription} \
   -H 'Content-Type: application/json'
 
 ```
@@ -713,9 +743,11 @@ You can edit the settings of an existing subscription while it is running. This
 |Status|Meaning|Description|Schema|
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|Subscription updated|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Create subscription
@@ -726,7 +758,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X PUT https://eventstore.com/subscriptions/{stream}/{subscription} \
+curl -X PUT https://kurrent.io/subscriptions/{stream}/{subscription} \
   -H 'Content-Type: application/json'
 
 ```
@@ -734,7 +766,7 @@ curl -X PUT https://eventstore.com/subscriptions/{stream}/{subscription} \
  `PUT /subscriptions/{stream}/{subscription}`
 *Create a persistent subscription*
 
-Before interacting with a subscription group, you need to create one. You will receive an error if you attempt to create a subscription group more than once. This requires [admin permissions](@server/security.md#access-control-lists).
+Before interacting with a subscription group, you need to create one. You will receive an error if you attempt to create a subscription group more than once. This requires [admin permissions](@server/security/user-authorization.md#admins-role).
 
 > Body parameter
 
@@ -769,9 +801,11 @@ Before interacting with a subscription group, you need to create one. You will r
 |Status|Meaning|Description|Schema|
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|Subscription created|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Delete subscription
@@ -782,7 +816,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X DELETE https://eventstore.com/subscriptions/{stream}/{subscription}
+curl -X DELETE https://kurrent.io/subscriptions/{stream}/{subscription}
 
 ```
 
@@ -803,9 +837,11 @@ Deletes a subscription
 |Status|Meaning|Description|Schema|
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Get {n} subscription events
@@ -816,7 +852,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/subscriptions/{stream}/{subscription}/{count}
+curl -X GET https://kurrent.io/subscriptions/{stream}/{subscription}/{count}
 
 ```
 
@@ -850,9 +886,11 @@ Reads a stream via a persistent subscription and return a specific number of eve
 |Status|Meaning|Description|Schema|
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Acknowledge a single message
@@ -863,7 +901,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/subscriptions/{stream}/{subscription}/ack/{messageid}
+curl -X POST https://kurrent.io/subscriptions/{stream}/{subscription}/ack/{messageid}
 
 ```
 
@@ -886,9 +924,11 @@ Clients must acknowledge (or not acknowledge) messages in the competing consumer
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|New persistant subscription|None|
 |400|[Bad Request](https://tools.ietf.org/html/rfc7231#section-6.5.1)|bad input parameter|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Acknowledge multiple messages
@@ -899,7 +939,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/subscriptions/{stream}/{subscription}/ack
+curl -X POST https://kurrent.io/subscriptions/{stream}/{subscription}/ack
 
 ```
 
@@ -922,9 +962,11 @@ Clients must acknowledge (or not acknowledge) messages in the competing consumer
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|New persistant subscription|None|
 |400|[Bad Request](https://tools.ietf.org/html/rfc7231#section-6.5.1)|bad input parameter|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Don't acknowledge a single message
@@ -935,7 +977,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/subscriptions/{stream}/{subscription}/nack/{messageid}
+curl -X POST https://kurrent.io/subscriptions/{stream}/{subscription}/nack/{messageid}
 
 ```
 
@@ -968,9 +1010,11 @@ Clients must acknowledge (or not acknowledge) messages in the competing consumer
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|New persistant subscription|None|
 |400|[Bad Request](https://tools.ietf.org/html/rfc7231#section-6.5.1)|bad input parameter|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Don't acknowledge multiple messages
@@ -981,7 +1025,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/subscriptions/{stream}/{subscription}/nack
+curl -X POST https://kurrent.io/subscriptions/{stream}/{subscription}/nack
 
 ```
 
@@ -1014,9 +1058,11 @@ Clients must acknowledge (or not acknowledge) messages in the competing consumer
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|New persistant subscription|None|
 |400|[Bad Request](https://tools.ietf.org/html/rfc7231#section-6.5.1)|bad input parameter|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Replay previously parked messages
@@ -1027,7 +1073,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/subscriptions/{stream}/{subscription}/replayParked
+curl -X POST https://kurrent.io/subscriptions/{stream}/{subscription}/replayParked
 
 ```
 
@@ -1048,9 +1094,11 @@ Replay any previously parked messages in a stream that were parked by a negative
 |Status|Meaning|Description|Schema|
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ## Projections
@@ -1065,14 +1113,14 @@ Endpoints for Projection operations
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/projections/any
+curl -X GET https://kurrent.io/projections/any
 
 ```
 
  `GET /projections/any`
 *Get all projections*
 
-Returns all projections defined in EventStoreDB.
+Returns all projections defined in KurrentDB.
 
 <h3 id="get-all-projections-responses">Responses</h3>
 
@@ -1080,9 +1128,11 @@ Returns all projections defined in EventStoreDB.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Get all non-transient projections
@@ -1093,7 +1143,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/projections/all-non-transient
+curl -X GET https://kurrent.io/projections/all-non-transient
 
 ```
 
@@ -1108,9 +1158,11 @@ Returns all known projections except ad-hoc projections.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Get all queries
@@ -1121,14 +1173,14 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/projections/onetime
+curl -X GET https://kurrent.io/projections/onetime
 
 ```
 
  `GET /projections/onetime`
 *Get all queries*
 
-Returns all queries defined in EventStoreDB.
+Returns all queries defined in KurrentDB.
 
 <h3 id="get-all-queries-responses">Responses</h3>
 
@@ -1136,9 +1188,11 @@ Returns all queries defined in EventStoreDB.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Create a onetime projection
@@ -1149,7 +1203,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/projections/onetime
+curl -X POST https://kurrent.io/projections/onetime
 
 ```
 
@@ -1181,9 +1235,11 @@ Create a new onetime projection.
 |---|---|---|---|
 |201|[Created](https://tools.ietf.org/html/rfc7231#section-6.3.2)|New projection created|None|
 |400|[Bad Request](https://tools.ietf.org/html/rfc7231#section-6.5.1)|Bad request|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Get all continious projections
@@ -1194,14 +1250,14 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/projections/continuous
+curl -X GET https://kurrent.io/projections/continuous
 
 ```
 
  `GET /projections/continuous`
 *Get all continious projections*
 
-Returns all continually running projections defined in EventStoreDB.
+Returns all continually running projections defined in KurrentDB.
 
 <h3 id="get-all-continious-projections-responses">Responses</h3>
 
@@ -1209,9 +1265,11 @@ Returns all continually running projections defined in EventStoreDB.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Create a continuous projection
@@ -1222,7 +1280,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/projections/continuous
+curl -X POST https://kurrent.io/projections/continuous
 
 ```
 
@@ -1254,9 +1312,11 @@ Create a new continious projection.
 |---|---|---|---|
 |201|[Created](https://tools.ietf.org/html/rfc7231#section-6.3.2)|New projection created|None|
 |400|[Bad Request](https://tools.ietf.org/html/rfc7231#section-6.5.1)|Bad request|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Read projection events based on a query
@@ -1267,7 +1327,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/projections/read-events
+curl -X POST https://kurrent.io/projections/read-events
 
 ```
 
@@ -1282,9 +1342,11 @@ Read events from projection based on a query definition, i.e. fromAll, fromStrea
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Get all transient projections
@@ -1295,14 +1357,14 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/projections/transient
+curl -X GET https://kurrent.io/projections/transient
 
 ```
 
  `GET /projections/transient`
 *Get all transient projections*
 
-Returns all transient projections defined in EventStoreDB.
+Returns all transient projections defined in KurrentDB.
 
 <h3 id="get-all-transient-projections-responses">Responses</h3>
 
@@ -1310,9 +1372,11 @@ Returns all transient projections defined in EventStoreDB.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Create a transient projection
@@ -1323,7 +1387,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/projections/transient
+curl -X POST https://kurrent.io/projections/transient
 
 ```
 
@@ -1352,9 +1416,11 @@ Create a new transient projection.
 |---|---|---|---|
 |201|[Created](https://tools.ietf.org/html/rfc7231#section-6.3.2)|New user created|None|
 |400|[Bad Request](https://tools.ietf.org/html/rfc7231#section-6.5.1)|Bad request|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Get projection definition
@@ -1365,7 +1431,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/projection/{name}/query
+curl -X GET https://kurrent.io/projection/{name}/query
 
 ```
 
@@ -1387,9 +1453,11 @@ Returns definition of the specified projection.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Update projection definition
@@ -1400,7 +1468,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X PUT https://eventstore.com/projection/{name}/query
+curl -X PUT https://kurrent.io/projection/{name}/query
 
 ```
 
@@ -1429,9 +1497,11 @@ Update the specified projection definition.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Get the projection state
@@ -1442,7 +1512,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/projection/{name}/state
+curl -X GET https://kurrent.io/projection/{name}/state
 
 ```
 
@@ -1464,9 +1534,11 @@ Return the current state of the specified projection.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Get result of projection
@@ -1477,7 +1549,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/projection/{name}/result
+curl -X GET https://kurrent.io/projection/{name}/result
 
 ```
 
@@ -1499,9 +1571,11 @@ Get the final result of a projection.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Get projection statistics
@@ -1512,7 +1586,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/projection/{name}/statistics
+curl -X GET https://kurrent.io/projection/{name}/statistics
 
 ```
 
@@ -1533,9 +1607,11 @@ Returns the statistics for a projection, such as how many events, the status etc
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Disable projection
@@ -1546,7 +1622,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/projection/{name}/command/disable
+curl -X POST https://kurrent.io/projection/{name}/command/disable
 
 ```
 
@@ -1568,9 +1644,11 @@ Disable the specified projection.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Enable projection
@@ -1581,7 +1659,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/projection/{name}/command/enable
+curl -X POST https://kurrent.io/projection/{name}/command/enable
 
 ```
 
@@ -1603,9 +1681,11 @@ Enable the specified projection.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Reset projection
@@ -1616,7 +1696,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/projection/{name}/command/reset
+curl -X POST https://kurrent.io/projection/{name}/command/reset
 
 ```
 
@@ -1638,9 +1718,11 @@ Reset the specified projection.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Abort projection
@@ -1651,7 +1733,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/projection/{name}/command/abort
+curl -X POST https://kurrent.io/projection/{name}/command/abort
 
 ```
 
@@ -1673,9 +1755,11 @@ Abort the specified projection.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Get projection config
@@ -1686,7 +1770,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/projection/{name}/config
+curl -X GET https://kurrent.io/projection/{name}/config
 
 ```
 
@@ -1707,9 +1791,11 @@ Returns the performance configuration of the specified projection.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Update projection config
@@ -1720,7 +1806,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X PUT https://eventstore.com/projection/{name}/config
+curl -X PUT https://kurrent.io/projection/{name}/config
 
 ```
 
@@ -1741,9 +1827,11 @@ Update the performance configuration of the specified projection.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Get a projection
@@ -1754,7 +1842,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/projection/{name}
+curl -X GET https://kurrent.io/projection/{name}
 
 ```
 
@@ -1775,9 +1863,11 @@ Returns a specific projection.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Delete a projection
@@ -1788,7 +1878,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X DELETE https://eventstore.com/projection/{name}
+curl -X DELETE https://kurrent.io/projection/{name}
 
 ```
 
@@ -1811,9 +1901,11 @@ Deletes a projection
 |Status|Meaning|Description|Schema|
 |---|---|---|---|
 |204|[No Content](https://tools.ietf.org/html/rfc7231#section-6.3.5)|Projection deleted|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ## Admin
@@ -1828,7 +1920,7 @@ Endpoints for Admin operations
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/admin/shutdown
+curl -X POST https://kurrent.io/admin/shutdown
 
 ```
 
@@ -1842,12 +1934,23 @@ Issues a shut down command to a node.
 |Status|Meaning|Description|Schema|
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
 <aside class="warning">
 To perform this operation, you must be authenticated by means of one of the following methods:
 basicAuth
 </aside>
 
+### Resigning a leader
+
+Issue a `resign` command to the Leader node which will explicitly start a round of elections:
+
+```bash:no-line-numbers
+curl -X POST -d {} https://{leader_address}:2113/admin/node/resign -u admin:changeit
+```
+
+> **Note:** The resigned leader node automatically has reduced priority in the elections, but it is still possible that the same node will be elected leader again.
+
 ### Scavenge a node
 
 <a id="opIdScavenge a node"></a>
@@ -1856,7 +1959,7 @@ basicAuth
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/admin/scavenge
+curl -X POST https://kurrent.io/admin/scavenge
 
 ```
 
@@ -1892,7 +1995,7 @@ basicAuth
 
 ``` shell
 # You can also use wget
-curl -X DELETE https://eventstore.com/admin/scavenge/{scavengeId}
+curl -X DELETE https://kurrent.io/admin/scavenge/{scavengeId}
 
 ```
 
@@ -1927,7 +2030,7 @@ basicAuth
 
 ``` shell
 # You can also use wget
-curl -X POST -d{} https://eventstore.com/admin/mergeindexes
+curl -X POST -d{} https://kurrent.io/admin/mergeindexes
 
 ```
 
@@ -1960,7 +2063,7 @@ Endpoints for Info operations
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/info
+curl -X GET https://kurrent.io/info
 
 ```
 
@@ -1989,7 +2092,7 @@ basicAuth
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/info/options
+curl -X GET https://kurrent.io/info/options
 
 ```
 
@@ -2022,14 +2125,14 @@ Endpoints for User operations
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/users/
+curl -X GET https://kurrent.io/users/
 
 ```
 
  `GET /users/`
 *Get all users*
 
-Returns all users defined in EventStoreDB.
+Returns all users defined in KurrentDB.
 
 <h3 id="get-all-users-responses">Responses</h3>
 
@@ -2037,9 +2140,11 @@ Returns all users defined in EventStoreDB.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Create a user
@@ -2050,7 +2155,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/users/ \
+curl -X POST https://kurrent.io/users/ \
   -H 'Content-Type: application/json'
 
 ```
@@ -2065,7 +2170,7 @@ Create a new user.
 ``` json
 {
   "LoginName": "admin",
-  "FullName": "EventStore Admin",
+  "FullName": "KurrentDB Admin",
   "Groups": [
     "Admin",
     "DataScience"
@@ -2101,7 +2206,7 @@ basicAuth
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/users/{login}
+curl -X GET https://kurrent.io/users/{login}
 
 ```
 
@@ -2122,9 +2227,11 @@ Returns the user currently authenticated with the API, or the user specified.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Update a user
@@ -2135,7 +2242,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X PUT https://eventstore.com/users/{login} \
+curl -X PUT https://kurrent.io/users/{login} \
   -H 'Content-Type: application/json'
 
 ```
@@ -2149,7 +2256,7 @@ Update the FullName of Groups of the specified user.
 
 ``` json
 {
-  "FullName": "EventStore Admin",
+  "FullName": "KurrentDB Admin",
   "Groups": [
     "Admin",
     "DataScience"
@@ -2170,9 +2277,11 @@ Update the FullName of Groups of the specified user.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Delete a user
@@ -2183,7 +2292,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X DELETE https://eventstore.com/users/{login}
+curl -X DELETE https://kurrent.io/users/{login}
 
 ```
 
@@ -2203,9 +2312,11 @@ Delete specified user.
 |Status|Meaning|Description|Schema|
 |---|---|---|---|
 |204|[No Content](https://tools.ietf.org/html/rfc7231#section-6.3.5)|User deleted|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Enable a user
@@ -2216,7 +2327,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X PUT https://eventstore.com/users/{login}/command/enable
+curl -X PUT https://kurrent.io/users/{login}/command/enable
 
 ```
 
@@ -2237,9 +2348,11 @@ Enable the acount of the specified user.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Disable a user
@@ -2250,7 +2363,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X PUT https://eventstore.com/users/{login}/command/disable
+curl -X PUT https://kurrent.io/users/{login}/command/disable
 
 ```
 
@@ -2271,9 +2384,11 @@ Disable the acount of the specified user.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Reset password
@@ -2284,7 +2399,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/users/{login}/command/reset-password \
+curl -X POST https://kurrent.io/users/{login}/command/reset-password \
   -H 'Content-Type: application/json'
 
 ```
@@ -2315,9 +2430,11 @@ Reset the password of the specified user.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |400|[Bad Request](https://tools.ietf.org/html/rfc7231#section-6.5.1)|Bad request|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Change password
@@ -2328,7 +2445,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/users/{login}/command/change-password \
+curl -X POST https://kurrent.io/users/{login}/command/change-password \
   -H 'Content-Type: application/json'
 
 ```
@@ -2360,9 +2477,11 @@ Change the password of the specified user.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |400|[Bad Request](https://tools.ietf.org/html/rfc7231#section-6.5.1)|Bad request|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ## Stats
@@ -2377,7 +2496,7 @@ Endpoints for Statistics operations.
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/stats \
+curl -X GET https://kurrent.io/stats \
   -H 'Accept: application/json'
 
 ```
@@ -2385,7 +2504,7 @@ curl -X GET https://eventstore.com/stats \
  `GET /stats`
 *Get all stats*
 
-Returns all stats enabled for EventStoreDB.
+Returns all stats enabled for KurrentDB.
 
 > Example responses
 
@@ -2588,9 +2707,11 @@ Returns all stats enabled for EventStoreDB.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|A list of stats|[Stats](#schemastats)|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ### Get specified stat
@@ -2601,14 +2722,14 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/stats/{statPath}
+curl -X GET https://kurrent.io/stats/{statPath}
 
 ```
 
  `GET /stats/{statPath}`
 *Get stats sub path*
 
-Returns the sub path of the EventStoreDB statistics available.
+Returns the sub path of the KurrentDB statistics available.
 
 <h3 id="get-specified-stat-parameters">Parameters</h3>
 
@@ -2622,9 +2743,11 @@ Returns the sub path of the EventStoreDB statistics available.
 |---|---|---|---|
 |200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|None|
 |404|[Not Found](https://tools.ietf.org/html/rfc7231#section-6.5.4)|Not found|None|
+|401|[Unauthorized](https://tools.ietf.org/html/rfc7235#section-3.1)|Unauthorized|None|
 
-<aside class="success">
-This operation does not require authentication
+<aside class="warning">
+To perform this operation, you must be authenticated by means of one of the following methods:
+basicAuth
 </aside>
 
 ## Gossip
@@ -2637,7 +2760,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X GET https://eventstore.com/gossip
+curl -X GET https://kurrent.io/gossip
 
 ```
 
@@ -2665,7 +2788,7 @@ This operation does not require authentication
 
 ``` shell
 # You can also use wget
-curl -X POST https://eventstore.com/gossip
+curl -X POST https://kurrent.io/gossip
 
 ```
 
@@ -2697,7 +2820,7 @@ This operation does not require authentication
 ``` json
 {
   "LoginName": "admin",
-  "FullName": "EventStore Admin",
+  "FullName": "KurrentDB Admin",
   "Groups": [
     "Admin",
     "DataScience"
@@ -2725,7 +2848,7 @@ This operation does not require authentication
 
 ``` json
 {
-  "FullName": "EventStore Admin",
+  "FullName": "KurrentDB Admin",
   "Groups": [
     "Admin",
     "DataScience"
@@ -3110,12 +3233,12 @@ This operation does not require authentication
 |»» timeInGc|number|false|none|Percentage of time in garbage collection|
 |»» totalBytesInHeaps|number|false|none|Total bytes in all heaps|
 |» diskIo|object|false|none|Disk input and output stats|
-|»» readBytes|number|false|none|The number of bytes read by EventStoreDB since server start|
-|»» writtenBytes|number|false|none|The number of bytes written by EventStoreDB since server start|
-|»» readOps|number|false|none|The number of read operations by EventStoreDB since server start|
-|»» writeOps|number|false|none|The number of write operations by EventStoreDB since server start|
+|»» readBytes|number|false|none|The number of bytes read by KurrentDB since server start|
+|»» writtenBytes|number|false|none|The number of bytes written by KurrentDB since server start|
+|»» readOps|number|false|none|The number of read operations by KurrentDB since server start|
+|»» writeOps|number|false|none|The number of write operations by KurrentDB since server start|
 |» tcp|object|false|none|TCP connection stats|
-|»» connections|integer|false|none|Number of TCP connections to EventStoreDB|
+|»» connections|integer|false|none|Number of TCP connections to KurrentDB|
 |»» receivingSpeed|string|false|none|Receiving speed in bytes per second|
 |»» sendingSpeed|number|false|none|Sending speed in bytes per second|
 |»» inSend|number|false|none|Number of bytes sent to connections but not yet acknowledged by the receiving party|
@@ -3131,10 +3254,10 @@ This operation does not require authentication
 |» freeMem|number|false|none|Free memory in bytes|
 |» drive|object|false|none|Drive usage stats|
 |»» driveName|object|false|none|Drive path|
-|»»» availableBytes|number|false|none|Remaining bytes of space available to EventStoreDB|
-|»»» totalBytes|number|false|none|Total bytes of space available to EventStoreDB|
-|»»» usage|number|false|none|Percentage usage of space used by EventStoreDB|
-|»»» usedBytes|number|false|none|Total bytes of space used by EventStoreDB|
+|»»» availableBytes|number|false|none|Remaining bytes of space available to KurrentDB|
+|»»» totalBytes|number|false|none|Total bytes of space available to KurrentDB|
+|»»» usage|number|false|none|Percentage usage of space used by KurrentDB|
+|»»» usedBytes|number|false|none|Total bytes of space used by KurrentDB|
 |es|object|false|none|none|
 |» checksum|number|false|none|none|
 |» checksumNonFlushed|number|false|none|none|
diff --git a/docs/http-api/introduction.md b/docs/http-api/introduction.md
new file mode 100644
index 00000000000..0664794b046
--- /dev/null
+++ b/docs/http-api/introduction.md
@@ -0,0 +1,687 @@
+---
+order: 1
+---
+
+# Introduction 
+
+## Overview
+
+KurrentDB provides a native interface of AtomPub over HTTP. AtomPub is a RESTful protocol that can reuse many existing components, for example reverse proxies and a client's native HTTP caching. Since events stored in KurrentDB are immutable, cache expiration can be infinite. KurrentDB leverages content type negotiation and you can access appropriately serialised events as JSON or according to the request headers.
+
+### Compatibility with AtomPub
+
+KurrentDB is compatible with the [1.0 version of the Atom Protocol](https://datatracker.ietf.org/doc/html/rfc4287). KurrentDB adds extensions to the protocol, such as headers for control and custom `rel` links.
+
+::: warning
+KurrentDB has the AtomPub protocol disabled by default. We do not advise creating new applications using AtomPub as we plan to deprecate it. Please use the gRPC protocol available in v20. It provides more reliable real-time event streaming with wide range of platforms and language supported.
+:::
+
+#### Existing implementations
+
+Many environments have already implemented the AtomPub protocol, which simplifies the process.
+
+| Library   | Description                                        |
+|-----------|----------------------------------------------------|
+| NET (BCL) | `System.ServiceModel.SyndicationServices`          |
+| JVM       | <http://java-source.net/open-source/rss-rdf-tools> |
+| PHP       | <http://simplepie.org/>                            |
+| Ruby      | <https://github.com/cardmagic/simple-rss>          |
+| Clojure   | <https://github.com/scsibug/feedparser-clj>        |
+| Python    | <http://code.google.com/p/feedparser/>             |
+| node.js   | <https://github.com/danmactough/node-feedparser>   |
+
+::: warning
+These are not officially supported by KurrentDB.
+:::
+
+#### Content types
+
+The preferred way of determining which content type responses KurrentDB serves is to set the `Accept` header on the request. As some clients do not deal well with HTTP headers when caching, appending a format parameter to the URL is also supported, for example, `?format=xml`.
+
+The accepted content types for POST requests are:
+
+- `application/xml`
+- `application/vnd.eventstore.events+xml`
+- `application/json`
+- `application/vnd.kurrent.events+json`
+- `application/vnd.eventstore.events+json`
+- `text/xml`
+
+The accepted content types for GET requests are:
+
+- `application/xml`
+- `application/atom+xml`
+- `application/json`
+- `application/vnd.kurrent.atom+json`
+- `application/vnd.eventstore.atom+json`
+- `text/xml`
+- `text/html`
+- `application/vnd.kurrent.streamdesc+json`
+- `application/vnd.eventstore.streamdesc+json`
+
+## Appending Events
+
+You append to a stream over HTTP using a `POST` request to the resource of the stream. If the stream does not exist then the stream is implicitly created.
+
+### KurrentDB media types
+
+KurrentDB supports a custom media type for posting events, `application/vnd.kurrent.events+json`. This format allows for extra functionality that posting events as `application/json` does not. For example it allows you to post multiple events in a single batch.
+
+<!-- TODO: And more? Why not use it? And why are these examples not using it? -->
+
+The format represents data with the following JSON schema (`eventId` must be a UUID).
+
+```json
+[
+    {
+      "eventId"    : "string",
+      "eventType"  : "string",
+      "data"       : "object",
+      "metadata"   : "object"
+    }
+]
+```
+
+### Appending a single event to a new stream
+
+If you issue a `POST` request with data to a stream and the correct content type set it appends the event to the stream, and generates a `201` response from the server, giving you the location of the event. Using the following event, which [you can also download as a file](https://raw.githubusercontent.com/EventStore/EventStore/c948d32302414b456b42a73e0ce212f264ccb30a/samples/http-api/event.json):
+
+@[code](@httpapi/event.json)
+
+`POST` the following request to create a stream and add an event to it:
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/append-event-to-new-stream.sh)
+@tab Response
+@[code{response}](@httpapi/append-event-to-new-stream.sh)
+:::
+
+Some clients may not be able to generate a unique identifier (or may not want to) for the event ID. You need this ID for idempotence purposes and KurrentDB can generate it for you.
+
+If you leave off the `Kurrent-EventId` header you see different behavior:
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/append-event-no-id.sh)
+@tab Response
+@[code{response}](@httpapi/append-event-no-id.sh)
+:::
+
+In this case KurrentDB has responded with a `307 Temporary Redirect`. The location points to another URI that you can post the event to. This new URI is idempotent for posting, even without an event ID.
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/append-event-follow.sh)
+@tab Response
+@[code{response}](@httpapi/append-event-follow.sh)
+:::
+
+It's generally recommended to include an event ID if possible as it results in fewer round trips between the client and the server.
+
+When posting to either the stream or to the returned redirect, clients must include the `EventType` header. If you forget to include the header you receive an error.
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/append-event-no-type.sh)
+@tab Response
+@[code{response}](@httpapi/append-event-no-type.sh)
+:::
+
+### Batch append operation
+
+You can append more than one event in a single post by placing multiple events inside the array representing the events, including metadata.
+
+For example, the below has two events:
+
+@[code](@httpapi/multiple-events.json)
+
+When you append multiple events in a single post, KurrentDB treats them as one transaction, it appends all events together or fails.
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/append-multiple-events.sh)
+@tab Response
+@[code{response}](@httpapi/append-multiple-events.sh)
+:::
+
+#### Appending events
+
+To append events, issue a `POST` request to the same resource with a new `eventId`:
+
+@[code](@httpapi/event-append.json)
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/append-event.sh)
+@tab Response
+@[code{response}](@httpapi/append-event.sh)
+:::
+
+### Data-only events
+
+Use the `application/octet-stream` content type to support data-only binary events. When creating these events, you need to provide the `Kurrent-EventType` and `Kurrent-EventId` headers and cannot have metadata associated with the event. In the example below `SGVsbG8gV29ybGQ=` is the data you `POST` to the stream:
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/append-data-event.sh)
+@tab Response
+@[code{response}](@httpapi/append-data-event.sh)
+:::
+
+### Expected version header
+
+The expected version header represents the version of the stream you expect.
+
+For example if you append to a stream at version 1, then you expect it to be at version 1 next time you append. This can allow for optimistic locking when multiple applications are reading/appending to streams.
+
+If your expected version is not the current version you receive an HTTP status code of 400.
+
+::: warning
+See the idempotence section below, if you post the same event twice it is idempotent and won't return a version error.
+:::
+
+First append an event to a stream, setting a version:
+
+@[code](@httpapi/event-version.json)
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/append-event-version.sh)
+@tab Response
+@[code{response}](@httpapi/append-event-version.sh)
+:::
+
+If you now append to the stream with the incorrect version, you receive an HTTP status code 400 error.
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/append-event-wrong-version.sh)
+@tab Response
+@[code{response}](@httpapi/append-event-wrong-version.sh)
+:::
+
+There are special values you can use in the expected version header:
+
+- `-2` states that this append operation should never conflict and should **always** succeed.
+- `-1` states that the stream should not exist at the time of the appending (this append operation creates it).
+- `0` states that the stream should exist but should be empty.
+
+### Idempotence
+
+Appends to streams are idempotent based upon the `EventId` assigned in your post. If you were to re-run the last command it returns the same value again.
+
+This is important behaviour as it's how you implement error handling. If you receive a timeout, broken connection, no answer, etc from your HTTP `POST` then it's your responsibility to retry the post. You must also keep the same UUID that you assigned to the event in the first `POST`.
+
+If you are using the expected version parameter with your post, then KurrentDB is 100% idempotent. If you use `-2` as your expected version value, KurrentDB does its best to keep events idempotent but cannot assure that everything is fully idempotent and you end up in 'at-least-once' messaging.
+
+## Reading streams and events
+
+### Reading a stream
+
+KurrentDB exposes streams as a resource located at `http(s)://{yourdomain.com}:{port}/streams/{stream}`. If you issue a simple `GET` request to this resource, you receive a standard AtomFeed document as a response.
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/read-stream.sh)
+@tab Response
+@[code{response}](@httpapi/read-stream.sh)
+:::
+
+### Reading an event from a stream
+
+The feed has one item in it, and if there are more than one, then items are sorted from newest to oldest.
+
+For each entry, there are a series of links to the actual events, [we cover embedding data into a stream later](#embedding-data-into-streams-in-json-format). To `GET` an event, follow the `alternate` link and set your `Accept` headers to the mime type you would like the event in.
+
+The accepted content types for `GET` requests are:
+
+- `application/xml`
+- `application/atom+xml`
+- `application/json`
+- `application/vnd.kurrent.atom+json`
+- `application/vnd.eventstore.atom+json`
+- `text/xml`
+- `text/html`
+
+The non-atom version of the event has fewer details about the event.
+
+::: tabs
+@tab Request
+@[code](@httpapi/read-event.sh)
+@tab Response
+@[code](@httpapi/read-event.json)
+:::
+
+### Feed paging
+
+The next step in understanding how to read a stream is the `first`/`last`/`previous`/`next` links within a stream. KurrentDB supplies these links, so you can read through a stream, and they follow the pattern defined in [RFC 5005](https://datatracker.ietf.org/doc/html/rfc5005).
+
+In the example above the server returned the following `links` as part of its result:
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/read-stream.sh)
+@tab Response
+@[code{response}](@httpapi/read-stream.sh)
+:::
+
+This shows that there is not a `next` URL as all the information is in this request and that the URL requested is the first link. When dealing with these URLs, there are two ways of reading the data in the stream.
+
+- You `GET` the `last` link and move backwards following `previous` links, or
+- You `GET` the `first` link and follow the `next` links, and the final item will not have a `next` link.
+
+If you want to follow a live stream, then you keep following the `previous` links. When you reach the end of a stream, you receive an empty document with no entries or `previous` link. You then continue polling this URI (in the future a document will appear). You can see this by trying the `previous` link from the above feed.
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/read-stream-forwards.sh)
+@tab Response
+@[code{response}](@httpapi/read-stream-forwards.sh)
+:::
+
+When parsing an atom subscription, the IDs of events always stay the same. This is important for figuring out if you are referring to the same event.
+
+### Paging through events
+
+Let's now try an example with more than a single page. First create the multiple events:
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/append-paging-events.sh)
+@tab Response
+@[code{response}](@httpapi/append-paging-events.sh)
+:::
+
+If you request the stream of events, you see a series of links above the events:
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/request-paging-events.sh)
+@tab Response
+@[code{response}](@httpapi/request-paging-events.sh)
+:::
+
+Using the links in the stream of events, you can traverse through all the events in the stream by going to the `last` URL and following `previous` links, or by following `next` links from the `first` link.
+
+For example, if you request the `last` link from above:
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/request-last-link.sh)
+@tab Response
+@[code{response}](@httpapi/request-last-link.sh)
+:::
+
+You then follow `previous` links until you are back to the head of the stream, where you can continue reading events in real time by polling the `previous` link.
+
+::: tip
+All links except the head link are fully cacheable as you can see in the HTTP header `Cache-Control: max-age=31536000, public`. This is important when discussing intermediaries and performance as you commonly replay a stream from storage. You should **never** bookmark links aside from the head of the stream resource, and always follow links. We may in the future change how internal links work, and bookmarking links other than the head may break.
+:::
+
+### Reading all events
+
+`$all` is a special paged stream for all events. You can use the same paged form of reading described above to read all events for a node by pointing the stream at _/streams/\$all_. As it's a stream like any other, you can perform all operations, except posting to it.
+
+::: tip
+To access the `$all` stream, you must use admin details. Find more information on the [security](security.md) page.
+:::
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/read-all-events.sh)
+@tab Response
+@[code{response}](@httpapi/read-all-events.sh)
+:::
+
+### Conditional GETs
+
+The head link supports conditional `GET`s with the use of [ETag](http://en.wikipedia.org/wiki/HTTP_ETag), a well-known HTTP construct. You can include the ETAG of your last request and issue a conditional `GET` to the server. If nothing has changed, it won't return the full feed. For example the earlier response has an ETAG:
+
+@[code{responseHeader}](@httpapi/request-paging-events.sh)
+
+You can use this in your next request when polling the stream for changes by putting it in the `If-None-Match` header. This tells the server to check if the response is the one you already know and returning a '304 not modified' response. If the tags have changed, the server returns a '200 OK' response. You can use this method to optimise your application by not sending large streams if there are no changes.
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/request-etag.sh)
+@tab Response
+@[code{response}](@httpapi/request-etag.sh)
+:::
+
+::: tip
+You create Etags using the version of the stream and the media type of the stream you are reading. You can't read an Etag from a stream in one media type and use it with another media type.
+:::
+
+### Embedding data into streams in JSON format
+
+So far in this guide, the feeds returned have contained links that refer to the actual event data. This is normally a preferable mechanism for several reasons:
+
+- They can be in a different media type than the feed, and you can negotiate them separately from the feed itself (for example, the feed in JSON, the event in XML). You can cache the event data separately from the feed, and you can point it to different feeds. If you use a `linkTo()` in your [projection](@server/features/projections/custom.md) this is what happens in your atom feeds.
+- If you are using JSON, you can embed the events into the atom feed events. This can help cut down on the number of requests in some situations, but the messages are larger.
+
+There are ways of embedding events and further metadata into your stream by using the `embed` parameter.
+
+#### Rich embed mode
+
+The `rich` embed mode returns more properties about the event (`eventtype`, `streamid`, `position`, and so on) as you can see in the following request.
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/read-stream-rich.sh)
+@tab Response
+@[code{response}](@httpapi/read-stream-rich.sh)
+:::
+
+#### Body embed mode
+
+The `body` embed mode returns the JSON/XML body of the events into the feed as well, depending on the type of the feed. You can see this in the request below:
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/read-stream-body.sh)
+@tab Response
+@[code{response}](@httpapi/read-stream-body.sh)
+:::
+
+##### Variants of body embed mode
+
+Two other modes are variants of `body`:
+
+- `PrettyBody` tries to reformat the JSON to make it "pretty to read".
+- `TryHarder` works harder to try to parse and reformat the JSON from an event to return it in the feed. These do not include further information and are focused on how the feed looks.
+
+## Deleting a stream
+
+### Soft deleting
+
+To delete a stream over the Atom interface, issue a `DELETE` request to the resource.
+
+::: tabs
+@tab Request
+@[code](@httpapi/delete-stream/delete-stream.sh)
+@tab Response
+@[code](@httpapi/delete-stream/delete-stream-response.http)
+:::
+
+By default, when you delete a stream, KurrentDB soft deletes it. This means you can recreate it later by setting the `$tb` metadata section in the stream. If you try to `GET` a soft deleted stream you receive a 404 response:
+
+::: tabs
+@tab Request
+@[code](@httpapi/delete-stream/get-deleted-stream.sh)
+@tab Response
+@[code](@httpapi/delete-stream/get-deleted-stream-response.http)
+:::
+
+You can recreate the stream by appending new events to it (like creating a new stream):
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/append-event.sh)
+@tab Response
+@[code](@httpapi/append-event.http)
+:::
+
+The version numbers do not start at zero but at where you soft deleted the stream from
+
+### Hard deleting
+
+You can hard delete a stream. To issue a permanent delete use the `Kurrent-HardDelete` header.
+
+::: warning
+A hard delete is permanent and the stream is not removed during a scavenge. If you hard delete a stream, you cannot recreate the stream.
+:::
+
+Issue the `DELETE` as before but with the permanent delete header:
+
+::: tabs
+@tab Request
+@[code](@httpapi/delete-stream/hard-delete-stream.sh)
+@tab Response
+@[code](@httpapi/delete-stream/hard-delete-stream.http)
+:::
+
+The stream is now permanently deleted, and now the response is a `410`.
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/delete-stream/get-deleted-stream.sh)
+@tab Response
+@[code](@httpapi/delete-stream/get-deleted-stream-response.http)
+:::
+
+If you try to recreate the stream as in the above example you also receive a `410` response.
+
+::: tabs
+@tab Request
+@[code](@httpapi/delete-stream/append-event-deleted.sh)
+@tab Response
+@[code](@httpapi/delete-stream/append-event-deleted.http)
+:::
+
+## Description document
+
+<!-- TODO: Combine with CC pages?  -->
+
+With the addition of Competing Consumers, which is another way of reading streams, the need arose to expose these different methods to consumers.
+
+The introduction of the description document has some benefits:
+
+- Clients can rely on the keys (streams, streamSubscription) in the description document to remain unchanged across versions of KurrentDB and you can rely on it as a lookup for the particular method of reading a stream.
+- Allows the restructuring of URIs underneath without breaking clients. e.g., `/streams/newstream` -> `/streams/newstream/atom`.
+
+### Fetching the description document
+
+There are three ways in which KurrentDB returns the description document.
+
+- Attempting to read a stream with an unsupported media type.
+- Attempting to read a stream with no accept header.
+- Requesting the description document explicitly.
+
+The client is able to request the description document by passing `application/vnd.kurrent.streamdesc+json` in the `accept` header, for example:
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/get-dd.sh)
+@tab Response
+@[code{response}](@httpapi/get-dd.sh)
+:::
+
+In the example above, the client requested the description document for the stream called `newstream` which has a set of links describing the supported methods and content types. The document also includes additional methods available such as the `streamSubscription`. If there are no subscriptions to the `newstream`, the `streamSubscription` key is absent.
+
+## Optimistic concurrency and idempotence
+
+### Idempotence
+
+All operations on the HTTP interface are idempotent (unless the [expected version](#expected-version-header) is ignored). It is the responsibility of the client to retry operations under failure conditions, ensuring that the event IDs of the events posted are the same as the first attempt.
+
+Provided the client maintains this KurrentDB will treat all operations as idempotent.
+
+For example:
+
+::: tabs
+@tab Request
+```bash
+curl -i -d @event.txt "http://127.0.0.1:2113/streams/newstream"
+```
+@tab Response
+```http
+HTTP/1.1 201 Created
+Access-Control-Allow-Origin: *
+Access-Control-Allow-Methods: POST, GET, PUT, DELETE
+Location: http://127.0.0.1:2113/streams/newstream444/1
+Content-Type: application/json
+Server: Mono-HTTPAPI/1.0
+Date: Thu, 06 Sep 2012 19:49:37 GMT
+Content-Length: 107
+Keep-Alive: timeout=15,max=100
+```
+:::
+
+Assuming you were posting to a new stream you would get the event appended once (and the stream created). The second event returns as the first but not write again.
+
+::: tip
+This allows the client rule of “if you get an unknown condition, retry” to work.
+:::
+
+For example:
+
+::: tabs
+@tab Request
+```bash
+curl -i "http://127.0.0.1:2113/streams/newstream444"
+```
+@tab Response
+```http
+HTTP/1.1 200 OK
+Access-Control-Allow-Origin: *
+Access-Control-Allow-Methods: POST, GET, PUT, DELETE
+Content-Type: application/json
+Server: Mono-HTTPAPI/1.0
+Date: Thu, 06 Sep 2012 19:50:30 GMT
+Content-Length: 2131
+Keep-Alive: timeout=15,max=100
+
+{
+	"title": "Event stream 'newstream444'",
+	"id": "http://127.0.0.1:2113/streams/newstream444",
+	"updated": "2012-09-06T16:39:44.695643Z",
+	"author": {
+		"name": "Kurrent"
+	},
+	"links": [
+		{
+			"uri": "http://127.0.0.1:2113/streams/newstream444",
+			"relation": "self"
+		},
+		{
+			"uri": "http://127.0.0.1:2113/streams/newstream444",
+			"relation": "first"
+		}
+	],
+	"entries": [
+		{
+			"title": "newstream444 #1",
+			"id": "http://127.0.0.1:2113/streams/newstream444/1",
+			"updated": "2012-09-06T16:39:44.695643Z",
+			"author": {
+				"name": "Kurrent"
+			},
+			"summary": "Entry #1",
+			"links": [
+				{
+					"uri": "http://127.0.0.1:2113/streams/newstream444/1",
+					"relation": "edit"
+				},
+				{
+					"uri": "http://127.0.0.1:2113/streams/newstream444/event/1?format=text",
+					"type": "text/plain"
+				},
+				{
+					"uri": "http://127.0.0.1:2113/streams/newstream444/event/1?format=json",
+					"relation": "alternate",
+					"type": "application/json"
+				},
+				{
+					"uri": "http://127.0.0.1:2113/streams/newstream444/event/1?format=xml",
+					"relation": "alternate",
+					"type": "text/xml"
+				}
+			]
+		},
+		{
+			"title": "newstream444 #0",
+			"id": "http://127.0.0.1:2113/streams/newstream444/0",
+			"updated": "2012-09-06T16:39:44.695631Z",
+			"author": {
+				"name": "Kurrent"
+			},
+			"summary": "Entry #0",
+			"links": [
+				{
+					"uri": "http://127.0.0.1:2113/streams/newstream444/0",
+					"relation": "edit"
+				},
+				{
+					"uri": "http://127.0.0.1:2113/streams/newstream444/event/0?format=text",
+					"type": "text/plain"
+				},
+				{
+					"uri": "http://127.0.0.1:2113/streams/newstream444/event/0?format=json",
+					"relation": "alternate",
+					"type": "application/json"
+				},
+				{
+					"uri": "http://127.0.0.1:2113/streams/newstream444/event/0?format=xml",
+					"relation": "alternate",
+					"type": "text/xml"
+				}
+			]
+		}
+	]
+}
+```
+:::
+
+## Stream metadata
+
+Every stream in KurrentDB has metadata stream associated with it, prefixed by `$$`, so the metadata stream from a stream called `foo` is `$$foo`. Internally, the metadata includes information such as the ACL of the stream, the maximum count and age for the events in the stream. Client code can also add information into stream metadata for use with projections or the client API.
+
+Stream metadata is stored internally as JSON, and you can access it over the HTTP API.
+
+### Reading stream metadata
+
+To read the metadata, issue a `GET` request to the attached metadata resource, which is typically of the form:
+
+```http
+https://{kurrentdb-ip-address}/streams/{stream-name}/metadata
+```
+
+You should not access metadata by constructing this URL yourself, as the right to change the resource address is reserved. Instead, you should follow the link from the stream itself, which enables your client to tolerate future changes to the addressing structure.
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/read-metadata.sh)
+@tab Response
+@[code{response}](@httpapi/read-metadata.sh)
+:::
+
+Once you have the URI of the metadata stream, issue a `GET` request to retrieve the metadata:
+
+```bash
+curl -i -H "Accept:application/vnd.kurrent.atom+json" https://127.0.0.1:2113/streams/%24users/metadata --user admin:changeit
+```
+
+If you have security enabled, reading metadata may require that you pass credentials, as in the examples above. If credentials are required and you do not pass them, then you receive a `401 Unauthorized` response.
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/missing-credentials.sh)
+@tab Response
+@[code{response}](@httpapi/missing-credentials.sh)
+:::
+
+### Writing metadata
+
+To update the metadata for a stream, issue a `POST` request to the metadata resource.
+
+Inside a file named _metadata.json_:
+
+@[code](@httpapi/metadata.json)
+
+You can also add user-specified metadata here. Some examples user-specified metadata are:
+
+- Which adapter populates a stream.
+- Which projection created a stream.
+- A correlation ID to a business process.
+
+You then post this information is then posted to the stream:
+
+::: tabs
+@tab Request
+@[code{curl}](@httpapi/update-metadata.sh)
+@tab Response
+@[code{response}](@httpapi/update-metadata.sh)
+:::
+
+If the specified user does not have permissions to write to the stream metadata, you receive a '401 Unauthorized' response.
diff --git a/docs/http-api/optional-http-headers.md b/docs/http-api/optional-http-headers.md
index 5c749812d7b..cf6fb12f4c0 100644
--- a/docs/http-api/optional-http-headers.md
+++ b/docs/http-api/optional-http-headers.md
@@ -1,77 +1,73 @@
+---
+order: 5
+---
+
 # Optional HTTP headers
 
 <!-- TODO: Can Swagger replace this? And sub files -->
 
-EventStoreDB supports custom HTTP headers for requests. The headers were previously in the form `X-ES-ExpectedVersion` but were changed to `ES-ExpectedVersion` in compliance with [RFC-6648](https://datatracker.ietf.org/doc/html/rfc6648).
+KurrentDB supports custom HTTP headers for requests in the form `Kurrent-*`.
 
 The headers supported are:
 
-| Header                                                     | Description                                                                                        |
-|------------------------------------------------------------|----------------------------------------------------------------------------------------------------|
-| [ES-ExpectedVersion](#expected-version)                    | The expected version of the stream (allows optimistic concurrency)                                 |
-| [ES-ResolveLinkTo](#resolve-linkto)                        | Whether to resolve `linkTos` in stream                                                             |
-| [ES-RequiresMaster](#requires-master)                      | Whether this operation needs to run on the master node                                             |
-| [ES-TrustedAuth](@server/security.md#trusted-intermediary) | Allows a trusted intermediary to handle authentication                                             |
-| [ES-LongPoll](#longpoll)                                   | Instructs the server to do a long poll operation on a stream read                                  |
-| [ES-HardDelete](#harddelete)                               | Instructs the server to hard delete the stream when deleting as opposed to the default soft delete |
-| [ES-EventType](#eventtype)                                 | Instructs the server the event type associated to a posted body                                    |
-| [ES-EventId](#eventid)                                     | Instructs the server the event id associated to a posted body                                      |
+| Header                                                                   | Description                                                                                        |
+|--------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------|
+| [Kurrent-ExpectedVersion](#expected-version)                                  | The expected version of the stream (allows optimistic concurrency)                                 |
+| [Kurrent-ResolveLinkTo](#resolve-linkto)                                      | Whether to resolve `linkTos` in stream                                                             |
+| [Kurrent-RequireLeader](#require-leader)                                    | Whether this operation needs to run on the leader node                                             |
+| [Kurrent-TrustedAuth](@server/security/user-authentication.md#externalised-authentication) | Allows a trusted intermediary to handle authentication                                             |
+| [Kurrent-LongPoll](#longpoll)                                                 | Instructs the server to do a long poll operation on a stream read                                  |
+| [Kurrent-HardDelete](#harddelete)                                             | Instructs the server to hard delete the stream when deleting as opposed to the default soft delete |
+| [Kurrent-EventType](#eventtype)                                               | Instructs the server the event type associated to a posted body                                    |
+| [Kurrent-EventId](#eventid)                                                   | Instructs the server the event id associated to a posted body                                      |
 
 ## EventID
 
-When you append to a stream and don't use the `application/vnd.eventstore.events+json/+xml` media type, you need to specify an event ID with the event you post. This is not required with the custom media type as it is specified within the format (there is an `EventId` on each entry in the format). EventStoreDB uses `EventId` for impotency.
+When you append to a stream and don't use the `application/vnd.kurrent.events+json` media type, you need to specify an event ID with the event you post. This is not required with the custom media type as it is specified within the format (there is an `EventId` on each entry in the format). KurrentDB uses `EventId` for impotency.
 
 You can include an event ID on an event by specifying this header.
 
-:::: code-group
-::: code-group-item Request
+::: tabs
+@tab Request
 @[code{curl}](@httpapi/append-event-to-new-stream.sh)
-:::
-::: code-group-item Response
+@tab Response
 @[code{response}](@httpapi/append-event-to-new-stream.sh)
 :::
-::::
 
-If you don't add an `ES-EventId` header on an append where the body is considered the actual event (e.g., not using `application/vnd.eventstore.events+json/+xml`) EventStoreDB generates a unique identifier for you and redirects you to an idempotent URI where you can post your event. If you can create a UUID then you shouldn't use this feature, but it's useful when you cannot create a UUID.
+If you don't add an `Kurrent-EventId` header on an append where the body is considered the actual event (e.g., not using `application/vnd.kurrent.events+json`) KurrentDB generates a unique identifier for you and redirects you to an idempotent URI where you can post your event. If you can create a UUID then you shouldn't use this feature, but it's useful when you cannot create a UUID.
 
-:::: code-group
-::: code-group-item Request
+::: tabs
+@tab Request
 @[code{curl}](@httpapi/append-event-no-id.sh)
-:::
-::: code-group-item Response
+@tab Response
 @[code{response}](@httpapi/append-event-no-id.sh)
 :::
-::::
 
-EventStoreDB returned a `307 Temporary Redirect` with a location header that points to a generated URI that is idempotent for purposes of retrying the post.
+KurrentDB returned a `307 Temporary Redirect` with a location header that points to a generated URI that is idempotent for purposes of retrying the post.
 
 ## EventType
 
-When you append to a stream and don't the `application/vnd.eventstore.events+json/+xml` media type you must specify an event type with the event that you are posting. This isn't required with the custom media type as it's specified within the format itself.
+When you append to a stream and don't the `application/vnd.kurrent.events+json/` media type you must specify an event type with the event that you are posting. This isn't required with the custom media type as it's specified within the format itself.
 
-You use the `ES-EventType` header as follows.
+You use the `Kurrent-EventType` header as follows.
 
-:::: code-group
-::: code-group-item Request
+::: tabs
+@tab Request
 @[code{curl}](@httpapi/append-event-to-new-stream.sh)
-:::
-::: code-group-item Response
+@tab Response
 @[code{response}](@httpapi/append-event-to-new-stream.sh)
 :::
-::::
 
 If you view the event in the UI or with cURL it has the `EventType` of `SomeEvent`:
 
 <!-- TODO: Does this make sense? If I can't use the custom media type -->
 
-:::: code-group
-::: code-group-item Request
-@[code{curl}](@httpapi/read-event.sh)
+::: tabs
+@tab Request
+@[code](@httpapi/read-event.sh)
+@tab Response
+@[code](@httpapi/read-event.json)
 :::
-::: code-group-item Response
-@[code{response}](@httpapi/read-event.sh)
-:::
-::::
 
 ## Expected Version
 
@@ -79,94 +75,82 @@ When you append to a stream you often want to use `Expected Version` to allow fo
 
 i.e., "A append operations can succeed if I have seen everyone else's append operations."
 
-You set `ExpectedVersion` with the syntax `ES-ExpectedVersion: #`, where `#` is an integer version number. There are other special values available:
+You set `ExpectedVersion` with the syntax `Kurrent-ExpectedVersion: #`, where `#` is an integer version number. There are other special values available:
 
 - `0`, the stream should exist but be empty when appending.
 - `-1`, the stream should not exist when appending.
 - `-2`, the write should not conflict with anything and should always succeed.
 - `-4`, the stream or a metadata stream should exist when appending.
 
-If the `ExpectedVersion` does not match the version of the stream, EventStoreDB returns an HTTP 400 `Wrong expected EventNumber` response. This response contains the current version of the stream in an `ES-CurrentVersion` header.
+If the `ExpectedVersion` does not match the version of the stream, KurrentDB returns an HTTP 400 `Wrong expected EventNumber` response. This response contains the current version of the stream in an `Kurrent-CurrentVersion` header.
 
 In the following cURL command `ExpectedVersion` is not set, and it appends or create/append to the stream.
 
-:::: code-group
-::: code-group-item Request
+::: tabs
+@tab Request
 @[code{curl}](@httpapi/append-event-to-new-stream.sh)
-:::
-::: code-group-item Response
+@tab Response
 @[code{response}](@httpapi/append-event-to-new-stream.sh)
 :::
-::::
 
 The stream `newstream` has one event. If you append with an expected version of `3`, you receive an error.
 
-:::: code-group
-::: code-group-item Request
+::: tabs
+@tab Request
 @[code{curl}](@httpapi/append-event-wrong-version.sh)
-:::
-::: code-group-item Response
+@tab Response
 @[code{response}](@httpapi/append-event-wrong-version.sh)
 :::
-::::
 
-You can see from the `ES-CurrentVersion` header above that the stream is at version 0. Appending with an expected version of 0 works. The expected version is always the version of the last event known in the stream.
+You can see from the `Kurrent-CurrentVersion` header above that the stream is at version 0. Appending with an expected version of 0 works. The expected version is always the version of the last event known in the stream.
 
-:::: code-group
-::: code-group-item Request
+::: tabs
+@tab Request
 @[code{curl}](@httpapi/append-event-version.sh)
-:::
-::: code-group-item Response
+@tab Response
 @[code{response}](@httpapi/append-event-version.sh)
 :::
-::::
 
 ## HardDelete
 
-The `ES-HardDelete` header controls deleting a stream. By default EventStoreDB soft deletes a stream allowing you to later reuse that stream. If you set the `ES-HardDelete` header EventStoreDB permanently deletes the stream.
+The `Kurrent-HardDelete` header controls deleting a stream. By default KurrentDB soft deletes a stream allowing you to later reuse that stream. If you set the `Kurrent-HardDelete` header KurrentDB permanently deletes the stream.
 
-:::: code-group
-::: code-group-item Request
-@[code{curl}](@httpapi/delete-stream/hard-delete-stream.sh)
+::: tabs
+@tab Request
+@[code](@httpapi/delete-stream/hard-delete-stream.sh)
+@tab Response
+@[code](@httpapi/delete-stream/hard-delete-stream.http)
 :::
-::: code-group-item Response
-@[code{response}](@httpapi/delete-stream/hard-delete-stream.sh)
-:::
-::::
 
 This changes the general behaviour from returning a `404` and the stream to be recreated (soft-delete) to the stream now return a `410 Deleted` response.
 
 ## LongPoll
 
-You use the `ES-LongPoll` header to tell EventStoreDB that when on the head link of a stream and no data is available to wait a period of time to see if data becomes available.
+You use the `Kurrent-LongPoll` header to tell KurrentDB that when on the head link of a stream and no data is available to wait a period of time to see if data becomes available.
 
 You can use this to give lower latency for Atom clients instead of client initiated polling.
 
-Instead of the client polling every 5 seconds to get data from the feed the client sends a request with `ES-LongPoll: 15`. This instructs EventStoreDB to wait for up to 15 seconds before returning with no result. The latency is therefore lowered from the poll interval to about 10ms from the time an event is appended until the time the HTTP connection is notified.
+Instead of the client polling every 5 seconds to get data from the feed the client sends a request with `Kurrent-LongPoll: 15`. This instructs KurrentDB to wait for up to 15 seconds before returning with no result. The latency is therefore lowered from the poll interval to about 10ms from the time an event is appended until the time the HTTP connection is notified.
 
-You can see the use of the `ES-LongPoll` header in the following cURL command.
+You can see the use of the `Kurrent-LongPoll` header in the following cURL command.
 
 First go to the head of the stream.
 
-:::: code-group
-::: code-group-item Request
+::: tabs
+@tab Request
 @[code{curl}](@httpapi/read-stream.sh)
-:::
-::: code-group-item Response
+@tab Response
 @[code{response}](@httpapi/read-stream.sh)
 :::
-::::
 
 Then fetch the previous `rel` link `http://127.0.0.1:2113/streams/newstream/2/forward/20` and try it. It returns an empty feed.
 
-:::: code-group
-::: code-group-item Request
+::: tabs
+@tab Request
 @[code{curl}](@httpapi/get-forward-link.sh)
-:::
-::: code-group-item Response
+@tab Response
 @[code{response}](@httpapi/get-forward-link.sh)
 :::
-::::
 
 The entries section is empty (there is no further data to provide). Now try the same URI with a long poll header.
 
@@ -174,27 +158,26 @@ The entries section is empty (there is no further data to provide). Now try the
 
 If you do not insert any events into the stream while this is running it takes 10 seconds for the HTTP request to finish. If you append an event to the stream while its running you see the result for that request when you append the event.
 
-## Requires Master
+## Require Leader
 
 When running in a clustered environment there are times when you only want an operation to happen on the current leader node. A client can fetch information in an eventually consistent fashion by communicating with the servers. The TCP client included with the multi-node version does this.
 
-Over HTTP the `RequiresMaster` header tells the node that it is not allowed to serve a read or forward a write request. If the node is the leader everything works as normal, if it isn't it responds with a `307` temporary redirect to the leader.
+Over HTTP the `RequireLeader` header tells the node that it is not allowed to serve a read or forward a write request. If the node is the leader everything works as normal, if it isn't it responds with a `307` temporary redirect to the leader.
 
-Run the below on the master:
+Run the below on the leader:
 
-:::: code-group
-::: code-group-item Request
+::: tabs
+@tab Request
 ```bash
 curl -i "http://127.0.0.1:32004/streams/newstream" \
-    -H "ES-RequireMaster: True"
+    -H "Kurrent-RequireLeader: True"
 ```
-:::
-::: code-group-item Response
+@tab Response
 ```json
 HTTP/1.1 200 OK
 Cache-Control: max-age=0, no-cache, must-revalidate
 Content-Length: 1296
-Content-Type: application/vnd.eventstore.atom+json; charset: utf-8
+Content-Type: application/vnd.kurrent.atom+json; charset: utf-8
 ETag: "0;-2060438500"
 Vary: Accept
 Server: Microsoft-HTTPAPI/2.0
@@ -209,7 +192,7 @@ Date: Thu, 27 Jun 2013 14:48:37 GMT
   "updated": "2013-06-27T14:48:15.2596358Z",
   "streamId": "stream",
   "author": {
-    "name": "EventStore"
+    "name": "Kurrent"
   },
   "links": [
     {
@@ -239,7 +222,7 @@ Date: Thu, 27 Jun 2013 14:48:37 GMT
       "id": "http://127.0.0.1:32004/streams/stream/0",
       "updated": "2013-06-27T14:48:15.2596358Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "TakeSomeSpaceEvent",
       "links": [
@@ -257,18 +240,16 @@ Date: Thu, 27 Jun 2013 14:48:37 GMT
 }
 ```
 :::
-::::
 
 Run the following on any other node:
 
-:::: code-group
-::: code-group-item Request
+::: tabs
+@tab Request
 ```bash
 curl -i "http://127.0.0.1:31004/streams/newstream" \
-    -H "ES-RequireMaster: True"
+    -H "Kurrent-RequireLeader: True"
 ```
-:::
-::: code-group-item Response
+@tab Response
 ```http
 HTTP/1.1 307 Temporary Redirect
 Content-Length: 0
@@ -281,32 +262,27 @@ Access-Control-Allow-Origin: *
 Date: Thu, 27 Jun 2013 14:48:28 GMT
 ```
 :::
-::::
 
 ## Resolve LinkTo
 
-When using projections you can have links placed into another stream. By default EventStoreDB always resolve `linkTo`s for you returning the event that points to the link. You can use the `ES-ResolveLinkTos: false` HTTP header to tell EventStoreDB to return you the actual link and to not resolve it.
+When using projections you can have links placed into another stream. By default KurrentDB always resolve `linkTo`s for you returning the event that points to the link. You can use the `Kurrent-ResolveLinkTos: false` HTTP header to tell KurrentDB to return you the actual link and to not resolve it.
 
 You can see the differences in behaviour in the following cURL commands.
 
-:::: code-group
-::: code-group-item Request
+::: tabs
+@tab Request
 @[code{curl}](@httpapi/resolve-links.sh)
-:::
-::: code-group-item Response
+@tab Response
 @[code{response}](@httpapi/resolve-links.sh)
 :::
-::::
 
 ::: tip
 The content links are pointing to the original projection stream. The linked events are resolved back to where they point. With the header set the links (or embedded content) instead point back to the actual `linkTo` events.
 :::
 
-:::: code-group
-::: code-group-item Request
+::: tabs
+@tab Request
 @[code{curl}](@httpapi/resolve-links-false.sh)
-:::
-::: code-group-item Response
+@tab Response
 @[code{response}](@httpapi/resolve-links-false.sh)
 :::
-::::
diff --git a/docs/http-api/persistent.md b/docs/http-api/persistent.md
index 9561a30d6d5..9ee61eca330 100644
--- a/docs/http-api/persistent.md
+++ b/docs/http-api/persistent.md
@@ -1,6 +1,10 @@
+---
+order: 3
+---
+
 # Persistent subscriptions
 
-This document explains how to use the HTTP API for setting up and consuming persistent subscriptions and competing consumer subscription groups. For an overview on competing consumers and how they relate to other subscription types, please see our [getting started guide](@server/persistent-subscriptions.md).
+This document explains how to use the HTTP API for setting up and consuming persistent subscriptions and competing consumer subscription groups. For an overview on competing consumers and how they relate to other subscription types, please see our [getting started guide](@server/features/persistent-subscriptions.md).
 
 ::: tip
 The Administration UI includes a _Competing Consumers_ section where you are able to create, update, delete and view subscriptions and their statuses.
@@ -17,20 +21,20 @@ Persistent subscriptions to `$all` are not supported over the HTTP API. If you w
 <!-- TODO: File inclusion for the below? -->
 
 | URI                                           | Supported Content Types | Method |
-| --------------------------------------------- | ----------------------- | ------ |
+|-----------------------------------------------|-------------------------|--------|
 | `/subscriptions/{stream}/{subscription_name}` | `application/json`      | PUT    |
 
 ### Query parameters
 
 | Parameter           | Description                                   |
-| ------------------- | --------------------------------------------- |
+|---------------------|-----------------------------------------------|
 | `stream`            | The stream the persistent subscription is on. |
 | `subscription_name` | The name of the subscription group.           |
 
 ### Body
 
 | Parameter                     | Description                                                                                        |
-| ----------------------------- | -------------------------------------------------------------------------------------------------- |
+|-------------------------------|----------------------------------------------------------------------------------------------------|
 | `resolveLinktos`              | Tells the subscription to resolve link events.                                                     |
 | `startFrom`                   | Start the subscription from the position of the event in the stream.                               |
 | `extraStatistics`             | Tells the backend to measure timings on the clients so statistics will contain histograms of them. |
@@ -50,7 +54,7 @@ Persistent subscriptions to `$all` are not supported over the HTTP API. If you w
 You can edit the settings of an existing subscription while it is running. This drops the current subscribers and resets the subscription internally. This requires admin permissions.
 
 | URI                                           | Supported Content Types | Method |
-| --------------------------------------------- | ----------------------- | ------ |
+|-----------------------------------------------|-------------------------|--------|
 | `/subscriptions/{stream}/{subscription_name}` | `application/json`      | POST   |
 
 ::: warning
@@ -60,7 +64,7 @@ Persistent subscriptions to `$all` are not supported over the HTTP API. To updat
 ### Query parameters
 
 | Parameter           | Description                                   |
-| ------------------- | --------------------------------------------- |
+|---------------------|-----------------------------------------------|
 | `stream`            | The stream the persistent subscription is on. |
 | `subscription_name` | The name of the subscription group.           |
 
@@ -71,7 +75,7 @@ _Same parameters as [Creating a Persistent Subscription](#creating-a-persistent-
 ## Deleting a persistent subscription
 
 | URI                                           | Supported Content Types | Method |
-| --------------------------------------------- | ----------------------- | ------ |
+|-----------------------------------------------|-------------------------|--------|
 | `/subscriptions/{stream}/{subscription_name}` | `application/json`      | DELETE |
 
 ::: warning
@@ -81,7 +85,7 @@ Deleting persistent subscriptions to `$all` is not supported over the HTTP API.
 ### Query parameters
 
 | Parameter           | Description                                   |
-| ------------------- | --------------------------------------------- |
+|---------------------|-----------------------------------------------|
 | `stream`            | The stream the persistent subscription is on. |
 | `subscription_name` | The name of the subscription group.           |
 
@@ -90,19 +94,19 @@ Deleting persistent subscriptions to `$all` is not supported over the HTTP API.
 By default, reading a stream via a persistent subscription returns a single event per request and does not embed the event properties as part of the response.
 
 | URI                                                                                                                                                                  | Supported Content Types                                                                      | Method |
-| -------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------- | ------ |
-| `/subscriptions/{stream}/{subscription_name} /subscriptions/{stream}/{subscription_name}?embed={embed} /subscriptions/{stream}/{subscription}/{count}?embed={embed}` | `application/vnd.eventstore.competingatom+xml application/vnd.eventstore.competingatom+json` | GET    |
+|----------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------|--------|
+| `/subscriptions/{stream}/{subscription_name} /subscriptions/{stream}/{subscription_name}?embed={embed} /subscriptions/{stream}/{subscription}/{count}?embed={embed}` | `application/vnd.eventstore.competingatom+xml  application/vnd.kurrent.competingatom+json application/vnd.eventstore.competingatom+json` | GET    |
 
 ### Query parameters
 
 | Parameter           | Description                                                                      |
-| ------------------- | -------------------------------------------------------------------------------- |
+|---------------------|----------------------------------------------------------------------------------|
 | `stream`            | The stream the persistent subscription is on.                                    |
 | `subscription_name` | The name of the subscription group.                                              |
 | `count`             | How many events to return for the request.                                       |
 | `embed`             | Allowed values are `None`, `Content`, `Rich`, `Body`, `PrettyBody`, `TryHarder`. |
 
-See [Reading Streams](README.md#reading-streams-and-events) for information on the different embed levels.
+See [Reading Streams](introduction.md#reading-streams-and-events) for information on the different embed levels.
 
 ### Response
 
@@ -124,27 +128,27 @@ For example:
 ### Ack multiple messages
 
 | URI                                                                | Supported Content Types | Method |
-| ------------------------------------------------------------------ | ----------------------- | ------ |
+|--------------------------------------------------------------------|-------------------------|--------|
 | `/subscriptions/{stream}/{subscription_name}/ack?ids={messageids}` | `application/json`      | POST   |
 
 #### Query parameters
 
 | Parameter           | Description                                            |
-| :------------------ | :----------------------------------------------------- |
+|:--------------------|:-------------------------------------------------------|
 | `stream`            | The stream the persistent subscription is on.          |
 | `subscription_name` | The name of the subscription group.                    |
-| `messageids`        | The IDs of the messages that needs to be acknowledged. |
+| `messages`          | The IDs of the messages that needs to be acknowledged. |
 
 ### Ack a single message
 
 | URI                                                           | Supported Content Types | Method |
-| ------------------------------------------------------------- | ----------------------- | ------ |
+|---------------------------------------------------------------|-------------------------|--------|
 | `/subscriptions/{stream}/{subscription_name}/ack/{messageid}` | `application/json`      | POST   |
 
 #### Query parameters
 
 | Parameter           | Description                                          |
-| ------------------- | ---------------------------------------------------- |
+|---------------------|------------------------------------------------------|
 | `stream`            | The stream to the persistent subscription is on.     |
 | `subscription_name` | The name of the subscription group.                  |
 | `messageid`         | The ID of the message that needs to be acknowledged. |
@@ -152,13 +156,13 @@ For example:
 ### Nack multiple messages
 
 | URI                                                                                 | Supported Content Types | Method |
-| ----------------------------------------------------------------------------------- | ----------------------- | ------ |
+|-------------------------------------------------------------------------------------|-------------------------|--------|
 | `/subscriptions/{stream}/{subscription_name}/nack?ids={messageids}?action={action}` | `application/json`      | POST   |
 
 #### Query parameters
 
 | Parameter           | Description                                                                                                                                                                                                                               |
-| ------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+|---------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `stream`            | The stream to the persistent subscription is on.                                                                                                                                                                                          |
 | `subscription_name` | The name of the subscription group.                                                                                                                                                                                                       |
 | `action`            | <ul><li>**Park**: Don't retry the message; park it until a request is sent to replay the parked messages.</li><li>**Retry**: Retry the message.</li><li>**Skip**: Discard the message.</li><li>**Stop**: Stop the subscription.</li></ul> |
@@ -167,19 +171,19 @@ For example:
 ### Nack a single message
 
 | URI                                                                            | Supported Content Types | Method |
-| ------------------------------------------------------------------------------ | ----------------------- | ------ |
+|--------------------------------------------------------------------------------|-------------------------|--------|
 | `/subscriptions/{stream}/{subscription_name}/nack/{messageid}?action={action}` | `application/json`      | POST   |
 
 ## Replaying parked messages
 
 | URI                                                        | Supported Content Types | Method |
-| ---------------------------------------------------------- | ----------------------- | ------ |
+|------------------------------------------------------------|-------------------------|--------|
 | `/subscriptions/{stream}/{subscription_name}/replayParked` | `application/json`      | POST   |
 
 ## Getting information for all subscriptions
 
 | URI              | Method |
-| ---------------- | ------ |
+|------------------|--------|
 | `/subscriptions` | GET    |
 
 ### Response
@@ -189,7 +193,7 @@ For example:
 ## Get subscriptions for a stream
 
 | URI                       | Supported Content Types | Method |
-| ------------------------- | ----------------------- | ------ |
+|---------------------------|-------------------------|--------|
 | `/subscriptions/{stream}` | `application/json`      | GET    |
 
 ### Response
@@ -199,7 +203,7 @@ For example:
 ## Getting a specific subscription
 
 | URI                                                | Supported Content Types | Method |
-| -------------------------------------------------- | ----------------------- | ------ |
+|----------------------------------------------------|-------------------------|--------|
 | `/subscriptions/{stream}/{subscription_name}/info` | `application/json`      | GET    |
 
 ### Response
@@ -208,4 +212,3 @@ For example:
 
 <!-- TODO: Is this better as a general subscriptions page? -->
 <!-- TODO: Somehow get this better integrated with API docs -->
-<!-- TODO: Still to do -->
diff --git a/docs/http-api/projections.md b/docs/http-api/projections.md
deleted file mode 100644
index 4a3245f0b41..00000000000
--- a/docs/http-api/projections.md
+++ /dev/null
@@ -1,238 +0,0 @@
-# Projections
-
-You can also query the state of all projections using the HTTP API.
-
-@[code](@httpapi/projections/list-all-projections.sh)
-
-The response is a list of all known projections and useful information about them.
-
-@[code](@httpapi/projections/list-all-projections.json)
-
-## Add sample data
-
-Download the following files that contain sample data used throughout this step of the getting started guide.
-
-- [shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1164.json](@httpapi/data/shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1164.json)
-- [shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1165.json](@httpapi/data/shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1165.json)
-- [shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1166.json](@httpapi/data/shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1166.json)
-- [shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1167.json](@httpapi/data/shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1167.json)
-
-Add the sample data to four different streams:
-
-@[code](@httpapi/add-sample-data.sh)
-
-## Creating your first projection
-
-::: tip Next steps
-Read [this guide](#projections-api) to find out more about the user defined projection's API.
-:::
-
-The projection counts the number of 'XBox One S's that customers added to their shopping carts.
-
-A projection starts with a selector, in this case `fromAll()`. Another possibility is `fromCategory({category})` which this step discusses later, but for now, `fromAll` should do.
-
-The second part of a projection is a set of filters. There is a special filter called `$init` that sets up an initial state. You want to start a counter from 0 and each time EventStoreDB observes an `ItemAdded` event for an 'Xbox One S,' increment the counter.
-
-Here is the projection code:
-
-@[code](@httpapi/xbox-one-s-counter.js)
-
-You create a projection by calling the projection API and providing it with the definition of the projection. Here you decide how to run the projection, declaring that you want the projection to start from the beginning and keep running. You can create a projection using the Admin UI by opening the _Projections_ tab, clicking the _New Projection_ button and filling in the details of your projection.
-
-![Creating a projection with the EventStoreDB Admin UI](./images/getting-started-create-projection.png)
-
-You can also create projections programmatically. Pass the projection JSON file as a parameter of your request, along with any other settings:
-
-@[code](@httpapi/projections/create-projection.sh)
-
-::: tip Next steps
-[Read here](api.md) for more information on creating projections with the HTTP API and the parameters available, or [our projections section](projections.md) for details on projection syntax.
-:::
-
-## Querying for the state of the projection
-
-Now the projection is running, you can query the state of the projection. As this projection has a single state, query it with the following request:
-
-@[code](@httpapi/projections/query-state.sh)
-
-The server will send a response similar to this:
-
-@[code](@httpapi/projections/query-state.json)
-
-## Appending to streams from projections
-
-The above gives you the correct result but requires you to poll for the state of a projection. What if you wanted EventStoreDB to notify you about state updates via subscriptions?
-
-### Output state
-
-Update the projection to output the state to a stream by calling the `outputState()` method on the projection which by default produces a `$projections-{projection-name}-result` stream.
-
-Below is the updated projection:
-
-@[code](@httpapi/xbox-one-s-counter-outputState.js)
-
-To update the projection, edit the projection definition in the Admin UI, or issue the following request:
-
-@[code](@httpapi/xbox-one-s-counter-outputState.sh)
-
-Then reset the projection you created above:
-
-@[code](@httpapi/projections/reset-projection.sh)
-
-You should get a response similar to the one below:
-
-@[code](@httpapi/projections/reset-projection.json)
-
-You can now read the events in the result stream by issuing a read request.
-
-@[code](@httpapi/projections/read-projection-events.sh)
-
-And you'll get a response like this:
-
-@[code](@httpapi/projections/reset-projection.json)
-
-## Configure projection properties
-
-You can configure properties of the projection by updating values of the `options` object. For example, the following projection changes the name of the results stream:
-
-@[code{2}](@httpapi/projections/update-projection-options.js)
-
-Then send the update to the projection:
-
-@[code](@httpapi/projections/update-projection-options.sh)
-
-::: tip
-You can find all the options available in the [user-defined projections guide](@server/projections.md#user-defined-projections).
-:::
-
-Now you can read the result as above, but use the new stream name:
-
-@[code](@httpapi/projections/read-projection-events-renamed.sh)
-
-## The number of items per shopping cart
-
-The example in this step so far relied on a global state for the projection, but what if you wanted a count of the number of items in the shopping cart per shopping cart.
-
-EventStoreDB has a built-in `$by_category` projection that lets you select events from a particular list of streams. Enable this projection with the following command.
-
-@[code](@httpapi/projections/enable-by-category.sh)
-
-The projection links events from existing streams to new streams by splitting the stream name by a separator. You can configure the projection to specify the position of where to split the stream `id` and provide a separator.
-
-By default, the category splits the stream `id` by a dash. The category is the first string.
-
-| Stream Name        | Category                               |
-|--------------------|----------------------------------------|
-| shoppingCart-54    | shoppingCart                           |
-| shoppingCart-v1-54 | shoppingCart                           |
-| shoppingCart       | _No category as there is no separator_ |
-
-You want to define a projection that produces a count per stream for a category, but the state needs to be per stream. To do so, use `$by_category` and its `fromCategory` API method.
-
-Below is the projection:
-
-@[code](@httpapi/projections/shopping-cart-counter.js)
-
-Create the projection with the following request:
-
-@[code](@httpapi/projections/shopping-cart-counter.sh)
-
-#### Querying for the state of the projection by partition
-
-Querying for the state of the projection is different due to the partitioning of the projection. You have to specify the partition and the name of the stream.
-
-@[code](@httpapi/projections/read-state-partition.sh)
-
-The server then returns the state for the partition:
-
-@[code](@httpapi/projections/read-state-partition.json)
-
-## Projections API
-
-### List Projections
-
-| URI                                                | Description                  | HTTP verb |
-|:---------------------------------------------------|:-----------------------------|:----------|
-| `/projections/any`                                 | Returns all known projections.             | GET       |
-| `/projections/all-non-transient`                   | Returns all known non ad-hoc projections.  | GET       |
-
-
-### Manage Continuous Projections
-
-Continuous projections will continue to run until they are disabled or until they encounter an unrecoverable error. These are the most typical projections.
-
-| URI                                                | Description                  | HTTP verb |
-|:---------------------------------------------------|:-----------------------------|:----------|
-| `/projections/continuous`                          | Returns all known continuous projections.  | GET       |
-| `/projections/continuous?name={name}&type={type}&enabled={enabled}&emit={emit}&trackemittedstreams={trackemittedstreams}` | Create a continuous projection. | POST      |
-
-#### Parameters
-
-* `name`: Name of the projection
-* `type`: JS or Native. (JavaScript or native. At this time, EventStoreDB only supports JavaScript)
-* `enabled`: Enable the projection (true/false)
-* `emit`: Allow the projection to append to streams (true/false)
-* `trackemittedstreams`: Write the name of the streams the projection is managing to a separate stream. $projections-{projection-name}-emittedstreams (true/false)
-
-### Manage Transient Projections
-
-Transient projections are sometimes called ad-hoc projections or queries. This type of projection will run until completion and automatically delete itself afterwards.
-
-| URI                                                | Description                  | HTTP verb |
-|:---------------------------------------------------|:-----------------------------|:----------|
-| `/projections/transient`                                           | Returns all known ad-hoc projections.      | GET       |
-| `/projections/transient?name={name}&type={type}&enabled={enabled}` | Create an ad-hoc projection (or query).    | POST      |
-
-#### Parameters
-
-* `name`: Name of the projection
-* `type`: JS or Native. (JavaScript or native. At this time, EventStoreDB only supports JavaScript)
-* `enabled`: Enable the projection (true/false)
-
-### Manage OneTime Projections
-
-OneTime projections run until completion and then stop. These are useful for periodically generating state or reports when you don't need the projection to be always running.
-
-| URI                                                | Description                  | HTTP verb |
-|:---------------------------------------------------|:-----------------------------|:----------|
-| `/projections/onetime`                             | Returns all known one-time projections.    | GET       |
-| `/projections/onetime?name={name}&type={type}&enabled={enabled}&checkpoints={checkpoints}&emit={emit}&trackemittedstreams={trackemittedstreams}` | Create a one-time projection. | POST      |
-
-#### Parameters
-
-* `name`: Name of the projection
-* `type`: JS or Native. (JavaScript or native. At this time, EventStoreDB only supports JavaScript)
-* `enabled`: Enable the projection (true/false)
-* `checkpoints`: Enable checkpoints (true/false)
-* `emit`: Enable the ability for the projection to append to streams (true/false)
-* `trackemittedstreams`: Write the name of the streams the projection is managing to a separate stream. $projections-{projection-name}-emittedstreams (true/false)
-
-### Manage a Projection
-
-| URI                                                | Description                  | HTTP verb |
-|:---------------------------------------------------|:-----------------------------|:----------|
-| `/projection/{name}`                               | Returns information for a projection.          | GET       |
-| `/projection/{name}/query?config={config}`         | Returns the definition query and if config is set to true, will return the configuration. | GET
-| `/projection/{name}/query?type={type}&emit={emit}` | Update a projection's query.                   | PUT       |
-| `/projection/{name}?deleteStateStream={deleteStateStream}&deleteCheckpointStream={deleteCheckpointStream}&deleteEmittedStreams={deleteEmittedStreams}` | Delete a projection, optionally delete the streams that were created as part of the projection. | DELETE    |
-| `/projection/{name}/statistics`                    | Returns detailed information for a projection. | GET       |
-| `/projection/{name}/state?partition={partition}`   | Query for the state of a projection.           | GET       |
-| `/projection/{name}/result?partition={partition}`  | Query for the result of a projection.          | GET       |
-| `/projection/{name}/command/enable?enableRunAs={enableRunAs}`  | Enable a projection.               | POST      |
-| `/projection/{name}/command/disable?enableRunAs={enableRunAs}` | Disable a projection.              | POST      |
-| `/projection/{name}/command/reset?enableRunAs={enableRunAs}` | Reset a projection. (This will re-emit events, streams that are written to from the projection will also be soft deleted). | POST      |
-| `/projection/{name}/command/abort?enableRunAs={enableRunAs}` | Abort a projection.                  | POST      |
-
-#### Parameters
-
-* `name`: Name of the projection
-* `config`: Return the definition of the projection (true/false)
-* `type`: JS or Native. (JavaScript or native. At this time, EventStoreDB only supports JavaScript)
-* `emit`: Allow the projection to write to streams (true/false)
-* `trackemittedstreams`: Write the name of the streams the projection is managing to a separate stream. $projections-{projection-name}-emittedstreams (true/false)
-* `name`: Name of the projection
-* `deleteStateStream`: Delete the state stream (true/false)
-* `deleteCheckpointStream`: Delete the checkpoint stream (true/false)
-* `deleteEmittedStreams`: Delete the emitted streams stream (true/false)
-* `partition`: The name of the partition
-* `enableRunAs`: Enables the projection to run as the user who issued the request.
diff --git a/docs/http-api/security.md b/docs/http-api/security.md
index d26a5af1e8e..3c024390439 100644
--- a/docs/http-api/security.md
+++ b/docs/http-api/security.md
@@ -1,46 +1,46 @@
+---
+order: 2
+---
+
 # Security
 
-EventStoreDB supports basic authentication for HTTP API calls, and access control lists (ACL).
+KurrentDB supports basic authentication for HTTP API calls, and access control lists (ACL).
 
 ## Authentication
 
 ### Creating users
 
-EventStoreDB supports basic HTTP authentication to internal users. You create these users with the HTTP API or the admin console. You need to use the credentials of the default user in the request, which has the username of `admin`, and the password of `changeit`.
+KurrentDB supports basic HTTP authentication to internal users. You create these users with the HTTP API or the admin console. You need to use the credentials of the default user in the request, which has the username of `admin`, and the password of `changeit`.
 
 When using the HTTP API, you can send the following JSON payload to the server:
 
 @[code](@httpapi/new-user.json)
 
-:::: code-group
-::: code-group-item Request
+::: tabs
+@tab Request
 @[code](@httpapi/new-user.sh)
-:::
-::: code-group-item Response
+@tab Response
 @[code](@httpapi/new-user.http)
 :::
-::::
 
 Once you have added users, you can use their details with requests.
 
 If you were to use the wrong user or no user when a request requires one, you receive a `401 Unauthorized` response.
 
-:::: code-group
-::: code-group-item Request
+::: tabs
+@tab Request
 @[code](@httpapi/incorrect-user.sh)
-:::
-::: code-group-item Response
+@tab Response
 @[code](@httpapi/incorrect-user.http)
 :::
-::::
 
-As you pass the username and password in the request we recommend you to enable SSL to encrypt the user information. [Read this guide for instructions](@server/security.md).
+As you pass the username and password in the request we recommend you to enable SSL to encrypt the user information. [Read this guide for instructions](@server/security/README.md).
 
 ## Access control lists
 
-Alongside authentication, EventStoreDB supports per stream configuration of Access Control Lists (ACL). To configure the ACL of a stream go to its head and look for the `metadata` relationship link to fetch the metadata for the stream.
+Alongside authentication, KurrentDB supports per stream configuration of Access Control Lists (ACL). To configure the ACL of a stream go to its head and look for the `metadata` relationship link to fetch the metadata for the stream.
 
-To set access control lists over HTTP you can post to the metadata stream as [with setting any other metadata](README.md#stream-metadata). You can also set Access Control Lists for a stream in the admin UI.
+To set access control lists over HTTP you can post to the metadata stream as [with setting any other metadata](introduction.md#stream-metadata). You can also set Access Control Lists for a stream in the admin UI.
 
 ### ACL example
 
@@ -66,21 +66,20 @@ All these examples assume you have created a user named `ouro` with password `ou
 
 If you try to access the `$settings` stream as an unauthorized user, the server returns a 401 response.
 
-:::: code-group
-::: code-group-item Request
+::: tabs
+@tab Request
 ```bash
 curl -i http://127.0.0.1:2113/streams/%24settings \
     -u ouro:ouroboros
 ```
-:::
-::: code-group-item Response
+@tab Response
 ```http
 HTTP/1.1 401 Unauthorized
 Access-Control-Allow-Methods: POST, DELETE, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTo, ES-ExpectedVersion
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTo, Kurrent-ExpectedVersion
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position
-WWW-Authenticate: Basic realm="ES"
+Access-Control-Expose-Headers: Location, Kurrent-Position
+WWW-Authenticate: Basic Realm="Kurrent"
 Content-Type: text/plain; charset=utf-8
 Server: Mono-HTTPAPI/1.0
 Date: Mon, 02 Mar 2015 15:21:27 GMT
@@ -88,7 +87,6 @@ Content-Length: 0
 Keep-Alive: timeout=15,max=100
 ```
 :::
-::::
 
 If you wanted to give `ouro` access by default to system streams, POST the following JSON:
 
@@ -113,20 +111,19 @@ If you wanted to give `ouro` access by default to system streams, POST the follo
 
 At which point `ouro` can read system streams by default:
 
-:::: code-group
-::: code-group-item Request
+::: tabs
+@tab Request
 ```bash
 curl -i http://127.0.0.1:2113/streams/%24settings \
     -u ouro:ouroboros
 ```
-:::
-::: code-group-item Response
+@tab Response
 ```http
 HTTP/1.1 200 OK
 Access-Control-Allow-Methods: POST, DELETE, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTo, ES-ExpectedVersion
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTo, Kurrent-ExpectedVersion
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position
+Access-Control-Expose-Headers: Location, Kurrent-Position
 Cache-Control: max-age=0, no-cache, must-revalidate
 Vary: Accept
 ETag: "1;-1296467268"
@@ -137,7 +134,6 @@ Content-Length: 1286
 Keep-Alive: timeout=15,max=100
 ```
 :::
-::::
 
 You can also limit ACLs on particular streams which are then merged with the default ACLs.
 
diff --git a/docs/http-api/sidebar.js b/docs/http-api/sidebar.js
deleted file mode 100644
index f04f0a4aefd..00000000000
--- a/docs/http-api/sidebar.js
+++ /dev/null
@@ -1,14 +0,0 @@
-module.exports = [
-    {
-        text: "",
-        header: "HTTP",
-        children: [
-            "README.md",
-            "security.md",
-            "persistent.md",
-            "projections.md",
-            "optional-http-headers.md",
-            "api.md",
-        ]
-    }
-]
diff --git a/docs/http-api/swagger.yaml b/docs/http-api/swagger.yaml
index a8e99c1fed1..87c5d7bba03 100644
--- a/docs/http-api/swagger.yaml
+++ b/docs/http-api/swagger.yaml
@@ -1,14 +1,14 @@
 swagger: "2.0"
 info:
-  description: The HTTP API for EventStoreDB
+  description: The HTTP API for KurrentDB
   version: nightly
   title: HTTP API
   contact:
-    url: https://www.eventstore.com/contact
+    url: https://www.kurrent.io/contact
   license:
-    name: BSD 3-Clause
+    name: Event Store License v2
     url: https://github.com/EventStore/EventStore/blob/master/LICENSE.md
-host: eventstore.com
+host: kurrent.io
 securityDefinitions:
   basicAuth:
     type: basic
@@ -309,10 +309,10 @@ paths:
           required: true
           schema:
             $ref: "#/definitions/streamData"
-        - $ref: "#/parameters/ES-ExpectedVersion"
-        - $ref: "#/parameters/ES-EventType"
-        - $ref: "#/parameters/ES-EventId"
-        - $ref: "#/parameters/ES-RequiresLeader"
+        - $ref: "#/parameters/Kurrent-ExpectedVersion"
+        - $ref: "#/parameters/Kurrent-EventType"
+        - $ref: "#/parameters/Kurrent-EventId"
+        - $ref: "#/parameters/Kurrent-RequireLeader"
       responses:
         "201":
           description: New stream created
@@ -362,7 +362,7 @@ paths:
         - Streams
       summary: An alternative URL to post events to
       description: >-
-        A URL generated by EventStoreDB if you don't supply an ID when creating a
+        A URL generated by KurrentDB if you don't supply an ID when creating a
         stream. You then use this URL to post events to.
       operationId: Alternative stream URL
       produces:
@@ -715,7 +715,7 @@ paths:
       description: Returns all subscriptions from all streams.
       operationId: Get all subscriptions
       produces:
-        - application/vnd.eventstore.competingatom+json
+        - application/vnd.kurrent.competingatom+json
         - application/vnd.eventstore.competingatom+xml
       parameters: []
       responses:
@@ -737,7 +737,7 @@ paths:
       description: Returns information about the subscriptions for a stream.
       operationId: Get subscription stream information
       produces:
-        - application/vnd.eventstore.competingatom+json
+        - application/vnd.kurrent.competingatom+json
         - application/vnd.eventstore.competingatom+xml
       parameters:
         - name: stream
@@ -764,7 +764,7 @@ paths:
       description: Reads stream information via a persistent subscription.
       operationId: Get subscription information
       produces:
-        - application/vnd.eventstore.competingatom+json
+        - application/vnd.kurrent.competingatom+json
         - application/vnd.eventstore.competingatom+xml
       parameters:
         - name: stream
@@ -796,7 +796,7 @@ paths:
       description: Read a specified stream by a persistent subscription.
       operationId: Get a stream
       produces:
-        - application/vnd.eventstore.competingatom+json
+        - application/vnd.kurrent.competingatom+json
         - application/vnd.eventstore.competingatom+xml
       parameters:
         - name: stream
@@ -841,7 +841,7 @@ paths:
         subscription internally.
       operationId: Update subscription
       produces:
-        - application/vnd.eventstore.competingatom+json
+        - application/vnd.kurrent.competingatom+json
         - application/vnd.eventstore.competingatom+xml
       parameters:
         - name: stream
@@ -881,7 +881,7 @@ paths:
         more than once. This requires [admin permissions](/v5/server/access-control-lists).
       operationId: Create subscription
       produces:
-        - application/vnd.eventstore.competingatom+json
+        - application/vnd.kurrent.competingatom+json
         - application/vnd.eventstore.competingatom+xml
       parameters:
         - name: stream
@@ -920,7 +920,7 @@ paths:
       description: Deletes a subscription.
       operationId: Delete subscription
       produces:
-        - application/vnd.eventstore.competingatom+json
+        - application/vnd.kurrent.competingatom+json
         - application/vnd.eventstore.competingatom+xml
       parameters:
         - name: stream
@@ -956,7 +956,7 @@ paths:
         number of events.
       operationId: "Get {n} subscription events"
       produces:
-        - application/vnd.eventstore.competingatom+json
+        - application/vnd.kurrent.competingatom+json
         - application/vnd.eventstore.competingatom+xml
       parameters:
         - name: stream
@@ -1010,7 +1010,7 @@ paths:
         change in future versions.
       operationId: Acknowledge a single message
       produces:
-        - application/vnd.eventstore.competingatom+json
+        - application/vnd.kurrent.competingatom+json
         - application/vnd.eventstore.competingatom+xml
       parameters:
         - name: stream
@@ -1052,7 +1052,7 @@ paths:
         change in future versions.
       operationId: Acknowledge multiple messages
       produces:
-        - application/vnd.eventstore.competingatom+json
+        - application/vnd.kurrent.competingatom+json
         - application/vnd.eventstore.competingatom+xml
       parameters:
         - name: stream
@@ -1094,7 +1094,7 @@ paths:
         change in future versions.
       operationId: Don't acknowledge a single message
       produces:
-        - application/vnd.eventstore.competingatom+json
+        - application/vnd.kurrent.competingatom+json
         - application/vnd.eventstore.competingatom+xml
       parameters:
         - name: stream
@@ -1150,7 +1150,7 @@ paths:
         change in future versions.
       operationId: Don't acknowledge multiple messages
       produces:
-        - application/vnd.eventstore.competingatom+json
+        - application/vnd.kurrent.competingatom+json
         - application/vnd.eventstore.competingatom+xml
       parameters:
         - name: stream
@@ -1203,7 +1203,7 @@ paths:
         negative acknowledgement action.
       operationId: Replay previously parked messages
       produces:
-        - application/vnd.eventstore.competingatom+json
+        - application/vnd.kurrent.competingatom+json
         - application/vnd.eventstore.competingatom+xml
       parameters:
         - name: stream
@@ -1250,7 +1250,7 @@ paths:
       tags:
         - Users
       summary: Get all users
-      description: Returns all users defined in EventStoreDB.
+      description: Returns all users defined in KurrentDB.
       operationId: Get all users
       produces:
         - application/json
@@ -1483,7 +1483,7 @@ paths:
       tags:
         - Projections
       summary: Get all projections
-      description: Returns all projections defined in EventStoreDB.
+      description: Returns all projections defined in KurrentDB.
       operationId: Get all projections
       produces:
         - application/json
@@ -1521,7 +1521,7 @@ paths:
       tags:
         - Projections
       summary: Get all queries
-      description: Returns all queries defined in EventStoreDB.
+      description: Returns all queries defined in KurrentDB.
       operationId: Get all queries
       produces:
         - application/json
@@ -1595,7 +1595,7 @@ paths:
       tags:
         - Projections
       summary: Get all continious projections
-      description: Returns all continually running projections defined in EventStoreDB.
+      description: Returns all continually running projections defined in KurrentDB.
       operationId: Get all continious projections
       produces:
         - application/json
@@ -1684,7 +1684,7 @@ paths:
       tags:
         - Projections
       summary: Get all transient projections
-      description: Returns all transient projections defined in EventStoreDB.
+      description: Returns all transient projections defined in KurrentDB.
       operationId: Get all transient projections
       produces:
         - application/json
@@ -2125,7 +2125,7 @@ paths:
       tags:
         - Stats
       summary: Get all stats
-      description: Returns all stats enabled for EventStoreDB.
+      description: Returns all stats enabled for KurrentDB.
       operationId: Get all stats
       produces:
         - application/json
@@ -2142,7 +2142,7 @@ paths:
       tags:
         - Stats
       summary: Get stats sub path
-      description: Returns the sub path of the EventStoreDB statistics available.
+      description: Returns the sub path of the KurrentDB statistics available.
       operationId: Get specified stat
       produces:
         - application/json
@@ -2174,50 +2174,50 @@ paths:
         "404":
           description: Not found
 parameters:
-  ES-ExpectedVersion:
-    name: ES-ExpectedVersion
+  Kurrent-ExpectedVersion:
+    name: Kurrent-ExpectedVersion
     in: header
     required: false
     type: integer
     description: Expected stream version.
-  ES-ResolveLinkTo:
-    name: ES-ResolveLinkTo
+  Kurrent-ResolveLinkTo:
+    name: Kurrent-ResolveLinkTo
     in: header
     required: false
     type: boolean
     description: Wether to resolve `linkTos` in a stream.
-  ES-RequiresLeader:
-    name: ES-RequiresLeader
+  Kurrent-RequireLeader:
+    name: Kurrent-RequireLeader
     in: header
     required: false
     type: boolean
     description: Wether to run on a leader node.
-  ES-TrustedAuth:
-    name: ES-TrustedAuth
+  Kurrent-TrustedAuth:
+    name: Kurrent-TrustedAuth
     in: header
     required: false
     type: string
     description: Allows a trusted intermediary to handle authentication.
-  ES-LongPoll:
-    name: ES-LongPoll
+  Kurrent-LongPoll:
+    name: Kurrent-LongPoll
     in: header
     required: false
     type: integer
     description: Long poll operation on a stream read.
-  ES-HardDelete:
-    name: ES-HardDelete
+  Kurrent-HardDelete:
+    name: Kurrent-HardDelete
     in: header
     required: false
     type: boolean
     description: Hard delete the stream when deleting.
-  ES-EventType:
-    name: ES-EventType
+  Kurrent-EventType:
+    name: Kurrent-EventType
     in: header
     required: false
     type: string
     description: The event type associated to a posted body.
-  ES-EventId:
-    name: ES-EventId
+  Kurrent-EventId:
+    name: Kurrent-EventId
     in: header
     required: false
     type: integer
@@ -2242,7 +2242,7 @@ definitions:
         description: The password for the new user.
     example:
       LoginName: admin
-      FullName: EventStore Admin
+      FullName: KurrentDB Admin
       Groups:
         - Admin
         - DataScience
@@ -2259,7 +2259,7 @@ definitions:
           type: string
         description: The groups the new user should become a member of.
     example:
-      FullName: EventStore Admin
+      FullName: KurrentDB Admin
       Groups:
         - Admin
         - DataScience
@@ -2494,23 +2494,23 @@ definitions:
             properties:
               readBytes:
                 type: number
-                description: The number of bytes read by EventStoreDB since server start.
+                description: The number of bytes read by KurrentDB since server start.
               writtenBytes:
                 type: number
-                description: The number of bytes written by EventStoreDB since server start.
+                description: The number of bytes written by KurrentDB since server start.
               readOps:
                 type: number
-                description: The number of read operations by EventStoreDB since server start.
+                description: The number of read operations by KurrentDB since server start.
               writeOps:
                 type: number
-                description: The number of write operations by EventStoreDB since server start.
+                description: The number of write operations by KurrentDB since server start.
           tcp:
             type: object
             description: TCP connection stats.
             properties:
               connections:
                 type: integer
-                description: Number of TCP connections to EventStoreDB.
+                description: Number of TCP connections to KurrentDB.
               receivingSpeed:
                 type: string
                 description: Receiving speed in bytes per second.
@@ -2563,16 +2563,16 @@ definitions:
                 properties:
                   availableBytes:
                     type: number
-                    description: Remaining bytes of space available to EventStoreDB.
+                    description: Remaining bytes of space available to KurrentDB.
                   totalBytes:
                     type: number
-                    description: Total bytes of space available to EventStoreDB.
+                    description: Total bytes of space available to KurrentDB.
                   usage:
                     type: number
-                    description: Percentage usage of space used by EventStoreDB.
+                    description: Percentage usage of space used by KurrentDB.
                   usedBytes:
                     type: number
-                    description: Total bytes of space used by EventStoreDB.
+                    description: Total bytes of space used by KurrentDB.
       es:
         type: object
         description: ""
diff --git a/docs/images/admin-ui-create-user.png b/docs/images/admin-ui-create-user.png
deleted file mode 100644
index f3a31bd982f..00000000000
Binary files a/docs/images/admin-ui-create-user.png and /dev/null differ
diff --git a/docs/images/admin-ui-users-list.png b/docs/images/admin-ui-users-list.png
deleted file mode 100644
index 8917e4529bd..00000000000
Binary files a/docs/images/admin-ui-users-list.png and /dev/null differ
diff --git a/docs/images/es-web-admin-dashboard.png b/docs/images/es-web-admin-dashboard.png
deleted file mode 100644
index ad9d899af5d..00000000000
Binary files a/docs/images/es-web-admin-dashboard.png and /dev/null differ
diff --git a/docs/images/es-web-admin-stream-browser.png b/docs/images/es-web-admin-stream-browser.png
deleted file mode 100644
index 79e05af8686..00000000000
Binary files a/docs/images/es-web-admin-stream-browser.png and /dev/null differ
diff --git a/docs/images/grafana.png b/docs/images/grafana.png
deleted file mode 100644
index 8bce408a56f..00000000000
Binary files a/docs/images/grafana.png and /dev/null differ
diff --git a/docs/images/http-api-create-user.png b/docs/images/http-api-create-user.png
deleted file mode 100644
index f3a31bd982f..00000000000
Binary files a/docs/images/http-api-create-user.png and /dev/null differ
diff --git a/docs/images/http-set-acl.png b/docs/images/http-set-acl.png
deleted file mode 100644
index 91777080311..00000000000
Binary files a/docs/images/http-set-acl.png and /dev/null differ
diff --git a/docs/images/projections-default.png b/docs/images/projections-default.png
deleted file mode 100644
index be3ec8c3f85..00000000000
Binary files a/docs/images/projections-default.png and /dev/null differ
diff --git a/docs/images/projections-menu-item.png b/docs/images/projections-menu-item.png
deleted file mode 100644
index b0c32ffa955..00000000000
Binary files a/docs/images/projections-menu-item.png and /dev/null differ
diff --git a/docs/installation.md b/docs/installation.md
deleted file mode 100644
index 974f7328586..00000000000
--- a/docs/installation.md
+++ /dev/null
@@ -1,261 +0,0 @@
----
-title: "Installation"
----
-
-## Quick start
-
-EventStoreDB can run as a single node or as a highly-available cluster. For the cluster deployment, you'd need
-three server nodes.
-
-The installation procedure consists of the following steps:
-
-- Create a configuration file for each cluster node.
-- Install EventStoreDB on each node using one of the available methods.
-- Obtain SSL certificates, either signed by a publicly trusted or private certificate authority.
-- Copy the configuration files and SSL certificates to each node.
-- Start the EventStoreDB service on each node.
-- Check the cluster status using the Admin UI on any node.
-
-### Default access
-
-| User  | Password |
-|-------|----------|
-| admin | changeit |
-| ops   | changeit |
-
-## Linux
-
-### Install from PackageCloud
-
-EventStoreDB has pre-built [packages available for Debian-based distributions](https://packagecloud.io/EventStore/EventStore-OSS), or you can [build from source](https://github.com/EventStore/EventStore#linux). The package name to install is `eventstore-oss`.
-
-Commercial version with additional features is available as a separate package `eventstore-commercial`.
-
-Before installing the package from Packagecloud, add the repository to your system:
-
-```bash:no-line-numbers
-curl -s https://packagecloud.io/install/repositories/EventStore/EventStore-OSS/script.deb.sh | sudo bash
-```
-
-For the commercial version:
-
-```bash:no-line-numbers
-curl -s https://<key>@packagecloud.io/install/repositories/EventStore/EventStore-Commercial/script.deb.sh | sudo bash
-```
-
-Then, install the package:
-
-```bash:no-line-numbers
-sudo apt install eventstore-oss
-```
-
-For the commercial version:
-
-```bash:no-line-numbers
-sudo apt install eventstore-commercial
-```
-
-::: tip
-RPM packages are not available as part of the [EventStore/EventStore-OSS](https://packagecloud.io/EventStore/EventStore-OSS/) Packagecloud repository
-::: 
-
-If you installed from a pre-built package, the server is registered as a service. Therefore, you can start EventStoreDB with:
-
-```bash:no-line-numbers
-sudo systemctl start eventstore
-```
-
-When you install the EventStoreDB package, the service doesn't start by default. This allows you to change the configuration located at `etc/eventstore/eventstore.conf` and to prevent creating database and index files in the default location.
-
-::: warning
-We recommend that when using Linux you set the 'open file limit' to a high number. The precise value depends on your use case, but at least between `30,000` and `60,000`.
-:::
-
-### Building from source
-
-You can also build EventStoreDB from source. Before doing that, you need to install the .NET 8 SDK. EventStoreDB packages have the .NET Runtime embedded, so you don't need to install anything except the EventStoreDB package.
-
-### Uninstall
-
-If you installed one of the [pre-built packages for Debian based systems](https://packagecloud.io/EventStore/EventStore-OSS), you can remove it with:
-
-```bash
-sudo apt-get purge eventstore-oss
-```
-or
-```bash
-sudo apt-get purge eventstore-commercial
-```
-
-This removes EventStoreDB completely, including any user settings.
-
-If you built EventStoreDB from source, remove it by deleting the directory containing the source and build and manually removing any environment variables.
-
-## Windows
-
-::: warning
-EventStoreDB doesn't install as a Windows service. You need to ensure that the server executable
-starts automatically.
-:::
-
-### Install from Chocolatey
-
-EventStoreDB has [Chocolatey packages](https://chocolatey.org/packages/eventstore-oss) available that you can
-install with the following command with administrator permissions.
-
-```powershell:no-line-numbers
-choco install eventstore-oss
-```
-
-### Download the binaries
-
-You can also [download](https://eventstore.com/downloads/) a binary, unzip the archive and run from the folder
-location with administrator permissions.
-
-The following command starts EventStoreDB in dev mode with the database stored at the path `./db` and the logs in `./logs`.
-Read more about configuring the EventStoreDB server in the [Configuration section](configuration.md).
-
-```powershell:no-line-numbers
-EventStore.ClusterNode.exe --dev --db ./db --log ./logs
-```
-
-EventStoreDB runs in an administration context because it starts an HTTP server through `http.sys`. For
-permanent or production instances, you need to provide an ACL such as:
-
-```powershell:no-line-numbers
-netsh http add urlacl url=http://+:2113/ user=DOMAIN\username
-```
-
-For more information, refer to
-Microsoft's `add urlacl` [documentation](https://docs.microsoft.com/en-us/windows/win32/http/add-urlacl).
-
-To build EventStoreDB from source, refer to the
-EventStoreDB [GitHub repository](https://github.com/EventStore/EventStore#building-eventstoredb).
-
-### Uninstall
-
-If you installed EventStoreDB with Chocolatey, you can uninstall with:
-
-```powershell:no-line-numbers
-choco uninstall eventstore-oss
-```
-
-This removes the `eventstore-oss` Chocolatey package.
-
-If you installed EventStoreDB by [downloading a binary](https://eventstore.com/downloads/), you can remove it
-by:
-
-- Deleting the `EventStore-OSS-Win-*` directory.
-- Removing the directory from your PATH.
-
-## Docker
-
-You can run EventStoreDB in a Docker container as a single node, using insecure mode. It is useful in most
-cases to try out the product and for local development purposes.
-
-It's also possible to run a three-node cluster with or without SSL using Docker Compose. Such a setup is
-closer to what you'd run in production.
-
-### Run with Docker
-
-EventStoreDB has a Docker image available for any platform that supports Docker.
-
-The following command will start the EventStoreDB node using default HTTP port, without security. You can then
-connect to it using one of the clients and the `esdb://localhost:2113?tls=false` connection string. You can also access the Admin UI by opening http://localhost:2113 in your browser.
-
-```bash:no-line-numbers
-docker run --name esdb-node -it -p 2113:2113 \
-    eventstore/eventstore:latest --insecure --run-projections=All
-    --enable-atom-pub-over-http
-```
-
-Then, you'd be able to connect to EventStoreDB with gRPC clients. Also, the Stream Browser will work
-in the Admin UI.
-
-In order to sustainably keep the data, we also recommend mapping the database and index volumes.
-
-### Use Docker Compose
-
-You can also run a single-node instance or a three-node secure cluster locally using Docker Compose.
-
-#### Insecure single node
-
-You can use Docker Compose to run EventStoreDB in the same setup as the `docker run` command mentioned before.
-
-Create file `docker-compose.yaml` with following content:
-
-@[code{curl}](@samples/docker-compose.yaml)
-
-Run the instance:
-
-```bash:no-line-numbers
-docker-compose up
-```
-
-The command above would run EventStoreDB as a single node without SSL. You also get AtomPub protocol enabled, so you can get the stream browser to work in the Admin UI.
-
-::: warning
-The legacy TCP client protocol is disabled by default and will no longer be available since version 24.2. 
-To enable it in versions lower than 24.2, add the environment variable to the yaml file: 
-EVENTSTORE_ENABLE_EXTERNAL_TCP=true
-:::
-
-#### Secure cluster
-
-With Docker Compose, you can also run a three-node cluster with security enabled. That kind of setup is
-something you'd expect to use in production.
-
-Create file `docker-compose.yaml` with following content:
-
-@[code{curl}](@samples/docker-compose-cluster.yaml)
-
-Quite a few settings are shared between the nodes and we use the `env` file to avoid repeating those settings.
-So, add the `vars.env` file to the same location:
-
-@[code{curl}](@samples/vars.env)
-
-Containers will use the shared volume using the local `./certs` directory for certificates. However, if you
-let Docker create the directory on startup, the container won't be able to get write access to it.
-Therefore, you should create the `certs` directory manually. You only need to do it once.
-
-```bash:no-line-numbers
-mkdir certs
-```
-
-Now you are ready to start the cluster.
-
-```bash:no-line-numbers
-docker-compose up
-```
-
-Watching the log messages, you will see that after some time, the elections process completes. Then you're able to connect to each
-node using the Admin UI. Nodes should be accessible on the loopback address (`127.0.0.1` or `localhost`) over
-HTTP, using ports specified below:
-
-| Node  | HTTP port |
-|:------|:----------|
-| node1 | 2111      |
-| node2 | 2112      |
-| node3 | 2113      |
-
-You have to tell your client to use secure connection.
-
-| Protocol | Connection string                                                                  |
-|:---------|:-----------------------------------------------------------------------------------|
-| gRPC     | `esdb://localhost:2111,localhost:2112,localhost:2113?tls=true&tlsVerifyCert=false` |
-
-As you might've noticed, the connection string has a setting to disable the certificate validation (`tlsVerifyCert=false`). It would prevent the invalid certificate error since the cluster uses a private, auto-generated CA.
-
-However, **we do not recommend using this setting in production**. Instead, you can either add the CA certificate to the trusted root CA store or instruct your application to use such a certificate. See the [security section](security.md#certificate-installation-on-a-client-environment) for detailed instructions.
-
-## Compatibility notes
-
-Depending on how your EventStoreDB instance is configured, some features might not work. Below are some features that are unavailable due to the specified options.
-
-| Feature                       | Options impact                                                                                                                                                                          |
-|:------------------------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Connection without SSL or TLS | EventStoreDB 20.6+ is secure by default. Your clients need to establish a secure connection, unless you use the `Insecure` option.                                                      |
-| Authentication and ACLs       | When using the `Insecure` option for the server, all security is disabled. The `Users` menu item is also disabled in the Admin UI.                                                      |
-| Projections                   | Running projections is disabled by default and the `Projections` menu item is disabled in the Admin UI. You need to enable projections explicitly by using the `RunProjections` option. |
-| AtomPub protocol              | In 20.6+, the AtomPub protocol is disabled by default. If you use this protocol, you have to explicitly enable it by using the `EnableAtomPubOverHttp` option.                          |
-| Stream browser                | The stream browser feature in Admin UI depends on the AtomPub protocol and is greyed out by default. You need to enable AtomPub (previous line) to make the stream browser work.        |
diff --git a/docs/networking.md b/docs/networking.md
deleted file mode 100644
index baf08de1f45..00000000000
--- a/docs/networking.md
+++ /dev/null
@@ -1,479 +0,0 @@
----
-title: Networking
----
-
-## Network configuration
-
-EventStoreDB provides two interfaces: 
-- HTTP(S) for gRPC communication and REST APIs
-- TCP for cluster replication (internal)
-
-Nodes in the cluster replicate with each other using the TCP protocol, but use gRPC for [discovering other cluster nodes](cluster.md#discovering-cluster-members).
-
-Server nodes separate internal and external TCP communication explicitly, but use a single HTTP binding. Replication between the cluster nodes is considered internal, and all the TCP clients that connect to the database are external. EventStoreDB allows you to separate network configurations for internal and external communication. For example, you can use different network interfaces on the node. All the internal communication can go over the isolated private network, but access for external clients can be configured on another interface, which is connected to a more open network. You can set restrictions on those external interfaces to make your deployment more secure.
-
-For gRPC and HTTP, there's no internal vs external separation of traffic.
-
-## HTTP configuration
-
-HTTP is the primary protocol for EventStoreDB. It is used in gRPC communication and HTTP APIs (management, gossip and diagnostics).
-The HTTP endpoint always binds to the IP address configured in the `NodeIp` setting (previously referred to as `ExtIp`).
-
-| Format               | Syntax               |
-|:---------------------|:---------------------|
-| Command line         | `--node-ip`          |
-| YAML                 | `NodeIp`             |
-| Environment variable | `EVENTSTORE_NODE_IP` |
-
-When the `NodeIp` setting is not provided, EventStoreDB will use the first available non-loopback address. You can also bind HTTP to all available interfaces using `0.0.0.0` as the setting value. If you do that, you'd need to configure the `NodeHostAdvertiseAs` (previously `ExtHostAdvertiseAs`) setting (read more [here](#network-address-translation)), since `0.0.0.0` is not a valid IP address to connect from the outside world.
-
-::: warning
-Please note that the `ExtIp` parameter has been deprecated as of version 23.10.0 and will be removed in future versions. It is recommended to use the `NodeIp` parameter instead.
-:::
-
-The default HTTP port is `2113`. Depending on the [security settings](security.md) of the node, it either responds over plain HTTP or via HTTPS. There is no HSTS redirect, so if you try reaching a secure node via HTTP, you can get an empty response.
-
-You can change the HTTP port using the `NodePort` setting (previously `HttpPort` setting) :
-
-| Format               | Syntax                 |
-|:---------------------|:-----------------------|
-| Command line         | `--node-port`          |
-| YAML                 | `NodePort`             |
-| Environment variable | `EVENTSTORE_NODE_PORT` |
-
-**Default**: `2113`
-
-::: warning
-Please note that the `HttpPort` parameter has been deprecated as of version 23.10.0 and will be removed in future versions. It is recommended to use the `NodePort` parameter instead.
-:::
-
-If your network setup requires any kind of IP address, DNS name and port translation for internal or external communication, you can use available [address translation](#network-address-translation) settings.
-
-### Keep-alive pings
-
-The reliability of the connection between the client application and database is crucial for the stability of the solution. If the network is not stable or has some periodic issues, the client may drop the connection. Stability is essential for the [stream subscriptions](@clients/grpc/subscriptions.md) where a client is listening to database notifications. Having an existing connection open when an app resumes activity allows for the initial gRPC calls to be made quickly, without any delay caused by the reestablished connection.
-
-EventStoreDB supports the built-in gRPC mechanism for keeping the connection alive. If the other side does not acknowledge the ping within a certain period, the connection will be closed. Note that pings are only necessary when there's no activity on the connection.
-
-Keepalive pings are enabled by default, with the default interval set to 10 seconds. The default value is based on the [gRPC proposal](https://github.com/grpc/proposal/blob/master/A8-client-side-keepalive.md#extending-for-basic-health-checking) that suggests 10 seconds as the minimum. It's a compromise value to ensure that the connection is open and not making too many redundant network calls.
-
-You can customise the following Keepalive settings:
-
-#### KeepAliveInterval
-
-After a duration of `keepAliveInterval` (in milliseconds), if the server doesn't see any activity, it pings the client to see if the transport is still alive.
-
-| Format               | Syntax                           |
-|:---------------------|:---------------------------------|
-| Command line         | `--keep-alive-interval`          |
-| YAML                 | `KeepAliveInterval`              |
-| Environment variable | `EVENTSTORE_KEEP_ALIVE_INTERVAL` |
-
-**Default**: `10000` (ms, 10 sec)
-
-#### KeepAliveTimeout
-
-After having pinged for keepalive check, the server waits for a duration of `keepAliveTimeout` (in milliseconds). If the connection doesn't have any activity even after that, it gets closed.
-
-| Format               | Syntax                          |
-|:---------------------|:--------------------------------|
-| Command line         | `--keep-alive-timeout`          |
-| YAML                 | `KeepAliveTimeout`              |
-| Environment variable | `EVENTSTORE_KEEP_ALIVE_TIMEOUT` |
-
-**Default**: `10000` (ms, 10 sec)
-
-As a general rule, we do not recommend putting EventStoreDB behind a load balancer. However, if you are using it and want to benefit from the Keepalive feature, then you should make sure if the compatible settings are properly set. Some load balancers may also override the Keepalive settings. Most of them require setting the idle timeout larger/longer than the `keepAliveTimeout`. We suggest checking the load balancer documentation before using Keepalive pings.
-
-### AtomPub
-
-The AtomPub application protocol over HTTP is disabled by default since v20. We plan to deprecate the AtomPub support in the future versions, but we aim to provide a replacement before we finally deprecate AtomPub.
-
-In Event Store Cloud, the AtomPub protocol is enabled. For self-hosted instances, use the configuration setting to enable AtomPub.
-
-| Format               | Syntax                                 |
-|:---------------------|:---------------------------------------|
-| Command line         | `--enable-atom-pub-over-http`          |
-| YAML                 | `EnableAtomPubOverHttp`                |
-| Environment variable | `EVENTSTORE_ENABLE_ATOM_PUB_OVER_HTTP` |
-
-**Default**: `false` (AtomPub is disabled)
-
-### HTTP caching
-
-:::tip
-This section is about caching static resources for HTTP API. It does not affect the server performance directly and cannot be used with gRPC clients.
-:::
-
-Most of the URIs that EventStoreDB emits are immutable (including the UI and Atom Feeds).
-
-An Atom feed has a URI that represents an event, e.g., `/streams/foo/0` which represents 'event 0'. The data for event 0 never changes. If this stream is open to public reads, then the URI is set to be 'cachable' for long periods of time.
-
-You can see a similar example in reading a feed. If a stream has 50 events in it, the feed page `20/forward/10` never changes, it will always be events 20-30. Internally, EventStoreDB controls serving the right URIs by using `rel` links with feeds (for example `prev`/`next`).
-
-This caching behavior is great for performance in a production environment and we recommended you use it, but in a developer environment it can become confusing.
-
-For example, what happens if you started a database, wrote `/streams/foo/0` and performed a `GET` request? The `GET` request is cachable and now in your cache. Since this is a development environment, you shut down EventStoreDB and delete the database. You then restart EventStoreDB and append a different event to `/streams/foo/0`. You open your browser and inspect the `/streams/foo/0` stream, and you see the event appended before you deleted the database.
-
-To avoid this during development it's best to run EventStoreDB with the `--disable-http-caching` command line option. This disables all caching and solves the issue.
-
-The option can be set as follows:
-
-| Format               | Syntax                            |
-|:---------------------|:----------------------------------|
-| Command line         | `--disable-http-caching`          |
-| YAML                 | `DisableHttpCaching`              |
-| Environment variable | `EVENTSTORE_DISABLE_HTTP_CACHING` |
-
-**Default**: `false`, so the HTTP caching is **enabled** by default.
-
-### Kestrel Settings
-
-It's generally not expected that you'll need to update the Kestrel configuration that EventStoreDB has set by default, but it's good to know that you can update the following settings if needed.
-
-Kestrel uses the `kestrelsettings.json` configuration file. This file should be located in the [default configuration directory](configuration.md#configuration-file).
-
-#### MaxConcurrentConnections
-
-Sets the maximum number of open connections. See the docs [here](https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.server.kestrel.core.kestrelserverlimits.maxconcurrentconnections?view=aspnetcore-5.0).
-
-This is configured with `Kestrel.Limits.MaxConcurrentConnections` in the settings file.
-
-#### MaxConcurrentUpgradedConnections
-
-Sets the maximum number of open, upgraded connections. An upgraded connection is one that has been switched from HTTP to another protocol, such as WebSockets. See the docs [here](https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.server.kestrel.core.kestrelserverlimits.maxconcurrentupgradedconnections?view=aspnetcore-5.0).
-
-This is configured with `Kestrel.Limits.MaxConcurrentUpgradedConnections` in the settings file.
-
-#### Http2 InitialConnectionWindowSize
-
-Sets how much request body data the server is willing to receive and buffer at a time aggregated across all requests (streams) per connection. Note requests are also limited by `KestrelInitialStreamWindowSize`
-
-The value must be greater than or equal to 65,535 and less than 2^31. See the docs [here](https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.server.kestrel.core.http2limits.initialconnectionwindowsize?view=aspnetcore-5.0).
-
-This is configured with `Kestrel.Limits.Http2.InitialConnectionWindowSize` in the settings file.
-
-#### Http2 InitialStreamWindowSize
-
-Sets how much request body data the server is willing to receive and buffer at a time per stream. Note connections are also limited by `KestrelInitialConnectionWindowSize`
-
-Value must be greater than or equal to 65,535 and less than 2^31. See the docs [here](https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.server.kestrel.core.http2limits.initialstreamwindowsize?view=aspnetcore-5.0).
-
-This is configured with `Kestrel.Limits.Http2.InitialStreamWindowSize` in the settings file.
-
-## Replication protocol
-
-Replication between cluster nodes uses a proprietary TCP-based protocol. Options for configuring the internal replication protocol are described below.
-
-### Interface and port
-
-Internal TCP binds to the IP address specified in the `ReplicationIp` setting (previously `IntIp`). It must be configured if you run a multi-node cluster.
-
-By default, EventStoreDB binds its internal networking on the loopback interface only (`127.0.0.1`). You can change this behaviour and tell EventStoreDB to listen on a specific internal IP address. To do that set the `ReplicationIp` to `0.0.0.0` or the IP address of the network interface.
-
-| Format               | Syntax                      |
-|:---------------------|:----------------------------|
-| Command line         | `--replication-ip`          |
-| YAML                 | `ReplicationIp`             |
-| Environment variable | `EVENTSTORE_REPLICATION_IP` |
-
-**Default**: `127.0.0.1` (loopback).
-
-If you keep this setting to its default value, cluster nodes won't be able to talk to each other.
-
-::: warning
-Please note that the `IntIp` parameter has been deprecated as of version 23.10.0 and will be removed in future versions. It is recommended to use the `ReplicationIp` parameter instead.
-:::
-
-By default, EventStoreDB uses port `1112` for internal TCP. You can change this by specifying the `ReplicationPort` setting (previously `IntTcpPort` setting).
-
-| Format               | Syntax                        |
-|:---------------------|:------------------------------|
-| Command line         | `--replication-port`          |
-| YAML                 | `ReplicationPort`             |
-| Environment variable | `EVENTSTORE_REPLICATION_PORT` |
-
-**Default**: `1112`
-
-::: warning
-Please note that the `IntTcpPort` parameter has been deprecated as of version 23.10.0 and will be removed in future versions. It is recommended to use the `ReplicationPort` parameter instead.
-:::
-
-### Security
-
-When the node is secured (by default), all the TCP traffic will use TLS. You can disable TLS for TCP internally and externally using the settings described below.
-
-| Format               | Syntax                                |
-|:---------------------|:--------------------------------------|
-| Command line         | `--disable-internal-tcp-tls`          |
-| YAML                 | `DisableInternalTcpTls`               |
-| Environment variable | `EVENTSTORE_DISABLE_INTERNAL_TCP_TLS` |
-
-**Default**: `false`
-
-If your network setup requires any kind of IP address, DNS name and port translation for internal communication, you can use available [address translation](#network-address-translation) settings.
-
-## Network address translation
-
-Due to NAT (network address translation), or other reasons a node may not be bound to the address it is reachable from other nodes. For example, the machine has an IP address of `192.168.1.13`, but the node is visible to other nodes as `10.114.12.112`.
-
-Options described below allow you to tell the node that even though it is bound to a given address it should not gossip that address. When returning links over HTTP, EventStoreDB will also use the specified addresses instead of physical addresses, so the clients that use HTTP can follow those links.
-
-Another case when you might want to specify the advertised address although there's no address translation involved. When you configure EventStoreDB to bind to `0.0.0.0`, it will use the first non-loopback address for gossip. It might or might not be the address you want it to use. Whilst the best way to avoid such a situation is to configure the binding properly using the `NodeIp` and `ReplicationIp` settings, you can also use address translation setting with the correct IP address or DNS name.
-
-Also, even if you specified the `NodeIp` and `ReplicationIp` settings in the configuration, you might still want to override the advertised address if you want to use hostnames and not IP addresses. That might be needed when running a secure cluster with certificates that only contain DNS names of the nodes.
-
-The only place where these settings make any effect is the [gossip](cluster.md#gossip-protocol) endpoint response.
-
-## HTTP translations
-
-By default, a cluster node will advertise itself using `NodeIp` and `NodePort`. You can override the advertised HTTP port using the  `NodePortAdvertiseAs` setting (previously `HttpPortAdvertiseAs` setting).
-
-| Format               | Syntax                              |
-|:---------------------|:------------------------------------|
-| Command line         | `--node-port-advertise-as`          |
-| YAML                 | `NodePortAdvertiseAs`               |
-| Environment variable | `EVENTSTORE_NODE_PORT_ADVERTISE_AS` | 
-
-::: warning
-Please note that the `HttpPortAdvertiseAs` parameter has been deprecated as of version 23.10.0 and will be removed in future versions. It is recommended to use the `NodePortAdvertiseAs` parameter instead.
-:::
-
-If you want the node to advertise itself using the hostname rather than its IP address, use the `NodeHostAdvertiseAs` setting (previously `ExtHostAdvertiseAs` setting).
-
-| Format               | Syntax                              |
-|:---------------------|:------------------------------------|
-| Command line         | `--node-host-advertise-as`          |
-| YAML                 | `NodeHostAdvertiseAs`               |
-| Environment variable | `EVENTSTORE_NODE_HOST_ADVERTISE_AS` | 
-
-::: warning
-Please note that the `ExtHostAdvertiseAs` parameter has been deprecated as of version 23.10.0 and will be removed in future versions. It is recommended to use the `NodeHostAdvertiseAs` parameter instead.
-:::
-
-### TCP translations
-
-TCP ports used for replication can be advertised using custom values:
-
-| Format               | Syntax                                         |
-|:---------------------|:-----------------------------------------------|
-| Command line         | `--replication-tcp-port-advertise-as`          |
-| YAML                 | `ReplicationTcpPortAdvertiseAs`                |
-| Environment variable | `EVENTSTORE_REPLICATION_TCP_PORT_ADVERTISE_AS` | 
-
-::: warning
-Please note that the `IntTcpPortAdvertiseAs` parameter has been deprecated as of version 23.10.0 and will be removed in future versions. It is recommended to use the `ReplicationTcpPortAdvertiseAs` and `NodeTcpPortAdvertiseAs` parameters instead, respectively.
-:::
-
-If you want to change how the node TCP address is advertised internally, use the `ReplicationHostAdvertiseAs` setting (previously `IntHostAdvertiseAs` setting). You can use an IP address or a hostname.
-
-| Format               | Syntax                                     |
-|:---------------------|:-------------------------------------------|
-| Command line         | `--replication-host-advertise-as`          |
-| YAML                 | `ReplicationHostAdvertiseAs`               |
-| Environment variable | `EVENTSTORE_REPLICATION_HOST_ADVERTISE_AS` | 
-
-::: warning
-Please note that the `IntHostAdvertiseAs` parameter has been deprecated as of version 23.10.0 and will be removed in future versions. It is recommended to use the `ReplicationHostAdvertiseAs` parameter instead.
-:::
-
-### Advertise to clients
-
-In some cases, the cluster needs to advertise itself to clients using a completely different set of addresses and ports. Usually, you need to do it because addresses and ports configured for the HTTP protocol are not available as-is to the outside world. One of the examples is running a cluster in Docker Compose. In such environment, HTTP uses internal hostnames in the Docker network, which isn't accessible on the host. So, in order to connect to the cluster from the host machine, you need to use `localhost` and translated HTTP ports to reach the cluster nodes.
-
-To configure how the cluster nodes advertise to clients, use the `Advertise<*>ToClient` settings listed below.
-
-Specify the advertised hostname or IP address:
-
-| Format               | Syntax                                   |
-|:---------------------|:-----------------------------------------|
-| Command line         | `--advertise-host-to-client-as`          |
-| YAML                 | `AdvertiseHostToClientAs`                |
-| Environment variable | `EVENTSTORE_ADVERTISE_HOST_TO_CLIENT_AS` | 
-
-Specify the advertised HTTP(S) port (previously `AdvertiseHttpPortToClientAs` setting):
-
-| Format               | Syntax                                        |
-|:---------------------|:----------------------------------------------|
-| Command line         | `--advertise-node-port-to-client-as`          |
-| YAML                 | `AdvertiseNodePortToClientAs`                 |
-| Environment variable | `EVENTSTORE_ADVERTISE_NODE_PORT_TO_CLIENT_AS` |
-
-::: warning
-Please note that the `AdvertiseHttpPortToClientAs` parameter has been deprecated as of version 23.10.0 and will be removed in future versions. It is recommended to use the `AdvertiseNodePortToClientAs` parameter instead.
-:::
-
-## Heartbeat timeouts
-
-EventStoreDB uses heartbeats over all TCP connections to discover dead clients and nodes. Heartbeat timeouts should not be too short, as short timeouts will produce false positives. At the same time, setting too long timeouts will prevent discovering dead nodes and clients in time.
-
-Each heartbeat has two points of configuration. The first is the _interval;_ this represents how often the system should consider a heartbeat. EventStoreDB doesn't send a heartbeat for every interval, but only if it has not heard from a node within the configured interval. In a busy cluster, you may never see any heartbeats.
-
-The second point of configuration is the _timeout_. This determines how long EventStoreDB server waits for a client or node to respond to a heartbeat request.
-
-Different environments need different values for these settings. The defaults are likely fine on a LAN. If you experience frequent elections in your environment, you can try to increase both interval and timeout, for example:
-
-- An interval of 5000ms.
-- A timeout of 1000ms.
-
-::: tip
-If in doubt, choose higher numbers. This adds a small period of time to discover a dead client or node and is better than the alternative, which is false positives.
-:::
-
-Replication/Internal TCP heartbeat (between cluster nodes):
-
-| Format               | Syntax                                      |
-|:---------------------|:--------------------------------------------|
-| Command line         | `--replication-heartbeat-interval`          |
-| YAML                 | `ReplicationHeartbeatInterval`              |
-| Environment variable | `EVENTSTORE_REPLICATION_HEARTBEAT_INTERVAL` | 
-
-**Default**: `700` (ms)
-
-| Format               | Syntax                                     |
-|:---------------------|:-------------------------------------------|
-| Command line         | `--replication-heartbeat-timeout`          |
-| YAML                 | `ReplicationHeartbeatTimeout`              |
-| Environment variable | `EVENTSTORE_REPLICATION_HEARTBEAT_TIMEOUT` | 
-
-**Default**: `700` (ms)
-
-::: warning
-Please note that the `IntTcpHeartbeatInterval` and `IntTcpHeartbeatTimeout` parameters have been deprecated as of version 23.10.0 and will be removed in future versions. It is recommended to use the `ReplicationHeartbeatInterval` and `ReplicationHeartbeatTimeout` parameters instead, respectively.
-:::
-
-### gRPC heartbeats
-
-For the gRPC heartbeats, EventStoreDB and its gRPC clients use the protocol feature called _Keepalive ping_. Read more about it on the [HTTP configuration page](#keep-alive-pings).
-
-## Exposing endpoints
-
-If you need to disable some HTTP endpoints on the external HTTP interface, you can change some settings below. It is possible to disable the Admin UI, stats and gossip port to be exposed externally.
-
-You can disable the Admin UI on external HTTP by setting `AdminOnExt` setting to `false`.
-
-| Format               | Syntax                    |
-|:---------------------|:--------------------------|
-| Command line         | `--admin-on-ext`          |
-| YAML                 | `AdminOnExt`              |
-| Environment variable | `EVENTSTORE_ADMIN_ON_EXT` | 
-
-**Default**: `true`, Admin UI is enabled on the external HTTP.
-
-Exposing the `stats` endpoint externally is required for the Admin UI and can also be useful if you collect stats for an external monitoring tool.
-
-| Format               | Syntax                    |
-|:---------------------|:--------------------------|
-| Command line         | `--stats-on-ext`          |
-| YAML                 | `StatsOnExt`              |
-| Environment variable | `EVENTSTORE_STATS_ON_EXT` | 
-
-**Default**: `true`, stats endpoint is enabled on the external HTTP.
-
-You can also disable the gossip protocol in the external HTTP interface. If you do that, ensure that the internal interface is properly configured. Also, if you use [gossip with DNS](cluster.md#cluster-with-dns), ensure that the [gossip port](cluster.md#gossip-port) is set to the internal HTTP port.
-
-| Format               | Syntax                     |
-|:---------------------|:---------------------------|
-| Command line         | `--gossip-on-ext`          |
-| YAML                 | `GossipOnExt`              |
-| Environment variable | `EVENTSTORE_GOSSIP_ON_EXT` | 
-
-**Default**: `true`, gossip is enabled on the external HTTP.
-
-## External TCP 
-
-<wbr><Badge type="warning" text="Commercial" vertical="middle"/>
-
-The TCP client protocol plugin enables client applications based on the external TCP API to run without any changes. This provides developers a mechanism to migrate to gRPC clients. This bridge solution enables development teams to plan for the End Of Life (EOL) of the external TCP API. Past the EOL, the external TCP API will no longer be supported.
-
-### Enabling the plugin
-
-Refer to the general [plugins configuration](./configuration.md#plugins-configuration) guide to see how to configure plugins with JSON files and environment variables.
-
-To enable the TCP API plugin, save the following configuration in a JSON file, for example `<esdb-installation-directory>/config/tcp-plugin-config.json`, in the EventStoreDB installation directory for a node:
-
-```json
-{
-  "EventStore": {
-    "TcpPlugin": {
-      "EnableExternalTcp": true
-    }
-  }
-}
-```
-
-Once the plugin is enabled, the server will log a message similar to the one below:
-
-```
-[11212, 1,18:44:34.070,INF] "TcpApi" "24.6.0.0" plugin enabled.
-```
-
-### Other parameters
-
-The following options can be set in the json configuration:
-
-1. `NodeHeartbeatTimeout` - defaults to: 1000
-2. `NodeHeartbeatInterval` - defaults to: 2000
-3. `NodeTcpPort` - defaults to: 1113
-4. `NodeTcpPortAdvertiseAs` - defaults to: 1113
-
-The above default values can be overridden, for example:
-
-```json
-{
-  "EventStore": {
-    "TcpPlugin": {
-      "EnableExternalTcp": true,
-      "NodeTcpPort": 8113,
-      "NodeTcpPortAdvertiseAs": 8113,
-      "NodeHeartbeatInterval": 2000,
-      "NodeHeartbeatTimeout": 1000
-    }
-  }
-}
-```
-
-### Troubleshooting
-
-#### Plugin doesn't load
-
-The plugin has to be located in a subdirectory of the server's plugins directory. To check this:
-
-1. Go to the installation directory of a node, the directory containing the EventStoreDb executable.
-2. In this directory, there should be a directory called `plugins`, create it if this is not the case.
-3. The `plugins` directory should have a subdirectory for the TCP API plugin, for example `EventStore.TcpPlugin`. Create it if it doesn't exist.
-4. The binaries of the plugin should be located in that same subdirectory.
-
-You can verify which plugins have been found and loaded by searching for log entries similar to the following:
-
-```
-[11212, 1,18:44:30.420,INF] Plugins path: "C:\\EventStore\\plugins"
-[11212, 1,18:44:30.420,INF] Adding: "C:\\EventStore\\plugins" to the plugin catalog.
-[11212, 1,18:44:30.422,INF] Adding: "C:\\EventStore\\plugins\\EventStore.Licensing" to the plugin catalog.
-[11212, 1,18:44:30.432,INF] Adding: "C:\\EventStore\\plugins\\EventStore.POC.ConnectedSubsystemsPlugin" to the plugin catalog.
-[11212, 1,18:44:30.433,INF] Adding: "C:\\EventStore\\plugins\\EventStore.POC.ConnectorsPlugin" to the plugin catalog.
-[11212, 1,18:44:30.436,INF] Adding: "C:\\EventStore\\plugins\\EventStore.TcpPlugin" to the plugin catalog.
-[11212, 1,18:44:30.479,INF] Loaded SubsystemsPlugin plugin: "licensing" "24.10.0.0".
-[11212, 1,18:44:30.483,INF] Loaded SubsystemsPlugin plugin: "connected" "0.0.5".
-[11212, 1,18:44:30.496,INF] Loaded ConnectedSubsystemsPlugin plugin: "connectors" "0.0.5".
-[11212, 1,18:44:30.504,INF] Loaded SubsystemsPlugin plugin: "tcp-api" "24.10.0.0".
-```
-
-#### Plugin doesn't start
-
-The plugin has to be configured to be enabled.
-If you see the following log it means the plugin was found but not started:
-
-```
-[ 5104, 1,19:03:13.807,INF] "TcpApi" "24.6.0.0" plugin disabled. "Set 'EventStore:TcpPlugin:EnableExternalTcp' to 'true' to enable"
-```
-
-When the plugin starts, you should see a log similar to the following:
-
-```
-[11212, 1,18:44:34.070,INF] "TcpApi" "24.6.0.0" plugin enabled.
-```
-
-
-
-
diff --git a/docs/operations.md b/docs/operations.md
deleted file mode 100644
index 010a0962b9f..00000000000
--- a/docs/operations.md
+++ /dev/null
@@ -1,640 +0,0 @@
-# Maintenance
-
-EventStoreDB requires regular maintenance with three operational concerns:
-
-- [Scavenging](#scavenging) for freeing up space after deleting events.
-- [Backup and restore](#backup-and-restore) for disaster recovery.
-- [Certificate update](#certificate-update-upon-expiry) to renew certificates.
-
-You might also be interested learning about EventStoreDB [diagnostics](diagnostics/README.md)
-and [indexes](./indexes.md), which might require some Ops attention.
-
-## Scavenging
-
-In EventStoreDB, events are no longer present in stream reads or subscriptions after they have been deleted or they have expired according to the metadata of the stream.
-
-The events are, however, still present in the database and will be visible in reads and subscriptions to the `$all` stream.
-
-To remove these events from the database, which may be necessary for GDPR, you need to run a 'scavenge' on each of your nodes.
-
-A scavenge operation removes events and reclaims disk space by creating a copy of the relevant chunk, minus those events, and
-then deleting the old chunk. The scavenged events are also removed from the index.
-
-::: warning
-Scavenging is destructive. Once a scavenge has run, you cannot recover any deleted events except from a backup.
-:::
-
-### Starting a scavenge
-
-You start a scavenge by issuing an empty `POST` request to the HTTP API with the credentials of an `admin`
-or `ops` user:
-
-@[code{curl}](@samples/scavenge.sh)
-
-You can also start scavenges from the _Admin_ page of the Admin UI.
-
-![Start a scavenge in the Admin UI](./images/admin-scavenge.png)
-
-Each node in a cluster has its own independent copy of the database. As such, when you run a scavenge, you need to issue a
-scavenge request to each node. The scavenges can be run concurrently, but can also be run in series to spread the load.
-
-### Getting the current scavenge ID
-
-Get the ID of the currently running scavenge, if there is one, by issuing a `GET` request to the following HTTP API endpoint with the `admin` or `ops` credentials.
-
-```bash:no-line-numbers
-curl -i -X GET http://127.0.0.1:2113/admin/scavenge/current -u "admin:changeit"
-```
-
-### Stopping a scavenge
-
-Stop a running scavenge operation by issuing a `DELETE` request to the HTTP API with the credentials of
-an `admin` or `ops` user and the ID of the scavenge you want to stop:
-
-```bash:no-line-numbers
-curl -i -X DELETE http://localhost:2113/admin/scavenge/{scavengeId} -u "admin:changeit"
-```
-
-Or stop the currently running scavenge by specifying an ID of `current`:
-
-```bash:no-line-numbers
-curl -i -X DELETE http://localhost:2113/admin/scavenge/current -u "admin:changeit"
-```
-
-A 200 response is returned after the scavenge has stopped.
-
-You can also stop scavenges from the _Admin_ page of the Admin UI.
-
-::: tip
-A scavenge can be stopped at any time. The next time a scavenge is started, it will resume from the place the previous scavenge stopped.
-:::
-
-### Viewing progress
-
-The logs contain detailed information about the progress of the scavenge.
-
-The current state of the scavenge can also be tracked in the [metrics](diagnostics/metrics.md).
-
-The [execution phase](#execution-phase) of the scavenge emits events into streams.
-Each scavenge operation will generate a new stream and the stream will contain events related to that
-operation.
-Refer to the `$scavenges` [stream documentation](streams.md#scavenges) to learn how you can use it to observe
-the scavenging operation progress and status.
-
-## Scavenging best practices
-
-### Backups
-
-Do not take [file-copy](#types-of-backups) backups while scavenge is running. Stop the scavenge and resume it after the backup.
-
-[Disk snapshot](#types-of-backups) backups can be taken while scavenge is running.
-
-### How often to scavenge
-
-This depends on:
-
-- How often you delete streams.
-- How you set `$maxAge`, `$maxCount` or `$tb` metadata on your streams.
-- How important freeing the disk space is to you.
-- Your requirements around GDPR.
-
-You can tell from the scavenge output in the logs and streams how much data it is removing. This can help guide how frequently to scavenge.
-
-You can set up a scheduled task, for example using cron on Linux or [Windows Task Scheduler](https://learn.microsoft.com/en-us/windows/win32/taskschd/task-scheduler-start-page), to trigger a scavenge as often as you need.
-
-### Spreading the load
-
-Scavenging does place extra load on the server, especially in terms of disk IO. If this is a concern, consider spreading the load with the following:
-
-- Run scavenge on one node at a time.
-- Run scavenge on the Follower nodes to avoid adding load on the Leader. Then resign the Leader node and perform scavenging on that node.
-- Stop the scavenge during peak times and resume it afterwards.
-- Use the [throttle](#throttle-percent) and [threshold](#threshold) options.
-
-## Scavenging algorithm
-
-Central to the scavenging process is the concept of _scavenge points_. Physically, these are log records in the transaction log, each containing the following information:
-
-- the position in the log that the scavenge will run up to
-- a number unique to the scavenge point (counting from 0)
-- the time (`EffectiveNow`) used to determine whether the `maxAge` of an event has been exceeded
-- the threshold that a chunk's weight must reach to be executed
-
-Any run of the scavenge process is associated with a single scavenge point, and it scavenges the log up to that point.
-Log records after that scavenge point do not exist as far as that scavenge is concerned.
-
-In this way, a scavenge can be run on the first node, creating a scavenge point. Then it can be run (potentially later) on other nodes, to scavenge up to the same point, producing the same effect on the log.
-
-The scavenging algorithm itself consists of several phases:
-
-### Beginning
-
-When a scavenge is started, it first checks to see if a previous scavenge was stopped. If so, it resumes from where the previous scavenge stopped. Otherwise it begins a fresh scavenge.
-
-When beginning a fresh scavenge, it checks to see if a scavenge point already exists that has not been reached by previous scavenges. If so, it begins scavenging up to that point. Otherwise, it writes a new scavenge point to the log (which is replicated to the other nodes) and then begins a scavenge up to there. Writing a new scavenge point also causes the active chunk to be completed so that it can be scavenged.
-
-### Accumulation phase
-
-During the accumulation phase, the scavenging process reads through the chunks that have been added since the previous scavenge, up to the current scavenge point.
-It finds necessary information (such as tombstones and metadata records) and stores it in the scavenge database.
-
-In this way, any particular chunk is only accumulated once, regardless of how many times scavenge is run.
-
-::: tip
-The first time the scavenge is run it needs to accumulate all the chunks. Typically, this makes the first scavenge take longer than subsequent scavenges.
-:::
-
-### Calculation phase
-
-During the calculation phase, the scavenging process calculates which events can be discarded and which chunks they are located in for each stream that it accumulated tombstones or metadata for. It assigns weight to those chunks.
-
-### Execution phase
-
-The execution phase uses the data from the calculation phase to remove events from the chunks and indexes. Small chunks are then merged together.
-
-Only chunks whose weight meets the threshold will be executed.
-
-### Cleaning phase
-
-This final phase removes data from the scavenge database that is no longer needed.
-
-## Starting a scavenge
-
-When starting a scavenge with an HTTP POST request, the following options are available.
-
-### Threads
-
-Specify the number of threads to use for running the scavenging process. The default value is 1.
-
-Example:
-
-```bash:no-line-numbers
-curl -i -X POST http://127.0.0.1:2113/admin/scavenge?threads=2 -u "admin:changeit"
-```
-
-### Threshold
-
-By default, all chunks that have events to be removed are scavenged.
-
-Setting this option allows you to scavenge only the chunks that have a sufficiently large number of events expected to be removed. This allows scavenge to run more quickly by focusing on the chunks that would benefit from it most. The weights of the chunks that are being scavenged or skipped can be found in the log files by searching for the term "with weight". The weight of a chunk is approximately twice the number of records that can be removed from it.
-
-Possible values for the threshold:
-
-- `-1`: Scavenge all chunks, even if there are no event to remove. This should not be necessary in practice.
-- `0`: Default value. Scavenges every chunk that has events to remove.
-- `> 0`: The minimum weight a chunk must have in order to be scavenged.
-
-Example:
-
-```bash:no-line-numbers
-curl -i -X POST http://127.0.0.1:2113/admin/scavenge?threshold=2000 -u "admin:changeit"
-```
-
-::: tip
-Setting a positive threshold means that not all deleted and expired events will be removed. This may be important to consider with respect to GDPR.
-:::
-
-### Throttle percent
-
-The scavenging process can be time-consuming and resource-intensive. You can control the speed and resource usage of the scavenge process using the `throttlePercent` option. When set to 100 (default value), the scavenge process runs at full speed. Setting it to 50 makes the process take twice as long by pausing regularly.
-
-A scavenge can be stopped and restarted with a different `throttlePercent`.
-
-For `throttlePercent` values:
-
-- Throttle percent must be between 1 and 100.
-
-- Throttle percent must be 100 for a multi-threaded scavenge.
-
-Example:
-
-```bash:no-line-numbers
-curl -i -X POST http://127.0.0.1:2113/admin/scavenge?throttlePercent=50 -u "admin:changeit"
-```
-
-### Sync Only
-
-The `syncOnly` option is a boolean value and is false by default. When true, it prevents the creation of a new scavenge point and will only run the scavenge if there is an existing scavenge point that has not yet been reached in a previous scavenged. After running a scavenge on one node, this flag can be used to ensure that a subsequent node scavenges to that same point.
-
-Example:
-
-```bash:no-line-numbers
-curl -i -X POST http://127.0.0.1:2113/admin/scavenge?syncOnly=true -u "admin:changeit"
-```
-
-### Start From Chunk
-
-This option is deprecated. It is ignored and will be removed.
-
-## Scavenging database options
-
-Below you can find some options that change the way how scavenging works on the server node.
-
-### Disable chunk merging
-
-Scavenged chunks may be small enough to be merged into a single physical chunk file of approximately 256 MB. This behaviour can be disabled with this option.
-
-| Format               | Syntax                                |
-| :------------------- | :------------------------------------ |
-| Command line         | `--disable-scavenge-merging`          |
-| YAML                 | `DisableScavengeMerging`              |
-| Environment variable | `EVENTSTORE_DISABLE_SCAVENGE_MERGING` |
-
-**Default**: `false`, small scavenged chunks are merged together.
-
-### Scavenge history
-
-Each scavenge operation gets an ID and creates a stream. You might want to look at these streams to see the
-scavenge history, how much time each operation took, and how much disk space was reclaimed. However, you
-might not want to keep this history forever. Use the following option to limit how long the scavenge history
-stays in the database:
-
-| Format               | Syntax                                |
-| :------------------- | :------------------------------------ |
-| Command line         | `--scavenge-history-max-age`          |
-| YAML                 | `ScavengeHistoryMaxAge`               |
-| Environment variable | `EVENTSTORE_SCAVENGE_HISTORY_MAX_AGE` |
-
-**Default**: `30` (days)
-
-### Always keep scavenged (_Deprecated_)
-
-This option ensures that the newer chunk from a scavenge operation is always kept.
-
-| Format               | Syntax                             |
-| :------------------- | :--------------------------------- |
-| Command line         | `--always-keep-scavenged`          |
-| YAML                 | `AlwaysKeepScavenged`              |
-| Environment variable | `EVENTSTORE_ALWAYS_KEEP_SCAVENGED` |
-
-### Scavenge backend page size
-
-Specify the page size of the scavenge database. The default value is 16 KiB.
-
-| Format               | Syntax                                  |
-| :------------------- | :-------------------------------------- |
-| Command line         | `--scavenge-backend-page-size`          |
-| YAML                 | `ScavengeBackendPageSize`               |
-| Environment variable | `EVENTSTORE_SCAVENGE_BACKEND_PAGE_SIZE` |
-
-**Default**: `16` (KiB)
-
-### Scavenge backend cache size
-
-Specify the amount of memory, in bytes, to use for backend caching during scavenging. The default value is 64 MiB.
-
-| Format               | Syntax                                   |
-| :------------------- | :--------------------------------------- |
-| Command line         | `--scavenge-backend-cache-size`          |
-| YAML                 | `ScavengeBackendCacheSize`               |
-| Environment variable | `EVENTSTORE_SCAVENGE_BACKEND_CACHE_SIZE` |
-
-### Scavenge hash users cache capacity
-
-Specify the number of stream hashes to remember when checking for collisions.
-If the accumulation phase is reporting a lot of cache misses, it may benefit from increasing this number.
-
-The default value is 100000.
-
-| Format               | Syntax                                          |
-| :------------------- | :---------------------------------------------- |
-| Command line         | `--scavenge-hash-users-cache-capacity`          |
-| YAML                 | `ScavengeHashUsersCacheCapacity`                |
-| Environment variable | `EVENTSTORE_SCAVENGE_HASH_USERS_CACHE_CAPACITY` |
-
-## Redaction <Badge text="Commercial" type="warning" vertical="middle"/>
-
-In EventStoreDB, events are immutable and cannot be changed after they are written. Usually, when you have an event with data that needs to be deleted you should take the following steps:
-
-- Rewrite the stream to a new stream without the data to be removed.
-- Delete the old stream.
-- Run a scavenge to remove the data from disk on each node in turn.
-
-If this procedure is impractical for your use case, then you can use the redaction tool (the "redactor") to blank out the data of specific events.
-
-::: warning
-Use the redactor as a last resort and only if you know what you're doing. Redacting events may lead to unintended consequences in your subscriptions and projections!
-:::
-
-### Prerequisites
-
-Using redaction has the following prerequisites:
-
-- A commercial license.
-- EventStoreDB version 23.6.0 or above. If running on Windows, Windows Server 2019 or above is required.
-- Server configuration option: `EnableUnixSocket: True`.
-- The redactor tool (see steps below on how to get it).
-
-### Getting the redactor
-
-Redaction requires a commercial license. Due to its sensitive nature, the tool is available only upon request. Please [contact us here](https://www.eventstore.com/contact) if you do not have commercial support, or reach out to our support team if you do.
-
-### Running the redactor
-
-The binary needs to be extracted and run locally on an EventStoreDB node. Similar to scavenging, redaction affects only the node where it's running. Thus, it must be run once on each node of the cluster.
-
-The redactor takes two mandatory parameters as input:
-
-| Parameter  | Description                                                                             |
-| :--------- | --------------------------------------------------------------------------------------- |
-| `--db`     | The path to the database directory containing the chunk files.                          |
-| `--events` | A comma-separated list of events to be redacted in the format: `eventNumber@streamName` |
-
-Specify `--help` to see the full list of options.
-
-The redactor will blank out the data section of the specified events with one bits (0xFF bytes) keeping the data size exactly the same as it was before. It will also set a flag (`IsRedacted`) on the event's record to indicate that the event has been redacted. All other properties of the event such as the event type, event metadata, and timestamp will remain unchanged.
-
-![Redactor run](./images/redaction-run.png)
-
-If you read the data of a redacted event from an external client, you should see data composed of only 0xFF bytes. The UI will also label redacted events.
-
-![Redacted event in UI](./images/redaction-ui.png)
-
-::: tip
-The redactor is not an offline tool. The EventStoreDB server must be running, as the redactor needs to communicate with it to obtain information about the events to be redacted and replace the chunk files with the redacted ones.
-:::
-
-### How the redactor works
-
-The redactor follows these steps:
-
-1. It establishes a connection to the database via a unix domain socket located in the database directory.
-
-2. It then fetches information about the events to be redacted from the server via an RPC call. This information includes the chunk file the event is in and the event's position in the chunk.
-
-3. A list is built of chunk files containing events to be redacted.
-
-4. For each chunk in the list:
-   - It is copied to a file with a .tmp extension in the database directory.
-   - The requested event(s) are redacted in the .tmp chunk file.
-   - The .tmp chunk is atomically switched into the database via an RPC call on the server.
-
-## Backup and restore
-
-Backing up an EventStoreDB database is straightforward but relies on carrying out the steps below in the
-correct order.
-
-### Types of backups
-
-There are two main ways to perform backups:
-
-- **Disk snapshots**: If your infrastructure is virtualized, [disk snapshots](#disks-snapshot) are an option and the easiest way to perform backup and
-  restore operations.
-
-- **Regular file copy**:
-
-  - [Simple full backup](#simple-full-backup--restore): when the DB size is small and the frequency of appends is low.
-  - [Differential backup](#differential-backup--restore): when the DB size is large or the system has a high append frequency.
-
-### Backup and restore best practices
-
-- Backing up one node is recommended. However, ensure that the node you choose to back up is **up to date** and **connected to the cluster**.
-
-- For additional safety, you can also back up at least a quorum of nodes.
-
-- Do not attempt to back up a node using file copy at the same time a scavenge operation is running.
-
-- [Read-only replica](./cluster.md#read-only-replica) nodes may be used as a backup source.
-
-- When either running a backup or restoring, do not mix backup files of different nodes.
-
-- A restore must happen on a _stopped_ node.
-
-- The restore process can happen on any node of a cluster.
-
-- You can restore any number of nodes in a cluster from the same backup source. It means, for example, in the
-  event of a non-recoverable three node cluster, that the same backup source can be used to restore a completely new
-  three node cluster.
-
-- When you restore a node that was the backup source, perform a full backup after recovery.
-
-### Database files information
-
-By default, there are two directories containing data that needs to be included in the backup:
-
-- `db/ ` where the data is located
-- `index/ ` where the indexes are kept
-
-The exact name and location are dependent on your configuration.
-
-- `db/ ` contains:
-  - the chunks files named `chk-X.Y` where `X` is the chunk number and `Y` the version.
-  - the checkpoints files `*.chk` (`chaser.chk`, `epoch.chk`, `proposal.chk`, `truncate.chk`, `writer.chk`)
-- `index/ ` contains:
-  - the index map: `indexmap`
-  - the indexes: UUID named files , e.g `5a1a8395-94ee-40c1-bf93-aa757b5887f8`
-
-### Disks snapshot
-
-If the `db/ ` and `index/ ` directories are on the same volume, a snapshot of that volume is enough.
-
-However, if they are on different volumes, take first a snapshot of the volume containing the `index/ `
-directory and then a snapshot of the volume containing the `db/ ` directory.
-
-### Simple full backup & restore
-
-#### Backup
-
-1. Copy any index checkpoint files (`<index directory>/**/*.chk`) to your backup location.
-2. Copy the other index files to your backup location (the rest of `<index directory>`, excluding the checkpoints).
-3. Copy the database checkpoint files (`*.chk`) to your backup location.
-4. Copy the chunk files (`chunk-X.Y`) to your backup location.
-
-For example, with a database in `data` and index in `data/index`:
-
-```bash:no-line-numbers
-rsync -aIR data/./index/**/*.chk backup
-rsync -aI --exclude '*.chk' data/index backup
-rsync -aI data/*.chk backup
-rsync -a data/*.0* backup
-```
-
-#### Restore
-
-1. Ensure the EventStoreDB process is stopped. Restoring a database on running instance is not possible and,
-   in most cases, will lead to data corruption.
-2. Copy all files to the desired location.
-3. Create a copy of `chaser.chk` and call it `truncate.chk`. This effectively overwrites the
-   restored `truncate.chk`.
-
-### Differential backup & restore
-
-The following procedure is designed to minimize the backup storage space, and can be used to do a full and
-differential backup.
-
-#### Backup
-
-First backup the index:
-
-1. If there are no files in the index directory (apart from directories), go to step 7.
-2. Copy the `index/indexmap` file to the backup. If the source file does not exist, repeat until it does.
-3. Make a list `indexFiles` of all the `index/<GUID>` and `index/<GUID>.bloomfilter` files in the source.
-4. Copy the files listed in `indexFiles` to the backup, skipping file names already in the backup.
-5. Compare the contents of the `indexmap` file in the source and the backup. If they are different (i.e. the
-   `indexmap` file has changed since step 2 or no longer exists), go back to step 2.
-6. Remove `index/<GUID>` and `index/<GUID>.bloomfilter` files from the backup that are not listed
-   in `indexFiles`.
-7. Copy the `index/stream-existence/streamExistenceFilter.chk` file (if present) to the backup.
-8. Copy the `index/stream-existence/streamExistenceFilter.dat` file (if present) to the backup.
-9. Copy the `index/scavenging/scavenging.db` file (if present) to the backup. It should be the only file in the `scavenging` directory.
-
-Then backup the log:
-
-1. Rename the last chunk in the backup to have a `.old` suffix. e.g. rename `chunk-000123.000000`
-   to `chunk-000123.000000.old`.
-2. Copy `chaser.chk` to the backup.
-3. Copy `epoch.chk` to the backup.
-4. Copy `writer.chk` to the backup.
-5. Copy `proposal.chk` to the backup.
-6. Make a list `chunkFiles` of all chunk files (`chunk-X.Y`) in the source.
-7. Copy the files listed in `chunkFiles` to the backup, skipping file names already in the backup. All files
-   should copy successfully. None should have been deleted since scavenge is not running.
-8. Remove any chunks from the backup that are not in the `chunksFiles` list. This will include the `.old`
-   file from step 1.
-
-#### Restore
-
-1. Ensure the Event Store DB process is stopped. Restoring a database on running instance is not possible and,
-   in most cases, will lead to data corruption.
-2. Copy all files to the desired location.
-3. Create a copy of `chaser.chk` and call it `truncate.chk`.
-
-### Other options for data recovery
-
-#### Additional node (aka Hot Backup)
-
-Increase the cluster size from 3 to 5 to keep further copies of data. This increase in the cluster size will
-slow the cluster's writing performance as two follower nodes will need to confirm each write.
-
-Alternatively, you can use a [read-only replica](./cluster.md#read-only-replica) node, which is not a part of
-the cluster. In this case, the write performance will be minimally impacted.
-
-#### Alternative storage
-
-Set up a durable subscription that writes all events to another storage mechanism such as a key/value or
-column store. These methods would require a manual set up for restoring a cluster node or group.
-
-#### Backup cluster
-
-Use a second EventStoreDB cluster as a backup. Such a strategy is known as a primary/secondary back up scheme.
-
-The primary cluster asynchronously pushes data to the second cluster using a durable subscription. The second
-cluster is available in case of a disaster on the primary cluster.
-
-If you are using this strategy, we recommend you only support manual fail over from primary to secondary as
-automated strategies risk causing a [split brain](http://en.wikipedia.org/wiki/Split-brain_%28computing%29)
-problem.
-
-## Certificate update upon expiry
-
-In EventStoreDB, the certificates require updating when they have expired or are going to expire soon. Follow the steps below to perform a rolling certificate update.
-
-### Step 1: Generate new certificates
-
-The new certificates can be created in the same manner as you generated the existing certificates.
-You can use the EventStore [es-gencert-cli](https://github.com/EventStore/es-gencert-cli) tool to generate the CA and node certificates.
-You can also follow the [Configurator](https://configurator.eventstore.com/) to create commands for generating the certificates based on your cluster's configuration.
-
-::: tip
-As of version 23.10.0, it is possible to do a rolling update with new certificates having a Common Name (CN) that's different from the original certificates. If `CertificateReservedNodeCommonName` was set in your configuration, any changes to its value will be taken into consideration during a config reload.
-:::
-
-### Step 2: Replace the certificates
-
-The next step is to replace the outdated certificates with the newly generated certificates.
-
-If you are using symlinks, then you can update the symlink to point it to the new certificates.
-
-#### Linux OS
-
-We normally have a symlink that points to the existing certificates:
-
-ca -> `/etc/eventstore/certs/ca`
-node.crt -> `/etc/eventstore/certs/node.crt`
-node.key -> `/etc/eventstore/certs/node.key`
-
-Update the symlink so that the link points to the new certificates:
-
-ca -> `/etc/eventstore/newCerts/ca`
-node.crt -> `/etc/eventstore/newCerts/node.crt`
-node.key -> `/etc/eventstore/newCerts/node.key`
-
-In the above example we have the links in a folder at path `/home/ubuntu/links`.
-
-### Step 3: Reload the configuration
-
-You can reload the certificate configuration without restarting the node by issuing the following curl command.
-
-```bash:no-line-numbers
-curl -k -X POST --basic https://{nodeAddress}:{HttpPort}/admin/reloadconfig -u {username}:{Password}
-```
-
-For Example:
-
-```bash:no-line-numbers
-curl -k -X POST --basic https://127.0.0.1:2113/admin/reloadconfig -u admin:changeit
-```
-
-#### Linux OS
-
-Linux users can also send the SIGHUP signal to the EventStoreDB to reload the certificates.
-
-For Example:
-
-```
-kill -s SIGHUP 38956
-```
-
-Here "38956" is the Process ID (PID) of EventStoreDB on our local machine. To find the PID, use the following command in the Linux terminal.
-
-```
-pidof eventstored
-```
-
-Once the configuration has been reloaded successfully, the server logs will look something like:
-
-```
-[108277,30,14:46:07.453,INF] Reloading the node's configuration since a request has been received on /admin/reloadconfig.
-[108277,29,14:46:07.457,INF] Loading the node's certificate(s) from file: "/home/ubuntu/links/node.crt"
-[108277,29,14:46:07.488,INF] Loading the node's certificate. Subject: "CN=eventstoredb-node", Previous thumbprint: "05526714107700C519E24794E8964A3B30EF9BD0", New thumbprint: "BE6D5CD681D7B9281D60A5969B5A7E31AF775E9F"
-[108277,29,14:46:07.488,INF] Loading intermediate certificate. Subject: "CN=EventStoreDB Intermediate CA 78ae8d5a159b247568039cf64f4b04ad, O=Event Store Ltd, C=UK", Thumbprint: "ED4AA0C5ED4AD120DDEE2FA8B3B0CCC5A30B81E3"
-[108277,29,14:46:07.489,INF] Loading trusted root certificates.
-[108277,29,14:46:07.490,INF] Loading trusted root certificate file: "/home/ubuntu/links/ca/ca.crt"
-[108277,29,14:46:07.491,INF] Loading trusted root certificate. Subject: "CN=EventStoreDB CA c39fece76b4efcb65846145c942c037c, O=Event Store Ltd, C=UK", Thumbprint: "5F020804E8D7C419F9FC69ED3B4BC72DD79A5996"
-[108277,29,14:46:07.493,INF] Certificate chain verification successful.
-[108277,29,14:46:07.493,INF] All certificates successfully loaded.
-[108277,29,14:46:07.494,INF] The node's configuration was successfully reloaded
-```
-
-::: tip
-If there are any errors during loading certificates, the new configuration changes will not take effect.
-:::
-
-The server logs the following error when the node certificate is not available at the path specified in the EventStore configuration file.
-
-```
-[108277,30,14:49:47.481,INF] Reloading the node's configuration since a request has been received on /admin/reloadconfig.
-[108277,29,14:49:47.488,INF] Loading the node's certificate(s) from file: "/home/ubuntu/links/node.crt"
-[108277,29,14:49:47.489,ERR] An error has occurred while reloading the configuration
-System.IO.FileNotFoundException: Could not find file '/home/ubuntu/links/node.key'.
-```
-
-### Step 4: Update the other nodes
-
-Now update the certificates on the other nodes.
-
-### Step 5: Monitor the cluster
-
-The connection between nodes in EventStoreDB reset every 10 minutes so the new configuration won’t take immediate effect. Use this time to update the certificates on all of the nodes. It is advisable to monitor the cluster after this timeframe to make sure everything is working as expected.
-The EventStoreDB will log certificate errors if the certificates are not reloaded on all of the nodes before the connection resets.
-
-```
-[108277,29,14:59:47.489,ERR] eventstoredb-node : A certificate chain could not be built to a trusted root authority.
-[108277,29,14:59:47.489,ERR] Client certificate validation error: "The certificate (CN=eventstoredb-node) provided by the client failed validation with the following error(s): RemoteCertificateChainErrors (PartialChain)"
-```
-
-The above error indicates that there is some issue with the certificate because the reload process is not yet completed on all the nodes. The error can be safely ignored during the duration of the reloading certificate process, but the affected nodes will not be able to communicate with each other until the certificates have been updated on all the nodes.
-
-::: warning
-It can take up to 10 minutes for certificate changes to take effect. Certificates on all nodes should be updated within this window to avoid connection issues.
-:::
diff --git a/docs/package.json b/docs/package.json
index 12a82290f3b..fc7a827342e 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,36 +1,54 @@
 {
-  "name": "esdb-docs",
+  "name": "kurrentdb-docs",
   "version": "1.0.0",
   "private": true,
-  "author": "Event Store Ltd",
+  "type": "module",
+  "author": "Kurrent Inc",
   "devDependencies": {
-    "@types/markdown-it": "^14.1.2",
+    "@babel/cli": "^7.24.8",
+    "@babel/core": "^7.24.9",
+    "@babel/preset-env": "^7.24.8",
+    "@babel/preset-typescript": "^7.24.7",
+    "@types/fs-extra": "^11.0.4",
+    "@types/markdown-it": "^14.1.1",
+    "degit": "2.8.4",
+    "del": "5.1.0",
+    "dotenv": "10.0.0",
     "eslint": "^8.57.0",
     "eslint-config-vuepress": "^4.10.1",
     "eslint-config-vuepress-typescript": "^4.10.1",
+    "fs-extra": "^11.2.0",
     "markdown-it": "^14.1.0",
+    "prettier": "2.3.2",
+    "sass": "^1.84.0",
+    "shx": "0.3.3",
+    "stylus": "^0.56.0",
     "tsconfig-vuepress": "^4.5.0",
-    "typescript": "^5.5.3"
+    "typescript": "^5.5.3",
+    "vite-plugin-vue-devtools": "^7.3.6",
+    "@vuepress/plugin-search": "^2.0.0-rc.74",
+    "@mdit/plugin-dl": "^0.13.0"
   },
   "dependencies": {
-    "@vuepress/bundler-vite": "2.0.0-rc.14",
-    "@vuepress/plugin-container": "^2.0.0-rc.28",
-    "@vuepress/plugin-docsearch": "2.0.0-rc.37",
-    "@vuepress/plugin-google-analytics": "2.0.0-rc.37",
-    "@vuepress/plugin-register-components": "2.0.0-rc.37",
-    "@vuepress/theme-default": "2.0.0-rc.37",
-    "@vuepress/utils": "^2.0.0-rc.14",
-    "sass-loader": "^14.2.1",
+    "@rollup/plugin-alias": "^3.1.9",
+    "@vuelidate/core": "^2.0.3",
+    "@vuepress/bundler-vite": "2.0.0-rc.19",
+    "vuepress-theme-hope": "^2.0.0-rc.71",
+    "sass-loader": "^15.0.0",
     "vue": "^3.4.30",
-    "vuepress": "2.0.0-rc.14",
-    "vuepress-plugin-md-enhance": "^2.0.0-rc.50"
+    "vue-router": "^4.4.0",
+    "vuepress": "2.0.0-rc.19",
+    "iconify-icon": "^2.1.0",
+    "mermaid": "^11.3.0"
   },
   "scripts": {
     "preinstall": "npx only-allow pnpm",
-    "dev": "vuepress dev",
-    "build": "vuepress build"
+    "dev": "vuepress-vite dev .",
+    "build": "vuepress-vite build .",
+    "update-package": "pnpm dlx vp-update"
   },
   "engines": {
     "node": ">=18.19.0"
-  }
+  },
+  "packageManager": "pnpm@9.10.0+sha512.73a29afa36a0d092ece5271de5177ecbf8318d454ecd701343131b8ebc0c1a91c487da46ab77c8e596d6acf1461e3594ced4becedf8921b074fbd8653ed7051c"
 }
diff --git a/docs/persistent-subscriptions.md b/docs/persistent-subscriptions.md
deleted file mode 100644
index a627e67f8c2..00000000000
--- a/docs/persistent-subscriptions.md
+++ /dev/null
@@ -1,107 +0,0 @@
----
-title: Persistent subscriptions
----
-
-## Persistent subscription
-
-A common operation is to subscribe to a stream and receive notifications for changes. As new events arrive, you continue following them. 
-
-You can only subscribe to one stream or the `$all` stream. You can use server-side projections for linking events to new aggregated streams. System projections create pre-defined streams that aggregate events by type or by category and are available out-of-the box. Learn more about system and user-defined projections [here](projections.md).
-
-Persistent subscriptions run on the Leader node and are not dropped when the connection is closed. Moreover, this subscription type supports the "[competing consumers](https://www.enterpriseintegrationpatterns.com/patterns/messaging/CompetingConsumers.html)" messaging pattern and are useful when you need to distribute messages to many workers. EventStoreDB saves the subscription state server-side and allows for at-least-once delivery guarantees across multiple consumers on the same stream. It is possible to have many groups of consumers compete on the same stream, with each group getting an at-least-once guarantee.
-
-::: tip
-The Administration UI includes a _Persistent Subscriptions_ section where a user can create, update, delete and view subscriptions and their statuses. However, persistent subscriptions to the $all stream have to be created through a gRPC client.
-:::
-
-## Concepts
-
-Persistent subscriptions serve the same purpose as catch-up or volatile subscriptions, but in a different way. All subscriptions aim to deliver events in real-time to connected subscribers. But, unlike other subscription types, persistent subscriptions are maintained by the server. In a way, catch-up and persistent subscriptions are similar. Both have a last known position from where the subscription starts getting events. However, catch-up subscriptions must take care about keeping the last known position on the subscriber side and persistent subscriptions keep the position on the server.
-
-Since it is the server who decides from where the subscription should start receiving events and knows where events are delivered, subscribers that use a persistent subscription can be load-balanced and process events in parallel. In contrast, catch-up subscriptions, which are client-driven, always receive and process events sequentially and can only be load-balanced on the client side. Therefore, persistent subscriptions allow using the competing consumers pattern that is common in the world of message brokers.
-
-In order for the server to load-balance subscribers, it uses the concept of consumer groups. All clients that belong to a single consumer group will get a portion of events, and that's how load balancing works inside a group. It is possible to create multiple consumer groups for the same stream and they will be completely independent of each other, receiving and processing events at their own pace and having their own last known position handled by the server.
-
-![Consumer groups](./images/consumer-groups.jpg)
-
-::: warning
-Just as in the world of message brokers, processing events in a group of consumers running in parallel processes will most likely get events out of order within a certain window. For example, if a consumer group has ten consumers, ten messages will be distributed among the available consumers, based on the [strategy](#consumer-strategies) of the group. Even though some strategies make an attempt to consistently deliver ordered events to a single consumer, it's done on the best effort basis and there is no guarantee of events coming in order with any strategy.
-:::
-
-## Acknowledging messages
-
-Clients must acknowledge (or not acknowledge) messages as they are handled. If messages aren't acknowledged before they time out on the server, then the server will retry the messages. If a message has been retried more than the `maxRetryCount` setting for the persistent subscription, then the message will be parked and processing will continue.
-
-## Parked messages
-
-Messages that have been retried too will often be parked in the persistent subscription's parked message stream. This stream is named `$persistentsubscription-{groupname}::{streamname}-parked`. You can easily see the number of parked events in the persistent subscription statistics or browse the parked messages in the admin UI.
-
-If you want to retry the parked messages, you can `Replay` the parked messages for that subscription. This will push the parked messages to subscribers before any new events on the subscription.
-
-You can also specify the number of parked messages to replay over the HTTP endpoint. This can be done by providing the `stopAt` parameter when requesting to replay messages through the HTTP url. For example:
-
-```bash:no-line-numbers
-curl -i -X POST -d {} https://localhost:2113/subscriptions/{stream}/{groupnanme}/replayParked?stopAt={numberofevents} -u "admin:changeit"
-```
-
-If you don't want to replay any of the parked messages for a subscription and want to clear them out, you can do this by deleting the parked stream like a normal stream.
-
-## Checkpointing
-
-Once a persistent subscription has handled enough events, it will write a checkpoint. If the subscription is restarted, for example due to a Leader change, then the persistent subscription will continue processing from the last checkpoint. This means that some events my be received multiple times by consumers.
-
-If a persistent subscription has a filter, then the persistent subscription will checkpoint when enough events are either handled or skipped by the filter.
-
-::: note
-Persistent Subscriptions won't write a new checkpoint if there's one already in the process of being written. This means that even if you configure the subscription with a max checkpoint count of 1, it's not guaranteed to write a checkpoint after every event.
-:::
-
-## Consumer strategies
-
-When creating a persistent subscription, you can choose between a number of consumer strategies. These strategies determine how the server pushes events to subscribed clients.
-
-### RoundRobin (default)
-
-Distributes events to all clients evenly. If the client `bufferSize` is reached, the client is ignored until events are acknowledged/not acknowledged.
-
-This strategy provides equal load balancing between all consumers in the group.
-
-### DispatchToSingle
-
-Distributes events to a single client until the `bufferSize` is reached. After that, the next client is selected in a round-robin style, and the process is repeated.
-
-This option can be seen as a fall-back scenario for high availability, when a single consumer processes all the events until it reaches its maximum capacity. When that happens, another consumer takes the load to free up the main consumer resources.
-
-### Pinned
-
-For use with an indexing projection such as the [system](projections.md#by-category) `$by_category` projection.
-
-EventStoreDB inspects the event for its source stream id, hashing the id to one of 1024 buckets assigned to individual clients. When a client disconnects its buckets are assigned to other clients. When a client connects, it is assigned some existing buckets. This naively attempts to maintain a balanced workload.
-
-The main aim of this strategy is to decrease the likelihood of concurrency and ordering issues while maintaining load balancing. This is not a guarantee, and you should handle the usual ordering and concurrency issues.
-
-::: warning
-This strategy behaves differently depending on whether `ResolveLinkTos` is enabled. If you want to use this strategy with an indexing projection such as `$by_category` then you should have `ResolveLinkTos` enabled.
-:::
-
-### PinnedByCorrelation
-
-This is similar to the `Pinned` strategy, but instead of using the source stream id to bucket the messages, it distributes the events based on the event's correlationId.
-
-## Considerations
-
-Persistent subscriptions are a powerful tool, but they are not always appropriate for every situation. Here are some things to consider before deciding whether you should use them:
-
-### Persistent subscriptions run on leader
-
-Persistent subscriptions only run on the Leader node.
-This means that more pressure will be put on the Leader node, and there is no option to balance the load to a follower like with a Catch-up subscription.
-
-It also means that the subscriptions will reload from the last checkpoint whenever the Leader changes.
-
-### Ordering is not guaranteed
-
-Ordering is not guaranteed with persistent subscriptions due to the possibility of messages being retried, or consumers handling events before others.
-While some strategies do attempt to mitigate this, it is still on a best-effort basis and messages may still arrive to consumers out of order.
-
-If you need an ordering guarantee then you should use a Catch-up subscription instead and handle the checkpointing in your client code.
diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml
index c7296a5b404..755a706cd96 100644
--- a/docs/pnpm-lock.yaml
+++ b/docs/pnpm-lock.yaml
@@ -8,43 +8,70 @@ importers:
 
   .:
     dependencies:
+      '@rollup/plugin-alias':
+        specifier: ^3.1.9
+        version: 3.1.9(rollup@4.34.6)
+      '@vuelidate/core':
+        specifier: ^2.0.3
+        version: 2.0.3(vue@3.4.31(typescript@5.5.3))
       '@vuepress/bundler-vite':
-        specifier: 2.0.0-rc.14
-        version: 2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3)
-      '@vuepress/plugin-container':
-        specifier: ^2.0.0-rc.28
-        version: 2.0.0-rc.28(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vuepress/plugin-docsearch':
-        specifier: 2.0.0-rc.37
-        version: 2.0.0-rc.37(@algolia/client-search@4.24.0)(search-insights@2.15.0)(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vuepress/plugin-google-analytics':
-        specifier: 2.0.0-rc.37
-        version: 2.0.0-rc.37(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vuepress/plugin-register-components':
-        specifier: 2.0.0-rc.37
-        version: 2.0.0-rc.37(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vuepress/theme-default':
-        specifier: 2.0.0-rc.37
-        version: 2.0.0-rc.37(sass-loader@14.2.1(sass@1.77.8))(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vuepress/utils':
-        specifier: ^2.0.0-rc.14
-        version: 2.0.0-rc.14
+        specifier: 2.0.0-rc.19
+        version: 2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3)
+      iconify-icon:
+        specifier: ^2.1.0
+        version: 2.1.0
+      mermaid:
+        specifier: ^11.3.0
+        version: 11.3.0
       sass-loader:
-        specifier: ^14.2.1
-        version: 14.2.1(sass@1.77.8)
+        specifier: ^15.0.0
+        version: 15.0.0(sass@1.84.0)
       vue:
         specifier: ^3.4.30
         version: 3.4.31(typescript@5.5.3)
+      vue-router:
+        specifier: ^4.4.0
+        version: 4.4.0(vue@3.4.31(typescript@5.5.3))
       vuepress:
-        specifier: 2.0.0-rc.14
-        version: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
-      vuepress-plugin-md-enhance:
-        specifier: ^2.0.0-rc.50
-        version: 2.0.0-rc.50(markdown-it@14.1.0)(sass-loader@14.2.1(sass@1.77.8))(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+        specifier: 2.0.0-rc.19
+        version: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      vuepress-theme-hope:
+        specifier: ^2.0.0-rc.71
+        version: 2.0.0-rc.71(@vuepress/plugin-search@2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))))(katex@0.16.11)(markdown-it@14.1.0)(mermaid@11.3.0)(sass-loader@15.0.0(sass@1.84.0))(sass@1.84.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
     devDependencies:
+      '@babel/cli':
+        specifier: ^7.24.8
+        version: 7.24.8(@babel/core@7.25.2)
+      '@babel/core':
+        specifier: ^7.24.9
+        version: 7.25.2
+      '@babel/preset-env':
+        specifier: ^7.24.8
+        version: 7.25.3(@babel/core@7.25.2)
+      '@babel/preset-typescript':
+        specifier: ^7.24.7
+        version: 7.24.7(@babel/core@7.25.2)
+      '@mdit/plugin-dl':
+        specifier: ^0.13.0
+        version: 0.13.0(markdown-it@14.1.0)
+      '@types/fs-extra':
+        specifier: ^11.0.4
+        version: 11.0.4
       '@types/markdown-it':
-        specifier: ^14.1.2
+        specifier: ^14.1.1
         version: 14.1.2
+      '@vuepress/plugin-search':
+        specifier: ^2.0.0-rc.74
+        version: 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      degit:
+        specifier: 2.8.4
+        version: 2.8.4
+      del:
+        specifier: 5.1.0
+        version: 5.1.0
+      dotenv:
+        specifier: 10.0.0
+        version: 10.0.0
       eslint:
         specifier: ^8.57.0
         version: 8.57.0
@@ -54,82 +81,143 @@ importers:
       eslint-config-vuepress-typescript:
         specifier: ^4.10.1
         version: 4.10.1(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.16.0(eslint@8.57.0)(typescript@5.5.3))(eslint@8.57.0))(eslint-plugin-n@16.6.2(eslint@8.57.0))(eslint-plugin-promise@6.4.0(eslint@8.57.0))(eslint@8.57.0)(typescript@5.5.3)
+      fs-extra:
+        specifier: ^11.2.0
+        version: 11.2.0
       markdown-it:
         specifier: ^14.1.0
         version: 14.1.0
+      prettier:
+        specifier: 2.3.2
+        version: 2.3.2
+      sass:
+        specifier: ^1.84.0
+        version: 1.84.0
+      shx:
+        specifier: 0.3.3
+        version: 0.3.3
+      stylus:
+        specifier: ^0.56.0
+        version: 0.56.0
       tsconfig-vuepress:
         specifier: ^4.5.0
         version: 4.5.0
       typescript:
         specifier: ^5.5.3
         version: 5.5.3
+      vite-plugin-vue-devtools:
+        specifier: ^7.3.6
+        version: 7.3.8(rollup@4.34.6)(vite@6.0.11(sass@1.84.0)(stylus@0.56.0))(vue@3.4.31(typescript@5.5.3))
 
 packages:
 
-  '@algolia/autocomplete-core@1.9.3':
-    resolution: {integrity: sha512-009HdfugtGCdC4JdXUbVJClA0q0zh24yyePn+KUGk3rP7j8FEe/m5Yo/z65gn6nP/cM39PxpzqKrL7A6fP6PPw==}
+  '@ampproject/remapping@2.3.0':
+    resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==}
+    engines: {node: '>=6.0.0'}
 
-  '@algolia/autocomplete-plugin-algolia-insights@1.9.3':
-    resolution: {integrity: sha512-a/yTUkcO/Vyy+JffmAnTWbr4/90cLzw+CC3bRbhnULr/EM0fGNvM13oQQ14f2moLMcVDyAx/leczLlAOovhSZg==}
-    peerDependencies:
-      search-insights: '>= 1 < 3'
+  '@antfu/install-pkg@0.4.1':
+    resolution: {integrity: sha512-T7yB5QNG29afhWVkVq7XeIMBa5U/vs9mX69YqayXypPRmYzUmzwnYltplHmPtZ4HPCn+sQKeXW8I47wCbuBOjw==}
 
-  '@algolia/autocomplete-preset-algolia@1.9.3':
-    resolution: {integrity: sha512-d4qlt6YmrLMYy95n5TB52wtNDr6EgAIPH81dvvvW8UmuWRgxEtY0NJiPwl/h95JtG2vmRM804M0DSwMCNZlzRA==}
-    peerDependencies:
-      '@algolia/client-search': '>= 4.9.1 < 6'
-      algoliasearch: '>= 4.9.1 < 6'
+  '@antfu/utils@0.7.10':
+    resolution: {integrity: sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==}
 
-  '@algolia/autocomplete-shared@1.9.3':
-    resolution: {integrity: sha512-Wnm9E4Ye6Rl6sTTqjoymD+l8DjSTHsHboVRYrKgEt8Q7UHm9nYbqhN/i0fhUYA3OAEH7WA8x3jfpnmJm3rKvaQ==}
+  '@babel/cli@7.24.8':
+    resolution: {integrity: sha512-isdp+G6DpRyKc+3Gqxy2rjzgF7Zj9K0mzLNnxz+E/fgeag8qT3vVulX4gY9dGO1q0y+0lUv6V3a+uhUzMzrwXg==}
+    engines: {node: '>=6.9.0'}
+    hasBin: true
     peerDependencies:
-      '@algolia/client-search': '>= 4.9.1 < 6'
-      algoliasearch: '>= 4.9.1 < 6'
+      '@babel/core': ^7.0.0-0
+
+  '@babel/code-frame@7.24.7':
+    resolution: {integrity: sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/compat-data@7.25.2':
+    resolution: {integrity: sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/core@7.25.2':
+    resolution: {integrity: sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/generator@7.25.0':
+    resolution: {integrity: sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-annotate-as-pure@7.24.7':
+    resolution: {integrity: sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==}
+    engines: {node: '>=6.9.0'}
 
-  '@algolia/cache-browser-local-storage@4.24.0':
-    resolution: {integrity: sha512-t63W9BnoXVrGy9iYHBgObNXqYXM3tYXCjDSHeNwnsc324r4o5UiVKUiAB4THQ5z9U5hTj6qUvwg/Ez43ZD85ww==}
+  '@babel/helper-builder-binary-assignment-operator-visitor@7.24.7':
+    resolution: {integrity: sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==}
+    engines: {node: '>=6.9.0'}
 
-  '@algolia/cache-common@4.24.0':
-    resolution: {integrity: sha512-emi+v+DmVLpMGhp0V9q9h5CdkURsNmFC+cOS6uK9ndeJm9J4TiqSvPYVu+THUP8P/S08rxf5x2P+p3CfID0Y4g==}
+  '@babel/helper-compilation-targets@7.25.2':
+    resolution: {integrity: sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==}
+    engines: {node: '>=6.9.0'}
 
-  '@algolia/cache-in-memory@4.24.0':
-    resolution: {integrity: sha512-gDrt2so19jW26jY3/MkFg5mEypFIPbPoXsQGQWAi6TrCPsNOSEYepBMPlucqWigsmEy/prp5ug2jy/N3PVG/8w==}
+  '@babel/helper-create-class-features-plugin@7.25.0':
+    resolution: {integrity: sha512-GYM6BxeQsETc9mnct+nIIpf63SAyzvyYN7UB/IlTyd+MBg06afFGp0mIeUqGyWgS2mxad6vqbMrHVlaL3m70sQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
 
-  '@algolia/client-account@4.24.0':
-    resolution: {integrity: sha512-adcvyJ3KjPZFDybxlqnf+5KgxJtBjwTPTeyG2aOyoJvx0Y8dUQAEOEVOJ/GBxX0WWNbmaSrhDURMhc+QeevDsA==}
+  '@babel/helper-create-regexp-features-plugin@7.25.2':
+    resolution: {integrity: sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
 
-  '@algolia/client-analytics@4.24.0':
-    resolution: {integrity: sha512-y8jOZt1OjwWU4N2qr8G4AxXAzaa8DBvyHTWlHzX/7Me1LX8OayfgHexqrsL4vSBcoMmVw2XnVW9MhL+Y2ZDJXg==}
+  '@babel/helper-define-polyfill-provider@0.6.2':
+    resolution: {integrity: sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
 
-  '@algolia/client-common@4.24.0':
-    resolution: {integrity: sha512-bc2ROsNL6w6rqpl5jj/UywlIYC21TwSSoFHKl01lYirGMW+9Eek6r02Tocg4gZ8HAw3iBvu6XQiM3BEbmEMoiA==}
+  '@babel/helper-member-expression-to-functions@7.24.8':
+    resolution: {integrity: sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==}
+    engines: {node: '>=6.9.0'}
 
-  '@algolia/client-personalization@4.24.0':
-    resolution: {integrity: sha512-l5FRFm/yngztweU0HdUzz1rC4yoWCFo3IF+dVIVTfEPg906eZg5BOd1k0K6rZx5JzyyoP4LdmOikfkfGsKVE9w==}
+  '@babel/helper-module-imports@7.22.15':
+    resolution: {integrity: sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==}
+    engines: {node: '>=6.9.0'}
 
-  '@algolia/client-search@4.24.0':
-    resolution: {integrity: sha512-uRW6EpNapmLAD0mW47OXqTP8eiIx5F6qN9/x/7HHO6owL3N1IXqydGwW5nhDFBrV+ldouro2W1VX3XlcUXEFCA==}
+  '@babel/helper-module-imports@7.24.7':
+    resolution: {integrity: sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==}
+    engines: {node: '>=6.9.0'}
 
-  '@algolia/logger-common@4.24.0':
-    resolution: {integrity: sha512-LLUNjkahj9KtKYrQhFKCzMx0BY3RnNP4FEtO+sBybCjJ73E8jNdaKJ/Dd8A/VA4imVHP5tADZ8pn5B8Ga/wTMA==}
+  '@babel/helper-module-transforms@7.25.2':
+    resolution: {integrity: sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
 
-  '@algolia/logger-console@4.24.0':
-    resolution: {integrity: sha512-X4C8IoHgHfiUROfoRCV+lzSy+LHMgkoEEU1BbKcsfnV0i0S20zyy0NLww9dwVHUWNfPPxdMU+/wKmLGYf96yTg==}
+  '@babel/helper-optimise-call-expression@7.24.7':
+    resolution: {integrity: sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==}
+    engines: {node: '>=6.9.0'}
 
-  '@algolia/recommend@4.24.0':
-    resolution: {integrity: sha512-P9kcgerfVBpfYHDfVZDvvdJv0lEoCvzNlOy2nykyt5bK8TyieYyiD0lguIJdRZZYGre03WIAFf14pgE+V+IBlw==}
+  '@babel/helper-plugin-utils@7.24.8':
+    resolution: {integrity: sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==}
+    engines: {node: '>=6.9.0'}
 
-  '@algolia/requester-browser-xhr@4.24.0':
-    resolution: {integrity: sha512-Z2NxZMb6+nVXSjF13YpjYTdvV3032YTBSGm2vnYvYPA6mMxzM3v5rsCiSspndn9rzIW4Qp1lPHBvuoKJV6jnAA==}
+  '@babel/helper-remap-async-to-generator@7.25.0':
+    resolution: {integrity: sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
 
-  '@algolia/requester-common@4.24.0':
-    resolution: {integrity: sha512-k3CXJ2OVnvgE3HMwcojpvY6d9kgKMPRxs/kVohrwF5WMr2fnqojnycZkxPoEg+bXm8fi5BBfFmOqgYztRtHsQA==}
+  '@babel/helper-replace-supers@7.25.0':
+    resolution: {integrity: sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
 
-  '@algolia/requester-node-http@4.24.0':
-    resolution: {integrity: sha512-JF18yTjNOVYvU/L3UosRcvbPMGT9B+/GQWNWnenIImglzNVGpyzChkXLnrSf6uxwVNO6ESGu6oN8MqcGQcjQJw==}
+  '@babel/helper-simple-access@7.24.7':
+    resolution: {integrity: sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==}
+    engines: {node: '>=6.9.0'}
 
-  '@algolia/transporter@4.24.0':
-    resolution: {integrity: sha512-86nI7w6NzWxd1Zp9q3413dRshDqAzSbsQjhcDhPIatEFiZrL1/TjnHL8S7jVKFePlIMzDsZWXAXwXzcok9c5oA==}
+  '@babel/helper-skip-transparent-expression-wrappers@7.24.7':
+    resolution: {integrity: sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/helper-string-parser@7.24.8':
     resolution: {integrity: sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==}
@@ -139,2421 +227,5286 @@ packages:
     resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-validator-option@7.24.8':
+    resolution: {integrity: sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-wrap-function@7.25.0':
+    resolution: {integrity: sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helpers@7.25.0':
+    resolution: {integrity: sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/highlight@7.24.7':
+    resolution: {integrity: sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/parser@7.24.7':
     resolution: {integrity: sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==}
     engines: {node: '>=6.0.0'}
     hasBin: true
 
-  '@babel/types@7.24.8':
-    resolution: {integrity: sha512-SkSBEHwwJRU52QEVZBmMBnE5Ux2/6WU1grdYyOhpbCNxbmJrDuDCphBzKZSO3taf0zztp+qkWlymE5tVL5l0TA==}
+  '@babel/parser@7.25.3':
+    resolution: {integrity: sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
+  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.3':
+    resolution: {integrity: sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==}
     engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
 
-  '@docsearch/css@3.6.0':
-    resolution: {integrity: sha512-+sbxb71sWre+PwDK7X2T8+bhS6clcVMLwBPznX45Qu6opJcgRjAp7gYSDzVFp187J+feSj5dNBN1mJoi6ckkUQ==}
+  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.0':
+    resolution: {integrity: sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
 
-  '@docsearch/js@3.6.0':
-    resolution: {integrity: sha512-QujhqINEElrkIfKwyyyTfbsfMAYCkylInLYMRqHy7PHc8xTBQCow73tlo/Kc7oIwBrCLf0P3YhjlOeV4v8hevQ==}
+  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.0':
+    resolution: {integrity: sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
 
-  '@docsearch/react@3.6.0':
-    resolution: {integrity: sha512-HUFut4ztcVNmqy9gp/wxNbC7pTOHhgVVkHVGCACTuLhUKUhKAF9KYHJtMiLUJxEqiFLQiuri1fWF8zqwM/cu1w==}
+  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.24.7':
+    resolution: {integrity: sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@types/react': '>= 16.8.0 < 19.0.0'
-      react: '>= 16.8.0 < 19.0.0'
-      react-dom: '>= 16.8.0 < 19.0.0'
-      search-insights: '>= 1 < 3'
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      react:
-        optional: true
-      react-dom:
-        optional: true
-      search-insights:
-        optional: true
+      '@babel/core': ^7.13.0
 
-  '@esbuild/aix-ppc64@0.21.5':
-    resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [aix]
+  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.0':
+    resolution: {integrity: sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
 
-  '@esbuild/android-arm64@0.21.5':
-    resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
+  '@babel/plugin-proposal-decorators@7.24.7':
+    resolution: {integrity: sha512-RL9GR0pUG5Kc8BUWLNDm2T5OpYwSX15r98I0IkgmRQTXuELq/OynH8xtMTMvTJFjXbMWFVTKtYkTaYQsuAwQlQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@esbuild/android-arm@0.21.5':
-    resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
+  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2':
+    resolution: {integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@esbuild/android-x64@0.21.5':
-    resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
+  '@babel/plugin-syntax-async-generators@7.8.4':
+    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@esbuild/darwin-arm64@0.21.5':
-    resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
+  '@babel/plugin-syntax-class-properties@7.12.13':
+    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@esbuild/darwin-x64@0.21.5':
-    resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
+  '@babel/plugin-syntax-class-static-block@7.14.5':
+    resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@esbuild/freebsd-arm64@0.21.5':
-    resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
+  '@babel/plugin-syntax-decorators@7.24.7':
+    resolution: {integrity: sha512-Ui4uLJJrRV1lb38zg1yYTmRKmiZLiftDEvZN2iq3kd9kUFU+PttmzTbAFC2ucRk/XJmtek6G23gPsuZbhrT8fQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@esbuild/freebsd-x64@0.21.5':
-    resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
+  '@babel/plugin-syntax-dynamic-import@7.8.3':
+    resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@esbuild/linux-arm64@0.21.5':
-    resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
+  '@babel/plugin-syntax-export-namespace-from@7.8.3':
+    resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@esbuild/linux-arm@0.21.5':
-    resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
+  '@babel/plugin-syntax-import-assertions@7.24.7':
+    resolution: {integrity: sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@esbuild/linux-ia32@0.21.5':
-    resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
+  '@babel/plugin-syntax-import-attributes@7.24.7':
+    resolution: {integrity: sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@esbuild/linux-loong64@0.21.5':
-    resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
-    os: [linux]
+  '@babel/plugin-syntax-import-meta@7.10.4':
+    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@esbuild/linux-mips64el@0.21.5':
-    resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
+  '@babel/plugin-syntax-json-strings@7.8.3':
+    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@esbuild/linux-ppc64@0.21.5':
-    resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
+  '@babel/plugin-syntax-jsx@7.24.7':
+    resolution: {integrity: sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@esbuild/linux-riscv64@0.21.5':
-    resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
+  '@babel/plugin-syntax-logical-assignment-operators@7.10.4':
+    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@esbuild/linux-s390x@0.21.5':
-    resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
+  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3':
+    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@esbuild/linux-x64@0.21.5':
-    resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
+  '@babel/plugin-syntax-numeric-separator@7.10.4':
+    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@esbuild/netbsd-x64@0.21.5':
-    resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
+  '@babel/plugin-syntax-object-rest-spread@7.8.3':
+    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@esbuild/openbsd-x64@0.21.5':
-    resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
+  '@babel/plugin-syntax-optional-catch-binding@7.8.3':
+    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@esbuild/sunos-x64@0.21.5':
-    resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
+  '@babel/plugin-syntax-optional-chaining@7.8.3':
+    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@esbuild/win32-arm64@0.21.5':
-    resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
+  '@babel/plugin-syntax-private-property-in-object@7.14.5':
+    resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@esbuild/win32-ia32@0.21.5':
-    resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
+  '@babel/plugin-syntax-top-level-await@7.14.5':
+    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@esbuild/win32-x64@0.21.5':
-    resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
+  '@babel/plugin-syntax-typescript@7.24.7':
+    resolution: {integrity: sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@eslint-community/eslint-utils@4.4.0':
-    resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  '@babel/plugin-syntax-unicode-sets-regex@7.18.6':
+    resolution: {integrity: sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+      '@babel/core': ^7.0.0
 
-  '@eslint-community/regexpp@4.11.0':
-    resolution: {integrity: sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==}
-    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+  '@babel/plugin-transform-arrow-functions@7.24.7':
+    resolution: {integrity: sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@eslint/eslintrc@2.1.4':
-    resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  '@babel/plugin-transform-async-generator-functions@7.25.0':
+    resolution: {integrity: sha512-uaIi2FdqzjpAMvVqvB51S42oC2JEVgh0LDsGfZVDysWE8LrJtQC2jvKmOqEYThKyB7bDEb7BP1GYWDm7tABA0Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@eslint/js@8.57.0':
-    resolution: {integrity: sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  '@babel/plugin-transform-async-to-generator@7.24.7':
+    resolution: {integrity: sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@humanwhocodes/config-array@0.11.14':
-    resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==}
-    engines: {node: '>=10.10.0'}
-    deprecated: Use @eslint/config-array instead
+  '@babel/plugin-transform-block-scoped-functions@7.24.7':
+    resolution: {integrity: sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@humanwhocodes/module-importer@1.0.1':
-    resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
-    engines: {node: '>=12.22'}
+  '@babel/plugin-transform-block-scoping@7.25.0':
+    resolution: {integrity: sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@humanwhocodes/object-schema@2.0.3':
-    resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==}
-    deprecated: Use @eslint/object-schema instead
+  '@babel/plugin-transform-class-properties@7.24.7':
+    resolution: {integrity: sha512-vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@jridgewell/sourcemap-codec@1.5.0':
-    resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==}
+  '@babel/plugin-transform-class-static-block@7.24.7':
+    resolution: {integrity: sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.12.0
 
-  '@mdit-vue/plugin-component@2.1.3':
-    resolution: {integrity: sha512-9AG17beCgpEw/4ldo/M6Y/1Rh4E1bqMmr/rCkWKmCAxy9tJz3lzY7HQJanyHMJufwsb3WL5Lp7Om/aPcQTZ9SA==}
+  '@babel/plugin-transform-classes@7.25.0':
+    resolution: {integrity: sha512-xyi6qjr/fYU304fiRwFbekzkqVJZ6A7hOjWZd+89FVcBqPV3S9Wuozz82xdpLspckeaafntbzglaW4pqpzvtSw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@mdit-vue/plugin-frontmatter@2.1.3':
-    resolution: {integrity: sha512-KxsSCUVBEmn6sJcchSTiI5v9bWaoRxe68RBYRDGcSEY1GTnfQ5gQPMIsM48P4q1luLEIWurVGGrRu7u93//LDQ==}
+  '@babel/plugin-transform-computed-properties@7.24.7':
+    resolution: {integrity: sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@mdit-vue/plugin-headers@2.1.3':
-    resolution: {integrity: sha512-AcL7a7LHQR3ISINhfjGJNE/bHyM0dcl6MYm1Sr//zF7ZgokPGwD/HhD7TzwmrKA9YNYCcO9P3QmF/RN9XyA6CA==}
+  '@babel/plugin-transform-destructuring@7.24.8':
+    resolution: {integrity: sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@mdit-vue/plugin-sfc@2.1.3':
-    resolution: {integrity: sha512-Ezl0dNvQNS639Yl4siXm+cnWtQvlqHrg+u+lnau/OHpj9Xh3LVap/BSQVugKIV37eR13jXXYf3VaAOP1fXPN+w==}
+  '@babel/plugin-transform-dotall-regex@7.24.7':
+    resolution: {integrity: sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@mdit-vue/plugin-title@2.1.3':
-    resolution: {integrity: sha512-XWVOQoZqczoN97xCDrnQicmXKoqwOjIymIm9HQnRXhHnYKOgJPW1CxSGhkcOGzvDU1v0mD/adojVyyj/s6ggWw==}
+  '@babel/plugin-transform-duplicate-keys@7.24.7':
+    resolution: {integrity: sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@mdit-vue/plugin-toc@2.1.3':
-    resolution: {integrity: sha512-41Q+iXpLHZt0zJdApVwoVt7WF6za/xUjtjEPf90Z3KLzQO01TXsv48Xp9BsrFHPcPcm8tiZ0+O1/ICJO80V/MQ==}
+  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.0':
+    resolution: {integrity: sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
 
-  '@mdit-vue/shared@2.1.3':
-    resolution: {integrity: sha512-27YI8b0VVZsAlNwaWoaOCWbr4eL8B04HxiYk/y2ktblO/nMcOEOLt4p0RjuobvdyUyjHvGOS09RKhq7qHm1CHQ==}
+  '@babel/plugin-transform-dynamic-import@7.24.7':
+    resolution: {integrity: sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@mdit-vue/types@2.1.0':
-    resolution: {integrity: sha512-TMBB/BQWVvwtpBdWD75rkZx4ZphQ6MN0O4QB2Bc0oI5PC2uE57QerhNxdRZ7cvBHE2iY2C+BUNUziCfJbjIRRA==}
+  '@babel/plugin-transform-exponentiation-operator@7.24.7':
+    resolution: {integrity: sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@mdit/plugin-alert@0.12.0':
-    resolution: {integrity: sha512-4OyGK1PZrJbmEF/kS6GKmmG1nlN5h/CyIPZV8lRgnlWLFB37JiEz3EHusPAXAoMtw7VGNFaIcl7OT/I5yyz1JQ==}
+  '@babel/plugin-transform-export-namespace-from@7.24.7':
+    resolution: {integrity: sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      markdown-it: ^14.1.0
-    peerDependenciesMeta:
-      markdown-it:
-        optional: true
+      '@babel/core': ^7.0.0-0
 
-  '@mdit/plugin-align@0.12.0':
-    resolution: {integrity: sha512-rvA+xzaVrlsr44s7XD/xadO3lF0QYWCbeSrOS2dhOroNCIOy4RotVP/1tQPr84eqm4oXcxXF0cbjFuwUgE1jYw==}
-    engines: {node: '>= 18'}
+  '@babel/plugin-transform-for-of@7.24.7':
+    resolution: {integrity: sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      markdown-it: ^14.1.0
-    peerDependenciesMeta:
-      markdown-it:
-        optional: true
+      '@babel/core': ^7.0.0-0
 
-  '@mdit/plugin-attrs@0.12.0':
-    resolution: {integrity: sha512-J0MBwBq958lBtdIcEo02mUIO4ubl2YK+bY799T2SusrLTf3FZsq8+d/OiLTUtovfxaphD7F6yqo8M61AiOpq+w==}
-    engines: {node: '>= 18'}
+  '@babel/plugin-transform-function-name@7.25.1':
+    resolution: {integrity: sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      markdown-it: ^14.1.0
-    peerDependenciesMeta:
-      markdown-it:
-        optional: true
+      '@babel/core': ^7.0.0-0
 
-  '@mdit/plugin-container@0.12.0':
-    resolution: {integrity: sha512-61bWK1ek6Rn4o12/BIKTWgGU0miB9ENcXE19H5D4DRhwG5+4+0zp2U6hRLf/mE73+mRYin7iKVzcwwEsqs+u8w==}
-    engines: {node: '>= 18'}
+  '@babel/plugin-transform-json-strings@7.24.7':
+    resolution: {integrity: sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      markdown-it: ^14.1.0
-    peerDependenciesMeta:
-      markdown-it:
-        optional: true
+      '@babel/core': ^7.0.0-0
 
-  '@mdit/plugin-demo@0.12.0':
-    resolution: {integrity: sha512-+KDUOgcvnMtBN/uYWlhIFuWkTJexuxstq8ERy9q7vOiu8Go85qCb27h0RSToKBTmmGy+XqfU2EdJclYPWBupJQ==}
+  '@babel/plugin-transform-literals@7.25.2':
+    resolution: {integrity: sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      markdown-it: ^14.1.0
-    peerDependenciesMeta:
-      markdown-it:
-        optional: true
+      '@babel/core': ^7.0.0-0
 
-  '@mdit/plugin-figure@0.12.0':
-    resolution: {integrity: sha512-3nfcGI+uM0f6AqHZrEr8kSMBI6T2+fKKQXtCbvWQqQ+P3iGgf34Ay2eAtuMDcDGqyfNuR6e8aLoOeY2QWuEynA==}
-    engines: {node: '>= 18'}
+  '@babel/plugin-transform-logical-assignment-operators@7.24.7':
+    resolution: {integrity: sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      markdown-it: ^14.1.0
-    peerDependenciesMeta:
-      markdown-it:
-        optional: true
+      '@babel/core': ^7.0.0-0
 
-  '@mdit/plugin-footnote@0.12.0':
-    resolution: {integrity: sha512-9B+bJdMndCPoA9De9bxRm4/fyz02PHRcttOyuyPJ3G+wCAgIN1c/7CB8ViT1YJuECUjLogJQ/rrgqh7f0LTqLQ==}
-    engines: {node: '>= 18'}
+  '@babel/plugin-transform-member-expression-literals@7.24.7':
+    resolution: {integrity: sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      markdown-it: ^14.1.0
+      '@babel/core': ^7.0.0-0
 
-  '@mdit/plugin-img-lazyload@0.12.0':
-    resolution: {integrity: sha512-6R42ieXzwkB5BKKZi+ZefqeP/fBG5qo7Sqtl72ewSVqEQ30bgxpk6nkrPI2orRob4tb6z0F/c+R8h6PW5MkTOw==}
-    engines: {node: '>= 18'}
+  '@babel/plugin-transform-modules-amd@7.24.7':
+    resolution: {integrity: sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      markdown-it: ^14.1.0
-    peerDependenciesMeta:
-      markdown-it:
-        optional: true
+      '@babel/core': ^7.0.0-0
 
-  '@mdit/plugin-img-mark@0.12.0':
-    resolution: {integrity: sha512-HkIUwlTg/xPsBi4PG+5dsMnsb7wdiJzELSCEUfdAJTg55nksonHfyV2pFpr87MML4nuZlZK9JHt+Bm2BBDSVSw==}
-    engines: {node: '>= 18'}
+  '@babel/plugin-transform-modules-commonjs@7.24.8':
+    resolution: {integrity: sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      markdown-it: ^14.1.0
-    peerDependenciesMeta:
-      markdown-it:
-        optional: true
+      '@babel/core': ^7.0.0-0
 
-  '@mdit/plugin-img-size@0.12.0':
-    resolution: {integrity: sha512-fCcF5gc+ba6gQ5ebrKuI8bK/gFbj8mbeN45FHmBsFDFsfTHa0Xij2v8iok0nP8YEIVj71y8XYojsqCWs6avong==}
-    engines: {node: '>= 18'}
+  '@babel/plugin-transform-modules-systemjs@7.25.0':
+    resolution: {integrity: sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      markdown-it: ^14.1.0
-    peerDependenciesMeta:
-      markdown-it:
-        optional: true
+      '@babel/core': ^7.0.0-0
 
-  '@mdit/plugin-include@0.12.0':
-    resolution: {integrity: sha512-8pnmp7s1TjbtoBIa/YhYpEivOpeVSyhkQoQrGq1UoaEcTbXqmFwShGkAW3zUYZVFYTl74PgL/UqJnrUojegJQg==}
+  '@babel/plugin-transform-modules-umd@7.24.7':
+    resolution: {integrity: sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      markdown-it: ^14.1.0
-    peerDependenciesMeta:
-      markdown-it:
-        optional: true
+      '@babel/core': ^7.0.0-0
 
-  '@mdit/plugin-katex-slim@0.12.0':
-    resolution: {integrity: sha512-s2MJGXFZT7u8IUTmy6K1rxxAdYRmGggu0m860siyUrThL112xLN9r3jmXZ83epgi4UA/gLkRDAU5vF6R2JtyjQ==}
-    engines: {node: '>= 18'}
+  '@babel/plugin-transform-named-capturing-groups-regex@7.24.7':
+    resolution: {integrity: sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      katex: ^0.16.9
-      markdown-it: ^14.1.0
-    peerDependenciesMeta:
-      katex:
-        optional: true
-      markdown-it:
-        optional: true
+      '@babel/core': ^7.0.0
 
-  '@mdit/plugin-mark@0.12.0':
-    resolution: {integrity: sha512-BDFwbV/tbgUGL8KF2ymYNLEXT2KNBLe8D0rshDrbB4Iko1U2DywACQkmaUbYBJ1VCn7/dff35at9fWrm3QjrwQ==}
-    engines: {node: '>= 18'}
+  '@babel/plugin-transform-new-target@7.24.7':
+    resolution: {integrity: sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      markdown-it: ^14.1.0
-    peerDependenciesMeta:
-      markdown-it:
-        optional: true
+      '@babel/core': ^7.0.0-0
 
-  '@mdit/plugin-mathjax-slim@0.12.0':
-    resolution: {integrity: sha512-bLM+JnCTN/3XiyKb64Yhpx014VYLfHBexua4n92cUyoKR9g3waB0loF1WMlg6GdyCTc7OvrUSceNjwWj3YRogg==}
-    engines: {node: '>= 18'}
+  '@babel/plugin-transform-nullish-coalescing-operator@7.24.7':
+    resolution: {integrity: sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      markdown-it: ^14.1.0
-      mathjax-full: ^3.2.2
-    peerDependenciesMeta:
-      markdown-it:
-        optional: true
-      mathjax-full:
-        optional: true
+      '@babel/core': ^7.0.0-0
 
-  '@mdit/plugin-plantuml@0.12.0':
-    resolution: {integrity: sha512-m1pk6PA9+kWUs8kylLqjnQ7Lex68x3c4Ato8zAh+omkhugfWzuQXfFiXRiJ9C7wkdqHoJx/E5XobP3HJnhCpoA==}
+  '@babel/plugin-transform-numeric-separator@7.24.7':
+    resolution: {integrity: sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      markdown-it: ^14.1.0
-    peerDependenciesMeta:
-      markdown-it:
-        optional: true
+      '@babel/core': ^7.0.0-0
 
-  '@mdit/plugin-spoiler@0.12.0':
-    resolution: {integrity: sha512-7yu+Gz000O0OxGnGYOoj77Am3WgH4GwzOvwCp7tPLexkJwTve8MyT9In/NEPFaRw8fmgXwthC0gKq4Ubh1+8DA==}
-    engines: {node: '>= 18'}
+  '@babel/plugin-transform-object-rest-spread@7.24.7':
+    resolution: {integrity: sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      markdown-it: ^14.1.0
-    peerDependenciesMeta:
-      markdown-it:
-        optional: true
+      '@babel/core': ^7.0.0-0
 
-  '@mdit/plugin-stylize@0.12.0':
-    resolution: {integrity: sha512-5bzZvmjEpGTdwBax9jaDbCBhD1snEx6uTHVUG9HD/L5koKrL86+ox9E5FGeiMiD1dtxeMgL+WqBzV44nRE9ZPg==}
-    engines: {node: '>= 18'}
+  '@babel/plugin-transform-object-super@7.24.7':
+    resolution: {integrity: sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      markdown-it: ^14.1.0
-    peerDependenciesMeta:
-      markdown-it:
-        optional: true
+      '@babel/core': ^7.0.0-0
 
-  '@mdit/plugin-sub@0.12.0':
-    resolution: {integrity: sha512-27kKkSVkymc+2RNc5XOYkeXip5PgHZPUnHpxUvkpnairLwyHsXb8/gzr9zd5arVkip86rcdy9LIvnF7zO0dNVQ==}
-    engines: {node: '>= 18'}
+  '@babel/plugin-transform-optional-catch-binding@7.24.7':
+    resolution: {integrity: sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      markdown-it: ^14.1.0
-    peerDependenciesMeta:
-      markdown-it:
-        optional: true
+      '@babel/core': ^7.0.0-0
 
-  '@mdit/plugin-sup@0.12.0':
-    resolution: {integrity: sha512-3bEDW5/y1UDVU8LVbFsqUvNcMW6orp16uCdRGYCNZ3/IeK7Qj1/9a3wfhScIoI8xRUE6M3JLv41sGBFXLHwi1w==}
-    engines: {node: '>= 18'}
+  '@babel/plugin-transform-optional-chaining@7.24.8':
+    resolution: {integrity: sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      markdown-it: ^14.1.0
-    peerDependenciesMeta:
-      markdown-it:
-        optional: true
+      '@babel/core': ^7.0.0-0
 
-  '@mdit/plugin-tab@0.12.0':
-    resolution: {integrity: sha512-ZDTEDxHoekcFA5Al+NLizn8Nf0kj6ABkNBAc/VxbQoVQdjZNQtGY2dOPeWW0I96Rao+Aw+IpYRCLFIfb/KtExw==}
+  '@babel/plugin-transform-parameters@7.24.7':
+    resolution: {integrity: sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      markdown-it: ^14.1.0
-    peerDependenciesMeta:
-      markdown-it:
-        optional: true
+      '@babel/core': ^7.0.0-0
 
-  '@mdit/plugin-tasklist@0.12.0':
-    resolution: {integrity: sha512-MPmuLJrqHYR2xI7ST9Xtw/xj+6Xoq7kUvcGuXWdMMNT11DcU1KppkR8QBHov437NFYh6aGyjrHUVeM4T5Ls8yg==}
-    engines: {node: '>= 18'}
+  '@babel/plugin-transform-private-methods@7.24.7':
+    resolution: {integrity: sha512-COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      markdown-it: ^14.1.0
-    peerDependenciesMeta:
-      markdown-it:
-        optional: true
+      '@babel/core': ^7.0.0-0
 
-  '@mdit/plugin-tex@0.12.0':
-    resolution: {integrity: sha512-ejeSgSeZvcI5P4hFFQ4q5pHrZBGO2fQWVGm6dZ3BhX4ldoV8LjCIzkcMMXhrhSOVjwHnqmF6xOh9EvI0jzak1w==}
-    engines: {node: '>= 18'}
+  '@babel/plugin-transform-private-property-in-object@7.24.7':
+    resolution: {integrity: sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      markdown-it: ^14.1.0
-    peerDependenciesMeta:
-      markdown-it:
-        optional: true
+      '@babel/core': ^7.0.0-0
 
-  '@mdit/plugin-uml@0.12.0':
-    resolution: {integrity: sha512-EfVMmq0CwLJcssxhkvGS2ESenNNEMeK04j702Z9v3am1M9DdEj6zHTrHQd9tA0jNVuFY8ZlmMgDfkkG5k6Rm3Q==}
-    engines: {node: '>= 18'}
+  '@babel/plugin-transform-property-literals@7.24.7':
+    resolution: {integrity: sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      markdown-it: ^14.1.0
-    peerDependenciesMeta:
-      markdown-it:
-        optional: true
+      '@babel/core': ^7.0.0-0
 
-  '@nodelib/fs.scandir@2.1.5':
-    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
-    engines: {node: '>= 8'}
+  '@babel/plugin-transform-regenerator@7.24.7':
+    resolution: {integrity: sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@nodelib/fs.stat@2.0.5':
-    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
-    engines: {node: '>= 8'}
+  '@babel/plugin-transform-reserved-words@7.24.7':
+    resolution: {integrity: sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@nodelib/fs.walk@1.2.8':
-    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
-    engines: {node: '>= 8'}
+  '@babel/plugin-transform-shorthand-properties@7.24.7':
+    resolution: {integrity: sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@rollup/rollup-android-arm-eabi@4.18.1':
-    resolution: {integrity: sha512-lncuC4aHicncmbORnx+dUaAgzee9cm/PbIqgWz1PpXuwc+sa1Ct83tnqUDy/GFKleLiN7ZIeytM6KJ4cAn1SxA==}
-    cpu: [arm]
-    os: [android]
+  '@babel/plugin-transform-spread@7.24.7':
+    resolution: {integrity: sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@rollup/rollup-android-arm64@4.18.1':
-    resolution: {integrity: sha512-F/tkdw0WSs4ojqz5Ovrw5r9odqzFjb5LIgHdHZG65dFI1lWTWRVy32KDJLKRISHgJvqUeUhdIvy43fX41znyDg==}
-    cpu: [arm64]
-    os: [android]
+  '@babel/plugin-transform-sticky-regex@7.24.7':
+    resolution: {integrity: sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@rollup/rollup-darwin-arm64@4.18.1':
-    resolution: {integrity: sha512-vk+ma8iC1ebje/ahpxpnrfVQJibTMyHdWpOGZ3JpQ7Mgn/3QNHmPq7YwjZbIE7km73dH5M1e6MRRsnEBW7v5CQ==}
-    cpu: [arm64]
-    os: [darwin]
+  '@babel/plugin-transform-template-literals@7.24.7':
+    resolution: {integrity: sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@rollup/rollup-darwin-x64@4.18.1':
-    resolution: {integrity: sha512-IgpzXKauRe1Tafcej9STjSSuG0Ghu/xGYH+qG6JwsAUxXrnkvNHcq/NL6nz1+jzvWAnQkuAJ4uIwGB48K9OCGA==}
-    cpu: [x64]
-    os: [darwin]
+  '@babel/plugin-transform-typeof-symbol@7.24.8':
+    resolution: {integrity: sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.18.1':
-    resolution: {integrity: sha512-P9bSiAUnSSM7EmyRK+e5wgpqai86QOSv8BwvkGjLwYuOpaeomiZWifEos517CwbG+aZl1T4clSE1YqqH2JRs+g==}
-    cpu: [arm]
-    os: [linux]
+  '@babel/plugin-transform-typescript@7.25.2':
+    resolution: {integrity: sha512-lBwRvjSmqiMYe/pS0+1gggjJleUJi7NzjvQ1Fkqtt69hBa/0t1YuW/MLQMAPixfwaQOHUXsd6jeU3Z+vdGv3+A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@rollup/rollup-linux-arm-musleabihf@4.18.1':
-    resolution: {integrity: sha512-5RnjpACoxtS+aWOI1dURKno11d7krfpGDEn19jI8BuWmSBbUC4ytIADfROM1FZrFhQPSoP+KEa3NlEScznBTyQ==}
-    cpu: [arm]
-    os: [linux]
+  '@babel/plugin-transform-unicode-escapes@7.24.7':
+    resolution: {integrity: sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@rollup/rollup-linux-arm64-gnu@4.18.1':
-    resolution: {integrity: sha512-8mwmGD668m8WaGbthrEYZ9CBmPug2QPGWxhJxh/vCgBjro5o96gL04WLlg5BA233OCWLqERy4YUzX3bJGXaJgQ==}
-    cpu: [arm64]
-    os: [linux]
+  '@babel/plugin-transform-unicode-property-regex@7.24.7':
+    resolution: {integrity: sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@rollup/rollup-linux-arm64-musl@4.18.1':
-    resolution: {integrity: sha512-dJX9u4r4bqInMGOAQoGYdwDP8lQiisWb9et+T84l2WXk41yEej8v2iGKodmdKimT8cTAYt0jFb+UEBxnPkbXEQ==}
-    cpu: [arm64]
-    os: [linux]
+  '@babel/plugin-transform-unicode-regex@7.24.7':
+    resolution: {integrity: sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.18.1':
-    resolution: {integrity: sha512-V72cXdTl4EI0x6FNmho4D502sy7ed+LuVW6Ym8aI6DRQ9hQZdp5sj0a2usYOlqvFBNKQnLQGwmYnujo2HvjCxQ==}
-    cpu: [ppc64]
-    os: [linux]
+  '@babel/plugin-transform-unicode-sets-regex@7.24.7':
+    resolution: {integrity: sha512-2G8aAvF4wy1w/AGZkemprdGMRg5o6zPNhbHVImRz3lss55TYCBd6xStN19rt8XJHq20sqV0JbyWjOWwQRwV/wg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
 
-  '@rollup/rollup-linux-riscv64-gnu@4.18.1':
-    resolution: {integrity: sha512-f+pJih7sxoKmbjghrM2RkWo2WHUW8UbfxIQiWo5yeCaCM0TveMEuAzKJte4QskBp1TIinpnRcxkquY+4WuY/tg==}
-    cpu: [riscv64]
-    os: [linux]
+  '@babel/preset-env@7.25.3':
+    resolution: {integrity: sha512-QsYW7UeAaXvLPX9tdVliMJE7MD7M6MLYVTovRTIwhoYQVFHR1rM4wO8wqAezYi3/BpSD+NzVCZ69R6smWiIi8g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@rollup/rollup-linux-s390x-gnu@4.18.1':
-    resolution: {integrity: sha512-qb1hMMT3Fr/Qz1OKovCuUM11MUNLUuHeBC2DPPAWUYYUAOFWaxInaTwTQmc7Fl5La7DShTEpmYwgdt2hG+4TEg==}
-    cpu: [s390x]
-    os: [linux]
+  '@babel/preset-modules@0.1.6-no-external-plugins':
+    resolution: {integrity: sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0 || ^8.0.0-0 <8.0.0
 
-  '@rollup/rollup-linux-x64-gnu@4.18.1':
-    resolution: {integrity: sha512-7O5u/p6oKUFYjRbZkL2FLbwsyoJAjyeXHCU3O4ndvzg2OFO2GinFPSJFGbiwFDaCFc+k7gs9CF243PwdPQFh5g==}
-    cpu: [x64]
-    os: [linux]
+  '@babel/preset-typescript@7.24.7':
+    resolution: {integrity: sha512-SyXRe3OdWwIwalxDg5UtJnJQO+YPcTfwiIY2B0Xlddh9o7jpWLvv8X1RthIeDOxQ+O1ML5BLPCONToObyVQVuQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@rollup/rollup-linux-x64-musl@4.18.1':
-    resolution: {integrity: sha512-pDLkYITdYrH/9Cv/Vlj8HppDuLMDUBmgsM0+N+xLtFd18aXgM9Nyqupb/Uw+HeidhfYg2lD6CXvz6CjoVOaKjQ==}
-    cpu: [x64]
-    os: [linux]
+  '@babel/regjsgen@0.8.0':
+    resolution: {integrity: sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==}
 
-  '@rollup/rollup-win32-arm64-msvc@4.18.1':
-    resolution: {integrity: sha512-W2ZNI323O/8pJdBGil1oCauuCzmVd9lDmWBBqxYZcOqWD6aWqJtVBQ1dFrF4dYpZPks6F+xCZHfzG5hYlSHZ6g==}
-    cpu: [arm64]
-    os: [win32]
+  '@babel/runtime@7.25.0':
+    resolution: {integrity: sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw==}
+    engines: {node: '>=6.9.0'}
 
-  '@rollup/rollup-win32-ia32-msvc@4.18.1':
-    resolution: {integrity: sha512-ELfEX1/+eGZYMaCIbK4jqLxO1gyTSOIlZr6pbC4SRYFaSIDVKOnZNMdoZ+ON0mrFDp4+H5MhwNC1H/AhE3zQLg==}
-    cpu: [ia32]
-    os: [win32]
+  '@babel/template@7.25.0':
+    resolution: {integrity: sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==}
+    engines: {node: '>=6.9.0'}
 
-  '@rollup/rollup-win32-x64-msvc@4.18.1':
-    resolution: {integrity: sha512-yjk2MAkQmoaPYCSu35RLJ62+dz358nE83VfTePJRp8CG7aMg25mEJYpXFiD+NcevhX8LxD5OP5tktPXnXN7GDw==}
-    cpu: [x64]
-    os: [win32]
+  '@babel/traverse@7.25.3':
+    resolution: {integrity: sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ==}
+    engines: {node: '>=6.9.0'}
 
-  '@sec-ant/readable-stream@0.4.1':
-    resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==}
+  '@babel/types@7.24.8':
+    resolution: {integrity: sha512-SkSBEHwwJRU52QEVZBmMBnE5Ux2/6WU1grdYyOhpbCNxbmJrDuDCphBzKZSO3taf0zztp+qkWlymE5tVL5l0TA==}
+    engines: {node: '>=6.9.0'}
 
-  '@sindresorhus/merge-streams@2.3.0':
-    resolution: {integrity: sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==}
-    engines: {node: '>=18'}
+  '@babel/types@7.25.2':
+    resolution: {integrity: sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==}
+    engines: {node: '>=6.9.0'}
 
-  '@sindresorhus/merge-streams@4.0.0':
-    resolution: {integrity: sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==}
-    engines: {node: '>=18'}
+  '@braintree/sanitize-url@7.1.0':
+    resolution: {integrity: sha512-o+UlMLt49RvtCASlOMW0AkHnabN9wR9rwCCherxO0yG4Npy34GkvrAqdXQvrhNs+jh+gkK8gB8Lf05qL/O7KWg==}
 
-  '@types/debug@4.1.12':
-    resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==}
+  '@chevrotain/cst-dts-gen@11.0.3':
+    resolution: {integrity: sha512-BvIKpRLeS/8UbfxXxgC33xOumsacaeCKAjAeLyOn7Pcp95HiRbrpl14S+9vaZLolnbssPIUuiUd8IvgkRyt6NQ==}
 
-  '@types/estree@1.0.5':
-    resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==}
+  '@chevrotain/gast@11.0.3':
+    resolution: {integrity: sha512-+qNfcoNk70PyS/uxmj3li5NiECO+2YKZZQMbmjTqRI3Qchu8Hig/Q9vgkHpI3alNjr7M+a2St5pw5w5F6NL5/Q==}
 
-  '@types/fs-extra@11.0.4':
-    resolution: {integrity: sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==}
+  '@chevrotain/regexp-to-ast@11.0.3':
+    resolution: {integrity: sha512-1fMHaBZxLFvWI067AVbGJav1eRY7N8DDvYCTwGBiE/ytKBgP8azTdgyrKyWZ9Mfh09eHWb5PgTSO8wi7U824RA==}
 
-  '@types/hash-sum@1.0.2':
-    resolution: {integrity: sha512-UP28RddqY8xcU0SCEp9YKutQICXpaAq9N8U2klqF5hegGha7KzTOL8EdhIIV3bOSGBzjEpN9bU/d+nNZBdJYVw==}
+  '@chevrotain/types@11.0.3':
+    resolution: {integrity: sha512-gsiM3G8b58kZC2HaWR50gu6Y1440cHiJ+i3JUvcp/35JchYejb2+5MVeJK0iKThYpAa/P2PYFV4hoi44HD+aHQ==}
 
-  '@types/json5@0.0.29':
+  '@chevrotain/utils@11.0.3':
+    resolution: {integrity: sha512-YslZMgtJUyuMbZ+aKvfF3x1f5liK4mWNxghFRv7jqRR9C3R3fAOGTTKvxXDa2Y1s9zSbcpuO0cAxDYsc9SrXoQ==}
+
+  '@esbuild/aix-ppc64@0.21.5':
+    resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [aix]
+
+  '@esbuild/aix-ppc64@0.24.2':
+    resolution: {integrity: sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [aix]
+
+  '@esbuild/android-arm64@0.21.5':
+    resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+
+  '@esbuild/android-arm64@0.24.2':
+    resolution: {integrity: sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [android]
+
+  '@esbuild/android-arm@0.21.5':
+    resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+
+  '@esbuild/android-arm@0.24.2':
+    resolution: {integrity: sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [android]
+
+  '@esbuild/android-x64@0.21.5':
+    resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+
+  '@esbuild/android-x64@0.24.2':
+    resolution: {integrity: sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
+
+  '@esbuild/darwin-arm64@0.21.5':
+    resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@esbuild/darwin-arm64@0.24.2':
+    resolution: {integrity: sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@esbuild/darwin-x64@0.21.5':
+    resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@esbuild/darwin-x64@0.24.2':
+    resolution: {integrity: sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@esbuild/freebsd-arm64@0.21.5':
+    resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-arm64@0.24.2':
+    resolution: {integrity: sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-x64@0.21.5':
+    resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-x64@0.24.2':
+    resolution: {integrity: sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@esbuild/linux-arm64@0.21.5':
+    resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@esbuild/linux-arm64@0.24.2':
+    resolution: {integrity: sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@esbuild/linux-arm@0.21.5':
+    resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+
+  '@esbuild/linux-arm@0.24.2':
+    resolution: {integrity: sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [linux]
+
+  '@esbuild/linux-ia32@0.21.5':
+    resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+
+  '@esbuild/linux-ia32@0.24.2':
+    resolution: {integrity: sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [linux]
+
+  '@esbuild/linux-loong64@0.21.5':
+    resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+
+  '@esbuild/linux-loong64@0.24.2':
+    resolution: {integrity: sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==}
+    engines: {node: '>=18'}
+    cpu: [loong64]
+    os: [linux]
+
+  '@esbuild/linux-mips64el@0.21.5':
+    resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+
+  '@esbuild/linux-mips64el@0.24.2':
+    resolution: {integrity: sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==}
+    engines: {node: '>=18'}
+    cpu: [mips64el]
+    os: [linux]
+
+  '@esbuild/linux-ppc64@0.21.5':
+    resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@esbuild/linux-ppc64@0.24.2':
+    resolution: {integrity: sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@esbuild/linux-riscv64@0.21.5':
+    resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@esbuild/linux-riscv64@0.24.2':
+    resolution: {integrity: sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@esbuild/linux-s390x@0.21.5':
+    resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+
+  '@esbuild/linux-s390x@0.24.2':
+    resolution: {integrity: sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==}
+    engines: {node: '>=18'}
+    cpu: [s390x]
+    os: [linux]
+
+  '@esbuild/linux-x64@0.21.5':
+    resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+
+  '@esbuild/linux-x64@0.24.2':
+    resolution: {integrity: sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [linux]
+
+  '@esbuild/netbsd-arm64@0.24.2':
+    resolution: {integrity: sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [netbsd]
+
+  '@esbuild/netbsd-x64@0.21.5':
+    resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@esbuild/netbsd-x64@0.24.2':
+    resolution: {integrity: sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@esbuild/openbsd-arm64@0.24.2':
+    resolution: {integrity: sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
+  '@esbuild/openbsd-x64@0.21.5':
+    resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@esbuild/openbsd-x64@0.24.2':
+    resolution: {integrity: sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@esbuild/sunos-x64@0.21.5':
+    resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+
+  '@esbuild/sunos-x64@0.24.2':
+    resolution: {integrity: sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
+
+  '@esbuild/win32-arm64@0.21.5':
+    resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@esbuild/win32-arm64@0.24.2':
+    resolution: {integrity: sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@esbuild/win32-ia32@0.21.5':
+    resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@esbuild/win32-ia32@0.24.2':
+    resolution: {integrity: sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@esbuild/win32-x64@0.21.5':
+    resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+
+  '@esbuild/win32-x64@0.24.2':
+    resolution: {integrity: sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
+
+  '@eslint-community/eslint-utils@4.4.0':
+    resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+
+  '@eslint-community/regexpp@4.11.0':
+    resolution: {integrity: sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==}
+    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+
+  '@eslint/eslintrc@2.1.4':
+    resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@eslint/js@8.57.0':
+    resolution: {integrity: sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@humanwhocodes/config-array@0.11.14':
+    resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==}
+    engines: {node: '>=10.10.0'}
+    deprecated: Use @eslint/config-array instead
+
+  '@humanwhocodes/module-importer@1.0.1':
+    resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
+    engines: {node: '>=12.22'}
+
+  '@humanwhocodes/object-schema@2.0.3':
+    resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==}
+    deprecated: Use @eslint/object-schema instead
+
+  '@iconify/types@2.0.0':
+    resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==}
+
+  '@iconify/utils@2.1.33':
+    resolution: {integrity: sha512-jP9h6v/g0BIZx0p7XGJJVtkVnydtbgTgt9mVNcGDYwaa7UhdHdI9dvoq+gKj9sijMSJKxUPEG2JyjsgXjxL7Kw==}
+
+  '@jridgewell/gen-mapping@0.3.5':
+    resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==}
+    engines: {node: '>=6.0.0'}
+
+  '@jridgewell/resolve-uri@3.1.2':
+    resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
+    engines: {node: '>=6.0.0'}
+
+  '@jridgewell/set-array@1.2.1':
+    resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==}
+    engines: {node: '>=6.0.0'}
+
+  '@jridgewell/sourcemap-codec@1.5.0':
+    resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==}
+
+  '@jridgewell/trace-mapping@0.3.25':
+    resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
+
+  '@lit-labs/ssr-dom-shim@1.2.1':
+    resolution: {integrity: sha512-wx4aBmgeGvFmOKucFKY+8VFJSYZxs9poN3SDNQFF6lT6NrQUnHiPB2PWz2sc4ieEcAaYYzN+1uWahEeTq2aRIQ==}
+
+  '@lit/reactive-element@2.0.4':
+    resolution: {integrity: sha512-GFn91inaUa2oHLak8awSIigYz0cU0Payr1rcFsrkf5OJ5eSPxElyZfKh0f2p9FsTiZWXQdWGJeXZICEfXXYSXQ==}
+
+  '@mdit-vue/plugin-component@2.1.3':
+    resolution: {integrity: sha512-9AG17beCgpEw/4ldo/M6Y/1Rh4E1bqMmr/rCkWKmCAxy9tJz3lzY7HQJanyHMJufwsb3WL5Lp7Om/aPcQTZ9SA==}
+
+  '@mdit-vue/plugin-frontmatter@2.1.3':
+    resolution: {integrity: sha512-KxsSCUVBEmn6sJcchSTiI5v9bWaoRxe68RBYRDGcSEY1GTnfQ5gQPMIsM48P4q1luLEIWurVGGrRu7u93//LDQ==}
+
+  '@mdit-vue/plugin-headers@2.1.3':
+    resolution: {integrity: sha512-AcL7a7LHQR3ISINhfjGJNE/bHyM0dcl6MYm1Sr//zF7ZgokPGwD/HhD7TzwmrKA9YNYCcO9P3QmF/RN9XyA6CA==}
+
+  '@mdit-vue/plugin-sfc@2.1.3':
+    resolution: {integrity: sha512-Ezl0dNvQNS639Yl4siXm+cnWtQvlqHrg+u+lnau/OHpj9Xh3LVap/BSQVugKIV37eR13jXXYf3VaAOP1fXPN+w==}
+
+  '@mdit-vue/plugin-title@2.1.3':
+    resolution: {integrity: sha512-XWVOQoZqczoN97xCDrnQicmXKoqwOjIymIm9HQnRXhHnYKOgJPW1CxSGhkcOGzvDU1v0mD/adojVyyj/s6ggWw==}
+
+  '@mdit-vue/plugin-toc@2.1.3':
+    resolution: {integrity: sha512-41Q+iXpLHZt0zJdApVwoVt7WF6za/xUjtjEPf90Z3KLzQO01TXsv48Xp9BsrFHPcPcm8tiZ0+O1/ICJO80V/MQ==}
+
+  '@mdit-vue/shared@2.1.3':
+    resolution: {integrity: sha512-27YI8b0VVZsAlNwaWoaOCWbr4eL8B04HxiYk/y2ktblO/nMcOEOLt4p0RjuobvdyUyjHvGOS09RKhq7qHm1CHQ==}
+
+  '@mdit-vue/types@2.1.0':
+    resolution: {integrity: sha512-TMBB/BQWVvwtpBdWD75rkZx4ZphQ6MN0O4QB2Bc0oI5PC2uE57QerhNxdRZ7cvBHE2iY2C+BUNUziCfJbjIRRA==}
+
+  '@mdit/helper@0.16.0':
+    resolution: {integrity: sha512-vUmLSZp+7UXJIYxOya9BkD0OgjgQ+6gpX+htEnc4SKaDPx4S1E7h5TE6Wy4E9Gm/JhkMHoD6TdeoQwrN/I9cLQ==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-alert@0.16.0':
+    resolution: {integrity: sha512-T+0BUVhKjp+Azp6sNdDbiZwydDIcZP6/NAg9uivPvcsDnI9u4lMRCdXI090xNJOdhHO3l/lOsoO//s+++MJNtA==}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-align@0.16.0':
+    resolution: {integrity: sha512-BJhOjX4Zobs+ZKEpDtxGrUCnppkFCTGIBLjXkCPmxeLf4Tsh7dqv5vVhbRueSOz/EIzc2RJzR0dlMLofsaCFeA==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-attrs@0.16.7':
+    resolution: {integrity: sha512-N0zqyuDUO+VeM+vpmVCjujxAbuvE9DhYJoMV9GzLhzmJAP431JMsBBs/sRrJG9tvZrVFZbUMuq4uZz2CHAdkxQ==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-container@0.16.0':
+    resolution: {integrity: sha512-NCsyEiOmoJvXSEVJSY6vaEcvbE11sciRSx5qXBvQQZxUYGYsB+ObYSFVZDFPezsEN35X3b07rurLx8P2Mi9DgQ==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-demo@0.16.0':
+    resolution: {integrity: sha512-EoSpHz8ViLk5HLBCSzQZGOa36JXGHM4q5zOJ0ppgZymxnzRr6vUo+GX022uLivxyNMW1+l30IiF+jbse+JtBGw==}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-dl@0.13.0':
+    resolution: {integrity: sha512-6IC+82oDrXqxQ0Tg6ifTw70HoFk5hI/e9qQgmH5PAu8igTSWLOCSV1RfQc3bYEBKoSZGYnrjs/PtgJHgRLSgZQ==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-figure@0.16.0':
+    resolution: {integrity: sha512-0lYZX3cCUNaygtQXXZH2fHXzmF7sMZ5Jbk5MXDxEDIk1Nkxj8ADo/SctvXN5exwyGpJyw8nTbm7CGgMqifDpmQ==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-footnote@0.16.0':
+    resolution: {integrity: sha512-vaJWhOsya7bYfplLlMHYBxGTbME0e46/eTVKBROemWtAf873DTkV4IhkAq7MzGqeYrw0L9gxQPgGDFphGfySMA==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      markdown-it: ^14.1.0
+
+  '@mdit/plugin-icon@0.16.5':
+    resolution: {integrity: sha512-9T34gnNrjCMdqNLnC1oi+kZT1iCnwlHAtH3D7sjVkcP8Cw4GoDoAGy50oyryivDlczrKubOFtF05lYAfXZauuA==}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-img-lazyload@0.16.0':
+    resolution: {integrity: sha512-Ilf3e5SKG7hd+RAoYQalpjoz8LMCxCe3BBHFYerv8u4wLnKe/L0Gqc8kXSpR37flzv3Ncw/NMqmD4ZZ0QQnK9A==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-img-mark@0.16.0':
+    resolution: {integrity: sha512-BUYqQRWUxNKB0BbMb8SZtlTeDZNXxuJ9AuiuB54RIWlbx3iRlQkbQI3B/AxTT5/EbRMDhxOq0R8PumBuA1gNFA==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-img-size@0.16.0':
+    resolution: {integrity: sha512-4FBvIHYWT22bjU+kO1I00xLtnCi7aXdZ7QD3CJnK4Xl6gN8/WB9IkfqYnBPv8yDiaZrabduQo8Dh8Dm8hPOm2A==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-include@0.16.0':
+    resolution: {integrity: sha512-9ESwsc+/jYkS0hIzpWqMQ9bHgHG//35datnfp0KUOql/DSuLVhufPtNkKNe/SVNO/+AOBTTlRYzej9Jl7JjD7g==}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-katex-slim@0.16.7':
+    resolution: {integrity: sha512-pHaaz0WVhBepyKLRNtk1GyZU+kf3oQ7qWoESOoLBEOkOakZJuVVT4oNfrFgbfW2obW983q3z9l4kHjMRx/bn5g==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      katex: ^0.16.9
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      katex:
+        optional: true
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-mark@0.16.0':
+    resolution: {integrity: sha512-VY8HhLaNw6iO6E1pSZr3bG6MzyxcAdQmQ+S0r/l87S0EKHCBrUJusaUjxa9aTVHiBcgGUjg9aumribGrWfuitA==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-mathjax-slim@0.16.0':
+    resolution: {integrity: sha512-bbo6HtNOFdNMGZH/pxc3X1vZOvOW1FF9RMiAW2pkmyk7sPnMziB8uwxm0Ra1RajEC/NDxJ3wcF7xynkLmS6PfA==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      markdown-it: ^14.1.0
+      mathjax-full: ^3.2.2
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+      mathjax-full:
+        optional: true
+
+  '@mdit/plugin-plantuml@0.16.0':
+    resolution: {integrity: sha512-ZjGOWYxPcGFq/TAJ2wOU6vCYH82685ERFQAC+xUsd/f6G41oGmk5i2aNqfNYYPmoQvcPvimGUPky9L6k2IXKXw==}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-spoiler@0.16.0':
+    resolution: {integrity: sha512-lm2lLx5H6649igzmbEe7KGsYfS6EOHn3Ps1ZdOHIFo0AY9eEh//gbjPOuJNJU58vtMnzLYzQHQKp/JqViYTIQQ==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-stylize@0.16.0':
+    resolution: {integrity: sha512-uxM9aFdgS5YCXOSNSdYyC+uXyCnmqv1VUPRNAv0g/iOts0pUp63ZEUEO2sNlbXj1rGGEWylXyXqh3OU9rRngzg==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-sub@0.16.0':
+    resolution: {integrity: sha512-XpGcZW11SAWuiWtx9aYugM67OLtQJSfN87Q/aZbEfm6ahgdbO5lAe/vBFTBmL9aDc2EVatytGeZL3kA7pfHlOA==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-sup@0.16.0':
+    resolution: {integrity: sha512-45Sws9TC9h9ZRB/IcXAae+uYXb+FkVr/rkr9eMYKMFKksjMBddN+WY3Gpl9O7LhaGPipqTkm68QZnRSS1jvFkw==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-tab@0.16.0':
+    resolution: {integrity: sha512-c+/oT319DIWaMHyx5chueW8cy4pjC7E09QOg3qp86abTCdG2ljGLOlMAQbst5i/iH684QG/i8EJpB4oUeQdhkw==}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-tasklist@0.16.0':
+    resolution: {integrity: sha512-pxVxartDd8LYxhdYxyrh4c7JEAq+4cEMLI1HNCHTMK9cfO+SoVd/YpibfrDUg+LHvffc8Pf2Yc8pWXNoW34B1g==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-tex@0.16.0':
+    resolution: {integrity: sha512-VWb5rJYP0eBRRjYhcaRE3r8UQkUaBXzu0l42ck7DOp+MSPsgXfS+bmk8/tyHG6/X/Mig9H92Lh1jzTqp3f5yKg==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mdit/plugin-uml@0.16.0':
+    resolution: {integrity: sha512-BIsq6PpmRgoThtVR2j4BGiRGis6jrcxxqQW3RICacrG52Ps2RWEGwu7B/IvXs+KJZJLJsrKFQ2Pqaxttbjx3kw==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      markdown-it: ^14.1.0
+    peerDependenciesMeta:
+      markdown-it:
+        optional: true
+
+  '@mermaid-js/parser@0.3.0':
+    resolution: {integrity: sha512-HsvL6zgE5sUPGgkIDlmAWR1HTNHz2Iy11BAWPTa4Jjabkpguy4Ze2gzfLrg6pdRuBvFwgUYyxiaNqZwrEEXepA==}
+
+  '@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3':
+    resolution: {integrity: sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==}
+
+  '@nodelib/fs.scandir@2.1.5':
+    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
+    engines: {node: '>= 8'}
+
+  '@nodelib/fs.stat@2.0.5':
+    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
+    engines: {node: '>= 8'}
+
+  '@nodelib/fs.walk@1.2.8':
+    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
+    engines: {node: '>= 8'}
+
+  '@parcel/watcher-android-arm64@2.5.1':
+    resolution: {integrity: sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [android]
+
+  '@parcel/watcher-darwin-arm64@2.5.1':
+    resolution: {integrity: sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@parcel/watcher-darwin-x64@2.5.1':
+    resolution: {integrity: sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@parcel/watcher-freebsd-x64@2.5.1':
+    resolution: {integrity: sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@parcel/watcher-linux-arm-glibc@2.5.1':
+    resolution: {integrity: sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm]
+    os: [linux]
+
+  '@parcel/watcher-linux-arm-musl@2.5.1':
+    resolution: {integrity: sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm]
+    os: [linux]
+
+  '@parcel/watcher-linux-arm64-glibc@2.5.1':
+    resolution: {integrity: sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@parcel/watcher-linux-arm64-musl@2.5.1':
+    resolution: {integrity: sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@parcel/watcher-linux-x64-glibc@2.5.1':
+    resolution: {integrity: sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [linux]
+
+  '@parcel/watcher-linux-x64-musl@2.5.1':
+    resolution: {integrity: sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [linux]
+
+  '@parcel/watcher-win32-arm64@2.5.1':
+    resolution: {integrity: sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@parcel/watcher-win32-ia32@2.5.1':
+    resolution: {integrity: sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@parcel/watcher-win32-x64@2.5.1':
+    resolution: {integrity: sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [win32]
+
+  '@parcel/watcher@2.5.1':
+    resolution: {integrity: sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==}
+    engines: {node: '>= 10.0.0'}
+
+  '@pkgr/core@0.1.1':
+    resolution: {integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==}
+    engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
+
+  '@polka/url@1.0.0-next.25':
+    resolution: {integrity: sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==}
+
+  '@rollup/plugin-alias@3.1.9':
+    resolution: {integrity: sha512-QI5fsEvm9bDzt32k39wpOwZhVzRcL5ydcffUHMyLVaVaLeC70I8TJZ17F1z1eMoLu4E/UOcH9BWVkKpIKdrfiw==}
+    engines: {node: '>=8.0.0'}
+    peerDependencies:
+      rollup: ^1.20.0||^2.0.0
+
+  '@rollup/pluginutils@5.1.0':
+    resolution: {integrity: sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
+
+  '@rollup/rollup-android-arm-eabi@4.34.6':
+    resolution: {integrity: sha512-+GcCXtOQoWuC7hhX1P00LqjjIiS/iOouHXhMdiDSnq/1DGTox4SpUvO52Xm+div6+106r+TcvOeo/cxvyEyTgg==}
+    cpu: [arm]
+    os: [android]
+
+  '@rollup/rollup-android-arm64@4.34.6':
+    resolution: {integrity: sha512-E8+2qCIjciYUnCa1AiVF1BkRgqIGW9KzJeesQqVfyRITGQN+dFuoivO0hnro1DjT74wXLRZ7QF8MIbz+luGaJA==}
+    cpu: [arm64]
+    os: [android]
+
+  '@rollup/rollup-darwin-arm64@4.34.6':
+    resolution: {integrity: sha512-z9Ib+OzqN3DZEjX7PDQMHEhtF+t6Mi2z/ueChQPLS/qUMKY7Ybn5A2ggFoKRNRh1q1T03YTQfBTQCJZiepESAg==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@rollup/rollup-darwin-x64@4.34.6':
+    resolution: {integrity: sha512-PShKVY4u0FDAR7jskyFIYVyHEPCPnIQY8s5OcXkdU8mz3Y7eXDJPdyM/ZWjkYdR2m0izD9HHWA8sGcXn+Qrsyg==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@rollup/rollup-freebsd-arm64@4.34.6':
+    resolution: {integrity: sha512-YSwyOqlDAdKqs0iKuqvRHLN4SrD2TiswfoLfvYXseKbL47ht1grQpq46MSiQAx6rQEN8o8URtpXARCpqabqxGQ==}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@rollup/rollup-freebsd-x64@4.34.6':
+    resolution: {integrity: sha512-HEP4CgPAY1RxXwwL5sPFv6BBM3tVeLnshF03HMhJYCNc6kvSqBgTMmsEjb72RkZBAWIqiPUyF1JpEBv5XT9wKQ==}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@rollup/rollup-linux-arm-gnueabihf@4.34.6':
+    resolution: {integrity: sha512-88fSzjC5xeH9S2Vg3rPgXJULkHcLYMkh8faix8DX4h4TIAL65ekwuQMA/g2CXq8W+NJC43V6fUpYZNjaX3+IIg==}
+    cpu: [arm]
+    os: [linux]
+
+  '@rollup/rollup-linux-arm-musleabihf@4.34.6':
+    resolution: {integrity: sha512-wM4ztnutBqYFyvNeR7Av+reWI/enK9tDOTKNF+6Kk2Q96k9bwhDDOlnCUNRPvromlVXo04riSliMBs/Z7RteEg==}
+    cpu: [arm]
+    os: [linux]
+
+  '@rollup/rollup-linux-arm64-gnu@4.34.6':
+    resolution: {integrity: sha512-9RyprECbRa9zEjXLtvvshhw4CMrRa3K+0wcp3KME0zmBe1ILmvcVHnypZ/aIDXpRyfhSYSuN4EPdCCj5Du8FIA==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@rollup/rollup-linux-arm64-musl@4.34.6':
+    resolution: {integrity: sha512-qTmklhCTyaJSB05S+iSovfo++EwnIEZxHkzv5dep4qoszUMX5Ca4WM4zAVUMbfdviLgCSQOu5oU8YoGk1s6M9Q==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@rollup/rollup-linux-loongarch64-gnu@4.34.6':
+    resolution: {integrity: sha512-4Qmkaps9yqmpjY5pvpkfOerYgKNUGzQpFxV6rnS7c/JfYbDSU0y6WpbbredB5cCpLFGJEqYX40WUmxMkwhWCjw==}
+    cpu: [loong64]
+    os: [linux]
+
+  '@rollup/rollup-linux-powerpc64le-gnu@4.34.6':
+    resolution: {integrity: sha512-Zsrtux3PuaxuBTX/zHdLaFmcofWGzaWW1scwLU3ZbW/X+hSsFbz9wDIp6XvnT7pzYRl9MezWqEqKy7ssmDEnuQ==}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@rollup/rollup-linux-riscv64-gnu@4.34.6':
+    resolution: {integrity: sha512-aK+Zp+CRM55iPrlyKiU3/zyhgzWBxLVrw2mwiQSYJRobCURb781+XstzvA8Gkjg/hbdQFuDw44aUOxVQFycrAg==}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@rollup/rollup-linux-s390x-gnu@4.34.6':
+    resolution: {integrity: sha512-WoKLVrY9ogmaYPXwTH326+ErlCIgMmsoRSx6bO+l68YgJnlOXhygDYSZe/qbUJCSiCiZAQ+tKm88NcWuUXqOzw==}
+    cpu: [s390x]
+    os: [linux]
+
+  '@rollup/rollup-linux-x64-gnu@4.34.6':
+    resolution: {integrity: sha512-Sht4aFvmA4ToHd2vFzwMFaQCiYm2lDFho5rPcvPBT5pCdC+GwHG6CMch4GQfmWTQ1SwRKS0dhDYb54khSrjDWw==}
+    cpu: [x64]
+    os: [linux]
+
+  '@rollup/rollup-linux-x64-musl@4.34.6':
+    resolution: {integrity: sha512-zmmpOQh8vXc2QITsnCiODCDGXFC8LMi64+/oPpPx5qz3pqv0s6x46ps4xoycfUiVZps5PFn1gksZzo4RGTKT+A==}
+    cpu: [x64]
+    os: [linux]
+
+  '@rollup/rollup-win32-arm64-msvc@4.34.6':
+    resolution: {integrity: sha512-3/q1qUsO/tLqGBaD4uXsB6coVGB3usxw3qyeVb59aArCgedSF66MPdgRStUd7vbZOsko/CgVaY5fo2vkvPLWiA==}
+    cpu: [arm64]
+    os: [win32]
+
+  '@rollup/rollup-win32-ia32-msvc@4.34.6':
+    resolution: {integrity: sha512-oLHxuyywc6efdKVTxvc0135zPrRdtYVjtVD5GUm55I3ODxhU/PwkQFD97z16Xzxa1Fz0AEe4W/2hzRtd+IfpOA==}
+    cpu: [ia32]
+    os: [win32]
+
+  '@rollup/rollup-win32-x64-msvc@4.34.6':
+    resolution: {integrity: sha512-0PVwmgzZ8+TZ9oGBmdZoQVXflbvuwzN/HRclujpl4N/q3i+y0lqLw8n1bXA8ru3sApDjlmONaNAuYr38y1Kr9w==}
+    cpu: [x64]
+    os: [win32]
+
+  '@sec-ant/readable-stream@0.4.1':
+    resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==}
+
+  '@shikijs/core@2.3.2':
+    resolution: {integrity: sha512-s7vyL3LzUKm3Qwf36zRWlavX9BQMZTIq9B1almM63M5xBuSldnsTHCmsXzoF/Kyw4k7Xgas7yAyJz9VR/vcP1A==}
+
+  '@shikijs/engine-javascript@2.3.2':
+    resolution: {integrity: sha512-w3IEMu5HfL/OaJTsMbIfZ1HRPnWVYRANeDtmsdIIEgUOcLjzFJFQwlnkckGjKHekEzNqlMLbgB/twnfZ/EEAGg==}
+
+  '@shikijs/engine-oniguruma@2.3.2':
+    resolution: {integrity: sha512-vikMY1TroyZXUHIXbMnvY/mjtOxMn+tavcfAeQPgWS9FHcgFSUoEtywF5B5sOLb9NXb8P2vb7odkh3nj15/00A==}
+
+  '@shikijs/langs@2.3.2':
+    resolution: {integrity: sha512-UqI6bSxFzhexIJficZLKeB1L2Sc3xoNiAV0yHpfbg5meck93du+EKQtsGbBv66Ki53XZPhnR/kYkOr85elIuFw==}
+
+  '@shikijs/themes@2.3.2':
+    resolution: {integrity: sha512-QAh7D/hhfYKHibkG2tti8vxNt3ekAH5EqkXJeJbTh7FGvTCWEI7BHqNCtMdjFvZ0vav5nvUgdvA7/HI7pfsB4w==}
+
+  '@shikijs/transformers@2.3.2':
+    resolution: {integrity: sha512-2HDnJumw8A/9GecRpTgvfqSbPjEbJ4DPWq5J++OVP1gNMLvbV0MqFsP4canqRNM1LqB7VmWY45Stipb0ZIJ+0A==}
+
+  '@shikijs/types@2.3.2':
+    resolution: {integrity: sha512-CBaMY+a3pepyC4SETi7+bSzO0f6hxEQJUUuS4uD7zppzjmrN4ZRtBqxaT+wOan26CR9eeJ5iBhc4qvWEwn7Eeg==}
+
+  '@shikijs/vscode-textmate@10.0.1':
+    resolution: {integrity: sha512-fTIQwLF+Qhuws31iw7Ncl1R3HUDtGwIipiJ9iU+UsDUwMhegFcQKQHd51nZjb7CArq0MvON8rbgCGQYWHUKAdg==}
+
+  '@sindresorhus/merge-streams@2.3.0':
+    resolution: {integrity: sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==}
+    engines: {node: '>=18'}
+
+  '@sindresorhus/merge-streams@4.0.0':
+    resolution: {integrity: sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==}
+    engines: {node: '>=18'}
+
+  '@stackblitz/sdk@1.11.0':
+    resolution: {integrity: sha512-DFQGANNkEZRzFk1/rDP6TcFdM82ycHE+zfl9C/M/jXlH68jiqHWHFMQURLELoD8koxvu/eW5uhg94NSAZlYrUQ==}
+
+  '@types/debug@4.1.12':
+    resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==}
+
+  '@types/estree@1.0.6':
+    resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==}
+
+  '@types/fs-extra@11.0.4':
+    resolution: {integrity: sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==}
+
+  '@types/glob@7.2.0':
+    resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==}
+
+  '@types/hash-sum@1.0.2':
+    resolution: {integrity: sha512-UP28RddqY8xcU0SCEp9YKutQICXpaAq9N8U2klqF5hegGha7KzTOL8EdhIIV3bOSGBzjEpN9bU/d+nNZBdJYVw==}
+
+  '@types/hast@3.0.4':
+    resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==}
+
+  '@types/json5@0.0.29':
     resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
 
-  '@types/jsonfile@6.1.4':
-    resolution: {integrity: sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==}
+  '@types/jsonfile@6.1.4':
+    resolution: {integrity: sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==}
+
+  '@types/linkify-it@5.0.0':
+    resolution: {integrity: sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==}
+
+  '@types/markdown-it-emoji@3.0.1':
+    resolution: {integrity: sha512-cz1j8R35XivBqq9mwnsrP2fsz2yicLhB8+PDtuVkKOExwEdsVBNI+ROL3sbhtR5occRZ66vT0QnwFZCqdjf3pA==}
+
+  '@types/markdown-it@14.1.2':
+    resolution: {integrity: sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==}
+
+  '@types/mdast@4.0.4':
+    resolution: {integrity: sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==}
+
+  '@types/mdurl@2.0.0':
+    resolution: {integrity: sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==}
+
+  '@types/minimatch@5.1.2':
+    resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==}
+
+  '@types/ms@0.7.31':
+    resolution: {integrity: sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==}
+
+  '@types/node@17.0.45':
+    resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
+
+  '@types/sax@1.2.7':
+    resolution: {integrity: sha512-rO73L89PJxeYM3s3pPPjiPgVVcymqU490g0YO5n5By0k2Erzj6tay/4lr1CHAAU4JyOWd1rpQ8bCf6cZfHU96A==}
+
+  '@types/trusted-types@2.0.7':
+    resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==}
+
+  '@types/unist@3.0.3':
+    resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==}
+
+  '@types/web-bluetooth@0.0.20':
+    resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==}
+
+  '@typescript-eslint/eslint-plugin@7.16.0':
+    resolution: {integrity: sha512-py1miT6iQpJcs1BiJjm54AMzeuMPBSPuKPlnT8HlfudbcS5rYeX5jajpLf3mrdRh9dA/Ec2FVUY0ifeVNDIhZw==}
+    engines: {node: ^18.18.0 || >=20.0.0}
+    peerDependencies:
+      '@typescript-eslint/parser': ^7.0.0
+      eslint: ^8.56.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/parser@7.16.0':
+    resolution: {integrity: sha512-ar9E+k7CU8rWi2e5ErzQiC93KKEFAXA2Kky0scAlPcxYblLt8+XZuHUZwlyfXILyQa95P6lQg+eZgh/dDs3+Vw==}
+    engines: {node: ^18.18.0 || >=20.0.0}
+    peerDependencies:
+      eslint: ^8.56.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/scope-manager@7.16.0':
+    resolution: {integrity: sha512-8gVv3kW6n01Q6TrI1cmTZ9YMFi3ucDT7i7aI5lEikk2ebk1AEjrwX8MDTdaX5D7fPXMBLvnsaa0IFTAu+jcfOw==}
+    engines: {node: ^18.18.0 || >=20.0.0}
+
+  '@typescript-eslint/type-utils@7.16.0':
+    resolution: {integrity: sha512-j0fuUswUjDHfqV/UdW6mLtOQQseORqfdmoBNDFOqs9rvNVR2e+cmu6zJu/Ku4SDuqiJko6YnhwcL8x45r8Oqxg==}
+    engines: {node: ^18.18.0 || >=20.0.0}
+    peerDependencies:
+      eslint: ^8.56.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/types@7.16.0':
+    resolution: {integrity: sha512-fecuH15Y+TzlUutvUl9Cc2XJxqdLr7+93SQIbcZfd4XRGGKoxyljK27b+kxKamjRkU7FYC6RrbSCg0ALcZn/xw==}
+    engines: {node: ^18.18.0 || >=20.0.0}
+
+  '@typescript-eslint/typescript-estree@7.16.0':
+    resolution: {integrity: sha512-a5NTvk51ZndFuOLCh5OaJBELYc2O3Zqxfl3Js78VFE1zE46J2AaVuW+rEbVkQznjkmlzWsUI15BG5tQMixzZLw==}
+    engines: {node: ^18.18.0 || >=20.0.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/utils@7.16.0':
+    resolution: {integrity: sha512-PqP4kP3hb4r7Jav+NiRCntlVzhxBNWq6ZQ+zQwII1y/G/1gdIPeYDCKr2+dH6049yJQsWZiHU6RlwvIFBXXGNA==}
+    engines: {node: ^18.18.0 || >=20.0.0}
+    peerDependencies:
+      eslint: ^8.56.0
+
+  '@typescript-eslint/visitor-keys@7.16.0':
+    resolution: {integrity: sha512-rMo01uPy9C7XxG7AFsxa8zLnWXTF8N3PYclekWSrurvhwiw1eW88mrKiAYe6s53AUY57nTRz8dJsuuXdkAhzCg==}
+    engines: {node: ^18.18.0 || >=20.0.0}
+
+  '@ungap/structured-clone@1.2.0':
+    resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
+
+  '@vitejs/plugin-vue@5.2.1':
+    resolution: {integrity: sha512-cxh314tzaWwOLqVes2gnnCtvBDcM1UMdn+iFR+UjAn411dPT3tOmqrJjbMd7koZpMAmBM/GqeV4n9ge7JSiJJQ==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+    peerDependencies:
+      vite: ^5.0.0 || ^6.0.0
+      vue: ^3.2.25
+
+  '@vue/babel-helper-vue-transform-on@1.2.2':
+    resolution: {integrity: sha512-nOttamHUR3YzdEqdM/XXDyCSdxMA9VizUKoroLX6yTyRtggzQMHXcmwh8a7ZErcJttIBIc9s68a1B8GZ+Dmvsw==}
+
+  '@vue/babel-plugin-jsx@1.2.2':
+    resolution: {integrity: sha512-nYTkZUVTu4nhP199UoORePsql0l+wj7v/oyQjtThUVhJl1U+6qHuoVhIvR3bf7eVKjbCK+Cs2AWd7mi9Mpz9rA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+
+  '@vue/babel-plugin-resolve-type@1.2.2':
+    resolution: {integrity: sha512-EntyroPwNg5IPVdUJupqs0CFzuf6lUrVvCspmv2J1FITLeGnUCuoGNNk78dgCusxEiYj6RMkTJflGSxk5aIC4A==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@vue/compiler-core@3.4.31':
+    resolution: {integrity: sha512-skOiodXWTV3DxfDhB4rOf3OGalpITLlgCeOwb+Y9GJpfQ8ErigdBUHomBzvG78JoVE8MJoQsb+qhZiHfKeNeEg==}
+
+  '@vue/compiler-core@3.4.38':
+    resolution: {integrity: sha512-8IQOTCWnLFqfHzOGm9+P8OPSEDukgg3Huc92qSG49if/xI2SAwLHQO2qaPQbjCWPBcQoO1WYfXfTACUrWV3c5A==}
+
+  '@vue/compiler-core@3.5.13':
+    resolution: {integrity: sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==}
+
+  '@vue/compiler-dom@3.4.31':
+    resolution: {integrity: sha512-wK424WMXsG1IGMyDGyLqB+TbmEBFM78hIsOJ9QwUVLGrcSk0ak6zYty7Pj8ftm7nEtdU/DGQxAXp0/lM/2cEpQ==}
+
+  '@vue/compiler-dom@3.4.38':
+    resolution: {integrity: sha512-Osc/c7ABsHXTsETLgykcOwIxFktHfGSUDkb05V61rocEfsFDcjDLH/IHJSNJP+/Sv9KeN2Lx1V6McZzlSb9EhQ==}
+
+  '@vue/compiler-dom@3.5.13':
+    resolution: {integrity: sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==}
+
+  '@vue/compiler-sfc@3.4.31':
+    resolution: {integrity: sha512-einJxqEw8IIJxzmnxmJBuK2usI+lJonl53foq+9etB2HAzlPjAS/wa7r0uUpXw5ByX3/0uswVSrjNb17vJm1kQ==}
+
+  '@vue/compiler-sfc@3.4.38':
+    resolution: {integrity: sha512-s5QfZ+9PzPh3T5H4hsQDJtI8x7zdJaew/dCGgqZ2630XdzaZ3AD8xGZfBqpT8oaD/p2eedd+pL8tD5vvt5ZYJQ==}
+
+  '@vue/compiler-sfc@3.5.13':
+    resolution: {integrity: sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==}
+
+  '@vue/compiler-ssr@3.4.31':
+    resolution: {integrity: sha512-RtefmITAje3fJ8FSg1gwgDhdKhZVntIVbwupdyZDSifZTRMiWxWehAOTCc8/KZDnBOcYQ4/9VWxsTbd3wT0hAA==}
+
+  '@vue/compiler-ssr@3.4.38':
+    resolution: {integrity: sha512-YXznKFQ8dxYpAz9zLuVvfcXhc31FSPFDcqr0kyujbOwNhlmaNvL2QfIy+RZeJgSn5Fk54CWoEUeW+NVBAogGaw==}
+
+  '@vue/compiler-ssr@3.5.13':
+    resolution: {integrity: sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==}
+
+  '@vue/devtools-api@6.6.3':
+    resolution: {integrity: sha512-0MiMsFma/HqA6g3KLKn+AGpL1kgKhFWszC9U29NfpWK5LE7bjeXxySWJrOJ77hBz+TBrBQ7o4QJqbPbqbs8rJw==}
+
+  '@vue/devtools-api@6.6.4':
+    resolution: {integrity: sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==}
+
+  '@vue/devtools-api@7.7.2':
+    resolution: {integrity: sha512-1syn558KhyN+chO5SjlZIwJ8bV/bQ1nOVTG66t2RbG66ZGekyiYNmRO7X9BJCXQqPsFHlnksqvPhce2qpzxFnA==}
+
+  '@vue/devtools-core@7.3.8':
+    resolution: {integrity: sha512-mEwsR7GMklWuPOBH/++DiJe0GWqQ0syDtWP0HhU8m9tebs5zQtujMXrgu+cgBAKquJAWnBz0PwNzBgBD2P+M9A==}
+    peerDependencies:
+      vue: ^3.0.0
+
+  '@vue/devtools-kit@7.3.8':
+    resolution: {integrity: sha512-HYy3MQP1nZ6GbE4vrgJ/UB+MvZnhYmEwCa/UafrEpdpwa+jNCkz1ZdUrC5I7LpkH1ShREEV2/pZlAQdBj+ncLQ==}
+
+  '@vue/devtools-kit@7.7.2':
+    resolution: {integrity: sha512-CY0I1JH3Z8PECbn6k3TqM1Bk9ASWxeMtTCvZr7vb+CHi+X/QwQm5F1/fPagraamKMAHVfuuCbdcnNg1A4CYVWQ==}
+
+  '@vue/devtools-shared@7.3.8':
+    resolution: {integrity: sha512-1NiJbn7Yp47nPDWhFZyEKpB2+5/+7JYv8IQnU0ccMrgslPR2dL7u1DIyI7mLqy4HN1ll36gQy0k8GqBYSFgZJw==}
+
+  '@vue/devtools-shared@7.7.2':
+    resolution: {integrity: sha512-uBFxnp8gwW2vD6FrJB8JZLUzVb6PNRG0B0jBnHsOH8uKyva2qINY8PTF5Te4QlTbMDqU5K6qtJDr6cNsKWhbOA==}
+
+  '@vue/reactivity@3.4.31':
+    resolution: {integrity: sha512-VGkTani8SOoVkZNds1PfJ/T1SlAIOf8E58PGAhIOUDYPC4GAmFA2u/E14TDAFcf3vVDKunc4QqCe/SHr8xC65Q==}
+
+  '@vue/reactivity@3.5.13':
+    resolution: {integrity: sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==}
+
+  '@vue/runtime-core@3.4.31':
+    resolution: {integrity: sha512-LDkztxeUPazxG/p8c5JDDKPfkCDBkkiNLVNf7XZIUnJ+66GVGkP+TIh34+8LtPisZ+HMWl2zqhIw0xN5MwU1cw==}
+
+  '@vue/runtime-core@3.5.13':
+    resolution: {integrity: sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==}
+
+  '@vue/runtime-dom@3.4.31':
+    resolution: {integrity: sha512-2Auws3mB7+lHhTFCg8E9ZWopA6Q6L455EcU7bzcQ4x6Dn4cCPuqj6S2oBZgN2a8vJRS/LSYYxwFFq2Hlx3Fsaw==}
+
+  '@vue/runtime-dom@3.5.13':
+    resolution: {integrity: sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==}
+
+  '@vue/server-renderer@3.4.31':
+    resolution: {integrity: sha512-D5BLbdvrlR9PE3by9GaUp1gQXlCNadIZytMIb8H2h3FMWJd4oUfkUTEH2wAr3qxoRz25uxbTcbqd3WKlm9EHQA==}
+    peerDependencies:
+      vue: 3.4.31
+
+  '@vue/server-renderer@3.5.13':
+    resolution: {integrity: sha512-wAi4IRJV/2SAW3htkTlB+dHeRmpTiVIK1OGLWV1yeStVSebSQQOwGwIq0D3ZIoBj2C2qpgz5+vX9iEBkTdk5YA==}
+    peerDependencies:
+      vue: 3.5.13
+
+  '@vue/shared@3.4.31':
+    resolution: {integrity: sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA==}
+
+  '@vue/shared@3.4.38':
+    resolution: {integrity: sha512-q0xCiLkuWWQLzVrecPb0RMsNWyxICOjPrcrwxTUEHb1fsnvni4dcuyG7RT/Ie7VPTvnjzIaWzRMUBsrqNj/hhw==}
+
+  '@vue/shared@3.5.13':
+    resolution: {integrity: sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==}
+
+  '@vuelidate/core@2.0.3':
+    resolution: {integrity: sha512-AN6l7KF7+mEfyWG0doT96z+47ljwPpZfi9/JrNMkOGLFv27XVZvKzRLXlmDPQjPl/wOB1GNnHuc54jlCLRNqGA==}
+    peerDependencies:
+      '@vue/composition-api': ^1.0.0-rc.1
+      vue: ^2.0.0 || >=3.0.0
+    peerDependenciesMeta:
+      '@vue/composition-api':
+        optional: true
+
+  '@vuepress/bundler-vite@2.0.0-rc.19':
+    resolution: {integrity: sha512-Vn0wEVRcdAld+8NJeELSwrj5JEPObRn0xpRWtAau/UwVWHmMLo16RRkTvXdjSiwpDWeP/9ztC5buyTXVoeb7Dw==}
+
+  '@vuepress/bundlerutils@2.0.0-rc.19':
+    resolution: {integrity: sha512-ln5htptK14OMJV3yeGRxAwYhSkVxrTwEHEaifeWrFvjuNxj2kLmkCl7MDdzr232jSOWwkCcmbOyafbxMsaRDkQ==}
+
+  '@vuepress/cli@2.0.0-rc.19':
+    resolution: {integrity: sha512-QFicPNIj3RZAJbHoLbeYlPJsPchnQLGuw0n8xv0eeUi9ejEXO1huWA8sLoPbTGdiDW+PHr1MHnaVMkyUfwaKcQ==}
+    hasBin: true
+
+  '@vuepress/client@2.0.0-rc.19':
+    resolution: {integrity: sha512-vUAU6n4qmtXqthxkb4LHq0D+VWSDenwBDf0jUs7RaBLuOVrbPtmH/hs4k1vLIlGdwC3Zs/G6tlB4UmuZiiwR8Q==}
+
+  '@vuepress/core@2.0.0-rc.19':
+    resolution: {integrity: sha512-rvmBPMIWS2dey/2QjxZoO0OcrUU46NE3mSLk3oU7JOP0cG7xvRxf6U1OXiwYLC3fPO4g6XbHiKe6gihkmL6VDA==}
+
+  '@vuepress/helper@2.0.0-rc.74':
+    resolution: {integrity: sha512-k0FjkM9TKggcWkyZwXj4cLUIF3FBJ5iZGnC+Ln4OJVGD7k3SvT7TL7IaCZoFBIXTlepZwytsIN7K5Lbmpx0GfQ==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/highlighter-helper@2.0.0-rc.71':
+    resolution: {integrity: sha512-Hi9ira4VmX1MuRcagbSIZ/hHtwB4Fduz/NfiFGmOYX68zWIsQ1e90Ntku8GeI2MEDWlFxGU8PY/7VcXwINjoXQ==}
+    peerDependencies:
+      '@vueuse/core': ^12.2.0
+      vuepress: 2.0.0-rc.19
+    peerDependenciesMeta:
+      '@vueuse/core':
+        optional: true
+
+  '@vuepress/markdown@2.0.0-rc.19':
+    resolution: {integrity: sha512-6jgUXhpEK55PEEGtPhz7Hq/JqTbLU8n9w2D7emXiK2FYcbeKpjoRIbVRzmzB/dXeK3NzHChANu2IIqpOT6Ba1w==}
+
+  '@vuepress/plugin-active-header-links@2.0.0-rc.74':
+    resolution: {integrity: sha512-ErXPpq52hKS0AubppT8HOqST5BBr2ibMK8LF2ctmoS7fZr8VlRysVn6jpLRGdDG+hBIHqbHsitBwMp5y1k99ag==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-back-to-top@2.0.0-rc.74':
+    resolution: {integrity: sha512-/r7pUarK67s3ZedfoUQ7JxcOcrSTxcSMiu6ozQW5vfe7s3d2WzIeaW/dsXPlmAdCEU0MZcb5RXRCNHBdZ9Zo2Q==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-blog@2.0.0-rc.74':
+    resolution: {integrity: sha512-CxVrkwLT3BHkwWaEyaaqeZ5YZ9kdqLaNjTidw9zMK0LAFCm62MrCUrhJnUeSEy233Gi3YYSiCV8hPRnUDMMa7A==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-catalog@2.0.0-rc.74':
+    resolution: {integrity: sha512-Oqz5BXVVdGfGlfTg+wxwUn5RFCPIVkLykBejMJy6E5oLeQC7Ofp9tg9KJze6nPoknXJWY78MEwRq0UQIC9oX9g==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-comment@2.0.0-rc.74':
+    resolution: {integrity: sha512-pBDe4Ua5UOme3C4FWW1ZCXiTMGjOL5YppOtwexmrPxFMZ3G5OpN2Eli5AHQjsl2lQADtDwciKuVFspTpNWbdFw==}
+    peerDependencies:
+      '@waline/client': ^3.5.0
+      artalk: ^2.9.0
+      twikoo: ^1.6.39
+      vuepress: 2.0.0-rc.19
+    peerDependenciesMeta:
+      '@waline/client':
+        optional: true
+      artalk:
+        optional: true
+      twikoo:
+        optional: true
+
+  '@vuepress/plugin-copy-code@2.0.0-rc.74':
+    resolution: {integrity: sha512-flyUj8Xwj0G2jKMTtTrdJGpMS4By90kJGgEbxDTobV4t/98hpBBvEiL1AQ8oGIcQFHH6U+eNRPytde6/7NxKlw==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-copyright@2.0.0-rc.74':
+    resolution: {integrity: sha512-T0KM753aiJsfXPgWSRIdKHit4CB9pNDCXcz1xRBMKRtI2WdajWPHpF7clrmgIwmZzvgNhxz5DtW80vDbyp0G0A==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-git@2.0.0-rc.68':
+    resolution: {integrity: sha512-k/tXBSIyQM26UrmDK/mN1/q6gw8PmF2uLyIaso+B39qCOFQKUBq4uJF2a0oYTq9tpjM5AHwwBpytPE5cdV/BPQ==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-icon@2.0.0-rc.74':
+    resolution: {integrity: sha512-JwodDsB5jQuoqFEW7cAWNyJG1GyiEaHiaLphIPjZZaO+QIt5wgRakhydd8VK/PqICzav/WO8LknN/i6OqhpUYw==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-links-check@2.0.0-rc.74':
+    resolution: {integrity: sha512-/g+mosEv2iqbTVD7QpPIP0f0OGC8cQEO6VZgwxj25Swcnq0ndsuq0NOO+SIRasdYZe2xTZ94eNXcZEcKlCA9uw==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-markdown-ext@2.0.0-rc.74':
+    resolution: {integrity: sha512-+SrSu95GKoGSCvIG1EAMctF7YKbbPAc3phbz0DuywuJjhEo7dC8T74tYGwj+AG8BFTVPFr3rMJTssdpHiUogNw==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-markdown-hint@2.0.0-rc.74':
+    resolution: {integrity: sha512-1vC11eie+85XoIxQNWFgevpkYCcnc3DMi+x7WAc89+7yk0gP7zJVolWaPH1lLNfmoMxmpfms5ssEnUpr3vHMEQ==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-markdown-image@2.0.0-rc.74':
+    resolution: {integrity: sha512-x0j3FNBoexTRurgy0ycPnW8na4FR5pJC1n/vAInqu5w6U2O7PANr7tgKUz2r+XXfRpNh3j5JyLKWmJLvHdu8UA==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-markdown-include@2.0.0-rc.74':
+    resolution: {integrity: sha512-yLoWBhlOoWLQrMD30hFKquNt7IZvQiW45O5unztEy2F9bI1MicyBxUnbSMe8d+HNkuAaKxIeDqyt5pVFbqLb0w==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-markdown-math@2.0.0-rc.74':
+    resolution: {integrity: sha512-C0rG1A1I3fxrQ1VQtNepnoPuUnnjtNd9lFaW8WeEIKuLQVt2jWKjPXK6yMeu/0OwtyYYPZ5PJmofn0mFLbOZTw==}
+    peerDependencies:
+      katex: ^0.16.10
+      mathjax-full: ^3.2.2
+      vuepress: 2.0.0-rc.19
+    peerDependenciesMeta:
+      katex:
+        optional: true
+      mathjax-full:
+        optional: true
+
+  '@vuepress/plugin-markdown-stylize@2.0.0-rc.75':
+    resolution: {integrity: sha512-ratBXmz4TeOANsjyC4/F0K3kUe0YpFF8+OoPmX6GqqnVnk0UAM50BALYy+ca1R2imC0HRXSWp2jEmsKRCTt6OQ==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-markdown-tab@2.0.0-rc.74':
+    resolution: {integrity: sha512-LhsOEVDfOLpyjBKwx9ZsMbWD8NVQkHgjT+AbZMd2f+fnOaTw7cvWtJxTsg6yQZt2c0Wc3268WtaqxeuqaHTZ6w==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-notice@2.0.0-rc.74':
+    resolution: {integrity: sha512-6cVP7x5zDup+65tjkRnZhBy3tHXhN7pNcBcACKrLE/G3p1rb6SZiSoNk1H2Iva0RAFARzP1fztgTgasLWurofg==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-nprogress@2.0.0-rc.74':
+    resolution: {integrity: sha512-tgbMm2+MwJaUzqTBioeXYs8gaPXS9gYbvTg6HpFU0B4dJJ3CBq62CZEuord6T3Q6m/PnZz1H98bb3BmosKg1OA==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-photo-swipe@2.0.0-rc.74':
+    resolution: {integrity: sha512-yeFIXmlzefQOrKBFWKN4KYi8YM8rKRMD2M/L1hqtPp1rBudhfOva4c6ZKqgYnTyf7A1KlZRer1QCUQ3GWdRxew==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-reading-time@2.0.0-rc.74':
+    resolution: {integrity: sha512-VK7hwq077eiZ4igVLzX01Dioxy40DXqCSgNHtoycfrsQjqBuxyokVEQHe2+q0jvGLBXcrt381x/ZCDsUwVZhDw==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-redirect@2.0.0-rc.74':
+    resolution: {integrity: sha512-zSfwcKD25MBGC2BZ/VD6XxJtpgDeUoAbZvkn3kuhakYllUHz94cFmxgbu+RukwL78Nam/UFj6ukyh4YCH3mMgg==}
+    hasBin: true
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-rtl@2.0.0-rc.74':
+    resolution: {integrity: sha512-T77zrw5htxe3uwjgqPKN1iU2zQlPnXl/YrQPVqIWEJJ4uNt93ZLyU892SiGWXNFMmqn8wes9PziCzBEAXqlKkQ==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-sass-palette@2.0.0-rc.74':
+    resolution: {integrity: sha512-bNXw/mMQrgRhhWGKx/W+agFORLbR33Z6FyNbGk6u7ZCSkuKlMcu8A5H+GLl4Jr0uvTTF6UESAxsJZVtRGZcTSQ==}
+    peerDependencies:
+      sass: ^1.80.3
+      sass-embedded: ^1.80.3
+      sass-loader: ^16.0.2
+      vuepress: 2.0.0-rc.19
+    peerDependenciesMeta:
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+      sass-loader:
+        optional: true
+
+  '@vuepress/plugin-search@2.0.0-rc.74':
+    resolution: {integrity: sha512-zDSl/vLRjtQIT8a8jZJ/fFQyJYZMSqcFJFUqpOWojNgDiTNZwa83PJxl0Tq8YdfSgmi4odwTl06xzpAuY6Pi3g==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-seo@2.0.0-rc.74':
+    resolution: {integrity: sha512-Z5Q35Y3TALhfhOs8DocBtQcyRCp0/Btjec7DfnDih5p5rhRI7dHI7DIdf9aJHTuz1VxpzCfru6sApqSdbPlc5g==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-shiki@2.0.0-rc.74':
+    resolution: {integrity: sha512-75wMcxa18JhFdTpGPzCeKJl0bc6gZ/ODKRbJo7wRRNLo3UOFBAcqTER3az2hi5b1xVUKrLWkbULSGivfeyvPSw==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-sitemap@2.0.0-rc.74':
+    resolution: {integrity: sha512-Kbr9u3fryw34s9ZdxY4fKsCQcN74aFal34CJ4xPxx5E6liE9Rp+gOWevOl89qYXfXgPfyHHJlW5KYfonaZe9Sw==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/plugin-theme-data@2.0.0-rc.74':
+    resolution: {integrity: sha512-6uQPv4kRakqcEPWmL3ZYKqjXqzOVycAdlr7oQlxs23E8CO59/QyIcrkloHPsdI+VhAA3v46NdiVD2TIrESRm6A==}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
+
+  '@vuepress/shared@2.0.0-rc.19':
+    resolution: {integrity: sha512-xaDeZxX0Qetc2Y6/lrzO6M/40i3LmMm7Fk85bOftBBOaNehZ24RdsmIHBJDDv+bTUv+DBF++1/mOtbt6DBRzEA==}
+
+  '@vuepress/utils@2.0.0-rc.19':
+    resolution: {integrity: sha512-cgzk8/aJquZKgFMNTuqdjbU5NrCzrPmdTyhYBcmliL/6N/He1OTWn3PD9QWUGJNODb1sPRJpklZnCpU07waLmg==}
+
+  '@vueuse/core@12.5.0':
+    resolution: {integrity: sha512-GVyH1iYqNANwcahAx8JBm6awaNgvR/SwZ1fjr10b8l1HIgDp82ngNbfzJUgOgWEoxjL+URAggnlilAEXwCOZtg==}
+
+  '@vueuse/metadata@12.5.0':
+    resolution: {integrity: sha512-Ui7Lo2a7AxrMAXRF+fAp9QsXuwTeeZ8fIB9wsLHqzq9MQk+2gMYE2IGJW48VMJ8ecvCB3z3GsGLKLbSasQ5Qlg==}
+
+  '@vueuse/shared@12.5.0':
+    resolution: {integrity: sha512-vMpcL1lStUU6O+kdj6YdHDixh0odjPAUM15uJ9f7MY781jcYkIwFA4iv2EfoIPO6vBmvutI1HxxAwmf0cx5ISQ==}
+
+  acorn-jsx@5.3.2:
+    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
+    peerDependencies:
+      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+
+  acorn@8.12.1:
+    resolution: {integrity: sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
+  aggregate-error@3.1.0:
+    resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
+    engines: {node: '>=8'}
+
+  ajv@6.12.6:
+    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
+
+  ansi-regex@5.0.1:
+    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
+    engines: {node: '>=8'}
+
+  ansi-regex@6.0.1:
+    resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
+    engines: {node: '>=12'}
+
+  ansi-styles@3.2.1:
+    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
+    engines: {node: '>=4'}
+
+  ansi-styles@4.3.0:
+    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
+    engines: {node: '>=8'}
+
+  anymatch@3.1.2:
+    resolution: {integrity: sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==}
+    engines: {node: '>= 8'}
+
+  arg@5.0.2:
+    resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==}
+
+  argparse@1.0.10:
+    resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
+
+  argparse@2.0.1:
+    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
+
+  array-buffer-byte-length@1.0.1:
+    resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==}
+    engines: {node: '>= 0.4'}
+
+  array-includes@3.1.8:
+    resolution: {integrity: sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==}
+    engines: {node: '>= 0.4'}
+
+  array-union@2.1.0:
+    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
+    engines: {node: '>=8'}
+
+  array.prototype.findlastindex@1.2.5:
+    resolution: {integrity: sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.flat@1.3.2:
+    resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.flatmap@1.3.2:
+    resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==}
+    engines: {node: '>= 0.4'}
+
+  arraybuffer.prototype.slice@1.0.3:
+    resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==}
+    engines: {node: '>= 0.4'}
+
+  atob@2.1.2:
+    resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
+    engines: {node: '>= 4.5.0'}
+    hasBin: true
+
+  autoprefixer@10.4.20:
+    resolution: {integrity: sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==}
+    engines: {node: ^10 || ^12 || >=14}
+    hasBin: true
+    peerDependencies:
+      postcss: ^8.1.0
+
+  available-typed-arrays@1.0.7:
+    resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
+    engines: {node: '>= 0.4'}
+
+  babel-plugin-polyfill-corejs2@0.4.11:
+    resolution: {integrity: sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
+  babel-plugin-polyfill-corejs3@0.10.6:
+    resolution: {integrity: sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
+  babel-plugin-polyfill-regenerator@0.6.2:
+    resolution: {integrity: sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
+  balanced-match@1.0.2:
+    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
+
+  balloon-css@1.2.0:
+    resolution: {integrity: sha512-urXwkHgwp6GsXVF+it01485Z2Cj4pnW02ICnM0TemOlkKmCNnDLmyy+ZZiRXBpwldUXO+aRNr7Hdia4CBvXJ5A==}
+
+  bcrypt-ts@5.0.3:
+    resolution: {integrity: sha512-2FcgD12xPbwCoe5i9/HK0jJ1xA1m+QfC1e6htG9Bl/hNOnLyaFmQSlqLKcfe3QdnoMPKpKEGFCbESBTg+SJNOw==}
+    engines: {node: '>=18'}
+
+  binary-extensions@2.2.0:
+    resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
+    engines: {node: '>=8'}
+
+  birpc@0.2.17:
+    resolution: {integrity: sha512-+hkTxhot+dWsLpp3gia5AkVHIsKlZybNT5gIYiDlNzJrmYPcTM9k5/w2uaj3IPpd7LlEYpmCj4Jj1nC41VhDFg==}
+
+  birpc@0.2.19:
+    resolution: {integrity: sha512-5WeXXAvTmitV1RqJFppT5QtUiz2p1mRSYU000Jkft5ZUCLJIk4uQriYNO50HknxKwM6jd8utNc66K1qGIwwWBQ==}
+
+  boolbase@1.0.0:
+    resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
+
+  brace-expansion@1.1.11:
+    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
+
+  brace-expansion@2.0.1:
+    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
+
+  braces@3.0.3:
+    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
+    engines: {node: '>=8'}
+
+  browserslist@4.23.2:
+    resolution: {integrity: sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
+
+  browserslist@4.23.3:
+    resolution: {integrity: sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
+
+  builtin-modules@3.3.0:
+    resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==}
+    engines: {node: '>=6'}
+
+  builtins@5.1.0:
+    resolution: {integrity: sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==}
+
+  bundle-name@4.1.0:
+    resolution: {integrity: sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==}
+    engines: {node: '>=18'}
+
+  cac@6.7.14:
+    resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
+    engines: {node: '>=8'}
+
+  call-bind@1.0.7:
+    resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==}
+    engines: {node: '>= 0.4'}
+
+  callsites@3.1.0:
+    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
+    engines: {node: '>=6'}
+
+  camelcase@5.3.1:
+    resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
+    engines: {node: '>=6'}
+
+  camelcase@6.3.0:
+    resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
+    engines: {node: '>=10'}
+
+  caniuse-lite@1.0.30001641:
+    resolution: {integrity: sha512-Phv5thgl67bHYo1TtMY/MurjkHhV4EDaCosezRXgZ8jzA/Ub+wjxAvbGvjoFENStinwi5kCyOYV3mi5tOGykwA==}
+
+  caniuse-lite@1.0.30001651:
+    resolution: {integrity: sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==}
+
+  ccount@2.0.1:
+    resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
+
+  chalk@2.4.2:
+    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
+    engines: {node: '>=4'}
+
+  chalk@4.1.2:
+    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
+    engines: {node: '>=10'}
+
+  chalk@5.3.0:
+    resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==}
+    engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
+
+  character-entities-html4@2.1.0:
+    resolution: {integrity: sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==}
+
+  character-entities-legacy@3.0.0:
+    resolution: {integrity: sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==}
+
+  cheerio-select@2.1.0:
+    resolution: {integrity: sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==}
+
+  cheerio@1.0.0:
+    resolution: {integrity: sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==}
+    engines: {node: '>=18.17'}
+
+  chevrotain-allstar@0.3.1:
+    resolution: {integrity: sha512-b7g+y9A0v4mxCW1qUhf3BSVPg+/NvGErk/dOkrDaHA0nQIQGAtrOjlX//9OQtRlSCy+x9rfB5N8yC71lH1nvMw==}
+    peerDependencies:
+      chevrotain: ^11.0.0
+
+  chevrotain@11.0.3:
+    resolution: {integrity: sha512-ci2iJH6LeIkvP9eJW6gpueU8cnZhv85ELY8w8WiFtNjMHA5ad6pQLaJo9mEly/9qUyCpvqX8/POVUTf18/HFdw==}
+
+  chokidar@3.6.0:
+    resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
+    engines: {node: '>= 8.10.0'}
+
+  chokidar@4.0.3:
+    resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==}
+    engines: {node: '>= 14.16.0'}
+
+  clean-stack@2.2.0:
+    resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
+    engines: {node: '>=6'}
+
+  cli-cursor@5.0.0:
+    resolution: {integrity: sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==}
+    engines: {node: '>=18'}
+
+  cli-spinners@2.9.2:
+    resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==}
+    engines: {node: '>=6'}
+
+  cliui@6.0.0:
+    resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
+
+  color-convert@1.9.3:
+    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
+
+  color-convert@2.0.1:
+    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
+    engines: {node: '>=7.0.0'}
+
+  color-name@1.1.3:
+    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
+
+  color-name@1.1.4:
+    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
+
+  comma-separated-tokens@2.0.3:
+    resolution: {integrity: sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==}
+
+  commander@13.1.0:
+    resolution: {integrity: sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==}
+    engines: {node: '>=18'}
+
+  commander@6.2.1:
+    resolution: {integrity: sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==}
+    engines: {node: '>= 6'}
+
+  commander@7.2.0:
+    resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==}
+    engines: {node: '>= 10'}
+
+  commander@8.3.0:
+    resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}
+    engines: {node: '>= 12'}
+
+  concat-map@0.0.1:
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
+
+  confbox@0.1.8:
+    resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==}
+
+  connect-history-api-fallback@2.0.0:
+    resolution: {integrity: sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==}
+    engines: {node: '>=0.8'}
+
+  convert-source-map@2.0.0:
+    resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
+
+  copy-anything@3.0.5:
+    resolution: {integrity: sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==}
+    engines: {node: '>=12.13'}
+
+  core-js-compat@3.38.0:
+    resolution: {integrity: sha512-75LAicdLa4OJVwFxFbQR3NdnZjNgX6ILpVcVzcC4T2smerB5lELMrJQQQoWV6TiuC/vlaFqgU2tKQx9w5s0e0A==}
+
+  cose-base@1.0.3:
+    resolution: {integrity: sha512-s9whTXInMSgAp/NVXVNuVxVKzGH2qck3aQlVHxDCdAEPgtMKwc4Wq6/QKhgdEdgbLSi9rBTAcPoRa6JpiG4ksg==}
+
+  cose-base@2.2.0:
+    resolution: {integrity: sha512-AzlgcsCbUMymkADOJtQm3wO9S3ltPfYOFD5033keQn9NJzIbtnZj+UdBJe7DYml/8TdbtHJW3j58SOnKhWY/5g==}
+
+  create-codepen@2.0.0:
+    resolution: {integrity: sha512-ehJ0Zw5RSV2G4+/azUb7vEZWRSA/K9cW7HDock1Y9ViDexkgSJUZJRcObdw/YAWeXKjreEQV9l/igNSsJ1yw5A==}
+    engines: {node: '>=18'}
+
+  cross-spawn@7.0.6:
+    resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
+    engines: {node: '>= 8'}
+
+  css-select@5.1.0:
+    resolution: {integrity: sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==}
+
+  css-what@6.1.0:
+    resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==}
+    engines: {node: '>= 6'}
+
+  css@3.0.0:
+    resolution: {integrity: sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==}
+
+  cssesc@3.0.0:
+    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  csstype@3.1.3:
+    resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
+
+  cytoscape-cose-bilkent@4.1.0:
+    resolution: {integrity: sha512-wgQlVIUJF13Quxiv5e1gstZ08rnZj2XaLHGoFMYXz7SkNfCDOOteKBE6SYRfA9WxxI/iBc3ajfDoc6hb/MRAHQ==}
+    peerDependencies:
+      cytoscape: ^3.2.0
+
+  cytoscape-fcose@2.2.0:
+    resolution: {integrity: sha512-ki1/VuRIHFCzxWNrsshHYPs6L7TvLu3DL+TyIGEsRcvVERmxokbf5Gdk7mFxZnTdiGtnA4cfSmjZJMviqSuZrQ==}
+    peerDependencies:
+      cytoscape: ^3.2.0
+
+  cytoscape@3.30.3:
+    resolution: {integrity: sha512-HncJ9gGJbVtw7YXtIs3+6YAFSSiKsom0amWc33Z7QbylbY2JGMrA0yz4EwrdTScZxnwclXeEZHzO5pxoy0ZE4g==}
+    engines: {node: '>=0.10'}
+
+  d3-array@2.12.1:
+    resolution: {integrity: sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==}
+
+  d3-array@3.2.4:
+    resolution: {integrity: sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==}
+    engines: {node: '>=12'}
+
+  d3-axis@3.0.0:
+    resolution: {integrity: sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==}
+    engines: {node: '>=12'}
+
+  d3-brush@3.0.0:
+    resolution: {integrity: sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==}
+    engines: {node: '>=12'}
+
+  d3-chord@3.0.1:
+    resolution: {integrity: sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==}
+    engines: {node: '>=12'}
+
+  d3-color@3.1.0:
+    resolution: {integrity: sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==}
+    engines: {node: '>=12'}
+
+  d3-contour@4.0.2:
+    resolution: {integrity: sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==}
+    engines: {node: '>=12'}
+
+  d3-delaunay@6.0.4:
+    resolution: {integrity: sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==}
+    engines: {node: '>=12'}
+
+  d3-dispatch@3.0.1:
+    resolution: {integrity: sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==}
+    engines: {node: '>=12'}
+
+  d3-drag@3.0.0:
+    resolution: {integrity: sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==}
+    engines: {node: '>=12'}
+
+  d3-dsv@3.0.1:
+    resolution: {integrity: sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==}
+    engines: {node: '>=12'}
+    hasBin: true
+
+  d3-ease@3.0.1:
+    resolution: {integrity: sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==}
+    engines: {node: '>=12'}
+
+  d3-fetch@3.0.1:
+    resolution: {integrity: sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==}
+    engines: {node: '>=12'}
+
+  d3-force@3.0.0:
+    resolution: {integrity: sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==}
+    engines: {node: '>=12'}
+
+  d3-format@3.1.0:
+    resolution: {integrity: sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==}
+    engines: {node: '>=12'}
+
+  d3-geo@3.1.1:
+    resolution: {integrity: sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==}
+    engines: {node: '>=12'}
+
+  d3-hierarchy@3.1.2:
+    resolution: {integrity: sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==}
+    engines: {node: '>=12'}
+
+  d3-interpolate@3.0.1:
+    resolution: {integrity: sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==}
+    engines: {node: '>=12'}
+
+  d3-path@1.0.9:
+    resolution: {integrity: sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==}
+
+  d3-path@3.1.0:
+    resolution: {integrity: sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==}
+    engines: {node: '>=12'}
+
+  d3-polygon@3.0.1:
+    resolution: {integrity: sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==}
+    engines: {node: '>=12'}
+
+  d3-quadtree@3.0.1:
+    resolution: {integrity: sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==}
+    engines: {node: '>=12'}
+
+  d3-random@3.0.1:
+    resolution: {integrity: sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==}
+    engines: {node: '>=12'}
+
+  d3-sankey@0.12.3:
+    resolution: {integrity: sha512-nQhsBRmM19Ax5xEIPLMY9ZmJ/cDvd1BG3UVvt5h3WRxKg5zGRbvnteTyWAbzeSvlh3tW7ZEmq4VwR5mB3tutmQ==}
+
+  d3-scale-chromatic@3.1.0:
+    resolution: {integrity: sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==}
+    engines: {node: '>=12'}
+
+  d3-scale@4.0.2:
+    resolution: {integrity: sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==}
+    engines: {node: '>=12'}
+
+  d3-selection@3.0.0:
+    resolution: {integrity: sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==}
+    engines: {node: '>=12'}
+
+  d3-shape@1.3.7:
+    resolution: {integrity: sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==}
+
+  d3-shape@3.2.0:
+    resolution: {integrity: sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==}
+    engines: {node: '>=12'}
+
+  d3-time-format@4.1.0:
+    resolution: {integrity: sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==}
+    engines: {node: '>=12'}
+
+  d3-time@3.1.0:
+    resolution: {integrity: sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==}
+    engines: {node: '>=12'}
+
+  d3-timer@3.0.1:
+    resolution: {integrity: sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==}
+    engines: {node: '>=12'}
+
+  d3-transition@3.0.1:
+    resolution: {integrity: sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      d3-selection: 2 - 3
+
+  d3-zoom@3.0.0:
+    resolution: {integrity: sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==}
+    engines: {node: '>=12'}
+
+  d3@7.9.0:
+    resolution: {integrity: sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==}
+    engines: {node: '>=12'}
+
+  dagre-d3-es@7.0.10:
+    resolution: {integrity: sha512-qTCQmEhcynucuaZgY5/+ti3X/rnszKZhEQH/ZdWdtP1tA/y3VoHJzcVrO9pjjJCNpigfscAtoUB5ONcd2wNn0A==}
+
+  data-view-buffer@1.0.1:
+    resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==}
+    engines: {node: '>= 0.4'}
+
+  data-view-byte-length@1.0.1:
+    resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==}
+    engines: {node: '>= 0.4'}
+
+  data-view-byte-offset@1.0.0:
+    resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==}
+    engines: {node: '>= 0.4'}
+
+  dayjs@1.11.12:
+    resolution: {integrity: sha512-Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg==}
+
+  dayjs@1.11.13:
+    resolution: {integrity: sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==}
+
+  debug@3.2.7:
+    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  debug@4.3.5:
+    resolution: {integrity: sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  debug@4.3.7:
+    resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  debug@4.4.0:
+    resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  decamelize@1.2.0:
+    resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
+    engines: {node: '>=0.10.0'}
+
+  decode-uri-component@0.2.2:
+    resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
+    engines: {node: '>=0.10'}
+
+  deep-is@0.1.4:
+    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
+
+  default-browser-id@5.0.0:
+    resolution: {integrity: sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==}
+    engines: {node: '>=18'}
+
+  default-browser@5.2.1:
+    resolution: {integrity: sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==}
+    engines: {node: '>=18'}
+
+  define-data-property@1.1.4:
+    resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
+    engines: {node: '>= 0.4'}
+
+  define-lazy-prop@3.0.0:
+    resolution: {integrity: sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==}
+    engines: {node: '>=12'}
+
+  define-properties@1.2.1:
+    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
+    engines: {node: '>= 0.4'}
+
+  degit@2.8.4:
+    resolution: {integrity: sha512-vqYuzmSA5I50J882jd+AbAhQtgK6bdKUJIex1JNfEUPENCgYsxugzKVZlFyMwV4i06MmnV47/Iqi5Io86zf3Ng==}
+    engines: {node: '>=8.0.0'}
+    hasBin: true
+
+  del@5.1.0:
+    resolution: {integrity: sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==}
+    engines: {node: '>=8'}
+
+  delaunator@5.0.1:
+    resolution: {integrity: sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==}
+
+  dequal@2.0.3:
+    resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
+    engines: {node: '>=6'}
+
+  detect-libc@1.0.3:
+    resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==}
+    engines: {node: '>=0.10'}
+    hasBin: true
+
+  devlop@1.1.0:
+    resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==}
+
+  dijkstrajs@1.0.3:
+    resolution: {integrity: sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==}
+
+  dir-glob@3.0.1:
+    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
+    engines: {node: '>=8'}
+
+  doctrine@2.1.0:
+    resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
+    engines: {node: '>=0.10.0'}
+
+  doctrine@3.0.0:
+    resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
+    engines: {node: '>=6.0.0'}
+
+  dom-serializer@2.0.0:
+    resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==}
+
+  domelementtype@2.3.0:
+    resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
+
+  domhandler@5.0.3:
+    resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
+    engines: {node: '>= 4'}
+
+  dompurify@3.1.6:
+    resolution: {integrity: sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ==}
+
+  domutils@3.1.0:
+    resolution: {integrity: sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==}
+
+  dotenv@10.0.0:
+    resolution: {integrity: sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==}
+    engines: {node: '>=10'}
+
+  electron-to-chromium@1.4.825:
+    resolution: {integrity: sha512-OCcF+LwdgFGcsYPYC5keEEFC2XT0gBhrYbeGzHCx7i9qRFbzO/AqTmc/C/1xNhJj+JA7rzlN7mpBuStshh96Cg==}
+
+  electron-to-chromium@1.5.9:
+    resolution: {integrity: sha512-HfkT8ndXR0SEkU8gBQQM3rz035bpE/hxkZ1YIt4KJPEFES68HfIU6LzKukH0H794Lm83WJtkSAMfEToxCs15VA==}
+
+  emoji-regex-xs@1.0.0:
+    resolution: {integrity: sha512-LRlerrMYoIDrT6jgpeZ2YYl/L8EulRTt5hQcYjy5AInh7HWXKimpqx68aknBFpGL2+/IcogTcaydJEgaTmOpDg==}
+
+  emoji-regex@10.3.0:
+    resolution: {integrity: sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==}
+
+  emoji-regex@8.0.0:
+    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
+
+  encoding-sniffer@0.2.0:
+    resolution: {integrity: sha512-ju7Wq1kg04I3HtiYIOrUrdfdDvkyO9s5XM8QAj/bN61Yo/Vb4vgJxy5vi4Yxk01gWHbrofpPtpxM8bKger9jhg==}
+
+  entities@4.5.0:
+    resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
+    engines: {node: '>=0.12'}
+
+  envinfo@7.14.0:
+    resolution: {integrity: sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  error-stack-parser-es@0.1.5:
+    resolution: {integrity: sha512-xHku1X40RO+fO8yJ8Wh2f2rZWVjqyhb1zgq1yZ8aZRQkv6OOKhKWRUaht3eSCUbAOBaKIgM+ykwFLE+QUxgGeg==}
+
+  es-abstract@1.23.3:
+    resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==}
+    engines: {node: '>= 0.4'}
+
+  es-define-property@1.0.0:
+    resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==}
+    engines: {node: '>= 0.4'}
+
+  es-errors@1.3.0:
+    resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
+    engines: {node: '>= 0.4'}
+
+  es-object-atoms@1.0.0:
+    resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==}
+    engines: {node: '>= 0.4'}
+
+  es-set-tostringtag@2.0.3:
+    resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==}
+    engines: {node: '>= 0.4'}
+
+  es-shim-unscopables@1.0.2:
+    resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==}
+
+  es-to-primitive@1.2.1:
+    resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
+    engines: {node: '>= 0.4'}
+
+  esbuild@0.21.5:
+    resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==}
+    engines: {node: '>=12'}
+    hasBin: true
+
+  esbuild@0.24.2:
+    resolution: {integrity: sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  escalade@3.1.2:
+    resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==}
+    engines: {node: '>=6'}
+
+  escape-string-regexp@1.0.5:
+    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
+    engines: {node: '>=0.8.0'}
+
+  escape-string-regexp@4.0.0:
+    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
+    engines: {node: '>=10'}
+
+  eslint-compat-utils@0.5.1:
+    resolution: {integrity: sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      eslint: '>=6.0.0'
+
+  eslint-config-prettier@9.1.0:
+    resolution: {integrity: sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==}
+    hasBin: true
+    peerDependencies:
+      eslint: '>=7.0.0'
+
+  eslint-config-standard@17.1.0:
+    resolution: {integrity: sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==}
+    engines: {node: '>=12.0.0'}
+    peerDependencies:
+      eslint: ^8.0.1
+      eslint-plugin-import: ^2.25.2
+      eslint-plugin-n: '^15.0.0 || ^16.0.0 '
+      eslint-plugin-promise: ^6.0.0
+
+  eslint-config-vuepress-typescript@4.10.1:
+    resolution: {integrity: sha512-MD6Z0K/GViVIIRuCym2CfHb8XB2JJ3MXPN5gNe+Bv2lAXOyi5/IUDR+BjBjA/Hdo6xrLHQOM+I8gtQrxUuddjg==}
+
+  eslint-config-vuepress@4.10.1:
+    resolution: {integrity: sha512-VunYtLhFdDxReGRCp+Lba86f18Hd/Srb+tOVbonYFITUNtpr8y85JgtVrXCS9c5+JE9PPx0JcxAFDxWDtoTH7g==}
+
+  eslint-import-resolver-node@0.3.9:
+    resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==}
+
+  eslint-module-utils@2.8.1:
+    resolution: {integrity: sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: '*'
+      eslint-import-resolver-node: '*'
+      eslint-import-resolver-typescript: '*'
+      eslint-import-resolver-webpack: '*'
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+      eslint:
+        optional: true
+      eslint-import-resolver-node:
+        optional: true
+      eslint-import-resolver-typescript:
+        optional: true
+      eslint-import-resolver-webpack:
+        optional: true
+
+  eslint-plugin-es-x@7.8.0:
+    resolution: {integrity: sha512-7Ds8+wAAoV3T+LAKeu39Y5BzXCrGKrcISfgKEqTS4BDN8SFEDQd0S43jiQ8vIa3wUKD07qitZdfzlenSi8/0qQ==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '>=8'
+
+  eslint-plugin-import@2.29.1:
+    resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+
+  eslint-plugin-n@16.6.2:
+    resolution: {integrity: sha512-6TyDmZ1HXoFQXnhCTUjVFULReoBPOAjpuiKELMkeP40yffI/1ZRO+d9ug/VC6fqISo2WkuIBk3cvuRPALaWlOQ==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      eslint: '>=7.0.0'
+
+  eslint-plugin-promise@6.4.0:
+    resolution: {integrity: sha512-/KWWRaD3fGkVCZsdR0RU53PSthFmoHVhZl+y9+6DqeDLSikLdlUVpVEAmI6iCRR5QyOjBYBqHZV/bdv4DJ4Gtw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
+
+  eslint-plugin-vue@9.27.0:
+    resolution: {integrity: sha512-5Dw3yxEyuBSXTzT5/Ge1X5kIkRTQ3nvBn/VwPwInNiZBSJOO/timWMUaflONnFBzU6NhB68lxnCda7ULV5N7LA==}
+    engines: {node: ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
+
+  eslint-scope@7.2.2:
+    resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  eslint-visitor-keys@3.4.3:
+    resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  eslint@8.57.0:
+    resolution: {integrity: sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.
+    hasBin: true
+
+  espree@9.6.1:
+    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  esprima@4.0.1:
+    resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  esquery@1.6.0:
+    resolution: {integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==}
+    engines: {node: '>=0.10'}
+
+  esrecurse@4.3.0:
+    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
+    engines: {node: '>=4.0'}
+
+  estraverse@5.3.0:
+    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
+    engines: {node: '>=4.0'}
+
+  estree-walker@2.0.2:
+    resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
+
+  esutils@2.0.3:
+    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
+    engines: {node: '>=0.10.0'}
+
+  execa@8.0.1:
+    resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==}
+    engines: {node: '>=16.17'}
+
+  execa@9.5.2:
+    resolution: {integrity: sha512-EHlpxMCpHWSAh1dgS6bVeoLAXGnJNdR93aabr4QCGbzOM73o5XmRfM/e5FUqsw3aagP8S8XEWUWFAxnRBnAF0Q==}
+    engines: {node: ^18.19.0 || >=20.5.0}
+
+  extend-shallow@2.0.1:
+    resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
+    engines: {node: '>=0.10.0'}
+
+  fast-deep-equal@3.1.3:
+    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
+
+  fast-glob@3.3.2:
+    resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==}
+    engines: {node: '>=8.6.0'}
+
+  fast-json-stable-stringify@2.1.0:
+    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
+
+  fast-levenshtein@2.0.6:
+    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
+
+  fastq@1.13.0:
+    resolution: {integrity: sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==}
+
+  fflate@0.8.2:
+    resolution: {integrity: sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==}
+
+  figures@6.1.0:
+    resolution: {integrity: sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==}
+    engines: {node: '>=18'}
+
+  file-entry-cache@6.0.1:
+    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
+    engines: {node: ^10.12.0 || >=12.0.0}
+
+  fill-range@7.1.1:
+    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
+    engines: {node: '>=8'}
+
+  find-up@4.1.0:
+    resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
+    engines: {node: '>=8'}
+
+  find-up@5.0.0:
+    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
+    engines: {node: '>=10'}
+
+  flat-cache@3.2.0:
+    resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==}
+    engines: {node: ^10.12.0 || >=12.0.0}
+
+  flatted@3.3.1:
+    resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==}
+
+  for-each@0.3.3:
+    resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
+
+  fraction.js@4.3.7:
+    resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==}
+
+  fs-extra@11.2.0:
+    resolution: {integrity: sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==}
+    engines: {node: '>=14.14'}
+
+  fs-readdir-recursive@1.1.0:
+    resolution: {integrity: sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==}
+
+  fs.realpath@1.0.0:
+    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
+
+  fsevents@2.3.3:
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+
+  function-bind@1.1.2:
+    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
+
+  function.prototype.name@1.1.6:
+    resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==}
+    engines: {node: '>= 0.4'}
+
+  functions-have-names@1.2.3:
+    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
+
+  gensync@1.0.0-beta.2:
+    resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
+    engines: {node: '>=6.9.0'}
+
+  get-caller-file@2.0.5:
+    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
+    engines: {node: 6.* || 8.* || >= 10.*}
+
+  get-east-asian-width@1.2.0:
+    resolution: {integrity: sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==}
+    engines: {node: '>=18'}
+
+  get-intrinsic@1.2.4:
+    resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
+    engines: {node: '>= 0.4'}
+
+  get-stream@8.0.1:
+    resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==}
+    engines: {node: '>=16'}
+
+  get-stream@9.0.1:
+    resolution: {integrity: sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==}
+    engines: {node: '>=18'}
+
+  get-symbol-description@1.0.2:
+    resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==}
+    engines: {node: '>= 0.4'}
 
-  '@types/katex@0.16.7':
-    resolution: {integrity: sha512-HMwFiRujE5PjrgwHQ25+bsLJgowjGjm5Z8FVSf0N6PwgJrwxH0QxzHYDcKsTfV3wva0vzrpqMTJS2jXPr5BMEQ==}
+  get-tsconfig@4.7.5:
+    resolution: {integrity: sha512-ZCuZCnlqNzjb4QprAzXKdpp/gh6KTxSJuw3IBsPnV/7fV4NxC9ckB+vPTt8w7fJA0TaSD7c55BR47JD6MEDyDw==}
 
-  '@types/linkify-it@5.0.0':
-    resolution: {integrity: sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==}
+  giscus@1.6.0:
+    resolution: {integrity: sha512-Zrsi8r4t1LVW950keaWcsURuZUQwUaMKjvJgTCY125vkW6OiEBkatE7ScJDbpqKHdZwb///7FVC21SE3iFK3PQ==}
 
-  '@types/markdown-it-emoji@3.0.1':
-    resolution: {integrity: sha512-cz1j8R35XivBqq9mwnsrP2fsz2yicLhB8+PDtuVkKOExwEdsVBNI+ROL3sbhtR5occRZ66vT0QnwFZCqdjf3pA==}
+  glob-parent@5.1.2:
+    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
+    engines: {node: '>= 6'}
 
-  '@types/markdown-it@14.1.2':
-    resolution: {integrity: sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==}
+  glob-parent@6.0.2:
+    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
+    engines: {node: '>=10.13.0'}
 
-  '@types/mdurl@2.0.0':
-    resolution: {integrity: sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==}
+  glob@7.2.3:
+    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
+    deprecated: Glob versions prior to v9 are no longer supported
 
-  '@types/ms@0.7.31':
-    resolution: {integrity: sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==}
+  globals@11.12.0:
+    resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
+    engines: {node: '>=4'}
 
-  '@types/node@17.0.45':
-    resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
+  globals@13.24.0:
+    resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==}
+    engines: {node: '>=8'}
 
-  '@types/sax@1.2.7':
-    resolution: {integrity: sha512-rO73L89PJxeYM3s3pPPjiPgVVcymqU490g0YO5n5By0k2Erzj6tay/4lr1CHAAU4JyOWd1rpQ8bCf6cZfHU96A==}
+  globalthis@1.0.4:
+    resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==}
+    engines: {node: '>= 0.4'}
 
-  '@types/web-bluetooth@0.0.20':
-    resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==}
+  globby@10.0.2:
+    resolution: {integrity: sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==}
+    engines: {node: '>=8'}
 
-  '@typescript-eslint/eslint-plugin@7.16.0':
-    resolution: {integrity: sha512-py1miT6iQpJcs1BiJjm54AMzeuMPBSPuKPlnT8HlfudbcS5rYeX5jajpLf3mrdRh9dA/Ec2FVUY0ifeVNDIhZw==}
-    engines: {node: ^18.18.0 || >=20.0.0}
-    peerDependencies:
-      '@typescript-eslint/parser': ^7.0.0
-      eslint: ^8.56.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  globby@11.1.0:
+    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
+    engines: {node: '>=10'}
 
-  '@typescript-eslint/parser@7.16.0':
-    resolution: {integrity: sha512-ar9E+k7CU8rWi2e5ErzQiC93KKEFAXA2Kky0scAlPcxYblLt8+XZuHUZwlyfXILyQa95P6lQg+eZgh/dDs3+Vw==}
-    engines: {node: ^18.18.0 || >=20.0.0}
-    peerDependencies:
-      eslint: ^8.56.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  globby@14.0.2:
+    resolution: {integrity: sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==}
+    engines: {node: '>=18'}
+
+  gopd@1.0.1:
+    resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
+
+  graceful-fs@4.2.11:
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
+
+  graphemer@1.4.0:
+    resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
+
+  gray-matter@4.0.3:
+    resolution: {integrity: sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==}
+    engines: {node: '>=6.0'}
+
+  hachure-fill@0.5.2:
+    resolution: {integrity: sha512-3GKBOn+m2LX9iq+JC1064cSFprJY4jL1jCXTcpnfER5HYE2l/4EfWSGzkPa/ZDBmYI0ZOEj5VHV/eKnPGkHuOg==}
+
+  has-bigints@1.0.2:
+    resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
+
+  has-flag@3.0.0:
+    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
+    engines: {node: '>=4'}
+
+  has-flag@4.0.0:
+    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
+    engines: {node: '>=8'}
+
+  has-property-descriptors@1.0.2:
+    resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
+
+  has-proto@1.0.3:
+    resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==}
+    engines: {node: '>= 0.4'}
+
+  has-symbols@1.0.3:
+    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
+    engines: {node: '>= 0.4'}
+
+  has-tostringtag@1.0.2:
+    resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
+    engines: {node: '>= 0.4'}
+
+  hash-sum@2.0.0:
+    resolution: {integrity: sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==}
+
+  hasown@2.0.2:
+    resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
+    engines: {node: '>= 0.4'}
+
+  hast-util-to-html@9.0.4:
+    resolution: {integrity: sha512-wxQzXtdbhiwGAUKrnQJXlOPmHnEehzphwkK7aluUPQ+lEc1xefC8pblMgpp2w5ldBTEfveRIrADcrhGIWrlTDA==}
+
+  hast-util-whitespace@3.0.0:
+    resolution: {integrity: sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==}
+
+  hookable@5.5.3:
+    resolution: {integrity: sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==}
+
+  html-tags@3.3.1:
+    resolution: {integrity: sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==}
+    engines: {node: '>=8'}
+
+  html-void-elements@3.0.0:
+    resolution: {integrity: sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==}
+
+  htmlparser2@9.1.0:
+    resolution: {integrity: sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==}
+
+  human-signals@5.0.0:
+    resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}
+    engines: {node: '>=16.17.0'}
+
+  human-signals@8.0.0:
+    resolution: {integrity: sha512-/1/GPCpDUCCYwlERiYjxoczfP0zfvZMU/OWgQPMya9AbAE24vseigFdhAMObpc8Q4lc/kjutPfUddDYyAmejnA==}
+    engines: {node: '>=18.18.0'}
+
+  iconify-icon@2.1.0:
+    resolution: {integrity: sha512-lto4XU3bwTQnb+D/CsJ4dWAo0aDe+uPMxEtxyOodw9l7R9QnJUUab3GCehlw2M8mDHdeUu/ufx8PvRQiJphhXg==}
+
+  iconv-lite@0.6.3:
+    resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
+    engines: {node: '>=0.10.0'}
+
+  ignore@5.3.1:
+    resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==}
+    engines: {node: '>= 4'}
+
+  immutable@5.0.3:
+    resolution: {integrity: sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==}
+
+  import-fresh@3.3.0:
+    resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
+    engines: {node: '>=6'}
+
+  imurmurhash@0.1.4:
+    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
+    engines: {node: '>=0.8.19'}
+
+  indent-string@4.0.0:
+    resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
+    engines: {node: '>=8'}
+
+  inflight@1.0.6:
+    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
+    deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
+
+  inherits@2.0.4:
+    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
+
+  internal-slot@1.0.7:
+    resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==}
+    engines: {node: '>= 0.4'}
+
+  internmap@1.0.1:
+    resolution: {integrity: sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==}
+
+  internmap@2.0.3:
+    resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==}
+    engines: {node: '>=12'}
+
+  interpret@1.4.0:
+    resolution: {integrity: sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==}
+    engines: {node: '>= 0.10'}
+
+  is-array-buffer@3.0.4:
+    resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==}
+    engines: {node: '>= 0.4'}
+
+  is-bigint@1.0.4:
+    resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
+
+  is-binary-path@2.1.0:
+    resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
+    engines: {node: '>=8'}
+
+  is-boolean-object@1.1.2:
+    resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
+    engines: {node: '>= 0.4'}
+
+  is-builtin-module@3.2.1:
+    resolution: {integrity: sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==}
+    engines: {node: '>=6'}
+
+  is-callable@1.2.7:
+    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
+    engines: {node: '>= 0.4'}
+
+  is-core-module@2.14.0:
+    resolution: {integrity: sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==}
+    engines: {node: '>= 0.4'}
+
+  is-data-view@1.0.1:
+    resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==}
+    engines: {node: '>= 0.4'}
+
+  is-date-object@1.0.5:
+    resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
+    engines: {node: '>= 0.4'}
+
+  is-docker@3.0.0:
+    resolution: {integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    hasBin: true
+
+  is-extendable@0.1.1:
+    resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==}
+    engines: {node: '>=0.10.0'}
+
+  is-extglob@2.1.1:
+    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-fullwidth-code-point@3.0.0:
+    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
+    engines: {node: '>=8'}
+
+  is-glob@4.0.3:
+    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
+    engines: {node: '>=0.10.0'}
+
+  is-inside-container@1.0.0:
+    resolution: {integrity: sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==}
+    engines: {node: '>=14.16'}
+    hasBin: true
+
+  is-interactive@2.0.0:
+    resolution: {integrity: sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==}
+    engines: {node: '>=12'}
+
+  is-negative-zero@2.0.3:
+    resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
+    engines: {node: '>= 0.4'}
+
+  is-number-object@1.0.7:
+    resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
+    engines: {node: '>= 0.4'}
+
+  is-number@7.0.0:
+    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
+    engines: {node: '>=0.12.0'}
+
+  is-path-cwd@2.2.0:
+    resolution: {integrity: sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==}
+    engines: {node: '>=6'}
+
+  is-path-inside@3.0.3:
+    resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
+    engines: {node: '>=8'}
+
+  is-plain-obj@4.1.0:
+    resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==}
+    engines: {node: '>=12'}
+
+  is-regex@1.1.4:
+    resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
+    engines: {node: '>= 0.4'}
+
+  is-shared-array-buffer@1.0.3:
+    resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==}
+    engines: {node: '>= 0.4'}
+
+  is-stream@3.0.0:
+    resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  is-stream@4.0.1:
+    resolution: {integrity: sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==}
+    engines: {node: '>=18'}
+
+  is-string@1.0.7:
+    resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
+    engines: {node: '>= 0.4'}
+
+  is-symbol@1.0.4:
+    resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
+    engines: {node: '>= 0.4'}
 
-  '@typescript-eslint/scope-manager@7.16.0':
-    resolution: {integrity: sha512-8gVv3kW6n01Q6TrI1cmTZ9YMFi3ucDT7i7aI5lEikk2ebk1AEjrwX8MDTdaX5D7fPXMBLvnsaa0IFTAu+jcfOw==}
-    engines: {node: ^18.18.0 || >=20.0.0}
+  is-typed-array@1.1.13:
+    resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==}
+    engines: {node: '>= 0.4'}
 
-  '@typescript-eslint/type-utils@7.16.0':
-    resolution: {integrity: sha512-j0fuUswUjDHfqV/UdW6mLtOQQseORqfdmoBNDFOqs9rvNVR2e+cmu6zJu/Ku4SDuqiJko6YnhwcL8x45r8Oqxg==}
-    engines: {node: ^18.18.0 || >=20.0.0}
-    peerDependencies:
-      eslint: ^8.56.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  is-unicode-supported@1.3.0:
+    resolution: {integrity: sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==}
+    engines: {node: '>=12'}
 
-  '@typescript-eslint/types@7.16.0':
-    resolution: {integrity: sha512-fecuH15Y+TzlUutvUl9Cc2XJxqdLr7+93SQIbcZfd4XRGGKoxyljK27b+kxKamjRkU7FYC6RrbSCg0ALcZn/xw==}
-    engines: {node: ^18.18.0 || >=20.0.0}
+  is-unicode-supported@2.0.0:
+    resolution: {integrity: sha512-FRdAyx5lusK1iHG0TWpVtk9+1i+GjrzRffhDg4ovQ7mcidMQ6mj+MhKPmvh7Xwyv5gIS06ns49CA7Sqg7lC22Q==}
+    engines: {node: '>=18'}
 
-  '@typescript-eslint/typescript-estree@7.16.0':
-    resolution: {integrity: sha512-a5NTvk51ZndFuOLCh5OaJBELYc2O3Zqxfl3Js78VFE1zE46J2AaVuW+rEbVkQznjkmlzWsUI15BG5tQMixzZLw==}
-    engines: {node: ^18.18.0 || >=20.0.0}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  is-weakref@1.0.2:
+    resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
 
-  '@typescript-eslint/utils@7.16.0':
-    resolution: {integrity: sha512-PqP4kP3hb4r7Jav+NiRCntlVzhxBNWq6ZQ+zQwII1y/G/1gdIPeYDCKr2+dH6049yJQsWZiHU6RlwvIFBXXGNA==}
-    engines: {node: ^18.18.0 || >=20.0.0}
-    peerDependencies:
-      eslint: ^8.56.0
+  is-what@4.1.16:
+    resolution: {integrity: sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==}
+    engines: {node: '>=12.13'}
 
-  '@typescript-eslint/visitor-keys@7.16.0':
-    resolution: {integrity: sha512-rMo01uPy9C7XxG7AFsxa8zLnWXTF8N3PYclekWSrurvhwiw1eW88mrKiAYe6s53AUY57nTRz8dJsuuXdkAhzCg==}
-    engines: {node: ^18.18.0 || >=20.0.0}
+  is-wsl@3.1.0:
+    resolution: {integrity: sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==}
+    engines: {node: '>=16'}
 
-  '@ungap/structured-clone@1.2.0':
-    resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
+  isarray@2.0.5:
+    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
 
-  '@vitejs/plugin-vue@5.0.5':
-    resolution: {integrity: sha512-LOjm7XeIimLBZyzinBQ6OSm3UBCNVCpLkxGC0oWmm2YPzVZoxMsdvNVimLTBzpAnR9hl/yn1SHGuRfe6/Td9rQ==}
-    engines: {node: ^18.0.0 || >=20.0.0}
-    peerDependencies:
-      vite: ^5.0.0
-      vue: ^3.2.25
+  isexe@2.0.0:
+    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
 
-  '@vue/compiler-core@3.4.31':
-    resolution: {integrity: sha512-skOiodXWTV3DxfDhB4rOf3OGalpITLlgCeOwb+Y9GJpfQ8ErigdBUHomBzvG78JoVE8MJoQsb+qhZiHfKeNeEg==}
+  js-tokens@4.0.0:
+    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
-  '@vue/compiler-dom@3.4.31':
-    resolution: {integrity: sha512-wK424WMXsG1IGMyDGyLqB+TbmEBFM78hIsOJ9QwUVLGrcSk0ak6zYty7Pj8ftm7nEtdU/DGQxAXp0/lM/2cEpQ==}
+  js-yaml@3.14.1:
+    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
+    hasBin: true
 
-  '@vue/compiler-sfc@3.4.31':
-    resolution: {integrity: sha512-einJxqEw8IIJxzmnxmJBuK2usI+lJonl53foq+9etB2HAzlPjAS/wa7r0uUpXw5ByX3/0uswVSrjNb17vJm1kQ==}
+  js-yaml@4.1.0:
+    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
+    hasBin: true
 
-  '@vue/compiler-ssr@3.4.31':
-    resolution: {integrity: sha512-RtefmITAje3fJ8FSg1gwgDhdKhZVntIVbwupdyZDSifZTRMiWxWehAOTCc8/KZDnBOcYQ4/9VWxsTbd3wT0hAA==}
+  jsesc@0.5.0:
+    resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==}
+    hasBin: true
 
-  '@vue/devtools-api@6.6.3':
-    resolution: {integrity: sha512-0MiMsFma/HqA6g3KLKn+AGpL1kgKhFWszC9U29NfpWK5LE7bjeXxySWJrOJ77hBz+TBrBQ7o4QJqbPbqbs8rJw==}
+  jsesc@2.5.2:
+    resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
+    engines: {node: '>=4'}
+    hasBin: true
 
-  '@vue/reactivity@3.4.31':
-    resolution: {integrity: sha512-VGkTani8SOoVkZNds1PfJ/T1SlAIOf8E58PGAhIOUDYPC4GAmFA2u/E14TDAFcf3vVDKunc4QqCe/SHr8xC65Q==}
+  json-buffer@3.0.1:
+    resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
 
-  '@vue/runtime-core@3.4.31':
-    resolution: {integrity: sha512-LDkztxeUPazxG/p8c5JDDKPfkCDBkkiNLVNf7XZIUnJ+66GVGkP+TIh34+8LtPisZ+HMWl2zqhIw0xN5MwU1cw==}
+  json-schema-traverse@0.4.1:
+    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
 
-  '@vue/runtime-dom@3.4.31':
-    resolution: {integrity: sha512-2Auws3mB7+lHhTFCg8E9ZWopA6Q6L455EcU7bzcQ4x6Dn4cCPuqj6S2oBZgN2a8vJRS/LSYYxwFFq2Hlx3Fsaw==}
+  json-stable-stringify-without-jsonify@1.0.1:
+    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
 
-  '@vue/server-renderer@3.4.31':
-    resolution: {integrity: sha512-D5BLbdvrlR9PE3by9GaUp1gQXlCNadIZytMIb8H2h3FMWJd4oUfkUTEH2wAr3qxoRz25uxbTcbqd3WKlm9EHQA==}
-    peerDependencies:
-      vue: 3.4.31
+  json5@1.0.2:
+    resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
+    hasBin: true
 
-  '@vue/shared@3.4.31':
-    resolution: {integrity: sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA==}
+  json5@2.2.3:
+    resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
+    engines: {node: '>=6'}
+    hasBin: true
 
-  '@vuepress/bundler-vite@2.0.0-rc.14':
-    resolution: {integrity: sha512-kttbowYITMCX3ztz78Qb6bMfXRv/GEpNu+nALksu7j/QJQ0gOzI2is68PatbmzZRWOufVsf1Zf0A8BwolmVcXA==}
+  jsonfile@6.1.0:
+    resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
 
-  '@vuepress/cli@2.0.0-rc.14':
-    resolution: {integrity: sha512-oYJX1nE6/ohF2tzUtpBAFxRr4MF2kdtab3+AQ897esXzrciQnE2LxPQZ8BUOn6Jb3XYW12FXDdkHrr82rN6XnQ==}
+  katex@0.16.11:
+    resolution: {integrity: sha512-RQrI8rlHY92OLf3rho/Ts8i/XvjgguEjOkO1BEXcU3N8BqPpSzBNwV/G0Ukr+P/l3ivvJUE/Fa/CwbS6HesGNQ==}
     hasBin: true
 
-  '@vuepress/client@2.0.0-rc.14':
-    resolution: {integrity: sha512-ULwxOiWoUi15HWQ6qH60gWjxSXB0797uExCUa4HgHV/8SpIqv4SHFn6jqjo7qCzOxuTqj1RT47JH3oWfUF4XPA==}
+  keyv@4.5.4:
+    resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
 
-  '@vuepress/core@2.0.0-rc.14':
-    resolution: {integrity: sha512-Ly3fypjXGUgPzjfbXKJeyd59jxJgXkhxhWAGkH/rRyQeV8Nr7Wo1ah3H1MeGhlCRGH1T9Yd3Bz9W7QMoyWFfmg==}
+  khroma@2.1.0:
+    resolution: {integrity: sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw==}
 
-  '@vuepress/helper@2.0.0-rc.37':
-    resolution: {integrity: sha512-Sa2H6EqRuG0+521Z5WN7I8EQNwLwFe7U+1KtV01zFp2BcehsgD3EigBjBP7hl01ubb4T8wR7CxWv7cGVA4bPcw==}
-    peerDependencies:
-      vuepress: 2.0.0-rc.14
+  kind-of@6.0.3:
+    resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
+    engines: {node: '>=0.10.0'}
 
-  '@vuepress/highlighter-helper@2.0.0-rc.37':
-    resolution: {integrity: sha512-l7qxuJJP0+zxDd42UctS0Oc240cCN7BvxfEx6XJfaYmn2Yncrbbk15gS9tUT3jeXB959JGm8uUhxpPP0/4w3kw==}
-    peerDependencies:
-      vuepress: 2.0.0-rc.14
+  kolorist@1.8.0:
+    resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==}
 
-  '@vuepress/markdown@2.0.0-rc.14':
-    resolution: {integrity: sha512-9xr693gkp71qwEbQLxpo1ybhJ+lA2k5SiuFUgqqrmR2a8CSL3gcmKEGM+y7GMnHvL63U2dYlc9pUOtJ5rG9O0Q==}
+  langium@3.0.0:
+    resolution: {integrity: sha512-+Ez9EoiByeoTu/2BXmEaZ06iPNXM6thWJp02KfBO/raSMyCJ4jw7AkWWa+zBCTm0+Tw1Fj9FOxdqSskyN5nAwg==}
+    engines: {node: '>=16.0.0'}
 
-  '@vuepress/plugin-active-header-links@2.0.0-rc.37':
-    resolution: {integrity: sha512-VLM0JXgdShRAR38smp/M72sctDIVPgW4E+fBpGaP4iG+JOywXbLp5MfiO/r1ww62k7LXRI8g8/hYjlhyeMGnEg==}
-    peerDependencies:
-      vuepress: 2.0.0-rc.14
+  layout-base@1.0.2:
+    resolution: {integrity: sha512-8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg==}
 
-  '@vuepress/plugin-back-to-top@2.0.0-rc.37':
-    resolution: {integrity: sha512-R9rAXZCYdnBADvcbY2V4xtGOHS11mAIV98MbpixP1CYGaRdOGMcp4oJwfsGqwE1Iyi/nBgBaVFHexyQFkx7Rag==}
-    peerDependencies:
-      vuepress: 2.0.0-rc.14
+  layout-base@2.0.1:
+    resolution: {integrity: sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg==}
 
-  '@vuepress/plugin-container@2.0.0-rc.28':
-    resolution: {integrity: sha512-EBvmanLATZRtjDr/a6Td8Dw8Mr3ToigNoqdfibhhGA3PKAk5/olUbtpJBcYemgA3nVIyH6gdqbC3zMTO3/vx3A==}
-    peerDependencies:
-      vuepress: 2.0.0-rc.9
+  levn@0.4.1:
+    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
+    engines: {node: '>= 0.8.0'}
 
-  '@vuepress/plugin-copy-code@2.0.0-rc.37':
-    resolution: {integrity: sha512-Z8rvn3n+SsEUmyoR2rYo/AYUPbOsJravtVh4COVqc40FT6gxlZPLlUcr4XV4Nh0ja87oZn/FubbZMkWfU8MyOA==}
-    peerDependencies:
-      vuepress: 2.0.0-rc.14
+  lilconfig@3.1.2:
+    resolution: {integrity: sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==}
+    engines: {node: '>=14'}
 
-  '@vuepress/plugin-docsearch@2.0.0-rc.37':
-    resolution: {integrity: sha512-i2K6jbwgjJhO85ig9lpBcC9dUCi0MdCDFOu0lOVAMsMMNFuToVPHM2Fe+GU1qtJk7IEDmtzmCa1A9+4+D7WX1w==}
-    peerDependencies:
-      vuepress: 2.0.0-rc.14
+  linkify-it@5.0.0:
+    resolution: {integrity: sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==}
 
-  '@vuepress/plugin-git@2.0.0-rc.37':
-    resolution: {integrity: sha512-+p+EkcWsoErJXKdVZQBfazJ6Q8YFRXXjfDrb1qUSF5wCUfC7QgD6Vsgt5MmB9YZjbhj1Yf/xeZcDVB6qz8B+GA==}
-    peerDependencies:
-      vuepress: 2.0.0-rc.14
+  lit-element@4.1.0:
+    resolution: {integrity: sha512-gSejRUQJuMQjV2Z59KAS/D4iElUhwKpIyJvZ9w+DIagIQjfJnhR20h2Q5ddpzXGS+fF0tMZ/xEYGMnKmaI/iww==}
 
-  '@vuepress/plugin-google-analytics@2.0.0-rc.37':
-    resolution: {integrity: sha512-NgI8VN9h+BoCEhkOHhYZFRurFmeBKjb+TiLALqlvVJ7cn3XmGVliHDBEWTbbNImp3kEZhKzw0y37muzFQ0Rbfg==}
-    peerDependencies:
-      vuepress: 2.0.0-rc.14
+  lit-html@3.2.0:
+    resolution: {integrity: sha512-pwT/HwoxqI9FggTrYVarkBKFN9MlTUpLrDHubTmW4SrkL3kkqW5gxwbxMMUnbbRHBC0WTZnYHcjDSCM559VyfA==}
 
-  '@vuepress/plugin-links-check@2.0.0-rc.37':
-    resolution: {integrity: sha512-9YelTHKFKADKmSdGxEVyF5LE6r9rg95ia695tQ695n/ov+2/iC0Ez6Kc0ceaqdaCPMq8Q5OsLAh2/hC2N/H15Q==}
-    peerDependencies:
-      vuepress: 2.0.0-rc.14
+  lit@3.2.1:
+    resolution: {integrity: sha512-1BBa1E/z0O9ye5fZprPtdqnc0BFzxIxTTOO/tQFmyC/hj1O3jL4TfmLBw0WEwjAokdLwpclkvGgDJwTIh0/22w==}
 
-  '@vuepress/plugin-markdown-container@2.0.0-rc.37':
-    resolution: {integrity: sha512-o/jL/uHQ2U0x0crtODh2n4S51yG4BBmHw7DWrolP6e0FN6/PoQVsBenau5700c2iuouAfdrJ6G+tRbCrOx5ZjA==}
-    peerDependencies:
-      vuepress: 2.0.0-rc.14
+  local-pkg@0.5.0:
+    resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==}
+    engines: {node: '>=14'}
 
-  '@vuepress/plugin-medium-zoom@2.0.0-rc.37':
-    resolution: {integrity: sha512-s4AYQgWlXinmapYas+psmttWMIyUedi06bGcPVoXSHIoMsM74glr385xQtKSGp6V7F2CykGchYGeRyfGXG4OKQ==}
-    peerDependencies:
-      vuepress: 2.0.0-rc.14
+  locate-path@5.0.0:
+    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
+    engines: {node: '>=8'}
 
-  '@vuepress/plugin-nprogress@2.0.0-rc.37':
-    resolution: {integrity: sha512-HEv6AzAG3U7Q5cAkeuQhMV2JhASB/2veTQ85OHNyWUzZ5yTC/Kx5PfQOb87X6LWK51eZA5vImibeZbFJ1mkE3g==}
-    peerDependencies:
-      vuepress: 2.0.0-rc.14
+  locate-path@6.0.0:
+    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
+    engines: {node: '>=10'}
 
-  '@vuepress/plugin-palette@2.0.0-rc.37':
-    resolution: {integrity: sha512-wzsywEeZFHOcRITIff1SC0jXsMasze3t0d9gc0cp5iB/OW3bEdhes4mFmPtZZmWfnlmgajq/7uTEavEXVWJTIA==}
-    peerDependencies:
-      vuepress: 2.0.0-rc.14
+  lodash-es@4.17.21:
+    resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
 
-  '@vuepress/plugin-prismjs@2.0.0-rc.37':
-    resolution: {integrity: sha512-39m6oYZzW0XqwtyTI1QEidQ7GIQAKQZG7q+VXO1E5ZURWh6YepjSodA+zgxhIAFcNx69NR77EaSp2WBO10sdZQ==}
-    peerDependencies:
-      vuepress: 2.0.0-rc.14
+  lodash.debounce@4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
 
-  '@vuepress/plugin-register-components@2.0.0-rc.37':
-    resolution: {integrity: sha512-Ont6tTX67ZJaozH3sfGkQyaE83oMDqpYC8i34StVmidh8naC2uRcxDeza/orSe0nLvb+LUK/WiABB2ZuYRRTxw==}
-    peerDependencies:
-      vuepress: 2.0.0-rc.14
+  lodash.merge@4.6.2:
+    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
 
-  '@vuepress/plugin-sass-palette@2.0.0-rc.37':
-    resolution: {integrity: sha512-/dy47g27diqwbupYsoNTTgqsEv26AbC/rrypFLb6qQwYd+/1sO/b6osAqpqbm1u7mGq5J3nCGLp6mtK9gVLpTg==}
-    peerDependencies:
-      sass-loader: ^14.0.0
-      vuepress: 2.0.0-rc.14
-    peerDependenciesMeta:
-      sass-loader:
-        optional: true
+  lodash@4.17.21:
+    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
 
-  '@vuepress/plugin-seo@2.0.0-rc.37':
-    resolution: {integrity: sha512-H6bM4jYKwFABP/JGocDC7CD5SACMdFf9rE5lci5/VYJybvBr5XXDXHXk9KSy01jupPjmAjsGp5Fzqk2ggeqQIQ==}
-    peerDependencies:
-      vuepress: 2.0.0-rc.14
+  log-symbols@6.0.0:
+    resolution: {integrity: sha512-i24m8rpwhmPIS4zscNzK6MSEhk0DUWa/8iYQWxhffV8jkI4Phvs3F+quL5xvS0gdQR0FyTCMMH33Y78dDTzzIw==}
+    engines: {node: '>=18'}
 
-  '@vuepress/plugin-sitemap@2.0.0-rc.37':
-    resolution: {integrity: sha512-mL9aKIkiSEJizVcsreY7O+FZmTT/coV4iR2P5OQ5oyXbcByMN+omirsupHBHsWl2zH/EZe2FklByDEDUPpg3MQ==}
-    peerDependencies:
-      vuepress: 2.0.0-rc.14
+  lru-cache@5.1.1:
+    resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
 
-  '@vuepress/plugin-theme-data@2.0.0-rc.37':
-    resolution: {integrity: sha512-xzdYyScZcS5aDbk/2bQAuEofe6wqgtX2Y/6SUqsGlV4A59D+xIfPbNUZhO0gbUX//ofYGaxgKQps0OrvPkwMVg==}
-    peerDependencies:
-      vuepress: 2.0.0-rc.14
+  magic-string@0.30.10:
+    resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==}
 
-  '@vuepress/shared@2.0.0-rc.14':
-    resolution: {integrity: sha512-VDDnPpz4x1Q07richcVRGbc4qc2RG/6bKoEYSImofTFzvdmHer538ouv8kD2SNU10UrSOpxxUiphnhlhNIe03A==}
+  magic-string@0.30.17:
+    resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==}
 
-  '@vuepress/theme-default@2.0.0-rc.37':
-    resolution: {integrity: sha512-wgAZCLJ9yw+fRGtohGFQ0ltdqdhPoTw7DyEgHl3eI12ScVY7H+ZosgWXSczb+ks8IXY0Gw1+VNK/L1al5naYHg==}
+  make-dir@2.1.0:
+    resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}
+    engines: {node: '>=6'}
+
+  markdown-it-anchor@9.2.0:
+    resolution: {integrity: sha512-sa2ErMQ6kKOA4l31gLGYliFQrMKkqSO0ZJgGhDHKijPf0pNFM9vghjAh3gn26pS4JDRs7Iwa9S36gxm3vgZTzg==}
     peerDependencies:
-      sass-loader: ^14.0.0
-      vuepress: 2.0.0-rc.14
-    peerDependenciesMeta:
-      sass-loader:
-        optional: true
+      '@types/markdown-it': '*'
+      markdown-it: '*'
 
-  '@vuepress/utils@2.0.0-rc.14':
-    resolution: {integrity: sha512-1h/5qcKBeIhIg6SZM2IoZVOaIdFSeQ1CdEWadqQWy1uwupEeVrU3QPkjFyn0vUt0O/EuuVqQcLLC8OuS/wldNw==}
+  markdown-it-emoji@3.0.0:
+    resolution: {integrity: sha512-+rUD93bXHubA4arpEZO3q80so0qgoFJEKRkRbjKX8RTdca89v2kfyF+xR3i2sQTwql9tpPZPOQN5B+PunspXRg==}
 
-  '@vueuse/core@10.11.0':
-    resolution: {integrity: sha512-x3sD4Mkm7PJ+pcq3HX8PLPBadXCAlSDR/waK87dz0gQE+qJnaaFhc/dZVfJz+IUYzTMVGum2QlR7ImiJQN4s6g==}
+  markdown-it@14.1.0:
+    resolution: {integrity: sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==}
+    hasBin: true
 
-  '@vueuse/metadata@10.11.0':
-    resolution: {integrity: sha512-kQX7l6l8dVWNqlqyN3ePW3KmjCQO3ZMgXuBMddIu83CmucrsBfXlH+JoviYyRBws/yLTQO8g3Pbw+bdIoVm4oQ==}
+  marked@13.0.3:
+    resolution: {integrity: sha512-rqRix3/TWzE9rIoFGIn8JmsVfhiuC8VIQ8IdX5TfzmeBucdY05/0UlzKaw0eVtpcN/OdVFpBk7CjKGo9iHJ/zA==}
+    engines: {node: '>= 18'}
+    hasBin: true
 
-  '@vueuse/shared@10.11.0':
-    resolution: {integrity: sha512-fyNoIXEq3PfX1L3NkNhtVQUSRtqYwJtJg+Bp9rIzculIZWHTkKSysujrOk2J+NrRulLTQH9+3gGSfYLWSEWU1A==}
+  mdast-util-to-hast@13.2.0:
+    resolution: {integrity: sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==}
 
-  acorn-jsx@5.3.2:
-    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
-    peerDependencies:
-      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+  mdurl@2.0.0:
+    resolution: {integrity: sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==}
 
-  acorn@8.12.1:
-    resolution: {integrity: sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
+  merge-stream@2.0.0:
+    resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
 
-  ajv@6.12.6:
-    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
+  merge2@1.4.1:
+    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
+    engines: {node: '>= 8'}
 
-  algoliasearch@4.24.0:
-    resolution: {integrity: sha512-bf0QV/9jVejssFBmz2HQLxUadxk574t4iwjCKp5E7NBzwKkrDEhKPISIIjAU/p6K5qDx3qoeh4+26zWN1jmw3g==}
+  mermaid@11.3.0:
+    resolution: {integrity: sha512-fFmf2gRXLtlGzug4wpIGN+rQdZ30M8IZEB1D3eZkXNqC7puhqeURBcD/9tbwXsqBO+A6Nzzo3MSSepmnw5xSeg==}
 
-  ansi-regex@5.0.1:
-    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
-    engines: {node: '>=8'}
+  micromark-util-character@2.1.1:
+    resolution: {integrity: sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==}
 
-  ansi-regex@6.0.1:
-    resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
-    engines: {node: '>=12'}
+  micromark-util-encode@2.0.1:
+    resolution: {integrity: sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==}
 
-  ansi-styles@4.3.0:
-    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
-    engines: {node: '>=8'}
+  micromark-util-sanitize-uri@2.0.1:
+    resolution: {integrity: sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==}
 
-  anymatch@3.1.2:
-    resolution: {integrity: sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==}
-    engines: {node: '>= 8'}
+  micromark-util-symbol@2.0.1:
+    resolution: {integrity: sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==}
 
-  arg@5.0.2:
-    resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==}
+  micromark-util-types@2.0.1:
+    resolution: {integrity: sha512-534m2WhVTddrcKVepwmVEVnUAmtrx9bfIjNoQHRqfnvdaHQiFytEhJoTgpWJvDEXCO5gLTQh3wYC1PgOJA4NSQ==}
 
-  argparse@1.0.10:
-    resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
+  micromatch@4.0.8:
+    resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
+    engines: {node: '>=8.6'}
 
-  argparse@2.0.1:
-    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
+  mimic-fn@4.0.0:
+    resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
+    engines: {node: '>=12'}
 
-  array-buffer-byte-length@1.0.1:
-    resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==}
-    engines: {node: '>= 0.4'}
+  mimic-function@5.0.1:
+    resolution: {integrity: sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==}
+    engines: {node: '>=18'}
 
-  array-includes@3.1.8:
-    resolution: {integrity: sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==}
-    engines: {node: '>= 0.4'}
+  minimatch@3.1.2:
+    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
 
-  array-union@2.1.0:
-    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
-    engines: {node: '>=8'}
+  minimatch@9.0.5:
+    resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==}
+    engines: {node: '>=16 || 14 >=14.17'}
 
-  array.prototype.findlastindex@1.2.5:
-    resolution: {integrity: sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==}
-    engines: {node: '>= 0.4'}
+  minimist@1.2.8:
+    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
 
-  array.prototype.flat@1.3.2:
-    resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==}
-    engines: {node: '>= 0.4'}
+  mitt@3.0.1:
+    resolution: {integrity: sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==}
 
-  array.prototype.flatmap@1.3.2:
-    resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==}
-    engines: {node: '>= 0.4'}
+  mlly@1.7.2:
+    resolution: {integrity: sha512-tN3dvVHYVz4DhSXinXIk7u9syPYaJvio118uomkovAtWBT+RdbP6Lfh/5Lvo519YMmwBafwlh20IPTXIStscpA==}
 
-  arraybuffer.prototype.slice@1.0.3:
-    resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==}
-    engines: {node: '>= 0.4'}
+  mrmime@2.0.0:
+    resolution: {integrity: sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==}
+    engines: {node: '>=10'}
 
-  autoprefixer@10.4.19:
-    resolution: {integrity: sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==}
-    engines: {node: ^10 || ^12 || >=14}
+  ms@2.1.2:
+    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
+
+  ms@2.1.3:
+    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
+
+  nanoid@3.3.7:
+    resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
-    peerDependencies:
-      postcss: ^8.1.0
 
-  available-typed-arrays@1.0.7:
-    resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
-    engines: {node: '>= 0.4'}
+  nanoid@3.3.8:
+    resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
 
-  balanced-match@1.0.2:
-    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
+  nanoid@5.0.9:
+    resolution: {integrity: sha512-Aooyr6MXU6HpvvWXKoVoXwKMs/KyVakWwg7xQfv5/S/RIgJMy0Ifa45H9qqYy7pTCszrHzP21Uk4PZq2HpEM8Q==}
+    engines: {node: ^18 || >=20}
+    hasBin: true
 
-  balloon-css@1.2.0:
-    resolution: {integrity: sha512-urXwkHgwp6GsXVF+it01485Z2Cj4pnW02ICnM0TemOlkKmCNnDLmyy+ZZiRXBpwldUXO+aRNr7Hdia4CBvXJ5A==}
+  natural-compare@1.4.0:
+    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
+
+  neo-async@2.6.2:
+    resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
+
+  node-addon-api@7.1.1:
+    resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
+
+  node-releases@2.0.14:
+    resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==}
 
-  binary-extensions@2.2.0:
-    resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
-    engines: {node: '>=8'}
+  node-releases@2.0.18:
+    resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==}
 
-  boolbase@1.0.0:
-    resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
+  normalize-path@3.0.0:
+    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
+    engines: {node: '>=0.10.0'}
 
-  brace-expansion@1.1.11:
-    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
+  normalize-range@0.1.2:
+    resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==}
+    engines: {node: '>=0.10.0'}
 
-  brace-expansion@2.0.1:
-    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
+  npm-run-path@5.3.0:
+    resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
-  braces@3.0.2:
-    resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
-    engines: {node: '>=8'}
+  npm-run-path@6.0.0:
+    resolution: {integrity: sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==}
+    engines: {node: '>=18'}
 
-  browserslist@4.23.2:
-    resolution: {integrity: sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==}
-    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
-    hasBin: true
+  nth-check@2.1.1:
+    resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
 
-  builtin-modules@3.3.0:
-    resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==}
-    engines: {node: '>=6'}
+  object-inspect@1.13.2:
+    resolution: {integrity: sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==}
+    engines: {node: '>= 0.4'}
 
-  builtins@5.1.0:
-    resolution: {integrity: sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==}
+  object-keys@1.1.1:
+    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
+    engines: {node: '>= 0.4'}
 
-  cac@6.7.14:
-    resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
-    engines: {node: '>=8'}
+  object.assign@4.1.5:
+    resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==}
+    engines: {node: '>= 0.4'}
 
-  call-bind@1.0.7:
-    resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==}
+  object.fromentries@2.0.8:
+    resolution: {integrity: sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==}
     engines: {node: '>= 0.4'}
 
-  callsites@3.1.0:
-    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
-    engines: {node: '>=6'}
+  object.groupby@1.0.3:
+    resolution: {integrity: sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==}
+    engines: {node: '>= 0.4'}
 
-  caniuse-lite@1.0.30001641:
-    resolution: {integrity: sha512-Phv5thgl67bHYo1TtMY/MurjkHhV4EDaCosezRXgZ8jzA/Ub+wjxAvbGvjoFENStinwi5kCyOYV3mi5tOGykwA==}
+  object.values@1.2.0:
+    resolution: {integrity: sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==}
+    engines: {node: '>= 0.4'}
 
-  chalk@4.1.2:
-    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
-    engines: {node: '>=10'}
+  once@1.4.0:
+    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
 
-  chalk@5.3.0:
-    resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==}
-    engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
+  onetime@6.0.0:
+    resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}
+    engines: {node: '>=12'}
 
-  cheerio-select@2.1.0:
-    resolution: {integrity: sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==}
+  onetime@7.0.0:
+    resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==}
+    engines: {node: '>=18'}
 
-  cheerio@1.0.0-rc.12:
-    resolution: {integrity: sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==}
-    engines: {node: '>= 6'}
+  oniguruma-to-es@3.1.0:
+    resolution: {integrity: sha512-BJ3Jy22YlgejHSO7Fvmz1kKazlaPmRSUH+4adTDUS/dKQ4wLxI+gALZ8updbaux7/m7fIlpgOZ5fp/Inq5jUAw==}
 
-  chokidar@3.6.0:
-    resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
-    engines: {node: '>= 8.10.0'}
+  open@10.1.0:
+    resolution: {integrity: sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==}
+    engines: {node: '>=18'}
 
-  cli-cursor@4.0.0:
-    resolution: {integrity: sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  optionator@0.9.4:
+    resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
+    engines: {node: '>= 0.8.0'}
 
-  cli-spinners@2.9.2:
-    resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==}
-    engines: {node: '>=6'}
+  ora@8.2.0:
+    resolution: {integrity: sha512-weP+BZ8MVNnlCm8c0Qdc1WSWq4Qn7I+9CJGm7Qali6g44e/PUzbjNqJX5NJ9ljlNMosfJvg1fKEGILklK9cwnw==}
+    engines: {node: '>=18'}
 
-  color-convert@2.0.1:
-    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
-    engines: {node: '>=7.0.0'}
+  p-limit@2.3.0:
+    resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
+    engines: {node: '>=6'}
 
-  color-name@1.1.4:
-    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
+  p-limit@3.1.0:
+    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
+    engines: {node: '>=10'}
 
-  concat-map@0.0.1:
-    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
+  p-locate@4.1.0:
+    resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
+    engines: {node: '>=8'}
 
-  connect-history-api-fallback@2.0.0:
-    resolution: {integrity: sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==}
-    engines: {node: '>=0.8'}
+  p-locate@5.0.0:
+    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
+    engines: {node: '>=10'}
 
-  cross-spawn@7.0.3:
-    resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
-    engines: {node: '>= 8'}
+  p-map@3.0.0:
+    resolution: {integrity: sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==}
+    engines: {node: '>=8'}
 
-  css-select@5.1.0:
-    resolution: {integrity: sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==}
+  p-try@2.2.0:
+    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
+    engines: {node: '>=6'}
 
-  css-what@6.1.0:
-    resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==}
-    engines: {node: '>= 6'}
+  package-manager-detector@0.2.2:
+    resolution: {integrity: sha512-VgXbyrSNsml4eHWIvxxG/nTL4wgybMTXCV2Un/+yEc3aDKKU6nQBZjbeP3Pl3qm9Qg92X/1ng4ffvCeD/zwHgg==}
 
-  cssesc@3.0.0:
-    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
-    engines: {node: '>=4'}
-    hasBin: true
+  parent-module@1.0.1:
+    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
+    engines: {node: '>=6'}
 
-  csstype@3.1.3:
-    resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
+  parse-ms@4.0.0:
+    resolution: {integrity: sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==}
+    engines: {node: '>=18'}
 
-  data-view-buffer@1.0.1:
-    resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==}
-    engines: {node: '>= 0.4'}
+  parse5-htmlparser2-tree-adapter@7.0.0:
+    resolution: {integrity: sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==}
 
-  data-view-byte-length@1.0.1:
-    resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==}
-    engines: {node: '>= 0.4'}
+  parse5-parser-stream@7.1.2:
+    resolution: {integrity: sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==}
 
-  data-view-byte-offset@1.0.0:
-    resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==}
-    engines: {node: '>= 0.4'}
+  parse5@7.1.2:
+    resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==}
 
-  dayjs@1.11.11:
-    resolution: {integrity: sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==}
+  path-data-parser@0.1.0:
+    resolution: {integrity: sha512-NOnmBpt5Y2RWbuv0LMzsayp3lVylAHLPUTut412ZA3l+C4uw4ZVkQbjShYCQ8TCpUMdPapr4YjUqLYD6v68j+w==}
 
-  debug@3.2.7:
-    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
+  path-exists@4.0.0:
+    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
+    engines: {node: '>=8'}
 
-  debug@4.3.5:
-    resolution: {integrity: sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
+  path-is-absolute@1.0.1:
+    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
+    engines: {node: '>=0.10.0'}
 
-  deep-is@0.1.4:
-    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
+  path-key@3.1.1:
+    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
+    engines: {node: '>=8'}
 
-  define-data-property@1.1.4:
-    resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
-    engines: {node: '>= 0.4'}
+  path-key@4.0.0:
+    resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
+    engines: {node: '>=12'}
 
-  define-properties@1.2.1:
-    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
-    engines: {node: '>= 0.4'}
+  path-parse@1.0.7:
+    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
-  dir-glob@3.0.1:
-    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
+  path-type@4.0.0:
+    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
     engines: {node: '>=8'}
 
-  doctrine@2.1.0:
-    resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
-    engines: {node: '>=0.10.0'}
+  path-type@5.0.0:
+    resolution: {integrity: sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==}
+    engines: {node: '>=12'}
 
-  doctrine@3.0.0:
-    resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
-    engines: {node: '>=6.0.0'}
+  pathe@1.1.2:
+    resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==}
 
-  dom-serializer@2.0.0:
-    resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==}
+  perfect-debounce@1.0.0:
+    resolution: {integrity: sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==}
 
-  domelementtype@2.3.0:
-    resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
+  photoswipe@5.4.4:
+    resolution: {integrity: sha512-WNFHoKrkZNnvFFhbHL93WDkW3ifwVOXSW3w1UuZZelSmgXpIGiZSNlZJq37rR8YejqME2rHs9EhH9ZvlvFH2NA==}
+    engines: {node: '>= 0.12.0'}
 
-  domhandler@5.0.3:
-    resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
-    engines: {node: '>= 4'}
+  picocolors@1.0.1:
+    resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==}
 
-  domutils@3.1.0:
-    resolution: {integrity: sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==}
+  picocolors@1.1.1:
+    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
 
-  electron-to-chromium@1.4.825:
-    resolution: {integrity: sha512-OCcF+LwdgFGcsYPYC5keEEFC2XT0gBhrYbeGzHCx7i9qRFbzO/AqTmc/C/1xNhJj+JA7rzlN7mpBuStshh96Cg==}
+  picomatch@2.3.1:
+    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
+    engines: {node: '>=8.6'}
 
-  emoji-regex@10.3.0:
-    resolution: {integrity: sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==}
+  pify@4.0.1:
+    resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
+    engines: {node: '>=6'}
 
-  entities@4.5.0:
-    resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
-    engines: {node: '>=0.12'}
+  pkg-types@1.2.1:
+    resolution: {integrity: sha512-sQoqa8alT3nHjGuTjuKgOnvjo4cljkufdtLMnO2LBP/wRwuDlo1tkaEdMxCRhyGRPacv/ztlZgDPm2b7FAmEvw==}
 
-  envinfo@7.13.0:
-    resolution: {integrity: sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==}
-    engines: {node: '>=4'}
-    hasBin: true
+  pngjs@5.0.0:
+    resolution: {integrity: sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==}
+    engines: {node: '>=10.13.0'}
 
-  es-abstract@1.23.3:
-    resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==}
-    engines: {node: '>= 0.4'}
+  points-on-curve@0.2.0:
+    resolution: {integrity: sha512-0mYKnYYe9ZcqMCWhUjItv/oHjvgEsfKvnUTg8sAtnHr3GVy7rGkXCb6d5cSyqrWqL4k81b9CPg3urd+T7aop3A==}
 
-  es-define-property@1.0.0:
-    resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==}
-    engines: {node: '>= 0.4'}
+  points-on-path@0.2.1:
+    resolution: {integrity: sha512-25ClnWWuw7JbWZcgqY/gJ4FQWadKxGWk+3kR/7kD0tCaDtPPMj7oHu2ToLaVhfpnHrZzYby2w6tUA0eOIuUg8g==}
 
-  es-errors@1.3.0:
-    resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
+  possible-typed-array-names@1.0.0:
+    resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==}
     engines: {node: '>= 0.4'}
 
-  es-object-atoms@1.0.0:
-    resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==}
-    engines: {node: '>= 0.4'}
+  postcss-load-config@6.0.1:
+    resolution: {integrity: sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      jiti: '>=1.21.0'
+      postcss: '>=8.0.9'
+      tsx: ^4.8.1
+      yaml: ^2.4.2
+    peerDependenciesMeta:
+      jiti:
+        optional: true
+      postcss:
+        optional: true
+      tsx:
+        optional: true
+      yaml:
+        optional: true
 
-  es-set-tostringtag@2.0.3:
-    resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==}
-    engines: {node: '>= 0.4'}
+  postcss-selector-parser@6.1.1:
+    resolution: {integrity: sha512-b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg==}
+    engines: {node: '>=4'}
 
-  es-shim-unscopables@1.0.2:
-    resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==}
+  postcss-value-parser@4.2.0:
+    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
 
-  es-to-primitive@1.2.1:
-    resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
-    engines: {node: '>= 0.4'}
+  postcss@8.4.41:
+    resolution: {integrity: sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==}
+    engines: {node: ^10 || ^12 || >=14}
+
+  postcss@8.5.2:
+    resolution: {integrity: sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==}
+    engines: {node: ^10 || ^12 || >=14}
+
+  prelude-ls@1.2.1:
+    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
+    engines: {node: '>= 0.8.0'}
 
-  esbuild@0.21.5:
-    resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==}
-    engines: {node: '>=12'}
+  prettier@2.3.2:
+    resolution: {integrity: sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==}
+    engines: {node: '>=10.13.0'}
     hasBin: true
 
-  escalade@3.1.2:
-    resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==}
-    engines: {node: '>=6'}
+  pretty-ms@9.0.0:
+    resolution: {integrity: sha512-E9e9HJ9R9NasGOgPaPE8VMeiPKAyWR5jcFpNnwIejslIhWqdqOrb2wShBsncMPUb+BcCd2OPYfh7p2W6oemTng==}
+    engines: {node: '>=18'}
 
-  escape-string-regexp@4.0.0:
-    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
-    engines: {node: '>=10'}
+  property-information@6.5.0:
+    resolution: {integrity: sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==}
 
-  eslint-compat-utils@0.5.1:
-    resolution: {integrity: sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==}
-    engines: {node: '>=12'}
-    peerDependencies:
-      eslint: '>=6.0.0'
+  punycode.js@2.3.1:
+    resolution: {integrity: sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==}
+    engines: {node: '>=6'}
 
-  eslint-config-prettier@9.1.0:
-    resolution: {integrity: sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==}
+  punycode@2.3.1:
+    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
+    engines: {node: '>=6'}
+
+  qrcode@1.5.4:
+    resolution: {integrity: sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==}
+    engines: {node: '>=10.13.0'}
     hasBin: true
-    peerDependencies:
-      eslint: '>=7.0.0'
 
-  eslint-config-standard@17.1.0:
-    resolution: {integrity: sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==}
-    engines: {node: '>=12.0.0'}
-    peerDependencies:
-      eslint: ^8.0.1
-      eslint-plugin-import: ^2.25.2
-      eslint-plugin-n: '^15.0.0 || ^16.0.0 '
-      eslint-plugin-promise: ^6.0.0
+  queue-microtask@1.2.3:
+    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
 
-  eslint-config-vuepress-typescript@4.10.1:
-    resolution: {integrity: sha512-MD6Z0K/GViVIIRuCym2CfHb8XB2JJ3MXPN5gNe+Bv2lAXOyi5/IUDR+BjBjA/Hdo6xrLHQOM+I8gtQrxUuddjg==}
+  readdirp@3.6.0:
+    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
+    engines: {node: '>=8.10.0'}
 
-  eslint-config-vuepress@4.10.1:
-    resolution: {integrity: sha512-VunYtLhFdDxReGRCp+Lba86f18Hd/Srb+tOVbonYFITUNtpr8y85JgtVrXCS9c5+JE9PPx0JcxAFDxWDtoTH7g==}
+  readdirp@4.1.1:
+    resolution: {integrity: sha512-h80JrZu/MHUZCyHu5ciuoI0+WxsCxzxJTILn6Fs8rxSnFPh+UVHYfeIxK1nVGugMqkfC4vJcBOYbkfkwYK0+gw==}
+    engines: {node: '>= 14.18.0'}
 
-  eslint-import-resolver-node@0.3.9:
-    resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==}
+  rechoir@0.6.2:
+    resolution: {integrity: sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==}
+    engines: {node: '>= 0.10'}
 
-  eslint-module-utils@2.8.1:
-    resolution: {integrity: sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==}
+  regenerate-unicode-properties@10.1.1:
+    resolution: {integrity: sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==}
     engines: {node: '>=4'}
-    peerDependencies:
-      '@typescript-eslint/parser': '*'
-      eslint: '*'
-      eslint-import-resolver-node: '*'
-      eslint-import-resolver-typescript: '*'
-      eslint-import-resolver-webpack: '*'
-    peerDependenciesMeta:
-      '@typescript-eslint/parser':
-        optional: true
-      eslint:
-        optional: true
-      eslint-import-resolver-node:
-        optional: true
-      eslint-import-resolver-typescript:
-        optional: true
-      eslint-import-resolver-webpack:
-        optional: true
 
-  eslint-plugin-es-x@7.8.0:
-    resolution: {integrity: sha512-7Ds8+wAAoV3T+LAKeu39Y5BzXCrGKrcISfgKEqTS4BDN8SFEDQd0S43jiQ8vIa3wUKD07qitZdfzlenSi8/0qQ==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    peerDependencies:
-      eslint: '>=8'
+  regenerate@1.4.2:
+    resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==}
 
-  eslint-plugin-import@2.29.1:
-    resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      '@typescript-eslint/parser': '*'
-      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
-    peerDependenciesMeta:
-      '@typescript-eslint/parser':
-        optional: true
+  regenerator-runtime@0.14.1:
+    resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}
 
-  eslint-plugin-n@16.6.2:
-    resolution: {integrity: sha512-6TyDmZ1HXoFQXnhCTUjVFULReoBPOAjpuiKELMkeP40yffI/1ZRO+d9ug/VC6fqISo2WkuIBk3cvuRPALaWlOQ==}
-    engines: {node: '>=16.0.0'}
-    peerDependencies:
-      eslint: '>=7.0.0'
+  regenerator-transform@0.15.2:
+    resolution: {integrity: sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==}
 
-  eslint-plugin-promise@6.4.0:
-    resolution: {integrity: sha512-/KWWRaD3fGkVCZsdR0RU53PSthFmoHVhZl+y9+6DqeDLSikLdlUVpVEAmI6iCRR5QyOjBYBqHZV/bdv4DJ4Gtw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
+  regex-recursion@6.0.2:
+    resolution: {integrity: sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==}
 
-  eslint-plugin-vue@9.27.0:
-    resolution: {integrity: sha512-5Dw3yxEyuBSXTzT5/Ge1X5kIkRTQ3nvBn/VwPwInNiZBSJOO/timWMUaflONnFBzU6NhB68lxnCda7ULV5N7LA==}
-    engines: {node: ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
+  regex-utilities@2.3.0:
+    resolution: {integrity: sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==}
 
-  eslint-scope@7.2.2:
-    resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  regex@6.0.1:
+    resolution: {integrity: sha512-uorlqlzAKjKQZ5P+kTJr3eeJGSVroLKoHmquUj4zHWuR+hEyNqlXsSKlYYF5F4NI6nl7tWCs0apKJ0lmfsXAPA==}
 
-  eslint-visitor-keys@3.4.3:
-    resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  regexp.prototype.flags@1.5.2:
+    resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==}
+    engines: {node: '>= 0.4'}
 
-  eslint@8.57.0:
-    resolution: {integrity: sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  regexpu-core@5.3.2:
+    resolution: {integrity: sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==}
+    engines: {node: '>=4'}
+
+  regjsparser@0.9.1:
+    resolution: {integrity: sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==}
     hasBin: true
 
-  espree@9.6.1:
-    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  require-directory@2.1.1:
+    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
+    engines: {node: '>=0.10.0'}
 
-  esprima@4.0.1:
-    resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
+  require-main-filename@2.0.0:
+    resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}
+
+  resolve-from@4.0.0:
+    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
     engines: {node: '>=4'}
-    hasBin: true
 
-  esquery@1.6.0:
-    resolution: {integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==}
-    engines: {node: '>=0.10'}
+  resolve-pkg-maps@1.0.0:
+    resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
 
-  esrecurse@4.3.0:
-    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
-    engines: {node: '>=4.0'}
+  resolve@1.22.8:
+    resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==}
+    hasBin: true
 
-  estraverse@5.3.0:
-    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
-    engines: {node: '>=4.0'}
+  restore-cursor@5.1.0:
+    resolution: {integrity: sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==}
+    engines: {node: '>=18'}
 
-  estree-walker@2.0.2:
-    resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
+  reusify@1.0.4:
+    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
+    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
 
-  esutils@2.0.3:
-    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
-    engines: {node: '>=0.10.0'}
+  rfdc@1.4.1:
+    resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==}
 
-  execa@9.3.0:
-    resolution: {integrity: sha512-l6JFbqnHEadBoVAVpN5dl2yCyfX28WoBAGaoQcNmLLSedOxTxcn2Qa83s8I/PA5i56vWru2OHOtrwF7Om2vqlg==}
-    engines: {node: ^18.19.0 || >=20.5.0}
+  rimraf@3.0.2:
+    resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
+    deprecated: Rimraf versions prior to v4 are no longer supported
+    hasBin: true
 
-  extend-shallow@2.0.1:
-    resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
-    engines: {node: '>=0.10.0'}
+  robust-predicates@3.0.2:
+    resolution: {integrity: sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==}
 
-  fast-deep-equal@3.1.3:
-    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
+  rollup@4.34.6:
+    resolution: {integrity: sha512-wc2cBWqJgkU3Iz5oztRkQbfVkbxoz5EhnCGOrnJvnLnQ7O0WhQUYyv18qQI79O8L7DdHrrlJNeCHd4VGpnaXKQ==}
+    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
+    hasBin: true
 
-  fast-glob@3.3.2:
-    resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==}
-    engines: {node: '>=8.6.0'}
+  roughjs@4.6.6:
+    resolution: {integrity: sha512-ZUz/69+SYpFN/g/lUlo2FXcIjRkSu3nDarreVdGGndHEBJ6cXPdKguS8JGxwj5HA5xIbVKSmLgr5b3AWxtRfvQ==}
 
-  fast-json-stable-stringify@2.1.0:
-    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
+  run-applescript@7.0.0:
+    resolution: {integrity: sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==}
+    engines: {node: '>=18'}
 
-  fast-levenshtein@2.0.6:
-    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
+  run-parallel@1.2.0:
+    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
 
-  fastq@1.13.0:
-    resolution: {integrity: sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==}
+  rw@1.3.3:
+    resolution: {integrity: sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==}
 
-  fflate@0.8.2:
-    resolution: {integrity: sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==}
+  safe-array-concat@1.1.2:
+    resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==}
+    engines: {node: '>=0.4'}
 
-  figures@6.1.0:
-    resolution: {integrity: sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==}
-    engines: {node: '>=18'}
+  safe-regex-test@1.0.3:
+    resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==}
+    engines: {node: '>= 0.4'}
 
-  file-entry-cache@6.0.1:
-    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  safer-buffer@2.1.2:
+    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
 
-  fill-range@7.0.1:
-    resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
-    engines: {node: '>=8'}
+  sass-loader@15.0.0:
+    resolution: {integrity: sha512-mbXAL7sI/fgt3skXR6xHxtKkaGyxRrGf7zrU4hLLWxBDJEcAe0QsoNy92qKttCb3zfMniTkU2kD9yakUKtW7vQ==}
+    engines: {node: '>= 18.12.0'}
+    peerDependencies:
+      '@rspack/core': 0.x || 1.x
+      node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
+      sass: ^1.3.0
+      sass-embedded: '*'
+      webpack: ^5.0.0
+    peerDependenciesMeta:
+      '@rspack/core':
+        optional: true
+      node-sass:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+      webpack:
+        optional: true
 
-  find-up@5.0.0:
-    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
-    engines: {node: '>=10'}
+  sass@1.84.0:
+    resolution: {integrity: sha512-XDAbhEPJRxi7H0SxrnOpiXFQoUJHwkR2u3Zc4el+fK/Tt5Hpzw5kkQ59qVDfvdaUq6gCrEZIbySFBM2T9DNKHg==}
+    engines: {node: '>=14.0.0'}
+    hasBin: true
 
-  flat-cache@3.2.0:
-    resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  sax@1.2.4:
+    resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==}
 
-  flatted@3.3.1:
-    resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==}
+  sax@1.4.1:
+    resolution: {integrity: sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==}
 
-  for-each@0.3.3:
-    resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
+  section-matter@1.0.0:
+    resolution: {integrity: sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==}
+    engines: {node: '>=4'}
 
-  fraction.js@4.3.7:
-    resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==}
+  semver@5.7.2:
+    resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==}
+    hasBin: true
 
-  fs-extra@11.2.0:
-    resolution: {integrity: sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==}
-    engines: {node: '>=14.14'}
+  semver@6.3.1:
+    resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
+    hasBin: true
 
-  fs.realpath@1.0.0:
-    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
+  semver@7.6.2:
+    resolution: {integrity: sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==}
+    engines: {node: '>=10'}
+    hasBin: true
 
-  fsevents@2.3.3:
-    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
-    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
-    os: [darwin]
+  set-blocking@2.0.0:
+    resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
 
-  function-bind@1.1.2:
-    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
+  set-function-length@1.2.2:
+    resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
+    engines: {node: '>= 0.4'}
 
-  function.prototype.name@1.1.6:
-    resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==}
+  set-function-name@2.0.2:
+    resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==}
     engines: {node: '>= 0.4'}
 
-  functions-have-names@1.2.3:
-    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
+  shebang-command@2.0.0:
+    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
+    engines: {node: '>=8'}
+
+  shebang-regex@3.0.0:
+    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
+    engines: {node: '>=8'}
 
-  get-east-asian-width@1.2.0:
-    resolution: {integrity: sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==}
-    engines: {node: '>=18'}
+  shelljs@0.8.5:
+    resolution: {integrity: sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==}
+    engines: {node: '>=4'}
+    hasBin: true
 
-  get-intrinsic@1.2.4:
-    resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
-    engines: {node: '>= 0.4'}
+  shiki@2.3.2:
+    resolution: {integrity: sha512-UZhz/gsUz7DHFbQBOJP7eXqvKyYvMGramxQiSDc83M/7OkWm6OdVHAReEc3vMLh6L6TRhgL9dvhXz9XDkCDaaw==}
 
-  get-stream@9.0.1:
-    resolution: {integrity: sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==}
-    engines: {node: '>=18'}
+  shx@0.3.3:
+    resolution: {integrity: sha512-nZJ3HFWVoTSyyB+evEKjJ1STiixGztlqwKLTUNV5KqMWtGey9fTd4KU1gdZ1X9BV6215pswQ/Jew9NsuS/fNDA==}
+    engines: {node: '>=6'}
+    hasBin: true
 
-  get-symbol-description@1.0.2:
-    resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==}
+  side-channel@1.0.6:
+    resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==}
     engines: {node: '>= 0.4'}
 
-  get-tsconfig@4.7.5:
-    resolution: {integrity: sha512-ZCuZCnlqNzjb4QprAzXKdpp/gh6KTxSJuw3IBsPnV/7fV4NxC9ckB+vPTt8w7fJA0TaSD7c55BR47JD6MEDyDw==}
+  signal-exit@4.1.0:
+    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
+    engines: {node: '>=14'}
 
-  glob-parent@5.1.2:
-    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
-    engines: {node: '>= 6'}
+  sirv@2.0.4:
+    resolution: {integrity: sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==}
+    engines: {node: '>= 10'}
 
-  glob-parent@6.0.2:
-    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
-    engines: {node: '>=10.13.0'}
+  sitemap@8.0.0:
+    resolution: {integrity: sha512-+AbdxhM9kJsHtruUF39bwS/B0Fytw6Fr1o4ZAIAEqA6cke2xcoO2GleBw9Zw7nRzILVEgz7zBM5GiTJjie1G9A==}
+    engines: {node: '>=14.0.0', npm: '>=6.0.0'}
+    hasBin: true
 
-  glob@7.2.3:
-    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
-    deprecated: Glob versions prior to v9 are no longer supported
+  slash@2.0.0:
+    resolution: {integrity: sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==}
+    engines: {node: '>=6'}
 
-  globals@13.24.0:
-    resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==}
+  slash@3.0.0:
+    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
     engines: {node: '>=8'}
 
-  globalthis@1.0.4:
-    resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==}
-    engines: {node: '>= 0.4'}
+  slash@5.1.0:
+    resolution: {integrity: sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==}
+    engines: {node: '>=14.16'}
 
-  globby@11.1.0:
-    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
-    engines: {node: '>=10'}
+  source-map-js@1.2.0:
+    resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
+    engines: {node: '>=0.10.0'}
 
-  globby@14.0.2:
-    resolution: {integrity: sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==}
-    engines: {node: '>=18'}
+  source-map-js@1.2.1:
+    resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
+    engines: {node: '>=0.10.0'}
 
-  gopd@1.0.1:
-    resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
+  source-map-resolve@0.6.0:
+    resolution: {integrity: sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==}
+    deprecated: See https://github.com/lydell/source-map-resolve#deprecated
 
-  graceful-fs@4.2.11:
-    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
+  source-map@0.6.1:
+    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
+    engines: {node: '>=0.10.0'}
 
-  graphemer@1.4.0:
-    resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
+  source-map@0.7.4:
+    resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==}
+    engines: {node: '>= 8'}
 
-  gray-matter@4.0.3:
-    resolution: {integrity: sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==}
-    engines: {node: '>=6.0'}
+  space-separated-tokens@2.0.2:
+    resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==}
 
-  has-bigints@1.0.2:
-    resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
+  speakingurl@14.0.1:
+    resolution: {integrity: sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==}
+    engines: {node: '>=0.10.0'}
 
-  has-flag@4.0.0:
-    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
-    engines: {node: '>=8'}
+  sprintf-js@1.0.3:
+    resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
 
-  has-property-descriptors@1.0.2:
-    resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
+  stdin-discarder@0.2.2:
+    resolution: {integrity: sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ==}
+    engines: {node: '>=18'}
 
-  has-proto@1.0.3:
-    resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==}
-    engines: {node: '>= 0.4'}
+  string-width@4.2.3:
+    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
+    engines: {node: '>=8'}
 
-  has-symbols@1.0.3:
-    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
-    engines: {node: '>= 0.4'}
+  string-width@7.2.0:
+    resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==}
+    engines: {node: '>=18'}
 
-  has-tostringtag@1.0.2:
-    resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
+  string.prototype.trim@1.2.9:
+    resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==}
     engines: {node: '>= 0.4'}
 
-  hash-sum@2.0.0:
-    resolution: {integrity: sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==}
+  string.prototype.trimend@1.0.8:
+    resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==}
 
-  hasown@2.0.2:
-    resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
+  string.prototype.trimstart@1.0.8:
+    resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}
     engines: {node: '>= 0.4'}
 
-  htmlparser2@8.0.2:
-    resolution: {integrity: sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==}
-
-  human-signals@7.0.0:
-    resolution: {integrity: sha512-74kytxOUSvNbjrT9KisAbaTZ/eJwD/LrbM/kh5j0IhPuJzwuA19dWvniFGwBzN9rVjg+O/e+F310PjObDXS+9Q==}
-    engines: {node: '>=18.18.0'}
-
-  ignore@5.3.1:
-    resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==}
-    engines: {node: '>= 4'}
-
-  immutable@4.0.0:
-    resolution: {integrity: sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==}
-
-  import-fresh@3.3.0:
-    resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
-    engines: {node: '>=6'}
+  stringify-entities@4.0.4:
+    resolution: {integrity: sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==}
 
-  imurmurhash@0.1.4:
-    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
-    engines: {node: '>=0.8.19'}
+  strip-ansi@6.0.1:
+    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
+    engines: {node: '>=8'}
 
-  inflight@1.0.6:
-    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
-    deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
+  strip-ansi@7.1.0:
+    resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}
+    engines: {node: '>=12'}
 
-  inherits@2.0.4:
-    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
+  strip-bom-string@1.0.0:
+    resolution: {integrity: sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==}
+    engines: {node: '>=0.10.0'}
 
-  internal-slot@1.0.7:
-    resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==}
-    engines: {node: '>= 0.4'}
+  strip-bom@3.0.0:
+    resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
+    engines: {node: '>=4'}
 
-  is-array-buffer@3.0.4:
-    resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==}
-    engines: {node: '>= 0.4'}
+  strip-final-newline@3.0.0:
+    resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
+    engines: {node: '>=12'}
 
-  is-bigint@1.0.4:
-    resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
+  strip-final-newline@4.0.0:
+    resolution: {integrity: sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==}
+    engines: {node: '>=18'}
 
-  is-binary-path@2.1.0:
-    resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
+  strip-json-comments@3.1.1:
+    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
     engines: {node: '>=8'}
 
-  is-boolean-object@1.1.2:
-    resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
-    engines: {node: '>= 0.4'}
+  stylis@4.3.4:
+    resolution: {integrity: sha512-osIBl6BGUmSfDkyH2mB7EFvCJntXDrLhKjHTRj/rK6xLH0yuPrHULDRQzKokSOD4VoorhtKpfcfW1GAntu8now==}
 
-  is-builtin-module@3.2.1:
-    resolution: {integrity: sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==}
-    engines: {node: '>=6'}
+  stylus@0.56.0:
+    resolution: {integrity: sha512-Ev3fOb4bUElwWu4F9P9WjnnaSpc8XB9OFHSFZSKMFL1CE1oM+oFXWEgAqPmmZIyhBihuqIQlFsVTypiiS9RxeA==}
+    hasBin: true
 
-  is-callable@1.2.7:
-    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
-    engines: {node: '>= 0.4'}
+  superjson@2.2.1:
+    resolution: {integrity: sha512-8iGv75BYOa0xRJHK5vRLEjE2H/i4lulTjzpUXic3Eg8akftYjkmQDa8JARQ42rlczXyFR3IeRoeFCc7RxHsYZA==}
+    engines: {node: '>=16'}
 
-  is-core-module@2.14.0:
-    resolution: {integrity: sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==}
-    engines: {node: '>= 0.4'}
+  supports-color@5.5.0:
+    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
+    engines: {node: '>=4'}
 
-  is-data-view@1.0.1:
-    resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==}
-    engines: {node: '>= 0.4'}
+  supports-color@7.2.0:
+    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
+    engines: {node: '>=8'}
 
-  is-date-object@1.0.5:
-    resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
+  supports-preserve-symlinks-flag@1.0.0:
+    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
 
-  is-extendable@0.1.1:
-    resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==}
-    engines: {node: '>=0.10.0'}
-
-  is-extglob@2.1.1:
-    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
-    engines: {node: '>=0.10.0'}
-
-  is-glob@4.0.3:
-    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
-    engines: {node: '>=0.10.0'}
+  svg-tags@1.0.0:
+    resolution: {integrity: sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==}
 
-  is-interactive@2.0.0:
-    resolution: {integrity: sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==}
-    engines: {node: '>=12'}
+  synckit@0.9.2:
+    resolution: {integrity: sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==}
+    engines: {node: ^14.18.0 || >=16.0.0}
 
-  is-negative-zero@2.0.3:
-    resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
-    engines: {node: '>= 0.4'}
+  text-table@0.2.0:
+    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
 
-  is-number-object@1.0.7:
-    resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
-    engines: {node: '>= 0.4'}
+  tinyexec@0.3.1:
+    resolution: {integrity: sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==}
 
-  is-number@7.0.0:
-    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
-    engines: {node: '>=0.12.0'}
+  to-fast-properties@2.0.0:
+    resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
+    engines: {node: '>=4'}
 
-  is-path-inside@3.0.3:
-    resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
-    engines: {node: '>=8'}
+  to-regex-range@5.0.1:
+    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
+    engines: {node: '>=8.0'}
 
-  is-plain-obj@4.1.0:
-    resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==}
-    engines: {node: '>=12'}
+  totalist@3.0.1:
+    resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
+    engines: {node: '>=6'}
 
-  is-regex@1.1.4:
-    resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
-    engines: {node: '>= 0.4'}
+  trim-lines@3.0.1:
+    resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==}
 
-  is-shared-array-buffer@1.0.3:
-    resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==}
-    engines: {node: '>= 0.4'}
+  ts-api-utils@1.3.0:
+    resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==}
+    engines: {node: '>=16'}
+    peerDependencies:
+      typescript: '>=4.2.0'
 
-  is-stream@4.0.1:
-    resolution: {integrity: sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==}
-    engines: {node: '>=18'}
+  ts-dedent@2.2.0:
+    resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==}
+    engines: {node: '>=6.10'}
 
-  is-string@1.0.7:
-    resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
-    engines: {node: '>= 0.4'}
+  tsconfig-paths@3.15.0:
+    resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==}
 
-  is-symbol@1.0.4:
-    resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
-    engines: {node: '>= 0.4'}
+  tsconfig-vuepress@4.5.0:
+    resolution: {integrity: sha512-edJbEJwTQayS4+q5mIPsVY9UaZfgzJezNX/eO86rRgIIDsJyVdcUahr7WgqQWdYI7MIcdDvMRlSn0+Veznmq5g==}
 
-  is-typed-array@1.1.13:
-    resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==}
-    engines: {node: '>= 0.4'}
+  tslib@2.8.1:
+    resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
-  is-unicode-supported@1.3.0:
-    resolution: {integrity: sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==}
-    engines: {node: '>=12'}
+  type-check@0.4.0:
+    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
+    engines: {node: '>= 0.8.0'}
 
-  is-unicode-supported@2.0.0:
-    resolution: {integrity: sha512-FRdAyx5lusK1iHG0TWpVtk9+1i+GjrzRffhDg4ovQ7mcidMQ6mj+MhKPmvh7Xwyv5gIS06ns49CA7Sqg7lC22Q==}
-    engines: {node: '>=18'}
+  type-fest@0.20.2:
+    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
+    engines: {node: '>=10'}
 
-  is-weakref@1.0.2:
-    resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
+  typed-array-buffer@1.0.2:
+    resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==}
+    engines: {node: '>= 0.4'}
 
-  isarray@2.0.5:
-    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
+  typed-array-byte-length@1.0.1:
+    resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==}
+    engines: {node: '>= 0.4'}
 
-  isexe@2.0.0:
-    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
+  typed-array-byte-offset@1.0.2:
+    resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==}
+    engines: {node: '>= 0.4'}
 
-  js-yaml@3.14.1:
-    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
-    hasBin: true
+  typed-array-length@1.0.6:
+    resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==}
+    engines: {node: '>= 0.4'}
 
-  js-yaml@4.1.0:
-    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
+  typescript@5.5.3:
+    resolution: {integrity: sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==}
+    engines: {node: '>=14.17'}
     hasBin: true
 
-  json-buffer@3.0.1:
-    resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
-
-  json-schema-traverse@0.4.1:
-    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
+  uc.micro@2.1.0:
+    resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==}
 
-  json-stable-stringify-without-jsonify@1.0.1:
-    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
+  ufo@1.5.4:
+    resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==}
 
-  json5@1.0.2:
-    resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
-    hasBin: true
+  unbox-primitive@1.0.2:
+    resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
 
-  jsonfile@6.1.0:
-    resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
+  undici@6.21.1:
+    resolution: {integrity: sha512-q/1rj5D0/zayJB2FraXdaWxbhWiNKDvu8naDT2dl1yTlvJp4BLtOcp2a5BvgGNQpYYJzau7tf1WgKv3b+7mqpQ==}
+    engines: {node: '>=18.17'}
 
-  keyv@4.5.4:
-    resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
+  unicode-canonical-property-names-ecmascript@2.0.0:
+    resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==}
+    engines: {node: '>=4'}
 
-  kind-of@6.0.3:
-    resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
-    engines: {node: '>=0.10.0'}
+  unicode-match-property-ecmascript@2.0.0:
+    resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==}
+    engines: {node: '>=4'}
 
-  levn@0.4.1:
-    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
-    engines: {node: '>= 0.8.0'}
+  unicode-match-property-value-ecmascript@2.1.0:
+    resolution: {integrity: sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==}
+    engines: {node: '>=4'}
 
-  lilconfig@3.1.2:
-    resolution: {integrity: sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==}
-    engines: {node: '>=14'}
+  unicode-property-aliases-ecmascript@2.1.0:
+    resolution: {integrity: sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==}
+    engines: {node: '>=4'}
 
-  linkify-it@5.0.0:
-    resolution: {integrity: sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==}
+  unicorn-magic@0.1.0:
+    resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==}
+    engines: {node: '>=18'}
 
-  locate-path@6.0.0:
-    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
-    engines: {node: '>=10'}
+  unicorn-magic@0.3.0:
+    resolution: {integrity: sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==}
+    engines: {node: '>=18'}
 
-  lodash.merge@4.6.2:
-    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
+  unist-util-is@6.0.0:
+    resolution: {integrity: sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==}
 
-  lodash@4.17.21:
-    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
+  unist-util-position@5.0.0:
+    resolution: {integrity: sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==}
 
-  log-symbols@6.0.0:
-    resolution: {integrity: sha512-i24m8rpwhmPIS4zscNzK6MSEhk0DUWa/8iYQWxhffV8jkI4Phvs3F+quL5xvS0gdQR0FyTCMMH33Y78dDTzzIw==}
-    engines: {node: '>=18'}
+  unist-util-stringify-position@4.0.0:
+    resolution: {integrity: sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==}
 
-  magic-string@0.30.10:
-    resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==}
+  unist-util-visit-parents@6.0.1:
+    resolution: {integrity: sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==}
 
-  markdown-it-anchor@9.0.1:
-    resolution: {integrity: sha512-cBt7aAzmkfX8X7FqAe8EBryiKmToXgMQEEMqkXzWCm0toDtfDYIGboKeTKd8cpNJArJtutrf+977wFJTsvNGmQ==}
-    peerDependencies:
-      '@types/markdown-it': '*'
-      markdown-it: '*'
+  unist-util-visit@5.0.0:
+    resolution: {integrity: sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==}
 
-  markdown-it-container@4.0.0:
-    resolution: {integrity: sha512-HaNccxUH0l7BNGYbFbjmGpf5aLHAMTinqRZQAEQbMr2cdD3z91Q6kIo1oUn1CQndkT03jat6ckrdRYuwwqLlQw==}
+  universalify@2.0.0:
+    resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
+    engines: {node: '>= 10.0.0'}
 
-  markdown-it-emoji@3.0.0:
-    resolution: {integrity: sha512-+rUD93bXHubA4arpEZO3q80so0qgoFJEKRkRbjKX8RTdca89v2kfyF+xR3i2sQTwql9tpPZPOQN5B+PunspXRg==}
+  upath@2.0.1:
+    resolution: {integrity: sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==}
+    engines: {node: '>=4'}
 
-  markdown-it@14.1.0:
-    resolution: {integrity: sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==}
+  update-browserslist-db@1.1.0:
+    resolution: {integrity: sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==}
     hasBin: true
+    peerDependencies:
+      browserslist: '>= 4.21.0'
 
-  mdurl@2.0.0:
-    resolution: {integrity: sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==}
+  uri-js@4.4.1:
+    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
 
-  medium-zoom@1.1.0:
-    resolution: {integrity: sha512-ewyDsp7k4InCUp3jRmwHBRFGyjBimKps/AJLjRSox+2q/2H4p/PNpQf+pwONWlJiOudkBXtbdmVbFjqyybfTmQ==}
+  util-deprecate@1.0.2:
+    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
 
-  merge2@1.4.1:
-    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
-    engines: {node: '>= 8'}
+  uuid@9.0.1:
+    resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
+    hasBin: true
 
-  micromatch@4.0.4:
-    resolution: {integrity: sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==}
-    engines: {node: '>=8.6'}
+  vfile-message@4.0.2:
+    resolution: {integrity: sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==}
 
-  mimic-fn@2.1.0:
-    resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
-    engines: {node: '>=6'}
+  vfile@6.0.3:
+    resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==}
 
-  minimatch@3.1.2:
-    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
+  vite-hot-client@0.2.3:
+    resolution: {integrity: sha512-rOGAV7rUlUHX89fP2p2v0A2WWvV3QMX2UYq0fRqsWSvFvev4atHWqjwGoKaZT1VTKyLGk533ecu3eyd0o59CAg==}
+    peerDependencies:
+      vite: ^2.6.0 || ^3.0.0 || ^4.0.0 || ^5.0.0-0
 
-  minimatch@9.0.5:
-    resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==}
-    engines: {node: '>=16 || 14 >=14.17'}
+  vite-plugin-inspect@0.8.5:
+    resolution: {integrity: sha512-JvTUqsP1JNDw0lMZ5Z/r5cSj81VK2B7884LO1DC3GMBhdcjcsAnJjdWq7bzQL01Xbh+v60d3lju3g+z7eAtNew==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@nuxt/kit': '*'
+      vite: ^3.1.0 || ^4.0.0 || ^5.0.0-0
+    peerDependenciesMeta:
+      '@nuxt/kit':
+        optional: true
 
-  minimist@1.2.8:
-    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
+  vite-plugin-vue-devtools@7.3.8:
+    resolution: {integrity: sha512-b5t4wxCb5g5cjh+odNpgnB7iX7gA6FJnKugFqX2/YZX9I4fvMjlj1bUnCKnvPlmwnFxClYgdmgZcCh2RyhZgvw==}
+    engines: {node: '>=v14.21.3'}
+    peerDependencies:
+      vite: ^3.1.0 || ^4.0.0-0 || ^5.0.0-0
 
-  ms@2.1.2:
-    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
+  vite-plugin-vue-inspector@5.1.3:
+    resolution: {integrity: sha512-pMrseXIDP1Gb38mOevY+BvtNGNqiqmqa2pKB99lnLsADQww9w9xMbAfT4GB6RUoaOkSPrtlXqpq2Fq+Dj2AgFg==}
+    peerDependencies:
+      vite: ^3.0.0-0 || ^4.0.0-0 || ^5.0.0-0
 
-  nanoid@3.3.7:
-    resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
-    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+  vite@6.0.11:
+    resolution: {integrity: sha512-4VL9mQPKoHy4+FE0NnRE/kbY51TOfaknxAjt3fJbGJxhIpBZiqVzlZDEesWWsuREXHwNdAoOFZ9MkPEVXczHwg==}
+    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
     hasBin: true
+    peerDependencies:
+      '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0
+      jiti: '>=1.21.0'
+      less: '*'
+      lightningcss: ^1.21.0
+      sass: '*'
+      sass-embedded: '*'
+      stylus: '*'
+      sugarss: '*'
+      terser: ^5.16.0
+      tsx: ^4.8.1
+      yaml: ^2.4.2
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      jiti:
+        optional: true
+      less:
+        optional: true
+      lightningcss:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      terser:
+        optional: true
+      tsx:
+        optional: true
+      yaml:
+        optional: true
 
-  natural-compare@1.4.0:
-    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
+  vscode-jsonrpc@8.2.0:
+    resolution: {integrity: sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==}
+    engines: {node: '>=14.0.0'}
 
-  neo-async@2.6.2:
-    resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
+  vscode-languageserver-protocol@3.17.5:
+    resolution: {integrity: sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==}
 
-  node-releases@2.0.14:
-    resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==}
+  vscode-languageserver-textdocument@1.0.12:
+    resolution: {integrity: sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==}
 
-  normalize-path@3.0.0:
-    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
-    engines: {node: '>=0.10.0'}
+  vscode-languageserver-types@3.17.5:
+    resolution: {integrity: sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==}
 
-  normalize-range@0.1.2:
-    resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==}
-    engines: {node: '>=0.10.0'}
+  vscode-languageserver@9.0.1:
+    resolution: {integrity: sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==}
+    hasBin: true
 
-  npm-run-path@5.3.0:
-    resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  vscode-uri@3.0.8:
+    resolution: {integrity: sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==}
 
-  nth-check@2.1.1:
-    resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
+  vue-demi@0.13.11:
+    resolution: {integrity: sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==}
+    engines: {node: '>=12'}
+    hasBin: true
+    peerDependencies:
+      '@vue/composition-api': ^1.0.0-rc.1
+      vue: ^3.0.0-0 || ^2.6.0
+    peerDependenciesMeta:
+      '@vue/composition-api':
+        optional: true
 
-  object-inspect@1.13.2:
-    resolution: {integrity: sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==}
-    engines: {node: '>= 0.4'}
+  vue-eslint-parser@9.4.3:
+    resolution: {integrity: sha512-2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg==}
+    engines: {node: ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '>=6.0.0'
 
-  object-keys@1.1.1:
-    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
-    engines: {node: '>= 0.4'}
+  vue-router@4.4.0:
+    resolution: {integrity: sha512-HB+t2p611aIZraV2aPSRNXf0Z/oLZFrlygJm+sZbdJaW6lcFqEDQwnzUBXn+DApw+/QzDU/I9TeWx9izEjTmsA==}
+    peerDependencies:
+      vue: ^3.2.0
 
-  object.assign@4.1.5:
-    resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==}
-    engines: {node: '>= 0.4'}
+  vue-router@4.5.0:
+    resolution: {integrity: sha512-HDuk+PuH5monfNuY+ct49mNmkCRK4xJAV9Ts4z9UFc4rzdDnxQLyCMGGc8pKhZhHTVzfanpNwB/lwqevcBwI4w==}
+    peerDependencies:
+      vue: ^3.2.0
 
-  object.fromentries@2.0.8:
-    resolution: {integrity: sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==}
-    engines: {node: '>= 0.4'}
+  vue@3.4.31:
+    resolution: {integrity: sha512-njqRrOy7W3YLAlVqSKpBebtZpDVg21FPoaq1I7f/+qqBThK9ChAIjkRWgeP6Eat+8C+iia4P3OYqpATP21BCoQ==}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
 
-  object.groupby@1.0.3:
-    resolution: {integrity: sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==}
-    engines: {node: '>= 0.4'}
+  vue@3.5.13:
+    resolution: {integrity: sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
 
-  object.values@1.2.0:
-    resolution: {integrity: sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==}
-    engines: {node: '>= 0.4'}
+  vuepress-plugin-components@2.0.0-rc.71:
+    resolution: {integrity: sha512-0EN/RgVUpinQaoLwqozYEzxhI8xHT+oDv0B6bw4DI6pFSlUzDP2adE1rw9UYeZDbVMZ9CD1SxuCLvc0dGEIGbw==}
+    engines: {node: '>=18.19.0', npm: '>=8', pnpm: '>=7', yarn: '>=2'}
+    peerDependencies:
+      artplayer: ^5.0.0
+      dashjs: 4.7.4
+      hls.js: ^1.4.12
+      mpegts.js: ^1.7.3
+      sass: ^1.81.0
+      sass-embedded: ^1.81.0
+      sass-loader: ^16.0.2
+      vidstack: ^1.12.9
+      vuepress: 2.0.0-rc.19
+    peerDependenciesMeta:
+      artplayer:
+        optional: true
+      dashjs:
+        optional: true
+      hls.js:
+        optional: true
+      mpegts.js:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+      sass-loader:
+        optional: true
+      vidstack:
+        optional: true
+
+  vuepress-plugin-md-enhance@2.0.0-rc.71:
+    resolution: {integrity: sha512-0w5PAXUE4z9hFcM7ig/BlBn874JzX+7B59TPUWrehyeVfdldPPGA5m1v0+30+9jGotANk5cwfhqtI0KT7Lrn3Q==}
+    engines: {node: '>=18.19.0', npm: '>=8', pnpm: '>=7', yarn: '>=2'}
+    peerDependencies:
+      '@vue/repl': ^4.1.1
+      chart.js: ^4.0.0
+      echarts: ^5.0.0
+      flowchart.ts: ^3.0.0
+      kotlin-playground: ^1.23.0
+      markmap-lib: ^0.18.5
+      markmap-toolbar: ^0.18.5
+      markmap-view: ^0.18.5
+      mermaid: ^11.2.0
+      sandpack-vue3: ^3.0.0
+      sass: ^1.81.0
+      sass-embedded: ^1.81.0
+      sass-loader: ^16.0.2
+      vuepress: 2.0.0-rc.19
+    peerDependenciesMeta:
+      '@vue/repl':
+        optional: true
+      chart.js:
+        optional: true
+      echarts:
+        optional: true
+      flowchart.ts:
+        optional: true
+      kotlin-playground:
+        optional: true
+      markmap-lib:
+        optional: true
+      markmap-toolbar:
+        optional: true
+      markmap-view:
+        optional: true
+      mermaid:
+        optional: true
+      sandpack-vue3:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+      sass-loader:
+        optional: true
 
-  once@1.4.0:
-    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
+  vuepress-shared@2.0.0-rc.71:
+    resolution: {integrity: sha512-hdRZx4Qtr5uSVs8Tx61il8pXgeBpa5BnruEIFvcy/kjOUblqPjX/NwxThWPSHO4AjRAz4zQ8Gq9JcXh2c/m7Ow==}
+    engines: {node: '>=18.19.0', npm: '>=8', pnpm: '>=7', yarn: '>=2'}
+    peerDependencies:
+      vuepress: 2.0.0-rc.19
 
-  onetime@5.1.2:
-    resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
-    engines: {node: '>=6'}
+  vuepress-theme-hope@2.0.0-rc.71:
+    resolution: {integrity: sha512-tZbdXIYiYZHYLIhNdxWTHnbjCKhJWTFFkCqC73jBqBr9gqYyuzfQ/fSPWh/xaqwe/v33AUzJ2QHKao86m78mjg==}
+    engines: {node: '>=18.19.0', npm: '>=8', pnpm: '>=7', yarn: '>=2'}
+    peerDependencies:
+      '@vuepress/plugin-docsearch': 2.0.0-rc.74
+      '@vuepress/plugin-feed': 2.0.0-rc.74
+      '@vuepress/plugin-prismjs': 2.0.0-rc.74
+      '@vuepress/plugin-pwa': 2.0.0-rc.74
+      '@vuepress/plugin-revealjs': 2.0.0-rc.74
+      '@vuepress/plugin-search': 2.0.0-rc.74
+      '@vuepress/plugin-slimsearch': 2.0.0-rc.74
+      '@vuepress/plugin-watermark': 2.0.0-rc.74
+      nodejs-jieba: ^0.2.1
+      sass: ^1.81.0
+      sass-embedded: ^1.81.0
+      sass-loader: ^16.0.2
+      vuepress: 2.0.0-rc.19
+    peerDependenciesMeta:
+      '@vuepress/plugin-docsearch':
+        optional: true
+      '@vuepress/plugin-feed':
+        optional: true
+      '@vuepress/plugin-prismjs':
+        optional: true
+      '@vuepress/plugin-pwa':
+        optional: true
+      '@vuepress/plugin-revealjs':
+        optional: true
+      '@vuepress/plugin-search':
+        optional: true
+      '@vuepress/plugin-slimsearch':
+        optional: true
+      '@vuepress/plugin-watermark':
+        optional: true
+      nodejs-jieba:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+      sass-loader:
+        optional: true
 
-  optionator@0.9.4:
-    resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
-    engines: {node: '>= 0.8.0'}
+  vuepress@2.0.0-rc.19:
+    resolution: {integrity: sha512-JDeuPTu14Kprdqx2geAryjFJvUzVaMnOLewlAgwVuZTygDWb8cgXhu9/p6rqzzdHETtIrvjbASBhH7JPyqmxmA==}
+    engines: {node: ^18.19.0 || >=20.4.0}
+    hasBin: true
+    peerDependencies:
+      '@vuepress/bundler-vite': 2.0.0-rc.19
+      '@vuepress/bundler-webpack': 2.0.0-rc.19
+      vue: ^3.5.0
+    peerDependenciesMeta:
+      '@vuepress/bundler-vite':
+        optional: true
+      '@vuepress/bundler-webpack':
+        optional: true
 
-  ora@8.0.1:
-    resolution: {integrity: sha512-ANIvzobt1rls2BDny5fWZ3ZVKyD6nscLvfFRpQgfWsythlcsVUC9kL0zq6j2Z5z9wwp1kd7wpsD/T9qNPVLCaQ==}
+  whatwg-encoding@3.1.1:
+    resolution: {integrity: sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==}
     engines: {node: '>=18'}
 
-  p-limit@3.1.0:
-    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
-    engines: {node: '>=10'}
-
-  p-locate@5.0.0:
-    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
-    engines: {node: '>=10'}
-
-  parent-module@1.0.1:
-    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
-    engines: {node: '>=6'}
-
-  parse-ms@4.0.0:
-    resolution: {integrity: sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==}
+  whatwg-mimetype@4.0.0:
+    resolution: {integrity: sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==}
     engines: {node: '>=18'}
 
-  parse5-htmlparser2-tree-adapter@7.0.0:
-    resolution: {integrity: sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==}
+  which-boxed-primitive@1.0.2:
+    resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
 
-  parse5@7.1.2:
-    resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==}
+  which-module@2.0.1:
+    resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==}
 
-  path-exists@4.0.0:
-    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
-    engines: {node: '>=8'}
+  which-typed-array@1.1.15:
+    resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==}
+    engines: {node: '>= 0.4'}
 
-  path-is-absolute@1.0.1:
-    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
+  which@2.0.2:
+    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
+    engines: {node: '>= 8'}
+    hasBin: true
+
+  word-wrap@1.2.5:
+    resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
     engines: {node: '>=0.10.0'}
 
-  path-key@3.1.1:
-    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
+  wrap-ansi@6.2.0:
+    resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
     engines: {node: '>=8'}
 
-  path-key@4.0.0:
-    resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
-    engines: {node: '>=12'}
-
-  path-parse@1.0.7:
-    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
-
-  path-type@4.0.0:
-    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
-    engines: {node: '>=8'}
+  wrappy@1.0.2:
+    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
-  path-type@5.0.0:
-    resolution: {integrity: sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==}
+  xml-name-validator@4.0.0:
+    resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
     engines: {node: '>=12'}
 
-  picocolors@1.0.1:
-    resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==}
-
-  picomatch@2.3.0:
-    resolution: {integrity: sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==}
-    engines: {node: '>=8.6'}
-
-  possible-typed-array-names@1.0.0:
-    resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==}
-    engines: {node: '>= 0.4'}
-
-  postcss-load-config@6.0.1:
-    resolution: {integrity: sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==}
-    engines: {node: '>= 18'}
-    peerDependencies:
-      jiti: '>=1.21.0'
-      postcss: '>=8.0.9'
-      tsx: ^4.8.1
-      yaml: ^2.4.2
-    peerDependenciesMeta:
-      jiti:
-        optional: true
-      postcss:
-        optional: true
-      tsx:
-        optional: true
-      yaml:
-        optional: true
-
-  postcss-selector-parser@6.1.1:
-    resolution: {integrity: sha512-b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg==}
-    engines: {node: '>=4'}
+  y18n@4.0.3:
+    resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==}
 
-  postcss-value-parser@4.2.0:
-    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
+  yallist@3.1.1:
+    resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
 
-  postcss@8.4.39:
-    resolution: {integrity: sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==}
-    engines: {node: ^10 || ^12 || >=14}
+  yargs-parser@18.1.3:
+    resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
+    engines: {node: '>=6'}
 
-  preact@10.22.1:
-    resolution: {integrity: sha512-jRYbDDgMpIb5LHq3hkI0bbl+l/TQ9UnkdQ0ww+lp+4MMOdqaUYdFc5qeyP+IV8FAd/2Em7drVPeKdQxsiWCf/A==}
+  yargs@15.4.1:
+    resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
+    engines: {node: '>=8'}
 
-  prelude-ls@1.2.1:
-    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
-    engines: {node: '>= 0.8.0'}
+  yocto-queue@0.1.0:
+    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
+    engines: {node: '>=10'}
 
-  pretty-ms@9.0.0:
-    resolution: {integrity: sha512-E9e9HJ9R9NasGOgPaPE8VMeiPKAyWR5jcFpNnwIejslIhWqdqOrb2wShBsncMPUb+BcCd2OPYfh7p2W6oemTng==}
+  yoctocolors@2.1.1:
+    resolution: {integrity: sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==}
     engines: {node: '>=18'}
 
-  prismjs@1.29.0:
-    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
-    engines: {node: '>=6'}
-
-  punycode.js@2.3.1:
-    resolution: {integrity: sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==}
-    engines: {node: '>=6'}
-
-  punycode@2.3.1:
-    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
-    engines: {node: '>=6'}
+  zwitch@2.0.4:
+    resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
 
-  queue-microtask@1.2.3:
-    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
+snapshots:
 
-  readdirp@3.6.0:
-    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
-    engines: {node: '>=8.10.0'}
+  '@ampproject/remapping@2.3.0':
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.5
+      '@jridgewell/trace-mapping': 0.3.25
 
-  regexp.prototype.flags@1.5.2:
-    resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==}
-    engines: {node: '>= 0.4'}
+  '@antfu/install-pkg@0.4.1':
+    dependencies:
+      package-manager-detector: 0.2.2
+      tinyexec: 0.3.1
 
-  resolve-from@4.0.0:
-    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
-    engines: {node: '>=4'}
+  '@antfu/utils@0.7.10': {}
 
-  resolve-pkg-maps@1.0.0:
-    resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
+  '@babel/cli@7.24.8(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@jridgewell/trace-mapping': 0.3.25
+      commander: 6.2.1
+      convert-source-map: 2.0.0
+      fs-readdir-recursive: 1.1.0
+      glob: 7.2.3
+      make-dir: 2.1.0
+      slash: 2.0.0
+    optionalDependencies:
+      '@nicolo-ribaudo/chokidar-2': 2.1.8-no-fsevents.3
+      chokidar: 3.6.0
 
-  resolve@1.22.8:
-    resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==}
-    hasBin: true
+  '@babel/code-frame@7.24.7':
+    dependencies:
+      '@babel/highlight': 7.24.7
+      picocolors: 1.0.1
 
-  restore-cursor@4.0.0:
-    resolution: {integrity: sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  '@babel/compat-data@7.25.2': {}
+
+  '@babel/core@7.25.2':
+    dependencies:
+      '@ampproject/remapping': 2.3.0
+      '@babel/code-frame': 7.24.7
+      '@babel/generator': 7.25.0
+      '@babel/helper-compilation-targets': 7.25.2
+      '@babel/helper-module-transforms': 7.25.2(@babel/core@7.25.2)
+      '@babel/helpers': 7.25.0
+      '@babel/parser': 7.25.3
+      '@babel/template': 7.25.0
+      '@babel/traverse': 7.25.3
+      '@babel/types': 7.25.2
+      convert-source-map: 2.0.0
+      debug: 4.3.5
+      gensync: 1.0.0-beta.2
+      json5: 2.2.3
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
 
-  reusify@1.0.4:
-    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
-    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
+  '@babel/generator@7.25.0':
+    dependencies:
+      '@babel/types': 7.25.2
+      '@jridgewell/gen-mapping': 0.3.5
+      '@jridgewell/trace-mapping': 0.3.25
+      jsesc: 2.5.2
 
-  rimraf@3.0.2:
-    resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
-    deprecated: Rimraf versions prior to v4 are no longer supported
-    hasBin: true
+  '@babel/helper-annotate-as-pure@7.24.7':
+    dependencies:
+      '@babel/types': 7.24.8
 
-  rollup@4.18.1:
-    resolution: {integrity: sha512-Elx2UT8lzxxOXMpy5HWQGZqkrQOtrVDDa/bm9l10+U4rQnVzbL/LgZ4NOM1MPIDyHk69W4InuYDF5dzRh4Kw1A==}
-    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
-    hasBin: true
+  '@babel/helper-builder-binary-assignment-operator-visitor@7.24.7':
+    dependencies:
+      '@babel/traverse': 7.25.3
+      '@babel/types': 7.24.8
+    transitivePeerDependencies:
+      - supports-color
 
-  run-parallel@1.2.0:
-    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
+  '@babel/helper-compilation-targets@7.25.2':
+    dependencies:
+      '@babel/compat-data': 7.25.2
+      '@babel/helper-validator-option': 7.24.8
+      browserslist: 4.23.2
+      lru-cache: 5.1.1
+      semver: 6.3.1
 
-  safe-array-concat@1.1.2:
-    resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==}
-    engines: {node: '>=0.4'}
+  '@babel/helper-create-class-features-plugin@7.25.0(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-annotate-as-pure': 7.24.7
+      '@babel/helper-member-expression-to-functions': 7.24.8
+      '@babel/helper-optimise-call-expression': 7.24.7
+      '@babel/helper-replace-supers': 7.25.0(@babel/core@7.25.2)
+      '@babel/helper-skip-transparent-expression-wrappers': 7.24.7
+      '@babel/traverse': 7.25.3
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
 
-  safe-regex-test@1.0.3:
-    resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==}
-    engines: {node: '>= 0.4'}
+  '@babel/helper-create-regexp-features-plugin@7.25.2(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-annotate-as-pure': 7.24.7
+      regexpu-core: 5.3.2
+      semver: 6.3.1
 
-  sass-loader@14.2.1:
-    resolution: {integrity: sha512-G0VcnMYU18a4N7VoNDegg2OuMjYtxnqzQWARVWCIVSZwJeiL9kg8QMsuIZOplsJgTzZLF6jGxI3AClj8I9nRdQ==}
-    engines: {node: '>= 18.12.0'}
-    peerDependencies:
-      '@rspack/core': 0.x || 1.x
-      node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
-      sass: ^1.3.0
-      sass-embedded: '*'
-      webpack: ^5.0.0
-    peerDependenciesMeta:
-      '@rspack/core':
-        optional: true
-      node-sass:
-        optional: true
-      sass:
-        optional: true
-      sass-embedded:
-        optional: true
-      webpack:
-        optional: true
+  '@babel/helper-define-polyfill-provider@0.6.2(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-compilation-targets': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      debug: 4.3.5
+      lodash.debounce: 4.0.8
+      resolve: 1.22.8
+    transitivePeerDependencies:
+      - supports-color
 
-  sass@1.77.8:
-    resolution: {integrity: sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==}
-    engines: {node: '>=14.0.0'}
-    hasBin: true
+  '@babel/helper-member-expression-to-functions@7.24.8':
+    dependencies:
+      '@babel/traverse': 7.25.3
+      '@babel/types': 7.24.8
+    transitivePeerDependencies:
+      - supports-color
 
-  sax@1.4.1:
-    resolution: {integrity: sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==}
+  '@babel/helper-module-imports@7.22.15':
+    dependencies:
+      '@babel/types': 7.24.8
 
-  search-insights@2.15.0:
-    resolution: {integrity: sha512-ch2sPCUDD4sbPQdknVl9ALSi9H7VyoeVbsxznYz6QV55jJ8CI3EtwpO1i84keN4+hF5IeHWIeGvc08530JkVXQ==}
+  '@babel/helper-module-imports@7.24.7':
+    dependencies:
+      '@babel/traverse': 7.25.3
+      '@babel/types': 7.25.2
+    transitivePeerDependencies:
+      - supports-color
 
-  section-matter@1.0.0:
-    resolution: {integrity: sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==}
-    engines: {node: '>=4'}
+  '@babel/helper-module-transforms@7.25.2(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-module-imports': 7.24.7
+      '@babel/helper-simple-access': 7.24.7
+      '@babel/helper-validator-identifier': 7.24.7
+      '@babel/traverse': 7.25.3
+    transitivePeerDependencies:
+      - supports-color
 
-  semver@6.3.1:
-    resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
-    hasBin: true
+  '@babel/helper-optimise-call-expression@7.24.7':
+    dependencies:
+      '@babel/types': 7.24.8
 
-  semver@7.6.2:
-    resolution: {integrity: sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==}
-    engines: {node: '>=10'}
-    hasBin: true
+  '@babel/helper-plugin-utils@7.24.8': {}
 
-  set-function-length@1.2.2:
-    resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
-    engines: {node: '>= 0.4'}
+  '@babel/helper-remap-async-to-generator@7.25.0(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-annotate-as-pure': 7.24.7
+      '@babel/helper-wrap-function': 7.25.0
+      '@babel/traverse': 7.25.3
+    transitivePeerDependencies:
+      - supports-color
 
-  set-function-name@2.0.2:
-    resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==}
-    engines: {node: '>= 0.4'}
+  '@babel/helper-replace-supers@7.25.0(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-member-expression-to-functions': 7.24.8
+      '@babel/helper-optimise-call-expression': 7.24.7
+      '@babel/traverse': 7.25.3
+    transitivePeerDependencies:
+      - supports-color
 
-  shebang-command@2.0.0:
-    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
-    engines: {node: '>=8'}
+  '@babel/helper-simple-access@7.24.7':
+    dependencies:
+      '@babel/traverse': 7.25.3
+      '@babel/types': 7.25.2
+    transitivePeerDependencies:
+      - supports-color
 
-  shebang-regex@3.0.0:
-    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
-    engines: {node: '>=8'}
+  '@babel/helper-skip-transparent-expression-wrappers@7.24.7':
+    dependencies:
+      '@babel/traverse': 7.25.3
+      '@babel/types': 7.24.8
+    transitivePeerDependencies:
+      - supports-color
 
-  side-channel@1.0.6:
-    resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==}
-    engines: {node: '>= 0.4'}
+  '@babel/helper-string-parser@7.24.8': {}
 
-  signal-exit@3.0.6:
-    resolution: {integrity: sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==}
+  '@babel/helper-validator-identifier@7.24.7': {}
 
-  signal-exit@4.1.0:
-    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
-    engines: {node: '>=14'}
+  '@babel/helper-validator-option@7.24.8': {}
 
-  sitemap@8.0.0:
-    resolution: {integrity: sha512-+AbdxhM9kJsHtruUF39bwS/B0Fytw6Fr1o4ZAIAEqA6cke2xcoO2GleBw9Zw7nRzILVEgz7zBM5GiTJjie1G9A==}
-    engines: {node: '>=14.0.0', npm: '>=6.0.0'}
-    hasBin: true
+  '@babel/helper-wrap-function@7.25.0':
+    dependencies:
+      '@babel/template': 7.25.0
+      '@babel/traverse': 7.25.3
+      '@babel/types': 7.25.2
+    transitivePeerDependencies:
+      - supports-color
 
-  slash@3.0.0:
-    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
-    engines: {node: '>=8'}
+  '@babel/helpers@7.25.0':
+    dependencies:
+      '@babel/template': 7.25.0
+      '@babel/types': 7.25.2
 
-  slash@5.1.0:
-    resolution: {integrity: sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==}
-    engines: {node: '>=14.16'}
+  '@babel/highlight@7.24.7':
+    dependencies:
+      '@babel/helper-validator-identifier': 7.24.7
+      chalk: 2.4.2
+      js-tokens: 4.0.0
+      picocolors: 1.0.1
 
-  source-map-js@1.2.0:
-    resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
-    engines: {node: '>=0.10.0'}
+  '@babel/parser@7.24.7':
+    dependencies:
+      '@babel/types': 7.24.8
 
-  sprintf-js@1.0.3:
-    resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
+  '@babel/parser@7.25.3':
+    dependencies:
+      '@babel/types': 7.25.2
 
-  stdin-discarder@0.2.2:
-    resolution: {integrity: sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ==}
-    engines: {node: '>=18'}
+  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.3(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/traverse': 7.25.3
+    transitivePeerDependencies:
+      - supports-color
 
-  string-width@7.2.0:
-    resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==}
-    engines: {node: '>=18'}
+  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.0(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  string.prototype.trim@1.2.9:
-    resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==}
-    engines: {node: '>= 0.4'}
+  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.0(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  string.prototype.trimend@1.0.8:
-    resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==}
+  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/helper-skip-transparent-expression-wrappers': 7.24.7
+      '@babel/plugin-transform-optional-chaining': 7.24.8(@babel/core@7.25.2)
+    transitivePeerDependencies:
+      - supports-color
 
-  string.prototype.trimstart@1.0.8:
-    resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}
-    engines: {node: '>= 0.4'}
+  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.0(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/traverse': 7.25.3
+    transitivePeerDependencies:
+      - supports-color
 
-  strip-ansi@6.0.1:
-    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
-    engines: {node: '>=8'}
+  '@babel/plugin-proposal-decorators@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-create-class-features-plugin': 7.25.0(@babel/core@7.25.2)
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/plugin-syntax-decorators': 7.24.7(@babel/core@7.25.2)
+    transitivePeerDependencies:
+      - supports-color
 
-  strip-ansi@7.1.0:
-    resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}
-    engines: {node: '>=12'}
+  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
 
-  strip-bom-string@1.0.0:
-    resolution: {integrity: sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==}
-    engines: {node: '>=0.10.0'}
+  '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  strip-bom@3.0.0:
-    resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
-    engines: {node: '>=4'}
+  '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  strip-final-newline@4.0.0:
-    resolution: {integrity: sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==}
-    engines: {node: '>=18'}
+  '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  strip-json-comments@3.1.1:
-    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
-    engines: {node: '>=8'}
+  '@babel/plugin-syntax-decorators@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  supports-color@7.2.0:
-    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
-    engines: {node: '>=8'}
+  '@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  supports-preserve-symlinks-flag@1.0.0:
-    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
-    engines: {node: '>= 0.4'}
+  '@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  text-table@0.2.0:
-    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
+  '@babel/plugin-syntax-import-assertions@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  to-fast-properties@2.0.0:
-    resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
-    engines: {node: '>=4'}
+  '@babel/plugin-syntax-import-attributes@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  to-regex-range@5.0.1:
-    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
-    engines: {node: '>=8.0'}
+  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  ts-api-utils@1.3.0:
-    resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==}
-    engines: {node: '>=16'}
-    peerDependencies:
-      typescript: '>=4.2.0'
+  '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  ts-debounce@4.0.0:
-    resolution: {integrity: sha512-+1iDGY6NmOGidq7i7xZGA4cm8DAa6fqdYcvO5Z6yBevH++Bdo9Qt/mN0TzHUgcCcKv1gmh9+W5dHqz8pMWbCbg==}
+  '@babel/plugin-syntax-jsx@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  tsconfig-paths@3.15.0:
-    resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==}
+  '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  tsconfig-vuepress@4.5.0:
-    resolution: {integrity: sha512-edJbEJwTQayS4+q5mIPsVY9UaZfgzJezNX/eO86rRgIIDsJyVdcUahr7WgqQWdYI7MIcdDvMRlSn0+Veznmq5g==}
+  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  type-check@0.4.0:
-    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
-    engines: {node: '>= 0.8.0'}
+  '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  type-fest@0.20.2:
-    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
-    engines: {node: '>=10'}
+  '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  typed-array-buffer@1.0.2:
-    resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==}
-    engines: {node: '>= 0.4'}
+  '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  typed-array-byte-length@1.0.1:
-    resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==}
-    engines: {node: '>= 0.4'}
+  '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  typed-array-byte-offset@1.0.2:
-    resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==}
-    engines: {node: '>= 0.4'}
+  '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  typed-array-length@1.0.6:
-    resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==}
-    engines: {node: '>= 0.4'}
+  '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  typescript@5.5.3:
-    resolution: {integrity: sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==}
-    engines: {node: '>=14.17'}
-    hasBin: true
+  '@babel/plugin-syntax-typescript@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  uc.micro@2.1.0:
-    resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==}
+  '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2)
+      '@babel/helper-plugin-utils': 7.24.8
 
-  unbox-primitive@1.0.2:
-    resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
+  '@babel/plugin-transform-arrow-functions@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  unicorn-magic@0.1.0:
-    resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==}
-    engines: {node: '>=18'}
+  '@babel/plugin-transform-async-generator-functions@7.25.0(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/helper-remap-async-to-generator': 7.25.0(@babel/core@7.25.2)
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.25.2)
+      '@babel/traverse': 7.25.3
+    transitivePeerDependencies:
+      - supports-color
 
-  universalify@2.0.0:
-    resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
-    engines: {node: '>= 10.0.0'}
+  '@babel/plugin-transform-async-to-generator@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-module-imports': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/helper-remap-async-to-generator': 7.25.0(@babel/core@7.25.2)
+    transitivePeerDependencies:
+      - supports-color
 
-  upath@2.0.1:
-    resolution: {integrity: sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==}
-    engines: {node: '>=4'}
+  '@babel/plugin-transform-block-scoped-functions@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  update-browserslist-db@1.1.0:
-    resolution: {integrity: sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==}
-    hasBin: true
-    peerDependencies:
-      browserslist: '>= 4.21.0'
+  '@babel/plugin-transform-block-scoping@7.25.0(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  uri-js@4.4.1:
-    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
+  '@babel/plugin-transform-class-properties@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-create-class-features-plugin': 7.25.0(@babel/core@7.25.2)
+      '@babel/helper-plugin-utils': 7.24.8
+    transitivePeerDependencies:
+      - supports-color
 
-  util-deprecate@1.0.2:
-    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
+  '@babel/plugin-transform-class-static-block@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-create-class-features-plugin': 7.25.0(@babel/core@7.25.2)
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.25.2)
+    transitivePeerDependencies:
+      - supports-color
 
-  vite@5.3.3:
-    resolution: {integrity: sha512-NPQdeCU0Dv2z5fu+ULotpuq5yfCS1BzKUIPhNbP3YBfAMGJXbt2nS+sbTFu+qchaqWTD+H3JK++nRwr6XIcp6A==}
-    engines: {node: ^18.0.0 || >=20.0.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': ^18.0.0 || >=20.0.0
-      less: '*'
-      lightningcss: ^1.21.0
-      sass: '*'
-      stylus: '*'
-      sugarss: '*'
-      terser: ^5.4.0
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      less:
-        optional: true
-      lightningcss:
-        optional: true
-      sass:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
+  '@babel/plugin-transform-classes@7.25.0(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-annotate-as-pure': 7.24.7
+      '@babel/helper-compilation-targets': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/helper-replace-supers': 7.25.0(@babel/core@7.25.2)
+      '@babel/traverse': 7.25.3
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
 
-  vue-demi@0.14.8:
-    resolution: {integrity: sha512-Uuqnk9YE9SsWeReYqK2alDI5YzciATE0r2SkA6iMAtuXvNTMNACJLJEXNXaEy94ECuBe4Sk6RzRU80kjdbIo1Q==}
-    engines: {node: '>=12'}
-    hasBin: true
-    peerDependencies:
-      '@vue/composition-api': ^1.0.0-rc.1
-      vue: ^3.0.0-0 || ^2.6.0
-    peerDependenciesMeta:
-      '@vue/composition-api':
-        optional: true
+  '@babel/plugin-transform-computed-properties@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/template': 7.25.0
 
-  vue-eslint-parser@9.4.3:
-    resolution: {integrity: sha512-2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg==}
-    engines: {node: ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: '>=6.0.0'
+  '@babel/plugin-transform-destructuring@7.24.8(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  vue-router@4.4.0:
-    resolution: {integrity: sha512-HB+t2p611aIZraV2aPSRNXf0Z/oLZFrlygJm+sZbdJaW6lcFqEDQwnzUBXn+DApw+/QzDU/I9TeWx9izEjTmsA==}
-    peerDependencies:
-      vue: ^3.2.0
+  '@babel/plugin-transform-dotall-regex@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2)
+      '@babel/helper-plugin-utils': 7.24.8
 
-  vue@3.4.31:
-    resolution: {integrity: sha512-njqRrOy7W3YLAlVqSKpBebtZpDVg21FPoaq1I7f/+qqBThK9ChAIjkRWgeP6Eat+8C+iia4P3OYqpATP21BCoQ==}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  '@babel/plugin-transform-duplicate-keys@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  vuepress-plugin-md-enhance@2.0.0-rc.50:
-    resolution: {integrity: sha512-1t570DCGDDWvc5+aPf1ERK6ZIvwY1hGKN4KOdFz7zgGzP2EFZXwwW8wioyVgKVfbjTgT2dvkyNbxykRQV6eKEA==}
-    engines: {node: '>=18.19.0', npm: '>=8', pnpm: '>=7', yarn: '>=2'}
-    peerDependencies:
-      '@types/reveal.js': ^5.0.0
-      '@vue/repl': ^4.1.1
-      chart.js: ^4.0.0
-      echarts: ^5.0.0
-      flowchart.ts: ^2.0.0 || ^3.0.0
-      katex: ^0.16.0
-      kotlin-playground: ^1.23.0
-      markmap-lib: ^0.17.0
-      markmap-toolbar: ^0.17.0
-      markmap-view: ^0.17.0
-      mathjax-full: ^3.2.2
-      mermaid: ^10.8.0
-      reveal.js: ^5.0.0
-      sandpack-vue3: ^3.0.0
-      sass-loader: ^14.0.0
-      vuepress: 2.0.0-rc.14
-    peerDependenciesMeta:
-      '@types/reveal.js':
-        optional: true
-      '@vue/repl':
-        optional: true
-      chart.js:
-        optional: true
-      echarts:
-        optional: true
-      flowchart.ts:
-        optional: true
-      katex:
-        optional: true
-      kotlin-playground:
-        optional: true
-      markmap-lib:
-        optional: true
-      markmap-toolbar:
-        optional: true
-      markmap-view:
-        optional: true
-      mathjax-full:
-        optional: true
-      mermaid:
-        optional: true
-      reveal.js:
-        optional: true
-      sandpack-vue3:
-        optional: true
-      sass-loader:
-        optional: true
+  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.0(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2)
+      '@babel/helper-plugin-utils': 7.24.8
 
-  vuepress-shared@2.0.0-rc.50:
-    resolution: {integrity: sha512-iOf4r4LpdXVvFJb2Zh1rmXJW8lrq3ZyJv0bTKGun4yhBKE9sW5ZAt9rT/eVEFMDPLJLFYBfRmF4MZ9c4x8BL6A==}
-    engines: {node: '>=18.19.0', npm: '>=8', pnpm: '>=7', yarn: '>=2'}
-    peerDependencies:
-      vuepress: 2.0.0-rc.14
+  '@babel/plugin-transform-dynamic-import@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.25.2)
 
-  vuepress@2.0.0-rc.14:
-    resolution: {integrity: sha512-t902FYKFF2MavNQjm/I4gN8etl6iX4PETutu4c1Pt7qQjXF6Hp2eurZaW32O5/TaYWsbVG757FwKodRLj9GDng==}
-    engines: {node: '>=18.16.0'}
-    hasBin: true
-    peerDependencies:
-      '@vuepress/bundler-vite': 2.0.0-rc.14
-      '@vuepress/bundler-webpack': 2.0.0-rc.14
-      vue: ^3.4.0
-    peerDependenciesMeta:
-      '@vuepress/bundler-vite':
-        optional: true
-      '@vuepress/bundler-webpack':
-        optional: true
+  '@babel/plugin-transform-exponentiation-operator@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-builder-binary-assignment-operator-visitor': 7.24.7
+      '@babel/helper-plugin-utils': 7.24.8
+    transitivePeerDependencies:
+      - supports-color
 
-  which-boxed-primitive@1.0.2:
-    resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
+  '@babel/plugin-transform-export-namespace-from@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.25.2)
 
-  which-typed-array@1.1.15:
-    resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==}
-    engines: {node: '>= 0.4'}
+  '@babel/plugin-transform-for-of@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/helper-skip-transparent-expression-wrappers': 7.24.7
+    transitivePeerDependencies:
+      - supports-color
 
-  which@2.0.2:
-    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
-    engines: {node: '>= 8'}
-    hasBin: true
+  '@babel/plugin-transform-function-name@7.25.1(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-compilation-targets': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/traverse': 7.25.3
+    transitivePeerDependencies:
+      - supports-color
 
-  word-wrap@1.2.5:
-    resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
-    engines: {node: '>=0.10.0'}
+  '@babel/plugin-transform-json-strings@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.25.2)
 
-  wrappy@1.0.2:
-    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
+  '@babel/plugin-transform-literals@7.25.2(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  xml-name-validator@4.0.0:
-    resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
-    engines: {node: '>=12'}
+  '@babel/plugin-transform-logical-assignment-operators@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.25.2)
 
-  yocto-queue@0.1.0:
-    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
-    engines: {node: '>=10'}
+  '@babel/plugin-transform-member-expression-literals@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  yoctocolors@2.1.1:
-    resolution: {integrity: sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==}
-    engines: {node: '>=18'}
+  '@babel/plugin-transform-modules-amd@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-module-transforms': 7.25.2(@babel/core@7.25.2)
+      '@babel/helper-plugin-utils': 7.24.8
+    transitivePeerDependencies:
+      - supports-color
 
-snapshots:
+  '@babel/plugin-transform-modules-commonjs@7.24.8(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-module-transforms': 7.25.2(@babel/core@7.25.2)
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/helper-simple-access': 7.24.7
+    transitivePeerDependencies:
+      - supports-color
 
-  '@algolia/autocomplete-core@1.9.3(@algolia/client-search@4.24.0)(algoliasearch@4.24.0)(search-insights@2.15.0)':
+  '@babel/plugin-transform-modules-systemjs@7.25.0(@babel/core@7.25.2)':
     dependencies:
-      '@algolia/autocomplete-plugin-algolia-insights': 1.9.3(@algolia/client-search@4.24.0)(algoliasearch@4.24.0)(search-insights@2.15.0)
-      '@algolia/autocomplete-shared': 1.9.3(@algolia/client-search@4.24.0)(algoliasearch@4.24.0)
+      '@babel/core': 7.25.2
+      '@babel/helper-module-transforms': 7.25.2(@babel/core@7.25.2)
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/helper-validator-identifier': 7.24.7
+      '@babel/traverse': 7.25.3
     transitivePeerDependencies:
-      - '@algolia/client-search'
-      - algoliasearch
-      - search-insights
+      - supports-color
 
-  '@algolia/autocomplete-plugin-algolia-insights@1.9.3(@algolia/client-search@4.24.0)(algoliasearch@4.24.0)(search-insights@2.15.0)':
+  '@babel/plugin-transform-modules-umd@7.24.7(@babel/core@7.25.2)':
     dependencies:
-      '@algolia/autocomplete-shared': 1.9.3(@algolia/client-search@4.24.0)(algoliasearch@4.24.0)
-      search-insights: 2.15.0
+      '@babel/core': 7.25.2
+      '@babel/helper-module-transforms': 7.25.2(@babel/core@7.25.2)
+      '@babel/helper-plugin-utils': 7.24.8
     transitivePeerDependencies:
-      - '@algolia/client-search'
-      - algoliasearch
+      - supports-color
+
+  '@babel/plugin-transform-named-capturing-groups-regex@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2)
+      '@babel/helper-plugin-utils': 7.24.8
+
+  '@babel/plugin-transform-new-target@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  '@algolia/autocomplete-preset-algolia@1.9.3(@algolia/client-search@4.24.0)(algoliasearch@4.24.0)':
+  '@babel/plugin-transform-nullish-coalescing-operator@7.24.7(@babel/core@7.25.2)':
     dependencies:
-      '@algolia/autocomplete-shared': 1.9.3(@algolia/client-search@4.24.0)(algoliasearch@4.24.0)
-      '@algolia/client-search': 4.24.0
-      algoliasearch: 4.24.0
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.25.2)
 
-  '@algolia/autocomplete-shared@1.9.3(@algolia/client-search@4.24.0)(algoliasearch@4.24.0)':
+  '@babel/plugin-transform-numeric-separator@7.24.7(@babel/core@7.25.2)':
     dependencies:
-      '@algolia/client-search': 4.24.0
-      algoliasearch: 4.24.0
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.25.2)
 
-  '@algolia/cache-browser-local-storage@4.24.0':
+  '@babel/plugin-transform-object-rest-spread@7.24.7(@babel/core@7.25.2)':
     dependencies:
-      '@algolia/cache-common': 4.24.0
+      '@babel/core': 7.25.2
+      '@babel/helper-compilation-targets': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.25.2)
+      '@babel/plugin-transform-parameters': 7.24.7(@babel/core@7.25.2)
 
-  '@algolia/cache-common@4.24.0': {}
+  '@babel/plugin-transform-object-super@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/helper-replace-supers': 7.25.0(@babel/core@7.25.2)
+    transitivePeerDependencies:
+      - supports-color
 
-  '@algolia/cache-in-memory@4.24.0':
+  '@babel/plugin-transform-optional-catch-binding@7.24.7(@babel/core@7.25.2)':
     dependencies:
-      '@algolia/cache-common': 4.24.0
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.25.2)
 
-  '@algolia/client-account@4.24.0':
+  '@babel/plugin-transform-optional-chaining@7.24.8(@babel/core@7.25.2)':
     dependencies:
-      '@algolia/client-common': 4.24.0
-      '@algolia/client-search': 4.24.0
-      '@algolia/transporter': 4.24.0
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/helper-skip-transparent-expression-wrappers': 7.24.7
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.25.2)
+    transitivePeerDependencies:
+      - supports-color
 
-  '@algolia/client-analytics@4.24.0':
+  '@babel/plugin-transform-parameters@7.24.7(@babel/core@7.25.2)':
     dependencies:
-      '@algolia/client-common': 4.24.0
-      '@algolia/client-search': 4.24.0
-      '@algolia/requester-common': 4.24.0
-      '@algolia/transporter': 4.24.0
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  '@algolia/client-common@4.24.0':
+  '@babel/plugin-transform-private-methods@7.24.7(@babel/core@7.25.2)':
     dependencies:
-      '@algolia/requester-common': 4.24.0
-      '@algolia/transporter': 4.24.0
+      '@babel/core': 7.25.2
+      '@babel/helper-create-class-features-plugin': 7.25.0(@babel/core@7.25.2)
+      '@babel/helper-plugin-utils': 7.24.8
+    transitivePeerDependencies:
+      - supports-color
 
-  '@algolia/client-personalization@4.24.0':
+  '@babel/plugin-transform-private-property-in-object@7.24.7(@babel/core@7.25.2)':
     dependencies:
-      '@algolia/client-common': 4.24.0
-      '@algolia/requester-common': 4.24.0
-      '@algolia/transporter': 4.24.0
+      '@babel/core': 7.25.2
+      '@babel/helper-annotate-as-pure': 7.24.7
+      '@babel/helper-create-class-features-plugin': 7.25.0(@babel/core@7.25.2)
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.25.2)
+    transitivePeerDependencies:
+      - supports-color
 
-  '@algolia/client-search@4.24.0':
+  '@babel/plugin-transform-property-literals@7.24.7(@babel/core@7.25.2)':
     dependencies:
-      '@algolia/client-common': 4.24.0
-      '@algolia/requester-common': 4.24.0
-      '@algolia/transporter': 4.24.0
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  '@algolia/logger-common@4.24.0': {}
+  '@babel/plugin-transform-regenerator@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      regenerator-transform: 0.15.2
 
-  '@algolia/logger-console@4.24.0':
+  '@babel/plugin-transform-reserved-words@7.24.7(@babel/core@7.25.2)':
     dependencies:
-      '@algolia/logger-common': 4.24.0
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  '@algolia/recommend@4.24.0':
+  '@babel/plugin-transform-shorthand-properties@7.24.7(@babel/core@7.25.2)':
     dependencies:
-      '@algolia/cache-browser-local-storage': 4.24.0
-      '@algolia/cache-common': 4.24.0
-      '@algolia/cache-in-memory': 4.24.0
-      '@algolia/client-common': 4.24.0
-      '@algolia/client-search': 4.24.0
-      '@algolia/logger-common': 4.24.0
-      '@algolia/logger-console': 4.24.0
-      '@algolia/requester-browser-xhr': 4.24.0
-      '@algolia/requester-common': 4.24.0
-      '@algolia/requester-node-http': 4.24.0
-      '@algolia/transporter': 4.24.0
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  '@algolia/requester-browser-xhr@4.24.0':
+  '@babel/plugin-transform-spread@7.24.7(@babel/core@7.25.2)':
     dependencies:
-      '@algolia/requester-common': 4.24.0
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/helper-skip-transparent-expression-wrappers': 7.24.7
+    transitivePeerDependencies:
+      - supports-color
 
-  '@algolia/requester-common@4.24.0': {}
+  '@babel/plugin-transform-sticky-regex@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  '@algolia/requester-node-http@4.24.0':
+  '@babel/plugin-transform-template-literals@7.24.7(@babel/core@7.25.2)':
     dependencies:
-      '@algolia/requester-common': 4.24.0
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  '@algolia/transporter@4.24.0':
+  '@babel/plugin-transform-typeof-symbol@7.24.8(@babel/core@7.25.2)':
     dependencies:
-      '@algolia/cache-common': 4.24.0
-      '@algolia/logger-common': 4.24.0
-      '@algolia/requester-common': 4.24.0
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
 
-  '@babel/helper-string-parser@7.24.8': {}
+  '@babel/plugin-transform-typescript@7.25.2(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-annotate-as-pure': 7.24.7
+      '@babel/helper-create-class-features-plugin': 7.25.0(@babel/core@7.25.2)
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/helper-skip-transparent-expression-wrappers': 7.24.7
+      '@babel/plugin-syntax-typescript': 7.24.7(@babel/core@7.25.2)
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/helper-validator-identifier@7.24.7': {}
+  '@babel/plugin-transform-unicode-escapes@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+
+  '@babel/plugin-transform-unicode-property-regex@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2)
+      '@babel/helper-plugin-utils': 7.24.8
+
+  '@babel/plugin-transform-unicode-regex@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2)
+      '@babel/helper-plugin-utils': 7.24.8
+
+  '@babel/plugin-transform-unicode-sets-regex@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-create-regexp-features-plugin': 7.25.2(@babel/core@7.25.2)
+      '@babel/helper-plugin-utils': 7.24.8
+
+  '@babel/preset-env@7.25.3(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/compat-data': 7.25.2
+      '@babel/core': 7.25.2
+      '@babel/helper-compilation-targets': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/helper-validator-option': 7.24.8
+      '@babel/plugin-bugfix-firefox-class-in-computed-class-key': 7.25.3(@babel/core@7.25.2)
+      '@babel/plugin-bugfix-safari-class-field-initializer-scope': 7.25.0(@babel/core@7.25.2)
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.25.0(@babel/core@7.25.2)
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.25.0(@babel/core@7.25.2)
+      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.25.2)
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.25.2)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.25.2)
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.25.2)
+      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.25.2)
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.25.2)
+      '@babel/plugin-syntax-import-assertions': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-syntax-import-attributes': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.25.2)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.25.2)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.25.2)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.25.2)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.25.2)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.25.2)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.25.2)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.25.2)
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.25.2)
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.25.2)
+      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.25.2)
+      '@babel/plugin-transform-arrow-functions': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-async-generator-functions': 7.25.0(@babel/core@7.25.2)
+      '@babel/plugin-transform-async-to-generator': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-block-scoped-functions': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-block-scoping': 7.25.0(@babel/core@7.25.2)
+      '@babel/plugin-transform-class-properties': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-class-static-block': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-classes': 7.25.0(@babel/core@7.25.2)
+      '@babel/plugin-transform-computed-properties': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-destructuring': 7.24.8(@babel/core@7.25.2)
+      '@babel/plugin-transform-dotall-regex': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-duplicate-keys': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-duplicate-named-capturing-groups-regex': 7.25.0(@babel/core@7.25.2)
+      '@babel/plugin-transform-dynamic-import': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-exponentiation-operator': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-export-namespace-from': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-for-of': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-function-name': 7.25.1(@babel/core@7.25.2)
+      '@babel/plugin-transform-json-strings': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-literals': 7.25.2(@babel/core@7.25.2)
+      '@babel/plugin-transform-logical-assignment-operators': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-member-expression-literals': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-modules-amd': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-modules-commonjs': 7.24.8(@babel/core@7.25.2)
+      '@babel/plugin-transform-modules-systemjs': 7.25.0(@babel/core@7.25.2)
+      '@babel/plugin-transform-modules-umd': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-new-target': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-numeric-separator': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-object-rest-spread': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-object-super': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-optional-catch-binding': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-optional-chaining': 7.24.8(@babel/core@7.25.2)
+      '@babel/plugin-transform-parameters': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-private-methods': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-private-property-in-object': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-property-literals': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-regenerator': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-reserved-words': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-shorthand-properties': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-spread': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-sticky-regex': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-template-literals': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-typeof-symbol': 7.24.8(@babel/core@7.25.2)
+      '@babel/plugin-transform-unicode-escapes': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-unicode-property-regex': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-unicode-regex': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-unicode-sets-regex': 7.24.7(@babel/core@7.25.2)
+      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.25.2)
+      babel-plugin-polyfill-corejs2: 0.4.11(@babel/core@7.25.2)
+      babel-plugin-polyfill-corejs3: 0.10.6(@babel/core@7.25.2)
+      babel-plugin-polyfill-regenerator: 0.6.2(@babel/core@7.25.2)
+      core-js-compat: 3.38.0
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/parser@7.24.7':
+  '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.25.2)':
     dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
       '@babel/types': 7.24.8
+      esutils: 2.0.3
+
+  '@babel/preset-typescript@7.24.7(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/helper-validator-option': 7.24.8
+      '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-transform-modules-commonjs': 7.24.8(@babel/core@7.25.2)
+      '@babel/plugin-transform-typescript': 7.25.2(@babel/core@7.25.2)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/regjsgen@0.8.0': {}
+
+  '@babel/runtime@7.25.0':
+    dependencies:
+      regenerator-runtime: 0.14.1
+
+  '@babel/template@7.25.0':
+    dependencies:
+      '@babel/code-frame': 7.24.7
+      '@babel/parser': 7.25.3
+      '@babel/types': 7.25.2
+
+  '@babel/traverse@7.25.3':
+    dependencies:
+      '@babel/code-frame': 7.24.7
+      '@babel/generator': 7.25.0
+      '@babel/parser': 7.25.3
+      '@babel/template': 7.25.0
+      '@babel/types': 7.25.2
+      debug: 4.3.5
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
 
   '@babel/types@7.24.8':
     dependencies:
@@ -2561,99 +5514,175 @@ snapshots:
       '@babel/helper-validator-identifier': 7.24.7
       to-fast-properties: 2.0.0
 
-  '@docsearch/css@3.6.0': {}
+  '@babel/types@7.25.2':
+    dependencies:
+      '@babel/helper-string-parser': 7.24.8
+      '@babel/helper-validator-identifier': 7.24.7
+      to-fast-properties: 2.0.0
+
+  '@braintree/sanitize-url@7.1.0': {}
 
-  '@docsearch/js@3.6.0(@algolia/client-search@4.24.0)(search-insights@2.15.0)':
+  '@chevrotain/cst-dts-gen@11.0.3':
     dependencies:
-      '@docsearch/react': 3.6.0(@algolia/client-search@4.24.0)(search-insights@2.15.0)
-      preact: 10.22.1
-    transitivePeerDependencies:
-      - '@algolia/client-search'
-      - '@types/react'
-      - react
-      - react-dom
-      - search-insights
-
-  '@docsearch/react@3.6.0(@algolia/client-search@4.24.0)(search-insights@2.15.0)':
-    dependencies:
-      '@algolia/autocomplete-core': 1.9.3(@algolia/client-search@4.24.0)(algoliasearch@4.24.0)(search-insights@2.15.0)
-      '@algolia/autocomplete-preset-algolia': 1.9.3(@algolia/client-search@4.24.0)(algoliasearch@4.24.0)
-      '@docsearch/css': 3.6.0
-      algoliasearch: 4.24.0
-    optionalDependencies:
-      search-insights: 2.15.0
-    transitivePeerDependencies:
-      - '@algolia/client-search'
+      '@chevrotain/gast': 11.0.3
+      '@chevrotain/types': 11.0.3
+      lodash-es: 4.17.21
+
+  '@chevrotain/gast@11.0.3':
+    dependencies:
+      '@chevrotain/types': 11.0.3
+      lodash-es: 4.17.21
+
+  '@chevrotain/regexp-to-ast@11.0.3': {}
+
+  '@chevrotain/types@11.0.3': {}
+
+  '@chevrotain/utils@11.0.3': {}
 
   '@esbuild/aix-ppc64@0.21.5':
     optional: true
 
+  '@esbuild/aix-ppc64@0.24.2':
+    optional: true
+
   '@esbuild/android-arm64@0.21.5':
     optional: true
 
+  '@esbuild/android-arm64@0.24.2':
+    optional: true
+
   '@esbuild/android-arm@0.21.5':
     optional: true
 
+  '@esbuild/android-arm@0.24.2':
+    optional: true
+
   '@esbuild/android-x64@0.21.5':
     optional: true
 
+  '@esbuild/android-x64@0.24.2':
+    optional: true
+
   '@esbuild/darwin-arm64@0.21.5':
     optional: true
 
+  '@esbuild/darwin-arm64@0.24.2':
+    optional: true
+
   '@esbuild/darwin-x64@0.21.5':
     optional: true
 
+  '@esbuild/darwin-x64@0.24.2':
+    optional: true
+
   '@esbuild/freebsd-arm64@0.21.5':
     optional: true
 
+  '@esbuild/freebsd-arm64@0.24.2':
+    optional: true
+
   '@esbuild/freebsd-x64@0.21.5':
     optional: true
 
+  '@esbuild/freebsd-x64@0.24.2':
+    optional: true
+
   '@esbuild/linux-arm64@0.21.5':
     optional: true
 
+  '@esbuild/linux-arm64@0.24.2':
+    optional: true
+
   '@esbuild/linux-arm@0.21.5':
     optional: true
 
+  '@esbuild/linux-arm@0.24.2':
+    optional: true
+
   '@esbuild/linux-ia32@0.21.5':
     optional: true
 
+  '@esbuild/linux-ia32@0.24.2':
+    optional: true
+
   '@esbuild/linux-loong64@0.21.5':
     optional: true
 
+  '@esbuild/linux-loong64@0.24.2':
+    optional: true
+
   '@esbuild/linux-mips64el@0.21.5':
     optional: true
 
+  '@esbuild/linux-mips64el@0.24.2':
+    optional: true
+
   '@esbuild/linux-ppc64@0.21.5':
     optional: true
 
+  '@esbuild/linux-ppc64@0.24.2':
+    optional: true
+
   '@esbuild/linux-riscv64@0.21.5':
     optional: true
 
+  '@esbuild/linux-riscv64@0.24.2':
+    optional: true
+
   '@esbuild/linux-s390x@0.21.5':
     optional: true
 
+  '@esbuild/linux-s390x@0.24.2':
+    optional: true
+
   '@esbuild/linux-x64@0.21.5':
     optional: true
 
+  '@esbuild/linux-x64@0.24.2':
+    optional: true
+
+  '@esbuild/netbsd-arm64@0.24.2':
+    optional: true
+
   '@esbuild/netbsd-x64@0.21.5':
     optional: true
 
+  '@esbuild/netbsd-x64@0.24.2':
+    optional: true
+
+  '@esbuild/openbsd-arm64@0.24.2':
+    optional: true
+
   '@esbuild/openbsd-x64@0.21.5':
     optional: true
 
+  '@esbuild/openbsd-x64@0.24.2':
+    optional: true
+
   '@esbuild/sunos-x64@0.21.5':
     optional: true
 
+  '@esbuild/sunos-x64@0.24.2':
+    optional: true
+
   '@esbuild/win32-arm64@0.21.5':
     optional: true
 
+  '@esbuild/win32-arm64@0.24.2':
+    optional: true
+
   '@esbuild/win32-ia32@0.21.5':
     optional: true
 
+  '@esbuild/win32-ia32@0.24.2':
+    optional: true
+
   '@esbuild/win32-x64@0.21.5':
     optional: true
 
+  '@esbuild/win32-x64@0.24.2':
+    optional: true
+
   '@eslint-community/eslint-utils@4.4.0(eslint@8.57.0)':
     dependencies:
       eslint: 8.57.0
@@ -2689,8 +5718,43 @@ snapshots:
 
   '@humanwhocodes/object-schema@2.0.3': {}
 
+  '@iconify/types@2.0.0': {}
+
+  '@iconify/utils@2.1.33':
+    dependencies:
+      '@antfu/install-pkg': 0.4.1
+      '@antfu/utils': 0.7.10
+      '@iconify/types': 2.0.0
+      debug: 4.3.7
+      kolorist: 1.8.0
+      local-pkg: 0.5.0
+      mlly: 1.7.2
+    transitivePeerDependencies:
+      - supports-color
+
+  '@jridgewell/gen-mapping@0.3.5':
+    dependencies:
+      '@jridgewell/set-array': 1.2.1
+      '@jridgewell/sourcemap-codec': 1.5.0
+      '@jridgewell/trace-mapping': 0.3.25
+
+  '@jridgewell/resolve-uri@3.1.2': {}
+
+  '@jridgewell/set-array@1.2.1': {}
+
   '@jridgewell/sourcemap-codec@1.5.0': {}
 
+  '@jridgewell/trace-mapping@0.3.25':
+    dependencies:
+      '@jridgewell/resolve-uri': 3.1.2
+      '@jridgewell/sourcemap-codec': 1.5.0
+
+  '@lit-labs/ssr-dom-shim@1.2.1': {}
+
+  '@lit/reactive-element@2.0.4':
+    dependencies:
+      '@lit-labs/ssr-dom-shim': 1.2.1
+
   '@mdit-vue/plugin-component@2.1.3':
     dependencies:
       '@types/markdown-it': 14.1.2
@@ -2718,170 +5782,203 @@ snapshots:
 
   '@mdit-vue/plugin-title@2.1.3':
     dependencies:
-      '@mdit-vue/shared': 2.1.3
-      '@mdit-vue/types': 2.1.0
+      '@mdit-vue/shared': 2.1.3
+      '@mdit-vue/types': 2.1.0
+      '@types/markdown-it': 14.1.2
+      markdown-it: 14.1.0
+
+  '@mdit-vue/plugin-toc@2.1.3':
+    dependencies:
+      '@mdit-vue/shared': 2.1.3
+      '@mdit-vue/types': 2.1.0
+      '@types/markdown-it': 14.1.2
+      markdown-it: 14.1.0
+
+  '@mdit-vue/shared@2.1.3':
+    dependencies:
+      '@mdit-vue/types': 2.1.0
+      '@types/markdown-it': 14.1.2
+      markdown-it: 14.1.0
+
+  '@mdit-vue/types@2.1.0': {}
+
+  '@mdit/helper@0.16.0(markdown-it@14.1.0)':
+    dependencies:
       '@types/markdown-it': 14.1.2
+    optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit-vue/plugin-toc@2.1.3':
+  '@mdit/plugin-alert@0.16.0(markdown-it@14.1.0)':
     dependencies:
-      '@mdit-vue/shared': 2.1.3
-      '@mdit-vue/types': 2.1.0
       '@types/markdown-it': 14.1.2
+    optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit-vue/shared@2.1.3':
+  '@mdit/plugin-align@0.16.0(markdown-it@14.1.0)':
     dependencies:
-      '@mdit-vue/types': 2.1.0
+      '@mdit/plugin-container': 0.16.0(markdown-it@14.1.0)
       '@types/markdown-it': 14.1.2
+    optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit-vue/types@2.1.0': {}
-
-  '@mdit/plugin-alert@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-attrs@0.16.7(markdown-it@14.1.0)':
     dependencies:
+      '@mdit/helper': 0.16.0(markdown-it@14.1.0)
       '@types/markdown-it': 14.1.2
     optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit/plugin-align@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-container@0.16.0(markdown-it@14.1.0)':
     dependencies:
-      '@mdit/plugin-container': 0.12.0(markdown-it@14.1.0)
       '@types/markdown-it': 14.1.2
     optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit/plugin-attrs@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-demo@0.16.0(markdown-it@14.1.0)':
     dependencies:
       '@types/markdown-it': 14.1.2
     optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit/plugin-container@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-dl@0.13.0(markdown-it@14.1.0)':
     dependencies:
       '@types/markdown-it': 14.1.2
     optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit/plugin-demo@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-figure@0.16.0(markdown-it@14.1.0)':
     dependencies:
       '@types/markdown-it': 14.1.2
     optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit/plugin-figure@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-footnote@0.16.0(markdown-it@14.1.0)':
     dependencies:
       '@types/markdown-it': 14.1.2
-    optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit/plugin-footnote@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-icon@0.16.5(markdown-it@14.1.0)':
     dependencies:
+      '@mdit/helper': 0.16.0(markdown-it@14.1.0)
       '@types/markdown-it': 14.1.2
+    optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit/plugin-img-lazyload@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-img-lazyload@0.16.0(markdown-it@14.1.0)':
     dependencies:
       '@types/markdown-it': 14.1.2
     optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit/plugin-img-mark@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-img-mark@0.16.0(markdown-it@14.1.0)':
     dependencies:
       '@types/markdown-it': 14.1.2
     optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit/plugin-img-size@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-img-size@0.16.0(markdown-it@14.1.0)':
     dependencies:
       '@types/markdown-it': 14.1.2
     optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit/plugin-include@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-include@0.16.0(markdown-it@14.1.0)':
     dependencies:
+      '@mdit/helper': 0.16.0(markdown-it@14.1.0)
       '@types/markdown-it': 14.1.2
       upath: 2.0.1
     optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit/plugin-katex-slim@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-katex-slim@0.16.7(katex@0.16.11)(markdown-it@14.1.0)':
     dependencies:
-      '@mdit/plugin-tex': 0.12.0(markdown-it@14.1.0)
-      '@types/katex': 0.16.7
+      '@mdit/helper': 0.16.0(markdown-it@14.1.0)
+      '@mdit/plugin-tex': 0.16.0(markdown-it@14.1.0)
       '@types/markdown-it': 14.1.2
     optionalDependencies:
+      katex: 0.16.11
       markdown-it: 14.1.0
 
-  '@mdit/plugin-mark@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-mark@0.16.0(markdown-it@14.1.0)':
     dependencies:
       '@types/markdown-it': 14.1.2
     optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit/plugin-mathjax-slim@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-mathjax-slim@0.16.0(markdown-it@14.1.0)':
     dependencies:
-      '@mdit/plugin-tex': 0.12.0(markdown-it@14.1.0)
+      '@mdit/plugin-tex': 0.16.0(markdown-it@14.1.0)
       '@types/markdown-it': 14.1.2
       upath: 2.0.1
     optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit/plugin-plantuml@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-plantuml@0.16.0(markdown-it@14.1.0)':
     dependencies:
-      '@mdit/plugin-uml': 0.12.0(markdown-it@14.1.0)
+      '@mdit/plugin-uml': 0.16.0(markdown-it@14.1.0)
       '@types/markdown-it': 14.1.2
     optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit/plugin-spoiler@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-spoiler@0.16.0(markdown-it@14.1.0)':
     dependencies:
       '@types/markdown-it': 14.1.2
     optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit/plugin-stylize@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-stylize@0.16.0(markdown-it@14.1.0)':
     dependencies:
       '@types/markdown-it': 14.1.2
     optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit/plugin-sub@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-sub@0.16.0(markdown-it@14.1.0)':
     dependencies:
+      '@mdit/helper': 0.16.0(markdown-it@14.1.0)
       '@types/markdown-it': 14.1.2
     optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit/plugin-sup@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-sup@0.16.0(markdown-it@14.1.0)':
     dependencies:
+      '@mdit/helper': 0.16.0(markdown-it@14.1.0)
       '@types/markdown-it': 14.1.2
     optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit/plugin-tab@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-tab@0.16.0(markdown-it@14.1.0)':
     dependencies:
+      '@mdit/helper': 0.16.0(markdown-it@14.1.0)
       '@types/markdown-it': 14.1.2
     optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit/plugin-tasklist@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-tasklist@0.16.0(markdown-it@14.1.0)':
     dependencies:
       '@types/markdown-it': 14.1.2
     optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit/plugin-tex@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-tex@0.16.0(markdown-it@14.1.0)':
     dependencies:
       '@types/markdown-it': 14.1.2
     optionalDependencies:
       markdown-it: 14.1.0
 
-  '@mdit/plugin-uml@0.12.0(markdown-it@14.1.0)':
+  '@mdit/plugin-uml@0.16.0(markdown-it@14.1.0)':
     dependencies:
+      '@mdit/helper': 0.16.0(markdown-it@14.1.0)
       '@types/markdown-it': 14.1.2
     optionalDependencies:
       markdown-it: 14.1.0
 
+  '@mermaid-js/parser@0.3.0':
+    dependencies:
+      langium: 3.0.0
+
+  '@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3':
+    optional: true
+
   '@nodelib/fs.scandir@2.1.5':
     dependencies:
       '@nodelib/fs.stat': 2.0.5
@@ -2894,81 +5991,217 @@ snapshots:
       '@nodelib/fs.scandir': 2.1.5
       fastq: 1.13.0
 
-  '@rollup/rollup-android-arm-eabi@4.18.1':
+  '@parcel/watcher-android-arm64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-darwin-arm64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-darwin-x64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-freebsd-x64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm-glibc@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm-musl@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm64-glibc@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-arm64-musl@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-x64-glibc@2.5.1':
+    optional: true
+
+  '@parcel/watcher-linux-x64-musl@2.5.1':
+    optional: true
+
+  '@parcel/watcher-win32-arm64@2.5.1':
+    optional: true
+
+  '@parcel/watcher-win32-ia32@2.5.1':
+    optional: true
+
+  '@parcel/watcher-win32-x64@2.5.1':
+    optional: true
+
+  '@parcel/watcher@2.5.1':
+    dependencies:
+      detect-libc: 1.0.3
+      is-glob: 4.0.3
+      micromatch: 4.0.8
+      node-addon-api: 7.1.1
+    optionalDependencies:
+      '@parcel/watcher-android-arm64': 2.5.1
+      '@parcel/watcher-darwin-arm64': 2.5.1
+      '@parcel/watcher-darwin-x64': 2.5.1
+      '@parcel/watcher-freebsd-x64': 2.5.1
+      '@parcel/watcher-linux-arm-glibc': 2.5.1
+      '@parcel/watcher-linux-arm-musl': 2.5.1
+      '@parcel/watcher-linux-arm64-glibc': 2.5.1
+      '@parcel/watcher-linux-arm64-musl': 2.5.1
+      '@parcel/watcher-linux-x64-glibc': 2.5.1
+      '@parcel/watcher-linux-x64-musl': 2.5.1
+      '@parcel/watcher-win32-arm64': 2.5.1
+      '@parcel/watcher-win32-ia32': 2.5.1
+      '@parcel/watcher-win32-x64': 2.5.1
+    optional: true
+
+  '@pkgr/core@0.1.1': {}
+
+  '@polka/url@1.0.0-next.25': {}
+
+  '@rollup/plugin-alias@3.1.9(rollup@4.34.6)':
+    dependencies:
+      rollup: 4.34.6
+      slash: 3.0.0
+
+  '@rollup/pluginutils@5.1.0(rollup@4.34.6)':
+    dependencies:
+      '@types/estree': 1.0.6
+      estree-walker: 2.0.2
+      picomatch: 2.3.1
+    optionalDependencies:
+      rollup: 4.34.6
+
+  '@rollup/rollup-android-arm-eabi@4.34.6':
+    optional: true
+
+  '@rollup/rollup-android-arm64@4.34.6':
+    optional: true
+
+  '@rollup/rollup-darwin-arm64@4.34.6':
+    optional: true
+
+  '@rollup/rollup-darwin-x64@4.34.6':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.18.1':
+  '@rollup/rollup-freebsd-arm64@4.34.6':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.18.1':
+  '@rollup/rollup-freebsd-x64@4.34.6':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.18.1':
+  '@rollup/rollup-linux-arm-gnueabihf@4.34.6':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.18.1':
+  '@rollup/rollup-linux-arm-musleabihf@4.34.6':
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.18.1':
+  '@rollup/rollup-linux-arm64-gnu@4.34.6':
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.18.1':
+  '@rollup/rollup-linux-arm64-musl@4.34.6':
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.18.1':
+  '@rollup/rollup-linux-loongarch64-gnu@4.34.6':
     optional: true
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.18.1':
+  '@rollup/rollup-linux-powerpc64le-gnu@4.34.6':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-gnu@4.18.1':
+  '@rollup/rollup-linux-riscv64-gnu@4.34.6':
     optional: true
 
-  '@rollup/rollup-linux-s390x-gnu@4.18.1':
+  '@rollup/rollup-linux-s390x-gnu@4.34.6':
     optional: true
 
-  '@rollup/rollup-linux-x64-gnu@4.18.1':
+  '@rollup/rollup-linux-x64-gnu@4.34.6':
     optional: true
 
-  '@rollup/rollup-linux-x64-musl@4.18.1':
+  '@rollup/rollup-linux-x64-musl@4.34.6':
     optional: true
 
-  '@rollup/rollup-win32-arm64-msvc@4.18.1':
+  '@rollup/rollup-win32-arm64-msvc@4.34.6':
     optional: true
 
-  '@rollup/rollup-win32-ia32-msvc@4.18.1':
+  '@rollup/rollup-win32-ia32-msvc@4.34.6':
     optional: true
 
-  '@rollup/rollup-win32-x64-msvc@4.18.1':
+  '@rollup/rollup-win32-x64-msvc@4.34.6':
     optional: true
 
   '@sec-ant/readable-stream@0.4.1': {}
 
+  '@shikijs/core@2.3.2':
+    dependencies:
+      '@shikijs/engine-javascript': 2.3.2
+      '@shikijs/engine-oniguruma': 2.3.2
+      '@shikijs/types': 2.3.2
+      '@shikijs/vscode-textmate': 10.0.1
+      '@types/hast': 3.0.4
+      hast-util-to-html: 9.0.4
+
+  '@shikijs/engine-javascript@2.3.2':
+    dependencies:
+      '@shikijs/types': 2.3.2
+      '@shikijs/vscode-textmate': 10.0.1
+      oniguruma-to-es: 3.1.0
+
+  '@shikijs/engine-oniguruma@2.3.2':
+    dependencies:
+      '@shikijs/types': 2.3.2
+      '@shikijs/vscode-textmate': 10.0.1
+
+  '@shikijs/langs@2.3.2':
+    dependencies:
+      '@shikijs/types': 2.3.2
+
+  '@shikijs/themes@2.3.2':
+    dependencies:
+      '@shikijs/types': 2.3.2
+
+  '@shikijs/transformers@2.3.2':
+    dependencies:
+      '@shikijs/core': 2.3.2
+      '@shikijs/types': 2.3.2
+
+  '@shikijs/types@2.3.2':
+    dependencies:
+      '@shikijs/vscode-textmate': 10.0.1
+      '@types/hast': 3.0.4
+
+  '@shikijs/vscode-textmate@10.0.1': {}
+
   '@sindresorhus/merge-streams@2.3.0': {}
 
   '@sindresorhus/merge-streams@4.0.0': {}
 
+  '@stackblitz/sdk@1.11.0': {}
+
   '@types/debug@4.1.12':
     dependencies:
       '@types/ms': 0.7.31
 
-  '@types/estree@1.0.5': {}
+  '@types/estree@1.0.6': {}
 
   '@types/fs-extra@11.0.4':
     dependencies:
       '@types/jsonfile': 6.1.4
       '@types/node': 17.0.45
 
+  '@types/glob@7.2.0':
+    dependencies:
+      '@types/minimatch': 5.1.2
+      '@types/node': 17.0.45
+
   '@types/hash-sum@1.0.2': {}
 
+  '@types/hast@3.0.4':
+    dependencies:
+      '@types/unist': 3.0.3
+
   '@types/json5@0.0.29': {}
 
   '@types/jsonfile@6.1.4':
     dependencies:
       '@types/node': 17.0.45
 
-  '@types/katex@0.16.7': {}
-
   '@types/linkify-it@5.0.0': {}
 
   '@types/markdown-it-emoji@3.0.1':
@@ -2980,8 +6213,14 @@ snapshots:
       '@types/linkify-it': 5.0.0
       '@types/mdurl': 2.0.0
 
+  '@types/mdast@4.0.4':
+    dependencies:
+      '@types/unist': 3.0.3
+
   '@types/mdurl@2.0.0': {}
 
+  '@types/minimatch@5.1.2': {}
+
   '@types/ms@0.7.31': {}
 
   '@types/node@17.0.45': {}
@@ -2990,6 +6229,10 @@ snapshots:
     dependencies:
       '@types/node': 17.0.45
 
+  '@types/trusted-types@2.0.7': {}
+
+  '@types/unist@3.0.3': {}
+
   '@types/web-bluetooth@0.0.20': {}
 
   '@typescript-eslint/eslint-plugin@7.16.0(@typescript-eslint/parser@7.16.0(eslint@8.57.0)(typescript@5.5.3))(eslint@8.57.0)(typescript@5.5.3)':
@@ -3075,10 +6318,39 @@ snapshots:
 
   '@ungap/structured-clone@1.2.0': {}
 
-  '@vitejs/plugin-vue@5.0.5(vite@5.3.3(sass@1.77.8))(vue@3.4.31(typescript@5.5.3))':
+  '@vitejs/plugin-vue@5.2.1(vite@6.0.11(sass@1.84.0)(stylus@0.56.0))(vue@3.5.13(typescript@5.5.3))':
     dependencies:
-      vite: 5.3.3(sass@1.77.8)
-      vue: 3.4.31(typescript@5.5.3)
+      vite: 6.0.11(sass@1.84.0)(stylus@0.56.0)
+      vue: 3.5.13(typescript@5.5.3)
+
+  '@vue/babel-helper-vue-transform-on@1.2.2': {}
+
+  '@vue/babel-plugin-jsx@1.2.2(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/helper-module-imports': 7.22.15
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.25.2)
+      '@babel/template': 7.25.0
+      '@babel/traverse': 7.25.3
+      '@babel/types': 7.24.8
+      '@vue/babel-helper-vue-transform-on': 1.2.2
+      '@vue/babel-plugin-resolve-type': 1.2.2(@babel/core@7.25.2)
+      camelcase: 6.3.0
+      html-tags: 3.3.1
+      svg-tags: 1.0.0
+    optionalDependencies:
+      '@babel/core': 7.25.2
+    transitivePeerDependencies:
+      - supports-color
+
+  '@vue/babel-plugin-resolve-type@1.2.2(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/code-frame': 7.24.7
+      '@babel/core': 7.25.2
+      '@babel/helper-module-imports': 7.22.15
+      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/parser': 7.24.7
+      '@vue/compiler-sfc': 3.4.38
 
   '@vue/compiler-core@3.4.31':
     dependencies:
@@ -3086,13 +6358,39 @@ snapshots:
       '@vue/shared': 3.4.31
       entities: 4.5.0
       estree-walker: 2.0.2
-      source-map-js: 1.2.0
+      source-map-js: 1.2.1
+
+  '@vue/compiler-core@3.4.38':
+    dependencies:
+      '@babel/parser': 7.24.7
+      '@vue/shared': 3.4.38
+      entities: 4.5.0
+      estree-walker: 2.0.2
+      source-map-js: 1.2.1
+
+  '@vue/compiler-core@3.5.13':
+    dependencies:
+      '@babel/parser': 7.25.3
+      '@vue/shared': 3.5.13
+      entities: 4.5.0
+      estree-walker: 2.0.2
+      source-map-js: 1.2.1
 
   '@vue/compiler-dom@3.4.31':
     dependencies:
       '@vue/compiler-core': 3.4.31
       '@vue/shared': 3.4.31
 
+  '@vue/compiler-dom@3.4.38':
+    dependencies:
+      '@vue/compiler-core': 3.4.38
+      '@vue/shared': 3.4.38
+
+  '@vue/compiler-dom@3.5.13':
+    dependencies:
+      '@vue/compiler-core': 3.5.13
+      '@vue/shared': 3.5.13
+
   '@vue/compiler-sfc@3.4.31':
     dependencies:
       '@babel/parser': 7.24.7
@@ -3102,25 +6400,114 @@ snapshots:
       '@vue/shared': 3.4.31
       estree-walker: 2.0.2
       magic-string: 0.30.10
-      postcss: 8.4.39
+      postcss: 8.4.41
       source-map-js: 1.2.0
 
+  '@vue/compiler-sfc@3.4.38':
+    dependencies:
+      '@babel/parser': 7.24.7
+      '@vue/compiler-core': 3.4.38
+      '@vue/compiler-dom': 3.4.38
+      '@vue/compiler-ssr': 3.4.38
+      '@vue/shared': 3.4.38
+      estree-walker: 2.0.2
+      magic-string: 0.30.10
+      postcss: 8.4.41
+      source-map-js: 1.2.1
+
+  '@vue/compiler-sfc@3.5.13':
+    dependencies:
+      '@babel/parser': 7.25.3
+      '@vue/compiler-core': 3.5.13
+      '@vue/compiler-dom': 3.5.13
+      '@vue/compiler-ssr': 3.5.13
+      '@vue/shared': 3.5.13
+      estree-walker: 2.0.2
+      magic-string: 0.30.17
+      postcss: 8.5.2
+      source-map-js: 1.2.1
+
   '@vue/compiler-ssr@3.4.31':
     dependencies:
       '@vue/compiler-dom': 3.4.31
       '@vue/shared': 3.4.31
 
+  '@vue/compiler-ssr@3.4.38':
+    dependencies:
+      '@vue/compiler-dom': 3.4.38
+      '@vue/shared': 3.4.38
+
+  '@vue/compiler-ssr@3.5.13':
+    dependencies:
+      '@vue/compiler-dom': 3.5.13
+      '@vue/shared': 3.5.13
+
   '@vue/devtools-api@6.6.3': {}
 
+  '@vue/devtools-api@6.6.4': {}
+
+  '@vue/devtools-api@7.7.2':
+    dependencies:
+      '@vue/devtools-kit': 7.7.2
+
+  '@vue/devtools-core@7.3.8(vite@6.0.11(sass@1.84.0)(stylus@0.56.0))(vue@3.4.31(typescript@5.5.3))':
+    dependencies:
+      '@vue/devtools-kit': 7.3.8
+      '@vue/devtools-shared': 7.3.8
+      mitt: 3.0.1
+      nanoid: 3.3.7
+      pathe: 1.1.2
+      vite-hot-client: 0.2.3(vite@6.0.11(sass@1.84.0)(stylus@0.56.0))
+      vue: 3.4.31(typescript@5.5.3)
+    transitivePeerDependencies:
+      - vite
+
+  '@vue/devtools-kit@7.3.8':
+    dependencies:
+      '@vue/devtools-shared': 7.3.8
+      birpc: 0.2.17
+      hookable: 5.5.3
+      mitt: 3.0.1
+      perfect-debounce: 1.0.0
+      speakingurl: 14.0.1
+      superjson: 2.2.1
+
+  '@vue/devtools-kit@7.7.2':
+    dependencies:
+      '@vue/devtools-shared': 7.7.2
+      birpc: 0.2.19
+      hookable: 5.5.3
+      mitt: 3.0.1
+      perfect-debounce: 1.0.0
+      speakingurl: 14.0.1
+      superjson: 2.2.1
+
+  '@vue/devtools-shared@7.3.8':
+    dependencies:
+      rfdc: 1.4.1
+
+  '@vue/devtools-shared@7.7.2':
+    dependencies:
+      rfdc: 1.4.1
+
   '@vue/reactivity@3.4.31':
     dependencies:
       '@vue/shared': 3.4.31
 
+  '@vue/reactivity@3.5.13':
+    dependencies:
+      '@vue/shared': 3.5.13
+
   '@vue/runtime-core@3.4.31':
     dependencies:
       '@vue/reactivity': 3.4.31
       '@vue/shared': 3.4.31
 
+  '@vue/runtime-core@3.5.13':
+    dependencies:
+      '@vue/reactivity': 3.5.13
+      '@vue/shared': 3.5.13
+
   '@vue/runtime-dom@3.4.31':
     dependencies:
       '@vue/reactivity': 3.4.31
@@ -3128,35 +6515,59 @@ snapshots:
       '@vue/shared': 3.4.31
       csstype: 3.1.3
 
+  '@vue/runtime-dom@3.5.13':
+    dependencies:
+      '@vue/reactivity': 3.5.13
+      '@vue/runtime-core': 3.5.13
+      '@vue/shared': 3.5.13
+      csstype: 3.1.3
+
   '@vue/server-renderer@3.4.31(vue@3.4.31(typescript@5.5.3))':
     dependencies:
       '@vue/compiler-ssr': 3.4.31
       '@vue/shared': 3.4.31
       vue: 3.4.31(typescript@5.5.3)
 
+  '@vue/server-renderer@3.5.13(vue@3.5.13(typescript@5.5.3))':
+    dependencies:
+      '@vue/compiler-ssr': 3.5.13
+      '@vue/shared': 3.5.13
+      vue: 3.5.13(typescript@5.5.3)
+
   '@vue/shared@3.4.31': {}
 
-  '@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3)':
+  '@vue/shared@3.4.38': {}
+
+  '@vue/shared@3.5.13': {}
+
+  '@vuelidate/core@2.0.3(vue@3.4.31(typescript@5.5.3))':
     dependencies:
-      '@vitejs/plugin-vue': 5.0.5(vite@5.3.3(sass@1.77.8))(vue@3.4.31(typescript@5.5.3))
-      '@vuepress/client': 2.0.0-rc.14(typescript@5.5.3)
-      '@vuepress/core': 2.0.0-rc.14(typescript@5.5.3)
-      '@vuepress/shared': 2.0.0-rc.14
-      '@vuepress/utils': 2.0.0-rc.14
-      autoprefixer: 10.4.19(postcss@8.4.39)
-      connect-history-api-fallback: 2.0.0
-      postcss: 8.4.39
-      postcss-load-config: 6.0.1(postcss@8.4.39)
-      rollup: 4.18.1
-      vite: 5.3.3(sass@1.77.8)
       vue: 3.4.31(typescript@5.5.3)
-      vue-router: 4.4.0(vue@3.4.31(typescript@5.5.3))
+      vue-demi: 0.13.11(vue@3.4.31(typescript@5.5.3))
+
+  '@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3)':
+    dependencies:
+      '@vitejs/plugin-vue': 5.2.1(vite@6.0.11(sass@1.84.0)(stylus@0.56.0))(vue@3.5.13(typescript@5.5.3))
+      '@vuepress/bundlerutils': 2.0.0-rc.19(typescript@5.5.3)
+      '@vuepress/client': 2.0.0-rc.19(typescript@5.5.3)
+      '@vuepress/core': 2.0.0-rc.19(typescript@5.5.3)
+      '@vuepress/shared': 2.0.0-rc.19
+      '@vuepress/utils': 2.0.0-rc.19
+      autoprefixer: 10.4.20(postcss@8.5.2)
+      connect-history-api-fallback: 2.0.0
+      postcss: 8.5.2
+      postcss-load-config: 6.0.1(postcss@8.5.2)
+      rollup: 4.34.6
+      vite: 6.0.11(sass@1.84.0)(stylus@0.56.0)
+      vue: 3.5.13(typescript@5.5.3)
+      vue-router: 4.5.0(vue@3.5.13(typescript@5.5.3))
     transitivePeerDependencies:
       - '@types/node'
       - jiti
       - less
       - lightningcss
       - sass
+      - sass-embedded
       - stylus
       - sugarss
       - supports-color
@@ -3165,55 +6576,70 @@ snapshots:
       - typescript
       - yaml
 
-  '@vuepress/cli@2.0.0-rc.14(typescript@5.5.3)':
+  '@vuepress/bundlerutils@2.0.0-rc.19(typescript@5.5.3)':
+    dependencies:
+      '@vuepress/client': 2.0.0-rc.19(typescript@5.5.3)
+      '@vuepress/core': 2.0.0-rc.19(typescript@5.5.3)
+      '@vuepress/shared': 2.0.0-rc.19
+      '@vuepress/utils': 2.0.0-rc.19
+      vue: 3.5.13(typescript@5.5.3)
+      vue-router: 4.5.0(vue@3.5.13(typescript@5.5.3))
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+
+  '@vuepress/cli@2.0.0-rc.19(typescript@5.5.3)':
     dependencies:
-      '@vuepress/core': 2.0.0-rc.14(typescript@5.5.3)
-      '@vuepress/shared': 2.0.0-rc.14
-      '@vuepress/utils': 2.0.0-rc.14
+      '@vuepress/core': 2.0.0-rc.19(typescript@5.5.3)
+      '@vuepress/shared': 2.0.0-rc.19
+      '@vuepress/utils': 2.0.0-rc.19
       cac: 6.7.14
       chokidar: 3.6.0
-      envinfo: 7.13.0
+      envinfo: 7.14.0
       esbuild: 0.21.5
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  '@vuepress/client@2.0.0-rc.14(typescript@5.5.3)':
+  '@vuepress/client@2.0.0-rc.19(typescript@5.5.3)':
     dependencies:
-      '@vue/devtools-api': 6.6.3
-      '@vuepress/shared': 2.0.0-rc.14
-      vue: 3.4.31(typescript@5.5.3)
-      vue-router: 4.4.0(vue@3.4.31(typescript@5.5.3))
+      '@vue/devtools-api': 7.7.2
+      '@vuepress/shared': 2.0.0-rc.19
+      vue: 3.5.13(typescript@5.5.3)
+      vue-router: 4.5.0(vue@3.5.13(typescript@5.5.3))
     transitivePeerDependencies:
       - typescript
 
-  '@vuepress/core@2.0.0-rc.14(typescript@5.5.3)':
+  '@vuepress/core@2.0.0-rc.19(typescript@5.5.3)':
     dependencies:
-      '@vuepress/client': 2.0.0-rc.14(typescript@5.5.3)
-      '@vuepress/markdown': 2.0.0-rc.14
-      '@vuepress/shared': 2.0.0-rc.14
-      '@vuepress/utils': 2.0.0-rc.14
-      vue: 3.4.31(typescript@5.5.3)
+      '@vuepress/client': 2.0.0-rc.19(typescript@5.5.3)
+      '@vuepress/markdown': 2.0.0-rc.19
+      '@vuepress/shared': 2.0.0-rc.19
+      '@vuepress/utils': 2.0.0-rc.19
+      vue: 3.5.13(typescript@5.5.3)
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  '@vuepress/helper@2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+  '@vuepress/helper@2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
     dependencies:
-      '@vue/shared': 3.4.31
-      cheerio: 1.0.0-rc.12
+      '@vue/shared': 3.5.13
+      '@vueuse/core': 12.5.0(typescript@5.5.3)
+      cheerio: 1.0.0
       fflate: 0.8.2
       gray-matter: 4.0.3
-      vue: 3.4.31(typescript@5.5.3)
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
     transitivePeerDependencies:
       - typescript
 
-  '@vuepress/highlighter-helper@2.0.0-rc.37(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+  '@vuepress/highlighter-helper@2.0.0-rc.71(@vueuse/core@12.5.0(typescript@5.5.3))(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
     dependencies:
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+    optionalDependencies:
+      '@vueuse/core': 12.5.0(typescript@5.5.3)
 
-  '@vuepress/markdown@2.0.0-rc.14':
+  '@vuepress/markdown@2.0.0-rc.19':
     dependencies:
       '@mdit-vue/plugin-component': 2.1.3
       '@mdit-vue/plugin-frontmatter': 2.1.3
@@ -3225,222 +6651,336 @@ snapshots:
       '@mdit-vue/types': 2.1.0
       '@types/markdown-it': 14.1.2
       '@types/markdown-it-emoji': 3.0.1
-      '@vuepress/shared': 2.0.0-rc.14
-      '@vuepress/utils': 2.0.0-rc.14
+      '@vuepress/shared': 2.0.0-rc.19
+      '@vuepress/utils': 2.0.0-rc.19
       markdown-it: 14.1.0
-      markdown-it-anchor: 9.0.1(@types/markdown-it@14.1.2)(markdown-it@14.1.0)
+      markdown-it-anchor: 9.2.0(@types/markdown-it@14.1.2)(markdown-it@14.1.0)
       markdown-it-emoji: 3.0.0
       mdurl: 2.0.0
     transitivePeerDependencies:
       - supports-color
 
-  '@vuepress/plugin-active-header-links@2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+  '@vuepress/plugin-active-header-links@2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
     dependencies:
-      '@vueuse/core': 10.11.0(vue@3.4.31(typescript@5.5.3))
-      vue: 3.4.31(typescript@5.5.3)
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      '@vueuse/core': 12.5.0(typescript@5.5.3)
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
     transitivePeerDependencies:
-      - '@vue/composition-api'
       - typescript
 
-  '@vuepress/plugin-back-to-top@2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+  '@vuepress/plugin-back-to-top@2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
     dependencies:
-      '@vuepress/helper': 2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vueuse/core': 10.11.0(vue@3.4.31(typescript@5.5.3))
-      vue: 3.4.31(typescript@5.5.3)
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vueuse/core': 12.5.0(typescript@5.5.3)
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+    transitivePeerDependencies:
+      - typescript
+
+  '@vuepress/plugin-blog@2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+    dependencies:
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      chokidar: 3.6.0
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+    transitivePeerDependencies:
+      - typescript
+
+  '@vuepress/plugin-catalog@2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+    dependencies:
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+    transitivePeerDependencies:
+      - typescript
+
+  '@vuepress/plugin-comment@2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+    dependencies:
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vueuse/core': 12.5.0(typescript@5.5.3)
+      giscus: 1.6.0
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+    transitivePeerDependencies:
+      - typescript
+
+  '@vuepress/plugin-copy-code@2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+    dependencies:
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vueuse/core': 12.5.0(typescript@5.5.3)
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+    transitivePeerDependencies:
+      - typescript
+
+  '@vuepress/plugin-copyright@2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+    dependencies:
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vueuse/core': 12.5.0(typescript@5.5.3)
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+    transitivePeerDependencies:
+      - typescript
+
+  '@vuepress/plugin-git@2.0.0-rc.68(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+    dependencies:
+      execa: 9.5.2
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+
+  '@vuepress/plugin-icon@2.0.0-rc.74(markdown-it@14.1.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+    dependencies:
+      '@mdit/plugin-icon': 0.16.5(markdown-it@14.1.0)
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vueuse/core': 12.5.0(typescript@5.5.3)
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+    transitivePeerDependencies:
+      - markdown-it
+      - typescript
+
+  '@vuepress/plugin-links-check@2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+    dependencies:
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
     transitivePeerDependencies:
-      - '@vue/composition-api'
       - typescript
 
-  '@vuepress/plugin-container@2.0.0-rc.28(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+  '@vuepress/plugin-markdown-ext@2.0.0-rc.74(markdown-it@14.1.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
     dependencies:
+      '@mdit/plugin-container': 0.16.0(markdown-it@14.1.0)
+      '@mdit/plugin-footnote': 0.16.0(markdown-it@14.1.0)
+      '@mdit/plugin-tasklist': 0.16.0(markdown-it@14.1.0)
       '@types/markdown-it': 14.1.2
-      markdown-it: 14.1.0
-      markdown-it-container: 4.0.0
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      js-yaml: 4.1.0
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+    transitivePeerDependencies:
+      - markdown-it
+      - typescript
 
-  '@vuepress/plugin-copy-code@2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+  '@vuepress/plugin-markdown-hint@2.0.0-rc.74(markdown-it@14.1.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
     dependencies:
-      '@vuepress/helper': 2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vueuse/core': 10.11.0(vue@3.4.31(typescript@5.5.3))
-      vue: 3.4.31(typescript@5.5.3)
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      '@mdit/plugin-alert': 0.16.0(markdown-it@14.1.0)
+      '@mdit/plugin-container': 0.16.0(markdown-it@14.1.0)
+      '@types/markdown-it': 14.1.2
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vueuse/core': 12.5.0(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
     transitivePeerDependencies:
-      - '@vue/composition-api'
+      - markdown-it
       - typescript
 
-  '@vuepress/plugin-docsearch@2.0.0-rc.37(@algolia/client-search@4.24.0)(search-insights@2.15.0)(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+  '@vuepress/plugin-markdown-image@2.0.0-rc.74(markdown-it@14.1.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
     dependencies:
-      '@docsearch/css': 3.6.0
-      '@docsearch/js': 3.6.0(@algolia/client-search@4.24.0)(search-insights@2.15.0)
-      '@docsearch/react': 3.6.0(@algolia/client-search@4.24.0)(search-insights@2.15.0)
-      '@vuepress/helper': 2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vueuse/core': 10.11.0(vue@3.4.31(typescript@5.5.3))
-      ts-debounce: 4.0.0
-      vue: 3.4.31(typescript@5.5.3)
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      '@mdit/plugin-figure': 0.16.0(markdown-it@14.1.0)
+      '@mdit/plugin-img-lazyload': 0.16.0(markdown-it@14.1.0)
+      '@mdit/plugin-img-mark': 0.16.0(markdown-it@14.1.0)
+      '@mdit/plugin-img-size': 0.16.0(markdown-it@14.1.0)
+      '@types/markdown-it': 14.1.2
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
     transitivePeerDependencies:
-      - '@algolia/client-search'
-      - '@types/react'
-      - '@vue/composition-api'
-      - react
-      - react-dom
-      - search-insights
+      - markdown-it
       - typescript
 
-  '@vuepress/plugin-git@2.0.0-rc.37(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+  '@vuepress/plugin-markdown-include@2.0.0-rc.74(markdown-it@14.1.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
     dependencies:
-      execa: 9.3.0
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      '@mdit/plugin-include': 0.16.0(markdown-it@14.1.0)
+      '@types/markdown-it': 14.1.2
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+    transitivePeerDependencies:
+      - markdown-it
+      - typescript
 
-  '@vuepress/plugin-google-analytics@2.0.0-rc.37(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+  '@vuepress/plugin-markdown-math@2.0.0-rc.74(katex@0.16.11)(markdown-it@14.1.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
     dependencies:
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      '@mdit/plugin-katex-slim': 0.16.7(katex@0.16.11)(markdown-it@14.1.0)
+      '@mdit/plugin-mathjax-slim': 0.16.0(markdown-it@14.1.0)
+      '@types/markdown-it': 14.1.2
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+    optionalDependencies:
+      katex: 0.16.11
+    transitivePeerDependencies:
+      - markdown-it
+      - typescript
 
-  '@vuepress/plugin-links-check@2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+  '@vuepress/plugin-markdown-stylize@2.0.0-rc.75(markdown-it@14.1.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
     dependencies:
-      '@vuepress/helper': 2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      '@mdit/plugin-align': 0.16.0(markdown-it@14.1.0)
+      '@mdit/plugin-attrs': 0.16.7(markdown-it@14.1.0)
+      '@mdit/plugin-mark': 0.16.0(markdown-it@14.1.0)
+      '@mdit/plugin-spoiler': 0.16.0(markdown-it@14.1.0)
+      '@mdit/plugin-stylize': 0.16.0(markdown-it@14.1.0)
+      '@mdit/plugin-sub': 0.16.0(markdown-it@14.1.0)
+      '@mdit/plugin-sup': 0.16.0(markdown-it@14.1.0)
+      '@types/markdown-it': 14.1.2
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
     transitivePeerDependencies:
+      - markdown-it
       - typescript
 
-  '@vuepress/plugin-markdown-container@2.0.0-rc.37(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+  '@vuepress/plugin-markdown-tab@2.0.0-rc.74(markdown-it@14.1.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
     dependencies:
+      '@mdit/plugin-tab': 0.16.0(markdown-it@14.1.0)
       '@types/markdown-it': 14.1.2
-      markdown-it-container: 4.0.0
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vueuse/core': 12.5.0(typescript@5.5.3)
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+    transitivePeerDependencies:
+      - markdown-it
+      - typescript
 
-  '@vuepress/plugin-medium-zoom@2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+  '@vuepress/plugin-notice@2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
     dependencies:
-      '@vuepress/helper': 2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      medium-zoom: 1.1.0
-      vue: 3.4.31(typescript@5.5.3)
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vueuse/core': 12.5.0(typescript@5.5.3)
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
     transitivePeerDependencies:
       - typescript
 
-  '@vuepress/plugin-nprogress@2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+  '@vuepress/plugin-nprogress@2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
     dependencies:
-      vue: 3.4.31(typescript@5.5.3)
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
     transitivePeerDependencies:
       - typescript
 
-  '@vuepress/plugin-palette@2.0.0-rc.37(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+  '@vuepress/plugin-photo-swipe@2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
     dependencies:
-      chokidar: 3.6.0
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vueuse/core': 12.5.0(typescript@5.5.3)
+      photoswipe: 5.4.4
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+    transitivePeerDependencies:
+      - typescript
 
-  '@vuepress/plugin-prismjs@2.0.0-rc.37(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+  '@vuepress/plugin-reading-time@2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
     dependencies:
-      '@vuepress/highlighter-helper': 2.0.0-rc.37(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      prismjs: 1.29.0
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+    transitivePeerDependencies:
+      - typescript
 
-  '@vuepress/plugin-register-components@2.0.0-rc.37(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+  '@vuepress/plugin-redirect@2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
     dependencies:
-      chokidar: 3.6.0
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vueuse/core': 12.5.0(typescript@5.5.3)
+      commander: 13.1.0
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+    transitivePeerDependencies:
+      - typescript
 
-  '@vuepress/plugin-sass-palette@2.0.0-rc.37(sass-loader@14.2.1(sass@1.77.8))(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+  '@vuepress/plugin-rtl@2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
     dependencies:
-      '@vuepress/helper': 2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      chokidar: 3.6.0
-      sass: 1.77.8
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vueuse/core': 12.5.0(typescript@5.5.3)
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+    transitivePeerDependencies:
+      - typescript
+
+  '@vuepress/plugin-sass-palette@2.0.0-rc.74(sass-loader@15.0.0(sass@1.84.0))(sass@1.84.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+    dependencies:
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      chokidar: 4.0.3
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
     optionalDependencies:
-      sass-loader: 14.2.1(sass@1.77.8)
+      sass: 1.84.0
+      sass-loader: 15.0.0(sass@1.84.0)
     transitivePeerDependencies:
       - typescript
 
-  '@vuepress/plugin-seo@2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+  '@vuepress/plugin-search@2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
     dependencies:
-      '@vuepress/helper': 2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      chokidar: 3.6.0
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
     transitivePeerDependencies:
       - typescript
 
-  '@vuepress/plugin-sitemap@2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+  '@vuepress/plugin-seo@2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
     dependencies:
-      '@vuepress/helper': 2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      sitemap: 8.0.0
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
     transitivePeerDependencies:
       - typescript
 
-  '@vuepress/plugin-theme-data@2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+  '@vuepress/plugin-shiki@2.0.0-rc.74(@vueuse/core@12.5.0(typescript@5.5.3))(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
     dependencies:
-      '@vue/devtools-api': 6.6.3
-      vue: 3.4.31(typescript@5.5.3)
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      '@shikijs/transformers': 2.3.2
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/highlighter-helper': 2.0.0-rc.71(@vueuse/core@12.5.0(typescript@5.5.3))(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      nanoid: 5.0.9
+      shiki: 2.3.2
+      synckit: 0.9.2
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
     transitivePeerDependencies:
+      - '@vueuse/core'
       - typescript
 
-  '@vuepress/shared@2.0.0-rc.14':
+  '@vuepress/plugin-sitemap@2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
     dependencies:
-      '@mdit-vue/types': 2.1.0
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      sitemap: 8.0.0
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+    transitivePeerDependencies:
+      - typescript
 
-  '@vuepress/theme-default@2.0.0-rc.37(sass-loader@14.2.1(sass@1.77.8))(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
-    dependencies:
-      '@vuepress/helper': 2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vuepress/plugin-active-header-links': 2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vuepress/plugin-back-to-top': 2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vuepress/plugin-copy-code': 2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vuepress/plugin-git': 2.0.0-rc.37(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vuepress/plugin-links-check': 2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vuepress/plugin-markdown-container': 2.0.0-rc.37(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vuepress/plugin-medium-zoom': 2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vuepress/plugin-nprogress': 2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vuepress/plugin-palette': 2.0.0-rc.37(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vuepress/plugin-prismjs': 2.0.0-rc.37(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vuepress/plugin-seo': 2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vuepress/plugin-sitemap': 2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vuepress/plugin-theme-data': 2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vueuse/core': 10.11.0(vue@3.4.31(typescript@5.5.3))
-      sass: 1.77.8
-      vue: 3.4.31(typescript@5.5.3)
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
-    optionalDependencies:
-      sass-loader: 14.2.1(sass@1.77.8)
+  '@vuepress/plugin-theme-data@2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))':
+    dependencies:
+      '@vue/devtools-api': 7.7.2
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
     transitivePeerDependencies:
-      - '@vue/composition-api'
       - typescript
 
-  '@vuepress/utils@2.0.0-rc.14':
+  '@vuepress/shared@2.0.0-rc.19':
+    dependencies:
+      '@mdit-vue/types': 2.1.0
+
+  '@vuepress/utils@2.0.0-rc.19':
     dependencies:
       '@types/debug': 4.1.12
       '@types/fs-extra': 11.0.4
       '@types/hash-sum': 1.0.2
-      '@vuepress/shared': 2.0.0-rc.14
-      debug: 4.3.5
+      '@vuepress/shared': 2.0.0-rc.19
+      debug: 4.4.0
       fs-extra: 11.2.0
       globby: 14.0.2
       hash-sum: 2.0.0
-      ora: 8.0.1
-      picocolors: 1.0.1
+      ora: 8.2.0
+      picocolors: 1.1.1
       upath: 2.0.1
     transitivePeerDependencies:
       - supports-color
 
-  '@vueuse/core@10.11.0(vue@3.4.31(typescript@5.5.3))':
+  '@vueuse/core@12.5.0(typescript@5.5.3)':
     dependencies:
       '@types/web-bluetooth': 0.0.20
-      '@vueuse/metadata': 10.11.0
-      '@vueuse/shared': 10.11.0(vue@3.4.31(typescript@5.5.3))
-      vue-demi: 0.14.8(vue@3.4.31(typescript@5.5.3))
+      '@vueuse/metadata': 12.5.0
+      '@vueuse/shared': 12.5.0(typescript@5.5.3)
+      vue: 3.5.13(typescript@5.5.3)
     transitivePeerDependencies:
-      - '@vue/composition-api'
-      - vue
+      - typescript
 
-  '@vueuse/metadata@10.11.0': {}
+  '@vueuse/metadata@12.5.0': {}
 
-  '@vueuse/shared@10.11.0(vue@3.4.31(typescript@5.5.3))':
+  '@vueuse/shared@12.5.0(typescript@5.5.3)':
     dependencies:
-      vue-demi: 0.14.8(vue@3.4.31(typescript@5.5.3))
+      vue: 3.5.13(typescript@5.5.3)
     transitivePeerDependencies:
-      - '@vue/composition-api'
-      - vue
+      - typescript
 
   acorn-jsx@5.3.2(acorn@8.12.1):
     dependencies:
@@ -3448,6 +6988,11 @@ snapshots:
 
   acorn@8.12.1: {}
 
+  aggregate-error@3.1.0:
+    dependencies:
+      clean-stack: 2.2.0
+      indent-string: 4.0.0
+
   ajv@6.12.6:
     dependencies:
       fast-deep-equal: 3.1.3
@@ -3455,28 +7000,14 @@ snapshots:
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
 
-  algoliasearch@4.24.0:
-    dependencies:
-      '@algolia/cache-browser-local-storage': 4.24.0
-      '@algolia/cache-common': 4.24.0
-      '@algolia/cache-in-memory': 4.24.0
-      '@algolia/client-account': 4.24.0
-      '@algolia/client-analytics': 4.24.0
-      '@algolia/client-common': 4.24.0
-      '@algolia/client-personalization': 4.24.0
-      '@algolia/client-search': 4.24.0
-      '@algolia/logger-common': 4.24.0
-      '@algolia/logger-console': 4.24.0
-      '@algolia/recommend': 4.24.0
-      '@algolia/requester-browser-xhr': 4.24.0
-      '@algolia/requester-common': 4.24.0
-      '@algolia/requester-node-http': 4.24.0
-      '@algolia/transporter': 4.24.0
-
   ansi-regex@5.0.1: {}
 
   ansi-regex@6.0.1: {}
 
+  ansi-styles@3.2.1:
+    dependencies:
+      color-convert: 1.9.3
+
   ansi-styles@4.3.0:
     dependencies:
       color-convert: 2.0.1
@@ -3484,7 +7015,7 @@ snapshots:
   anymatch@3.1.2:
     dependencies:
       normalize-path: 3.0.0
-      picomatch: 2.3.0
+      picomatch: 2.3.1
 
   arg@5.0.2: {}
 
@@ -3544,26 +7075,58 @@ snapshots:
       is-array-buffer: 3.0.4
       is-shared-array-buffer: 1.0.3
 
-  autoprefixer@10.4.19(postcss@8.4.39):
+  atob@2.1.2: {}
+
+  autoprefixer@10.4.20(postcss@8.5.2):
     dependencies:
-      browserslist: 4.23.2
-      caniuse-lite: 1.0.30001641
+      browserslist: 4.23.3
+      caniuse-lite: 1.0.30001651
       fraction.js: 4.3.7
       normalize-range: 0.1.2
       picocolors: 1.0.1
-      postcss: 8.4.39
+      postcss: 8.5.2
       postcss-value-parser: 4.2.0
 
   available-typed-arrays@1.0.7:
     dependencies:
       possible-typed-array-names: 1.0.0
 
+  babel-plugin-polyfill-corejs2@0.4.11(@babel/core@7.25.2):
+    dependencies:
+      '@babel/compat-data': 7.25.2
+      '@babel/core': 7.25.2
+      '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.25.2)
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-plugin-polyfill-corejs3@0.10.6(@babel/core@7.25.2):
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.25.2)
+      core-js-compat: 3.38.0
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-plugin-polyfill-regenerator@0.6.2(@babel/core@7.25.2):
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.25.2)
+    transitivePeerDependencies:
+      - supports-color
+
   balanced-match@1.0.2: {}
 
   balloon-css@1.2.0: {}
 
+  bcrypt-ts@5.0.3: {}
+
   binary-extensions@2.2.0: {}
 
+  birpc@0.2.17: {}
+
+  birpc@0.2.19: {}
+
   boolbase@1.0.0: {}
 
   brace-expansion@1.1.11:
@@ -3575,9 +7138,9 @@ snapshots:
     dependencies:
       balanced-match: 1.0.2
 
-  braces@3.0.2:
+  braces@3.0.3:
     dependencies:
-      fill-range: 7.0.1
+      fill-range: 7.1.1
 
   browserslist@4.23.2:
     dependencies:
@@ -3586,12 +7149,23 @@ snapshots:
       node-releases: 2.0.14
       update-browserslist-db: 1.1.0(browserslist@4.23.2)
 
+  browserslist@4.23.3:
+    dependencies:
+      caniuse-lite: 1.0.30001651
+      electron-to-chromium: 1.5.9
+      node-releases: 2.0.18
+      update-browserslist-db: 1.1.0(browserslist@4.23.3)
+
   builtin-modules@3.3.0: {}
 
   builtins@5.1.0:
     dependencies:
       semver: 7.6.2
 
+  bundle-name@4.1.0:
+    dependencies:
+      run-applescript: 7.0.0
+
   cac@6.7.14: {}
 
   call-bind@1.0.7:
@@ -3604,8 +7178,22 @@ snapshots:
 
   callsites@3.1.0: {}
 
+  camelcase@5.3.1: {}
+
+  camelcase@6.3.0: {}
+
   caniuse-lite@1.0.30001641: {}
 
+  caniuse-lite@1.0.30001651: {}
+
+  ccount@2.0.1: {}
+
+  chalk@2.4.2:
+    dependencies:
+      ansi-styles: 3.2.1
+      escape-string-regexp: 1.0.5
+      supports-color: 5.5.0
+
   chalk@4.1.2:
     dependencies:
       ansi-styles: 4.3.0
@@ -3613,6 +7201,10 @@ snapshots:
 
   chalk@5.3.0: {}
 
+  character-entities-html4@2.1.0: {}
+
+  character-entities-legacy@3.0.0: {}
+
   cheerio-select@2.1.0:
     dependencies:
       boolbase: 1.0.0
@@ -3622,20 +7214,38 @@ snapshots:
       domhandler: 5.0.3
       domutils: 3.1.0
 
-  cheerio@1.0.0-rc.12:
+  cheerio@1.0.0:
     dependencies:
       cheerio-select: 2.1.0
       dom-serializer: 2.0.0
       domhandler: 5.0.3
       domutils: 3.1.0
-      htmlparser2: 8.0.2
+      encoding-sniffer: 0.2.0
+      htmlparser2: 9.1.0
       parse5: 7.1.2
       parse5-htmlparser2-tree-adapter: 7.0.0
+      parse5-parser-stream: 7.1.2
+      undici: 6.21.1
+      whatwg-mimetype: 4.0.0
+
+  chevrotain-allstar@0.3.1(chevrotain@11.0.3):
+    dependencies:
+      chevrotain: 11.0.3
+      lodash-es: 4.17.21
+
+  chevrotain@11.0.3:
+    dependencies:
+      '@chevrotain/cst-dts-gen': 11.0.3
+      '@chevrotain/gast': 11.0.3
+      '@chevrotain/regexp-to-ast': 11.0.3
+      '@chevrotain/types': 11.0.3
+      '@chevrotain/utils': 11.0.3
+      lodash-es: 4.17.21
 
   chokidar@3.6.0:
     dependencies:
       anymatch: 3.1.2
-      braces: 3.0.2
+      braces: 3.0.3
       glob-parent: 5.1.2
       is-binary-path: 2.1.0
       is-glob: 4.0.3
@@ -3644,23 +7254,73 @@ snapshots:
     optionalDependencies:
       fsevents: 2.3.3
 
-  cli-cursor@4.0.0:
+  chokidar@4.0.3:
     dependencies:
-      restore-cursor: 4.0.0
+      readdirp: 4.1.1
+
+  clean-stack@2.2.0: {}
+
+  cli-cursor@5.0.0:
+    dependencies:
+      restore-cursor: 5.1.0
 
   cli-spinners@2.9.2: {}
 
+  cliui@6.0.0:
+    dependencies:
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      wrap-ansi: 6.2.0
+
+  color-convert@1.9.3:
+    dependencies:
+      color-name: 1.1.3
+
   color-convert@2.0.1:
     dependencies:
       color-name: 1.1.4
 
+  color-name@1.1.3: {}
+
   color-name@1.1.4: {}
 
+  comma-separated-tokens@2.0.3: {}
+
+  commander@13.1.0: {}
+
+  commander@6.2.1: {}
+
+  commander@7.2.0: {}
+
+  commander@8.3.0: {}
+
   concat-map@0.0.1: {}
 
+  confbox@0.1.8: {}
+
   connect-history-api-fallback@2.0.0: {}
 
-  cross-spawn@7.0.3:
+  convert-source-map@2.0.0: {}
+
+  copy-anything@3.0.5:
+    dependencies:
+      is-what: 4.1.16
+
+  core-js-compat@3.38.0:
+    dependencies:
+      browserslist: 4.23.3
+
+  cose-base@1.0.3:
+    dependencies:
+      layout-base: 1.0.2
+
+  cose-base@2.2.0:
+    dependencies:
+      layout-base: 2.0.1
+
+  create-codepen@2.0.0: {}
+
+  cross-spawn@7.0.6:
     dependencies:
       path-key: 3.1.1
       shebang-command: 2.0.0
@@ -3676,10 +7336,200 @@ snapshots:
 
   css-what@6.1.0: {}
 
+  css@3.0.0:
+    dependencies:
+      inherits: 2.0.4
+      source-map: 0.6.1
+      source-map-resolve: 0.6.0
+
   cssesc@3.0.0: {}
 
   csstype@3.1.3: {}
 
+  cytoscape-cose-bilkent@4.1.0(cytoscape@3.30.3):
+    dependencies:
+      cose-base: 1.0.3
+      cytoscape: 3.30.3
+
+  cytoscape-fcose@2.2.0(cytoscape@3.30.3):
+    dependencies:
+      cose-base: 2.2.0
+      cytoscape: 3.30.3
+
+  cytoscape@3.30.3: {}
+
+  d3-array@2.12.1:
+    dependencies:
+      internmap: 1.0.1
+
+  d3-array@3.2.4:
+    dependencies:
+      internmap: 2.0.3
+
+  d3-axis@3.0.0: {}
+
+  d3-brush@3.0.0:
+    dependencies:
+      d3-dispatch: 3.0.1
+      d3-drag: 3.0.0
+      d3-interpolate: 3.0.1
+      d3-selection: 3.0.0
+      d3-transition: 3.0.1(d3-selection@3.0.0)
+
+  d3-chord@3.0.1:
+    dependencies:
+      d3-path: 3.1.0
+
+  d3-color@3.1.0: {}
+
+  d3-contour@4.0.2:
+    dependencies:
+      d3-array: 3.2.4
+
+  d3-delaunay@6.0.4:
+    dependencies:
+      delaunator: 5.0.1
+
+  d3-dispatch@3.0.1: {}
+
+  d3-drag@3.0.0:
+    dependencies:
+      d3-dispatch: 3.0.1
+      d3-selection: 3.0.0
+
+  d3-dsv@3.0.1:
+    dependencies:
+      commander: 7.2.0
+      iconv-lite: 0.6.3
+      rw: 1.3.3
+
+  d3-ease@3.0.1: {}
+
+  d3-fetch@3.0.1:
+    dependencies:
+      d3-dsv: 3.0.1
+
+  d3-force@3.0.0:
+    dependencies:
+      d3-dispatch: 3.0.1
+      d3-quadtree: 3.0.1
+      d3-timer: 3.0.1
+
+  d3-format@3.1.0: {}
+
+  d3-geo@3.1.1:
+    dependencies:
+      d3-array: 3.2.4
+
+  d3-hierarchy@3.1.2: {}
+
+  d3-interpolate@3.0.1:
+    dependencies:
+      d3-color: 3.1.0
+
+  d3-path@1.0.9: {}
+
+  d3-path@3.1.0: {}
+
+  d3-polygon@3.0.1: {}
+
+  d3-quadtree@3.0.1: {}
+
+  d3-random@3.0.1: {}
+
+  d3-sankey@0.12.3:
+    dependencies:
+      d3-array: 2.12.1
+      d3-shape: 1.3.7
+
+  d3-scale-chromatic@3.1.0:
+    dependencies:
+      d3-color: 3.1.0
+      d3-interpolate: 3.0.1
+
+  d3-scale@4.0.2:
+    dependencies:
+      d3-array: 3.2.4
+      d3-format: 3.1.0
+      d3-interpolate: 3.0.1
+      d3-time: 3.1.0
+      d3-time-format: 4.1.0
+
+  d3-selection@3.0.0: {}
+
+  d3-shape@1.3.7:
+    dependencies:
+      d3-path: 1.0.9
+
+  d3-shape@3.2.0:
+    dependencies:
+      d3-path: 3.1.0
+
+  d3-time-format@4.1.0:
+    dependencies:
+      d3-time: 3.1.0
+
+  d3-time@3.1.0:
+    dependencies:
+      d3-array: 3.2.4
+
+  d3-timer@3.0.1: {}
+
+  d3-transition@3.0.1(d3-selection@3.0.0):
+    dependencies:
+      d3-color: 3.1.0
+      d3-dispatch: 3.0.1
+      d3-ease: 3.0.1
+      d3-interpolate: 3.0.1
+      d3-selection: 3.0.0
+      d3-timer: 3.0.1
+
+  d3-zoom@3.0.0:
+    dependencies:
+      d3-dispatch: 3.0.1
+      d3-drag: 3.0.0
+      d3-interpolate: 3.0.1
+      d3-selection: 3.0.0
+      d3-transition: 3.0.1(d3-selection@3.0.0)
+
+  d3@7.9.0:
+    dependencies:
+      d3-array: 3.2.4
+      d3-axis: 3.0.0
+      d3-brush: 3.0.0
+      d3-chord: 3.0.1
+      d3-color: 3.1.0
+      d3-contour: 4.0.2
+      d3-delaunay: 6.0.4
+      d3-dispatch: 3.0.1
+      d3-drag: 3.0.0
+      d3-dsv: 3.0.1
+      d3-ease: 3.0.1
+      d3-fetch: 3.0.1
+      d3-force: 3.0.0
+      d3-format: 3.1.0
+      d3-geo: 3.1.1
+      d3-hierarchy: 3.1.2
+      d3-interpolate: 3.0.1
+      d3-path: 3.1.0
+      d3-polygon: 3.0.1
+      d3-quadtree: 3.0.1
+      d3-random: 3.0.1
+      d3-scale: 4.0.2
+      d3-scale-chromatic: 3.1.0
+      d3-selection: 3.0.0
+      d3-shape: 3.2.0
+      d3-time: 3.1.0
+      d3-time-format: 4.1.0
+      d3-timer: 3.0.1
+      d3-transition: 3.0.1(d3-selection@3.0.0)
+      d3-zoom: 3.0.0
+
+  dagre-d3-es@7.0.10:
+    dependencies:
+      d3: 7.9.0
+      lodash-es: 4.17.21
+
   data-view-buffer@1.0.1:
     dependencies:
       call-bind: 1.0.7
@@ -3698,7 +7548,9 @@ snapshots:
       es-errors: 1.3.0
       is-data-view: 1.0.1
 
-  dayjs@1.11.11: {}
+  dayjs@1.11.12: {}
+
+  dayjs@1.11.13: {}
 
   debug@3.2.7:
     dependencies:
@@ -3708,20 +7560,69 @@ snapshots:
     dependencies:
       ms: 2.1.2
 
+  debug@4.3.7:
+    dependencies:
+      ms: 2.1.3
+
+  debug@4.4.0:
+    dependencies:
+      ms: 2.1.3
+
+  decamelize@1.2.0: {}
+
+  decode-uri-component@0.2.2: {}
+
   deep-is@0.1.4: {}
 
+  default-browser-id@5.0.0: {}
+
+  default-browser@5.2.1:
+    dependencies:
+      bundle-name: 4.1.0
+      default-browser-id: 5.0.0
+
   define-data-property@1.1.4:
     dependencies:
       es-define-property: 1.0.0
       es-errors: 1.3.0
       gopd: 1.0.1
 
+  define-lazy-prop@3.0.0: {}
+
   define-properties@1.2.1:
     dependencies:
       define-data-property: 1.1.4
       has-property-descriptors: 1.0.2
       object-keys: 1.1.1
 
+  degit@2.8.4: {}
+
+  del@5.1.0:
+    dependencies:
+      globby: 10.0.2
+      graceful-fs: 4.2.11
+      is-glob: 4.0.3
+      is-path-cwd: 2.2.0
+      is-path-inside: 3.0.3
+      p-map: 3.0.0
+      rimraf: 3.0.2
+      slash: 3.0.0
+
+  delaunator@5.0.1:
+    dependencies:
+      robust-predicates: 3.0.2
+
+  dequal@2.0.3: {}
+
+  detect-libc@1.0.3:
+    optional: true
+
+  devlop@1.1.0:
+    dependencies:
+      dequal: 2.0.3
+
+  dijkstrajs@1.0.3: {}
+
   dir-glob@3.0.1:
     dependencies:
       path-type: 4.0.0
@@ -3746,19 +7647,36 @@ snapshots:
     dependencies:
       domelementtype: 2.3.0
 
+  dompurify@3.1.6: {}
+
   domutils@3.1.0:
     dependencies:
       dom-serializer: 2.0.0
       domelementtype: 2.3.0
       domhandler: 5.0.3
 
+  dotenv@10.0.0: {}
+
   electron-to-chromium@1.4.825: {}
 
+  electron-to-chromium@1.5.9: {}
+
+  emoji-regex-xs@1.0.0: {}
+
   emoji-regex@10.3.0: {}
 
+  emoji-regex@8.0.0: {}
+
+  encoding-sniffer@0.2.0:
+    dependencies:
+      iconv-lite: 0.6.3
+      whatwg-encoding: 3.1.1
+
   entities@4.5.0: {}
 
-  envinfo@7.13.0: {}
+  envinfo@7.14.0: {}
+
+  error-stack-parser-es@0.1.5: {}
 
   es-abstract@1.23.3:
     dependencies:
@@ -3861,8 +7779,38 @@ snapshots:
       '@esbuild/win32-ia32': 0.21.5
       '@esbuild/win32-x64': 0.21.5
 
+  esbuild@0.24.2:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.24.2
+      '@esbuild/android-arm': 0.24.2
+      '@esbuild/android-arm64': 0.24.2
+      '@esbuild/android-x64': 0.24.2
+      '@esbuild/darwin-arm64': 0.24.2
+      '@esbuild/darwin-x64': 0.24.2
+      '@esbuild/freebsd-arm64': 0.24.2
+      '@esbuild/freebsd-x64': 0.24.2
+      '@esbuild/linux-arm': 0.24.2
+      '@esbuild/linux-arm64': 0.24.2
+      '@esbuild/linux-ia32': 0.24.2
+      '@esbuild/linux-loong64': 0.24.2
+      '@esbuild/linux-mips64el': 0.24.2
+      '@esbuild/linux-ppc64': 0.24.2
+      '@esbuild/linux-riscv64': 0.24.2
+      '@esbuild/linux-s390x': 0.24.2
+      '@esbuild/linux-x64': 0.24.2
+      '@esbuild/netbsd-arm64': 0.24.2
+      '@esbuild/netbsd-x64': 0.24.2
+      '@esbuild/openbsd-arm64': 0.24.2
+      '@esbuild/openbsd-x64': 0.24.2
+      '@esbuild/sunos-x64': 0.24.2
+      '@esbuild/win32-arm64': 0.24.2
+      '@esbuild/win32-ia32': 0.24.2
+      '@esbuild/win32-x64': 0.24.2
+
   escalade@3.1.2: {}
 
+  escape-string-regexp@1.0.5: {}
+
   escape-string-regexp@4.0.0: {}
 
   eslint-compat-utils@0.5.1(eslint@8.57.0):
@@ -4016,7 +7964,7 @@ snapshots:
       '@ungap/structured-clone': 1.2.0
       ajv: 6.12.6
       chalk: 4.1.2
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       debug: 4.3.5
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
@@ -4069,16 +8017,28 @@ snapshots:
 
   esutils@2.0.3: {}
 
-  execa@9.3.0:
+  execa@8.0.1:
+    dependencies:
+      cross-spawn: 7.0.6
+      get-stream: 8.0.1
+      human-signals: 5.0.0
+      is-stream: 3.0.0
+      merge-stream: 2.0.0
+      npm-run-path: 5.3.0
+      onetime: 6.0.0
+      signal-exit: 4.1.0
+      strip-final-newline: 3.0.0
+
+  execa@9.5.2:
     dependencies:
       '@sindresorhus/merge-streams': 4.0.0
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       figures: 6.1.0
       get-stream: 9.0.1
-      human-signals: 7.0.0
+      human-signals: 8.0.0
       is-plain-obj: 4.1.0
       is-stream: 4.0.1
-      npm-run-path: 5.3.0
+      npm-run-path: 6.0.0
       pretty-ms: 9.0.0
       signal-exit: 4.1.0
       strip-final-newline: 4.0.0
@@ -4096,7 +8056,7 @@ snapshots:
       '@nodelib/fs.walk': 1.2.8
       glob-parent: 5.1.2
       merge2: 1.4.1
-      micromatch: 4.0.4
+      micromatch: 4.0.8
 
   fast-json-stable-stringify@2.1.0: {}
 
@@ -4116,10 +8076,15 @@ snapshots:
     dependencies:
       flat-cache: 3.2.0
 
-  fill-range@7.0.1:
+  fill-range@7.1.1:
     dependencies:
       to-regex-range: 5.0.1
 
+  find-up@4.1.0:
+    dependencies:
+      locate-path: 5.0.0
+      path-exists: 4.0.0
+
   find-up@5.0.0:
     dependencies:
       locate-path: 6.0.0
@@ -4145,6 +8110,8 @@ snapshots:
       jsonfile: 6.1.0
       universalify: 2.0.0
 
+  fs-readdir-recursive@1.1.0: {}
+
   fs.realpath@1.0.0: {}
 
   fsevents@2.3.3:
@@ -4161,6 +8128,10 @@ snapshots:
 
   functions-have-names@1.2.3: {}
 
+  gensync@1.0.0-beta.2: {}
+
+  get-caller-file@2.0.5: {}
+
   get-east-asian-width@1.2.0: {}
 
   get-intrinsic@1.2.4:
@@ -4171,6 +8142,8 @@ snapshots:
       has-symbols: 1.0.3
       hasown: 2.0.2
 
+  get-stream@8.0.1: {}
+
   get-stream@9.0.1:
     dependencies:
       '@sec-ant/readable-stream': 0.4.1
@@ -4186,6 +8159,10 @@ snapshots:
     dependencies:
       resolve-pkg-maps: 1.0.0
 
+  giscus@1.6.0:
+    dependencies:
+      lit: 3.2.1
+
   glob-parent@5.1.2:
     dependencies:
       is-glob: 4.0.3
@@ -4203,6 +8180,8 @@ snapshots:
       once: 1.4.0
       path-is-absolute: 1.0.1
 
+  globals@11.12.0: {}
+
   globals@13.24.0:
     dependencies:
       type-fest: 0.20.2
@@ -4212,6 +8191,17 @@ snapshots:
       define-properties: 1.2.1
       gopd: 1.0.1
 
+  globby@10.0.2:
+    dependencies:
+      '@types/glob': 7.2.0
+      array-union: 2.1.0
+      dir-glob: 3.0.1
+      fast-glob: 3.3.2
+      glob: 7.2.3
+      ignore: 5.3.1
+      merge2: 1.4.1
+      slash: 3.0.0
+
   globby@11.1.0:
     dependencies:
       array-union: 2.1.0
@@ -4245,8 +8235,12 @@ snapshots:
       section-matter: 1.0.0
       strip-bom-string: 1.0.0
 
+  hachure-fill@0.5.2: {}
+
   has-bigints@1.0.2: {}
 
+  has-flag@3.0.0: {}
+
   has-flag@4.0.0: {}
 
   has-property-descriptors@1.0.2:
@@ -4267,18 +8261,52 @@ snapshots:
     dependencies:
       function-bind: 1.1.2
 
-  htmlparser2@8.0.2:
+  hast-util-to-html@9.0.4:
+    dependencies:
+      '@types/hast': 3.0.4
+      '@types/unist': 3.0.3
+      ccount: 2.0.1
+      comma-separated-tokens: 2.0.3
+      hast-util-whitespace: 3.0.0
+      html-void-elements: 3.0.0
+      mdast-util-to-hast: 13.2.0
+      property-information: 6.5.0
+      space-separated-tokens: 2.0.2
+      stringify-entities: 4.0.4
+      zwitch: 2.0.4
+
+  hast-util-whitespace@3.0.0:
+    dependencies:
+      '@types/hast': 3.0.4
+
+  hookable@5.5.3: {}
+
+  html-tags@3.3.1: {}
+
+  html-void-elements@3.0.0: {}
+
+  htmlparser2@9.1.0:
     dependencies:
       domelementtype: 2.3.0
       domhandler: 5.0.3
       domutils: 3.1.0
       entities: 4.5.0
 
-  human-signals@7.0.0: {}
+  human-signals@5.0.0: {}
+
+  human-signals@8.0.0: {}
+
+  iconify-icon@2.1.0:
+    dependencies:
+      '@iconify/types': 2.0.0
+
+  iconv-lite@0.6.3:
+    dependencies:
+      safer-buffer: 2.1.2
 
   ignore@5.3.1: {}
 
-  immutable@4.0.0: {}
+  immutable@5.0.3: {}
 
   import-fresh@3.3.0:
     dependencies:
@@ -4287,6 +8315,8 @@ snapshots:
 
   imurmurhash@0.1.4: {}
 
+  indent-string@4.0.0: {}
+
   inflight@1.0.6:
     dependencies:
       once: 1.4.0
@@ -4300,6 +8330,12 @@ snapshots:
       hasown: 2.0.2
       side-channel: 1.0.6
 
+  internmap@1.0.1: {}
+
+  internmap@2.0.3: {}
+
+  interpret@1.4.0: {}
+
   is-array-buffer@3.0.4:
     dependencies:
       call-bind: 1.0.7
@@ -4336,14 +8372,22 @@ snapshots:
     dependencies:
       has-tostringtag: 1.0.2
 
+  is-docker@3.0.0: {}
+
   is-extendable@0.1.1: {}
 
   is-extglob@2.1.1: {}
 
+  is-fullwidth-code-point@3.0.0: {}
+
   is-glob@4.0.3:
     dependencies:
       is-extglob: 2.1.1
 
+  is-inside-container@1.0.0:
+    dependencies:
+      is-docker: 3.0.0
+
   is-interactive@2.0.0: {}
 
   is-negative-zero@2.0.3: {}
@@ -4354,6 +8398,8 @@ snapshots:
 
   is-number@7.0.0: {}
 
+  is-path-cwd@2.2.0: {}
+
   is-path-inside@3.0.3: {}
 
   is-plain-obj@4.1.0: {}
@@ -4367,6 +8413,8 @@ snapshots:
     dependencies:
       call-bind: 1.0.7
 
+  is-stream@3.0.0: {}
+
   is-stream@4.0.1: {}
 
   is-string@1.0.7:
@@ -4389,10 +8437,18 @@ snapshots:
     dependencies:
       call-bind: 1.0.7
 
+  is-what@4.1.16: {}
+
+  is-wsl@3.1.0:
+    dependencies:
+      is-inside-container: 1.0.0
+
   isarray@2.0.5: {}
 
   isexe@2.0.0: {}
 
+  js-tokens@4.0.0: {}
+
   js-yaml@3.14.1:
     dependencies:
       argparse: 1.0.10
@@ -4402,6 +8458,10 @@ snapshots:
     dependencies:
       argparse: 2.0.1
 
+  jsesc@0.5.0: {}
+
+  jsesc@2.5.2: {}
+
   json-buffer@3.0.1: {}
 
   json-schema-traverse@0.4.1: {}
@@ -4412,33 +8472,84 @@ snapshots:
     dependencies:
       minimist: 1.2.8
 
+  json5@2.2.3: {}
+
   jsonfile@6.1.0:
     dependencies:
       universalify: 2.0.0
     optionalDependencies:
       graceful-fs: 4.2.11
 
+  katex@0.16.11:
+    dependencies:
+      commander: 8.3.0
+
   keyv@4.5.4:
     dependencies:
       json-buffer: 3.0.1
 
-  kind-of@6.0.3: {}
+  khroma@2.1.0: {}
+
+  kind-of@6.0.3: {}
+
+  kolorist@1.8.0: {}
+
+  langium@3.0.0:
+    dependencies:
+      chevrotain: 11.0.3
+      chevrotain-allstar: 0.3.1(chevrotain@11.0.3)
+      vscode-languageserver: 9.0.1
+      vscode-languageserver-textdocument: 1.0.12
+      vscode-uri: 3.0.8
+
+  layout-base@1.0.2: {}
+
+  layout-base@2.0.1: {}
+
+  levn@0.4.1:
+    dependencies:
+      prelude-ls: 1.2.1
+      type-check: 0.4.0
+
+  lilconfig@3.1.2: {}
+
+  linkify-it@5.0.0:
+    dependencies:
+      uc.micro: 2.1.0
+
+  lit-element@4.1.0:
+    dependencies:
+      '@lit-labs/ssr-dom-shim': 1.2.1
+      '@lit/reactive-element': 2.0.4
+      lit-html: 3.2.0
+
+  lit-html@3.2.0:
+    dependencies:
+      '@types/trusted-types': 2.0.7
 
-  levn@0.4.1:
+  lit@3.2.1:
     dependencies:
-      prelude-ls: 1.2.1
-      type-check: 0.4.0
+      '@lit/reactive-element': 2.0.4
+      lit-element: 4.1.0
+      lit-html: 3.2.0
 
-  lilconfig@3.1.2: {}
+  local-pkg@0.5.0:
+    dependencies:
+      mlly: 1.7.2
+      pkg-types: 1.2.1
 
-  linkify-it@5.0.0:
+  locate-path@5.0.0:
     dependencies:
-      uc.micro: 2.1.0
+      p-locate: 4.1.0
 
   locate-path@6.0.0:
     dependencies:
       p-locate: 5.0.0
 
+  lodash-es@4.17.21: {}
+
+  lodash.debounce@4.0.8: {}
+
   lodash.merge@4.6.2: {}
 
   lodash@4.17.21: {}
@@ -4448,17 +8559,28 @@ snapshots:
       chalk: 5.3.0
       is-unicode-supported: 1.3.0
 
+  lru-cache@5.1.1:
+    dependencies:
+      yallist: 3.1.1
+
   magic-string@0.30.10:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.0
 
-  markdown-it-anchor@9.0.1(@types/markdown-it@14.1.2)(markdown-it@14.1.0):
+  magic-string@0.30.17:
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.0
+
+  make-dir@2.1.0:
+    dependencies:
+      pify: 4.0.1
+      semver: 5.7.2
+
+  markdown-it-anchor@9.2.0(@types/markdown-it@14.1.2)(markdown-it@14.1.0):
     dependencies:
       '@types/markdown-it': 14.1.2
       markdown-it: 14.1.0
 
-  markdown-it-container@4.0.0: {}
-
   markdown-it-emoji@3.0.0: {}
 
   markdown-it@14.1.0:
@@ -4470,18 +8592,75 @@ snapshots:
       punycode.js: 2.3.1
       uc.micro: 2.1.0
 
+  marked@13.0.3: {}
+
+  mdast-util-to-hast@13.2.0:
+    dependencies:
+      '@types/hast': 3.0.4
+      '@types/mdast': 4.0.4
+      '@ungap/structured-clone': 1.2.0
+      devlop: 1.1.0
+      micromark-util-sanitize-uri: 2.0.1
+      trim-lines: 3.0.1
+      unist-util-position: 5.0.0
+      unist-util-visit: 5.0.0
+      vfile: 6.0.3
+
   mdurl@2.0.0: {}
 
-  medium-zoom@1.1.0: {}
+  merge-stream@2.0.0: {}
 
   merge2@1.4.1: {}
 
-  micromatch@4.0.4:
+  mermaid@11.3.0:
+    dependencies:
+      '@braintree/sanitize-url': 7.1.0
+      '@iconify/utils': 2.1.33
+      '@mermaid-js/parser': 0.3.0
+      cytoscape: 3.30.3
+      cytoscape-cose-bilkent: 4.1.0(cytoscape@3.30.3)
+      cytoscape-fcose: 2.2.0(cytoscape@3.30.3)
+      d3: 7.9.0
+      d3-sankey: 0.12.3
+      dagre-d3-es: 7.0.10
+      dayjs: 1.11.12
+      dompurify: 3.1.6
+      katex: 0.16.11
+      khroma: 2.1.0
+      lodash-es: 4.17.21
+      marked: 13.0.3
+      roughjs: 4.6.6
+      stylis: 4.3.4
+      ts-dedent: 2.2.0
+      uuid: 9.0.1
+    transitivePeerDependencies:
+      - supports-color
+
+  micromark-util-character@2.1.1:
+    dependencies:
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.1
+
+  micromark-util-encode@2.0.1: {}
+
+  micromark-util-sanitize-uri@2.0.1:
+    dependencies:
+      micromark-util-character: 2.1.1
+      micromark-util-encode: 2.0.1
+      micromark-util-symbol: 2.0.1
+
+  micromark-util-symbol@2.0.1: {}
+
+  micromark-util-types@2.0.1: {}
+
+  micromatch@4.0.8:
     dependencies:
-      braces: 3.0.2
-      picomatch: 2.3.0
+      braces: 3.0.3
+      picomatch: 2.3.1
+
+  mimic-fn@4.0.0: {}
 
-  mimic-fn@2.1.0: {}
+  mimic-function@5.0.1: {}
 
   minimatch@3.1.2:
     dependencies:
@@ -4493,16 +8672,38 @@ snapshots:
 
   minimist@1.2.8: {}
 
+  mitt@3.0.1: {}
+
+  mlly@1.7.2:
+    dependencies:
+      acorn: 8.12.1
+      pathe: 1.1.2
+      pkg-types: 1.2.1
+      ufo: 1.5.4
+
+  mrmime@2.0.0: {}
+
   ms@2.1.2: {}
 
+  ms@2.1.3: {}
+
   nanoid@3.3.7: {}
 
+  nanoid@3.3.8: {}
+
+  nanoid@5.0.9: {}
+
   natural-compare@1.4.0: {}
 
   neo-async@2.6.2: {}
 
+  node-addon-api@7.1.1:
+    optional: true
+
   node-releases@2.0.14: {}
 
+  node-releases@2.0.18: {}
+
   normalize-path@3.0.0: {}
 
   normalize-range@0.1.2: {}
@@ -4511,6 +8712,11 @@ snapshots:
     dependencies:
       path-key: 4.0.0
 
+  npm-run-path@6.0.0:
+    dependencies:
+      path-key: 4.0.0
+      unicorn-magic: 0.3.0
+
   nth-check@2.1.1:
     dependencies:
       boolbase: 1.0.0
@@ -4549,9 +8755,26 @@ snapshots:
     dependencies:
       wrappy: 1.0.2
 
-  onetime@5.1.2:
+  onetime@6.0.0:
     dependencies:
-      mimic-fn: 2.1.0
+      mimic-fn: 4.0.0
+
+  onetime@7.0.0:
+    dependencies:
+      mimic-function: 5.0.1
+
+  oniguruma-to-es@3.1.0:
+    dependencies:
+      emoji-regex-xs: 1.0.0
+      regex: 6.0.1
+      regex-recursion: 6.0.2
+
+  open@10.1.0:
+    dependencies:
+      default-browser: 5.2.1
+      define-lazy-prop: 3.0.0
+      is-inside-container: 1.0.0
+      is-wsl: 3.1.0
 
   optionator@0.9.4:
     dependencies:
@@ -4562,10 +8785,10 @@ snapshots:
       type-check: 0.4.0
       word-wrap: 1.2.5
 
-  ora@8.0.1:
+  ora@8.2.0:
     dependencies:
       chalk: 5.3.0
-      cli-cursor: 4.0.0
+      cli-cursor: 5.0.0
       cli-spinners: 2.9.2
       is-interactive: 2.0.0
       is-unicode-supported: 2.0.0
@@ -4574,14 +8797,30 @@ snapshots:
       string-width: 7.2.0
       strip-ansi: 7.1.0
 
+  p-limit@2.3.0:
+    dependencies:
+      p-try: 2.2.0
+
   p-limit@3.1.0:
     dependencies:
       yocto-queue: 0.1.0
 
+  p-locate@4.1.0:
+    dependencies:
+      p-limit: 2.3.0
+
   p-locate@5.0.0:
     dependencies:
       p-limit: 3.1.0
 
+  p-map@3.0.0:
+    dependencies:
+      aggregate-error: 3.1.0
+
+  p-try@2.2.0: {}
+
+  package-manager-detector@0.2.2: {}
+
   parent-module@1.0.1:
     dependencies:
       callsites: 3.1.0
@@ -4593,10 +8832,16 @@ snapshots:
       domhandler: 5.0.3
       parse5: 7.1.2
 
+  parse5-parser-stream@7.1.2:
+    dependencies:
+      parse5: 7.1.2
+
   parse5@7.1.2:
     dependencies:
       entities: 4.5.0
 
+  path-data-parser@0.1.0: {}
+
   path-exists@4.0.0: {}
 
   path-is-absolute@1.0.1: {}
@@ -4611,17 +8856,42 @@ snapshots:
 
   path-type@5.0.0: {}
 
+  pathe@1.1.2: {}
+
+  perfect-debounce@1.0.0: {}
+
+  photoswipe@5.4.4: {}
+
   picocolors@1.0.1: {}
 
-  picomatch@2.3.0: {}
+  picocolors@1.1.1: {}
+
+  picomatch@2.3.1: {}
+
+  pify@4.0.1: {}
+
+  pkg-types@1.2.1:
+    dependencies:
+      confbox: 0.1.8
+      mlly: 1.7.2
+      pathe: 1.1.2
+
+  pngjs@5.0.0: {}
+
+  points-on-curve@0.2.0: {}
+
+  points-on-path@0.2.1:
+    dependencies:
+      path-data-parser: 0.1.0
+      points-on-curve: 0.2.0
 
   possible-typed-array-names@1.0.0: {}
 
-  postcss-load-config@6.0.1(postcss@8.4.39):
+  postcss-load-config@6.0.1(postcss@8.5.2):
     dependencies:
       lilconfig: 3.1.2
     optionalDependencies:
-      postcss: 8.4.39
+      postcss: 8.5.2
 
   postcss-selector-parser@6.1.1:
     dependencies:
@@ -4630,31 +8900,71 @@ snapshots:
 
   postcss-value-parser@4.2.0: {}
 
-  postcss@8.4.39:
+  postcss@8.4.41:
     dependencies:
       nanoid: 3.3.7
       picocolors: 1.0.1
-      source-map-js: 1.2.0
+      source-map-js: 1.2.1
 
-  preact@10.22.1: {}
+  postcss@8.5.2:
+    dependencies:
+      nanoid: 3.3.8
+      picocolors: 1.1.1
+      source-map-js: 1.2.1
 
   prelude-ls@1.2.1: {}
 
+  prettier@2.3.2: {}
+
   pretty-ms@9.0.0:
     dependencies:
       parse-ms: 4.0.0
 
-  prismjs@1.29.0: {}
+  property-information@6.5.0: {}
 
   punycode.js@2.3.1: {}
 
   punycode@2.3.1: {}
 
+  qrcode@1.5.4:
+    dependencies:
+      dijkstrajs: 1.0.3
+      pngjs: 5.0.0
+      yargs: 15.4.1
+
   queue-microtask@1.2.3: {}
 
   readdirp@3.6.0:
     dependencies:
-      picomatch: 2.3.0
+      picomatch: 2.3.1
+
+  readdirp@4.1.1: {}
+
+  rechoir@0.6.2:
+    dependencies:
+      resolve: 1.22.8
+
+  regenerate-unicode-properties@10.1.1:
+    dependencies:
+      regenerate: 1.4.2
+
+  regenerate@1.4.2: {}
+
+  regenerator-runtime@0.14.1: {}
+
+  regenerator-transform@0.15.2:
+    dependencies:
+      '@babel/runtime': 7.25.0
+
+  regex-recursion@6.0.2:
+    dependencies:
+      regex-utilities: 2.3.0
+
+  regex-utilities@2.3.0: {}
+
+  regex@6.0.1:
+    dependencies:
+      regex-utilities: 2.3.0
 
   regexp.prototype.flags@1.5.2:
     dependencies:
@@ -4663,6 +8973,23 @@ snapshots:
       es-errors: 1.3.0
       set-function-name: 2.0.2
 
+  regexpu-core@5.3.2:
+    dependencies:
+      '@babel/regjsgen': 0.8.0
+      regenerate: 1.4.2
+      regenerate-unicode-properties: 10.1.1
+      regjsparser: 0.9.1
+      unicode-match-property-ecmascript: 2.0.0
+      unicode-match-property-value-ecmascript: 2.1.0
+
+  regjsparser@0.9.1:
+    dependencies:
+      jsesc: 0.5.0
+
+  require-directory@2.1.1: {}
+
+  require-main-filename@2.0.0: {}
+
   resolve-from@4.0.0: {}
 
   resolve-pkg-maps@1.0.0: {}
@@ -4673,43 +9000,61 @@ snapshots:
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
-  restore-cursor@4.0.0:
+  restore-cursor@5.1.0:
     dependencies:
-      onetime: 5.1.2
-      signal-exit: 3.0.6
+      onetime: 7.0.0
+      signal-exit: 4.1.0
 
   reusify@1.0.4: {}
 
+  rfdc@1.4.1: {}
+
   rimraf@3.0.2:
     dependencies:
       glob: 7.2.3
 
-  rollup@4.18.1:
+  robust-predicates@3.0.2: {}
+
+  rollup@4.34.6:
     dependencies:
-      '@types/estree': 1.0.5
+      '@types/estree': 1.0.6
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.18.1
-      '@rollup/rollup-android-arm64': 4.18.1
-      '@rollup/rollup-darwin-arm64': 4.18.1
-      '@rollup/rollup-darwin-x64': 4.18.1
-      '@rollup/rollup-linux-arm-gnueabihf': 4.18.1
-      '@rollup/rollup-linux-arm-musleabihf': 4.18.1
-      '@rollup/rollup-linux-arm64-gnu': 4.18.1
-      '@rollup/rollup-linux-arm64-musl': 4.18.1
-      '@rollup/rollup-linux-powerpc64le-gnu': 4.18.1
-      '@rollup/rollup-linux-riscv64-gnu': 4.18.1
-      '@rollup/rollup-linux-s390x-gnu': 4.18.1
-      '@rollup/rollup-linux-x64-gnu': 4.18.1
-      '@rollup/rollup-linux-x64-musl': 4.18.1
-      '@rollup/rollup-win32-arm64-msvc': 4.18.1
-      '@rollup/rollup-win32-ia32-msvc': 4.18.1
-      '@rollup/rollup-win32-x64-msvc': 4.18.1
+      '@rollup/rollup-android-arm-eabi': 4.34.6
+      '@rollup/rollup-android-arm64': 4.34.6
+      '@rollup/rollup-darwin-arm64': 4.34.6
+      '@rollup/rollup-darwin-x64': 4.34.6
+      '@rollup/rollup-freebsd-arm64': 4.34.6
+      '@rollup/rollup-freebsd-x64': 4.34.6
+      '@rollup/rollup-linux-arm-gnueabihf': 4.34.6
+      '@rollup/rollup-linux-arm-musleabihf': 4.34.6
+      '@rollup/rollup-linux-arm64-gnu': 4.34.6
+      '@rollup/rollup-linux-arm64-musl': 4.34.6
+      '@rollup/rollup-linux-loongarch64-gnu': 4.34.6
+      '@rollup/rollup-linux-powerpc64le-gnu': 4.34.6
+      '@rollup/rollup-linux-riscv64-gnu': 4.34.6
+      '@rollup/rollup-linux-s390x-gnu': 4.34.6
+      '@rollup/rollup-linux-x64-gnu': 4.34.6
+      '@rollup/rollup-linux-x64-musl': 4.34.6
+      '@rollup/rollup-win32-arm64-msvc': 4.34.6
+      '@rollup/rollup-win32-ia32-msvc': 4.34.6
+      '@rollup/rollup-win32-x64-msvc': 4.34.6
       fsevents: 2.3.3
 
+  roughjs@4.6.6:
+    dependencies:
+      hachure-fill: 0.5.2
+      path-data-parser: 0.1.0
+      points-on-curve: 0.2.0
+      points-on-path: 0.2.1
+
+  run-applescript@7.0.0: {}
+
   run-parallel@1.2.0:
     dependencies:
       queue-microtask: 1.2.3
 
+  rw@1.3.3: {}
+
   safe-array-concat@1.1.2:
     dependencies:
       call-bind: 1.0.7
@@ -4723,31 +9068,39 @@ snapshots:
       es-errors: 1.3.0
       is-regex: 1.1.4
 
-  sass-loader@14.2.1(sass@1.77.8):
+  safer-buffer@2.1.2: {}
+
+  sass-loader@15.0.0(sass@1.84.0):
     dependencies:
       neo-async: 2.6.2
     optionalDependencies:
-      sass: 1.77.8
+      sass: 1.84.0
 
-  sass@1.77.8:
+  sass@1.84.0:
     dependencies:
-      chokidar: 3.6.0
-      immutable: 4.0.0
-      source-map-js: 1.2.0
+      chokidar: 4.0.3
+      immutable: 5.0.3
+      source-map-js: 1.2.1
+    optionalDependencies:
+      '@parcel/watcher': 2.5.1
 
-  sax@1.4.1: {}
+  sax@1.2.4: {}
 
-  search-insights@2.15.0: {}
+  sax@1.4.1: {}
 
   section-matter@1.0.0:
     dependencies:
       extend-shallow: 2.0.1
       kind-of: 6.0.3
 
+  semver@5.7.2: {}
+
   semver@6.3.1: {}
 
   semver@7.6.2: {}
 
+  set-blocking@2.0.0: {}
+
   set-function-length@1.2.2:
     dependencies:
       define-data-property: 1.1.4
@@ -4770,6 +9123,28 @@ snapshots:
 
   shebang-regex@3.0.0: {}
 
+  shelljs@0.8.5:
+    dependencies:
+      glob: 7.2.3
+      interpret: 1.4.0
+      rechoir: 0.6.2
+
+  shiki@2.3.2:
+    dependencies:
+      '@shikijs/core': 2.3.2
+      '@shikijs/engine-javascript': 2.3.2
+      '@shikijs/engine-oniguruma': 2.3.2
+      '@shikijs/langs': 2.3.2
+      '@shikijs/themes': 2.3.2
+      '@shikijs/types': 2.3.2
+      '@shikijs/vscode-textmate': 10.0.1
+      '@types/hast': 3.0.4
+
+  shx@0.3.3:
+    dependencies:
+      minimist: 1.2.8
+      shelljs: 0.8.5
+
   side-channel@1.0.6:
     dependencies:
       call-bind: 1.0.7
@@ -4777,10 +9152,14 @@ snapshots:
       get-intrinsic: 1.2.4
       object-inspect: 1.13.2
 
-  signal-exit@3.0.6: {}
-
   signal-exit@4.1.0: {}
 
+  sirv@2.0.4:
+    dependencies:
+      '@polka/url': 1.0.0-next.25
+      mrmime: 2.0.0
+      totalist: 3.0.1
+
   sitemap@8.0.0:
     dependencies:
       '@types/node': 17.0.45
@@ -4788,16 +9167,39 @@ snapshots:
       arg: 5.0.2
       sax: 1.4.1
 
+  slash@2.0.0: {}
+
   slash@3.0.0: {}
 
   slash@5.1.0: {}
 
   source-map-js@1.2.0: {}
 
+  source-map-js@1.2.1: {}
+
+  source-map-resolve@0.6.0:
+    dependencies:
+      atob: 2.1.2
+      decode-uri-component: 0.2.2
+
+  source-map@0.6.1: {}
+
+  source-map@0.7.4: {}
+
+  space-separated-tokens@2.0.2: {}
+
+  speakingurl@14.0.1: {}
+
   sprintf-js@1.0.3: {}
 
   stdin-discarder@0.2.2: {}
 
+  string-width@4.2.3:
+    dependencies:
+      emoji-regex: 8.0.0
+      is-fullwidth-code-point: 3.0.0
+      strip-ansi: 6.0.1
+
   string-width@7.2.0:
     dependencies:
       emoji-regex: 10.3.0
@@ -4823,6 +9225,11 @@ snapshots:
       define-properties: 1.2.1
       es-object-atoms: 1.0.0
 
+  stringify-entities@4.0.4:
+    dependencies:
+      character-entities-html4: 2.1.0
+      character-entities-legacy: 3.0.0
+
   strip-ansi@6.0.1:
     dependencies:
       ansi-regex: 5.0.1
@@ -4835,29 +9242,65 @@ snapshots:
 
   strip-bom@3.0.0: {}
 
+  strip-final-newline@3.0.0: {}
+
   strip-final-newline@4.0.0: {}
 
   strip-json-comments@3.1.1: {}
 
+  stylis@4.3.4: {}
+
+  stylus@0.56.0:
+    dependencies:
+      css: 3.0.0
+      debug: 4.3.5
+      glob: 7.2.3
+      safer-buffer: 2.1.2
+      sax: 1.2.4
+      source-map: 0.7.4
+    transitivePeerDependencies:
+      - supports-color
+
+  superjson@2.2.1:
+    dependencies:
+      copy-anything: 3.0.5
+
+  supports-color@5.5.0:
+    dependencies:
+      has-flag: 3.0.0
+
   supports-color@7.2.0:
     dependencies:
       has-flag: 4.0.0
 
   supports-preserve-symlinks-flag@1.0.0: {}
 
+  svg-tags@1.0.0: {}
+
+  synckit@0.9.2:
+    dependencies:
+      '@pkgr/core': 0.1.1
+      tslib: 2.8.1
+
   text-table@0.2.0: {}
 
+  tinyexec@0.3.1: {}
+
   to-fast-properties@2.0.0: {}
 
   to-regex-range@5.0.1:
     dependencies:
       is-number: 7.0.0
 
+  totalist@3.0.1: {}
+
+  trim-lines@3.0.1: {}
+
   ts-api-utils@1.3.0(typescript@5.5.3):
     dependencies:
       typescript: 5.5.3
 
-  ts-debounce@4.0.0: {}
+  ts-dedent@2.2.0: {}
 
   tsconfig-paths@3.15.0:
     dependencies:
@@ -4868,6 +9311,8 @@ snapshots:
 
   tsconfig-vuepress@4.5.0: {}
 
+  tslib@2.8.1: {}
+
   type-check@0.4.0:
     dependencies:
       prelude-ls: 1.2.1
@@ -4910,6 +9355,8 @@ snapshots:
 
   uc.micro@2.1.0: {}
 
+  ufo@1.5.4: {}
+
   unbox-primitive@1.0.2:
     dependencies:
       call-bind: 1.0.7
@@ -4917,8 +9364,46 @@ snapshots:
       has-symbols: 1.0.3
       which-boxed-primitive: 1.0.2
 
+  undici@6.21.1: {}
+
+  unicode-canonical-property-names-ecmascript@2.0.0: {}
+
+  unicode-match-property-ecmascript@2.0.0:
+    dependencies:
+      unicode-canonical-property-names-ecmascript: 2.0.0
+      unicode-property-aliases-ecmascript: 2.1.0
+
+  unicode-match-property-value-ecmascript@2.1.0: {}
+
+  unicode-property-aliases-ecmascript@2.1.0: {}
+
   unicorn-magic@0.1.0: {}
 
+  unicorn-magic@0.3.0: {}
+
+  unist-util-is@6.0.0:
+    dependencies:
+      '@types/unist': 3.0.3
+
+  unist-util-position@5.0.0:
+    dependencies:
+      '@types/unist': 3.0.3
+
+  unist-util-stringify-position@4.0.0:
+    dependencies:
+      '@types/unist': 3.0.3
+
+  unist-util-visit-parents@6.0.1:
+    dependencies:
+      '@types/unist': 3.0.3
+      unist-util-is: 6.0.0
+
+  unist-util-visit@5.0.0:
+    dependencies:
+      '@types/unist': 3.0.3
+      unist-util-is: 6.0.0
+      unist-util-visit-parents: 6.0.1
+
   universalify@2.0.0: {}
 
   upath@2.0.1: {}
@@ -4929,22 +9414,109 @@ snapshots:
       escalade: 3.1.2
       picocolors: 1.0.1
 
+  update-browserslist-db@1.1.0(browserslist@4.23.3):
+    dependencies:
+      browserslist: 4.23.3
+      escalade: 3.1.2
+      picocolors: 1.0.1
+
   uri-js@4.4.1:
     dependencies:
       punycode: 2.3.1
 
   util-deprecate@1.0.2: {}
 
-  vite@5.3.3(sass@1.77.8):
+  uuid@9.0.1: {}
+
+  vfile-message@4.0.2:
     dependencies:
-      esbuild: 0.21.5
-      postcss: 8.4.39
-      rollup: 4.18.1
+      '@types/unist': 3.0.3
+      unist-util-stringify-position: 4.0.0
+
+  vfile@6.0.3:
+    dependencies:
+      '@types/unist': 3.0.3
+      vfile-message: 4.0.2
+
+  vite-hot-client@0.2.3(vite@6.0.11(sass@1.84.0)(stylus@0.56.0)):
+    dependencies:
+      vite: 6.0.11(sass@1.84.0)(stylus@0.56.0)
+
+  vite-plugin-inspect@0.8.5(rollup@4.34.6)(vite@6.0.11(sass@1.84.0)(stylus@0.56.0)):
+    dependencies:
+      '@antfu/utils': 0.7.10
+      '@rollup/pluginutils': 5.1.0(rollup@4.34.6)
+      debug: 4.3.5
+      error-stack-parser-es: 0.1.5
+      fs-extra: 11.2.0
+      open: 10.1.0
+      perfect-debounce: 1.0.0
+      picocolors: 1.0.1
+      sirv: 2.0.4
+      vite: 6.0.11(sass@1.84.0)(stylus@0.56.0)
+    transitivePeerDependencies:
+      - rollup
+      - supports-color
+
+  vite-plugin-vue-devtools@7.3.8(rollup@4.34.6)(vite@6.0.11(sass@1.84.0)(stylus@0.56.0))(vue@3.4.31(typescript@5.5.3)):
+    dependencies:
+      '@vue/devtools-core': 7.3.8(vite@6.0.11(sass@1.84.0)(stylus@0.56.0))(vue@3.4.31(typescript@5.5.3))
+      '@vue/devtools-kit': 7.3.8
+      '@vue/devtools-shared': 7.3.8
+      execa: 8.0.1
+      sirv: 2.0.4
+      vite: 6.0.11(sass@1.84.0)(stylus@0.56.0)
+      vite-plugin-inspect: 0.8.5(rollup@4.34.6)(vite@6.0.11(sass@1.84.0)(stylus@0.56.0))
+      vite-plugin-vue-inspector: 5.1.3(vite@6.0.11(sass@1.84.0)(stylus@0.56.0))
+    transitivePeerDependencies:
+      - '@nuxt/kit'
+      - rollup
+      - supports-color
+      - vue
+
+  vite-plugin-vue-inspector@5.1.3(vite@6.0.11(sass@1.84.0)(stylus@0.56.0)):
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/plugin-proposal-decorators': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-syntax-import-attributes': 7.24.7(@babel/core@7.25.2)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.25.2)
+      '@babel/plugin-transform-typescript': 7.25.2(@babel/core@7.25.2)
+      '@vue/babel-plugin-jsx': 1.2.2(@babel/core@7.25.2)
+      '@vue/compiler-dom': 3.4.38
+      kolorist: 1.8.0
+      magic-string: 0.30.10
+      vite: 6.0.11(sass@1.84.0)(stylus@0.56.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  vite@6.0.11(sass@1.84.0)(stylus@0.56.0):
+    dependencies:
+      esbuild: 0.24.2
+      postcss: 8.5.2
+      rollup: 4.34.6
     optionalDependencies:
       fsevents: 2.3.3
-      sass: 1.77.8
+      sass: 1.84.0
+      stylus: 0.56.0
 
-  vue-demi@0.14.8(vue@3.4.31(typescript@5.5.3)):
+  vscode-jsonrpc@8.2.0: {}
+
+  vscode-languageserver-protocol@3.17.5:
+    dependencies:
+      vscode-jsonrpc: 8.2.0
+      vscode-languageserver-types: 3.17.5
+
+  vscode-languageserver-textdocument@1.0.12: {}
+
+  vscode-languageserver-types@3.17.5: {}
+
+  vscode-languageserver@9.0.1:
+    dependencies:
+      vscode-languageserver-protocol: 3.17.5
+
+  vscode-uri@3.0.8: {}
+
+  vue-demi@0.13.11(vue@3.4.31(typescript@5.5.3)):
     dependencies:
       vue: 3.4.31(typescript@5.5.3)
 
@@ -4966,6 +9538,11 @@ snapshots:
       '@vue/devtools-api': 6.6.3
       vue: 3.4.31(typescript@5.5.3)
 
+  vue-router@4.5.0(vue@3.5.13(typescript@5.5.3)):
+    dependencies:
+      '@vue/devtools-api': 6.6.4
+      vue: 3.5.13(typescript@5.5.3)
+
   vue@3.4.31(typescript@5.5.3):
     dependencies:
       '@vue/compiler-dom': 3.4.31
@@ -4976,78 +9553,156 @@ snapshots:
     optionalDependencies:
       typescript: 5.5.3
 
-  vuepress-plugin-md-enhance@2.0.0-rc.50(markdown-it@14.1.0)(sass-loader@14.2.1(sass@1.77.8))(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))):
-    dependencies:
-      '@mdit/plugin-alert': 0.12.0(markdown-it@14.1.0)
-      '@mdit/plugin-align': 0.12.0(markdown-it@14.1.0)
-      '@mdit/plugin-attrs': 0.12.0(markdown-it@14.1.0)
-      '@mdit/plugin-container': 0.12.0(markdown-it@14.1.0)
-      '@mdit/plugin-demo': 0.12.0(markdown-it@14.1.0)
-      '@mdit/plugin-figure': 0.12.0(markdown-it@14.1.0)
-      '@mdit/plugin-footnote': 0.12.0(markdown-it@14.1.0)
-      '@mdit/plugin-img-lazyload': 0.12.0(markdown-it@14.1.0)
-      '@mdit/plugin-img-mark': 0.12.0(markdown-it@14.1.0)
-      '@mdit/plugin-img-size': 0.12.0(markdown-it@14.1.0)
-      '@mdit/plugin-include': 0.12.0(markdown-it@14.1.0)
-      '@mdit/plugin-katex-slim': 0.12.0(markdown-it@14.1.0)
-      '@mdit/plugin-mark': 0.12.0(markdown-it@14.1.0)
-      '@mdit/plugin-mathjax-slim': 0.12.0(markdown-it@14.1.0)
-      '@mdit/plugin-plantuml': 0.12.0(markdown-it@14.1.0)
-      '@mdit/plugin-spoiler': 0.12.0(markdown-it@14.1.0)
-      '@mdit/plugin-stylize': 0.12.0(markdown-it@14.1.0)
-      '@mdit/plugin-sub': 0.12.0(markdown-it@14.1.0)
-      '@mdit/plugin-sup': 0.12.0(markdown-it@14.1.0)
-      '@mdit/plugin-tab': 0.12.0(markdown-it@14.1.0)
-      '@mdit/plugin-tasklist': 0.12.0(markdown-it@14.1.0)
-      '@mdit/plugin-tex': 0.12.0(markdown-it@14.1.0)
-      '@mdit/plugin-uml': 0.12.0(markdown-it@14.1.0)
+  vue@3.5.13(typescript@5.5.3):
+    dependencies:
+      '@vue/compiler-dom': 3.5.13
+      '@vue/compiler-sfc': 3.5.13
+      '@vue/runtime-dom': 3.5.13
+      '@vue/server-renderer': 3.5.13(vue@3.5.13(typescript@5.5.3))
+      '@vue/shared': 3.5.13
+    optionalDependencies:
+      typescript: 5.5.3
+
+  vuepress-plugin-components@2.0.0-rc.71(sass-loader@15.0.0(sass@1.84.0))(sass@1.84.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))):
+    dependencies:
+      '@stackblitz/sdk': 1.11.0
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-sass-palette': 2.0.0-rc.74(sass-loader@15.0.0(sass@1.84.0))(sass@1.84.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vueuse/core': 12.5.0(typescript@5.5.3)
+      balloon-css: 1.2.0
+      create-codepen: 2.0.0
+      qrcode: 1.5.4
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      vuepress-shared: 2.0.0-rc.71(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+    optionalDependencies:
+      sass: 1.84.0
+      sass-loader: 15.0.0(sass@1.84.0)
+    transitivePeerDependencies:
+      - typescript
+
+  vuepress-plugin-md-enhance@2.0.0-rc.71(markdown-it@14.1.0)(mermaid@11.3.0)(sass-loader@15.0.0(sass@1.84.0))(sass@1.84.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))):
+    dependencies:
+      '@mdit/plugin-container': 0.16.0(markdown-it@14.1.0)
+      '@mdit/plugin-demo': 0.16.0(markdown-it@14.1.0)
+      '@mdit/plugin-plantuml': 0.16.0(markdown-it@14.1.0)
+      '@mdit/plugin-uml': 0.16.0(markdown-it@14.1.0)
       '@types/markdown-it': 14.1.2
-      '@vuepress/helper': 2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vuepress/plugin-sass-palette': 2.0.0-rc.37(sass-loader@14.2.1(sass@1.77.8))(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vueuse/core': 10.11.0(vue@3.4.31(typescript@5.5.3))
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-sass-palette': 2.0.0-rc.74(sass-loader@15.0.0(sass@1.84.0))(sass@1.84.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vueuse/core': 12.5.0(typescript@5.5.3)
       balloon-css: 1.2.0
       js-yaml: 4.1.0
-      vue: 3.4.31(typescript@5.5.3)
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
-      vuepress-shared: 2.0.0-rc.50(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      vuepress-shared: 2.0.0-rc.71(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
     optionalDependencies:
-      sass-loader: 14.2.1(sass@1.77.8)
+      mermaid: 11.3.0
+      sass: 1.84.0
+      sass-loader: 15.0.0(sass@1.84.0)
     transitivePeerDependencies:
-      - '@vue/composition-api'
       - markdown-it
       - typescript
 
-  vuepress-shared@2.0.0-rc.50(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))):
+  vuepress-shared@2.0.0-rc.71(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))):
     dependencies:
-      '@vuepress/helper': 2.0.0-rc.37(typescript@5.5.3)(vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
-      '@vueuse/core': 10.11.0(vue@3.4.31(typescript@5.5.3))
-      cheerio: 1.0.0-rc.12
-      dayjs: 1.11.11
-      execa: 9.3.0
-      fflate: 0.8.2
-      gray-matter: 4.0.3
-      semver: 7.6.2
-      vue: 3.4.31(typescript@5.5.3)
-      vuepress: 2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vueuse/core': 12.5.0(typescript@5.5.3)
+      dayjs: 1.11.13
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+    transitivePeerDependencies:
+      - typescript
+
+  vuepress-theme-hope@2.0.0-rc.71(@vuepress/plugin-search@2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))))(katex@0.16.11)(markdown-it@14.1.0)(mermaid@11.3.0)(sass-loader@15.0.0(sass@1.84.0))(sass@1.84.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))):
+    dependencies:
+      '@vuepress/helper': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-active-header-links': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-back-to-top': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-blog': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-catalog': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-comment': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-copy-code': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-copyright': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-git': 2.0.0-rc.68(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-icon': 2.0.0-rc.74(markdown-it@14.1.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-links-check': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-markdown-ext': 2.0.0-rc.74(markdown-it@14.1.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-markdown-hint': 2.0.0-rc.74(markdown-it@14.1.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-markdown-image': 2.0.0-rc.74(markdown-it@14.1.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-markdown-include': 2.0.0-rc.74(markdown-it@14.1.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-markdown-math': 2.0.0-rc.74(katex@0.16.11)(markdown-it@14.1.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-markdown-stylize': 2.0.0-rc.75(markdown-it@14.1.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-markdown-tab': 2.0.0-rc.74(markdown-it@14.1.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-notice': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-nprogress': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-photo-swipe': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-reading-time': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-redirect': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-rtl': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-sass-palette': 2.0.0-rc.74(sass-loader@15.0.0(sass@1.84.0))(sass@1.84.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-seo': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-shiki': 2.0.0-rc.74(@vueuse/core@12.5.0(typescript@5.5.3))(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-sitemap': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vuepress/plugin-theme-data': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      '@vueuse/core': 12.5.0(typescript@5.5.3)
+      balloon-css: 1.2.0
+      bcrypt-ts: 5.0.3
+      chokidar: 3.6.0
+      vue: 3.5.13(typescript@5.5.3)
+      vuepress: 2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3))
+      vuepress-plugin-components: 2.0.0-rc.71(sass-loader@15.0.0(sass@1.84.0))(sass@1.84.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      vuepress-plugin-md-enhance: 2.0.0-rc.71(markdown-it@14.1.0)(mermaid@11.3.0)(sass-loader@15.0.0(sass@1.84.0))(sass@1.84.0)(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      vuepress-shared: 2.0.0-rc.71(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+    optionalDependencies:
+      '@vuepress/plugin-search': 2.0.0-rc.74(typescript@5.5.3)(vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)))
+      sass: 1.84.0
+      sass-loader: 15.0.0(sass@1.84.0)
     transitivePeerDependencies:
-      - '@vue/composition-api'
+      - '@vue/repl'
+      - '@waline/client'
+      - artalk
+      - artplayer
+      - chart.js
+      - dashjs
+      - echarts
+      - flowchart.ts
+      - hls.js
+      - katex
+      - kotlin-playground
+      - markdown-it
+      - markmap-lib
+      - markmap-toolbar
+      - markmap-view
+      - mathjax-full
+      - mermaid
+      - mpegts.js
+      - sandpack-vue3
+      - twikoo
       - typescript
+      - vidstack
 
-  vuepress@2.0.0-rc.14(@vuepress/bundler-vite@2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)):
+  vuepress@2.0.0-rc.19(@vuepress/bundler-vite@2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3))(typescript@5.5.3)(vue@3.4.31(typescript@5.5.3)):
     dependencies:
-      '@vuepress/cli': 2.0.0-rc.14(typescript@5.5.3)
-      '@vuepress/client': 2.0.0-rc.14(typescript@5.5.3)
-      '@vuepress/core': 2.0.0-rc.14(typescript@5.5.3)
-      '@vuepress/markdown': 2.0.0-rc.14
-      '@vuepress/shared': 2.0.0-rc.14
-      '@vuepress/utils': 2.0.0-rc.14
+      '@vuepress/cli': 2.0.0-rc.19(typescript@5.5.3)
+      '@vuepress/client': 2.0.0-rc.19(typescript@5.5.3)
+      '@vuepress/core': 2.0.0-rc.19(typescript@5.5.3)
+      '@vuepress/markdown': 2.0.0-rc.19
+      '@vuepress/shared': 2.0.0-rc.19
+      '@vuepress/utils': 2.0.0-rc.19
       vue: 3.4.31(typescript@5.5.3)
     optionalDependencies:
-      '@vuepress/bundler-vite': 2.0.0-rc.14(sass@1.77.8)(typescript@5.5.3)
+      '@vuepress/bundler-vite': 2.0.0-rc.19(sass@1.84.0)(stylus@0.56.0)(typescript@5.5.3)
     transitivePeerDependencies:
       - supports-color
       - typescript
 
+  whatwg-encoding@3.1.1:
+    dependencies:
+      iconv-lite: 0.6.3
+
+  whatwg-mimetype@4.0.0: {}
+
   which-boxed-primitive@1.0.2:
     dependencies:
       is-bigint: 1.0.4
@@ -5056,6 +9711,8 @@ snapshots:
       is-string: 1.0.7
       is-symbol: 1.0.4
 
+  which-module@2.0.1: {}
+
   which-typed-array@1.1.15:
     dependencies:
       available-typed-arrays: 1.0.7
@@ -5070,10 +9727,41 @@ snapshots:
 
   word-wrap@1.2.5: {}
 
+  wrap-ansi@6.2.0:
+    dependencies:
+      ansi-styles: 4.3.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+
   wrappy@1.0.2: {}
 
   xml-name-validator@4.0.0: {}
 
+  y18n@4.0.3: {}
+
+  yallist@3.1.1: {}
+
+  yargs-parser@18.1.3:
+    dependencies:
+      camelcase: 5.3.1
+      decamelize: 1.2.0
+
+  yargs@15.4.1:
+    dependencies:
+      cliui: 6.0.0
+      decamelize: 1.2.0
+      find-up: 4.1.0
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      require-main-filename: 2.0.0
+      set-blocking: 2.0.0
+      string-width: 4.2.3
+      which-module: 2.0.1
+      y18n: 4.0.3
+      yargs-parser: 18.1.3
+
   yocto-queue@0.1.0: {}
 
   yoctocolors@2.1.1: {}
+
+  zwitch@2.0.4: {}
diff --git a/docs/projections.md b/docs/projections.md
deleted file mode 100644
index 23ec963f0d2..00000000000
--- a/docs/projections.md
+++ /dev/null
@@ -1,637 +0,0 @@
----
-title: Projections
----
-
-## Introduction
-
-Projections is an EventStoreDB subsystem that lets you append new events or link existing events to streams in
-a reactive manner.
-
-Projections are good at solving one specific query type, a category known as 'temporal correlation queries'.
-This query type is common in business systems and few can execute these queries well.
-
-::: tip 
-Projections require the event body to be in JSON.
-:::
-
-### Business case examples
-
-For example. You are looking for how many Twitter users said "happy" within 5 minutes of the word "foo coffee
-shop" and within 2 minutes of saying "london".
-
-This is the type of query that projections can solve. Let's try a more complex business problem.
-
-As a medical research doctor you want to find people diagnosed with pancreatic cancer within the last year.
-During their treatment a patient should not have had any proxies for a heart condition such as taking aspirin
-every morning. Within three weeks of their diagnosis they should have been put on treatment X. Within one
-month after starting the treatment they should have failed with a lab result that looks like L1. Within
-another six weeks they should have been put on treatment Y, and within four weeks failed that treatment with a
-lab result that looks like L2.
-
-You can use projections in nearly all examples of near real-time complex event processing. There are a large
-number of problems that fit into this category from monitoring of temperature sensors, to reacting to changes
-in the stock market.
-
-It's important to remember the types of problems that projections help to solve. Many problems are not a good
-fit for projections and are better served by hosting another read model populated by a catchup subscription.
-
-### Continuous querying
-
-Projections support the concept of continuous queries. When running a projection you can choose whether the
-query should run and give you all results present, or whether the query should continue running into the
-future finding new results as they happen and updating its result set.
-
-In the medical example above the doctor could leave the query running to be notified of any new patients that
-meet the criteria. The output of all queries is a stream, you can listen to this stream like any other stream.
-
-### Types of projections
-
-There are two types of projections in EventStoreDB:
-
-- [Built in (system) projections](#system-projections)
-- [User-defined JavaScript projections](#user-defined-projections) which you create via the API or the admin
-  UI
-
-### Performance impact
-
-Keep in mind that all projections emit events as a reaction to events that they process. We call this effect _write amplification_
-because emitting new events or link events creates additional load on the server IO.
-
-Some system projections emit link events to their streams for each event appended to the database. These
-projections are By Category, By Event Type and By Correlation Id. If all those three projections are enabled
-and started, adding one event to the database will, in fact, produce three additional events and, therefore,
-quadruples the number of write operations.
-
-System projections `$streams` and `$stream-by-category` produce new events too, either per each new stream or
-per new stream category. If your system has a lot of small streams, the `$streams` system projection would
-also amplify writes significantly.
-
-Custom projections create the most significant write amplification since they produce new events or link
-events, which in turn get processed by system projections.
-
-Projections only run on a leader node of the cluster due to consistency concerns. It creates more CPU and IO
-load on the leader node compared to follower nodes.
-
-### Limitations
-
-Streams where projections emit events cannot be used to append events from applications. When this happens,
-the projection will detect events not produced by the projection itself and it will break.
-
-The reason projections exclusively own their streams is that otherwise they would lose all predictability. The
-projection would no longer have any idea what should be in that stream. For example, when a projection starts
-up from a checkpoint, it first goes through all the events after that checkpoint and checks them against the
-emitted stream. By doing this, the projection can understand if it up to the last event and can continue from
-where it left off. On top of that, the projection can verify that everything is in order, no events missing,
-etc. If anyone can append to the emitted streams, then the projection would have no idea where it got to last
-in terms of processing. Therefore, it can no longer trust that the projection itself emitted that event or if
-something else did.
-
-## System projections
-
-EventStoreDB ships with five built in projections:
-
-- [By Category](#by-category) (`$by_category`)
-- [By Event Type](#by-event-type) (`$by_event_type`)
-- [By Correlation ID](#by-correlation-id) (`$by_correlation_id`)
-- [Stream by Category](#stream-by-category) (`$stream_by_category`)
-- [Streams](#streams-projection) (`$streams`)
-
-### Enabling system projections
-
-When you start EventStoreDB from a fresh database, these projections are present but disabled and querying
-their statuses returns `Stopped`. You can enable a projection by issuing a request which switches the status
-of the projection from `Stopped` to `Running`.
-
-```bash:no-line-numbers
-curl -i -X POST "http://{event-store-ip}:{ext-http-port}/projection/{projection-name}/command/enable" -H "accept:application/json" -H "Content-Length:0" -u admin:changeit
-```
-
-### By category
-
-The `$by_category` (_http://127.0.0.1:2113/projection/$by_category_) projection links existing events from
-streams to a new stream with a `$ce-` prefix (a category) by splitting a stream `id` by a configurable
-separator.
-
-```text:no-line-numbers
-first
--
-```
-
-You can configure the separator, as well as where to split the stream `id`. You can edit the projection and
-provide your own values if the defaults don't fit your particular scenario.
-
-The first parameter specifies how the separator is used, and the possible values for that parameter is `first`
-or `last`. The second parameter is the separator, and can be any character.
-
-For example, if the body of the projection is `first` and `-`, for a stream id
-of `account-9E763770-0A8D-456D-AF23-410ADBC88249`, the stream name the projection creates is `$ce-account`.
-
-If the body of the projection is `last` and `-`, for a stream id of `shopping-cart-1`, the stream name the
-projection creates is `$ce-shopping-cart`.
-
-::: warning 
-You can change the projection setting at any time, so it can be quite dangerous. Consider all
-possible event consumers of the category stream that expect it to be in the format that is already there.
-Changing the setting might break all of them.
-:::
-
-The use case of this project is subscribing to all events within a category.
-
-### By event type
-
-The `$by_event_type` (_http://127.0.0.1:2113/projection/$by_event_type_) projection links existing events from
-streams to a new stream with a stream id in the format `$et-{event-type}`.
-
-For example, if you append an event with the `EventType` field set to `PaymentProcessed`, no matter in what
-stream you appended this event, you get a link event in the `$et-PaymentProcessed` stream.
-
-You cannot configure this projection.
-
-### By correlation ID
-
-The `$by_correlation_id` (_http://127.0.0.1:2113/projection/$by_correlation_id_) projection links existing
-events from projections to a new stream with a stream id in the format `$bc-<correlation id>`.
-
-The projection takes one parameter, a JSON string as a projection source:
-
-```json:no-line-numbers
-{
-  "correlationIdProperty": "$myCorrelationId"
-}
-```
-
-### Stream by category
-
-The `$stream_by_category` (_http://127.0.0.1:2113/projection/$by_category_) projection links existing events
-from streams to a new stream with a `$category` prefix by splitting a stream `id` by a configurable separator.
-
-```text:no-line-numbers
-first
--
-```
-
-By default, the `$stream_by_category` projection links existing events from a stream id with a name such
-as `account-1` to a stream called `$category-account`. You can configure the separator as well as where to
-split the stream `id`. You can edit the projection and provide your own values if the defaults don't fit your
-particular scenario.
-
-The first parameter specifies how the separator is used, and the possible values for that parameter is `first`
-or `last`. The second parameter is the separator, and can be any character.
-
-For example, if the body of the projection is `first` and `-`, for a stream id of `account-1`, the stream name
-the projection creates is `$category-account`, and the `account-1` stream is linked to it. Future streams
-prefixed with `account-` are likewise linked to the newly created `$category-account` stream.
-
-If the body of the projection is last and `-`, for a stream id of `shopping-cart-1`, the stream name the
-projection creates is `$category-shopping-cart`, and the `shopping-cart-1` stream is linked to it. Future
-streams whose left-side split by the _last_ `-` is `shopping-cart`, are likewise linked to the newly
-created `$category-shopping-cart` stream.
-
-The use case of this projection is subscribing to all stream instances of a category.
-
-### Streams projection
-
-The `$streams` (_http://127.0.0.1:2113/projection/$streams_) projection links existing events from streams to
-a stream named `$streams`
-
-You cannot configure this projection.
-
-## User defined projections
-
-::: warning 
-WIP This section is work in progress.
-:::
-
-<!-- TODO: Again refactor to shopping cart? -->
-
-<!-- TODO: Use cases and performance implications. -->
-
-<!-- ## Overview -->
-
-You create user defined projections in JavaScript. For example, the `my_demo_projection_result` projection
-below counts the number of `myEventType` events from the `account-1` stream. It then uses the `transformBy`
-function to change the final state:
-
-```javascript
-options({
-    resultStreamName: "my_demo_projection_result",
-    $includeLinks:    false,
-    reorderEvents:    false,
-    processingLag:    0
-})
-
-fromStream('account-1')
-    .when({
-        $init: function () {
-            return {
-                count: 0
-            }
-        },
-        myEventType: function (state, event) {
-            state.count += 1;
-        }
-    })
-    .transformBy(function (state) {
-        return {Total: state.count}
-    })
-    .outputState()
-```
-
-<!-- TODO: Show example output, see above comment -->
-
-### User defined projections API
-
-#### Options
-
-| Name               | Description                                                                                                                                                                                                                                                  | Notes                                                     |
-|:-------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:----------------------------------------------------------|
-| `resultStreamName` | Overrides the default resulting stream name for the `outputState()` transformation, which is `$projections-{projection-name}-result`.                                                                                                                        |                                                           |
-| `$includeLinks`    | Configures the projection to include/exclude link to events.                                                                                                                                                                                                 | Default: `false`                                          |
-| `processingLag`    | When `reorderEvents` is enabled, this value is used to compare the total milliseconds between the first and last events in the buffer and if the value is equal or greater, the events in the buffer are processed. The buffer is an ordered list of events. | Default: `500ms`. Only valid for `fromStreams()` selector |
-| `reorderEvents`    | Process events by storing a buffer of events ordered by their prepare position                                                                                                                                                                               | Default: `false`. Only valid for `fromStreams()` selector |
-
-#### Selectors
-
-| Selector                   | Description                                      | Notes                                                                                                 |
-|:---------------------------|:-------------------------------------------------|:------------------------------------------------------------------------------------------------------|
-| `fromAll()`                | Selects events from the `$all` stream.           | Provides <ul><li>`partitionBy`</li><li>`when`</li><li>`foreachStream`</li><li>`outputState`</li></ul> |
-| `fromCategory({category})` | Selects events from the `$ce-{category}` stream. | Provides <ul><li>`partitionBy`</li><li>`when`</li><li>`foreachStream`</li><li>`outputState`</li></ul> |
-| `fromStream({streamId})`   | Selects events from the `streamId` stream.       | Provides <ul><li>`partitionBy`</li><li>`when`</li><li>`outputState`</li></ul>                         |
-| `fromStreams(streams[])`   | Selects events from the streams supplied.        | Provides <ul><li>`partitionBy`</li><li>`when`</li><li>`outputState`</li></ul>                         |
-
-#### Filters and transformations
-
-| Filter/Partition               | Description                                                                                                                                               | Notes                                                                                                                                    |
-|:-------------------------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------|
-| `when(handlers)`               | Allows only the given events of a particular to pass through the projection.                                                                              | Provides <ul><li>`$defines_state_transform` </li><li>`transformBy`</li><li>`filterBy`</li><li>`outputTo`</li><li>`outputState`</li></ul> |
-| `foreachStream()`              | Partitions the state for each of the streams provided.                                                                                                    | Provides <ul><li>`when`</li></ul>                                                                                                        |
-| `outputState()`                | If the projection maintains state, setting this option produces a stream called `$projections-{projection-name}-result` with the state as the event body. | Provides <ul><li>`transformBy`</li><li>`filterBy`</li><li>`outputTo`</li></ul>                                                           |
-| `partitionBy(function(event))` | Partitions a projection by the partition returned from the handler.                                                                                       | Provides <ul><li>`when`</li></ul>                                                                                                        |
-| `transformBy(function(state))` | Provides the ability to transform the state of a projection by the provided handler.                                                                      | Provides <ul><li>`transformBy`</li><li>`filterBy`</li><li>`outputState`</li><li>`outputTo`</li></ul>                                     |
-| `filterBy(function(state))`    | Causes projection results to be `null` for any `state` that returns a `false` value from the given predicate.                                             | Provides <ul><li>`transformBy`</li><li>`filterBy`</li><li>`outputState`</li><li>`outputTo`</li></ul>                                     |
-
-#### Handlers
-
-Each handler is provided with the current state of the projection as well as the event that triggered the
-handler. The event provided through the handler contains the following properties.
-
-- `isJson`: true/false
-- `data`: {}
-- `body`: {}
-- `bodyRaw`: string
-- `sequenceNumber`: integer
-- `metadataRaw`: {}
-- `linkMetadataRaw`: string
-- `partition`: string
-- `eventType`: string
-- `streamId`: string
-
-| Handler        | Description                                                                                                                                                                                                                                                                                                              | Notes                                                                          |
-|:---------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------|
-| `{event-type}` | When using `fromAll()` and 2 or more event type handlers are specified and the `$by_event_type` projection is enabled and running, the projection starts as a `fromStreams($et-event-type-foo, $et-event-type-bar)` until the projection has caught up and moves to reading from the transaction log (i.e. from `$all`). |                                                                                |
-| `$init`        | Provide the initialization for a projection.                                                                                                                                                                                                                                                                             | Commonly used to setup the initial state for a projection.                     |
-| `$initShared`  | Provide the initialization for a projection where the projection is possibly partitioned.                                                                                                                                                                                                                                |                                                                                |
-| `$any`         | Event type pattern match that match any event type.                                                                                                                                                                                                                                                                      | Commonly used when the user is interested in any event type from the selector. |
-| `$deleted`     | Called upon the deletion of a stream.                                                                                                                                                                                                                                                                                    | Can only be used with `foreachStream`                                          |
-
-#### Functions
-
-| Handler                                          | Description                                     |
-|:-------------------------------------------------|:------------------------------------------------|
-| `emit(streamId, eventType, eventBody, metadata)` | Appends an event to the designated stream       |
-| `linkTo(streamId, event, metadata)`              | Writes a link to event to the designated stream |
-
-## Configuring projections
-
-By changing these settings, you can lessen the amount of pressure projections put on an EventStoreDB node or
-improve projection performance. You can change these settings on a case-by-case basis, and monitor potential
-improvements.
-
-::: warning 
-You can only change the configuration of a stopped projection.
-:::
-
-You change the configuration of a projection by setting the relevant key and value in a request, or when you
-create a projection with the web admin interface.
-
-![Web admin interface projections configuration screen](./images/wai-projection-config.jpg)
-
-<!-- TODO: Further explanation here -->
-
-### Emit options
-
-These options control how projections append events.
-
-In busy systems, projections can put a lot of extra pressure on the master node. This is especially true for
-EventStoreDB servers that also have persistent subscriptions running, which only the master node can process.
-If you see a lot of commit timeouts and slow writes from your projections and other clients, then start with
-these settings.
-
-#### Emit enabled
-
-The `emit` boolean setting determines whether a projection can emit events and any projection that
-calls `emit()` or `linkTo()` requires it. If this option is not set and a projection attempts to emit events,
-you see an error message like the following:
-
-<!-- TODO: Is it emit or emitenabled? Or are .NET and HTTP different -->
-
-```bash:no-line-numbers
-'emit' is not allowed by the projection/configuration/mode
-```
-
-EventStoreDB disables this setting by default, and is usually set when you create the projection and if you
-need the projection to emit events.
-
-#### Track emitted streams
-
-The `trackemittedstreams` boolean setting enables tracking of a projection's emitted streams. It only has an
-affect if the projection has `EmitEnabled` enabled.
-
-Tracking emitted streams enables you to delete a projection and all the streams that it has created. You
-should only the setting if you intend to delete a projection and create new ones that project to the same
-stream.
-
-::: warning 
-By default, EventStoreDB disables the `trackemittedstreams` setting for projections. When enabled,
-an event appended records the stream name (in `$projections-{projection_name}-emittedstreams`) of each event
-emitted by the projection. This means that write amplification is a possibility, as each event that the
-projection emits appends a separate event. As such, this option is not recommended for projections that emit a
-lot of events, and you should enable only where necessary.
-:::
-
-::: tip 
-Between EventStoreDB versions 3.8.0 and 4.0.2, this option was enabled by default when a projection
-was created through the UI. If you have any projections created during this time frame, it's worth checking
-whether this option is enabled.
-:::
-
-#### Max allowed writes in flight
-
-<!-- TODO: Why is this not in the GUI for new projection? -->
-
-The `MaxAllowedWritesInFlight` setting sets the maximum number of writes to allow for a projection. Because a
-projection can write to multiple different streams, it's possible for the projection to send multiple writes
-at the same time. This option sets the number of concurrent writes that a projection can perform.
-
-By default, projections try to perform writes as quickly as they come. This can add a lot of pressure to a
-node, especially for projections that emit to different streams. If you see your projections causing frequent
-commit timeouts or slow reads, you can try lowering this value to see if there is any improvement.
-
-::: tip 
-Lower values may cause the projection to slow down as the number of writes are throttled, but the
-trade-off for this is cleaner logs and fewer commit timeouts.
-:::
-
-By default, this is unbounded, allowing a projection to write as fast as it can.
-
-#### Max write batch length
-
-<!-- TODO: Why is this not in the GUI for new projection? -->
-
-The `MaxWriteBatchLength` setting sets the maximum number of events the projection can write in a batch at a
-time.
-
-**Default:** `500` (events).
-
-### Checkpoint options
-
-Checkpoints store how far along a projection is in the streams it is processing from. There is a performance
-overhead with writing a checkpoint, as it does more than append an event, and writing them too often can slow
-projections down.
-
-We recommend you try other methods of improving projections before changing these values, as checkpoints are
-an important part of running projections.
-
-#### Checkpoint after Ms
-
-The `CheckpointAfterMs` setting prevents a new checkpoint from being written within a certain time frame from
-the previous one. The setting is to keep a projection from writing too many checkpoints too quickly, something
-that can happen in a busy system.
-
-The default setting is 0 seconds, which means there is no limit to how quickly checkpoints can be written.
-
-#### Checkpoint handled threshold
-
-The `CheckpointHandledThreshold` setting controls the number of events that a projection can handle before
-attempting to write a checkpoint. An event is considered handled if it actually passed through the
-projection's filter. If the projection is set to checkpoint every 4,000 events, but it only reads from
-the `foo` stream, the projection only checkpoints every 4,000 `foo` events.
-
-**Default:** `4000` (events).
-
-#### Checkpoint unhandled bytes threshold
-
-The `CheckpointUnhandledBytesThreshold` setting specifies the number of bytes a projection can process before
-attempting to write a checkpoint. Unhandled bytes are the events that are not processed by the projection
-itself.
-
-For example, if the projection reads from the `foo` stream, but writes from the `bar` stream comes through, a
-checkpoint is written after this number of bytes have been processed. This prevents the projection from having
-to read through a potentially large number of unrelated events again because none of them passed its filter.
-
-**Default:** `10` (MiB).
-
-### Processing options
-
-#### Pending events threshold
-
-The `PendingEventsThreshold` setting determines the number of events that can be pending before the projection
-is paused. Pausing the projection stops the projection from reading, allowing it to finish with the current
-events that are waiting to be processed. Once the pending queue has drained to half the threshold, the
-projection starts reading again.
-
-**Default:** `5000` (events).
-
-#### Projection Execution Timeout
-
-The `ProjectionExecutionTimeout` setting specifies per event projection processing timeout. If an event is not processed within the specified duration, the projection will fault and won't process further events.
-
-::: tip 
-Increase value of this setting if projection handler is compute intensive or server is under heavy load
-:::
-
-**Default:** `250` (ms).
-
-## Debugging
-
-[User projections you create in JavaScript](#user-defined-projections) have a bonus that debugging is easier
-via any browser that ships with debugging capabilities. The screenshots in this document show the use of
-Chrome, but we have tested debugging with all major browsers including Firefox, Edge and Safari.
-
-### Logging from within a projection
-
-For debugging purposes, projections includes a log method which, when called, sends messages to the configured
-EventStoreDB logger (the default is `NLog`, to a file, and `stdout`).
-
-You might find printing out the structure of the event body for inspection useful.
-
-For example:
-
-```javascript
-fromStream('$stats-127.0.0.1:2113')
-    .when({
-        $any: function (s, e) {
-            log(JSON.stringify(e));
-        }
-    })
-```
-
-#### Creating a sample projection for debugging purposes
-
-Filename: _stats-counter.json_
-
-Contents:
-
-```javascript
-fromStream('$stats-127.0.0.1:2113')
-    .when({
-        $init: function () {
-            return {
-                count: 0
-            }
-        },
-        $any:  function (s, e) {
-            s.count += 1;
-        }
-    })
-```
-
-You create the projection by making a call to the API and providing it with the definition of the projection.
-
-```bash:no-line-numbers
-curl -i -d@stats-counter.json \
-  http://localhost:2113/projections/continuous?name=stats-counter%26type=js%26enabled=true%26emit=true%26trackemittedstreams=true \
-  -u admin:changeit
-```
-
-### Debugging your first projection
-
-Once the projection is running, open your browser and enable the developer tools. Once you have the developer
-tools open, visit your projection URL and you should see a button labelled _Debug_.
-
-![Projections Debugging Part 1](./images/projections_debugging_part_1.png)
-
-After clicking the projection "Debug" button, you see the debugging interface with the definition of the
-projection and information about the events the projection is processing on the right-hand side.
-
-At the top there are a couple of buttons to take note of, specifically the _Run Step_ and _Update_ buttons.
-You use _Run Step_ to step through the event waiting in the queue, placing you in projection debugging mode.
-The _Update_ button provides you with a way to update the projection definition without having to go back to
-the projection itself and leave the context of the debugger.
-
-![Projections Debugging Part 2](./images/projections_debugging_part_2.png)
-
-If the _Run Step_ button is not greyed out and you click it, the browser has hit a breakpoint.
-
-![Projections Debugging Part 3](./images/projections_debugging_part_3.png)
-
-You are now able to step through the projection, the important method to step into is
-the `handler(state, eventEnvelope)` method.
-
-## Projections settings
-
-Settings in this section concern projections that are running on the server.
-
-::: warning 
-Server-side projections impact the performance of the EventStoreDB server. For example, some
-standard [system projections](#system-projections) like Category or Event Type projections produce new (link)
-events that are stored in the database in addition to the original event. This effectively doubles or triples
-the number of events appended and therefore creates pressure on the IO of the server node. We often call this
-effect "write amplification".
-:::
-
-### Projection runtime
-
-An Interpreted runtime was introduced in 21.6.0 to replace the existing V8 runtime.
-
-The `ProjectionRuntime` option can be used to select which runtime the Projection Subsystem should use. We
-only recommend changing this setting if you observe a difference in behaviour between running an existing
-projection on the Legacy runtime versus the Interpreted runtime.
-
-| Format               | Syntax                          |
-|:---------------------|:--------------------------------|
-| Command line         | `--projection-runtime`          |
-| YAML                 | `ProjectionRuntime`             |
-| Environment variable | `EVENTSTORE_PROJECTION_RUNTIME` |
-
-**Default**: `Interpreted`, use the new Interpreted runtime by default.
-
-Accepted values are `Interpreted` and `Legacy`.
-
-### Run projections
-
-The `RunProjections` option tells the server if you want to run all projections, only system projections or no
-projections at all. Keep in mind that the `StartStandardProjections` setting has no effect on custom
-projections.
-
-The option accepts three values: `None`, `System` and `All`.
-
-When the option value is set to `None`, the projections subsystem of EventStoreDB will be completely disabled
-and the Projections menu in the Admin UI will be disabled.
-
-By using the `System` value for this option, you can instruct the server to enable system projections when the
-server starts. However, system projections will only start if the `StartStandardProjections` option is set
-to `true`. When the `RunProjections` option value is `System` (or `All`) but the `StartStandardProjections`
-option value is `false`, system projections will be enabled but not start. You can start them later manually
-via the Admin UI or via an API call.
-
-Finally, you can set `RunProjections` to `All` and it will enable both system and custom projections.
-
-| Format               | Syntax                       |
-|:---------------------|:-----------------------------|
-| Command line         | `--run-projections`          |
-| YAML                 | `RunProjections`             |
-| Environment variable | `EVENTSTORE_RUN_PROJECTIONS` |
-
-**Default**: `None`, all projections are disabled by default.
-
-Accepted values are `None`, `System` and `All`.
-
-### Projection threads
-
-Projection threads are used to make calls in to the V8 JavaScript engine, and coordinate dispatching
-operations back into the main worker threads of the database. While they carry out none of the operations
-listed directly, they are indirectly involved in all of them.
-
-The primary reason for increasing the number of projection threads is projections which perform a large amount
-of CPU-bound processing. Projections are always eventually consistent - if there is a mismatch between egress
-from the database log and processing speed of projections, the window across which the latest events have not
-been processed promptly may increase. Too many projection threads can end up with increased context switching
-and memory use, since a V8 engine is created per thread.
-
-There are three primary influences over projections lagging:
-
-- Large number of writes, outpacing the ability of the engine to process them in a timely fashion.
-- Projections which perform a lot of CPU-bound work (heavy calculations).
-- Projections which result in a high system write amplification factor, especially with latent disks.
-
-Use the `ProjectionThreads` option to adjust the number of threads dedicated to projections.
-
-| Format               | Syntax                          |
-|:---------------------|:--------------------------------|
-| Command line         | `--projection-threads`          |
-| YAML                 | `ProjectionThreads`             |
-| Environment variable | `EVENTSTORE_PROJECTION_THREADS` |
-
-**Default**: `3`
-
-### Fault out of order projections
-
-It is possible that in some cases a projection would get an unexpected event version. It won't get an event
-that precedes the last processed event, such a situation is very unlikely. But, it might get the next event
-that doesn't satisfy the `N+1` condition for the event number. The projection expects to get an event
-number `5` after processing the event number `4`, but eventually it might get an event number `7` because
-events `5` and `6` got deleted and scavenged.
-
-The projections engine can keep track of the latest processed event for each projection. It allows projections
-to guarantee ordered handling of events. By default, the projections engine ignore ordering failures like
-described above. You can force out of order projections to fail by setting the `FailOutOfOrderProjections`
-to `true`.
-
-| Format               | Syntax                                      |
-|:---------------------|:--------------------------------------------|
-| Command line         | `--fault-out-of-order-projections`          |
-| YAML                 | `FaultOutOfOrderProjections`                |
-| Environment variable | `EVENTSTORE_FAULT_OUT_OF_ORDER_PROJECTIONS` |
-
-**Default**: `false`
diff --git a/docs/security.md b/docs/security.md
deleted file mode 100644
index 410d22cd2ed..00000000000
--- a/docs/security.md
+++ /dev/null
@@ -1,1001 +0,0 @@
----
-title: "Security"
----
-
-## Security
-
-For production use, it is important to configure EventStoreDB security features to prevent unauthorised access
-to your data.
-
-Security features of EventStoreDB include:
-
-- [User management](#authentication) for allowing users with different roles to access the database
-- [Access Control Lists](#access-control-lists) to restrict access to specific event streams
-- Encryption in-flight using HTTPS and TLS
-
-### Protocol security
-
-EventStoreDB supports gRPC and the proprietary TCP protocol for high-throughput real-time communication. It
-also has some HTTP endpoints for the management operations like scavenging, creating projections and so on.
-EventStoreDB also uses HTTP for the gossip seed endpoint, both internally for the cluster gossip, and
-internally for clients that connect to the cluster using discovery mode.
-
-All those protocols support encryption with TLS and SSL. Each protocol has its own security configuration, but
-you can only use one set of certificates for both TLS and HTTPS.
-
-The protocol security configuration depends a lot on the deployment topology and platform. We have created an
-interactive [configuration tool](installation.md), which also has instructions on how to generate and install
-the certificates and configure EventStoreDB nodes to use them.
-
-## Security options
-
-Below you can find more details about each of the available security options.
-
-### Running without security
-
-Unlike previous versions, EventStoreDB v20+ is secure by default. It means that you have to supply valid certificates and configuration for the database node to work.
-
-We realise that many users want to try out the latest version with their existing applications, and also run a previous version of EventStoreDB without any security in their internal networks.
-
-For this to work, you can use the `Insecure` option:
-
-| Format               | Syntax                |
-|:---------------------|:----------------------|
-| Command line         | `--insecure`          |
-| YAML                 | `Insecure`            |
-| Environment variable | `EVENTSTORE_INSECURE` |
-
-**Default**: `false`
-
-::: warning
-When running with protocol security disabled, everything is sent unencrypted over the wire. In the previous version it included the server credentials. Sending username and password over the wire without encryption is not secure by definition, but it might give a false sense of security. To make things explicit, EventStoreDB v20+ **does not use any authentication and authorisation** (including ACLs) when running insecure.
-:::
-
-### Set initial passwords
-
-We are adding an ability to set default admin and ops passwords on the first run of the database. It will not impact the existing credentials, the user can log into their accounts with exising passwords.
-
-For this to work, you can use the `DefaultAdminPassword` option:
-
-| Format               | Syntax                              |
-|:---------------------|:------------------------------------|
-| Environment variable | `EVENTSTORE_DEFAULT_ADMIN_PASSWORD` |
-
-**Default**: `changeit`
-
-For this to work, you can use the `DefaultOpsPassword` option:
-
-| Format               | Syntax                              |
-|:---------------------|:------------------------------------|
-| Environment variable | `EVENTSTORE_DEFAULT_OPS_PASSWORD`   |
-
-**Default**: `changeit`
-
-::: warning
-Due to security reasons the `DefaultAdminPassword` and `DefaultOpsPassword` options can only be set through environment variables. The user will receive the error message if they try to pass the options using command line or config file.
-:::
-
-### Anonymous access to streams
-
-Historically, anonymous users with network access have been allowed to read/write streams that do not have access control lists.
-
-This is now disabled by default but can be enabled by setting `AllowAnonymousStreamAccess` to `true`.
-
-| Format               | Syntax                                     |
-|:---------------------|:-------------------------------------------|
-| Command line         | `--allow-anonymous-stream-access`          |
-| YAML                 | `AllowAnonymousStreamAccess`               |
-| Environment variable | `EVENTSTORE_ALLOW_ANONYMOUS_STREAM_ACCESS` |
-
-**Default**: `false`
-
-### Anonymous access to endpoints
-
-Similarly to streams above, anonymous access has historically been available to some http endpoints.
-
-Anonymous access to `/gossip`, `/stats` and the `HTTP OPTIONS` method can now be configured with the following two options. By default `/gossip` is still accessible anonymously but the others are not. Some clients currently rely on anonymous access to `/gossip`. This will likely change in the future.
-
-The `AllowAnonymousEndpointAccess` option controls anonymous access to these endpoints. Setting `OverrideAnonymousEndpointAccessForGossip` to `true` allows anonymous access to `/gossip` specifically, overriding the other option.
-
-| Format               | Syntax                                       |
-|:---------------------|:---------------------------------------------|
-| Command line         | `--allow-anonymous-endpoint-access`          |
-| YAML                 | `AllowAnonymousEndpointAccess`               |
-| Environment variable | `EVENTSTORE_ALLOW_ANONYMOUS_ENDPOINT_ACCESS` |
-
-**Default**: `false`
-
-| Format               | Syntax                                                     |
-|:---------------------|:-----------------------------------------------------------|
-| Command line         | `--override-anonymous-endpoint-access-for-gossip`          |
-| YAML                 | `OverrideAnonymousEndpointAccessForGossip`                 |
-| Environment variable | `EVENTSTORE_OVERRIDE_ANONYMOUS_ENDPOINT_ACCESS_FOR_GOSSIP` |
-
-**Default**: `true`
-
-::: tip
-Anonymous access is still always granted to `/ping`, `/info`, the static content of the UI, and http redirects.
-:::
-
-### Certificates configuration
-
-In this section, you can find settings related to protocol security (HTTPS and TLS).
-
-#### Certificate common name
-
-SSL certificates can be created with a common name (CN), which is an arbitrary string. Usually it contains the DNS name for which the certificate is issued.
-
-When cluster nodes connect to each other, they need to ensure that they indeed talk to another node and not something that pretends to be a node. To achieve that, EventStoreDB authenticates a connecting node by ensuring that it supplies a trusted client certificate having a CN that matches exactly with the CN in its own certificate. This essentially means that the CN must be the same across all node certificates by default. For example, when using the Event Store [certificate generator](#certificate-generation-tool), the CN is set to `eventstoredb-node` in all node certificates.
-
-::: note
-Prior to version 23.10.0, the `CertificateReservedNodeCommonName` setting needed to be configured if a user had certificates with a CN other than `eventstoredb-node`. EventStoreDB will now, by default, automatically read the CN from the node's certificate and use it as the `CertificateReservedNodeCommonName`. However, if you still choose to specify the `CertificateReservedNodeCommonName` in your configuration, it will take precedence.
-:::
-
-In practice, it's not always possible to obtain certificates where the CN is the same across all nodes. For instance, when using a public CA, single-domain certificates are very common and these certificates cannot be used on multiple nodes as they are valid for exactly one host. In this case, the `CertificateReservedNodeCommonName` setting can be configured with a wildcard as per the following example:
-
-If the domains are `node1.esdb.mycompany.org`, `node2.esdb.mycompany.org` and `node3.esdb.mycompany.org`, then `CertificateReservedNodeCommonName` must be set to `*.esdb.mycompany.org`.
-
-| Format               | Syntax                                             |
-|:---------------------|:---------------------------------------------------|
-| Command line         | `--certificate-reserved-node-common-name`          |
-| YAML                 | `CertificateReservedNodeCommonName`                |
-| Environment variable | `EVENTSTORE_CERTIFICATE_RESERVED_NODE_COMMON_NAME` |
-
-::: warning
-Server certificates **must** have the internal and external IP addresses (`ReplicationIp` and `NodeIp` respectively) or DNS names as subject alternative names.
-:::
-
-#### Trusted root certificates
-
-When getting an incoming connection, the server needs to ensure if the certificate used for the connection can be trusted. For this to work, the server needs to know where trusted root certificates are located.
-
-EventStoreDB will use the default trusted root certificates location of `/etc/ssl/certs` when running on Linux only. So if you are running on Windows or a platform with a different default certificates location, you'd need to explicitly tell the node to use the OS default root certificate store. For certificates signed by a private CA, you just provide the path to the CA certificate file (but not the filename).
-
-If you are running on Windows, you can also load the trusted root certificate from the Windows Certificate Store. The available options for configuring this are described [below](#certificate-store-windows).
-
-| Format               | Syntax                                      |
-|:---------------------|:--------------------------------------------|
-| Command line         | `--trusted-root-certificates-paths`         |
-| YAML                 | `TrustedRootCertificatesPath`               |
-| Environment variable | `EVENTSTORE_TRUSTED_ROOT_CERTIFICATES_PATH` |
-
-**Default**: n/a on Windows, `/etc/ssl/certs` on Linux
-
-#### Certificate file
-
-The `CertificateFile` setting needs to point to the certificate file, which will be used by the cluster node.
-
-| Format               | Syntax                        |
-|:---------------------|:------------------------------|
-| Command line         | `--certificate-file`          |
-| YAML                 | `CertificateFile`             |
-| Environment variable | `EVENTSTORE_CERTIFICATE_FILE` |
-
-If the certificate file is protected by password, you'd need to set the `CertificatePassword` value accordingly, so the server can load the certificate.
-
-| Format               | Syntax                            |
-|:---------------------|:----------------------------------|
-| Command line         | `--certificate-password`          |
-| YAML                 | `CertificatePassword`             |
-| Environment variable | `EVENTSTORE_CERTIFICATE_PASSWORD` |
-
-If the certificate file doesn't contain the certificate private key, you need to tell the node where to find the key file using the `CertificatePrivateKeyFile` setting. The private key can be in RSA, or PKCS8 format.
-
-| Format               | Syntax                                    |
-|:---------------------|:------------------------------------------|
-| Command line         | `--certificate-private-key-file`          |
-| YAML                 | `CertificatePrivateKeyFile`               |
-| Environment variable | `EVENTSTORE_CERTIFICATE_PRIVATE_KEY_FILE` |
-
-If the private key file is an encrypted PKCS #8 file, then you need to provide the password with the `CertificatePrivateKeyPassword` option.
-
-| Format               | Syntax                                        |
-|:---------------------|:----------------------------------------------|
-| Command line         | `--certificate-private-key-password`          |
-| YAML                 | `CertificatePrivateKeyPassword`               |
-| Environment variable | `EVENTSTORE_CERTIFICATE_PRIVATE_KEY_PASSWORD` |
-
-
-#### Certificate store (Windows)
-
-The certificate store location is the location of the Windows certificate store, for example `CurrentUser`.
-
-| Format               | Syntax                                  |
-|:---------------------|:----------------------------------------|
-| Command line         | `--certificate-store-location`          |
-| YAML                 | `CertificateStoreLocation`              |
-| Environment variable | `EVENTSTORE_CERTIFICATE_STORE_LOCATION` |
-
-The certificate store name is the name of the Windows certificate store, for example `My`.
-
-| Format               | Syntax                              |
-|:---------------------|:------------------------------------|
-| Command line         | `--certificate-store-name`          |
-| YAML                 | `CertificateStoreName`              |
-| Environment variable | `EVENTSTORE_CERTIFICATE_STORE_NAME` |
-
-You can load a certificate using either its thumbprint or its subject name.
-If using the thumbprint, the server expects to only find one certificate file matching that thumbprint in the cert store.
-
-| Format               | Syntax                              |
-|:---------------------|:------------------------------------|
-| Command line         | `--certificate-thumbprint`          |
-| YAML                 | `CertificateThumbprint`             |
-| Environment variable | `EVENTSTORE_CERTIFICATE_THUMBPRINT` |
-
-The subject name matches any certificate that contains the specified name. This means that multiple matching certificates could be found.
-To match any certificate made by the es-gencert-cli, you can set the subject name to `eventstoredb-node`.
-
-If multiple matching certificates are found, then the certificate with the latest expiry date will be selected.
-
-| Format               | Syntax                                |
-|:---------------------|:--------------------------------------|
-| Command line         | `--certificate-subject-name`          |
-| YAML                 | `CertificateSubjectName`              |
-| Environment variable | `EVENTSTORE_CERTIFICATE_SUBJECT_NAME` |
-
-When you are loading your node certificates from the Windows cert store, you are likely to want to load the trusted root certificate from the cert store as well.
-The options to configure this are similar to the ones for node certificates.
-
-The trusted root certificate store location is the location of the Windows certificate store in which the trusted root certificate is installed, for example `CurrentUser`.
-
-| Format               | Syntax                                               |
-|:---------------------|:-----------------------------------------------------|
-| Command line         | `--trusted-root-certificate-store-location`          |
-| YAML                 | `TrustedRootCertificateStoreLocation`                |
-| Environment variable | `EVENTSTORE_TRUSTED_ROOT_CERTIFICATE_STORE_LOCATION` |
-
-The trusted root certificate store name is the name of the Windows certificate store in which the trusted root certificate is installed, for example `Root`.
-
-| Format               | Syntax                                           |
-|:---------------------|:-------------------------------------------------|
-| Command line         | `--trusted-root-certificate-store-name`          |
-| YAML                 | `TrustedRootCertificateStoreName`                |
-| Environment variable | `EVENTSTORE_TRUSTED_ROOT_CERTIFICATE_STORE_NAME` |
-
-Trusted root certificates can also be loaded using either its thumbprint or its subject name.
-If using the thumbprint, the server expects to only find one trusted root certificate file matching that thumbprint in the cert store.
-
-| Format               | Syntax                                           |
-|:---------------------|:-------------------------------------------------|
-| Command line         | `--trusted-root-certificate-thumbprint`          |
-| YAML                 | `TrustedRootCertificateThumbprint`               |
-| Environment variable | `EVENTSTORE_TRUSTED_ROOT_CERTIFICATE_THUMBPRINT` |
-
-The subject name matches any certificate that contains the specified name. This means that multiple matching certificates could be found.
-To match any root certificate made through the es-gencert-cli, you can set the Subject Name to `EventStoreDB CA`.
-
-If multiple matching root certificates are found, then the root certificate with the latest expiry date will be selected.
-
-| Format               | Syntax                                             |
-|:---------------------|:---------------------------------------------------|
-| Command line         | `--trusted-root-certificate-subject-name`          |
-| YAML                 | `TrustedRootCertificateSubjectName`                |
-| Environment variable | `EVENTSTORE_TRUSTED_ROOT_CERTIFICATE_SUBJECT_NAME` |
-
-### Certificate generation tool
-
-Event Store provides the interactive Certificate Generation CLI, which creates certificates signed by a private, auto-generated CA for EventStoreDB. You can use the [configuration wizard](installation.md), that will provide you exact CLI commands that you need to run to generate certificates matching your configuration.
-
-#### Getting started
-
-The CLI is available as Open Source project in the [Github Repository](https://github.com/EventStore/es-gencert-cli). The latest release can be found under the [GitHub releases page.](https://github.com/EventStore/es-gencert-cli/releases)
-
-We're releasing binaries for Windows, Linux and macOS. We also publish the tool as a Docker image.
-
-Basic usage for the Certificate Generation CLI:
-
-```bash
-./es-gencert-cli [options] <command> [args]
-```
-
-Getting help for a specific command:
-
-```bash
-./es-gencert-cli -help <command>
-```
-
-::: warning
-If you are running EventStoreDB on Linux, remember that all certificate files should have restrictive rights, otherwise the OS won't allow using them.
-Usually, you'd need to change rights for each certificate file to prevent the "permissions are too open" error.
-
-You can do it by running the following command:
-
-```bash
-chmod 600 [file]
-```
-:::
-
-#### Generating the CA certificate
-
-As the first step CA certificate needs to be generated. It'll need to be trusted for each of the nodes and client environment.
-
-By default, the tool will create the `ca` directory in the `certs` directory you created. Two keys will be generated:
-- `ca.crt` - public file that need to be used also for the nodes and client configuration,
-- `ca.key` - private key file that should be used only in the node configuration. **Do not copy it to client environment**.
-
-CA certificate will be generated with pre-defined CN `eventstoredb-node`.
-
-To generate CA certificate run:
-
-```bash
-./es-gencert-cli create-ca
-```
-
-You can customise generated cert by providing following params:
-
-| Param   | Description                                                       |
-|:--------|:------------------------------------------------------------------|
-| `-days` | The validity period of the certificate in days (default: 5 years) |
-| `-out`  | The output directory (default: ./ca)                              |
-
-Example:
-
-```bash
-./es-gencert-cli create-ca -out ./es-ca
-```
-
-#### Generating the Node certificate
-
-You need to generate certificates signed by the CA for each node. They should be installed only on the specific node machine.
-
-By default, the tool will create the `ca` directory in the `certs` directory you created. Two keys will be generated:
-- `node.crt` - the public file that needs to be also used for the nodes and client configuration,
-- `node.key` - the private key file that should be used only in the node's configuration. **Do not copy it to client environment**.
-
-To generate node certificate run command:
-
-```bash
-./es-gencert-cli -help create_node
-```
-
-You can customise generated cert by providing following params:
-
-| Param             | Description                                                                   |
-|:------------------|:------------------------------------------------------------------------------|
-| `-ca-certificate` | The path to the CA certificate file (default: `./ca/ca.crt`)                  |
-| `-ca-key`         | The path to the CA key file (default: `./ca/ca.key`)                          |
-| `-days`           | The output directory (default: `./nodeX` where X is an auto-generated number) |
-| `-out`            | The output directory (default: `./ca`)                                        |
-| `-ip-addresses`   | Comma-separated list of IP addresses of the node                              |
-| `-dns-names`      | Comma-separated list of DNS names of the node                                 |
-
-::: warning
-While generating the certificate, you need to remember to pass internal end external:
-- IP addresses to `-ip-addresses`: e.g. `127.0.0.1,172.20.240.1` and/or
-- DNS names to `-dns-names`: e.g. `localhost,node1.eventstore`
-  that will match the URLs that you will be accessing EventStoreDB nodes.
-  :::
-
-Sample:
-
-```
-./es-gencert-cli-cli create-node \
-    -ca-certificate ./es-ca/ca.crt \
-    -ca-key ./es-ca/ca.key \
-    -out ./node1 \
-    -ip-addresses 127.0.0.1,172.20.240.1 \
-    -dns-names localhost,node1.eventstore
-```
-
-#### Running with Docker
-
-You could also run the tool using Docker interactive container:
-
-```bash
-docker run --rm -i eventstore/es-gencert-cli <command> <options>
-```
-
-One useful scenario is to use the Docker Compose file tool to generate all the necessary certificates before starting cluster nodes.
-
-Sample:
-
-```yaml
-version: "3.5"
-
-services:
-  setup:
-    image: eventstore/es-gencert-cli:1.0.2
-    entrypoint: bash
-    user: "1000:1000"
-    command: >
-      -c "mkdir -p ./certs && cd /certs
-      && es-gencert-cli create-ca
-      && es-gencert-cli create-node -out ./node1 -ip-addresses 127.0.0.1,172.20.240.1 -dns-names localhost,node1.eventstore
-      && es-gencert-cli create-node -out ./node1 -ip-addresses 127.0.0.1,172.20.240.2 -dns-names localhost,node2.eventstore
-      && es-gencert-cli create-node -out ./node1 -ip-addresses 127.0.0.1,172.20.240.3 -dns-names localhost,node3.eventstore
-      && find . -type f -print0 | xargs -0 chmod 666"
-    container_name: setup
-    volumes:
-      - ./certs:/certs
-```
-
-See more in the [complete sample of docker-compose secured cluster configuration.](installation.md#use-docker-compose)
-
-### Certificate installation on a client environment
-
-To connect to EventStoreDB, you need to install the auto-generated CA certificate file on the client machine (e.g. machine where the client is hosted, or your dev environment).
-
-#### Linux (Ubuntu, Debian)
-
-1. Copy auto-generated CA file to dir `/usr/local/share/ca-certificates/`, e.g. using command:
-  ```bash
-  sudo cp ca.crt /usr/local/share/ca-certificates/event_store_ca.crt
-  ```
-2. Update the CA store:
-  ```bash
-  sudo update-ca-certificates
-  ```
-
-#### Windows
-
-1. You can manually import it to the local CA cert store through `Certificates Local Machine Management Console`. To do that select **Run** from the **Start** menu, and then enter `certmgr.msc`. Then import certificate to `Trusted Root Certification`.
-2. You can also run the PowerShell script instead:
-
-```powershell
-Import-Certificate -FilePath ".\certs\ca\ca.crt" -CertStoreLocation Cert:\CurrentUser\Root
-```
-
-#### MacOS
-
-1. In the Keychain Access app on your Mac, select either the login or System keychain. Drag the certificate file onto the Keychain Access app. If you're asked to provide a name and password, type the name and password for an administrator user on this computer.
-2. You can also run the bash script:
-
-```bash
-sudo security add-certificates -k /Library/Keychains/System.keychain ca.crt 
-```
-
-### Intermediate CA certificates
-
-Intermediate CA certificates are supported by loading them from a [PEM](https://datatracker.ietf.org/doc/html/rfc1422) or [PKCS #12](https://datatracker.ietf.org/doc/html/rfc7292) bundle specified by the [`CertificateFile` configuration parameter](#certificate-file). To make sure that the configuration is correct, the certificate chain is validated on startup with the node's own certificate.
-
-If you've used the [certificate generation tool](#certificate-generation-tool) with the default settings to generate your CA and node certificates, then you're not using intermediate CA certificates.
-
-However, if you're using a public certificate authority (e.g [Let's Encrypt](https://letsencrypt.org/)) to generate your node certificates there is a chance that you're using intermediate CA certificates without knowing. This is due to the [Authority Information Access (AIA)](https://datatracker.ietf.org/doc/html/rfc4325#section-2) extension which allows intermediate certificates to be fetched from a remote server.
-
-To verify if your certificate is using the AIA extension, you need to verify if there is a section named: `Authority Information Access` in the certificate.
-
-:::: tabs
-::: tab Linux
-
-Use `openssl` to find the section in the certificate file:
-
-```
-openssl x509 -in /path/to/node.crt -text | grep 'Authority Information Access' -A 1
-```
-:::
-::: tab Windows
-Open the certificate, go to the `Details` tab and look for the `Authority Information Access` field.
-
-If the extension is present, you can manually download the intermediate certificate from the URL present under the `CA Issuers` entry.
-Note that you will usually need to convert the downloaded certificate from the `DER` to the `PEM` format.
-
-This can be done with the following `openssl` command:
-
-```bash
-openssl x509 -inform der -in /path/to/cert.der > /path/to/cert.pem
-```
-
-or with [an online service](https://www.sslshopper.com/ssl-converter.html) if you don't have openssl installed.
-:::
-::::
-
-It's possible that there are more than one intermediate CA certificates in the chain - so you need to verify if the certificate you've just downloaded also uses the AIA extension. If yes, you need to download the next intermediate CA certificate in the chain by repeating the same process above until you eventually reach a publicly trusted root certificate (i.e. the `Subject` and `Issuer` fields will match). In practice, there'll usually be at most two intermediate certificates in the chain.
-
-#### Bundling the intermediate certificates
-
-The node's certificate should be first in the bundle, followed by the intermediates. Intermediates can be in any order but it would be good to keep it from leaf to root, as per the usual convention. The root certificate should not be bundled.
-
-In the examples below, intermediate certificates are numbered from 1 to N starting from the leaf and going up.
-
-##### PEM format
-
-If your node's certificate and the intermediate CA certificates are both PEM formatted, that is they begin with `-----BEGIN CERTIFICATE-----` and end with `-----END CERTIFICATE-----` then you can simply append the contents of the intermediate certificate files to the end of the node's certificate file to create the bundle.
-
-:::: code-group
-::: code-group-item Linux
-
-```bash
-cat /path/to/intermediate1.crt >> /path/to/node.crt
-...
-cat /path/to/intermediateN.crt >> /path/to/node.crt
-```
-
-:::
-::: code-group-item Windows
-
-```powershell
-type C:\path\to\intermediate1.crt >> C:\path\to\node.crt
-...
-type C:\path\to\intermediateN.crt >> C:\path\to\node.crt
-```
-:::
-::::
-
-##### PKCS #12 format
-
-If you want to generate a PKCS #12 bundle from PEM formatted certificate files, please follow the steps below.
-
-```bash
-cat /path/to/intermediate1.crt >> ./ca_bundle.crt
-...
-cat /path/to/intermediateN.crt >> ./ca_bundle.crt
-
-openssl pkcs12 -export -in /path/to/node.crt -inkey /path/to/node.key -certfile ./ca_bundle.crt -out /path/to/node.p12 -passout pass:<password>
-```
-
-#### Adding intermediate certificates to the certificate store
-
-Intermediate certificates also need to be added to the current user's certificate store.
-
-This is required for two reasons:  
-i)  For the full certificate chain to be sent when TLS connections are established  
-ii) To improve performance by preventing certificate downloads if your certificate uses the AIA extension  
-
-:::: tabs
-::: tab Linux
-The following script assumes EventStoreDB is running under the `eventstore` account.
-
-```bash
-sudo su eventstore --shell /bin/bash
-dotnet tool install --global dotnet-certificate-tool
- ~/.dotnet/tools/certificate-tool add -s CertificateAuthority -l CurrentUser --file /path/to/intermediate.crt
-```
-:::
-::: tab Windows
-To import the intermediate certificate in the `Intermediate Certification Authorities` certificate store, run the following PowerShell command under the same account as EventStoreDB is running:
-
-```powershell
-Import-Certificate -FilePath .\path\to\intermediate.crt -CertStoreLocation Cert:\CurrentUser\CA
-```
-
-Optionally, to import the intermediate certificate in the `Local Computer` store, run the following as `Administrator`:
-
-```powershell
-Import-Certificate -FilePath .\ca.crt -CertStoreLocation Cert:\LocalMachine\CA
-```
-:::
-::::
-
-### TCP protocol security
-
-Although TCP is disabled by default for external connections (clients), cluster nodes still use TCP for replication. If you aren't running EventStoreDB in insecure mode, all TCP communication will use TLS using the same certificates as SSL.
-
-You can, however, disable TLS for both internal and external TCP.
-
-| Format               | Syntax                                |
-|:---------------------|:--------------------------------------|
-| Command line         | `--disable-internal-tcp-tls`          |
-| YAML                 | `DisableInternalTcpTls`               |
-| Environment variable | `EVENTSTORE_DISABLE_INTERNAL_TCP_TLS` |
-
-**Default**: `false`
-
-## Authentication
-
-EventStoreDB supports authentication based on usernames and passwords out of the box. The Enterprise version
-also supports LDAP as the authentication source.
-
-Authentication is applied to all HTTP endpoints, except `/info`, `/ping`, `/stats`, `/elections` (only `GET`)
-, `/gossip` (only `GET`) and static web content.
-
-### Default users
-
-EventStoreDB provides two default users, `$ops` and `$admin`.
-
-`$admin` has full access to everything in EventStoreDB. It can read and write to protected streams, which is
-any stream that starts with \$, such as `$projections-master`. Protected streams are usually system streams,
-for example, `$projections-master` manages some projections' states. The `$admin` user can also run
-operational commands, such as scavenges and shutdowns on EventStoreDB.
-
-An `$ops` user can do everything that an `$admin` can do except manage users and read from system streams (
-except for `$scavenges` and `$scavenges-streams`).
-
-### New users
-
-New users created in EventStoreDB are standard non-authenticated users. Non-authenticated users are
-allowed `GET` access to the `/info`, `/ping`, `/stats`, `/elections`, and `/gossip` system streams.
-
-`POST` access to the `/elections` and `/gossip` system streams is only allowed on the internal HTTP service.
-
-By default, any user can read any non-protected stream unless there is an ACL preventing that.
-
-### Externalised authentication
-
-You can also use the trusted intermediary header for externalized authentication that allows you to integrate
-almost any authentication system with EventStoreDB. Read more
-about [the trusted intermediary header](#trusted-intermediary).
-
-### Disable HTTP authentication
-
-It is possible to disable authentication on all protected HTTP endpoints by setting
-the `DisableFirstLevelHttpAuthorization` setting to `true`. The setting is set to `false` by default. When
-enabled, the setting will force EventStoreDB to use the supplied credentials only to check the stream access
-using [ACLs](#access-control-lists).
-
-## Access control lists
-
-By default, authenticated users have access to the whole EventStoreDB database. In addition to that, it allows
-you to use Access Control Lists (ACLs) to set up more granular access control. In fact, the default access
-level is also controlled by a special ACL, which is called the [default ACL](#default-acl).
-
-### Stream ACL
-
-EventStoreDB keeps the ACL of a stream in the stream metadata as JSON with the below definition:
-
-```json
-{
-  "$acl": {
-    "$w": "$admins",
-    "$r": "$all",
-    "$d": "$admins",
-    "$mw": "$admins",
-    "$mr": "$admins"
-  }
-}
-```
-
-These fields represent the following:
-
-- `$w` The permission to write to this stream.
-- `$r` The permission to read from this stream.
-- `$d` The permission to delete this stream.
-- `$mw` The permission to write the metadata associated with this stream.
-- `$mr` The permission to read the metadata associated with this stream.
-
-You can update these fields with either a single string or an array of strings representing users or
-groups (`$admins`, `$all`, or custom groups). It's possible to put an empty array into one of these fields,
-and this has the effect of removing all users from that permission.
-
-::: tip 
-We recommend you don't give people access to `$mw` as then they can then change the ACL.
-:::
-
-### Default ACL
-
-The `$settings` stream has a special ACL used as the default ACL. This stream controls the default ACL for
-streams without an ACL and also controls who can create streams in the system, the default state of these is
-shown below:
-
-```json
-{
-  "$userStreamAcl": {
-    "$r": "$all",
-    "$w": "$all",
-    "$d": "$all",
-    "$mr": "$all",
-    "$mw": "$all"
-  },
-  "$systemStreamAcl": {
-    "$r": "$admins",
-    "$w": "$admins",
-    "$d": "$admins",
-    "$mr": "$admins",
-    "$mw": "$admins"
-  }
-}
-```
-
-You can rewrite these to the `$settings` stream with the following request:
-
-@[code{curl}](@samples/default-settings.sh)
-
-The `$userStreamAcl` controls the default ACL for user streams, while all system streams use
-the `$systemStreamAcl` as the default.
-
-::: tip 
-The `$w` in `$userStreamAcl` also applies to the ability to create a stream. Members of `$admins`
-always have access to everything, you cannot remove this permission.
-:::
-
-When you set a permission on a stream, it overrides the default values. However, it's not necessary to specify
-all permissions on a stream. It's only necessary to specify those which differ from the default.
-
-Here is an example of the default ACL that has been changed:
-
-```json
-{
-  "$userStreamAcl": {
-    "$r": "$all",
-    "$w": "ouro",
-    "$d": "ouro",
-    "$mr": "ouro",
-    "$mw": "ouro"
-  },
-  "$systemStreamAcl": {
-    "$r": "$admins",
-    "$w": "$admins",
-    "$d": "$admins",
-    "$mr": "$admins",
-    "$mw": "$admins"
-  }
-}
-```
-
-This default ACL gives `ouro` and `$admins` create and write permissions on all streams, while everyone else
-can read from them. Be careful allowing default access to system streams to non-admins as they would also have
-access to `$settings` unless you specifically override it.
-
-Refer to the documentation of the HTTP API or SDK of your choice for more information about changing ACLs
-programmatically.
-
-## Trusted intermediary
-
-The trusted intermediary header helps EventStoreDB to support a common security architecture. There are
-thousands of possible methods for handling authentication and it is impossible for us to support them all. The
-header allows you to configure a trusted intermediary to handle the authentication instead of EventStoreDB.
-
-A sample configuration is to enable OAuth2 with the following steps:
-
-- Configure EventStoreDB to run on the local loopback.
-- Configure nginx to handle OAuth2 authentication.
-- After authenticating the user, nginx rewrites the request and forwards it to the loopback to EventStoreDB
-  that serves the request.
-
-The header has the form of `{user}; group, group1` and the EventStoreDB ACLs use the information to handle
-security.
-
-```http:no-line-numbers
-ES-TrustedAuth: "root; admin, other"
-```
-
-Use the following option to enable this feature:
-
-| Format               | Syntax                           |
-|:---------------------|:---------------------------------|
-| Command line         | `--enable-trusted-auth`          |
-| YAML                 | `EnableTrustedAuth`              |
-| Environment variable | `EVENTSTORE_ENABLE_TRUSTED_AUTH` |
-
-## FIPS 140-2 <Badge type="warning" vertical="middle" text="Commercial"/>
-
-EventStoreDB runs on FIPS 140-2 enabled operating systems, this feature requires a commercial licence.
-
-The Federal Information Processing Standards (FIPS) of the United States are a set of publicly announced standards that the National Institute of Standards and Technology (NIST) has developed for use in computer systems of non-military United States government agencies and contractors.
-
-The 140 series of FIPS (FIPS 140) are U.S. government computer security standards that specify requirements for cryptography modules.
-
-To run EventStoreDB on FIPS 140-2 enabled operating systems, the following is required:
-
-1. The FIPS plugin must be installed. It is available on our [commercial downloads page](https://developers.eventstore.org/). To install it, unzip it in the `plugins` directory inside the server installation directory and restart the server.
-2. The node's certificates & keys must be FIPS 140-2 compliant
-    - Our certificate generation tool, [es-gencert-cli](https://github.com/EventStore/es-gencert-cli/releases), generates FIPS 140-2 compliant certificates & keys as from version 1.2.0 (only the linux build).
-    - If you want to manually generate your certificates or keys with openssl, you must use openssl 3 or later.
-    - If you want to use PKCS #12 bundles (.p12/.pfx extension), you must use a FIPS 140-2 compliant encryption algorithm (e.g AES-256) & hash algorithm (e.g SHA-256) to encrypt the bundle's contents.
-
-Note that EventStoreDB will also likely run properly on FIPS 140-3 compliant systems with the above steps but this cannot reliably be confirmed at the moment as FIPS 140-3 certification is still ongoing for several operating systems.
-
-## LDAP authentication <Badge type="warning" vertical="middle" text="Commercial"/>
-
-The LDAP Authentication plugin enables EventStoreDB to use LDAP-based directory services for authentication. 
-
-### Configuration steps
-
-To set up EventStoreDB with LDAP authentication, follow these steps on the [database node's configuration file](@server/configuration.md). Remember to stop the service before making changes, and then start it. 
-
-1. Change the authentication type to `ldaps`.
-2. Add a section named `LdapsAuth` for LDAP-specific settings. 
-
-Example configuration file in YAML format:
-
-```yaml
-AuthenticationType: ldaps
-LdapsAuth:
-  Host: 13.88.9.49
-  Port: 636 #to use plaintext protocol, set Port to 389 and UseSSL to false 
-  UseSSL: true
-  ValidateServerCertificate: false #set this to true to validate the certificate chain
-  AnonymousBind: false
-  BindUser: cn=binduser,dc=mycompany,dc=local
-  BindPassword: p@ssw0rd!
-  BaseDn: ou=Lab,dc=mycompany,dc=local
-  ObjectClass: organizationalPerson
-  Filter: sAMAccountName
-  RequireGroupMembership: false #set this to true to allow authentication only if the user is a member of the group specified by RequiredGroupDn
-  GroupMembershipAttribute: memberOf
-  RequiredGroupDn: cn=ES-Users,dc=mycompany,dc=local
-  PrincipalCacheDurationSec: 60
-  LdapGroupRoles:
-      'cn=ES-Accounting,ou=Staff,dc=mycompany,dc=local': accounting
-      'cn=ES-Operations,ou=Staff,dc=mycompany,dc=local': it
-      'cn=ES-Admins,ou=Staff,dc=mycompany,dc=local': '$admins'
-```
-
-Upon successful LDAP authentication, users are assigned roles based on their domain group memberships, as specified in the `LdapGroupRoles` section. EventStoreDB supports two built-in roles: `$admins` and `$ops`, which can be assigned to users. 
-
-### Troubleshooting 
-
-If you encounter issues, check the server's log. Common problems include: 
-
-| Error                                                                                       | Solution                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-|:--------------------------------------------------------------------------------------------|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Invalid Bind Credentials Specified                                                          | Confirm the `BindUser` and `BindPassword`.                                                                                                                                                                                                                                                                                                                                                                                                      |
-| Exception During Search - 'No such Object' or 'The object does not exist'                   | Verify the `BaseDn`.                                                                                                                                                                                                                                                                                                                                                                                                                            |
-| 'Server Certificate Error' or 'Connect Error - The authentication or decryption has failed' | Verify that the server certificate is valid. If it is a self-signed certificate, set `ValidateServerCertificate` to `false`.                                                                                                                                                                                                                                                                                                                    |
-| LDAP Server Unavailable                                                                     | Verify connectivity to the LDAP server from an EventStoreDB node (e.g. using `netcat` or `telnet`). Verify the `Host` and `Port` parameters.                                                                                                                                                                                                                                                                                                    |
-| Error Authenticating with LDAP server                                                       | Verify the `ObjectClass` and `Filter` parameters. If you have set `RequireGroupMembership` to `true`, verify that the user is part of the group specified by `RequiredGroupDn` and that the LDAP record has `GroupMembershipAttribute` set to `memberOf`.                                                                                                                                                                                       |
-| Error Authenticating with LDAP server. System.AggregateException                            | This packaging error may occur when setting `UseSSL: true` on Windows. Extract `Mono.Security.dll` to the _EventStore_ folder (where _EventStore.ClusterNode.exe_ is located) as a workaround.                                                                                                                                                                                                                                                  |
-| No Errors in Server Logs But Cannot Login                                                   | <ul><li>Verify that the user is part of the group specified by `RequiredGroupDn` and that the LDAP record has `GroupMembershipAttribute` set to `memberOf`.</li><li>Verify the `ObjectClass` and `Filter` parameters.</li><li>If you have set `RequireGroupMembership` to `true`, verify that the user is part of the group specified by `RequiredGroupDn` and that the LDAP record has `GroupMembershipAttribute` set to `memberOf`.</li></ul> |
-
-
-## User X.509 Certificates <Badge type="warning" vertical="middle" text="Commercial"/>
-
-The User Certificates plugin allows authentication through an X.509 user certificate in addition to username and password. User certificates work across any cluster that shares a trusted root Certificate Authority (CA) with the user's certificate. This means that you can have a single user certificate that is valid across multiple clusters.
-
-### Configuration steps
-
-Refer to the general [plugins configuration](configuration.md#plugins-configuration) guide to see how to configure plugins with JSON files and environment variables.
-
-Sample json configuration:
-```json
-{
-  "EventStore": {
-    "Plugins": {
-      "UserCertificates": {
-        "Enabled": true
-      }
-    }
-  }
-}
-```
-
-If the plugin is enabled, the server will log the following on startup:
-
-```:no-line-numbers
-UserCertificatesPlugin: user X.509 certificate authentication is enabled
-```
-
-### Connecting with a user certificate
-
-Use the following command as an example to connect using `curl`: 
-
-```:no-line-numbers
-curl -i https://localhost:2113/streams/%24all --cert user-admin.crt --key user-admin.key
-```
-
-For using X.509 user certificate with EventStoreDB client from an application, refer to the client's documentation.
-
-### Creating a user certificate
-
-The user certificate must adhere to the following requirements:
-
-- The certificate has a root CA in common with the node certificate.
-- The root CA that they have in common is trusted by the node.
-- The certificate has the ClientAuth EKU, and not the ServerAuth EKU.
-- The certificate must be in date.
-- The CN is the username of a user that exists in the database.
-
-::: tip
-Certificates can also authenticate `admin` and `ops` users.
-:::
-
-You can generate a user certificate with the [es-gencert-cli](https://github.com/EventStore/es-gencert-cli/):
-
-For example, to generate a user certificate with the username `ouro`:
-
-```:no-line-numbers
-./es-gencert-cli.exe create-user -username ouro -ca-certificate ca.crt -ca-key ca.key -days 10
-```
-
-::: details Click to view a sample user certificate
-
-```
-X509 Certificate:
-Version: 3
-Serial Number: 6339e77cacd508002e45cf38418e4f69
-Signature Algorithm:
-    Algorithm ObjectId: 1.2.840.113549.1.1.11 sha256RSA
-    Algorithm Parameters:
-    05 00
-Issuer:
-    CN=EventStoreDB CA f2993c31201bd4bb5a59f3e580d32865
-    O=Event Store Ltd
-    C=UK
-  Name Hash(sha1): cd4323cbb5259cfee1e1e01aaf472552cf18cbf2
-  Name Hash(md5): 993adcf28aa235c593611234e6abc1fc
-
- NotBefore: 2024-02-26 5:24 PM
- NotAfter: 2024-03-07 5:24 PM
-
-Subject:
-    CN=ouro
-  Name Hash(sha1): fe1463b6b0edf7f66dd22101c7d1c38f14d1292e
-  Name Hash(md5): f40719c54125d3a27290bb48d6f73b15
-
-Public Key Algorithm:
-    Algorithm ObjectId: 1.2.840.113549.1.1.1 RSA
-    Algorithm Parameters:
-    05 00
-Public Key Length: 2048 bits
-Public Key: UnusedBits = 0
-    0000  30 82 01 0a 02 82 01 01  00 9d 7b f2 25 72 0c b6
-    0010  65 01 02 16 37 60 b9 22  14 04 bf fc 54 b2 e9 6f
-    0020  c7 bc 43 8d c0 ca 3d 55  86 b4 3e 24 88 fc 70 7e
-    0030  f6 f4 38 d3 52 2d 57 a0  48 8e 91 7b f4 10 8b fd
-    0040  95 6b 41 99 d7 9b e4 d9  42 c8 c5 47 5e d1 0c 4c
-    0050  3a 5a ff a3 db ea 0d 11  89 0c 3d 7f fb 9c e5 6c
-    0060  4a 04 e7 f7 48 ff 0f 2f  63 fa be bf f5 f3 76 a1
-    0070  ea 02 27 4c ca 27 82 64  40 b5 ef f6 6f fe f2 02
-    0080  8b 16 ea 45 54 fd ba 80  2c 72 02 d0 14 41 d5 cd
-    0090  db ae 6e 4d 9b 67 60 63  ae 92 ab 2d f4 8b 70 70
-    00a0  d0 4f b1 97 66 71 9b c9  2a 5e 7a e3 d0 f5 0b eb
-    00b0  9e 37 81 09 75 fa 81 d6  3c 9f 6a e6 56 8b 1f 73
-    00c0  d0 61 4c f5 51 16 44 da  dd 3b b1 2b b9 f2 44 94
-    00d0  53 a2 08 5a 8d 4a 4e cb  d7 cb f7 0c ca 7a 1a fb
-    00e0  21 db 00 3e 75 85 c6 d3  95 bd 39 61 d1 ff 89 e7
-    00f0  88 ab b0 58 ff ce e8 d7  19 a9 75 62 dc 98 a8 8f
-    0100  58 31 a7 7c 1d 88 ba 51  5d 02 03 01 00 01
-Certificate Extensions: 5
-    2.5.29.15: Flags = 1(Critical), Length = 4
-    Key Usage
-        Digital Signature, Key Encipherment (a0)
-
-    2.5.29.37: Flags = 0, Length = c
-    Enhanced Key Usage
-        Client Authentication (1.3.6.1.5.5.7.3.2)
-
-    2.5.29.19: Flags = 1(Critical), Length = 2
-    Basic Constraints
-        Subject Type=End Entity
-        Path Length Constraint=None
-
-    2.5.29.14: Flags = 0, Length = 22
-    Subject Key Identifier
-        01fc7f1e364f1767b759dae23d43bbb1cbf2d75deabe605737969489b8de201d
-
-    2.5.29.35: Flags = 0, Length = 24
-    Authority Key Identifier
-        KeyID=5e13f92550df9af08cdab327161ef2d2ef764b77fc4246bc2b172e1d9ed81b2f
-
-Signature Algorithm:
-    Algorithm ObjectId: 1.2.840.113549.1.1.11 sha256RSA
-    Algorithm Parameters:
-    05 00
-Signature: UnusedBits=0
-    0000  8f a4 00 65 f1 a5 53 54  a8 ed de 98 cc 51 f9 1c
-    0010  49 7d f0 7c d6 9f 14 fa  13 b4 db b3 8b 56 59 6a
-    0020  d1 67 a7 e3 21 d5 2d e3  c9 73 9b 09 a9 25 74 35
-    0030  79 16 a2 ce 62 ff fd f1  5e 05 0c b6 29 3d c8 ab
-    0040  1f 7f 87 66 d3 a1 a1 23  7e 11 03 1f 28 eb af d2
-    0050  ac ef 7b 2c 0f b2 18 b4  59 b1 5a ba c9 35 5a b6
-    0060  58 ef 55 4f e7 8c 43 35  1f 22 5c 6d 65 ff 6d 7c
-    0070  af 32 3c b5 ba 00 c4 74  91 73 32 54 22 4c 52 f5
-    0080  de cf f4 ed 71 37 f6 4a  5f 3b ba 37 2c 29 77 9a
-    0090  ad a0 6f c9 a0 26 b3 a6  d3 0c 99 d6 1c f2 f0 b9
-    00a0  29 51 c7 cc 8e 47 2c 04  0f b4 6f aa 09 5b c6 a4
-    00b0  e3 b9 0b 07 3c 49 e6 62  b7 78 3b ff 81 d1 8c 26
-    00c0  3e af 24 ae 01 54 91 33  96 a1 aa 14 05 b4 0a 5b
-    00d0  42 3c 11 f1 f1 2c 93 9d  6d 8b b8 ec eb c6 e5 e7
-    00e0  a4 9a d4 59 fb ff b7 ba  e1 33 c2 f8 09 52 80 c6
-    00f0  95 95 51 35 08 1a 65 41  76 bc c2 62 2b 71 b3 65
-Non-root Certificate
-Key Id Hash(rfc-sha1): 8a3c17e6662711175142740cfeb0f52d2bdd3596
-Key Id Hash(sha1): 87a30feaaeabd616f4dad92a9f1b44a43e2d0b52
-Subject Key Id (precomputed): 01fc7f1e364f1767b759dae23d43bbb1cbf2d75deabe605737969489b8de201d
-Key Id Hash(bcrypt-sha1): b808b4e710e4f6f158a837155838a295cfbb17bf
-Key Id Hash(bcrypt-sha256): eaf799bb5f3d57dbb3afc0f5357a8723574c8c254bf159fce1c95d76f6085ae5
-Key Id Hash(md5): fbb024d546e2039af7f3e01c71278313
-Key Id Hash(sha256): ca10f7cb5af9bf9dff8f2ad43c3cbdb0647da1173631018cb8551812c425d575
-Key Id Hash(pin-sha256): MZu7Waanp4kbJ/Hx3/tpgMb6L3GnXB3PrMY+9MDBmSg=
-Key Id Hash(pin-sha256-hex): 319bbb59a6a7a7891b27f1f1dffb6980c6fa2f71a75c1dcfacc63ef4c0c19928
-Cert Hash(md5): 1719850bd6f5f09c3610e4c33d13f7c2
-Cert Hash(sha1): 12c5293973bda1df2c74ab280d492135171c8ab6
-Cert Hash(sha256): a37767096f10697fb0fcf94a3872d0984aeed4754a295c5320679876e00def32
-Signature Hash: 6d922badaba2372070f13c69b620286262eab1d8d2d2156a271a1d73aaaf64e4
-```
-
-:::
-
-### Limitations
-
-1. Requests authenticated with user certificates cannot be forwarded between nodes. This affects Writes, Persistent Subscription operations, and Projections operations. These requests will need to be performed on the Leader node only.
-
-2. The X.509 authentication cannot be used in conjunction with any of the other authentication plugins, such as the LDAP plugin.
-
-### Troubleshooting
-
-| Error                                     | Solution                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-|:------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Plugin not loaded                         | The plugin is only available in commercial editions. Check that it is present in `<installation-directory/plugins`.<br/><br/> If it is present, on startup the server will log a message similar to: `Loaded SubsystemsPlugin plugin: "user-certificates"`.                                                                                                                                                                                                                                                                |
-| Plugin not enabled                        | The plugin has to be enabled in order to authenticate user requests.<br/><br/> The following log indicates that the plugin was found but not enabled: `UserCertificatesPlugin is not enabled`.                                                                                                                                                                                                                                                                                                                             |
-| Plugin enabled and user not authenticated | If the plugin has been enabled but there are still access denied errors, check the following: <ul><li>The user exists and is enabled in the EventStoreDB database. Can you log in with the username and password?</li><li>The user certificate is valid, and has a valid chain up to a trusted root CA.</li><li>The user certificate and node certificate share a common root CA.</li><li>Use 'requires leader' (which is the default) in your client configuration to rule out issues with forwarding requests.</li></ul> |
diff --git a/docs/server-settings.md b/docs/server-settings.md
deleted file mode 100644
index 6c1889eb973..00000000000
--- a/docs/server-settings.md
+++ /dev/null
@@ -1,244 +0,0 @@
----
-id: server-settings
-title: Server settings | v24.6
-sidebar_label: Server settings
----
-
-# Server settings with ESDB v24.6
-
-EventStoreDB server settings allow you to tweak the behavior of the database server during the startup and at run-time. You may want to adjust these settings if performance issues occur.
-
-## Default directories
-
-The default directories used by EventStoreDB vary by platform to fit with the common practices each platform.
-
-### Linux
-
-When you install EventStoreDB from PackageCloud on Linux, the following locations apply:
-
-- **Application:** `/usr/bin`
-- **Content:** `/usr/share/eventstore`
-- **Configuration:** `/etc/eventstore/`
-- **Data:** `/var/lib/eventstore`
-- **Server logs:** `/var/log/eventstore`
-- **Test client logs:** `./testclientlog`
-- **Web content:** `./clusternode-web` then `{Content}/clusternode-web`
-- **Projections:** `./projections` then `{Content}/projections`
-- **Prelude:** `./Prelude` then `{Content}/Prelude`
-
-### Windows
-
-- **Configuration:** `./`
-- **Data:** `./data`
-- **Server logs:** `./logs`
-- **Test client log:** `./testclientlogs`
-- **Web content:** `./clusternode-web`
-- **Projections:** `./projections`
-- **Prelude:** `./Prelude`
-
-### Local binaries
-
-When running EventStoreDB using local binaries, either downloaded or built from source, the server will use its location and place the necessary files inside it:
-
-- **Configuration:** `./`
-- **Data:** `./data`
-- **Server logs:** `./logs`
-- **Test client log:** `./testclientlogs`
-- **Web content:** `./clusternode-web`
-- **Projections:** `./projections`
-- **Prelude:** `./Prelude`
-
-Depending on the platform and installation type, the location of EventStoreDB executables, configuration and other necessary files vary.
-
-## Database settings
-
-### Database location
-
-EventStoreDB has a single database, which is spread across ever-growing number of physical files on the file system. Those files are called chunks and new data is always appended to the end of the latest chunk. When the chunk grows over 256 MiB, the server closes the chunk and opens a new one.
-
-Normally, you'd want to keep the database files separated from the OS and other application files. The `Db` setting tells EventStoreDB where to put those chunk files. If the database server doesn't find anything at the specified location, it will create a new database.
-
-| Format               | Syntax          |
-| :------------------- | :-------------- |
-| Command line         | `--db`          |
-| YAML                 | `Db`            |
-| Environment variable | `EVENTSTORE_DB` |
-
-**Default**: the default database location is platform specific. On Windows, the database will be stored in the `data` directory inside the EventStoreDB installation location. On Linux, it will be `/var/lib/eventstore`.
-
-### In-memory database
-
-When running EventStoreDB for educational purposes or in an automated test environment, you might want to prevent it from saving any data to the disk. EventStoreDB can keep the data in memory as soon as it has enough available RAM. When you shut down the instance that uses in-memory database, all the data will be lost.
-
-| Format               | Syntax              |
-| :------------------- | :------------------ |
-| Command line         | `--mem-db`          |
-| YAML                 | `MemDb`             |
-| Environment variable | `EVENTSTORE_MEM_DB` |
-
-**Default**: `false`
-
-### Skip database verification
-
-When the database node restarts, it checks the database files to ensure they aren't corrupted. It is a lengthy process and can take hours on a large database. EventStoreDB normally flushes every write to disk, so database files are unlikely to get corrupted. In an environment where nodes restart often for some reason, you might want to disable the database verification to allow faster startup of the node.
-
-| Format               | Syntax                      |
-| :------------------- | :-------------------------- |
-| Command line         | `--skip-db-verify`          |
-| YAML                 | `SkipDbVerify`              |
-| Environment variable | `EVENTSTORE_SKIP_DB_VERIFY` |
-
-**Default**: `false`
-
-### Chunk cache
-
-You can increase the number of chunk files that are cached if you have free memory on the nodes.
-
-The [stats response](diagnostics/README.md#statistics) contains two fields: `es-readIndex-cachedRecord` and `es-readIndex-notCachedRecord`. Statistic values for those fields tell you how many times a chunk file was retrieved from the cache and from the disk. We expect the two most recent chunks (the current chunk and the previous one) to be most frequently accessed and therefore cached.
-
-If you observe that the `es-readIndex-notCachedRecord` stats value gets significantly higher than the `es-readIndex-cachedRecord`, you can try adjusting the chunk cache.
-
-The setting `ChunkCacheSize` tells the server how much memory it can use to cache chunks (in bytes). The chunk size is 256 MiB max, so the default cache size (two chunks) is 0.5 GiB. To increase the cache size to four chunks, you can set the value to 1 GiB (`1073741824` bytes).
-
-Remember that only the latest chunks get cached. Also consider that the OS has its own file cache and increasing the chunk cache might not bring the desired performance benefit.
-
-| Format               | Syntax                         |
-| :------------------- | :----------------------------- |
-| Command line         | `--chunks-cache-size`          |
-| YAML                 | `ChunksCacheSize `             |
-| Environment variable | `EVENTSTORE_CHUNKS_CACHE_SIZE` |
-
-**Default**: `536871424`
-
-You would also need to adjust the `CachedChunks` setting to tell the server how many chunk files you want to keep in cache. For example, to double the number of cached chunks, set the `CachedChunks` setting to `4`.
-
-| Format               | Syntax                     |
-| :------------------- | :------------------------- |
-| Command line         | `--cached-chunks`          |
-| YAML                 | `CachedChunks `            |
-| Environment variable | `EVENTSTORE_CACHED_CHUNKS` |
-
-**Default**: `-1` (all)
-
-### Prepare and Commit timeouts
-
-Having prepare and commit timeouts of 2000 ms (default) means that any write done on the cluster may take up to 2000 ms before the server replies to the client that this write has timed out.
-
-Depending on your client operation timeout settings (default is 7 seconds), increasing the timeout may block a client for up to the minimum of those two timeouts which may reduce the throughput if set to a large value. The server also needs to keep track of all these writes and retries in memory until the time out is over. If a large number of them accumulate, it may slow things down.
-
-| Format               | Syntax                          |
-| :------------------- | :------------------------------ |
-| Command line         | `--prepare-timeout-ms`          |
-| YAML                 | `PrepareTimeoutMs`              |
-| Environment variable | `EVENTSTORE_PREPARE_TIMEOUT_MS` |
-
-**Default**: `2000` (in milliseconds)
-
-| Format               | Syntax                         |
-| :------------------- | :----------------------------- |
-| Command line         | `--commit-timeout-ms`          |
-| YAML                 | `CommitTimeoutMs`              |
-| Environment variable | `EVENTSTORE_COMMIT_TIMEOUT_MS` |
-
-**Default**: `2000` (in milliseconds)
-
-### Disable flush to disk
-
-:::warning
-Using this option might cause data loss.
-:::
-
-This will prevent EventStoreDB from forcing the flush to disk after writes. Please note that this is unsafe in case of a power outage.
-
-With this option enabled, EventStoreDB will still write data to the disk at the application level but not necessarily at the OS level. Usually, the OS should flush its buffers at regular intervals or when a process exits but it is something that's opaque to EventStoreDB.
-
-| Format               | Syntax                                    |
-| :------------------- | :---------------------------------------- |
-| Command line         | `--unsafe-disable-flush-to-disk`          |
-| YAML                 | `UnsafeDisableFlushToDisk`                |
-| Environment variable | `EVENTSTORE_UNSAFE_DISABLE_FLUSH_TO_DISK` |
-
-**Default**: `false`
-
-### Minimum flush delay
-
-The minimum flush delay in milliseconds.
-
-<!-- TODO -->
-
-| Format               | Syntax                           |
-| :------------------- | :------------------------------- |
-| Command line         | `--min-flush-delay-ms`           |
-| YAML                 | `MinFlushDelayMs`                |
-| Environment variable | `EVENTSTORE_MIN_FLUSH_DELAY_MS ` |
-
-**Default**: `2` (ms)
-
-## Threading
-
-### Worker threads
-
-A variety of undifferentiated work is carried out on general purpose worker threads, including sending over a network, authentication, and completion of HTTP requests.
-
-Increasing the number of threads beyond that necessary to satisfy the workload generated by other components in the system may result in additional unnecessary context switching overhead.
-
-| Format               | Syntax                      |
-| :------------------- | :-------------------------- |
-| Command line         | `--worker-threads`          |
-| YAML                 | `WorkerThreads`             |
-| Environment variable | `EVENTSTORE_WORKER_THREADS` |
-
-**Default**: `5`
-
-### Reader threads count
-
-Reader threads are used for all read operations on data files - whether the requests originate from the client or internal requests to the database. There are a number of things that cause operations to be dispatched to reader threads, including:
-
-- All index reads, including those to service stream and event number-based reads and for idempotent handling of write operations when an expected version is specified.
-- Data to service requests originating from either the HTTP or client APIs.
-- Projections needing to read data for processing.
-- Authorization needing to read access control lists from stream metadata.
-
-| Format               | Syntax                            |
-| :------------------- | :-------------------------------- |
-| Command line         | `--reader-threads-count`          |
-| YAML                 | `ReaderThreadsCount`              |
-| Environment variable | `EVENTSTORE_READER_THREADS_COUNT` |
-
-**Default**: `4`
-
-Reads are queued until a reader thread becomes available to service them. If an operation doesn't complete within an internal deadline window, a disk operation is not dispatched by the worker thread which processes the operation.
-
-The size of read operations is dependent on the size of the events appended, not on the database chunk size, which has a fixed logical size. Larger reads (subject to the operating system page size) result in more time being spent in system calls and less availability of reader threads.
-
-A higher reader count can be useful, if disks are able to support more concurrent operations. Context switching incurs additional costs in terms of performance. If disks are already saturated, adding more reader threads can exacerbate that issue and lead to more failed requests.
-
-Increasing the count of reader threads can improve performance up to a point, but it is likely to rapidly tail off once that limit is reached.
-
-## HTTP caching
-
-:::tip
-This section is about caching static resources for HTTP API. It does not affect the server performance directly and cannot be used with gRPC clients.
-:::
-
-Most of the URIs that EventStoreDB emits are immutable (including the UI and Atom Feeds).
-
-An Atom feed has a URI that represents an event, e.g., `/streams/foo/0` which represents 'event 0'. The data for event 0 never changes. If this stream is open to public reads, then the URI is set to be 'cachable' for long periods of time.
-
-You can see a similar example in reading a feed. If a stream has 50 events in it, the feed page `20/forward/10` never changes, it will always be events 20-30. Internally, EventStoreDB controls serving the right URIs by using `rel` links with feeds (for example `prev`/`next`).
-
-This caching behavior is great for performance in a production environment and we recommended you use it, but in a developer environment it can become confusing.
-
-For example, what happens if you started a database, wrote `/streams/foo/0` and performed a `GET` request? The `GET` request is cachable and now in your cache. Since this is a development environment, you shut down EventStoreDB and delete the database. You then restart EventStoreDB and append a different event to `/streams/foo/0`. You open your browser and inspect the `/streams/foo/0` stream, and you see the event appended before you deleted the database.
-
-To avoid this during development it's best to run EventStoreDB with the `--disable-http-caching` command line option. This disables all caching and solves the issue.
-
-The option can be set as follows:
-
-| Format               | Syntax                            |
-| :------------------- | :-------------------------------- |
-| Command line         | `--disable-http-caching`          |
-| YAML                 | `DisableHttpCaching`              |
-| Environment variable | `EVENTSTORE_DISABLE_HTTP_CACHING` |
-
-**Default**: `false`, so the HTTP caching is **enabled** by default.
diff --git a/docs/server/configuration/README.md b/docs/server/configuration/README.md
new file mode 100644
index 00000000000..c251196a043
--- /dev/null
+++ b/docs/server/configuration/README.md
@@ -0,0 +1,402 @@
+---
+dir:
+  text: Configuration
+  order: 2
+---
+
+# Configuring the server
+
+KurrentDB has a number of configuration options that are described in detail in the sections to the left.
+
+The options have sensible defaults, but those might not suit your specific needs and can be customised.
+
+There are multiple ways to configure KurrentDB. They are described below in order of increasing precedence:
+
+### Version and help
+
+Use the `--version` parameter in the command line to check the installed version of KurrentDB. For example:
+
+::: tabs#os
+@tab Linux
+```bash:no-line-numbers
+$ kurrentd --version
+KurrentDB version 25.0.0.1673-build.1 ee (0de5e4be-c415-4230-95d4-0f0d3b1d4a18/80248a9214b3412d5051bac58168ee5666e6cb97)
+```
+
+@tab Windows
+```powershell
+> KurrentDB.exe --version
+KurrentDB version 25.0.0.1673-build.1 ee (0de5e4be-c415-4230-95d4-0f0d3b1d4a18/80248a9214b3412d5051bac58168ee5666e6cb97)
+```
+:::
+
+The full list of available options is available from the currently installed server by using the `--help`
+option in the command line.
+
+## Configuration files
+
+### YAML
+
+The default configuration file name is `kurrentdb.conf`, and it is located in:
+- **Linux:** `/etc/kurrentdb/`
+- **Windows:** KurrentDB installation directory
+
+This configuration file has a YAML format. Options can be set as follows:
+
+```yaml
+---
+Db: "/volumes/data"
+Log: "/kurrentdb/logs"
+ReaderThreadsCount: 4
+```
+
+Nested configuration options are expressed in the natural way:
+
+```yaml
+UserCertificates:
+  Enabled: true
+```
+
+::: tip 
+You need to use the three dashes at the top of the YAML file, and spaces for indentation.
+:::
+
+The path to the configuration file can be changed with the `KURRENTDB_CONFIG` environment variable, or on the command line with `--config=path-to-file`.
+
+### JSON
+
+KurrentDB looks for JSON configuration files in the `<installation-directory>/config/` directory, and on Linux and OS X, the server additionally looks in `/etc/kurrentdb/config/`. JSON configuration may be split across multiple files or combined into a single file. Apart from the `json` extension, the names of the files is not important.
+
+All configuration options are nested under the `KurrentDB` key.
+
+```json
+{
+  "KurrentDB": {
+    "Db": "/volumes/data",
+    "Log": "/kurrentdb/logs",
+    "ReaderThreadsCount": 4,
+
+    "UserCertificates": {
+      "Enabled": true
+    }
+  }
+}
+```
+
+An option set in the JSON configuration overrides the same option set in the YAML configuration.
+
+## Environment variables
+
+When setting options via environment variables, prefix the option with `KURRENTDB_` and use double underscores `__` to indicate nesting.
+
+For example:
+
+```
+KURRENTDB_DB
+KURRENTDB_LOG
+KURRENTDB_READER_THREADS_COUNT
+KURRENTDB_USER_CERTIFICATES__ENABLED
+```
+
+An option set via an environment variables overrides the same option set in the configuration files.
+
+## Command line
+
+For example, starting KurrentDB with the `--log` option will override the default log files location:
+
+::: tabs#os
+@tab Linux
+```bash:no-line-numbers
+kurrentd --log /tmp/kurrentdb/logs
+```
+
+@tab Windows
+```bash:no-line-numbers
+KurrentDB.exe --log C:\Temp\KurrentDB\Logs
+```
+:::
+
+Use double underscores `__` to indicate nesting, as with environment variables.
+
+Additional examples:
+
+```
+--db
+--log
+--reader-threads-count
+--user-certificates__enabled
+```
+
+Command line options override the configuration files and environment variables.
+
+## Testing the configuration
+
+If more than one method is used to configure the server, it may be difficult to discern the effective
+configuration when the server starts. You can use the `--what-if` option to better understand the configuration
+details.
+
+When you run KurrentDB with the `--what-if` option, it will print out the effective configuration applied from all
+available sources (default and custom configuration file, environment variables, and command line parameters)
+to the console.
+
+::: details Click here to see a WhatIf example
+
+```
+$ KurrentDB.exe --what-if
+[13816, 1,12:02:34.627,INF] KurrentDB                      DB VERSION:               25.0.0.1673-build.1 ee (0de5e4be-c415-4230-95d4-0f0d3b1d4a18/80248a9214b3412d5051bac58168ee5666e6cb97, 2025-02-03 15:57:19.547253)
+[13816, 1,12:02:34.630,INF] KurrentDB                      OS ARCHITECTURE:          X64
+[13816, 1,12:02:34.631,INF] KurrentDB                      OS:                       Windows (Microsoft Windows NT 10.0.22631.0)
+[13816, 1,12:02:34.631,INF] KurrentDB                      RUNTIME:                  .NET 8.0.12/89ef51c5d (64-bit)
+[13816, 1,12:02:34.631,INF] KurrentDB                      GC:                       3 GENERATIONS IsServerGC: False Latency Mode: Interactive
+[13816, 1,12:02:34.632,INF] KurrentDB                      LOGS:                     C:\Users\hayle\Downloads\kurrentdb.25.0.0-build.1\logs
+[13816, 1,12:02:34.635,INF] KurrentDB
+MODIFIED OPTIONS:
+    APPLICATION OPTIONS:
+         WHAT IF:                                            true (Command Line)
+
+
+DEFAULT OPTIONS:
+    APPLICATION OPTIONS:
+         ALLOW ANONYMOUS ENDPOINT ACCESS:                    False (<DEFAULT>)
+         ALLOW ANONYMOUS STREAM ACCESS:                      False (<DEFAULT>)
+         ALLOW UNKNOWN OPTIONS:                              False (<DEFAULT>)
+         CONFIG:                                             C:\kurrentdb.25.0.0-build.1 (<DEFAULT>)
+         DISABLE HTTP CACHING:                               False (<DEFAULT>)
+         ENABLE HISTOGRAMS:                                  False (<DEFAULT>)
+         HELP:                                               False (<DEFAULT>)
+         INSECURE:                                           False (<DEFAULT>)
+         LOG FAILED AUTHENTICATION ATTEMPTS:                 False (<DEFAULT>)
+         LOG HTTP REQUESTS:                                  False (<DEFAULT>)
+         MAX APPEND SIZE:                                    1048576 (<DEFAULT>)
+         OVERRIDE ANONYMOUS ENDPOINT ACCESS FOR GOSSIP:      True (<DEFAULT>)
+         SKIP INDEX SCAN ON READS:                           False (<DEFAULT>)
+         STATS PERIOD SEC:                                   30 (<DEFAULT>)
+         TELEMETRY OPTOUT:                                   False (<DEFAULT>)
+         VERSION:                                            False (<DEFAULT>)
+         WORKER THREADS:                                     0 (<DEFAULT>)
+
+    AUTHENTICATION/AUTHORIZATION OPTIONS:
+         AUTHENTICATION CONFIG:                               (<DEFAULT>)
+         AUTHENTICATION TYPE:                                internal (<DEFAULT>)
+         AUTHORIZATION CONFIG:                                (<DEFAULT>)
+         AUTHORIZATION TYPE:                                 internal (<DEFAULT>)
+         DISABLE FIRST LEVEL HTTP AUTHORIZATION:             False (<DEFAULT>)
+
+    CERTIFICATE OPTIONS:
+         CERTIFICATE RESERVED NODE COMMON NAME:               (<DEFAULT>)
+         TRUSTED ROOT CERTIFICATES PATH:                      (<DEFAULT>)
+
+    CERTIFICATE OPTIONS (FROM FILE):
+         CERTIFICATE FILE:                                    (<DEFAULT>)
+         CERTIFICATE PASSWORD:                               ******** (<DEFAULT>)
+         CERTIFICATE PRIVATE KEY FILE:                        (<DEFAULT>)
+         CERTIFICATE PRIVATE KEY PASSWORD:                   ******** (<DEFAULT>)
+
+    CERTIFICATE OPTIONS (FROM STORE):
+         CERTIFICATE STORE LOCATION:                          (<DEFAULT>)
+         CERTIFICATE STORE NAME:                              (<DEFAULT>)
+         CERTIFICATE SUBJECT NAME:                            (<DEFAULT>)
+         CERTIFICATE THUMBPRINT:                              (<DEFAULT>)
+         TRUSTED ROOT CERTIFICATE STORE LOCATION:             (<DEFAULT>)
+         TRUSTED ROOT CERTIFICATE STORE NAME:                 (<DEFAULT>)
+         TRUSTED ROOT CERTIFICATE SUBJECT NAME:               (<DEFAULT>)
+         TRUSTED ROOT CERTIFICATE THUMBPRINT:                 (<DEFAULT>)
+
+    CLUSTER OPTIONS:
+         ARCHIVER:                                           False (<DEFAULT>)
+         CLUSTER DNS:                                        fake.dns (<DEFAULT>)
+         CLUSTER GOSSIP PORT:                                2113 (<DEFAULT>)
+         CLUSTER SIZE:                                       1 (<DEFAULT>)
+         DEAD MEMBER REMOVAL PERIOD SEC:                     1800 (<DEFAULT>)
+         DISCOVER VIA DNS:                                   True (<DEFAULT>)
+         GOSSIP ALLOWED DIFFERENCE MS:                       60000 (<DEFAULT>)
+         GOSSIP INTERVAL MS:                                 2000 (<DEFAULT>)
+         GOSSIP SEED:                                         (<DEFAULT>)
+         GOSSIP TIMEOUT MS:                                  2500 (<DEFAULT>)
+         LEADER ELECTION TIMEOUT MS:                         1000 (<DEFAULT>)
+         NODE PRIORITY:                                      0 (<DEFAULT>)
+         QUORUM SIZE:                                        1 (<DEFAULT>)
+         READ ONLY REPLICA:                                  False (<DEFAULT>)
+         STREAM INFO CACHE CAPACITY:                         0 (<DEFAULT>)
+         UNSAFE ALLOW SURPLUS NODES:                         False (<DEFAULT>)
+
+    DATABASE OPTIONS:
+         CACHED CHUNKS:                                      -1 (<DEFAULT>)
+         CHUNK INITIAL READER COUNT:                         5 (<DEFAULT>)
+         CHUNK SIZE:                                         268435456 (<DEFAULT>)
+         CHUNKS CACHE SIZE:                                  536871424 (<DEFAULT>)
+         COMMIT TIMEOUT MS:                                  2000 (<DEFAULT>)
+         DB:                                                 C:\kurrentdb.25.0.0-build.1\data (<DEFAULT>)
+         DB LOG FORMAT:                                      V2 (<DEFAULT>)
+         DISABLE SCAVENGE MERGING:                           False (<DEFAULT>)
+         HASH COLLISION READ LIMIT:                          100 (<DEFAULT>)
+         INDEX:                                               (<DEFAULT>)
+         INDEX CACHE DEPTH:                                  16 (<DEFAULT>)
+         INDEX CACHE SIZE:                                   0 (<DEFAULT>)
+         INITIALIZATION THREADS:                             1 (<DEFAULT>)
+         MAX AUTO MERGE INDEX LEVEL:                         2147483647 (<DEFAULT>)
+         MAX MEM TABLE SIZE:                                 1000000 (<DEFAULT>)
+         MAX TRUNCATION:                                     268435456 (<DEFAULT>)
+         MEM DB:                                             False (<DEFAULT>)
+         MIN FLUSH DELAY MS:                                 2 (<DEFAULT>)
+         PREPARE TIMEOUT MS:                                 2000 (<DEFAULT>)
+         READER THREADS COUNT:                               0 (<DEFAULT>)
+         REDUCE FILE CACHE PRESSURE:                         False (<DEFAULT>)
+         SCAVENGE BACKEND CACHE SIZE:                        67108864 (<DEFAULT>)
+         SCAVENGE BACKEND PAGE SIZE:                         16384 (<DEFAULT>)
+         SCAVENGE HASH USERS CACHE CAPACITY:                 100000 (<DEFAULT>)
+         SCAVENGE HISTORY MAX AGE:                           30 (<DEFAULT>)
+         SKIP DB VERIFY:                                     False (<DEFAULT>)
+         SKIP INDEX VERIFY:                                  False (<DEFAULT>)
+         STATS STORAGE:                                      File (<DEFAULT>)
+         STREAM EXISTENCE FILTER SIZE:                       256000000 (<DEFAULT>)
+         TRANSFORM:                                          identity (<DEFAULT>)
+         UNBUFFERED:                                         False (<DEFAULT>)
+         UNSAFE DISABLE FLUSH TO DISK:                       False (<DEFAULT>)
+         UNSAFE IGNORE HARD DELETE:                          False (<DEFAULT>)
+         USE INDEX BLOOM FILTERS:                            True (<DEFAULT>)
+         WRITE STATS TO DB:                                  False (<DEFAULT>)
+         WRITE THROUGH:                                      False (<DEFAULT>)
+         WRITE TIMEOUT MS:                                   2000 (<DEFAULT>)
+
+    DEFAULT USER OPTIONS:
+         DEFAULT ADMIN PASSWORD:                             ******** (<DEFAULT>)
+         DEFAULT OPS PASSWORD:                               ******** (<DEFAULT>)
+
+    DEV MODE OPTIONS:
+         DEV:                                                False (<DEFAULT>)
+         REMOVE DEV CERTS:                                   False (<DEFAULT>)
+
+    GRPC OPTIONS:
+         KEEP ALIVE INTERVAL:                                10000 (<DEFAULT>)
+         KEEP ALIVE TIMEOUT:                                 10000 (<DEFAULT>)
+
+    INTERFACE OPTIONS:
+         ADVERTISE HOST TO CLIENT AS:                         (<DEFAULT>)
+         ADVERTISE NODE PORT TO CLIENT AS:                   0 (<DEFAULT>)
+         CONNECTION PENDING SEND BYTES THRESHOLD:            10485760 (<DEFAULT>)
+         CONNECTION QUEUE SIZE THRESHOLD:                    50000 (<DEFAULT>)
+         DISABLE ADMIN UI:                                   False (<DEFAULT>)
+         DISABLE GOSSIP ON HTTP:                             False (<DEFAULT>)
+         DISABLE STATS ON HTTP:                              False (<DEFAULT>)
+         ENABLE ATOM PUB OVER HTTP:                          False (<DEFAULT>)
+         ENABLE TRUSTED AUTH:                                False (<DEFAULT>)
+         ENABLE UNIX SOCKET:                                 False (<DEFAULT>)
+         NODE HOST ADVERTISE AS:                              (<DEFAULT>)
+         NODE IP:                                            127.0.0.1 (<DEFAULT>)
+         NODE PORT:                                          2113 (<DEFAULT>)
+         NODE PORT ADVERTISE AS:                             0 (<DEFAULT>)
+         REPLICATION HEARTBEAT INTERVAL:                     700 (<DEFAULT>)
+         REPLICATION HEARTBEAT TIMEOUT:                      700 (<DEFAULT>)
+         REPLICATION HOST ADVERTISE AS:                       (<DEFAULT>)
+         REPLICATION IP:                                     127.0.0.1 (<DEFAULT>)
+         REPLICATION PORT:                                   1112 (<DEFAULT>)
+         REPLICATION TCP PORT ADVERTISE AS:                  0 (<DEFAULT>)
+
+    LOGGING OPTIONS:
+         DISABLE LOG FILE:                                   False (<DEFAULT>)
+         LOG:                                                C:\kurrentdb.25.0.0-build.1\logs (<DEFAULT>)
+         LOG CONFIG:                                         logconfig.json (<DEFAULT>)
+         LOG CONSOLE FORMAT:                                 Plain (<DEFAULT>)
+         LOG FILE INTERVAL:                                  Day (<DEFAULT>)
+         LOG FILE RETENTION COUNT:                           31 (<DEFAULT>)
+         LOG FILE SIZE:                                      1073741824 (<DEFAULT>)
+         LOG LEVEL:                                          Default (<DEFAULT>)
+
+    PROJECTION OPTIONS:
+         FAULT OUT OF ORDER PROJECTIONS:                     False (<DEFAULT>)
+         PROJECTION COMPILATION TIMEOUT:                     500 (<DEFAULT>)
+         PROJECTION EXECUTION TIMEOUT:                       250 (<DEFAULT>)
+         PROJECTION THREADS:                                 3 (<DEFAULT>)
+         PROJECTIONS QUERY EXPIRY:                           5 (<DEFAULT>)
+         RUN PROJECTIONS:                                    None (<DEFAULT>)
+         START STANDARD PROJECTIONS:                         False (<DEFAULT>)
+```
+:::
+
+::: note 
+The server will _not start_ when an unknown configuration option is passed in the configuration file, environment variable, or command line.
+
+As an example, the following will prevent the server from starting:
+
+* `--UnknownConfig` on the command line
+* `KURRENTDB_UnknownConfig` through environment variable
+* `UnknownConfig: value` in the config file
+
+And will output on `stdout`
+only: _Error while parsing options: The option UnknownConfig is not a known option. (Parameter 'UnknownConfig')_.
+:::
+
+## Autoconfigured options
+
+Some options are configured at startup to make better use of the available resources on larger instances or
+machines.
+
+These options are `StreamInfoCacheCapacity`, `ReaderThreadsCount`, and `WorkerThreads`.
+
+Autoconfiguration does not apply in containerized environments.
+
+### StreamInfoCacheCapacity
+
+This option sets the maximum number of entries in the stream info cache. This lookup contains information on
+any stream that has recently been read or written. Having entries in this cache significantly improves the write 
+and read performance to cached streams on larger databases.
+
+By default, the cache dynamically resizes based on the amount of free memory. The minimum it can be set to is 100,000 entries.
+
+| Format               | Syntax                                  |
+|:---------------------|:----------------------------------------|
+| Command line         | `--stream-info-cache-capacity`          |
+| YAML                 | `StreamInfoCacheCapacity`               |
+| Environment variable | `KURRENTDB_STREAM_INFO_CACHE_CAPACITY`  |
+
+The option is set to 0 by default, which enables dynamic resizing. The default on previous versions of
+KurrentDB was 100,000 entries.
+
+::: note
+The default value of 0 for `StreamInfoCacheCapacity` might not always be the best value for optimal performance. Ideally, it should be set to double the number of streams in the anticipated working set.
+
+Check the event count in the `$streams` system stream to obtain the total number of streams. This stream is created by the [$streams system projection](../features/projections/system.md#streams-projection).
+
+It should be noted that the total number of streams does not necessarily provide you with the anticipated working set. The working set of streams is the one you intend to read, write, and/or subscribe to actively. This can be much lower than the total number of streams in some instances, especially in systems with many short-lived streams.
+:::
+
+### ReaderThreadsCount
+
+This option configures the number of reader threads available to KurrentDB. Increased reader threads
+enables more concurrent reads to be processed.
+
+::: warning 
+Increasing the reader threads count too high can cause read timeouts if your disk cannot handle the
+increased load.
+:::
+
+The reader threads count will be set at startup to twice the number of available processors, with a minimum of
+four and a maximum of sixteen threads.
+
+| Format               | Syntax                            |
+|:---------------------|:----------------------------------|
+| Command line         | `--reader-threads-count`          |
+| YAML                 | `ReaderThreadsCount`              |
+| Environment variable | `KURRENTDB_READER_THREADS_COUNT`  |
+
+The option is set to 0 by default, which enables autoconfiguration. The default on previous versions of
+KurrentDB was four threads.
+
+
+### WorkerThreads
+
+The `WorkerThreads` option configures the number of threads available to the pool of worker services.
+
+At startup, the number of worker threads will be set to ten if there are more than four reader threads. Otherwise,
+it will be set to have five threads available.
+
+| Format               | Syntax                      |
+|:---------------------|:----------------------------|
+| Command line         | `--worker-threads`          |
+| YAML                 | `WorkerThreads`             |
+| Environment variable | `KURRENTDB_WORKER_THREADS`  |
+
+The option is set to 0 by default, which enables autoconfiguration. The default on previous versions of
+KurrentDB was five threads.
+
diff --git a/docs/server/configuration/cluster.md b/docs/server/configuration/cluster.md
new file mode 100644
index 00000000000..aadd8744289
--- /dev/null
+++ b/docs/server/configuration/cluster.md
@@ -0,0 +1,231 @@
+---
+title: Clustering
+order: 3
+---
+
+# Highly-available cluster
+
+KurrentDB allows you to run more than one node in a cluster for high availability.
+
+::: info Cluster member authentication
+KurrentDB starts in secure mode by default, which requires configuration [settings for certificates](../security/protocol-security.md#certificates-configuration).
+Cluster members authenticate each other using the certificate Common Name. All the cluster nodes must have the same common name in their certificates.
+:::
+
+## Cluster nodes
+
+KurrentDB clusters follow a "shared nothing" philosophy, meaning that clustering requires no shared disks. Instead, each node has a copy of the data to ensure it is not lost in case of a drive failure or a node crashing.
+
+::: tip
+Lean more about [node roles](#node-roles).
+:::
+
+KurrentDB uses a quorum-based replication model, in which a majority of nodes in the cluster must acknowledge that they have received a copy of the write before the write is acknowledged to the client. This means that to be able to tolerate the failure of _n_ nodes, the cluster must be of size _(2n + 1)_. A three node cluster can continue to accept writes if one node is unavailable. A five node cluster can continue to accept writes if two nodes are unavailable, and so forth.
+
+## Cluster size
+
+For any cluster configuration, you first need to decide how many nodes you want, provision each node and set the cluster size option on each node.
+
+The cluster size is a pre-defined value. The cluster expects the number of nodes to match this predefined number, otherwise the cluster would be incomplete and therefore unhealthy.
+
+The cluster cannot be dynamically scaled. If you need to change the number of cluster nodes, the cluster size setting must be changed on all nodes before the new node can join.
+
+Use the `ClusterSize` option to tell each cluster node about how many nodes the cluster should have.
+
+| Format               | Syntax                    |
+|:---------------------|:--------------------------|
+| Command line         | `--cluster-size`          |
+| YAML                 | `ClusterSize`             |
+| Environment variable | `KURRENTDB_CLUSTER_SIZE`  |
+
+**Default**: `1` (single node, no high-availability).
+
+Common values for the `ClusterSize` setting are three or five (to have a majority of two nodes and a majority of three nodes). We recommended setting this to an odd number of nodes to minimise the chance of a tie during elections, which would lengthen the election process.
+
+## Internal communication
+
+When setting up a cluster, the nodes must be able to reach each other over both the HTTP channel, and the internal TCP channel. You should ensure that these ports are open on firewalls on the machines and between the machines.
+
+Learn more about [replication configuration](networking.md#replication-protocol) and [HTTP configuration](networking.md#http-configuration) to set up the cluster properly.
+
+## Discovering cluster members
+
+Cluster nodes use the gossip protocol to discover each other and elect the cluster leader.
+
+Cluster nodes need to know about one another to gossip. To start this process, you provide gossip seeds for each node. 
+
+Configure cluster nodes to discover other nodes in one of two ways:
+- [via a DNS entry](#cluster-with-dns) and a well-known [gossip port](#gossip-port)
+- [via a list of addresses](#cluster-with-gossip-seeds) of other cluster nodes
+
+The multi-address DNS name cluster discovery only works for clusters that use certificates signed by a private certificate authority, or run insecure. For other scenarios you need to provide the gossip seed using hostnames of other cluster nodes.
+
+### Cluster with DNS
+
+When you tell KurrentDB to use DNS for its gossip, the server will resolve the DNS name to a list of IP addresses and connect to each of those addresses to find other nodes. This method is very flexible because you can change the list of nodes on your DNS server without changing the cluster configuration. The DNS method is also useful in automated deployment scenarios when you control both the cluster deployment and the DNS server from your infrastructure-as-code scripts.
+
+To use DNS discovery, you need to set the `ClusterDns` option to the DNS name that allows making an HTTP call to it. When the server starts, it will attempt to make a gRPC call using the `https://<cluster-dns>:<gossip-port>` URL (`http` if the cluster is insecure).
+
+When using a certificate signed by a publicly trusted CA, you'd normally use the wildcard certificate. Ensure that the cluster DNS name fits the wildcard, otherwise the request will fail on SSL check.
+
+When using certificates signed by a private CA, the cluster DNS name must be included to the certificate of each node as SAN (subject alternative name).
+
+You also need to have the `DiscoverViaDns` option to be set to `true` but it is its default value.
+
+| Format               | Syntax                   |
+|:---------------------|:-------------------------|
+| Command line         | `--cluster-dns`          |
+| YAML                 | `ClusterDns`             |
+| Environment variable | `KURRENTDB_CLUSTER_DNS`  |
+
+**Default**: `fake.dns`, which doesn't resolve to anything. You have to set it to a proper DNS name when used in combination to the DNS discovery (next setting).
+
+| Format               | Syntax                        |
+|:---------------------|:------------------------------|
+| Command line         | `--discover-via-dns`          |
+| YAML                 | `DiscoverViaDns`              |
+| Environment variable | `KURRENTDB_DISCOVER_VIA_DNS`  |
+
+**Default**: `true`, the DNS discovery is enabled by default.
+
+It will be used only if the cluster has more than one node. You must set the `ClusterDns` setting to a proper DNS name.
+
+When using DNS for cluster gossip, you might need to set the `GossipPort` setting to the HTTP port if the external node port setting is not set to `2113` default port. Refer to [gossip port](#gossip-port) option documentation to learn more.
+
+### Cluster with gossip seeds
+
+If you don't want or cannot use the DNS-based configuration, it is possible to tell cluster nodes to call other nodes using their IP addresses. This method is a bit more cumbersome, because each node has to have the list of addresses for other nodes configured, but not its own address.
+
+The setting accepts a comma-separated list of IP addresses or host names with their gossip port values.
+
+| Format               | Syntax                   |
+|:---------------------|:-------------------------|
+| Command line         | `--gossip-seed`          |
+| YAML                 | `GossipSeed`             |
+| Environment variable | `KURRENTDB_GOSSIP_SEED`  |
+
+## Gossip protocol
+
+KurrentDB uses a quorum-based replication model. When working normally, a cluster has one node known as a leader, and the remaining nodes are followers. The leader node is responsible for coordinating writes while it is the leader. Cluster nodes use a consensus algorithm to determine which node should be the leader and which should be followers. KurrentDB bases the decision as to which node should be the leader on a number of factors.
+
+For a cluster node to have this information available to them, the nodes gossip with other nodes in the cluster. Gossip runs over the HTTP interface of the cluster nodes.
+
+The gossip protocol configuration can be changed using the settings listed below. Pay attention to the settings related to time, like intervals and timeouts, when running in a cloud environment.
+
+### Gossip port
+
+The gossip port is used for constructing the URL for making a gossip request to other nodes that are discovered via DNS. It is not used when using gossip seeds, because in that case the list contains IP addresses and the port.
+
+::: warning
+Normally, the cluster gossip port is the same as the node port, so you don't need to change this setting.
+:::
+
+| Format               | Syntax                           |
+|:---------------------|:---------------------------------|
+| Command line         | `--cluster-gossip-port`          |
+| YAML                 | `ClusterGossipPort`              |
+| Environment variable | `KURRENTDB_CLUSTER_GOSSIP_PORT`  |
+
+**Default**: Node port
+
+### Gossip interval
+
+Cluster nodes try to ensure that the communication with their neighbour nodes is not broken. They use the gossip protocol and call each other after a specified period of time. This period is called the gossip interval. You can change the `GossipInvervalMs` setting so cluster nodes check in with each other more or less frequently.
+
+The default value is two seconds (2000 ms).
+
+| Format               | Syntax                          |
+|:---------------------|:--------------------------------|
+| Command line         | `--gossip-interval-ms`          |
+| YAML                 | `GossipIntervalMs`              |
+| Environment variable | `KURRENTDB_GOSSIP_INTERVAL_MS`  |
+
+**Default**: `2000` (in milliseconds), which is two seconds.
+
+### Time difference toleration
+
+KurrentDB expects the time on cluster nodes to be in sync within a given tolerance.
+
+If different nodes have their clock out of sync for a number of milliseconds that exceeds the value of this setting, the gossip is rejected and the node will not be accepted as a cluster member.
+
+| Format               | Syntax                                    |
+|:---------------------|:------------------------------------------|
+| Command line         | `--gossip-allowed-difference-ms`          |
+| YAML                 | `GossipAllowedDifferenceMs`               |
+| Environment variable | `KURRENTDB_GOSSIP_ALLOWED_DIFFERENCE_MS`  |
+
+**Default**: `60000` (in milliseconds), which is one minute.
+
+### Gossip timeout
+
+When nodes call each other using the gossip protocol to understand the cluster status, a busy node might delay the response. When a node is not getting a response from another node, it might consider that other node as dead. Such a situation might trigger the election process.
+
+If your cluster network is congested, you might increase the gossip timeout using the `GossipTimeoutMs` setting, so nodes will be more tolerant to delayed gossip responses. The default value is 2.5 seconds (2500 ms).
+
+| Format               | Syntax                         |
+|:---------------------|:-------------------------------|
+| Command line         | `--gossip-timeout-ms`          |
+| YAML                 | `GossipTimeoutMs`              |
+| Environment variable | `KURRENTDB_GOSSIP_TIMEOUT_MS`  |
+
+**Default**: `2500` (in milliseconds).
+
+### Leader election timeout
+
+The leader elections are separate to the node gossip, and are used to elect a node as Leader.
+
+In some cases the leader election messages may be delayed, which can result in elections taking longer than they should. If you start seeing election timeouts in the logs or if you have needed to increase the gossip timeout due to a congested network, then you should consider increasing the leader election timeout as well.
+
+| Format               | Syntax                                  |
+|:---------------------|:----------------------------------------|
+| Command line         | `--leader-election-timeout-ms`          |
+| YAML                 | `LeaderElectionTimeoutMs`               |
+| Environment variable | `KURRENTDB_LEADER_ELECTION_TIMEOUT_MS`  |
+
+**Default**: `1000` (in milliseconds).
+
+## Node roles
+
+Every node in a stable KurrentDB deployment settles into one of three roles: Leader, Follower, and ReadOnlyReplica. The cluster is composed of the Leader and Followers.
+
+### Leader
+
+The leader ensures that writes are persisted to its own disk, replicated to a majority of cluster nodes, and indexed on the leader so that they can be read from the leader, before acknowledging the write as successful to the client.
+
+### Follower
+
+A cluster assigns the follower role based on an election process. A cluster uses one or more nodes with the follower role to form the quorum, or the majority of nodes necessary to confirm that the write is persisted.
+
+### Read-only replica
+
+You can add read-only replica nodes, which will not become cluster members and will not take part in elections. Read-only replicas can be used for scaling up reads if you have many catch-up subscriptions and want to off-load cluster members.
+
+A cluster asynchronously replicates data one way to a node with the read-only replica role. The read-only replica node is not part of the cluster, so does not add to the replication requirements needed to acknowledge a write. For this reason a node with a read-only replica role does not add much overhead to the other nodes.
+
+You need to explicitly configure the node as a read-only replica using this setting:
+
+| Format               | Syntax                         |
+|:---------------------|:-------------------------------|
+| Command line         | `--read-only-replica`          |
+| YAML                 | `ReadOnlyReplica`              |
+| Environment variable | `KURRENTDB_READ_ONLY_REPLICA`  |
+
+**Default**: `false`, set to `true` for a read-only replica node.
+
+The replica node needs to have the cluster gossip DNS or seed configured. For the gossip seed, use DNS names or IP addresses of all other cluster nodes, except read-only replicas.
+
+### Node priority
+
+You can control which clones the cluster promotes with the `NodePriority` setting. The default value is `0`, and the cluster is more likely to promote nodes with higher values.
+
+| Format               | Syntax                    |
+|:---------------------|:--------------------------|
+| Command line         | `--node-priority`         |
+| YAML                 | `NodePriority`            |
+| Environment variable | `KURRENTDB_NODE_PRIORITY`  |
+
+**Default**: `0`.
+
+::: tip
+Changing `NodePriority` does not guarantee that the cluster will not promote the node. It is only one of the criteria that the Election Service considers.
+:::
diff --git a/docs/server/configuration/db-config.md b/docs/server/configuration/db-config.md
new file mode 100644
index 00000000000..0d09a5baf69
--- /dev/null
+++ b/docs/server/configuration/db-config.md
@@ -0,0 +1,176 @@
+---
+order: 1
+---
+
+# Database settings
+
+On this page, you find settings that tune the database server behaviour. Only modify these settings if you know what you are doing or when requested by Kurrent support personnel.
+
+## Database
+
+Settings described below are related to the database behaviour, like the location of the database files, in-memory database, and verification, and caches.
+
+### Database location
+
+KurrentDB has a single database, which is spread across ever-growing number of physical files on the file system. Those files are called chunks and new data is always appended to the end of the latest chunk. When the chunk grows over 256 MiB, the server closes the chunk and opens a new one.
+
+Normally, you'd want to keep the database files separated from the OS and other application files. The `Db` setting tells KurrentDB where to put those chunk files. If the database server doesn't find anything at the specified location, it will create a new database.
+
+| Format               | Syntax          |
+|:---------------------|:----------------|
+| Command line         | `--db`          |
+| YAML                 | `Db`            |
+| Environment variable | `KURRENTDB_DB`  |
+
+**Default**: the default database location is platform specific. On Windows, the database will be stored in the `data` directory inside the KurrentDB installation location. On Linux, it will be `/var/lib/kurrentdb`.
+
+### In-memory database
+
+When running KurrentDB for educational purposes or in an automated test environment, you might want to prevent it from saving any data to the disk. KurrentDB can keep the data in memory as soon as it has enough available RAM. When you shut down the instance that uses in-memory database, all the data will be lost.
+
+| Format               | Syntax              |
+|:---------------------|:--------------------|
+| Command line         | `--mem-db`          |
+| YAML                 | `MemDb`             |
+| Environment variable | `KURRENTDB_MEM_DB`  |
+
+**Default**: `false`
+
+### Skip database verification
+
+When the database node restarts, it checks the database files to ensure they aren't corrupted. It is a lengthy process and can take hours on a large database. KurrentDB normally flushes every write to disk, so database files are unlikely to get corrupted. In an environment where nodes restart often for some reason, you might want to disable the database verification to allow faster startup of the node.
+
+| Format               | Syntax                      |
+|:---------------------|:----------------------------|
+| Command line         | `--skip-db-verify`          |
+| YAML                 | `SkipDbVerify`              |
+| Environment variable | `KURRENTDB_SKIP_DB_VERIFY`  |
+
+**Default**: `false`
+
+### Chunk cache
+
+You can increase the number of chunk files that are cached if you have free memory on the nodes.
+
+The [stats response](../diagnostics/README.md#statistics) contains two fields: `es-readIndex-cachedRecord` and `es-readIndex-notCachedRecord`. Statistic values for those fields tell you how many times a chunk file was retrieved from the cache and from the disk. We expect the two most recent chunks (the current chunk and the previous one) to be most frequently accessed and therefore cached.
+
+If you observe that the `es-readIndex-notCachedRecord` stats value gets significantly higher than the `es-readIndex-cachedRecord`, you can try adjusting the chunk cache.
+
+The setting `ChunkCacheSize` tells the server how much memory it can use to cache chunks (in bytes). The chunk size is 256 MiB max, so the default cache size (two chunks) is 0.5 GiB. To increase the cache size to four chunks, you can set the value to 1 GiB (`1073741824` bytes).
+
+Remember that only the latest chunks get cached. Also consider that the OS has its own file cache and increasing the chunk cache might not bring the desired performance benefit.
+
+| Format               | Syntax                         |
+|:---------------------|:-------------------------------|
+| Command line         | `--chunks-cache-size`          |
+| YAML                 | `ChunksCacheSize `             |
+| Environment variable | `KURRENTDB_CHUNKS_CACHE_SIZE`  |
+
+**Default**: `536871424`
+
+You would also need to adjust the `CachedChunks` setting to tell the server how many chunk files you want to keep in cache. For example, to double the number of cached chunks, set the `CachedChunks` setting to `4`.
+
+| Format               | Syntax                     |
+|:---------------------|:---------------------------|
+| Command line         | `--cached-chunks`          |
+| YAML                 | `CachedChunks `            |
+| Environment variable | `KURRENTDB_CACHED_CHUNKS`  |
+
+**Default**: `-1` (all)
+
+### Prepare and Commit timeouts
+
+Having prepare and commit timeouts of 2000 ms (default) means that any write done on the cluster may take up to 2000 ms before the server replies to the client that this write has timed out.
+
+Depending on your client operation timeout settings (default is 7 seconds), increasing the timeout may block a client for up to the minimum of those two timeouts which may reduce the throughput if set to a large value. The server also needs to keep track of all these writes and retries in memory until the time out is over. If a large number of them accumulate, it may slow things down.
+
+| Format               | Syntax                          |
+|:---------------------|:--------------------------------|
+| Command line         | `--prepare-timeout-ms`          |
+| YAML                 | `PrepareTimeoutMs`              |
+| Environment variable | `KURRENTDB_PREPARE_TIMEOUT_MS`  |
+
+**Default**: `2000` (in milliseconds)
+
+| Format               | Syntax                         |
+|:---------------------|:-------------------------------|
+| Command line         | `--commit-timeout-ms`          |
+| YAML                 | `CommitTimeoutMs`              |
+| Environment variable | `KURRENTDB_COMMIT_TIMEOUT_MS`  |
+
+**Default**: `2000` (in milliseconds)
+
+### Disable flush to disk
+
+:::warning
+Using this option might cause data loss.
+:::
+
+This will prevent KurrentDB from forcing the flush to disk after writes. Please note that this is unsafe in case of a power outage.
+
+With this option enabled, KurrentDB will still write data to the disk at the application level but not necessarily at the OS level. Usually, the OS should flush its buffers at regular intervals or when a process exits but it is something that's opaque to KurrentDB.
+
+| Format               | Syntax                                    |
+|:---------------------|:------------------------------------------|
+| Command line         | `--unsafe-disable-flush-to-disk`          |
+| YAML                 | `UnsafeDisableFlushToDisk`                |
+| Environment variable | `KURRENTDB_UNSAFE_DISABLE_FLUSH_TO_DISK`  |
+
+**Default**: `false`
+
+### Minimum flush delay
+
+The minimum flush delay in milliseconds.
+
+<!-- TODO -->
+
+| Format               | Syntax                           |
+|:---------------------|:---------------------------------|
+| Command line         | `--min-flush-delay-ms`           |
+| YAML                 | `MinFlushDelayMs`                |
+| Environment variable | `KURRENTDB_MIN_FLUSH_DELAY_MS `  |
+
+**Default**: `2` (ms)
+
+## Threading
+
+Settings described below are related to the threading model used by KurrentDB.
+
+### Worker threads
+
+A variety of undifferentiated work is carried out on general purpose worker threads, including sending over a network, authentication, and completion of HTTP requests.
+
+Increasing the number of threads beyond that necessary to satisfy the workload generated by other components in the system may result in additional unnecessary context switching overhead.
+
+| Format               | Syntax                      |
+|:---------------------|:----------------------------|
+| Command line         | `--worker-threads`          |
+| YAML                 | `WorkerThreads`             |
+| Environment variable | `KURRENTDB_WORKER_THREADS`  |
+
+**Default**: `5`
+
+### Reader threads count
+
+Reader threads are used for all read operations on data files - whether the requests originate from the client or internal requests to the database. There are a number of things that cause operations to be dispatched to reader threads, including:
+
+- All index reads, including those to service stream and event number-based reads and for idempotent handling of write operations when an expected version is specified.
+- Data to service requests originating from either the HTTP or client APIs.
+- Projections needing to read data for processing.
+- Authorization needing to read access control lists from stream metadata.
+
+| Format               | Syntax                            |
+|:---------------------|:----------------------------------|
+| Command line         | `--reader-threads-count`          |
+| YAML                 | `ReaderThreadsCount`              |
+| Environment variable | `KURRENTDB_READER_THREADS_COUNT`  |
+
+**Default**: `4`
+
+Reads are queued until a reader thread becomes available to service them. If an operation doesn't complete within an internal deadline window, a disk operation is not dispatched by the worker thread which processes the operation.
+
+The size of read operations is dependent on the size of the events appended, not on the database chunk size, which has a fixed logical size. Larger reads (subject to the operating system page size) result in more time being spent in system calls and less availability of reader threads.
+
+A higher reader count can be useful, if disks are able to support more concurrent operations. Context switching incurs additional costs in terms of performance. If disks are already saturated, adding more reader threads can exacerbate that issue and lead to more failed requests.
+
+Increasing the count of reader threads can improve performance up to a point, but it is likely to rapidly tail off once that limit is reached.
diff --git a/docs/indexes.md b/docs/server/configuration/indexes.md
similarity index 80%
rename from docs/indexes.md
rename to docs/server/configuration/indexes.md
index d5aab1755d0..bf6de712574 100644
--- a/docs/indexes.md
+++ b/docs/server/configuration/indexes.md
@@ -1,14 +1,13 @@
 ---
-title: "Indexes"
+title: "Indexing"
+order: 4
 ---
 
-## Indexing
+KurrentDB stores indexes separately from the main data files, accessing records by stream name.
 
-EventStoreDB stores indexes separately from the main data files, accessing records by stream name.
+## Overview
 
-### Overview
-
-EventStoreDB creates index entries as it processes commit events. It holds these in memory (called 
+KurrentDB creates index entries as it processes commit events. It holds these in memory (called 
 _memtables_) until it reaches the `MaxMemTableSize` and then persisted on disk in the _index_ folder along
 with `.bloomfilter` files and an index map file. The index files are uniquely named, and the index map file
 called _indexmap_. The index map describes the order and the level of the index file as well as containing the
@@ -16,10 +15,10 @@ data checkpoint for the last written file, the version of the index map file and
 file. The logs refer to the index files as a _PTable_.
 
 Indexes are sorted lists based on the hashes of stream names. To speed up seeking the correct location in the
-file of an entry for a stream, EventStoreDB keeps midpoints to relate the stream hash to the physical offset
+file of an entry for a stream, KurrentDB keeps midpoints to relate the stream hash to the physical offset
 in the file.
 
-As EventStoreDB saves more files, they are automatically merged together whenever there are more than 2 files
+As KurrentDB saves more files, they are automatically merged together whenever there are more than 2 files
 at the same level into a single file at the next level. Each index entry is 24 bytes and the index file size
 is approximately 24Mb per 1M events. The Bloom filter files are approximately 1% of the size of the rest of
 the index.
@@ -45,7 +44,7 @@ Each index entry is 24 bytes and the index file size is approximately 24Mb per M
 
 ## Indexing in depth
 
-For general operation of EventStoreDB the following information is not critical but useful for developers
+For general operation of KurrentDB the following information is not critical but useful for developers
 wanting to make changes in the indexing subsystem and for understanding crash recovery and tuning scenarios.
 
 ### Index map files
@@ -65,33 +64,33 @@ The _indexmap_ structure is as follows:
 - `ptable`,`level`,`index`- List of all the _ptables_ used by this index map with the level of the _ptable_
   and it's order.
 
-EventStoreDB writes _indexmap_ files to a temporary file and then deletes the original and renames the
-temporary file. EventStoreDB attempts this 5 times before failing. Because of the order, this operation can
+KurrentDB writes _indexmap_ files to a temporary file and then deletes the original and renames the
+temporary file. KurrentDB attempts this 5 times before failing. Because of the order, this operation can
 only fail if there is an issue with the underlying file system or the disk is full. This is a 2 phase process,
-and in the unlikely event of a crash during this process, EventStoreDB recovers by rebuilding the indexes
+and in the unlikely event of a crash during this process, KurrentDB recovers by rebuilding the indexes
 using the same process used if it detects corrupted files during startup.
 
 ### Writing and merging of index files
 
 Merging _ptables_, updating the _indexmap_ and persisting _memtable_ operations happen on a background thread.
 These operations are performed on a single thread with any additional operations queued and completed later.
-EventStoreDB runs these operations on a thread pool thread rather than a dedicated thread. Generally there is
+KurrentDB runs these operations on a thread pool thread rather than a dedicated thread. Generally there is
 only one operation queued at a time, but if merging to _ptables_ at one level causes 2 tables to be available
 at the next level, then the next merge operation is immediately queued. While merge operations are in
-progress, if EventStoreDB is appending large numbers of events, it may queue 1 or more _memtables_ for
+progress, if KurrentDB is appending large numbers of events, it may queue 1 or more _memtables_ for
 persistence. The number of pending operations is logged.
 
-For safety _ptables_ EventStoreDB is currently merging are only deleted after the new _ptable_ has persisted
-and the _indexmap_  updated. In the event of a crash, EventStoreDB recovers by deleting any files not in the
+For safety _ptables_ KurrentDB is currently merging are only deleted after the new _ptable_ has persisted
+and the _indexmap_  updated. In the event of a crash, KurrentDB recovers by deleting any files not in the
 _indexmap_ and reindexing from the prepare/commit position stored in the _indexmap_ file.
 
 ### Manual merging
 
 If you have set the maximum level ([`MaxAutoMergeIndexLevel`](#auto-merge-index-level)) for automatically
 merging indexes, then you need to trigger merging indexes above this level manually by using
-the `/admin/mergeindexes` endpoint, or the es-cli tool that is available with commercial support.
+the `/admin/mergeindexes` endpoint, or the es-cli tool.
 
-Triggering a manual merge causes EventStoreDB to merge all tables that have a level equal to the maximum merge
+Triggering a manual merge causes KurrentDB to merge all tables that have a level equal to the maximum merge
 level or above into a single table. If there is only 1 table at the maximum level or above, no merge is
 performed.
 
@@ -107,11 +106,11 @@ where in the log the filter has processed up to. As per the documented backup pr
 to be backed up before the dat file.
 
 The Stream Existence Filter is used when reading and writing to quickly determine whether a stream _might
-exist_ or _definitely does not exist_. If a stream definitely does not exist then EventStoreDB can skip
+exist_ or _definitely does not exist_. If a stream definitely does not exist then KurrentDB can skip
 looking through the index to find information about it. This is particularly useful when creating new
 streams (i.e. appending to stream that did not previously exist).
 
-Additional information can be found in this [`blog post`](https://www.eventstore.com/blog/bloom-filters).
+Additional information can be found in this [`blog post`](https://www.kurrent.io/blog/bloom-filters).
 
 ## Configuration options
 
@@ -136,7 +135,7 @@ Read more below to understand these options better.
 |:---------------------|:-------------------|
 | Command line         | `--index`          |
 | YAML                 | `Index`            |
-| Environment variable | `EVENTSTORE_INDEX` | 
+| Environment variable | `KURRENTDB_INDEX`  |
 
 **Default**: data files location
 
@@ -149,20 +148,20 @@ avoid competition for IO between the data, index and log files.
 |:---------------------|:--------------------------------|
 | Command line         | `--max-mem-table-size`          |
 | YAML                 | `MaxMemTableSize`               |
-| Environment variable | `EVENTSTORE_MAX_MEM_TABLE_SIZE` | 
+| Environment variable | `KURRENTDB_MAX_MEM_TABLE_SIZE`  |
 
 **Default**: `1000000`
 
-`MaxMemTableSize` affects disk IO when EventStoreDB writes files to disk, index seek time and database startup
+`MaxMemTableSize` affects disk IO when KurrentDB writes files to disk, index seek time and database startup
 time. The default size is a good tradeoff between low disk IO and startup time. Increasing
 the `MaxMemTableSize` results in longer database startup time because a node has to read through the data
 files from the last position in the `indexmap` file and rebuild the in memory index table before it starts.
 
 <!-- TODO: Polish a little more -->
 
-Increasing `MaxMemTableSize` also decreases the number of times EventStoreDB writes index files to disk and
+Increasing `MaxMemTableSize` also decreases the number of times KurrentDB writes index files to disk and
 how often it merges them together, which increases IO operations. It also reduces the number of seek
-operations when stream entries span multiple files as EventStoreDB needs to search each file for the stream
+operations when stream entries span multiple files as KurrentDB needs to search each file for the stream
 entries. This affects streams written to over longer periods of time more than streams written to over a
 shorter time, where time is measured by the number of events created, not time passed. This is because streams
 written to over longer time periods are more likely to have entries in multiple index files.
@@ -173,11 +172,11 @@ written to over longer time periods are more likely to have entries in multiple
 |:---------------------|:-------------------------------|
 | Command line         | `--index-cache-depth`          |
 | YAML                 | `IndexCacheDepth`              |
-| Environment variable | `EVENTSTORE_INDEX_CACHE_DEPTH` | 
+| Environment variable | `KURRENTDB_INDEX_CACHE_DEPTH`  |
 
 **Default**: `16`
 
-`IndexCacheDepth` affects how many midpoints EventStoreDB calculates for an index file which affects file
+`IndexCacheDepth` affects how many midpoints KurrentDB calculates for an index file which affects file
 size slightly, but can affect lookup times significantly. Looking up a stream entry in a file requires a
 binary search on the midpoints to find the nearest midpoint, and then a seek through the entries to find the
 entry or entries that match. Increasing this value decreases the second part of the operation and increase the
@@ -198,12 +197,12 @@ entries. Most clusters should not need to change this setting.
 |:---------------------|:-------------------------------|
 | Command line         | `--skip-index-verify`          |
 | YAML                 | `SkipIndexVerify`              |
-| Environment variable | `EVENTSTORE_SKIP_INDEX_VERIFY` | 
+| Environment variable | `KURRENTDB_SKIP_INDEX_VERIFY`  |
 
 **Default**: `false`
 
 `SkipIndexVerify` skips reading and verification of index file hashes during startup. Instead of recalculating
-midpoints when EventStoreDB reads the file, it reads the midpoints directly from the footer of the index file.
+midpoints when KurrentDB reads the file, it reads the midpoints directly from the footer of the index file.
 You can set `SkipIndexVerify` to `true` to reduce startup time in exchange for the acceptance of a small risk
 that the index file becomes corrupted. This corruption could lead to a failure if you read the corrupted
 entries, and a message saying the index needs to be rebuilt. You can safely disable this setting for ZFS on
@@ -218,12 +217,12 @@ indexes from scratch.
 |:---------------------|:----------------------------------------|
 | Command line         | `--max-auto-merge-index-level`          |
 | YAML                 | `MaxAutoMergeIndexLevel`                |
-| Environment variable | `EVENTSTORE_MAX_AUTO_MERGE_INDEX_LEVEL` | 
+| Environment variable | `KURRENTDB_MAX_AUTO_MERGE_INDEX_LEVEL`  |
 
 **Default**: `2147483647`
 
 `MaxAutoMergeIndexLevel` allows you to specify the maximum index file level to automatically merge. By default
-EventStoreDB merges all levels. Depending on the specification of the host running EventStoreDB, at some point
+KurrentDB merges all levels. Depending on the specification of the host running KurrentDB, at some point
 index merges will use a large amount of disk IO.
 
 For example:
@@ -236,7 +235,7 @@ For example:
 |:---------------------|:------------------------------------------|
 | Command line         | `--stream-existence-filter-size`          |
 | YAML                 | `StreamExistenceFilterSize`               |
-| Environment variable | `EVENTSTORE_STREAM_EXISTENCE_FILTER_SIZE` | 
+| Environment variable | `KURRENTDB_STREAM_EXISTENCE_FILTER_SIZE`  |
 
 **Default**: `256000000`
 
@@ -245,7 +244,7 @@ filter. This should be set to roughly the maximum number of streams you expect t
 if you expect to have a max of 500 million streams, use a value of 500000000. The value you select should also
 fit entirely in memory to avoid any performance degradation. Use 0 to disable the filter.
 
-Upgrading to a version of EventStoreDB that supports the Stream Existence Filter requires the filter to be
+Upgrading to a version of KurrentDB that supports the Stream Existence Filter requires the filter to be
 built - unless it is disabled. This will take approximately as long as it takes to read through the whole
 index.
 
@@ -257,7 +256,7 @@ Resizing the filter will also cause a full rebuild of the filter.
 |:---------------------|:------------------------------|
 | Command line         | `--index-cache-size`          |
 | YAML                 | `IndexCacheSize`              |
-| Environment variable | `EVENTSTORE_INDEX_CACHE_SIZE` | 
+| Environment variable | `KURRENTDB_INDEX_CACHE_SIZE`  |
 
 **Default**: `0`
 
@@ -273,25 +272,25 @@ The index LRU cache is only created for index files that have Bloom filters.
 |:---------------------|:-------------------------------------|
 | Command line         | `--use-index-bloom-filters`          |
 | YAML                 | `UseIndexBloomFilters`               |
-| Environment variable | `EVENTSTORE_USE_INDEX_BLOOM_FILTERS` | 
+| Environment variable | `KURRENTDB_USE_INDEX_BLOOM_FILTERS`  |
 
 **Default**: `true`
 
 `UseIndexBloomFilters` is a feature flag which can be used to disable the index Bloom filters. This should not
 be necessary and this flag will be removed in a future release, but is provided for safety since the index
-Bloom filters are a new feature. Please contact EventStore if you discover some need to disable this feature.
+Bloom filters are a new feature. Please contact Kurrent if you discover some need to disable this feature.
 
-Unless this flag is set to false, EventStoreDB creates a `.bloomfilter` file for each new PTable. The Bloom
-filter describes which streams are present in the PTable. This speeds up stream reads since EventStoreDB can
+Unless this flag is set to false, KurrentDB creates a `.bloomfilter` file for each new PTable. The Bloom
+filter describes which streams are present in the PTable. This speeds up stream reads since KurrentDB can
 avoid searching in index files do not contain the stream.
 
-Note that immediately after upgrading to a version of EventStoreDB that produces index Bloom filters, no Bloom
+Note that immediately after upgrading to a version of KurrentDB that produces index Bloom filters, no Bloom
 filters will yet exist. Either wait for new PTables to be produced with Bloom filters in the natural course of
 writing/merging/scavenging PTables, or rebuild the index for immediate generation.
 
 ## Tuning indexes
 
-For most EventStoreDB clusters, the default settings are enough to give consistent and good performance. For
+For most KurrentDB clusters, the default settings are enough to give consistent and good performance. For
 clusters with larger numbers of events, or those that run in constrained environments the configuration
 options allow for some tuning to meet operational constraints.
 
@@ -305,4 +304,4 @@ cluster.
 
 For example:
 
-> A cluster with 3000 256b IOPS can read/write about 0.73Gb/sec (This level of IOPS represents a small cloud instance). Assuming sustained read/write throughput of 0.73Gb/s. When an index merge of level 7 or above starts, it consumes as many IOPS up to all on the node until it completes. Because EventStoreDB has a shared nothing architecture for clustering this operation is likely to cause all nodes to appear to stall simultaneously as they all try and perform an index merge at the same time. By setting `MaxAutoMergeLevel` to 6 or below you can avoid this, and you can run the merge on each node individually keeping read/write latency in the cluster consistent.
+> A cluster with 3000 256b IOPS can read/write about 0.73Gb/sec (This level of IOPS represents a small cloud instance). Assuming sustained read/write throughput of 0.73Gb/s. When an index merge of level 7 or above starts, it consumes as many IOPS up to all on the node until it completes. Because KurrentDB has a shared nothing architecture for clustering this operation is likely to cause all nodes to appear to stall simultaneously as they all try and perform an index merge at the same time. By setting `MaxAutoMergeLevel` to 6 or below you can avoid this, and you can run the merge on each node individually keeping read/write latency in the cluster consistent.
diff --git a/docs/server/configuration/networking.md b/docs/server/configuration/networking.md
new file mode 100644
index 00000000000..daa6f8f8799
--- /dev/null
+++ b/docs/server/configuration/networking.md
@@ -0,0 +1,428 @@
+---
+title: Networking
+order: 2
+---
+
+KurrentDB provides two interfaces:
+- HTTP(S) for gRPC communication and REST APIs (node)
+- TCP for cluster replication (replication)
+
+Nodes in the cluster replicate with each other using the TCP protocol, but use gRPC for [discovering other cluster nodes](cluster.md#discovering-cluster-members).
+
+For gRPC and HTTP, there's no internal vs external separation of traffic.
+
+## HTTP configuration
+
+HTTP is the primary protocol for KurrentDB. It is used in gRPC communication and HTTP APIs (management, gossip and diagnostics).
+The HTTP endpoint always binds to the IP address configured in the `NodeIp` setting (previously `ExtIp` setting).
+
+| Format               | Syntax               |
+|:---------------------|:---------------------|
+| Command line         | `--node-ip`          |
+| YAML                 | `NodeIp`             |
+| Environment variable | `KURRENTDB_NODE_IP`  |
+
+When the `NodeIp` setting is not provided, KurrentDB will use the first available non-loopback address. You can also bind HTTP to all available interfaces using `0.0.0.0` as the setting value. If you do that, you'd need to configure the `NodeHostAdvertiseAs` (previously `ExtHostAdvertiseAs`) setting (read more [here](#network-address-translation)), since `0.0.0.0` is not a valid IP address to connect from the outside world.
+
+::: warning
+Please note that the `ExtIp` setting has been removed as of version 25.0.0, use the `NodeIp` setting instead.
+:::
+
+The default HTTP port is `2113`. Depending on the [security settings](../security/README.md) of the node, it either responds over plain HTTP or via HTTPS. There is no HSTS redirect, so if you try reaching a secure node via HTTP, you can get an empty response.
+
+You can change the HTTP port using the `NodePort` setting (previously `HttpPort` setting) :
+
+| Format               | Syntax                 |
+|:---------------------|:-----------------------|
+| Command line         | `--node-port`          |
+| YAML                 | `NodePort`             |
+| Environment variable | `KURRENTDB_NODE_PORT`  |
+
+**Default**: `2113`
+
+::: warning
+Please note that the `HttpPort` setting has been removed as of version 25.0.0, use the `NodePort` setting instead.
+:::
+
+If your network setup requires any kind of IP address, DNS name and port translation for internal or external communication, you can use available [address translation](#network-address-translation) settings.
+
+### Keep-alive pings
+
+The reliability of the connection between the client application and database is crucial for the stability of the solution. If the network is not stable or has some periodic issues, the client may drop the connection. Stability is essential for the [stream subscriptions](@clients/grpc/subscriptions.md) where a client is listening to database notifications. Having an existing connection open when an app resumes activity allows for the initial gRPC calls to be made quickly, without any delay caused by the reestablished connection.
+
+KurrentDB supports the built-in gRPC mechanism for keeping the connection alive. If the other side does not acknowledge the ping within a certain period, the connection will be closed. Note that pings are only necessary when there's no activity on the connection.
+
+Keepalive pings are enabled by default, with the default interval set to 10 seconds. The default value is based on the [gRPC proposal](https://github.com/grpc/proposal/blob/master/A8-client-side-keepalive.md#extending-for-basic-health-checking) that suggests 10 seconds as the minimum. It's a compromise value to ensure that the connection is open and not making too many redundant network calls.
+
+You can customise the following Keepalive settings:
+
+#### KeepAliveInterval
+
+After a duration of `keepAliveInterval` (in milliseconds), if the server doesn't see any activity, it pings the client to see if the transport is still alive.
+
+| Format               | Syntax                           |
+|:---------------------|:---------------------------------|
+| Command line         | `--keep-alive-interval`          |
+| YAML                 | `KeepAliveInterval`              |
+| Environment variable | `KURRENTDB_KEEP_ALIVE_INTERVAL`  |
+
+**Default**: `10000` (ms, 10 sec)
+
+#### KeepAliveTimeout
+
+After having pinged for keepalive check, the server waits for a duration of `keepAliveTimeout` (in milliseconds). If the connection doesn't have any activity even after that, it gets closed.
+
+| Format               | Syntax                          |
+|:---------------------|:--------------------------------|
+| Command line         | `--keep-alive-timeout`          |
+| YAML                 | `KeepAliveTimeout`              |
+| Environment variable | `KURRENTDB_KEEP_ALIVE_TIMEOUT`  |
+
+**Default**: `10000` (ms, 10 sec)
+
+As a general rule, we do not recommend putting KurrentDB behind a load balancer. However, if you are using it and want to benefit from the Keepalive feature, then you should make sure if the compatible settings are properly set. Some load balancers may also override the Keepalive settings. Most of them require setting the idle timeout larger/longer than the `keepAliveTimeout`. We suggest checking the load balancer documentation before using Keepalive pings.
+
+### AtomPub
+
+The AtomPub application protocol over HTTP is disabled by default since v20. We plan to deprecate the AtomPub support in the future versions, but we aim to provide a replacement before we finally deprecate AtomPub.
+
+In Kurrent Cloud, the AtomPub protocol is enabled. For self-hosted instances, use the configuration setting to enable AtomPub.
+
+| Format               | Syntax                                 |
+|:---------------------|:---------------------------------------|
+| Command line         | `--enable-atom-pub-over-http`          |
+| YAML                 | `EnableAtomPubOverHttp`                |
+| Environment variable | `KURRENTDB_ENABLE_ATOM_PUB_OVER_HTTP`  |
+
+**Default**: `false` (AtomPub is disabled)
+
+### HTTP caching
+
+:::tip
+This section is about caching static resources for HTTP API. It does not affect the server performance directly and cannot be used with gRPC clients.
+:::
+
+Most of the URIs that KurrentDB emits are immutable (including the UI and Atom Feeds).
+
+An Atom feed has a URI that represents an event, e.g., `/streams/foo/0` which represents 'event 0'. The data for event 0 never changes. If this stream is open to public reads, then the URI is set to be 'cachable' for long periods of time.
+
+You can see a similar example in reading a feed. If a stream has 50 events in it, the feed page `20/forward/10` never changes, it will always be events 20-30. Internally, KurrentDB controls serving the right URIs by using `rel` links with feeds (for example `prev`/`next`).
+
+This caching behavior is great for performance in a production environment and we recommended you use it, but in a developer environment it can become confusing.
+
+For example, what happens if you started a database, wrote `/streams/foo/0` and performed a `GET` request? The `GET` request is cachable and now in your cache. Since this is a development environment, you shut down KurrentDB and delete the database. You then restart KurrentDB and append a different event to `/streams/foo/0`. You open your browser and inspect the `/streams/foo/0` stream, and you see the event appended before you deleted the database.
+
+To avoid this during development it's best to run KurrentDB with the `--disable-http-caching` command line option. This disables all caching and solves the issue.
+
+The option can be set as follows:
+
+| Format               | Syntax                            |
+|:---------------------|:----------------------------------|
+| Command line         | `--disable-http-caching`          |
+| YAML                 | `DisableHttpCaching`              |
+| Environment variable | `KURRENTDB_DISABLE_HTTP_CACHING`  |
+
+**Default**: `false`, so the HTTP caching is **enabled** by default.
+
+### Kestrel Settings
+
+It's generally not expected that you'll need to update the Kestrel configuration that KurrentDB has set by default, but it's good to know that you can update the following settings if needed.
+
+Kestrel uses the `kestrelsettings.json` configuration file. This file should be located in the [default configuration directory](../configuration/README.md#configuration-files).
+
+#### MaxConcurrentConnections
+
+Sets the maximum number of open connections. See the docs [here](https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.server.kestrel.core.kestrelserverlimits.maxconcurrentconnections?view=aspnetcore-5.0).
+
+This is configured with `Kestrel.Limits.MaxConcurrentConnections` in the settings file.
+
+#### MaxConcurrentUpgradedConnections
+
+Sets the maximum number of open, upgraded connections. An upgraded connection is one that has been switched from HTTP to another protocol, such as WebSockets. See the docs [here](https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.server.kestrel.core.kestrelserverlimits.maxconcurrentupgradedconnections?view=aspnetcore-5.0).
+
+This is configured with `Kestrel.Limits.MaxConcurrentUpgradedConnections` in the settings file.
+
+#### Http2 InitialConnectionWindowSize
+
+Sets how much request body data the server is willing to receive and buffer at a time aggregated across all requests (streams) per connection. Note requests are also limited by `KestrelInitialStreamWindowSize`
+
+The value must be greater than or equal to 65,535 and less than 2^31. See the docs [here](https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.server.kestrel.core.http2limits.initialconnectionwindowsize?view=aspnetcore-5.0).
+
+This is configured with `Kestrel.Limits.Http2.InitialConnectionWindowSize` in the settings file.
+
+#### Http2 InitialStreamWindowSize
+
+Sets how much request body data the server is willing to receive and buffer at a time per stream. Note connections are also limited by `KestrelInitialConnectionWindowSize`
+
+Value must be greater than or equal to 65,535 and less than 2^31. See the docs [here](https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.server.kestrel.core.http2limits.initialstreamwindowsize?view=aspnetcore-5.0).
+
+This is configured with `Kestrel.Limits.Http2.InitialStreamWindowSize` in the settings file.
+
+## Replication protocol
+
+Replication between cluster nodes uses a proprietary TCP-based protocol. Options for configuring the internal replication protocol are described below.
+
+### Interface and port
+
+Internal TCP binds to the IP address specified in the `ReplicationIp` setting (previously `IntIp`). It must be configured if you run a multi-node cluster.
+
+By default, KurrentDB binds its internal networking on the loopback interface only (`127.0.0.1`). You can change this behaviour and tell KurrentDB to listen on a specific internal IP address. To do that set the `ReplicationIp` to `0.0.0.0` or the IP address of the network interface.
+
+| Format               | Syntax                      |
+|:---------------------|:----------------------------|
+| Command line         | `--replication-ip`          |
+| YAML                 | `ReplicationIp`             |
+| Environment variable | `KURRENTDB_REPLICATION_IP`  |
+
+**Default**: `127.0.0.1` (loopback).
+
+If you keep this setting to its default value, cluster nodes won't be able to talk to each other.
+
+::: warning
+Please note that the `IntIp` setting has been removed as of version 25.0.0, use the `ReplicationIp` setting instead.
+:::
+
+By default, KurrentDB uses port `1112` for internal TCP. You can change this by specifying the `ReplicationPort` setting (previously `IntTcpPort` setting).
+
+| Format               | Syntax                        |
+|:---------------------|:------------------------------|
+| Command line         | `--replication-port`          |
+| YAML                 | `ReplicationPort`             |
+| Environment variable | `KURRENTDB_REPLICATION_PORT`  |
+
+**Default**: `1112`
+
+::: warning
+Please note that the `IntTcpPort` setting has been removed as of version 25.0.0, use the `ReplicationPort` setting instead.
+:::
+
+If your network setup requires any kind of IP address, DNS name and port translation for internal communication, you can use available [address translation](#network-address-translation) settings.
+
+## Network address translation
+
+Due to NAT (network address translation), or other reasons a node may not be bound to the address it is reachable from other nodes. For example, the machine has an IP address of `192.168.1.13`, but the node is visible to other nodes as `10.114.12.112`.
+
+Options described below allow you to tell the node that even though it is bound to a given address it should not gossip that address. When returning links over HTTP, KurrentDB will also use the specified addresses instead of physical addresses, so the clients that use HTTP can follow those links.
+
+Another case when you might want to specify the advertised address although there's no address translation involved. When you configure KurrentDB to bind to `0.0.0.0`, it will use the first non-loopback address for gossip. It might or might not be the address you want it to use. Whilst the best way to avoid such a situation is to configure the binding properly using the `NodeIp` and `ReplicationIp` settings, you can also use address translation setting with the correct IP address or DNS name.
+
+Also, even if you specified the `NodeIp` and `ReplicationIp` settings in the configuration, you might still want to override the advertised address if you want to use hostnames and not IP addresses. That might be needed when running a secure cluster with certificates that only contain DNS names of the nodes.
+
+The only place where these settings make any effect is the [gossip](cluster.md#gossip-protocol) endpoint response.
+
+## HTTP translations
+
+By default, a cluster node will advertise itself using `NodeIp` and `NodePort`. You can override the advertised HTTP port using the  `NodePortAdvertiseAs` setting (previously `HttpPortAdvertiseAs` setting).
+
+| Format               | Syntax                              |
+|:---------------------|:------------------------------------|
+| Command line         | `--node-port-advertise-as`          |
+| YAML                 | `NodePortAdvertiseAs`               |
+| Environment variable | `KURRENTDB_NODE_PORT_ADVERTISE_AS`  |
+
+::: warning
+Please note that the `HttpPortAdvertiseAs` setting has been removed as of version 25.0.0, use the `NodePortAdvertiseAs` setting instead.
+:::
+
+If you want the node to advertise itself using the hostname rather than its IP address, use the `NodeHostAdvertiseAs` setting (previously `ExtHostAdvertiseAs` setting).
+
+| Format               | Syntax                              |
+|:---------------------|:------------------------------------|
+| Command line         | `--node-host-advertise-as`          |
+| YAML                 | `NodeHostAdvertiseAs`               |
+| Environment variable | `KURRENTDB_NODE_HOST_ADVERTISE_AS`  |
+
+::: warning
+Please note that the `ExtHostAdvertiseAs` setting has been removed as of version 25.0.0, use the `NodeHostAdvertiseAs` setting instead.
+:::
+
+### TCP translations
+
+TCP ports used for replication can be advertised using custom values:
+
+| Format               | Syntax                                         |
+|:---------------------|:-----------------------------------------------|
+| Command line         | `--replication-tcp-port-advertise-as`          |
+| YAML                 | `ReplicationTcpPortAdvertiseAs`                |
+| Environment variable | `KURRENTDB_REPLICATION_TCP_PORT_ADVERTISE_AS`  |
+
+::: warning
+Please note that the `IntTcpPortAdvertiseAs` setting has been removed as of version 25.0.0, use the `ReplicationTcpPortAdvertiseAs` and `NodeTcpPortAdvertiseAs` setting instead, respectively.
+:::
+
+If you want to change how the node TCP address is advertised internally, use the `ReplicationHostAdvertiseAs` setting (previously `IntHostAdvertiseAs` setting). You can use an IP address or a hostname.
+
+| Format               | Syntax                                     |
+|:---------------------|:-------------------------------------------|
+| Command line         | `--replication-host-advertise-as`          |
+| YAML                 | `ReplicationHostAdvertiseAs`               |
+| Environment variable | `KURRENTDB_REPLICATION_HOST_ADVERTISE_AS`  |
+
+::: warning
+Please note that the `IntHostAdvertiseAs` setting has been removed as of version 25.0.0, use the `ReplicationHostAdvertiseAs` setting instead.
+:::
+
+### Advertise to clients
+
+In some cases, the cluster needs to advertise itself to clients using a completely different set of addresses and ports. Usually, you need to do it because addresses and ports configured for the HTTP protocol are not available as-is to the outside world. One of the examples is running a cluster in Docker Compose. In such environment, HTTP uses internal hostnames in the Docker network, which isn't accessible on the host. So, in order to connect to the cluster from the host machine, you need to use `localhost` and translated HTTP ports to reach the cluster nodes.
+
+To configure how the cluster nodes advertise to clients, use the `Advertise<*>ToClient` settings listed below.
+
+Specify the advertised hostname or IP address:
+
+| Format               | Syntax                                   |
+|:---------------------|:-----------------------------------------|
+| Command line         | `--advertise-host-to-client-as`          |
+| YAML                 | `AdvertiseHostToClientAs`                |
+| Environment variable | `KURRENTDB_ADVERTISE_HOST_TO_CLIENT_AS`  |
+
+Specify the advertised HTTP(S) port (previously `AdvertiseHttpPortToClientAs` setting):
+
+| Format               | Syntax                                        |
+|:---------------------|:----------------------------------------------|
+| Command line         | `--advertise-node-port-to-client-as`          |
+| YAML                 | `AdvertiseNodePortToClientAs`                 |
+| Environment variable | `KURRENTDB_ADVERTISE_NODE_PORT_TO_CLIENT_AS`  |
+
+::: warning
+Please note that the `AdvertiseHttpPortToClientAs` setting has been removed as of version 25.0.0, use the `AdvertiseNodePortToClientAs` setting instead.
+:::
+
+## Heartbeat timeouts
+
+KurrentDB uses heartbeats over all TCP connections to discover dead clients and nodes. Heartbeat timeouts should not be too short, as short timeouts will produce false positives. At the same time, setting too long timeouts will prevent discovering dead nodes and clients in time.
+
+Each heartbeat has two points of configuration. The first is the _interval;_ this represents how often the system should consider a heartbeat. KurrentDB doesn't send a heartbeat for every interval, but only if it has not heard from a node within the configured interval. In a busy cluster, you may never see any heartbeats.
+
+The second point of configuration is the _timeout_. This determines how long KurrentDB server waits for a client or node to respond to a heartbeat request.
+
+Different environments need different values for these settings. The defaults are likely fine on a LAN. If you experience frequent elections in your environment, you can try to increase both interval and timeout, for example:
+
+- An interval of 5000ms.
+- A timeout of 1000ms.
+
+::: tip
+If in doubt, choose higher numbers. This adds a small period of time to discover a dead client or node and is better than the alternative, which is false positives.
+:::
+
+Replication/Internal TCP heartbeat (between cluster nodes):
+
+| Format               | Syntax                                      |
+|:---------------------|:--------------------------------------------|
+| Command line         | `--replication-heartbeat-interval`          |
+| YAML                 | `ReplicationHeartbeatInterval`              |
+| Environment variable | `KURRENTDB_REPLICATION_HEARTBEAT_INTERVAL`  |
+
+**Default**: `700` (ms)
+
+| Format               | Syntax                                     |
+|:---------------------|:-------------------------------------------|
+| Command line         | `--replication-heartbeat-timeout`          |
+| YAML                 | `ReplicationHeartbeatTimeout`              |
+| Environment variable | `KURRENTDB_REPLICATION_HEARTBEAT_TIMEOUT`  |
+
+**Default**: `700` (ms)
+
+::: warning
+Please note that the `IntTcpHeartbeatInterval` and `IntTcpHeartbeatTimeout` setting have been removed as of version 25.0.0, use the `ReplicationHeartbeatInterval` and `ReplicationHeartbeatTimeout` setting instead, respectively.
+:::
+
+### gRPC heartbeats
+
+For the gRPC heartbeats, KurrentDB and its gRPC clients use the protocol feature called _Keepalive ping_. Read more about it on the [HTTP configuration page](#keep-alive-pings).
+
+## Exposing endpoints
+
+If you need to disable some HTTP endpoints on the external HTTP interface, you can change some settings below. It is possible to disable the Admin UI, stats and gossip port to be exposed externally.
+
+You can disable the Admin UI on external HTTP by setting `AdminOnExt` setting to `false`.
+
+| Format               | Syntax                    |
+|:---------------------|:--------------------------|
+| Command line         | `--admin-on-ext`          |
+| YAML                 | `AdminOnExt`              |
+| Environment variable | `KURRENTDB_ADMIN_ON_EXT`  |
+
+**Default**: `true`, Admin UI is enabled on the external HTTP.
+
+Exposing the `stats` endpoint externally is required for the Admin UI and can also be useful if you collect stats for an external monitoring tool.
+
+| Format               | Syntax                    |
+|:---------------------|:--------------------------|
+| Command line         | `--stats-on-ext`          |
+| YAML                 | `StatsOnExt`              |
+| Environment variable | `KURRENTDB_STATS_ON_EXT`  |
+
+**Default**: `true`, stats endpoint is enabled on the external HTTP.
+
+You can also disable the gossip protocol in the external HTTP interface. If you do that, ensure that the internal interface is properly configured. Also, if you use [gossip with DNS](cluster.md#cluster-with-dns), ensure that the [gossip port](cluster.md#gossip-port) is set to the internal HTTP port.
+
+| Format               | Syntax                     |
+|:---------------------|:---------------------------|
+| Command line         | `--gossip-on-ext`          |
+| YAML                 | `GossipOnExt`              |
+| Environment variable | `KURRENTDB_GOSSIP_ON_EXT`  |
+
+**Default**: `true`, gossip is enabled on the external HTTP.
+
+## External TCP
+
+<wbr><Badge type="info" text="License Required" vertical="middle"/>
+
+The TCP client protocol plugin enables client applications based on the external TCP API to run without any changes. This provides developers a mechanism to migrate to gRPC clients. This bridge solution enables development teams to plan for the End Of Life (EOL) of the external TCP API. Past the EOL, the external TCP API will no longer be supported.
+
+### Configuration
+
+You require a [license key](../quick-start/installation.md#license-keys) to use this feature.
+
+Refer to the [configuration guide](../configuration/README.md) for configuration mechanisms other than YAML.
+
+Sample configuration:
+
+```yaml
+TcpPlugin:
+  EnableExternalTcp: true
+```
+
+Once enabled, the server will log a message similar to the one below:
+
+```
+[11212, 1,18:44:34.070,INF] "TcpApi" "25.0.0.1673" plugin enabled.
+```
+
+#### Other setting
+
+The following options can be set in the json configuration:
+
+1. `NodeHeartbeatTimeout` - defaults to: 1000
+2. `NodeHeartbeatInterval` - defaults to: 2000
+3. `NodeTcpPort` - defaults to: 1113
+4. `NodeTcpPortAdvertiseAs` - defaults to: 1113
+
+The above default values can be overridden, for example:
+
+```yaml
+TcpPlugin:
+  EnableExternalTcp: true
+  NodeTcpPort: 8113
+  NodeTcpPortAdvertiseAs: 8113
+  NodeHeartbeatInterval: 2000
+  NodeHeartbeatTimeout: 1000
+```
+
+### Troubleshooting
+
+#### Plugin doesn't start
+
+The plugin has to be configured to be enabled.
+If you see the following log it means the plugin was found but not started:
+
+```
+[ 5104, 1,19:03:13.807,INF] "TcpApi" "25.0.0.1673" plugin disabled. "Set 'KurrentDB:TcpPlugin:EnableExternalTcp' to 'true' to enable"
+```
+
+When the plugin starts, you should see a log similar to the following:
+
+```
+[11212, 1,18:44:34.070,INF] "TcpApi" "25.0.0.1673" plugin enabled.
+```
diff --git a/docs/server/diagnostics/README.md b/docs/server/diagnostics/README.md
new file mode 100644
index 00000000000..6c4852d9828
--- /dev/null
+++ b/docs/server/diagnostics/README.md
@@ -0,0 +1,371 @@
+---
+dir:
+  order: 5
+  text: Monitoring
+---
+
+# Diagnostics
+
+KurrentDB provides several ways to diagnose and troubleshoot issues.
+
+- [Logging](logs.md): structured or plain-text logs on the console and in log files.
+- [Metrics](metrics.md): collect standard metrics using Prometheus or OpenTelemetry.
+- [Stats](#statistics): stats collection and HTTP endpoint.
+
+You can also use external tools to measure the performance of KurrentDB and monitor the cluster health. Learn more on the [Integrations](./integrations.md) page.
+
+## Statistics
+
+KurrentDB servers collect internal statistics and make it available via HTTP over
+the `https://<host>:2113/stats` in JSON format. Here, `2113` is the default HTTP port. Monitoring applications
+and metric collectors can use this endpoint to gather the information about the cluster node. The `stats`
+endpoint only exposes information about the node where you fetch it from and doesn't contain any cluster
+information.
+
+What you see in the `stats` endpoint response is the last collected state of the server. The server collects
+this information using events that are appended to the statistics stream. Each node has one. We use a reserved
+name for the stats stream, `$stats-<host:port>`. For example, for a single node running locally the stream
+name would be `$stats-127.0.0.1:2113`.
+
+As all other events, stats events are also linked in the `$all` stream. These events have a reserved event
+type `$statsCollected`.
+
+::: details Click here to see an example of a stats event
+
+```json
+{
+  "proc-startTime": "2020-06-25T10:13:26.8281750Z",
+  "proc-id": 5465,
+  "proc-mem": 118648832,
+  "proc-cpu": 2.44386363,
+  "proc-cpuScaled": 0.152741477,
+  "proc-threadsCount": 10,
+  "proc-contentionsRate": 0.9012223,
+  "proc-thrownExceptionsRate": 0.0,
+  "sys-cpu": 100.0,
+  "sys-freeMem": 25100288,
+  "proc-gc-allocationSpeed": 0.0,
+  "proc-gc-gen0ItemsCount": 8,
+  "proc-gc-gen0Size": 0,
+  "proc-gc-gen1ItemsCount": 2,
+  "proc-gc-gen1Size": 0,
+  "proc-gc-gen2ItemsCount": 0,
+  "proc-gc-gen2Size": 0,
+  "proc-gc-largeHeapSize": 0,
+  "proc-gc-timeInGc": 0.0,
+  "proc-gc-totalBytesInHeaps": 0,
+  "proc-tcp-connections": 0,
+  "proc-tcp-receivingSpeed": 0.0,
+  "proc-tcp-sendingSpeed": 0.0,
+  "proc-tcp-inSend": 0,
+  "proc-tcp-measureTime": "00:00:19.0534210",
+  "proc-tcp-pendingReceived": 0,
+  "proc-tcp-pendingSend": 0,
+  "proc-tcp-receivedBytesSinceLastRun": 0,
+  "proc-tcp-receivedBytesTotal": 0,
+  "proc-tcp-sentBytesSinceLastRun": 0,
+  "proc-tcp-sentBytesTotal": 0,
+  "es-checksum": 1613144,
+  "es-checksumNonFlushed": 1613144,
+  "sys-drive-/System/Volumes/Data-availableBytes": 545628151808,
+  "sys-drive-/System/Volumes/Data-totalBytes": 2000481927168,
+  "sys-drive-/System/Volumes/Data-usage": "72%",
+  "sys-drive-/System/Volumes/Data-usedBytes": 1454853775360,
+  "es-queue-Index Committer-queueName": "Index Committer",
+  "es-queue-Index Committer-groupName": "",
+  "es-queue-Index Committer-avgItemsPerSecond": 0,
+  "es-queue-Index Committer-avgProcessingTime": 0.0,
+  "es-queue-Index Committer-currentIdleTime": "0:00:00:29.9895180",
+  "es-queue-Index Committer-currentItemProcessingTime": null,
+  "es-queue-Index Committer-idleTimePercent": 100.0,
+  "es-queue-Index Committer-length": 0,
+  "es-queue-Index Committer-lengthCurrentTryPeak": 0,
+  "es-queue-Index Committer-lengthLifetimePeak": 0,
+  "es-queue-Index Committer-totalItemsProcessed": 0,
+  "es-queue-Index Committer-inProgressMessage": "<none>",
+  "es-queue-Index Committer-lastProcessedMessage": "<none>",
+  "es-queue-MainQueue-queueName": "MainQueue",
+  "es-queue-MainQueue-groupName": "",
+  "es-queue-MainQueue-avgItemsPerSecond": 14,
+  "es-queue-MainQueue-avgProcessingTime": 0.0093527972027972021,
+  "es-queue-MainQueue-currentIdleTime": "0:00:00:00.8050567",
+  "es-queue-MainQueue-currentItemProcessingTime": null,
+  "es-queue-MainQueue-idleTimePercent": 99.986616840364917,
+  "es-queue-MainQueue-length": 0,
+  "es-queue-MainQueue-lengthCurrentTryPeak": 3,
+  "es-queue-MainQueue-lengthLifetimePeak": 6,
+  "es-queue-MainQueue-totalItemsProcessed": 452,
+  "es-queue-MainQueue-inProgressMessage": "<none>",
+  "es-queue-MainQueue-lastProcessedMessage": "Schedule",
+  "es-queue-MonitoringQueue-queueName": "MonitoringQueue",
+  "es-queue-MonitoringQueue-groupName": "",
+  "es-queue-MonitoringQueue-avgItemsPerSecond": 0,
+  "es-queue-MonitoringQueue-avgProcessingTime": 1.94455,
+  "es-queue-MonitoringQueue-currentIdleTime": "0:00:00:19.0601186",
+  "es-queue-MonitoringQueue-currentItemProcessingTime": null,
+  "es-queue-MonitoringQueue-idleTimePercent": 99.980537727681721,
+  "es-queue-MonitoringQueue-length": 0,
+  "es-queue-MonitoringQueue-lengthCurrentTryPeak": 0,
+  "es-queue-MonitoringQueue-lengthLifetimePeak": 0,
+  "es-queue-MonitoringQueue-totalItemsProcessed": 14,
+  "es-queue-MonitoringQueue-inProgressMessage": "<none>",
+  "es-queue-MonitoringQueue-lastProcessedMessage": "GetFreshTcpConnectionStats",
+  "es-queue-PersistentSubscriptions-queueName": "PersistentSubscriptions",
+  "es-queue-PersistentSubscriptions-groupName": "",
+  "es-queue-PersistentSubscriptions-avgItemsPerSecond": 1,
+  "es-queue-PersistentSubscriptions-avgProcessingTime": 0.010400000000000001,
+  "es-queue-PersistentSubscriptions-currentIdleTime": "0:00:00:00.8052015",
+  "es-queue-PersistentSubscriptions-currentItemProcessingTime": null,
+  "es-queue-PersistentSubscriptions-idleTimePercent": 99.998954276430226,
+  "es-queue-PersistentSubscriptions-length": 0,
+  "es-queue-PersistentSubscriptions-lengthCurrentTryPeak": 0,
+  "es-queue-PersistentSubscriptions-lengthLifetimePeak": 0,
+  "es-queue-PersistentSubscriptions-totalItemsProcessed": 32,
+  "es-queue-PersistentSubscriptions-inProgressMessage": "<none>",
+  "es-queue-PersistentSubscriptions-lastProcessedMessage": "PersistentSubscriptionTimerTick",
+  "es-queue-Projection Core #0-queueName": "Projection Core #0",
+  "es-queue-Projection Core #0-groupName": "Projection Core",
+  "es-queue-Projection Core #0-avgItemsPerSecond": 0,
+  "es-queue-Projection Core #0-avgProcessingTime": 0.0,
+  "es-queue-Projection Core #0-currentIdleTime": "0:00:00:29.9480513",
+  "es-queue-Projection Core #0-currentItemProcessingTime": null,
+  "es-queue-Projection Core #0-idleTimePercent": 100.0,
+  "es-queue-Projection Core #0-length": 0,
+  "es-queue-Projection Core #0-lengthCurrentTryPeak": 0,
+  "es-queue-Projection Core #0-lengthLifetimePeak": 0,
+  "es-queue-Projection Core #0-totalItemsProcessed": 2,
+  "es-queue-Projection Core #0-inProgressMessage": "<none>",
+  "es-queue-Projection Core #0-lastProcessedMessage": "SubComponentStarted",
+  "es-queue-Projections Master-queueName": "Projections Master",
+  "es-queue-Projections Master-groupName": "",
+  "es-queue-Projections Master-avgItemsPerSecond": 0,
+  "es-queue-Projections Master-avgProcessingTime": 0.0,
+  "es-queue-Projections Master-currentIdleTime": "0:00:00:29.8467445",
+  "es-queue-Projections Master-currentItemProcessingTime": null,
+  "es-queue-Projections Master-idleTimePercent": 100.0,
+  "es-queue-Projections Master-length": 0,
+  "es-queue-Projections Master-lengthCurrentTryPeak": 0,
+  "es-queue-Projections Master-lengthLifetimePeak": 3,
+  "es-queue-Projections Master-totalItemsProcessed": 10,
+  "es-queue-Projections Master-inProgressMessage": "<none>",
+  "es-queue-Projections Master-lastProcessedMessage": "RegularTimeout",
+  "es-queue-Storage Chaser-queueName": "Storage Chaser",
+  "es-queue-Storage Chaser-groupName": "",
+  "es-queue-Storage Chaser-avgItemsPerSecond": 94,
+  "es-queue-Storage Chaser-avgProcessingTime": 0.0043385023898035047,
+  "es-queue-Storage Chaser-currentIdleTime": "0:00:00:00.0002530",
+  "es-queue-Storage Chaser-currentItemProcessingTime": null,
+  "es-queue-Storage Chaser-idleTimePercent": 99.959003031702224,
+  "es-queue-Storage Chaser-length": 0,
+  "es-queue-Storage Chaser-lengthCurrentTryPeak": 0,
+  "es-queue-Storage Chaser-lengthLifetimePeak": 0,
+  "es-queue-Storage Chaser-totalItemsProcessed": 2835,
+  "es-queue-Storage Chaser-inProgressMessage": "<none>",
+  "es-queue-Storage Chaser-lastProcessedMessage": "ChaserCheckpointFlush",
+  "es-queue-StorageReaderQueue #1-queueName": "StorageReaderQueue #1",
+  "es-queue-StorageReaderQueue #1-groupName": "StorageReaderQueue",
+  "es-queue-StorageReaderQueue #1-avgItemsPerSecond": 0,
+  "es-queue-StorageReaderQueue #1-avgProcessingTime": 0.22461000000000003,
+  "es-queue-StorageReaderQueue #1-currentIdleTime": "0:00:00:00.9863988",
+  "es-queue-StorageReaderQueue #1-currentItemProcessingTime": null,
+  "es-queue-StorageReaderQueue #1-idleTimePercent": 99.988756844383616,
+  "es-queue-StorageReaderQueue #1-length": 0,
+  "es-queue-StorageReaderQueue #1-lengthCurrentTryPeak": 0,
+  "es-queue-StorageReaderQueue #1-lengthLifetimePeak": 0,
+  "es-queue-StorageReaderQueue #1-totalItemsProcessed": 15,
+  "es-queue-StorageReaderQueue #1-inProgressMessage": "<none>",
+  "es-queue-StorageReaderQueue #1-lastProcessedMessage": "ReadStreamEventsBackward",
+  "es-queue-StorageReaderQueue #2-queueName": "StorageReaderQueue #2",
+  "es-queue-StorageReaderQueue #2-groupName": "StorageReaderQueue",
+  "es-queue-StorageReaderQueue #2-avgItemsPerSecond": 0,
+  "es-queue-StorageReaderQueue #2-avgProcessingTime": 8.83216,
+  "es-queue-StorageReaderQueue #2-currentIdleTime": "0:00:00:00.8051068",
+  "es-queue-StorageReaderQueue #2-currentItemProcessingTime": null,
+  "es-queue-StorageReaderQueue #2-idleTimePercent": 99.557874170777851,
+  "es-queue-StorageReaderQueue #2-length": 0,
+  "es-queue-StorageReaderQueue #2-lengthCurrentTryPeak": 0,
+  "es-queue-StorageReaderQueue #2-lengthLifetimePeak": 0,
+  "es-queue-StorageReaderQueue #2-totalItemsProcessed": 16,
+  "es-queue-StorageReaderQueue #2-inProgressMessage": "<none>",
+  "es-queue-StorageReaderQueue #2-lastProcessedMessage": "ReadStreamEventsForward",
+  "es-queue-StorageReaderQueue #3-queueName": "StorageReaderQueue #3",
+  "es-queue-StorageReaderQueue #3-groupName": "StorageReaderQueue",
+  "es-queue-StorageReaderQueue #3-avgItemsPerSecond": 0,
+  "es-queue-StorageReaderQueue #3-avgProcessingTime": 6.4189888888888893,
+  "es-queue-StorageReaderQueue #3-currentIdleTime": "0:00:00:02.8228372",
+  "es-queue-StorageReaderQueue #3-currentItemProcessingTime": null,
+  "es-queue-StorageReaderQueue #3-idleTimePercent": 99.710808119472517,
+  "es-queue-StorageReaderQueue #3-length": 0,
+  "es-queue-StorageReaderQueue #3-lengthCurrentTryPeak": 0,
+  "es-queue-StorageReaderQueue #3-lengthLifetimePeak": 0,
+  "es-queue-StorageReaderQueue #3-totalItemsProcessed": 14,
+  "es-queue-StorageReaderQueue #3-inProgressMessage": "<none>",
+  "es-queue-StorageReaderQueue #3-lastProcessedMessage": "ReadStreamEventsForward",
+  "es-queue-StorageReaderQueue #4-queueName": "StorageReaderQueue #4",
+  "es-queue-StorageReaderQueue #4-groupName": "StorageReaderQueue",
+  "es-queue-StorageReaderQueue #4-avgItemsPerSecond": 0,
+  "es-queue-StorageReaderQueue #4-avgProcessingTime": 0.36447,
+  "es-queue-StorageReaderQueue #4-currentIdleTime": "0:00:00:01.8144419",
+  "es-queue-StorageReaderQueue #4-currentItemProcessingTime": null,
+  "es-queue-StorageReaderQueue #4-idleTimePercent": 99.981747643099709,
+  "es-queue-StorageReaderQueue #4-length": 0,
+  "es-queue-StorageReaderQueue #4-lengthCurrentTryPeak": 0,
+  "es-queue-StorageReaderQueue #4-lengthLifetimePeak": 0,
+  "es-queue-StorageReaderQueue #4-totalItemsProcessed": 14,
+  "es-queue-StorageReaderQueue #4-inProgressMessage": "<none>",
+  "es-queue-StorageReaderQueue #4-lastProcessedMessage": "ReadStreamEventsForward",
+  "es-queue-StorageWriterQueue-queueName": "StorageWriterQueue",
+  "es-queue-StorageWriterQueue-groupName": "",
+  "es-queue-StorageWriterQueue-avgItemsPerSecond": 0,
+  "es-queue-StorageWriterQueue-avgProcessingTime": 0.0,
+  "es-queue-StorageWriterQueue-currentIdleTime": "0:00:00:29.9437790",
+  "es-queue-StorageWriterQueue-currentItemProcessingTime": null,
+  "es-queue-StorageWriterQueue-idleTimePercent": 100.0,
+  "es-queue-StorageWriterQueue-length": 0,
+  "es-queue-StorageWriterQueue-lengthCurrentTryPeak": 0,
+  "es-queue-StorageWriterQueue-lengthLifetimePeak": 0,
+  "es-queue-StorageWriterQueue-totalItemsProcessed": 6,
+  "es-queue-StorageWriterQueue-inProgressMessage": "<none>",
+  "es-queue-StorageWriterQueue-lastProcessedMessage": "WritePrepares",
+  "es-queue-Subscriptions-queueName": "Subscriptions",
+  "es-queue-Subscriptions-groupName": "",
+  "es-queue-Subscriptions-avgItemsPerSecond": 1,
+  "es-queue-Subscriptions-avgProcessingTime": 0.057019047619047622,
+  "es-queue-Subscriptions-currentIdleTime": "0:00:00:00.8153708",
+  "es-queue-Subscriptions-currentItemProcessingTime": null,
+  "es-queue-Subscriptions-idleTimePercent": 99.993992971356,
+  "es-queue-Subscriptions-length": 0,
+  "es-queue-Subscriptions-lengthCurrentTryPeak": 0,
+  "es-queue-Subscriptions-lengthLifetimePeak": 0,
+  "es-queue-Subscriptions-totalItemsProcessed": 31,
+  "es-queue-Subscriptions-inProgressMessage": "<none>",
+  "es-queue-Subscriptions-lastProcessedMessage": "CheckPollTimeout",
+  "es-queue-Timer-queueName": "Timer",
+  "es-queue-Timer-groupName": "",
+  "es-queue-Timer-avgItemsPerSecond": 14,
+  "es-queue-Timer-avgProcessingTime": 0.038568989547038329,
+  "es-queue-Timer-currentIdleTime": "0:00:00:00.0002752",
+  "es-queue-Timer-currentItemProcessingTime": null,
+  "es-queue-Timer-idleTimePercent": 99.94364205726194,
+  "es-queue-Timer-length": 17,
+  "es-queue-Timer-lengthCurrentTryPeak": 17,
+  "es-queue-Timer-lengthLifetimePeak": 17,
+  "es-queue-Timer-totalItemsProcessed": 419,
+  "es-queue-Timer-inProgressMessage": "<none>",
+  "es-queue-Timer-lastProcessedMessage": "ExecuteScheduledTasks",
+  "es-queue-Worker #1-queueName": "Worker #1",
+  "es-queue-Worker #1-groupName": "Workers",
+  "es-queue-Worker #1-avgItemsPerSecond": 2,
+  "es-queue-Worker #1-avgProcessingTime": 0.076058695652173922,
+  "es-queue-Worker #1-currentIdleTime": "0:00:00:00.8050943",
+  "es-queue-Worker #1-currentItemProcessingTime": null,
+  "es-queue-Worker #1-idleTimePercent": 99.982484504768721,
+  "es-queue-Worker #1-length": 0,
+  "es-queue-Worker #1-lengthCurrentTryPeak": 0,
+  "es-queue-Worker #1-lengthLifetimePeak": 0,
+  "es-queue-Worker #1-totalItemsProcessed": 73,
+  "es-queue-Worker #1-inProgressMessage": "<none>",
+  "es-queue-Worker #1-lastProcessedMessage": "ReadStreamEventsForwardCompleted",
+  "es-queue-Worker #2-queueName": "Worker #2",
+  "es-queue-Worker #2-groupName": "Workers",
+  "es-queue-Worker #2-avgItemsPerSecond": 2,
+  "es-queue-Worker #2-avgProcessingTime": 0.19399347826086957,
+  "es-queue-Worker #2-currentIdleTime": "0:00:00:00.8356863",
+  "es-queue-Worker #2-currentItemProcessingTime": null,
+  "es-queue-Worker #2-idleTimePercent": 99.955350254886739,
+  "es-queue-Worker #2-length": 0,
+  "es-queue-Worker #2-lengthCurrentTryPeak": 0,
+  "es-queue-Worker #2-lengthLifetimePeak": 0,
+  "es-queue-Worker #2-totalItemsProcessed": 69,
+  "es-queue-Worker #2-inProgressMessage": "<none>",
+  "es-queue-Worker #2-lastProcessedMessage": "PurgeTimedOutRequests",
+  "es-queue-Worker #3-queueName": "Worker #3",
+  "es-queue-Worker #3-groupName": "Workers",
+  "es-queue-Worker #3-avgItemsPerSecond": 2,
+  "es-queue-Worker #3-avgProcessingTime": 0.068475555555555567,
+  "es-queue-Worker #3-currentIdleTime": "0:00:00:00.8356754",
+  "es-queue-Worker #3-currentItemProcessingTime": null,
+  "es-queue-Worker #3-idleTimePercent": 99.984583460721979,
+  "es-queue-Worker #3-length": 0,
+  "es-queue-Worker #3-lengthCurrentTryPeak": 0,
+  "es-queue-Worker #3-lengthLifetimePeak": 0,
+  "es-queue-Worker #3-totalItemsProcessed": 68,
+  "es-queue-Worker #3-inProgressMessage": "<none>",
+  "es-queue-Worker #3-lastProcessedMessage": "PurgeTimedOutRequests",
+  "es-queue-Worker #4-queueName": "Worker #4",
+  "es-queue-Worker #4-groupName": "Workers",
+  "es-queue-Worker #4-avgItemsPerSecond": 2,
+  "es-queue-Worker #4-avgProcessingTime": 0.040221428571428575,
+  "es-queue-Worker #4-currentIdleTime": "0:00:00:00.8356870",
+  "es-queue-Worker #4-currentItemProcessingTime": null,
+  "es-queue-Worker #4-idleTimePercent": 99.99154911144629,
+  "es-queue-Worker #4-length": 0,
+  "es-queue-Worker #4-lengthCurrentTryPeak": 0,
+  "es-queue-Worker #4-lengthLifetimePeak": 0,
+  "es-queue-Worker #4-totalItemsProcessed": 65,
+  "es-queue-Worker #4-inProgressMessage": "<none>",
+  "es-queue-Worker #4-lastProcessedMessage": "PurgeTimedOutRequests",
+  "es-queue-Worker #5-queueName": "Worker #5",
+  "es-queue-Worker #5-groupName": "Workers",
+  "es-queue-Worker #5-avgItemsPerSecond": 2,
+  "es-queue-Worker #5-avgProcessingTime": 0.17759268292682928,
+  "es-queue-Worker #5-currentIdleTime": "0:00:00:00.8052165",
+  "es-queue-Worker #5-currentItemProcessingTime": null,
+  "es-queue-Worker #5-idleTimePercent": 99.9635548548067,
+  "es-queue-Worker #5-length": 0,
+  "es-queue-Worker #5-lengthCurrentTryPeak": 0,
+  "es-queue-Worker #5-lengthLifetimePeak": 0,
+  "es-queue-Worker #5-totalItemsProcessed": 70,
+  "es-queue-Worker #5-inProgressMessage": "<none>",
+  "es-queue-Worker #5-lastProcessedMessage": "IODispatcherDelayedMessage",
+  "es-writer-lastFlushSize": 0,
+  "es-writer-lastFlushDelayMs": 0.0134,
+  "es-writer-meanFlushSize": 0,
+  "es-writer-meanFlushDelayMs": 0.0134,
+  "es-writer-maxFlushSize": 0,
+  "es-writer-maxFlushDelayMs": 0.0134,
+  "es-writer-queuedFlushMessages": 0,
+  "es-readIndex-cachedRecord": 676,
+  "es-readIndex-notCachedRecord": 0,
+  "es-readIndex-cachedStreamInfo": 171,
+  "es-readIndex-notCachedStreamInfo": 32,
+  "es-readIndex-cachedTransInfo": 0,
+  "es-readIndex-notCachedTransInfo": 0
+}
+```
+
+:::
+
+Stats stream has the max time-to-live set to 24 hours, so all the events that are older than 24 hours will be
+deleted.
+
+### Stats period
+
+Using this setting you can control how often stats events are generated. By default, the node will produce one
+event in 30 seconds. If you want to decrease network pressure on subscribers to the `$all` stream, you can
+tell KurrentDB to produce stats less often.
+
+| Format               | Syntax                        |
+| :------------------- | :---------------------------- |
+| Command line         | `--stats-period-sec`          |
+| YAML                 | `StatsPeriodSec`              |
+| Environment variable | `KURRENTDB_STATS_PERIOD_SEC`  |
+
+**Default**: `30`
+
+### Write stats to database
+
+As mentioned before, stats events are quite large and whilst it is sometimes beneficial to keep the stats
+history, it is most of the time not necessary. Therefore, we do not write stats events to the database by
+default. When this option is set to `true`, all the stats events will be persisted.
+
+As mentioned before, stats events have a TTL of 24 hours and when writing stats to the database is enabled,
+you'd need to scavenge more often to release the disk space.
+
+| Format               | Syntax                         |
+| :------------------- | :----------------------------- |
+| Command line         | `--write-stats-to-db`          |
+| YAML                 | `WriteStatsToDb`               |
+| Environment variable | `KURRENTDB_WRITE_STATS_TO_DB`  |
+
+**Default**: `false`
diff --git a/docs/server/diagnostics/integrations.md b/docs/server/diagnostics/integrations.md
new file mode 100644
index 00000000000..9e719090cb7
--- /dev/null
+++ b/docs/server/diagnostics/integrations.md
@@ -0,0 +1,372 @@
+---
+title: "Integrations"
+order: 3
+---
+
+# Monitoring integrations
+
+KurrentDB supports several methods to integrate with external monitoring and observability tools. Those include:
+
+- [OpenTelemetry](#opentelemetry-exporter): export metrics to an OpenTelemetry-compatible endpoint
+- [Prometheus](#prometheus): collect metrics in Prometheus
+- [Datadog](#datadog): monitor and measure the cluster with Datadog
+- [ElasticSearch](#elasticsearch): this section describes how to collect KurrentDB logs in ElasticSearch
+- [Vector](#vector): collect metrics and logs to your APM tool using Vector
+
+## Prometheus
+
+You can collect KurrentDB metrics to Prometheus and configure Grafana dashboards to monitor your deployment.
+KurrentDB provides Prometheus support out of the box. Refer to [metrics](metrics.md) documentation to learn more.
+
+Older versions can be monitored by Prometheus using the community-supported exporter available in the [GitHub repository](https://github.com/marcinbudny/eventstore_exporter).
+
+## OpenTelemetry Exporter
+
+<wbr><Badge type="info" vertical="middle" text="License Required"/>
+
+KurrentDB passively exposes metrics for scraping on the `/metrics` endpoint. If you would like KurrentDB to actively export the metrics, the _OpenTelemetry Exporter_ feature can be used.
+
+The OpenTelemetry Exporter feature allows you to export KurrentDB metrics to a specified endpoint using the [OpenTelemetry Protocol](https://opentelemetry.io/docs/specs/otel/protocol/) (OTLP). The following instructions will help you set up the exporter and customize its configuration, so you can receive, process, export and monitor metrics as needed.
+
+A number of APM providers natively support ingesting metrics using the OTLP protocol, so you might be able to directly use the OpenTelemetry Exporter to send metrics to your APM provider. Alternatively, you can export metrics to the OpenTelemetry Collector, which can then be configured to send metrics to a variety of backends. You can find out more about the [OpenTelemetry collector](https://opentelemetry.io/docs/collector/).
+
+### Configuration
+
+You require a [license key](../quick-start/installation.md#license-keys) to use this feature.
+
+Refer to the [configuration guide](../configuration/README.md) for configuration mechanisms other than YAML.
+
+Sample configuration:
+
+```yaml
+OpenTelemetry:
+  Otlp:
+    Endpoint: "http://localhost:4317"
+    Headers: ""
+```
+
+The configuration can specify:
+
+| Name                          | Description                                            |
+|-------------------------------|--------------------------------------------------------|
+| OpenTelemetry__Otlp__Endpoint | Destination where the OTLP exporter will send the data |
+| OpenTelemetry__Otlp__Headers  | Optional headers for the connection                    |
+
+Headers are key-value pairs separated by commas. For example:
+
+```:no-line-numbers
+"Headers": "api-key=value,other-config-value=value"
+```
+
+KurrentDB will log a message on startup confirming the metrics export to your specified endpoint:
+
+```:no-line-numbers
+OtlpExporter: Exporting metrics to http://localhost:4317/ every 15.0 seconds
+```
+
+The interval is taken from the `ExpectedScrapeIntervalSeconds` value in `metricsconfig.json` in the server installation directory:
+
+```:no-line-numbers
+"ExpectedScrapeIntervalSeconds": 15
+```
+
+### Troubleshooting
+
+| Symptom                                                                      | Solution                                                                                                                                                                                                                                                                                    |
+|------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| KurrentDB logs a message on startup that it cannot find the configuration | The server logs a message: `OtlpExporter: No OpenTelemetry:Otlp configuration found. Not exporting metrics.`.<br/><br/> Check the configuration steps above.                                                                                                                                |
+
+## Datadog
+
+The best way to integrate KurrentDB metrics with Datadog today is by using the [OpenTelemetry exporter](#opentelemetry-exporter). We currently don't support exporting logs via the exporter.
+
+You can use the community-supported integration to collect KurrentDB logs and metrics in Datadog.
+
+Find out more details about the integration
+in [Datadog documentation](https://docs.datadoghq.com/integrations/eventstore/).
+
+## Vector
+
+> Vector is a lightweight and ultra-fast tool for building observability pipelines.
+> (from Vector website)
+
+You can use [Vector] for extracting metrics or logs from your self-managed KurrentDB server.
+
+It's also possible to collect metrics from the Kurrent Cloud managed cluster or instance, as long as the
+Vector agent is running on a machine that has a direct connection to the KurrentDB server. You cannot,
+however, fetch logs from Kurrent Cloud using your own Vector agent.
+
+### Installation
+
+Follow the [installation instructions](https://vector.dev/docs/setup/installation/) provided by Vector to
+deploy the agent. You can deploy and run it on the same machine where you run KurrentDB server. If you run
+KurrentDB in Kubernetes, you can run Vector as a sidecar for each of the KurrentDB pods.
+
+### Configuration
+
+Each Vector instance needs to be configured with sources and sinks. When configured properly, it will collect
+information from each source, apply the necessary transformation (if needed), and send the transformed
+information to the configured sink.
+
+[Vector] provides [many different sinks], you most probably will find your preferred monitoring platform among
+those sinks.
+
+#### Collecting metrics
+
+There is an official [KurrentDB source] that you can use to pull relevant metrics from your database.
+
+Below you can find an example that you can use in your `vector.toml` configuration file:
+
+```toml
+[sources.kurrentdb_metrics]
+type = "kurrentdb_metrics"
+endpoint = "https://{hostname}:{http_port}/stats"
+scrape_interval_secs = 3
+```
+
+Here `hostname` is the KurrentDB node hostname or the cluster DNS name, and `http_port` is the configured
+HTTP port, which is `2113` by default.
+
+#### Collecting logs
+
+To collect logs, you can use the [file source] and configure it to target KurrentDB log file. For log
+collection, Vector must run on the same machine as KurrentDB server as it collects the logs from files on
+the local file system.
+
+```toml
+[sources.kurrentdb_logs]
+type = "file"
+# If you changed the default log location, please update the filepath accordingly.
+include = ["/var/log/kurrentdb"]
+read_from = "end"
+```
+
+#### Example
+
+In this example, Vector runs on the same machine as KurrentDB, collects metrics and logs, and then sends them to Datadog. Notice that despite the KurrentDB HTTP is, in theory, accessible via `localhost`, it won't work if the server SSL certificate doesn't have `localhost` in the certificate CN or SAN.
+
+```toml
+[sources.kurrentdb_metrics]
+type = "kurrentdb_metrics"
+endpoint = "https://node1.kurrentdb.acme.company:2113/stats"
+scrape_interval_secs = 10
+
+[sources.kurrentdb_logs]
+type = "file"
+include = ["/var/log/kurrentdb"]
+read_from = "end"
+
+[sinks.dd_metrics]
+type = "datadog_metrics"
+inputs = ["kurrentdb_metrics"]
+api_key = "${DD_API_KEY}"
+default_namespace = "service"
+
+[sinks.dd_logs]
+type = "datadog_logs"
+inputs = ["sources.kurrentdb_logs"]
+default_api_key = "${DD_API_KEY}"
+compression = "gzip"
+```
+
+## ElasticSearch
+
+Elastic Stack is one of the most popular tools for ingesting and analyzing logs and statistics:
+- [Elasticsearch](https://www.elastic.co/guide/en/elasticsearch/reference/8.2/index.html) was built for advanced filtering and text analysis.
+- [Filebeat](https://www.elastic.co/guide/en/beats/filebeat/8.2/index.html) allow tailing files efficiently.
+- [Logstash](https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html) enables log transformations and processing pipelines.
+- [Kibana](https://www.elastic.co/guide/en/kibana/8.2/index.html) is a dashboard and visualization UI for Elasticsearch data.
+
+KurrentDB exposes structured information through its logs and statistics, allowing straightforward integration with mentioned tooling.
+
+### Logstash
+
+Logstash is the plugin based data processing component of the Elastic Stack which sends incoming data to Elasticsearch. It's excellent for building a text-based processing pipeline. It can also gather logs from files (although Elastic recommends now Filebeat for that, see more in the following paragraphs). Logstash needs to either be installed on the KurrentDB node or have access to logs storage. The processing pipeline can be configured through the configuration file (e.g. `logstash.conf`). This file contains the three essential building blocks:
+- input - source of logs, e.g. log files, system output, Filebeat.
+- filter - processing pipeline, e.g. to modify, enrich, tag log data,
+- output - place where we'd like to put transformed logs. Typically that contains Elasticsearch configuration.
+
+See the sample Logstash 8.2 configuration file. It shows how to take the KurrentDB log files, split them based on the log type (regular and stats) and output them to separate indices to Elasticsearch:
+
+```ruby
+#######################################################
+#  KurrentDB logs file input
+#######################################################
+input {
+  file {
+    path => "/var/log/kurrentdb/*/log*.json"
+    start_position => "beginning"
+    codec => json
+  }
+}
+
+#######################################################
+#  Filter out stats from regular logs
+#  add respecting field with log type
+#######################################################
+filter {
+  # check if log path includes "log-stats"
+  # so pattern for stats
+  if [log][file][path] =~ "log-stats" {
+    mutate {
+      add_field => {
+        "log_type" => "stats"
+      }
+    }
+  }
+  else {
+    mutate {
+      add_field => {
+        "log_type" => "logs"
+      }
+    }
+  }
+}
+
+#######################################################
+#  Send logs to Elastic
+#  Create separate indexes for stats and regular logs
+#  using field defined in the filter transformation
+#######################################################
+output {
+  elasticsearch {
+    hosts => [ "elasticsearch:9200" ]
+    index => 'kurrentdb-%{[log_type]}'
+  }
+}
+```
+
+You can play with such configuration through the [sample docker-compose](https://github.com/EventStore/samples/blob/2829b0a90a6488e1eee73fad0be33a3ded7d13d2/Logging/Elastic/Logstash/docker-compose.yml).
+
+### Filebeat
+
+Logstash was an initial attempt by Elastic to provide a log harvester tool. However, it appeared to have performance limitations. Elastic came up with the [Beats family](https://www.elastic.co/beats/), which allows gathering data from various specialized sources (files, metrics, network data, etc.). Elastic recommends Filebeat as the log collection and shipment tool off the host servers. Filebeat uses a backpressure-sensitive protocol when sending data to Logstash or Elasticsearch to account for higher volumes of data.
+
+Filebeat can pipe logs directly to Elasticsearch and set up a Kibana data view.
+
+Filebeat needs to either be installed on the KurrentDB node or have access to logs storage. The processing pipeline can be configured through the configuration file (e.g. `filebeat.yml`). This file contains the three essential building blocks:
+- input - configuration for file source, e.g. if stored in JSON format.
+- output - place where we'd like to put transformed logs, e.g. Elasticsearch, Logstash,
+- setup - additional setup and simple transformations (e.g. Elasticsearch indices template, Kibana data view).
+
+See the sample Filebeat 8.2 configuration file. It shows how to take the KurrentDB log files, output them to Elasticsearch prefixing index with `kurrentdb` and create a Kibana data view:
+
+```yml
+#######################################################
+#  KurrentDB logs file input
+#######################################################
+filebeat.inputs:
+  - type: log
+    paths:
+      - /var/log/kurrentdb/*/log*.json
+    json.keys_under_root: true
+    json.add_error_key: true
+
+#######################################################
+#  ElasticSearch direct output
+#######################################################
+output.elasticsearch:
+  index: "kurrentdb-%{[agent.version]}"
+  hosts: ["elasticsearch:9200"]
+
+#######################################################
+#  ElasticSearch dashboard configuration
+#  (index pattern and data view)
+#######################################################
+setup.dashboards:
+  enabled: true
+  index: "kurrentdb-*"
+
+setup.template:
+  name: "kurrentdb"
+  pattern: "kurrentdb-%{[agent.version]}"
+
+#######################################################
+#  Kibana dashboard configuration
+#######################################################
+setup.kibana:
+  host: "kibana:5601"
+
+```
+
+You can play with such configuration through the [sample docker-compose](https://github.com/EventStore/samples/blob/2829b0a90a6488e1eee73fad0be33a3ded7d13d2/Logging/Elastic/Filebeat/docker-compose.yml).
+
+### Filebeat with Logstash
+
+Even though Filebeat can pipe logs directly to Elasticsearch and do a basic Kibana setup, you'd like to have more control and expand the processing pipeline. That's why for production, it's recommended to use both. Multiple Filebeat instances (e.g. from different KurrentDB clusters) can collect logs and pipe them to Logstash, which will play an aggregator role. Filebeat can output logs to Logstash, and Logstash can receive and process these logs with the Beats input. Logstash can transform and route logs to Elasticsearch instance(s).
+
+In that configuration, Filebeat should be installed on the KurrentDB node (or have access to file logs) and define Logstash as output. See the sample Filebeat 8.2 configuration file.
+
+```yml
+#######################################################
+#  KurrentDB logs file input
+#######################################################
+filebeat.inputs:
+  - type: log
+    paths:
+      - /var/log/kurrentdb/*/log*.json
+    json.keys_under_root: true
+    json.add_error_key: true
+
+#######################################################
+#  Logstash output to transform and prepare logs
+#######################################################
+output.logstash:
+  hosts: ["logstash:5044"]
+```
+
+Then the sample Logstash 8.2 configuration file will look like the below. It shows how to take the KurrentDB logs from Filebeat, split them based on the log type (regular and stats) and output them to separate indices to Elasticsearch:
+
+```ruby
+#######################################################
+#  Filebeat input 
+#######################################################
+input {
+  beats {
+    port => 5044
+  }
+}
+
+#######################################################
+#  Filter out stats from regular logs
+#  add respecting field with log type
+#######################################################
+filter {
+  # check if log path includes "log-stats"
+  # so pattern for stats
+  if [log][file][path] =~ "log-stats" {
+    mutate {
+      add_field => {
+        "log_type" => "stats"
+      }
+    }
+  }
+  else {
+    mutate {
+      add_field => {
+        "log_type" => "logs"
+      }
+    }
+  }
+}
+
+#######################################################
+#  Send logs to Elastic
+#  Create separate indexes for stats and regular logs
+#  using field defined in the filter transformation
+#######################################################
+output {
+  elasticsearch {
+    hosts => [ "elasticsearch:9200" ]
+    index => 'kurrentdb-%{[log_type]}'
+  }
+}
+```
+
+You can play with such configuration through the [sample docker-compose](https://github.com/EventStore/samples/blob/2829b0a90a6488e1eee73fad0be33a3ded7d13d2/Logging/Elastic/FilebeatWithLogstash/docker-compose.yml).
+
+[Vector]: https://vector.dev/docs/
+[KurrentDB source]: https://vector.dev/docs/reference/configuration/sources/kurrentdb_metrics/
+[file source]: https://vector.dev/docs/reference/configuration/sources/file/
+[many different sinks]: https://vector.dev/docs/reference/configuration/sinks/
+[Console]: https://vector.dev/docs/reference/configuration/sinks/console/
diff --git a/docs/server/diagnostics/logs.md b/docs/server/diagnostics/logs.md
new file mode 100644
index 00000000000..71cc48c7079
--- /dev/null
+++ b/docs/server/diagnostics/logs.md
@@ -0,0 +1,291 @@
+---
+title: "Logs"
+order: 1
+---
+
+# Database logs
+
+KurrentDB logs its internal operations to the console (stdout) and to log files. The default location of
+the log files and the way to change it is described [below](#logs-location).
+
+There are a few options to change the way how KurrentDB produces logs and how detailed the logs should be.
+
+::: warning
+KurrentDB logs may contain sensitive information such as stream names, usernames, and projection definitions.
+:::
+
+## Log format
+
+KurrentDB uses the structured logging in JSON format that is more machine-friendly and can be ingested by
+vendor-specific tools like Logstash or Datadog agent.
+
+Here is how the structured log looks like:
+
+```json
+{
+	"@t": "2025-02-03T18:11:53.8612833+01:00",
+	"@mt": "PROJECTIONS SUBSYSTEM: All components started for Instance: {instanceCorrelationId}",
+	"@l": "Information",
+	"@i": 669867955,
+	"instanceCorrelationId": "9bfbea73-b3de-45d8-8586-caefaa0bf05f",
+	"SourceContext": "EventStore.Projections.Core.ProjectionsSubsystem",
+	"ProcessId": 19812,
+	"ThreadId": 9
+} {
+	"@t": "2025-02-03T18:11:53.8614272+01:00",
+	"@mt": "========== [{httpEndPoint}] Sub System '{subSystemName}' initialized.",
+	"@l": "Information",
+	"@i": 1147237149,
+	"httpEndPoint": "127.0.0.1:2113",
+	"subSystemName": "Projections",
+	"SourceContext": "EventStore.Core.Services.VNode.ClusterVNodeController",
+	"ProcessId": 19812,
+	"ThreadId": 16
+} {
+	"@t": "2025-02-03T18:11:53.8630025+01:00",
+	"@mt": "Allowed Connectors: {AllowedConnectors}",
+	"@l": "Information",
+	"@i": 542710717,
+	"AllowedConnectors": ["SerilogSink", "HttpSink"],
+	"SourceContext": "EventStore.Connectors.Management.ConnectorsLicenseService",
+	"ProcessId": 19812,
+	"ThreadId": 22
+} {
+	"@t": "2025-02-03T18:11:53.8633385+01:00",
+	"@mt": "PROJECTIONS: No projections were found in {stream}, starting from empty stream",
+	"@l": "Debug",
+	"@i": 2065058799,
+	"stream": "$projections-$all",
+	"SourceContext": "EventStore.Projections.Core.Services.Management.ProjectionManager",
+	"ProcessId": 19812,
+	"ThreadId": 9
+}
+```
+
+This format is aligned with the [CLEF format](https://clef-json.org/).
+
+## Logs location
+
+Log files are located in `/var/log/kurrentdb` for Linux and macOS, and in the `logs` subdirectory of the
+KurrentDB installation directory on Windows. You can change the log files location using the `Log`
+configuration option.
+
+::: tip
+Moving logs to a separate storage might improve the database performance if you keep the default
+verbose log level.
+:::
+
+| Format               | Syntax           |
+|:---------------------|:-----------------|
+| Command line         | `--log`          |
+| YAML                 | `Log`            |
+| Environment variable | `KURRENTDB_LOG`  |
+
+For example, adding this line to the `kurrentdb.conf` file will force writing logs to
+the `/tmp/kurrentdb/logs` directory:
+
+```text:no-line-numbers
+Log: /tmp/kurrentdb/logs
+```
+
+## Log level
+
+You can change the level using the `LogLevel` setting:
+
+| Format               | Syntax                 |
+|:---------------------|:-----------------------|
+| Command line         | `--log-level`          |
+| YAML                 | `LogLevel`             |
+| Environment variable | `KURRENTDB_LOG_LEVEL`  |
+
+Acceptable values are: `Default`, `Verbose`, `Debug`, `Information`, `Warning`, `Error`, and `Fatal`.
+
+Additionally: `Trace` is equivalent to `Verbose`, `Critical` is equivalent to `Fatal`, and `None` is equivalent to `Fatal`.
+
+## Logging options
+
+You can tune the KurrentDB logging further by using the logging options described below.
+
+### Log configuration file
+
+Specifies the location of the file which configures the logging levels of various components.
+
+| Format               | Syntax                  |
+|:---------------------|:------------------------|
+| Command line         | `--log-config`          |
+| YAML                 | `LogConfig`             |
+| Environment variable | `KURRENTDB_LOG_CONFIG`  |
+
+By default, the application directory (and `/etc/kurrentdb` on Linux and Mac) are checked. You may specify a
+full path.
+
+### HTTP requests logging
+
+KurrentDB can also log all the incoming HTTP requests, like many HTTP servers do. Requests are logged
+before being processed, so unsuccessful requests are logged too.
+
+Use one of the following ways to enable the HTTP requests logging:
+
+| Format               | Syntax                         |
+|:---------------------|:-------------------------------|
+| Command line         | `--log-http-requests`          |
+| YAML                 | `LogHttpRequests`              |
+| Environment variable | `KURRENTDB_LOG_HTTP_REQUESTS`  |
+
+**Default**: `false`, logging HTTP requests is disabled by default.
+
+### Log failed authentication
+
+For security monitoring, you can enable logging failed authentication attempts by
+setting `LogFailedAuthenticationAttempts` setting to true.
+
+| Format               | Syntax                                          |
+|:---------------------|:------------------------------------------------|
+| Command line         | `--log-failed-authentication-attempts`          |
+| YAML                 | `LogFailedAuthenticationAttempts`               |
+| Environment variable | `KURRENTDB_LOG_FAILED_AUTHENTICATION_ATTEMPTS`  |
+
+**Default**: `false`
+
+### Log console format
+
+The format of the console logger. Use `Json` for structured log output.
+
+| Format               | Syntax                          |
+|:---------------------|:--------------------------------|
+| Command line         | `--log-console-format`          |
+| YAML                 | `LogConsoleFormat`              |
+| Environment variable | `KURRENTDB_LOG_CONSOLE_FORMAT`  |
+
+Acceptable values are: `Plain`, `Json`
+
+**Default**: `Plain`
+
+### Log file size
+
+The maximum size of each log file, in bytes.
+
+| Format               | Syntax                     |
+|:---------------------|:---------------------------|
+| Command line         | `--log-file-size`          |
+| YAML                 | `LogFileSize`              |
+| Environment variable | `KURRENTDB_LOG_FILE_SIZE`  |
+
+**Default**: `1GB`
+
+### Log file interval
+
+How often to rotate logs.
+
+| Format               | Syntax                         |
+|:---------------------|:-------------------------------|
+| Command line         | `--log-file-interval`          |
+| YAML                 | `LogFileInterval`              |
+| Environment variable | `KURRENTDB_LOG_FILE_INTERVAL`  |
+
+Acceptable values are: `Minute`, `Hour`, `Day`, `Week`, `Month`, `Year`
+
+**Default**: `Day`
+
+### Log file retention count
+
+Defines how many log files need to be kept on disk. By default, logs for the last month are available. Tune this setting if you need to have more history in the logs, or you need to save disk space. 
+
+| Format               | Syntax                           |
+|:---------------------|:---------------------------------|
+| Command line         | `--log-file-retention-count`     |
+| YAML                 | `LogFileRetentionCount`          |
+| Environment variable | `KURRENTDB_LOG_RETENTION_COUNT`  |
+
+**Default**: `31`
+
+#### Disable log file
+
+You can completely disable logging to a file by changing the `DisableLogFile` option.
+
+| Format               | Syntax                        |
+|:---------------------|:------------------------------|
+| Command line         | `--disable-log-file`          |
+| YAML                 | `DisableLogFile`              |
+| Environment variable | `KURRENTDB_DISABLE_LOG_FILE`  |
+
+**Default**: `false`
+
+## Logs download
+
+<Badge type="info" vertical="middle" text="License Required"/>
+
+The _Logs Download_ feature provides HTTP access to KurrentDB logs so that they can be viewed without requiring file system access.
+
+You require a [license key](../quick-start/installation.md#license-keys) to use this feature.
+
+::: tip
+You can use this API to download log files from your managed KurrentDB clusters in Kurrent Cloud.
+:::
+
+On startup the server will log a message similar to:
+```:no-line-numbers
+LogsEndpoint: Serving logs from "<FULL-PATH-TO-LOGS>" at endpoint "/admin/logs"
+```
+
+Access the logs via the `/admin/logs` endpoint on your server. Construct the full URL as follows:
+
+```:no-line-numbers
+http(s)://<node ip or hostname>:<node port>/admin/logs
+```
+
+Example:
+```:no-line-numbers
+https://localhost:2113/admin/logs
+```
+
+Only authenticated users belonging to the `$admins` or `$ops` groups can use this endpoint.
+
+### Listing log files
+
+To list the current log files, issue a `GET` to the `/admin/logs` endpoint
+
+Example:
+```bash:no-line-numbers
+curl https://user:password@localhost:2113/admin/logs | jq
+```
+
+Sample response:
+```json
+[
+  {
+    "name": "log-stats20240205.json",
+    "lastModified": "2024-02-05T13:14:14.2789475+00:00",
+    "size": 1058614
+  },
+  {
+    "name": "log20240205.json",
+    "lastModified": "2024-02-05T13:14:37.0781601+00:00",
+    "size": 158542
+  }
+]
+```
+
+The response is ordered from most recent change first, is limited to a maximum of 1000 items, and includes:
+
+| Name         | Description                                                                                                                                                                                                                                       |
+|--------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| name         | File name of the log file                                                                                                                                                                                                                         |
+| createdAt    | Timestamp of when the log file was created in [round-trip format](https://learn.microsoft.com/en-us/dotnet/standard/base-types/standard-date-and-time-format-strings#the-round-trip-o-o-format-specifier) (local time with time zone information) |
+| lastModified | Timestamp of the last modification in [round-trip format](https://learn.microsoft.com/en-us/dotnet/standard/base-types/standard-date-and-time-format-strings#the-round-trip-o-o-format-specifier) (local time with time zone information)         |
+| size         | Size of the log file in bytes                                                                                                                                                                                                                     |
+
+### Downloading log files
+
+To download a specific log file, append its name to the URL:
+
+Example:
+```bash:no-line-numbers
+curl https://user:password@localhost:2113/admin/logs/log20240205.json --output log20240205.json
+```
+
+### Troubleshooting
+
+- **404 Not Found:** Verify that you have a valid license key.
+
+- **401 Unauthorized:** Confirm the credentials are correct and the user belongs to the `$ops` or `$admins` group.
diff --git a/docs/server/diagnostics/metrics.md b/docs/server/diagnostics/metrics.md
new file mode 100644
index 00000000000..98ec0d21bd6
--- /dev/null
+++ b/docs/server/diagnostics/metrics.md
@@ -0,0 +1,602 @@
+---
+order: 2
+---
+
+# Metrics
+
+KurrentDB collects metrics in [Prometheus format](https://prometheus.io/docs/instrumenting/exposition_formats/#text-based-format), available on the `/metrics` endpoint. Prometheus can be configured to scrape this endpoint directly. The metrics are configured in `metricsconfig.json` which is located in the installation directory.
+
+In addition, KurrentDB can actively export metrics to a specified endpoint using the [OpenTelemetry Protocol](https://opentelemetry.io/docs/specs/otel/protocol/) (OTLP). <Badge type="info" text="License Required" vertical="middle"></Badge>
+
+A [Cluster Summary](https://grafana.com/grafana/dashboards/22824) Grafana dashboard is available, as well as [miscellaneous panels](https://grafana.com/grafana/dashboards/22823).
+
+## Metrics reference
+
+### Caches
+
+#### Cache hits and misses
+
+KurrentDB tracks cache hits/misses metrics for `stream-info` and `chunk` caches.
+
+| Time series                                                                     | Type                     | Description                             |
+|:--------------------------------------------------------------------------------|:-------------------------|:----------------------------------------|
+| `kurrentdb_cache_hits_misses_total{cache=<CACHE_NAME>,kind=<"hits"\|"misses">}` | [Counter](#common-types) | Total hits/misses on _CACHE_NAME_ cache |
+
+Example configuration:
+```json
+"CacheHitsMisses": {
+  "StreamInfo": true,
+  "Chunk": false
+}
+```
+
+Example output:
+```
+# TYPE kurrentdb_cache_hits_misses_total counter
+kurrentdb_cache_hits_misses_total{cache="stream-info",kind="hits"} 104329 1688157489545
+kurrentdb_cache_hits_misses_total{cache="stream-info",kind="misses"} 117 1688157489545
+```
+
+#### Dynamic cache resources
+
+Certain caches that KurrentDB uses are dynamic in nature i.e. their capacity scales up/down during their lifetime. KurrentDB records metrics for resources being used by each such dynamic cache.
+
+| Time series                                                                     | Type                   | Description                                          |
+|:--------------------------------------------------------------------------------|:-----------------------|:-----------------------------------------------------|
+| `kurrentdb_cache_resources_bytes{cache=<CACHE_NAME>,kind=<"capacity"\|"size">}` | [Gauge](#common-types) | Current capacity/size of _CACHE_NAME_ cache in bytes |
+| `kurrentdb_cache_resources_entries{cache=<CACHE_NAME>,kind="count"}`            | [Gauge](#common-types) | Current number of entries in _CACHE_NAME_ cache      |
+
+Example configuration:
+```json
+"CacheResources": true
+```
+
+Example output:
+```
+# TYPE kurrentdb_cache_resources_bytes gauge
+# UNIT kurrentdb_cache_resources_bytes bytes
+kurrentdb_cache_resources_bytes{cache="LastEventNumber",kind="capacity"} 50000000 1688157491029
+kurrentdb_cache_resources_bytes{cache="LastEventNumber",kind="size"} 15804 1688157491029
+
+# TYPE kurrentdb_cache_resources_entries gauge
+# UNIT kurrentdb_cache_resources_entries entries
+kurrentdb_cache_resources_entries{cache="LastEventNumber",kind="count"} 75 1688157491029
+```
+
+### Checkpoints
+
+| Time series                                                        | Type                   | Description                            |
+|:-------------------------------------------------------------------|:-----------------------|:---------------------------------------|
+| `kurrentdb_checkpoints{name=<CHECKPOINT_NAME>,read="non-flushed"}` | [Gauge](#common-types) | Value for _CHECKPOINT_NAME_ checkpoint |
+
+Example configuration:
+```json
+"Checkpoints": {
+  "Replication": true,
+  "Chaser": false,
+  "Epoch": false,
+  "Index": false,
+  "Proposal": false,
+  "Truncate": false,
+  "Writer": false,
+  "StreamExistenceFilter": false
+}
+```
+
+Example output:
+```
+# TYPE kurrentdb_checkpoints gauge
+kurrentdb_checkpoints{name="replication",read="non-flushed"} 613363 1688054162478
+```
+
+### Elections Count
+
+This metric tracks the number of elections that have been completed.
+
+| Time series                       | Type                     | Description                  |
+|:----------------------------------|:-------------------------|:-----------------------------|
+| `kurrentdb_elections_count_total` | [Counter](#common-types) | Elections count in a cluster |
+
+Example configuration:
+```json
+"ElectionsCount": true
+```
+
+Example output:
+```
+# TYPE kurrentdb_elections_count_total counter
+kurrentdb_elections_count_total 0 1710188996949
+```
+
+### Events
+
+These metrics track events written to and read from the server, including reads from caches.
+
+| Time series                                                                                                      | Type                       | Description                                                                                          |
+|:-----------------------------------------------------------------------------------------------------------------|:---------------------------|:-----------------------------------------------------------------------------------------------------|
+| `kurrentdb_io_bytes_total{activity="read"}`                                                                      | [Counter](#common-types)   | Event bytes read                                                                                     |
+| `kurrentdb_io_events_total{activity=<"read"\|"written">}`                                                        | [Counter](#common-types)   | Events read/written                                                                                  |
+| `kurrentdb_logical_chunk_read_distribution_bucket{le=<CHUNK_OFFSET>}`                                            | [Histogram](#common-types) | Number of records read from chunks less than or equal to _CHUNK\_OFFSET_ older than the active chunk |
+| `kurrentdb_io_record_read_duration_seconds_bucket{source=<"Archive"\|"ChunkCache"\|"FileSystem">,le=<DURATION>}` | [Histogram](#common-types) | Number of records read from the source with latency less than or equal to _DURATION_ in seconds      |
+
+Example configuration:
+```json
+"Events": {
+  "Read": false,
+  "Written": true
+}
+```
+
+Example output:
+```
+# TYPE kurrentdb_io_events_total counter
+# UNIT kurrentdb_io_events_total events
+kurrentdb_io_events_total{activity="written"} 320 1687963622074
+```
+
+`kurrentdb_logical_chunk_read_distribution_bucket` is a histogram showing where in the log events are being read from relative to the current tail.
+This is useful for determining cutoff-points such as how much of the log should be kept in memory, and how much can be archived.
+Note that the scale is exponential to accommodate a wide range of log sizes.
+
+`kurrentdb_io_record_read_duration_seconds_bucket` is a histogram showing how long records are taking to be read from various sources (`Archive`, `ChunkCache`, `FileSystem`).
+Note that any of these can return very quickly if the record happens to already be in the read buffer.
+
+### Gossip
+
+Measures the round trip latency and processing time of gossip.
+Usually a node pushes new gossip to other nodes periodically or when its view of the cluster changes. Sometimes nodes pull gossip from each other if there is a suspected network problem. 
+
+#### Gossip latency
+
+| Time series                                                                                                        | Type                       | Description                                                                                  |
+|:-------------------------------------------------------------------------------------------------------------------|:---------------------------|:---------------------------------------------------------------------------------------------|
+| `kurrentdb_gossip_latency_seconds_bucket{activity="pull-from-peer",status=<"successful"\|"failed">,le=<DURATION>}` | [Histogram](#common-types) | Number of gossips pulled from peers with latency less than or equal to _DURATION_ in seconds |
+| `kurrentdb_gossip_latency_seconds_bucket{activity="push-to-peer",status=<"successful"\|"failed">,le=<DURATION>}`   | [Histogram](#common-types) | Number of gossips pushed to peers with latency less than or equal to _DURATION_ in seconds   |
+
+#### Gossip processing
+
+
+| Time Series                                                                                                                                                   | Type                       | Description                                                                                                  |
+|:--------------------------------------------------------------------------------------------------------------------------------------------------------------|:---------------------------|:-------------------------------------------------------------------------------------------------------------|
+| `kurrentdb_gossip_processing_duration_seconds_bucket{`<br/>`activity="push-from-peer",`<br/>`status=<"successful"\|"failed">,`<br/>`le=<DURATION>}`           | [Histogram](#common-types) | Number of gossips pushed from peers that took less than or equal to _DURATION_ in seconds to process         |
+| `kurrentdb_gossip_processing_duration_seconds_bucket{`<br/>`activity="request-from-peer",`<br/>`status=<"successful"\|"failed">,`<br/>`le=<DURATION>}`        | [Histogram](#common-types) | Number of gossip requests from peers that took less than or equal to _DURATION_ in seconds to process        |
+| `kurrentdb_gossip_processing_duration_seconds_bucket{`<br/>`activity="request-from-grpc-client",`<br/>`status=<"successful"\|"failed">,`<br/>`le=<DURATION>}` | [Histogram](#common-types) | Number of gossip requests from gRPC clients that took less than or equal to _DURATION_ in seconds to process |
+| `kurrentdb_gossip_processing_duration_seconds_bucket{`<br/>`activity="request-from-http-client",`<br/>`status=<"successful"\|"failed">,`<br/>`le=<DURATION>}` | [Histogram](#common-types) | Number of gossip requests from HTTP clients that took less than or equal to _DURATION_ in seconds to process |
+
+Example configuration:
+```json
+"Gossip": {
+  "PullFromPeer": false,
+  "PushToPeer": true,
+  "ProcessingPushFromPeer": false,
+  "ProcessingRequestFromPeer": false,
+  "ProcessingRequestFromGrpcClient": false,
+  "ProcessingRequestFromHttpClient": false
+}
+```
+
+Example output:
+```
+# TYPE kurrentdb_gossip_latency_seconds histogram
+# UNIT kurrentdb_gossip_latency_seconds seconds
+kurrentdb_gossip_latency_seconds_bucket{activity="push-to-peer",status="successful",le="0.005"} 8 1687972306948
+```
+
+### Incoming gRPC calls
+
+| Time series                                                            | Type                     | Description                                                                                |
+|:-----------------------------------------------------------------------|:-------------------------|:-------------------------------------------------------------------------------------------|
+| `kurrentdb_current_incoming_grpc_calls`                                | [Gauge](#common-types)   | Inflight gRPC calls i.e. gRPC requests that have started on the server but not yet stopped |
+| `kurrentdb_incoming_grpc_calls_total{kind="total"}`                    | [Counter](#common-types) | Total gRPC requests served                                                                 |
+| `kurrentdb_incoming_grpc_calls_total{kind="failed"}`                   | [Counter](#common-types) | Total gRPC requests failed                                                                 |
+| `kurrentdb_incoming_grpc_calls_total{`<br/>`kind="unimplemented"}`     | [Counter](#common-types) | Total gRPC requests made to unimplemented methods                                          |
+| `kurrentdb_incoming_grpc_calls_total{`<br/>`kind="deadline-exceeded"}` | [Counter](#common-types) | Total gRPC requests for which deadline have exceeded                                       |
+
+Example configuration:
+```json
+"IncomingGrpcCalls": {
+  "Current": true,
+  "Total": false,
+  "Failed": true,
+  "Unimplemented": false,
+  "DeadlineExceeded": false
+}
+```
+
+Example output:
+```
+# TYPE kurrentdb_current_incoming_grpc_calls gauge
+kurrentdb_current_incoming_grpc_calls 1 1687963622074
+
+# TYPE kurrentdb_incoming_grpc_calls_total counter
+kurrentdb_incoming_grpc_calls_total{kind="failed"} 1 1687962877623
+```
+
+#### Client protocol gRPC methods
+
+In addition, KurrentDB also records metrics for each of client protocol gRPC methods: `StreamRead`, `StreamAppend`, `StreamBatchAppend`, `StreamDelete` and `StreamTombstone`. They are grouped together according to the mapping defined in the configuration.
+
+| Time series                                                                                                                        | Type                       | Description                                                                                      |
+|:-----------------------------------------------------------------------------------------------------------------------------------|:---------------------------|:-------------------------------------------------------------------------------------------------|
+| `kurrentdb_grpc_method_duration_seconds_bucket{`<br/>`activity=<LABEL>,`<br/>`status="successful"\|"failed",`<br/>`le=<DURATION>}` | [Histogram](#common-types) | Number of _LABEL_ gRPC requests that took less than or equal to _DURATION_ in seconds to process |
+
+Example configuration:
+```json
+"GrpcMethods": {
+  "StreamAppend": "append",
+  "StreamBatchAppend": "append",
+  // leaving label as blank will disable metric collection
+  "StreamRead": "",
+  "StreamDelete": "",
+  "StreamTombstone": ""
+}
+```
+
+Example output:
+```
+# TYPE kurrentdb_grpc_method_duration_seconds histogram
+# UNIT kurrentdb_grpc_method_duration_seconds seconds
+kurrentdb_grpc_method_duration_seconds_bucket{activity="append",status="successful",le="1E-06"} 0 1688157491029
+kurrentdb_grpc_method_duration_seconds_bucket{activity="append",status="successful",le="1E-05"} 0 1688157491029
+kurrentdb_grpc_method_duration_seconds_bucket{activity="append",status="successful",le="0.0001"} 129 1688157491029
+kurrentdb_grpc_method_duration_seconds_bucket{activity="append",status="successful",le="0.001"} 143 1688157491029
+kurrentdb_grpc_method_duration_seconds_bucket{activity="append",status="successful",le="0.01"} 168 1688157491029
+kurrentdb_grpc_method_duration_seconds_bucket{activity="append",status="successful",le="0.1"} 169 1688157491029
+kurrentdb_grpc_method_duration_seconds_bucket{activity="append",status="successful",le="1"} 169 1688157491029
+kurrentdb_grpc_method_duration_seconds_bucket{activity="append",status="successful",le="10"} 169 1688157491029
+kurrentdb_grpc_method_duration_seconds_bucket{activity="append",status="successful",le="+Inf"} 169 1688157491029
+```
+
+### Kestrel
+
+| Time series                     | Type                   | Description                        |
+|:--------------------------------|:-----------------------|:-----------------------------------|
+| `kurrentdb_kestrel_connections` | [Gauge](#common-types) | Number of open kestrel connections |
+
+Example configuration:
+```json
+"Kestrel": {
+  "ConnectionCount": true
+}
+```
+
+Example output:
+```
+# TYPE kurrentdb_kestrel_connections gauge
+kurrentdb_kestrel_connections 1 1688070655500
+```
+
+### Persistent Subscriptions
+
+Persistent subscription metrics track the statistics for the persistent subscriptions.
+
+| Time series                                                                                                                 | Type                     | Description                                                    |
+|:----------------------------------------------------------------------------------------------------------------------------|:-------------------------|:---------------------------------------------------------------|
+| `kurrentdb_persistent_sub_connections`<br/>`{event_stream_id=<STREAM_NAME>,group_name=<GROUP_NAME>}`                        | [Gauge](#common-types)   | Number of connections                                          |
+| `kurrentdb_persistent_sub_parked_messages`<br/>`{event_stream_id=<STREAM_NAME>,group_name=<GROUP_NAME>}`                    | [Gauge](#common-types)   | Number of parked messages                                      |
+| `kurrentdb_persistent_sub_in_flight_messages`<br/>`{event_stream_id=<STREAM_NAME>,group_name=<GROUP_NAME>}`                 | [Gauge](#common-types)   | Number of messages in flight                                   |
+| `kurrentdb_persistent_sub_oldest_parked_message_seconds`<br/>`{event_stream_id=<STREAM_NAME>,group_name=<GROUP_NAME>}`      | [Gauge](#common-types)   | Oldest parked message age in seconds                           |
+| `kurrentdb_persistent_sub_items_processed_total`<br/>`{event_stream_id=<STREAM_NAME>,group_name=<GROUP_NAME>}`              | [Counter](#common-types) | Total items processed                                          |
+| `kurrentdb_persistent_sub_last_known_event_number`<br/>`{event_stream_id=<STREAM_NAME>,group_name=<GROUP_NAME>}`            | [Gauge](#common-types)   | Last known event number (streams other than `$all`)            |
+| `kurrentdb_persistent_sub_last_known_event_commit_position`<br/>`{event_stream_id=<STREAM_NAME>,group_name=<GROUP_NAME>}`   | [Gauge](#common-types)   | Last known event's commit position (`$all` stream only)        |
+| `kurrentdb_persistent_sub_checkpointed_event_number`<br/>`{event_stream_id=<STREAM_NAME>,group_name=<GROUP_NAME>}`          | [Gauge](#common-types)   | Last checkpointed event number (streams other than `$all)`     |
+| `kurrentdb_persistent_sub_checkpointed_event_commit_position`<br/>`{event_stream_id=<STREAM_NAME>,group_name=<GROUP_NAME>}` | [Gauge](#common-types)   | Last checkpointed event's commit position (`$all` stream only) |
+
+Example configuration:
+
+```json
+"PersistentSubscriptionStats": true,
+```
+
+Example output:
+
+```
+# TYPE kurrentdb_persistent_sub_connections gauge
+kurrentdb_persistent_sub_connections{event_stream_id="test-stream",group_name="group1"} 1 1720172078179
+kurrentdb_persistent_sub_connections{event_stream_id="$all",group_name="group1"} 1 1720172078179
+
+# TYPE kurrentdb_persistent_sub_parked_messages gauge
+kurrentdb_persistent_sub_parked_messages{event_stream_id="test-stream",group_name="group1"} 0 1720172078179
+kurrentdb_persistent_sub_parked_messages{event_stream_id="$all",group_name="group1"} 0 1720172078179
+
+# TYPE kurrentdb_persistent_sub_in_flight_messages gauge
+kurrentdb_persistent_sub_in_flight_messages{event_stream_id="test-stream",group_name="group1"} 0 1720172078179
+kurrentdb_persistent_sub_in_flight_messages{event_stream_id="$all",group_name="group1"} 0 1720172078179
+
+# TYPE kurrentdb_persistent_sub_oldest_parked_message_seconds gauge
+kurrentdb_persistent_sub_oldest_parked_message_seconds{event_stream_id="test-stream",group_name="group1"} 0 1720172078179
+kurrentdb_persistent_sub_oldest_parked_message_seconds{event_stream_id="$all",group_name="group1"} 0 1720172078179
+
+# TYPE kurrentdb_persistent_sub_items_processed_total counter
+kurrentdb_persistent_sub_items_processed_total{event_stream_id="test-stream",group_name="group1"} 0 1720172078179
+kurrentdb_persistent_sub_items_processed_total{event_stream_id="$all",group_name="group1"} 5 1720172078179
+
+# TYPE kurrentdb_persistent_sub_last_known_event_number gauge
+kurrentdb_persistent_sub_last_known_event_number{event_stream_id="test-stream",group_name="group1"} 0 1720172078179
+
+# TYPE kurrentdb_persistent_sub_last_known_event_commit_position gauge
+kurrentdb_persistent_sub_last_known_event_commit_position{event_stream_id="$all",group_name="group1"} 4113 1720172078179
+
+# TYPE kurrentdb_persistent_sub_checkpointed_event_number gauge
+kurrentdb_persistent_sub_checkpointed_event_number{event_stream_id="test-stream",group_name="group1"} 0 1720172078179
+
+# TYPE kurrentdb_persistent_sub_checkpointed_event_commit_position gauge
+kurrentdb_persistent_sub_checkpointed_event_commit_position{event_stream_id="$all",group_name="group1"} 4013 1720172078179
+```
+
+### Process
+
+KurrentDB collects key metrics about the running process.
+
+| Time Series                                                                             | Type                     | Description                                                                                                                                                                                                                                                                                                                                                                          |
+|:----------------------------------------------------------------------------------------|:-------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `kurrentdb_proc_up_time_seconds_total{pid=<PID>}`                                       | [Counter](#common-types) | Time in seconds this process has been running for. _PID_ is process Id of KurrentDB process                                                                                                                                                                                                                                                                                          |
+| `kurrentdb_proc_cpu`                                                                    | [Gauge](#common-types)   | Process CPU usage                                                                                                                                                                                                                                                                                                                                                                    |
+| `kurrentdb_proc_thread_count`                                                           | [Gauge](#common-types)   | Current number of threadpool threads ([ThreadPool.ThreadCount](https://learn.microsoft.com/en-us/dotnet/api/system.threading.threadpool.threadcount?view=net-6.0))                                                                                                                                                                                                                   |
+| `kurrentdb_proc_thread_pool_pending_work_item_count`                                    | [Gauge](#common-types)   | Current number of items that are queued to be processed by threadpool threads ([ThreadPool.PendingWorkItemCount](https://learn.microsoft.com/en-us/dotnet/api/system.threading.threadpool.pendingworkitemcount?view=net-6.0))                                                                                                                                                        |
+| `kurrentdb_proc_contention_count_total`                                                 | [Counter](#common-types) | Total number of times there was contention when trying to take monitor's lock ([Monitor.LockContentionCount](https://learn.microsoft.com/en-us/dotnet/api/system.threading.monitor.lockcontentioncount?view=net-6.0))                                                                                                                                                                |
+| `kurrentdb_proc_exception_count_total`                                                  | [Counter](#common-types) | Total number of exceptions thrown                                                                                                                                                                                                                                                                                                                                                    |
+| `kurrentdb_gc_time_in_gc`                                                               | [Gauge](#common-types)   | Percentage of CPU time spent collecting garbage during last garbage collection                                                                                                                                                                                                                                                                                                       |
+| `kurrentdb_gc_heap_size_bytes`                                                          | [Gauge](#common-types)   | [Heap size in bytes](https://learn.microsoft.com/en-us/dotnet/api/system.gcmemoryinfo.heapsizebytes?view=net-6.0)                                                                                                                                                                                                                                                                    |
+| `kurrentdb_gc_heap_fragmentation`                                                       | [Gauge](#common-types)   | Percentage of heap [fragmentation](https://learn.microsoft.com/en-us/dotnet/api/system.gcmemoryinfo.fragmentedbytes?view=net-6.0) during last garbage collection                                                                                                                                                                                                                     |
+| `kurrentdb_gc_allocated_bytes_total`                                                    | [Counter](#common-types) | [Total allocated bytes](https://learn.microsoft.com/en-us/dotnet/api/system.gc.gettotalallocatedbytes?view=net-6.0) over the lifetime of this process                                                                                                                                                                                                                                |
+| `kurrentdb_gc_pause_duration_max_seconds{`<br/>`range=<RANGE>}`                         | [RecentMax](#recentmax)  | Recent maximum garbage collection pause in seconds. This measures the times that the execution engine is paused for GC                                                                                                                                                                                                                                                               |
+| `kurrentdb_gc_generation_size_bytes{`<br/>`generation=<"gen0"\|"gen1"\|"gen2"\|"loh">}` | [Gauge](#common-types)   | Size of each generation in bytes                                                                                                                                                                                                                                                                                                                                                     |
+| `kurrentdb_gc_collection_count_total{`<br/>`generation=<"gen0"\|"gen1"\|"gen2">}`       | [Counter](#common-types) | [Number of garbage collections](https://learn.microsoft.com/en-us/dotnet/api/system.gc.collectioncount?view=net-6.0) from each generation                                                                                                                                                                                                                                            |
+| `kurrentdb_proc_mem_bytes{`<br/>`kind=<"working-set"\|"paged-bytes"\|"virtual-bytes">}` | [Gauge](#common-types)   | Size in bytes of the [working set](https://learn.microsoft.com/en-us/dotnet/api/system.diagnostics.process.workingset64?view=net-6.0), [paged](https://learn.microsoft.com/en-us/dotnet/api/system.diagnostics.process.pagedmemorysize64?view=net-6.0) or [virtual](https://learn.microsoft.com/en-us/dotnet/api/system.diagnostics.process.virtualmemorysize64?view=net-6.0) memory |
+| `kurrentdb_disk_io_bytes_total{`<br/>`activity=<"read"\|"written">}`                    | [Counter](#common-types) | Number of bytes read from/written to the disk                                                                                                                                                                                                                                                                                                                                        |
+| `kurrentdb_disk_io_operations_total{`<br/>`activity=<"read"\|"written">}`               | [Counter](#common-types) | Number of OS read/write operations issued to the disk                                                                                                                                                                                                                                                                                                                                |
+
+Example configuration:
+```json
+"Process": {
+  "UpTime": false,
+  "Cpu": false,
+  "MemWorkingSet": false,
+  "MemPagedBytes": false,
+  "MemVirtualBytes": false,
+  "ThreadCount": true,
+  "ThreadPoolPendingWorkItemCount": false,
+  "LockContentionCount": true,
+  "ExceptionCount": false,
+  "Gen0CollectionCount": false,
+  "Gen1CollectionCount": false,
+  "Gen2CollectionCount": false,
+  "Gen0Size": false,
+  "Gen1Size": false,
+  "Gen2Size": false,
+  "LohSize": false,
+  "TimeInGc": false,
+  "GcPauseDuration": true,
+  "HeapSize": false,
+  "HeapFragmentation": false,
+  "TotalAllocatedBytes": false,
+  "DiskReadBytes": false,
+  "DiskReadOps": false,
+  "DiskWrittenBytes": false,
+  "DiskWrittenOps": false
+}
+```
+
+Example output:
+```
+# TYPE kurrentdb_proc_thread_count gauge
+kurrentdb_proc_thread_count 15 1688070655500
+
+# TYPE kurrentdb_proc_contention_count_total counter
+kurrentdb_proc_contention_count_total 297 1688147136862
+
+# TYPE kurrentdb_gc_pause_duration_max_seconds gauge
+# UNIT kurrentdb_gc_pause_duration_max_seconds seconds
+kurrentdb_gc_pause_duration_max_seconds{range="16-20 seconds"} 0.0485873 1688147136862
+```
+
+### Projections
+
+Projection metrics track the statistics for projections.
+
+| Time series                                                                                      | Type                     | Description                                                      |
+|:-------------------------------------------------------------------------------------------------|:-------------------------|:-----------------------------------------------------------------|
+| `kurrentdb_projection_events_processed_after_restart_total`<br/>`{projection=<PROJECTION_NAME>}` | [Counter](#common-types) | Projection event processed count after restart                   |
+| `kurrentdb_projection_progress{projection=<PROJECTION_NAME>}`                                    | [Gauge](#common-types)   | Projection progress 0 - 1, where 1 = projection progress at 100% |
+| `kurrentdb_projection_running{projection=<PROJECTION_NAME>}`                                     | [Gauge](#common-types)   | If 1, projection is in 'Running' state                           |
+| `kurrentdb_projection_status{projection=<PROJECTION_NAME>,status=<PROJECTION_STATUS>}`           | [Gauge](#common-types)   | If 1, projection is in specified state                           |
+
+`Status` can have one of the following statuses:
+
+- Running
+- Faulted
+- Stopped
+
+Example configuration:
+
+```json
+"ProjectionStats": true
+```
+
+Example output:
+
+```
+# TYPE kurrentdb_projection_events_processed_after_restart_total counter
+kurrentdb_projection_events_processed_after_restart_total{projection="$by_category"} 83 1719526306309
+
+# TYPE kurrentdb_projection_progress gauge
+kurrentdb_projection_progress{projection="$stream_by_category"} 1 1719526306309
+
+# TYPE kurrentdb_projection_running gauge
+kurrentdb_projection_running{projection="$by_category"} 1 1719526306309
+
+# TYPE kurrentdb_projection_status gauge
+kurrentdb_projection_status{projection="$by_category",status="Running"} 1 1719526306309
+kurrentdb_projection_status{projection="$by_category",status="Faulted"} 0 1719526306309
+kurrentdb_projection_status{projection="$by_category",status="Stopped"} 0 1719526306309
+```
+
+### Queues
+
+KurrentDB uses various queues for asynchronous processing for which it also collects different metrics. In addition, KurrentDB allows users to group queues and monitor them as a unit.
+
+| Time series                                                                                                        | Type                       | Description                                                                                                                                                                                      |
+|:-------------------------------------------------------------------------------------------------------------------|:---------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `kurrentdb_queue_busy_seconds_total{queue=<QUEUE_GROUP>}`                                                          | [Counter](#common-types)   | Total time spent processing in seconds, averaged across the queues in the _QUEUE_GROUP_. The rate of this metric is therefore the average busyness of the group during the period (from 0-1 s/s) |
+| `kurrentdb_queue_queueing_duration_max_seconds{`<br/>`name=<QUEUE_GROUP>,range=<RANGE>}`                           | [RecentMax](#recentmax)    | Recent maximum time in seconds for which any item was queued in queues belonging to the _QUEUE_GROUP_. This is essentially the length of the longest queue in the group in seconds               |
+| `kurrentdb_queue_processing_duration_seconds_bucket{`<br/>`message_type=<TYPE>,queue=<QUEUE_GROUP>,le=<DURATION>}` | [Histogram](#common-types) | Number of messages of type _TYPE_ processed by _QUEUE_GROUP_ group that took less than or equal to _DURATION_ in seconds                                                                         |
+
+`QueueLabels` setting within `metricsconfig.json` can be used to group queues, based on regex which gets matched on queue names, and label them for metrics reporting. Capture groups are also supported. Message types can be grouped in the same way in the `MessageTypes` setting in `metricsconfig.json`.
+
+::: note
+Enabling `Queues.Processing` can cause a lot more time series to be generated, according to the `QueueLabels` and `MessageTypes` configuration.
+:::
+
+Example configuration:
+```json
+"Queues": {
+  "Busy": true,
+  "Length": true,
+  "Processing": false
+}
+
+"QueueLabels": [
+  {
+    "Regex": "StorageReaderQueue #.*",
+    "Label": "Readers"
+  },
+  {
+    "Regex": ".*",
+    "Label": "Others"
+  }
+]
+```
+
+Example output:
+```
+# TYPE kurrentdb_queue_busy_seconds_total counter
+# UNIT kurrentdb_queue_busy_seconds_total seconds
+kurrentdb_queue_busy_seconds_total{queue="Readers"} 1.04568158125 1688157491029
+kurrentdb_queue_busy_seconds_total{queue="Others"} 0 1688157491029
+
+# TYPE kurrentdb_queue_queueing_duration_max_seconds gauge
+# UNIT kurrentdb_queue_queueing_duration_max_seconds seconds
+kurrentdb_queue_queueing_duration_max_seconds{name="Readers",range="16-20 seconds"} 0.06434454 1688157489545
+kurrentdb_queue_queueing_duration_max_seconds{name="Others",range="16-20 seconds"} 0 1688157489545
+```
+
+### Status
+
+KurrentDB tracks the current status of the `Node` role  as well as  progress of  `Index`, and `Scavenge` processes.
+
+| Time series                                       | Type                   | Description                                                                              |
+|:--------------------------------------------------|:-----------------------|:-----------------------------------------------------------------------------------------|
+| `kurrentdb_statuses{name=<NAME>,status=<STATUS>}` | [Gauge](#common-types) | Number of seconds since the 1970 epoch when _NAME_ most recently had the status _STATUS_ |
+
+For a given _NAME_, the current status can be determined by taking the max of all the time series with that name.
+
+`Index` can have one of the following statuses:
+- Opening (loading/verifying the PTables)
+- Rebuilding (indexing previously written records on start up)
+- Initializing (initializing any other parts of the index e.g. StreamExistenceFilter on start up)
+- Merging
+- Scavenging
+- Idle
+
+`Scavenge` can have one of the following statuses:
+- Accumulation
+- Calculation
+- Chunk Execution
+- Chunk Merging
+- Index Execution
+- Cleaning
+- Idle
+
+`Node` can be one of the [node roles](../configuration/cluster.md#node-roles).
+
+Example configuration:
+```json
+"Statuses": {
+  "Index": true,
+  "Node": false,
+  "Scavenge": false
+}
+```
+
+Example output:
+```
+# TYPE kurrentdb_checkpoints gauge
+kurrentdb_statuses{name="Index",status="Idle"} 1688054162 1688054162477
+```
+
+### Storage Writer
+
+| Time series                                                  | Type                    | Description                              |
+|:-------------------------------------------------------------|:------------------------|:-----------------------------------------|
+| `kurrentdb_writer_flush_size_max{range=<RANGE>}`             | [RecentMax](#recentmax) | Recent maximum flush size in bytes       |
+| `kurrentdb_writer_flush_duration_max_seconds{range=<RANGE>}` | [RecentMax](#recentmax) | Recent maximum flush duration in seconds |
+
+Example configuration:
+```json
+"Writer": {
+  "FlushSize": true,
+  "FlushDuration": false
+}
+```
+
+Example output:
+```
+# TYPE kurrentdb_writer_flush_size_max gauge
+kurrentdb_writer_flush_size_max{range="16-20 seconds"} 410 1688056823193
+```
+
+### System
+
+| Time series                                                           | Type                   | Description                                                                                                 |
+|:----------------------------------------------------------------------|:-----------------------|:------------------------------------------------------------------------------------------------------------|
+| `kurrentdb_sys_load_avg{period=<"1m"\|"5m"\|"15m">}`                  | [Gauge](#common-types) | Average system load in last `1`, `5`, and `15` minutes. This metric is only available for Unix-like systems |
+| `kurrentdb_sys_cpu`                                                   | [Gauge](#common-types) | Current CPU usage in percentage. This metric is unavailable for Unix-like systems                           |
+| `kurrentdb_sys_mem_bytes{kind=<"free"\|"total">}`                     | [Gauge](#common-types) | Current free/total memory in bytes                                                                          |
+| `kurrentdb_sys_disk_bytes{disk=<MOUNT_POINT>,kind=<"used"\|"total">}` | [Gauge](#common-types) | Current used/total bytes of disk mounted at _MOUNT_POINT_                                                   |
+
+Example configuration:
+```json
+"System": {
+  "Cpu": false,
+  "LoadAverage1m": false,
+  "LoadAverage5m": false,
+  "LoadAverage15m": false,
+  "FreeMem": false,
+  "TotalMem": false,
+  "DriveTotalBytes": false,
+  "DriveUsedBytes": true
+}
+```
+
+Example output:
+```
+# TYPE kurrentdb_sys_disk_bytes gauge
+# UNIT kurrentdb_sys_disk_bytes bytes
+kurrentdb_sys_disk_bytes{disk="/home",kind="used"} 38947205120 1688070655500
+```
+
+## Metric types
+
+### Common types
+
+Please refer to [Prometheus documentation](https://prometheus.io/docs/concepts/metric_types/) for explanation of common metric types (`Gauge`, `Counter` and `Histogram`).
+
+### RecentMax
+
+A gauge whose value represents the maximum out of a set of _recent_ measurements. Its purpose is to capture spikes that would otherwise have fallen in-between scrapes.
+
+::: note
+The `ExpectedScrapeIntervalSeconds` setting within `metricsconfig.json` can be used to control the size of the window that the max is calculated over. It represents the expected interval between scrapes by a consumer such as Prometheus. It can only take specific values: `0`, `1`, `5`, `10` or multiples of `15`.
+
+Setting the expected scape interval correctly ensures that spikes in the time series will be captured by at least one scrape and at most two.
+:::
+
+Example output:
+Following metric is reported when `ExpectedScrapeIntervalSeconds` is set to `15` seconds
+```
+# TYPE kurrentdb_writer_flush_size_max gauge
+kurrentdb_writer_flush_size_max{range="16-20 seconds"} 1854 1688070655500
+```
+In above example, maximum reported is `1854`. It is not a maximum measurement in last `15s` but rather maximum measurement in last `16` to last `20` seconds i.e. the maximum measurement could have been recorded in last `16s`, last `17s`, …, upto last `20s`.
+
diff --git a/docs/server/features/README.md b/docs/server/features/README.md
new file mode 100644
index 00000000000..c1218ae173e
--- /dev/null
+++ b/docs/server/features/README.md
@@ -0,0 +1,8 @@
+---
+dir:
+  order: 6
+  text: Features
+index: false
+---
+
+Features of KurrentDB.
diff --git a/docs/server/features/admin-ui.md b/docs/server/features/admin-ui.md
new file mode 100644
index 00000000000..acecac249f7
--- /dev/null
+++ b/docs/server/features/admin-ui.md
@@ -0,0 +1,111 @@
+---
+order: 1
+---
+
+# Admin UI
+
+The KurrentDB Admin UI is available at _SERVER_IP:2113_ and helps you interact with and visually manage a cluster. This guide explains the interface's tabs and their functions.
+
+::: tip
+The embedded KurrentDB web interface is reaching its end of life. We are working on a replacement, and you can try using the Early Preview of [Kurrent Navigator](https://navigator.kurrent.io/) app instead. It doesn't have full feature parity with the embedded web UI, but it already has usability improvements compared to it.
+:::
+
+## Dashboard
+
+![Web admin interface dashboard](images/wai-dashboard.png)
+
+The _Dashboard_ tab shows an overview of active queues with associated statistics in the top half. The _+_ icon indicates a queue group; click it to reveal the queues in that group.
+
+The second half of the tab shows active connections to KurrentDB and information about them.
+
+Click the _Snapshot_ button in the top right to output a snapshot of all queue statistics at the time you clicked the button.
+
+## Stream browser
+
+![Web admin interface stream browser tab](images/wai-stream-browser.png)
+
+The _Stream Browser_ tab gives an overview of recently created and changed streams, clicking on an individual stream shows details about the individual stream.
+
+### Event stream
+
+![Web admin interface stream details](images/wai-stream-details.png)
+
+Each stream shows pages of the events in a stream with an overview of the event. Click the _Name_ to see the EventId, and _JSON_ to see the event data. The buttons above change depending on what you are viewing in the interface. The _Back_ button takes you to the parent screen.
+
+The buttons on the top right when you are viewing an event stream are:
+
+- _Pause_: Stop showing events arriving into this stream.
+- _Resume_: Resume showing events arriving into this stream.
+- _Edit ACL_: Edit [the access control lists](../security/user-authorization.md#access-control-lists) for a stream.
+- _Add Event_: [Add a new event](@clients/grpc/appending-events.md) to the stream.
+- _Delete_: [Delete a stream](@clients/grpc/delete-stream.md#soft-delete) to the stream.
+- _Query_:
+
+The buttons on the left above the events when you are viewing an event stream are:
+
+- _self_: Takes you to the overview of the stream.
+- _first_: Takes you to the first page of events in a stream.
+- _previous_: Takes you to the previous page of events in a stream.
+- _metadata_: Shows the metadata of a stream.
+  - On the metadata screen, click _Add New Like This_ to add a new event to the stream.
+
+## Projections
+
+![Web admin interface projections tab](images/wai-projections.png)
+
+The _Projections_ tab shows system and user-created projections defined in KurrentDB. The buttons above the list do the following:
+
+- _Disable All_: Disable all running projections.
+- _Enable All_: Enable all stopped projections.
+- _Include Queries_: Toggle displaying queries in the Projections table.
+- _New Projection_: [Create a user-defined projection](projections/custom.md) with the Admin UI.
+
+Clicking an individual projection shows further details.
+
+![Web admin interface projection details](./images/wai-projection-details.jpg)
+
+On the left is the projection definition. On the right are the stats, results, and projection state. The buttons above the details do the following:
+
+- _Start_: Start a stopped projection.
+- _Stop_: Stop a running projection.
+- _Edit_: Edit the projection definition.
+- _Config_: [Set configuration options](projections/custom.md#configuring-projections) for a projection.
+- _Debug_: Opens [the debugging interface](projections/custom.md#debugging) to debug what effect a projection has on events.
+- _Delete_: Delete a projection.
+- _Reset_: Reset a projection.
+- _Back_: Returns you to the parent screen.
+
+## Query
+
+The _Query_ tab has a code editor field where you can create transient and short-lived projections to analyze your event streams quickly.
+
+![Web admin interface query details](images/wai-query-details.png)
+
+## Persistent subscriptions
+
+The _Persistent Subscriptions_ tab shows an overview of [persistent subscriptions](persistent-subscriptions.md) configured on streams. The button above the list does the following:
+
+- _New Subscription_: Create a new subscription.
+
+Clicking the _+_ icon next to a stream name reveals the subscription name and more buttons. The _Back_ button takes you to the parent screen.
+
+- _Edit_: Edit the subscription.
+- _Delete_: Delete the subscription.
+- _Detail_: Shows the subscription configuration options.
+- _Replay Parked Messages_: Replay events in subscription to return state.
+
+## Admin
+
+![Web admin interface admin](images/wai-admin.png)
+
+The _Admin_ tab shows subsystems enabled (currently only [projections](projections/README.md)) on KurrentDB and [scavenges](../operations/scavenge.md) run. You can start a new scavenge operation by clicking the _Scavenge_ button, and shut KurrentDB down by clicking the _Shutdown Server_ button.
+
+## Users
+
+![Web admin interface projections tab](images/wai-users.png)
+
+The _Users_ tab shows [the users defined in KurrentDB](../security/user-authentication.md). Clicking an individual user displays a JSON representation of that user's details.
+
+## Log out
+
+Logs you out of the Admin UI interface.
diff --git a/docs/server/features/archiving.md b/docs/server/features/archiving.md
new file mode 100644
index 00000000000..14955a5ef4b
--- /dev/null
+++ b/docs/server/features/archiving.md
@@ -0,0 +1,126 @@
+# Archiving
+
+## Introducing Archiving
+
+KurrentDB 25.0 introduces the initial release of Archiving: a new major feature to reduce costs and increase scalability of a KurrentDB cluster.
+
+Future releases of KurrentDB will build on and improve this feature.
+
+A [license key](../quick-start/installation.md#license-keys) is required to use this feature.
+
+## Motivation
+
+KurrentDB databases can become very large. Typical KurrentDB deployments require low latency, high throughput access to the data, and so employ large, expensive volumes attached to each node in the cluster. The size of the database can be controlled by deleting data, but only if that data is no longer needed. Often, a large proportion of the data can become old enough that, although it is still required for occasional reads, it is not read frequently, and need not be read quickly. Until now, this 'cold' data has necessarily been stored on the same volumes as the hot data, taking up space and adding to the expense of running a high performance cluster.
+
+With the new Archiving feature, data is uploaded to cheaper storage such as Amazon S3 and then can be removed from the volumes attached to the cluster nodes. The volumes can be correspondingly smaller and cheaper. The nodes are all able to read the archive, and when a read request from a client requires data that is stored in the archive, the node retrieves that data from the archive transparently to the client.
+
+The extra copy of the data in S3 also acts as a backup that is kept up to date as each chunk of data is written to the log.
+
+## Operation
+
+### Summary
+
+- Data written to the database is replicated to all nodes in the deployment as normal.
+- A designated _Archiver Node_ is responsible for uploading chunk files into the _archive_.
+- Nodes can then remove chunks from their local volumes to save space according to a _retention policy_.
+- Read requests read transparently through to the archive as necessary.
+
+::: warning
+Read requests that read the archive will have comparatively high latency and at the moment can cause other reads to be queued.
+:::
+
+### Populating the Archive
+
+- A designated _Archiver Node_ uploads complete chunk files to the archive once they are committed to the database. The contents of each chunk file are the same as they were locally, except that merged chunks are unmerged for upload.
+- The Archiver Node stores an archive checkpoint in the archive indicating how much of the log has been uploaded to the archive.
+- The Archiver Node is also a _Read-only Replica_ and does not participate in cluster elections/replication criteria. At the moment Read-only replicas can only be used in 3+ node clusters, and not single node deployments.
+- Only chunk files are uploaded. PTables, scavenge.db, etc remain local to each node.
+
+### Removal of data from node volumes
+
+- All nodes can delete chunks from their local volumes.
+- The removal is performed during the Scavenge operation.
+- Chunks are removed only after they have been uploaded to the archive.
+- Chunks are removed only after they no longer meet the simple user defined retention policy.
+
+### Backup/restore considerations
+
+- A backup taken from one node can generally be restored to any other node, but this is not the case with the Archiver Node. The Archiver Node must be restored from a backup that was taken from the Archiver Node itself. Scavenging the archive is not yet implemented, but once it is then if the Archiver node were to be restored from a backup taken from a different node then there would be a risk that the Archiver Node will not completely scavenge the archive. A scavenge with `threshold = -1` would need to be run to restore normal operation.
+
+- When a node starts up, it checks to see if the archive has newer data than it has locally, and if so downloads that data from the archive.
+  - This prevents the cluster from ever diverging from the content of the archive, even if multiple nodes are restored from backup simultaneously.
+  - When restoring an old backup there may be a lot of data to download and store locally. In such cases it is preferable to create a new backup from another node and use that to restore (but, as described above, do not restore the Archiver Node from a backup of another node).
+
+## Configuration
+
+Sample configuration:
+
+The following can be placed on all nodes (including the Archiver Node)
+
+```yaml
+Licensing:
+  LicenseKey: <your key>
+
+Archive:
+  Enabled: true
+
+  RetainAtLeast:
+    Days: 30
+    LogicalBytes: 500000000
+
+  StorageType: S3
+  S3:
+    Region: eu-west-1
+    Bucket: kurrentdb-cluster-123-archive
+```
+
+::: warning
+Do not use the same archive bucket for multiple clusters, and do not run more than one Archiver node in a single cluster.
+:::
+
+Additionally this can be placed on the Archiver Node to designate it as the Archive Node.
+
+```yaml
+ReadOnlyReplica: true
+Archiver: true
+```
+
+The Archiver Node is a read-only replica and does not participate in quorum activities. It must be a separate node to the main cluster nodes. e.g. If you have a three node cluster, you will need a fourth node to be the archiver. If you already have a read-only replica as a forth node then it is possible to use it as the Archiver Node.
+
+`RetainAtLeast` is the retention policy for what to retain in the local volume for each node. It does not affect which chunks are uploaded to the archive by the Archiver Node (which will upload all completed committed chunks). If a chunk contains any data less than `RetainAtLeast:Days` old, then it will not be removed locally. If a chunk contains any data that is within `RetainAtLeast:LogicalBytes` of the tail of the log (strictly: the `scavenge point` of the current scavenge) then it will not be removed locally. The metrics described below can be useful to determine sensible values for the retention policy.
+
+On startup, up to `MaxMemTableSize` events can be read from the log. It is recommended to keep at least this much data locally for faster startup.
+
+`StorageType` must currently be set to `S3`. Other cloud providers may be supported in the future, please contact us if you are interested.
+
+### Credentials
+
+The KurrentDB nodes authenticate with S3 by looking for credentials from the standard providers. Please see the documentation for [S3 in general](https://docs.aws.amazon.com/sdkref/latest/guide/standardized-credentials.html) and [.NET in particular](https://docs.aws.amazon.com/sdk-for-net/v3/developer-guide/creds-assign.html).
+
+## Metrics
+
+The metrics relevant to Archiving in particular are `kurrentdb_logical_chunk_read_distribution_bucket` and `kurrentdb_io_record_read_duration_seconds_bucket` described in the [metrics](../diagnostics/metrics.md#events) documentation.
+
+The panels are available in the `Events Served` section of the [miscellaneous panels](https://grafana.com/grafana/dashboards/22823) dashboard.
+
+![Chunk Read Distribution](images/archiving/chunk-read-distribution.png)
+
+![Reads by Source](images/archiving/reads-by-source.png)
+
+## Limitations
+
+This initial release has several limitations that we intend to improve in future releases.
+
+Work to improve the following limitations is in progress:
+- The headers of archived chunks are read on startup, just as for local chunks. This will increase startup times significantly when there are a lot of chunks in the archive.
+- Requests that read the archive can cause other reads to be queued behind them, resulting in higher read latency if the archive is being accessed frequently.
+
+Work to improve the following limitations is planned:
+- Once uploaded to the archive, the chunks there are not scavenged any further.
+- Clients cannot yet opt out of their read reading from the archive.
+- Repeated reads of the same part of the archive are not cached locally.
+
+Work on the following items may be added according to interest:
+
+- At the moment only S3 is supported. A local file-system based archive exists for development/testing purposes.
+- Redaction is not compatible with Archiving.
diff --git a/docs/server/features/connectors/README.md b/docs/server/features/connectors/README.md
new file mode 100644
index 00000000000..8e1e05b92eb
--- /dev/null
+++ b/docs/server/features/connectors/README.md
@@ -0,0 +1,89 @@
+---
+dir:
+  text: "Connectors"
+  order: 1
+---
+
+# Understanding Connectors
+
+Connectors make it easy to integrate data from KurrentDB into other systems.
+
+Each connector runs on the server-side and uses a catch-up subscription to receive events, filter or transform them, and push them to an external system via a [sink](https://en.wikipedia.org/wiki/Sink_(computing)).
+
+<!-- ![Connectors anatomy](./images/connector-anatomy.svg#light)
+![Connectors anatomy](./images/connector-anatomy-dark.svg#dark) -->
+
+```mermaid
+graph TD
+    A[KurrentDB] --> B[Subscription]
+    B --> C[Filter]
+    C --> D[Sink]
+    D --> E[External System]
+    
+    subgraph Connector
+    B
+    C
+    D
+    end
+```
+
+This reduces the amount of work needed to process data from KurrentDB instances and makes it easy to create data pipelines to implement complex use cases.
+
+::: info
+The Connector plugin is pre-installed in all KurrentDB binaries and is enabled by default.
+:::
+
+## Motivation
+
+Currently, a pain point that users experience is that, on one hand, they have a convenient Kurrent cloud service, on the other hand, they have a convenient downstream database or processing engine, but there's nothing in between.
+As a result, users need to host and maintain their own solution in their own infrastructure for subscribing to KurrentDB and sending the events to a downstream service.
+This solution in the middle often needs to be highly available and needs to manage its own checkpoints: this quickly becomes cumbersome.
+
+Kurrent Connectors remove the need for users to develop, host and maintain such a solution.
+
+As an example, a developer want to send events to a lambda function, which projects events to an RDS instance.
+
+Without connectors, it requires the developer to implement a subscription service. Such service then needs to be hosted, observed, and maintained. It also needs to manage its own checkpoints.
+
+In addition, the subscription service that uses a catch-up subscription would need to run as a single instance to ensure ordered event processing. As a consequence, it becomes a single point of failure.
+
+<!-- ![Example with EKS and Lambda](./images/example-lambda-eks.svg#light)
+![Example with EKS and Lambda](./images/example-lambda-eks-dark.svg#dark) -->
+
+```mermaid
+graph TD
+    A[KurrentDB] --> B[Self-hosted subscription]
+    B -->|events| C[Lambda function]
+    C -->|SQL updates| D[RDS]
+    B -->|checkpoints| D
+    D --> E[Data tables]
+    D --> F[Checkpoints table]
+
+    subgraph EKS
+        B
+    end
+
+    subgraph RDS
+        E
+        F
+    end
+```
+
+With connectors, the subscription service is provided natively by KurrentDB and the lambda function acts as the sink. For this particular example, the lambda function requires an accessible HTTP endpoint, or to be exposed via the AWS API Gateway.
+
+<!-- ![Example with Connector and Lambda](./images/example-lambda-connector.svg#light)
+![Example with Connector and Lambda](./images/example-lambda-connector-dark.svg#dark) -->
+
+```mermaid
+graph TD
+    A[KurrentDB] -->|events| B[Lambda function]
+    B -->|SQL updates| C[RDS]
+    
+    subgraph Data Tables
+        D[Data Table 1]
+        E[Data Table 2]
+    end
+
+    C --> D
+    C --> E
+```
\ No newline at end of file
diff --git a/docs/server/features/connectors/features.md b/docs/server/features/connectors/features.md
new file mode 100644
index 00000000000..35fe00d9533
--- /dev/null
+++ b/docs/server/features/connectors/features.md
@@ -0,0 +1,337 @@
+---
+title: 'Features'
+order: 2
+---
+
+## Filters
+
+All sink connectors supports filtering events using regular expressions, JsonPath expressions, or prefixes. The expression is first checked as a JsonPath, then as a regex, and if neither, it's used as a prefix for filtering.
+
+::: info
+By default, if no filter is specified, the system will consume from the `$all` stream, excluding system events.
+:::
+
+#### KurrentDB Record
+
+When a connector consumes events from KurrentDB, you have access to the following objects that represent KurrentDB records:
+
+```json
+{
+  "recordId": "string",
+  "position": {
+    "streamId": "string",
+    "partitionId": "number"
+  },
+  "sequenceId": "number",
+  "isRedacted": "boolean",
+  "schemaInfo": {
+    "subject": "string",
+    "type": "string"
+  },
+  "headers": {},
+  "value": {},
+  "streamId": "string",
+  "partitionId": "number"
+}
+```
+
+::: details Click here to see an example of KurrentDB record
+
+```json
+{
+  "recordId": "46ed7c22-38c9-4a62-bbaf-e40f3d5b84c9",
+  "position": {
+    "streamId": "VehicleRegistration-5b27b19d80814adeb13471c7a6a1e285",
+    "partitionId": -1
+  },
+  "sequenceId": 1,
+  "isRedacted": false,
+  "schemaInfo": {
+    "subject": "VehicleRegistered",
+    "type": "json"
+  },
+  "headers": {},
+  "value": {
+    "registrationId": "5b27b19d-8081-4ade-b134-71c7a6a1e285",
+    "registrationNumber": 4474795452,
+    "vehicle": {
+      "make": "Audi",
+      "model": "A6",
+      "year": 2018,
+      "engineType": "petrol"
+    }
+  },
+  "streamId": "VehicleRegistration-5b27b19d80814adeb13471c7a6a1e285",
+  "partitionId": -1
+}
+```
+
+:::
+
+You can use this schema as a reference when creating your filters. The `value` object contains the actual event data, while the `schemaInfo` object contains the event type and subject. The `streamId` and `partitionId` properties are used to identify the stream and partition from which the event originated.
+
+### Stream ID Filter
+
+The stream ID filter allows you to filter events based on the stream ID. This filter is applied at the stream scope, meaning it filters events by their stream ID. An example of a stream ID filter is shown below:
+
+```json
+{
+  "subscription:filter:scope": "stream",
+  "subscription:filter:filterType": "streamId",
+  "subscription:filter:expression": "some-stream"
+}
+```
+
+In this case, the filter will only match events from the `some-stream` stream.
+
+### Regex Filters
+
+The simplest and fastest way to filter events is by using regular expressions.
+This can be done at the stream scope, which applies to the stream ID, or at the
+record scope, which applies to the event type.
+
+An example of a Regex expression is shown below:
+
+```json
+{
+  "subscription:filter:scope": "record",
+  "subscription:filter:filterType": "regex",
+  "subscription:filter:expression": "^eventType.*"
+}
+```
+
+This filter will only match records where the event type starts with
+`eventType`. This filter type can be used for both `stream` and `record` scopes.
+
+### Prefix Filters
+
+You can also filter records by prefix using the following configuration:
+
+```json
+{
+  "subscription:filter:scope": "stream",
+  "subscription:filter:filterType": "prefix",
+  "subscription:filter:expression": "prefix1,prefix2"
+}
+```
+
+In this case, the filter will only match events where the stream ID starts with
+`prefix1` or `prefix2`. This filter type can be used for both `stream` and
+`record` scopes.
+
+### JsonPath Filters
+
+JSONPath provides a standardized string syntax for selecting and extracting JSON values from KurrentDB records. Following the [RFC 9535](https://www.rfc-editor.org/rfc/rfc9535.html#name-introduction) standard, JSONPath allows for efficient querying of JSON data within your KurrentDB connectors. The filtering process is managed at the connector level and is applied only at the record scope. JSONPath filters apply exclusively to events with the `application/json` content type.
+
+An example of a JsonPath filter is shown below:
+
+```json
+{
+  "subscription:filter:scope": "record",
+  "subscription:filter:filterType": "jsonPath",
+  "subscription:filter:expression": "$[?($.value.vehicle.year==2018)]"
+}
+```
+
+In this case, the filter will only match events where the year field is equal to 2018.
+
+::: tip
+You can test your JSONPath expressions using the [JsonPath Playground](https://json-everything.net/json-path/). Copy the record JSON and test your expressions to ensure they work as expected.
+:::
+
+Refer to the [Subscription Configuration](./settings.md#subscription-configuration) section in settings
+page for more details on the available scopes and additional configuration
+options.
+
+## Transformations
+
+```mermaid
+graph TD
+    A[Input Record] --> B[Transformation Applied?]
+    B -- Yes --> C[Transformed Record]
+    B -- No --> D[Original Record]
+```
+
+Connectors support transformations using JavaScript, allowing you
+to modify the records received from the KurrentDB stream. This feature
+enables you to tailor the data to meet your specific requirements before it is
+processed further. Transformations can be applied to any part of the record,
+providing flexibility in how the data is handled and utilized within your
+application. It takes a `base64` encoded string as input for the
+transformations.
+
+:::tip
+You can use an [base64encode](https://www.base64encode.org/) to encode your JavaScript function. All sinks supports transformation.
+:::
+
+All records that are transformed will receive a property `IsTransformed` that will be set to `true`.
+
+Below is an example of a valid JavaScript function, which will then be encoded into a base64 string:
+
+```js
+function transform(record) {
+  let { make, model } = record.value.vehicle;
+  record.schemaInfo.subject = 'Vehicle';
+  record.value.vehicle.makemodel = `${make} ${model}`;
+}
+```
+
+The transformation function must be a JavaScript function named **transform**.
+
+Additionally, it must adhere to the KurrentDB Record structure. Otherwise, it will not start. For example, the following will **NOT** work:
+
+```js
+{
+  function transform(record) {
+    return {
+      name: 'invalid',
+    };
+  }
+}
+```
+
+It also doesn't support advanced Javascript syntax such as generators and tail calls.
+
+Transformation can be configured as follows:
+
+```json
+{
+  "transformer:enabled": "true",
+  "transformer:function": "ZnVuY3Rpb24gdHJhbnNmb3JtKHJlY29yZCkgewogIGxldCB7IG1ha2UsIG1vZGVsIH0gPSByZWNvcmQudmFsdWUudmVoaWNsZTsKICByZWNvcmQuc2NoZW1hSW5mby5zdWJqZWN0ID0gJ1ZlaGljbGUnOwogIHJlY29yZC52YWx1ZS52ZWhpY2xlLm1ha2Vtb2RlbCA9IGAke21ha2V9ICR7bW9kZWx9YDsKfQ=="
+}
+```
+
+## Checkpointing
+
+Connectors periodically store the position of the last event that they have
+successfully processed. Then, if the connector host is restarted, the connectors
+can continue from close to where they got up to. The checkpoint information is
+stored in the `$connectors/{connector-id}/checkpoints` system stream in
+KurrentDB. Each connector has its own dedicated stream for storing
+checkpoints.
+
+By default, when the connector is started and there are no checkpoints, it will
+begin from the latest position in the stream. You can configure this behavior
+using the `initialPosition` property in the settings. If you need to start from
+a specific position, you can use the [Start API](./manage.md#start) with the
+`position` parameter.
+
+## Resilience
+
+Currently, connectors only support _at least once_ delivery guarantees, meaning
+that events may be delivered more than once. Events are delivered _in order_,
+ensuring that event `x` is not delivered until all preceding events have been
+delivered.
+
+Most connectors have a built-in resilience mechanism to ensure the reliable
+delivery of data and messages, preserving system integrity and minimizing
+downtime during unexpected disruptions. To see if a connector supports
+resilience, refer to the connector's individual page.
+
+The default resilience strategy is as follows:
+
+```mermaid
+graph TD
+    style A stroke:#333,stroke-width:1px,font-size:12px;
+    style B stroke:#333,stroke-width:1px,font-size:12px;
+    style C stroke:#333,stroke-width:1px,font-size:12px;
+    style D stroke:#333,stroke-width:1px,font-size:12px;
+    style E stroke:#333,stroke-width:1px,font-size:12px;
+    style F stroke:#333,stroke-width:1px,font-size:12px;
+    style G stroke:#333,stroke-width:1px,font-size:12px;
+    style H stroke:#333,stroke-width:1px,font-size:12px;
+    style I stroke:#333,stroke-width:1px,font-size:12px;
+
+    A[Failure Detected] --> B[Retry Begins]
+    B --> C{Phase 1: Small Delay - 5 seconds}
+    C -->|Success| D[Operation Completes]
+    C -->|Failure| E{Phase 2: Exponential Backoff}
+    E -->|Retry with Increasing Delays| F[Several Minutes Delay - 10 minutes]
+    F -->|Failure| G{Phase 3: Long Delay - 1 hour or more}
+    G -->|Success| D
+    G -->|Failure| H[Manual Intervention or Indefinite Delay]
+    D --> I[Operation Completed Successfully]
+    H --> I
+```
+
+### Automatic Retries and Resilience Strategy
+
+To help systems recover smoothly from disruptions, an automatic retry
+strategy is in place. This approach uses [exponential backoff](https://en.wikipedia.org/wiki/Exponential_backoff) to manage
+retry timing after a failure, gradually increasing the time between attempts to
+balance quick recovery with system stability.
+
+The retry process unfolds in three phases:
+
+1. **Phase 1 – Rapid Retries**: Right after a failure, the system tries again every **5 seconds** for **up to 1 minute**. This phase addresses minor issues that may quickly resolve on their own.
+
+2. **Phase 2 – Moderate Delays**: If the issue continues, retries slow to **every 10 minutes** for the next **1 hour**. This phase eases system strain by spacing out attempts, giving more time for resolution.
+
+3. **Phase 3 – Extended Delays**: For issues that still aren’t resolved, the final phase sets retries to occur every **1 hour indefinitely**. This ensures ample recovery time while reducing unnecessary attempts, though manual intervention may eventually be required.
+
+These phases allow the system to progressively adjust retry frequency, balancing resilience and performance. 
+
+For more details on customizing these settings, refer to the [Resilience Configuration](./settings.md#resilience-configuration) section.
+
+::: note
+Some connectors have their own resilience mechanisms and configurations. Refer to the specific connector's page for details.
+:::
+
+## Data Protection
+
+KurrentDB Connectors protect sensitive configuration fields using envelope encryption to secure confidential information such as passwords and access tokens.
+
+When you configure a connector, the system encrypts sensitive data using Data Encryption Keys (DEKs), which are then wrapped (encrypted) using a master key based on your provided token. The encrypted data is stored securely in KurrentDB rather than in plaintext.
+
+Refer to each connector's [individual documentation](./sinks/) to see which fields are considered sensitive and protected.
+
+### Configuring Data Protection
+
+To enable data protection, configure the data protection settings in your
+configuration file. You can provide an encryption token using either a token
+file or by specifying the token directly in the configuration.
+
+#### Using a Token File
+```yaml
+Connectors:
+  Enabled: true
+  DataProtection:
+    TokenFile: "/path/to/token/file"
+```
+
+#### Using a Token Directly
+```yaml
+Connectors:
+  Enabled: true
+  DataProtection:
+    Token: "<your-secret-token>"
+```
+
+::: note
+If you provide both `Token` and `TokenFile`, the system will use the token file and ignore the `Token` setting.
+:::
+
+### Key Vault Configuration
+
+KurrentDB Connectors currently only supports the Surge key vault for storing
+encryption keys:
+
+The Surge key vault is KurrentDB's native key storage mechanism that stores
+encryption keys directly within KurrentDB itself. Rather than requiring a
+separate external key management system, Surge stores the encrypted keys in
+internal system streams. More key vault options will be available in the future.
+
+```yaml {6-8}
+Connectors:
+  Enabled: true
+  DataProtection:
+    Token: "<your-secret-token>"
+    
+    KeyVaults:
+      Surge:
+        KeyMaxHistory: 10
+```
+
+::: tip
+The default value for `KeyMaxHistory` is `-1`, which means unlimited key history. You can set it to a specific number to limit the number of historical keys stored.
+:::
\ No newline at end of file
diff --git a/docs/server/features/connectors/images/connector-anatomy-dark.svg b/docs/server/features/connectors/images/connector-anatomy-dark.svg
new file mode 100644
index 00000000000..2169536af94
--- /dev/null
+++ b/docs/server/features/connectors/images/connector-anatomy-dark.svg
@@ -0,0 +1,13 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1287.921876125 300.48828125" width="1287.921876125" height="300.48828125" filter="invert(93%) hue-rotate(180deg)">
+  <!-- svg-source:excalidraw -->
+  
+  <defs>
+    <style class="style-fonts">
+      @font-face {
+        font-family: Virgil;
+        src: url(data:font/woff2;base64,d09GMgABAAAAANtcAA0AAAACfqAAANsCAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cGiAGYACHOhEICojDDIazNwuQXAABNgIkA5BYBCAF8SwHm3xbju1xYYy7sd0OAIpS8WVRITvfArcDpBRW0yrYuBoNGwdgevzg5P//85KOMXSkA8Aye/31X6aqSFOjM8yLldTu6uDRvazbyMy9zzwgOKQom/g6a15H3etNifhB1SU3kXgQVsw6e7M0xQm+4QP3vDzRvyYpK7Ba6lJt8H5GV4Xf+EcERLVOkazgxYl3h7PDv+FdjElJVZs7TTRxrr2RZUAZtx6MZOXIlTf6DtDavOv/vvtI4L+peCq+4cnn4emyiLYQELHRxsjcZuWclZsVm7NiTqrgNnuPnmjCgUoQxd53u3tpTX2VhFY9DuFKNR4ho/FgLPjSPINHmGrBMfPo+TrQ/Xc38WQ8hiEpxsolKta8GqM2D/6r/XpvfZm1b8IgRVhHxZgTUmt7/uup6gX8QCoA4DIvm+7/Bxg4sk1iY6xTGpUQoZKDRhH7EZH4vQAEBnNq0lf6SpZlGQKGQMuhwjgwAjvaLSM65Nfe+x7wxumASwfAsqWqLcltnCOahodxOqb/P6f2753zV+9tL0hyp7OxrQGA5SdK6sw4Oe5M2p+PnI29TbYSGwKSJVuOXXCgTYGTAQ4kANdwKoAMD8yzjSG1lSbqpPUt++3aGXuX98JPMVd3kYOQCAceo5A8jPq4mWnA8VObfn/FIsbA8JBAdCakpIHEiQEptVg9qctPV0xPe9vrHi7/f11arv8eRf1nbr8ncp2VYgubCUYOR65OgDBKALGSMCFF2e9PubRe9ecmXdWtJJ6ZxTi0QNlkAbjt/giXa9W16vpePUnVYBA02c7EDabEybhthwZTUn0gv0/3+p6TbjblsxSGFrBPy1Q1mfbeVtr1kWwWhOBBkg+Vza3g/76pfd27XPXbILAVkthO8hLLdmA44fe4Wz3zPDuwmcVHnwtk/ya/ohZYtkUNAoOALNmxMwo4XFV3z4nKJqphbq4kTdICkhZmbtQjBYVNbC4X6OGo3n3X2yl3YOz/M9VsF4q4TJ1jqKjO6fUxdx32z4LcnWUABlTgLJVmKT9iQL4nDHgBAylT4CWKTjHOirY4e4lDOXApp+U5JcqVXeVcuahd1NBV9LuiufKeO3dX1OfK79rSzpVKt639vmVluMa8XSgDoAh0FtLun/kzOic2tta47pb3TEIZmVWj6q6ZkfwZhzw8QA8egQcFCNETugPw/v85X5sUhiynJIFlI3Z8e9MUko/5nHE+0JjS3rx8eM0bAcsOyc1OebbmZZhOTW5udm5y879Wq7sNvIpVyJQiYqFbtGxus2fy5w8yt7hbFZMkbjMkrv1B50iJy0RvGiKl8EjEi3Nttm28ox3VNfEIkVCPdo9kCYLc6T+EQQIHInnzoHkY5hgHz797ne3/L7dbSI7HyBSrukfSOSRjKRRVlakDh5Ecj0XixJgS4TXLWpaBJGgLIwxmJUKk+7rO75qapUspub25DUNwVIEVCGaqMCzj3n78to/FsNd2UYsokxAE9Jaxstaedp/nHQUCjo4fKJAEob1jOau9NX+ZtluLImGQJDByJv7W58quoxXEyj7O/CuT0MM2+95tP26P8gghiAwiInYq4R+OvRUAACAH/npZ0PzWt5/YufDhz7256jFcmUAE5G6CAHSDNBOkhBmAAkAvVg4ASFLBIgBMEcS311N0A3o5BXwGeg0AEj0sSO5rtQJ6wKff+l4ZOq3TCgDYzx4AAH5b/wEAeZdu+N53KawBwDc+eNmGOPs4BBLooVAAACZjbLS7sLHNmPkJSVfYOrXu7Sl71l6+1+0Lh4GknYJTdmacW+fZ/Ynb+7TyAHmkfJNCq8SUt0/3E7bp5Cy32d4iJnn+W6Jl7ifXzd27p+05e+XecECEhaSfojNwbp6nd9zexV0yERnl8uvXTMvH5RHAz/fy6/LLcmCJSRPt/6/3HwE/9vfzpZBJA370Tz88+hwIAA9enduhAHD/8tcfmgzk4SEYXZQ5XZx1fWVFBQDKlE9rKlXNr1qNWnUlTtIkA8B7kzppAPDhvJiXsO/0Z77Nd5ju+H9+zP8j4AIBkCgMfXPPORACoRCtOLALYNkHn+4JgNJKKAONlfLNPfDWdCMOClRo0GHAhAUbAhIOXHjwESBEhBgJUlxwxQ0ZchQoUaFGgxZ3PPDEC2988MUPfwIIJAgdwYQQShjhRBBJFNHEEEscegZGJmYWVvES2CRKkixFqjR26RwyZHLKki1Hrjz5ChQqUqxEKQAYp1uvPtPMMmiJxZZabpkVVlljtbXW2WC9jTbZYputtttph7322Gc/ABg+MoR6LWCRoWr6G1XT2j3mAIARMFCrqQjt+7XPAECttvYr7TZKWf5NX3sPqNM+VB6ty8wYIHO8kGHK2rUN+KWgNLIN4RDlSz/Hzf2/QAgDxppgjH7jTTLZFBMNmAEApptnvrlej3ESDMs8lrFqyTbxY/KOsX6iK7waaxG5TW//d8CBXwDXnyaOWKFHDP+3w4Bk0KUsmdKxg4/hBrF+MEnVFCqdCgcrvLRDeAaqlsdjuEMwEYFUcMY6sMpqehSODsbSUegpK5g8uzw+HdTDSnztsJZ9kD7RDxrWdAwOgHJ+uHEQWFmrsrGHSPMD4sxr7sAgSWo7WJZU7FYFuDS7qqa1vf08ck7eVJI8u19Uu0oWu/HoDT6U4xi8BPdInUBueMfDprK2O1Exo4EowGGyZX/l9oaZ0P/MPeMzolzAeI/h9fJZL6fEiMLR4/DZ9G5R3DjgjBhCDK0nF+rtcJegKWsjbuTG/xnOjy9OjztXp1m9kaiVHjfG2+35kXPTTw2yBm+hPDb3DLw/7fMSpqPUxBNVDS2Ede9i0pwcDVaPyjODQZXof3/5AHJOZuyWJuT4NhdwKkYL6iHM42hbm7mbvR/DaEfU/VD3aWNkjhHAGOHwGL1CF/I34o72rAI8q+iWPmhPAE8HZn6FT9M+p6WpkaYAaXrgCJFEVTGyLoDLOJWQ5euiHZlYqGghAAvhoIXOwmgNTCwWI8TEcGoXl0DIS9NJs8tSAkSViuqiqMIyAz4PBRZxntokNoDNDNZvTTuoj1HNQjBGYKEjtASjwCRjal64JB1hktrjvjIeys+qaWKIywULhp71PibeIl/ZdE6mwjw5hTlM54oypce5/mf8h/mnslR9akjCkyx9xmfhSfoX81SijkaPlE1F6ECqo6QU0knhTiQVepzAqeSdKp5CTomneO00LYqqCBYUZMmxUIHBtAj/omsRVfwA9A8UXSEfEB1G4OVG1DvbIyPijZW+QsZC/+NnwzXsttuwVRdsHHRx0ObBxZK9NaNzMqGONgBw4AJW/24kFwSGXiE4C0ObI0QEHBwpnvKMc6UaAcBBbDBYFAHE+rvx8Rrf5t6QY9zWPd/2Mw32Hqx/bo5BLlwc27ixQHKbu04zHo27lp89ugJovwHQZZIBtiraYuammzp/YlWf2tTZSt2mOJTZ6dbNYYQ5iIc0OdZMGSF71AXIAKT4CMOmZEp308ZSxRldADy1B6GV0KmyBTV3ylrYRpwx4v/5oHmQXTm2r46zevcNLMLaot93tDZ44/pmCa/5/QEdu0PkxixEA5lAsN5GBr5/x7FHjdySJ6peBpn1gfFeYG+lcXK3hkchnxqyBtALsBHi+5QpdUd8bZ0f02poNXggNUCqXpcK5ViVrVhUZTvMhQnModqUo88/7/CDriEAkQVOzJNELBbjo1EjynGBQJH8tmraichIU+rRrcpMma2YzjW3dYMd++AJYMauqMTRZ14UAoLYb16J0/lMbkKIuZGCVHjSZoMZcMeYfUQHJ8C9ReOcwawLnBxhLJc13SGdb9OSQnPMWBU2pUkaFQTpiLcCByUElO2xgStGK3sDxQGWsQKPN13X1UEup5GBC+AKWzulCyOKKkox4YbCRwpJaVnZzceEIGZXp2UXeRqgNFVJyXGgmr4JFSsF6B8mSeJA6CE2kKvDsVdXImK6WPNI6BQiAtjMTzk2hD3QCC2yDreK3dIeNFEPnjapg7ysW5LsOkxXaL1WSvpMwI5BR67vA9ylz4RposXi0i7Pl6E1BQuk9PCt2SF/tICYMSEQdyBz6Uyr9yH4ngsVTxnTki4lAOSPxKJ8UR27zb1/KsD4Pkim/TwPN0AI0vuNkScF3axO8CWeaEGeF41qUBMTch/B+rCLGSiPDFF5S1uU1dp/yssDxD4+rScOG+I5c3ug/4/jfTsoJ9bWreJA9uEeMLa1daqr46rmWxBEEa+LO3IZu9voOTF9WVEJuUoWj8OL9KQvt0VfFnCQJxKy4I9jPmwDpJ3ADepU7PVY7GmHiUDUzHJB4ChYdcfT7vex7AKPH12lkI3ukAkBQr310e/gUf4ML6nqnfF+ch/eFu7XfscKPTaWMqOpv5llWiyGuty/eXyH8irGHbIZWkXWKCSH8iH0AJKeR7+M6mo6sRWexmeB4gMwUZB5RTsHeuXEqq93jvK6weNOAtnjyo6jBrAuCoqmC7EAyEsvDr0IwkPSLs0s/YCJgqURHnqOA/7II1LZLudVWxXl4ShQpjiLjvmT82UXX+kqhRiho7DQUXlPwX9bq1SIe0xZnygT8xhTxESAMbFt8aUsWnhII97W47q5T5g3A+witlMcOuJlqOyQD60pTf0jrS+Pr13WUXcxWR6gwl849mDTPsh9ecXI48BiPiG+rh2VbIjByAG+Gjhwvx2bhhKunuJ4x1P9KMac+lJ14wo1t5jWSVV/GpuO+2zt7nOEZbgISctSfPCEBC0Fi93W6TtPmVvjQgs4lCSYIUgyKTPetL3h6wqo4j+BNOvX+1VZmia5EQsf78NccTzHg2xg7X5yOvzxpWfo+chH2CAxllN3UNoQy9DT6UESBP/oag1I5wC9aoZwtUjSrnp94aaUi+yGRnhqfk9ALUf1OaWV522q+s8Km8c3wyP2UxbqiudRWmQCzTBFmqEK4c7qbsQs0XRFrITrAcSjzwmci2iCFbohpI5n0D9e/3G5U12+bvr1qM54USuWC1rbjg4dMTEhHQSIV849b6uuDtA//i+AMMNKWTcwHsCEmMNZXlNJPFGznOkh8mDGJxW6rZORF0sRqu70qRj0lW9Q2qwoEw/br+bT4Wt2zNaOKtXsqULwj86Z4qmgAgn3CmrOKFp5Lt1YhPK8wUsJ/BgervTzjTlPResyDS1wYNzFBfTUsy/nd6htYR870mSf6UWwmMdEIOx4UYCTt0Y5WJytlZjqcP/y2hkbuhdpapclqIf6C44plflFzGZ96O3QxToYQbsuhnZePWArBDAkyZcEQXocoWrKCjSmTPiykomvu9dM3ICYmIHyHTriO5kCM1a4LgbBbED1lKOsqOHikdYHpgdUa1q03Rl1/V0/y7IU1b6RjKqyojzqIEtO4jgO8ISLOaVBu4So7GYHDBOAcQfQ/WgtQgwdUuAHrVcO/oskq62xpBt+ga0+SMF/JbG5JCR9QjLySzjvPKX5/2HdmckFLd9CvS1weqRFwDANklaXtkAfPycBo0khfaU/VQ0mK1vXCNMJG0RHHEULs7dmzbAS5GfQAMgJDNAWPVwRmNyUFUreGjISX98W0tt6tMkxU2GzxITNcfYgMT3cTANgow289so/FSwLj86mhfg2v7bqnr1vl7M87eTwqvlsTBZ3XRcP6QzSP3nXESNI+pXx/uM5b2sy5sfPMgUCRfEfjjSE4PXlYlMn+331ignbDlRV19BUKV87JV5vBMqXm6Ix4xCpPF5EIOf5KGgsdQt7nw38DT+OTyrylaGtaGwxyB1NEFSCfZw5MT2C8Nm9Kj1B0Oqo3j+aI/n9Luk9M+E5UmtfVaTotdbg/6zo3lN9dJEbeQ6hLbgusgGZv6kr/Wg2yOtGfBBKy7NY2qw50jA7YFVOEse1S3vVrNMfkx/3knJ2S3KISf+Ta9FMLVpMn0o4gbCFjNSmCLFa69fXD51cfAs5x5RPYapWe20Rck5J7YTHw88CN4HpmXJY2naTrJFPJk4CtojNReHSKMqIT21JfBjdADghkp+/0D6zcYJ7e1dLokDjAMtrDU5M2Ahgc+MIZMxyhsoYB1iuZQpyPvw3AnkSzjd18RyIEzcrH27G0WfYOgNCJqRYYt78Be7FBMu0R/KqL9HyvvGo4EWkuFrJ6Y9pWq7QJV9cx7e0mn5AYusQk8woKkPa+t2FVoI4RFU55UubO47tsoNcqJbK6sFwOCnVWvyYhXIB6MDxOKrK2qkyB5Tl0olOFJ9mpIWj8YAd6J1NYfN100pyZwRWKkFRQVRiPqG4CgPB7ku29oi59R5Vd/XpXLxxo8SRlHQjOoHSA1fb3GzW6a7LYIqNXKz+J9VE1YV0HuTOnrMHy6BqP/4xys6nD8J7KJUCE7+vx776uFYfxYSalVTlxMEvi6Lc3xYpXwp7J+BFr8v5U1TNeCarbvYZo+kKDtG7jbTPybMS6THUALIqhJwAmS42sCtBR4tyGw8diRc6aj3EisGDbCs46b4qrqfkNh1SLQH3gjqAMCU+HP9AoEU/LiQQsrB2/emNL/TuL6D5kljd1aQqD18Aicu5AFpKVFbNKvEniI3YdVfSPAAhGfFlD/zV0La8iRe8I0nz/k90gbLHRh6nlUeGrqwkao60rC7T2rr6/wLa2b6/z9+KykDZNzfvnNzws97nV9+QE+Js0s45y6Y1kgpm6GTEvQB20xQRp5TmdOlJkB9yC9geQShRkoyofl0jhHgIm9cz/8i9dYrtyjrrFxxRkUVRiliX1rTLULIKQD5y8oTmNLhcKGWSnYq1iT2b5w4gNo8L32gfEdwM2/JV47+rKZtul7IB4Xr1ckklpkCrJ3bpC0qZbC7FgKqDG3r8vUMpcZyVFQWvFD477sdpV7ERmDyBbkGVhbuFhUwZsb6mHwb91eyYTM+3RYoZDSuqyiTFRk4DVfZ9NnzcY2LL3cEwlAYK6WjG8LgsDuxy9XqOg68aWFN1A4ykXFdACDdoCgrlsXFIlnoU0yWPRpoUoAfhhjDwz88ReH3QYj9CS6T50xMnnZg8FyKK0ak2hnXHcpT3zeHyfTBuAJCREyH/CGmAmeBi4oD48EeKC77pGrc+sqp/vN6h4rG3dWG2SiDEmkd9eYHptMUGIZDuAEZnmEtyhaZuqoZUrpB7fcmeTZn4PJyQtAC1SzBYOBJsIzEhFtJKB8Wl1D3+guAeCAMCfKa5aWICG2tcJGD7ms4WrMrYUFpzoDRZNSvBQ4qGsAoVjY0arTEV5CtMqehvUn+JEgOdJkLsUgc3EXWYpRG1zd7pBWCiWNoOlIcmJ4THAdKBqEWHkAfBzD8oNJQyC2rBGsTpjmGrQnD1VpztsnizQxo8jwmvi+YocMa/SyNctJQWe6/WWhKORIjJ/uDJIVmej8fDr74XrjdFz84RroMh5qU942TSgFTWbscKaeRONangQ1ziFrXUuhvAZPmA+NPFZf+b5KGxMY9w3+HEf8T3REulEVXxhNAa5VX3ac5CWbHLOQBywi9OiAoz1oNPjRHzelB9TTq1f3+B6aukQksM6VtY3Qik2c93oek7S/99hVh+Zsx1aD+NSa+XTKQM4SGlVMz7sfp0jhCEsUAI0UbeY5OWrkUP3eZFMBTPB5R4Fxl2I73DIWCmCFnriHhbTe81sqS4a1tOng9eeLEdfT5ilfc1dadZpuijqJqudO3xbvWFzhEUXkcrSGl3Jh5Vp65aHVObFyEMHd5UVEenrpQZtc6tp9Jz5prqatwBWnVfVPFn30A9ELtCDMzo8ZQRYvu90j+mlbwz0yG1Z2q1kI7+SRRblpbq+RYIBwsvmtrtjhypm7Eqp7YCifBjGXUHIQ7Fw7JsKe18MiMOR04dz4I1HEnZeQ2GYAMBTCFJVcS6AdvtfIjvbZo7+5X8yyXdDFPsQAyY7VkZl1iX2bVFCOsAm02DkxFIWswTAMJivfk41oMje7hBQkyrktIeO7qxUi7bvSpyNgKLDrzNhQkQzDqW9qTM7TFLZ8bU+40oSG6Ohd7DzKRSfvRnSCmKSvWHgvaY5SJRbzaFb3SMBAf4uXtV/qqWo5US0/fy0TExO8S023EQkn1pag0NM1GXhDQgJsQTgooXkY5qad4QfPntE7dWQzb1j29RBzf9hPcSGu7fpblc2kVLnvj7GV+WPaOBGXroOKSjuD9AFMCAqaQrQ69wGsUypanluUwTYPXXz76FNtIVyzuGui2YIWw9EYc7xzwJ5VWbgDmSTMSNM61X611iA9GZaY5iFKDXwxefBxyPf9MsUMW6/m19ygSorzld8lVHqrrqIj5ivCBc919Aut7xgJQs8PXBWFWCDmaf9WUHMklW+grDdpTdl51HRmqqtxYlMbJbLUFiFKFCIJSKVff1LqXnKOUjLbUX8vlIvJz5CwXi0KWpUqb3VptPIvOXZlIr+9D5EwrSOPXHRp36I3ZXKJjYwwyh8yrW8WkcfRqn+7cJfmalfKq1oVcnaa7Ip7LEd0tVO+BRM0MeoYAqTuyu4O05YuOJKGexTv36GA3CMLulw3ptac5mdQ8GB/+YEPdUdY4mfHqBIMJHKSZvKdJy1Q+KkL8XRMoXqLIeQdNRdTlA8Tsoej43QRgrBUlMRpSqyZKC9YdEgCPzFYfmroJVmtq287v4ABwfhm7GKrpm7tjiPnzN5VNM1VsB0UV3cN/DwKhGbZrdgoz3vT41R+zoEDPwcuusIwoSd4qT23ODlW3ZQDGywrPNKkik8GlS68q7M2on2/kTVpeK0W0YD9N1U5zddn3mcVgg/BTiTq1/tO4U6mV/8OTwdCzIkkcPJd2BbJQ/wZ1sJ3qoSiuozxTu1Yv17q7GnCWztzaP9+HFvJXOvqbsKNxtw5te3SabAPYR9QBhU0C5Ki9zKX05qR/TRFTjMNvQqEtdQI6X133upZQNHC/9WsxvknaG8PMR8sKTehUlTodTtrgdUAK9Nzfg+GqrarXWLZBKxHK6uqo3xiiTpgTy6UKQx+taqjupXaE2CwYzYGlhEtYIvhlNyztvDeY2Y8pcKe+ZoVlYjM5Yacxo/fkIGtImnhlzBK93VEE5jyegyxVQLZGPdHjDp+Ry71Q5JfGXDreOmNuHuWPMz7juOKBvXQDi7tFUmGPC36K/FOBRsmYTEmJa2PGJF7wvtKgMrd6D7GSBkMnyuJ2VTlJTZFo+9+EyswwTTFdlslwVnAL1CKZ/KfSI5qsihC/0cP7dS3Wlfk52hV742Bv4EergZ51PjWL9A80yI3WbKDp5PlxHngtEeMfCo2/3PhN6nIDmAHlJl/KiMW+Gt+G6N1N0b3+EGbHM0jYezlYPN+cOEO4Vzz97ZU251pMEUk7MiXfq2r1cZkvkeSNd71nkK3/C8x1MOGX5+MWwatPQByQgPsR1qU4FjCfJYcvrBAOlOFQGizW3wdv6UDCYIS6uIVf/xLgZdjrECCSWZDdq1a/CmdNTY9exL5/30g6wvcAs9I4av1ycA0pUuHSm623IDCUm1ft22irMcJ5WhfHia9lVREOjLMVgmksWFFnv/y4zwIR0LQrCRuVMbJXQvmdkF4JAv6pDecs1q+w6z4siQImgrIZpr16nkSQ1pteYhvt8jEk3VNNzSkTyCK3/GoxrWK+DOO3RWuT1qXbwgjBwP0DcVOrb77eVymTaj9Ah3Slb63MCqiQOmx+PQRUq2Dm4AAnuP9vQhT5bq1EJBwpPh4s+nKx6e4jPmVvTnqvyupEEn4gVTLC3sKKG4Vr9C/NY0rcvbZNMKo9WcbDSP1p3jHml2tBBR50t6kG/T7KTJBCeOJLcuol64BgTgV5olOXzDWxvpweYS5RtlIZatRVR79rYWafKwayI3aA8fqsVgeO002F8+DZtDcjiwjLNzrX22tlUssuyRZo1hQJ/65JRMBfnREpVQtfTYfTubGYgnK4ozBZCvtEx+fxQVDIdeTybyPgoYV7dECbG55uhpcZhvdstpczQ/9ToY6Eah0SKyQyf69DyzgdJVunT0dkT0p4+v3k1bXSjTRl40efIZmrrzjQOBEI44XznyRlmgOxiEk9YZOvbAKqDqbgN6uEAc9nNGahSFE3BnDsLx13gj753kkkajcdn69401pvO5ZDHSzRQp8mHMFA6s4gDsIh6pdtKoCu41BsfaUZf/MmN2zqcsyjsBI0vETyRpec0vZRu9SwmMk8zukb3CYTODOndBsNCTHVpeAtpGTHlgCBypAAs8qoZeIFcfbrQM0D8A/pUgS4RuFeX+lSwUD9Uhf2R35BMAv/uV8wCJuw0tZAhhF9ourZ5KvqY4tABwQ01eRlQVb2F473e48sdXGoa+ulEiW30hHTIRJxbM2IvPKTd732HlM55Xy5yDHFSElkz1C0euY1MCRfvzmhan8024uWpAhEhhu+kfcCCpv0BYhAYkdKq1gyM68p10sJnn5Vsud0GMenRu3P913ue0T/rIBfRWM5Er0Me0UxD5Dk8rEY63Bg5vuFgNnlp7nIUcsWbRYy6QrpXM650q3cq+uBRhVFN0eCCsYH+D6t4TE5q6M7FRrkYlHShV+tWngeMRw+vnOdRj+n1HE7oCBDsufH4Qmrao1hJd9NwOXg0JQwdmM5FJUqqYLVsFvPzh2Z5spD9iCBkYzn/u5GY6v+0szCoHVimWdzmEqJqZUj/rIdOyq8YwUogPw0G2DBdw47s2ZocNYCc47h0NI4XfOyUs5ptsVYVPJ6rU7tMSmnOoDiTTGxJEU3NvoAAQZxAhZiQJs40+iCb4grsDD/S9+yiXpMXGR+dgXhQE+6INPcx2c6S5jNmkZ3t8qU8F6y6OJzhcdFYT4ljUCpYT2OqFceBjtObOC8JFnzwBRhWSKts4uAJXbZXD3AKuBYPncMIDTJzlZ0dWp0TBBL6slEyTbt8hJ/niaB1Fqus5Gg7Bq29MrSUNnXyNb+H1uYuzfusfnhNHO/kHdPGI56JMetQOF30JT3nippxRKsZ/ZTSA6vUtSikC2fZ2YcR0OMJZNlD42I2qzIQ8mdoQ+rExx8T2r8O30HPewrjs0xnZf/vSUY2Bw0MmFk6V9Gy43mdY2bpNkvtvMgaBI8gOn2B2UbMIxermFQhtnqRCrXww7S3AK29OvX9aW8UGLxu50CpbsS9B4uEXKRi0wdyJD2qjjGf6Fep7psNfFv2wL7Rt87UKFF3WT1a9bsWXwrYhCUmJl+x68BDx3ozRsnB6KY3YcSrTqQvlBvo9MjfxnBTk6/BH1P8XGbG54XMxHv4STN9n2Q/4wA5grBdlukABnNeyiIvb+M38Nmv+AMnN8r+PCwr12l9zlpOiG5EzmTLwhIuFwKdHgd7ezWAylt+Lbn4HU5xG7CmoRoZAquk4Zq12Jjk3afTyg7JNIBFva1T0ed7/aPAvCZv78LCGtOrkDzy4UvMPWmf+1tNGYxc3Pel8ONP55xjHWIiw4XAtwjENUTwXTedeCLfO4ehHhhnvTcPmNjyvpYMRG7uAkG6nfJ2n0dUKvO3S/CFy2X0zl1SalCBHFqzTql0eFCgZdU0RBP8JBYTvSqAbTm8A+et8HKKM3NxsQ1FsnKXej8bvhQ+dthk1Y3GGDOqItkoZOuUflw8hhIhIHjFxbw8TXQQmyunCOHRYNxriKbdgcFQGsD5fBBJWyMRaV5HVTV42wvBj/LDO1xJG17e3xJ12brGYdAw9qTkhkrT9EyZJzF8IEp6pabSIU7jJWmvV+i6b/D0COxOvjmqyti3P3Q690AO7PREETPQIiLqzxU8WmECO8Up4mW/GNd+dbdPRwYOFqdzBUsaiDTjDZd1ExWnKny1GTgOfGXtU3YB3iRIqa5H/Scxj4+UcEIaNk3V4mX9mk4xwRIMQTh5wIRtvSJJvLm8T5cjZNaQmACJCXJxSNfk+mPemKgR2oRvzs6aRx+zFLRkQnZbv7o5Hluiqlm+WRnSPwEbMBg5o2cmOTMYFLVINE/ZnS7rkhG6LDU1n0kpEFxHCsgHAzUNr2B3R4Z+GEXxXdVMOEBTCG+GbgEpwac8ncPJErQCHHyBtLC8v4ikggBRTaNK/+roMbTL6xvoRGsmGkJgRhQKkZ9YTXnLc4HXxJjk/DD/mts1b7Nrovk2Ddnl748Yc5nrxGQ5mFHwkHRMVXZX33taQZVD9OJjkeRKz9RJMg+EgPCOpcooHix06PeMqluQWS9D+oPO1i44yOsikRCnEJET5U/KHu5rSYvn8oWxAAYn5sX3LxgV4oLbK75sbS9p+LaQ6ywSKXmT40f+v0DxzVCiqJB05uymzm/5NYI0+U6J5cUx+VTZHZheBL0tUYnXUUQu9zXlO1H0J6LLzrhEaCYoSzkMvN++2YqvfxuMG0/Adq4w+IuQoATL8kqHikY0L9AsjwkfYllrk2MewfzKxrIbotdYHDTFsBMSAvfCGNGK9Y3loJGLCbX5gq+thNTOGdCsn11K+SbYYWtollDRGNMy5LySHwzSdDvdRhydAkVv3nogE2Hxq9Jv0lDTyfXwcnDQ5zab0oBGzBD/LiKRowFvW2MCPowzVTQTgCd4uB7/HCjPGkC+ID5YS16mWAQzWvK/mLB3eQ+2UTkNDfDaYRA+vEfo/LdmDCfMGd4y0ijGz3ZpOslNkXOYUO5xYtaUJ5b2L0MtHBDlb8RSj5Y+RHAjULxnb7L9o+/HxWvM0A639Wwpmrdd9OJGwZbZrEyqwc3BAdGiYnJBuJpaksPgCjr+C5Znjd6TK420T0FXnUk+XX7b4mUVwcusZuQKCnVR87BX1c9qRR4fqDdTOyzRxY6XI1iWKcQTpvfR85WEfulDzGpWDI8etr+u6+c1e12w5joKLV/BQPvfu6lHoQaKw4vA+Uk4Ze6W6uXEQJcTSzQUhIEwh+hEO0vHxBoz8b4S+7NO1YGRx2fcT4KKjAOau3VGdYf74HzzluAY7U5IaeBYBR3UitSXMd7B5zpDDik0iHbgA6qU7OvBlweZkFdcgX6AEuwXQOjez0Litdg5qkOwlOTXuByDYx5IYrLuEPBADbVb6uqEvbGIJa8KK95PsQShl55qlonfXxKC1gMfEaRY5taeSr46wkzW37XVlApov4J770sDSAyDye6ccOUvxWv58f7rJdTVGc/iIEtUHxlxsD9z21GCAMshbKDjBSyH3FBT5/6vZCem4YD8oHzvz6umcG19ODLv/DHMx63ZKsbLkelntN27NpCexMV413C1AiKqIYZ6QkcfzcnkO/BBxBw0w90DRu4tKDKdHF+9+s6XDovzFCaPjAvQncb1xmzdwrqdECqoLrJEiAeGFe8XSbptd3ccY7uIy0uK37mrxN53s8o3iA8vvnNhJWIJAWIazqL3uQ8nSGVjnvUxp0ysTwnE9SlHGg2PPVjT3kCXhpptvWE9h1tfTgdGsl2Vks70FUqJ8z4sfzbccI+QQ+5P6bNciI1poo1SAkeJZ1HjquEoLZSiKmu67YMR19aVB+j8o6STSjAdduvB2ADJsmSy4yStdsTo70fzUPfG2gkjIvkn4yntivJTjigX56zhT/3vT5lhBdtpeY0P347erSJTZeU0+//9/Z408t8uMGPR0yEsO77wXaI3iC0Hp/7d78PAcb+7hXghskyFehi0wTuqnqJvLkC26CV19cTBv9XZuPD3eQyYV7BfQVxDNJv5cAac1TEqWOgXRBF/JOl/F9mY9wNN6jFmKKF8k6ZB2URB3b1eg9YWExM7MC8+6o+Ouk1U6QAhXKf+nqRgH6jPEEIjnrT9hzPbhsyPHL7dwPNWp8vFe3pCOZcYfL6KRyi1xfCzr91n7R5rzAmieiG0wzACqAV1cdRUAKPdRA2DTqQZXHXUOjpSALnsD0PJCYFRLqB4LaZq/cT4+pfaM4dbdRrbZfqRmtQHn1yLKtg1Bl35OMX3mfTacb9UZiCV/lB41pbF/R6yMUO3WMjf4iH5t3fmrmU02uQptVTmJCCL6zhS4PuAgDACDsmZtTApccWXxkfsBi98pEkp+1rteXmNY6eqBX/gmUDPJ9dwUoKSIwS1F4jKWPAjd/H1lfb7vTXlfV+NM1KTV1bGmITlpx+iqEJl8SYcEISra0WR115C7m5Pm4r+EilrWIC73C/phBu5iOZWeNm9jJ5NQot3GdqeI81cD6JSBEohtyZEADZGihlw5o0he3heSwKPaL7CkzA/aTs7t57aZefgSH9yWg3cUGDLtbfaMpyQFgirR6Hi5buaOVso68JyFDo0xBYxTvBhsbXRtfqBYlGIzbaB1Guc0RX5873m7adXidjQkNt6Vj8f8XyhYMvPK8N7FTymuECQ2FAL6teNyhm/NMmKIBsXrcWdyDclIP70FiGiyQNrvFtWHXHV00BpordJvPxArJncr/kIyX7RA2hoSif7kbRrgglAPuP1OGSCMa8SPZNwA5LSfMUwmuOGymsKK8cAbVfhl8AN1HP+hT5ScP3nY5er5XlUaqS8RWJLr6SYSH1y4KuqZ82mkEbWp2jIovRmuZGcc2RTYkO6veiDEQTwymHxRZIG5pgYf/mV9MeUl+tN19AcWNlf3NKHMN/BaiahQCbUkzrj7Vb047fR4kh7IqVxWHJqXv1YMRrb2R9rttCu1NQLduxTXNs34566B709gJJIuazjEiyxrdNPk4ehwHkVd/A7SQ78YjC8Z2gJHBZLh/Pv2jHGN4RYCi96gRGS2G8p4iN8yWvRGAZj8GUt+umrs2bFaAldpB6UvtWHZxgWNpxO2dvOruChexur7SxjnLmJVngJPSbCIf2n6dBaJhjTkdgtzGwSloFaCrbsuMBr0eFkW1Pe0xXlhYkzcXLxQgPi4RJX4v1rQen0Xij2cLoIwj+dkCHPEM7vqUqGeOImW/3xyl/K0TS+yFMvbn7qo+3W71Bk+/fR7u9q1QxmTbvcN7mJjar8B8wLBP/vmSDgwhUuCVY5+wdPzOJxE/xBTA4zhF6EmZPFvcMSkIWT1V5ZNuacbTvFjB7uXLpTsj+V4CkE+fUqCdCE9nLQTNVF3FlQygXTJ6D3zfY1ysYewfHV3rJf6qfNqhu9Ou2WxKw6zZ7/W6J92MUBGpzLp5hIhbD2h/zv6jGlvuHCvknY4yB3wlYKAUwlOaXSo78Vn5TvtwIVYdaNEAS7fjNVSzleeKMn9+XFPNJ0RQWPN+CEOX6MxoemJSIPW7x8NS+7uKSNmdpyaFd0NvYLLlB6eXzt/dUiQlOal6/hLZI/qC6c8RwsP/oM6+FWZ/1Myw5Th+F9j+I0XbygSu1oUynbO/A6NldHu2ltiUVPWOkd7HJqj5ir3kk/Ty2vT34mhFATb2ZZykQWywWfO9/C76AvEQSTE7NRfsLCCVLcQZ0ae7wM1pj6rOJbhAO/1Ex2sm8zO1C2s32O9Lubu/5ghXjrFpqheMtpI5IqVYyrsHkQcE+YkuQlduUvxm4mXNd0JpLeOkEoCcqCIIYwNnRnsr4kw6zbm1x9gvpOYSy31bi14zcOBc66NXCWCvUZ5yMo3IuH/+XvxquzJt+y4/a2JIZU1m0hejzu2KgxxMKPvyswMzVVtzVTuj9SS8c+Ernnzf5KK5V8xfxlUL6vEUofMWrKbHZbW94sc7ncHjE9dwodcpPNh9p5Mu+58t6MxZDPZapmhDi/mKwn2Kmj/T8QRQxlUZrmQacWSiOHL0G8DUEjWOx7Zauun382tiJyk4aw7w7CEokcPdaZiCANnHcuxWpSIY6zQCJQrs/X3bHLZlyKcjs6JfY0M+5W5DkRQAO6hFIv/AUbiAjZ+zr+TOQb889dmnDl99ADWZIPEKwZM7EbtB+lI3aJ06XNl1bQLhbT7tYwuSDo6uuOamO6G0Ween/R3hjTuM0p9qytNp+ln6EXFZRDPO4qUyHmKs25aHGi8JMIjyB721244cZOA2XZ0fcveOXfeUGpeKqjDmjn0+ez3Js85uvsEp9JPFbCLqFX/geR5r8YA4E77eSfhUWLN8gCXq/ETPLOCNYKoTKE9o2o1FPfB57sV/2/fmn5IW6S2Sq/VSmHcbF+/eHV4a+MoA3Wu/fFE1yuLCY8wfx3fP/VMiCKpNRHkjJHUk8HEBu0Wj9S7go91pb1O0OR5QRoHZrd+uCfC9XW3oGh+t0W7wUldiWfQkS6EmRZ6fN/y86sKl7cpmYHQvYy5mYVT0poj5njgmq7rRKGRPc7a4GnfsB0Rbqa/78mtRtG0nOaX9BVDPqvXYxeM0s5XXpWVgkd36EJFvMLUeLCnROfO+ZSJZr/RhhYiIgF7Z8wiSIrUQgeT2Cs+KIuEOtnTqxzAfWzVZFcH4ctRPya/FmikspwvMKJl/57P4/rxWcmqi+lplargetPV63qXYUnXkSwonUNGAHI5W+Itjx0DJazxY0Zc9AKPWuHp9hR699urbJZKODNJwWfTWsJBvRPs6nVwklgAbUyf1LMlP8H52UDethwYo5PI57Pt8cpm14GXbQWKddqSfn9CXLYS5WyMr8qv2XAhW5QjK8t+yHpea3LUDyGTmTF+ZQMCiIrMB+TxeRyUS5svSz6XY4Gsy24w5fPOnWU1cFjAmHxt+vzlKgHHrjKFMXryYOI0lrehd1yvXOT9Be3bE9O5CWPeqD6r8UpixZe4BZJLpV3UzYS/cUdgmIkjI05preyeGDLLDI+f1E0pa17SzDYgVygLV8I/RdFVTr5f9KBz/GaKDuakOeGwQwHrnj3Yi6V8iNsn9fChZpU0IvcV68DB6wvJvzii8JsUJ6Ge7ZRKQ2wmFPwJ2Ll5THltI5g7UnPd2VT6Sh63r4vj4nVzyluy76sJDG3wnYRcO+ThUVtyuctxUOscLlk236XkSZ6iKDQwtxy0mM+WaHAGIF+SIg9iuaffMs/DuQzILB7fh/9cUpY01a0aLkMHQfxxIjhy0M7Lwoi3wJ5NFc6wrzxhk3+OI1Bpf07D2OL3XsXqb3WdQ5tsXvzMTF2KApOfbto6NG1zW/DWhKr3QMveliBON1+GELxwEL7JQRDXYHWP/HwNYmT26qoUgAXNP/VMrAVa6QL5O95G9GbmGs0T6uZVtWI7ZI4+gfRz0MrnQySktE0X0DNMMS7JA+35dvbGFzniPAn0G/teKPs5pKUTuU8nqY8oRyMZAqSjQmcak7PE5U2pDSXV5Q6n+clYoJlof3KgygTCMBXZQhyWeRTQWhIK6VAc64/HFkosYC+RbDhRxNWrs5PxvwhwPZIYe4tNK5Hw7Is1tXpOGAibStOhlkmL/VFhq3a37L9o85iHE6z6y1XTnwPmpyzq3tHmEqxGG0vQFQr1qFEZzsnLF8iiFUsYduY0pLl8mQfsndIMtKCp6sCiO/86jBnF/gON2M846YQKFsRLynOGN4L2UoZU3d1W3/IX3GcPc/I/DMrrd58eWzftl8PlXUjHCgXgUA3NOz+rrQY1ZsB9EW+3gbRg1Iavk91y2E+GLYrGvYVNbOktNVSHml8cBESe2Jm/wNiPeeIrovSVoUJ/jZMuFqg4QBUPAPmHkhlhbELfD+rsuTW/kz1069mERq+6rdk3PHK0PyikanNbbr23CyV3pkLbD49yPeWRqU86aPwzFeX4SRuCQ9mNNUgtPutQRviJ4Tu9ixiAjfiVCa5VIqhUjr+a5hpbhjekNbNgWDB4OJLL/PP1LzNVOAxMGrGvdLeklpQZzk5AYMSdgXBn1J8sodCnLf5SvtL+Y6RaJn4nFe3eeTxybPdyYJRWCfwLqw+0CKuVTPLSrN1Yxf8eidU5tlElEp67X2f1wrBePksiHRmj1/2v2X/5c3p5X/qg0Toif2cXobiW/YXW7Kv5AA/qSC74EvCGIihAmZcwzbyktnKX7cchoq88h0oHAfANvGNHx1NnUXyM5wGbleBA+KFjTt3uNnQp0i9nrEXnVW3Ot24MlBQmdT/GFczdYfUXw9puLGzodIU2iVmZyGeVfmAoFpmMXQlmkHC6gdu3lpCn4HcFwne46w7EmFCEwg6b6KKQeYzWupF1j/UTkv/IEtfFykIXccOJUlLpeSg2ebo/Ic6aX7WWC0ZVvRmwXdj44DGLuyNJhHmX9b35/KFKvHBCjJ3NTWzhiIpFsTKf2XXiuxWLERyxcs4sDaz64IZiKArxMyBGxP0XxeXjfDoT3+4y/d+8gY59OwvJAdH3+BXqt6ELCl3pDwBQ9J9klHT7VeUtSb/SR6QeEiy5GhUq2RjUb9pB8ow+4DpnzsyxzL56R8S04X9b19gMyef6AlurVcPRA5U6CVnZWWJUmoZeKBsogiKVbe744IsnmM/+DkIpoOwBHf3hgjJADDtoCUpRS/N2XlQeMJfDjwXb3elM/Gy/ESJeei3fFGvkeYXmGVSMeVIbMFiwfoHtTfyj1a3jYbBe1+zsdsNQGh2pKYQb/mbDtzy8ekSP1xApA7am3D15Hotut7yytYUuhUlZH5qfHmkltbVKlSpBRfqQNU98kBpKRpJaQh+2skuOq3kWvd2kvNAGeP9J0JjJ/+kUxSpXqnDTkOgIXu6dxv39hPibdsdMT4Pem0O3E4kGsRgmkF0I1ZtbWk1FQAQdbmOISEDDO1WELc/sleBdJdTJFn/MCattmXzMGygo++rrw982ky43zKW4WHVro/PpFBvxLO1BKK9v+bHqddNm8e72E5CqYmTapcHP2d6Aaox+8WjcPdMhApFb3w8am3qeu3raOrtwmkp5IwHn6rEjQ2mYaQrYpMN1dDR+ccB6FJHpCJJifMpPKI4lThotz7A3ieLzFB1qOg8ZQgmwo1iu3B6P5npc6/hQabXcsXNGRuyp6LsBosMVid7MIWyTuvNaw/uR3dp0foWNW4f5YmvMiyjzhjwDxDXc1xUTvybr5pzuCTeemIePC4y+MP/99x5VGcAZruaHwGpf7eUzUGGeQrHmpBANqUw54bvOpGm3TycDxLXeukJBLmwJHRWJa14Ubu4auFhgaLeqQ3u0/l+gGz/oN7KzeeFy+/EzDgNZ+qFu0j0c7hpHzh9ZNnCP5jatlUbkWxe/ZjRLYbfO0lz1fG1YG+Hr4LkQStNvUt1r8hylJthZ9KmEeLmglVG+YeXqWrT7KnOX2N/yyTQ2TmpZ6QWYDaTnHJ8IYMGCqoYyf0P56mzFqjEwOQLCR3d4YDq5hdZPdZfW4uF8fbRgZRddqXFknlkNrqU78yVl+tWGVrYXzjqoqDYJ+uiftN/gmnlVMMdM00IjCQB7a9hQcBCCpCo9ju1AMSPFVf6k4nD/BMebjBWv1qsRddZOmQsoTnVW1HPpr7ZpY63AcwU415v83GD2TesqHybNknqYL6dV2Ul8qjHMjcjvhXMq5wdqNsP6fHO7WsMKR86SoINefUrJkC46yyXNBiTRTXKuuNYVQ4gOmArZUxkTsr+l86eAbJKKipyuG5suelRJYfx4DAYo90w+l8i/6/qSv2L97Lj4026WQH7vJUnTVMAUaMlOKeY93UpZWs7KWmi7EuiEmHeQuBsm8vn2bVyhKqnV6UuAYMgJKiGHtfZxgiTRErmEFTiYmkjxTFSkKZk9afshCiFm3DBsTAnRA6W7XRePwOGWh2UHQVhtQj3P3ES1JGQXZPgwpa1O67aI06vV+rlaOX2pucGnBZ4LVtvKUhz4vt7VyZZa30YJ/uB8BmapkxxO/FUEvLM9kE7wdnqQXxD3i6ZRlXHswODeF2QuwQPODBfM82bnSdegZIBXesxfQFIXa9pSIvPQjEtyvwDXFiLrPQIM4SAy+kKsEMlrgVHpNqXA2kgAFUICs+1RaWc/BMyqhYWweoJQTDXuqP4mRQgG3ZuyrnBsUbXLAZ1OvbSps8s60N8xUrRpFjgtLL5kyT1m8dSjqVo3m7zeS4EkdcAAG7fssGTpiAS88R71/OeH8fBmwPE1dZFRH1af0G9IRFKU/1RA3Jt7olb5+N0PMat02sAFSUqOuS0u88bqg3UvjBKeE0VVtSlt/squXV4lZDMO3TEyURVBNLCxO7YZiWU8HvUx+Rilo+qQeHKSI20w720yd+TLDDrbaG1O3RomUEr0BWbDYbc5rsrZclNCVklcY5FDJKysGJDsT6xozH8rvbNaFSKqt/Mp4nCYodyr3NTVslp3U5TZll082cqKJ83ULmOEqSP0V39V+VINEoLSK3xUezhpEc9Q9Y7Im1Hc5TVk7iYMbJBspiSrnxuytQ41qortZhz+iJYZNPK4VLqUKAeWN2/KEg2Lqn2nCWDB5FemfVApPT7YV5Jx3zSaoQbMqwrK3TkEcPS2My9TP+pKNGZfCE2sz2EGMTpz5uNlzOhfQa2xPVwpu6igeSksJNjiM9YBsfhEbt81vciw+A8yO2t0ET6wMdcZ5GYmOh0KTO8xihvcPrOfuG0SlPWNPx0+TSsYNba+WyhQ1P6Eu8plcEt1OQcP+NmFz6Le5H/q5P43zpAG25qENJmer4iZl/Z5YFtMaMe6F5Jyx+YripTfHyA1OSm0l9WikYL61g6KGfkybqxy4cqFsMaQI7SzSn/cw/mmiPXFsjLyLFWlhVqjG5JwhORMJ9xNNR6cCrvXNMb4TLr4BLRb+t2pQGAPG/+dQq+SPs/+EkYXNCZ7gsEUtpQku1XCqvXK7m+gkUhZb2WDGAZe3VgJopGDYc7xxfVw2GBJdKwUU8+dJmqXdmdfzncP9MqUczBJTMwQEsftOsFScitC9znD/LQV2w9orZt/6SL/dOeeANK2Fw/5vlpe39bfvYFmwmDKk9tXRnicybTi4uJ32PXdJb1U1tz36hivE36Bc6+JG1YyQ/BmDuI0maTzSNVktZGt1bhqxaB1caL9AHk2TLL90UuKbiObiyDchqP1CpO4o5lYCekMv+Z2iFJSh06k2PeX0Ama453HWvUdLBz3YqMVGrWucUqK/22puzitU8OQrts5ak7M5pAMqmnahWtawn/OZeIz/aV/OEpgq8DC3lcptw4BTXEwYl3yrJsYLuXllCsx/7zh8W/pSXIdUYKXzmTKzXAm6XNTTqoh0weEKeDOjx407gsZJIzq0R2JuvabLchFh1VgB9SYMyCXw/b837nmHbrx18+q5cvBHoO2ge0nzZKnlg6QakO/IWD0R2w5eCoapRqk05NQ8FhFfsODOeYmlEbMdmkeaTc4E7lzaYajMcbG8Ra6+Tc/vAXnPet9AHlgCUY7ZsKiQ+RtnG6EKVu3D3bWz+5+/3e2mtwvIjMEx3IEasWlZ2hNJw+WzJMohVH75WstSfo67qko1MaU4Rp6/ALh9dgJKrepiDn2mIliADdh0VQ4gylrUOU7RnhQCssDu37DaL+mcdVRoQOwx+YnAbrT28KL6KvDIgx+eDwUqiNiwvUxXyWE1WzNwHdA5kgmgdGmdvD+lKuHn0lB7KjyW722Fr0BWpFlFdj+jHl3GhIAniNoJWKfJfQnpxHODYkv96gmIG+Ak+gktgrfIFZbm2kYNUE4NDWoXm7UpoCxfJopxw+/ZP5Y5IYAJogh0TWnY6Bmg3UTCoFjwBdz2ldDU1hbr9TAxsLFsZEpU6gxQo8hSdyUOvC+No6wM65cVZbTufAbBaHdTY2t7z3fu6D5J+h7gIn8YQr+VF1vvJJZ3AZYZllB+qiugeMjID80h8H4Wcs3xn3B5dD8y3vOUQLWhqcrBISc0Gb1KUmNyo2yFZBFSsB34sAUTTGJ594UmYJzB2jo1YTSivTA0oZ9coFN4BdxdEWvmf+KVRshhB8hrNGBSvrRmQlHYLWarrK1DTxpZ2d5Rcg7/G97og1lFenFnq37HuUQtkJtMQPUOmetVe6DcU+8Vm11NyvPljd81R/xRqAVydC4QS/bDQdH++EbjzgCc787Fv5t2RjOLbebaj+TgU9iT9s//vv8qgFXZTanNsZ0+Z2KmlgEcrm1PZBYY5fOc+UxFRp3dlQ3NLLpRnnxhQyxc53OH7Si5FYNiC0rYYH4+5GlItyUPMFGcDCqFzWPYgcl5bAAULh0aajqL/F5bG9b7ulxcjv/PQivc9/zURkm2VuYUm7QLIiB/2guXKIeW28pPrNIzSMxVWOzNWE5ux8Vom60WK39sr05t2NPYwNvNkry0Ic0f7xc+X0Tx73ytqC6YlStkfv9G9R/xvOaxCuV7IdoHIYBmNaHbi4OiOhmZA2k3ZrUmVNuvjZSbTPogefeBsiwVIniXhovKAkMIkG/tXCpcNgi7bHR2sh9CuzX4xPmUZ1jjw7H8et7OOULSozBbiYyW8GGHD8xFqHkNbrNjNzxfOAhiLKkw6aMiPLEBpWjXz7m04SFf19Cp8/wVjYfgDG35D+EjlKkXwKwyMS34uIy7cq88NUzX9dFKh/NpWbg4vJGGZxB4GSlhhzP7Vh1dyW+1Bsd4i8F3zI0GbyMyU2jb4unXU0m4wfFuJNJoEsnwBhzt/BTw8hk7gL3m4rbsChvDY9HbkhxKXzAZk/UQLa4XsL1QWWrc/hpUyUpVrXN+RYc47Zu+gMjvnsg9ujarIMSu1LsxM2sfL0un7EBGq+MQWsrgWjfKrQefSZ+nUdk14GkmRwRUuTHsb2vcIm04ynWuvkjkFLcZcG4Y174KvN9XC9Y/75SFKpykxlnN4PN2nvf6d2Xj/3/A1hRwmBEFiHW3G/d6IA5a9FMhFhf9mJNgYv/YgGM2DHa4p7I5D2kb+8vD9lu6X0nBYuEsKNwYyz4V2u9gts58oipu49kDT1fyq7qpfUZZyOuQ0BIFhFtHRNH4RWvBEEyW+uztS1wdR/Q3KLfXp6JzMMiy91ckcgvPRPtnulU6vKHYWNhRXXOrjO4+KkGgXxA7DYKxprQ8mdED19aOZmqEIVk8l31dC4TXbSMtTmxoyF4+IXPWiiqTNlK1MOgpjAp7I2UagxsfS8Xh+SsG3Ec/sWBYxE0EIQLBmyBTva5aRWBV5U0Cv3jXj7yPzcwsJWdUHFkh0TESrA9TjWJ0oHCwIoMbpk15d5KY+iXnCt1nYqYJem/C8IeVm+VTJPS/NmgmW9XSZqrg1G4CUdO4BSVmLjFW0tt3RoJfUmP0O2z2cDe7GMJtCDlCQKuydGK2rZ7934/5UYIBuXUPTxEef1cX50U10z75VWq8RS17pYJ43WlBLkXvrbvfCyTcCE9ldrKdl721s5LNNq3m7lkveP89jFvndSt8o0afm2Ar/LjmOtKgek3SZ2cPNuzgVBk6EyMSb+JzvqX+RnBzhL9KyHu4U4HrXSchKksuQaFWXxEQydUMU2A4JSq4imp7PqsP8Fb+7MwCRqyp0b3NdO6nZoiqlts6J9KWJf6xLH+2sQdvC9ydL8ypNJSUpBwQqU7TniQnO9I9BWrQFxuLoA7bk5Gn9fNi1sVxWefDmzQXZ3qSQQSsa08ZFg7hYIIORkdFQ7YrCnYaLf0qubihXOkXB9XU9uT+7PjS9kmYRJYavy4FvljDNvfcs7wHwmnfkrKfB96TEA+8eGD6nYz3jGMfNm603bjUlugX3GQ0g4DGeoZqdbrGUF8sKnIUSGblbwa5ri6QXw67BZj+D44bnABrAJ+aU1QLgUG0lC0jv4Q1N3hpZVpScOP6Jtsj6GXWPbMNSyQtIMcDUTzjQz9glHs5ogCM6sbXqoXFy897wV3RLVBULnrzaK2E8HHcGnyjdTZrl29t4OpN79A5T+edlpjuBxU94B1BUNFFSNjco0IQ2hNfLwC4g3EvVTHjSxbWu9IyxVmnKfj0qDOOeuAnWY1jJmjGCzeiFDXU/atU5vXJkQvxhcof/MpevjQ+7eMZg0IoJisQoqxoQwr7SiFZ/kOyCEV678FQEg6++DnXA9Qf9Z+SRw6yn7c1E54/j7X0YmTJtfDa9RymJNwc+z7C8EAy7a5jUDs8a336aXZoeYcrcOvisatl23utio1yTUv91jhWuFxbrQK2xldjpmQumm2g7k/oNrkmW7NvR3rnykfaFy86ygt6jK+aphBKAOPVFdVHEtFXtWnfr66pMAwiWKCl+XjT3o1F9/abJdGV/ZgPzWKZ+BLdncgdXU9HhVCB0Otep+6zZeBiSfXGrLd2eUz9F1tvxZba1t8I1wi/0M0/Zhm10jnIKk9ra/giUKg8Sbzw3I+5/8yR/R9RPSrpPkfV2CMKwiiRRFOc8KAtN55RiH9vZNM6nlT4DXia1qcvC0LVk2ODdPPEfoGXxjDrIsFEUj+8YO6xELhuMNoqI4hR/5RAYzEzQLM+bHXOTWjG5u3YxH1Z4Twx5vU5FJOMyp+9eWFwMpTE8QD0D88gro3ZmwSUbAM9wGyDsyHOKVdXgPst7qKs+MZXDXijrmbGlojY5Q/hszhmBcAg+frMB31qNy9M5ErFr5Jyv9U6Z4+jXm6gz70pp3uGvolSTKtCoROjIMQdZZF+eQgW3qqQHJsIBzW9ZJMOSoGFs1GbYFOP8SgUgM5RB4MG7/FPqMycNg4JW4eYT30AEpFACq+ykTa8ju7Ls/5/GqKvXrOsPm2fYKzfrxpVX8lDl61JwA8bJChWLl4NcYq7Efn0BGa+xw/Fx69nOT7aMvEPiXYvjO7dQk8K6GCHt0dAOn4JnCBQ4UpZRB0vxHcP+d5cSio1iknh6jvYrcxvT1QDYqeW/A228ZVT9fPWLd2DYPV6oVLCJetMWpjUpJCHj9CR3dm/xAJGmBe+W/mgTCa21W2bdJU17VIG3uVbLdkpC2JicLCA9ItirfSVvGHAdoueB5DLWgLPwN49Ao/ue9VnH8xcOPbZIEE/9gzC+caeVbAbBBvLFuJLmy9HwtGrI5MGDNbSZiogG2iTvmWuSGRPKbM4JFGKyuHRFOUThpSOpMCxSoObBgmgfNV4+vJluaJvMcwit9IqBNv+P8x24dOYbOotk/BRJ63Dp8WnLAP2CfbFnQDRCAhabYax2oeBO5eh6/fbBpWHRpSnnNYCkMkKEBVB+R4xqE06x1By0eZnQ5yWwy8fSZPSDzsmG6vxcWEaf1gxxsykI+PgdF55/1FaBZiJzCNBXjUdvqwE+3Q70TpiU+iWkKtAAZFkRaThhue2lxdz4T7e293i7ljWAt7OACBA6U6GOAdexKrhQ5JnxU3CgPzD7ojaNKivBIPt+TttYKkK/QampOW0E+phS/znOYbu2xOlkzPY+qorSYzrA4HUwLzgRvcLl0JS8I8klKyx39PwUaDNDb3rknsbC6XWnyM5UDud9o/RAnNTshnxYLVCZXN2X+r6/e6U4qAt1/aeIpSsVT7i3KWttQYadjcMymFcWJHcdHSovIp/aRxFYPWgqVHU8HtpsfEU9xyYC+HN2j3go7mtGzciMwjSTx1+KydvWY7gOLtJ+bnBEK6rBEdHfbrBjW4TvHKYEBEnNG4CWzus0MY0+YHywEkW6RCYmNJjnCXvRWDULqeLfZvKAADtENSIu7NX1rFXbs4HUbknhOPlJxk75WZQRiIv6QN365LuEKrcyDIfAWVLZYg5e8NUJTu/M4KekxBP7ogMAx5zG5sEfIr5nXxT87tQFtUs06MyjpSAglR5FT0l6UDdHKJJjC1dufNbHxIE6+tW1T30MEgMXUkV/Ho6XBdnusvoA37Mo5inbRJB94nikL+AfJKUICvK8pP6PrcfAPaRppTO14E7HfN9LKCnhYJJmyXf4+EGYto84o0TWm8ZbeJz3YmJPRZT2m1FbPUhUjST0ifb2f9u7/jflym1H/Bq0BfpaW63he+mpZQbZoOTIQ15OS+KdnIc8+cd+8u20GMmLO2klk3e5ue+TyuoWrpbLX7ePgONsloU5ypho/oMQIaXSODJfhPA7Na5MFKNPrRa4dSuDlZmYhExYCbF1b0rPjc/+CdVkSdwZbup+x+CWWdqKU2Wq7ncMyyCEu01R6FtBxmLWxjI/oS/rfKXrlFA1Jjq86ZaBpOcUIx9asNS1v1yKxtFg2nT1Vk8N+rcrF6iLO2hNCJS+HFpQFlHMfC0/2l5vFYxEBD36eucaF6cPhYi5TtWelDchqZkcT8va5XpatpliZKR3H+QKZ9jBX7t2Ngwlwuvx7Ke7UPetkiLmMZGeH7P2vr47cIVILjV0diZC2tXwMjn2oEIvwlmM1ta4xu61SKDh3ObbJFcEGBKk+ReksnKPLo5JsxXOWmbpC+JGqmL4cK7hFyRtk7gnCu5P+NMMwqPoGwrx/Uu2CRmmf7623MzyaloMbJ6gXQOEK91xhcltOzfAAoRiMrAPukh0vLsKYvjgL9P0WIzEStO5fB0clEY0ao7Gt+bT1yN2rSectNGrDZUZssuFlpyJlgetxnPkEMztqYBSYmSZQEv1vRM1ghUS35StRtGgRfDaT8QZQcEZMtTHEQY68NvX8669L2Y0mJIk5cVIJ63Jsj55Z/6b3Cp3w7Tjog7RyXcHnDyymwjIVtr5HudvDSBz99C3WjjYul5TDzPX2a74OfrgwgSbTz0EpINWwcOCARF7Lv7gcFk8TMb97kEFRohGy6J/nxK/3u+GqiKP/U9q0Zz/L9784OQ0eN2XbTRuNm6bqJeWSdNDcRTuD8EpytZ1QDYHtv2cIgLqdmz4NFGLumW+QU2MEXYa0rpFprMXMeavva0ewgrUVXlVcsBdYB4VRD7nRDUBpzi3ar0sWVBueokw6nChJfsv9gmIU4AGo2x2xgWgy8Z9AnDQkc3YcUvpqpBXVppvWdmbg9Gghpg4jpi7mtVSx9ShuCCLA0zFH0olaBiUEuOsREQkWs37TDtDFS+bA6rZHoFpNz57c5+Mxdjmno04A6EKkrd757cviO7kd5HqbqQfLDjQOiyRplZJxK67Q1FwgEV+7zEw445T18ix9TX1vtZqx9kE9ommgcLAgyQ2r2bQpPLhjkL+csGCChBwf4NmLefC+QMgR42rEY9rx7ODBFCcE2FdG4F/kCY5h9keRXVfwwaBRS+PMJvo+/+/ij79ywWO8tS549HGjZOKC4xiqO5qbRlz7PKoYySVt0fLQ3DLR8BrQ58uDxk2i98VoswbtMgtNI/Mo7uPTDaQ81gPY3968zGl0TMgRLQWE46gMaF98j7UneXRdjqE0Le09EZa4dP8rkUSRtoj6hMWzZ6jGeA+tFunj4V/53rp5X1UH16DVOuAgw4p0/txbDKKFbGTwvkFeEtmn3dgYWBOlTqRpnLjNeMX3Cu0akXEYRsCe2/lSyi6jgTRGEqwE+dj1wdE76OAAaTH+mDogCVrv1FlK0585S0kRwtKTAHeAG8MkFlPK8+si0CmZ6RJ7+MBoBN58ix8jKK+Cs0E7Uzb5x7l94dLI8HvBDfq5cn8+6FDx3JBzRMM9T92ZAa8YKDoKzNnqYb5RzsIpo5wMUhgv1b0TMtG6R9Ph9PyU1vNqmsTgbAK1qeoHl3Tl7q1Pe97K6cC3bojMWuOExN7sqv6aiVMrYRe6y3jIjAm5gJAp1xWUgv3hEvXUVx1dlggyMhh9TbyFr9pQZS5RBofeQt8/Xb/tLlBRlJUvVjCPMIcXdAq7kl/GAUpK8LY7e9yDWw7QmLcg3jfCBh2pAoA6T/OafXAXEbCobJv53P7e996AnpPnwMV31Bl3NBjiI3aYmC7I35Jd9z5brsDqWQ0mk/zFZsRUK8PZ/9WhCPhyrhvxa2vajtNLzoRm0p3N1gxu1ze+AAwPz96ujtF9D2UunEZhRo6yuB0UZoaHCZRISabOxs0DAWEyZ2bI81kRxsBNc90S7C50iEyIYOPN65JGtwMnFwoQThU6yMZN0dLpXFFZ1D1SM3He5qVibpY4p8pLQUh5LsCZap3ovCnBH6PTJd6dwZ9n3pwFv7zBpM4iQHmrUOrzwJ1ycWbuQAmrrLE1w13DslVKMY8gPMsgAaROpI3MgZmYh2kF5UGDLj0+kJ+1lZoIoIlIBHaLInIbycmgKAspK8iTfa0cVz8X6msmHApZkKXLOc6xc0laK9a4bK8PejgDWOJGuX6mZ5of0B057WHSfT9qKy+Io3Nmf3SkYxAYCUIuQ61Huo6ydyk5kjXDd9PxTdSLqYrImcICuQn8nusJ7YRBYCPVyabtKUljhIUuuvDyJZwUMnLHgKY8Xu23hQJdpfTAQ1wzhnsta2eWTtCn8Ff4cTNwia+5psjHmJDtPtzznnKRJ8oVJXdU3BWQ94t8S8kJkAl0OKvyb/t8XekWz134n81tj4o6uiPStu7M3kThw0yyBPP0GOzeE+cZy0dzfuAxmcMFU27Qk70xnqGh7056eaKi5P0ZbxuYX/Z7wLWboTRAQwKhrftLx/8lNmBBK7EZfNr0cVMS+I8Fl5LDp8nqrPnlNnzZrK28i1vCub0X3diod37ksOzZ16YEdz7isNvm3r6o4A5jGrzxpPSelIrCArbv54Yhytn9J7RNjv7NuG2o04KYkuLnsnGLyNYFHEj45SaltCPszod5iUB8e4irI15fW8dNUEKlIsvIDd/dPG4GePiUxjeM5UpSaib/vNq5bYb8hPy91fs+F33KDUhnzIqnlJQYT/tmUiNwehGf7o6JDUtcoA0LWdmQhT8lfwDbvsci2OwxmRoDlC2igUTrUEElNcjkDcHiAj/fIbq+GzTGCIB6Lni/MeGH/wQyqi4U5IEcIsigaHaGDM5Tl/EiEnJalG2ePzMfiOlFVGPJxz8OXnSVAzhUQfo6vZraolRNIzc4lp8nSOAbQJB3d/OZ+ApkwU2KypSidPQos1z6mQlWwzj4muyaYMYRKv4BZgPT9i97u41zXL4PkHcOAZhJ1CAyAELtl2+DEDgES7WB6fC+EDBdbpAHcWA4F+qhHAat85ftk2LDslmAR2lQ97L6izAIAr8+r7A0jfFxPdYnnDFpv9kxitQLAvZcimVmVPwG8MaxJDm0PiaNp1/esCL4oSvjLhy64x1xGxsh0mRFQAzYD55C1gPMsqsfNRfiizU/XaWZCCu+hFNC2UfBq5Q6wKdBXBDZk4wGuiB0rnu4zIN5vCmGD3vw6glu0wqwIKymVw8QwCclBfYAeJgw4b2Q9xkdeHa5ZNmKsmO5D6q6ZgpK3AdOm++TCzYAZpEgCewof6qdlUYvLj7G71oyDNjTM//Vzd2z/3cztC9OcZI53VDGVI6Dcn23rz0hb93c95VdE9OQ3bqGgIY20yKABoxNjFhqoRt67oLuFLTMI9NgaFc+UDl9+veurEC09uR7ltGF0VPAXFGx7yjOVzzvf5k+7EC7p3n5e2BXwbEUtd+4r4NXVo2Lng1UpWjpPHexKOtfBu+9IKMjBJTQdpTSIAYbGcpiFsHVtg6EwX0FmsHDbhCQP+PavTa8FtvlBndGj6QZNdvxRe2ihqxhg91DuaAA1IA6ucOgDz6o8S9VvnJkySPuU4FWZt1oVYan8XJV57WuOSeMRFymW82WaDlePvsSOWqEPToDK758dsGWXeBlvvvK6H+/mycjD7L3cBUECDNOCsSqi8BHGMP8rf1l3fnK9+m8RH2KYuvptN/Co6jzbu5IFm/MZ1aUWsoWJB5x/2+nXaDnf2kspj5I5fHKxInTYqdcuexX8qLn7TqyOAapBqzRWSs2IH3x2NAioDMkIfdZcV8IHTFnmBcNxZe9ezC78ovlATD29clHqbzzlcsSxRQWdN6UbbFsnLlt0iNH3kf04/KQ2dXcNi//z3gISAyCPEXpLdIqJJmcjF18vu9ySOnZ37t1LXspg3jHAa8HscKnSPlybyCgKVBpKSAoKOyDAP/oCPQa6SwtgFediChfkk7cPeYzYsdKpthP4UrJUbVfeLPnShpbKFl7JPP8A9LsxPfSKFpN+PlDQfikVFqCsX3IjfEiQwbTdX/muno+v9QQCG6D5ZVM9Ju7dIQyAhF6GJpzeFzvRdQLPKD0iX9OppvDFTAW+M/oam+95PJ7Qzy59vm6iHTKh6TR/+mY/+um/KZLYhudL+4oIpNUZsYF1+Naa13ipe1t5hunOBP7m4Gzp8FjCVeu9Ew6H3Q6za92ws3J8rwmcvXFD0B6J5udu+xw7+H9/j6VXK857xTaGhpbfrdOsuDqrnecVMgAQ2CAHPaEAwKAgBJeqOsb7JBfQzMZpQlMfD+nJZ454oz3NCgJPAWPOgydvCCzUoTNqhKsBKmkegF3eoC4EWmWC4CRjM9Z2Z5fZawIiNpJfXhSPrNku/SkRCcPBs9DLfQSPEEL5hvFlWc6NcjivzhuWb7P8bocSrFpAeX3VTdKdvykC3LvkHrdiieZs0M7OyDN3A+x6QH+yyIvmyUmZbB9KmzBN9sQNOmXtv/IjN159ZAeK4DigyqB09OR9B13x+FZui870m0znSAXztddmJSXSDhraAeUUxJxCvbHZGgoCPGew8DEMj2De191AK0kl4eiL5PUBkPgBou+gFVbIwfwSR5BqYuAtEyp21q2Sz99FR00hk7E9IKAbV7Ioa4ogvmyHPcGLR0Qa/yR7vniQqB2gmcY9XKnugzM4cl9dJAcxihksRJDQ1GMS89eIgJ7n5b5UDK7uQ2rum83BjB5/+UPxhbtX6AL/GAEgM6wPJnNZVSenbj6PsGcse9myJWsDc/jlzPW/FZrCT/34Q13X4UQ5dZxFwAlK0JLvmSrWhedOJMjY+0hFyl7AUcO3R2iIjDMBx8DfLF4OAeuFMBLgg9mzsM8ogMCHsEg5vILptZ+s0BOUNfMFYA9jaAvTJj1EVjePISkw10X3WWsme9Aaq+b/J2dCALyIlGyl7n8yLz3aSG3qcw7CcEO6JrT/P1tbh2mbi0vIyD6nvruxqqBtsHJLlUV4c6U2+mmZ2/kfzSu/Lt2FtAgpp3Zqhx/Zryyhcy2tW3iO8wMps/y3bMICMQowoS+3UpGM9NjjNX6ZQgafv7AgQPF5oNYBap0090yNTXRZbuKGrjPDo6OzKxht46Yz+DdA4pPa04cW7GR1CTLE7jNQ2IncZaKEpbgD28c0fu4vW1l3P/85VopBcMx5y7XOa0JJVOYFyuZEs1NSh0DgJd4HZ0tXv67Li6RWybKazdWjN8dynl9jX58e1ClzD15nNnamPlDhTkit6xySS6CQTAGN5QGruQFDpiwzb43Fs3oOtVT/XDyDT66bIa1O8IQ77EkYzXwIoc21wnONvcLBnl0xiMs6EBFxVpinYprv1KU/all+YclvhbTV14B2A2OqO+CeQcBDE0UsVVuGAhCZZJBFsSZcWyCBqSD658G6FJIG0rJ5C44s5rF3P2q2ca4dLITMEFYvdzYdGNXRYAfkO33VWG6G5BbD/yIFlCndMBHWYfp8FTAigyvkPGv0mAO5f6M4yZfVAf9aUgC7UGNzI48brzs49BMzJwhiw8nDn78Izxz4b56sxG1M/OTzRhuQfWKlvrks/OMcc1UegJ0qwT8PA6a5Qg47hDHTeBbW/Ij16ldeBUwOW6mx2t1EJ8wVfE62uJhJXWhmFgAFD0y5hlcqpuwehSDWgkEeqSwfBk+1n306TSEAR2S1JhIAgCv7LLUZE4uvETSCv7+95Mlb36qPdgw3GUWADuw2TCXZXV2iNvTu5JEcPR4j0v7jM4l/FrAWXF1B7TN3uDYuRNDyZZvedU0K0QTUo7GU4+DgCpZaHffEXFPSl/5xSTv17L6051Wh1Wl3198K/7+5VslJx4aZBXkFLa6zcp8S9nvav3FvpRWFRvEsTpxND0wMbu8L3+4C24O/QU0xIJ5iJFrG56opQI1WB7KpZgQCgpysWKoAi3WPUT1Zi11DxF/if9i3a5ZR7f0SZaFaOfOm38BjQs7tSJQs30EYhWuMgl2/ajE0SQMh8qhKk8fuMjFzN5G23bYdOz36tDbjjHIjRZhmnQl7WPHmsB1geMSEEMKB6KG0sltKfA2kgNUtGBoKpzJvvo8tnPtwDT2pZIzuSu7hqX/zfvpvL4KmxIEmI58T8QOrVYktjpw+eWdbPEc4cjsqOvHd+xbm2nvY16wlk+DugfPx6VUUEu4JVRomKvKjNPFoeLAv5+VsBpu9yk0cAmJP3FiRedw6eZ1PSuSeVghUCVSTeat1fZhVncGFCc0NAWxl6GfpZWVxYbRYMvQ0BRLWfgw9/zuvA174tqfvwp0/BL9yrRnRYFkRRC3tQFmPFPO8zZ76TPMpHuFNjd01cHpHjb644MLna5uv9SDAf0TnXh6JjmHk4CfWJq4NYJF1mptiRSPr3YUKj31lgRNQMWvRrRTfd5K41GKDzfF1aj43WiNt8jeTigLYnP86bmgAzoMc1cRn8RDGyksarzCDTSDzH0cipEPfPVzGQ0nCP3za+3qsAqxYOMpEIayR0jBNBbVIvVM4zbvkGPdVLsGLgH+rhZn+q4j91vYDQlPWBQzrYJN7koJpgR7l45N5gNEVv32JT7LMwMvDtwX2f50XKvW7HiDcWFJEEyYCBg0g93yV/UUPYZAp+1DmSQ482jIBtxjUuntRh4aAAeg/DLZXMBrWdgoQDwRYaGYn5moP/q8IjaoXJThlQvP2HZLpFGiIugeP5O0gPJSULUeQgJXLJHiXgmqhcEkyQEJeSb/jV7SNTAN2t4ACx4H+5ZWKVuIR+OUld6AEemRqGiTExROYeAJh+pOOktveOesBL40sPZ0NGak1G94031IRpOsAkuolZQuLqi39D14RQkbhpKZ9PxKtFHUrislz/uZM/sX7PS0B9g7NR6eTbv+37phc2HF+Np2jdUcXxgbmI0HVfkUX+W3PRoXANsv31z7uu0Psu5IDjAfrqM6oG2G9LCn/9gC1Hkh7fzEQO8iHwpWDL6Y50vnrmQmrvk754NnoQuXmjv8tk51fAKta5ljsmM0QEqrxlDhIX4QtY8FpAdu4JYO+uJZzQARCCxMqC0Y3pSjNIT6R4LzutyK+D7tUSOAA4oz8PWgEv64uR3LU5NUGRS+ucDEnfXbIzp+Lb7/JDRKrYk9BTeulelz5mE5gnoBgDTOWE6ssuyl6kFgezc+JGypAEHjo8BLj84l2j8DNlucKA9qhyj+syZ4H5eZEofY7J97wPjEYH4zY3op/2Eyv1U7en5zidZ4Oo9rO8TJieVPo0x+9SBmGsSPh9EUCh6hAlWjp+yPWVg886HWcunAs2nqC8qm9D5o0hXBwTyqFk1U7USlY/4BvCe7JpS1d3uBhYKuWbkCF8xk9tODfhR+DgiDAOgLuhYrE6oKU3wdsmRr//BQbqF7X4NbGAzFmaHqjq7D77UsreVC6YN2YeAFqfmSd3bqQIckoF47BFyzPmtbig9/cVwK4HE1UTot+SmU4bG/Izw8RMLc7VzkxBZhw7hl6une1iL+ziQg2/rl0RlRxQijeqpOlBwlBORMLC5pBgS0FfqCxq5vNGk8zmkiH+k/HmsVjgfogDU9eiupnum/EjE8CFHdBxiSMuBJMCL/cMnJ8tSs3XaKbfjHr8YXU1TVUGxhtTsqNLkCccSezKBeD6cgYaSutoS+pkxjyPgCc33S17is8QsyHTn0GCiqyQgL47y3X3qXUEU2lKphwVz3rf4c66eZZSE150xLdqtOeRRFFT0/w3IDMK+gvnV68XpnbXYlYAa057ZG87a0Og3/Ip6lut1VSahdZUfHqfJ8nfEht1zYm3Z+fdkfRL9tRMdhOX2x9vgYcz/AAUF5VRdKeFpaiGshd5/WOO1NydZvXMWJ/+cpLofz5Rf/Zy7XbPAf7XXXR2fkMK8yaA3INi6aGqJQ8ty5nIO0TDyfchygNRN+D7TzAsENH7R6MJH6cmBehiXQOcx9ZDT7xuJtDfYAcCS87/7krnigceY345E5ZX16OjrQBxWAdm5NwJZRwbtTXGjYkYVJsqaBkLjU8UUfDdHDKoeBTVCqcu2GfCApmVUQYM8E0sAxDW4/u1V8drTrtzLPeRnCAlyPVo6Hl9UTaD0tAXyQiHhjVoWMAg4S9cvrGasZXFT/SI++xLOBixQadcEKWDRWeZA4YTTpKsFUlIucAaLmwpp6LewZqpv07+FPrYF845d7VJxmlyX2aYa/OOepfD6LETq8varqT8/pK1WjE4VQmheXhA7D8z2RhomeYpbTr8THY3rL1I/VE1mmHa3C3RqXo6kil0PcvBJsEiAMG/elZNcv1hOgcoOyss4t68KZmvbSw24pgkQb8zG0e+y7dwcgp0+INlPtPFiwbxNshzx0P1IqJuy2tU8O6pixQz2hXfoqPSwAeAmmwx1wiYBRIIp6WuzMzhSG0UZgxSl+ZthRQ3CTRgRMj5u2U8LbfC67jCnCEjzcGA788LVBQ+fmsUPUaY044B/3wU0sdGtO5fNrwouHvgnqn2ubHfjgU+PybHnprrOZIKdzv84hQtND9M53r+/+/aAbn3hVmQvMJhXkA9XyEBqjxeRguko9qMlqZRuYOcazKPR9L0uUHjB8wR/K0+Jv8K4s3ZCfzK3HFBfCl9p8N+vV5Y1c6HWwYMSE3Tq1R6FMpuIYwLXj3ZQHc2qmcpCOhZ8DneAud7/7S4DZUi4/XwBUXyRJlQlY47b+ZOLFMH6SRkBa2HSYVjpPzKTaMz1/azjBGm+ODjIa3FN/zgwcCNnYeebU+g1VPD+45WAxt2bPFQZ9WC2AJ5PnHQ+nMROZBTH1OQd/dbaAR2ZRnUuUoyXlnbMDMe7hbeWzWHJaPe1hY1fcQPqa30kUY5ZU1r2ZV58RPb5q1uKmMZnjtH3jO4arvhkzSRN+rNQCofRhpdu/oO/eMmVXX8zwHL9YKIc7XBpmfu0nzJuVQD2DNQW/OON0zT8TonVS6uKuWB+QWe3LbgufeuWayGP6j4FlYC8GLpvRlwYt7SaLmcREEOdvhNPhXEqTlAjJRpfZK5cdyUs0lAWSjYeAMYJhtD84mPNzV9WIlnX3h6+t0iW/PSUSpxVZZKL5SseULdMExZs/nnu/+hpQfIm7LQG8cgVcPZys4cxjzI+C/pQ/rKHASvj09mMX+LlrW9B0PlhWzx6o+sBSDv3hLqS2g968m+Boidgibh3V1y44XLrvQX0WHLg2MOzSW+cQBXCyM23cXP1Aeonl0qj75q5LMB7fmTb6+kldjInR4Ja98P2m3/6xOR2oXrUWEBrF551gAGqlY/Xou+1s+0H2Uj6WXyVfCTnlkczKeNKHUYXGwSg0tGsjxY52Ed/RUApjEpBl/JAHtCvbAsejKxRBu30a9E3CtLqSnfmrgXnTW1bYKszLHhlE2ql1N9OcfC/Qy7Lfp0I5I4GdhpO1C8LP3x0ZWFkYvCK4peLrALEB8ogCl4gY3dqyKGNgb1aVF1+iJm+AoyoT4HY8OBHRzcrZWY8AwtD9NCn/NZNfd5ecR3N5g7InuBCTKEY5DH/UI+kYmbBA5mdXhtdPnJccXAJWxHsm+lELwIShemr4Du0bCwv4ZnaQOzt2reNxTTvnVaYA7KPDp3cLit2f608pqobHnToM73gSEbz6RcPblqtDk+FS71WfopcN47SLK0+j0S8+lF8cyk0slf34BqAbcGpaT2cqw7ASou1yBCh2VeoAe/1uhfBzXZhliQCEO0ABpWQxc0w3Hr3vjUOa5CtkY8MxDWOIWpai1gNQEuSf7SLVJ7q9CsHRbYNeuzH7f7xTkcm6eNuxU8zAM7e3fMXSgSqX+HyntAq+lG/1QbKyTaHC4CdKLFABUmn6ljwDPEsA+830nYWX7qdqwo0rpp98Ks+G7QE2jXvhS/cRnXz+w16km6IC4xheeunHdekiya0qMBRIpXauzeWPVcmIgcidGFgsxOj5dO6On9w8T+7nEcn6nKLyXdp4BRVVbTi/qvLfTJE5Uu+syE5RPz9pZ41n1Z48M5ebfWVerDfwni8dwl+mFYpbKSgl3GUsHb+bopjxZUK3ZyefYwKS75YKOQfNMz8rYcBGYkmxEawWGz0qKCBpQmQCLSoj61hqWDyAURgHD++xPIqxmaOibBuqDpB31HIjr1g2eRFMPArYaehVW3Ea4hpeY/GeSvRjzra7Ps85XGtY3rCFejEQ+c9BzyHBthom4zpdMJOzMFgNI0x/XQCUxIHzITG1QRRB72kEfr5CJV1UGrqSysVaW9qrBAJFAk+Ws9Qlx0vDI7PoFO3VBKGVxjYBTJ+ih6B9xuqMzUE52RFkLa1NAHlOJairEl5IcTueg0tcX2hP/MEfNuKKL0XpD0L+nnXGVQATUGnsAnqb+f/+TaMF1oW4FzNuZ3qSr8LHdcah9P0C1vgcJliXmSDbPdn9E0vHLGAlbGJ9ub9A539dJEh7lRfkebxSi/TuzU0FlkzbVg5CFIhatjJttOXUBp3vATqt2tXoxUWnBexRQ4YheL6qI6Fx2Zfa+agh4OkaBolVw5j1y9Fme2EpYKId8iYw7yaL64ycS2MsLONtqM4PSNpGp5/FASrdt0PgImPS4HgaEyzk1YKJzAivmsNLmZ2neMJTID8mHaiXF/u87Xib47nvIy+suFIVndJxc+vsxMOUXDD7kOtCLaPtaObP4Zsm+Y6CyqmBGeZ2cnEax6ICdcn/zILuxmXT66BAwFyiMU5GVpWol0DvIwWMGQCXbQgLcXD9UhuWm3+R2ehzXFE4AkYRwvRGfqzOm0oDW4DsmtTQ29brhwnKyrqBITvc4p2cdPgIKHkpr8FoYk5VNcdQoN2SEF9KAVx6h9Z51b5s+75mflxif9wpnXVz3LDRLh8r6wMoXrW/2VK9h73ZMcTbI0tgC7fSWUcHZcGZfj6C8O7Bsz1K9oEtaJ5UCwTS3pzhWpj4rBa3gIQfjDGvh8cqbzuCFyNUqE+B10VWzBwM3V5ffzvrV9I9nraWAlRJQEcB1TyrMKQ9I8klWnpGYjSdu9W/epbUhlIVQJkFeTruc+ZuyKNRprTg7OQar/TwTrceenh3RnRnCziCklVdaPF3w7mldOjtr8kRrPE4GoK+CQ+d1RxUnKwGx0OfaI/a/LYBKvqQv+YERlhPZQbrYKG//QOrOVh86yIlQH9tjzNuomusd9YQwa+JyyczWa/G3FwCGCzca5rwoFeuq7br6QKfWbpW3yUpxkq3pAhr2WUpNsxg4n4tUGegkAJ+G7jT3JrAd4xH09/savl+4+r4z3/tTIcQGsNW0JjMvfKGbFCMGQOsPQimuyZlmQyInOq6vezOfVMEN4cRUMWpBhfVCFb5acDsKvAjFHh7u+HS6o3AuNLPVmI7MUC3MrQC01ZJ4Bvq5YD39p2GXktb7ah4pIW35fCle+n6kpFhKfYG+Rj6pXzN5T0aEDdRAGC5WB/++2YcRkpWshRf1ZBPBTV5uPf7CDqG5gaEze1M0N6Dn92IuwxWcwQ0JxPz+8RVBo67ATVM9GPACKTWRPp7fir7Rucnfjyu7BlYHILCgHCz8k35U9rV/w1wkqSOLzu7+Z3qR8HwGzs8SrB+5REvNuZt69bbLUWLEv4xriH3gXPIo4Hkzv1GV+KtKOFcqVrvBghkGIMw6AzVJdcn/Kmk5qLDcVzPEQnwG4EGZT40zMwJpdyqPcHZzz/PXfPYmLMpoZKsBNP1JaycppgEP7PVLA/6o6VSbE5YAMvpV4KWUbO9Y91cwAIgC6lN6k6rMobPzn1bmXV/lq+gLYuCNMwi+jdGZ5TqYSgALS8ydRRFOhHSIbdwQkEY8jIbTvUYZZ6S7pg3fEE/2SEvu6r75iP5eji9e3ZyollK0CDBiUkmp+iO//blaQuAtjJGY+KJX8UG68WL8j2E28pKRf5QQyktQdjlQX7uise838AljISn2+LtBzYF8y7sWIOYo6dmjBK5KFM6Nd5Jwa+hSE29aFvs5qBxVQUhEtoT+RwNMJ72puHGl15GMC62LAxpnlLOeT4oj6wy0tk1mHT4COvNkpKrAb8crmCM5HLZc8Akplt/WuDUPVF3q8FBAjYG0IrzxYTdLkpue2CjHEYDHuuBnkPvK4pMFKY+8Pn7TsOz0SlH2yLIaDWaC3WrtqmSZKmPc938E1gDX39Nk/KuR97ZOcPvwNay3yuvMr8w0fEmUcb15oVaKGv42yvJid9evX5171nZ97p5EAeqKb4nEf86oq1dBQ8BJDPEokS2J14kMoKjjcIN8utXMYpTWKmAwF4uKAGdEHkKGYdhTs6D3DQBN/GWytzIdKcREYBnMsKVJ5bbIuYsBFrOu6NTeYGjFj9YAp6LF+xhkil6f+PIvsEjTLHM8MJsj9Ll3aj356ut4D+z7e6hBWNtUav+BluoeCuqr6NxWTr/q2fyEsm0xMfnwUoK+VjRwp8CuPeXcpnPzm5+6Acg0mQGYQ5rz8KSolYkEI/1oYbI0GNswdib5Q6j6lB6txO8DqwcGBZ+KLu4FBDMEaawNBx2L7+4P/U2a+ZmFEzkomMp28WiY0w0iiKlDBMi3stE9vVIMXAM9NLvtsV5c+GcqikOVxq7lkDFOxmunSTGTOYKafg1nyK8Xz7k/vwJy+csz+eyTzBx9wBK9mUG4Vdiv4012TYP0GW8WeinJ8uAVAcw+TUlc2OnmY6CQ6HKA1SOjjUpx5Xvzc44naGKSqLqDW+dZRqEhaH+FrLkaONNo6uiSV7q1wHL6Zf7cQ6KaWl7p4O7skn2GALeCL6SOaE0RQUBmkHue9Uy+rY2Jk1xdBNdHB3yWwhAqkA2ITiw/M2bQlCpaIJ3NAoeq8P/N2p5WRrQDA4cW8ZZjjkro/Hh76MuIqqpDJmCCAKDmpUCgJypc4MZ4DtwJW/hjqUvMCnMxmEBU2VwjWqjbtDenAlDA9tYGBr/BPKGCZ0+FIvve8OkwKM2adwoywKpB/fvbfaWBAa1b9/xNpntPx914TwzQmbQRLXyMNPhHQ46kPOVguswCtcz4juDMiOer0CgTI1C7N/pii1ikNwnJRgyAoT0DAjoKiPd137EDOkQeH/Hs3omk2po5nX5OOMGn0LkvJgfCilXE6k+5v9a2wFNPuieezrUtH5Dkgs1qg1cB4DOQsaMLiyfNJeujhd26Wvww1MqD8v17TzWjlxPvjlZnOSlM4UzE622TCVO++fsX4s1J5obm7UzH/zmeFQbHWxADn8KHbLFiX9llgLS/akp75slzMUcsJ46N1OzZKnnCy0mDPzKDc4tK03IHGKQzZ0rh+hQl7ysIkh1Kp36xA2IGmoF58VWlbbXKav6x/Qw6NzTPPRZMP8/Cam8R5z7w5PCoP5+jD4i5PxBMl6Gn8c53EGCAKxK6MSSc+b1pcg3VUgkTKESL6ANAaahut9bHaciVnKvkswo8j0bXL4D+BlhqnkkHJnqcKRbjazFFO7kBBNGe0xfv8+R45aijwaY82jl5zdkMLH08PQG7QH+emCGjAg08mAGNFQzlPhqSxWG6NzYWrnCAQY1B6owANeVMazwihVOMEsEDg9svi2qlia31KQp+MKoqXFjvvwWXQVl4ONKpoJpE+cmA2/XH7n0W/5Jzt6ZD1+mbBwP23+cFC3m0OPNoxlSgtH4FMbIOxzfaT/KP2Y12lBKKNG4HcP9Rtt+d74GnF+6QSCuGaMOPBqgaoXgcdvhrJsqDMyCqLp9jo8UVioWCiIBJfAzpEsPigO1CzQOz3RYgF6nuvWIz/06E0YBho7KA7ml9mUh6MR29ippgiplKcN9lo9OCdWH/X2Qm0whcS7iIwgq1jAqUbyI7kWUfGCAPY2grthBJzADQePk8ADwP1OoshAzXvlftIzJYlkYbhhmgVgmkRi1q+0ol6yS6P9t5KpVEF4Pnoc4grbTDSutLDF9ERMtQGmyFfsA7Z5mf68LyEcYh0HoRehcMjGQzc2x/UdnVI3x8X5YWLZexlOxks8jIAFdUHo+fjfc0APwxGTrnuXO5YzLGGo9sbOvmxbTQoguplp5CEWlnHhGS++7wCby2JWC3x+ocHTIFYzLP0CgltNGkUuDXMD9AXiNeeZ97XGAYeuEF1Smqn6qaFlHoHIujs35oVwIDNYJRvLlwmnumrfpNeGCSxfItn9CWf8dtSqHNcaPu96SSB0btCZIlPgGWe8Scut0KNd1gVqYqWkyuq/QHbsLuZRfBJx+8mIPV52ueOeBFQxTHLCC9ycmQap3yFJBVd9MAXszWxpWTTXNqjYBuKoszuu+h0bLnSNuhjhUImGCHf9/CPkHJV/GHAugszIEhiCSt4dbVNMGzCRlslJ+qj3JYUCHG70Y+Q1SpniOTNhNkXmbWlWeJk+s6iIwTMsE13B3Z7a4mEWuxFdQYu3XQvrBKGZkUVQNby55gxDzwKqJTRrXnyuxtpjmtDG+iEEQpTM3oHhDufzWoIaroQqHBBSnjBgLwchPxZ2APaVlrFQ2uWW2dFelzxGC9ngDh/h9bk3pmDTjXC0XwOLZjI+ZaYOvSbAOJIsZpyg6GIyFoBKpXBfC+RjMq+DDhyHUU0wjVThkPdQ/+MsvQyL8Rle2zBKvTGIGKSZhLv2vsxuq4luRh51WZXtE/6BHmwWjc4Mz/OQCuAmEATkRHwhyKUbHlSaCH0P1HRl/O8OLkF0IZMQhdDpTFEHWJiWASRIJj6GU20GKElzGOX8RHoChElwpSgCkDUoM8N6+Eig2FxVhvlA5rKLXUaGjIK65+JiBqA2aYnIcnpHhYjYYip2kjWByRc/M3PJ3+yAoAINoCIBMH6vLyMgykcQaggQPaBLvmRYxuEx/N67vaPpYRMBonn/P3ImyWPARs/yJVgaCKNQNQzDoIO70mpmgdvKttSQBMFxYBHLq8ykExS7Cous/78BRzH1FWerrSZNOi2EUksZzqVyVEsyBuNj0KizgSgCWrOz2f5/lCICh0mfKmQvSGciv1bTzzpeZyTSmU1lAFzBTtHvU4J5niRZs2nnMORPUJQIEAaojMfg/Zf757oOD4jYK95w/CINLV9B821b/43t+msVSvsH5E2Gj7ZdviKlgZh6SjrIwBhUF0EFF7q7pIQikhV4HK59yqMdNKp15oW6l1MMzZ1bpMpLQZp/IZsJcDxACm7lgE9MU4+4BCRh2UubyVCpIgc//DnDeF+INs4C7WHUDNxfvzqPMgIFv/7xOCmrUPef85rKbzX1qjmBonDQGeGMJ4jkg39Ex+3Bx9kRG2F5v5E+PyqArA/VVOxIQWLxZ/M90W3c2sj1zjsU3Gy7kmgHerOtxJqHmJGtpwyrbWNrkNFHMqi4G79lP3dFzW8Y9DrDlsxrtVWsuGBo//ONZkhOf4Om+WjCEmsEvVpe2ibXJlA7WFb66sRCCbgYLghPyNseHXnmTn+mP+w3zlmLc4PO69FUg4JYxXEssF5JPm6zE9gerdqXzGSUBpePXk4SI2eHGnUwkZjGcMybW3Yht97hkwxFwxjqBptkdO8we8AQ/Y9hiCWmpD5awIZxbdXAiL+U1r1oxQ2Y6r7MUx1rOcPDjyLvDP5q9JhFvCL2LN7sf4LzPRvos2/UuKo5ssNslKzWpY0X0yw2yksnmXHKySc1E78LyfmDz4MFhDHLLztvYISCY2F3VL+mYy0B+wZQLzJn77q/VQNbOnOwQU2nyyFT/wrDZ1DQwG4Z2dMG8n/AnCu3bQRakHPe4Xwuywd9Ogs44vgOnbOKPPTjXbc2r807Mdf/VaXwUOQI0VtzY7YyAbZS+V64pf93z0iUD4ozn75jUfS//WTENhLmLGMDT43+rVw9VynkXtca8vh46YzPrdmXGkTcPIA0YD7TOSPS8+NlYijzqEVfMyowNNpTWojVZXkl2STN1vHt0Vihzyd6ISKAgEYC+D5txJdn92PhUNgUZVkZMGGnn3XRBdQ/BpkUSwnxR2G46nH9ImoGH14bMm5suNAJXpBimzmKyslicA42CUrOKoqN/1GpfJZoNbU9xSQIYzlpxDY3iTBEiu0exRbqmbfZJxqRO5fxQlgg6aCGvxzh4jLMUwmqcq6g4baZ+luKGotUrns+KDoQbMWd/0sarOSiSCqNcFHUilYxu3QZXXsk9UnKQChOP5JB2tcdYWKMXwDgSbCo3NOobIdrMy2wyiz7A7VFVwKAvCKOXEMUeeAfso4n42diaocXkITib8eaQSjpCBhWAFE9TpqVgTjxKHyJmhqx2o1fxBeZODtiAN4DKL/ykURkYhQpcWou1fbi2IZ5ykIdDzwQY9q8DvAQsxQTMUUFTg5C5J0inzJIi8Pn2KuXt8sD66v0MSLJ+p57OyPZLgFMFPes+0hpZ2vPbO1F+F7HzBfOFb6NYgKdgy2qFXehM0DqF2TXouoqZI5ro4DqlryqJXjP26sqyLTgfB1Qn5kKHsLsQk7jDCS8R2Y1sE8BmyY56pot2IMZC5amB/IdLkd2kG+yQbjiOla2AdSEw8V++Ozs9I0Wb+wA7Mu562TdHqmJncoJhB7/5vmFW0bBQ5vQnmJdgHlUwjr+c6A5oDCpXhwrFGIUWzh+vfKg3BuBrGZSa5dxxkuH0ckeooyCI38tg421aE4wLOAbmMggidp1NFRW7rWA6MbTEXjrndEAipkkPq55JkaSia0DPRg6b+wWgzsXBCnBByk6CBBJNwMHC+Ywc3I5LvvLdWQF7SEN4/7DXEZCYvvfFVPF/Za5RApjKdsXypb7sud28zjtxPnMOH6IjekoYHkGp4bIw6okXzgTmJ4Kx54ePKjgziJmlfIoK6IbmS/vH/R0oEDrPpM8n2lGMYxMRrAIWUUqjwCv2p5zweDhLc/A1rX5WF22ozP0EwBw3kJtYxrhgoN6l8oN6yFReoy9Frzr+0IA0s6g9jkwMXhUo+tOqOtKMn/eF4+3DuDD7m0stx/k97twjXT02B/8G6DaPTqa5pAn7ii7ITBsaLHC7QRnmRX0EOmGfsKXu+/BxhSmmVTnxz9MW/q9dOg6nTPS6Pjwly+jgqM2vil5mvbn0tfjJtjK/SvZkRnC0y0Pm2xdnj2c+ngG7eIIO7J2DAiJZKMZ1fg/PH4vJFxgMC7dJz5/XLqdUR1dm3flTVYUJ0n0SO3TjCofJcGV4cg4d0OFUkApjD3Y0ncr/2A4NojSUbe7xdMeBua+ZHTNWn+YFQk6xf7h6xSbnGvXnbv9ntvj2oRqoAIStYP3UMCN1gtUjzXiDuT03n5KBMeofhx5OPvfvrtBjf6tdFIlSablbI6/Sv3O+9tl5gRGCx4RIHaSBbuR5Siv4cuCONZMNuxVEnE9R1khV6V76rTlurhR/q1clUcDmmKhwFcdcR4wJSmBxnMDzuVHbpjOstg0vPegJFHG6GrM51IenHOA1NCT65K10SvT2BcMT7epMcYqpqcqHlige2kDCVAqUB/cmqAzEnxpFLp8xK7XlmXzexdTooTe4/oPms/tTyf2tCi6HaAHKZ4gLfmMk8eE02/1TtAhmxoYOW664dxVCh+DwnAkGwNHpAMhtYACyhqzPZ8JpUlpVoSWoBGwhry0NWDqtMTMsPlVk8BqbCTnVxWfEB0feXN0zW5syQhx12yMeS90yf6Q2F3cI1WnDhwOjAhxmRNOuA5ca9dlSRDCvr2s4JwXgSD/XGI4h83FCQHcSEeMbDKGXGfyCrrKeFZPy35Tlg9uB+c3VIR2W7FRoqFSQt1VZwIguUL0aeXxTk5KUL4KMFJiQByjBDdZ0SC7R04sm128zFx+kQDBsCc79fffgeS7sDuFRpx9hWmdSIgjhuOe4nut68ulQsZpP6nbcU+TehHB4CHCvv+qoR4kWwmln3zG2A9Yw47oW8VCdSY15z8pJ7gbBtC1Txs8XySxF4jTRqbe65CrVh2Zo1Q7/Ya3q+uzEOH/QMmjPRyPvQ0pFWFl6k9ICp17/Zvxlixjed6ZxvFXsWigA/owGoMK+pR4P5K/Ob4pUrdQXjuFjkAesBhVyiGsw57Vb72ePCWxbp1DldIxjeaFJCjA7jztZ/dfDk94WnlrLNLPqOhn+eAovK0KayHf3uBdZOpS9KHPetCXVZvbD+7zXpV7N/PxYvA34mVs9IiV6EpairWDSY3HLGnWBEgxwpPMW62InMMl150aI7s7AxOQRSeG8YYFRMENdmmVrOJ7m9BOxLbbNKvjg+Bp38rr1nFhIn+SxzVvq0LbWja2Q6WhpGc7xa4CaGQWvskWCjYSkPF+wvvIbf62o9qsqmeWxaQ9yFiIy7uonzI+ksRcm/kX152SF8+AtYtSjXX8kfc6ZYTM0dqHEzMSaNJ8hv7mY1R+D7PNbW1Ntm1mXWFiQexcNWnTGfhNDx+bhX47C1y9zKraxKZTcvEvt35qorK0TzBtYT7/n4l4PfDgfQcHLK6gOtscnAWx07Wbt7qY1o0I/CHhMqJgu0lUj1gTZLFE5htFw1xdlcnGkA5AyKoUrpAFrDUyvAi/FOnFEDQhlIhtAYOl0yDphklS4PRhxT6dZZI0Ro0uK9KJRmizJcL/yk3Pdqmb1UcvJjO0TnNW8mr2nYcp9ekZvrYkFgIAFJJM7ElRGcELO2VviQCs3p1387+RlyDRY5tzYUVbIB3pH49aYYw8CRseKhZMDJ9JNWPF4HRMedL0JkOmgfEBF3Jg0KcR3+plJfv/66+EcsnFzlNCydkHqUIHPz5l6dRWxKy9XHlT40zZ19FXe34SeBFmY74TnPQR3TsEPIDx6h8OB8VBEBy1XUHxUY/SgXjHoRMHt+XjFSc68pMBb3+WAGoGU86mK4dEGp2ALW9T9k8ctMugo+LmDv30/6Qx8dlseEeepXkQGzuqVmdO9d9NiI2/BmwEXH0jtPbOt28KmmmK/fufx0i2x7Jzs3XQuxxmqjgdsx+KfmlDeOrYkPYErezI3/MpugeUrN5EhnLgL2QfJ9Xe8JswTM1gT410pTtKJ5xWvGZS5e48vygcgTjXO/PNYV+hqADoH3dNyK5torMWlxoxj0gXLHvqYazqsmoNPotOPT5YHcshHexBFU9FLv9vGe0VsjYy4ZyzhIZVS3roIhpUHK2v3r5JhrfoeGhMfz1uNG1JC/T0TzJcfCwIYpA9IBu5GVMtAMnhF8NkJ+sbLvT0LH2ywQFRdoNshPTggsY8TBTa0oOh2CefuMG1gJlXYEBFz8KlH8pfjlQbfl+fXCoYlfS0LPXfPK1CHVud7umt5wZCZrARGu4bbvgH54pHphojSdCc3JMc6/2JknIoLJyVbBpWDH2jsWxhnOhvNtCJwEYq8N2LHzSyImQHTZtAoWo8k6Oh/mvgrJbmUtEcZgCavJ+qHSUGZCckVt+DZw9sXO9OVffrAXf38eZjg+t0Jbvq+aWMjCnwj1nzz2vXY6v5bIYsZ2m1DIByk0PxMfNmDxsCKgXR2nfSycJaEKKmT9PY5YjLdHHApsGyWIQql1VYbWw6X/fpGbzOXANlZQ762CgVnSVdTHV/+6UuYZo8o112Vxgw/dwLdD0Nld4vmrYuksxcAGyl4Ilccclr3bYao9ElPPEaBjiF8mGzFphwf5jaPQg2FouVuZEN61CnHOYvmjq2wYO6cRRxfofwMh9/EZ2F6N5SixCYo2auoPtQ9WiDFKa5qM42dYQ74WEnnLivlqcmxDSG2uoWKgZEUOKEaNrc1lgEUK6VEGoFlIvApUM5QUJkn7UDVkoSbToy3gC12RLJAjgWMTueU3lo7T5DzjGtjiCauRvZDcsNd7wnzxXTWxC1OHh7kFdudBxxT2i87UEJuL7tqrR2//Bz1tOtV6ADYs/3eyb+vKCv5EeubD89ULfs45fZYUt0YY5/vPPt1bm75usAXIJFTYTF00VcdWlQtO4s25lZ0/VX4pdUIjEVwbSzyB/3clsLLrNXDhRcIJrmoystc9dN8bRnQoy7F9s9fsKGMCci4gWYmUgyJTTb/DMKH//u7zz8fzk/MnBFRVj3IVDLxeRMfLbgWDONJYf6ikdQ0j8k/Ai9XqgFv3hwpPcNmvsLf3IIBLrda12+ZtBKz8OSEu9f72c7+l5sO83yCxVXKWFBwCfRzE59X7kCRdFF2DZqKmsKHf2HXRPzdbe3uoF0sZQatgCqnMCnu7vCcBrDmWpLYl9IHU1JYXrpBNxkDOAliq0QvdbL31mh7XxhJXeMueEnKMv4dx9ILRPGW66LaeJ2DmfP9CXoLgsv+Gz5vXx6NXMALajP4QaeMSWu4Pa8v3gzAvkrWm8fHLLt7g8a+eT2pYu4VjHnQ53lF+V3W26Ciqs6xqd7fP1mzVp9tG7KfaEgT7T/l9cc9FCFiH79RVZaSHJCCoJiUThtawgJ+8a+inIvluvF+XHnYRQWvoZvQAo/oPd28rb9u8W2LOwXSEXCyCVqxdjR+FHu7RKvCCN6/Yp8ZXzGHEQIf7LrdweUyE4fzupRW2zQgqQVn5LGZ/cPk9cwxCywzNE/aNt+bVLMXp2OjMYeP5V4KMHr0kMA/Z5//cLrxIflVw/tCwf5354+k0hBOcrhUmzo3XEJZ9j6Xc8H/jXMA9Crifakatr0IHoBza+1shssm4OSvNxZCzn6Q6jwkkAGu688fEbfRVKz2NSEvP87TvXLSMyOED4lkb4ObXl0jaHSspdEZnlwU5tu5km3Pofs353A7uUXlEV8kCBc+qt4wdQhEYTE4zNBdW34tbili/jjVlhoNLPld5Ale2s4aNLsRBGA1VjFYSmZ6f9XiNtBjTFWenNfeVls2ITPdniWls2CIlZs1OSH0zB/GKXeHasljfyA6pauhm5/915r4mqBVAubaPaVrV7eiynGBSaUuq8tTK7HR7EzA9qf5kR7hzGNL7PGk27FTgkcr+ZnPoCQ6PmEnsheSx90O65snorP6w4+TJM1q1KPgjp/4cjUXU1W3cy6Txee5p9kMjUV8oqWYAT0++giP/965zt1ZVlr6vlO3e/9lUzxKc+63RTXRiL/mIrNy+YwAgWEnC+wMy4uOU2rG6+EymmBgikhML8zmeBcd7eQBZM83mz/rYDhFA5UQm4ailBJTCUUuBGaJL4yeo8JBK0TT1Ty6htETcRV4Kf4SyEcCZgUgJqUJ4SB9uLhSkrKoHdqNZrBikF0E+BOl1DfXUxRICo5ijE4VDmZDNE07+gllJOPatx1wfYDIgp06iPGqeISLzsMlNa7pq8bAJ+ek7hF0t1ze19yyxdGl06vktJVT2k8OfWlki06ziOS6bD5kJI7x8z2z65AkpsuMCXr6qVXr8eU/WkjpK5KT1Vks6TXr4Zy1wPuBuBSb4w942upT7ZudsH2RkgHvuQ+Mz8msUr0C3y9QGPf8mfa7knNzzi7xYNh++90jNrbkHkjMauYgQAHhG04NSgvOR49lGgsHAJ6gt07ERkUaE791yHpYkBYP8yM58hWTBCVtwnW7nglrBk2FzH6LVIDeguUzXbas3dfJIDfwNiu4ZsPzCTwxYneYwIsj65kosFs92lo+iWrbTDnMfqMURc/AcDdj2tp9nXRygZwOFwh/tbSiugFWD+iMvG0iDuaCaTN5U4Xn/rBP8KL7y0uzkLiHT/nkSjTsOycF1645ZgncqQbdc6ta+3X7/cFls8HBWD9fEiJmvlTWefi+7yblDQ+J5RVEmjv7oH+cEBeRgQOGAZNBe+yPDqmBncJRWRGLUBUyzIRLuHjTvV7RZGC8I5PGBjpkCG7facclQrCLY0SpX7gYBPIAkMqJmPkYomVpwO17t4MkeIk6RB0/9UJqAUy8J5bsqj/TVahjIVaMnyG62QwibPhJTR9k0v+s4It2y+kGiplmaDwRGABlIau+FISv5bwIKTSYYmOuSzf0bCFn/PIA+LYVpZQEl1BkqA1HUEaiCoOsMC0458k1jN4WjNqYCM8eMq4w3hWbgIlrXPSDbdCex60cDWlR5h0EL4FLcBfEjMEYzYOLgVaIokrYvhujn3RHzHSYC6nBWNkVAmnFBGUiybTh0Jy1v3nAAP+e76gcx95kaZQj5cCTPU0M6VgrgK8ZZhesiTmnYwkG2UTCiDTusT/NBvTi4oZyHLs665XCPm+FiM78+UpT1mgm4jXPsIUE9FSbp3T6ccx6hEEfzHY64wCuTpvt0Q8Kno9FM5M4JWkcKAezv78POf0U7/7HIOQX44jDdWX69noWkx7zHV4wXl0Bg+joc6NNsvrqH3BvyHILV8SRN0zgFpuFfb2P+VVtQXmMaqMYxm5C8nrpYN/eGgY5OGlFYSpeu2YxvDBxr00QzZHNniygfurcfVNUOzEjlzlocsGxWxDSwxxYu7+TQW6UlSXw61Z/3GcUZsXQxUtaedSdIxeFPl3wvIGQXGex0ssLJdnzDcZXP7Y019W5uEAvAXECZPocwZcxvixX7dUK+8MWc5QLSc6IzrGKBU3aIiXYSQ+8MfrrP6+A3mHyIb72L/PQvNyb3ujFnsrPLN7PWzGg2+l5Wqv6HhcJkYIIKNUpwSqI2xoH+P8ypY/K5t27mcJx3ThfGa++QCIhXiDMYehgMB6CsecbtSXZkLQbbtINhHA/cVy72jipOryqdyc/s1qZTc/WC9+jp2F5Ca1t7t4cOjmffFTAjucjmwNvjc08KV7KloTGinkHbn9xnD0z0aXwFmJjU+s3IAdAOPRPbfuCaCprKn9Kvo80K9OXMEHdScEY/VzUZa4JZ5C8hjOgbUi48hEjPOlvJ4Qd4xLALZDRS+lpLsMVv09D9lAkDaJ71dT83Roo3bBnKNxzkZoYq7/8WSNtgq8VNomPhFA9rEd5QoC0KIL3wxiohajQ16AWFJ/rAo57ZA/g62P+BLKsKolgJR3GEEInHlLBRpFJuHYk3Q6cOkPFm9asunMn2N/v/P2Pbs9L+3ZW/gXmC07d7wNfvp0RG3q2sqEsSauZ9fe7mYVM4E2GwI9rWeW6CWDLGBLjz8NdEh7sAp5xzv3GEnztbaTwnoceGKcvMwt5NIQGwm7l5Ub1iWce77k74r0xs9tQSr253isuzDTHyFVhlYKpwTXv91AYesxvEeZED2dBFoUFZuFcbU1atHgktOeO3AybFKaRCKYv12NCTF8JByAI5QwXB0MhGpdaMQeltInBGdUzQDYsV8vhIBGXCWtRjkW6pCkHCqHYTKHbdq8lRTLfSJduPVlCezL1r1YrU7yS6xbOJkqHDhWfFcD1l3f+2FhaysCKvDVJJvvREYf7DFARx8nH2fsvdqz/ooAPhOUi3PzUzC3kUaD2vHRGOXXkvIkvpdM8js9LmTBWwBJNunS/sxp4vHarZdr25H7BkRKo9yExOIs4uQuh36Xxg+ZLAF25B0H5pGR/pEXEc/ZzFWOSV3ozBFMeAgoQZBP8szPkh2FWYAYqRAcojbzXPJVFTjiQVTzV+kqaSI1k4xUUHbvAhEC6UyVib+gZS2TJ0e695d+DmjxuJcAAyjvihsIIxtg6bDgDRmDcilYjJiNOASmsXuaKQByzkGyTBQkUnLcWyeYSo1j8d3wVcDCybBPIOmqfwZPty+iEw/eZprp8yxa4T7vLyhOR8oZ+nj0krHr2NUF1mymb0WaUINhpSN71feHafR00ckGtDmFhWDENr8oHMZT4VD6lLlVL1jDAQyAtQ8J+HRccMhIaJUDKKG00w8WyP1M51IaX5VjdB3QOQQbs5wskcRzZ3mniirrEiTsSX6x3GTZoKiQ6rXIJdhuSz3Fbs/5APovcBIM+ZAT8Vc3a099VUXBvvaxs2uQAz9mpkZuWjk1VIvptE1yKm/nOJrg1Drb0Bz0yqh2/G3wX7q/ImFqChu5wTOiCW8DDK0Y/lXTEJpYfEv7hKuV/mEEo43w+qCdcniGHSz7s+dn+ALRN/6hf53ZhUkir2bBel92Kc3P6T5o9gJqzxz4J+IdpWzJqFWmn/3b6vOKWGldJYvdcA+sKGlxVInu+d+ZAgve+xqKwC3uTjY0oNseyhTP61ydZZ0liPbXxId4GsR1ibqVRaH+pWsTySDolikIH7YJAT3paSOPtzS7zrokkJ/xSQuNL4OLa7DQMRnnIcEmRy4lDtHPq8Z8FYMYaJbGCwGEs6rXdRymHmO2hqwja+mPeyML5DOzW852jN+t8xpVCcCPUUj9ZeH74yfr7dAVdxCm34YYo3k8RpY2/ffMBq6kbuCLXnF4OtfiAq45i0j9isZn6wN7ueh13lRck6iJnIQsE584DG3fSdzZ2Qye4lF/4MA0D2zuswiSXVUH/qjHnAbO22bDy6kpbCZv/cXSNKiNwfOXyJgRFmuWiHu1Z/pLoqBn/cvkjMB2Sf3Tf1a+YxsGgX4kOx+nTJrQSKlGTJDBz3vQwPM7M0KElUhX5Dpie0rk1MbS3C4CM6Km2P4F8lpw5Ru4fh6rw5I5KnPP72Pnfdo+7x9WbnYHcy0OfgaCa0xqigQ+Rbiy3YUGFY3LQJCIULRaawERqZeiJaV5qfZZQ37ZTqewGwg4BF18+CP7xr/JgHwLT7tWWCjbNi1b20rAeKWGSoh6WS0XxNMGgYrhutE5PChX7w5Ue3qU43HWK5YAJLd97H8aS0VKh09M9DhQVtz6hExzQpfoFhbmK7IfyDKJeilSzKlw/jaKpGKJEUhlDxiZxrYuHaSHtWB3ScA2aykQEcCuUoEpgC1lLEU90617VRfRBE4WSM82OShLNi6VLNu8poV1deK/qxCwzN4lwdWexiyqHuMV9URzw0Gl8jehfI9WTNqWNWqC7fm7rCop6Dx+dEmq29E6Brl6YSyG8+PDwi+rt6KnRPYeW3VhJJV9YnAxDTuNIfHMrjfiobvoX4k7wBd81C1npbWNu/9J3Ukjjlow9Pkc6nsr4uICqGJkwdJhl4YX02a3XBTRNzYTOCp+fEh1abRDVuiilCshdKQiBCEmFgkrTEQ4UyeGhJMU6HTTXEySBipQ8ot2I5b9WnSYHKpAcYTPzQmhkQpi/l9my4irPm/kaRQ/lLxvrnh64Y2Vf0KLtkwwQhRvoNvbyuMRVq42EFdZrFTN+y+EaT8Z37c53zV2hh2ckkfwGceTIp6KUm7ucgV4HNcdWPuX6WT/fJv+xA//ezYVpg82Vgl/mpgT20igXg9wpaNKzoAL6Y0TIGi5gxEGcYEEhUEQfcIPNxoA4SlC+lcHacwrhur94k8WyIC0ul4h/Kg5lxuxVksmf7l5tGBcWSAtx5cq+B117zElVrPuDNEwwR6S5VrvEz3oXfaRGVAMuju4eqfQ/8gnzjeW34V8Wi+tEU/jq3eQKdvf6wVMGVCzp/NpcwbyV7JaAfYPlx30f7ru1kMn7xTVZfX6V5CvcH7Yqni/huK5s59ut4dXNn4Q1bbo8Ro5J8hG7BcnH/bdo7bpcJrlAttgYKNGaFSyThfVGEzIczKo/45ewoSdb3pYNmtxAU6E8dOHHpFCGg9ljSxrNIAy9WfLqYtwUPAZwU9XdLCx2hWn9DGPqHGmQMle8SrMHPylSOccIfBKRteobnCoPJJbcNrHJLwG+QrR2ad3FdkLroKCJmLMsC26uj9nefZe08bL/T4SG8LOWJITs9NNCWVV8UJHIuD7Tb86inzObu12Jmd+yWKTIxGyRItMxDtlubgoYWEarvcmoX8h5rY8ykr72C5G7xINxE5ARmU/6xl0R5CQ5Mil9RgGC7oXlZT+K207RLgHrb0lNw5kArptrgmAqoOR18EqS39CoTX/f0QwKJ3JJYDyFbK8zS1EB3IARtHBJ1sCh+ChhDtOEHv16FC259FiFglkgJXhD6Gf80hCO6Hc0qRP+tB3BbUHS8Z50ugGV0ESHPKZf7TaEnfGcj4htEmFfPk6JgmEQzh12cvzK7Q112Gh8g9qLM3y8ltAThIXON5OcgLtU/qKwN0vd7CzMZDaGlM7bZzI27aSn5sJGAA5UsNjo5awnO43Depj75+y+QiFZ78ozzHn/XeT4gU1AzxinP4Of5LxuzdSwhfym4ieTOvfV7i3DEE8l6+HRU6rVIZx/uH/mhbb00FhbZpmMF/58wCmGdMZUi/tIkfv5VZ/kZ7iJSgQGTcrRiw75rzbiB7cgeMmjEtxFxH4NQfUYTYwGriEPDt+1G6MZcRliosMcRN4sR2LcjhFIFi5wSllThsIEl/hnvVb4OdTcRLFzSmoUQCFAumTLmhLaiYUXqrSvxDM5rkIWUVBd5wLthQ34YfFhl/Av02GRIXYGlx+oVAEbnSTkbYlkJXMX9gxn25UrLw8KeffozFBWx4S/I2BK7Qzu/eP/1aFFf85muCipFY0THh4NmCuYpqN7FH6S/haon239Tq5iuBrF5SP6PhwJnEtnTNMxhCWj/wNd5yZmztj3p39vPSmgc4pHHZ/J3KV3hCqMhqb8AJaMDELNi35Pn111nU9XVXRtLXX7DcLzcD1E7mHYHWOkUb5hqnXE2f9SxFTKhPQdORd/N9K5T98SM7MAAcsmWd2iUtOEHoN/v0PfwIeP0mr5uPLStWUs3KLtDuV/4bg2tnP1vITQihP86nhODiPcIH6MnoaJ+u+T+/bl0MmJbW6PR2ZfvD8tv4D4544R3+99CkxcNhPkNvMApa+Qdy9DHitcE5+7Pzp+1OeiCb8FPdx75InNWW/bzuQG9yfsShCIubIVEwWfP3b2fhLWTijPYsw3S1GXOyBj87w0H1Zu0D17yI124l6Hey3bLVwPjmz5BG5xpnvf7Mf8qglB+Yw2M1HTQhd9/VzWrO9YU+aHd1fri4zxmxwt+p90qxwrNHl9qe32Or1eOtSmymLb9LIX6DlI3vJ/8/wNSQxyEdDTdtZTqSMyTyITfcgQgMOW7jnVtrY99pvV4+x0qsZ7wVu1m31Oea923UNfCwl4kyITWnv+fogToJY2XTMsr1EDQBd8qCRo7dK9ghL3inCuyX4aA8aiNgHRYs/TDlk5d9fDD5y4XPEvtgxofwf/eLNrdtYlkkTTJqm1NLNnUdFBwAM6ESfh5rK6xoGM/ZW/DZkTMQiH54sibJe/wdMqaDppE5/iIVEbtu9OTJNvTGzQ9uqfbrAWT9LwXlWd10pxjopO9cwSJIbFmwTrsxegNXt6cDF/hSioRYuGa8PAz1IXAmIMOXdhT9RuiI3bk8NgEdvytEIB/pjgQxLYbnQGyQEsB0aS35+7gy27jYgseuCpTmE8lmiGi4i6q9XrQgzdu6XJgiwh/Yq1a07FVCdOq6o7pkiYEap63rn9QEbXBox+NXH8WNOShS/Qf0+3EdMKkpp4Pc/sgWXlg8m4U3Fg8lEMyoB2Ahb+O3xNSM7EY3ujAyybmqMHtOn3b/3mi1dvBSRxd1YgQa5394aN6EpfGRpE844JTFW0SHvVVgm6uIsT6VETz50GMY+SjeG7cnirGTCH9zufM29OebJo+9ARBYCBWZkzUOpmAYz3ODTbWBcBo+yY9l3HfPryCDkoqH3UIIACHE6VDRQU/MIb5tP8LoIgnz57fBvvc0G70DlDaEFL5dfPxmOPclG5/H8Z2/080mBfV4Js9OMkUUocNsp3eSegDxCqeYzUZvs0fscSYadDbsdYdUwe3+mO+ap8WjLVe4wxq8XTASBLskKzkEO+xfyH8MAR3FTaSt+PUc9ydxKMCcqk903Cy6gb7lW6Y9xZCY/JdckHJ7JPn75PQhl4xd7hTZzKdDK725c1klpBGa3IHC79SDOC69KEY9Ol2pSNvd5Dz0bUzRSQ9Lkyj+41bVOR0Iqy7SUXoTfAKx5lza6oeILtg/7Ah5XhLgeEnk5BTMMYjns6821YL8ncOf8DHqDw5hA6xAXi7oMUUAD61rgqJFdKYZm4jlbmbUTSJshZ868Xs28T0VkVRisL1zc6skk19aMcAnIvBUyMY+lbr4p40j5CM6G37RBi7W06Uv8WRrszWpW1iW/z4q9NAUvqygzl5rChkuZIR/mKZdWOYW2j8posiWlW73yDZ3o3YIt0H+P4ovTxoEJwXHVP4DLgDZ9T+fLKtp6KYw3EqCBfsKlaXkO2sZT7Aq8DRItoe6mFzmp8sRypz/v971k41w5qwMVjFL0zAsV3nSOnp3WbXS8nR4uaBKKtMRkRMS7gVN/xtPpUvAJ9rpVPmzFScYTQAQGHf4gqzw68CMj7QCs/AWvonBYrP9FOJhxZfTQeg8I7o6QMm86zFU97+b+vy8lZ4tBR7dXMzh1H3UfbwhC7p7dkJwRKJZMyt6dQaHMNk2TLedeFPm1EV8Ahyk66/9Q5nbyFFebviottnJUijgkFU1z/m8XOzWcMPIj2Kh/9ruWwmEc16CTqhvrm/YEqBMJPZBwEZgc1OLtyGFPVFPlfa9cnbNK4fnXlzcsTMDNL2MRUPw3G2608y3Ud3a58pN166zAtAStK4zYBrxtoc82ETIvj5Rz24j7BVkNfmCCZVwBQrpsY3RI+uS2Xji1/EpLGmXGEot/GtGF6hHA8IpK4ruwhXDuzyTWwTsB05SD4RhnzVyyd1Xw1vWQpOwr6YaLTg7mEQS7qj232h6kpYKrdIae8LY8MK5eOiBzS9kuRWR8YmihaClrFtrES++Xmkhxv9sKI6XoX/opSiOlJlIjZgmIJ3elZwkSHxHrX2PiUtaKpYm8tk6srlkgFZFJYYBUVvQQi7vQAbzJnXTaDIBCaH6aW+VQ5uLzXBGsKWvCYyIOxAKtB+JbE5ZIbBSTCTbhaEQVh9iEjTaFn5S2dheszS+oX+cRrT0904NdiJn42gHPGVeSW4cqxHT66LbgIfJukKeFD/KHUAhY/S0oYMq1Cw9wapFc50THRLDVAdzIL9fdZ3iPLlL9pE1aN468VUmNCUsRHTizyCgio0XEVZnD3innNYp8VQl14kBT0HF73eHZAqKQLI3GJt8zdJ2WcGur1eaPWKzX0h+3+gV5nGXNAiHxv59ss7OsnxVXoZzK5KXoCyHsSEE/x4St+N72ONStuJajKSxjHWmCAnYOXRb/hu3jlzDdweRkYMZFZC1QjVGhlcEQG5y17LPc3jFVFGwsayF7MDh6gjmX8JQYh0MXX4EZ+E26h9/GWsMQwMpikFwmvbPb5hdw+M2Gth5j1365lo+MW3rXq1qZCz+h6ahHoN52PJlH9hIfFzOuVRA5Uf4U7ToC7ELv3XZvSuSnD4TYyX+GWeSd+iBRridMdPBo5TZGACaT7ePIlFNRhOOXYAUPkbBPJIALm+9Ad69S4Thep0VyaaEhWV3BKNNGRi36S8oHLuWNnsYVPhaFBPFeJnGtSBOghcSL/ON0lUpMtveVtJ3PhoheczCFTkrWP960XrL+n99O1YtnlpuYq+/LNf8lLzJUBMQeIOfYeKutcfckWD2bOMwLgF3FY8r9UzsszX2/gGqIGT3LfU3Jbm3eoRQQFCrg1HPlLN5fitomjksn4Rq9FoWEB+60CMSEpNYmEElGVJaQd8mKlT7inMQ6MG3qf/zePbjjX1lJ6Bazl1a1UONR/rFHjVmGdX6norJiMI+IoofekdAAvdwXKMy5lpbcJXyJ7yiHAbaei4CZrKO8DqtOb/5wVhBbPCUrWNMO0PxNH7CralEmh9tRsComxHZuT4qrOZztrbB2dRY5tFuG4rKSGoCEgoSUll8DkqbtYXi0kTsaZDNlSikqizbNKUDhJ8a25FvA87Wc4reMknzlR9sA3ZfNXMartLdsl7/KMGBmWtR/oFxhmd1moQU0hhnsVpSKfIkByxKfQnlZluEzI0BDX8/xT2fEHKaaRlCLKLXBPwFU5efqHXVF0E/ih0JW8gzdHh1Amu9J390YGNa5oSEPcnRmr0o8RIPJIJUprAvnQEDAh6Jh2PyUtSaZI0C5kcdcv3ALV11GaS+l23/GQIQqstTNJOo2aJwp6qp4DeRGOJPdQl4QV96B8P2azTGDgGyUtvsI/vN8Cdu+ozMCV/Iyf/JKg0JjqS0tdYJQXoqxQNMt7wUcx5VY8Ss27HYg1fNVcPLM3ha+cKcFLWebQkNzeKO18cOfKr8Pp3CvE1zibf0Ts2BH50S3CBqD+yF4tj1O0o1JnMhL4WBOl4RXd6R3iJCbTSBRb/ncANITl0048LpOxvQsAumCFk5wdsCvtuDtkhLASqIe3UZwQeVAgMQ3lONBHiHOGsd6SYSnfpai6fpTJcwk8/sFlX0J7Sk5qOx7WrjN6IWVy2wvhj8MmwF7r6lEzRRlx2Bv4nmYLzyuJqfYvNL4wtnIYErbHsozShgq50TQ5wrvcK9EzNU8Wy0leOqQkojzN9QJ27RSH8VWvNLhpFspSN4p4irDf3Q30ZMCzrwbbxVHSl/LE8TpzMzJj4393muf9ld8hgs4uyNK7GSP96ZF0BT6b7nrvm1Y6gpry+MoI/9qCOKgU16fYFyQoTRR7weg7lgHFvGp++EwCRyhDJvS66eg7r3BBP8K69P9atTll4qR5O9WTHQmelZzyEOHIjK0OPTj7SneSwb/SJauCIzRW/7WL0MOTCUuGyBj0hclj0Oa+3ytVCVxDV9kkGSNdclrysEl84pqu25Ht5QQ89raXp6gvfyZhND7zZcFsv4RG0SEUgVAKbBwBcHIGM55X0xsruDOGhJUtH7WEq3h6lRTJpSoZ2RHuUcK6zzeN2M5QGuKnk8sERk4831PnPTlVZy9K9rEddrou+RoZjEF7ge8MBTA4aUWs+wzUP/TJZHdmef9giwyxEku8TARvH6SjsrNP0PiH+4BUsb8t1r8hsBTUp1BfhbEkhdtvunkGufnKdqy+nn+vnTD6CzOtSeGdOnz/MJtTy53cnh8sOLXbx5LjVtDkl9jVVmAEMs3gf+6eswU1rYodHRFjLr6GOawM35Xdv76WWO8DxLj4gjEBXmp6TFpOjCHNYVLeRwrpTdeW2rhefise3+YBeW4NpkCX47MfCWPELDlHx/BleYFD6/BV5oEZ2XnzzBsCmV6EiX7fdzTb6unqUbFBEAxgM62hXfXZiVHh+BP//DD7snGO2LyCrBS1QxlSnRyoKBLO4LF/vhu6NtvCAN9sh3tBfHbHNyqHCOK6VEuyWpPbKIZsIIzHGUpg3h79lr0ZnwIFANcP8eDOByD5neLQax0pJddr2Md7Z7oZA5MFSqI3GQLyODm6qrKeAUzJHkJVnVa6xRWsmmcgp9G8zwIWErfSeT1uD7x8Jiz3HeVlkViGDbcYW0ca/AKtUEoEJVXAmVbpp1V1RDhc1mjo2qhED3UO8KmdMZJt8aU/O9IyNS52ckuVWefr5Ym9h1WJhat7Qr0/8hywPlSfGMKsOXqUI9oEYJuLmwYLD0+gvH8GlAIGNoSCpP5/P9OnuPwVS/LjEytz00sMUbUjInkOItAhoAv+5J0LywW+h+K9It4RGG4J19T5tZzppdG9U706S6aHCTizJd3Yg7K7+QV1+YSkVOq1NcpvWyU7wJNbRtUDWTsYrEvuTaR8gczFG+Bd7Ni/NPDqzy7cZSojs64QMshFQ72aLBkalZr5aIcZNM/IEj6dFMQqnCpK+8uqhGMcafzLaR4jr90cKaH398hmrdQ3rF6Ywti4N0kfoGwF/5wlTFgLsAq/LOjv9xRWilQobgdR4ROBe1uMhq9NCMh0ypFhDaPu6QjbNsEYgV3XLGTL7Naz1zjiWlx4UtDYEc8rnGiOcDQzbaBCzw/wc6sAJlzzp09ZrP0QwjX0lhbxyhOqw8VH9yax80Sj8ij0TJiWwIZcphWQtKuThnAYfHowbFYHZYOD4KhR8aFBfsJtAi4mmOOdVGnrPfLPbyGL+VPGuTZ2Eylbi3gqQFpHKZHN5xu4nHzCNV6zlF6uar9UobKZAe8kIqkylae8HAYXaDBTWEhCb13YHvDYLPE0mnIlKbYmBNT4j63Ij3IGJT5Ks3lJRqevA2ZlGYNwWuf1apBvvzX3IEnF9WHxas372Jq9LfzxEiY2OyJsxJW5OYig0rGy9Ij8zZ6k9rwY1LHVt7aVk3vahT27l+rRMM4wSuVi35G5rvLe+nA//Ke1XyPnDAiotXL6410LElsePnJD0GBVk3FmwEroHb9q74mZc4W9fZ8uSURR9FTqg3BvMpGLYitpTWT2Fcz4cRQgl63M9qG/4rP0wTkyH6FFINUzejUdB5HKePpvV1YeUaPAvMYDBoqB9tdcQ4TBDBitVl8RTImleMcEL2yIEGfkHInGAJHHfpor/yUDRALstG2rXdz/maVptEoy38DxjJj0xbJ9trgKUMmUrOZA7LGsdgxXTc0ICJw1Klbvn4/O5NCAhbX8uyenGB8TVyMMxlAxrC07BmssEFbPmMRP+M5QltQydT/4tDKDMMQPXKML3ncxT4gEXUhREvHSKB+PCE/cyRY98IMGd5JbrzSSwHMTd7yxu6oood5XxMi7nl6Sz6nYzKf3XMF5Fk96imtetPXOPzuPn4MiV+UG1huHS61ME8igUzcsn/2yT0wjDy/rqFCe7eiQPHxTtDAwREwXqA9y2q5eg2nhWUVbwJWtRUSMbxk+9s0g7ypX+rcArqFMQsqH5PA//0VcwcU2BteiLWNtMSaXu73eVg9Kan+1nSU/0lCJbsrka8YNMjyXw8D8IGTUcMhvKbxe3G+3Nh6bYQ0DBMm0g2AykuDt8TWusZ53ULgHgws9u7LQbU1YFjzvlYUKUVfRcR8MBkEEpeJ/XgyMqKvSqe3DogMznIhhFEfI6ZoQzEK7GCM9Zzvs66fVv8adv8Gk+saoPXpYXL1QD2in4PbBfgMVBQOfAhCR6zab6KNLmOUEtB68JctgsdtY6BCvABTVilJYpaK7KE35S+nyNddr5Vku4YPzKlNEAkZnvFWN5mNcTRMBJoAJ+2l87iUhbOA9Uo5kuM1W9JJ84MVtyMliZ/y9Ww3TDup3GgW/9w1X7KZgqySKIHcqGrXyPsmp63joCQIGAAxPV7z18JmQ1KEDs3WSXpdhAQFOsUSJZ2fFWVJqVqp8UsMCKLPiFAWzprllJU7Y31ip9+nV/YqzLm4/ZVHy2VmELifQi73LGJXoUqc651fPEwMXXofOR+qJZ3h/8SUbo3UWGoQ2m2J9vGIMLuV0hwKF0vwBY6nMm4pN9wyJMWqSgxMXMvbGeE/BSnzg391cJdYF2h0XXOgZXlrgY/fOFKwp4iqlebtUm8JbQO1j+4rB6bCR48Urzv7wk/amTwqGx3owkHZ++npAQOQAv4qDoqyJUGwCpr8uz3qqrXJ7YAsEVqQxFfQtiUYMWSKUa88rBR/KT3t3LC6lI8sW00PHgybTRtUZMbOkGz9axNlK41cJayx2HqItqkVt09mrtSv0I4NnLhpyv3dHlCoC6WJ1strgpMUDjS0KbszcQamTPNJ/pBmtTQydPKObx3VhayCDSO1Kv6G3GLGyIjJe1ybJJ4KgAg8LoWdfqZeKJVQzBEP0ynDz/8NGLlsxs/2YyY8Veuw+rA9IoVhGJv42YjbRcX8TNgLjBxCZDHNgCm9kz8Y7+eoMtl5dlPv1k78hsvfvD733/6CyVflN0+2CWwKv/H8YKWpOjo81YrQTosMKhIIM82yYDXZTZQq7q91RIKT9XRE39/RMRKM5lWY5nV4bwfdCk7DWE/Z/pcD6zKwt3JkE5zT49JbUSBSnGhKUwoxVJofu6DqOT2LpxmSz64fXwGKyV10my5jO9fRRm30UCeqekNqOdxiwgW9+AyCfS1VFixtyPTQ2uYlhCvv78BNvIXvNdFVOWfDCbsG1o+MAspWlvZgeeOREgluhOqEUplBsiZ2JQGL12HmWZCS4NBT4E6G5+MhFGDWbtzcmLcZqttUc3hoKQcazokpFnqvaVbJ1XQxzFe0vHlZBTeIO49Pk0U4kGSoT44p1O9oXJQNBE7oDmlfyuHtnWRzlqxebmucaaw/PCIYx2BvGYP69ZgYtwyvK86gBoL6fxHItc2eTzFhQOLv/zr+5e7dx80igmktOrspaG3jNU0WV/0fN1nAnkcOYrq9oVCmQMPrX0E4YzUKI18C2feAXwc6SkpBf9fmIFG2g3Zwa5MNf4HF5PCBDiigE/pYqNztaJvE3/uWCpnnzS0iE5Z3o2oFNxeggAlFyTmkSVKZ+EE0fjf/tIGsivzzHCD7wkbl5AsUq12i2YJ0kof5EerDwb1E57bchsefVaZdLC9R7u2ewPP82zPnjMHuc/5e8uJKHdZiV66nO5OXyvSpiZpSVtEndYBnhxVIrRP+CtyBjhMc8SlxhsXtHZKjrmLDR+ZXNSmbHiKnfyW3vwjhsQZ26O5OyFvgmGxnZ2jF2iik0uwkL8uKf6VpE5+WEx3tKwCs4dks8dXmhbUxmTjEA75dvvxtTGwq7toq/RJ/drDVP4n7sXalJB58HpF+tmmeCq4MS2Mn0MLyYNkdb4WreHRayC+H1If6kLdk5JrhzLa/WzW+QwaEgZColWzSBwaEagPOvGsss+eMBv+pDdnrp/0yXWUBdhTe6nk6RHnb9Kzj+AtPD4nfnqNRugPppSwSu+aOB6+wYaLErJY0+FDOBMJ1StJ3BVI3dccHT32LFstHCBtfrAbgmG/KsEu+Qtr/O8LFvBZe5Shqp2tRh2vTx/XkgCOR5BvgowGyK7C9QVCVm03IGI+6vcLcckCMGOd4wRMIai7TEDxmOtwXchQFWT9D54GnUWe7ERJA2lDMfyKZHUEZz0ArUMK3jWF40r9TZh1g84Qwq7lYkUx4WKOuZSUgWYxY3NeHdYjA0PvbQlQaN56ndHdayGV4TMcDKibvpP/NDitERvP9kAJPLzmboGTgDLmTgDJDcTl2iIWzufmkIH3UGVurFAtSXrLZLWpi/e3yQkE9Jv635XmhCFjpVTNm0fybIXKc4QSS9eXuZzzh0Hk+RrgJtccX75Qu7j0n9zq6+0LRytpxzgOMSaFUA01T7aZ7MxXKKlavI8uou0mdnhrosB7PaQW1X0X2JNcwoTPCZqph7jTMHllQjgIRZ7zbEwN56fOpRXYIraOD45ma4i/PUa7USXmgNlbLTGIh4ocKoS17/X+a43ePn0Kz8Q4nJNwcf9Lu7ZcvULvokqT99S0WBpAr2WpfiM7igsGnHCtmrDmH589gIDbVxQ2ZJ5KKIzYAVZyUxTSDDdZfbyqP0uhcHj5y1PmR67m2cfTcdjKhFPrcoxzUDHCNKLWCWlnm1xg7zDt7NlwcvFwCJjS/43n/us4uN2HResr9b5/Bu7nnyO51poPKq6qbzPxQBOAiCCo5RaVqgoSht16ybJropzpatCREl/17oICkfdzN4k01cuVDwGCs8JbaPOxilOQbEevAZu/xbFyVS3vzBQ0pd3NT6Gg7R+m9JVCa1RjwX3dUiXY5uLZgBJlYn7C8RtGxzGzcbxKJ3xG3MALNMv/QtdEhnG6Ldy3hps73niaZ7gBavIfQscgtHmMcXysCDNkw+Z9259CKf7B/szQH+oN02T+93ZPcT04UCOrBAdv2COsCHHprjNKDQvsRCmdEr/cut3D5ZlnV5ootqRynJPssGWAsp8vxHu8ZoPIKpfCYp1qAmPI+AxpMRJTWRfjlqg86QpCFMe2raxbMRA5gAGjiuszo/XAtxxQX+gSIMjdySvwZyFo+3u6fY9fphgyGpcFnmhD9xmncMj7WLGtSgzk0L9NvmKSi/yp6w9GBzxDgnlFlVT/Ac4tPF0bF/U00j/duHAeIkzhQmDdhJdBkFj0XzPI721mVOEkRVj28V9YPatiCpHpEXhWhFKaxkj+bIDGe0gKnkCtlOaCshPyKLrqoI9Rii3buK8gcQe4+EoSoO5pjxF2EBfR8mArJnIa5UDpzQuC2JSqQXAGWfaaUaWEqKlHmZHSqluhJLw/iA3ovRirMZHUDiP01C4kDVYqECIhMfQslxnpQ2T4p8Y4DPAYcuLWYxrzgiK9bbWGSEPsabF0kcgj1q9WTqdLbPllknrn1TlVl0tUM22HOn5YfWRoEQ4GYNgnoKyPtlNgtgo2z5u1/C4Xcov2iS9h1OqYHkEZNxMoqsTWNmMJRAFgyB+tSaz2+nd67fHMnjJb4rHzwjMnKfikyLxdoBLyf4N5rhZ8uvjI8p0/5DF7RzPUr8l4RV+KebQj7sFCmU5H8iL09w3HIkKLObTPZoB5OD7t8Y55oiAA3u3qnjj6nO2JsGauiJpdz0h2wOexoA48/8/JqNs3yblHztNmpWvSOjNktglKRkrM4I4QT6Mxuy1XfiFnq6omEhBaWPaKyzLhpJzh95luDiIRrXonPT7T5lHaNntyLbggBP4MMPH4oAbG3gCnbRjJFpzLAv7k/k8RAAgF/iN1hFUoGE4UWbKmZ4n0vSgwuEPjFq+1D3ph7b5sYpiy77WerJ0BFA/FoWzqR+obkxq32+5A8Rcw5wBGvmKgRKqidjlQdV5yHK2xA4cnpcFdPXU7iMX8TesIARXBRJFfB4/DaRR2mdx5z7wg6wvHJzoPZ9K5YTA9e5WE1yxpzPwHhg+pHuaf4Z7gPzIMFHLvsXFjHIaFwQ7u3tmc53+a6m2q5DCXtXsi9CbHrA94uxUAsdKWdecK3pvRq5h+Ll4XrgbAEAxAdsQ/4Z7pHaAvomrfZkspnX5MUBYzd7DcWg3AVUrHvVkyi2r0+5x0BwZcMmlcbyJ6kFukocIniES+3QkU6dyiEAnUILK4cgpxOFUA1ghEfToYqwsX37YLqre6tLKyvAJbRuanhN8mKUJRMGUdAPoJ4hY/CyuNQr81vt4WpcAAPBfC/6ck081CrnMBFa46txnhY/IZLNhejYMkO3xSrB3eeiSiydFskUakSSpxR08sOJ3NsUpIJ6V8KkdUZS2Z4V7lgvm+EvAAM9fRgZUoolIkguS97haIBwJ0Lv0Dp7JyyyztuyX8/sUERSMee1rzispYR3okBSpDE+zGdR65dLDfWJUHflEhPYOhJFsEHE3+4v5GoqavPF9G1Hm/bG+YYn+AIFbSuyXapHoilM8jnB3s0ajaVyElUlxYEU+tG9lPm0LmwLhR8rkOTXhDPywmPLArJERDVNH6c30bGSG1VBxAeTSsV24vmgItoqz+I4GLt32f9Hyjbl8hvMfunQcDW3wa9rlJJB9Wm3PNIHgWCMIczs626YMkrq83+OclYyNNrf5ZpULV3EzvfgI6x3w7OWSaODjVNEjp2pZCWnmsXDHSsKCRSmEU8MLDdpUYpHZl0A/3fglSkbLCBgky3aJAl/NuAGm+InGTljSeggt0LqLFDmm39DjDlT/u2S3g+R4a5z3WgUK0bZdrUsOFD6VqxN0QAPKgIqYoSzpNRwtC46VqNjlrKZGM85CRa8X2jl46ygJFo9szobAMGazPNRubxT27gu490YFv7eIh/zbspkfg0jHV5Kk34VeAfRMjD/UbjNk4w6sE5Bpf7QWww+3A/XuQGUzf5Ayp7YdrbZDwBNX388mWCXcDcvCWBysGnpoMRPGBDC/i1GZKFn+/OaJsFiaiD9Fz+W8v3IDXIemkQJ8ZD8X8eP1JzxRoUrZtyqiTCEcN2KFRwHU/+dT7pxZPlxuS4GRmj5TYc3712o082FnLC8dFjAEoLzmQds1e2n+QgaqMrVnV7cIzXTZQJOO4c+6neIIWV/yd1zLRSsVlWVLcdc57ryDjEYta4eO+QuVu01yBMNhrAcDyRdQTXM5CgUvMgJl7UOpYch0APcFFyF/jOTXpgl8s6UiT5jNighTuJa4r4r255D9fOc6Mp+GrOHyd/Fs5b//2qpID/0ns1cAAGZeakZLbc6mLrIeGSpguNwiEVx7hgEgjC6cpE6sd5vG34veDYECCDkz+aJ4Ejuw9lauqeHKDvcEHKJnQOC/uVxIX6RBt/YutFxaQ3DGan0XzpBnyizn0DsYnEPa2CAFoDKibAI2LcldNDknlquuG9UiANUimr/7O6Y/C44lyE4xuMsF0V4pyYZIg4Kkr1BokfkqOXyLAwrIHB1Lp2VLVnA4z4BDktP8WChkElf/u+IoD0EBFJpVRKYqAd5v3IkIbdzFi3FXIA42vb05ZkMp3bz2ojN+nisYpyBkiXK0VoTY6hGZu1YzIxi1FIb0zmUMcAUmyhEtM3LWhpPoBlUlq/ejRqV9G2pBHH3K1AiyfsyjtR2AaVKvUal7KhmMy+fPGMgbvMZ1vMlnm5eEv+YpqFZ4UgZizxBhtOuY5qZhwTPxdpg6lrGLpmb2ZXcX+0vwbRLjYsMzeLZxclptbgdzZ5yOLvdFwHdTKEA3RYMqyYIsxWVpe+6Fxt+/Pbs0MkMbhaIz+jKcGaa//hR35Sado3OWRZMjg6NTQqjZWqmfl6x9oSiV+QuF+8YU7vPLa2pAbS7buwgJpoCMHKNCgJiwk83L7MK+iOX9d1k8FZxFqqDaVNaNA4ohVKQYQgUq4yHe66cXXCqgULgEEVKhEJjOfhgLQsySNxZowmXUsd0gQ7pWaGLBDTt7QyL2DW76uJsS3OlfwQVtXjUQLSISonXs9mPIWn87dX4KYaVPrHJUX5vw8KK7QCFlld8OIdRTmUentBi8mDEkL9/nM9UhKjiT99kwvZx0DEvt7dbCME/1Y85D4T8DQbpQJZMH4CG0Ecw2oMQL22d+GI5MDKUbFTo2mZFLFm6j2PwgoSfZ3RZUNogUujTZNK+U5tuYVOWX0Pe+5ThMAVCSINclCA+OpVBM108fImTYeCNsRjcFI9CriLizgp56bUIKhOmL+LjKifPaOsxbm1YGRn4yRRPTcQYrrQYYRG/GIT2WdrH0vQgAIBwDLiGY8EdilL2LjEZ7fUuHyNjrjyQ3yYxQPCKelKSHhH4f9Kohcqv0ol2XwWC8WHcBpf82yPBac10oScXhCAK1jEQHJNio7gVR87QHAMW6YNzY1NzpQJeORVDi5hZKX+E24VUBdx2yznrOEn4q11XEbwyokwSbX2x1IEmlT2bi6ugxUVwQFhLmI79L2ZA12CWKz+7BCqR0ictMW90HBdNPzo4JmsNRleVjsKXtP9UjsfQOQeDghm4UTrdYN6u3TR6jiaM6T1MiC+vyePvDr8WwBKsYjKteRm8+kzeX3zXZqWHvxjIA2zyQA9ViDCNZpLAkC2AtNf4sRhwuY8xfVPr7PUc9j9sVauXC7SNoQD2DLmupL1ffy08GfY8uNMRmEyI4CFAQQtQex4pFP0HSjrOPBp85R+MxDhq7F0JjubYP8Z1lSj1XrNmar00jx17Dc6ZxMb0NGvD6RcI1T3Mg2Ewi0sDsjWcZdfbqfsk3QK34ym7lFXa+9eRIO7vnme/UIsf+xxihWgIBwqdfb3vfVOmy2LKTNAbLsvPoxBBAl904boV8fI6nDGM1QAdZcerOOkkkVxDAK8Xpg0drgKDPr6xgTVZYIK+quZqu9hgDeizIxWBBnBWooyWONCSAsSDK/g7Do97KfKyhw/HK+CKmFx/jwawXibhKdLLRTvBwEiAoudWxlXXh/Gr3AwqN2D2xJACu2rytlUF4f2l8fmUja5+InDvGlC3mvTUfGtLOHu5u0F54nhXpUm3Mxs2CmIPJkj9HMnVmKxKeiAcsLvJl8lD+fiqY3/TRogerdKn/2XN43NfoiejC6DrNQKwmKmpLgzFUa6KkwwHJyknBc3DdirL7gWMylzvZe7uQmYXPRoy1qsUFGDJ5FIZzBSJtggg4/dVQ/JV3xLymV7ty8z1gVsK8iikDSHZc28LAoU/aFisgblk+SxuzhjGKAS2BV3APusqfvHvzFootpSNuzqnaMcAA17lIQj0NshBhd7UOGNbJrKNMUa20o0K37uHo0HUP5VNVHf+gT7JlUiESxA36WvrSAOEgR4wF4RyLB5fmVQw4hBAdRUXPsBrbWihQy9yro2oS8bS4RVPN7spawjfUjtcpwgbjaQDPTcZT7nxQEfU0GXvGGR3MDVuarfnwaztR5ioATgxJm/Jkz9up6S0wlqncjaxCwzMqCGg6VGIBwTFQhAVQmOAS30+yMpVhHzOwgQhI1uTQyWUBI2UO0BJ39Q7IQxNw8oYbBGKyolBKFmYttajjkM5y5Tvvr5O6xRmADnRHlbnV0y7wRtHz3h34/HqZYsVDI0E9tPmgRChGtXGpHxDCn4VS6ZLo95xeZPne7gD3ASmMguaAAqI7O3W1CwKqjWR/tQhvuGvMjhBLXMZzGhCkanTcnCQBjO2n/kzreS2JjWGPylhTuehm+V0xg5akH+8953a6MljYxNlqWh5bn9BxoPo/wCTyufV5imPpcyAC3WSKqdOQp8UFQSDcSAsi2piYT9SJq/sD+S6jZQzXVdifWIHGn+80WiM4Vd004R9vFsLGVoX4e/37P/dDnAkcAJqob5BZf1+3rMqh/KfOM8ByL9U/oSADH3WCd1Q3RQuO0QgCxTOjmqPjA8tQBlUeOioWOeZ9t88fdp29JXYr59YL7vl6tha2ALcWzpiwxamG2WgqPm3EAmJWC4fbF8fSmZHJOwkItMWHfNJ2r47tuRsCy4IGgvYv2M+1W1rEAJcI594On5o0QZ28mcOr/zhlKOw59K4zf/CCntQLY++jg5A4AkCiucGnWDODH/WFEhUjc1PWpD9ItMzcPUqmyNa9eKU0XqrpDnyV/yxk1xP4RsJMojgIAjq+5ulBIF/r5CSXcgbHooBdxaIX5FBRqkbP37DeS1HfiaSkiGHcsGTjwx/jvz3XzF3zZoyFCfiXanxlIHocoqrZz09YTtVjob/EqKT61gc6eQebOLCqNHho1qoEH1SFHUzvyEdy9YiKRE8VYJVn7NWDhMm/RsjWF8ct7qLZLmy6kfwVIwUJjh3gN3lEYAvquUxlwH7oqx6Mk9j/OIxzTRaIDMNiVhgsPt7+ufIc3fode6TkyfytF1vzY6oUsauMZe6214d8TLmfaABqhLiqYC3Qw/MxL152eDyJVkn9/it8ssKC9WFeP5och/b/tfJNZ+0hrGymWkvCOGW2AR13ezY+L83yNK04zZB+zm7Zvksm2KMtfxgfCc4lHOKG4cPWPYiHY+/HamgPRjXu6/d02m1skradYsY+Pv0hF8ctwTE3DHlbOlBk5H3QcjiLn2NGbQ0Ukl3b6kmg1JBW8hfvwY3dk/SGALuQw/0q60x1JfxbW+w9R8PQH9VVXgcRuQr1GYup4ZUZvnIQAqsV5g4sYRVsEibwWdLt8QkWI4vEJSWZoflICHJhxXbo0xEuQy+Q6L4Kr84BHJnpNrZWWWOSd34UbAuGuAMyt32+HKBDUz6CQaho+RY4DL3VhOdGvzkD2PFfCDclNwYaFqqSzvmqctLm6KM/m89P48Mm2n1Wh9IhIWNuo62nZihkptCZsb0scjJxuiw7TMHTm0Re2YA7aFDaOh0Sn6FE82rV+7o2aVMUVnA52ZwmGvOHzsmqjZpPKCGGvAZBI50Ve8w7Un42L23U0OEJCfQwVwfGyi0yrAeJhfMCXE65DMGWEMu1k3fxxD9g9fTrzNGlyXO/q+YHf2RQoefnyAewXU/y398Q14io8GjQBfY6JzSnQKqNmR/5kFxn4ft3SrQaixfpfvv/f9bXRdhAt9xBcCXuM9G7v0hWhpQ3lI0HcgQAK3B8EBA60JcOYx96J+2CZD98+c6zbT1wLrQq6OsS3gSon7IXSkZ7xiCgLgKQdWS+4SLl9FHw7QBtG70oV7wMABmKwiLRQy/57lzS4FfJ16VfMrG7H+8egV2HQC95NIRaGuIKkEddec7yy8UoPSSuCxYCECMa298ReCHXvsBOznaRPbc3XK3ENf/CPyEWgQoFY5Pe+hHLF8TcwdqQv0+6704kLwO3l4hzIvAf4hS9sMthMmwCulS4dyjA0SlhAVhew2naPxixLIOxzcoY8NhAcITZMMEpgz5eUMa4FyRxZvYz/kFuzno7cJqKHrfIS4SUxKmq9Fdgy8GKPy3XYbLaqVlRShrAqxx6F2AdxtlgvAKRG0KbJg/3zfQ/4fsWkbseIAjsb2H0XjCgx+15HhSVGqYO+jDBEjs9At83pFC8APR0ntuEQt6Wj5+AvR1bsKoGdHjnwtEx71Pzs57lMtr4NXImSxCq7Uf/AkzUrI7DTr1IV+AMuL5P2pyiPRvNhoL1K8oufR/UlggwCeUqZAyIc3ewhmUzsQF/SBhDIn0QXvYfRCBPej4vloEMI05g33BQmNKYG2wV85le/IeGlXaD+40dTkFnum9M9X0ftpa121KIGJqcP0MzYEwofEtw/BH772xXRxIISuupmvOkJy9PRB1tJ3O72DV3bDvvlTTi2IIxzhws2N0JkFmLQv/YM0msnqeVtKx0HvI/gdOEd2cmZ2P24VDZotTquwuH29cA/l9Tg81fjg6Il/dCQGIcPC2N7qfid43k55ZG+yV19VzSVaHHPC0rZmRfiDxrKxeDRsKcWob7PbngscAKsKA+C02su+oVbeqX1H8A9p3ghnKdWJ747jONg07wigboMUXxA2KLvovTUJ0i2lo3XukBV8hERZcwUveRz24C4ut2qUwwZ8zyeQtip/Q3UGmS4/d3IYDeKvOE/0oQZyFK11JWFdVIAA8BvEPfP/tc0zMoA9Qd2F4GN56VGdqdxqN469JH6O4Gb8JaHHbVxdu3bi6tM3NfW5DGcqHf4/w58+Pmr7FjF3QCRa1XVk+M9C0eEFTu1U5wm1YPkLGPOUSo4L2cJRIXD+sHNc3fawXNyXRATBCvsk/grN7wcAbZsElL6y3EFbKXvHoMOHU9KELBFEB0rf4491/xfcp5uPe9tm/SDzB348Qr8b7gszqbMFoPsWMesKGZDQEEPhb/yfklUDAJ6qCdqxI+VyLcMvHLhDhdhz/xxoY8GhGJ8eLp5dwfNv/9aOmhfu0f6L+7E7ExWUwdLC1hNzpFzu61XZAyXzdehlF8NU5eIlMl1eNkgy3WGrvgLzZ4Yl953mPIJlpbEOb6Wi+VtJcvWfwW8/4BQJpReBoRG7lxalr0tXIdTV3F0OV4Xe98WsIQOscLPbPTzaF7SjSDxb3CcMXsO1JjwGSfEnmN1RAAGgV3p0nGmkNCLhafwg3hwOXQe8SCMZVEDivwHibBIHudChsD8Jg+QJOcGUo8DsW1DooGoZbio5kTZiMUoN59BueebGQ3FEBMOAaNaxuAAFhcBIEiztgsrzvNhptBMXNhTBcPAenpi8oeDUvqeUWGt0nRSd4HgSjrgVhXvhGlhry/6+z539F600MdbqZbgf9VpjL88SRY8dh5qZ4vtAGBjY36nzz6X4t5igPYV0y9nwQ1lRTpsiutpCl7GTecy7Nk1k6hjNuijnKgyiAn9rwsYPCHIjVvG0mBq0ut6tWHsWfn82UYuxcbhqvfman0vqWbHdDFgM2Qz2OEJ3srGpD9MhUOwjmW1hzftm9jXt6ug25g9d8q2xDlxc2w0X26tHR8YE7uYUndeVWHz09BeSsV2798FKcZZb4dBZmlK7VLCvJ7vMKgIn3Xk64ED0qkVHrbBZ17Rj5fklq48nv+h9Tq5oCUz9Bs6YoqMZAkRXgVw6o6IuapTM/i+dLP/vlbx/IYBne7d04LIfjiwcmnVVfWHVx/4HixdYM/BiI3go4dDd67MjZAkCtn1usG6jrnicFW5esK86rQJPenbmRudByx8BkCBfg8L7d1iTDNhCO47f15OVuyNKRqtfgM5CCuFZvEaSFSUyJybnU5k0AswppxYcqN1L1Zd5XVd7MeQJjHgPkowJyt9TD8h85N+BN31qFdbS/0APpuZGqP9LbQzyWFB7/97zDFEbw0BYTPcRF0m1gsfL7Jdi0RZ7T9KI9S9gagx1scuD/65FLlf8ebMUYauNOiBkmGvDFHT1yftekNUdbEiEThoigEfurM8/acmxtrJtLGP2mUdooeEFhpns7wqBdi25JDmxrjQHRroJZ94x9JUz7j3N+S1pYbUqE5MGgfXvv9DnqCpPcKCv8N7usairAvCwUnzLAQN/QcdptYKaUW5G0RaCdZ1RFpviNIpN82yOJvtJKVi/rFfDgIq6rQAWg8dMOEgBY6/59rTFqwKeiTa4HFKuHNSnlgGTqZOLVvv5Fp7O+1n6eQgyonscKBJGYi+YIgcKw6e0QmvEoshMeTjZUGTFWHlyvituWvrDqKNioM44FMZTzaXUXBWRt4JgITkiwXSmJnU7m7jp1l6qNzC2V1dpK1QYicBheTEGdEbgvFhotqat2bOH11wNc7t1OszlDi4EEyPJa6RsoEKP5QV8eDwdCaHq4yCkUo0XiHlt2dQ9bCQQKONjihRdB5+M5C5iWy/VwLB72E1CUtWcAJuoKzmQGTQ1eigFIKuiaWVHkolOiECDoFFnmR83vIpnG6H/pgS+SgMygVix41kREPVMMY4BcQsAt6lQkIwKgMJtaeD4XjnJcSgqA3np3zqGfasKBtrYJKTH4n5jdH4hyWpXX7e8LvjKWfUWh1WzBI4KgXGokpIM2S5t2uhDPIUlvwDoS1JF/z17IHL240Iq1ZjKHf1MkgGbLCvmdHDJV1zuQG1QZfsViob8xkgqmQuwZTEQ1jJYKpDG/7as4to4ENArwQCvoJx90taGwIq2b6nEEox0h/y5QdBuzoiU0tCbJNz4AcJ2osds4D5E8IFnQ0FEDnSm1r/2pKM2s0lnI3/EefBoUrfs39Tf2elzhWMs6lIeDVFacYuQakMz9iExNFbIZ5HrxhjcZB5HW6EIyQzgmKO7lQJIrfDoQtj93PnBCT1TCgSreKJYZDBiSazKQiNLn4Ah3CHqF680IhYfiVDNIL4u5StFpvWy0kWrV9l2V9VKRyeNU1rZjyL79CW4EBO0SDLDAeMDHOBKAKznr5Uy0cTRmpvM5JI9GRQBoYu/GNgKLJaWwQT8DEr7uW5aFbuVoGzHam9osJZs0L+jHemGjw4plLW7oDBq3h11X/qGWc2Uc/fAyEF2bvh2vXZaRfxzt6nTAuaRekyKF+BpEjPMDyc91EZLrGRueZuVVT7itwtms4qcF5gRbW90lXcXeQLj0FyRIKm+tG8/ocSlrRBzi0vHB7Lr9JmdMxd7Uysi3OoSjnT6AzQxr5E5YMiqtMafV1nzTgDTaZVVY/mQn5mtPy6WUN6h5/Dw7xnnII8gq8IOExMAtDKfvnWGTwKJrsQUJOXCcCBfGG8ryOPDdzFGbCPceFf4xt0o9+4KzmMu//YPju67Wdsg8Mp+W2zmrD7GExUUxDoP1UPFBFUpajHfWRnMB3swd42OUp9LO3j7GKaJChGj+mPZiomx4A1cNt7rKd2DyvCm61v3p2ZGvmK9m4mOnyXFOHZZTf+BCGRvK1JfANYwICI9Aab3/VC1mQeORPDWwBKX22li0MCh0dOZaor3zAY/6toI5En9PzkHPZOqdwNzgbjpy0rpEbtkkhKb7fqcw31GGmC09U8/e055gtwNOe0+TwjH4RCPMJqdOqRK5l2MNu/0D1VQ3hihjKfJDidV4pzQEFV4jq0ojRUaOcjwn60faTfuCRkbou0Qbs3+6c3mLADmzieRiALUk8fD3XVMosn8YG6CnBXrn+HwkwzX4icLabxdBmhCmdwAniC8GFS0jAeXcbY7fVDgalGXeiQP76/Bd2NDKvFjcff13wdVziU+EU+ozxyl2XJfo4Mt1gB44U8TbkA7JqLw3mNrTn61qycI7A/hZdq/HwIqXzRwa2LvwF0I06kYJhP/mGrtElpNT57//hIrfMap4yel97lGw49suYa+15Ix+dZ4+dblurRlUvsizjVH+B1+gYgkXeg9Sl7548Xre18LviR12McTqdt8OfdEHTVCyzSyXeaXbXc+XI3yfD0OyVOzLKd65KkyDrlGcAZq84FjxHnUn4ISGIEH9ZR9JNf9SKSawg3e7kMHWeKXLNlt815FSbClYIx0v+mI9ykSguwEuXexk6kvVemUdjXTTNMeSppp0yYHOL98jGI0PGsuCyQ5wRikZLS8/YjYAghwWw/Y5kKI4bA07azwIY/iN7ksKIEliwSBxs0QlB+3zCXVhdQyzYAPpoislYOioEkX4G0RecCpa8HcHjdemqbWCwTn8SYgRALhr/OKDrCpy7gEl9AI0SCJqo7N+ERzocMkPYxRJmnafS8Hok+sOGcaNQgShYCbjgOlE9klut8yIPRfnEbO71I4NCfJJ/x0YIpACFUVa0nc09+bArClSWh6/0yQJZDGhSC0gfW6iIglCuSogBLmqnb5P6fLxgUKMnH5Hwlc8LXkytRJInMjCeq13BPr0QbzobuBbSSjRuJU1BrSgr3A/hPw86Qo2bLYs8kEO+giMO/sYPTy5wA8NkKVfXqr/0iRmdHMXMkhrYWcQOmq9KD+Lv7kfzrECKAnH15xqB+JThY0oNQChDWYCnOxFlZFAhVYAX4c9kkxTyNqIBEG+AJxashoBFwVfhkBcKLbcAG2JyCAigFRFll+zKF2XyJuQxAuJUiwqoRFEZsUp5Ngb3A+R/HlpkCFxaERWFZFpQomGVWj3dSPxrEJoxQUxpg5oLViiVpInu0rPCilW0TWLnKBLhgoEGVdVaR5f8KYrG2WuyVa5UZZLXpWg3OrwXkwTZiPJBIM2Cc8Im5M4VAJUVqpMTNJVbYLih4j0Sk9664GuVCHFlWhM2c4FlTbRIx81MUdKsd9IZUQcuHQVzgUIRtMguZWlHdkkAl6Jv1QgaDPZm9qQl1sYgbpRcpfwm/DVZe1+Be9KHK4BC6pYylIWNi7dhDWHcL/LzvVHLhKtsjAtiHPAxeLi1gSNIwp6LKQauIRAiZl4SPgvgST2Y9gCwNpiBwsK5S6EjFOBCUqloAdaYUVkuDfsPINEAS3dW3lXYcCJz88CYO7LwkIDbhXhMcZsEwnyD+vbDmXFFgGxLoduEeRzzbJxncCvSCHgzNueR4X0DW3uAgm0Nzzvng7VKR7X7oV8OCGpJtppiTV5ccQm9JWpEfocCfqvAKYjTdswOJFF781M0tpKLHtIaGCxLAx3IbtsoEJsdREaK8xrIZP1ei19ITXzyc+pozIBBM2LI0B0384ntn4DNnuU1BEVZ/oRH+wCfn0HgqRhf4uQcEBKGLAFLj6UAsBl38e+eNHx/d8BAcRw56jR+8gqwZqNtJ8ABbXXQqBtIZzRN4EBS7uqPnrPq6bRLMYKktCLGnSNwFWPD8tb1Zq9MHFgk2Ej8vruzwBm5HauMkEZPk7tkLGPnAMzLkplB/D0Bmy5hbuIEkZJLk/c/OLIw9lVIFI3ei9SIHlWPVy7QBdLhxcQiZ94RMiGd3QRPC3a1/IzWjKcjxJJKMIENioAf2xEMU2ScpEK4lnlhNFYSM8N4QH1LKNR74jZOvqYAhQAN1P+eVDCSJfMsDPCxPau+gAwZBAvbyETIxJAXbDAkp0vaeNlZFB1pBxYaqIjABZiMq+spDAYg2UYJtBTC1s9kuE4aN4sjwqsU50WV9MPmw9NcG1Y2e6Kin7QQU6bUR5MK7m9po2VyQnYWjTavZD3kXND6If6ggDvFmbzQpdZ0Bv12N8S0XgYQdTL6BjiMKyV4qm5OHFQiK+4mSXD0G0C1CG7dpuA5DbeV7AnREjmozvA1sdhrmueCcdfzwk8EzyG1oHmYDtO7B7/kR3xdYOdBqCD+K6qBmVxPOKgw/j1AG60chAtpNz4BqRr9jFZ4kV7yWj49VeaaHe+Eq+PWZquxXTi8guuUC4Qk8nTwGv7b/P4P3GriPSRs8tOIWZ3hGd8qyAu01UQqiPnw01OpaAg/kfHKnd6oP9i/8ISIx4FkS+Ix8Dox5eB+5M988aWTs/FwBhH+ILiEoKYHIPXxy7iFiPuISqBZ/BLQw/J3MQ1z93fu2MYBnxyh0qwIBThFTJ3DfVJ0tiVVvRQCAjFuWyVk+QHhRQ99ScU17VgaVmlCC0xrng1YQ9Zc2k1SMfIfDwEvW/RaNbaWX7SyR8XV+kLdlJv6KSfE53ARFgspPO+yjx2d3KFx/p6rcCeSOAKGAkRQ74WRKtElfr+P/5B6fw0xRmBzzs4mnSfFr0Mre4DA3/BL/PK+O54cz2HPBn+s+tDgElu6zHLO+9NDQWO+dNbS2zw0QefrLDZGadsobQ3D0A+l37a0876w3m/u+CFKldcdMlW1d6Y4bqrrqnxyj8mqlNriGGGGm6ZERq+XKdNXzD5KVq1ealdpw4jjTbKPsuNNUaXcf722oGHAmCYlu3E/4Tq/h2Hrlc+JiEq5jUfwuJgPCAQSWTxfr4mo0pISknLyCKoHE3eAl2hvxuBigymkrKKqpq6hiZLq94QrKOrB4AQ+bpPYARi29rR+pu9SPH/i0Sm9N1/HptCaHQGk8XmcHl8XCAUiSVSmVyh7CBMpdb01BKu0xuMJrPF2k2dQqnSyjQRdofT5fZ4fX44AolCY7A4PIFIIlOoNDqDyWJzuDy+QCgSS6QyuUKpUmu0Or3BaCo0W6w2O3sHRydnF1c3dw9PL28fXwKRRKZQaXQGk8XmcHl8gVAklkh9fGVyhVKl1mh1eoPRZLZYbXaH0+X2eL31znsffPTJZ18A+Uqvb4Y04eyFBagSHhL6D26/TnjwESBEhBjJ6FgmyubifCgUS+XxSnVicmp6xh6JwZId0RTsbGKkeuNS0lyN71m9UF+4uJj9Yx268ZNzQXXYx+lKWzkCx1VMSHNZdXYozoZKNQjm4mzInuz7C/kQ5WXa6PjF8kVvUe5PWXPGp1GcLbksyngr5duUksRN+ShLFamYSMdjsYWkVaaKkoYs0Yp86/orxfSdtgrtMsZPvkDwLj/rBLT6vF3n5WXrt5sM3Lg0LdWl1cAGlAqqKtcIlHoUwR+oN/9PNtpbVg/LCM5HC0V39bRsbnJbanlaLEPWcmnO27DcH9scDKOIeheXHyhaJN3Q7wRdzMnT8TG0yq1BKy76TyGv360vr3ddyvcJ9RrDOFPd1NySgFfjYzGGyf5iXT8pjCOtDQTHbGkMVWdvOa0O36lMDWQMKpOhLRk46LYMgf0wsyhhsJpVW22o6frT7risv2iT4auV8ul4rw1P+zSUFZcRsiiucLuU97Cs6czx5GczyGKr/DXH4/S232GpWqklpddUPB40ZK76Aes7xQUz12OHuZOJG+ilZcDbMdeyj7tZiKLXNW1/H0nH25mIlC2DHK7LSqxrqVm17Gu7ZGAgaX0q21tH7hmI/DxDsVZNic2AaMCz0sxfgK0ycb1Lovq1NKl4VZNzZluPZlGL25YbBFrU4p3y6xxPmJwggzKoTPHus8UgEX7u7yoC9NqqNMv/9KQ4X8m7NJnyeOqfhW7Ah1JtW9OYNbt1VRBroOcYvN4rAn1bdGHvBcrMbbruBbqsEoaQzmQ4QaRuQQARTjCYLHY83+tWIXGueq31YwxAhBMMJotNUhyuemvQAQAAAAAAAAAAABBCCCGEEEIIIYQIIYQQQgghhBBC1u0YQIQTDCaLTVJc9dYiq9qynVU7SXLsrZ7erzVK0W1ciY1n1ae+WsYu9amldanjksFedq5MD0OWbkchyTVL1vZDlttGrCoj/KBIp7YKMkQwhr6xhlap/YRmuPyZ917pX6zR/f74vZQdHC74/R+b0fvAEi54MwA=);
+          }
+    </style>
+    
+  </defs>
+  <g stroke-linecap="round" transform="translate(10 86.79882824999999) rotate(0 91.072265625 64.396484375)"><path d="M32 0 C71.11 4.17, 112.19 3.9, 150.14 0 C173.2 -3.04, 181.04 12.18, 182.14 32 C179.02 51.52, 178.95 74.01, 182.14 96.79 C181.29 118.71, 169.89 130.13, 150.14 128.79 C108.67 123.44, 68.46 124.2, 32 128.79 C12.02 128.01, -0.43 117.66, 0 96.79 C-0.76 79.28, -0.36 58.44, 0 32 C3.15 10.73, 11.2 0.72, 32 0" stroke="none" stroke-width="0" fill="#b2f2bb"></path><path d="M32 0 C64.05 2.4, 96.32 1.11, 150.14 0 M32 0 C60.76 -0.85, 88.01 -0.73, 150.14 0 M150.14 0 C169.71 0.84, 180.77 10.85, 182.14 32 M150.14 0 C171.83 0.68, 182.3 9.89, 182.14 32 M182.14 32 C182.44 44.96, 183.2 59.08, 182.14 96.79 M182.14 32 C183.13 47.29, 183.69 63.84, 182.14 96.79 M182.14 96.79 C180.7 120.02, 170.01 127.4, 150.14 128.79 M182.14 96.79 C182.97 118.41, 171.81 129.32, 150.14 128.79 M150.14 128.79 C106.5 129.08, 62.76 129.23, 32 128.79 M150.14 128.79 C110.15 128.92, 71.56 128.04, 32 128.79 M32 128.79 C11.3 127.37, -1.73 119.21, 0 96.79 M32 128.79 C12.93 129.98, -1.01 118.72, 0 96.79 M0 96.79 C-1.32 77.18, 0.45 58.72, 0 32 M0 96.79 C-0.42 82.36, 0.21 68.56, 0 32 M0 32 C-1.6 9.18, 9.92 0.97, 32 0 M0 32 C1.83 9.93, 9.38 0.45, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(24.35230255126953 116.19531262499999) rotate(0 76.71996307373047 35)"><text x="76.71996307373047" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">EventStore</text><text x="76.71996307373047" y="59.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">DB</text></g><g stroke-linecap="round" transform="translate(286.44335975000007 10) rotate(0 357.517578125 140.244140625)"><path d="M0 0 C248.91 0.2, 498.91 -0.71, 715.04 0 M0 0 C204.79 -0.27, 410.1 -0.01, 715.04 0 M715.04 0 C714.81 87.99, 714.17 175.87, 715.04 280.49 M715.04 0 C712.99 86.59, 713.99 174.3, 715.04 280.49 M715.04 280.49 C497.5 279.57, 279.5 278.74, 0 280.49 M715.04 280.49 C512.53 281.83, 309.11 281.99, 0 280.49 M0 280.49 C0.14 203.06, -1.13 128.03, 0 0 M0 280.49 C0.93 200.63, 0.62 121.32, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(575.584717 10.000000749999998) rotate(0 66.219970703125 17.5)"><text x="0" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Connector</text></g><g stroke-linecap="round" transform="translate(315.25390725000017 109.98046875000006) rotate(0 92.08203125 41.21484375)"><path d="M20.61 0 C60.84 3.11, 104.34 3.12, 163.56 0 C173.7 1.53, 184.58 7.6, 184.16 20.61 C184.72 32.62, 183.25 41.81, 184.16 61.82 C180.65 72.56, 176.76 79.69, 163.56 82.43 C120.44 81.68, 75.32 85.91, 20.61 82.43 C8.38 83.45, -0.43 78.63, 0 61.82 C-0.48 51.63, 3.01 35.52, 0 20.61 C2.95 8.54, 8.05 1.37, 20.61 0" stroke="none" stroke-width="0" fill="#a5d8ff"></path><path d="M20.61 0 C57.73 1.59, 93.84 -0.5, 163.56 0 M20.61 0 C63.36 0.53, 104.98 0.78, 163.56 0 M163.56 0 C178.02 -1.93, 184.91 5.51, 184.16 20.61 M163.56 0 C175.54 -1.78, 183.71 5.02, 184.16 20.61 M184.16 20.61 C185.77 33.07, 185.67 44.75, 184.16 61.82 M184.16 20.61 C183.65 34.35, 183.79 50, 184.16 61.82 M184.16 61.82 C183.67 77.34, 176.29 81.03, 163.56 82.43 M184.16 61.82 C182.89 75.09, 175.65 83.13, 163.56 82.43 M163.56 82.43 C115.71 81.92, 70.69 84.07, 20.61 82.43 M163.56 82.43 C125.26 81.96, 85.06 82.94, 20.61 82.43 M20.61 82.43 C7.89 81.88, -0.85 76.39, 0 61.82 M20.61 82.43 C7.37 83.32, -0.18 73.58, 0 61.82 M0 61.82 C0.77 45.27, -1.37 33.96, 0 20.61 M0 61.82 C-0.59 46.95, 0.53 30.99, 0 20.61 M0 20.61 C1.09 8.06, 7.74 -1.26, 20.61 0 M0 20.61 C-0.85 7.03, 7.63 -0.45, 20.61 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(327.8719873891603 133.69531250000006) rotate(0 79.46395111083984 17.5)"><text x="79.46395111083984" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Subscription</text></g><g stroke-linecap="round" transform="translate(549.7226565000001 109.98046875) rotate(0 92.08203125 41.21484375)"><path d="M20.61 0 C51.98 3, 86.81 -0.03, 163.56 0 C180.69 -1.64, 185.34 6.42, 184.16 20.61 C181.17 34.62, 186.39 47.26, 184.16 61.82 C185.1 78.49, 178.31 83.27, 163.56 82.43 C129.99 83.45, 92.49 84.07, 20.61 82.43 C5.28 84.98, -2.61 78.22, 0 61.82 C2.63 48.27, 2.01 37.12, 0 20.61 C0.71 7.77, 10.33 -2.46, 20.61 0" stroke="none" stroke-width="0" fill="#a5d8ff"></path><path d="M20.61 0 C53.35 -1.68, 89.59 -1.33, 163.56 0 M20.61 0 C61.45 0.94, 103.32 1.39, 163.56 0 M163.56 0 C175.8 -0.13, 185.29 7.61, 184.16 20.61 M163.56 0 C175.51 1.17, 184.57 7.33, 184.16 20.61 M184.16 20.61 C185.08 32.93, 186.23 45.82, 184.16 61.82 M184.16 20.61 C184.19 35.17, 183.48 47.84, 184.16 61.82 M184.16 61.82 C183.64 75.45, 178.11 81.92, 163.56 82.43 M184.16 61.82 C183.72 75.97, 178.95 81.46, 163.56 82.43 M163.56 82.43 C113.63 82.31, 61.8 81.46, 20.61 82.43 M163.56 82.43 C131.14 81.85, 98.69 81.79, 20.61 82.43 M20.61 82.43 C7.22 81.05, -1.74 77.12, 0 61.82 M20.61 82.43 C5.09 81.39, 0.07 76.76, 0 61.82 M0 61.82 C-1.54 47.99, -1.82 34.15, 0 20.61 M0 61.82 C0.23 47.8, 0.66 32.87, 0 20.61 M0 20.61 C0.51 6.47, 5.56 -0.2, 20.61 0 M0 20.61 C-1.53 7.82, 5.75 1.97, 20.61 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(605.4327089902345 133.6953125) rotate(0 36.371978759765625 17.5)"><text x="36.371978759765625" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Filter</text></g><g stroke-linecap="round" transform="translate(784.1914060000001 109.98046799999992) rotate(0 92.08203125 41.21484375)"><path d="M20.61 0 C67.45 2.7, 110.05 0.25, 163.56 0 C177.8 -0.84, 185.72 6.3, 184.16 20.61 C184.44 33.24, 185.24 55.86, 184.16 61.82 C181.64 76.6, 179.27 85.8, 163.56 82.43 C109.86 80.03, 54.74 82.07, 20.61 82.43 C9.59 79.82, -3.4 77.02, 0 61.82 C0.8 46.03, -0.49 29.99, 0 20.61 C-0.03 8.06, 7.44 3.32, 20.61 0" stroke="none" stroke-width="0" fill="#a5d8ff"></path><path d="M20.61 0 C63.2 0.11, 103.08 2.67, 163.56 0 M20.61 0 C50.48 -1.36, 80.17 -1.21, 163.56 0 M163.56 0 C175.32 -0.26, 185.74 8.08, 184.16 20.61 M163.56 0 C177.42 0.73, 182.85 7.24, 184.16 20.61 M184.16 20.61 C183.64 30.28, 184.35 41, 184.16 61.82 M184.16 20.61 C184.67 28.36, 184.39 38.57, 184.16 61.82 M184.16 61.82 C185.16 74.91, 177.15 82.33, 163.56 82.43 M184.16 61.82 C185.98 76.86, 176.26 80.52, 163.56 82.43 M163.56 82.43 C132.16 82.02, 98.54 81.69, 20.61 82.43 M163.56 82.43 C119.13 82.86, 73.97 83.91, 20.61 82.43 M20.61 82.43 C7.11 84.06, 0.64 75.04, 0 61.82 M20.61 82.43 C8.99 82.7, -1.89 75.92, 0 61.82 M0 61.82 C1.46 51.27, -0.18 40.82, 0 20.61 M0 61.82 C0.62 53.18, 0.38 43.49, 0 20.61 M0 20.61 C-0.75 6.83, 8.14 -1.32, 20.61 0 M0 20.61 C0.83 6.17, 6.38 -0.27, 20.61 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(851.3394620302736 133.69531174999992) rotate(0 24.933975219726562 17.5)"><text x="24.933975219726562" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Sink</text></g><g stroke-linecap="round" transform="translate(1095.777344875 85.84765612500007) rotate(0 91.072265625 64.396484375)"><path d="M32 0 C66.66 0.27, 91.7 1.83, 150.14 0 C172.1 -2.5, 185.73 9.22, 182.14 32 C181.51 48.02, 181.4 63.66, 182.14 96.79 C182.43 117.84, 173.39 131.85, 150.14 128.79 C120.22 132.13, 87.28 129.98, 32 128.79 C13.68 130.58, -3.5 120.23, 0 96.79 C-1.32 81.76, -3.37 65.71, 0 32 C0.38 8.82, 9.22 -0.09, 32 0" stroke="none" stroke-width="0" fill="#ffec99"></path><path d="M32 0 C76.7 1.38, 116.23 -1.02, 150.14 0 M32 0 C58.19 0.09, 86.91 0.07, 150.14 0 M150.14 0 C170.74 -0.58, 183.71 11.08, 182.14 32 M150.14 0 C170.48 -1.15, 182.06 11.1, 182.14 32 M182.14 32 C181.17 46.89, 183.31 60.28, 182.14 96.79 M182.14 32 C183.56 55.16, 182.87 78.22, 182.14 96.79 M182.14 96.79 C183.06 119.8, 169.71 130.28, 150.14 128.79 M182.14 96.79 C181.48 116.49, 173.12 128.2, 150.14 128.79 M150.14 128.79 C112.88 127.16, 78.27 127.43, 32 128.79 M150.14 128.79 C114.72 130.84, 81.17 129.4, 32 128.79 M32 128.79 C10.38 129.93, -1.1 119.55, 0 96.79 M32 128.79 C8.44 127.22, -0.87 116.41, 0 96.79 M0 96.79 C1.15 76.66, 1.03 61.07, 0 32 M0 96.79 C-0.58 76.45, -0.34 58.07, 0 32 M0 32 C-0.07 8.95, 11.84 -0.81, 32 0 M0 32 C-0.74 12.08, 12.71 -0.9, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1121.3996364399413 115.24414050000007) rotate(0 65.4499740600586 35)"><text x="65.4499740600586" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">External </text><text x="65.4499740600586" y="59.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">system</text></g><g stroke-linecap="round"><g transform="translate(201.60937525000003 155.4140625) rotate(0 53.663985771588045 0.2945782786702864)"><path d="M0.91 0.83 C18.93 0.72, 89.59 -0.46, 107.4 -0.5 M-0.07 0.23 C17.84 0.31, 88.51 1.28, 106.38 1.05" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(201.60937525000003 155.4140625) rotate(0 53.663985771588045 0.2945782786702864)"><path d="M82.87 9.55 C89.95 7.09, 94.29 5.65, 106.38 1.05 M82.87 9.55 C92.57 6.91, 100.62 3.2, 106.38 1.05" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(201.60937525000003 155.4140625) rotate(0 53.663985771588045 0.2945782786702864)"><path d="M82.91 -7.55 C90 -5.87, 94.34 -3.15, 106.38 1.05 M82.91 -7.55 C92.44 -3.48, 100.47 -0.49, 106.38 1.05" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(505.06250025 152.546875) rotate(0 17.382870296171177 0.024521116632968187)"><path d="M-0.41 0.47 C5.2 0.37, 28.28 -0.36, 34.15 -0.42 M0.38 0.24 C6.13 0.2, 29.48 0.35, 35.18 0.17" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(505.06250025 152.546875) rotate(0 17.382870296171177 0.024521116632968187)"><path d="M19.01 6.24 C25.91 3.36, 31.04 2.06, 35.18 0.17 M19.01 6.24 C24.49 3.74, 30.84 1.65, 35.18 0.17" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(505.06250025 152.546875) rotate(0 17.382870296171177 0.024521116632968187)"><path d="M18.89 -5.58 C25.86 -3.94, 31.03 -0.73, 35.18 0.17 M18.89 -5.58 C24.47 -3.9, 30.85 -1.81, 35.18 0.17" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(738.5585940000001 150.53515625) rotate(0 19.18487723590806 0.33168593880680675)"><path d="M-0.41 0.47 C6.02 0.4, 32.34 0.04, 38.78 0.11 M0.38 0.24 C6.74 0.45, 32.25 0.59, 38.48 0.55" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(738.5585940000001 150.53515625) rotate(0 19.18487723590806 0.33168593880680675)"><path d="M20.37 7.12 C27.34 5.4, 31.8 2.21, 38.48 0.55 M20.37 7.12 C26.82 5.13, 33.03 2.74, 38.48 0.55" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(738.5585940000001 150.53515625) rotate(0 19.18487723590806 0.33168593880680675)"><path d="M20.38 -6.05 C27.41 -3.29, 31.86 -1.99, 38.48 0.55 M20.38 -6.05 C26.83 -3.39, 33.03 -1.12, 38.48 0.55" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(980.3320315000001 152.49609375) rotate(0 52.041878668218885 -0.32124529088847)"><path d="M-0.38 -0.03 C17 -0.05, 87.06 -0.5, 104.46 -0.66 M1.62 -1.09 C18.9 -0.94, 86.99 0.31, 103.96 0.45" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(980.3320315000001 152.49609375) rotate(0 52.041878668218885 -0.32124529088847)"><path d="M80.35 8.67 C87.77 7.58, 93.88 4.24, 103.96 0.45 M80.35 8.67 C85.5 7.1, 89.17 5.82, 103.96 0.45" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(980.3320315000001 152.49609375) rotate(0 52.041878668218885 -0.32124529088847)"><path d="M80.59 -8.43 C87.86 -4.14, 93.89 -2.1, 103.96 0.45 M80.59 -8.43 C85.76 -6.51, 89.39 -4.31, 103.96 0.45" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask></svg>
\ No newline at end of file
diff --git a/docs/server/features/connectors/images/connector-anatomy.svg b/docs/server/features/connectors/images/connector-anatomy.svg
new file mode 100644
index 00000000000..5cab9693ce4
--- /dev/null
+++ b/docs/server/features/connectors/images/connector-anatomy.svg
@@ -0,0 +1,13 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1287.921876125 300.48828125" width="1287.921876125" height="300.48828125">
+  <!-- svg-source:excalidraw -->
+  
+  <defs>
+    <style class="style-fonts">
+      @font-face {
+        font-family: Virgil;
+        src: url(data:font/woff2;base64,d09GMgABAAAAANtcAA0AAAACfqAAANsCAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cGiAGYACHOhEICojDDIazNwuQXAABNgIkA5BYBCAF8SwHm3xbju1xYYy7sd0OAIpS8WVRITvfArcDpBRW0yrYuBoNGwdgevzg5P//85KOMXSkA8Aye/31X6aqSFOjM8yLldTu6uDRvazbyMy9zzwgOKQom/g6a15H3etNifhB1SU3kXgQVsw6e7M0xQm+4QP3vDzRvyYpK7Ba6lJt8H5GV4Xf+EcERLVOkazgxYl3h7PDv+FdjElJVZs7TTRxrr2RZUAZtx6MZOXIlTf6DtDavOv/vvtI4L+peCq+4cnn4emyiLYQELHRxsjcZuWclZsVm7NiTqrgNnuPnmjCgUoQxd53u3tpTX2VhFY9DuFKNR4ho/FgLPjSPINHmGrBMfPo+TrQ/Xc38WQ8hiEpxsolKta8GqM2D/6r/XpvfZm1b8IgRVhHxZgTUmt7/uup6gX8QCoA4DIvm+7/Bxg4sk1iY6xTGpUQoZKDRhH7EZH4vQAEBnNq0lf6SpZlGQKGQMuhwjgwAjvaLSM65Nfe+x7wxumASwfAsqWqLcltnCOahodxOqb/P6f2753zV+9tL0hyp7OxrQGA5SdK6sw4Oe5M2p+PnI29TbYSGwKSJVuOXXCgTYGTAQ4kANdwKoAMD8yzjSG1lSbqpPUt++3aGXuX98JPMVd3kYOQCAceo5A8jPq4mWnA8VObfn/FIsbA8JBAdCakpIHEiQEptVg9qctPV0xPe9vrHi7/f11arv8eRf1nbr8ncp2VYgubCUYOR65OgDBKALGSMCFF2e9PubRe9ecmXdWtJJ6ZxTi0QNlkAbjt/giXa9W16vpePUnVYBA02c7EDabEybhthwZTUn0gv0/3+p6TbjblsxSGFrBPy1Q1mfbeVtr1kWwWhOBBkg+Vza3g/76pfd27XPXbILAVkthO8hLLdmA44fe4Wz3zPDuwmcVHnwtk/ya/ohZYtkUNAoOALNmxMwo4XFV3z4nKJqphbq4kTdICkhZmbtQjBYVNbC4X6OGo3n3X2yl3YOz/M9VsF4q4TJ1jqKjO6fUxdx32z4LcnWUABlTgLJVmKT9iQL4nDHgBAylT4CWKTjHOirY4e4lDOXApp+U5JcqVXeVcuahd1NBV9LuiufKeO3dX1OfK79rSzpVKt639vmVluMa8XSgDoAh0FtLun/kzOic2tta47pb3TEIZmVWj6q6ZkfwZhzw8QA8egQcFCNETugPw/v85X5sUhiynJIFlI3Z8e9MUko/5nHE+0JjS3rx8eM0bAcsOyc1OebbmZZhOTW5udm5y879Wq7sNvIpVyJQiYqFbtGxus2fy5w8yt7hbFZMkbjMkrv1B50iJy0RvGiKl8EjEi3Nttm28ox3VNfEIkVCPdo9kCYLc6T+EQQIHInnzoHkY5hgHz797ne3/L7dbSI7HyBSrukfSOSRjKRRVlakDh5Ecj0XixJgS4TXLWpaBJGgLIwxmJUKk+7rO75qapUspub25DUNwVIEVCGaqMCzj3n78to/FsNd2UYsokxAE9Jaxstaedp/nHQUCjo4fKJAEob1jOau9NX+ZtluLImGQJDByJv7W58quoxXEyj7O/CuT0MM2+95tP26P8gghiAwiInYq4R+OvRUAACAH/npZ0PzWt5/YufDhz7256jFcmUAE5G6CAHSDNBOkhBmAAkAvVg4ASFLBIgBMEcS311N0A3o5BXwGeg0AEj0sSO5rtQJ6wKff+l4ZOq3TCgDYzx4AAH5b/wEAeZdu+N53KawBwDc+eNmGOPs4BBLooVAAACZjbLS7sLHNmPkJSVfYOrXu7Sl71l6+1+0Lh4GknYJTdmacW+fZ/Ynb+7TyAHmkfJNCq8SUt0/3E7bp5Cy32d4iJnn+W6Jl7ifXzd27p+05e+XecECEhaSfojNwbp6nd9zexV0yERnl8uvXTMvH5RHAz/fy6/LLcmCJSRPt/6/3HwE/9vfzpZBJA370Tz88+hwIAA9enduhAHD/8tcfmgzk4SEYXZQ5XZx1fWVFBQDKlE9rKlXNr1qNWnUlTtIkA8B7kzppAPDhvJiXsO/0Z77Nd5ju+H9+zP8j4AIBkCgMfXPPORACoRCtOLALYNkHn+4JgNJKKAONlfLNPfDWdCMOClRo0GHAhAUbAhIOXHjwESBEhBgJUlxwxQ0ZchQoUaFGgxZ3PPDEC2988MUPfwIIJAgdwYQQShjhRBBJFNHEEEscegZGJmYWVvES2CRKkixFqjR26RwyZHLKki1Hrjz5ChQqUqxEKQAYp1uvPtPMMmiJxZZabpkVVlljtbXW2WC9jTbZYputtttph7322Gc/ABg+MoR6LWCRoWr6G1XT2j3mAIARMFCrqQjt+7XPAECttvYr7TZKWf5NX3sPqNM+VB6ty8wYIHO8kGHK2rUN+KWgNLIN4RDlSz/Hzf2/QAgDxppgjH7jTTLZFBMNmAEApptnvrlej3ESDMs8lrFqyTbxY/KOsX6iK7waaxG5TW//d8CBXwDXnyaOWKFHDP+3w4Bk0KUsmdKxg4/hBrF+MEnVFCqdCgcrvLRDeAaqlsdjuEMwEYFUcMY6sMpqehSODsbSUegpK5g8uzw+HdTDSnztsJZ9kD7RDxrWdAwOgHJ+uHEQWFmrsrGHSPMD4sxr7sAgSWo7WJZU7FYFuDS7qqa1vf08ck7eVJI8u19Uu0oWu/HoDT6U4xi8BPdInUBueMfDprK2O1Exo4EowGGyZX/l9oaZ0P/MPeMzolzAeI/h9fJZL6fEiMLR4/DZ9G5R3DjgjBhCDK0nF+rtcJegKWsjbuTG/xnOjy9OjztXp1m9kaiVHjfG2+35kXPTTw2yBm+hPDb3DLw/7fMSpqPUxBNVDS2Ede9i0pwcDVaPyjODQZXof3/5AHJOZuyWJuT4NhdwKkYL6iHM42hbm7mbvR/DaEfU/VD3aWNkjhHAGOHwGL1CF/I34o72rAI8q+iWPmhPAE8HZn6FT9M+p6WpkaYAaXrgCJFEVTGyLoDLOJWQ5euiHZlYqGghAAvhoIXOwmgNTCwWI8TEcGoXl0DIS9NJs8tSAkSViuqiqMIyAz4PBRZxntokNoDNDNZvTTuoj1HNQjBGYKEjtASjwCRjal64JB1hktrjvjIeys+qaWKIywULhp71PibeIl/ZdE6mwjw5hTlM54oypce5/mf8h/mnslR9akjCkyx9xmfhSfoX81SijkaPlE1F6ECqo6QU0knhTiQVepzAqeSdKp5CTomneO00LYqqCBYUZMmxUIHBtAj/omsRVfwA9A8UXSEfEB1G4OVG1DvbIyPijZW+QsZC/+NnwzXsttuwVRdsHHRx0ObBxZK9NaNzMqGONgBw4AJW/24kFwSGXiE4C0ObI0QEHBwpnvKMc6UaAcBBbDBYFAHE+rvx8Rrf5t6QY9zWPd/2Mw32Hqx/bo5BLlwc27ixQHKbu04zHo27lp89ugJovwHQZZIBtiraYuammzp/YlWf2tTZSt2mOJTZ6dbNYYQ5iIc0OdZMGSF71AXIAKT4CMOmZEp308ZSxRldADy1B6GV0KmyBTV3ylrYRpwx4v/5oHmQXTm2r46zevcNLMLaot93tDZ44/pmCa/5/QEdu0PkxixEA5lAsN5GBr5/x7FHjdySJ6peBpn1gfFeYG+lcXK3hkchnxqyBtALsBHi+5QpdUd8bZ0f02poNXggNUCqXpcK5ViVrVhUZTvMhQnModqUo88/7/CDriEAkQVOzJNELBbjo1EjynGBQJH8tmraichIU+rRrcpMma2YzjW3dYMd++AJYMauqMTRZ14UAoLYb16J0/lMbkKIuZGCVHjSZoMZcMeYfUQHJ8C9ReOcwawLnBxhLJc13SGdb9OSQnPMWBU2pUkaFQTpiLcCByUElO2xgStGK3sDxQGWsQKPN13X1UEup5GBC+AKWzulCyOKKkox4YbCRwpJaVnZzceEIGZXp2UXeRqgNFVJyXGgmr4JFSsF6B8mSeJA6CE2kKvDsVdXImK6WPNI6BQiAtjMTzk2hD3QCC2yDreK3dIeNFEPnjapg7ysW5LsOkxXaL1WSvpMwI5BR67vA9ylz4RposXi0i7Pl6E1BQuk9PCt2SF/tICYMSEQdyBz6Uyr9yH4ngsVTxnTki4lAOSPxKJ8UR27zb1/KsD4Pkim/TwPN0AI0vuNkScF3axO8CWeaEGeF41qUBMTch/B+rCLGSiPDFF5S1uU1dp/yssDxD4+rScOG+I5c3ug/4/jfTsoJ9bWreJA9uEeMLa1daqr46rmWxBEEa+LO3IZu9voOTF9WVEJuUoWj8OL9KQvt0VfFnCQJxKy4I9jPmwDpJ3ADepU7PVY7GmHiUDUzHJB4ChYdcfT7vex7AKPH12lkI3ukAkBQr310e/gUf4ML6nqnfF+ch/eFu7XfscKPTaWMqOpv5llWiyGuty/eXyH8irGHbIZWkXWKCSH8iH0AJKeR7+M6mo6sRWexmeB4gMwUZB5RTsHeuXEqq93jvK6weNOAtnjyo6jBrAuCoqmC7EAyEsvDr0IwkPSLs0s/YCJgqURHnqOA/7II1LZLudVWxXl4ShQpjiLjvmT82UXX+kqhRiho7DQUXlPwX9bq1SIe0xZnygT8xhTxESAMbFt8aUsWnhII97W47q5T5g3A+witlMcOuJlqOyQD60pTf0jrS+Pr13WUXcxWR6gwl849mDTPsh9ecXI48BiPiG+rh2VbIjByAG+Gjhwvx2bhhKunuJ4x1P9KMac+lJ14wo1t5jWSVV/GpuO+2zt7nOEZbgISctSfPCEBC0Fi93W6TtPmVvjQgs4lCSYIUgyKTPetL3h6wqo4j+BNOvX+1VZmia5EQsf78NccTzHg2xg7X5yOvzxpWfo+chH2CAxllN3UNoQy9DT6UESBP/oag1I5wC9aoZwtUjSrnp94aaUi+yGRnhqfk9ALUf1OaWV522q+s8Km8c3wyP2UxbqiudRWmQCzTBFmqEK4c7qbsQs0XRFrITrAcSjzwmci2iCFbohpI5n0D9e/3G5U12+bvr1qM54USuWC1rbjg4dMTEhHQSIV849b6uuDtA//i+AMMNKWTcwHsCEmMNZXlNJPFGznOkh8mDGJxW6rZORF0sRqu70qRj0lW9Q2qwoEw/br+bT4Wt2zNaOKtXsqULwj86Z4qmgAgn3CmrOKFp5Lt1YhPK8wUsJ/BgervTzjTlPResyDS1wYNzFBfTUsy/nd6htYR870mSf6UWwmMdEIOx4UYCTt0Y5WJytlZjqcP/y2hkbuhdpapclqIf6C44plflFzGZ96O3QxToYQbsuhnZePWArBDAkyZcEQXocoWrKCjSmTPiykomvu9dM3ICYmIHyHTriO5kCM1a4LgbBbED1lKOsqOHikdYHpgdUa1q03Rl1/V0/y7IU1b6RjKqyojzqIEtO4jgO8ISLOaVBu4So7GYHDBOAcQfQ/WgtQgwdUuAHrVcO/oskq62xpBt+ga0+SMF/JbG5JCR9QjLySzjvPKX5/2HdmckFLd9CvS1weqRFwDANklaXtkAfPycBo0khfaU/VQ0mK1vXCNMJG0RHHEULs7dmzbAS5GfQAMgJDNAWPVwRmNyUFUreGjISX98W0tt6tMkxU2GzxITNcfYgMT3cTANgow289so/FSwLj86mhfg2v7bqnr1vl7M87eTwqvlsTBZ3XRcP6QzSP3nXESNI+pXx/uM5b2sy5sfPMgUCRfEfjjSE4PXlYlMn+331ignbDlRV19BUKV87JV5vBMqXm6Ix4xCpPF5EIOf5KGgsdQt7nw38DT+OTyrylaGtaGwxyB1NEFSCfZw5MT2C8Nm9Kj1B0Oqo3j+aI/n9Luk9M+E5UmtfVaTotdbg/6zo3lN9dJEbeQ6hLbgusgGZv6kr/Wg2yOtGfBBKy7NY2qw50jA7YFVOEse1S3vVrNMfkx/3knJ2S3KISf+Ta9FMLVpMn0o4gbCFjNSmCLFa69fXD51cfAs5x5RPYapWe20Rck5J7YTHw88CN4HpmXJY2naTrJFPJk4CtojNReHSKMqIT21JfBjdADghkp+/0D6zcYJ7e1dLokDjAMtrDU5M2Ahgc+MIZMxyhsoYB1iuZQpyPvw3AnkSzjd18RyIEzcrH27G0WfYOgNCJqRYYt78Be7FBMu0R/KqL9HyvvGo4EWkuFrJ6Y9pWq7QJV9cx7e0mn5AYusQk8woKkPa+t2FVoI4RFU55UubO47tsoNcqJbK6sFwOCnVWvyYhXIB6MDxOKrK2qkyB5Tl0olOFJ9mpIWj8YAd6J1NYfN100pyZwRWKkFRQVRiPqG4CgPB7ku29oi59R5Vd/XpXLxxo8SRlHQjOoHSA1fb3GzW6a7LYIqNXKz+J9VE1YV0HuTOnrMHy6BqP/4xys6nD8J7KJUCE7+vx776uFYfxYSalVTlxMEvi6Lc3xYpXwp7J+BFr8v5U1TNeCarbvYZo+kKDtG7jbTPybMS6THUALIqhJwAmS42sCtBR4tyGw8diRc6aj3EisGDbCs46b4qrqfkNh1SLQH3gjqAMCU+HP9AoEU/LiQQsrB2/emNL/TuL6D5kljd1aQqD18Aicu5AFpKVFbNKvEniI3YdVfSPAAhGfFlD/zV0La8iRe8I0nz/k90gbLHRh6nlUeGrqwkao60rC7T2rr6/wLa2b6/z9+KykDZNzfvnNzws97nV9+QE+Js0s45y6Y1kgpm6GTEvQB20xQRp5TmdOlJkB9yC9geQShRkoyofl0jhHgIm9cz/8i9dYrtyjrrFxxRkUVRiliX1rTLULIKQD5y8oTmNLhcKGWSnYq1iT2b5w4gNo8L32gfEdwM2/JV47+rKZtul7IB4Xr1ckklpkCrJ3bpC0qZbC7FgKqDG3r8vUMpcZyVFQWvFD477sdpV7ERmDyBbkGVhbuFhUwZsb6mHwb91eyYTM+3RYoZDSuqyiTFRk4DVfZ9NnzcY2LL3cEwlAYK6WjG8LgsDuxy9XqOg68aWFN1A4ykXFdACDdoCgrlsXFIlnoU0yWPRpoUoAfhhjDwz88ReH3QYj9CS6T50xMnnZg8FyKK0ak2hnXHcpT3zeHyfTBuAJCREyH/CGmAmeBi4oD48EeKC77pGrc+sqp/vN6h4rG3dWG2SiDEmkd9eYHptMUGIZDuAEZnmEtyhaZuqoZUrpB7fcmeTZn4PJyQtAC1SzBYOBJsIzEhFtJKB8Wl1D3+guAeCAMCfKa5aWICG2tcJGD7ms4WrMrYUFpzoDRZNSvBQ4qGsAoVjY0arTEV5CtMqehvUn+JEgOdJkLsUgc3EXWYpRG1zd7pBWCiWNoOlIcmJ4THAdKBqEWHkAfBzD8oNJQyC2rBGsTpjmGrQnD1VpztsnizQxo8jwmvi+YocMa/SyNctJQWe6/WWhKORIjJ/uDJIVmej8fDr74XrjdFz84RroMh5qU942TSgFTWbscKaeRONangQ1ziFrXUuhvAZPmA+NPFZf+b5KGxMY9w3+HEf8T3REulEVXxhNAa5VX3ac5CWbHLOQBywi9OiAoz1oNPjRHzelB9TTq1f3+B6aukQksM6VtY3Qik2c93oek7S/99hVh+Zsx1aD+NSa+XTKQM4SGlVMz7sfp0jhCEsUAI0UbeY5OWrkUP3eZFMBTPB5R4Fxl2I73DIWCmCFnriHhbTe81sqS4a1tOng9eeLEdfT5ilfc1dadZpuijqJqudO3xbvWFzhEUXkcrSGl3Jh5Vp65aHVObFyEMHd5UVEenrpQZtc6tp9Jz5prqatwBWnVfVPFn30A9ELtCDMzo8ZQRYvu90j+mlbwz0yG1Z2q1kI7+SRRblpbq+RYIBwsvmtrtjhypm7Eqp7YCifBjGXUHIQ7Fw7JsKe18MiMOR04dz4I1HEnZeQ2GYAMBTCFJVcS6AdvtfIjvbZo7+5X8yyXdDFPsQAyY7VkZl1iX2bVFCOsAm02DkxFIWswTAMJivfk41oMje7hBQkyrktIeO7qxUi7bvSpyNgKLDrzNhQkQzDqW9qTM7TFLZ8bU+40oSG6Ohd7DzKRSfvRnSCmKSvWHgvaY5SJRbzaFb3SMBAf4uXtV/qqWo5US0/fy0TExO8S023EQkn1pag0NM1GXhDQgJsQTgooXkY5qad4QfPntE7dWQzb1j29RBzf9hPcSGu7fpblc2kVLnvj7GV+WPaOBGXroOKSjuD9AFMCAqaQrQ69wGsUypanluUwTYPXXz76FNtIVyzuGui2YIWw9EYc7xzwJ5VWbgDmSTMSNM61X611iA9GZaY5iFKDXwxefBxyPf9MsUMW6/m19ygSorzld8lVHqrrqIj5ivCBc919Aut7xgJQs8PXBWFWCDmaf9WUHMklW+grDdpTdl51HRmqqtxYlMbJbLUFiFKFCIJSKVff1LqXnKOUjLbUX8vlIvJz5CwXi0KWpUqb3VptPIvOXZlIr+9D5EwrSOPXHRp36I3ZXKJjYwwyh8yrW8WkcfRqn+7cJfmalfKq1oVcnaa7Ip7LEd0tVO+BRM0MeoYAqTuyu4O05YuOJKGexTv36GA3CMLulw3ptac5mdQ8GB/+YEPdUdY4mfHqBIMJHKSZvKdJy1Q+KkL8XRMoXqLIeQdNRdTlA8Tsoej43QRgrBUlMRpSqyZKC9YdEgCPzFYfmroJVmtq287v4ABwfhm7GKrpm7tjiPnzN5VNM1VsB0UV3cN/DwKhGbZrdgoz3vT41R+zoEDPwcuusIwoSd4qT23ODlW3ZQDGywrPNKkik8GlS68q7M2on2/kTVpeK0W0YD9N1U5zddn3mcVgg/BTiTq1/tO4U6mV/8OTwdCzIkkcPJd2BbJQ/wZ1sJ3qoSiuozxTu1Yv17q7GnCWztzaP9+HFvJXOvqbsKNxtw5te3SabAPYR9QBhU0C5Ki9zKX05qR/TRFTjMNvQqEtdQI6X133upZQNHC/9WsxvknaG8PMR8sKTehUlTodTtrgdUAK9Nzfg+GqrarXWLZBKxHK6uqo3xiiTpgTy6UKQx+taqjupXaE2CwYzYGlhEtYIvhlNyztvDeY2Y8pcKe+ZoVlYjM5Yacxo/fkIGtImnhlzBK93VEE5jyegyxVQLZGPdHjDp+Ry71Q5JfGXDreOmNuHuWPMz7juOKBvXQDi7tFUmGPC36K/FOBRsmYTEmJa2PGJF7wvtKgMrd6D7GSBkMnyuJ2VTlJTZFo+9+EyswwTTFdlslwVnAL1CKZ/KfSI5qsihC/0cP7dS3Wlfk52hV742Bv4EergZ51PjWL9A80yI3WbKDp5PlxHngtEeMfCo2/3PhN6nIDmAHlJl/KiMW+Gt+G6N1N0b3+EGbHM0jYezlYPN+cOEO4Vzz97ZU251pMEUk7MiXfq2r1cZkvkeSNd71nkK3/C8x1MOGX5+MWwatPQByQgPsR1qU4FjCfJYcvrBAOlOFQGizW3wdv6UDCYIS6uIVf/xLgZdjrECCSWZDdq1a/CmdNTY9exL5/30g6wvcAs9I4av1ycA0pUuHSm623IDCUm1ft22irMcJ5WhfHia9lVREOjLMVgmksWFFnv/y4zwIR0LQrCRuVMbJXQvmdkF4JAv6pDecs1q+w6z4siQImgrIZpr16nkSQ1pteYhvt8jEk3VNNzSkTyCK3/GoxrWK+DOO3RWuT1qXbwgjBwP0DcVOrb77eVymTaj9Ah3Slb63MCqiQOmx+PQRUq2Dm4AAnuP9vQhT5bq1EJBwpPh4s+nKx6e4jPmVvTnqvyupEEn4gVTLC3sKKG4Vr9C/NY0rcvbZNMKo9WcbDSP1p3jHml2tBBR50t6kG/T7KTJBCeOJLcuol64BgTgV5olOXzDWxvpweYS5RtlIZatRVR79rYWafKwayI3aA8fqsVgeO002F8+DZtDcjiwjLNzrX22tlUssuyRZo1hQJ/65JRMBfnREpVQtfTYfTubGYgnK4ozBZCvtEx+fxQVDIdeTybyPgoYV7dECbG55uhpcZhvdstpczQ/9ToY6Eah0SKyQyf69DyzgdJVunT0dkT0p4+v3k1bXSjTRl40efIZmrrzjQOBEI44XznyRlmgOxiEk9YZOvbAKqDqbgN6uEAc9nNGahSFE3BnDsLx13gj753kkkajcdn69401pvO5ZDHSzRQp8mHMFA6s4gDsIh6pdtKoCu41BsfaUZf/MmN2zqcsyjsBI0vETyRpec0vZRu9SwmMk8zukb3CYTODOndBsNCTHVpeAtpGTHlgCBypAAs8qoZeIFcfbrQM0D8A/pUgS4RuFeX+lSwUD9Uhf2R35BMAv/uV8wCJuw0tZAhhF9ourZ5KvqY4tABwQ01eRlQVb2F473e48sdXGoa+ulEiW30hHTIRJxbM2IvPKTd732HlM55Xy5yDHFSElkz1C0euY1MCRfvzmhan8024uWpAhEhhu+kfcCCpv0BYhAYkdKq1gyM68p10sJnn5Vsud0GMenRu3P913ue0T/rIBfRWM5Er0Me0UxD5Dk8rEY63Bg5vuFgNnlp7nIUcsWbRYy6QrpXM650q3cq+uBRhVFN0eCCsYH+D6t4TE5q6M7FRrkYlHShV+tWngeMRw+vnOdRj+n1HE7oCBDsufH4Qmrao1hJd9NwOXg0JQwdmM5FJUqqYLVsFvPzh2Z5spD9iCBkYzn/u5GY6v+0szCoHVimWdzmEqJqZUj/rIdOyq8YwUogPw0G2DBdw47s2ZocNYCc47h0NI4XfOyUs5ptsVYVPJ6rU7tMSmnOoDiTTGxJEU3NvoAAQZxAhZiQJs40+iCb4grsDD/S9+yiXpMXGR+dgXhQE+6INPcx2c6S5jNmkZ3t8qU8F6y6OJzhcdFYT4ljUCpYT2OqFceBjtObOC8JFnzwBRhWSKts4uAJXbZXD3AKuBYPncMIDTJzlZ0dWp0TBBL6slEyTbt8hJ/niaB1Fqus5Gg7Bq29MrSUNnXyNb+H1uYuzfusfnhNHO/kHdPGI56JMetQOF30JT3nippxRKsZ/ZTSA6vUtSikC2fZ2YcR0OMJZNlD42I2qzIQ8mdoQ+rExx8T2r8O30HPewrjs0xnZf/vSUY2Bw0MmFk6V9Gy43mdY2bpNkvtvMgaBI8gOn2B2UbMIxermFQhtnqRCrXww7S3AK29OvX9aW8UGLxu50CpbsS9B4uEXKRi0wdyJD2qjjGf6Fep7psNfFv2wL7Rt87UKFF3WT1a9bsWXwrYhCUmJl+x68BDx3ozRsnB6KY3YcSrTqQvlBvo9MjfxnBTk6/BH1P8XGbG54XMxHv4STN9n2Q/4wA5grBdlukABnNeyiIvb+M38Nmv+AMnN8r+PCwr12l9zlpOiG5EzmTLwhIuFwKdHgd7ezWAylt+Lbn4HU5xG7CmoRoZAquk4Zq12Jjk3afTyg7JNIBFva1T0ed7/aPAvCZv78LCGtOrkDzy4UvMPWmf+1tNGYxc3Pel8ONP55xjHWIiw4XAtwjENUTwXTedeCLfO4ehHhhnvTcPmNjyvpYMRG7uAkG6nfJ2n0dUKvO3S/CFy2X0zl1SalCBHFqzTql0eFCgZdU0RBP8JBYTvSqAbTm8A+et8HKKM3NxsQ1FsnKXej8bvhQ+dthk1Y3GGDOqItkoZOuUflw8hhIhIHjFxbw8TXQQmyunCOHRYNxriKbdgcFQGsD5fBBJWyMRaV5HVTV42wvBj/LDO1xJG17e3xJ12brGYdAw9qTkhkrT9EyZJzF8IEp6pabSIU7jJWmvV+i6b/D0COxOvjmqyti3P3Q690AO7PREETPQIiLqzxU8WmECO8Up4mW/GNd+dbdPRwYOFqdzBUsaiDTjDZd1ExWnKny1GTgOfGXtU3YB3iRIqa5H/Scxj4+UcEIaNk3V4mX9mk4xwRIMQTh5wIRtvSJJvLm8T5cjZNaQmACJCXJxSNfk+mPemKgR2oRvzs6aRx+zFLRkQnZbv7o5Hluiqlm+WRnSPwEbMBg5o2cmOTMYFLVINE/ZnS7rkhG6LDU1n0kpEFxHCsgHAzUNr2B3R4Z+GEXxXdVMOEBTCG+GbgEpwac8ncPJErQCHHyBtLC8v4ikggBRTaNK/+roMbTL6xvoRGsmGkJgRhQKkZ9YTXnLc4HXxJjk/DD/mts1b7Nrovk2Ddnl748Yc5nrxGQ5mFHwkHRMVXZX33taQZVD9OJjkeRKz9RJMg+EgPCOpcooHix06PeMqluQWS9D+oPO1i44yOsikRCnEJET5U/KHu5rSYvn8oWxAAYn5sX3LxgV4oLbK75sbS9p+LaQ6ywSKXmT40f+v0DxzVCiqJB05uymzm/5NYI0+U6J5cUx+VTZHZheBL0tUYnXUUQu9zXlO1H0J6LLzrhEaCYoSzkMvN++2YqvfxuMG0/Adq4w+IuQoATL8kqHikY0L9AsjwkfYllrk2MewfzKxrIbotdYHDTFsBMSAvfCGNGK9Y3loJGLCbX5gq+thNTOGdCsn11K+SbYYWtollDRGNMy5LySHwzSdDvdRhydAkVv3nogE2Hxq9Jv0lDTyfXwcnDQ5zab0oBGzBD/LiKRowFvW2MCPowzVTQTgCd4uB7/HCjPGkC+ID5YS16mWAQzWvK/mLB3eQ+2UTkNDfDaYRA+vEfo/LdmDCfMGd4y0ijGz3ZpOslNkXOYUO5xYtaUJ5b2L0MtHBDlb8RSj5Y+RHAjULxnb7L9o+/HxWvM0A639Wwpmrdd9OJGwZbZrEyqwc3BAdGiYnJBuJpaksPgCjr+C5Znjd6TK420T0FXnUk+XX7b4mUVwcusZuQKCnVR87BX1c9qRR4fqDdTOyzRxY6XI1iWKcQTpvfR85WEfulDzGpWDI8etr+u6+c1e12w5joKLV/BQPvfu6lHoQaKw4vA+Uk4Ze6W6uXEQJcTSzQUhIEwh+hEO0vHxBoz8b4S+7NO1YGRx2fcT4KKjAOau3VGdYf74HzzluAY7U5IaeBYBR3UitSXMd7B5zpDDik0iHbgA6qU7OvBlweZkFdcgX6AEuwXQOjez0Litdg5qkOwlOTXuByDYx5IYrLuEPBADbVb6uqEvbGIJa8KK95PsQShl55qlonfXxKC1gMfEaRY5taeSr46wkzW37XVlApov4J770sDSAyDye6ccOUvxWv58f7rJdTVGc/iIEtUHxlxsD9z21GCAMshbKDjBSyH3FBT5/6vZCem4YD8oHzvz6umcG19ODLv/DHMx63ZKsbLkelntN27NpCexMV413C1AiKqIYZ6QkcfzcnkO/BBxBw0w90DRu4tKDKdHF+9+s6XDovzFCaPjAvQncb1xmzdwrqdECqoLrJEiAeGFe8XSbptd3ccY7uIy0uK37mrxN53s8o3iA8vvnNhJWIJAWIazqL3uQ8nSGVjnvUxp0ysTwnE9SlHGg2PPVjT3kCXhpptvWE9h1tfTgdGsl2Vks70FUqJ8z4sfzbccI+QQ+5P6bNciI1poo1SAkeJZ1HjquEoLZSiKmu67YMR19aVB+j8o6STSjAdduvB2ADJsmSy4yStdsTo70fzUPfG2gkjIvkn4yntivJTjigX56zhT/3vT5lhBdtpeY0P347erSJTZeU0+//9/Z408t8uMGPR0yEsO77wXaI3iC0Hp/7d78PAcb+7hXghskyFehi0wTuqnqJvLkC26CV19cTBv9XZuPD3eQyYV7BfQVxDNJv5cAac1TEqWOgXRBF/JOl/F9mY9wNN6jFmKKF8k6ZB2URB3b1eg9YWExM7MC8+6o+Ouk1U6QAhXKf+nqRgH6jPEEIjnrT9hzPbhsyPHL7dwPNWp8vFe3pCOZcYfL6KRyi1xfCzr91n7R5rzAmieiG0wzACqAV1cdRUAKPdRA2DTqQZXHXUOjpSALnsD0PJCYFRLqB4LaZq/cT4+pfaM4dbdRrbZfqRmtQHn1yLKtg1Bl35OMX3mfTacb9UZiCV/lB41pbF/R6yMUO3WMjf4iH5t3fmrmU02uQptVTmJCCL6zhS4PuAgDACDsmZtTApccWXxkfsBi98pEkp+1rteXmNY6eqBX/gmUDPJ9dwUoKSIwS1F4jKWPAjd/H1lfb7vTXlfV+NM1KTV1bGmITlpx+iqEJl8SYcEISra0WR115C7m5Pm4r+EilrWIC73C/phBu5iOZWeNm9jJ5NQot3GdqeI81cD6JSBEohtyZEADZGihlw5o0he3heSwKPaL7CkzA/aTs7t57aZefgSH9yWg3cUGDLtbfaMpyQFgirR6Hi5buaOVso68JyFDo0xBYxTvBhsbXRtfqBYlGIzbaB1Guc0RX5873m7adXidjQkNt6Vj8f8XyhYMvPK8N7FTymuECQ2FAL6teNyhm/NMmKIBsXrcWdyDclIP70FiGiyQNrvFtWHXHV00BpordJvPxArJncr/kIyX7RA2hoSif7kbRrgglAPuP1OGSCMa8SPZNwA5LSfMUwmuOGymsKK8cAbVfhl8AN1HP+hT5ScP3nY5er5XlUaqS8RWJLr6SYSH1y4KuqZ82mkEbWp2jIovRmuZGcc2RTYkO6veiDEQTwymHxRZIG5pgYf/mV9MeUl+tN19AcWNlf3NKHMN/BaiahQCbUkzrj7Vb047fR4kh7IqVxWHJqXv1YMRrb2R9rttCu1NQLduxTXNs34566B709gJJIuazjEiyxrdNPk4ehwHkVd/A7SQ78YjC8Z2gJHBZLh/Pv2jHGN4RYCi96gRGS2G8p4iN8yWvRGAZj8GUt+umrs2bFaAldpB6UvtWHZxgWNpxO2dvOruChexur7SxjnLmJVngJPSbCIf2n6dBaJhjTkdgtzGwSloFaCrbsuMBr0eFkW1Pe0xXlhYkzcXLxQgPi4RJX4v1rQen0Xij2cLoIwj+dkCHPEM7vqUqGeOImW/3xyl/K0TS+yFMvbn7qo+3W71Bk+/fR7u9q1QxmTbvcN7mJjar8B8wLBP/vmSDgwhUuCVY5+wdPzOJxE/xBTA4zhF6EmZPFvcMSkIWT1V5ZNuacbTvFjB7uXLpTsj+V4CkE+fUqCdCE9nLQTNVF3FlQygXTJ6D3zfY1ysYewfHV3rJf6qfNqhu9Ou2WxKw6zZ7/W6J92MUBGpzLp5hIhbD2h/zv6jGlvuHCvknY4yB3wlYKAUwlOaXSo78Vn5TvtwIVYdaNEAS7fjNVSzleeKMn9+XFPNJ0RQWPN+CEOX6MxoemJSIPW7x8NS+7uKSNmdpyaFd0NvYLLlB6eXzt/dUiQlOal6/hLZI/qC6c8RwsP/oM6+FWZ/1Myw5Th+F9j+I0XbygSu1oUynbO/A6NldHu2ltiUVPWOkd7HJqj5ir3kk/Ty2vT34mhFATb2ZZykQWywWfO9/C76AvEQSTE7NRfsLCCVLcQZ0ae7wM1pj6rOJbhAO/1Ex2sm8zO1C2s32O9Lubu/5ghXjrFpqheMtpI5IqVYyrsHkQcE+YkuQlduUvxm4mXNd0JpLeOkEoCcqCIIYwNnRnsr4kw6zbm1x9gvpOYSy31bi14zcOBc66NXCWCvUZ5yMo3IuH/+XvxquzJt+y4/a2JIZU1m0hejzu2KgxxMKPvyswMzVVtzVTuj9SS8c+Ernnzf5KK5V8xfxlUL6vEUofMWrKbHZbW94sc7ncHjE9dwodcpPNh9p5Mu+58t6MxZDPZapmhDi/mKwn2Kmj/T8QRQxlUZrmQacWSiOHL0G8DUEjWOx7Zauun382tiJyk4aw7w7CEokcPdaZiCANnHcuxWpSIY6zQCJQrs/X3bHLZlyKcjs6JfY0M+5W5DkRQAO6hFIv/AUbiAjZ+zr+TOQb889dmnDl99ADWZIPEKwZM7EbtB+lI3aJ06XNl1bQLhbT7tYwuSDo6uuOamO6G0Ween/R3hjTuM0p9qytNp+ln6EXFZRDPO4qUyHmKs25aHGi8JMIjyB721244cZOA2XZ0fcveOXfeUGpeKqjDmjn0+ez3Js85uvsEp9JPFbCLqFX/geR5r8YA4E77eSfhUWLN8gCXq/ETPLOCNYKoTKE9o2o1FPfB57sV/2/fmn5IW6S2Sq/VSmHcbF+/eHV4a+MoA3Wu/fFE1yuLCY8wfx3fP/VMiCKpNRHkjJHUk8HEBu0Wj9S7go91pb1O0OR5QRoHZrd+uCfC9XW3oGh+t0W7wUldiWfQkS6EmRZ6fN/y86sKl7cpmYHQvYy5mYVT0poj5njgmq7rRKGRPc7a4GnfsB0Rbqa/78mtRtG0nOaX9BVDPqvXYxeM0s5XXpWVgkd36EJFvMLUeLCnROfO+ZSJZr/RhhYiIgF7Z8wiSIrUQgeT2Cs+KIuEOtnTqxzAfWzVZFcH4ctRPya/FmikspwvMKJl/57P4/rxWcmqi+lplargetPV63qXYUnXkSwonUNGAHI5W+Itjx0DJazxY0Zc9AKPWuHp9hR699urbJZKODNJwWfTWsJBvRPs6nVwklgAbUyf1LMlP8H52UDethwYo5PI57Pt8cpm14GXbQWKddqSfn9CXLYS5WyMr8qv2XAhW5QjK8t+yHpea3LUDyGTmTF+ZQMCiIrMB+TxeRyUS5svSz6XY4Gsy24w5fPOnWU1cFjAmHxt+vzlKgHHrjKFMXryYOI0lrehd1yvXOT9Be3bE9O5CWPeqD6r8UpixZe4BZJLpV3UzYS/cUdgmIkjI05preyeGDLLDI+f1E0pa17SzDYgVygLV8I/RdFVTr5f9KBz/GaKDuakOeGwQwHrnj3Yi6V8iNsn9fChZpU0IvcV68DB6wvJvzii8JsUJ6Ge7ZRKQ2wmFPwJ2Ll5THltI5g7UnPd2VT6Sh63r4vj4nVzyluy76sJDG3wnYRcO+ThUVtyuctxUOscLlk236XkSZ6iKDQwtxy0mM+WaHAGIF+SIg9iuaffMs/DuQzILB7fh/9cUpY01a0aLkMHQfxxIjhy0M7Lwoi3wJ5NFc6wrzxhk3+OI1Bpf07D2OL3XsXqb3WdQ5tsXvzMTF2KApOfbto6NG1zW/DWhKr3QMveliBON1+GELxwEL7JQRDXYHWP/HwNYmT26qoUgAXNP/VMrAVa6QL5O95G9GbmGs0T6uZVtWI7ZI4+gfRz0MrnQySktE0X0DNMMS7JA+35dvbGFzniPAn0G/teKPs5pKUTuU8nqY8oRyMZAqSjQmcak7PE5U2pDSXV5Q6n+clYoJlof3KgygTCMBXZQhyWeRTQWhIK6VAc64/HFkosYC+RbDhRxNWrs5PxvwhwPZIYe4tNK5Hw7Is1tXpOGAibStOhlkmL/VFhq3a37L9o85iHE6z6y1XTnwPmpyzq3tHmEqxGG0vQFQr1qFEZzsnLF8iiFUsYduY0pLl8mQfsndIMtKCp6sCiO/86jBnF/gON2M846YQKFsRLynOGN4L2UoZU3d1W3/IX3GcPc/I/DMrrd58eWzftl8PlXUjHCgXgUA3NOz+rrQY1ZsB9EW+3gbRg1Iavk91y2E+GLYrGvYVNbOktNVSHml8cBESe2Jm/wNiPeeIrovSVoUJ/jZMuFqg4QBUPAPmHkhlhbELfD+rsuTW/kz1069mERq+6rdk3PHK0PyikanNbbr23CyV3pkLbD49yPeWRqU86aPwzFeX4SRuCQ9mNNUgtPutQRviJ4Tu9ixiAjfiVCa5VIqhUjr+a5hpbhjekNbNgWDB4OJLL/PP1LzNVOAxMGrGvdLeklpQZzk5AYMSdgXBn1J8sodCnLf5SvtL+Y6RaJn4nFe3eeTxybPdyYJRWCfwLqw+0CKuVTPLSrN1Yxf8eidU5tlElEp67X2f1wrBePksiHRmj1/2v2X/5c3p5X/qg0Toif2cXobiW/YXW7Kv5AA/qSC74EvCGIihAmZcwzbyktnKX7cchoq88h0oHAfANvGNHx1NnUXyM5wGbleBA+KFjTt3uNnQp0i9nrEXnVW3Ot24MlBQmdT/GFczdYfUXw9puLGzodIU2iVmZyGeVfmAoFpmMXQlmkHC6gdu3lpCn4HcFwne46w7EmFCEwg6b6KKQeYzWupF1j/UTkv/IEtfFykIXccOJUlLpeSg2ebo/Ic6aX7WWC0ZVvRmwXdj44DGLuyNJhHmX9b35/KFKvHBCjJ3NTWzhiIpFsTKf2XXiuxWLERyxcs4sDaz64IZiKArxMyBGxP0XxeXjfDoT3+4y/d+8gY59OwvJAdH3+BXqt6ELCl3pDwBQ9J9klHT7VeUtSb/SR6QeEiy5GhUq2RjUb9pB8ow+4DpnzsyxzL56R8S04X9b19gMyef6AlurVcPRA5U6CVnZWWJUmoZeKBsogiKVbe744IsnmM/+DkIpoOwBHf3hgjJADDtoCUpRS/N2XlQeMJfDjwXb3elM/Gy/ESJeei3fFGvkeYXmGVSMeVIbMFiwfoHtTfyj1a3jYbBe1+zsdsNQGh2pKYQb/mbDtzy8ekSP1xApA7am3D15Hotut7yytYUuhUlZH5qfHmkltbVKlSpBRfqQNU98kBpKRpJaQh+2skuOq3kWvd2kvNAGeP9J0JjJ/+kUxSpXqnDTkOgIXu6dxv39hPibdsdMT4Pem0O3E4kGsRgmkF0I1ZtbWk1FQAQdbmOISEDDO1WELc/sleBdJdTJFn/MCattmXzMGygo++rrw982ky43zKW4WHVro/PpFBvxLO1BKK9v+bHqddNm8e72E5CqYmTapcHP2d6Aaox+8WjcPdMhApFb3w8am3qeu3raOrtwmkp5IwHn6rEjQ2mYaQrYpMN1dDR+ccB6FJHpCJJifMpPKI4lThotz7A3ieLzFB1qOg8ZQgmwo1iu3B6P5npc6/hQabXcsXNGRuyp6LsBosMVid7MIWyTuvNaw/uR3dp0foWNW4f5YmvMiyjzhjwDxDXc1xUTvybr5pzuCTeemIePC4y+MP/99x5VGcAZruaHwGpf7eUzUGGeQrHmpBANqUw54bvOpGm3TycDxLXeukJBLmwJHRWJa14Ubu4auFhgaLeqQ3u0/l+gGz/oN7KzeeFy+/EzDgNZ+qFu0j0c7hpHzh9ZNnCP5jatlUbkWxe/ZjRLYbfO0lz1fG1YG+Hr4LkQStNvUt1r8hylJthZ9KmEeLmglVG+YeXqWrT7KnOX2N/yyTQ2TmpZ6QWYDaTnHJ8IYMGCqoYyf0P56mzFqjEwOQLCR3d4YDq5hdZPdZfW4uF8fbRgZRddqXFknlkNrqU78yVl+tWGVrYXzjqoqDYJ+uiftN/gmnlVMMdM00IjCQB7a9hQcBCCpCo9ju1AMSPFVf6k4nD/BMebjBWv1qsRddZOmQsoTnVW1HPpr7ZpY63AcwU415v83GD2TesqHybNknqYL6dV2Ul8qjHMjcjvhXMq5wdqNsP6fHO7WsMKR86SoINefUrJkC46yyXNBiTRTXKuuNYVQ4gOmArZUxkTsr+l86eAbJKKipyuG5suelRJYfx4DAYo90w+l8i/6/qSv2L97Lj4026WQH7vJUnTVMAUaMlOKeY93UpZWs7KWmi7EuiEmHeQuBsm8vn2bVyhKqnV6UuAYMgJKiGHtfZxgiTRErmEFTiYmkjxTFSkKZk9afshCiFm3DBsTAnRA6W7XRePwOGWh2UHQVhtQj3P3ES1JGQXZPgwpa1O67aI06vV+rlaOX2pucGnBZ4LVtvKUhz4vt7VyZZa30YJ/uB8BmapkxxO/FUEvLM9kE7wdnqQXxD3i6ZRlXHswODeF2QuwQPODBfM82bnSdegZIBXesxfQFIXa9pSIvPQjEtyvwDXFiLrPQIM4SAy+kKsEMlrgVHpNqXA2kgAFUICs+1RaWc/BMyqhYWweoJQTDXuqP4mRQgG3ZuyrnBsUbXLAZ1OvbSps8s60N8xUrRpFjgtLL5kyT1m8dSjqVo3m7zeS4EkdcAAG7fssGTpiAS88R71/OeH8fBmwPE1dZFRH1af0G9IRFKU/1RA3Jt7olb5+N0PMat02sAFSUqOuS0u88bqg3UvjBKeE0VVtSlt/squXV4lZDMO3TEyURVBNLCxO7YZiWU8HvUx+Rilo+qQeHKSI20w720yd+TLDDrbaG1O3RomUEr0BWbDYbc5rsrZclNCVklcY5FDJKysGJDsT6xozH8rvbNaFSKqt/Mp4nCYodyr3NTVslp3U5TZll082cqKJ83ULmOEqSP0V39V+VINEoLSK3xUezhpEc9Q9Y7Im1Hc5TVk7iYMbJBspiSrnxuytQ41qortZhz+iJYZNPK4VLqUKAeWN2/KEg2Lqn2nCWDB5FemfVApPT7YV5Jx3zSaoQbMqwrK3TkEcPS2My9TP+pKNGZfCE2sz2EGMTpz5uNlzOhfQa2xPVwpu6igeSksJNjiM9YBsfhEbt81vciw+A8yO2t0ET6wMdcZ5GYmOh0KTO8xihvcPrOfuG0SlPWNPx0+TSsYNba+WyhQ1P6Eu8plcEt1OQcP+NmFz6Le5H/q5P43zpAG25qENJmer4iZl/Z5YFtMaMe6F5Jyx+YripTfHyA1OSm0l9WikYL61g6KGfkybqxy4cqFsMaQI7SzSn/cw/mmiPXFsjLyLFWlhVqjG5JwhORMJ9xNNR6cCrvXNMb4TLr4BLRb+t2pQGAPG/+dQq+SPs/+EkYXNCZ7gsEUtpQku1XCqvXK7m+gkUhZb2WDGAZe3VgJopGDYc7xxfVw2GBJdKwUU8+dJmqXdmdfzncP9MqUczBJTMwQEsftOsFScitC9znD/LQV2w9orZt/6SL/dOeeANK2Fw/5vlpe39bfvYFmwmDKk9tXRnicybTi4uJ32PXdJb1U1tz36hivE36Bc6+JG1YyQ/BmDuI0maTzSNVktZGt1bhqxaB1caL9AHk2TLL90UuKbiObiyDchqP1CpO4o5lYCekMv+Z2iFJSh06k2PeX0Ama453HWvUdLBz3YqMVGrWucUqK/22puzitU8OQrts5ak7M5pAMqmnahWtawn/OZeIz/aV/OEpgq8DC3lcptw4BTXEwYl3yrJsYLuXllCsx/7zh8W/pSXIdUYKXzmTKzXAm6XNTTqoh0weEKeDOjx407gsZJIzq0R2JuvabLchFh1VgB9SYMyCXw/b837nmHbrx18+q5cvBHoO2ge0nzZKnlg6QakO/IWD0R2w5eCoapRqk05NQ8FhFfsODOeYmlEbMdmkeaTc4E7lzaYajMcbG8Ra6+Tc/vAXnPet9AHlgCUY7ZsKiQ+RtnG6EKVu3D3bWz+5+/3e2mtwvIjMEx3IEasWlZ2hNJw+WzJMohVH75WstSfo67qko1MaU4Rp6/ALh9dgJKrepiDn2mIliADdh0VQ4gylrUOU7RnhQCssDu37DaL+mcdVRoQOwx+YnAbrT28KL6KvDIgx+eDwUqiNiwvUxXyWE1WzNwHdA5kgmgdGmdvD+lKuHn0lB7KjyW722Fr0BWpFlFdj+jHl3GhIAniNoJWKfJfQnpxHODYkv96gmIG+Ak+gktgrfIFZbm2kYNUE4NDWoXm7UpoCxfJopxw+/ZP5Y5IYAJogh0TWnY6Bmg3UTCoFjwBdz2ldDU1hbr9TAxsLFsZEpU6gxQo8hSdyUOvC+No6wM65cVZbTufAbBaHdTY2t7z3fu6D5J+h7gIn8YQr+VF1vvJJZ3AZYZllB+qiugeMjID80h8H4Wcs3xn3B5dD8y3vOUQLWhqcrBISc0Gb1KUmNyo2yFZBFSsB34sAUTTGJ594UmYJzB2jo1YTSivTA0oZ9coFN4BdxdEWvmf+KVRshhB8hrNGBSvrRmQlHYLWarrK1DTxpZ2d5Rcg7/G97og1lFenFnq37HuUQtkJtMQPUOmetVe6DcU+8Vm11NyvPljd81R/xRqAVydC4QS/bDQdH++EbjzgCc787Fv5t2RjOLbebaj+TgU9iT9s//vv8qgFXZTanNsZ0+Z2KmlgEcrm1PZBYY5fOc+UxFRp3dlQ3NLLpRnnxhQyxc53OH7Si5FYNiC0rYYH4+5GlItyUPMFGcDCqFzWPYgcl5bAAULh0aajqL/F5bG9b7ulxcjv/PQivc9/zURkm2VuYUm7QLIiB/2guXKIeW28pPrNIzSMxVWOzNWE5ux8Vom60WK39sr05t2NPYwNvNkry0Ic0f7xc+X0Tx73ytqC6YlStkfv9G9R/xvOaxCuV7IdoHIYBmNaHbi4OiOhmZA2k3ZrUmVNuvjZSbTPogefeBsiwVIniXhovKAkMIkG/tXCpcNgi7bHR2sh9CuzX4xPmUZ1jjw7H8et7OOULSozBbiYyW8GGHD8xFqHkNbrNjNzxfOAhiLKkw6aMiPLEBpWjXz7m04SFf19Cp8/wVjYfgDG35D+EjlKkXwKwyMS34uIy7cq88NUzX9dFKh/NpWbg4vJGGZxB4GSlhhzP7Vh1dyW+1Bsd4i8F3zI0GbyMyU2jb4unXU0m4wfFuJNJoEsnwBhzt/BTw8hk7gL3m4rbsChvDY9HbkhxKXzAZk/UQLa4XsL1QWWrc/hpUyUpVrXN+RYc47Zu+gMjvnsg9ujarIMSu1LsxM2sfL0un7EBGq+MQWsrgWjfKrQefSZ+nUdk14GkmRwRUuTHsb2vcIm04ynWuvkjkFLcZcG4Y174KvN9XC9Y/75SFKpykxlnN4PN2nvf6d2Xj/3/A1hRwmBEFiHW3G/d6IA5a9FMhFhf9mJNgYv/YgGM2DHa4p7I5D2kb+8vD9lu6X0nBYuEsKNwYyz4V2u9gts58oipu49kDT1fyq7qpfUZZyOuQ0BIFhFtHRNH4RWvBEEyW+uztS1wdR/Q3KLfXp6JzMMiy91ckcgvPRPtnulU6vKHYWNhRXXOrjO4+KkGgXxA7DYKxprQ8mdED19aOZmqEIVk8l31dC4TXbSMtTmxoyF4+IXPWiiqTNlK1MOgpjAp7I2UagxsfS8Xh+SsG3Ec/sWBYxE0EIQLBmyBTva5aRWBV5U0Cv3jXj7yPzcwsJWdUHFkh0TESrA9TjWJ0oHCwIoMbpk15d5KY+iXnCt1nYqYJem/C8IeVm+VTJPS/NmgmW9XSZqrg1G4CUdO4BSVmLjFW0tt3RoJfUmP0O2z2cDe7GMJtCDlCQKuydGK2rZ7934/5UYIBuXUPTxEef1cX50U10z75VWq8RS17pYJ43WlBLkXvrbvfCyTcCE9ldrKdl721s5LNNq3m7lkveP89jFvndSt8o0afm2Ar/LjmOtKgek3SZ2cPNuzgVBk6EyMSb+JzvqX+RnBzhL9KyHu4U4HrXSchKksuQaFWXxEQydUMU2A4JSq4imp7PqsP8Fb+7MwCRqyp0b3NdO6nZoiqlts6J9KWJf6xLH+2sQdvC9ydL8ypNJSUpBwQqU7TniQnO9I9BWrQFxuLoA7bk5Gn9fNi1sVxWefDmzQXZ3qSQQSsa08ZFg7hYIIORkdFQ7YrCnYaLf0qubihXOkXB9XU9uT+7PjS9kmYRJYavy4FvljDNvfcs7wHwmnfkrKfB96TEA+8eGD6nYz3jGMfNm603bjUlugX3GQ0g4DGeoZqdbrGUF8sKnIUSGblbwa5ri6QXw67BZj+D44bnABrAJ+aU1QLgUG0lC0jv4Q1N3hpZVpScOP6Jtsj6GXWPbMNSyQtIMcDUTzjQz9glHs5ogCM6sbXqoXFy897wV3RLVBULnrzaK2E8HHcGnyjdTZrl29t4OpN79A5T+edlpjuBxU94B1BUNFFSNjco0IQ2hNfLwC4g3EvVTHjSxbWu9IyxVmnKfj0qDOOeuAnWY1jJmjGCzeiFDXU/atU5vXJkQvxhcof/MpevjQ+7eMZg0IoJisQoqxoQwr7SiFZ/kOyCEV678FQEg6++DnXA9Qf9Z+SRw6yn7c1E54/j7X0YmTJtfDa9RymJNwc+z7C8EAy7a5jUDs8a336aXZoeYcrcOvisatl23utio1yTUv91jhWuFxbrQK2xldjpmQumm2g7k/oNrkmW7NvR3rnykfaFy86ygt6jK+aphBKAOPVFdVHEtFXtWnfr66pMAwiWKCl+XjT3o1F9/abJdGV/ZgPzWKZ+BLdncgdXU9HhVCB0Otep+6zZeBiSfXGrLd2eUz9F1tvxZba1t8I1wi/0M0/Zhm10jnIKk9ra/giUKg8Sbzw3I+5/8yR/R9RPSrpPkfV2CMKwiiRRFOc8KAtN55RiH9vZNM6nlT4DXia1qcvC0LVk2ODdPPEfoGXxjDrIsFEUj+8YO6xELhuMNoqI4hR/5RAYzEzQLM+bHXOTWjG5u3YxH1Z4Twx5vU5FJOMyp+9eWFwMpTE8QD0D88gro3ZmwSUbAM9wGyDsyHOKVdXgPst7qKs+MZXDXijrmbGlojY5Q/hszhmBcAg+frMB31qNy9M5ErFr5Jyv9U6Z4+jXm6gz70pp3uGvolSTKtCoROjIMQdZZF+eQgW3qqQHJsIBzW9ZJMOSoGFs1GbYFOP8SgUgM5RB4MG7/FPqMycNg4JW4eYT30AEpFACq+ykTa8ju7Ls/5/GqKvXrOsPm2fYKzfrxpVX8lDl61JwA8bJChWLl4NcYq7Efn0BGa+xw/Fx69nOT7aMvEPiXYvjO7dQk8K6GCHt0dAOn4JnCBQ4UpZRB0vxHcP+d5cSio1iknh6jvYrcxvT1QDYqeW/A228ZVT9fPWLd2DYPV6oVLCJetMWpjUpJCHj9CR3dm/xAJGmBe+W/mgTCa21W2bdJU17VIG3uVbLdkpC2JicLCA9ItirfSVvGHAdoueB5DLWgLPwN49Ao/ue9VnH8xcOPbZIEE/9gzC+caeVbAbBBvLFuJLmy9HwtGrI5MGDNbSZiogG2iTvmWuSGRPKbM4JFGKyuHRFOUThpSOpMCxSoObBgmgfNV4+vJluaJvMcwit9IqBNv+P8x24dOYbOotk/BRJ63Dp8WnLAP2CfbFnQDRCAhabYax2oeBO5eh6/fbBpWHRpSnnNYCkMkKEBVB+R4xqE06x1By0eZnQ5yWwy8fSZPSDzsmG6vxcWEaf1gxxsykI+PgdF55/1FaBZiJzCNBXjUdvqwE+3Q70TpiU+iWkKtAAZFkRaThhue2lxdz4T7e293i7ljWAt7OACBA6U6GOAdexKrhQ5JnxU3CgPzD7ojaNKivBIPt+TttYKkK/QampOW0E+phS/znOYbu2xOlkzPY+qorSYzrA4HUwLzgRvcLl0JS8I8klKyx39PwUaDNDb3rknsbC6XWnyM5UDud9o/RAnNTshnxYLVCZXN2X+r6/e6U4qAt1/aeIpSsVT7i3KWttQYadjcMymFcWJHcdHSovIp/aRxFYPWgqVHU8HtpsfEU9xyYC+HN2j3go7mtGzciMwjSTx1+KydvWY7gOLtJ+bnBEK6rBEdHfbrBjW4TvHKYEBEnNG4CWzus0MY0+YHywEkW6RCYmNJjnCXvRWDULqeLfZvKAADtENSIu7NX1rFXbs4HUbknhOPlJxk75WZQRiIv6QN365LuEKrcyDIfAWVLZYg5e8NUJTu/M4KekxBP7ogMAx5zG5sEfIr5nXxT87tQFtUs06MyjpSAglR5FT0l6UDdHKJJjC1dufNbHxIE6+tW1T30MEgMXUkV/Ho6XBdnusvoA37Mo5inbRJB94nikL+AfJKUICvK8pP6PrcfAPaRppTO14E7HfN9LKCnhYJJmyXf4+EGYto84o0TWm8ZbeJz3YmJPRZT2m1FbPUhUjST0ifb2f9u7/jflym1H/Bq0BfpaW63he+mpZQbZoOTIQ15OS+KdnIc8+cd+8u20GMmLO2klk3e5ue+TyuoWrpbLX7ePgONsloU5ypho/oMQIaXSODJfhPA7Na5MFKNPrRa4dSuDlZmYhExYCbF1b0rPjc/+CdVkSdwZbup+x+CWWdqKU2Wq7ncMyyCEu01R6FtBxmLWxjI/oS/rfKXrlFA1Jjq86ZaBpOcUIx9asNS1v1yKxtFg2nT1Vk8N+rcrF6iLO2hNCJS+HFpQFlHMfC0/2l5vFYxEBD36eucaF6cPhYi5TtWelDchqZkcT8va5XpatpliZKR3H+QKZ9jBX7t2Ngwlwuvx7Ke7UPetkiLmMZGeH7P2vr47cIVILjV0diZC2tXwMjn2oEIvwlmM1ta4xu61SKDh3ObbJFcEGBKk+ReksnKPLo5JsxXOWmbpC+JGqmL4cK7hFyRtk7gnCu5P+NMMwqPoGwrx/Uu2CRmmf7623MzyaloMbJ6gXQOEK91xhcltOzfAAoRiMrAPukh0vLsKYvjgL9P0WIzEStO5fB0clEY0ao7Gt+bT1yN2rSectNGrDZUZssuFlpyJlgetxnPkEMztqYBSYmSZQEv1vRM1ghUS35StRtGgRfDaT8QZQcEZMtTHEQY68NvX8669L2Y0mJIk5cVIJ63Jsj55Z/6b3Cp3w7Tjog7RyXcHnDyymwjIVtr5HudvDSBz99C3WjjYul5TDzPX2a74OfrgwgSbTz0EpINWwcOCARF7Lv7gcFk8TMb97kEFRohGy6J/nxK/3u+GqiKP/U9q0Zz/L9784OQ0eN2XbTRuNm6bqJeWSdNDcRTuD8EpytZ1QDYHtv2cIgLqdmz4NFGLumW+QU2MEXYa0rpFprMXMeavva0ewgrUVXlVcsBdYB4VRD7nRDUBpzi3ar0sWVBueokw6nChJfsv9gmIU4AGo2x2xgWgy8Z9AnDQkc3YcUvpqpBXVppvWdmbg9Gghpg4jpi7mtVSx9ShuCCLA0zFH0olaBiUEuOsREQkWs37TDtDFS+bA6rZHoFpNz57c5+Mxdjmno04A6EKkrd757cviO7kd5HqbqQfLDjQOiyRplZJxK67Q1FwgEV+7zEw445T18ix9TX1vtZqx9kE9ommgcLAgyQ2r2bQpPLhjkL+csGCChBwf4NmLefC+QMgR42rEY9rx7ODBFCcE2FdG4F/kCY5h9keRXVfwwaBRS+PMJvo+/+/ij79ywWO8tS549HGjZOKC4xiqO5qbRlz7PKoYySVt0fLQ3DLR8BrQ58uDxk2i98VoswbtMgtNI/Mo7uPTDaQ81gPY3968zGl0TMgRLQWE46gMaF98j7UneXRdjqE0Le09EZa4dP8rkUSRtoj6hMWzZ6jGeA+tFunj4V/53rp5X1UH16DVOuAgw4p0/txbDKKFbGTwvkFeEtmn3dgYWBOlTqRpnLjNeMX3Cu0akXEYRsCe2/lSyi6jgTRGEqwE+dj1wdE76OAAaTH+mDogCVrv1FlK0585S0kRwtKTAHeAG8MkFlPK8+si0CmZ6RJ7+MBoBN58ix8jKK+Cs0E7Uzb5x7l94dLI8HvBDfq5cn8+6FDx3JBzRMM9T92ZAa8YKDoKzNnqYb5RzsIpo5wMUhgv1b0TMtG6R9Ph9PyU1vNqmsTgbAK1qeoHl3Tl7q1Pe97K6cC3bojMWuOExN7sqv6aiVMrYRe6y3jIjAm5gJAp1xWUgv3hEvXUVx1dlggyMhh9TbyFr9pQZS5RBofeQt8/Xb/tLlBRlJUvVjCPMIcXdAq7kl/GAUpK8LY7e9yDWw7QmLcg3jfCBh2pAoA6T/OafXAXEbCobJv53P7e996AnpPnwMV31Bl3NBjiI3aYmC7I35Jd9z5brsDqWQ0mk/zFZsRUK8PZ/9WhCPhyrhvxa2vajtNLzoRm0p3N1gxu1ze+AAwPz96ujtF9D2UunEZhRo6yuB0UZoaHCZRISabOxs0DAWEyZ2bI81kRxsBNc90S7C50iEyIYOPN65JGtwMnFwoQThU6yMZN0dLpXFFZ1D1SM3He5qVibpY4p8pLQUh5LsCZap3ovCnBH6PTJd6dwZ9n3pwFv7zBpM4iQHmrUOrzwJ1ycWbuQAmrrLE1w13DslVKMY8gPMsgAaROpI3MgZmYh2kF5UGDLj0+kJ+1lZoIoIlIBHaLInIbycmgKAspK8iTfa0cVz8X6msmHApZkKXLOc6xc0laK9a4bK8PejgDWOJGuX6mZ5of0B057WHSfT9qKy+Io3Nmf3SkYxAYCUIuQ61Huo6ydyk5kjXDd9PxTdSLqYrImcICuQn8nusJ7YRBYCPVyabtKUljhIUuuvDyJZwUMnLHgKY8Xu23hQJdpfTAQ1wzhnsta2eWTtCn8Ff4cTNwia+5psjHmJDtPtzznnKRJ8oVJXdU3BWQ94t8S8kJkAl0OKvyb/t8XekWz134n81tj4o6uiPStu7M3kThw0yyBPP0GOzeE+cZy0dzfuAxmcMFU27Qk70xnqGh7056eaKi5P0ZbxuYX/Z7wLWboTRAQwKhrftLx/8lNmBBK7EZfNr0cVMS+I8Fl5LDp8nqrPnlNnzZrK28i1vCub0X3diod37ksOzZ16YEdz7isNvm3r6o4A5jGrzxpPSelIrCArbv54Yhytn9J7RNjv7NuG2o04KYkuLnsnGLyNYFHEj45SaltCPszod5iUB8e4irI15fW8dNUEKlIsvIDd/dPG4GePiUxjeM5UpSaib/vNq5bYb8hPy91fs+F33KDUhnzIqnlJQYT/tmUiNwehGf7o6JDUtcoA0LWdmQhT8lfwDbvsci2OwxmRoDlC2igUTrUEElNcjkDcHiAj/fIbq+GzTGCIB6Lni/MeGH/wQyqi4U5IEcIsigaHaGDM5Tl/EiEnJalG2ePzMfiOlFVGPJxz8OXnSVAzhUQfo6vZraolRNIzc4lp8nSOAbQJB3d/OZ+ApkwU2KypSidPQos1z6mQlWwzj4muyaYMYRKv4BZgPT9i97u41zXL4PkHcOAZhJ1CAyAELtl2+DEDgES7WB6fC+EDBdbpAHcWA4F+qhHAat85ftk2LDslmAR2lQ97L6izAIAr8+r7A0jfFxPdYnnDFpv9kxitQLAvZcimVmVPwG8MaxJDm0PiaNp1/esCL4oSvjLhy64x1xGxsh0mRFQAzYD55C1gPMsqsfNRfiizU/XaWZCCu+hFNC2UfBq5Q6wKdBXBDZk4wGuiB0rnu4zIN5vCmGD3vw6glu0wqwIKymVw8QwCclBfYAeJgw4b2Q9xkdeHa5ZNmKsmO5D6q6ZgpK3AdOm++TCzYAZpEgCewof6qdlUYvLj7G71oyDNjTM//Vzd2z/3cztC9OcZI53VDGVI6Dcn23rz0hb93c95VdE9OQ3bqGgIY20yKABoxNjFhqoRt67oLuFLTMI9NgaFc+UDl9+veurEC09uR7ltGF0VPAXFGx7yjOVzzvf5k+7EC7p3n5e2BXwbEUtd+4r4NXVo2Lng1UpWjpPHexKOtfBu+9IKMjBJTQdpTSIAYbGcpiFsHVtg6EwX0FmsHDbhCQP+PavTa8FtvlBndGj6QZNdvxRe2ihqxhg91DuaAA1IA6ucOgDz6o8S9VvnJkySPuU4FWZt1oVYan8XJV57WuOSeMRFymW82WaDlePvsSOWqEPToDK758dsGWXeBlvvvK6H+/mycjD7L3cBUECDNOCsSqi8BHGMP8rf1l3fnK9+m8RH2KYuvptN/Co6jzbu5IFm/MZ1aUWsoWJB5x/2+nXaDnf2kspj5I5fHKxInTYqdcuexX8qLn7TqyOAapBqzRWSs2IH3x2NAioDMkIfdZcV8IHTFnmBcNxZe9ezC78ovlATD29clHqbzzlcsSxRQWdN6UbbFsnLlt0iNH3kf04/KQ2dXcNi//z3gISAyCPEXpLdIqJJmcjF18vu9ySOnZ37t1LXspg3jHAa8HscKnSPlybyCgKVBpKSAoKOyDAP/oCPQa6SwtgFediChfkk7cPeYzYsdKpthP4UrJUbVfeLPnShpbKFl7JPP8A9LsxPfSKFpN+PlDQfikVFqCsX3IjfEiQwbTdX/muno+v9QQCG6D5ZVM9Ju7dIQyAhF6GJpzeFzvRdQLPKD0iX9OppvDFTAW+M/oam+95PJ7Qzy59vm6iHTKh6TR/+mY/+um/KZLYhudL+4oIpNUZsYF1+Naa13ipe1t5hunOBP7m4Gzp8FjCVeu9Ew6H3Q6za92ws3J8rwmcvXFD0B6J5udu+xw7+H9/j6VXK857xTaGhpbfrdOsuDqrnecVMgAQ2CAHPaEAwKAgBJeqOsb7JBfQzMZpQlMfD+nJZ454oz3NCgJPAWPOgydvCCzUoTNqhKsBKmkegF3eoC4EWmWC4CRjM9Z2Z5fZawIiNpJfXhSPrNku/SkRCcPBs9DLfQSPEEL5hvFlWc6NcjivzhuWb7P8bocSrFpAeX3VTdKdvykC3LvkHrdiieZs0M7OyDN3A+x6QH+yyIvmyUmZbB9KmzBN9sQNOmXtv/IjN159ZAeK4DigyqB09OR9B13x+FZui870m0znSAXztddmJSXSDhraAeUUxJxCvbHZGgoCPGew8DEMj2De191AK0kl4eiL5PUBkPgBou+gFVbIwfwSR5BqYuAtEyp21q2Sz99FR00hk7E9IKAbV7Ioa4ogvmyHPcGLR0Qa/yR7vniQqB2gmcY9XKnugzM4cl9dJAcxihksRJDQ1GMS89eIgJ7n5b5UDK7uQ2rum83BjB5/+UPxhbtX6AL/GAEgM6wPJnNZVSenbj6PsGcse9myJWsDc/jlzPW/FZrCT/34Q13X4UQ5dZxFwAlK0JLvmSrWhedOJMjY+0hFyl7AUcO3R2iIjDMBx8DfLF4OAeuFMBLgg9mzsM8ogMCHsEg5vILptZ+s0BOUNfMFYA9jaAvTJj1EVjePISkw10X3WWsme9Aaq+b/J2dCALyIlGyl7n8yLz3aSG3qcw7CcEO6JrT/P1tbh2mbi0vIyD6nvruxqqBtsHJLlUV4c6U2+mmZ2/kfzSu/Lt2FtAgpp3Zqhx/Zryyhcy2tW3iO8wMps/y3bMICMQowoS+3UpGM9NjjNX6ZQgafv7AgQPF5oNYBap0090yNTXRZbuKGrjPDo6OzKxht46Yz+DdA4pPa04cW7GR1CTLE7jNQ2IncZaKEpbgD28c0fu4vW1l3P/85VopBcMx5y7XOa0JJVOYFyuZEs1NSh0DgJd4HZ0tXv67Li6RWybKazdWjN8dynl9jX58e1ClzD15nNnamPlDhTkit6xySS6CQTAGN5QGruQFDpiwzb43Fs3oOtVT/XDyDT66bIa1O8IQ77EkYzXwIoc21wnONvcLBnl0xiMs6EBFxVpinYprv1KU/all+YclvhbTV14B2A2OqO+CeQcBDE0UsVVuGAhCZZJBFsSZcWyCBqSD658G6FJIG0rJ5C44s5rF3P2q2ca4dLITMEFYvdzYdGNXRYAfkO33VWG6G5BbD/yIFlCndMBHWYfp8FTAigyvkPGv0mAO5f6M4yZfVAf9aUgC7UGNzI48brzs49BMzJwhiw8nDn78Izxz4b56sxG1M/OTzRhuQfWKlvrks/OMcc1UegJ0qwT8PA6a5Qg47hDHTeBbW/Ij16ldeBUwOW6mx2t1EJ8wVfE62uJhJXWhmFgAFD0y5hlcqpuwehSDWgkEeqSwfBk+1n306TSEAR2S1JhIAgCv7LLUZE4uvETSCv7+95Mlb36qPdgw3GUWADuw2TCXZXV2iNvTu5JEcPR4j0v7jM4l/FrAWXF1B7TN3uDYuRNDyZZvedU0K0QTUo7GU4+DgCpZaHffEXFPSl/5xSTv17L6051Wh1Wl3198K/7+5VslJx4aZBXkFLa6zcp8S9nvav3FvpRWFRvEsTpxND0wMbu8L3+4C24O/QU0xIJ5iJFrG56opQI1WB7KpZgQCgpysWKoAi3WPUT1Zi11DxF/if9i3a5ZR7f0SZaFaOfOm38BjQs7tSJQs30EYhWuMgl2/ajE0SQMh8qhKk8fuMjFzN5G23bYdOz36tDbjjHIjRZhmnQl7WPHmsB1geMSEEMKB6KG0sltKfA2kgNUtGBoKpzJvvo8tnPtwDT2pZIzuSu7hqX/zfvpvL4KmxIEmI58T8QOrVYktjpw+eWdbPEc4cjsqOvHd+xbm2nvY16wlk+DugfPx6VUUEu4JVRomKvKjNPFoeLAv5+VsBpu9yk0cAmJP3FiRedw6eZ1PSuSeVghUCVSTeat1fZhVncGFCc0NAWxl6GfpZWVxYbRYMvQ0BRLWfgw9/zuvA174tqfvwp0/BL9yrRnRYFkRRC3tQFmPFPO8zZ76TPMpHuFNjd01cHpHjb644MLna5uv9SDAf0TnXh6JjmHk4CfWJq4NYJF1mptiRSPr3YUKj31lgRNQMWvRrRTfd5K41GKDzfF1aj43WiNt8jeTigLYnP86bmgAzoMc1cRn8RDGyksarzCDTSDzH0cipEPfPVzGQ0nCP3za+3qsAqxYOMpEIayR0jBNBbVIvVM4zbvkGPdVLsGLgH+rhZn+q4j91vYDQlPWBQzrYJN7koJpgR7l45N5gNEVv32JT7LMwMvDtwX2f50XKvW7HiDcWFJEEyYCBg0g93yV/UUPYZAp+1DmSQ482jIBtxjUuntRh4aAAeg/DLZXMBrWdgoQDwRYaGYn5moP/q8IjaoXJThlQvP2HZLpFGiIugeP5O0gPJSULUeQgJXLJHiXgmqhcEkyQEJeSb/jV7SNTAN2t4ACx4H+5ZWKVuIR+OUld6AEemRqGiTExROYeAJh+pOOktveOesBL40sPZ0NGak1G94031IRpOsAkuolZQuLqi39D14RQkbhpKZ9PxKtFHUrislz/uZM/sX7PS0B9g7NR6eTbv+37phc2HF+Np2jdUcXxgbmI0HVfkUX+W3PRoXANsv31z7uu0Psu5IDjAfrqM6oG2G9LCn/9gC1Hkh7fzEQO8iHwpWDL6Y50vnrmQmrvk754NnoQuXmjv8tk51fAKta5ljsmM0QEqrxlDhIX4QtY8FpAdu4JYO+uJZzQARCCxMqC0Y3pSjNIT6R4LzutyK+D7tUSOAA4oz8PWgEv64uR3LU5NUGRS+ucDEnfXbIzp+Lb7/JDRKrYk9BTeulelz5mE5gnoBgDTOWE6ssuyl6kFgezc+JGypAEHjo8BLj84l2j8DNlucKA9qhyj+syZ4H5eZEofY7J97wPjEYH4zY3op/2Eyv1U7en5zidZ4Oo9rO8TJieVPo0x+9SBmGsSPh9EUCh6hAlWjp+yPWVg886HWcunAs2nqC8qm9D5o0hXBwTyqFk1U7USlY/4BvCe7JpS1d3uBhYKuWbkCF8xk9tODfhR+DgiDAOgLuhYrE6oKU3wdsmRr//BQbqF7X4NbGAzFmaHqjq7D77UsreVC6YN2YeAFqfmSd3bqQIckoF47BFyzPmtbig9/cVwK4HE1UTot+SmU4bG/Izw8RMLc7VzkxBZhw7hl6une1iL+ziQg2/rl0RlRxQijeqpOlBwlBORMLC5pBgS0FfqCxq5vNGk8zmkiH+k/HmsVjgfogDU9eiupnum/EjE8CFHdBxiSMuBJMCL/cMnJ8tSs3XaKbfjHr8YXU1TVUGxhtTsqNLkCccSezKBeD6cgYaSutoS+pkxjyPgCc33S17is8QsyHTn0GCiqyQgL47y3X3qXUEU2lKphwVz3rf4c66eZZSE150xLdqtOeRRFFT0/w3IDMK+gvnV68XpnbXYlYAa057ZG87a0Og3/Ip6lut1VSahdZUfHqfJ8nfEht1zYm3Z+fdkfRL9tRMdhOX2x9vgYcz/AAUF5VRdKeFpaiGshd5/WOO1NydZvXMWJ/+cpLofz5Rf/Zy7XbPAf7XXXR2fkMK8yaA3INi6aGqJQ8ty5nIO0TDyfchygNRN+D7TzAsENH7R6MJH6cmBehiXQOcx9ZDT7xuJtDfYAcCS87/7krnigceY345E5ZX16OjrQBxWAdm5NwJZRwbtTXGjYkYVJsqaBkLjU8UUfDdHDKoeBTVCqcu2GfCApmVUQYM8E0sAxDW4/u1V8drTrtzLPeRnCAlyPVo6Hl9UTaD0tAXyQiHhjVoWMAg4S9cvrGasZXFT/SI++xLOBixQadcEKWDRWeZA4YTTpKsFUlIucAaLmwpp6LewZqpv07+FPrYF845d7VJxmlyX2aYa/OOepfD6LETq8varqT8/pK1WjE4VQmheXhA7D8z2RhomeYpbTr8THY3rL1I/VE1mmHa3C3RqXo6kil0PcvBJsEiAMG/elZNcv1hOgcoOyss4t68KZmvbSw24pgkQb8zG0e+y7dwcgp0+INlPtPFiwbxNshzx0P1IqJuy2tU8O6pixQz2hXfoqPSwAeAmmwx1wiYBRIIp6WuzMzhSG0UZgxSl+ZthRQ3CTRgRMj5u2U8LbfC67jCnCEjzcGA788LVBQ+fmsUPUaY044B/3wU0sdGtO5fNrwouHvgnqn2ubHfjgU+PybHnprrOZIKdzv84hQtND9M53r+/+/aAbn3hVmQvMJhXkA9XyEBqjxeRguko9qMlqZRuYOcazKPR9L0uUHjB8wR/K0+Jv8K4s3ZCfzK3HFBfCl9p8N+vV5Y1c6HWwYMSE3Tq1R6FMpuIYwLXj3ZQHc2qmcpCOhZ8DneAud7/7S4DZUi4/XwBUXyRJlQlY47b+ZOLFMH6SRkBa2HSYVjpPzKTaMz1/azjBGm+ODjIa3FN/zgwcCNnYeebU+g1VPD+45WAxt2bPFQZ9WC2AJ5PnHQ+nMROZBTH1OQd/dbaAR2ZRnUuUoyXlnbMDMe7hbeWzWHJaPe1hY1fcQPqa30kUY5ZU1r2ZV58RPb5q1uKmMZnjtH3jO4arvhkzSRN+rNQCofRhpdu/oO/eMmVXX8zwHL9YKIc7XBpmfu0nzJuVQD2DNQW/OON0zT8TonVS6uKuWB+QWe3LbgufeuWayGP6j4FlYC8GLpvRlwYt7SaLmcREEOdvhNPhXEqTlAjJRpfZK5cdyUs0lAWSjYeAMYJhtD84mPNzV9WIlnX3h6+t0iW/PSUSpxVZZKL5SseULdMExZs/nnu/+hpQfIm7LQG8cgVcPZys4cxjzI+C/pQ/rKHASvj09mMX+LlrW9B0PlhWzx6o+sBSDv3hLqS2g968m+Boidgibh3V1y44XLrvQX0WHLg2MOzSW+cQBXCyM23cXP1Aeonl0qj75q5LMB7fmTb6+kldjInR4Ja98P2m3/6xOR2oXrUWEBrF551gAGqlY/Xou+1s+0H2Uj6WXyVfCTnlkczKeNKHUYXGwSg0tGsjxY52Ed/RUApjEpBl/JAHtCvbAsejKxRBu30a9E3CtLqSnfmrgXnTW1bYKszLHhlE2ql1N9OcfC/Qy7Lfp0I5I4GdhpO1C8LP3x0ZWFkYvCK4peLrALEB8ogCl4gY3dqyKGNgb1aVF1+iJm+AoyoT4HY8OBHRzcrZWY8AwtD9NCn/NZNfd5ecR3N5g7InuBCTKEY5DH/UI+kYmbBA5mdXhtdPnJccXAJWxHsm+lELwIShemr4Du0bCwv4ZnaQOzt2reNxTTvnVaYA7KPDp3cLit2f608pqobHnToM73gSEbz6RcPblqtDk+FS71WfopcN47SLK0+j0S8+lF8cyk0slf34BqAbcGpaT2cqw7ASou1yBCh2VeoAe/1uhfBzXZhliQCEO0ABpWQxc0w3Hr3vjUOa5CtkY8MxDWOIWpai1gNQEuSf7SLVJ7q9CsHRbYNeuzH7f7xTkcm6eNuxU8zAM7e3fMXSgSqX+HyntAq+lG/1QbKyTaHC4CdKLFABUmn6ljwDPEsA+830nYWX7qdqwo0rpp98Ks+G7QE2jXvhS/cRnXz+w16km6IC4xheeunHdekiya0qMBRIpXauzeWPVcmIgcidGFgsxOj5dO6On9w8T+7nEcn6nKLyXdp4BRVVbTi/qvLfTJE5Uu+syE5RPz9pZ41n1Z48M5ebfWVerDfwni8dwl+mFYpbKSgl3GUsHb+bopjxZUK3ZyefYwKS75YKOQfNMz8rYcBGYkmxEawWGz0qKCBpQmQCLSoj61hqWDyAURgHD++xPIqxmaOibBuqDpB31HIjr1g2eRFMPArYaehVW3Ea4hpeY/GeSvRjzra7Ps85XGtY3rCFejEQ+c9BzyHBthom4zpdMJOzMFgNI0x/XQCUxIHzITG1QRRB72kEfr5CJV1UGrqSysVaW9qrBAJFAk+Ws9Qlx0vDI7PoFO3VBKGVxjYBTJ+ih6B9xuqMzUE52RFkLa1NAHlOJairEl5IcTueg0tcX2hP/MEfNuKKL0XpD0L+nnXGVQATUGnsAnqb+f/+TaMF1oW4FzNuZ3qSr8LHdcah9P0C1vgcJliXmSDbPdn9E0vHLGAlbGJ9ub9A539dJEh7lRfkebxSi/TuzU0FlkzbVg5CFIhatjJttOXUBp3vATqt2tXoxUWnBexRQ4YheL6qI6Fx2Zfa+agh4OkaBolVw5j1y9Fme2EpYKId8iYw7yaL64ycS2MsLONtqM4PSNpGp5/FASrdt0PgImPS4HgaEyzk1YKJzAivmsNLmZ2neMJTID8mHaiXF/u87Xib47nvIy+suFIVndJxc+vsxMOUXDD7kOtCLaPtaObP4Zsm+Y6CyqmBGeZ2cnEax6ICdcn/zILuxmXT66BAwFyiMU5GVpWol0DvIwWMGQCXbQgLcXD9UhuWm3+R2ehzXFE4AkYRwvRGfqzOm0oDW4DsmtTQ29brhwnKyrqBITvc4p2cdPgIKHkpr8FoYk5VNcdQoN2SEF9KAVx6h9Z51b5s+75mflxif9wpnXVz3LDRLh8r6wMoXrW/2VK9h73ZMcTbI0tgC7fSWUcHZcGZfj6C8O7Bsz1K9oEtaJ5UCwTS3pzhWpj4rBa3gIQfjDGvh8cqbzuCFyNUqE+B10VWzBwM3V5ffzvrV9I9nraWAlRJQEcB1TyrMKQ9I8klWnpGYjSdu9W/epbUhlIVQJkFeTruc+ZuyKNRprTg7OQar/TwTrceenh3RnRnCziCklVdaPF3w7mldOjtr8kRrPE4GoK+CQ+d1RxUnKwGx0OfaI/a/LYBKvqQv+YERlhPZQbrYKG//QOrOVh86yIlQH9tjzNuomusd9YQwa+JyyczWa/G3FwCGCzca5rwoFeuq7br6QKfWbpW3yUpxkq3pAhr2WUpNsxg4n4tUGegkAJ+G7jT3JrAd4xH09/savl+4+r4z3/tTIcQGsNW0JjMvfKGbFCMGQOsPQimuyZlmQyInOq6vezOfVMEN4cRUMWpBhfVCFb5acDsKvAjFHh7u+HS6o3AuNLPVmI7MUC3MrQC01ZJ4Bvq5YD39p2GXktb7ah4pIW35fCle+n6kpFhKfYG+Rj6pXzN5T0aEDdRAGC5WB/++2YcRkpWshRf1ZBPBTV5uPf7CDqG5gaEze1M0N6Dn92IuwxWcwQ0JxPz+8RVBo67ATVM9GPACKTWRPp7fir7Rucnfjyu7BlYHILCgHCz8k35U9rV/w1wkqSOLzu7+Z3qR8HwGzs8SrB+5REvNuZt69bbLUWLEv4xriH3gXPIo4Hkzv1GV+KtKOFcqVrvBghkGIMw6AzVJdcn/Kmk5qLDcVzPEQnwG4EGZT40zMwJpdyqPcHZzz/PXfPYmLMpoZKsBNP1JaycppgEP7PVLA/6o6VSbE5YAMvpV4KWUbO9Y91cwAIgC6lN6k6rMobPzn1bmXV/lq+gLYuCNMwi+jdGZ5TqYSgALS8ydRRFOhHSIbdwQkEY8jIbTvUYZZ6S7pg3fEE/2SEvu6r75iP5eji9e3ZyollK0CDBiUkmp+iO//blaQuAtjJGY+KJX8UG68WL8j2E28pKRf5QQyktQdjlQX7uise838AljISn2+LtBzYF8y7sWIOYo6dmjBK5KFM6Nd5Jwa+hSE29aFvs5qBxVQUhEtoT+RwNMJ72puHGl15GMC62LAxpnlLOeT4oj6wy0tk1mHT4COvNkpKrAb8crmCM5HLZc8Akplt/WuDUPVF3q8FBAjYG0IrzxYTdLkpue2CjHEYDHuuBnkPvK4pMFKY+8Pn7TsOz0SlH2yLIaDWaC3WrtqmSZKmPc938E1gDX39Nk/KuR97ZOcPvwNay3yuvMr8w0fEmUcb15oVaKGv42yvJid9evX5171nZ97p5EAeqKb4nEf86oq1dBQ8BJDPEokS2J14kMoKjjcIN8utXMYpTWKmAwF4uKAGdEHkKGYdhTs6D3DQBN/GWytzIdKcREYBnMsKVJ5bbIuYsBFrOu6NTeYGjFj9YAp6LF+xhkil6f+PIvsEjTLHM8MJsj9Ll3aj356ut4D+z7e6hBWNtUav+BluoeCuqr6NxWTr/q2fyEsm0xMfnwUoK+VjRwp8CuPeXcpnPzm5+6Acg0mQGYQ5rz8KSolYkEI/1oYbI0GNswdib5Q6j6lB6txO8DqwcGBZ+KLu4FBDMEaawNBx2L7+4P/U2a+ZmFEzkomMp28WiY0w0iiKlDBMi3stE9vVIMXAM9NLvtsV5c+GcqikOVxq7lkDFOxmunSTGTOYKafg1nyK8Xz7k/vwJy+csz+eyTzBx9wBK9mUG4Vdiv4012TYP0GW8WeinJ8uAVAcw+TUlc2OnmY6CQ6HKA1SOjjUpx5Xvzc44naGKSqLqDW+dZRqEhaH+FrLkaONNo6uiSV7q1wHL6Zf7cQ6KaWl7p4O7skn2GALeCL6SOaE0RQUBmkHue9Uy+rY2Jk1xdBNdHB3yWwhAqkA2ITiw/M2bQlCpaIJ3NAoeq8P/N2p5WRrQDA4cW8ZZjjkro/Hh76MuIqqpDJmCCAKDmpUCgJypc4MZ4DtwJW/hjqUvMCnMxmEBU2VwjWqjbtDenAlDA9tYGBr/BPKGCZ0+FIvve8OkwKM2adwoywKpB/fvbfaWBAa1b9/xNpntPx914TwzQmbQRLXyMNPhHQ46kPOVguswCtcz4juDMiOer0CgTI1C7N/pii1ikNwnJRgyAoT0DAjoKiPd137EDOkQeH/Hs3omk2po5nX5OOMGn0LkvJgfCilXE6k+5v9a2wFNPuieezrUtH5Dkgs1qg1cB4DOQsaMLiyfNJeujhd26Wvww1MqD8v17TzWjlxPvjlZnOSlM4UzE622TCVO++fsX4s1J5obm7UzH/zmeFQbHWxADn8KHbLFiX9llgLS/akp75slzMUcsJ46N1OzZKnnCy0mDPzKDc4tK03IHGKQzZ0rh+hQl7ysIkh1Kp36xA2IGmoF58VWlbbXKav6x/Qw6NzTPPRZMP8/Cam8R5z7w5PCoP5+jD4i5PxBMl6Gn8c53EGCAKxK6MSSc+b1pcg3VUgkTKESL6ANAaahut9bHaciVnKvkswo8j0bXL4D+BlhqnkkHJnqcKRbjazFFO7kBBNGe0xfv8+R45aijwaY82jl5zdkMLH08PQG7QH+emCGjAg08mAGNFQzlPhqSxWG6NzYWrnCAQY1B6owANeVMazwihVOMEsEDg9svi2qlia31KQp+MKoqXFjvvwWXQVl4ONKpoJpE+cmA2/XH7n0W/5Jzt6ZD1+mbBwP23+cFC3m0OPNoxlSgtH4FMbIOxzfaT/KP2Y12lBKKNG4HcP9Rtt+d74GnF+6QSCuGaMOPBqgaoXgcdvhrJsqDMyCqLp9jo8UVioWCiIBJfAzpEsPigO1CzQOz3RYgF6nuvWIz/06E0YBho7KA7ml9mUh6MR29ippgiplKcN9lo9OCdWH/X2Qm0whcS7iIwgq1jAqUbyI7kWUfGCAPY2grthBJzADQePk8ADwP1OoshAzXvlftIzJYlkYbhhmgVgmkRi1q+0ol6yS6P9t5KpVEF4Pnoc4grbTDSutLDF9ERMtQGmyFfsA7Z5mf68LyEcYh0HoRehcMjGQzc2x/UdnVI3x8X5YWLZexlOxks8jIAFdUHo+fjfc0APwxGTrnuXO5YzLGGo9sbOvmxbTQoguplp5CEWlnHhGS++7wCby2JWC3x+ocHTIFYzLP0CgltNGkUuDXMD9AXiNeeZ97XGAYeuEF1Smqn6qaFlHoHIujs35oVwIDNYJRvLlwmnumrfpNeGCSxfItn9CWf8dtSqHNcaPu96SSB0btCZIlPgGWe8Scut0KNd1gVqYqWkyuq/QHbsLuZRfBJx+8mIPV52ueOeBFQxTHLCC9ycmQap3yFJBVd9MAXszWxpWTTXNqjYBuKoszuu+h0bLnSNuhjhUImGCHf9/CPkHJV/GHAugszIEhiCSt4dbVNMGzCRlslJ+qj3JYUCHG70Y+Q1SpniOTNhNkXmbWlWeJk+s6iIwTMsE13B3Z7a4mEWuxFdQYu3XQvrBKGZkUVQNby55gxDzwKqJTRrXnyuxtpjmtDG+iEEQpTM3oHhDufzWoIaroQqHBBSnjBgLwchPxZ2APaVlrFQ2uWW2dFelzxGC9ngDh/h9bk3pmDTjXC0XwOLZjI+ZaYOvSbAOJIsZpyg6GIyFoBKpXBfC+RjMq+DDhyHUU0wjVThkPdQ/+MsvQyL8Rle2zBKvTGIGKSZhLv2vsxuq4luRh51WZXtE/6BHmwWjc4Mz/OQCuAmEATkRHwhyKUbHlSaCH0P1HRl/O8OLkF0IZMQhdDpTFEHWJiWASRIJj6GU20GKElzGOX8RHoChElwpSgCkDUoM8N6+Eig2FxVhvlA5rKLXUaGjIK65+JiBqA2aYnIcnpHhYjYYip2kjWByRc/M3PJ3+yAoAINoCIBMH6vLyMgykcQaggQPaBLvmRYxuEx/N67vaPpYRMBonn/P3ImyWPARs/yJVgaCKNQNQzDoIO70mpmgdvKttSQBMFxYBHLq8ykExS7Cous/78BRzH1FWerrSZNOi2EUksZzqVyVEsyBuNj0KizgSgCWrOz2f5/lCICh0mfKmQvSGciv1bTzzpeZyTSmU1lAFzBTtHvU4J5niRZs2nnMORPUJQIEAaojMfg/Zf757oOD4jYK95w/CINLV9B821b/43t+msVSvsH5E2Gj7ZdviKlgZh6SjrIwBhUF0EFF7q7pIQikhV4HK59yqMdNKp15oW6l1MMzZ1bpMpLQZp/IZsJcDxACm7lgE9MU4+4BCRh2UubyVCpIgc//DnDeF+INs4C7WHUDNxfvzqPMgIFv/7xOCmrUPef85rKbzX1qjmBonDQGeGMJ4jkg39Ex+3Bx9kRG2F5v5E+PyqArA/VVOxIQWLxZ/M90W3c2sj1zjsU3Gy7kmgHerOtxJqHmJGtpwyrbWNrkNFHMqi4G79lP3dFzW8Y9DrDlsxrtVWsuGBo//ONZkhOf4Om+WjCEmsEvVpe2ibXJlA7WFb66sRCCbgYLghPyNseHXnmTn+mP+w3zlmLc4PO69FUg4JYxXEssF5JPm6zE9gerdqXzGSUBpePXk4SI2eHGnUwkZjGcMybW3Yht97hkwxFwxjqBptkdO8we8AQ/Y9hiCWmpD5awIZxbdXAiL+U1r1oxQ2Y6r7MUx1rOcPDjyLvDP5q9JhFvCL2LN7sf4LzPRvos2/UuKo5ssNslKzWpY0X0yw2yksnmXHKySc1E78LyfmDz4MFhDHLLztvYISCY2F3VL+mYy0B+wZQLzJn77q/VQNbOnOwQU2nyyFT/wrDZ1DQwG4Z2dMG8n/AnCu3bQRakHPe4Xwuywd9Ogs44vgOnbOKPPTjXbc2r807Mdf/VaXwUOQI0VtzY7YyAbZS+V64pf93z0iUD4ozn75jUfS//WTENhLmLGMDT43+rVw9VynkXtca8vh46YzPrdmXGkTcPIA0YD7TOSPS8+NlYijzqEVfMyowNNpTWojVZXkl2STN1vHt0Vihzyd6ISKAgEYC+D5txJdn92PhUNgUZVkZMGGnn3XRBdQ/BpkUSwnxR2G46nH9ImoGH14bMm5suNAJXpBimzmKyslicA42CUrOKoqN/1GpfJZoNbU9xSQIYzlpxDY3iTBEiu0exRbqmbfZJxqRO5fxQlgg6aCGvxzh4jLMUwmqcq6g4baZ+luKGotUrns+KDoQbMWd/0sarOSiSCqNcFHUilYxu3QZXXsk9UnKQChOP5JB2tcdYWKMXwDgSbCo3NOobIdrMy2wyiz7A7VFVwKAvCKOXEMUeeAfso4n42diaocXkITib8eaQSjpCBhWAFE9TpqVgTjxKHyJmhqx2o1fxBeZODtiAN4DKL/ykURkYhQpcWou1fbi2IZ5ykIdDzwQY9q8DvAQsxQTMUUFTg5C5J0inzJIi8Pn2KuXt8sD66v0MSLJ+p57OyPZLgFMFPes+0hpZ2vPbO1F+F7HzBfOFb6NYgKdgy2qFXehM0DqF2TXouoqZI5ro4DqlryqJXjP26sqyLTgfB1Qn5kKHsLsQk7jDCS8R2Y1sE8BmyY56pot2IMZC5amB/IdLkd2kG+yQbjiOla2AdSEw8V++Ozs9I0Wb+wA7Mu562TdHqmJncoJhB7/5vmFW0bBQ5vQnmJdgHlUwjr+c6A5oDCpXhwrFGIUWzh+vfKg3BuBrGZSa5dxxkuH0ckeooyCI38tg421aE4wLOAbmMggidp1NFRW7rWA6MbTEXjrndEAipkkPq55JkaSia0DPRg6b+wWgzsXBCnBByk6CBBJNwMHC+Ywc3I5LvvLdWQF7SEN4/7DXEZCYvvfFVPF/Za5RApjKdsXypb7sud28zjtxPnMOH6IjekoYHkGp4bIw6okXzgTmJ4Kx54ePKjgziJmlfIoK6IbmS/vH/R0oEDrPpM8n2lGMYxMRrAIWUUqjwCv2p5zweDhLc/A1rX5WF22ozP0EwBw3kJtYxrhgoN6l8oN6yFReoy9Frzr+0IA0s6g9jkwMXhUo+tOqOtKMn/eF4+3DuDD7m0stx/k97twjXT02B/8G6DaPTqa5pAn7ii7ITBsaLHC7QRnmRX0EOmGfsKXu+/BxhSmmVTnxz9MW/q9dOg6nTPS6Pjwly+jgqM2vil5mvbn0tfjJtjK/SvZkRnC0y0Pm2xdnj2c+ngG7eIIO7J2DAiJZKMZ1fg/PH4vJFxgMC7dJz5/XLqdUR1dm3flTVYUJ0n0SO3TjCofJcGV4cg4d0OFUkApjD3Y0ncr/2A4NojSUbe7xdMeBua+ZHTNWn+YFQk6xf7h6xSbnGvXnbv9ntvj2oRqoAIStYP3UMCN1gtUjzXiDuT03n5KBMeofhx5OPvfvrtBjf6tdFIlSablbI6/Sv3O+9tl5gRGCx4RIHaSBbuR5Siv4cuCONZMNuxVEnE9R1khV6V76rTlurhR/q1clUcDmmKhwFcdcR4wJSmBxnMDzuVHbpjOstg0vPegJFHG6GrM51IenHOA1NCT65K10SvT2BcMT7epMcYqpqcqHlige2kDCVAqUB/cmqAzEnxpFLp8xK7XlmXzexdTooTe4/oPms/tTyf2tCi6HaAHKZ4gLfmMk8eE02/1TtAhmxoYOW664dxVCh+DwnAkGwNHpAMhtYACyhqzPZ8JpUlpVoSWoBGwhry0NWDqtMTMsPlVk8BqbCTnVxWfEB0feXN0zW5syQhx12yMeS90yf6Q2F3cI1WnDhwOjAhxmRNOuA5ca9dlSRDCvr2s4JwXgSD/XGI4h83FCQHcSEeMbDKGXGfyCrrKeFZPy35Tlg9uB+c3VIR2W7FRoqFSQt1VZwIguUL0aeXxTk5KUL4KMFJiQByjBDdZ0SC7R04sm128zFx+kQDBsCc79fffgeS7sDuFRpx9hWmdSIgjhuOe4nut68ulQsZpP6nbcU+TehHB4CHCvv+qoR4kWwmln3zG2A9Yw47oW8VCdSY15z8pJ7gbBtC1Txs8XySxF4jTRqbe65CrVh2Zo1Q7/Ya3q+uzEOH/QMmjPRyPvQ0pFWFl6k9ICp17/Zvxlixjed6ZxvFXsWigA/owGoMK+pR4P5K/Ob4pUrdQXjuFjkAesBhVyiGsw57Vb72ePCWxbp1DldIxjeaFJCjA7jztZ/dfDk94WnlrLNLPqOhn+eAovK0KayHf3uBdZOpS9KHPetCXVZvbD+7zXpV7N/PxYvA34mVs9IiV6EpairWDSY3HLGnWBEgxwpPMW62InMMl150aI7s7AxOQRSeG8YYFRMENdmmVrOJ7m9BOxLbbNKvjg+Bp38rr1nFhIn+SxzVvq0LbWja2Q6WhpGc7xa4CaGQWvskWCjYSkPF+wvvIbf62o9qsqmeWxaQ9yFiIy7uonzI+ksRcm/kX152SF8+AtYtSjXX8kfc6ZYTM0dqHEzMSaNJ8hv7mY1R+D7PNbW1Ntm1mXWFiQexcNWnTGfhNDx+bhX47C1y9zKraxKZTcvEvt35qorK0TzBtYT7/n4l4PfDgfQcHLK6gOtscnAWx07Wbt7qY1o0I/CHhMqJgu0lUj1gTZLFE5htFw1xdlcnGkA5AyKoUrpAFrDUyvAi/FOnFEDQhlIhtAYOl0yDphklS4PRhxT6dZZI0Ro0uK9KJRmizJcL/yk3Pdqmb1UcvJjO0TnNW8mr2nYcp9ekZvrYkFgIAFJJM7ElRGcELO2VviQCs3p1387+RlyDRY5tzYUVbIB3pH49aYYw8CRseKhZMDJ9JNWPF4HRMedL0JkOmgfEBF3Jg0KcR3+plJfv/66+EcsnFzlNCydkHqUIHPz5l6dRWxKy9XHlT40zZ19FXe34SeBFmY74TnPQR3TsEPIDx6h8OB8VBEBy1XUHxUY/SgXjHoRMHt+XjFSc68pMBb3+WAGoGU86mK4dEGp2ALW9T9k8ctMugo+LmDv30/6Qx8dlseEeepXkQGzuqVmdO9d9NiI2/BmwEXH0jtPbOt28KmmmK/fufx0i2x7Jzs3XQuxxmqjgdsx+KfmlDeOrYkPYErezI3/MpugeUrN5EhnLgL2QfJ9Xe8JswTM1gT410pTtKJ5xWvGZS5e48vygcgTjXO/PNYV+hqADoH3dNyK5torMWlxoxj0gXLHvqYazqsmoNPotOPT5YHcshHexBFU9FLv9vGe0VsjYy4ZyzhIZVS3roIhpUHK2v3r5JhrfoeGhMfz1uNG1JC/T0TzJcfCwIYpA9IBu5GVMtAMnhF8NkJ+sbLvT0LH2ywQFRdoNshPTggsY8TBTa0oOh2CefuMG1gJlXYEBFz8KlH8pfjlQbfl+fXCoYlfS0LPXfPK1CHVud7umt5wZCZrARGu4bbvgH54pHphojSdCc3JMc6/2JknIoLJyVbBpWDH2jsWxhnOhvNtCJwEYq8N2LHzSyImQHTZtAoWo8k6Oh/mvgrJbmUtEcZgCavJ+qHSUGZCckVt+DZw9sXO9OVffrAXf38eZjg+t0Jbvq+aWMjCnwj1nzz2vXY6v5bIYsZ2m1DIByk0PxMfNmDxsCKgXR2nfSycJaEKKmT9PY5YjLdHHApsGyWIQql1VYbWw6X/fpGbzOXANlZQ762CgVnSVdTHV/+6UuYZo8o112Vxgw/dwLdD0Nld4vmrYuksxcAGyl4Ilccclr3bYao9ElPPEaBjiF8mGzFphwf5jaPQg2FouVuZEN61CnHOYvmjq2wYO6cRRxfofwMh9/EZ2F6N5SixCYo2auoPtQ9WiDFKa5qM42dYQ74WEnnLivlqcmxDSG2uoWKgZEUOKEaNrc1lgEUK6VEGoFlIvApUM5QUJkn7UDVkoSbToy3gC12RLJAjgWMTueU3lo7T5DzjGtjiCauRvZDcsNd7wnzxXTWxC1OHh7kFdudBxxT2i87UEJuL7tqrR2//Bz1tOtV6ADYs/3eyb+vKCv5EeubD89ULfs45fZYUt0YY5/vPPt1bm75usAXIJFTYTF00VcdWlQtO4s25lZ0/VX4pdUIjEVwbSzyB/3clsLLrNXDhRcIJrmoystc9dN8bRnQoy7F9s9fsKGMCci4gWYmUgyJTTb/DMKH//u7zz8fzk/MnBFRVj3IVDLxeRMfLbgWDONJYf6ikdQ0j8k/Ai9XqgFv3hwpPcNmvsLf3IIBLrda12+ZtBKz8OSEu9f72c7+l5sO83yCxVXKWFBwCfRzE59X7kCRdFF2DZqKmsKHf2HXRPzdbe3uoF0sZQatgCqnMCnu7vCcBrDmWpLYl9IHU1JYXrpBNxkDOAliq0QvdbL31mh7XxhJXeMueEnKMv4dx9ILRPGW66LaeJ2DmfP9CXoLgsv+Gz5vXx6NXMALajP4QaeMSWu4Pa8v3gzAvkrWm8fHLLt7g8a+eT2pYu4VjHnQ53lF+V3W26Ciqs6xqd7fP1mzVp9tG7KfaEgT7T/l9cc9FCFiH79RVZaSHJCCoJiUThtawgJ+8a+inIvluvF+XHnYRQWvoZvQAo/oPd28rb9u8W2LOwXSEXCyCVqxdjR+FHu7RKvCCN6/Yp8ZXzGHEQIf7LrdweUyE4fzupRW2zQgqQVn5LGZ/cPk9cwxCywzNE/aNt+bVLMXp2OjMYeP5V4KMHr0kMA/Z5//cLrxIflVw/tCwf5354+k0hBOcrhUmzo3XEJZ9j6Xc8H/jXMA9Crifakatr0IHoBza+1shssm4OSvNxZCzn6Q6jwkkAGu688fEbfRVKz2NSEvP87TvXLSMyOED4lkb4ObXl0jaHSspdEZnlwU5tu5km3Pofs353A7uUXlEV8kCBc+qt4wdQhEYTE4zNBdW34tbili/jjVlhoNLPld5Ale2s4aNLsRBGA1VjFYSmZ6f9XiNtBjTFWenNfeVls2ITPdniWls2CIlZs1OSH0zB/GKXeHasljfyA6pauhm5/915r4mqBVAubaPaVrV7eiynGBSaUuq8tTK7HR7EzA9qf5kR7hzGNL7PGk27FTgkcr+ZnPoCQ6PmEnsheSx90O65snorP6w4+TJM1q1KPgjp/4cjUXU1W3cy6Txee5p9kMjUV8oqWYAT0++giP/965zt1ZVlr6vlO3e/9lUzxKc+63RTXRiL/mIrNy+YwAgWEnC+wMy4uOU2rG6+EymmBgikhML8zmeBcd7eQBZM83mz/rYDhFA5UQm4ailBJTCUUuBGaJL4yeo8JBK0TT1Ty6htETcRV4Kf4SyEcCZgUgJqUJ4SB9uLhSkrKoHdqNZrBikF0E+BOl1DfXUxRICo5ijE4VDmZDNE07+gllJOPatx1wfYDIgp06iPGqeISLzsMlNa7pq8bAJ+ek7hF0t1ze19yyxdGl06vktJVT2k8OfWlki06ziOS6bD5kJI7x8z2z65AkpsuMCXr6qVXr8eU/WkjpK5KT1Vks6TXr4Zy1wPuBuBSb4w942upT7ZudsH2RkgHvuQ+Mz8msUr0C3y9QGPf8mfa7knNzzi7xYNh++90jNrbkHkjMauYgQAHhG04NSgvOR49lGgsHAJ6gt07ERkUaE791yHpYkBYP8yM58hWTBCVtwnW7nglrBk2FzH6LVIDeguUzXbas3dfJIDfwNiu4ZsPzCTwxYneYwIsj65kosFs92lo+iWrbTDnMfqMURc/AcDdj2tp9nXRygZwOFwh/tbSiugFWD+iMvG0iDuaCaTN5U4Xn/rBP8KL7y0uzkLiHT/nkSjTsOycF1645ZgncqQbdc6ta+3X7/cFls8HBWD9fEiJmvlTWefi+7yblDQ+J5RVEmjv7oH+cEBeRgQOGAZNBe+yPDqmBncJRWRGLUBUyzIRLuHjTvV7RZGC8I5PGBjpkCG7facclQrCLY0SpX7gYBPIAkMqJmPkYomVpwO17t4MkeIk6RB0/9UJqAUy8J5bsqj/TVahjIVaMnyG62QwibPhJTR9k0v+s4It2y+kGiplmaDwRGABlIau+FISv5bwIKTSYYmOuSzf0bCFn/PIA+LYVpZQEl1BkqA1HUEaiCoOsMC0458k1jN4WjNqYCM8eMq4w3hWbgIlrXPSDbdCex60cDWlR5h0EL4FLcBfEjMEYzYOLgVaIokrYvhujn3RHzHSYC6nBWNkVAmnFBGUiybTh0Jy1v3nAAP+e76gcx95kaZQj5cCTPU0M6VgrgK8ZZhesiTmnYwkG2UTCiDTusT/NBvTi4oZyHLs665XCPm+FiM78+UpT1mgm4jXPsIUE9FSbp3T6ccx6hEEfzHY64wCuTpvt0Q8Kno9FM5M4JWkcKAezv78POf0U7/7HIOQX44jDdWX69noWkx7zHV4wXl0Bg+joc6NNsvrqH3BvyHILV8SRN0zgFpuFfb2P+VVtQXmMaqMYxm5C8nrpYN/eGgY5OGlFYSpeu2YxvDBxr00QzZHNniygfurcfVNUOzEjlzlocsGxWxDSwxxYu7+TQW6UlSXw61Z/3GcUZsXQxUtaedSdIxeFPl3wvIGQXGex0ssLJdnzDcZXP7Y019W5uEAvAXECZPocwZcxvixX7dUK+8MWc5QLSc6IzrGKBU3aIiXYSQ+8MfrrP6+A3mHyIb72L/PQvNyb3ujFnsrPLN7PWzGg2+l5Wqv6HhcJkYIIKNUpwSqI2xoH+P8ypY/K5t27mcJx3ThfGa++QCIhXiDMYehgMB6CsecbtSXZkLQbbtINhHA/cVy72jipOryqdyc/s1qZTc/WC9+jp2F5Ca1t7t4cOjmffFTAjucjmwNvjc08KV7KloTGinkHbn9xnD0z0aXwFmJjU+s3IAdAOPRPbfuCaCprKn9Kvo80K9OXMEHdScEY/VzUZa4JZ5C8hjOgbUi48hEjPOlvJ4Qd4xLALZDRS+lpLsMVv09D9lAkDaJ71dT83Roo3bBnKNxzkZoYq7/8WSNtgq8VNomPhFA9rEd5QoC0KIL3wxiohajQ16AWFJ/rAo57ZA/g62P+BLKsKolgJR3GEEInHlLBRpFJuHYk3Q6cOkPFm9asunMn2N/v/P2Pbs9L+3ZW/gXmC07d7wNfvp0RG3q2sqEsSauZ9fe7mYVM4E2GwI9rWeW6CWDLGBLjz8NdEh7sAp5xzv3GEnztbaTwnoceGKcvMwt5NIQGwm7l5Ub1iWce77k74r0xs9tQSr253isuzDTHyFVhlYKpwTXv91AYesxvEeZED2dBFoUFZuFcbU1atHgktOeO3AybFKaRCKYv12NCTF8JByAI5QwXB0MhGpdaMQeltInBGdUzQDYsV8vhIBGXCWtRjkW6pCkHCqHYTKHbdq8lRTLfSJduPVlCezL1r1YrU7yS6xbOJkqHDhWfFcD1l3f+2FhaysCKvDVJJvvREYf7DFARx8nH2fsvdqz/ooAPhOUi3PzUzC3kUaD2vHRGOXXkvIkvpdM8js9LmTBWwBJNunS/sxp4vHarZdr25H7BkRKo9yExOIs4uQuh36Xxg+ZLAF25B0H5pGR/pEXEc/ZzFWOSV3ozBFMeAgoQZBP8szPkh2FWYAYqRAcojbzXPJVFTjiQVTzV+kqaSI1k4xUUHbvAhEC6UyVib+gZS2TJ0e695d+DmjxuJcAAyjvihsIIxtg6bDgDRmDcilYjJiNOASmsXuaKQByzkGyTBQkUnLcWyeYSo1j8d3wVcDCybBPIOmqfwZPty+iEw/eZprp8yxa4T7vLyhOR8oZ+nj0krHr2NUF1mymb0WaUINhpSN71feHafR00ckGtDmFhWDENr8oHMZT4VD6lLlVL1jDAQyAtQ8J+HRccMhIaJUDKKG00w8WyP1M51IaX5VjdB3QOQQbs5wskcRzZ3mniirrEiTsSX6x3GTZoKiQ6rXIJdhuSz3Fbs/5APovcBIM+ZAT8Vc3a099VUXBvvaxs2uQAz9mpkZuWjk1VIvptE1yKm/nOJrg1Drb0Bz0yqh2/G3wX7q/ImFqChu5wTOiCW8DDK0Y/lXTEJpYfEv7hKuV/mEEo43w+qCdcniGHSz7s+dn+ALRN/6hf53ZhUkir2bBel92Kc3P6T5o9gJqzxz4J+IdpWzJqFWmn/3b6vOKWGldJYvdcA+sKGlxVInu+d+ZAgve+xqKwC3uTjY0oNseyhTP61ydZZ0liPbXxId4GsR1ibqVRaH+pWsTySDolikIH7YJAT3paSOPtzS7zrokkJ/xSQuNL4OLa7DQMRnnIcEmRy4lDtHPq8Z8FYMYaJbGCwGEs6rXdRymHmO2hqwja+mPeyML5DOzW852jN+t8xpVCcCPUUj9ZeH74yfr7dAVdxCm34YYo3k8RpY2/ffMBq6kbuCLXnF4OtfiAq45i0j9isZn6wN7ueh13lRck6iJnIQsE584DG3fSdzZ2Qye4lF/4MA0D2zuswiSXVUH/qjHnAbO22bDy6kpbCZv/cXSNKiNwfOXyJgRFmuWiHu1Z/pLoqBn/cvkjMB2Sf3Tf1a+YxsGgX4kOx+nTJrQSKlGTJDBz3vQwPM7M0KElUhX5Dpie0rk1MbS3C4CM6Km2P4F8lpw5Ru4fh6rw5I5KnPP72Pnfdo+7x9WbnYHcy0OfgaCa0xqigQ+Rbiy3YUGFY3LQJCIULRaawERqZeiJaV5qfZZQ37ZTqewGwg4BF18+CP7xr/JgHwLT7tWWCjbNi1b20rAeKWGSoh6WS0XxNMGgYrhutE5PChX7w5Ue3qU43HWK5YAJLd97H8aS0VKh09M9DhQVtz6hExzQpfoFhbmK7IfyDKJeilSzKlw/jaKpGKJEUhlDxiZxrYuHaSHtWB3ScA2aykQEcCuUoEpgC1lLEU90617VRfRBE4WSM82OShLNi6VLNu8poV1deK/qxCwzN4lwdWexiyqHuMV9URzw0Gl8jehfI9WTNqWNWqC7fm7rCop6Dx+dEmq29E6Brl6YSyG8+PDwi+rt6KnRPYeW3VhJJV9YnAxDTuNIfHMrjfiobvoX4k7wBd81C1npbWNu/9J3Ukjjlow9Pkc6nsr4uICqGJkwdJhl4YX02a3XBTRNzYTOCp+fEh1abRDVuiilCshdKQiBCEmFgkrTEQ4UyeGhJMU6HTTXEySBipQ8ot2I5b9WnSYHKpAcYTPzQmhkQpi/l9my4irPm/kaRQ/lLxvrnh64Y2Vf0KLtkwwQhRvoNvbyuMRVq42EFdZrFTN+y+EaT8Z37c53zV2hh2ckkfwGceTIp6KUm7ucgV4HNcdWPuX6WT/fJv+xA//ezYVpg82Vgl/mpgT20igXg9wpaNKzoAL6Y0TIGi5gxEGcYEEhUEQfcIPNxoA4SlC+lcHacwrhur94k8WyIC0ul4h/Kg5lxuxVksmf7l5tGBcWSAtx5cq+B117zElVrPuDNEwwR6S5VrvEz3oXfaRGVAMuju4eqfQ/8gnzjeW34V8Wi+tEU/jq3eQKdvf6wVMGVCzp/NpcwbyV7JaAfYPlx30f7ru1kMn7xTVZfX6V5CvcH7Yqni/huK5s59ut4dXNn4Q1bbo8Ro5J8hG7BcnH/bdo7bpcJrlAttgYKNGaFSyThfVGEzIczKo/45ewoSdb3pYNmtxAU6E8dOHHpFCGg9ljSxrNIAy9WfLqYtwUPAZwU9XdLCx2hWn9DGPqHGmQMle8SrMHPylSOccIfBKRteobnCoPJJbcNrHJLwG+QrR2ad3FdkLroKCJmLMsC26uj9nefZe08bL/T4SG8LOWJITs9NNCWVV8UJHIuD7Tb86inzObu12Jmd+yWKTIxGyRItMxDtlubgoYWEarvcmoX8h5rY8ykr72C5G7xINxE5ARmU/6xl0R5CQ5Mil9RgGC7oXlZT+K207RLgHrb0lNw5kArptrgmAqoOR18EqS39CoTX/f0QwKJ3JJYDyFbK8zS1EB3IARtHBJ1sCh+ChhDtOEHv16FC259FiFglkgJXhD6Gf80hCO6Hc0qRP+tB3BbUHS8Z50ugGV0ESHPKZf7TaEnfGcj4htEmFfPk6JgmEQzh12cvzK7Q112Gh8g9qLM3y8ltAThIXON5OcgLtU/qKwN0vd7CzMZDaGlM7bZzI27aSn5sJGAA5UsNjo5awnO43Depj75+y+QiFZ78ozzHn/XeT4gU1AzxinP4Of5LxuzdSwhfym4ieTOvfV7i3DEE8l6+HRU6rVIZx/uH/mhbb00FhbZpmMF/58wCmGdMZUi/tIkfv5VZ/kZ7iJSgQGTcrRiw75rzbiB7cgeMmjEtxFxH4NQfUYTYwGriEPDt+1G6MZcRliosMcRN4sR2LcjhFIFi5wSllThsIEl/hnvVb4OdTcRLFzSmoUQCFAumTLmhLaiYUXqrSvxDM5rkIWUVBd5wLthQ34YfFhl/Av02GRIXYGlx+oVAEbnSTkbYlkJXMX9gxn25UrLw8KeffozFBWx4S/I2BK7Qzu/eP/1aFFf85muCipFY0THh4NmCuYpqN7FH6S/haon239Tq5iuBrF5SP6PhwJnEtnTNMxhCWj/wNd5yZmztj3p39vPSmgc4pHHZ/J3KV3hCqMhqb8AJaMDELNi35Pn111nU9XVXRtLXX7DcLzcD1E7mHYHWOkUb5hqnXE2f9SxFTKhPQdORd/N9K5T98SM7MAAcsmWd2iUtOEHoN/v0PfwIeP0mr5uPLStWUs3KLtDuV/4bg2tnP1vITQihP86nhODiPcIH6MnoaJ+u+T+/bl0MmJbW6PR2ZfvD8tv4D4544R3+99CkxcNhPkNvMApa+Qdy9DHitcE5+7Pzp+1OeiCb8FPdx75InNWW/bzuQG9yfsShCIubIVEwWfP3b2fhLWTijPYsw3S1GXOyBj87w0H1Zu0D17yI124l6Hey3bLVwPjmz5BG5xpnvf7Mf8qglB+Yw2M1HTQhd9/VzWrO9YU+aHd1fri4zxmxwt+p90qxwrNHl9qe32Or1eOtSmymLb9LIX6DlI3vJ/8/wNSQxyEdDTdtZTqSMyTyITfcgQgMOW7jnVtrY99pvV4+x0qsZ7wVu1m31Oea923UNfCwl4kyITWnv+fogToJY2XTMsr1EDQBd8qCRo7dK9ghL3inCuyX4aA8aiNgHRYs/TDlk5d9fDD5y4XPEvtgxofwf/eLNrdtYlkkTTJqm1NLNnUdFBwAM6ESfh5rK6xoGM/ZW/DZkTMQiH54sibJe/wdMqaDppE5/iIVEbtu9OTJNvTGzQ9uqfbrAWT9LwXlWd10pxjopO9cwSJIbFmwTrsxegNXt6cDF/hSioRYuGa8PAz1IXAmIMOXdhT9RuiI3bk8NgEdvytEIB/pjgQxLYbnQGyQEsB0aS35+7gy27jYgseuCpTmE8lmiGi4i6q9XrQgzdu6XJgiwh/Yq1a07FVCdOq6o7pkiYEap63rn9QEbXBox+NXH8WNOShS/Qf0+3EdMKkpp4Pc/sgWXlg8m4U3Fg8lEMyoB2Ahb+O3xNSM7EY3ujAyybmqMHtOn3b/3mi1dvBSRxd1YgQa5394aN6EpfGRpE844JTFW0SHvVVgm6uIsT6VETz50GMY+SjeG7cnirGTCH9zufM29OebJo+9ARBYCBWZkzUOpmAYz3ODTbWBcBo+yY9l3HfPryCDkoqH3UIIACHE6VDRQU/MIb5tP8LoIgnz57fBvvc0G70DlDaEFL5dfPxmOPclG5/H8Z2/080mBfV4Js9OMkUUocNsp3eSegDxCqeYzUZvs0fscSYadDbsdYdUwe3+mO+ap8WjLVe4wxq8XTASBLskKzkEO+xfyH8MAR3FTaSt+PUc9ydxKMCcqk903Cy6gb7lW6Y9xZCY/JdckHJ7JPn75PQhl4xd7hTZzKdDK725c1klpBGa3IHC79SDOC69KEY9Ol2pSNvd5Dz0bUzRSQ9Lkyj+41bVOR0Iqy7SUXoTfAKx5lza6oeILtg/7Ah5XhLgeEnk5BTMMYjns6821YL8ncOf8DHqDw5hA6xAXi7oMUUAD61rgqJFdKYZm4jlbmbUTSJshZ868Xs28T0VkVRisL1zc6skk19aMcAnIvBUyMY+lbr4p40j5CM6G37RBi7W06Uv8WRrszWpW1iW/z4q9NAUvqygzl5rChkuZIR/mKZdWOYW2j8posiWlW73yDZ3o3YIt0H+P4ovTxoEJwXHVP4DLgDZ9T+fLKtp6KYw3EqCBfsKlaXkO2sZT7Aq8DRItoe6mFzmp8sRypz/v971k41w5qwMVjFL0zAsV3nSOnp3WbXS8nR4uaBKKtMRkRMS7gVN/xtPpUvAJ9rpVPmzFScYTQAQGHf4gqzw68CMj7QCs/AWvonBYrP9FOJhxZfTQeg8I7o6QMm86zFU97+b+vy8lZ4tBR7dXMzh1H3UfbwhC7p7dkJwRKJZMyt6dQaHMNk2TLedeFPm1EV8Ahyk66/9Q5nbyFFebviottnJUijgkFU1z/m8XOzWcMPIj2Kh/9ruWwmEc16CTqhvrm/YEqBMJPZBwEZgc1OLtyGFPVFPlfa9cnbNK4fnXlzcsTMDNL2MRUPw3G2608y3Ud3a58pN166zAtAStK4zYBrxtoc82ETIvj5Rz24j7BVkNfmCCZVwBQrpsY3RI+uS2Xji1/EpLGmXGEot/GtGF6hHA8IpK4ruwhXDuzyTWwTsB05SD4RhnzVyyd1Xw1vWQpOwr6YaLTg7mEQS7qj232h6kpYKrdIae8LY8MK5eOiBzS9kuRWR8YmihaClrFtrES++Xmkhxv9sKI6XoX/opSiOlJlIjZgmIJ3elZwkSHxHrX2PiUtaKpYm8tk6srlkgFZFJYYBUVvQQi7vQAbzJnXTaDIBCaH6aW+VQ5uLzXBGsKWvCYyIOxAKtB+JbE5ZIbBSTCTbhaEQVh9iEjTaFn5S2dheszS+oX+cRrT0904NdiJn42gHPGVeSW4cqxHT66LbgIfJukKeFD/KHUAhY/S0oYMq1Cw9wapFc50THRLDVAdzIL9fdZ3iPLlL9pE1aN468VUmNCUsRHTizyCgio0XEVZnD3innNYp8VQl14kBT0HF73eHZAqKQLI3GJt8zdJ2WcGur1eaPWKzX0h+3+gV5nGXNAiHxv59ss7OsnxVXoZzK5KXoCyHsSEE/x4St+N72ONStuJajKSxjHWmCAnYOXRb/hu3jlzDdweRkYMZFZC1QjVGhlcEQG5y17LPc3jFVFGwsayF7MDh6gjmX8JQYh0MXX4EZ+E26h9/GWsMQwMpikFwmvbPb5hdw+M2Gth5j1365lo+MW3rXq1qZCz+h6ahHoN52PJlH9hIfFzOuVRA5Uf4U7ToC7ELv3XZvSuSnD4TYyX+GWeSd+iBRridMdPBo5TZGACaT7ePIlFNRhOOXYAUPkbBPJIALm+9Ad69S4Thep0VyaaEhWV3BKNNGRi36S8oHLuWNnsYVPhaFBPFeJnGtSBOghcSL/ON0lUpMtveVtJ3PhoheczCFTkrWP960XrL+n99O1YtnlpuYq+/LNf8lLzJUBMQeIOfYeKutcfckWD2bOMwLgF3FY8r9UzsszX2/gGqIGT3LfU3Jbm3eoRQQFCrg1HPlLN5fitomjksn4Rq9FoWEB+60CMSEpNYmEElGVJaQd8mKlT7inMQ6MG3qf/zePbjjX1lJ6Bazl1a1UONR/rFHjVmGdX6norJiMI+IoofekdAAvdwXKMy5lpbcJXyJ7yiHAbaei4CZrKO8DqtOb/5wVhBbPCUrWNMO0PxNH7CralEmh9tRsComxHZuT4qrOZztrbB2dRY5tFuG4rKSGoCEgoSUll8DkqbtYXi0kTsaZDNlSikqizbNKUDhJ8a25FvA87Wc4reMknzlR9sA3ZfNXMartLdsl7/KMGBmWtR/oFxhmd1moQU0hhnsVpSKfIkByxKfQnlZluEzI0BDX8/xT2fEHKaaRlCLKLXBPwFU5efqHXVF0E/ih0JW8gzdHh1Amu9J390YGNa5oSEPcnRmr0o8RIPJIJUprAvnQEDAh6Jh2PyUtSaZI0C5kcdcv3ALV11GaS+l23/GQIQqstTNJOo2aJwp6qp4DeRGOJPdQl4QV96B8P2azTGDgGyUtvsI/vN8Cdu+ozMCV/Iyf/JKg0JjqS0tdYJQXoqxQNMt7wUcx5VY8Ss27HYg1fNVcPLM3ha+cKcFLWebQkNzeKO18cOfKr8Pp3CvE1zibf0Ts2BH50S3CBqD+yF4tj1O0o1JnMhL4WBOl4RXd6R3iJCbTSBRb/ncANITl0048LpOxvQsAumCFk5wdsCvtuDtkhLASqIe3UZwQeVAgMQ3lONBHiHOGsd6SYSnfpai6fpTJcwk8/sFlX0J7Sk5qOx7WrjN6IWVy2wvhj8MmwF7r6lEzRRlx2Bv4nmYLzyuJqfYvNL4wtnIYErbHsozShgq50TQ5wrvcK9EzNU8Wy0leOqQkojzN9QJ27RSH8VWvNLhpFspSN4p4irDf3Q30ZMCzrwbbxVHSl/LE8TpzMzJj4393muf9ld8hgs4uyNK7GSP96ZF0BT6b7nrvm1Y6gpry+MoI/9qCOKgU16fYFyQoTRR7weg7lgHFvGp++EwCRyhDJvS66eg7r3BBP8K69P9atTll4qR5O9WTHQmelZzyEOHIjK0OPTj7SneSwb/SJauCIzRW/7WL0MOTCUuGyBj0hclj0Oa+3ytVCVxDV9kkGSNdclrysEl84pqu25Ht5QQ89raXp6gvfyZhND7zZcFsv4RG0SEUgVAKbBwBcHIGM55X0xsruDOGhJUtH7WEq3h6lRTJpSoZ2RHuUcK6zzeN2M5QGuKnk8sERk4831PnPTlVZy9K9rEddrou+RoZjEF7ge8MBTA4aUWs+wzUP/TJZHdmef9giwyxEku8TARvH6SjsrNP0PiH+4BUsb8t1r8hsBTUp1BfhbEkhdtvunkGufnKdqy+nn+vnTD6CzOtSeGdOnz/MJtTy53cnh8sOLXbx5LjVtDkl9jVVmAEMs3gf+6eswU1rYodHRFjLr6GOawM35Xdv76WWO8DxLj4gjEBXmp6TFpOjCHNYVLeRwrpTdeW2rhefise3+YBeW4NpkCX47MfCWPELDlHx/BleYFD6/BV5oEZ2XnzzBsCmV6EiX7fdzTb6unqUbFBEAxgM62hXfXZiVHh+BP//DD7snGO2LyCrBS1QxlSnRyoKBLO4LF/vhu6NtvCAN9sh3tBfHbHNyqHCOK6VEuyWpPbKIZsIIzHGUpg3h79lr0ZnwIFANcP8eDOByD5neLQax0pJddr2Md7Z7oZA5MFSqI3GQLyODm6qrKeAUzJHkJVnVa6xRWsmmcgp9G8zwIWErfSeT1uD7x8Jiz3HeVlkViGDbcYW0ca/AKtUEoEJVXAmVbpp1V1RDhc1mjo2qhED3UO8KmdMZJt8aU/O9IyNS52ckuVWefr5Ym9h1WJhat7Qr0/8hywPlSfGMKsOXqUI9oEYJuLmwYLD0+gvH8GlAIGNoSCpP5/P9OnuPwVS/LjEytz00sMUbUjInkOItAhoAv+5J0LywW+h+K9It4RGG4J19T5tZzppdG9U706S6aHCTizJd3Yg7K7+QV1+YSkVOq1NcpvWyU7wJNbRtUDWTsYrEvuTaR8gczFG+Bd7Ni/NPDqzy7cZSojs64QMshFQ72aLBkalZr5aIcZNM/IEj6dFMQqnCpK+8uqhGMcafzLaR4jr90cKaH398hmrdQ3rF6Ywti4N0kfoGwF/5wlTFgLsAq/LOjv9xRWilQobgdR4ROBe1uMhq9NCMh0ypFhDaPu6QjbNsEYgV3XLGTL7Naz1zjiWlx4UtDYEc8rnGiOcDQzbaBCzw/wc6sAJlzzp09ZrP0QwjX0lhbxyhOqw8VH9yax80Sj8ij0TJiWwIZcphWQtKuThnAYfHowbFYHZYOD4KhR8aFBfsJtAi4mmOOdVGnrPfLPbyGL+VPGuTZ2Eylbi3gqQFpHKZHN5xu4nHzCNV6zlF6uar9UobKZAe8kIqkylae8HAYXaDBTWEhCb13YHvDYLPE0mnIlKbYmBNT4j63Ij3IGJT5Ks3lJRqevA2ZlGYNwWuf1apBvvzX3IEnF9WHxas372Jq9LfzxEiY2OyJsxJW5OYig0rGy9Ij8zZ6k9rwY1LHVt7aVk3vahT27l+rRMM4wSuVi35G5rvLe+nA//Ke1XyPnDAiotXL6410LElsePnJD0GBVk3FmwEroHb9q74mZc4W9fZ8uSURR9FTqg3BvMpGLYitpTWT2Fcz4cRQgl63M9qG/4rP0wTkyH6FFINUzejUdB5HKePpvV1YeUaPAvMYDBoqB9tdcQ4TBDBitVl8RTImleMcEL2yIEGfkHInGAJHHfpor/yUDRALstG2rXdz/maVptEoy38DxjJj0xbJ9trgKUMmUrOZA7LGsdgxXTc0ICJw1Klbvn4/O5NCAhbX8uyenGB8TVyMMxlAxrC07BmssEFbPmMRP+M5QltQydT/4tDKDMMQPXKML3ncxT4gEXUhREvHSKB+PCE/cyRY98IMGd5JbrzSSwHMTd7yxu6oood5XxMi7nl6Sz6nYzKf3XMF5Fk96imtetPXOPzuPn4MiV+UG1huHS61ME8igUzcsn/2yT0wjDy/rqFCe7eiQPHxTtDAwREwXqA9y2q5eg2nhWUVbwJWtRUSMbxk+9s0g7ypX+rcArqFMQsqH5PA//0VcwcU2BteiLWNtMSaXu73eVg9Kan+1nSU/0lCJbsrka8YNMjyXw8D8IGTUcMhvKbxe3G+3Nh6bYQ0DBMm0g2AykuDt8TWusZ53ULgHgws9u7LQbU1YFjzvlYUKUVfRcR8MBkEEpeJ/XgyMqKvSqe3DogMznIhhFEfI6ZoQzEK7GCM9Zzvs66fVv8adv8Gk+saoPXpYXL1QD2in4PbBfgMVBQOfAhCR6zab6KNLmOUEtB68JctgsdtY6BCvABTVilJYpaK7KE35S+nyNddr5Vku4YPzKlNEAkZnvFWN5mNcTRMBJoAJ+2l87iUhbOA9Uo5kuM1W9JJ84MVtyMliZ/y9Ww3TDup3GgW/9w1X7KZgqySKIHcqGrXyPsmp63joCQIGAAxPV7z18JmQ1KEDs3WSXpdhAQFOsUSJZ2fFWVJqVqp8UsMCKLPiFAWzprllJU7Y31ip9+nV/YqzLm4/ZVHy2VmELifQi73LGJXoUqc651fPEwMXXofOR+qJZ3h/8SUbo3UWGoQ2m2J9vGIMLuV0hwKF0vwBY6nMm4pN9wyJMWqSgxMXMvbGeE/BSnzg391cJdYF2h0XXOgZXlrgY/fOFKwp4iqlebtUm8JbQO1j+4rB6bCR48Urzv7wk/amTwqGx3owkHZ++npAQOQAv4qDoqyJUGwCpr8uz3qqrXJ7YAsEVqQxFfQtiUYMWSKUa88rBR/KT3t3LC6lI8sW00PHgybTRtUZMbOkGz9axNlK41cJayx2HqItqkVt09mrtSv0I4NnLhpyv3dHlCoC6WJ1strgpMUDjS0KbszcQamTPNJ/pBmtTQydPKObx3VhayCDSO1Kv6G3GLGyIjJe1ybJJ4KgAg8LoWdfqZeKJVQzBEP0ynDz/8NGLlsxs/2YyY8Veuw+rA9IoVhGJv42YjbRcX8TNgLjBxCZDHNgCm9kz8Y7+eoMtl5dlPv1k78hsvfvD733/6CyVflN0+2CWwKv/H8YKWpOjo81YrQTosMKhIIM82yYDXZTZQq7q91RIKT9XRE39/RMRKM5lWY5nV4bwfdCk7DWE/Z/pcD6zKwt3JkE5zT49JbUSBSnGhKUwoxVJofu6DqOT2LpxmSz64fXwGKyV10my5jO9fRRm30UCeqekNqOdxiwgW9+AyCfS1VFixtyPTQ2uYlhCvv78BNvIXvNdFVOWfDCbsG1o+MAspWlvZgeeOREgluhOqEUplBsiZ2JQGL12HmWZCS4NBT4E6G5+MhFGDWbtzcmLcZqttUc3hoKQcazokpFnqvaVbJ1XQxzFe0vHlZBTeIO49Pk0U4kGSoT44p1O9oXJQNBE7oDmlfyuHtnWRzlqxebmucaaw/PCIYx2BvGYP69ZgYtwyvK86gBoL6fxHItc2eTzFhQOLv/zr+5e7dx80igmktOrspaG3jNU0WV/0fN1nAnkcOYrq9oVCmQMPrX0E4YzUKI18C2feAXwc6SkpBf9fmIFG2g3Zwa5MNf4HF5PCBDiigE/pYqNztaJvE3/uWCpnnzS0iE5Z3o2oFNxeggAlFyTmkSVKZ+EE0fjf/tIGsivzzHCD7wkbl5AsUq12i2YJ0kof5EerDwb1E57bchsefVaZdLC9R7u2ewPP82zPnjMHuc/5e8uJKHdZiV66nO5OXyvSpiZpSVtEndYBnhxVIrRP+CtyBjhMc8SlxhsXtHZKjrmLDR+ZXNSmbHiKnfyW3vwjhsQZ26O5OyFvgmGxnZ2jF2iik0uwkL8uKf6VpE5+WEx3tKwCs4dks8dXmhbUxmTjEA75dvvxtTGwq7toq/RJ/drDVP4n7sXalJB58HpF+tmmeCq4MS2Mn0MLyYNkdb4WreHRayC+H1If6kLdk5JrhzLa/WzW+QwaEgZColWzSBwaEagPOvGsss+eMBv+pDdnrp/0yXWUBdhTe6nk6RHnb9Kzj+AtPD4nfnqNRugPppSwSu+aOB6+wYaLErJY0+FDOBMJ1StJ3BVI3dccHT32LFstHCBtfrAbgmG/KsEu+Qtr/O8LFvBZe5Shqp2tRh2vTx/XkgCOR5BvgowGyK7C9QVCVm03IGI+6vcLcckCMGOd4wRMIai7TEDxmOtwXchQFWT9D54GnUWe7ERJA2lDMfyKZHUEZz0ArUMK3jWF40r9TZh1g84Qwq7lYkUx4WKOuZSUgWYxY3NeHdYjA0PvbQlQaN56ndHdayGV4TMcDKibvpP/NDitERvP9kAJPLzmboGTgDLmTgDJDcTl2iIWzufmkIH3UGVurFAtSXrLZLWpi/e3yQkE9Jv635XmhCFjpVTNm0fybIXKc4QSS9eXuZzzh0Hk+RrgJtccX75Qu7j0n9zq6+0LRytpxzgOMSaFUA01T7aZ7MxXKKlavI8uou0mdnhrosB7PaQW1X0X2JNcwoTPCZqph7jTMHllQjgIRZ7zbEwN56fOpRXYIraOD45ma4i/PUa7USXmgNlbLTGIh4ocKoS17/X+a43ePn0Kz8Q4nJNwcf9Lu7ZcvULvokqT99S0WBpAr2WpfiM7igsGnHCtmrDmH589gIDbVxQ2ZJ5KKIzYAVZyUxTSDDdZfbyqP0uhcHj5y1PmR67m2cfTcdjKhFPrcoxzUDHCNKLWCWlnm1xg7zDt7NlwcvFwCJjS/43n/us4uN2HResr9b5/Bu7nnyO51poPKq6qbzPxQBOAiCCo5RaVqgoSht16ybJropzpatCREl/17oICkfdzN4k01cuVDwGCs8JbaPOxilOQbEevAZu/xbFyVS3vzBQ0pd3NT6Gg7R+m9JVCa1RjwX3dUiXY5uLZgBJlYn7C8RtGxzGzcbxKJ3xG3MALNMv/QtdEhnG6Ldy3hps73niaZ7gBavIfQscgtHmMcXysCDNkw+Z9259CKf7B/szQH+oN02T+93ZPcT04UCOrBAdv2COsCHHprjNKDQvsRCmdEr/cut3D5ZlnV5ootqRynJPssGWAsp8vxHu8ZoPIKpfCYp1qAmPI+AxpMRJTWRfjlqg86QpCFMe2raxbMRA5gAGjiuszo/XAtxxQX+gSIMjdySvwZyFo+3u6fY9fphgyGpcFnmhD9xmncMj7WLGtSgzk0L9NvmKSi/yp6w9GBzxDgnlFlVT/Ac4tPF0bF/U00j/duHAeIkzhQmDdhJdBkFj0XzPI721mVOEkRVj28V9YPatiCpHpEXhWhFKaxkj+bIDGe0gKnkCtlOaCshPyKLrqoI9Rii3buK8gcQe4+EoSoO5pjxF2EBfR8mArJnIa5UDpzQuC2JSqQXAGWfaaUaWEqKlHmZHSqluhJLw/iA3ovRirMZHUDiP01C4kDVYqECIhMfQslxnpQ2T4p8Y4DPAYcuLWYxrzgiK9bbWGSEPsabF0kcgj1q9WTqdLbPllknrn1TlVl0tUM22HOn5YfWRoEQ4GYNgnoKyPtlNgtgo2z5u1/C4Xcov2iS9h1OqYHkEZNxMoqsTWNmMJRAFgyB+tSaz2+nd67fHMnjJb4rHzwjMnKfikyLxdoBLyf4N5rhZ8uvjI8p0/5DF7RzPUr8l4RV+KebQj7sFCmU5H8iL09w3HIkKLObTPZoB5OD7t8Y55oiAA3u3qnjj6nO2JsGauiJpdz0h2wOexoA48/8/JqNs3yblHztNmpWvSOjNktglKRkrM4I4QT6Mxuy1XfiFnq6omEhBaWPaKyzLhpJzh95luDiIRrXonPT7T5lHaNntyLbggBP4MMPH4oAbG3gCnbRjJFpzLAv7k/k8RAAgF/iN1hFUoGE4UWbKmZ4n0vSgwuEPjFq+1D3ph7b5sYpiy77WerJ0BFA/FoWzqR+obkxq32+5A8Rcw5wBGvmKgRKqidjlQdV5yHK2xA4cnpcFdPXU7iMX8TesIARXBRJFfB4/DaRR2mdx5z7wg6wvHJzoPZ9K5YTA9e5WE1yxpzPwHhg+pHuaf4Z7gPzIMFHLvsXFjHIaFwQ7u3tmc53+a6m2q5DCXtXsi9CbHrA94uxUAsdKWdecK3pvRq5h+Ll4XrgbAEAxAdsQ/4Z7pHaAvomrfZkspnX5MUBYzd7DcWg3AVUrHvVkyi2r0+5x0BwZcMmlcbyJ6kFukocIniES+3QkU6dyiEAnUILK4cgpxOFUA1ghEfToYqwsX37YLqre6tLKyvAJbRuanhN8mKUJRMGUdAPoJ4hY/CyuNQr81vt4WpcAAPBfC/6ck081CrnMBFa46txnhY/IZLNhejYMkO3xSrB3eeiSiydFskUakSSpxR08sOJ3NsUpIJ6V8KkdUZS2Z4V7lgvm+EvAAM9fRgZUoolIkguS97haIBwJ0Lv0Dp7JyyyztuyX8/sUERSMee1rzispYR3okBSpDE+zGdR65dLDfWJUHflEhPYOhJFsEHE3+4v5GoqavPF9G1Hm/bG+YYn+AIFbSuyXapHoilM8jnB3s0ajaVyElUlxYEU+tG9lPm0LmwLhR8rkOTXhDPywmPLArJERDVNH6c30bGSG1VBxAeTSsV24vmgItoqz+I4GLt32f9Hyjbl8hvMfunQcDW3wa9rlJJB9Wm3PNIHgWCMIczs626YMkrq83+OclYyNNrf5ZpULV3EzvfgI6x3w7OWSaODjVNEjp2pZCWnmsXDHSsKCRSmEU8MLDdpUYpHZl0A/3fglSkbLCBgky3aJAl/NuAGm+InGTljSeggt0LqLFDmm39DjDlT/u2S3g+R4a5z3WgUK0bZdrUsOFD6VqxN0QAPKgIqYoSzpNRwtC46VqNjlrKZGM85CRa8X2jl46ygJFo9szobAMGazPNRubxT27gu490YFv7eIh/zbspkfg0jHV5Kk34VeAfRMjD/UbjNk4w6sE5Bpf7QWww+3A/XuQGUzf5Ayp7YdrbZDwBNX388mWCXcDcvCWBysGnpoMRPGBDC/i1GZKFn+/OaJsFiaiD9Fz+W8v3IDXIemkQJ8ZD8X8eP1JzxRoUrZtyqiTCEcN2KFRwHU/+dT7pxZPlxuS4GRmj5TYc3712o082FnLC8dFjAEoLzmQds1e2n+QgaqMrVnV7cIzXTZQJOO4c+6neIIWV/yd1zLRSsVlWVLcdc57ryDjEYta4eO+QuVu01yBMNhrAcDyRdQTXM5CgUvMgJl7UOpYch0APcFFyF/jOTXpgl8s6UiT5jNighTuJa4r4r255D9fOc6Mp+GrOHyd/Fs5b//2qpID/0ns1cAAGZeakZLbc6mLrIeGSpguNwiEVx7hgEgjC6cpE6sd5vG34veDYECCDkz+aJ4Ejuw9lauqeHKDvcEHKJnQOC/uVxIX6RBt/YutFxaQ3DGan0XzpBnyizn0DsYnEPa2CAFoDKibAI2LcldNDknlquuG9UiANUimr/7O6Y/C44lyE4xuMsF0V4pyYZIg4Kkr1BokfkqOXyLAwrIHB1Lp2VLVnA4z4BDktP8WChkElf/u+IoD0EBFJpVRKYqAd5v3IkIbdzFi3FXIA42vb05ZkMp3bz2ojN+nisYpyBkiXK0VoTY6hGZu1YzIxi1FIb0zmUMcAUmyhEtM3LWhpPoBlUlq/ejRqV9G2pBHH3K1AiyfsyjtR2AaVKvUal7KhmMy+fPGMgbvMZ1vMlnm5eEv+YpqFZ4UgZizxBhtOuY5qZhwTPxdpg6lrGLpmb2ZXcX+0vwbRLjYsMzeLZxclptbgdzZ5yOLvdFwHdTKEA3RYMqyYIsxWVpe+6Fxt+/Pbs0MkMbhaIz+jKcGaa//hR35Sado3OWRZMjg6NTQqjZWqmfl6x9oSiV+QuF+8YU7vPLa2pAbS7buwgJpoCMHKNCgJiwk83L7MK+iOX9d1k8FZxFqqDaVNaNA4ohVKQYQgUq4yHe66cXXCqgULgEEVKhEJjOfhgLQsySNxZowmXUsd0gQ7pWaGLBDTt7QyL2DW76uJsS3OlfwQVtXjUQLSISonXs9mPIWn87dX4KYaVPrHJUX5vw8KK7QCFlld8OIdRTmUentBi8mDEkL9/nM9UhKjiT99kwvZx0DEvt7dbCME/1Y85D4T8DQbpQJZMH4CG0Ecw2oMQL22d+GI5MDKUbFTo2mZFLFm6j2PwgoSfZ3RZUNogUujTZNK+U5tuYVOWX0Pe+5ThMAVCSINclCA+OpVBM108fImTYeCNsRjcFI9CriLizgp56bUIKhOmL+LjKifPaOsxbm1YGRn4yRRPTcQYrrQYYRG/GIT2WdrH0vQgAIBwDLiGY8EdilL2LjEZ7fUuHyNjrjyQ3yYxQPCKelKSHhH4f9Kohcqv0ol2XwWC8WHcBpf82yPBac10oScXhCAK1jEQHJNio7gVR87QHAMW6YNzY1NzpQJeORVDi5hZKX+E24VUBdx2yznrOEn4q11XEbwyokwSbX2x1IEmlT2bi6ugxUVwQFhLmI79L2ZA12CWKz+7BCqR0ictMW90HBdNPzo4JmsNRleVjsKXtP9UjsfQOQeDghm4UTrdYN6u3TR6jiaM6T1MiC+vyePvDr8WwBKsYjKteRm8+kzeX3zXZqWHvxjIA2zyQA9ViDCNZpLAkC2AtNf4sRhwuY8xfVPr7PUc9j9sVauXC7SNoQD2DLmupL1ffy08GfY8uNMRmEyI4CFAQQtQex4pFP0HSjrOPBp85R+MxDhq7F0JjubYP8Z1lSj1XrNmar00jx17Dc6ZxMb0NGvD6RcI1T3Mg2Ewi0sDsjWcZdfbqfsk3QK34ym7lFXa+9eRIO7vnme/UIsf+xxihWgIBwqdfb3vfVOmy2LKTNAbLsvPoxBBAl904boV8fI6nDGM1QAdZcerOOkkkVxDAK8Xpg0drgKDPr6xgTVZYIK+quZqu9hgDeizIxWBBnBWooyWONCSAsSDK/g7Do97KfKyhw/HK+CKmFx/jwawXibhKdLLRTvBwEiAoudWxlXXh/Gr3AwqN2D2xJACu2rytlUF4f2l8fmUja5+InDvGlC3mvTUfGtLOHu5u0F54nhXpUm3Mxs2CmIPJkj9HMnVmKxKeiAcsLvJl8lD+fiqY3/TRogerdKn/2XN43NfoiejC6DrNQKwmKmpLgzFUa6KkwwHJyknBc3DdirL7gWMylzvZe7uQmYXPRoy1qsUFGDJ5FIZzBSJtggg4/dVQ/JV3xLymV7ty8z1gVsK8iikDSHZc28LAoU/aFisgblk+SxuzhjGKAS2BV3APusqfvHvzFootpSNuzqnaMcAA17lIQj0NshBhd7UOGNbJrKNMUa20o0K37uHo0HUP5VNVHf+gT7JlUiESxA36WvrSAOEgR4wF4RyLB5fmVQw4hBAdRUXPsBrbWihQy9yro2oS8bS4RVPN7spawjfUjtcpwgbjaQDPTcZT7nxQEfU0GXvGGR3MDVuarfnwaztR5ioATgxJm/Jkz9up6S0wlqncjaxCwzMqCGg6VGIBwTFQhAVQmOAS30+yMpVhHzOwgQhI1uTQyWUBI2UO0BJ39Q7IQxNw8oYbBGKyolBKFmYttajjkM5y5Tvvr5O6xRmADnRHlbnV0y7wRtHz3h34/HqZYsVDI0E9tPmgRChGtXGpHxDCn4VS6ZLo95xeZPne7gD3ASmMguaAAqI7O3W1CwKqjWR/tQhvuGvMjhBLXMZzGhCkanTcnCQBjO2n/kzreS2JjWGPylhTuehm+V0xg5akH+8953a6MljYxNlqWh5bn9BxoPo/wCTyufV5imPpcyAC3WSKqdOQp8UFQSDcSAsi2piYT9SJq/sD+S6jZQzXVdifWIHGn+80WiM4Vd004R9vFsLGVoX4e/37P/dDnAkcAJqob5BZf1+3rMqh/KfOM8ByL9U/oSADH3WCd1Q3RQuO0QgCxTOjmqPjA8tQBlUeOioWOeZ9t88fdp29JXYr59YL7vl6tha2ALcWzpiwxamG2WgqPm3EAmJWC4fbF8fSmZHJOwkItMWHfNJ2r47tuRsCy4IGgvYv2M+1W1rEAJcI594On5o0QZ28mcOr/zhlKOw59K4zf/CCntQLY++jg5A4AkCiucGnWDODH/WFEhUjc1PWpD9ItMzcPUqmyNa9eKU0XqrpDnyV/yxk1xP4RsJMojgIAjq+5ulBIF/r5CSXcgbHooBdxaIX5FBRqkbP37DeS1HfiaSkiGHcsGTjwx/jvz3XzF3zZoyFCfiXanxlIHocoqrZz09YTtVjob/EqKT61gc6eQebOLCqNHho1qoEH1SFHUzvyEdy9YiKRE8VYJVn7NWDhMm/RsjWF8ct7qLZLmy6kfwVIwUJjh3gN3lEYAvquUxlwH7oqx6Mk9j/OIxzTRaIDMNiVhgsPt7+ufIc3fode6TkyfytF1vzY6oUsauMZe6214d8TLmfaABqhLiqYC3Qw/MxL152eDyJVkn9/it8ssKC9WFeP5och/b/tfJNZ+0hrGymWkvCOGW2AR13ezY+L83yNK04zZB+zm7Zvksm2KMtfxgfCc4lHOKG4cPWPYiHY+/HamgPRjXu6/d02m1skradYsY+Pv0hF8ctwTE3DHlbOlBk5H3QcjiLn2NGbQ0Ukl3b6kmg1JBW8hfvwY3dk/SGALuQw/0q60x1JfxbW+w9R8PQH9VVXgcRuQr1GYup4ZUZvnIQAqsV5g4sYRVsEibwWdLt8QkWI4vEJSWZoflICHJhxXbo0xEuQy+Q6L4Kr84BHJnpNrZWWWOSd34UbAuGuAMyt32+HKBDUz6CQaho+RY4DL3VhOdGvzkD2PFfCDclNwYaFqqSzvmqctLm6KM/m89P48Mm2n1Wh9IhIWNuo62nZihkptCZsb0scjJxuiw7TMHTm0Re2YA7aFDaOh0Sn6FE82rV+7o2aVMUVnA52ZwmGvOHzsmqjZpPKCGGvAZBI50Ve8w7Un42L23U0OEJCfQwVwfGyi0yrAeJhfMCXE65DMGWEMu1k3fxxD9g9fTrzNGlyXO/q+YHf2RQoefnyAewXU/y398Q14io8GjQBfY6JzSnQKqNmR/5kFxn4ft3SrQaixfpfvv/f9bXRdhAt9xBcCXuM9G7v0hWhpQ3lI0HcgQAK3B8EBA60JcOYx96J+2CZD98+c6zbT1wLrQq6OsS3gSon7IXSkZ7xiCgLgKQdWS+4SLl9FHw7QBtG70oV7wMABmKwiLRQy/57lzS4FfJ16VfMrG7H+8egV2HQC95NIRaGuIKkEddec7yy8UoPSSuCxYCECMa298ReCHXvsBOznaRPbc3XK3ENf/CPyEWgQoFY5Pe+hHLF8TcwdqQv0+6704kLwO3l4hzIvAf4hS9sMthMmwCulS4dyjA0SlhAVhew2naPxixLIOxzcoY8NhAcITZMMEpgz5eUMa4FyRxZvYz/kFuzno7cJqKHrfIS4SUxKmq9Fdgy8GKPy3XYbLaqVlRShrAqxx6F2AdxtlgvAKRG0KbJg/3zfQ/4fsWkbseIAjsb2H0XjCgx+15HhSVGqYO+jDBEjs9At83pFC8APR0ntuEQt6Wj5+AvR1bsKoGdHjnwtEx71Pzs57lMtr4NXImSxCq7Uf/AkzUrI7DTr1IV+AMuL5P2pyiPRvNhoL1K8oufR/UlggwCeUqZAyIc3ewhmUzsQF/SBhDIn0QXvYfRCBPej4vloEMI05g33BQmNKYG2wV85le/IeGlXaD+40dTkFnum9M9X0ftpa121KIGJqcP0MzYEwofEtw/BH772xXRxIISuupmvOkJy9PRB1tJ3O72DV3bDvvlTTi2IIxzhws2N0JkFmLQv/YM0msnqeVtKx0HvI/gdOEd2cmZ2P24VDZotTquwuH29cA/l9Tg81fjg6Il/dCQGIcPC2N7qfid43k55ZG+yV19VzSVaHHPC0rZmRfiDxrKxeDRsKcWob7PbngscAKsKA+C02su+oVbeqX1H8A9p3ghnKdWJ747jONg07wigboMUXxA2KLvovTUJ0i2lo3XukBV8hERZcwUveRz24C4ut2qUwwZ8zyeQtip/Q3UGmS4/d3IYDeKvOE/0oQZyFK11JWFdVIAA8BvEPfP/tc0zMoA9Qd2F4GN56VGdqdxqN469JH6O4Gb8JaHHbVxdu3bi6tM3NfW5DGcqHf4/w58+Pmr7FjF3QCRa1XVk+M9C0eEFTu1U5wm1YPkLGPOUSo4L2cJRIXD+sHNc3fawXNyXRATBCvsk/grN7wcAbZsElL6y3EFbKXvHoMOHU9KELBFEB0rf4491/xfcp5uPe9tm/SDzB348Qr8b7gszqbMFoPsWMesKGZDQEEPhb/yfklUDAJ6qCdqxI+VyLcMvHLhDhdhz/xxoY8GhGJ8eLp5dwfNv/9aOmhfu0f6L+7E7ExWUwdLC1hNzpFzu61XZAyXzdehlF8NU5eIlMl1eNkgy3WGrvgLzZ4Yl953mPIJlpbEOb6Wi+VtJcvWfwW8/4BQJpReBoRG7lxalr0tXIdTV3F0OV4Xe98WsIQOscLPbPTzaF7SjSDxb3CcMXsO1JjwGSfEnmN1RAAGgV3p0nGmkNCLhafwg3hwOXQe8SCMZVEDivwHibBIHudChsD8Jg+QJOcGUo8DsW1DooGoZbio5kTZiMUoN59BueebGQ3FEBMOAaNaxuAAFhcBIEiztgsrzvNhptBMXNhTBcPAenpi8oeDUvqeUWGt0nRSd4HgSjrgVhXvhGlhry/6+z539F600MdbqZbgf9VpjL88SRY8dh5qZ4vtAGBjY36nzz6X4t5igPYV0y9nwQ1lRTpsiutpCl7GTecy7Nk1k6hjNuijnKgyiAn9rwsYPCHIjVvG0mBq0ut6tWHsWfn82UYuxcbhqvfman0vqWbHdDFgM2Qz2OEJ3srGpD9MhUOwjmW1hzftm9jXt6ug25g9d8q2xDlxc2w0X26tHR8YE7uYUndeVWHz09BeSsV2798FKcZZb4dBZmlK7VLCvJ7vMKgIn3Xk64ED0qkVHrbBZ17Rj5fklq48nv+h9Tq5oCUz9Bs6YoqMZAkRXgVw6o6IuapTM/i+dLP/vlbx/IYBne7d04LIfjiwcmnVVfWHVx/4HixdYM/BiI3go4dDd67MjZAkCtn1usG6jrnicFW5esK86rQJPenbmRudByx8BkCBfg8L7d1iTDNhCO47f15OVuyNKRqtfgM5CCuFZvEaSFSUyJybnU5k0AswppxYcqN1L1Zd5XVd7MeQJjHgPkowJyt9TD8h85N+BN31qFdbS/0APpuZGqP9LbQzyWFB7/97zDFEbw0BYTPcRF0m1gsfL7Jdi0RZ7T9KI9S9gagx1scuD/65FLlf8ebMUYauNOiBkmGvDFHT1yftekNUdbEiEThoigEfurM8/acmxtrJtLGP2mUdooeEFhpns7wqBdi25JDmxrjQHRroJZ94x9JUz7j3N+S1pYbUqE5MGgfXvv9DnqCpPcKCv8N7usairAvCwUnzLAQN/QcdptYKaUW5G0RaCdZ1RFpviNIpN82yOJvtJKVi/rFfDgIq6rQAWg8dMOEgBY6/59rTFqwKeiTa4HFKuHNSnlgGTqZOLVvv5Fp7O+1n6eQgyonscKBJGYi+YIgcKw6e0QmvEoshMeTjZUGTFWHlyvituWvrDqKNioM44FMZTzaXUXBWRt4JgITkiwXSmJnU7m7jp1l6qNzC2V1dpK1QYicBheTEGdEbgvFhotqat2bOH11wNc7t1OszlDi4EEyPJa6RsoEKP5QV8eDwdCaHq4yCkUo0XiHlt2dQ9bCQQKONjihRdB5+M5C5iWy/VwLB72E1CUtWcAJuoKzmQGTQ1eigFIKuiaWVHkolOiECDoFFnmR83vIpnG6H/pgS+SgMygVix41kREPVMMY4BcQsAt6lQkIwKgMJtaeD4XjnJcSgqA3np3zqGfasKBtrYJKTH4n5jdH4hyWpXX7e8LvjKWfUWh1WzBI4KgXGokpIM2S5t2uhDPIUlvwDoS1JF/z17IHL240Iq1ZjKHf1MkgGbLCvmdHDJV1zuQG1QZfsViob8xkgqmQuwZTEQ1jJYKpDG/7as4to4ENArwQCvoJx90taGwIq2b6nEEox0h/y5QdBuzoiU0tCbJNz4AcJ2osds4D5E8IFnQ0FEDnSm1r/2pKM2s0lnI3/EefBoUrfs39Tf2elzhWMs6lIeDVFacYuQakMz9iExNFbIZ5HrxhjcZB5HW6EIyQzgmKO7lQJIrfDoQtj93PnBCT1TCgSreKJYZDBiSazKQiNLn4Ah3CHqF680IhYfiVDNIL4u5StFpvWy0kWrV9l2V9VKRyeNU1rZjyL79CW4EBO0SDLDAeMDHOBKAKznr5Uy0cTRmpvM5JI9GRQBoYu/GNgKLJaWwQT8DEr7uW5aFbuVoGzHam9osJZs0L+jHemGjw4plLW7oDBq3h11X/qGWc2Uc/fAyEF2bvh2vXZaRfxzt6nTAuaRekyKF+BpEjPMDyc91EZLrGRueZuVVT7itwtms4qcF5gRbW90lXcXeQLj0FyRIKm+tG8/ocSlrRBzi0vHB7Lr9JmdMxd7Uysi3OoSjnT6AzQxr5E5YMiqtMafV1nzTgDTaZVVY/mQn5mtPy6WUN6h5/Dw7xnnII8gq8IOExMAtDKfvnWGTwKJrsQUJOXCcCBfGG8ryOPDdzFGbCPceFf4xt0o9+4KzmMu//YPju67Wdsg8Mp+W2zmrD7GExUUxDoP1UPFBFUpajHfWRnMB3swd42OUp9LO3j7GKaJChGj+mPZiomx4A1cNt7rKd2DyvCm61v3p2ZGvmK9m4mOnyXFOHZZTf+BCGRvK1JfANYwICI9Aab3/VC1mQeORPDWwBKX22li0MCh0dOZaor3zAY/6toI5En9PzkHPZOqdwNzgbjpy0rpEbtkkhKb7fqcw31GGmC09U8/e055gtwNOe0+TwjH4RCPMJqdOqRK5l2MNu/0D1VQ3hihjKfJDidV4pzQEFV4jq0ojRUaOcjwn60faTfuCRkbou0Qbs3+6c3mLADmzieRiALUk8fD3XVMosn8YG6CnBXrn+HwkwzX4icLabxdBmhCmdwAniC8GFS0jAeXcbY7fVDgalGXeiQP76/Bd2NDKvFjcff13wdVziU+EU+ozxyl2XJfo4Mt1gB44U8TbkA7JqLw3mNrTn61qycI7A/hZdq/HwIqXzRwa2LvwF0I06kYJhP/mGrtElpNT57//hIrfMap4yel97lGw49suYa+15Ix+dZ4+dblurRlUvsizjVH+B1+gYgkXeg9Sl7548Xre18LviR12McTqdt8OfdEHTVCyzSyXeaXbXc+XI3yfD0OyVOzLKd65KkyDrlGcAZq84FjxHnUn4ISGIEH9ZR9JNf9SKSawg3e7kMHWeKXLNlt815FSbClYIx0v+mI9ykSguwEuXexk6kvVemUdjXTTNMeSppp0yYHOL98jGI0PGsuCyQ5wRikZLS8/YjYAghwWw/Y5kKI4bA07azwIY/iN7ksKIEliwSBxs0QlB+3zCXVhdQyzYAPpoislYOioEkX4G0RecCpa8HcHjdemqbWCwTn8SYgRALhr/OKDrCpy7gEl9AI0SCJqo7N+ERzocMkPYxRJmnafS8Hok+sOGcaNQgShYCbjgOlE9klut8yIPRfnEbO71I4NCfJJ/x0YIpACFUVa0nc09+bArClSWh6/0yQJZDGhSC0gfW6iIglCuSogBLmqnb5P6fLxgUKMnH5Hwlc8LXkytRJInMjCeq13BPr0QbzobuBbSSjRuJU1BrSgr3A/hPw86Qo2bLYs8kEO+giMO/sYPTy5wA8NkKVfXqr/0iRmdHMXMkhrYWcQOmq9KD+Lv7kfzrECKAnH15xqB+JThY0oNQChDWYCnOxFlZFAhVYAX4c9kkxTyNqIBEG+AJxashoBFwVfhkBcKLbcAG2JyCAigFRFll+zKF2XyJuQxAuJUiwqoRFEZsUp5Ngb3A+R/HlpkCFxaERWFZFpQomGVWj3dSPxrEJoxQUxpg5oLViiVpInu0rPCilW0TWLnKBLhgoEGVdVaR5f8KYrG2WuyVa5UZZLXpWg3OrwXkwTZiPJBIM2Cc8Im5M4VAJUVqpMTNJVbYLih4j0Sk9664GuVCHFlWhM2c4FlTbRIx81MUdKsd9IZUQcuHQVzgUIRtMguZWlHdkkAl6Jv1QgaDPZm9qQl1sYgbpRcpfwm/DVZe1+Be9KHK4BC6pYylIWNi7dhDWHcL/LzvVHLhKtsjAtiHPAxeLi1gSNIwp6LKQauIRAiZl4SPgvgST2Y9gCwNpiBwsK5S6EjFOBCUqloAdaYUVkuDfsPINEAS3dW3lXYcCJz88CYO7LwkIDbhXhMcZsEwnyD+vbDmXFFgGxLoduEeRzzbJxncCvSCHgzNueR4X0DW3uAgm0Nzzvng7VKR7X7oV8OCGpJtppiTV5ccQm9JWpEfocCfqvAKYjTdswOJFF781M0tpKLHtIaGCxLAx3IbtsoEJsdREaK8xrIZP1ei19ITXzyc+pozIBBM2LI0B0384ntn4DNnuU1BEVZ/oRH+wCfn0HgqRhf4uQcEBKGLAFLj6UAsBl38e+eNHx/d8BAcRw56jR+8gqwZqNtJ8ABbXXQqBtIZzRN4EBS7uqPnrPq6bRLMYKktCLGnSNwFWPD8tb1Zq9MHFgk2Ej8vruzwBm5HauMkEZPk7tkLGPnAMzLkplB/D0Bmy5hbuIEkZJLk/c/OLIw9lVIFI3ei9SIHlWPVy7QBdLhxcQiZ94RMiGd3QRPC3a1/IzWjKcjxJJKMIENioAf2xEMU2ScpEK4lnlhNFYSM8N4QH1LKNR74jZOvqYAhQAN1P+eVDCSJfMsDPCxPau+gAwZBAvbyETIxJAXbDAkp0vaeNlZFB1pBxYaqIjABZiMq+spDAYg2UYJtBTC1s9kuE4aN4sjwqsU50WV9MPmw9NcG1Y2e6Kin7QQU6bUR5MK7m9po2VyQnYWjTavZD3kXND6If6ggDvFmbzQpdZ0Bv12N8S0XgYQdTL6BjiMKyV4qm5OHFQiK+4mSXD0G0C1CG7dpuA5DbeV7AnREjmozvA1sdhrmueCcdfzwk8EzyG1oHmYDtO7B7/kR3xdYOdBqCD+K6qBmVxPOKgw/j1AG60chAtpNz4BqRr9jFZ4kV7yWj49VeaaHe+Eq+PWZquxXTi8guuUC4Qk8nTwGv7b/P4P3GriPSRs8tOIWZ3hGd8qyAu01UQqiPnw01OpaAg/kfHKnd6oP9i/8ISIx4FkS+Ix8Dox5eB+5M988aWTs/FwBhH+ILiEoKYHIPXxy7iFiPuISqBZ/BLQw/J3MQ1z93fu2MYBnxyh0qwIBThFTJ3DfVJ0tiVVvRQCAjFuWyVk+QHhRQ99ScU17VgaVmlCC0xrng1YQ9Zc2k1SMfIfDwEvW/RaNbaWX7SyR8XV+kLdlJv6KSfE53ARFgspPO+yjx2d3KFx/p6rcCeSOAKGAkRQ74WRKtElfr+P/5B6fw0xRmBzzs4mnSfFr0Mre4DA3/BL/PK+O54cz2HPBn+s+tDgElu6zHLO+9NDQWO+dNbS2zw0QefrLDZGadsobQ3D0A+l37a0876w3m/u+CFKldcdMlW1d6Y4bqrrqnxyj8mqlNriGGGGm6ZERq+XKdNXzD5KVq1ealdpw4jjTbKPsuNNUaXcf722oGHAmCYlu3E/4Tq/h2Hrlc+JiEq5jUfwuJgPCAQSWTxfr4mo0pISknLyCKoHE3eAl2hvxuBigymkrKKqpq6hiZLq94QrKOrB4AQ+bpPYARi29rR+pu9SPH/i0Sm9N1/HptCaHQGk8XmcHl8XCAUiSVSmVyh7CBMpdb01BKu0xuMJrPF2k2dQqnSyjQRdofT5fZ4fX44AolCY7A4PIFIIlOoNDqDyWJzuDy+QCgSS6QyuUKpUmu0Or3BaCo0W6w2O3sHRydnF1c3dw9PL28fXwKRRKZQaXQGk8XmcHl8gVAklkh9fGVyhVKl1mh1eoPRZLZYbXaH0+X2eL31znsffPTJZ18A+Uqvb4Y04eyFBagSHhL6D26/TnjwESBEhBjJ6FgmyubifCgUS+XxSnVicmp6xh6JwZId0RTsbGKkeuNS0lyN71m9UF+4uJj9Yx268ZNzQXXYx+lKWzkCx1VMSHNZdXYozoZKNQjm4mzInuz7C/kQ5WXa6PjF8kVvUe5PWXPGp1GcLbksyngr5duUksRN+ShLFamYSMdjsYWkVaaKkoYs0Yp86/orxfSdtgrtMsZPvkDwLj/rBLT6vF3n5WXrt5sM3Lg0LdWl1cAGlAqqKtcIlHoUwR+oN/9PNtpbVg/LCM5HC0V39bRsbnJbanlaLEPWcmnO27DcH9scDKOIeheXHyhaJN3Q7wRdzMnT8TG0yq1BKy76TyGv360vr3ddyvcJ9RrDOFPd1NySgFfjYzGGyf5iXT8pjCOtDQTHbGkMVWdvOa0O36lMDWQMKpOhLRk46LYMgf0wsyhhsJpVW22o6frT7risv2iT4auV8ul4rw1P+zSUFZcRsiiucLuU97Cs6czx5GczyGKr/DXH4/S232GpWqklpddUPB40ZK76Aes7xQUz12OHuZOJG+ilZcDbMdeyj7tZiKLXNW1/H0nH25mIlC2DHK7LSqxrqVm17Gu7ZGAgaX0q21tH7hmI/DxDsVZNic2AaMCz0sxfgK0ycb1Lovq1NKl4VZNzZluPZlGL25YbBFrU4p3y6xxPmJwggzKoTPHus8UgEX7u7yoC9NqqNMv/9KQ4X8m7NJnyeOqfhW7Ah1JtW9OYNbt1VRBroOcYvN4rAn1bdGHvBcrMbbruBbqsEoaQzmQ4QaRuQQARTjCYLHY83+tWIXGueq31YwxAhBMMJotNUhyuemvQAQAAAAAAAAAAABBCCCGEEEIIIYQIIYQQQgghhBBC1u0YQIQTDCaLTVJc9dYiq9qynVU7SXLsrZ7erzVK0W1ciY1n1ae+WsYu9amldanjksFedq5MD0OWbkchyTVL1vZDlttGrCoj/KBIp7YKMkQwhr6xhlap/YRmuPyZ917pX6zR/f74vZQdHC74/R+b0fvAEi54MwA=);
+          }
+    </style>
+    
+  </defs>
+  <g stroke-linecap="round" transform="translate(10 86.79882824999999) rotate(0 91.072265625 64.396484375)"><path d="M32 0 C71.11 4.17, 112.19 3.9, 150.14 0 C173.2 -3.04, 181.04 12.18, 182.14 32 C179.02 51.52, 178.95 74.01, 182.14 96.79 C181.29 118.71, 169.89 130.13, 150.14 128.79 C108.67 123.44, 68.46 124.2, 32 128.79 C12.02 128.01, -0.43 117.66, 0 96.79 C-0.76 79.28, -0.36 58.44, 0 32 C3.15 10.73, 11.2 0.72, 32 0" stroke="none" stroke-width="0" fill="#b2f2bb"></path><path d="M32 0 C64.05 2.4, 96.32 1.11, 150.14 0 M32 0 C60.76 -0.85, 88.01 -0.73, 150.14 0 M150.14 0 C169.71 0.84, 180.77 10.85, 182.14 32 M150.14 0 C171.83 0.68, 182.3 9.89, 182.14 32 M182.14 32 C182.44 44.96, 183.2 59.08, 182.14 96.79 M182.14 32 C183.13 47.29, 183.69 63.84, 182.14 96.79 M182.14 96.79 C180.7 120.02, 170.01 127.4, 150.14 128.79 M182.14 96.79 C182.97 118.41, 171.81 129.32, 150.14 128.79 M150.14 128.79 C106.5 129.08, 62.76 129.23, 32 128.79 M150.14 128.79 C110.15 128.92, 71.56 128.04, 32 128.79 M32 128.79 C11.3 127.37, -1.73 119.21, 0 96.79 M32 128.79 C12.93 129.98, -1.01 118.72, 0 96.79 M0 96.79 C-1.32 77.18, 0.45 58.72, 0 32 M0 96.79 C-0.42 82.36, 0.21 68.56, 0 32 M0 32 C-1.6 9.18, 9.92 0.97, 32 0 M0 32 C1.83 9.93, 9.38 0.45, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(24.35230255126953 116.19531262499999) rotate(0 76.71996307373047 35)"><text x="76.71996307373047" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">EventStore</text><text x="76.71996307373047" y="59.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">DB</text></g><g stroke-linecap="round" transform="translate(286.44335975000007 10) rotate(0 357.517578125 140.244140625)"><path d="M0 0 C248.91 0.2, 498.91 -0.71, 715.04 0 M0 0 C204.79 -0.27, 410.1 -0.01, 715.04 0 M715.04 0 C714.81 87.99, 714.17 175.87, 715.04 280.49 M715.04 0 C712.99 86.59, 713.99 174.3, 715.04 280.49 M715.04 280.49 C497.5 279.57, 279.5 278.74, 0 280.49 M715.04 280.49 C512.53 281.83, 309.11 281.99, 0 280.49 M0 280.49 C0.14 203.06, -1.13 128.03, 0 0 M0 280.49 C0.93 200.63, 0.62 121.32, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(575.584717 10.000000749999998) rotate(0 66.219970703125 17.5)"><text x="0" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Connector</text></g><g stroke-linecap="round" transform="translate(315.25390725000017 109.98046875000006) rotate(0 92.08203125 41.21484375)"><path d="M20.61 0 C60.84 3.11, 104.34 3.12, 163.56 0 C173.7 1.53, 184.58 7.6, 184.16 20.61 C184.72 32.62, 183.25 41.81, 184.16 61.82 C180.65 72.56, 176.76 79.69, 163.56 82.43 C120.44 81.68, 75.32 85.91, 20.61 82.43 C8.38 83.45, -0.43 78.63, 0 61.82 C-0.48 51.63, 3.01 35.52, 0 20.61 C2.95 8.54, 8.05 1.37, 20.61 0" stroke="none" stroke-width="0" fill="#a5d8ff"></path><path d="M20.61 0 C57.73 1.59, 93.84 -0.5, 163.56 0 M20.61 0 C63.36 0.53, 104.98 0.78, 163.56 0 M163.56 0 C178.02 -1.93, 184.91 5.51, 184.16 20.61 M163.56 0 C175.54 -1.78, 183.71 5.02, 184.16 20.61 M184.16 20.61 C185.77 33.07, 185.67 44.75, 184.16 61.82 M184.16 20.61 C183.65 34.35, 183.79 50, 184.16 61.82 M184.16 61.82 C183.67 77.34, 176.29 81.03, 163.56 82.43 M184.16 61.82 C182.89 75.09, 175.65 83.13, 163.56 82.43 M163.56 82.43 C115.71 81.92, 70.69 84.07, 20.61 82.43 M163.56 82.43 C125.26 81.96, 85.06 82.94, 20.61 82.43 M20.61 82.43 C7.89 81.88, -0.85 76.39, 0 61.82 M20.61 82.43 C7.37 83.32, -0.18 73.58, 0 61.82 M0 61.82 C0.77 45.27, -1.37 33.96, 0 20.61 M0 61.82 C-0.59 46.95, 0.53 30.99, 0 20.61 M0 20.61 C1.09 8.06, 7.74 -1.26, 20.61 0 M0 20.61 C-0.85 7.03, 7.63 -0.45, 20.61 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(327.8719873891603 133.69531250000006) rotate(0 79.46395111083984 17.5)"><text x="79.46395111083984" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Subscription</text></g><g stroke-linecap="round" transform="translate(549.7226565000001 109.98046875) rotate(0 92.08203125 41.21484375)"><path d="M20.61 0 C51.98 3, 86.81 -0.03, 163.56 0 C180.69 -1.64, 185.34 6.42, 184.16 20.61 C181.17 34.62, 186.39 47.26, 184.16 61.82 C185.1 78.49, 178.31 83.27, 163.56 82.43 C129.99 83.45, 92.49 84.07, 20.61 82.43 C5.28 84.98, -2.61 78.22, 0 61.82 C2.63 48.27, 2.01 37.12, 0 20.61 C0.71 7.77, 10.33 -2.46, 20.61 0" stroke="none" stroke-width="0" fill="#a5d8ff"></path><path d="M20.61 0 C53.35 -1.68, 89.59 -1.33, 163.56 0 M20.61 0 C61.45 0.94, 103.32 1.39, 163.56 0 M163.56 0 C175.8 -0.13, 185.29 7.61, 184.16 20.61 M163.56 0 C175.51 1.17, 184.57 7.33, 184.16 20.61 M184.16 20.61 C185.08 32.93, 186.23 45.82, 184.16 61.82 M184.16 20.61 C184.19 35.17, 183.48 47.84, 184.16 61.82 M184.16 61.82 C183.64 75.45, 178.11 81.92, 163.56 82.43 M184.16 61.82 C183.72 75.97, 178.95 81.46, 163.56 82.43 M163.56 82.43 C113.63 82.31, 61.8 81.46, 20.61 82.43 M163.56 82.43 C131.14 81.85, 98.69 81.79, 20.61 82.43 M20.61 82.43 C7.22 81.05, -1.74 77.12, 0 61.82 M20.61 82.43 C5.09 81.39, 0.07 76.76, 0 61.82 M0 61.82 C-1.54 47.99, -1.82 34.15, 0 20.61 M0 61.82 C0.23 47.8, 0.66 32.87, 0 20.61 M0 20.61 C0.51 6.47, 5.56 -0.2, 20.61 0 M0 20.61 C-1.53 7.82, 5.75 1.97, 20.61 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(605.4327089902345 133.6953125) rotate(0 36.371978759765625 17.5)"><text x="36.371978759765625" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Filter</text></g><g stroke-linecap="round" transform="translate(784.1914060000001 109.98046799999992) rotate(0 92.08203125 41.21484375)"><path d="M20.61 0 C67.45 2.7, 110.05 0.25, 163.56 0 C177.8 -0.84, 185.72 6.3, 184.16 20.61 C184.44 33.24, 185.24 55.86, 184.16 61.82 C181.64 76.6, 179.27 85.8, 163.56 82.43 C109.86 80.03, 54.74 82.07, 20.61 82.43 C9.59 79.82, -3.4 77.02, 0 61.82 C0.8 46.03, -0.49 29.99, 0 20.61 C-0.03 8.06, 7.44 3.32, 20.61 0" stroke="none" stroke-width="0" fill="#a5d8ff"></path><path d="M20.61 0 C63.2 0.11, 103.08 2.67, 163.56 0 M20.61 0 C50.48 -1.36, 80.17 -1.21, 163.56 0 M163.56 0 C175.32 -0.26, 185.74 8.08, 184.16 20.61 M163.56 0 C177.42 0.73, 182.85 7.24, 184.16 20.61 M184.16 20.61 C183.64 30.28, 184.35 41, 184.16 61.82 M184.16 20.61 C184.67 28.36, 184.39 38.57, 184.16 61.82 M184.16 61.82 C185.16 74.91, 177.15 82.33, 163.56 82.43 M184.16 61.82 C185.98 76.86, 176.26 80.52, 163.56 82.43 M163.56 82.43 C132.16 82.02, 98.54 81.69, 20.61 82.43 M163.56 82.43 C119.13 82.86, 73.97 83.91, 20.61 82.43 M20.61 82.43 C7.11 84.06, 0.64 75.04, 0 61.82 M20.61 82.43 C8.99 82.7, -1.89 75.92, 0 61.82 M0 61.82 C1.46 51.27, -0.18 40.82, 0 20.61 M0 61.82 C0.62 53.18, 0.38 43.49, 0 20.61 M0 20.61 C-0.75 6.83, 8.14 -1.32, 20.61 0 M0 20.61 C0.83 6.17, 6.38 -0.27, 20.61 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(851.3394620302736 133.69531174999992) rotate(0 24.933975219726562 17.5)"><text x="24.933975219726562" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Sink</text></g><g stroke-linecap="round" transform="translate(1095.777344875 85.84765612500007) rotate(0 91.072265625 64.396484375)"><path d="M32 0 C66.66 0.27, 91.7 1.83, 150.14 0 C172.1 -2.5, 185.73 9.22, 182.14 32 C181.51 48.02, 181.4 63.66, 182.14 96.79 C182.43 117.84, 173.39 131.85, 150.14 128.79 C120.22 132.13, 87.28 129.98, 32 128.79 C13.68 130.58, -3.5 120.23, 0 96.79 C-1.32 81.76, -3.37 65.71, 0 32 C0.38 8.82, 9.22 -0.09, 32 0" stroke="none" stroke-width="0" fill="#ffec99"></path><path d="M32 0 C76.7 1.38, 116.23 -1.02, 150.14 0 M32 0 C58.19 0.09, 86.91 0.07, 150.14 0 M150.14 0 C170.74 -0.58, 183.71 11.08, 182.14 32 M150.14 0 C170.48 -1.15, 182.06 11.1, 182.14 32 M182.14 32 C181.17 46.89, 183.31 60.28, 182.14 96.79 M182.14 32 C183.56 55.16, 182.87 78.22, 182.14 96.79 M182.14 96.79 C183.06 119.8, 169.71 130.28, 150.14 128.79 M182.14 96.79 C181.48 116.49, 173.12 128.2, 150.14 128.79 M150.14 128.79 C112.88 127.16, 78.27 127.43, 32 128.79 M150.14 128.79 C114.72 130.84, 81.17 129.4, 32 128.79 M32 128.79 C10.38 129.93, -1.1 119.55, 0 96.79 M32 128.79 C8.44 127.22, -0.87 116.41, 0 96.79 M0 96.79 C1.15 76.66, 1.03 61.07, 0 32 M0 96.79 C-0.58 76.45, -0.34 58.07, 0 32 M0 32 C-0.07 8.95, 11.84 -0.81, 32 0 M0 32 C-0.74 12.08, 12.71 -0.9, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1121.3996364399413 115.24414050000007) rotate(0 65.4499740600586 35)"><text x="65.4499740600586" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">External </text><text x="65.4499740600586" y="59.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">system</text></g><g stroke-linecap="round"><g transform="translate(201.60937525000003 155.4140625) rotate(0 53.663985771588045 0.2945782786702864)"><path d="M0.91 0.83 C18.93 0.72, 89.59 -0.46, 107.4 -0.5 M-0.07 0.23 C17.84 0.31, 88.51 1.28, 106.38 1.05" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(201.60937525000003 155.4140625) rotate(0 53.663985771588045 0.2945782786702864)"><path d="M82.87 9.55 C89.95 7.09, 94.29 5.65, 106.38 1.05 M82.87 9.55 C92.57 6.91, 100.62 3.2, 106.38 1.05" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(201.60937525000003 155.4140625) rotate(0 53.663985771588045 0.2945782786702864)"><path d="M82.91 -7.55 C90 -5.87, 94.34 -3.15, 106.38 1.05 M82.91 -7.55 C92.44 -3.48, 100.47 -0.49, 106.38 1.05" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(505.06250025 152.546875) rotate(0 17.382870296171177 0.024521116632968187)"><path d="M-0.41 0.47 C5.2 0.37, 28.28 -0.36, 34.15 -0.42 M0.38 0.24 C6.13 0.2, 29.48 0.35, 35.18 0.17" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(505.06250025 152.546875) rotate(0 17.382870296171177 0.024521116632968187)"><path d="M19.01 6.24 C25.91 3.36, 31.04 2.06, 35.18 0.17 M19.01 6.24 C24.49 3.74, 30.84 1.65, 35.18 0.17" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(505.06250025 152.546875) rotate(0 17.382870296171177 0.024521116632968187)"><path d="M18.89 -5.58 C25.86 -3.94, 31.03 -0.73, 35.18 0.17 M18.89 -5.58 C24.47 -3.9, 30.85 -1.81, 35.18 0.17" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(738.5585940000001 150.53515625) rotate(0 19.18487723590806 0.33168593880680675)"><path d="M-0.41 0.47 C6.02 0.4, 32.34 0.04, 38.78 0.11 M0.38 0.24 C6.74 0.45, 32.25 0.59, 38.48 0.55" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(738.5585940000001 150.53515625) rotate(0 19.18487723590806 0.33168593880680675)"><path d="M20.37 7.12 C27.34 5.4, 31.8 2.21, 38.48 0.55 M20.37 7.12 C26.82 5.13, 33.03 2.74, 38.48 0.55" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(738.5585940000001 150.53515625) rotate(0 19.18487723590806 0.33168593880680675)"><path d="M20.38 -6.05 C27.41 -3.29, 31.86 -1.99, 38.48 0.55 M20.38 -6.05 C26.83 -3.39, 33.03 -1.12, 38.48 0.55" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g stroke-linecap="round"><g transform="translate(980.3320315000001 152.49609375) rotate(0 52.041878668218885 -0.32124529088847)"><path d="M-0.38 -0.03 C17 -0.05, 87.06 -0.5, 104.46 -0.66 M1.62 -1.09 C18.9 -0.94, 86.99 0.31, 103.96 0.45" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(980.3320315000001 152.49609375) rotate(0 52.041878668218885 -0.32124529088847)"><path d="M80.35 8.67 C87.77 7.58, 93.88 4.24, 103.96 0.45 M80.35 8.67 C85.5 7.1, 89.17 5.82, 103.96 0.45" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(980.3320315000001 152.49609375) rotate(0 52.041878668218885 -0.32124529088847)"><path d="M80.59 -8.43 C87.86 -4.14, 93.89 -2.1, 103.96 0.45 M80.59 -8.43 C85.76 -6.51, 89.39 -4.31, 103.96 0.45" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask></svg>
\ No newline at end of file
diff --git a/docs/server/features/connectors/images/example-lambda-connector-dark.svg b/docs/server/features/connectors/images/example-lambda-connector-dark.svg
new file mode 100644
index 00000000000..1ff5c50c55d
--- /dev/null
+++ b/docs/server/features/connectors/images/example-lambda-connector-dark.svg
@@ -0,0 +1,13 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1190.3183733333328 306.6733008181809" width="1190.3183733333328" height="306.6733008181809" filter="invert(93%) hue-rotate(180deg)">
+  <!-- svg-source:excalidraw -->
+  
+  <defs>
+    <style class="style-fonts">
+      @font-face {
+        font-family: Virgil;
+        src: url(data:font/woff2;base64,d09GMgABAAAAANtcAA0AAAACfqAAANsCAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cGiAGYACHOhEICojDDIazNwuQXAABNgIkA5BYBCAF8SwHm3xbju1xYYy7sd0OAIpS8WVRITvfArcDpBRW0yrYuBoNGwdgevzg5P//85KOMXSkA8Aye/31X6aqSFOjM8yLldTu6uDRvazbyMy9zzwgOKQom/g6a15H3etNifhB1SU3kXgQVsw6e7M0xQm+4QP3vDzRvyYpK7Ba6lJt8H5GV4Xf+EcERLVOkazgxYl3h7PDv+FdjElJVZs7TTRxrr2RZUAZtx6MZOXIlTf6DtDavOv/vvtI4L+peCq+4cnn4emyiLYQELHRxsjcZuWclZsVm7NiTqrgNnuPnmjCgUoQxd53u3tpTX2VhFY9DuFKNR4ho/FgLPjSPINHmGrBMfPo+TrQ/Xc38WQ8hiEpxsolKta8GqM2D/6r/XpvfZm1b8IgRVhHxZgTUmt7/uup6gX8QCoA4DIvm+7/Bxg4sk1iY6xTGpUQoZKDRhH7EZH4vQAEBnNq0lf6SpZlGQKGQMuhwjgwAjvaLSM65Nfe+x7wxumASwfAsqWqLcltnCOahodxOqb/P6f2753zV+9tL0hyp7OxrQGA5SdK6sw4Oe5M2p+PnI29TbYSGwKSJVuOXXCgTYGTAQ4kANdwKoAMD8yzjSG1lSbqpPUt++3aGXuX98JPMVd3kYOQCAceo5A8jPq4mWnA8VObfn/FIsbA8JBAdCakpIHEiQEptVg9qctPV0xPe9vrHi7/f11arv8eRf1nbr8ncp2VYgubCUYOR65OgDBKALGSMCFF2e9PubRe9ecmXdWtJJ6ZxTi0QNlkAbjt/giXa9W16vpePUnVYBA02c7EDabEybhthwZTUn0gv0/3+p6TbjblsxSGFrBPy1Q1mfbeVtr1kWwWhOBBkg+Vza3g/76pfd27XPXbILAVkthO8hLLdmA44fe4Wz3zPDuwmcVHnwtk/ya/ohZYtkUNAoOALNmxMwo4XFV3z4nKJqphbq4kTdICkhZmbtQjBYVNbC4X6OGo3n3X2yl3YOz/M9VsF4q4TJ1jqKjO6fUxdx32z4LcnWUABlTgLJVmKT9iQL4nDHgBAylT4CWKTjHOirY4e4lDOXApp+U5JcqVXeVcuahd1NBV9LuiufKeO3dX1OfK79rSzpVKt639vmVluMa8XSgDoAh0FtLun/kzOic2tta47pb3TEIZmVWj6q6ZkfwZhzw8QA8egQcFCNETugPw/v85X5sUhiynJIFlI3Z8e9MUko/5nHE+0JjS3rx8eM0bAcsOyc1OebbmZZhOTW5udm5y879Wq7sNvIpVyJQiYqFbtGxus2fy5w8yt7hbFZMkbjMkrv1B50iJy0RvGiKl8EjEi3Nttm28ox3VNfEIkVCPdo9kCYLc6T+EQQIHInnzoHkY5hgHz797ne3/L7dbSI7HyBSrukfSOSRjKRRVlakDh5Ecj0XixJgS4TXLWpaBJGgLIwxmJUKk+7rO75qapUspub25DUNwVIEVCGaqMCzj3n78to/FsNd2UYsokxAE9Jaxstaedp/nHQUCjo4fKJAEob1jOau9NX+ZtluLImGQJDByJv7W58quoxXEyj7O/CuT0MM2+95tP26P8gghiAwiInYq4R+OvRUAACAH/npZ0PzWt5/YufDhz7256jFcmUAE5G6CAHSDNBOkhBmAAkAvVg4ASFLBIgBMEcS311N0A3o5BXwGeg0AEj0sSO5rtQJ6wKff+l4ZOq3TCgDYzx4AAH5b/wEAeZdu+N53KawBwDc+eNmGOPs4BBLooVAAACZjbLS7sLHNmPkJSVfYOrXu7Sl71l6+1+0Lh4GknYJTdmacW+fZ/Ynb+7TyAHmkfJNCq8SUt0/3E7bp5Cy32d4iJnn+W6Jl7ifXzd27p+05e+XecECEhaSfojNwbp6nd9zexV0yERnl8uvXTMvH5RHAz/fy6/LLcmCJSRPt/6/3HwE/9vfzpZBJA370Tz88+hwIAA9enduhAHD/8tcfmgzk4SEYXZQ5XZx1fWVFBQDKlE9rKlXNr1qNWnUlTtIkA8B7kzppAPDhvJiXsO/0Z77Nd5ju+H9+zP8j4AIBkCgMfXPPORACoRCtOLALYNkHn+4JgNJKKAONlfLNPfDWdCMOClRo0GHAhAUbAhIOXHjwESBEhBgJUlxwxQ0ZchQoUaFGgxZ3PPDEC2988MUPfwIIJAgdwYQQShjhRBBJFNHEEEscegZGJmYWVvES2CRKkixFqjR26RwyZHLKki1Hrjz5ChQqUqxEKQAYp1uvPtPMMmiJxZZabpkVVlljtbXW2WC9jTbZYputtttph7322Gc/ABg+MoR6LWCRoWr6G1XT2j3mAIARMFCrqQjt+7XPAECttvYr7TZKWf5NX3sPqNM+VB6ty8wYIHO8kGHK2rUN+KWgNLIN4RDlSz/Hzf2/QAgDxppgjH7jTTLZFBMNmAEApptnvrlej3ESDMs8lrFqyTbxY/KOsX6iK7waaxG5TW//d8CBXwDXnyaOWKFHDP+3w4Bk0KUsmdKxg4/hBrF+MEnVFCqdCgcrvLRDeAaqlsdjuEMwEYFUcMY6sMpqehSODsbSUegpK5g8uzw+HdTDSnztsJZ9kD7RDxrWdAwOgHJ+uHEQWFmrsrGHSPMD4sxr7sAgSWo7WJZU7FYFuDS7qqa1vf08ck7eVJI8u19Uu0oWu/HoDT6U4xi8BPdInUBueMfDprK2O1Exo4EowGGyZX/l9oaZ0P/MPeMzolzAeI/h9fJZL6fEiMLR4/DZ9G5R3DjgjBhCDK0nF+rtcJegKWsjbuTG/xnOjy9OjztXp1m9kaiVHjfG2+35kXPTTw2yBm+hPDb3DLw/7fMSpqPUxBNVDS2Ede9i0pwcDVaPyjODQZXof3/5AHJOZuyWJuT4NhdwKkYL6iHM42hbm7mbvR/DaEfU/VD3aWNkjhHAGOHwGL1CF/I34o72rAI8q+iWPmhPAE8HZn6FT9M+p6WpkaYAaXrgCJFEVTGyLoDLOJWQ5euiHZlYqGghAAvhoIXOwmgNTCwWI8TEcGoXl0DIS9NJs8tSAkSViuqiqMIyAz4PBRZxntokNoDNDNZvTTuoj1HNQjBGYKEjtASjwCRjal64JB1hktrjvjIeys+qaWKIywULhp71PibeIl/ZdE6mwjw5hTlM54oypce5/mf8h/mnslR9akjCkyx9xmfhSfoX81SijkaPlE1F6ECqo6QU0knhTiQVepzAqeSdKp5CTomneO00LYqqCBYUZMmxUIHBtAj/omsRVfwA9A8UXSEfEB1G4OVG1DvbIyPijZW+QsZC/+NnwzXsttuwVRdsHHRx0ObBxZK9NaNzMqGONgBw4AJW/24kFwSGXiE4C0ObI0QEHBwpnvKMc6UaAcBBbDBYFAHE+rvx8Rrf5t6QY9zWPd/2Mw32Hqx/bo5BLlwc27ixQHKbu04zHo27lp89ugJovwHQZZIBtiraYuammzp/YlWf2tTZSt2mOJTZ6dbNYYQ5iIc0OdZMGSF71AXIAKT4CMOmZEp308ZSxRldADy1B6GV0KmyBTV3ylrYRpwx4v/5oHmQXTm2r46zevcNLMLaot93tDZ44/pmCa/5/QEdu0PkxixEA5lAsN5GBr5/x7FHjdySJ6peBpn1gfFeYG+lcXK3hkchnxqyBtALsBHi+5QpdUd8bZ0f02poNXggNUCqXpcK5ViVrVhUZTvMhQnModqUo88/7/CDriEAkQVOzJNELBbjo1EjynGBQJH8tmraichIU+rRrcpMma2YzjW3dYMd++AJYMauqMTRZ14UAoLYb16J0/lMbkKIuZGCVHjSZoMZcMeYfUQHJ8C9ReOcwawLnBxhLJc13SGdb9OSQnPMWBU2pUkaFQTpiLcCByUElO2xgStGK3sDxQGWsQKPN13X1UEup5GBC+AKWzulCyOKKkox4YbCRwpJaVnZzceEIGZXp2UXeRqgNFVJyXGgmr4JFSsF6B8mSeJA6CE2kKvDsVdXImK6WPNI6BQiAtjMTzk2hD3QCC2yDreK3dIeNFEPnjapg7ysW5LsOkxXaL1WSvpMwI5BR67vA9ylz4RposXi0i7Pl6E1BQuk9PCt2SF/tICYMSEQdyBz6Uyr9yH4ngsVTxnTki4lAOSPxKJ8UR27zb1/KsD4Pkim/TwPN0AI0vuNkScF3axO8CWeaEGeF41qUBMTch/B+rCLGSiPDFF5S1uU1dp/yssDxD4+rScOG+I5c3ug/4/jfTsoJ9bWreJA9uEeMLa1daqr46rmWxBEEa+LO3IZu9voOTF9WVEJuUoWj8OL9KQvt0VfFnCQJxKy4I9jPmwDpJ3ADepU7PVY7GmHiUDUzHJB4ChYdcfT7vex7AKPH12lkI3ukAkBQr310e/gUf4ML6nqnfF+ch/eFu7XfscKPTaWMqOpv5llWiyGuty/eXyH8irGHbIZWkXWKCSH8iH0AJKeR7+M6mo6sRWexmeB4gMwUZB5RTsHeuXEqq93jvK6weNOAtnjyo6jBrAuCoqmC7EAyEsvDr0IwkPSLs0s/YCJgqURHnqOA/7II1LZLudVWxXl4ShQpjiLjvmT82UXX+kqhRiho7DQUXlPwX9bq1SIe0xZnygT8xhTxESAMbFt8aUsWnhII97W47q5T5g3A+witlMcOuJlqOyQD60pTf0jrS+Pr13WUXcxWR6gwl849mDTPsh9ecXI48BiPiG+rh2VbIjByAG+Gjhwvx2bhhKunuJ4x1P9KMac+lJ14wo1t5jWSVV/GpuO+2zt7nOEZbgISctSfPCEBC0Fi93W6TtPmVvjQgs4lCSYIUgyKTPetL3h6wqo4j+BNOvX+1VZmia5EQsf78NccTzHg2xg7X5yOvzxpWfo+chH2CAxllN3UNoQy9DT6UESBP/oag1I5wC9aoZwtUjSrnp94aaUi+yGRnhqfk9ALUf1OaWV522q+s8Km8c3wyP2UxbqiudRWmQCzTBFmqEK4c7qbsQs0XRFrITrAcSjzwmci2iCFbohpI5n0D9e/3G5U12+bvr1qM54USuWC1rbjg4dMTEhHQSIV849b6uuDtA//i+AMMNKWTcwHsCEmMNZXlNJPFGznOkh8mDGJxW6rZORF0sRqu70qRj0lW9Q2qwoEw/br+bT4Wt2zNaOKtXsqULwj86Z4qmgAgn3CmrOKFp5Lt1YhPK8wUsJ/BgervTzjTlPResyDS1wYNzFBfTUsy/nd6htYR870mSf6UWwmMdEIOx4UYCTt0Y5WJytlZjqcP/y2hkbuhdpapclqIf6C44plflFzGZ96O3QxToYQbsuhnZePWArBDAkyZcEQXocoWrKCjSmTPiykomvu9dM3ICYmIHyHTriO5kCM1a4LgbBbED1lKOsqOHikdYHpgdUa1q03Rl1/V0/y7IU1b6RjKqyojzqIEtO4jgO8ISLOaVBu4So7GYHDBOAcQfQ/WgtQgwdUuAHrVcO/oskq62xpBt+ga0+SMF/JbG5JCR9QjLySzjvPKX5/2HdmckFLd9CvS1weqRFwDANklaXtkAfPycBo0khfaU/VQ0mK1vXCNMJG0RHHEULs7dmzbAS5GfQAMgJDNAWPVwRmNyUFUreGjISX98W0tt6tMkxU2GzxITNcfYgMT3cTANgow289so/FSwLj86mhfg2v7bqnr1vl7M87eTwqvlsTBZ3XRcP6QzSP3nXESNI+pXx/uM5b2sy5sfPMgUCRfEfjjSE4PXlYlMn+331ignbDlRV19BUKV87JV5vBMqXm6Ix4xCpPF5EIOf5KGgsdQt7nw38DT+OTyrylaGtaGwxyB1NEFSCfZw5MT2C8Nm9Kj1B0Oqo3j+aI/n9Luk9M+E5UmtfVaTotdbg/6zo3lN9dJEbeQ6hLbgusgGZv6kr/Wg2yOtGfBBKy7NY2qw50jA7YFVOEse1S3vVrNMfkx/3knJ2S3KISf+Ta9FMLVpMn0o4gbCFjNSmCLFa69fXD51cfAs5x5RPYapWe20Rck5J7YTHw88CN4HpmXJY2naTrJFPJk4CtojNReHSKMqIT21JfBjdADghkp+/0D6zcYJ7e1dLokDjAMtrDU5M2Ahgc+MIZMxyhsoYB1iuZQpyPvw3AnkSzjd18RyIEzcrH27G0WfYOgNCJqRYYt78Be7FBMu0R/KqL9HyvvGo4EWkuFrJ6Y9pWq7QJV9cx7e0mn5AYusQk8woKkPa+t2FVoI4RFU55UubO47tsoNcqJbK6sFwOCnVWvyYhXIB6MDxOKrK2qkyB5Tl0olOFJ9mpIWj8YAd6J1NYfN100pyZwRWKkFRQVRiPqG4CgPB7ku29oi59R5Vd/XpXLxxo8SRlHQjOoHSA1fb3GzW6a7LYIqNXKz+J9VE1YV0HuTOnrMHy6BqP/4xys6nD8J7KJUCE7+vx776uFYfxYSalVTlxMEvi6Lc3xYpXwp7J+BFr8v5U1TNeCarbvYZo+kKDtG7jbTPybMS6THUALIqhJwAmS42sCtBR4tyGw8diRc6aj3EisGDbCs46b4qrqfkNh1SLQH3gjqAMCU+HP9AoEU/LiQQsrB2/emNL/TuL6D5kljd1aQqD18Aicu5AFpKVFbNKvEniI3YdVfSPAAhGfFlD/zV0La8iRe8I0nz/k90gbLHRh6nlUeGrqwkao60rC7T2rr6/wLa2b6/z9+KykDZNzfvnNzws97nV9+QE+Js0s45y6Y1kgpm6GTEvQB20xQRp5TmdOlJkB9yC9geQShRkoyofl0jhHgIm9cz/8i9dYrtyjrrFxxRkUVRiliX1rTLULIKQD5y8oTmNLhcKGWSnYq1iT2b5w4gNo8L32gfEdwM2/JV47+rKZtul7IB4Xr1ckklpkCrJ3bpC0qZbC7FgKqDG3r8vUMpcZyVFQWvFD477sdpV7ERmDyBbkGVhbuFhUwZsb6mHwb91eyYTM+3RYoZDSuqyiTFRk4DVfZ9NnzcY2LL3cEwlAYK6WjG8LgsDuxy9XqOg68aWFN1A4ykXFdACDdoCgrlsXFIlnoU0yWPRpoUoAfhhjDwz88ReH3QYj9CS6T50xMnnZg8FyKK0ak2hnXHcpT3zeHyfTBuAJCREyH/CGmAmeBi4oD48EeKC77pGrc+sqp/vN6h4rG3dWG2SiDEmkd9eYHptMUGIZDuAEZnmEtyhaZuqoZUrpB7fcmeTZn4PJyQtAC1SzBYOBJsIzEhFtJKB8Wl1D3+guAeCAMCfKa5aWICG2tcJGD7ms4WrMrYUFpzoDRZNSvBQ4qGsAoVjY0arTEV5CtMqehvUn+JEgOdJkLsUgc3EXWYpRG1zd7pBWCiWNoOlIcmJ4THAdKBqEWHkAfBzD8oNJQyC2rBGsTpjmGrQnD1VpztsnizQxo8jwmvi+YocMa/SyNctJQWe6/WWhKORIjJ/uDJIVmej8fDr74XrjdFz84RroMh5qU942TSgFTWbscKaeRONangQ1ziFrXUuhvAZPmA+NPFZf+b5KGxMY9w3+HEf8T3REulEVXxhNAa5VX3ac5CWbHLOQBywi9OiAoz1oNPjRHzelB9TTq1f3+B6aukQksM6VtY3Qik2c93oek7S/99hVh+Zsx1aD+NSa+XTKQM4SGlVMz7sfp0jhCEsUAI0UbeY5OWrkUP3eZFMBTPB5R4Fxl2I73DIWCmCFnriHhbTe81sqS4a1tOng9eeLEdfT5ilfc1dadZpuijqJqudO3xbvWFzhEUXkcrSGl3Jh5Vp65aHVObFyEMHd5UVEenrpQZtc6tp9Jz5prqatwBWnVfVPFn30A9ELtCDMzo8ZQRYvu90j+mlbwz0yG1Z2q1kI7+SRRblpbq+RYIBwsvmtrtjhypm7Eqp7YCifBjGXUHIQ7Fw7JsKe18MiMOR04dz4I1HEnZeQ2GYAMBTCFJVcS6AdvtfIjvbZo7+5X8yyXdDFPsQAyY7VkZl1iX2bVFCOsAm02DkxFIWswTAMJivfk41oMje7hBQkyrktIeO7qxUi7bvSpyNgKLDrzNhQkQzDqW9qTM7TFLZ8bU+40oSG6Ohd7DzKRSfvRnSCmKSvWHgvaY5SJRbzaFb3SMBAf4uXtV/qqWo5US0/fy0TExO8S023EQkn1pag0NM1GXhDQgJsQTgooXkY5qad4QfPntE7dWQzb1j29RBzf9hPcSGu7fpblc2kVLnvj7GV+WPaOBGXroOKSjuD9AFMCAqaQrQ69wGsUypanluUwTYPXXz76FNtIVyzuGui2YIWw9EYc7xzwJ5VWbgDmSTMSNM61X611iA9GZaY5iFKDXwxefBxyPf9MsUMW6/m19ygSorzld8lVHqrrqIj5ivCBc919Aut7xgJQs8PXBWFWCDmaf9WUHMklW+grDdpTdl51HRmqqtxYlMbJbLUFiFKFCIJSKVff1LqXnKOUjLbUX8vlIvJz5CwXi0KWpUqb3VptPIvOXZlIr+9D5EwrSOPXHRp36I3ZXKJjYwwyh8yrW8WkcfRqn+7cJfmalfKq1oVcnaa7Ip7LEd0tVO+BRM0MeoYAqTuyu4O05YuOJKGexTv36GA3CMLulw3ptac5mdQ8GB/+YEPdUdY4mfHqBIMJHKSZvKdJy1Q+KkL8XRMoXqLIeQdNRdTlA8Tsoej43QRgrBUlMRpSqyZKC9YdEgCPzFYfmroJVmtq287v4ABwfhm7GKrpm7tjiPnzN5VNM1VsB0UV3cN/DwKhGbZrdgoz3vT41R+zoEDPwcuusIwoSd4qT23ODlW3ZQDGywrPNKkik8GlS68q7M2on2/kTVpeK0W0YD9N1U5zddn3mcVgg/BTiTq1/tO4U6mV/8OTwdCzIkkcPJd2BbJQ/wZ1sJ3qoSiuozxTu1Yv17q7GnCWztzaP9+HFvJXOvqbsKNxtw5te3SabAPYR9QBhU0C5Ki9zKX05qR/TRFTjMNvQqEtdQI6X133upZQNHC/9WsxvknaG8PMR8sKTehUlTodTtrgdUAK9Nzfg+GqrarXWLZBKxHK6uqo3xiiTpgTy6UKQx+taqjupXaE2CwYzYGlhEtYIvhlNyztvDeY2Y8pcKe+ZoVlYjM5Yacxo/fkIGtImnhlzBK93VEE5jyegyxVQLZGPdHjDp+Ry71Q5JfGXDreOmNuHuWPMz7juOKBvXQDi7tFUmGPC36K/FOBRsmYTEmJa2PGJF7wvtKgMrd6D7GSBkMnyuJ2VTlJTZFo+9+EyswwTTFdlslwVnAL1CKZ/KfSI5qsihC/0cP7dS3Wlfk52hV742Bv4EergZ51PjWL9A80yI3WbKDp5PlxHngtEeMfCo2/3PhN6nIDmAHlJl/KiMW+Gt+G6N1N0b3+EGbHM0jYezlYPN+cOEO4Vzz97ZU251pMEUk7MiXfq2r1cZkvkeSNd71nkK3/C8x1MOGX5+MWwatPQByQgPsR1qU4FjCfJYcvrBAOlOFQGizW3wdv6UDCYIS6uIVf/xLgZdjrECCSWZDdq1a/CmdNTY9exL5/30g6wvcAs9I4av1ycA0pUuHSm623IDCUm1ft22irMcJ5WhfHia9lVREOjLMVgmksWFFnv/y4zwIR0LQrCRuVMbJXQvmdkF4JAv6pDecs1q+w6z4siQImgrIZpr16nkSQ1pteYhvt8jEk3VNNzSkTyCK3/GoxrWK+DOO3RWuT1qXbwgjBwP0DcVOrb77eVymTaj9Ah3Slb63MCqiQOmx+PQRUq2Dm4AAnuP9vQhT5bq1EJBwpPh4s+nKx6e4jPmVvTnqvyupEEn4gVTLC3sKKG4Vr9C/NY0rcvbZNMKo9WcbDSP1p3jHml2tBBR50t6kG/T7KTJBCeOJLcuol64BgTgV5olOXzDWxvpweYS5RtlIZatRVR79rYWafKwayI3aA8fqsVgeO002F8+DZtDcjiwjLNzrX22tlUssuyRZo1hQJ/65JRMBfnREpVQtfTYfTubGYgnK4ozBZCvtEx+fxQVDIdeTybyPgoYV7dECbG55uhpcZhvdstpczQ/9ToY6Eah0SKyQyf69DyzgdJVunT0dkT0p4+v3k1bXSjTRl40efIZmrrzjQOBEI44XznyRlmgOxiEk9YZOvbAKqDqbgN6uEAc9nNGahSFE3BnDsLx13gj753kkkajcdn69401pvO5ZDHSzRQp8mHMFA6s4gDsIh6pdtKoCu41BsfaUZf/MmN2zqcsyjsBI0vETyRpec0vZRu9SwmMk8zukb3CYTODOndBsNCTHVpeAtpGTHlgCBypAAs8qoZeIFcfbrQM0D8A/pUgS4RuFeX+lSwUD9Uhf2R35BMAv/uV8wCJuw0tZAhhF9ourZ5KvqY4tABwQ01eRlQVb2F473e48sdXGoa+ulEiW30hHTIRJxbM2IvPKTd732HlM55Xy5yDHFSElkz1C0euY1MCRfvzmhan8024uWpAhEhhu+kfcCCpv0BYhAYkdKq1gyM68p10sJnn5Vsud0GMenRu3P913ue0T/rIBfRWM5Er0Me0UxD5Dk8rEY63Bg5vuFgNnlp7nIUcsWbRYy6QrpXM650q3cq+uBRhVFN0eCCsYH+D6t4TE5q6M7FRrkYlHShV+tWngeMRw+vnOdRj+n1HE7oCBDsufH4Qmrao1hJd9NwOXg0JQwdmM5FJUqqYLVsFvPzh2Z5spD9iCBkYzn/u5GY6v+0szCoHVimWdzmEqJqZUj/rIdOyq8YwUogPw0G2DBdw47s2ZocNYCc47h0NI4XfOyUs5ptsVYVPJ6rU7tMSmnOoDiTTGxJEU3NvoAAQZxAhZiQJs40+iCb4grsDD/S9+yiXpMXGR+dgXhQE+6INPcx2c6S5jNmkZ3t8qU8F6y6OJzhcdFYT4ljUCpYT2OqFceBjtObOC8JFnzwBRhWSKts4uAJXbZXD3AKuBYPncMIDTJzlZ0dWp0TBBL6slEyTbt8hJ/niaB1Fqus5Gg7Bq29MrSUNnXyNb+H1uYuzfusfnhNHO/kHdPGI56JMetQOF30JT3nippxRKsZ/ZTSA6vUtSikC2fZ2YcR0OMJZNlD42I2qzIQ8mdoQ+rExx8T2r8O30HPewrjs0xnZf/vSUY2Bw0MmFk6V9Gy43mdY2bpNkvtvMgaBI8gOn2B2UbMIxermFQhtnqRCrXww7S3AK29OvX9aW8UGLxu50CpbsS9B4uEXKRi0wdyJD2qjjGf6Fep7psNfFv2wL7Rt87UKFF3WT1a9bsWXwrYhCUmJl+x68BDx3ozRsnB6KY3YcSrTqQvlBvo9MjfxnBTk6/BH1P8XGbG54XMxHv4STN9n2Q/4wA5grBdlukABnNeyiIvb+M38Nmv+AMnN8r+PCwr12l9zlpOiG5EzmTLwhIuFwKdHgd7ezWAylt+Lbn4HU5xG7CmoRoZAquk4Zq12Jjk3afTyg7JNIBFva1T0ed7/aPAvCZv78LCGtOrkDzy4UvMPWmf+1tNGYxc3Pel8ONP55xjHWIiw4XAtwjENUTwXTedeCLfO4ehHhhnvTcPmNjyvpYMRG7uAkG6nfJ2n0dUKvO3S/CFy2X0zl1SalCBHFqzTql0eFCgZdU0RBP8JBYTvSqAbTm8A+et8HKKM3NxsQ1FsnKXej8bvhQ+dthk1Y3GGDOqItkoZOuUflw8hhIhIHjFxbw8TXQQmyunCOHRYNxriKbdgcFQGsD5fBBJWyMRaV5HVTV42wvBj/LDO1xJG17e3xJ12brGYdAw9qTkhkrT9EyZJzF8IEp6pabSIU7jJWmvV+i6b/D0COxOvjmqyti3P3Q690AO7PREETPQIiLqzxU8WmECO8Up4mW/GNd+dbdPRwYOFqdzBUsaiDTjDZd1ExWnKny1GTgOfGXtU3YB3iRIqa5H/Scxj4+UcEIaNk3V4mX9mk4xwRIMQTh5wIRtvSJJvLm8T5cjZNaQmACJCXJxSNfk+mPemKgR2oRvzs6aRx+zFLRkQnZbv7o5Hluiqlm+WRnSPwEbMBg5o2cmOTMYFLVINE/ZnS7rkhG6LDU1n0kpEFxHCsgHAzUNr2B3R4Z+GEXxXdVMOEBTCG+GbgEpwac8ncPJErQCHHyBtLC8v4ikggBRTaNK/+roMbTL6xvoRGsmGkJgRhQKkZ9YTXnLc4HXxJjk/DD/mts1b7Nrovk2Ddnl748Yc5nrxGQ5mFHwkHRMVXZX33taQZVD9OJjkeRKz9RJMg+EgPCOpcooHix06PeMqluQWS9D+oPO1i44yOsikRCnEJET5U/KHu5rSYvn8oWxAAYn5sX3LxgV4oLbK75sbS9p+LaQ6ywSKXmT40f+v0DxzVCiqJB05uymzm/5NYI0+U6J5cUx+VTZHZheBL0tUYnXUUQu9zXlO1H0J6LLzrhEaCYoSzkMvN++2YqvfxuMG0/Adq4w+IuQoATL8kqHikY0L9AsjwkfYllrk2MewfzKxrIbotdYHDTFsBMSAvfCGNGK9Y3loJGLCbX5gq+thNTOGdCsn11K+SbYYWtollDRGNMy5LySHwzSdDvdRhydAkVv3nogE2Hxq9Jv0lDTyfXwcnDQ5zab0oBGzBD/LiKRowFvW2MCPowzVTQTgCd4uB7/HCjPGkC+ID5YS16mWAQzWvK/mLB3eQ+2UTkNDfDaYRA+vEfo/LdmDCfMGd4y0ijGz3ZpOslNkXOYUO5xYtaUJ5b2L0MtHBDlb8RSj5Y+RHAjULxnb7L9o+/HxWvM0A639Wwpmrdd9OJGwZbZrEyqwc3BAdGiYnJBuJpaksPgCjr+C5Znjd6TK420T0FXnUk+XX7b4mUVwcusZuQKCnVR87BX1c9qRR4fqDdTOyzRxY6XI1iWKcQTpvfR85WEfulDzGpWDI8etr+u6+c1e12w5joKLV/BQPvfu6lHoQaKw4vA+Uk4Ze6W6uXEQJcTSzQUhIEwh+hEO0vHxBoz8b4S+7NO1YGRx2fcT4KKjAOau3VGdYf74HzzluAY7U5IaeBYBR3UitSXMd7B5zpDDik0iHbgA6qU7OvBlweZkFdcgX6AEuwXQOjez0Litdg5qkOwlOTXuByDYx5IYrLuEPBADbVb6uqEvbGIJa8KK95PsQShl55qlonfXxKC1gMfEaRY5taeSr46wkzW37XVlApov4J770sDSAyDye6ccOUvxWv58f7rJdTVGc/iIEtUHxlxsD9z21GCAMshbKDjBSyH3FBT5/6vZCem4YD8oHzvz6umcG19ODLv/DHMx63ZKsbLkelntN27NpCexMV413C1AiKqIYZ6QkcfzcnkO/BBxBw0w90DRu4tKDKdHF+9+s6XDovzFCaPjAvQncb1xmzdwrqdECqoLrJEiAeGFe8XSbptd3ccY7uIy0uK37mrxN53s8o3iA8vvnNhJWIJAWIazqL3uQ8nSGVjnvUxp0ysTwnE9SlHGg2PPVjT3kCXhpptvWE9h1tfTgdGsl2Vks70FUqJ8z4sfzbccI+QQ+5P6bNciI1poo1SAkeJZ1HjquEoLZSiKmu67YMR19aVB+j8o6STSjAdduvB2ADJsmSy4yStdsTo70fzUPfG2gkjIvkn4yntivJTjigX56zhT/3vT5lhBdtpeY0P347erSJTZeU0+//9/Z408t8uMGPR0yEsO77wXaI3iC0Hp/7d78PAcb+7hXghskyFehi0wTuqnqJvLkC26CV19cTBv9XZuPD3eQyYV7BfQVxDNJv5cAac1TEqWOgXRBF/JOl/F9mY9wNN6jFmKKF8k6ZB2URB3b1eg9YWExM7MC8+6o+Ouk1U6QAhXKf+nqRgH6jPEEIjnrT9hzPbhsyPHL7dwPNWp8vFe3pCOZcYfL6KRyi1xfCzr91n7R5rzAmieiG0wzACqAV1cdRUAKPdRA2DTqQZXHXUOjpSALnsD0PJCYFRLqB4LaZq/cT4+pfaM4dbdRrbZfqRmtQHn1yLKtg1Bl35OMX3mfTacb9UZiCV/lB41pbF/R6yMUO3WMjf4iH5t3fmrmU02uQptVTmJCCL6zhS4PuAgDACDsmZtTApccWXxkfsBi98pEkp+1rteXmNY6eqBX/gmUDPJ9dwUoKSIwS1F4jKWPAjd/H1lfb7vTXlfV+NM1KTV1bGmITlpx+iqEJl8SYcEISra0WR115C7m5Pm4r+EilrWIC73C/phBu5iOZWeNm9jJ5NQot3GdqeI81cD6JSBEohtyZEADZGihlw5o0he3heSwKPaL7CkzA/aTs7t57aZefgSH9yWg3cUGDLtbfaMpyQFgirR6Hi5buaOVso68JyFDo0xBYxTvBhsbXRtfqBYlGIzbaB1Guc0RX5873m7adXidjQkNt6Vj8f8XyhYMvPK8N7FTymuECQ2FAL6teNyhm/NMmKIBsXrcWdyDclIP70FiGiyQNrvFtWHXHV00BpordJvPxArJncr/kIyX7RA2hoSif7kbRrgglAPuP1OGSCMa8SPZNwA5LSfMUwmuOGymsKK8cAbVfhl8AN1HP+hT5ScP3nY5er5XlUaqS8RWJLr6SYSH1y4KuqZ82mkEbWp2jIovRmuZGcc2RTYkO6veiDEQTwymHxRZIG5pgYf/mV9MeUl+tN19AcWNlf3NKHMN/BaiahQCbUkzrj7Vb047fR4kh7IqVxWHJqXv1YMRrb2R9rttCu1NQLduxTXNs34566B709gJJIuazjEiyxrdNPk4ehwHkVd/A7SQ78YjC8Z2gJHBZLh/Pv2jHGN4RYCi96gRGS2G8p4iN8yWvRGAZj8GUt+umrs2bFaAldpB6UvtWHZxgWNpxO2dvOruChexur7SxjnLmJVngJPSbCIf2n6dBaJhjTkdgtzGwSloFaCrbsuMBr0eFkW1Pe0xXlhYkzcXLxQgPi4RJX4v1rQen0Xij2cLoIwj+dkCHPEM7vqUqGeOImW/3xyl/K0TS+yFMvbn7qo+3W71Bk+/fR7u9q1QxmTbvcN7mJjar8B8wLBP/vmSDgwhUuCVY5+wdPzOJxE/xBTA4zhF6EmZPFvcMSkIWT1V5ZNuacbTvFjB7uXLpTsj+V4CkE+fUqCdCE9nLQTNVF3FlQygXTJ6D3zfY1ysYewfHV3rJf6qfNqhu9Ou2WxKw6zZ7/W6J92MUBGpzLp5hIhbD2h/zv6jGlvuHCvknY4yB3wlYKAUwlOaXSo78Vn5TvtwIVYdaNEAS7fjNVSzleeKMn9+XFPNJ0RQWPN+CEOX6MxoemJSIPW7x8NS+7uKSNmdpyaFd0NvYLLlB6eXzt/dUiQlOal6/hLZI/qC6c8RwsP/oM6+FWZ/1Myw5Th+F9j+I0XbygSu1oUynbO/A6NldHu2ltiUVPWOkd7HJqj5ir3kk/Ty2vT34mhFATb2ZZykQWywWfO9/C76AvEQSTE7NRfsLCCVLcQZ0ae7wM1pj6rOJbhAO/1Ex2sm8zO1C2s32O9Lubu/5ghXjrFpqheMtpI5IqVYyrsHkQcE+YkuQlduUvxm4mXNd0JpLeOkEoCcqCIIYwNnRnsr4kw6zbm1x9gvpOYSy31bi14zcOBc66NXCWCvUZ5yMo3IuH/+XvxquzJt+y4/a2JIZU1m0hejzu2KgxxMKPvyswMzVVtzVTuj9SS8c+Ernnzf5KK5V8xfxlUL6vEUofMWrKbHZbW94sc7ncHjE9dwodcpPNh9p5Mu+58t6MxZDPZapmhDi/mKwn2Kmj/T8QRQxlUZrmQacWSiOHL0G8DUEjWOx7Zauun382tiJyk4aw7w7CEokcPdaZiCANnHcuxWpSIY6zQCJQrs/X3bHLZlyKcjs6JfY0M+5W5DkRQAO6hFIv/AUbiAjZ+zr+TOQb889dmnDl99ADWZIPEKwZM7EbtB+lI3aJ06XNl1bQLhbT7tYwuSDo6uuOamO6G0Ween/R3hjTuM0p9qytNp+ln6EXFZRDPO4qUyHmKs25aHGi8JMIjyB721244cZOA2XZ0fcveOXfeUGpeKqjDmjn0+ez3Js85uvsEp9JPFbCLqFX/geR5r8YA4E77eSfhUWLN8gCXq/ETPLOCNYKoTKE9o2o1FPfB57sV/2/fmn5IW6S2Sq/VSmHcbF+/eHV4a+MoA3Wu/fFE1yuLCY8wfx3fP/VMiCKpNRHkjJHUk8HEBu0Wj9S7go91pb1O0OR5QRoHZrd+uCfC9XW3oGh+t0W7wUldiWfQkS6EmRZ6fN/y86sKl7cpmYHQvYy5mYVT0poj5njgmq7rRKGRPc7a4GnfsB0Rbqa/78mtRtG0nOaX9BVDPqvXYxeM0s5XXpWVgkd36EJFvMLUeLCnROfO+ZSJZr/RhhYiIgF7Z8wiSIrUQgeT2Cs+KIuEOtnTqxzAfWzVZFcH4ctRPya/FmikspwvMKJl/57P4/rxWcmqi+lplargetPV63qXYUnXkSwonUNGAHI5W+Itjx0DJazxY0Zc9AKPWuHp9hR699urbJZKODNJwWfTWsJBvRPs6nVwklgAbUyf1LMlP8H52UDethwYo5PI57Pt8cpm14GXbQWKddqSfn9CXLYS5WyMr8qv2XAhW5QjK8t+yHpea3LUDyGTmTF+ZQMCiIrMB+TxeRyUS5svSz6XY4Gsy24w5fPOnWU1cFjAmHxt+vzlKgHHrjKFMXryYOI0lrehd1yvXOT9Be3bE9O5CWPeqD6r8UpixZe4BZJLpV3UzYS/cUdgmIkjI05preyeGDLLDI+f1E0pa17SzDYgVygLV8I/RdFVTr5f9KBz/GaKDuakOeGwQwHrnj3Yi6V8iNsn9fChZpU0IvcV68DB6wvJvzii8JsUJ6Ge7ZRKQ2wmFPwJ2Ll5THltI5g7UnPd2VT6Sh63r4vj4nVzyluy76sJDG3wnYRcO+ThUVtyuctxUOscLlk236XkSZ6iKDQwtxy0mM+WaHAGIF+SIg9iuaffMs/DuQzILB7fh/9cUpY01a0aLkMHQfxxIjhy0M7Lwoi3wJ5NFc6wrzxhk3+OI1Bpf07D2OL3XsXqb3WdQ5tsXvzMTF2KApOfbto6NG1zW/DWhKr3QMveliBON1+GELxwEL7JQRDXYHWP/HwNYmT26qoUgAXNP/VMrAVa6QL5O95G9GbmGs0T6uZVtWI7ZI4+gfRz0MrnQySktE0X0DNMMS7JA+35dvbGFzniPAn0G/teKPs5pKUTuU8nqY8oRyMZAqSjQmcak7PE5U2pDSXV5Q6n+clYoJlof3KgygTCMBXZQhyWeRTQWhIK6VAc64/HFkosYC+RbDhRxNWrs5PxvwhwPZIYe4tNK5Hw7Is1tXpOGAibStOhlkmL/VFhq3a37L9o85iHE6z6y1XTnwPmpyzq3tHmEqxGG0vQFQr1qFEZzsnLF8iiFUsYduY0pLl8mQfsndIMtKCp6sCiO/86jBnF/gON2M846YQKFsRLynOGN4L2UoZU3d1W3/IX3GcPc/I/DMrrd58eWzftl8PlXUjHCgXgUA3NOz+rrQY1ZsB9EW+3gbRg1Iavk91y2E+GLYrGvYVNbOktNVSHml8cBESe2Jm/wNiPeeIrovSVoUJ/jZMuFqg4QBUPAPmHkhlhbELfD+rsuTW/kz1069mERq+6rdk3PHK0PyikanNbbr23CyV3pkLbD49yPeWRqU86aPwzFeX4SRuCQ9mNNUgtPutQRviJ4Tu9ixiAjfiVCa5VIqhUjr+a5hpbhjekNbNgWDB4OJLL/PP1LzNVOAxMGrGvdLeklpQZzk5AYMSdgXBn1J8sodCnLf5SvtL+Y6RaJn4nFe3eeTxybPdyYJRWCfwLqw+0CKuVTPLSrN1Yxf8eidU5tlElEp67X2f1wrBePksiHRmj1/2v2X/5c3p5X/qg0Toif2cXobiW/YXW7Kv5AA/qSC74EvCGIihAmZcwzbyktnKX7cchoq88h0oHAfANvGNHx1NnUXyM5wGbleBA+KFjTt3uNnQp0i9nrEXnVW3Ot24MlBQmdT/GFczdYfUXw9puLGzodIU2iVmZyGeVfmAoFpmMXQlmkHC6gdu3lpCn4HcFwne46w7EmFCEwg6b6KKQeYzWupF1j/UTkv/IEtfFykIXccOJUlLpeSg2ebo/Ic6aX7WWC0ZVvRmwXdj44DGLuyNJhHmX9b35/KFKvHBCjJ3NTWzhiIpFsTKf2XXiuxWLERyxcs4sDaz64IZiKArxMyBGxP0XxeXjfDoT3+4y/d+8gY59OwvJAdH3+BXqt6ELCl3pDwBQ9J9klHT7VeUtSb/SR6QeEiy5GhUq2RjUb9pB8ow+4DpnzsyxzL56R8S04X9b19gMyef6AlurVcPRA5U6CVnZWWJUmoZeKBsogiKVbe744IsnmM/+DkIpoOwBHf3hgjJADDtoCUpRS/N2XlQeMJfDjwXb3elM/Gy/ESJeei3fFGvkeYXmGVSMeVIbMFiwfoHtTfyj1a3jYbBe1+zsdsNQGh2pKYQb/mbDtzy8ekSP1xApA7am3D15Hotut7yytYUuhUlZH5qfHmkltbVKlSpBRfqQNU98kBpKRpJaQh+2skuOq3kWvd2kvNAGeP9J0JjJ/+kUxSpXqnDTkOgIXu6dxv39hPibdsdMT4Pem0O3E4kGsRgmkF0I1ZtbWk1FQAQdbmOISEDDO1WELc/sleBdJdTJFn/MCattmXzMGygo++rrw982ky43zKW4WHVro/PpFBvxLO1BKK9v+bHqddNm8e72E5CqYmTapcHP2d6Aaox+8WjcPdMhApFb3w8am3qeu3raOrtwmkp5IwHn6rEjQ2mYaQrYpMN1dDR+ccB6FJHpCJJifMpPKI4lThotz7A3ieLzFB1qOg8ZQgmwo1iu3B6P5npc6/hQabXcsXNGRuyp6LsBosMVid7MIWyTuvNaw/uR3dp0foWNW4f5YmvMiyjzhjwDxDXc1xUTvybr5pzuCTeemIePC4y+MP/99x5VGcAZruaHwGpf7eUzUGGeQrHmpBANqUw54bvOpGm3TycDxLXeukJBLmwJHRWJa14Ubu4auFhgaLeqQ3u0/l+gGz/oN7KzeeFy+/EzDgNZ+qFu0j0c7hpHzh9ZNnCP5jatlUbkWxe/ZjRLYbfO0lz1fG1YG+Hr4LkQStNvUt1r8hylJthZ9KmEeLmglVG+YeXqWrT7KnOX2N/yyTQ2TmpZ6QWYDaTnHJ8IYMGCqoYyf0P56mzFqjEwOQLCR3d4YDq5hdZPdZfW4uF8fbRgZRddqXFknlkNrqU78yVl+tWGVrYXzjqoqDYJ+uiftN/gmnlVMMdM00IjCQB7a9hQcBCCpCo9ju1AMSPFVf6k4nD/BMebjBWv1qsRddZOmQsoTnVW1HPpr7ZpY63AcwU415v83GD2TesqHybNknqYL6dV2Ul8qjHMjcjvhXMq5wdqNsP6fHO7WsMKR86SoINefUrJkC46yyXNBiTRTXKuuNYVQ4gOmArZUxkTsr+l86eAbJKKipyuG5suelRJYfx4DAYo90w+l8i/6/qSv2L97Lj4026WQH7vJUnTVMAUaMlOKeY93UpZWs7KWmi7EuiEmHeQuBsm8vn2bVyhKqnV6UuAYMgJKiGHtfZxgiTRErmEFTiYmkjxTFSkKZk9afshCiFm3DBsTAnRA6W7XRePwOGWh2UHQVhtQj3P3ES1JGQXZPgwpa1O67aI06vV+rlaOX2pucGnBZ4LVtvKUhz4vt7VyZZa30YJ/uB8BmapkxxO/FUEvLM9kE7wdnqQXxD3i6ZRlXHswODeF2QuwQPODBfM82bnSdegZIBXesxfQFIXa9pSIvPQjEtyvwDXFiLrPQIM4SAy+kKsEMlrgVHpNqXA2kgAFUICs+1RaWc/BMyqhYWweoJQTDXuqP4mRQgG3ZuyrnBsUbXLAZ1OvbSps8s60N8xUrRpFjgtLL5kyT1m8dSjqVo3m7zeS4EkdcAAG7fssGTpiAS88R71/OeH8fBmwPE1dZFRH1af0G9IRFKU/1RA3Jt7olb5+N0PMat02sAFSUqOuS0u88bqg3UvjBKeE0VVtSlt/squXV4lZDMO3TEyURVBNLCxO7YZiWU8HvUx+Rilo+qQeHKSI20w720yd+TLDDrbaG1O3RomUEr0BWbDYbc5rsrZclNCVklcY5FDJKysGJDsT6xozH8rvbNaFSKqt/Mp4nCYodyr3NTVslp3U5TZll082cqKJ83ULmOEqSP0V39V+VINEoLSK3xUezhpEc9Q9Y7Im1Hc5TVk7iYMbJBspiSrnxuytQ41qortZhz+iJYZNPK4VLqUKAeWN2/KEg2Lqn2nCWDB5FemfVApPT7YV5Jx3zSaoQbMqwrK3TkEcPS2My9TP+pKNGZfCE2sz2EGMTpz5uNlzOhfQa2xPVwpu6igeSksJNjiM9YBsfhEbt81vciw+A8yO2t0ET6wMdcZ5GYmOh0KTO8xihvcPrOfuG0SlPWNPx0+TSsYNba+WyhQ1P6Eu8plcEt1OQcP+NmFz6Le5H/q5P43zpAG25qENJmer4iZl/Z5YFtMaMe6F5Jyx+YripTfHyA1OSm0l9WikYL61g6KGfkybqxy4cqFsMaQI7SzSn/cw/mmiPXFsjLyLFWlhVqjG5JwhORMJ9xNNR6cCrvXNMb4TLr4BLRb+t2pQGAPG/+dQq+SPs/+EkYXNCZ7gsEUtpQku1XCqvXK7m+gkUhZb2WDGAZe3VgJopGDYc7xxfVw2GBJdKwUU8+dJmqXdmdfzncP9MqUczBJTMwQEsftOsFScitC9znD/LQV2w9orZt/6SL/dOeeANK2Fw/5vlpe39bfvYFmwmDKk9tXRnicybTi4uJ32PXdJb1U1tz36hivE36Bc6+JG1YyQ/BmDuI0maTzSNVktZGt1bhqxaB1caL9AHk2TLL90UuKbiObiyDchqP1CpO4o5lYCekMv+Z2iFJSh06k2PeX0Ama453HWvUdLBz3YqMVGrWucUqK/22puzitU8OQrts5ak7M5pAMqmnahWtawn/OZeIz/aV/OEpgq8DC3lcptw4BTXEwYl3yrJsYLuXllCsx/7zh8W/pSXIdUYKXzmTKzXAm6XNTTqoh0weEKeDOjx407gsZJIzq0R2JuvabLchFh1VgB9SYMyCXw/b837nmHbrx18+q5cvBHoO2ge0nzZKnlg6QakO/IWD0R2w5eCoapRqk05NQ8FhFfsODOeYmlEbMdmkeaTc4E7lzaYajMcbG8Ra6+Tc/vAXnPet9AHlgCUY7ZsKiQ+RtnG6EKVu3D3bWz+5+/3e2mtwvIjMEx3IEasWlZ2hNJw+WzJMohVH75WstSfo67qko1MaU4Rp6/ALh9dgJKrepiDn2mIliADdh0VQ4gylrUOU7RnhQCssDu37DaL+mcdVRoQOwx+YnAbrT28KL6KvDIgx+eDwUqiNiwvUxXyWE1WzNwHdA5kgmgdGmdvD+lKuHn0lB7KjyW722Fr0BWpFlFdj+jHl3GhIAniNoJWKfJfQnpxHODYkv96gmIG+Ak+gktgrfIFZbm2kYNUE4NDWoXm7UpoCxfJopxw+/ZP5Y5IYAJogh0TWnY6Bmg3UTCoFjwBdz2ldDU1hbr9TAxsLFsZEpU6gxQo8hSdyUOvC+No6wM65cVZbTufAbBaHdTY2t7z3fu6D5J+h7gIn8YQr+VF1vvJJZ3AZYZllB+qiugeMjID80h8H4Wcs3xn3B5dD8y3vOUQLWhqcrBISc0Gb1KUmNyo2yFZBFSsB34sAUTTGJ594UmYJzB2jo1YTSivTA0oZ9coFN4BdxdEWvmf+KVRshhB8hrNGBSvrRmQlHYLWarrK1DTxpZ2d5Rcg7/G97og1lFenFnq37HuUQtkJtMQPUOmetVe6DcU+8Vm11NyvPljd81R/xRqAVydC4QS/bDQdH++EbjzgCc787Fv5t2RjOLbebaj+TgU9iT9s//vv8qgFXZTanNsZ0+Z2KmlgEcrm1PZBYY5fOc+UxFRp3dlQ3NLLpRnnxhQyxc53OH7Si5FYNiC0rYYH4+5GlItyUPMFGcDCqFzWPYgcl5bAAULh0aajqL/F5bG9b7ulxcjv/PQivc9/zURkm2VuYUm7QLIiB/2guXKIeW28pPrNIzSMxVWOzNWE5ux8Vom60WK39sr05t2NPYwNvNkry0Ic0f7xc+X0Tx73ytqC6YlStkfv9G9R/xvOaxCuV7IdoHIYBmNaHbi4OiOhmZA2k3ZrUmVNuvjZSbTPogefeBsiwVIniXhovKAkMIkG/tXCpcNgi7bHR2sh9CuzX4xPmUZ1jjw7H8et7OOULSozBbiYyW8GGHD8xFqHkNbrNjNzxfOAhiLKkw6aMiPLEBpWjXz7m04SFf19Cp8/wVjYfgDG35D+EjlKkXwKwyMS34uIy7cq88NUzX9dFKh/NpWbg4vJGGZxB4GSlhhzP7Vh1dyW+1Bsd4i8F3zI0GbyMyU2jb4unXU0m4wfFuJNJoEsnwBhzt/BTw8hk7gL3m4rbsChvDY9HbkhxKXzAZk/UQLa4XsL1QWWrc/hpUyUpVrXN+RYc47Zu+gMjvnsg9ujarIMSu1LsxM2sfL0un7EBGq+MQWsrgWjfKrQefSZ+nUdk14GkmRwRUuTHsb2vcIm04ynWuvkjkFLcZcG4Y174KvN9XC9Y/75SFKpykxlnN4PN2nvf6d2Xj/3/A1hRwmBEFiHW3G/d6IA5a9FMhFhf9mJNgYv/YgGM2DHa4p7I5D2kb+8vD9lu6X0nBYuEsKNwYyz4V2u9gts58oipu49kDT1fyq7qpfUZZyOuQ0BIFhFtHRNH4RWvBEEyW+uztS1wdR/Q3KLfXp6JzMMiy91ckcgvPRPtnulU6vKHYWNhRXXOrjO4+KkGgXxA7DYKxprQ8mdED19aOZmqEIVk8l31dC4TXbSMtTmxoyF4+IXPWiiqTNlK1MOgpjAp7I2UagxsfS8Xh+SsG3Ec/sWBYxE0EIQLBmyBTva5aRWBV5U0Cv3jXj7yPzcwsJWdUHFkh0TESrA9TjWJ0oHCwIoMbpk15d5KY+iXnCt1nYqYJem/C8IeVm+VTJPS/NmgmW9XSZqrg1G4CUdO4BSVmLjFW0tt3RoJfUmP0O2z2cDe7GMJtCDlCQKuydGK2rZ7934/5UYIBuXUPTxEef1cX50U10z75VWq8RS17pYJ43WlBLkXvrbvfCyTcCE9ldrKdl721s5LNNq3m7lkveP89jFvndSt8o0afm2Ar/LjmOtKgek3SZ2cPNuzgVBk6EyMSb+JzvqX+RnBzhL9KyHu4U4HrXSchKksuQaFWXxEQydUMU2A4JSq4imp7PqsP8Fb+7MwCRqyp0b3NdO6nZoiqlts6J9KWJf6xLH+2sQdvC9ydL8ypNJSUpBwQqU7TniQnO9I9BWrQFxuLoA7bk5Gn9fNi1sVxWefDmzQXZ3qSQQSsa08ZFg7hYIIORkdFQ7YrCnYaLf0qubihXOkXB9XU9uT+7PjS9kmYRJYavy4FvljDNvfcs7wHwmnfkrKfB96TEA+8eGD6nYz3jGMfNm603bjUlugX3GQ0g4DGeoZqdbrGUF8sKnIUSGblbwa5ri6QXw67BZj+D44bnABrAJ+aU1QLgUG0lC0jv4Q1N3hpZVpScOP6Jtsj6GXWPbMNSyQtIMcDUTzjQz9glHs5ogCM6sbXqoXFy897wV3RLVBULnrzaK2E8HHcGnyjdTZrl29t4OpN79A5T+edlpjuBxU94B1BUNFFSNjco0IQ2hNfLwC4g3EvVTHjSxbWu9IyxVmnKfj0qDOOeuAnWY1jJmjGCzeiFDXU/atU5vXJkQvxhcof/MpevjQ+7eMZg0IoJisQoqxoQwr7SiFZ/kOyCEV678FQEg6++DnXA9Qf9Z+SRw6yn7c1E54/j7X0YmTJtfDa9RymJNwc+z7C8EAy7a5jUDs8a336aXZoeYcrcOvisatl23utio1yTUv91jhWuFxbrQK2xldjpmQumm2g7k/oNrkmW7NvR3rnykfaFy86ygt6jK+aphBKAOPVFdVHEtFXtWnfr66pMAwiWKCl+XjT3o1F9/abJdGV/ZgPzWKZ+BLdncgdXU9HhVCB0Otep+6zZeBiSfXGrLd2eUz9F1tvxZba1t8I1wi/0M0/Zhm10jnIKk9ra/giUKg8Sbzw3I+5/8yR/R9RPSrpPkfV2CMKwiiRRFOc8KAtN55RiH9vZNM6nlT4DXia1qcvC0LVk2ODdPPEfoGXxjDrIsFEUj+8YO6xELhuMNoqI4hR/5RAYzEzQLM+bHXOTWjG5u3YxH1Z4Twx5vU5FJOMyp+9eWFwMpTE8QD0D88gro3ZmwSUbAM9wGyDsyHOKVdXgPst7qKs+MZXDXijrmbGlojY5Q/hszhmBcAg+frMB31qNy9M5ErFr5Jyv9U6Z4+jXm6gz70pp3uGvolSTKtCoROjIMQdZZF+eQgW3qqQHJsIBzW9ZJMOSoGFs1GbYFOP8SgUgM5RB4MG7/FPqMycNg4JW4eYT30AEpFACq+ykTa8ju7Ls/5/GqKvXrOsPm2fYKzfrxpVX8lDl61JwA8bJChWLl4NcYq7Efn0BGa+xw/Fx69nOT7aMvEPiXYvjO7dQk8K6GCHt0dAOn4JnCBQ4UpZRB0vxHcP+d5cSio1iknh6jvYrcxvT1QDYqeW/A228ZVT9fPWLd2DYPV6oVLCJetMWpjUpJCHj9CR3dm/xAJGmBe+W/mgTCa21W2bdJU17VIG3uVbLdkpC2JicLCA9ItirfSVvGHAdoueB5DLWgLPwN49Ao/ue9VnH8xcOPbZIEE/9gzC+caeVbAbBBvLFuJLmy9HwtGrI5MGDNbSZiogG2iTvmWuSGRPKbM4JFGKyuHRFOUThpSOpMCxSoObBgmgfNV4+vJluaJvMcwit9IqBNv+P8x24dOYbOotk/BRJ63Dp8WnLAP2CfbFnQDRCAhabYax2oeBO5eh6/fbBpWHRpSnnNYCkMkKEBVB+R4xqE06x1By0eZnQ5yWwy8fSZPSDzsmG6vxcWEaf1gxxsykI+PgdF55/1FaBZiJzCNBXjUdvqwE+3Q70TpiU+iWkKtAAZFkRaThhue2lxdz4T7e293i7ljWAt7OACBA6U6GOAdexKrhQ5JnxU3CgPzD7ojaNKivBIPt+TttYKkK/QampOW0E+phS/znOYbu2xOlkzPY+qorSYzrA4HUwLzgRvcLl0JS8I8klKyx39PwUaDNDb3rknsbC6XWnyM5UDud9o/RAnNTshnxYLVCZXN2X+r6/e6U4qAt1/aeIpSsVT7i3KWttQYadjcMymFcWJHcdHSovIp/aRxFYPWgqVHU8HtpsfEU9xyYC+HN2j3go7mtGzciMwjSTx1+KydvWY7gOLtJ+bnBEK6rBEdHfbrBjW4TvHKYEBEnNG4CWzus0MY0+YHywEkW6RCYmNJjnCXvRWDULqeLfZvKAADtENSIu7NX1rFXbs4HUbknhOPlJxk75WZQRiIv6QN365LuEKrcyDIfAWVLZYg5e8NUJTu/M4KekxBP7ogMAx5zG5sEfIr5nXxT87tQFtUs06MyjpSAglR5FT0l6UDdHKJJjC1dufNbHxIE6+tW1T30MEgMXUkV/Ho6XBdnusvoA37Mo5inbRJB94nikL+AfJKUICvK8pP6PrcfAPaRppTO14E7HfN9LKCnhYJJmyXf4+EGYto84o0TWm8ZbeJz3YmJPRZT2m1FbPUhUjST0ifb2f9u7/jflym1H/Bq0BfpaW63he+mpZQbZoOTIQ15OS+KdnIc8+cd+8u20GMmLO2klk3e5ue+TyuoWrpbLX7ePgONsloU5ypho/oMQIaXSODJfhPA7Na5MFKNPrRa4dSuDlZmYhExYCbF1b0rPjc/+CdVkSdwZbup+x+CWWdqKU2Wq7ncMyyCEu01R6FtBxmLWxjI/oS/rfKXrlFA1Jjq86ZaBpOcUIx9asNS1v1yKxtFg2nT1Vk8N+rcrF6iLO2hNCJS+HFpQFlHMfC0/2l5vFYxEBD36eucaF6cPhYi5TtWelDchqZkcT8va5XpatpliZKR3H+QKZ9jBX7t2Ngwlwuvx7Ke7UPetkiLmMZGeH7P2vr47cIVILjV0diZC2tXwMjn2oEIvwlmM1ta4xu61SKDh3ObbJFcEGBKk+ReksnKPLo5JsxXOWmbpC+JGqmL4cK7hFyRtk7gnCu5P+NMMwqPoGwrx/Uu2CRmmf7623MzyaloMbJ6gXQOEK91xhcltOzfAAoRiMrAPukh0vLsKYvjgL9P0WIzEStO5fB0clEY0ao7Gt+bT1yN2rSectNGrDZUZssuFlpyJlgetxnPkEMztqYBSYmSZQEv1vRM1ghUS35StRtGgRfDaT8QZQcEZMtTHEQY68NvX8669L2Y0mJIk5cVIJ63Jsj55Z/6b3Cp3w7Tjog7RyXcHnDyymwjIVtr5HudvDSBz99C3WjjYul5TDzPX2a74OfrgwgSbTz0EpINWwcOCARF7Lv7gcFk8TMb97kEFRohGy6J/nxK/3u+GqiKP/U9q0Zz/L9784OQ0eN2XbTRuNm6bqJeWSdNDcRTuD8EpytZ1QDYHtv2cIgLqdmz4NFGLumW+QU2MEXYa0rpFprMXMeavva0ewgrUVXlVcsBdYB4VRD7nRDUBpzi3ar0sWVBueokw6nChJfsv9gmIU4AGo2x2xgWgy8Z9AnDQkc3YcUvpqpBXVppvWdmbg9Gghpg4jpi7mtVSx9ShuCCLA0zFH0olaBiUEuOsREQkWs37TDtDFS+bA6rZHoFpNz57c5+Mxdjmno04A6EKkrd757cviO7kd5HqbqQfLDjQOiyRplZJxK67Q1FwgEV+7zEw445T18ix9TX1vtZqx9kE9ommgcLAgyQ2r2bQpPLhjkL+csGCChBwf4NmLefC+QMgR42rEY9rx7ODBFCcE2FdG4F/kCY5h9keRXVfwwaBRS+PMJvo+/+/ij79ywWO8tS549HGjZOKC4xiqO5qbRlz7PKoYySVt0fLQ3DLR8BrQ58uDxk2i98VoswbtMgtNI/Mo7uPTDaQ81gPY3968zGl0TMgRLQWE46gMaF98j7UneXRdjqE0Le09EZa4dP8rkUSRtoj6hMWzZ6jGeA+tFunj4V/53rp5X1UH16DVOuAgw4p0/txbDKKFbGTwvkFeEtmn3dgYWBOlTqRpnLjNeMX3Cu0akXEYRsCe2/lSyi6jgTRGEqwE+dj1wdE76OAAaTH+mDogCVrv1FlK0585S0kRwtKTAHeAG8MkFlPK8+si0CmZ6RJ7+MBoBN58ix8jKK+Cs0E7Uzb5x7l94dLI8HvBDfq5cn8+6FDx3JBzRMM9T92ZAa8YKDoKzNnqYb5RzsIpo5wMUhgv1b0TMtG6R9Ph9PyU1vNqmsTgbAK1qeoHl3Tl7q1Pe97K6cC3bojMWuOExN7sqv6aiVMrYRe6y3jIjAm5gJAp1xWUgv3hEvXUVx1dlggyMhh9TbyFr9pQZS5RBofeQt8/Xb/tLlBRlJUvVjCPMIcXdAq7kl/GAUpK8LY7e9yDWw7QmLcg3jfCBh2pAoA6T/OafXAXEbCobJv53P7e996AnpPnwMV31Bl3NBjiI3aYmC7I35Jd9z5brsDqWQ0mk/zFZsRUK8PZ/9WhCPhyrhvxa2vajtNLzoRm0p3N1gxu1ze+AAwPz96ujtF9D2UunEZhRo6yuB0UZoaHCZRISabOxs0DAWEyZ2bI81kRxsBNc90S7C50iEyIYOPN65JGtwMnFwoQThU6yMZN0dLpXFFZ1D1SM3He5qVibpY4p8pLQUh5LsCZap3ovCnBH6PTJd6dwZ9n3pwFv7zBpM4iQHmrUOrzwJ1ycWbuQAmrrLE1w13DslVKMY8gPMsgAaROpI3MgZmYh2kF5UGDLj0+kJ+1lZoIoIlIBHaLInIbycmgKAspK8iTfa0cVz8X6msmHApZkKXLOc6xc0laK9a4bK8PejgDWOJGuX6mZ5of0B057WHSfT9qKy+Io3Nmf3SkYxAYCUIuQ61Huo6ydyk5kjXDd9PxTdSLqYrImcICuQn8nusJ7YRBYCPVyabtKUljhIUuuvDyJZwUMnLHgKY8Xu23hQJdpfTAQ1wzhnsta2eWTtCn8Ff4cTNwia+5psjHmJDtPtzznnKRJ8oVJXdU3BWQ94t8S8kJkAl0OKvyb/t8XekWz134n81tj4o6uiPStu7M3kThw0yyBPP0GOzeE+cZy0dzfuAxmcMFU27Qk70xnqGh7056eaKi5P0ZbxuYX/Z7wLWboTRAQwKhrftLx/8lNmBBK7EZfNr0cVMS+I8Fl5LDp8nqrPnlNnzZrK28i1vCub0X3diod37ksOzZ16YEdz7isNvm3r6o4A5jGrzxpPSelIrCArbv54Yhytn9J7RNjv7NuG2o04KYkuLnsnGLyNYFHEj45SaltCPszod5iUB8e4irI15fW8dNUEKlIsvIDd/dPG4GePiUxjeM5UpSaib/vNq5bYb8hPy91fs+F33KDUhnzIqnlJQYT/tmUiNwehGf7o6JDUtcoA0LWdmQhT8lfwDbvsci2OwxmRoDlC2igUTrUEElNcjkDcHiAj/fIbq+GzTGCIB6Lni/MeGH/wQyqi4U5IEcIsigaHaGDM5Tl/EiEnJalG2ePzMfiOlFVGPJxz8OXnSVAzhUQfo6vZraolRNIzc4lp8nSOAbQJB3d/OZ+ApkwU2KypSidPQos1z6mQlWwzj4muyaYMYRKv4BZgPT9i97u41zXL4PkHcOAZhJ1CAyAELtl2+DEDgES7WB6fC+EDBdbpAHcWA4F+qhHAat85ftk2LDslmAR2lQ97L6izAIAr8+r7A0jfFxPdYnnDFpv9kxitQLAvZcimVmVPwG8MaxJDm0PiaNp1/esCL4oSvjLhy64x1xGxsh0mRFQAzYD55C1gPMsqsfNRfiizU/XaWZCCu+hFNC2UfBq5Q6wKdBXBDZk4wGuiB0rnu4zIN5vCmGD3vw6glu0wqwIKymVw8QwCclBfYAeJgw4b2Q9xkdeHa5ZNmKsmO5D6q6ZgpK3AdOm++TCzYAZpEgCewof6qdlUYvLj7G71oyDNjTM//Vzd2z/3cztC9OcZI53VDGVI6Dcn23rz0hb93c95VdE9OQ3bqGgIY20yKABoxNjFhqoRt67oLuFLTMI9NgaFc+UDl9+veurEC09uR7ltGF0VPAXFGx7yjOVzzvf5k+7EC7p3n5e2BXwbEUtd+4r4NXVo2Lng1UpWjpPHexKOtfBu+9IKMjBJTQdpTSIAYbGcpiFsHVtg6EwX0FmsHDbhCQP+PavTa8FtvlBndGj6QZNdvxRe2ihqxhg91DuaAA1IA6ucOgDz6o8S9VvnJkySPuU4FWZt1oVYan8XJV57WuOSeMRFymW82WaDlePvsSOWqEPToDK758dsGWXeBlvvvK6H+/mycjD7L3cBUECDNOCsSqi8BHGMP8rf1l3fnK9+m8RH2KYuvptN/Co6jzbu5IFm/MZ1aUWsoWJB5x/2+nXaDnf2kspj5I5fHKxInTYqdcuexX8qLn7TqyOAapBqzRWSs2IH3x2NAioDMkIfdZcV8IHTFnmBcNxZe9ezC78ovlATD29clHqbzzlcsSxRQWdN6UbbFsnLlt0iNH3kf04/KQ2dXcNi//z3gISAyCPEXpLdIqJJmcjF18vu9ySOnZ37t1LXspg3jHAa8HscKnSPlybyCgKVBpKSAoKOyDAP/oCPQa6SwtgFediChfkk7cPeYzYsdKpthP4UrJUbVfeLPnShpbKFl7JPP8A9LsxPfSKFpN+PlDQfikVFqCsX3IjfEiQwbTdX/muno+v9QQCG6D5ZVM9Ju7dIQyAhF6GJpzeFzvRdQLPKD0iX9OppvDFTAW+M/oam+95PJ7Qzy59vm6iHTKh6TR/+mY/+um/KZLYhudL+4oIpNUZsYF1+Naa13ipe1t5hunOBP7m4Gzp8FjCVeu9Ew6H3Q6za92ws3J8rwmcvXFD0B6J5udu+xw7+H9/j6VXK857xTaGhpbfrdOsuDqrnecVMgAQ2CAHPaEAwKAgBJeqOsb7JBfQzMZpQlMfD+nJZ454oz3NCgJPAWPOgydvCCzUoTNqhKsBKmkegF3eoC4EWmWC4CRjM9Z2Z5fZawIiNpJfXhSPrNku/SkRCcPBs9DLfQSPEEL5hvFlWc6NcjivzhuWb7P8bocSrFpAeX3VTdKdvykC3LvkHrdiieZs0M7OyDN3A+x6QH+yyIvmyUmZbB9KmzBN9sQNOmXtv/IjN159ZAeK4DigyqB09OR9B13x+FZui870m0znSAXztddmJSXSDhraAeUUxJxCvbHZGgoCPGew8DEMj2De191AK0kl4eiL5PUBkPgBou+gFVbIwfwSR5BqYuAtEyp21q2Sz99FR00hk7E9IKAbV7Ioa4ogvmyHPcGLR0Qa/yR7vniQqB2gmcY9XKnugzM4cl9dJAcxihksRJDQ1GMS89eIgJ7n5b5UDK7uQ2rum83BjB5/+UPxhbtX6AL/GAEgM6wPJnNZVSenbj6PsGcse9myJWsDc/jlzPW/FZrCT/34Q13X4UQ5dZxFwAlK0JLvmSrWhedOJMjY+0hFyl7AUcO3R2iIjDMBx8DfLF4OAeuFMBLgg9mzsM8ogMCHsEg5vILptZ+s0BOUNfMFYA9jaAvTJj1EVjePISkw10X3WWsme9Aaq+b/J2dCALyIlGyl7n8yLz3aSG3qcw7CcEO6JrT/P1tbh2mbi0vIyD6nvruxqqBtsHJLlUV4c6U2+mmZ2/kfzSu/Lt2FtAgpp3Zqhx/Zryyhcy2tW3iO8wMps/y3bMICMQowoS+3UpGM9NjjNX6ZQgafv7AgQPF5oNYBap0090yNTXRZbuKGrjPDo6OzKxht46Yz+DdA4pPa04cW7GR1CTLE7jNQ2IncZaKEpbgD28c0fu4vW1l3P/85VopBcMx5y7XOa0JJVOYFyuZEs1NSh0DgJd4HZ0tXv67Li6RWybKazdWjN8dynl9jX58e1ClzD15nNnamPlDhTkit6xySS6CQTAGN5QGruQFDpiwzb43Fs3oOtVT/XDyDT66bIa1O8IQ77EkYzXwIoc21wnONvcLBnl0xiMs6EBFxVpinYprv1KU/all+YclvhbTV14B2A2OqO+CeQcBDE0UsVVuGAhCZZJBFsSZcWyCBqSD658G6FJIG0rJ5C44s5rF3P2q2ca4dLITMEFYvdzYdGNXRYAfkO33VWG6G5BbD/yIFlCndMBHWYfp8FTAigyvkPGv0mAO5f6M4yZfVAf9aUgC7UGNzI48brzs49BMzJwhiw8nDn78Izxz4b56sxG1M/OTzRhuQfWKlvrks/OMcc1UegJ0qwT8PA6a5Qg47hDHTeBbW/Ij16ldeBUwOW6mx2t1EJ8wVfE62uJhJXWhmFgAFD0y5hlcqpuwehSDWgkEeqSwfBk+1n306TSEAR2S1JhIAgCv7LLUZE4uvETSCv7+95Mlb36qPdgw3GUWADuw2TCXZXV2iNvTu5JEcPR4j0v7jM4l/FrAWXF1B7TN3uDYuRNDyZZvedU0K0QTUo7GU4+DgCpZaHffEXFPSl/5xSTv17L6051Wh1Wl3198K/7+5VslJx4aZBXkFLa6zcp8S9nvav3FvpRWFRvEsTpxND0wMbu8L3+4C24O/QU0xIJ5iJFrG56opQI1WB7KpZgQCgpysWKoAi3WPUT1Zi11DxF/if9i3a5ZR7f0SZaFaOfOm38BjQs7tSJQs30EYhWuMgl2/ajE0SQMh8qhKk8fuMjFzN5G23bYdOz36tDbjjHIjRZhmnQl7WPHmsB1geMSEEMKB6KG0sltKfA2kgNUtGBoKpzJvvo8tnPtwDT2pZIzuSu7hqX/zfvpvL4KmxIEmI58T8QOrVYktjpw+eWdbPEc4cjsqOvHd+xbm2nvY16wlk+DugfPx6VUUEu4JVRomKvKjNPFoeLAv5+VsBpu9yk0cAmJP3FiRedw6eZ1PSuSeVghUCVSTeat1fZhVncGFCc0NAWxl6GfpZWVxYbRYMvQ0BRLWfgw9/zuvA174tqfvwp0/BL9yrRnRYFkRRC3tQFmPFPO8zZ76TPMpHuFNjd01cHpHjb644MLna5uv9SDAf0TnXh6JjmHk4CfWJq4NYJF1mptiRSPr3YUKj31lgRNQMWvRrRTfd5K41GKDzfF1aj43WiNt8jeTigLYnP86bmgAzoMc1cRn8RDGyksarzCDTSDzH0cipEPfPVzGQ0nCP3za+3qsAqxYOMpEIayR0jBNBbVIvVM4zbvkGPdVLsGLgH+rhZn+q4j91vYDQlPWBQzrYJN7koJpgR7l45N5gNEVv32JT7LMwMvDtwX2f50XKvW7HiDcWFJEEyYCBg0g93yV/UUPYZAp+1DmSQ482jIBtxjUuntRh4aAAeg/DLZXMBrWdgoQDwRYaGYn5moP/q8IjaoXJThlQvP2HZLpFGiIugeP5O0gPJSULUeQgJXLJHiXgmqhcEkyQEJeSb/jV7SNTAN2t4ACx4H+5ZWKVuIR+OUld6AEemRqGiTExROYeAJh+pOOktveOesBL40sPZ0NGak1G94031IRpOsAkuolZQuLqi39D14RQkbhpKZ9PxKtFHUrislz/uZM/sX7PS0B9g7NR6eTbv+37phc2HF+Np2jdUcXxgbmI0HVfkUX+W3PRoXANsv31z7uu0Psu5IDjAfrqM6oG2G9LCn/9gC1Hkh7fzEQO8iHwpWDL6Y50vnrmQmrvk754NnoQuXmjv8tk51fAKta5ljsmM0QEqrxlDhIX4QtY8FpAdu4JYO+uJZzQARCCxMqC0Y3pSjNIT6R4LzutyK+D7tUSOAA4oz8PWgEv64uR3LU5NUGRS+ucDEnfXbIzp+Lb7/JDRKrYk9BTeulelz5mE5gnoBgDTOWE6ssuyl6kFgezc+JGypAEHjo8BLj84l2j8DNlucKA9qhyj+syZ4H5eZEofY7J97wPjEYH4zY3op/2Eyv1U7en5zidZ4Oo9rO8TJieVPo0x+9SBmGsSPh9EUCh6hAlWjp+yPWVg886HWcunAs2nqC8qm9D5o0hXBwTyqFk1U7USlY/4BvCe7JpS1d3uBhYKuWbkCF8xk9tODfhR+DgiDAOgLuhYrE6oKU3wdsmRr//BQbqF7X4NbGAzFmaHqjq7D77UsreVC6YN2YeAFqfmSd3bqQIckoF47BFyzPmtbig9/cVwK4HE1UTot+SmU4bG/Izw8RMLc7VzkxBZhw7hl6une1iL+ziQg2/rl0RlRxQijeqpOlBwlBORMLC5pBgS0FfqCxq5vNGk8zmkiH+k/HmsVjgfogDU9eiupnum/EjE8CFHdBxiSMuBJMCL/cMnJ8tSs3XaKbfjHr8YXU1TVUGxhtTsqNLkCccSezKBeD6cgYaSutoS+pkxjyPgCc33S17is8QsyHTn0GCiqyQgL47y3X3qXUEU2lKphwVz3rf4c66eZZSE150xLdqtOeRRFFT0/w3IDMK+gvnV68XpnbXYlYAa057ZG87a0Og3/Ip6lut1VSahdZUfHqfJ8nfEht1zYm3Z+fdkfRL9tRMdhOX2x9vgYcz/AAUF5VRdKeFpaiGshd5/WOO1NydZvXMWJ/+cpLofz5Rf/Zy7XbPAf7XXXR2fkMK8yaA3INi6aGqJQ8ty5nIO0TDyfchygNRN+D7TzAsENH7R6MJH6cmBehiXQOcx9ZDT7xuJtDfYAcCS87/7krnigceY345E5ZX16OjrQBxWAdm5NwJZRwbtTXGjYkYVJsqaBkLjU8UUfDdHDKoeBTVCqcu2GfCApmVUQYM8E0sAxDW4/u1V8drTrtzLPeRnCAlyPVo6Hl9UTaD0tAXyQiHhjVoWMAg4S9cvrGasZXFT/SI++xLOBixQadcEKWDRWeZA4YTTpKsFUlIucAaLmwpp6LewZqpv07+FPrYF845d7VJxmlyX2aYa/OOepfD6LETq8varqT8/pK1WjE4VQmheXhA7D8z2RhomeYpbTr8THY3rL1I/VE1mmHa3C3RqXo6kil0PcvBJsEiAMG/elZNcv1hOgcoOyss4t68KZmvbSw24pgkQb8zG0e+y7dwcgp0+INlPtPFiwbxNshzx0P1IqJuy2tU8O6pixQz2hXfoqPSwAeAmmwx1wiYBRIIp6WuzMzhSG0UZgxSl+ZthRQ3CTRgRMj5u2U8LbfC67jCnCEjzcGA788LVBQ+fmsUPUaY044B/3wU0sdGtO5fNrwouHvgnqn2ubHfjgU+PybHnprrOZIKdzv84hQtND9M53r+/+/aAbn3hVmQvMJhXkA9XyEBqjxeRguko9qMlqZRuYOcazKPR9L0uUHjB8wR/K0+Jv8K4s3ZCfzK3HFBfCl9p8N+vV5Y1c6HWwYMSE3Tq1R6FMpuIYwLXj3ZQHc2qmcpCOhZ8DneAud7/7S4DZUi4/XwBUXyRJlQlY47b+ZOLFMH6SRkBa2HSYVjpPzKTaMz1/azjBGm+ODjIa3FN/zgwcCNnYeebU+g1VPD+45WAxt2bPFQZ9WC2AJ5PnHQ+nMROZBTH1OQd/dbaAR2ZRnUuUoyXlnbMDMe7hbeWzWHJaPe1hY1fcQPqa30kUY5ZU1r2ZV58RPb5q1uKmMZnjtH3jO4arvhkzSRN+rNQCofRhpdu/oO/eMmVXX8zwHL9YKIc7XBpmfu0nzJuVQD2DNQW/OON0zT8TonVS6uKuWB+QWe3LbgufeuWayGP6j4FlYC8GLpvRlwYt7SaLmcREEOdvhNPhXEqTlAjJRpfZK5cdyUs0lAWSjYeAMYJhtD84mPNzV9WIlnX3h6+t0iW/PSUSpxVZZKL5SseULdMExZs/nnu/+hpQfIm7LQG8cgVcPZys4cxjzI+C/pQ/rKHASvj09mMX+LlrW9B0PlhWzx6o+sBSDv3hLqS2g968m+Boidgibh3V1y44XLrvQX0WHLg2MOzSW+cQBXCyM23cXP1Aeonl0qj75q5LMB7fmTb6+kldjInR4Ja98P2m3/6xOR2oXrUWEBrF551gAGqlY/Xou+1s+0H2Uj6WXyVfCTnlkczKeNKHUYXGwSg0tGsjxY52Ed/RUApjEpBl/JAHtCvbAsejKxRBu30a9E3CtLqSnfmrgXnTW1bYKszLHhlE2ql1N9OcfC/Qy7Lfp0I5I4GdhpO1C8LP3x0ZWFkYvCK4peLrALEB8ogCl4gY3dqyKGNgb1aVF1+iJm+AoyoT4HY8OBHRzcrZWY8AwtD9NCn/NZNfd5ecR3N5g7InuBCTKEY5DH/UI+kYmbBA5mdXhtdPnJccXAJWxHsm+lELwIShemr4Du0bCwv4ZnaQOzt2reNxTTvnVaYA7KPDp3cLit2f608pqobHnToM73gSEbz6RcPblqtDk+FS71WfopcN47SLK0+j0S8+lF8cyk0slf34BqAbcGpaT2cqw7ASou1yBCh2VeoAe/1uhfBzXZhliQCEO0ABpWQxc0w3Hr3vjUOa5CtkY8MxDWOIWpai1gNQEuSf7SLVJ7q9CsHRbYNeuzH7f7xTkcm6eNuxU8zAM7e3fMXSgSqX+HyntAq+lG/1QbKyTaHC4CdKLFABUmn6ljwDPEsA+830nYWX7qdqwo0rpp98Ks+G7QE2jXvhS/cRnXz+w16km6IC4xheeunHdekiya0qMBRIpXauzeWPVcmIgcidGFgsxOj5dO6On9w8T+7nEcn6nKLyXdp4BRVVbTi/qvLfTJE5Uu+syE5RPz9pZ41n1Z48M5ebfWVerDfwni8dwl+mFYpbKSgl3GUsHb+bopjxZUK3ZyefYwKS75YKOQfNMz8rYcBGYkmxEawWGz0qKCBpQmQCLSoj61hqWDyAURgHD++xPIqxmaOibBuqDpB31HIjr1g2eRFMPArYaehVW3Ea4hpeY/GeSvRjzra7Ps85XGtY3rCFejEQ+c9BzyHBthom4zpdMJOzMFgNI0x/XQCUxIHzITG1QRRB72kEfr5CJV1UGrqSysVaW9qrBAJFAk+Ws9Qlx0vDI7PoFO3VBKGVxjYBTJ+ih6B9xuqMzUE52RFkLa1NAHlOJairEl5IcTueg0tcX2hP/MEfNuKKL0XpD0L+nnXGVQATUGnsAnqb+f/+TaMF1oW4FzNuZ3qSr8LHdcah9P0C1vgcJliXmSDbPdn9E0vHLGAlbGJ9ub9A539dJEh7lRfkebxSi/TuzU0FlkzbVg5CFIhatjJttOXUBp3vATqt2tXoxUWnBexRQ4YheL6qI6Fx2Zfa+agh4OkaBolVw5j1y9Fme2EpYKId8iYw7yaL64ycS2MsLONtqM4PSNpGp5/FASrdt0PgImPS4HgaEyzk1YKJzAivmsNLmZ2neMJTID8mHaiXF/u87Xib47nvIy+suFIVndJxc+vsxMOUXDD7kOtCLaPtaObP4Zsm+Y6CyqmBGeZ2cnEax6ICdcn/zILuxmXT66BAwFyiMU5GVpWol0DvIwWMGQCXbQgLcXD9UhuWm3+R2ehzXFE4AkYRwvRGfqzOm0oDW4DsmtTQ29brhwnKyrqBITvc4p2cdPgIKHkpr8FoYk5VNcdQoN2SEF9KAVx6h9Z51b5s+75mflxif9wpnXVz3LDRLh8r6wMoXrW/2VK9h73ZMcTbI0tgC7fSWUcHZcGZfj6C8O7Bsz1K9oEtaJ5UCwTS3pzhWpj4rBa3gIQfjDGvh8cqbzuCFyNUqE+B10VWzBwM3V5ffzvrV9I9nraWAlRJQEcB1TyrMKQ9I8klWnpGYjSdu9W/epbUhlIVQJkFeTruc+ZuyKNRprTg7OQar/TwTrceenh3RnRnCziCklVdaPF3w7mldOjtr8kRrPE4GoK+CQ+d1RxUnKwGx0OfaI/a/LYBKvqQv+YERlhPZQbrYKG//QOrOVh86yIlQH9tjzNuomusd9YQwa+JyyczWa/G3FwCGCzca5rwoFeuq7br6QKfWbpW3yUpxkq3pAhr2WUpNsxg4n4tUGegkAJ+G7jT3JrAd4xH09/savl+4+r4z3/tTIcQGsNW0JjMvfKGbFCMGQOsPQimuyZlmQyInOq6vezOfVMEN4cRUMWpBhfVCFb5acDsKvAjFHh7u+HS6o3AuNLPVmI7MUC3MrQC01ZJ4Bvq5YD39p2GXktb7ah4pIW35fCle+n6kpFhKfYG+Rj6pXzN5T0aEDdRAGC5WB/++2YcRkpWshRf1ZBPBTV5uPf7CDqG5gaEze1M0N6Dn92IuwxWcwQ0JxPz+8RVBo67ATVM9GPACKTWRPp7fir7Rucnfjyu7BlYHILCgHCz8k35U9rV/w1wkqSOLzu7+Z3qR8HwGzs8SrB+5REvNuZt69bbLUWLEv4xriH3gXPIo4Hkzv1GV+KtKOFcqVrvBghkGIMw6AzVJdcn/Kmk5qLDcVzPEQnwG4EGZT40zMwJpdyqPcHZzz/PXfPYmLMpoZKsBNP1JaycppgEP7PVLA/6o6VSbE5YAMvpV4KWUbO9Y91cwAIgC6lN6k6rMobPzn1bmXV/lq+gLYuCNMwi+jdGZ5TqYSgALS8ydRRFOhHSIbdwQkEY8jIbTvUYZZ6S7pg3fEE/2SEvu6r75iP5eji9e3ZyollK0CDBiUkmp+iO//blaQuAtjJGY+KJX8UG68WL8j2E28pKRf5QQyktQdjlQX7uise838AljISn2+LtBzYF8y7sWIOYo6dmjBK5KFM6Nd5Jwa+hSE29aFvs5qBxVQUhEtoT+RwNMJ72puHGl15GMC62LAxpnlLOeT4oj6wy0tk1mHT4COvNkpKrAb8crmCM5HLZc8Akplt/WuDUPVF3q8FBAjYG0IrzxYTdLkpue2CjHEYDHuuBnkPvK4pMFKY+8Pn7TsOz0SlH2yLIaDWaC3WrtqmSZKmPc938E1gDX39Nk/KuR97ZOcPvwNay3yuvMr8w0fEmUcb15oVaKGv42yvJid9evX5171nZ97p5EAeqKb4nEf86oq1dBQ8BJDPEokS2J14kMoKjjcIN8utXMYpTWKmAwF4uKAGdEHkKGYdhTs6D3DQBN/GWytzIdKcREYBnMsKVJ5bbIuYsBFrOu6NTeYGjFj9YAp6LF+xhkil6f+PIvsEjTLHM8MJsj9Ll3aj356ut4D+z7e6hBWNtUav+BluoeCuqr6NxWTr/q2fyEsm0xMfnwUoK+VjRwp8CuPeXcpnPzm5+6Acg0mQGYQ5rz8KSolYkEI/1oYbI0GNswdib5Q6j6lB6txO8DqwcGBZ+KLu4FBDMEaawNBx2L7+4P/U2a+ZmFEzkomMp28WiY0w0iiKlDBMi3stE9vVIMXAM9NLvtsV5c+GcqikOVxq7lkDFOxmunSTGTOYKafg1nyK8Xz7k/vwJy+csz+eyTzBx9wBK9mUG4Vdiv4012TYP0GW8WeinJ8uAVAcw+TUlc2OnmY6CQ6HKA1SOjjUpx5Xvzc44naGKSqLqDW+dZRqEhaH+FrLkaONNo6uiSV7q1wHL6Zf7cQ6KaWl7p4O7skn2GALeCL6SOaE0RQUBmkHue9Uy+rY2Jk1xdBNdHB3yWwhAqkA2ITiw/M2bQlCpaIJ3NAoeq8P/N2p5WRrQDA4cW8ZZjjkro/Hh76MuIqqpDJmCCAKDmpUCgJypc4MZ4DtwJW/hjqUvMCnMxmEBU2VwjWqjbtDenAlDA9tYGBr/BPKGCZ0+FIvve8OkwKM2adwoywKpB/fvbfaWBAa1b9/xNpntPx914TwzQmbQRLXyMNPhHQ46kPOVguswCtcz4juDMiOer0CgTI1C7N/pii1ikNwnJRgyAoT0DAjoKiPd137EDOkQeH/Hs3omk2po5nX5OOMGn0LkvJgfCilXE6k+5v9a2wFNPuieezrUtH5Dkgs1qg1cB4DOQsaMLiyfNJeujhd26Wvww1MqD8v17TzWjlxPvjlZnOSlM4UzE622TCVO++fsX4s1J5obm7UzH/zmeFQbHWxADn8KHbLFiX9llgLS/akp75slzMUcsJ46N1OzZKnnCy0mDPzKDc4tK03IHGKQzZ0rh+hQl7ysIkh1Kp36xA2IGmoF58VWlbbXKav6x/Qw6NzTPPRZMP8/Cam8R5z7w5PCoP5+jD4i5PxBMl6Gn8c53EGCAKxK6MSSc+b1pcg3VUgkTKESL6ANAaahut9bHaciVnKvkswo8j0bXL4D+BlhqnkkHJnqcKRbjazFFO7kBBNGe0xfv8+R45aijwaY82jl5zdkMLH08PQG7QH+emCGjAg08mAGNFQzlPhqSxWG6NzYWrnCAQY1B6owANeVMazwihVOMEsEDg9svi2qlia31KQp+MKoqXFjvvwWXQVl4ONKpoJpE+cmA2/XH7n0W/5Jzt6ZD1+mbBwP23+cFC3m0OPNoxlSgtH4FMbIOxzfaT/KP2Y12lBKKNG4HcP9Rtt+d74GnF+6QSCuGaMOPBqgaoXgcdvhrJsqDMyCqLp9jo8UVioWCiIBJfAzpEsPigO1CzQOz3RYgF6nuvWIz/06E0YBho7KA7ml9mUh6MR29ippgiplKcN9lo9OCdWH/X2Qm0whcS7iIwgq1jAqUbyI7kWUfGCAPY2grthBJzADQePk8ADwP1OoshAzXvlftIzJYlkYbhhmgVgmkRi1q+0ol6yS6P9t5KpVEF4Pnoc4grbTDSutLDF9ERMtQGmyFfsA7Z5mf68LyEcYh0HoRehcMjGQzc2x/UdnVI3x8X5YWLZexlOxks8jIAFdUHo+fjfc0APwxGTrnuXO5YzLGGo9sbOvmxbTQoguplp5CEWlnHhGS++7wCby2JWC3x+ocHTIFYzLP0CgltNGkUuDXMD9AXiNeeZ97XGAYeuEF1Smqn6qaFlHoHIujs35oVwIDNYJRvLlwmnumrfpNeGCSxfItn9CWf8dtSqHNcaPu96SSB0btCZIlPgGWe8Scut0KNd1gVqYqWkyuq/QHbsLuZRfBJx+8mIPV52ueOeBFQxTHLCC9ycmQap3yFJBVd9MAXszWxpWTTXNqjYBuKoszuu+h0bLnSNuhjhUImGCHf9/CPkHJV/GHAugszIEhiCSt4dbVNMGzCRlslJ+qj3JYUCHG70Y+Q1SpniOTNhNkXmbWlWeJk+s6iIwTMsE13B3Z7a4mEWuxFdQYu3XQvrBKGZkUVQNby55gxDzwKqJTRrXnyuxtpjmtDG+iEEQpTM3oHhDufzWoIaroQqHBBSnjBgLwchPxZ2APaVlrFQ2uWW2dFelzxGC9ngDh/h9bk3pmDTjXC0XwOLZjI+ZaYOvSbAOJIsZpyg6GIyFoBKpXBfC+RjMq+DDhyHUU0wjVThkPdQ/+MsvQyL8Rle2zBKvTGIGKSZhLv2vsxuq4luRh51WZXtE/6BHmwWjc4Mz/OQCuAmEATkRHwhyKUbHlSaCH0P1HRl/O8OLkF0IZMQhdDpTFEHWJiWASRIJj6GU20GKElzGOX8RHoChElwpSgCkDUoM8N6+Eig2FxVhvlA5rKLXUaGjIK65+JiBqA2aYnIcnpHhYjYYip2kjWByRc/M3PJ3+yAoAINoCIBMH6vLyMgykcQaggQPaBLvmRYxuEx/N67vaPpYRMBonn/P3ImyWPARs/yJVgaCKNQNQzDoIO70mpmgdvKttSQBMFxYBHLq8ykExS7Cous/78BRzH1FWerrSZNOi2EUksZzqVyVEsyBuNj0KizgSgCWrOz2f5/lCICh0mfKmQvSGciv1bTzzpeZyTSmU1lAFzBTtHvU4J5niRZs2nnMORPUJQIEAaojMfg/Zf757oOD4jYK95w/CINLV9B821b/43t+msVSvsH5E2Gj7ZdviKlgZh6SjrIwBhUF0EFF7q7pIQikhV4HK59yqMdNKp15oW6l1MMzZ1bpMpLQZp/IZsJcDxACm7lgE9MU4+4BCRh2UubyVCpIgc//DnDeF+INs4C7WHUDNxfvzqPMgIFv/7xOCmrUPef85rKbzX1qjmBonDQGeGMJ4jkg39Ex+3Bx9kRG2F5v5E+PyqArA/VVOxIQWLxZ/M90W3c2sj1zjsU3Gy7kmgHerOtxJqHmJGtpwyrbWNrkNFHMqi4G79lP3dFzW8Y9DrDlsxrtVWsuGBo//ONZkhOf4Om+WjCEmsEvVpe2ibXJlA7WFb66sRCCbgYLghPyNseHXnmTn+mP+w3zlmLc4PO69FUg4JYxXEssF5JPm6zE9gerdqXzGSUBpePXk4SI2eHGnUwkZjGcMybW3Yht97hkwxFwxjqBptkdO8we8AQ/Y9hiCWmpD5awIZxbdXAiL+U1r1oxQ2Y6r7MUx1rOcPDjyLvDP5q9JhFvCL2LN7sf4LzPRvos2/UuKo5ssNslKzWpY0X0yw2yksnmXHKySc1E78LyfmDz4MFhDHLLztvYISCY2F3VL+mYy0B+wZQLzJn77q/VQNbOnOwQU2nyyFT/wrDZ1DQwG4Z2dMG8n/AnCu3bQRakHPe4Xwuywd9Ogs44vgOnbOKPPTjXbc2r807Mdf/VaXwUOQI0VtzY7YyAbZS+V64pf93z0iUD4ozn75jUfS//WTENhLmLGMDT43+rVw9VynkXtca8vh46YzPrdmXGkTcPIA0YD7TOSPS8+NlYijzqEVfMyowNNpTWojVZXkl2STN1vHt0Vihzyd6ISKAgEYC+D5txJdn92PhUNgUZVkZMGGnn3XRBdQ/BpkUSwnxR2G46nH9ImoGH14bMm5suNAJXpBimzmKyslicA42CUrOKoqN/1GpfJZoNbU9xSQIYzlpxDY3iTBEiu0exRbqmbfZJxqRO5fxQlgg6aCGvxzh4jLMUwmqcq6g4baZ+luKGotUrns+KDoQbMWd/0sarOSiSCqNcFHUilYxu3QZXXsk9UnKQChOP5JB2tcdYWKMXwDgSbCo3NOobIdrMy2wyiz7A7VFVwKAvCKOXEMUeeAfso4n42diaocXkITib8eaQSjpCBhWAFE9TpqVgTjxKHyJmhqx2o1fxBeZODtiAN4DKL/ykURkYhQpcWou1fbi2IZ5ykIdDzwQY9q8DvAQsxQTMUUFTg5C5J0inzJIi8Pn2KuXt8sD66v0MSLJ+p57OyPZLgFMFPes+0hpZ2vPbO1F+F7HzBfOFb6NYgKdgy2qFXehM0DqF2TXouoqZI5ro4DqlryqJXjP26sqyLTgfB1Qn5kKHsLsQk7jDCS8R2Y1sE8BmyY56pot2IMZC5amB/IdLkd2kG+yQbjiOla2AdSEw8V++Ozs9I0Wb+wA7Mu562TdHqmJncoJhB7/5vmFW0bBQ5vQnmJdgHlUwjr+c6A5oDCpXhwrFGIUWzh+vfKg3BuBrGZSa5dxxkuH0ckeooyCI38tg421aE4wLOAbmMggidp1NFRW7rWA6MbTEXjrndEAipkkPq55JkaSia0DPRg6b+wWgzsXBCnBByk6CBBJNwMHC+Ywc3I5LvvLdWQF7SEN4/7DXEZCYvvfFVPF/Za5RApjKdsXypb7sud28zjtxPnMOH6IjekoYHkGp4bIw6okXzgTmJ4Kx54ePKjgziJmlfIoK6IbmS/vH/R0oEDrPpM8n2lGMYxMRrAIWUUqjwCv2p5zweDhLc/A1rX5WF22ozP0EwBw3kJtYxrhgoN6l8oN6yFReoy9Frzr+0IA0s6g9jkwMXhUo+tOqOtKMn/eF4+3DuDD7m0stx/k97twjXT02B/8G6DaPTqa5pAn7ii7ITBsaLHC7QRnmRX0EOmGfsKXu+/BxhSmmVTnxz9MW/q9dOg6nTPS6Pjwly+jgqM2vil5mvbn0tfjJtjK/SvZkRnC0y0Pm2xdnj2c+ngG7eIIO7J2DAiJZKMZ1fg/PH4vJFxgMC7dJz5/XLqdUR1dm3flTVYUJ0n0SO3TjCofJcGV4cg4d0OFUkApjD3Y0ncr/2A4NojSUbe7xdMeBua+ZHTNWn+YFQk6xf7h6xSbnGvXnbv9ntvj2oRqoAIStYP3UMCN1gtUjzXiDuT03n5KBMeofhx5OPvfvrtBjf6tdFIlSablbI6/Sv3O+9tl5gRGCx4RIHaSBbuR5Siv4cuCONZMNuxVEnE9R1khV6V76rTlurhR/q1clUcDmmKhwFcdcR4wJSmBxnMDzuVHbpjOstg0vPegJFHG6GrM51IenHOA1NCT65K10SvT2BcMT7epMcYqpqcqHlige2kDCVAqUB/cmqAzEnxpFLp8xK7XlmXzexdTooTe4/oPms/tTyf2tCi6HaAHKZ4gLfmMk8eE02/1TtAhmxoYOW664dxVCh+DwnAkGwNHpAMhtYACyhqzPZ8JpUlpVoSWoBGwhry0NWDqtMTMsPlVk8BqbCTnVxWfEB0feXN0zW5syQhx12yMeS90yf6Q2F3cI1WnDhwOjAhxmRNOuA5ca9dlSRDCvr2s4JwXgSD/XGI4h83FCQHcSEeMbDKGXGfyCrrKeFZPy35Tlg9uB+c3VIR2W7FRoqFSQt1VZwIguUL0aeXxTk5KUL4KMFJiQByjBDdZ0SC7R04sm128zFx+kQDBsCc79fffgeS7sDuFRpx9hWmdSIgjhuOe4nut68ulQsZpP6nbcU+TehHB4CHCvv+qoR4kWwmln3zG2A9Yw47oW8VCdSY15z8pJ7gbBtC1Txs8XySxF4jTRqbe65CrVh2Zo1Q7/Ya3q+uzEOH/QMmjPRyPvQ0pFWFl6k9ICp17/Zvxlixjed6ZxvFXsWigA/owGoMK+pR4P5K/Ob4pUrdQXjuFjkAesBhVyiGsw57Vb72ePCWxbp1DldIxjeaFJCjA7jztZ/dfDk94WnlrLNLPqOhn+eAovK0KayHf3uBdZOpS9KHPetCXVZvbD+7zXpV7N/PxYvA34mVs9IiV6EpairWDSY3HLGnWBEgxwpPMW62InMMl150aI7s7AxOQRSeG8YYFRMENdmmVrOJ7m9BOxLbbNKvjg+Bp38rr1nFhIn+SxzVvq0LbWja2Q6WhpGc7xa4CaGQWvskWCjYSkPF+wvvIbf62o9qsqmeWxaQ9yFiIy7uonzI+ksRcm/kX152SF8+AtYtSjXX8kfc6ZYTM0dqHEzMSaNJ8hv7mY1R+D7PNbW1Ntm1mXWFiQexcNWnTGfhNDx+bhX47C1y9zKraxKZTcvEvt35qorK0TzBtYT7/n4l4PfDgfQcHLK6gOtscnAWx07Wbt7qY1o0I/CHhMqJgu0lUj1gTZLFE5htFw1xdlcnGkA5AyKoUrpAFrDUyvAi/FOnFEDQhlIhtAYOl0yDphklS4PRhxT6dZZI0Ro0uK9KJRmizJcL/yk3Pdqmb1UcvJjO0TnNW8mr2nYcp9ekZvrYkFgIAFJJM7ElRGcELO2VviQCs3p1387+RlyDRY5tzYUVbIB3pH49aYYw8CRseKhZMDJ9JNWPF4HRMedL0JkOmgfEBF3Jg0KcR3+plJfv/66+EcsnFzlNCydkHqUIHPz5l6dRWxKy9XHlT40zZ19FXe34SeBFmY74TnPQR3TsEPIDx6h8OB8VBEBy1XUHxUY/SgXjHoRMHt+XjFSc68pMBb3+WAGoGU86mK4dEGp2ALW9T9k8ctMugo+LmDv30/6Qx8dlseEeepXkQGzuqVmdO9d9NiI2/BmwEXH0jtPbOt28KmmmK/fufx0i2x7Jzs3XQuxxmqjgdsx+KfmlDeOrYkPYErezI3/MpugeUrN5EhnLgL2QfJ9Xe8JswTM1gT410pTtKJ5xWvGZS5e48vygcgTjXO/PNYV+hqADoH3dNyK5torMWlxoxj0gXLHvqYazqsmoNPotOPT5YHcshHexBFU9FLv9vGe0VsjYy4ZyzhIZVS3roIhpUHK2v3r5JhrfoeGhMfz1uNG1JC/T0TzJcfCwIYpA9IBu5GVMtAMnhF8NkJ+sbLvT0LH2ywQFRdoNshPTggsY8TBTa0oOh2CefuMG1gJlXYEBFz8KlH8pfjlQbfl+fXCoYlfS0LPXfPK1CHVud7umt5wZCZrARGu4bbvgH54pHphojSdCc3JMc6/2JknIoLJyVbBpWDH2jsWxhnOhvNtCJwEYq8N2LHzSyImQHTZtAoWo8k6Oh/mvgrJbmUtEcZgCavJ+qHSUGZCckVt+DZw9sXO9OVffrAXf38eZjg+t0Jbvq+aWMjCnwj1nzz2vXY6v5bIYsZ2m1DIByk0PxMfNmDxsCKgXR2nfSycJaEKKmT9PY5YjLdHHApsGyWIQql1VYbWw6X/fpGbzOXANlZQ762CgVnSVdTHV/+6UuYZo8o112Vxgw/dwLdD0Nld4vmrYuksxcAGyl4Ilccclr3bYao9ElPPEaBjiF8mGzFphwf5jaPQg2FouVuZEN61CnHOYvmjq2wYO6cRRxfofwMh9/EZ2F6N5SixCYo2auoPtQ9WiDFKa5qM42dYQ74WEnnLivlqcmxDSG2uoWKgZEUOKEaNrc1lgEUK6VEGoFlIvApUM5QUJkn7UDVkoSbToy3gC12RLJAjgWMTueU3lo7T5DzjGtjiCauRvZDcsNd7wnzxXTWxC1OHh7kFdudBxxT2i87UEJuL7tqrR2//Bz1tOtV6ADYs/3eyb+vKCv5EeubD89ULfs45fZYUt0YY5/vPPt1bm75usAXIJFTYTF00VcdWlQtO4s25lZ0/VX4pdUIjEVwbSzyB/3clsLLrNXDhRcIJrmoystc9dN8bRnQoy7F9s9fsKGMCci4gWYmUgyJTTb/DMKH//u7zz8fzk/MnBFRVj3IVDLxeRMfLbgWDONJYf6ikdQ0j8k/Ai9XqgFv3hwpPcNmvsLf3IIBLrda12+ZtBKz8OSEu9f72c7+l5sO83yCxVXKWFBwCfRzE59X7kCRdFF2DZqKmsKHf2HXRPzdbe3uoF0sZQatgCqnMCnu7vCcBrDmWpLYl9IHU1JYXrpBNxkDOAliq0QvdbL31mh7XxhJXeMueEnKMv4dx9ILRPGW66LaeJ2DmfP9CXoLgsv+Gz5vXx6NXMALajP4QaeMSWu4Pa8v3gzAvkrWm8fHLLt7g8a+eT2pYu4VjHnQ53lF+V3W26Ciqs6xqd7fP1mzVp9tG7KfaEgT7T/l9cc9FCFiH79RVZaSHJCCoJiUThtawgJ+8a+inIvluvF+XHnYRQWvoZvQAo/oPd28rb9u8W2LOwXSEXCyCVqxdjR+FHu7RKvCCN6/Yp8ZXzGHEQIf7LrdweUyE4fzupRW2zQgqQVn5LGZ/cPk9cwxCywzNE/aNt+bVLMXp2OjMYeP5V4KMHr0kMA/Z5//cLrxIflVw/tCwf5354+k0hBOcrhUmzo3XEJZ9j6Xc8H/jXMA9Crifakatr0IHoBza+1shssm4OSvNxZCzn6Q6jwkkAGu688fEbfRVKz2NSEvP87TvXLSMyOED4lkb4ObXl0jaHSspdEZnlwU5tu5km3Pofs353A7uUXlEV8kCBc+qt4wdQhEYTE4zNBdW34tbili/jjVlhoNLPld5Ale2s4aNLsRBGA1VjFYSmZ6f9XiNtBjTFWenNfeVls2ITPdniWls2CIlZs1OSH0zB/GKXeHasljfyA6pauhm5/915r4mqBVAubaPaVrV7eiynGBSaUuq8tTK7HR7EzA9qf5kR7hzGNL7PGk27FTgkcr+ZnPoCQ6PmEnsheSx90O65snorP6w4+TJM1q1KPgjp/4cjUXU1W3cy6Txee5p9kMjUV8oqWYAT0++giP/965zt1ZVlr6vlO3e/9lUzxKc+63RTXRiL/mIrNy+YwAgWEnC+wMy4uOU2rG6+EymmBgikhML8zmeBcd7eQBZM83mz/rYDhFA5UQm4ailBJTCUUuBGaJL4yeo8JBK0TT1Ty6htETcRV4Kf4SyEcCZgUgJqUJ4SB9uLhSkrKoHdqNZrBikF0E+BOl1DfXUxRICo5ijE4VDmZDNE07+gllJOPatx1wfYDIgp06iPGqeISLzsMlNa7pq8bAJ+ek7hF0t1ze19yyxdGl06vktJVT2k8OfWlki06ziOS6bD5kJI7x8z2z65AkpsuMCXr6qVXr8eU/WkjpK5KT1Vks6TXr4Zy1wPuBuBSb4w942upT7ZudsH2RkgHvuQ+Mz8msUr0C3y9QGPf8mfa7knNzzi7xYNh++90jNrbkHkjMauYgQAHhG04NSgvOR49lGgsHAJ6gt07ERkUaE791yHpYkBYP8yM58hWTBCVtwnW7nglrBk2FzH6LVIDeguUzXbas3dfJIDfwNiu4ZsPzCTwxYneYwIsj65kosFs92lo+iWrbTDnMfqMURc/AcDdj2tp9nXRygZwOFwh/tbSiugFWD+iMvG0iDuaCaTN5U4Xn/rBP8KL7y0uzkLiHT/nkSjTsOycF1645ZgncqQbdc6ta+3X7/cFls8HBWD9fEiJmvlTWefi+7yblDQ+J5RVEmjv7oH+cEBeRgQOGAZNBe+yPDqmBncJRWRGLUBUyzIRLuHjTvV7RZGC8I5PGBjpkCG7facclQrCLY0SpX7gYBPIAkMqJmPkYomVpwO17t4MkeIk6RB0/9UJqAUy8J5bsqj/TVahjIVaMnyG62QwibPhJTR9k0v+s4It2y+kGiplmaDwRGABlIau+FISv5bwIKTSYYmOuSzf0bCFn/PIA+LYVpZQEl1BkqA1HUEaiCoOsMC0458k1jN4WjNqYCM8eMq4w3hWbgIlrXPSDbdCex60cDWlR5h0EL4FLcBfEjMEYzYOLgVaIokrYvhujn3RHzHSYC6nBWNkVAmnFBGUiybTh0Jy1v3nAAP+e76gcx95kaZQj5cCTPU0M6VgrgK8ZZhesiTmnYwkG2UTCiDTusT/NBvTi4oZyHLs665XCPm+FiM78+UpT1mgm4jXPsIUE9FSbp3T6ccx6hEEfzHY64wCuTpvt0Q8Kno9FM5M4JWkcKAezv78POf0U7/7HIOQX44jDdWX69noWkx7zHV4wXl0Bg+joc6NNsvrqH3BvyHILV8SRN0zgFpuFfb2P+VVtQXmMaqMYxm5C8nrpYN/eGgY5OGlFYSpeu2YxvDBxr00QzZHNniygfurcfVNUOzEjlzlocsGxWxDSwxxYu7+TQW6UlSXw61Z/3GcUZsXQxUtaedSdIxeFPl3wvIGQXGex0ssLJdnzDcZXP7Y019W5uEAvAXECZPocwZcxvixX7dUK+8MWc5QLSc6IzrGKBU3aIiXYSQ+8MfrrP6+A3mHyIb72L/PQvNyb3ujFnsrPLN7PWzGg2+l5Wqv6HhcJkYIIKNUpwSqI2xoH+P8ypY/K5t27mcJx3ThfGa++QCIhXiDMYehgMB6CsecbtSXZkLQbbtINhHA/cVy72jipOryqdyc/s1qZTc/WC9+jp2F5Ca1t7t4cOjmffFTAjucjmwNvjc08KV7KloTGinkHbn9xnD0z0aXwFmJjU+s3IAdAOPRPbfuCaCprKn9Kvo80K9OXMEHdScEY/VzUZa4JZ5C8hjOgbUi48hEjPOlvJ4Qd4xLALZDRS+lpLsMVv09D9lAkDaJ71dT83Roo3bBnKNxzkZoYq7/8WSNtgq8VNomPhFA9rEd5QoC0KIL3wxiohajQ16AWFJ/rAo57ZA/g62P+BLKsKolgJR3GEEInHlLBRpFJuHYk3Q6cOkPFm9asunMn2N/v/P2Pbs9L+3ZW/gXmC07d7wNfvp0RG3q2sqEsSauZ9fe7mYVM4E2GwI9rWeW6CWDLGBLjz8NdEh7sAp5xzv3GEnztbaTwnoceGKcvMwt5NIQGwm7l5Ub1iWce77k74r0xs9tQSr253isuzDTHyFVhlYKpwTXv91AYesxvEeZED2dBFoUFZuFcbU1atHgktOeO3AybFKaRCKYv12NCTF8JByAI5QwXB0MhGpdaMQeltInBGdUzQDYsV8vhIBGXCWtRjkW6pCkHCqHYTKHbdq8lRTLfSJduPVlCezL1r1YrU7yS6xbOJkqHDhWfFcD1l3f+2FhaysCKvDVJJvvREYf7DFARx8nH2fsvdqz/ooAPhOUi3PzUzC3kUaD2vHRGOXXkvIkvpdM8js9LmTBWwBJNunS/sxp4vHarZdr25H7BkRKo9yExOIs4uQuh36Xxg+ZLAF25B0H5pGR/pEXEc/ZzFWOSV3ozBFMeAgoQZBP8szPkh2FWYAYqRAcojbzXPJVFTjiQVTzV+kqaSI1k4xUUHbvAhEC6UyVib+gZS2TJ0e695d+DmjxuJcAAyjvihsIIxtg6bDgDRmDcilYjJiNOASmsXuaKQByzkGyTBQkUnLcWyeYSo1j8d3wVcDCybBPIOmqfwZPty+iEw/eZprp8yxa4T7vLyhOR8oZ+nj0krHr2NUF1mymb0WaUINhpSN71feHafR00ckGtDmFhWDENr8oHMZT4VD6lLlVL1jDAQyAtQ8J+HRccMhIaJUDKKG00w8WyP1M51IaX5VjdB3QOQQbs5wskcRzZ3mniirrEiTsSX6x3GTZoKiQ6rXIJdhuSz3Fbs/5APovcBIM+ZAT8Vc3a099VUXBvvaxs2uQAz9mpkZuWjk1VIvptE1yKm/nOJrg1Drb0Bz0yqh2/G3wX7q/ImFqChu5wTOiCW8DDK0Y/lXTEJpYfEv7hKuV/mEEo43w+qCdcniGHSz7s+dn+ALRN/6hf53ZhUkir2bBel92Kc3P6T5o9gJqzxz4J+IdpWzJqFWmn/3b6vOKWGldJYvdcA+sKGlxVInu+d+ZAgve+xqKwC3uTjY0oNseyhTP61ydZZ0liPbXxId4GsR1ibqVRaH+pWsTySDolikIH7YJAT3paSOPtzS7zrokkJ/xSQuNL4OLa7DQMRnnIcEmRy4lDtHPq8Z8FYMYaJbGCwGEs6rXdRymHmO2hqwja+mPeyML5DOzW852jN+t8xpVCcCPUUj9ZeH74yfr7dAVdxCm34YYo3k8RpY2/ffMBq6kbuCLXnF4OtfiAq45i0j9isZn6wN7ueh13lRck6iJnIQsE584DG3fSdzZ2Qye4lF/4MA0D2zuswiSXVUH/qjHnAbO22bDy6kpbCZv/cXSNKiNwfOXyJgRFmuWiHu1Z/pLoqBn/cvkjMB2Sf3Tf1a+YxsGgX4kOx+nTJrQSKlGTJDBz3vQwPM7M0KElUhX5Dpie0rk1MbS3C4CM6Km2P4F8lpw5Ru4fh6rw5I5KnPP72Pnfdo+7x9WbnYHcy0OfgaCa0xqigQ+Rbiy3YUGFY3LQJCIULRaawERqZeiJaV5qfZZQ37ZTqewGwg4BF18+CP7xr/JgHwLT7tWWCjbNi1b20rAeKWGSoh6WS0XxNMGgYrhutE5PChX7w5Ue3qU43HWK5YAJLd97H8aS0VKh09M9DhQVtz6hExzQpfoFhbmK7IfyDKJeilSzKlw/jaKpGKJEUhlDxiZxrYuHaSHtWB3ScA2aykQEcCuUoEpgC1lLEU90617VRfRBE4WSM82OShLNi6VLNu8poV1deK/qxCwzN4lwdWexiyqHuMV9URzw0Gl8jehfI9WTNqWNWqC7fm7rCop6Dx+dEmq29E6Brl6YSyG8+PDwi+rt6KnRPYeW3VhJJV9YnAxDTuNIfHMrjfiobvoX4k7wBd81C1npbWNu/9J3Ukjjlow9Pkc6nsr4uICqGJkwdJhl4YX02a3XBTRNzYTOCp+fEh1abRDVuiilCshdKQiBCEmFgkrTEQ4UyeGhJMU6HTTXEySBipQ8ot2I5b9WnSYHKpAcYTPzQmhkQpi/l9my4irPm/kaRQ/lLxvrnh64Y2Vf0KLtkwwQhRvoNvbyuMRVq42EFdZrFTN+y+EaT8Z37c53zV2hh2ckkfwGceTIp6KUm7ucgV4HNcdWPuX6WT/fJv+xA//ezYVpg82Vgl/mpgT20igXg9wpaNKzoAL6Y0TIGi5gxEGcYEEhUEQfcIPNxoA4SlC+lcHacwrhur94k8WyIC0ul4h/Kg5lxuxVksmf7l5tGBcWSAtx5cq+B117zElVrPuDNEwwR6S5VrvEz3oXfaRGVAMuju4eqfQ/8gnzjeW34V8Wi+tEU/jq3eQKdvf6wVMGVCzp/NpcwbyV7JaAfYPlx30f7ru1kMn7xTVZfX6V5CvcH7Yqni/huK5s59ut4dXNn4Q1bbo8Ro5J8hG7BcnH/bdo7bpcJrlAttgYKNGaFSyThfVGEzIczKo/45ewoSdb3pYNmtxAU6E8dOHHpFCGg9ljSxrNIAy9WfLqYtwUPAZwU9XdLCx2hWn9DGPqHGmQMle8SrMHPylSOccIfBKRteobnCoPJJbcNrHJLwG+QrR2ad3FdkLroKCJmLMsC26uj9nefZe08bL/T4SG8LOWJITs9NNCWVV8UJHIuD7Tb86inzObu12Jmd+yWKTIxGyRItMxDtlubgoYWEarvcmoX8h5rY8ykr72C5G7xINxE5ARmU/6xl0R5CQ5Mil9RgGC7oXlZT+K207RLgHrb0lNw5kArptrgmAqoOR18EqS39CoTX/f0QwKJ3JJYDyFbK8zS1EB3IARtHBJ1sCh+ChhDtOEHv16FC259FiFglkgJXhD6Gf80hCO6Hc0qRP+tB3BbUHS8Z50ugGV0ESHPKZf7TaEnfGcj4htEmFfPk6JgmEQzh12cvzK7Q112Gh8g9qLM3y8ltAThIXON5OcgLtU/qKwN0vd7CzMZDaGlM7bZzI27aSn5sJGAA5UsNjo5awnO43Depj75+y+QiFZ78ozzHn/XeT4gU1AzxinP4Of5LxuzdSwhfym4ieTOvfV7i3DEE8l6+HRU6rVIZx/uH/mhbb00FhbZpmMF/58wCmGdMZUi/tIkfv5VZ/kZ7iJSgQGTcrRiw75rzbiB7cgeMmjEtxFxH4NQfUYTYwGriEPDt+1G6MZcRliosMcRN4sR2LcjhFIFi5wSllThsIEl/hnvVb4OdTcRLFzSmoUQCFAumTLmhLaiYUXqrSvxDM5rkIWUVBd5wLthQ34YfFhl/Av02GRIXYGlx+oVAEbnSTkbYlkJXMX9gxn25UrLw8KeffozFBWx4S/I2BK7Qzu/eP/1aFFf85muCipFY0THh4NmCuYpqN7FH6S/haon239Tq5iuBrF5SP6PhwJnEtnTNMxhCWj/wNd5yZmztj3p39vPSmgc4pHHZ/J3KV3hCqMhqb8AJaMDELNi35Pn111nU9XVXRtLXX7DcLzcD1E7mHYHWOkUb5hqnXE2f9SxFTKhPQdORd/N9K5T98SM7MAAcsmWd2iUtOEHoN/v0PfwIeP0mr5uPLStWUs3KLtDuV/4bg2tnP1vITQihP86nhODiPcIH6MnoaJ+u+T+/bl0MmJbW6PR2ZfvD8tv4D4544R3+99CkxcNhPkNvMApa+Qdy9DHitcE5+7Pzp+1OeiCb8FPdx75InNWW/bzuQG9yfsShCIubIVEwWfP3b2fhLWTijPYsw3S1GXOyBj87w0H1Zu0D17yI124l6Hey3bLVwPjmz5BG5xpnvf7Mf8qglB+Yw2M1HTQhd9/VzWrO9YU+aHd1fri4zxmxwt+p90qxwrNHl9qe32Or1eOtSmymLb9LIX6DlI3vJ/8/wNSQxyEdDTdtZTqSMyTyITfcgQgMOW7jnVtrY99pvV4+x0qsZ7wVu1m31Oea923UNfCwl4kyITWnv+fogToJY2XTMsr1EDQBd8qCRo7dK9ghL3inCuyX4aA8aiNgHRYs/TDlk5d9fDD5y4XPEvtgxofwf/eLNrdtYlkkTTJqm1NLNnUdFBwAM6ESfh5rK6xoGM/ZW/DZkTMQiH54sibJe/wdMqaDppE5/iIVEbtu9OTJNvTGzQ9uqfbrAWT9LwXlWd10pxjopO9cwSJIbFmwTrsxegNXt6cDF/hSioRYuGa8PAz1IXAmIMOXdhT9RuiI3bk8NgEdvytEIB/pjgQxLYbnQGyQEsB0aS35+7gy27jYgseuCpTmE8lmiGi4i6q9XrQgzdu6XJgiwh/Yq1a07FVCdOq6o7pkiYEap63rn9QEbXBox+NXH8WNOShS/Qf0+3EdMKkpp4Pc/sgWXlg8m4U3Fg8lEMyoB2Ahb+O3xNSM7EY3ujAyybmqMHtOn3b/3mi1dvBSRxd1YgQa5394aN6EpfGRpE844JTFW0SHvVVgm6uIsT6VETz50GMY+SjeG7cnirGTCH9zufM29OebJo+9ARBYCBWZkzUOpmAYz3ODTbWBcBo+yY9l3HfPryCDkoqH3UIIACHE6VDRQU/MIb5tP8LoIgnz57fBvvc0G70DlDaEFL5dfPxmOPclG5/H8Z2/080mBfV4Js9OMkUUocNsp3eSegDxCqeYzUZvs0fscSYadDbsdYdUwe3+mO+ap8WjLVe4wxq8XTASBLskKzkEO+xfyH8MAR3FTaSt+PUc9ydxKMCcqk903Cy6gb7lW6Y9xZCY/JdckHJ7JPn75PQhl4xd7hTZzKdDK725c1klpBGa3IHC79SDOC69KEY9Ol2pSNvd5Dz0bUzRSQ9Lkyj+41bVOR0Iqy7SUXoTfAKx5lza6oeILtg/7Ah5XhLgeEnk5BTMMYjns6821YL8ncOf8DHqDw5hA6xAXi7oMUUAD61rgqJFdKYZm4jlbmbUTSJshZ868Xs28T0VkVRisL1zc6skk19aMcAnIvBUyMY+lbr4p40j5CM6G37RBi7W06Uv8WRrszWpW1iW/z4q9NAUvqygzl5rChkuZIR/mKZdWOYW2j8posiWlW73yDZ3o3YIt0H+P4ovTxoEJwXHVP4DLgDZ9T+fLKtp6KYw3EqCBfsKlaXkO2sZT7Aq8DRItoe6mFzmp8sRypz/v971k41w5qwMVjFL0zAsV3nSOnp3WbXS8nR4uaBKKtMRkRMS7gVN/xtPpUvAJ9rpVPmzFScYTQAQGHf4gqzw68CMj7QCs/AWvonBYrP9FOJhxZfTQeg8I7o6QMm86zFU97+b+vy8lZ4tBR7dXMzh1H3UfbwhC7p7dkJwRKJZMyt6dQaHMNk2TLedeFPm1EV8Ahyk66/9Q5nbyFFebviottnJUijgkFU1z/m8XOzWcMPIj2Kh/9ruWwmEc16CTqhvrm/YEqBMJPZBwEZgc1OLtyGFPVFPlfa9cnbNK4fnXlzcsTMDNL2MRUPw3G2608y3Ud3a58pN166zAtAStK4zYBrxtoc82ETIvj5Rz24j7BVkNfmCCZVwBQrpsY3RI+uS2Xji1/EpLGmXGEot/GtGF6hHA8IpK4ruwhXDuzyTWwTsB05SD4RhnzVyyd1Xw1vWQpOwr6YaLTg7mEQS7qj232h6kpYKrdIae8LY8MK5eOiBzS9kuRWR8YmihaClrFtrES++Xmkhxv9sKI6XoX/opSiOlJlIjZgmIJ3elZwkSHxHrX2PiUtaKpYm8tk6srlkgFZFJYYBUVvQQi7vQAbzJnXTaDIBCaH6aW+VQ5uLzXBGsKWvCYyIOxAKtB+JbE5ZIbBSTCTbhaEQVh9iEjTaFn5S2dheszS+oX+cRrT0904NdiJn42gHPGVeSW4cqxHT66LbgIfJukKeFD/KHUAhY/S0oYMq1Cw9wapFc50THRLDVAdzIL9fdZ3iPLlL9pE1aN468VUmNCUsRHTizyCgio0XEVZnD3innNYp8VQl14kBT0HF73eHZAqKQLI3GJt8zdJ2WcGur1eaPWKzX0h+3+gV5nGXNAiHxv59ss7OsnxVXoZzK5KXoCyHsSEE/x4St+N72ONStuJajKSxjHWmCAnYOXRb/hu3jlzDdweRkYMZFZC1QjVGhlcEQG5y17LPc3jFVFGwsayF7MDh6gjmX8JQYh0MXX4EZ+E26h9/GWsMQwMpikFwmvbPb5hdw+M2Gth5j1365lo+MW3rXq1qZCz+h6ahHoN52PJlH9hIfFzOuVRA5Uf4U7ToC7ELv3XZvSuSnD4TYyX+GWeSd+iBRridMdPBo5TZGACaT7ePIlFNRhOOXYAUPkbBPJIALm+9Ad69S4Thep0VyaaEhWV3BKNNGRi36S8oHLuWNnsYVPhaFBPFeJnGtSBOghcSL/ON0lUpMtveVtJ3PhoheczCFTkrWP960XrL+n99O1YtnlpuYq+/LNf8lLzJUBMQeIOfYeKutcfckWD2bOMwLgF3FY8r9UzsszX2/gGqIGT3LfU3Jbm3eoRQQFCrg1HPlLN5fitomjksn4Rq9FoWEB+60CMSEpNYmEElGVJaQd8mKlT7inMQ6MG3qf/zePbjjX1lJ6Bazl1a1UONR/rFHjVmGdX6norJiMI+IoofekdAAvdwXKMy5lpbcJXyJ7yiHAbaei4CZrKO8DqtOb/5wVhBbPCUrWNMO0PxNH7CralEmh9tRsComxHZuT4qrOZztrbB2dRY5tFuG4rKSGoCEgoSUll8DkqbtYXi0kTsaZDNlSikqizbNKUDhJ8a25FvA87Wc4reMknzlR9sA3ZfNXMartLdsl7/KMGBmWtR/oFxhmd1moQU0hhnsVpSKfIkByxKfQnlZluEzI0BDX8/xT2fEHKaaRlCLKLXBPwFU5efqHXVF0E/ih0JW8gzdHh1Amu9J390YGNa5oSEPcnRmr0o8RIPJIJUprAvnQEDAh6Jh2PyUtSaZI0C5kcdcv3ALV11GaS+l23/GQIQqstTNJOo2aJwp6qp4DeRGOJPdQl4QV96B8P2azTGDgGyUtvsI/vN8Cdu+ozMCV/Iyf/JKg0JjqS0tdYJQXoqxQNMt7wUcx5VY8Ss27HYg1fNVcPLM3ha+cKcFLWebQkNzeKO18cOfKr8Pp3CvE1zibf0Ts2BH50S3CBqD+yF4tj1O0o1JnMhL4WBOl4RXd6R3iJCbTSBRb/ncANITl0048LpOxvQsAumCFk5wdsCvtuDtkhLASqIe3UZwQeVAgMQ3lONBHiHOGsd6SYSnfpai6fpTJcwk8/sFlX0J7Sk5qOx7WrjN6IWVy2wvhj8MmwF7r6lEzRRlx2Bv4nmYLzyuJqfYvNL4wtnIYErbHsozShgq50TQ5wrvcK9EzNU8Wy0leOqQkojzN9QJ27RSH8VWvNLhpFspSN4p4irDf3Q30ZMCzrwbbxVHSl/LE8TpzMzJj4393muf9ld8hgs4uyNK7GSP96ZF0BT6b7nrvm1Y6gpry+MoI/9qCOKgU16fYFyQoTRR7weg7lgHFvGp++EwCRyhDJvS66eg7r3BBP8K69P9atTll4qR5O9WTHQmelZzyEOHIjK0OPTj7SneSwb/SJauCIzRW/7WL0MOTCUuGyBj0hclj0Oa+3ytVCVxDV9kkGSNdclrysEl84pqu25Ht5QQ89raXp6gvfyZhND7zZcFsv4RG0SEUgVAKbBwBcHIGM55X0xsruDOGhJUtH7WEq3h6lRTJpSoZ2RHuUcK6zzeN2M5QGuKnk8sERk4831PnPTlVZy9K9rEddrou+RoZjEF7ge8MBTA4aUWs+wzUP/TJZHdmef9giwyxEku8TARvH6SjsrNP0PiH+4BUsb8t1r8hsBTUp1BfhbEkhdtvunkGufnKdqy+nn+vnTD6CzOtSeGdOnz/MJtTy53cnh8sOLXbx5LjVtDkl9jVVmAEMs3gf+6eswU1rYodHRFjLr6GOawM35Xdv76WWO8DxLj4gjEBXmp6TFpOjCHNYVLeRwrpTdeW2rhefise3+YBeW4NpkCX47MfCWPELDlHx/BleYFD6/BV5oEZ2XnzzBsCmV6EiX7fdzTb6unqUbFBEAxgM62hXfXZiVHh+BP//DD7snGO2LyCrBS1QxlSnRyoKBLO4LF/vhu6NtvCAN9sh3tBfHbHNyqHCOK6VEuyWpPbKIZsIIzHGUpg3h79lr0ZnwIFANcP8eDOByD5neLQax0pJddr2Md7Z7oZA5MFSqI3GQLyODm6qrKeAUzJHkJVnVa6xRWsmmcgp9G8zwIWErfSeT1uD7x8Jiz3HeVlkViGDbcYW0ca/AKtUEoEJVXAmVbpp1V1RDhc1mjo2qhED3UO8KmdMZJt8aU/O9IyNS52ckuVWefr5Ym9h1WJhat7Qr0/8hywPlSfGMKsOXqUI9oEYJuLmwYLD0+gvH8GlAIGNoSCpP5/P9OnuPwVS/LjEytz00sMUbUjInkOItAhoAv+5J0LywW+h+K9It4RGG4J19T5tZzppdG9U706S6aHCTizJd3Yg7K7+QV1+YSkVOq1NcpvWyU7wJNbRtUDWTsYrEvuTaR8gczFG+Bd7Ni/NPDqzy7cZSojs64QMshFQ72aLBkalZr5aIcZNM/IEj6dFMQqnCpK+8uqhGMcafzLaR4jr90cKaH398hmrdQ3rF6Ywti4N0kfoGwF/5wlTFgLsAq/LOjv9xRWilQobgdR4ROBe1uMhq9NCMh0ypFhDaPu6QjbNsEYgV3XLGTL7Naz1zjiWlx4UtDYEc8rnGiOcDQzbaBCzw/wc6sAJlzzp09ZrP0QwjX0lhbxyhOqw8VH9yax80Sj8ij0TJiWwIZcphWQtKuThnAYfHowbFYHZYOD4KhR8aFBfsJtAi4mmOOdVGnrPfLPbyGL+VPGuTZ2Eylbi3gqQFpHKZHN5xu4nHzCNV6zlF6uar9UobKZAe8kIqkylae8HAYXaDBTWEhCb13YHvDYLPE0mnIlKbYmBNT4j63Ij3IGJT5Ks3lJRqevA2ZlGYNwWuf1apBvvzX3IEnF9WHxas372Jq9LfzxEiY2OyJsxJW5OYig0rGy9Ij8zZ6k9rwY1LHVt7aVk3vahT27l+rRMM4wSuVi35G5rvLe+nA//Ke1XyPnDAiotXL6410LElsePnJD0GBVk3FmwEroHb9q74mZc4W9fZ8uSURR9FTqg3BvMpGLYitpTWT2Fcz4cRQgl63M9qG/4rP0wTkyH6FFINUzejUdB5HKePpvV1YeUaPAvMYDBoqB9tdcQ4TBDBitVl8RTImleMcEL2yIEGfkHInGAJHHfpor/yUDRALstG2rXdz/maVptEoy38DxjJj0xbJ9trgKUMmUrOZA7LGsdgxXTc0ICJw1Klbvn4/O5NCAhbX8uyenGB8TVyMMxlAxrC07BmssEFbPmMRP+M5QltQydT/4tDKDMMQPXKML3ncxT4gEXUhREvHSKB+PCE/cyRY98IMGd5JbrzSSwHMTd7yxu6oood5XxMi7nl6Sz6nYzKf3XMF5Fk96imtetPXOPzuPn4MiV+UG1huHS61ME8igUzcsn/2yT0wjDy/rqFCe7eiQPHxTtDAwREwXqA9y2q5eg2nhWUVbwJWtRUSMbxk+9s0g7ypX+rcArqFMQsqH5PA//0VcwcU2BteiLWNtMSaXu73eVg9Kan+1nSU/0lCJbsrka8YNMjyXw8D8IGTUcMhvKbxe3G+3Nh6bYQ0DBMm0g2AykuDt8TWusZ53ULgHgws9u7LQbU1YFjzvlYUKUVfRcR8MBkEEpeJ/XgyMqKvSqe3DogMznIhhFEfI6ZoQzEK7GCM9Zzvs66fVv8adv8Gk+saoPXpYXL1QD2in4PbBfgMVBQOfAhCR6zab6KNLmOUEtB68JctgsdtY6BCvABTVilJYpaK7KE35S+nyNddr5Vku4YPzKlNEAkZnvFWN5mNcTRMBJoAJ+2l87iUhbOA9Uo5kuM1W9JJ84MVtyMliZ/y9Ww3TDup3GgW/9w1X7KZgqySKIHcqGrXyPsmp63joCQIGAAxPV7z18JmQ1KEDs3WSXpdhAQFOsUSJZ2fFWVJqVqp8UsMCKLPiFAWzprllJU7Y31ip9+nV/YqzLm4/ZVHy2VmELifQi73LGJXoUqc651fPEwMXXofOR+qJZ3h/8SUbo3UWGoQ2m2J9vGIMLuV0hwKF0vwBY6nMm4pN9wyJMWqSgxMXMvbGeE/BSnzg391cJdYF2h0XXOgZXlrgY/fOFKwp4iqlebtUm8JbQO1j+4rB6bCR48Urzv7wk/amTwqGx3owkHZ++npAQOQAv4qDoqyJUGwCpr8uz3qqrXJ7YAsEVqQxFfQtiUYMWSKUa88rBR/KT3t3LC6lI8sW00PHgybTRtUZMbOkGz9axNlK41cJayx2HqItqkVt09mrtSv0I4NnLhpyv3dHlCoC6WJ1strgpMUDjS0KbszcQamTPNJ/pBmtTQydPKObx3VhayCDSO1Kv6G3GLGyIjJe1ybJJ4KgAg8LoWdfqZeKJVQzBEP0ynDz/8NGLlsxs/2YyY8Veuw+rA9IoVhGJv42YjbRcX8TNgLjBxCZDHNgCm9kz8Y7+eoMtl5dlPv1k78hsvfvD733/6CyVflN0+2CWwKv/H8YKWpOjo81YrQTosMKhIIM82yYDXZTZQq7q91RIKT9XRE39/RMRKM5lWY5nV4bwfdCk7DWE/Z/pcD6zKwt3JkE5zT49JbUSBSnGhKUwoxVJofu6DqOT2LpxmSz64fXwGKyV10my5jO9fRRm30UCeqekNqOdxiwgW9+AyCfS1VFixtyPTQ2uYlhCvv78BNvIXvNdFVOWfDCbsG1o+MAspWlvZgeeOREgluhOqEUplBsiZ2JQGL12HmWZCS4NBT4E6G5+MhFGDWbtzcmLcZqttUc3hoKQcazokpFnqvaVbJ1XQxzFe0vHlZBTeIO49Pk0U4kGSoT44p1O9oXJQNBE7oDmlfyuHtnWRzlqxebmucaaw/PCIYx2BvGYP69ZgYtwyvK86gBoL6fxHItc2eTzFhQOLv/zr+5e7dx80igmktOrspaG3jNU0WV/0fN1nAnkcOYrq9oVCmQMPrX0E4YzUKI18C2feAXwc6SkpBf9fmIFG2g3Zwa5MNf4HF5PCBDiigE/pYqNztaJvE3/uWCpnnzS0iE5Z3o2oFNxeggAlFyTmkSVKZ+EE0fjf/tIGsivzzHCD7wkbl5AsUq12i2YJ0kof5EerDwb1E57bchsefVaZdLC9R7u2ewPP82zPnjMHuc/5e8uJKHdZiV66nO5OXyvSpiZpSVtEndYBnhxVIrRP+CtyBjhMc8SlxhsXtHZKjrmLDR+ZXNSmbHiKnfyW3vwjhsQZ26O5OyFvgmGxnZ2jF2iik0uwkL8uKf6VpE5+WEx3tKwCs4dks8dXmhbUxmTjEA75dvvxtTGwq7toq/RJ/drDVP4n7sXalJB58HpF+tmmeCq4MS2Mn0MLyYNkdb4WreHRayC+H1If6kLdk5JrhzLa/WzW+QwaEgZColWzSBwaEagPOvGsss+eMBv+pDdnrp/0yXWUBdhTe6nk6RHnb9Kzj+AtPD4nfnqNRugPppSwSu+aOB6+wYaLErJY0+FDOBMJ1StJ3BVI3dccHT32LFstHCBtfrAbgmG/KsEu+Qtr/O8LFvBZe5Shqp2tRh2vTx/XkgCOR5BvgowGyK7C9QVCVm03IGI+6vcLcckCMGOd4wRMIai7TEDxmOtwXchQFWT9D54GnUWe7ERJA2lDMfyKZHUEZz0ArUMK3jWF40r9TZh1g84Qwq7lYkUx4WKOuZSUgWYxY3NeHdYjA0PvbQlQaN56ndHdayGV4TMcDKibvpP/NDitERvP9kAJPLzmboGTgDLmTgDJDcTl2iIWzufmkIH3UGVurFAtSXrLZLWpi/e3yQkE9Jv635XmhCFjpVTNm0fybIXKc4QSS9eXuZzzh0Hk+RrgJtccX75Qu7j0n9zq6+0LRytpxzgOMSaFUA01T7aZ7MxXKKlavI8uou0mdnhrosB7PaQW1X0X2JNcwoTPCZqph7jTMHllQjgIRZ7zbEwN56fOpRXYIraOD45ma4i/PUa7USXmgNlbLTGIh4ocKoS17/X+a43ePn0Kz8Q4nJNwcf9Lu7ZcvULvokqT99S0WBpAr2WpfiM7igsGnHCtmrDmH589gIDbVxQ2ZJ5KKIzYAVZyUxTSDDdZfbyqP0uhcHj5y1PmR67m2cfTcdjKhFPrcoxzUDHCNKLWCWlnm1xg7zDt7NlwcvFwCJjS/43n/us4uN2HResr9b5/Bu7nnyO51poPKq6qbzPxQBOAiCCo5RaVqgoSht16ybJropzpatCREl/17oICkfdzN4k01cuVDwGCs8JbaPOxilOQbEevAZu/xbFyVS3vzBQ0pd3NT6Gg7R+m9JVCa1RjwX3dUiXY5uLZgBJlYn7C8RtGxzGzcbxKJ3xG3MALNMv/QtdEhnG6Ldy3hps73niaZ7gBavIfQscgtHmMcXysCDNkw+Z9259CKf7B/szQH+oN02T+93ZPcT04UCOrBAdv2COsCHHprjNKDQvsRCmdEr/cut3D5ZlnV5ootqRynJPssGWAsp8vxHu8ZoPIKpfCYp1qAmPI+AxpMRJTWRfjlqg86QpCFMe2raxbMRA5gAGjiuszo/XAtxxQX+gSIMjdySvwZyFo+3u6fY9fphgyGpcFnmhD9xmncMj7WLGtSgzk0L9NvmKSi/yp6w9GBzxDgnlFlVT/Ac4tPF0bF/U00j/duHAeIkzhQmDdhJdBkFj0XzPI721mVOEkRVj28V9YPatiCpHpEXhWhFKaxkj+bIDGe0gKnkCtlOaCshPyKLrqoI9Rii3buK8gcQe4+EoSoO5pjxF2EBfR8mArJnIa5UDpzQuC2JSqQXAGWfaaUaWEqKlHmZHSqluhJLw/iA3ovRirMZHUDiP01C4kDVYqECIhMfQslxnpQ2T4p8Y4DPAYcuLWYxrzgiK9bbWGSEPsabF0kcgj1q9WTqdLbPllknrn1TlVl0tUM22HOn5YfWRoEQ4GYNgnoKyPtlNgtgo2z5u1/C4Xcov2iS9h1OqYHkEZNxMoqsTWNmMJRAFgyB+tSaz2+nd67fHMnjJb4rHzwjMnKfikyLxdoBLyf4N5rhZ8uvjI8p0/5DF7RzPUr8l4RV+KebQj7sFCmU5H8iL09w3HIkKLObTPZoB5OD7t8Y55oiAA3u3qnjj6nO2JsGauiJpdz0h2wOexoA48/8/JqNs3yblHztNmpWvSOjNktglKRkrM4I4QT6Mxuy1XfiFnq6omEhBaWPaKyzLhpJzh95luDiIRrXonPT7T5lHaNntyLbggBP4MMPH4oAbG3gCnbRjJFpzLAv7k/k8RAAgF/iN1hFUoGE4UWbKmZ4n0vSgwuEPjFq+1D3ph7b5sYpiy77WerJ0BFA/FoWzqR+obkxq32+5A8Rcw5wBGvmKgRKqidjlQdV5yHK2xA4cnpcFdPXU7iMX8TesIARXBRJFfB4/DaRR2mdx5z7wg6wvHJzoPZ9K5YTA9e5WE1yxpzPwHhg+pHuaf4Z7gPzIMFHLvsXFjHIaFwQ7u3tmc53+a6m2q5DCXtXsi9CbHrA94uxUAsdKWdecK3pvRq5h+Ll4XrgbAEAxAdsQ/4Z7pHaAvomrfZkspnX5MUBYzd7DcWg3AVUrHvVkyi2r0+5x0BwZcMmlcbyJ6kFukocIniES+3QkU6dyiEAnUILK4cgpxOFUA1ghEfToYqwsX37YLqre6tLKyvAJbRuanhN8mKUJRMGUdAPoJ4hY/CyuNQr81vt4WpcAAPBfC/6ck081CrnMBFa46txnhY/IZLNhejYMkO3xSrB3eeiSiydFskUakSSpxR08sOJ3NsUpIJ6V8KkdUZS2Z4V7lgvm+EvAAM9fRgZUoolIkguS97haIBwJ0Lv0Dp7JyyyztuyX8/sUERSMee1rzispYR3okBSpDE+zGdR65dLDfWJUHflEhPYOhJFsEHE3+4v5GoqavPF9G1Hm/bG+YYn+AIFbSuyXapHoilM8jnB3s0ajaVyElUlxYEU+tG9lPm0LmwLhR8rkOTXhDPywmPLArJERDVNH6c30bGSG1VBxAeTSsV24vmgItoqz+I4GLt32f9Hyjbl8hvMfunQcDW3wa9rlJJB9Wm3PNIHgWCMIczs626YMkrq83+OclYyNNrf5ZpULV3EzvfgI6x3w7OWSaODjVNEjp2pZCWnmsXDHSsKCRSmEU8MLDdpUYpHZl0A/3fglSkbLCBgky3aJAl/NuAGm+InGTljSeggt0LqLFDmm39DjDlT/u2S3g+R4a5z3WgUK0bZdrUsOFD6VqxN0QAPKgIqYoSzpNRwtC46VqNjlrKZGM85CRa8X2jl46ygJFo9szobAMGazPNRubxT27gu490YFv7eIh/zbspkfg0jHV5Kk34VeAfRMjD/UbjNk4w6sE5Bpf7QWww+3A/XuQGUzf5Ayp7YdrbZDwBNX388mWCXcDcvCWBysGnpoMRPGBDC/i1GZKFn+/OaJsFiaiD9Fz+W8v3IDXIemkQJ8ZD8X8eP1JzxRoUrZtyqiTCEcN2KFRwHU/+dT7pxZPlxuS4GRmj5TYc3712o082FnLC8dFjAEoLzmQds1e2n+QgaqMrVnV7cIzXTZQJOO4c+6neIIWV/yd1zLRSsVlWVLcdc57ryDjEYta4eO+QuVu01yBMNhrAcDyRdQTXM5CgUvMgJl7UOpYch0APcFFyF/jOTXpgl8s6UiT5jNighTuJa4r4r255D9fOc6Mp+GrOHyd/Fs5b//2qpID/0ns1cAAGZeakZLbc6mLrIeGSpguNwiEVx7hgEgjC6cpE6sd5vG34veDYECCDkz+aJ4Ejuw9lauqeHKDvcEHKJnQOC/uVxIX6RBt/YutFxaQ3DGan0XzpBnyizn0DsYnEPa2CAFoDKibAI2LcldNDknlquuG9UiANUimr/7O6Y/C44lyE4xuMsF0V4pyYZIg4Kkr1BokfkqOXyLAwrIHB1Lp2VLVnA4z4BDktP8WChkElf/u+IoD0EBFJpVRKYqAd5v3IkIbdzFi3FXIA42vb05ZkMp3bz2ojN+nisYpyBkiXK0VoTY6hGZu1YzIxi1FIb0zmUMcAUmyhEtM3LWhpPoBlUlq/ejRqV9G2pBHH3K1AiyfsyjtR2AaVKvUal7KhmMy+fPGMgbvMZ1vMlnm5eEv+YpqFZ4UgZizxBhtOuY5qZhwTPxdpg6lrGLpmb2ZXcX+0vwbRLjYsMzeLZxclptbgdzZ5yOLvdFwHdTKEA3RYMqyYIsxWVpe+6Fxt+/Pbs0MkMbhaIz+jKcGaa//hR35Sado3OWRZMjg6NTQqjZWqmfl6x9oSiV+QuF+8YU7vPLa2pAbS7buwgJpoCMHKNCgJiwk83L7MK+iOX9d1k8FZxFqqDaVNaNA4ohVKQYQgUq4yHe66cXXCqgULgEEVKhEJjOfhgLQsySNxZowmXUsd0gQ7pWaGLBDTt7QyL2DW76uJsS3OlfwQVtXjUQLSISonXs9mPIWn87dX4KYaVPrHJUX5vw8KK7QCFlld8OIdRTmUentBi8mDEkL9/nM9UhKjiT99kwvZx0DEvt7dbCME/1Y85D4T8DQbpQJZMH4CG0Ecw2oMQL22d+GI5MDKUbFTo2mZFLFm6j2PwgoSfZ3RZUNogUujTZNK+U5tuYVOWX0Pe+5ThMAVCSINclCA+OpVBM108fImTYeCNsRjcFI9CriLizgp56bUIKhOmL+LjKifPaOsxbm1YGRn4yRRPTcQYrrQYYRG/GIT2WdrH0vQgAIBwDLiGY8EdilL2LjEZ7fUuHyNjrjyQ3yYxQPCKelKSHhH4f9Kohcqv0ol2XwWC8WHcBpf82yPBac10oScXhCAK1jEQHJNio7gVR87QHAMW6YNzY1NzpQJeORVDi5hZKX+E24VUBdx2yznrOEn4q11XEbwyokwSbX2x1IEmlT2bi6ugxUVwQFhLmI79L2ZA12CWKz+7BCqR0ictMW90HBdNPzo4JmsNRleVjsKXtP9UjsfQOQeDghm4UTrdYN6u3TR6jiaM6T1MiC+vyePvDr8WwBKsYjKteRm8+kzeX3zXZqWHvxjIA2zyQA9ViDCNZpLAkC2AtNf4sRhwuY8xfVPr7PUc9j9sVauXC7SNoQD2DLmupL1ffy08GfY8uNMRmEyI4CFAQQtQex4pFP0HSjrOPBp85R+MxDhq7F0JjubYP8Z1lSj1XrNmar00jx17Dc6ZxMb0NGvD6RcI1T3Mg2Ewi0sDsjWcZdfbqfsk3QK34ym7lFXa+9eRIO7vnme/UIsf+xxihWgIBwqdfb3vfVOmy2LKTNAbLsvPoxBBAl904boV8fI6nDGM1QAdZcerOOkkkVxDAK8Xpg0drgKDPr6xgTVZYIK+quZqu9hgDeizIxWBBnBWooyWONCSAsSDK/g7Do97KfKyhw/HK+CKmFx/jwawXibhKdLLRTvBwEiAoudWxlXXh/Gr3AwqN2D2xJACu2rytlUF4f2l8fmUja5+InDvGlC3mvTUfGtLOHu5u0F54nhXpUm3Mxs2CmIPJkj9HMnVmKxKeiAcsLvJl8lD+fiqY3/TRogerdKn/2XN43NfoiejC6DrNQKwmKmpLgzFUa6KkwwHJyknBc3DdirL7gWMylzvZe7uQmYXPRoy1qsUFGDJ5FIZzBSJtggg4/dVQ/JV3xLymV7ty8z1gVsK8iikDSHZc28LAoU/aFisgblk+SxuzhjGKAS2BV3APusqfvHvzFootpSNuzqnaMcAA17lIQj0NshBhd7UOGNbJrKNMUa20o0K37uHo0HUP5VNVHf+gT7JlUiESxA36WvrSAOEgR4wF4RyLB5fmVQw4hBAdRUXPsBrbWihQy9yro2oS8bS4RVPN7spawjfUjtcpwgbjaQDPTcZT7nxQEfU0GXvGGR3MDVuarfnwaztR5ioATgxJm/Jkz9up6S0wlqncjaxCwzMqCGg6VGIBwTFQhAVQmOAS30+yMpVhHzOwgQhI1uTQyWUBI2UO0BJ39Q7IQxNw8oYbBGKyolBKFmYttajjkM5y5Tvvr5O6xRmADnRHlbnV0y7wRtHz3h34/HqZYsVDI0E9tPmgRChGtXGpHxDCn4VS6ZLo95xeZPne7gD3ASmMguaAAqI7O3W1CwKqjWR/tQhvuGvMjhBLXMZzGhCkanTcnCQBjO2n/kzreS2JjWGPylhTuehm+V0xg5akH+8953a6MljYxNlqWh5bn9BxoPo/wCTyufV5imPpcyAC3WSKqdOQp8UFQSDcSAsi2piYT9SJq/sD+S6jZQzXVdifWIHGn+80WiM4Vd004R9vFsLGVoX4e/37P/dDnAkcAJqob5BZf1+3rMqh/KfOM8ByL9U/oSADH3WCd1Q3RQuO0QgCxTOjmqPjA8tQBlUeOioWOeZ9t88fdp29JXYr59YL7vl6tha2ALcWzpiwxamG2WgqPm3EAmJWC4fbF8fSmZHJOwkItMWHfNJ2r47tuRsCy4IGgvYv2M+1W1rEAJcI594On5o0QZ28mcOr/zhlKOw59K4zf/CCntQLY++jg5A4AkCiucGnWDODH/WFEhUjc1PWpD9ItMzcPUqmyNa9eKU0XqrpDnyV/yxk1xP4RsJMojgIAjq+5ulBIF/r5CSXcgbHooBdxaIX5FBRqkbP37DeS1HfiaSkiGHcsGTjwx/jvz3XzF3zZoyFCfiXanxlIHocoqrZz09YTtVjob/EqKT61gc6eQebOLCqNHho1qoEH1SFHUzvyEdy9YiKRE8VYJVn7NWDhMm/RsjWF8ct7qLZLmy6kfwVIwUJjh3gN3lEYAvquUxlwH7oqx6Mk9j/OIxzTRaIDMNiVhgsPt7+ufIc3fode6TkyfytF1vzY6oUsauMZe6214d8TLmfaABqhLiqYC3Qw/MxL152eDyJVkn9/it8ssKC9WFeP5och/b/tfJNZ+0hrGymWkvCOGW2AR13ezY+L83yNK04zZB+zm7Zvksm2KMtfxgfCc4lHOKG4cPWPYiHY+/HamgPRjXu6/d02m1skradYsY+Pv0hF8ctwTE3DHlbOlBk5H3QcjiLn2NGbQ0Ukl3b6kmg1JBW8hfvwY3dk/SGALuQw/0q60x1JfxbW+w9R8PQH9VVXgcRuQr1GYup4ZUZvnIQAqsV5g4sYRVsEibwWdLt8QkWI4vEJSWZoflICHJhxXbo0xEuQy+Q6L4Kr84BHJnpNrZWWWOSd34UbAuGuAMyt32+HKBDUz6CQaho+RY4DL3VhOdGvzkD2PFfCDclNwYaFqqSzvmqctLm6KM/m89P48Mm2n1Wh9IhIWNuo62nZihkptCZsb0scjJxuiw7TMHTm0Re2YA7aFDaOh0Sn6FE82rV+7o2aVMUVnA52ZwmGvOHzsmqjZpPKCGGvAZBI50Ve8w7Un42L23U0OEJCfQwVwfGyi0yrAeJhfMCXE65DMGWEMu1k3fxxD9g9fTrzNGlyXO/q+YHf2RQoefnyAewXU/y398Q14io8GjQBfY6JzSnQKqNmR/5kFxn4ft3SrQaixfpfvv/f9bXRdhAt9xBcCXuM9G7v0hWhpQ3lI0HcgQAK3B8EBA60JcOYx96J+2CZD98+c6zbT1wLrQq6OsS3gSon7IXSkZ7xiCgLgKQdWS+4SLl9FHw7QBtG70oV7wMABmKwiLRQy/57lzS4FfJ16VfMrG7H+8egV2HQC95NIRaGuIKkEddec7yy8UoPSSuCxYCECMa298ReCHXvsBOznaRPbc3XK3ENf/CPyEWgQoFY5Pe+hHLF8TcwdqQv0+6704kLwO3l4hzIvAf4hS9sMthMmwCulS4dyjA0SlhAVhew2naPxixLIOxzcoY8NhAcITZMMEpgz5eUMa4FyRxZvYz/kFuzno7cJqKHrfIS4SUxKmq9Fdgy8GKPy3XYbLaqVlRShrAqxx6F2AdxtlgvAKRG0KbJg/3zfQ/4fsWkbseIAjsb2H0XjCgx+15HhSVGqYO+jDBEjs9At83pFC8APR0ntuEQt6Wj5+AvR1bsKoGdHjnwtEx71Pzs57lMtr4NXImSxCq7Uf/AkzUrI7DTr1IV+AMuL5P2pyiPRvNhoL1K8oufR/UlggwCeUqZAyIc3ewhmUzsQF/SBhDIn0QXvYfRCBPej4vloEMI05g33BQmNKYG2wV85le/IeGlXaD+40dTkFnum9M9X0ftpa121KIGJqcP0MzYEwofEtw/BH772xXRxIISuupmvOkJy9PRB1tJ3O72DV3bDvvlTTi2IIxzhws2N0JkFmLQv/YM0msnqeVtKx0HvI/gdOEd2cmZ2P24VDZotTquwuH29cA/l9Tg81fjg6Il/dCQGIcPC2N7qfid43k55ZG+yV19VzSVaHHPC0rZmRfiDxrKxeDRsKcWob7PbngscAKsKA+C02su+oVbeqX1H8A9p3ghnKdWJ747jONg07wigboMUXxA2KLvovTUJ0i2lo3XukBV8hERZcwUveRz24C4ut2qUwwZ8zyeQtip/Q3UGmS4/d3IYDeKvOE/0oQZyFK11JWFdVIAA8BvEPfP/tc0zMoA9Qd2F4GN56VGdqdxqN469JH6O4Gb8JaHHbVxdu3bi6tM3NfW5DGcqHf4/w58+Pmr7FjF3QCRa1XVk+M9C0eEFTu1U5wm1YPkLGPOUSo4L2cJRIXD+sHNc3fawXNyXRATBCvsk/grN7wcAbZsElL6y3EFbKXvHoMOHU9KELBFEB0rf4491/xfcp5uPe9tm/SDzB348Qr8b7gszqbMFoPsWMesKGZDQEEPhb/yfklUDAJ6qCdqxI+VyLcMvHLhDhdhz/xxoY8GhGJ8eLp5dwfNv/9aOmhfu0f6L+7E7ExWUwdLC1hNzpFzu61XZAyXzdehlF8NU5eIlMl1eNkgy3WGrvgLzZ4Yl953mPIJlpbEOb6Wi+VtJcvWfwW8/4BQJpReBoRG7lxalr0tXIdTV3F0OV4Xe98WsIQOscLPbPTzaF7SjSDxb3CcMXsO1JjwGSfEnmN1RAAGgV3p0nGmkNCLhafwg3hwOXQe8SCMZVEDivwHibBIHudChsD8Jg+QJOcGUo8DsW1DooGoZbio5kTZiMUoN59BueebGQ3FEBMOAaNaxuAAFhcBIEiztgsrzvNhptBMXNhTBcPAenpi8oeDUvqeUWGt0nRSd4HgSjrgVhXvhGlhry/6+z539F600MdbqZbgf9VpjL88SRY8dh5qZ4vtAGBjY36nzz6X4t5igPYV0y9nwQ1lRTpsiutpCl7GTecy7Nk1k6hjNuijnKgyiAn9rwsYPCHIjVvG0mBq0ut6tWHsWfn82UYuxcbhqvfman0vqWbHdDFgM2Qz2OEJ3srGpD9MhUOwjmW1hzftm9jXt6ug25g9d8q2xDlxc2w0X26tHR8YE7uYUndeVWHz09BeSsV2798FKcZZb4dBZmlK7VLCvJ7vMKgIn3Xk64ED0qkVHrbBZ17Rj5fklq48nv+h9Tq5oCUz9Bs6YoqMZAkRXgVw6o6IuapTM/i+dLP/vlbx/IYBne7d04LIfjiwcmnVVfWHVx/4HixdYM/BiI3go4dDd67MjZAkCtn1usG6jrnicFW5esK86rQJPenbmRudByx8BkCBfg8L7d1iTDNhCO47f15OVuyNKRqtfgM5CCuFZvEaSFSUyJybnU5k0AswppxYcqN1L1Zd5XVd7MeQJjHgPkowJyt9TD8h85N+BN31qFdbS/0APpuZGqP9LbQzyWFB7/97zDFEbw0BYTPcRF0m1gsfL7Jdi0RZ7T9KI9S9gagx1scuD/65FLlf8ebMUYauNOiBkmGvDFHT1yftekNUdbEiEThoigEfurM8/acmxtrJtLGP2mUdooeEFhpns7wqBdi25JDmxrjQHRroJZ94x9JUz7j3N+S1pYbUqE5MGgfXvv9DnqCpPcKCv8N7usairAvCwUnzLAQN/QcdptYKaUW5G0RaCdZ1RFpviNIpN82yOJvtJKVi/rFfDgIq6rQAWg8dMOEgBY6/59rTFqwKeiTa4HFKuHNSnlgGTqZOLVvv5Fp7O+1n6eQgyonscKBJGYi+YIgcKw6e0QmvEoshMeTjZUGTFWHlyvituWvrDqKNioM44FMZTzaXUXBWRt4JgITkiwXSmJnU7m7jp1l6qNzC2V1dpK1QYicBheTEGdEbgvFhotqat2bOH11wNc7t1OszlDi4EEyPJa6RsoEKP5QV8eDwdCaHq4yCkUo0XiHlt2dQ9bCQQKONjihRdB5+M5C5iWy/VwLB72E1CUtWcAJuoKzmQGTQ1eigFIKuiaWVHkolOiECDoFFnmR83vIpnG6H/pgS+SgMygVix41kREPVMMY4BcQsAt6lQkIwKgMJtaeD4XjnJcSgqA3np3zqGfasKBtrYJKTH4n5jdH4hyWpXX7e8LvjKWfUWh1WzBI4KgXGokpIM2S5t2uhDPIUlvwDoS1JF/z17IHL240Iq1ZjKHf1MkgGbLCvmdHDJV1zuQG1QZfsViob8xkgqmQuwZTEQ1jJYKpDG/7as4to4ENArwQCvoJx90taGwIq2b6nEEox0h/y5QdBuzoiU0tCbJNz4AcJ2osds4D5E8IFnQ0FEDnSm1r/2pKM2s0lnI3/EefBoUrfs39Tf2elzhWMs6lIeDVFacYuQakMz9iExNFbIZ5HrxhjcZB5HW6EIyQzgmKO7lQJIrfDoQtj93PnBCT1TCgSreKJYZDBiSazKQiNLn4Ah3CHqF680IhYfiVDNIL4u5StFpvWy0kWrV9l2V9VKRyeNU1rZjyL79CW4EBO0SDLDAeMDHOBKAKznr5Uy0cTRmpvM5JI9GRQBoYu/GNgKLJaWwQT8DEr7uW5aFbuVoGzHam9osJZs0L+jHemGjw4plLW7oDBq3h11X/qGWc2Uc/fAyEF2bvh2vXZaRfxzt6nTAuaRekyKF+BpEjPMDyc91EZLrGRueZuVVT7itwtms4qcF5gRbW90lXcXeQLj0FyRIKm+tG8/ocSlrRBzi0vHB7Lr9JmdMxd7Uysi3OoSjnT6AzQxr5E5YMiqtMafV1nzTgDTaZVVY/mQn5mtPy6WUN6h5/Dw7xnnII8gq8IOExMAtDKfvnWGTwKJrsQUJOXCcCBfGG8ryOPDdzFGbCPceFf4xt0o9+4KzmMu//YPju67Wdsg8Mp+W2zmrD7GExUUxDoP1UPFBFUpajHfWRnMB3swd42OUp9LO3j7GKaJChGj+mPZiomx4A1cNt7rKd2DyvCm61v3p2ZGvmK9m4mOnyXFOHZZTf+BCGRvK1JfANYwICI9Aab3/VC1mQeORPDWwBKX22li0MCh0dOZaor3zAY/6toI5En9PzkHPZOqdwNzgbjpy0rpEbtkkhKb7fqcw31GGmC09U8/e055gtwNOe0+TwjH4RCPMJqdOqRK5l2MNu/0D1VQ3hihjKfJDidV4pzQEFV4jq0ojRUaOcjwn60faTfuCRkbou0Qbs3+6c3mLADmzieRiALUk8fD3XVMosn8YG6CnBXrn+HwkwzX4icLabxdBmhCmdwAniC8GFS0jAeXcbY7fVDgalGXeiQP76/Bd2NDKvFjcff13wdVziU+EU+ozxyl2XJfo4Mt1gB44U8TbkA7JqLw3mNrTn61qycI7A/hZdq/HwIqXzRwa2LvwF0I06kYJhP/mGrtElpNT57//hIrfMap4yel97lGw49suYa+15Ix+dZ4+dblurRlUvsizjVH+B1+gYgkXeg9Sl7548Xre18LviR12McTqdt8OfdEHTVCyzSyXeaXbXc+XI3yfD0OyVOzLKd65KkyDrlGcAZq84FjxHnUn4ISGIEH9ZR9JNf9SKSawg3e7kMHWeKXLNlt815FSbClYIx0v+mI9ykSguwEuXexk6kvVemUdjXTTNMeSppp0yYHOL98jGI0PGsuCyQ5wRikZLS8/YjYAghwWw/Y5kKI4bA07azwIY/iN7ksKIEliwSBxs0QlB+3zCXVhdQyzYAPpoislYOioEkX4G0RecCpa8HcHjdemqbWCwTn8SYgRALhr/OKDrCpy7gEl9AI0SCJqo7N+ERzocMkPYxRJmnafS8Hok+sOGcaNQgShYCbjgOlE9klut8yIPRfnEbO71I4NCfJJ/x0YIpACFUVa0nc09+bArClSWh6/0yQJZDGhSC0gfW6iIglCuSogBLmqnb5P6fLxgUKMnH5Hwlc8LXkytRJInMjCeq13BPr0QbzobuBbSSjRuJU1BrSgr3A/hPw86Qo2bLYs8kEO+giMO/sYPTy5wA8NkKVfXqr/0iRmdHMXMkhrYWcQOmq9KD+Lv7kfzrECKAnH15xqB+JThY0oNQChDWYCnOxFlZFAhVYAX4c9kkxTyNqIBEG+AJxashoBFwVfhkBcKLbcAG2JyCAigFRFll+zKF2XyJuQxAuJUiwqoRFEZsUp5Ngb3A+R/HlpkCFxaERWFZFpQomGVWj3dSPxrEJoxQUxpg5oLViiVpInu0rPCilW0TWLnKBLhgoEGVdVaR5f8KYrG2WuyVa5UZZLXpWg3OrwXkwTZiPJBIM2Cc8Im5M4VAJUVqpMTNJVbYLih4j0Sk9664GuVCHFlWhM2c4FlTbRIx81MUdKsd9IZUQcuHQVzgUIRtMguZWlHdkkAl6Jv1QgaDPZm9qQl1sYgbpRcpfwm/DVZe1+Be9KHK4BC6pYylIWNi7dhDWHcL/LzvVHLhKtsjAtiHPAxeLi1gSNIwp6LKQauIRAiZl4SPgvgST2Y9gCwNpiBwsK5S6EjFOBCUqloAdaYUVkuDfsPINEAS3dW3lXYcCJz88CYO7LwkIDbhXhMcZsEwnyD+vbDmXFFgGxLoduEeRzzbJxncCvSCHgzNueR4X0DW3uAgm0Nzzvng7VKR7X7oV8OCGpJtppiTV5ccQm9JWpEfocCfqvAKYjTdswOJFF781M0tpKLHtIaGCxLAx3IbtsoEJsdREaK8xrIZP1ei19ITXzyc+pozIBBM2LI0B0384ntn4DNnuU1BEVZ/oRH+wCfn0HgqRhf4uQcEBKGLAFLj6UAsBl38e+eNHx/d8BAcRw56jR+8gqwZqNtJ8ABbXXQqBtIZzRN4EBS7uqPnrPq6bRLMYKktCLGnSNwFWPD8tb1Zq9MHFgk2Ej8vruzwBm5HauMkEZPk7tkLGPnAMzLkplB/D0Bmy5hbuIEkZJLk/c/OLIw9lVIFI3ei9SIHlWPVy7QBdLhxcQiZ94RMiGd3QRPC3a1/IzWjKcjxJJKMIENioAf2xEMU2ScpEK4lnlhNFYSM8N4QH1LKNR74jZOvqYAhQAN1P+eVDCSJfMsDPCxPau+gAwZBAvbyETIxJAXbDAkp0vaeNlZFB1pBxYaqIjABZiMq+spDAYg2UYJtBTC1s9kuE4aN4sjwqsU50WV9MPmw9NcG1Y2e6Kin7QQU6bUR5MK7m9po2VyQnYWjTavZD3kXND6If6ggDvFmbzQpdZ0Bv12N8S0XgYQdTL6BjiMKyV4qm5OHFQiK+4mSXD0G0C1CG7dpuA5DbeV7AnREjmozvA1sdhrmueCcdfzwk8EzyG1oHmYDtO7B7/kR3xdYOdBqCD+K6qBmVxPOKgw/j1AG60chAtpNz4BqRr9jFZ4kV7yWj49VeaaHe+Eq+PWZquxXTi8guuUC4Qk8nTwGv7b/P4P3GriPSRs8tOIWZ3hGd8qyAu01UQqiPnw01OpaAg/kfHKnd6oP9i/8ISIx4FkS+Ix8Dox5eB+5M988aWTs/FwBhH+ILiEoKYHIPXxy7iFiPuISqBZ/BLQw/J3MQ1z93fu2MYBnxyh0qwIBThFTJ3DfVJ0tiVVvRQCAjFuWyVk+QHhRQ99ScU17VgaVmlCC0xrng1YQ9Zc2k1SMfIfDwEvW/RaNbaWX7SyR8XV+kLdlJv6KSfE53ARFgspPO+yjx2d3KFx/p6rcCeSOAKGAkRQ74WRKtElfr+P/5B6fw0xRmBzzs4mnSfFr0Mre4DA3/BL/PK+O54cz2HPBn+s+tDgElu6zHLO+9NDQWO+dNbS2zw0QefrLDZGadsobQ3D0A+l37a0876w3m/u+CFKldcdMlW1d6Y4bqrrqnxyj8mqlNriGGGGm6ZERq+XKdNXzD5KVq1ealdpw4jjTbKPsuNNUaXcf722oGHAmCYlu3E/4Tq/h2Hrlc+JiEq5jUfwuJgPCAQSWTxfr4mo0pISknLyCKoHE3eAl2hvxuBigymkrKKqpq6hiZLq94QrKOrB4AQ+bpPYARi29rR+pu9SPH/i0Sm9N1/HptCaHQGk8XmcHl8XCAUiSVSmVyh7CBMpdb01BKu0xuMJrPF2k2dQqnSyjQRdofT5fZ4fX44AolCY7A4PIFIIlOoNDqDyWJzuDy+QCgSS6QyuUKpUmu0Or3BaCo0W6w2O3sHRydnF1c3dw9PL28fXwKRRKZQaXQGk8XmcHl8gVAklkh9fGVyhVKl1mh1eoPRZLZYbXaH0+X2eL31znsffPTJZ18A+Uqvb4Y04eyFBagSHhL6D26/TnjwESBEhBjJ6FgmyubifCgUS+XxSnVicmp6xh6JwZId0RTsbGKkeuNS0lyN71m9UF+4uJj9Yx268ZNzQXXYx+lKWzkCx1VMSHNZdXYozoZKNQjm4mzInuz7C/kQ5WXa6PjF8kVvUe5PWXPGp1GcLbksyngr5duUksRN+ShLFamYSMdjsYWkVaaKkoYs0Yp86/orxfSdtgrtMsZPvkDwLj/rBLT6vF3n5WXrt5sM3Lg0LdWl1cAGlAqqKtcIlHoUwR+oN/9PNtpbVg/LCM5HC0V39bRsbnJbanlaLEPWcmnO27DcH9scDKOIeheXHyhaJN3Q7wRdzMnT8TG0yq1BKy76TyGv360vr3ddyvcJ9RrDOFPd1NySgFfjYzGGyf5iXT8pjCOtDQTHbGkMVWdvOa0O36lMDWQMKpOhLRk46LYMgf0wsyhhsJpVW22o6frT7risv2iT4auV8ul4rw1P+zSUFZcRsiiucLuU97Cs6czx5GczyGKr/DXH4/S232GpWqklpddUPB40ZK76Aes7xQUz12OHuZOJG+ilZcDbMdeyj7tZiKLXNW1/H0nH25mIlC2DHK7LSqxrqVm17Gu7ZGAgaX0q21tH7hmI/DxDsVZNic2AaMCz0sxfgK0ycb1Lovq1NKl4VZNzZluPZlGL25YbBFrU4p3y6xxPmJwggzKoTPHus8UgEX7u7yoC9NqqNMv/9KQ4X8m7NJnyeOqfhW7Ah1JtW9OYNbt1VRBroOcYvN4rAn1bdGHvBcrMbbruBbqsEoaQzmQ4QaRuQQARTjCYLHY83+tWIXGueq31YwxAhBMMJotNUhyuemvQAQAAAAAAAAAAABBCCCGEEEIIIYQIIYQQQgghhBBC1u0YQIQTDCaLTVJc9dYiq9qynVU7SXLsrZ7erzVK0W1ciY1n1ae+WsYu9amldanjksFedq5MD0OWbkchyTVL1vZDlttGrCoj/KBIp7YKMkQwhr6xhlap/YRmuPyZ917pX6zR/f74vZQdHC74/R+b0fvAEi54MwA=);
+          }
+    </style>
+    
+  </defs>
+  <g stroke-linecap="round" transform="translate(10 22.564064636363128) rotate(0 109.5 79.34668982323285)"><path d="M32 0 C91.51 -0.6, 148.04 -2.78, 187 0 C207.68 0.8, 220.12 11.04, 219 32 C218.3 52.3, 216.53 71.85, 219 126.69 C220.01 148.71, 204.75 155.49, 187 158.69 C129.73 162.03, 71.22 159.98, 32 158.69 C7.82 160.15, 3.34 150.23, 0 126.69 C2.19 92.75, 4.95 57.02, 0 32 C-2.82 7.13, 11.73 -1.46, 32 0" stroke="none" stroke-width="0" fill="#b2f2bb"></path><path d="M32 0 C94.58 0.8, 153.79 0.92, 187 0 M32 0 C73.07 -0.89, 115.11 -1.5, 187 0 M187 0 C210.05 0.42, 219.64 11.93, 219 32 M187 0 C207.88 -0.26, 217.57 12.92, 219 32 M219 32 C219.7 68.07, 216.47 103.98, 219 126.69 M219 32 C219.47 59.93, 220.28 87.23, 219 126.69 M219 126.69 C217.58 146.81, 206.67 159.55, 187 158.69 M219 126.69 C217.65 148.85, 206.58 159.54, 187 158.69 M187 158.69 C134.7 156.82, 79.7 156.64, 32 158.69 M187 158.69 C146.83 159.33, 106.88 158.46, 32 158.69 M32 158.69 C11.94 159.74, 1.2 147.57, 0 126.69 M32 158.69 C12.35 159.35, 0.81 146.86, 0 126.69 M0 126.69 C-0.27 97.73, -1.52 69.12, 0 32 M0 126.69 C-0.81 107.31, -0.31 86.52, 0 32 M0 32 C1.51 11.78, 11.07 0.93, 32 0 M0 32 C-1.37 8.38, 12.33 -0.18, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(21.682044982910156 84.41075445959586) rotate(0 97.81795501708984 17.5)"><text x="97.81795501708984" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">EventStoreDB</text></g><g stroke-linecap="round" transform="translate(461.91275806060605 10) rotate(0 93.18181818181802 90.90909090909076)"><path d="M32 0 C70.19 1.75, 110.83 1.32, 154.36 0 C173.11 -0.11, 187.35 10.02, 186.36 32 C185.95 63.75, 181.35 90.91, 186.36 149.82 C189.31 174.66, 177.39 183.76, 154.36 181.82 C107.95 183.26, 70.56 184, 32 181.82 C13.18 178.35, -0.9 171.7, 0 149.82 C-4.76 107.45, -0.88 70.69, 0 32 C-2.9 9.2, 7.77 2.08, 32 0" stroke="none" stroke-width="0" fill="#a5d8ff"></path><path d="M32 0 C72.12 1.35, 114.7 -0.79, 154.36 0 M32 0 C69.17 1, 104.94 1.42, 154.36 0 M154.36 0 C175.31 -0.23, 185.12 12.62, 186.36 32 M154.36 0 C177.62 -1.82, 186.69 12.34, 186.36 32 M186.36 32 C185.15 67.25, 183.81 99.57, 186.36 149.82 M186.36 32 C186.43 70.41, 186.31 110.46, 186.36 149.82 M186.36 149.82 C185.19 171.87, 174.17 182.56, 154.36 181.82 M186.36 149.82 C187.33 171.45, 175.03 182.61, 154.36 181.82 M154.36 181.82 C125.55 180.41, 99.03 181.07, 32 181.82 M154.36 181.82 C117.09 181.4, 79.15 180.64, 32 181.82 M32 181.82 C12.13 182.39, 0.7 170.14, 0 149.82 M32 181.82 C10.99 180.66, 1.34 170.29, 0 149.82 M0 149.82 C-0.6 111.42, 1.9 69.71, 0 32 M0 149.82 C0.23 107.62, -0.32 64.77, 0 32 M0 32 C-1.19 8.68, 12.11 -0.16, 32 0 M0 32 C1.58 10.21, 11.68 1.51, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(497.09259259984594 65.90909090909076) rotate(0 58.001983642578125 35)"><text x="58.001983642578125" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Lambda </text><text x="58.001983642578125" y="59.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">function</text></g><g stroke-linecap="round" transform="translate(925.7346065151513 26.67330063636382) rotate(0 90.00000000000006 72.72727272727275)"><path d="M32 0 C66.81 -0.33, 107.77 -0.86, 148 0 C168.02 -2.41, 176.64 11.67, 180 32 C181.49 61.5, 180.23 85.92, 180 113.45 C182.02 137.42, 169.31 142.61, 148 145.45 C111.01 143.26, 68.1 147.28, 32 145.45 C11.73 148.76, 0.35 131.97, 0 113.45 C-3.33 95.55, -3.33 82.67, 0 32 C0.91 12.36, 8.61 0.4, 32 0" stroke="none" stroke-width="0" fill="#ffc9c9"></path><path d="M32 0 C77.37 1.52, 121.58 1.9, 148 0 M32 0 C69.05 -0.85, 105.87 0.25, 148 0 M148 0 C171 -1.58, 180.28 12.12, 180 32 M148 0 C169.06 -2.05, 179.27 10.47, 180 32 M180 32 C180.01 63.12, 179.36 90.16, 180 113.45 M180 32 C178.74 51.84, 178.56 71.34, 180 113.45 M180 113.45 C180.84 135.04, 168.75 146.14, 148 145.45 M180 113.45 C178.37 133.27, 167.5 144.53, 148 145.45 M148 145.45 C115.9 146.48, 81.85 146.87, 32 145.45 M148 145.45 C107.83 145.47, 66.56 144.68, 32 145.45 M32 145.45 C10.95 144.45, 1.17 134.04, 0 113.45 M32 145.45 C11.58 143.16, 2.22 132.75, 0 113.45 M0 113.45 C0.96 83.39, -0.6 53.06, 0 32 M0 113.45 C-0.76 83.48, 0.56 55.41, 0 32 M0 32 C1.37 10.27, 11.55 1.31, 32 0 M0 32 C0.4 11.77, 9.67 -0.42, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(995.0746181118311 86.90057336363702) rotate(0 20.659988403320312 12.5)"><text x="20.659988403320312" y="17.619999999999997" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">RDS</text></g><g mask="url(#mask-Kc7afa11G0naNtNt9CKEH)" stroke-linecap="round"><g transform="translate(660.0945762424241 98.96871146653962) rotate(0 130.34044307114033 -1.0166158962562122)"><path d="M1.03 0.25 C44.33 0.29, 217.41 -0.28, 260.57 -0.56 M0.11 -0.66 C43.21 -0.9, 216.66 -2.36, 259.82 -2.29" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(660.0945762424241 98.96871146653962) rotate(0 130.34044307114033 -1.0166158962562122)"><path d="M236.36 6.36 C245.44 3.62, 254.89 -0.57, 259.82 -2.29 M236.36 6.36 C244.02 2.84, 250.1 1.87, 259.82 -2.29" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(660.0945762424241 98.96871146653962) rotate(0 130.34044307114033 -1.0166158962562122)"><path d="M236.29 -10.74 C245.29 -7.2, 254.76 -5.13, 259.82 -2.29 M236.29 -10.74 C243.86 -9.32, 249.96 -5.36, 259.82 -2.29" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-Kc7afa11G0naNtNt9CKEH"><rect x="0" y="0" fill="#fff" width="1020.2800610606058" height="200.28548810397365"></rect><rect x="701.0913637564953" y="80.8103231478226" fill="#000" width="178.19190979003906" height="35" opacity="1"></rect></mask><g transform="translate(701.0913637564954 80.8103231478226) rotate(0 89.34365555706898 17.141772422460804)"><text x="89.09595489501953" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">SQL updates</text></g><g mask="url(#mask-cjWDFRLUWRVio-G2fcpHS)" stroke-linecap="round"><g transform="translate(241.72451214583305 101.07668753155508) rotate(0 107.07406335269718 -2.1778998464196775)"><path d="M-0.38 -0.1 C35.4 -0.63, 178.87 -3.78, 214.53 -4.26 M1.62 -1.2 C37.32 -1.51, 178.82 -2.54, 214 -3.19" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(241.72451214583305 101.07668753155508) rotate(0 107.07406335269718 -2.1778998464196775)"><path d="M190.61 5.64 C197.26 4.49, 202.66 0.33, 214 -3.19 M190.61 5.64 C197.59 2.11, 205.21 0.22, 214 -3.19" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(241.72451214583305 101.07668753155508) rotate(0 107.07406335269718 -2.1778998464196775)"><path d="M190.4 -11.46 C196.96 -7.69, 202.42 -6.92, 214 -3.19 M190.4 -11.46 C197.56 -9.33, 205.25 -5.55, 214 -3.19" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-cjWDFRLUWRVio-G2fcpHS"><rect x="0" y="0" fill="#fff" width="555.4668507708332" height="204.4289159361067"></rect><rect x="303.9077008064777" y="81.90057332927927" fill="#000" width="89.37596130371094" height="35" opacity="1"></rect></mask><g transform="translate(303.9077008064776 81.9005733292795) rotate(0 44.89087469205259 16.998214355856135)"><text x="44.68798065185547" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">events</text></g><g stroke-linecap="round" transform="translate(906.6820096969698 192.1278462727264) rotate(0 51.36363636363603 41.36363636363626)"><path d="M0 0 C36.4 -0.93, 76.08 -0.45, 102.73 0 M0 0 C34.91 -0.25, 68.7 -0.03, 102.73 0 M102.73 0 C101.38 18.51, 102.87 38.11, 102.73 82.73 M102.73 0 C103.74 26.15, 103.7 51.03, 102.73 82.73 M102.73 82.73 C63.38 83.37, 25.05 84.26, 0 82.73 M102.73 82.73 C76.73 80.82, 49.6 82.06, 0 82.73 M0 82.73 C-0.82 59.86, 0.6 34.37, 0 0 M0 82.73 C1.22 53.99, 1.18 25.21, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(926.2556604038675 208.49148263636334) rotate(0 31.78998565673828 25)"><text x="31.78998565673828" y="17.619999999999997" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Data </text><text x="31.78998565673828" y="42.62" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">tables</text></g><g stroke-linecap="round" transform="translate(874.8638278787878 172.1278462727264) rotate(0 152.72727272727252 62.27272727272725)"><path d="M0 0 C68.56 -1.35, 137.25 -1.96, 305.45 0 M305.45 0 C304.03 29.82, 304.69 58.45, 305.45 124.55 M305.45 124.55 C200.91 126.83, 94.52 127.02, 0 124.55 M0 124.55 C-0.15 82.63, 0.73 41.97, 0 0" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="8 9"></path></g><g stroke-linecap="round" transform="translate(1050.0062768030305 192.12784654545476) rotate(0 51.36363636363603 41.36363636363626)"><path d="M0 0 C25.42 2.6, 51.73 1.61, 102.73 0 M0 0 C24.72 -0.32, 48.36 1.09, 102.73 0 M102.73 0 C101.07 24.52, 100.86 45.14, 102.73 82.73 M102.73 0 C101.3 28.31, 101.44 54.93, 102.73 82.73 M102.73 82.73 C69.43 82.75, 33.67 84.25, 0 82.73 M102.73 82.73 C82.18 81.36, 61.59 81.03, 0 82.73 M0 82.73 C-0.79 62.01, -1.03 38.66, 0 0 M0 82.73 C-0.35 56.82, 0.52 31.71, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1069.5799275099282 208.4914829090908) rotate(0 31.78998565673828 25)"><text x="31.78998565673828" y="17.619999999999997" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Data </text><text x="31.78998565673828" y="42.62" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">tables</text></g></svg>
\ No newline at end of file
diff --git a/docs/server/features/connectors/images/example-lambda-connector.svg b/docs/server/features/connectors/images/example-lambda-connector.svg
new file mode 100644
index 00000000000..646457a251d
--- /dev/null
+++ b/docs/server/features/connectors/images/example-lambda-connector.svg
@@ -0,0 +1,13 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1190.3183733333328 306.6733008181809" width="1190.3183733333328" height="306.6733008181809">
+  <!-- svg-source:excalidraw -->
+  
+  <defs>
+    <style class="style-fonts">
+      @font-face {
+        font-family: Virgil;
+        src: url(data:font/woff2;base64,d09GMgABAAAAANtcAA0AAAACfqAAANsCAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cGiAGYACHOhEICojDDIazNwuQXAABNgIkA5BYBCAF8SwHm3xbju1xYYy7sd0OAIpS8WVRITvfArcDpBRW0yrYuBoNGwdgevzg5P//85KOMXSkA8Aye/31X6aqSFOjM8yLldTu6uDRvazbyMy9zzwgOKQom/g6a15H3etNifhB1SU3kXgQVsw6e7M0xQm+4QP3vDzRvyYpK7Ba6lJt8H5GV4Xf+EcERLVOkazgxYl3h7PDv+FdjElJVZs7TTRxrr2RZUAZtx6MZOXIlTf6DtDavOv/vvtI4L+peCq+4cnn4emyiLYQELHRxsjcZuWclZsVm7NiTqrgNnuPnmjCgUoQxd53u3tpTX2VhFY9DuFKNR4ho/FgLPjSPINHmGrBMfPo+TrQ/Xc38WQ8hiEpxsolKta8GqM2D/6r/XpvfZm1b8IgRVhHxZgTUmt7/uup6gX8QCoA4DIvm+7/Bxg4sk1iY6xTGpUQoZKDRhH7EZH4vQAEBnNq0lf6SpZlGQKGQMuhwjgwAjvaLSM65Nfe+x7wxumASwfAsqWqLcltnCOahodxOqb/P6f2753zV+9tL0hyp7OxrQGA5SdK6sw4Oe5M2p+PnI29TbYSGwKSJVuOXXCgTYGTAQ4kANdwKoAMD8yzjSG1lSbqpPUt++3aGXuX98JPMVd3kYOQCAceo5A8jPq4mWnA8VObfn/FIsbA8JBAdCakpIHEiQEptVg9qctPV0xPe9vrHi7/f11arv8eRf1nbr8ncp2VYgubCUYOR65OgDBKALGSMCFF2e9PubRe9ecmXdWtJJ6ZxTi0QNlkAbjt/giXa9W16vpePUnVYBA02c7EDabEybhthwZTUn0gv0/3+p6TbjblsxSGFrBPy1Q1mfbeVtr1kWwWhOBBkg+Vza3g/76pfd27XPXbILAVkthO8hLLdmA44fe4Wz3zPDuwmcVHnwtk/ya/ohZYtkUNAoOALNmxMwo4XFV3z4nKJqphbq4kTdICkhZmbtQjBYVNbC4X6OGo3n3X2yl3YOz/M9VsF4q4TJ1jqKjO6fUxdx32z4LcnWUABlTgLJVmKT9iQL4nDHgBAylT4CWKTjHOirY4e4lDOXApp+U5JcqVXeVcuahd1NBV9LuiufKeO3dX1OfK79rSzpVKt639vmVluMa8XSgDoAh0FtLun/kzOic2tta47pb3TEIZmVWj6q6ZkfwZhzw8QA8egQcFCNETugPw/v85X5sUhiynJIFlI3Z8e9MUko/5nHE+0JjS3rx8eM0bAcsOyc1OebbmZZhOTW5udm5y879Wq7sNvIpVyJQiYqFbtGxus2fy5w8yt7hbFZMkbjMkrv1B50iJy0RvGiKl8EjEi3Nttm28ox3VNfEIkVCPdo9kCYLc6T+EQQIHInnzoHkY5hgHz797ne3/L7dbSI7HyBSrukfSOSRjKRRVlakDh5Ecj0XixJgS4TXLWpaBJGgLIwxmJUKk+7rO75qapUspub25DUNwVIEVCGaqMCzj3n78to/FsNd2UYsokxAE9Jaxstaedp/nHQUCjo4fKJAEob1jOau9NX+ZtluLImGQJDByJv7W58quoxXEyj7O/CuT0MM2+95tP26P8gghiAwiInYq4R+OvRUAACAH/npZ0PzWt5/YufDhz7256jFcmUAE5G6CAHSDNBOkhBmAAkAvVg4ASFLBIgBMEcS311N0A3o5BXwGeg0AEj0sSO5rtQJ6wKff+l4ZOq3TCgDYzx4AAH5b/wEAeZdu+N53KawBwDc+eNmGOPs4BBLooVAAACZjbLS7sLHNmPkJSVfYOrXu7Sl71l6+1+0Lh4GknYJTdmacW+fZ/Ynb+7TyAHmkfJNCq8SUt0/3E7bp5Cy32d4iJnn+W6Jl7ifXzd27p+05e+XecECEhaSfojNwbp6nd9zexV0yERnl8uvXTMvH5RHAz/fy6/LLcmCJSRPt/6/3HwE/9vfzpZBJA370Tz88+hwIAA9enduhAHD/8tcfmgzk4SEYXZQ5XZx1fWVFBQDKlE9rKlXNr1qNWnUlTtIkA8B7kzppAPDhvJiXsO/0Z77Nd5ju+H9+zP8j4AIBkCgMfXPPORACoRCtOLALYNkHn+4JgNJKKAONlfLNPfDWdCMOClRo0GHAhAUbAhIOXHjwESBEhBgJUlxwxQ0ZchQoUaFGgxZ3PPDEC2988MUPfwIIJAgdwYQQShjhRBBJFNHEEEscegZGJmYWVvES2CRKkixFqjR26RwyZHLKki1Hrjz5ChQqUqxEKQAYp1uvPtPMMmiJxZZabpkVVlljtbXW2WC9jTbZYputtttph7322Gc/ABg+MoR6LWCRoWr6G1XT2j3mAIARMFCrqQjt+7XPAECttvYr7TZKWf5NX3sPqNM+VB6ty8wYIHO8kGHK2rUN+KWgNLIN4RDlSz/Hzf2/QAgDxppgjH7jTTLZFBMNmAEApptnvrlej3ESDMs8lrFqyTbxY/KOsX6iK7waaxG5TW//d8CBXwDXnyaOWKFHDP+3w4Bk0KUsmdKxg4/hBrF+MEnVFCqdCgcrvLRDeAaqlsdjuEMwEYFUcMY6sMpqehSODsbSUegpK5g8uzw+HdTDSnztsJZ9kD7RDxrWdAwOgHJ+uHEQWFmrsrGHSPMD4sxr7sAgSWo7WJZU7FYFuDS7qqa1vf08ck7eVJI8u19Uu0oWu/HoDT6U4xi8BPdInUBueMfDprK2O1Exo4EowGGyZX/l9oaZ0P/MPeMzolzAeI/h9fJZL6fEiMLR4/DZ9G5R3DjgjBhCDK0nF+rtcJegKWsjbuTG/xnOjy9OjztXp1m9kaiVHjfG2+35kXPTTw2yBm+hPDb3DLw/7fMSpqPUxBNVDS2Ede9i0pwcDVaPyjODQZXof3/5AHJOZuyWJuT4NhdwKkYL6iHM42hbm7mbvR/DaEfU/VD3aWNkjhHAGOHwGL1CF/I34o72rAI8q+iWPmhPAE8HZn6FT9M+p6WpkaYAaXrgCJFEVTGyLoDLOJWQ5euiHZlYqGghAAvhoIXOwmgNTCwWI8TEcGoXl0DIS9NJs8tSAkSViuqiqMIyAz4PBRZxntokNoDNDNZvTTuoj1HNQjBGYKEjtASjwCRjal64JB1hktrjvjIeys+qaWKIywULhp71PibeIl/ZdE6mwjw5hTlM54oypce5/mf8h/mnslR9akjCkyx9xmfhSfoX81SijkaPlE1F6ECqo6QU0knhTiQVepzAqeSdKp5CTomneO00LYqqCBYUZMmxUIHBtAj/omsRVfwA9A8UXSEfEB1G4OVG1DvbIyPijZW+QsZC/+NnwzXsttuwVRdsHHRx0ObBxZK9NaNzMqGONgBw4AJW/24kFwSGXiE4C0ObI0QEHBwpnvKMc6UaAcBBbDBYFAHE+rvx8Rrf5t6QY9zWPd/2Mw32Hqx/bo5BLlwc27ixQHKbu04zHo27lp89ugJovwHQZZIBtiraYuammzp/YlWf2tTZSt2mOJTZ6dbNYYQ5iIc0OdZMGSF71AXIAKT4CMOmZEp308ZSxRldADy1B6GV0KmyBTV3ylrYRpwx4v/5oHmQXTm2r46zevcNLMLaot93tDZ44/pmCa/5/QEdu0PkxixEA5lAsN5GBr5/x7FHjdySJ6peBpn1gfFeYG+lcXK3hkchnxqyBtALsBHi+5QpdUd8bZ0f02poNXggNUCqXpcK5ViVrVhUZTvMhQnModqUo88/7/CDriEAkQVOzJNELBbjo1EjynGBQJH8tmraichIU+rRrcpMma2YzjW3dYMd++AJYMauqMTRZ14UAoLYb16J0/lMbkKIuZGCVHjSZoMZcMeYfUQHJ8C9ReOcwawLnBxhLJc13SGdb9OSQnPMWBU2pUkaFQTpiLcCByUElO2xgStGK3sDxQGWsQKPN13X1UEup5GBC+AKWzulCyOKKkox4YbCRwpJaVnZzceEIGZXp2UXeRqgNFVJyXGgmr4JFSsF6B8mSeJA6CE2kKvDsVdXImK6WPNI6BQiAtjMTzk2hD3QCC2yDreK3dIeNFEPnjapg7ysW5LsOkxXaL1WSvpMwI5BR67vA9ylz4RposXi0i7Pl6E1BQuk9PCt2SF/tICYMSEQdyBz6Uyr9yH4ngsVTxnTki4lAOSPxKJ8UR27zb1/KsD4Pkim/TwPN0AI0vuNkScF3axO8CWeaEGeF41qUBMTch/B+rCLGSiPDFF5S1uU1dp/yssDxD4+rScOG+I5c3ug/4/jfTsoJ9bWreJA9uEeMLa1daqr46rmWxBEEa+LO3IZu9voOTF9WVEJuUoWj8OL9KQvt0VfFnCQJxKy4I9jPmwDpJ3ADepU7PVY7GmHiUDUzHJB4ChYdcfT7vex7AKPH12lkI3ukAkBQr310e/gUf4ML6nqnfF+ch/eFu7XfscKPTaWMqOpv5llWiyGuty/eXyH8irGHbIZWkXWKCSH8iH0AJKeR7+M6mo6sRWexmeB4gMwUZB5RTsHeuXEqq93jvK6weNOAtnjyo6jBrAuCoqmC7EAyEsvDr0IwkPSLs0s/YCJgqURHnqOA/7II1LZLudVWxXl4ShQpjiLjvmT82UXX+kqhRiho7DQUXlPwX9bq1SIe0xZnygT8xhTxESAMbFt8aUsWnhII97W47q5T5g3A+witlMcOuJlqOyQD60pTf0jrS+Pr13WUXcxWR6gwl849mDTPsh9ecXI48BiPiG+rh2VbIjByAG+Gjhwvx2bhhKunuJ4x1P9KMac+lJ14wo1t5jWSVV/GpuO+2zt7nOEZbgISctSfPCEBC0Fi93W6TtPmVvjQgs4lCSYIUgyKTPetL3h6wqo4j+BNOvX+1VZmia5EQsf78NccTzHg2xg7X5yOvzxpWfo+chH2CAxllN3UNoQy9DT6UESBP/oag1I5wC9aoZwtUjSrnp94aaUi+yGRnhqfk9ALUf1OaWV522q+s8Km8c3wyP2UxbqiudRWmQCzTBFmqEK4c7qbsQs0XRFrITrAcSjzwmci2iCFbohpI5n0D9e/3G5U12+bvr1qM54USuWC1rbjg4dMTEhHQSIV849b6uuDtA//i+AMMNKWTcwHsCEmMNZXlNJPFGznOkh8mDGJxW6rZORF0sRqu70qRj0lW9Q2qwoEw/br+bT4Wt2zNaOKtXsqULwj86Z4qmgAgn3CmrOKFp5Lt1YhPK8wUsJ/BgervTzjTlPResyDS1wYNzFBfTUsy/nd6htYR870mSf6UWwmMdEIOx4UYCTt0Y5WJytlZjqcP/y2hkbuhdpapclqIf6C44plflFzGZ96O3QxToYQbsuhnZePWArBDAkyZcEQXocoWrKCjSmTPiykomvu9dM3ICYmIHyHTriO5kCM1a4LgbBbED1lKOsqOHikdYHpgdUa1q03Rl1/V0/y7IU1b6RjKqyojzqIEtO4jgO8ISLOaVBu4So7GYHDBOAcQfQ/WgtQgwdUuAHrVcO/oskq62xpBt+ga0+SMF/JbG5JCR9QjLySzjvPKX5/2HdmckFLd9CvS1weqRFwDANklaXtkAfPycBo0khfaU/VQ0mK1vXCNMJG0RHHEULs7dmzbAS5GfQAMgJDNAWPVwRmNyUFUreGjISX98W0tt6tMkxU2GzxITNcfYgMT3cTANgow289so/FSwLj86mhfg2v7bqnr1vl7M87eTwqvlsTBZ3XRcP6QzSP3nXESNI+pXx/uM5b2sy5sfPMgUCRfEfjjSE4PXlYlMn+331ignbDlRV19BUKV87JV5vBMqXm6Ix4xCpPF5EIOf5KGgsdQt7nw38DT+OTyrylaGtaGwxyB1NEFSCfZw5MT2C8Nm9Kj1B0Oqo3j+aI/n9Luk9M+E5UmtfVaTotdbg/6zo3lN9dJEbeQ6hLbgusgGZv6kr/Wg2yOtGfBBKy7NY2qw50jA7YFVOEse1S3vVrNMfkx/3knJ2S3KISf+Ta9FMLVpMn0o4gbCFjNSmCLFa69fXD51cfAs5x5RPYapWe20Rck5J7YTHw88CN4HpmXJY2naTrJFPJk4CtojNReHSKMqIT21JfBjdADghkp+/0D6zcYJ7e1dLokDjAMtrDU5M2Ahgc+MIZMxyhsoYB1iuZQpyPvw3AnkSzjd18RyIEzcrH27G0WfYOgNCJqRYYt78Be7FBMu0R/KqL9HyvvGo4EWkuFrJ6Y9pWq7QJV9cx7e0mn5AYusQk8woKkPa+t2FVoI4RFU55UubO47tsoNcqJbK6sFwOCnVWvyYhXIB6MDxOKrK2qkyB5Tl0olOFJ9mpIWj8YAd6J1NYfN100pyZwRWKkFRQVRiPqG4CgPB7ku29oi59R5Vd/XpXLxxo8SRlHQjOoHSA1fb3GzW6a7LYIqNXKz+J9VE1YV0HuTOnrMHy6BqP/4xys6nD8J7KJUCE7+vx776uFYfxYSalVTlxMEvi6Lc3xYpXwp7J+BFr8v5U1TNeCarbvYZo+kKDtG7jbTPybMS6THUALIqhJwAmS42sCtBR4tyGw8diRc6aj3EisGDbCs46b4qrqfkNh1SLQH3gjqAMCU+HP9AoEU/LiQQsrB2/emNL/TuL6D5kljd1aQqD18Aicu5AFpKVFbNKvEniI3YdVfSPAAhGfFlD/zV0La8iRe8I0nz/k90gbLHRh6nlUeGrqwkao60rC7T2rr6/wLa2b6/z9+KykDZNzfvnNzws97nV9+QE+Js0s45y6Y1kgpm6GTEvQB20xQRp5TmdOlJkB9yC9geQShRkoyofl0jhHgIm9cz/8i9dYrtyjrrFxxRkUVRiliX1rTLULIKQD5y8oTmNLhcKGWSnYq1iT2b5w4gNo8L32gfEdwM2/JV47+rKZtul7IB4Xr1ckklpkCrJ3bpC0qZbC7FgKqDG3r8vUMpcZyVFQWvFD477sdpV7ERmDyBbkGVhbuFhUwZsb6mHwb91eyYTM+3RYoZDSuqyiTFRk4DVfZ9NnzcY2LL3cEwlAYK6WjG8LgsDuxy9XqOg68aWFN1A4ykXFdACDdoCgrlsXFIlnoU0yWPRpoUoAfhhjDwz88ReH3QYj9CS6T50xMnnZg8FyKK0ak2hnXHcpT3zeHyfTBuAJCREyH/CGmAmeBi4oD48EeKC77pGrc+sqp/vN6h4rG3dWG2SiDEmkd9eYHptMUGIZDuAEZnmEtyhaZuqoZUrpB7fcmeTZn4PJyQtAC1SzBYOBJsIzEhFtJKB8Wl1D3+guAeCAMCfKa5aWICG2tcJGD7ms4WrMrYUFpzoDRZNSvBQ4qGsAoVjY0arTEV5CtMqehvUn+JEgOdJkLsUgc3EXWYpRG1zd7pBWCiWNoOlIcmJ4THAdKBqEWHkAfBzD8oNJQyC2rBGsTpjmGrQnD1VpztsnizQxo8jwmvi+YocMa/SyNctJQWe6/WWhKORIjJ/uDJIVmej8fDr74XrjdFz84RroMh5qU942TSgFTWbscKaeRONangQ1ziFrXUuhvAZPmA+NPFZf+b5KGxMY9w3+HEf8T3REulEVXxhNAa5VX3ac5CWbHLOQBywi9OiAoz1oNPjRHzelB9TTq1f3+B6aukQksM6VtY3Qik2c93oek7S/99hVh+Zsx1aD+NSa+XTKQM4SGlVMz7sfp0jhCEsUAI0UbeY5OWrkUP3eZFMBTPB5R4Fxl2I73DIWCmCFnriHhbTe81sqS4a1tOng9eeLEdfT5ilfc1dadZpuijqJqudO3xbvWFzhEUXkcrSGl3Jh5Vp65aHVObFyEMHd5UVEenrpQZtc6tp9Jz5prqatwBWnVfVPFn30A9ELtCDMzo8ZQRYvu90j+mlbwz0yG1Z2q1kI7+SRRblpbq+RYIBwsvmtrtjhypm7Eqp7YCifBjGXUHIQ7Fw7JsKe18MiMOR04dz4I1HEnZeQ2GYAMBTCFJVcS6AdvtfIjvbZo7+5X8yyXdDFPsQAyY7VkZl1iX2bVFCOsAm02DkxFIWswTAMJivfk41oMje7hBQkyrktIeO7qxUi7bvSpyNgKLDrzNhQkQzDqW9qTM7TFLZ8bU+40oSG6Ohd7DzKRSfvRnSCmKSvWHgvaY5SJRbzaFb3SMBAf4uXtV/qqWo5US0/fy0TExO8S023EQkn1pag0NM1GXhDQgJsQTgooXkY5qad4QfPntE7dWQzb1j29RBzf9hPcSGu7fpblc2kVLnvj7GV+WPaOBGXroOKSjuD9AFMCAqaQrQ69wGsUypanluUwTYPXXz76FNtIVyzuGui2YIWw9EYc7xzwJ5VWbgDmSTMSNM61X611iA9GZaY5iFKDXwxefBxyPf9MsUMW6/m19ygSorzld8lVHqrrqIj5ivCBc919Aut7xgJQs8PXBWFWCDmaf9WUHMklW+grDdpTdl51HRmqqtxYlMbJbLUFiFKFCIJSKVff1LqXnKOUjLbUX8vlIvJz5CwXi0KWpUqb3VptPIvOXZlIr+9D5EwrSOPXHRp36I3ZXKJjYwwyh8yrW8WkcfRqn+7cJfmalfKq1oVcnaa7Ip7LEd0tVO+BRM0MeoYAqTuyu4O05YuOJKGexTv36GA3CMLulw3ptac5mdQ8GB/+YEPdUdY4mfHqBIMJHKSZvKdJy1Q+KkL8XRMoXqLIeQdNRdTlA8Tsoej43QRgrBUlMRpSqyZKC9YdEgCPzFYfmroJVmtq287v4ABwfhm7GKrpm7tjiPnzN5VNM1VsB0UV3cN/DwKhGbZrdgoz3vT41R+zoEDPwcuusIwoSd4qT23ODlW3ZQDGywrPNKkik8GlS68q7M2on2/kTVpeK0W0YD9N1U5zddn3mcVgg/BTiTq1/tO4U6mV/8OTwdCzIkkcPJd2BbJQ/wZ1sJ3qoSiuozxTu1Yv17q7GnCWztzaP9+HFvJXOvqbsKNxtw5te3SabAPYR9QBhU0C5Ki9zKX05qR/TRFTjMNvQqEtdQI6X133upZQNHC/9WsxvknaG8PMR8sKTehUlTodTtrgdUAK9Nzfg+GqrarXWLZBKxHK6uqo3xiiTpgTy6UKQx+taqjupXaE2CwYzYGlhEtYIvhlNyztvDeY2Y8pcKe+ZoVlYjM5Yacxo/fkIGtImnhlzBK93VEE5jyegyxVQLZGPdHjDp+Ry71Q5JfGXDreOmNuHuWPMz7juOKBvXQDi7tFUmGPC36K/FOBRsmYTEmJa2PGJF7wvtKgMrd6D7GSBkMnyuJ2VTlJTZFo+9+EyswwTTFdlslwVnAL1CKZ/KfSI5qsihC/0cP7dS3Wlfk52hV742Bv4EergZ51PjWL9A80yI3WbKDp5PlxHngtEeMfCo2/3PhN6nIDmAHlJl/KiMW+Gt+G6N1N0b3+EGbHM0jYezlYPN+cOEO4Vzz97ZU251pMEUk7MiXfq2r1cZkvkeSNd71nkK3/C8x1MOGX5+MWwatPQByQgPsR1qU4FjCfJYcvrBAOlOFQGizW3wdv6UDCYIS6uIVf/xLgZdjrECCSWZDdq1a/CmdNTY9exL5/30g6wvcAs9I4av1ycA0pUuHSm623IDCUm1ft22irMcJ5WhfHia9lVREOjLMVgmksWFFnv/y4zwIR0LQrCRuVMbJXQvmdkF4JAv6pDecs1q+w6z4siQImgrIZpr16nkSQ1pteYhvt8jEk3VNNzSkTyCK3/GoxrWK+DOO3RWuT1qXbwgjBwP0DcVOrb77eVymTaj9Ah3Slb63MCqiQOmx+PQRUq2Dm4AAnuP9vQhT5bq1EJBwpPh4s+nKx6e4jPmVvTnqvyupEEn4gVTLC3sKKG4Vr9C/NY0rcvbZNMKo9WcbDSP1p3jHml2tBBR50t6kG/T7KTJBCeOJLcuol64BgTgV5olOXzDWxvpweYS5RtlIZatRVR79rYWafKwayI3aA8fqsVgeO002F8+DZtDcjiwjLNzrX22tlUssuyRZo1hQJ/65JRMBfnREpVQtfTYfTubGYgnK4ozBZCvtEx+fxQVDIdeTybyPgoYV7dECbG55uhpcZhvdstpczQ/9ToY6Eah0SKyQyf69DyzgdJVunT0dkT0p4+v3k1bXSjTRl40efIZmrrzjQOBEI44XznyRlmgOxiEk9YZOvbAKqDqbgN6uEAc9nNGahSFE3BnDsLx13gj753kkkajcdn69401pvO5ZDHSzRQp8mHMFA6s4gDsIh6pdtKoCu41BsfaUZf/MmN2zqcsyjsBI0vETyRpec0vZRu9SwmMk8zukb3CYTODOndBsNCTHVpeAtpGTHlgCBypAAs8qoZeIFcfbrQM0D8A/pUgS4RuFeX+lSwUD9Uhf2R35BMAv/uV8wCJuw0tZAhhF9ourZ5KvqY4tABwQ01eRlQVb2F473e48sdXGoa+ulEiW30hHTIRJxbM2IvPKTd732HlM55Xy5yDHFSElkz1C0euY1MCRfvzmhan8024uWpAhEhhu+kfcCCpv0BYhAYkdKq1gyM68p10sJnn5Vsud0GMenRu3P913ue0T/rIBfRWM5Er0Me0UxD5Dk8rEY63Bg5vuFgNnlp7nIUcsWbRYy6QrpXM650q3cq+uBRhVFN0eCCsYH+D6t4TE5q6M7FRrkYlHShV+tWngeMRw+vnOdRj+n1HE7oCBDsufH4Qmrao1hJd9NwOXg0JQwdmM5FJUqqYLVsFvPzh2Z5spD9iCBkYzn/u5GY6v+0szCoHVimWdzmEqJqZUj/rIdOyq8YwUogPw0G2DBdw47s2ZocNYCc47h0NI4XfOyUs5ptsVYVPJ6rU7tMSmnOoDiTTGxJEU3NvoAAQZxAhZiQJs40+iCb4grsDD/S9+yiXpMXGR+dgXhQE+6INPcx2c6S5jNmkZ3t8qU8F6y6OJzhcdFYT4ljUCpYT2OqFceBjtObOC8JFnzwBRhWSKts4uAJXbZXD3AKuBYPncMIDTJzlZ0dWp0TBBL6slEyTbt8hJ/niaB1Fqus5Gg7Bq29MrSUNnXyNb+H1uYuzfusfnhNHO/kHdPGI56JMetQOF30JT3nippxRKsZ/ZTSA6vUtSikC2fZ2YcR0OMJZNlD42I2qzIQ8mdoQ+rExx8T2r8O30HPewrjs0xnZf/vSUY2Bw0MmFk6V9Gy43mdY2bpNkvtvMgaBI8gOn2B2UbMIxermFQhtnqRCrXww7S3AK29OvX9aW8UGLxu50CpbsS9B4uEXKRi0wdyJD2qjjGf6Fep7psNfFv2wL7Rt87UKFF3WT1a9bsWXwrYhCUmJl+x68BDx3ozRsnB6KY3YcSrTqQvlBvo9MjfxnBTk6/BH1P8XGbG54XMxHv4STN9n2Q/4wA5grBdlukABnNeyiIvb+M38Nmv+AMnN8r+PCwr12l9zlpOiG5EzmTLwhIuFwKdHgd7ezWAylt+Lbn4HU5xG7CmoRoZAquk4Zq12Jjk3afTyg7JNIBFva1T0ed7/aPAvCZv78LCGtOrkDzy4UvMPWmf+1tNGYxc3Pel8ONP55xjHWIiw4XAtwjENUTwXTedeCLfO4ehHhhnvTcPmNjyvpYMRG7uAkG6nfJ2n0dUKvO3S/CFy2X0zl1SalCBHFqzTql0eFCgZdU0RBP8JBYTvSqAbTm8A+et8HKKM3NxsQ1FsnKXej8bvhQ+dthk1Y3GGDOqItkoZOuUflw8hhIhIHjFxbw8TXQQmyunCOHRYNxriKbdgcFQGsD5fBBJWyMRaV5HVTV42wvBj/LDO1xJG17e3xJ12brGYdAw9qTkhkrT9EyZJzF8IEp6pabSIU7jJWmvV+i6b/D0COxOvjmqyti3P3Q690AO7PREETPQIiLqzxU8WmECO8Up4mW/GNd+dbdPRwYOFqdzBUsaiDTjDZd1ExWnKny1GTgOfGXtU3YB3iRIqa5H/Scxj4+UcEIaNk3V4mX9mk4xwRIMQTh5wIRtvSJJvLm8T5cjZNaQmACJCXJxSNfk+mPemKgR2oRvzs6aRx+zFLRkQnZbv7o5Hluiqlm+WRnSPwEbMBg5o2cmOTMYFLVINE/ZnS7rkhG6LDU1n0kpEFxHCsgHAzUNr2B3R4Z+GEXxXdVMOEBTCG+GbgEpwac8ncPJErQCHHyBtLC8v4ikggBRTaNK/+roMbTL6xvoRGsmGkJgRhQKkZ9YTXnLc4HXxJjk/DD/mts1b7Nrovk2Ddnl748Yc5nrxGQ5mFHwkHRMVXZX33taQZVD9OJjkeRKz9RJMg+EgPCOpcooHix06PeMqluQWS9D+oPO1i44yOsikRCnEJET5U/KHu5rSYvn8oWxAAYn5sX3LxgV4oLbK75sbS9p+LaQ6ywSKXmT40f+v0DxzVCiqJB05uymzm/5NYI0+U6J5cUx+VTZHZheBL0tUYnXUUQu9zXlO1H0J6LLzrhEaCYoSzkMvN++2YqvfxuMG0/Adq4w+IuQoATL8kqHikY0L9AsjwkfYllrk2MewfzKxrIbotdYHDTFsBMSAvfCGNGK9Y3loJGLCbX5gq+thNTOGdCsn11K+SbYYWtollDRGNMy5LySHwzSdDvdRhydAkVv3nogE2Hxq9Jv0lDTyfXwcnDQ5zab0oBGzBD/LiKRowFvW2MCPowzVTQTgCd4uB7/HCjPGkC+ID5YS16mWAQzWvK/mLB3eQ+2UTkNDfDaYRA+vEfo/LdmDCfMGd4y0ijGz3ZpOslNkXOYUO5xYtaUJ5b2L0MtHBDlb8RSj5Y+RHAjULxnb7L9o+/HxWvM0A639Wwpmrdd9OJGwZbZrEyqwc3BAdGiYnJBuJpaksPgCjr+C5Znjd6TK420T0FXnUk+XX7b4mUVwcusZuQKCnVR87BX1c9qRR4fqDdTOyzRxY6XI1iWKcQTpvfR85WEfulDzGpWDI8etr+u6+c1e12w5joKLV/BQPvfu6lHoQaKw4vA+Uk4Ze6W6uXEQJcTSzQUhIEwh+hEO0vHxBoz8b4S+7NO1YGRx2fcT4KKjAOau3VGdYf74HzzluAY7U5IaeBYBR3UitSXMd7B5zpDDik0iHbgA6qU7OvBlweZkFdcgX6AEuwXQOjez0Litdg5qkOwlOTXuByDYx5IYrLuEPBADbVb6uqEvbGIJa8KK95PsQShl55qlonfXxKC1gMfEaRY5taeSr46wkzW37XVlApov4J770sDSAyDye6ccOUvxWv58f7rJdTVGc/iIEtUHxlxsD9z21GCAMshbKDjBSyH3FBT5/6vZCem4YD8oHzvz6umcG19ODLv/DHMx63ZKsbLkelntN27NpCexMV413C1AiKqIYZ6QkcfzcnkO/BBxBw0w90DRu4tKDKdHF+9+s6XDovzFCaPjAvQncb1xmzdwrqdECqoLrJEiAeGFe8XSbptd3ccY7uIy0uK37mrxN53s8o3iA8vvnNhJWIJAWIazqL3uQ8nSGVjnvUxp0ysTwnE9SlHGg2PPVjT3kCXhpptvWE9h1tfTgdGsl2Vks70FUqJ8z4sfzbccI+QQ+5P6bNciI1poo1SAkeJZ1HjquEoLZSiKmu67YMR19aVB+j8o6STSjAdduvB2ADJsmSy4yStdsTo70fzUPfG2gkjIvkn4yntivJTjigX56zhT/3vT5lhBdtpeY0P347erSJTZeU0+//9/Z408t8uMGPR0yEsO77wXaI3iC0Hp/7d78PAcb+7hXghskyFehi0wTuqnqJvLkC26CV19cTBv9XZuPD3eQyYV7BfQVxDNJv5cAac1TEqWOgXRBF/JOl/F9mY9wNN6jFmKKF8k6ZB2URB3b1eg9YWExM7MC8+6o+Ouk1U6QAhXKf+nqRgH6jPEEIjnrT9hzPbhsyPHL7dwPNWp8vFe3pCOZcYfL6KRyi1xfCzr91n7R5rzAmieiG0wzACqAV1cdRUAKPdRA2DTqQZXHXUOjpSALnsD0PJCYFRLqB4LaZq/cT4+pfaM4dbdRrbZfqRmtQHn1yLKtg1Bl35OMX3mfTacb9UZiCV/lB41pbF/R6yMUO3WMjf4iH5t3fmrmU02uQptVTmJCCL6zhS4PuAgDACDsmZtTApccWXxkfsBi98pEkp+1rteXmNY6eqBX/gmUDPJ9dwUoKSIwS1F4jKWPAjd/H1lfb7vTXlfV+NM1KTV1bGmITlpx+iqEJl8SYcEISra0WR115C7m5Pm4r+EilrWIC73C/phBu5iOZWeNm9jJ5NQot3GdqeI81cD6JSBEohtyZEADZGihlw5o0he3heSwKPaL7CkzA/aTs7t57aZefgSH9yWg3cUGDLtbfaMpyQFgirR6Hi5buaOVso68JyFDo0xBYxTvBhsbXRtfqBYlGIzbaB1Guc0RX5873m7adXidjQkNt6Vj8f8XyhYMvPK8N7FTymuECQ2FAL6teNyhm/NMmKIBsXrcWdyDclIP70FiGiyQNrvFtWHXHV00BpordJvPxArJncr/kIyX7RA2hoSif7kbRrgglAPuP1OGSCMa8SPZNwA5LSfMUwmuOGymsKK8cAbVfhl8AN1HP+hT5ScP3nY5er5XlUaqS8RWJLr6SYSH1y4KuqZ82mkEbWp2jIovRmuZGcc2RTYkO6veiDEQTwymHxRZIG5pgYf/mV9MeUl+tN19AcWNlf3NKHMN/BaiahQCbUkzrj7Vb047fR4kh7IqVxWHJqXv1YMRrb2R9rttCu1NQLduxTXNs34566B709gJJIuazjEiyxrdNPk4ehwHkVd/A7SQ78YjC8Z2gJHBZLh/Pv2jHGN4RYCi96gRGS2G8p4iN8yWvRGAZj8GUt+umrs2bFaAldpB6UvtWHZxgWNpxO2dvOruChexur7SxjnLmJVngJPSbCIf2n6dBaJhjTkdgtzGwSloFaCrbsuMBr0eFkW1Pe0xXlhYkzcXLxQgPi4RJX4v1rQen0Xij2cLoIwj+dkCHPEM7vqUqGeOImW/3xyl/K0TS+yFMvbn7qo+3W71Bk+/fR7u9q1QxmTbvcN7mJjar8B8wLBP/vmSDgwhUuCVY5+wdPzOJxE/xBTA4zhF6EmZPFvcMSkIWT1V5ZNuacbTvFjB7uXLpTsj+V4CkE+fUqCdCE9nLQTNVF3FlQygXTJ6D3zfY1ysYewfHV3rJf6qfNqhu9Ou2WxKw6zZ7/W6J92MUBGpzLp5hIhbD2h/zv6jGlvuHCvknY4yB3wlYKAUwlOaXSo78Vn5TvtwIVYdaNEAS7fjNVSzleeKMn9+XFPNJ0RQWPN+CEOX6MxoemJSIPW7x8NS+7uKSNmdpyaFd0NvYLLlB6eXzt/dUiQlOal6/hLZI/qC6c8RwsP/oM6+FWZ/1Myw5Th+F9j+I0XbygSu1oUynbO/A6NldHu2ltiUVPWOkd7HJqj5ir3kk/Ty2vT34mhFATb2ZZykQWywWfO9/C76AvEQSTE7NRfsLCCVLcQZ0ae7wM1pj6rOJbhAO/1Ex2sm8zO1C2s32O9Lubu/5ghXjrFpqheMtpI5IqVYyrsHkQcE+YkuQlduUvxm4mXNd0JpLeOkEoCcqCIIYwNnRnsr4kw6zbm1x9gvpOYSy31bi14zcOBc66NXCWCvUZ5yMo3IuH/+XvxquzJt+y4/a2JIZU1m0hejzu2KgxxMKPvyswMzVVtzVTuj9SS8c+Ernnzf5KK5V8xfxlUL6vEUofMWrKbHZbW94sc7ncHjE9dwodcpPNh9p5Mu+58t6MxZDPZapmhDi/mKwn2Kmj/T8QRQxlUZrmQacWSiOHL0G8DUEjWOx7Zauun382tiJyk4aw7w7CEokcPdaZiCANnHcuxWpSIY6zQCJQrs/X3bHLZlyKcjs6JfY0M+5W5DkRQAO6hFIv/AUbiAjZ+zr+TOQb889dmnDl99ADWZIPEKwZM7EbtB+lI3aJ06XNl1bQLhbT7tYwuSDo6uuOamO6G0Ween/R3hjTuM0p9qytNp+ln6EXFZRDPO4qUyHmKs25aHGi8JMIjyB721244cZOA2XZ0fcveOXfeUGpeKqjDmjn0+ez3Js85uvsEp9JPFbCLqFX/geR5r8YA4E77eSfhUWLN8gCXq/ETPLOCNYKoTKE9o2o1FPfB57sV/2/fmn5IW6S2Sq/VSmHcbF+/eHV4a+MoA3Wu/fFE1yuLCY8wfx3fP/VMiCKpNRHkjJHUk8HEBu0Wj9S7go91pb1O0OR5QRoHZrd+uCfC9XW3oGh+t0W7wUldiWfQkS6EmRZ6fN/y86sKl7cpmYHQvYy5mYVT0poj5njgmq7rRKGRPc7a4GnfsB0Rbqa/78mtRtG0nOaX9BVDPqvXYxeM0s5XXpWVgkd36EJFvMLUeLCnROfO+ZSJZr/RhhYiIgF7Z8wiSIrUQgeT2Cs+KIuEOtnTqxzAfWzVZFcH4ctRPya/FmikspwvMKJl/57P4/rxWcmqi+lplargetPV63qXYUnXkSwonUNGAHI5W+Itjx0DJazxY0Zc9AKPWuHp9hR699urbJZKODNJwWfTWsJBvRPs6nVwklgAbUyf1LMlP8H52UDethwYo5PI57Pt8cpm14GXbQWKddqSfn9CXLYS5WyMr8qv2XAhW5QjK8t+yHpea3LUDyGTmTF+ZQMCiIrMB+TxeRyUS5svSz6XY4Gsy24w5fPOnWU1cFjAmHxt+vzlKgHHrjKFMXryYOI0lrehd1yvXOT9Be3bE9O5CWPeqD6r8UpixZe4BZJLpV3UzYS/cUdgmIkjI05preyeGDLLDI+f1E0pa17SzDYgVygLV8I/RdFVTr5f9KBz/GaKDuakOeGwQwHrnj3Yi6V8iNsn9fChZpU0IvcV68DB6wvJvzii8JsUJ6Ge7ZRKQ2wmFPwJ2Ll5THltI5g7UnPd2VT6Sh63r4vj4nVzyluy76sJDG3wnYRcO+ThUVtyuctxUOscLlk236XkSZ6iKDQwtxy0mM+WaHAGIF+SIg9iuaffMs/DuQzILB7fh/9cUpY01a0aLkMHQfxxIjhy0M7Lwoi3wJ5NFc6wrzxhk3+OI1Bpf07D2OL3XsXqb3WdQ5tsXvzMTF2KApOfbto6NG1zW/DWhKr3QMveliBON1+GELxwEL7JQRDXYHWP/HwNYmT26qoUgAXNP/VMrAVa6QL5O95G9GbmGs0T6uZVtWI7ZI4+gfRz0MrnQySktE0X0DNMMS7JA+35dvbGFzniPAn0G/teKPs5pKUTuU8nqY8oRyMZAqSjQmcak7PE5U2pDSXV5Q6n+clYoJlof3KgygTCMBXZQhyWeRTQWhIK6VAc64/HFkosYC+RbDhRxNWrs5PxvwhwPZIYe4tNK5Hw7Is1tXpOGAibStOhlkmL/VFhq3a37L9o85iHE6z6y1XTnwPmpyzq3tHmEqxGG0vQFQr1qFEZzsnLF8iiFUsYduY0pLl8mQfsndIMtKCp6sCiO/86jBnF/gON2M846YQKFsRLynOGN4L2UoZU3d1W3/IX3GcPc/I/DMrrd58eWzftl8PlXUjHCgXgUA3NOz+rrQY1ZsB9EW+3gbRg1Iavk91y2E+GLYrGvYVNbOktNVSHml8cBESe2Jm/wNiPeeIrovSVoUJ/jZMuFqg4QBUPAPmHkhlhbELfD+rsuTW/kz1069mERq+6rdk3PHK0PyikanNbbr23CyV3pkLbD49yPeWRqU86aPwzFeX4SRuCQ9mNNUgtPutQRviJ4Tu9ixiAjfiVCa5VIqhUjr+a5hpbhjekNbNgWDB4OJLL/PP1LzNVOAxMGrGvdLeklpQZzk5AYMSdgXBn1J8sodCnLf5SvtL+Y6RaJn4nFe3eeTxybPdyYJRWCfwLqw+0CKuVTPLSrN1Yxf8eidU5tlElEp67X2f1wrBePksiHRmj1/2v2X/5c3p5X/qg0Toif2cXobiW/YXW7Kv5AA/qSC74EvCGIihAmZcwzbyktnKX7cchoq88h0oHAfANvGNHx1NnUXyM5wGbleBA+KFjTt3uNnQp0i9nrEXnVW3Ot24MlBQmdT/GFczdYfUXw9puLGzodIU2iVmZyGeVfmAoFpmMXQlmkHC6gdu3lpCn4HcFwne46w7EmFCEwg6b6KKQeYzWupF1j/UTkv/IEtfFykIXccOJUlLpeSg2ebo/Ic6aX7WWC0ZVvRmwXdj44DGLuyNJhHmX9b35/KFKvHBCjJ3NTWzhiIpFsTKf2XXiuxWLERyxcs4sDaz64IZiKArxMyBGxP0XxeXjfDoT3+4y/d+8gY59OwvJAdH3+BXqt6ELCl3pDwBQ9J9klHT7VeUtSb/SR6QeEiy5GhUq2RjUb9pB8ow+4DpnzsyxzL56R8S04X9b19gMyef6AlurVcPRA5U6CVnZWWJUmoZeKBsogiKVbe744IsnmM/+DkIpoOwBHf3hgjJADDtoCUpRS/N2XlQeMJfDjwXb3elM/Gy/ESJeei3fFGvkeYXmGVSMeVIbMFiwfoHtTfyj1a3jYbBe1+zsdsNQGh2pKYQb/mbDtzy8ekSP1xApA7am3D15Hotut7yytYUuhUlZH5qfHmkltbVKlSpBRfqQNU98kBpKRpJaQh+2skuOq3kWvd2kvNAGeP9J0JjJ/+kUxSpXqnDTkOgIXu6dxv39hPibdsdMT4Pem0O3E4kGsRgmkF0I1ZtbWk1FQAQdbmOISEDDO1WELc/sleBdJdTJFn/MCattmXzMGygo++rrw982ky43zKW4WHVro/PpFBvxLO1BKK9v+bHqddNm8e72E5CqYmTapcHP2d6Aaox+8WjcPdMhApFb3w8am3qeu3raOrtwmkp5IwHn6rEjQ2mYaQrYpMN1dDR+ccB6FJHpCJJifMpPKI4lThotz7A3ieLzFB1qOg8ZQgmwo1iu3B6P5npc6/hQabXcsXNGRuyp6LsBosMVid7MIWyTuvNaw/uR3dp0foWNW4f5YmvMiyjzhjwDxDXc1xUTvybr5pzuCTeemIePC4y+MP/99x5VGcAZruaHwGpf7eUzUGGeQrHmpBANqUw54bvOpGm3TycDxLXeukJBLmwJHRWJa14Ubu4auFhgaLeqQ3u0/l+gGz/oN7KzeeFy+/EzDgNZ+qFu0j0c7hpHzh9ZNnCP5jatlUbkWxe/ZjRLYbfO0lz1fG1YG+Hr4LkQStNvUt1r8hylJthZ9KmEeLmglVG+YeXqWrT7KnOX2N/yyTQ2TmpZ6QWYDaTnHJ8IYMGCqoYyf0P56mzFqjEwOQLCR3d4YDq5hdZPdZfW4uF8fbRgZRddqXFknlkNrqU78yVl+tWGVrYXzjqoqDYJ+uiftN/gmnlVMMdM00IjCQB7a9hQcBCCpCo9ju1AMSPFVf6k4nD/BMebjBWv1qsRddZOmQsoTnVW1HPpr7ZpY63AcwU415v83GD2TesqHybNknqYL6dV2Ul8qjHMjcjvhXMq5wdqNsP6fHO7WsMKR86SoINefUrJkC46yyXNBiTRTXKuuNYVQ4gOmArZUxkTsr+l86eAbJKKipyuG5suelRJYfx4DAYo90w+l8i/6/qSv2L97Lj4026WQH7vJUnTVMAUaMlOKeY93UpZWs7KWmi7EuiEmHeQuBsm8vn2bVyhKqnV6UuAYMgJKiGHtfZxgiTRErmEFTiYmkjxTFSkKZk9afshCiFm3DBsTAnRA6W7XRePwOGWh2UHQVhtQj3P3ES1JGQXZPgwpa1O67aI06vV+rlaOX2pucGnBZ4LVtvKUhz4vt7VyZZa30YJ/uB8BmapkxxO/FUEvLM9kE7wdnqQXxD3i6ZRlXHswODeF2QuwQPODBfM82bnSdegZIBXesxfQFIXa9pSIvPQjEtyvwDXFiLrPQIM4SAy+kKsEMlrgVHpNqXA2kgAFUICs+1RaWc/BMyqhYWweoJQTDXuqP4mRQgG3ZuyrnBsUbXLAZ1OvbSps8s60N8xUrRpFjgtLL5kyT1m8dSjqVo3m7zeS4EkdcAAG7fssGTpiAS88R71/OeH8fBmwPE1dZFRH1af0G9IRFKU/1RA3Jt7olb5+N0PMat02sAFSUqOuS0u88bqg3UvjBKeE0VVtSlt/squXV4lZDMO3TEyURVBNLCxO7YZiWU8HvUx+Rilo+qQeHKSI20w720yd+TLDDrbaG1O3RomUEr0BWbDYbc5rsrZclNCVklcY5FDJKysGJDsT6xozH8rvbNaFSKqt/Mp4nCYodyr3NTVslp3U5TZll082cqKJ83ULmOEqSP0V39V+VINEoLSK3xUezhpEc9Q9Y7Im1Hc5TVk7iYMbJBspiSrnxuytQ41qortZhz+iJYZNPK4VLqUKAeWN2/KEg2Lqn2nCWDB5FemfVApPT7YV5Jx3zSaoQbMqwrK3TkEcPS2My9TP+pKNGZfCE2sz2EGMTpz5uNlzOhfQa2xPVwpu6igeSksJNjiM9YBsfhEbt81vciw+A8yO2t0ET6wMdcZ5GYmOh0KTO8xihvcPrOfuG0SlPWNPx0+TSsYNba+WyhQ1P6Eu8plcEt1OQcP+NmFz6Le5H/q5P43zpAG25qENJmer4iZl/Z5YFtMaMe6F5Jyx+YripTfHyA1OSm0l9WikYL61g6KGfkybqxy4cqFsMaQI7SzSn/cw/mmiPXFsjLyLFWlhVqjG5JwhORMJ9xNNR6cCrvXNMb4TLr4BLRb+t2pQGAPG/+dQq+SPs/+EkYXNCZ7gsEUtpQku1XCqvXK7m+gkUhZb2WDGAZe3VgJopGDYc7xxfVw2GBJdKwUU8+dJmqXdmdfzncP9MqUczBJTMwQEsftOsFScitC9znD/LQV2w9orZt/6SL/dOeeANK2Fw/5vlpe39bfvYFmwmDKk9tXRnicybTi4uJ32PXdJb1U1tz36hivE36Bc6+JG1YyQ/BmDuI0maTzSNVktZGt1bhqxaB1caL9AHk2TLL90UuKbiObiyDchqP1CpO4o5lYCekMv+Z2iFJSh06k2PeX0Ama453HWvUdLBz3YqMVGrWucUqK/22puzitU8OQrts5ak7M5pAMqmnahWtawn/OZeIz/aV/OEpgq8DC3lcptw4BTXEwYl3yrJsYLuXllCsx/7zh8W/pSXIdUYKXzmTKzXAm6XNTTqoh0weEKeDOjx407gsZJIzq0R2JuvabLchFh1VgB9SYMyCXw/b837nmHbrx18+q5cvBHoO2ge0nzZKnlg6QakO/IWD0R2w5eCoapRqk05NQ8FhFfsODOeYmlEbMdmkeaTc4E7lzaYajMcbG8Ra6+Tc/vAXnPet9AHlgCUY7ZsKiQ+RtnG6EKVu3D3bWz+5+/3e2mtwvIjMEx3IEasWlZ2hNJw+WzJMohVH75WstSfo67qko1MaU4Rp6/ALh9dgJKrepiDn2mIliADdh0VQ4gylrUOU7RnhQCssDu37DaL+mcdVRoQOwx+YnAbrT28KL6KvDIgx+eDwUqiNiwvUxXyWE1WzNwHdA5kgmgdGmdvD+lKuHn0lB7KjyW722Fr0BWpFlFdj+jHl3GhIAniNoJWKfJfQnpxHODYkv96gmIG+Ak+gktgrfIFZbm2kYNUE4NDWoXm7UpoCxfJopxw+/ZP5Y5IYAJogh0TWnY6Bmg3UTCoFjwBdz2ldDU1hbr9TAxsLFsZEpU6gxQo8hSdyUOvC+No6wM65cVZbTufAbBaHdTY2t7z3fu6D5J+h7gIn8YQr+VF1vvJJZ3AZYZllB+qiugeMjID80h8H4Wcs3xn3B5dD8y3vOUQLWhqcrBISc0Gb1KUmNyo2yFZBFSsB34sAUTTGJ594UmYJzB2jo1YTSivTA0oZ9coFN4BdxdEWvmf+KVRshhB8hrNGBSvrRmQlHYLWarrK1DTxpZ2d5Rcg7/G97og1lFenFnq37HuUQtkJtMQPUOmetVe6DcU+8Vm11NyvPljd81R/xRqAVydC4QS/bDQdH++EbjzgCc787Fv5t2RjOLbebaj+TgU9iT9s//vv8qgFXZTanNsZ0+Z2KmlgEcrm1PZBYY5fOc+UxFRp3dlQ3NLLpRnnxhQyxc53OH7Si5FYNiC0rYYH4+5GlItyUPMFGcDCqFzWPYgcl5bAAULh0aajqL/F5bG9b7ulxcjv/PQivc9/zURkm2VuYUm7QLIiB/2guXKIeW28pPrNIzSMxVWOzNWE5ux8Vom60WK39sr05t2NPYwNvNkry0Ic0f7xc+X0Tx73ytqC6YlStkfv9G9R/xvOaxCuV7IdoHIYBmNaHbi4OiOhmZA2k3ZrUmVNuvjZSbTPogefeBsiwVIniXhovKAkMIkG/tXCpcNgi7bHR2sh9CuzX4xPmUZ1jjw7H8et7OOULSozBbiYyW8GGHD8xFqHkNbrNjNzxfOAhiLKkw6aMiPLEBpWjXz7m04SFf19Cp8/wVjYfgDG35D+EjlKkXwKwyMS34uIy7cq88NUzX9dFKh/NpWbg4vJGGZxB4GSlhhzP7Vh1dyW+1Bsd4i8F3zI0GbyMyU2jb4unXU0m4wfFuJNJoEsnwBhzt/BTw8hk7gL3m4rbsChvDY9HbkhxKXzAZk/UQLa4XsL1QWWrc/hpUyUpVrXN+RYc47Zu+gMjvnsg9ujarIMSu1LsxM2sfL0un7EBGq+MQWsrgWjfKrQefSZ+nUdk14GkmRwRUuTHsb2vcIm04ynWuvkjkFLcZcG4Y174KvN9XC9Y/75SFKpykxlnN4PN2nvf6d2Xj/3/A1hRwmBEFiHW3G/d6IA5a9FMhFhf9mJNgYv/YgGM2DHa4p7I5D2kb+8vD9lu6X0nBYuEsKNwYyz4V2u9gts58oipu49kDT1fyq7qpfUZZyOuQ0BIFhFtHRNH4RWvBEEyW+uztS1wdR/Q3KLfXp6JzMMiy91ckcgvPRPtnulU6vKHYWNhRXXOrjO4+KkGgXxA7DYKxprQ8mdED19aOZmqEIVk8l31dC4TXbSMtTmxoyF4+IXPWiiqTNlK1MOgpjAp7I2UagxsfS8Xh+SsG3Ec/sWBYxE0EIQLBmyBTva5aRWBV5U0Cv3jXj7yPzcwsJWdUHFkh0TESrA9TjWJ0oHCwIoMbpk15d5KY+iXnCt1nYqYJem/C8IeVm+VTJPS/NmgmW9XSZqrg1G4CUdO4BSVmLjFW0tt3RoJfUmP0O2z2cDe7GMJtCDlCQKuydGK2rZ7934/5UYIBuXUPTxEef1cX50U10z75VWq8RS17pYJ43WlBLkXvrbvfCyTcCE9ldrKdl721s5LNNq3m7lkveP89jFvndSt8o0afm2Ar/LjmOtKgek3SZ2cPNuzgVBk6EyMSb+JzvqX+RnBzhL9KyHu4U4HrXSchKksuQaFWXxEQydUMU2A4JSq4imp7PqsP8Fb+7MwCRqyp0b3NdO6nZoiqlts6J9KWJf6xLH+2sQdvC9ydL8ypNJSUpBwQqU7TniQnO9I9BWrQFxuLoA7bk5Gn9fNi1sVxWefDmzQXZ3qSQQSsa08ZFg7hYIIORkdFQ7YrCnYaLf0qubihXOkXB9XU9uT+7PjS9kmYRJYavy4FvljDNvfcs7wHwmnfkrKfB96TEA+8eGD6nYz3jGMfNm603bjUlugX3GQ0g4DGeoZqdbrGUF8sKnIUSGblbwa5ri6QXw67BZj+D44bnABrAJ+aU1QLgUG0lC0jv4Q1N3hpZVpScOP6Jtsj6GXWPbMNSyQtIMcDUTzjQz9glHs5ogCM6sbXqoXFy897wV3RLVBULnrzaK2E8HHcGnyjdTZrl29t4OpN79A5T+edlpjuBxU94B1BUNFFSNjco0IQ2hNfLwC4g3EvVTHjSxbWu9IyxVmnKfj0qDOOeuAnWY1jJmjGCzeiFDXU/atU5vXJkQvxhcof/MpevjQ+7eMZg0IoJisQoqxoQwr7SiFZ/kOyCEV678FQEg6++DnXA9Qf9Z+SRw6yn7c1E54/j7X0YmTJtfDa9RymJNwc+z7C8EAy7a5jUDs8a336aXZoeYcrcOvisatl23utio1yTUv91jhWuFxbrQK2xldjpmQumm2g7k/oNrkmW7NvR3rnykfaFy86ygt6jK+aphBKAOPVFdVHEtFXtWnfr66pMAwiWKCl+XjT3o1F9/abJdGV/ZgPzWKZ+BLdncgdXU9HhVCB0Otep+6zZeBiSfXGrLd2eUz9F1tvxZba1t8I1wi/0M0/Zhm10jnIKk9ra/giUKg8Sbzw3I+5/8yR/R9RPSrpPkfV2CMKwiiRRFOc8KAtN55RiH9vZNM6nlT4DXia1qcvC0LVk2ODdPPEfoGXxjDrIsFEUj+8YO6xELhuMNoqI4hR/5RAYzEzQLM+bHXOTWjG5u3YxH1Z4Twx5vU5FJOMyp+9eWFwMpTE8QD0D88gro3ZmwSUbAM9wGyDsyHOKVdXgPst7qKs+MZXDXijrmbGlojY5Q/hszhmBcAg+frMB31qNy9M5ErFr5Jyv9U6Z4+jXm6gz70pp3uGvolSTKtCoROjIMQdZZF+eQgW3qqQHJsIBzW9ZJMOSoGFs1GbYFOP8SgUgM5RB4MG7/FPqMycNg4JW4eYT30AEpFACq+ykTa8ju7Ls/5/GqKvXrOsPm2fYKzfrxpVX8lDl61JwA8bJChWLl4NcYq7Efn0BGa+xw/Fx69nOT7aMvEPiXYvjO7dQk8K6GCHt0dAOn4JnCBQ4UpZRB0vxHcP+d5cSio1iknh6jvYrcxvT1QDYqeW/A228ZVT9fPWLd2DYPV6oVLCJetMWpjUpJCHj9CR3dm/xAJGmBe+W/mgTCa21W2bdJU17VIG3uVbLdkpC2JicLCA9ItirfSVvGHAdoueB5DLWgLPwN49Ao/ue9VnH8xcOPbZIEE/9gzC+caeVbAbBBvLFuJLmy9HwtGrI5MGDNbSZiogG2iTvmWuSGRPKbM4JFGKyuHRFOUThpSOpMCxSoObBgmgfNV4+vJluaJvMcwit9IqBNv+P8x24dOYbOotk/BRJ63Dp8WnLAP2CfbFnQDRCAhabYax2oeBO5eh6/fbBpWHRpSnnNYCkMkKEBVB+R4xqE06x1By0eZnQ5yWwy8fSZPSDzsmG6vxcWEaf1gxxsykI+PgdF55/1FaBZiJzCNBXjUdvqwE+3Q70TpiU+iWkKtAAZFkRaThhue2lxdz4T7e293i7ljWAt7OACBA6U6GOAdexKrhQ5JnxU3CgPzD7ojaNKivBIPt+TttYKkK/QampOW0E+phS/znOYbu2xOlkzPY+qorSYzrA4HUwLzgRvcLl0JS8I8klKyx39PwUaDNDb3rknsbC6XWnyM5UDud9o/RAnNTshnxYLVCZXN2X+r6/e6U4qAt1/aeIpSsVT7i3KWttQYadjcMymFcWJHcdHSovIp/aRxFYPWgqVHU8HtpsfEU9xyYC+HN2j3go7mtGzciMwjSTx1+KydvWY7gOLtJ+bnBEK6rBEdHfbrBjW4TvHKYEBEnNG4CWzus0MY0+YHywEkW6RCYmNJjnCXvRWDULqeLfZvKAADtENSIu7NX1rFXbs4HUbknhOPlJxk75WZQRiIv6QN365LuEKrcyDIfAWVLZYg5e8NUJTu/M4KekxBP7ogMAx5zG5sEfIr5nXxT87tQFtUs06MyjpSAglR5FT0l6UDdHKJJjC1dufNbHxIE6+tW1T30MEgMXUkV/Ho6XBdnusvoA37Mo5inbRJB94nikL+AfJKUICvK8pP6PrcfAPaRppTO14E7HfN9LKCnhYJJmyXf4+EGYto84o0TWm8ZbeJz3YmJPRZT2m1FbPUhUjST0ifb2f9u7/jflym1H/Bq0BfpaW63he+mpZQbZoOTIQ15OS+KdnIc8+cd+8u20GMmLO2klk3e5ue+TyuoWrpbLX7ePgONsloU5ypho/oMQIaXSODJfhPA7Na5MFKNPrRa4dSuDlZmYhExYCbF1b0rPjc/+CdVkSdwZbup+x+CWWdqKU2Wq7ncMyyCEu01R6FtBxmLWxjI/oS/rfKXrlFA1Jjq86ZaBpOcUIx9asNS1v1yKxtFg2nT1Vk8N+rcrF6iLO2hNCJS+HFpQFlHMfC0/2l5vFYxEBD36eucaF6cPhYi5TtWelDchqZkcT8va5XpatpliZKR3H+QKZ9jBX7t2Ngwlwuvx7Ke7UPetkiLmMZGeH7P2vr47cIVILjV0diZC2tXwMjn2oEIvwlmM1ta4xu61SKDh3ObbJFcEGBKk+ReksnKPLo5JsxXOWmbpC+JGqmL4cK7hFyRtk7gnCu5P+NMMwqPoGwrx/Uu2CRmmf7623MzyaloMbJ6gXQOEK91xhcltOzfAAoRiMrAPukh0vLsKYvjgL9P0WIzEStO5fB0clEY0ao7Gt+bT1yN2rSectNGrDZUZssuFlpyJlgetxnPkEMztqYBSYmSZQEv1vRM1ghUS35StRtGgRfDaT8QZQcEZMtTHEQY68NvX8669L2Y0mJIk5cVIJ63Jsj55Z/6b3Cp3w7Tjog7RyXcHnDyymwjIVtr5HudvDSBz99C3WjjYul5TDzPX2a74OfrgwgSbTz0EpINWwcOCARF7Lv7gcFk8TMb97kEFRohGy6J/nxK/3u+GqiKP/U9q0Zz/L9784OQ0eN2XbTRuNm6bqJeWSdNDcRTuD8EpytZ1QDYHtv2cIgLqdmz4NFGLumW+QU2MEXYa0rpFprMXMeavva0ewgrUVXlVcsBdYB4VRD7nRDUBpzi3ar0sWVBueokw6nChJfsv9gmIU4AGo2x2xgWgy8Z9AnDQkc3YcUvpqpBXVppvWdmbg9Gghpg4jpi7mtVSx9ShuCCLA0zFH0olaBiUEuOsREQkWs37TDtDFS+bA6rZHoFpNz57c5+Mxdjmno04A6EKkrd757cviO7kd5HqbqQfLDjQOiyRplZJxK67Q1FwgEV+7zEw445T18ix9TX1vtZqx9kE9ommgcLAgyQ2r2bQpPLhjkL+csGCChBwf4NmLefC+QMgR42rEY9rx7ODBFCcE2FdG4F/kCY5h9keRXVfwwaBRS+PMJvo+/+/ij79ywWO8tS549HGjZOKC4xiqO5qbRlz7PKoYySVt0fLQ3DLR8BrQ58uDxk2i98VoswbtMgtNI/Mo7uPTDaQ81gPY3968zGl0TMgRLQWE46gMaF98j7UneXRdjqE0Le09EZa4dP8rkUSRtoj6hMWzZ6jGeA+tFunj4V/53rp5X1UH16DVOuAgw4p0/txbDKKFbGTwvkFeEtmn3dgYWBOlTqRpnLjNeMX3Cu0akXEYRsCe2/lSyi6jgTRGEqwE+dj1wdE76OAAaTH+mDogCVrv1FlK0585S0kRwtKTAHeAG8MkFlPK8+si0CmZ6RJ7+MBoBN58ix8jKK+Cs0E7Uzb5x7l94dLI8HvBDfq5cn8+6FDx3JBzRMM9T92ZAa8YKDoKzNnqYb5RzsIpo5wMUhgv1b0TMtG6R9Ph9PyU1vNqmsTgbAK1qeoHl3Tl7q1Pe97K6cC3bojMWuOExN7sqv6aiVMrYRe6y3jIjAm5gJAp1xWUgv3hEvXUVx1dlggyMhh9TbyFr9pQZS5RBofeQt8/Xb/tLlBRlJUvVjCPMIcXdAq7kl/GAUpK8LY7e9yDWw7QmLcg3jfCBh2pAoA6T/OafXAXEbCobJv53P7e996AnpPnwMV31Bl3NBjiI3aYmC7I35Jd9z5brsDqWQ0mk/zFZsRUK8PZ/9WhCPhyrhvxa2vajtNLzoRm0p3N1gxu1ze+AAwPz96ujtF9D2UunEZhRo6yuB0UZoaHCZRISabOxs0DAWEyZ2bI81kRxsBNc90S7C50iEyIYOPN65JGtwMnFwoQThU6yMZN0dLpXFFZ1D1SM3He5qVibpY4p8pLQUh5LsCZap3ovCnBH6PTJd6dwZ9n3pwFv7zBpM4iQHmrUOrzwJ1ycWbuQAmrrLE1w13DslVKMY8gPMsgAaROpI3MgZmYh2kF5UGDLj0+kJ+1lZoIoIlIBHaLInIbycmgKAspK8iTfa0cVz8X6msmHApZkKXLOc6xc0laK9a4bK8PejgDWOJGuX6mZ5of0B057WHSfT9qKy+Io3Nmf3SkYxAYCUIuQ61Huo6ydyk5kjXDd9PxTdSLqYrImcICuQn8nusJ7YRBYCPVyabtKUljhIUuuvDyJZwUMnLHgKY8Xu23hQJdpfTAQ1wzhnsta2eWTtCn8Ff4cTNwia+5psjHmJDtPtzznnKRJ8oVJXdU3BWQ94t8S8kJkAl0OKvyb/t8XekWz134n81tj4o6uiPStu7M3kThw0yyBPP0GOzeE+cZy0dzfuAxmcMFU27Qk70xnqGh7056eaKi5P0ZbxuYX/Z7wLWboTRAQwKhrftLx/8lNmBBK7EZfNr0cVMS+I8Fl5LDp8nqrPnlNnzZrK28i1vCub0X3diod37ksOzZ16YEdz7isNvm3r6o4A5jGrzxpPSelIrCArbv54Yhytn9J7RNjv7NuG2o04KYkuLnsnGLyNYFHEj45SaltCPszod5iUB8e4irI15fW8dNUEKlIsvIDd/dPG4GePiUxjeM5UpSaib/vNq5bYb8hPy91fs+F33KDUhnzIqnlJQYT/tmUiNwehGf7o6JDUtcoA0LWdmQhT8lfwDbvsci2OwxmRoDlC2igUTrUEElNcjkDcHiAj/fIbq+GzTGCIB6Lni/MeGH/wQyqi4U5IEcIsigaHaGDM5Tl/EiEnJalG2ePzMfiOlFVGPJxz8OXnSVAzhUQfo6vZraolRNIzc4lp8nSOAbQJB3d/OZ+ApkwU2KypSidPQos1z6mQlWwzj4muyaYMYRKv4BZgPT9i97u41zXL4PkHcOAZhJ1CAyAELtl2+DEDgES7WB6fC+EDBdbpAHcWA4F+qhHAat85ftk2LDslmAR2lQ97L6izAIAr8+r7A0jfFxPdYnnDFpv9kxitQLAvZcimVmVPwG8MaxJDm0PiaNp1/esCL4oSvjLhy64x1xGxsh0mRFQAzYD55C1gPMsqsfNRfiizU/XaWZCCu+hFNC2UfBq5Q6wKdBXBDZk4wGuiB0rnu4zIN5vCmGD3vw6glu0wqwIKymVw8QwCclBfYAeJgw4b2Q9xkdeHa5ZNmKsmO5D6q6ZgpK3AdOm++TCzYAZpEgCewof6qdlUYvLj7G71oyDNjTM//Vzd2z/3cztC9OcZI53VDGVI6Dcn23rz0hb93c95VdE9OQ3bqGgIY20yKABoxNjFhqoRt67oLuFLTMI9NgaFc+UDl9+veurEC09uR7ltGF0VPAXFGx7yjOVzzvf5k+7EC7p3n5e2BXwbEUtd+4r4NXVo2Lng1UpWjpPHexKOtfBu+9IKMjBJTQdpTSIAYbGcpiFsHVtg6EwX0FmsHDbhCQP+PavTa8FtvlBndGj6QZNdvxRe2ihqxhg91DuaAA1IA6ucOgDz6o8S9VvnJkySPuU4FWZt1oVYan8XJV57WuOSeMRFymW82WaDlePvsSOWqEPToDK758dsGWXeBlvvvK6H+/mycjD7L3cBUECDNOCsSqi8BHGMP8rf1l3fnK9+m8RH2KYuvptN/Co6jzbu5IFm/MZ1aUWsoWJB5x/2+nXaDnf2kspj5I5fHKxInTYqdcuexX8qLn7TqyOAapBqzRWSs2IH3x2NAioDMkIfdZcV8IHTFnmBcNxZe9ezC78ovlATD29clHqbzzlcsSxRQWdN6UbbFsnLlt0iNH3kf04/KQ2dXcNi//z3gISAyCPEXpLdIqJJmcjF18vu9ySOnZ37t1LXspg3jHAa8HscKnSPlybyCgKVBpKSAoKOyDAP/oCPQa6SwtgFediChfkk7cPeYzYsdKpthP4UrJUbVfeLPnShpbKFl7JPP8A9LsxPfSKFpN+PlDQfikVFqCsX3IjfEiQwbTdX/muno+v9QQCG6D5ZVM9Ju7dIQyAhF6GJpzeFzvRdQLPKD0iX9OppvDFTAW+M/oam+95PJ7Qzy59vm6iHTKh6TR/+mY/+um/KZLYhudL+4oIpNUZsYF1+Naa13ipe1t5hunOBP7m4Gzp8FjCVeu9Ew6H3Q6za92ws3J8rwmcvXFD0B6J5udu+xw7+H9/j6VXK857xTaGhpbfrdOsuDqrnecVMgAQ2CAHPaEAwKAgBJeqOsb7JBfQzMZpQlMfD+nJZ454oz3NCgJPAWPOgydvCCzUoTNqhKsBKmkegF3eoC4EWmWC4CRjM9Z2Z5fZawIiNpJfXhSPrNku/SkRCcPBs9DLfQSPEEL5hvFlWc6NcjivzhuWb7P8bocSrFpAeX3VTdKdvykC3LvkHrdiieZs0M7OyDN3A+x6QH+yyIvmyUmZbB9KmzBN9sQNOmXtv/IjN159ZAeK4DigyqB09OR9B13x+FZui870m0znSAXztddmJSXSDhraAeUUxJxCvbHZGgoCPGew8DEMj2De191AK0kl4eiL5PUBkPgBou+gFVbIwfwSR5BqYuAtEyp21q2Sz99FR00hk7E9IKAbV7Ioa4ogvmyHPcGLR0Qa/yR7vniQqB2gmcY9XKnugzM4cl9dJAcxihksRJDQ1GMS89eIgJ7n5b5UDK7uQ2rum83BjB5/+UPxhbtX6AL/GAEgM6wPJnNZVSenbj6PsGcse9myJWsDc/jlzPW/FZrCT/34Q13X4UQ5dZxFwAlK0JLvmSrWhedOJMjY+0hFyl7AUcO3R2iIjDMBx8DfLF4OAeuFMBLgg9mzsM8ogMCHsEg5vILptZ+s0BOUNfMFYA9jaAvTJj1EVjePISkw10X3WWsme9Aaq+b/J2dCALyIlGyl7n8yLz3aSG3qcw7CcEO6JrT/P1tbh2mbi0vIyD6nvruxqqBtsHJLlUV4c6U2+mmZ2/kfzSu/Lt2FtAgpp3Zqhx/Zryyhcy2tW3iO8wMps/y3bMICMQowoS+3UpGM9NjjNX6ZQgafv7AgQPF5oNYBap0090yNTXRZbuKGrjPDo6OzKxht46Yz+DdA4pPa04cW7GR1CTLE7jNQ2IncZaKEpbgD28c0fu4vW1l3P/85VopBcMx5y7XOa0JJVOYFyuZEs1NSh0DgJd4HZ0tXv67Li6RWybKazdWjN8dynl9jX58e1ClzD15nNnamPlDhTkit6xySS6CQTAGN5QGruQFDpiwzb43Fs3oOtVT/XDyDT66bIa1O8IQ77EkYzXwIoc21wnONvcLBnl0xiMs6EBFxVpinYprv1KU/all+YclvhbTV14B2A2OqO+CeQcBDE0UsVVuGAhCZZJBFsSZcWyCBqSD658G6FJIG0rJ5C44s5rF3P2q2ca4dLITMEFYvdzYdGNXRYAfkO33VWG6G5BbD/yIFlCndMBHWYfp8FTAigyvkPGv0mAO5f6M4yZfVAf9aUgC7UGNzI48brzs49BMzJwhiw8nDn78Izxz4b56sxG1M/OTzRhuQfWKlvrks/OMcc1UegJ0qwT8PA6a5Qg47hDHTeBbW/Ij16ldeBUwOW6mx2t1EJ8wVfE62uJhJXWhmFgAFD0y5hlcqpuwehSDWgkEeqSwfBk+1n306TSEAR2S1JhIAgCv7LLUZE4uvETSCv7+95Mlb36qPdgw3GUWADuw2TCXZXV2iNvTu5JEcPR4j0v7jM4l/FrAWXF1B7TN3uDYuRNDyZZvedU0K0QTUo7GU4+DgCpZaHffEXFPSl/5xSTv17L6051Wh1Wl3198K/7+5VslJx4aZBXkFLa6zcp8S9nvav3FvpRWFRvEsTpxND0wMbu8L3+4C24O/QU0xIJ5iJFrG56opQI1WB7KpZgQCgpysWKoAi3WPUT1Zi11DxF/if9i3a5ZR7f0SZaFaOfOm38BjQs7tSJQs30EYhWuMgl2/ajE0SQMh8qhKk8fuMjFzN5G23bYdOz36tDbjjHIjRZhmnQl7WPHmsB1geMSEEMKB6KG0sltKfA2kgNUtGBoKpzJvvo8tnPtwDT2pZIzuSu7hqX/zfvpvL4KmxIEmI58T8QOrVYktjpw+eWdbPEc4cjsqOvHd+xbm2nvY16wlk+DugfPx6VUUEu4JVRomKvKjNPFoeLAv5+VsBpu9yk0cAmJP3FiRedw6eZ1PSuSeVghUCVSTeat1fZhVncGFCc0NAWxl6GfpZWVxYbRYMvQ0BRLWfgw9/zuvA174tqfvwp0/BL9yrRnRYFkRRC3tQFmPFPO8zZ76TPMpHuFNjd01cHpHjb644MLna5uv9SDAf0TnXh6JjmHk4CfWJq4NYJF1mptiRSPr3YUKj31lgRNQMWvRrRTfd5K41GKDzfF1aj43WiNt8jeTigLYnP86bmgAzoMc1cRn8RDGyksarzCDTSDzH0cipEPfPVzGQ0nCP3za+3qsAqxYOMpEIayR0jBNBbVIvVM4zbvkGPdVLsGLgH+rhZn+q4j91vYDQlPWBQzrYJN7koJpgR7l45N5gNEVv32JT7LMwMvDtwX2f50XKvW7HiDcWFJEEyYCBg0g93yV/UUPYZAp+1DmSQ482jIBtxjUuntRh4aAAeg/DLZXMBrWdgoQDwRYaGYn5moP/q8IjaoXJThlQvP2HZLpFGiIugeP5O0gPJSULUeQgJXLJHiXgmqhcEkyQEJeSb/jV7SNTAN2t4ACx4H+5ZWKVuIR+OUld6AEemRqGiTExROYeAJh+pOOktveOesBL40sPZ0NGak1G94031IRpOsAkuolZQuLqi39D14RQkbhpKZ9PxKtFHUrislz/uZM/sX7PS0B9g7NR6eTbv+37phc2HF+Np2jdUcXxgbmI0HVfkUX+W3PRoXANsv31z7uu0Psu5IDjAfrqM6oG2G9LCn/9gC1Hkh7fzEQO8iHwpWDL6Y50vnrmQmrvk754NnoQuXmjv8tk51fAKta5ljsmM0QEqrxlDhIX4QtY8FpAdu4JYO+uJZzQARCCxMqC0Y3pSjNIT6R4LzutyK+D7tUSOAA4oz8PWgEv64uR3LU5NUGRS+ucDEnfXbIzp+Lb7/JDRKrYk9BTeulelz5mE5gnoBgDTOWE6ssuyl6kFgezc+JGypAEHjo8BLj84l2j8DNlucKA9qhyj+syZ4H5eZEofY7J97wPjEYH4zY3op/2Eyv1U7en5zidZ4Oo9rO8TJieVPo0x+9SBmGsSPh9EUCh6hAlWjp+yPWVg886HWcunAs2nqC8qm9D5o0hXBwTyqFk1U7USlY/4BvCe7JpS1d3uBhYKuWbkCF8xk9tODfhR+DgiDAOgLuhYrE6oKU3wdsmRr//BQbqF7X4NbGAzFmaHqjq7D77UsreVC6YN2YeAFqfmSd3bqQIckoF47BFyzPmtbig9/cVwK4HE1UTot+SmU4bG/Izw8RMLc7VzkxBZhw7hl6une1iL+ziQg2/rl0RlRxQijeqpOlBwlBORMLC5pBgS0FfqCxq5vNGk8zmkiH+k/HmsVjgfogDU9eiupnum/EjE8CFHdBxiSMuBJMCL/cMnJ8tSs3XaKbfjHr8YXU1TVUGxhtTsqNLkCccSezKBeD6cgYaSutoS+pkxjyPgCc33S17is8QsyHTn0GCiqyQgL47y3X3qXUEU2lKphwVz3rf4c66eZZSE150xLdqtOeRRFFT0/w3IDMK+gvnV68XpnbXYlYAa057ZG87a0Og3/Ip6lut1VSahdZUfHqfJ8nfEht1zYm3Z+fdkfRL9tRMdhOX2x9vgYcz/AAUF5VRdKeFpaiGshd5/WOO1NydZvXMWJ/+cpLofz5Rf/Zy7XbPAf7XXXR2fkMK8yaA3INi6aGqJQ8ty5nIO0TDyfchygNRN+D7TzAsENH7R6MJH6cmBehiXQOcx9ZDT7xuJtDfYAcCS87/7krnigceY345E5ZX16OjrQBxWAdm5NwJZRwbtTXGjYkYVJsqaBkLjU8UUfDdHDKoeBTVCqcu2GfCApmVUQYM8E0sAxDW4/u1V8drTrtzLPeRnCAlyPVo6Hl9UTaD0tAXyQiHhjVoWMAg4S9cvrGasZXFT/SI++xLOBixQadcEKWDRWeZA4YTTpKsFUlIucAaLmwpp6LewZqpv07+FPrYF845d7VJxmlyX2aYa/OOepfD6LETq8varqT8/pK1WjE4VQmheXhA7D8z2RhomeYpbTr8THY3rL1I/VE1mmHa3C3RqXo6kil0PcvBJsEiAMG/elZNcv1hOgcoOyss4t68KZmvbSw24pgkQb8zG0e+y7dwcgp0+INlPtPFiwbxNshzx0P1IqJuy2tU8O6pixQz2hXfoqPSwAeAmmwx1wiYBRIIp6WuzMzhSG0UZgxSl+ZthRQ3CTRgRMj5u2U8LbfC67jCnCEjzcGA788LVBQ+fmsUPUaY044B/3wU0sdGtO5fNrwouHvgnqn2ubHfjgU+PybHnprrOZIKdzv84hQtND9M53r+/+/aAbn3hVmQvMJhXkA9XyEBqjxeRguko9qMlqZRuYOcazKPR9L0uUHjB8wR/K0+Jv8K4s3ZCfzK3HFBfCl9p8N+vV5Y1c6HWwYMSE3Tq1R6FMpuIYwLXj3ZQHc2qmcpCOhZ8DneAud7/7S4DZUi4/XwBUXyRJlQlY47b+ZOLFMH6SRkBa2HSYVjpPzKTaMz1/azjBGm+ODjIa3FN/zgwcCNnYeebU+g1VPD+45WAxt2bPFQZ9WC2AJ5PnHQ+nMROZBTH1OQd/dbaAR2ZRnUuUoyXlnbMDMe7hbeWzWHJaPe1hY1fcQPqa30kUY5ZU1r2ZV58RPb5q1uKmMZnjtH3jO4arvhkzSRN+rNQCofRhpdu/oO/eMmVXX8zwHL9YKIc7XBpmfu0nzJuVQD2DNQW/OON0zT8TonVS6uKuWB+QWe3LbgufeuWayGP6j4FlYC8GLpvRlwYt7SaLmcREEOdvhNPhXEqTlAjJRpfZK5cdyUs0lAWSjYeAMYJhtD84mPNzV9WIlnX3h6+t0iW/PSUSpxVZZKL5SseULdMExZs/nnu/+hpQfIm7LQG8cgVcPZys4cxjzI+C/pQ/rKHASvj09mMX+LlrW9B0PlhWzx6o+sBSDv3hLqS2g968m+Boidgibh3V1y44XLrvQX0WHLg2MOzSW+cQBXCyM23cXP1Aeonl0qj75q5LMB7fmTb6+kldjInR4Ja98P2m3/6xOR2oXrUWEBrF551gAGqlY/Xou+1s+0H2Uj6WXyVfCTnlkczKeNKHUYXGwSg0tGsjxY52Ed/RUApjEpBl/JAHtCvbAsejKxRBu30a9E3CtLqSnfmrgXnTW1bYKszLHhlE2ql1N9OcfC/Qy7Lfp0I5I4GdhpO1C8LP3x0ZWFkYvCK4peLrALEB8ogCl4gY3dqyKGNgb1aVF1+iJm+AoyoT4HY8OBHRzcrZWY8AwtD9NCn/NZNfd5ecR3N5g7InuBCTKEY5DH/UI+kYmbBA5mdXhtdPnJccXAJWxHsm+lELwIShemr4Du0bCwv4ZnaQOzt2reNxTTvnVaYA7KPDp3cLit2f608pqobHnToM73gSEbz6RcPblqtDk+FS71WfopcN47SLK0+j0S8+lF8cyk0slf34BqAbcGpaT2cqw7ASou1yBCh2VeoAe/1uhfBzXZhliQCEO0ABpWQxc0w3Hr3vjUOa5CtkY8MxDWOIWpai1gNQEuSf7SLVJ7q9CsHRbYNeuzH7f7xTkcm6eNuxU8zAM7e3fMXSgSqX+HyntAq+lG/1QbKyTaHC4CdKLFABUmn6ljwDPEsA+830nYWX7qdqwo0rpp98Ks+G7QE2jXvhS/cRnXz+w16km6IC4xheeunHdekiya0qMBRIpXauzeWPVcmIgcidGFgsxOj5dO6On9w8T+7nEcn6nKLyXdp4BRVVbTi/qvLfTJE5Uu+syE5RPz9pZ41n1Z48M5ebfWVerDfwni8dwl+mFYpbKSgl3GUsHb+bopjxZUK3ZyefYwKS75YKOQfNMz8rYcBGYkmxEawWGz0qKCBpQmQCLSoj61hqWDyAURgHD++xPIqxmaOibBuqDpB31HIjr1g2eRFMPArYaehVW3Ea4hpeY/GeSvRjzra7Ps85XGtY3rCFejEQ+c9BzyHBthom4zpdMJOzMFgNI0x/XQCUxIHzITG1QRRB72kEfr5CJV1UGrqSysVaW9qrBAJFAk+Ws9Qlx0vDI7PoFO3VBKGVxjYBTJ+ih6B9xuqMzUE52RFkLa1NAHlOJairEl5IcTueg0tcX2hP/MEfNuKKL0XpD0L+nnXGVQATUGnsAnqb+f/+TaMF1oW4FzNuZ3qSr8LHdcah9P0C1vgcJliXmSDbPdn9E0vHLGAlbGJ9ub9A539dJEh7lRfkebxSi/TuzU0FlkzbVg5CFIhatjJttOXUBp3vATqt2tXoxUWnBexRQ4YheL6qI6Fx2Zfa+agh4OkaBolVw5j1y9Fme2EpYKId8iYw7yaL64ycS2MsLONtqM4PSNpGp5/FASrdt0PgImPS4HgaEyzk1YKJzAivmsNLmZ2neMJTID8mHaiXF/u87Xib47nvIy+suFIVndJxc+vsxMOUXDD7kOtCLaPtaObP4Zsm+Y6CyqmBGeZ2cnEax6ICdcn/zILuxmXT66BAwFyiMU5GVpWol0DvIwWMGQCXbQgLcXD9UhuWm3+R2ehzXFE4AkYRwvRGfqzOm0oDW4DsmtTQ29brhwnKyrqBITvc4p2cdPgIKHkpr8FoYk5VNcdQoN2SEF9KAVx6h9Z51b5s+75mflxif9wpnXVz3LDRLh8r6wMoXrW/2VK9h73ZMcTbI0tgC7fSWUcHZcGZfj6C8O7Bsz1K9oEtaJ5UCwTS3pzhWpj4rBa3gIQfjDGvh8cqbzuCFyNUqE+B10VWzBwM3V5ffzvrV9I9nraWAlRJQEcB1TyrMKQ9I8klWnpGYjSdu9W/epbUhlIVQJkFeTruc+ZuyKNRprTg7OQar/TwTrceenh3RnRnCziCklVdaPF3w7mldOjtr8kRrPE4GoK+CQ+d1RxUnKwGx0OfaI/a/LYBKvqQv+YERlhPZQbrYKG//QOrOVh86yIlQH9tjzNuomusd9YQwa+JyyczWa/G3FwCGCzca5rwoFeuq7br6QKfWbpW3yUpxkq3pAhr2WUpNsxg4n4tUGegkAJ+G7jT3JrAd4xH09/savl+4+r4z3/tTIcQGsNW0JjMvfKGbFCMGQOsPQimuyZlmQyInOq6vezOfVMEN4cRUMWpBhfVCFb5acDsKvAjFHh7u+HS6o3AuNLPVmI7MUC3MrQC01ZJ4Bvq5YD39p2GXktb7ah4pIW35fCle+n6kpFhKfYG+Rj6pXzN5T0aEDdRAGC5WB/++2YcRkpWshRf1ZBPBTV5uPf7CDqG5gaEze1M0N6Dn92IuwxWcwQ0JxPz+8RVBo67ATVM9GPACKTWRPp7fir7Rucnfjyu7BlYHILCgHCz8k35U9rV/w1wkqSOLzu7+Z3qR8HwGzs8SrB+5REvNuZt69bbLUWLEv4xriH3gXPIo4Hkzv1GV+KtKOFcqVrvBghkGIMw6AzVJdcn/Kmk5qLDcVzPEQnwG4EGZT40zMwJpdyqPcHZzz/PXfPYmLMpoZKsBNP1JaycppgEP7PVLA/6o6VSbE5YAMvpV4KWUbO9Y91cwAIgC6lN6k6rMobPzn1bmXV/lq+gLYuCNMwi+jdGZ5TqYSgALS8ydRRFOhHSIbdwQkEY8jIbTvUYZZ6S7pg3fEE/2SEvu6r75iP5eji9e3ZyollK0CDBiUkmp+iO//blaQuAtjJGY+KJX8UG68WL8j2E28pKRf5QQyktQdjlQX7uise838AljISn2+LtBzYF8y7sWIOYo6dmjBK5KFM6Nd5Jwa+hSE29aFvs5qBxVQUhEtoT+RwNMJ72puHGl15GMC62LAxpnlLOeT4oj6wy0tk1mHT4COvNkpKrAb8crmCM5HLZc8Akplt/WuDUPVF3q8FBAjYG0IrzxYTdLkpue2CjHEYDHuuBnkPvK4pMFKY+8Pn7TsOz0SlH2yLIaDWaC3WrtqmSZKmPc938E1gDX39Nk/KuR97ZOcPvwNay3yuvMr8w0fEmUcb15oVaKGv42yvJid9evX5171nZ97p5EAeqKb4nEf86oq1dBQ8BJDPEokS2J14kMoKjjcIN8utXMYpTWKmAwF4uKAGdEHkKGYdhTs6D3DQBN/GWytzIdKcREYBnMsKVJ5bbIuYsBFrOu6NTeYGjFj9YAp6LF+xhkil6f+PIvsEjTLHM8MJsj9Ll3aj356ut4D+z7e6hBWNtUav+BluoeCuqr6NxWTr/q2fyEsm0xMfnwUoK+VjRwp8CuPeXcpnPzm5+6Acg0mQGYQ5rz8KSolYkEI/1oYbI0GNswdib5Q6j6lB6txO8DqwcGBZ+KLu4FBDMEaawNBx2L7+4P/U2a+ZmFEzkomMp28WiY0w0iiKlDBMi3stE9vVIMXAM9NLvtsV5c+GcqikOVxq7lkDFOxmunSTGTOYKafg1nyK8Xz7k/vwJy+csz+eyTzBx9wBK9mUG4Vdiv4012TYP0GW8WeinJ8uAVAcw+TUlc2OnmY6CQ6HKA1SOjjUpx5Xvzc44naGKSqLqDW+dZRqEhaH+FrLkaONNo6uiSV7q1wHL6Zf7cQ6KaWl7p4O7skn2GALeCL6SOaE0RQUBmkHue9Uy+rY2Jk1xdBNdHB3yWwhAqkA2ITiw/M2bQlCpaIJ3NAoeq8P/N2p5WRrQDA4cW8ZZjjkro/Hh76MuIqqpDJmCCAKDmpUCgJypc4MZ4DtwJW/hjqUvMCnMxmEBU2VwjWqjbtDenAlDA9tYGBr/BPKGCZ0+FIvve8OkwKM2adwoywKpB/fvbfaWBAa1b9/xNpntPx914TwzQmbQRLXyMNPhHQ46kPOVguswCtcz4juDMiOer0CgTI1C7N/pii1ikNwnJRgyAoT0DAjoKiPd137EDOkQeH/Hs3omk2po5nX5OOMGn0LkvJgfCilXE6k+5v9a2wFNPuieezrUtH5Dkgs1qg1cB4DOQsaMLiyfNJeujhd26Wvww1MqD8v17TzWjlxPvjlZnOSlM4UzE622TCVO++fsX4s1J5obm7UzH/zmeFQbHWxADn8KHbLFiX9llgLS/akp75slzMUcsJ46N1OzZKnnCy0mDPzKDc4tK03IHGKQzZ0rh+hQl7ysIkh1Kp36xA2IGmoF58VWlbbXKav6x/Qw6NzTPPRZMP8/Cam8R5z7w5PCoP5+jD4i5PxBMl6Gn8c53EGCAKxK6MSSc+b1pcg3VUgkTKESL6ANAaahut9bHaciVnKvkswo8j0bXL4D+BlhqnkkHJnqcKRbjazFFO7kBBNGe0xfv8+R45aijwaY82jl5zdkMLH08PQG7QH+emCGjAg08mAGNFQzlPhqSxWG6NzYWrnCAQY1B6owANeVMazwihVOMEsEDg9svi2qlia31KQp+MKoqXFjvvwWXQVl4ONKpoJpE+cmA2/XH7n0W/5Jzt6ZD1+mbBwP23+cFC3m0OPNoxlSgtH4FMbIOxzfaT/KP2Y12lBKKNG4HcP9Rtt+d74GnF+6QSCuGaMOPBqgaoXgcdvhrJsqDMyCqLp9jo8UVioWCiIBJfAzpEsPigO1CzQOz3RYgF6nuvWIz/06E0YBho7KA7ml9mUh6MR29ippgiplKcN9lo9OCdWH/X2Qm0whcS7iIwgq1jAqUbyI7kWUfGCAPY2grthBJzADQePk8ADwP1OoshAzXvlftIzJYlkYbhhmgVgmkRi1q+0ol6yS6P9t5KpVEF4Pnoc4grbTDSutLDF9ERMtQGmyFfsA7Z5mf68LyEcYh0HoRehcMjGQzc2x/UdnVI3x8X5YWLZexlOxks8jIAFdUHo+fjfc0APwxGTrnuXO5YzLGGo9sbOvmxbTQoguplp5CEWlnHhGS++7wCby2JWC3x+ocHTIFYzLP0CgltNGkUuDXMD9AXiNeeZ97XGAYeuEF1Smqn6qaFlHoHIujs35oVwIDNYJRvLlwmnumrfpNeGCSxfItn9CWf8dtSqHNcaPu96SSB0btCZIlPgGWe8Scut0KNd1gVqYqWkyuq/QHbsLuZRfBJx+8mIPV52ueOeBFQxTHLCC9ycmQap3yFJBVd9MAXszWxpWTTXNqjYBuKoszuu+h0bLnSNuhjhUImGCHf9/CPkHJV/GHAugszIEhiCSt4dbVNMGzCRlslJ+qj3JYUCHG70Y+Q1SpniOTNhNkXmbWlWeJk+s6iIwTMsE13B3Z7a4mEWuxFdQYu3XQvrBKGZkUVQNby55gxDzwKqJTRrXnyuxtpjmtDG+iEEQpTM3oHhDufzWoIaroQqHBBSnjBgLwchPxZ2APaVlrFQ2uWW2dFelzxGC9ngDh/h9bk3pmDTjXC0XwOLZjI+ZaYOvSbAOJIsZpyg6GIyFoBKpXBfC+RjMq+DDhyHUU0wjVThkPdQ/+MsvQyL8Rle2zBKvTGIGKSZhLv2vsxuq4luRh51WZXtE/6BHmwWjc4Mz/OQCuAmEATkRHwhyKUbHlSaCH0P1HRl/O8OLkF0IZMQhdDpTFEHWJiWASRIJj6GU20GKElzGOX8RHoChElwpSgCkDUoM8N6+Eig2FxVhvlA5rKLXUaGjIK65+JiBqA2aYnIcnpHhYjYYip2kjWByRc/M3PJ3+yAoAINoCIBMH6vLyMgykcQaggQPaBLvmRYxuEx/N67vaPpYRMBonn/P3ImyWPARs/yJVgaCKNQNQzDoIO70mpmgdvKttSQBMFxYBHLq8ykExS7Cous/78BRzH1FWerrSZNOi2EUksZzqVyVEsyBuNj0KizgSgCWrOz2f5/lCICh0mfKmQvSGciv1bTzzpeZyTSmU1lAFzBTtHvU4J5niRZs2nnMORPUJQIEAaojMfg/Zf757oOD4jYK95w/CINLV9B821b/43t+msVSvsH5E2Gj7ZdviKlgZh6SjrIwBhUF0EFF7q7pIQikhV4HK59yqMdNKp15oW6l1MMzZ1bpMpLQZp/IZsJcDxACm7lgE9MU4+4BCRh2UubyVCpIgc//DnDeF+INs4C7WHUDNxfvzqPMgIFv/7xOCmrUPef85rKbzX1qjmBonDQGeGMJ4jkg39Ex+3Bx9kRG2F5v5E+PyqArA/VVOxIQWLxZ/M90W3c2sj1zjsU3Gy7kmgHerOtxJqHmJGtpwyrbWNrkNFHMqi4G79lP3dFzW8Y9DrDlsxrtVWsuGBo//ONZkhOf4Om+WjCEmsEvVpe2ibXJlA7WFb66sRCCbgYLghPyNseHXnmTn+mP+w3zlmLc4PO69FUg4JYxXEssF5JPm6zE9gerdqXzGSUBpePXk4SI2eHGnUwkZjGcMybW3Yht97hkwxFwxjqBptkdO8we8AQ/Y9hiCWmpD5awIZxbdXAiL+U1r1oxQ2Y6r7MUx1rOcPDjyLvDP5q9JhFvCL2LN7sf4LzPRvos2/UuKo5ssNslKzWpY0X0yw2yksnmXHKySc1E78LyfmDz4MFhDHLLztvYISCY2F3VL+mYy0B+wZQLzJn77q/VQNbOnOwQU2nyyFT/wrDZ1DQwG4Z2dMG8n/AnCu3bQRakHPe4Xwuywd9Ogs44vgOnbOKPPTjXbc2r807Mdf/VaXwUOQI0VtzY7YyAbZS+V64pf93z0iUD4ozn75jUfS//WTENhLmLGMDT43+rVw9VynkXtca8vh46YzPrdmXGkTcPIA0YD7TOSPS8+NlYijzqEVfMyowNNpTWojVZXkl2STN1vHt0Vihzyd6ISKAgEYC+D5txJdn92PhUNgUZVkZMGGnn3XRBdQ/BpkUSwnxR2G46nH9ImoGH14bMm5suNAJXpBimzmKyslicA42CUrOKoqN/1GpfJZoNbU9xSQIYzlpxDY3iTBEiu0exRbqmbfZJxqRO5fxQlgg6aCGvxzh4jLMUwmqcq6g4baZ+luKGotUrns+KDoQbMWd/0sarOSiSCqNcFHUilYxu3QZXXsk9UnKQChOP5JB2tcdYWKMXwDgSbCo3NOobIdrMy2wyiz7A7VFVwKAvCKOXEMUeeAfso4n42diaocXkITib8eaQSjpCBhWAFE9TpqVgTjxKHyJmhqx2o1fxBeZODtiAN4DKL/ykURkYhQpcWou1fbi2IZ5ykIdDzwQY9q8DvAQsxQTMUUFTg5C5J0inzJIi8Pn2KuXt8sD66v0MSLJ+p57OyPZLgFMFPes+0hpZ2vPbO1F+F7HzBfOFb6NYgKdgy2qFXehM0DqF2TXouoqZI5ro4DqlryqJXjP26sqyLTgfB1Qn5kKHsLsQk7jDCS8R2Y1sE8BmyY56pot2IMZC5amB/IdLkd2kG+yQbjiOla2AdSEw8V++Ozs9I0Wb+wA7Mu562TdHqmJncoJhB7/5vmFW0bBQ5vQnmJdgHlUwjr+c6A5oDCpXhwrFGIUWzh+vfKg3BuBrGZSa5dxxkuH0ckeooyCI38tg421aE4wLOAbmMggidp1NFRW7rWA6MbTEXjrndEAipkkPq55JkaSia0DPRg6b+wWgzsXBCnBByk6CBBJNwMHC+Ywc3I5LvvLdWQF7SEN4/7DXEZCYvvfFVPF/Za5RApjKdsXypb7sud28zjtxPnMOH6IjekoYHkGp4bIw6okXzgTmJ4Kx54ePKjgziJmlfIoK6IbmS/vH/R0oEDrPpM8n2lGMYxMRrAIWUUqjwCv2p5zweDhLc/A1rX5WF22ozP0EwBw3kJtYxrhgoN6l8oN6yFReoy9Frzr+0IA0s6g9jkwMXhUo+tOqOtKMn/eF4+3DuDD7m0stx/k97twjXT02B/8G6DaPTqa5pAn7ii7ITBsaLHC7QRnmRX0EOmGfsKXu+/BxhSmmVTnxz9MW/q9dOg6nTPS6Pjwly+jgqM2vil5mvbn0tfjJtjK/SvZkRnC0y0Pm2xdnj2c+ngG7eIIO7J2DAiJZKMZ1fg/PH4vJFxgMC7dJz5/XLqdUR1dm3flTVYUJ0n0SO3TjCofJcGV4cg4d0OFUkApjD3Y0ncr/2A4NojSUbe7xdMeBua+ZHTNWn+YFQk6xf7h6xSbnGvXnbv9ntvj2oRqoAIStYP3UMCN1gtUjzXiDuT03n5KBMeofhx5OPvfvrtBjf6tdFIlSablbI6/Sv3O+9tl5gRGCx4RIHaSBbuR5Siv4cuCONZMNuxVEnE9R1khV6V76rTlurhR/q1clUcDmmKhwFcdcR4wJSmBxnMDzuVHbpjOstg0vPegJFHG6GrM51IenHOA1NCT65K10SvT2BcMT7epMcYqpqcqHlige2kDCVAqUB/cmqAzEnxpFLp8xK7XlmXzexdTooTe4/oPms/tTyf2tCi6HaAHKZ4gLfmMk8eE02/1TtAhmxoYOW664dxVCh+DwnAkGwNHpAMhtYACyhqzPZ8JpUlpVoSWoBGwhry0NWDqtMTMsPlVk8BqbCTnVxWfEB0feXN0zW5syQhx12yMeS90yf6Q2F3cI1WnDhwOjAhxmRNOuA5ca9dlSRDCvr2s4JwXgSD/XGI4h83FCQHcSEeMbDKGXGfyCrrKeFZPy35Tlg9uB+c3VIR2W7FRoqFSQt1VZwIguUL0aeXxTk5KUL4KMFJiQByjBDdZ0SC7R04sm128zFx+kQDBsCc79fffgeS7sDuFRpx9hWmdSIgjhuOe4nut68ulQsZpP6nbcU+TehHB4CHCvv+qoR4kWwmln3zG2A9Yw47oW8VCdSY15z8pJ7gbBtC1Txs8XySxF4jTRqbe65CrVh2Zo1Q7/Ya3q+uzEOH/QMmjPRyPvQ0pFWFl6k9ICp17/Zvxlixjed6ZxvFXsWigA/owGoMK+pR4P5K/Ob4pUrdQXjuFjkAesBhVyiGsw57Vb72ePCWxbp1DldIxjeaFJCjA7jztZ/dfDk94WnlrLNLPqOhn+eAovK0KayHf3uBdZOpS9KHPetCXVZvbD+7zXpV7N/PxYvA34mVs9IiV6EpairWDSY3HLGnWBEgxwpPMW62InMMl150aI7s7AxOQRSeG8YYFRMENdmmVrOJ7m9BOxLbbNKvjg+Bp38rr1nFhIn+SxzVvq0LbWja2Q6WhpGc7xa4CaGQWvskWCjYSkPF+wvvIbf62o9qsqmeWxaQ9yFiIy7uonzI+ksRcm/kX152SF8+AtYtSjXX8kfc6ZYTM0dqHEzMSaNJ8hv7mY1R+D7PNbW1Ntm1mXWFiQexcNWnTGfhNDx+bhX47C1y9zKraxKZTcvEvt35qorK0TzBtYT7/n4l4PfDgfQcHLK6gOtscnAWx07Wbt7qY1o0I/CHhMqJgu0lUj1gTZLFE5htFw1xdlcnGkA5AyKoUrpAFrDUyvAi/FOnFEDQhlIhtAYOl0yDphklS4PRhxT6dZZI0Ro0uK9KJRmizJcL/yk3Pdqmb1UcvJjO0TnNW8mr2nYcp9ekZvrYkFgIAFJJM7ElRGcELO2VviQCs3p1387+RlyDRY5tzYUVbIB3pH49aYYw8CRseKhZMDJ9JNWPF4HRMedL0JkOmgfEBF3Jg0KcR3+plJfv/66+EcsnFzlNCydkHqUIHPz5l6dRWxKy9XHlT40zZ19FXe34SeBFmY74TnPQR3TsEPIDx6h8OB8VBEBy1XUHxUY/SgXjHoRMHt+XjFSc68pMBb3+WAGoGU86mK4dEGp2ALW9T9k8ctMugo+LmDv30/6Qx8dlseEeepXkQGzuqVmdO9d9NiI2/BmwEXH0jtPbOt28KmmmK/fufx0i2x7Jzs3XQuxxmqjgdsx+KfmlDeOrYkPYErezI3/MpugeUrN5EhnLgL2QfJ9Xe8JswTM1gT410pTtKJ5xWvGZS5e48vygcgTjXO/PNYV+hqADoH3dNyK5torMWlxoxj0gXLHvqYazqsmoNPotOPT5YHcshHexBFU9FLv9vGe0VsjYy4ZyzhIZVS3roIhpUHK2v3r5JhrfoeGhMfz1uNG1JC/T0TzJcfCwIYpA9IBu5GVMtAMnhF8NkJ+sbLvT0LH2ywQFRdoNshPTggsY8TBTa0oOh2CefuMG1gJlXYEBFz8KlH8pfjlQbfl+fXCoYlfS0LPXfPK1CHVud7umt5wZCZrARGu4bbvgH54pHphojSdCc3JMc6/2JknIoLJyVbBpWDH2jsWxhnOhvNtCJwEYq8N2LHzSyImQHTZtAoWo8k6Oh/mvgrJbmUtEcZgCavJ+qHSUGZCckVt+DZw9sXO9OVffrAXf38eZjg+t0Jbvq+aWMjCnwj1nzz2vXY6v5bIYsZ2m1DIByk0PxMfNmDxsCKgXR2nfSycJaEKKmT9PY5YjLdHHApsGyWIQql1VYbWw6X/fpGbzOXANlZQ762CgVnSVdTHV/+6UuYZo8o112Vxgw/dwLdD0Nld4vmrYuksxcAGyl4Ilccclr3bYao9ElPPEaBjiF8mGzFphwf5jaPQg2FouVuZEN61CnHOYvmjq2wYO6cRRxfofwMh9/EZ2F6N5SixCYo2auoPtQ9WiDFKa5qM42dYQ74WEnnLivlqcmxDSG2uoWKgZEUOKEaNrc1lgEUK6VEGoFlIvApUM5QUJkn7UDVkoSbToy3gC12RLJAjgWMTueU3lo7T5DzjGtjiCauRvZDcsNd7wnzxXTWxC1OHh7kFdudBxxT2i87UEJuL7tqrR2//Bz1tOtV6ADYs/3eyb+vKCv5EeubD89ULfs45fZYUt0YY5/vPPt1bm75usAXIJFTYTF00VcdWlQtO4s25lZ0/VX4pdUIjEVwbSzyB/3clsLLrNXDhRcIJrmoystc9dN8bRnQoy7F9s9fsKGMCci4gWYmUgyJTTb/DMKH//u7zz8fzk/MnBFRVj3IVDLxeRMfLbgWDONJYf6ikdQ0j8k/Ai9XqgFv3hwpPcNmvsLf3IIBLrda12+ZtBKz8OSEu9f72c7+l5sO83yCxVXKWFBwCfRzE59X7kCRdFF2DZqKmsKHf2HXRPzdbe3uoF0sZQatgCqnMCnu7vCcBrDmWpLYl9IHU1JYXrpBNxkDOAliq0QvdbL31mh7XxhJXeMueEnKMv4dx9ILRPGW66LaeJ2DmfP9CXoLgsv+Gz5vXx6NXMALajP4QaeMSWu4Pa8v3gzAvkrWm8fHLLt7g8a+eT2pYu4VjHnQ53lF+V3W26Ciqs6xqd7fP1mzVp9tG7KfaEgT7T/l9cc9FCFiH79RVZaSHJCCoJiUThtawgJ+8a+inIvluvF+XHnYRQWvoZvQAo/oPd28rb9u8W2LOwXSEXCyCVqxdjR+FHu7RKvCCN6/Yp8ZXzGHEQIf7LrdweUyE4fzupRW2zQgqQVn5LGZ/cPk9cwxCywzNE/aNt+bVLMXp2OjMYeP5V4KMHr0kMA/Z5//cLrxIflVw/tCwf5354+k0hBOcrhUmzo3XEJZ9j6Xc8H/jXMA9Crifakatr0IHoBza+1shssm4OSvNxZCzn6Q6jwkkAGu688fEbfRVKz2NSEvP87TvXLSMyOED4lkb4ObXl0jaHSspdEZnlwU5tu5km3Pofs353A7uUXlEV8kCBc+qt4wdQhEYTE4zNBdW34tbili/jjVlhoNLPld5Ale2s4aNLsRBGA1VjFYSmZ6f9XiNtBjTFWenNfeVls2ITPdniWls2CIlZs1OSH0zB/GKXeHasljfyA6pauhm5/915r4mqBVAubaPaVrV7eiynGBSaUuq8tTK7HR7EzA9qf5kR7hzGNL7PGk27FTgkcr+ZnPoCQ6PmEnsheSx90O65snorP6w4+TJM1q1KPgjp/4cjUXU1W3cy6Txee5p9kMjUV8oqWYAT0++giP/965zt1ZVlr6vlO3e/9lUzxKc+63RTXRiL/mIrNy+YwAgWEnC+wMy4uOU2rG6+EymmBgikhML8zmeBcd7eQBZM83mz/rYDhFA5UQm4ailBJTCUUuBGaJL4yeo8JBK0TT1Ty6htETcRV4Kf4SyEcCZgUgJqUJ4SB9uLhSkrKoHdqNZrBikF0E+BOl1DfXUxRICo5ijE4VDmZDNE07+gllJOPatx1wfYDIgp06iPGqeISLzsMlNa7pq8bAJ+ek7hF0t1ze19yyxdGl06vktJVT2k8OfWlki06ziOS6bD5kJI7x8z2z65AkpsuMCXr6qVXr8eU/WkjpK5KT1Vks6TXr4Zy1wPuBuBSb4w942upT7ZudsH2RkgHvuQ+Mz8msUr0C3y9QGPf8mfa7knNzzi7xYNh++90jNrbkHkjMauYgQAHhG04NSgvOR49lGgsHAJ6gt07ERkUaE791yHpYkBYP8yM58hWTBCVtwnW7nglrBk2FzH6LVIDeguUzXbas3dfJIDfwNiu4ZsPzCTwxYneYwIsj65kosFs92lo+iWrbTDnMfqMURc/AcDdj2tp9nXRygZwOFwh/tbSiugFWD+iMvG0iDuaCaTN5U4Xn/rBP8KL7y0uzkLiHT/nkSjTsOycF1645ZgncqQbdc6ta+3X7/cFls8HBWD9fEiJmvlTWefi+7yblDQ+J5RVEmjv7oH+cEBeRgQOGAZNBe+yPDqmBncJRWRGLUBUyzIRLuHjTvV7RZGC8I5PGBjpkCG7facclQrCLY0SpX7gYBPIAkMqJmPkYomVpwO17t4MkeIk6RB0/9UJqAUy8J5bsqj/TVahjIVaMnyG62QwibPhJTR9k0v+s4It2y+kGiplmaDwRGABlIau+FISv5bwIKTSYYmOuSzf0bCFn/PIA+LYVpZQEl1BkqA1HUEaiCoOsMC0458k1jN4WjNqYCM8eMq4w3hWbgIlrXPSDbdCex60cDWlR5h0EL4FLcBfEjMEYzYOLgVaIokrYvhujn3RHzHSYC6nBWNkVAmnFBGUiybTh0Jy1v3nAAP+e76gcx95kaZQj5cCTPU0M6VgrgK8ZZhesiTmnYwkG2UTCiDTusT/NBvTi4oZyHLs665XCPm+FiM78+UpT1mgm4jXPsIUE9FSbp3T6ccx6hEEfzHY64wCuTpvt0Q8Kno9FM5M4JWkcKAezv78POf0U7/7HIOQX44jDdWX69noWkx7zHV4wXl0Bg+joc6NNsvrqH3BvyHILV8SRN0zgFpuFfb2P+VVtQXmMaqMYxm5C8nrpYN/eGgY5OGlFYSpeu2YxvDBxr00QzZHNniygfurcfVNUOzEjlzlocsGxWxDSwxxYu7+TQW6UlSXw61Z/3GcUZsXQxUtaedSdIxeFPl3wvIGQXGex0ssLJdnzDcZXP7Y019W5uEAvAXECZPocwZcxvixX7dUK+8MWc5QLSc6IzrGKBU3aIiXYSQ+8MfrrP6+A3mHyIb72L/PQvNyb3ujFnsrPLN7PWzGg2+l5Wqv6HhcJkYIIKNUpwSqI2xoH+P8ypY/K5t27mcJx3ThfGa++QCIhXiDMYehgMB6CsecbtSXZkLQbbtINhHA/cVy72jipOryqdyc/s1qZTc/WC9+jp2F5Ca1t7t4cOjmffFTAjucjmwNvjc08KV7KloTGinkHbn9xnD0z0aXwFmJjU+s3IAdAOPRPbfuCaCprKn9Kvo80K9OXMEHdScEY/VzUZa4JZ5C8hjOgbUi48hEjPOlvJ4Qd4xLALZDRS+lpLsMVv09D9lAkDaJ71dT83Roo3bBnKNxzkZoYq7/8WSNtgq8VNomPhFA9rEd5QoC0KIL3wxiohajQ16AWFJ/rAo57ZA/g62P+BLKsKolgJR3GEEInHlLBRpFJuHYk3Q6cOkPFm9asunMn2N/v/P2Pbs9L+3ZW/gXmC07d7wNfvp0RG3q2sqEsSauZ9fe7mYVM4E2GwI9rWeW6CWDLGBLjz8NdEh7sAp5xzv3GEnztbaTwnoceGKcvMwt5NIQGwm7l5Ub1iWce77k74r0xs9tQSr253isuzDTHyFVhlYKpwTXv91AYesxvEeZED2dBFoUFZuFcbU1atHgktOeO3AybFKaRCKYv12NCTF8JByAI5QwXB0MhGpdaMQeltInBGdUzQDYsV8vhIBGXCWtRjkW6pCkHCqHYTKHbdq8lRTLfSJduPVlCezL1r1YrU7yS6xbOJkqHDhWfFcD1l3f+2FhaysCKvDVJJvvREYf7DFARx8nH2fsvdqz/ooAPhOUi3PzUzC3kUaD2vHRGOXXkvIkvpdM8js9LmTBWwBJNunS/sxp4vHarZdr25H7BkRKo9yExOIs4uQuh36Xxg+ZLAF25B0H5pGR/pEXEc/ZzFWOSV3ozBFMeAgoQZBP8szPkh2FWYAYqRAcojbzXPJVFTjiQVTzV+kqaSI1k4xUUHbvAhEC6UyVib+gZS2TJ0e695d+DmjxuJcAAyjvihsIIxtg6bDgDRmDcilYjJiNOASmsXuaKQByzkGyTBQkUnLcWyeYSo1j8d3wVcDCybBPIOmqfwZPty+iEw/eZprp8yxa4T7vLyhOR8oZ+nj0krHr2NUF1mymb0WaUINhpSN71feHafR00ckGtDmFhWDENr8oHMZT4VD6lLlVL1jDAQyAtQ8J+HRccMhIaJUDKKG00w8WyP1M51IaX5VjdB3QOQQbs5wskcRzZ3mniirrEiTsSX6x3GTZoKiQ6rXIJdhuSz3Fbs/5APovcBIM+ZAT8Vc3a099VUXBvvaxs2uQAz9mpkZuWjk1VIvptE1yKm/nOJrg1Drb0Bz0yqh2/G3wX7q/ImFqChu5wTOiCW8DDK0Y/lXTEJpYfEv7hKuV/mEEo43w+qCdcniGHSz7s+dn+ALRN/6hf53ZhUkir2bBel92Kc3P6T5o9gJqzxz4J+IdpWzJqFWmn/3b6vOKWGldJYvdcA+sKGlxVInu+d+ZAgve+xqKwC3uTjY0oNseyhTP61ydZZ0liPbXxId4GsR1ibqVRaH+pWsTySDolikIH7YJAT3paSOPtzS7zrokkJ/xSQuNL4OLa7DQMRnnIcEmRy4lDtHPq8Z8FYMYaJbGCwGEs6rXdRymHmO2hqwja+mPeyML5DOzW852jN+t8xpVCcCPUUj9ZeH74yfr7dAVdxCm34YYo3k8RpY2/ffMBq6kbuCLXnF4OtfiAq45i0j9isZn6wN7ueh13lRck6iJnIQsE584DG3fSdzZ2Qye4lF/4MA0D2zuswiSXVUH/qjHnAbO22bDy6kpbCZv/cXSNKiNwfOXyJgRFmuWiHu1Z/pLoqBn/cvkjMB2Sf3Tf1a+YxsGgX4kOx+nTJrQSKlGTJDBz3vQwPM7M0KElUhX5Dpie0rk1MbS3C4CM6Km2P4F8lpw5Ru4fh6rw5I5KnPP72Pnfdo+7x9WbnYHcy0OfgaCa0xqigQ+Rbiy3YUGFY3LQJCIULRaawERqZeiJaV5qfZZQ37ZTqewGwg4BF18+CP7xr/JgHwLT7tWWCjbNi1b20rAeKWGSoh6WS0XxNMGgYrhutE5PChX7w5Ue3qU43HWK5YAJLd97H8aS0VKh09M9DhQVtz6hExzQpfoFhbmK7IfyDKJeilSzKlw/jaKpGKJEUhlDxiZxrYuHaSHtWB3ScA2aykQEcCuUoEpgC1lLEU90617VRfRBE4WSM82OShLNi6VLNu8poV1deK/qxCwzN4lwdWexiyqHuMV9URzw0Gl8jehfI9WTNqWNWqC7fm7rCop6Dx+dEmq29E6Brl6YSyG8+PDwi+rt6KnRPYeW3VhJJV9YnAxDTuNIfHMrjfiobvoX4k7wBd81C1npbWNu/9J3Ukjjlow9Pkc6nsr4uICqGJkwdJhl4YX02a3XBTRNzYTOCp+fEh1abRDVuiilCshdKQiBCEmFgkrTEQ4UyeGhJMU6HTTXEySBipQ8ot2I5b9WnSYHKpAcYTPzQmhkQpi/l9my4irPm/kaRQ/lLxvrnh64Y2Vf0KLtkwwQhRvoNvbyuMRVq42EFdZrFTN+y+EaT8Z37c53zV2hh2ckkfwGceTIp6KUm7ucgV4HNcdWPuX6WT/fJv+xA//ezYVpg82Vgl/mpgT20igXg9wpaNKzoAL6Y0TIGi5gxEGcYEEhUEQfcIPNxoA4SlC+lcHacwrhur94k8WyIC0ul4h/Kg5lxuxVksmf7l5tGBcWSAtx5cq+B117zElVrPuDNEwwR6S5VrvEz3oXfaRGVAMuju4eqfQ/8gnzjeW34V8Wi+tEU/jq3eQKdvf6wVMGVCzp/NpcwbyV7JaAfYPlx30f7ru1kMn7xTVZfX6V5CvcH7Yqni/huK5s59ut4dXNn4Q1bbo8Ro5J8hG7BcnH/bdo7bpcJrlAttgYKNGaFSyThfVGEzIczKo/45ewoSdb3pYNmtxAU6E8dOHHpFCGg9ljSxrNIAy9WfLqYtwUPAZwU9XdLCx2hWn9DGPqHGmQMle8SrMHPylSOccIfBKRteobnCoPJJbcNrHJLwG+QrR2ad3FdkLroKCJmLMsC26uj9nefZe08bL/T4SG8LOWJITs9NNCWVV8UJHIuD7Tb86inzObu12Jmd+yWKTIxGyRItMxDtlubgoYWEarvcmoX8h5rY8ykr72C5G7xINxE5ARmU/6xl0R5CQ5Mil9RgGC7oXlZT+K207RLgHrb0lNw5kArptrgmAqoOR18EqS39CoTX/f0QwKJ3JJYDyFbK8zS1EB3IARtHBJ1sCh+ChhDtOEHv16FC259FiFglkgJXhD6Gf80hCO6Hc0qRP+tB3BbUHS8Z50ugGV0ESHPKZf7TaEnfGcj4htEmFfPk6JgmEQzh12cvzK7Q112Gh8g9qLM3y8ltAThIXON5OcgLtU/qKwN0vd7CzMZDaGlM7bZzI27aSn5sJGAA5UsNjo5awnO43Depj75+y+QiFZ78ozzHn/XeT4gU1AzxinP4Of5LxuzdSwhfym4ieTOvfV7i3DEE8l6+HRU6rVIZx/uH/mhbb00FhbZpmMF/58wCmGdMZUi/tIkfv5VZ/kZ7iJSgQGTcrRiw75rzbiB7cgeMmjEtxFxH4NQfUYTYwGriEPDt+1G6MZcRliosMcRN4sR2LcjhFIFi5wSllThsIEl/hnvVb4OdTcRLFzSmoUQCFAumTLmhLaiYUXqrSvxDM5rkIWUVBd5wLthQ34YfFhl/Av02GRIXYGlx+oVAEbnSTkbYlkJXMX9gxn25UrLw8KeffozFBWx4S/I2BK7Qzu/eP/1aFFf85muCipFY0THh4NmCuYpqN7FH6S/haon239Tq5iuBrF5SP6PhwJnEtnTNMxhCWj/wNd5yZmztj3p39vPSmgc4pHHZ/J3KV3hCqMhqb8AJaMDELNi35Pn111nU9XVXRtLXX7DcLzcD1E7mHYHWOkUb5hqnXE2f9SxFTKhPQdORd/N9K5T98SM7MAAcsmWd2iUtOEHoN/v0PfwIeP0mr5uPLStWUs3KLtDuV/4bg2tnP1vITQihP86nhODiPcIH6MnoaJ+u+T+/bl0MmJbW6PR2ZfvD8tv4D4544R3+99CkxcNhPkNvMApa+Qdy9DHitcE5+7Pzp+1OeiCb8FPdx75InNWW/bzuQG9yfsShCIubIVEwWfP3b2fhLWTijPYsw3S1GXOyBj87w0H1Zu0D17yI124l6Hey3bLVwPjmz5BG5xpnvf7Mf8qglB+Yw2M1HTQhd9/VzWrO9YU+aHd1fri4zxmxwt+p90qxwrNHl9qe32Or1eOtSmymLb9LIX6DlI3vJ/8/wNSQxyEdDTdtZTqSMyTyITfcgQgMOW7jnVtrY99pvV4+x0qsZ7wVu1m31Oea923UNfCwl4kyITWnv+fogToJY2XTMsr1EDQBd8qCRo7dK9ghL3inCuyX4aA8aiNgHRYs/TDlk5d9fDD5y4XPEvtgxofwf/eLNrdtYlkkTTJqm1NLNnUdFBwAM6ESfh5rK6xoGM/ZW/DZkTMQiH54sibJe/wdMqaDppE5/iIVEbtu9OTJNvTGzQ9uqfbrAWT9LwXlWd10pxjopO9cwSJIbFmwTrsxegNXt6cDF/hSioRYuGa8PAz1IXAmIMOXdhT9RuiI3bk8NgEdvytEIB/pjgQxLYbnQGyQEsB0aS35+7gy27jYgseuCpTmE8lmiGi4i6q9XrQgzdu6XJgiwh/Yq1a07FVCdOq6o7pkiYEap63rn9QEbXBox+NXH8WNOShS/Qf0+3EdMKkpp4Pc/sgWXlg8m4U3Fg8lEMyoB2Ahb+O3xNSM7EY3ujAyybmqMHtOn3b/3mi1dvBSRxd1YgQa5394aN6EpfGRpE844JTFW0SHvVVgm6uIsT6VETz50GMY+SjeG7cnirGTCH9zufM29OebJo+9ARBYCBWZkzUOpmAYz3ODTbWBcBo+yY9l3HfPryCDkoqH3UIIACHE6VDRQU/MIb5tP8LoIgnz57fBvvc0G70DlDaEFL5dfPxmOPclG5/H8Z2/080mBfV4Js9OMkUUocNsp3eSegDxCqeYzUZvs0fscSYadDbsdYdUwe3+mO+ap8WjLVe4wxq8XTASBLskKzkEO+xfyH8MAR3FTaSt+PUc9ydxKMCcqk903Cy6gb7lW6Y9xZCY/JdckHJ7JPn75PQhl4xd7hTZzKdDK725c1klpBGa3IHC79SDOC69KEY9Ol2pSNvd5Dz0bUzRSQ9Lkyj+41bVOR0Iqy7SUXoTfAKx5lza6oeILtg/7Ah5XhLgeEnk5BTMMYjns6821YL8ncOf8DHqDw5hA6xAXi7oMUUAD61rgqJFdKYZm4jlbmbUTSJshZ868Xs28T0VkVRisL1zc6skk19aMcAnIvBUyMY+lbr4p40j5CM6G37RBi7W06Uv8WRrszWpW1iW/z4q9NAUvqygzl5rChkuZIR/mKZdWOYW2j8posiWlW73yDZ3o3YIt0H+P4ovTxoEJwXHVP4DLgDZ9T+fLKtp6KYw3EqCBfsKlaXkO2sZT7Aq8DRItoe6mFzmp8sRypz/v971k41w5qwMVjFL0zAsV3nSOnp3WbXS8nR4uaBKKtMRkRMS7gVN/xtPpUvAJ9rpVPmzFScYTQAQGHf4gqzw68CMj7QCs/AWvonBYrP9FOJhxZfTQeg8I7o6QMm86zFU97+b+vy8lZ4tBR7dXMzh1H3UfbwhC7p7dkJwRKJZMyt6dQaHMNk2TLedeFPm1EV8Ahyk66/9Q5nbyFFebviottnJUijgkFU1z/m8XOzWcMPIj2Kh/9ruWwmEc16CTqhvrm/YEqBMJPZBwEZgc1OLtyGFPVFPlfa9cnbNK4fnXlzcsTMDNL2MRUPw3G2608y3Ud3a58pN166zAtAStK4zYBrxtoc82ETIvj5Rz24j7BVkNfmCCZVwBQrpsY3RI+uS2Xji1/EpLGmXGEot/GtGF6hHA8IpK4ruwhXDuzyTWwTsB05SD4RhnzVyyd1Xw1vWQpOwr6YaLTg7mEQS7qj232h6kpYKrdIae8LY8MK5eOiBzS9kuRWR8YmihaClrFtrES++Xmkhxv9sKI6XoX/opSiOlJlIjZgmIJ3elZwkSHxHrX2PiUtaKpYm8tk6srlkgFZFJYYBUVvQQi7vQAbzJnXTaDIBCaH6aW+VQ5uLzXBGsKWvCYyIOxAKtB+JbE5ZIbBSTCTbhaEQVh9iEjTaFn5S2dheszS+oX+cRrT0904NdiJn42gHPGVeSW4cqxHT66LbgIfJukKeFD/KHUAhY/S0oYMq1Cw9wapFc50THRLDVAdzIL9fdZ3iPLlL9pE1aN468VUmNCUsRHTizyCgio0XEVZnD3innNYp8VQl14kBT0HF73eHZAqKQLI3GJt8zdJ2WcGur1eaPWKzX0h+3+gV5nGXNAiHxv59ss7OsnxVXoZzK5KXoCyHsSEE/x4St+N72ONStuJajKSxjHWmCAnYOXRb/hu3jlzDdweRkYMZFZC1QjVGhlcEQG5y17LPc3jFVFGwsayF7MDh6gjmX8JQYh0MXX4EZ+E26h9/GWsMQwMpikFwmvbPb5hdw+M2Gth5j1365lo+MW3rXq1qZCz+h6ahHoN52PJlH9hIfFzOuVRA5Uf4U7ToC7ELv3XZvSuSnD4TYyX+GWeSd+iBRridMdPBo5TZGACaT7ePIlFNRhOOXYAUPkbBPJIALm+9Ad69S4Thep0VyaaEhWV3BKNNGRi36S8oHLuWNnsYVPhaFBPFeJnGtSBOghcSL/ON0lUpMtveVtJ3PhoheczCFTkrWP960XrL+n99O1YtnlpuYq+/LNf8lLzJUBMQeIOfYeKutcfckWD2bOMwLgF3FY8r9UzsszX2/gGqIGT3LfU3Jbm3eoRQQFCrg1HPlLN5fitomjksn4Rq9FoWEB+60CMSEpNYmEElGVJaQd8mKlT7inMQ6MG3qf/zePbjjX1lJ6Bazl1a1UONR/rFHjVmGdX6norJiMI+IoofekdAAvdwXKMy5lpbcJXyJ7yiHAbaei4CZrKO8DqtOb/5wVhBbPCUrWNMO0PxNH7CralEmh9tRsComxHZuT4qrOZztrbB2dRY5tFuG4rKSGoCEgoSUll8DkqbtYXi0kTsaZDNlSikqizbNKUDhJ8a25FvA87Wc4reMknzlR9sA3ZfNXMartLdsl7/KMGBmWtR/oFxhmd1moQU0hhnsVpSKfIkByxKfQnlZluEzI0BDX8/xT2fEHKaaRlCLKLXBPwFU5efqHXVF0E/ih0JW8gzdHh1Amu9J390YGNa5oSEPcnRmr0o8RIPJIJUprAvnQEDAh6Jh2PyUtSaZI0C5kcdcv3ALV11GaS+l23/GQIQqstTNJOo2aJwp6qp4DeRGOJPdQl4QV96B8P2azTGDgGyUtvsI/vN8Cdu+ozMCV/Iyf/JKg0JjqS0tdYJQXoqxQNMt7wUcx5VY8Ss27HYg1fNVcPLM3ha+cKcFLWebQkNzeKO18cOfKr8Pp3CvE1zibf0Ts2BH50S3CBqD+yF4tj1O0o1JnMhL4WBOl4RXd6R3iJCbTSBRb/ncANITl0048LpOxvQsAumCFk5wdsCvtuDtkhLASqIe3UZwQeVAgMQ3lONBHiHOGsd6SYSnfpai6fpTJcwk8/sFlX0J7Sk5qOx7WrjN6IWVy2wvhj8MmwF7r6lEzRRlx2Bv4nmYLzyuJqfYvNL4wtnIYErbHsozShgq50TQ5wrvcK9EzNU8Wy0leOqQkojzN9QJ27RSH8VWvNLhpFspSN4p4irDf3Q30ZMCzrwbbxVHSl/LE8TpzMzJj4393muf9ld8hgs4uyNK7GSP96ZF0BT6b7nrvm1Y6gpry+MoI/9qCOKgU16fYFyQoTRR7weg7lgHFvGp++EwCRyhDJvS66eg7r3BBP8K69P9atTll4qR5O9WTHQmelZzyEOHIjK0OPTj7SneSwb/SJauCIzRW/7WL0MOTCUuGyBj0hclj0Oa+3ytVCVxDV9kkGSNdclrysEl84pqu25Ht5QQ89raXp6gvfyZhND7zZcFsv4RG0SEUgVAKbBwBcHIGM55X0xsruDOGhJUtH7WEq3h6lRTJpSoZ2RHuUcK6zzeN2M5QGuKnk8sERk4831PnPTlVZy9K9rEddrou+RoZjEF7ge8MBTA4aUWs+wzUP/TJZHdmef9giwyxEku8TARvH6SjsrNP0PiH+4BUsb8t1r8hsBTUp1BfhbEkhdtvunkGufnKdqy+nn+vnTD6CzOtSeGdOnz/MJtTy53cnh8sOLXbx5LjVtDkl9jVVmAEMs3gf+6eswU1rYodHRFjLr6GOawM35Xdv76WWO8DxLj4gjEBXmp6TFpOjCHNYVLeRwrpTdeW2rhefise3+YBeW4NpkCX47MfCWPELDlHx/BleYFD6/BV5oEZ2XnzzBsCmV6EiX7fdzTb6unqUbFBEAxgM62hXfXZiVHh+BP//DD7snGO2LyCrBS1QxlSnRyoKBLO4LF/vhu6NtvCAN9sh3tBfHbHNyqHCOK6VEuyWpPbKIZsIIzHGUpg3h79lr0ZnwIFANcP8eDOByD5neLQax0pJddr2Md7Z7oZA5MFSqI3GQLyODm6qrKeAUzJHkJVnVa6xRWsmmcgp9G8zwIWErfSeT1uD7x8Jiz3HeVlkViGDbcYW0ca/AKtUEoEJVXAmVbpp1V1RDhc1mjo2qhED3UO8KmdMZJt8aU/O9IyNS52ckuVWefr5Ym9h1WJhat7Qr0/8hywPlSfGMKsOXqUI9oEYJuLmwYLD0+gvH8GlAIGNoSCpP5/P9OnuPwVS/LjEytz00sMUbUjInkOItAhoAv+5J0LywW+h+K9It4RGG4J19T5tZzppdG9U706S6aHCTizJd3Yg7K7+QV1+YSkVOq1NcpvWyU7wJNbRtUDWTsYrEvuTaR8gczFG+Bd7Ni/NPDqzy7cZSojs64QMshFQ72aLBkalZr5aIcZNM/IEj6dFMQqnCpK+8uqhGMcafzLaR4jr90cKaH398hmrdQ3rF6Ywti4N0kfoGwF/5wlTFgLsAq/LOjv9xRWilQobgdR4ROBe1uMhq9NCMh0ypFhDaPu6QjbNsEYgV3XLGTL7Naz1zjiWlx4UtDYEc8rnGiOcDQzbaBCzw/wc6sAJlzzp09ZrP0QwjX0lhbxyhOqw8VH9yax80Sj8ij0TJiWwIZcphWQtKuThnAYfHowbFYHZYOD4KhR8aFBfsJtAi4mmOOdVGnrPfLPbyGL+VPGuTZ2Eylbi3gqQFpHKZHN5xu4nHzCNV6zlF6uar9UobKZAe8kIqkylae8HAYXaDBTWEhCb13YHvDYLPE0mnIlKbYmBNT4j63Ij3IGJT5Ks3lJRqevA2ZlGYNwWuf1apBvvzX3IEnF9WHxas372Jq9LfzxEiY2OyJsxJW5OYig0rGy9Ij8zZ6k9rwY1LHVt7aVk3vahT27l+rRMM4wSuVi35G5rvLe+nA//Ke1XyPnDAiotXL6410LElsePnJD0GBVk3FmwEroHb9q74mZc4W9fZ8uSURR9FTqg3BvMpGLYitpTWT2Fcz4cRQgl63M9qG/4rP0wTkyH6FFINUzejUdB5HKePpvV1YeUaPAvMYDBoqB9tdcQ4TBDBitVl8RTImleMcEL2yIEGfkHInGAJHHfpor/yUDRALstG2rXdz/maVptEoy38DxjJj0xbJ9trgKUMmUrOZA7LGsdgxXTc0ICJw1Klbvn4/O5NCAhbX8uyenGB8TVyMMxlAxrC07BmssEFbPmMRP+M5QltQydT/4tDKDMMQPXKML3ncxT4gEXUhREvHSKB+PCE/cyRY98IMGd5JbrzSSwHMTd7yxu6oood5XxMi7nl6Sz6nYzKf3XMF5Fk96imtetPXOPzuPn4MiV+UG1huHS61ME8igUzcsn/2yT0wjDy/rqFCe7eiQPHxTtDAwREwXqA9y2q5eg2nhWUVbwJWtRUSMbxk+9s0g7ypX+rcArqFMQsqH5PA//0VcwcU2BteiLWNtMSaXu73eVg9Kan+1nSU/0lCJbsrka8YNMjyXw8D8IGTUcMhvKbxe3G+3Nh6bYQ0DBMm0g2AykuDt8TWusZ53ULgHgws9u7LQbU1YFjzvlYUKUVfRcR8MBkEEpeJ/XgyMqKvSqe3DogMznIhhFEfI6ZoQzEK7GCM9Zzvs66fVv8adv8Gk+saoPXpYXL1QD2in4PbBfgMVBQOfAhCR6zab6KNLmOUEtB68JctgsdtY6BCvABTVilJYpaK7KE35S+nyNddr5Vku4YPzKlNEAkZnvFWN5mNcTRMBJoAJ+2l87iUhbOA9Uo5kuM1W9JJ84MVtyMliZ/y9Ww3TDup3GgW/9w1X7KZgqySKIHcqGrXyPsmp63joCQIGAAxPV7z18JmQ1KEDs3WSXpdhAQFOsUSJZ2fFWVJqVqp8UsMCKLPiFAWzprllJU7Y31ip9+nV/YqzLm4/ZVHy2VmELifQi73LGJXoUqc651fPEwMXXofOR+qJZ3h/8SUbo3UWGoQ2m2J9vGIMLuV0hwKF0vwBY6nMm4pN9wyJMWqSgxMXMvbGeE/BSnzg391cJdYF2h0XXOgZXlrgY/fOFKwp4iqlebtUm8JbQO1j+4rB6bCR48Urzv7wk/amTwqGx3owkHZ++npAQOQAv4qDoqyJUGwCpr8uz3qqrXJ7YAsEVqQxFfQtiUYMWSKUa88rBR/KT3t3LC6lI8sW00PHgybTRtUZMbOkGz9axNlK41cJayx2HqItqkVt09mrtSv0I4NnLhpyv3dHlCoC6WJ1strgpMUDjS0KbszcQamTPNJ/pBmtTQydPKObx3VhayCDSO1Kv6G3GLGyIjJe1ybJJ4KgAg8LoWdfqZeKJVQzBEP0ynDz/8NGLlsxs/2YyY8Veuw+rA9IoVhGJv42YjbRcX8TNgLjBxCZDHNgCm9kz8Y7+eoMtl5dlPv1k78hsvfvD733/6CyVflN0+2CWwKv/H8YKWpOjo81YrQTosMKhIIM82yYDXZTZQq7q91RIKT9XRE39/RMRKM5lWY5nV4bwfdCk7DWE/Z/pcD6zKwt3JkE5zT49JbUSBSnGhKUwoxVJofu6DqOT2LpxmSz64fXwGKyV10my5jO9fRRm30UCeqekNqOdxiwgW9+AyCfS1VFixtyPTQ2uYlhCvv78BNvIXvNdFVOWfDCbsG1o+MAspWlvZgeeOREgluhOqEUplBsiZ2JQGL12HmWZCS4NBT4E6G5+MhFGDWbtzcmLcZqttUc3hoKQcazokpFnqvaVbJ1XQxzFe0vHlZBTeIO49Pk0U4kGSoT44p1O9oXJQNBE7oDmlfyuHtnWRzlqxebmucaaw/PCIYx2BvGYP69ZgYtwyvK86gBoL6fxHItc2eTzFhQOLv/zr+5e7dx80igmktOrspaG3jNU0WV/0fN1nAnkcOYrq9oVCmQMPrX0E4YzUKI18C2feAXwc6SkpBf9fmIFG2g3Zwa5MNf4HF5PCBDiigE/pYqNztaJvE3/uWCpnnzS0iE5Z3o2oFNxeggAlFyTmkSVKZ+EE0fjf/tIGsivzzHCD7wkbl5AsUq12i2YJ0kof5EerDwb1E57bchsefVaZdLC9R7u2ewPP82zPnjMHuc/5e8uJKHdZiV66nO5OXyvSpiZpSVtEndYBnhxVIrRP+CtyBjhMc8SlxhsXtHZKjrmLDR+ZXNSmbHiKnfyW3vwjhsQZ26O5OyFvgmGxnZ2jF2iik0uwkL8uKf6VpE5+WEx3tKwCs4dks8dXmhbUxmTjEA75dvvxtTGwq7toq/RJ/drDVP4n7sXalJB58HpF+tmmeCq4MS2Mn0MLyYNkdb4WreHRayC+H1If6kLdk5JrhzLa/WzW+QwaEgZColWzSBwaEagPOvGsss+eMBv+pDdnrp/0yXWUBdhTe6nk6RHnb9Kzj+AtPD4nfnqNRugPppSwSu+aOB6+wYaLErJY0+FDOBMJ1StJ3BVI3dccHT32LFstHCBtfrAbgmG/KsEu+Qtr/O8LFvBZe5Shqp2tRh2vTx/XkgCOR5BvgowGyK7C9QVCVm03IGI+6vcLcckCMGOd4wRMIai7TEDxmOtwXchQFWT9D54GnUWe7ERJA2lDMfyKZHUEZz0ArUMK3jWF40r9TZh1g84Qwq7lYkUx4WKOuZSUgWYxY3NeHdYjA0PvbQlQaN56ndHdayGV4TMcDKibvpP/NDitERvP9kAJPLzmboGTgDLmTgDJDcTl2iIWzufmkIH3UGVurFAtSXrLZLWpi/e3yQkE9Jv635XmhCFjpVTNm0fybIXKc4QSS9eXuZzzh0Hk+RrgJtccX75Qu7j0n9zq6+0LRytpxzgOMSaFUA01T7aZ7MxXKKlavI8uou0mdnhrosB7PaQW1X0X2JNcwoTPCZqph7jTMHllQjgIRZ7zbEwN56fOpRXYIraOD45ma4i/PUa7USXmgNlbLTGIh4ocKoS17/X+a43ePn0Kz8Q4nJNwcf9Lu7ZcvULvokqT99S0WBpAr2WpfiM7igsGnHCtmrDmH589gIDbVxQ2ZJ5KKIzYAVZyUxTSDDdZfbyqP0uhcHj5y1PmR67m2cfTcdjKhFPrcoxzUDHCNKLWCWlnm1xg7zDt7NlwcvFwCJjS/43n/us4uN2HResr9b5/Bu7nnyO51poPKq6qbzPxQBOAiCCo5RaVqgoSht16ybJropzpatCREl/17oICkfdzN4k01cuVDwGCs8JbaPOxilOQbEevAZu/xbFyVS3vzBQ0pd3NT6Gg7R+m9JVCa1RjwX3dUiXY5uLZgBJlYn7C8RtGxzGzcbxKJ3xG3MALNMv/QtdEhnG6Ldy3hps73niaZ7gBavIfQscgtHmMcXysCDNkw+Z9259CKf7B/szQH+oN02T+93ZPcT04UCOrBAdv2COsCHHprjNKDQvsRCmdEr/cut3D5ZlnV5ootqRynJPssGWAsp8vxHu8ZoPIKpfCYp1qAmPI+AxpMRJTWRfjlqg86QpCFMe2raxbMRA5gAGjiuszo/XAtxxQX+gSIMjdySvwZyFo+3u6fY9fphgyGpcFnmhD9xmncMj7WLGtSgzk0L9NvmKSi/yp6w9GBzxDgnlFlVT/Ac4tPF0bF/U00j/duHAeIkzhQmDdhJdBkFj0XzPI721mVOEkRVj28V9YPatiCpHpEXhWhFKaxkj+bIDGe0gKnkCtlOaCshPyKLrqoI9Rii3buK8gcQe4+EoSoO5pjxF2EBfR8mArJnIa5UDpzQuC2JSqQXAGWfaaUaWEqKlHmZHSqluhJLw/iA3ovRirMZHUDiP01C4kDVYqECIhMfQslxnpQ2T4p8Y4DPAYcuLWYxrzgiK9bbWGSEPsabF0kcgj1q9WTqdLbPllknrn1TlVl0tUM22HOn5YfWRoEQ4GYNgnoKyPtlNgtgo2z5u1/C4Xcov2iS9h1OqYHkEZNxMoqsTWNmMJRAFgyB+tSaz2+nd67fHMnjJb4rHzwjMnKfikyLxdoBLyf4N5rhZ8uvjI8p0/5DF7RzPUr8l4RV+KebQj7sFCmU5H8iL09w3HIkKLObTPZoB5OD7t8Y55oiAA3u3qnjj6nO2JsGauiJpdz0h2wOexoA48/8/JqNs3yblHztNmpWvSOjNktglKRkrM4I4QT6Mxuy1XfiFnq6omEhBaWPaKyzLhpJzh95luDiIRrXonPT7T5lHaNntyLbggBP4MMPH4oAbG3gCnbRjJFpzLAv7k/k8RAAgF/iN1hFUoGE4UWbKmZ4n0vSgwuEPjFq+1D3ph7b5sYpiy77WerJ0BFA/FoWzqR+obkxq32+5A8Rcw5wBGvmKgRKqidjlQdV5yHK2xA4cnpcFdPXU7iMX8TesIARXBRJFfB4/DaRR2mdx5z7wg6wvHJzoPZ9K5YTA9e5WE1yxpzPwHhg+pHuaf4Z7gPzIMFHLvsXFjHIaFwQ7u3tmc53+a6m2q5DCXtXsi9CbHrA94uxUAsdKWdecK3pvRq5h+Ll4XrgbAEAxAdsQ/4Z7pHaAvomrfZkspnX5MUBYzd7DcWg3AVUrHvVkyi2r0+5x0BwZcMmlcbyJ6kFukocIniES+3QkU6dyiEAnUILK4cgpxOFUA1ghEfToYqwsX37YLqre6tLKyvAJbRuanhN8mKUJRMGUdAPoJ4hY/CyuNQr81vt4WpcAAPBfC/6ck081CrnMBFa46txnhY/IZLNhejYMkO3xSrB3eeiSiydFskUakSSpxR08sOJ3NsUpIJ6V8KkdUZS2Z4V7lgvm+EvAAM9fRgZUoolIkguS97haIBwJ0Lv0Dp7JyyyztuyX8/sUERSMee1rzispYR3okBSpDE+zGdR65dLDfWJUHflEhPYOhJFsEHE3+4v5GoqavPF9G1Hm/bG+YYn+AIFbSuyXapHoilM8jnB3s0ajaVyElUlxYEU+tG9lPm0LmwLhR8rkOTXhDPywmPLArJERDVNH6c30bGSG1VBxAeTSsV24vmgItoqz+I4GLt32f9Hyjbl8hvMfunQcDW3wa9rlJJB9Wm3PNIHgWCMIczs626YMkrq83+OclYyNNrf5ZpULV3EzvfgI6x3w7OWSaODjVNEjp2pZCWnmsXDHSsKCRSmEU8MLDdpUYpHZl0A/3fglSkbLCBgky3aJAl/NuAGm+InGTljSeggt0LqLFDmm39DjDlT/u2S3g+R4a5z3WgUK0bZdrUsOFD6VqxN0QAPKgIqYoSzpNRwtC46VqNjlrKZGM85CRa8X2jl46ygJFo9szobAMGazPNRubxT27gu490YFv7eIh/zbspkfg0jHV5Kk34VeAfRMjD/UbjNk4w6sE5Bpf7QWww+3A/XuQGUzf5Ayp7YdrbZDwBNX388mWCXcDcvCWBysGnpoMRPGBDC/i1GZKFn+/OaJsFiaiD9Fz+W8v3IDXIemkQJ8ZD8X8eP1JzxRoUrZtyqiTCEcN2KFRwHU/+dT7pxZPlxuS4GRmj5TYc3712o082FnLC8dFjAEoLzmQds1e2n+QgaqMrVnV7cIzXTZQJOO4c+6neIIWV/yd1zLRSsVlWVLcdc57ryDjEYta4eO+QuVu01yBMNhrAcDyRdQTXM5CgUvMgJl7UOpYch0APcFFyF/jOTXpgl8s6UiT5jNighTuJa4r4r255D9fOc6Mp+GrOHyd/Fs5b//2qpID/0ns1cAAGZeakZLbc6mLrIeGSpguNwiEVx7hgEgjC6cpE6sd5vG34veDYECCDkz+aJ4Ejuw9lauqeHKDvcEHKJnQOC/uVxIX6RBt/YutFxaQ3DGan0XzpBnyizn0DsYnEPa2CAFoDKibAI2LcldNDknlquuG9UiANUimr/7O6Y/C44lyE4xuMsF0V4pyYZIg4Kkr1BokfkqOXyLAwrIHB1Lp2VLVnA4z4BDktP8WChkElf/u+IoD0EBFJpVRKYqAd5v3IkIbdzFi3FXIA42vb05ZkMp3bz2ojN+nisYpyBkiXK0VoTY6hGZu1YzIxi1FIb0zmUMcAUmyhEtM3LWhpPoBlUlq/ejRqV9G2pBHH3K1AiyfsyjtR2AaVKvUal7KhmMy+fPGMgbvMZ1vMlnm5eEv+YpqFZ4UgZizxBhtOuY5qZhwTPxdpg6lrGLpmb2ZXcX+0vwbRLjYsMzeLZxclptbgdzZ5yOLvdFwHdTKEA3RYMqyYIsxWVpe+6Fxt+/Pbs0MkMbhaIz+jKcGaa//hR35Sado3OWRZMjg6NTQqjZWqmfl6x9oSiV+QuF+8YU7vPLa2pAbS7buwgJpoCMHKNCgJiwk83L7MK+iOX9d1k8FZxFqqDaVNaNA4ohVKQYQgUq4yHe66cXXCqgULgEEVKhEJjOfhgLQsySNxZowmXUsd0gQ7pWaGLBDTt7QyL2DW76uJsS3OlfwQVtXjUQLSISonXs9mPIWn87dX4KYaVPrHJUX5vw8KK7QCFlld8OIdRTmUentBi8mDEkL9/nM9UhKjiT99kwvZx0DEvt7dbCME/1Y85D4T8DQbpQJZMH4CG0Ecw2oMQL22d+GI5MDKUbFTo2mZFLFm6j2PwgoSfZ3RZUNogUujTZNK+U5tuYVOWX0Pe+5ThMAVCSINclCA+OpVBM108fImTYeCNsRjcFI9CriLizgp56bUIKhOmL+LjKifPaOsxbm1YGRn4yRRPTcQYrrQYYRG/GIT2WdrH0vQgAIBwDLiGY8EdilL2LjEZ7fUuHyNjrjyQ3yYxQPCKelKSHhH4f9Kohcqv0ol2XwWC8WHcBpf82yPBac10oScXhCAK1jEQHJNio7gVR87QHAMW6YNzY1NzpQJeORVDi5hZKX+E24VUBdx2yznrOEn4q11XEbwyokwSbX2x1IEmlT2bi6ugxUVwQFhLmI79L2ZA12CWKz+7BCqR0ictMW90HBdNPzo4JmsNRleVjsKXtP9UjsfQOQeDghm4UTrdYN6u3TR6jiaM6T1MiC+vyePvDr8WwBKsYjKteRm8+kzeX3zXZqWHvxjIA2zyQA9ViDCNZpLAkC2AtNf4sRhwuY8xfVPr7PUc9j9sVauXC7SNoQD2DLmupL1ffy08GfY8uNMRmEyI4CFAQQtQex4pFP0HSjrOPBp85R+MxDhq7F0JjubYP8Z1lSj1XrNmar00jx17Dc6ZxMb0NGvD6RcI1T3Mg2Ewi0sDsjWcZdfbqfsk3QK34ym7lFXa+9eRIO7vnme/UIsf+xxihWgIBwqdfb3vfVOmy2LKTNAbLsvPoxBBAl904boV8fI6nDGM1QAdZcerOOkkkVxDAK8Xpg0drgKDPr6xgTVZYIK+quZqu9hgDeizIxWBBnBWooyWONCSAsSDK/g7Do97KfKyhw/HK+CKmFx/jwawXibhKdLLRTvBwEiAoudWxlXXh/Gr3AwqN2D2xJACu2rytlUF4f2l8fmUja5+InDvGlC3mvTUfGtLOHu5u0F54nhXpUm3Mxs2CmIPJkj9HMnVmKxKeiAcsLvJl8lD+fiqY3/TRogerdKn/2XN43NfoiejC6DrNQKwmKmpLgzFUa6KkwwHJyknBc3DdirL7gWMylzvZe7uQmYXPRoy1qsUFGDJ5FIZzBSJtggg4/dVQ/JV3xLymV7ty8z1gVsK8iikDSHZc28LAoU/aFisgblk+SxuzhjGKAS2BV3APusqfvHvzFootpSNuzqnaMcAA17lIQj0NshBhd7UOGNbJrKNMUa20o0K37uHo0HUP5VNVHf+gT7JlUiESxA36WvrSAOEgR4wF4RyLB5fmVQw4hBAdRUXPsBrbWihQy9yro2oS8bS4RVPN7spawjfUjtcpwgbjaQDPTcZT7nxQEfU0GXvGGR3MDVuarfnwaztR5ioATgxJm/Jkz9up6S0wlqncjaxCwzMqCGg6VGIBwTFQhAVQmOAS30+yMpVhHzOwgQhI1uTQyWUBI2UO0BJ39Q7IQxNw8oYbBGKyolBKFmYttajjkM5y5Tvvr5O6xRmADnRHlbnV0y7wRtHz3h34/HqZYsVDI0E9tPmgRChGtXGpHxDCn4VS6ZLo95xeZPne7gD3ASmMguaAAqI7O3W1CwKqjWR/tQhvuGvMjhBLXMZzGhCkanTcnCQBjO2n/kzreS2JjWGPylhTuehm+V0xg5akH+8953a6MljYxNlqWh5bn9BxoPo/wCTyufV5imPpcyAC3WSKqdOQp8UFQSDcSAsi2piYT9SJq/sD+S6jZQzXVdifWIHGn+80WiM4Vd004R9vFsLGVoX4e/37P/dDnAkcAJqob5BZf1+3rMqh/KfOM8ByL9U/oSADH3WCd1Q3RQuO0QgCxTOjmqPjA8tQBlUeOioWOeZ9t88fdp29JXYr59YL7vl6tha2ALcWzpiwxamG2WgqPm3EAmJWC4fbF8fSmZHJOwkItMWHfNJ2r47tuRsCy4IGgvYv2M+1W1rEAJcI594On5o0QZ28mcOr/zhlKOw59K4zf/CCntQLY++jg5A4AkCiucGnWDODH/WFEhUjc1PWpD9ItMzcPUqmyNa9eKU0XqrpDnyV/yxk1xP4RsJMojgIAjq+5ulBIF/r5CSXcgbHooBdxaIX5FBRqkbP37DeS1HfiaSkiGHcsGTjwx/jvz3XzF3zZoyFCfiXanxlIHocoqrZz09YTtVjob/EqKT61gc6eQebOLCqNHho1qoEH1SFHUzvyEdy9YiKRE8VYJVn7NWDhMm/RsjWF8ct7qLZLmy6kfwVIwUJjh3gN3lEYAvquUxlwH7oqx6Mk9j/OIxzTRaIDMNiVhgsPt7+ufIc3fode6TkyfytF1vzY6oUsauMZe6214d8TLmfaABqhLiqYC3Qw/MxL152eDyJVkn9/it8ssKC9WFeP5och/b/tfJNZ+0hrGymWkvCOGW2AR13ezY+L83yNK04zZB+zm7Zvksm2KMtfxgfCc4lHOKG4cPWPYiHY+/HamgPRjXu6/d02m1skradYsY+Pv0hF8ctwTE3DHlbOlBk5H3QcjiLn2NGbQ0Ukl3b6kmg1JBW8hfvwY3dk/SGALuQw/0q60x1JfxbW+w9R8PQH9VVXgcRuQr1GYup4ZUZvnIQAqsV5g4sYRVsEibwWdLt8QkWI4vEJSWZoflICHJhxXbo0xEuQy+Q6L4Kr84BHJnpNrZWWWOSd34UbAuGuAMyt32+HKBDUz6CQaho+RY4DL3VhOdGvzkD2PFfCDclNwYaFqqSzvmqctLm6KM/m89P48Mm2n1Wh9IhIWNuo62nZihkptCZsb0scjJxuiw7TMHTm0Re2YA7aFDaOh0Sn6FE82rV+7o2aVMUVnA52ZwmGvOHzsmqjZpPKCGGvAZBI50Ve8w7Un42L23U0OEJCfQwVwfGyi0yrAeJhfMCXE65DMGWEMu1k3fxxD9g9fTrzNGlyXO/q+YHf2RQoefnyAewXU/y398Q14io8GjQBfY6JzSnQKqNmR/5kFxn4ft3SrQaixfpfvv/f9bXRdhAt9xBcCXuM9G7v0hWhpQ3lI0HcgQAK3B8EBA60JcOYx96J+2CZD98+c6zbT1wLrQq6OsS3gSon7IXSkZ7xiCgLgKQdWS+4SLl9FHw7QBtG70oV7wMABmKwiLRQy/57lzS4FfJ16VfMrG7H+8egV2HQC95NIRaGuIKkEddec7yy8UoPSSuCxYCECMa298ReCHXvsBOznaRPbc3XK3ENf/CPyEWgQoFY5Pe+hHLF8TcwdqQv0+6704kLwO3l4hzIvAf4hS9sMthMmwCulS4dyjA0SlhAVhew2naPxixLIOxzcoY8NhAcITZMMEpgz5eUMa4FyRxZvYz/kFuzno7cJqKHrfIS4SUxKmq9Fdgy8GKPy3XYbLaqVlRShrAqxx6F2AdxtlgvAKRG0KbJg/3zfQ/4fsWkbseIAjsb2H0XjCgx+15HhSVGqYO+jDBEjs9At83pFC8APR0ntuEQt6Wj5+AvR1bsKoGdHjnwtEx71Pzs57lMtr4NXImSxCq7Uf/AkzUrI7DTr1IV+AMuL5P2pyiPRvNhoL1K8oufR/UlggwCeUqZAyIc3ewhmUzsQF/SBhDIn0QXvYfRCBPej4vloEMI05g33BQmNKYG2wV85le/IeGlXaD+40dTkFnum9M9X0ftpa121KIGJqcP0MzYEwofEtw/BH772xXRxIISuupmvOkJy9PRB1tJ3O72DV3bDvvlTTi2IIxzhws2N0JkFmLQv/YM0msnqeVtKx0HvI/gdOEd2cmZ2P24VDZotTquwuH29cA/l9Tg81fjg6Il/dCQGIcPC2N7qfid43k55ZG+yV19VzSVaHHPC0rZmRfiDxrKxeDRsKcWob7PbngscAKsKA+C02su+oVbeqX1H8A9p3ghnKdWJ747jONg07wigboMUXxA2KLvovTUJ0i2lo3XukBV8hERZcwUveRz24C4ut2qUwwZ8zyeQtip/Q3UGmS4/d3IYDeKvOE/0oQZyFK11JWFdVIAA8BvEPfP/tc0zMoA9Qd2F4GN56VGdqdxqN469JH6O4Gb8JaHHbVxdu3bi6tM3NfW5DGcqHf4/w58+Pmr7FjF3QCRa1XVk+M9C0eEFTu1U5wm1YPkLGPOUSo4L2cJRIXD+sHNc3fawXNyXRATBCvsk/grN7wcAbZsElL6y3EFbKXvHoMOHU9KELBFEB0rf4491/xfcp5uPe9tm/SDzB348Qr8b7gszqbMFoPsWMesKGZDQEEPhb/yfklUDAJ6qCdqxI+VyLcMvHLhDhdhz/xxoY8GhGJ8eLp5dwfNv/9aOmhfu0f6L+7E7ExWUwdLC1hNzpFzu61XZAyXzdehlF8NU5eIlMl1eNkgy3WGrvgLzZ4Yl953mPIJlpbEOb6Wi+VtJcvWfwW8/4BQJpReBoRG7lxalr0tXIdTV3F0OV4Xe98WsIQOscLPbPTzaF7SjSDxb3CcMXsO1JjwGSfEnmN1RAAGgV3p0nGmkNCLhafwg3hwOXQe8SCMZVEDivwHibBIHudChsD8Jg+QJOcGUo8DsW1DooGoZbio5kTZiMUoN59BueebGQ3FEBMOAaNaxuAAFhcBIEiztgsrzvNhptBMXNhTBcPAenpi8oeDUvqeUWGt0nRSd4HgSjrgVhXvhGlhry/6+z539F600MdbqZbgf9VpjL88SRY8dh5qZ4vtAGBjY36nzz6X4t5igPYV0y9nwQ1lRTpsiutpCl7GTecy7Nk1k6hjNuijnKgyiAn9rwsYPCHIjVvG0mBq0ut6tWHsWfn82UYuxcbhqvfman0vqWbHdDFgM2Qz2OEJ3srGpD9MhUOwjmW1hzftm9jXt6ug25g9d8q2xDlxc2w0X26tHR8YE7uYUndeVWHz09BeSsV2798FKcZZb4dBZmlK7VLCvJ7vMKgIn3Xk64ED0qkVHrbBZ17Rj5fklq48nv+h9Tq5oCUz9Bs6YoqMZAkRXgVw6o6IuapTM/i+dLP/vlbx/IYBne7d04LIfjiwcmnVVfWHVx/4HixdYM/BiI3go4dDd67MjZAkCtn1usG6jrnicFW5esK86rQJPenbmRudByx8BkCBfg8L7d1iTDNhCO47f15OVuyNKRqtfgM5CCuFZvEaSFSUyJybnU5k0AswppxYcqN1L1Zd5XVd7MeQJjHgPkowJyt9TD8h85N+BN31qFdbS/0APpuZGqP9LbQzyWFB7/97zDFEbw0BYTPcRF0m1gsfL7Jdi0RZ7T9KI9S9gagx1scuD/65FLlf8ebMUYauNOiBkmGvDFHT1yftekNUdbEiEThoigEfurM8/acmxtrJtLGP2mUdooeEFhpns7wqBdi25JDmxrjQHRroJZ94x9JUz7j3N+S1pYbUqE5MGgfXvv9DnqCpPcKCv8N7usairAvCwUnzLAQN/QcdptYKaUW5G0RaCdZ1RFpviNIpN82yOJvtJKVi/rFfDgIq6rQAWg8dMOEgBY6/59rTFqwKeiTa4HFKuHNSnlgGTqZOLVvv5Fp7O+1n6eQgyonscKBJGYi+YIgcKw6e0QmvEoshMeTjZUGTFWHlyvituWvrDqKNioM44FMZTzaXUXBWRt4JgITkiwXSmJnU7m7jp1l6qNzC2V1dpK1QYicBheTEGdEbgvFhotqat2bOH11wNc7t1OszlDi4EEyPJa6RsoEKP5QV8eDwdCaHq4yCkUo0XiHlt2dQ9bCQQKONjihRdB5+M5C5iWy/VwLB72E1CUtWcAJuoKzmQGTQ1eigFIKuiaWVHkolOiECDoFFnmR83vIpnG6H/pgS+SgMygVix41kREPVMMY4BcQsAt6lQkIwKgMJtaeD4XjnJcSgqA3np3zqGfasKBtrYJKTH4n5jdH4hyWpXX7e8LvjKWfUWh1WzBI4KgXGokpIM2S5t2uhDPIUlvwDoS1JF/z17IHL240Iq1ZjKHf1MkgGbLCvmdHDJV1zuQG1QZfsViob8xkgqmQuwZTEQ1jJYKpDG/7as4to4ENArwQCvoJx90taGwIq2b6nEEox0h/y5QdBuzoiU0tCbJNz4AcJ2osds4D5E8IFnQ0FEDnSm1r/2pKM2s0lnI3/EefBoUrfs39Tf2elzhWMs6lIeDVFacYuQakMz9iExNFbIZ5HrxhjcZB5HW6EIyQzgmKO7lQJIrfDoQtj93PnBCT1TCgSreKJYZDBiSazKQiNLn4Ah3CHqF680IhYfiVDNIL4u5StFpvWy0kWrV9l2V9VKRyeNU1rZjyL79CW4EBO0SDLDAeMDHOBKAKznr5Uy0cTRmpvM5JI9GRQBoYu/GNgKLJaWwQT8DEr7uW5aFbuVoGzHam9osJZs0L+jHemGjw4plLW7oDBq3h11X/qGWc2Uc/fAyEF2bvh2vXZaRfxzt6nTAuaRekyKF+BpEjPMDyc91EZLrGRueZuVVT7itwtms4qcF5gRbW90lXcXeQLj0FyRIKm+tG8/ocSlrRBzi0vHB7Lr9JmdMxd7Uysi3OoSjnT6AzQxr5E5YMiqtMafV1nzTgDTaZVVY/mQn5mtPy6WUN6h5/Dw7xnnII8gq8IOExMAtDKfvnWGTwKJrsQUJOXCcCBfGG8ryOPDdzFGbCPceFf4xt0o9+4KzmMu//YPju67Wdsg8Mp+W2zmrD7GExUUxDoP1UPFBFUpajHfWRnMB3swd42OUp9LO3j7GKaJChGj+mPZiomx4A1cNt7rKd2DyvCm61v3p2ZGvmK9m4mOnyXFOHZZTf+BCGRvK1JfANYwICI9Aab3/VC1mQeORPDWwBKX22li0MCh0dOZaor3zAY/6toI5En9PzkHPZOqdwNzgbjpy0rpEbtkkhKb7fqcw31GGmC09U8/e055gtwNOe0+TwjH4RCPMJqdOqRK5l2MNu/0D1VQ3hihjKfJDidV4pzQEFV4jq0ojRUaOcjwn60faTfuCRkbou0Qbs3+6c3mLADmzieRiALUk8fD3XVMosn8YG6CnBXrn+HwkwzX4icLabxdBmhCmdwAniC8GFS0jAeXcbY7fVDgalGXeiQP76/Bd2NDKvFjcff13wdVziU+EU+ozxyl2XJfo4Mt1gB44U8TbkA7JqLw3mNrTn61qycI7A/hZdq/HwIqXzRwa2LvwF0I06kYJhP/mGrtElpNT57//hIrfMap4yel97lGw49suYa+15Ix+dZ4+dblurRlUvsizjVH+B1+gYgkXeg9Sl7548Xre18LviR12McTqdt8OfdEHTVCyzSyXeaXbXc+XI3yfD0OyVOzLKd65KkyDrlGcAZq84FjxHnUn4ISGIEH9ZR9JNf9SKSawg3e7kMHWeKXLNlt815FSbClYIx0v+mI9ykSguwEuXexk6kvVemUdjXTTNMeSppp0yYHOL98jGI0PGsuCyQ5wRikZLS8/YjYAghwWw/Y5kKI4bA07azwIY/iN7ksKIEliwSBxs0QlB+3zCXVhdQyzYAPpoislYOioEkX4G0RecCpa8HcHjdemqbWCwTn8SYgRALhr/OKDrCpy7gEl9AI0SCJqo7N+ERzocMkPYxRJmnafS8Hok+sOGcaNQgShYCbjgOlE9klut8yIPRfnEbO71I4NCfJJ/x0YIpACFUVa0nc09+bArClSWh6/0yQJZDGhSC0gfW6iIglCuSogBLmqnb5P6fLxgUKMnH5Hwlc8LXkytRJInMjCeq13BPr0QbzobuBbSSjRuJU1BrSgr3A/hPw86Qo2bLYs8kEO+giMO/sYPTy5wA8NkKVfXqr/0iRmdHMXMkhrYWcQOmq9KD+Lv7kfzrECKAnH15xqB+JThY0oNQChDWYCnOxFlZFAhVYAX4c9kkxTyNqIBEG+AJxashoBFwVfhkBcKLbcAG2JyCAigFRFll+zKF2XyJuQxAuJUiwqoRFEZsUp5Ngb3A+R/HlpkCFxaERWFZFpQomGVWj3dSPxrEJoxQUxpg5oLViiVpInu0rPCilW0TWLnKBLhgoEGVdVaR5f8KYrG2WuyVa5UZZLXpWg3OrwXkwTZiPJBIM2Cc8Im5M4VAJUVqpMTNJVbYLih4j0Sk9664GuVCHFlWhM2c4FlTbRIx81MUdKsd9IZUQcuHQVzgUIRtMguZWlHdkkAl6Jv1QgaDPZm9qQl1sYgbpRcpfwm/DVZe1+Be9KHK4BC6pYylIWNi7dhDWHcL/LzvVHLhKtsjAtiHPAxeLi1gSNIwp6LKQauIRAiZl4SPgvgST2Y9gCwNpiBwsK5S6EjFOBCUqloAdaYUVkuDfsPINEAS3dW3lXYcCJz88CYO7LwkIDbhXhMcZsEwnyD+vbDmXFFgGxLoduEeRzzbJxncCvSCHgzNueR4X0DW3uAgm0Nzzvng7VKR7X7oV8OCGpJtppiTV5ccQm9JWpEfocCfqvAKYjTdswOJFF781M0tpKLHtIaGCxLAx3IbtsoEJsdREaK8xrIZP1ei19ITXzyc+pozIBBM2LI0B0384ntn4DNnuU1BEVZ/oRH+wCfn0HgqRhf4uQcEBKGLAFLj6UAsBl38e+eNHx/d8BAcRw56jR+8gqwZqNtJ8ABbXXQqBtIZzRN4EBS7uqPnrPq6bRLMYKktCLGnSNwFWPD8tb1Zq9MHFgk2Ej8vruzwBm5HauMkEZPk7tkLGPnAMzLkplB/D0Bmy5hbuIEkZJLk/c/OLIw9lVIFI3ei9SIHlWPVy7QBdLhxcQiZ94RMiGd3QRPC3a1/IzWjKcjxJJKMIENioAf2xEMU2ScpEK4lnlhNFYSM8N4QH1LKNR74jZOvqYAhQAN1P+eVDCSJfMsDPCxPau+gAwZBAvbyETIxJAXbDAkp0vaeNlZFB1pBxYaqIjABZiMq+spDAYg2UYJtBTC1s9kuE4aN4sjwqsU50WV9MPmw9NcG1Y2e6Kin7QQU6bUR5MK7m9po2VyQnYWjTavZD3kXND6If6ggDvFmbzQpdZ0Bv12N8S0XgYQdTL6BjiMKyV4qm5OHFQiK+4mSXD0G0C1CG7dpuA5DbeV7AnREjmozvA1sdhrmueCcdfzwk8EzyG1oHmYDtO7B7/kR3xdYOdBqCD+K6qBmVxPOKgw/j1AG60chAtpNz4BqRr9jFZ4kV7yWj49VeaaHe+Eq+PWZquxXTi8guuUC4Qk8nTwGv7b/P4P3GriPSRs8tOIWZ3hGd8qyAu01UQqiPnw01OpaAg/kfHKnd6oP9i/8ISIx4FkS+Ix8Dox5eB+5M988aWTs/FwBhH+ILiEoKYHIPXxy7iFiPuISqBZ/BLQw/J3MQ1z93fu2MYBnxyh0qwIBThFTJ3DfVJ0tiVVvRQCAjFuWyVk+QHhRQ99ScU17VgaVmlCC0xrng1YQ9Zc2k1SMfIfDwEvW/RaNbaWX7SyR8XV+kLdlJv6KSfE53ARFgspPO+yjx2d3KFx/p6rcCeSOAKGAkRQ74WRKtElfr+P/5B6fw0xRmBzzs4mnSfFr0Mre4DA3/BL/PK+O54cz2HPBn+s+tDgElu6zHLO+9NDQWO+dNbS2zw0QefrLDZGadsobQ3D0A+l37a0876w3m/u+CFKldcdMlW1d6Y4bqrrqnxyj8mqlNriGGGGm6ZERq+XKdNXzD5KVq1ealdpw4jjTbKPsuNNUaXcf722oGHAmCYlu3E/4Tq/h2Hrlc+JiEq5jUfwuJgPCAQSWTxfr4mo0pISknLyCKoHE3eAl2hvxuBigymkrKKqpq6hiZLq94QrKOrB4AQ+bpPYARi29rR+pu9SPH/i0Sm9N1/HptCaHQGk8XmcHl8XCAUiSVSmVyh7CBMpdb01BKu0xuMJrPF2k2dQqnSyjQRdofT5fZ4fX44AolCY7A4PIFIIlOoNDqDyWJzuDy+QCgSS6QyuUKpUmu0Or3BaCo0W6w2O3sHRydnF1c3dw9PL28fXwKRRKZQaXQGk8XmcHl8gVAklkh9fGVyhVKl1mh1eoPRZLZYbXaH0+X2eL31znsffPTJZ18A+Uqvb4Y04eyFBagSHhL6D26/TnjwESBEhBjJ6FgmyubifCgUS+XxSnVicmp6xh6JwZId0RTsbGKkeuNS0lyN71m9UF+4uJj9Yx268ZNzQXXYx+lKWzkCx1VMSHNZdXYozoZKNQjm4mzInuz7C/kQ5WXa6PjF8kVvUe5PWXPGp1GcLbksyngr5duUksRN+ShLFamYSMdjsYWkVaaKkoYs0Yp86/orxfSdtgrtMsZPvkDwLj/rBLT6vF3n5WXrt5sM3Lg0LdWl1cAGlAqqKtcIlHoUwR+oN/9PNtpbVg/LCM5HC0V39bRsbnJbanlaLEPWcmnO27DcH9scDKOIeheXHyhaJN3Q7wRdzMnT8TG0yq1BKy76TyGv360vr3ddyvcJ9RrDOFPd1NySgFfjYzGGyf5iXT8pjCOtDQTHbGkMVWdvOa0O36lMDWQMKpOhLRk46LYMgf0wsyhhsJpVW22o6frT7risv2iT4auV8ul4rw1P+zSUFZcRsiiucLuU97Cs6czx5GczyGKr/DXH4/S232GpWqklpddUPB40ZK76Aes7xQUz12OHuZOJG+ilZcDbMdeyj7tZiKLXNW1/H0nH25mIlC2DHK7LSqxrqVm17Gu7ZGAgaX0q21tH7hmI/DxDsVZNic2AaMCz0sxfgK0ycb1Lovq1NKl4VZNzZluPZlGL25YbBFrU4p3y6xxPmJwggzKoTPHus8UgEX7u7yoC9NqqNMv/9KQ4X8m7NJnyeOqfhW7Ah1JtW9OYNbt1VRBroOcYvN4rAn1bdGHvBcrMbbruBbqsEoaQzmQ4QaRuQQARTjCYLHY83+tWIXGueq31YwxAhBMMJotNUhyuemvQAQAAAAAAAAAAABBCCCGEEEIIIYQIIYQQQgghhBBC1u0YQIQTDCaLTVJc9dYiq9qynVU7SXLsrZ7erzVK0W1ciY1n1ae+WsYu9amldanjksFedq5MD0OWbkchyTVL1vZDlttGrCoj/KBIp7YKMkQwhr6xhlap/YRmuPyZ917pX6zR/f74vZQdHC74/R+b0fvAEi54MwA=);
+          }
+    </style>
+    
+  </defs>
+  <g stroke-linecap="round" transform="translate(10 22.564064636363128) rotate(0 109.5 79.34668982323285)"><path d="M32 0 C91.51 -0.6, 148.04 -2.78, 187 0 C207.68 0.8, 220.12 11.04, 219 32 C218.3 52.3, 216.53 71.85, 219 126.69 C220.01 148.71, 204.75 155.49, 187 158.69 C129.73 162.03, 71.22 159.98, 32 158.69 C7.82 160.15, 3.34 150.23, 0 126.69 C2.19 92.75, 4.95 57.02, 0 32 C-2.82 7.13, 11.73 -1.46, 32 0" stroke="none" stroke-width="0" fill="#b2f2bb"></path><path d="M32 0 C94.58 0.8, 153.79 0.92, 187 0 M32 0 C73.07 -0.89, 115.11 -1.5, 187 0 M187 0 C210.05 0.42, 219.64 11.93, 219 32 M187 0 C207.88 -0.26, 217.57 12.92, 219 32 M219 32 C219.7 68.07, 216.47 103.98, 219 126.69 M219 32 C219.47 59.93, 220.28 87.23, 219 126.69 M219 126.69 C217.58 146.81, 206.67 159.55, 187 158.69 M219 126.69 C217.65 148.85, 206.58 159.54, 187 158.69 M187 158.69 C134.7 156.82, 79.7 156.64, 32 158.69 M187 158.69 C146.83 159.33, 106.88 158.46, 32 158.69 M32 158.69 C11.94 159.74, 1.2 147.57, 0 126.69 M32 158.69 C12.35 159.35, 0.81 146.86, 0 126.69 M0 126.69 C-0.27 97.73, -1.52 69.12, 0 32 M0 126.69 C-0.81 107.31, -0.31 86.52, 0 32 M0 32 C1.51 11.78, 11.07 0.93, 32 0 M0 32 C-1.37 8.38, 12.33 -0.18, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(21.682044982910156 84.41075445959586) rotate(0 97.81795501708984 17.5)"><text x="97.81795501708984" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">EventStoreDB</text></g><g stroke-linecap="round" transform="translate(461.91275806060605 10) rotate(0 93.18181818181802 90.90909090909076)"><path d="M32 0 C70.19 1.75, 110.83 1.32, 154.36 0 C173.11 -0.11, 187.35 10.02, 186.36 32 C185.95 63.75, 181.35 90.91, 186.36 149.82 C189.31 174.66, 177.39 183.76, 154.36 181.82 C107.95 183.26, 70.56 184, 32 181.82 C13.18 178.35, -0.9 171.7, 0 149.82 C-4.76 107.45, -0.88 70.69, 0 32 C-2.9 9.2, 7.77 2.08, 32 0" stroke="none" stroke-width="0" fill="#a5d8ff"></path><path d="M32 0 C72.12 1.35, 114.7 -0.79, 154.36 0 M32 0 C69.17 1, 104.94 1.42, 154.36 0 M154.36 0 C175.31 -0.23, 185.12 12.62, 186.36 32 M154.36 0 C177.62 -1.82, 186.69 12.34, 186.36 32 M186.36 32 C185.15 67.25, 183.81 99.57, 186.36 149.82 M186.36 32 C186.43 70.41, 186.31 110.46, 186.36 149.82 M186.36 149.82 C185.19 171.87, 174.17 182.56, 154.36 181.82 M186.36 149.82 C187.33 171.45, 175.03 182.61, 154.36 181.82 M154.36 181.82 C125.55 180.41, 99.03 181.07, 32 181.82 M154.36 181.82 C117.09 181.4, 79.15 180.64, 32 181.82 M32 181.82 C12.13 182.39, 0.7 170.14, 0 149.82 M32 181.82 C10.99 180.66, 1.34 170.29, 0 149.82 M0 149.82 C-0.6 111.42, 1.9 69.71, 0 32 M0 149.82 C0.23 107.62, -0.32 64.77, 0 32 M0 32 C-1.19 8.68, 12.11 -0.16, 32 0 M0 32 C1.58 10.21, 11.68 1.51, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(497.09259259984594 65.90909090909076) rotate(0 58.001983642578125 35)"><text x="58.001983642578125" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Lambda </text><text x="58.001983642578125" y="59.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">function</text></g><g stroke-linecap="round" transform="translate(925.7346065151513 26.67330063636382) rotate(0 90.00000000000006 72.72727272727275)"><path d="M32 0 C66.81 -0.33, 107.77 -0.86, 148 0 C168.02 -2.41, 176.64 11.67, 180 32 C181.49 61.5, 180.23 85.92, 180 113.45 C182.02 137.42, 169.31 142.61, 148 145.45 C111.01 143.26, 68.1 147.28, 32 145.45 C11.73 148.76, 0.35 131.97, 0 113.45 C-3.33 95.55, -3.33 82.67, 0 32 C0.91 12.36, 8.61 0.4, 32 0" stroke="none" stroke-width="0" fill="#ffc9c9"></path><path d="M32 0 C77.37 1.52, 121.58 1.9, 148 0 M32 0 C69.05 -0.85, 105.87 0.25, 148 0 M148 0 C171 -1.58, 180.28 12.12, 180 32 M148 0 C169.06 -2.05, 179.27 10.47, 180 32 M180 32 C180.01 63.12, 179.36 90.16, 180 113.45 M180 32 C178.74 51.84, 178.56 71.34, 180 113.45 M180 113.45 C180.84 135.04, 168.75 146.14, 148 145.45 M180 113.45 C178.37 133.27, 167.5 144.53, 148 145.45 M148 145.45 C115.9 146.48, 81.85 146.87, 32 145.45 M148 145.45 C107.83 145.47, 66.56 144.68, 32 145.45 M32 145.45 C10.95 144.45, 1.17 134.04, 0 113.45 M32 145.45 C11.58 143.16, 2.22 132.75, 0 113.45 M0 113.45 C0.96 83.39, -0.6 53.06, 0 32 M0 113.45 C-0.76 83.48, 0.56 55.41, 0 32 M0 32 C1.37 10.27, 11.55 1.31, 32 0 M0 32 C0.4 11.77, 9.67 -0.42, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(995.0746181118311 86.90057336363702) rotate(0 20.659988403320312 12.5)"><text x="20.659988403320312" y="17.619999999999997" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">RDS</text></g><g mask="url(#mask-Kc7afa11G0naNtNt9CKEH)" stroke-linecap="round"><g transform="translate(660.0945762424241 98.96871146653962) rotate(0 130.34044307114033 -1.0166158962562122)"><path d="M1.03 0.25 C44.33 0.29, 217.41 -0.28, 260.57 -0.56 M0.11 -0.66 C43.21 -0.9, 216.66 -2.36, 259.82 -2.29" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(660.0945762424241 98.96871146653962) rotate(0 130.34044307114033 -1.0166158962562122)"><path d="M236.36 6.36 C245.44 3.62, 254.89 -0.57, 259.82 -2.29 M236.36 6.36 C244.02 2.84, 250.1 1.87, 259.82 -2.29" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(660.0945762424241 98.96871146653962) rotate(0 130.34044307114033 -1.0166158962562122)"><path d="M236.29 -10.74 C245.29 -7.2, 254.76 -5.13, 259.82 -2.29 M236.29 -10.74 C243.86 -9.32, 249.96 -5.36, 259.82 -2.29" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-Kc7afa11G0naNtNt9CKEH"><rect x="0" y="0" fill="#fff" width="1020.2800610606058" height="200.28548810397365"></rect><rect x="701.0913637564953" y="80.8103231478226" fill="#000" width="178.19190979003906" height="35" opacity="1"></rect></mask><g transform="translate(701.0913637564954 80.8103231478226) rotate(0 89.34365555706898 17.141772422460804)"><text x="89.09595489501953" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">SQL updates</text></g><g mask="url(#mask-cjWDFRLUWRVio-G2fcpHS)" stroke-linecap="round"><g transform="translate(241.72451214583305 101.07668753155508) rotate(0 107.07406335269718 -2.1778998464196775)"><path d="M-0.38 -0.1 C35.4 -0.63, 178.87 -3.78, 214.53 -4.26 M1.62 -1.2 C37.32 -1.51, 178.82 -2.54, 214 -3.19" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(241.72451214583305 101.07668753155508) rotate(0 107.07406335269718 -2.1778998464196775)"><path d="M190.61 5.64 C197.26 4.49, 202.66 0.33, 214 -3.19 M190.61 5.64 C197.59 2.11, 205.21 0.22, 214 -3.19" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(241.72451214583305 101.07668753155508) rotate(0 107.07406335269718 -2.1778998464196775)"><path d="M190.4 -11.46 C196.96 -7.69, 202.42 -6.92, 214 -3.19 M190.4 -11.46 C197.56 -9.33, 205.25 -5.55, 214 -3.19" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-cjWDFRLUWRVio-G2fcpHS"><rect x="0" y="0" fill="#fff" width="555.4668507708332" height="204.4289159361067"></rect><rect x="303.9077008064777" y="81.90057332927927" fill="#000" width="89.37596130371094" height="35" opacity="1"></rect></mask><g transform="translate(303.9077008064776 81.9005733292795) rotate(0 44.89087469205259 16.998214355856135)"><text x="44.68798065185547" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">events</text></g><g stroke-linecap="round" transform="translate(906.6820096969698 192.1278462727264) rotate(0 51.36363636363603 41.36363636363626)"><path d="M0 0 C36.4 -0.93, 76.08 -0.45, 102.73 0 M0 0 C34.91 -0.25, 68.7 -0.03, 102.73 0 M102.73 0 C101.38 18.51, 102.87 38.11, 102.73 82.73 M102.73 0 C103.74 26.15, 103.7 51.03, 102.73 82.73 M102.73 82.73 C63.38 83.37, 25.05 84.26, 0 82.73 M102.73 82.73 C76.73 80.82, 49.6 82.06, 0 82.73 M0 82.73 C-0.82 59.86, 0.6 34.37, 0 0 M0 82.73 C1.22 53.99, 1.18 25.21, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(926.2556604038675 208.49148263636334) rotate(0 31.78998565673828 25)"><text x="31.78998565673828" y="17.619999999999997" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Data </text><text x="31.78998565673828" y="42.62" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">tables</text></g><g stroke-linecap="round" transform="translate(874.8638278787878 172.1278462727264) rotate(0 152.72727272727252 62.27272727272725)"><path d="M0 0 C68.56 -1.35, 137.25 -1.96, 305.45 0 M305.45 0 C304.03 29.82, 304.69 58.45, 305.45 124.55 M305.45 124.55 C200.91 126.83, 94.52 127.02, 0 124.55 M0 124.55 C-0.15 82.63, 0.73 41.97, 0 0" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="8 9"></path></g><g stroke-linecap="round" transform="translate(1050.0062768030305 192.12784654545476) rotate(0 51.36363636363603 41.36363636363626)"><path d="M0 0 C25.42 2.6, 51.73 1.61, 102.73 0 M0 0 C24.72 -0.32, 48.36 1.09, 102.73 0 M102.73 0 C101.07 24.52, 100.86 45.14, 102.73 82.73 M102.73 0 C101.3 28.31, 101.44 54.93, 102.73 82.73 M102.73 82.73 C69.43 82.75, 33.67 84.25, 0 82.73 M102.73 82.73 C82.18 81.36, 61.59 81.03, 0 82.73 M0 82.73 C-0.79 62.01, -1.03 38.66, 0 0 M0 82.73 C-0.35 56.82, 0.52 31.71, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(1069.5799275099282 208.4914829090908) rotate(0 31.78998565673828 25)"><text x="31.78998565673828" y="17.619999999999997" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Data </text><text x="31.78998565673828" y="42.62" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">tables</text></g></svg>
\ No newline at end of file
diff --git a/docs/server/features/connectors/images/example-lambda-eks-dark.svg b/docs/server/features/connectors/images/example-lambda-eks-dark.svg
new file mode 100644
index 00000000000..70dadc6a88a
--- /dev/null
+++ b/docs/server/features/connectors/images/example-lambda-eks-dark.svg
@@ -0,0 +1,13 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1133.8122883333328 712.9023438181812" width="1133.8122883333328" height="712.9023438181812" filter="invert(93%) hue-rotate(180deg)">
+  <!-- svg-source:excalidraw -->
+  
+  <defs>
+    <style class="style-fonts">
+      @font-face {
+        font-family: Virgil;
+        src: url(data:font/woff2;base64,d09GMgABAAAAANtcAA0AAAACfqAAANsCAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cGiAGYACHOhEICojDDIazNwuQXAABNgIkA5BYBCAF8SwHm3xbju1xYYy7sd0OAIpS8WVRITvfArcDpBRW0yrYuBoNGwdgevzg5P//85KOMXSkA8Aye/31X6aqSFOjM8yLldTu6uDRvazbyMy9zzwgOKQom/g6a15H3etNifhB1SU3kXgQVsw6e7M0xQm+4QP3vDzRvyYpK7Ba6lJt8H5GV4Xf+EcERLVOkazgxYl3h7PDv+FdjElJVZs7TTRxrr2RZUAZtx6MZOXIlTf6DtDavOv/vvtI4L+peCq+4cnn4emyiLYQELHRxsjcZuWclZsVm7NiTqrgNnuPnmjCgUoQxd53u3tpTX2VhFY9DuFKNR4ho/FgLPjSPINHmGrBMfPo+TrQ/Xc38WQ8hiEpxsolKta8GqM2D/6r/XpvfZm1b8IgRVhHxZgTUmt7/uup6gX8QCoA4DIvm+7/Bxg4sk1iY6xTGpUQoZKDRhH7EZH4vQAEBnNq0lf6SpZlGQKGQMuhwjgwAjvaLSM65Nfe+x7wxumASwfAsqWqLcltnCOahodxOqb/P6f2753zV+9tL0hyp7OxrQGA5SdK6sw4Oe5M2p+PnI29TbYSGwKSJVuOXXCgTYGTAQ4kANdwKoAMD8yzjSG1lSbqpPUt++3aGXuX98JPMVd3kYOQCAceo5A8jPq4mWnA8VObfn/FIsbA8JBAdCakpIHEiQEptVg9qctPV0xPe9vrHi7/f11arv8eRf1nbr8ncp2VYgubCUYOR65OgDBKALGSMCFF2e9PubRe9ecmXdWtJJ6ZxTi0QNlkAbjt/giXa9W16vpePUnVYBA02c7EDabEybhthwZTUn0gv0/3+p6TbjblsxSGFrBPy1Q1mfbeVtr1kWwWhOBBkg+Vza3g/76pfd27XPXbILAVkthO8hLLdmA44fe4Wz3zPDuwmcVHnwtk/ya/ohZYtkUNAoOALNmxMwo4XFV3z4nKJqphbq4kTdICkhZmbtQjBYVNbC4X6OGo3n3X2yl3YOz/M9VsF4q4TJ1jqKjO6fUxdx32z4LcnWUABlTgLJVmKT9iQL4nDHgBAylT4CWKTjHOirY4e4lDOXApp+U5JcqVXeVcuahd1NBV9LuiufKeO3dX1OfK79rSzpVKt639vmVluMa8XSgDoAh0FtLun/kzOic2tta47pb3TEIZmVWj6q6ZkfwZhzw8QA8egQcFCNETugPw/v85X5sUhiynJIFlI3Z8e9MUko/5nHE+0JjS3rx8eM0bAcsOyc1OebbmZZhOTW5udm5y879Wq7sNvIpVyJQiYqFbtGxus2fy5w8yt7hbFZMkbjMkrv1B50iJy0RvGiKl8EjEi3Nttm28ox3VNfEIkVCPdo9kCYLc6T+EQQIHInnzoHkY5hgHz797ne3/L7dbSI7HyBSrukfSOSRjKRRVlakDh5Ecj0XixJgS4TXLWpaBJGgLIwxmJUKk+7rO75qapUspub25DUNwVIEVCGaqMCzj3n78to/FsNd2UYsokxAE9Jaxstaedp/nHQUCjo4fKJAEob1jOau9NX+ZtluLImGQJDByJv7W58quoxXEyj7O/CuT0MM2+95tP26P8gghiAwiInYq4R+OvRUAACAH/npZ0PzWt5/YufDhz7256jFcmUAE5G6CAHSDNBOkhBmAAkAvVg4ASFLBIgBMEcS311N0A3o5BXwGeg0AEj0sSO5rtQJ6wKff+l4ZOq3TCgDYzx4AAH5b/wEAeZdu+N53KawBwDc+eNmGOPs4BBLooVAAACZjbLS7sLHNmPkJSVfYOrXu7Sl71l6+1+0Lh4GknYJTdmacW+fZ/Ynb+7TyAHmkfJNCq8SUt0/3E7bp5Cy32d4iJnn+W6Jl7ifXzd27p+05e+XecECEhaSfojNwbp6nd9zexV0yERnl8uvXTMvH5RHAz/fy6/LLcmCJSRPt/6/3HwE/9vfzpZBJA370Tz88+hwIAA9enduhAHD/8tcfmgzk4SEYXZQ5XZx1fWVFBQDKlE9rKlXNr1qNWnUlTtIkA8B7kzppAPDhvJiXsO/0Z77Nd5ju+H9+zP8j4AIBkCgMfXPPORACoRCtOLALYNkHn+4JgNJKKAONlfLNPfDWdCMOClRo0GHAhAUbAhIOXHjwESBEhBgJUlxwxQ0ZchQoUaFGgxZ3PPDEC2988MUPfwIIJAgdwYQQShjhRBBJFNHEEEscegZGJmYWVvES2CRKkixFqjR26RwyZHLKki1Hrjz5ChQqUqxEKQAYp1uvPtPMMmiJxZZabpkVVlljtbXW2WC9jTbZYputtttph7322Gc/ABg+MoR6LWCRoWr6G1XT2j3mAIARMFCrqQjt+7XPAECttvYr7TZKWf5NX3sPqNM+VB6ty8wYIHO8kGHK2rUN+KWgNLIN4RDlSz/Hzf2/QAgDxppgjH7jTTLZFBMNmAEApptnvrlej3ESDMs8lrFqyTbxY/KOsX6iK7waaxG5TW//d8CBXwDXnyaOWKFHDP+3w4Bk0KUsmdKxg4/hBrF+MEnVFCqdCgcrvLRDeAaqlsdjuEMwEYFUcMY6sMpqehSODsbSUegpK5g8uzw+HdTDSnztsJZ9kD7RDxrWdAwOgHJ+uHEQWFmrsrGHSPMD4sxr7sAgSWo7WJZU7FYFuDS7qqa1vf08ck7eVJI8u19Uu0oWu/HoDT6U4xi8BPdInUBueMfDprK2O1Exo4EowGGyZX/l9oaZ0P/MPeMzolzAeI/h9fJZL6fEiMLR4/DZ9G5R3DjgjBhCDK0nF+rtcJegKWsjbuTG/xnOjy9OjztXp1m9kaiVHjfG2+35kXPTTw2yBm+hPDb3DLw/7fMSpqPUxBNVDS2Ede9i0pwcDVaPyjODQZXof3/5AHJOZuyWJuT4NhdwKkYL6iHM42hbm7mbvR/DaEfU/VD3aWNkjhHAGOHwGL1CF/I34o72rAI8q+iWPmhPAE8HZn6FT9M+p6WpkaYAaXrgCJFEVTGyLoDLOJWQ5euiHZlYqGghAAvhoIXOwmgNTCwWI8TEcGoXl0DIS9NJs8tSAkSViuqiqMIyAz4PBRZxntokNoDNDNZvTTuoj1HNQjBGYKEjtASjwCRjal64JB1hktrjvjIeys+qaWKIywULhp71PibeIl/ZdE6mwjw5hTlM54oypce5/mf8h/mnslR9akjCkyx9xmfhSfoX81SijkaPlE1F6ECqo6QU0knhTiQVepzAqeSdKp5CTomneO00LYqqCBYUZMmxUIHBtAj/omsRVfwA9A8UXSEfEB1G4OVG1DvbIyPijZW+QsZC/+NnwzXsttuwVRdsHHRx0ObBxZK9NaNzMqGONgBw4AJW/24kFwSGXiE4C0ObI0QEHBwpnvKMc6UaAcBBbDBYFAHE+rvx8Rrf5t6QY9zWPd/2Mw32Hqx/bo5BLlwc27ixQHKbu04zHo27lp89ugJovwHQZZIBtiraYuammzp/YlWf2tTZSt2mOJTZ6dbNYYQ5iIc0OdZMGSF71AXIAKT4CMOmZEp308ZSxRldADy1B6GV0KmyBTV3ylrYRpwx4v/5oHmQXTm2r46zevcNLMLaot93tDZ44/pmCa/5/QEdu0PkxixEA5lAsN5GBr5/x7FHjdySJ6peBpn1gfFeYG+lcXK3hkchnxqyBtALsBHi+5QpdUd8bZ0f02poNXggNUCqXpcK5ViVrVhUZTvMhQnModqUo88/7/CDriEAkQVOzJNELBbjo1EjynGBQJH8tmraichIU+rRrcpMma2YzjW3dYMd++AJYMauqMTRZ14UAoLYb16J0/lMbkKIuZGCVHjSZoMZcMeYfUQHJ8C9ReOcwawLnBxhLJc13SGdb9OSQnPMWBU2pUkaFQTpiLcCByUElO2xgStGK3sDxQGWsQKPN13X1UEup5GBC+AKWzulCyOKKkox4YbCRwpJaVnZzceEIGZXp2UXeRqgNFVJyXGgmr4JFSsF6B8mSeJA6CE2kKvDsVdXImK6WPNI6BQiAtjMTzk2hD3QCC2yDreK3dIeNFEPnjapg7ysW5LsOkxXaL1WSvpMwI5BR67vA9ylz4RposXi0i7Pl6E1BQuk9PCt2SF/tICYMSEQdyBz6Uyr9yH4ngsVTxnTki4lAOSPxKJ8UR27zb1/KsD4Pkim/TwPN0AI0vuNkScF3axO8CWeaEGeF41qUBMTch/B+rCLGSiPDFF5S1uU1dp/yssDxD4+rScOG+I5c3ug/4/jfTsoJ9bWreJA9uEeMLa1daqr46rmWxBEEa+LO3IZu9voOTF9WVEJuUoWj8OL9KQvt0VfFnCQJxKy4I9jPmwDpJ3ADepU7PVY7GmHiUDUzHJB4ChYdcfT7vex7AKPH12lkI3ukAkBQr310e/gUf4ML6nqnfF+ch/eFu7XfscKPTaWMqOpv5llWiyGuty/eXyH8irGHbIZWkXWKCSH8iH0AJKeR7+M6mo6sRWexmeB4gMwUZB5RTsHeuXEqq93jvK6weNOAtnjyo6jBrAuCoqmC7EAyEsvDr0IwkPSLs0s/YCJgqURHnqOA/7II1LZLudVWxXl4ShQpjiLjvmT82UXX+kqhRiho7DQUXlPwX9bq1SIe0xZnygT8xhTxESAMbFt8aUsWnhII97W47q5T5g3A+witlMcOuJlqOyQD60pTf0jrS+Pr13WUXcxWR6gwl849mDTPsh9ecXI48BiPiG+rh2VbIjByAG+Gjhwvx2bhhKunuJ4x1P9KMac+lJ14wo1t5jWSVV/GpuO+2zt7nOEZbgISctSfPCEBC0Fi93W6TtPmVvjQgs4lCSYIUgyKTPetL3h6wqo4j+BNOvX+1VZmia5EQsf78NccTzHg2xg7X5yOvzxpWfo+chH2CAxllN3UNoQy9DT6UESBP/oag1I5wC9aoZwtUjSrnp94aaUi+yGRnhqfk9ALUf1OaWV522q+s8Km8c3wyP2UxbqiudRWmQCzTBFmqEK4c7qbsQs0XRFrITrAcSjzwmci2iCFbohpI5n0D9e/3G5U12+bvr1qM54USuWC1rbjg4dMTEhHQSIV849b6uuDtA//i+AMMNKWTcwHsCEmMNZXlNJPFGznOkh8mDGJxW6rZORF0sRqu70qRj0lW9Q2qwoEw/br+bT4Wt2zNaOKtXsqULwj86Z4qmgAgn3CmrOKFp5Lt1YhPK8wUsJ/BgervTzjTlPResyDS1wYNzFBfTUsy/nd6htYR870mSf6UWwmMdEIOx4UYCTt0Y5WJytlZjqcP/y2hkbuhdpapclqIf6C44plflFzGZ96O3QxToYQbsuhnZePWArBDAkyZcEQXocoWrKCjSmTPiykomvu9dM3ICYmIHyHTriO5kCM1a4LgbBbED1lKOsqOHikdYHpgdUa1q03Rl1/V0/y7IU1b6RjKqyojzqIEtO4jgO8ISLOaVBu4So7GYHDBOAcQfQ/WgtQgwdUuAHrVcO/oskq62xpBt+ga0+SMF/JbG5JCR9QjLySzjvPKX5/2HdmckFLd9CvS1weqRFwDANklaXtkAfPycBo0khfaU/VQ0mK1vXCNMJG0RHHEULs7dmzbAS5GfQAMgJDNAWPVwRmNyUFUreGjISX98W0tt6tMkxU2GzxITNcfYgMT3cTANgow289so/FSwLj86mhfg2v7bqnr1vl7M87eTwqvlsTBZ3XRcP6QzSP3nXESNI+pXx/uM5b2sy5sfPMgUCRfEfjjSE4PXlYlMn+331ignbDlRV19BUKV87JV5vBMqXm6Ix4xCpPF5EIOf5KGgsdQt7nw38DT+OTyrylaGtaGwxyB1NEFSCfZw5MT2C8Nm9Kj1B0Oqo3j+aI/n9Luk9M+E5UmtfVaTotdbg/6zo3lN9dJEbeQ6hLbgusgGZv6kr/Wg2yOtGfBBKy7NY2qw50jA7YFVOEse1S3vVrNMfkx/3knJ2S3KISf+Ta9FMLVpMn0o4gbCFjNSmCLFa69fXD51cfAs5x5RPYapWe20Rck5J7YTHw88CN4HpmXJY2naTrJFPJk4CtojNReHSKMqIT21JfBjdADghkp+/0D6zcYJ7e1dLokDjAMtrDU5M2Ahgc+MIZMxyhsoYB1iuZQpyPvw3AnkSzjd18RyIEzcrH27G0WfYOgNCJqRYYt78Be7FBMu0R/KqL9HyvvGo4EWkuFrJ6Y9pWq7QJV9cx7e0mn5AYusQk8woKkPa+t2FVoI4RFU55UubO47tsoNcqJbK6sFwOCnVWvyYhXIB6MDxOKrK2qkyB5Tl0olOFJ9mpIWj8YAd6J1NYfN100pyZwRWKkFRQVRiPqG4CgPB7ku29oi59R5Vd/XpXLxxo8SRlHQjOoHSA1fb3GzW6a7LYIqNXKz+J9VE1YV0HuTOnrMHy6BqP/4xys6nD8J7KJUCE7+vx776uFYfxYSalVTlxMEvi6Lc3xYpXwp7J+BFr8v5U1TNeCarbvYZo+kKDtG7jbTPybMS6THUALIqhJwAmS42sCtBR4tyGw8diRc6aj3EisGDbCs46b4qrqfkNh1SLQH3gjqAMCU+HP9AoEU/LiQQsrB2/emNL/TuL6D5kljd1aQqD18Aicu5AFpKVFbNKvEniI3YdVfSPAAhGfFlD/zV0La8iRe8I0nz/k90gbLHRh6nlUeGrqwkao60rC7T2rr6/wLa2b6/z9+KykDZNzfvnNzws97nV9+QE+Js0s45y6Y1kgpm6GTEvQB20xQRp5TmdOlJkB9yC9geQShRkoyofl0jhHgIm9cz/8i9dYrtyjrrFxxRkUVRiliX1rTLULIKQD5y8oTmNLhcKGWSnYq1iT2b5w4gNo8L32gfEdwM2/JV47+rKZtul7IB4Xr1ckklpkCrJ3bpC0qZbC7FgKqDG3r8vUMpcZyVFQWvFD477sdpV7ERmDyBbkGVhbuFhUwZsb6mHwb91eyYTM+3RYoZDSuqyiTFRk4DVfZ9NnzcY2LL3cEwlAYK6WjG8LgsDuxy9XqOg68aWFN1A4ykXFdACDdoCgrlsXFIlnoU0yWPRpoUoAfhhjDwz88ReH3QYj9CS6T50xMnnZg8FyKK0ak2hnXHcpT3zeHyfTBuAJCREyH/CGmAmeBi4oD48EeKC77pGrc+sqp/vN6h4rG3dWG2SiDEmkd9eYHptMUGIZDuAEZnmEtyhaZuqoZUrpB7fcmeTZn4PJyQtAC1SzBYOBJsIzEhFtJKB8Wl1D3+guAeCAMCfKa5aWICG2tcJGD7ms4WrMrYUFpzoDRZNSvBQ4qGsAoVjY0arTEV5CtMqehvUn+JEgOdJkLsUgc3EXWYpRG1zd7pBWCiWNoOlIcmJ4THAdKBqEWHkAfBzD8oNJQyC2rBGsTpjmGrQnD1VpztsnizQxo8jwmvi+YocMa/SyNctJQWe6/WWhKORIjJ/uDJIVmej8fDr74XrjdFz84RroMh5qU942TSgFTWbscKaeRONangQ1ziFrXUuhvAZPmA+NPFZf+b5KGxMY9w3+HEf8T3REulEVXxhNAa5VX3ac5CWbHLOQBywi9OiAoz1oNPjRHzelB9TTq1f3+B6aukQksM6VtY3Qik2c93oek7S/99hVh+Zsx1aD+NSa+XTKQM4SGlVMz7sfp0jhCEsUAI0UbeY5OWrkUP3eZFMBTPB5R4Fxl2I73DIWCmCFnriHhbTe81sqS4a1tOng9eeLEdfT5ilfc1dadZpuijqJqudO3xbvWFzhEUXkcrSGl3Jh5Vp65aHVObFyEMHd5UVEenrpQZtc6tp9Jz5prqatwBWnVfVPFn30A9ELtCDMzo8ZQRYvu90j+mlbwz0yG1Z2q1kI7+SRRblpbq+RYIBwsvmtrtjhypm7Eqp7YCifBjGXUHIQ7Fw7JsKe18MiMOR04dz4I1HEnZeQ2GYAMBTCFJVcS6AdvtfIjvbZo7+5X8yyXdDFPsQAyY7VkZl1iX2bVFCOsAm02DkxFIWswTAMJivfk41oMje7hBQkyrktIeO7qxUi7bvSpyNgKLDrzNhQkQzDqW9qTM7TFLZ8bU+40oSG6Ohd7DzKRSfvRnSCmKSvWHgvaY5SJRbzaFb3SMBAf4uXtV/qqWo5US0/fy0TExO8S023EQkn1pag0NM1GXhDQgJsQTgooXkY5qad4QfPntE7dWQzb1j29RBzf9hPcSGu7fpblc2kVLnvj7GV+WPaOBGXroOKSjuD9AFMCAqaQrQ69wGsUypanluUwTYPXXz76FNtIVyzuGui2YIWw9EYc7xzwJ5VWbgDmSTMSNM61X611iA9GZaY5iFKDXwxefBxyPf9MsUMW6/m19ygSorzld8lVHqrrqIj5ivCBc919Aut7xgJQs8PXBWFWCDmaf9WUHMklW+grDdpTdl51HRmqqtxYlMbJbLUFiFKFCIJSKVff1LqXnKOUjLbUX8vlIvJz5CwXi0KWpUqb3VptPIvOXZlIr+9D5EwrSOPXHRp36I3ZXKJjYwwyh8yrW8WkcfRqn+7cJfmalfKq1oVcnaa7Ip7LEd0tVO+BRM0MeoYAqTuyu4O05YuOJKGexTv36GA3CMLulw3ptac5mdQ8GB/+YEPdUdY4mfHqBIMJHKSZvKdJy1Q+KkL8XRMoXqLIeQdNRdTlA8Tsoej43QRgrBUlMRpSqyZKC9YdEgCPzFYfmroJVmtq287v4ABwfhm7GKrpm7tjiPnzN5VNM1VsB0UV3cN/DwKhGbZrdgoz3vT41R+zoEDPwcuusIwoSd4qT23ODlW3ZQDGywrPNKkik8GlS68q7M2on2/kTVpeK0W0YD9N1U5zddn3mcVgg/BTiTq1/tO4U6mV/8OTwdCzIkkcPJd2BbJQ/wZ1sJ3qoSiuozxTu1Yv17q7GnCWztzaP9+HFvJXOvqbsKNxtw5te3SabAPYR9QBhU0C5Ki9zKX05qR/TRFTjMNvQqEtdQI6X133upZQNHC/9WsxvknaG8PMR8sKTehUlTodTtrgdUAK9Nzfg+GqrarXWLZBKxHK6uqo3xiiTpgTy6UKQx+taqjupXaE2CwYzYGlhEtYIvhlNyztvDeY2Y8pcKe+ZoVlYjM5Yacxo/fkIGtImnhlzBK93VEE5jyegyxVQLZGPdHjDp+Ry71Q5JfGXDreOmNuHuWPMz7juOKBvXQDi7tFUmGPC36K/FOBRsmYTEmJa2PGJF7wvtKgMrd6D7GSBkMnyuJ2VTlJTZFo+9+EyswwTTFdlslwVnAL1CKZ/KfSI5qsihC/0cP7dS3Wlfk52hV742Bv4EergZ51PjWL9A80yI3WbKDp5PlxHngtEeMfCo2/3PhN6nIDmAHlJl/KiMW+Gt+G6N1N0b3+EGbHM0jYezlYPN+cOEO4Vzz97ZU251pMEUk7MiXfq2r1cZkvkeSNd71nkK3/C8x1MOGX5+MWwatPQByQgPsR1qU4FjCfJYcvrBAOlOFQGizW3wdv6UDCYIS6uIVf/xLgZdjrECCSWZDdq1a/CmdNTY9exL5/30g6wvcAs9I4av1ycA0pUuHSm623IDCUm1ft22irMcJ5WhfHia9lVREOjLMVgmksWFFnv/y4zwIR0LQrCRuVMbJXQvmdkF4JAv6pDecs1q+w6z4siQImgrIZpr16nkSQ1pteYhvt8jEk3VNNzSkTyCK3/GoxrWK+DOO3RWuT1qXbwgjBwP0DcVOrb77eVymTaj9Ah3Slb63MCqiQOmx+PQRUq2Dm4AAnuP9vQhT5bq1EJBwpPh4s+nKx6e4jPmVvTnqvyupEEn4gVTLC3sKKG4Vr9C/NY0rcvbZNMKo9WcbDSP1p3jHml2tBBR50t6kG/T7KTJBCeOJLcuol64BgTgV5olOXzDWxvpweYS5RtlIZatRVR79rYWafKwayI3aA8fqsVgeO002F8+DZtDcjiwjLNzrX22tlUssuyRZo1hQJ/65JRMBfnREpVQtfTYfTubGYgnK4ozBZCvtEx+fxQVDIdeTybyPgoYV7dECbG55uhpcZhvdstpczQ/9ToY6Eah0SKyQyf69DyzgdJVunT0dkT0p4+v3k1bXSjTRl40efIZmrrzjQOBEI44XznyRlmgOxiEk9YZOvbAKqDqbgN6uEAc9nNGahSFE3BnDsLx13gj753kkkajcdn69401pvO5ZDHSzRQp8mHMFA6s4gDsIh6pdtKoCu41BsfaUZf/MmN2zqcsyjsBI0vETyRpec0vZRu9SwmMk8zukb3CYTODOndBsNCTHVpeAtpGTHlgCBypAAs8qoZeIFcfbrQM0D8A/pUgS4RuFeX+lSwUD9Uhf2R35BMAv/uV8wCJuw0tZAhhF9ourZ5KvqY4tABwQ01eRlQVb2F473e48sdXGoa+ulEiW30hHTIRJxbM2IvPKTd732HlM55Xy5yDHFSElkz1C0euY1MCRfvzmhan8024uWpAhEhhu+kfcCCpv0BYhAYkdKq1gyM68p10sJnn5Vsud0GMenRu3P913ue0T/rIBfRWM5Er0Me0UxD5Dk8rEY63Bg5vuFgNnlp7nIUcsWbRYy6QrpXM650q3cq+uBRhVFN0eCCsYH+D6t4TE5q6M7FRrkYlHShV+tWngeMRw+vnOdRj+n1HE7oCBDsufH4Qmrao1hJd9NwOXg0JQwdmM5FJUqqYLVsFvPzh2Z5spD9iCBkYzn/u5GY6v+0szCoHVimWdzmEqJqZUj/rIdOyq8YwUogPw0G2DBdw47s2ZocNYCc47h0NI4XfOyUs5ptsVYVPJ6rU7tMSmnOoDiTTGxJEU3NvoAAQZxAhZiQJs40+iCb4grsDD/S9+yiXpMXGR+dgXhQE+6INPcx2c6S5jNmkZ3t8qU8F6y6OJzhcdFYT4ljUCpYT2OqFceBjtObOC8JFnzwBRhWSKts4uAJXbZXD3AKuBYPncMIDTJzlZ0dWp0TBBL6slEyTbt8hJ/niaB1Fqus5Gg7Bq29MrSUNnXyNb+H1uYuzfusfnhNHO/kHdPGI56JMetQOF30JT3nippxRKsZ/ZTSA6vUtSikC2fZ2YcR0OMJZNlD42I2qzIQ8mdoQ+rExx8T2r8O30HPewrjs0xnZf/vSUY2Bw0MmFk6V9Gy43mdY2bpNkvtvMgaBI8gOn2B2UbMIxermFQhtnqRCrXww7S3AK29OvX9aW8UGLxu50CpbsS9B4uEXKRi0wdyJD2qjjGf6Fep7psNfFv2wL7Rt87UKFF3WT1a9bsWXwrYhCUmJl+x68BDx3ozRsnB6KY3YcSrTqQvlBvo9MjfxnBTk6/BH1P8XGbG54XMxHv4STN9n2Q/4wA5grBdlukABnNeyiIvb+M38Nmv+AMnN8r+PCwr12l9zlpOiG5EzmTLwhIuFwKdHgd7ezWAylt+Lbn4HU5xG7CmoRoZAquk4Zq12Jjk3afTyg7JNIBFva1T0ed7/aPAvCZv78LCGtOrkDzy4UvMPWmf+1tNGYxc3Pel8ONP55xjHWIiw4XAtwjENUTwXTedeCLfO4ehHhhnvTcPmNjyvpYMRG7uAkG6nfJ2n0dUKvO3S/CFy2X0zl1SalCBHFqzTql0eFCgZdU0RBP8JBYTvSqAbTm8A+et8HKKM3NxsQ1FsnKXej8bvhQ+dthk1Y3GGDOqItkoZOuUflw8hhIhIHjFxbw8TXQQmyunCOHRYNxriKbdgcFQGsD5fBBJWyMRaV5HVTV42wvBj/LDO1xJG17e3xJ12brGYdAw9qTkhkrT9EyZJzF8IEp6pabSIU7jJWmvV+i6b/D0COxOvjmqyti3P3Q690AO7PREETPQIiLqzxU8WmECO8Up4mW/GNd+dbdPRwYOFqdzBUsaiDTjDZd1ExWnKny1GTgOfGXtU3YB3iRIqa5H/Scxj4+UcEIaNk3V4mX9mk4xwRIMQTh5wIRtvSJJvLm8T5cjZNaQmACJCXJxSNfk+mPemKgR2oRvzs6aRx+zFLRkQnZbv7o5Hluiqlm+WRnSPwEbMBg5o2cmOTMYFLVINE/ZnS7rkhG6LDU1n0kpEFxHCsgHAzUNr2B3R4Z+GEXxXdVMOEBTCG+GbgEpwac8ncPJErQCHHyBtLC8v4ikggBRTaNK/+roMbTL6xvoRGsmGkJgRhQKkZ9YTXnLc4HXxJjk/DD/mts1b7Nrovk2Ddnl748Yc5nrxGQ5mFHwkHRMVXZX33taQZVD9OJjkeRKz9RJMg+EgPCOpcooHix06PeMqluQWS9D+oPO1i44yOsikRCnEJET5U/KHu5rSYvn8oWxAAYn5sX3LxgV4oLbK75sbS9p+LaQ6ywSKXmT40f+v0DxzVCiqJB05uymzm/5NYI0+U6J5cUx+VTZHZheBL0tUYnXUUQu9zXlO1H0J6LLzrhEaCYoSzkMvN++2YqvfxuMG0/Adq4w+IuQoATL8kqHikY0L9AsjwkfYllrk2MewfzKxrIbotdYHDTFsBMSAvfCGNGK9Y3loJGLCbX5gq+thNTOGdCsn11K+SbYYWtollDRGNMy5LySHwzSdDvdRhydAkVv3nogE2Hxq9Jv0lDTyfXwcnDQ5zab0oBGzBD/LiKRowFvW2MCPowzVTQTgCd4uB7/HCjPGkC+ID5YS16mWAQzWvK/mLB3eQ+2UTkNDfDaYRA+vEfo/LdmDCfMGd4y0ijGz3ZpOslNkXOYUO5xYtaUJ5b2L0MtHBDlb8RSj5Y+RHAjULxnb7L9o+/HxWvM0A639Wwpmrdd9OJGwZbZrEyqwc3BAdGiYnJBuJpaksPgCjr+C5Znjd6TK420T0FXnUk+XX7b4mUVwcusZuQKCnVR87BX1c9qRR4fqDdTOyzRxY6XI1iWKcQTpvfR85WEfulDzGpWDI8etr+u6+c1e12w5joKLV/BQPvfu6lHoQaKw4vA+Uk4Ze6W6uXEQJcTSzQUhIEwh+hEO0vHxBoz8b4S+7NO1YGRx2fcT4KKjAOau3VGdYf74HzzluAY7U5IaeBYBR3UitSXMd7B5zpDDik0iHbgA6qU7OvBlweZkFdcgX6AEuwXQOjez0Litdg5qkOwlOTXuByDYx5IYrLuEPBADbVb6uqEvbGIJa8KK95PsQShl55qlonfXxKC1gMfEaRY5taeSr46wkzW37XVlApov4J770sDSAyDye6ccOUvxWv58f7rJdTVGc/iIEtUHxlxsD9z21GCAMshbKDjBSyH3FBT5/6vZCem4YD8oHzvz6umcG19ODLv/DHMx63ZKsbLkelntN27NpCexMV413C1AiKqIYZ6QkcfzcnkO/BBxBw0w90DRu4tKDKdHF+9+s6XDovzFCaPjAvQncb1xmzdwrqdECqoLrJEiAeGFe8XSbptd3ccY7uIy0uK37mrxN53s8o3iA8vvnNhJWIJAWIazqL3uQ8nSGVjnvUxp0ysTwnE9SlHGg2PPVjT3kCXhpptvWE9h1tfTgdGsl2Vks70FUqJ8z4sfzbccI+QQ+5P6bNciI1poo1SAkeJZ1HjquEoLZSiKmu67YMR19aVB+j8o6STSjAdduvB2ADJsmSy4yStdsTo70fzUPfG2gkjIvkn4yntivJTjigX56zhT/3vT5lhBdtpeY0P347erSJTZeU0+//9/Z408t8uMGPR0yEsO77wXaI3iC0Hp/7d78PAcb+7hXghskyFehi0wTuqnqJvLkC26CV19cTBv9XZuPD3eQyYV7BfQVxDNJv5cAac1TEqWOgXRBF/JOl/F9mY9wNN6jFmKKF8k6ZB2URB3b1eg9YWExM7MC8+6o+Ouk1U6QAhXKf+nqRgH6jPEEIjnrT9hzPbhsyPHL7dwPNWp8vFe3pCOZcYfL6KRyi1xfCzr91n7R5rzAmieiG0wzACqAV1cdRUAKPdRA2DTqQZXHXUOjpSALnsD0PJCYFRLqB4LaZq/cT4+pfaM4dbdRrbZfqRmtQHn1yLKtg1Bl35OMX3mfTacb9UZiCV/lB41pbF/R6yMUO3WMjf4iH5t3fmrmU02uQptVTmJCCL6zhS4PuAgDACDsmZtTApccWXxkfsBi98pEkp+1rteXmNY6eqBX/gmUDPJ9dwUoKSIwS1F4jKWPAjd/H1lfb7vTXlfV+NM1KTV1bGmITlpx+iqEJl8SYcEISra0WR115C7m5Pm4r+EilrWIC73C/phBu5iOZWeNm9jJ5NQot3GdqeI81cD6JSBEohtyZEADZGihlw5o0he3heSwKPaL7CkzA/aTs7t57aZefgSH9yWg3cUGDLtbfaMpyQFgirR6Hi5buaOVso68JyFDo0xBYxTvBhsbXRtfqBYlGIzbaB1Guc0RX5873m7adXidjQkNt6Vj8f8XyhYMvPK8N7FTymuECQ2FAL6teNyhm/NMmKIBsXrcWdyDclIP70FiGiyQNrvFtWHXHV00BpordJvPxArJncr/kIyX7RA2hoSif7kbRrgglAPuP1OGSCMa8SPZNwA5LSfMUwmuOGymsKK8cAbVfhl8AN1HP+hT5ScP3nY5er5XlUaqS8RWJLr6SYSH1y4KuqZ82mkEbWp2jIovRmuZGcc2RTYkO6veiDEQTwymHxRZIG5pgYf/mV9MeUl+tN19AcWNlf3NKHMN/BaiahQCbUkzrj7Vb047fR4kh7IqVxWHJqXv1YMRrb2R9rttCu1NQLduxTXNs34566B709gJJIuazjEiyxrdNPk4ehwHkVd/A7SQ78YjC8Z2gJHBZLh/Pv2jHGN4RYCi96gRGS2G8p4iN8yWvRGAZj8GUt+umrs2bFaAldpB6UvtWHZxgWNpxO2dvOruChexur7SxjnLmJVngJPSbCIf2n6dBaJhjTkdgtzGwSloFaCrbsuMBr0eFkW1Pe0xXlhYkzcXLxQgPi4RJX4v1rQen0Xij2cLoIwj+dkCHPEM7vqUqGeOImW/3xyl/K0TS+yFMvbn7qo+3W71Bk+/fR7u9q1QxmTbvcN7mJjar8B8wLBP/vmSDgwhUuCVY5+wdPzOJxE/xBTA4zhF6EmZPFvcMSkIWT1V5ZNuacbTvFjB7uXLpTsj+V4CkE+fUqCdCE9nLQTNVF3FlQygXTJ6D3zfY1ysYewfHV3rJf6qfNqhu9Ou2WxKw6zZ7/W6J92MUBGpzLp5hIhbD2h/zv6jGlvuHCvknY4yB3wlYKAUwlOaXSo78Vn5TvtwIVYdaNEAS7fjNVSzleeKMn9+XFPNJ0RQWPN+CEOX6MxoemJSIPW7x8NS+7uKSNmdpyaFd0NvYLLlB6eXzt/dUiQlOal6/hLZI/qC6c8RwsP/oM6+FWZ/1Myw5Th+F9j+I0XbygSu1oUynbO/A6NldHu2ltiUVPWOkd7HJqj5ir3kk/Ty2vT34mhFATb2ZZykQWywWfO9/C76AvEQSTE7NRfsLCCVLcQZ0ae7wM1pj6rOJbhAO/1Ex2sm8zO1C2s32O9Lubu/5ghXjrFpqheMtpI5IqVYyrsHkQcE+YkuQlduUvxm4mXNd0JpLeOkEoCcqCIIYwNnRnsr4kw6zbm1x9gvpOYSy31bi14zcOBc66NXCWCvUZ5yMo3IuH/+XvxquzJt+y4/a2JIZU1m0hejzu2KgxxMKPvyswMzVVtzVTuj9SS8c+Ernnzf5KK5V8xfxlUL6vEUofMWrKbHZbW94sc7ncHjE9dwodcpPNh9p5Mu+58t6MxZDPZapmhDi/mKwn2Kmj/T8QRQxlUZrmQacWSiOHL0G8DUEjWOx7Zauun382tiJyk4aw7w7CEokcPdaZiCANnHcuxWpSIY6zQCJQrs/X3bHLZlyKcjs6JfY0M+5W5DkRQAO6hFIv/AUbiAjZ+zr+TOQb889dmnDl99ADWZIPEKwZM7EbtB+lI3aJ06XNl1bQLhbT7tYwuSDo6uuOamO6G0Ween/R3hjTuM0p9qytNp+ln6EXFZRDPO4qUyHmKs25aHGi8JMIjyB721244cZOA2XZ0fcveOXfeUGpeKqjDmjn0+ez3Js85uvsEp9JPFbCLqFX/geR5r8YA4E77eSfhUWLN8gCXq/ETPLOCNYKoTKE9o2o1FPfB57sV/2/fmn5IW6S2Sq/VSmHcbF+/eHV4a+MoA3Wu/fFE1yuLCY8wfx3fP/VMiCKpNRHkjJHUk8HEBu0Wj9S7go91pb1O0OR5QRoHZrd+uCfC9XW3oGh+t0W7wUldiWfQkS6EmRZ6fN/y86sKl7cpmYHQvYy5mYVT0poj5njgmq7rRKGRPc7a4GnfsB0Rbqa/78mtRtG0nOaX9BVDPqvXYxeM0s5XXpWVgkd36EJFvMLUeLCnROfO+ZSJZr/RhhYiIgF7Z8wiSIrUQgeT2Cs+KIuEOtnTqxzAfWzVZFcH4ctRPya/FmikspwvMKJl/57P4/rxWcmqi+lplargetPV63qXYUnXkSwonUNGAHI5W+Itjx0DJazxY0Zc9AKPWuHp9hR699urbJZKODNJwWfTWsJBvRPs6nVwklgAbUyf1LMlP8H52UDethwYo5PI57Pt8cpm14GXbQWKddqSfn9CXLYS5WyMr8qv2XAhW5QjK8t+yHpea3LUDyGTmTF+ZQMCiIrMB+TxeRyUS5svSz6XY4Gsy24w5fPOnWU1cFjAmHxt+vzlKgHHrjKFMXryYOI0lrehd1yvXOT9Be3bE9O5CWPeqD6r8UpixZe4BZJLpV3UzYS/cUdgmIkjI05preyeGDLLDI+f1E0pa17SzDYgVygLV8I/RdFVTr5f9KBz/GaKDuakOeGwQwHrnj3Yi6V8iNsn9fChZpU0IvcV68DB6wvJvzii8JsUJ6Ge7ZRKQ2wmFPwJ2Ll5THltI5g7UnPd2VT6Sh63r4vj4nVzyluy76sJDG3wnYRcO+ThUVtyuctxUOscLlk236XkSZ6iKDQwtxy0mM+WaHAGIF+SIg9iuaffMs/DuQzILB7fh/9cUpY01a0aLkMHQfxxIjhy0M7Lwoi3wJ5NFc6wrzxhk3+OI1Bpf07D2OL3XsXqb3WdQ5tsXvzMTF2KApOfbto6NG1zW/DWhKr3QMveliBON1+GELxwEL7JQRDXYHWP/HwNYmT26qoUgAXNP/VMrAVa6QL5O95G9GbmGs0T6uZVtWI7ZI4+gfRz0MrnQySktE0X0DNMMS7JA+35dvbGFzniPAn0G/teKPs5pKUTuU8nqY8oRyMZAqSjQmcak7PE5U2pDSXV5Q6n+clYoJlof3KgygTCMBXZQhyWeRTQWhIK6VAc64/HFkosYC+RbDhRxNWrs5PxvwhwPZIYe4tNK5Hw7Is1tXpOGAibStOhlkmL/VFhq3a37L9o85iHE6z6y1XTnwPmpyzq3tHmEqxGG0vQFQr1qFEZzsnLF8iiFUsYduY0pLl8mQfsndIMtKCp6sCiO/86jBnF/gON2M846YQKFsRLynOGN4L2UoZU3d1W3/IX3GcPc/I/DMrrd58eWzftl8PlXUjHCgXgUA3NOz+rrQY1ZsB9EW+3gbRg1Iavk91y2E+GLYrGvYVNbOktNVSHml8cBESe2Jm/wNiPeeIrovSVoUJ/jZMuFqg4QBUPAPmHkhlhbELfD+rsuTW/kz1069mERq+6rdk3PHK0PyikanNbbr23CyV3pkLbD49yPeWRqU86aPwzFeX4SRuCQ9mNNUgtPutQRviJ4Tu9ixiAjfiVCa5VIqhUjr+a5hpbhjekNbNgWDB4OJLL/PP1LzNVOAxMGrGvdLeklpQZzk5AYMSdgXBn1J8sodCnLf5SvtL+Y6RaJn4nFe3eeTxybPdyYJRWCfwLqw+0CKuVTPLSrN1Yxf8eidU5tlElEp67X2f1wrBePksiHRmj1/2v2X/5c3p5X/qg0Toif2cXobiW/YXW7Kv5AA/qSC74EvCGIihAmZcwzbyktnKX7cchoq88h0oHAfANvGNHx1NnUXyM5wGbleBA+KFjTt3uNnQp0i9nrEXnVW3Ot24MlBQmdT/GFczdYfUXw9puLGzodIU2iVmZyGeVfmAoFpmMXQlmkHC6gdu3lpCn4HcFwne46w7EmFCEwg6b6KKQeYzWupF1j/UTkv/IEtfFykIXccOJUlLpeSg2ebo/Ic6aX7WWC0ZVvRmwXdj44DGLuyNJhHmX9b35/KFKvHBCjJ3NTWzhiIpFsTKf2XXiuxWLERyxcs4sDaz64IZiKArxMyBGxP0XxeXjfDoT3+4y/d+8gY59OwvJAdH3+BXqt6ELCl3pDwBQ9J9klHT7VeUtSb/SR6QeEiy5GhUq2RjUb9pB8ow+4DpnzsyxzL56R8S04X9b19gMyef6AlurVcPRA5U6CVnZWWJUmoZeKBsogiKVbe744IsnmM/+DkIpoOwBHf3hgjJADDtoCUpRS/N2XlQeMJfDjwXb3elM/Gy/ESJeei3fFGvkeYXmGVSMeVIbMFiwfoHtTfyj1a3jYbBe1+zsdsNQGh2pKYQb/mbDtzy8ekSP1xApA7am3D15Hotut7yytYUuhUlZH5qfHmkltbVKlSpBRfqQNU98kBpKRpJaQh+2skuOq3kWvd2kvNAGeP9J0JjJ/+kUxSpXqnDTkOgIXu6dxv39hPibdsdMT4Pem0O3E4kGsRgmkF0I1ZtbWk1FQAQdbmOISEDDO1WELc/sleBdJdTJFn/MCattmXzMGygo++rrw982ky43zKW4WHVro/PpFBvxLO1BKK9v+bHqddNm8e72E5CqYmTapcHP2d6Aaox+8WjcPdMhApFb3w8am3qeu3raOrtwmkp5IwHn6rEjQ2mYaQrYpMN1dDR+ccB6FJHpCJJifMpPKI4lThotz7A3ieLzFB1qOg8ZQgmwo1iu3B6P5npc6/hQabXcsXNGRuyp6LsBosMVid7MIWyTuvNaw/uR3dp0foWNW4f5YmvMiyjzhjwDxDXc1xUTvybr5pzuCTeemIePC4y+MP/99x5VGcAZruaHwGpf7eUzUGGeQrHmpBANqUw54bvOpGm3TycDxLXeukJBLmwJHRWJa14Ubu4auFhgaLeqQ3u0/l+gGz/oN7KzeeFy+/EzDgNZ+qFu0j0c7hpHzh9ZNnCP5jatlUbkWxe/ZjRLYbfO0lz1fG1YG+Hr4LkQStNvUt1r8hylJthZ9KmEeLmglVG+YeXqWrT7KnOX2N/yyTQ2TmpZ6QWYDaTnHJ8IYMGCqoYyf0P56mzFqjEwOQLCR3d4YDq5hdZPdZfW4uF8fbRgZRddqXFknlkNrqU78yVl+tWGVrYXzjqoqDYJ+uiftN/gmnlVMMdM00IjCQB7a9hQcBCCpCo9ju1AMSPFVf6k4nD/BMebjBWv1qsRddZOmQsoTnVW1HPpr7ZpY63AcwU415v83GD2TesqHybNknqYL6dV2Ul8qjHMjcjvhXMq5wdqNsP6fHO7WsMKR86SoINefUrJkC46yyXNBiTRTXKuuNYVQ4gOmArZUxkTsr+l86eAbJKKipyuG5suelRJYfx4DAYo90w+l8i/6/qSv2L97Lj4026WQH7vJUnTVMAUaMlOKeY93UpZWs7KWmi7EuiEmHeQuBsm8vn2bVyhKqnV6UuAYMgJKiGHtfZxgiTRErmEFTiYmkjxTFSkKZk9afshCiFm3DBsTAnRA6W7XRePwOGWh2UHQVhtQj3P3ES1JGQXZPgwpa1O67aI06vV+rlaOX2pucGnBZ4LVtvKUhz4vt7VyZZa30YJ/uB8BmapkxxO/FUEvLM9kE7wdnqQXxD3i6ZRlXHswODeF2QuwQPODBfM82bnSdegZIBXesxfQFIXa9pSIvPQjEtyvwDXFiLrPQIM4SAy+kKsEMlrgVHpNqXA2kgAFUICs+1RaWc/BMyqhYWweoJQTDXuqP4mRQgG3ZuyrnBsUbXLAZ1OvbSps8s60N8xUrRpFjgtLL5kyT1m8dSjqVo3m7zeS4EkdcAAG7fssGTpiAS88R71/OeH8fBmwPE1dZFRH1af0G9IRFKU/1RA3Jt7olb5+N0PMat02sAFSUqOuS0u88bqg3UvjBKeE0VVtSlt/squXV4lZDMO3TEyURVBNLCxO7YZiWU8HvUx+Rilo+qQeHKSI20w720yd+TLDDrbaG1O3RomUEr0BWbDYbc5rsrZclNCVklcY5FDJKysGJDsT6xozH8rvbNaFSKqt/Mp4nCYodyr3NTVslp3U5TZll082cqKJ83ULmOEqSP0V39V+VINEoLSK3xUezhpEc9Q9Y7Im1Hc5TVk7iYMbJBspiSrnxuytQ41qortZhz+iJYZNPK4VLqUKAeWN2/KEg2Lqn2nCWDB5FemfVApPT7YV5Jx3zSaoQbMqwrK3TkEcPS2My9TP+pKNGZfCE2sz2EGMTpz5uNlzOhfQa2xPVwpu6igeSksJNjiM9YBsfhEbt81vciw+A8yO2t0ET6wMdcZ5GYmOh0KTO8xihvcPrOfuG0SlPWNPx0+TSsYNba+WyhQ1P6Eu8plcEt1OQcP+NmFz6Le5H/q5P43zpAG25qENJmer4iZl/Z5YFtMaMe6F5Jyx+YripTfHyA1OSm0l9WikYL61g6KGfkybqxy4cqFsMaQI7SzSn/cw/mmiPXFsjLyLFWlhVqjG5JwhORMJ9xNNR6cCrvXNMb4TLr4BLRb+t2pQGAPG/+dQq+SPs/+EkYXNCZ7gsEUtpQku1XCqvXK7m+gkUhZb2WDGAZe3VgJopGDYc7xxfVw2GBJdKwUU8+dJmqXdmdfzncP9MqUczBJTMwQEsftOsFScitC9znD/LQV2w9orZt/6SL/dOeeANK2Fw/5vlpe39bfvYFmwmDKk9tXRnicybTi4uJ32PXdJb1U1tz36hivE36Bc6+JG1YyQ/BmDuI0maTzSNVktZGt1bhqxaB1caL9AHk2TLL90UuKbiObiyDchqP1CpO4o5lYCekMv+Z2iFJSh06k2PeX0Ama453HWvUdLBz3YqMVGrWucUqK/22puzitU8OQrts5ak7M5pAMqmnahWtawn/OZeIz/aV/OEpgq8DC3lcptw4BTXEwYl3yrJsYLuXllCsx/7zh8W/pSXIdUYKXzmTKzXAm6XNTTqoh0weEKeDOjx407gsZJIzq0R2JuvabLchFh1VgB9SYMyCXw/b837nmHbrx18+q5cvBHoO2ge0nzZKnlg6QakO/IWD0R2w5eCoapRqk05NQ8FhFfsODOeYmlEbMdmkeaTc4E7lzaYajMcbG8Ra6+Tc/vAXnPet9AHlgCUY7ZsKiQ+RtnG6EKVu3D3bWz+5+/3e2mtwvIjMEx3IEasWlZ2hNJw+WzJMohVH75WstSfo67qko1MaU4Rp6/ALh9dgJKrepiDn2mIliADdh0VQ4gylrUOU7RnhQCssDu37DaL+mcdVRoQOwx+YnAbrT28KL6KvDIgx+eDwUqiNiwvUxXyWE1WzNwHdA5kgmgdGmdvD+lKuHn0lB7KjyW722Fr0BWpFlFdj+jHl3GhIAniNoJWKfJfQnpxHODYkv96gmIG+Ak+gktgrfIFZbm2kYNUE4NDWoXm7UpoCxfJopxw+/ZP5Y5IYAJogh0TWnY6Bmg3UTCoFjwBdz2ldDU1hbr9TAxsLFsZEpU6gxQo8hSdyUOvC+No6wM65cVZbTufAbBaHdTY2t7z3fu6D5J+h7gIn8YQr+VF1vvJJZ3AZYZllB+qiugeMjID80h8H4Wcs3xn3B5dD8y3vOUQLWhqcrBISc0Gb1KUmNyo2yFZBFSsB34sAUTTGJ594UmYJzB2jo1YTSivTA0oZ9coFN4BdxdEWvmf+KVRshhB8hrNGBSvrRmQlHYLWarrK1DTxpZ2d5Rcg7/G97og1lFenFnq37HuUQtkJtMQPUOmetVe6DcU+8Vm11NyvPljd81R/xRqAVydC4QS/bDQdH++EbjzgCc787Fv5t2RjOLbebaj+TgU9iT9s//vv8qgFXZTanNsZ0+Z2KmlgEcrm1PZBYY5fOc+UxFRp3dlQ3NLLpRnnxhQyxc53OH7Si5FYNiC0rYYH4+5GlItyUPMFGcDCqFzWPYgcl5bAAULh0aajqL/F5bG9b7ulxcjv/PQivc9/zURkm2VuYUm7QLIiB/2guXKIeW28pPrNIzSMxVWOzNWE5ux8Vom60WK39sr05t2NPYwNvNkry0Ic0f7xc+X0Tx73ytqC6YlStkfv9G9R/xvOaxCuV7IdoHIYBmNaHbi4OiOhmZA2k3ZrUmVNuvjZSbTPogefeBsiwVIniXhovKAkMIkG/tXCpcNgi7bHR2sh9CuzX4xPmUZ1jjw7H8et7OOULSozBbiYyW8GGHD8xFqHkNbrNjNzxfOAhiLKkw6aMiPLEBpWjXz7m04SFf19Cp8/wVjYfgDG35D+EjlKkXwKwyMS34uIy7cq88NUzX9dFKh/NpWbg4vJGGZxB4GSlhhzP7Vh1dyW+1Bsd4i8F3zI0GbyMyU2jb4unXU0m4wfFuJNJoEsnwBhzt/BTw8hk7gL3m4rbsChvDY9HbkhxKXzAZk/UQLa4XsL1QWWrc/hpUyUpVrXN+RYc47Zu+gMjvnsg9ujarIMSu1LsxM2sfL0un7EBGq+MQWsrgWjfKrQefSZ+nUdk14GkmRwRUuTHsb2vcIm04ynWuvkjkFLcZcG4Y174KvN9XC9Y/75SFKpykxlnN4PN2nvf6d2Xj/3/A1hRwmBEFiHW3G/d6IA5a9FMhFhf9mJNgYv/YgGM2DHa4p7I5D2kb+8vD9lu6X0nBYuEsKNwYyz4V2u9gts58oipu49kDT1fyq7qpfUZZyOuQ0BIFhFtHRNH4RWvBEEyW+uztS1wdR/Q3KLfXp6JzMMiy91ckcgvPRPtnulU6vKHYWNhRXXOrjO4+KkGgXxA7DYKxprQ8mdED19aOZmqEIVk8l31dC4TXbSMtTmxoyF4+IXPWiiqTNlK1MOgpjAp7I2UagxsfS8Xh+SsG3Ec/sWBYxE0EIQLBmyBTva5aRWBV5U0Cv3jXj7yPzcwsJWdUHFkh0TESrA9TjWJ0oHCwIoMbpk15d5KY+iXnCt1nYqYJem/C8IeVm+VTJPS/NmgmW9XSZqrg1G4CUdO4BSVmLjFW0tt3RoJfUmP0O2z2cDe7GMJtCDlCQKuydGK2rZ7934/5UYIBuXUPTxEef1cX50U10z75VWq8RS17pYJ43WlBLkXvrbvfCyTcCE9ldrKdl721s5LNNq3m7lkveP89jFvndSt8o0afm2Ar/LjmOtKgek3SZ2cPNuzgVBk6EyMSb+JzvqX+RnBzhL9KyHu4U4HrXSchKksuQaFWXxEQydUMU2A4JSq4imp7PqsP8Fb+7MwCRqyp0b3NdO6nZoiqlts6J9KWJf6xLH+2sQdvC9ydL8ypNJSUpBwQqU7TniQnO9I9BWrQFxuLoA7bk5Gn9fNi1sVxWefDmzQXZ3qSQQSsa08ZFg7hYIIORkdFQ7YrCnYaLf0qubihXOkXB9XU9uT+7PjS9kmYRJYavy4FvljDNvfcs7wHwmnfkrKfB96TEA+8eGD6nYz3jGMfNm603bjUlugX3GQ0g4DGeoZqdbrGUF8sKnIUSGblbwa5ri6QXw67BZj+D44bnABrAJ+aU1QLgUG0lC0jv4Q1N3hpZVpScOP6Jtsj6GXWPbMNSyQtIMcDUTzjQz9glHs5ogCM6sbXqoXFy897wV3RLVBULnrzaK2E8HHcGnyjdTZrl29t4OpN79A5T+edlpjuBxU94B1BUNFFSNjco0IQ2hNfLwC4g3EvVTHjSxbWu9IyxVmnKfj0qDOOeuAnWY1jJmjGCzeiFDXU/atU5vXJkQvxhcof/MpevjQ+7eMZg0IoJisQoqxoQwr7SiFZ/kOyCEV678FQEg6++DnXA9Qf9Z+SRw6yn7c1E54/j7X0YmTJtfDa9RymJNwc+z7C8EAy7a5jUDs8a336aXZoeYcrcOvisatl23utio1yTUv91jhWuFxbrQK2xldjpmQumm2g7k/oNrkmW7NvR3rnykfaFy86ygt6jK+aphBKAOPVFdVHEtFXtWnfr66pMAwiWKCl+XjT3o1F9/abJdGV/ZgPzWKZ+BLdncgdXU9HhVCB0Otep+6zZeBiSfXGrLd2eUz9F1tvxZba1t8I1wi/0M0/Zhm10jnIKk9ra/giUKg8Sbzw3I+5/8yR/R9RPSrpPkfV2CMKwiiRRFOc8KAtN55RiH9vZNM6nlT4DXia1qcvC0LVk2ODdPPEfoGXxjDrIsFEUj+8YO6xELhuMNoqI4hR/5RAYzEzQLM+bHXOTWjG5u3YxH1Z4Twx5vU5FJOMyp+9eWFwMpTE8QD0D88gro3ZmwSUbAM9wGyDsyHOKVdXgPst7qKs+MZXDXijrmbGlojY5Q/hszhmBcAg+frMB31qNy9M5ErFr5Jyv9U6Z4+jXm6gz70pp3uGvolSTKtCoROjIMQdZZF+eQgW3qqQHJsIBzW9ZJMOSoGFs1GbYFOP8SgUgM5RB4MG7/FPqMycNg4JW4eYT30AEpFACq+ykTa8ju7Ls/5/GqKvXrOsPm2fYKzfrxpVX8lDl61JwA8bJChWLl4NcYq7Efn0BGa+xw/Fx69nOT7aMvEPiXYvjO7dQk8K6GCHt0dAOn4JnCBQ4UpZRB0vxHcP+d5cSio1iknh6jvYrcxvT1QDYqeW/A228ZVT9fPWLd2DYPV6oVLCJetMWpjUpJCHj9CR3dm/xAJGmBe+W/mgTCa21W2bdJU17VIG3uVbLdkpC2JicLCA9ItirfSVvGHAdoueB5DLWgLPwN49Ao/ue9VnH8xcOPbZIEE/9gzC+caeVbAbBBvLFuJLmy9HwtGrI5MGDNbSZiogG2iTvmWuSGRPKbM4JFGKyuHRFOUThpSOpMCxSoObBgmgfNV4+vJluaJvMcwit9IqBNv+P8x24dOYbOotk/BRJ63Dp8WnLAP2CfbFnQDRCAhabYax2oeBO5eh6/fbBpWHRpSnnNYCkMkKEBVB+R4xqE06x1By0eZnQ5yWwy8fSZPSDzsmG6vxcWEaf1gxxsykI+PgdF55/1FaBZiJzCNBXjUdvqwE+3Q70TpiU+iWkKtAAZFkRaThhue2lxdz4T7e293i7ljWAt7OACBA6U6GOAdexKrhQ5JnxU3CgPzD7ojaNKivBIPt+TttYKkK/QampOW0E+phS/znOYbu2xOlkzPY+qorSYzrA4HUwLzgRvcLl0JS8I8klKyx39PwUaDNDb3rknsbC6XWnyM5UDud9o/RAnNTshnxYLVCZXN2X+r6/e6U4qAt1/aeIpSsVT7i3KWttQYadjcMymFcWJHcdHSovIp/aRxFYPWgqVHU8HtpsfEU9xyYC+HN2j3go7mtGzciMwjSTx1+KydvWY7gOLtJ+bnBEK6rBEdHfbrBjW4TvHKYEBEnNG4CWzus0MY0+YHywEkW6RCYmNJjnCXvRWDULqeLfZvKAADtENSIu7NX1rFXbs4HUbknhOPlJxk75WZQRiIv6QN365LuEKrcyDIfAWVLZYg5e8NUJTu/M4KekxBP7ogMAx5zG5sEfIr5nXxT87tQFtUs06MyjpSAglR5FT0l6UDdHKJJjC1dufNbHxIE6+tW1T30MEgMXUkV/Ho6XBdnusvoA37Mo5inbRJB94nikL+AfJKUICvK8pP6PrcfAPaRppTO14E7HfN9LKCnhYJJmyXf4+EGYto84o0TWm8ZbeJz3YmJPRZT2m1FbPUhUjST0ifb2f9u7/jflym1H/Bq0BfpaW63he+mpZQbZoOTIQ15OS+KdnIc8+cd+8u20GMmLO2klk3e5ue+TyuoWrpbLX7ePgONsloU5ypho/oMQIaXSODJfhPA7Na5MFKNPrRa4dSuDlZmYhExYCbF1b0rPjc/+CdVkSdwZbup+x+CWWdqKU2Wq7ncMyyCEu01R6FtBxmLWxjI/oS/rfKXrlFA1Jjq86ZaBpOcUIx9asNS1v1yKxtFg2nT1Vk8N+rcrF6iLO2hNCJS+HFpQFlHMfC0/2l5vFYxEBD36eucaF6cPhYi5TtWelDchqZkcT8va5XpatpliZKR3H+QKZ9jBX7t2Ngwlwuvx7Ke7UPetkiLmMZGeH7P2vr47cIVILjV0diZC2tXwMjn2oEIvwlmM1ta4xu61SKDh3ObbJFcEGBKk+ReksnKPLo5JsxXOWmbpC+JGqmL4cK7hFyRtk7gnCu5P+NMMwqPoGwrx/Uu2CRmmf7623MzyaloMbJ6gXQOEK91xhcltOzfAAoRiMrAPukh0vLsKYvjgL9P0WIzEStO5fB0clEY0ao7Gt+bT1yN2rSectNGrDZUZssuFlpyJlgetxnPkEMztqYBSYmSZQEv1vRM1ghUS35StRtGgRfDaT8QZQcEZMtTHEQY68NvX8669L2Y0mJIk5cVIJ63Jsj55Z/6b3Cp3w7Tjog7RyXcHnDyymwjIVtr5HudvDSBz99C3WjjYul5TDzPX2a74OfrgwgSbTz0EpINWwcOCARF7Lv7gcFk8TMb97kEFRohGy6J/nxK/3u+GqiKP/U9q0Zz/L9784OQ0eN2XbTRuNm6bqJeWSdNDcRTuD8EpytZ1QDYHtv2cIgLqdmz4NFGLumW+QU2MEXYa0rpFprMXMeavva0ewgrUVXlVcsBdYB4VRD7nRDUBpzi3ar0sWVBueokw6nChJfsv9gmIU4AGo2x2xgWgy8Z9AnDQkc3YcUvpqpBXVppvWdmbg9Gghpg4jpi7mtVSx9ShuCCLA0zFH0olaBiUEuOsREQkWs37TDtDFS+bA6rZHoFpNz57c5+Mxdjmno04A6EKkrd757cviO7kd5HqbqQfLDjQOiyRplZJxK67Q1FwgEV+7zEw445T18ix9TX1vtZqx9kE9ommgcLAgyQ2r2bQpPLhjkL+csGCChBwf4NmLefC+QMgR42rEY9rx7ODBFCcE2FdG4F/kCY5h9keRXVfwwaBRS+PMJvo+/+/ij79ywWO8tS549HGjZOKC4xiqO5qbRlz7PKoYySVt0fLQ3DLR8BrQ58uDxk2i98VoswbtMgtNI/Mo7uPTDaQ81gPY3968zGl0TMgRLQWE46gMaF98j7UneXRdjqE0Le09EZa4dP8rkUSRtoj6hMWzZ6jGeA+tFunj4V/53rp5X1UH16DVOuAgw4p0/txbDKKFbGTwvkFeEtmn3dgYWBOlTqRpnLjNeMX3Cu0akXEYRsCe2/lSyi6jgTRGEqwE+dj1wdE76OAAaTH+mDogCVrv1FlK0585S0kRwtKTAHeAG8MkFlPK8+si0CmZ6RJ7+MBoBN58ix8jKK+Cs0E7Uzb5x7l94dLI8HvBDfq5cn8+6FDx3JBzRMM9T92ZAa8YKDoKzNnqYb5RzsIpo5wMUhgv1b0TMtG6R9Ph9PyU1vNqmsTgbAK1qeoHl3Tl7q1Pe97K6cC3bojMWuOExN7sqv6aiVMrYRe6y3jIjAm5gJAp1xWUgv3hEvXUVx1dlggyMhh9TbyFr9pQZS5RBofeQt8/Xb/tLlBRlJUvVjCPMIcXdAq7kl/GAUpK8LY7e9yDWw7QmLcg3jfCBh2pAoA6T/OafXAXEbCobJv53P7e996AnpPnwMV31Bl3NBjiI3aYmC7I35Jd9z5brsDqWQ0mk/zFZsRUK8PZ/9WhCPhyrhvxa2vajtNLzoRm0p3N1gxu1ze+AAwPz96ujtF9D2UunEZhRo6yuB0UZoaHCZRISabOxs0DAWEyZ2bI81kRxsBNc90S7C50iEyIYOPN65JGtwMnFwoQThU6yMZN0dLpXFFZ1D1SM3He5qVibpY4p8pLQUh5LsCZap3ovCnBH6PTJd6dwZ9n3pwFv7zBpM4iQHmrUOrzwJ1ycWbuQAmrrLE1w13DslVKMY8gPMsgAaROpI3MgZmYh2kF5UGDLj0+kJ+1lZoIoIlIBHaLInIbycmgKAspK8iTfa0cVz8X6msmHApZkKXLOc6xc0laK9a4bK8PejgDWOJGuX6mZ5of0B057WHSfT9qKy+Io3Nmf3SkYxAYCUIuQ61Huo6ydyk5kjXDd9PxTdSLqYrImcICuQn8nusJ7YRBYCPVyabtKUljhIUuuvDyJZwUMnLHgKY8Xu23hQJdpfTAQ1wzhnsta2eWTtCn8Ff4cTNwia+5psjHmJDtPtzznnKRJ8oVJXdU3BWQ94t8S8kJkAl0OKvyb/t8XekWz134n81tj4o6uiPStu7M3kThw0yyBPP0GOzeE+cZy0dzfuAxmcMFU27Qk70xnqGh7056eaKi5P0ZbxuYX/Z7wLWboTRAQwKhrftLx/8lNmBBK7EZfNr0cVMS+I8Fl5LDp8nqrPnlNnzZrK28i1vCub0X3diod37ksOzZ16YEdz7isNvm3r6o4A5jGrzxpPSelIrCArbv54Yhytn9J7RNjv7NuG2o04KYkuLnsnGLyNYFHEj45SaltCPszod5iUB8e4irI15fW8dNUEKlIsvIDd/dPG4GePiUxjeM5UpSaib/vNq5bYb8hPy91fs+F33KDUhnzIqnlJQYT/tmUiNwehGf7o6JDUtcoA0LWdmQhT8lfwDbvsci2OwxmRoDlC2igUTrUEElNcjkDcHiAj/fIbq+GzTGCIB6Lni/MeGH/wQyqi4U5IEcIsigaHaGDM5Tl/EiEnJalG2ePzMfiOlFVGPJxz8OXnSVAzhUQfo6vZraolRNIzc4lp8nSOAbQJB3d/OZ+ApkwU2KypSidPQos1z6mQlWwzj4muyaYMYRKv4BZgPT9i97u41zXL4PkHcOAZhJ1CAyAELtl2+DEDgES7WB6fC+EDBdbpAHcWA4F+qhHAat85ftk2LDslmAR2lQ97L6izAIAr8+r7A0jfFxPdYnnDFpv9kxitQLAvZcimVmVPwG8MaxJDm0PiaNp1/esCL4oSvjLhy64x1xGxsh0mRFQAzYD55C1gPMsqsfNRfiizU/XaWZCCu+hFNC2UfBq5Q6wKdBXBDZk4wGuiB0rnu4zIN5vCmGD3vw6glu0wqwIKymVw8QwCclBfYAeJgw4b2Q9xkdeHa5ZNmKsmO5D6q6ZgpK3AdOm++TCzYAZpEgCewof6qdlUYvLj7G71oyDNjTM//Vzd2z/3cztC9OcZI53VDGVI6Dcn23rz0hb93c95VdE9OQ3bqGgIY20yKABoxNjFhqoRt67oLuFLTMI9NgaFc+UDl9+veurEC09uR7ltGF0VPAXFGx7yjOVzzvf5k+7EC7p3n5e2BXwbEUtd+4r4NXVo2Lng1UpWjpPHexKOtfBu+9IKMjBJTQdpTSIAYbGcpiFsHVtg6EwX0FmsHDbhCQP+PavTa8FtvlBndGj6QZNdvxRe2ihqxhg91DuaAA1IA6ucOgDz6o8S9VvnJkySPuU4FWZt1oVYan8XJV57WuOSeMRFymW82WaDlePvsSOWqEPToDK758dsGWXeBlvvvK6H+/mycjD7L3cBUECDNOCsSqi8BHGMP8rf1l3fnK9+m8RH2KYuvptN/Co6jzbu5IFm/MZ1aUWsoWJB5x/2+nXaDnf2kspj5I5fHKxInTYqdcuexX8qLn7TqyOAapBqzRWSs2IH3x2NAioDMkIfdZcV8IHTFnmBcNxZe9ezC78ovlATD29clHqbzzlcsSxRQWdN6UbbFsnLlt0iNH3kf04/KQ2dXcNi//z3gISAyCPEXpLdIqJJmcjF18vu9ySOnZ37t1LXspg3jHAa8HscKnSPlybyCgKVBpKSAoKOyDAP/oCPQa6SwtgFediChfkk7cPeYzYsdKpthP4UrJUbVfeLPnShpbKFl7JPP8A9LsxPfSKFpN+PlDQfikVFqCsX3IjfEiQwbTdX/muno+v9QQCG6D5ZVM9Ju7dIQyAhF6GJpzeFzvRdQLPKD0iX9OppvDFTAW+M/oam+95PJ7Qzy59vm6iHTKh6TR/+mY/+um/KZLYhudL+4oIpNUZsYF1+Naa13ipe1t5hunOBP7m4Gzp8FjCVeu9Ew6H3Q6za92ws3J8rwmcvXFD0B6J5udu+xw7+H9/j6VXK857xTaGhpbfrdOsuDqrnecVMgAQ2CAHPaEAwKAgBJeqOsb7JBfQzMZpQlMfD+nJZ454oz3NCgJPAWPOgydvCCzUoTNqhKsBKmkegF3eoC4EWmWC4CRjM9Z2Z5fZawIiNpJfXhSPrNku/SkRCcPBs9DLfQSPEEL5hvFlWc6NcjivzhuWb7P8bocSrFpAeX3VTdKdvykC3LvkHrdiieZs0M7OyDN3A+x6QH+yyIvmyUmZbB9KmzBN9sQNOmXtv/IjN159ZAeK4DigyqB09OR9B13x+FZui870m0znSAXztddmJSXSDhraAeUUxJxCvbHZGgoCPGew8DEMj2De191AK0kl4eiL5PUBkPgBou+gFVbIwfwSR5BqYuAtEyp21q2Sz99FR00hk7E9IKAbV7Ioa4ogvmyHPcGLR0Qa/yR7vniQqB2gmcY9XKnugzM4cl9dJAcxihksRJDQ1GMS89eIgJ7n5b5UDK7uQ2rum83BjB5/+UPxhbtX6AL/GAEgM6wPJnNZVSenbj6PsGcse9myJWsDc/jlzPW/FZrCT/34Q13X4UQ5dZxFwAlK0JLvmSrWhedOJMjY+0hFyl7AUcO3R2iIjDMBx8DfLF4OAeuFMBLgg9mzsM8ogMCHsEg5vILptZ+s0BOUNfMFYA9jaAvTJj1EVjePISkw10X3WWsme9Aaq+b/J2dCALyIlGyl7n8yLz3aSG3qcw7CcEO6JrT/P1tbh2mbi0vIyD6nvruxqqBtsHJLlUV4c6U2+mmZ2/kfzSu/Lt2FtAgpp3Zqhx/Zryyhcy2tW3iO8wMps/y3bMICMQowoS+3UpGM9NjjNX6ZQgafv7AgQPF5oNYBap0090yNTXRZbuKGrjPDo6OzKxht46Yz+DdA4pPa04cW7GR1CTLE7jNQ2IncZaKEpbgD28c0fu4vW1l3P/85VopBcMx5y7XOa0JJVOYFyuZEs1NSh0DgJd4HZ0tXv67Li6RWybKazdWjN8dynl9jX58e1ClzD15nNnamPlDhTkit6xySS6CQTAGN5QGruQFDpiwzb43Fs3oOtVT/XDyDT66bIa1O8IQ77EkYzXwIoc21wnONvcLBnl0xiMs6EBFxVpinYprv1KU/all+YclvhbTV14B2A2OqO+CeQcBDE0UsVVuGAhCZZJBFsSZcWyCBqSD658G6FJIG0rJ5C44s5rF3P2q2ca4dLITMEFYvdzYdGNXRYAfkO33VWG6G5BbD/yIFlCndMBHWYfp8FTAigyvkPGv0mAO5f6M4yZfVAf9aUgC7UGNzI48brzs49BMzJwhiw8nDn78Izxz4b56sxG1M/OTzRhuQfWKlvrks/OMcc1UegJ0qwT8PA6a5Qg47hDHTeBbW/Ij16ldeBUwOW6mx2t1EJ8wVfE62uJhJXWhmFgAFD0y5hlcqpuwehSDWgkEeqSwfBk+1n306TSEAR2S1JhIAgCv7LLUZE4uvETSCv7+95Mlb36qPdgw3GUWADuw2TCXZXV2iNvTu5JEcPR4j0v7jM4l/FrAWXF1B7TN3uDYuRNDyZZvedU0K0QTUo7GU4+DgCpZaHffEXFPSl/5xSTv17L6051Wh1Wl3198K/7+5VslJx4aZBXkFLa6zcp8S9nvav3FvpRWFRvEsTpxND0wMbu8L3+4C24O/QU0xIJ5iJFrG56opQI1WB7KpZgQCgpysWKoAi3WPUT1Zi11DxF/if9i3a5ZR7f0SZaFaOfOm38BjQs7tSJQs30EYhWuMgl2/ajE0SQMh8qhKk8fuMjFzN5G23bYdOz36tDbjjHIjRZhmnQl7WPHmsB1geMSEEMKB6KG0sltKfA2kgNUtGBoKpzJvvo8tnPtwDT2pZIzuSu7hqX/zfvpvL4KmxIEmI58T8QOrVYktjpw+eWdbPEc4cjsqOvHd+xbm2nvY16wlk+DugfPx6VUUEu4JVRomKvKjNPFoeLAv5+VsBpu9yk0cAmJP3FiRedw6eZ1PSuSeVghUCVSTeat1fZhVncGFCc0NAWxl6GfpZWVxYbRYMvQ0BRLWfgw9/zuvA174tqfvwp0/BL9yrRnRYFkRRC3tQFmPFPO8zZ76TPMpHuFNjd01cHpHjb644MLna5uv9SDAf0TnXh6JjmHk4CfWJq4NYJF1mptiRSPr3YUKj31lgRNQMWvRrRTfd5K41GKDzfF1aj43WiNt8jeTigLYnP86bmgAzoMc1cRn8RDGyksarzCDTSDzH0cipEPfPVzGQ0nCP3za+3qsAqxYOMpEIayR0jBNBbVIvVM4zbvkGPdVLsGLgH+rhZn+q4j91vYDQlPWBQzrYJN7koJpgR7l45N5gNEVv32JT7LMwMvDtwX2f50XKvW7HiDcWFJEEyYCBg0g93yV/UUPYZAp+1DmSQ482jIBtxjUuntRh4aAAeg/DLZXMBrWdgoQDwRYaGYn5moP/q8IjaoXJThlQvP2HZLpFGiIugeP5O0gPJSULUeQgJXLJHiXgmqhcEkyQEJeSb/jV7SNTAN2t4ACx4H+5ZWKVuIR+OUld6AEemRqGiTExROYeAJh+pOOktveOesBL40sPZ0NGak1G94031IRpOsAkuolZQuLqi39D14RQkbhpKZ9PxKtFHUrislz/uZM/sX7PS0B9g7NR6eTbv+37phc2HF+Np2jdUcXxgbmI0HVfkUX+W3PRoXANsv31z7uu0Psu5IDjAfrqM6oG2G9LCn/9gC1Hkh7fzEQO8iHwpWDL6Y50vnrmQmrvk754NnoQuXmjv8tk51fAKta5ljsmM0QEqrxlDhIX4QtY8FpAdu4JYO+uJZzQARCCxMqC0Y3pSjNIT6R4LzutyK+D7tUSOAA4oz8PWgEv64uR3LU5NUGRS+ucDEnfXbIzp+Lb7/JDRKrYk9BTeulelz5mE5gnoBgDTOWE6ssuyl6kFgezc+JGypAEHjo8BLj84l2j8DNlucKA9qhyj+syZ4H5eZEofY7J97wPjEYH4zY3op/2Eyv1U7en5zidZ4Oo9rO8TJieVPo0x+9SBmGsSPh9EUCh6hAlWjp+yPWVg886HWcunAs2nqC8qm9D5o0hXBwTyqFk1U7USlY/4BvCe7JpS1d3uBhYKuWbkCF8xk9tODfhR+DgiDAOgLuhYrE6oKU3wdsmRr//BQbqF7X4NbGAzFmaHqjq7D77UsreVC6YN2YeAFqfmSd3bqQIckoF47BFyzPmtbig9/cVwK4HE1UTot+SmU4bG/Izw8RMLc7VzkxBZhw7hl6une1iL+ziQg2/rl0RlRxQijeqpOlBwlBORMLC5pBgS0FfqCxq5vNGk8zmkiH+k/HmsVjgfogDU9eiupnum/EjE8CFHdBxiSMuBJMCL/cMnJ8tSs3XaKbfjHr8YXU1TVUGxhtTsqNLkCccSezKBeD6cgYaSutoS+pkxjyPgCc33S17is8QsyHTn0GCiqyQgL47y3X3qXUEU2lKphwVz3rf4c66eZZSE150xLdqtOeRRFFT0/w3IDMK+gvnV68XpnbXYlYAa057ZG87a0Og3/Ip6lut1VSahdZUfHqfJ8nfEht1zYm3Z+fdkfRL9tRMdhOX2x9vgYcz/AAUF5VRdKeFpaiGshd5/WOO1NydZvXMWJ/+cpLofz5Rf/Zy7XbPAf7XXXR2fkMK8yaA3INi6aGqJQ8ty5nIO0TDyfchygNRN+D7TzAsENH7R6MJH6cmBehiXQOcx9ZDT7xuJtDfYAcCS87/7krnigceY345E5ZX16OjrQBxWAdm5NwJZRwbtTXGjYkYVJsqaBkLjU8UUfDdHDKoeBTVCqcu2GfCApmVUQYM8E0sAxDW4/u1V8drTrtzLPeRnCAlyPVo6Hl9UTaD0tAXyQiHhjVoWMAg4S9cvrGasZXFT/SI++xLOBixQadcEKWDRWeZA4YTTpKsFUlIucAaLmwpp6LewZqpv07+FPrYF845d7VJxmlyX2aYa/OOepfD6LETq8varqT8/pK1WjE4VQmheXhA7D8z2RhomeYpbTr8THY3rL1I/VE1mmHa3C3RqXo6kil0PcvBJsEiAMG/elZNcv1hOgcoOyss4t68KZmvbSw24pgkQb8zG0e+y7dwcgp0+INlPtPFiwbxNshzx0P1IqJuy2tU8O6pixQz2hXfoqPSwAeAmmwx1wiYBRIIp6WuzMzhSG0UZgxSl+ZthRQ3CTRgRMj5u2U8LbfC67jCnCEjzcGA788LVBQ+fmsUPUaY044B/3wU0sdGtO5fNrwouHvgnqn2ubHfjgU+PybHnprrOZIKdzv84hQtND9M53r+/+/aAbn3hVmQvMJhXkA9XyEBqjxeRguko9qMlqZRuYOcazKPR9L0uUHjB8wR/K0+Jv8K4s3ZCfzK3HFBfCl9p8N+vV5Y1c6HWwYMSE3Tq1R6FMpuIYwLXj3ZQHc2qmcpCOhZ8DneAud7/7S4DZUi4/XwBUXyRJlQlY47b+ZOLFMH6SRkBa2HSYVjpPzKTaMz1/azjBGm+ODjIa3FN/zgwcCNnYeebU+g1VPD+45WAxt2bPFQZ9WC2AJ5PnHQ+nMROZBTH1OQd/dbaAR2ZRnUuUoyXlnbMDMe7hbeWzWHJaPe1hY1fcQPqa30kUY5ZU1r2ZV58RPb5q1uKmMZnjtH3jO4arvhkzSRN+rNQCofRhpdu/oO/eMmVXX8zwHL9YKIc7XBpmfu0nzJuVQD2DNQW/OON0zT8TonVS6uKuWB+QWe3LbgufeuWayGP6j4FlYC8GLpvRlwYt7SaLmcREEOdvhNPhXEqTlAjJRpfZK5cdyUs0lAWSjYeAMYJhtD84mPNzV9WIlnX3h6+t0iW/PSUSpxVZZKL5SseULdMExZs/nnu/+hpQfIm7LQG8cgVcPZys4cxjzI+C/pQ/rKHASvj09mMX+LlrW9B0PlhWzx6o+sBSDv3hLqS2g968m+Boidgibh3V1y44XLrvQX0WHLg2MOzSW+cQBXCyM23cXP1Aeonl0qj75q5LMB7fmTb6+kldjInR4Ja98P2m3/6xOR2oXrUWEBrF551gAGqlY/Xou+1s+0H2Uj6WXyVfCTnlkczKeNKHUYXGwSg0tGsjxY52Ed/RUApjEpBl/JAHtCvbAsejKxRBu30a9E3CtLqSnfmrgXnTW1bYKszLHhlE2ql1N9OcfC/Qy7Lfp0I5I4GdhpO1C8LP3x0ZWFkYvCK4peLrALEB8ogCl4gY3dqyKGNgb1aVF1+iJm+AoyoT4HY8OBHRzcrZWY8AwtD9NCn/NZNfd5ecR3N5g7InuBCTKEY5DH/UI+kYmbBA5mdXhtdPnJccXAJWxHsm+lELwIShemr4Du0bCwv4ZnaQOzt2reNxTTvnVaYA7KPDp3cLit2f608pqobHnToM73gSEbz6RcPblqtDk+FS71WfopcN47SLK0+j0S8+lF8cyk0slf34BqAbcGpaT2cqw7ASou1yBCh2VeoAe/1uhfBzXZhliQCEO0ABpWQxc0w3Hr3vjUOa5CtkY8MxDWOIWpai1gNQEuSf7SLVJ7q9CsHRbYNeuzH7f7xTkcm6eNuxU8zAM7e3fMXSgSqX+HyntAq+lG/1QbKyTaHC4CdKLFABUmn6ljwDPEsA+830nYWX7qdqwo0rpp98Ks+G7QE2jXvhS/cRnXz+w16km6IC4xheeunHdekiya0qMBRIpXauzeWPVcmIgcidGFgsxOj5dO6On9w8T+7nEcn6nKLyXdp4BRVVbTi/qvLfTJE5Uu+syE5RPz9pZ41n1Z48M5ebfWVerDfwni8dwl+mFYpbKSgl3GUsHb+bopjxZUK3ZyefYwKS75YKOQfNMz8rYcBGYkmxEawWGz0qKCBpQmQCLSoj61hqWDyAURgHD++xPIqxmaOibBuqDpB31HIjr1g2eRFMPArYaehVW3Ea4hpeY/GeSvRjzra7Ps85XGtY3rCFejEQ+c9BzyHBthom4zpdMJOzMFgNI0x/XQCUxIHzITG1QRRB72kEfr5CJV1UGrqSysVaW9qrBAJFAk+Ws9Qlx0vDI7PoFO3VBKGVxjYBTJ+ih6B9xuqMzUE52RFkLa1NAHlOJairEl5IcTueg0tcX2hP/MEfNuKKL0XpD0L+nnXGVQATUGnsAnqb+f/+TaMF1oW4FzNuZ3qSr8LHdcah9P0C1vgcJliXmSDbPdn9E0vHLGAlbGJ9ub9A539dJEh7lRfkebxSi/TuzU0FlkzbVg5CFIhatjJttOXUBp3vATqt2tXoxUWnBexRQ4YheL6qI6Fx2Zfa+agh4OkaBolVw5j1y9Fme2EpYKId8iYw7yaL64ycS2MsLONtqM4PSNpGp5/FASrdt0PgImPS4HgaEyzk1YKJzAivmsNLmZ2neMJTID8mHaiXF/u87Xib47nvIy+suFIVndJxc+vsxMOUXDD7kOtCLaPtaObP4Zsm+Y6CyqmBGeZ2cnEax6ICdcn/zILuxmXT66BAwFyiMU5GVpWol0DvIwWMGQCXbQgLcXD9UhuWm3+R2ehzXFE4AkYRwvRGfqzOm0oDW4DsmtTQ29brhwnKyrqBITvc4p2cdPgIKHkpr8FoYk5VNcdQoN2SEF9KAVx6h9Z51b5s+75mflxif9wpnXVz3LDRLh8r6wMoXrW/2VK9h73ZMcTbI0tgC7fSWUcHZcGZfj6C8O7Bsz1K9oEtaJ5UCwTS3pzhWpj4rBa3gIQfjDGvh8cqbzuCFyNUqE+B10VWzBwM3V5ffzvrV9I9nraWAlRJQEcB1TyrMKQ9I8klWnpGYjSdu9W/epbUhlIVQJkFeTruc+ZuyKNRprTg7OQar/TwTrceenh3RnRnCziCklVdaPF3w7mldOjtr8kRrPE4GoK+CQ+d1RxUnKwGx0OfaI/a/LYBKvqQv+YERlhPZQbrYKG//QOrOVh86yIlQH9tjzNuomusd9YQwa+JyyczWa/G3FwCGCzca5rwoFeuq7br6QKfWbpW3yUpxkq3pAhr2WUpNsxg4n4tUGegkAJ+G7jT3JrAd4xH09/savl+4+r4z3/tTIcQGsNW0JjMvfKGbFCMGQOsPQimuyZlmQyInOq6vezOfVMEN4cRUMWpBhfVCFb5acDsKvAjFHh7u+HS6o3AuNLPVmI7MUC3MrQC01ZJ4Bvq5YD39p2GXktb7ah4pIW35fCle+n6kpFhKfYG+Rj6pXzN5T0aEDdRAGC5WB/++2YcRkpWshRf1ZBPBTV5uPf7CDqG5gaEze1M0N6Dn92IuwxWcwQ0JxPz+8RVBo67ATVM9GPACKTWRPp7fir7Rucnfjyu7BlYHILCgHCz8k35U9rV/w1wkqSOLzu7+Z3qR8HwGzs8SrB+5REvNuZt69bbLUWLEv4xriH3gXPIo4Hkzv1GV+KtKOFcqVrvBghkGIMw6AzVJdcn/Kmk5qLDcVzPEQnwG4EGZT40zMwJpdyqPcHZzz/PXfPYmLMpoZKsBNP1JaycppgEP7PVLA/6o6VSbE5YAMvpV4KWUbO9Y91cwAIgC6lN6k6rMobPzn1bmXV/lq+gLYuCNMwi+jdGZ5TqYSgALS8ydRRFOhHSIbdwQkEY8jIbTvUYZZ6S7pg3fEE/2SEvu6r75iP5eji9e3ZyollK0CDBiUkmp+iO//blaQuAtjJGY+KJX8UG68WL8j2E28pKRf5QQyktQdjlQX7uise838AljISn2+LtBzYF8y7sWIOYo6dmjBK5KFM6Nd5Jwa+hSE29aFvs5qBxVQUhEtoT+RwNMJ72puHGl15GMC62LAxpnlLOeT4oj6wy0tk1mHT4COvNkpKrAb8crmCM5HLZc8Akplt/WuDUPVF3q8FBAjYG0IrzxYTdLkpue2CjHEYDHuuBnkPvK4pMFKY+8Pn7TsOz0SlH2yLIaDWaC3WrtqmSZKmPc938E1gDX39Nk/KuR97ZOcPvwNay3yuvMr8w0fEmUcb15oVaKGv42yvJid9evX5171nZ97p5EAeqKb4nEf86oq1dBQ8BJDPEokS2J14kMoKjjcIN8utXMYpTWKmAwF4uKAGdEHkKGYdhTs6D3DQBN/GWytzIdKcREYBnMsKVJ5bbIuYsBFrOu6NTeYGjFj9YAp6LF+xhkil6f+PIvsEjTLHM8MJsj9Ll3aj356ut4D+z7e6hBWNtUav+BluoeCuqr6NxWTr/q2fyEsm0xMfnwUoK+VjRwp8CuPeXcpnPzm5+6Acg0mQGYQ5rz8KSolYkEI/1oYbI0GNswdib5Q6j6lB6txO8DqwcGBZ+KLu4FBDMEaawNBx2L7+4P/U2a+ZmFEzkomMp28WiY0w0iiKlDBMi3stE9vVIMXAM9NLvtsV5c+GcqikOVxq7lkDFOxmunSTGTOYKafg1nyK8Xz7k/vwJy+csz+eyTzBx9wBK9mUG4Vdiv4012TYP0GW8WeinJ8uAVAcw+TUlc2OnmY6CQ6HKA1SOjjUpx5Xvzc44naGKSqLqDW+dZRqEhaH+FrLkaONNo6uiSV7q1wHL6Zf7cQ6KaWl7p4O7skn2GALeCL6SOaE0RQUBmkHue9Uy+rY2Jk1xdBNdHB3yWwhAqkA2ITiw/M2bQlCpaIJ3NAoeq8P/N2p5WRrQDA4cW8ZZjjkro/Hh76MuIqqpDJmCCAKDmpUCgJypc4MZ4DtwJW/hjqUvMCnMxmEBU2VwjWqjbtDenAlDA9tYGBr/BPKGCZ0+FIvve8OkwKM2adwoywKpB/fvbfaWBAa1b9/xNpntPx914TwzQmbQRLXyMNPhHQ46kPOVguswCtcz4juDMiOer0CgTI1C7N/pii1ikNwnJRgyAoT0DAjoKiPd137EDOkQeH/Hs3omk2po5nX5OOMGn0LkvJgfCilXE6k+5v9a2wFNPuieezrUtH5Dkgs1qg1cB4DOQsaMLiyfNJeujhd26Wvww1MqD8v17TzWjlxPvjlZnOSlM4UzE622TCVO++fsX4s1J5obm7UzH/zmeFQbHWxADn8KHbLFiX9llgLS/akp75slzMUcsJ46N1OzZKnnCy0mDPzKDc4tK03IHGKQzZ0rh+hQl7ysIkh1Kp36xA2IGmoF58VWlbbXKav6x/Qw6NzTPPRZMP8/Cam8R5z7w5PCoP5+jD4i5PxBMl6Gn8c53EGCAKxK6MSSc+b1pcg3VUgkTKESL6ANAaahut9bHaciVnKvkswo8j0bXL4D+BlhqnkkHJnqcKRbjazFFO7kBBNGe0xfv8+R45aijwaY82jl5zdkMLH08PQG7QH+emCGjAg08mAGNFQzlPhqSxWG6NzYWrnCAQY1B6owANeVMazwihVOMEsEDg9svi2qlia31KQp+MKoqXFjvvwWXQVl4ONKpoJpE+cmA2/XH7n0W/5Jzt6ZD1+mbBwP23+cFC3m0OPNoxlSgtH4FMbIOxzfaT/KP2Y12lBKKNG4HcP9Rtt+d74GnF+6QSCuGaMOPBqgaoXgcdvhrJsqDMyCqLp9jo8UVioWCiIBJfAzpEsPigO1CzQOz3RYgF6nuvWIz/06E0YBho7KA7ml9mUh6MR29ippgiplKcN9lo9OCdWH/X2Qm0whcS7iIwgq1jAqUbyI7kWUfGCAPY2grthBJzADQePk8ADwP1OoshAzXvlftIzJYlkYbhhmgVgmkRi1q+0ol6yS6P9t5KpVEF4Pnoc4grbTDSutLDF9ERMtQGmyFfsA7Z5mf68LyEcYh0HoRehcMjGQzc2x/UdnVI3x8X5YWLZexlOxks8jIAFdUHo+fjfc0APwxGTrnuXO5YzLGGo9sbOvmxbTQoguplp5CEWlnHhGS++7wCby2JWC3x+ocHTIFYzLP0CgltNGkUuDXMD9AXiNeeZ97XGAYeuEF1Smqn6qaFlHoHIujs35oVwIDNYJRvLlwmnumrfpNeGCSxfItn9CWf8dtSqHNcaPu96SSB0btCZIlPgGWe8Scut0KNd1gVqYqWkyuq/QHbsLuZRfBJx+8mIPV52ueOeBFQxTHLCC9ycmQap3yFJBVd9MAXszWxpWTTXNqjYBuKoszuu+h0bLnSNuhjhUImGCHf9/CPkHJV/GHAugszIEhiCSt4dbVNMGzCRlslJ+qj3JYUCHG70Y+Q1SpniOTNhNkXmbWlWeJk+s6iIwTMsE13B3Z7a4mEWuxFdQYu3XQvrBKGZkUVQNby55gxDzwKqJTRrXnyuxtpjmtDG+iEEQpTM3oHhDufzWoIaroQqHBBSnjBgLwchPxZ2APaVlrFQ2uWW2dFelzxGC9ngDh/h9bk3pmDTjXC0XwOLZjI+ZaYOvSbAOJIsZpyg6GIyFoBKpXBfC+RjMq+DDhyHUU0wjVThkPdQ/+MsvQyL8Rle2zBKvTGIGKSZhLv2vsxuq4luRh51WZXtE/6BHmwWjc4Mz/OQCuAmEATkRHwhyKUbHlSaCH0P1HRl/O8OLkF0IZMQhdDpTFEHWJiWASRIJj6GU20GKElzGOX8RHoChElwpSgCkDUoM8N6+Eig2FxVhvlA5rKLXUaGjIK65+JiBqA2aYnIcnpHhYjYYip2kjWByRc/M3PJ3+yAoAINoCIBMH6vLyMgykcQaggQPaBLvmRYxuEx/N67vaPpYRMBonn/P3ImyWPARs/yJVgaCKNQNQzDoIO70mpmgdvKttSQBMFxYBHLq8ykExS7Cous/78BRzH1FWerrSZNOi2EUksZzqVyVEsyBuNj0KizgSgCWrOz2f5/lCICh0mfKmQvSGciv1bTzzpeZyTSmU1lAFzBTtHvU4J5niRZs2nnMORPUJQIEAaojMfg/Zf757oOD4jYK95w/CINLV9B821b/43t+msVSvsH5E2Gj7ZdviKlgZh6SjrIwBhUF0EFF7q7pIQikhV4HK59yqMdNKp15oW6l1MMzZ1bpMpLQZp/IZsJcDxACm7lgE9MU4+4BCRh2UubyVCpIgc//DnDeF+INs4C7WHUDNxfvzqPMgIFv/7xOCmrUPef85rKbzX1qjmBonDQGeGMJ4jkg39Ex+3Bx9kRG2F5v5E+PyqArA/VVOxIQWLxZ/M90W3c2sj1zjsU3Gy7kmgHerOtxJqHmJGtpwyrbWNrkNFHMqi4G79lP3dFzW8Y9DrDlsxrtVWsuGBo//ONZkhOf4Om+WjCEmsEvVpe2ibXJlA7WFb66sRCCbgYLghPyNseHXnmTn+mP+w3zlmLc4PO69FUg4JYxXEssF5JPm6zE9gerdqXzGSUBpePXk4SI2eHGnUwkZjGcMybW3Yht97hkwxFwxjqBptkdO8we8AQ/Y9hiCWmpD5awIZxbdXAiL+U1r1oxQ2Y6r7MUx1rOcPDjyLvDP5q9JhFvCL2LN7sf4LzPRvos2/UuKo5ssNslKzWpY0X0yw2yksnmXHKySc1E78LyfmDz4MFhDHLLztvYISCY2F3VL+mYy0B+wZQLzJn77q/VQNbOnOwQU2nyyFT/wrDZ1DQwG4Z2dMG8n/AnCu3bQRakHPe4Xwuywd9Ogs44vgOnbOKPPTjXbc2r807Mdf/VaXwUOQI0VtzY7YyAbZS+V64pf93z0iUD4ozn75jUfS//WTENhLmLGMDT43+rVw9VynkXtca8vh46YzPrdmXGkTcPIA0YD7TOSPS8+NlYijzqEVfMyowNNpTWojVZXkl2STN1vHt0Vihzyd6ISKAgEYC+D5txJdn92PhUNgUZVkZMGGnn3XRBdQ/BpkUSwnxR2G46nH9ImoGH14bMm5suNAJXpBimzmKyslicA42CUrOKoqN/1GpfJZoNbU9xSQIYzlpxDY3iTBEiu0exRbqmbfZJxqRO5fxQlgg6aCGvxzh4jLMUwmqcq6g4baZ+luKGotUrns+KDoQbMWd/0sarOSiSCqNcFHUilYxu3QZXXsk9UnKQChOP5JB2tcdYWKMXwDgSbCo3NOobIdrMy2wyiz7A7VFVwKAvCKOXEMUeeAfso4n42diaocXkITib8eaQSjpCBhWAFE9TpqVgTjxKHyJmhqx2o1fxBeZODtiAN4DKL/ykURkYhQpcWou1fbi2IZ5ykIdDzwQY9q8DvAQsxQTMUUFTg5C5J0inzJIi8Pn2KuXt8sD66v0MSLJ+p57OyPZLgFMFPes+0hpZ2vPbO1F+F7HzBfOFb6NYgKdgy2qFXehM0DqF2TXouoqZI5ro4DqlryqJXjP26sqyLTgfB1Qn5kKHsLsQk7jDCS8R2Y1sE8BmyY56pot2IMZC5amB/IdLkd2kG+yQbjiOla2AdSEw8V++Ozs9I0Wb+wA7Mu562TdHqmJncoJhB7/5vmFW0bBQ5vQnmJdgHlUwjr+c6A5oDCpXhwrFGIUWzh+vfKg3BuBrGZSa5dxxkuH0ckeooyCI38tg421aE4wLOAbmMggidp1NFRW7rWA6MbTEXjrndEAipkkPq55JkaSia0DPRg6b+wWgzsXBCnBByk6CBBJNwMHC+Ywc3I5LvvLdWQF7SEN4/7DXEZCYvvfFVPF/Za5RApjKdsXypb7sud28zjtxPnMOH6IjekoYHkGp4bIw6okXzgTmJ4Kx54ePKjgziJmlfIoK6IbmS/vH/R0oEDrPpM8n2lGMYxMRrAIWUUqjwCv2p5zweDhLc/A1rX5WF22ozP0EwBw3kJtYxrhgoN6l8oN6yFReoy9Frzr+0IA0s6g9jkwMXhUo+tOqOtKMn/eF4+3DuDD7m0stx/k97twjXT02B/8G6DaPTqa5pAn7ii7ITBsaLHC7QRnmRX0EOmGfsKXu+/BxhSmmVTnxz9MW/q9dOg6nTPS6Pjwly+jgqM2vil5mvbn0tfjJtjK/SvZkRnC0y0Pm2xdnj2c+ngG7eIIO7J2DAiJZKMZ1fg/PH4vJFxgMC7dJz5/XLqdUR1dm3flTVYUJ0n0SO3TjCofJcGV4cg4d0OFUkApjD3Y0ncr/2A4NojSUbe7xdMeBua+ZHTNWn+YFQk6xf7h6xSbnGvXnbv9ntvj2oRqoAIStYP3UMCN1gtUjzXiDuT03n5KBMeofhx5OPvfvrtBjf6tdFIlSablbI6/Sv3O+9tl5gRGCx4RIHaSBbuR5Siv4cuCONZMNuxVEnE9R1khV6V76rTlurhR/q1clUcDmmKhwFcdcR4wJSmBxnMDzuVHbpjOstg0vPegJFHG6GrM51IenHOA1NCT65K10SvT2BcMT7epMcYqpqcqHlige2kDCVAqUB/cmqAzEnxpFLp8xK7XlmXzexdTooTe4/oPms/tTyf2tCi6HaAHKZ4gLfmMk8eE02/1TtAhmxoYOW664dxVCh+DwnAkGwNHpAMhtYACyhqzPZ8JpUlpVoSWoBGwhry0NWDqtMTMsPlVk8BqbCTnVxWfEB0feXN0zW5syQhx12yMeS90yf6Q2F3cI1WnDhwOjAhxmRNOuA5ca9dlSRDCvr2s4JwXgSD/XGI4h83FCQHcSEeMbDKGXGfyCrrKeFZPy35Tlg9uB+c3VIR2W7FRoqFSQt1VZwIguUL0aeXxTk5KUL4KMFJiQByjBDdZ0SC7R04sm128zFx+kQDBsCc79fffgeS7sDuFRpx9hWmdSIgjhuOe4nut68ulQsZpP6nbcU+TehHB4CHCvv+qoR4kWwmln3zG2A9Yw47oW8VCdSY15z8pJ7gbBtC1Txs8XySxF4jTRqbe65CrVh2Zo1Q7/Ya3q+uzEOH/QMmjPRyPvQ0pFWFl6k9ICp17/Zvxlixjed6ZxvFXsWigA/owGoMK+pR4P5K/Ob4pUrdQXjuFjkAesBhVyiGsw57Vb72ePCWxbp1DldIxjeaFJCjA7jztZ/dfDk94WnlrLNLPqOhn+eAovK0KayHf3uBdZOpS9KHPetCXVZvbD+7zXpV7N/PxYvA34mVs9IiV6EpairWDSY3HLGnWBEgxwpPMW62InMMl150aI7s7AxOQRSeG8YYFRMENdmmVrOJ7m9BOxLbbNKvjg+Bp38rr1nFhIn+SxzVvq0LbWja2Q6WhpGc7xa4CaGQWvskWCjYSkPF+wvvIbf62o9qsqmeWxaQ9yFiIy7uonzI+ksRcm/kX152SF8+AtYtSjXX8kfc6ZYTM0dqHEzMSaNJ8hv7mY1R+D7PNbW1Ntm1mXWFiQexcNWnTGfhNDx+bhX47C1y9zKraxKZTcvEvt35qorK0TzBtYT7/n4l4PfDgfQcHLK6gOtscnAWx07Wbt7qY1o0I/CHhMqJgu0lUj1gTZLFE5htFw1xdlcnGkA5AyKoUrpAFrDUyvAi/FOnFEDQhlIhtAYOl0yDphklS4PRhxT6dZZI0Ro0uK9KJRmizJcL/yk3Pdqmb1UcvJjO0TnNW8mr2nYcp9ekZvrYkFgIAFJJM7ElRGcELO2VviQCs3p1387+RlyDRY5tzYUVbIB3pH49aYYw8CRseKhZMDJ9JNWPF4HRMedL0JkOmgfEBF3Jg0KcR3+plJfv/66+EcsnFzlNCydkHqUIHPz5l6dRWxKy9XHlT40zZ19FXe34SeBFmY74TnPQR3TsEPIDx6h8OB8VBEBy1XUHxUY/SgXjHoRMHt+XjFSc68pMBb3+WAGoGU86mK4dEGp2ALW9T9k8ctMugo+LmDv30/6Qx8dlseEeepXkQGzuqVmdO9d9NiI2/BmwEXH0jtPbOt28KmmmK/fufx0i2x7Jzs3XQuxxmqjgdsx+KfmlDeOrYkPYErezI3/MpugeUrN5EhnLgL2QfJ9Xe8JswTM1gT410pTtKJ5xWvGZS5e48vygcgTjXO/PNYV+hqADoH3dNyK5torMWlxoxj0gXLHvqYazqsmoNPotOPT5YHcshHexBFU9FLv9vGe0VsjYy4ZyzhIZVS3roIhpUHK2v3r5JhrfoeGhMfz1uNG1JC/T0TzJcfCwIYpA9IBu5GVMtAMnhF8NkJ+sbLvT0LH2ywQFRdoNshPTggsY8TBTa0oOh2CefuMG1gJlXYEBFz8KlH8pfjlQbfl+fXCoYlfS0LPXfPK1CHVud7umt5wZCZrARGu4bbvgH54pHphojSdCc3JMc6/2JknIoLJyVbBpWDH2jsWxhnOhvNtCJwEYq8N2LHzSyImQHTZtAoWo8k6Oh/mvgrJbmUtEcZgCavJ+qHSUGZCckVt+DZw9sXO9OVffrAXf38eZjg+t0Jbvq+aWMjCnwj1nzz2vXY6v5bIYsZ2m1DIByk0PxMfNmDxsCKgXR2nfSycJaEKKmT9PY5YjLdHHApsGyWIQql1VYbWw6X/fpGbzOXANlZQ762CgVnSVdTHV/+6UuYZo8o112Vxgw/dwLdD0Nld4vmrYuksxcAGyl4Ilccclr3bYao9ElPPEaBjiF8mGzFphwf5jaPQg2FouVuZEN61CnHOYvmjq2wYO6cRRxfofwMh9/EZ2F6N5SixCYo2auoPtQ9WiDFKa5qM42dYQ74WEnnLivlqcmxDSG2uoWKgZEUOKEaNrc1lgEUK6VEGoFlIvApUM5QUJkn7UDVkoSbToy3gC12RLJAjgWMTueU3lo7T5DzjGtjiCauRvZDcsNd7wnzxXTWxC1OHh7kFdudBxxT2i87UEJuL7tqrR2//Bz1tOtV6ADYs/3eyb+vKCv5EeubD89ULfs45fZYUt0YY5/vPPt1bm75usAXIJFTYTF00VcdWlQtO4s25lZ0/VX4pdUIjEVwbSzyB/3clsLLrNXDhRcIJrmoystc9dN8bRnQoy7F9s9fsKGMCci4gWYmUgyJTTb/DMKH//u7zz8fzk/MnBFRVj3IVDLxeRMfLbgWDONJYf6ikdQ0j8k/Ai9XqgFv3hwpPcNmvsLf3IIBLrda12+ZtBKz8OSEu9f72c7+l5sO83yCxVXKWFBwCfRzE59X7kCRdFF2DZqKmsKHf2HXRPzdbe3uoF0sZQatgCqnMCnu7vCcBrDmWpLYl9IHU1JYXrpBNxkDOAliq0QvdbL31mh7XxhJXeMueEnKMv4dx9ILRPGW66LaeJ2DmfP9CXoLgsv+Gz5vXx6NXMALajP4QaeMSWu4Pa8v3gzAvkrWm8fHLLt7g8a+eT2pYu4VjHnQ53lF+V3W26Ciqs6xqd7fP1mzVp9tG7KfaEgT7T/l9cc9FCFiH79RVZaSHJCCoJiUThtawgJ+8a+inIvluvF+XHnYRQWvoZvQAo/oPd28rb9u8W2LOwXSEXCyCVqxdjR+FHu7RKvCCN6/Yp8ZXzGHEQIf7LrdweUyE4fzupRW2zQgqQVn5LGZ/cPk9cwxCywzNE/aNt+bVLMXp2OjMYeP5V4KMHr0kMA/Z5//cLrxIflVw/tCwf5354+k0hBOcrhUmzo3XEJZ9j6Xc8H/jXMA9Crifakatr0IHoBza+1shssm4OSvNxZCzn6Q6jwkkAGu688fEbfRVKz2NSEvP87TvXLSMyOED4lkb4ObXl0jaHSspdEZnlwU5tu5km3Pofs353A7uUXlEV8kCBc+qt4wdQhEYTE4zNBdW34tbili/jjVlhoNLPld5Ale2s4aNLsRBGA1VjFYSmZ6f9XiNtBjTFWenNfeVls2ITPdniWls2CIlZs1OSH0zB/GKXeHasljfyA6pauhm5/915r4mqBVAubaPaVrV7eiynGBSaUuq8tTK7HR7EzA9qf5kR7hzGNL7PGk27FTgkcr+ZnPoCQ6PmEnsheSx90O65snorP6w4+TJM1q1KPgjp/4cjUXU1W3cy6Txee5p9kMjUV8oqWYAT0++giP/965zt1ZVlr6vlO3e/9lUzxKc+63RTXRiL/mIrNy+YwAgWEnC+wMy4uOU2rG6+EymmBgikhML8zmeBcd7eQBZM83mz/rYDhFA5UQm4ailBJTCUUuBGaJL4yeo8JBK0TT1Ty6htETcRV4Kf4SyEcCZgUgJqUJ4SB9uLhSkrKoHdqNZrBikF0E+BOl1DfXUxRICo5ijE4VDmZDNE07+gllJOPatx1wfYDIgp06iPGqeISLzsMlNa7pq8bAJ+ek7hF0t1ze19yyxdGl06vktJVT2k8OfWlki06ziOS6bD5kJI7x8z2z65AkpsuMCXr6qVXr8eU/WkjpK5KT1Vks6TXr4Zy1wPuBuBSb4w942upT7ZudsH2RkgHvuQ+Mz8msUr0C3y9QGPf8mfa7knNzzi7xYNh++90jNrbkHkjMauYgQAHhG04NSgvOR49lGgsHAJ6gt07ERkUaE791yHpYkBYP8yM58hWTBCVtwnW7nglrBk2FzH6LVIDeguUzXbas3dfJIDfwNiu4ZsPzCTwxYneYwIsj65kosFs92lo+iWrbTDnMfqMURc/AcDdj2tp9nXRygZwOFwh/tbSiugFWD+iMvG0iDuaCaTN5U4Xn/rBP8KL7y0uzkLiHT/nkSjTsOycF1645ZgncqQbdc6ta+3X7/cFls8HBWD9fEiJmvlTWefi+7yblDQ+J5RVEmjv7oH+cEBeRgQOGAZNBe+yPDqmBncJRWRGLUBUyzIRLuHjTvV7RZGC8I5PGBjpkCG7facclQrCLY0SpX7gYBPIAkMqJmPkYomVpwO17t4MkeIk6RB0/9UJqAUy8J5bsqj/TVahjIVaMnyG62QwibPhJTR9k0v+s4It2y+kGiplmaDwRGABlIau+FISv5bwIKTSYYmOuSzf0bCFn/PIA+LYVpZQEl1BkqA1HUEaiCoOsMC0458k1jN4WjNqYCM8eMq4w3hWbgIlrXPSDbdCex60cDWlR5h0EL4FLcBfEjMEYzYOLgVaIokrYvhujn3RHzHSYC6nBWNkVAmnFBGUiybTh0Jy1v3nAAP+e76gcx95kaZQj5cCTPU0M6VgrgK8ZZhesiTmnYwkG2UTCiDTusT/NBvTi4oZyHLs665XCPm+FiM78+UpT1mgm4jXPsIUE9FSbp3T6ccx6hEEfzHY64wCuTpvt0Q8Kno9FM5M4JWkcKAezv78POf0U7/7HIOQX44jDdWX69noWkx7zHV4wXl0Bg+joc6NNsvrqH3BvyHILV8SRN0zgFpuFfb2P+VVtQXmMaqMYxm5C8nrpYN/eGgY5OGlFYSpeu2YxvDBxr00QzZHNniygfurcfVNUOzEjlzlocsGxWxDSwxxYu7+TQW6UlSXw61Z/3GcUZsXQxUtaedSdIxeFPl3wvIGQXGex0ssLJdnzDcZXP7Y019W5uEAvAXECZPocwZcxvixX7dUK+8MWc5QLSc6IzrGKBU3aIiXYSQ+8MfrrP6+A3mHyIb72L/PQvNyb3ujFnsrPLN7PWzGg2+l5Wqv6HhcJkYIIKNUpwSqI2xoH+P8ypY/K5t27mcJx3ThfGa++QCIhXiDMYehgMB6CsecbtSXZkLQbbtINhHA/cVy72jipOryqdyc/s1qZTc/WC9+jp2F5Ca1t7t4cOjmffFTAjucjmwNvjc08KV7KloTGinkHbn9xnD0z0aXwFmJjU+s3IAdAOPRPbfuCaCprKn9Kvo80K9OXMEHdScEY/VzUZa4JZ5C8hjOgbUi48hEjPOlvJ4Qd4xLALZDRS+lpLsMVv09D9lAkDaJ71dT83Roo3bBnKNxzkZoYq7/8WSNtgq8VNomPhFA9rEd5QoC0KIL3wxiohajQ16AWFJ/rAo57ZA/g62P+BLKsKolgJR3GEEInHlLBRpFJuHYk3Q6cOkPFm9asunMn2N/v/P2Pbs9L+3ZW/gXmC07d7wNfvp0RG3q2sqEsSauZ9fe7mYVM4E2GwI9rWeW6CWDLGBLjz8NdEh7sAp5xzv3GEnztbaTwnoceGKcvMwt5NIQGwm7l5Ub1iWce77k74r0xs9tQSr253isuzDTHyFVhlYKpwTXv91AYesxvEeZED2dBFoUFZuFcbU1atHgktOeO3AybFKaRCKYv12NCTF8JByAI5QwXB0MhGpdaMQeltInBGdUzQDYsV8vhIBGXCWtRjkW6pCkHCqHYTKHbdq8lRTLfSJduPVlCezL1r1YrU7yS6xbOJkqHDhWfFcD1l3f+2FhaysCKvDVJJvvREYf7DFARx8nH2fsvdqz/ooAPhOUi3PzUzC3kUaD2vHRGOXXkvIkvpdM8js9LmTBWwBJNunS/sxp4vHarZdr25H7BkRKo9yExOIs4uQuh36Xxg+ZLAF25B0H5pGR/pEXEc/ZzFWOSV3ozBFMeAgoQZBP8szPkh2FWYAYqRAcojbzXPJVFTjiQVTzV+kqaSI1k4xUUHbvAhEC6UyVib+gZS2TJ0e695d+DmjxuJcAAyjvihsIIxtg6bDgDRmDcilYjJiNOASmsXuaKQByzkGyTBQkUnLcWyeYSo1j8d3wVcDCybBPIOmqfwZPty+iEw/eZprp8yxa4T7vLyhOR8oZ+nj0krHr2NUF1mymb0WaUINhpSN71feHafR00ckGtDmFhWDENr8oHMZT4VD6lLlVL1jDAQyAtQ8J+HRccMhIaJUDKKG00w8WyP1M51IaX5VjdB3QOQQbs5wskcRzZ3mniirrEiTsSX6x3GTZoKiQ6rXIJdhuSz3Fbs/5APovcBIM+ZAT8Vc3a099VUXBvvaxs2uQAz9mpkZuWjk1VIvptE1yKm/nOJrg1Drb0Bz0yqh2/G3wX7q/ImFqChu5wTOiCW8DDK0Y/lXTEJpYfEv7hKuV/mEEo43w+qCdcniGHSz7s+dn+ALRN/6hf53ZhUkir2bBel92Kc3P6T5o9gJqzxz4J+IdpWzJqFWmn/3b6vOKWGldJYvdcA+sKGlxVInu+d+ZAgve+xqKwC3uTjY0oNseyhTP61ydZZ0liPbXxId4GsR1ibqVRaH+pWsTySDolikIH7YJAT3paSOPtzS7zrokkJ/xSQuNL4OLa7DQMRnnIcEmRy4lDtHPq8Z8FYMYaJbGCwGEs6rXdRymHmO2hqwja+mPeyML5DOzW852jN+t8xpVCcCPUUj9ZeH74yfr7dAVdxCm34YYo3k8RpY2/ffMBq6kbuCLXnF4OtfiAq45i0j9isZn6wN7ueh13lRck6iJnIQsE584DG3fSdzZ2Qye4lF/4MA0D2zuswiSXVUH/qjHnAbO22bDy6kpbCZv/cXSNKiNwfOXyJgRFmuWiHu1Z/pLoqBn/cvkjMB2Sf3Tf1a+YxsGgX4kOx+nTJrQSKlGTJDBz3vQwPM7M0KElUhX5Dpie0rk1MbS3C4CM6Km2P4F8lpw5Ru4fh6rw5I5KnPP72Pnfdo+7x9WbnYHcy0OfgaCa0xqigQ+Rbiy3YUGFY3LQJCIULRaawERqZeiJaV5qfZZQ37ZTqewGwg4BF18+CP7xr/JgHwLT7tWWCjbNi1b20rAeKWGSoh6WS0XxNMGgYrhutE5PChX7w5Ue3qU43HWK5YAJLd97H8aS0VKh09M9DhQVtz6hExzQpfoFhbmK7IfyDKJeilSzKlw/jaKpGKJEUhlDxiZxrYuHaSHtWB3ScA2aykQEcCuUoEpgC1lLEU90617VRfRBE4WSM82OShLNi6VLNu8poV1deK/qxCwzN4lwdWexiyqHuMV9URzw0Gl8jehfI9WTNqWNWqC7fm7rCop6Dx+dEmq29E6Brl6YSyG8+PDwi+rt6KnRPYeW3VhJJV9YnAxDTuNIfHMrjfiobvoX4k7wBd81C1npbWNu/9J3Ukjjlow9Pkc6nsr4uICqGJkwdJhl4YX02a3XBTRNzYTOCp+fEh1abRDVuiilCshdKQiBCEmFgkrTEQ4UyeGhJMU6HTTXEySBipQ8ot2I5b9WnSYHKpAcYTPzQmhkQpi/l9my4irPm/kaRQ/lLxvrnh64Y2Vf0KLtkwwQhRvoNvbyuMRVq42EFdZrFTN+y+EaT8Z37c53zV2hh2ckkfwGceTIp6KUm7ucgV4HNcdWPuX6WT/fJv+xA//ezYVpg82Vgl/mpgT20igXg9wpaNKzoAL6Y0TIGi5gxEGcYEEhUEQfcIPNxoA4SlC+lcHacwrhur94k8WyIC0ul4h/Kg5lxuxVksmf7l5tGBcWSAtx5cq+B117zElVrPuDNEwwR6S5VrvEz3oXfaRGVAMuju4eqfQ/8gnzjeW34V8Wi+tEU/jq3eQKdvf6wVMGVCzp/NpcwbyV7JaAfYPlx30f7ru1kMn7xTVZfX6V5CvcH7Yqni/huK5s59ut4dXNn4Q1bbo8Ro5J8hG7BcnH/bdo7bpcJrlAttgYKNGaFSyThfVGEzIczKo/45ewoSdb3pYNmtxAU6E8dOHHpFCGg9ljSxrNIAy9WfLqYtwUPAZwU9XdLCx2hWn9DGPqHGmQMle8SrMHPylSOccIfBKRteobnCoPJJbcNrHJLwG+QrR2ad3FdkLroKCJmLMsC26uj9nefZe08bL/T4SG8LOWJITs9NNCWVV8UJHIuD7Tb86inzObu12Jmd+yWKTIxGyRItMxDtlubgoYWEarvcmoX8h5rY8ykr72C5G7xINxE5ARmU/6xl0R5CQ5Mil9RgGC7oXlZT+K207RLgHrb0lNw5kArptrgmAqoOR18EqS39CoTX/f0QwKJ3JJYDyFbK8zS1EB3IARtHBJ1sCh+ChhDtOEHv16FC259FiFglkgJXhD6Gf80hCO6Hc0qRP+tB3BbUHS8Z50ugGV0ESHPKZf7TaEnfGcj4htEmFfPk6JgmEQzh12cvzK7Q112Gh8g9qLM3y8ltAThIXON5OcgLtU/qKwN0vd7CzMZDaGlM7bZzI27aSn5sJGAA5UsNjo5awnO43Depj75+y+QiFZ78ozzHn/XeT4gU1AzxinP4Of5LxuzdSwhfym4ieTOvfV7i3DEE8l6+HRU6rVIZx/uH/mhbb00FhbZpmMF/58wCmGdMZUi/tIkfv5VZ/kZ7iJSgQGTcrRiw75rzbiB7cgeMmjEtxFxH4NQfUYTYwGriEPDt+1G6MZcRliosMcRN4sR2LcjhFIFi5wSllThsIEl/hnvVb4OdTcRLFzSmoUQCFAumTLmhLaiYUXqrSvxDM5rkIWUVBd5wLthQ34YfFhl/Av02GRIXYGlx+oVAEbnSTkbYlkJXMX9gxn25UrLw8KeffozFBWx4S/I2BK7Qzu/eP/1aFFf85muCipFY0THh4NmCuYpqN7FH6S/haon239Tq5iuBrF5SP6PhwJnEtnTNMxhCWj/wNd5yZmztj3p39vPSmgc4pHHZ/J3KV3hCqMhqb8AJaMDELNi35Pn111nU9XVXRtLXX7DcLzcD1E7mHYHWOkUb5hqnXE2f9SxFTKhPQdORd/N9K5T98SM7MAAcsmWd2iUtOEHoN/v0PfwIeP0mr5uPLStWUs3KLtDuV/4bg2tnP1vITQihP86nhODiPcIH6MnoaJ+u+T+/bl0MmJbW6PR2ZfvD8tv4D4544R3+99CkxcNhPkNvMApa+Qdy9DHitcE5+7Pzp+1OeiCb8FPdx75InNWW/bzuQG9yfsShCIubIVEwWfP3b2fhLWTijPYsw3S1GXOyBj87w0H1Zu0D17yI124l6Hey3bLVwPjmz5BG5xpnvf7Mf8qglB+Yw2M1HTQhd9/VzWrO9YU+aHd1fri4zxmxwt+p90qxwrNHl9qe32Or1eOtSmymLb9LIX6DlI3vJ/8/wNSQxyEdDTdtZTqSMyTyITfcgQgMOW7jnVtrY99pvV4+x0qsZ7wVu1m31Oea923UNfCwl4kyITWnv+fogToJY2XTMsr1EDQBd8qCRo7dK9ghL3inCuyX4aA8aiNgHRYs/TDlk5d9fDD5y4XPEvtgxofwf/eLNrdtYlkkTTJqm1NLNnUdFBwAM6ESfh5rK6xoGM/ZW/DZkTMQiH54sibJe/wdMqaDppE5/iIVEbtu9OTJNvTGzQ9uqfbrAWT9LwXlWd10pxjopO9cwSJIbFmwTrsxegNXt6cDF/hSioRYuGa8PAz1IXAmIMOXdhT9RuiI3bk8NgEdvytEIB/pjgQxLYbnQGyQEsB0aS35+7gy27jYgseuCpTmE8lmiGi4i6q9XrQgzdu6XJgiwh/Yq1a07FVCdOq6o7pkiYEap63rn9QEbXBox+NXH8WNOShS/Qf0+3EdMKkpp4Pc/sgWXlg8m4U3Fg8lEMyoB2Ahb+O3xNSM7EY3ujAyybmqMHtOn3b/3mi1dvBSRxd1YgQa5394aN6EpfGRpE844JTFW0SHvVVgm6uIsT6VETz50GMY+SjeG7cnirGTCH9zufM29OebJo+9ARBYCBWZkzUOpmAYz3ODTbWBcBo+yY9l3HfPryCDkoqH3UIIACHE6VDRQU/MIb5tP8LoIgnz57fBvvc0G70DlDaEFL5dfPxmOPclG5/H8Z2/080mBfV4Js9OMkUUocNsp3eSegDxCqeYzUZvs0fscSYadDbsdYdUwe3+mO+ap8WjLVe4wxq8XTASBLskKzkEO+xfyH8MAR3FTaSt+PUc9ydxKMCcqk903Cy6gb7lW6Y9xZCY/JdckHJ7JPn75PQhl4xd7hTZzKdDK725c1klpBGa3IHC79SDOC69KEY9Ol2pSNvd5Dz0bUzRSQ9Lkyj+41bVOR0Iqy7SUXoTfAKx5lza6oeILtg/7Ah5XhLgeEnk5BTMMYjns6821YL8ncOf8DHqDw5hA6xAXi7oMUUAD61rgqJFdKYZm4jlbmbUTSJshZ868Xs28T0VkVRisL1zc6skk19aMcAnIvBUyMY+lbr4p40j5CM6G37RBi7W06Uv8WRrszWpW1iW/z4q9NAUvqygzl5rChkuZIR/mKZdWOYW2j8posiWlW73yDZ3o3YIt0H+P4ovTxoEJwXHVP4DLgDZ9T+fLKtp6KYw3EqCBfsKlaXkO2sZT7Aq8DRItoe6mFzmp8sRypz/v971k41w5qwMVjFL0zAsV3nSOnp3WbXS8nR4uaBKKtMRkRMS7gVN/xtPpUvAJ9rpVPmzFScYTQAQGHf4gqzw68CMj7QCs/AWvonBYrP9FOJhxZfTQeg8I7o6QMm86zFU97+b+vy8lZ4tBR7dXMzh1H3UfbwhC7p7dkJwRKJZMyt6dQaHMNk2TLedeFPm1EV8Ahyk66/9Q5nbyFFebviottnJUijgkFU1z/m8XOzWcMPIj2Kh/9ruWwmEc16CTqhvrm/YEqBMJPZBwEZgc1OLtyGFPVFPlfa9cnbNK4fnXlzcsTMDNL2MRUPw3G2608y3Ud3a58pN166zAtAStK4zYBrxtoc82ETIvj5Rz24j7BVkNfmCCZVwBQrpsY3RI+uS2Xji1/EpLGmXGEot/GtGF6hHA8IpK4ruwhXDuzyTWwTsB05SD4RhnzVyyd1Xw1vWQpOwr6YaLTg7mEQS7qj232h6kpYKrdIae8LY8MK5eOiBzS9kuRWR8YmihaClrFtrES++Xmkhxv9sKI6XoX/opSiOlJlIjZgmIJ3elZwkSHxHrX2PiUtaKpYm8tk6srlkgFZFJYYBUVvQQi7vQAbzJnXTaDIBCaH6aW+VQ5uLzXBGsKWvCYyIOxAKtB+JbE5ZIbBSTCTbhaEQVh9iEjTaFn5S2dheszS+oX+cRrT0904NdiJn42gHPGVeSW4cqxHT66LbgIfJukKeFD/KHUAhY/S0oYMq1Cw9wapFc50THRLDVAdzIL9fdZ3iPLlL9pE1aN468VUmNCUsRHTizyCgio0XEVZnD3innNYp8VQl14kBT0HF73eHZAqKQLI3GJt8zdJ2WcGur1eaPWKzX0h+3+gV5nGXNAiHxv59ss7OsnxVXoZzK5KXoCyHsSEE/x4St+N72ONStuJajKSxjHWmCAnYOXRb/hu3jlzDdweRkYMZFZC1QjVGhlcEQG5y17LPc3jFVFGwsayF7MDh6gjmX8JQYh0MXX4EZ+E26h9/GWsMQwMpikFwmvbPb5hdw+M2Gth5j1365lo+MW3rXq1qZCz+h6ahHoN52PJlH9hIfFzOuVRA5Uf4U7ToC7ELv3XZvSuSnD4TYyX+GWeSd+iBRridMdPBo5TZGACaT7ePIlFNRhOOXYAUPkbBPJIALm+9Ad69S4Thep0VyaaEhWV3BKNNGRi36S8oHLuWNnsYVPhaFBPFeJnGtSBOghcSL/ON0lUpMtveVtJ3PhoheczCFTkrWP960XrL+n99O1YtnlpuYq+/LNf8lLzJUBMQeIOfYeKutcfckWD2bOMwLgF3FY8r9UzsszX2/gGqIGT3LfU3Jbm3eoRQQFCrg1HPlLN5fitomjksn4Rq9FoWEB+60CMSEpNYmEElGVJaQd8mKlT7inMQ6MG3qf/zePbjjX1lJ6Bazl1a1UONR/rFHjVmGdX6norJiMI+IoofekdAAvdwXKMy5lpbcJXyJ7yiHAbaei4CZrKO8DqtOb/5wVhBbPCUrWNMO0PxNH7CralEmh9tRsComxHZuT4qrOZztrbB2dRY5tFuG4rKSGoCEgoSUll8DkqbtYXi0kTsaZDNlSikqizbNKUDhJ8a25FvA87Wc4reMknzlR9sA3ZfNXMartLdsl7/KMGBmWtR/oFxhmd1moQU0hhnsVpSKfIkByxKfQnlZluEzI0BDX8/xT2fEHKaaRlCLKLXBPwFU5efqHXVF0E/ih0JW8gzdHh1Amu9J390YGNa5oSEPcnRmr0o8RIPJIJUprAvnQEDAh6Jh2PyUtSaZI0C5kcdcv3ALV11GaS+l23/GQIQqstTNJOo2aJwp6qp4DeRGOJPdQl4QV96B8P2azTGDgGyUtvsI/vN8Cdu+ozMCV/Iyf/JKg0JjqS0tdYJQXoqxQNMt7wUcx5VY8Ss27HYg1fNVcPLM3ha+cKcFLWebQkNzeKO18cOfKr8Pp3CvE1zibf0Ts2BH50S3CBqD+yF4tj1O0o1JnMhL4WBOl4RXd6R3iJCbTSBRb/ncANITl0048LpOxvQsAumCFk5wdsCvtuDtkhLASqIe3UZwQeVAgMQ3lONBHiHOGsd6SYSnfpai6fpTJcwk8/sFlX0J7Sk5qOx7WrjN6IWVy2wvhj8MmwF7r6lEzRRlx2Bv4nmYLzyuJqfYvNL4wtnIYErbHsozShgq50TQ5wrvcK9EzNU8Wy0leOqQkojzN9QJ27RSH8VWvNLhpFspSN4p4irDf3Q30ZMCzrwbbxVHSl/LE8TpzMzJj4393muf9ld8hgs4uyNK7GSP96ZF0BT6b7nrvm1Y6gpry+MoI/9qCOKgU16fYFyQoTRR7weg7lgHFvGp++EwCRyhDJvS66eg7r3BBP8K69P9atTll4qR5O9WTHQmelZzyEOHIjK0OPTj7SneSwb/SJauCIzRW/7WL0MOTCUuGyBj0hclj0Oa+3ytVCVxDV9kkGSNdclrysEl84pqu25Ht5QQ89raXp6gvfyZhND7zZcFsv4RG0SEUgVAKbBwBcHIGM55X0xsruDOGhJUtH7WEq3h6lRTJpSoZ2RHuUcK6zzeN2M5QGuKnk8sERk4831PnPTlVZy9K9rEddrou+RoZjEF7ge8MBTA4aUWs+wzUP/TJZHdmef9giwyxEku8TARvH6SjsrNP0PiH+4BUsb8t1r8hsBTUp1BfhbEkhdtvunkGufnKdqy+nn+vnTD6CzOtSeGdOnz/MJtTy53cnh8sOLXbx5LjVtDkl9jVVmAEMs3gf+6eswU1rYodHRFjLr6GOawM35Xdv76WWO8DxLj4gjEBXmp6TFpOjCHNYVLeRwrpTdeW2rhefise3+YBeW4NpkCX47MfCWPELDlHx/BleYFD6/BV5oEZ2XnzzBsCmV6EiX7fdzTb6unqUbFBEAxgM62hXfXZiVHh+BP//DD7snGO2LyCrBS1QxlSnRyoKBLO4LF/vhu6NtvCAN9sh3tBfHbHNyqHCOK6VEuyWpPbKIZsIIzHGUpg3h79lr0ZnwIFANcP8eDOByD5neLQax0pJddr2Md7Z7oZA5MFSqI3GQLyODm6qrKeAUzJHkJVnVa6xRWsmmcgp9G8zwIWErfSeT1uD7x8Jiz3HeVlkViGDbcYW0ca/AKtUEoEJVXAmVbpp1V1RDhc1mjo2qhED3UO8KmdMZJt8aU/O9IyNS52ckuVWefr5Ym9h1WJhat7Qr0/8hywPlSfGMKsOXqUI9oEYJuLmwYLD0+gvH8GlAIGNoSCpP5/P9OnuPwVS/LjEytz00sMUbUjInkOItAhoAv+5J0LywW+h+K9It4RGG4J19T5tZzppdG9U706S6aHCTizJd3Yg7K7+QV1+YSkVOq1NcpvWyU7wJNbRtUDWTsYrEvuTaR8gczFG+Bd7Ni/NPDqzy7cZSojs64QMshFQ72aLBkalZr5aIcZNM/IEj6dFMQqnCpK+8uqhGMcafzLaR4jr90cKaH398hmrdQ3rF6Ywti4N0kfoGwF/5wlTFgLsAq/LOjv9xRWilQobgdR4ROBe1uMhq9NCMh0ypFhDaPu6QjbNsEYgV3XLGTL7Naz1zjiWlx4UtDYEc8rnGiOcDQzbaBCzw/wc6sAJlzzp09ZrP0QwjX0lhbxyhOqw8VH9yax80Sj8ij0TJiWwIZcphWQtKuThnAYfHowbFYHZYOD4KhR8aFBfsJtAi4mmOOdVGnrPfLPbyGL+VPGuTZ2Eylbi3gqQFpHKZHN5xu4nHzCNV6zlF6uar9UobKZAe8kIqkylae8HAYXaDBTWEhCb13YHvDYLPE0mnIlKbYmBNT4j63Ij3IGJT5Ks3lJRqevA2ZlGYNwWuf1apBvvzX3IEnF9WHxas372Jq9LfzxEiY2OyJsxJW5OYig0rGy9Ij8zZ6k9rwY1LHVt7aVk3vahT27l+rRMM4wSuVi35G5rvLe+nA//Ke1XyPnDAiotXL6410LElsePnJD0GBVk3FmwEroHb9q74mZc4W9fZ8uSURR9FTqg3BvMpGLYitpTWT2Fcz4cRQgl63M9qG/4rP0wTkyH6FFINUzejUdB5HKePpvV1YeUaPAvMYDBoqB9tdcQ4TBDBitVl8RTImleMcEL2yIEGfkHInGAJHHfpor/yUDRALstG2rXdz/maVptEoy38DxjJj0xbJ9trgKUMmUrOZA7LGsdgxXTc0ICJw1Klbvn4/O5NCAhbX8uyenGB8TVyMMxlAxrC07BmssEFbPmMRP+M5QltQydT/4tDKDMMQPXKML3ncxT4gEXUhREvHSKB+PCE/cyRY98IMGd5JbrzSSwHMTd7yxu6oood5XxMi7nl6Sz6nYzKf3XMF5Fk96imtetPXOPzuPn4MiV+UG1huHS61ME8igUzcsn/2yT0wjDy/rqFCe7eiQPHxTtDAwREwXqA9y2q5eg2nhWUVbwJWtRUSMbxk+9s0g7ypX+rcArqFMQsqH5PA//0VcwcU2BteiLWNtMSaXu73eVg9Kan+1nSU/0lCJbsrka8YNMjyXw8D8IGTUcMhvKbxe3G+3Nh6bYQ0DBMm0g2AykuDt8TWusZ53ULgHgws9u7LQbU1YFjzvlYUKUVfRcR8MBkEEpeJ/XgyMqKvSqe3DogMznIhhFEfI6ZoQzEK7GCM9Zzvs66fVv8adv8Gk+saoPXpYXL1QD2in4PbBfgMVBQOfAhCR6zab6KNLmOUEtB68JctgsdtY6BCvABTVilJYpaK7KE35S+nyNddr5Vku4YPzKlNEAkZnvFWN5mNcTRMBJoAJ+2l87iUhbOA9Uo5kuM1W9JJ84MVtyMliZ/y9Ww3TDup3GgW/9w1X7KZgqySKIHcqGrXyPsmp63joCQIGAAxPV7z18JmQ1KEDs3WSXpdhAQFOsUSJZ2fFWVJqVqp8UsMCKLPiFAWzprllJU7Y31ip9+nV/YqzLm4/ZVHy2VmELifQi73LGJXoUqc651fPEwMXXofOR+qJZ3h/8SUbo3UWGoQ2m2J9vGIMLuV0hwKF0vwBY6nMm4pN9wyJMWqSgxMXMvbGeE/BSnzg391cJdYF2h0XXOgZXlrgY/fOFKwp4iqlebtUm8JbQO1j+4rB6bCR48Urzv7wk/amTwqGx3owkHZ++npAQOQAv4qDoqyJUGwCpr8uz3qqrXJ7YAsEVqQxFfQtiUYMWSKUa88rBR/KT3t3LC6lI8sW00PHgybTRtUZMbOkGz9axNlK41cJayx2HqItqkVt09mrtSv0I4NnLhpyv3dHlCoC6WJ1strgpMUDjS0KbszcQamTPNJ/pBmtTQydPKObx3VhayCDSO1Kv6G3GLGyIjJe1ybJJ4KgAg8LoWdfqZeKJVQzBEP0ynDz/8NGLlsxs/2YyY8Veuw+rA9IoVhGJv42YjbRcX8TNgLjBxCZDHNgCm9kz8Y7+eoMtl5dlPv1k78hsvfvD733/6CyVflN0+2CWwKv/H8YKWpOjo81YrQTosMKhIIM82yYDXZTZQq7q91RIKT9XRE39/RMRKM5lWY5nV4bwfdCk7DWE/Z/pcD6zKwt3JkE5zT49JbUSBSnGhKUwoxVJofu6DqOT2LpxmSz64fXwGKyV10my5jO9fRRm30UCeqekNqOdxiwgW9+AyCfS1VFixtyPTQ2uYlhCvv78BNvIXvNdFVOWfDCbsG1o+MAspWlvZgeeOREgluhOqEUplBsiZ2JQGL12HmWZCS4NBT4E6G5+MhFGDWbtzcmLcZqttUc3hoKQcazokpFnqvaVbJ1XQxzFe0vHlZBTeIO49Pk0U4kGSoT44p1O9oXJQNBE7oDmlfyuHtnWRzlqxebmucaaw/PCIYx2BvGYP69ZgYtwyvK86gBoL6fxHItc2eTzFhQOLv/zr+5e7dx80igmktOrspaG3jNU0WV/0fN1nAnkcOYrq9oVCmQMPrX0E4YzUKI18C2feAXwc6SkpBf9fmIFG2g3Zwa5MNf4HF5PCBDiigE/pYqNztaJvE3/uWCpnnzS0iE5Z3o2oFNxeggAlFyTmkSVKZ+EE0fjf/tIGsivzzHCD7wkbl5AsUq12i2YJ0kof5EerDwb1E57bchsefVaZdLC9R7u2ewPP82zPnjMHuc/5e8uJKHdZiV66nO5OXyvSpiZpSVtEndYBnhxVIrRP+CtyBjhMc8SlxhsXtHZKjrmLDR+ZXNSmbHiKnfyW3vwjhsQZ26O5OyFvgmGxnZ2jF2iik0uwkL8uKf6VpE5+WEx3tKwCs4dks8dXmhbUxmTjEA75dvvxtTGwq7toq/RJ/drDVP4n7sXalJB58HpF+tmmeCq4MS2Mn0MLyYNkdb4WreHRayC+H1If6kLdk5JrhzLa/WzW+QwaEgZColWzSBwaEagPOvGsss+eMBv+pDdnrp/0yXWUBdhTe6nk6RHnb9Kzj+AtPD4nfnqNRugPppSwSu+aOB6+wYaLErJY0+FDOBMJ1StJ3BVI3dccHT32LFstHCBtfrAbgmG/KsEu+Qtr/O8LFvBZe5Shqp2tRh2vTx/XkgCOR5BvgowGyK7C9QVCVm03IGI+6vcLcckCMGOd4wRMIai7TEDxmOtwXchQFWT9D54GnUWe7ERJA2lDMfyKZHUEZz0ArUMK3jWF40r9TZh1g84Qwq7lYkUx4WKOuZSUgWYxY3NeHdYjA0PvbQlQaN56ndHdayGV4TMcDKibvpP/NDitERvP9kAJPLzmboGTgDLmTgDJDcTl2iIWzufmkIH3UGVurFAtSXrLZLWpi/e3yQkE9Jv635XmhCFjpVTNm0fybIXKc4QSS9eXuZzzh0Hk+RrgJtccX75Qu7j0n9zq6+0LRytpxzgOMSaFUA01T7aZ7MxXKKlavI8uou0mdnhrosB7PaQW1X0X2JNcwoTPCZqph7jTMHllQjgIRZ7zbEwN56fOpRXYIraOD45ma4i/PUa7USXmgNlbLTGIh4ocKoS17/X+a43ePn0Kz8Q4nJNwcf9Lu7ZcvULvokqT99S0WBpAr2WpfiM7igsGnHCtmrDmH589gIDbVxQ2ZJ5KKIzYAVZyUxTSDDdZfbyqP0uhcHj5y1PmR67m2cfTcdjKhFPrcoxzUDHCNKLWCWlnm1xg7zDt7NlwcvFwCJjS/43n/us4uN2HResr9b5/Bu7nnyO51poPKq6qbzPxQBOAiCCo5RaVqgoSht16ybJropzpatCREl/17oICkfdzN4k01cuVDwGCs8JbaPOxilOQbEevAZu/xbFyVS3vzBQ0pd3NT6Gg7R+m9JVCa1RjwX3dUiXY5uLZgBJlYn7C8RtGxzGzcbxKJ3xG3MALNMv/QtdEhnG6Ldy3hps73niaZ7gBavIfQscgtHmMcXysCDNkw+Z9259CKf7B/szQH+oN02T+93ZPcT04UCOrBAdv2COsCHHprjNKDQvsRCmdEr/cut3D5ZlnV5ootqRynJPssGWAsp8vxHu8ZoPIKpfCYp1qAmPI+AxpMRJTWRfjlqg86QpCFMe2raxbMRA5gAGjiuszo/XAtxxQX+gSIMjdySvwZyFo+3u6fY9fphgyGpcFnmhD9xmncMj7WLGtSgzk0L9NvmKSi/yp6w9GBzxDgnlFlVT/Ac4tPF0bF/U00j/duHAeIkzhQmDdhJdBkFj0XzPI721mVOEkRVj28V9YPatiCpHpEXhWhFKaxkj+bIDGe0gKnkCtlOaCshPyKLrqoI9Rii3buK8gcQe4+EoSoO5pjxF2EBfR8mArJnIa5UDpzQuC2JSqQXAGWfaaUaWEqKlHmZHSqluhJLw/iA3ovRirMZHUDiP01C4kDVYqECIhMfQslxnpQ2T4p8Y4DPAYcuLWYxrzgiK9bbWGSEPsabF0kcgj1q9WTqdLbPllknrn1TlVl0tUM22HOn5YfWRoEQ4GYNgnoKyPtlNgtgo2z5u1/C4Xcov2iS9h1OqYHkEZNxMoqsTWNmMJRAFgyB+tSaz2+nd67fHMnjJb4rHzwjMnKfikyLxdoBLyf4N5rhZ8uvjI8p0/5DF7RzPUr8l4RV+KebQj7sFCmU5H8iL09w3HIkKLObTPZoB5OD7t8Y55oiAA3u3qnjj6nO2JsGauiJpdz0h2wOexoA48/8/JqNs3yblHztNmpWvSOjNktglKRkrM4I4QT6Mxuy1XfiFnq6omEhBaWPaKyzLhpJzh95luDiIRrXonPT7T5lHaNntyLbggBP4MMPH4oAbG3gCnbRjJFpzLAv7k/k8RAAgF/iN1hFUoGE4UWbKmZ4n0vSgwuEPjFq+1D3ph7b5sYpiy77WerJ0BFA/FoWzqR+obkxq32+5A8Rcw5wBGvmKgRKqidjlQdV5yHK2xA4cnpcFdPXU7iMX8TesIARXBRJFfB4/DaRR2mdx5z7wg6wvHJzoPZ9K5YTA9e5WE1yxpzPwHhg+pHuaf4Z7gPzIMFHLvsXFjHIaFwQ7u3tmc53+a6m2q5DCXtXsi9CbHrA94uxUAsdKWdecK3pvRq5h+Ll4XrgbAEAxAdsQ/4Z7pHaAvomrfZkspnX5MUBYzd7DcWg3AVUrHvVkyi2r0+5x0BwZcMmlcbyJ6kFukocIniES+3QkU6dyiEAnUILK4cgpxOFUA1ghEfToYqwsX37YLqre6tLKyvAJbRuanhN8mKUJRMGUdAPoJ4hY/CyuNQr81vt4WpcAAPBfC/6ck081CrnMBFa46txnhY/IZLNhejYMkO3xSrB3eeiSiydFskUakSSpxR08sOJ3NsUpIJ6V8KkdUZS2Z4V7lgvm+EvAAM9fRgZUoolIkguS97haIBwJ0Lv0Dp7JyyyztuyX8/sUERSMee1rzispYR3okBSpDE+zGdR65dLDfWJUHflEhPYOhJFsEHE3+4v5GoqavPF9G1Hm/bG+YYn+AIFbSuyXapHoilM8jnB3s0ajaVyElUlxYEU+tG9lPm0LmwLhR8rkOTXhDPywmPLArJERDVNH6c30bGSG1VBxAeTSsV24vmgItoqz+I4GLt32f9Hyjbl8hvMfunQcDW3wa9rlJJB9Wm3PNIHgWCMIczs626YMkrq83+OclYyNNrf5ZpULV3EzvfgI6x3w7OWSaODjVNEjp2pZCWnmsXDHSsKCRSmEU8MLDdpUYpHZl0A/3fglSkbLCBgky3aJAl/NuAGm+InGTljSeggt0LqLFDmm39DjDlT/u2S3g+R4a5z3WgUK0bZdrUsOFD6VqxN0QAPKgIqYoSzpNRwtC46VqNjlrKZGM85CRa8X2jl46ygJFo9szobAMGazPNRubxT27gu490YFv7eIh/zbspkfg0jHV5Kk34VeAfRMjD/UbjNk4w6sE5Bpf7QWww+3A/XuQGUzf5Ayp7YdrbZDwBNX388mWCXcDcvCWBysGnpoMRPGBDC/i1GZKFn+/OaJsFiaiD9Fz+W8v3IDXIemkQJ8ZD8X8eP1JzxRoUrZtyqiTCEcN2KFRwHU/+dT7pxZPlxuS4GRmj5TYc3712o082FnLC8dFjAEoLzmQds1e2n+QgaqMrVnV7cIzXTZQJOO4c+6neIIWV/yd1zLRSsVlWVLcdc57ryDjEYta4eO+QuVu01yBMNhrAcDyRdQTXM5CgUvMgJl7UOpYch0APcFFyF/jOTXpgl8s6UiT5jNighTuJa4r4r255D9fOc6Mp+GrOHyd/Fs5b//2qpID/0ns1cAAGZeakZLbc6mLrIeGSpguNwiEVx7hgEgjC6cpE6sd5vG34veDYECCDkz+aJ4Ejuw9lauqeHKDvcEHKJnQOC/uVxIX6RBt/YutFxaQ3DGan0XzpBnyizn0DsYnEPa2CAFoDKibAI2LcldNDknlquuG9UiANUimr/7O6Y/C44lyE4xuMsF0V4pyYZIg4Kkr1BokfkqOXyLAwrIHB1Lp2VLVnA4z4BDktP8WChkElf/u+IoD0EBFJpVRKYqAd5v3IkIbdzFi3FXIA42vb05ZkMp3bz2ojN+nisYpyBkiXK0VoTY6hGZu1YzIxi1FIb0zmUMcAUmyhEtM3LWhpPoBlUlq/ejRqV9G2pBHH3K1AiyfsyjtR2AaVKvUal7KhmMy+fPGMgbvMZ1vMlnm5eEv+YpqFZ4UgZizxBhtOuY5qZhwTPxdpg6lrGLpmb2ZXcX+0vwbRLjYsMzeLZxclptbgdzZ5yOLvdFwHdTKEA3RYMqyYIsxWVpe+6Fxt+/Pbs0MkMbhaIz+jKcGaa//hR35Sado3OWRZMjg6NTQqjZWqmfl6x9oSiV+QuF+8YU7vPLa2pAbS7buwgJpoCMHKNCgJiwk83L7MK+iOX9d1k8FZxFqqDaVNaNA4ohVKQYQgUq4yHe66cXXCqgULgEEVKhEJjOfhgLQsySNxZowmXUsd0gQ7pWaGLBDTt7QyL2DW76uJsS3OlfwQVtXjUQLSISonXs9mPIWn87dX4KYaVPrHJUX5vw8KK7QCFlld8OIdRTmUentBi8mDEkL9/nM9UhKjiT99kwvZx0DEvt7dbCME/1Y85D4T8DQbpQJZMH4CG0Ecw2oMQL22d+GI5MDKUbFTo2mZFLFm6j2PwgoSfZ3RZUNogUujTZNK+U5tuYVOWX0Pe+5ThMAVCSINclCA+OpVBM108fImTYeCNsRjcFI9CriLizgp56bUIKhOmL+LjKifPaOsxbm1YGRn4yRRPTcQYrrQYYRG/GIT2WdrH0vQgAIBwDLiGY8EdilL2LjEZ7fUuHyNjrjyQ3yYxQPCKelKSHhH4f9Kohcqv0ol2XwWC8WHcBpf82yPBac10oScXhCAK1jEQHJNio7gVR87QHAMW6YNzY1NzpQJeORVDi5hZKX+E24VUBdx2yznrOEn4q11XEbwyokwSbX2x1IEmlT2bi6ugxUVwQFhLmI79L2ZA12CWKz+7BCqR0ictMW90HBdNPzo4JmsNRleVjsKXtP9UjsfQOQeDghm4UTrdYN6u3TR6jiaM6T1MiC+vyePvDr8WwBKsYjKteRm8+kzeX3zXZqWHvxjIA2zyQA9ViDCNZpLAkC2AtNf4sRhwuY8xfVPr7PUc9j9sVauXC7SNoQD2DLmupL1ffy08GfY8uNMRmEyI4CFAQQtQex4pFP0HSjrOPBp85R+MxDhq7F0JjubYP8Z1lSj1XrNmar00jx17Dc6ZxMb0NGvD6RcI1T3Mg2Ewi0sDsjWcZdfbqfsk3QK34ym7lFXa+9eRIO7vnme/UIsf+xxihWgIBwqdfb3vfVOmy2LKTNAbLsvPoxBBAl904boV8fI6nDGM1QAdZcerOOkkkVxDAK8Xpg0drgKDPr6xgTVZYIK+quZqu9hgDeizIxWBBnBWooyWONCSAsSDK/g7Do97KfKyhw/HK+CKmFx/jwawXibhKdLLRTvBwEiAoudWxlXXh/Gr3AwqN2D2xJACu2rytlUF4f2l8fmUja5+InDvGlC3mvTUfGtLOHu5u0F54nhXpUm3Mxs2CmIPJkj9HMnVmKxKeiAcsLvJl8lD+fiqY3/TRogerdKn/2XN43NfoiejC6DrNQKwmKmpLgzFUa6KkwwHJyknBc3DdirL7gWMylzvZe7uQmYXPRoy1qsUFGDJ5FIZzBSJtggg4/dVQ/JV3xLymV7ty8z1gVsK8iikDSHZc28LAoU/aFisgblk+SxuzhjGKAS2BV3APusqfvHvzFootpSNuzqnaMcAA17lIQj0NshBhd7UOGNbJrKNMUa20o0K37uHo0HUP5VNVHf+gT7JlUiESxA36WvrSAOEgR4wF4RyLB5fmVQw4hBAdRUXPsBrbWihQy9yro2oS8bS4RVPN7spawjfUjtcpwgbjaQDPTcZT7nxQEfU0GXvGGR3MDVuarfnwaztR5ioATgxJm/Jkz9up6S0wlqncjaxCwzMqCGg6VGIBwTFQhAVQmOAS30+yMpVhHzOwgQhI1uTQyWUBI2UO0BJ39Q7IQxNw8oYbBGKyolBKFmYttajjkM5y5Tvvr5O6xRmADnRHlbnV0y7wRtHz3h34/HqZYsVDI0E9tPmgRChGtXGpHxDCn4VS6ZLo95xeZPne7gD3ASmMguaAAqI7O3W1CwKqjWR/tQhvuGvMjhBLXMZzGhCkanTcnCQBjO2n/kzreS2JjWGPylhTuehm+V0xg5akH+8953a6MljYxNlqWh5bn9BxoPo/wCTyufV5imPpcyAC3WSKqdOQp8UFQSDcSAsi2piYT9SJq/sD+S6jZQzXVdifWIHGn+80WiM4Vd004R9vFsLGVoX4e/37P/dDnAkcAJqob5BZf1+3rMqh/KfOM8ByL9U/oSADH3WCd1Q3RQuO0QgCxTOjmqPjA8tQBlUeOioWOeZ9t88fdp29JXYr59YL7vl6tha2ALcWzpiwxamG2WgqPm3EAmJWC4fbF8fSmZHJOwkItMWHfNJ2r47tuRsCy4IGgvYv2M+1W1rEAJcI594On5o0QZ28mcOr/zhlKOw59K4zf/CCntQLY++jg5A4AkCiucGnWDODH/WFEhUjc1PWpD9ItMzcPUqmyNa9eKU0XqrpDnyV/yxk1xP4RsJMojgIAjq+5ulBIF/r5CSXcgbHooBdxaIX5FBRqkbP37DeS1HfiaSkiGHcsGTjwx/jvz3XzF3zZoyFCfiXanxlIHocoqrZz09YTtVjob/EqKT61gc6eQebOLCqNHho1qoEH1SFHUzvyEdy9YiKRE8VYJVn7NWDhMm/RsjWF8ct7qLZLmy6kfwVIwUJjh3gN3lEYAvquUxlwH7oqx6Mk9j/OIxzTRaIDMNiVhgsPt7+ufIc3fode6TkyfytF1vzY6oUsauMZe6214d8TLmfaABqhLiqYC3Qw/MxL152eDyJVkn9/it8ssKC9WFeP5och/b/tfJNZ+0hrGymWkvCOGW2AR13ezY+L83yNK04zZB+zm7Zvksm2KMtfxgfCc4lHOKG4cPWPYiHY+/HamgPRjXu6/d02m1skradYsY+Pv0hF8ctwTE3DHlbOlBk5H3QcjiLn2NGbQ0Ukl3b6kmg1JBW8hfvwY3dk/SGALuQw/0q60x1JfxbW+w9R8PQH9VVXgcRuQr1GYup4ZUZvnIQAqsV5g4sYRVsEibwWdLt8QkWI4vEJSWZoflICHJhxXbo0xEuQy+Q6L4Kr84BHJnpNrZWWWOSd34UbAuGuAMyt32+HKBDUz6CQaho+RY4DL3VhOdGvzkD2PFfCDclNwYaFqqSzvmqctLm6KM/m89P48Mm2n1Wh9IhIWNuo62nZihkptCZsb0scjJxuiw7TMHTm0Re2YA7aFDaOh0Sn6FE82rV+7o2aVMUVnA52ZwmGvOHzsmqjZpPKCGGvAZBI50Ve8w7Un42L23U0OEJCfQwVwfGyi0yrAeJhfMCXE65DMGWEMu1k3fxxD9g9fTrzNGlyXO/q+YHf2RQoefnyAewXU/y398Q14io8GjQBfY6JzSnQKqNmR/5kFxn4ft3SrQaixfpfvv/f9bXRdhAt9xBcCXuM9G7v0hWhpQ3lI0HcgQAK3B8EBA60JcOYx96J+2CZD98+c6zbT1wLrQq6OsS3gSon7IXSkZ7xiCgLgKQdWS+4SLl9FHw7QBtG70oV7wMABmKwiLRQy/57lzS4FfJ16VfMrG7H+8egV2HQC95NIRaGuIKkEddec7yy8UoPSSuCxYCECMa298ReCHXvsBOznaRPbc3XK3ENf/CPyEWgQoFY5Pe+hHLF8TcwdqQv0+6704kLwO3l4hzIvAf4hS9sMthMmwCulS4dyjA0SlhAVhew2naPxixLIOxzcoY8NhAcITZMMEpgz5eUMa4FyRxZvYz/kFuzno7cJqKHrfIS4SUxKmq9Fdgy8GKPy3XYbLaqVlRShrAqxx6F2AdxtlgvAKRG0KbJg/3zfQ/4fsWkbseIAjsb2H0XjCgx+15HhSVGqYO+jDBEjs9At83pFC8APR0ntuEQt6Wj5+AvR1bsKoGdHjnwtEx71Pzs57lMtr4NXImSxCq7Uf/AkzUrI7DTr1IV+AMuL5P2pyiPRvNhoL1K8oufR/UlggwCeUqZAyIc3ewhmUzsQF/SBhDIn0QXvYfRCBPej4vloEMI05g33BQmNKYG2wV85le/IeGlXaD+40dTkFnum9M9X0ftpa121KIGJqcP0MzYEwofEtw/BH772xXRxIISuupmvOkJy9PRB1tJ3O72DV3bDvvlTTi2IIxzhws2N0JkFmLQv/YM0msnqeVtKx0HvI/gdOEd2cmZ2P24VDZotTquwuH29cA/l9Tg81fjg6Il/dCQGIcPC2N7qfid43k55ZG+yV19VzSVaHHPC0rZmRfiDxrKxeDRsKcWob7PbngscAKsKA+C02su+oVbeqX1H8A9p3ghnKdWJ747jONg07wigboMUXxA2KLvovTUJ0i2lo3XukBV8hERZcwUveRz24C4ut2qUwwZ8zyeQtip/Q3UGmS4/d3IYDeKvOE/0oQZyFK11JWFdVIAA8BvEPfP/tc0zMoA9Qd2F4GN56VGdqdxqN469JH6O4Gb8JaHHbVxdu3bi6tM3NfW5DGcqHf4/w58+Pmr7FjF3QCRa1XVk+M9C0eEFTu1U5wm1YPkLGPOUSo4L2cJRIXD+sHNc3fawXNyXRATBCvsk/grN7wcAbZsElL6y3EFbKXvHoMOHU9KELBFEB0rf4491/xfcp5uPe9tm/SDzB348Qr8b7gszqbMFoPsWMesKGZDQEEPhb/yfklUDAJ6qCdqxI+VyLcMvHLhDhdhz/xxoY8GhGJ8eLp5dwfNv/9aOmhfu0f6L+7E7ExWUwdLC1hNzpFzu61XZAyXzdehlF8NU5eIlMl1eNkgy3WGrvgLzZ4Yl953mPIJlpbEOb6Wi+VtJcvWfwW8/4BQJpReBoRG7lxalr0tXIdTV3F0OV4Xe98WsIQOscLPbPTzaF7SjSDxb3CcMXsO1JjwGSfEnmN1RAAGgV3p0nGmkNCLhafwg3hwOXQe8SCMZVEDivwHibBIHudChsD8Jg+QJOcGUo8DsW1DooGoZbio5kTZiMUoN59BueebGQ3FEBMOAaNaxuAAFhcBIEiztgsrzvNhptBMXNhTBcPAenpi8oeDUvqeUWGt0nRSd4HgSjrgVhXvhGlhry/6+z539F600MdbqZbgf9VpjL88SRY8dh5qZ4vtAGBjY36nzz6X4t5igPYV0y9nwQ1lRTpsiutpCl7GTecy7Nk1k6hjNuijnKgyiAn9rwsYPCHIjVvG0mBq0ut6tWHsWfn82UYuxcbhqvfman0vqWbHdDFgM2Qz2OEJ3srGpD9MhUOwjmW1hzftm9jXt6ug25g9d8q2xDlxc2w0X26tHR8YE7uYUndeVWHz09BeSsV2798FKcZZb4dBZmlK7VLCvJ7vMKgIn3Xk64ED0qkVHrbBZ17Rj5fklq48nv+h9Tq5oCUz9Bs6YoqMZAkRXgVw6o6IuapTM/i+dLP/vlbx/IYBne7d04LIfjiwcmnVVfWHVx/4HixdYM/BiI3go4dDd67MjZAkCtn1usG6jrnicFW5esK86rQJPenbmRudByx8BkCBfg8L7d1iTDNhCO47f15OVuyNKRqtfgM5CCuFZvEaSFSUyJybnU5k0AswppxYcqN1L1Zd5XVd7MeQJjHgPkowJyt9TD8h85N+BN31qFdbS/0APpuZGqP9LbQzyWFB7/97zDFEbw0BYTPcRF0m1gsfL7Jdi0RZ7T9KI9S9gagx1scuD/65FLlf8ebMUYauNOiBkmGvDFHT1yftekNUdbEiEThoigEfurM8/acmxtrJtLGP2mUdooeEFhpns7wqBdi25JDmxrjQHRroJZ94x9JUz7j3N+S1pYbUqE5MGgfXvv9DnqCpPcKCv8N7usairAvCwUnzLAQN/QcdptYKaUW5G0RaCdZ1RFpviNIpN82yOJvtJKVi/rFfDgIq6rQAWg8dMOEgBY6/59rTFqwKeiTa4HFKuHNSnlgGTqZOLVvv5Fp7O+1n6eQgyonscKBJGYi+YIgcKw6e0QmvEoshMeTjZUGTFWHlyvituWvrDqKNioM44FMZTzaXUXBWRt4JgITkiwXSmJnU7m7jp1l6qNzC2V1dpK1QYicBheTEGdEbgvFhotqat2bOH11wNc7t1OszlDi4EEyPJa6RsoEKP5QV8eDwdCaHq4yCkUo0XiHlt2dQ9bCQQKONjihRdB5+M5C5iWy/VwLB72E1CUtWcAJuoKzmQGTQ1eigFIKuiaWVHkolOiECDoFFnmR83vIpnG6H/pgS+SgMygVix41kREPVMMY4BcQsAt6lQkIwKgMJtaeD4XjnJcSgqA3np3zqGfasKBtrYJKTH4n5jdH4hyWpXX7e8LvjKWfUWh1WzBI4KgXGokpIM2S5t2uhDPIUlvwDoS1JF/z17IHL240Iq1ZjKHf1MkgGbLCvmdHDJV1zuQG1QZfsViob8xkgqmQuwZTEQ1jJYKpDG/7as4to4ENArwQCvoJx90taGwIq2b6nEEox0h/y5QdBuzoiU0tCbJNz4AcJ2osds4D5E8IFnQ0FEDnSm1r/2pKM2s0lnI3/EefBoUrfs39Tf2elzhWMs6lIeDVFacYuQakMz9iExNFbIZ5HrxhjcZB5HW6EIyQzgmKO7lQJIrfDoQtj93PnBCT1TCgSreKJYZDBiSazKQiNLn4Ah3CHqF680IhYfiVDNIL4u5StFpvWy0kWrV9l2V9VKRyeNU1rZjyL79CW4EBO0SDLDAeMDHOBKAKznr5Uy0cTRmpvM5JI9GRQBoYu/GNgKLJaWwQT8DEr7uW5aFbuVoGzHam9osJZs0L+jHemGjw4plLW7oDBq3h11X/qGWc2Uc/fAyEF2bvh2vXZaRfxzt6nTAuaRekyKF+BpEjPMDyc91EZLrGRueZuVVT7itwtms4qcF5gRbW90lXcXeQLj0FyRIKm+tG8/ocSlrRBzi0vHB7Lr9JmdMxd7Uysi3OoSjnT6AzQxr5E5YMiqtMafV1nzTgDTaZVVY/mQn5mtPy6WUN6h5/Dw7xnnII8gq8IOExMAtDKfvnWGTwKJrsQUJOXCcCBfGG8ryOPDdzFGbCPceFf4xt0o9+4KzmMu//YPju67Wdsg8Mp+W2zmrD7GExUUxDoP1UPFBFUpajHfWRnMB3swd42OUp9LO3j7GKaJChGj+mPZiomx4A1cNt7rKd2DyvCm61v3p2ZGvmK9m4mOnyXFOHZZTf+BCGRvK1JfANYwICI9Aab3/VC1mQeORPDWwBKX22li0MCh0dOZaor3zAY/6toI5En9PzkHPZOqdwNzgbjpy0rpEbtkkhKb7fqcw31GGmC09U8/e055gtwNOe0+TwjH4RCPMJqdOqRK5l2MNu/0D1VQ3hihjKfJDidV4pzQEFV4jq0ojRUaOcjwn60faTfuCRkbou0Qbs3+6c3mLADmzieRiALUk8fD3XVMosn8YG6CnBXrn+HwkwzX4icLabxdBmhCmdwAniC8GFS0jAeXcbY7fVDgalGXeiQP76/Bd2NDKvFjcff13wdVziU+EU+ozxyl2XJfo4Mt1gB44U8TbkA7JqLw3mNrTn61qycI7A/hZdq/HwIqXzRwa2LvwF0I06kYJhP/mGrtElpNT57//hIrfMap4yel97lGw49suYa+15Ix+dZ4+dblurRlUvsizjVH+B1+gYgkXeg9Sl7548Xre18LviR12McTqdt8OfdEHTVCyzSyXeaXbXc+XI3yfD0OyVOzLKd65KkyDrlGcAZq84FjxHnUn4ISGIEH9ZR9JNf9SKSawg3e7kMHWeKXLNlt815FSbClYIx0v+mI9ykSguwEuXexk6kvVemUdjXTTNMeSppp0yYHOL98jGI0PGsuCyQ5wRikZLS8/YjYAghwWw/Y5kKI4bA07azwIY/iN7ksKIEliwSBxs0QlB+3zCXVhdQyzYAPpoislYOioEkX4G0RecCpa8HcHjdemqbWCwTn8SYgRALhr/OKDrCpy7gEl9AI0SCJqo7N+ERzocMkPYxRJmnafS8Hok+sOGcaNQgShYCbjgOlE9klut8yIPRfnEbO71I4NCfJJ/x0YIpACFUVa0nc09+bArClSWh6/0yQJZDGhSC0gfW6iIglCuSogBLmqnb5P6fLxgUKMnH5Hwlc8LXkytRJInMjCeq13BPr0QbzobuBbSSjRuJU1BrSgr3A/hPw86Qo2bLYs8kEO+giMO/sYPTy5wA8NkKVfXqr/0iRmdHMXMkhrYWcQOmq9KD+Lv7kfzrECKAnH15xqB+JThY0oNQChDWYCnOxFlZFAhVYAX4c9kkxTyNqIBEG+AJxashoBFwVfhkBcKLbcAG2JyCAigFRFll+zKF2XyJuQxAuJUiwqoRFEZsUp5Ngb3A+R/HlpkCFxaERWFZFpQomGVWj3dSPxrEJoxQUxpg5oLViiVpInu0rPCilW0TWLnKBLhgoEGVdVaR5f8KYrG2WuyVa5UZZLXpWg3OrwXkwTZiPJBIM2Cc8Im5M4VAJUVqpMTNJVbYLih4j0Sk9664GuVCHFlWhM2c4FlTbRIx81MUdKsd9IZUQcuHQVzgUIRtMguZWlHdkkAl6Jv1QgaDPZm9qQl1sYgbpRcpfwm/DVZe1+Be9KHK4BC6pYylIWNi7dhDWHcL/LzvVHLhKtsjAtiHPAxeLi1gSNIwp6LKQauIRAiZl4SPgvgST2Y9gCwNpiBwsK5S6EjFOBCUqloAdaYUVkuDfsPINEAS3dW3lXYcCJz88CYO7LwkIDbhXhMcZsEwnyD+vbDmXFFgGxLoduEeRzzbJxncCvSCHgzNueR4X0DW3uAgm0Nzzvng7VKR7X7oV8OCGpJtppiTV5ccQm9JWpEfocCfqvAKYjTdswOJFF781M0tpKLHtIaGCxLAx3IbtsoEJsdREaK8xrIZP1ei19ITXzyc+pozIBBM2LI0B0384ntn4DNnuU1BEVZ/oRH+wCfn0HgqRhf4uQcEBKGLAFLj6UAsBl38e+eNHx/d8BAcRw56jR+8gqwZqNtJ8ABbXXQqBtIZzRN4EBS7uqPnrPq6bRLMYKktCLGnSNwFWPD8tb1Zq9MHFgk2Ej8vruzwBm5HauMkEZPk7tkLGPnAMzLkplB/D0Bmy5hbuIEkZJLk/c/OLIw9lVIFI3ei9SIHlWPVy7QBdLhxcQiZ94RMiGd3QRPC3a1/IzWjKcjxJJKMIENioAf2xEMU2ScpEK4lnlhNFYSM8N4QH1LKNR74jZOvqYAhQAN1P+eVDCSJfMsDPCxPau+gAwZBAvbyETIxJAXbDAkp0vaeNlZFB1pBxYaqIjABZiMq+spDAYg2UYJtBTC1s9kuE4aN4sjwqsU50WV9MPmw9NcG1Y2e6Kin7QQU6bUR5MK7m9po2VyQnYWjTavZD3kXND6If6ggDvFmbzQpdZ0Bv12N8S0XgYQdTL6BjiMKyV4qm5OHFQiK+4mSXD0G0C1CG7dpuA5DbeV7AnREjmozvA1sdhrmueCcdfzwk8EzyG1oHmYDtO7B7/kR3xdYOdBqCD+K6qBmVxPOKgw/j1AG60chAtpNz4BqRr9jFZ4kV7yWj49VeaaHe+Eq+PWZquxXTi8guuUC4Qk8nTwGv7b/P4P3GriPSRs8tOIWZ3hGd8qyAu01UQqiPnw01OpaAg/kfHKnd6oP9i/8ISIx4FkS+Ix8Dox5eB+5M988aWTs/FwBhH+ILiEoKYHIPXxy7iFiPuISqBZ/BLQw/J3MQ1z93fu2MYBnxyh0qwIBThFTJ3DfVJ0tiVVvRQCAjFuWyVk+QHhRQ99ScU17VgaVmlCC0xrng1YQ9Zc2k1SMfIfDwEvW/RaNbaWX7SyR8XV+kLdlJv6KSfE53ARFgspPO+yjx2d3KFx/p6rcCeSOAKGAkRQ74WRKtElfr+P/5B6fw0xRmBzzs4mnSfFr0Mre4DA3/BL/PK+O54cz2HPBn+s+tDgElu6zHLO+9NDQWO+dNbS2zw0QefrLDZGadsobQ3D0A+l37a0876w3m/u+CFKldcdMlW1d6Y4bqrrqnxyj8mqlNriGGGGm6ZERq+XKdNXzD5KVq1ealdpw4jjTbKPsuNNUaXcf722oGHAmCYlu3E/4Tq/h2Hrlc+JiEq5jUfwuJgPCAQSWTxfr4mo0pISknLyCKoHE3eAl2hvxuBigymkrKKqpq6hiZLq94QrKOrB4AQ+bpPYARi29rR+pu9SPH/i0Sm9N1/HptCaHQGk8XmcHl8XCAUiSVSmVyh7CBMpdb01BKu0xuMJrPF2k2dQqnSyjQRdofT5fZ4fX44AolCY7A4PIFIIlOoNDqDyWJzuDy+QCgSS6QyuUKpUmu0Or3BaCo0W6w2O3sHRydnF1c3dw9PL28fXwKRRKZQaXQGk8XmcHl8gVAklkh9fGVyhVKl1mh1eoPRZLZYbXaH0+X2eL31znsffPTJZ18A+Uqvb4Y04eyFBagSHhL6D26/TnjwESBEhBjJ6FgmyubifCgUS+XxSnVicmp6xh6JwZId0RTsbGKkeuNS0lyN71m9UF+4uJj9Yx268ZNzQXXYx+lKWzkCx1VMSHNZdXYozoZKNQjm4mzInuz7C/kQ5WXa6PjF8kVvUe5PWXPGp1GcLbksyngr5duUksRN+ShLFamYSMdjsYWkVaaKkoYs0Yp86/orxfSdtgrtMsZPvkDwLj/rBLT6vF3n5WXrt5sM3Lg0LdWl1cAGlAqqKtcIlHoUwR+oN/9PNtpbVg/LCM5HC0V39bRsbnJbanlaLEPWcmnO27DcH9scDKOIeheXHyhaJN3Q7wRdzMnT8TG0yq1BKy76TyGv360vr3ddyvcJ9RrDOFPd1NySgFfjYzGGyf5iXT8pjCOtDQTHbGkMVWdvOa0O36lMDWQMKpOhLRk46LYMgf0wsyhhsJpVW22o6frT7risv2iT4auV8ul4rw1P+zSUFZcRsiiucLuU97Cs6czx5GczyGKr/DXH4/S232GpWqklpddUPB40ZK76Aes7xQUz12OHuZOJG+ilZcDbMdeyj7tZiKLXNW1/H0nH25mIlC2DHK7LSqxrqVm17Gu7ZGAgaX0q21tH7hmI/DxDsVZNic2AaMCz0sxfgK0ycb1Lovq1NKl4VZNzZluPZlGL25YbBFrU4p3y6xxPmJwggzKoTPHus8UgEX7u7yoC9NqqNMv/9KQ4X8m7NJnyeOqfhW7Ah1JtW9OYNbt1VRBroOcYvN4rAn1bdGHvBcrMbbruBbqsEoaQzmQ4QaRuQQARTjCYLHY83+tWIXGueq31YwxAhBMMJotNUhyuemvQAQAAAAAAAAAAABBCCCGEEEIIIYQIIYQQQgghhBBC1u0YQIQTDCaLTVJc9dYiq9qynVU7SXLsrZ7erzVK0W1ciY1n1ae+WsYu9amldanjksFedq5MD0OWbkchyTVL1vZDlttGrCoj/KBIp7YKMkQwhr6xhlap/YRmuPyZ917pX6zR/f74vZQdHC74/R+b0fvAEi54MwA=);
+          }
+    </style>
+    
+  </defs>
+  <g stroke-linecap="round" transform="translate(10.000000000000002 206.10785563636307) rotate(0 109.5 79.3466898232328)"><path d="M32 0 C74.22 -2.25, 115.52 1.32, 187 0 C206.94 -0.97, 221.97 7.31, 219 32 C219.57 65.57, 216.76 97.92, 219 126.69 C218.95 144.97, 205.93 159.72, 187 158.69 C147.64 155.32, 113.82 156.1, 32 158.69 C11.15 157.9, 1.87 144.5, 0 126.69 C0.73 89.21, -3.85 56.34, 0 32 C3.31 13.25, 8.45 2.64, 32 0" stroke="none" stroke-width="0" fill="#b2f2bb"></path><path d="M32 0 C70.55 1.69, 110.63 1.9, 187 0 M32 0 C84.75 1.45, 137.69 0.35, 187 0 M187 0 C208.84 0.86, 220.01 12.49, 219 32 M187 0 C209.05 0.24, 219.67 9.48, 219 32 M219 32 C217.66 54.18, 218.16 72.8, 219 126.69 M219 32 C220.44 64.54, 220.35 96.41, 219 126.69 M219 126.69 C220.32 148.95, 209.48 157.68, 187 158.69 M219 126.69 C220.11 146.96, 210.56 159.72, 187 158.69 M187 158.69 C146.78 156.02, 106.21 157.85, 32 158.69 M187 158.69 C137.33 158.4, 88.43 157.93, 32 158.69 M32 158.69 C9.06 158.86, 0.44 148.54, 0 126.69 M32 158.69 C10.85 158.97, 0.63 147.93, 0 126.69 M0 126.69 C-0.47 96.22, 0.77 68.95, 0 32 M0 126.69 C-1.01 101.45, -0.41 75.63, 0 32 M0 32 C1.79 11.98, 11.71 0.21, 32 0 M0 32 C1.27 12.93, 11.42 0.17, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(21.682044982910156 267.9545454595959) rotate(0 97.81795501708984 17.5)"><text x="97.81795501708984" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">EventStoreDB</text></g><g stroke-linecap="round" transform="translate(877.903197060606 10) rotate(0 93.18181818181802 90.90909090909076)"><path d="M32 0 C59.55 -1.75, 92.84 -4.13, 154.36 0 C177.24 -2.96, 189.82 12.63, 186.36 32 C185.81 67.86, 183.47 110.86, 186.36 149.82 C184.08 173.36, 173.9 179.13, 154.36 181.82 C124.87 180.29, 96.28 177.56, 32 181.82 C12.89 184.26, 2.99 173.04, 0 149.82 C4.9 127.59, -0.63 102.85, 0 32 C2.66 8.13, 9.75 1.82, 32 0" stroke="none" stroke-width="0" fill="#a5d8ff"></path><path d="M32 0 C71.9 0.07, 109.11 0.14, 154.36 0 M32 0 C75.84 1.08, 119.67 1.57, 154.36 0 M154.36 0 C176.32 0.21, 186.95 9.64, 186.36 32 M154.36 0 C173.91 -1.38, 187.51 9.77, 186.36 32 M186.36 32 C187.11 75.29, 187.73 117.48, 186.36 149.82 M186.36 32 C187.85 66.28, 187.77 99.13, 186.36 149.82 M186.36 149.82 C187.33 170.22, 177.63 182.71, 154.36 181.82 M186.36 149.82 C185.45 169.13, 174.27 181.97, 154.36 181.82 M154.36 181.82 C128.52 181.91, 100.89 182.01, 32 181.82 M154.36 181.82 C111.35 181.88, 70.16 182.05, 32 181.82 M32 181.82 C10.83 182.06, 0.55 171.07, 0 149.82 M32 181.82 C10.88 180.19, -2.14 169.84, 0 149.82 M0 149.82 C-0.59 123.42, 1.06 92.96, 0 32 M0 149.82 C0.31 107.56, -0.06 64.1, 0 32 M0 32 C1.1 12.64, 11.32 0.15, 32 0 M0 32 C-0.45 9.67, 10.63 -0.79, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(913.0830315998459 65.90909090909076) rotate(0 58.001983642578125 35)"><text x="58.001983642578125" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Lambda </text><text x="58.001983642578125" y="59.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">function</text></g><g stroke-linecap="round" transform="translate(884.2668335151513 456.8793566363636) rotate(0 90.00000000000006 72.72727272727275)"><path d="M32 0 C65.23 -1.01, 98.81 3.91, 148 0 C170.42 -0.84, 180.97 10.61, 180 32 C176.74 51.74, 177.22 64.37, 180 113.45 C178.02 134.95, 168.14 145.94, 148 145.45 C117.98 145.85, 86.51 145.29, 32 145.45 C7.45 142.76, -1.83 138.1, 0 113.45 C3.56 80.63, -0.01 54.72, 0 32 C1.03 8.49, 9.89 1.71, 32 0" stroke="none" stroke-width="0" fill="#ffc9c9"></path><path d="M32 0 C70.43 1.1, 105.55 0.21, 148 0 M32 0 C72.13 -0.96, 111.92 -1.58, 148 0 M148 0 C167.78 -1.2, 181 9.89, 180 32 M148 0 C170.62 -0.31, 178.47 11.7, 180 32 M180 32 C180.36 63.35, 178.77 93.19, 180 113.45 M180 32 C180.95 59.74, 181.43 88.86, 180 113.45 M180 113.45 C179.21 133.03, 168.09 145.58, 148 145.45 M180 113.45 C178.04 134.69, 169.47 145.93, 148 145.45 M148 145.45 C113.98 147.28, 78.13 143.92, 32 145.45 M148 145.45 C112.32 145.87, 76.75 145.71, 32 145.45 M32 145.45 C10.85 144.04, -1.86 133.65, 0 113.45 M32 145.45 C9.3 145.57, 0.95 134.18, 0 113.45 M0 113.45 C0.83 82.17, 0.96 50.68, 0 32 M0 113.45 C0.13 84.67, -0.1 54, 0 32 M0 32 C-0.39 9.8, 10.64 -0.69, 32 0 M0 32 C-1.46 8.5, 11.48 -0.89, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(953.606845111831 517.1066293636363) rotate(0 20.659988403320312 12.5)"><text x="20.659988403320312" y="17.619999999999997" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">RDS</text></g><g mask="url(#mask-3kEFuuFhUrPMSC_z8QTo2)" stroke-linecap="round"><g transform="translate(973.9716149400014 203.6363636363635) rotate(0 0.9673473530268666 124.31517453137548)"><path d="M0.3 0.52 C0.65 42.11, 2.53 207.65, 2.93 248.89 M-1 -0.25 C-0.82 41.08, 1.78 205.75, 2.3 247.34" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(973.9716149400014 203.6363636363635) rotate(0 0.9673473530268666 124.31517453137548)"><path d="M-6.58 223.97 C-2.56 233.59, 1.68 241.84, 2.3 247.34 M-6.58 223.97 C-4.54 230.67, -0.5 238.13, 2.3 247.34" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(973.9716149400014 203.6363636363635) rotate(0 0.9673473530268666 124.31517453137548)"><path d="M10.51 223.73 C8.22 233.48, 6.15 241.82, 2.3 247.34 M10.51 223.73 C7.26 230.41, 5.98 237.95, 2.3 247.34" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-3kEFuuFhUrPMSC_z8QTo2"><rect x="0" y="0" fill="#fff" width="1076.2981610288416" height="551.4248111818183"></rect><rect x="886.0389330894018" y="310.0305874090909" fill="#000" width="178.19190979003906" height="35" opacity="1"></rect></mask><g transform="translate(886.038933089402 310.0305874090909) rotate(0 88.90002920362633 17.920950758648075)"><text x="89.09595489501953" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">SQL updates</text></g><g stroke-linecap="round" transform="translate(395.1759236969695 191.81818163636353) rotate(0 110.4545454545455 93.63636363636374)"><path d="M32 0 C88.61 0.61, 140.23 -1.74, 188.91 0 C211.27 -2.28, 223.12 8.87, 220.91 32 C218.49 60.25, 218.9 89.4, 220.91 155.27 C217.39 178.83, 212.68 190.27, 188.91 187.27 C131.8 188.47, 80.92 182.95, 32 187.27 C13.31 189.93, -2.54 175.69, 0 155.27 C-1.41 113.77, -1.88 69.92, 0 32 C-0.97 10.78, 13.23 0.01, 32 0" stroke="none" stroke-width="0" fill="#ffec99"></path><path d="M32 0 C84.88 -0.16, 134.31 -0.2, 188.91 0 M32 0 C71.48 0.55, 110.52 0.81, 188.91 0 M188.91 0 C208.91 0.9, 222.26 12.19, 220.91 32 M188.91 0 C212.07 -0.3, 222.53 8.53, 220.91 32 M220.91 32 C220.47 78.06, 220.55 124.13, 220.91 155.27 M220.91 32 C219.8 74.54, 219.57 116.9, 220.91 155.27 M220.91 155.27 C221.03 177.02, 210.26 186.31, 188.91 187.27 M220.91 155.27 C221.04 177.64, 212.27 187.23, 188.91 187.27 M188.91 187.27 C154.95 187.77, 120.21 188.16, 32 187.27 M188.91 187.27 C141.55 185.59, 95.45 186.21, 32 187.27 M32 187.27 C11.5 186.74, 1.93 177.72, 0 155.27 M32 187.27 C10.44 188.75, 1.15 178.24, 0 155.27 M0 155.27 C-0.6 108.36, 1.16 59.9, 0 32 M0 155.27 C0.23 117.05, -0.39 78.57, 0 32 M0 32 C0.71 9.89, 10.13 1.65, 32 0 M0 32 C-2.14 11.65, 8.78 2.21, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(420.41251260854625 250.45454527272727) rotate(0 85.21795654296875 35)"><text x="85.21795654296875" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Self-hosted </text><text x="85.21795654296875" y="59.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">subscription</text></g><g stroke-linecap="round" transform="translate(313.357741878788 98.18181800000002) rotate(0 191.81818181818176 205)"><path d="M0 0 C126.5 -1.59, 253.52 -0.08, 383.64 0 M383.64 0 C384.17 107.59, 385.64 215.02, 383.64 410 M383.64 410 C236.93 412.39, 92.97 412.29, 0 410 M0 410 C-0.02 308.25, -1.52 204.56, 0 0" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="8 9"></path></g><g transform="translate(470.63046915151546 55.90909072727254) rotate(0 26.529983520507812 17.5)"><text x="0" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">EKS</text></g><g stroke-linecap="round"><g transform="translate(240.151515151515 283.9553732264569) rotate(0 74.58315365976826 -0.7570613841713225)"><path d="M0.6 -0.47 C25.71 -0.55, 125.1 -1.21, 149.71 -1.22 M-0.55 -1.76 C24.54 -1.59, 123.91 0.37, 149.12 0.23" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(240.151515151515 283.9553732264569) rotate(0 74.58315365976826 -0.7570613841713225)"><path d="M125.55 8.58 C130.07 7.73, 135.82 3.42, 149.12 0.23 M125.55 8.58 C134.42 5.39, 142.46 1.71, 149.12 0.23" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(240.151515151515 283.9553732264569) rotate(0 74.58315365976826 -0.7570613841713225)"><path d="M125.7 -8.52 C130.08 -5.57, 135.8 -6.07, 149.12 0.23 M125.7 -8.52 C134.63 -5.81, 142.62 -3.59, 149.12 0.23" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g mask="url(#mask-bjQ9m9s5Hp1oIIzyWqC7I)" stroke-linecap="round"><g transform="translate(628.2821293333332 239.24045011829344) rotate(0 118.71197645803636 -48.99352107871783)"><path d="M0.67 -0.16 C39.83 -16.08, 196.15 -80.08, 235.57 -95.99 M-0.43 -1.29 C39.06 -17.53, 198.31 -81.8, 237.86 -97.83" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(628.2821293333332 239.24045011829344) rotate(0 118.71197645803636 -48.99352107871783)"><path d="M219.29 -81.09 C225.58 -88.38, 233.25 -91.56, 237.86 -97.83 M219.29 -81.09 C226.85 -88.29, 233.79 -93.2, 237.86 -97.83" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(628.2821293333332 239.24045011829344) rotate(0 118.71197645803636 -48.99352107871783)"><path d="M212.87 -96.94 C221.35 -98.72, 231.26 -96.35, 237.86 -97.83 M212.87 -96.94 C222.97 -98.17, 232.33 -97.11, 237.86 -97.83" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-bjQ9m9s5Hp1oIIzyWqC7I"><rect x="0" y="0" fill="#fff" width="964.6457663333332" height="435.76736657080926"></rect><rect x="701.7759671814778" y="173.47699189203558" fill="#000" width="89.37596130371094" height="35" opacity="1"></rect></mask><g transform="translate(701.7759671814778 173.47699189203558) rotate(0 45.21813860989175 16.76993714754002)"><text x="44.68798065185547" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">events</text></g><g mask="url(#mask-4JRsygYNsOESEsMb-AwUM)" stroke-linecap="round"><g transform="translate(584.5433634748046 389.99999981818155) rotate(0 146.6860473869218 66.64306840436859)"><path d="M-0.8 0.54 C48.12 22.82, 244.98 111.53, 294.17 133.51 M0.98 -0.22 C49.75 21.74, 244.8 109.55, 293.65 131.87" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(584.5433634748046 389.99999981818155) rotate(0 146.6860473869218 66.64306840436859)"><path d="M268.72 129.96 C278.49 132.16, 287.99 133.07, 293.65 131.87 M268.72 129.96 C276.55 131.2, 283.62 130.78, 293.65 131.87" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(584.5433634748046 389.99999981818155) rotate(0 146.6860473869218 66.64306840436859)"><path d="M275.78 114.38 C283.02 122.08, 290 128.54, 293.65 131.87 M275.78 114.38 C281.69 120.03, 286.73 124.08, 293.65 131.87" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-4JRsygYNsOESEsMb-AwUM"><rect x="0" y="0" fill="#fff" width="977.903197151515" height="622.5927330815148"></rect><rect x="656.0013259674565" y="438.79636644984816" fill="#000" width="150.44390869140625" height="35" opacity="1"></rect></mask><g transform="translate(656.0013259674568 438.79636644984816) rotate(0 75.22808489426973 17.846701772701977)"><text x="75.22195434570312" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">checkpoints</text></g><g stroke-linecap="round" transform="translate(850.17592469697 598.3568892727267) rotate(0 51.36363636363603 41.36363636363626)"><path d="M0 0 C39 0.47, 75.15 0.29, 102.73 0 M0 0 C25.66 -1.34, 51.49 -0.39, 102.73 0 M102.73 0 C103.11 17.77, 101.73 35.62, 102.73 82.73 M102.73 0 C102.65 28.62, 103.67 57.33, 102.73 82.73 M102.73 82.73 C71.01 83.19, 38.05 81.14, 0 82.73 M102.73 82.73 C78.16 82.51, 53.73 83.34, 0 82.73 M0 82.73 C0.89 60.53, 0.78 35.8, 0 0 M0 82.73 C-0.13 57.11, -0.65 30.91, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(869.7495754038678 614.7205256363629) rotate(0 31.78998565673828 25)"><text x="31.78998565673828" y="17.619999999999997" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Data </text><text x="31.78998565673828" y="42.62" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">tables</text></g><g stroke-linecap="round" transform="translate(976.539561060606 596.5387074545447) rotate(0 64.99999999999994 43.5)"><path d="M0 0 C45.5 1.31, 93.75 -1.42, 130 0 M0 0 C26.7 -0.13, 55.17 0.12, 130 0 M130 0 C130.48 27.95, 129.55 50.77, 130 87 M130 0 C130.27 26.94, 130.46 53.6, 130 87 M130 87 C88.66 84.6, 49.69 86.62, 0 87 M130 87 C94.36 88.37, 59.43 88.44, 0 87 M0 87 C-0.36 54.22, 1.4 19.88, 0 0 M0 87 C0.16 59.92, -0.46 32.59, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(986.3896205698834 615.0387074545447) rotate(0 55.1499404907226 25)"><text x="55.149940490722656" y="17.619999999999997" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Checkpoints</text><text x="55.149940490722656" y="42.62" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">table</text></g><g stroke-linecap="round" transform="translate(818.357742878788 578.3568892727267) rotate(0 152.72727272727246 62.27272727272725)"><path d="M0 0 C119.95 -0.02, 242.54 -0.36, 305.45 0 M305.45 0 C305.55 35.88, 305.65 74.58, 305.45 124.55 M305.45 124.55 C187.06 123.09, 68.81 122.88, 0 124.55 M0 124.55 C-0.15 84.27, -2.2 45.69, 0 0" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="8 9"></path></g></svg>
\ No newline at end of file
diff --git a/docs/server/features/connectors/images/example-lambda-eks.svg b/docs/server/features/connectors/images/example-lambda-eks.svg
new file mode 100644
index 00000000000..863c7eb2090
--- /dev/null
+++ b/docs/server/features/connectors/images/example-lambda-eks.svg
@@ -0,0 +1,13 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1133.8122883333328 712.9023438181812" width="1133.8122883333328" height="712.9023438181812">
+  <!-- svg-source:excalidraw -->
+  
+  <defs>
+    <style class="style-fonts">
+      @font-face {
+        font-family: Virgil;
+        src: url(data:font/woff2;base64,d09GMgABAAAAANtcAA0AAAACfqAAANsCAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cGiAGYACHOhEICojDDIazNwuQXAABNgIkA5BYBCAF8SwHm3xbju1xYYy7sd0OAIpS8WVRITvfArcDpBRW0yrYuBoNGwdgevzg5P//85KOMXSkA8Aye/31X6aqSFOjM8yLldTu6uDRvazbyMy9zzwgOKQom/g6a15H3etNifhB1SU3kXgQVsw6e7M0xQm+4QP3vDzRvyYpK7Ba6lJt8H5GV4Xf+EcERLVOkazgxYl3h7PDv+FdjElJVZs7TTRxrr2RZUAZtx6MZOXIlTf6DtDavOv/vvtI4L+peCq+4cnn4emyiLYQELHRxsjcZuWclZsVm7NiTqrgNnuPnmjCgUoQxd53u3tpTX2VhFY9DuFKNR4ho/FgLPjSPINHmGrBMfPo+TrQ/Xc38WQ8hiEpxsolKta8GqM2D/6r/XpvfZm1b8IgRVhHxZgTUmt7/uup6gX8QCoA4DIvm+7/Bxg4sk1iY6xTGpUQoZKDRhH7EZH4vQAEBnNq0lf6SpZlGQKGQMuhwjgwAjvaLSM65Nfe+x7wxumASwfAsqWqLcltnCOahodxOqb/P6f2753zV+9tL0hyp7OxrQGA5SdK6sw4Oe5M2p+PnI29TbYSGwKSJVuOXXCgTYGTAQ4kANdwKoAMD8yzjSG1lSbqpPUt++3aGXuX98JPMVd3kYOQCAceo5A8jPq4mWnA8VObfn/FIsbA8JBAdCakpIHEiQEptVg9qctPV0xPe9vrHi7/f11arv8eRf1nbr8ncp2VYgubCUYOR65OgDBKALGSMCFF2e9PubRe9ecmXdWtJJ6ZxTi0QNlkAbjt/giXa9W16vpePUnVYBA02c7EDabEybhthwZTUn0gv0/3+p6TbjblsxSGFrBPy1Q1mfbeVtr1kWwWhOBBkg+Vza3g/76pfd27XPXbILAVkthO8hLLdmA44fe4Wz3zPDuwmcVHnwtk/ya/ohZYtkUNAoOALNmxMwo4XFV3z4nKJqphbq4kTdICkhZmbtQjBYVNbC4X6OGo3n3X2yl3YOz/M9VsF4q4TJ1jqKjO6fUxdx32z4LcnWUABlTgLJVmKT9iQL4nDHgBAylT4CWKTjHOirY4e4lDOXApp+U5JcqVXeVcuahd1NBV9LuiufKeO3dX1OfK79rSzpVKt639vmVluMa8XSgDoAh0FtLun/kzOic2tta47pb3TEIZmVWj6q6ZkfwZhzw8QA8egQcFCNETugPw/v85X5sUhiynJIFlI3Z8e9MUko/5nHE+0JjS3rx8eM0bAcsOyc1OebbmZZhOTW5udm5y879Wq7sNvIpVyJQiYqFbtGxus2fy5w8yt7hbFZMkbjMkrv1B50iJy0RvGiKl8EjEi3Nttm28ox3VNfEIkVCPdo9kCYLc6T+EQQIHInnzoHkY5hgHz797ne3/L7dbSI7HyBSrukfSOSRjKRRVlakDh5Ecj0XixJgS4TXLWpaBJGgLIwxmJUKk+7rO75qapUspub25DUNwVIEVCGaqMCzj3n78to/FsNd2UYsokxAE9Jaxstaedp/nHQUCjo4fKJAEob1jOau9NX+ZtluLImGQJDByJv7W58quoxXEyj7O/CuT0MM2+95tP26P8gghiAwiInYq4R+OvRUAACAH/npZ0PzWt5/YufDhz7256jFcmUAE5G6CAHSDNBOkhBmAAkAvVg4ASFLBIgBMEcS311N0A3o5BXwGeg0AEj0sSO5rtQJ6wKff+l4ZOq3TCgDYzx4AAH5b/wEAeZdu+N53KawBwDc+eNmGOPs4BBLooVAAACZjbLS7sLHNmPkJSVfYOrXu7Sl71l6+1+0Lh4GknYJTdmacW+fZ/Ynb+7TyAHmkfJNCq8SUt0/3E7bp5Cy32d4iJnn+W6Jl7ifXzd27p+05e+XecECEhaSfojNwbp6nd9zexV0yERnl8uvXTMvH5RHAz/fy6/LLcmCJSRPt/6/3HwE/9vfzpZBJA370Tz88+hwIAA9enduhAHD/8tcfmgzk4SEYXZQ5XZx1fWVFBQDKlE9rKlXNr1qNWnUlTtIkA8B7kzppAPDhvJiXsO/0Z77Nd5ju+H9+zP8j4AIBkCgMfXPPORACoRCtOLALYNkHn+4JgNJKKAONlfLNPfDWdCMOClRo0GHAhAUbAhIOXHjwESBEhBgJUlxwxQ0ZchQoUaFGgxZ3PPDEC2988MUPfwIIJAgdwYQQShjhRBBJFNHEEEscegZGJmYWVvES2CRKkixFqjR26RwyZHLKki1Hrjz5ChQqUqxEKQAYp1uvPtPMMmiJxZZabpkVVlljtbXW2WC9jTbZYputtttph7322Gc/ABg+MoR6LWCRoWr6G1XT2j3mAIARMFCrqQjt+7XPAECttvYr7TZKWf5NX3sPqNM+VB6ty8wYIHO8kGHK2rUN+KWgNLIN4RDlSz/Hzf2/QAgDxppgjH7jTTLZFBMNmAEApptnvrlej3ESDMs8lrFqyTbxY/KOsX6iK7waaxG5TW//d8CBXwDXnyaOWKFHDP+3w4Bk0KUsmdKxg4/hBrF+MEnVFCqdCgcrvLRDeAaqlsdjuEMwEYFUcMY6sMpqehSODsbSUegpK5g8uzw+HdTDSnztsJZ9kD7RDxrWdAwOgHJ+uHEQWFmrsrGHSPMD4sxr7sAgSWo7WJZU7FYFuDS7qqa1vf08ck7eVJI8u19Uu0oWu/HoDT6U4xi8BPdInUBueMfDprK2O1Exo4EowGGyZX/l9oaZ0P/MPeMzolzAeI/h9fJZL6fEiMLR4/DZ9G5R3DjgjBhCDK0nF+rtcJegKWsjbuTG/xnOjy9OjztXp1m9kaiVHjfG2+35kXPTTw2yBm+hPDb3DLw/7fMSpqPUxBNVDS2Ede9i0pwcDVaPyjODQZXof3/5AHJOZuyWJuT4NhdwKkYL6iHM42hbm7mbvR/DaEfU/VD3aWNkjhHAGOHwGL1CF/I34o72rAI8q+iWPmhPAE8HZn6FT9M+p6WpkaYAaXrgCJFEVTGyLoDLOJWQ5euiHZlYqGghAAvhoIXOwmgNTCwWI8TEcGoXl0DIS9NJs8tSAkSViuqiqMIyAz4PBRZxntokNoDNDNZvTTuoj1HNQjBGYKEjtASjwCRjal64JB1hktrjvjIeys+qaWKIywULhp71PibeIl/ZdE6mwjw5hTlM54oypce5/mf8h/mnslR9akjCkyx9xmfhSfoX81SijkaPlE1F6ECqo6QU0knhTiQVepzAqeSdKp5CTomneO00LYqqCBYUZMmxUIHBtAj/omsRVfwA9A8UXSEfEB1G4OVG1DvbIyPijZW+QsZC/+NnwzXsttuwVRdsHHRx0ObBxZK9NaNzMqGONgBw4AJW/24kFwSGXiE4C0ObI0QEHBwpnvKMc6UaAcBBbDBYFAHE+rvx8Rrf5t6QY9zWPd/2Mw32Hqx/bo5BLlwc27ixQHKbu04zHo27lp89ugJovwHQZZIBtiraYuammzp/YlWf2tTZSt2mOJTZ6dbNYYQ5iIc0OdZMGSF71AXIAKT4CMOmZEp308ZSxRldADy1B6GV0KmyBTV3ylrYRpwx4v/5oHmQXTm2r46zevcNLMLaot93tDZ44/pmCa/5/QEdu0PkxixEA5lAsN5GBr5/x7FHjdySJ6peBpn1gfFeYG+lcXK3hkchnxqyBtALsBHi+5QpdUd8bZ0f02poNXggNUCqXpcK5ViVrVhUZTvMhQnModqUo88/7/CDriEAkQVOzJNELBbjo1EjynGBQJH8tmraichIU+rRrcpMma2YzjW3dYMd++AJYMauqMTRZ14UAoLYb16J0/lMbkKIuZGCVHjSZoMZcMeYfUQHJ8C9ReOcwawLnBxhLJc13SGdb9OSQnPMWBU2pUkaFQTpiLcCByUElO2xgStGK3sDxQGWsQKPN13X1UEup5GBC+AKWzulCyOKKkox4YbCRwpJaVnZzceEIGZXp2UXeRqgNFVJyXGgmr4JFSsF6B8mSeJA6CE2kKvDsVdXImK6WPNI6BQiAtjMTzk2hD3QCC2yDreK3dIeNFEPnjapg7ysW5LsOkxXaL1WSvpMwI5BR67vA9ylz4RposXi0i7Pl6E1BQuk9PCt2SF/tICYMSEQdyBz6Uyr9yH4ngsVTxnTki4lAOSPxKJ8UR27zb1/KsD4Pkim/TwPN0AI0vuNkScF3axO8CWeaEGeF41qUBMTch/B+rCLGSiPDFF5S1uU1dp/yssDxD4+rScOG+I5c3ug/4/jfTsoJ9bWreJA9uEeMLa1daqr46rmWxBEEa+LO3IZu9voOTF9WVEJuUoWj8OL9KQvt0VfFnCQJxKy4I9jPmwDpJ3ADepU7PVY7GmHiUDUzHJB4ChYdcfT7vex7AKPH12lkI3ukAkBQr310e/gUf4ML6nqnfF+ch/eFu7XfscKPTaWMqOpv5llWiyGuty/eXyH8irGHbIZWkXWKCSH8iH0AJKeR7+M6mo6sRWexmeB4gMwUZB5RTsHeuXEqq93jvK6weNOAtnjyo6jBrAuCoqmC7EAyEsvDr0IwkPSLs0s/YCJgqURHnqOA/7II1LZLudVWxXl4ShQpjiLjvmT82UXX+kqhRiho7DQUXlPwX9bq1SIe0xZnygT8xhTxESAMbFt8aUsWnhII97W47q5T5g3A+witlMcOuJlqOyQD60pTf0jrS+Pr13WUXcxWR6gwl849mDTPsh9ecXI48BiPiG+rh2VbIjByAG+Gjhwvx2bhhKunuJ4x1P9KMac+lJ14wo1t5jWSVV/GpuO+2zt7nOEZbgISctSfPCEBC0Fi93W6TtPmVvjQgs4lCSYIUgyKTPetL3h6wqo4j+BNOvX+1VZmia5EQsf78NccTzHg2xg7X5yOvzxpWfo+chH2CAxllN3UNoQy9DT6UESBP/oag1I5wC9aoZwtUjSrnp94aaUi+yGRnhqfk9ALUf1OaWV522q+s8Km8c3wyP2UxbqiudRWmQCzTBFmqEK4c7qbsQs0XRFrITrAcSjzwmci2iCFbohpI5n0D9e/3G5U12+bvr1qM54USuWC1rbjg4dMTEhHQSIV849b6uuDtA//i+AMMNKWTcwHsCEmMNZXlNJPFGznOkh8mDGJxW6rZORF0sRqu70qRj0lW9Q2qwoEw/br+bT4Wt2zNaOKtXsqULwj86Z4qmgAgn3CmrOKFp5Lt1YhPK8wUsJ/BgervTzjTlPResyDS1wYNzFBfTUsy/nd6htYR870mSf6UWwmMdEIOx4UYCTt0Y5WJytlZjqcP/y2hkbuhdpapclqIf6C44plflFzGZ96O3QxToYQbsuhnZePWArBDAkyZcEQXocoWrKCjSmTPiykomvu9dM3ICYmIHyHTriO5kCM1a4LgbBbED1lKOsqOHikdYHpgdUa1q03Rl1/V0/y7IU1b6RjKqyojzqIEtO4jgO8ISLOaVBu4So7GYHDBOAcQfQ/WgtQgwdUuAHrVcO/oskq62xpBt+ga0+SMF/JbG5JCR9QjLySzjvPKX5/2HdmckFLd9CvS1weqRFwDANklaXtkAfPycBo0khfaU/VQ0mK1vXCNMJG0RHHEULs7dmzbAS5GfQAMgJDNAWPVwRmNyUFUreGjISX98W0tt6tMkxU2GzxITNcfYgMT3cTANgow289so/FSwLj86mhfg2v7bqnr1vl7M87eTwqvlsTBZ3XRcP6QzSP3nXESNI+pXx/uM5b2sy5sfPMgUCRfEfjjSE4PXlYlMn+331ignbDlRV19BUKV87JV5vBMqXm6Ix4xCpPF5EIOf5KGgsdQt7nw38DT+OTyrylaGtaGwxyB1NEFSCfZw5MT2C8Nm9Kj1B0Oqo3j+aI/n9Luk9M+E5UmtfVaTotdbg/6zo3lN9dJEbeQ6hLbgusgGZv6kr/Wg2yOtGfBBKy7NY2qw50jA7YFVOEse1S3vVrNMfkx/3knJ2S3KISf+Ta9FMLVpMn0o4gbCFjNSmCLFa69fXD51cfAs5x5RPYapWe20Rck5J7YTHw88CN4HpmXJY2naTrJFPJk4CtojNReHSKMqIT21JfBjdADghkp+/0D6zcYJ7e1dLokDjAMtrDU5M2Ahgc+MIZMxyhsoYB1iuZQpyPvw3AnkSzjd18RyIEzcrH27G0WfYOgNCJqRYYt78Be7FBMu0R/KqL9HyvvGo4EWkuFrJ6Y9pWq7QJV9cx7e0mn5AYusQk8woKkPa+t2FVoI4RFU55UubO47tsoNcqJbK6sFwOCnVWvyYhXIB6MDxOKrK2qkyB5Tl0olOFJ9mpIWj8YAd6J1NYfN100pyZwRWKkFRQVRiPqG4CgPB7ku29oi59R5Vd/XpXLxxo8SRlHQjOoHSA1fb3GzW6a7LYIqNXKz+J9VE1YV0HuTOnrMHy6BqP/4xys6nD8J7KJUCE7+vx776uFYfxYSalVTlxMEvi6Lc3xYpXwp7J+BFr8v5U1TNeCarbvYZo+kKDtG7jbTPybMS6THUALIqhJwAmS42sCtBR4tyGw8diRc6aj3EisGDbCs46b4qrqfkNh1SLQH3gjqAMCU+HP9AoEU/LiQQsrB2/emNL/TuL6D5kljd1aQqD18Aicu5AFpKVFbNKvEniI3YdVfSPAAhGfFlD/zV0La8iRe8I0nz/k90gbLHRh6nlUeGrqwkao60rC7T2rr6/wLa2b6/z9+KykDZNzfvnNzws97nV9+QE+Js0s45y6Y1kgpm6GTEvQB20xQRp5TmdOlJkB9yC9geQShRkoyofl0jhHgIm9cz/8i9dYrtyjrrFxxRkUVRiliX1rTLULIKQD5y8oTmNLhcKGWSnYq1iT2b5w4gNo8L32gfEdwM2/JV47+rKZtul7IB4Xr1ckklpkCrJ3bpC0qZbC7FgKqDG3r8vUMpcZyVFQWvFD477sdpV7ERmDyBbkGVhbuFhUwZsb6mHwb91eyYTM+3RYoZDSuqyiTFRk4DVfZ9NnzcY2LL3cEwlAYK6WjG8LgsDuxy9XqOg68aWFN1A4ykXFdACDdoCgrlsXFIlnoU0yWPRpoUoAfhhjDwz88ReH3QYj9CS6T50xMnnZg8FyKK0ak2hnXHcpT3zeHyfTBuAJCREyH/CGmAmeBi4oD48EeKC77pGrc+sqp/vN6h4rG3dWG2SiDEmkd9eYHptMUGIZDuAEZnmEtyhaZuqoZUrpB7fcmeTZn4PJyQtAC1SzBYOBJsIzEhFtJKB8Wl1D3+guAeCAMCfKa5aWICG2tcJGD7ms4WrMrYUFpzoDRZNSvBQ4qGsAoVjY0arTEV5CtMqehvUn+JEgOdJkLsUgc3EXWYpRG1zd7pBWCiWNoOlIcmJ4THAdKBqEWHkAfBzD8oNJQyC2rBGsTpjmGrQnD1VpztsnizQxo8jwmvi+YocMa/SyNctJQWe6/WWhKORIjJ/uDJIVmej8fDr74XrjdFz84RroMh5qU942TSgFTWbscKaeRONangQ1ziFrXUuhvAZPmA+NPFZf+b5KGxMY9w3+HEf8T3REulEVXxhNAa5VX3ac5CWbHLOQBywi9OiAoz1oNPjRHzelB9TTq1f3+B6aukQksM6VtY3Qik2c93oek7S/99hVh+Zsx1aD+NSa+XTKQM4SGlVMz7sfp0jhCEsUAI0UbeY5OWrkUP3eZFMBTPB5R4Fxl2I73DIWCmCFnriHhbTe81sqS4a1tOng9eeLEdfT5ilfc1dadZpuijqJqudO3xbvWFzhEUXkcrSGl3Jh5Vp65aHVObFyEMHd5UVEenrpQZtc6tp9Jz5prqatwBWnVfVPFn30A9ELtCDMzo8ZQRYvu90j+mlbwz0yG1Z2q1kI7+SRRblpbq+RYIBwsvmtrtjhypm7Eqp7YCifBjGXUHIQ7Fw7JsKe18MiMOR04dz4I1HEnZeQ2GYAMBTCFJVcS6AdvtfIjvbZo7+5X8yyXdDFPsQAyY7VkZl1iX2bVFCOsAm02DkxFIWswTAMJivfk41oMje7hBQkyrktIeO7qxUi7bvSpyNgKLDrzNhQkQzDqW9qTM7TFLZ8bU+40oSG6Ohd7DzKRSfvRnSCmKSvWHgvaY5SJRbzaFb3SMBAf4uXtV/qqWo5US0/fy0TExO8S023EQkn1pag0NM1GXhDQgJsQTgooXkY5qad4QfPntE7dWQzb1j29RBzf9hPcSGu7fpblc2kVLnvj7GV+WPaOBGXroOKSjuD9AFMCAqaQrQ69wGsUypanluUwTYPXXz76FNtIVyzuGui2YIWw9EYc7xzwJ5VWbgDmSTMSNM61X611iA9GZaY5iFKDXwxefBxyPf9MsUMW6/m19ygSorzld8lVHqrrqIj5ivCBc919Aut7xgJQs8PXBWFWCDmaf9WUHMklW+grDdpTdl51HRmqqtxYlMbJbLUFiFKFCIJSKVff1LqXnKOUjLbUX8vlIvJz5CwXi0KWpUqb3VptPIvOXZlIr+9D5EwrSOPXHRp36I3ZXKJjYwwyh8yrW8WkcfRqn+7cJfmalfKq1oVcnaa7Ip7LEd0tVO+BRM0MeoYAqTuyu4O05YuOJKGexTv36GA3CMLulw3ptac5mdQ8GB/+YEPdUdY4mfHqBIMJHKSZvKdJy1Q+KkL8XRMoXqLIeQdNRdTlA8Tsoej43QRgrBUlMRpSqyZKC9YdEgCPzFYfmroJVmtq287v4ABwfhm7GKrpm7tjiPnzN5VNM1VsB0UV3cN/DwKhGbZrdgoz3vT41R+zoEDPwcuusIwoSd4qT23ODlW3ZQDGywrPNKkik8GlS68q7M2on2/kTVpeK0W0YD9N1U5zddn3mcVgg/BTiTq1/tO4U6mV/8OTwdCzIkkcPJd2BbJQ/wZ1sJ3qoSiuozxTu1Yv17q7GnCWztzaP9+HFvJXOvqbsKNxtw5te3SabAPYR9QBhU0C5Ki9zKX05qR/TRFTjMNvQqEtdQI6X133upZQNHC/9WsxvknaG8PMR8sKTehUlTodTtrgdUAK9Nzfg+GqrarXWLZBKxHK6uqo3xiiTpgTy6UKQx+taqjupXaE2CwYzYGlhEtYIvhlNyztvDeY2Y8pcKe+ZoVlYjM5Yacxo/fkIGtImnhlzBK93VEE5jyegyxVQLZGPdHjDp+Ry71Q5JfGXDreOmNuHuWPMz7juOKBvXQDi7tFUmGPC36K/FOBRsmYTEmJa2PGJF7wvtKgMrd6D7GSBkMnyuJ2VTlJTZFo+9+EyswwTTFdlslwVnAL1CKZ/KfSI5qsihC/0cP7dS3Wlfk52hV742Bv4EergZ51PjWL9A80yI3WbKDp5PlxHngtEeMfCo2/3PhN6nIDmAHlJl/KiMW+Gt+G6N1N0b3+EGbHM0jYezlYPN+cOEO4Vzz97ZU251pMEUk7MiXfq2r1cZkvkeSNd71nkK3/C8x1MOGX5+MWwatPQByQgPsR1qU4FjCfJYcvrBAOlOFQGizW3wdv6UDCYIS6uIVf/xLgZdjrECCSWZDdq1a/CmdNTY9exL5/30g6wvcAs9I4av1ycA0pUuHSm623IDCUm1ft22irMcJ5WhfHia9lVREOjLMVgmksWFFnv/y4zwIR0LQrCRuVMbJXQvmdkF4JAv6pDecs1q+w6z4siQImgrIZpr16nkSQ1pteYhvt8jEk3VNNzSkTyCK3/GoxrWK+DOO3RWuT1qXbwgjBwP0DcVOrb77eVymTaj9Ah3Slb63MCqiQOmx+PQRUq2Dm4AAnuP9vQhT5bq1EJBwpPh4s+nKx6e4jPmVvTnqvyupEEn4gVTLC3sKKG4Vr9C/NY0rcvbZNMKo9WcbDSP1p3jHml2tBBR50t6kG/T7KTJBCeOJLcuol64BgTgV5olOXzDWxvpweYS5RtlIZatRVR79rYWafKwayI3aA8fqsVgeO002F8+DZtDcjiwjLNzrX22tlUssuyRZo1hQJ/65JRMBfnREpVQtfTYfTubGYgnK4ozBZCvtEx+fxQVDIdeTybyPgoYV7dECbG55uhpcZhvdstpczQ/9ToY6Eah0SKyQyf69DyzgdJVunT0dkT0p4+v3k1bXSjTRl40efIZmrrzjQOBEI44XznyRlmgOxiEk9YZOvbAKqDqbgN6uEAc9nNGahSFE3BnDsLx13gj753kkkajcdn69401pvO5ZDHSzRQp8mHMFA6s4gDsIh6pdtKoCu41BsfaUZf/MmN2zqcsyjsBI0vETyRpec0vZRu9SwmMk8zukb3CYTODOndBsNCTHVpeAtpGTHlgCBypAAs8qoZeIFcfbrQM0D8A/pUgS4RuFeX+lSwUD9Uhf2R35BMAv/uV8wCJuw0tZAhhF9ourZ5KvqY4tABwQ01eRlQVb2F473e48sdXGoa+ulEiW30hHTIRJxbM2IvPKTd732HlM55Xy5yDHFSElkz1C0euY1MCRfvzmhan8024uWpAhEhhu+kfcCCpv0BYhAYkdKq1gyM68p10sJnn5Vsud0GMenRu3P913ue0T/rIBfRWM5Er0Me0UxD5Dk8rEY63Bg5vuFgNnlp7nIUcsWbRYy6QrpXM650q3cq+uBRhVFN0eCCsYH+D6t4TE5q6M7FRrkYlHShV+tWngeMRw+vnOdRj+n1HE7oCBDsufH4Qmrao1hJd9NwOXg0JQwdmM5FJUqqYLVsFvPzh2Z5spD9iCBkYzn/u5GY6v+0szCoHVimWdzmEqJqZUj/rIdOyq8YwUogPw0G2DBdw47s2ZocNYCc47h0NI4XfOyUs5ptsVYVPJ6rU7tMSmnOoDiTTGxJEU3NvoAAQZxAhZiQJs40+iCb4grsDD/S9+yiXpMXGR+dgXhQE+6INPcx2c6S5jNmkZ3t8qU8F6y6OJzhcdFYT4ljUCpYT2OqFceBjtObOC8JFnzwBRhWSKts4uAJXbZXD3AKuBYPncMIDTJzlZ0dWp0TBBL6slEyTbt8hJ/niaB1Fqus5Gg7Bq29MrSUNnXyNb+H1uYuzfusfnhNHO/kHdPGI56JMetQOF30JT3nippxRKsZ/ZTSA6vUtSikC2fZ2YcR0OMJZNlD42I2qzIQ8mdoQ+rExx8T2r8O30HPewrjs0xnZf/vSUY2Bw0MmFk6V9Gy43mdY2bpNkvtvMgaBI8gOn2B2UbMIxermFQhtnqRCrXww7S3AK29OvX9aW8UGLxu50CpbsS9B4uEXKRi0wdyJD2qjjGf6Fep7psNfFv2wL7Rt87UKFF3WT1a9bsWXwrYhCUmJl+x68BDx3ozRsnB6KY3YcSrTqQvlBvo9MjfxnBTk6/BH1P8XGbG54XMxHv4STN9n2Q/4wA5grBdlukABnNeyiIvb+M38Nmv+AMnN8r+PCwr12l9zlpOiG5EzmTLwhIuFwKdHgd7ezWAylt+Lbn4HU5xG7CmoRoZAquk4Zq12Jjk3afTyg7JNIBFva1T0ed7/aPAvCZv78LCGtOrkDzy4UvMPWmf+1tNGYxc3Pel8ONP55xjHWIiw4XAtwjENUTwXTedeCLfO4ehHhhnvTcPmNjyvpYMRG7uAkG6nfJ2n0dUKvO3S/CFy2X0zl1SalCBHFqzTql0eFCgZdU0RBP8JBYTvSqAbTm8A+et8HKKM3NxsQ1FsnKXej8bvhQ+dthk1Y3GGDOqItkoZOuUflw8hhIhIHjFxbw8TXQQmyunCOHRYNxriKbdgcFQGsD5fBBJWyMRaV5HVTV42wvBj/LDO1xJG17e3xJ12brGYdAw9qTkhkrT9EyZJzF8IEp6pabSIU7jJWmvV+i6b/D0COxOvjmqyti3P3Q690AO7PREETPQIiLqzxU8WmECO8Up4mW/GNd+dbdPRwYOFqdzBUsaiDTjDZd1ExWnKny1GTgOfGXtU3YB3iRIqa5H/Scxj4+UcEIaNk3V4mX9mk4xwRIMQTh5wIRtvSJJvLm8T5cjZNaQmACJCXJxSNfk+mPemKgR2oRvzs6aRx+zFLRkQnZbv7o5Hluiqlm+WRnSPwEbMBg5o2cmOTMYFLVINE/ZnS7rkhG6LDU1n0kpEFxHCsgHAzUNr2B3R4Z+GEXxXdVMOEBTCG+GbgEpwac8ncPJErQCHHyBtLC8v4ikggBRTaNK/+roMbTL6xvoRGsmGkJgRhQKkZ9YTXnLc4HXxJjk/DD/mts1b7Nrovk2Ddnl748Yc5nrxGQ5mFHwkHRMVXZX33taQZVD9OJjkeRKz9RJMg+EgPCOpcooHix06PeMqluQWS9D+oPO1i44yOsikRCnEJET5U/KHu5rSYvn8oWxAAYn5sX3LxgV4oLbK75sbS9p+LaQ6ywSKXmT40f+v0DxzVCiqJB05uymzm/5NYI0+U6J5cUx+VTZHZheBL0tUYnXUUQu9zXlO1H0J6LLzrhEaCYoSzkMvN++2YqvfxuMG0/Adq4w+IuQoATL8kqHikY0L9AsjwkfYllrk2MewfzKxrIbotdYHDTFsBMSAvfCGNGK9Y3loJGLCbX5gq+thNTOGdCsn11K+SbYYWtollDRGNMy5LySHwzSdDvdRhydAkVv3nogE2Hxq9Jv0lDTyfXwcnDQ5zab0oBGzBD/LiKRowFvW2MCPowzVTQTgCd4uB7/HCjPGkC+ID5YS16mWAQzWvK/mLB3eQ+2UTkNDfDaYRA+vEfo/LdmDCfMGd4y0ijGz3ZpOslNkXOYUO5xYtaUJ5b2L0MtHBDlb8RSj5Y+RHAjULxnb7L9o+/HxWvM0A639Wwpmrdd9OJGwZbZrEyqwc3BAdGiYnJBuJpaksPgCjr+C5Znjd6TK420T0FXnUk+XX7b4mUVwcusZuQKCnVR87BX1c9qRR4fqDdTOyzRxY6XI1iWKcQTpvfR85WEfulDzGpWDI8etr+u6+c1e12w5joKLV/BQPvfu6lHoQaKw4vA+Uk4Ze6W6uXEQJcTSzQUhIEwh+hEO0vHxBoz8b4S+7NO1YGRx2fcT4KKjAOau3VGdYf74HzzluAY7U5IaeBYBR3UitSXMd7B5zpDDik0iHbgA6qU7OvBlweZkFdcgX6AEuwXQOjez0Litdg5qkOwlOTXuByDYx5IYrLuEPBADbVb6uqEvbGIJa8KK95PsQShl55qlonfXxKC1gMfEaRY5taeSr46wkzW37XVlApov4J770sDSAyDye6ccOUvxWv58f7rJdTVGc/iIEtUHxlxsD9z21GCAMshbKDjBSyH3FBT5/6vZCem4YD8oHzvz6umcG19ODLv/DHMx63ZKsbLkelntN27NpCexMV413C1AiKqIYZ6QkcfzcnkO/BBxBw0w90DRu4tKDKdHF+9+s6XDovzFCaPjAvQncb1xmzdwrqdECqoLrJEiAeGFe8XSbptd3ccY7uIy0uK37mrxN53s8o3iA8vvnNhJWIJAWIazqL3uQ8nSGVjnvUxp0ysTwnE9SlHGg2PPVjT3kCXhpptvWE9h1tfTgdGsl2Vks70FUqJ8z4sfzbccI+QQ+5P6bNciI1poo1SAkeJZ1HjquEoLZSiKmu67YMR19aVB+j8o6STSjAdduvB2ADJsmSy4yStdsTo70fzUPfG2gkjIvkn4yntivJTjigX56zhT/3vT5lhBdtpeY0P347erSJTZeU0+//9/Z408t8uMGPR0yEsO77wXaI3iC0Hp/7d78PAcb+7hXghskyFehi0wTuqnqJvLkC26CV19cTBv9XZuPD3eQyYV7BfQVxDNJv5cAac1TEqWOgXRBF/JOl/F9mY9wNN6jFmKKF8k6ZB2URB3b1eg9YWExM7MC8+6o+Ouk1U6QAhXKf+nqRgH6jPEEIjnrT9hzPbhsyPHL7dwPNWp8vFe3pCOZcYfL6KRyi1xfCzr91n7R5rzAmieiG0wzACqAV1cdRUAKPdRA2DTqQZXHXUOjpSALnsD0PJCYFRLqB4LaZq/cT4+pfaM4dbdRrbZfqRmtQHn1yLKtg1Bl35OMX3mfTacb9UZiCV/lB41pbF/R6yMUO3WMjf4iH5t3fmrmU02uQptVTmJCCL6zhS4PuAgDACDsmZtTApccWXxkfsBi98pEkp+1rteXmNY6eqBX/gmUDPJ9dwUoKSIwS1F4jKWPAjd/H1lfb7vTXlfV+NM1KTV1bGmITlpx+iqEJl8SYcEISra0WR115C7m5Pm4r+EilrWIC73C/phBu5iOZWeNm9jJ5NQot3GdqeI81cD6JSBEohtyZEADZGihlw5o0he3heSwKPaL7CkzA/aTs7t57aZefgSH9yWg3cUGDLtbfaMpyQFgirR6Hi5buaOVso68JyFDo0xBYxTvBhsbXRtfqBYlGIzbaB1Guc0RX5873m7adXidjQkNt6Vj8f8XyhYMvPK8N7FTymuECQ2FAL6teNyhm/NMmKIBsXrcWdyDclIP70FiGiyQNrvFtWHXHV00BpordJvPxArJncr/kIyX7RA2hoSif7kbRrgglAPuP1OGSCMa8SPZNwA5LSfMUwmuOGymsKK8cAbVfhl8AN1HP+hT5ScP3nY5er5XlUaqS8RWJLr6SYSH1y4KuqZ82mkEbWp2jIovRmuZGcc2RTYkO6veiDEQTwymHxRZIG5pgYf/mV9MeUl+tN19AcWNlf3NKHMN/BaiahQCbUkzrj7Vb047fR4kh7IqVxWHJqXv1YMRrb2R9rttCu1NQLduxTXNs34566B709gJJIuazjEiyxrdNPk4ehwHkVd/A7SQ78YjC8Z2gJHBZLh/Pv2jHGN4RYCi96gRGS2G8p4iN8yWvRGAZj8GUt+umrs2bFaAldpB6UvtWHZxgWNpxO2dvOruChexur7SxjnLmJVngJPSbCIf2n6dBaJhjTkdgtzGwSloFaCrbsuMBr0eFkW1Pe0xXlhYkzcXLxQgPi4RJX4v1rQen0Xij2cLoIwj+dkCHPEM7vqUqGeOImW/3xyl/K0TS+yFMvbn7qo+3W71Bk+/fR7u9q1QxmTbvcN7mJjar8B8wLBP/vmSDgwhUuCVY5+wdPzOJxE/xBTA4zhF6EmZPFvcMSkIWT1V5ZNuacbTvFjB7uXLpTsj+V4CkE+fUqCdCE9nLQTNVF3FlQygXTJ6D3zfY1ysYewfHV3rJf6qfNqhu9Ou2WxKw6zZ7/W6J92MUBGpzLp5hIhbD2h/zv6jGlvuHCvknY4yB3wlYKAUwlOaXSo78Vn5TvtwIVYdaNEAS7fjNVSzleeKMn9+XFPNJ0RQWPN+CEOX6MxoemJSIPW7x8NS+7uKSNmdpyaFd0NvYLLlB6eXzt/dUiQlOal6/hLZI/qC6c8RwsP/oM6+FWZ/1Myw5Th+F9j+I0XbygSu1oUynbO/A6NldHu2ltiUVPWOkd7HJqj5ir3kk/Ty2vT34mhFATb2ZZykQWywWfO9/C76AvEQSTE7NRfsLCCVLcQZ0ae7wM1pj6rOJbhAO/1Ex2sm8zO1C2s32O9Lubu/5ghXjrFpqheMtpI5IqVYyrsHkQcE+YkuQlduUvxm4mXNd0JpLeOkEoCcqCIIYwNnRnsr4kw6zbm1x9gvpOYSy31bi14zcOBc66NXCWCvUZ5yMo3IuH/+XvxquzJt+y4/a2JIZU1m0hejzu2KgxxMKPvyswMzVVtzVTuj9SS8c+Ernnzf5KK5V8xfxlUL6vEUofMWrKbHZbW94sc7ncHjE9dwodcpPNh9p5Mu+58t6MxZDPZapmhDi/mKwn2Kmj/T8QRQxlUZrmQacWSiOHL0G8DUEjWOx7Zauun382tiJyk4aw7w7CEokcPdaZiCANnHcuxWpSIY6zQCJQrs/X3bHLZlyKcjs6JfY0M+5W5DkRQAO6hFIv/AUbiAjZ+zr+TOQb889dmnDl99ADWZIPEKwZM7EbtB+lI3aJ06XNl1bQLhbT7tYwuSDo6uuOamO6G0Ween/R3hjTuM0p9qytNp+ln6EXFZRDPO4qUyHmKs25aHGi8JMIjyB721244cZOA2XZ0fcveOXfeUGpeKqjDmjn0+ez3Js85uvsEp9JPFbCLqFX/geR5r8YA4E77eSfhUWLN8gCXq/ETPLOCNYKoTKE9o2o1FPfB57sV/2/fmn5IW6S2Sq/VSmHcbF+/eHV4a+MoA3Wu/fFE1yuLCY8wfx3fP/VMiCKpNRHkjJHUk8HEBu0Wj9S7go91pb1O0OR5QRoHZrd+uCfC9XW3oGh+t0W7wUldiWfQkS6EmRZ6fN/y86sKl7cpmYHQvYy5mYVT0poj5njgmq7rRKGRPc7a4GnfsB0Rbqa/78mtRtG0nOaX9BVDPqvXYxeM0s5XXpWVgkd36EJFvMLUeLCnROfO+ZSJZr/RhhYiIgF7Z8wiSIrUQgeT2Cs+KIuEOtnTqxzAfWzVZFcH4ctRPya/FmikspwvMKJl/57P4/rxWcmqi+lplargetPV63qXYUnXkSwonUNGAHI5W+Itjx0DJazxY0Zc9AKPWuHp9hR699urbJZKODNJwWfTWsJBvRPs6nVwklgAbUyf1LMlP8H52UDethwYo5PI57Pt8cpm14GXbQWKddqSfn9CXLYS5WyMr8qv2XAhW5QjK8t+yHpea3LUDyGTmTF+ZQMCiIrMB+TxeRyUS5svSz6XY4Gsy24w5fPOnWU1cFjAmHxt+vzlKgHHrjKFMXryYOI0lrehd1yvXOT9Be3bE9O5CWPeqD6r8UpixZe4BZJLpV3UzYS/cUdgmIkjI05preyeGDLLDI+f1E0pa17SzDYgVygLV8I/RdFVTr5f9KBz/GaKDuakOeGwQwHrnj3Yi6V8iNsn9fChZpU0IvcV68DB6wvJvzii8JsUJ6Ge7ZRKQ2wmFPwJ2Ll5THltI5g7UnPd2VT6Sh63r4vj4nVzyluy76sJDG3wnYRcO+ThUVtyuctxUOscLlk236XkSZ6iKDQwtxy0mM+WaHAGIF+SIg9iuaffMs/DuQzILB7fh/9cUpY01a0aLkMHQfxxIjhy0M7Lwoi3wJ5NFc6wrzxhk3+OI1Bpf07D2OL3XsXqb3WdQ5tsXvzMTF2KApOfbto6NG1zW/DWhKr3QMveliBON1+GELxwEL7JQRDXYHWP/HwNYmT26qoUgAXNP/VMrAVa6QL5O95G9GbmGs0T6uZVtWI7ZI4+gfRz0MrnQySktE0X0DNMMS7JA+35dvbGFzniPAn0G/teKPs5pKUTuU8nqY8oRyMZAqSjQmcak7PE5U2pDSXV5Q6n+clYoJlof3KgygTCMBXZQhyWeRTQWhIK6VAc64/HFkosYC+RbDhRxNWrs5PxvwhwPZIYe4tNK5Hw7Is1tXpOGAibStOhlkmL/VFhq3a37L9o85iHE6z6y1XTnwPmpyzq3tHmEqxGG0vQFQr1qFEZzsnLF8iiFUsYduY0pLl8mQfsndIMtKCp6sCiO/86jBnF/gON2M846YQKFsRLynOGN4L2UoZU3d1W3/IX3GcPc/I/DMrrd58eWzftl8PlXUjHCgXgUA3NOz+rrQY1ZsB9EW+3gbRg1Iavk91y2E+GLYrGvYVNbOktNVSHml8cBESe2Jm/wNiPeeIrovSVoUJ/jZMuFqg4QBUPAPmHkhlhbELfD+rsuTW/kz1069mERq+6rdk3PHK0PyikanNbbr23CyV3pkLbD49yPeWRqU86aPwzFeX4SRuCQ9mNNUgtPutQRviJ4Tu9ixiAjfiVCa5VIqhUjr+a5hpbhjekNbNgWDB4OJLL/PP1LzNVOAxMGrGvdLeklpQZzk5AYMSdgXBn1J8sodCnLf5SvtL+Y6RaJn4nFe3eeTxybPdyYJRWCfwLqw+0CKuVTPLSrN1Yxf8eidU5tlElEp67X2f1wrBePksiHRmj1/2v2X/5c3p5X/qg0Toif2cXobiW/YXW7Kv5AA/qSC74EvCGIihAmZcwzbyktnKX7cchoq88h0oHAfANvGNHx1NnUXyM5wGbleBA+KFjTt3uNnQp0i9nrEXnVW3Ot24MlBQmdT/GFczdYfUXw9puLGzodIU2iVmZyGeVfmAoFpmMXQlmkHC6gdu3lpCn4HcFwne46w7EmFCEwg6b6KKQeYzWupF1j/UTkv/IEtfFykIXccOJUlLpeSg2ebo/Ic6aX7WWC0ZVvRmwXdj44DGLuyNJhHmX9b35/KFKvHBCjJ3NTWzhiIpFsTKf2XXiuxWLERyxcs4sDaz64IZiKArxMyBGxP0XxeXjfDoT3+4y/d+8gY59OwvJAdH3+BXqt6ELCl3pDwBQ9J9klHT7VeUtSb/SR6QeEiy5GhUq2RjUb9pB8ow+4DpnzsyxzL56R8S04X9b19gMyef6AlurVcPRA5U6CVnZWWJUmoZeKBsogiKVbe744IsnmM/+DkIpoOwBHf3hgjJADDtoCUpRS/N2XlQeMJfDjwXb3elM/Gy/ESJeei3fFGvkeYXmGVSMeVIbMFiwfoHtTfyj1a3jYbBe1+zsdsNQGh2pKYQb/mbDtzy8ekSP1xApA7am3D15Hotut7yytYUuhUlZH5qfHmkltbVKlSpBRfqQNU98kBpKRpJaQh+2skuOq3kWvd2kvNAGeP9J0JjJ/+kUxSpXqnDTkOgIXu6dxv39hPibdsdMT4Pem0O3E4kGsRgmkF0I1ZtbWk1FQAQdbmOISEDDO1WELc/sleBdJdTJFn/MCattmXzMGygo++rrw982ky43zKW4WHVro/PpFBvxLO1BKK9v+bHqddNm8e72E5CqYmTapcHP2d6Aaox+8WjcPdMhApFb3w8am3qeu3raOrtwmkp5IwHn6rEjQ2mYaQrYpMN1dDR+ccB6FJHpCJJifMpPKI4lThotz7A3ieLzFB1qOg8ZQgmwo1iu3B6P5npc6/hQabXcsXNGRuyp6LsBosMVid7MIWyTuvNaw/uR3dp0foWNW4f5YmvMiyjzhjwDxDXc1xUTvybr5pzuCTeemIePC4y+MP/99x5VGcAZruaHwGpf7eUzUGGeQrHmpBANqUw54bvOpGm3TycDxLXeukJBLmwJHRWJa14Ubu4auFhgaLeqQ3u0/l+gGz/oN7KzeeFy+/EzDgNZ+qFu0j0c7hpHzh9ZNnCP5jatlUbkWxe/ZjRLYbfO0lz1fG1YG+Hr4LkQStNvUt1r8hylJthZ9KmEeLmglVG+YeXqWrT7KnOX2N/yyTQ2TmpZ6QWYDaTnHJ8IYMGCqoYyf0P56mzFqjEwOQLCR3d4YDq5hdZPdZfW4uF8fbRgZRddqXFknlkNrqU78yVl+tWGVrYXzjqoqDYJ+uiftN/gmnlVMMdM00IjCQB7a9hQcBCCpCo9ju1AMSPFVf6k4nD/BMebjBWv1qsRddZOmQsoTnVW1HPpr7ZpY63AcwU415v83GD2TesqHybNknqYL6dV2Ul8qjHMjcjvhXMq5wdqNsP6fHO7WsMKR86SoINefUrJkC46yyXNBiTRTXKuuNYVQ4gOmArZUxkTsr+l86eAbJKKipyuG5suelRJYfx4DAYo90w+l8i/6/qSv2L97Lj4026WQH7vJUnTVMAUaMlOKeY93UpZWs7KWmi7EuiEmHeQuBsm8vn2bVyhKqnV6UuAYMgJKiGHtfZxgiTRErmEFTiYmkjxTFSkKZk9afshCiFm3DBsTAnRA6W7XRePwOGWh2UHQVhtQj3P3ES1JGQXZPgwpa1O67aI06vV+rlaOX2pucGnBZ4LVtvKUhz4vt7VyZZa30YJ/uB8BmapkxxO/FUEvLM9kE7wdnqQXxD3i6ZRlXHswODeF2QuwQPODBfM82bnSdegZIBXesxfQFIXa9pSIvPQjEtyvwDXFiLrPQIM4SAy+kKsEMlrgVHpNqXA2kgAFUICs+1RaWc/BMyqhYWweoJQTDXuqP4mRQgG3ZuyrnBsUbXLAZ1OvbSps8s60N8xUrRpFjgtLL5kyT1m8dSjqVo3m7zeS4EkdcAAG7fssGTpiAS88R71/OeH8fBmwPE1dZFRH1af0G9IRFKU/1RA3Jt7olb5+N0PMat02sAFSUqOuS0u88bqg3UvjBKeE0VVtSlt/squXV4lZDMO3TEyURVBNLCxO7YZiWU8HvUx+Rilo+qQeHKSI20w720yd+TLDDrbaG1O3RomUEr0BWbDYbc5rsrZclNCVklcY5FDJKysGJDsT6xozH8rvbNaFSKqt/Mp4nCYodyr3NTVslp3U5TZll082cqKJ83ULmOEqSP0V39V+VINEoLSK3xUezhpEc9Q9Y7Im1Hc5TVk7iYMbJBspiSrnxuytQ41qortZhz+iJYZNPK4VLqUKAeWN2/KEg2Lqn2nCWDB5FemfVApPT7YV5Jx3zSaoQbMqwrK3TkEcPS2My9TP+pKNGZfCE2sz2EGMTpz5uNlzOhfQa2xPVwpu6igeSksJNjiM9YBsfhEbt81vciw+A8yO2t0ET6wMdcZ5GYmOh0KTO8xihvcPrOfuG0SlPWNPx0+TSsYNba+WyhQ1P6Eu8plcEt1OQcP+NmFz6Le5H/q5P43zpAG25qENJmer4iZl/Z5YFtMaMe6F5Jyx+YripTfHyA1OSm0l9WikYL61g6KGfkybqxy4cqFsMaQI7SzSn/cw/mmiPXFsjLyLFWlhVqjG5JwhORMJ9xNNR6cCrvXNMb4TLr4BLRb+t2pQGAPG/+dQq+SPs/+EkYXNCZ7gsEUtpQku1XCqvXK7m+gkUhZb2WDGAZe3VgJopGDYc7xxfVw2GBJdKwUU8+dJmqXdmdfzncP9MqUczBJTMwQEsftOsFScitC9znD/LQV2w9orZt/6SL/dOeeANK2Fw/5vlpe39bfvYFmwmDKk9tXRnicybTi4uJ32PXdJb1U1tz36hivE36Bc6+JG1YyQ/BmDuI0maTzSNVktZGt1bhqxaB1caL9AHk2TLL90UuKbiObiyDchqP1CpO4o5lYCekMv+Z2iFJSh06k2PeX0Ama453HWvUdLBz3YqMVGrWucUqK/22puzitU8OQrts5ak7M5pAMqmnahWtawn/OZeIz/aV/OEpgq8DC3lcptw4BTXEwYl3yrJsYLuXllCsx/7zh8W/pSXIdUYKXzmTKzXAm6XNTTqoh0weEKeDOjx407gsZJIzq0R2JuvabLchFh1VgB9SYMyCXw/b837nmHbrx18+q5cvBHoO2ge0nzZKnlg6QakO/IWD0R2w5eCoapRqk05NQ8FhFfsODOeYmlEbMdmkeaTc4E7lzaYajMcbG8Ra6+Tc/vAXnPet9AHlgCUY7ZsKiQ+RtnG6EKVu3D3bWz+5+/3e2mtwvIjMEx3IEasWlZ2hNJw+WzJMohVH75WstSfo67qko1MaU4Rp6/ALh9dgJKrepiDn2mIliADdh0VQ4gylrUOU7RnhQCssDu37DaL+mcdVRoQOwx+YnAbrT28KL6KvDIgx+eDwUqiNiwvUxXyWE1WzNwHdA5kgmgdGmdvD+lKuHn0lB7KjyW722Fr0BWpFlFdj+jHl3GhIAniNoJWKfJfQnpxHODYkv96gmIG+Ak+gktgrfIFZbm2kYNUE4NDWoXm7UpoCxfJopxw+/ZP5Y5IYAJogh0TWnY6Bmg3UTCoFjwBdz2ldDU1hbr9TAxsLFsZEpU6gxQo8hSdyUOvC+No6wM65cVZbTufAbBaHdTY2t7z3fu6D5J+h7gIn8YQr+VF1vvJJZ3AZYZllB+qiugeMjID80h8H4Wcs3xn3B5dD8y3vOUQLWhqcrBISc0Gb1KUmNyo2yFZBFSsB34sAUTTGJ594UmYJzB2jo1YTSivTA0oZ9coFN4BdxdEWvmf+KVRshhB8hrNGBSvrRmQlHYLWarrK1DTxpZ2d5Rcg7/G97og1lFenFnq37HuUQtkJtMQPUOmetVe6DcU+8Vm11NyvPljd81R/xRqAVydC4QS/bDQdH++EbjzgCc787Fv5t2RjOLbebaj+TgU9iT9s//vv8qgFXZTanNsZ0+Z2KmlgEcrm1PZBYY5fOc+UxFRp3dlQ3NLLpRnnxhQyxc53OH7Si5FYNiC0rYYH4+5GlItyUPMFGcDCqFzWPYgcl5bAAULh0aajqL/F5bG9b7ulxcjv/PQivc9/zURkm2VuYUm7QLIiB/2guXKIeW28pPrNIzSMxVWOzNWE5ux8Vom60WK39sr05t2NPYwNvNkry0Ic0f7xc+X0Tx73ytqC6YlStkfv9G9R/xvOaxCuV7IdoHIYBmNaHbi4OiOhmZA2k3ZrUmVNuvjZSbTPogefeBsiwVIniXhovKAkMIkG/tXCpcNgi7bHR2sh9CuzX4xPmUZ1jjw7H8et7OOULSozBbiYyW8GGHD8xFqHkNbrNjNzxfOAhiLKkw6aMiPLEBpWjXz7m04SFf19Cp8/wVjYfgDG35D+EjlKkXwKwyMS34uIy7cq88NUzX9dFKh/NpWbg4vJGGZxB4GSlhhzP7Vh1dyW+1Bsd4i8F3zI0GbyMyU2jb4unXU0m4wfFuJNJoEsnwBhzt/BTw8hk7gL3m4rbsChvDY9HbkhxKXzAZk/UQLa4XsL1QWWrc/hpUyUpVrXN+RYc47Zu+gMjvnsg9ujarIMSu1LsxM2sfL0un7EBGq+MQWsrgWjfKrQefSZ+nUdk14GkmRwRUuTHsb2vcIm04ynWuvkjkFLcZcG4Y174KvN9XC9Y/75SFKpykxlnN4PN2nvf6d2Xj/3/A1hRwmBEFiHW3G/d6IA5a9FMhFhf9mJNgYv/YgGM2DHa4p7I5D2kb+8vD9lu6X0nBYuEsKNwYyz4V2u9gts58oipu49kDT1fyq7qpfUZZyOuQ0BIFhFtHRNH4RWvBEEyW+uztS1wdR/Q3KLfXp6JzMMiy91ckcgvPRPtnulU6vKHYWNhRXXOrjO4+KkGgXxA7DYKxprQ8mdED19aOZmqEIVk8l31dC4TXbSMtTmxoyF4+IXPWiiqTNlK1MOgpjAp7I2UagxsfS8Xh+SsG3Ec/sWBYxE0EIQLBmyBTva5aRWBV5U0Cv3jXj7yPzcwsJWdUHFkh0TESrA9TjWJ0oHCwIoMbpk15d5KY+iXnCt1nYqYJem/C8IeVm+VTJPS/NmgmW9XSZqrg1G4CUdO4BSVmLjFW0tt3RoJfUmP0O2z2cDe7GMJtCDlCQKuydGK2rZ7934/5UYIBuXUPTxEef1cX50U10z75VWq8RS17pYJ43WlBLkXvrbvfCyTcCE9ldrKdl721s5LNNq3m7lkveP89jFvndSt8o0afm2Ar/LjmOtKgek3SZ2cPNuzgVBk6EyMSb+JzvqX+RnBzhL9KyHu4U4HrXSchKksuQaFWXxEQydUMU2A4JSq4imp7PqsP8Fb+7MwCRqyp0b3NdO6nZoiqlts6J9KWJf6xLH+2sQdvC9ydL8ypNJSUpBwQqU7TniQnO9I9BWrQFxuLoA7bk5Gn9fNi1sVxWefDmzQXZ3qSQQSsa08ZFg7hYIIORkdFQ7YrCnYaLf0qubihXOkXB9XU9uT+7PjS9kmYRJYavy4FvljDNvfcs7wHwmnfkrKfB96TEA+8eGD6nYz3jGMfNm603bjUlugX3GQ0g4DGeoZqdbrGUF8sKnIUSGblbwa5ri6QXw67BZj+D44bnABrAJ+aU1QLgUG0lC0jv4Q1N3hpZVpScOP6Jtsj6GXWPbMNSyQtIMcDUTzjQz9glHs5ogCM6sbXqoXFy897wV3RLVBULnrzaK2E8HHcGnyjdTZrl29t4OpN79A5T+edlpjuBxU94B1BUNFFSNjco0IQ2hNfLwC4g3EvVTHjSxbWu9IyxVmnKfj0qDOOeuAnWY1jJmjGCzeiFDXU/atU5vXJkQvxhcof/MpevjQ+7eMZg0IoJisQoqxoQwr7SiFZ/kOyCEV678FQEg6++DnXA9Qf9Z+SRw6yn7c1E54/j7X0YmTJtfDa9RymJNwc+z7C8EAy7a5jUDs8a336aXZoeYcrcOvisatl23utio1yTUv91jhWuFxbrQK2xldjpmQumm2g7k/oNrkmW7NvR3rnykfaFy86ygt6jK+aphBKAOPVFdVHEtFXtWnfr66pMAwiWKCl+XjT3o1F9/abJdGV/ZgPzWKZ+BLdncgdXU9HhVCB0Otep+6zZeBiSfXGrLd2eUz9F1tvxZba1t8I1wi/0M0/Zhm10jnIKk9ra/giUKg8Sbzw3I+5/8yR/R9RPSrpPkfV2CMKwiiRRFOc8KAtN55RiH9vZNM6nlT4DXia1qcvC0LVk2ODdPPEfoGXxjDrIsFEUj+8YO6xELhuMNoqI4hR/5RAYzEzQLM+bHXOTWjG5u3YxH1Z4Twx5vU5FJOMyp+9eWFwMpTE8QD0D88gro3ZmwSUbAM9wGyDsyHOKVdXgPst7qKs+MZXDXijrmbGlojY5Q/hszhmBcAg+frMB31qNy9M5ErFr5Jyv9U6Z4+jXm6gz70pp3uGvolSTKtCoROjIMQdZZF+eQgW3qqQHJsIBzW9ZJMOSoGFs1GbYFOP8SgUgM5RB4MG7/FPqMycNg4JW4eYT30AEpFACq+ykTa8ju7Ls/5/GqKvXrOsPm2fYKzfrxpVX8lDl61JwA8bJChWLl4NcYq7Efn0BGa+xw/Fx69nOT7aMvEPiXYvjO7dQk8K6GCHt0dAOn4JnCBQ4UpZRB0vxHcP+d5cSio1iknh6jvYrcxvT1QDYqeW/A228ZVT9fPWLd2DYPV6oVLCJetMWpjUpJCHj9CR3dm/xAJGmBe+W/mgTCa21W2bdJU17VIG3uVbLdkpC2JicLCA9ItirfSVvGHAdoueB5DLWgLPwN49Ao/ue9VnH8xcOPbZIEE/9gzC+caeVbAbBBvLFuJLmy9HwtGrI5MGDNbSZiogG2iTvmWuSGRPKbM4JFGKyuHRFOUThpSOpMCxSoObBgmgfNV4+vJluaJvMcwit9IqBNv+P8x24dOYbOotk/BRJ63Dp8WnLAP2CfbFnQDRCAhabYax2oeBO5eh6/fbBpWHRpSnnNYCkMkKEBVB+R4xqE06x1By0eZnQ5yWwy8fSZPSDzsmG6vxcWEaf1gxxsykI+PgdF55/1FaBZiJzCNBXjUdvqwE+3Q70TpiU+iWkKtAAZFkRaThhue2lxdz4T7e293i7ljWAt7OACBA6U6GOAdexKrhQ5JnxU3CgPzD7ojaNKivBIPt+TttYKkK/QampOW0E+phS/znOYbu2xOlkzPY+qorSYzrA4HUwLzgRvcLl0JS8I8klKyx39PwUaDNDb3rknsbC6XWnyM5UDud9o/RAnNTshnxYLVCZXN2X+r6/e6U4qAt1/aeIpSsVT7i3KWttQYadjcMymFcWJHcdHSovIp/aRxFYPWgqVHU8HtpsfEU9xyYC+HN2j3go7mtGzciMwjSTx1+KydvWY7gOLtJ+bnBEK6rBEdHfbrBjW4TvHKYEBEnNG4CWzus0MY0+YHywEkW6RCYmNJjnCXvRWDULqeLfZvKAADtENSIu7NX1rFXbs4HUbknhOPlJxk75WZQRiIv6QN365LuEKrcyDIfAWVLZYg5e8NUJTu/M4KekxBP7ogMAx5zG5sEfIr5nXxT87tQFtUs06MyjpSAglR5FT0l6UDdHKJJjC1dufNbHxIE6+tW1T30MEgMXUkV/Ho6XBdnusvoA37Mo5inbRJB94nikL+AfJKUICvK8pP6PrcfAPaRppTO14E7HfN9LKCnhYJJmyXf4+EGYto84o0TWm8ZbeJz3YmJPRZT2m1FbPUhUjST0ifb2f9u7/jflym1H/Bq0BfpaW63he+mpZQbZoOTIQ15OS+KdnIc8+cd+8u20GMmLO2klk3e5ue+TyuoWrpbLX7ePgONsloU5ypho/oMQIaXSODJfhPA7Na5MFKNPrRa4dSuDlZmYhExYCbF1b0rPjc/+CdVkSdwZbup+x+CWWdqKU2Wq7ncMyyCEu01R6FtBxmLWxjI/oS/rfKXrlFA1Jjq86ZaBpOcUIx9asNS1v1yKxtFg2nT1Vk8N+rcrF6iLO2hNCJS+HFpQFlHMfC0/2l5vFYxEBD36eucaF6cPhYi5TtWelDchqZkcT8va5XpatpliZKR3H+QKZ9jBX7t2Ngwlwuvx7Ke7UPetkiLmMZGeH7P2vr47cIVILjV0diZC2tXwMjn2oEIvwlmM1ta4xu61SKDh3ObbJFcEGBKk+ReksnKPLo5JsxXOWmbpC+JGqmL4cK7hFyRtk7gnCu5P+NMMwqPoGwrx/Uu2CRmmf7623MzyaloMbJ6gXQOEK91xhcltOzfAAoRiMrAPukh0vLsKYvjgL9P0WIzEStO5fB0clEY0ao7Gt+bT1yN2rSectNGrDZUZssuFlpyJlgetxnPkEMztqYBSYmSZQEv1vRM1ghUS35StRtGgRfDaT8QZQcEZMtTHEQY68NvX8669L2Y0mJIk5cVIJ63Jsj55Z/6b3Cp3w7Tjog7RyXcHnDyymwjIVtr5HudvDSBz99C3WjjYul5TDzPX2a74OfrgwgSbTz0EpINWwcOCARF7Lv7gcFk8TMb97kEFRohGy6J/nxK/3u+GqiKP/U9q0Zz/L9784OQ0eN2XbTRuNm6bqJeWSdNDcRTuD8EpytZ1QDYHtv2cIgLqdmz4NFGLumW+QU2MEXYa0rpFprMXMeavva0ewgrUVXlVcsBdYB4VRD7nRDUBpzi3ar0sWVBueokw6nChJfsv9gmIU4AGo2x2xgWgy8Z9AnDQkc3YcUvpqpBXVppvWdmbg9Gghpg4jpi7mtVSx9ShuCCLA0zFH0olaBiUEuOsREQkWs37TDtDFS+bA6rZHoFpNz57c5+Mxdjmno04A6EKkrd757cviO7kd5HqbqQfLDjQOiyRplZJxK67Q1FwgEV+7zEw445T18ix9TX1vtZqx9kE9ommgcLAgyQ2r2bQpPLhjkL+csGCChBwf4NmLefC+QMgR42rEY9rx7ODBFCcE2FdG4F/kCY5h9keRXVfwwaBRS+PMJvo+/+/ij79ywWO8tS549HGjZOKC4xiqO5qbRlz7PKoYySVt0fLQ3DLR8BrQ58uDxk2i98VoswbtMgtNI/Mo7uPTDaQ81gPY3968zGl0TMgRLQWE46gMaF98j7UneXRdjqE0Le09EZa4dP8rkUSRtoj6hMWzZ6jGeA+tFunj4V/53rp5X1UH16DVOuAgw4p0/txbDKKFbGTwvkFeEtmn3dgYWBOlTqRpnLjNeMX3Cu0akXEYRsCe2/lSyi6jgTRGEqwE+dj1wdE76OAAaTH+mDogCVrv1FlK0585S0kRwtKTAHeAG8MkFlPK8+si0CmZ6RJ7+MBoBN58ix8jKK+Cs0E7Uzb5x7l94dLI8HvBDfq5cn8+6FDx3JBzRMM9T92ZAa8YKDoKzNnqYb5RzsIpo5wMUhgv1b0TMtG6R9Ph9PyU1vNqmsTgbAK1qeoHl3Tl7q1Pe97K6cC3bojMWuOExN7sqv6aiVMrYRe6y3jIjAm5gJAp1xWUgv3hEvXUVx1dlggyMhh9TbyFr9pQZS5RBofeQt8/Xb/tLlBRlJUvVjCPMIcXdAq7kl/GAUpK8LY7e9yDWw7QmLcg3jfCBh2pAoA6T/OafXAXEbCobJv53P7e996AnpPnwMV31Bl3NBjiI3aYmC7I35Jd9z5brsDqWQ0mk/zFZsRUK8PZ/9WhCPhyrhvxa2vajtNLzoRm0p3N1gxu1ze+AAwPz96ujtF9D2UunEZhRo6yuB0UZoaHCZRISabOxs0DAWEyZ2bI81kRxsBNc90S7C50iEyIYOPN65JGtwMnFwoQThU6yMZN0dLpXFFZ1D1SM3He5qVibpY4p8pLQUh5LsCZap3ovCnBH6PTJd6dwZ9n3pwFv7zBpM4iQHmrUOrzwJ1ycWbuQAmrrLE1w13DslVKMY8gPMsgAaROpI3MgZmYh2kF5UGDLj0+kJ+1lZoIoIlIBHaLInIbycmgKAspK8iTfa0cVz8X6msmHApZkKXLOc6xc0laK9a4bK8PejgDWOJGuX6mZ5of0B057WHSfT9qKy+Io3Nmf3SkYxAYCUIuQ61Huo6ydyk5kjXDd9PxTdSLqYrImcICuQn8nusJ7YRBYCPVyabtKUljhIUuuvDyJZwUMnLHgKY8Xu23hQJdpfTAQ1wzhnsta2eWTtCn8Ff4cTNwia+5psjHmJDtPtzznnKRJ8oVJXdU3BWQ94t8S8kJkAl0OKvyb/t8XekWz134n81tj4o6uiPStu7M3kThw0yyBPP0GOzeE+cZy0dzfuAxmcMFU27Qk70xnqGh7056eaKi5P0ZbxuYX/Z7wLWboTRAQwKhrftLx/8lNmBBK7EZfNr0cVMS+I8Fl5LDp8nqrPnlNnzZrK28i1vCub0X3diod37ksOzZ16YEdz7isNvm3r6o4A5jGrzxpPSelIrCArbv54Yhytn9J7RNjv7NuG2o04KYkuLnsnGLyNYFHEj45SaltCPszod5iUB8e4irI15fW8dNUEKlIsvIDd/dPG4GePiUxjeM5UpSaib/vNq5bYb8hPy91fs+F33KDUhnzIqnlJQYT/tmUiNwehGf7o6JDUtcoA0LWdmQhT8lfwDbvsci2OwxmRoDlC2igUTrUEElNcjkDcHiAj/fIbq+GzTGCIB6Lni/MeGH/wQyqi4U5IEcIsigaHaGDM5Tl/EiEnJalG2ePzMfiOlFVGPJxz8OXnSVAzhUQfo6vZraolRNIzc4lp8nSOAbQJB3d/OZ+ApkwU2KypSidPQos1z6mQlWwzj4muyaYMYRKv4BZgPT9i97u41zXL4PkHcOAZhJ1CAyAELtl2+DEDgES7WB6fC+EDBdbpAHcWA4F+qhHAat85ftk2LDslmAR2lQ97L6izAIAr8+r7A0jfFxPdYnnDFpv9kxitQLAvZcimVmVPwG8MaxJDm0PiaNp1/esCL4oSvjLhy64x1xGxsh0mRFQAzYD55C1gPMsqsfNRfiizU/XaWZCCu+hFNC2UfBq5Q6wKdBXBDZk4wGuiB0rnu4zIN5vCmGD3vw6glu0wqwIKymVw8QwCclBfYAeJgw4b2Q9xkdeHa5ZNmKsmO5D6q6ZgpK3AdOm++TCzYAZpEgCewof6qdlUYvLj7G71oyDNjTM//Vzd2z/3cztC9OcZI53VDGVI6Dcn23rz0hb93c95VdE9OQ3bqGgIY20yKABoxNjFhqoRt67oLuFLTMI9NgaFc+UDl9+veurEC09uR7ltGF0VPAXFGx7yjOVzzvf5k+7EC7p3n5e2BXwbEUtd+4r4NXVo2Lng1UpWjpPHexKOtfBu+9IKMjBJTQdpTSIAYbGcpiFsHVtg6EwX0FmsHDbhCQP+PavTa8FtvlBndGj6QZNdvxRe2ihqxhg91DuaAA1IA6ucOgDz6o8S9VvnJkySPuU4FWZt1oVYan8XJV57WuOSeMRFymW82WaDlePvsSOWqEPToDK758dsGWXeBlvvvK6H+/mycjD7L3cBUECDNOCsSqi8BHGMP8rf1l3fnK9+m8RH2KYuvptN/Co6jzbu5IFm/MZ1aUWsoWJB5x/2+nXaDnf2kspj5I5fHKxInTYqdcuexX8qLn7TqyOAapBqzRWSs2IH3x2NAioDMkIfdZcV8IHTFnmBcNxZe9ezC78ovlATD29clHqbzzlcsSxRQWdN6UbbFsnLlt0iNH3kf04/KQ2dXcNi//z3gISAyCPEXpLdIqJJmcjF18vu9ySOnZ37t1LXspg3jHAa8HscKnSPlybyCgKVBpKSAoKOyDAP/oCPQa6SwtgFediChfkk7cPeYzYsdKpthP4UrJUbVfeLPnShpbKFl7JPP8A9LsxPfSKFpN+PlDQfikVFqCsX3IjfEiQwbTdX/muno+v9QQCG6D5ZVM9Ju7dIQyAhF6GJpzeFzvRdQLPKD0iX9OppvDFTAW+M/oam+95PJ7Qzy59vm6iHTKh6TR/+mY/+um/KZLYhudL+4oIpNUZsYF1+Naa13ipe1t5hunOBP7m4Gzp8FjCVeu9Ew6H3Q6za92ws3J8rwmcvXFD0B6J5udu+xw7+H9/j6VXK857xTaGhpbfrdOsuDqrnecVMgAQ2CAHPaEAwKAgBJeqOsb7JBfQzMZpQlMfD+nJZ454oz3NCgJPAWPOgydvCCzUoTNqhKsBKmkegF3eoC4EWmWC4CRjM9Z2Z5fZawIiNpJfXhSPrNku/SkRCcPBs9DLfQSPEEL5hvFlWc6NcjivzhuWb7P8bocSrFpAeX3VTdKdvykC3LvkHrdiieZs0M7OyDN3A+x6QH+yyIvmyUmZbB9KmzBN9sQNOmXtv/IjN159ZAeK4DigyqB09OR9B13x+FZui870m0znSAXztddmJSXSDhraAeUUxJxCvbHZGgoCPGew8DEMj2De191AK0kl4eiL5PUBkPgBou+gFVbIwfwSR5BqYuAtEyp21q2Sz99FR00hk7E9IKAbV7Ioa4ogvmyHPcGLR0Qa/yR7vniQqB2gmcY9XKnugzM4cl9dJAcxihksRJDQ1GMS89eIgJ7n5b5UDK7uQ2rum83BjB5/+UPxhbtX6AL/GAEgM6wPJnNZVSenbj6PsGcse9myJWsDc/jlzPW/FZrCT/34Q13X4UQ5dZxFwAlK0JLvmSrWhedOJMjY+0hFyl7AUcO3R2iIjDMBx8DfLF4OAeuFMBLgg9mzsM8ogMCHsEg5vILptZ+s0BOUNfMFYA9jaAvTJj1EVjePISkw10X3WWsme9Aaq+b/J2dCALyIlGyl7n8yLz3aSG3qcw7CcEO6JrT/P1tbh2mbi0vIyD6nvruxqqBtsHJLlUV4c6U2+mmZ2/kfzSu/Lt2FtAgpp3Zqhx/Zryyhcy2tW3iO8wMps/y3bMICMQowoS+3UpGM9NjjNX6ZQgafv7AgQPF5oNYBap0090yNTXRZbuKGrjPDo6OzKxht46Yz+DdA4pPa04cW7GR1CTLE7jNQ2IncZaKEpbgD28c0fu4vW1l3P/85VopBcMx5y7XOa0JJVOYFyuZEs1NSh0DgJd4HZ0tXv67Li6RWybKazdWjN8dynl9jX58e1ClzD15nNnamPlDhTkit6xySS6CQTAGN5QGruQFDpiwzb43Fs3oOtVT/XDyDT66bIa1O8IQ77EkYzXwIoc21wnONvcLBnl0xiMs6EBFxVpinYprv1KU/all+YclvhbTV14B2A2OqO+CeQcBDE0UsVVuGAhCZZJBFsSZcWyCBqSD658G6FJIG0rJ5C44s5rF3P2q2ca4dLITMEFYvdzYdGNXRYAfkO33VWG6G5BbD/yIFlCndMBHWYfp8FTAigyvkPGv0mAO5f6M4yZfVAf9aUgC7UGNzI48brzs49BMzJwhiw8nDn78Izxz4b56sxG1M/OTzRhuQfWKlvrks/OMcc1UegJ0qwT8PA6a5Qg47hDHTeBbW/Ij16ldeBUwOW6mx2t1EJ8wVfE62uJhJXWhmFgAFD0y5hlcqpuwehSDWgkEeqSwfBk+1n306TSEAR2S1JhIAgCv7LLUZE4uvETSCv7+95Mlb36qPdgw3GUWADuw2TCXZXV2iNvTu5JEcPR4j0v7jM4l/FrAWXF1B7TN3uDYuRNDyZZvedU0K0QTUo7GU4+DgCpZaHffEXFPSl/5xSTv17L6051Wh1Wl3198K/7+5VslJx4aZBXkFLa6zcp8S9nvav3FvpRWFRvEsTpxND0wMbu8L3+4C24O/QU0xIJ5iJFrG56opQI1WB7KpZgQCgpysWKoAi3WPUT1Zi11DxF/if9i3a5ZR7f0SZaFaOfOm38BjQs7tSJQs30EYhWuMgl2/ajE0SQMh8qhKk8fuMjFzN5G23bYdOz36tDbjjHIjRZhmnQl7WPHmsB1geMSEEMKB6KG0sltKfA2kgNUtGBoKpzJvvo8tnPtwDT2pZIzuSu7hqX/zfvpvL4KmxIEmI58T8QOrVYktjpw+eWdbPEc4cjsqOvHd+xbm2nvY16wlk+DugfPx6VUUEu4JVRomKvKjNPFoeLAv5+VsBpu9yk0cAmJP3FiRedw6eZ1PSuSeVghUCVSTeat1fZhVncGFCc0NAWxl6GfpZWVxYbRYMvQ0BRLWfgw9/zuvA174tqfvwp0/BL9yrRnRYFkRRC3tQFmPFPO8zZ76TPMpHuFNjd01cHpHjb644MLna5uv9SDAf0TnXh6JjmHk4CfWJq4NYJF1mptiRSPr3YUKj31lgRNQMWvRrRTfd5K41GKDzfF1aj43WiNt8jeTigLYnP86bmgAzoMc1cRn8RDGyksarzCDTSDzH0cipEPfPVzGQ0nCP3za+3qsAqxYOMpEIayR0jBNBbVIvVM4zbvkGPdVLsGLgH+rhZn+q4j91vYDQlPWBQzrYJN7koJpgR7l45N5gNEVv32JT7LMwMvDtwX2f50XKvW7HiDcWFJEEyYCBg0g93yV/UUPYZAp+1DmSQ482jIBtxjUuntRh4aAAeg/DLZXMBrWdgoQDwRYaGYn5moP/q8IjaoXJThlQvP2HZLpFGiIugeP5O0gPJSULUeQgJXLJHiXgmqhcEkyQEJeSb/jV7SNTAN2t4ACx4H+5ZWKVuIR+OUld6AEemRqGiTExROYeAJh+pOOktveOesBL40sPZ0NGak1G94031IRpOsAkuolZQuLqi39D14RQkbhpKZ9PxKtFHUrislz/uZM/sX7PS0B9g7NR6eTbv+37phc2HF+Np2jdUcXxgbmI0HVfkUX+W3PRoXANsv31z7uu0Psu5IDjAfrqM6oG2G9LCn/9gC1Hkh7fzEQO8iHwpWDL6Y50vnrmQmrvk754NnoQuXmjv8tk51fAKta5ljsmM0QEqrxlDhIX4QtY8FpAdu4JYO+uJZzQARCCxMqC0Y3pSjNIT6R4LzutyK+D7tUSOAA4oz8PWgEv64uR3LU5NUGRS+ucDEnfXbIzp+Lb7/JDRKrYk9BTeulelz5mE5gnoBgDTOWE6ssuyl6kFgezc+JGypAEHjo8BLj84l2j8DNlucKA9qhyj+syZ4H5eZEofY7J97wPjEYH4zY3op/2Eyv1U7en5zidZ4Oo9rO8TJieVPo0x+9SBmGsSPh9EUCh6hAlWjp+yPWVg886HWcunAs2nqC8qm9D5o0hXBwTyqFk1U7USlY/4BvCe7JpS1d3uBhYKuWbkCF8xk9tODfhR+DgiDAOgLuhYrE6oKU3wdsmRr//BQbqF7X4NbGAzFmaHqjq7D77UsreVC6YN2YeAFqfmSd3bqQIckoF47BFyzPmtbig9/cVwK4HE1UTot+SmU4bG/Izw8RMLc7VzkxBZhw7hl6une1iL+ziQg2/rl0RlRxQijeqpOlBwlBORMLC5pBgS0FfqCxq5vNGk8zmkiH+k/HmsVjgfogDU9eiupnum/EjE8CFHdBxiSMuBJMCL/cMnJ8tSs3XaKbfjHr8YXU1TVUGxhtTsqNLkCccSezKBeD6cgYaSutoS+pkxjyPgCc33S17is8QsyHTn0GCiqyQgL47y3X3qXUEU2lKphwVz3rf4c66eZZSE150xLdqtOeRRFFT0/w3IDMK+gvnV68XpnbXYlYAa057ZG87a0Og3/Ip6lut1VSahdZUfHqfJ8nfEht1zYm3Z+fdkfRL9tRMdhOX2x9vgYcz/AAUF5VRdKeFpaiGshd5/WOO1NydZvXMWJ/+cpLofz5Rf/Zy7XbPAf7XXXR2fkMK8yaA3INi6aGqJQ8ty5nIO0TDyfchygNRN+D7TzAsENH7R6MJH6cmBehiXQOcx9ZDT7xuJtDfYAcCS87/7krnigceY345E5ZX16OjrQBxWAdm5NwJZRwbtTXGjYkYVJsqaBkLjU8UUfDdHDKoeBTVCqcu2GfCApmVUQYM8E0sAxDW4/u1V8drTrtzLPeRnCAlyPVo6Hl9UTaD0tAXyQiHhjVoWMAg4S9cvrGasZXFT/SI++xLOBixQadcEKWDRWeZA4YTTpKsFUlIucAaLmwpp6LewZqpv07+FPrYF845d7VJxmlyX2aYa/OOepfD6LETq8varqT8/pK1WjE4VQmheXhA7D8z2RhomeYpbTr8THY3rL1I/VE1mmHa3C3RqXo6kil0PcvBJsEiAMG/elZNcv1hOgcoOyss4t68KZmvbSw24pgkQb8zG0e+y7dwcgp0+INlPtPFiwbxNshzx0P1IqJuy2tU8O6pixQz2hXfoqPSwAeAmmwx1wiYBRIIp6WuzMzhSG0UZgxSl+ZthRQ3CTRgRMj5u2U8LbfC67jCnCEjzcGA788LVBQ+fmsUPUaY044B/3wU0sdGtO5fNrwouHvgnqn2ubHfjgU+PybHnprrOZIKdzv84hQtND9M53r+/+/aAbn3hVmQvMJhXkA9XyEBqjxeRguko9qMlqZRuYOcazKPR9L0uUHjB8wR/K0+Jv8K4s3ZCfzK3HFBfCl9p8N+vV5Y1c6HWwYMSE3Tq1R6FMpuIYwLXj3ZQHc2qmcpCOhZ8DneAud7/7S4DZUi4/XwBUXyRJlQlY47b+ZOLFMH6SRkBa2HSYVjpPzKTaMz1/azjBGm+ODjIa3FN/zgwcCNnYeebU+g1VPD+45WAxt2bPFQZ9WC2AJ5PnHQ+nMROZBTH1OQd/dbaAR2ZRnUuUoyXlnbMDMe7hbeWzWHJaPe1hY1fcQPqa30kUY5ZU1r2ZV58RPb5q1uKmMZnjtH3jO4arvhkzSRN+rNQCofRhpdu/oO/eMmVXX8zwHL9YKIc7XBpmfu0nzJuVQD2DNQW/OON0zT8TonVS6uKuWB+QWe3LbgufeuWayGP6j4FlYC8GLpvRlwYt7SaLmcREEOdvhNPhXEqTlAjJRpfZK5cdyUs0lAWSjYeAMYJhtD84mPNzV9WIlnX3h6+t0iW/PSUSpxVZZKL5SseULdMExZs/nnu/+hpQfIm7LQG8cgVcPZys4cxjzI+C/pQ/rKHASvj09mMX+LlrW9B0PlhWzx6o+sBSDv3hLqS2g968m+Boidgibh3V1y44XLrvQX0WHLg2MOzSW+cQBXCyM23cXP1Aeonl0qj75q5LMB7fmTb6+kldjInR4Ja98P2m3/6xOR2oXrUWEBrF551gAGqlY/Xou+1s+0H2Uj6WXyVfCTnlkczKeNKHUYXGwSg0tGsjxY52Ed/RUApjEpBl/JAHtCvbAsejKxRBu30a9E3CtLqSnfmrgXnTW1bYKszLHhlE2ql1N9OcfC/Qy7Lfp0I5I4GdhpO1C8LP3x0ZWFkYvCK4peLrALEB8ogCl4gY3dqyKGNgb1aVF1+iJm+AoyoT4HY8OBHRzcrZWY8AwtD9NCn/NZNfd5ecR3N5g7InuBCTKEY5DH/UI+kYmbBA5mdXhtdPnJccXAJWxHsm+lELwIShemr4Du0bCwv4ZnaQOzt2reNxTTvnVaYA7KPDp3cLit2f608pqobHnToM73gSEbz6RcPblqtDk+FS71WfopcN47SLK0+j0S8+lF8cyk0slf34BqAbcGpaT2cqw7ASou1yBCh2VeoAe/1uhfBzXZhliQCEO0ABpWQxc0w3Hr3vjUOa5CtkY8MxDWOIWpai1gNQEuSf7SLVJ7q9CsHRbYNeuzH7f7xTkcm6eNuxU8zAM7e3fMXSgSqX+HyntAq+lG/1QbKyTaHC4CdKLFABUmn6ljwDPEsA+830nYWX7qdqwo0rpp98Ks+G7QE2jXvhS/cRnXz+w16km6IC4xheeunHdekiya0qMBRIpXauzeWPVcmIgcidGFgsxOj5dO6On9w8T+7nEcn6nKLyXdp4BRVVbTi/qvLfTJE5Uu+syE5RPz9pZ41n1Z48M5ebfWVerDfwni8dwl+mFYpbKSgl3GUsHb+bopjxZUK3ZyefYwKS75YKOQfNMz8rYcBGYkmxEawWGz0qKCBpQmQCLSoj61hqWDyAURgHD++xPIqxmaOibBuqDpB31HIjr1g2eRFMPArYaehVW3Ea4hpeY/GeSvRjzra7Ps85XGtY3rCFejEQ+c9BzyHBthom4zpdMJOzMFgNI0x/XQCUxIHzITG1QRRB72kEfr5CJV1UGrqSysVaW9qrBAJFAk+Ws9Qlx0vDI7PoFO3VBKGVxjYBTJ+ih6B9xuqMzUE52RFkLa1NAHlOJairEl5IcTueg0tcX2hP/MEfNuKKL0XpD0L+nnXGVQATUGnsAnqb+f/+TaMF1oW4FzNuZ3qSr8LHdcah9P0C1vgcJliXmSDbPdn9E0vHLGAlbGJ9ub9A539dJEh7lRfkebxSi/TuzU0FlkzbVg5CFIhatjJttOXUBp3vATqt2tXoxUWnBexRQ4YheL6qI6Fx2Zfa+agh4OkaBolVw5j1y9Fme2EpYKId8iYw7yaL64ycS2MsLONtqM4PSNpGp5/FASrdt0PgImPS4HgaEyzk1YKJzAivmsNLmZ2neMJTID8mHaiXF/u87Xib47nvIy+suFIVndJxc+vsxMOUXDD7kOtCLaPtaObP4Zsm+Y6CyqmBGeZ2cnEax6ICdcn/zILuxmXT66BAwFyiMU5GVpWol0DvIwWMGQCXbQgLcXD9UhuWm3+R2ehzXFE4AkYRwvRGfqzOm0oDW4DsmtTQ29brhwnKyrqBITvc4p2cdPgIKHkpr8FoYk5VNcdQoN2SEF9KAVx6h9Z51b5s+75mflxif9wpnXVz3LDRLh8r6wMoXrW/2VK9h73ZMcTbI0tgC7fSWUcHZcGZfj6C8O7Bsz1K9oEtaJ5UCwTS3pzhWpj4rBa3gIQfjDGvh8cqbzuCFyNUqE+B10VWzBwM3V5ffzvrV9I9nraWAlRJQEcB1TyrMKQ9I8klWnpGYjSdu9W/epbUhlIVQJkFeTruc+ZuyKNRprTg7OQar/TwTrceenh3RnRnCziCklVdaPF3w7mldOjtr8kRrPE4GoK+CQ+d1RxUnKwGx0OfaI/a/LYBKvqQv+YERlhPZQbrYKG//QOrOVh86yIlQH9tjzNuomusd9YQwa+JyyczWa/G3FwCGCzca5rwoFeuq7br6QKfWbpW3yUpxkq3pAhr2WUpNsxg4n4tUGegkAJ+G7jT3JrAd4xH09/savl+4+r4z3/tTIcQGsNW0JjMvfKGbFCMGQOsPQimuyZlmQyInOq6vezOfVMEN4cRUMWpBhfVCFb5acDsKvAjFHh7u+HS6o3AuNLPVmI7MUC3MrQC01ZJ4Bvq5YD39p2GXktb7ah4pIW35fCle+n6kpFhKfYG+Rj6pXzN5T0aEDdRAGC5WB/++2YcRkpWshRf1ZBPBTV5uPf7CDqG5gaEze1M0N6Dn92IuwxWcwQ0JxPz+8RVBo67ATVM9GPACKTWRPp7fir7Rucnfjyu7BlYHILCgHCz8k35U9rV/w1wkqSOLzu7+Z3qR8HwGzs8SrB+5REvNuZt69bbLUWLEv4xriH3gXPIo4Hkzv1GV+KtKOFcqVrvBghkGIMw6AzVJdcn/Kmk5qLDcVzPEQnwG4EGZT40zMwJpdyqPcHZzz/PXfPYmLMpoZKsBNP1JaycppgEP7PVLA/6o6VSbE5YAMvpV4KWUbO9Y91cwAIgC6lN6k6rMobPzn1bmXV/lq+gLYuCNMwi+jdGZ5TqYSgALS8ydRRFOhHSIbdwQkEY8jIbTvUYZZ6S7pg3fEE/2SEvu6r75iP5eji9e3ZyollK0CDBiUkmp+iO//blaQuAtjJGY+KJX8UG68WL8j2E28pKRf5QQyktQdjlQX7uise838AljISn2+LtBzYF8y7sWIOYo6dmjBK5KFM6Nd5Jwa+hSE29aFvs5qBxVQUhEtoT+RwNMJ72puHGl15GMC62LAxpnlLOeT4oj6wy0tk1mHT4COvNkpKrAb8crmCM5HLZc8Akplt/WuDUPVF3q8FBAjYG0IrzxYTdLkpue2CjHEYDHuuBnkPvK4pMFKY+8Pn7TsOz0SlH2yLIaDWaC3WrtqmSZKmPc938E1gDX39Nk/KuR97ZOcPvwNay3yuvMr8w0fEmUcb15oVaKGv42yvJid9evX5171nZ97p5EAeqKb4nEf86oq1dBQ8BJDPEokS2J14kMoKjjcIN8utXMYpTWKmAwF4uKAGdEHkKGYdhTs6D3DQBN/GWytzIdKcREYBnMsKVJ5bbIuYsBFrOu6NTeYGjFj9YAp6LF+xhkil6f+PIvsEjTLHM8MJsj9Ll3aj356ut4D+z7e6hBWNtUav+BluoeCuqr6NxWTr/q2fyEsm0xMfnwUoK+VjRwp8CuPeXcpnPzm5+6Acg0mQGYQ5rz8KSolYkEI/1oYbI0GNswdib5Q6j6lB6txO8DqwcGBZ+KLu4FBDMEaawNBx2L7+4P/U2a+ZmFEzkomMp28WiY0w0iiKlDBMi3stE9vVIMXAM9NLvtsV5c+GcqikOVxq7lkDFOxmunSTGTOYKafg1nyK8Xz7k/vwJy+csz+eyTzBx9wBK9mUG4Vdiv4012TYP0GW8WeinJ8uAVAcw+TUlc2OnmY6CQ6HKA1SOjjUpx5Xvzc44naGKSqLqDW+dZRqEhaH+FrLkaONNo6uiSV7q1wHL6Zf7cQ6KaWl7p4O7skn2GALeCL6SOaE0RQUBmkHue9Uy+rY2Jk1xdBNdHB3yWwhAqkA2ITiw/M2bQlCpaIJ3NAoeq8P/N2p5WRrQDA4cW8ZZjjkro/Hh76MuIqqpDJmCCAKDmpUCgJypc4MZ4DtwJW/hjqUvMCnMxmEBU2VwjWqjbtDenAlDA9tYGBr/BPKGCZ0+FIvve8OkwKM2adwoywKpB/fvbfaWBAa1b9/xNpntPx914TwzQmbQRLXyMNPhHQ46kPOVguswCtcz4juDMiOer0CgTI1C7N/pii1ikNwnJRgyAoT0DAjoKiPd137EDOkQeH/Hs3omk2po5nX5OOMGn0LkvJgfCilXE6k+5v9a2wFNPuieezrUtH5Dkgs1qg1cB4DOQsaMLiyfNJeujhd26Wvww1MqD8v17TzWjlxPvjlZnOSlM4UzE622TCVO++fsX4s1J5obm7UzH/zmeFQbHWxADn8KHbLFiX9llgLS/akp75slzMUcsJ46N1OzZKnnCy0mDPzKDc4tK03IHGKQzZ0rh+hQl7ysIkh1Kp36xA2IGmoF58VWlbbXKav6x/Qw6NzTPPRZMP8/Cam8R5z7w5PCoP5+jD4i5PxBMl6Gn8c53EGCAKxK6MSSc+b1pcg3VUgkTKESL6ANAaahut9bHaciVnKvkswo8j0bXL4D+BlhqnkkHJnqcKRbjazFFO7kBBNGe0xfv8+R45aijwaY82jl5zdkMLH08PQG7QH+emCGjAg08mAGNFQzlPhqSxWG6NzYWrnCAQY1B6owANeVMazwihVOMEsEDg9svi2qlia31KQp+MKoqXFjvvwWXQVl4ONKpoJpE+cmA2/XH7n0W/5Jzt6ZD1+mbBwP23+cFC3m0OPNoxlSgtH4FMbIOxzfaT/KP2Y12lBKKNG4HcP9Rtt+d74GnF+6QSCuGaMOPBqgaoXgcdvhrJsqDMyCqLp9jo8UVioWCiIBJfAzpEsPigO1CzQOz3RYgF6nuvWIz/06E0YBho7KA7ml9mUh6MR29ippgiplKcN9lo9OCdWH/X2Qm0whcS7iIwgq1jAqUbyI7kWUfGCAPY2grthBJzADQePk8ADwP1OoshAzXvlftIzJYlkYbhhmgVgmkRi1q+0ol6yS6P9t5KpVEF4Pnoc4grbTDSutLDF9ERMtQGmyFfsA7Z5mf68LyEcYh0HoRehcMjGQzc2x/UdnVI3x8X5YWLZexlOxks8jIAFdUHo+fjfc0APwxGTrnuXO5YzLGGo9sbOvmxbTQoguplp5CEWlnHhGS++7wCby2JWC3x+ocHTIFYzLP0CgltNGkUuDXMD9AXiNeeZ97XGAYeuEF1Smqn6qaFlHoHIujs35oVwIDNYJRvLlwmnumrfpNeGCSxfItn9CWf8dtSqHNcaPu96SSB0btCZIlPgGWe8Scut0KNd1gVqYqWkyuq/QHbsLuZRfBJx+8mIPV52ueOeBFQxTHLCC9ycmQap3yFJBVd9MAXszWxpWTTXNqjYBuKoszuu+h0bLnSNuhjhUImGCHf9/CPkHJV/GHAugszIEhiCSt4dbVNMGzCRlslJ+qj3JYUCHG70Y+Q1SpniOTNhNkXmbWlWeJk+s6iIwTMsE13B3Z7a4mEWuxFdQYu3XQvrBKGZkUVQNby55gxDzwKqJTRrXnyuxtpjmtDG+iEEQpTM3oHhDufzWoIaroQqHBBSnjBgLwchPxZ2APaVlrFQ2uWW2dFelzxGC9ngDh/h9bk3pmDTjXC0XwOLZjI+ZaYOvSbAOJIsZpyg6GIyFoBKpXBfC+RjMq+DDhyHUU0wjVThkPdQ/+MsvQyL8Rle2zBKvTGIGKSZhLv2vsxuq4luRh51WZXtE/6BHmwWjc4Mz/OQCuAmEATkRHwhyKUbHlSaCH0P1HRl/O8OLkF0IZMQhdDpTFEHWJiWASRIJj6GU20GKElzGOX8RHoChElwpSgCkDUoM8N6+Eig2FxVhvlA5rKLXUaGjIK65+JiBqA2aYnIcnpHhYjYYip2kjWByRc/M3PJ3+yAoAINoCIBMH6vLyMgykcQaggQPaBLvmRYxuEx/N67vaPpYRMBonn/P3ImyWPARs/yJVgaCKNQNQzDoIO70mpmgdvKttSQBMFxYBHLq8ykExS7Cous/78BRzH1FWerrSZNOi2EUksZzqVyVEsyBuNj0KizgSgCWrOz2f5/lCICh0mfKmQvSGciv1bTzzpeZyTSmU1lAFzBTtHvU4J5niRZs2nnMORPUJQIEAaojMfg/Zf757oOD4jYK95w/CINLV9B821b/43t+msVSvsH5E2Gj7ZdviKlgZh6SjrIwBhUF0EFF7q7pIQikhV4HK59yqMdNKp15oW6l1MMzZ1bpMpLQZp/IZsJcDxACm7lgE9MU4+4BCRh2UubyVCpIgc//DnDeF+INs4C7WHUDNxfvzqPMgIFv/7xOCmrUPef85rKbzX1qjmBonDQGeGMJ4jkg39Ex+3Bx9kRG2F5v5E+PyqArA/VVOxIQWLxZ/M90W3c2sj1zjsU3Gy7kmgHerOtxJqHmJGtpwyrbWNrkNFHMqi4G79lP3dFzW8Y9DrDlsxrtVWsuGBo//ONZkhOf4Om+WjCEmsEvVpe2ibXJlA7WFb66sRCCbgYLghPyNseHXnmTn+mP+w3zlmLc4PO69FUg4JYxXEssF5JPm6zE9gerdqXzGSUBpePXk4SI2eHGnUwkZjGcMybW3Yht97hkwxFwxjqBptkdO8we8AQ/Y9hiCWmpD5awIZxbdXAiL+U1r1oxQ2Y6r7MUx1rOcPDjyLvDP5q9JhFvCL2LN7sf4LzPRvos2/UuKo5ssNslKzWpY0X0yw2yksnmXHKySc1E78LyfmDz4MFhDHLLztvYISCY2F3VL+mYy0B+wZQLzJn77q/VQNbOnOwQU2nyyFT/wrDZ1DQwG4Z2dMG8n/AnCu3bQRakHPe4Xwuywd9Ogs44vgOnbOKPPTjXbc2r807Mdf/VaXwUOQI0VtzY7YyAbZS+V64pf93z0iUD4ozn75jUfS//WTENhLmLGMDT43+rVw9VynkXtca8vh46YzPrdmXGkTcPIA0YD7TOSPS8+NlYijzqEVfMyowNNpTWojVZXkl2STN1vHt0Vihzyd6ISKAgEYC+D5txJdn92PhUNgUZVkZMGGnn3XRBdQ/BpkUSwnxR2G46nH9ImoGH14bMm5suNAJXpBimzmKyslicA42CUrOKoqN/1GpfJZoNbU9xSQIYzlpxDY3iTBEiu0exRbqmbfZJxqRO5fxQlgg6aCGvxzh4jLMUwmqcq6g4baZ+luKGotUrns+KDoQbMWd/0sarOSiSCqNcFHUilYxu3QZXXsk9UnKQChOP5JB2tcdYWKMXwDgSbCo3NOobIdrMy2wyiz7A7VFVwKAvCKOXEMUeeAfso4n42diaocXkITib8eaQSjpCBhWAFE9TpqVgTjxKHyJmhqx2o1fxBeZODtiAN4DKL/ykURkYhQpcWou1fbi2IZ5ykIdDzwQY9q8DvAQsxQTMUUFTg5C5J0inzJIi8Pn2KuXt8sD66v0MSLJ+p57OyPZLgFMFPes+0hpZ2vPbO1F+F7HzBfOFb6NYgKdgy2qFXehM0DqF2TXouoqZI5ro4DqlryqJXjP26sqyLTgfB1Qn5kKHsLsQk7jDCS8R2Y1sE8BmyY56pot2IMZC5amB/IdLkd2kG+yQbjiOla2AdSEw8V++Ozs9I0Wb+wA7Mu562TdHqmJncoJhB7/5vmFW0bBQ5vQnmJdgHlUwjr+c6A5oDCpXhwrFGIUWzh+vfKg3BuBrGZSa5dxxkuH0ckeooyCI38tg421aE4wLOAbmMggidp1NFRW7rWA6MbTEXjrndEAipkkPq55JkaSia0DPRg6b+wWgzsXBCnBByk6CBBJNwMHC+Ywc3I5LvvLdWQF7SEN4/7DXEZCYvvfFVPF/Za5RApjKdsXypb7sud28zjtxPnMOH6IjekoYHkGp4bIw6okXzgTmJ4Kx54ePKjgziJmlfIoK6IbmS/vH/R0oEDrPpM8n2lGMYxMRrAIWUUqjwCv2p5zweDhLc/A1rX5WF22ozP0EwBw3kJtYxrhgoN6l8oN6yFReoy9Frzr+0IA0s6g9jkwMXhUo+tOqOtKMn/eF4+3DuDD7m0stx/k97twjXT02B/8G6DaPTqa5pAn7ii7ITBsaLHC7QRnmRX0EOmGfsKXu+/BxhSmmVTnxz9MW/q9dOg6nTPS6Pjwly+jgqM2vil5mvbn0tfjJtjK/SvZkRnC0y0Pm2xdnj2c+ngG7eIIO7J2DAiJZKMZ1fg/PH4vJFxgMC7dJz5/XLqdUR1dm3flTVYUJ0n0SO3TjCofJcGV4cg4d0OFUkApjD3Y0ncr/2A4NojSUbe7xdMeBua+ZHTNWn+YFQk6xf7h6xSbnGvXnbv9ntvj2oRqoAIStYP3UMCN1gtUjzXiDuT03n5KBMeofhx5OPvfvrtBjf6tdFIlSablbI6/Sv3O+9tl5gRGCx4RIHaSBbuR5Siv4cuCONZMNuxVEnE9R1khV6V76rTlurhR/q1clUcDmmKhwFcdcR4wJSmBxnMDzuVHbpjOstg0vPegJFHG6GrM51IenHOA1NCT65K10SvT2BcMT7epMcYqpqcqHlige2kDCVAqUB/cmqAzEnxpFLp8xK7XlmXzexdTooTe4/oPms/tTyf2tCi6HaAHKZ4gLfmMk8eE02/1TtAhmxoYOW664dxVCh+DwnAkGwNHpAMhtYACyhqzPZ8JpUlpVoSWoBGwhry0NWDqtMTMsPlVk8BqbCTnVxWfEB0feXN0zW5syQhx12yMeS90yf6Q2F3cI1WnDhwOjAhxmRNOuA5ca9dlSRDCvr2s4JwXgSD/XGI4h83FCQHcSEeMbDKGXGfyCrrKeFZPy35Tlg9uB+c3VIR2W7FRoqFSQt1VZwIguUL0aeXxTk5KUL4KMFJiQByjBDdZ0SC7R04sm128zFx+kQDBsCc79fffgeS7sDuFRpx9hWmdSIgjhuOe4nut68ulQsZpP6nbcU+TehHB4CHCvv+qoR4kWwmln3zG2A9Yw47oW8VCdSY15z8pJ7gbBtC1Txs8XySxF4jTRqbe65CrVh2Zo1Q7/Ya3q+uzEOH/QMmjPRyPvQ0pFWFl6k9ICp17/Zvxlixjed6ZxvFXsWigA/owGoMK+pR4P5K/Ob4pUrdQXjuFjkAesBhVyiGsw57Vb72ePCWxbp1DldIxjeaFJCjA7jztZ/dfDk94WnlrLNLPqOhn+eAovK0KayHf3uBdZOpS9KHPetCXVZvbD+7zXpV7N/PxYvA34mVs9IiV6EpairWDSY3HLGnWBEgxwpPMW62InMMl150aI7s7AxOQRSeG8YYFRMENdmmVrOJ7m9BOxLbbNKvjg+Bp38rr1nFhIn+SxzVvq0LbWja2Q6WhpGc7xa4CaGQWvskWCjYSkPF+wvvIbf62o9qsqmeWxaQ9yFiIy7uonzI+ksRcm/kX152SF8+AtYtSjXX8kfc6ZYTM0dqHEzMSaNJ8hv7mY1R+D7PNbW1Ntm1mXWFiQexcNWnTGfhNDx+bhX47C1y9zKraxKZTcvEvt35qorK0TzBtYT7/n4l4PfDgfQcHLK6gOtscnAWx07Wbt7qY1o0I/CHhMqJgu0lUj1gTZLFE5htFw1xdlcnGkA5AyKoUrpAFrDUyvAi/FOnFEDQhlIhtAYOl0yDphklS4PRhxT6dZZI0Ro0uK9KJRmizJcL/yk3Pdqmb1UcvJjO0TnNW8mr2nYcp9ekZvrYkFgIAFJJM7ElRGcELO2VviQCs3p1387+RlyDRY5tzYUVbIB3pH49aYYw8CRseKhZMDJ9JNWPF4HRMedL0JkOmgfEBF3Jg0KcR3+plJfv/66+EcsnFzlNCydkHqUIHPz5l6dRWxKy9XHlT40zZ19FXe34SeBFmY74TnPQR3TsEPIDx6h8OB8VBEBy1XUHxUY/SgXjHoRMHt+XjFSc68pMBb3+WAGoGU86mK4dEGp2ALW9T9k8ctMugo+LmDv30/6Qx8dlseEeepXkQGzuqVmdO9d9NiI2/BmwEXH0jtPbOt28KmmmK/fufx0i2x7Jzs3XQuxxmqjgdsx+KfmlDeOrYkPYErezI3/MpugeUrN5EhnLgL2QfJ9Xe8JswTM1gT410pTtKJ5xWvGZS5e48vygcgTjXO/PNYV+hqADoH3dNyK5torMWlxoxj0gXLHvqYazqsmoNPotOPT5YHcshHexBFU9FLv9vGe0VsjYy4ZyzhIZVS3roIhpUHK2v3r5JhrfoeGhMfz1uNG1JC/T0TzJcfCwIYpA9IBu5GVMtAMnhF8NkJ+sbLvT0LH2ywQFRdoNshPTggsY8TBTa0oOh2CefuMG1gJlXYEBFz8KlH8pfjlQbfl+fXCoYlfS0LPXfPK1CHVud7umt5wZCZrARGu4bbvgH54pHphojSdCc3JMc6/2JknIoLJyVbBpWDH2jsWxhnOhvNtCJwEYq8N2LHzSyImQHTZtAoWo8k6Oh/mvgrJbmUtEcZgCavJ+qHSUGZCckVt+DZw9sXO9OVffrAXf38eZjg+t0Jbvq+aWMjCnwj1nzz2vXY6v5bIYsZ2m1DIByk0PxMfNmDxsCKgXR2nfSycJaEKKmT9PY5YjLdHHApsGyWIQql1VYbWw6X/fpGbzOXANlZQ762CgVnSVdTHV/+6UuYZo8o112Vxgw/dwLdD0Nld4vmrYuksxcAGyl4Ilccclr3bYao9ElPPEaBjiF8mGzFphwf5jaPQg2FouVuZEN61CnHOYvmjq2wYO6cRRxfofwMh9/EZ2F6N5SixCYo2auoPtQ9WiDFKa5qM42dYQ74WEnnLivlqcmxDSG2uoWKgZEUOKEaNrc1lgEUK6VEGoFlIvApUM5QUJkn7UDVkoSbToy3gC12RLJAjgWMTueU3lo7T5DzjGtjiCauRvZDcsNd7wnzxXTWxC1OHh7kFdudBxxT2i87UEJuL7tqrR2//Bz1tOtV6ADYs/3eyb+vKCv5EeubD89ULfs45fZYUt0YY5/vPPt1bm75usAXIJFTYTF00VcdWlQtO4s25lZ0/VX4pdUIjEVwbSzyB/3clsLLrNXDhRcIJrmoystc9dN8bRnQoy7F9s9fsKGMCci4gWYmUgyJTTb/DMKH//u7zz8fzk/MnBFRVj3IVDLxeRMfLbgWDONJYf6ikdQ0j8k/Ai9XqgFv3hwpPcNmvsLf3IIBLrda12+ZtBKz8OSEu9f72c7+l5sO83yCxVXKWFBwCfRzE59X7kCRdFF2DZqKmsKHf2HXRPzdbe3uoF0sZQatgCqnMCnu7vCcBrDmWpLYl9IHU1JYXrpBNxkDOAliq0QvdbL31mh7XxhJXeMueEnKMv4dx9ILRPGW66LaeJ2DmfP9CXoLgsv+Gz5vXx6NXMALajP4QaeMSWu4Pa8v3gzAvkrWm8fHLLt7g8a+eT2pYu4VjHnQ53lF+V3W26Ciqs6xqd7fP1mzVp9tG7KfaEgT7T/l9cc9FCFiH79RVZaSHJCCoJiUThtawgJ+8a+inIvluvF+XHnYRQWvoZvQAo/oPd28rb9u8W2LOwXSEXCyCVqxdjR+FHu7RKvCCN6/Yp8ZXzGHEQIf7LrdweUyE4fzupRW2zQgqQVn5LGZ/cPk9cwxCywzNE/aNt+bVLMXp2OjMYeP5V4KMHr0kMA/Z5//cLrxIflVw/tCwf5354+k0hBOcrhUmzo3XEJZ9j6Xc8H/jXMA9Crifakatr0IHoBza+1shssm4OSvNxZCzn6Q6jwkkAGu688fEbfRVKz2NSEvP87TvXLSMyOED4lkb4ObXl0jaHSspdEZnlwU5tu5km3Pofs353A7uUXlEV8kCBc+qt4wdQhEYTE4zNBdW34tbili/jjVlhoNLPld5Ale2s4aNLsRBGA1VjFYSmZ6f9XiNtBjTFWenNfeVls2ITPdniWls2CIlZs1OSH0zB/GKXeHasljfyA6pauhm5/915r4mqBVAubaPaVrV7eiynGBSaUuq8tTK7HR7EzA9qf5kR7hzGNL7PGk27FTgkcr+ZnPoCQ6PmEnsheSx90O65snorP6w4+TJM1q1KPgjp/4cjUXU1W3cy6Txee5p9kMjUV8oqWYAT0++giP/965zt1ZVlr6vlO3e/9lUzxKc+63RTXRiL/mIrNy+YwAgWEnC+wMy4uOU2rG6+EymmBgikhML8zmeBcd7eQBZM83mz/rYDhFA5UQm4ailBJTCUUuBGaJL4yeo8JBK0TT1Ty6htETcRV4Kf4SyEcCZgUgJqUJ4SB9uLhSkrKoHdqNZrBikF0E+BOl1DfXUxRICo5ijE4VDmZDNE07+gllJOPatx1wfYDIgp06iPGqeISLzsMlNa7pq8bAJ+ek7hF0t1ze19yyxdGl06vktJVT2k8OfWlki06ziOS6bD5kJI7x8z2z65AkpsuMCXr6qVXr8eU/WkjpK5KT1Vks6TXr4Zy1wPuBuBSb4w942upT7ZudsH2RkgHvuQ+Mz8msUr0C3y9QGPf8mfa7knNzzi7xYNh++90jNrbkHkjMauYgQAHhG04NSgvOR49lGgsHAJ6gt07ERkUaE791yHpYkBYP8yM58hWTBCVtwnW7nglrBk2FzH6LVIDeguUzXbas3dfJIDfwNiu4ZsPzCTwxYneYwIsj65kosFs92lo+iWrbTDnMfqMURc/AcDdj2tp9nXRygZwOFwh/tbSiugFWD+iMvG0iDuaCaTN5U4Xn/rBP8KL7y0uzkLiHT/nkSjTsOycF1645ZgncqQbdc6ta+3X7/cFls8HBWD9fEiJmvlTWefi+7yblDQ+J5RVEmjv7oH+cEBeRgQOGAZNBe+yPDqmBncJRWRGLUBUyzIRLuHjTvV7RZGC8I5PGBjpkCG7facclQrCLY0SpX7gYBPIAkMqJmPkYomVpwO17t4MkeIk6RB0/9UJqAUy8J5bsqj/TVahjIVaMnyG62QwibPhJTR9k0v+s4It2y+kGiplmaDwRGABlIau+FISv5bwIKTSYYmOuSzf0bCFn/PIA+LYVpZQEl1BkqA1HUEaiCoOsMC0458k1jN4WjNqYCM8eMq4w3hWbgIlrXPSDbdCex60cDWlR5h0EL4FLcBfEjMEYzYOLgVaIokrYvhujn3RHzHSYC6nBWNkVAmnFBGUiybTh0Jy1v3nAAP+e76gcx95kaZQj5cCTPU0M6VgrgK8ZZhesiTmnYwkG2UTCiDTusT/NBvTi4oZyHLs665XCPm+FiM78+UpT1mgm4jXPsIUE9FSbp3T6ccx6hEEfzHY64wCuTpvt0Q8Kno9FM5M4JWkcKAezv78POf0U7/7HIOQX44jDdWX69noWkx7zHV4wXl0Bg+joc6NNsvrqH3BvyHILV8SRN0zgFpuFfb2P+VVtQXmMaqMYxm5C8nrpYN/eGgY5OGlFYSpeu2YxvDBxr00QzZHNniygfurcfVNUOzEjlzlocsGxWxDSwxxYu7+TQW6UlSXw61Z/3GcUZsXQxUtaedSdIxeFPl3wvIGQXGex0ssLJdnzDcZXP7Y019W5uEAvAXECZPocwZcxvixX7dUK+8MWc5QLSc6IzrGKBU3aIiXYSQ+8MfrrP6+A3mHyIb72L/PQvNyb3ujFnsrPLN7PWzGg2+l5Wqv6HhcJkYIIKNUpwSqI2xoH+P8ypY/K5t27mcJx3ThfGa++QCIhXiDMYehgMB6CsecbtSXZkLQbbtINhHA/cVy72jipOryqdyc/s1qZTc/WC9+jp2F5Ca1t7t4cOjmffFTAjucjmwNvjc08KV7KloTGinkHbn9xnD0z0aXwFmJjU+s3IAdAOPRPbfuCaCprKn9Kvo80K9OXMEHdScEY/VzUZa4JZ5C8hjOgbUi48hEjPOlvJ4Qd4xLALZDRS+lpLsMVv09D9lAkDaJ71dT83Roo3bBnKNxzkZoYq7/8WSNtgq8VNomPhFA9rEd5QoC0KIL3wxiohajQ16AWFJ/rAo57ZA/g62P+BLKsKolgJR3GEEInHlLBRpFJuHYk3Q6cOkPFm9asunMn2N/v/P2Pbs9L+3ZW/gXmC07d7wNfvp0RG3q2sqEsSauZ9fe7mYVM4E2GwI9rWeW6CWDLGBLjz8NdEh7sAp5xzv3GEnztbaTwnoceGKcvMwt5NIQGwm7l5Ub1iWce77k74r0xs9tQSr253isuzDTHyFVhlYKpwTXv91AYesxvEeZED2dBFoUFZuFcbU1atHgktOeO3AybFKaRCKYv12NCTF8JByAI5QwXB0MhGpdaMQeltInBGdUzQDYsV8vhIBGXCWtRjkW6pCkHCqHYTKHbdq8lRTLfSJduPVlCezL1r1YrU7yS6xbOJkqHDhWfFcD1l3f+2FhaysCKvDVJJvvREYf7DFARx8nH2fsvdqz/ooAPhOUi3PzUzC3kUaD2vHRGOXXkvIkvpdM8js9LmTBWwBJNunS/sxp4vHarZdr25H7BkRKo9yExOIs4uQuh36Xxg+ZLAF25B0H5pGR/pEXEc/ZzFWOSV3ozBFMeAgoQZBP8szPkh2FWYAYqRAcojbzXPJVFTjiQVTzV+kqaSI1k4xUUHbvAhEC6UyVib+gZS2TJ0e695d+DmjxuJcAAyjvihsIIxtg6bDgDRmDcilYjJiNOASmsXuaKQByzkGyTBQkUnLcWyeYSo1j8d3wVcDCybBPIOmqfwZPty+iEw/eZprp8yxa4T7vLyhOR8oZ+nj0krHr2NUF1mymb0WaUINhpSN71feHafR00ckGtDmFhWDENr8oHMZT4VD6lLlVL1jDAQyAtQ8J+HRccMhIaJUDKKG00w8WyP1M51IaX5VjdB3QOQQbs5wskcRzZ3mniirrEiTsSX6x3GTZoKiQ6rXIJdhuSz3Fbs/5APovcBIM+ZAT8Vc3a099VUXBvvaxs2uQAz9mpkZuWjk1VIvptE1yKm/nOJrg1Drb0Bz0yqh2/G3wX7q/ImFqChu5wTOiCW8DDK0Y/lXTEJpYfEv7hKuV/mEEo43w+qCdcniGHSz7s+dn+ALRN/6hf53ZhUkir2bBel92Kc3P6T5o9gJqzxz4J+IdpWzJqFWmn/3b6vOKWGldJYvdcA+sKGlxVInu+d+ZAgve+xqKwC3uTjY0oNseyhTP61ydZZ0liPbXxId4GsR1ibqVRaH+pWsTySDolikIH7YJAT3paSOPtzS7zrokkJ/xSQuNL4OLa7DQMRnnIcEmRy4lDtHPq8Z8FYMYaJbGCwGEs6rXdRymHmO2hqwja+mPeyML5DOzW852jN+t8xpVCcCPUUj9ZeH74yfr7dAVdxCm34YYo3k8RpY2/ffMBq6kbuCLXnF4OtfiAq45i0j9isZn6wN7ueh13lRck6iJnIQsE584DG3fSdzZ2Qye4lF/4MA0D2zuswiSXVUH/qjHnAbO22bDy6kpbCZv/cXSNKiNwfOXyJgRFmuWiHu1Z/pLoqBn/cvkjMB2Sf3Tf1a+YxsGgX4kOx+nTJrQSKlGTJDBz3vQwPM7M0KElUhX5Dpie0rk1MbS3C4CM6Km2P4F8lpw5Ru4fh6rw5I5KnPP72Pnfdo+7x9WbnYHcy0OfgaCa0xqigQ+Rbiy3YUGFY3LQJCIULRaawERqZeiJaV5qfZZQ37ZTqewGwg4BF18+CP7xr/JgHwLT7tWWCjbNi1b20rAeKWGSoh6WS0XxNMGgYrhutE5PChX7w5Ue3qU43HWK5YAJLd97H8aS0VKh09M9DhQVtz6hExzQpfoFhbmK7IfyDKJeilSzKlw/jaKpGKJEUhlDxiZxrYuHaSHtWB3ScA2aykQEcCuUoEpgC1lLEU90617VRfRBE4WSM82OShLNi6VLNu8poV1deK/qxCwzN4lwdWexiyqHuMV9URzw0Gl8jehfI9WTNqWNWqC7fm7rCop6Dx+dEmq29E6Brl6YSyG8+PDwi+rt6KnRPYeW3VhJJV9YnAxDTuNIfHMrjfiobvoX4k7wBd81C1npbWNu/9J3Ukjjlow9Pkc6nsr4uICqGJkwdJhl4YX02a3XBTRNzYTOCp+fEh1abRDVuiilCshdKQiBCEmFgkrTEQ4UyeGhJMU6HTTXEySBipQ8ot2I5b9WnSYHKpAcYTPzQmhkQpi/l9my4irPm/kaRQ/lLxvrnh64Y2Vf0KLtkwwQhRvoNvbyuMRVq42EFdZrFTN+y+EaT8Z37c53zV2hh2ckkfwGceTIp6KUm7ucgV4HNcdWPuX6WT/fJv+xA//ezYVpg82Vgl/mpgT20igXg9wpaNKzoAL6Y0TIGi5gxEGcYEEhUEQfcIPNxoA4SlC+lcHacwrhur94k8WyIC0ul4h/Kg5lxuxVksmf7l5tGBcWSAtx5cq+B117zElVrPuDNEwwR6S5VrvEz3oXfaRGVAMuju4eqfQ/8gnzjeW34V8Wi+tEU/jq3eQKdvf6wVMGVCzp/NpcwbyV7JaAfYPlx30f7ru1kMn7xTVZfX6V5CvcH7Yqni/huK5s59ut4dXNn4Q1bbo8Ro5J8hG7BcnH/bdo7bpcJrlAttgYKNGaFSyThfVGEzIczKo/45ewoSdb3pYNmtxAU6E8dOHHpFCGg9ljSxrNIAy9WfLqYtwUPAZwU9XdLCx2hWn9DGPqHGmQMle8SrMHPylSOccIfBKRteobnCoPJJbcNrHJLwG+QrR2ad3FdkLroKCJmLMsC26uj9nefZe08bL/T4SG8LOWJITs9NNCWVV8UJHIuD7Tb86inzObu12Jmd+yWKTIxGyRItMxDtlubgoYWEarvcmoX8h5rY8ykr72C5G7xINxE5ARmU/6xl0R5CQ5Mil9RgGC7oXlZT+K207RLgHrb0lNw5kArptrgmAqoOR18EqS39CoTX/f0QwKJ3JJYDyFbK8zS1EB3IARtHBJ1sCh+ChhDtOEHv16FC259FiFglkgJXhD6Gf80hCO6Hc0qRP+tB3BbUHS8Z50ugGV0ESHPKZf7TaEnfGcj4htEmFfPk6JgmEQzh12cvzK7Q112Gh8g9qLM3y8ltAThIXON5OcgLtU/qKwN0vd7CzMZDaGlM7bZzI27aSn5sJGAA5UsNjo5awnO43Depj75+y+QiFZ78ozzHn/XeT4gU1AzxinP4Of5LxuzdSwhfym4ieTOvfV7i3DEE8l6+HRU6rVIZx/uH/mhbb00FhbZpmMF/58wCmGdMZUi/tIkfv5VZ/kZ7iJSgQGTcrRiw75rzbiB7cgeMmjEtxFxH4NQfUYTYwGriEPDt+1G6MZcRliosMcRN4sR2LcjhFIFi5wSllThsIEl/hnvVb4OdTcRLFzSmoUQCFAumTLmhLaiYUXqrSvxDM5rkIWUVBd5wLthQ34YfFhl/Av02GRIXYGlx+oVAEbnSTkbYlkJXMX9gxn25UrLw8KeffozFBWx4S/I2BK7Qzu/eP/1aFFf85muCipFY0THh4NmCuYpqN7FH6S/haon239Tq5iuBrF5SP6PhwJnEtnTNMxhCWj/wNd5yZmztj3p39vPSmgc4pHHZ/J3KV3hCqMhqb8AJaMDELNi35Pn111nU9XVXRtLXX7DcLzcD1E7mHYHWOkUb5hqnXE2f9SxFTKhPQdORd/N9K5T98SM7MAAcsmWd2iUtOEHoN/v0PfwIeP0mr5uPLStWUs3KLtDuV/4bg2tnP1vITQihP86nhODiPcIH6MnoaJ+u+T+/bl0MmJbW6PR2ZfvD8tv4D4544R3+99CkxcNhPkNvMApa+Qdy9DHitcE5+7Pzp+1OeiCb8FPdx75InNWW/bzuQG9yfsShCIubIVEwWfP3b2fhLWTijPYsw3S1GXOyBj87w0H1Zu0D17yI124l6Hey3bLVwPjmz5BG5xpnvf7Mf8qglB+Yw2M1HTQhd9/VzWrO9YU+aHd1fri4zxmxwt+p90qxwrNHl9qe32Or1eOtSmymLb9LIX6DlI3vJ/8/wNSQxyEdDTdtZTqSMyTyITfcgQgMOW7jnVtrY99pvV4+x0qsZ7wVu1m31Oea923UNfCwl4kyITWnv+fogToJY2XTMsr1EDQBd8qCRo7dK9ghL3inCuyX4aA8aiNgHRYs/TDlk5d9fDD5y4XPEvtgxofwf/eLNrdtYlkkTTJqm1NLNnUdFBwAM6ESfh5rK6xoGM/ZW/DZkTMQiH54sibJe/wdMqaDppE5/iIVEbtu9OTJNvTGzQ9uqfbrAWT9LwXlWd10pxjopO9cwSJIbFmwTrsxegNXt6cDF/hSioRYuGa8PAz1IXAmIMOXdhT9RuiI3bk8NgEdvytEIB/pjgQxLYbnQGyQEsB0aS35+7gy27jYgseuCpTmE8lmiGi4i6q9XrQgzdu6XJgiwh/Yq1a07FVCdOq6o7pkiYEap63rn9QEbXBox+NXH8WNOShS/Qf0+3EdMKkpp4Pc/sgWXlg8m4U3Fg8lEMyoB2Ahb+O3xNSM7EY3ujAyybmqMHtOn3b/3mi1dvBSRxd1YgQa5394aN6EpfGRpE844JTFW0SHvVVgm6uIsT6VETz50GMY+SjeG7cnirGTCH9zufM29OebJo+9ARBYCBWZkzUOpmAYz3ODTbWBcBo+yY9l3HfPryCDkoqH3UIIACHE6VDRQU/MIb5tP8LoIgnz57fBvvc0G70DlDaEFL5dfPxmOPclG5/H8Z2/080mBfV4Js9OMkUUocNsp3eSegDxCqeYzUZvs0fscSYadDbsdYdUwe3+mO+ap8WjLVe4wxq8XTASBLskKzkEO+xfyH8MAR3FTaSt+PUc9ydxKMCcqk903Cy6gb7lW6Y9xZCY/JdckHJ7JPn75PQhl4xd7hTZzKdDK725c1klpBGa3IHC79SDOC69KEY9Ol2pSNvd5Dz0bUzRSQ9Lkyj+41bVOR0Iqy7SUXoTfAKx5lza6oeILtg/7Ah5XhLgeEnk5BTMMYjns6821YL8ncOf8DHqDw5hA6xAXi7oMUUAD61rgqJFdKYZm4jlbmbUTSJshZ868Xs28T0VkVRisL1zc6skk19aMcAnIvBUyMY+lbr4p40j5CM6G37RBi7W06Uv8WRrszWpW1iW/z4q9NAUvqygzl5rChkuZIR/mKZdWOYW2j8posiWlW73yDZ3o3YIt0H+P4ovTxoEJwXHVP4DLgDZ9T+fLKtp6KYw3EqCBfsKlaXkO2sZT7Aq8DRItoe6mFzmp8sRypz/v971k41w5qwMVjFL0zAsV3nSOnp3WbXS8nR4uaBKKtMRkRMS7gVN/xtPpUvAJ9rpVPmzFScYTQAQGHf4gqzw68CMj7QCs/AWvonBYrP9FOJhxZfTQeg8I7o6QMm86zFU97+b+vy8lZ4tBR7dXMzh1H3UfbwhC7p7dkJwRKJZMyt6dQaHMNk2TLedeFPm1EV8Ahyk66/9Q5nbyFFebviottnJUijgkFU1z/m8XOzWcMPIj2Kh/9ruWwmEc16CTqhvrm/YEqBMJPZBwEZgc1OLtyGFPVFPlfa9cnbNK4fnXlzcsTMDNL2MRUPw3G2608y3Ud3a58pN166zAtAStK4zYBrxtoc82ETIvj5Rz24j7BVkNfmCCZVwBQrpsY3RI+uS2Xji1/EpLGmXGEot/GtGF6hHA8IpK4ruwhXDuzyTWwTsB05SD4RhnzVyyd1Xw1vWQpOwr6YaLTg7mEQS7qj232h6kpYKrdIae8LY8MK5eOiBzS9kuRWR8YmihaClrFtrES++Xmkhxv9sKI6XoX/opSiOlJlIjZgmIJ3elZwkSHxHrX2PiUtaKpYm8tk6srlkgFZFJYYBUVvQQi7vQAbzJnXTaDIBCaH6aW+VQ5uLzXBGsKWvCYyIOxAKtB+JbE5ZIbBSTCTbhaEQVh9iEjTaFn5S2dheszS+oX+cRrT0904NdiJn42gHPGVeSW4cqxHT66LbgIfJukKeFD/KHUAhY/S0oYMq1Cw9wapFc50THRLDVAdzIL9fdZ3iPLlL9pE1aN468VUmNCUsRHTizyCgio0XEVZnD3innNYp8VQl14kBT0HF73eHZAqKQLI3GJt8zdJ2WcGur1eaPWKzX0h+3+gV5nGXNAiHxv59ss7OsnxVXoZzK5KXoCyHsSEE/x4St+N72ONStuJajKSxjHWmCAnYOXRb/hu3jlzDdweRkYMZFZC1QjVGhlcEQG5y17LPc3jFVFGwsayF7MDh6gjmX8JQYh0MXX4EZ+E26h9/GWsMQwMpikFwmvbPb5hdw+M2Gth5j1365lo+MW3rXq1qZCz+h6ahHoN52PJlH9hIfFzOuVRA5Uf4U7ToC7ELv3XZvSuSnD4TYyX+GWeSd+iBRridMdPBo5TZGACaT7ePIlFNRhOOXYAUPkbBPJIALm+9Ad69S4Thep0VyaaEhWV3BKNNGRi36S8oHLuWNnsYVPhaFBPFeJnGtSBOghcSL/ON0lUpMtveVtJ3PhoheczCFTkrWP960XrL+n99O1YtnlpuYq+/LNf8lLzJUBMQeIOfYeKutcfckWD2bOMwLgF3FY8r9UzsszX2/gGqIGT3LfU3Jbm3eoRQQFCrg1HPlLN5fitomjksn4Rq9FoWEB+60CMSEpNYmEElGVJaQd8mKlT7inMQ6MG3qf/zePbjjX1lJ6Bazl1a1UONR/rFHjVmGdX6norJiMI+IoofekdAAvdwXKMy5lpbcJXyJ7yiHAbaei4CZrKO8DqtOb/5wVhBbPCUrWNMO0PxNH7CralEmh9tRsComxHZuT4qrOZztrbB2dRY5tFuG4rKSGoCEgoSUll8DkqbtYXi0kTsaZDNlSikqizbNKUDhJ8a25FvA87Wc4reMknzlR9sA3ZfNXMartLdsl7/KMGBmWtR/oFxhmd1moQU0hhnsVpSKfIkByxKfQnlZluEzI0BDX8/xT2fEHKaaRlCLKLXBPwFU5efqHXVF0E/ih0JW8gzdHh1Amu9J390YGNa5oSEPcnRmr0o8RIPJIJUprAvnQEDAh6Jh2PyUtSaZI0C5kcdcv3ALV11GaS+l23/GQIQqstTNJOo2aJwp6qp4DeRGOJPdQl4QV96B8P2azTGDgGyUtvsI/vN8Cdu+ozMCV/Iyf/JKg0JjqS0tdYJQXoqxQNMt7wUcx5VY8Ss27HYg1fNVcPLM3ha+cKcFLWebQkNzeKO18cOfKr8Pp3CvE1zibf0Ts2BH50S3CBqD+yF4tj1O0o1JnMhL4WBOl4RXd6R3iJCbTSBRb/ncANITl0048LpOxvQsAumCFk5wdsCvtuDtkhLASqIe3UZwQeVAgMQ3lONBHiHOGsd6SYSnfpai6fpTJcwk8/sFlX0J7Sk5qOx7WrjN6IWVy2wvhj8MmwF7r6lEzRRlx2Bv4nmYLzyuJqfYvNL4wtnIYErbHsozShgq50TQ5wrvcK9EzNU8Wy0leOqQkojzN9QJ27RSH8VWvNLhpFspSN4p4irDf3Q30ZMCzrwbbxVHSl/LE8TpzMzJj4393muf9ld8hgs4uyNK7GSP96ZF0BT6b7nrvm1Y6gpry+MoI/9qCOKgU16fYFyQoTRR7weg7lgHFvGp++EwCRyhDJvS66eg7r3BBP8K69P9atTll4qR5O9WTHQmelZzyEOHIjK0OPTj7SneSwb/SJauCIzRW/7WL0MOTCUuGyBj0hclj0Oa+3ytVCVxDV9kkGSNdclrysEl84pqu25Ht5QQ89raXp6gvfyZhND7zZcFsv4RG0SEUgVAKbBwBcHIGM55X0xsruDOGhJUtH7WEq3h6lRTJpSoZ2RHuUcK6zzeN2M5QGuKnk8sERk4831PnPTlVZy9K9rEddrou+RoZjEF7ge8MBTA4aUWs+wzUP/TJZHdmef9giwyxEku8TARvH6SjsrNP0PiH+4BUsb8t1r8hsBTUp1BfhbEkhdtvunkGufnKdqy+nn+vnTD6CzOtSeGdOnz/MJtTy53cnh8sOLXbx5LjVtDkl9jVVmAEMs3gf+6eswU1rYodHRFjLr6GOawM35Xdv76WWO8DxLj4gjEBXmp6TFpOjCHNYVLeRwrpTdeW2rhefise3+YBeW4NpkCX47MfCWPELDlHx/BleYFD6/BV5oEZ2XnzzBsCmV6EiX7fdzTb6unqUbFBEAxgM62hXfXZiVHh+BP//DD7snGO2LyCrBS1QxlSnRyoKBLO4LF/vhu6NtvCAN9sh3tBfHbHNyqHCOK6VEuyWpPbKIZsIIzHGUpg3h79lr0ZnwIFANcP8eDOByD5neLQax0pJddr2Md7Z7oZA5MFSqI3GQLyODm6qrKeAUzJHkJVnVa6xRWsmmcgp9G8zwIWErfSeT1uD7x8Jiz3HeVlkViGDbcYW0ca/AKtUEoEJVXAmVbpp1V1RDhc1mjo2qhED3UO8KmdMZJt8aU/O9IyNS52ckuVWefr5Ym9h1WJhat7Qr0/8hywPlSfGMKsOXqUI9oEYJuLmwYLD0+gvH8GlAIGNoSCpP5/P9OnuPwVS/LjEytz00sMUbUjInkOItAhoAv+5J0LywW+h+K9It4RGG4J19T5tZzppdG9U706S6aHCTizJd3Yg7K7+QV1+YSkVOq1NcpvWyU7wJNbRtUDWTsYrEvuTaR8gczFG+Bd7Ni/NPDqzy7cZSojs64QMshFQ72aLBkalZr5aIcZNM/IEj6dFMQqnCpK+8uqhGMcafzLaR4jr90cKaH398hmrdQ3rF6Ywti4N0kfoGwF/5wlTFgLsAq/LOjv9xRWilQobgdR4ROBe1uMhq9NCMh0ypFhDaPu6QjbNsEYgV3XLGTL7Naz1zjiWlx4UtDYEc8rnGiOcDQzbaBCzw/wc6sAJlzzp09ZrP0QwjX0lhbxyhOqw8VH9yax80Sj8ij0TJiWwIZcphWQtKuThnAYfHowbFYHZYOD4KhR8aFBfsJtAi4mmOOdVGnrPfLPbyGL+VPGuTZ2Eylbi3gqQFpHKZHN5xu4nHzCNV6zlF6uar9UobKZAe8kIqkylae8HAYXaDBTWEhCb13YHvDYLPE0mnIlKbYmBNT4j63Ij3IGJT5Ks3lJRqevA2ZlGYNwWuf1apBvvzX3IEnF9WHxas372Jq9LfzxEiY2OyJsxJW5OYig0rGy9Ij8zZ6k9rwY1LHVt7aVk3vahT27l+rRMM4wSuVi35G5rvLe+nA//Ke1XyPnDAiotXL6410LElsePnJD0GBVk3FmwEroHb9q74mZc4W9fZ8uSURR9FTqg3BvMpGLYitpTWT2Fcz4cRQgl63M9qG/4rP0wTkyH6FFINUzejUdB5HKePpvV1YeUaPAvMYDBoqB9tdcQ4TBDBitVl8RTImleMcEL2yIEGfkHInGAJHHfpor/yUDRALstG2rXdz/maVptEoy38DxjJj0xbJ9trgKUMmUrOZA7LGsdgxXTc0ICJw1Klbvn4/O5NCAhbX8uyenGB8TVyMMxlAxrC07BmssEFbPmMRP+M5QltQydT/4tDKDMMQPXKML3ncxT4gEXUhREvHSKB+PCE/cyRY98IMGd5JbrzSSwHMTd7yxu6oood5XxMi7nl6Sz6nYzKf3XMF5Fk96imtetPXOPzuPn4MiV+UG1huHS61ME8igUzcsn/2yT0wjDy/rqFCe7eiQPHxTtDAwREwXqA9y2q5eg2nhWUVbwJWtRUSMbxk+9s0g7ypX+rcArqFMQsqH5PA//0VcwcU2BteiLWNtMSaXu73eVg9Kan+1nSU/0lCJbsrka8YNMjyXw8D8IGTUcMhvKbxe3G+3Nh6bYQ0DBMm0g2AykuDt8TWusZ53ULgHgws9u7LQbU1YFjzvlYUKUVfRcR8MBkEEpeJ/XgyMqKvSqe3DogMznIhhFEfI6ZoQzEK7GCM9Zzvs66fVv8adv8Gk+saoPXpYXL1QD2in4PbBfgMVBQOfAhCR6zab6KNLmOUEtB68JctgsdtY6BCvABTVilJYpaK7KE35S+nyNddr5Vku4YPzKlNEAkZnvFWN5mNcTRMBJoAJ+2l87iUhbOA9Uo5kuM1W9JJ84MVtyMliZ/y9Ww3TDup3GgW/9w1X7KZgqySKIHcqGrXyPsmp63joCQIGAAxPV7z18JmQ1KEDs3WSXpdhAQFOsUSJZ2fFWVJqVqp8UsMCKLPiFAWzprllJU7Y31ip9+nV/YqzLm4/ZVHy2VmELifQi73LGJXoUqc651fPEwMXXofOR+qJZ3h/8SUbo3UWGoQ2m2J9vGIMLuV0hwKF0vwBY6nMm4pN9wyJMWqSgxMXMvbGeE/BSnzg391cJdYF2h0XXOgZXlrgY/fOFKwp4iqlebtUm8JbQO1j+4rB6bCR48Urzv7wk/amTwqGx3owkHZ++npAQOQAv4qDoqyJUGwCpr8uz3qqrXJ7YAsEVqQxFfQtiUYMWSKUa88rBR/KT3t3LC6lI8sW00PHgybTRtUZMbOkGz9axNlK41cJayx2HqItqkVt09mrtSv0I4NnLhpyv3dHlCoC6WJ1strgpMUDjS0KbszcQamTPNJ/pBmtTQydPKObx3VhayCDSO1Kv6G3GLGyIjJe1ybJJ4KgAg8LoWdfqZeKJVQzBEP0ynDz/8NGLlsxs/2YyY8Veuw+rA9IoVhGJv42YjbRcX8TNgLjBxCZDHNgCm9kz8Y7+eoMtl5dlPv1k78hsvfvD733/6CyVflN0+2CWwKv/H8YKWpOjo81YrQTosMKhIIM82yYDXZTZQq7q91RIKT9XRE39/RMRKM5lWY5nV4bwfdCk7DWE/Z/pcD6zKwt3JkE5zT49JbUSBSnGhKUwoxVJofu6DqOT2LpxmSz64fXwGKyV10my5jO9fRRm30UCeqekNqOdxiwgW9+AyCfS1VFixtyPTQ2uYlhCvv78BNvIXvNdFVOWfDCbsG1o+MAspWlvZgeeOREgluhOqEUplBsiZ2JQGL12HmWZCS4NBT4E6G5+MhFGDWbtzcmLcZqttUc3hoKQcazokpFnqvaVbJ1XQxzFe0vHlZBTeIO49Pk0U4kGSoT44p1O9oXJQNBE7oDmlfyuHtnWRzlqxebmucaaw/PCIYx2BvGYP69ZgYtwyvK86gBoL6fxHItc2eTzFhQOLv/zr+5e7dx80igmktOrspaG3jNU0WV/0fN1nAnkcOYrq9oVCmQMPrX0E4YzUKI18C2feAXwc6SkpBf9fmIFG2g3Zwa5MNf4HF5PCBDiigE/pYqNztaJvE3/uWCpnnzS0iE5Z3o2oFNxeggAlFyTmkSVKZ+EE0fjf/tIGsivzzHCD7wkbl5AsUq12i2YJ0kof5EerDwb1E57bchsefVaZdLC9R7u2ewPP82zPnjMHuc/5e8uJKHdZiV66nO5OXyvSpiZpSVtEndYBnhxVIrRP+CtyBjhMc8SlxhsXtHZKjrmLDR+ZXNSmbHiKnfyW3vwjhsQZ26O5OyFvgmGxnZ2jF2iik0uwkL8uKf6VpE5+WEx3tKwCs4dks8dXmhbUxmTjEA75dvvxtTGwq7toq/RJ/drDVP4n7sXalJB58HpF+tmmeCq4MS2Mn0MLyYNkdb4WreHRayC+H1If6kLdk5JrhzLa/WzW+QwaEgZColWzSBwaEagPOvGsss+eMBv+pDdnrp/0yXWUBdhTe6nk6RHnb9Kzj+AtPD4nfnqNRugPppSwSu+aOB6+wYaLErJY0+FDOBMJ1StJ3BVI3dccHT32LFstHCBtfrAbgmG/KsEu+Qtr/O8LFvBZe5Shqp2tRh2vTx/XkgCOR5BvgowGyK7C9QVCVm03IGI+6vcLcckCMGOd4wRMIai7TEDxmOtwXchQFWT9D54GnUWe7ERJA2lDMfyKZHUEZz0ArUMK3jWF40r9TZh1g84Qwq7lYkUx4WKOuZSUgWYxY3NeHdYjA0PvbQlQaN56ndHdayGV4TMcDKibvpP/NDitERvP9kAJPLzmboGTgDLmTgDJDcTl2iIWzufmkIH3UGVurFAtSXrLZLWpi/e3yQkE9Jv635XmhCFjpVTNm0fybIXKc4QSS9eXuZzzh0Hk+RrgJtccX75Qu7j0n9zq6+0LRytpxzgOMSaFUA01T7aZ7MxXKKlavI8uou0mdnhrosB7PaQW1X0X2JNcwoTPCZqph7jTMHllQjgIRZ7zbEwN56fOpRXYIraOD45ma4i/PUa7USXmgNlbLTGIh4ocKoS17/X+a43ePn0Kz8Q4nJNwcf9Lu7ZcvULvokqT99S0WBpAr2WpfiM7igsGnHCtmrDmH589gIDbVxQ2ZJ5KKIzYAVZyUxTSDDdZfbyqP0uhcHj5y1PmR67m2cfTcdjKhFPrcoxzUDHCNKLWCWlnm1xg7zDt7NlwcvFwCJjS/43n/us4uN2HResr9b5/Bu7nnyO51poPKq6qbzPxQBOAiCCo5RaVqgoSht16ybJropzpatCREl/17oICkfdzN4k01cuVDwGCs8JbaPOxilOQbEevAZu/xbFyVS3vzBQ0pd3NT6Gg7R+m9JVCa1RjwX3dUiXY5uLZgBJlYn7C8RtGxzGzcbxKJ3xG3MALNMv/QtdEhnG6Ldy3hps73niaZ7gBavIfQscgtHmMcXysCDNkw+Z9259CKf7B/szQH+oN02T+93ZPcT04UCOrBAdv2COsCHHprjNKDQvsRCmdEr/cut3D5ZlnV5ootqRynJPssGWAsp8vxHu8ZoPIKpfCYp1qAmPI+AxpMRJTWRfjlqg86QpCFMe2raxbMRA5gAGjiuszo/XAtxxQX+gSIMjdySvwZyFo+3u6fY9fphgyGpcFnmhD9xmncMj7WLGtSgzk0L9NvmKSi/yp6w9GBzxDgnlFlVT/Ac4tPF0bF/U00j/duHAeIkzhQmDdhJdBkFj0XzPI721mVOEkRVj28V9YPatiCpHpEXhWhFKaxkj+bIDGe0gKnkCtlOaCshPyKLrqoI9Rii3buK8gcQe4+EoSoO5pjxF2EBfR8mArJnIa5UDpzQuC2JSqQXAGWfaaUaWEqKlHmZHSqluhJLw/iA3ovRirMZHUDiP01C4kDVYqECIhMfQslxnpQ2T4p8Y4DPAYcuLWYxrzgiK9bbWGSEPsabF0kcgj1q9WTqdLbPllknrn1TlVl0tUM22HOn5YfWRoEQ4GYNgnoKyPtlNgtgo2z5u1/C4Xcov2iS9h1OqYHkEZNxMoqsTWNmMJRAFgyB+tSaz2+nd67fHMnjJb4rHzwjMnKfikyLxdoBLyf4N5rhZ8uvjI8p0/5DF7RzPUr8l4RV+KebQj7sFCmU5H8iL09w3HIkKLObTPZoB5OD7t8Y55oiAA3u3qnjj6nO2JsGauiJpdz0h2wOexoA48/8/JqNs3yblHztNmpWvSOjNktglKRkrM4I4QT6Mxuy1XfiFnq6omEhBaWPaKyzLhpJzh95luDiIRrXonPT7T5lHaNntyLbggBP4MMPH4oAbG3gCnbRjJFpzLAv7k/k8RAAgF/iN1hFUoGE4UWbKmZ4n0vSgwuEPjFq+1D3ph7b5sYpiy77WerJ0BFA/FoWzqR+obkxq32+5A8Rcw5wBGvmKgRKqidjlQdV5yHK2xA4cnpcFdPXU7iMX8TesIARXBRJFfB4/DaRR2mdx5z7wg6wvHJzoPZ9K5YTA9e5WE1yxpzPwHhg+pHuaf4Z7gPzIMFHLvsXFjHIaFwQ7u3tmc53+a6m2q5DCXtXsi9CbHrA94uxUAsdKWdecK3pvRq5h+Ll4XrgbAEAxAdsQ/4Z7pHaAvomrfZkspnX5MUBYzd7DcWg3AVUrHvVkyi2r0+5x0BwZcMmlcbyJ6kFukocIniES+3QkU6dyiEAnUILK4cgpxOFUA1ghEfToYqwsX37YLqre6tLKyvAJbRuanhN8mKUJRMGUdAPoJ4hY/CyuNQr81vt4WpcAAPBfC/6ck081CrnMBFa46txnhY/IZLNhejYMkO3xSrB3eeiSiydFskUakSSpxR08sOJ3NsUpIJ6V8KkdUZS2Z4V7lgvm+EvAAM9fRgZUoolIkguS97haIBwJ0Lv0Dp7JyyyztuyX8/sUERSMee1rzispYR3okBSpDE+zGdR65dLDfWJUHflEhPYOhJFsEHE3+4v5GoqavPF9G1Hm/bG+YYn+AIFbSuyXapHoilM8jnB3s0ajaVyElUlxYEU+tG9lPm0LmwLhR8rkOTXhDPywmPLArJERDVNH6c30bGSG1VBxAeTSsV24vmgItoqz+I4GLt32f9Hyjbl8hvMfunQcDW3wa9rlJJB9Wm3PNIHgWCMIczs626YMkrq83+OclYyNNrf5ZpULV3EzvfgI6x3w7OWSaODjVNEjp2pZCWnmsXDHSsKCRSmEU8MLDdpUYpHZl0A/3fglSkbLCBgky3aJAl/NuAGm+InGTljSeggt0LqLFDmm39DjDlT/u2S3g+R4a5z3WgUK0bZdrUsOFD6VqxN0QAPKgIqYoSzpNRwtC46VqNjlrKZGM85CRa8X2jl46ygJFo9szobAMGazPNRubxT27gu490YFv7eIh/zbspkfg0jHV5Kk34VeAfRMjD/UbjNk4w6sE5Bpf7QWww+3A/XuQGUzf5Ayp7YdrbZDwBNX388mWCXcDcvCWBysGnpoMRPGBDC/i1GZKFn+/OaJsFiaiD9Fz+W8v3IDXIemkQJ8ZD8X8eP1JzxRoUrZtyqiTCEcN2KFRwHU/+dT7pxZPlxuS4GRmj5TYc3712o082FnLC8dFjAEoLzmQds1e2n+QgaqMrVnV7cIzXTZQJOO4c+6neIIWV/yd1zLRSsVlWVLcdc57ryDjEYta4eO+QuVu01yBMNhrAcDyRdQTXM5CgUvMgJl7UOpYch0APcFFyF/jOTXpgl8s6UiT5jNighTuJa4r4r255D9fOc6Mp+GrOHyd/Fs5b//2qpID/0ns1cAAGZeakZLbc6mLrIeGSpguNwiEVx7hgEgjC6cpE6sd5vG34veDYECCDkz+aJ4Ejuw9lauqeHKDvcEHKJnQOC/uVxIX6RBt/YutFxaQ3DGan0XzpBnyizn0DsYnEPa2CAFoDKibAI2LcldNDknlquuG9UiANUimr/7O6Y/C44lyE4xuMsF0V4pyYZIg4Kkr1BokfkqOXyLAwrIHB1Lp2VLVnA4z4BDktP8WChkElf/u+IoD0EBFJpVRKYqAd5v3IkIbdzFi3FXIA42vb05ZkMp3bz2ojN+nisYpyBkiXK0VoTY6hGZu1YzIxi1FIb0zmUMcAUmyhEtM3LWhpPoBlUlq/ejRqV9G2pBHH3K1AiyfsyjtR2AaVKvUal7KhmMy+fPGMgbvMZ1vMlnm5eEv+YpqFZ4UgZizxBhtOuY5qZhwTPxdpg6lrGLpmb2ZXcX+0vwbRLjYsMzeLZxclptbgdzZ5yOLvdFwHdTKEA3RYMqyYIsxWVpe+6Fxt+/Pbs0MkMbhaIz+jKcGaa//hR35Sado3OWRZMjg6NTQqjZWqmfl6x9oSiV+QuF+8YU7vPLa2pAbS7buwgJpoCMHKNCgJiwk83L7MK+iOX9d1k8FZxFqqDaVNaNA4ohVKQYQgUq4yHe66cXXCqgULgEEVKhEJjOfhgLQsySNxZowmXUsd0gQ7pWaGLBDTt7QyL2DW76uJsS3OlfwQVtXjUQLSISonXs9mPIWn87dX4KYaVPrHJUX5vw8KK7QCFlld8OIdRTmUentBi8mDEkL9/nM9UhKjiT99kwvZx0DEvt7dbCME/1Y85D4T8DQbpQJZMH4CG0Ecw2oMQL22d+GI5MDKUbFTo2mZFLFm6j2PwgoSfZ3RZUNogUujTZNK+U5tuYVOWX0Pe+5ThMAVCSINclCA+OpVBM108fImTYeCNsRjcFI9CriLizgp56bUIKhOmL+LjKifPaOsxbm1YGRn4yRRPTcQYrrQYYRG/GIT2WdrH0vQgAIBwDLiGY8EdilL2LjEZ7fUuHyNjrjyQ3yYxQPCKelKSHhH4f9Kohcqv0ol2XwWC8WHcBpf82yPBac10oScXhCAK1jEQHJNio7gVR87QHAMW6YNzY1NzpQJeORVDi5hZKX+E24VUBdx2yznrOEn4q11XEbwyokwSbX2x1IEmlT2bi6ugxUVwQFhLmI79L2ZA12CWKz+7BCqR0ictMW90HBdNPzo4JmsNRleVjsKXtP9UjsfQOQeDghm4UTrdYN6u3TR6jiaM6T1MiC+vyePvDr8WwBKsYjKteRm8+kzeX3zXZqWHvxjIA2zyQA9ViDCNZpLAkC2AtNf4sRhwuY8xfVPr7PUc9j9sVauXC7SNoQD2DLmupL1ffy08GfY8uNMRmEyI4CFAQQtQex4pFP0HSjrOPBp85R+MxDhq7F0JjubYP8Z1lSj1XrNmar00jx17Dc6ZxMb0NGvD6RcI1T3Mg2Ewi0sDsjWcZdfbqfsk3QK34ym7lFXa+9eRIO7vnme/UIsf+xxihWgIBwqdfb3vfVOmy2LKTNAbLsvPoxBBAl904boV8fI6nDGM1QAdZcerOOkkkVxDAK8Xpg0drgKDPr6xgTVZYIK+quZqu9hgDeizIxWBBnBWooyWONCSAsSDK/g7Do97KfKyhw/HK+CKmFx/jwawXibhKdLLRTvBwEiAoudWxlXXh/Gr3AwqN2D2xJACu2rytlUF4f2l8fmUja5+InDvGlC3mvTUfGtLOHu5u0F54nhXpUm3Mxs2CmIPJkj9HMnVmKxKeiAcsLvJl8lD+fiqY3/TRogerdKn/2XN43NfoiejC6DrNQKwmKmpLgzFUa6KkwwHJyknBc3DdirL7gWMylzvZe7uQmYXPRoy1qsUFGDJ5FIZzBSJtggg4/dVQ/JV3xLymV7ty8z1gVsK8iikDSHZc28LAoU/aFisgblk+SxuzhjGKAS2BV3APusqfvHvzFootpSNuzqnaMcAA17lIQj0NshBhd7UOGNbJrKNMUa20o0K37uHo0HUP5VNVHf+gT7JlUiESxA36WvrSAOEgR4wF4RyLB5fmVQw4hBAdRUXPsBrbWihQy9yro2oS8bS4RVPN7spawjfUjtcpwgbjaQDPTcZT7nxQEfU0GXvGGR3MDVuarfnwaztR5ioATgxJm/Jkz9up6S0wlqncjaxCwzMqCGg6VGIBwTFQhAVQmOAS30+yMpVhHzOwgQhI1uTQyWUBI2UO0BJ39Q7IQxNw8oYbBGKyolBKFmYttajjkM5y5Tvvr5O6xRmADnRHlbnV0y7wRtHz3h34/HqZYsVDI0E9tPmgRChGtXGpHxDCn4VS6ZLo95xeZPne7gD3ASmMguaAAqI7O3W1CwKqjWR/tQhvuGvMjhBLXMZzGhCkanTcnCQBjO2n/kzreS2JjWGPylhTuehm+V0xg5akH+8953a6MljYxNlqWh5bn9BxoPo/wCTyufV5imPpcyAC3WSKqdOQp8UFQSDcSAsi2piYT9SJq/sD+S6jZQzXVdifWIHGn+80WiM4Vd004R9vFsLGVoX4e/37P/dDnAkcAJqob5BZf1+3rMqh/KfOM8ByL9U/oSADH3WCd1Q3RQuO0QgCxTOjmqPjA8tQBlUeOioWOeZ9t88fdp29JXYr59YL7vl6tha2ALcWzpiwxamG2WgqPm3EAmJWC4fbF8fSmZHJOwkItMWHfNJ2r47tuRsCy4IGgvYv2M+1W1rEAJcI594On5o0QZ28mcOr/zhlKOw59K4zf/CCntQLY++jg5A4AkCiucGnWDODH/WFEhUjc1PWpD9ItMzcPUqmyNa9eKU0XqrpDnyV/yxk1xP4RsJMojgIAjq+5ulBIF/r5CSXcgbHooBdxaIX5FBRqkbP37DeS1HfiaSkiGHcsGTjwx/jvz3XzF3zZoyFCfiXanxlIHocoqrZz09YTtVjob/EqKT61gc6eQebOLCqNHho1qoEH1SFHUzvyEdy9YiKRE8VYJVn7NWDhMm/RsjWF8ct7qLZLmy6kfwVIwUJjh3gN3lEYAvquUxlwH7oqx6Mk9j/OIxzTRaIDMNiVhgsPt7+ufIc3fode6TkyfytF1vzY6oUsauMZe6214d8TLmfaABqhLiqYC3Qw/MxL152eDyJVkn9/it8ssKC9WFeP5och/b/tfJNZ+0hrGymWkvCOGW2AR13ezY+L83yNK04zZB+zm7Zvksm2KMtfxgfCc4lHOKG4cPWPYiHY+/HamgPRjXu6/d02m1skradYsY+Pv0hF8ctwTE3DHlbOlBk5H3QcjiLn2NGbQ0Ukl3b6kmg1JBW8hfvwY3dk/SGALuQw/0q60x1JfxbW+w9R8PQH9VVXgcRuQr1GYup4ZUZvnIQAqsV5g4sYRVsEibwWdLt8QkWI4vEJSWZoflICHJhxXbo0xEuQy+Q6L4Kr84BHJnpNrZWWWOSd34UbAuGuAMyt32+HKBDUz6CQaho+RY4DL3VhOdGvzkD2PFfCDclNwYaFqqSzvmqctLm6KM/m89P48Mm2n1Wh9IhIWNuo62nZihkptCZsb0scjJxuiw7TMHTm0Re2YA7aFDaOh0Sn6FE82rV+7o2aVMUVnA52ZwmGvOHzsmqjZpPKCGGvAZBI50Ve8w7Un42L23U0OEJCfQwVwfGyi0yrAeJhfMCXE65DMGWEMu1k3fxxD9g9fTrzNGlyXO/q+YHf2RQoefnyAewXU/y398Q14io8GjQBfY6JzSnQKqNmR/5kFxn4ft3SrQaixfpfvv/f9bXRdhAt9xBcCXuM9G7v0hWhpQ3lI0HcgQAK3B8EBA60JcOYx96J+2CZD98+c6zbT1wLrQq6OsS3gSon7IXSkZ7xiCgLgKQdWS+4SLl9FHw7QBtG70oV7wMABmKwiLRQy/57lzS4FfJ16VfMrG7H+8egV2HQC95NIRaGuIKkEddec7yy8UoPSSuCxYCECMa298ReCHXvsBOznaRPbc3XK3ENf/CPyEWgQoFY5Pe+hHLF8TcwdqQv0+6704kLwO3l4hzIvAf4hS9sMthMmwCulS4dyjA0SlhAVhew2naPxixLIOxzcoY8NhAcITZMMEpgz5eUMa4FyRxZvYz/kFuzno7cJqKHrfIS4SUxKmq9Fdgy8GKPy3XYbLaqVlRShrAqxx6F2AdxtlgvAKRG0KbJg/3zfQ/4fsWkbseIAjsb2H0XjCgx+15HhSVGqYO+jDBEjs9At83pFC8APR0ntuEQt6Wj5+AvR1bsKoGdHjnwtEx71Pzs57lMtr4NXImSxCq7Uf/AkzUrI7DTr1IV+AMuL5P2pyiPRvNhoL1K8oufR/UlggwCeUqZAyIc3ewhmUzsQF/SBhDIn0QXvYfRCBPej4vloEMI05g33BQmNKYG2wV85le/IeGlXaD+40dTkFnum9M9X0ftpa121KIGJqcP0MzYEwofEtw/BH772xXRxIISuupmvOkJy9PRB1tJ3O72DV3bDvvlTTi2IIxzhws2N0JkFmLQv/YM0msnqeVtKx0HvI/gdOEd2cmZ2P24VDZotTquwuH29cA/l9Tg81fjg6Il/dCQGIcPC2N7qfid43k55ZG+yV19VzSVaHHPC0rZmRfiDxrKxeDRsKcWob7PbngscAKsKA+C02su+oVbeqX1H8A9p3ghnKdWJ747jONg07wigboMUXxA2KLvovTUJ0i2lo3XukBV8hERZcwUveRz24C4ut2qUwwZ8zyeQtip/Q3UGmS4/d3IYDeKvOE/0oQZyFK11JWFdVIAA8BvEPfP/tc0zMoA9Qd2F4GN56VGdqdxqN469JH6O4Gb8JaHHbVxdu3bi6tM3NfW5DGcqHf4/w58+Pmr7FjF3QCRa1XVk+M9C0eEFTu1U5wm1YPkLGPOUSo4L2cJRIXD+sHNc3fawXNyXRATBCvsk/grN7wcAbZsElL6y3EFbKXvHoMOHU9KELBFEB0rf4491/xfcp5uPe9tm/SDzB348Qr8b7gszqbMFoPsWMesKGZDQEEPhb/yfklUDAJ6qCdqxI+VyLcMvHLhDhdhz/xxoY8GhGJ8eLp5dwfNv/9aOmhfu0f6L+7E7ExWUwdLC1hNzpFzu61XZAyXzdehlF8NU5eIlMl1eNkgy3WGrvgLzZ4Yl953mPIJlpbEOb6Wi+VtJcvWfwW8/4BQJpReBoRG7lxalr0tXIdTV3F0OV4Xe98WsIQOscLPbPTzaF7SjSDxb3CcMXsO1JjwGSfEnmN1RAAGgV3p0nGmkNCLhafwg3hwOXQe8SCMZVEDivwHibBIHudChsD8Jg+QJOcGUo8DsW1DooGoZbio5kTZiMUoN59BueebGQ3FEBMOAaNaxuAAFhcBIEiztgsrzvNhptBMXNhTBcPAenpi8oeDUvqeUWGt0nRSd4HgSjrgVhXvhGlhry/6+z539F600MdbqZbgf9VpjL88SRY8dh5qZ4vtAGBjY36nzz6X4t5igPYV0y9nwQ1lRTpsiutpCl7GTecy7Nk1k6hjNuijnKgyiAn9rwsYPCHIjVvG0mBq0ut6tWHsWfn82UYuxcbhqvfman0vqWbHdDFgM2Qz2OEJ3srGpD9MhUOwjmW1hzftm9jXt6ug25g9d8q2xDlxc2w0X26tHR8YE7uYUndeVWHz09BeSsV2798FKcZZb4dBZmlK7VLCvJ7vMKgIn3Xk64ED0qkVHrbBZ17Rj5fklq48nv+h9Tq5oCUz9Bs6YoqMZAkRXgVw6o6IuapTM/i+dLP/vlbx/IYBne7d04LIfjiwcmnVVfWHVx/4HixdYM/BiI3go4dDd67MjZAkCtn1usG6jrnicFW5esK86rQJPenbmRudByx8BkCBfg8L7d1iTDNhCO47f15OVuyNKRqtfgM5CCuFZvEaSFSUyJybnU5k0AswppxYcqN1L1Zd5XVd7MeQJjHgPkowJyt9TD8h85N+BN31qFdbS/0APpuZGqP9LbQzyWFB7/97zDFEbw0BYTPcRF0m1gsfL7Jdi0RZ7T9KI9S9gagx1scuD/65FLlf8ebMUYauNOiBkmGvDFHT1yftekNUdbEiEThoigEfurM8/acmxtrJtLGP2mUdooeEFhpns7wqBdi25JDmxrjQHRroJZ94x9JUz7j3N+S1pYbUqE5MGgfXvv9DnqCpPcKCv8N7usairAvCwUnzLAQN/QcdptYKaUW5G0RaCdZ1RFpviNIpN82yOJvtJKVi/rFfDgIq6rQAWg8dMOEgBY6/59rTFqwKeiTa4HFKuHNSnlgGTqZOLVvv5Fp7O+1n6eQgyonscKBJGYi+YIgcKw6e0QmvEoshMeTjZUGTFWHlyvituWvrDqKNioM44FMZTzaXUXBWRt4JgITkiwXSmJnU7m7jp1l6qNzC2V1dpK1QYicBheTEGdEbgvFhotqat2bOH11wNc7t1OszlDi4EEyPJa6RsoEKP5QV8eDwdCaHq4yCkUo0XiHlt2dQ9bCQQKONjihRdB5+M5C5iWy/VwLB72E1CUtWcAJuoKzmQGTQ1eigFIKuiaWVHkolOiECDoFFnmR83vIpnG6H/pgS+SgMygVix41kREPVMMY4BcQsAt6lQkIwKgMJtaeD4XjnJcSgqA3np3zqGfasKBtrYJKTH4n5jdH4hyWpXX7e8LvjKWfUWh1WzBI4KgXGokpIM2S5t2uhDPIUlvwDoS1JF/z17IHL240Iq1ZjKHf1MkgGbLCvmdHDJV1zuQG1QZfsViob8xkgqmQuwZTEQ1jJYKpDG/7as4to4ENArwQCvoJx90taGwIq2b6nEEox0h/y5QdBuzoiU0tCbJNz4AcJ2osds4D5E8IFnQ0FEDnSm1r/2pKM2s0lnI3/EefBoUrfs39Tf2elzhWMs6lIeDVFacYuQakMz9iExNFbIZ5HrxhjcZB5HW6EIyQzgmKO7lQJIrfDoQtj93PnBCT1TCgSreKJYZDBiSazKQiNLn4Ah3CHqF680IhYfiVDNIL4u5StFpvWy0kWrV9l2V9VKRyeNU1rZjyL79CW4EBO0SDLDAeMDHOBKAKznr5Uy0cTRmpvM5JI9GRQBoYu/GNgKLJaWwQT8DEr7uW5aFbuVoGzHam9osJZs0L+jHemGjw4plLW7oDBq3h11X/qGWc2Uc/fAyEF2bvh2vXZaRfxzt6nTAuaRekyKF+BpEjPMDyc91EZLrGRueZuVVT7itwtms4qcF5gRbW90lXcXeQLj0FyRIKm+tG8/ocSlrRBzi0vHB7Lr9JmdMxd7Uysi3OoSjnT6AzQxr5E5YMiqtMafV1nzTgDTaZVVY/mQn5mtPy6WUN6h5/Dw7xnnII8gq8IOExMAtDKfvnWGTwKJrsQUJOXCcCBfGG8ryOPDdzFGbCPceFf4xt0o9+4KzmMu//YPju67Wdsg8Mp+W2zmrD7GExUUxDoP1UPFBFUpajHfWRnMB3swd42OUp9LO3j7GKaJChGj+mPZiomx4A1cNt7rKd2DyvCm61v3p2ZGvmK9m4mOnyXFOHZZTf+BCGRvK1JfANYwICI9Aab3/VC1mQeORPDWwBKX22li0MCh0dOZaor3zAY/6toI5En9PzkHPZOqdwNzgbjpy0rpEbtkkhKb7fqcw31GGmC09U8/e055gtwNOe0+TwjH4RCPMJqdOqRK5l2MNu/0D1VQ3hihjKfJDidV4pzQEFV4jq0ojRUaOcjwn60faTfuCRkbou0Qbs3+6c3mLADmzieRiALUk8fD3XVMosn8YG6CnBXrn+HwkwzX4icLabxdBmhCmdwAniC8GFS0jAeXcbY7fVDgalGXeiQP76/Bd2NDKvFjcff13wdVziU+EU+ozxyl2XJfo4Mt1gB44U8TbkA7JqLw3mNrTn61qycI7A/hZdq/HwIqXzRwa2LvwF0I06kYJhP/mGrtElpNT57//hIrfMap4yel97lGw49suYa+15Ix+dZ4+dblurRlUvsizjVH+B1+gYgkXeg9Sl7548Xre18LviR12McTqdt8OfdEHTVCyzSyXeaXbXc+XI3yfD0OyVOzLKd65KkyDrlGcAZq84FjxHnUn4ISGIEH9ZR9JNf9SKSawg3e7kMHWeKXLNlt815FSbClYIx0v+mI9ykSguwEuXexk6kvVemUdjXTTNMeSppp0yYHOL98jGI0PGsuCyQ5wRikZLS8/YjYAghwWw/Y5kKI4bA07azwIY/iN7ksKIEliwSBxs0QlB+3zCXVhdQyzYAPpoislYOioEkX4G0RecCpa8HcHjdemqbWCwTn8SYgRALhr/OKDrCpy7gEl9AI0SCJqo7N+ERzocMkPYxRJmnafS8Hok+sOGcaNQgShYCbjgOlE9klut8yIPRfnEbO71I4NCfJJ/x0YIpACFUVa0nc09+bArClSWh6/0yQJZDGhSC0gfW6iIglCuSogBLmqnb5P6fLxgUKMnH5Hwlc8LXkytRJInMjCeq13BPr0QbzobuBbSSjRuJU1BrSgr3A/hPw86Qo2bLYs8kEO+giMO/sYPTy5wA8NkKVfXqr/0iRmdHMXMkhrYWcQOmq9KD+Lv7kfzrECKAnH15xqB+JThY0oNQChDWYCnOxFlZFAhVYAX4c9kkxTyNqIBEG+AJxashoBFwVfhkBcKLbcAG2JyCAigFRFll+zKF2XyJuQxAuJUiwqoRFEZsUp5Ngb3A+R/HlpkCFxaERWFZFpQomGVWj3dSPxrEJoxQUxpg5oLViiVpInu0rPCilW0TWLnKBLhgoEGVdVaR5f8KYrG2WuyVa5UZZLXpWg3OrwXkwTZiPJBIM2Cc8Im5M4VAJUVqpMTNJVbYLih4j0Sk9664GuVCHFlWhM2c4FlTbRIx81MUdKsd9IZUQcuHQVzgUIRtMguZWlHdkkAl6Jv1QgaDPZm9qQl1sYgbpRcpfwm/DVZe1+Be9KHK4BC6pYylIWNi7dhDWHcL/LzvVHLhKtsjAtiHPAxeLi1gSNIwp6LKQauIRAiZl4SPgvgST2Y9gCwNpiBwsK5S6EjFOBCUqloAdaYUVkuDfsPINEAS3dW3lXYcCJz88CYO7LwkIDbhXhMcZsEwnyD+vbDmXFFgGxLoduEeRzzbJxncCvSCHgzNueR4X0DW3uAgm0Nzzvng7VKR7X7oV8OCGpJtppiTV5ccQm9JWpEfocCfqvAKYjTdswOJFF781M0tpKLHtIaGCxLAx3IbtsoEJsdREaK8xrIZP1ei19ITXzyc+pozIBBM2LI0B0384ntn4DNnuU1BEVZ/oRH+wCfn0HgqRhf4uQcEBKGLAFLj6UAsBl38e+eNHx/d8BAcRw56jR+8gqwZqNtJ8ABbXXQqBtIZzRN4EBS7uqPnrPq6bRLMYKktCLGnSNwFWPD8tb1Zq9MHFgk2Ej8vruzwBm5HauMkEZPk7tkLGPnAMzLkplB/D0Bmy5hbuIEkZJLk/c/OLIw9lVIFI3ei9SIHlWPVy7QBdLhxcQiZ94RMiGd3QRPC3a1/IzWjKcjxJJKMIENioAf2xEMU2ScpEK4lnlhNFYSM8N4QH1LKNR74jZOvqYAhQAN1P+eVDCSJfMsDPCxPau+gAwZBAvbyETIxJAXbDAkp0vaeNlZFB1pBxYaqIjABZiMq+spDAYg2UYJtBTC1s9kuE4aN4sjwqsU50WV9MPmw9NcG1Y2e6Kin7QQU6bUR5MK7m9po2VyQnYWjTavZD3kXND6If6ggDvFmbzQpdZ0Bv12N8S0XgYQdTL6BjiMKyV4qm5OHFQiK+4mSXD0G0C1CG7dpuA5DbeV7AnREjmozvA1sdhrmueCcdfzwk8EzyG1oHmYDtO7B7/kR3xdYOdBqCD+K6qBmVxPOKgw/j1AG60chAtpNz4BqRr9jFZ4kV7yWj49VeaaHe+Eq+PWZquxXTi8guuUC4Qk8nTwGv7b/P4P3GriPSRs8tOIWZ3hGd8qyAu01UQqiPnw01OpaAg/kfHKnd6oP9i/8ISIx4FkS+Ix8Dox5eB+5M988aWTs/FwBhH+ILiEoKYHIPXxy7iFiPuISqBZ/BLQw/J3MQ1z93fu2MYBnxyh0qwIBThFTJ3DfVJ0tiVVvRQCAjFuWyVk+QHhRQ99ScU17VgaVmlCC0xrng1YQ9Zc2k1SMfIfDwEvW/RaNbaWX7SyR8XV+kLdlJv6KSfE53ARFgspPO+yjx2d3KFx/p6rcCeSOAKGAkRQ74WRKtElfr+P/5B6fw0xRmBzzs4mnSfFr0Mre4DA3/BL/PK+O54cz2HPBn+s+tDgElu6zHLO+9NDQWO+dNbS2zw0QefrLDZGadsobQ3D0A+l37a0876w3m/u+CFKldcdMlW1d6Y4bqrrqnxyj8mqlNriGGGGm6ZERq+XKdNXzD5KVq1ealdpw4jjTbKPsuNNUaXcf722oGHAmCYlu3E/4Tq/h2Hrlc+JiEq5jUfwuJgPCAQSWTxfr4mo0pISknLyCKoHE3eAl2hvxuBigymkrKKqpq6hiZLq94QrKOrB4AQ+bpPYARi29rR+pu9SPH/i0Sm9N1/HptCaHQGk8XmcHl8XCAUiSVSmVyh7CBMpdb01BKu0xuMJrPF2k2dQqnSyjQRdofT5fZ4fX44AolCY7A4PIFIIlOoNDqDyWJzuDy+QCgSS6QyuUKpUmu0Or3BaCo0W6w2O3sHRydnF1c3dw9PL28fXwKRRKZQaXQGk8XmcHl8gVAklkh9fGVyhVKl1mh1eoPRZLZYbXaH0+X2eL31znsffPTJZ18A+Uqvb4Y04eyFBagSHhL6D26/TnjwESBEhBjJ6FgmyubifCgUS+XxSnVicmp6xh6JwZId0RTsbGKkeuNS0lyN71m9UF+4uJj9Yx268ZNzQXXYx+lKWzkCx1VMSHNZdXYozoZKNQjm4mzInuz7C/kQ5WXa6PjF8kVvUe5PWXPGp1GcLbksyngr5duUksRN+ShLFamYSMdjsYWkVaaKkoYs0Yp86/orxfSdtgrtMsZPvkDwLj/rBLT6vF3n5WXrt5sM3Lg0LdWl1cAGlAqqKtcIlHoUwR+oN/9PNtpbVg/LCM5HC0V39bRsbnJbanlaLEPWcmnO27DcH9scDKOIeheXHyhaJN3Q7wRdzMnT8TG0yq1BKy76TyGv360vr3ddyvcJ9RrDOFPd1NySgFfjYzGGyf5iXT8pjCOtDQTHbGkMVWdvOa0O36lMDWQMKpOhLRk46LYMgf0wsyhhsJpVW22o6frT7risv2iT4auV8ul4rw1P+zSUFZcRsiiucLuU97Cs6czx5GczyGKr/DXH4/S232GpWqklpddUPB40ZK76Aes7xQUz12OHuZOJG+ilZcDbMdeyj7tZiKLXNW1/H0nH25mIlC2DHK7LSqxrqVm17Gu7ZGAgaX0q21tH7hmI/DxDsVZNic2AaMCz0sxfgK0ycb1Lovq1NKl4VZNzZluPZlGL25YbBFrU4p3y6xxPmJwggzKoTPHus8UgEX7u7yoC9NqqNMv/9KQ4X8m7NJnyeOqfhW7Ah1JtW9OYNbt1VRBroOcYvN4rAn1bdGHvBcrMbbruBbqsEoaQzmQ4QaRuQQARTjCYLHY83+tWIXGueq31YwxAhBMMJotNUhyuemvQAQAAAAAAAAAAABBCCCGEEEIIIYQIIYQQQgghhBBC1u0YQIQTDCaLTVJc9dYiq9qynVU7SXLsrZ7erzVK0W1ciY1n1ae+WsYu9amldanjksFedq5MD0OWbkchyTVL1vZDlttGrCoj/KBIp7YKMkQwhr6xhlap/YRmuPyZ917pX6zR/f74vZQdHC74/R+b0fvAEi54MwA=);
+          }
+    </style>
+    
+  </defs>
+  <g stroke-linecap="round" transform="translate(10.000000000000002 206.10785563636307) rotate(0 109.5 79.3466898232328)"><path d="M32 0 C74.22 -2.25, 115.52 1.32, 187 0 C206.94 -0.97, 221.97 7.31, 219 32 C219.57 65.57, 216.76 97.92, 219 126.69 C218.95 144.97, 205.93 159.72, 187 158.69 C147.64 155.32, 113.82 156.1, 32 158.69 C11.15 157.9, 1.87 144.5, 0 126.69 C0.73 89.21, -3.85 56.34, 0 32 C3.31 13.25, 8.45 2.64, 32 0" stroke="none" stroke-width="0" fill="#b2f2bb"></path><path d="M32 0 C70.55 1.69, 110.63 1.9, 187 0 M32 0 C84.75 1.45, 137.69 0.35, 187 0 M187 0 C208.84 0.86, 220.01 12.49, 219 32 M187 0 C209.05 0.24, 219.67 9.48, 219 32 M219 32 C217.66 54.18, 218.16 72.8, 219 126.69 M219 32 C220.44 64.54, 220.35 96.41, 219 126.69 M219 126.69 C220.32 148.95, 209.48 157.68, 187 158.69 M219 126.69 C220.11 146.96, 210.56 159.72, 187 158.69 M187 158.69 C146.78 156.02, 106.21 157.85, 32 158.69 M187 158.69 C137.33 158.4, 88.43 157.93, 32 158.69 M32 158.69 C9.06 158.86, 0.44 148.54, 0 126.69 M32 158.69 C10.85 158.97, 0.63 147.93, 0 126.69 M0 126.69 C-0.47 96.22, 0.77 68.95, 0 32 M0 126.69 C-1.01 101.45, -0.41 75.63, 0 32 M0 32 C1.79 11.98, 11.71 0.21, 32 0 M0 32 C1.27 12.93, 11.42 0.17, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(21.682044982910156 267.9545454595959) rotate(0 97.81795501708984 17.5)"><text x="97.81795501708984" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">EventStoreDB</text></g><g stroke-linecap="round" transform="translate(877.903197060606 10) rotate(0 93.18181818181802 90.90909090909076)"><path d="M32 0 C59.55 -1.75, 92.84 -4.13, 154.36 0 C177.24 -2.96, 189.82 12.63, 186.36 32 C185.81 67.86, 183.47 110.86, 186.36 149.82 C184.08 173.36, 173.9 179.13, 154.36 181.82 C124.87 180.29, 96.28 177.56, 32 181.82 C12.89 184.26, 2.99 173.04, 0 149.82 C4.9 127.59, -0.63 102.85, 0 32 C2.66 8.13, 9.75 1.82, 32 0" stroke="none" stroke-width="0" fill="#a5d8ff"></path><path d="M32 0 C71.9 0.07, 109.11 0.14, 154.36 0 M32 0 C75.84 1.08, 119.67 1.57, 154.36 0 M154.36 0 C176.32 0.21, 186.95 9.64, 186.36 32 M154.36 0 C173.91 -1.38, 187.51 9.77, 186.36 32 M186.36 32 C187.11 75.29, 187.73 117.48, 186.36 149.82 M186.36 32 C187.85 66.28, 187.77 99.13, 186.36 149.82 M186.36 149.82 C187.33 170.22, 177.63 182.71, 154.36 181.82 M186.36 149.82 C185.45 169.13, 174.27 181.97, 154.36 181.82 M154.36 181.82 C128.52 181.91, 100.89 182.01, 32 181.82 M154.36 181.82 C111.35 181.88, 70.16 182.05, 32 181.82 M32 181.82 C10.83 182.06, 0.55 171.07, 0 149.82 M32 181.82 C10.88 180.19, -2.14 169.84, 0 149.82 M0 149.82 C-0.59 123.42, 1.06 92.96, 0 32 M0 149.82 C0.31 107.56, -0.06 64.1, 0 32 M0 32 C1.1 12.64, 11.32 0.15, 32 0 M0 32 C-0.45 9.67, 10.63 -0.79, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(913.0830315998459 65.90909090909076) rotate(0 58.001983642578125 35)"><text x="58.001983642578125" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Lambda </text><text x="58.001983642578125" y="59.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">function</text></g><g stroke-linecap="round" transform="translate(884.2668335151513 456.8793566363636) rotate(0 90.00000000000006 72.72727272727275)"><path d="M32 0 C65.23 -1.01, 98.81 3.91, 148 0 C170.42 -0.84, 180.97 10.61, 180 32 C176.74 51.74, 177.22 64.37, 180 113.45 C178.02 134.95, 168.14 145.94, 148 145.45 C117.98 145.85, 86.51 145.29, 32 145.45 C7.45 142.76, -1.83 138.1, 0 113.45 C3.56 80.63, -0.01 54.72, 0 32 C1.03 8.49, 9.89 1.71, 32 0" stroke="none" stroke-width="0" fill="#ffc9c9"></path><path d="M32 0 C70.43 1.1, 105.55 0.21, 148 0 M32 0 C72.13 -0.96, 111.92 -1.58, 148 0 M148 0 C167.78 -1.2, 181 9.89, 180 32 M148 0 C170.62 -0.31, 178.47 11.7, 180 32 M180 32 C180.36 63.35, 178.77 93.19, 180 113.45 M180 32 C180.95 59.74, 181.43 88.86, 180 113.45 M180 113.45 C179.21 133.03, 168.09 145.58, 148 145.45 M180 113.45 C178.04 134.69, 169.47 145.93, 148 145.45 M148 145.45 C113.98 147.28, 78.13 143.92, 32 145.45 M148 145.45 C112.32 145.87, 76.75 145.71, 32 145.45 M32 145.45 C10.85 144.04, -1.86 133.65, 0 113.45 M32 145.45 C9.3 145.57, 0.95 134.18, 0 113.45 M0 113.45 C0.83 82.17, 0.96 50.68, 0 32 M0 113.45 C0.13 84.67, -0.1 54, 0 32 M0 32 C-0.39 9.8, 10.64 -0.69, 32 0 M0 32 C-1.46 8.5, 11.48 -0.89, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(953.606845111831 517.1066293636363) rotate(0 20.659988403320312 12.5)"><text x="20.659988403320312" y="17.619999999999997" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">RDS</text></g><g mask="url(#mask-3kEFuuFhUrPMSC_z8QTo2)" stroke-linecap="round"><g transform="translate(973.9716149400014 203.6363636363635) rotate(0 0.9673473530268666 124.31517453137548)"><path d="M0.3 0.52 C0.65 42.11, 2.53 207.65, 2.93 248.89 M-1 -0.25 C-0.82 41.08, 1.78 205.75, 2.3 247.34" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(973.9716149400014 203.6363636363635) rotate(0 0.9673473530268666 124.31517453137548)"><path d="M-6.58 223.97 C-2.56 233.59, 1.68 241.84, 2.3 247.34 M-6.58 223.97 C-4.54 230.67, -0.5 238.13, 2.3 247.34" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(973.9716149400014 203.6363636363635) rotate(0 0.9673473530268666 124.31517453137548)"><path d="M10.51 223.73 C8.22 233.48, 6.15 241.82, 2.3 247.34 M10.51 223.73 C7.26 230.41, 5.98 237.95, 2.3 247.34" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-3kEFuuFhUrPMSC_z8QTo2"><rect x="0" y="0" fill="#fff" width="1076.2981610288416" height="551.4248111818183"></rect><rect x="886.0389330894018" y="310.0305874090909" fill="#000" width="178.19190979003906" height="35" opacity="1"></rect></mask><g transform="translate(886.038933089402 310.0305874090909) rotate(0 88.90002920362633 17.920950758648075)"><text x="89.09595489501953" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">SQL updates</text></g><g stroke-linecap="round" transform="translate(395.1759236969695 191.81818163636353) rotate(0 110.4545454545455 93.63636363636374)"><path d="M32 0 C88.61 0.61, 140.23 -1.74, 188.91 0 C211.27 -2.28, 223.12 8.87, 220.91 32 C218.49 60.25, 218.9 89.4, 220.91 155.27 C217.39 178.83, 212.68 190.27, 188.91 187.27 C131.8 188.47, 80.92 182.95, 32 187.27 C13.31 189.93, -2.54 175.69, 0 155.27 C-1.41 113.77, -1.88 69.92, 0 32 C-0.97 10.78, 13.23 0.01, 32 0" stroke="none" stroke-width="0" fill="#ffec99"></path><path d="M32 0 C84.88 -0.16, 134.31 -0.2, 188.91 0 M32 0 C71.48 0.55, 110.52 0.81, 188.91 0 M188.91 0 C208.91 0.9, 222.26 12.19, 220.91 32 M188.91 0 C212.07 -0.3, 222.53 8.53, 220.91 32 M220.91 32 C220.47 78.06, 220.55 124.13, 220.91 155.27 M220.91 32 C219.8 74.54, 219.57 116.9, 220.91 155.27 M220.91 155.27 C221.03 177.02, 210.26 186.31, 188.91 187.27 M220.91 155.27 C221.04 177.64, 212.27 187.23, 188.91 187.27 M188.91 187.27 C154.95 187.77, 120.21 188.16, 32 187.27 M188.91 187.27 C141.55 185.59, 95.45 186.21, 32 187.27 M32 187.27 C11.5 186.74, 1.93 177.72, 0 155.27 M32 187.27 C10.44 188.75, 1.15 178.24, 0 155.27 M0 155.27 C-0.6 108.36, 1.16 59.9, 0 32 M0 155.27 C0.23 117.05, -0.39 78.57, 0 32 M0 32 C0.71 9.89, 10.13 1.65, 32 0 M0 32 C-2.14 11.65, 8.78 2.21, 32 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(420.41251260854625 250.45454527272727) rotate(0 85.21795654296875 35)"><text x="85.21795654296875" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Self-hosted </text><text x="85.21795654296875" y="59.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">subscription</text></g><g stroke-linecap="round" transform="translate(313.357741878788 98.18181800000002) rotate(0 191.81818181818176 205)"><path d="M0 0 C126.5 -1.59, 253.52 -0.08, 383.64 0 M383.64 0 C384.17 107.59, 385.64 215.02, 383.64 410 M383.64 410 C236.93 412.39, 92.97 412.29, 0 410 M0 410 C-0.02 308.25, -1.52 204.56, 0 0" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="8 9"></path></g><g transform="translate(470.63046915151546 55.90909072727254) rotate(0 26.529983520507812 17.5)"><text x="0" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="start" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">EKS</text></g><g stroke-linecap="round"><g transform="translate(240.151515151515 283.9553732264569) rotate(0 74.58315365976826 -0.7570613841713225)"><path d="M0.6 -0.47 C25.71 -0.55, 125.1 -1.21, 149.71 -1.22 M-0.55 -1.76 C24.54 -1.59, 123.91 0.37, 149.12 0.23" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(240.151515151515 283.9553732264569) rotate(0 74.58315365976826 -0.7570613841713225)"><path d="M125.55 8.58 C130.07 7.73, 135.82 3.42, 149.12 0.23 M125.55 8.58 C134.42 5.39, 142.46 1.71, 149.12 0.23" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(240.151515151515 283.9553732264569) rotate(0 74.58315365976826 -0.7570613841713225)"><path d="M125.7 -8.52 C130.08 -5.57, 135.8 -6.07, 149.12 0.23 M125.7 -8.52 C134.63 -5.81, 142.62 -3.59, 149.12 0.23" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask></mask><g mask="url(#mask-bjQ9m9s5Hp1oIIzyWqC7I)" stroke-linecap="round"><g transform="translate(628.2821293333332 239.24045011829344) rotate(0 118.71197645803636 -48.99352107871783)"><path d="M0.67 -0.16 C39.83 -16.08, 196.15 -80.08, 235.57 -95.99 M-0.43 -1.29 C39.06 -17.53, 198.31 -81.8, 237.86 -97.83" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(628.2821293333332 239.24045011829344) rotate(0 118.71197645803636 -48.99352107871783)"><path d="M219.29 -81.09 C225.58 -88.38, 233.25 -91.56, 237.86 -97.83 M219.29 -81.09 C226.85 -88.29, 233.79 -93.2, 237.86 -97.83" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(628.2821293333332 239.24045011829344) rotate(0 118.71197645803636 -48.99352107871783)"><path d="M212.87 -96.94 C221.35 -98.72, 231.26 -96.35, 237.86 -97.83 M212.87 -96.94 C222.97 -98.17, 232.33 -97.11, 237.86 -97.83" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-bjQ9m9s5Hp1oIIzyWqC7I"><rect x="0" y="0" fill="#fff" width="964.6457663333332" height="435.76736657080926"></rect><rect x="701.7759671814778" y="173.47699189203558" fill="#000" width="89.37596130371094" height="35" opacity="1"></rect></mask><g transform="translate(701.7759671814778 173.47699189203558) rotate(0 45.21813860989175 16.76993714754002)"><text x="44.68798065185547" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">events</text></g><g mask="url(#mask-4JRsygYNsOESEsMb-AwUM)" stroke-linecap="round"><g transform="translate(584.5433634748046 389.99999981818155) rotate(0 146.6860473869218 66.64306840436859)"><path d="M-0.8 0.54 C48.12 22.82, 244.98 111.53, 294.17 133.51 M0.98 -0.22 C49.75 21.74, 244.8 109.55, 293.65 131.87" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(584.5433634748046 389.99999981818155) rotate(0 146.6860473869218 66.64306840436859)"><path d="M268.72 129.96 C278.49 132.16, 287.99 133.07, 293.65 131.87 M268.72 129.96 C276.55 131.2, 283.62 130.78, 293.65 131.87" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(584.5433634748046 389.99999981818155) rotate(0 146.6860473869218 66.64306840436859)"><path d="M275.78 114.38 C283.02 122.08, 290 128.54, 293.65 131.87 M275.78 114.38 C281.69 120.03, 286.73 124.08, 293.65 131.87" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g></g><mask id="mask-4JRsygYNsOESEsMb-AwUM"><rect x="0" y="0" fill="#fff" width="977.903197151515" height="622.5927330815148"></rect><rect x="656.0013259674565" y="438.79636644984816" fill="#000" width="150.44390869140625" height="35" opacity="1"></rect></mask><g transform="translate(656.0013259674568 438.79636644984816) rotate(0 75.22808489426973 17.846701772701977)"><text x="75.22195434570312" y="24.668" font-family="Virgil, Segoe UI Emoji" font-size="28px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">checkpoints</text></g><g stroke-linecap="round" transform="translate(850.17592469697 598.3568892727267) rotate(0 51.36363636363603 41.36363636363626)"><path d="M0 0 C39 0.47, 75.15 0.29, 102.73 0 M0 0 C25.66 -1.34, 51.49 -0.39, 102.73 0 M102.73 0 C103.11 17.77, 101.73 35.62, 102.73 82.73 M102.73 0 C102.65 28.62, 103.67 57.33, 102.73 82.73 M102.73 82.73 C71.01 83.19, 38.05 81.14, 0 82.73 M102.73 82.73 C78.16 82.51, 53.73 83.34, 0 82.73 M0 82.73 C0.89 60.53, 0.78 35.8, 0 0 M0 82.73 C-0.13 57.11, -0.65 30.91, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(869.7495754038678 614.7205256363629) rotate(0 31.78998565673828 25)"><text x="31.78998565673828" y="17.619999999999997" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Data </text><text x="31.78998565673828" y="42.62" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">tables</text></g><g stroke-linecap="round" transform="translate(976.539561060606 596.5387074545447) rotate(0 64.99999999999994 43.5)"><path d="M0 0 C45.5 1.31, 93.75 -1.42, 130 0 M0 0 C26.7 -0.13, 55.17 0.12, 130 0 M130 0 C130.48 27.95, 129.55 50.77, 130 87 M130 0 C130.27 26.94, 130.46 53.6, 130 87 M130 87 C88.66 84.6, 49.69 86.62, 0 87 M130 87 C94.36 88.37, 59.43 88.44, 0 87 M0 87 C-0.36 54.22, 1.4 19.88, 0 0 M0 87 C0.16 59.92, -0.46 32.59, 0 0" stroke="#1e1e1e" stroke-width="1" fill="none"></path></g><g transform="translate(986.3896205698834 615.0387074545447) rotate(0 55.1499404907226 25)"><text x="55.149940490722656" y="17.619999999999997" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">Checkpoints</text><text x="55.149940490722656" y="42.62" font-family="Virgil, Segoe UI Emoji" font-size="20px" fill="#1e1e1e" text-anchor="middle" style="white-space: pre;" direction="ltr" dominant-baseline="alphabetic">table</text></g><g stroke-linecap="round" transform="translate(818.357742878788 578.3568892727267) rotate(0 152.72727272727246 62.27272727272725)"><path d="M0 0 C119.95 -0.02, 242.54 -0.36, 305.45 0 M305.45 0 C305.55 35.88, 305.65 74.58, 305.45 124.55 M305.45 124.55 C187.06 123.09, 68.81 122.88, 0 124.55 M0 124.55 C-0.15 84.27, -2.2 45.69, 0 0" stroke="#1e1e1e" stroke-width="1.5" fill="none" stroke-dasharray="8 9"></path></g></svg>
\ No newline at end of file
diff --git a/docs/server/features/connectors/images/internal-hosting.png b/docs/server/features/connectors/images/internal-hosting.png
new file mode 100644
index 00000000000..9ca873c26f6
Binary files /dev/null and b/docs/server/features/connectors/images/internal-hosting.png differ
diff --git a/docs/server/features/connectors/manage.md b/docs/server/features/connectors/manage.md
new file mode 100644
index 00000000000..ce63bdc5c86
--- /dev/null
+++ b/docs/server/features/connectors/manage.md
@@ -0,0 +1,443 @@
+---
+title: 'Manage Connectors'
+order: 4
+---
+
+This page offers a detailed list of operations for effectively managing your connectors.
+
+::: info
+This page uses the `serilog-sink` connector as an example. Replace `instanceTypeName` with the unique identifier of your chosen connector. For more information on the instance type name, refer to the [individual documentation](./sinks/) for each connector.
+:::
+
+<template>
+  <div>
+    <label for="connector">Select Connector Type:</label>
+    <select id="connector" v-model="selectedConnector">
+      <option v-for="type in connectorTypes" :value="type">{{ type }}</option>
+    </select>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      selectedConnector: "serilog-sink", // Default connector type
+      connectorTypes: ["serilog-sink", "http-sink", "custom-sink"], // Add more connector types as needed
+    };
+  },
+};
+</script>
+
+## Create
+
+Create a connector by sending a `POST` request to `connectors/{connector_id}`, where `{connector_id}` is a unique identifier of your choice for the connector.
+
+::: tabs
+@tab Powershell
+
+```powershell
+$JSON = @"
+{
+  "name": "Demo Serilog Sink",
+  "settings": {
+    "instanceTypeName": "serilog-sink",
+    "subscription:filter:scope": "stream",
+    "subscription:filter:expression": "some-stream",
+    "subscription:initialPosition": "earliest"
+  }
+}
+"@ `
+
+curl.exe -X POST `
+  -H "Content-Type: application/json" `
+  -d $JSON `
+  http://localhost:2113/connectors/serilog-sink
+```
+
+@tab Bash
+
+```bash
+JSON='{
+  "name": "Demo Serilog Sink",
+  "settings": {
+    "instanceTypeName": "serilog-sink",
+    "subscription:filter:scope": "stream",
+    "subscription:filter:expression": "some-stream",
+    "subscription:initialPosition": "earliest"
+  }
+}'
+
+curl -X POST \
+  -H "Content-Type: application/json" \
+  -d "$JSON" \
+  http://localhost:2113/connectors/serilog-sink
+```
+
+:::
+
+When you start the connector using the [Start command](#start), and append an
+event to the stream `some-stream`, the connector will consume the event and log
+it to the console. Find out more about [Subscription configuration](./settings.md#subscription-configuration).
+
+::: note
+The name field is optional and can be used to provide a human-readable name for the connector. If not provided, the connector will be named after the connector ID.
+:::
+
+## Start
+
+Start a connector by sending a `POST` request to `connectors/{connector_id}/start`, where `{connector_id}` is the unique identifier used when the connector was created.
+
+::: tabs
+@tab Powershell
+
+```powershell
+curl.exe -i -X POST http://localhost:2113/connectors/serilog-sink/start
+```
+
+@tab Bash
+
+```bash
+curl -i -X POST -H http://localhost:2113/connectors/serilog-sink/start
+```
+
+:::
+
+You can also start from a specific position by providing the start position in
+the query parameter. Do this by sending a `POST` request to
+`connectors/{connector_id}/start/{log_position}` where `{log_position}` is the position
+from which to start consuming events.
+
+::: tabs
+@tab Powershell
+
+```powershell
+curl.exe -i -X POST http://localhost:2113/connectors/serilog-sink/start/32789
+```
+
+@tab Bash
+
+```bash
+curl -i -X POST http://localhost:2113/connectors/serilog-sink/start/32789
+```
+
+:::
+
+::: note
+If you do not provide a start position, the connector will start consuming
+events from an existing checkpoint position, defaulting to the subscription
+initial position if no checkpoint exists.
+:::
+
+## List
+
+List all connectors by sending a `GET` request to `/connectors`.
+
+::: tabs
+@tab Powershell
+
+```powershell
+$JSON = @"
+{
+  "state": ["CONNECTOR_STATE_STOPPED", "CONNECTOR_STATE_RUNNING"],
+  "instanceTypeName": ["serilog-sink"],
+  "connectorId": ["serilog-sink"],
+  "includeSettings": true,
+  "paging": {
+      "page": 1,
+      "pageSize": 100
+  }
+}
+"@ `
+
+curl.exe -X GET `
+  -H "Content-Type: application/json" `
+  -d $JSON `
+  http://localhost:2113/connectors
+```
+
+@tab Bash
+
+```bash
+JSON='{
+  "state": ["CONNECTOR_STATE_STOPPED", "CONNECTOR_STATE_RUNNING"],
+  "instanceTypeName": ["serilog-sink"],
+  "connectorId": ["serilog-sink"],
+  "includeSettings": "true",
+  "paging": {
+      "page": 1,
+      "pageSize": 100
+  }
+}'
+
+curl -X GET \
+  -H "Content-Type: application/json" \
+  -d "$JSON" \
+  http://localhost:2113/connectors
+```
+
+:::
+
+You can paginate the results by specifying the `pageSize` and `page` parameters.
+Additionally, you can filter the results using the `state`, `instanceType`, and
+`connectorId` parameters.
+
+::: details Click here to see a list example
+
+```json
+{
+  "items": [
+    {
+      "connectorId": "http-sink",
+      "name": "Demo HTTP Sink",
+      "state": "CONNECTOR_STATE_STOPPED",
+      "stateTimestamp": "2024-08-13T12:21:50.506102900Z",
+      "settings": {
+        "instanceTypeName": "http-sink",
+        "url": "http://localhost:8080/sink",
+        "transformer:Enabled": "true",
+        "transformer:Function": "ZnVuY3Rpb24gdHJhbnNmb3JtKHJlY29yZCkgewogIGxldCB7IG1ha2UsIG1vZGVsIH0gPSByZWNvcmQudmFsdWUudmVoaWNsZTsKICByZWNvcmQuc2NoZW1hSW5mby5zdWJqZWN0ID0gJ1ZlaGljbGUnOwogIHJlY29yZC52YWx1ZS52ZWhpY2xlLm1ha2Vtb2RlbCA9IGAke21ha2V9ICR7bW9kZWx9YDsKfQ==",
+        "subscription:filter:scope": "stream",
+        "subscription:filter:expression": "^\\$connectors\\/[^\\/]+\\/leases"
+      },
+      "settingsTimestamp": "2024-08-13T12:21:50.506102900Z"
+    },
+    {
+      "connectorId": "serilog-sink",
+      "name": "Demo Serilog Sink",
+      "state": "CONNECTOR_STATE_RUNNING",
+      "stateTimestamp": "2024-08-13T12:21:47.459327600Z",
+      "settings": {
+        "instanceTypeName": "serilog-sink",
+        "subscription:filter:scope": "stream",
+        "subscription:filter:expression": "some-stream",
+        "subscription:initialPosition": "earliest"
+      },
+      "settingsTimestamp": "2024-08-13T12:21:47.366197400Z",
+      "position": 16829
+    }
+  ],
+  "totalCount": 2,
+  "paging": {
+    "page": 1,
+    "pageSize": 100
+  }
+}
+```
+
+:::
+
+The following states are available:
+
+| State                          | Description                                           |
+| ------------------------------ | ----------------------------------------------------- |
+| `CONNECTOR_STATE_UNKNOWN`      | The state of the connector is unknown.                |
+| `CONNECTOR_STATE_ACTIVATING`   | The connector is in the process of being activated.   |
+| `CONNECTOR_STATE_RUNNING`      | The connector is currently running.                   |
+| `CONNECTOR_STATE_DEACTIVATING` | The connector is in the process of being deactivated. |
+| `CONNECTOR_STATE_STOPPED`      | The connector is currently stopped.                   |
+
+## View settings
+
+View the settings for a connector by sending a `GET` request to
+`/connectors/{connector_id}/settings`, where `{connector_id}` is the unique
+identifier used when the connector was created.
+
+::: tabs
+@tab Powershell
+
+```powershell
+curl.exe -X GET http://localhost:2113/connectors/serilog-sink/settings
+```
+
+@tab Bash
+
+```bash
+curl -X GET http://localhost:2113/connectors/serilog-sink/settings
+```
+
+:::
+
+::: details Click here to see an example of the settings
+
+```json
+{
+  "settings": {
+    "instanceTypeName": "serilog-sink",
+    "subscription:filter:scope": "stream",
+    "subscription:filter:expression": "some-stream",
+    "subscription:initialPosition": "latest"
+  },
+  "settingsUpdateTime": "2024-08-14T18:12:16.500822500Z"
+}
+```
+
+:::
+
+## Reset
+
+Reset a connector by sending a `POST` request to `/connectors/{connector_id}/reset`, where `{connector_id}` is the unique identifier used when the connector was created.
+
+::: tabs
+@tab Powershell
+
+```powershell
+curl.exe -i -X POST http://localhost:2113/connectors/serilog-sink/reset
+```
+
+@tab Bash
+
+```bash
+curl -i -X POST http://localhost:2113/connectors/serilog-sink/reset
+```
+
+:::
+
+You can also reset the connector to a specific position by providing the reset
+position in the query parameter. Do this by sending a `POST` request to
+`/connectors/{connector_id}/reset/{log_position}` where `{log_position}` is the position
+to which the connector should be reset.
+
+::: tabs
+@tab Powershell
+
+```powershell
+curl.exe -i -X POST http://localhost:2113/connectors/serilog-sink/reset/25123
+```
+
+@tab Bash
+
+```bash
+curl -i -X POST http://localhost:2113/connectors/serilog-sink/reset/25123
+```
+
+:::
+
+::: note
+If no reset position is provided, the connector will reset the position to the beginning of the stream.
+:::
+
+## Stop
+
+Stop a connector by sending a `POST` request to `/connectors/{connector_id}/stop`, where `{connector_id}` is the unique identifier used when the connector was created.
+
+::: tabs
+@tab Powershell
+
+```powershell
+curl.exe -i -X POST http://localhost:2113/connectors/serilog-sink/stop
+```
+
+@tab Bash
+
+```bash
+curl -i -X POST http://localhost:2113/connectors/serilog-sink/stop
+```
+
+:::
+
+## Reconfigure
+
+Reconfigure an existing connector by sending a `PUT` request to
+`/connectors/{connector_id}/settings`, where `{connector_id}` is the unique
+identifier used when the connector was created. This endpoint allows you to
+modify the settings of a connector without having to delete and recreate it.
+
+::: tabs
+@tab Powershell
+
+```powershell
+$JSON = @"
+{
+  "instanceTypeName": "serilog-sink",
+  "logging:enabled": "false"
+}
+"@ `
+
+curl.exe -X PUT `
+  -H "Content-Type: application/json" `
+  -d $JSON `
+  http://localhost:2113/connectors/serilog-sink/settings
+```
+
+@tab Bash
+
+```bash
+JSON='{
+  "instanceTypeName": "serilog-sink",
+  "logging:Enabled": "false"
+}'
+
+curl -X PUT \
+  -H "Content-Type: application/json" \
+  -d "$JSON" \
+  http://localhost:2113/connectors/serilog-sink/settings
+```
+
+:::
+
+For a comprehensive list of available configuration options available for all sinks, please refer to the [Connector Settings](./settings.md) page.
+
+::: note
+The connector must be stopped before reconfiguring. If the connector is running,
+the reconfigure operation will fail. Make sure to [Stop](#stop) the connector
+before attempting to reconfigure it.
+:::
+
+## Delete
+
+Delete a connector by sending a `DELETE` request to
+`/connectors/{connector_id}`, where `{connector_id}` is the unique
+identifier used when the connector was created.
+
+::: tabs
+@tab Powershell
+
+```powershell
+curl.exe -X DELETE http://localhost:2113/connectors/serilog-sink
+```
+
+@tab Bash
+
+```bash
+curl -X DELETE http://localhost:2113/connectors/serilog-sink
+```
+
+:::
+
+## Rename
+
+To rename a connector, send a `PUT` request to
+`/connectors/{connector_id}/rename`, where `{connector_id}` is the unique
+identifier used when the connector was created.
+
+::: tabs
+@tab Powershell
+
+```powershell
+$JSON = @"
+{
+  "name": "New connector name"
+}
+"@ `
+
+curl.exe -X PUT `
+  -H "Content-Type: application/json" `
+  -d $JSON `
+  http://localhost:2113/connectors/serilog-sink/rename
+```
+
+@tab Bash
+
+```bash
+JSON='{
+  "name": "New connector name"
+}'
+
+curl -X PUT \
+  -H "Content-Type: application/json" \
+  -d "$JSON" \
+  http://localhost:2113/connectors/serilog-sink/rename
+```
+
+:::
diff --git a/docs/server/features/connectors/settings.md b/docs/server/features/connectors/settings.md
new file mode 100644
index 00000000000..8d2fa4b8e66
--- /dev/null
+++ b/docs/server/features/connectors/settings.md
@@ -0,0 +1,82 @@
+---
+title: 'Configure Connector'
+order: 3
+---
+
+All connectors share a common set of configuration options that can be used to
+customize their behavior.
+
+## Sink Options
+
+Below, you will find a comprehensive list of configuration settings that you can
+use to define the connection parameters and other necessary details for your
+sink connector.
+
+::: tip
+Individual connectors also include their own specific settings. To view them, go to their individual pages.
+:::
+
+### Instance configuration
+
+| Name               | Details                                                                                                                                                                                             |
+| ------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `instanceTypeName` | _required_<br><br>**Type**: string<br><br>**Description:** The name of the instance type for the sink.<br><br>Refer to the sink's individual page for more details on the available instance types. |
+
+### Subscription configuration
+
+| Name                             | Details                                                                                                                                                                                                                                                                                            |
+| -------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `subscription:filter:scope`      | **Type**: enum<br><br>**Description:** Determines the scope of event filtering for the subscription. Use `stream` to filter events by stream ID, or `record` to filter events by event type.<br><br>**Accepted Values:**<br>- `stream`, `record`, `unspecified`.<br><br>**Default**: `unspecified` |
+| `subscription:filter:filterType` | **Type**: enum<br><br>**Description:** Specifies the method used to filter events.<br><br>**Accepted Values:**<br>- `streamId`, `regex`, `prefix`, `jsonPath`, `unspecified`.<br><br>**Default**: `unspecified`                                                                                    |
+| `subscription:filter:expression` | **Type**: string<br><br>**Description:** A filter expression (regex, JsonPath, or prefix) for records. If `scope` is specified and the expression is empty, it consumes from `$all` including system events. If `scope` is unspecified, it consumes from `$all` excluding system events.<br><br>**Default**: `""`                                                                     |
+| `subscription:initialPosition`   | **Type**: enum<br><br>**Description:** The position in the message stream from which a consumer starts consuming messages when there is no prior checkpoint.<br><br>**Accepted Values:**<br>- `latest`, `earliest`.<br><br>**Default**: `latest`                                                   |
+
+For details and examples on subscriptions, see [Filters](./features.md#filters).
+
+### Transformation configuration
+
+| Name                   | Details                                                                                                                                                                                                                         |
+| ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `transformer:enabled`  | **Type**: bool<br><br>**Description:** Enables or disables the event transformer.<br><br>**Default**: `false`                                                                                                                   |
+| `transformer:function` | _required (if enabled)_<br><br>**Type**: string<br><br>**Description:** Base64 encoded JavaScript function for transforming events. See [Transformations](./features.md#transformations) for examples.<br><br>**Default**: `""` |
+
+For details and examples on transformations, see [Transformations](./features.md#transformations).
+
+### Resilience configuration
+
+| Name                                       | Details                                                                                                                                                                |
+| ------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `resilience:enabled`                       | **Type**: bool<br><br>**Description:** Enables or disables resilience.<br><br>**Default**: `true`                                                                      |
+| `resilience:firstDelayBound:upperLimitMs`  | **Type**: int<br><br>**Description:** The upper limit for the first delay bound in milliseconds.<br><br>**Default**: `60000` (1 minute)                                |
+| `resilience:firstDelayBound:delayMs`       | **Type**: int<br><br>**Description:** The delay for the first delay bound in milliseconds.<br><br>**Default**: `5000` (5 seconds)                                      |
+| `resilience:secondDelayBound:upperLimitMs` | **Type**: int<br><br>**Description:** The upper limit for the second delay bound in milliseconds.<br><br>**Default**: `3600000` (1 hour)                               |
+| `resilience:secondDelayBound:delayMs`      | **Type**: int<br><br>**Description:** The delay for the second delay bound in milliseconds.<br><br>**Default**: `600000` (10 minutes)                                  |
+| `resilience:thirdDelayBound:upperLimitMs`  | **Type**: int<br><br>**Description:** The upper limit for the third delay bound in milliseconds. A value of `-1` indicates forever.<br><br>**Default**: `-1` (forever) |
+| `resilience:thirdDelayBound:delayMs`       | **Type**: int<br><br>**Description:** The delay for the third delay bound in milliseconds.<br><br>**Default**: `3600000` (1 hour)                                      |
+
+For details on resilience, see [Resilience](./features.md#resilience).
+
+### Auto-Commit configuration
+
+| Name                          | Details                                                                                                                    |
+| ----------------------------- | -------------------------------------------------------------------------------------------------------------------------- |
+| `autocommit:enabled`          | **Type**: bool<br><br>**Description:** Enable or disables auto-commit<br><br>**Default:** `true`                           |
+| `autocommit:interval`         | **Type**: int<br><br>**Description:** The interval, in milliseconds at which auto-commit occurs<br><br>**Default**: `5000` |
+| `autocommit:recordsThreshold` | **Type**: int<br><br>**Description:** The threshold of records that triggers an auto-commit<br><br>**Default**: `1000`     |
+
+### Logging configuration
+
+| Name              | Details                                                                                        |
+| ----------------- | ---------------------------------------------------------------------------------------------- |
+| `logging:enabled` | **Type**: bool<br><br>**Description:** Enables or disables logging.<br><br>**Default**: `true` |
+
+## Disable the Plugin
+
+The Connector plugin is pre-installed in all KurrentDB binaries and is enabled by default. It can be disabled with the following configuration.
+
+Refer to the [configuration guide](../../configuration/README.md) for configuration mechanisms other than YAML.
+
+```yaml
+Connectors:
+  Enabled: false
+```
diff --git a/docs/server/features/connectors/sinks/http.md b/docs/server/features/connectors/sinks/http.md
new file mode 100644
index 00000000000..b02af0661f7
--- /dev/null
+++ b/docs/server/features/connectors/sinks/http.md
@@ -0,0 +1,139 @@
+---
+title: "HTTP Sink"
+---
+
+## Overview
+
+The HTTP sink allows for integration between KurrentDB and external
+APIs over HTTP or HTTPS. This connector consumes events from a KurrentDB
+stream and converts each event's data into JSON format before sending it in the
+request body to a specified Url. Events are sent individually as they are
+consumed from the stream, without batching. The event data is transmitted as the
+request body, and metadata can be included as HTTP headers. The connector also
+supports Basic Authentication and Bearer Token Authentication. See [Authentication](#authentication).
+
+## Quickstart
+
+You can create the HTTP Sink connector as follows:
+
+::: tabs
+@tab Powershell
+
+```powershell
+$JSON = @"
+{
+  "settings": {
+    "instanceTypeName": "http-sink",
+    "url": "https://api.example.com/",
+    "subscription:filter:scope": "stream",
+    "subscription:filter:filterType": "streamId",
+    "subscription:filter:expression": "example-stream"
+  }
+}
+"@ `
+
+curl.exe -X POST `
+  -H "Content-Type: application/json" `
+  -d $JSON `
+  http://localhost:2113/connectors/http-sink-connector
+```
+
+@tab Bash
+
+```bash
+JSON='{
+  "settings": {
+    "instanceTypeName": "http-sink",
+    "url": "https://api.example.com/",
+    "subscription:filter:scope": "stream",
+    "subscription:filter:filterType": "streamId",
+    "subscription:filter:expression": "example-stream"
+  }
+}'
+
+curl -X POST \
+  -H "Content-Type: application/json" \
+  -d "$JSON" \
+  http://localhost:2113/connectors/http-sink-connector
+```
+:::
+
+After creating and starting the HTTP sink connector, every time an event is
+appended to the `example-stream`, the HTTP sink connector will send the record
+to the specified URL. You can find a list of available management API endpoints
+in the [API Reference](../manage.md).
+
+## Settings
+
+Adjust these settings to specify the behavior and interaction of your HTTP sink connector with KurrentDB, ensuring it operates according to your requirements and preferences.
+
+::: tip
+The HTTP sink inherits a set of common settings that are used to configure the connector. The settings can be found in
+the [Sink Options](../settings.md#sink-options) page.
+:::
+
+### HTTP settings
+
+| Name                       | Details                                                                                                                                                                                                                           |
+| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `url`                      | _required_<br><br> **Type**: string<br><br>**Description:** The URL or endpoint to which the request or message will be sent. See [Template Parameters](http#template-parameters) for advanced settings.<br><br>**Default**: `""` |
+| `method`                   | **Type**: string<br><br>**Description:** The method or operation to use for the request or message.<br><br>**Default**: `"POST"`                                                                                                  |
+| `defaultHeaders`           | **Type**: string<br><br>**Description:** Headers included in all messages.<br><br>**Default**: `Accept-Encoding:*`                                                                                                                |
+| `pooledConnectionLifetime` | **Type**: TimeSpan<br><br>**Description:** Maximum time a connection can stay in the pool before it is no longer reusable.<br><br>**Default**: `00:05:00` (5 minutes)                                                             |
+
+### Authentication
+
+The HTTP sink connector supports both [Basic](https://datatracker.ietf.org/doc/html/rfc7617) and [Bearer](https://datatracker.ietf.org/doc/html/rfc6750) authentication methods.
+
+| Name                    | Details                                                                                                                                                   |
+| ----------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `authentication:method` | **Type**: string<br><br>**Description:** The authentication method to use.<br><br>**Default**: `None`<br><br>**Accepted Values:** `None`,`Basic`,`Bearer` |
+
+#### Basic Authentication
+
+| Name                            | Details                                                                                                  |
+| ------------------------------- | -------------------------------------------------------------------------------------------------------- |
+| `authentication:basic:username` | **Type**: string<br><br>**Description:** The username for basic authentication.<br><br>**Default**: `""` |
+| `authentication:basic:password` | **Type**: string<br><br>**Description:** The password for basic authentication.<br><br>**Default**: `""` |
+
+#### Bearer Authentication
+
+| Name                          | Details                                                                                                |
+| ----------------------------- | ------------------------------------------------------------------------------------------------------ |
+| `authentication:bearer:token` | **Type**: string<br><br>**Description:** The token for bearer authentication.<br><br>**Default**: `""` |
+
+## Template parameters
+
+The HTTP sink supports the use of template parameters in the URL,
+allowing for dynamic construction of the request URL based on event data. This
+feature enables you to customize the destination URL for each event, making it
+easier to integrate with APIs that require specific URL structures.
+
+The following template parameters are available for use in the URL:
+
+| Parameter          | Description                                                     |
+| ------------------ | --------------------------------------------------------------- |
+| `{schema-subject}` | The event's schema subject, converted to lowercase with hyphens |
+| `{event-type}`     | Alias for `{schema-subject}`                                    |
+| `{stream}`         | The KurrentDB stream ID                                         |
+
+**Usage**
+
+To use template parameters, include them in the `Url` option of your HTTP sink configuration. The parameters will be
+replaced with their corresponding values for each event.
+
+Example:
+
+```
+https://api.example.com/{schema-subject}
+```
+
+For an event with schema subject "TestEvent", this would result in the URL:
+
+```
+https://api.example.com/TestEvent
+```
+
+### Tutorial
+
+[Learn how to configure and use a connector using the HTTP Sink in KurrentDB through a tutorial.](/tutorials/http.md)
diff --git a/docs/server/features/connectors/sinks/images/kafka-sink-quickstart-add-event.png b/docs/server/features/connectors/sinks/images/kafka-sink-quickstart-add-event.png
new file mode 100644
index 00000000000..b38423b3de1
Binary files /dev/null and b/docs/server/features/connectors/sinks/images/kafka-sink-quickstart-add-event.png differ
diff --git a/docs/server/features/connectors/sinks/images/kafka-sink-quickstart.png b/docs/server/features/connectors/sinks/images/kafka-sink-quickstart.png
new file mode 100644
index 00000000000..89a9648100a
Binary files /dev/null and b/docs/server/features/connectors/sinks/images/kafka-sink-quickstart.png differ
diff --git a/docs/server/features/connectors/sinks/kafka.md b/docs/server/features/connectors/sinks/kafka.md
new file mode 100644
index 00000000000..3a7fa484898
--- /dev/null
+++ b/docs/server/features/connectors/sinks/kafka.md
@@ -0,0 +1,256 @@
+---
+title: "Kafka Sink"
+---
+
+<Badge type="info" vertical="middle" text="License Required"/>
+
+## Overview
+
+The Kafka sink writes events to a Kafka topic. It can extract the
+partition key from the record based on specific sources such as the stream ID,
+headers, or record key and also supports basic authentication and resilience
+features to handle transient errors.
+
+## Quickstart
+
+You can create the Kafka Sink connector as follows:
+
+::: tabs
+@tab Powershell
+
+```powershell
+$JSON = @"
+{
+  "settings": {
+    "instanceTypeName": "kafka-sink",
+    "topic": "customers",
+    "bootstrapServers": "localhost:9092",
+    "subscription:filter:scope": "stream",
+    "subscription:filter:filterType": "streamId",
+    "subscription:filter:expression": "example-stream",
+    "authentication:username": "your-username",
+    "authentication:password": "your-password",
+    "authentication:securityProtocol": "SaslSsl",
+    "waitForBrokerAck": "true"
+  }
+}
+"@ `
+
+curl.exe -X POST `
+  -H "Content-Type: application/json" `
+  -d $JSON `
+  http://localhost:2113/connectors/kafka-sink-connector
+```
+
+@tab Bash
+
+```bash
+JSON='{
+  "settings": {
+    "instanceTypeName": "kafka-sink",
+    "topic": "your-topic",
+    "bootstrapServers": "your-kafka-cluster-address:9092",
+    "subscription:filter:scope": "stream",
+    "subscription:filter:filterType": "streamId",
+    "subscription:filter:expression": "example-stream",
+    "authentication:username": "your-username",
+    "authentication:password": "your-password",
+    "authentication:securityProtocol": "SaslSsl",
+    "waitForBrokerAck": "true"
+  }
+}'
+
+curl -X POST \
+  -H "Content-Type: application/json" \
+  -d "$JSON" \
+  http://localhost:2113/connectors/kafka-sink-connector
+```
+
+:::
+
+After creating and starting the Kafka sink connector, every time an event is
+appended to the `example-stream`, the Kafka sink connector will send the record
+to the specified Kafka topic. You can find a list of available management API
+endpoints in the [API Reference](../manage.md).
+
+## Settings
+
+Adjust these settings to specify the behavior and interaction of your Kafka sink connector with KurrentDB, ensuring it operates according to your requirements and preferences.
+
+::: tip
+The Kafka sink inherits a set of common settings that are used to configure the connector. The settings can be found in
+the [Sink Options](../settings.md#sink-options) page.
+:::
+
+The Kafka sink can be configured with the following options:
+
+| Name                              | Details                                                                                                                                                                                                                                                       |
+| --------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `topic`                           | _required_<br><br>**Type**: string<br><br>**Description:** The Kafka topic to produce records to.                                                                                                                                                             |
+| `bootstrapServers`                | **Type**: string<br><br>**Description:** Comma-separated list of Kafka broker addresses.<br><br>**Default**: `localhost:9092`                                                                                                                                 |
+| `defaultHeaders`                  | **Type**: dict<string,string><br><br>**Description:** Headers included in all produced messages.<br><br>**Default**: None                                                                                                                                     |
+| `authentication:securityProtocol` | **Type**: [SecurityProtocol](https://docs.confluent.io/platform/current/clients/confluent-kafka-dotnet/_site/api/Confluent.Kafka.SecurityProtocol.html)<br><br>**Description:** Protocol used for Kafka broker communication.<br><br>**Default**: `Plaintext` |
+| `authentication:username`         | **Type**: string<br><br>**Description:** Username for authentication.                                                                                                                                                                                         |
+| `authentication:password`         | **Type**: string<br><br>**Description:** Password for authentication.                                                                                                                                                                                         |
+
+### Partitioning
+
+| Name                                | Details                                                                                                                                                                           |
+| ----------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `partitionKeyExtraction:enabled`    | **Type**: boolean<br><br>**Description:** Enables partition key extraction.<br><br>**Default**: false                                                                             |
+| `partitionKeyExtraction:source`     | **Type**: Enum<br><br>**Description:** Source for extracting the partition key.<br><br>**Accepted Values:**`stream`, `streamSuffix`, `headers`<br><br>**Default**: `PartitionKey` |
+| `partitionKeyExtraction:expression` | **Type**: string<br><br>**Description:** Regular expression for extracting the partition key.                                                                                     |
+
+See the [Partitioning](#partitioning-1) section for examples.
+
+### Resilience
+
+Besides the common sink settings that can be found in the [Resilience Configuration](../settings.md#resilience-configuration) page, the Kafka sink connector supports additional settings related to resilience:
+
+| Name                               | Details                                                                                                                                                                                                        |
+| ---------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `waitForBrokerAck`                 | **Type**: boolean<br><br>**Description:** Whether the producer waits for broker acknowledgment before considering the send operation complete.<br><br>**Default**: true                                        |
+| `resilience:enabled`               | **Type**: boolean<br><br>**Description:** Enables resilience features for message handling.<br><br>**Default**: `true`                                                                                         |
+| `resilience:maxRetries`            | **Type**: int<br><br>**Description:** Maximum number of retry attempts.<br><br>**Default**: `-1` (unlimited)                                                                                                   |
+| `resilience:transientErrorDelay`   | **Type**: TimeSpan<br><br>**Description:** Delay between retries for transient errors.<br><br>**Default**: `00:00:00`                                                                                          |
+| `resilience:reconnectBackoffMaxMs` | **Type**: int<br><br>**Description:** Maximum backoff time in milliseconds for reconnection attempts.<br><br>**Default**: `20000`                                                                              |
+| `resilience:messageSendMaxRetries` | **Type**: int<br><br>**Description:** Number of times to retry sending a failing message. **Note:** Retrying may cause reordering unless `enable.idempotence` is set to true.<br><br>**Default**: `2147483647` |
+
+### Miscellaneous
+
+| Name                  | Details                                                                                                                                                                                                                                            |
+| --------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `brokerAddressFamily` | **Type**: [BrokerAddressFamily](https://docs.confluent.io/platform/current/clients/confluent-kafka-dotnet/_site/api/Confluent.Kafka.BrokerAddressFamily.html)<br><br>**Description:** Allowed broker IP address families.<br><br>**Default**: `V4` |
+| `compression:type`    | **Type**: [CompressionType](https://docs.confluent.io/platform/current/clients/confluent-kafka-dotnet/_site/api/Confluent.Kafka.CompressionType.html)<br><br>**Description:** Kafka compression type.<br><br>**Default**: `Zstd`                   |
+| `compression:level`   | **Type**: int<br><br>**Description:** Kafka compression level.<br><br>**Default**: 6                                                                                                                                                               |
+
+## At least once delivery
+
+The Kafka sink guarantees at least once delivery by retrying failed
+requests based on configurable resilience settings. It will continue to attempt
+delivery until the event is successfully sent or the maximum number of retries
+is reached, ensuring each event is delivered at least once.
+
+The Kafka sink currently retries transient errors based on the following error codes:
+
+- **Local_AllBrokersDown**: All broker connections are down
+- **OutOfOrderSequenceNumber**: Broker received an out of order sequence number
+- **TransactionCoordinatorFenced**: Indicates that the transaction coordinator sending a WriteTxnMarker is no longer the
+  current coordinator for a given producer
+- **UnknownProducerId**: Unknown Producer Id.
+
+For detailed information on the listed error codes, refer to
+the [Kafka documentation](https://docs.confluent.io/platform/current/clients/confluent-kafka-dotnet/_site/api/Confluent.Kafka.ErrorCode.html).
+
+**Configuration example**
+
+```json
+{
+  "resilience:enabled": true,
+  "resilience:requestTimeoutMs": 3000,
+  "resilience:maxRetries": -1,
+  "resilience:transientErrorDelay": "00:00:05",
+  "resilience:reconnectBackoffMaxMs": 20000,
+  "resilience:messageSendMaxRetries": 2147483647
+}
+```
+
+## Broker Acknowledgment
+
+In the Kafka sink connector for KurrentDB, broker acknowledgment refers to
+the producer waiting for confirmation from the Kafka broker that a message has
+been successfully received. When `waitForBrokerAck` is enabled (which is the
+default setting), the producer waits for this acknowledgment, ensuring more
+reliable delivery of messages, which is crucial for systems that require
+durability and fault tolerance.
+
+While this setting improves reliability, it can slightly increase latency, as
+the producer must wait for confirmation from Kafka before continuing. If higher
+throughput is preferred over strict delivery guarantees, you can disable this
+option.
+
+For more details about Kafka broker acknowledgment, refer to [Kafka's official
+documentation](https://kafka.apache.org/documentation/#producerconfigs_acks).
+
+To learn more about authentication in Kafka,
+see [Authentication using SASL](https://kafka.apache.org/documentation/#security_sasl)
+
+For Kafka client enum types, please refer to the
+official [Kafka .NET client documentation](https://docs.confluent.io/platform/current/clients/confluent-kafka-dotnet/_site/api/Confluent.Kafka.html).
+
+## Examples
+
+### Partitioning
+
+The Kafka sink connector allows customizing the partition keys that are sent
+with the message. 
+
+Kafka partition keys can be generated from various sources. These sources
+include the event stream, stream suffix, headers, or other record fields.
+
+By default, it will use the `PartitionKey` and grab this value from the KurrentDB record.
+
+**Partition using Stream ID**
+
+You can extract part of the stream name using a regular expression (regex) to
+define the partition key. The expression is optional and can be customized based
+on your naming convention. In this example, the expression captures the stream
+name up to `_data`.
+
+```json
+{
+  "partitionKeyExtraction:enabled": "true",
+  "partitionKeyExtraction:source": "stream",
+  "partitionKeyExtraction:expression": "^(.*)_data$"
+}
+```
+
+Alternatively, if you only need the last segment of the stream name (after a
+hyphen), you can use the `streamSuffix` source. This
+doesn't require an expression since it automatically extracts the suffix.
+
+```json
+{
+  "partitionKeyExtraction:enabled": "true",
+  "partitionKeyExtraction:source": "streamSuffix"
+}
+```
+
+The `streamSuffix` source is useful when stream names follow a structured
+format, and you want to use only the trailing part as the partition key. For
+example, if the stream is named `user-123`, the partition key would be `123`.
+
+**Partition using header values**
+
+You can generate the partition key by concatenating values from specific event
+headers. In this case, two header values (`key1` and `key2`) are combined to
+form the key.
+
+```json
+{
+  "partitionKeyExtraction:enabled": "true",
+  "partitionKeyExtraction:source": "headers",
+  "partitionKeyExtraction:expression": "key1,key2"
+}
+```
+
+The `Headers` source allows you to pull values from the event's metadata. The
+`documentId:expression` field lists the header keys (in this case, `key1` and
+`key2`), and their values are concatenated to generate the partition key. 
+
+::: details Click here to see an example
+
+```json
+{
+  "key1": "value1",
+  "key2": "value2"
+}
+
+// outputs "value1-value2"
+```
+
+:::
+
+## Tutorial
+
+[Learn how to set up and use a Kafka Sink connector in KurrentDB through a tutorial.](/tutorials/Kafka_Sink.md)
diff --git a/docs/server/features/connectors/sinks/mongo.md b/docs/server/features/connectors/sinks/mongo.md
new file mode 100644
index 00000000000..fcc8b988d80
--- /dev/null
+++ b/docs/server/features/connectors/sinks/mongo.md
@@ -0,0 +1,201 @@
+---
+title: "MongoDB Sink"
+---
+
+<Badge type="info" vertical="middle" text="License Required"/>
+
+## Overview
+
+The MongoDB sink pulls messages from a KurrentDB stream and stores them in a
+collection. The records will be serialized into
+[BSON](https://www.mongodb.com/docs/manual/reference/glossary/#std-term-BSON)
+documents, so the data must be valid for BSON format. 
+
+## Quickstart
+
+You can create the MongoDB Sink connector as follows:
+
+::: tabs
+@tab Powershell
+
+```powershell
+$JSON = @"
+{
+  "settings": {
+    "instanceTypeName": "mongo-db-sink",
+    "connectionString": "mongodb://127.0.0.1:27020",
+    "database": "sampleDB",
+    "collection": "sampleCollection",
+    "subscription:filter:scope": "stream",
+    "subscription:filter:filterType": "streamId",
+    "subscription:filter:expression": "example-stream"
+  }
+}
+"@ `
+
+curl.exe -X POST `
+  -H "Content-Type: application/json" `
+  -d $JSON `
+  http://localhost:2113/connectors/mongo-sink-connector
+```
+
+@tab Bash
+
+```bash
+JSON='{
+  "settings": {
+    "instanceTypeName": "mongo-db-sink",
+    "connectionString": "mongodb://127.0.0.1:27020",
+    "database": "sampleDB",
+    "collection": "sampleCollection",
+    "subscription:filter:scope": "stream",
+    "subscription:filter:filterType": "streamId",
+    "subscription:filter:expression": "example-stream"
+  }
+}'
+
+curl -X POST \
+  -H "Content-Type: application/json" \
+  -d "$JSON" \
+  http://localhost:2113/connectors/mongo-sink-connector
+```
+
+:::
+
+After creating and starting the MongoDB sink connector, every time an event is
+appended to the `example-stream`, the MongoDB sink connector will send the
+record to the specified collection in the database. You can find a list of
+available management API endpoints in the [API Reference](../manage.md).
+
+## Settings
+
+Adjust these settings to specify the behavior and interaction of your MongoDB sink connector with KurrentDB, ensuring it operates according to your requirements and preferences.
+
+::: tip
+The MongoDB sink inherits a set of common settings that are used to configure the connector. The settings can be found in
+the [Sink Options](../settings.md#sink-options) page.
+:::
+
+The MongoDB sink can be configured with the following options:
+
+| Name                      | Details                                                                                                                                                                                                                                                                                          |
+| ------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `database`                | _required_<br><br>**Type**: string<br><br>**Description:** The name of the database where the records will be stored.                                                                                                                                                                            |
+| `collection`              | _required_<br><br>**Type**: string<br><br>**Description:** The collection name that resides in the database to push records to.                                                                                                                                                                  |
+| `connectionString`        | _required_<br><br>**Type**: string<br><br>**Description:** The MongoDB URI to which the connector connects. <br><br>See [connection string URI format](https://www.mongodb.com/docs/manual/reference/connection-string/)<br><br>**Default**: `mongodb://mongoadmin:secret@localhost:27017/admin` |
+| `documentId:source`       | **Type**: string<br><br>**Description:** The attribute used to generate the document id.<br><br>**Default**: `recordId`<br><br>**Accepted Values:**<br>- `recordId`, `stream`, `headers`, `streamSuffix`, `PartitionKey`.                                                                        |
+| `documentId:expression`   | **Type**: string<br><br>**Description:** The expression used to format the document id based on the selected source. This allows for custom id generation logic.<br><br>**Default**: `250`                                                                                                       |
+| `certificate:rawData`     | **Type**: string<br><br>**Description:** Base64 encoded x509 certificate.<br><br>**Default**: ""                                                                                                                                                                                                 |
+| `certificate:password`    | **Type**: string<br><br>**Description:** The password used to access the x509 certificate for secure connections.<br><br>**Default**: ""                                                                                                                                                         |
+| `batching:batchSize`      | **Type**: string<br><br>**Description:** Threshold batch size at which the sink will push the batch of records to the MongoDB collection.<br><br>**Default**: `1000`                                                                                                                             |
+| `batching:batchTimeoutMs` | **Type**: string<br><br>**Description:** Threshold time in milliseconds at which the sink will push the current batch of records to the MongoDB collection, regardless of the batch size.<br><br>**Default**: `250`                                                                              |
+
+## Authentication
+
+This MongoDB sink connector currently only supports [SCRAM](./mongo.md#scram) and [X.509 certificate authentication](./mongo.md#x509-certificate-authentication).
+
+### SCRAM
+
+To use SCRAM for authentication, include the username and password in the
+connection string and set the `authMechanism` parameter in the connection string
+to either `SCRAM-SHA-1` or `SCRAM-SHA-256` to select the desired MongoDB
+authentication mechanism. For more explanations on the connection string URI
+refer to the official MongoDB documentation on [Authentication Mechanism](https://www.mongodb.com/docs/v4.4/core/authentication-mechanisms/#:~:text=To%20specify%20the%20authentication%20mechanism,mechanism%20from%20the%20command%20line.).
+
+::: note
+MongoDB version 4.0 and later uses SCRAM-SHA-256 as the default authentication mechanism if the MongoDB server version supports it.
+:::
+
+### X.509 certificate authentication
+
+To use X.509 certificate authentication, include the base64 encoded x509
+certificate and the password in the settings. You can use an online tool like
+[base64encode](https://www.base64encode.org/) to encode your certificate.
+
+```json
+{
+  "certificate:rawData": "base64encodedstring",
+  "certificate:password": "password"
+}
+```
+
+## Document ID
+
+The id of the document can be generated automatically based on the source specified and expression if needed. The following options are available:
+
+By default, the MongoDB sink uses the `recordId` as the document ID. This is the unique identifier generated for every record in KurrentDB.
+
+Here are some examples that demonstrate how to configure the MongoDB sink to generate document IDs based on different sources.
+
+**Set Document ID using Stream ID**
+
+You can extract part of the stream name using a regular expression (regex) to
+define the document id. The expression is optional and can be customized based
+on your naming convention. In this example, the expression captures the stream
+name up to `_data`.
+
+```json
+{
+  "documentId:source": "stream",
+  "documentId:expression": "^(.*)_data$"
+}
+```
+
+Alternatively, if you only need the last segment of the stream name (after a
+hyphen), you can use the `streamSuffix` source. This
+doesn't require an expression since it automatically extracts the suffix.
+
+```json
+{
+  "documentId:source": "streamSuffix"
+}
+```
+
+The `streamSuffix` source is useful when stream names follow a structured
+format, and you want to use only the trailing part as the document ID. For
+example, if the stream is named `user-123`, the document ID would be `123`.
+
+**Set Document ID from Headers**
+
+You can generate the document ID by concatenating values from specific event headers. In this case, two header values (`key1` and `key2`) are combined to form the ID.
+
+```json
+{
+  "documentId:source": "headers",
+  "documentId:expression": "key1,key2"
+}
+```
+
+The `Headers` source allows you to pull values from the event's metadata. The
+`documentId:expression` field lists the header keys (in this case, `key1` and
+`key2`), and their values are concatenated to generate the document ID. This is
+useful when headers hold important metadata that should define the document's
+unique identifier, such as region, user ID, or other identifiers.
+
+::: details Click here to see an example
+
+```json
+{
+  "key1": "value1",
+  "key2": "value2"
+}
+
+// outputs "value1-value2"
+```
+
+:::
+
+**4. Set Document ID from Partition Key**
+
+If your event has a partition key, you can use it as the document ID. The `PartitionKey` source directly uses this key without requiring an expression.
+
+```json
+{
+  "documentId:source": "PartitionKey"
+}
+```
+
+This uses the record's partition key as a unique document ID.
+
+## Tutorial
+[Learn how to set up and use a MongoDB Sink connector in KurrentDB through a tutorial.](/tutorials/MongoDB_Sink.md)
diff --git a/docs/server/features/connectors/sinks/rabbitmq.md b/docs/server/features/connectors/sinks/rabbitmq.md
new file mode 100644
index 00000000000..7e1fb439bc7
--- /dev/null
+++ b/docs/server/features/connectors/sinks/rabbitmq.md
@@ -0,0 +1,120 @@
+---
+title: "RabbitMQ Sink"
+---
+
+<Badge type="info" vertical="middle" text="License Required"/>
+
+## Overview
+
+This sink is responsible for sending messages to a RabbitMQ exchange using a specified routing key. It efficiently
+handles message delivery by abstracting the complexities of RabbitMQ's exchange and queue management, ensuring that
+messages are routed to the appropriate destinations based on the provided routing key. This sink is designed for high
+reliability and supports graceful error handling and recovery mechanisms to ensure consistent message delivery in a
+production environment.
+
+## Quickstart
+
+You can create the RabbitMQ Sink connector as follows:
+
+::: tabs
+@tab Powershell
+
+```powershell
+$JSON = @"
+{
+  "settings": {
+    "instanceTypeName": "rabbit-mq-sink",
+    "exchange:name": "example-exchange",
+    "exchange:type": "direct",
+    "routingKey": "my-routing-key",
+    "subscription:filter:scope": "stream",
+    "subscription:filter:filterType": "streamId",
+    "subscription:filter:expression": "example-stream"
+  }
+}
+"@ `
+
+curl.exe -X POST `
+  -H "Content-Type: application/json" `
+  -d $JSON `
+  http://localhost:2113/connectors/rabbit-sink-connector
+```
+
+@tab Bash
+
+```bash
+JSON='{
+  "settings": {
+    "instanceTypeName": "rabbit-mq-sink",
+    "exchange:name": "example-exchange",
+    "exchange:type": "direct",
+    "routingKey": "my-routing-key",
+    "subscription:filter:scope": "stream",
+    "subscription:filter:filterType": "streamId",
+    "subscription:filter:expression": "example-stream"
+  }
+}'
+
+curl -X POST \
+  -H "Content-Type: application/json" \
+  -d "$JSON" \
+  http://localhost:2113/connectors/rabbit-sink-connector
+```
+
+:::
+
+After creating and starting the RabbitMQ sink connector, every time an event is
+appended to the `example-stream`, the RabbitMQ sink connector will send the
+record to the specified queue in RabbitMQ. You can find a list of available
+management API endpoints in the [API Reference](../manage.md).
+
+## Settings
+
+Adjust these settings to specify the behavior and interaction of your RabbitMQ sink connector with KurrentDB, ensuring it operates according to your requirements and preferences.
+
+::: tip
+The RabbitMQ sink inherits a set of common settings that are used to configure the connector. The settings can be found in
+the [Sink Options](../settings.md#sink-options) page.
+:::
+
+The RabbitMQ sink can be configured with the following options:
+
+| Option                            | Description                                                                                                                                                                                                                                                                                         |
+| --------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `exchange:name`                   | _required_<br><br>**Type**: string<br><br>**Description:** Exchange's name.                                                                                                                                                                                                                         |
+| `exchange:type`                   | **Type**: string<br><br>**Description:** Exchange's type.<br><br>**Default**: `"fanout"`                                                                                                                                                                                                      |
+| `routingKey`                      | **Type**: string<br><br>**Description:** Used by the exchange to determine how to route a message to the appropriate queue(s). The routing key is evaluated against the binding rules of the queues associated with the exchange, influencing the message's delivery path.<br><br>**Default**: `""` |
+| `host`                            | **Type**: string<br><br>**Description:** Hostname of the server.<br><br>**Default**: `"localhost"`                                                                                                                                                                                                  |
+| `port`                            | **Type**: string<br><br>**Description:** Port number of the server.<br><br>**Default**: `5672`                                                                                                                                                                                                      |
+| `connectionName`                  | **Type**: string<br><br>**Description:** Connection name used for logging and diagnostics. The default value is the connector ID.Connection name used for logging and diagnostics.<br><br>**Default**: The connector id                                                                             |
+| `virtualHost`                     | **Type**: string<br><br>**Description:** Represents the VirtualHost (vhost) used in RabbitMQ. <br><br>**Default**: `/`                                                                                                                                                                              |
+| `waitForBrokerAck`                | **Type**: boolean<br><br>**Description:** Whether the channel waits for broker acknowledgment before considering the send operation complete.<br><br>**Default**: `false`                                                                                                                           |
+| `authentication:username`         | **Type**: string<br><br>**Description:** Username for authentication.<br><br>**Default**: `"guest"`                                                                                                                                                                                                   |
+| `authentication:password`         | **Type**: string<br><br>**Description:** Password for authentication.<br><br>**Default**: `"guest"`                                                                                                                                                                                                   |
+| `autoDelete`                      | **Type**: string<br><br>**Description:** Whether the exchange is automatically deleted when no longer in use.<br><br>**Default**: `"false"`                                                                                                                                                           |
+| `durable`                         | **Type**: string<br><br>**Description:** Whether the exchange is durable.<br><br>**Default**: `"true"`                                                                                                                                                                                                             |
+| `resilience:connectionTimeoutMs`  | **Type**: int<br><br>**Description:** Connection TCP establishment timeout in milliseconds. 0 for infinite.<br><br>**Default**: `60000`                                                                                                                                                             |
+| `resilience:handshakeTimeoutMs`   | **Type**: int<br><br>**Description:** The protocol handshake timeout in milliseconds.<br><br>**Default**: `10000`                                                                                                                                                                                   |
+| `resilience:requestedHeartbeatMs` | **Type**: int<br><br>**Description:** The requested heartbeat timeout in milliseconds. 0 means "heartbeats are disabled". Should be no lower than 1 second.<br><br>**Default**: `60000`                                                                                                             |
+
+## Resilience
+
+The RabbitMQ sink connector relies on its own RabbitMQ retry mechanism and doesn't include the configuration from [Resilience configuration](../settings.md#resilience-configuration).
+
+## Broker Acknowledgment
+
+By default, the connector waits for broker acknowledgment. Enabling broker acknowledgment ensures that each message sent
+to RabbitMQ is confirmed by the broker before the publish operation is considered complete:
+
+```json
+{
+  "WaitForBrokerAck": true
+}
+```
+
+Disabling broker acknowledgment can significantly increase throughput by allowing the producer to continue sending
+messages without waiting for confirmation from the broker. This is ideal for high-throughput scenarios where performance
+is prioritized over delivery guarantees, despite a slight increase in the risk of message loss or duplication.
+
+## Tutorial
+[Learn how to set up and use a RabbitMQ Sink connector in KurrentDB through a tutorial.](/tutorials/RabbitMQ_Sink.md)
diff --git a/docs/server/features/connectors/sinks/serilog.md b/docs/server/features/connectors/sinks/serilog.md
new file mode 100644
index 00000000000..f95ec4c34aa
--- /dev/null
+++ b/docs/server/features/connectors/sinks/serilog.md
@@ -0,0 +1,142 @@
+---
+title: 'Serilog Sink'
+---
+
+## Overview
+
+The Serilog sink logs detailed messages about the connector and record details.
+
+The Serilog sink supports writing logs to the following outputs:
+
+- [Console](https://github.com/serilog/serilog-sinks-console)
+- [File](https://github.com/serilog/serilog-sinks-file)
+- [Seq](https://github.com/serilog/serilog-sinks-seq)
+
+These outputs can be configured using the Serilog settings in the configuration file.
+
+## Quickstart
+
+You can create the Serilog Sink connector as follows:
+
+::: tabs
+@tab Powershell
+
+```powershell
+$JSON = @"
+{
+  "settings": {
+    "instanceTypeName": "serilog-sink",
+    "subscription:filter:scope": "stream",
+    "subscription:filter:filterType": "streamId",
+    "subscription:filter:expression": "example-stream"
+  }
+}
+"@ `
+
+curl.exe -X POST `
+  -H "Content-Type: application/json" `
+  -d $JSON `
+  http://localhost:2113/connectors/serilog-sink-connector
+```
+
+@tab Bash
+
+```bash
+JSON='{
+  "settings": {
+    "instanceTypeName": "serilog-sink",
+    "subscription:filter:scope": "stream",
+    "subscription:filter:filterType": "streamId",
+    "subscription:filter:expression": "example-stream"
+  }
+}'
+
+curl -X POST \
+  -H "Content-Type: application/json" \
+  -d "$JSON" \
+  http://localhost:2113/connectors/serilog-sink-connector
+```
+
+:::
+
+After creating and starting the serilog sink connector, every time an event is
+appended to the `example-stream`, the serilog sink connector will print the
+record to the console. You can find a list of available management API endpoints
+in the [API Reference](../manage.md).
+
+Here is an example:
+
+```
+78689502-9502-9502-9502-172978689502 example-stream@16437 eventType1
+78699411-9411-9411-9411-172978699411 example-stream@18975 eventType2
+78699614-9614-9614-9614-172978699614 example-stream@19142 eventType3
+78699732-9732-9732-9732-172978699732 example-stream@21170 eventType4
+78699899-9899-9899-9899-172978699899 example-stream@23711 eventType5
+```
+
+## Settings
+
+Adjust these settings to specify the behavior and interaction of your serilog sink connector with KurrentDB, ensuring it operates according to your requirements and preferences.
+
+::: tip
+The serilog sink inherits a set of common settings that are used to configure the connector. The settings can be found in
+the [Sink Options](../settings.md#sink-options) page.
+:::
+
+The Serilog sink can be configured with the following options:
+
+| Name                | Details                                                                                                                                                                                                                     |
+| ------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `configuration`     | **Type**: string<br><br>**Description:** The JSON serilog configuration.<br><br>**Accepted Values:** A base64 encoded string of the serilog configuration<br><br>**Default**: If not provided, it will write to the console |
+| `includeRecordData` | **Type**: bool<br><br>**Description:** Whether the record data should be included in the log output.<br><br>**Default**: `true`                                                                                             |
+
+## Write to Seq
+
+1. Refer to the [Seq documentation](https://docs.datalust.co/docs/getting-started) for installation instructions.
+
+2. Configure the Serilog sink to export logs to [Seq](https://datalust.co/seq) by following these steps:
+
+```json
+{
+  "Serilog": {
+    "Using": ["Serilog.Sinks.Seq"],
+    "WriteTo": [
+      {
+        "Name": "Seq",
+        "Args": {
+          "serverUrl": "http://localhost:5341",
+          "payloadFormatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact"
+        }
+      }
+    ]
+  }
+}
+```
+
+3. Browse the Seq UI at `http://localhost:5341` to view the logs.
+
+Follow the configuration guide from [Serilog Seq](https://github.com/serilog/serilog-sinks-seq) for more details.
+
+## Write to a File
+
+Encode the JSON configuration to base64, then provide the base64 encoded configuration to the Serilog sink connector.
+
+```json
+{
+  "Serilog": {
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": {
+          "path": "/tmp/logs/log.txt",
+          "rollingInterval": "Infinite"
+        }
+      }
+    ]
+  }
+}
+```
+
+This will write logs to `/tmp/logs/log.txt`.
+
+Follow the configuration guide from [Serilog File](https://github.com/serilog/serilog-sinks-file) for more details.
\ No newline at end of file
diff --git a/docs/server/features/images/archiving/chunk-read-distribution.png b/docs/server/features/images/archiving/chunk-read-distribution.png
new file mode 100644
index 00000000000..889516a24a6
Binary files /dev/null and b/docs/server/features/images/archiving/chunk-read-distribution.png differ
diff --git a/docs/server/features/images/archiving/reads-by-source.png b/docs/server/features/images/archiving/reads-by-source.png
new file mode 100644
index 00000000000..972105645d4
Binary files /dev/null and b/docs/server/features/images/archiving/reads-by-source.png differ
diff --git a/docs/images/consumer-groups.jpg b/docs/server/features/images/consumer-groups.jpg
similarity index 100%
rename from docs/images/consumer-groups.jpg
rename to docs/server/features/images/consumer-groups.jpg
diff --git a/docs/images/wai-admin.png b/docs/server/features/images/wai-admin.png
similarity index 100%
rename from docs/images/wai-admin.png
rename to docs/server/features/images/wai-admin.png
diff --git a/docs/images/wai-dashboard.png b/docs/server/features/images/wai-dashboard.png
similarity index 100%
rename from docs/images/wai-dashboard.png
rename to docs/server/features/images/wai-dashboard.png
diff --git a/docs/images/wai-projection-config.jpg b/docs/server/features/images/wai-projection-config.jpg
similarity index 100%
rename from docs/images/wai-projection-config.jpg
rename to docs/server/features/images/wai-projection-config.jpg
diff --git a/docs/images/wai-projection-details.jpg b/docs/server/features/images/wai-projection-details.jpg
similarity index 100%
rename from docs/images/wai-projection-details.jpg
rename to docs/server/features/images/wai-projection-details.jpg
diff --git a/docs/images/wai-projection-stream.jpg b/docs/server/features/images/wai-projection-stream.jpg
similarity index 100%
rename from docs/images/wai-projection-stream.jpg
rename to docs/server/features/images/wai-projection-stream.jpg
diff --git a/docs/images/wai-projections.png b/docs/server/features/images/wai-projections.png
similarity index 100%
rename from docs/images/wai-projections.png
rename to docs/server/features/images/wai-projections.png
diff --git a/docs/images/wai-query-details.png b/docs/server/features/images/wai-query-details.png
similarity index 100%
rename from docs/images/wai-query-details.png
rename to docs/server/features/images/wai-query-details.png
diff --git a/docs/images/wai-stream-browser.png b/docs/server/features/images/wai-stream-browser.png
similarity index 100%
rename from docs/images/wai-stream-browser.png
rename to docs/server/features/images/wai-stream-browser.png
diff --git a/docs/images/wai-stream-details.png b/docs/server/features/images/wai-stream-details.png
similarity index 100%
rename from docs/images/wai-stream-details.png
rename to docs/server/features/images/wai-stream-details.png
diff --git a/docs/images/wai-users.png b/docs/server/features/images/wai-users.png
similarity index 100%
rename from docs/images/wai-users.png
rename to docs/server/features/images/wai-users.png
diff --git a/docs/server/features/persistent-subscriptions.md b/docs/server/features/persistent-subscriptions.md
new file mode 100644
index 00000000000..ce05933f4c6
--- /dev/null
+++ b/docs/server/features/persistent-subscriptions.md
@@ -0,0 +1,115 @@
+---
+title: Persistent subscriptions
+---
+
+## Persistent subscription
+
+A typical operation is subscribing to a stream and receiving notifications for changes. As new events arrive, you continue following them. 
+
+You can only subscribe to one stream or the `$all` stream. You can use server-side projections for linking events to new aggregated streams. System projections create pre-defined streams that aggregate events by type or category and are available out of the box. You can learn more about system and user-defined projections [here](projections/custom.md).
+
+Persistent subscriptions run on the Leader node and are not dropped when the connection is closed. Moreover, this subscription type supports the "[competing consumers](https://www.enterpriseintegrationpatterns.com/patterns/messaging/CompetingConsumers.html)" messaging pattern and are helpful when you need to distribute messages to many workers. KurrentDB saves the subscription state server-side and allows for at-least-once delivery guarantees across multiple consumers on the same stream. It is possible to have many groups of consumers compete on the same stream, with each group getting an at-least-once guarantee.
+
+::: tip
+The Administration UI includes a _Persistent Subscriptions_ section where users can create, update, delete, and view subscriptions and their statuses. However, persistent subscriptions to the $all stream must be made through a gRPC client.
+:::
+
+## Concepts
+
+Persistent subscriptions serve the same purpose as catch-up or volatile subscriptions, but in a different way. All subscriptions aim to deliver events in real-time to connected subscribers. But, unlike other subscription types, persistent subscriptions are maintained by the server. In a way, catch-up and persistent subscriptions are similar. Both have a last known position from where the subscription starts getting events. However, catch-up subscriptions must keep the last known position on the subscriber side, while persistent subscriptions keep the position on the server.
+
+Since the server decides where the subscription should start receiving events and knows where events are delivered, subscribers that use a persistent subscription can be load-balanced and process events in parallel. In contrast, catch-up subscriptions, which are client-driven, always receive and process events sequentially and can only be load-balanced on the client side. Therefore, persistent subscriptions allow using the competing consumers pattern that is common in the world of message brokers.
+
+For the server to load-balance subscribers, it uses the concept of consumer groups. All clients that belong to a single consumer group will get a portion of events, and that's how load balancing works inside a group. It is possible to create multiple consumer groups for the same stream and they will be completely independent of each other, receiving and processing events at their own pace and having their last known position handled by the server.
+
+![Consumer groups](./images/consumer-groups.jpg)
+
+::: warning
+Just as with message brokers, processing events in a group of consumers running in parallel processes will most likely get events out of order within a specific window. For example, if a consumer group has ten consumers, ten messages will be distributed among the available consumers, based on the group's [strategy](#consumer-strategies). Even though some strategies attempt to deliver ordered events to a single consumer consistently, it's done on the best effort basis and there is no guarantee of events coming in order with any strategy.
+:::
+
+## Acknowledging messages
+
+Clients must acknowledge (or not acknowledge) messages as they are handled. If messages aren't acknowledged before they time out on the server, the server will retry them. If a message has been retried more than the `maxRetryCount` setting for the persistent subscription, then the message will be parked and processing will continue.
+
+## Parked messages
+
+Messages that have been retried too many times will often be parked in the persistent subscription's parked message stream. This stream is named `$persistentsubscription-{streamname}::{groupname}-parked`. You can easily see the number of parked events in the persistent subscription statistics or browse the parked messages in the admin UI.
+
+If you want to retry the parked messages, you can `Replay` the parked messages for that subscription. This will push the parked messages to subscribers before any new events on the subscription.
+
+You can also specify the number of parked messages to replay over the HTTP endpoint. This can be done by providing the `stopAt` parameter when requesting to replay messages through the HTTP url. For example:
+
+```bash:no-line-numbers
+curl -i -X POST -d {} https://localhost:2113/subscriptions/{stream}/{groupnanme}/replayParked?stopAt={numberofevents} -u "admin:changeit"
+```
+
+If you don't want to replay any parked messages for a subscription and want to clear them out, you can delete the parked stream like a regular stream.
+
+## Checkpointing
+
+Once a persistent subscription has handled enough events, it will write a checkpoint. If the subscription is restarted, for example, due to a Leader change, then the persistent subscription will continue processing from the last checkpoint. This means that some events may be received multiple times by consumers.
+
+If a persistent subscription has a filter, the persistent subscription will checkpoint when enough events are handled or skipped by the filter.
+
+Checkpoints are events written to system streams with event type `$SubscriptionCheckpoint`. Checkpoint stream name is composed using the subscribed stream name and consumer group name:
+
+`$persistentsubscription-STREAMNAME::GROUPNAME-checkpoint`
+
+For example, if you have a persistent subscription `LoanProcessing` on top of the stream `$et-LoanRequested`, the checkpoints stream name would be:
+
+`$persistentsubscription-$et-LoanRequested::LoanProcessing-checkpoint`
+
+::: note
+Persistent Subscriptions won't write a new checkpoint if there's one already being written. This means that even if you configure the subscription with a max checkpoint count of 1, it's not guaranteed to write a checkpoint after every event.
+:::
+
+## Consumer strategies
+
+When creating a persistent subscription, you can choose between several consumer strategies. These strategies determine how the server pushes events to subscribed clients.
+
+### RoundRobin (default)
+
+Distributes events to all clients evenly. If the client `bufferSize` is reached, the client is ignored until events are acknowledged/not acknowledged.
+
+This strategy provides equal load balancing between all consumers in the group.
+
+### DispatchToSingle
+
+Distributes events to a single client until the `bufferSize` is reached. After that, the next client is selected in a round-robin style, and the process is repeated.
+
+This option can be seen as a fall-back scenario for high availability, when a single consumer processes all the events until it reaches its maximum capacity. When that happens, another consumer takes the load to free up the main consumer resources.
+
+### Pinned
+
+For use with an indexing projection such as the [system](projections/system.md#by-category) `$by_category` projection.
+
+KurrentDB inspects the event for its source stream id, hashing the id to one of 1024 buckets assigned to individual clients. When a client disconnects, its buckets are assigned to other clients. When a client connects, it is assigned some existing buckets. This naively attempts to maintain a balanced workload.
+
+The main aim of this strategy is to decrease the likelihood of concurrency and ordering issues while maintaining load balancing. This is not a guarantee, and you should handle the usual ordering and concurrency issues.
+
+::: warning
+This strategy behaves differently depending on whether `ResolveLinkTos` is enabled. If you want to use this strategy with an indexing projection such as `$by_category` then you should have `ResolveLinkTos` enabled.
+:::
+
+### PinnedByCorrelation
+
+This is similar to the `Pinned` strategy, but instead of using the source stream id to bucket the messages, it distributes the events based on the event's correlationId.
+
+## Considerations
+
+Persistent subscriptions are a powerful tool but are not always appropriate for every situation. Here are some things to consider before deciding whether you should use them:
+
+### Persistent subscriptions run on leader
+
+Persistent subscriptions only run on the Leader node.
+This means that more pressure will be put on the Leader node, and there is no option to balance the load to a follower like with a Catch-up subscription.
+
+It also means the subscriptions will reload from the last checkpoint whenever the Leader changes.
+
+### Ordering is not guaranteed
+
+Ordering is not guaranteed with persistent subscriptions due to the possibility of messages being retried, or consumers handling events before others.
+While some strategies attempt to mitigate this, it is still on a best-effort basis and messages may still arrive to consumers out of order.
+
+If you need an ordering guarantee, then you should use a Catch-up subscription instead, and handle the checkpointing in your client code.
diff --git a/docs/server/features/projections/README.md b/docs/server/features/projections/README.md
new file mode 100644
index 00000000000..6ce293333ba
--- /dev/null
+++ b/docs/server/features/projections/README.md
@@ -0,0 +1,93 @@
+---
+dir:
+  text: Projections
+  order: 5
+title: Introduction to projections
+---
+
+Projections is a KurrentDB subsystem that lets you append new events or link existing events to streams in
+a reactive manner.
+
+Projections are good at solving one specific query type, a category known as 'temporal correlation queries'.
+This query type is common in business systems and few can execute these queries well.
+
+::: tip 
+Projections require the event body to be in JSON.
+:::
+
+## Business case examples
+
+For example. You are looking for how many Twitter users said "happy" within 5 minutes of the word "foo coffee
+shop" and within 2 minutes of saying "london".
+
+This is the type of query that projections can solve. Let's try a more complex business problem.
+
+As a medical research doctor you want to find people diagnosed with pancreatic cancer within the last year.
+During their treatment a patient should not have had any proxies for a heart condition such as taking aspirin
+every morning. Within three weeks of their diagnosis they should have been put on treatment X. Within one
+month after starting the treatment they should have failed with a lab result that looks like L1. Within
+another six weeks they should have been put on treatment Y, and within four weeks failed that treatment with a
+lab result that looks like L2.
+
+You can use projections in nearly all examples of near real-time complex event processing. There are a large
+number of problems that fit into this category from monitoring of temperature sensors, to reacting to changes
+in the stock market.
+
+It's important to remember the types of problems that projections help to solve. Many problems are not a good
+fit for projections and are better served by hosting another read model populated by a catchup subscription.
+
+## Continuous querying
+
+Projections support the concept of continuous queries. When running a projection you can choose whether the
+query should run and give you all results present, or whether the query should continue running into the
+future finding new results as they happen and updating its result set.
+
+In the medical example above the doctor could leave the query running to be notified of any new patients that
+meet the criteria. The output of all queries is a stream, you can listen to this stream like any other stream.
+
+## Types of projections
+
+There are two types of projections in KurrentDB:
+
+- [Built in (system) projections](system.md)
+- [User-defined JavaScript projections](custom.md) which you create via the API or the admin
+  UI
+
+## Performance impact
+
+Keep in mind that all projections emit events as a reaction to events that they process. We call this effect _write amplification_
+because emitting new events or link events creates additional load on the server IO.
+
+Some system projections emit link events to their streams for each event appended to the database. These
+projections are By Category, By Event Type and By Correlation Id. If all those three projections are enabled
+and started, adding one event to the database will, in fact, produce three additional events and, therefore,
+quadruples the number of write operations.
+
+System projections `$streams` and `$stream-by-category` produce new events too, either per each new stream or
+per new stream category. If your system has a lot of small streams, the `$streams` system projection would
+also amplify writes significantly.
+
+Custom projections create the most significant write amplification since they produce new events or link
+events, which in turn get processed by system projections.
+
+Projections only run on a leader node of the cluster due to consistency concerns. It creates more CPU and IO
+load on the leader node compared to follower nodes.
+
+## Limitations
+
+Streams where projections emit events cannot be used to append events from applications. When this happens,
+the projection will detect events not produced by the projection itself and it will break.
+
+The reason projections exclusively own their streams is that otherwise they would lose all predictability. The
+projection would no longer have any idea what should be in that stream. For example, when a projection starts
+up from a checkpoint, it first goes through all the events after that checkpoint and checks them against the
+emitted stream. By doing this, the projection can understand if it up to the last event and can continue from
+where it left off. On top of that, the projection can verify that everything is in order, no events missing,
+etc. If anyone can append to the emitted streams, then the projection would have no idea where it got to last
+in terms of processing. Therefore, it can no longer trust that the projection itself emitted that event or if
+something else did.
+
+### Impact of resetting projections
+Resetting a projection in KurrentDB will soft-delete the output streams associated with the projection. If 'TrackEmittedStreams' is enabled when the projection is created, it will also allow the projection subsystem to truncate all streams created by the projection.
+
+The checkpoint will also be reset. This means that the projection will start processing events from the beginning of the event stream and not from the latest checkpoint.
\ No newline at end of file
diff --git a/docs/server/features/projections/custom.md b/docs/server/features/projections/custom.md
new file mode 100644
index 00000000000..7f5b226c418
--- /dev/null
+++ b/docs/server/features/projections/custom.md
@@ -0,0 +1,442 @@
+---
+order: 2
+---
+
+# User-defined projections
+
+You create user defined projections using JavaScript. For example, the `my_demo_projection_result` projection
+below counts the number of `myEventType` events from the `account-1` stream. It then uses the `transformBy`
+function to change the final state:
+
+```javascript
+options({
+    resultStreamName: "my_demo_projection_result",
+    $includeLinks:    false,
+    reorderEvents:    false,
+    processingLag:    0
+})
+
+fromStream('account-1')
+    .when({
+        $init: function () {
+            return {
+                count: 0
+            }
+        },
+        myEventType: function (state, event) {
+            state.count += 1;
+        }
+    })
+    .transformBy(function (state) {
+        return {Total: state.count}
+    })
+    .outputState()
+```
+
+## Projections API
+
+Below, you can find the JavaScript API for user defined projections.
+
+### Options
+
+| Name               | Description                                                                                                                                                                                                                                                  | Notes                                                     |
+|:-------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:----------------------------------------------------------|
+| `resultStreamName` | Overrides the default resulting stream name for the `outputState()` transformation, which is `$projections-{projection-name}-result`.                                                                                                                        |                                                           |
+| `$includeLinks`    | Configures the projection to include/exclude link to events.                                                                                                                                                                                                 | Default: `false`                                          |
+| `processingLag`    | When `reorderEvents` is enabled, this value is used to compare the total milliseconds between the first and last events in the buffer and if the value is equal or greater, the events in the buffer are processed. The buffer is an ordered list of events. | Default: `500ms`. Only valid for `fromStreams()` selector |
+| `reorderEvents`    | Process events by storing a buffer of events ordered by their prepare position                                                                                                                                                                               | Default: `false`. Only valid for `fromStreams()` selector |
+
+### Selectors
+
+| Selector                                                                                                | Description                                      | Notes |
+|:--------------------------------------------------------------------------------------------------------|:-------------------------------------------------|:------|
+| `fromAll()`                                                                                             | Selects events from the `$all` stream.           | **    |
+| Provides** <ul><li>`partitionBy`</li><li>`when`</li><li>`foreachStream`</li><li>`outputState`</li></ul> |                                                  |       |
+| `fromCategory({category})`                                                                              | Selects events from the `$ce-{category}` stream. | **    |
+| Provides** <ul><li>`partitionBy`</li><li>`when`</li><li>`foreachStream`</li><li>`outputState`</li></ul> |                                                  |       |
+| `fromStream({streamId})`                                                                                | Selects events from the `streamId` stream.       | **    |
+| Provides** <ul><li>`partitionBy`</li><li>`when`</li><li>`outputState`</li></ul>                         |                                                  |       |
+| `fromStreams(streams[])`                                                                                | Selects events from the streams supplied.        | **    |
+| Provides**<ul><li>`partitionBy`</li><li>`when`</li><li>`outputState`</li></ul>                          |                                                  |       |
+
+### Filters and transformations
+
+| Filter/Partition                                                                                                                           | Description                                                                                                                                               | Notes |
+|:-------------------------------------------------------------------------------------------------------------------------------------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------|:------|
+| `when(handlers)`                                                                                                                           | Allows only the given events of a particular to pass through the projection.                                                                              | **    |
+| Provides** <ul><li>`$defines_state_transform` </li><li>`transformBy`</li><li>`filterBy`</li><li>`outputTo`</li><li>`outputState`</li></ul> |                                                                                                                                                           |       |
+| `foreachStream()`                                                                                                                          | Partitions the state for each of the streams provided.                                                                                                    | **    |
+| Provides** <ul><li>`when`</li></ul>                                                                                                        |                                                                                                                                                           |       |
+| `outputState()`                                                                                                                            | If the projection maintains state, setting this option produces a stream called `$projections-{projection-name}-result` with the state as the event body. | **    |
+| Provides** <ul><li>`transformBy`</li><li>`filterBy`</li><li>`outputTo`</li></ul>                                                           |                                                                                                                                                           |       |
+| `partitionBy(function(event))`                                                                                                             | Partitions a projection by the partition returned from the handler.                                                                                       | **    |
+| Provides** <ul><li>`when`</li></ul>                                                                                                        |                                                                                                                                                           |       |
+| `transformBy(function(state))`                                                                                                             | Provides the ability to transform the state of a projection by the provided handler.                                                                      | **    |
+| Provides** <ul><li>`transformBy`</li><li>`filterBy`</li><li>`outputState`</li><li>`outputTo`</li></ul>                                     |                                                                                                                                                           |       |
+| `filterBy(function(state))`                                                                                                                | Causes projection results to be `null` for any `state` that returns a `false` value from the given predicate.                                             | **    |
+| Provides** <ul><li>`transformBy`</li><li>`filterBy`</li><li>`outputState`</li><li>`outputTo`</li></ul>                                     |                                                                                                                                                           |       |
+
+### Handlers
+
+Each handler is provided with the current state of the projection as well as the event that triggered the
+handler. The event provided through the handler contains the following properties.
+
+- `isJson`: true/false
+- `data`: {}
+- `body`: {}
+- `bodyRaw`: string
+- `sequenceNumber`: integer
+- `metadataRaw`: {}
+- `linkMetadataRaw`: string
+- `partition`: string
+- `eventType`: string
+- `streamId`: string
+
+| Handler        | Description                                                                                                                                                                                                                                                                                                              | Notes                                                                          |
+|:---------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------|
+| `{event-type}` | When using `fromAll()` and 2 or more event type handlers are specified and the `$by_event_type` projection is enabled and running, the projection starts as a `fromStreams($et-event-type-foo, $et-event-type-bar)` until the projection has caught up and moves to reading from the transaction log (i.e. from `$all`). |                                                                                |
+| `$init`        | Provide the initialization for a projection.                                                                                                                                                                                                                                                                             | Commonly used to setup the initial state for a projection.                     |
+| `$initShared`  | Provide the initialization for a projection where the projection is possibly partitioned.                                                                                                                                                                                                                                |                                                                                |
+| `$any`         | Event type pattern match that match any event type.                                                                                                                                                                                                                                                                      | Commonly used when the user is interested in any event type from the selector. |
+| `$deleted`     | Called upon the deletion of a stream.                                                                                                                                                                                                                                                                                    | Can only be used with `foreachStream`                                          |
+
+### Functions
+
+| Handler                                          | Description                                     |
+|:-------------------------------------------------|:------------------------------------------------|
+| `emit(streamId, eventType, eventBody, metadata)` | Appends an event to the designated stream       |
+| `linkTo(streamId, event, metadata)`              | Writes a link to event to the designated stream |
+
+
+## Debugging
+
+User projections have a bonus that debugging is easier
+via any browser that ships with debugging capabilities. The screenshots in this document show the use of
+Chrome, but we have tested debugging with all major browsers including Firefox, Edge and Safari.
+
+### Logging from a projection
+
+For debugging purposes, projections includes a log method which, when called, sends messages to the configured
+KurrentDB logger.
+
+You might find printing out the structure of the event body for inspection useful.
+
+For example:
+
+```javascript
+fromStream('$stats-127.0.0.1:2113')
+    .when({
+        $any: function (s, e) {
+            log(JSON.stringify(e));
+        }
+    })
+```
+
+#### Creating a projection for debugging
+
+Filename: _stats-counter.json_
+
+Contents:
+
+```javascript
+fromStream('$stats-127.0.0.1:2113')
+    .when({
+        $init: function () {
+            return {
+                count: 0
+            }
+        },
+        $any:  function (s, e) {
+            s.count += 1;
+        }
+    })
+```
+
+You create the projection by making a call to the API and providing it with the definition of the projection.
+
+```bash
+curl -i -d@stats-counter.json \
+  http://localhost:2113/projections/continuous?name=stats-counter%26type=js%26enabled=true%26emit=true%26trackemittedstreams=true \
+  -u admin:changeit
+```
+
+### Debugging your first projection
+
+Once the projection is running, open your browser and enable the developer tools. Once you have the developer
+tools open, visit your projection URL and you should see a button labelled _Debug_.
+
+![Projections Debugging Part 1](images/projections_debugging_part_1.png)
+
+After clicking the projection "Debug" button, you see the debugging interface with the definition of the
+projection and information about the events the projection is processing on the right-hand side.
+
+At the top there are a couple of buttons to take note of, specifically the _Run Step_ and _Update_ buttons.
+You use _Run Step_ to step through the event waiting in the queue, placing you in projection debugging mode.
+The _Update_ button provides you with a way to update the projection definition without having to go back to
+the projection itself and leave the context of the debugger.
+
+![Projections Debugging Part 2](images/projections_debugging_part_2.png)
+
+If the _Run Step_ button is not greyed out, and you click it, the browser has hit a breakpoint.
+
+![Projections Debugging Part 3](images/projections_debugging_part_3.png)
+
+You are now able to step through the projection, the important method to step into is
+the `handler(state, eventEnvelope)` method.
+
+## Configuring projections
+
+By changing these settings, you can lessen the amount of pressure projections put on a KurrentDB node or
+improve projection performance. You can change these settings on a case-by-case basis, and monitor potential
+improvements.
+
+::: warning
+You can only change the configuration of a stopped projection.
+:::
+
+You change the configuration of a projection by setting the relevant key and value in a request, or when you
+create a projection with the web admin interface.
+
+![Web admin interface projections configuration screen](../images/wai-projection-config.jpg)
+
+<!-- TODO: Further explanation here -->
+
+### Emit options
+
+These options control how projections append events.
+
+In busy systems, projections can put a lot of extra pressure on the leader node. This is especially true for
+KurrentDB servers that also have persistent subscriptions running, which only the leader node can process.
+If you see a lot of commit timeouts and slow writes from your projections and other clients, then start with
+these settings.
+
+#### Emit enabled
+
+The `emit` boolean setting determines whether a projection can emit events and any projection that
+calls `emit()` or `linkTo()` requires it. If this option is not set and a projection attempts to emit events,
+you see an error message like the following:
+
+<!-- TODO: Is it emit or emitenabled? Or are .NET and HTTP different -->
+
+```
+'emit' is not allowed by the projection/configuration/mode
+```
+
+KurrentDB disables this setting by default, and is usually set when you create the projection and if you
+need the projection to emit events.
+
+#### Track emitted streams
+
+The `trackemittedstreams` boolean setting enables tracking of a projection's emitted streams. It only has an
+affect if the projection has `EmitEnabled` enabled.
+
+Tracking emitted streams enables you to delete a projection and all the streams that it has created. You
+should only the setting if you intend to delete a projection and create new ones that project to the same
+stream.
+
+::: warning
+By default, KurrentDB disables the `trackemittedstreams` setting for projections. When enabled,
+an event appended records the stream name (in `$projections-{projection_name}-emittedstreams`) of each event
+emitted by the projection. This means that write amplification is a possibility, as each event that the
+projection emits appends a separate event. As such, this option is not recommended for projections that emit a
+lot of events, and you should enable only where necessary.
+:::
+
+#### Max allowed writes in flight
+
+<!-- TODO: Why is this not in the GUI for new projection? -->
+
+The `MaxAllowedWritesInFlight` setting sets the maximum number of writes to allow for a projection. Because a
+projection can write to multiple different streams, it's possible for the projection to send multiple writes
+at the same time. This option sets the number of concurrent writes that a projection can perform.
+
+By default, projections try to perform writes as quickly as they come. This can add a lot of pressure to a
+node, especially for projections that emit to different streams. If you see your projections causing frequent
+commit timeouts or slow reads, you can try lowering this value to see if there is any improvement.
+
+::: tip
+Lower values may cause the projection to slow down as the number of writes are throttled, but the
+trade-off for this is cleaner logs and fewer commit timeouts.
+:::
+
+By default, this is unbounded, allowing a projection to write as fast as it can.
+
+#### Max write batch length
+
+<!-- TODO: Why is this not in the GUI for new projection? -->
+
+The `MaxWriteBatchLength` setting sets the maximum number of events the projection can write in a batch at a
+time.
+
+**Default:** `500` (events).
+
+### Checkpoint options
+
+Checkpoints store how far along a projection is in the streams it is processing from. There is a performance
+overhead with writing a checkpoint, as it does more than append an event, and writing them too often can slow
+projections down.
+
+We recommend you try other methods of improving projections before changing these values, as checkpoints are
+an important part of running projections.
+
+#### Checkpoint after Ms
+
+The `CheckpointAfterMs` setting prevents a new checkpoint from being written within a certain time frame from
+the previous one. The setting is to keep a projection from writing too many checkpoints too quickly, something
+that can happen in a busy system.
+
+The default setting is 0 seconds, which means there is no limit to how quickly checkpoints can be written.
+
+#### Checkpoint handled threshold
+
+The `CheckpointHandledThreshold` setting controls the number of events that a projection can handle before
+attempting to write a checkpoint. An event is considered handled if it actually passed through the
+projection's filter. If the projection is set to checkpoint every 4,000 events, but it only reads from
+the `foo` stream, the projection only checkpoints every 4,000 `foo` events.
+
+**Default:** `4000` (events).
+
+#### Checkpoint unhandled bytes threshold
+
+The `CheckpointUnhandledBytesThreshold` setting specifies the number of bytes a projection can process before
+attempting to write a checkpoint. Unhandled bytes are the events that are not processed by the projection
+itself.
+
+For example, if the projection reads from the `foo` stream, but writes from the `bar` stream comes through, a
+checkpoint is written after this number of bytes have been processed. This prevents the projection from having
+to read through a potentially large number of unrelated events again because none of them passed its filter.
+
+**Default:** `10` (MiB).
+
+### Processing options
+
+#### Pending events threshold
+
+The `PendingEventsThreshold` setting determines the number of events that can be pending before the projection
+is paused. Pausing the projection stops the projection from reading, allowing it to finish with the current
+events that are waiting to be processed. Once the pending queue has drained to half the threshold, the
+projection starts reading again.
+
+**Default:** `5000` (events).
+
+#### Projection Execution Timeout
+
+The `ProjectionExecutionTimeout` setting determines how long a projection has to process an event. If an event is not processed within the specified duration, the projection will fault and won't process further events. This setting applies to all projections unless a specific timeout is set for a particular projection.
+
+Recovering a projection from a faulted state due to a timeout can be done by restarting the projection to resume from the previous checkpoint or by increasing the `ProjectionExecutionTimeout` value, which requires a server restart. Alternatively, increasing the Per Event Projection Processing Timeout does not require a server restart.
+
+::: tip
+Increase value of this setting if projection handler is compute intensive or server is under heavy load
+:::
+
+**Default:** `250` (ms).
+
+Settings in this section concern projections that are running on the server.
+
+::: warning
+Server-side projections impact the performance of the KurrentDB server. For example, some
+standard [system projections](system.md) like Category or Event Type projections produce new (link)
+events that are stored in the database in addition to the original event. This effectively doubles or triples
+the number of events appended and therefore creates pressure on the IO of the server node. We often call this
+effect "write amplification".
+:::
+
+#### Per Event Projection Processing Timeout
+
+This setting works like `ProjectionExecutionTimeout` but applies to individual projections. If both timeouts are configured for a projection, the Per Event Projection Processing Timeout takes precedence.
+
+### Projection runtime
+
+An Interpreted runtime was introduced in 21.6.0 to replace the existing V8 runtime.
+
+The `ProjectionRuntime` option can be used to select which runtime the Projection Subsystem should use. We
+only recommend changing this setting if you observe a difference in behaviour between running an existing
+projection on the Legacy runtime versus the Interpreted runtime.
+
+| Format               | Syntax                          |
+|:---------------------|:--------------------------------|
+| Command line         | `--projection-runtime`          |
+| YAML                 | `ProjectionRuntime`             |
+| Environment variable | `KURRENTDB_PROJECTION_RUNTIME`  |
+
+**Default**: `Interpreted`, use the new Interpreted runtime by default.
+
+Accepted values are `Interpreted` and `Legacy`.
+
+### Run projections
+
+The `RunProjections` option tells the server if you want to run all projections, only system projections or no
+projections at all. Keep in mind that the `StartStandardProjections` setting has no effect on custom
+projections.
+
+The option accepts three values: `None`, `System` and `All`.
+
+When the option value is set to `None`, the projections subsystem of KurrentDB will be completely disabled
+and the Projections menu in the Admin UI will be disabled.
+
+By using the `System` value for this option, you can instruct the server to enable system projections when the
+server starts. However, system projections will only start if the `StartStandardProjections` option is set
+to `true`. When the `RunProjections` option value is `System` (or `All`) but the `StartStandardProjections`
+option value is `false`, system projections will be enabled but not start. You can start them later manually
+via the Admin UI or via an API call.
+
+Finally, you can set `RunProjections` to `All` and it will enable both system and custom projections.
+
+| Format               | Syntax                       |
+|:---------------------|:-----------------------------|
+| Command line         | `--run-projections`          |
+| YAML                 | `RunProjections`             |
+| Environment variable | `KURRENTDB_RUN_PROJECTIONS`  |
+
+**Default**: `None`, all projections are disabled by default.
+
+Accepted values are `None`, `System` and `All`.
+
+### Projection threads
+
+Projection threads are used to make calls in to the V8 JavaScript engine, and coordinate dispatching
+operations back into the main worker threads of the database. While they carry out none of the operations
+listed directly, they are indirectly involved in all of them.
+
+The primary reason for increasing the number of projection threads is projections which perform a large amount
+of CPU-bound processing. Projections are always eventually consistent - if there is a mismatch between egress
+from the database log and processing speed of projections, the window across which the latest events have not
+been processed promptly may increase. Too many projection threads can end up with increased context switching
+and memory use, since a V8 engine is created per thread.
+
+There are three primary influences over projections lagging:
+
+- Large number of writes, outpacing the ability of the engine to process them in a timely fashion.
+- Projections which perform a lot of CPU-bound work (heavy calculations).
+- Projections which result in a high system write amplification factor, especially with latent disks.
+
+Use the `ProjectionThreads` option to adjust the number of threads dedicated to projections.
+
+| Format               | Syntax                          |
+|:---------------------|:--------------------------------|
+| Command line         | `--projection-threads`          |
+| YAML                 | `ProjectionThreads`             |
+| Environment variable | `KURRENTDB_PROJECTION_THREADS`  |
+
+**Default**: `3`
+
+### Fault out of order projections
+
+It is possible that in some cases a projection would get an unexpected event version. It won't get an event
+that precedes the last processed event, such a situation is very unlikely. But, it might get the next event
+that doesn't satisfy the `N+1` condition for the event number. The projection expects to get an event
+number `5` after processing the event number `4`, but eventually it might get an event number `7` because
+events `5` and `6` got deleted and scavenged.
+
+The projections engine can keep track of the latest processed event for each projection. It allows projections
+to guarantee ordered handling of events. By default, the projections engine ignore ordering failures like
+described above. You can force out of order projections to fail by setting the `FailOutOfOrderProjections`
+to `true`.
+
+| Format               | Syntax                                      |
+|:---------------------|:--------------------------------------------|
+| Command line         | `--fault-out-of-order-projections`          |
+| YAML                 | `FaultOutOfOrderProjections`                |
+| Environment variable | `KURRENTDB_FAULT_OUT_OF_ORDER_PROJECTIONS`  |
+
+**Default**: `false`
diff --git a/docs/http-api/images/getting-started-create-projection.png b/docs/server/features/projections/images/getting-started-create-projection.png
similarity index 100%
rename from docs/http-api/images/getting-started-create-projection.png
rename to docs/server/features/projections/images/getting-started-create-projection.png
diff --git a/docs/images/projections_debugging_part_1.png b/docs/server/features/projections/images/projections_debugging_part_1.png
similarity index 100%
rename from docs/images/projections_debugging_part_1.png
rename to docs/server/features/projections/images/projections_debugging_part_1.png
diff --git a/docs/images/projections_debugging_part_2.png b/docs/server/features/projections/images/projections_debugging_part_2.png
similarity index 100%
rename from docs/images/projections_debugging_part_2.png
rename to docs/server/features/projections/images/projections_debugging_part_2.png
diff --git a/docs/images/projections_debugging_part_3.png b/docs/server/features/projections/images/projections_debugging_part_3.png
similarity index 100%
rename from docs/images/projections_debugging_part_3.png
rename to docs/server/features/projections/images/projections_debugging_part_3.png
diff --git a/docs/server/features/projections/system.md b/docs/server/features/projections/system.md
new file mode 100644
index 00000000000..1b895e7723e
--- /dev/null
+++ b/docs/server/features/projections/system.md
@@ -0,0 +1,113 @@
+---
+order: 1
+---
+
+# System projections
+
+KurrentDB ships with five built in projections:
+
+- [By Category](#by-category) (`$by_category`)
+- [By Event Type](#by-event-type) (`$by_event_type`)
+- [By Correlation ID](#by-correlation-id) (`$by_correlation_id`)
+- [Stream by Category](#stream-by-category) (`$stream_by_category`)
+- [Streams](#streams-projection) (`$streams`)
+
+## Enabling system projections
+
+When you start KurrentDB from a fresh database, these projections are present but disabled and querying
+their statuses returns `Stopped`. You can enable a projection by issuing a request which switches the status
+of the projection from `Stopped` to `Running`.
+
+```bash:no-line-numbers
+curl -i -X POST "http://{event-store-ip}:{ext-http-port}/projection/{projection-name}/command/enable" -H "accept:application/json" -H "Content-Length:0" -u admin:changeit
+```
+
+## By category
+
+The `$by_category` (_http://127.0.0.1:2113/projection/$by_category_) projection links existing events from
+streams to a new stream with a `$ce-` prefix (a category) by splitting a stream `id` by a configurable
+separator.
+
+```text:no-line-numbers
+first
+-
+```
+
+You can configure the separator, as well as where to split the stream `id`. You can edit the projection and
+provide your own values if the defaults don't fit your particular scenario.
+
+The first parameter specifies how the separator is used, and the possible values for that parameter is `first`
+or `last`. The second parameter is the separator, and can be any character.
+
+For example, if the body of the projection is `first` and `-`, for a stream id
+of `account-9E763770-0A8D-456D-AF23-410ADBC88249`, the stream name the projection creates is `$ce-account`.
+
+If the body of the projection is `last` and `-`, for a stream id of `shopping-cart-1`, the stream name the
+projection creates is `$ce-shopping-cart`.
+
+::: warning
+You can change the projection setting at any time, so it can be quite dangerous. Consider all
+possible event consumers of the category stream that expect it to be in the format that is already there.
+Changing the setting might break all of them.
+:::
+
+The use case of this project is subscribing to all events within a category.
+
+## By event type
+
+The `$by_event_type` (_http://127.0.0.1:2113/projection/$by_event_type_) projection links existing events from
+streams to a new stream with a stream id in the format `$et-{event-type}`.
+
+For example, if you append an event with the `EventType` field set to `PaymentProcessed`, no matter in what
+stream you appended this event, you get a link event in the `$et-PaymentProcessed` stream.
+
+You cannot configure this projection.
+
+## By correlation ID
+
+The `$by_correlation_id` (_http://127.0.0.1:2113/projection/$by_correlation_id_) projection links existing
+events from projections to a new stream with a stream id in the format `$bc-<correlation id>`.
+
+The projection takes one parameter, a JSON string as a projection source:
+
+```json:no-line-numbers
+{
+  "correlationIdProperty": "$myCorrelationId"
+}
+```
+
+## Stream by category
+
+The `$stream_by_category` (_http://127.0.0.1:2113/projection/$by_category_) projection links existing events
+from streams to a new stream with a `$category` prefix by splitting a stream `id` by a configurable separator.
+
+```text:no-line-numbers
+first
+-
+```
+
+By default, the `$stream_by_category` projection links existing events from a stream id with a name such
+as `account-1` to a stream called `$category-account`. You can configure the separator as well as where to
+split the stream `id`. You can edit the projection and provide your own values if the defaults don't fit your
+particular scenario.
+
+The first parameter specifies how the separator is used, and the possible values for that parameter is `first`
+or `last`. The second parameter is the separator, and can be any character.
+
+For example, if the body of the projection is `first` and `-`, for a stream id of `account-1`, the stream name
+the projection creates is `$category-account`, and the `account-1` stream is linked to it. Future streams
+prefixed with `account-` are likewise linked to the newly created `$category-account` stream.
+
+If the body of the projection is last and `-`, for a stream id of `shopping-cart-1`, the stream name the
+projection creates is `$category-shopping-cart`, and the `shopping-cart-1` stream is linked to it. Future
+streams whose left-side split by the _last_ `-` is `shopping-cart`, are likewise linked to the newly
+created `$category-shopping-cart` stream.
+
+The use case of this projection is subscribing to all stream instances of a category.
+
+## Streams projection
+
+The `$streams` (_http://127.0.0.1:2113/projection/$streams_) projection links existing events from streams to
+a stream named `$streams`
+
+You cannot configure this projection.
diff --git a/docs/server/features/projections/tutorial.md b/docs/server/features/projections/tutorial.md
new file mode 100644
index 00000000000..48d100217c1
--- /dev/null
+++ b/docs/server/features/projections/tutorial.md
@@ -0,0 +1,153 @@
+---
+order: 3
+---
+
+# Projections tutorial
+
+Follow the steps below to learn how to create a user defined projection.
+
+## Add sample data
+
+Download the following files that contain sample data used throughout this step of the getting started guide.
+
+- [shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1164.json](@httpapi/data/shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1164.json)
+- [shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1165.json](@httpapi/data/shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1165.json)
+- [shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1166.json](@httpapi/data/shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1166.json)
+- [shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1167.json](@httpapi/data/shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1167.json)
+
+Add the sample data to four different streams:
+
+@[code](@httpapi/add-sample-data.sh)
+
+## Create your first projection
+
+::: tip Next steps
+Read [this guide](custom.md#projections-api) to find out more about the user defined projection's API.
+:::
+
+The projection counts the number of 'XBox One S's that customers added to their shopping carts.
+
+A projection starts with a selector, in this case `fromAll()`. Another possibility is `fromCategory({category})` which this step discusses later, but for now, `fromAll` should do.
+
+The second part of a projection is a set of filters. There is a special filter called `$init` that sets up an initial state. You want to start a counter from 0 and each time KurrentDB observes an `ItemAdded` event for an 'Xbox One S,' increment the counter.
+
+Here is the projection code:
+
+@[code](@httpapi/xbox-one-s-counter.js)
+
+You create a projection by calling the projection API and providing it with the definition of the projection. Here you decide how to run the projection, declaring that you want the projection to start from the beginning and keep running. You can create a projection using the Admin UI by opening the _Projections_ tab, clicking the _New Projection_ button and filling in the details of your projection.
+
+![Creating a projection with the KurrentDB Admin UI](images/getting-started-create-projection.png)
+
+You can also create projections programmatically. Pass the projection JSON file as a parameter of your request, along with any other settings:
+
+@[code](@httpapi/projections/create-projection.sh)
+
+## Query for the projection state
+
+Now the projection is running, you can query the state of the projection. As this projection has a single state, query it with the following request:
+
+@[code](@httpapi/projections/query-state.sh)
+
+The server will send a response similar to this:
+
+@[code](@httpapi/projections/query-state.json)
+
+## Append to streams from projections
+
+The above gives you the correct result but requires you to poll for the state of a projection. What if you wanted KurrentDB to notify you about state updates via subscriptions?
+
+### Output state
+
+Update the projection to output the state to a stream by calling the `outputState()` method on the projection which by default produces a `$projections-{projection-name}-result` stream.
+
+Below is the updated projection:
+
+@[code](@httpapi/xbox-one-s-counter-outputState.js)
+
+To update the projection, edit the projection definition in the Admin UI, or issue the following request:
+
+@[code](@httpapi/xbox-one-s-counter-outputState.sh)
+
+Then reset the projection you created above:
+
+@[code](@httpapi/projections/reset-projection.sh)
+
+You should get a response similar to the one below:
+
+@[code](@httpapi/projections/reset-projection.json)
+
+You can now read the events in the result stream by issuing a read request.
+
+@[code](@httpapi/projections/read-projection-events.sh)
+
+And you'll get a response like this:
+
+@[code](@httpapi/projections/reset-projection.json)
+
+## The number of items per shopping cart
+
+The example in this step so far relied on a global state for the projection, but what if you wanted a count of the number of items in the shopping cart per shopping cart.
+
+KurrentDB has a built-in `$by_category` projection that lets you select events from a particular list of streams. Enable this projection with the following command.
+
+@[code](@httpapi/projections/enable-by-category.sh)
+
+The projection links events from existing streams to new streams by splitting the stream name by a separator. You can configure the projection to specify the position of where to split the stream `id` and provide a separator.
+
+By default, the category splits the stream `id` by a dash. The category is the first string.
+
+| Stream Name        | Category                               |
+|--------------------|----------------------------------------|
+| shoppingCart-54    | shoppingCart                           |
+| shoppingCart-v1-54 | shoppingCart                           |
+| shoppingCart       | _No category as there is no separator_ |
+
+You want to define a projection that produces a count per stream for a category, but the state needs to be per stream. To do so, use `$by_category` and its `fromCategory` API method.
+
+Below is the projection:
+
+@[code](@httpapi/projections/shopping-cart-counter.js)
+
+Create the projection with the following request:
+
+@[code](@httpapi/projections/shopping-cart-counter.sh)
+
+### Querying for the state of the projection by partition
+
+Querying for the state of the projection is different due to the partitioning of the projection. You have to specify the partition and the name of the stream.
+
+@[code](@httpapi/projections/read-state-partition.sh)
+
+The server then returns the state for the partition:
+
+@[code](@httpapi/projections/read-state-partition.json)
+
+## Configure projection properties
+
+You can configure properties of the projection by updating values of the `options` object. For example, the following projection changes the name of the results stream:
+
+@[code{2}](@httpapi/projections/update-projection-options.js)
+
+Then send the update to the projection:
+
+@[code](@httpapi/projections/update-projection-options.sh)
+
+::: tip
+You can find all the options available in the [projections API](custom.md#projections-api) documentation.
+:::
+
+Now you can read the result as above, but use the new stream name:
+
+@[code](@httpapi/projections/read-projection-events-renamed.sh)
+
+## Query running projections
+
+You can also query the state of all projections using the HTTP API.
+
+@[code](@httpapi/projections/list-all-projections.sh)
+
+The response is a list of all known projections and useful information about them.
+
+@[code](@httpapi/projections/list-all-projections.json)
+
diff --git a/docs/server/features/streams.md b/docs/server/features/streams.md
new file mode 100644
index 00000000000..ca2225e5f21
--- /dev/null
+++ b/docs/server/features/streams.md
@@ -0,0 +1,271 @@
+# Event streams
+
+KurrentDB is purpose-built for event storage. Unlike traditional state-based databases, which retain only the most recent entity state, KurrentDB allows you to store each state alteration as an independent event.
+
+These **events** are logically organized into **streams**, typically only one stream per entity.
+
+## Metadata and reserved names
+
+## Stream metadata
+
+In KurrentDB, every stream and event is accompanied by metadata, distinguished by the **`$$`** prefix. For example, the stream metadata for a stream named **`foo`** is **`$$foo`**. You can modify specific metadata values and write your data to the metadata, which can be referenced in your code.
+
+### Reserved names
+
+KurrentDB uses a **`$`** prefix for all internal data, such as **`$maxCount`** in a stream's metadata. Do not use a **`$`** prefix for event names, metadata keys, or stream names, except as detailed below.
+
+The supported internal settings are:
+
+| Property name       | Description                                                                                                                                                                                                                                                                                                                                                            |
+| :------------------ | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **`$maxAge`**       | Sets a sliding window based on dates. When data reaches a certain age, it automatically disappears from the stream and becomes eligible for scavenging. This value is set as an integer representing the number of seconds (must be >= 1).                                                                                                                             |
+| **`$maxCount`**     | Sets a sliding window based on the number of items in the stream. When data reaches a certain length, it automatically disappears from the stream and becomes eligible for scavenging. This value is set as an integer representing the count of items (must be >= 1).                                                                                                 |
+| **`$cacheControl`** | Controls the cache of the head of a stream. While most URIs in a stream are infinitely cacheable, the head, by default, will not cache. In some situations, it may be preferable to set a small amount of caching on the head to allow intermediaries to handle polls (e.g., 10 seconds). The argument is an integer representing the seconds to cache (must be >= 1). |
+
+&nbsp;
+
+::: tip
+If you configure both **`$maxAge`** and **`$maxCount`**, events then become eligible for scavenging when either
+condition is met. For example, if you set **`$maxAge`** to 10 seconds and **`$maxCount`** to 50,000, events
+qualify for scavenging after either 10 seconds or the accumulation of 50,000 events. Affected items are removed once the scavenge process runs.
+:::
+
+**Security access control lists (ACLs)** are part of the **`$acl`** section in the stream metadata.
+
+| Property name | Description                                     |
+| :------------ | :---------------------------------------------- |
+| **`$r`**      | Users with read permissions                     |
+| **`$w`**      | Users with write permissions                    |
+| **`$d`**      | Users with delete permissions                   |
+| **`$mw`**     | Users with write permissions to stream metadata |
+| **`$mr`**     | Users with read permissions to stream metadata  |
+
+You can find more information on ACLs in the [access control lists documentation](../security/user-authorization.md#access-control-lists).
+
+## Event metadata
+
+All names starting with **`$`** are reserved for internal use. The currently supported reserved internal names include:
+
+| Property name        | Description                                           |
+| :------------------- | :---------------------------------------------------- |
+| **`$correlationId`** | The application-level correlation ID for the message. |
+| **`$causationId`**   | The application-level causation ID for the message.   |
+
+Projections within KurrentDB adhere to both the **`correlationId`** and **`causationId`** patterns for any events they internally produce (e.g., through functions like `linkTo` and `emit`).
+
+## Deleting streams and events
+
+In KurrentDB, metadata can determine whether an event is deleted or not. You can use [stream metadata](#metadata-and-reserved-names) elements such as **`TruncateBefore`**, **`MaxAge`**, and **`MaxCount`** to
+filter events marked as deleted. During a stream read, the index references the stream's metadata to determine if any events have been deleted.
+
+::: note
+In KurrentDB, you cannot selectively delete events from the middle of a stream. It only allows truncating the stream.
+:::
+
+When you delete a stream, KurrentDB offers two options: **soft delete** or **hard delete**.
+
+**Soft delete** triggers scavenging, removing all events from the stream during the subsequent scavenging process. This allows for the reopening of the stream by appending new events.
+
+It's worth noting that the **`$all`** stream circumvents index checking. Deleted events within this stream remain readable until a scavenging process removes them. To understand the prerequisites for successful event removal through scavenging, refer to the [scavenging guide](../operations/scavenge.md).
+
+Even if a stream has been deleted, KurrentDB retains one event within the stream to indicate the stream's existence and provide information about the last event version. As a best practice, consider appending a specific event like **`StreamDeleted`** and then setting the **`MaxCount`** to 1 to delete the stream. Keep this in mind, especially when dealing with streams containing sensitive data that you want to erase thoroughly and without a trace.
+
+### Soft delete and TruncateBefore
+
+In event sourcing, **`TruncateBefore`** (or **`$tb`**) designates any event with an event number lower than its value as deleted. For instance, consider a stream with the following events:
+
+```
+0@test-stream
+1@test-stream
+2@test-stream
+3@test-stream
+```
+
+Setting the **`TruncateBefore`** (or **`$tb`**) value to 3, results in reading only the last event:
+
+```
+3@test-stream
+```
+
+A **soft delete** leverages **`TruncateBefore`** (or **`$tb`**). When you delete a stream, **`TruncateBefore`**
+(or **`$tb`**) is set to the [max long/Int64 value](https://docs.microsoft.com/en-us/dotnet/api/system.int64.maxvalue?view=net-5.0): 9223372036854775807.
+
+If you attempt to read this soft-deleted stream the read returns a **`StreamNotFound`** or **`404`** result.
+
+Appending to the stream later adds events starting from the last stream revision before deletion, incremented by one. Continuing with our previous example, a new event would be appended with event number 4, and only events from event number 4 onwards are visible when you read this stream.
+
+### Max count and Max age
+
+**Max count** (**`$maxCount`** and **`MaxCount`**) restricts the number of events you can read from a stream. Reading a stream with a max count of 5 allows you to retrieve only the last 5 events, regardless of the total events in the stream.
+
+**Max age** (**`$maxAge`** and **`MaxAge`**) specifies the time an event can live in seconds. The age is
+calculated at the time of the read. For example, if you read a stream with a **`MaxAge`** of 3 minutes, an event that has existed for 4 minutes won't be returned.
+
+### Hard delete
+
+A **hard delete** involves appending a **`tombstone`** event to the stream and permanently deleting it. This action prevents stream recreation or further appends. Tombstone events are appended with the event type **`$streamDeleted`**.
+Any attempt to append or read a hard-deleted stream, the response is a **`StreamDeleted`** or **`410`** result.
+
+While events in the deleted stream are subject to removal during a scavenge, the tombstone event remains.
+
+::: note
+Hard deletion of a stream is permanent; you cannot append or recreate it.
+It is recommended to opt for soft deletion for streams unless you have a specific requirement for permanent removal.
+:::
+
+### Deleted events and projections
+
+If you plan to use projections and delete streams, there are some considerations:
+
+- In the context of **`$all`**, projections using **`fromAll`** read any deleted events that have not been scavenged. They also receive tombstone events from any hard deletions.
+
+- System projections like [by category](projections/system.md#by-category) or [by event type](projections/system.md#by-event-type) produce new link events stored alongside
+  the original event in the database. When original events are deleted, link events remain in the projected streams, but their links remain unresolved (with undefined values). You can ignore those events in the code logic.
+
+## System events and streams
+
+System streams and events begin with the `$` symbol. These streams and events are used for internal data, or for configuring specific parts of KurrentDB.
+
+Metadata streams for system streams follow the same convention of prefixing the stream name with `$$`. Therefore metadata streams for system streams start with `$$$`.
+
+By default, access to system streams is limited to members of the `$admins` group.
+
+::: tip
+Metadata streams (streams beginning with `$$` or `$$$`) are considered system streams.
+:::
+
+### **`$persistentSubscriptionConfig`**
+
+**`$persistentSubscriptionConfig`** is a specialized paged stream that stores all configuration events for all
+persistent subscriptions. It uses the **`$PersistentConfig`** system event type (previously **`PersistentConfig1`**), capturing configuration changes.
+The event data includes:
+
+| Property name   | Description                                   |
+| :-------------- | :-------------------------------------------- |
+| **`version`**   | Event data version                            |
+| **`updated`**   | Date of the update                            |
+| **`updatedBy`** | User responsible for the configuration update |
+| **`maxCount`**  | The number of configuration events to retain  |
+| **`entries`**   | Configuration items set by the event          |
+
+### **`$all`**
+
+**`$all`** is a dedicated paged stream containing all events. You can employ the same paged reading method described earlier to
+read all events for a node by pointing the stream at _/streams/\$all_. Like any other stream, you can perform all operations, except posting to it.
+
+### **`$settings`**
+
+The **`$settings`** stream hosts a special ACL serving as the default ACL. It governs the default ACL for streams lacking ACLs and controls who can create streams within the system.
+
+Learn more about the default ACL in the [access control lists](../security/user-authorization.md#default-acl) documentation.
+
+### **`$stats`**
+
+KurrentDB offers debugging and statistical information about a cluster within the **`$stats`** stream. Find out
+more in [the stats guide](../diagnostics/README.md#statistics).
+
+### **`$scavenges`**
+
+**`$scavenges`** represents a specialized paged stream for all scavenge-related events. It uses the following system event
+types:
+
+- **`$scavengeIndexInitialized`**: An event that records the initialization of the scavenge index.
+- **`$scavengeStarted`**: An event that records the beginning of a scavenge process. The event data contains:
+
+  - **`scavengeId`**: Scavenge event ID
+  - **`nodeEndpoint`**: Node address
+
+- **`$scavengeCompleted`**: An event that records the completion of a scavenge process. The event data contains:
+  - **`scavengeId`**: Scavenge event ID
+  - **`nodeEndpoint`**: Node address
+  - **`result`**: **`Success`**, **`Failed`**, **`Stopped`**
+  - **`error`**: Error details
+  - **`timeTaken`**: Duration of the scavenging process in milliseconds
+  - **`spaceSaved`**: Space saved by scavenge process in bytes.
+
+## Projections events and streams
+
+These are the streams and event types that are specific to projections. Most projections streams are considered system streams as they start with a `$`.
+
+User projections are able to interact with non-system streams depending on their code and configuration. You should avoid appending events directly to streams created by projections, as this may cause the projection to fault.
+
+The system streams created by the projections subsystem are listed below.
+
+### Streams created by system projections
+
+The system projections create the following system streams:
+
+- **`$streams`**: Output of the [`$streams` projection](./projections/system.md#streams-projection).
+- **`$ce-`**: Output of the [`$by_category` projection](./projections/system.md#by-category).
+- **`$et-`**: Output of the [`$by_event_type` projection](./projections/system.md#by-event-type).
+- **`$et`**: Checkpoint stream for the [`$by_event_type` projection](./projections/system.md#by-event-type).
+- **`$bc-`**: Output of the [`$by_correlation_id` projection](./projections/system.md#by-correlation-id).
+- **`$category-`**: Output of the [`$stream_by_category` projection](./projections/system.md#stream-by-category).
+
+### **`$projections-$all`**
+
+This is the registry of all of the projections in KurrentDB. It contains a number of `$ProjectionCreated` and `$ProjectionDeleted` events, which form the list of available projections when replayed.
+
+This stream contains the following event types:
+
+- **`$ProjectionsInitialized`**: The first event written to the `$projections-$all` stream, which indicates that the projections system is ready to create new projections.
+- **`$ProjectionCreated`**: A projection was created. The body contains the projection name, and the event number for this event becomes the projection's id.
+- **`$ProjectionDeleted`**: A projection was deleted. The body contains the projection name.
+
+### **`$projections-{projection_name}`**
+
+The stream containing the definition for the `{projection_name}` projection. This stream contains the projection's configuration and code.
+
+These streams contain the following event type:
+
+- **`$ProjectionUpdated`**: The projection definition was updated.
+
+### **`$projections-{projection_name}-checkpoint`** and **`$projections-{projection_name}-{partition}-checkpoint`**
+
+The stream containing the checkpoints for the `{projection_name}` projection, specifically for the `{partition}` partition if it is included in the stream name.
+
+The checkpoints differ depending on the selector used for the projection. For example, a projection using `fromAll` has a checkpoint containing an `$all` position, whereas a projection using `fromStream` has a checkpoint containing the stream position.
+
+These streams contain the following event type:
+
+- **`$ProjectionCheckpoint`**: The checkpoint for the projection. This includes the checkpoint position, the state at the time of the checkpoint, and the result at the time of the checkpoint.
+
+### **`$projections-{projection_name}-result`** and **`$projections-{projection_name}-{partition}-result`**
+
+The default stream containing the result of the `{projection_name}` projection, specifically for the `{partition}` partition if it is included in the stream name.
+
+These streams are only created if the projection produces an [output state](./projections/custom.md#filters-and-transformations).
+
+These streams contain the following event type:
+
+- **`Result`**: The result of the projection.
+
+### **`$projections-{projection_name}-emittedstreams`**
+
+This stream typically contains the first event of each stream created by the `{projection_name}` projection. This stream is only created if [track emitted streams]() is enabled.
+
+These streams contain the following event type:
+
+- **`$StreamTracked`**: The name of the stream created by the projection.
+
+### **`$projections-{projection_name}-emittedstreams-checkpoint`**
+
+If tracked emitted streams for the `{projection_name}` projection have been deleted, this stream will contain a checkpoint for where the emitted streams were deleted up to.
+
+These streams contain the following event type:
+
+- **`$ProjectionCheckpoint`**: The checkpoint for where the emitted streams have been deleted up to.
+
+### **`$projections-{projection_name}-order`**
+
+This stream contains the ordering for the `{projection_name}` projection. Some projections, such as ones using `fromStreams` or `fromCategories`, need to be ordered before they can be processed so that the projection can guarantee that it will process the events in the same order after restarts.
+
+This stream contains LinkTo events, pointing to the original events.
+
+### **`$projections-{projection_name}-partitions`**
+
+This stream contains a list of the partitions for the `{projection_name}` projection. This stream will only exist if the projection has [multiple partitions](./projections/custom.md#filters-and-transformations).
+
+These streams contain the following event type:
+
+- **`$partition`**: The name of the partition.
diff --git a/docs/server/operations/README.md b/docs/server/operations/README.md
new file mode 100644
index 00000000000..867514bdb7c
--- /dev/null
+++ b/docs/server/operations/README.md
@@ -0,0 +1,18 @@
+---
+dir:
+  text: Operations
+  order: 4
+---
+
+# Maintenance
+
+KurrentDB requires regular maintenance with three operational concerns:
+
+- [Scavenging](scavenge.md) for freeing up space after deleting events.
+- [Backup and restore](backup.md) for disaster recovery.
+- [Certificate update](cert-update.md) to renew certificates.
+
+You might also be interested learning about KurrentDB [diagnostics](../diagnostics/README.md)
+and [indexes](../configuration/indexes.md), which might require some Ops attention.
+
+<Catalog/>
\ No newline at end of file
diff --git a/docs/server/operations/auto-scavenge.md b/docs/server/operations/auto-scavenge.md
new file mode 100644
index 00000000000..9872f0dc608
--- /dev/null
+++ b/docs/server/operations/auto-scavenge.md
@@ -0,0 +1,151 @@
+---
+order: 2
+---
+
+# Auto-Scavenge
+
+<Badge type="info" vertical="middle" text="License Required"/>
+
+The Auto-scavenge feature automatically schedules and coordinates _cluster scavenges_ which are composed of multiple _node scavenges_ run across all of the nodes in the cluster. The feature ensures that only one node scavenge is executed at a time in the cluster, and handles restarting or cancelling scavenges if a node is lost.
+
+Cluster scavenges are configured to run on a set schedule with a CRON expression, and cluster scavenges can be paused and resumed if needed.
+
+The Auto-scavenge does its best not to run the scavenge process on the leader node to minimise the impact a scavenge can have on your cluster. It does this by executing the scavenge on all of the non-leader nodes first. Once all of the other nodes have been scavenged, the leader of the cluster will resign before executing its own scavenge.
+
+### Configuration
+
+You require a [license key](../quick-start/installation.md#license-keys) to use this feature.
+
+Auto-scavenge is automatically enabled by default when a valid license key is provided. It can be disabled with the following configuration. It will not run any scavenges until a schedule is set via the HTTP endpoint.
+
+Refer to the [configuration guide](../configuration/README.md) for configuration mechanisms other than YAML.
+
+```yaml
+AutoScavenge:
+  Enabled: false
+```
+
+Once the feature is enabled the server should log a similar message to the one below:
+
+```
+[18304, 1,23:01:53.335,INF] "AutoScavenge" "25.0.0.1673" plugin enabled.
+```
+
+::: note
+Auto-scavenge cannot be enabled at the same time as `dev` mode or `mem-db`
+:::
+
+### HTTP endpoints
+
+The Auto-scavenge feature adds several endpoints demonstrated with the following examples.
+
+Replace `admin:changeit` with your credentials, and the url with the correct address for your server.
+
+In a cluster the requests can be submitted to any node and they will be forwarded to the leader for processing.
+
+#### Enabled endpoint
+
+The `enabled` endpoint returns whether the feature is enabled.
+
+Sample request:
+
+```http
+GET https://127.0.0.1:2113/auto-scavenge/enabled
+Authorization: Basic admin:changeit
+```
+
+Sample response:
+
+```json
+{
+  "enabled": true
+}
+```
+
+Requires an authenticated user.
+
+#### Status endpoint
+
+The `status` endpoint returns information about the current state of the auto-scavenge process.
+
+Sample request:
+
+```http
+GET https://127.0.0.1:2113/auto-scavenge/status
+Authorization: Basic admin:changeit
+```
+
+Sample response:
+
+```json
+{
+  "state": "Waiting",
+  "schedule": "0 6 * * 6",
+  "timeUntilNextCycle": "1.13:14:32.6299115"
+}
+```
+
+The `state` field can be one of:
+
+* `NotConfigured`: The auto-scavenge will not do anything until configured with a schedule.
+* `Waiting`: Waiting until it is time to start the next cluster scavenge.
+* `InProgress`: A cluster scavenge is currently in progress.
+* `Pausing`: The auto-scavenge process is attempting to pause a node scavenge that is currently running.
+* `Paused`: The auto-scavenbe process is paused and will not start any further node scavenges until resumed.
+
+Requires an authenticated user.
+
+#### Pause endpoint
+
+The `pause` endpoint pauses the auto-scavenge process. A response of 200 OK indicates that the auto-scavenge process has been paused and any node scavenge that it was running has been stopped. A response of 202 ACCEPTED indicates that the auto-scavenge will not start any further node scavenges but is still attempting to stop a node scavenge that was already running.
+
+Sample request:
+
+```http
+POST https://127.0.0.1:2113/auto-scavenge/pause
+Authorization: Basic admin:changeit
+```
+
+Requires `$ops` or `$admin` roles.
+
+#### Resume endpoint
+
+After pausing, resume by using this endpoint. The cluster scavenge will continue from where it left off.
+
+Sample request:
+
+```http
+POST https://127.0.0.1:2113/auto-scavenge/resume
+Authorization: Basic admin:changeit
+```
+
+Requires `$ops` or `$admin` roles.
+
+#### Configure endpoint
+
+The schedule is a CRON expression.
+
+```http
+### configure to scavenge at 06:00 each Saturday
+POST https://127.0.0.1:2113/auto-scavenge/configure
+Content-Type: application/json
+Authorization: Basic admin:changeit
+
+{
+    "schedule": "0 6 * * 6"
+}
+```
+
+Requires `$ops` or `$admin` roles.
+
+### Troubleshooting
+
+Check that
+- A valid license key is provided.
+- The server is not running in `dev` mode.
+- The server is not running in `mem-db` (i.e. with an in-memory database).
+- A schedule has been set via the HTTP endpoint.
+
+### Tutorial
+
+[Learn how to schedule and manage Auto-Scavenge in KurrentDB through a tutorial.](/tutorials/Auto-Scavenge.md)
diff --git a/docs/server/operations/backup.md b/docs/server/operations/backup.md
new file mode 100644
index 00000000000..fda571ab21d
--- /dev/null
+++ b/docs/server/operations/backup.md
@@ -0,0 +1,169 @@
+---
+order: 3
+---
+
+# Backup and restore
+
+Backing up a KurrentDB database is straightforward but relies on carrying out the steps below in the
+correct order.
+
+## Types of backups
+
+There are two main ways to perform backups:
+
+- **Disk snapshots**: If your infrastructure is virtualized, [disk snapshots](#disks-snapshot) are an option and the easiest way to perform backup and
+  restore operations.
+
+- **Regular file copy**:
+
+    - [Simple full backup](#simple-full-backup--restore): when the DB size is small and the frequency of appends is low.
+    - [Differential backup](#differential-backup--restore): when the DB size is large or the system has a high append frequency.
+
+## Backup and restore best practices
+
+- Backing up one node is recommended. However, ensure that the node you choose to back up is **up to date** and **connected to the cluster**.
+
+- For additional safety, you can also back up at least a quorum of nodes.
+
+- Do not attempt to back up a node using file copy at the same time a scavenge operation is running. Your backup script should [stop any ongoing scavenge](#stopping-an-ongoing-scavenge-before-taking-a-backup) on a node before taking a backup.
+
+- [Read-only replica](../configuration/cluster.md#read-only-replica) nodes may be used as a backup source.
+
+- When either running a backup or restoring, do not mix backup files of different nodes.
+
+- A restore must happen on a _stopped_ node.
+
+- The restore process can happen on any node of a cluster.
+
+- You can restore any number of nodes in a cluster from the same backup source. It means, for example, in the
+  event of a non-recoverable three node cluster, that the same backup source can be used to restore a completely new
+  three node cluster.
+
+- When you restore a node that was the backup source, perform a full backup after recovery.
+
+## Database files information
+
+By default, there are two directories containing data that needs to be included in the backup:
+
+- `db/ ` where the data is located
+- `index/ ` where the indexes are kept
+
+The exact name and location are dependent on your configuration.
+
+- `db/ ` contains:
+    - the chunks files named `chk-X.Y` where `X` is the chunk number and `Y` the version.
+    - the checkpoints files `*.chk` (`chaser.chk`, `epoch.chk`, `proposal.chk`, `truncate.chk`, `writer.chk`)
+- `index/ ` contains:
+    - the index map: `indexmap`
+    - the indexes: UUID named files , e.g `5a1a8395-94ee-40c1-bf93-aa757b5887f8`
+
+## Disks snapshot
+
+If the `db/ ` and `index/ ` directories are on the same volume, a snapshot of that volume is enough.
+
+However, if they are on different volumes, take first a snapshot of the volume containing the `index/ `
+directory and then a snapshot of the volume containing the `db/ ` directory.
+
+## Simple full backup & restore
+
+### Backup
+
+1. Copy any index checkpoint files (`<index directory>/**/*.chk`) to your backup location.
+2. Copy the other index files to your backup location (the rest of `<index directory>`, excluding the checkpoints).
+3. Copy the database checkpoint files (`*.chk`) to your backup location.
+4. Copy the chunk files (`chunk-X.Y`) to your backup location.
+
+For example, with a database in `data` and index in `data/index`:
+
+```bash:no-line-numbers
+rsync -aIR data/./index/**/*.chk backup
+rsync -aI --exclude '*.chk' data/index backup
+rsync -aI data/*.chk backup
+rsync -a data/*.0* backup
+```
+
+### Restore
+
+1. Ensure the KurrentDB process is stopped. Restoring a database on running instance is not possible and,
+   in most cases, will lead to data corruption.
+2. Copy all files to the desired location.
+3. Create a copy of `chaser.chk` and call it `truncate.chk`. This effectively overwrites the
+   restored `truncate.chk`.
+
+## Differential backup & restore
+
+The following procedure is designed to minimize the backup storage space, and can be used to do a full and
+differential backup.
+
+### Backup
+
+First backup the index:
+
+1. If there are no files in the index directory (apart from directories), go to step 7.
+2. Copy the `index/indexmap` file to the backup. If the source file does not exist, repeat until it does.
+3. Make a list `indexFiles` of all the `index/<GUID>` and `index/<GUID>.bloomfilter` files in the source.
+4. Copy the files listed in `indexFiles` to the backup, skipping file names already in the backup.
+5. Compare the contents of the `indexmap` file in the source and the backup. If they are different (i.e. the
+   `indexmap` file has changed since step 2 or no longer exists), go back to step 2.
+6. Remove `index/<GUID>` and `index/<GUID>.bloomfilter` files from the backup that are not listed
+   in `indexFiles`.
+7. Copy the `index/stream-existence/streamExistenceFilter.chk` file (if present) to the backup.
+8. Copy the `index/stream-existence/streamExistenceFilter.dat` file (if present) to the backup.
+9. Copy the `index/scavenging/scavenging.db` file (if present) to the backup. It should be the only file in the `scavenging` directory.
+
+Then backup the log:
+
+1. Rename the last chunk in the backup to have a `.old` suffix. e.g. rename `chunk-000123.000000`
+   to `chunk-000123.000000.old`.
+2. Copy `chaser.chk` to the backup.
+3. Copy `epoch.chk` to the backup.
+4. Copy `writer.chk` to the backup.
+5. Copy `proposal.chk` to the backup.
+6. Make a list `chunkFiles` of all chunk files (`chunk-X.Y`) in the source.
+7. Copy the files listed in `chunkFiles` to the backup, skipping file names already in the backup. All files
+   should copy successfully. None should have been deleted since scavenge is not running.
+8. Remove any chunks from the backup that are not in the `chunksFiles` list. This will include the `.old`
+   file from step 1.
+
+### Restore
+
+1. Ensure the KurrentDB process is stopped. Restoring a database on running instance is not possible and,
+   in most cases, will lead to data corruption.
+2. Copy all files to the desired location.
+3. Create a copy of `chaser.chk` and call it `truncate.chk`.
+
+## Stopping an ongoing scavenge before taking a backup
+It is extremely important to stop any ongoing scavenge before taking a backup. If this step is not followed, the backed up data may have missing or corrupted files. Your backup script can include the following steps to ensure that any ongoing scavenge is stopped before a node is backed up:
+
+1. Do an HTTP `GET` request to `/admin/scavenge/current` or `/admin/scavenge/last` to determine if there is an ongoing scavenge on the node.
+2. If there is one, do an HTTP `DELETE` request to `/admin/scavenge/{scavengeId}` to abort the scavenge. `{scavengeId}` can be obtained from the HTTP response received in the first step.
+3. If you are using the [auto-scavenge](./auto-scavenge.md) feature, it is recommended to pause auto-scavenge by doing a `POST` request to `/auto-scavenge/pause`. This will ensure that no new scavenges are launched on the node while it is being backed up.
+4. You can now back up the node's data
+5. If you are using the auto-scavenge feature, you can resume auto-scavenge by doing a `POST` request to `/auto-scavenge/resume`.
+6. Finally, you can optionally resume the scavenge that was aborted by starting a new one. This can be done with a `POST` request to `/admin/scavenge`. If you are using the auto-scavenge feature, it will resume the scavenge automatically.
+
+## Other options for data recovery
+
+### Additional node (aka Hot Backup)
+
+Increase the cluster size from 3 to 5 to keep further copies of data. This increase in the cluster size will
+slow the cluster's writing performance as two follower nodes will need to confirm each write.
+
+Alternatively, you can use a [read-only replica](../configuration/cluster.md#read-only-replica) node, which is not a part of
+the cluster. In this case, the write performance will be minimally impacted.
+
+### Alternative storage
+
+Set up a durable subscription that writes all events to another storage mechanism such as a key/value or
+column store. These methods would require a manual set up for restoring a cluster node or group.
+
+### Backup cluster
+
+Use a second KurrentDB cluster as a backup. Such a strategy is known as a primary/secondary back up scheme.
+
+The primary cluster asynchronously pushes data to the second cluster using a durable subscription. The second
+cluster is available in case of a disaster on the primary cluster.
+
+If you are using this strategy, we recommend you only support manual fail over from primary to secondary as
+automated strategies risk causing a [split brain](http://en.wikipedia.org/wiki/Split-brain_%28computing%29)
+problem.
diff --git a/docs/server/operations/cert-update.md b/docs/server/operations/cert-update.md
new file mode 100644
index 00000000000..44ca7425ad6
--- /dev/null
+++ b/docs/server/operations/cert-update.md
@@ -0,0 +1,118 @@
+---
+order: 5
+title: Renew certificates
+---
+
+# Certificate update upon expiry
+
+In KurrentDB, the certificates require updating when they have expired or are going to expire soon. Follow the steps below to perform a rolling certificate update.
+
+## Step 1: Generate new certificates
+
+The new certificates can be created in the same manner as you generated the existing certificates.
+You can use the [es-gencert-cli](https://github.com/EventStore/es-gencert-cli) tool to generate the CA and node certificates.
+You can also follow the [Configurator](https://configurator.eventstore.com/) to create commands for generating the certificates based on your cluster's configuration.
+
+::: tip
+It is possible to do a rolling update with new certificates having a Common Name (CN) that's different from the original certificates. If `CertificateReservedNodeCommonName` was set in your configuration, any changes to its value will be taken into consideration during a config reload.
+:::
+
+## Step 2: Replace the certificates
+
+The next step is to replace the outdated certificates with the newly generated certificates.
+
+If you are using symlinks, then you can update the symlink to point it to the new certificates.
+
+### Linux
+
+We normally have a symlink that points to the existing certificates:
+
+ca -> `/etc/kurrentdb/certs/ca`
+node.crt -> `/etc/kurrentdb/certs/node.crt`
+node.key -> `/etc/kurrentdb/certs/node.key`
+
+Update the symlink so that the link points to the new certificates:
+
+ca -> `/etc/kurrentdb/newCerts/ca`
+node.crt -> `/etc/kurrentdb/newCerts/node.crt`
+node.key -> `/etc/kurrentdb/newCerts/node.key`
+
+In the above example we have the links in a folder at path `/home/ubuntu/links`.
+
+## Step 3: Reload the configuration
+
+You can reload the certificate configuration without restarting the node by issuing the following curl command.
+
+```bash
+curl -k -X POST --basic https://{nodeAddress}:{HttpPort}/admin/reloadconfig -u {username}:{Password}
+```
+
+For Example:
+
+```bash
+curl -k -X POST --basic https://127.0.0.1:2113/admin/reloadconfig -u admin:changeit
+```
+
+### Linux
+
+Linux users can also send the `SIGHUP` signal to KurrentDB to reload the certificates.
+
+For Example:
+
+```bash
+kill -s SIGHUP 38956
+```
+
+Here `38956` is the Process ID (PID) of KurrentDB on our local machine. To find the PID, use the following command in the Linux terminal.
+
+```bash
+pidof kurrentd
+```
+
+Once the configuration has been reloaded successfully, the server logs will look something like:
+
+```
+[108277,30,14:46:07.453,INF] Reloading the node's configuration since a request has been received on /admin/reloadconfig.
+[108277,29,14:46:07.457,INF] Loading the node's certificate(s) from file: "/home/ubuntu/links/node.crt"
+[108277,29,14:46:07.488,INF] Loading the node's certificate. Subject: "CN=kurrentdb-node", Previous thumbprint: "05526714107700C519E24794E8964A3B30EF9BD0", New thumbprint: "BE6D5CD681D7B9281D60A5969B5A7E31AF775E9F"
+[108277,29,14:46:07.488,INF] Loading intermediate certificate. Subject: "CN=KurrentDB Intermediate CA 78ae8d5a159b247568039cf64f4b04ad, O=Kurrent Inc, C=UK", Thumbprint: "ED4AA0C5ED4AD120DDEE2FA8B3B0CCC5A30B81E3"
+[108277,29,14:46:07.489,INF] Loading trusted root certificates.
+[108277,29,14:46:07.490,INF] Loading trusted root certificate file: "/home/ubuntu/links/ca/ca.crt"
+[108277,29,14:46:07.491,INF] Loading trusted root certificate. Subject: "CN=KurrentDB CA c39fece76b4efcb65846145c942c037c, O=Kurrent Inc, C=UK", Thumbprint: "5F020804E8D7C419F9FC69ED3B4BC72DD79A5996"
+[108277,29,14:46:07.493,INF] Certificate chain verification successful.
+[108277,29,14:46:07.493,INF] All certificates successfully loaded.
+[108277,29,14:46:07.494,INF] The node's configuration was successfully reloaded
+```
+
+::: tip
+If there are any errors during loading certificates, the new configuration changes will not take effect.
+:::
+
+The server logs the following error when the node certificate is not available at the path specified in the KurrentDB configuration file.
+
+```
+[108277,30,14:49:47.481,INF] Reloading the node's configuration since a request has been received on /admin/reloadconfig.
+[108277,29,14:49:47.488,INF] Loading the node's certificate(s) from file: "/home/ubuntu/links/node.crt"
+[108277,29,14:49:47.489,ERR] An error has occurred while reloading the configuration
+System.IO.FileNotFoundException: Could not find file '/home/ubuntu/links/node.key'.
+```
+
+## Step 4: Update the other nodes
+
+Now update the certificates on the other nodes.
+
+## Step 5: Monitor the cluster
+
+The connection between nodes in KurrentDB reset every 10 minutes so the new configuration won’t take immediate effect. Use this time to update the certificates on all of the nodes. It is advisable to monitor the cluster after this timeframe to make sure everything is working as expected.
+The KurrentDB will log certificate errors if the certificates are not reloaded on all of the nodes before the connection resets.
+
+```
+[108277,29,14:59:47.489,ERR] kurrentdb-node : A certificate chain could not be built to a trusted root authority.
+[108277,29,14:59:47.489,ERR] Client certificate validation error: "The certificate (CN=kurrentdb-node) provided by the client failed validation with the following error(s): RemoteCertificateChainErrors (PartialChain)"
+```
+
+The above error indicates that there is some issue with the certificate because the reload process is not yet completed on all the nodes. The error can be safely ignored during the duration of the reloading certificate process, but the affected nodes will not be able to communicate with each other until the certificates have been updated on all the nodes.
+
+::: warning
+It can take up to 10 minutes for certificate changes to take effect. Certificates on all nodes should be updated within this window to avoid connection issues.
+:::
diff --git a/docs/images/admin-scavenge.png b/docs/server/operations/images/admin-scavenge.png
similarity index 100%
rename from docs/images/admin-scavenge.png
rename to docs/server/operations/images/admin-scavenge.png
diff --git a/docs/images/redaction-run.png b/docs/server/operations/images/redaction-run.png
similarity index 100%
rename from docs/images/redaction-run.png
rename to docs/server/operations/images/redaction-run.png
diff --git a/docs/images/redaction-ui.png b/docs/server/operations/images/redaction-ui.png
similarity index 100%
rename from docs/images/redaction-ui.png
rename to docs/server/operations/images/redaction-ui.png
diff --git a/docs/server/operations/redaction.md b/docs/server/operations/redaction.md
new file mode 100644
index 00000000000..0f34de815f0
--- /dev/null
+++ b/docs/server/operations/redaction.md
@@ -0,0 +1,72 @@
+---
+order: 4
+---
+
+# Redaction
+
+<Badge text="License Required" type="info" vertical="middle"/>
+
+In KurrentDB, events are immutable and cannot be changed after they are written. Usually, when you have an event with data that needs to be deleted you should take the following steps:
+
+- Rewrite the stream to a new stream without the data to be removed.
+- Delete the old stream.
+- Run a scavenge to remove the data from disk on each node in turn.
+
+If this procedure is impractical for your use case, then you can use the redaction tool (the "redactor") to blank out the data of specific events.
+
+::: warning
+Use the redactor as a last resort and only if you know what you're doing. Redacting events may lead to unintended consequences in your subscriptions and projections!
+:::
+
+## Prerequisites
+
+Using redaction has the following prerequisites:
+
+- A valid [license key](../quick-start/installation.md#license-keys).
+- If running on Windows, Windows Server 2019 or above is required.
+- Server configuration option: `EnableUnixSocket: True`.
+- The redactor tool (see steps below on how to get it).
+
+## Getting the redactor
+
+Redaction requires a license key. Due to its sensitive nature, the tool is available only upon request. Please [contact us here](https://www.kurrent.io/talk_to_expert) if you do not have a support contract, or reach out to our support team if you do.
+
+## Running the redactor
+
+The binary needs to be extracted and run locally on a KurrentDB node. Similar to scavenging, redaction affects only the node where it's running. Thus, it must be run once on each node of the cluster.
+
+The redactor takes two mandatory parameters as input:
+
+| Parameter  | Description                                                                             |
+|:-----------|-----------------------------------------------------------------------------------------|
+| `--db`     | The path to the database directory containing the chunk files.                          |
+| `--events` | A comma-separated list of events to be redacted in the format: `eventNumber@streamName` |
+
+Specify `--help` to see the full list of options.
+
+The redactor will blank out the data section of the specified events with one bits (0xFF bytes) keeping the data size exactly the same as it was before. It will also set a flag (`IsRedacted`) on the event's record to indicate that the event has been redacted. All other properties of the event such as the event type, event metadata, and timestamp will remain unchanged.
+
+![Redactor run](./images/redaction-run.png)
+
+If you read the data of a redacted event from an external client, you should see data composed of only 0xFF bytes. The UI will also label redacted events.
+
+![Redacted event in UI](./images/redaction-ui.png)
+
+::: tip
+The redactor is not an offline tool. The KurrentDB server must be running, as the redactor needs to communicate with it to obtain information about the events to be redacted and replace the chunk files with the redacted ones.
+:::
+
+## How the redactor works
+
+The redactor follows these steps:
+
+1. It establishes a connection to the database via a unix domain socket located in the database directory.
+
+2. It then fetches information about the events to be redacted from the server via an RPC call. This information includes the chunk file the event is in and the event's position in the chunk.
+
+3. A list is built of chunk files containing events to be redacted.
+
+4. For each chunk in the list:
+    - It is copied to a file with a .tmp extension in the database directory.
+    - The requested event(s) are redacted in the .tmp chunk file.
+    - The .tmp chunk is atomically switched into the database via an RPC call on the server.
diff --git a/docs/server/operations/scavenge.md b/docs/server/operations/scavenge.md
new file mode 100644
index 00000000000..15977d143b2
--- /dev/null
+++ b/docs/server/operations/scavenge.md
@@ -0,0 +1,288 @@
+---
+order: 1
+---
+
+# Scavenging
+
+In KurrentDB, events are no longer present in stream reads or subscriptions after they have been deleted or they have expired according to the metadata of the stream.
+
+The events are, however, still present in the database and will be visible in reads and subscriptions to the `$all` stream.
+
+To remove these events from the database, which may be necessary for GDPR, you need to run a 'scavenge' on each of your nodes.
+
+A scavenge operation removes events and reclaims disk space by creating a copy of the relevant chunk, minus those events, and
+then deleting the old chunk. The scavenged events are also removed from the index.
+
+::: warning
+Scavenging is destructive. Once a scavenge has run, you cannot recover any deleted events except from a backup.
+:::
+
+## Starting a scavenge
+
+You start a scavenge by issuing an empty `POST` request to the HTTP API with the credentials of an `admin`
+or `ops` user:
+
+@[code{curl}](@samples/scavenge.sh)
+
+You can also start scavenges from the _Admin_ page of the Admin UI.
+
+![Start a scavenge in the Admin UI](./images/admin-scavenge.png)
+
+Each node in a cluster has its own independent copy of the database. As such, when you run a scavenge, you need to issue a
+scavenge request to each node. The scavenges can be run concurrently, but can also be run in series to spread the load.
+
+## Getting the current scavenge ID
+
+Get the ID of the currently running scavenge, if there is one, by issuing a `GET` request to the following HTTP API endpoint with the `admin` or `ops` credentials.
+
+```bash
+curl -i -X GET http://127.0.0.1:2113/admin/scavenge/current -u "admin:changeit"
+```
+
+## Stopping a scavenge
+
+Stop a running scavenge operation by issuing a `DELETE` request to the HTTP API with the credentials of
+an `admin` or `ops` user and the ID of the scavenge you want to stop:
+
+```bash
+curl -i -X DELETE http://localhost:2113/admin/scavenge/{scavengeId} -u "admin:changeit"
+```
+
+Or stop the currently running scavenge by specifying an ID of `current`:
+
+```bash
+curl -i -X DELETE http://localhost:2113/admin/scavenge/current -u "admin:changeit"
+```
+
+A 200 response is returned after the scavenge has stopped.
+
+You can also stop scavenges from the _Admin_ page of the Admin UI.
+
+::: tip
+A scavenge can be stopped at any time. The next time a scavenge is started, it will resume from the place the previous scavenge stopped.
+:::
+
+## Viewing progress
+
+The logs contain detailed information about the progress of the scavenge.
+
+The current state of the scavenge can also be tracked in the [metrics](../diagnostics/metrics.md).
+
+The [execution phase](#execution-phase) of the scavenge emits events into streams.
+Each scavenge operation will generate a new stream and the stream will contain events related to that
+operation.
+Refer to the `$scavenges` [stream documentation](../features/streams.md#scavenges) to learn how you can use it to observe
+the scavenging operation progress and status.
+
+## Scavenging best practices
+
+### Backups
+
+Do not take [file-copy](backup.md#types-of-backups) backups while scavenge is running. Stop the scavenge and resume it after the backup.
+
+[Disk snapshot](backup.md#types-of-backups) backups can be taken while scavenge is running.
+
+### How often to scavenge
+
+This depends on:
+
+- How often you delete streams.
+- How you set `$maxAge`, `$maxCount` or `$tb` metadata on your streams.
+- How important freeing the disk space is to you.
+- Your requirements around GDPR.
+
+You can tell from the scavenge output in the logs and streams how much data it is removing. This can help guide how frequently to scavenge.
+
+You can set up a scheduled task, for example using cron on Linux or [Windows Task Scheduler](https://learn.microsoft.com/en-us/windows/win32/taskschd/task-scheduler-start-page), to trigger a scavenge as often as you need.
+
+### Spreading the load
+
+Scavenging does place extra load on the server, especially in terms of disk IO. If this is a concern, consider spreading the load with the following:
+
+- Run scavenge on one node at a time.
+- Run scavenge on the Follower nodes to avoid adding load on the Leader. Then resign the Leader node and perform scavenging on that node.
+- Stop the scavenge during peak times and resume it afterwards.
+- Use the [throttle](#throttle-percent) and [threshold](#threshold) options.
+
+## Scavenging algorithm
+
+Central to the scavenging process is the concept of _scavenge points_. Physically, these are log records in the transaction log, each containing the following information:
+
+- the position in the log that the scavenge will run up to
+- a number unique to the scavenge point (counting from 0)
+- the time (`EffectiveNow`) used to determine whether the `maxAge` of an event has been exceeded
+- the threshold that a chunk's weight must reach to be executed
+
+Any run of the scavenge process is associated with a single scavenge point, and it scavenges the log up to that point.
+Log records after that scavenge point do not exist as far as that scavenge is concerned.
+
+In this way, a scavenge can be run on the first node, creating a scavenge point. Then it can be run (potentially later) on other nodes, to scavenge up to the same point, producing the same effect on the log.
+
+The scavenging algorithm itself consists of several phases:
+
+### Beginning
+
+When a scavenge is started, it first checks to see if a previous scavenge was stopped. If so, it resumes from where the previous scavenge stopped. Otherwise, it begins a fresh scavenge.
+
+When beginning a fresh scavenge, it checks to see if a scavenge point already exists that has not been reached by previous scavenges. If so, it begins scavenging up to that point. Otherwise, it writes a new scavenge point to the log (which is replicated to the other nodes) and then begins a scavenge up to there. Writing a new scavenge point also causes the active chunk to be completed so that it can be scavenged.
+
+### Accumulation phase
+
+During the accumulation phase, the scavenging process reads through the chunks that have been added since the previous scavenge, up to the current scavenge point.
+It finds necessary information (such as tombstones and metadata records) and stores it in the scavenge database.
+
+In this way, any particular chunk is only accumulated once, regardless of how many times scavenge is run.
+
+::: tip
+The first time the scavenge is run it needs to accumulate all the chunks. Typically, this makes the first scavenge take longer than subsequent scavenges.
+:::
+
+### Calculation phase
+
+During the calculation phase, the scavenging process calculates which events can be discarded and which chunks they are located in for each stream that it accumulated tombstones or metadata for. It assigns weight to those chunks.
+
+### Execution phase
+
+The execution phase uses the data from the calculation phase to remove events from the chunks and indexes. Small chunks are then merged together.
+
+Only chunks whose weight meets the threshold will be executed.
+
+### Cleaning phase
+
+This final phase removes data from the scavenge database that is no longer needed.
+
+## Starting a scavenge
+
+When starting a scavenge with an HTTP POST request, the following options are available.
+
+### Threads
+
+Specify the number of threads to use for running the scavenging process. The default value is 1.
+
+Example:
+
+```bash
+curl -i -X POST http://127.0.0.1:2113/admin/scavenge?threads=2 -u "admin:changeit"
+```
+
+### Threshold
+
+By default, all chunks that have events to be removed are scavenged.
+
+Setting this option allows you to scavenge only the chunks that have a sufficiently large number of events expected to be removed. This allows scavenge to run more quickly by focusing on the chunks that would benefit from it most. The weights of the chunks that are being scavenged or skipped can be found in the log files by searching for the term "with weight". The weight of a chunk is approximately twice the number of records that can be removed from it.
+
+Possible values for the threshold:
+
+- `-1`: Scavenge all chunks, even if there are no event to remove. This should not be necessary in practice.
+- `0`: Default value. Scavenges every chunk that has events to remove.
+- `> 0`: The minimum weight a chunk must have in order to be scavenged.
+
+Example:
+
+```bash
+curl -i -X POST http://127.0.0.1:2113/admin/scavenge?threshold=2000 -u "admin:changeit"
+```
+
+::: tip
+Setting a positive threshold means that not all deleted and expired events will be removed. This may be important to consider with respect to GDPR.
+:::
+
+### Throttle percent
+
+The scavenging process can be time-consuming and resource-intensive. You can control the speed and resource usage of the scavenge process using the `throttlePercent` option. When set to 100 (default value), the scavenge process runs at full speed. Setting it to 50 makes the process take twice as long by pausing regularly.
+
+A scavenge can be stopped and restarted with a different `throttlePercent`.
+
+For `throttlePercent` values:
+
+- Throttle percent must be between 1 and 100.
+
+- Throttle percent must be 100 for a multi-threaded scavenge.
+
+Example:
+
+```bash
+curl -i -X POST http://127.0.0.1:2113/admin/scavenge?throttlePercent=50 -u "admin:changeit"
+```
+
+### Sync-only
+
+The `syncOnly` option is a boolean value and is false by default. When true, it prevents the creation of a new scavenge point and will only run the scavenge if there is an existing scavenge point that has not yet been reached in a previous scavenged. After running a scavenge on one node, this flag can be used to ensure that a subsequent node scavenges to that same point.
+
+Example:
+
+```bash
+curl -i -X POST http://127.0.0.1:2113/admin/scavenge?syncOnly=true -u "admin:changeit"
+```
+
+### Start from chunk
+
+<Badge text="Deprecated" type="warning" vertical="middle"/>
+
+This option is deprecated. It is ignored and will be removed.
+
+## Scavenging database options
+
+Below you can find some options that change the way how scavenging works on the server node.
+
+### Disable chunk merging
+
+Scavenged chunks may be small enough to be merged into a single physical chunk file of approximately 256 MB. This behaviour can be disabled with this option.
+
+| Format               | Syntax                                |
+|:---------------------|:--------------------------------------|
+| Command line         | `--disable-scavenge-merging`          |
+| YAML                 | `DisableScavengeMerging`              |
+| Environment variable | `KURRENTDB_DISABLE_SCAVENGE_MERGING`  |
+
+**Default**: `false`, small scavenged chunks are merged together.
+
+### Scavenge history
+
+Each scavenge operation gets an ID and creates a stream. You might want to look at these streams to see the
+scavenge history, how much time each operation took, and how much disk space was reclaimed. However, you
+might not want to keep this history forever. Use the following option to limit how long the scavenge history
+stays in the database:
+
+| Format               | Syntax                                |
+|:---------------------|:--------------------------------------|
+| Command line         | `--scavenge-history-max-age`          |
+| YAML                 | `ScavengeHistoryMaxAge`               |
+| Environment variable | `KURRENTDB_SCAVENGE_HISTORY_MAX_AGE`  |
+
+**Default**: `30` (days)
+
+### Scavenge backend page size
+
+Specify the page size of the scavenge database. The default value is 16 KiB.
+
+| Format               | Syntax                                  |
+|:---------------------|:----------------------------------------|
+| Command line         | `--scavenge-backend-page-size`          |
+| YAML                 | `ScavengeBackendPageSize`               |
+| Environment variable | `KURRENTDB_SCAVENGE_BACKEND_PAGE_SIZE`  |
+
+**Default**: `16` (KiB)
+
+### Scavenge backend cache size
+
+Specify the amount of memory, in bytes, to use for backend caching during scavenging. The default value is 64 MiB.
+
+| Format               | Syntax                                   |
+|:---------------------|:-----------------------------------------|
+| Command line         | `--scavenge-backend-cache-size`          |
+| YAML                 | `ScavengeBackendCacheSize`               |
+| Environment variable | `KURRENTDB_SCAVENGE_BACKEND_CACHE_SIZE`  |
+
+### Scavenge hash users cache capacity
+
+Specify the number of stream hashes to remember when checking for collisions.
+If the accumulation phase is reporting a lot of cache misses, it may benefit from increasing this number.
+
+The default value is 100000.
+
+| Format               | Syntax                                          |
+|:---------------------|:------------------------------------------------|
+| Command line         | `--scavenge-hash-users-cache-capacity`          |
+| YAML                 | `ScavengeHashUsersCacheCapacity`                |
+| Environment variable | `KURRENTDB_SCAVENGE_HASH_USERS_CACHE_CAPACITY`  |
diff --git a/docs/server/quick-start/README.md b/docs/server/quick-start/README.md
new file mode 100644
index 00000000000..1c9fd2fbcd5
--- /dev/null
+++ b/docs/server/quick-start/README.md
@@ -0,0 +1,90 @@
+---
+order: 1
+headerDepth: 3
+dir:
+  text: "Quick Start"
+  expanded: true
+  order: 1
+---
+
+# Introduction
+
+Welcome to the KurrentDB documentation.
+
+KurrentDB is a database that's engineered for modern software applications and event-driven architectures. Its event-native design simplifies data modeling and preserves data integrity while the integrated streaming engine solves distributed messaging challenges and ensures data consistency.
+
+KurrentDB is licensed under [Kurrent License v1 (KLv1)](https://github.com/EventStore/EventStore/blob/master/LICENSE.md), meaning that anyone can access and use it, but enterprise features are only enabled with a valid [license key](./installation.md#license-keys).
+
+::: note
+Although the source code for KurrentDB is available to view, the [KLv1 license](https://github.com/EventStore/EventStore/blob/master/LICENSE.md) is not an OSI-approved Open Source License.
+:::
+
+## What's new
+
+Find out [what's new](whatsnew.md) in this release to get details on new features and other changes.
+
+## Getting started
+
+Check the [getting started guide](/getting-started/) for an introduction to KurrentDB and its features, along with detailed instructions to quickly get started.
+
+## Support
+
+### Community
+
+Users of KurrentDB can use the [community forum](https://www.kurrent.io/community) for questions, discussions, and getting help from community members.
+
+### Enterprise customers
+
+Customers with a paid subscription can open tickets using the [support portal](https://eventstore.freshdesk.com). For additional information on supported versions, users can access KurrentDB's [release and support schedule](../release-schedule/).
+
+### Issues
+
+We openly track most issues in the KurrentDB [repository on GitHub](https://github.com/EventStore/EventStore). Before opening an issue, please ensure that a similar issue hasn't been opened already. Also, try searching closed issues that might contain a solution or workaround for your problem.
+
+When opening an issue, follow our [guidelines](https://github.com/EventStore/EventStore/blob/master/CONTRIBUTING.md) for bug reports and feature requests. By doing so, you will significantly help us to solve your concerns most efficiently.
+
+## Protocols, clients, and SDKs
+
+KurrentDB supports one client protocol, which is described below. The older TCP client API has been removed in KurrentDB. The final version with TCP API support is EventStoreDB version 23.10. More information can be found in our [blog post](https://www.kurrent.io/blog/sunsetting-eventstoredb-tcp-based-client-protocol).
+
+The legacy protocol is available for Kurrent customers as a [licensed plugin](../configuration/networking.md#external-tcp).
+
+### Client protocol
+
+The client protocol is based on [open standards](https://grpc.io/) and is widely supported by many programming languages. KurrentDB uses gRPC to communicate between the cluster nodes and for client-server communication.
+
+When developing software that uses KurrentDB, we recommend using one of the official SDKs.
+
+#### Supported clients
+
+- Python: [pyeventsourcing/esdbclient](https://pypi.org/project/esdbclient/)
+- Node.js (JavaScript/TypeScript): [EventStore/EventStore-Client-NodeJS](https://github.com/EventStore/EventStore-Client-NodeJS)
+- Java: [(EventStore/EventStoreDB-Client-Java](https://github.com/EventStore/EventStoreDB-Client-Java)
+- .NET: [EventStore/EventStore-Client-Dotnet](https://github.com/EventStore/EventStore-Client-Dotnet)
+- Go: [EventStore/EventStore-Client-Go](https://github.com/EventStore/EventStore-Client-Go)
+- Rust: [EventStore/EventStoreDB-Client-Rust](https://github.com/EventStore/EventStoreDB-Client-Rust)
+
+Read more in the [gRPC clients documentation](@clients/grpc/README.md).
+
+#### Community-developed clients
+
+- [Ruby (yousty/event_store_client)](https://github.com/yousty/event_store_client)
+- [Elixir (NFIBrokerage/spear)](https://github.com/NFIBrokerage/spear)
+
+### HTTP
+
+KurrentDB also offers an HTTP-based interface that consists of the REST-oriented API and a real-time subscription feature based on the [AtomPub protocol](https://datatracker.ietf.org/doc/html/rfc5023). As it operates over HTTP, this is less efficient, but nearly every environment supports it.
+
+Learn more about configuring the HTTP protocol on the [HTTP configuration](../configuration/networking.md#http-configuration) page.
+
+::: warning Deprecation Note
+The current AtomPub-based HTTP application API is disabled by default. You can enable it by adding an [option](../configuration/networking.md#atompub) to the server configuration. Although we plan to remove AtomPub support from future server versions, the server management HTTP API will remain available.
+You need to enable the AtomPub protocol to have a fully functioning database user interface.
+:::
+
+Learn more about the KurrentDB HTTP interface in the [HTTP documentation](@clients/http-api/README.md). 
+
+#### Community-developed clients
+
+- [PHP (prooph/event-store-http-client)](https://github.com/prooph/event-store-http-client/)
+- [Ruby (yousty/event_store_client)](https://github.com/yousty/event_store_client)
diff --git a/docs/server/quick-start/default-directories.md b/docs/server/quick-start/default-directories.md
new file mode 100644
index 00000000000..5a17728b336
--- /dev/null
+++ b/docs/server/quick-start/default-directories.md
@@ -0,0 +1,45 @@
+---
+order: 4
+---
+
+# Default directories
+
+The default directories used by KurrentDB vary by platform to fit with the common practices each platform.
+
+## Linux
+
+When you install KurrentDB on Linux, the following locations apply:
+
+- **Application:** `/usr/bin`
+- **Content:** `/usr/share/kurrentdb`
+- **Configuration:** `/etc/kurrentdb/`
+- **Data:** `/var/lib/kurrentdb`
+- **Server logs:** `/var/log/kurrentdb`
+- **Test client logs:** `./testclientlog`
+- **Web content:** `./clusternode-web` then `{Content}/clusternode-web`
+- **Projections:** `./projections` then `{Content}/projections`
+- **Prelude:** `./Prelude` then `{Content}/Prelude`
+
+## Windows
+
+- **Configuration:** `./`
+- **Data:** `./data`
+- **Server logs:** `./logs`
+- **Test client log:** `./testclientlogs`
+- **Web content:** `./clusternode-web`
+- **Projections:** `./projections`
+- **Prelude:** `./Prelude`
+
+## Local binaries
+
+When running KurrentDB using local binaries, either downloaded or built from source, the server will use its location and place the necessary files inside it:
+
+- **Configuration:** `./`
+- **Data:** `./data`
+- **Server logs:** `./logs`
+- **Test client log:** `./testclientlogs`
+- **Web content:** `./clusternode-web`
+- **Projections:** `./projections`
+- **Prelude:** `./Prelude`
+
+Depending on the platform and installation type, the location of KurrentDB executables, configuration and other necessary files vary.
diff --git a/docs/images/upgrade-procedure.png b/docs/server/quick-start/images/upgrade-procedure.png
similarity index 100%
rename from docs/images/upgrade-procedure.png
rename to docs/server/quick-start/images/upgrade-procedure.png
diff --git a/docs/server/quick-start/installation.md b/docs/server/quick-start/installation.md
new file mode 100644
index 00000000000..94a767d9e24
--- /dev/null
+++ b/docs/server/quick-start/installation.md
@@ -0,0 +1,419 @@
+---
+title: "Installation"
+order: 3
+---
+
+<CloudBanner />
+
+## Quick start
+
+KurrentDB can run as a single node or as a highly-available cluster. For the cluster deployment, you'd need three server nodes.
+
+The installation procedure consists of the following steps:
+
+- Create a configuration file for each cluster node. If you are using any licensed features, ensure that you configure a [license key](#license-keys).
+- Install KurrentDB on each node using one of the available methods.
+- Obtain SSL certificates, either signed by a publicly trusted or private certificate authority.
+- Copy the configuration files and SSL certificates to each node.
+- Start the KurrentDB service on each node.
+- Check the cluster status using the Admin UI on any node.
+
+### Default access
+
+| User  | Password |
+|-------|----------|
+| admin | changeit |
+| ops   | changeit |
+
+### License Keys
+
+Some features of KurrentDB require a license key to access. When you purchase an enterprise subscription, the license key will be sent to your company's designated license administrator. Existing customers who would like to upgrade to a 24.10+ enterprise license should contact their Kurrent (formerly Event Store) account manager or contact us [here](https://www.kurrent.io/talk_to_expert). As an existing customer, you can also try the enterprise features by signing up for a [free trial license key](https://www.kurrent.io/kurrent_free_trial).
+
+There are various ways to provide the license key to KurrentDB. For more information, refer to the [configuration guide](../configuration/README.md).
+
+Configuration file:
+
+```yaml
+Licensing:
+  LicenseKey: Yourkey
+```
+
+Environment variable:
+
+```
+KURRENTDB_LICENSING__LICENSE_KEY
+```
+
+For most features that require a license, KurrentDB will not start if the feature is enabled but the license key is not provided or is invalid.
+
+## Package repositories
+
+Packages for KurrentDB are hosted on [Cloudsmith](https://cloudsmith.io/~eventstore), in the following repositories:
+
+* [kurrent-lts](https://cloudsmith.io/~eventstore/repos/kurrent-lts) containing only production-ready [LTS](../release-schedule/#long-term-support-releases) packages.
+* [kurrent-latest](https://cloudsmith.io/~eventstore/repos/kurrent-latest) containing production-ready LTS and [STS](../release-schedule/#short-term-support-releases) packages.
+* [kurrent-preview](https://cloudsmith.io/~eventstore/repos/kurrent-preview) containing non-production preview packages.
+
+## Linux
+
+KurrentDB has pre-built packages available on Cloudsmith for RedHat or Debian-based distributions.
+The name of the KurrentDB package is `kurrentdb`.
+
+### Ubuntu/Debian packages
+
+Debian packages can be found in the following repositories:
+
+* [kurrent-lts](https://cloudsmith.io/~eventstore/repos/kurrent-lts/packages/?q=format%3Adeb+name%3Akurrentdb) containing only production-ready [LTS](../release-schedule/#long-term-support-releases) packages.
+* [kurrent-latest](https://cloudsmith.io/~eventstore/repos/kurrent-latest/packages/?q=format%3Adeb+name%3Akurrentdb) containing production-ready LTS and [STS](../release-schedule/#short-term-support-releases) packages.
+* [kurrent-preview](https://cloudsmith.io/~eventstore/repos/kurrent-preview/packages/?q=format%3Adeb+name%3Akurrentdb) containing non-production preview packages.
+
+#### Distribution setup
+To install packages, you can quickly set up the repository automatically (recommended):
+
+::: tabs
+@tab kurrent-latest
+```bash
+curl -1sLf \
+  'https://packages.kurrent.io/public/kurrent-latest/setup.deb.sh' \
+  | sudo -E bash
+```
+@tab kurrent-lts
+```bash
+curl -1sLf \
+  'https://packages.kurrent.io/public/kurrent-lts/setup.deb.sh' \
+  | sudo -E bash
+```
+@tab kurrent-preview
+```bash
+curl -1sLf \
+  'https://packages.kurrent.io/public/kurrent-preview/setup.deb.sh' \
+  | sudo -E bash
+```
+:::
+
+If you need to force a specific distribution, release/version, architecture, or component (if supported), you can also do that (e.g. if your system is compatible but not identical):
+
+::: tabs
+@tab kurrent-latest
+```bash
+curl -1sLf \
+  'https://packages.kurrent.io/public/kurrent-latest/setup.deb.sh' \
+  | sudo -E distro=DISTRO codename=CODENAME arch=ARCH component=COMPONENT bash
+```
+@tab kurrent-lts
+```bash
+curl -1sLf \
+  'https://packages.kurrent.io/public/kurrent-lts/setup.deb.sh' \
+  | sudo -E distro=DISTRO codename=CODENAME arch=ARCH component=COMPONENT bash
+```
+@tab kurrent-preview
+```bash
+curl -1sLf \
+  'https://packages.kurrent.io/public/kurrent-preview/setup.deb.sh' \
+  | sudo -E distro=DISTRO codename=CODENAME arch=ARCH component=COMPONENT bash
+```
+:::
+
+Alternatively, you can find instructions to manually configure it yourself on Cloudsmith:
+* [kurrent-lts](https://cloudsmith.io/~eventstore/repos/kurrent-staging/setup/#formats-deb)
+* [kurrent-latest](https://cloudsmith.io/~eventstore/repos/kurrent-staging/setup/#formats-deb)
+* [kurrent-preview](https://cloudsmith.io/~eventstore/repos/kurrent-staging/setup/#formats-deb)
+
+#### Install with apt-get
+
+Install the package:
+
+```bash
+apt-get install kurrentdb=25.0.0
+```
+
+#### Uninstall with apt-get
+
+You can uninstall the package with:
+
+```bash
+apt-get remove kurrentdb
+```
+
+If you want to also remove any configuration files and user settings, use:
+
+```bash
+apt-get purge kurrentdb
+```
+
+### RedHat packages
+
+RedHat packages can be found in the following repositories:
+
+* [kurrent-lts](https://cloudsmith.io/~eventstore/repos/kurrent-lts/packages/?q=format%3Arpm+name%3Akurrentdb) containing only production-ready [LTS](../release-schedule/#long-term-support-releases) packages.
+* [kurrent-latest](https://cloudsmith.io/~eventstore/repos/kurrent-latest/packages/?q=format%3Arpm+name%3Akurrentdb) containing production-ready LTS and [STS](../release-schedule/#short-term-support-releases) packages.
+* [kurrent-preview](https://cloudsmith.io/~eventstore/repos/kurrent-preview/packages/?q=format%3Arpm+name%3Akurrentdb) containing non-production preview packages.
+
+#### Distribution setup
+
+To install packages, you can quickly set up the repository automatically (recommended):
+
+::: tabs
+@tab kurrent-latest
+```bash
+curl -1sLf \
+  'https://packages.kurrent.io/public/kurrent-latest/setup.rpm.sh' \
+  | sudo -E bash
+```
+@tab kurrent-lts
+```bash
+curl -1sLf \
+  'https://packages.kurrent.io/public/kurrent-lts/setup.rpm.sh' \
+  | sudo -E bash
+```
+@tab kurrent-preview
+```bash
+curl -1sLf \
+  'https://packages.kurrent.io/public/kurrent-preview/setup.rpm.sh' \
+  | sudo -E bash
+```
+:::
+
+If you need to force a specific distribution, release/version, or architecture, you can also do that (e.g. if your system is compatible but not identical):
+
+::: tabs
+@tab kurrent-latest
+```bash
+curl -1sLf \
+  'https://packages.kurrent.io/public/kurrent-latest/setup.rpm.sh' \
+  | sudo -E distro=DISTRO codename=CODENAME arch=ARCH bash
+```
+@tab kurrent-lts
+```bash
+curl -1sLf \
+  'https://packages.kurrent.io/public/kurrent-lts/setup.rpm.sh' \
+  | sudo -E distro=DISTRO codename=CODENAME arch=ARCH bash
+```
+@tab kurrent-preview
+```bash
+curl -1sLf \
+  'https://packages.kurrent.io/public/kurrent-preview/setup.rpm.sh' \
+  | sudo -E distro=DISTRO codename=CODENAME arch=ARCH bash
+```
+:::
+
+Alternatively, you can find instructions to manually configure it yourself on Cloudsmith:
+* [kurrent-latest](https://cloudsmith.io/~eventstore/repos/kurrent-latest/setup/#formats-rpm).
+* [kurrent-lts](https://cloudsmith.io/~eventstore/repos/kurrent-lts/setup/#formats-rpm).
+* [kurrent-preview](https://cloudsmith.io/~eventstore/repos/kurrent-preview/setup/#formats-rpm).
+
+#### Install with yum
+
+Install the package:
+
+```bash
+yum install kurrentdb-25.0.0-1.x86_64
+```
+
+#### Uninstall with yum
+
+You can uninstall the package with:
+
+```bash
+yum remove kurrentdb
+```
+
+### Running the kurrentdb service
+
+Once installed, the server is registered as a service. Therefore, you can start KurrentDB with:
+
+```bash
+systemctl start kurrentdb
+```
+
+When you install the KurrentDB package, the service doesn't start by default. This allows you to change the configuration located at `/etc/kurrentdb/kurrentdb.conf` and to prevent creating database and index files in the default location.
+
+::: warning
+We recommend that when using Linux you set the 'open file limit' to a high number. The precise value depends on your use case, but at least between `30,000` and `60,000`.
+:::
+
+## Windows
+
+::: warning
+KurrentDB doesn't install as a Windows service. You need to ensure that the server executable
+starts automatically.
+:::
+
+### NuGet
+
+KurrentDB has NuGet packages available on [Chocolatey](https://community.chocolatey.org/packages/kurrentdb).
+
+#### Install with Chocolatey
+
+You can install KurrentDB through Chocolatey:
+
+```powershell
+choco install kurrentdb --version=25.0.0
+```
+
+KurrentDB can then be run with `KurrentDB.exe`:
+
+```powershell
+KurrentDB.exe --config {your config file}
+```
+
+#### Uninstall with Chocolatey
+
+You can uninstall KurrentDB through Chocolatey with:
+
+```powershell
+choco uninstall kurrentdb
+```
+
+## Docker
+
+You can run KurrentDB in a Docker container as a single node, using insecure mode. It is useful in most
+cases to try out the product and for local development purposes.
+
+It's also possible to run a three-node cluster with or without SSL using Docker Compose. Such a setup is
+closer to what you'd run in production.
+
+KurrentDB Docker images are hosted in the following registries:
+
+* [kurrent-lts](https://cloudsmith.io/~eventstore/repos/kurrent-lts/packages/?q=format%3Adocker+name%3Akurrentdb) containing only production-ready [LTS](../release-schedule/#long-term-support-releases) containers.
+* [kurrent-latest](https://cloudsmith.io/~eventstore/repos/kurrent-latest/packages/?q=format%3Adocker+name%3Akurrentdb) containing production-ready LTS and [STS](../release-schedule/#short-term-support-releases) containers.
+* [kurrent-preview](https://cloudsmith.io/~eventstore/repos/kurrent-preview/packages/?q=format%3Adocker+name%3Akurrentdb) containing non-production preview containers.
+
+### Run with Docker
+
+Pull the container with:
+
+::: tabs
+@tab kurrent-latest
+```bash
+docker pull docker.kurrent.io/kurrent-latest/kurrentdb:latest
+```
+@tab kurrent-lts
+```bash
+docker pull docker.kurrent.io/kurrent-lts/kurrentdb:lts
+```
+@tab kurrent-preview
+```bash
+docker pull docker.kurrent.io/kurrent-preview/kurrentdb:latest
+```
+:::
+
+The following command will start the KurrentDB node using the default HTTP port, without security. You can then connect to it using one of the clients and the `kurrentdb://localhost:2113?tls=false` connection string. You can also access the Admin UI by opening http://localhost:2113 in your browser.
+
+::: tabs
+@tab kurrent-latest
+```bash
+docker run --name kurrentdb-node -it -p 2113:2113 \
+    docker.kurrent.io/kurrent-latest/kurrentdb --insecure --run-projections=All
+    --enable-atom-pub-over-http
+```
+@tab kurrent-lts
+```bash
+docker run --name kurrentdb-node -it -p 2113:2113 \
+    docker.kurrent.io/kurrent-lts/kurrentdb --insecure --run-projections=All
+    --enable-atom-pub-over-http
+```
+@tab kurrent-preview
+```bash
+docker run --name kurrentdb-node -it -p 2113:2113 \
+    docker.kurrent.io/kurrent-preview/kurrentdb --insecure --run-projections=All
+    --enable-atom-pub-over-http
+```
+:::
+
+Then, you'd be able to connect to KurrentDB with gRPC clients. Also, the Stream Browser will work
+in the Admin UI.
+
+In order to sustainably keep the data, we also recommend mapping the database and index volumes.
+
+### Use Docker Compose
+
+You can also run a single-node instance or a three-node secure cluster locally using Docker Compose.
+
+#### Insecure single node
+
+You can use Docker Compose to run KurrentDB in the same setup as the `docker run` command mentioned before.
+
+Create a file `docker-compose.yaml` with the following content:
+
+@[code{curl}](@samples/docker-compose.yaml)
+
+Run the instance:
+
+```bash
+docker compose up
+```
+
+The command above would run KurrentDB as a single node without SSL. You also get AtomPub protocol enabled, so you can get the stream browser to work in the Admin UI.
+
+::: warning
+The legacy TCP client protocol is disabled by default and is no longer be available from version 24.10. 
+:::
+
+#### Secure cluster
+
+With Docker Compose, you can also run a three-node cluster with security enabled. This kind of setup is
+something you'd expect to use in production.
+
+Create file `docker-compose.yaml` with following content:
+
+@[code{curl}](@samples/docker-compose-cluster.yaml)
+
+Quite a few settings are shared between the nodes and we use the `env` file to avoid repeating those settings.
+So, add the `vars.env` file to the same location:
+
+@[code{curl}](@samples/vars.env)
+
+Containers will use the shared volume using the local `./certs` directory for certificates. However, if you
+let Docker create the directory on startup, the container won't be able to get write access to it.
+Therefore, you should create the `certs` directory manually. You only need to do it once.
+
+```bash
+mkdir certs
+```
+
+Now you are ready to start the cluster.
+
+```bash
+docker compose up
+```
+
+Watching the log messages, you will see that after some time, the elections process completes. Then you're able to connect to each
+node using the Admin UI. Nodes should be accessible on the loopback address (`127.0.0.1` or `localhost`) over
+HTTP, using ports specified below:
+
+| Node  | HTTP port |
+|:------|:----------|
+| node1 | 2111      |
+| node2 | 2112      |
+| node3 | 2113      |
+
+You have to tell your client to use secure connection.
+
+| Protocol | Connection string                                                                  |
+|:---------|:-----------------------------------------------------------------------------------|
+| gRPC     | `kurrentdb://localhost:2111,localhost:2112,localhost:2113?tls=true&tlsVerifyCert=false` |
+
+As you might've noticed, the connection string has a setting to disable the certificate validation (`tlsVerifyCert=false`). It would prevent the invalid certificate error since the cluster uses a private, auto-generated CA.
+
+However, **we do not recommend using this setting in production**. Instead, you can either add the CA certificate to the trusted root CA store or instruct your application to use such a certificate. See the [security section](../security/protocol-security.md#certificate-installation-on-a-client-environment) for detailed instructions.
+
+## Kubernetes
+
+KurrentDB can be deployed and managed using the [Operator](/server/kubernetes-operator/).
+
+## Building from source
+
+You can also build [KurrentDB from source](https://github.com/EventStore/EventStore?tab=readme-ov-file#building-kurrentdb). Before doing that, you need to install the .NET 8 SDK. KurrentDB packages have the .NET Runtime embedded, so you don't need to install anything except the KurrentDB package.
+
+## Compatibility notes
+
+Depending on how your KurrentDB instance is configured, some features might not work. Below are some features that are unavailable due to the specified options.
+
+| Feature                       | Options impact                                                                                                                                                                          |
+|:------------------------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Connection without SSL or TLS | KurrentDB is secure by default. Your clients need to establish a secure connection, unless you use the `Insecure` option.                                                      |
+| Authentication and ACLs       | When using the `Insecure` option for the server, all security is disabled. The `Users` menu item is also disabled in the Admin UI.                                                      |
+| Projections                   | Running projections is disabled by default and the `Projections` menu item is disabled in the Admin UI. You need to enable projections explicitly by using the `RunProjections` option. |
+| AtomPub protocol              | The AtomPub protocol is disabled by default. If you use this protocol, you have to explicitly enable it by using the `EnableAtomPubOverHttp` option.                          |
+| Stream browser                | The stream browser feature in Admin UI depends on the AtomPub protocol and is greyed out by default. You need to enable AtomPub (previous line) to make the stream browser work.        |
diff --git a/docs/server/quick-start/upgrade-guide.md b/docs/server/quick-start/upgrade-guide.md
new file mode 100644
index 00000000000..99eaa12bbb0
--- /dev/null
+++ b/docs/server/quick-start/upgrade-guide.md
@@ -0,0 +1,408 @@
+---
+title: "Upgrade guide"
+order: 5
+---
+
+# Upgrade guide for KurrentDB 25.0
+
+Event Store – the company and the product – are rebranding as Kurrent.
+
+As part of this rebrand, EventStoreDB has been renamed to KurrentDB, with the first release of KurrentDB being version 25.0.
+
+Read more about the rebrand in the [rebrand FAQ](https://www.kurrent.io/blog/kurrent-re-brand-faq).
+
+Packages for KurrentDB are still hosted on [Cloudsmith](https://cloudsmith.io/~eventstore), in the following repositories:
+
+* [kurrent-lts](https://cloudsmith.io/~eventstore/repos/kurrent-lts) containing only production-ready [LTS](../release-schedule/#long-term-support-releases) packages.
+* [kurrent-latest](https://cloudsmith.io/~eventstore/repos/kurrent-latest) containing production-ready LTS and [STS](../release-schedule/#short-term-support-releases) packages.
+* [kurrent-preview](https://cloudsmith.io/~eventstore/repos/kurrent-preview) containing non-production preview packages.
+
+Packages are available for [Ubuntu/Debian](./installation.md#ubuntu-debian-packages), [RedHat](./installation.md#redhat-packages), [Docker](./installation.md#docker), and [NuGet](./installation.md#nuget).
+
+## Should you upgrade?
+
+KurrentDB 25.0 is a short term support (STS) feature release and will be supported until the next major or minor release of KurrentDB.
+
+Upgrade to this version if you want to use the new archiving feature, or want to prepare for some of the changes caused by the rebrand from EventStoreDB to KurrentDB.
+
+## Upgrade procedure
+
+You can perform an online rolling upgrade directly to KurrentDB 25.0 from these versions of EventStoreDB:
+- 24.10
+- 23.10
+- 22.10
+
+Follow the upgrade procedure below on each node, starting with a follower node:
+
+1. Stop the node.
+1. Uninstall any previous versions of EventStoreDB.
+1. Install KurrentDB 25.0 and update the configuration. If you use licensed features, ensure that you configure a [license key](../quick-start/installation.md#license-keys).
+1. Start the node.
+1. Wait for the node to become a follower or read-only replica.
+1. Repeat the process for the next node.
+
+Upgrading the cluster this way keeps the cluster online and able to service requests. There may still be disruptions to your services during the upgrade, namely:
+- Client connections may be disconnected when nodes go offline or elections occur.
+- The cluster is less fault-tolerant while a node is offline for an upgrade because the cluster requires a quorum of nodes to be online to service write requests.
+- Replicating large amounts of data to a node can have a performance impact on the Leader in the cluster.
+
+::: warning
+If you modified the Linux service file to increase the open files limit, those changes will be overridden during the upgrade. You will need to reapply them after the upgrade.
+:::
+
+## Breaking changes
+
+### File and location changes when upgrading from EventStoreDB
+
+You will need to take the following changes into account when upgrading from EventStoreDB:
+
+#### On Windows
+
+1. The executable `EventStore.ClusterNode.exe` has been renamed to `KurrentDB.exe`.
+1. The test client executable `EventStore.TestClient.exe` has been renamed to `KurrentDB.TestClient.exe`.
+
+#### On Linux
+
+1. The `eventstore` service has been renamed to `kurrentdb`.
+1. The `eventstored` executable has been renamed to `kurrentd`.
+1. The `eventstore` user has been renamed to `kurrent`.
+1. The default locations have changed from `eventstore` to `kurrentdb`:
+
+| Old location                      | New location                    | Description               |
+| --------------------------------- | ------------------------------- | ------------------------- |
+| `/etc/eventstore/eventstore.conf` | `/etc/kurrentdb/kurrentdb.conf` | Default config file       |
+| `/usr/bin/eventstored`            | `/usr/bin/kurrentd`             | Symlink to the executable |
+| `/var/lib/eventstore/`            | `/var/lib/kurrentdb/ `          | Default data directory    |
+| `/var/log/eventstore/`            | `/var/log/kurrentdb/`           | Default log directory     |
+| `/usr/share/eventstore/`          | `/usr/share/kurrentdb/`         | Installation directory    |
+
+If the following EventStore locations exist and the KurrentDB locations do not, KurrentDB will use the EventStore locations instead:
+
+- The default config file `/etc/kurrentdb/kurrentdb.conf` -> `/etc/eventstore/eventstore.conf`
+- The default data directory `/var/lib/kurrentdb/` -> `/var/lib/eventstore/`
+- The default log directory `/var/log/kurrentdb/` -> `/var/log/eventstore/`
+
+If you install KurrentDB through a package manager, it will create a default configuration file at `/etc/kurrentdb/kurrentdb.conf` for you and therefore won't fall back to the EventStore config file. You will need to copy any configuration over from `eventstore.conf` to `kurrentdb.conf`.
+
+::: warning
+If you are running KurrentDB as a service, you will need to grant the `kurrent` user access to any data, logs, or configuration directories that the `eventstore` user had access to.
+:::
+
+### Log Levels supported in logconfig.json
+
+The log levels specified in `logconfig.json` must now be Microsoft levels rather than Serilog levels.
+
+If you have customized your `logconfig.json` you will need to change `Fatal` to `Critical` and `Verbose` to `Trace`.
+[#4837](https://github.com/kurrent-io/EventStore/pull/4837)
+
+### Metrics name changes
+
+::: info
+The old EventStore metric names can still be used by changing the two meter names in `metricsconfig.json` to have `EventStore` prefixes:
+
+```diff
+  "Meters": [
+-    "KurrentDB.Core",
+-    "KurrentDB.Projections.Core"
++    "EventStore.Core",
++    "EventStore.Projections.Core"
+  ],
+```
+
+However, this functionality will eventually be removed in a future release.
+
+If you are using the Open Telemetry Collector, you may also need to set `add_metric_suffixes` to `false` in its configuration file:
+
+```
+exporters:
+  prometheus:
+    endpoint: "0.0.0.0:8889"
+    add_metric_suffixes: false
+```
+:::
+
+All of the `eventstore` prefixes have been changed to `kurrentdb`
+
+| Old name        | New name      |
+| --------------- | ------------- |
+| `eventstore_*`  | `kurrentdb_*` |
+
+The following metric names have had `_total` appended to the end when exposed in Prometheus format on the `/metrics` endpoint to match the spec:
+
+| Old name                                    | New name                                          |
+| ------------------------------------------- | ------------------------------------------------- |
+| `eventstore_cache_hits_misses`              | `kurrentdb_cache_hits_misses_total`               |
+| `eventstore_disk_io_bytes`                  | `kurrentdb_disk_io_bytes_total`                   |
+| `eventstore_disk_io_operations`             | `kurrentdb_disk_io_operations_total`              |
+| `eventstore_elections_count`                | `kurrentdb_elections_count_total`                 |
+| `eventstore_gc_collection_count`            | `kurrentdb_gc_collection_count_total`             |
+| `eventstore_incoming_grpc_calls`            | `kurrentdb_incoming_grpc_calls_total`             |
+| `eventstore_io_bytes`                       | `kurrentdb_io_bytes_total`                        |
+| `eventstore_io_events`                      | `kurrentdb_io_events_total`                       |
+| `eventstore_proc_contention_count`          | `kurrentdb_proc_contention_count_total`           |
+| `eventstore_proc_exception_count`           | `kurrentdb_proc_exception_count_total`            |
+| `eventstore_queue_busy_seconds`             | `kurrentdb_queue_busy_seconds_total`              |
+| `eventstore_persistent_sub_items_processed` | `kurrentdb_persistent_sub_items_processed_total`  |
+
+The following metric names have changed generally
+
+| Old name                        | New name                                |
+| ------------------------------- | --------------------------------------- |
+| `eventstore_gc_total_allocated` | `kurrentdb_gc_allocated_bytes_total`    |
+| `eventstore_proc_up_time`       | `kurrentdb_proc_up_time_seconds_total`  |
+
+### Removed configuration options
+
+A number of configuration options have been removed in 25.0. KurrentDB will not start by default if any of these options are present in the database configuration.
+
+The following options were renamed in EventStoreDB version 23.10. KurrentDB will no longer start if the deprecated option is present in the database configuration:
+
+| Deprecated Option             | Use Instead                     |
+| ----------------------------- | ------------------------------- |
+| `ExtIp`                       | `NodeIp`                        |
+| `ExtPort`                     | `NodePort`                      |
+| `HttpPortAdvertiseAs`         | `NodePortAdvertiseAs`           |
+| `ExtHostAdvertiseAs`          | `NodeHostAdvertiseAs`           |
+| `AdvertiseHttpPortToClientAs` | `AdvertiseNodePortToClientAs`   |
+| `IntIp`                       | `ReplicationIp`                 |
+| `IntTcpPort`                  | `ReplicationPort`               |
+| `IntTcpPortAdvertiseAs`       | `ReplicationTcpPortAdvertiseAs` |
+| `IntHostAdvertiseAs`          | `ReplicationHostAdvertiseAs`    |
+| `IntTcpHeartbeatTimeout`      | `ReplicationHeartbeatTimeout`   |
+| `IntTcpHeartbeatInterval`     | `ReplicationHeartbeatInterval`  |
+
+The following deprecated options were removed as they had no effect:
+
+- `AlwaysKeepScavenged`
+- `GossipOnSingleNode`
+- `DisableInternalTcpTls`
+- `OptimizeIndexMerge`
+
+### New OAuth redirect uri
+
+The new embedded web UI requires a new redirect uri in order to work with the OAuth plugin.
+
+If you use the OAuth plugin and the web UI, you will need to allow the `/signin-oidc` redirect uri in your identity server configuration in addition to the `/oauth/callback` uri.
+
+For example, if you had the following redirect uris configured in your identity server:
+
+```json
+"RedirectUris": [
+  "https://localhost:2113/oauth/callback",
+  "https://127.0.0.1:2113/oauth/callback"
+]
+```
+
+Then you would need to update it to this:
+
+```json
+"RedirectUris": [
+  "https://localhost:2113/signin-oidc",
+  "https://127.0.0.1:2113/signin-oidc",
+  "https://localhost:2113/oauth/callback",
+  "https://127.0.0.1:2113/oauth/callback"
+]
+```
+
+### From v24.6 and earlier
+
+#### Histograms endpoint has been removed
+
+The `/histogram/{name}` endpoint has been removed.
+
+Any tooling that relies on the histogram endpoint will receive a 404 when requesting this endpoint after upgrading.
+
+#### Support for v1 PTables has been removed
+
+Support for extremely old PTables (v1) has been removed.
+
+This will only affect databases created on EventStoreDB version 3.9.0 and before, and which have not upgraded their PTables since EventStoreDB version 3.9.0.
+
+PTables are automatically upgraded when merged or when the PTables are rebuilt. So, if your EventStoreDB has been running for some time on a version greater than 3.9.0, then you are unlikely to be affected by this change.
+
+If 32bit PTables are present, we detect them on startup and exit. If this happens, you can use a version between v3.9.0 and v24.10.0 to upgrade the PTables or rebuild the index.
+
+#### Otel Exporter commercial plugin configuration changes
+
+The configuration for this plugin is now nested in the `KurrentDB` subsection to ensure consistency with the other plugins. Additionally, this plugin used to be configured via JSON or environment variables, but it can now be configured directly in the server's main configuration.
+
+For example, an old JSON configuration file could look like this:
+
+```json
+{
+  "OpenTelemetry": {
+    "Otlp": {
+      "Endpoint": "http://localhost:4317"
+    }
+  }
+}
+```
+
+Which would now look like this:
+
+```json
+{
+  "KurrentDB": {
+    "OpenTelemetry": {
+      "Otlp": {
+        "Endpoint": "http://localhost:4317"
+      }
+    }
+  }
+}
+```
+
+And can instead be moved to the main config file like this:
+
+```yaml
+OpenTelemetry:
+  Otlp:
+    Endpoint: "http://localhost:4317"
+```
+
+#### User Certificates commercial plugin configuration changes
+
+The configuration for this plugin used to be nested in a subsection titled `Plugins`. This is no longer the case. Additionally, this plugin used to be configured via JSON or environment variables, but it can now be configured directly in the server's main configuration.
+
+For example, an old JSON configuration file could look like this:
+
+```json
+{
+  "EventStore": {
+    "Plugins": {
+      "UserCertificates": {
+        "Enabled": true
+      }
+    }
+  }
+}
+```
+
+Which would now look like this:
+
+```json
+{
+  "KurrentDB": {
+    "UserCertificates": {
+      "Enabled": true
+    }
+  }
+}
+```
+
+And can instead be moved to the main config file like this:
+
+```yaml
+UserCertificates:
+  Enabled: true
+```
+
+### From v23.10 and earlier
+
+#### External TCP API removed
+
+The external TCP API was removed in EventStoreDB 24.2.0. This affects external clients using the TCP API and its related configurations.
+
+::: tip
+KurrentDB 25.0 includes [a plugin](../configuration/networking.md#external-tcp) that enables the TCP client protocol. This plugin can only be used with a [license](../quick-start/installation.md#license-keys)
+:::
+
+A number of configuration options have been removed as part of this. KurrentDB will not start by default if any of the following options are present in the database configuration:
+
+- `AdvertiseTcpPortToClientAs`
+- `DisableExternalTcpTls`
+- `EnableExternalTcp`
+- `ExtHostAdvertiseAs`
+- `ExtTcpHeartbeatInterval`
+- `ExtTcpHeartbeatTimeout`
+- `ExtTcpPort`
+- `ExtTcpPortAdvertiseAs`
+- `NodeHeartbeatInterval`
+- `NodeHeartbeatTimeout`
+- `NodeTcpPort`
+- `NodeTcpPortAdvertiseAs`
+
+### From v22.10 and earlier
+
+The updates to anonymous access described in the [release notes](https://www.eventstore.com/blog/23.10.0-release-notes) have introduced some breaking changes. We have also removed, renamed, and deprecated some options in KurrentDB.
+
+None of these changes will prevent you from performing an online rolling upgrade of the cluster, but you will need to take them into account before you perform an upgrade.
+
+When upgrading from 22.10 and earlier, you will need to account for the following breaking changes:
+
+#### Clients must be authenticated by default
+
+We have disabled anonymous access to streams by default. This means that read and write requests from clients need to be authenticated.
+
+If you see authentication errors when connecting to KurrentDB after upgrading, please ensure that you either use default credentials on the connection or provide user credentials with the request itself.
+
+If you want to revert to the old behavior, you can enable the `AllowAnonymousStreamAccess` and `AllowAnonymousEndpointAccess` options in KurrentDB.
+
+#### Requests to the HTTP API must be authenticated by default
+
+Like with anonymous access to streams, anonymous access to the HTTP and gRPC endpoints has been disabled by default. The exceptions are the `/gossip`, `/info`, and `/ping` endpoints.
+
+Any tools or monitoring scripts accessing the HTTP endpoints (e.g., `/stats`) must make authenticated requests to KurrentDB.
+
+If you want to revert to the old behavior, you can enable the `AllowAnonymousStreamAccess` and `AllowAnonymousEndpointAccess` options in KurrentDB.
+
+#### PrepareCount and CommitCount options have been removed
+
+We have removed the `PrepareCount` and `CommitCount` options from KurrentDB. KurrentDB will fail if these options are present in the config on startup.
+
+These options did not have any effect and can be safely removed from your configuration file if you have them defined.
+
+#### Persistent subscriptions config event has been renamed
+
+We have renamed the event type used to store a persistent subscription configuration from `PersistentConfig1` to `$PersistentConfig`. This event type is a system event, so naming it as such will allow certain filters to exclude it correctly.
+
+If you have any tools or clients relying on this event type, you will need to update them before upgrading.
+
+## Deprecations
+
+### Configuration sections and prefixes
+
+The `EventStore` configuration section and configuration root has been renamed to `KurrentDB`.
+
+The `EVENTSTORE_` environment variable prefix has been changed to `KURRENTDB_`
+
+### Custom HTTP content types
+
+The `vnd.eventstore.*` content types have been renamed to `vnd.kurrent.*`:
+
+| Deprecated                                      | Use instead                                   |
+| ----------------------------------------------- | --------------------------------------------- |
+| `application/vnd.eventstore.atom+json`          | `application/vnd.kurrent.atom+json`           |
+| `application/vnd.eventstore.event+json`         | `application/vnd.kurrent.event+json`          |
+| `application/vnd.eventstore.events+json`        | `application/vnd.kurrent.events+json`         |
+| `application/vnd.eventstore.streamdesc+json`    | `application/vnd.kurrent.streamdesc+json`     |
+| `application/vnd.eventstore.competingatom+json` | `application/vnd.kurrent.competingatom+json`  |
+
+The `application/vnd.eventstore.atomsvc+json` content type has been removed and replaced with `application/vnd.kurrent.atomsvc+json`.
+
+Xml content types are unchanged.
+
+### Custom HTTP headers
+
+The `ES-*` HTTP headers have been renamed to `Kurrent-*`.
+
+Deprecated headers accepted by the server:
+
+| Deprecated            | Use instead               |
+| --------------------- | ------------------------- |
+| `ES-ExpectedVersion`  | `Kurrent-ExpectedVersion` |
+| `ES-RequireLeader`    | `Kurrent-RequireLeader`   |
+| `ES-RequireMaster`    | `Kurrent-RequireLeader`   |
+| `ES-ResolveLinkTos`   | `Kurrent-ResolveLinkTos`  |
+| `ES-LongPoll`         | `Kurrent-LongPoll`        |
+| `ES-TrustedAuth`      | `Kurrent-TrustedAuth`     |
+| `ES-HardDelete`       | `Kurrent-HardDelete`      |
+| `ES-EventId`          | `Kurrent-EventId`         |
+| `ES-EventType`        | `Kurrent-EventType`       |
+
+Deprecated headers provided by the server in certain responses:
+
+| Deprecated          | Use instead               |
+| ------------------- | ------------------------- |
+| `ES-Position`       | `Kurrent-Position`        |
+| `ES-CurrentVersion` | `Kurrent-CurrentVersion`  |
\ No newline at end of file
diff --git a/docs/server/quick-start/whatsnew.md b/docs/server/quick-start/whatsnew.md
new file mode 100644
index 00000000000..35a7878fae1
--- /dev/null
+++ b/docs/server/quick-start/whatsnew.md
@@ -0,0 +1,232 @@
+---
+order: 2
+---
+
+# What's New
+
+## New in 25.0
+
+These are the new features in KurrentDB 25.0:
+
+* [Archiving](#archiving)
+* [Connectors](#connectors)
+* [KurrentDB rebranding](#kurrentdb-rebranding)
+* [New embedded Web UI](#new-embedded-web-ui)
+* [New versioning scheme and release schedule](#new-versioning-scheme-and-release-schedule)
+
+### Archiving
+
+<Badge type="info" vertical="middle" text="License Required"/>
+
+KurrentDB 25.0 introduces the initial release of Archiving: a new major feature to reduce costs and increase scalability of a KurrentDB cluster.
+
+With the new Archiving feature, data is uploaded to cheaper storage such as Amazon S3 and then can be removed from the volumes attached to the cluster nodes. The volumes can be correspondingly smaller and cheaper. The nodes are all able to read the archive, and when a read request from a client requires data that is stored in the archive, the node retrieves that data from the archive transparently to the client.
+
+Refer to [the documentation](../features/archiving.md) for more information about archiving and instructions on how to set it up.
+
+### Connectors
+
+#### Data Protection
+
+We've introduced a comprehensive data protection system to enhance the security of your sensitive connector configurations.
+
+All connectors now use envelope encryption to automatically protect sensitive data such as passwords and tokens using industry-standard encryption techniques. This ensures your credentials remain secure during transmission.
+
+Setup is straightforward with token-based protection requiring minimal configuration. You can provide tokens directly in your configuration or via separate files for enhanced security in production environments.
+
+We've integrated a native Surge key vault that stores encryption keys directly within KurrentDB system streams but we will support more key vaults in the future.
+
+See the [Data Protection documentation](../features/connectors/features.md#data-protection) for complete setup instructions.
+
+### KurrentDB rebranding
+
+Event Store – the company and the product – are rebranding as Kurrent.
+
+As part of this rebrand, EventStoreDB has been renamed to KurrentDB, with the first release of KurrentDB being version 25.0.
+
+Read more about the rebrand in the [rebrand FAQ](https://www.kurrent.io/blog/kurrent-re-brand-faq).
+
+The KurrentDB packages are still hosted on [Cloudsmith](https://cloudsmith.io/~eventstore/repos/kurrent/packages/). Refer to [the upgrade guide](./upgrade-guide.md) to see what's changed between EventStoreDB and KurrentDB, or [the installation guide](./installation.md) for updated installation instructions.
+
+### New embedded Web UI
+
+In the new embedded Web UI you can see at a glance:
+
+- A summary of the cluster status
+- A summary of resource utilization
+- Recent log messages
+- Node configuration
+- License status
+
+### New versioning scheme and release schedule
+
+We are changing the version scheme with the first official release of KurrentDB.
+
+As before, there will be two categories of release:
+* Long term support (LTS) releases which are supported for a minimum of two years, with a two month grace period.
+* Short term support (STS) releases which are supported until the next LTS or STS release.
+
+The version number will now reflect whether a release is an LTS or feature release, rather than being based on the year and month. LTS releases will have _even_ major numbers, and STS releases will have _odd_ major numbers.
+
+#### Versioning scheme
+
+The new scheme is `Major.Minor.Patch` where:
+* `Major`
+    * Is _even_ for LTS releases.
+    * Is _odd_ for STS releases.
+* `Minor`
+    * Increments with scope changes or new features.
+    * Is typically `0` for LTS releases, but may be incremented in rare cases.
+* `Patch` for bug fixes.
+
+#### New release schedule
+
+The release schedule will be changing with the versioning scheme, given that the version numbers are no longer tied to the year and month:
+
+* LTS: Approximately one LTS release per year.
+* STS: Published as necessary when sets of features are ready.
+* Patch (LTS and STS): Published as necessary with bugfixes.
+
+[More information](../release-schedule/)
+
+#### New package repositories
+
+Packages for KurrentDB will still be published to [Cloudsmith](https://cloudsmith.io/~eventstore), into the following repositories:
+
+- [kurrent-lts](https://cloudsmith.io/~eventstore/repos/kurrent-lts) containing only production-ready [LTS](../release-schedule/#long-term-support-releases) packages.
+- [kurrent-latest](https://cloudsmith.io/~eventstore/repos/kurrent-latest) containing production-ready LTS and [STS](../release-schedule/#short-term-support-releases) packages.
+- [kurrent-preview](https://cloudsmith.io/~eventstore/repos/kurrent-preview) containing non-production preview packages.
+
+[More information](../quick-start/installation.md)
+
+## New in 24.10
+
+These are the new features that were added in EventStoreDB 24.10:
+
+* [Connectors](#connectors):
+    * Kafka
+    * MongoDB
+    * RabbitMQ
+    * HTTP
+* [Auto-scavenge](#auto-scavenge): Schedule and execute scavenges automatically across a cluster.
+* [Stream policy](#stream-policy): Define stream access policies based on stream prefixes rather than using stream ACLs.
+* [Encryption-at-rest](#encryption-at-rest): Encrypt EventStoreDB chunks to secure them against attackers with file access to the database.
+
+### Connectors
+
+We have improved and expanded on the Connectors preview introduced in 24.2.0.
+
+The Connectors feature is enabled by default.
+You can use the HTTP sink without a license, but a license is required for all other connectors.
+
+Refer to the [documentation](../features/connectors/README.md) for instructions on setting up and configuring connectors and sinks.
+
+#### Kafka sink
+
+<Badge type="info" vertical="middle" text="License Required"/>
+
+The Kafka sink writes events from EventStoreDB to a Kafka topic.
+
+It can extract the partition key from the record based on specific sources such as the stream ID, headers, or record key and also supports basic authentication and resilience
+features to handle transient errors.
+
+Refer to the [documentation](../features/connectors/sinks/kafka.md) for instructions on setting up a Kafka sink.
+
+#### MongoDB sink
+
+<Badge type="info" vertical="middle" text="License Required"/>
+
+The MongoDB sink pulls messages from an EventStoreDB stream and stores the messages to a collection.
+
+It supports data transformation for modifying event data or metadata and the inclusion of additional headers before sending messages to the MongoDB collection. It also supports at-least-once delivery and resilience features to handle transient errors.
+
+Refer to the [documentation](../features/connectors/sinks/mongo.md) for instructions on setting up a MongoDB sink.
+
+#### RabbitMQ sink
+
+<Badge type="info" vertical="middle" text="License Required"/>
+
+The RabbitMQ sink pulls messages from EventStoreDB and sends the messages to a RabbitMQ exchange using a specified routing key.
+
+It efficiently handles message delivery by abstracting the complexities of RabbitMQ's exchange and queue management, ensuring that messages are routed to the appropriate destinations based on the provided routing key.
+
+This sink is designed for high reliability and supports graceful error handling and recovery mechanisms to ensure consistent message delivery in a production environment.
+
+Refer to the [documentation](../features/connectors/sinks/rabbitmq.md) for instructions on setting up a RabbitMQ sink.
+
+#### HTTP sink
+
+The HTTP sink allows for integration between EventStoreDB and external
+APIs over HTTP or HTTPS. This connector consumes events from an EventStoreDB
+stream and converts each event's data into JSON format before sending it in the
+request body to a specified URL. Events are sent individually as they are
+consumed from the stream, without batching. The event data is transmitted as the
+request body, and metadata can be included as HTTP headers. The connector also
+supports Basic Authentication and Bearer Token Authentication.
+
+Refer to the [documentation](../features/connectors/sinks/http.md) for instructions on setting up an HTTP sink.
+
+#### Serilog sink
+
+The Serilog sink logs detailed messages about the connector and record details.
+
+Refer to the [documentation](../features/connectors/sinks/serilog.md) for instructions on setting up a Serilog sink.
+
+#### Data Protection
+
+We've introduced a comprehensive data protection system to enhance the security of your sensitive connector configurations.
+
+All connectors now use envelope encryption to automatically protect sensitive data such as passwords and tokens using industry-standard encryption techniques. This ensures your credentials remain secure during transmission.
+
+Setup is straightforward with token-based protection requiring minimal configuration. You can provide tokens directly in your configuration or via separate files for enhanced security in production environments.
+
+We've integrated a native Surge key vault that stores encryption keys directly within KurrentDB system streams but we will support more key vaults in the future.
+
+See the [Data Protection documentation](../features/connectors/features.md#data-protection) for complete setup instructions.
+
+### Auto-scavenge
+
+<Badge type="info" vertical="middle" text="License Required"/>
+
+The auto-scavenge feature automatically schedules _cluster scavenges_ which are composed of multiple _node scavenges_. Only one node scavenge can be executed at a time in the cluster. The auto-scavenge feature allows the scheduling of said _cluster scavenges_.
+
+The auto-scavenge feature requires a license to use. EventStoreDB will only start auto-scavenging once an administrator has set up a schedule for running cluster scavenges.
+
+Refer to the [documentation](../operations/auto-scavenge.md) for instructions on enabling and using this feature.
+
+### Stream policy
+
+<Badge type="info" vertical="middle" text="License Required"/>
+
+Define stream access policies in one place based on stream prefixes rather than using stream ACLs.
+
+Stream access policies can be created to grant users or groups read, write, delete, or metadata access.  These policies can be applied to streams based on their prefix or to system or user streams.
+
+The Stream Policy feature requires a license to use. Refer to the [documentation](../security/user-authorization.md#stream-policy-authorization) for more information about using and configuring this feature.
+
+### Encryption-at-rest
+
+<Badge type="info" vertical="middle" text="License Required"/>
+
+Encrypt EventStoreDB chunks to secure them against attackers with file access to the database.
+
+This feature aims to protect against an attacker who obtains access to the physical disk. In contrast to volume or filesystem encryption, file-level encryption provides some protection for attacks against the live system or remote exploits, as the plaintext data is not directly readable.
+
+The Encryption-at-rest feature requires a license to use and is disabled by default.
+If Encryption-at-rest is enabled, it is impossible to roll back to an unencrypted database after a new chunk has been created or if a chunk has been scavenged.
+
+Refer to the [documentation](../security/README.md#encryption-at-rest) for more information about using and configuring this feature.
+
+### Enterprise features now require a license key
+
+Customers can unlock the enterprise features of EventStoreDB with a license key. This applies to the previous commercial plugins and several of the new features in this release.
+
+You will need to provide a license key if you want to enable or use the following features:
+* Auto-scavenge
+* Kafka connectors
+* Stream Policies
+* Encryption-at-rest
+* Ldaps authentication
+* OAuth authentication
+* Logs Endpoint
+* OTLP Endpoint
diff --git a/docs/server/release-schedule/README.md b/docs/server/release-schedule/README.md
new file mode 100644
index 00000000000..f1afba3d875
--- /dev/null
+++ b/docs/server/release-schedule/README.md
@@ -0,0 +1,62 @@
+---
+dir:
+  text: "Release schedule"
+  order: 7
+---
+
+# Release schedule
+
+## KurrentDB versioning and release schedule
+
+There are two categories of release for KurrentDB:
+* Long term support (LTS) releases.
+* Short term support (STS) releases.
+
+The version number reflects whether a release is an LTS or STS release. LTS releases have _even_ major numbers, and STS releases have _odd_ major numbers.
+
+### Versioning scheme
+
+The version scheme for KurrentDB is `Major.Minor.Patch` where:
+
+* `Major`
+    * Is _even_ for LTS releases.
+    * Is _odd_ for STS releases.
+* `Minor`
+    * Increments with scope changes or new features.
+    * Is typically `0` for LTS releases, but may be incremented in rare cases.
+* `Patch` for bug fixes.
+
+As an example, the future releases of KurrentDB may look like this:
+
+| Version  | Type    | Description |
+|----------|---------|-------------|
+| `25.0.0` | STS     | The first release of KurrentDB. |
+| `25.1.0` | STS     | New features added. |
+| `26.0.0` | LTS     | The first LTS release of KurrentDB. |
+| `26.0.1` | LTS     | A patch to 26.0.0. |
+| `27.0.0` | STS     | New features added. |
+
+### Long term support releases
+
+There will be approximately one LTS release of KurrentDB per year.
+
+These versions will be supported for a minimum of two years, with a two month grace period for organizing upgrades when the LTS goes out of support.
+
+LTS versions of KurrentDB start with an even major number.
+
+### Short term support releases
+
+STS releases will be published as new features are added to KurrentDB.
+
+These versions will be supported until the next STS or LTS release of KurrentDB.
+
+STS versions of KurrentDB start with an odd major number.
+
+## Supported EventStoreDB versions
+
+EventStoreDB had a different versioning scheme to KurrentDB, where the LTS release always had a minor version of `10`.
+
+The LTS versions of EventStoreDB will still be supported for two years from their release date. This means the following versions of EventStoreDB are still within Kurrent's support window:
+
+* [EventStoreDB 24.10](https://docs.kurrent.io/server/v24.10/quick-start/) supported until October 2026.
+* [EventStoreDB 23.10](https://docs.kurrent.io/server/v23.10/quick-start/) supported until October 2025.
diff --git a/docs/server/release-schedule/release-notes.md b/docs/server/release-schedule/release-notes.md
new file mode 100644
index 00000000000..71dd32fff86
--- /dev/null
+++ b/docs/server/release-schedule/release-notes.md
@@ -0,0 +1,13 @@
+---
+order: 1
+---
+
+# Release notes
+
+This page contains the release notes for KurrentDB 25.0
+
+## [25.0.0](https://github.com/EventStore/EventStore/releases/tag/v25.0.0)
+
+25 March 2025
+
+Find out [what's new](../quick-start/whatsnew.md) in this release.
diff --git a/docs/server/security/README.md b/docs/server/security/README.md
new file mode 100644
index 00000000000..6322a7b3f1e
--- /dev/null
+++ b/docs/server/security/README.md
@@ -0,0 +1,218 @@
+---
+dir:
+  text: Security
+  order: 3
+title: Security options
+---
+
+# Security
+
+For production use, it is important to configure KurrentDB security features to prevent unauthorised access
+to your data.
+
+Security features of KurrentDB include:
+
+- [Encryption in-flight](./protocol-security.md) using HTTPS and TLS
+- [User authentication](./user-authentication.md) for allowing users with different roles to access the database
+- [User authorization](./user-authorization.md) to restrict access to specific event streams
+- [Encryption-at-rest](#encryption-at-rest) to protect data on disk
+- [FIPS compatibility](#fips-140-2) to allow running KurrentDB on FIPS-enabled operating systems
+
+## Configuration options
+
+Below you can find more details about each of the available security options.
+
+### Running without security
+
+KurrentDB is secure by default. It means that you have to supply valid certificates and configuration for the database node to work.
+
+We realise that many users want to try out the latest version with their existing applications without any security in their internal networks.
+
+For this to work, you can use the `Insecure` option:
+
+| Format               | Syntax                |
+|:---------------------|:----------------------|
+| Command line         | `--insecure`          |
+| YAML                 | `Insecure`            |
+| Environment variable | `KURRENTDB_INSECURE`  |
+
+**Default**: `false`
+
+::: warning
+When running with protocol security disabled, everything is sent unencrypted over the wire. To make things explicit, KurrentDB **does not use any authentication and authorisation** (including ACLs) when running insecure.
+:::
+
+### Set initial passwords
+
+You can set the admin and ops passwords on the first run of the database. This will not impact the existing credentials, the user can log into their accounts with exising passwords. Additionally, this will only take effect if you are using [basic authentication](./user-authentication.md#basic-authentication).
+
+Set the password for the `admin` user with the `DefaultAdminPassword` option:
+
+| Format               | Syntax                              |
+|:---------------------|:------------------------------------|
+| Environment variable | `KURRENTDB_DEFAULT_ADMIN_PASSWORD`  |
+
+**Default**: `changeit`
+
+And set the password for the `ops` user with the `DefaultOpsPassword` option:
+
+| Format               | Syntax                              |
+|:---------------------|:------------------------------------|
+| Environment variable | `KURRENTDB_DEFAULT_OPS_PASSWORD`    |
+
+**Default**: `changeit`
+
+::: warning
+Due to security reasons the `DefaultAdminPassword` and `DefaultOpsPassword` options can only be set through environment variables. The user will receive the error message if they try to pass the options using command line or config file.
+:::
+
+### Anonymous access to streams
+
+Historically, anonymous users with network access have been allowed to read/write streams that do not have access control lists.
+
+This is now disabled by default but can be enabled by setting `AllowAnonymousStreamAccess` to `true`.
+
+| Format               | Syntax                                     |
+|:---------------------|:-------------------------------------------|
+| Command line         | `--allow-anonymous-stream-access`          |
+| YAML                 | `AllowAnonymousStreamAccess`               |
+| Environment variable | `KURRENTDB_ALLOW_ANONYMOUS_STREAM_ACCESS`  |
+
+**Default**: `false`
+
+### Anonymous access to endpoints
+
+Similarly to streams above, anonymous access has historically been available to some http endpoints.
+
+Anonymous access to `/gossip`, `/stats` and the `HTTP OPTIONS` method can now be configured with the following two options. By default `/gossip` is still accessible anonymously but the others are not. Some clients currently rely on anonymous access to `/gossip`. This will likely change in the future.
+
+The `AllowAnonymousEndpointAccess` option controls anonymous access to these endpoints. Setting `OverrideAnonymousEndpointAccessForGossip` to `true` allows anonymous access to `/gossip` specifically, overriding the other option.
+
+| Format               | Syntax                                       |
+|:---------------------|:---------------------------------------------|
+| Command line         | `--allow-anonymous-endpoint-access`          |
+| YAML                 | `AllowAnonymousEndpointAccess`               |
+| Environment variable | `KURRENTDB_ALLOW_ANONYMOUS_ENDPOINT_ACCESS`  |
+
+**Default**: `false`
+
+| Format               | Syntax                                                     |
+|:---------------------|:-----------------------------------------------------------|
+| Command line         | `--override-anonymous-endpoint-access-for-gossip`          |
+| YAML                 | `OverrideAnonymousEndpointAccessForGossip`                 |
+| Environment variable | `KURRENTDB_OVERRIDE_ANONYMOUS_ENDPOINT_ACCESS_FOR_GOSSIP`  |
+
+**Default**: `true`
+
+::: tip
+Anonymous access is still always granted to `/ping`, `/info`, the static content of the UI, and http redirects.
+:::
+
+## FIPS 140-2 
+
+KurrentDB runs on FIPS 140-2 enabled operating systems.
+
+The Federal Information Processing Standards (FIPS) of the United States are a set of publicly announced standards that the National Institute of Standards and Technology (NIST) has developed for use in computer systems of non-military United States government agencies and contractors.
+
+The 140 series of FIPS (FIPS 140) are U.S. government computer security standards that specify requirements for cryptography modules.
+
+To run KurrentDB on FIPS 140-2 enabled operating systems, the following is required:
+
+1. The node's certificates & keys must be FIPS 140-2 compatible
+    - Our certificate generation tool, [es-gencert-cli](https://github.com/EventStore/es-gencert-cli/releases), generates FIPS 140-2 compatible certificates & keys as from version 1.2.0 (only the linux build).
+    - If you want to manually generate your certificates or keys with openssl, you must use openssl 3 or later.
+    - If you want to use PKCS #12 bundles (.p12/.pfx extension), you must use a FIPS 140-2 compatible encryption algorithm (e.g AES-256) & hash algorithm (e.g SHA-256) to encrypt the bundle's contents.
+
+Note that KurrentDB will also likely run properly on FIPS 140-3 compliant operating systems with the above steps but this cannot reliably be confirmed at the moment as FIPS 140-3 certification is still ongoing for the operating systems themselves.
+
+## Encryption-At-Rest
+
+<Badge type="info" vertical="middle" text="License Required"/>
+
+The Encryption-At-Rest feature allows users to encrypt their KurrentDB database. Currently, only chunk files are encrypted - the indexes are not. The primary objective is to protect against an attacker who obtains access to the physical disk. In contrast to volume or filesystem encryption, file level encryption provides some degree of protection for attacks against the live system or remote exploits as the plaintext data is not directly readable. Protecting against memory-dump based attacks is out of the scope of this feature.
+
+You require a [license key](../quick-start/installation.md#license-keys) to use this feature.
+
+### Encryption Algorithm
+
+Data is encrypted using a symmetric-key encryption algorithm.
+
+
+The feature is designed to support different encryption algorithms. Currently, the following encryption algorithms are implemented:
+- `AesGcm` - Advanced Encryption Standard (AES) Galois Counter Mode (GCM)
+  - The default key size is 256 bits, but 128-bit and 192-bit keys are also supported.
+
+### Master Key
+
+The `master` key is the topmost key in the key hierarchy.
+
+The size of the master key is not defined but it needs to be long enough (e.g at least 128 bits) to provide reasonable security.
+
+Using a key-derivation function (HKDF in our case), the master key is used to derive multiple `data` keys. Each `data` key is used to encrypt a single chunk file. If the `master` key is compromised, the whole database can be decrypted. However, if a `data` key is compromised, only one chunk file can be decrypted.
+
+Usually, only one `master` key should be necessary. However, to cater for scenarios where a `master` key is compromised, the feature supports loading multiple `master` keys. The latest `master` key is actively used to encrypt/decrypt new chunks, while old `master` keys are used only to decrypt old chunks - thus the new data is secure.
+
+### Master Key Source
+
+The function of a master key source is to load master keys.
+
+Master keys are loaded from the source only once at process startup. They are then kept in memory throughout the lifetime of the process.
+
+The feature is designed to support different master key sources. Currently, the following master key sources are implemented:
+- `File` - loads master keys from a directory
+  - The master key can be generated using [es-cli](https://cloudsmith.io/~eventstore/repos/eventstore/packages/?q=es-cli) with the command: `es-cli encryption generate-master-key`
+  - For proper security, the master key files must be located on a drive other than where the database files are.
+  - This master key source is not recommended to be used in production as it provides minimal protection.
+
+You can contact Kurrent if you want us to support a particular master key source.
+
+### Configuration
+
+Refer to the [configuration guide](../configuration/README.md) for configuration mechanisms other than YAML.
+
+Sample configuration:
+
+```yaml
+Transform: aes-gcm
+
+EncryptionAtRest:
+  Enabled: true
+  MasterKey:
+    File:
+      KeyPath: /path/to/keys/
+  Encryption:
+    AesGcm:
+      Enabled: true
+      KeySize: 256 # optional. supported key sizes: 128, 192, 256 (default)
+```
+
+When using the `File` master key source, a master key must be generated using the es-genkey-cli tool and placed in the configured `KeyPath` directory. The master key having the highest ID will be chosen as the active one.
+
+Once the feature is enabled, the server should log messages similar to the following:
+
+```
+...
+[141828, 1,11:42:45.325,INF] Encryption-At-Rest: Loaded master key source: "File"
+[141828, 1,11:42:45.340,INF] Encryption-At-Rest: (File) Loaded master key: 2 (256 bits)
+[141828, 1,11:42:45.340,INF] Encryption-At-Rest: (File) Loaded master key: 1 (256 bits)
+[141828, 1,11:42:45.345,INF] Encryption-At-Rest: Active master key ID: 2
+[141828, 1,11:42:45.345,INF] Encryption-At-Rest: Loaded encryption algorithm: "AesGcm"
+[141828, 1,11:42:45.347,INF] Encryption-At-Rest: (AesGcm) Using key size: 256 bits
+[141828, 1,11:42:45.401,INF] Loaded the following transforms: Identity, Encryption_AesGcm
+[141828, 1,11:42:45.402,INF] Active transform set to: Encryption_AesGcm
+...
+```
+
+New and scavenged chunks will be encrypted.
+
+### Compatibility
+
+When encryption is enabled, it's no longer possible to revert back to an unencrypted database if:
+- at least one new chunk file has been created or
+- at least one chunk has been scavenged
+
+The encrypted chunks would first need to be decrypted before a user can revert to the `identity` transform. Special tooling or endpoints are not currently available to do this.
+
+### Tutorial
+
+[Learn how to set up and use Encryption-At-Rest in KurrentDB through a tutorial.](/tutorials/Encryption-At-Rest.md)
diff --git a/docs/server/security/protocol-security.md b/docs/server/security/protocol-security.md
new file mode 100644
index 00000000000..aadd72ee003
--- /dev/null
+++ b/docs/server/security/protocol-security.md
@@ -0,0 +1,454 @@
+---
+title: Protocol security
+order: 1
+---
+
+# Protocol security
+
+KurrentDB supports gRPC and the proprietary TCP protocol for high-throughput real-time communication. It
+also has some HTTP endpoints for the management operations like scavenging, creating projections and so on.
+KurrentDB also uses HTTP for the gossip seed endpoint, both for the cluster gossip, and
+for clients that connect to the cluster using discovery mode.
+
+All those protocols support encryption with TLS and SSL. You can only use one set of certificates for both TLS and HTTPS.
+
+The protocol security configuration depends a lot on the deployment topology and platform. We have created an
+interactive [configuration tool](https://configurator.eventstore.com), which also has instructions on how to generate and install
+the certificates and configure KurrentDB nodes to use them.
+
+## Certificates configuration
+
+In this section, you can find settings related to configuring the certificates for protocol security (HTTPS and TLS).
+
+### Certificate common name
+
+SSL certificates can be created with a common name (CN), which is an arbitrary string. Usually it contains the DNS name for which the certificate is issued.
+
+When cluster nodes connect to each other, they need to ensure that they indeed talk to another node and not something that pretends to be a node. To achieve that, KurrentDB authenticates a connecting node by ensuring that it supplies a trusted client certificate having a CN that matches exactly with the CN in its own certificate. This essentially means that the CN must be the same across all node certificates by default. For example, when using the [certificate generator](#certificate-generation-tool), the CN is set to `eventstoredb-node` in all node certificates.
+
+::: note
+KurrentDB will automatically read the CN from the node's certificate and use it as the `CertificateReservedNodeCommonName` by default. However, if you still choose to specify the `CertificateReservedNodeCommonName` in your configuration, it will take precedence.
+:::
+
+In practice, it's not always possible to obtain certificates where the CN is the same across all nodes. For instance, when using a public CA, single-domain certificates are very common and these certificates cannot be used on multiple nodes as they are valid for exactly one host. In this case, the `CertificateReservedNodeCommonName` setting can be configured with a wildcard as per the following example:
+
+If the domains are `node1.kurrentdb.mycompany.org`, `node2.kurrentdb.mycompany.org` and `node3.kurrentdb.mycompany.org`, then `CertificateReservedNodeCommonName` must be set to `*.kurrentdb.mycompany.org`.
+
+| Format               | Syntax                                             |
+|:---------------------|:---------------------------------------------------|
+| Command line         | `--certificate-reserved-node-common-name`          |
+| YAML                 | `CertificateReservedNodeCommonName`                |
+| Environment variable | `KURRENTDB_CERTIFICATE_RESERVED_NODE_COMMON_NAME`  |
+
+::: warning
+Server certificates **must** have the internal and external IP addresses (`ReplicationIp` and `NodeIp` respectively) or DNS names as subject alternative names.
+:::
+
+### Trusted root certificates
+
+When getting an incoming connection, the server needs to ensure if the certificate used for the connection can be trusted. For this to work, the server needs to know where trusted root certificates are located.
+
+KurrentDB will use the default trusted root certificates location of `/etc/ssl/certs` when running on Linux only. So if you are running on Windows or a platform with a different default certificates location, you'd need to explicitly tell the node to use the OS default root certificate store. For certificates signed by a private CA, you just provide the path to the CA certificate file (but not the filename).
+
+If you are running on Windows, you can also load the trusted root certificate from the Windows Certificate Store. The available options for configuring this are described [below](#certificate-store-windows).
+
+| Format               | Syntax                                      |
+|:---------------------|:--------------------------------------------|
+| Command line         | `--trusted-root-certificates-paths`         |
+| YAML                 | `TrustedRootCertificatesPath`               |
+| Environment variable | `KURRENTDB_TRUSTED_ROOT_CERTIFICATES_PATH`  |
+
+**Default**: n/a on Windows, `/etc/ssl/certs` on Linux
+
+### Certificate file
+
+The `CertificateFile` setting needs to point to the certificate file, which will be used by the cluster node.
+
+| Format               | Syntax                        |
+|:---------------------|:------------------------------|
+| Command line         | `--certificate-file`          |
+| YAML                 | `CertificateFile`             |
+| Environment variable | `KURRENTDB_CERTIFICATE_FILE`  |
+
+If the certificate file is protected by password, you'd need to set the `CertificatePassword` value accordingly, so the server can load the certificate.
+
+| Format               | Syntax                            |
+|:---------------------|:----------------------------------|
+| Command line         | `--certificate-password`          |
+| YAML                 | `CertificatePassword`             |
+| Environment variable | `KURRENTDB_CERTIFICATE_PASSWORD`  |
+
+If the certificate file doesn't contain the certificate private key, you need to tell the node where to find the key file using the `CertificatePrivateKeyFile` setting. The private key can be in RSA, or PKCS8 format.
+
+| Format               | Syntax                                    |
+|:---------------------|:------------------------------------------|
+| Command line         | `--certificate-private-key-file`          |
+| YAML                 | `CertificatePrivateKeyFile`               |
+| Environment variable | `KURRENTDB_CERTIFICATE_PRIVATE_KEY_FILE`  |
+
+If the private key file is an encrypted PKCS #8 file, then you need to provide the password with the `CertificatePrivateKeyPassword` option.
+
+| Format               | Syntax                                        |
+|:---------------------|:----------------------------------------------|
+| Command line         | `--certificate-private-key-password`          |
+| YAML                 | `CertificatePrivateKeyPassword`               |
+| Environment variable | `KURRENTDB_CERTIFICATE_PRIVATE_KEY_PASSWORD`  |
+
+
+### Certificate store (Windows)
+
+The certificate store location is the location of the Windows certificate store, for example `CurrentUser`.
+
+| Format               | Syntax                                  |
+|:---------------------|:----------------------------------------|
+| Command line         | `--certificate-store-location`          |
+| YAML                 | `CertificateStoreLocation`              |
+| Environment variable | `KURRENTDB_CERTIFICATE_STORE_LOCATION`  |
+
+The certificate store name is the name of the Windows certificate store, for example `My`.
+
+| Format               | Syntax                              |
+|:---------------------|:------------------------------------|
+| Command line         | `--certificate-store-name`          |
+| YAML                 | `CertificateStoreName`              |
+| Environment variable | `KURRENTDB_CERTIFICATE_STORE_NAME`  |
+
+You can load a certificate using either its thumbprint or its subject name.
+If using the thumbprint, the server expects to only find one certificate file matching that thumbprint in the cert store.
+
+| Format               | Syntax                              |
+|:---------------------|:------------------------------------|
+| Command line         | `--certificate-thumbprint`          |
+| YAML                 | `CertificateThumbprint`             |
+| Environment variable | `KURRENTDB_CERTIFICATE_THUMBPRINT`  |
+
+The subject name matches any certificate that contains the specified name. This means that multiple matching certificates could be found.
+To match any certificate made by the `es-gencert-cli` tool, you can set the subject name to `eventstoredb-node`.
+
+If multiple matching certificates are found, then the certificate with the latest expiry date will be selected.
+
+| Format               | Syntax                                |
+|:---------------------|:--------------------------------------|
+| Command line         | `--certificate-subject-name`          |
+| YAML                 | `CertificateSubjectName`              |
+| Environment variable | `KURRENTDB_CERTIFICATE_SUBJECT_NAME`  |
+
+When you are loading your node certificates from the Windows cert store, you are likely to want to load the trusted root certificate from the cert store as well.
+The options to configure this are similar to the ones for node certificates.
+
+The trusted root certificate store location is the location of the Windows certificate store in which the trusted root certificate is installed, for example `CurrentUser`.
+
+| Format               | Syntax                                               |
+|:---------------------|:-----------------------------------------------------|
+| Command line         | `--trusted-root-certificate-store-location`          |
+| YAML                 | `TrustedRootCertificateStoreLocation`                |
+| Environment variable | `KURRENTDB_TRUSTED_ROOT_CERTIFICATE_STORE_LOCATION`  |
+
+The trusted root certificate store name is the name of the Windows certificate store in which the trusted root certificate is installed, for example `Root`.
+
+| Format               | Syntax                                           |
+|:---------------------|:-------------------------------------------------|
+| Command line         | `--trusted-root-certificate-store-name`          |
+| YAML                 | `TrustedRootCertificateStoreName`                |
+| Environment variable | `KURRENTDB_TRUSTED_ROOT_CERTIFICATE_STORE_NAME`  |
+
+Trusted root certificates can also be loaded using either its thumbprint or its subject name.
+If using the thumbprint, the server expects to only find one trusted root certificate file matching that thumbprint in the cert store.
+
+| Format               | Syntax                                           |
+|:---------------------|:-------------------------------------------------|
+| Command line         | `--trusted-root-certificate-thumbprint`          |
+| YAML                 | `TrustedRootCertificateThumbprint`               |
+| Environment variable | `KURRENTDB_TRUSTED_ROOT_CERTIFICATE_THUMBPRINT`  |
+
+The subject name matches any certificate that contains the specified name. This means that multiple matching certificates could be found.
+To match any root certificate made through the `es-gencert-cli` tool, you can set the Subject Name to `EventStoreDB CA`.
+
+If multiple matching root certificates are found, then the root certificate with the latest expiry date will be selected.
+
+| Format               | Syntax                                             |
+|:---------------------|:---------------------------------------------------|
+| Command line         | `--trusted-root-certificate-subject-name`          |
+| YAML                 | `TrustedRootCertificateSubjectName`                |
+| Environment variable | `KURRENTDB_TRUSTED_ROOT_CERTIFICATE_SUBJECT_NAME`  |
+
+## Certificate generation tool
+
+Kurrent provides the interactive Certificate Generation CLI, which creates certificates signed by a private, auto-generated CA for KurrentDB. You can use the [configuration wizard](https://configurator.eventstore.com), that will provide you exact CLI commands that you need to run to generate certificates matching your configuration.
+
+### Getting started
+
+The CLI is available from its [GitHub Repository](https://github.com/EventStore/es-gencert-cli). The latest release can be found under the [GitHub releases page.](https://github.com/EventStore/es-gencert-cli/releases)
+
+We're releasing binaries for Windows, Linux and macOS. We also publish the tool as a Docker image.
+
+Basic usage for the Certificate Generation CLI:
+
+```bash
+./es-gencert-cli [options] <command> [args]
+```
+
+Getting help for a specific command:
+
+```bash
+./es-gencert-cli -help <command>
+```
+
+::: warning
+If you are running KurrentDB on Linux, remember that all certificate files should have restrictive rights, otherwise the OS won't allow using them.
+Usually, you'd need to change rights for each certificate file to prevent the "permissions are too open" error.
+
+You can do it by running the following command:
+
+```bash
+chmod 600 [file]
+```
+:::
+
+### Generating the CA certificate
+
+As the first step CA certificate needs to be generated. It'll need to be trusted for each of the nodes and client environment.
+
+By default, the tool will create the `ca` directory in the `certs` directory you created. Two keys will be generated:
+- `ca.crt` - public file that need to be used also for the nodes and client configuration,
+- `ca.key` - private key file that should be used only in the node configuration. **Do not copy it to client environment**.
+
+CA certificate will be generated with pre-defined CN `eventstoredb-node`.
+
+To generate CA certificate run:
+
+```bash
+./es-gencert-cli create-ca
+```
+
+You can customise generated cert by providing following params:
+
+| Param   | Description                                                       |
+|:--------|:------------------------------------------------------------------|
+| `-days` | The validity period of the certificate in days (default: 5 years) |
+| `-out`  | The output directory (default: ./ca)                              |
+
+Example:
+
+```bash
+./es-gencert-cli create-ca -out ./kurrentdb-ca
+```
+
+### Generating the Node certificate
+
+You need to generate certificates signed by the CA for each node. They should be installed only on the specific node machine.
+
+By default, the tool will create the `ca` directory in the `certs` directory you created. Two keys will be generated:
+- `node.crt` - the public file that needs to be also used for the nodes and client configuration,
+- `node.key` - the private key file that should be used only in the node's configuration. **Do not copy it to client environment**.
+
+To generate node certificate run command:
+
+```bash
+./es-gencert-cli -help create_node
+```
+
+You can customise generated cert by providing following params:
+
+| Param             | Description                                                                   |
+|:------------------|:------------------------------------------------------------------------------|
+| `-ca-certificate` | The path to the CA certificate file (default: `./ca/ca.crt`)                  |
+| `-ca-key`         | The path to the CA key file (default: `./ca/ca.key`)                          |
+| `-days`           | The output directory (default: `./nodeX` where X is an auto-generated number) |
+| `-out`            | The output directory (default: `./ca`)                                        |
+| `-ip-addresses`   | Comma-separated list of IP addresses of the node                              |
+| `-dns-names`      | Comma-separated list of DNS names of the node                                 |
+
+::: warning
+While generating the certificate, you need to remember to pass internal end external:
+- IP addresses to `-ip-addresses`: e.g. `127.0.0.1,172.20.240.1` and/or
+- DNS names to `-dns-names`: e.g. `localhost,node1.kurrentdb`
+  that will match the URLs that you will be accessing KurrentDB nodes.
+  :::
+
+Sample:
+
+```
+./es-gencert-cli-cli create-node \
+    -ca-certificate ./kurrentdb-ca/ca.crt \
+    -ca-key ./kurrentdb-ca/ca.key \
+    -out ./node1 \
+    -ip-addresses 127.0.0.1,172.20.240.1 \
+    -dns-names localhost,node1.kurrentdb
+```
+
+### Running with Docker
+
+You could also run the tool using Docker interactive container:
+
+```bash
+docker run --rm -i eventstore/es-gencert-cli <command> <options>
+```
+
+One useful scenario is to use the Docker Compose file tool to generate all the necessary certificates before starting cluster nodes.
+
+Sample:
+
+```yaml
+version: "3.5"
+
+services:
+  setup:
+    image: eventstore/es-gencert-cli:1.0.2
+    entrypoint: bash
+    user: "1000:1000"
+    command: >
+      -c "mkdir -p ./certs && cd /certs
+      && es-gencert-cli create-ca
+      && es-gencert-cli create-node -out ./node1 -ip-addresses 127.0.0.1,172.20.240.1 -dns-names localhost,node1.kurrentdb
+      && es-gencert-cli create-node -out ./node1 -ip-addresses 127.0.0.1,172.20.240.2 -dns-names localhost,node2.kurrentdb
+      && es-gencert-cli create-node -out ./node1 -ip-addresses 127.0.0.1,172.20.240.3 -dns-names localhost,node3.kurrentdb
+      && find . -type f -print0 | xargs -0 chmod 666"
+    container_name: setup
+    volumes:
+      - ./certs:/certs
+```
+
+See more in the [complete sample of docker-compose secured cluster configuration.](../quick-start/installation.md#use-docker-compose)
+
+## Certificate installation on a client environment
+
+To connect to KurrentDB, you need to install the auto-generated CA certificate file on the client machine (e.g. machine where the client is hosted, or your dev environment).
+
+::: tabs#os
+@tab Linux
+
+1. Copy auto-generated CA file to dir `/usr/local/share/ca-certificates/`, e.g. using command:
+  ```bash
+  sudo cp ca.crt /usr/local/share/ca-certificates/event_store_ca.crt
+  ```
+2. Update the CA store:
+  ```bash
+  sudo update-ca-certificates
+  ```
+
+@tab Windows
+
+1. You can manually import it to the local CA cert store through `Certificates Local Machine Management Console`. To do that select **Run** from the **Start** menu, and then enter `certmgr.msc`. Then import certificate to `Trusted Root Certification`.
+2. You can also run the PowerShell script instead:
+
+```powershell
+Import-Certificate -FilePath ".\certs\ca\ca.crt" -CertStoreLocation Cert:\CurrentUser\Root
+```
+
+@tab macOS
+
+1. In the Keychain Access app on your Mac, select either the login or System keychain. Drag the certificate file onto the Keychain Access app. If you're asked to provide a name and password, type the name and password for an administrator user on this computer.
+2. You can also run the bash script:
+
+```bash
+sudo security add-certificates -k /Library/Keychains/System.keychain ca.crt 
+```
+:::
+
+## Intermediate CA certificates
+
+Intermediate CA certificates are supported by loading them from a [PEM](https://datatracker.ietf.org/doc/html/rfc1422) or [PKCS #12](https://datatracker.ietf.org/doc/html/rfc7292) bundle specified by the [`CertificateFile` configuration parameter](#certificate-file). To make sure that the configuration is correct, the certificate chain is validated on startup with the node's own certificate.
+
+If you've used the [certificate generation tool](#certificate-generation-tool) with the default settings to generate your CA and node certificates, then you're not using intermediate CA certificates.
+
+However, if you're using a public certificate authority (e.g [Let's Encrypt](https://letsencrypt.org/)) to generate your node certificates there is a chance that you're using intermediate CA certificates without knowing. This is due to the [Authority Information Access (AIA)](https://datatracker.ietf.org/doc/html/rfc4325#section-2) extension which allows intermediate certificates to be fetched from a remote server.
+
+To verify if your certificate is using the AIA extension, you need to verify if there is a section named: `Authority Information Access` in the certificate.
+
+::: tabs#os
+@tab Linux
+
+Use `openssl` to find the section in the certificate file:
+
+```bash
+openssl x509 -in /path/to/node.crt -text | grep 'Authority Information Access' -A 1
+```
+@tab Windows
+Open the certificate, go to the `Details` tab and look for the `Authority Information Access` field.
+
+If the extension is present, you can manually download the intermediate certificate from the URL present under the `CA Issuers` entry.
+Note that you will usually need to convert the downloaded certificate from the `DER` to the `PEM` format.
+
+This can be done with the following `openssl` command:
+
+```powershell
+openssl x509 -inform der -in /path/to/cert.der > /path/to/cert.pem
+```
+
+or with [an online service](https://www.sslshopper.com/ssl-converter.html) if you don't have openssl installed.
+:::
+
+It's possible that there are more than one intermediate CA certificates in the chain - so you need to verify if the certificate you've just downloaded also uses the AIA extension. If yes, you need to download the next intermediate CA certificate in the chain by repeating the same process above until you eventually reach a publicly trusted root certificate (i.e. the `Subject` and `Issuer` fields will match). In practice, there'll usually be at most two intermediate certificates in the chain.
+
+### Bundling the intermediate certificates
+
+The node's certificate should be first in the bundle, followed by the intermediates. Intermediates can be in any order but it would be good to keep it from leaf to root, as per the usual convention. The root certificate should not be bundled.
+
+In the examples below, intermediate certificates are numbered from 1 to N starting from the leaf and going up.
+
+#### PEM format
+
+If your node's certificate and the intermediate CA certificates are both PEM formatted, that is they begin with `-----BEGIN CERTIFICATE-----` and end with `-----END CERTIFICATE-----` then you can simply append the contents of the intermediate certificate files to the end of the node's certificate file to create the bundle.
+
+::: tabs#os
+@tab Linux
+
+```bash
+cat /path/to/intermediate1.crt >> /path/to/node.crt
+...
+cat /path/to/intermediateN.crt >> /path/to/node.crt
+```
+
+@tab Windows
+
+```powershell
+type C:\path\to\intermediate1.crt >> C:\path\to\node.crt
+...
+type C:\path\to\intermediateN.crt >> C:\path\to\node.crt
+```
+:::
+
+#### PKCS #12 format
+
+If you want to generate a PKCS #12 bundle from PEM formatted certificate files, please follow the steps below.
+
+```bash
+cat /path/to/intermediate1.crt >> ./ca_bundle.crt
+...
+cat /path/to/intermediateN.crt >> ./ca_bundle.crt
+
+openssl pkcs12 -export -in /path/to/node.crt -inkey /path/to/node.key -certfile ./ca_bundle.crt -out /path/to/node.p12 -passout pass:<password>
+```
+
+### Adding intermediate certificates to the certificate store
+
+Intermediate certificates also need to be added to the current user's certificate store.
+
+This is required for two reasons:  
+i)  For the full certificate chain to be sent when TLS connections are established  
+ii) To improve performance by preventing certificate downloads if your certificate uses the AIA extension  
+
+::: tabs#os
+@tab Linux
+The following script assumes KurrentDB is running under the `kurrent` account.
+
+```bash
+sudo su kurrent --shell /bin/bash
+dotnet tool install --global dotnet-certificate-tool
+ ~/.dotnet/tools/certificate-tool add -s CertificateAuthority -l CurrentUser --file /path/to/intermediate.crt
+```
+
+@tab Windows
+To import the intermediate certificate in the `Intermediate Certification Authorities` certificate store, run the following PowerShell command under the same account as KurrentDB is running:
+
+```powershell
+Import-Certificate -FilePath .\path\to\intermediate.crt -CertStoreLocation Cert:\CurrentUser\CA
+```
+
+Optionally, to import the intermediate certificate in the `Local Computer` store, run the following as `Administrator`:
+
+```powershell
+Import-Certificate -FilePath .\ca.crt -CertStoreLocation Cert:\LocalMachine\CA
+```
+:::
diff --git a/docs/server/security/user-authentication.md b/docs/server/security/user-authentication.md
new file mode 100644
index 00000000000..ef5049413d6
--- /dev/null
+++ b/docs/server/security/user-authentication.md
@@ -0,0 +1,583 @@
+---
+title: User authentication
+order: 2
+---
+
+# Authentication
+
+KurrentDB provides the following means to authenticate users connecting to the database:
+
+- [Basic authentication](#basic-authentication) is enabled by default, and allows you to authenticate users with a username and password. Users are created and managed in KurrentDB.
+- [User X.509 certificates](#user-x509-certificates) to authenticate users with an X.509 certificate. This is in addition to basic authentication.
+- [LDAP authentication](#ldap-authentication) to authenticate users against an LDAP server such as OpenLDAP or Acive Directory.
+- [OAuth authentication](#oauth-authentication) to authenticate users against an identity provider such as Auth0 or Identity Server
+
+Once a user has been authenticated, they must be [authorized](./user-authorization.md) before they can perform actions on the database.
+
+## Basic authentication
+
+KurrentDB supports authentication based on usernames and passwords out of the box.
+
+These users are created and managed within KurrentDB. So if you back up and restore a database with configured users, the same users will exist on the restored node.
+
+### Default users
+
+KurrentDB provides two default users, `$ops` and `$admin`.
+
+`$admin` has full access to everything in KurrentDB. It can read and write to protected streams, which is any stream that starts with `$`, such as `$projections-$all` or `$users`. Protected streams are usually system streams, for example, `$projections-$all` manages which projections exist in KurrentDB.
+
+The `$admin` user can also run operational commands, such as scavenges and shutdowns on KurrentDB.
+
+An `$ops` user can do everything that an `$admin` can do except manage users and read from system streams.
+
+### New users
+
+New users can be created through the following means:
+
+- The [HTTP API](@httpapi/security.md#creating-users)
+- The [Admin UI](../features/admin-ui.md#users)
+<!-- TODO A [gRPC client]() -->
+
+Users are created with a username, password, and optional set of groups or roles. These roles are used for [authorization](./user-authorization.md#roles).
+
+::: tip
+Users managed in KurrentDB are always granted a role that matches their username.
+:::
+
+### Externalised authentication
+
+You can also use the trusted intermediary header for externalized authentication that allows you to integrate
+almost any authentication system with KurrentDB.
+
+The trusted intermediary header helps KurrentDB to support a common security architecture. There are
+thousands of possible methods for handling authentication and it is impossible for us to support them all. The
+header allows you to configure a trusted intermediary to handle the authentication instead of KurrentDB.
+
+A sample configuration is to enable OAuth2 with the following steps:
+
+- Configure KurrentDB to run on the local loopback.
+- Configure nginx to handle OAuth2 authentication.
+- After authenticating the user, nginx rewrites the request and forwards it to the loopback to KurrentDB
+  that serves the request.
+
+The header has the form of `{user}; group, group1` and the KurrentDB ACLs use the information to handle
+security.
+
+```http:no-line-numbers
+Kurrent-TrustedAuth: "root; admin, other"
+```
+
+Use the following option to enable this feature:
+
+| Format               | Syntax                           |
+|:---------------------|:---------------------------------|
+| Command line         | `--enable-trusted-auth`          |
+| YAML                 | `EnableTrustedAuth`              |
+| Environment variable | `KURRENTDB_ENABLE_TRUSTED_AUTH`  |
+
+### Disable HTTP authentication
+
+It is possible to disable authentication on all protected HTTP endpoints by setting
+the `DisableFirstLevelHttpAuthorization` setting to `true`. The setting is set to `false` by default. When
+`true`, the setting will force KurrentDB to use the supplied credentials only to check [stream access](./user-authorization.md#stream-access).
+
+## User X.509 Certificates 
+
+<Badge type="info" vertical="middle" text="License Required"/>
+
+The User Certificates feature allows authentication through an X.509 user certificate in addition to username and password. User certificates work across any cluster that shares a trusted root Certificate Authority (CA) with the user's certificate. This means that you can have a single user certificate that is valid across multiple clusters.
+
+### Configuration steps
+
+You require a [license key](../quick-start/installation.md#license-keys) to use this feature.
+
+Refer to the [configuration guide](../configuration/README.md) for configuration mechanisms other than YAML.
+
+Sample configuration:
+
+```yaml
+UserCertificates:
+  Enabled: true
+```
+
+If the feature is enabled, the server will log the following on startup:
+
+```
+UserCertificatesPlugin: user X.509 certificate authentication is enabled
+```
+
+### Connecting with a user certificate
+
+Use the following command as an example to connect using `curl`: 
+
+```bash
+curl -i https://localhost:2113/streams/%24all --cert user-admin.crt --key user-admin.key
+```
+
+For using X.509 user certificate with KurrentDB client from an application, refer to the client's documentation.
+
+### Creating a user certificate
+
+The user certificate must adhere to the following requirements:
+
+- The certificate has a root CA in common with the node certificate.
+- The root CA that they have in common is trusted by the node.
+- The certificate has the ClientAuth EKU, and not the ServerAuth EKU.
+- The certificate must be in date.
+- The CN is the username of a user that exists in the database.
+
+::: tip
+Certificates can also authenticate `admin` and `ops` users.
+:::
+
+You can generate a user certificate with the [es-gencert-cli](https://github.com/EventStore/es-gencert-cli/):
+
+For example, to generate a user certificate with the username `ouro`:
+
+```bash
+./es-gencert-cli.exe create-user -username ouro -ca-certificate ca.crt -ca-key ca.key -days 10
+```
+
+::: details Click to view a sample user certificate
+
+```
+X509 Certificate:
+Version: 3
+Serial Number: 6339e77cacd508002e45cf38418e4f69
+Signature Algorithm:
+    Algorithm ObjectId: 1.2.840.113549.1.1.11 sha256RSA
+    Algorithm Parameters:
+    05 00
+Issuer:
+    CN=KurrentDB CA f2993c31201bd4bb5a59f3e580d32865
+    O=Kurrent Inc
+    C=UK
+  Name Hash(sha1): cd4323cbb5259cfee1e1e01aaf472552cf18cbf2
+  Name Hash(md5): 993adcf28aa235c593611234e6abc1fc
+
+ NotBefore: 2024-02-26 5:24 PM
+ NotAfter: 2024-03-07 5:24 PM
+
+Subject:
+    CN=ouro
+  Name Hash(sha1): fe1463b6b0edf7f66dd22101c7d1c38f14d1292e
+  Name Hash(md5): f40719c54125d3a27290bb48d6f73b15
+
+Public Key Algorithm:
+    Algorithm ObjectId: 1.2.840.113549.1.1.1 RSA
+    Algorithm Parameters:
+    05 00
+Public Key Length: 2048 bits
+Public Key: UnusedBits = 0
+    0000  30 82 01 0a 02 82 01 01  00 9d 7b f2 25 72 0c b6
+    0010  65 01 02 16 37 60 b9 22  14 04 bf fc 54 b2 e9 6f
+    0020  c7 bc 43 8d c0 ca 3d 55  86 b4 3e 24 88 fc 70 7e
+    0030  f6 f4 38 d3 52 2d 57 a0  48 8e 91 7b f4 10 8b fd
+    0040  95 6b 41 99 d7 9b e4 d9  42 c8 c5 47 5e d1 0c 4c
+    0050  3a 5a ff a3 db ea 0d 11  89 0c 3d 7f fb 9c e5 6c
+    0060  4a 04 e7 f7 48 ff 0f 2f  63 fa be bf f5 f3 76 a1
+    0070  ea 02 27 4c ca 27 82 64  40 b5 ef f6 6f fe f2 02
+    0080  8b 16 ea 45 54 fd ba 80  2c 72 02 d0 14 41 d5 cd
+    0090  db ae 6e 4d 9b 67 60 63  ae 92 ab 2d f4 8b 70 70
+    00a0  d0 4f b1 97 66 71 9b c9  2a 5e 7a e3 d0 f5 0b eb
+    00b0  9e 37 81 09 75 fa 81 d6  3c 9f 6a e6 56 8b 1f 73
+    00c0  d0 61 4c f5 51 16 44 da  dd 3b b1 2b b9 f2 44 94
+    00d0  53 a2 08 5a 8d 4a 4e cb  d7 cb f7 0c ca 7a 1a fb
+    00e0  21 db 00 3e 75 85 c6 d3  95 bd 39 61 d1 ff 89 e7
+    00f0  88 ab b0 58 ff ce e8 d7  19 a9 75 62 dc 98 a8 8f
+    0100  58 31 a7 7c 1d 88 ba 51  5d 02 03 01 00 01
+Certificate Extensions: 5
+    2.5.29.15: Flags = 1(Critical), Length = 4
+    Key Usage
+        Digital Signature, Key Encipherment (a0)
+
+    2.5.29.37: Flags = 0, Length = c
+    Enhanced Key Usage
+        Client Authentication (1.3.6.1.5.5.7.3.2)
+
+    2.5.29.19: Flags = 1(Critical), Length = 2
+    Basic Constraints
+        Subject Type=End Entity
+        Path Length Constraint=None
+
+    2.5.29.14: Flags = 0, Length = 22
+    Subject Key Identifier
+        01fc7f1e364f1767b759dae23d43bbb1cbf2d75deabe605737969489b8de201d
+
+    2.5.29.35: Flags = 0, Length = 24
+    Authority Key Identifier
+        KeyID=5e13f92550df9af08cdab327161ef2d2ef764b77fc4246bc2b172e1d9ed81b2f
+
+Signature Algorithm:
+    Algorithm ObjectId: 1.2.840.113549.1.1.11 sha256RSA
+    Algorithm Parameters:
+    05 00
+Signature: UnusedBits=0
+    0000  8f a4 00 65 f1 a5 53 54  a8 ed de 98 cc 51 f9 1c
+    0010  49 7d f0 7c d6 9f 14 fa  13 b4 db b3 8b 56 59 6a
+    0020  d1 67 a7 e3 21 d5 2d e3  c9 73 9b 09 a9 25 74 35
+    0030  79 16 a2 ce 62 ff fd f1  5e 05 0c b6 29 3d c8 ab
+    0040  1f 7f 87 66 d3 a1 a1 23  7e 11 03 1f 28 eb af d2
+    0050  ac ef 7b 2c 0f b2 18 b4  59 b1 5a ba c9 35 5a b6
+    0060  58 ef 55 4f e7 8c 43 35  1f 22 5c 6d 65 ff 6d 7c
+    0070  af 32 3c b5 ba 00 c4 74  91 73 32 54 22 4c 52 f5
+    0080  de cf f4 ed 71 37 f6 4a  5f 3b ba 37 2c 29 77 9a
+    0090  ad a0 6f c9 a0 26 b3 a6  d3 0c 99 d6 1c f2 f0 b9
+    00a0  29 51 c7 cc 8e 47 2c 04  0f b4 6f aa 09 5b c6 a4
+    00b0  e3 b9 0b 07 3c 49 e6 62  b7 78 3b ff 81 d1 8c 26
+    00c0  3e af 24 ae 01 54 91 33  96 a1 aa 14 05 b4 0a 5b
+    00d0  42 3c 11 f1 f1 2c 93 9d  6d 8b b8 ec eb c6 e5 e7
+    00e0  a4 9a d4 59 fb ff b7 ba  e1 33 c2 f8 09 52 80 c6
+    00f0  95 95 51 35 08 1a 65 41  76 bc c2 62 2b 71 b3 65
+Non-root Certificate
+Key Id Hash(rfc-sha1): 8a3c17e6662711175142740cfeb0f52d2bdd3596
+Key Id Hash(sha1): 87a30feaaeabd616f4dad92a9f1b44a43e2d0b52
+Subject Key Id (precomputed): 01fc7f1e364f1767b759dae23d43bbb1cbf2d75deabe605737969489b8de201d
+Key Id Hash(bcrypt-sha1): b808b4e710e4f6f158a837155838a295cfbb17bf
+Key Id Hash(bcrypt-sha256): eaf799bb5f3d57dbb3afc0f5357a8723574c8c254bf159fce1c95d76f6085ae5
+Key Id Hash(md5): fbb024d546e2039af7f3e01c71278313
+Key Id Hash(sha256): ca10f7cb5af9bf9dff8f2ad43c3cbdb0647da1173631018cb8551812c425d575
+Key Id Hash(pin-sha256): MZu7Waanp4kbJ/Hx3/tpgMb6L3GnXB3PrMY+9MDBmSg=
+Key Id Hash(pin-sha256-hex): 319bbb59a6a7a7891b27f1f1dffb6980c6fa2f71a75c1dcfacc63ef4c0c19928
+Cert Hash(md5): 1719850bd6f5f09c3610e4c33d13f7c2
+Cert Hash(sha1): 12c5293973bda1df2c74ab280d492135171c8ab6
+Cert Hash(sha256): a37767096f10697fb0fcf94a3872d0984aeed4754a295c5320679876e00def32
+Signature Hash: 6d922badaba2372070f13c69b620286262eab1d8d2d2156a271a1d73aaaf64e4
+```
+
+:::
+
+### Limitations
+
+1. Requests authenticated with user certificates cannot be forwarded between nodes. This affects Writes, Persistent Subscription operations, and Projections operations. These requests will need to be performed on the Leader node only.
+
+2. The X.509 authentication cannot be used in conjunction with any of the other authentication plugins, such as the LDAP plugin.
+
+### Troubleshooting
+
+| Error                                     | Solution                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
+|:------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Feature not enabled                        | The feature has to be enabled in order to authenticate user requests.<br/><br/> The following log indicates that the feature was not enabled: `UserCertificatesPlugin is not enabled`.                                                                                                                                                                                                                                                                                                                             |
+| Feature enabled and user not authenticated | If the feature has been enabled but there are still access denied errors, check the following: <ul><li>The user exists and is enabled in the KurrentDB database. Can you log in with the username and password?</li><li>The user certificate is valid, and has a valid chain up to a trusted root CA.</li><li>The user certificate and node certificate share a common root CA.</li><li>Use 'requires leader' (which is the default) in your client configuration to rule out issues with forwarding requests.</li></ul> |
+
+## LDAP authentication 
+
+<Badge type="info" vertical="middle" text="License Required"/>
+
+The LDAP Authentication feature enables KurrentDB to use LDAP-based directory services for authentication.
+
+### Configuration
+
+You require a [license key](../quick-start/installation.md#license-keys) to use this feature.
+
+Refer to the [configuration guide](../configuration/README.md) for configuration mechanisms other than YAML.
+
+1. Change the authentication type to `ldaps`.
+2. Add a section named `LdapsAuth` for LDAP-specific settings. 
+
+Example configuration file in YAML format:
+
+```yaml
+AuthenticationType: ldaps
+LdapsAuth:
+  Host: 13.88.9.49
+  Port: 636 #to use plaintext protocol, set Port to 389 and UseSSL to false 
+  UseSSL: true
+  ValidateServerCertificate: false #set this to true to validate the certificate chain
+  AnonymousBind: false
+  BindUser: cn=binduser,dc=mycompany,dc=local
+  BindPassword: p@ssw0rd!
+  BaseDn: ou=Lab,dc=mycompany,dc=local
+  ObjectClass: organizationalPerson
+  Filter: sAMAccountName
+  RequireGroupMembership: false #set this to true to allow authentication only if the user is a member of the group specified by RequiredGroupDn
+  GroupMembershipAttribute: memberOf
+  RequiredGroupDn: cn=Kurrent-Users,dc=mycompany,dc=local
+  PrincipalCacheDurationSec: 60
+  LdapGroupRoles:
+      'cn=Kurrent-Accounting,ou=Staff,dc=mycompany,dc=local': accounting
+      'cn=Kurrent-Operations,ou=Staff,dc=mycompany,dc=local': it
+      'cn=Kurrent-Admins,ou=Staff,dc=mycompany,dc=local': '$admins'
+```
+
+Upon successful LDAP authentication, users are assigned [roles](./user-authorization.md#roles) based on their domain group memberships, as specified in the `LdapGroupRoles` section.
+
+### Troubleshooting 
+
+If you encounter issues, check the server's log. Common problems include: 
+
+| Error                                                                                       | Solution                                                                                                                                                                                                                                                                                                                                                                                                                                        |
+|:--------------------------------------------------------------------------------------------|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Invalid Bind Credentials Specified                                                          | Confirm the `BindUser` and `BindPassword`.                                                                                                                                                                                                                                                                                                                                                                                                      |
+| Exception During Search - 'No such Object' or 'The object does not exist'                   | Verify the `BaseDn`.                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| 'Server Certificate Error' or 'Connect Error - The authentication or decryption has failed' | Verify that the server certificate is valid. If it is a self-signed certificate, set `ValidateServerCertificate` to `false`.                                                                                                                                                                                                                                                                                                                    |
+| LDAP Server Unavailable                                                                     | Verify connectivity to the LDAP server from a KurrentDB node (e.g. using `netcat` or `telnet`). Verify the `Host` and `Port` parameters.                                                                                                                                                                                                                                                                                                    |
+| Error Authenticating with LDAP server                                                       | Verify the `ObjectClass` and `Filter` parameters. If you have set `RequireGroupMembership` to `true`, verify that the user is part of the group specified by `RequiredGroupDn` and that the LDAP record has `GroupMembershipAttribute` set to `memberOf`.                                                                                                                                                                                       |
+| No Errors in Server Logs But Cannot Login                                                   | <ul><li>Verify that the user is part of the group specified by `RequiredGroupDn` and that the LDAP record has `GroupMembershipAttribute` set to `memberOf`.</li><li>Verify the `ObjectClass` and `Filter` parameters.</li><li>If you have set `RequireGroupMembership` to `true`, verify that the user is part of the group specified by `RequiredGroupDn` and that the LDAP record has `GroupMembershipAttribute` set to `memberOf`.</li></ul> |
+
+## OAuth Authentication
+
+<Badge type="info" vertical="middle" text="License Required"/>
+
+The OAuth feature allows KurrentDB to connect to an identity server and authenticate users based on a JWT rather than username and password.
+
+Access tokens can contain a "role" claim, which will be used for [authorization](./user-authorization.md).
+
+::: tip
+With the default basic authentication, KurrentDB treats the username as a "role" in addition to the groups they are in. If you want to have the same behaviour with OAuth authentication, you will need to add the user's username as an additional role claim.
+:::
+
+### Configuration
+
+You require a [license key](../quick-start/installation.md#license-keys) to use this feature.
+
+Refer to the [configuration guide](../configuration/README.md) for configuration mechanisms other than YAML.
+
+You can enable the OAuth plugin by setting the following options in your KurrentDB config file:
+- Set the `AuthenticationType` to `oauth`
+- Provide oauth configuration in a section named `OAuth`
+
+For example:
+
+:::tabs
+@tab kurrentdb.conf
+```yaml
+AuthenticationType: oauth
+OAuth:
+  Audience: {audience}
+  Issuer: {identity_server_endpoint}
+  ClientId: {client_id}
+  ClientSecret: {client_secret}
+```
+:::
+
+Alternatively you can provide a path to a separate config file with the `AuthenticationConfig` option. For example:
+
+:::tabs
+@tab kurrentdb.conf
+```yaml
+AuthenticationType: oauth
+AuthenticationConfig: ./kurrentdb-oauth.conf
+```
+
+@tab kurrentdb-oauth.conf
+```yaml
+OAuth:
+  Audience: {audience}
+  Issuer: {identity_server_endpoint}
+  ClientId: {client_id}
+  ClientSecret: {client_secret}
+```
+:::
+
+The configuration options are:
+
+| Name 			              | Type	  | Required?	| Default 	|Description |
+|-------------------------|---------|-----------|-----------|------------|
+| Audience 			          | string 	| Y 		| - 		| The audience used in your identity provider. |
+| Issuer 			            | string 	| Y 		| - 		| The issuer endpoint for your identity provider. |
+| ClientId			          | string 	| N 		| "" 		| The id of the client configured in the identity provider. |
+| ClientSecret 		        | string 	| N 	  | "" 		| The client secret configured in the identity provider. |
+| DisableIssuerValidation | bool 	  | N 		| false 	| Disable issuer validation for testing purposes. |
+| Insecure 			          | bool 	  | N 		| false 	| Whether to validate the certificates for the identity provider. This is not related to `Insecure` in the KurrentDB configuration. |
+
+### Testing with a local identity server
+
+You can try out the OAuth feature locally with this [Identity Server 4 docker container](https://github.com/EventStore/idsrv4). This container is not intended to be used in production.
+
+You will first configure and run the identity server, and then configure and run KurrentDB.
+
+1. Create a `users.conf.json` file to configure the users for your test.
+
+::: details users.conf.json
+```json
+[
+  {
+    "subjectId": "1",
+    "username": "admin",
+    "password": "password",
+    "claims": [{
+        "type": "role",
+        "value": "$admins"
+      }, {
+        "type": "role",
+        "value": "$ops"
+      }]
+  }, {
+    "subjectId": "2",
+    "username": "operator",
+    "password": "password",
+    "claims": [{
+      "type": "role",
+      "value": "$ops"
+    }]
+  }, {
+    "subjectId": "3",
+    "username": "ouro",
+    "password": "password",
+    "claims": [{
+      "type": "role",
+      "value": "custom"
+    }]
+  }, {
+    "subjectId": "4",
+    "username": "user",
+    "password": "password",
+    "claims": []
+  }
+]
+```
+:::
+
+This creates the following users:
+
+| Username 		  | Password 		| Roles |
+|---------------|-------------|-------|
+| `admin`		    | `password` 	| `$admins`, `$ops` |
+| `operator` 	  | `password` 	| `$ops` |
+| `ouro`		    | `password`	| `custom` |
+| `user`		    | `password`	| None |
+
+2. Create an identity server config file, `idsrv4.conf.json`.
+
+You need to configure the following:
+
+- A role claim (`http://schemas.microsoft.com/ws/2008/06/identity/claims/role`) must be added to the token.
+- The grant types of `password` and `authorization_code` must be allowed.
+- A redirect uri of `{kurrentdb_server_ip}/oauth/callback` must be allowed for the legacy UI to function.
+
+::: details idsrv4.conf.json
+```json
+{
+	"IdentityResources": [
+		{
+			"Name": "openid",
+			"DisplayName": "Your user identifier",
+			"Required": true,
+			"UserClaims": [
+				"sub",
+				"role"
+			]
+		},
+		{
+			"Name": "profile",
+			"DisplayName": "User profile",
+			"Description": "Your user profile information (first name, last name, etc.)",
+			"Emphasize": true,
+			"UserClaims": [
+				"name",
+				"given_name",
+				"middle_name",
+			]
+		}
+	],
+	"ApiResources": [
+		{
+			"Name": "kurrentdb-client",
+			"Scopes": [
+				"streams",
+				"openid",
+				"profile"
+			]
+		}
+	],
+	"ApiScopes": [
+		{
+			"Name": "streams",
+			"UserClaims": [
+				"http://schemas.microsoft.com/ws/2008/06/identity/claims/role",
+				"role"
+			]
+		}
+	],
+	"Clients": [
+		{
+			"ClientId": "kurrentdb-client",
+			"AllowedGrantTypes": [
+				"password",
+				"authorization_code",
+                "client_credentials"
+			],
+			"ClientSecrets": [
+				{
+					"Value": "{client_secret}"
+				}
+			],
+			"AllowedScopes": [
+				"streams",
+				"openid",
+				"profile"
+			],
+			"RedirectUris": ["https://localhost:2113/signin-oidc","https://127.0.0.1:2113/signin-oidc","https://localhost:2113/oauth/callback","https://127.0.0.1:2113/oauth/callback"],
+			"AlwaysIncludeUserClaimsInIdToken": true,
+			"RequireConsent": false,
+			"AlwaysSendClientClaims": true,
+			"AllowOfflineAccess": true,
+			"RequireClientSecret": false,
+			"AllowAccessTokensViaBrowser": true
+		}
+	]
+}
+```
+:::
+
+::: tip
+In this example we set the `RedirectUris` to both `https://localhost:2113` and `https://127.0.0.1:2113` so that you can log into the UI from either address.
+:::
+
+3. Pull and run the `kurrent-io/idsrv4` docker container:
+
+```bash
+docker pull ghcr.io/kurrent-io/idsrv4/idsrv4
+
+docker run \
+    --rm -it \
+    -p 5000:5000 \                                            # HTTP port
+    -p 5001:5001 \                                            # HTTPS port
+    --volume $PWD/users.conf.json:/etc/idsrv4/users.conf \    # mount users file; required
+    --volume $PWD/idsrv4.conf.json:/etc/idsrv4/idsrv4.conf \  # mount configuration file
+    ghcr.io/kurrent-io/idsrv4/idsrv4
+```
+
+You should see the identity server start up and start listening on the ports `5000` and `5001`:
+
+```
+info: Microsoft.Hosting.Lifetime[14]
+      Now listening on: https://[::]:5000
+info: Microsoft.Hosting.Lifetime[14]
+      Now listening on: https://[::]:5001
+```
+
+4. Add the following configuration to your KurrentDB config file `kurrentdb.conf`:
+
+:::tabs
+@tab kurrentdb.conf
+```yaml
+IntIp: 127.0.0.1
+ExtIp: 127.0.0.1
+
+# Licensing and certificates configuration omitted
+
+AuthenticationType: oauth
+OAuth:
+  Audience: kurrentdb-client
+  Issuer: https://localhost:5001/
+  ClientId: kurrentdb-client
+  ClientSecret: {client_secret}
+  # For testing
+  DisableIssuerValidation: true
+  Insecure: true
+```
+:::
+
+5. Start KurrentDB. You should see the following logs indicating that OAuth is in use:
+
+```
+[INF] OAuthAuthenticationProvider    OAuthAuthentication 25.0.0.1673 plugin enabled.
+...
+[INF] OAuthAuthenticationPlugin      Obtaining auth token signing key from https://localhost:5001/
+...
+[INF] OAuthAuthenticationPlugin      Issuer signing keys have been retrieved. Key IDs: ["{key_id}"]
+```
+
+You should now be able to log into the UI with the configured user names and passwords.
diff --git a/docs/server/security/user-authorization.md b/docs/server/security/user-authorization.md
new file mode 100644
index 00000000000..bef40b0b780
--- /dev/null
+++ b/docs/server/security/user-authorization.md
@@ -0,0 +1,772 @@
+---
+title: User authorization
+order: 3
+---
+
+# Authorization
+
+Authorization governs what an authenticated user can access and what actions they can perform based on that user's roles.
+
+## Roles
+
+Users are granted roles by the [authentication mechanism](./user-authentication.md). These roles determine what operations, endpoints, and streams a user can access.
+
+KurrentDB provides the `$admins` and `$ops` roles by default, granted respectively to the `admin` and `ops` default users. Custom roles can also be created.
+
+### Admins role
+
+The `$admins` role is granted to the `admin` user by default and authorizes the user to do the following:
+
+- Read all streams, including `$all` and system streams.
+- Manage users and reset their passwords.
+- Perform all administrative operations on a node or cluster, such as scavenges, restarts, and triggering leader elections.
+- Manage projections and persistent subscriptions.
+- View statistics for the node, subscriptions, or projections
+
+You can create additional admin users by assigning the `$admins` group to a user.
+
+::: note
+The `$admins` role bypasses all stream access checks such as [ACLs](#access-control-lists) or [stream policies](#stream-policy-authorization).
+:::
+
+### Ops role
+
+The `$ops` role is granted to the `ops` user by default. This role grants similar permissions to the `$admins` role, but without the user management and stream access.
+
+The `$ops` role authorizes the user to do the following:
+
+- Perform maintenance operations on a node or cluster, such as scavenges, restarts, and triggering leader elections.
+- Manage projections and persistent subscriptions.
+- View statistics for the node, subscriptions, or projections
+- Stream access is determined by the [authorization mechanism used](#stream-access)
+
+You can create additional ops users by assigning the `$ops` group to a user.
+
+### Custom roles
+
+Custom roles are any role assigned to an authenticated user outside of the `$admins` and `$ops` roles.
+These can be groups assigned to the user, their username, or a mapping from the authentication mechanism used. These roles can be anything, but typically describe the group or tenant a user is part of. Examples of custom roles are `accounting`, `sales`, or `tenant-123`.
+
+Users with custom (or no) roles are authorized to do the following:
+
+- View statistics for the node, subscriptions, or projections
+- Stream access is determined by the [authorization mechanism used](#stream-access)
+
+::: tip
+Users managed in KurrentDB are always granted a role that matches their username.
+:::
+
+## Stream access
+
+Stream access covers what actions a user can perform on a stream within KurrentDB. These actions are:
+
+| Name              | Key   | Description |
+|-------------------|-------|-------------|
+| Read              | `$r`  | The permission to read from a stream. |
+| Write             | `$w`  | The permission to write to a stream. |
+| Delete            | `$d`  | The permission to delete a stream. |
+| Metadata read     | `$mr` | The permission to read the metadata associated with a stream. |
+| Metadata write    | `$mw` | The permission to write the metadata associated with a stream. |
+
+KurrentDB supports these methods of authorizing user access to streams:
+- [Access control lists](#access-control-lists) to restrict user access to streams based on metadata in each stream.
+- [Stream policies](#stream-policy-authorization) to restrict user access to streams based on configured policies.
+
+### Access control lists
+
+By default, authenticated users can access all non-system streams in the KurrentDB database. You can use Access Control Lists (ACLs) to set up more granular access control. In fact, the default access
+level is also controlled by a special ACL called the [default ACL](#default-acl).
+
+#### Stream ACL
+
+KurrentDB keeps the ACL of a stream in the stream metadata as JSON with the below definition:
+
+```json
+{
+  "$acl": {
+    "$w": "$admins",
+    "$r": "$all",
+    "$d": "$admins",
+    "$mw": "$admins",
+    "$mr": "$admins"
+  }
+}
+```
+
+These fields represent the following:
+
+- `$w` The permission to write to this stream.
+- `$r` The permission to read from this stream.
+- `$d` The permission to delete this stream.
+- `$mw` The permission to write the metadata associated with this stream.
+- `$mr` The permission to read the metadata associated with this stream.
+
+You can update these fields with either a single string or an array of strings representing users or
+groups (`$admins`, `$all`, or custom groups). It's possible to put an empty array into one of these fields,
+and this removes all users from that permission.
+
+::: tip 
+We recommend you don't give people access to `$mw` as then they can change the ACL.
+:::
+
+#### Default ACL
+
+The `$settings` stream uses a special ACL as the default ACL. This stream controls the default ACL for
+streams without an ACL and who can create streams in the system. The default state of these is
+shown below:
+
+```json
+{
+  "$userStreamAcl": {
+    "$r": "$all",
+    "$w": "$all",
+    "$d": "$all",
+    "$mr": "$all",
+    "$mw": "$all"
+  },
+  "$systemStreamAcl": {
+    "$r": "$admins",
+    "$w": "$admins",
+    "$d": "$admins",
+    "$mr": "$admins",
+    "$mw": "$admins"
+  }
+}
+```
+
+You can rewrite these to the `$settings` stream with the following request:
+
+@[code{curl}](@samples/default-settings.sh)
+
+The `$userStreamAcl` controls the default ACL for user streams, while all system streams use
+the `$systemStreamAcl` as the default.
+
+::: tip 
+Members of `$admins` always have access to everything. You cannot remove this permission.
+:::
+
+When you set a permission on a stream, it overrides the default values. However, it's not necessary to specify
+all permissions on a stream. It's only required to specify those which differ from the default.
+
+Here is an example of the default ACL that has been changed:
+
+```json
+{
+  "$userStreamAcl": {
+    "$r": "$all",
+    "$w": "ouro",
+    "$d": "ouro",
+    "$mr": "ouro",
+    "$mw": "ouro"
+  },
+  "$systemStreamAcl": {
+    "$r": "$admins",
+    "$w": "$admins",
+    "$d": "$admins",
+    "$mr": "$admins",
+    "$mw": "$admins"
+  }
+}
+```
+
+This default ACL gives `ouro` and `$admins` create and write permissions on all streams while everyone else
+can read from them. Be careful when allowing default access to system streams to non-admins, as they would also have
+access to `$settings` unless you specifically override it.
+
+Refer to the documentation of the HTTP API or SDK of your choice for more information about changing ACLs
+programmatically.
+
+### Stream policy authorization
+
+<Badge type="info" vertical="middle" text="License Required"/>
+
+This allows administrators to define stream access policies for KurrentDB based on stream prefixes.
+
+#### Enabling
+
+Using this feature requires a [license key](../quick-start/installation.md#license-keys).
+
+The last event in the `$authorization-policy-settings` stream configures the stream access policy.
+
+Enable stream policies by appending an event of type `$authorization-policy-changed` to the `$authorization-policy-settings` stream:
+
+::: tabs
+@tab HTTP
+```http
+POST https://localhost:2113/streams/$authorization-policy-settings
+Authorization: Basic admin changeit
+Content-Type: application/json
+Kurrent-EventId: 11887e82-9fb4-4112-b937-aea895b32a4a
+Kurrent-EventType: $authorization-policy-changed
+
+{
+    "streamAccessPolicyType": "streampolicy"
+}
+```
+
+@tab Powershell
+```powershell
+$JSON = @"
+{
+    "streamAccessPolicyType": "streampolicy"
+}
+"@ `
+
+curl.exe -X POST `
+  -H "Content-Type: application/json" `
+  -H "Kurrent-EventId: 11887e82-9fb4-4112-b937-aea895b32a4b" `
+  -H "Kurrent-EventType: `$authorization-policy-changed" `
+  -u "admin:changeit" `
+  -d $JSON `
+  https://localhost:2113/streams/%24authorization-policy-settings
+```
+
+@tab Bash
+```bash
+JSON='{
+    "streamAccessPolicyType": "streampolicy"
+}'
+
+curl -X POST \
+  -H "Content-Type: application/json" \
+  -H "Kurrent-EventId: 814f6d67-515c-4bd6-a6d6-8a0235ec719a" \
+  -H "Kurrent-EventType: \$authorization-policy-changed" \
+  -u "admin:changeit" \
+  -d "$JSON" \
+  https://localhost:2113/streams/%24authorization-policy-settings
+```
+:::
+
+And disable stream policies by setting the stream access policy type back to `acl`:
+
+::: tabs
+@tab HTTP
+
+```http
+### Configure cluster to use acls
+POST https://localhost:2113/streams/$authorization-policy-settings
+Authorization: Basic admin changeit
+Content-Type: application/json
+Kurrent-EventId: d07a6637-d9d0-43b7-8f48-6a9a8800af12
+Kurrent-EventType: $authorization-policy-changed
+
+{
+    "streamAccessPolicyType": "acl"
+}
+```
+
+@tab Powershell
+```Powershell
+$JSON = @"
+{
+    "streamAccessPolicyType": "acl"
+}
+"@ `
+
+curl.exe -X POST `
+  -H "Content-Type: application/json" `
+  -H "Kurrent-EventId: 3762c89e-d12e-4a01-83bb-781459c93ebc" `
+  -H "Kurrent-EventType: `$authorization-policy-changed" `
+  -u "admin:changeit" `
+  -d $JSON `
+  https://localhost:2113/streams/%24authorization-policy-settings
+```
+@tab Bash
+```bash
+JSON='{
+    "streamAccessPolicyType": "acl"
+}'
+
+curl -X POST \
+  -H "Content-Type: application/json" \
+  -H "Kurrent-EventId: d6b3a316-2493-4bcd-9019-e02b5ae4eec3" \
+  -H "Kurrent-EventType: \$authorization-policy-changed" \
+  -u "admin:changeit" \
+  -d "$JSON" \
+  https://localhost:2113/streams/%24authorization-policy-settings
+```
+
+:::
+
+When stream policies are enabled, you should see the following logs:
+
+You can check that the feature is enabled by searching for the following log at startup:
+
+```
+[22860,28,17:30:42.247,INF] StreamBasedAuthorizationPolicyRegistry New Authorization Policy Settings event received
+[22860,28,17:30:42.249,INF] StreamBasedAuthorizationPolicyRegistry Starting factory streampolicy
+...
+[22860,28,17:30:42.264,INF] StreamBasedPolicySelector      Existing policy found in $policies stream (0)
+[22860,28,17:30:42.269,INF] StreamBasedPolicySelector      Successfully applied policy
+[22860,28,17:30:42.271,INF] StreamBasedPolicySelector      Subscribing to $policies at 0
+```
+
+Stream policies will log the following error and not start if you do not have a valid license. KurrentDB will continue to run with the current policy type:
+
+```
+[22928, 1,17:31:56.879,INF] StreamPolicySelector           Stream Policies plugin is not licensed, stream policy authorization may not be enabled.
+...
+[22928,28,17:31:57.030,ERR] StreamPolicySelector           Stream Policies plugin is not licensed, cannot enable Stream policies
+[22928,28,17:31:57.030,ERR] StreamBasedAuthorizationPolicyRegistry Failed to enable policy selector plugin streampolicy. Authorization settings will not be applied
+```
+
+::: note
+If you enable the Stream Policy feature, KurrentDB will not enforce [stream ACLs](#access-control-lists).
+:::
+
+#### Overriding the default
+
+If the `$authorization-policy-settings` stream is empty and there is no configuration, KurrentDB will default to using ACLs.
+
+If you would rather default to stream policies, you can set the `Authorization:DefaultPolicyType` option to `streampolicy`.
+
+::: note
+Any events in the `$authorization-policy-settings` stream take precedence over the `Authorization:DefaultPolicyType` setting.
+:::
+
+You can do this by adding the following to the server configuration file:
+
+```yaml
+Authorization:
+  DefaultPolicyType: streampolicy
+```
+
+Refer to the [configuration guide](../configuration/README.md) for configuration mechanisms other than YAML.
+
+::: warning
+If the policy type configured in `Authorization:DefaultPolicyType` is not present at startup, KurrentDB will not start.
+:::
+
+#### Fallback stream access policy
+
+If none of the events in the `$authorization-policy-settings` stream are valid, or if the stream policy plugin cannot be started (for example, due to it being unlicensed), KurrentDB will fall back to restricted access.
+
+This locks down all stream access to admins only to prevent KurrentDB from returning to a more permissive policy such as ACLs.
+
+To recover from this, either fix the issue preventing the plugin from loading or set the stream access policy type to a different policy such as ACL:
+
+```json
+{
+    "streamAccessPolicyType": "acl"
+}
+```
+
+#### Stream policies and rules
+
+Stream policies and Stream Rules are configured by events written to the `$policies` stream.
+
+##### Default stream policy
+
+KurrentDB creates default stream policies by adding a default policy event in the `$policies` stream when the feature is enabled for the first time. The default policies specified in that event include:
+
+- Restricts [system streams](../features/streams.md#system-events-and-streams) to the `$admins` group.
+- Grants users outside of the `$ops` group access to user streams.
+- Grants users outside of the `$ops` group read access to the [default projection streams](../features/streams.md#projections-events-and-streams) (`$ce`, `$et`, `$bc`, `$category`, `$streams`) and their metadata.
+
+KurrentDB will log when the default policy is created:
+
+```
+[31124,16,11:18:15.099,DBG] StreamBasedPolicySelector Successfully wrote default policy to stream $policies.
+```
+
+::: details Click here to see the default policy
+
+```json
+{
+  "streamPolicies": {
+    "publicDefault": {
+      "$r": ["$all"],
+      "$w": ["$all"],
+      "$d": ["$all"],
+      "$mr": ["$all"],
+      "$mw": ["$all"]
+    },
+    "adminsDefault": {
+      "$r": ["$admins"],
+      "$w": ["$admins"],
+      "$d": ["$admins"],
+      "$mr": ["$admins"],
+      "$mw": ["$admins"]
+    },
+    "projectionsDefault": {
+      "$r": ["$all"],
+      "$w": ["$admins"],
+      "$d": ["$admins"],
+      "$mr": ["$all"],
+      "$mw": ["$admins"]
+    }
+  },
+  "streamRules": [
+    {
+      "startsWith": "$et-",
+      "policy": "projectionsDefault"
+    },
+    {
+      "startsWith": "$ce-",
+      "policy": "projectionsDefault"
+    },
+    {
+      "startsWith": "$bc-",
+      "policy": "projectionsDefault"
+    },
+    {
+      "startsWith": "$category-",
+      "policy": "projectionsDefault"
+    },
+    {
+      "startsWith": "$streams",
+      "policy": "projectionsDefault"
+    }
+  ],
+  "defaultStreamRules": {
+    "userStreams": "publicDefault",
+    "systemStreams": "adminsDefault"
+  }
+}
+```
+
+:::
+
+::: note
+Operations users in the `$ops` group are excluded from the `$all` group and do not have access to user streams by default.
+:::
+
+##### Custom stream policies
+
+You can create a custom stream policy by writing an event with event type `$policy-updated` to the `$policies` stream.
+
+We recommend that you start with the default policy shown above and add your own policies and stream rules to it.
+
+Define policies by adding one or more entries to the `streamPolicies` JSON object, with the key being your policy name and the value being an [access policy](#accesspolicy):
+
+```json
+"streamPolicies": {
+  "{your_policy_name}": {
+    "$r": ["{roles_with_read_access}"],
+    "$w": ["{roles_with_write_access}"],
+    "$d": ["{roles_with_delete_access}"],
+    "$mr": ["{roles_with_metadata_read_access}"],
+    "$mw": ["{roles_with_metadata_write_access}"],
+  },
+  // Default policies truncated
+}
+```
+
+For example, this policy, named `customPolicy`, grants read, write, delete, metadata read, and metadata write access to users with the `ouro` role, and only grants read access to users in the `readers` role:
+
+```json
+"streamPolicies": {
+    "customPolicy": {
+        "$r": ["ouro", "readers"],
+        "$w": ["ouro"],
+        "$d": ["ouro"],
+        "$mr": ["ouro"],
+        "$mw": ["ouro"]
+    },
+    // Default policies truncated (full version shown below)
+}
+```
+
+Define which policies apply to which stream prefix by adding a [stream rule](#streamrule) entry to the `streamRules` object:
+
+```json
+"streamRules": [{
+  "startsWith": "{stream_prefix}",
+  "policy": "{your_policy_name}"
+},
+// Default stream rules truncated
+]
+```
+
+For example, these stream rules apply the `customPolicy` defined above to streams starting with `account` and `customer`:
+
+```json
+"streamRules": [{
+    "startsWith": "account",
+    "policy": "customPolicy"
+}, {
+    "startsWith": "customer",
+    "policy": "customPolicy"
+}
+// Default stream rules truncated (full version shown below)
+]
+```
+
+::: tip
+You can apply the same policy to multiple streams by defining multiple stream rules.
+:::
+
+Define which policies apply to user and system streams by default by updating the `defaultStreamRules` object:
+
+```json
+"defaultStreamRules": {
+  "userStreams": "{default_users_policy_name}",
+  "systemStreams": "{default_system_policy_name}"
+}
+```
+
+For example, to keep using the system defaults:
+
+```json
+"defaultStreamRules": {
+  "userStreams": "publicDefault",
+  "systemStreams": "adminsDefault"
+}
+```
+
+::: tip
+Ensure the default policies are included in the `streamPolicies` object.
+:::
+
+To update the policies, append an event containing the JSON created in the above steps to the `$policies` stream with the `$policy-updated` event type:
+
+::: tabs
+@tab HTTP
+```http
+POST https://localhost:2113/streams/$policies
+Authorization: Basic admin changeit
+Content-Type: application/json
+Kurrent-EventId: b04a64bf-4ac2-4f36-a856-6da9b63e64b7
+Kurrent-EventType: $policy-updated
+
+< ./customPolicy.json
+```
+
+@tab Powershell
+```powershell
+curl.exe -X POST `
+  -H "Content-Type: application/json" `
+  -H "Kurrent-EventId: 8bc7c581-0f07-4987-bfcb-ab8f9404ca34" `
+  -H "Kurrent-EventType: `$policy-updated" `
+  -u "admin:changeit" `
+  -d @customPolicy.json `
+  https://localhost:2113/streams/%24policies
+```
+
+@tab Bash
+```bash
+curl -X POST \
+  -H "Content-Type: application/json" \
+  -H "Kurrent-EventId: cb6a722d-c775-4831-929b-86870560c68e" \
+  -H "Kurrent-EventType: \$policy-updated" \
+  -u "admin:changeit" \
+  -d @customPolicy.json \
+  https://localhost:2113/streams/%24policies
+
+```
+
+@tab customPolicy.json
+```json
+{
+  "streamPolicies": {
+    "customPolicy": {
+      "$r": ["ouro", "readers"],
+      "$w": ["ouro"],
+      "$d": ["ouro"],
+      "$mr": ["ouro"],
+      "$mw": ["ouro"]
+    },
+    "publicDefault": {
+      "$r": ["$all"],
+      "$w": ["$all"],
+      "$d": ["$all"],
+      "$mr": ["$all"],
+      "$mw": ["$all"]
+    },
+    "adminsDefault": {
+      "$r": ["$admins"],
+      "$w": ["$admins"],
+      "$d": ["$admins"],
+      "$mr": ["$admins"],
+      "$mw": ["$admins"]
+    },
+    "projectionsDefault": {
+      "$r": ["$all"],
+      "$w": ["$admins"],
+      "$d": ["$admins"],
+      "$mr": ["$all"],
+      "$mw": ["$admins"]
+    }
+  },
+  "streamRules": [
+    {
+      "startsWith": "account",
+      "policy": "customPolicy"
+    },
+    {
+      "startsWith": "customer",
+      "policy": "customPolicy"
+    },
+    {
+      "startsWith": "$et-",
+      "policy": "projectionsDefault"
+    },
+    {
+      "startsWith": "$ce-",
+      "policy": "projectionsDefault"
+    },
+    {
+      "startsWith": "$bc-",
+      "policy": "projectionsDefault"
+    },
+    {
+      "startsWith": "$category-",
+      "policy": "projectionsDefault"
+    },
+    {
+      "startsWith": "$streams",
+      "policy": "projectionsDefault"
+    }
+  ],
+  "defaultStreamRules": {
+    "userStreams": "publicDefault",
+    "systemStreams": "adminsDefault"
+  }
+}
+```
+
+:::
+
+::: note
+If a policy update is invalid, it will not be applied, and an error will be logged. KurrentDB will continue running with the previous valid policy in place.
+:::
+
+##### Stream policy schema
+
+###### Policy
+
+| Key                   | Type                                  | Description | Required |
+|-----------------------|---------------------------------------|-------------|----------|
+| `streamPolicies`      | `Dictionary<string, AccessPolicy>`    | The named policies which can be applied to streams. | Yes |
+| `streamRules`         | `StreamRule[]`                        | An array of rules to apply for stream access.  The ordering is important, and the first match wins. | Yes |
+| `defaultStreamRules`  | `DefaultStreamRules`                  | The default policies to apply if no other policies are defined for a stream | Yes |
+
+###### AccessPolicy
+
+| Key   | Type	    | Description	| Required |
+|-------|-----------|---------------|----------|
+| `$r`  | string[]  | User and group names that are granted stream read access. | Yes |
+| `$w`  | string[]  | User and group names that are granted stream write access. | Yes |
+| `$d`  | string[]  | User and group names that are granted stream delete access. | Yes |
+| `$mr` | string[]  | User and group names that are granted metadata stream read access. | Yes |
+| `$mw` | string[]  | User and group names that are granted metadata stream write access. | Yes |
+
+::: note
+Having metadata read or metadata write access to a stream does not grant read or write access to that stream.
+:::
+
+###### DefaultStreamRules
+
+|Key                | Type           | Description   | Required |
+|-------------------|----------------|---------------|----------|
+| `userStreams`     | `AccessPolicy` | The default policy to apply for non-system streams. | Yes |
+| `systemStreams`   | `AccessPolicy` | The default policy to apply for system streams. | Yes |
+
+###### StreamRule
+
+| Key           | Type     | Description   | Required |
+|---------------|----------|---------------|----------|
+| `startsWith`  | `string` | The stream prefix to which the rule is applied. | Yes |
+| `policy`      | `string` | The name of the policy to enforce for streams that match this prefix. | Yes |
+
+
+#### Tutorial
+
+[Learn how to set up and use Stream Policy Authorization in KurrentDB through a tutorial.](/tutorials/Stream_Policy_Authorization.md)
+
+
+#### Troubleshooting
+
+##### License is invalid or not found
+
+This feature requires a license to use. If a license is not found or the provided license is invalid, you will see the following log:
+
+```
+[INF] StreamPolicySelector           Stream Policies plugin is not licensed, stream policy authorization cannot be enabled.
+```
+
+Trying to enable the feature will give you the following errors, and the previous or default policy authorization settings will be used:
+
+```
+[ERR] StreamPolicySelector           Stream Policies plugin is not licensed, cannot enable Stream policies
+[ERR] StreamBasedAuthorizationPolicyRegistry Failed to enable policy selector plugin streampolicy. Authorization settings will not be applied.
+```
+
+If the `DefaultPolicyType` is set to `streampolicy`, the [fallback policy](#fallback-stream-access-policy) will be used, and stream access will be restricted to admins only:
+
+```
+[WRN] StreamBasedAuthorizationPolicyRegistry Could not load authorization policy settings. Restricting access to admins only.
+```
+
+#### The `$authorization-policy-settings` stream has been deleted
+
+If the `$authorization-policy-settings` stream has been deleted (including hard deleted), the default policy type will be used, and KurrentDB will log the following:
+
+```
+[WRN] StreamBasedAuthorizationPolicyRegistry Authorization policy settings stream $authorization-policy-settings has been deleted.
+[INF] KurrentDB                     No existing authorization policy settings were found in $authorization-policy-settings. Using the default
+```
+
+#### New authorization settings could not be applied
+
+If an invalid update is made to the `$authorization-policy-changed` stream, you will see the following log and the settings will not be updated.
+
+```
+[WRN] StreamBasedAuthorizationPolicyRegistry New authorization settings could not be applied. Settings were not updated.
+```
+
+This can happen because:
+
+1. The event type is not `$authorization-policy-changed`:
+
+```
+[ERR] StreamBasedAuthorizationPolicyRegistry Invalid authorization policy settings event. Expected event type $authorization-policy-changed but got {invalid_event_type}
+```
+
+2. The event is not valid JSON:
+
+```
+[ERR] StreamBasedAuthorizationPolicyRegistry Could not parse authorization policy settings
+```
+
+3. The stream access policy type was not found. Ensure that the policy type is set to `acl` or `streampolicy`:
+
+```
+[ERR] StreamBasedAuthorizationPolicyRegistry Could not find policy not-found in registered authorization policy plugins.
+```
+
+#### Could not parse policy
+
+If an invalid update is made to the `$policies` stream, you will see the following log and the policies will not be updated.
+
+```
+[ERR] StreamBasedPolicySelector      Could not parse policy
+```
+
+This can happen because:
+
+1. A stream rule references a policy that does not exist. Ensure that the policy is defined in the [streamPolicies](#custom-stream-policies) json object:
+
+```
+[ERR] StreamPolicySelector           Stream rule for prefix: {stream_prefix} refers to an undefined policy: {not_found_policy}
+```
+
+2. An [access policy](#accesspolicy) is missing a key. Ensure that each access key (`$r`, `$w`, `$d`, `$mr`, `$md`) is defined:
+
+```
+[ERR] StreamPolicySelector           Error while deserializing new policy
+System.ArgumentNullException: Value cannot be null. (Parameter 'Deleters cannot be null')
+```
+
+3. A [stream rule](#streamrule) has an empty prefix:
+
+```
+[ERR] StreamPolicySelector           Error while deserializing new policy
+System.ArgumentNullException: Value cannot be null. (Parameter 'StartsWith cannot be null or empty')
+```
+
+4. The event type is not `$policy-updated`:
+
+```
+[ERR] StreamPolicySelector           Expected event type: $policy-updated but was {invalid_event_type}
+```
diff --git a/docs/server/usage-telemetry.md b/docs/server/usage-telemetry.md
new file mode 100644
index 00000000000..c3765a4c849
--- /dev/null
+++ b/docs/server/usage-telemetry.md
@@ -0,0 +1,105 @@
+# Usage telemetry
+
+KurrentDB collects anonymous, aggregated usage statistics and sends them periodically to Kurrent, Inc. Telemetry data helps us refine and improve our product based on real usage patterns.
+
+## What is usage telemetry
+
+KurrentDB telemetry only tracks non-Personally-Identifiable Information. Collected data does not allow Kurrent to fingerprint the users by any of the collected data points.
+
+Examples of the telemetry data collected:
+
+* KurrentDB version number
+* Cluster or instance size
+* Node machine size
+* Is cluster or instance configured in secure mode
+* Legacy TCP client protocol enabled
+* Legacy AtomPub protocol enabled
+* Number of running projections
+* Number of running persistent subscriptions
+
+What KurrentDB **does not** track:
+
+* Stream names
+* Stream metadata
+* Event payloads
+* Event metadata
+* Usernames and passwords
+
+Here's an example of a full telemetry message from a single-node instance:
+
+```json
+{
+  "version": "23.10.0.0",
+  "tag": "oss-v23.10.0",
+  "uptime": "00:01:11.0115732",
+  "cluster": {
+    "leaderId": "81e9ca2a-8acc-41ed-b9d0-65a652b36801",
+    "nodeId": "81e9ca2a-8acc-41ed-b9d0-65a652b36801",
+    "nodeState": "Leader"
+  },
+  "configuration": {
+    "clusterSize": 1,
+    "enableAtomPubOverHttp": true,
+    "enableExternalTcp": true,
+    "insecure": false,
+    "runProjections": "None"
+  },
+  "database": {
+    "epochNumber": 29,
+    "firstEpochId": "b02f1ba6-98a3-473f-ade7-dcd1476b2149",
+    "activeChunkNumber": 2
+  },
+  "environment": {
+    "coreCount": 24,
+    "isContainer": false,
+    "isKubernetes": false,
+    "processorArchitecture": "X64",
+    "totalDiskSpace": 1000186310656,
+    "totalMemory": 68631052288
+  },
+  "gossip": {
+    "81e9ca2a-8acc-41ed-b9d0-65a652b36801": "Leader"
+  },
+  "persistentSubscriptions": {
+    "count": 0
+  },
+  "projections": {
+    "customProjectionCount": 0,
+    "standardProjectionCount": 5,
+    "customProjectionRunningCount": 0,
+    "standardProjectionRunningCount": 5,
+    "totalCount": 5,
+    "totalRunningCount": 5
+  }
+}
+```
+
+## Disclosure
+
+On startup, KurrentDB produces a message to the console and to the diagnostic logs, which looks similar to:
+
+```
+Telemetry
+---------
+KurrentDB collects usage data in order to improve your experience. The data is anonymous and collected by Kurrent, Inc.
+You can opt out of sending telemetry by setting the KURRENTDB_TELEMETRY_OPTOUT environment variable to true.
+For more information visit https://kurrent.io/telemetry
+```
+
+If telemetry collection is disabled (see below), the disclosure is still shown with a different text:
+
+```
+Telemetry
+---------
+KurrentDB collects usage data in order to improve your experience. The data is anonymous and collected by Kurrent, Inc.
+You have opted out of sending telemetry by setting the KURRENTDB_TELEMETRY_OPTOUT environment variable to true.
+For more information visit https://kurrent.io/telemetry
+```
+
+## Reporting frequency
+
+To avoid tracking short-lived instances (like containers used for tests), telemetry data is sent one hour after the cluster node starts. Following this, updates are sent every 24 hours. All transmissions are logged for transparency to the server console and in the log file.
+
+## How to opt out
+
+Telemetry transmission can be disabled by setting the `KURRENTDB_TELEMETRY_OPTOUT` environment variable to `true`. KurrentDB will still collect the information required to produce telemetry messages, and those messages will be produced to console and diagnostic log, but they will not be sent to Kurrent.
diff --git a/docs/sidebar.js b/docs/sidebar.js
deleted file mode 100644
index 93d4bed80c2..00000000000
--- a/docs/sidebar.js
+++ /dev/null
@@ -1,50 +0,0 @@
-module.exports = [
-    {
-        text: "Server Quick Start",
-        children: [
-            "README.md",
-            "whatsnew.md",
-            "installation.md",
-            "usage-telemetry.md"
-        ]
-    },
-    {
-        text: "Configuration",
-        children: [
-            "configuration.md",
-            "db-config.md",
-            "security.md",
-            "networking.md",
-            "cluster.md",
-        ]
-    },
-    {
-        text: "Features",
-        children: [
-            "admin-ui.md",
-            "streams.md",
-            "indexes.md",
-            "projections.md",
-            "persistent-subscriptions.md",
-        ]
-    },
-    {
-        text: "Operations",
-        children: [
-            "upgrade-guide.md",
-            "operations.md",
-        ]
-    },
-    {
-        text: "Diagnostics",
-        group: "Diagnostics",
-        prefix: "/diagnostics/",
-        link: "/diagnostics/",
-        children: [
-            "README.md",
-            "logs.md",
-            "metrics.md",
-            "integrations.md",
-        ]
-    }
-];
diff --git a/docs/streams.md b/docs/streams.md
deleted file mode 100644
index ae667470416..00000000000
--- a/docs/streams.md
+++ /dev/null
@@ -1,174 +0,0 @@
-# Event streams
-
-EventStoreDB is purpose-built for event storage. Unlike traditional state-based databases, which retain only the most recent entity state, EventStoreDB allows you to store each state alteration as an independent event.
-
-These **events** are logically organized into **streams**, typically only one stream per entity.
-
-## Metadata and reserved names
-
-## Stream metadata
-
-In EventStoreDB, every stream and event is accompanied by metadata, distinguished by the **`$$`** prefix. For example, the stream metadata for a stream named **`foo`** is **`$$foo`**. You can modify specific metadata values and write your data to the metadata, which can be referenced in your code.
-
-### Reserved names
-
-EventStoreDB uses a **`$`** prefix for all internal data, such as **`$maxCount`** in a stream's metadata. Do not use a **`$`** prefix for event names, metadata keys, or stream names, except as detailed below.
-
-The supported internal settings are:
-
-| Property name       | Description                                                                                                                                                                                                                                                                                                                                                            |
-| :------------------ | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **`$maxAge`**       | Sets a sliding window based on dates. When data reaches a certain age, it automatically disappears from the stream and becomes eligible for scavenging. This value is set as an integer representing the number of seconds (must be >= 1).                                                                                                                             |
-| **`$maxCount`**     | Sets a sliding window based on the number of items in the stream. When data reaches a certain length, it automatically disappears from the stream and becomes eligible for scavenging. This value is set as an integer representing the count of items (must be >= 1).                                                                                                 |
-| **`$cacheControl`** | Controls the cache of the head of a stream. While most URIs in a stream are infinitely cacheable, the head, by default, will not cache. In some situations, it may be preferable to set a small amount of caching on the head to allow intermediaries to handle polls (e.g., 10 seconds). The argument is an integer representing the seconds to cache (must be >= 1). |
-
-&nbsp;
-
-::: tip
-If you configure both **`$maxAge`** and **`$maxCount`**, events then become eligible for scavenging when either
-condition is met. For example, if you set **`$maxAge`** to 10 seconds and **`$maxCount`** to 50,000, events
-qualify for scavenging after either 10 seconds or the accumulation of 50,000 events. Affected items are removed once the scavenge process runs.
-:::
-
-**Security access control lists (ACLs)** are part of the **`$acl`** section in the stream metadata.
-
-| Property name | Description                                     |
-| :------------ | :---------------------------------------------- |
-| **`$r`**      | Users with read permissions                     |
-| **`$w`**      | Users with write permissions                    |
-| **`$d`**      | Users with delete permissions                   |
-| **`$mw`**     | Users with write permissions to stream metadata |
-| **`$mr`**     | Users with read permissions to stream metadata  |
-
-You can find more information on ACLs in the [access control lists documentation](./security.md#access-control-lists).
-
-## Event metadata
-
-All names starting with **`$`** are reserved for internal use. The currently supported reserved internal names include:
-
-| Property name        | Description                                           |
-| :------------------- | :---------------------------------------------------- |
-| **`$correlationId`** | The application-level correlation ID for the message. |
-| **`$causationId`**   | The application-level causation ID for the message.   |
-
-Projections within EventStoreDB adhere to both the **`correlationId`** and **`causationId`** patterns for any events they internally produce (e.g., through functions like `linkTo` and `emit`).
-
-## Deleting streams and events
-
-In EventStoreDB, metadata can determine whether an event is deleted or not. You can use [stream metadata](#metadata-and-reserved-names) elements such as **`TruncateBefore`**, **`MaxAge`**, and **`MaxCount`** to
-filter events marked as deleted. During a stream read, the index references the stream's metadata to determine if any events have been deleted.
-
-::: note
-In EventStoreDB, you cannot selectively delete events from the middle of a stream. It only allows truncating the stream.
-:::
-
-When you delete a stream, EventStoreDB offers two options: **soft delete** or **hard delete**.
-
-**Soft delete** triggers scavenging, removing all events from the stream during the subsequent scavenging process. This allows for the reopening of the stream by appending new events.
-
-It's worth noting that the **`$all`** stream circumvents index checking. Deleted events within this stream remain readable until a scavenging process removes them. To understand the prerequisites for successful event removal through scavenging, refer to the [scavenging guide](operations.md#scavenging).
-
-Even if a stream has been deleted, EventStoreDB retains one event within the stream to indicate the stream's existence and provide information about the last event version. As a best practice, consider appending a specific event like **`StreamDeleted`** and then setting the **`MaxCount`** to 1 to delete the stream. Keep this in mind, especially when dealing with streams containing sensitive data that you want to erase thoroughly and without a trace.
-
-### Soft delete and TruncateBefore
-
-In event sourcing, **`TruncateBefore`** (or **`$tb`**) designates any event with an event number lower than its value as deleted. For instance, consider a stream with the following events:
-
-```
-0@test-stream
-1@test-stream
-2@test-stream
-3@test-stream
-```
-
-Setting the **`TruncateBefore`** (or **`$tb`**) value to 3, results in reading only the last event:
-
-```
-3@test-stream
-```
-
-A **soft delete** leverages **`TruncateBefore`** (or **`$tb`**). When you delete a stream, **`TruncateBefore`**
-(or **`$tb`**) is set to the [max long/Int64 value](https://docs.microsoft.com/en-us/dotnet/api/system.int64.maxvalue?view=net-5.0): 9223372036854775807.
-
-If you attempt to read this soft-deleted stream the read returns a **`StreamNotFound`** or **`404`** result.
-
-Appending to the stream later adds events starting from the last stream revision before deletion, incremented by one. Continuing with our previous example, a new event would be appended with event number 4, and only events from event number 4 onwards are visible when you read this stream.
-
-### Max count and Max age
-
-**Max count** (**`$maxCount`** and **`MaxCount`**) restricts the number of events you can read from a stream. Reading a stream with a max count of 5 allows you to retrieve only the last 5 events, regardless of the total events in the stream.
-
-**Max age** (**`$maxAge`** and **`MaxAge`**) specifies the time an event can live in seconds. The age is
-calculated at the time of the read. For example, if you read a stream with a **`MaxAge`** of 3 minutes, an event that has existed for 4 minutes won't be returned.
-
-### Hard delete
-
-A **hard delete** involves appending a **`tombstone`** event to the stream and permanently deleting it. This action prevents stream recreation or further appends. Tombstone events are appended with the event type **`$streamDeleted`**.
-Any attempt to append or read a hard-deleted stream, the response is a **`StreamDeleted`** or **`410`** result.
-
-While events in the deleted stream are subject to removal during a scavenge, the tombstone event remains.
-
-::: note
-Hard deletion of a stream is permanent; you cannot append or recreate it.
-It is recommended to opt for soft deletion for streams unless you have a specific requirement for permanent removal.
-:::
-
-### Deleted events and projections
-
-If you plan to use projections and delete streams, there are some considerations:
-
-- In the context of **`$all`**, projections using **`fromAll`** read any deleted events that have not been scavenged. They also receive tombstone events from any hard deletions.
-
-- System projections like [by category](projections.md#by-category) or [by event type](projections.md#by-event-type) produce new link events stored alongside
-  the original event in the database. When original events are deleted, link events remain in the projected streams, but their links remain unresolved (with undefined values). You can ignore those events in the code logic.
-
-## System events and streams
-
-### **`$persistentSubscriptionConfig`**
-
-**`$persistentSubscriptionConfig`** is a specialized paged stream that stores all configuration events for all
-persistent subscriptions. It uses the **`$PersistentConfig`** system event type (previously **`PersistentConfig1`**), capturing configuration changes.
-The event data includes:
-
-| Property name   | Description                                   |
-| :-------------- | :-------------------------------------------- |
-| **`version`**   | Event data version                            |
-| **`updated`**   | Date of the update                            |
-| **`updatedBy`** | User responsible for the configuration update |
-| **`maxCount`**  | The number of configuration events to retain  |
-| **`entries`**   | Configuration items set by the event          |
-
-### **`$all`**
-
-**`$all`** is a dedicated paged stream containing all events. You can employ the same paged reading method described earlier to
-read all events for a node by pointing the stream at _/streams/\$all_. Like any other stream, you can perform all operations, except posting to it.
-
-### **`$settings`**
-
-The **`$settings`** stream hosts a special ACL serving as the default ACL. It governs the default ACL for streams lacking ACLs and controls who can create streams within the system.
-
-Learn more about the default ACL in the [access control lists](security.md#default-acl) documentation.
-
-### **`$stats`**
-
-EventStoreDB offers debugging and statistical information about a cluster within the **`$stats`** stream. Find out
-more in [the stats guide](diagnostics/README.md#statistics).
-
-### **`$scavenges`**
-
-**`$scavenges`** represents a specialized paged stream for all scavenge-related events. It uses the following system event
-types:
-
-- **`$scavengeIndexInitialized`**: An event that records the initialization of the scavenge index.
-- **`$scavengeStarted`**: An event that records the beginning of a scavenge process. The event data contains:
-
-  - **`scavengeId`**: Scavenge event ID
-  - **`nodeEndpoint`**: Node address
-
-- **`$scavengeCompleted`**: An event that records the completion of a scavenge process. The event data contains:
-  - **`scavengeId`**: Scavenge event ID
-  - **`nodeEndpoint`**: Node address
-  - **`result`**: **`Success`**, **`Failed`**, **`Stopped`**
-  - **`error`**: Error details
-  - **`timeTaken`**: Duration of the scavenging process in milliseconds
-  - **`spaceSaved`**: Space saved by scavenge process in bytes.
diff --git a/docs/upgrade-guide.md b/docs/upgrade-guide.md
deleted file mode 100644
index 103f0df7ca8..00000000000
--- a/docs/upgrade-guide.md
+++ /dev/null
@@ -1,141 +0,0 @@
----
-title: "Upgrade Guide"
----
-
-# Upgrade guide for EventStoreDB 24.6
-
-EventStoreDB 24.6 is now available for download. You can install it using [Packagecloud](https://packagecloud.io/EventStore/EventStore-OSS), [Chocolatey](https://chocolatey.org/packages/eventstore-oss), or [Docker](https://hub.docker.com/r/eventstore/eventstore/tags?page=1&name=24.6).  Packages are available on our [website](https://www.eventstore.com/downloads) with detailed instructions for each platform.
-
-### Should you upgrade?
-
-Version 24.6 is an interim release that will be supported until the launch of version 24.10 in October 2024.
-We recommend upgrading to 24.6 if you are interested in using the new features introduced in this release.
-
-::: warning
-Do not upgrade to version 24.6 if your applications rely on the external TCP API. This has been removed in 24.2. See the [breaking changes](#external-tcp-api-removed) for more information. You can prevent automatic upgrades by pinning the version in your package manager. Find out about package holding on Linux [here](https://askubuntu.com/questions/18654/how-to-prevent-updating-of-a-specific-package).
-
-The commercial version of EventStoreDB 24.6 includes a plugin that enables the TCP client protocol. 
-:::
-
-### Security update
-
-If you are not upgrading to 24.6, please ensure that you are running a patch of EventStoreDB with the security release addressing [CVE-2024-26133](https://www.eventstore.com/blog/eventstoredb-security-release-23.10-22.10-21.10-and-20.10-for-cve-2024-26133):
-
-- **Version 23.10.0:** Upgrade to at least 23.10.1.
-- **Versions 22.10.x:** Upgrade to at least 22.10.5 or 23.10.1.
-- **Versions 21.10.x:** Upgrade to at least 21.10.11 for the security fix, or 22.10.5 for ongoing support.
-- **Versions 20.10.x:** Upgrade to at least 20.10.6 for the security fix, or 22.10.5 for ongoing support.
-
-### Upgrade procedure
-
-You can perform an online rolling upgrade directly to 24.6 from these versions of EventStoreDB:
-- 24.2
-- 23.10
-- 22.10
-- 21.10
-
-Follow the upgrade procedure below on each node, starting with a follower node:
-
-1. Stop the node.
-2. Upgrade EventstoreDB to 24.6 and update configuration.
-3. Start the node.
-4. Wait for the node to become a follower or read-only replica.
-5. Repeat the process for the next node.
-
-As illustrated below:
-
-![EventStoreDB upgrade procedure for each node](./images/upgrade-procedure.png)
-
-Upgrading the cluster in this manner keeps the cluster online and able to service requests. There may still be disruptions to your services during the upgrade, namely:
-- Client connections may be disconnected when nodes go offline, or when elections take place.
-- The cluster is less fault-tolerant while a node is offline for an upgrade because the cluster requires a quorum of nodes to be online to service write requests.
-- Replicating large amounts of data to a node can have a performance impact on the Leader in the cluster.
-
-::: warning
-If you modified the Linux service file to increase the open files limit, those changes will be overridden during the upgrade. You will need to reapply them after the upgrade.
-:::
-
-### Breaking changes
-
-#### From version 23.10 and earlier
-
-##### External TCP API removed
-
-The external TCP API has been removed in 24.2.0. This affects external clients using the TCP API and configurations related to it.
-
-A number of configuration options have been removed as part of this. EventStoreDB will not start by default if any of the following options are present in the database configuration:
-- `AdvertiseTcpPortToClientAs`
-- `DisableExternalTcpTls`
-- `EnableExternalTcp`
-- `ExtHostAdvertiseAs`
-- `ExtTcpHeartbeatInterval`
-- `ExtTcpHeartbeatTimeout`
-- `ExtTcpPort`
-- `ExtTcpPortAdvertiseAs`
-- `NodeHeartbeatInterval`
-- `NodeHeartbeatTimeout`
-- `NodeTcpPort`
-- `NodeTcpPortAdvertiseAs`
-
-#### From version 22.10 and earlier
-
-The updates to anonymous access described in the [release notes](https://www.eventstore.com/blog/23.10.0-release-notes) have introduced some breaking changes. We have also removed, renamed, and deprecated some options in EventStoreDB.
-
-None of these changes will prevent you from performing an online rolling upgrade of the cluster, but you will need to take them into account before you perform an upgrade.
-
-When upgrading from 22.10 and earlier, you will need to account for the following breaking changes:
-
-##### Clients must be authenticated by default
-
-We have disabled anonymous access to streams by default in this version. This means that read and write requests from clients need to be authenticated.
-
-If you see authentication errors when connecting to EventStoreDB after upgrading, please ensure that you are either using default credentials on the connection, or are providing user credentials with the request itself.
-
-If you want to revert back to the old behavior, you can enable the `AllowAnonymousStreamAccess` and `AllowAnonymousEndpointAccess` options in EventStoreDB.
-Requests to the HTTP API must be authenticated by default.
-Like with anonymous access to streams, anonymous access to the HTTP and gRPC endpoints has been disabled by default. The exceptions are the `/gossip`, `/info`, and `/ping` endpoints.
-
-Any tools or monitoring scripts accessing the HTTP endpoints (e.g. `/stats`) will need to make authenticated requests to EventStoreDB.
-
-If you want to revert back to the old behavior, you can enable the `AllowAnonymousStreamAccess` and `AllowAnonymousEndpointAccess` options in EventStoreDB.
-
-##### PrepareCount and CommitCount options have been removed
-
-We have removed the `PrepareCount` and `CommitCount` options from EventStoreDB. EventStoreDB will now fail if these options are present in the config on startup.
-
-These options did not have any effect and can be safely removed from your configuration file if you have them defined.
-
-##### Persistent subscriptions config event has been renamed
-
-We have renamed the event type used to store a persistent subscriptions configuration from `PersistentConfig1` to `$PersistentConfig`. This event type is a system event, so naming it as such will allow certain filters to exclude it correctly.
-
-If you have any tools or clients relying on this event type, then you will need to update them before you upgrade.
-
-#### From 21.10 and earlier
-
-If you are upgrading from version 21.10 and earlier, then you need to be aware of a breaking change in the TCP proto:
-
-##### Proto2 upgraded to Proto3 (TCP)
-
-The server now uses Proto3 for messages sent over TCP. This affects replication between servers in a cluster.
-
-EventStoreDB nodes on version 22.10 cannot replicate data to version 21.10 and below, but older nodes can still replicate to version 22.10 and above.
-Follow the [upgrade procedure](#upgrade-procedure) and ensure that the Leader node is the last node to be upgraded to avoid any issues.
-
-##### Deprecated configuration options
-
-Several options are deprecated and slated for removal in future releases. See the table below for guidance.
-
-| Deprecated Option             | Use Instead                     |
-|:------------------------------|:--------------------------------|
-| `ExtIp`                       | `NodeIp`                        |
-| `ExtPort`                     | `NodePort`                      |
-| `HttpPortAdvertiseAs`         | `NodePortAdvertiseAs`           |
-| `ExtHostAdvertiseAs`          | `NodeHostAdvertiseAs`           |
-| `AdvertiseHttpPortToClientAs` | `AdvertiseNodePortToClientAs`   |
-| `IntIp`                       | `ReplicationIp`                 |
-| `IntTcpPort`                  | `ReplicationTcpPort`            |
-| `IntTcpPortAdvertiseAs`       | `ReplicationTcpPortAdvertiseAs` |
-| `IntHostAdvertiseAs`          | `ReplicationHostAdvertiseAs`    |
-| `IntTcpHeartbeatTimeout`      | `ReplicationHeartbeatTimeout`   |
-| `IntTcpHeartbeatInterval`     | `ReplicationHeartbeatInterval`  |
diff --git a/docs/usage-telemetry.md b/docs/usage-telemetry.md
deleted file mode 100644
index 5875642572c..00000000000
--- a/docs/usage-telemetry.md
+++ /dev/null
@@ -1,105 +0,0 @@
-# Usage telemetry
-
-Starting with version 23.10 LTS, EventStoreDB has introduced a telemetry feature. This collects anonymous, aggregated usage statistics and sends them periodically to Event Store Ltd. Telemetry data helps us refine and improve our product based on real usage patterns.
-
-## What is usage telemetry
-
-EventStoreDB telemetry only tracks non-Personally-Identifiable Information. Collected data does not allow Event Store to fingerprint the users by any of the collected data points.
-
-Examples of the telemetry data collected:
-
-* EventStoreDB version number
-* Cluster or instance size
-* Node machine size
-* Is cluster or instance configured in secure mode
-* Legacy TCP client protocol enabled
-* Legacy AtomPub protocol enabled
-* Number of running projections
-* Number of running persistent subscriptions
-
-What EventStoreDB **does not** track:
-
-* Stream names
-* Stream metadata
-* Event payloads
-* Event metadata
-* Usernames and passwords
-
-Here's an example of a full telemetry message from a single-node instance:
-
-```json
-{
-  "version": "23.10.0.0",
-  "tag": "oss-v23.10.0",
-  "uptime": "00:01:11.0115732",
-  "cluster": {
-    "leaderId": "81e9ca2a-8acc-41ed-b9d0-65a652b36801",
-    "nodeId": "81e9ca2a-8acc-41ed-b9d0-65a652b36801",
-    "nodeState": "Leader"
-  },
-  "configuration": {
-    "clusterSize": 1,
-    "enableAtomPubOverHttp": true,
-    "enableExternalTcp": true,
-    "insecure": false,
-    "runProjections": "None"
-  },
-  "database": {
-    "epochNumber": 29,
-    "firstEpochId": "b02f1ba6-98a3-473f-ade7-dcd1476b2149",
-    "activeChunkNumber": 2
-  },
-  "environment": {
-    "coreCount": 24,
-    "isContainer": false,
-    "isKubernetes": false,
-    "processorArchitecture": "X64",
-    "totalDiskSpace": 1000186310656,
-    "totalMemory": 68631052288
-  },
-  "gossip": {
-    "81e9ca2a-8acc-41ed-b9d0-65a652b36801": "Leader"
-  },
-  "persistentSubscriptions": {
-    "count": 0
-  },
-  "projections": {
-    "customProjectionCount": 0,
-    "standardProjectionCount": 5,
-    "customProjectionRunningCount": 0,
-    "standardProjectionRunningCount": 5,
-    "totalCount": 5,
-    "totalRunningCount": 5
-  }
-}
-```
-
-## Disclosure
-
-On startup, EventStoreDB produces a message to the console and to the diagnostic logs, which looks similar to:
-
-```
-Telemetry
----------
-EventStoreDB collects usage data in order to improve your experience. The data is anonymous and collected by Event Store Ltd.
-You can opt out of sending telemetry by setting the EVENTSTORE_TELEMETRY_OPTOUT environment variable to true.
-For more information visit https://eventstore.com/telemetry
-```
-
-If telemetry collection is disabled (see below), the disclosure is still shown with a different text:
-
-```
-Telemetry
----------
-EventStoreDB collects usage data in order to improve your experience. The data is anonymous and collected by EventStore Ltd.
-You have opted out of sending telemetry by setting the EVENTSTORE_TELEMETRY_OPTOUT environment variable to true.
-For more information visit https://eventstore.com/telemetry
-```
-
-## Reporting frequency
-
-To avoid tracking short-lived instances (like containers used for tests), telemetry data is sent one hour after the cluster node starts. Following this, updates are sent every 24 hours. All transmissions are logged for transparency to the server console and in the log file.
-
-## How to opt out
-
-Telemetry transmission can be disabled by setting the `EVENTSTORE_TELEMETRY_OPTOUT` environment variable to `true`. EventStoreDB will still collect the information required to produce telemetry messages, and those messages will be produced to console and diagnostic log, but they will not be sent to Event Store Ltd.
diff --git a/docs/whatsnew.md b/docs/whatsnew.md
deleted file mode 100644
index d3028f757b1..00000000000
--- a/docs/whatsnew.md
+++ /dev/null
@@ -1,150 +0,0 @@
-# What's New
-
-This page describes new features and other changes in EventStoreDB 24.6.
-
-## New features
-
-- **Legacy TCP Client API plugin** <Badge type="warning" text="Commercial" vertical="middle" />
-- **macOS arm64 support for development purposes**
-- **Additional metrics**
-
-### Legacy TCP Client API plugin <Badge type="warning" text="Commercial" vertical="middle" />
-
-EventStoreDB v23.10 is the last release to natively support the legacy TCP-based client protocol.
-Version 24.2 removed it completely.
-
-This release introduces a new plugin that allows to connect to the database with the legacy TCP API.
-This is a stop-gap solution for customers who have not yet upgraded to the gRPC API.
-
-Read more about enabling and configuration of the TCP API plugin in the [documentation](networking.md#external-tcp).
-
-### Apple Silicon support for development
-
-An alpha build was available for running EventStoreDB on arm64 processors since EventStoreDB v22.10 using a [Docker image](https://hub.docker.com/r/eventstore/eventstore/tags?page=&page_size=&ordering=&name=arm64).
-
-Since version 24.6, EventStoreDB can now be built from source and executed on macOS with Apple Silicon.
-
-### Additional metrics
-
-Continuing the work on observability, the following [metrics](diagnostics/metrics.md) are now available.
-
-* [Election counter](diagnostics/metrics.md#elections-count): `eventstore_elections_count`
-* [Projections](diagnostics/metrics.md#projections).
-    * Projection status: `eventstore_projection_status`
-    * Percent progress: `eventstore_projection_progress`
-    * Events processed since restart: `eventstore_projection_events_processed_after_restart_total`
-* [Persistent Subscriptions](diagnostics/metrics.md#persistent-subscriptions):
-    * Connection count: `eventstore_persistent_sub_connections`
-    * Total in-flight messages : `eventstore_persistent_sub_in_flight_messages`
-    * Total number of parked messages: `eventstore_persistent_sub_parked_messages`
-    * Oldest Parked Message: `eventstore_persistent_sub_oldest_parked_message_seconds`
-    * Total Number of Item processed: `eventstore_persistent_sub_items_processed`
-    * Last Seen Message:
-        * `eventstore_persistent_sub_last_known_event_number`
-        * `eventstore_persistent_sub_last_known_event_commit_position`
-    * Last checkpoint event:
-        * `eventstore_persistent_sub_checkpointed_event_number`
-        * `eventstore_persistent_sub_checkpointed_event_commit_position`
-
-## Feature enhancements
-
-- **Performance improvements**
-- **X.509 authentication in client libraries**
-- **Metric support for Linux, FreeBSD, macOS**
-- **Allow specifying the status Code for health requests**
-- **Fix: Events in explicit transactions can be missing in `$all` reads**
-- **Miscellaneous**
-
-### Performance improvements
-
-Several performance and compatibility improvements have been made to EventStoreDB and client SDKs, described below.
-
-#### Reduced FileHandle usage by 80%
-
-The number of file handles used by the database has been reduced by 80%. On large databases it results in:
-* Reduced likelihood of hitting the default OS file handle limit
-* Lower overall memory footprint
-
-#### Faster Startup For Scavenged databases
-
-Large database with thousands of scavenged chunks now starts faster.
-A 10x improvement has been observed in testing.
-
-### X.509 authentication in client APIs <Badge type="warning" text="Commercial" vertical="middle" />
-
-Refer to the [clients documentation](@clients/grpc/authentication.md) for instructions on how to enable and use X.509 certificates with the EventStoreDB clients.
-
-### Metrics support for Linux, FreeBSD, OSX
-
-The following [System metrics](diagnostics/metrics.md#system) are now available on the following platforms:
-* `eventstore_sys_load_avg`: Linux, FreeBSD, macOS, Windows
-* `eventstore_sys_cpu`: Linux, FreeBSD, macOS
-
-The following [Process metrics](diagnostics/metrics.md#process) are now available on the following platforms:
-* `eventstore_disk_io_bytes`: Linux, Windows and macOS
-
-### Allow specifying the HTTP status Code for health requests
-
-The HTTP status code to be returned by the `/health/live` endpoint can be provided using the `liveCode` query parameter.
-For example, making a `GET` HTTP call to `/health/live?liveCode=200` will return an empty response with `200 OK` status code.
-
-This is useful for liveness probe expecting specific status code.
-
-### Fix - Events in explicit transactions can be missing from $all reads
-
-This bug only appears with events written in explicit transactions with the deprecated TCP API.
-They will not appear on filtered $all reads and subscriptions under specific circumstances.
-
-This [fix](https://github.com/EventStore/EventStore/pull/4251) will also be back ported to v23.10.2 and v22.10.6.
-
-### Miscellaneous
-
-* Index merge will now continue without bloom filters if there is not enough memory to store them.
-* Node advertise address is used for identifying nodes in the scavenge log.
-* Incomplete scavenges that previously got status `Failed` will now be marked as `Interrupted`.
-* Error will be logged when the node certificate does not have the necessary usages.
-* More information made available in the current database options API response.
-* Projections will now log a warning when the projection state size becomes greater than 8 MB.
-
-## Breaking changes
-
-### Persistent subscription checkpoint event type
-
-The persistent subscription checkpoint event type has been changed from `SubscriptionCheckpoint` to `$SubscriptionCheckpoint`.  
-Checkpoints written before upgrading will still have the old event type and will continue to work.
-
-### Deposed leader truncation: Two restarts needed
-
-Previously a deposed leader that needed offline truncation would:
-* Set a truncate checkpoint and shutdown
-* Upon restart, truncate its log and join the cluster
-
-The process is now:
-* Set a truncate checkpoint and shutdown
-* Upon restart, truncate its log, shutdown
-
-This will affect nodes that run under a Service Manager configured to disallow successive stops of the process, like [systemd](https://systemd.io/) with `StartLimitIntervalSec` and `StartLimitBurst`.
-
-### File-copy backup and restore: Two restarts needed
-
-Part of the file copy [backup and restore procedure](operations.md#simple-full-backup-restore) requires copying the chaser checkpoint file over the truncate checkpoint file.   
-This might trigger the database to truncate the log on startup.
-
-Previously the process was:
-* Set the truncate checkpoint
-* Start the node.
-
-The process is now:
-* Set the truncate checkpoint
-* Start the node
-    * if needed, the log will be truncated and the node will shut down
-* Start the node
-
-This will affect nodes that run under a Service Manager configured to disallow successive stops of the process, like [systemd](https://systemd.io/) with `StartLimitIntervalSec` and `StartLimitBurst`
-
-### Unbuffered config setting
-
-The `--unbuffered` config setting is deprecated and has no effect when set to `true`.
-This option was used to enable unbuffered and direct IO when writing to the file system, and it is no longer supported.
-
-You can read more about any breaking changes and what you should be aware of during an upgrade in the [Upgrade Guide](upgrade-guide.md).
diff --git a/proto.lock b/proto.lock
index fdb0a80f671..207ed9d455e 100644
--- a/proto.lock
+++ b/proto.lock
@@ -4726,12 +4726,12 @@
           }
         ],
         "package": {
-          "name": "event_store.client.redaction"
+          "name": "kurrent.client.redaction"
         },
         "options": [
           {
             "name": "java_package",
-            "value": "com.eventstore.dbclient.proto.redaction"
+            "value": "com.kurrent.dbclient.proto.redaction"
           }
         ]
       }
@@ -4941,6 +4941,26 @@
               }
             ]
           },
+          {
+            "name": "MaximumAppendEventSizeExceeded",
+            "fields": [
+              {
+                "id": 1,
+                "name": "eventId",
+                "type": "string"
+              },
+              {
+                "id": 2,
+                "name": "proposedEventSize",
+                "type": "uint32"
+              },
+              {
+                "id": 3,
+                "name": "maxAppendEventSize",
+                "type": "uint32"
+              }
+            ]
+          },
           {
             "name": "BadRequest",
             "fields": [
diff --git a/qodana.yaml b/qodana.yaml
index 071025b54ee..e728ccbc8d3 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -3,18 +3,23 @@ version: "1.0"
 linter: jetbrains/qodana-dotnet:2024.1
 
 dotnet:
-  solution: src/EventStore.sln
+  solution: src/KurrentDB.sln
+
+exclude:
+  - name: RedundantTypeArgumentsOfMethod
 
 #
 # License Audit
 #
 
-# Dependencies to exclude from the License Audit
-dependencyIgnores:
-  - name: "EventStore.Plugins" # Our own software
+licenseRules:
+  - keys:
+      - "PROPRIETARY-LICENSE"
+    allowed:
+      - "Kurrent-1.0"
 
 customDependencies:
-  # System.UriTemplate (source copied under src/EventStore.NETCore.Compatibility from .NET 4.8 with some modifications)
+  # System.UriTemplate (source copied under src/KurrentDB.NETCore.Compatibility from .NET 4.8 with some modifications)
   - name: "System.UriTemplate"
     version: ""
     licenses:
@@ -22,6 +27,13 @@ customDependencies:
 
 # Manually specify the licenses of the following packages
 dependencyOverrides:
+  # not automatically detectable
+  - name: "EventStore.Plugins"
+    version: "25.2.5"
+    licenses:
+      - key: "Kurrent-1.0"
+        url: "https://github.com/EventStore/EventStore/blob/master/LICENSE.md"
+
   # not automatically detectable, but the MIT license is in the nuget package
   - name: "NETStandard.Library"
     version: "2.0.3"
@@ -43,37 +55,9 @@ dependencyOverrides:
       - key: "MIT"
         url: "https://github.com/mono/mono/blob/main/LICENSE"
 
-  # not automatically detectable in this older package
-  - name: "OpenTelemetry"
-    version: "1.4.0-rc.1"
-    licenses:
-      - key: "Apache-2.0"
-        url: "https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/LICENSE.TXT"
-
-  # not automatically detectable in this older package
-  - name: "OpenTelemetry.Api"
-    version: "1.4.0-rc.1"
-    licenses:
-      - key: "Apache-2.0"
-        url: "https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/LICENSE.TXT"
-
-  # not automatically detectable in this older package
+  # not automatically detectable
   - name: "OpenTelemetry.Exporter.Prometheus.AspNetCore"
-    version: "1.4.0-rc.1"
-    licenses:
-      - key: "Apache-2.0"
-        url: "https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/LICENSE.TXT"
-
-  # not automatically detectable in this older package
-  - name: "OpenTelemetry.Extensions.DependencyInjection"
-    version: "1.4.0-rc.1"
-    licenses:
-      - key: "Apache-2.0"
-        url: "https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/LICENSE.TXT"
-
-  # not automatically detectable in this older package
-  - name: "OpenTelemetry.Extensions.Hosting"
-    version: "1.4.0-rc.1"
+    version: "1.11.0-beta.1"
     licenses:
       - key: "Apache-2.0"
         url: "https://github.com/open-telemetry/opentelemetry-dotnet/blob/main/LICENSE.TXT"
diff --git a/samples/http-api/add-sample-data.sh b/samples/http-api/add-sample-data.sh
index 65d702a6343..c55cdcc9a71 100644
--- a/samples/http-api/add-sample-data.sh
+++ b/samples/http-api/add-sample-data.sh
@@ -1,7 +1,7 @@
-curl -i -d "@shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1164.json" -u "admin:changeit" "http://127.0.0.1:2113/streams/shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1164" -H "Content-Type:application/vnd.eventstore.events+json"
+curl -i -d "@shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1164.json" -u "admin:changeit" "http://127.0.0.1:2113/streams/shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1164" -H "Content-Type:application/vnd.kurrent.events+json"
 
-curl -i -d "@shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1165.json" -u "admin:changeit" "http://127.0.0.1:2113/streams/shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1165" -H "Content-Type:application/vnd.eventstore.events+json"
+curl -i -d "@shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1165.json" -u "admin:changeit" "http://127.0.0.1:2113/streams/shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1165" -H "Content-Type:application/vnd.kurrent.events+json"
 
-curl -i -d "@shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1166.json" -u "admin:changeit" "http://127.0.0.1:2113/streams/shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1166" -H "Content-Type:application/vnd.eventstore.events+json"
+curl -i -d "@shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1166.json" -u "admin:changeit" "http://127.0.0.1:2113/streams/shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1166" -H "Content-Type:application/vnd.kurrent.events+json"
 
-curl -i -d "@shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1167.json" -u "admin:changeit" "http://127.0.0.1:2113/streams/shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1167" -H "Content-Type:application/vnd.eventstore.events+json"
\ No newline at end of file
+curl -i -d "@shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1167.json" -u "admin:changeit" "http://127.0.0.1:2113/streams/shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1167" -H "Content-Type:application/vnd.kurrent.events+json"
\ No newline at end of file
diff --git a/samples/http-api/append-data-event.sh b/samples/http-api/append-data-event.sh
index efd3239ae30..8225c86b0b5 100644
--- a/samples/http-api/append-data-event.sh
+++ b/samples/http-api/append-data-event.sh
@@ -1,19 +1,19 @@
 #region curl
 curl -i -d "SGVsbG8gV29ybGQ=" "http://127.0.0.1:2113/streams/newstream" \
     -H "Content-Type:application/octet-stream" \
-    -H "ES-EventType:rawDataType" \
-    -H "ES-EventId:eeccf3ce-4f54-409d-8870-b35dd836cca6"
+    -H "Kurrent-EventType:rawDataType" \
+    -H "Kurrent-EventId:eeccf3ce-4f54-409d-8870-b35dd836cca6"
 #endregion curl
 
 #region response
 HTTP/1.1 201 Created
 Access-Control-Allow-Methods: POST, DELETE, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTo, ES-ExpectedVersion
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTo, Kurrent-ExpectedVersion
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position
+Access-Control-Expose-Headers: Location, Kurrent-Position
 Location: http://127.0.0.1:2113/streams/newstream/0
 Content-Type: text/plain; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Mon, 27 Jun 2016 13:15:27 GMT
 Content-Length: 0
 Keep-Alive: timeout=15,max=100
diff --git a/samples/http-api/append-event-follow.sh b/samples/http-api/append-event-follow.sh
index dd75a6c68a2..eae3262455f 100644
--- a/samples/http-api/append-event-follow.sh
+++ b/samples/http-api/append-event-follow.sh
@@ -1,17 +1,17 @@
 #region curl
 curl -i -d "@event.json" "http://127.0.0.1:2113/streams/newstream/incoming/8a00e469-3a99-4517-a0b0-8dc662ffad9b" \
-    -H "Content-Type: application/json" -H "ES-EventType: SomeEvent"
+    -H "Content-Type: application/json" -H "Kurrent-EventType: SomeEvent"
 #endregion curl
 
 #region response
 HTTP/1.1 201 Created
 Access-Control-Allow-Methods: GET, POST, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Location: http://127.0.0.1:2113/streams/newstream/0
 Content-Type: text/plain; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Tue, 24 Jul 2018 14:46:10 GMT
 Content-Length: 0
 Keep-Alive: timeout=15,max=100
diff --git a/samples/http-api/append-event-no-id.sh b/samples/http-api/append-event-no-id.sh
index af68f3b12ba..e5755320097 100644
--- a/samples/http-api/append-event-no-id.sh
+++ b/samples/http-api/append-event-no-id.sh
@@ -1,18 +1,18 @@
 #region curl
 curl -i -d "@event.json" "http://127.0.0.1:2113/streams/newstream" \
     -H "Content-Type:application/json" \
-    -H "ES-EventType: SomeEvent"
+    -H "Kurrent-EventType: SomeEvent"
 #endregion curl
 
 #region response
 HTTP/1.1 307 Temporary Redirect
 Access-Control-Allow-Methods: POST, DELETE, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Location: http://127.0.0.1:2113/streams/newstream/incoming/8a00e469-3a99-4517-a0b0-8dc662ffad9b
 Content-Type: text/plain; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Tue, 24 Jul 2018 14:42:44 GMT
 Content-Length: 28
 Keep-Alive: timeout=15,max=100
diff --git a/samples/http-api/append-event-no-type.sh b/samples/http-api/append-event-no-type.sh
index bbbfe250bd9..f911c94342b 100644
--- a/samples/http-api/append-event-no-type.sh
+++ b/samples/http-api/append-event-no-type.sh
@@ -3,13 +3,13 @@ curl -i -d "@event.json" "http://127.0.0.1:2113/streams/newstream" -H "Content-T
 #endregion curl
 
 #region response
-HTTP/1.1 400 Must include an event type with the request either in body or as ES-EventType header.
+HTTP/1.1 400 Must include an event type with the request either in body or as Kurrent-EventType header.
 Access-Control-Allow-Methods: POST, DELETE, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Content-Type:
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Tue, 24 Jul 2018 14:50:59 GMT
 Content-Length: 0
 Connection: close
diff --git a/samples/http-api/append-event-noid.sh b/samples/http-api/append-event-noid.sh
index 16a4a66f084..101c63394af 100644
--- a/samples/http-api/append-event-noid.sh
+++ b/samples/http-api/append-event-noid.sh
@@ -1,2 +1,2 @@
 curl -i -d @event-no-id.json "http://127.0.0.1:2113/streams/newstream" \
-    -H "Content-Type:application/vnd.eventstore.events+json"
+    -H "Content-Type:application/vnd.kurrent.events+json"
diff --git a/samples/http-api/append-event-to-new-stream.sh b/samples/http-api/append-event-to-new-stream.sh
index 5b37c8d2a00..71d62cd6e3d 100644
--- a/samples/http-api/append-event-to-new-stream.sh
+++ b/samples/http-api/append-event-to-new-stream.sh
@@ -1,6 +1,6 @@
 #region curl
 curl -i -d "@event.json" "http://127.0.0.1:2113/streams/newstream" \
-    -H "Content-Type:application/vnd.eventstore.events+json"
+    -H "Content-Type:application/vnd.kurrent.events+json"
     -u "admin:changeit"
 #endregion curl
 
@@ -11,7 +11,7 @@ Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-PINGOTHER
 Access-Control-Allow-Origin: *
 Location: http://127.0.0.1:2113/streams/newstream/0
 Content-Type: text/plain; charset: utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Fri, 28 Jun 2013 12:17:59 GMT
 Content-Length: 0
 Keep-Alive: timeout=15,max=100
diff --git a/samples/http-api/append-event-version.sh b/samples/http-api/append-event-version.sh
index 20087899b4b..be9e9db167e 100644
--- a/samples/http-api/append-event-version.sh
+++ b/samples/http-api/append-event-version.sh
@@ -1,18 +1,18 @@
 #region curl
 curl -i -d @event-version.json "http://127.0.0.1:2113/streams/newstream" \
-    -H "Content-Type:application/vnd.eventstore.events+json" \
-    -H "ES-CurrentVersion: 0"
+    -H "Content-Type:application/vnd.kurrent.events+json" \
+    -H "Kurrent-ExpectedVersion: 0"
 #endregion curl
 
 #region response
 HTTP/1.1 201 Created
 Access-Control-Allow-Methods: POST, DELETE, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Location: http://127.0.0.1:2113/streams/newstream/2
 Content-Type: text/plain; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Tue, 14 Aug 2018 10:02:08 GMT
 Content-Length: 0
 Keep-Alive: timeout=15,max=100
diff --git a/samples/http-api/append-event-wrong-version.sh b/samples/http-api/append-event-wrong-version.sh
index a61c26e3bf2..ce9eb5d5c4e 100644
--- a/samples/http-api/append-event-wrong-version.sh
+++ b/samples/http-api/append-event-wrong-version.sh
@@ -1,18 +1,18 @@
 #region curl
 curl -i -d @event-version.json "http://127.0.0.1:2113/streams/newstream" \
-    -H "Content-Type:application/vnd.eventstore.events+json" \
-    -H "ES-ExpectedVersion: 3"
+    -H "Content-Type:application/vnd.kurrent.events+json" \
+    -H "Kurrent-ExpectedVersion: 3"
 #endregion curl
 
 #region response
 HTTP/1.1 400 Wrong expected EventNumber
 Access-Control-Allow-Methods: POST, DELETE, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
-ES-CurrentVersion: 0
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
+Kurrent-CurrentVersion: 0
 Content-Type: text/plain; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Tue, 14 Aug 2018 14:08:44 GMT
 Content-Length: 0
 Connection: close
diff --git a/samples/http-api/append-event.http b/samples/http-api/append-event.http
index bbf641d2162..4c54e877cef 100644
--- a/samples/http-api/append-event.http
+++ b/samples/http-api/append-event.http
@@ -4,7 +4,7 @@ Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-PINGOTHER
 Access-Control-Allow-Origin: *
 Location: http://127.0.0.1:2113/streams/newstream/1
 Content-Type: text/plain; charset: utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Fri, 28 Jun 2013 12:32:18 GMT
 Content-Length: 0
 Keep-Alive: timeout=15,max=100
diff --git a/samples/http-api/append-event.sh b/samples/http-api/append-event.sh
index 04277780732..cea5333100e 100644
--- a/samples/http-api/append-event.sh
+++ b/samples/http-api/append-event.sh
@@ -1,7 +1,7 @@
 #region curl
 curl -i -d "@event-append.json" "http://127.0.0.1:2113/streams/newstream" \
-    -H "Content-Type:application/vnd.eventstore.events+json" \
-    -H "ES-EventType: SomeEvent"
+    -H "Content-Type:application/vnd.kurrent.events+json" \
+    -H "Kurrent-EventType: SomeEvent"
 #endregion curl
 
 #region response
@@ -11,7 +11,7 @@ Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-PINGOTHER
 Access-Control-Allow-Origin: *
 Location: http://127.0.0.1:2113/streams/newstream/1
 Content-Type: text/plain; charset: utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Fri, 28 Jun 2013 12:32:18 GMT
 Content-Length: 0
 Keep-Alive: timeout=15,max=100
diff --git a/samples/http-api/append-multiple-events.sh b/samples/http-api/append-multiple-events.sh
index 62c17d05d0c..87d9dd89190 100644
--- a/samples/http-api/append-multiple-events.sh
+++ b/samples/http-api/append-multiple-events.sh
@@ -1,6 +1,6 @@
 #region curl
 curl -i -d "@multiple-events.json" "http://127.0.0.1:2113/streams/newstream" \
-    -H "Content-Type:application/vnd.eventstore.events+json"
+    -H "Content-Type:application/vnd.kurrent.events+json"
 #endregion curl
 
 #region response
@@ -10,7 +10,7 @@ Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-PINGOTHER
 Access-Control-Allow-Origin: *
 Location: http://127.0.0.1:2113/streams/newstream/1
 Content-Type: text/plain; charset: utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Fri, 28 Jun 2013 12:32:18 GMT
 Content-Length: 0
 Keep-Alive: timeout=15,max=100
diff --git a/samples/http-api/append-paging-events.sh b/samples/http-api/append-paging-events.sh
index 942f0280dba..d2338bcf0a8 100644
--- a/samples/http-api/append-paging-events.sh
+++ b/samples/http-api/append-paging-events.sh
@@ -1,5 +1,5 @@
 #region curl
-curl -i -d "@paging-events.json" "http://127.0.0.1:2113/streams/alphabet" -H "Content-Type:application/vnd.eventstore.events+json"
+curl -i -d "@paging-events.json" "http://127.0.0.1:2113/streams/alphabet" -H "Content-Type:application/vnd.kurrent.events+json"
 #endregion curl
 
 #region response
@@ -7,12 +7,12 @@ HTTP/1.1 100 Continue
 
 HTTP/1.1 201 Created
 Access-Control-Allow-Methods: POST, DELETE, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Location: http://127.0.0.1:2113/streams/alphabet/0
 Content-Type: text/plain; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Tue, 21 Aug 2018 09:53:46 GMT
 Content-Length: 0
 Keep-Alive: timeout=15,max=100
diff --git a/samples/http-api/default-settings.sh b/samples/http-api/default-settings.sh
index c5f9a0f677f..f897dc65f75 100644
--- a/samples/http-api/default-settings.sh
+++ b/samples/http-api/default-settings.sh
@@ -1,7 +1,7 @@
 #region curl
 curl -i "http://127.0.0.1:2113/streams/%24settings" \
     --user admin:changeit \
-    -H "Content-Type: application/vnd.eventstore.events+json" \
+    -H "Content-Type: application/vnd.kurrent.events+json" \
     -d $'[{
         "eventId": "7c314750-05e1-439f-b2eb-f5b0e019be72",
         "eventType": "update-default-acl",
@@ -26,12 +26,12 @@ curl -i "http://127.0.0.1:2113/streams/%24settings" \
 
 HTTP/1.1 201 Created
 Access-Control-Allow-Methods: POST, DELETE, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Location: http://127.0.0.1:2113/streams/%24settings/0
 Content-Type: text/plain; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Fri, 04 Oct 2019 08:47:45 GMT
 Content-Length: 0
 Keep-Alive: timeout=15,max=100
diff --git a/samples/http-api/delete-stream/append-event-deleted.http b/samples/http-api/delete-stream/append-event-deleted.http
index ae86950cbaa..42b5106bf1c 100644
--- a/samples/http-api/delete-stream/append-event-deleted.http
+++ b/samples/http-api/delete-stream/append-event-deleted.http
@@ -4,7 +4,7 @@ Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-PINGOTHER
 Access-Control-Allow-Origin: *
 Location: http://127.0.0.1:2113/streams/newstream/1
 Content-Type: text/plain; charset: utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Fri, 28 Jun 2013 12:32:18 GMT
 Content-Length: 0
 Keep-Alive: timeout=15,max=100
diff --git a/samples/http-api/delete-stream/append-event-deleted.sh b/samples/http-api/delete-stream/append-event-deleted.sh
index 7dc05b0cbc7..225ac650963 100644
--- a/samples/http-api/delete-stream/append-event-deleted.sh
+++ b/samples/http-api/delete-stream/append-event-deleted.sh
@@ -1,3 +1,3 @@
 curl -i -d "@event-append.json" "http://127.0.0.1:2113/streams/newstream" \
-    -H "Content-Type:application/vnd.eventstore.events+json" \
-    -H "ES-EventType: SomeEvent"
+    -H "Content-Type:application/vnd.kurrent.events+json" \
+    -H "Kurrent-EventType: SomeEvent"
diff --git a/samples/http-api/delete-stream/delete-stream-response.http b/samples/http-api/delete-stream/delete-stream-response.http
index ecc5d56d73f..2e17cd12439 100644
--- a/samples/http-api/delete-stream/delete-stream-response.http
+++ b/samples/http-api/delete-stream/delete-stream-response.http
@@ -1,10 +1,10 @@
 HTTP/1.1 204 Stream deleted
 Access-Control-Allow-Methods: POST, DELETE, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Content-Type: text/plain; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Fri, 27 Jul 2018 11:51:02 GMT
 Content-Length: 0
 Connection: close
diff --git a/samples/http-api/delete-stream/get-deleted-stream-response.http b/samples/http-api/delete-stream/get-deleted-stream-response.http
index c8fd5dcc257..651f33172b1 100644
--- a/samples/http-api/delete-stream/get-deleted-stream-response.http
+++ b/samples/http-api/delete-stream/get-deleted-stream-response.http
@@ -1,10 +1,10 @@
 HTTP/1.1 410 Deleted
 Access-Control-Allow-Methods: POST, DELETE, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Content-Type: text/plain; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Fri, 27 Jul 2018 12:04:10 GMT
 Content-Length: 0
 Connection: close
diff --git a/samples/http-api/delete-stream/get-deleted-stream.sh b/samples/http-api/delete-stream/get-deleted-stream.sh
index f3d77d2d242..339d0dd5f01 100644
--- a/samples/http-api/delete-stream/get-deleted-stream.sh
+++ b/samples/http-api/delete-stream/get-deleted-stream.sh
@@ -1,2 +1,2 @@
 curl -X GET "http://127.0.0.1:2113/streams/newstream" \
-    -H 'Accept: application/vnd.eventstore.events+json'
+    -H 'Accept: application/vnd.kurrent.events+json'
diff --git a/samples/http-api/delete-stream/hard-delete-stream.sh b/samples/http-api/delete-stream/hard-delete-stream.sh
index 26ab6bca82f..faabcdea394 100644
--- a/samples/http-api/delete-stream/hard-delete-stream.sh
+++ b/samples/http-api/delete-stream/hard-delete-stream.sh
@@ -1 +1 @@
-curl -X DELETE http://127.0.0.1:2113/streams/newstream -H "ES-HardDelete:true"
+curl -X DELETE http://127.0.0.1:2113/streams/newstream -H "Kurrent-HardDelete:true"
diff --git a/samples/http-api/get-dd.sh b/samples/http-api/get-dd.sh
index c8d8f696f92..5f2a87af569 100644
--- a/samples/http-api/get-dd.sh
+++ b/samples/http-api/get-dd.sh
@@ -1,16 +1,16 @@
 #region curl
 curl -i http://localhost:2113/streams/newstream \
-    -H "accept:application/vnd.eventstore.streamdesc+json"
+    -H "accept:application/vnd.kurrent.streamdesc+json"
 #endregion curl
 
 #region response
 HTTP/1.1 200 Description Document
 Access-Control-Allow-Methods: POST, DELETE, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
-Content-Type: application/vnd.eventstore.streamdesc+json; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
+Content-Type: application/vnd.kurrent.streamdesc+json; charset=utf-8
+Server: Kestrel
 Date: Thu, 23 Aug 2018 12:37:18 GMT
 Content-Length: 517
 Keep-Alive: timeout=15,max=100
@@ -22,14 +22,14 @@ Keep-Alive: timeout=15,max=100
     "self": {
       "href": "/streams/newstream",
       "supportedContentTypes": [
-        "application/vnd.eventstore.streamdesc+json"
+        "application/vnd.kurrent.streamdesc+json"
       ]
     },
     "stream": {
       "href": "/streams/newstream",
       "supportedContentTypes": [
         "application/atom+xml",
-        "application/vnd.eventstore.atom+json"
+        "application/vnd.kurrent.atom+json"
       ]
     }
   }
diff --git a/samples/http-api/get-forward-link.sh b/samples/http-api/get-forward-link.sh
index fc934b33d0f..bab6d9fed8a 100644
--- a/samples/http-api/get-forward-link.sh
+++ b/samples/http-api/get-forward-link.sh
@@ -6,14 +6,14 @@ curl -i http://127.0.0.1:2113/streams/newstream/2/forward/20 \
 #region response
 HTTP/1.1 200 OK
 Access-Control-Allow-Methods: GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Cache-Control: max-age=0, no-cache, must-revalidate
 Vary: Accept
 ETag: "1;1391431453"
 Content-Type: application/json; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Mon, 27 Aug 2018 09:53:14 GMT
 Content-Length: 786
 Keep-Alive: timeout=15,max=100
@@ -24,7 +24,7 @@ Keep-Alive: timeout=15,max=100
   "updated": "0001-01-01T00:00:00Z",
   "streamId": "newstream",
   "author": {
-    "name": "EventStore"
+    "name": "Kurrent"
   },
   "headOfStream": true,
   "links": [
diff --git a/samples/http-api/incorrect-user.http b/samples/http-api/incorrect-user.http
index 31cabf4aa7a..70723394172 100644
--- a/samples/http-api/incorrect-user.http
+++ b/samples/http-api/incorrect-user.http
@@ -1,11 +1,11 @@
 HTTP/1.1 401 Unauthorized
 Access-Control-Allow-Methods:
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
-WWW-Authenticate: Basic realm="ES"
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
+WWW-Authenticate: Basic Realm="Kurrent"
 Content-Type:
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Thu, 23 Aug 2018 09:27:34 GMT
 Content-Length: 0
 Keep-Alive: timeout=15,max=100
diff --git a/samples/http-api/longpoll.sh b/samples/http-api/longpoll.sh
index f1ad4039b52..0bbc7e1a92c 100644
--- a/samples/http-api/longpoll.sh
+++ b/samples/http-api/longpoll.sh
@@ -1,3 +1,3 @@
 curl -i http://127.0.0.1:2113/streams/newstream/2/forward/20 \
     -H "Accept: application/json" \
-    -H "ES-LongPoll: 10"
+    -H "Kurrent-LongPoll: 10"
diff --git a/samples/http-api/missing-credentials.sh b/samples/http-api/missing-credentials.sh
index 53180490dc0..d0316dc3bc6 100644
--- a/samples/http-api/missing-credentials.sh
+++ b/samples/http-api/missing-credentials.sh
@@ -1,16 +1,16 @@
 #region curl
-curl -i -H "Accept:application/vnd.eventstore.atom+json" http://127.0.0.1:2113/streams/%24users
+curl -i -H "Accept:application/vnd.kurrent.atom+json" http://127.0.0.1:2113/streams/%24users
 #endregion curl
 
 #region response
 HTTP/1.1 401 Unauthorized
 Access-Control-Allow-Methods: GET, POST, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
-WWW-Authenticate: Basic realm="ES"
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
+WWW-Authenticate: Basic Realm="Kurrent"
 Content-Type: text/plain; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Thu, 23 Aug 2018 10:26:52 GMT
 Content-Length: 0
 Keep-Alive: timeout=15,max=100
diff --git a/samples/http-api/new-user.http b/samples/http-api/new-user.http
index 1d6f6d2f84b..7c25a92579d 100644
--- a/samples/http-api/new-user.http
+++ b/samples/http-api/new-user.http
@@ -1,11 +1,11 @@
 HTTP/1.1 201 Created
 Access-Control-Allow-Methods: GET, POST, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Location: http://127.0.0.1:2113/users/adminuser
 Content-Type: application/json; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Thu, 23 Aug 2018 09:08:40 GMT
 Content-Length: 90
 Keep-Alive: timeout=15,max=100
diff --git a/samples/http-api/new-user.json b/samples/http-api/new-user.json
index 2e5ed5ce7c3..f4aaf483c6a 100644
--- a/samples/http-api/new-user.json
+++ b/samples/http-api/new-user.json
@@ -1,6 +1,6 @@
 {
     "LoginName": "adminuser",
-    "FullName": "EventStore Admin",
+    "FullName": "KurrentDB Admin",
     "Groups": [
         "$admins",
         "DataScience"
diff --git a/samples/http-api/persistent-subscriptions/read-stream-response.json b/samples/http-api/persistent-subscriptions/read-stream-response.json
index d3e88fe1e07..0418414b428 100644
--- a/samples/http-api/persistent-subscriptions/read-stream-response.json
+++ b/samples/http-api/persistent-subscriptions/read-stream-response.json
@@ -3,7 +3,7 @@
   "id": "http://localhost:2113/subscriptions/newstream/competing_consumers_group1",
   "updated": "2015-12-02T09:17:48.556545Z",
   "author": {
-    "name": "EventStore"
+    "name": "Kurrent"
   },
   "headOfStream": false,
   "links": [
@@ -30,7 +30,7 @@
       "id": "http://localhost:2113/streams/newstream/1",
       "updated": "2015-12-02T09:17:48.556545Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "SomeEvent",
       "links": [
diff --git a/samples/http-api/read-all-events.sh b/samples/http-api/read-all-events.sh
index d12e0941a1e..6a17923dbef 100644
--- a/samples/http-api/read-all-events.sh
+++ b/samples/http-api/read-all-events.sh
@@ -1,19 +1,19 @@
 #region curl
 curl -i http://127.0.0.1:2113/streams/%24all \
-    -H "Accept:application/vnd.eventstore.atom+json" -u admin:changeit
+    -H "Accept:application/vnd.kurrent.atom+json" -u admin:changeit
 #endregion curl
 
 #region response
 HTTP/1.1 200 OK
 Access-Control-Allow-Methods: POST, DELETE, GET, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTo, ES-ExpectedVersion
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTo, Kurrent-ExpectedVersion
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position
+Access-Control-Expose-Headers: Location, Kurrent-Position
 Cache-Control: max-age=0, no-cache, must-revalidate
 Vary: Accept
 ETag: "25159393;248368668"
-Content-Type: application/vnd.eventstore.atom+json; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Content-Type: application/vnd.kurrent.atom+json; charset=utf-8
+Server: Kestrel
 Date: Fri, 13 Mar 2015 16:19:09 GMT
 Content-Length: 12157
 Keep-Alive: timeout=15,max=100
@@ -23,7 +23,7 @@ Keep-Alive: timeout=15,max=100
   "id": "<http://127.0.0.1:2113/streams/%24all">,
   "updated": "2015-03-13T16:19:06.548415Z",
   "author": {
-    "name": "EventStore"
+    "name": "Kurrent"
   },
   "headOfStream": false,
   "links": [
diff --git a/samples/http-api/read-event.json b/samples/http-api/read-event.json
index a9214e5b845..8fe678f2e44 100644
--- a/samples/http-api/read-event.json
+++ b/samples/http-api/read-event.json
@@ -5,7 +5,7 @@ Access-Control-Allow-Origin: *
 Cache-Control: max-age=31536000, public
 Vary: Accept
 Content-Type: application/json; charset: utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Wed, 03 Jul 2013 11:09:12 GMT
 Content-Length: 14
 Keep-Alive: timeout=15,max=100
diff --git a/samples/http-api/read-metadata.sh b/samples/http-api/read-metadata.sh
index 2548cd2a6e4..9881084d382 100644
--- a/samples/http-api/read-metadata.sh
+++ b/samples/http-api/read-metadata.sh
@@ -1,19 +1,19 @@
 #region curl
-curl -i -H "Accept:application/vnd.eventstore.atom+json" \
+curl -i -H "Accept:application/vnd.kurrent.atom+json" \
     http://127.0.0.1:2113/streams/%24users --user admin:changeit
 #endregion curl
 
 #region response
 HTTP/1.1 200 OK
 Access-Control-Allow-Methods: POST, DELETE, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Cache-Control: max-age=0, no-cache, must-revalidate
 Vary: Accept
 ETag: "3;-2060438500"
-Content-Type: application/vnd.eventstore.atom+json; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Content-Type: application/vnd.kurrent.atom+json; charset=utf-8
+Server: Kestrel
 Date: Thu, 23 Aug 2018 10:03:34 GMT
 Content-Length: 2670
 Keep-Alive: timeout=15,max=100
@@ -24,7 +24,7 @@ Keep-Alive: timeout=15,max=100
   "updated": "2018-08-23T09:19:37.880827Z",
   "streamId": "$users",
   "author": {
-    "name": "EventStore"
+    "name": "Kurrent"
   },
   "headOfStream": true,
   "selfUrl": "http://127.0.0.1:2113/streams/%24users",
@@ -53,7 +53,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/%24users/3",
       "updated": "2018-08-23T09:19:37.880827Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "$User",
       "links": [
@@ -72,7 +72,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/%24users/2",
       "updated": "2018-08-23T09:08:40.499762Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "$User",
       "links": [
@@ -91,7 +91,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/%24users/1",
       "updated": "2018-08-23T07:55:39.833203Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "$User",
       "links": [
@@ -110,7 +110,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/%24users/0",
       "updated": "2018-08-23T07:55:39.829589Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "$User",
       "links": [
diff --git a/samples/http-api/read-stream-body.sh b/samples/http-api/read-stream-body.sh
index 6fb1b939e70..c51371d429e 100644
--- a/samples/http-api/read-stream-body.sh
+++ b/samples/http-api/read-stream-body.sh
@@ -1,19 +1,19 @@
 #region curl
-curl -i -H "Accept:application/vnd.eventstore.atom+json" \
+curl -i -H "Accept:application/vnd.kurrent.atom+json" \
     "http://127.0.0.1:2113/streams/newstream?embed=body"
 #endregion curl
 
 #region response
 HTTP/1.1 200 OK
 Access-Control-Allow-Methods: POST, DELETE, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTo, ES-ExpectedVersion
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTo, Kurrent-ExpectedVersion
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position
+Access-Control-Expose-Headers: Location, Kurrent-Position
 Cache-Control: max-age=0, no-cache, must-revalidate
 Vary: Accept
 ETag: "0;248368668"
-Content-Type: application/vnd.eventstore.atom+json; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Content-Type: application/vnd.kurrent.atom+json; charset=utf-8
+Server: Kestrel
 Date: Fri, 13 Mar 2015 16:32:06 GMT
 Content-Length: 1608
 Keep-Alive: timeout=15,max=100
@@ -24,7 +24,7 @@ Keep-Alive: timeout=15,max=100
   "updated": "2015-03-13T12:13:42.492473Z",
   "streamId": "newstream",
   "author": {
-    "name": "EventStore"
+    "name": "Kurrent"
   },
   "headOfStream": true,
   "selfUrl": "<http://127.0.0.1:2113/streams/newstream">,
@@ -63,7 +63,7 @@ Keep-Alive: timeout=15,max=100
       "id": "<http://127.0.0.1:2113/streams/newstream/0">,
       "updated": "2015-03-13T12:13:42.492473Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
diff --git a/samples/http-api/read-stream-forwards.sh b/samples/http-api/read-stream-forwards.sh
index deae1bb5b61..510f1ad541e 100644
--- a/samples/http-api/read-stream-forwards.sh
+++ b/samples/http-api/read-stream-forwards.sh
@@ -1,18 +1,18 @@
 #region curl
-curl -i http://127.0.0.1:2113/streams/newstream/1/forward/20 -H "Accept:application/vnd.eventstore.atom+json"
+curl -i http://127.0.0.1:2113/streams/newstream/1/forward/20 -H "Accept:application/vnd.kurrent.atom+json"
 #endregion curl
 
 #region response
 HTTP/1.1 200 OK
 Access-Control-Allow-Methods: GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTo, ES-ExpectedVersion
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTo, Kurrent-ExpectedVersion
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position
+Access-Control-Expose-Headers: Location, Kurrent-Position
 Cache-Control: max-age=0, no-cache, must-revalidate
 Vary: Accept
 ETag: "0;248368668"
-Content-Type: application/vnd.eventstore.atom+json; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Content-Type: application/vnd.kurrent.atom+json; charset=utf-8
+Server: Kestrel
 Date: Fri, 13 Mar 2015 14:04:47 GMT
 Content-Length: 795
 Keep-Alive: timeout=15,max=100
@@ -23,7 +23,7 @@ Keep-Alive: timeout=15,max=100
   "updated": "0001-01-01T00:00:00Z",
   "streamId": "newstream",
   "author": {
-    "name": "EventStore"
+    "name": "Kurrent"
   },
   "headOfStream": false,
   "links": [
diff --git a/samples/http-api/read-stream-rich.sh b/samples/http-api/read-stream-rich.sh
index 111b98632c7..6065ac73b4f 100644
--- a/samples/http-api/read-stream-rich.sh
+++ b/samples/http-api/read-stream-rich.sh
@@ -1,19 +1,19 @@
 #region curl
-curl -i -H "Accept:application/vnd.eventstore.atom+json" \
+curl -i -H "Accept:application/vnd.kurrent.atom+json" \
     "http://127.0.0.1:2113/streams/newstream?embed=rich"
 #endregion curl
 
 #region response
 HTTP/1.1 200 OK
 Access-Control-Allow-Methods: POST, DELETE, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTo, ES-ExpectedVersion
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTo, Kurrent-ExpectedVersion
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position
+Access-Control-Expose-Headers: Location, Kurrent-Position
 Cache-Control: max-age=0, no-cache, must-revalidate
 Vary: Accept
 ETag: "0;248368668"
-Content-Type: application/vnd.eventstore.atom+json; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Content-Type: application/vnd.kurrent.atom+json; charset=utf-8
+Server: Kestrel
 Date: Fri, 13 Mar 2015 16:30:57 GMT
 Content-Length: 1570
 Keep-Alive: timeout=15,max=100
@@ -24,7 +24,7 @@ Keep-Alive: timeout=15,max=100
   "updated": "2015-03-13T12:13:42.492473Z",
   "streamId": "newstream",
   "author": {
-    "name": "EventStore"
+    "name": "Kurrent"
   },
   "headOfStream": true,
   "selfUrl": "<http://127.0.0.1:2113/streams/newstream">,
@@ -62,7 +62,7 @@ Keep-Alive: timeout=15,max=100
       "id": "<http://127.0.0.1:2113/streams/newstream/0">,
       "updated": "2015-03-13T12:13:42.492473Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
diff --git a/samples/http-api/read-stream-xml.sh b/samples/http-api/read-stream-xml.sh
index a26d1fd38f5..e6751f34088 100644
--- a/samples/http-api/read-stream-xml.sh
+++ b/samples/http-api/read-stream-xml.sh
@@ -6,14 +6,14 @@ curl -i -H "Accept:application/atom+xml" \
 #region response
 HTTP/1.1 200 OK
 Access-Control-Allow-Methods: POST, DELETE, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTo, ES-ExpectedVersion
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTo, Kurrent-ExpectedVersion
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position
+Access-Control-Expose-Headers: Location, Kurrent-Position
 Cache-Control: max-age=0, no-cache, must-revalidate
 Vary: Accept
 ETag: "0;-1296467268"
 Content-Type: application/atom+xml; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Fri, 13 Mar 2015 16:32:56 GMT
 Content-Length: 929
 Keep-Alive: timeout=15,max=100
@@ -23,7 +23,7 @@ Keep-Alive: timeout=15,max=100
    <id>http://127.0.0.1:2113/streams/newstream</id>
    <updated>2013-06-29T15:12:53.570125Z</updated>
    <author>
-      <name>EventStore</name>
+      <name>KurrentDB</name>
    </author>
    <link href="http://127.0.0.1:2113/streams/newstream" rel="self" />
    <link href="http://127.0.0.1:2113/streams/newstream/head/backward/20" rel="first" />
@@ -35,7 +35,7 @@ Keep-Alive: timeout=15,max=100
       <id>http://127.0.0.1:2113/streams/newstream/0</id>
       <updated>2013-06-29T15:12:53.570125Z</updated>
       <author>
-         <name>EventStore</name>
+         <name>KurrentDB</name>
       </author>
       <summary>event-type</summary>
       <link href="http://127.0.0.1:2113/streams/newstream/0" rel="edit" />
diff --git a/samples/http-api/read-stream.sh b/samples/http-api/read-stream.sh
index 378afad0012..145986c6fad 100644
--- a/samples/http-api/read-stream.sh
+++ b/samples/http-api/read-stream.sh
@@ -1,18 +1,18 @@
 #region curl
-curl -i -H "Accept:application/vnd.eventstore.atom+json" "http://127.0.0.1:2113/streams/newstream" -u "admin:changeit"
+curl -i -H "Accept:application/vnd.kurrent.atom+json" "http://127.0.0.1:2113/streams/newstream" -u "admin:changeit"
 #endregion curl
 
 #region response
 HTTP/1.1 200 OK
 Access-Control-Allow-Methods: POST, DELETE, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Cache-Control: max-age=0, no-cache, must-revalidate
 Vary: Accept
 ETag: "0;-2060438500"
-Content-Type: application/vnd.eventstore.atom+json; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Content-Type: application/vnd.kurrent.atom+json; charset=utf-8
+Server: Kestrel
 Date: Fri, 15 Dec 2017 12:23:23 GMT
 Content-Length: 1262
 Keep-Alive: timeout=15,max=100
@@ -23,7 +23,7 @@ Keep-Alive: timeout=15,max=100
   "updated": "2017-12-15T12:19:32.021776Z",
   "streamId": "newstream",
   "author": {
-    "name": "EventStore"
+    "name": "Kurrent"
   },
   "headOfStream": true,
   "selfUrl": "http://127.0.0.1:2113/streams/newstream",
@@ -52,7 +52,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/newstream/0",
       "updated": "2017-12-15T12:19:32.021776Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
diff --git a/samples/http-api/request-etag.sh b/samples/http-api/request-etag.sh
index 995ac9ce307..dd0960de4f6 100644
--- a/samples/http-api/request-etag.sh
+++ b/samples/http-api/request-etag.sh
@@ -1,17 +1,17 @@
 #region curl
 curl -i http://127.0.0.1:2113/streams/alphabet \
-    -H "Accept:application/vnd.eventstore.atom+json" \
+    -H "Accept:application/vnd.kurrent.atom+json" \
     -H "If-None-Match:26;-2060438500"
 #endregion curl
 
 #region response
 HTTP/1.1 304 Not Modified
 Access-Control-Allow-Methods: POST, DELETE, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Content-Type: text/plain; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Tue, 21 Aug 2018 12:07:35 GMT
 Content-Length: 0
 Keep-Alive: timeout=15,max=100
diff --git a/samples/http-api/request-last-link.sh b/samples/http-api/request-last-link.sh
index 109b490d1ee..90d61698e52 100644
--- a/samples/http-api/request-last-link.sh
+++ b/samples/http-api/request-last-link.sh
@@ -1,18 +1,18 @@
 #region curl
 curl -i http://127.0.0.1:2113/streams/alphabet/0/forward/20 \
-    -H "Accept:application/vnd.eventstore.atom+json"
+    -H "Accept:application/vnd.kurrent.atom+json"
 #endregion curl
 
 #region response
 HTTP/1.1 200 OK
 Access-Control-Allow-Methods: GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Cache-Control: max-age=31536000, public
 Vary: Accept
-Content-Type: application/vnd.eventstore.atom+json; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Content-Type: application/vnd.kurrent.atom+json; charset=utf-8
+Server: Kestrel
 Date: Tue, 21 Aug 2018 10:24:28 GMT
 Content-Length: 10403
 Keep-Alive: timeout=15,max=100
@@ -23,7 +23,7 @@ Keep-Alive: timeout=15,max=100
   "updated": "2018-08-21T09:53:46.869716Z",
   "streamId": "alphabet",
   "author": {
-    "name": "EventStore"
+    "name": "Kurrent"
   },
   "headOfStream": false,
   "links": [
@@ -50,7 +50,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/19",
       "updated": "2018-08-21T09:53:46.869791Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -69,7 +69,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/18",
       "updated": "2018-08-21T09:53:46.869788Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -88,7 +88,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/17",
       "updated": "2018-08-21T09:53:46.869786Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -107,7 +107,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/16",
       "updated": "2018-08-21T09:53:46.869782Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -126,7 +126,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/15",
       "updated": "2018-08-21T09:53:46.86978Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -145,7 +145,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/14",
       "updated": "2018-08-21T09:53:46.869778Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -164,7 +164,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/13",
       "updated": "2018-08-21T09:53:46.869773Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -183,7 +183,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/12",
       "updated": "2018-08-21T09:53:46.869771Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -202,7 +202,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/11",
       "updated": "2018-08-21T09:53:46.869769Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -221,7 +221,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/10",
       "updated": "2018-08-21T09:53:46.869766Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -240,7 +240,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/9",
       "updated": "2018-08-21T09:53:46.869764Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -259,7 +259,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/8",
       "updated": "2018-08-21T09:53:46.86976Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -278,7 +278,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/7",
       "updated": "2018-08-21T09:53:46.869758Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -297,7 +297,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/6",
       "updated": "2018-08-21T09:53:46.869755Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -316,7 +316,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/5",
       "updated": "2018-08-21T09:53:46.869753Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -335,7 +335,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/4",
       "updated": "2018-08-21T09:53:46.86975Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -354,7 +354,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/3",
       "updated": "2018-08-21T09:53:46.869748Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -373,7 +373,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/2",
       "updated": "2018-08-21T09:53:46.869746Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -392,7 +392,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/1",
       "updated": "2018-08-21T09:53:46.869742Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -411,7 +411,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/0",
       "updated": "2018-08-21T09:53:46.869716Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
diff --git a/samples/http-api/request-paging-events.sh b/samples/http-api/request-paging-events.sh
index 01e9a3bbf08..44fdd70c58e 100644
--- a/samples/http-api/request-paging-events.sh
+++ b/samples/http-api/request-paging-events.sh
@@ -1,20 +1,20 @@
 #region curl
 curl -i http://127.0.0.1:2113/streams/alphabet \
-    -H "Accept:application/vnd.eventstore.atom+json"
+    -H "Accept:application/vnd.kurrent.atom+json"
 #endregion curl
 
 #region response
 #region responseHeader
 HTTP/1.1 200 OK
 Access-Control-Allow-Methods: POST, DELETE, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Cache-Control: max-age=0, no-cache, must-revalidate
 Vary: Accept
 ETag: "26;-2060438500"
-Content-Type: application/vnd.eventstore.atom+json; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Content-Type: application/vnd.kurrent.atom+json; charset=utf-8
+Server: Kestrel
 Date: Tue, 21 Aug 2018 10:12:31 GMT
 Content-Length: 10727
 Keep-Alive: timeout=15,max=100
@@ -26,7 +26,7 @@ Keep-Alive: timeout=15,max=100
   "updated": "2018-08-21T09:53:46.869815Z",
   "streamId": "alphabet",
   "author": {
-    "name": "EventStore"
+    "name": "Kurrent"
   },
   "headOfStream": true,
   "selfUrl": "http://127.0.0.1:2113/streams/alphabet",
@@ -63,7 +63,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/26",
       "updated": "2018-08-21T09:53:46.869815Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -82,7 +82,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/25",
       "updated": "2018-08-21T09:53:46.869811Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -101,7 +101,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/24",
       "updated": "2018-08-21T09:53:46.869809Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -120,7 +120,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/23",
       "updated": "2018-08-21T09:53:46.869806Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -139,7 +139,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/22",
       "updated": "2018-08-21T09:53:46.869804Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -158,7 +158,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/21",
       "updated": "2018-08-21T09:53:46.869802Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -177,7 +177,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/20",
       "updated": "2018-08-21T09:53:46.869799Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -196,7 +196,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/19",
       "updated": "2018-08-21T09:53:46.869791Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -215,7 +215,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/18",
       "updated": "2018-08-21T09:53:46.869788Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -234,7 +234,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/17",
       "updated": "2018-08-21T09:53:46.869786Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -253,7 +253,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/16",
       "updated": "2018-08-21T09:53:46.869782Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -272,7 +272,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/15",
       "updated": "2018-08-21T09:53:46.86978Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -291,7 +291,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/14",
       "updated": "2018-08-21T09:53:46.869778Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -310,7 +310,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/13",
       "updated": "2018-08-21T09:53:46.869773Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -329,7 +329,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/12",
       "updated": "2018-08-21T09:53:46.869771Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -348,7 +348,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/11",
       "updated": "2018-08-21T09:53:46.869769Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -367,7 +367,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/10",
       "updated": "2018-08-21T09:53:46.869766Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -386,7 +386,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/9",
       "updated": "2018-08-21T09:53:46.869764Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -405,7 +405,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/8",
       "updated": "2018-08-21T09:53:46.86976Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
@@ -424,7 +424,7 @@ Keep-Alive: timeout=15,max=100
       "id": "http://127.0.0.1:2113/streams/alphabet/7",
       "updated": "2018-08-21T09:53:46.869758Z",
       "author": {
-        "name": "EventStore"
+        "name": "Kurrent"
       },
       "summary": "event-type",
       "links": [
diff --git a/samples/http-api/resolve-links-false.sh b/samples/http-api/resolve-links-false.sh
index 17463af6d21..b6f72fb98b6 100644
--- a/samples/http-api/resolve-links-false.sh
+++ b/samples/http-api/resolve-links-false.sh
@@ -1,19 +1,19 @@
 #region curl
 curl -i http://127.0.0.1:2113/streams/shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1167/0 \
-    -H "accept:application/vnd.eventstore.atom+json"
-    -H "ES-ResolveLinkTos: false"
+    -H "accept:application/vnd.kurrent.atom+json"
+    -H "Kurrent-ResolveLinkTos: false"
 #endregion curl
 
 #region response
 HTTP/1.1 200 OK
 Access-Control-Allow-Methods: GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Cache-Control: max-age=31536000, public
 Vary: Accept
-Content-Type: application/vnd.eventstore.atom+json; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Content-Type: application/vnd.kurrent.atom+json; charset=utf-8
+Server: Kestrel
 Date: Tue, 28 Aug 2018 13:22:09 GMT
 Content-Length: 918
 Keep-Alive: timeout=15,max=100
@@ -23,7 +23,7 @@ Keep-Alive: timeout=15,max=100
   "id": "http://127.0.0.1:2113/streams/shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1167/0",
   "updated": "2018-08-28T12:56:15.263731Z",
   "author": {
-    "name": "EventStore"
+    "name": "Kurrent"
   },
   "summary": "ItemAdded",
   "content": {
diff --git a/samples/http-api/resolve-links.sh b/samples/http-api/resolve-links.sh
index a992c76a284..0f118bb7091 100644
--- a/samples/http-api/resolve-links.sh
+++ b/samples/http-api/resolve-links.sh
@@ -1,19 +1,19 @@
 #region curl
 curl -i http://127.0.0.1:2113/streams/shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1167/0 \
-    -H "accept:application/vnd.eventstore.atom+json"
-    -H "ES-ResolveLinkTos: true"
+    -H "accept:application/vnd.kurrent.atom+json"
+    -H "Kurrent-ResolveLinkTos: true"
 #endregion curl
 
 #region response
 HTTP/1.1 200 OK
 Access-Control-Allow-Methods: GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Cache-Control: max-age=31536000, public
 Vary: Accept
-Content-Type: application/vnd.eventstore.atom+json; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Content-Type: application/vnd.kurrent.atom+json; charset=utf-8
+Server: Kestrel
 Date: Tue, 28 Aug 2018 13:13:49 GMT
 Content-Length: 918
 Keep-Alive: timeout=15,max=100
@@ -23,7 +23,7 @@ Keep-Alive: timeout=15,max=100
   "id": "http://127.0.0.1:2113/streams/shoppingCart-b989fe21-9469-4017-8d71-9820b8dd1167/0",
   "updated": "2018-08-28T12:56:15.263731Z",
   "author": {
-    "name": "EventStore"
+    "name": "Kurrent"
   },
   "summary": "ItemAdded",
   "content": {
diff --git a/samples/http-api/update-acl.sh b/samples/http-api/update-acl.sh
index bf9867eaf80..1d3ae6ef64e 100644
--- a/samples/http-api/update-acl.sh
+++ b/samples/http-api/update-acl.sh
@@ -1,18 +1,18 @@
 #region curl
 curl -i -d @metadata.json http://127.0.0.1:2113/streams/newstream/metadata \
     --user admin:changeit \
-    -H "Content-Type: application/vnd.eventstore.events+json"
+    -H "Content-Type: application/vnd.kurrent.events+json"
 #endregion curl
 
 #region response
 HTTP/1.1 201 Created
 Access-Control-Allow-Methods: GET, POST, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Location: http://127.0.0.1:2113/streams/%24%24newstream/0
 Content-Type: text/plain; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Tue, 18 Sep 2018 09:38:56 GMT
 Content-Length: 0
 Keep-Alive: timeout=15,max=100
diff --git a/samples/http-api/update-default-acl.http b/samples/http-api/update-default-acl.http
index ff786547fc9..c90bff07afd 100644
--- a/samples/http-api/update-default-acl.http
+++ b/samples/http-api/update-default-acl.http
@@ -1,11 +1,11 @@
 HTTP/1.1 201 Created
 Access-Control-Allow-Methods: GET, POST, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Location: http://127.0.0.1:2113/streams/%24%24%24users/0
 Content-Type: text/plain; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Thu, 23 Aug 2018 10:35:19 GMT
 Content-Length: 0
 Keep-Alive: timeout=15,max=100
diff --git a/samples/http-api/update-default-acl.sh b/samples/http-api/update-default-acl.sh
index 89872a71172..a3f422013a8 100644
--- a/samples/http-api/update-default-acl.sh
+++ b/samples/http-api/update-default-acl.sh
@@ -1,3 +1,3 @@
 curl -i -d @override-default.json http://127.0.0.1:2113/streams/%24settings /
     --user admin:changeit /
-    -H "Content-Type: application/vnd.eventstore.events+json"
+    -H "Content-Type: application/vnd.kurrent.events+json"
diff --git a/samples/http-api/update-metadata.sh b/samples/http-api/update-metadata.sh
index 45a53e867ff..a70dd6560c2 100644
--- a/samples/http-api/update-metadata.sh
+++ b/samples/http-api/update-metadata.sh
@@ -1,18 +1,18 @@
 #region curl
 curl -i -d @metadata.json http://127.0.0.1:2113/streams/%24users/metadata \
     --user admin:changeit \
-    -H "Content-Type: application/vnd.eventstore.events+json"
+    -H "Content-Type: application/vnd.kurrent.events+json"
 #endregion curl
 
 #region response
 HTTP/1.1 201 Created
 Access-Control-Allow-Methods: GET, POST, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Location: http://127.0.0.1:2113/streams/%24%24%24users/0
 Content-Type: text/plain; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Thu, 23 Aug 2018 10:35:19 GMT
 Content-Length: 0
 Keep-Alive: timeout=15,max=100
diff --git a/samples/server/default-settings.sh b/samples/server/default-settings.sh
index 60a6c77dc7e..0b65e2a73d4 100644
--- a/samples/server/default-settings.sh
+++ b/samples/server/default-settings.sh
@@ -1,6 +1,6 @@
 curl -i "http://localhost:2113/streams/%24settings" \
     --user admin:changeit \
-    -H "Content-Type: application/vnd.eventstore.events+json" \
+    -H "Content-Type: application/vnd.kurrent.events+json" \
     -d $'[{
         "eventId": "7c314750-05e1-439f-b2eb-f5b0e019be72",
         "eventType": "update-default-acl",
diff --git a/samples/server/docker-compose-cluster.yaml b/samples/server/docker-compose-cluster.yaml
index bd4472423f1..9c4ae1d7dcc 100644
--- a/samples/server/docker-compose-cluster.yaml
+++ b/samples/server/docker-compose-cluster.yaml
@@ -1,6 +1,12 @@
-version: "3.5"
-
 services:
+  volumes-provisioner:
+    image: hasnat/volumes-provisioner
+    environment:
+      PROVISION_DIRECTORIES: "1000:1000:0755:/tmp/certs"
+    volumes:
+      - certs:/tmp/certs
+    network_mode: none
+
   setup:
     image: eventstore/es-gencert-cli:1.0.2
     entrypoint: bash
@@ -14,25 +20,27 @@ services:
       && find . -type f -print0 | xargs -0 chmod 666"
     container_name: setup
     volumes:
-      - ./certs:/certs
+      - certs:/certs
+    depends_on:
+      - volumes-provisioner
 
-  node1.eventstore: &template
-    image: eventstore/eventstore:24.2.0-jammy
-    container_name: node1.eventstore
+  node1.kurrentdb: &template
+    image: docker.kurrent.io/kurrent-latest/kurrentdb:latest
+    container_name: node1.kurrentdb
     env_file:
       - vars.env
     environment:
-      - EVENTSTORE_INT_IP=172.30.240.11
-      - EVENTSTORE_ADVERTISE_HTTP_PORT_TO_CLIENT_AS=2111
-      - EVENTSTORE_GOSSIP_SEED=172.30.240.12:2113,172.30.240.13:2113
-      - EVENTSTORE_TRUSTED_ROOT_CERTIFICATES_PATH=/certs/ca
-      - EVENTSTORE_CERTIFICATE_FILE=/certs/node1/node.crt
-      - EVENTSTORE_CERTIFICATE_PRIVATE_KEY_FILE=/certs/node1/node.key
+      - KURRENTDB_REPLICATION_IP=172.30.240.11
+      - KURRENTDB_ADVERTISE_NODE_PORT_TO_CLIENT_AS=2111
+      - KURRENTDB_GOSSIP_SEED=172.30.240.12:2113,172.30.240.13:2113
+      - KURRENTDB_TRUSTED_ROOT_CERTIFICATES_PATH=/certs/ca
+      - KURRENTDB_CERTIFICATE_FILE=/certs/node1/node.crt
+      - KURRENTDB_CERTIFICATE_PRIVATE_KEY_FILE=/certs/node1/node.key
     healthcheck:
       test:
         [
           "CMD-SHELL",
-          "curl --fail --insecure https://node1.eventstore:2113/health/live || exit 1",
+          "curl --fail --insecure https://node1.kurrentdb:2113/health/live || exit 1",
         ]
       interval: 5s
       timeout: 5s
@@ -40,7 +48,7 @@ services:
     ports:
       - 2111:2113
     volumes:
-      - ./certs:/certs
+      - certs:/certs
     depends_on:
       - setup
     restart: always
@@ -48,23 +56,23 @@ services:
       clusternetwork:
         ipv4_address: 172.30.240.11
 
-  node2.eventstore:
+  node2.kurrentdb:
     <<: *template
-    container_name: node2.eventstore
+    container_name: node2.kurrentdb
     env_file:
       - vars.env
     environment:
-      - EVENTSTORE_INT_IP=172.30.240.12
-      - EVENTSTORE_ADVERTISE_HTTP_PORT_TO_CLIENT_AS=2112
-      - EVENTSTORE_GOSSIP_SEED=172.30.240.11:2113,172.30.240.13:2113
-      - EVENTSTORE_TRUSTED_ROOT_CERTIFICATES_PATH=/certs/ca
-      - EVENTSTORE_CERTIFICATE_FILE=/certs/node2/node.crt
-      - EVENTSTORE_CERTIFICATE_PRIVATE_KEY_FILE=/certs/node2/node.key
+      - KURRENTDB_REPLICATION_IP=172.30.240.12
+      - KURRENTDB_ADVERTISE_NODE_PORT_TO_CLIENT_AS=2112
+      - KURRENTDB_GOSSIP_SEED=172.30.240.11:2113,172.30.240.13:2113
+      - KURRENTDB_TRUSTED_ROOT_CERTIFICATES_PATH=/certs/ca
+      - KURRENTDB_CERTIFICATE_FILE=/certs/node2/node.crt
+      - KURRENTDB_CERTIFICATE_PRIVATE_KEY_FILE=/certs/node2/node.key
     healthcheck:
       test:
         [
           "CMD-SHELL",
-          "curl --fail --insecure https://node2.eventstore:2113/health/live || exit 1",
+          "curl --fail --insecure https://node2.kurrentdb:2113/health/live || exit 1",
         ]
       interval: 5s
       timeout: 5s
@@ -75,21 +83,21 @@ services:
       clusternetwork:
         ipv4_address: 172.30.240.12
 
-  node3.eventstore:
+  node3.kurrentdb:
     <<: *template
-    container_name: node3.eventstore
+    container_name: node3.kurrentdb
     environment:
-      - EVENTSTORE_INT_IP=172.30.240.13
-      - EVENTSTORE_ADVERTISE_HTTP_PORT_TO_CLIENT_AS=2113
-      - EVENTSTORE_GOSSIP_SEED=172.30.240.11:2113,172.30.240.12:2113
-      - EVENTSTORE_TRUSTED_ROOT_CERTIFICATES_PATH=/certs/ca
-      - EVENTSTORE_CERTIFICATE_FILE=/certs/node3/node.crt
-      - EVENTSTORE_CERTIFICATE_PRIVATE_KEY_FILE=/certs/node3/node.key
+      - KURRENTDB_REPLICATION_IP=172.30.240.13
+      - KURRENTDB_ADVERTISE_NODE_PORT_TO_CLIENT_AS=2113
+      - KURRENTDB_GOSSIP_SEED=172.30.240.11:2113,172.30.240.12:2113
+      - KURRENTDB_TRUSTED_ROOT_CERTIFICATES_PATH=/certs/ca
+      - KURRENTDB_CERTIFICATE_FILE=/certs/node3/node.crt
+      - KURRENTDB_CERTIFICATE_PRIVATE_KEY_FILE=/certs/node3/node.key
     healthcheck:
       test:
         [
           "CMD-SHELL",
-          "curl --fail --insecure https://node3.eventstore:2113/health/live || exit 1",
+          "curl --fail --insecure https://node3.kurrentdb:2113/health/live || exit 1",
         ]
       interval: 5s
       timeout: 5s
@@ -102,9 +110,12 @@ services:
 
 networks:
   clusternetwork:
-    name: eventstoredb.local
+    name: kurrentdb.local
     driver: bridge
     ipam:
       driver: default
       config:
         - subnet: 172.30.240.0/24
+
+volumes:
+  certs:
\ No newline at end of file
diff --git a/samples/server/docker-compose.yaml b/samples/server/docker-compose.yaml
index 962833cd1dc..48404399c3f 100644
--- a/samples/server/docker-compose.yaml
+++ b/samples/server/docker-compose.yaml
@@ -1,25 +1,23 @@
-version: "3.4"
-
 services:
-  eventstore.db:
-    image: eventstore/eventstore:24.2.0-jammy
+  kurrentdb.db:
+    image: docker.kurrent.io/kurrent-latest/kurrentdb:latest
     environment:
-      - EVENTSTORE_CLUSTER_SIZE=1
-      - EVENTSTORE_RUN_PROJECTIONS=All
-      - EVENTSTORE_START_STANDARD_PROJECTIONS=true
-      - EVENTSTORE_HTTP_PORT=2113
-      - EVENTSTORE_INSECURE=true
-      - EVENTSTORE_ENABLE_ATOM_PUB_OVER_HTTP=true
+      - KURRENTDB_CLUSTER_SIZE=1
+      - KURRENTDB_RUN_PROJECTIONS=All
+      - KURRENTDB_START_STANDARD_PROJECTIONS=true
+      - KURRENTDB_NODE_PORT=2113
+      - KURRENTDB_INSECURE=true
+      - KURRENTDB_ENABLE_ATOM_PUB_OVER_HTTP=true
     ports:
       - "2113:2113"
     volumes:
       - type: volume
-        source: eventstore-volume-data
-        target: /var/lib/eventstore
+        source: kurrentdb-volume-data
+        target: /var/lib/kurrentdb
       - type: volume
-        source: eventstore-volume-logs
-        target: /var/log/eventstore
+        source: kurrentdb-volume-logs
+        target: /var/log/kurrentdb
 
 volumes:
-  eventstore-volume-data:
-  eventstore-volume-logs:
+  kurrentdb-volume-data:
+  kurrentdb-volume-logs:
diff --git a/samples/server/stats-tcp.sh b/samples/server/stats-tcp.sh
index 20058252271..f18559c87a1 100644
--- a/samples/server/stats-tcp.sh
+++ b/samples/server/stats-tcp.sh
@@ -5,13 +5,13 @@ curl -i -X GET "http://127.0.0.1:2113/stats/proc/tcp" -u "admin:changeit"
 #region response
 HTTP/1.1 200 OK
 Access-Control-Allow-Methods: GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Cache-Control: max-age=1, public
 Vary: Accept
 Content-Type: application/json; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Thu, 06 Dec 2018 10:03:55 GMT
 Content-Length: 280
 Keep-Alive: timeout=15,max=100
diff --git a/samples/server/stats.json b/samples/server/stats.json
index 28f060cda6d..f2cc7674b42 100644
--- a/samples/server/stats.json
+++ b/samples/server/stats.json
@@ -44,7 +44,7 @@
     "cpu": 8.282546,
     "freeMem": 375517184,
     "drive": {
-      "/var/lib/eventstore": {
+      "/var/lib/kurrentdb": {
         "availableBytes": 13525999616,
         "totalBytes": 15679725568,
         "usage": "13%",
diff --git a/samples/server/update-acl.sh b/samples/server/update-acl.sh
index bf9867eaf80..1d3ae6ef64e 100644
--- a/samples/server/update-acl.sh
+++ b/samples/server/update-acl.sh
@@ -1,18 +1,18 @@
 #region curl
 curl -i -d @metadata.json http://127.0.0.1:2113/streams/newstream/metadata \
     --user admin:changeit \
-    -H "Content-Type: application/vnd.eventstore.events+json"
+    -H "Content-Type: application/vnd.kurrent.events+json"
 #endregion curl
 
 #region response
 HTTP/1.1 201 Created
 Access-Control-Allow-Methods: GET, POST, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Location: http://127.0.0.1:2113/streams/%24%24newstream/0
 Content-Type: text/plain; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Tue, 18 Sep 2018 09:38:56 GMT
 Content-Length: 0
 Keep-Alive: timeout=15,max=100
diff --git a/samples/server/update-default-acl.sh b/samples/server/update-default-acl.sh
index 28ee2410e6f..4938b76fc54 100644
--- a/samples/server/update-default-acl.sh
+++ b/samples/server/update-default-acl.sh
@@ -1,18 +1,18 @@
 #region curl
 curl -i -d @override-default.json http://127.0.0.1:2113/streams/%24settings/metadata /
     --user admin:changeit /
-    -H "Content-Type: application/vnd.eventstore.events+json"
+    -H "Content-Type: application/vnd.kurrent.events+json"
 #endregion curl
 
 #region response
 HTTP/1.1 201 Created
 Access-Control-Allow-Methods: GET, POST, GET, OPTIONS
-Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequiresMaster, ES-HardDelete, ES-ResolveLinkTos
+Access-Control-Allow-Headers: Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos
 Access-Control-Allow-Origin: *
-Access-Control-Expose-Headers: Location, ES-Position, ES-CurrentVersion
+Access-Control-Expose-Headers: Location, Kurrent-Position, Kurrent-CurrentVersion
 Location: http://127.0.0.1:2113/streams/%24%24%24users/0
 Content-Type: text/plain; charset=utf-8
-Server: Mono-HTTPAPI/1.0
+Server: Kestrel
 Date: Thu, 23 Aug 2018 10:35:19 GMT
 Content-Length: 0
 Keep-Alive: timeout=15,max=100
diff --git a/samples/server/vars.env b/samples/server/vars.env
index 8c64ebd41ed..ed845e52f65 100644
--- a/samples/server/vars.env
+++ b/samples/server/vars.env
@@ -1,5 +1,5 @@
-EVENTSTORE_CLUSTER_SIZE=3
-EVENTSTORE_RUN_PROJECTIONS=All
-EVENTSTORE_DISCOVER_VIA_DNS=false
-EVENTSTORE_ENABLE_ATOM_PUB_OVER_HTTP=true
-EVENTSTORE_ADVERTISE_HOST_TO_CLIENT_AS=127.0.0.1
+KURRENTDB_CLUSTER_SIZE=3
+KURRENTDB_RUN_PROJECTIONS=All
+KURRENTDB_DISCOVER_VIA_DNS=false
+KURRENTDB_ENABLE_ATOM_PUB_OVER_HTTP=true
+KURRENTDB_ADVERTISE_HOST_TO_CLIENT_AS=127.0.0.1
diff --git a/shared.env b/shared.env
index 175e11562b8..72031b358ee 100644
--- a/shared.env
+++ b/shared.env
@@ -1,7 +1,7 @@
-EVENTSTORE_CLUSTER_SIZE=3
-EVENTSTORE_RUN_PROJECTIONS=All
-EVENTSTORE_INT_TCP_PORT=1112
-EVENTSTORE_HTTP_PORT=2113
-EVENTSTORE_TRUSTED_ROOT_CERTIFICATES_PATH=/etc/eventstore/certs/ca
-EVENTSTORE_DISCOVER_VIA_DNS=false
-EVENTSTORE_ENABLE_ATOM_PUB_OVER_HTTP=true
\ No newline at end of file
+KURRENTDB_CLUSTER_SIZE=3
+KURRENTDB_RUN_PROJECTIONS=All
+KURRENTDB_REPLICATION_PORT=1112
+KURRENTDB_NODE_PORT=2113
+KURRENTDB_TRUSTED_ROOT_CERTIFICATES_PATH=/etc/kurrentdb/certs/ca
+KURRENTDB_DISCOVER_VIA_DNS=false
+KURRENTDB_ENABLE_ATOM_PUB_OVER_HTTP=true
diff --git a/src/.editorconfig b/src/.editorconfig
index a8d55111398..39369765669 100644
--- a/src/.editorconfig
+++ b/src/.editorconfig
@@ -14,6 +14,10 @@ trim_trailing_whitespace = true
 
 charset = utf-8
 
+# License headers
+dotnet_diagnostic.IDE0073.severity = error
+file_header_template = Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.\nKurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 # New line preferences
 csharp_new_line_before_open_brace = none
 csharp_new_line_before_catch = false
@@ -26,6 +30,10 @@ csharp_new_line_within_query_expression_clauses = true
 # disable hint to use primary constructor
 dotnet_diagnostic.IDE0290.severity = none
 
+# use file-scoped namespaces
+csharp_style_namespace_declarations = file_scoped
+dotnet_diagnostic.IDE0161.severity = error
+
 # use ValueTasks correctly
 dotnet_diagnostic.CA2012.severity = error
 
@@ -33,6 +41,7 @@ dotnet_diagnostic.CA2012.severity = error
 csharp_indent_block_contents = true
 csharp_indent_braces = false
 csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = false
 csharp_indent_switch_labels = true
 csharp_indent_labels = flush_left
 
@@ -53,10 +62,10 @@ dotnet_style_predefined_type_for_member_access = true:suggestion
 
 # name all constant fields using PascalCase
 dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
-dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields
-dotnet_naming_rule.constant_fields_should_be_pascal_case.style    = pascal_case_style
+dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
+dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
 
-dotnet_naming_symbols.constant_fields.applicable_kinds   = field
+dotnet_naming_symbols.constant_fields.applicable_kinds = field
 dotnet_naming_symbols.constant_fields.required_modifiers = const
 
 dotnet_naming_style.pascal_case_style.capitalization = pascal_case
@@ -64,23 +73,23 @@ dotnet_naming_style.pascal_case_style.capitalization = pascal_case
 # static fields should have s_ prefix
 dotnet_naming_rule.static_fields_should_have_prefix.severity = suggestion
 dotnet_naming_rule.static_fields_should_have_prefix.style = pascal_case_style
-dotnet_naming_rule.static_fields_should_have_prefix.symbols  = static_fields
+dotnet_naming_rule.static_fields_should_have_prefix.symbols = static_fields
 
-dotnet_naming_symbols.static_fields.applicable_kinds   = field
+dotnet_naming_symbols.static_fields.applicable_kinds = field
 dotnet_naming_symbols.static_fields.required_modifiers = static
 
-dotnet_naming_style.static_prefix_style.capitalization = pascal_case 
+dotnet_naming_style.static_prefix_style.capitalization = pascal_case
 
 # internal and private fields should be _camelCase
 dotnet_naming_rule.camel_case_for_private_internal_fields.severity = suggestion
-dotnet_naming_rule.camel_case_for_private_internal_fields.symbols  = private_internal_fields
-dotnet_naming_rule.camel_case_for_private_internal_fields.style    = camel_case_underscore_style
+dotnet_naming_rule.camel_case_for_private_internal_fields.symbols = private_internal_fields
+dotnet_naming_rule.camel_case_for_private_internal_fields.style = camel_case_underscore_style
 
 dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
 dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal
 
 dotnet_naming_style.camel_case_underscore_style.required_prefix = _
-dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case 
+dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
 
 # Code style defaults
 dotnet_sort_system_directives_first = true
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index d4cd5fe136b..09c239785ed 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -3,23 +3,29 @@
 		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 		<DebugType Condition=" '$(Configuration)' == 'Debug' ">full</DebugType>
 		<DebugType Condition=" '$(Configuration)' == 'Release' ">pdbonly</DebugType>
-		<Authors>Event Store Ltd</Authors>
+		<Authors>Kurrent, Inc</Authors>
 		<PackageIconUrl>ouro.png</PackageIconUrl>
 		<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
-		<PackageProjectUrl>https://eventstore.com</PackageProjectUrl>
+		<PackageProjectUrl>https://kurrent.io</PackageProjectUrl>
 		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-		<Copyright>Copyright 2012-2024 Event Store Ltd</Copyright>
-		<PackageReleaseNotes>https://eventstore.com/blog/</PackageReleaseNotes>
+		<Copyright>Copyright 2012-2025 Kurrent, Inc</Copyright>
+		<PackageReleaseNotes>https://docs.kurrent.io/server/latest/release-schedule/release-notes</PackageReleaseNotes>
 		<TargetFramework>net8.0</TargetFramework>
 		<LangVersion>12.0</LangVersion>
 		<Platforms>AnyCPU;x64;ARM64</Platforms>
 		<IsPackable>false</IsPackable>
-		<VersionPrefix>24.10.0</VersionPrefix>
+		<VersionPrefix>25.1.0</VersionPrefix>
 		<VersionSuffix>prerelease</VersionSuffix>
+		<IsTestProject>false</IsTestProject>
 	</PropertyGroup>
 	<ItemGroup>
 		<None Include="..\..\LICENSE.md" Pack="true" PackagePath="\" />
+		<None Include="..\..\LICENSE_CONTRIBUTIONS.md" Pack="true" PackagePath="\" />
 		<None Include="..\..\NOTICE.html" Pack="true" PackagePath="\" />
 		<None Include="..\..\ouro.png" Pack="true" PackagePath="\" />
 	</ItemGroup>
+
+	<ItemGroup Condition="'$(IsTestProject)' == 'true'">
+		<ProjectReference Include="..\KurrentDB.Plugins.TestHelpers\KurrentDB.Plugins.TestHelpers.csproj" />
+	</ItemGroup>
 </Project>
diff --git a/src/EventStore.BufferManagement.Tests/BufferManagerTests.cs b/src/EventStore.BufferManagement.Tests/BufferManagerTests.cs
deleted file mode 100644
index 41b7e39f6b1..00000000000
--- a/src/EventStore.BufferManagement.Tests/BufferManagerTests.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using System;
-using System.Collections.Generic;
-using NUnit.Framework;
-
-namespace EventStore.BufferManagement.Tests {
-	[TestFixture]
-	public class when_creating_a_buffer_manager {
-		[Test]
-		public void a_zero_chunk_size_causes_an_argumentexception() {
-			Assert.Throws<ArgumentException>(() => new BufferManager(1024, 0, 1024));
-		}
-
-		[Test]
-		public void a_negative_chunk_size_causes_an_argumentexception() {
-			Assert.Throws<ArgumentException>(() => new BufferManager(200, -1, 200));
-		}
-
-		[Test]
-		public void a_negative_chunks_per_segment_causes_an_argumentexception() {
-			Assert.Throws<ArgumentException>(() => new BufferManager(-1, 1024, 8));
-		}
-
-		[Test]
-		public void a_zero_chunks_per_segment_causes_an_argumentexception() {
-			Assert.Throws<ArgumentException>(() => new BufferManager(0, 1024, 8));
-		}
-
-		[Test]
-		public void a_negative_number_of_segments_causes_an_argumentexception() {
-			Assert.Throws<ArgumentException>(() => new BufferManager(1024, 1024, -1));
-		}
-
-		[Test]
-		public void can_create_a_manager_with_zero_inital_segments() {
-			Assert.DoesNotThrow(() => new BufferManager(1024, 1024, 0));
-		}
-	}
-
-	[TestFixture]
-	public class when_checking_out_a_buffer {
-		[Test]
-		public void should_return_a_valid_buffer_when_available() {
-			BufferManager manager = new BufferManager(1, 1000, 1);
-			ArraySegment<byte> buffer = manager.CheckOut();
-			Assert.AreEqual(1000, buffer.Count);
-		}
-
-		[Test]
-		public void should_decrement_available_buffers() {
-			BufferManager manager = new BufferManager(1, 1000, 1);
-			manager.CheckOut();
-			Assert.AreEqual(0, manager.AvailableBuffers);
-		}
-
-		[Test]
-		public void should_create_a_segment_if_none_are_availabke() {
-			BufferManager manager = new BufferManager(10, 1000, 0);
-			manager.CheckOut();
-			Assert.AreEqual(9, manager.AvailableBuffers);
-		}
-
-		[Test]
-		public void should_throw_an_unabletocreatememoryexception_if_acquiring_memory_is_disabled_and_out_of_memory() {
-			BufferManager manager = new BufferManager(1, 1000, 1, false);
-			manager.CheckOut();
-			//should be none left, boom
-			Assert.Throws<UnableToCreateMemoryException>(() => manager.CheckOut());
-		}
-
-		[Test]
-		public void should_release_acquired_buffers_if_size_requirement_cant_be_satisfied() {
-			BufferManager manager = new BufferManager(1, 1000, 1, false);
-			Assert.Throws(Is.InstanceOf(typeof(Exception)), () => manager.CheckOut(2));
-			Assert.AreEqual(1, manager.AvailableBuffers);
-		}
-	}
-
-	[TestFixture]
-	public class when_checking_in_a_buffer {
-		[Test]
-		public void should_accept_a_checked_out_buffer() {
-			BufferManager manager = new BufferManager(10, 1000, 0);
-			manager.CheckIn(manager.CheckOut());
-		}
-
-		[Test]
-		public void should_increment_available_buffers() {
-			BufferManager manager = new BufferManager(10, 1000, 0);
-			manager.CheckIn(manager.CheckOut());
-			Assert.AreEqual(10, manager.AvailableBuffers);
-		}
-
-		[Test]
-		public void should_throw_argumentnullexception_if_null_buffer() {
-			BufferManager manager = new BufferManager(10, 1000, 0);
-			Assert.Throws<ArgumentNullException>(() => { manager.CheckIn((IEnumerable<ArraySegment<byte>>)null); });
-		}
-
-		[Test]
-		public void should_throw_argumentexception_if_buffer_wrong_size() {
-			BufferManager manager = new BufferManager(10, 1000, 0);
-			byte[] data = new byte[10000];
-			Assert.Throws<ArgumentException>(() => { manager.CheckIn(new ArraySegment<byte>(data)); });
-		}
-	}
-}
diff --git a/src/EventStore.BufferManagement.Tests/BufferPoolStreamTests.cs b/src/EventStore.BufferManagement.Tests/BufferPoolStreamTests.cs
deleted file mode 100644
index aecc6d204ea..00000000000
--- a/src/EventStore.BufferManagement.Tests/BufferPoolStreamTests.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-using System;
-using System.IO;
-using NUnit.Framework;
-
-namespace EventStore.BufferManagement.Tests {
-	public abstract class has_buffer_pool_fixture : has_buffer_manager_fixture {
-		protected BufferPool BufferPool;
-
-		[SetUp]
-		public override void Setup() {
-			base.Setup();
-			BufferPool = new BufferPool(10, BufferManager);
-		}
-	}
-
-	[TestFixture]
-	public class when_insantiating_a_buffer_pool_stream : has_buffer_pool_fixture {
-		[Test]
-		public void a_null_buffer_pool_throws_an_argumentnullexception() {
-			Assert.Throws<ArgumentNullException>(() => new BufferPoolStream(null));
-		}
-
-		[Test]
-		public void the_internal_buffer_pool_is_set() {
-			using BufferPoolStream stream = new BufferPoolStream(BufferPool);
-			Assert.AreEqual(BufferPool, stream.BufferPool);
-		}
-	}
-
-	[TestFixture]
-	public class when_reading_from_the_stream : has_buffer_pool_fixture {
-		[Test]
-		public void position_is_incremented() {
-			using BufferPoolStream stream = new BufferPoolStream(BufferPool);
-			stream.Write(new byte[500], 0, 500);
-			stream.Seek(0, SeekOrigin.Begin);
-			Assert.AreEqual(0, stream.Position);
-			stream.Read(new byte[50], 0, 50);
-			Assert.AreEqual(50, stream.Position);
-		}
-
-		[Test]
-		public void a_read_past_the_end_of_the_stream_returns_zero() {
-			using BufferPoolStream stream = new BufferPoolStream(BufferPool);
-			stream.Write(new byte[500], 0, 500);
-			stream.Position = 0;
-			int read = stream.Read(new byte[500], 0, 500);
-			Assert.AreEqual(500, read);
-			read = stream.Read(new byte[500], 0, 500);
-			Assert.AreEqual(0, read);
-		}
-
-		[Test]
-		public void reading_from_the_stream_with_StreamCopyTo_returns_all_data() {
-			using BufferPoolStream stream = new BufferPoolStream(BufferPool);
-			int size = 20123;
-			stream.Write(new byte[size], 0, size);
-			stream.Position = 0;
-
-			using var destination = new MemoryStream();
-			stream.CopyTo(destination);
-			Assert.AreEqual(destination.Length, size);
-		}
-	}
-
-	[TestFixture]
-	public class when_writing_to_the_stream : has_buffer_pool_fixture {
-		[Test]
-		public void position_is_incremented() {
-			using BufferPoolStream stream = new BufferPoolStream(BufferPool);
-			stream.Write(new byte[500], 0, 500);
-			Assert.AreEqual(500, stream.Position);
-		}
-	}
-
-	[TestFixture]
-	public class when_seeking_in_the_stream : has_buffer_pool_fixture {
-		[Test]
-		public void from_begin_sets_relative_to_beginning() {
-			using BufferPoolStream stream = new BufferPoolStream(BufferPool);
-			stream.Write(new byte[500], 0, 500);
-			stream.Seek(22, SeekOrigin.Begin);
-			Assert.AreEqual(22, stream.Position);
-		}
-
-		[Test]
-		public void from_end_sets_relative_to_end() {
-			using BufferPoolStream stream = new BufferPoolStream(BufferPool);
-			stream.Write(new byte[500], 0, 500);
-			stream.Seek(-100, SeekOrigin.End);
-			Assert.AreEqual(400, stream.Position);
-		}
-
-		[Test]
-		public void from_current_sets_relative_to_current() {
-			using BufferPoolStream stream = new BufferPoolStream(BufferPool);
-			stream.Write(new byte[500], 0, 500);
-			stream.Seek(-2, SeekOrigin.Current);
-			stream.Seek(1, SeekOrigin.Current);
-			Assert.AreEqual(499, stream.Position);
-		}
-
-		[Test]
-		public void a_negative_position_throws_an_argumentexception() {
-			using BufferPoolStream stream = new BufferPoolStream(BufferPool);
-			Assert.Throws<ArgumentOutOfRangeException>(() => { stream.Seek(-1, SeekOrigin.Begin); });
-		}
-
-		[Test]
-		public void seeking_past_end_of_stream_throws_an_argumentexception() {
-			using BufferPoolStream stream = new BufferPoolStream(BufferPool);
-			stream.Write(new byte[500], 0, 500);
-			Assert.Throws<ArgumentOutOfRangeException>(() => { stream.Seek(501, SeekOrigin.Begin); });
-		}
-	}
-}
diff --git a/src/EventStore.BufferManagement.Tests/BufferPoolTests.cs b/src/EventStore.BufferManagement.Tests/BufferPoolTests.cs
deleted file mode 100644
index 5acc10e68c3..00000000000
--- a/src/EventStore.BufferManagement.Tests/BufferPoolTests.cs
+++ /dev/null
@@ -1,466 +0,0 @@
-using System;
-using System.Collections.Generic;
-using NUnit.Framework;
-
-namespace EventStore.BufferManagement.Tests {
-	public class has_buffer_manager_fixture {
-		protected BufferManager BufferManager;
-
-		[SetUp]
-		public virtual void Setup() {
-			BufferManager = new BufferManager(128, 1024, 1);
-		}
-	}
-
-	[TestFixture]
-	public class when_instantiating_a_bufferpool : has_buffer_manager_fixture {
-		[Test]
-		public void a_negative_initial_buffers_throws_an_argumentexception() {
-			Assert.Throws<ArgumentException>(() => new BufferPool(-1, BufferManager));
-		}
-
-		[Test]
-		public void a_null_buffer_manager_throws_an_argumentnullexception() {
-			Assert.Throws<ArgumentNullException>(() => new BufferPool(12, null));
-		}
-
-		[Test]
-		public void an_empty_buffer_has_a_length_of_zero() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			Assert.AreEqual(0, pool.Length);
-		}
-
-		[Test]
-		public void the_requested_buffers_should_be_removed_from_the_buffer_manager() {
-			int initialBuffers = BufferManager.AvailableBuffers;
-			new BufferPool(10, BufferManager);
-			Assert.AreEqual(initialBuffers - 10, BufferManager.AvailableBuffers);
-		}
-	}
-
-	[TestFixture]
-	public class when_changing_data_in_a_bufferpool_via_indexer : has_buffer_manager_fixture {
-		[Test]
-		public void an_index_under_zero_throws_an_argument_exception() {
-			BufferPool pool = new BufferPool(12, BufferManager);
-			Assert.Throws<ArgumentException>(() => pool[-1] = 4);
-		}
-
-		[Test]
-		public void data_that_has_been_set_can_read() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			pool[3] = 5;
-			Assert.AreEqual(5, pool[3]);
-		}
-
-		[Test]
-		public void length_is_updated_when_index_higher_than_count_set() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			Assert.AreEqual(0, pool.Length);
-			pool[3] = 5;
-			Assert.AreEqual(4, pool.Length);
-		}
-
-		[Test]
-		public void a_write_will_automatically_grow_the_buffer_pool() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			int initialCapacity = pool.Capacity;
-			pool[initialCapacity + 14] = 5;
-			Assert.AreEqual(initialCapacity * 2, pool.Capacity);
-		}
-
-		[Test]
-		public void a_write_past_end_will_check_out_a_buffer_from_the_buffer_pool() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			int initial = BufferManager.AvailableBuffers;
-			pool[pool.Capacity + 14] = 5;
-			Assert.AreEqual(initial - 1, BufferManager.AvailableBuffers);
-		}
-	}
-
-	[TestFixture]
-	public class when_converting_to_a_byte_array : has_buffer_manager_fixture {
-		[Test]
-		public void the_byte_array_should_be_the_same_length_as_the_pool_with_data() {
-			BufferPool pool = new BufferPool(5, BufferManager);
-			for (int i = 0; i < 500; i++) {
-				pool[i] = 12;
-			}
-
-			Assert.AreEqual(500, pool.ToByteArray().Length);
-		}
-
-		[Test]
-		public void the_byte_array_should_have_the_same_data_as_the_pool_with_multiple_buffers() {
-			BufferPool pool = new BufferPool(5, BufferManager);
-			for (int i = 0; i < 5000; i++) {
-				pool[i] = (byte)(i % 255);
-			}
-
-			byte[] data = pool.ToByteArray();
-			for (int i = 0; i < 5000; i++) {
-				Assert.AreEqual((byte)(i % 255), data[i]);
-			}
-		}
-
-		[Test]
-		public void the_byte_array_should_have_the_same_data_as_the_pool_with_a_single_buffer() {
-			BufferPool pool = new BufferPool(5, BufferManager);
-			for (int i = 0; i < 5; i++) {
-				pool[i] = (byte)(i % 255);
-			}
-
-			byte[] data = pool.ToByteArray();
-			for (int i = 0; i < 5; i++) {
-				Assert.AreEqual((byte)(i % 255), data[i]);
-			}
-		}
-
-
-		[Test]
-		public void an_empty_pool_should_return_an_empty_array() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			byte[] arr = pool.ToByteArray();
-			Assert.AreEqual(0, arr.Length);
-		}
-	}
-
-	[TestFixture]
-	public class when_converting_to_an_effective_IEnumerable_of_arraysegments : has_buffer_manager_fixture {
-		[Test]
-		public void empty_returns_no_results() {
-			BufferPool pool = new BufferPool(10, BufferManager);
-			foreach (ArraySegment<byte> effectiveBuffer in pool.EffectiveBuffers) {
-				Assert.Fail("should not have been buffers");
-			}
-		}
-
-		[Test]
-		public void a_single_partial_segment_can_be_returned() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			for (byte i = 0; i < 10; i++) {
-				pool[i] = i;
-			}
-
-			List<ArraySegment<byte>> buffers = new List<ArraySegment<byte>>(pool.EffectiveBuffers);
-			Assert.IsTrue(buffers.Count == 1);
-			for (byte i = 0; i < 10; i++) {
-				Assert.IsTrue(buffers[0].Array[buffers[0].Offset + i] == i);
-			}
-		}
-
-		[Test]
-		public void multiple_segments_can_be_returned() {
-			BufferManager manager = new BufferManager(3, 1000, 1);
-			BufferPool pool = new BufferPool(10, manager);
-			for (int i = 0; i < 2500; i++) {
-				pool[i] = (byte)(i % 255);
-			}
-
-			List<ArraySegment<byte>> buffers = new List<ArraySegment<byte>>(pool.EffectiveBuffers);
-			Assert.IsTrue(buffers.Count == 3);
-			Assert.IsTrue(buffers[0].Count == 1000);
-			Assert.IsTrue(buffers[1].Count == 1000);
-			Assert.IsTrue(buffers[2].Count == 500);
-		}
-	}
-
-	[TestFixture]
-	public class when_reading_data_in_a_bufferpool_via_indexer : has_buffer_manager_fixture {
-		[Test]
-		public void if_the_index_is_past_the_length_an_argumentoutofrangeexception_is_thrown() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			Assert.Throws<ArgumentOutOfRangeException>(() => {
-				var b = pool[3];
-			});
-		}
-	}
-
-
-	[TestFixture]
-	public class when_disposing_a_buffer_pool : has_buffer_manager_fixture {
-		[Test]
-		public void buffers_are_released_back_to_the_buffer_pool() {
-			int initial = BufferManager.AvailableBuffers;
-			using (new BufferPool(20, BufferManager)) {
-				//sanity check (make sure they are actually gone)
-				Assert.AreEqual(initial - 20, BufferManager.AvailableBuffers);
-			}
-
-			Assert.AreEqual(initial, BufferManager.AvailableBuffers);
-		}
-	}
-
-	[TestFixture]
-	public class when_reading_multiple_bytes : has_buffer_manager_fixture {
-		[Test]
-		public void a_null_read_buffer_throws_an_argumentnullexception() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			Assert.Throws<ArgumentNullException>(() => { pool.ReadFrom(0, null, 0, 0); });
-		}
-
-		[Test]
-		public void an_offset_larger_than_the_buffer_throws_an_argumentoutofrangeexception() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			Assert.Throws<ArgumentOutOfRangeException>(() => { pool.ReadFrom(0, new byte[5], 8, 3); });
-		}
-
-		[Test]
-		public void a_count_larger_than_the_buffer_throws_an_argumentoutofrangeexception() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			Assert.Throws<ArgumentOutOfRangeException>(() => { pool.ReadFrom(0, new byte[5], 3, 5); });
-		}
-
-		[Test]
-		public void a_negative_count_throws_an_argumentoutofrangeexception() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			Assert.Throws<ArgumentOutOfRangeException>(() => { pool.ReadFrom(0, new byte[5], 3, -1); });
-		}
-
-		[Test]
-		public void a_negative_offset_throws_an_argumentoutofrangeexception() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			Assert.Throws<ArgumentOutOfRangeException>(() => { pool.ReadFrom(0, new byte[5], -1, 1); });
-		}
-
-		[Test]
-		public void count_and_offset_together_lerger_than_buffer_throws_an_argumentoutofrangeexception() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			Assert.Throws<ArgumentOutOfRangeException>(() => { pool.ReadFrom(0, new byte[5], 4, 2); });
-		}
-
-		[Test]
-		public void reading_from_a_position_bigger_than_buffer_length_reads_nothing() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			pool[0] = 12;
-			pool[1] = 13;
-			int read = pool.ReadFrom(3, new byte[5], 0, 5);
-			Assert.AreEqual(read, 0);
-		}
-
-		[Test]
-		public void reading_from_a_position_plus_count_bigger_than_buffer_length_reads_the_right_amount() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			pool[0] = 12;
-			pool[1] = 13;
-			int read = pool.ReadFrom(0, new byte[5], 0, 5);
-			Assert.AreEqual(read, 2);
-		}
-
-		[Test]
-		public void can_read_within_a_single_buffer_with_no_offset() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			for (int i = 0; i < 255; i++) {
-				pool[i] = (byte)i;
-			}
-
-			byte[] buffer = new byte[255];
-			pool.ReadFrom(0, buffer, 0, 255);
-			for (int i = 0; i < 255; i++) {
-				Assert.AreEqual((byte)i, buffer[i]);
-			}
-		}
-
-		[Test]
-		public void can_read_from_multiple_buffers() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			for (int i = 0; i < 5000; i++) {
-				pool[i] = (byte)(i % 255);
-			}
-
-			byte[] buffer = new byte[5000];
-			pool.ReadFrom(0, buffer, 0, 5000);
-			for (int i = 0; i < 5000; i++) {
-				Assert.AreEqual((byte)(i % 255), buffer[i]);
-			}
-		}
-
-		[Test]
-		public void can_read_using_an_offset() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			for (int i = 5; i < 260; i++) {
-				pool[i] = (byte)(i - 5);
-			}
-
-			byte[] buffer = new byte[255];
-			pool.ReadFrom(5, buffer, 0, 255);
-			for (int i = 0; i < 255; i++) {
-				Assert.AreEqual((byte)i, buffer[i]);
-			}
-		}
-	}
-
-	[TestFixture]
-	public class when_writing_multiple_bytes : has_buffer_manager_fixture {
-		[Test]
-		public void a_null_byte_array_throws_an_argumentnullexception() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			Assert.Throws<ArgumentNullException>(() => { pool.Append(null); });
-		}
-
-		[Test]
-		public void an_offset_larger_than_the_buffer_throws_an_argumentoutofrangeexception() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			Assert.Throws<ArgumentOutOfRangeException>(() => { pool.Write(0, new byte[5], 8, 3); });
-		}
-
-		[Test]
-		public void a_count_larger_than_the_buffer_throws_an_argumentoutofrangeexception() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			Assert.Throws<ArgumentOutOfRangeException>(() => { pool.Write(0, new byte[5], 3, 5); });
-		}
-
-		[Test]
-		public void a_negative_count_throws_an_argumentoutofrangeexception() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			Assert.Throws<ArgumentOutOfRangeException>(() => { pool.Write(0, new byte[5], 3, -1); });
-		}
-
-		[Test]
-		public void a_negative_offset_throws_an_argumentoutofrangeexception() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			Assert.Throws<ArgumentOutOfRangeException>(() => { pool.Write(0, new byte[5], -1, 1); });
-		}
-
-		[Test]
-		public void length_is_updated_to_include_bytes_written() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			byte[] data = {1, 2, 3, 4, 5};
-			pool.Append(data);
-			Assert.IsTrue(pool.Length == 5);
-		}
-
-		[Test]
-		public void data_is_written_to_the_internal_buffer() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			byte[] data = {1, 2, 3, 4, 5};
-			pool.Append(data);
-			for (byte i = 0; i < 5; i++) {
-				Assert.AreEqual(i + 1, pool[i]);
-			}
-		}
-
-		[Test]
-		public void pool_can_expand_capacity() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			int initialCapacity = pool.Capacity;
-			byte[] data = new byte[initialCapacity + 25];
-			pool.Append(data);
-			Assert.AreEqual(initialCapacity * 2, pool.Capacity);
-		}
-
-		[Test]
-		public void can_write_given_a_self_offset() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			byte[] data = {1, 2, 3, 4, 5};
-			pool.Write(4, data, 0, 5); //start at position 4
-			for (byte i = 4; i < 9; i++) {
-				Assert.AreEqual(i - 3, pool[i]);
-			}
-		}
-
-		[Test]
-		public void can_write_given_a_source_offset() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			byte[] data = {1, 2, 3, 4, 5};
-			pool.Write(0, data, 3, 2);
-			Assert.AreEqual(pool[0], 4);
-			Assert.AreEqual(pool[1], 5);
-		}
-	}
-
-	[TestFixture]
-	public class when_setting_the_length_of_the_pool : has_buffer_manager_fixture {
-		[Test]
-		public void a_negative_length_throws_an_argumentexception() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			Assert.Throws<ArgumentException>(() => { pool.SetLength(-1, false); });
-		}
-
-		[Test]
-		public void a_larger_length_makes_capacity_larger() {
-			BufferManager manager = new BufferManager(10, 1000, 1);
-			BufferPool pool = new BufferPool(1, manager);
-			pool.SetLength(5000);
-			Assert.AreNotEqual(5000, pool.Capacity);
-		}
-
-		[Test]
-		public void length_is_set_when_setting_length() {
-			BufferPool pool = new BufferPool(1, BufferManager);
-			pool.SetLength(5000, false);
-			Assert.AreEqual(5000, pool.Length);
-		}
-
-		[Test]
-		public void a_smaller_length_lowers_capacity() {
-			BufferManager manager = new BufferManager(10, 1000, 1);
-			BufferPool pool = new BufferPool(5, manager);
-			pool.SetLength(1);
-			Assert.AreEqual(9, manager.AvailableBuffers);
-		}
-
-		[Test]
-		public void a_smaller_length_checks_buffers_back_in_when_allowed() {
-			BufferManager manager = new BufferManager(10, 1000, 1);
-			BufferPool pool = new BufferPool(5, manager);
-			pool.SetLength(1, true);
-			Assert.AreEqual(9, manager.AvailableBuffers);
-		}
-
-		[Test]
-		public void a_smaller_length_checks_buffers_back_in_when_not_allowed() {
-			BufferManager manager = new BufferManager(10, 1000, 1);
-			BufferPool pool = new BufferPool(5, manager);
-			pool.SetLength(1, false);
-			Assert.AreEqual(5, manager.AvailableBuffers);
-		}
-	}
-
-	[TestFixture]
-	public class when_a_buffer_pool_has_been_disposed : has_buffer_manager_fixture {
-		private BufferPool m_DisposedPool;
-
-		public override void Setup() {
-			base.Setup();
-			m_DisposedPool = new BufferPool(10, BufferManager);
-			m_DisposedPool.Dispose();
-		}
-
-		[Test]
-		public void reading_indexer_throws_objectdisposedexception() {
-			Assert.Throws<ObjectDisposedException>(() => {
-				byte b = m_DisposedPool[0];
-			});
-		}
-
-		[Test]
-		public void writing_indexer_throws_objectdisposedexception() {
-			Assert.Throws<ObjectDisposedException>(() => { m_DisposedPool[0] = 5; });
-		}
-
-		[Test]
-		public void writing_multiple_bytes_throws_objectdisposedexception() {
-			Assert.Throws<ObjectDisposedException>(() => { m_DisposedPool.Append(new byte[] {1, 2, 3, 4}); });
-		}
-
-
-		[Test]
-		public void effective_enumerator_throws_objectdisposedexception() {
-			Assert.Throws<ObjectDisposedException>(() => {
-				foreach (ArraySegment<byte> segment in m_DisposedPool.EffectiveBuffers) {
-				}
-			});
-		}
-
-		[Test]
-		public void setting_length_throws_objectdisposedexception() {
-			Assert.Throws<ObjectDisposedException>(() => { m_DisposedPool.SetLength(200); });
-		}
-
-		[Test]
-		public void converting_to_a_byte_array_throws_objectdisposedexception() {
-			Assert.Throws<ObjectDisposedException>(() => { m_DisposedPool.ToByteArray(); });
-		}
-	}
-}
diff --git a/src/EventStore.BufferManagement.Tests/EventStore.BufferManagement.Tests.csproj b/src/EventStore.BufferManagement.Tests/EventStore.BufferManagement.Tests.csproj
deleted file mode 100644
index 4f0da0ca64f..00000000000
--- a/src/EventStore.BufferManagement.Tests/EventStore.BufferManagement.Tests.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<DebugSymbols>true</DebugSymbols>
-	</PropertyGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\EventStore.BufferManagement\EventStore.BufferManagement.csproj" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-		<PackageReference Include="NUnit" Version="3.14.0" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-	</ItemGroup>
-</Project>
diff --git a/src/EventStore.BufferManagement/BufferManager.cs b/src/EventStore.BufferManagement/BufferManager.cs
deleted file mode 100644
index b48795554a1..00000000000
--- a/src/EventStore.BufferManagement/BufferManager.cs
+++ /dev/null
@@ -1,260 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using Serilog;
-
-namespace EventStore.BufferManagement {
-	/// <summary>
-	/// A manager to handle buffers for the socket connections
-	/// </summary>
-	/// <remarks>
-	/// When used in an async call a buffer is pinned. Large numbers of pinned buffers
-	/// cause problem with the GC (in particular it causes heap fragmentation).
-	/// This class maintains a set of large segments and gives clients pieces of these
-	/// segments that they can use for their buffers. The alternative to this would be to
-	/// create many small arrays which it then maintained. This methodology should be slightly
-	/// better than the many small array methodology because in creating only a few very
-	/// large objects it will force these objects to be placed on the LOH. Since the
-	/// objects are on the LOH they are at this time not subject to compacting which would
-	/// require an update of all GC roots as would be the case with lots of smaller arrays
-	/// that were in the normal heap.
-	/// </remarks>
-	public class BufferManager {
-        private static readonly ILogger Logger      = Log.ForContext<BufferManager>();
-
-        private const int TrialsCount = 100;
-
-		private static BufferManager _defaultBufferManager;
-
-		private readonly int _segmentChunks;
-		private readonly int _chunkSize;
-		private readonly int _segmentSize;
-		private readonly bool _allowedToCreateMemory;
-
-		private readonly ConcurrentStack<ArraySegment<byte>> _buffers = new ConcurrentStack<ArraySegment<byte>>();
-
-		private readonly List<byte[]> _segments;
-		private readonly object _creatingNewSegmentLock = new object();
-		
-
-		/// <summary>
-		/// Gets the default buffer manager
-		/// </summary>
-		/// <remarks>You should only be using this method if you don't want to manage buffers on your own.</remarks>
-		/// <value>The default buffer manager.</value>
-		public static BufferManager Default {
-			get {
-				//default to 1024 1kb buffers if people don't want to manage it on their own;
-				if (_defaultBufferManager == null)
-					_defaultBufferManager = new BufferManager(1024, 1024, 1);
-				return _defaultBufferManager;
-			}
-		}
-
-		/// <summary>
-		/// Sets the default buffer manager.
-		/// </summary>
-		/// <param name="manager">The new default buffer manager.</param>
-		public static void SetDefaultBufferManager(BufferManager manager) {
-			if (manager == null)
-				throw new ArgumentNullException("manager");
-			_defaultBufferManager = manager;
-		}
-
-		public int ChunkSize {
-			get { return _chunkSize; }
-		}
-
-		public int SegmentsCount {
-			get { return _segments.Count; }
-		}
-
-		public int SegmentChunksCount {
-			get { return _segmentChunks; }
-		}
-
-		/// <summary>
-		/// The current number of buffers available
-		/// </summary>
-		public int AvailableBuffers {
-			get { return _buffers.Count; } //do we really care about volatility here?
-		}
-
-		/// <summary>
-		/// The total size of all buffers
-		/// </summary>
-		public int TotalBufferSize {
-			get { return _segments.Count * _segmentSize; } //do we really care about volatility here?
-		}
-
-		/// <summary>
-		/// Constructs a new <see cref="BufferManager"></see> object
-		/// </summary>
-		/// <param name="segmentChunks">The number of chunks to create per segment</param>
-		/// <param name="chunkSize">The size of a chunk in bytes</param>
-		public BufferManager(int segmentChunks, int chunkSize)
-			: this(segmentChunks, chunkSize, 1) {
-		}
-
-		/// <summary>
-		/// Constructs a new <see cref="BufferManager"></see> object
-		/// </summary>
-		/// <param name="segmentChunks">The number of chunks to create per segment</param>
-		/// <param name="chunkSize">The size of a chunk in bytes</param>
-		/// <param name="initialSegments">The initial number of segments to create</param>
-		public BufferManager(int segmentChunks, int chunkSize, int initialSegments)
-			: this(segmentChunks, chunkSize, initialSegments, true) {
-		}
-
-		/// <summary>
-		/// Constructs a new <see cref="BufferManager"></see> object
-		/// </summary>
-		/// <param name="segmentChunks">The number of chunks to create per segment</param>
-		/// <param name="chunkSize">The size of a chunk in bytes</param>
-		/// <param name="initialSegments">The initial number of segments to create</param>
-		/// <param name="allowedToCreateMemory">If false when empty and checkout is called an exception will be thrown</param>
-		public BufferManager(int segmentChunks, int chunkSize, int initialSegments, bool allowedToCreateMemory) {
-			if (segmentChunks <= 0)
-				throw new ArgumentException("segmentChunks");
-			if (chunkSize <= 0)
-				throw new ArgumentException("chunkSize");
-			if (initialSegments < 0)
-				throw new ArgumentException("initialSegments");
-
-			_segmentChunks = segmentChunks;
-			_chunkSize = chunkSize;
-			_segmentSize = _segmentChunks * _chunkSize;
-
-			_segments = new List<byte[]>();
-
-			_allowedToCreateMemory = true;
-			for (int i = 0; i < initialSegments; i++) {
-				CreateNewSegment(true);
-			}
-
-			_allowedToCreateMemory = allowedToCreateMemory;
-		}
-
-		/// <summary>
-		/// Creates a new segment, makes buffers available
-		/// </summary>
-		private void CreateNewSegment(bool forceCreation) {
-			if (!_allowedToCreateMemory)
-				throw new UnableToCreateMemoryException();
-			lock (_creatingNewSegmentLock) {
-				if (!forceCreation && _buffers.Count > _segmentChunks / 2)
-					return;
-
-				var bytes = new byte[_segmentSize];
-				_segments.Add(bytes);
-				for (int i = 0; i < _segmentChunks; i++) {
-					var chunk = new ArraySegment<byte>(bytes, i * _chunkSize, _chunkSize);
-					_buffers.Push(chunk);
-				}
-
-				Logger.Debug(
-                    "Segments count: {segments}, buffers count: {buffers}, should be when full: {full}",
-					_segments.Count, _buffers.Count, _segments.Count * _segmentChunks
-                );
-			}
-		}
-
-		/// <summary>
-		/// Checks out a buffer from the manager
-		/// </summary>
-		/// <remarks>
-		/// It is the client's responsibility to return the buffer to the manager by
-		/// calling <see cref="CheckIn(ArraySegment{byte})"></see> on the buffer
-		/// </remarks>
-		/// <returns>A <see cref="ArraySegment{T}"></see> that can be used as a buffer</returns>
-		public ArraySegment<byte> CheckOut() {
-			int trial = 0;
-			while (trial < TrialsCount) {
-				ArraySegment<byte> result;
-				if (_buffers.TryPop(out result))
-					return result;
-				CreateNewSegment(false);
-				trial++;
-			}
-
-			throw new UnableToAllocateBufferException();
-		}
-
-		/// <summary>
-		/// Checks out a buffer from the manager
-		/// </summary>
-		/// <remarks>
-		/// It is the client's responsibility to return the buffer to the manger by
-		/// calling <see cref="CheckIn(IEnumerable{ArraySegment{byte}})"></see> on the buffer
-		/// </remarks>
-		/// <returns>A <see cref="ArraySegment{T}"></see> that can be used as a buffer</returns>
-		public IEnumerable<ArraySegment<byte>> CheckOut(int toGet) {
-			var result = new ArraySegment<byte>[toGet];
-			var count = 0;
-			var totalReceived = 0;
-
-			try {
-				while (count < TrialsCount) {
-					ArraySegment<byte> piece;
-					while (totalReceived < toGet) {
-						if (!_buffers.TryPop(out piece))
-							break;
-						result[totalReceived] = piece;
-						++totalReceived;
-					}
-
-					if (totalReceived == toGet)
-						return result;
-					CreateNewSegment(false);
-					count++;
-				}
-
-				throw new UnableToAllocateBufferException();
-			} catch {
-				if (totalReceived > 0)
-					CheckIn(result.Take(totalReceived));
-				throw;
-			}
-		}
-
-		/// <summary>
-		/// Returns a buffer to the control of the manager
-		/// </summary>
-		/// <remarks>
-		/// It is the client's responsibility to return the buffer to the manger by
-		/// calling <see cref="CheckIn(ArraySegment{byte})"></see> on the buffer
-		/// </remarks>
-		/// <param name="buffer">The <see cref="ArraySegment{T}"></see> to return to the cache</param>
-		public void CheckIn(ArraySegment<byte> buffer) {
-			CheckBuffer(buffer);
-			_buffers.Push(buffer);
-		}
-
-		/// <summary>
-		/// Returns a set of buffers to the control of the manager
-		/// </summary>
-		/// <remarks>
-		/// It is the client's responsibility to return the buffer to the manger by
-		/// calling <see cref="CheckIn(IEnumerable{ArraySegment{byte}})"></see> on the buffer
-		/// </remarks>
-		/// <param name="buffersToReturn">The <see cref="ArraySegment{T}"></see> to return to the cache</param>
-		public void CheckIn(IEnumerable<ArraySegment<byte>> buffersToReturn) {
-			if (buffersToReturn == null)
-				throw new ArgumentNullException("buffersToReturn");
-
-			foreach (var buf in buffersToReturn) {
-				CheckBuffer(buf);
-				_buffers.Push(buf);
-			}
-		}
-
-		//[Conditional("DEBUG")]
-		private void CheckBuffer(ArraySegment<byte> buffer) {
-			if (buffer.Array == null || buffer.Count == 0 || buffer.Array.Length < buffer.Offset + buffer.Count)
-				throw new Exception("Attempt to check in invalid buffer");
-			if (buffer.Count != _chunkSize)
-				throw new ArgumentException("Buffer was not of the same chunk size as the buffer manager", "buffer");
-		}
-	}
-}
diff --git a/src/EventStore.BufferManagement/BufferPool.cs b/src/EventStore.BufferManagement/BufferPool.cs
deleted file mode 100644
index f27af0a8aff..00000000000
--- a/src/EventStore.BufferManagement/BufferPool.cs
+++ /dev/null
@@ -1,326 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace EventStore.BufferManagement {
-	public class BufferPool : IDisposable {
-		private List<ArraySegment<byte>> _buffers;
-		private readonly BufferManager _bufferManager;
-		private readonly int _chunkSize;
-		private int _length;
-		private bool _disposed;
-
-		/// <summary>
-		/// Structure to represent an index and an offset into the list of buffers allowing for quick access to a position
-		/// </summary>
-		private struct Position {
-			public readonly int Index;
-			public readonly int Offset;
-
-			public Position(int index, int offset) {
-				Index = index;
-				Offset = offset;
-			}
-		}
-
-		/// <summary>
-		/// Gets the capacity of the <see cref="BufferPool"></see>
-		/// </summary>
-		/// <value>The capacity.</value>
-		public int Capacity {
-			get {
-				CheckDisposed();
-				return _chunkSize * _buffers.Count;
-			}
-		}
-
-		/// <summary>
-		/// Gets the current length of the <see cref="BufferPool"></see>
-		/// </summary>
-		/// <value>The length.</value>
-		public int Length {
-			get { return _length; }
-		}
-
-		/// <summary>
-		/// Gets the effective buffers contained in this <see cref="BufferPool"></see>
-		/// </summary>
-		/// <value>The effective buffers.</value>
-		public IEnumerable<ArraySegment<byte>> EffectiveBuffers {
-			get {
-				CheckDisposed();
-				if (_length > 0) {
-					Position l = GetPositionFor(_length);
-					//send full buffers
-					for (int i = 0; i < l.Index; i++) {
-						yield return _buffers[i];
-					}
-
-					//send partial buffer
-					ArraySegment<byte> last = _buffers[l.Index];
-					yield return new ArraySegment<byte>(last.Array, last.Offset, l.Offset);
-				}
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets the <see cref="System.Byte"/> with the specified index.
-		/// </summary>
-		public byte this[int index] {
-			get {
-				CheckDisposed();
-				if (index < 0 || index > _length)
-					throw new ArgumentOutOfRangeException("index");
-				Position l = GetPositionFor(index);
-				ArraySegment<byte> buffer = _buffers[l.Index];
-				return buffer.Array[buffer.Offset + l.Offset];
-			}
-			set {
-				CheckDisposed();
-				if (index < 0)
-					throw new ArgumentException("_Index");
-				Position l = GetPositionFor(index);
-				EnsureCapacity(l);
-				ArraySegment<byte> buffer = _buffers[l.Index];
-				buffer.Array[buffer.Offset + l.Offset] = value;
-				if (_length <= index)
-					_length = index + 1;
-			}
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="BufferPool"/> class.
-		/// </summary>
-		public BufferPool() : this(1, BufferManager.Default) {
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="BufferPool"/> class.
-		/// </summary>
-		/// <param name="bufferManager">The buffer manager.</param>
-		public BufferPool(BufferManager bufferManager) : this(1, bufferManager) {
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="BufferPool"/> class.
-		/// </summary>
-		/// <param name="initialBufferCount">The number of initial buffers.</param>
-		/// <param name="bufferManager">The buffer manager.</param>
-		public BufferPool(int initialBufferCount, BufferManager bufferManager) {
-			if (initialBufferCount <= 0)
-				throw new ArgumentException("initialBufferCount");
-			if (bufferManager == null)
-				throw new ArgumentNullException("bufferManager");
-			_length = 0;
-			_buffers = new List<ArraySegment<byte>>(bufferManager.CheckOut(initialBufferCount));
-			// must have 1 buffer
-			_chunkSize = _buffers[0].Count;
-			_bufferManager = bufferManager;
-			_disposed = false;
-		}
-
-		/// <summary>
-		/// Appends the specified data.
-		/// </summary>
-		/// <param name="data">The data to write.</param>
-		public void Append(byte[] data) {
-			if (data == null)
-				throw new ArgumentNullException("data");
-			Write(_length, data, 0, data.Length);
-		}
-
-		/// <summary>
-		/// Appends the specified data.
-		/// </summary>
-		/// <param name="data">The data.</param>
-		/// <param name="offset">The offset.</param>
-		/// <param name="count">The count.</param>
-		public void Append(byte[] data, int offset, int count) {
-			Write(_length, data, offset, count);
-		}
-
-		/// <summary>
-		/// Writes data to the specified position.
-		/// </summary>
-		/// <param name="position">The position to write at.</param>
-		/// <param name="data">The data.</param>
-		/// <param name="offset">The offset.</param>
-		/// <param name="count">The count.</param>
-		public void Write(int position, byte[] data, int offset, int count) {
-			if (data == null)
-				throw new ArgumentNullException("data");
-			if (offset < 0 || offset > data.Length)
-				throw new ArgumentOutOfRangeException("offset");
-			if (count < 0 || count + offset > data.Length)
-				throw new ArgumentOutOfRangeException("count");
-			Write(position, new ArraySegment<byte>(data, offset, count));
-		}
-
-		/// <summary>
-		/// Writes data to the specified position.
-		/// </summary>
-		/// <param name="position">The position to write at.</param>
-		/// <param name="data">The data.</param>
-		public void Write(int position, ArraySegment<byte> data) {
-			CheckDisposed();
-			int written = 0;
-			int tmpLength = position;
-			do {
-				Position loc = GetPositionFor(tmpLength);
-				EnsureCapacity(loc);
-				ArraySegment<byte> current = _buffers[loc.Index];
-				int canWrite = data.Count - written;
-				int available = current.Count - loc.Offset;
-				canWrite = canWrite > available ? available : canWrite;
-				if (canWrite > 0)
-					Buffer.BlockCopy(data.Array, written + data.Offset, current.Array, current.Offset + loc.Offset,
-						canWrite);
-				written += canWrite;
-				tmpLength += canWrite;
-			} while (written < data.Count);
-
-			_length = tmpLength > _length ? tmpLength : _length;
-		}
-
-		/// <summary>
-		/// Reads data from a given position
-		/// </summary>
-		/// <param name="position">The position to read from.</param>
-		/// <param name="data">Where to read the data to.</param>
-		/// <param name="offset">The offset to start reading into.</param>
-		/// <param name="count">The number of bytes to read.</param>
-		/// <returns></returns>
-		public int ReadFrom(int position, byte[] data, int offset, int count) {
-			if (data == null)
-				throw new ArgumentNullException("data");
-			if (offset < 0 || offset > data.Length)
-				throw new ArgumentOutOfRangeException("offset");
-			if (count < 0 || count + offset > data.Length)
-				throw new ArgumentOutOfRangeException("count");
-			return ReadFrom(position, new ArraySegment<byte>(data, offset, count));
-		}
-
-		/// <summary>
-		/// Reads data from a given position.
-		/// </summary>
-		/// <param name="position">The position to read from.</param>
-		/// <param name="data">Where to read the data to.</param>
-		/// <returns></returns>
-		public int ReadFrom(int position, ArraySegment<byte> data) {
-			CheckDisposed();
-			if (position >= _length)
-				return 0;
-			int copied = 0;
-			int left = Math.Min(data.Count, _length - position);
-			int currentLocation = position;
-			while (left > 0) {
-				Position l = GetPositionFor(currentLocation);
-				ArraySegment<byte> current = _buffers[l.Index];
-				int bytesToRead = Math.Min(_chunkSize - l.Offset, left);
-				if (bytesToRead > 0) {
-					Buffer.BlockCopy(current.Array, current.Offset + l.Offset, data.Array, data.Offset + copied,
-						bytesToRead);
-					copied += bytesToRead;
-					left -= bytesToRead;
-					currentLocation += bytesToRead;
-				}
-			}
-
-			return copied;
-		}
-
-		/// <summary>
-		/// Sets the length of the <see cref="BufferPool"></see>
-		/// </summary>
-		/// <param name="newLength">The new length.</param>
-		public void SetLength(int newLength) {
-			SetLength(newLength, true);
-		}
-
-		/// <summary>
-		/// Sets the length of the <see cref="BufferPool"></see>
-		/// </summary>
-		/// <param name="newLength">The new length</param>
-		/// <param name="releaseMemory">if set to <c>true</c> any memory no longer used will be released.</param>
-		public void SetLength(int newLength, bool releaseMemory) {
-			CheckDisposed();
-			if (newLength < 0) throw new ArgumentException("newLength must be greater than 0");
-			int oldCapacity = Capacity;
-			_length = newLength;
-
-			if (_length < oldCapacity && releaseMemory)
-				RemoveCapacity(GetPositionFor(_length));
-			else if (_length > oldCapacity)
-				EnsureCapacity(GetPositionFor(_length));
-		}
-
-		private void RemoveCapacity(Position position) {
-			while (_buffers.Count > position.Index + 1) {
-				_bufferManager.CheckIn(_buffers[_buffers.Count - 1]);
-				_buffers.RemoveAt(_buffers.Count - 1);
-			}
-		}
-
-		private void EnsureCapacity(Position position) {
-			if (position.Index >= _buffers.Count) {
-				foreach (ArraySegment<byte> buffer in _bufferManager.CheckOut(position.Index + 1 - _buffers.Count)) {
-					if (buffer.Count != _chunkSize)
-						throw new Exception("Received a buffer of the wrong size: this should never happen.");
-					_buffers.Add(buffer);
-				}
-			}
-		}
-
-		/// <summary>
-		/// Converts this <see cref="BufferPool"></see> to a byte array.
-		/// </summary>
-		/// <returns></returns>
-		public byte[] ToByteArray() {
-			CheckDisposed();
-			Position l = GetPositionFor(_length);
-			var result = new byte[_length];
-			for (int i = 0; i < l.Index; i++) {
-				ArraySegment<byte> current = _buffers[i];
-				//copy full buffers
-				Buffer.BlockCopy(current.Array, current.Offset, result, i * _chunkSize, _chunkSize);
-			}
-
-			//copy last partial buffer
-			if (l.Index < _buffers.Count) {
-				ArraySegment<byte> last = _buffers[l.Index];
-				Buffer.BlockCopy(last.Array, last.Offset, result, l.Index * _chunkSize, l.Offset);
-			}
-
-			return result;
-		}
-
-		private Position GetPositionFor(int index) {
-			//we could do this much faster if we restricted buffer sizes to powers of 2
-			var l = new Position(index / _chunkSize, index % _chunkSize);
-			return l;
-		}
-
-		/// <summary>
-		/// Returns any memory used buy this <see cref="BufferPool"></see> to the <see cref="BufferManager"></see>
-		/// </summary>
-		public void Dispose() {
-			DisposeInternal();
-			GC.SuppressFinalize(this);
-		}
-
-		~BufferPool() {
-			DisposeInternal();
-		}
-
-		protected virtual void DisposeInternal() {
-			if (_buffers != null)
-				_bufferManager.CheckIn(_buffers);
-			_disposed = true;
-			_buffers = null;
-		}
-
-		private void CheckDisposed() {
-			if (_disposed)
-				throw new ObjectDisposedException("Object has been disposed.");
-		}
-	}
-}
diff --git a/src/EventStore.BufferManagement/BufferPoolStream.cs b/src/EventStore.BufferManagement/BufferPoolStream.cs
deleted file mode 100644
index 3cb85c2c5d0..00000000000
--- a/src/EventStore.BufferManagement/BufferPoolStream.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using System;
-using System.IO;
-
-namespace EventStore.BufferManagement {
-	public class BufferPoolStream : Stream {
-		private readonly BufferPool _bufferPool;
-		private long _position;
-
-		public BufferPool BufferPool {
-			get { return _bufferPool; }
-		}
-
-		public override bool CanRead {
-			get { return true; }
-		}
-
-		public override bool CanSeek {
-			get { return true; }
-		}
-
-		public override bool CanWrite {
-			get { return true; }
-		}
-
-		public override long Length {
-			get { return _bufferPool.Length; }
-		}
-
-		public int Capacity {
-			get { return _bufferPool.Capacity; }
-		}
-
-		public override long Position {
-			get { return _position; }
-			set {
-				if (value < 0 || value > _bufferPool.Length)
-					throw new ArgumentOutOfRangeException("value");
-				_position = value;
-			}
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="BufferPoolStream"/> class.
-		/// </summary>
-		/// <param name="bufferPool">The buffer pool used as underlying storage.</param>
-		public BufferPoolStream(BufferPool bufferPool) {
-			if (bufferPool == null)
-				throw new ArgumentNullException("bufferPool");
-			_bufferPool = bufferPool;
-		}
-
-		public override void Flush() {
-			//noop
-		}
-
-		public override long Seek(long offset, SeekOrigin origin) {
-			switch (origin) {
-				case SeekOrigin.Begin:
-					Position = offset;
-					break;
-				case SeekOrigin.End:
-					Position = _bufferPool.Length + offset;
-					break;
-				case SeekOrigin.Current:
-					Position = _position + offset;
-					break;
-				default:
-					throw new Exception("Unknown SeekOrigin: " + origin.ToString());
-			}
-
-			return Position;
-		}
-
-		public override void SetLength(long value) {
-			_bufferPool.SetLength((int)value);
-			if (_position > value)
-				_position = value;
-		}
-
-		public override int Read(byte[] buffer, int offset, int count) {
-			if (_position >= _bufferPool.Length)
-				return 0;
-			int ret = _bufferPool.ReadFrom((int)_position, buffer, offset, count);
-			_position += ret;
-			return ret;
-		}
-
-		public override void Write(byte[] buffer, int offset, int count) {
-			_bufferPool.Write((int)_position, buffer, offset, count);
-			_position += count;
-		}
-
-		protected override void Dispose(bool disposing) {
-			if (disposing)
-				_bufferPool.Dispose();
-			base.Dispose(disposing);
-		}
-
-		public byte[] ToArray() {
-			return _bufferPool.ToByteArray();
-		}
-	}
-}
diff --git a/src/EventStore.BufferManagement/UnableToAllocateBufferException.cs b/src/EventStore.BufferManagement/UnableToAllocateBufferException.cs
deleted file mode 100644
index 229dacc7998..00000000000
--- a/src/EventStore.BufferManagement/UnableToAllocateBufferException.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-
-namespace EventStore.BufferManagement {
-	public class UnableToAllocateBufferException : Exception {
-		public UnableToAllocateBufferException()
-			: base("Cannot allocate buffer after few trials.") {
-		}
-	}
-}
diff --git a/src/EventStore.BufferManagement/UnableToCreateMemoryException.cs b/src/EventStore.BufferManagement/UnableToCreateMemoryException.cs
deleted file mode 100644
index 3da836e3450..00000000000
--- a/src/EventStore.BufferManagement/UnableToCreateMemoryException.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-
-namespace EventStore.BufferManagement {
-	public class UnableToCreateMemoryException : Exception {
-		public UnableToCreateMemoryException()
-			: base("All buffers were in use and acquiring more memory has been disabled.") {
-		}
-	}
-}
diff --git a/src/EventStore.ClusterNode.Web/EventStore.ClusterNode.Web.csproj b/src/EventStore.ClusterNode.Web/EventStore.ClusterNode.Web.csproj
deleted file mode 100644
index 8425a1c90f6..00000000000
--- a/src/EventStore.ClusterNode.Web/EventStore.ClusterNode.Web.csproj
+++ /dev/null
@@ -1,57 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-	</PropertyGroup>
-	<ItemGroup>
-		<Content Include="projections\es.projections.environment.js">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
-	<ItemGroup>
-		<None Include="clusternode-web\apple-touch-icon.png">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Include="clusternode-web\es-tile.png">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Include="clusternode-web\favicon.png">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Include="clusternode-web\fonts\**\*">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Include="clusternode-web\index.html">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Include="clusternode-web\css\main.min.css">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Include="clusternode-web\images\logo.svg">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Include="clusternode-web\js\app.min.js">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Include="clusternode-web\js\requirejs.min.js">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Include="clusternode-web\js\ace\ace.js">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Include="clusternode-web\js\ace\mode-javascript.js">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Include="clusternode-web\js\ace\mode-json.js">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Include="clusternode-web\js\ace\theme-monokai.js">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Include="clusternode-web\js\ace\worker-javascript.js">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Include="clusternode-web\js\ace\worker-json.js">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-	</ItemGroup>
-</Project>
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/apple-touch-icon.png b/src/EventStore.ClusterNode.Web/clusternode-web/apple-touch-icon.png
deleted file mode 100644
index c5ad563fce5..00000000000
Binary files a/src/EventStore.ClusterNode.Web/clusternode-web/apple-touch-icon.png and /dev/null differ
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/css/main.min.css b/src/EventStore.ClusterNode.Web/clusternode-web/css/main.min.css
deleted file mode 100644
index bdf15ddeae6..00000000000
--- a/src/EventStore.ClusterNode.Web/clusternode-web/css/main.min.css
+++ /dev/null
@@ -1,2 +0,0 @@
-.toast-title{font-weight:700}.toast-message{word-wrap:break-word}.toast-message a,.toast-message label{color:#fff}.toast-message a:hover{color:#ccc;text-decoration:none}.toast-close-button{position:relative;right:-.3em;top:-.3em;float:right;font-size:20px;font-weight:700;color:#fff;-webkit-text-shadow:0 1px 0 #fff;text-shadow:0 1px 0 #fff;opacity:.8}.toast-close-button:focus,.toast-close-button:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.4}button.toast-close-button{padding:0;cursor:pointer;background:0 0;border:0;-webkit-appearance:none}.toast-top-full-width{top:0;right:0;width:100%}.toast-bottom-full-width{bottom:0;right:0;width:100%}.toast-top-left{top:12px;left:12px}.toast-top-right{top:12px;right:12px}.toast-bottom-right{right:12px;bottom:12px}.toast-bottom-left{bottom:12px;left:12px}#toast-container{position:fixed;z-index:999999}#toast-container *{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}#toast-container>div{margin:0 0 6px;padding:15px 15px 15px 50px;width:300px;-moz-border-radius:3px;-webkit-border-radius:3px 3px 3px 3px;border-radius:3px;background-position:15px center;background-repeat:no-repeat;-moz-box-shadow:0 0 12px #999;-webkit-box-shadow:0 0 12px #999;box-shadow:0 0 12px #999;color:#fff;opacity:.8}#toast-container>:hover{-moz-box-shadow:0 0 12px #000;-webkit-box-shadow:0 0 12px #000;box-shadow:0 0 12px #000;opacity:1;cursor:pointer}#toast-container>.toast-info{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGwSURBVEhLtZa9SgNBEMc9sUxxRcoUKSzSWIhXpFMhhYWFhaBg4yPYiWCXZxBLERsLRS3EQkEfwCKdjWJAwSKCgoKCcudv4O5YLrt7EzgXhiU3/4+b2ckmwVjJSpKkQ6wAi4gwhT+z3wRBcEz0yjSseUTrcRyfsHsXmD0AmbHOC9Ii8VImnuXBPglHpQ5wwSVM7sNnTG7Za4JwDdCjxyAiH3nyA2mtaTJufiDZ5dCaqlItILh1NHatfN5skvjx9Z38m69CgzuXmZgVrPIGE763Jx9qKsRozWYw6xOHdER+nn2KkO+Bb+UV5CBN6WC6QtBgbRVozrahAbmm6HtUsgtPC19tFdxXZYBOfkbmFJ1VaHA1VAHjd0pp70oTZzvR+EVrx2Ygfdsq6eu55BHYR8hlcki+n+kERUFG8BrA0BwjeAv2M8WLQBtcy+SD6fNsmnB3AlBLrgTtVW1c2QN4bVWLATaIS60J2Du5y1TiJgjSBvFVZgTmwCU+dAZFoPxGEEs8nyHC9Bwe2GvEJv2WXZb0vjdyFT4Cxk3e/kIqlOGoVLwwPevpYHT+00T+hWwXDf4AJAOUqWcDhbwAAAAASUVORK5CYII=)!important}#toast-container>.toast-error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHOSURBVEhLrZa/SgNBEMZzh0WKCClSCKaIYOED+AAKeQQLG8HWztLCImBrYadgIdY+gIKNYkBFSwu7CAoqCgkkoGBI/E28PdbLZmeDLgzZzcx83/zZ2SSXC1j9fr+I1Hq93g2yxH4iwM1vkoBWAdxCmpzTxfkN2RcyZNaHFIkSo10+8kgxkXIURV5HGxTmFuc75B2RfQkpxHG8aAgaAFa0tAHqYFfQ7Iwe2yhODk8+J4C7yAoRTWI3w/4klGRgR4lO7Rpn9+gvMyWp+uxFh8+H+ARlgN1nJuJuQAYvNkEnwGFck18Er4q3egEc/oO+mhLdKgRyhdNFiacC0rlOCbhNVz4H9FnAYgDBvU3QIioZlJFLJtsoHYRDfiZoUyIxqCtRpVlANq0EU4dApjrtgezPFad5S19Wgjkc0hNVnuF4HjVA6C7QrSIbylB+oZe3aHgBsqlNqKYH48jXyJKMuAbiyVJ8KzaB3eRc0pg9VwQ4niFryI68qiOi3AbjwdsfnAtk0bCjTLJKr6mrD9g8iq/S/B81hguOMlQTnVyG40wAcjnmgsCNESDrjme7wfftP4P7SP4N3CJZdvzoNyGq2c/HWOXJGsvVg+RA/k2MC/wN6I2YA2Pt8GkAAAAASUVORK5CYII=)!important}#toast-container>.toast-success{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADsSURBVEhLY2AYBfQMgf///3P8+/evAIgvA/FsIF+BavYDDWMBGroaSMMBiE8VC7AZDrIFaMFnii3AZTjUgsUUWUDA8OdAH6iQbQEhw4HyGsPEcKBXBIC4ARhex4G4BsjmweU1soIFaGg/WtoFZRIZdEvIMhxkCCjXIVsATV6gFGACs4Rsw0EGgIIH3QJYJgHSARQZDrWAB+jawzgs+Q2UO49D7jnRSRGoEFRILcdmEMWGI0cm0JJ2QpYA1RDvcmzJEWhABhD/pqrL0S0CWuABKgnRki9lLseS7g2AlqwHWQSKH4oKLrILpRGhEQCw2LiRUIa4lwAAAABJRU5ErkJggg==)!important}#toast-container>.toast-warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGYSURBVEhL5ZSvTsNQFMbXZGICMYGYmJhAQIJAICYQPAACiSDB8AiICQQJT4CqQEwgJvYASAQCiZiYmJhAIBATCARJy+9rTsldd8sKu1M0+dLb057v6/lbq/2rK0mS/TRNj9cWNAKPYIJII7gIxCcQ51cvqID+GIEX8ASG4B1bK5gIZFeQfoJdEXOfgX4QAQg7kH2A65yQ87lyxb27sggkAzAuFhbbg1K2kgCkB1bVwyIR9m2L7PRPIhDUIXgGtyKw575yz3lTNs6X4JXnjV+LKM/m3MydnTbtOKIjtz6VhCBq4vSm3ncdrD2lk0VgUXSVKjVDJXJzijW1RQdsU7F77He8u68koNZTz8Oz5yGa6J3H3lZ0xYgXBK2QymlWWA+RWnYhskLBv2vmE+hBMCtbA7KX5drWyRT/2JsqZ2IvfB9Y4bWDNMFbJRFmC9E74SoS0CqulwjkC0+5bpcV1CZ8NMej4pjy0U+doDQsGyo1hzVJttIjhQ7GnBtRFN1UarUlH8F3xict+HY07rEzoUGPlWcjRFRr4/gChZgc3ZL2d8oAAAAASUVORK5CYII=)!important}#toast-container.toast-bottom-full-width>div,#toast-container.toast-top-full-width>div{width:96%;margin:auto}.toast{background-color:#030303;opacity:1!important}.toast-success{background-color:#51a351}.toast-error{background-color:#bd362f}.toast-info{background-color:#2f96b4}.toast-warning{background-color:#f89406}.toast.ng-enter{opacity:0!important;transition:opacity .3s linear}.toast.ng-enter.ng-enter-active{opacity:1!important}.toast.ng-leave{opacity:1;transition:opacity .3s linear}.toast.ng-leave.ng-leave-active{opacity:0!important}@media all and (max-width:240px){#toast-container>div{padding:8px 8px 8px 50px;width:11em}#toast-container .toast-close-button{right:-.2em;top:-.2em}}@media all and (min-width:241px) and (max-width:480px){#toast-container>div{padding:8px 8px 8px 50px;width:18em}#toast-container .toast-close-button{right:-.2em;top:-.2em}}@media all and (min-width:481px) and (max-width:768px){#toast-container>div{padding:15px 15px 15px 50px;width:25em}}
-.page-logon,body,html{height:100%}.logon-container button,body{-webkit-font-smoothing:antialiased}body,h3,ol{margin:0}.form-table,.note,.note--warning,main,textarea{display:block}kbd,th{background:#F2F4F0}tbody td,thead{border-top:1px solid #E2E4E0}tbody td,th{border-right:1px solid #E2E4E0}kbd,textarea{border:1px solid #E2E4E0}table,textarea{width:100%;border-collapse:collapse}@font-face{font-family:Roboto;src:url(../fonts/roboto-regular-webfont.woff2) format("woff2"),url(../fonts/roboto-regular-webfont.woff) format("woff");font-weight:400;font-style:normal}@font-face{font-family:Roboto;src:url(../fonts/roboto-bold-webfont.woff2) format("woff2"),url(../fonts/roboto-bold-webfont.woff) format("woff");font-weight:700;font-style:normal}@font-face{font-family:Roboto;src:url(../fonts/roboto-bolditalic-webfont.woff2) format("woff2"),url(../fonts/roboto-bolditalic-webfont.woff) format("woff");font-weight:700;font-style:italic}@font-face{font-family:Roboto;src:url(../fonts/roboto-italic-webfont.woff2) format("woff2"),url(../fonts/roboto-italic-webfont.woff) format("woff");font-weight:400;font-style:italic}@font-face{font-family:"Source Code Pro";src:url(../fonts/sourcecodepro-bold-webfont.woff2) format("woff2"),url(../fonts/sourcecodepro-bold-webfont.woff) format("woff");font-weight:700;font-style:normal}@font-face{font-family:"Source Code Pro";src:url(../fonts/sourcecodepro-regular-webfont.woff2) format("woff2"),url(../fonts/sourcecodepro-regular-webfont.woff) format("woff");font-weight:400;font-style:normal}::-moz-selection{background:#525450;color:#FFF}::selection{background:#525450;color:#FFF}:focus{outline:0}html{font-size:13px}body{min-width:1000px;background:#FFF;color:#435261;font-family:Roboto,sans-serif;font-weight:400;line-height:1.5;text-rendering:optimizeLegibility;-moz-osx-font-smoothing:grayscale}code,textarea{font-family:"Source Code Pro",monospace}.logon-container button,.navigator-banner-header a b,.site-header,.table-collapsetoggle,.table-subheading,h3,kbd,th{font-weight:700}a{color:#2E9625;text-decoration:none}a:focus,a:hover{color:#5AB552}h1{margin:1rem 0;font-size:2.25rem;line-height:3rem}h2{font-size:1.5rem;line-height:2rem}h3{font-size:1rem}ol{padding:0}table{border-left:1px solid #E2E4E0;border-bottom:1px solid #E2E4E0}td,th{padding:.5rem;text-align:left}thead{border-bottom:2px solid #E2E4E0}textarea{-moz-box-sizing:border-box;box-sizing:border-box;padding:.5rem}kbd{padding:0 .25rem;color:#727470;border-radius:.25rem;font-family:Roboto,sans-serif;font-size:.9rem}.note,.note--warning{-moz-box-sizing:border-box;box-sizing:border-box;margin:1.5rem 0;padding:1.5rem;background:#EEF3FF;color:#00216F;border-left:.75rem solid #BBCFFF;font-style:italic}.note--warning{background:#FFF6CA;color:#4B3E00;border-left:.75rem solid #FFED97}.page-logon{display:-webkit-flex;display:-ms-flex;display:flex;-webkit-align-items:center;-ms-align-items:center;align-items:center;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-justify-content:center;-ms-justify-content:center;justify-content:center;background:#F2F4F0}.logon-container{width:22rem;margin:0 auto;padding:2.25rem;background:#5AB552;background-image:linear-gradient(45deg,rgba(90,181,82,.5) 0,rgba(90,181,82,.5) 50%,rgba(46,150,37,.5) 50%,rgba(46,150,37,.5) 100%),linear-gradient(135deg,rgba(90,181,82,.5) 0,rgba(90,181,82,.5) 50%,rgba(46,150,37,.5) 50%,rgba(46,150,37,.5) 100%);border-radius:.25rem;box-shadow:0 .5rem 3.375rem #A2A4A0}.logon-container .site-title{margin:0 0 1rem;text-align:center}.logon-container button,.logon-container input{margin:1rem 0 0;font-family:inherit;width:100%}.logon-container .login-form,.table-queues td,.table-queues th{text-align:right}.logon-container .site-footer,.logon-container .site-footer a{color:#FFF}.logon-container label{display:none}.logon-container input{-moz-box-sizing:border-box;box-sizing:border-box;padding:.5rem;border:none;border-radius:.25rem;font-size:1rem}.logon-container button{-moz-box-sizing:border-box;box-sizing:border-box;padding:.75rem;border:none;border-radius:.25rem;background:#2E9625;color:#FFF;font-size:inherit;-mox-osx-font-smoothing:grayscale}.navigator-banner-header,.site-header{display:-webkit-flex;display:-ms-flex;-webkit-flex-direction:row;padding:0 3rem}.site-header{display:flex;-ms-flex-direction:row;flex-direction:row;-webkit-align-items:center;-ms-align-items:center;align-items:center;-webkit-justify-content:space-between;-ms-justify-content:space-between;justify-content:space-between;background:#5AB552}.navigator-banner-header{display:flex;-ms-flex-direction:row;flex-direction:row;-webkit-align-items:center;-ms-align-items:center;align-items:center;-webkit-justify-content:space-between;-ms-justify-content:space-between;justify-content:space-between;background:#FFED97}.container,.site-nav{display:-webkit-flex;display:-ms-flex}.navigator-banner-header a{margin:1rem .5rem;font-size:1rem;line-height:1rem;color:#525450}.site-title{margin:0 0 0 .5rem;font-size:1rem;line-height:1rem;text-transform:uppercase}.site-title a{color:#FFF;text-decoration:none}.site-nav{display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;margin:0;padding:0;list-style:none}.site-nav__item a,.site-nav__item--active a{display:inline-block;margin:1rem .25rem;padding:.5rem;color:#F2F4F0;text-decoration:none;border-radius:.25rem}.site-nav__item a:focus,.site-nav__item a:hover,.site-nav__item--active a:focus,.site-nav__item--active a:hover{background:#2E9625;color:#F2F4F0}.site-nav__item a.disabled,.site-nav__item--active a.disabled{color:#2E9625;pointer-events:none;cursor:default}.site-nav__item--active a,.site-nav__item--active a.disabled,.site-nav__item--active a:focus,.site-nav__item--active a:hover{background:#2E9625;color:#FFF}::-webkit-input-placeholder{color:#A2A4A0}:-moz-placeholder{color:#A2A4A0}::-moz-placeholder{color:#A2A4A0}:-ms-input-placeholder{color:#A2A4A0}.container{clear:both;display:flex;-webkit-align-items:top;-ms-align-items:top;align-items:top;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-justify-content:space-between;-ms-justify-content:space-between;justify-content:space-between}.page-nav+.container{padding-top:1.5rem}.container-left{-moz-box-sizing:border-box;box-sizing:border-box;width:50%;padding:0 .75rem 0 0}.container-right{-moz-box-sizing:border-box;box-sizing:border-box;width:50%;padding:0 0 0 .75rem}.container-narrow{clear:both;width:600px;margin:0 auto}.block{margin:0 0 0 .5rem}.block .block-title{margin-left:0}.site-main{padding:1.5rem 3rem}.page-header{display:-webkit-flex;display:-ms-flex;display:flex;-webkit-align-items:center;-ms-align-items:center;align-items:center;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-justify-content:space-between;-ms-justify-content:space-between;justify-content:space-between;margin:0 0 1.5rem}.page-nav{margin:0;padding:1.5rem .5rem 1.5rem 0;list-style:none}.page-nav__item,.page-title{margin:0 0 0 .5rem}.page-header .page-nav{padding-top:0;padding-bottom:0}.page-nav__item{float:left}.page-nav__item a,.page-nav__item button,.page-nav__item input[type=submit]{display:inline-block;padding:.5rem;background:#FFF;color:#2E9625;border:1px solid #5AB552;border-radius:.25rem;cursor:pointer}.page-nav__item a:active,.page-nav__item button:active,.page-nav__item input[type=submit]:active{background:#5AB552;color:#FFF}.page-nav__item a.disabled,.page-nav__item a[disabled],.page-nav__item button.disabled,.page-nav__item button[disabled],.page-nav__item input[type=submit].disabled,.page-nav__item input[type=submit][disabled]{background:#F2F4F0;border-color:#E2E4E0;color:#E2E4E0;cursor:default}.page-nav__item a.highlight{background:#2E9625;color:#F2F4F0}.page-nav__item form{margin:0;padding:0}.page-nav__item input[type=text]{padding:.5rem;margin:0;background:#FFF;color:#525450;border:1px solid #E2E4E0;border-radius:.25rem;font-family:inherit;font-size:inherit;line-height:inherit}.code-read-only,tbody .table-subheading{background:#F2F4F0}.page-nav__item button{height:34px}.ace_editor,.login-height{height:100%}.table-subheading{color:#727470}thead .table-subheading{border-top:1px solid #E2E4E0;font-style:italic}.table-indentedrow td:first-child{padding-left:1.5rem}.table-highlightred{color:#E22430}.table-queues td:first-child,.table-queues td:last-child,.table-queues th:first-child,.table-queues th:last-child{text-align:left}.table-projections td,.table-projections th{text-align:right}.table-projections td:first-child,.table-projections td:nth-child(2),.table-projections td:nth-child(3),.table-projections th:first-child,.table-projections th:nth-child(2),.table-projections th:nth-child(3){text-align:left}.table-collapsetoggle{float:right}.table-meta{margin-bottom:1.5rem}.block-title{margin:.5rem 0 .5rem .5rem}.block-title:first-child{margin-top:0}.code-full{min-height:35rem}.code-half{min-height:16.333rem}.code-console{background:#435261;color:#F2F4F0;border:1px solid #435261}.form-table{width:100%;margin:-.5rem;padding:.5rem;background:#FCFCCF;border:none;font:inherit}.form-table--error{background:#fdeff0;color:#E22430}.new-projection-form tr td:first-child{width:15em}.edit-projection.maximized{width:100%}.ace_editor{min-height:400px;font-size:14px!important}.status{position:relative;top:2px;margin-right:5px;float:left;width:12px;height:12px;border-radius:12px;border:1px solid #000}.toast-container-modal{width:100%;height:100%;background:rgba(0,0,0,.4)}#toast-container.toast-container-modal.toast-bottom-full-width>div{position:absolute;bottom:35px;width:96%;left:2%}#toast-container.toast-bottom-full-width>div{position:relative;bottom:35px}li.page-nav__item.copy-icon-right{float:right;list-style:none;font-size:1.2rem;cursor:pointer}li.page-nav__item.copy-icon-right a{padding:0 .2rem}li.page-nav__item.copy-icon-right a.copied{color:#fff;background-color:#5AB552}.site-footer{padding:1.5rem 3rem 3rem;text-align:center}.site-footer p{margin:0}
\ No newline at end of file
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/favicon.png b/src/EventStore.ClusterNode.Web/clusternode-web/favicon.png
deleted file mode 100644
index a6802d8e369..00000000000
Binary files a/src/EventStore.ClusterNode.Web/clusternode-web/favicon.png and /dev/null differ
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-bold-webfont.woff b/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-bold-webfont.woff
deleted file mode 100755
index d30095de995..00000000000
Binary files a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-bold-webfont.woff and /dev/null differ
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-bold-webfont.woff2 b/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-bold-webfont.woff2
deleted file mode 100755
index cba2d2b71b7..00000000000
Binary files a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-bold-webfont.woff2 and /dev/null differ
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-bolditalic-webfont.woff b/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-bolditalic-webfont.woff
deleted file mode 100755
index b880db491cc..00000000000
Binary files a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-bolditalic-webfont.woff and /dev/null differ
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-bolditalic-webfont.woff2 b/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-bolditalic-webfont.woff2
deleted file mode 100755
index dacccd764ab..00000000000
Binary files a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-bolditalic-webfont.woff2 and /dev/null differ
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-italic-webfont.woff b/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-italic-webfont.woff
deleted file mode 100755
index 7f265bc861f..00000000000
Binary files a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-italic-webfont.woff and /dev/null differ
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-italic-webfont.woff2 b/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-italic-webfont.woff2
deleted file mode 100755
index 2471d525772..00000000000
Binary files a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-italic-webfont.woff2 and /dev/null differ
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-regular-webfont.woff b/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-regular-webfont.woff
deleted file mode 100755
index 38349a23b07..00000000000
Binary files a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-regular-webfont.woff and /dev/null differ
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-regular-webfont.woff2 b/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-regular-webfont.woff2
deleted file mode 100755
index 238e6348a4c..00000000000
Binary files a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/roboto-regular-webfont.woff2 and /dev/null differ
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/sourcecodepro-bold-webfont.woff b/src/EventStore.ClusterNode.Web/clusternode-web/fonts/sourcecodepro-bold-webfont.woff
deleted file mode 100755
index 04eebe139b4..00000000000
Binary files a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/sourcecodepro-bold-webfont.woff and /dev/null differ
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/sourcecodepro-bold-webfont.woff2 b/src/EventStore.ClusterNode.Web/clusternode-web/fonts/sourcecodepro-bold-webfont.woff2
deleted file mode 100755
index e9b1fdc494b..00000000000
Binary files a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/sourcecodepro-bold-webfont.woff2 and /dev/null differ
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/sourcecodepro-regular-webfont.woff b/src/EventStore.ClusterNode.Web/clusternode-web/fonts/sourcecodepro-regular-webfont.woff
deleted file mode 100755
index 5d706b09614..00000000000
Binary files a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/sourcecodepro-regular-webfont.woff and /dev/null differ
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/sourcecodepro-regular-webfont.woff2 b/src/EventStore.ClusterNode.Web/clusternode-web/fonts/sourcecodepro-regular-webfont.woff2
deleted file mode 100755
index 9b94f419572..00000000000
Binary files a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/sourcecodepro-regular-webfont.woff2 and /dev/null differ
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/images/logo.svg b/src/EventStore.ClusterNode.Web/clusternode-web/images/logo.svg
deleted file mode 100644
index ab870a7f980..00000000000
--- a/src/EventStore.ClusterNode.Web/clusternode-web/images/logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="119" height="29" viewBox="307.241 -360.305 119 29" xml:space="preserve"><path fill="#FFF" d="m315.753-355.375-2.093-.809a13.24 13.24 0 0 1 1.617-.806 12.68 12.68 0 0 1 3.667-.916l1.364 1.553-.623 1.597a10.91 10.91 0 0 0-3.704 1.484l-.228-2.103zm-3.201 6.124c.053-.12.107-.24.166-.359a8.86 8.86 0 0 1 2.739-3.301l-.227-2.062-2.164-.838a12.915 12.915 0 0 0-2.015 1.662 12.54 12.54 0 0 0-2.492 3.577l2.482-.523 1.511 1.844zm15.332 6.812a7.614 7.614 0 0 1-.577 1.195c-.93 1.565-2.23 2.704-3.899 3.412l-.058.024-.763 3.356 2.914 2.465.101-.032a12.755 12.755 0 0 0 4.559-2.549 13.624 13.624 0 0 0 3.199-4.06 15.27 15.27 0 0 0 .8-1.821l-3.932.848-2.344-2.838zm5.026-11.033a13.932 13.932 0 0 0-.679-1.033l-1.584 4.204-4.243.503c.899.952 1.485 2.101 1.761 3.447.232 1.135.208 2.226-.073 3.272l2.355 2.849 3.926-.845c.246-.786.428-1.592.545-2.419.244-1.72.196-3.433-.145-5.138a15.235 15.235 0 0 0-1.863-4.84zm-20.674 10.079c-.112-.379-.2-.77-.265-1.172a8.231 8.231 0 0 1 .344-4.085l-1.494-1.824-2.536.534-.019.048a13.714 13.714 0 0 0-.975 5.073c-.002 1.051.112 2.08.343 3.087l1.924-2.273 2.678.612zm3.801 5.02a8.177 8.177 0 0 1-1.891-1.593 9.03 9.03 0 0 1-1.7-2.799l-2.677-.612-1.962 2.316c.13.458.285.911.463 1.36a13.209 13.209 0 0 0 2.834 4.358 13.065 13.065 0 0 0 2.417 1.955l-.144-3.464 2.66-1.521zm6.679.801a7.832 7.832 0 0 1-4.265.17 8.321 8.321 0 0 1-1.835-.651l-2.658 1.521.144 3.487a13.938 13.938 0 0 0 6.319 1.731 15.198 15.198 0 0 0 4.426-.485l-2.886-2.44.755-3.333zm-3.274-14.993a9.44 9.44 0 0 1 6.429 2.258l4.365-.517 1.588-4.214a13.565 13.565 0 0 0-2.348-2.293 13.629 13.629 0 0 0-4.642-2.326 16.997 16.997 0 0 0-4.199-.637c-.984-.03-1.97-.002-2.957.083l3.285 3.741-1.521 3.905zm93.597 7.745v.043c.777.357 1.113 1.177 1.156 2.753s.084 3.32.231 3.845h-2.648c-.063-.4-.105-1.828-.105-3.383 0-1.723-.358-2.291-1.24-2.291h-.441l-1.051 5.674h-2.564l2.669-13.974c.882-.148 1.87-.253 2.817-.253 1.218 0 2.395.232 3.131.967.588.588.925 1.408.925 2.333-.002 2.08-1.262 3.739-2.88 4.286zm.189-3.972c0-.756-.315-1.556-1.303-1.556-.273 0-.524.022-.693.063l-.819 4.392h.61c1.322.001 2.205-1.407 2.205-2.899zM339.38-338.18h6.179l.462-2.332h-3.572l.777-3.929h3.11l.442-2.228h-3.174l.694-3.362h3.257l.462-2.311h-5.926l-2.711 14.162zm75.957 0h6.178l.462-2.332h-3.572l.777-3.929h3.11l.441-2.228h-3.174l.694-3.362h3.257l.462-2.311h-5.925l-2.71 14.162zm-60.771-14.163-2.542 7.166c-.442 1.261-.925 2.921-1.219 4.013h-.042c.083-1.093.169-2.731.21-4.013l.189-7.166h-2.921l.441 14.163h2.858l5.926-14.163h-2.9zm28.658 11.473zm.904-7.123c0 1.24.567 2.374 1.681 3.425.882.882 1.408 1.429 1.408 2.374 0 1.114-.841 1.849-2.038 1.807-.756 0-1.492-.21-1.954-.483l-.672 2.29c.336.21 1.24.525 2.648.525 2.69 0 4.644-1.723 4.644-4.665 0-1.135-.546-2.374-1.701-3.405-1.135-1.009-1.408-1.534-1.408-2.206.021-1.093.777-1.807 1.892-1.807.651 0 1.113.148 1.534.379l.715-2.269c-.336-.21-1.03-.441-2.124-.441-2.776 0-4.625 1.849-4.625 4.476zm14.856-4.35h-7.544l-.484 2.48h2.459l-2.228 11.684h2.627l2.227-11.684h2.459l.484-2.48zm7.777 4.328c0 3.005-.987 6.787-2.857 8.658-.882.882-1.891 1.345-3.132 1.345-3.067 0-3.509-3.067-3.509-4.623 0-2.879.988-6.661 2.943-8.574.841-.819 1.871-1.303 3.11-1.303 3.066.001 3.445 2.817 3.445 4.497zm-2.711-.21c0-.903-.126-1.975-1.093-1.975-.336 0-.651.148-.945.441-1.303 1.324-2.038 5.274-2.038 7.376 0 .798.105 2.059 1.198 2.059.294 0 .61-.147.862-.42 1.406-1.387 2.016-5.946 2.016-7.481zm-43.84-1.807h3.257l.462-2.311h-5.926l-2.712 14.163h6.179l.463-2.332h-3.572l.778-3.929h3.11l.441-2.228h-3.174l.694-3.363zm10.432 1.367c-.441 2.354-.693 4.791-.882 6.346h-.043c-.105-1.177-.336-2.522-.693-4.392l-1.093-5.632h-2.395l-2.712 14.163h2.249l.715-3.761c.463-2.459.778-4.791.968-6.22h.042c.147 1.766.273 2.731.715 4.707l1.135 5.274h2.249l2.711-14.163h-2.269l-.697 3.678zm2.979-1.199h2.459l-2.228 11.684h2.627l2.228-11.684h2.459l.484-2.48h-7.544l-.485 2.48zm51.981 11.167.011.034h-.301a.831.831 0 0 1-.02-.167.578.578 0 0 0-.02-.148.147.147 0 0 0-.088-.088.322.322 0 0 0-.108-.019l-.069-.005h-.066v.426h-.315v-1.207l.336.001.249.002a.597.597 0 0 1 .238.062c.107.059.161.155.161.288 0 .101-.029.174-.085.219a.397.397 0 0 1-.209.081.427.427 0 0 1 .172.069c.07.057.106.148.106.271v.108l.003.036.005.037zm-.306-.797c0-.065-.033-.112-.098-.138a.522.522 0 0 0-.183-.025h-.076v.35h.123a.301.301 0 0 0 .173-.044c.041-.03.061-.077.061-.143zm.566 1.007a1.057 1.057 0 0 1-.761.307c-.306 0-.564-.105-.773-.314a1.055 1.055 0 0 1-.314-.773c0-.318.113-.582.34-.793.212-.196.462-.295.749-.295.3 0 .556.106.769.319.212.212.319.469.319.769a1.061 1.061 0 0 1-.329.78zm-.129-.14a.882.882 0 0 0 .263-.64.872.872 0 0 0-.262-.631.855.855 0 0 0-.635-.272c-.25 0-.463.09-.638.272a.873.873 0 0 0-.26.631.87.87 0 0 0 .265.642.863.863 0 0 0 .635.264c.246 0 .457-.09.632-.266z"/></svg>
\ No newline at end of file
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/index.html b/src/EventStore.ClusterNode.Web/clusternode-web/index.html
deleted file mode 100644
index 8bec7f81201..00000000000
--- a/src/EventStore.ClusterNode.Web/clusternode-web/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=1024"><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><title ng-bind="'Event Store - ' + $state.current.data.title">Event Store</title><link rel=stylesheet href=css/main.min.css><link rel=apple-touch-icon href=apple-touch-icon.png><link rel=icon type=image/png href=favicon.png><meta name=msapplication-TileImage content=es-tile.png><meta name=msapplication-TileColor content=#6BA300></head><body><div ui-view></div><script data-main=js/app.min.js src=js/requirejs.min.js></script></body></html>
\ No newline at end of file
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/js/app.min.js b/src/EventStore.ClusterNode.Web/clusternode-web/js/app.min.js
deleted file mode 100644
index f976279c343..00000000000
--- a/src/EventStore.ClusterNode.Web/clusternode-web/js/app.min.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * @license AngularJS v1.3.20
- * (c) 2010-2014 Google, Inc. http://angularjs.org
- * License: MIT
- */
-!function(e,t,n){"use strict";function i(e,t){return t=t||Error,function(){var n,i,r=arguments[0],s=arguments;for(n=(n="["+(e?e+":":"")+r+"] "+arguments[1].replace(/\{\d+\}/g,(function(e){var t=+e.slice(1,-1);return t+2<s.length?Te(s[t+2]):e})))+"\nhttp://errors.angularjs.org/1.3.20/"+(e?e+"/":"")+r,i=2;i<arguments.length;i++)n=n+(2==i?"?":"&")+"p"+(i-2)+"="+encodeURIComponent(Te(arguments[i]));return new t(n)}}var r=/^\/(.+)\/([a-z]*)$/,s="validity",o=function(e){return O(e)?e.toLowerCase():e},a=Object.prototype.hasOwnProperty,l=function(e){return O(e)?e.toUpperCase():e};"i"!=="I".toLowerCase()&&(o=function(e){return O(e)?e.replace(/[A-Z]/g,(function(e){return String.fromCharCode(32|e.charCodeAt(0))})):e},l=function(e){return O(e)?e.replace(/[a-z]/g,(function(e){return String.fromCharCode(-33&e.charCodeAt(0))})):e});var c,u,h,d,f=[].slice,p=[].splice,g=[].push,m=Object.prototype.toString,v=i("ng"),$=e.angular||(e.angular={}),b=0;function w(e){if(null==e||U(e))return!1;var t="length"in Object(e)&&e.length;return!(e.nodeType!==Ee||!t)||(O(e)||N(e)||0===t||"number"==typeof t&&t>0&&t-1 in e)}function y(e,t,n){var i,r;if(e)if(j(e))for(i in e)"prototype"==i||"length"==i||"name"==i||e.hasOwnProperty&&!e.hasOwnProperty(i)||t.call(n,e[i],i,e);else if(N(e)||w(e)){var s="object"!=typeof e;for(i=0,r=e.length;i<r;i++)(s||i in e)&&t.call(n,e[i],i,e)}else if(e.forEach&&e.forEach!==y)e.forEach(t,n,e);else for(i in e)e.hasOwnProperty(i)&&t.call(n,e[i],i,e);return e}function S(e){return Object.keys(e).sort()}function C(e){return function(t,n){e(n,t)}}function x(){return++b}function k(e,t){t?e.$$hashKey=t:delete e.$$hashKey}function A(e){for(var t=e.$$hashKey,n=1,i=arguments.length;n<i;n++){var r=arguments[n];if(r)for(var s=Object.keys(r),o=0,a=s.length;o<a;o++){var l=s[o];e[l]=r[l]}}return k(e,t),e}function E(e){return parseInt(e,10)}function R(e,t){return A(Object.create(e),t)}function _(){}function M(e){return e}function L(e){return function(){return e}}function T(e){return void 0===e}function P(e){return void 0!==e}function I(e){return null!==e&&"object"==typeof e}function O(e){return"string"==typeof e}function F(e){return"number"==typeof e}function D(e){return"[object Date]"===m.call(e)}c=t.documentMode,_.$inject=[],M.$inject=[];var N=Array.isArray;function j(e){return"function"==typeof e}function B(e){return"[object RegExp]"===m.call(e)}function U(e){return e&&e.window===e}function H(e){return e&&e.$evalAsync&&e.$watch}function W(e){return"boolean"==typeof e}function V(e){return e&&j(e.then)}var z=function(e){return O(e)?e.trim():e},q=function(e){return e.replace(/([-()\[\]{}+?*.$\^|,:#<!\\])/g,"\\$1").replace(/\x08/g,"\\x08")};function K(e){return!(!e||!(e.nodeName||e.prop&&e.attr&&e.find))}function G(e){return o(e.nodeName||e[0]&&e[0].nodeName)}function Q(e,t){var n=e.indexOf(t);return n>=0&&e.splice(n,1),t}function J(e,t,n,i){if(U(e)||H(e))throw v("cpws","Can't copy! Making copies of Window or Scope instances is not supported.");if(t){if(e===t)throw v("cpi","Can't copy! Source and destination are identical.");if(n=n||[],i=i||[],I(e)){var r=n.indexOf(e);if(-1!==r)return i[r];n.push(e),i.push(t)}var s;if(N(e)){t.length=0;for(var o=0;o<e.length;o++)s=J(e[o],null,n,i),I(e[o])&&(n.push(e[o]),i.push(s)),t.push(s)}else{var a=t.$$hashKey;for(var l in N(t)?t.length=0:y(t,(function(e,n){delete t[n]})),e)e.hasOwnProperty(l)&&(s=J(e[l],null,n,i),I(e[l])&&(n.push(e[l]),i.push(s)),t[l]=s);k(t,a)}}else if(t=e,e)if(N(e))t=J(e,[],n,i);else if(D(e))t=new Date(e.getTime());else if(B(e))(t=new RegExp(e.source,e.toString().match(/[^\/]*$/)[0])).lastIndex=e.lastIndex;else if(I(e)){var c=Object.create(Object.getPrototypeOf(e));t=J(e,c,n,i)}return t}function Y(e,t){if(N(e)){t=t||[];for(var n=0,i=e.length;n<i;n++)t[n]=e[n]}else if(I(e))for(var r in t=t||{},e)"$"===r.charAt(0)&&"$"===r.charAt(1)||(t[r]=e[r]);return t||e}function X(e,t){if(e===t)return!0;if(null===e||null===t)return!1;if(e!=e&&t!=t)return!0;var i,r,s,o=typeof e;if(o==typeof t&&"object"==o){if(!N(e)){if(D(e))return!!D(t)&&X(e.getTime(),t.getTime());if(B(e))return!!B(t)&&e.toString()==t.toString();if(H(e)||H(t)||U(e)||U(t)||N(t)||D(t)||B(t))return!1;for(r in s={},e)if("$"!==r.charAt(0)&&!j(e[r])){if(!X(e[r],t[r]))return!1;s[r]=!0}for(r in t)if(!s.hasOwnProperty(r)&&"$"!==r.charAt(0)&&t[r]!==n&&!j(t[r]))return!1;return!0}if(!N(t))return!1;if((i=e.length)==t.length){for(r=0;r<i;r++)if(!X(e[r],t[r]))return!1;return!0}}return!1}var Z=function(){if(P(Z.isActive_))return Z.isActive_;var e=!(!t.querySelector("[ng-csp]")&&!t.querySelector("[data-ng-csp]"));if(!e)try{new Function("")}catch(t){e=!0}return Z.isActive_=e};function ee(e,t,n){return e.concat(f.call(t,n))}function te(e,t){return f.call(e,t||0)}function ne(e,t){var n=arguments.length>2?te(arguments,2):[];return!j(t)||t instanceof RegExp?t:n.length?function(){return arguments.length?t.apply(e,ee(n,arguments,0)):t.apply(e,n)}:function(){return arguments.length?t.apply(e,arguments):t.call(e)}}function ie(e,i){var r=i;return"string"==typeof e&&"$"===e.charAt(0)&&"$"===e.charAt(1)?r=n:U(i)?r="$WINDOW":i&&t===i?r="$DOCUMENT":H(i)&&(r="$SCOPE"),r}function re(e,t){return void 0===e?n:(F(t)||(t=t?2:null),JSON.stringify(e,ie,t))}function se(e){return O(e)?JSON.parse(e):e}function oe(e){e=u(e).clone();try{e.empty()}catch(e){}var t=u("<div>").append(e).html();try{return e[0].nodeType===Re?o(t):t.match(/^(<[^>]+>)/)[1].replace(/^<([\w\-]+)/,(function(e,t){return"<"+o(t)}))}catch(e){return o(t)}}function ae(e){try{return decodeURIComponent(e)}catch(e){}}function le(e){var t,n,i={};return y((e||"").split("&"),(function(e){if(e&&(t=e.replace(/\+/g,"%20").split("="),P(n=ae(t[0])))){var r=!P(t[1])||ae(t[1]);a.call(i,n)?N(i[n])?i[n].push(r):i[n]=[i[n],r]:i[n]=r}})),i}function ce(e){var t=[];return y(e,(function(e,n){N(e)?y(e,(function(e){t.push(he(n,!0)+(!0===e?"":"="+he(e,!0)))})):t.push(he(n,!0)+(!0===e?"":"="+he(e,!0)))})),t.length?t.join("&"):""}function ue(e){return he(e,!0).replace(/%26/gi,"&").replace(/%3D/gi,"=").replace(/%2B/gi,"+")}function he(e,t){return encodeURIComponent(e).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%3B/gi,";").replace(/%20/g,t?"%20":"+")}var de=["ng-","data-ng-","ng:","x-ng-"];function fe(e,t){var n,i,r={};y(de,(function(t){var r=t+"app";!n&&e.hasAttribute&&e.hasAttribute(r)&&(n=e,i=e.getAttribute(r))})),y(de,(function(t){var r,s=t+"app";!n&&(r=e.querySelector("["+s.replace(":","\\:")+"]"))&&(n=r,i=r.getAttribute(s))})),n&&(r.strictDi=null!==function(e,t){var n,i,r=de.length;for(e=u(e),i=0;i<r;++i)if(n=de[i]+t,O(n=e.attr(n)))return n;return null}(n,"strict-di"),t(n,i?[i]:[],r))}function pe(n,i,r){I(r)||(r={});r=A({strictDi:!1},r);var s=function(){if((n=u(n)).injector()){var e=n[0]===t?"document":oe(n);throw v("btstrpd","App Already Bootstrapped with this Element '{0}'",e.replace(/</,"&lt;").replace(/>/,"&gt;"))}(i=i||[]).unshift(["$provide",function(e){e.value("$rootElement",n)}]),r.debugInfoEnabled&&i.push(["$compileProvider",function(e){e.debugInfoEnabled(!0)}]),i.unshift("ng");var s=kt(i,r.strictDi);return s.invoke(["$rootScope","$rootElement","$compile","$injector",function(e,t,n,i){e.$apply((function(){t.data("$injector",i),n(t)(e)}))}]),s},o=/^NG_ENABLE_DEBUG_INFO!/,a=/^NG_DEFER_BOOTSTRAP!/;if(e&&o.test(e.name)&&(r.debugInfoEnabled=!0,e.name=e.name.replace(o,"")),e&&!a.test(e.name))return s();e.name=e.name.replace(a,""),$.resumeBootstrap=function(e){return y(e,(function(e){i.push(e)})),s()},j($.resumeDeferredBootstrap)&&$.resumeDeferredBootstrap()}function ge(){e.name="NG_ENABLE_DEBUG_INFO!"+e.name,e.location.reload()}function me(e){var t=$.element(e).injector();if(!t)throw v("test","no injector found for element argument to getTestability");return t.get("$$testability")}var ve=/[A-Z]/g;function $e(e,t){return t=t||"_",e.replace(ve,(function(e,n){return(n?t:"")+e.toLowerCase()}))}var be,we=!1;function ye(e,t,n){if(!e)throw v("areq","Argument '{0}' is {1}",t||"?",n||"required");return e}function Se(e,t,n){return n&&N(e)&&(e=e[e.length-1]),ye(j(e),t,"not a function, got "+(e&&"object"==typeof e?e.constructor.name||"Object":typeof e)),e}function Ce(e,t){if("hasOwnProperty"===e)throw v("badname","hasOwnProperty is not a valid {0} name",t)}function xe(e,t,n){if(!t)return e;for(var i,r=t.split("."),s=e,o=r.length,a=0;a<o;a++)i=r[a],e&&(e=(s=e)[i]);return!n&&j(e)?ne(s,e):e}function ke(e){var t=e[0],n=e[e.length-1],i=[t];do{if(!(t=t.nextSibling))break;i.push(t)}while(t!==n);return u(i)}function Ae(){return Object.create(null)}var Ee=1,Re=3,_e=8,Me=9,Le=11;function Te(e){return"function"==typeof e?e.toString().replace(/ \{[\s\S]*$/,""):void 0===e?"undefined":"string"!=typeof e?function(e){var t=[];return JSON.stringify(e,(function(e,n){if(I(n=ie(e,n))){if(t.indexOf(n)>=0)return"<<already seen>>";t.push(n)}return n}))}(e):e}var Pe={full:"1.3.20",major:1,minor:3,dot:20,codeName:"shallow-translucence"};Ye.expando="ng339";var Ie=Ye.cache={},Oe=1,Fe=function(e,t,n){e.addEventListener(t,n,!1)},De=function(e,t,n){e.removeEventListener(t,n,!1)};Ye._data=function(e){return this.cache[e[this.expando]]||{}};var Ne=/([\:\-\_]+(.))/g,je=/^moz([A-Z])/,Be={mouseleave:"mouseout",mouseenter:"mouseover"},Ue=i("jqLite");function He(e){return e.replace(Ne,(function(e,t,n,i){return i?n.toUpperCase():n})).replace(je,"Moz$1")}var We=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,Ve=/<|&#?\w+;/,ze=/<([\w:]+)/,qe=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,Ke={option:[1,'<select multiple="multiple">',"</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function Ge(e){return!Ve.test(e)}function Qe(e){var t=e.nodeType;return t===Ee||!t||t===Me}function Je(e,t){var n,i,r,s,o=t.createDocumentFragment(),a=[];if(Ge(e))a.push(t.createTextNode(e));else{for(n=n||o.appendChild(t.createElement("div")),i=(ze.exec(e)||["",""])[1].toLowerCase(),r=Ke[i]||Ke._default,n.innerHTML=r[1]+e.replace(qe,"<$1></$2>")+r[2],s=r[0];s--;)n=n.lastChild;a=ee(a,n.childNodes),(n=o.firstChild).textContent=""}return o.textContent="",o.innerHTML="",y(a,(function(e){o.appendChild(e)})),o}function Ye(e){if(e instanceof Ye)return e;var n,i,r,s;if(O(e)&&(e=z(e),n=!0),!(this instanceof Ye)){if(n&&"<"!=e.charAt(0))throw Ue("nosel","Looking up elements via selectors is not supported by jqLite! See: http://docs.angularjs.org/api/angular.element");return new Ye(e)}at(this,n?(i=e,r=r||t,(s=We.exec(i))?[r.createElement(s[1])]:(s=Je(i,r))?s.childNodes:[]):e)}function Xe(e){return e.cloneNode(!0)}function Ze(e,t){if(t||tt(e),e.querySelectorAll)for(var n=e.querySelectorAll("*"),i=0,r=n.length;i<r;i++)tt(n[i])}function et(e,t,n,i){if(P(i))throw Ue("offargs","jqLite#off() does not support the `selector` argument");var r=nt(e),s=r&&r.events,o=r&&r.handle;if(o)if(t)y(t.split(" "),(function(t){if(P(n)){var i=s[t];if(Q(i||[],n),i&&i.length>0)return}De(e,t,o),delete s[t]}));else for(t in s)"$destroy"!==t&&De(e,t,o),delete s[t]}function tt(e,t){var i=e.ng339,r=i&&Ie[i];if(r){if(t)return void delete r.data[t];r.handle&&(r.events.$destroy&&r.handle({},"$destroy"),et(e)),delete Ie[i],e.ng339=n}}function nt(e,t){var i=e.ng339,r=i&&Ie[i];return t&&!r&&(e.ng339=i=++Oe,r=Ie[i]={events:{},data:{},handle:n}),r}function it(e,t,n){if(Qe(e)){var i=P(n),r=!i&&t&&!I(t),s=!t,o=nt(e,!r),a=o&&o.data;if(i)a[t]=n;else{if(s)return a;if(r)return a&&a[t];A(a,t)}}}function rt(e,t){return!!e.getAttribute&&(" "+(e.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").indexOf(" "+t+" ")>-1}function st(e,t){t&&e.setAttribute&&y(t.split(" "),(function(t){e.setAttribute("class",z((" "+(e.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").replace(" "+z(t)+" "," ")))}))}function ot(e,t){if(t&&e.setAttribute){var n=(" "+(e.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ");y(t.split(" "),(function(e){e=z(e),-1===n.indexOf(" "+e+" ")&&(n+=e+" ")})),e.setAttribute("class",z(n))}}function at(e,t){if(t)if(t.nodeType)e[e.length++]=t;else{var n=t.length;if("number"==typeof n&&t.window!==t){if(n)for(var i=0;i<n;i++)e[e.length++]=t[i]}else e[e.length++]=t}}function lt(e,t){return ct(e,"$"+(t||"ngController")+"Controller")}function ct(e,t,i){e.nodeType==Me&&(e=e.documentElement);for(var r=N(t)?t:[t];e;){for(var s=0,o=r.length;s<o;s++)if((i=u.data(e,r[s]))!==n)return i;e=e.parentNode||e.nodeType===Le&&e.host}}function ut(e){for(Ze(e,!0);e.firstChild;)e.removeChild(e.firstChild)}function ht(e,t){t||Ze(e);var n=e.parentNode;n&&n.removeChild(e)}Ke.optgroup=Ke.option,Ke.tbody=Ke.tfoot=Ke.colgroup=Ke.caption=Ke.thead,Ke.th=Ke.td;var dt=Ye.prototype={ready:function(n){var i=!1;function r(){i||(i=!0,n())}"complete"===t.readyState?setTimeout(r):(this.on("DOMContentLoaded",r),Ye(e).on("load",r))},toString:function(){var e=[];return y(this,(function(t){e.push(""+t)})),"["+e.join(", ")+"]"},eq:function(e){return u(e>=0?this[e]:this[this.length+e])},length:0,push:g,sort:[].sort,splice:[].splice},ft={};y("multiple,selected,checked,disabled,readOnly,required,open".split(","),(function(e){ft[o(e)]=e}));var pt={};y("input,select,option,textarea,button,form,details".split(","),(function(e){pt[e]=!0}));var gt={ngMinlength:"minlength",ngMaxlength:"maxlength",ngMin:"min",ngMax:"max",ngPattern:"pattern"};function mt(e,t){var n=ft[t.toLowerCase()];return n&&pt[G(e)]&&n}function vt(){this.$get=function(){return A(Ye,{hasClass:function(e,t){return e.attr&&(e=e[0]),rt(e,t)},addClass:function(e,t){return e.attr&&(e=e[0]),ot(e,t)},removeClass:function(e,t){return e.attr&&(e=e[0]),st(e,t)}})}}function $t(e,t){var n=e&&e.$$hashKey;if(n)return"function"==typeof n&&(n=e.$$hashKey()),n;var i=typeof e;return n="function"==i||"object"==i&&null!==e?e.$$hashKey=i+":"+(t||x)():i+":"+e}function bt(e,t){if(t){var n=0;this.nextUid=function(){return++n}}y(e,this.put,this)}y({data:it,removeData:tt},(function(e,t){Ye[t]=e})),y({data:it,inheritedData:ct,scope:function(e){return u.data(e,"$scope")||ct(e.parentNode||e,["$isolateScope","$scope"])},isolateScope:function(e){return u.data(e,"$isolateScope")||u.data(e,"$isolateScopeNoTemplate")},controller:lt,injector:function(e){return ct(e,"$injector")},removeAttr:function(e,t){e.removeAttribute(t)},hasClass:rt,css:function(e,t,n){if(t=He(t),!P(n))return e.style[t];e.style[t]=n},attr:function(e,t,i){var r=e.nodeType;if(r!==Re&&2!==r&&r!==_e){var s=o(t);if(ft[s]){if(!P(i))return e[t]||(e.attributes.getNamedItem(t)||_).specified?s:n;i?(e[t]=!0,e.setAttribute(t,s)):(e[t]=!1,e.removeAttribute(s))}else if(P(i))e.setAttribute(t,i);else if(e.getAttribute){var a=e.getAttribute(t,2);return null===a?n:a}}},prop:function(e,t,n){if(!P(n))return e[t];e[t]=n},text:function(){return e.$dv="",e;function e(e,t){if(T(t)){var n=e.nodeType;return n===Ee||n===Re?e.textContent:""}e.textContent=t}}(),val:function(e,t){if(T(t)){if(e.multiple&&"select"===G(e)){var n=[];return y(e.options,(function(e){e.selected&&n.push(e.value||e.text)})),0===n.length?null:n}return e.value}e.value=t},html:function(e,t){if(T(t))return e.innerHTML;Ze(e,!0),e.innerHTML=t},empty:ut},(function(e,t){Ye.prototype[t]=function(t,i){var r,s,o=this.length;if(e!==ut&&(2==e.length&&e!==rt&&e!==lt?t:i)===n){if(I(t)){for(r=0;r<o;r++)if(e===it)e(this[r],t);else for(s in t)e(this[r],s,t[s]);return this}for(var a=e.$dv,l=a===n?Math.min(o,1):o,c=0;c<l;c++){var u=e(this[c],t,i);a=a?a+u:u}return a}for(r=0;r<o;r++)e(this[r],t,i);return this}})),y({removeData:tt,on:function e(t,n,i,r){if(P(r))throw Ue("onargs","jqLite#on() does not support the `selector` or `eventData` parameters");if(Qe(t)){var s=nt(t,!0),o=s.events,a=s.handle;a||(a=s.handle=function(e,t){var n=function(n,i){n.isDefaultPrevented=function(){return n.defaultPrevented};var r=t[i||n.type],s=r?r.length:0;if(s){if(T(n.immediatePropagationStopped)){var o=n.stopImmediatePropagation;n.stopImmediatePropagation=function(){n.immediatePropagationStopped=!0,n.stopPropagation&&n.stopPropagation(),o&&o.call(n)}}n.isImmediatePropagationStopped=function(){return!0===n.immediatePropagationStopped},s>1&&(r=Y(r));for(var a=0;a<s;a++)n.isImmediatePropagationStopped()||r[a].call(e,n)}};return n.elem=e,n}(t,o));for(var l=n.indexOf(" ")>=0?n.split(" "):[n],c=l.length;c--;){var u=o[n=l[c]];u||(o[n]=[],"mouseenter"===n||"mouseleave"===n?e(t,Be[n],(function(e){var t=e.relatedTarget;t&&(t===this||this.contains(t))||a(e,n)})):"$destroy"!==n&&Fe(t,n,a),u=o[n]),u.push(i)}}},off:et,one:function(e,t,n){(e=u(e)).on(t,(function i(){e.off(t,n),e.off(t,i)})),e.on(t,n)},replaceWith:function(e,t){var n,i=e.parentNode;Ze(e),y(new Ye(t),(function(t){n?i.insertBefore(t,n.nextSibling):i.replaceChild(t,e),n=t}))},children:function(e){var t=[];return y(e.childNodes,(function(e){e.nodeType===Ee&&t.push(e)})),t},contents:function(e){return e.contentDocument||e.childNodes||[]},append:function(e,t){var n=e.nodeType;if(n===Ee||n===Le)for(var i=0,r=(t=new Ye(t)).length;i<r;i++){var s=t[i];e.appendChild(s)}},prepend:function(e,t){if(e.nodeType===Ee){var n=e.firstChild;y(new Ye(t),(function(t){e.insertBefore(t,n)}))}},wrap:function(e,t){t=u(t).eq(0).clone()[0];var n=e.parentNode;n&&n.replaceChild(t,e),t.appendChild(e)},remove:ht,detach:function(e){ht(e,!0)},after:function(e,t){for(var n=e,i=e.parentNode,r=0,s=(t=new Ye(t)).length;r<s;r++){var o=t[r];i.insertBefore(o,n.nextSibling),n=o}},addClass:ot,removeClass:st,toggleClass:function(e,t,n){t&&y(t.split(" "),(function(t){var i=n;T(i)&&(i=!rt(e,t)),(i?ot:st)(e,t)}))},parent:function(e){var t=e.parentNode;return t&&t.nodeType!==Le?t:null},next:function(e){return e.nextElementSibling},find:function(e,t){return e.getElementsByTagName?e.getElementsByTagName(t):[]},clone:Xe,triggerHandler:function(e,t,n){var i,r,s,o=t.type||t,a=nt(e),l=a&&a.events,c=l&&l[o];c&&(i={preventDefault:function(){this.defaultPrevented=!0},isDefaultPrevented:function(){return!0===this.defaultPrevented},stopImmediatePropagation:function(){this.immediatePropagationStopped=!0},isImmediatePropagationStopped:function(){return!0===this.immediatePropagationStopped},stopPropagation:_,type:o,target:e},t.type&&(i=A(i,t)),r=Y(c),s=n?[i].concat(n):[i],y(r,(function(t){i.isImmediatePropagationStopped()||t.apply(e,s)})))}},(function(e,t){Ye.prototype[t]=function(t,n,i){for(var r,s=0,o=this.length;s<o;s++)T(r)?P(r=e(this[s],t,n,i))&&(r=u(r)):at(r,e(this[s],t,n,i));return P(r)?r:this},Ye.prototype.bind=Ye.prototype.on,Ye.prototype.unbind=Ye.prototype.off})),bt.prototype={put:function(e,t){this[$t(e,this.nextUid)]=t},get:function(e){return this[$t(e,this.nextUid)]},remove:function(e){var t=this[e=$t(e,this.nextUid)];return delete this[e],t}};var wt=/^function\s*[^\(]*\(\s*([^\)]*)\)/m,yt=/,/,St=/^\s*(_?)(\S+?)\1\s*$/,Ct=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/gm,xt=i("$injector");function kt(e,t){t=!0===t;var i={},r="Provider",s=[],o=new bt([],!0),a={$provide:{provider:h(f),factory:h(g),service:h((function(e,t){return g(e,["$injector",function(e){return e.instantiate(t)}])})),value:h((function(e,t){return g(e,L(t),!1)})),constant:h((function(e,t){Ce(e,"constant"),a[e]=t,c[e]=t})),decorator:function(e,t){var n=l.get(e+r),i=n.$get;n.$get=function(){var e=u.invoke(i,n);return u.invoke(t,null,{$delegate:e})}}}},l=a.$injector=m(a,(function(e,t){throw $.isString(t)&&s.push(t),xt("unpr","Unknown provider: {0}",s.join(" <- "))})),c={},u=c.$injector=m(c,(function(e,t){var i=l.get(e+r,t);return u.invoke(i.$get,i,n,e)}));return y(function e(t){var n,i=[];return y(t,(function(t){if(!o.get(t)){o.put(t,!0);try{O(t)?(n=d(t),i=i.concat(e(n.requires)).concat(n._runBlocks),r(n._invokeQueue),r(n._configBlocks)):j(t)||N(t)?i.push(l.invoke(t)):Se(t,"module")}catch(e){throw N(t)&&(t=t[t.length-1]),e.message&&e.stack&&-1==e.stack.indexOf(e.message)&&(e=e.message+"\n"+e.stack),xt("modulerr","Failed to instantiate module {0} due to:\n{1}",t,e.stack||e.message||e)}}function r(e){var t,n;for(t=0,n=e.length;t<n;t++){var i=e[t],r=l.get(i[0]);r[i[1]].apply(r,i[2])}}})),i}(e),(function(e){u.invoke(e||_)})),u;function h(e){return function(t,n){if(!I(t))return e(t,n);y(t,C(e))}}function f(e,t){if(Ce(e,"service"),(j(t)||N(t))&&(t=l.instantiate(t)),!t.$get)throw xt("pget","Provider '{0}' must define $get factory method.",e);return a[e+r]=t}function p(e,t){return function(){var n=u.invoke(t,this);if(T(n))throw xt("undef","Provider '{0}' must return a value from $get factory method.",e);return n}}function g(e,t,n){return f(e,{$get:!1!==n?p(e,t):t})}function m(e,n){function o(t,r){if(e.hasOwnProperty(t)){if(e[t]===i)throw xt("cdep","Circular dependency found: {0}",t+" <- "+s.join(" <- "));return e[t]}try{return s.unshift(t),e[t]=i,e[t]=n(t,r)}catch(n){throw e[t]===i&&delete e[t],n}finally{s.shift()}}function l(e,n,i,r){"string"==typeof i&&(r=i,i=null);var s,a,l,c=[],u=kt.$$annotate(e,t,r);for(a=0,s=u.length;a<s;a++){if("string"!=typeof(l=u[a]))throw xt("itkn","Incorrect injection token! Expected service name as string, got {0}",l);c.push(i&&i.hasOwnProperty(l)?i[l]:o(l,r))}return N(e)&&(e=e[s]),e.apply(n,c)}return{invoke:l,instantiate:function(e,t,n){var i=Object.create((N(e)?e[e.length-1]:e).prototype||null),r=l(e,i,t,n);return I(r)||j(r)?r:i},get:o,annotate:kt.$$annotate,has:function(t){return a.hasOwnProperty(t+r)||e.hasOwnProperty(t)}}}}function At(){var t=!0;this.disableAutoScrolling=function(){t=!1},this.$get=["$window","$location","$rootScope",function(n,i,r){var s=n.document;function o(e){if(e){e.scrollIntoView();var t=function(){var e=a.yOffset;if(j(e))e=e();else if(K(e)){var t=e[0];e="fixed"!==n.getComputedStyle(t).position?0:t.getBoundingClientRect().bottom}else F(e)||(e=0);return e}();if(t){var i=e.getBoundingClientRect().top;n.scrollBy(0,i-t)}}else n.scrollTo(0,0)}function a(){var e,t,n,r=i.hash();r?(e=s.getElementById(r))?o(e):(t=s.getElementsByName(r),n=null,Array.prototype.some.call(t,(function(e){if("a"===G(e))return n=e,!0})),(e=n)?o(e):"top"===r&&o(null)):o(null)}return t&&r.$watch((function(){return i.hash()}),(function(t,n){var i,s;t===n&&""===t||(i=function(){r.$evalAsync(a)},"complete"===(s=s||e).document.readyState?s.setTimeout(i):u(s).on("load",i))})),a}]}kt.$$annotate=function(e,t,n){var i,r;if("function"==typeof e){if(!(i=e.$inject)){if(i=[],e.length){if(t)throw O(n)&&n||(n=e.name||function(e){var t=e.toString().replace(Ct,"").match(wt);return t?"function("+(t[1]||"").replace(/[\s\r\n]+/," ")+")":"fn"}(e)),xt("strictdi","{0} is not using explicit annotation and cannot be invoked in strict mode",n);y(e.toString().replace(Ct,"").match(wt)[1].split(yt),(function(e){e.replace(St,(function(e,t,n){i.push(n)}))}))}e.$inject=i}}else N(e)?(Se(e[r=e.length-1],"fn"),i=e.slice(0,r)):Se(e,"fn",!0);return i};var Et=i("$animate"),Rt=["$provide",function(e){this.$$selectors={},this.register=function(t,n){var i=t+"-animation";if(t&&"."!=t.charAt(0))throw Et("notcsel","Expecting class selector starting with '.' got '{0}'.",t);this.$$selectors[t.substr(1)]=i,e.factory(i,n)},this.classNameFilter=function(e){return 1===arguments.length&&(this.$$classNameFilter=e instanceof RegExp?e:null),this.$$classNameFilter},this.$get=["$$q","$$asyncCallback","$rootScope",function(e,t,n){var i;function r(e,t,n){for(var i=0,r=t.length;i<r;++i){e[t[i]]=n}}function s(){return i||(i=e.defer(),t((function(){i.resolve(),i=null}))),i.promise}function o(e,t){if($.isObject(t)){var n=A(t.from||{},t.to||{});e.css(n)}}return{animate:function(e,t,n){return o(e,{from:t,to:n}),s()},enter:function(e,t,n,i){return o(e,i),n?n.after(e):t.prepend(e),s()},leave:function(e,t){return o(e,t),e.remove(),s()},move:function(e,t,n,i){return this.enter(e,t,n,i)},addClass:function(e,t,n){return this.setClass(e,t,[],n)},$$addClassImmediately:function(e,t,n){return e=u(e),t=O(t)?t:N(t)?t.join(" "):"",y(e,(function(e){ot(e,t)})),o(e,n),s()},removeClass:function(e,t,n){return this.setClass(e,[],t,n)},$$removeClassImmediately:function(e,t,n){return e=u(e),t=O(t)?t:N(t)?t.join(" "):"",y(e,(function(e){st(e,t)})),o(e,n),s()},setClass:function(t,i,s,o){var a=this,l="$$animateClasses",c=!1,h=(t=u(t)).data(l);h?o&&h.options&&(h.options=$.extend(h.options||{},o)):(h={classes:{},options:o},c=!0);var d,f,p,g=h.classes;return i=N(i)?i:i.split(" "),s=N(s)?s:s.split(" "),r(g,i,!0),r(g,s,!1),c&&(h.promise=(d=function(e){var n=t.data(l);if(t.removeData(l),n){var i=function(e,t){var n=[],i=[],r=Ae();return y((e.attr("class")||"").split(/\s+/),(function(e){r[e]=!0})),y(t,(function(e,t){var s=r[t];!1===e&&s?i.push(t):!0!==e||s||n.push(t)})),n.length+i.length>0&&[n.length?n:null,i.length?i:null]}(t,n.classes);i&&a.$$setClassImmediately(t,i[0],i[1],n.options)}e()},(p=e.defer()).promise.$$cancelFn=function(){f&&f()},n.$$postDigest((function(){f=d((function(){p.resolve()}))})),p.promise),t.data(l,h)),h.promise},$$setClassImmediately:function(e,t,n,i){return t&&this.$$addClassImmediately(e,t),n&&this.$$removeClassImmediately(e,n),o(e,i),s()},enabled:_,cancel:_}}]}];function _t(){this.$get=["$$rAF","$timeout",function(e,t){return e.supported?function(t){return e(t)}:function(e){return t(e,0,!1)}}]}function Mt(e,t,i,r){var s=this,o=t[0],a=e.location,l=e.history,c=e.setTimeout,h=e.clearTimeout,d={};s.isMock=!1;var f=0,p=[];function g(e){try{e.apply(null,te(arguments,1))}finally{if(0===--f)for(;p.length;)try{p.pop()()}catch(e){i.error(e)}}}s.$$completeOutstandingRequest=g,s.$$incOutstandingRequestCount=function(){f++},s.notifyWhenNoOutstandingRequests=function(e){y(v,(function(e){e()})),0===f?e():p.push(e)};var m,v=[];s.addPollFn=function(e){return T(m)&&function(e,t){!function n(){y(v,(function(e){e()})),m=t(n,e)}()}(100,c),v.push(e),e};var $,b,w=a.href,S=t.find("base"),C=null;R(),b=$,s.url=function(t,n,i){if(T(i)&&(i=null),a!==e.location&&(a=e.location),l!==e.history&&(l=e.history),t){var o=b===i;if(w===t&&(!r.history||o))return s;var c=w&&gn(w)===gn(t);return w=t,b=i,!r.history||c&&o?(c&&!C||(C=t),n?a.replace(t):c?a.hash=function(e){var t=e.indexOf("#");return-1===t?"":e.substr(t)}(t):a.href=t):(l[n?"replaceState":"pushState"](i,"",t),R(),b=$),s}return C||a.href.replace(/%27/g,"'")},s.state=function(){return $};var x=[],k=!1;function A(){R(),M()}var E=null;function R(){X($=T($=function(){try{return l.state}catch(e){}}())?null:$,E)&&($=E),E=$}function M(){w===s.url()&&b===$||(w=s.url(),b=$,y(x,(function(e){e(s.url(),$)})))}s.onUrlChange=function(t){return k||(r.history&&u(e).on("popstate",A),u(e).on("hashchange",A),k=!0),x.push(t),t},s.$$checkUrlChange=M,s.baseHref=function(){var e=S.attr("href");return e?e.replace(/^(https?\:)?\/\/[^\/]*/,""):""};var L={},P="",I=s.baseHref();function F(e){try{return decodeURIComponent(e)}catch(t){return e}}s.cookies=function(e,t){var r,s,a,l,c;if(!e){if(o.cookie!==P)for(s=(P=o.cookie).split("; "),L={},l=0;l<s.length;l++)(c=(a=s[l]).indexOf("="))>0&&(e=F(a.substring(0,c)),L[e]===n&&(L[e]=F(a.substring(c+1))));return L}t===n?o.cookie=encodeURIComponent(e)+"=;path="+I+";expires=Thu, 01 Jan 1970 00:00:00 GMT":O(t)&&(r=(o.cookie=encodeURIComponent(e)+"="+encodeURIComponent(t)+";path="+I).length+1)>4096&&i.warn("Cookie '"+e+"' possibly not set or overflowed because it was too large ("+r+" > 4096 bytes)!")},s.defer=function(e,t){var n;return f++,n=c((function(){delete d[n],g(e)}),t||0),d[n]=!0,n},s.defer.cancel=function(e){return!!d[e]&&(delete d[e],h(e),g(_),!0)}}function Lt(){this.$get=["$window","$log","$sniffer","$document",function(e,t,n,i){return new Mt(e,i,t,n)}]}function Tt(){this.$get=function(){var e={};function t(t,n){if(t in e)throw i("$cacheFactory")("iid","CacheId '{0}' is already taken!",t);var r=0,s=A({},n,{id:t}),o={},a=n&&n.capacity||Number.MAX_VALUE,l={},c=null,u=null;return e[t]={put:function(e,t){a<Number.MAX_VALUE&&h(l[e]||(l[e]={key:e}));if(!T(t))return e in o||r++,o[e]=t,r>a&&this.remove(u.key),t},get:function(e){if(a<Number.MAX_VALUE){var t=l[e];if(!t)return;h(t)}return o[e]},remove:function(e){if(a<Number.MAX_VALUE){var t=l[e];if(!t)return;t==c&&(c=t.p),t==u&&(u=t.n),d(t.n,t.p),delete l[e]}delete o[e],r--},removeAll:function(){o={},r=0,l={},c=u=null},destroy:function(){o=null,s=null,l=null,delete e[t]},info:function(){return A({},s,{size:r})}};function h(e){e!=c&&(u?u==e&&(u=e.n):u=e,d(e.n,e.p),d(e,c),(c=e).n=null)}function d(e,t){e!=t&&(e&&(e.p=t),t&&(t.n=e))}}return t.info=function(){var t={};return y(e,(function(e,n){t[n]=e.info()})),t},t.get=function(t){return e[t]},t}}function Pt(){this.$get=["$cacheFactory",function(e){return e("templates")}]}var It=i("$compile");function Ot(e,i){var r={},s="Directive",a=/^\s*directive\:\s*([\w\-]+)\s+(.*)$/,l=/(([\w\-]+)(?:\:([^;]+))?;?)/,c=function(e){var t,n={},i=e.split(",");for(t=0;t<i.length;t++)n[i[t]]=!0;return n}("ngSrc,ngSrcset,src,srcset"),d=/^(?:(\^\^?)?(\?)?(\^\^?)?)?/,f=/^(on[a-z]+|formaction)$/;this.directive=function t(n,i){return Ce(n,"directive"),O(n)?(ye(i,"directiveFactory"),r.hasOwnProperty(n)||(r[n]=[],e.factory(n+s,["$injector","$exceptionHandler",function(e,t){var i=[];return y(r[n],(function(r,s){try{var o=e.invoke(r);j(o)?o={compile:L(o)}:!o.compile&&o.link&&(o.compile=L(o.link)),o.priority=o.priority||0,o.index=s,o.name=o.name||n,o.require=o.require||o.controller&&o.name,o.restrict=o.restrict||"EA",I(o.scope)&&(o.$$isolateBindings=(a=o.scope,l=o.name,c=/^\s*([@&]|=(\*?))(\??)\s*(\w*)\s*$/,u={},y(a,(function(e,t){var n=e.match(c);if(!n)throw It("iscp","Invalid isolate scope definition for directive '{0}'. Definition: {... {1}: '{2}' ...}",l,t,e);u[t]={mode:n[1][0],collection:"*"===n[2],optional:"?"===n[3],attrName:n[4]||t}})),u)),i.push(o)}catch(e){t(e)}var a,l,c,u})),i}])),r[n].push(i)):y(n,C(t)),this},this.aHrefSanitizationWhitelist=function(e){return P(e)?(i.aHrefSanitizationWhitelist(e),this):i.aHrefSanitizationWhitelist()},this.imgSrcSanitizationWhitelist=function(e){return P(e)?(i.imgSrcSanitizationWhitelist(e),this):i.imgSrcSanitizationWhitelist()};var p=!0;this.debugInfoEnabled=function(e){return P(e)?(p=e,this):p},this.$get=["$injector","$interpolate","$exceptionHandler","$templateRequest","$parse","$controller","$rootScope","$document","$sce","$animate","$$sanitizeUri",function(e,i,g,m,v,$,b,w,S,C,x){var k=function(e,t){if(t){var n,i,r,s=Object.keys(t);for(n=0,i=s.length;n<i;n++)this[r=s[n]]=t[r]}else this.$attr={};this.$$element=e};function E(e,t){try{e.addClass(t)}catch(e){}}k.prototype={$normalize:Dt,$addClass:function(e){e&&e.length>0&&C.addClass(this.$$element,e)},$removeClass:function(e){e&&e.length>0&&C.removeClass(this.$$element,e)},$updateClass:function(e,t){var n=Nt(e,t);n&&n.length&&C.addClass(this.$$element,n);var i=Nt(t,e);i&&i.length&&C.removeClass(this.$$element,i)},$set:function(e,t,i,r){var s,o=this.$$element[0],a=mt(o,e),l=function(e,t){var n=e.nodeName;return("INPUT"===n||"TEXTAREA"===n)&&gt[t]}(o,e),c=e;if(a?(this.$$element.prop(e,t),r=a):l&&(this[l]=t,c=l),this[e]=t,r?this.$attr[e]=r:(r=this.$attr[e])||(this.$attr[e]=r=$e(e,"-")),"a"===(s=G(this.$$element))&&"href"===e||"img"===s&&"src"===e)this[e]=t=x(t,"src"===e);else if("img"===s&&"srcset"===e){for(var u="",h=z(t),d=/\s/.test(h)?/(\s+\d+x\s*,|\s+\d+w\s*,|\s+,|,\s+)/:/(,)/,f=h.split(d),p=Math.floor(f.length/2),m=0;m<p;m++){var v=2*m;u+=x(z(f[v]),!0),u+=" "+z(f[v+1])}var $=z(f[2*m]).split(/\s/);u+=x(z($[0]),!0),2===$.length&&(u+=" "+z($[1])),this[e]=t=u}!1!==i&&(null===t||t===n?this.$$element.removeAttr(r):this.$$element.attr(r,t));var b=this.$$observers;b&&y(b[c],(function(e){try{e(t)}catch(e){g(e)}}))},$observe:function(e,t){var n=this,i=n.$$observers||(n.$$observers=Ae()),r=i[e]||(i[e]=[]);return r.push(t),b.$evalAsync((function(){!r.$$inter&&n.hasOwnProperty(e)&&t(n[e])})),function(){Q(r,t)}}};var L=i.startSymbol(),T=i.endSymbol(),P="{{"==L||"}}"==T?M:function(e){return e.replace(/\{\{/g,L).replace(/}}/g,T)},F=/^ngAttr[A-Z]/;return D.$$addBindingInfo=p?function(e,t){var n=e.data("$binding")||[];N(t)?n=n.concat(t):n.push(t),e.data("$binding",n)}:_,D.$$addBindingClass=p?function(e){E(e,"ng-binding")}:_,D.$$addScopeInfo=p?function(e,t,n,i){var r=n?i?"$isolateScopeNoTemplate":"$isolateScope":"$scope";e.data(r,t)}:_,D.$$addScopeClass=p?function(e,t){E(e,t?"ng-isolate-scope":"ng-scope")}:_,D;function D(e,t,n,i,r){e instanceof u||(e=u(e)),y(e,(function(t,n){t.nodeType==Re&&t.nodeValue.match(/\S+/)&&(e[n]=u(t).wrap("<span></span>").parent()[0])}));var s=B(e,t,e,n,i,r);D.$$addScopeClass(e);var o=null;return function(t,n,i){ye(t,"scope");var r,a,l,c=(i=i||{}).parentBoundTranscludeFn,h=i.transcludeControllers,d=i.futureParentElement;if(c&&c.$$boundTransclude&&(c=c.$$boundTransclude),o||(a=(r=d)&&r[0],o=a&&"foreignobject"!==G(a)&&a.toString().match(/SVG/)?"svg":"html"),l="html"!==o?u(se(o,u("<div>").append(e).html())):n?dt.clone.call(e):e,h)for(var f in h)l.data("$"+f+"Controller",h[f].instance);return D.$$addScopeInfo(l,t),n&&n(l,t),s&&s(t,l,l,c),l}}function B(e,t,i,r,s,o){for(var a,l,c,h,d,f,p,g=[],m=0;m<e.length;m++)a=new k,(c=(l=W(e[m],[],a,0===m?r:n,s)).length?K(l,e[m],a,t,i,null,[],[],o):null)&&c.scope&&D.$$addScopeClass(a.$$element),d=c&&c.terminal||!(h=e[m].childNodes)||!h.length?null:B(h,c?(c.transcludeOnThisElement||!c.templateOnThisElement)&&c.transclude:t),(c||d)&&(g.push(m,c,d),f=!0,p=p||c),o=null;return f?function(e,i,r,s){var o,a,l,c,h,d,f,m;if(p){var v=i.length;for(m=new Array(v),h=0;h<g.length;h+=3)m[f=g[h]]=i[f]}else m=i;for(h=0,d=g.length;h<d;)l=m[g[h++]],o=g[h++],a=g[h++],o?(o.scope?(c=e.$new(),D.$$addScopeInfo(u(l),c)):c=e,o(a,c,l,r,o.transcludeOnThisElement?U(e,o.transclude,s,o.elementTranscludeOnThisElement):!o.templateOnThisElement&&s?s:!s&&t?U(e,t):null)):a&&a(e,l.childNodes,n,s)}:null}function U(e,t,n,i){return function(i,r,s,o,a){return i||((i=e.$new(!1,a)).$$transcluded=!0),t(i,r,{parentBoundTranscludeFn:n,transcludeControllers:s,futureParentElement:o})}}function W(e,t,n,r,s){var o,c,u=e.nodeType,h=n.$attr;switch(u){case Ee:Y(t,Dt(G(e)),"E",r,s);for(var d,f,p,g,m,v,$=e.attributes,b=0,w=$&&$.length;b<w;b++){var y=!1,S=!1;f=(d=$[b]).name,m=z(d.value),g=Dt(f),(v=F.test(g))&&(f=f.replace(Ft,"").substr(8).replace(/_(.)/g,(function(e,t){return t.toUpperCase()})));var C=g.replace(/(Start|End)$/,"");Z(C)&&g===C+"Start"&&(y=f,S=f.substr(0,f.length-5)+"end",f=f.substr(0,f.length-6)),h[p=Dt(f.toLowerCase())]=f,!v&&n.hasOwnProperty(p)||(n[p]=m,mt(e,p)&&(n[p]=!0)),ae(e,t,m,p,v),Y(t,p,"A",r,s,y,S)}if(I(c=e.className)&&(c=c.animVal),O(c)&&""!==c)for(;o=l.exec(c);)Y(t,p=Dt(o[2]),"C",r,s)&&(n[p]=z(o[3])),c=c.substr(o.index+o[0].length);break;case Re:!function(e,t){var n=i(t,!0);n&&e.push({priority:0,compile:function(e){var t=e.parent(),i=!!t.length;return i&&D.$$addBindingClass(t),function(e,t){var r=t.parent();i||D.$$addBindingClass(r),D.$$addBindingInfo(r,n.expressions),e.$watch(n,(function(e){t[0].nodeValue=e}))}}})}(t,e.nodeValue);break;case _e:try{(o=a.exec(e.nodeValue))&&Y(t,p=Dt(o[1]),"M",r,s)&&(n[p]=z(o[2]))}catch(e){}}return t.sort(ie),t}function V(e,t,n){var i=[],r=0;if(t&&e.hasAttribute&&e.hasAttribute(t))do{if(!e)throw It("uterdir","Unterminated attribute, found '{0}' but no matching '{1}' found.",t,n);e.nodeType==Ee&&(e.hasAttribute(t)&&r++,e.hasAttribute(n)&&r--),i.push(e),e=e.nextSibling}while(r>0);else i.push(e);return u(i)}function q(e,t,n){return function(i,r,s,o,a){return r=V(r[0],t,n),e(i,r,s,o,a)}}function K(e,r,s,o,a,l,c,h,f){f=f||{};for(var p,m,b,w,S,C,x,A=-Number.MAX_VALUE,E=f.controllerDirectives,R=f.newIsolateScopeDirective,_=f.templateDirective,M=f.nonTlbTranscludeDirective,L=!1,T=!1,F=f.hasElementTranscludeDirective,B=s.$$element=u(r),U=l,K=o,G=0,Q=e.length;G<Q;G++){var Y=(b=e[G]).$$start,Z=b.$$end;if(Y&&(B=V(r,Y,Z)),S=n,A>b.priority)break;if((x=b.scope)&&(b.templateUrl||(I(x)?(re("new/isolated scope",R||p,b,B),R=b):re("new/isolated scope",R,b,B)),p=p||b),w=b.name,!b.templateUrl&&b.controller&&(x=b.controller,re("'"+w+"' controller",(E=E||{})[w],b,B),E[w]=b),(x=b.transclude)&&(L=!0,b.$$tlb||(re("transclusion",M,b,B),M=b),"element"==x?(F=!0,A=b.priority,S=B,B=s.$$element=u(t.createComment(" "+w+": "+s[w]+" ")),r=B[0],le(a,te(S),r),K=D(S,o,A,U&&U.name,{nonTlbTranscludeDirective:M})):(S=u(Xe(r)).contents(),B.empty(),K=D(S,o))),b.template)if(T=!0,re("template",_,b,B),_=b,x=j(b.template)?b.template(B,s):b.template,x=P(x),b.replace){if(U=b,S=Ge(x)?[]:jt(se(b.templateNamespace,z(x))),r=S[0],1!=S.length||r.nodeType!==Ee)throw It("tplrt","Template for directive '{0}' must have exactly one root element. {1}",w,"");le(a,B,r);var ie={$attr:{}},ae=W(r,[],ie),he=e.splice(G+1,e.length-(G+1));R&&J(ae),e=e.concat(ae).concat(he),ee(s,ie),Q=e.length}else B.html(x);if(b.templateUrl)T=!0,re("template",_,b,B),_=b,b.replace&&(U=b),pe=ne(e.splice(G,e.length-G),B,s,a,L&&K,c,h,{controllerDirectives:E,newIsolateScopeDirective:R,templateDirective:_,nonTlbTranscludeDirective:M}),Q=e.length;else if(b.compile)try{j(C=b.compile(B,s,K))?de(null,C,Y,Z):C&&de(C.pre,C.post,Y,Z)}catch(e){g(e,oe(B))}b.terminal&&(pe.terminal=!0,A=Math.max(A,b.priority))}return pe.scope=p&&!0===p.scope,pe.transcludeOnThisElement=L,pe.elementTranscludeOnThisElement=F,pe.templateOnThisElement=T,pe.transclude=K,f.hasElementTranscludeDirective=F,pe;function de(e,t,n,i){e&&(n&&(e=q(e,n,i)),e.require=b.require,e.directiveName=w,(R===b||b.$$isolateScope)&&(e=ce(e,{isolateScope:!0})),c.push(e)),t&&(n&&(t=q(t,n,i)),t.require=b.require,t.directiveName=w,(R===b||b.$$isolateScope)&&(t=ce(t,{isolateScope:!0})),h.push(t))}function fe(e,t,n,i){var r,s,o="data",a=!1,l=n;if(O(t)){if(s=t.match(d),t=t.substring(s[0].length),s[3]&&(s[1]?s[3]=null:s[1]=s[3]),"^"===s[1]?o="inheritedData":"^^"===s[1]&&(o="inheritedData",l=n.parent()),"?"===s[2]&&(a=!0),r=null,i&&"data"===o&&(r=i[t])&&(r=r.instance),!(r=r||l[o]("$"+t+"Controller"))&&!a)throw It("ctreq","Controller '{0}', required by directive '{1}', can't be found!",t,e);return r||null}return N(t)&&(r=[],y(t,(function(t){r.push(fe(e,t,n,i))}))),r}function pe(e,t,o,a,l){var d,f,p,g,b,w,S,C,x;if(r===o?(x=s,C=s.$$element):(C=u(o),x=new k(C,s)),R&&(b=t.$new(!0)),l&&(S=function(e,t,i){var r;H(e)||(i=t,t=e,e=n);F&&(r=w);i||(i=F?C.parent():C);return l(e,t,r,i,L)},S.$$boundTransclude=l),E&&(m={},w={},y(E,(function(e){var n,i={$scope:e===R||e.$$isolateScope?b:t,$element:C,$attrs:x,$transclude:S};"@"==(g=e.controller)&&(g=x[e.name]),n=$(g,i,!0,e.controllerAs),w[e.name]=n,F||C.data("$"+e.name+"Controller",n.instance),m[e.name]=n}))),R){D.$$addScopeInfo(C,b,!0,!(_&&(_===R||_===R.$$originalDirective))),D.$$addScopeClass(C,!0);var A=m&&m[R.name],M=b;A&&A.identifier&&!0===R.bindToController&&(M=A.instance),y(b.$$isolateBindings=R.$$isolateBindings,(function(e,n){var r,s,o,a,l=e.attrName,c=e.optional;switch(e.mode){case"@":x.$observe(l,(function(e){M[n]=e})),x.$$observers[l].$$scope=t,x[l]&&(M[n]=i(x[l])(t));break;case"=":if(c&&!x[l])return;s=v(x[l]),a=s.literal?X:function(e,t){return e===t||e!=e&&t!=t},o=s.assign||function(){throw r=M[n]=s(t),It("nonassign","Expression '{0}' used with directive '{1}' is non-assignable!",x[l],R.name)},r=M[n]=s(t);var u,h=function(e){return a(e,M[n])||(a(e,r)?o(t,e=M[n]):M[n]=e),r=e};h.$stateful=!0,u=e.collection?t.$watchCollection(x[l],h):t.$watch(v(x[l],h),null,s.literal),b.$on("$destroy",u);break;case"&":s=v(x[l]),M[n]=function(e){return s(t,e)}}}))}for(m&&(y(m,(function(e){e()})),m=null),d=0,f=c.length;d<f;d++)ue(p=c[d],p.isolateScope?b:t,C,x,p.require&&fe(p.directiveName,p.require,C,w),S);var L=t;for(R&&(R.template||null===R.templateUrl)&&(L=b),e&&e(L,o.childNodes,n,l),d=h.length-1;d>=0;d--)ue(p=h[d],p.isolateScope?b:t,C,x,p.require&&fe(p.directiveName,p.require,C,w),S)}}function J(e){for(var t=0,n=e.length;t<n;t++)e[t]=R(e[t],{$$isolateScope:!0})}function Y(t,i,o,a,l,c,u){if(i===l)return null;var h=null;if(r.hasOwnProperty(i))for(var d,f=e.get(i+s),p=0,m=f.length;p<m;p++)try{d=f[p],(a===n||a>d.priority)&&-1!=d.restrict.indexOf(o)&&(c&&(d=R(d,{$$start:c,$$end:u})),t.push(d),h=d)}catch(e){g(e)}return h}function Z(t){if(r.hasOwnProperty(t))for(var n=e.get(t+s),i=0,o=n.length;i<o;i++)if(n[i].multiElement)return!0;return!1}function ee(e,t){var n=t.$attr,i=e.$attr,r=e.$$element;y(e,(function(i,r){"$"!=r.charAt(0)&&(t[r]&&t[r]!==i&&(i+=("style"===r?";":" ")+t[r]),e.$set(r,i,!0,n[r]))})),y(t,(function(t,s){"class"==s?(E(r,t),e.class=(e.class?e.class+" ":"")+t):"style"==s?(r.attr("style",r.attr("style")+";"+t),e.style=(e.style?e.style+";":"")+t):"$"==s.charAt(0)||e.hasOwnProperty(s)||(e[s]=t,i[s]=n[s])}))}function ne(e,t,n,i,r,s,o,a){var l,c,h=[],d=t[0],f=e.shift(),p=R(f,{templateUrl:null,transclude:null,replace:null,$$originalDirective:f}),g=j(f.templateUrl)?f.templateUrl(t,n):f.templateUrl,v=f.templateNamespace;return t.empty(),m(g).then((function(m){var $,b,w,S;if(m=P(m),f.replace){if(w=Ge(m)?[]:jt(se(v,z(m))),$=w[0],1!=w.length||$.nodeType!==Ee)throw It("tplrt","Template for directive '{0}' must have exactly one root element. {1}",f.name,g);b={$attr:{}},le(i,t,$);var C=W($,[],b);I(f.scope)&&J(C),e=C.concat(e),ee(n,b)}else $=d,t.html(m);for(e.unshift(p),l=K(e,$,n,r,t,f,s,o,a),y(i,(function(e,n){e==$&&(i[n]=t[0])})),c=B(t[0].childNodes,r);h.length;){var x=h.shift(),k=h.shift(),A=h.shift(),R=h.shift(),_=t[0];if(!x.$$destroyed){if(k!==d){var M=k.className;a.hasElementTranscludeDirective&&f.replace||(_=Xe($)),le(A,u(k),_),E(u(_),M)}S=l.transcludeOnThisElement?U(x,l.transclude,R):R,l(c,x,_,i,S)}}h=null})),function(e,t,n,i,r){var s=r;t.$$destroyed||(h?h.push(t,n,i,s):(l.transcludeOnThisElement&&(s=U(t,l.transclude,r)),l(c,t,n,i,s)))}}function ie(e,t){var n=t.priority-e.priority;return 0!==n?n:e.name!==t.name?e.name<t.name?-1:1:e.index-t.index}function re(e,t,n,i){if(t)throw It("multidir","Multiple directives [{0}, {1}] asking for {2} on: {3}",t.name,n.name,e,oe(i))}function se(e,n){switch(e=o(e||"html")){case"svg":case"math":var i=t.createElement("div");return i.innerHTML="<"+e+">"+n+"</"+e+">",i.childNodes[0].childNodes;default:return n}}function ae(e,t,n,r,s){var o=function(e,t){if("srcdoc"==t)return S.HTML;var n=G(e);return"xlinkHref"==t||"form"==n&&"action"==t||"img"!=n&&("src"==t||"ngSrc"==t)?S.RESOURCE_URL:void 0}(e,r);s=c[r]||s;var a=i(n,!0,o,s);if(a){if("multiple"===r&&"select"===G(e))throw It("selmulti","Binding to the 'multiple' attribute is not supported. Element: {0}",oe(e));t.push({priority:100,compile:function(){return{pre:function(e,t,l){var c=l.$$observers||(l.$$observers={});if(f.test(r))throw It("nodomevents","Interpolations for HTML DOM event attributes are disallowed.  Please use the ng- versions (such as ng-click instead of onclick) instead.");var u=l[r];u!==n&&(a=u&&i(u,!0,o,s),n=u),a&&(l[r]=a(e),(c[r]||(c[r]=[])).$$inter=!0,(l.$$observers&&l.$$observers[r].$$scope||e).$watch(a,(function(e,t){"class"===r&&e!=t?l.$updateClass(e,t):l.$set(r,e)})))}}}})}}function le(e,n,i){var r,s,o=n[0],a=n.length,l=o.parentNode;if(e)for(r=0,s=e.length;r<s;r++)if(e[r]==o){e[r++]=i;for(var c=r,d=c+a-1,f=e.length;c<f;c++,d++)d<f?e[c]=e[d]:delete e[c];e.length-=a-1,e.context===o&&(e.context=i);break}l&&l.replaceChild(i,o);var p=t.createDocumentFragment();p.appendChild(o),u(i).data(u(o).data()),h?(be=!0,h.cleanData([o])):delete u.cache[o[u.expando]];for(var g=1,m=n.length;g<m;g++){var v=n[g];u(v).remove(),p.appendChild(v),delete n[g]}n[0]=i,n.length=1}function ce(e,t){return A((function(){return e.apply(null,arguments)}),e,t)}function ue(e,t,n,i,r,s){try{e(t,n,i,r,s)}catch(e){g(e,oe(n))}}}]}Ot.$inject=["$provide","$$sanitizeUriProvider"];var Ft=/^((?:x|data)[\:\-_])/i;function Dt(e){return He(e.replace(Ft,""))}function Nt(e,t){var n="",i=e.split(/\s+/),r=t.split(/\s+/);e:for(var s=0;s<i.length;s++){for(var o=i[s],a=0;a<r.length;a++)if(o==r[a])continue e;n+=(n.length>0?" ":"")+o}return n}function jt(e){var t=(e=u(e)).length;if(t<=1)return e;for(;t--;){e[t].nodeType===_e&&p.call(e,t,1)}return e}var Bt=i("$controller");function Ut(){var e={},t=!1,r=/^(\S+)(\s+as\s+(\w+))?$/;this.register=function(t,n){Ce(t,"controller"),I(t)?A(e,t):e[t]=n},this.allowGlobals=function(){t=!0},this.$get=["$injector","$window",function(s,o){return function(i,l,c,u){var h,d,f,p;if(c=!0===c,u&&O(u)&&(p=u),O(i)){if(!(d=i.match(r)))throw Bt("ctrlfmt","Badly formed controller string '{0}'. Must match `__name__ as __id__` or `__name__`.",i);f=d[1],p=p||d[3],Se(i=e.hasOwnProperty(f)?e[f]:xe(l.$scope,f,!0)||(t?xe(o,f,!0):n),f,!0)}if(c){var g=(N(i)?i[i.length-1]:i).prototype;return h=Object.create(g||null),p&&a(l,p,h,f||i.name),A((function(){return s.invoke(i,h,l,f),h}),{instance:h,identifier:p})}return h=s.instantiate(i,l,f),p&&a(l,p,h,f||i.name),h};function a(e,t,n,r){if(!e||!I(e.$scope))throw i("$controller")("noscp","Cannot export controller '{0}' as '{1}'! No $scope object provided via `locals`.",r,t);e.$scope[t]=n}}]}function Ht(){this.$get=["$window",function(e){return u(e.document)}]}function Wt(){this.$get=["$log",function(e){return function(t,n){e.error.apply(e,arguments)}}]}var Vt="application/json",zt={"Content-Type":Vt+";charset=utf-8"},qt=/^\[|^\{(?!\{)/,Kt={"[":/]$/,"{":/}$/},Gt=/^\)\]\}',?\n/;function Qt(e,t){if(O(e)){var n=e.replace(Gt,"").trim();if(n){var i=t("Content-Type");(i&&0===i.indexOf(Vt)||(s=(r=n).match(qt))&&Kt[s[0]].test(r))&&(e=se(n))}}var r,s;return e}function Jt(e){var t,n,i,r=Ae();return e?(y(e.split("\n"),(function(e){i=e.indexOf(":"),t=o(z(e.substr(0,i))),n=z(e.substr(i+1)),t&&(r[t]=r[t]?r[t]+", "+n:n)})),r):r}function Yt(e){var t=I(e)?e:n;return function(n){if(t||(t=Jt(e)),n){var i=t[o(n)];return void 0===i&&(i=null),i}return t}}function Xt(e,t,n,i){return j(i)?i(e,t,n):(y(i,(function(i){e=i(e,t,n)})),e)}function Zt(e){return 200<=e&&e<300}function en(){var e=this.defaults={transformResponse:[Qt],transformRequest:[function(e){return!I(e)||(t=e,"[object File]"===m.call(t))||function(e){return"[object Blob]"===m.call(e)}(e)||function(e){return"[object FormData]"===m.call(e)}(e)?e:re(e);var t}],headers:{common:{Accept:"application/json, text/plain, */*"},post:Y(zt),put:Y(zt),patch:Y(zt)},xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN"},t=!1;this.useApplyAsync=function(e){return P(e)?(t=!!e,this):t};var r=this.interceptors=[];this.$get=["$httpBackend","$browser","$cacheFactory","$rootScope","$q","$injector",function(s,a,c,u,h,d){var f=c("$http"),p=[];function g(r){if(!$.isObject(r))throw i("$http")("badreq","Http request configuration must be an object.  Received: {0}",r);var c=A({method:"get",transformRequest:e.transformRequest,transformResponse:e.transformResponse},r);c.headers=function(t){var n,i,r,s=e.headers,a=A({},t.headers);s=A({},s.common,s[o(t.method)]);e:for(n in s){for(r in i=o(n),a)if(o(r)===i)continue e;a[n]=s[n]}return l=a,u={},y(l,(function(e,t){j(e)?null!=(c=e())&&(u[t]=c):u[t]=e})),u;var l,c,u}(r),c.method=l(c.method);var d=[function(i){var r=i.headers,l=Xt(i.data,Yt(r),n,i.transformRequest);return T(l)&&y(r,(function(e,t){"content-type"===o(t)&&delete r[t]})),T(i.withCredentials)&&!T(e.withCredentials)&&(i.withCredentials=e.withCredentials),function(i,r){var o,l,c=h.defer(),d=c.promise,p=i.headers,m=function(e,t){if(!t)return e;var n=[];(function(e,t,n){for(var i=S(e),r=0;r<i.length;r++)t.call(n,e[i[r]],i[r])})(t,(function(e,t){null===e||T(e)||(N(e)||(e=[e]),y(e,(function(e){I(e)&&(e=D(e)?e.toISOString():re(e)),n.push(he(t)+"="+he(e))})))})),n.length>0&&(e+=(-1==e.indexOf("?")?"?":"&")+n.join("&"));return e}(i.url,i.params);g.pendingRequests.push(i),d.then(C,C),!i.cache&&!e.cache||!1===i.cache||"GET"!==i.method&&"JSONP"!==i.method||(o=I(i.cache)?i.cache:I(e.cache)?e.cache:f);o&&(P(l=o.get(m))?V(l)?l.then(w,w):N(l)?b(l[1],l[0],Y(l[2]),l[3]):b(l,200,{},"OK"):o.put(m,d));if(T(l)){var v=ui(i.url)?a.cookies()[i.xsrfCookieName||e.xsrfCookieName]:n;v&&(p[i.xsrfHeaderName||e.xsrfHeaderName]=v),s(i.method,m,r,$,p,i.timeout,i.withCredentials,i.responseType)}return d;function $(e,n,i,r){function s(){b(n,e,i,r)}o&&(Zt(e)?o.put(m,[e,n,Jt(i),r]):o.remove(m)),t?u.$applyAsync(s):(s(),u.$$phase||u.$apply())}function b(e,t,n,r){(Zt(t=t>=-1?t:0)?c.resolve:c.reject)({data:e,status:t,headers:Yt(n),config:i,statusText:r})}function w(e){b(e.data,e.status,Y(e.headers()),e.statusText)}function C(){var e=g.pendingRequests.indexOf(i);-1!==e&&g.pendingRequests.splice(e,1)}}(i,l).then(w,w)},n],m=h.when(c);for(y(p,(function(e){(e.request||e.requestError)&&d.unshift(e.request,e.requestError),(e.response||e.responseError)&&d.push(e.response,e.responseError)}));d.length;){var v=d.shift(),b=d.shift();m=m.then(v,b)}return m.success=function(e){return Se(e,"fn"),m.then((function(t){e(t.data,t.status,t.headers,c)})),m},m.error=function(e){return Se(e,"fn"),m.then(null,(function(t){e(t.data,t.status,t.headers,c)})),m},m;function w(e){var t=A({},e);return e.data?t.data=Xt(e.data,e.headers,e.status,c.transformResponse):t.data=e.data,Zt(e.status)?t:h.reject(t)}}return y(r,(function(e){p.unshift(O(e)?d.get(e):d.invoke(e))})),g.pendingRequests=[],function(e){y(arguments,(function(e){g[e]=function(t,n){return g(A(n||{},{method:e,url:t}))}}))}("get","delete","head","jsonp"),function(e){y(arguments,(function(e){g[e]=function(t,n,i){return g(A(i||{},{method:e,url:t,data:n}))}}))}("post","put","patch"),g.defaults=e,g}]}function tn(){return new e.XMLHttpRequest}function nn(){this.$get=["$browser","$window","$document",function(e,t,i){return function(e,t,i,r,s){return function(s,l,c,u,h,d,f,p){if(e.$$incOutstandingRequestCount(),l=l||e.url(),"jsonp"==o(s)){var g="_"+(r.counter++).toString(36);r[g]=function(e){r[g].data=e,r[g].called=!0};var m=a(l.replace("JSON_CALLBACK","angular.callbacks."+g),g,(function(e,t){S(u,e,r[g].data,"",t),r[g]=_}))}else{var v=t();v.open(s,l,!0),y(h,(function(e,t){P(e)&&v.setRequestHeader(t,e)})),v.onload=function(){var e=v.statusText||"",t="response"in v?v.response:v.responseText,n=1223===v.status?204:v.status;0===n&&(n=t?200:"file"==ci(l).protocol?404:0),S(u,n,t,v.getAllResponseHeaders(),e)};var $=function(){S(u,-1,null,null,"")};if(v.onerror=$,v.onabort=$,f&&(v.withCredentials=!0),p)try{v.responseType=p}catch(e){if("json"!==p)throw e}v.send(c||null)}if(d>0)var b=i(w,d);else V(d)&&d.then(w);function w(){m&&m(),v&&v.abort()}function S(t,r,s,o,a){b!==n&&i.cancel(b),m=v=null,t(r,s,o,a),e.$$completeOutstandingRequest(_)}};function a(e,t,n){var i=s.createElement("script"),o=null;return i.type="text/javascript",i.src=e,i.async=!0,o=function(e){De(i,"load",o),De(i,"error",o),s.body.removeChild(i),i=null;var a=-1,l="unknown";e&&("load"!==e.type||r[t].called||(e={type:"error"}),l=e.type,a="error"===e.type?404:200),n&&n(a,l)},Fe(i,"load",o),Fe(i,"error",o),s.body.appendChild(i),o}}(e,tn,e.defer,t.angular.callbacks,i[0])}]}var rn=i("$interpolate");function sn(){var e="{{",t="}}";this.startSymbol=function(t){return t?(e=t,this):e},this.endSymbol=function(e){return e?(t=e,this):t},this.$get=["$parse","$exceptionHandler","$sce",function(n,i,r){var s=e.length,o=t.length,a=new RegExp(e.replace(/./g,c),"g"),l=new RegExp(t.replace(/./g,c),"g");function c(e){return"\\\\\\"+e}function u(c,u,h,d){d=!!d;for(var f,p,g,m=0,v=[],$=[],b=c.length,w=[],y=[];m<b;){if(-1==(f=c.indexOf(e,m))||-1==(p=c.indexOf(t,f+s))){m!==b&&w.push(k(c.substring(m)));break}m!==f&&w.push(k(c.substring(m,f))),g=c.substring(f+s,p),v.push(g),$.push(n(g,E)),m=p+o,y.push(w.length),w.push("")}if(h&&w.length>1)throw rn("noconcat","Error while interpolating: {0}\nStrict Contextual Escaping disallows interpolations that concatenate multiple expressions when a trusted value is required.  See http://docs.angularjs.org/api/ng.$sce",c);if(!u||v.length){var S=function(e){for(var t=0,n=v.length;t<n;t++){if(d&&T(e[t]))return;w[y[t]]=e[t]}return w.join("")},C=function(e){return h?r.getTrusted(h,e):r.valueOf(e)},x=function(e){if(null==e)return"";switch(typeof e){case"string":break;case"number":e=""+e;break;default:e=re(e)}return e};return A((function(e){var t=0,n=v.length,r=new Array(n);try{for(;t<n;t++)r[t]=$[t](e);return S(r)}catch(e){var s=rn("interr","Can't interpolate: {0}\n{1}",c,e.toString());i(s)}}),{exp:c,expressions:v,$$watchDelegate:function(e,t,n){var i;return e.$watchGroup($,(function(n,r){var s=S(n);j(t)&&t.call(this,s,n!==r?i:s,e),i=s}),n)}})}function k(n){return n.replace(a,e).replace(l,t)}function E(e){try{return e=C(e),d&&!P(e)?e:x(e)}catch(e){var t=rn("interr","Can't interpolate: {0}\n{1}",c,e.toString());i(t)}}}return u.startSymbol=function(){return e},u.endSymbol=function(){return t},u}]}function on(){this.$get=["$rootScope","$window","$q","$$q",function(e,t,n,i){var r={};function s(s,o,a,l){var c=t.setInterval,u=t.clearInterval,h=0,d=P(l)&&!l,f=(d?i:n).defer(),p=f.promise;return a=P(a)?a:0,p.then(null,null,s),p.$$intervalId=c((function(){f.notify(h++),a>0&&h>=a&&(f.resolve(h),u(p.$$intervalId),delete r[p.$$intervalId]),d||e.$apply()}),o),r[p.$$intervalId]=f,p}return s.cancel=function(e){return!(!e||!(e.$$intervalId in r))&&(r[e.$$intervalId].reject("canceled"),t.clearInterval(e.$$intervalId),delete r[e.$$intervalId],!0)},s}]}function an(){this.$get=function(){return{id:"en-us",NUMBER_FORMATS:{DECIMAL_SEP:".",GROUP_SEP:",",PATTERNS:[{minInt:1,minFrac:0,maxFrac:3,posPre:"",posSuf:"",negPre:"-",negSuf:"",gSize:3,lgSize:3},{minInt:1,minFrac:2,maxFrac:2,posPre:"¤",posSuf:"",negPre:"(¤",negSuf:")",gSize:3,lgSize:3}],CURRENCY_SYM:"$"},DATETIME_FORMATS:{MONTH:"January,February,March,April,May,June,July,August,September,October,November,December".split(","),SHORTMONTH:"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec".split(","),DAY:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday".split(","),SHORTDAY:"Sun,Mon,Tue,Wed,Thu,Fri,Sat".split(","),AMPMS:["AM","PM"],medium:"MMM d, y h:mm:ss a",short:"M/d/yy h:mm a",fullDate:"EEEE, MMMM d, y",longDate:"MMMM d, y",mediumDate:"MMM d, y",shortDate:"M/d/yy",mediumTime:"h:mm:ss a",shortTime:"h:mm a",ERANAMES:["Before Christ","Anno Domini"],ERAS:["BC","AD"]},pluralCat:function(e){return 1===e?"one":"other"}}}}var ln=/^([^\?#]*)(\?([^#]*))?(#(.*))?$/,cn={http:80,https:443,ftp:21},un=i("$location");function hn(e){for(var t=e.split("/"),n=t.length;n--;)t[n]=ue(t[n]);return t.join("/")}function dn(e,t){var n=ci(e);t.$$protocol=n.protocol,t.$$host=n.hostname,t.$$port=E(n.port)||cn[n.protocol]||null}function fn(e,t){var n="/"!==e.charAt(0);n&&(e="/"+e);var i=ci(e);t.$$path=decodeURIComponent(n&&"/"===i.pathname.charAt(0)?i.pathname.substring(1):i.pathname),t.$$search=le(i.search),t.$$hash=decodeURIComponent(i.hash),t.$$path&&"/"!=t.$$path.charAt(0)&&(t.$$path="/"+t.$$path)}function pn(e,t){if(0===t.indexOf(e))return t.substr(e.length)}function gn(e){var t=e.indexOf("#");return-1==t?e:e.substr(0,t)}function mn(e){return e.replace(/(#.+)|#$/,"$1")}function vn(e,t,i){this.$$html5=!0,i=i||"",dn(e,this),this.$$parse=function(e){var n=pn(t,e);if(!O(n))throw un("ipthprfx",'Invalid url "{0}", missing path prefix "{1}".',e,t);fn(n,this),this.$$path||(this.$$path="/"),this.$$compose()},this.$$compose=function(){var e=ce(this.$$search),n=this.$$hash?"#"+ue(this.$$hash):"";this.$$url=hn(this.$$path)+(e?"?"+e:"")+n,this.$$absUrl=t+this.$$url.substr(1)},this.$$parseLinkUrl=function(r,s){return s&&"#"===s[0]?(this.hash(s.slice(1)),!0):((o=pn(e,r))!==n?(a=o,l=(o=pn(i,o))!==n?t+(pn("/",o)||o):e+a):(o=pn(t,r))!==n?l=t+o:t==r+"/"&&(l=t),l&&this.$$parse(l),!!l);var o,a,l}}function $n(e,t,n){dn(e,this),this.$$parse=function(i){var r,s=pn(e,i)||pn(t,i);T(s)||"#"!==s.charAt(0)?this.$$html5?r=s:(r="",T(s)&&(e=i,this.replace())):T(r=pn(n,s))&&(r=s),fn(r,this),this.$$path=function(e,t,n){var i,r=/^\/[A-Z]:(\/.*)/;0===t.indexOf(n)&&(t=t.replace(n,""));if(r.exec(t))return e;return(i=r.exec(e))?i[1]:e}(this.$$path,r,e),this.$$compose()},this.$$compose=function(){var t=ce(this.$$search),i=this.$$hash?"#"+ue(this.$$hash):"";this.$$url=hn(this.$$path)+(t?"?"+t:"")+i,this.$$absUrl=e+(this.$$url?n+this.$$url:"")},this.$$parseLinkUrl=function(t,n){return gn(e)==gn(t)&&(this.$$parse(t),!0)}}function bn(e,t,n){this.$$html5=!0,$n.apply(this,arguments),this.$$parseLinkUrl=function(i,r){return r&&"#"===r[0]?(this.hash(r.slice(1)),!0):(e==gn(i)?s=i:(o=pn(t,i))?s=e+n+o:t===i+"/"&&(s=t),s&&this.$$parse(s),!!s);var s,o},this.$$compose=function(){var t=ce(this.$$search),i=this.$$hash?"#"+ue(this.$$hash):"";this.$$url=hn(this.$$path)+(t?"?"+t:"")+i,this.$$absUrl=e+n+this.$$url}}var wn={$$html5:!1,$$replace:!1,absUrl:yn("$$absUrl"),url:function(e){if(T(e))return this.$$url;var t=ln.exec(e);return(t[1]||""===e)&&this.path(decodeURIComponent(t[1])),(t[2]||t[1]||""===e)&&this.search(t[3]||""),this.hash(t[5]||""),this},protocol:yn("$$protocol"),host:yn("$$host"),port:yn("$$port"),path:Sn("$$path",(function(e){return"/"==(e=null!==e?e.toString():"").charAt(0)?e:"/"+e})),search:function(e,t){switch(arguments.length){case 0:return this.$$search;case 1:if(O(e)||F(e))e=e.toString(),this.$$search=le(e);else{if(!I(e))throw un("isrcharg","The first argument of the `$location#search()` call must be a string or an object.");y(e=J(e,{}),(function(t,n){null==t&&delete e[n]})),this.$$search=e}break;default:T(t)||null===t?delete this.$$search[e]:this.$$search[e]=t}return this.$$compose(),this},hash:Sn("$$hash",(function(e){return null!==e?e.toString():""})),replace:function(){return this.$$replace=!0,this}};function yn(e){return function(){return this[e]}}function Sn(e,t){return function(n){return T(n)?this[e]:(this[e]=t(n),this.$$compose(),this)}}function Cn(){var e="",t={enabled:!1,requireBase:!0,rewriteLinks:!0};this.hashPrefix=function(t){return P(t)?(e=t,this):e},this.html5Mode=function(e){return W(e)?(t.enabled=e,this):I(e)?(W(e.enabled)&&(t.enabled=e.enabled),W(e.requireBase)&&(t.requireBase=e.requireBase),W(e.rewriteLinks)&&(t.rewriteLinks=e.rewriteLinks),this):t},this.$get=["$rootScope","$browser","$sniffer","$rootElement","$window",function(n,i,r,s,o){var a,l,c,h,d=i.baseHref(),f=i.url();if(t.enabled){if(!d&&t.requireBase)throw un("nobase","$location in HTML5 mode requires a <base> tag to be present!");c=(h=f).substring(0,h.indexOf("/",h.indexOf("//")+2))+(d||"/"),l=r.history?vn:bn}else c=gn(f),l=$n;var p=function(e){return e.substr(0,gn(e).lastIndexOf("/")+1)}(c);(a=new l(c,p,"#"+e)).$$parseLinkUrl(f,f),a.$$state=i.state();var g=/^\s*(javascript|mailto):/i;function m(e,t,n){var r=a.url(),s=a.$$state;try{i.url(e,t,n),a.$$state=i.state()}catch(e){throw a.url(r),a.$$state=s,e}}s.on("click",(function(e){if(t.rewriteLinks&&!e.ctrlKey&&!e.metaKey&&!e.shiftKey&&2!=e.which&&2!=e.button){for(var r=u(e.target);"a"!==G(r[0]);)if(r[0]===s[0]||!(r=r.parent())[0])return;var l=r.prop("href"),c=r.attr("href")||r.attr("xlink:href");I(l)&&"[object SVGAnimatedString]"===l.toString()&&(l=ci(l.animVal).href),g.test(l)||!l||r.attr("target")||e.isDefaultPrevented()||a.$$parseLinkUrl(l,c)&&(e.preventDefault(),a.absUrl()!=i.url()&&(n.$apply(),o.angular["ff-684208-preventDefault"]=!0))}})),mn(a.absUrl())!=mn(f)&&i.url(a.absUrl(),!0);var v=!0;return i.onUrlChange((function(e,t){T(pn(p,e))?o.location.href=e:(n.$evalAsync((function(){var i,r=a.absUrl(),s=a.$$state;a.$$parse(e),a.$$state=t,i=n.$broadcast("$locationChangeStart",e,r,t,s).defaultPrevented,a.absUrl()===e&&(i?(a.$$parse(r),a.$$state=s,m(r,!1,s)):(v=!1,$(r,s)))})),n.$$phase||n.$digest())})),n.$watch((function(){var e=mn(i.url()),t=mn(a.absUrl()),s=i.state(),o=a.$$replace,l=e!==t||a.$$html5&&r.history&&s!==a.$$state;(v||l)&&(v=!1,n.$evalAsync((function(){var t=a.absUrl(),i=n.$broadcast("$locationChangeStart",t,e,a.$$state,s).defaultPrevented;a.absUrl()===t&&(i?(a.$$parse(e),a.$$state=s):(l&&m(t,o,s===a.$$state?null:a.$$state),$(e,s)))}))),a.$$replace=!1})),a;function $(e,t){n.$broadcast("$locationChangeSuccess",a.absUrl(),e,a.$$state,t)}}]}function xn(){var e=!0,t=this;this.debugEnabled=function(t){return P(t)?(e=t,this):e},this.$get=["$window",function(n){return{log:r("log"),info:r("info"),warn:r("warn"),error:r("error"),debug:(i=r("debug"),function(){e&&i.apply(t,arguments)})};var i;function r(e){var t=n.console||{},i=t[e]||t.log||_,r=!1;try{r=!!i.apply}catch(e){}return r?function(){var e=[];return y(arguments,(function(t){e.push(function(e){return e instanceof Error&&(e.stack?e=e.message&&-1===e.stack.indexOf(e.message)?"Error: "+e.message+"\n"+e.stack:e.stack:e.sourceURL&&(e=e.message+"\n"+e.sourceURL+":"+e.line)),e}(t))})),i.apply(t,e)}:function(e,t){i(e,null==t?"":t)}}}]}y([bn,$n,vn],(function(e){e.prototype=Object.create(wn),e.prototype.state=function(t){if(!arguments.length)return this.$$state;if(e!==vn||!this.$$html5)throw un("nostate","History API state support is available only in HTML5 mode and only in browsers supporting HTML5 History API");return this.$$state=T(t)?null:t,this}}));var kn=i("$parse");function An(e,t){if("__defineGetter__"===e||"__defineSetter__"===e||"__lookupGetter__"===e||"__lookupSetter__"===e||"__proto__"===e)throw kn("isecfld","Attempting to access a disallowed field in Angular expressions! Expression: {0}",t);return e}function En(e,t){if(!O(e+=""))throw kn("iseccst","Cannot convert object to primitive value! Expression: {0}",t);return e}function Rn(e,t){if(e){if(e.constructor===e)throw kn("isecfn","Referencing Function in Angular expressions is disallowed! Expression: {0}",t);if(e.window===e)throw kn("isecwindow","Referencing the Window in Angular expressions is disallowed! Expression: {0}",t);if(e.children&&(e.nodeName||e.prop&&e.attr&&e.find))throw kn("isecdom","Referencing DOM nodes in Angular expressions is disallowed! Expression: {0}",t);if(e===Object)throw kn("isecobj","Referencing Object in Angular expressions is disallowed! Expression: {0}",t)}return e}var _n=Function.prototype.call,Mn=Function.prototype.apply,Ln=Function.prototype.bind;var Tn=Ae();y({null:function(){return null},true:function(){return!0},false:function(){return!1},undefined:function(){}},(function(e,t){e.constant=e.literal=e.sharedGetter=!0,Tn[t]=e})),Tn.this=function(e){return e},Tn.this.sharedGetter=!0;var Pn=A(Ae(),{"+":function(e,t,i,r){return i=i(e,t),r=r(e,t),P(i)?P(r)?i+r:i:P(r)?r:n},"-":function(e,t,n,i){return n=n(e,t),i=i(e,t),(P(n)?n:0)-(P(i)?i:0)},"*":function(e,t,n,i){return n(e,t)*i(e,t)},"/":function(e,t,n,i){return n(e,t)/i(e,t)},"%":function(e,t,n,i){return n(e,t)%i(e,t)},"===":function(e,t,n,i){return n(e,t)===i(e,t)},"!==":function(e,t,n,i){return n(e,t)!==i(e,t)},"==":function(e,t,n,i){return n(e,t)==i(e,t)},"!=":function(e,t,n,i){return n(e,t)!=i(e,t)},"<":function(e,t,n,i){return n(e,t)<i(e,t)},">":function(e,t,n,i){return n(e,t)>i(e,t)},"<=":function(e,t,n,i){return n(e,t)<=i(e,t)},">=":function(e,t,n,i){return n(e,t)>=i(e,t)},"&&":function(e,t,n,i){return n(e,t)&&i(e,t)},"||":function(e,t,n,i){return n(e,t)||i(e,t)},"!":function(e,t,n){return!n(e,t)},"=":!0,"|":!0}),In={n:"\n",f:"\f",r:"\r",t:"\t",v:"\v","'":"'",'"':'"'},On=function(e){this.options=e};function Fn(e){return e.constant}On.prototype={constructor:On,lex:function(e){for(this.text=e,this.index=0,this.tokens=[];this.index<this.text.length;){var t=this.text.charAt(this.index);if('"'===t||"'"===t)this.readString(t);else if(this.isNumber(t)||"."===t&&this.isNumber(this.peek()))this.readNumber();else if(this.isIdent(t))this.readIdent();else if(this.is(t,"(){}[].,;:?"))this.tokens.push({index:this.index,text:t}),this.index++;else if(this.isWhitespace(t))this.index++;else{var n=t+this.peek(),i=n+this.peek(2),r=Pn[t],s=Pn[n],o=Pn[i];if(r||s||o){var a=o?i:s?n:t;this.tokens.push({index:this.index,text:a,operator:!0}),this.index+=a.length}else this.throwError("Unexpected next character ",this.index,this.index+1)}}return this.tokens},is:function(e,t){return-1!==t.indexOf(e)},peek:function(e){var t=e||1;return this.index+t<this.text.length&&this.text.charAt(this.index+t)},isNumber:function(e){return"0"<=e&&e<="9"&&"string"==typeof e},isWhitespace:function(e){return" "===e||"\r"===e||"\t"===e||"\n"===e||"\v"===e||" "===e},isIdent:function(e){return"a"<=e&&e<="z"||"A"<=e&&e<="Z"||"_"===e||"$"===e},isExpOperator:function(e){return"-"===e||"+"===e||this.isNumber(e)},throwError:function(e,t,n){n=n||this.index;var i=P(t)?"s "+t+"-"+this.index+" ["+this.text.substring(t,n)+"]":" "+n;throw kn("lexerr","Lexer Error: {0} at column{1} in expression [{2}].",e,i,this.text)},readNumber:function(){for(var e="",t=this.index;this.index<this.text.length;){var n=o(this.text.charAt(this.index));if("."==n||this.isNumber(n))e+=n;else{var i=this.peek();if("e"==n&&this.isExpOperator(i))e+=n;else if(this.isExpOperator(n)&&i&&this.isNumber(i)&&"e"==e.charAt(e.length-1))e+=n;else{if(!this.isExpOperator(n)||i&&this.isNumber(i)||"e"!=e.charAt(e.length-1))break;this.throwError("Invalid exponent")}}this.index++}this.tokens.push({index:t,text:e,constant:!0,value:Number(e)})},readIdent:function(){for(var e=this.index;this.index<this.text.length;){var t=this.text.charAt(this.index);if(!this.isIdent(t)&&!this.isNumber(t))break;this.index++}this.tokens.push({index:e,text:this.text.slice(e,this.index),identifier:!0})},readString:function(e){var t=this.index;this.index++;for(var n="",i=e,r=!1;this.index<this.text.length;){var s=this.text.charAt(this.index);if(i+=s,r){if("u"===s){var o=this.text.substring(this.index+1,this.index+5);o.match(/[\da-f]{4}/i)||this.throwError("Invalid unicode escape [\\u"+o+"]"),this.index+=4,n+=String.fromCharCode(parseInt(o,16))}else{n+=In[s]||s}r=!1}else if("\\"===s)r=!0;else{if(s===e)return this.index++,void this.tokens.push({index:t,text:i,constant:!0,value:n});n+=s}this.index++}this.throwError("Unterminated quote",t)}};var Dn=function(e,t,n){this.lexer=e,this.$filter=t,this.options=n};function Nn(e,t,n,i,r){Rn(e,r),Rn(t,r);for(var s,o=n.split("."),a=0;o.length>1;a++){s=An(o.shift(),r);var l=0===a&&t&&t[s]||e[s];l||(l={},e[s]=l),e=Rn(l,r)}return Rn(e[s=An(o.shift(),r)],r),e[s]=i,i}Dn.ZERO=A((function(){return 0}),{sharedGetter:!0,constant:!0}),Dn.prototype={constructor:Dn,parse:function(e){this.text=e,this.tokens=this.lexer.lex(e);var t=this.statements();return 0!==this.tokens.length&&this.throwError("is an unexpected token",this.tokens[0]),t.literal=!!t.literal,t.constant=!!t.constant,t},primary:function(){var e,t,n;this.expect("(")?(e=this.filterChain(),this.consume(")")):this.expect("[")?e=this.arrayDeclaration():this.expect("{")?e=this.object():this.peek().identifier&&this.peek().text in Tn?e=Tn[this.consume().text]:this.peek().identifier?e=this.identifier():this.peek().constant?e=this.constant():this.throwError("not a primary expression",this.peek());for(;t=this.expect("(","[",".");)"("===t.text?(e=this.functionCall(e,n),n=null):"["===t.text?(n=e,e=this.objectIndex(e)):"."===t.text?(n=e,e=this.fieldAccess(e)):this.throwError("IMPOSSIBLE");return e},throwError:function(e,t){throw kn("syntax","Syntax Error: Token '{0}' {1} at column {2} of the expression [{3}] starting at [{4}].",t.text,e,t.index+1,this.text,this.text.substring(t.index))},peekToken:function(){if(0===this.tokens.length)throw kn("ueoe","Unexpected end of expression: {0}",this.text);return this.tokens[0]},peek:function(e,t,n,i){return this.peekAhead(0,e,t,n,i)},peekAhead:function(e,t,n,i,r){if(this.tokens.length>e){var s=this.tokens[e],o=s.text;if(o===t||o===n||o===i||o===r||!t&&!n&&!i&&!r)return s}return!1},expect:function(e,t,n,i){var r=this.peek(e,t,n,i);return!!r&&(this.tokens.shift(),r)},consume:function(e){if(0===this.tokens.length)throw kn("ueoe","Unexpected end of expression: {0}",this.text);var t=this.expect(e);return t||this.throwError("is unexpected, expecting ["+e+"]",this.peek()),t},unaryFn:function(e,t){var n=Pn[e];return A((function(e,i){return n(e,i,t)}),{constant:t.constant,inputs:[t]})},binaryFn:function(e,t,n,i){var r=Pn[t];return A((function(t,i){return r(t,i,e,n)}),{constant:e.constant&&n.constant,inputs:!i&&[e,n]})},identifier:function(){for(var e=this.consume().text;this.peek(".")&&this.peekAhead(1).identifier&&!this.peekAhead(2,"(");)e+=this.consume().text+this.consume().text;return function(e,t,i){var r=t.expensiveChecks,s=r?Bn:jn,o=s[e];if(o)return o;var a=e.split("."),l=a.length;if(t.csp)o=l<6?Hn(a[0],a[1],a[2],a[3],a[4],i,r):function(e,t){var s,o=0;do{s=Hn(a[o++],a[o++],a[o++],a[o++],a[o++],i,r)(e,t),t=n,e=s}while(o<l);return s};else{var c="";r&&(c+="s = eso(s, fe);\nl = eso(l, fe);\n");var u=r;y(a,(function(e,t){An(e,i);var n=(t?"s":'((l&&l.hasOwnProperty("'+e+'"))?l:s)')+"."+e;(r||Un(e))&&(n="eso("+n+", fe)",u=!0),c+="if(s == null) return undefined;\ns="+n+";\n"})),c+="return s;";var h=new Function("s","l","eso","fe",c);h.toString=L(c),u&&(h=function(e,t){return function(n,i){return e(n,i,Rn,t)}}(h,i)),o=h}return o.sharedGetter=!0,o.assign=function(t,n,i){return Nn(t,i,e,n,e)},s[e]=o,o}(e,this.options,this.text)},constant:function(){var e=this.consume().value;return A((function(){return e}),{constant:!0,literal:!0})},statements:function(){for(var e=[];;)if(this.tokens.length>0&&!this.peek("}",")",";","]")&&e.push(this.filterChain()),!this.expect(";"))return 1===e.length?e[0]:function(t,n){for(var i,r=0,s=e.length;r<s;r++)i=e[r](t,n);return i}},filterChain:function(){for(var e=this.expression();this.expect("|");)e=this.filter(e);return e},filter:function(e){var t,i,r=this.$filter(this.consume().text);if(this.peek(":"))for(t=[],i=[];this.expect(":");)t.push(this.expression());var s=[e].concat(t||[]);return A((function(s,o){var a=e(s,o);if(i){i[0]=a;for(var l=t.length;l--;)i[l+1]=t[l](s,o);return r.apply(n,i)}return r(a)}),{constant:!r.$stateful&&s.every(Fn),inputs:!r.$stateful&&s})},expression:function(){return this.assignment()},assignment:function(){var e,t,n=this.ternary();return(t=this.expect("="))?(n.assign||this.throwError("implies assignment but ["+this.text.substring(0,t.index)+"] can not be assigned to",t),e=this.ternary(),A((function(t,i){return n.assign(t,e(t,i),i)}),{inputs:[n,e]})):n},ternary:function(){var e,t=this.logicalOR();if(this.expect("?")&&(e=this.assignment(),this.consume(":"))){var n=this.assignment();return A((function(i,r){return t(i,r)?e(i,r):n(i,r)}),{constant:t.constant&&e.constant&&n.constant})}return t},logicalOR:function(){for(var e,t=this.logicalAND();e=this.expect("||");)t=this.binaryFn(t,e.text,this.logicalAND(),!0);return t},logicalAND:function(){for(var e,t=this.equality();e=this.expect("&&");)t=this.binaryFn(t,e.text,this.equality(),!0);return t},equality:function(){for(var e,t=this.relational();e=this.expect("==","!=","===","!==");)t=this.binaryFn(t,e.text,this.relational());return t},relational:function(){for(var e,t=this.additive();e=this.expect("<",">","<=",">=");)t=this.binaryFn(t,e.text,this.additive());return t},additive:function(){for(var e,t=this.multiplicative();e=this.expect("+","-");)t=this.binaryFn(t,e.text,this.multiplicative());return t},multiplicative:function(){for(var e,t=this.unary();e=this.expect("*","/","%");)t=this.binaryFn(t,e.text,this.unary());return t},unary:function(){var e;return this.expect("+")?this.primary():(e=this.expect("-"))?this.binaryFn(Dn.ZERO,e.text,this.unary()):(e=this.expect("!"))?this.unaryFn(e.text,this.unary()):this.primary()},fieldAccess:function(e){var t=this.identifier();return A((function(i,r,s){var o=s||e(i,r);return null==o?n:t(o)}),{assign:function(n,i,r){var s=e(n,r);return s||e.assign(n,s={},r),t.assign(s,i)}})},objectIndex:function(e){var t=this.text,i=this.expression();return this.consume("]"),A((function(r,s){var o=e(r,s),a=En(i(r,s),t);return An(a,t),o?Rn(o[a],t):n}),{assign:function(n,r,s){var o=An(En(i(n,s),t),t),a=Rn(e(n,s),t);return a||e.assign(n,a={},s),a[o]=r}})},functionCall:function(e,t){var i=[];if(")"!==this.peekToken().text)do{i.push(this.expression())}while(this.expect(","));this.consume(")");var r=this.text,s=i.length?[]:null;return function(o,a){var l=t?t(o,a):P(t)?n:o,c=e(o,a,l)||_;if(s)for(var u=i.length;u--;)s[u]=Rn(i[u](o,a),r);Rn(l,r),function(e,t){if(e){if(e.constructor===e)throw kn("isecfn","Referencing Function in Angular expressions is disallowed! Expression: {0}",t);if(e===_n||e===Mn||e===Ln)throw kn("isecff","Referencing call, apply or bind in Angular expressions is disallowed! Expression: {0}",t)}}(c,r);var h=c.apply?c.apply(l,s):c(s[0],s[1],s[2],s[3],s[4]);return s&&(s.length=0),Rn(h,r)}},arrayDeclaration:function(){var e=[];if("]"!==this.peekToken().text)do{if(this.peek("]"))break;e.push(this.expression())}while(this.expect(","));return this.consume("]"),A((function(t,n){for(var i=[],r=0,s=e.length;r<s;r++)i.push(e[r](t,n));return i}),{literal:!0,constant:e.every(Fn),inputs:e})},object:function(){var e=[],t=[];if("}"!==this.peekToken().text)do{if(this.peek("}"))break;var n=this.consume();n.constant?e.push(n.value):n.identifier?e.push(n.text):this.throwError("invalid key",n),this.consume(":"),t.push(this.expression())}while(this.expect(","));return this.consume("}"),A((function(n,i){for(var r={},s=0,o=t.length;s<o;s++)r[e[s]]=t[s](n,i);return r}),{literal:!0,constant:t.every(Fn),inputs:t})}};var jn=Ae(),Bn=Ae();function Un(e){return"constructor"==e}function Hn(e,t,i,r,s,o,a){An(e,o),An(t,o),An(i,o),An(r,o),An(s,o);var l=function(e){return Rn(e,o)},c=a||Un(e)?l:M,u=a||Un(t)?l:M,h=a||Un(i)?l:M,d=a||Un(r)?l:M,f=a||Un(s)?l:M;return function(o,a){var l=a&&a.hasOwnProperty(e)?a:o;return null==l?l:(l=c(l[e]),t?null==l?n:(l=u(l[t]),i?null==l?n:(l=h(l[i]),r?null==l?n:(l=d(l[r]),s?null==l?n:l=f(l[s]):l):l):l):l)}}var Wn=Object.prototype.valueOf;function Vn(e){return j(e.valueOf)?e.valueOf():Wn.call(e)}function zn(){var e=Ae(),t=Ae();this.$get=["$filter","$sniffer",function(n,i){var r={csp:i.csp,expensiveChecks:!1},s={csp:i.csp,expensiveChecks:!0};return function(i,o,a){var f,p,g;switch(typeof i){case"string":g=i=i.trim();var m=a?t:e;if(!(f=m[g])){":"===i.charAt(0)&&":"===i.charAt(1)&&(p=!0,i=i.substring(2));var v=a?s:r,$=new On(v);(f=new Dn($,n,v).parse(i)).constant?f.$$watchDelegate=h:p?(f=function(e){var t=e;return e.sharedGetter&&((t=function(t,n){return e(t,n)}).literal=e.literal,t.constant=e.constant,t.assign=e.assign),t}(f),f.$$watchDelegate=f.literal?u:c):f.inputs&&(f.$$watchDelegate=l),m[g]=f}return d(f,o);case"function":return d(i,o);default:return d(_,o)}};function o(e,t){for(var n=0,i=e.length;n<i;n++){var r=e[n];r.constant||(r.inputs?o(r.inputs,t):-1===t.indexOf(r)&&t.push(r))}return t}function a(e,t){return null==e||null==t?e===t:("object"!=typeof e||"object"!=typeof(e=Vn(e)))&&(e===t||e!=e&&t!=t)}function l(e,t,n,i){var r,s=i.$$inputs||(i.$$inputs=o(i.inputs,[]));if(1===s.length){var l=a;return s=s[0],e.$watch((function(e){var t=s(e);return a(t,l)||(r=i(e),l=t&&Vn(t)),r}),t,n)}for(var c=[],u=0,h=s.length;u<h;u++)c[u]=a;return e.$watch((function(e){for(var t=!1,n=0,o=s.length;n<o;n++){var l=s[n](e);(t||(t=!a(l,c[n])))&&(c[n]=l&&Vn(l))}return t&&(r=i(e)),r}),t,n)}function c(e,t,n,i){var r,s;return r=e.$watch((function(e){return i(e)}),(function(e,n,i){s=e,j(t)&&t.apply(this,arguments),P(e)&&i.$$postDigest((function(){P(s)&&r()}))}),n)}function u(e,t,n,i){var r,s;return r=e.$watch((function(e){return i(e)}),(function(e,n,i){s=e,j(t)&&t.call(this,e,n,i),o(e)&&i.$$postDigest((function(){o(s)&&r()}))}),n);function o(e){var t=!0;return y(e,(function(e){P(e)||(t=!1)})),t}}function h(e,t,n,i){var r;return r=e.$watch((function(e){return i(e)}),(function(e,n,i){j(t)&&t.apply(this,arguments),r()}),n)}function d(e,t){if(!t)return e;var n=e.$$watchDelegate,i=n!==u&&n!==c?function(n,i){var r=e(n,i);return t(r,n,i)}:function(n,i){var r=e(n,i),s=t(r,n,i);return P(r)?s:r};return e.$$watchDelegate&&e.$$watchDelegate!==l?i.$$watchDelegate=e.$$watchDelegate:t.$stateful||(i.$$watchDelegate=l,i.inputs=[e]),i}}]}function qn(){this.$get=["$rootScope","$exceptionHandler",function(e,t){return Gn((function(t){e.$evalAsync(t)}),t)}]}function Kn(){this.$get=["$browser","$exceptionHandler",function(e,t){return Gn((function(t){e.defer(t)}),t)}]}function Gn(e,t){var r=i("$q",TypeError);function s(){this.$$state={status:0}}function o(e,t){return function(n){t.call(e,n)}}function a(i){!i.processScheduled&&i.pending&&(i.processScheduled=!0,e((function(){!function(e){var i,r,s;s=e.pending,e.processScheduled=!1,e.pending=n;for(var o=0,a=s.length;o<a;++o){r=s[o][0],i=s[o][e.status];try{j(i)?r.resolve(i(e.value)):1===e.status?r.resolve(e.value):r.reject(e.value)}catch(e){r.reject(e),t(e)}}}(i)})))}function l(){this.promise=new s,this.resolve=o(this,this.resolve),this.reject=o(this,this.reject),this.notify=o(this,this.notify)}s.prototype={then:function(e,t,n){var i=new l;return this.$$state.pending=this.$$state.pending||[],this.$$state.pending.push([i,e,t,n]),this.$$state.status>0&&a(this.$$state),i.promise},catch:function(e){return this.then(null,e)},finally:function(e,t){return this.then((function(t){return u(t,!0,e)}),(function(t){return u(t,!1,e)}),t)}},l.prototype={resolve:function(e){this.promise.$$state.status||(e===this.promise?this.$$reject(r("qcycle","Expected promise to be resolved with value other than itself '{0}'",e)):this.$$resolve(e))},$$resolve:function(e){var n,i;i=function(e,t,n){var i=!1;function r(t){return function(n){i||(i=!0,t.call(e,n))}}return[r(t),r(n)]}(this,this.$$resolve,this.$$reject);try{(I(e)||j(e))&&(n=e&&e.then),j(n)?(this.promise.$$state.status=-1,n.call(e,i[0],i[1],this.notify)):(this.promise.$$state.value=e,this.promise.$$state.status=1,a(this.promise.$$state))}catch(e){i[1](e),t(e)}},reject:function(e){this.promise.$$state.status||this.$$reject(e)},$$reject:function(e){this.promise.$$state.value=e,this.promise.$$state.status=2,a(this.promise.$$state)},notify:function(n){var i=this.promise.$$state.pending;this.promise.$$state.status<=0&&i&&i.length&&e((function(){for(var e,r,s=0,o=i.length;s<o;s++){r=i[s][0],e=i[s][3];try{r.notify(j(e)?e(n):n)}catch(e){t(e)}}}))}};var c=function(e,t){var n=new l;return t?n.resolve(e):n.reject(e),n.promise},u=function(e,t,n){var i=null;try{j(n)&&(i=n())}catch(e){return c(e,!1)}return V(i)?i.then((function(){return c(e,t)}),(function(e){return c(e,!1)})):c(e,t)},h=function(e,t,n,i){var r=new l;return r.resolve(e),r.promise.then(t,n,i)};var d=function e(t){if(!j(t))throw r("norslvr","Expected resolverFn, got '{0}'",t);if(!(this instanceof e))return new e(t);var n=new l;return t((function(e){n.resolve(e)}),(function(e){n.reject(e)})),n.promise};return d.defer=function(){return new l},d.reject=function(e){var t=new l;return t.reject(e),t.promise},d.when=h,d.all=function(e){var t=new l,n=0,i=N(e)?[]:{};return y(e,(function(e,r){n++,h(e).then((function(e){i.hasOwnProperty(r)||(i[r]=e,--n||t.resolve(i))}),(function(e){i.hasOwnProperty(r)||t.reject(e)}))})),0===n&&t.resolve(i),t.promise},d}function Qn(){this.$get=["$window","$timeout",function(e,t){var n,i=e.requestAnimationFrame||e.webkitRequestAnimationFrame,r=e.cancelAnimationFrame||e.webkitCancelAnimationFrame||e.webkitCancelRequestAnimationFrame,s=!!i,o=s?function(e){var t=i(e);return function(){r(t)}}:function(e){var n=t(e,16.66,!1);return function(){t.cancel(n)}};u.supported=s;var a=0,l=[];return u;function c(){for(var e=0;e<l.length;e++){var t=l[e];t&&(l[e]=null,t())}a=l.length=0}function u(e){var t=l.length;return a++,l.push(e),0===t&&(n=o(c)),function(){t>=0&&(l[t]=null,t=null,0==--a&&n&&(n(),n=null,l.length=0))}}}]}function Jn(){var e=10,t=i("$rootScope"),n=null,r=null;this.digestTtl=function(t){return arguments.length&&(e=t),e},this.$get=["$injector","$exceptionHandler","$parse","$browser",function(i,s,o,l){function c(e){e.currentScope.$$destroyed=!0}function u(){this.$id=x(),this.$$phase=this.$parent=this.$$watchers=this.$$nextSibling=this.$$prevSibling=this.$$childHead=this.$$childTail=null,this.$root=this,this.$$destroyed=!1,this.$$listeners={},this.$$listenerCount={},this.$$isolateBindings=null}u.prototype={constructor:u,$new:function(e,t){var n;return t=t||this,e?(n=new u).$root=this.$root:(this.$$ChildScope||(this.$$ChildScope=function(e){function t(){this.$$watchers=this.$$nextSibling=this.$$childHead=this.$$childTail=null,this.$$listeners={},this.$$listenerCount={},this.$id=x(),this.$$ChildScope=null}return t.prototype=e,t}(this)),n=new this.$$ChildScope),n.$parent=t,n.$$prevSibling=t.$$childTail,t.$$childHead?(t.$$childTail.$$nextSibling=n,t.$$childTail=n):t.$$childHead=t.$$childTail=n,(e||t!=this)&&n.$on("$destroy",c),n},$watch:function(e,t,i){var r=o(e);if(r.$$watchDelegate)return r.$$watchDelegate(this,t,i,r);var s=this.$$watchers,a={fn:t,last:$,get:r,exp:e,eq:!!i};return n=null,j(t)||(a.fn=_),s||(s=this.$$watchers=[]),s.unshift(a),function(){Q(s,a),n=null}},$watchGroup:function(e,t){var n=new Array(e.length),i=new Array(e.length),r=[],s=this,o=!1,a=!0;if(!e.length){var l=!0;return s.$evalAsync((function(){l&&t(i,i,s)})),function(){l=!1}}if(1===e.length)return this.$watch(e[0],(function(e,r,s){i[0]=e,n[0]=r,t(i,e===r?i:n,s)}));function c(){o=!1,a?(a=!1,t(i,i,s)):t(i,n,s)}return y(e,(function(e,t){var a=s.$watch(e,(function(e,r){i[t]=e,n[t]=r,o||(o=!0,s.$evalAsync(c))}));r.push(a)})),function(){for(;r.length;)r.shift()()}},$watchCollection:function(e,t){g.$stateful=!0;var n,i,r,s=this,l=t.length>1,c=0,u=o(e,g),h=[],d={},f=!0,p=0;function g(e){var t,r,s,o;if(!T(n=e)){if(I(n))if(w(n)){i!==h&&(p=(i=h).length=0,c++),t=n.length,p!==t&&(c++,i.length=p=t);for(var a=0;a<t;a++)o=i[a],s=n[a],o!=o&&s!=s||o===s||(c++,i[a]=s)}else{for(r in i!==d&&(i=d={},p=0,c++),t=0,n)n.hasOwnProperty(r)&&(t++,s=n[r],o=i[r],r in i?o!=o&&s!=s||o===s||(c++,i[r]=s):(p++,i[r]=s,c++));if(p>t)for(r in c++,i)n.hasOwnProperty(r)||(p--,delete i[r])}else i!==n&&(i=n,c++);return c}}return this.$watch(u,(function(){if(f?(f=!1,t(n,n,s)):t(n,r,s),l)if(I(n))if(w(n)){r=new Array(n.length);for(var e=0;e<n.length;e++)r[e]=n[e]}else for(var i in r={},n)a.call(n,i)&&(r[i]=n[i]);else r=n}))},$digest:function(){var i,o,a,c,u,p,v,w,y,S,C=e,x=this,k=[];g("$digest"),l.$$checkUrlChange(),this===h&&null!==r&&(l.defer.cancel(r),b()),n=null;do{for(p=!1,w=x;d.length;){try{(S=d.shift()).scope.$eval(S.expression,S.locals)}catch(e){s(e)}n=null}e:do{if(c=w.$$watchers)for(u=c.length;u--;)try{if(i=c[u])if((o=i.get(w))===(a=i.last)||(i.eq?X(o,a):"number"==typeof o&&"number"==typeof a&&isNaN(o)&&isNaN(a))){if(i===n){p=!1;break e}}else p=!0,n=i,i.last=i.eq?J(o,null):o,i.fn(o,a===$?o:a,w),C<5&&(k[y=4-C]||(k[y]=[]),k[y].push({msg:j(i.exp)?"fn: "+(i.exp.name||i.exp.toString()):i.exp,newVal:o,oldVal:a}))}catch(e){s(e)}if(!(v=w.$$childHead||w!==x&&w.$$nextSibling))for(;w!==x&&!(v=w.$$nextSibling);)w=w.$parent}while(w=v);if((p||d.length)&&!C--)throw m(),t("infdig","{0} $digest() iterations reached. Aborting!\nWatchers fired in the last 5 iterations: {1}",e,k)}while(p||d.length);for(m();f.length;)try{f.shift()()}catch(e){s(e)}},$destroy:function(){if(!this.$$destroyed){var e=this.$parent;if(this.$broadcast("$destroy"),this.$$destroyed=!0,this!==h){for(var t in this.$$listenerCount)v(this,this.$$listenerCount[t],t);e.$$childHead==this&&(e.$$childHead=this.$$nextSibling),e.$$childTail==this&&(e.$$childTail=this.$$prevSibling),this.$$prevSibling&&(this.$$prevSibling.$$nextSibling=this.$$nextSibling),this.$$nextSibling&&(this.$$nextSibling.$$prevSibling=this.$$prevSibling),this.$destroy=this.$digest=this.$apply=this.$evalAsync=this.$applyAsync=_,this.$on=this.$watch=this.$watchGroup=function(){return _},this.$$listeners={},this.$parent=this.$$nextSibling=this.$$prevSibling=this.$$childHead=this.$$childTail=this.$root=this.$$watchers=null}}},$eval:function(e,t){return o(e)(this,t)},$evalAsync:function(e,t){h.$$phase||d.length||l.defer((function(){d.length&&h.$digest()})),d.push({scope:this,expression:e,locals:t})},$$postDigest:function(e){f.push(e)},$apply:function(e){try{return g("$apply"),this.$eval(e)}catch(e){s(e)}finally{m();try{h.$digest()}catch(e){throw s(e),e}}},$applyAsync:function(e){var t=this;e&&p.push((function(){t.$eval(e)})),null===r&&(r=l.defer((function(){h.$apply(b)})))},$on:function(e,t){var n=this.$$listeners[e];n||(this.$$listeners[e]=n=[]),n.push(t);var i=this;do{i.$$listenerCount[e]||(i.$$listenerCount[e]=0),i.$$listenerCount[e]++}while(i=i.$parent);var r=this;return function(){var i=n.indexOf(t);-1!==i&&(n[i]=null,v(r,1,e))}},$emit:function(e,t){var n,i,r,o=[],a=this,l=!1,c={name:e,targetScope:a,stopPropagation:function(){l=!0},preventDefault:function(){c.defaultPrevented=!0},defaultPrevented:!1},u=ee([c],arguments,1);do{for(n=a.$$listeners[e]||o,c.currentScope=a,i=0,r=n.length;i<r;i++)if(n[i])try{n[i].apply(null,u)}catch(e){s(e)}else n.splice(i,1),i--,r--;if(l)return c.currentScope=null,c;a=a.$parent}while(a);return c.currentScope=null,c},$broadcast:function(e,t){var n=this,i=n,r=n,o={name:e,targetScope:n,preventDefault:function(){o.defaultPrevented=!0},defaultPrevented:!1};if(!n.$$listenerCount[e])return o;for(var a,l,c,u=ee([o],arguments,1);i=r;){for(o.currentScope=i,l=0,c=(a=i.$$listeners[e]||[]).length;l<c;l++)if(a[l])try{a[l].apply(null,u)}catch(e){s(e)}else a.splice(l,1),l--,c--;if(!(r=i.$$listenerCount[e]&&i.$$childHead||i!==n&&i.$$nextSibling))for(;i!==n&&!(r=i.$$nextSibling);)i=i.$parent}return o.currentScope=null,o}};var h=new u,d=h.$$asyncQueue=[],f=h.$$postDigestQueue=[],p=h.$$applyAsyncQueue=[];return h;function g(e){if(h.$$phase)throw t("inprog","{0} already in progress",h.$$phase);h.$$phase=e}function m(){h.$$phase=null}function v(e,t,n){do{e.$$listenerCount[n]-=t,0===e.$$listenerCount[n]&&delete e.$$listenerCount[n]}while(e=e.$parent)}function $(){}function b(){for(;p.length;)try{p.shift()()}catch(e){s(e)}r=null}}]}function Yn(){var e=/^\s*(https?|ftp|mailto|tel|file):/,t=/^\s*((https?|ftp|file|blob):|data:image\/)/;this.aHrefSanitizationWhitelist=function(t){return P(t)?(e=t,this):e},this.imgSrcSanitizationWhitelist=function(e){return P(e)?(t=e,this):t},this.$get=function(){return function(n,i){var r,s=i?t:e;return""===(r=ci(n).href)||r.match(s)?n:"unsafe:"+r}}}var Xn=i("$sce"),Zn={HTML:"html",CSS:"css",URL:"url",RESOURCE_URL:"resourceUrl",JS:"js"};function ei(e){var t=[];return P(e)&&y(e,(function(e){t.push(function(e){if("self"===e)return e;if(O(e)){if(e.indexOf("***")>-1)throw Xn("iwcard","Illegal sequence *** in string matcher.  String: {0}",e);return e=q(e).replace("\\*\\*",".*").replace("\\*","[^:/.?&;]*"),new RegExp("^"+e+"$")}if(B(e))return new RegExp("^"+e.source+"$");throw Xn("imatcher",'Matchers may only be "self", string patterns or RegExp objects')}(e))})),t}function ti(){this.SCE_CONTEXTS=Zn;var e=["self"],t=[];this.resourceUrlWhitelist=function(t){return arguments.length&&(e=ei(t)),e},this.resourceUrlBlacklist=function(e){return arguments.length&&(t=ei(e)),t},this.$get=["$injector",function(i){var r=function(e){throw Xn("unsafe","Attempting to use an unsafe value in a safe context.")};function s(e,t){return"self"===e?ui(t):!!e.exec(t.href)}function o(e){var t=function(e){this.$$unwrapTrustedValue=function(){return e}};return e&&(t.prototype=new e),t.prototype.valueOf=function(){return this.$$unwrapTrustedValue()},t.prototype.toString=function(){return this.$$unwrapTrustedValue().toString()},t}i.has("$sanitize")&&(r=i.get("$sanitize"));var a=o(),l={};return l[Zn.HTML]=o(a),l[Zn.CSS]=o(a),l[Zn.URL]=o(a),l[Zn.JS]=o(a),l[Zn.RESOURCE_URL]=o(l[Zn.URL]),{trustAs:function(e,t){var i=l.hasOwnProperty(e)?l[e]:null;if(!i)throw Xn("icontext","Attempted to trust a value in invalid context. Context: {0}; Value: {1}",e,t);if(null===t||t===n||""===t)return t;if("string"!=typeof t)throw Xn("itype","Attempted to trust a non-string value in a content requiring a string: Context: {0}",e);return new i(t)},getTrusted:function(i,o){if(null===o||o===n||""===o)return o;var a=l.hasOwnProperty(i)?l[i]:null;if(a&&o instanceof a)return o.$$unwrapTrustedValue();if(i===Zn.RESOURCE_URL){if(function(n){var i,r,o=ci(n.toString()),a=!1;for(i=0,r=e.length;i<r;i++)if(s(e[i],o)){a=!0;break}if(a)for(i=0,r=t.length;i<r;i++)if(s(t[i],o)){a=!1;break}return a}(o))return o;throw Xn("insecurl","Blocked loading resource from url not allowed by $sceDelegate policy.  URL: {0}",o.toString())}if(i===Zn.HTML)return r(o);throw Xn("unsafe","Attempting to use an unsafe value in a safe context.")},valueOf:function(e){return e instanceof a?e.$$unwrapTrustedValue():e}}}]}function ni(){var e=!0;this.enabled=function(t){return arguments.length&&(e=!!t),e},this.$get=["$parse","$sceDelegate",function(t,n){if(e&&c<8)throw Xn("iequirks","Strict Contextual Escaping does not support Internet Explorer version < 11 in quirks mode.  You can fix this by adding the text <!doctype html> to the top of your HTML document.  See http://docs.angularjs.org/api/ng.$sce for more information.");var i=Y(Zn);i.isEnabled=function(){return e},i.trustAs=n.trustAs,i.getTrusted=n.getTrusted,i.valueOf=n.valueOf,e||(i.trustAs=i.getTrusted=function(e,t){return t},i.valueOf=M),i.parseAs=function(e,n){var r=t(n);return r.literal&&r.constant?r:t(n,(function(t){return i.getTrusted(e,t)}))};var r=i.parseAs,s=i.getTrusted,a=i.trustAs;return y(Zn,(function(e,t){var n=o(t);i[He("parse_as_"+n)]=function(t){return r(e,t)},i[He("get_trusted_"+n)]=function(t){return s(e,t)},i[He("trust_as_"+n)]=function(t){return a(e,t)}})),i}]}function ii(){this.$get=["$window","$document",function(e,t){var n,i,r={},s=E((/android (\d+)/.exec(o((e.navigator||{}).userAgent))||[])[1]),a=/Boxee/i.test((e.navigator||{}).userAgent),l=t[0]||{},u=/^(Moz|webkit|ms)(?=[A-Z])/,h=l.body&&l.body.style,d=!1,f=!1;if(h){for(var p in h)if(i=u.exec(p)){n=(n=i[0]).substr(0,1).toUpperCase()+n.substr(1);break}n||(n="WebkitOpacity"in h&&"webkit"),d=!(!("transition"in h)&&!(n+"Transition"in h)),f=!(!("animation"in h)&&!(n+"Animation"in h)),!s||d&&f||(d=O(l.body.style.webkitTransition),f=O(l.body.style.webkitAnimation))}return{history:!(!e.history||!e.history.pushState||s<4||a),hasEvent:function(e){if("input"===e&&c<=11)return!1;if(T(r[e])){var t=l.createElement("div");r[e]="on"+e in t}return r[e]},csp:Z(),vendorPrefix:n,transitions:d,animations:f,android:s}}]}It=i("$compile");function ri(){this.$get=["$templateCache","$http","$q","$sce",function(e,t,n,i){function r(s,o){r.totalPendingRequests++,O(s)&&e.get(s)||(s=i.getTrustedResourceUrl(s));var a=t.defaults&&t.defaults.transformResponse;N(a)?a=a.filter((function(e){return e!==Qt})):a===Qt&&(a=null);var l={cache:e,transformResponse:a};return t.get(s,l).finally((function(){r.totalPendingRequests--})).then((function(e){return e.data}),(function(e){if(!o)throw It("tpload","Failed to load template: {0}",s);return n.reject(e)}))}return r.totalPendingRequests=0,r}]}function si(){this.$get=["$rootScope","$browser","$location",function(e,t,n){var i={findBindings:function(e,t,n){var i=e.getElementsByClassName("ng-binding"),r=[];return y(i,(function(e){var i=$.element(e).data("$binding");i&&y(i,(function(i){n?new RegExp("(^|\\s)"+q(t)+"(\\s|\\||$)").test(i)&&r.push(e):-1!=i.indexOf(t)&&r.push(e)}))})),r},findModels:function(e,t,n){for(var i=["ng-","data-ng-","ng\\:"],r=0;r<i.length;++r){var s="["+i[r]+"model"+(n?"=":"*=")+'"'+t+'"]',o=e.querySelectorAll(s);if(o.length)return o}},getLocation:function(){return n.url()},setLocation:function(t){t!==n.url()&&(n.url(t),e.$digest())},whenStable:function(e){t.notifyWhenNoOutstandingRequests(e)}};return i}]}function oi(){this.$get=["$rootScope","$browser","$q","$$q","$exceptionHandler",function(e,t,n,i,r){var s={};function o(o,a,l){var c,u=P(l)&&!l,h=(u?i:n).defer(),d=h.promise;return c=t.defer((function(){try{h.resolve(o())}catch(e){h.reject(e),r(e)}finally{delete s[d.$$timeoutId]}u||e.$apply()}),a),d.$$timeoutId=c,s[c]=h,d}return o.cancel=function(e){return!(!e||!(e.$$timeoutId in s))&&(s[e.$$timeoutId].reject("canceled"),delete s[e.$$timeoutId],t.defer.cancel(e.$$timeoutId))},o}]}var ai=t.createElement("a"),li=ci(e.location.href);function ci(e){var t=e;return c&&(ai.setAttribute("href",t),t=ai.href),ai.setAttribute("href",t),{href:ai.href,protocol:ai.protocol?ai.protocol.replace(/:$/,""):"",host:ai.host,search:ai.search?ai.search.replace(/^\?/,""):"",hash:ai.hash?ai.hash.replace(/^#/,""):"",hostname:ai.hostname,port:ai.port,pathname:"/"===ai.pathname.charAt(0)?ai.pathname:"/"+ai.pathname}}function ui(e){var t=O(e)?ci(e):e;return t.protocol===li.protocol&&t.host===li.host}function hi(){this.$get=L(e)}function di(e){var t="Filter";function n(i,r){if(I(i)){var s={};return y(i,(function(e,t){s[t]=n(t,e)})),s}return e.factory(i+t,r)}this.register=n,this.$get=["$injector",function(e){return function(n){return e.get(n+t)}}],n("currency",gi),n("date",Ri),n("filter",fi),n("json",_i),n("limitTo",Ti),n("lowercase",Mi),n("number",mi),n("orderBy",Pi),n("uppercase",Li)}function fi(){return function(e,t,n){if(!N(e))return e;var i,r;switch(null!==t?typeof t:"null"){case"function":i=t;break;case"boolean":case"null":case"number":case"string":r=!0;case"object":i=function(e,t,n){var i,r=I(e)&&"$"in e;!0===t?t=X:j(t)||(t=function(e,t){return!T(e)&&(null===e||null===t?e===t:!I(e)&&!I(t)&&(e=o(""+e),t=o(""+t),-1!==e.indexOf(t)))});return i=function(i){return r&&!I(i)?pi(i,e.$,t,!1):pi(i,e,t,n)},i}(t,n,r);break;default:return e}return e.filter(i)}}function pi(e,t,n,i,r){var s=null!==e?typeof e:"null",o=null!==t?typeof t:"null";if("string"===o&&"!"===t.charAt(0))return!pi(e,t.substring(1),n,i);if(N(e))return e.some((function(e){return pi(e,t,n,i)}));switch(s){case"object":var a;if(i){for(a in e)if("$"!==a.charAt(0)&&pi(e[a],t,n,!0))return!0;return!r&&pi(e,t,n,!1)}if("object"===o){for(a in t){var l=t[a];if(!j(l)&&!T(l)){var c="$"===a;if(!pi(c?e:e[a],l,n,c,c))return!1}}return!0}return n(e,t);case"function":return!1;default:return n(e,t)}}function gi(e){var t=e.NUMBER_FORMATS;return function(e,n,i){return T(n)&&(n=t.CURRENCY_SYM),T(i)&&(i=t.PATTERNS[1].maxFrac),null==e?e:$i(e,t.PATTERNS[1],t.GROUP_SEP,t.DECIMAL_SEP,i).replace(/\u00A4/g,n)}}function mi(e){var t=e.NUMBER_FORMATS;return function(e,n){return null==e?e:$i(e,t.PATTERNS[0],t.GROUP_SEP,t.DECIMAL_SEP,n)}}di.$inject=["$provide"],gi.$inject=["$locale"],mi.$inject=["$locale"];var vi=".";function $i(e,t,n,i,r){if(!isFinite(e)||I(e))return"";var s=e<0,o=(e=Math.abs(e))+"",a="",l=[],c=!1;if(-1!==o.indexOf("e")){var u=o.match(/([\d\.]+)e(-?)(\d+)/);u&&"-"==u[2]&&u[3]>r+1?e=0:(a=o,c=!0)}if(c)r>0&&e<1&&(a=e.toFixed(r),e=parseFloat(a));else{var h=(o.split(vi)[1]||"").length;T(r)&&(r=Math.min(Math.max(t.minFrac,h),t.maxFrac));var d=(""+(e=+(Math.round(+(e.toString()+"e"+r)).toString()+"e"+-r))).split(vi),f=d[0];d=d[1]||"";var p,g=0,m=t.lgSize,v=t.gSize;if(f.length>=m+v)for(g=f.length-m,p=0;p<g;p++)(g-p)%v==0&&0!==p&&(a+=n),a+=f.charAt(p);for(p=g;p<f.length;p++)(f.length-p)%m==0&&0!==p&&(a+=n),a+=f.charAt(p);for(;d.length<r;)d+="0";r&&"0"!==r&&(a+=i+d.substr(0,r))}return 0===e&&(s=!1),l.push(s?t.negPre:t.posPre,a,s?t.negSuf:t.posSuf),l.join("")}function bi(e,t,n){var i="";for(e<0&&(i="-",e=-e),e=""+e;e.length<t;)e="0"+e;return n&&(e=e.substr(e.length-t)),i+e}function wi(e,t,n,i){return n=n||0,function(r){var s=r["get"+e]();return(n>0||s>-n)&&(s+=n),0===s&&-12==n&&(s=12),bi(s,t,i)}}function yi(e,t){return function(n,i){var r=n["get"+e]();return i[l(t?"SHORT"+e:e)][r]}}function Si(e){var t=new Date(e,0,1).getDay();return new Date(e,0,(t<=4?5:12)-t)}function Ci(e){return function(t){var n,i=Si(t.getFullYear()),r=+(n=t,new Date(n.getFullYear(),n.getMonth(),n.getDate()+(4-n.getDay())))-+i;return bi(1+Math.round(r/6048e5),e)}}function xi(e,t){return e.getFullYear()<=0?t.ERAS[0]:t.ERAS[1]}var ki={yyyy:wi("FullYear",4),yy:wi("FullYear",2,0,!0),y:wi("FullYear",1),MMMM:yi("Month"),MMM:yi("Month",!0),MM:wi("Month",2,1),M:wi("Month",1,1),dd:wi("Date",2),d:wi("Date",1),HH:wi("Hours",2),H:wi("Hours",1),hh:wi("Hours",2,-12),h:wi("Hours",1,-12),mm:wi("Minutes",2),m:wi("Minutes",1),ss:wi("Seconds",2),s:wi("Seconds",1),sss:wi("Milliseconds",3),EEEE:yi("Day"),EEE:yi("Day",!0),a:function(e,t){return e.getHours()<12?t.AMPMS[0]:t.AMPMS[1]},Z:function(e){var t=-1*e.getTimezoneOffset(),n=t>=0?"+":"";return n+=bi(Math[t>0?"floor":"ceil"](t/60),2)+bi(Math.abs(t%60),2)},ww:Ci(2),w:Ci(1),G:xi,GG:xi,GGG:xi,GGGG:function(e,t){return e.getFullYear()<=0?t.ERANAMES[0]:t.ERANAMES[1]}},Ai=/((?:[^yMdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z|G+|w+))(.*)/,Ei=/^\-?\d+$/;function Ri(e){var t=/^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;return function(n,i,r){var s,o,a="",l=[];if(i=i||"mediumDate",i=e.DATETIME_FORMATS[i]||i,O(n)&&(n=Ei.test(n)?E(n):function(e){var n;if(n=e.match(t)){var i=new Date(0),r=0,s=0,o=n[8]?i.setUTCFullYear:i.setFullYear,a=n[8]?i.setUTCHours:i.setHours;n[9]&&(r=E(n[9]+n[10]),s=E(n[9]+n[11])),o.call(i,E(n[1]),E(n[2])-1,E(n[3]));var l=E(n[4]||0)-r,c=E(n[5]||0)-s,u=E(n[6]||0),h=Math.round(1e3*parseFloat("0."+(n[7]||0)));return a.call(i,l,c,u,h),i}return e}(n)),F(n)&&(n=new Date(n)),!D(n))return n;for(;i;)(o=Ai.exec(i))?i=(l=ee(l,o,1)).pop():(l.push(i),i=null);return r&&"UTC"===r&&(n=new Date(n.getTime())).setMinutes(n.getMinutes()+n.getTimezoneOffset()),y(l,(function(t){s=ki[t],a+=s?s(n,e.DATETIME_FORMATS):t.replace(/(^'|'$)/g,"").replace(/''/g,"'")})),a}}function _i(){return function(e,t){return T(t)&&(t=2),re(e,t)}}Ri.$inject=["$locale"];var Mi=L(o),Li=L(l);function Ti(){return function(e,t){return F(e)&&(e=e.toString()),N(e)||O(e)?(t=Math.abs(Number(t))===1/0?Number(t):E(t))?t>0?e.slice(0,t):e.slice(t):O(e)?"":[]:e}}function Pi(e){return function(t,n,i){return w(t)?(0===(n=N(n)?n:[n]).length&&(n=["+"]),n=n.map((function(t){var n=!1,i=t||M;if(O(t)){if("+"!=t.charAt(0)&&"-"!=t.charAt(0)||(n="-"==t.charAt(0),t=t.substring(1)),""===t)return r(a,n);if((i=e(t)).constant){var s=i();return r((function(e,t){return a(e[s],t[s])}),n)}}return r((function(e,t){return a(i(e),i(t))}),n)})),f.call(t).sort(r((function(e,t){for(var i=0;i<n.length;i++){var r=n[i](e,t);if(0!==r)return r}return 0}),i))):t;function r(e,t){return t?function(t,n){return e(n,t)}:e}function s(e){switch(typeof e){case"number":case"boolean":case"string":return!0;default:return!1}}function o(e){return null===e?"null":"function"==typeof e.valueOf&&s(e=e.valueOf())||"function"==typeof e.toString&&s(e=e.toString())?e:""}function a(e,t){var n=typeof e,i=typeof t;return n===i&&"object"===n&&(e=o(e),t=o(t)),n===i?("string"===n&&(e=e.toLowerCase(),t=t.toLowerCase()),e===t?0:e<t?-1:1):n<i?-1:1}}}function Ii(e){return j(e)&&(e={link:e}),e.restrict=e.restrict||"AC",L(e)}Pi.$inject=["$parse"];var Oi=L({restrict:"E",compile:function(e,t){if(!t.href&&!t.xlinkHref&&!t.name)return function(e,t){if("a"===t[0].nodeName.toLowerCase()){var n="[object SVGAnimatedString]"===m.call(t.prop("href"))?"xlink:href":"href";t.on("click",(function(e){t.attr(n)||e.preventDefault()}))}}}}),Fi={};y(ft,(function(e,t){if("multiple"!=e){var n=Dt("ng-"+t);Fi[n]=function(){return{restrict:"A",priority:100,link:function(e,i,r){e.$watch(r[n],(function(e){r.$set(t,!!e)}))}}}}})),y(gt,(function(e,t){Fi[t]=function(){return{priority:100,link:function(e,n,i){if("ngPattern"===t&&"/"==i.ngPattern.charAt(0)){var s=i.ngPattern.match(r);if(s)return void i.$set("ngPattern",new RegExp(s[1],s[2]))}e.$watch(i[t],(function(e){i.$set(t,e)}))}}}})),y(["src","srcset","href"],(function(e){var t=Dt("ng-"+e);Fi[t]=function(){return{priority:99,link:function(n,i,r){var s=e,o=e;"href"===e&&"[object SVGAnimatedString]"===m.call(i.prop("href"))&&(o="xlinkHref",r.$attr[o]="xlink:href",s=null),r.$observe(t,(function(t){t?(r.$set(o,t),c&&s&&i.prop(s,r[o])):"href"===e&&r.$set(o,null)}))}}}}));var Di={$addControl:_,$$renameControl:function(e,t){e.$name=t},$removeControl:_,$setValidity:_,$setDirty:_,$setPristine:_,$setSubmitted:_},Ni="ng-submitted";function ji(e,t,i,r,s){var o=this,a=[],l=o.$$parentForm=e.parent().controller("form")||Di;o.$error={},o.$$success={},o.$pending=n,o.$name=s(t.name||t.ngForm||"")(i),o.$dirty=!1,o.$pristine=!0,o.$valid=!0,o.$invalid=!1,o.$submitted=!1,l.$addControl(o),o.$rollbackViewValue=function(){y(a,(function(e){e.$rollbackViewValue()}))},o.$commitViewValue=function(){y(a,(function(e){e.$commitViewValue()}))},o.$addControl=function(e){Ce(e.$name,"input"),a.push(e),e.$name&&(o[e.$name]=e)},o.$$renameControl=function(e,t){var n=e.$name;o[n]===e&&delete o[n],o[t]=e,e.$name=t},o.$removeControl=function(e){e.$name&&o[e.$name]===e&&delete o[e.$name],y(o.$pending,(function(t,n){o.$setValidity(n,null,e)})),y(o.$error,(function(t,n){o.$setValidity(n,null,e)})),y(o.$$success,(function(t,n){o.$setValidity(n,null,e)})),Q(a,e)},Dr({ctrl:this,$element:e,set:function(e,t,n){var i=e[t];i?-1===i.indexOf(n)&&i.push(n):e[t]=[n]},unset:function(e,t,n){var i=e[t];i&&(Q(i,n),0===i.length&&delete e[t])},parentForm:l,$animate:r}),o.$setDirty=function(){r.removeClass(e,Er),r.addClass(e,Rr),o.$dirty=!0,o.$pristine=!1,l.$setDirty()},o.$setPristine=function(){r.setClass(e,Er,Rr+" "+Ni),o.$dirty=!1,o.$pristine=!0,o.$submitted=!1,y(a,(function(e){e.$setPristine()}))},o.$setUntouched=function(){y(a,(function(e){e.$setUntouched()}))},o.$setSubmitted=function(){r.addClass(e,Ni),o.$submitted=!0,l.$setSubmitted()}}ji.$inject=["$element","$attrs","$scope","$animate","$interpolate"];var Bi=function(e){return["$timeout",function(t){return{name:"form",restrict:e?"EAC":"E",controller:ji,compile:function(i,r){i.addClass(Er).addClass(kr);var s=r.name?"name":!(!e||!r.ngForm)&&"ngForm";return{pre:function(e,i,r,o){if(!("action"in r)){var a=function(t){e.$apply((function(){o.$commitViewValue(),o.$setSubmitted()})),t.preventDefault()};Fe(i[0],"submit",a),i.on("$destroy",(function(){t((function(){De(i[0],"submit",a)}),0,!1)}))}var l=o.$$parentForm;s&&(Nn(e,null,o.$name,o,o.$name),r.$observe(s,(function(t){o.$name!==t&&(Nn(e,null,o.$name,n,o.$name),l.$$renameControl(o,t),Nn(e,null,o.$name,o,o.$name))}))),i.on("$destroy",(function(){l.$removeControl(o),s&&Nn(e,null,r[s],n,o.$name),A(o,Di)}))}}}}}]},Ui=Bi(),Hi=Bi(!0),Wi=/\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/,Vi=/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/,zi=/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i,qi=/^\s*(\-|\+)?(\d+|(\d*(\.\d*)))\s*$/,Ki=/^(\d{4})-(\d{2})-(\d{2})$/,Gi=/^(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,Qi=/^(\d{4})-W(\d\d)$/,Ji=/^(\d{4})-(\d\d)$/,Yi=/^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,Xi={text:function(e,t,n,i,r,s){er(e,t,n,i,r,s),Zi(i)},date:nr("date",Ki,tr(Ki,["yyyy","MM","dd"]),"yyyy-MM-dd"),"datetime-local":nr("datetimelocal",Gi,tr(Gi,["yyyy","MM","dd","HH","mm","ss","sss"]),"yyyy-MM-ddTHH:mm:ss.sss"),time:nr("time",Yi,tr(Yi,["HH","mm","ss","sss"]),"HH:mm:ss.sss"),week:nr("week",Qi,(function(e,t){if(D(e))return e;if(O(e)){Qi.lastIndex=0;var n=Qi.exec(e);if(n){var i=+n[1],r=+n[2],s=0,o=0,a=0,l=0,c=Si(i),u=7*(r-1);return t&&(s=t.getHours(),o=t.getMinutes(),a=t.getSeconds(),l=t.getMilliseconds()),new Date(i,0,c.getDate()+u,s,o,a,l)}}return NaN}),"yyyy-Www"),month:nr("month",Ji,tr(Ji,["yyyy","MM"]),"yyyy-MM"),number:function(e,t,i,r,s,o){if(ir(e,t,i,r),er(e,t,i,r,s,o),r.$$parserName="number",r.$parsers.push((function(e){return r.$isEmpty(e)?null:qi.test(e)?parseFloat(e):n})),r.$formatters.push((function(e){if(!r.$isEmpty(e)){if(!F(e))throw Tr("numfmt","Expected `{0}` to be a number",e);e=e.toString()}return e})),P(i.min)||i.ngMin){var a;r.$validators.min=function(e){return r.$isEmpty(e)||T(a)||e>=a},i.$observe("min",(function(e){P(e)&&!F(e)&&(e=parseFloat(e,10)),a=F(e)&&!isNaN(e)?e:n,r.$validate()}))}if(P(i.max)||i.ngMax){var l;r.$validators.max=function(e){return r.$isEmpty(e)||T(l)||e<=l},i.$observe("max",(function(e){P(e)&&!F(e)&&(e=parseFloat(e,10)),l=F(e)&&!isNaN(e)?e:n,r.$validate()}))}},url:function(e,t,n,i,r,s){er(e,t,n,i,r,s),Zi(i),i.$$parserName="url",i.$validators.url=function(e,t){var n=e||t;return i.$isEmpty(n)||Vi.test(n)}},email:function(e,t,n,i,r,s){er(e,t,n,i,r,s),Zi(i),i.$$parserName="email",i.$validators.email=function(e,t){var n=e||t;return i.$isEmpty(n)||zi.test(n)}},radio:function(e,t,n,i){T(n.name)&&t.attr("name",x());t.on("click",(function(e){t[0].checked&&i.$setViewValue(n.value,e&&e.type)})),i.$render=function(){var e=n.value;t[0].checked=e==i.$viewValue},n.$observe("value",i.$render)},checkbox:function(e,t,n,i,r,s,o,a){var l=rr(a,e,"ngTrueValue",n.ngTrueValue,!0),c=rr(a,e,"ngFalseValue",n.ngFalseValue,!1);t.on("click",(function(e){i.$setViewValue(t[0].checked,e&&e.type)})),i.$render=function(){t[0].checked=i.$viewValue},i.$isEmpty=function(e){return!1===e},i.$formatters.push((function(e){return X(e,l)})),i.$parsers.push((function(e){return e?l:c}))},hidden:_,button:_,submit:_,reset:_,file:_};function Zi(e){e.$formatters.push((function(t){return e.$isEmpty(t)?t:t.toString()}))}function er(e,t,n,i,r,s){var a=o(t[0].type);if(!r.android){var l=!1;t.on("compositionstart",(function(e){l=!0})),t.on("compositionend",(function(){l=!1,c()}))}var c=function(e){if(u&&(s.defer.cancel(u),u=null),!l){var r=t.val(),o=e&&e.type;"password"===a||n.ngTrim&&"false"===n.ngTrim||(r=z(r)),(i.$viewValue!==r||""===r&&i.$$hasNativeValidators)&&i.$setViewValue(r,o)}};if(r.hasEvent("input"))t.on("input",c);else{var u,h=function(e,t,n){u||(u=s.defer((function(){u=null,t&&t.value===n||c(e)})))};t.on("keydown",(function(e){var t=e.keyCode;91===t||15<t&&t<19||37<=t&&t<=40||h(e,this,this.value)})),r.hasEvent("paste")&&t.on("paste cut",h)}t.on("change",c),i.$render=function(){t.val(i.$isEmpty(i.$viewValue)?"":i.$viewValue)}}function tr(e,t){return function(n,i){var r,s;if(D(n))return n;if(O(n)){if('"'==n.charAt(0)&&'"'==n.charAt(n.length-1)&&(n=n.substring(1,n.length-1)),Wi.test(n))return new Date(n);if(e.lastIndex=0,r=e.exec(n))return r.shift(),s=i?{yyyy:i.getFullYear(),MM:i.getMonth()+1,dd:i.getDate(),HH:i.getHours(),mm:i.getMinutes(),ss:i.getSeconds(),sss:i.getMilliseconds()/1e3}:{yyyy:1970,MM:1,dd:1,HH:0,mm:0,ss:0,sss:0},y(r,(function(e,n){n<t.length&&(s[t[n]]=+e)})),new Date(s.yyyy,s.MM-1,s.dd,s.HH,s.mm,s.ss||0,1e3*s.sss||0)}return NaN}}function nr(e,t,i,r){return function(s,o,a,l,c,u,h){ir(s,o,a,l),er(0,o,a,l,c,u);var d,f,p,g=l&&l.$options&&l.$options.timezone;(l.$$parserName=e,l.$parsers.push((function(e){if(l.$isEmpty(e))return null;if(t.test(e)){var r=i(e,d);return"UTC"===g&&r.setMinutes(r.getMinutes()-r.getTimezoneOffset()),r}return n})),l.$formatters.push((function(e){if(e&&!D(e))throw Tr("datefmt","Expected `{0}` to be a date",e);if(m(e)){if((d=e)&&"UTC"===g){var t=6e4*d.getTimezoneOffset();d=new Date(d.getTime()+t)}return h("date")(e,r,g)}return d=null,""})),P(a.min)||a.ngMin)&&(l.$validators.min=function(e){return!m(e)||T(f)||i(e)>=f},a.$observe("min",(function(e){f=v(e),l.$validate()})));(P(a.max)||a.ngMax)&&(l.$validators.max=function(e){return!m(e)||T(p)||i(e)<=p},a.$observe("max",(function(e){p=v(e),l.$validate()})));function m(e){return e&&!(e.getTime&&e.getTime()!=e.getTime())}function v(e){return P(e)?D(e)?e:i(e):n}}}function ir(e,t,i,r){var o=t[0];(r.$$hasNativeValidators=I(o.validity))&&r.$parsers.push((function(e){var i=t.prop(s)||{};return i.badInput&&!i.typeMismatch?n:e}))}function rr(e,t,n,i,r){var s;if(P(i)){if(!(s=e(i)).constant)throw Tr("constexpr","Expected constant expression for `{0}`, but saw `{1}`.",n,i);return s(t)}return r}var sr=["$browser","$sniffer","$filter","$parse",function(e,t,n,i){return{restrict:"E",require:["?ngModel"],link:{pre:function(r,s,a,l){l[0]&&(Xi[o(a.type)]||Xi.text)(r,s,a,l[0],t,e,n,i)}}}}],or=/^(true|false|\d+)$/,ar=function(){return{restrict:"A",priority:100,compile:function(e,t){return or.test(t.ngValue)?function(e,t,n){n.$set("value",e.$eval(n.ngValue))}:function(e,t,n){e.$watch(n.ngValue,(function(e){n.$set("value",e)}))}}}},lr=["$compile",function(e){return{restrict:"AC",compile:function(t){return e.$$addBindingClass(t),function(t,i,r){e.$$addBindingInfo(i,r.ngBind),i=i[0],t.$watch(r.ngBind,(function(e){i.textContent=e===n?"":e}))}}}}],cr=["$interpolate","$compile",function(e,t){return{compile:function(i){return t.$$addBindingClass(i),function(i,r,s){var o=e(r.attr(s.$attr.ngBindTemplate));t.$$addBindingInfo(r,o.expressions),r=r[0],s.$observe("ngBindTemplate",(function(e){r.textContent=e===n?"":e}))}}}}],ur=["$sce","$parse","$compile",function(e,t,n){return{restrict:"A",compile:function(i,r){var s=t(r.ngBindHtml),o=t(r.ngBindHtml,(function(e){return(e||"").toString()}));return n.$$addBindingClass(i),function(t,i,r){n.$$addBindingInfo(i,r.ngBindHtml),t.$watch(o,(function(){i.html(e.getTrustedHtml(s(t))||"")}))}}}}],hr=L({restrict:"A",require:"ngModel",link:function(e,t,n,i){i.$viewChangeListeners.push((function(){e.$eval(n.ngChange)}))}});function dr(e,t){return e="ngClass"+e,["$animate",function(n){return{restrict:"AC",link:function(s,o,a){var l;function c(e){var t=u(e,1);a.$addClass(t)}function u(e,t){var n=o.data("$classCounts")||{},i=[];return y(e,(function(e){(t>0||n[e])&&(n[e]=(n[e]||0)+t,n[e]===+(t>0)&&i.push(e))})),o.data("$classCounts",n),i.join(" ")}function h(e){if(!0===t||s.$index%2===t){var a=r(e||[]);if(l){if(!X(e,l)){!function(e,t){var r=i(t,e),s=i(e,t);r=u(r,1),s=u(s,-1),r&&r.length&&n.addClass(o,r),s&&s.length&&n.removeClass(o,s)}(r(l),a)}}else c(a)}l=Y(e)}s.$watch(a[e],h,!0),a.$observe("class",(function(t){h(s.$eval(a[e]))})),"ngClass"!==e&&s.$watch("$index",(function(n,i){var o=1&n;if(o!==(1&i)){var l=r(s.$eval(a[e]));o===t?c(l):function(e){var t=u(e,-1);a.$removeClass(t)}(l)}}))}};function i(e,t){var n=[];e:for(var i=0;i<e.length;i++){for(var r=e[i],s=0;s<t.length;s++)if(r==t[s])continue e;n.push(r)}return n}function r(e){if(N(e))return e;if(O(e))return e.split(" ");if(I(e)){var t=[];return y(e,(function(e,n){e&&(t=t.concat(n.split(" ")))})),t}return e}}]}var fr=dr("",!0),pr=dr("Odd",0),gr=dr("Even",1),mr=Ii({compile:function(e,t){t.$set("ngCloak",n),e.removeClass("ng-cloak")}}),vr=[function(){return{restrict:"A",scope:!0,controller:"@",priority:500}}],$r={},br={blur:!0,focus:!0};y("click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste".split(" "),(function(e){var t=Dt("ng-"+e);$r[t]=["$parse","$rootScope",function(n,i){return{restrict:"A",compile:function(r,s){var o=n(s[t],null,!0);return function(t,n){n.on(e,(function(n){var r=function(){o(t,{$event:n})};br[e]&&i.$$phase?t.$evalAsync(r):t.$apply(r)}))}}}}]}));var wr=["$animate",function(e){return{multiElement:!0,transclude:"element",priority:600,terminal:!0,restrict:"A",$$tlb:!0,link:function(n,i,r,s,o){var a,l,c;n.$watch(r.ngIf,(function(n){n?l||o((function(n,s){l=s,n[n.length++]=t.createComment(" end ngIf: "+r.ngIf+" "),a={clone:n},e.enter(n,i.parent(),i)})):(c&&(c.remove(),c=null),l&&(l.$destroy(),l=null),a&&(c=ke(a.clone),e.leave(c).then((function(){c=null})),a=null))}))}}}],yr=["$templateRequest","$anchorScroll","$animate",function(e,t,n){return{restrict:"ECA",priority:400,terminal:!0,transclude:"element",controller:$.noop,compile:function(i,r){var s=r.ngInclude||r.src,o=r.onload||"",a=r.autoscroll;return function(i,r,l,c,u){var h,d,f,p=0,g=function(){d&&(d.remove(),d=null),h&&(h.$destroy(),h=null),f&&(n.leave(f).then((function(){d=null})),d=f,f=null)};i.$watch(s,(function(s){var l=function(){!P(a)||a&&!i.$eval(a)||t()},d=++p;s?(e(s,!0).then((function(e){if(d===p){var t=i.$new();c.template=e;var a=u(t,(function(e){g(),n.enter(e,null,r).then(l)}));f=a,(h=t).$emit("$includeContentLoaded",s),i.$eval(o)}}),(function(){d===p&&(g(),i.$emit("$includeContentError",s))})),i.$emit("$includeContentRequested",s)):(g(),c.template=null)}))}}}}],Sr=["$compile",function(e){return{restrict:"ECA",priority:-400,require:"ngInclude",link:function(n,i,r,s){if(/SVG/.test(i[0].toString()))return i.empty(),void e(Je(s.template,t).childNodes)(n,(function(e){i.append(e)}),{futureParentElement:i});i.html(s.template),e(i.contents())(n)}}}],Cr=Ii({priority:450,compile:function(){return{pre:function(e,t,n){e.$eval(n.ngInit)}}}}),xr=function(){return{restrict:"A",priority:100,require:"ngModel",link:function(e,t,i,r){var s=t.attr(i.$attr.ngList)||", ",o="false"!==i.ngTrim,a=o?z(s):s;r.$parsers.push((function(e){if(!T(e)){var t=[];return e&&y(e.split(a),(function(e){e&&t.push(o?z(e):e)})),t}})),r.$formatters.push((function(e){return N(e)?e.join(s):n})),r.$isEmpty=function(e){return!e||!e.length}}}},kr="ng-valid",Ar="ng-invalid",Er="ng-pristine",Rr="ng-dirty",_r="ng-untouched",Mr="ng-touched",Lr="ng-pending",Tr=i("ngModel"),Pr=["$scope","$exceptionHandler","$attrs","$element","$parse","$animate","$timeout","$rootScope","$q","$interpolate",function(e,t,i,r,s,o,a,l,c,u){this.$viewValue=Number.NaN,this.$modelValue=Number.NaN,this.$$rawModelValue=n,this.$validators={},this.$asyncValidators={},this.$parsers=[],this.$formatters=[],this.$viewChangeListeners=[],this.$untouched=!0,this.$touched=!1,this.$pristine=!0,this.$dirty=!1,this.$valid=!0,this.$invalid=!1,this.$error={},this.$$success={},this.$pending=n,this.$name=u(i.name||"",!1)(e);var h,d=s(i.ngModel),f=d.assign,p=d,g=f,m=null,v=this;this.$$setOptions=function(e){if(v.$options=e,e&&e.getterSetter){var t=s(i.ngModel+"()"),n=s(i.ngModel+"($$$p)");p=function(e){var n=d(e);return j(n)&&(n=t(e)),n},g=function(e,t){j(d(e))?n(e,{$$$p:v.$modelValue}):f(e,v.$modelValue)}}else if(!d.assign)throw Tr("nonassign","Expression '{0}' is non-assignable. Element: {1}",i.ngModel,oe(r))},this.$render=_,this.$isEmpty=function(e){return T(e)||""===e||null===e||e!=e};var $=r.inheritedData("$formController")||Di,b=0;Dr({ctrl:this,$element:r,set:function(e,t){e[t]=!0},unset:function(e,t){delete e[t]},parentForm:$,$animate:o}),this.$setPristine=function(){v.$dirty=!1,v.$pristine=!0,o.removeClass(r,Rr),o.addClass(r,Er)},this.$setDirty=function(){v.$dirty=!0,v.$pristine=!1,o.removeClass(r,Er),o.addClass(r,Rr),$.$setDirty()},this.$setUntouched=function(){v.$touched=!1,v.$untouched=!0,o.setClass(r,_r,Mr)},this.$setTouched=function(){v.$touched=!0,v.$untouched=!1,o.setClass(r,Mr,_r)},this.$rollbackViewValue=function(){a.cancel(m),v.$viewValue=v.$$lastCommittedViewValue,v.$render()},this.$validate=function(){if(!F(v.$modelValue)||!isNaN(v.$modelValue)){var e=v.$$lastCommittedViewValue,t=v.$$rawModelValue,i=v.$valid,r=v.$modelValue,s=v.$options&&v.$options.allowInvalid;v.$$runValidators(t,e,(function(e){s||i===e||(v.$modelValue=e?t:n,v.$modelValue!==r&&v.$$writeModelToScope())}))}},this.$$runValidators=function(e,t,i){var r,s,o=++b;(function(){var e=v.$$parserName||"parse";if(h!==n)return h||(y(v.$validators,(function(e,t){a(t,null)})),y(v.$asyncValidators,(function(e,t){a(t,null)}))),a(e,h),h;a(e,null);return!0})()?!function(){var n=!0;if(y(v.$validators,(function(i,r){var s=i(e,t);n=n&&s,a(r,s)})),!n)return y(v.$asyncValidators,(function(e,t){a(t,null)})),!1;return!0}()?l(!1):(r=[],s=!0,y(v.$asyncValidators,(function(i,o){var l=i(e,t);if(!V(l))throw Tr("$asyncValidators","Expected asynchronous validator to return a promise but got '{0}' instead.",l);a(o,n),r.push(l.then((function(){a(o,!0)}),(function(e){s=!1,a(o,!1)})))})),r.length?c.all(r).then((function(){l(s)}),_):l(!0)):l(!1);function a(e,t){o===b&&v.$setValidity(e,t)}function l(e){o===b&&i(e)}},this.$commitViewValue=function(){var e=v.$viewValue;a.cancel(m),(v.$$lastCommittedViewValue!==e||""===e&&v.$$hasNativeValidators)&&(v.$$lastCommittedViewValue=e,v.$pristine&&this.$setDirty(),this.$$parseAndValidate())},this.$$parseAndValidate=function(){var t=v.$$lastCommittedViewValue;if(h=!T(t)||n)for(var i=0;i<v.$parsers.length;i++)if(T(t=v.$parsers[i](t))){h=!1;break}F(v.$modelValue)&&isNaN(v.$modelValue)&&(v.$modelValue=p(e));var r=v.$modelValue,s=v.$options&&v.$options.allowInvalid;function o(){v.$modelValue!==r&&v.$$writeModelToScope()}v.$$rawModelValue=t,s&&(v.$modelValue=t,o()),v.$$runValidators(t,v.$$lastCommittedViewValue,(function(e){s||(v.$modelValue=e?t:n,o())}))},this.$$writeModelToScope=function(){g(e,v.$modelValue),y(v.$viewChangeListeners,(function(e){try{e()}catch(e){t(e)}}))},this.$setViewValue=function(e,t){v.$viewValue=e,v.$options&&!v.$options.updateOnDefault||v.$$debounceViewValueCommit(t)},this.$$debounceViewValueCommit=function(t){var n,i=0,r=v.$options;r&&P(r.debounce)&&(F(n=r.debounce)?i=n:F(n[t])?i=n[t]:F(n.default)&&(i=n.default)),a.cancel(m),i?m=a((function(){v.$commitViewValue()}),i):l.$$phase?v.$commitViewValue():e.$apply((function(){v.$commitViewValue()}))},e.$watch((function(){var t=p(e);if(t!==v.$modelValue&&(v.$modelValue==v.$modelValue||t==t)){v.$modelValue=v.$$rawModelValue=t,h=n;for(var i=v.$formatters,r=i.length,s=t;r--;)s=i[r](s);v.$viewValue!==s&&(v.$viewValue=v.$$lastCommittedViewValue=s,v.$render(),v.$$runValidators(t,s,_))}return t}))}],Ir=["$rootScope",function(e){return{restrict:"A",require:["ngModel","^?form","^?ngModelOptions"],controller:Pr,priority:1,compile:function(t){return t.addClass(Er).addClass(_r).addClass(kr),{pre:function(e,t,n,i){var r=i[0],s=i[1]||Di;r.$$setOptions(i[2]&&i[2].$options),s.$addControl(r),n.$observe("name",(function(e){r.$name!==e&&s.$$renameControl(r,e)})),e.$on("$destroy",(function(){s.$removeControl(r)}))},post:function(t,n,i,r){var s=r[0];s.$options&&s.$options.updateOn&&n.on(s.$options.updateOn,(function(e){s.$$debounceViewValueCommit(e&&e.type)})),n.on("blur",(function(n){s.$touched||(e.$$phase?t.$evalAsync(s.$setTouched):t.$apply(s.$setTouched))}))}}}}}],Or=/(\s+|^)default(\s+|$)/,Fr=function(){return{restrict:"A",controller:["$scope","$attrs",function(e,t){var i=this;this.$options=e.$eval(t.ngModelOptions),this.$options.updateOn!==n?(this.$options.updateOnDefault=!1,this.$options.updateOn=z(this.$options.updateOn.replace(Or,(function(){return i.$options.updateOnDefault=!0," "})))):this.$options.updateOnDefault=!0}]}};function Dr(e){var t=e.ctrl,i=e.$element,r={},s=e.set,o=e.unset,a=e.parentForm,l=e.$animate;function c(e,t){t&&!r[e]?(l.addClass(i,e),r[e]=!0):!t&&r[e]&&(l.removeClass(i,e),r[e]=!1)}function u(e,t){e=e?"-"+$e(e,"-"):"",c(kr+e,!0===t),c(Ar+e,!1===t)}r[Ar]=!(r[kr]=i.hasClass(kr)),t.$setValidity=function(e,i,r){i===n?function(e,n,i){t[e]||(t[e]={});s(t[e],n,i)}("$pending",e,r):function(e,i,r){t[e]&&o(t[e],i,r);Nr(t[e])&&(t[e]=n)}("$pending",e,r);W(i)?i?(o(t.$error,e,r),s(t.$$success,e,r)):(s(t.$error,e,r),o(t.$$success,e,r)):(o(t.$error,e,r),o(t.$$success,e,r));t.$pending?(c(Lr,!0),t.$valid=t.$invalid=n,u("",null)):(c(Lr,!1),t.$valid=Nr(t.$error),t.$invalid=!t.$valid,u("",t.$valid));var l;l=t.$pending&&t.$pending[e]?n:!t.$error[e]&&(!!t.$$success[e]||null);u(e,l),a.$setValidity(e,l,t)}}function Nr(e){if(e)for(var t in e)return!1;return!0}var jr,Br=Ii({terminal:!0,priority:1e3}),Ur=["$locale","$interpolate",function(e,t){var n=/{}/g,i=/^when(Minus)?(.+)$/;return{restrict:"EA",link:function(r,s,a){var l,c=a.count,u=a.$attr.when&&s.attr(a.$attr.when),h=a.offset||0,d=r.$eval(u)||{},f={},p=t.startSymbol(),g=t.endSymbol(),m=p+c+"-"+h+g,v=$.noop;function b(e){s.text(e||"")}y(a,(function(e,t){var n=i.exec(t);if(n){var r=(n[1]?"-":"")+o(n[2]);d[r]=s.attr(a.$attr[t])}})),y(d,(function(e,i){f[i]=t(e.replace(n,m))})),r.$watch(c,(function(t){var n=parseFloat(t),i=isNaN(n);i||n in d||(n=e.pluralCat(n-h)),n===l||i&&isNaN(l)||(v(),v=r.$watch(f[n],b),l=n)}))}}}],Hr=["$parse","$animate",function(e,r){var s="$$NG_REMOVED",o=i("ngRepeat"),a=function(e,t,n,i,r,s,o){e[n]=i,r&&(e[r]=s),e.$index=t,e.$first=0===t,e.$last=t===o-1,e.$middle=!(e.$first||e.$last),e.$odd=!(e.$even=0==(1&t))},l=function(e){return e.clone[0]},c=function(e){return e.clone[e.clone.length-1]};return{restrict:"A",multiElement:!0,transclude:"element",priority:1e3,terminal:!0,$$tlb:!0,compile:function(i,h){var d=h.ngRepeat,f=t.createComment(" end ngRepeat: "+d+" "),p=d.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+track\s+by\s+([\s\S]+?))?\s*$/);if(!p)throw o("iexp","Expected expression in form of '_item_ in _collection_[ track by _id_]' but got '{0}'.",d);var g=p[1],m=p[2],v=p[3],$=p[4];if(!(p=g.match(/^(?:(\s*[\$\w]+)|\(\s*([\$\w]+)\s*,\s*([\$\w]+)\s*\))$/)))throw o("iidexp","'_item_' in '_item_ in _collection_' should be an identifier or '(_key_, _value_)' expression, but got '{0}'.",g);var b,S,C,x,k=p[3]||p[1],A=p[2];if(v&&(!/^[$a-zA-Z_][$a-zA-Z0-9_]*$/.test(v)||/^(null|undefined|this|\$index|\$first|\$middle|\$last|\$even|\$odd|\$parent|\$root|\$id)$/.test(v)))throw o("badident","alias '{0}' is invalid --- must be a valid JS identifier which is not a reserved name.",v);var E={$id:$t};return $?b=e($):(C=function(e,t){return $t(t)},x=function(e){return e}),function(e,t,i,h,p){b&&(S=function(t,n,i){return A&&(E[A]=t),E[k]=n,E.$index=i,b(e,E)});var g=Ae();e.$watchCollection(m,(function(i){var h,m,$,b,E,R,_,M,L,T,P,I,O=t[0],F=Ae();if(v&&(e[v]=i),w(i))L=i,M=S||C;else{for(var D in M=S||x,L=[],i)i.hasOwnProperty(D)&&"$"!=D.charAt(0)&&L.push(D);L.sort()}for(b=L.length,P=new Array(b),h=0;h<b;h++)if(E=i===L?h:L[h],R=i[E],_=M(E,R,h),g[_])T=g[_],delete g[_],F[_]=T,P[h]=T;else{if(F[_])throw y(P,(function(e){e&&e.scope&&(g[e.id]=e)})),o("dupes","Duplicates in a repeater are not allowed. Use 'track by' expression to specify unique keys. Repeater: {0}, Duplicate key: {1}, Duplicate value: {2}",d,_,R);P[h]={id:_,scope:n,clone:n},F[_]=!0}for(var N in g){if(I=ke((T=g[N]).clone),r.leave(I),I[0].parentNode)for(h=0,m=I.length;h<m;h++)I[h][s]=!0;T.scope.$destroy()}for(h=0;h<b;h++)if(E=i===L?h:L[h],R=i[E],(T=P[h]).scope){$=O;do{$=$.nextSibling}while($&&$[s]);l(T)!=$&&r.move(ke(T.clone),null,u(O)),O=c(T),a(T.scope,h,k,R,A,E,b)}else p((function(e,t){T.scope=t;var n=f.cloneNode(!1);e[e.length++]=n,r.enter(e,null,u(O)),O=n,T.clone=e,F[T.id]=T,a(T.scope,h,k,R,A,E,b)}));g=F}))}}}}],Wr="ng-hide",Vr="ng-hide-animate",zr=["$animate",function(e){return{restrict:"A",multiElement:!0,link:function(t,n,i){t.$watch(i.ngShow,(function(t){e[t?"removeClass":"addClass"](n,Wr,{tempClasses:Vr})}))}}}],qr=["$animate",function(e){return{restrict:"A",multiElement:!0,link:function(t,n,i){t.$watch(i.ngHide,(function(t){e[t?"addClass":"removeClass"](n,Wr,{tempClasses:Vr})}))}}}],Kr=Ii((function(e,t,n){e.$watch(n.ngStyle,(function(e,n){n&&e!==n&&y(n,(function(e,n){t.css(n,"")})),e&&t.css(e)}),!0)})),Gr=["$animate",function(e){return{restrict:"EA",require:"ngSwitch",controller:["$scope",function(){this.cases={}}],link:function(n,i,r,s){var o=r.ngSwitch||r.on,a=[],l=[],c=[],u=[],h=function(e,t){return function(){e.splice(t,1)}};n.$watch(o,(function(n){var i,r;for(i=0,r=c.length;i<r;++i)e.cancel(c[i]);for(c.length=0,i=0,r=u.length;i<r;++i){var o=ke(l[i].clone);u[i].$destroy(),(c[i]=e.leave(o)).then(h(c,i))}l.length=0,u.length=0,(a=s.cases["!"+n]||s.cases["?"])&&y(a,(function(n){n.transclude((function(i,r){u.push(r);var s=n.element;i[i.length++]=t.createComment(" end ngSwitchWhen: ");var o={clone:i};l.push(o),e.enter(i,s.parent(),s)}))}))}))}}}],Qr=Ii({transclude:"element",priority:1200,require:"^ngSwitch",multiElement:!0,link:function(e,t,n,i,r){i.cases["!"+n.ngSwitchWhen]=i.cases["!"+n.ngSwitchWhen]||[],i.cases["!"+n.ngSwitchWhen].push({transclude:r,element:t})}}),Jr=Ii({transclude:"element",priority:1200,require:"^ngSwitch",multiElement:!0,link:function(e,t,n,i,r){i.cases["?"]=i.cases["?"]||[],i.cases["?"].push({transclude:r,element:t})}}),Yr=Ii({restrict:"EAC",link:function(e,t,n,r,s){if(!s)throw i("ngTransclude")("orphan","Illegal use of ngTransclude directive in the template! No parent directive that requires a transclusion found. Element: {0}",oe(t));s((function(e){t.empty(),t.append(e)}))}}),Xr=["$templateCache",function(e){return{restrict:"E",terminal:!0,compile:function(t,n){if("text/ng-template"==n.type){var i=n.id,r=t[0].text;e.put(i,r)}}}}],Zr=i("ngOptions"),es=L({restrict:"A",terminal:!0}),ts=["$compile","$parse",function(e,i){var r=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,s={$setViewValue:_};return{restrict:"E",require:["select","?ngModel"],controller:["$element","$scope","$attrs",function(e,t,n){var i,r=this,o={},a=s;r.databound=n.ngModel,r.init=function(e,t,n){a=e,t,i=n},r.addOption=function(t,n){Ce(t,'"option value"'),o[t]=!0,a.$viewValue==t&&(e.val(t),i.parent()&&i.remove()),n&&n[0].hasAttribute("selected")&&(n[0].selected=!0)},r.removeOption=function(e){this.hasOption(e)&&(delete o[e],a.$viewValue===e&&this.renderUnknownOption(e))},r.renderUnknownOption=function(t){var n="? "+$t(t)+" ?";i.val(n),e.prepend(i),e.val(n),i.prop("selected",!0)},r.hasOption=function(e){return o.hasOwnProperty(e)},t.$on("$destroy",(function(){r.renderUnknownOption=_}))}],link:function(s,o,a,l){if(l[1]){for(var h,d=l[0],f=l[1],p=a.multiple,g=a.ngOptions,m=!1,v=!1,$=u(t.createElement("option")),b=u(t.createElement("optgroup")),w=$.clone(),C=0,x=o.children(),k=x.length;C<k;C++)if(""===x[C].value){h=m=x.eq(C);break}d.init(f,m,w),p&&(f.$isEmpty=function(e){return!e||0===e.length}),g?function(t,s,o){var a;if(!(a=g.match(r)))throw Zr("iexp","Expected expression in form of '_select_ (as _label_)? for (_key_,)?_value_ in _collection_' but got '{0}'. Element: {1}",g,oe(s));var l=i(a[2]||a[1]),u=a[4]||a[6],h=/ as /.test(a[0])&&a[1],f=h?i(h):null,w=a[5],C=i(a[3]||""),x=i(a[2]?a[1]:u),k=i(a[7]),A=a[8]?i(a[8]):null,E={},R=[[{element:s,label:""}]],_={};m&&(e(m)(t),m.removeClass("ng-scope"),m.remove());s.empty(),s.on("change",L),o.$render=D,t.$watchCollection(k,O),t.$watchCollection(I,O),p&&t.$watchCollection((function(){return o.$modelValue}),O);function M(e,n,i){return _[u]=i,w&&(_[w]=n),e(t,_)}function L(){t.$apply((function(){var e,n=k(t)||[];if(p)e=[],y(s.val(),(function(t){t=A?E[t]:t,e.push(T(t,n[t]))}));else{var i=A?E[s.val()]:s.val();e=T(i,n[i])}o.$setViewValue(e),D()}))}function T(e,t){return"?"===e?n:""===e?null:M(f||x,e,t)}function I(){var e,n=k(t);if(n&&N(n)){e=new Array(n.length);for(var i=0,r=n.length;i<r;i++)e[i]=M(l,i,n[i]);return e}if(n)for(var s in e={},n)n.hasOwnProperty(s)&&(e[s]=M(l,s,n[s]));return e}function O(){v||(t.$$postDigest(D),v=!0)}function F(e,t,n){e[t]=e[t]||0,e[t]+=n?1:-1}function D(){v=!1;var e,n,i,r,a,u,h,g,L,T,I,O,D,j,B,U,H,W={"":[]},V=[""],z=o.$viewValue,q=k(t)||[],K=w?S(q):q,G={},Q=function(e){var t;if(p)if(A&&N(e)){t=new bt([]);for(var n=0;n<e.length;n++)t.put(M(A,null,e[n]),!0)}else t=new bt(e);else A&&(e=M(A,null,e));return function(n,i){var r;return r=A||f||x,p?P(t.remove(M(r,n,i))):e===M(r,n,i)}}(z),J=!1;for(E={},O=0;O<(T=K.length);O++)h=O,w&&"$"===(h=K[O]).charAt(0)||(g=q[h],(n=W[e=M(C,h,g)||""])||(n=W[e]=[],V.push(e)),D=Q(h,g),J=J||D,U=P(U=M(l,h,g))?U:"",H=A?A(t,_):w?K[O]:O,A&&(E[H]=h),n.push({id:H,label:U,selected:D}));for(p||(m||null===z?W[""].unshift({id:"",label:"",selected:!J}):J||W[""].unshift({id:"?",label:"",selected:!0})),I=0,L=V.length;I<L;I++){for(n=W[e=V[I]],R.length<=I?(a=[r={element:b.clone().attr("label",e),label:n.label}],R.push(a),s.append(r.element)):(r=(a=R[I])[0]).label!=e&&r.element.attr("label",r.label=e),j=null,O=0,T=n.length;O<T;O++)i=n[O],(u=a[O+1])?(j=u.element,u.label!==i.label&&(F(G,u.label,!1),F(G,i.label,!0),j.text(u.label=i.label),j.prop("label",u.label)),u.id!==i.id&&j.val(u.id=i.id),j[0].selected!==i.selected&&(j.prop("selected",u.selected=i.selected),c&&j.prop("selected",u.selected))):(""===i.id&&m?B=m:(B=$.clone()).val(i.id).prop("selected",i.selected).attr("selected",i.selected).prop("label",i.label).text(i.label),a.push(u={element:B,label:i.label,id:i.id,selected:i.selected}),F(G,i.label,!0),j?j.after(B):r.element.append(B),j=B);for(O++;a.length>O;)F(G,(i=a.pop()).label,!1),i.element.remove()}for(;R.length>I;){for(n=R.pop(),O=1;O<n.length;++O)F(G,n[O].label,!1);n[0].element.remove()}y(G,(function(e,t){e>0?d.addOption(t):e<0&&d.removeOption(t)}))}}(s,o,f):p?function(e,t,n){var i;n.$render=function(){var e=new bt(n.$viewValue);y(t.find("option"),(function(t){t.selected=P(e.get(t.value))}))},e.$watch((function(){X(i,n.$viewValue)||(i=Y(n.$viewValue),n.$render())})),t.on("change",(function(){e.$apply((function(){var e=[];y(t.find("option"),(function(t){t.selected&&e.push(t.value)})),n.$setViewValue(e)}))}))}(s,o,f):function(e,t,n,i){n.$render=function(){var e=n.$viewValue;i.hasOption(e)?(w.parent()&&w.remove(),t.val(e),""===e&&h.prop("selected",!0)):null==e&&h?t.val(""):i.renderUnknownOption(e)},t.on("change",(function(){e.$apply((function(){w.parent()&&w.remove(),n.$setViewValue(t.val())}))}))}(s,o,f,d)}}}}],ns=["$interpolate",function(e){var t={addOption:_,removeOption:_};return{restrict:"E",priority:100,compile:function(n,i){if(T(i.value)){var r=e(n.text(),!0);r||i.$set("value",n.text())}return function(e,n,i){var s="$selectController",o=n.parent(),a=o.data(s)||o.parent().data(s);a&&a.databound||(a=t),r?e.$watch(r,(function(e,t){i.$set("value",e),t!==e&&a.removeOption(t),a.addOption(e,n)})):a.addOption(i.value,n),n.on("$destroy",(function(){a.removeOption(i.value)}))}}}}],is=L({restrict:"E",terminal:!1}),rs=function(){return{restrict:"A",require:"?ngModel",link:function(e,t,n,i){i&&(n.required=!0,i.$validators.required=function(e,t){return!n.required||!i.$isEmpty(t)},n.$observe("required",(function(){i.$validate()})))}}},ss=function(){return{restrict:"A",require:"?ngModel",link:function(e,t,r,s){if(s){var o,a=r.ngPattern||r.pattern;r.$observe("pattern",(function(e){if(O(e)&&e.length>0&&(e=new RegExp("^"+e+"$")),e&&!e.test)throw i("ngPattern")("noregexp","Expected {0} to be a RegExp but was {1}. Element: {2}",a,e,oe(t));o=e||n,s.$validate()})),s.$validators.pattern=function(e,t){return s.$isEmpty(t)||T(o)||o.test(t)}}}}},os=function(){return{restrict:"A",require:"?ngModel",link:function(e,t,n,i){if(i){var r=-1;n.$observe("maxlength",(function(e){var t=E(e);r=isNaN(t)?-1:t,i.$validate()})),i.$validators.maxlength=function(e,t){return r<0||i.$isEmpty(t)||t.length<=r}}}}},as=function(){return{restrict:"A",require:"?ngModel",link:function(e,t,n,i){if(i){var r=0;n.$observe("minlength",(function(e){r=E(e)||0,i.$validate()})),i.$validators.minlength=function(e,t){return i.$isEmpty(t)||t.length>=r}}}}};e.angular.bootstrap?console.log("WARNING: Tried to load angular more than once."):(we||((h=e.jQuery)&&h.fn.on?(u=h,A(h.fn,{scope:dt.scope,isolateScope:dt.isolateScope,controller:dt.controller,injector:dt.injector,inheritedData:dt.inheritedData}),jr=h.cleanData,h.cleanData=function(e){var t;if(be)be=!1;else for(var n,i=0;null!=(n=e[i]);i++)(t=h._data(n,"events"))&&t.$destroy&&h(n).triggerHandler("$destroy");jr(e)}):u=Ye,$.element=u,we=!0),function(t){A(t,{bootstrap:pe,copy:J,extend:A,equals:X,element:u,forEach:y,injector:kt,noop:_,bind:ne,toJson:re,fromJson:se,identity:M,isUndefined:T,isDefined:P,isString:O,isFunction:j,isObject:I,isNumber:F,isElement:K,isArray:N,version:Pe,isDate:D,lowercase:o,uppercase:l,callbacks:{counter:0},getTestability:me,$$minErr:i,$$csp:Z,reloadWithDebugInfo:ge}),d=function(e){var t=i("$injector"),n=i("ng");function r(e,t,n){return e[t]||(e[t]=n())}var s=r(e,"angular",Object);return s.$$minErr=s.$$minErr||i,r(s,"module",(function(){var e={};return function(i,s,o){return function(e,t){if("hasOwnProperty"===e)throw n("badname","hasOwnProperty is not a valid {0} name","module")}(i),s&&e.hasOwnProperty(i)&&(e[i]=null),r(e,i,(function(){if(!s)throw t("nomod","Module '{0}' is not available! You either misspelled the module name or forgot to load it. If registering a module ensure that you specify the dependencies as the second argument.",i);var e=[],n=[],r=[],a=c("$injector","invoke","push",n),l={_invokeQueue:e,_configBlocks:n,_runBlocks:r,requires:s,name:i,provider:c("$provide","provider"),factory:c("$provide","factory"),service:c("$provide","service"),value:c("$provide","value"),constant:c("$provide","constant","unshift"),animation:c("$animateProvider","register"),filter:c("$filterProvider","register"),controller:c("$controllerProvider","register"),directive:c("$compileProvider","directive"),config:a,run:function(e){return r.push(e),this}};return o&&a(o),l;function c(t,n,i,r){return r||(r=e),function(){return r[i||"push"]([t,n,arguments]),l}}}))}}))}(e);try{d("ngLocale")}catch(e){d("ngLocale",[]).provider("$locale",an)}d("ng",["ngLocale"],["$provide",function(e){e.provider({$$sanitizeUri:Yn}),e.provider("$compile",Ot).directive({a:Oi,input:sr,textarea:sr,form:Ui,script:Xr,select:ts,style:is,option:ns,ngBind:lr,ngBindHtml:ur,ngBindTemplate:cr,ngClass:fr,ngClassEven:gr,ngClassOdd:pr,ngCloak:mr,ngController:vr,ngForm:Hi,ngHide:qr,ngIf:wr,ngInclude:yr,ngInit:Cr,ngNonBindable:Br,ngPluralize:Ur,ngRepeat:Hr,ngShow:zr,ngStyle:Kr,ngSwitch:Gr,ngSwitchWhen:Qr,ngSwitchDefault:Jr,ngOptions:es,ngTransclude:Yr,ngModel:Ir,ngList:xr,ngChange:hr,pattern:ss,ngPattern:ss,required:rs,ngRequired:rs,minlength:as,ngMinlength:as,maxlength:os,ngMaxlength:os,ngValue:ar,ngModelOptions:Fr}).directive({ngInclude:Sr}).directive(Fi).directive($r),e.provider({$anchorScroll:At,$animate:Rt,$browser:Lt,$cacheFactory:Tt,$controller:Ut,$document:Ht,$exceptionHandler:Wt,$filter:di,$interpolate:sn,$interval:on,$http:en,$httpBackend:nn,$location:Cn,$log:xn,$parse:zn,$rootScope:Jn,$q:qn,$$q:Kn,$sce:ni,$sceDelegate:ti,$sniffer:ii,$templateCache:Pt,$templateRequest:ri,$$testability:si,$timeout:oi,$window:hi,$$rAF:Qn,$$asyncCallback:_t,$$jqLite:vt})}])}($),u(t).ready((function(){fe(t,pe)})))}(window,document),!window.angular.$$csp()&&window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}</style>'),define("angular",function(e){return function(){return e.angular}}(this)),
-/**
- * State-based routing for AngularJS
- * @version v0.2.18
- * @link http://angular-ui.github.com/
- * @license MIT License, http://www.opensource.org/licenses/MIT
- */
-"undefined"!=typeof module&&"undefined"!=typeof exports&&module.exports===exports&&(module.exports="ui.router"),function(e,t,n){var i,r=t.isDefined,s=t.isFunction,o=t.isString,a=t.isObject,l=t.isArray,c=t.forEach,u=t.extend,h=t.copy,d=t.toJson;function f(e,t){return u(new(u((function(){}),{prototype:e})),t)}function p(e){return c(arguments,(function(t){t!==e&&c(t,(function(t,n){e.hasOwnProperty(n)||(e[n]=t)}))})),e}function g(e){if(Object.keys)return Object.keys(e);var t=[];return c(e,(function(e,n){t.push(n)})),t}function m(e,t){if(Array.prototype.indexOf)return e.indexOf(t,Number(arguments[2])||0);var n=e.length>>>0,i=Number(arguments[2])||0;for((i=i<0?Math.ceil(i):Math.floor(i))<0&&(i+=n);i<n;i++)if(i in e&&e[i]===t)return i;return-1}function v(e,t,n,i){var r,s=function(e,t){var n=[];for(var i in e.path){if(e.path[i]!==t.path[i])break;n.push(e.path[i])}return n}(n,i),o={},a=[];for(var l in s)if(s[l]&&s[l].params&&(r=g(s[l].params)).length)for(var c in r)m(a,r[c])>=0||(a.push(r[c]),o[r[c]]=e[r[c]]);return u({},o,t)}function $(e,t,n){if(!n)for(var i in n=[],e)n.push(i);for(var r=0;r<n.length;r++){var s=n[r];if(e[s]!=t[s])return!1}return!0}function b(e,t){var n={};return c(e,(function(e){n[e]=t[e]})),n}function w(e){var t={},n=Array.prototype.concat.apply(Array.prototype,Array.prototype.slice.call(arguments,1));return c(n,(function(n){n in e&&(t[n]=e[n])})),t}function y(e){var t={},n=Array.prototype.concat.apply(Array.prototype,Array.prototype.slice.call(arguments,1));for(var i in e)-1==m(n,i)&&(t[i]=e[i]);return t}function S(e,t){var n=l(e),i=n?[]:{};return c(e,(function(e,r){t(e,r)&&(i[n?i.length:r]=e)})),i}function C(e,t){var n=l(e)?[]:{};return c(e,(function(e,i){n[i]=t(e,i)})),n}function x(e,t){var i={},s=[],l=i,h=u(e.when(i),{$$promises:i,$$values:i});this.study=function(i){if(!a(i))throw new Error("'invocables' must be an object");var d=g(i||{}),f=[],v=[],$={};function b(e){return a(e)&&e.then&&e.$$promises}return c(i,(function e(n,r){if(2!==$[r]){if(v.push(r),1===$[r])throw v.splice(0,m(v,r)),new Error("Cyclic dependency: "+v.join(" -> "));if($[r]=1,o(n))f.push(r,[function(){return t.get(n)}],s);else{var a=t.annotate(n);c(a,(function(t){t!==r&&i.hasOwnProperty(t)&&e(i[t],t)})),f.push(r,n,a)}v.pop(),$[r]=2}})),i=v=$=null,function(i,s,o){if(b(i)&&o===n&&(o=s,s=i,i=null),i){if(!a(i))throw new Error("'locals' must be an object")}else i=l;if(s){if(!b(s))throw new Error("'parent' must be a promise returned by $resolve.resolve()")}else s=h;var g=e.defer(),m=g.promise,v=m.$$promises={},$=u({},i),w=1+f.length/3,S=!1;function C(){--w||(S||p($,s.$$values),m.$$values=$,m.$$promises=m.$$promises||!0,delete m.$$inheritedValues,g.resolve($))}function x(e){m.$$failure=e,g.reject(e)}if(r(s.$$failure))return x(s.$$failure),m;s.$$inheritedValues&&p($,y(s.$$inheritedValues,d)),u(v,s.$$promises),s.$$values?(S=p($,y(s.$$values,d)),m.$$inheritedValues=y(s.$$values,d),C()):(s.$$inheritedValues&&(m.$$inheritedValues=y(s.$$inheritedValues,d)),s.then(C,x));for(var k=0,A=f.length;k<A;k+=3)i.hasOwnProperty(f[k])?C():E(f[k],f[k+1],f[k+2]);function E(n,s,a){var l=e.defer(),u=0;function h(e){l.reject(e),x(e)}function d(){if(!r(m.$$failure))try{l.resolve(t.invoke(s,o,$)),l.promise.then((function(e){$[n]=e,C()}),h)}catch(e){h(e)}}c(a,(function(e){v.hasOwnProperty(e)&&!i.hasOwnProperty(e)&&(u++,v[e].then((function(t){$[e]=t,--u||d()}),h))})),u||d(),v[n]=l.promise}return m}},this.resolve=function(e,t,n,i){return this.study(e)(t,n,i)}}function k(e,t,n){this.fromConfig=function(e,t,n){return r(e.template)?this.fromString(e.template,t):r(e.templateUrl)?this.fromUrl(e.templateUrl,t):r(e.templateProvider)?this.fromProvider(e.templateProvider,t,n):null},this.fromString=function(e,t){return s(e)?e(t):e},this.fromUrl=function(n,i){return s(n)&&(n=n(i)),null==n?null:e.get(n,{cache:t,headers:{Accept:"text/html"}}).then((function(e){return e.data}))},this.fromProvider=function(e,t,i){return n.invoke(e,null,i||{params:t})}}function A(e,t,r){t=u({params:{}},a(t)?t:{});var s,o,l,c,h=/([:*])([\w\[\]]+)|\{([\w\[\]]+)(?:\:\s*((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g,d=/([:]?)([\w\[\].-]+)|\{([\w\[\].-]+)(?:\:\s*((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g,p="^",g=0,m=this.segments=[],v=r?r.params:{},$=this.params=r?r.params.$$new():new i.ParamSet,b=[];function w(t,n,r,s){if(b.push(t),v[t])return v[t];if(!/^\w+([-.]+\w+)*(?:\[\])?$/.test(t))throw new Error("Invalid parameter name '"+t+"' in pattern '"+e+"'");if($[t])throw new Error("Duplicate parameter name '"+t+"' in pattern '"+e+"'");return $[t]=new i.Param(t,n,r,s),$[t]}function y(e,t,n,i){var r=["",""],s=e.replace(/[\\\[\]\^$*+?.()|{}]/g,"\\$&");if(!t)return s;switch(n){case!1:r=["(",")"+(i?"?":"")];break;case!0:s=s.replace(/\/$/,""),r=["(?:/(",")|/)?"];break;default:r=["("+n+"|",")?"]}return s+r[0]+t+r[1]}function S(r,s){var o,a,l,c,u;return o=r[2]||r[3],u=t.params[o],l=e.substring(g,r.index),(a=s?r[4]:r[4]||("*"==r[1]?".*":null))&&(c=i.type(a)||f(i.type("string"),{pattern:new RegExp(a,t.caseInsensitive?"i":n)})),{id:o,regexp:a,segment:l,type:c,cfg:u}}for(this.source=e;(s=h.exec(e))&&!((o=S(s,!1)).segment.indexOf("?")>=0);)l=w(o.id,o.type,o.cfg,"path"),p+=y(o.segment,l.type.pattern.source,l.squash,l.isOptional),m.push(o.segment),g=h.lastIndex;var C=(c=e.substring(g)).indexOf("?");if(C>=0){var x=this.sourceSearch=c.substring(C);if(c=c.substring(0,C),this.sourcePath=e.substring(0,g+C),x.length>0)for(g=0;s=d.exec(x);)l=w((o=S(s,!0)).id,o.type,o.cfg,"search"),g=h.lastIndex}else this.sourcePath=e,this.sourceSearch="";p+=y(c)+(!1===t.strict?"/?":"")+"$",m.push(c),this.regexp=new RegExp(p,t.caseInsensitive?"i":n),this.prefix=m[0],this.$$paramNames=b}function E(e){u(this,e)}function R(e,i){var a,c=[],h=null,d=!1;function f(e,t,n){if(!n)return!1;var i=e.invoke(t,t,{$match:n});return!r(i)||i}function p(i,r,s,l,u){var f,p=l.baseHref(),g=i.url();function m(e){if(!e||!e.defaultPrevented){f&&i.url();f=n;var t,r=c.length;for(t=0;t<r;t++)if(a(c[t]))return;h&&a(h)}function a(e){var t=e(s,i);return!!t&&(o(t)&&i.replace().url(t),!0)}}function v(){return a=a||r.$on("$locationChangeSuccess",m)}return d||v(),{sync:function(){m()},listen:function(){return v()},update:function(e){e?g=i.url():i.url()!==g&&(i.url(g),i.replace())},push:function(e,t,r){var s=e.format(t||{});null!==s&&t&&t["#"]&&(s+="#"+t["#"]),i.url(s),f=r&&r.$$avoidResync?i.url():n,r&&r.replace&&i.replace()},href:function(n,r,s){if(!n.validates(r))return null;var o=e.html5Mode();t.isObject(o)&&(o=o.enabled),o=o&&u.history;var a=n.format(r);if(s=s||{},o||null===a||(a="#"+e.hashPrefix()+a),null!==a&&r&&r["#"]&&(a+="#"+r["#"]),a=function(e,t,n){return"/"===p?e:t?p.slice(0,-1)+e:n?p.slice(1)+e:e}(a,o,s.absolute),!s.absolute||!a)return a;var l=!o&&a?"/":"",c=i.port();return c=80===c||443===c?"":":"+c,[i.protocol(),"://",i.host(),c,l,a].join("")}}}this.rule=function(e){if(!s(e))throw new Error("'rule' must be a function");return c.push(e),this},this.otherwise=function(e){if(o(e)){var t=e;e=function(){return t}}else if(!s(e))throw new Error("'rule' must be a function");return h=e,this},this.when=function(e,t){var n,r=o(t);if(o(e)&&(e=i.compile(e)),!r&&!s(t)&&!l(t))throw new Error("invalid 'handler' in when()");var a={matcher:function(e,t){return r&&(n=i.compile(t),t=["$match",function(e){return n.format(e)}]),u((function(n,i){return f(n,t,e.exec(i.path(),i.search()))}),{prefix:o(e.prefix)?e.prefix:""})},regex:function(e,t){if(e.global||e.sticky)throw new Error("when() RegExp must not be global or sticky");return r&&(n=t,t=["$match",function(e){return t=e,n.replace(/\$(\$|\d{1,2})/,(function(e,n){return t["$"===n?0:Number(n)]}));var t}]),u((function(n,i){return f(n,t,e.exec(i.path()))}),{prefix:(i=e,s=/^\^((?:\\[^a-zA-Z0-9]|[^\\\[\]\^$*+?.()|{}]+)*)/.exec(i.source),null!=s?s[1].replace(/\\(.)/g,"$1"):"")});var i,s}},c={matcher:i.isMatcher(e),regex:e instanceof RegExp};for(var h in c)if(c[h])return this.rule(a[h](e,t));throw new Error("invalid 'what' in when()")},this.deferIntercept=function(e){e===n&&(e=!0),d=e},this.$get=p,p.$inject=["$location","$rootScope","$injector","$browser","$sniffer"]}function _(e,d){var p,y,S={},x={},k="abstract",A={parent:function(e){if(r(e.parent)&&e.parent)return E(e.parent);var t=/^(.+)\.[^.]+$/.exec(e.name);return t?E(t[1]):p},data:function(e){return e.parent&&e.parent.data&&(e.data=e.self.data=f(e.parent.data,e.data)),e.data},url:function(e){var t=e.url,n={params:e.params||{}};if(o(t))return"^"==t.charAt(0)?d.compile(t.substring(1),n):(e.parent.navigable||p).url.concat(t,n);if(!t||d.isMatcher(t))return t;throw new Error("Invalid url '"+t+"' in state '"+e+"'")},navigable:function(e){return e.url?e:e.parent?e.parent.navigable:null},ownParams:function(e){var t=e.url&&e.url.params||new i.ParamSet;return c(e.params||{},(function(e,n){t[n]||(t[n]=new i.Param(n,null,e,"config"))})),t},params:function(e){var t=w(e.ownParams,e.ownParams.$$keys());return e.parent&&e.parent.params?u(e.parent.params.$$new(),t):new i.ParamSet},views:function(e){var t={};return c(r(e.views)?e.views:{"":e},(function(n,i){i.indexOf("@")<0&&(i+="@"+e.parent.name),t[i]=n})),t},path:function(e){return e.parent?e.parent.path.concat(e):[]},includes:function(e){var t=e.parent?u({},e.parent.includes):{};return t[e.name]=!0,t},$delegates:{}};function E(e,t){if(!e)return n;var i,r=o(e),s=r?e:e.name;if(0===(i=s).indexOf(".")||0===i.indexOf("^")){if(!t)throw new Error("No reference point given for path '"+s+"'");t=E(t);for(var a=s.split("."),l=0,c=a.length,u=t;l<c;l++)if(""!==a[l]||0!==l){if("^"!==a[l])break;if(!u.parent)throw new Error("Path '"+s+"' not valid for state '"+t.name+"'");u=u.parent}else u=t;a=a.slice(l).join("."),s=u.name+(u.name&&a?".":"")+a}var h=S[s];return!h||!r&&(r||h!==e&&h.self!==e)?n:h}function R(t){var n=(t=f(t,{self:t,resolve:t.resolve||{},toString:function(){return this.name}})).name;if(!o(n)||n.indexOf("@")>=0)throw new Error("State must have a valid name");if(S.hasOwnProperty(n))throw new Error("State '"+n+"' is already defined");var i=-1!==n.indexOf(".")?n.substring(0,n.lastIndexOf(".")):o(t.parent)?t.parent:a(t.parent)&&o(t.parent.name)?t.parent.name:"";if(i&&!S[i])return function(e,t){x[e]||(x[e]=[]),x[e].push(t)}(i,t.self);for(var r in A)s(A[r])&&(t[r]=A[r](t,A.$delegates[r]));return S[n]=t,!t[k]&&t.url&&e.when(t.url,["$match","$stateParams",function(e,n){y.$current.navigable==t&&$(e,n)||y.transitionTo(t,e,{inherit:!0,location:!1})}]),function(e){for(var t=x[e]||[];t.length;)R(t.shift())}(n),t}function _(e,d,x,A,R,_,M,L,T){var P=d.reject(new Error("transition superseded")),I=d.reject(new Error("transition prevented")),O=d.reject(new Error("transition aborted")),F=d.reject(new Error("transition failed"));function D(e,n,i,r,o,a){var u=i?n:b(e.params.$$keys(),n),h={$stateParams:u};o.resolve=R.resolve(e.resolve,h,o.resolve,e);var f=[o.resolve.then((function(e){o.globals=e}))];return r&&f.push(r),d.all(f).then((function(){var n=[];return c(e.views,(function(i,r){var c=i.resolve&&i.resolve!==e.resolve?i.resolve:{};c.$template=[function(){return x.load(r,{view:i,locals:o.globals,params:u,notify:a.notify})||""}],n.push(R.resolve(c,o.globals,o.resolve,e).then((function(n){if(s(i.controllerProvider)||l(i.controllerProvider)){var a=t.extend({},c,o.globals);n.$$controller=A.invoke(i.controllerProvider,null,a)}else n.$$controller=i.controller;n.$$state=e,n.$$controllerAs=i.controllerAs,o[r]=n})))})),d.all(n).then((function(){return o.globals}))})).then((function(e){return o}))}return p.locals={resolve:null,globals:{$stateParams:{}}},(y={params:{},current:p.self,$current:p,transition:null}).reload=function(e){return y.transitionTo(y.current,_,{reload:e||!0,inherit:!1,notify:!0})},y.go=function(e,t,n){return y.transitionTo(e,t,u({inherit:!0,relative:y.$current},n))},y.transitionTo=function(t,n,s){n=n||{},s=u({location:!0,inherit:!1,relative:null,notify:!0,reload:!1,$retry:!1},s||{});var l=y.$current,c=y.params,g=l.path,m=E(t,s.relative),$=n["#"];if(!r(m)){var S={to:t,toParams:n,options:s},C=function(t,n,i,r){var s=e.$broadcast("$stateNotFound",t,n,i);if(s.defaultPrevented)return M.update(),O;if(!s.retry)return null;if(r.$retry)return M.update(),F;var o=y.transition=d.when(s.retry);return o.then((function(){return o!==y.transition?P:(t.options.$retry=!0,y.transitionTo(t.to,t.toParams,t.options))}),(function(){return O})),M.update(),o}(S,l.self,c,s);if(C)return C;if(n=S.toParams,m=E(t=S.to,(s=S.options).relative),!r(m)){if(!s.relative)throw new Error("No such state '"+t+"'");throw new Error("Could not resolve '"+t+"' from state '"+s.relative+"'")}}if(m[k])throw new Error("Cannot transition to abstract state '"+t+"'");if(s.inherit&&(n=v(_,n||{},y.$current,m)),!m.params.$$validates(n))return F;n=m.params.$$values(n);var x=(t=m).path,R=0,L=x[R],T=p.locals,N=[];if(s.reload){if(o(s.reload)||a(s.reload)){if(a(s.reload)&&!s.reload.name)throw new Error("Invalid reload state object");var j=!0===s.reload?g[0]:E(s.reload);if(s.reload&&!j)throw new Error("No such reload state '"+(o(s.reload)?s.reload:s.reload.name)+"'");for(;L&&L===g[R]&&L!==j;)T=N[R]=L.locals,R++,L=x[R]}}else for(;L&&L===g[R]&&L.ownParams.$$equals(n,c);)T=N[R]=L.locals,R++,L=x[R];if(function(e,t,n,r,s,o){function a(e,t,n){function r(t){return"search"!=e.params[t].location}var s=e.params.$$keys().filter(r),o=w.apply({},[e.params].concat(s));return new i.ParamSet(o).$$equals(t,n)}if(!o.reload&&e===n&&(s===n.locals||!1===e.self.reloadOnSearch&&a(n,r,t)))return!0}(t,n,l,c,T,s))return $&&(n["#"]=$),y.params=n,h(y.params,_),h(b(t.params.$$keys(),_),t.locals.globals.$stateParams),s.location&&t.navigable&&t.navigable.url&&(M.push(t.navigable.url,n,{$$avoidResync:!0,replace:"replace"===s.location}),M.update(!0)),y.transition=null,d.when(y.current);if(n=b(t.params.$$keys(),n||{}),$&&(n["#"]=$),s.notify&&e.$broadcast("$stateChangeStart",t.self,n,l.self,c,s).defaultPrevented)return e.$broadcast("$stateChangeCancel",t.self,n,l.self,c),null==y.transition&&M.update(),I;for(var B=d.when(T),U=R;U<x.length;U++,L=x[U])T=N[U]=f(T),B=D(L,n,L===t,B,T,s);var H=y.transition=B.then((function(){var i,r,o;if(y.transition!==H)return P;for(i=g.length-1;i>=R;i--)(o=g[i]).self.onExit&&A.invoke(o.self.onExit,o.self,o.locals.globals),o.locals=null;for(i=R;i<x.length;i++)(r=x[i]).locals=N[i],r.self.onEnter&&A.invoke(r.self.onEnter,r.self,r.locals.globals);return y.transition!==H?P:(y.$current=t,y.current=t.self,y.params=n,h(y.params,_),y.transition=null,s.location&&t.navigable&&M.push(t.navigable.url,t.navigable.locals.globals.$stateParams,{$$avoidResync:!0,replace:"replace"===s.location}),s.notify&&e.$broadcast("$stateChangeSuccess",t.self,n,l.self,c),M.update(!0),y.current)}),(function(i){return y.transition!==H?P:(y.transition=null,e.$broadcast("$stateChangeError",t.self,n,l.self,c,i).defaultPrevented||M.update(),d.reject(i))}));return H},y.is=function(e,t,i){var s=E(e,(i=u({relative:y.$current},i||{})).relative);return r(s)?y.$current===s&&(!t||$(s.params.$$values(t),_)):n},y.includes=function(e,t,i){if(i=u({relative:y.$current},i||{}),o(e)&&e.indexOf("*")>-1){if(!function(e){for(var t=e.split("."),n=y.$current.name.split("."),i=0,r=t.length;i<r;i++)"*"===t[i]&&(n[i]="*");return"**"===t[0]&&(n=n.slice(m(n,t[1]))).unshift("**"),"**"===t[t.length-1]&&(n.splice(m(n,t[t.length-2])+1,Number.MAX_VALUE),n.push("**")),t.length==n.length&&n.join("")===t.join("")}(e))return!1;e=y.$current.name}var s=E(e,i.relative);return r(s)?!!r(y.$current.includes[s.name])&&(!t||$(s.params.$$values(t),_,g(t))):n},y.href=function(e,t,i){var s=E(e,(i=u({lossy:!0,inherit:!0,absolute:!1,relative:y.$current},i||{})).relative);if(!r(s))return null;i.inherit&&(t=v(_,t||{},y.$current,s));var o=s&&i.lossy?s.navigable:s;return o&&o.url!==n&&null!==o.url?M.href(o.url,b(s.params.$$keys().concat("#"),t||{}),{absolute:i.absolute}):null},y.get=function(e,t){if(0===arguments.length)return C(g(S),(function(e){return S[e].self}));var n=E(e,t||y.$current);return n&&n.self?n.self:null},y}(p=R({name:"",url:"^",views:null,abstract:!0})).navigable=null,this.decorator=function(e,t){if(o(e)&&!r(t))return A[e];if(!s(t)||!o(e))return this;A[e]&&!A.$delegates[e]&&(A.$delegates[e]=A[e]);return A[e]=t,this},this.state=function(e,t){a(e)?t=e:t.name=e;return R(t),this},this.$get=_,_.$inject=["$rootScope","$q","$view","$injector","$resolve","$stateParams","$urlRouter","$location","$urlMatcherFactory"]}function M(){function e(e,t){return{load:function(e,n){var i;return(n=u({template:null,controller:null,view:null,locals:null,notify:!0,async:!0,params:{}},n)).view&&(i=t.fromConfig(n.view,n.params,n.locals)),i}}}this.$get=e,e.$inject=["$rootScope","$templateFactory"]}t.module("ui.router.util",["ng"]),t.module("ui.router.router",["ui.router.util"]),t.module("ui.router.state",["ui.router.router","ui.router.util"]),t.module("ui.router",["ui.router.state"]),t.module("ui.router.compat",["ui.router"]),x.$inject=["$q","$injector"],t.module("ui.router.util").service("$resolve",x),k.$inject=["$http","$templateCache","$injector"],t.module("ui.router.util").service("$templateFactory",k),A.prototype.concat=function(e,t){var n={caseInsensitive:i.caseInsensitive(),strict:i.strictMode(),squash:i.defaultSquashPolicy()};return new A(this.sourcePath+e+this.sourceSearch,u(n,t),this)},A.prototype.toString=function(){return this.source},A.prototype.exec=function(e,t){var n=this.regexp.exec(e);if(!n)return null;t=t||{};var i,s,o,a,l,c=this.parameters(),u=c.length,h=this.segments.length-1,d={};if(h!==n.length-1)throw new Error("Unbalanced capture group in route '"+this.source+"'");function f(e){function t(e){return e.split("").reverse().join("")}var n=C(t(e).split(/-(?!\\)/),t);return C(n,(function(e){return e.replace(/\\-/g,"-")})).reverse()}for(i=0;i<h;i++){for(o=c[i],a=this.params[o],l=n[i+1],s=0;s<a.replace.length;s++)a.replace[s].from===l&&(l=a.replace[s].to);l&&!0===a.array&&(l=f(l)),r(l)&&(l=a.type.decode(l)),d[o]=a.value(l)}for(;i<u;i++){for(d[o=c[i]]=this.params[o].value(t[o]),a=this.params[o],l=t[o],s=0;s<a.replace.length;s++)a.replace[s].from===l&&(l=a.replace[s].to);r(l)&&(l=a.type.decode(l)),d[o]=a.value(l)}return d},A.prototype.parameters=function(e){return r(e)?this.params[e]||null:this.$$paramNames},A.prototype.validates=function(e){return this.params.$$validates(e)},A.prototype.format=function(e){e=e||{};var t=this.segments,n=this.parameters(),i=this.params;if(!this.validates(e))return null;var r,s=!1,a=t.length-1,c=n.length,u=t[0];function h(e){return encodeURIComponent(e).replace(/-/g,(function(e){return"%5C%"+e.charCodeAt(0).toString(16).toUpperCase()}))}for(r=0;r<c;r++){var d=r<a,f=n[r],p=i[f],g=p.value(e[f]),m=p.isOptional&&p.type.equals(p.value(),g),v=!!m&&p.squash,$=p.type.encode(g);if(d){var b=t[r+1],w=r+1===a;if(!1===v)null!=$&&(l($)?u+=C($,h).join("-"):u+=encodeURIComponent($)),u+=b;else if(!0===v){var y=u.match(/\/$/)?/\/?(.*)/:/(.*)/;u+=b.match(y)[1]}else o(v)&&(u+=v+b);w&&!0===p.squash&&"/"===u.slice(-1)&&(u=u.slice(0,-1))}else{if(null==$||m&&!1!==v)continue;if(l($)||($=[$]),0===$.length)continue;u+=(s?"&":"?")+f+"="+($=C($,encodeURIComponent).join("&"+f+"=")),s=!0}}return u},E.prototype.is=function(e,t){return!0},E.prototype.encode=function(e,t){return e},E.prototype.decode=function(e,t){return e},E.prototype.equals=function(e,t){return e==t},E.prototype.$subPattern=function(){var e=this.pattern.toString();return e.substr(1,e.length-2)},E.prototype.pattern=/.*/,E.prototype.toString=function(){return"{Type:"+this.name+"}"},E.prototype.$normalize=function(e){return this.is(e)?e:this.decode(e)},E.prototype.$asArray=function(e,t){if(!e)return this;if("auto"===e&&!t)throw new Error("'auto' array mode is for query parameters only");return new function(e,t){function i(e,t){return function(){return e[t].apply(e,arguments)}}function s(e){return l(e)?e:r(e)?[e]:[]}function o(e){return!e}function a(e,i){return function(r){if(l(r)&&0===r.length)return r;var a=C(r=s(r),e);return!0===i?0===S(a,o).length:function(e){switch(e.length){case 0:return n;case 1:return"auto"===t?e[0]:e;default:return e}}(a)}}var c;this.encode=a(i(e,"encode")),this.decode=a(i(e,"decode")),this.is=a(i(e,"is"),!0),this.equals=(c=i(e,"equals"),function(e,t){var n=s(e),i=s(t);if(n.length!==i.length)return!1;for(var r=0;r<n.length;r++)if(!c(n[r],i[r]))return!1;return!0}),this.pattern=e.pattern,this.$normalize=a(i(e,"$normalize")),this.name=e.name,this.$arrayMode=t}(this,e)},t.module("ui.router.util").provider("$urlMatcherFactory",(function e(){i=this;var h=!1,d=!0,p=!1;function v(e){return null!=e?e.toString().replace(/~/g,"~~").replace(/\//g,"~2F"):e}var $,b={},w=!0,y=[],x={string:{encode:v,decode:function(e){return null!=e?e.toString().replace(/~2F/g,"/").replace(/~~/g,"~"):e},is:function(e){return null==e||!r(e)||"string"==typeof e},pattern:/[^/]*/},int:{encode:v,decode:function(e){return parseInt(e,10)},is:function(e){return r(e)&&this.decode(e.toString())===e},pattern:/\d+/},bool:{encode:function(e){return e?1:0},decode:function(e){return 0!==parseInt(e,10)},is:function(e){return!0===e||!1===e},pattern:/0|1/},date:{encode:function(e){return this.is(e)?[e.getFullYear(),("0"+(e.getMonth()+1)).slice(-2),("0"+e.getDate()).slice(-2)].join("-"):n},decode:function(e){if(this.is(e))return e;var t=this.capture.exec(e);return t?new Date(t[1],t[2]-1,t[3]):n},is:function(e){return e instanceof Date&&!isNaN(e.valueOf())},equals:function(e,t){return this.is(e)&&this.is(t)&&e.toISOString()===t.toISOString()},pattern:/[0-9]{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[1-2][0-9]|3[0-1])/,capture:/([0-9]{4})-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])/},json:{encode:t.toJson,decode:t.fromJson,is:t.isObject,equals:t.equals,pattern:/[^/]*/},any:{encode:t.identity,decode:t.identity,equals:t.equals,pattern:/.*/}};function k(e){return s(e)||l(e)&&s(e[e.length-1])}function R(){for(;y.length;){var e=y.shift();if(e.pattern)throw new Error("You cannot override a type's .pattern at runtime.");t.extend(b[e.name],$.invoke(e.def))}}function _(e){u(this,e||{})}e.$$getDefaultValue=function(e){if(!k(e.value))return e.value;if(!$)throw new Error("Injectable functions cannot be called at configuration time");return $.invoke(e.value)},this.caseInsensitive=function(e){return r(e)&&(h=e),h},this.strictMode=function(e){return r(e)&&(d=e),d},this.defaultSquashPolicy=function(e){if(!r(e))return p;if(!0!==e&&!1!==e&&!o(e))throw new Error("Invalid squash policy: "+e+". Valid policies: false, true, arbitrary-string");return p=e,e},this.compile=function(e,t){return new A(e,u({strict:d,caseInsensitive:h},t))},this.isMatcher=function(e){if(!a(e))return!1;var t=!0;return c(A.prototype,(function(n,i){s(n)&&(t=t&&r(e[i])&&s(e[i]))})),t},this.type=function(e,t,n){if(!r(t))return b[e];if(b.hasOwnProperty(e))throw new Error("A type named '"+e+"' has already been defined.");return b[e]=new E(u({name:e},t)),n&&(y.push({name:e,def:n}),w||R()),this},c(x,(function(e,t){b[t]=new E(u({name:t},e))})),b=f(b,{}),this.$get=["$injector",function(e){return $=e,w=!1,R(),c(x,(function(e,t){b[t]||(b[t]=new E(e))})),this}],this.Param=function(e,i,s,c){var h=this;s=function(e){var t=a(e)?g(e):[];-1===m(t,"value")&&-1===m(t,"type")&&-1===m(t,"squash")&&-1===m(t,"array")&&(e={value:e});return e.$$fn=k(e.value)?e.value:function(){return e.value},e}(s),i=function(n,i,r){if(n.type&&i)throw new Error("Param '"+e+"' has two type configurations.");return i||(n.type?t.isString(n.type)?b[n.type]:n.type instanceof E?n.type:new E(n.type):"config"===r?b.any:b.string)}(s,i,c);var d,f,v=(d={array:"search"===c&&"auto"},f=e.match(/\[\]$/)?{array:!0}:{},u(d,f,s).array);"string"!==(i=v?i.$asArray(v,"search"===c):i).name||v||"path"!==c||s.value!==n||(s.value="");var w=s.value!==n,y=function(e,t){var n=e.squash;if(!t||!1===n)return!1;if(!r(n)||null==n)return p;if(!0===n||o(n))return n;throw new Error("Invalid squash policy: '"+n+"'. Valid policies: false, true, or arbitrary string")}(s,w),x=function(e,t,i,r){var s,a,c=[{from:"",to:i||t?n:""},{from:null,to:i||t?n:""}];s=l(e.replace)?e.replace:[],o(r)&&s.push({from:r,to:n});return a=C(s,(function(e){return e.from})),S(c,(function(e){return-1===m(a,e.from)})).concat(s)}(s,v,w,y);u(this,{id:e,type:i,location:c,array:v,squash:y,replace:x,isOptional:w,value:function(e){return e=function(e){var t,n=C(S(h.replace,(t=e,function(e){return e.from===t})),(function(e){return e.to}));return n.length?n[0]:e}(e),r(e)?h.type.$normalize(e):function(){if(!$)throw new Error("Injectable functions cannot be called at configuration time");var e=$.invoke(s.$$fn);if(null!==e&&e!==n&&!h.type.is(e))throw new Error("Default value ("+e+") for parameter '"+h.id+"' is not an instance of Type ("+h.type.name+")");return e}()},dynamic:n,config:s,toString:function(){return"{Param:"+e+" "+i+" squash: '"+y+"' optional: "+w+"}"}})},_.prototype={$$new:function(){return f(this,u(new _,{$$parent:this}))},$$keys:function(){for(var e=[],t=[],n=this,i=g(_.prototype);n;)t.push(n),n=n.$$parent;return t.reverse(),c(t,(function(t){c(g(t),(function(t){-1===m(e,t)&&-1===m(i,t)&&e.push(t)}))})),e},$$values:function(e){var t={},n=this;return c(n.$$keys(),(function(i){t[i]=n[i].value(e&&e[i])})),t},$$equals:function(e,t){var n=!0,i=this;return c(i.$$keys(),(function(r){var s=e&&e[r],o=t&&t[r];i[r].type.equals(s,o)||(n=!1)})),n},$$validates:function(e){var i,r,s,o,a,l=this.$$keys();for(i=0;i<l.length&&(r=this[l[i]],(s=e[l[i]])!==n&&null!==s||!r.isOptional);i++){if(o=r.type.$normalize(s),!r.type.is(o))return!1;if(a=r.type.encode(o),t.isString(a)&&!r.type.pattern.exec(a))return!1}return!0},$$parent:n},this.ParamSet=_})),t.module("ui.router.util").run(["$urlMatcherFactory",function(e){}]),R.$inject=["$locationProvider","$urlMatcherFactoryProvider"],t.module("ui.router.router").provider("$urlRouter",R),_.$inject=["$urlRouterProvider","$urlMatcherFactoryProvider"],t.module("ui.router.state").factory("$stateParams",(function(){return{}})).provider("$state",_),M.$inject=[],t.module("ui.router.state").provider("$view",M),t.module("ui.router.state").provider("$uiViewScroll",(function(){var e=!1;this.useAnchorScroll=function(){e=!0},this.$get=["$anchorScroll","$timeout",function(t,n){return e?t:function(e){return n((function(){e[0].scrollIntoView()}),0,!1)}}]}));var L=t.version.major,T=t.version.minor;function P(e,n,i,r){var s=n.has?function(e){return n.has(e)?n.get(e):null}:function(e){try{return n.get(e)}catch(e){return null}},o=s("$animator"),a=s("$animate");return{restrict:"ECA",terminal:!0,priority:400,transclude:"element",compile:function(n,s,l){return function(n,s,c){var u,h,d,f,p=c.onload||"",g=c.autoscroll,m=function(e,n){var i={enter:function(e,t,n){t.after(e),n()},leave:function(e,t){e.remove(),t()}};if(e.noanimation)return i;function r(e){return 1===L&&T>=4?!!a.enabled(e):1===L&&T>=2?!!a.enabled():!!o}if(a)return{enter:function(e,n,s){r(e)?t.version.minor>2?a.enter(e,null,n).then(s):a.enter(e,null,n,s):i.enter(e,n,s)},leave:function(e,n){r(e)?t.version.minor>2?a.leave(e).then(n):a.leave(e,n):i.leave(e,n)}};if(o){var s=o&&o(n,e);return{enter:function(e,t,n){s.enter(e,null,t),n()},leave:function(e,t){s.leave(e),t()}}}return i}(c,n);function v(o){var a,v=O(n,c,s,r),$=v&&e.$current&&e.$current.locals[v];if((o||$!==f)&&!n._willBeDestroyed){a=n.$new(),f=e.$current.locals[v],a.$emit("$viewContentLoading",v);var b=l(a,(function(e){m.enter(e,s,(function(){d&&d.$emit("$viewContentAnimationEnded"),(t.isDefined(g)&&!g||n.$eval(g))&&i(e)})),function(){var e=u,t=d;function n(){e&&e.remove(),t&&t.$destroy()}t&&(t._willBeDestroyed=!0),h?(m.leave(h,(function(){n(),u=null})),u=h):(n(),u=null),h=null,d=null}()}));h=b,(d=a).$emit("$viewContentLoaded",v),d.$eval(p)}}n.$on("$stateChangeSuccess",(function(){v(!1)})),v(!0)}}}}function I(e,t,n,i){return{restrict:"ECA",priority:-400,compile:function(r){var s=r.html();return function(r,o,a){var l=n.$current,c=O(r,a,o,i),u=l&&l.locals[c];if(u){o.data("$uiView",{name:c,state:u.$$state}),o.html(u.$template?u.$template:s);var h=e(o.contents());if(u.$$controller){u.$scope=r,u.$element=o;var d=t(u.$$controller,u);u.$$controllerAs&&(r[u.$$controllerAs]=d),o.data("$ngControllerController",d),o.children().data("$ngControllerController",d)}h(r)}}}}}function O(e,t,n,i){var r=i(t.uiView||t.name||"")(e),s=n.inheritedData("$uiView");return r.indexOf("@")>=0?r:r+"@"+(s?s.state.name:"")}function F(e,t){var n,i=e.match(/^\s*({[^}]*})\s*$/);if(i&&(e=t+"("+i[1]+")"),!(n=e.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/))||4!==n.length)throw new Error("Invalid state ref '"+e+"'");return{state:n[1],paramExpr:n[3]||null}}function D(e){var t=e.parent().inheritedData("$uiView");if(t&&t.state&&t.state.name)return t.state}function N(e){var t="[object SVGAnimatedString]"===Object.prototype.toString.call(e.prop("href")),n="FORM"===e[0].nodeName;return{attr:n?"action":t?"xlink:href":"href",isAnchor:"A"===e.prop("tagName").toUpperCase(),clickable:!n}}function j(e,t,n,i,r){return function(s){var o=s.which||s.button,a=r();if(!(o>1||s.ctrlKey||s.metaKey||s.shiftKey||e.attr("target"))){var l=n((function(){t.go(a.state,a.params,a.options)}));s.preventDefault();var c=i.isAnchor&&!a.href?1:0;s.preventDefault=function(){c--<=0&&n.cancel(l)}}}}function B(e,n){return{restrict:"A",require:["?^uiSrefActive","?^uiSrefActiveEq"],link:function(i,r,s,o){var a=F(s.uiSref,e.current.name),l={state:a.state,href:null,params:null},c=N(r),h=o[1]||o[0];l.options=u(function(e,t){return{relative:D(e)||t.$current,inherit:!0}}(r,e),s.uiSrefOpts?i.$eval(s.uiSrefOpts):{});var d=function(n){n&&(l.params=t.copy(n)),l.href=e.href(a.state,l.params,l.options),h&&h.$$addStateInfo(a.state,l.params),null!==l.href&&s.$set(c.attr,l.href)};a.paramExpr&&(i.$watch(a.paramExpr,(function(e){e!==l.params&&d(e)}),!0),l.params=t.copy(i.$eval(a.paramExpr))),d(),c.clickable&&r.bind("click",j(r,e,n,c,(function(){return l})))}}}function U(e,t){return{restrict:"A",require:["?^uiSrefActive","?^uiSrefActiveEq"],link:function(n,i,r,s){var o=N(i),a=s[1]||s[0],l="["+[r.uiState,r.uiStateParams||null,r.uiStateOpts||null].map((function(e){return e||"null"})).join(", ")+"]",c={state:null,params:null,options:null,href:null};function u(t){c.state=t[0],c.params=t[1],c.options=t[2],c.href=e.href(c.state,c.params,c.options),a&&a.$$addStateInfo(c.state,c.params),c.href&&r.$set(o.attr,c.href)}n.$watch(l,u,!0),u(n.$eval(l)),o.clickable&&i.bind("click",j(i,e,t,o,(function(){return c})))}}}function H(e,t,n){return{restrict:"A",controller:["$scope","$element","$attrs","$timeout",function(t,i,r,s){var l,u,h=[],f={};l=n(r.uiSrefActiveEq||"",!1)(t);try{u=t.$eval(r.uiSrefActive)}catch(e){}function p(n,r,s){var l=e.get(n,D(i)),c=function(e,n){if(!o(e))throw new Error("state should be a string");if(a(n))return e+d(n);if(n=t.$eval(n),a(n))return e+d(n);return e}(n,r);h.push({state:l||{name:n},params:r,hash:c}),f[c]=s}function g(){for(var t=0;t<h.length;t++)n=h[t].state,r=h[t].params,e.includes(n.name,r)?m(i,f[h[t].hash]):v(i,f[h[t].hash]),$(h[t].state,h[t].params)?m(i,l):v(i,l);var n,r}function m(e,t){s((function(){e.addClass(t)}))}function v(e,t){e.removeClass(t)}function $(t,n){return e.is(t.name,n)}u=u||n(r.uiSrefActive||"",!1)(t),a(u)&&c(u,(function(n,i){if(o(n)){var r=F(n,e.current.name);p(r.state,t.$eval(r.paramExpr),i)}})),this.$$addStateInfo=function(e,t){a(u)&&h.length>0||(p(e,t,u),g())},t.$on("$stateChangeSuccess",g),g()}]}}function W(e){var t=function(t,n){return e.is(t,n)};return t.$stateful=!0,t}function V(e){var t=function(t,n,i){return e.includes(t,n,i)};return t.$stateful=!0,t}P.$inject=["$state","$injector","$uiViewScroll","$interpolate"],I.$inject=["$compile","$controller","$state","$interpolate"],t.module("ui.router.state").directive("uiView",P),t.module("ui.router.state").directive("uiView",I),B.$inject=["$state","$timeout"],U.$inject=["$state","$timeout"],H.$inject=["$state","$stateParams","$interpolate"],t.module("ui.router.state").directive("uiSref",B).directive("uiSrefActive",H).directive("uiSrefActiveEq",H).directive("uiState",U),W.$inject=["$state"],V.$inject=["$state"],t.module("ui.router.state").filter("isState",W).filter("includedByState",V)}(window,window.angular),define("uiRouter",["angular"],(function(){})),
-/**
- * angular-ui-utils - Swiss-Army-Knife of AngularJS tools (with no external dependencies!)
- * @version v0.1.1 - 2014-02-05
- * @link http://angular-ui.github.com
- * @license MIT License, http://www.opensource.org/licenses/MIT
- */
-angular.module("ui.alias",[]).config(["$compileProvider","uiAliasConfig",function(e,t){t=t||{},angular.forEach(t,(function(t,n){angular.isString(t)&&(t={replace:!0,template:t}),e.directive(n,(function(){return t}))}))}]),angular.module("ui.event",[]).directive("uiEvent",["$parse",function(e){return function(t,n,i){var r=t.$eval(i.uiEvent);angular.forEach(r,(function(i,r){var s=e(i);n.bind(r,(function(e){var n=Array.prototype.slice.call(arguments);n=n.splice(1),s(t,{$event:e,$params:n}),t.$$phase||t.$apply()}))}))}}]),angular.module("ui.format",[]).filter("format",(function(){return function(e,t){var n=e;if(angular.isString(n)&&void 0!==t)if(angular.isArray(t)||angular.isObject(t)||(t=[t]),angular.isArray(t)){var i=t.length;n=n.replace(/\$([0-9]+)/g,(function(e,n){return(n=parseInt(n,10))>=0&&n<i?t[n]:e}))}else angular.forEach(t,(function(e,t){n=n.split(":"+t).join(e)}));return n}})),angular.module("ui.highlight",[]).filter("highlight",(function(){return function(e,t,n){return t||angular.isNumber(t)?(e=e.toString(),t=t.toString(),n?e.split(t).join('<span class="ui-match">'+t+"</span>"):e.replace(new RegExp(t,"gi"),'<span class="ui-match">$&</span>')):e}})),angular.module("ui.include",[]).directive("uiInclude",["$http","$templateCache","$anchorScroll","$compile",function(e,t,n,i){return{restrict:"ECA",terminal:!0,compile:function(r,s){var o=s.uiInclude||s.src,a=s.fragment||"",l=s.onload||"",c=s.autoscroll;return function(r,s){var u,h=0,d=function(){u&&(u.$destroy(),u=null),s.html("")};function f(){var f=++h,p=r.$eval(o),g=r.$eval(a);p?e.get(p,{cache:t}).success((function(e){var t;f===h&&(u&&u.$destroy(),u=r.$new(),t=g?angular.element("<div/>").html(e).find(g):angular.element("<div/>").html(e).contents(),s.html(t),i(t)(u),!angular.isDefined(c)||c&&!r.$eval(c)||n(),u.$emit("$includeContentLoaded"),r.$eval(l))})).error((function(){f===h&&d()})):d()}r.$watch(a,f),r.$watch(o,f)}}}}]),angular.module("ui.indeterminate",[]).directive("uiIndeterminate",[function(){return{compile:function(e,t){return t.type&&"checkbox"===t.type.toLowerCase()?function(e,t,n){e.$watch(n.uiIndeterminate,(function(e){t[0].indeterminate=!!e}))}:angular.noop}}}]),angular.module("ui.inflector",[]).filter("inflector",(function(){function e(e){return e.replace(/^([a-z])|\s+([a-z])/g,(function(e){return e.toUpperCase()}))}function t(e,t){return e.replace(/[A-Z]/g,(function(e){return t+e}))}var n={humanize:function(n){return e(t(n," ").split("_").join(" "))},underscore:function(e){return e.substr(0,1).toLowerCase()+t(e.substr(1),"_").toLowerCase().split(" ").join("_")},variable:function(t){return t=t.substr(0,1).toLowerCase()+e(t.split("_").join(" ")).substr(1).split(" ").join("")}};return function(e,t){return!1!==t&&angular.isString(e)?n[t=t||"humanize"](e):e}})),angular.module("ui.jq",[]).value("uiJqConfig",{}).directive("uiJq",["uiJqConfig","$timeout",function(e,t){return{restrict:"A",compile:function(n,i){if(!angular.isFunction(n[i.uiJq]))throw new Error('ui-jq: The "'+i.uiJq+'" function does not exist');var r=e&&e[i.uiJq];return function(e,n,i){var s=[];function o(){t((function(){n[i.uiJq].apply(n,s)}),0,!1)}i.uiOptions?(s=e.$eval("["+i.uiOptions+"]"),angular.isObject(r)&&angular.isObject(s[0])&&(s[0]=angular.extend({},r,s[0]))):r&&(s=[r]),i.ngModel&&n.is("select,input,textarea")&&n.bind("change",(function(){n.trigger("input")})),i.uiRefresh&&e.$watch(i.uiRefresh,(function(){o()})),o()}}}}]),angular.module("ui.keypress",[]).factory("keypressHelper",["$parse",function(e){var t={8:"backspace",9:"tab",13:"enter",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"delete"};return function(n,i,r,s){var o,a,l=[];o=i.$eval(s["ui"+(a=n,a.charAt(0).toUpperCase()+a.slice(1))]),angular.forEach(o,(function(t,n){var i,r;r=e(t),angular.forEach(n.split(" "),(function(e){i={expression:r,keys:{}},angular.forEach(e.split("-"),(function(e){i.keys[e]=!0})),l.push(i)}))})),r.bind(n,(function(e){var r=!(!e.metaKey||e.ctrlKey),s=!!e.altKey,o=!!e.ctrlKey,a=!!e.shiftKey,c=e.keyCode;"keypress"===n&&!a&&c>=97&&c<=122&&(c-=32),angular.forEach(l,(function(n){var l=n.keys[t[c]]||n.keys[c.toString()],u=!!n.keys.meta,h=!!n.keys.alt,d=!!n.keys.ctrl,f=!!n.keys.shift;l&&u===r&&h===s&&d===o&&f===a&&i.$apply((function(){n.expression(i,{$event:e})}))}))}))}}]),angular.module("ui.keypress").directive("uiKeydown",["keypressHelper",function(e){return{link:function(t,n,i){e("keydown",t,n,i)}}}]),angular.module("ui.keypress").directive("uiKeypress",["keypressHelper",function(e){return{link:function(t,n,i){e("keypress",t,n,i)}}}]),angular.module("ui.keypress").directive("uiKeyup",["keypressHelper",function(e){return{link:function(t,n,i){e("keyup",t,n,i)}}}]),angular.module("ui.mask",[]).value("uiMaskConfig",{maskDefinitions:{9:/\d/,A:/[a-zA-Z]/,"*":/[a-zA-Z0-9]/}}).directive("uiMask",["uiMaskConfig",function(e){return{priority:100,require:"ngModel",restrict:"A",compile:function(){var t=e;return function(e,n,i,r){var s,o,a,l,c,u,h,d,f,p,g,m,v=!1,$=!1,b=i.placeholder,w=i.maxlength;var y={};function S(){return v=!1,function(){if(!$)return;n.unbind("blur",A),n.unbind("mousedown",E),n.unbind("mouseup",E),n.unbind("input",_),n.unbind("keyup",_),n.unbind("click",_),n.unbind("focus",_),$=!1}(),angular.isDefined(b)?n.attr("placeholder",b):n.removeAttr("placeholder"),angular.isDefined(w)?n.attr("maxlength",w):n.removeAttr("maxlength"),n.val(r.$modelValue),r.$viewValue=r.$modelValue,!1}function C(e){return!e.length||e.length>=c}function x(e){var t="",n=o.slice();return e=e.toString(),angular.forEach(l,(function(t){e=e.replace(t,"")})),angular.forEach(e.split(""),(function(e){n.length&&n[0].test(e)&&(t+=e,n.shift())})),t}function k(e){var t="",n=s.slice();return angular.forEach(a.split(""),(function(i,r){e.length&&r===n[0]?(t+=e.charAt(0)||"_",e=e.substr(1),n.shift()):t+=i})),t}function A(){g=0,m=0,d&&0!==u.length||(h="",n.val(""),e.$apply((function(){r.$setViewValue("")})))}function E(e){"mousedown"===e.type?n.bind("mouseout",R):n.unbind("mouseout",R)}function R(){m=L(this),n.unbind("mouseout",R)}function _(t){var i=(t=t||{}).which,o=t.type;if(16!==i&&91!==i){var a,l=n.val(),c=f,u=x(l),h=p,d=!1,v=function(e){if(!e)return 0;if(void 0!==e.selectionStart)return e.selectionStart;if(document.selection){e.focus();var t=document.selection.createRange();return t.moveStart("character",-e.value.length),t.text.length}return 0}(this)||0,$=g||0,b=v-$,w=s[0],y=s[u.length]||s.slice().shift(),S=m||0,C=L(this)>0,A=S>0,E=l.length>c.length||S&&l.length>c.length-S,R=l.length<c.length||S&&l.length===c.length-S,_=i>=37&&i<=40&&t.shiftKey,T=8===i||"keyup"!==o&&R&&-1===b,P=46===i||"keyup"!==o&&R&&0===b&&!A,I=(37===i||T||"click"===o)&&v>w;if(m=L(this),!_&&(!C||"click"!==o&&"keyup"!==o)){if("input"===o&&R&&!A&&u===h){for(;T&&v>w&&!M(v);)v--;for(;P&&v<y&&-1===s.indexOf(v);)v++;var O=s.indexOf(v);u=u.substring(0,O)+u.substring(O+1),d=!0}for(a=k(u),f=a,p=u,n.val(a),d&&e.$apply((function(){r.$setViewValue(u)})),E&&v<=w&&(v=w+1),I&&v--,v=v>y?y:v<w?w:v;!M(v)&&v>w&&v<y;)v+=I?-1:1;(I&&v<y||E&&!M($))&&v++,g=v,function(e,t){if(!e)return 0;if(0===e.offsetWidth||0===e.offsetHeight)return;if(e.setSelectionRange)e.focus(),e.setSelectionRange(t,t);else if(e.createTextRange){var n=e.createTextRange();n.collapse(!0),n.moveEnd("character",t),n.moveStart("character",t),n.select()}}(this,v)}}}function M(e){return s.indexOf(e)>-1}function L(e){return e?void 0!==e.selectionStart?e.selectionEnd-e.selectionStart:document.selection?document.selection.createRange().text.length:0:0}i.uiOptions?(y=e.$eval("["+i.uiOptions+"]"),angular.isObject(y[0])&&(y=function(e,t){for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]?angular.extend(t[n],e[n]):t[n]=angular.copy(e[n]));return t}(t,y[0]))):y=t,i.$observe("uiMask",(function(e){return angular.isDefined(e)?(function(e){var t=0;if(s=[],o=[],a="","string"==typeof e){c=0;var n=!1,r=e.split("");angular.forEach(r,(function(e,r){y.maskDefinitions[e]?(s.push(t),a+=function(e){var t=i.placeholder;return void 0!==t&&t[e]?t[e]:"_"}(r),o.push(y.maskDefinitions[e]),t++,n||c++):"?"===e?n=!0:(a+=e,t++)}))}s.push(s.slice().pop()+1),l=a.replace(/[_]+/g,"_").replace(/([^_]+)([a-zA-Z0-9])([^_])/g,"$1$2_$3").split("_"),v=s.length>1}(e),v?(function(){u=p=x(r.$modelValue||""),h=f=k(u);var e=(d=C(u))&&u.length?h:"";i.maxlength&&n.attr("maxlength",2*s[s.length-1]);n.attr("placeholder",a),n.val(e),r.$viewValue=e}(),function(){if($)return;n.bind("blur",A),n.bind("mousedown mouseup",E),n.bind("input keyup click focus",_),$=!0}(),!0):S()):S()})),i.$observe("placeholder",(function(e){angular.isDefined(e)&&(a=e,v&&_())})),r.$formatters.push((function(e){return v?(u=x(e||""),d=C(u),r.$setValidity("mask",d),d&&u.length?k(u):void 0):e})),r.$parsers.push((function(e){return v?(u=x(e||""),d=C(u),r.$viewValue=u.length?k(u):"",r.$setValidity("mask",d),""===u&&void 0!==r.$error.required&&r.$setValidity("required",!1),d?u:void 0):e})),n.bind("mousedown mouseup",E),Array.prototype.indexOf||(Array.prototype.indexOf=function(e){if(null===this)throw new TypeError;var t=Object(this),n=t.length>>>0;if(0===n)return-1;var i=0;if(arguments.length>1&&((i=Number(arguments[1]))!=i?i=0:0!==i&&i!==1/0&&i!==-1/0&&(i=(i>0||-1)*Math.floor(Math.abs(i)))),i>=n)return-1;for(var r=i>=0?i:Math.max(n-Math.abs(i),0);r<n;r++)if(r in t&&t[r]===e)return r;return-1})}}}}]),angular.module("ui.reset",[]).value("uiResetConfig",null).directive("uiReset",["uiResetConfig",function(e){var t=null;return void 0!==e&&(t=e),{require:"ngModel",link:function(e,n,i,r){var s;s=angular.element('<a class="ui-reset" />'),n.wrap('<span class="ui-resetwrap" />').after(s),s.bind("click",(function(n){n.preventDefault(),e.$apply((function(){i.uiReset?r.$setViewValue(e.$eval(i.uiReset)):r.$setViewValue(t),r.$render()}))}))}}}]),angular.module("ui.route",[]).directive("uiRoute",["$location","$parse",function(e,t){return{restrict:"AC",scope:!0,compile:function(n,i){var r;if(i.uiRoute)r="uiRoute";else if(i.ngHref)r="ngHref";else{if(!i.href)throw new Error("uiRoute missing a route or href property on "+n[0]);r="href"}return function(n,i,s){var o=t(s.ngModel||s.routeModel||"$uiRoute").assign,a=angular.noop;function l(t){var i=t.indexOf("#");i>-1&&(t=t.substr(i+1)),(a=function(){o(n,e.path().indexOf(t)>-1)})()}function c(t){var i=t.indexOf("#");i>-1&&(t=t.substr(i+1)),(a=function(){var i=new RegExp("^"+t+"$",["i"]);o(n,i.test(e.path()))})()}switch(r){case"uiRoute":s.uiRoute?c(s.uiRoute):s.$observe("uiRoute",c);break;case"ngHref":s.ngHref?l(s.ngHref):s.$observe("ngHref",l);break;case"href":l(s.href)}n.$on("$routeChangeSuccess",(function(){a()})),n.$on("$stateChangeSuccess",(function(){a()}))}}}}]),angular.module("ui.scroll.jqlite",["ui.scroll"]).service("jqLiteExtras",["$log","$window",function(e,t){return{registerFor:function(e){var n,i,r,s,o,a,l;return i=angular.element.prototype.css,e.prototype.css=function(e,t){var n;if(this,(n=this[0])&&3!==n.nodeType&&8!==n.nodeType&&n.style)return i.call(this,e,t)},a=function(e){return e&&e.document&&e.location&&e.alert&&e.setInterval},l=function(e,t,n){var i,r,s,o,l;return i=e[0],r=(l={top:["scrollTop","pageYOffset","scrollLeft"],left:["scrollLeft","pageXOffset","scrollTop"]}[t])[0],o=l[1],s=l[2],a(i)?angular.isDefined(n)?i.scrollTo(e[s].call(e),n):o in i?i[o]:i.document.documentElement[r]:angular.isDefined(n)?i[r]=n:i[r]},t.getComputedStyle?(s=function(e){return t.getComputedStyle(e,null)},n=function(e,t){return parseFloat(t)}):(s=function(e){return e.currentStyle},n=function(e,t){var n,i,r,s,o;return new RegExp("^("+/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source+")(?!px)[a-z%]+$","i").test(t)?(n=(o=e.style).left,s=(r=e.runtimeStyle)&&r.left,r&&(r.left=o.left),o.left=t,i=o.pixelLeft,o.left=n,s&&(r.left=s),i):parseFloat(t)}),r=function(e,t){var i,r,o,l,c,u,h,d,f,p,g;return a(e)?{base:i=document.documentElement[{height:"clientHeight",width:"clientWidth"}[t]],padding:0,border:0,margin:0}:(i=(g={width:[e.offsetWidth,"Left","Right"],height:[e.offsetHeight,"Top","Bottom"]}[t])[0],h=g[1],d=g[2],u=s(e),f=n(e,u["padding"+h])||0,p=n(e,u["padding"+d])||0,r=n(e,u["border"+h+"Width"])||0,o=n(e,u["border"+d+"Width"])||0,l=u["margin"+h],c=u["margin"+d],{base:i,padding:f+p,border:r+o,margin:(n(e,l)||0)+(n(e,c)||0)})},o=function(e,t,n){var i,o;return(i=r(e,t)).base>0?{base:i.base-i.padding-i.border,outer:i.base,outerfull:i.base+i.margin}[n]:(((o=s(e)[t])<0||null===o)&&(o=e.style[t]||0),{base:(o=parseFloat(o)||0)-i.padding-i.border,outer:o,outerfull:o+i.padding+i.border+i.margin}[n])},angular.forEach({before:function(e){var t,n,i,r,s,o;if(this,n=this[0],(t=(r=this.parent()).contents())[0]===n)return r.prepend(e);for(i=s=1,o=t.length-1;1<=o?s<=o:s>=o;i=1<=o?++s:--s)if(t[i]===n)return void angular.element(t[i-1]).after(e);throw new Error("invalid DOM structure "+n.outerHTML)},height:function(e){return this,angular.isDefined(e)?(angular.isNumber(e)&&(e+="px"),i.call(this,"height",e)):o(this[0],"height","base")},outerHeight:function(e){return o(this[0],"height",e?"outerfull":"outer")},offset:function(e){var t,n,i,r,s;return this,arguments.length?void 0===e?this:e:(t={top:0,left:0},(n=(r=this[0])&&r.ownerDocument)?(i=n.documentElement,r.getBoundingClientRect&&(t=r.getBoundingClientRect()),s=n.defaultView||n.parentWindow,{top:t.top+(s.pageYOffset||i.scrollTop)-(i.clientTop||0),left:t.left+(s.pageXOffset||i.scrollLeft)-(i.clientLeft||0)}):void 0)},scrollTop:function(e){return l(this,"top",e)},scrollLeft:function(e){return l(this,"left",e)}},(function(t,n){if(!e.prototype[n])return e.prototype[n]=t}))}}}]).run(["$log","$window","jqLiteExtras",function(e,t,n){if(!t.jQuery)return n.registerFor(angular.element)}]),angular.module("ui.scroll",[]).directive("ngScrollViewport",["$log",function(){return{controller:["$scope","$element",function(e,t){return t}]}}]).directive("ngScroll",["$log","$injector","$rootScope","$timeout",function(e,t,n,i){return{require:["?^ngScrollViewport"],transclude:"element",priority:1e3,terminal:!0,compile:function(r,s,o){return function(s,a,l,c){var u,h,d,f,p,g,m,v,$,b,w,y,S,C,x,k,A,E,R,_,M,L,T,P,I,O,F,D,N,j,B,U,H,W,V,z;if(!(P=l.ngScroll.match(/^\s*(\w+)\s+in\s+(\w+)\s*$/)))throw new Error('Expected ngScroll in form of "item_ in _datasource_" but got "'+l.ngScroll+'"');if(L=P[1],y=P[2],_=function(e){return angular.isObject(e)&&e.get&&angular.isFunction(e.get)},!_(w=s[y])&&!_(w=t.get(y)))throw new Error(y+" is not a valid datasource");return v=Math.max(3,+l.bufferSize||10),m=function(){return z.height()*Math.max(.1,+l.padding||.1)},B=function(e){return e[0].scrollHeight||e[0].document.documentElement.scrollHeight},u=null,o(W=s.$new(),(function(e){var t,n,i,s,o,a;if("dl"===(s=e[0].localName))throw new Error("ng-scroll directive does not support <"+e[0].localName+"> as a repeating tag: "+e[0].outerHTML);return"li"!==s&&"tr"!==s&&(s="div"),(a=c[0]||angular.element(window)).css({"overflow-y":"auto",display:"block"}),i=function(e){var t,n,i;return"tr"===e?(i=angular.element("<table><tr><td><div></div></td></tr></table>"),t=i.find("div"),(n=i.find("tr")).paddingHeight=function(){return t.height.apply(t,arguments)},n):((n=angular.element("<"+e+"></"+e+">")).paddingHeight=n.height,n)},n=function(e,t,n){return t[{top:"before",bottom:"after"}[n]](e),{paddingHeight:function(){return e.paddingHeight.apply(e,arguments)},insert:function(t){return e[{top:"after",bottom:"before"}[n]](t)}}},o=n(i(s),r,"top"),t=n(i(s),r,"bottom"),W.$destroy(),u={viewport:a,topPadding:o.paddingHeight,bottomPadding:t.paddingHeight,append:t.insert,prepend:o.insert,bottomDataPos:function(){return B(a)-t.paddingHeight()},topDataPos:function(){return o.paddingHeight()}}})),z=u.viewport,E=1,I=1,g=[],O=[],C=!1,f=!1,T=w.loading||function(){},M=!1,D=function(e,t){var n,i;for(n=i=e;e<=t?i<t:i>t;n=e<=t?++i:--i)g[n].scope.$destroy(),g[n].element.remove();return g.splice(e,t-e)},F=function(){return E=1,I=1,D(0,g.length),u.topPadding(0),u.bottomPadding(0),O=[],C=!1,f=!1,h(!1)},p=function(){return z.scrollTop()+z.height()},V=function(){return z.scrollTop()},U=function(){return!C&&u.bottomDataPos()<p()+m()},$=function(){var t,n,i,r,s,o;for(t=0,r=0,n=s=o=g.length-1;(o<=0?s<=0:s>=0)&&(i=g[n].element.outerHeight(!0),u.bottomDataPos()-t-i>p()+m());n=o<=0?++s:--s)t+=i,r++,C=!1;if(r>0)return u.bottomPadding(u.bottomPadding()+t),D(g.length-r,g.length),I-=r,e.log("clipped off bottom "+r+" bottom padding "+u.bottomPadding())},H=function(){return!f&&u.topDataPos()>V()-m()},b=function(){var t,n,i,r,s;for(i=0,n=0,r=0,s=g.length;r<s&&(t=g[r].element.outerHeight(!0),u.topDataPos()+i+t<V()-m());r++)i+=t,n++,f=!1;if(n>0)return u.topPadding(u.topPadding()+i),D(0,n),E+=n,e.log("clipped off top "+n+" top padding "+u.topPadding())},S=function(e,t){if(M||(M=!0,T(!0)),1===O.push(e))return k(t)},R=function(e,t){var n,i,r;return(n=s.$new())[L]=t,i=e>E,n.$index=e,i&&n.$index--,r={scope:n},o(n,(function(t){return r.element=t,i?e===I?(u.append(t),g.push(r)):(g[e-E].element.after(t),g.splice(e-E+1,0,r)):(u.prepend(t),g.unshift(r))})),{appended:i,wrapper:r}},d=function(e,t){var n;return e?u.bottomPadding(Math.max(0,u.bottomPadding()-t.element.outerHeight(!0))):(n=u.topPadding()-t.element.outerHeight(!0))>=0?u.topPadding(n):z.scrollTop(z.scrollTop()+t.element.outerHeight(!0))},h=function(t,n,r){var s;return s=function(){if(e.log("top {actual="+u.topDataPos()+" visible from="+V()+" bottom {visible through="+p()+" actual="+u.bottomDataPos()+"}"),U()?S(!0,t):H()&&S(!1,t),r)return r()},n?i((function(){var e,t,i;for(t=0,i=n.length;t<i;t++)e=n[t],d(e.appended,e.wrapper);return s()})):s()},A=function(e,t){return h(e,t,(function(){return O.shift(),0===O.length?(M=!1,T(!1)):k(e)}))},k=function(t){return O[0]?g.length&&!U()?A(t):w.get(I,v,(function(n){var i,r,s,o;if(r=[],0===n.length)C=!0,u.bottomPadding(0),e.log("appended: requested "+v+" records starting from "+I+" recieved: eof");else{for(b(),s=0,o=n.length;s<o;s++)i=n[s],r.push(R(++I,i));e.log("appended: requested "+v+" received "+n.length+" buffer size "+g.length+" first "+E+" next "+I)}return A(t,r)})):g.length&&!H()?A(t):w.get(E-v,v,(function(n){var i,r,s,o;if(r=[],0===n.length)f=!0,u.topPadding(0),e.log("prepended: requested "+v+" records starting from "+(E-v)+" recieved: bof");else{for($(),i=s=o=n.length-1;o<=0?s<=0:s>=0;i=o<=0?++s:--s)r.unshift(R(--E,n[i]));e.log("prepended: requested "+v+" received "+n.length+" buffer size "+g.length+" first "+E+" next "+I)}return A(t,r)}))},N=function(){if(!n.$$phase&&!M)return h(!1),s.$apply()},z.bind("resize",N),j=function(){if(!n.$$phase&&!M)return h(!0),s.$apply()},z.bind("scroll",j),s.$watch(w.revision,(function(){return F()})),x=w.scope?w.scope.$new():s.$new(),s.$on("$destroy",(function(){return x.$destroy(),z.unbind("resize",N),z.unbind("scroll",j)})),x.$on("update.items",(function(e,t,n){var i,r,s,o;if(angular.isFunction(t))for(i=function(e){return t(e.scope)},r=0,s=g.length;r<s;r++)i(g[r]);else 0<=(o=t-E-1)&&o<g.length&&(g[t-E-1].scope[L]=n);return null})),x.$on("delete.items",(function(e,t){var n,i,r,s,o,a,l,c,u,d,f;if(angular.isFunction(t)){for(r=[],o=0,c=g.length;o<c;o++)i=g[o],r.unshift(i);for(s=function(e){if(t(e.scope))return D(r.length-1-n,r.length-n),I--},n=a=0,u=r.length;a<u;n=++a)s(r[n])}else 0<=(f=t-E-1)&&f<g.length&&(D(t-E-1,t-E),I--);for(n=l=0,d=g.length;l<d;n=++l)(i=g[n]).scope.$index=E+n;return h(!1)})),x.$on("insert.item",(function(e,t,n){var i,r,s,o,a,l,c,u,d,f,p;if(r=[],angular.isFunction(t)){for(s=[],a=0,u=g.length;a<u;a++)n=g[a],s.unshift(n);for(o=function(e){var s,o,a,l,c;if(o=t(e.scope)){if(R=function(e,t){return R(e,t),I++},angular.isArray(o)){for(c=[],s=a=0,l=o.length;a<l;s=++a)n=o[s],c.push(r.push(R(i+s,n)));return c}return r.push(R(i,o))}},i=l=0,d=s.length;l<d;i=++l)o(s[i])}else 0<=(p=t-E-1)&&p<g.length&&(r.push(R(t,n)),I++);for(i=c=0,f=g.length;c<f;i=++c)(n=g[i]).scope.$index=E+i;return h(!1,r)}))}}}}]),angular.module("ui.scrollfix",[]).directive("uiScrollfix",["$window",function(e){return{require:"^?uiScrollfixTarget",link:function(t,n,i,r){var s=n[0].offsetTop,o=r&&r.$element||angular.element(e);function a(){var t;angular.isDefined(e.pageYOffset)?t=e.pageYOffset:t=(document.compatMode&&"BackCompat"!==document.compatMode?document.documentElement:document.body).scrollTop;!n.hasClass("ui-scrollfix")&&t>i.uiScrollfix?n.addClass("ui-scrollfix"):n.hasClass("ui-scrollfix")&&t<i.uiScrollfix&&n.removeClass("ui-scrollfix")}i.uiScrollfix?"string"==typeof i.uiScrollfix&&("-"===i.uiScrollfix.charAt(0)?i.uiScrollfix=s-parseFloat(i.uiScrollfix.substr(1)):"+"===i.uiScrollfix.charAt(0)&&(i.uiScrollfix=s+parseFloat(i.uiScrollfix.substr(1)))):i.uiScrollfix=s,o.on("scroll",a),t.$on("$destroy",(function(){o.off("scroll",a)}))}}}]).directive("uiScrollfixTarget",[function(){return{controller:["$element",function(e){this.$element=e}]}}]),angular.module("ui.showhide",[]).directive("uiShow",[function(){return function(e,t,n){e.$watch(n.uiShow,(function(e){e?t.addClass("ui-show"):t.removeClass("ui-show")}))}}]).directive("uiHide",[function(){return function(e,t,n){e.$watch(n.uiHide,(function(e){e?t.addClass("ui-hide"):t.removeClass("ui-hide")}))}}]).directive("uiToggle",[function(){return function(e,t,n){e.$watch(n.uiToggle,(function(e){e?t.removeClass("ui-hide").addClass("ui-show"):t.removeClass("ui-show").addClass("ui-hide")}))}}]),angular.module("ui.unique",[]).filter("unique",["$parse",function(e){return function(t,n){if(!1===n)return t;if((n||angular.isUndefined(n))&&angular.isArray(t)){var i=[],r=angular.isString(n)?e(n):function(e){return e},s=function(e){return angular.isObject(e)?r(e):e};angular.forEach(t,(function(e){for(var t=!1,n=0;n<i.length;n++)if(angular.equals(s(i[n]),s(e))){t=!0;break}t||i.push(e)})),t=i}return t}}]),angular.module("ui.validate",[]).directive("uiValidate",(function(){return{restrict:"A",require:"ngModel",link:function(e,t,n,i){var r,s,o={},a=e.$eval(n.uiValidate);a&&(angular.isString(a)&&(a={validator:a}),angular.forEach(a,(function(t,n){r=function(r){var s=e.$eval(t,{$value:r});return angular.isObject(s)&&angular.isFunction(s.then)?(s.then((function(){i.$setValidity(n,!0)}),(function(){i.$setValidity(n,!1)})),r):s?(i.$setValidity(n,!0),r):(i.$setValidity(n,!1),r)},o[n]=r,i.$formatters.push(r),i.$parsers.push(r)})),n.uiValidateWatch&&(s=e.$eval(n.uiValidateWatch),angular.isString(s)?e.$watch(s,(function(){angular.forEach(o,(function(e){e(i.$modelValue)}))})):angular.isArray(s)?angular.forEach(s,(function(t){e.$watch(t,(function(){angular.forEach(o,(function(e){e(i.$modelValue)}))}))})):angular.isObject(s)&&angular.forEach(s,(function(t,n){angular.isString(t)&&e.$watch(t,(function(){o[n](i.$modelValue)})),angular.isArray(t)&&angular.forEach(t,(function(t){e.$watch(t,(function(){o[n](i.$modelValue)}))}))}))))}}})),angular.module("ui.utils",["ui.event","ui.format","ui.highlight","ui.include","ui.indeterminate","ui.inflector","ui.jq","ui.keypress","ui.mask","ui.reset","ui.route","ui.scrollfix","ui.scroll","ui.scroll.jqlite","ui.showhide","ui.unique","ui.validate"]),define("uiUtils",["angular"],(function(){})),function(){var e=function(){return this}();!e&&"undefined"!=typeof window&&(e=window);var t=function(e,n,i){"string"==typeof e?(2==arguments.length&&(i=n),t.modules[e]||(t.payloads[e]=i,t.modules[e]=null)):t.original?t.original.apply(this,arguments):(console.error("dropping module because define wasn't a string."),console.trace())};t.modules={},t.payloads={};var n=function(e,t,n){if("string"==typeof t){var r=s(e,t);if(null!=r)return n&&n(),r}else if("[object Array]"===Object.prototype.toString.call(t)){for(var o=[],a=0,l=t.length;a<l;++a){var c=s(e,t[a]);if(null==c&&i.original)return;o.push(c)}return n&&n.apply(null,o)||!0}},i=function(e,t){var r=n("",e,t);return null==r&&i.original?i.original.apply(this,arguments):r},r=function(e,t){if(-1!==t.indexOf("!")){var n=t.split("!");return r(e,n[0])+"!"+r(e,n[1])}if("."==t.charAt(0))for(t=e.split("/").slice(0,-1).join("/")+"/"+t;-1!==t.indexOf(".")&&i!=t;){var i=t;t=t.replace(/\/\.\//,"/").replace(/[^\/]+\/\.\.\//,"")}return t},s=function(e,i){i=r(e,i);var s=t.modules[i];if(!s){if("function"==typeof(s=t.payloads[i])){var o={},a={id:i,uri:"",exports:o,packaged:!0},l=s((function(e,t){return n(i,e,t)}),o,a);o=l||a.exports,t.modules[i]=o,delete t.payloads[i]}s=t.modules[i]=o||s}return s};!function(n){var r=e;n&&(e[n]||(e[n]={}),r=e[n]),r.define&&r.define.packaged||(t.original=r.define,r.define=t,r.define.packaged=!0),r.require&&r.require.packaged||(i.original=r.require,r.require=i,r.require.packaged=!0)}("ace")}(),ace.define("ace/lib/regexp",["require","exports","module"],(function(e,t,n){"use strict";var i={exec:RegExp.prototype.exec,test:RegExp.prototype.test,match:String.prototype.match,replace:String.prototype.replace,split:String.prototype.split},r=void 0===i.exec.call(/()??/,"")[1],s=function(){var e=/^/g;return i.test.call(e,""),!e.lastIndex}();s&&r||(RegExp.prototype.exec=function(e){var t,n,o=i.exec.apply(this,arguments);if("string"==typeof e&&o){if(!r&&o.length>1&&function(e,t,n){if(Array.prototype.indexOf)return e.indexOf(t,n);for(var i=n||0;i<e.length;i++)if(e[i]===t)return i;return-1}(o,"")>-1&&(n=RegExp(this.source,i.replace.call(function(e){return(e.global?"g":"")+(e.ignoreCase?"i":"")+(e.multiline?"m":"")+(e.extended?"x":"")+(e.sticky?"y":"")}(this),"g","")),i.replace.call(e.slice(o.index),n,(function(){for(var e=1;e<arguments.length-2;e++)void 0===arguments[e]&&(o[e]=void 0)}))),this._xregexp&&this._xregexp.captureNames)for(var a=1;a<o.length;a++)(t=this._xregexp.captureNames[a-1])&&(o[t]=o[a]);!s&&this.global&&!o[0].length&&this.lastIndex>o.index&&this.lastIndex--}return o},s||(RegExp.prototype.test=function(e){var t=i.exec.call(this,e);return t&&this.global&&!t[0].length&&this.lastIndex>t.index&&this.lastIndex--,!!t}))})),ace.define("ace/lib/es5-shim",["require","exports","module"],(function(e,t,n){function i(){}function r(e){try{return Object.defineProperty(e,"sentinel",{}),"sentinel"in e}catch(e){}}function s(e){return(e=+e)!=e?e=0:0!==e&&e!==1/0&&e!==-1/0&&(e=(e>0||-1)*Math.floor(Math.abs(e))),e}Function.prototype.bind||(Function.prototype.bind=function(e){var t=this;if("function"!=typeof t)throw new TypeError("Function.prototype.bind called on incompatible "+t);var n=p.call(arguments,1),r=function(){if(this instanceof r){var i=t.apply(this,n.concat(p.call(arguments)));return Object(i)===i?i:this}return t.apply(e,n.concat(p.call(arguments)))};return t.prototype&&(i.prototype=t.prototype,r.prototype=new i,i.prototype=null),r});var o,a,l,c,u,h=Function.prototype.call,d=Array.prototype,f=Object.prototype,p=d.slice,g=h.bind(f.toString),m=h.bind(f.hasOwnProperty);if((u=m(f,"__defineGetter__"))&&(o=h.bind(f.__defineGetter__),a=h.bind(f.__defineSetter__),l=h.bind(f.__lookupGetter__),c=h.bind(f.__lookupSetter__)),2!=[1,2].splice(0).length)if(function(){function e(e){var t=new Array(e+2);return t[0]=t[1]=0,t}var t,n=[];if(n.splice.apply(n,e(20)),n.splice.apply(n,e(26)),t=n.length,n.splice(5,0,"XXX"),n.length,t+1==n.length)return!0}()){var v=Array.prototype.splice;Array.prototype.splice=function(e,t){return arguments.length?v.apply(this,[void 0===e?0:e,void 0===t?this.length-e:t].concat(p.call(arguments,2))):[]}}else Array.prototype.splice=function(e,t){var n=this.length;e>0?e>n&&(e=n):null==e?e=0:e<0&&(e=Math.max(n+e,0)),e+t<n||(t=n-e);var i=this.slice(e,e+t),r=p.call(arguments,2),s=r.length;if(e===n)s&&this.push.apply(this,r);else{var o=Math.min(t,n-e),a=e+o,l=a+s-o,c=n-a,u=n-o;if(l<a)for(var h=0;h<c;++h)this[l+h]=this[a+h];else if(l>a)for(h=c;h--;)this[l+h]=this[a+h];if(s&&e===u)this.length=u,this.push.apply(this,r);else for(this.length=u+s,h=0;h<s;++h)this[e+h]=r[h]}return i};Array.isArray||(Array.isArray=function(e){return"[object Array]"==g(e)});var $,b=Object("a"),w="a"!=b[0]||!(0 in b);if(Array.prototype.forEach||(Array.prototype.forEach=function(e){var t=L(this),n=w&&"[object String]"==g(this)?this.split(""):t,i=arguments[1],r=-1,s=n.length>>>0;if("[object Function]"!=g(e))throw new TypeError;for(;++r<s;)r in n&&e.call(i,n[r],r,t)}),Array.prototype.map||(Array.prototype.map=function(e){var t=L(this),n=w&&"[object String]"==g(this)?this.split(""):t,i=n.length>>>0,r=Array(i),s=arguments[1];if("[object Function]"!=g(e))throw new TypeError(e+" is not a function");for(var o=0;o<i;o++)o in n&&(r[o]=e.call(s,n[o],o,t));return r}),Array.prototype.filter||(Array.prototype.filter=function(e){var t,n=L(this),i=w&&"[object String]"==g(this)?this.split(""):n,r=i.length>>>0,s=[],o=arguments[1];if("[object Function]"!=g(e))throw new TypeError(e+" is not a function");for(var a=0;a<r;a++)a in i&&(t=i[a],e.call(o,t,a,n)&&s.push(t));return s}),Array.prototype.every||(Array.prototype.every=function(e){var t=L(this),n=w&&"[object String]"==g(this)?this.split(""):t,i=n.length>>>0,r=arguments[1];if("[object Function]"!=g(e))throw new TypeError(e+" is not a function");for(var s=0;s<i;s++)if(s in n&&!e.call(r,n[s],s,t))return!1;return!0}),Array.prototype.some||(Array.prototype.some=function(e){var t=L(this),n=w&&"[object String]"==g(this)?this.split(""):t,i=n.length>>>0,r=arguments[1];if("[object Function]"!=g(e))throw new TypeError(e+" is not a function");for(var s=0;s<i;s++)if(s in n&&e.call(r,n[s],s,t))return!0;return!1}),Array.prototype.reduce||(Array.prototype.reduce=function(e){var t=L(this),n=w&&"[object String]"==g(this)?this.split(""):t,i=n.length>>>0;if("[object Function]"!=g(e))throw new TypeError(e+" is not a function");if(!i&&1==arguments.length)throw new TypeError("reduce of empty array with no initial value");var r,s=0;if(arguments.length>=2)r=arguments[1];else for(;;){if(s in n){r=n[s++];break}if(++s>=i)throw new TypeError("reduce of empty array with no initial value")}for(;s<i;s++)s in n&&(r=e.call(void 0,r,n[s],s,t));return r}),Array.prototype.reduceRight||(Array.prototype.reduceRight=function(e){var t=L(this),n=w&&"[object String]"==g(this)?this.split(""):t,i=n.length>>>0;if("[object Function]"!=g(e))throw new TypeError(e+" is not a function");if(!i&&1==arguments.length)throw new TypeError("reduceRight of empty array with no initial value");var r,s=i-1;if(arguments.length>=2)r=arguments[1];else for(;;){if(s in n){r=n[s--];break}if(--s<0)throw new TypeError("reduceRight of empty array with no initial value")}do{s in this&&(r=e.call(void 0,r,n[s],s,t))}while(s--);return r}),Array.prototype.indexOf&&-1==[0,1].indexOf(1,2)||(Array.prototype.indexOf=function(e){var t=w&&"[object String]"==g(this)?this.split(""):L(this),n=t.length>>>0;if(!n)return-1;var i=0;for(arguments.length>1&&(i=s(arguments[1])),i=i>=0?i:Math.max(0,n+i);i<n;i++)if(i in t&&t[i]===e)return i;return-1}),Array.prototype.lastIndexOf&&-1==[0,1].lastIndexOf(0,-3)||(Array.prototype.lastIndexOf=function(e){var t=w&&"[object String]"==g(this)?this.split(""):L(this),n=t.length>>>0;if(!n)return-1;var i=n-1;for(arguments.length>1&&(i=Math.min(i,s(arguments[1]))),i=i>=0?i:n-Math.abs(i);i>=0;i--)if(i in t&&e===t[i])return i;return-1}),Object.getPrototypeOf||(Object.getPrototypeOf=function(e){return e.__proto__||(e.constructor?e.constructor.prototype:f)}),!Object.getOwnPropertyDescriptor){Object.getOwnPropertyDescriptor=function(e,t){if("object"!=typeof e&&"function"!=typeof e||null===e)throw new TypeError("Object.getOwnPropertyDescriptor called on a non-object: "+e);if(m(e,t)){var n;if(n={enumerable:!0,configurable:!0},u){var i=e.__proto__;e.__proto__=f;var r=l(e,t),s=c(e,t);if(e.__proto__=i,r||s)return r&&(n.get=r),s&&(n.set=s),n}return n.value=e[t],n}}}(Object.getOwnPropertyNames||(Object.getOwnPropertyNames=function(e){return Object.keys(e)}),Object.create)||($=null===Object.prototype.__proto__?function(){return{__proto__:null}}:function(){var e={};for(var t in e)e[t]=null;return e.constructor=e.hasOwnProperty=e.propertyIsEnumerable=e.isPrototypeOf=e.toLocaleString=e.toString=e.valueOf=e.__proto__=null,e},Object.create=function(e,t){var n;if(null===e)n=$();else{if("object"!=typeof e)throw new TypeError("typeof prototype["+typeof e+"] != 'object'");var i=function(){};i.prototype=e,(n=new i).__proto__=e}return void 0!==t&&Object.defineProperties(n,t),n});if(Object.defineProperty){var y=r({}),S="undefined"==typeof document||r(document.createElement("div"));if(!y||!S)var C=Object.defineProperty}if(!Object.defineProperty||C){Object.defineProperty=function(e,t,n){if("object"!=typeof e&&"function"!=typeof e||null===e)throw new TypeError("Object.defineProperty called on non-object: "+e);if("object"!=typeof n&&"function"!=typeof n||null===n)throw new TypeError("Property description must be an object: "+n);if(C)try{return C.call(Object,e,t,n)}catch(e){}if(m(n,"value"))if(u&&(l(e,t)||c(e,t))){var i=e.__proto__;e.__proto__=f,delete e[t],e[t]=n.value,e.__proto__=i}else e[t]=n.value;else{if(!u)throw new TypeError("getters & setters can not be defined on this javascript engine");m(n,"get")&&o(e,t,n.get),m(n,"set")&&a(e,t,n.set)}return e}}Object.defineProperties||(Object.defineProperties=function(e,t){for(var n in t)m(t,n)&&Object.defineProperty(e,n,t[n]);return e}),Object.seal||(Object.seal=function(e){return e}),Object.freeze||(Object.freeze=function(e){return e});try{Object.freeze((function(){}))}catch(e){Object.freeze=function(e){return function(t){return"function"==typeof t?t:e(t)}}(Object.freeze)}if(Object.preventExtensions||(Object.preventExtensions=function(e){return e}),Object.isSealed||(Object.isSealed=function(e){return!1}),Object.isFrozen||(Object.isFrozen=function(e){return!1}),Object.isExtensible||(Object.isExtensible=function(e){if(Object(e)===e)throw new TypeError;for(var t="";m(e,t);)t+="?";e[t]=!0;var n=m(e,t);return delete e[t],n}),!Object.keys){var x=!0,k=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],A=k.length;for(var E in{toString:null})x=!1;Object.keys=function(e){if("object"!=typeof e&&"function"!=typeof e||null===e)throw new TypeError("Object.keys called on a non-object");var t=[];for(var n in e)m(e,n)&&t.push(n);if(x)for(var i=0,r=A;i<r;i++){var s=k[i];m(e,s)&&t.push(s)}return t}}Date.now||(Date.now=function(){return(new Date).getTime()});var R="\t\n\v\f\r   ᠎             　\u2028\u2029\ufeff";if(!String.prototype.trim||R.trim()){R="["+R+"]";var _=new RegExp("^"+R+R+"*"),M=new RegExp(R+R+"*$");String.prototype.trim=function(){return String(this).replace(_,"").replace(M,"")}}var L=function(e){if(null==e)throw new TypeError("can't convert "+e+" to object");return Object(e)}})),ace.define("ace/lib/fixoldbrowsers",["require","exports","module","ace/lib/regexp","ace/lib/es5-shim"],(function(e,t,n){"use strict";e("./regexp"),e("./es5-shim"),"undefined"!=typeof Element&&!Element.prototype.remove&&Object.defineProperty(Element.prototype,"remove",{enumerable:!1,writable:!0,configurable:!0,value:function(){this.parentNode&&this.parentNode.removeChild(this)}})})),ace.define("ace/lib/useragent",["require","exports","module"],(function(e,t,n){"use strict";if(t.OS={LINUX:"LINUX",MAC:"MAC",WINDOWS:"WINDOWS"},t.getOS=function(){return t.isMac?t.OS.MAC:t.isLinux?t.OS.LINUX:t.OS.WINDOWS},"object"==typeof navigator){var i=(navigator.platform.match(/mac|win|linux/i)||["other"])[0].toLowerCase(),r=navigator.userAgent;t.isWin="win"==i,t.isMac="mac"==i,t.isLinux="linux"==i,t.isIE="Microsoft Internet Explorer"==navigator.appName||navigator.appName.indexOf("MSAppHost")>=0?parseFloat((r.match(/(?:MSIE |Trident\/[0-9]+[\.0-9]+;.*rv:)([0-9]+[\.0-9]+)/)||[])[1]):parseFloat((r.match(/(?:Trident\/[0-9]+[\.0-9]+;.*rv:)([0-9]+[\.0-9]+)/)||[])[1]),t.isOldIE=t.isIE&&t.isIE<9,t.isGecko=t.isMozilla=r.match(/ Gecko\/\d+/),t.isOpera=window.opera&&"[object Opera]"==Object.prototype.toString.call(window.opera),t.isWebKit=parseFloat(r.split("WebKit/")[1])||void 0,t.isChrome=parseFloat(r.split(" Chrome/")[1])||void 0,t.isEdge=parseFloat(r.split(" Edge/")[1])||void 0,t.isAIR=r.indexOf("AdobeAIR")>=0,t.isIPad=r.indexOf("iPad")>=0,t.isAndroid=r.indexOf("Android")>=0,t.isChromeOS=r.indexOf(" CrOS ")>=0,t.isIOS=/iPad|iPhone|iPod/.test(r)&&!window.MSStream,t.isIOS&&(t.isMac=!0),t.isMobile=t.isIPad||t.isAndroid}})),ace.define("ace/lib/dom",["require","exports","module","ace/lib/useragent"],(function(e,t,n){"use strict";var i=e("./useragent");if(t.buildDom=function e(t,n,i){if("string"==typeof t&&t){var r=document.createTextNode(t);return n&&n.appendChild(r),r}if(!Array.isArray(t))return t;if("string"!=typeof t[0]||!t[0]){for(var s=[],o=0;o<t.length;o++){var a=e(t[o],n,i);a&&s.push(a)}return s}var l=document.createElement(t[0]),c=t[1],u=1;c&&"object"==typeof c&&!Array.isArray(c)&&(u=2);for(o=u;o<t.length;o++)e(t[o],l,i);return 2==u&&Object.keys(c).forEach((function(e){var t=c[e];"class"===e?l.className=Array.isArray(t)?t.join(" "):t:"function"==typeof t||"value"==e?l[e]=t:"ref"===e?i&&(i[t]=l):null!=t&&l.setAttribute(e,t)})),n&&n.appendChild(l),l},t.getDocumentHead=function(e){return e||(e=document),e.head||e.getElementsByTagName("head")[0]||e.documentElement},t.createElement=function(e,t){return document.createElementNS?document.createElementNS(t||"http://www.w3.org/1999/xhtml",e):document.createElement(e)},t.removeChildren=function(e){e.innerHTML=""},t.createTextNode=function(e,t){return(t?t.ownerDocument:document).createTextNode(e)},t.createFragment=function(e){return(e?e.ownerDocument:document).createDocumentFragment()},t.hasCssClass=function(e,t){return-1!==(e.className+"").split(/\s+/g).indexOf(t)},t.addCssClass=function(e,n){t.hasCssClass(e,n)||(e.className+=" "+n)},t.removeCssClass=function(e,t){for(var n=e.className.split(/\s+/g);;){var i=n.indexOf(t);if(-1==i)break;n.splice(i,1)}e.className=n.join(" ")},t.toggleCssClass=function(e,t){for(var n=e.className.split(/\s+/g),i=!0;;){var r=n.indexOf(t);if(-1==r)break;i=!1,n.splice(r,1)}return i&&n.push(t),e.className=n.join(" "),i},t.setCssClass=function(e,n,i){i?t.addCssClass(e,n):t.removeCssClass(e,n)},t.hasCssString=function(e,t){var n,i=0;if(n=(t=t||document).querySelectorAll("style"))for(;i<n.length;)if(n[i++].id===e)return!0},t.importCssString=function(e,n,i){var r=i;i&&i.getRootNode&&(r=i.getRootNode())&&r!=i||(r=document);var s=r.ownerDocument||r;if(n&&t.hasCssString(n,r))return null;n&&(e+="\n/*# sourceURL=ace/css/"+n+" */");var o=t.createElement("style");o.appendChild(s.createTextNode(e)),n&&(o.id=n),r==s&&(r=t.getDocumentHead(s)),r.insertBefore(o,r.firstChild)},t.importCssStylsheet=function(e,n){t.buildDom(["link",{rel:"stylesheet",href:e}],t.getDocumentHead(n))},t.scrollbarWidth=function(e){var n=t.createElement("ace_inner");n.style.width="100%",n.style.minWidth="0px",n.style.height="200px",n.style.display="block";var i=t.createElement("ace_outer"),r=i.style;r.position="absolute",r.left="-10000px",r.overflow="hidden",r.width="200px",r.minWidth="0px",r.height="150px",r.display="block",i.appendChild(n);var s=e.documentElement;s.appendChild(i);var o=n.offsetWidth;r.overflow="scroll";var a=n.offsetWidth;return o==a&&(a=i.clientWidth),s.removeChild(i),o-a},"undefined"==typeof document&&(t.importCssString=function(){}),t.computedStyle=function(e,t){return window.getComputedStyle(e,"")||{}},t.setStyle=function(e,t,n){e[t]!==n&&(e[t]=n)},t.HAS_CSS_ANIMATION=!1,t.HAS_CSS_TRANSFORMS=!1,t.HI_DPI=!i.isWin||"undefined"!=typeof window&&window.devicePixelRatio>=1.5,"undefined"!=typeof document){var r=document.createElement("div");t.HI_DPI&&void 0!==r.style.transform&&(t.HAS_CSS_TRANSFORMS=!0),!i.isEdge&&void 0!==r.style.animationName&&(t.HAS_CSS_ANIMATION=!0),r=null}t.HAS_CSS_TRANSFORMS?t.translate=function(e,t,n){e.style.transform="translate("+Math.round(t)+"px, "+Math.round(n)+"px)"}:t.translate=function(e,t,n){e.style.top=Math.round(n)+"px",e.style.left=Math.round(t)+"px"}})),ace.define("ace/lib/oop",["require","exports","module"],(function(e,t,n){"use strict";t.inherits=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})},t.mixin=function(e,t){for(var n in t)e[n]=t[n];return e},t.implement=function(e,n){t.mixin(e,n)}})),ace.define("ace/lib/keys",["require","exports","module","ace/lib/oop"],(function(e,t,n){"use strict";var i=e("./oop"),r=function(){var e,t,n={MODIFIER_KEYS:{16:"Shift",17:"Ctrl",18:"Alt",224:"Meta"},KEY_MODS:{ctrl:1,alt:2,option:2,shift:4,super:8,meta:8,command:8,cmd:8},FUNCTION_KEYS:{8:"Backspace",9:"Tab",13:"Return",19:"Pause",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"Print",45:"Insert",46:"Delete",96:"Numpad0",97:"Numpad1",98:"Numpad2",99:"Numpad3",100:"Numpad4",101:"Numpad5",102:"Numpad6",103:"Numpad7",104:"Numpad8",105:"Numpad9","-13":"NumpadEnter",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"Numlock",145:"Scrolllock"},PRINTABLE_KEYS:{32:" ",48:"0",49:"1",50:"2",51:"3",52:"4",53:"5",54:"6",55:"7",56:"8",57:"9",59:";",61:"=",65:"a",66:"b",67:"c",68:"d",69:"e",70:"f",71:"g",72:"h",73:"i",74:"j",75:"k",76:"l",77:"m",78:"n",79:"o",80:"p",81:"q",82:"r",83:"s",84:"t",85:"u",86:"v",87:"w",88:"x",89:"y",90:"z",107:"+",109:"-",110:".",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'",111:"/",106:"*"}};for(t in n.FUNCTION_KEYS)e=n.FUNCTION_KEYS[t].toLowerCase(),n[e]=parseInt(t,10);for(t in n.PRINTABLE_KEYS)e=n.PRINTABLE_KEYS[t].toLowerCase(),n[e]=parseInt(t,10);return i.mixin(n,n.MODIFIER_KEYS),i.mixin(n,n.PRINTABLE_KEYS),i.mixin(n,n.FUNCTION_KEYS),n.enter=n.return,n.escape=n.esc,n.del=n.delete,n[173]="-",function(){for(var e=["cmd","ctrl","alt","shift"],t=Math.pow(2,e.length);t--;)n.KEY_MODS[t]=e.filter((function(e){return t&n.KEY_MODS[e]})).join("-")+"-"}(),n.KEY_MODS[0]="",n.KEY_MODS[-1]="input-",n}();i.mixin(t,r),t.keyCodeToString=function(e){var t=r[e];return"string"!=typeof t&&(t=String.fromCharCode(e)),t.toLowerCase()}})),ace.define("ace/lib/event",["require","exports","module","ace/lib/keys","ace/lib/useragent"],(function(e,t,n){"use strict";function i(e,t,n){var i=c(t);if(!o.isMac&&a){if(t.getModifierState&&(t.getModifierState("OS")||t.getModifierState("Win"))&&(i|=8),a.altGr){if(3==(3&i))return;a.altGr=0}if(18===n||17===n){var r="location"in t?t.location:t.keyLocation;if(17===n&&1===r)1==a[n]&&(l=t.timeStamp);else if(18===n&&3===i&&2===r){t.timeStamp-l<50&&(a.altGr=!0)}}}if((n in s.MODIFIER_KEYS&&(n=-1),8&i&&n>=91&&n<=93&&(n=-1),!i&&13===n)&&(3===(r="location"in t?t.location:t.keyLocation)&&(e(t,i,-n),t.defaultPrevented)))return;if(o.isChromeOS&&8&i){if(e(t,i,n),t.defaultPrevented)return;i&=-9}return!!(i||n in s.FUNCTION_KEYS||n in s.PRINTABLE_KEYS)&&e(t,i,n)}function r(){a=Object.create(null)}var s=e("./keys"),o=e("./useragent"),a=null,l=0;t.addListener=function(e,t,n){if(e.addEventListener)return e.addEventListener(t,n,!1);if(e.attachEvent){var i=function(){n.call(e,window.event)};n._wrapper=i,e.attachEvent("on"+t,i)}},t.removeListener=function(e,t,n){if(e.removeEventListener)return e.removeEventListener(t,n,!1);e.detachEvent&&e.detachEvent("on"+t,n._wrapper||n)},t.stopEvent=function(e){return t.stopPropagation(e),t.preventDefault(e),!1},t.stopPropagation=function(e){e.stopPropagation?e.stopPropagation():e.cancelBubble=!0},t.preventDefault=function(e){e.preventDefault?e.preventDefault():e.returnValue=!1},t.getButton=function(e){return"dblclick"==e.type?0:"contextmenu"==e.type||o.isMac&&e.ctrlKey&&!e.altKey&&!e.shiftKey?2:e.preventDefault?e.button:{1:0,2:2,4:1}[e.button]},t.capture=function(e,n,i){function r(e){n&&n(e),i&&i(e),t.removeListener(document,"mousemove",n,!0),t.removeListener(document,"mouseup",r,!0),t.removeListener(document,"dragstart",r,!0)}return t.addListener(document,"mousemove",n,!0),t.addListener(document,"mouseup",r,!0),t.addListener(document,"dragstart",r,!0),r},t.addTouchMoveListener=function(e,n){var i,r;t.addListener(e,"touchstart",(function(e){var t=e.touches[0];i=t.clientX,r=t.clientY})),t.addListener(e,"touchmove",(function(e){var t=e.touches;if(!(t.length>1)){var s=t[0];e.wheelX=i-s.clientX,e.wheelY=r-s.clientY,i=s.clientX,r=s.clientY,n(e)}}))},t.addMouseWheelListener=function(e,n){"onmousewheel"in e?t.addListener(e,"mousewheel",(function(e){void 0!==e.wheelDeltaX?(e.wheelX=-e.wheelDeltaX/8,e.wheelY=-e.wheelDeltaY/8):(e.wheelX=0,e.wheelY=-e.wheelDelta/8),n(e)})):"onwheel"in e?t.addListener(e,"wheel",(function(e){switch(e.deltaMode){case e.DOM_DELTA_PIXEL:e.wheelX=.35*e.deltaX||0,e.wheelY=.35*e.deltaY||0;break;case e.DOM_DELTA_LINE:case e.DOM_DELTA_PAGE:e.wheelX=5*(e.deltaX||0),e.wheelY=5*(e.deltaY||0)}n(e)})):t.addListener(e,"DOMMouseScroll",(function(e){e.axis&&e.axis==e.HORIZONTAL_AXIS?(e.wheelX=5*(e.detail||0),e.wheelY=0):(e.wheelX=0,e.wheelY=5*(e.detail||0)),n(e)}))},t.addMultiMouseDownListener=function(e,n,i,r){function s(e){if(0!==t.getButton(e)?h=0:e.detail>1?++h>4&&(h=1):h=1,o.isIE){var s=Math.abs(e.clientX-l)>5||Math.abs(e.clientY-c)>5;u&&!s||(h=1),u&&clearTimeout(u),u=setTimeout((function(){u=null}),n[h-1]||600),1==h&&(l=e.clientX,c=e.clientY)}if(e._clicks=h,i[r]("mousedown",e),h>4)h=0;else if(h>1)return i[r](d[h],e)}function a(e){h=2,u&&clearTimeout(u),u=setTimeout((function(){u=null}),n[h-1]||600),i[r]("mousedown",e),i[r](d[h],e)}var l,c,u,h=0,d={2:"dblclick",3:"tripleclick",4:"quadclick"};Array.isArray(e)||(e=[e]),e.forEach((function(e){t.addListener(e,"mousedown",s),o.isOldIE&&t.addListener(e,"dblclick",a)}))};var c=o.isMac&&o.isOpera&&!("KeyboardEvent"in window)?function(e){return 0|(e.metaKey?1:0)|(e.altKey?2:0)|(e.shiftKey?4:0)|(e.ctrlKey?8:0)}:function(e){return 0|(e.ctrlKey?1:0)|(e.altKey?2:0)|(e.shiftKey?4:0)|(e.metaKey?8:0)};if(t.getModifierString=function(e){return s.KEY_MODS[c(e)]},t.addCommandKeyListener=function(e,n){var s=t.addListener;if(o.isOldGecko||o.isOpera&&!("KeyboardEvent"in window)){var l=null;s(e,"keydown",(function(e){l=e.keyCode})),s(e,"keypress",(function(e){return i(n,e,l)}))}else{var c=null;s(e,"keydown",(function(e){a[e.keyCode]=(a[e.keyCode]||0)+1;var t=i(n,e,e.keyCode);return c=e.defaultPrevented,t})),s(e,"keypress",(function(e){c&&(e.ctrlKey||e.altKey||e.shiftKey||e.metaKey)&&(t.stopEvent(e),c=null)})),s(e,"keyup",(function(e){a[e.keyCode]=null})),a||(r(),s(window,"focus",r))}},"object"==typeof window&&window.postMessage&&!o.isOldIE){var u=1;t.nextTick=function(e,n){n=n||window;var i="zero-timeout-message-"+u++,r=function(s){s.data==i&&(t.stopPropagation(s),t.removeListener(n,"message",r),e())};t.addListener(n,"message",r),n.postMessage(i,"*")}}t.$idleBlocked=!1,t.onIdle=function(e,n){return setTimeout((function n(){t.$idleBlocked?setTimeout(n,100):e()}),n)},t.$idleBlockId=null,t.blockIdle=function(e){t.$idleBlockId&&clearTimeout(t.$idleBlockId),t.$idleBlocked=!0,t.$idleBlockId=setTimeout((function(){t.$idleBlocked=!1}),e||100)},t.nextFrame="object"==typeof window&&(window.requestAnimationFrame||window.mozRequestAnimationFrame||window.webkitRequestAnimationFrame||window.msRequestAnimationFrame||window.oRequestAnimationFrame),t.nextFrame?t.nextFrame=t.nextFrame.bind(window):t.nextFrame=function(e){setTimeout(e,17)}})),ace.define("ace/range",["require","exports","module"],(function(e,t,n){"use strict";var i=function(e,t,n,i){this.start={row:e,column:t},this.end={row:n,column:i}};(function(){this.isEqual=function(e){return this.start.row===e.start.row&&this.end.row===e.end.row&&this.start.column===e.start.column&&this.end.column===e.end.column},this.toString=function(){return"Range: ["+this.start.row+"/"+this.start.column+"] -> ["+this.end.row+"/"+this.end.column+"]"},this.contains=function(e,t){return 0==this.compare(e,t)},this.compareRange=function(e){var t,n=e.end,i=e.start;return 1==(t=this.compare(n.row,n.column))?1==(t=this.compare(i.row,i.column))?2:0==t?1:0:-1==t?-2:-1==(t=this.compare(i.row,i.column))?-1:1==t?42:0},this.comparePoint=function(e){return this.compare(e.row,e.column)},this.containsRange=function(e){return 0==this.comparePoint(e.start)&&0==this.comparePoint(e.end)},this.intersects=function(e){var t=this.compareRange(e);return-1==t||0==t||1==t},this.isEnd=function(e,t){return this.end.row==e&&this.end.column==t},this.isStart=function(e,t){return this.start.row==e&&this.start.column==t},this.setStart=function(e,t){"object"==typeof e?(this.start.column=e.column,this.start.row=e.row):(this.start.row=e,this.start.column=t)},this.setEnd=function(e,t){"object"==typeof e?(this.end.column=e.column,this.end.row=e.row):(this.end.row=e,this.end.column=t)},this.inside=function(e,t){return 0==this.compare(e,t)&&(!this.isEnd(e,t)&&!this.isStart(e,t))},this.insideStart=function(e,t){return 0==this.compare(e,t)&&!this.isEnd(e,t)},this.insideEnd=function(e,t){return 0==this.compare(e,t)&&!this.isStart(e,t)},this.compare=function(e,t){return this.isMultiLine()||e!==this.start.row?e<this.start.row?-1:e>this.end.row?1:this.start.row===e?t>=this.start.column?0:-1:this.end.row===e?t<=this.end.column?0:1:0:t<this.start.column?-1:t>this.end.column?1:0},this.compareStart=function(e,t){return this.start.row==e&&this.start.column==t?-1:this.compare(e,t)},this.compareEnd=function(e,t){return this.end.row==e&&this.end.column==t?1:this.compare(e,t)},this.compareInside=function(e,t){return this.end.row==e&&this.end.column==t?1:this.start.row==e&&this.start.column==t?-1:this.compare(e,t)},this.clipRows=function(e,t){if(this.end.row>t)var n={row:t+1,column:0};else if(this.end.row<e)n={row:e,column:0};if(this.start.row>t)var r={row:t+1,column:0};else if(this.start.row<e)r={row:e,column:0};return i.fromPoints(r||this.start,n||this.end)},this.extend=function(e,t){var n=this.compare(e,t);if(0==n)return this;if(-1==n)var r={row:e,column:t};else var s={row:e,column:t};return i.fromPoints(r||this.start,s||this.end)},this.isEmpty=function(){return this.start.row===this.end.row&&this.start.column===this.end.column},this.isMultiLine=function(){return this.start.row!==this.end.row},this.clone=function(){return i.fromPoints(this.start,this.end)},this.collapseRows=function(){return 0==this.end.column?new i(this.start.row,0,Math.max(this.start.row,this.end.row-1),0):new i(this.start.row,0,this.end.row,0)},this.toScreenRange=function(e){var t=e.documentToScreenPosition(this.start),n=e.documentToScreenPosition(this.end);return new i(t.row,t.column,n.row,n.column)},this.moveBy=function(e,t){this.start.row+=e,this.start.column+=t,this.end.row+=e,this.end.column+=t}}).call(i.prototype),i.fromPoints=function(e,t){return new i(e.row,e.column,t.row,t.column)},i.comparePoints=function(e,t){return e.row-t.row||e.column-t.column},i.comparePoints=function(e,t){return e.row-t.row||e.column-t.column},t.Range=i})),ace.define("ace/lib/lang",["require","exports","module"],(function(e,t,n){"use strict";t.last=function(e){return e[e.length-1]},t.stringReverse=function(e){return e.split("").reverse().join("")},t.stringRepeat=function(e,t){for(var n="";t>0;)1&t&&(n+=e),(t>>=1)&&(e+=e);return n};var i=/^\s\s*/,r=/\s\s*$/;t.stringTrimLeft=function(e){return e.replace(i,"")},t.stringTrimRight=function(e){return e.replace(r,"")},t.copyObject=function(e){var t={};for(var n in e)t[n]=e[n];return t},t.copyArray=function(e){for(var t=[],n=0,i=e.length;n<i;n++)e[n]&&"object"==typeof e[n]?t[n]=this.copyObject(e[n]):t[n]=e[n];return t},t.deepCopy=function e(t){if("object"!=typeof t||!t)return t;var n;if(Array.isArray(t)){n=[];for(var i=0;i<t.length;i++)n[i]=e(t[i]);return n}if("[object Object]"!==Object.prototype.toString.call(t))return t;for(var i in n={},t)n[i]=e(t[i]);return n},t.arrayToMap=function(e){for(var t={},n=0;n<e.length;n++)t[e[n]]=1;return t},t.createMap=function(e){var t=Object.create(null);for(var n in e)t[n]=e[n];return t},t.arrayRemove=function(e,t){for(var n=0;n<=e.length;n++)t===e[n]&&e.splice(n,1)},t.escapeRegExp=function(e){return e.replace(/([.*+?^${}()|[\]\/\\])/g,"\\$1")},t.escapeHTML=function(e){return(""+e).replace(/&/g,"&#38;").replace(/"/g,"&#34;").replace(/'/g,"&#39;").replace(/</g,"&#60;")},t.getMatchOffsets=function(e,t){var n=[];return e.replace(t,(function(e){n.push({offset:arguments[arguments.length-2],length:e.length})})),n},t.deferredCall=function(e){var t=null,n=function(){t=null,e()},i=function(e){return i.cancel(),t=setTimeout(n,e||0),i};return i.schedule=i,i.call=function(){return this.cancel(),e(),i},i.cancel=function(){return clearTimeout(t),t=null,i},i.isPending=function(){return t},i},t.delayedCall=function(e,t){var n=null,i=function(){n=null,e()},r=function(e){null==n&&(n=setTimeout(i,e||t))};return r.delay=function(e){n&&clearTimeout(n),n=setTimeout(i,e||t)},r.schedule=r,r.call=function(){this.cancel(),e()},r.cancel=function(){n&&clearTimeout(n),n=null},r.isPending=function(){return n},r}})),ace.define("ace/keyboard/textinput",["require","exports","module","ace/lib/event","ace/lib/useragent","ace/lib/dom","ace/lib/lang","ace/lib/keys"],(function(e,t,n){"use strict";var i=e("../lib/event"),r=e("../lib/useragent"),s=e("../lib/dom"),o=e("../lib/lang"),a=r.isChrome<18,l=r.isIE,c=r.isChrome>63,u=400,h=e("../lib/keys"),d=h.KEY_MODS,f=r.isIOS,p=f?/\s/:/\n/;t.TextInput=function(e,t){function n(){C=!0,m.blur(),m.focus(),C=!1}function g(){clearTimeout(U),U=setTimeout((function(){y&&(m.style.cssText=y,y=""),null==t.renderer.$keepTextAreaAtCursor&&(t.renderer.$keepTextAreaAtCursor=!0,t.renderer.$moveTextAreaToCursor())}),0)}var m=s.createElement("textarea");m.className="ace_text-input",m.setAttribute("wrap","off"),m.setAttribute("autocorrect","off"),m.setAttribute("autocapitalize","off"),m.setAttribute("spellcheck",!1),m.style.opacity="0",e.insertBefore(m,e.firstChild);var v=!1,$=!1,b=!1,w=!1,y="";r.isMobile||(m.style.fontSize="1px");var S=!1,C=!1,x="",k=0,A=0;try{var E=document.activeElement===m}catch(e){}i.addListener(m,"blur",(function(e){C||(t.onBlur(e),E=!1)})),i.addListener(m,"focus",(function(e){if(!C){if(E=!0,r.isEdge)try{if(!document.hasFocus())return}catch(e){}t.onFocus(e),r.isEdge?setTimeout(R):R()}})),this.$focusScroll=!1,this.focus=function(){if(y||c||"browser"==this.$focusScroll)return m.focus({preventScroll:!0});var e=m.style.top;m.style.position="fixed",m.style.top="0px";try{var t=0!=m.getBoundingClientRect().top}catch(e){return}var n=[];if(t)for(var i=m.parentElement;i&&1==i.nodeType;)n.push(i),i.setAttribute("ace_nocontext",!0),i=!i.parentElement&&i.getRootNode?i.getRootNode().host:i.parentElement;m.focus({preventScroll:!0}),t&&n.forEach((function(e){e.removeAttribute("ace_nocontext")})),setTimeout((function(){m.style.position="","0px"==m.style.top&&(m.style.top=e)}),0)},this.blur=function(){m.blur()},this.isFocused=function(){return E},t.on("beforeEndOperation",(function(){t.curOp&&"insertstring"==t.curOp.command.name||(b&&(x=m.value="",j()),R())}));var R=f?function(e){if(E&&(!v||e)){e||(e="");var n="\n ab"+e+"cde fg\n";n!=m.value&&(m.value=x=n);var i=4+(e.length||(t.selection.isEmpty()?0:1));(4!=k||A!=i)&&m.setSelectionRange(4,i),k=4,A=i}}:function(){if(!b&&!w&&(E||M)){b=!0;var e=t.selection,n=e.getRange(),i=e.cursor.row,r=n.start.column,s=n.end.column,o=t.session.getLine(i);if(n.start.row!=i){var a=t.session.getLine(i-1);r=n.start.row<i-1?0:r,s+=a.length+1,o=a+"\n"+o}else if(n.end.row!=i){var l=t.session.getLine(i+1);s=n.end.row>i+1?l.length:s,s+=o.length+1,o=o+"\n"+l}o.length>u&&(r<u&&s<u?o=o.slice(0,u):(o="\n",r=0,s=1));var c=o+"\n\n";if(c!=x&&(m.value=x=c,k=A=c.length),M&&(k=m.selectionStart,A=m.selectionEnd),A!=s||k!=r||m.selectionEnd!=A)try{m.setSelectionRange(r,s),k=r,A=s}catch(e){}b=!1}};E&&t.onFocus();var _=null;this.setInputHandler=function(e){_=e},this.getInputHandler=function(){return _};var M=!1,L=function(e,n){if(M&&(M=!1),$)return R(),e&&t.onPaste(e),$=!1,"";for(var i=m.selectionStart,r=m.selectionEnd,s=k,o=x.length-A,a=e,l=e.length-i,c=e.length-r,u=0;s>0&&x[u]==e[u];)u++,s--;for(a=a.slice(u),u=1;o>0&&x.length-u>k-1&&x[x.length-u]==e[e.length-u];)u++,o--;return l-=u-1,c-=u-1,a=a.slice(0,a.length-u+1),n||l!=a.length||s||o||c?(w=!0,a&&!s&&!o&&!l&&!c||S?t.onTextInput(a):t.onTextInput(a,{extendLeft:s,extendRight:o,restoreStart:l,restoreEnd:c}),w=!1,x=e,k=i,A=r,a):""},T=function(e){if(b)return N();var t=m.value,n=L(t,!0);(t.length>500||p.test(n))&&R()},P=function(e,t,n){var i=e.clipboardData||window.clipboardData;if(i&&!a){var r=l||n?"Text":"text/plain";try{return t?!1!==i.setData(r,t):i.getData(r)}catch(e){if(!n)return P(e,t,!0)}}},I=function(e,n){var r=t.getCopyText();if(!r)return i.preventDefault(e);P(e,r)?(f&&(R(r),v=r,setTimeout((function(){v=!1}),10)),n?t.onCut():t.onCopy(),i.preventDefault(e)):(v=!0,m.value=r,m.select(),setTimeout((function(){v=!1,R(),n?t.onCut():t.onCopy()})))},O=function(e){I(e,!0)},F=function(e){I(e,!1)},D=function(e){var n=P(e);"string"==typeof n?(n&&t.onPaste(n,e),r.isIE&&setTimeout(R),i.preventDefault(e)):(m.value="",$=!0)};i.addCommandKeyListener(m,t.onCommandKey.bind(t)),i.addListener(m,"select",(function(e){b||(v?v=!1:function(e){return 0===e.selectionStart&&e.selectionEnd>=x.length&&e.value===x&&x&&e.selectionEnd!==A}(m)&&(t.selectAll(),R()))})),i.addListener(m,"input",T),i.addListener(m,"cut",O),i.addListener(m,"copy",F),i.addListener(m,"paste",D),(!("oncut"in m)||!("oncopy"in m)||!("onpaste"in m))&&i.addListener(e,"keydown",(function(e){if((!r.isMac||e.metaKey)&&e.ctrlKey)switch(e.keyCode){case 67:F(e);break;case 86:D(e);break;case 88:O(e)}}));var N=function(){if(b&&t.onCompositionUpdate&&!t.$readOnly){if(S)return n();if(b.useTextareaForIME)t.onCompositionUpdate(m.value);else{var e=m.value;L(e),b.markerRange&&(b.context&&(b.markerRange.start.column=b.selectionStart=b.context.compositionStartOffset),b.markerRange.end.column=b.markerRange.start.column+A-b.selectionStart)}}},j=function(e){t.onCompositionEnd&&!t.$readOnly&&(b=!1,t.onCompositionEnd(),t.off("mousedown",n),e&&T())},B=o.delayedCall(N,50).schedule.bind(null,null);i.addListener(m,"compositionstart",(function(e){if(!b&&t.onCompositionStart&&!t.$readOnly&&(b={},!S)){setTimeout(N,0),t.on("mousedown",n);var i=t.getSelectionRange();i.end.row=i.start.row,i.end.column=i.start.column,b.markerRange=i,b.selectionStart=k,t.onCompositionStart(b),b.useTextareaForIME?(m.value="",x="",k=0,A=0):(m.msGetInputContext&&(b.context=m.msGetInputContext()),m.getInputContext&&(b.context=m.getInputContext()))}})),i.addListener(m,"compositionupdate",N),i.addListener(m,"keyup",(function(e){27==e.keyCode&&m.value.length<m.selectionStart&&(b||(x=m.value),k=A=-1,R()),B()})),i.addListener(m,"keydown",B),i.addListener(m,"compositionend",j),this.getElement=function(){return m},this.setCommandMode=function(e){S=e,m.readOnly=!1},this.setReadOnly=function(e){S||(m.readOnly=e)},this.setCopyWithEmptySelection=function(e){e},this.onContextMenu=function(e){M=!0,R(),t._emit("nativecontextmenu",{target:t,domEvent:e}),this.moveToMouse(e,!0)},this.moveToMouse=function(e,n){y||(y=m.style.cssText),m.style.cssText=(n?"z-index:100000;":"")+(r.isIE?"opacity:0.1;":"")+"text-indent: -"+(k+A)*t.renderer.characterWidth*.5+"px;";var o=t.container.getBoundingClientRect(),a=s.computedStyle(t.container),l=o.top+(parseInt(a.borderTopWidth)||0),c=o.left+(parseInt(o.borderLeftWidth)||0),u=o.bottom-l-m.clientHeight-2,h=function(e){m.style.left=e.clientX-c-2+"px",m.style.top=Math.min(e.clientY-l-2,u)+"px"};h(e),"mousedown"==e.type&&(t.renderer.$keepTextAreaAtCursor&&(t.renderer.$keepTextAreaAtCursor=null),clearTimeout(U),r.isWin&&i.capture(t.container,h,g))},this.onContextMenuClose=g;var U,H=function(e){t.textInput.onContextMenu(e),g()};i.addListener(m,"mouseup",H),i.addListener(m,"mousedown",(function(e){e.preventDefault(),g()})),i.addListener(t.renderer.scroller,"contextmenu",H),i.addListener(m,"contextmenu",H),f&&function(e,t,n){var i=null,r=!1;n.addEventListener("keydown",(function(e){i&&clearTimeout(i),r=!0}),!0),n.addEventListener("keyup",(function(e){i=setTimeout((function(){r=!1}),100)}),!0);var s=function(e){if(document.activeElement===n&&!r&&!b&&!v){var i=n.selectionStart,s=n.selectionEnd,o=null,a=0;console.log(i,s),0==i?o=h.up:1==i?o=h.home:s>A&&"\n"==x[s]?o=h.end:i<k&&" "==x[i-1]?(o=h.left,a=d.option):i<k||i==k&&A!=k&&i==s?o=h.left:s>A&&x.slice(0,s).split("\n").length>2?o=h.down:s>A&&" "==x[s-1]?(o=h.right,a=d.option):(s>A||s==A&&A!=k&&i==s)&&(o=h.right),i!==s&&(a|=d.shift),o&&(t.onCommandKey(null,a,o),k=i,A=s,R(""))}};document.addEventListener("selectionchange",s),t.on("destroy",(function(){document.removeEventListener("selectionchange",s)}))}(0,t,m)}})),ace.define("ace/mouse/default_handlers",["require","exports","module","ace/lib/useragent"],(function(e,t,n){"use strict";function i(e){e.$clickSelection=null;var t=e.editor;t.setDefaultHandler("mousedown",this.onMouseDown.bind(e)),t.setDefaultHandler("dblclick",this.onDoubleClick.bind(e)),t.setDefaultHandler("tripleclick",this.onTripleClick.bind(e)),t.setDefaultHandler("quadclick",this.onQuadClick.bind(e)),t.setDefaultHandler("mousewheel",this.onMouseWheel.bind(e)),t.setDefaultHandler("touchmove",this.onTouchMove.bind(e));["select","startSelect","selectEnd","selectAllEnd","selectByWordsEnd","selectByLinesEnd","dragWait","dragWaitEnd","focusWait"].forEach((function(t){e[t]=this[t]}),this),e.selectByLines=this.extendSelectionBy.bind(e,"getLineRange"),e.selectByWords=this.extendSelectionBy.bind(e,"getWordRange")}function r(e,t){if(e.start.row==e.end.row)var n=2*t.column-e.start.column-e.end.column;else if(e.start.row!=e.end.row-1||e.start.column||e.end.column)n=2*t.row-e.start.row-e.end.row;else var n=t.column-4;return n<0?{cursor:e.start,anchor:e.end}:{cursor:e.end,anchor:e.start}}var s=e("../lib/useragent");(function(){this.onMouseDown=function(e){var t=e.inSelection(),n=e.getDocumentPosition();this.mousedownEvent=e;var i=this.editor,r=e.getButton();return 0!==r?((i.getSelectionRange().isEmpty()||1==r)&&i.selection.moveToPosition(n),void(2==r&&(i.textInput.onContextMenu(e.domEvent),s.isMozilla||e.preventDefault()))):(this.mousedownEvent.time=Date.now(),!t||i.isFocused()||(i.focus(),!this.$focusTimeout||this.$clickSelection||i.inMultiSelectMode)?(this.captureMouse(e),this.startSelect(n,e.domEvent._clicks>1),e.preventDefault()):(this.setState("focusWait"),void this.captureMouse(e)))},this.startSelect=function(e,t){e=e||this.editor.renderer.screenToTextCoordinates(this.x,this.y);var n=this.editor;this.mousedownEvent&&(this.mousedownEvent.getShiftKey()?n.selection.selectToPosition(e):t||n.selection.moveToPosition(e),t||this.select(),n.renderer.scroller.setCapture&&n.renderer.scroller.setCapture(),n.setStyle("ace_selecting"),this.setState("select"))},this.select=function(){var e,t=this.editor,n=t.renderer.screenToTextCoordinates(this.x,this.y);if(this.$clickSelection){var i=this.$clickSelection.comparePoint(n);if(-1==i)e=this.$clickSelection.end;else if(1==i)e=this.$clickSelection.start;else{var s=r(this.$clickSelection,n);n=s.cursor,e=s.anchor}t.selection.setSelectionAnchor(e.row,e.column)}t.selection.selectToPosition(n),t.renderer.scrollCursorIntoView()},this.extendSelectionBy=function(e){var t,n=this.editor,i=n.renderer.screenToTextCoordinates(this.x,this.y),s=n.selection[e](i.row,i.column);if(this.$clickSelection){var o=this.$clickSelection.comparePoint(s.start),a=this.$clickSelection.comparePoint(s.end);if(-1==o&&a<=0)t=this.$clickSelection.end,s.end.row==i.row&&s.end.column==i.column||(i=s.start);else if(1==a&&o>=0)t=this.$clickSelection.start,s.start.row==i.row&&s.start.column==i.column||(i=s.end);else if(-1==o&&1==a)i=s.end,t=s.start;else{var l=r(this.$clickSelection,i);i=l.cursor,t=l.anchor}n.selection.setSelectionAnchor(t.row,t.column)}n.selection.selectToPosition(i),n.renderer.scrollCursorIntoView()},this.selectEnd=this.selectAllEnd=this.selectByWordsEnd=this.selectByLinesEnd=function(){this.$clickSelection=null,this.editor.unsetStyle("ace_selecting"),this.editor.renderer.scroller.releaseCapture&&this.editor.renderer.scroller.releaseCapture()},this.focusWait=function(){var e=function(e,t,n,i){return Math.sqrt(Math.pow(n-e,2)+Math.pow(i-t,2))}(this.mousedownEvent.x,this.mousedownEvent.y,this.x,this.y),t=Date.now();(e>0||t-this.mousedownEvent.time>this.$focusTimeout)&&this.startSelect(this.mousedownEvent.getDocumentPosition())},this.onDoubleClick=function(e){var t=e.getDocumentPosition(),n=this.editor,i=n.session.getBracketRange(t);i?(i.isEmpty()&&(i.start.column--,i.end.column++),this.setState("select")):(i=n.selection.getWordRange(t.row,t.column),this.setState("selectByWords")),this.$clickSelection=i,this.select()},this.onTripleClick=function(e){var t=e.getDocumentPosition(),n=this.editor;this.setState("selectByLines");var i=n.getSelectionRange();i.isMultiLine()&&i.contains(t.row,t.column)?(this.$clickSelection=n.selection.getLineRange(i.start.row),this.$clickSelection.end=n.selection.getLineRange(i.end.row).end):this.$clickSelection=n.selection.getLineRange(t.row),this.select()},this.onQuadClick=function(e){var t=this.editor;t.selectAll(),this.$clickSelection=t.getSelectionRange(),this.setState("selectAll")},this.onMouseWheel=function(e){if(!e.getAccelKey()){e.getShiftKey()&&e.wheelY&&!e.wheelX&&(e.wheelX=e.wheelY,e.wheelY=0);var t=this.editor;this.$lastScroll||(this.$lastScroll={t:0,vx:0,vy:0,allowed:0});var n=this.$lastScroll,i=e.domEvent.timeStamp,r=i-n.t,s=r?e.wheelX/r:n.vx,o=r?e.wheelY/r:n.vy;r<550&&(s=(s+n.vx)/2,o=(o+n.vy)/2);var a=Math.abs(s/o),l=!1;if(a>=1&&t.renderer.isScrollableBy(e.wheelX*e.speed,0)&&(l=!0),a<=1&&t.renderer.isScrollableBy(0,e.wheelY*e.speed)&&(l=!0),l)n.allowed=i;else if(i-n.allowed<550){Math.abs(s)<=1.5*Math.abs(n.vx)&&Math.abs(o)<=1.5*Math.abs(n.vy)?(l=!0,n.allowed=i):n.allowed=0}return n.t=i,n.vx=s,n.vy=o,l?(t.renderer.scrollBy(e.wheelX*e.speed,e.wheelY*e.speed),e.stop()):void 0}},this.onTouchMove=function(e){this.editor._emit("mousewheel",e)}}).call(i.prototype),t.DefaultHandlers=i})),ace.define("ace/tooltip",["require","exports","module","ace/lib/oop","ace/lib/dom"],(function(e,t,n){"use strict";function i(e){this.isOpen=!1,this.$element=null,this.$parentNode=e}e("./lib/oop");var r=e("./lib/dom");(function(){this.$init=function(){return this.$element=r.createElement("div"),this.$element.className="ace_tooltip",this.$element.style.display="none",this.$parentNode.appendChild(this.$element),this.$element},this.getElement=function(){return this.$element||this.$init()},this.setText=function(e){this.getElement().textContent=e},this.setHtml=function(e){this.getElement().innerHTML=e},this.setPosition=function(e,t){this.getElement().style.left=e+"px",this.getElement().style.top=t+"px"},this.setClassName=function(e){r.addCssClass(this.getElement(),e)},this.show=function(e,t,n){null!=e&&this.setText(e),null!=t&&null!=n&&this.setPosition(t,n),this.isOpen||(this.getElement().style.display="block",this.isOpen=!0)},this.hide=function(){this.isOpen&&(this.getElement().style.display="none",this.isOpen=!1)},this.getHeight=function(){return this.getElement().offsetHeight},this.getWidth=function(){return this.getElement().offsetWidth},this.destroy=function(){this.isOpen=!1,this.$element&&this.$element.parentNode&&this.$element.parentNode.removeChild(this.$element)}}).call(i.prototype),t.Tooltip=i})),ace.define("ace/mouse/default_gutter_handler",["require","exports","module","ace/lib/dom","ace/lib/oop","ace/lib/event","ace/tooltip"],(function(e,t,n){"use strict";function i(e){a.call(this,e)}var r=e("../lib/dom"),s=e("../lib/oop"),o=e("../lib/event"),a=e("../tooltip").Tooltip;s.inherits(i,a),function(){this.setPosition=function(e,t){var n=window.innerWidth||document.documentElement.clientWidth,i=window.innerHeight||document.documentElement.clientHeight,r=this.getWidth(),s=this.getHeight();(e+=15)+r>n&&(e-=e+r-n),(t+=15)+s>i&&(t-=20+s),a.prototype.setPosition.call(this,e,t)}}.call(i.prototype),t.GutterHandler=function(e){function t(){var t=l.getDocumentPosition().row,i=h.$annotations[t];if(!i)return n();if(t==u.session.getLength()){var r=u.renderer.pixelToScreenCoordinates(0,l.y).row,o=l.$pos;if(r>u.session.documentToScreenRow(o.row,o.column))return n()}if(c!=i)if(c=i.text.join("<br/>"),d.setHtml(c),d.show(),u._signal("showGutterTooltip",d),u.on("mousewheel",n),e.$tooltipFollowsMouse)s(l);else{var a=l.domEvent.target.getBoundingClientRect(),f=d.getElement().style;f.left=a.right+"px",f.top=a.bottom+"px"}}function n(){a&&(a=clearTimeout(a)),c&&(d.hide(),c=null,u._signal("hideGutterTooltip",d),u.removeEventListener("mousewheel",n))}function s(e){d.setPosition(e.x,e.y)}var a,l,c,u=e.editor,h=u.renderer.$gutterLayer,d=new i(u.container);e.editor.setDefaultHandler("guttermousedown",(function(t){if(u.isFocused()&&0==t.getButton()&&"foldWidgets"!=h.getRegion(t)){var n=t.getDocumentPosition().row,i=u.session.selection;if(t.getShiftKey())i.selectTo(n,0);else{if(2==t.domEvent.detail)return u.selectAll(),t.preventDefault();e.$clickSelection=u.selection.getLineRange(n)}return e.setState("selectByLines"),e.captureMouse(t),t.preventDefault()}})),e.editor.setDefaultHandler("guttermousemove",(function(i){var o=i.domEvent.target||i.domEvent.srcElement;if(r.hasCssClass(o,"ace_fold-widget"))return n();c&&e.$tooltipFollowsMouse&&s(i),l=i,a||(a=setTimeout((function(){a=null,l&&!e.isMousePressed?t():n()}),50))})),o.addListener(u.renderer.$gutter,"mouseout",(function(e){l=null,c&&!a&&(a=setTimeout((function(){a=null,n()}),50))})),u.on("changeSession",n)}})),ace.define("ace/mouse/mouse_event",["require","exports","module","ace/lib/event","ace/lib/useragent"],(function(e,t,n){"use strict";var i=e("../lib/event"),r=e("../lib/useragent"),s=t.MouseEvent=function(e,t){this.domEvent=e,this.editor=t,this.x=this.clientX=e.clientX,this.y=this.clientY=e.clientY,this.$pos=null,this.$inSelection=null,this.propagationStopped=!1,this.defaultPrevented=!1};(function(){this.stopPropagation=function(){i.stopPropagation(this.domEvent),this.propagationStopped=!0},this.preventDefault=function(){i.preventDefault(this.domEvent),this.defaultPrevented=!0},this.stop=function(){this.stopPropagation(),this.preventDefault()},this.getDocumentPosition=function(){return this.$pos||(this.$pos=this.editor.renderer.screenToTextCoordinates(this.clientX,this.clientY)),this.$pos},this.inSelection=function(){if(null!==this.$inSelection)return this.$inSelection;var e=this.editor.getSelectionRange();if(e.isEmpty())this.$inSelection=!1;else{var t=this.getDocumentPosition();this.$inSelection=e.contains(t.row,t.column)}return this.$inSelection},this.getButton=function(){return i.getButton(this.domEvent)},this.getShiftKey=function(){return this.domEvent.shiftKey},this.getAccelKey=r.isMac?function(){return this.domEvent.metaKey}:function(){return this.domEvent.ctrlKey}}).call(s.prototype)})),ace.define("ace/mouse/dragdrop_handler",["require","exports","module","ace/lib/dom","ace/lib/event","ace/lib/useragent"],(function(e,t,n){"use strict";function i(e){function t(){var e=y;(function(e,t){var n=Date.now(),i=!t||e.row!=t.row,s=!t||e.column!=t.column;!k||i||s?(p.moveCursorToPosition(e),k=n,A={x:v,y:$}):r(A.x,A.y,v,$)>u?k=null:n-k>=c&&(p.renderer.scrollCursorIntoView(),k=null)})(y=p.renderer.screenToTextCoordinates(v,$),e),function(e,t){var n=Date.now(),i=p.renderer.layerConfig.lineHeight,r=p.renderer.layerConfig.characterWidth,s=p.renderer.scroller.getBoundingClientRect(),o={x:{left:v-s.left,right:s.right-v},y:{top:$-s.top,bottom:s.bottom-$}},a=Math.min(o.x.left,o.x.right),c=Math.min(o.y.top,o.y.bottom),u={row:e.row,column:e.column};a/r<=2&&(u.column+=o.x.left<o.x.right?-3:2),c/i<=1&&(u.row+=o.y.top<o.y.bottom?-1:1);var h=e.row!=u.row,d=e.column!=u.column,f=!t||e.row!=t.row;h||d&&!f?x?n-x>=l&&p.renderer.scrollCursorIntoView(u):x=n:x=null}(y,e)}function n(){w=p.selection.toOrientedRange(),m=p.session.addMarker(w,"ace_selection",p.getSelectionStyle()),p.clearSelection(),p.isFocused()&&p.renderer.$cursorLayer.setBlinking(!1),clearInterval(b),t(),b=setInterval(t,20),R=0,o.addListener(document,"mousemove",h)}function i(){clearInterval(b),p.session.removeMarker(m),m=null,p.selection.fromOrientedRange(w),p.isFocused()&&!C&&p.renderer.$cursorLayer.setBlinking(!p.getReadOnly()),w=null,y=null,R=0,x=null,k=null,o.removeListener(document,"mousemove",h)}function h(){null==_&&(_=setTimeout((function(){null!=_&&m&&i()}),20))}function d(e){var t=e.types;return!t||Array.prototype.some.call(t,(function(e){return"text/plain"==e||"Text"==e}))}function f(e){var t=["copy","copymove","all","uninitialized"],n=a.isMac?e.altKey:e.ctrlKey,i="uninitialized";try{i=e.dataTransfer.effectAllowed.toLowerCase()}catch(e){}var r="none";return n&&t.indexOf(i)>=0?r="copy":["move","copymove","linkmove","all","uninitialized"].indexOf(i)>=0?r="move":t.indexOf(i)>=0&&(r="copy"),r}var p=e.editor,g=s.createElement("img");g.src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",a.isOpera&&(g.style.cssText="width:1px;height:1px;position:fixed;top:0;left:0;z-index:2147483647;opacity:0;");["dragWait","dragWaitEnd","startDrag","dragReadyEnd","onMouseDrag"].forEach((function(t){e[t]=this[t]}),this),p.addEventListener("mousedown",this.onMouseDown.bind(e));var m,v,$,b,w,y,S,C,x,k,A,E=p.container,R=0;this.onDragStart=function(e){if(this.cancelDrag||!E.draggable){var t=this;return setTimeout((function(){t.startSelect(),t.captureMouse(e)}),0),e.preventDefault()}w=p.getSelectionRange();var n=e.dataTransfer;n.effectAllowed=p.getReadOnly()?"copy":"copyMove",a.isOpera&&(p.container.appendChild(g),g.scrollTop=0),n.setDragImage&&n.setDragImage(g,0,0),a.isOpera&&p.container.removeChild(g),n.clearData(),n.setData("Text",p.session.getTextRange()),C=!0,this.setState("drag")},this.onDragEnd=function(e){if(E.draggable=!1,C=!1,this.setState(null),!p.getReadOnly()){var t=e.dataTransfer.dropEffect;!S&&"move"==t&&p.session.remove(p.getSelectionRange()),p.renderer.$cursorLayer.setBlinking(!0)}this.editor.unsetStyle("ace_dragging"),this.editor.renderer.setCursorStyle("")},this.onDragEnter=function(e){if(!p.getReadOnly()&&d(e.dataTransfer))return v=e.clientX,$=e.clientY,m||n(),R++,e.dataTransfer.dropEffect=S=f(e),o.preventDefault(e)},this.onDragOver=function(e){if(!p.getReadOnly()&&d(e.dataTransfer))return v=e.clientX,$=e.clientY,m||(n(),R++),null!==_&&(_=null),e.dataTransfer.dropEffect=S=f(e),o.preventDefault(e)},this.onDragLeave=function(e){if(--R<=0&&m)return i(),S=null,o.preventDefault(e)},this.onDrop=function(e){if(y){var t=e.dataTransfer;if(C)switch(S){case"move":w=w.contains(y.row,y.column)?{start:y,end:y}:p.moveText(w,y);break;case"copy":w=p.moveText(w,y,!0)}else{var n=t.getData("Text");w={start:y,end:p.session.insert(y,n)},p.focus(),S=null}return i(),o.preventDefault(e)}},o.addListener(E,"dragstart",this.onDragStart.bind(e)),o.addListener(E,"dragend",this.onDragEnd.bind(e)),o.addListener(E,"dragenter",this.onDragEnter.bind(e)),o.addListener(E,"dragover",this.onDragOver.bind(e)),o.addListener(E,"dragleave",this.onDragLeave.bind(e)),o.addListener(E,"drop",this.onDrop.bind(e));var _=null}function r(e,t,n,i){return Math.sqrt(Math.pow(n-e,2)+Math.pow(i-t,2))}var s=e("../lib/dom"),o=e("../lib/event"),a=e("../lib/useragent"),l=200,c=200,u=5;(function(){this.dragWait=function(){Date.now()-this.mousedownEvent.time>this.editor.getDragDelay()&&this.startDrag()},this.dragWaitEnd=function(){this.editor.container.draggable=!1,this.startSelect(this.mousedownEvent.getDocumentPosition()),this.selectEnd()},this.dragReadyEnd=function(e){this.editor.renderer.$cursorLayer.setBlinking(!this.editor.getReadOnly()),this.editor.unsetStyle("ace_dragging"),this.editor.renderer.setCursorStyle(""),this.dragWaitEnd()},this.startDrag=function(){this.cancelDrag=!1;var e=this.editor;e.container.draggable=!0,e.renderer.$cursorLayer.setBlinking(!1),e.setStyle("ace_dragging");var t=a.isWin?"default":"move";e.renderer.setCursorStyle(t),this.setState("dragReady")},this.onMouseDrag=function(e){var t=this.editor.container;a.isIE&&"dragReady"==this.state&&(r(this.mousedownEvent.x,this.mousedownEvent.y,this.x,this.y)>3&&t.dragDrop());"dragWait"===this.state&&(r(this.mousedownEvent.x,this.mousedownEvent.y,this.x,this.y)>0&&(t.draggable=!1,this.startSelect(this.mousedownEvent.getDocumentPosition())))},this.onMouseDown=function(e){if(this.$dragEnabled){this.mousedownEvent=e;var t=this.editor,n=e.inSelection(),i=e.getButton();if(1===(e.domEvent.detail||1)&&0===i&&n){if(e.editor.inMultiSelectMode&&(e.getAccelKey()||e.getShiftKey()))return;this.mousedownEvent.time=Date.now();var r=e.domEvent.target||e.domEvent.srcElement;if("unselectable"in r&&(r.unselectable="on"),t.getDragDelay()){if(a.isWebKit)this.cancelDrag=!0,t.container.draggable=!0;this.setState("dragWait")}else this.startDrag();this.captureMouse(e,this.onMouseDrag.bind(this)),e.defaultPrevented=!0}}}}).call(i.prototype),t.DragdropHandler=i})),ace.define("ace/lib/net",["require","exports","module","ace/lib/dom"],(function(e,t,n){"use strict";var i=e("./dom");t.get=function(e,t){var n=new XMLHttpRequest;n.open("GET",e,!0),n.onreadystatechange=function(){4===n.readyState&&t(n.responseText)},n.send(null)},t.loadScript=function(e,t){var n=i.getDocumentHead(),r=document.createElement("script");r.src=e,n.appendChild(r),r.onload=r.onreadystatechange=function(e,n){!n&&r.readyState&&"loaded"!=r.readyState&&"complete"!=r.readyState||(r=r.onload=r.onreadystatechange=null,n||t())}},t.qualifyURL=function(e){var t=document.createElement("a");return t.href=e,t.href}})),ace.define("ace/lib/event_emitter",["require","exports","module"],(function(e,t,n){"use strict";var i={},r=function(){this.propagationStopped=!0},s=function(){this.defaultPrevented=!0};i._emit=i._dispatchEvent=function(e,t){this._eventRegistry||(this._eventRegistry={}),this._defaultHandlers||(this._defaultHandlers={});var n=this._eventRegistry[e]||[],i=this._defaultHandlers[e];if(n.length||i){"object"==typeof t&&t||(t={}),t.type||(t.type=e),t.stopPropagation||(t.stopPropagation=r),t.preventDefault||(t.preventDefault=s),n=n.slice();for(var o=0;o<n.length&&(n[o](t,this),!t.propagationStopped);o++);return i&&!t.defaultPrevented?i(t,this):void 0}},i._signal=function(e,t){var n=(this._eventRegistry||{})[e];if(n){n=n.slice();for(var i=0;i<n.length;i++)n[i](t,this)}},i.once=function(e,t){var n=this;if(this.addEventListener(e,(function i(){n.removeEventListener(e,i),t.apply(null,arguments)})),!t)return new Promise((function(e){t=e}))},i.setDefaultHandler=function(e,t){var n=this._defaultHandlers;if(n||(n=this._defaultHandlers={_disabled_:{}}),n[e]){var i=n[e],r=n._disabled_[e];r||(n._disabled_[e]=r=[]),r.push(i);var s=r.indexOf(t);-1!=s&&r.splice(s,1)}n[e]=t},i.removeDefaultHandler=function(e,t){var n=this._defaultHandlers;if(n){var i=n._disabled_[e];if(n[e]==t)i&&this.setDefaultHandler(e,i.pop());else if(i){var r=i.indexOf(t);-1!=r&&i.splice(r,1)}}},i.on=i.addEventListener=function(e,t,n){this._eventRegistry=this._eventRegistry||{};var i=this._eventRegistry[e];return i||(i=this._eventRegistry[e]=[]),-1==i.indexOf(t)&&i[n?"unshift":"push"](t),t},i.off=i.removeListener=i.removeEventListener=function(e,t){this._eventRegistry=this._eventRegistry||{};var n=this._eventRegistry[e];if(n){var i=n.indexOf(t);-1!==i&&n.splice(i,1)}},i.removeAllListeners=function(e){this._eventRegistry&&(this._eventRegistry[e]=[])},t.EventEmitter=i})),ace.define("ace/lib/app_config",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],(function(e,t,n){function i(e){"undefined"!=typeof console&&console.warn&&console.warn.apply(console,arguments)}function r(e,t){var n=new Error(e);n.data=t,"object"==typeof console&&console.error&&console.error(n),setTimeout((function(){throw n}))}var s=e("./oop"),o=e("./event_emitter").EventEmitter,a={setOptions:function(e){Object.keys(e).forEach((function(t){this.setOption(t,e[t])}),this)},getOptions:function(e){var t={};if(e)Array.isArray(e)||(t=e,e=Object.keys(t));else{var n=this.$options;e=Object.keys(n).filter((function(e){return!n[e].hidden}))}return e.forEach((function(e){t[e]=this.getOption(e)}),this),t},setOption:function(e,t){if(this["$"+e]!==t){var n=this.$options[e];return n?n.forwardTo?this[n.forwardTo]&&this[n.forwardTo].setOption(e,t):(n.handlesSet||(this["$"+e]=t),void(n&&n.set&&n.set.call(this,t))):i('misspelled option "'+e+'"')}},getOption:function(e){var t=this.$options[e];return t?t.forwardTo?this[t.forwardTo]&&this[t.forwardTo].getOption(e):t&&t.get?t.get.call(this):this["$"+e]:i('misspelled option "'+e+'"')}},l=function(){this.$defaultOptions={}};(function(){s.implement(this,o),this.defineOptions=function(e,t,n){return e.$options||(this.$defaultOptions[t]=e.$options={}),Object.keys(n).forEach((function(t){var i=n[t];"string"==typeof i&&(i={forwardTo:i}),i.name||(i.name=t),e.$options[i.name]=i,"initialValue"in i&&(e["$"+i.name]=i.initialValue)})),s.implement(e,a),this},this.resetOptions=function(e){Object.keys(e.$options).forEach((function(t){var n=e.$options[t];"value"in n&&e.setOption(t,n.value)}))},this.setDefaultValue=function(e,t,n){var i=this.$defaultOptions[e]||(this.$defaultOptions[e]={});i[t]&&(i.forwardTo?this.setDefaultValue(i.forwardTo,t,n):i[t].value=n)},this.setDefaultValues=function(e,t){Object.keys(t).forEach((function(n){this.setDefaultValue(e,n,t[n])}),this)},this.warn=i,this.reportError=r}).call(l.prototype),t.AppConfig=l})),ace.define("ace/config",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/lib/net","ace/lib/app_config"],(function(e,t,n){function i(e){return e.replace(/-(.)/g,(function(e,t){return t.toUpperCase()}))}var r=e("./lib/lang"),s=(e("./lib/oop"),e("./lib/net")),o=e("./lib/app_config").AppConfig;n.exports=t=new o;var a=function(){return this||"undefined"!=typeof window&&window}(),l={packaged:!1,workerPath:null,modePath:null,themePath:null,basePath:"",suffix:".js",$moduleUrls:{}};t.get=function(e){if(!l.hasOwnProperty(e))throw new Error("Unknown config key: "+e);return l[e]},t.set=function(e,t){if(!l.hasOwnProperty(e))throw new Error("Unknown config key: "+e);l[e]=t},t.all=function(){return r.copyObject(l)},t.$modes={},t.moduleUrl=function(e,t){if(l.$moduleUrls[e])return l.$moduleUrls[e];var n=e.split("/"),i="snippets"==(t=t||n[n.length-2]||"")?"/":"-",r=n[n.length-1];if("worker"==t&&"-"==i){var s=new RegExp("^"+t+"[\\-_]|[\\-_]"+t+"$","g");r=r.replace(s,"")}(!r||r==t)&&n.length>1&&(r=n[n.length-2]);var o=l[t+"Path"];return null==o?o=l.basePath:"/"==i&&(t=i=""),o&&"/"!=o.slice(-1)&&(o+="/"),o+t+i+r+this.get("suffix")},t.setModuleUrl=function(e,t){return l.$moduleUrls[e]=t},t.$loading={},t.loadModule=function(n,i){var r,o;Array.isArray(n)&&(o=n[0],n=n[1]);try{r=e(n)}catch(e){}if(r&&!t.$loading[n])return i&&i(r);if(t.$loading[n]||(t.$loading[n]=[]),t.$loading[n].push(i),!(t.$loading[n].length>1)){var a=function(){e([n],(function(e){t._emit("load.module",{name:n,module:e});var i=t.$loading[n];t.$loading[n]=null,i.forEach((function(t){t&&t(e)}))}))};if(!t.get("packaged"))return a();s.loadScript(t.moduleUrl(n,o),a),c()}};var c=function(){!l.basePath&&!l.workerPath&&!l.modePath&&!l.themePath&&!Object.keys(l.$moduleUrls).length&&(console.error("Unable to infer path to ace from script src,","use ace.config.set('basePath', 'path') to enable dynamic loading of modes and themes","or with webpack use ace/webpack-resolver"),c=function(){})};t.init=function(r){if(a&&a.document){l.packaged=r||e.packaged||n.packaged||a.define&&define.packaged;for(var s={},o="",c=document.currentScript||document._currentScript,u=(c&&c.ownerDocument||document).getElementsByTagName("script"),h=0;h<u.length;h++){var d=u[h],f=d.src||d.getAttribute("src");if(f){for(var p=d.attributes,g=0,m=p.length;g<m;g++){var v=p[g];0===v.name.indexOf("data-ace-")&&(s[i(v.name.replace(/^data-ace-/,""))]=v.value)}var $=f.match(/^(.*)\/ace(\-\w+)?\.js(\?|$)/);$&&(o=$[1])}}for(var b in o&&(s.base=s.base||o,s.packaged=!0),s.basePath=s.base,s.workerPath=s.workerPath||s.base,s.modePath=s.modePath||s.base,s.themePath=s.themePath||s.base,delete s.base,s)void 0!==s[b]&&t.set(b,s[b])}}})),ace.define("ace/mouse/mouse_handler",["require","exports","module","ace/lib/event","ace/lib/useragent","ace/mouse/default_handlers","ace/mouse/default_gutter_handler","ace/mouse/mouse_event","ace/mouse/dragdrop_handler","ace/config"],(function(e,t,n){"use strict";var i=e("../lib/event"),r=e("../lib/useragent"),s=e("./default_handlers").DefaultHandlers,o=e("./default_gutter_handler").GutterHandler,a=e("./mouse_event").MouseEvent,l=e("./dragdrop_handler").DragdropHandler,c=e("../config"),u=function(e){var t=this;this.editor=e,new s(this),new o(this),new l(this);var n=function(t){(!document.hasFocus||!document.hasFocus()||!e.isFocused()&&document.activeElement==(e.textInput&&e.textInput.getElement()))&&window.focus(),e.focus()},a=e.renderer.getMouseEventTarget();i.addListener(a,"click",this.onMouseEvent.bind(this,"click")),i.addListener(a,"mousemove",this.onMouseMove.bind(this,"mousemove")),i.addMultiMouseDownListener([a,e.renderer.scrollBarV&&e.renderer.scrollBarV.inner,e.renderer.scrollBarH&&e.renderer.scrollBarH.inner,e.textInput&&e.textInput.getElement()].filter(Boolean),[400,300,250],this,"onMouseEvent"),i.addMouseWheelListener(e.container,this.onMouseWheel.bind(this,"mousewheel")),i.addTouchMoveListener(e.container,this.onTouchMove.bind(this,"touchmove"));var c=e.renderer.$gutter;i.addListener(c,"mousedown",this.onMouseEvent.bind(this,"guttermousedown")),i.addListener(c,"click",this.onMouseEvent.bind(this,"gutterclick")),i.addListener(c,"dblclick",this.onMouseEvent.bind(this,"gutterdblclick")),i.addListener(c,"mousemove",this.onMouseEvent.bind(this,"guttermousemove")),i.addListener(a,"mousedown",n),i.addListener(c,"mousedown",n),r.isIE&&e.renderer.scrollBarV&&(i.addListener(e.renderer.scrollBarV.element,"mousedown",n),i.addListener(e.renderer.scrollBarH.element,"mousedown",n)),e.on("mousemove",(function(n){if(!t.state&&!t.$dragDelay&&t.$dragEnabled){var i=e.renderer.screenToTextCoordinates(n.x,n.y),r=e.session.selection.getRange(),s=e.renderer;!r.isEmpty()&&r.insideStart(i.row,i.column)?s.setCursorStyle("default"):s.setCursorStyle("")}}))};(function(){this.onMouseEvent=function(e,t){this.editor._emit(e,new a(t,this.editor))},this.onMouseMove=function(e,t){var n=this.editor._eventRegistry&&this.editor._eventRegistry.mousemove;n&&n.length&&this.editor._emit(e,new a(t,this.editor))},this.onMouseWheel=function(e,t){var n=new a(t,this.editor);n.speed=2*this.$scrollSpeed,n.wheelX=t.wheelX,n.wheelY=t.wheelY,this.editor._emit(e,n)},this.onTouchMove=function(e,t){var n=new a(t,this.editor);n.speed=1,n.wheelX=t.wheelX,n.wheelY=t.wheelY,this.editor._emit(e,n)},this.setState=function(e){this.state=e},this.captureMouse=function(e,t){this.x=e.x,this.y=e.y,this.isMousePressed=!0;var n=this.editor,s=this.editor.renderer;s.$keepTextAreaAtCursor&&(s.$keepTextAreaAtCursor=null);var o=this,l=function(e){if(e)return r.isWebKit&&!e.which&&o.releaseMouse?o.releaseMouse():(o.x=e.clientX,o.y=e.clientY,t&&t(e),o.mouseEvent=new a(e,o.editor),void(o.$mouseMoved=!0))},c=function(e){n.off("beforeEndOperation",h),clearInterval(d),u(),o[o.state+"End"]&&o[o.state+"End"](e),o.state="",null==s.$keepTextAreaAtCursor&&(s.$keepTextAreaAtCursor=!0,s.$moveTextAreaToCursor()),o.isMousePressed=!1,o.$onCaptureMouseMove=o.releaseMouse=null,e&&o.onMouseEvent("mouseup",e),n.endOperation()},u=function(){o[o.state]&&o[o.state](),o.$mouseMoved=!1};if(r.isOldIE&&"dblclick"==e.domEvent.type)return setTimeout((function(){c(e)}));var h=function(e){o.releaseMouse&&n.curOp.command.name&&n.curOp.selectionChanged&&(o[o.state+"End"]&&o[o.state+"End"](),o.state="",o.releaseMouse())};n.on("beforeEndOperation",h),n.startOperation({command:{name:"mouse"}}),o.$onCaptureMouseMove=l,o.releaseMouse=i.capture(this.editor.container,l,c);var d=setInterval(u,20)},this.releaseMouse=null,this.cancelContextMenu=function(){var e=function(t){t&&t.domEvent&&"contextmenu"!=t.domEvent.type||(this.editor.off("nativecontextmenu",e),t&&t.domEvent&&i.stopEvent(t.domEvent))}.bind(this);setTimeout(e,10),this.editor.on("nativecontextmenu",e)}}).call(u.prototype),c.defineOptions(u.prototype,"mouseHandler",{scrollSpeed:{initialValue:2},dragDelay:{initialValue:r.isMac?150:0},dragEnabled:{initialValue:!0},focusTimeout:{initialValue:0},tooltipFollowsMouse:{initialValue:!0}}),t.MouseHandler=u})),ace.define("ace/mouse/fold_handler",["require","exports","module","ace/lib/dom"],(function(e,t,n){"use strict";var i=e("../lib/dom");t.FoldHandler=function(e){e.on("click",(function(t){var n=t.getDocumentPosition(),r=e.session,s=r.getFoldAt(n.row,n.column,1);s&&(t.getAccelKey()?r.removeFold(s):r.expandFold(s),t.stop());var o=t.domEvent&&t.domEvent.target;o&&i.hasCssClass(o,"ace_inline_button")&&i.hasCssClass(o,"ace_toggle_wrap")&&(r.setOption("wrap",!0),e.renderer.scrollCursorIntoView())})),e.on("gutterclick",(function(t){if("foldWidgets"==e.renderer.$gutterLayer.getRegion(t)){var n=t.getDocumentPosition().row,i=e.session;i.foldWidgets&&i.foldWidgets[n]&&e.session.onFoldWidgetClick(n,t),e.isFocused()||e.focus(),t.stop()}})),e.on("gutterdblclick",(function(t){if("foldWidgets"==e.renderer.$gutterLayer.getRegion(t)){var n=t.getDocumentPosition().row,i=e.session,r=i.getParentFoldRangeData(n,!0),s=r.range||r.firstRange;if(s){n=s.start.row;var o=i.getFoldAt(n,i.getLine(n).length,1);o?i.removeFold(o):(i.addFold("...",s),e.renderer.scrollCursorIntoView({row:s.start.row,column:0}))}t.stop()}}))}})),ace.define("ace/keyboard/keybinding",["require","exports","module","ace/lib/keys","ace/lib/event"],(function(e,t,n){"use strict";var i=e("../lib/keys"),r=e("../lib/event"),s=function(e){this.$editor=e,this.$data={editor:e},this.$handlers=[],this.setDefaultHandler(e.commands)};(function(){this.setDefaultHandler=function(e){this.removeKeyboardHandler(this.$defaultHandler),this.$defaultHandler=e,this.addKeyboardHandler(e,0)},this.setKeyboardHandler=function(e){var t=this.$handlers;if(t[t.length-1]!=e){for(;t[t.length-1]&&t[t.length-1]!=this.$defaultHandler;)this.removeKeyboardHandler(t[t.length-1]);this.addKeyboardHandler(e,1)}},this.addKeyboardHandler=function(e,t){if(e){"function"==typeof e&&!e.handleKeyboard&&(e.handleKeyboard=e);var n=this.$handlers.indexOf(e);-1!=n&&this.$handlers.splice(n,1),null==t?this.$handlers.push(e):this.$handlers.splice(t,0,e),-1==n&&e.attach&&e.attach(this.$editor)}},this.removeKeyboardHandler=function(e){var t=this.$handlers.indexOf(e);return-1!=t&&(this.$handlers.splice(t,1),e.detach&&e.detach(this.$editor),!0)},this.getKeyboardHandler=function(){return this.$handlers[this.$handlers.length-1]},this.getStatusText=function(){var e=this.$data,t=e.editor;return this.$handlers.map((function(n){return n.getStatusText&&n.getStatusText(t,e)||""})).filter(Boolean).join(" ")},this.$callKeyboardHandlers=function(e,t,n,i){for(var s,o=!1,a=this.$editor.commands,l=this.$handlers.length;l--&&!((s=this.$handlers[l].handleKeyboard(this.$data,e,t,n,i))&&s.command&&((o="null"==s.command||a.exec(s.command,this.$editor,s.args,i))&&i&&-1!=e&&1!=s.passEvent&&1!=s.command.passEvent&&r.stopEvent(i),o)););return!o&&-1==e&&(s={command:"insertstring"},o=a.exec("insertstring",this.$editor,t)),o&&this.$editor._signal&&this.$editor._signal("keyboardActivity",s),o},this.onCommandKey=function(e,t,n){var r=i.keyCodeToString(n);this.$callKeyboardHandlers(t,r,n,e)},this.onTextInput=function(e){this.$callKeyboardHandlers(-1,e)}}).call(s.prototype),t.KeyBinding=s})),ace.define("ace/lib/bidiutil",["require","exports","module"],(function(e,t,n){"use strict";function i(e,t,n,i){var r=a?f:d,p=null,g=null,m=null,v=0,$=null,b=-1,S=null,x=null,k=[];if(!i)for(S=0,i=[];S<n;S++)i[S]=o(e[S]);for(l=a,c=!1,!1,u=!1,h=!1,x=0;x<n;x++){if(p=v,k[x]=g=s(e,i,k,x),$=240&(v=r[p][g]),v&=15,t[x]=m=r[v][5],$>0)if(16==$){for(S=b;S<x;S++)t[S]=1;b=-1}else b=-1;if(r[v][6])-1==b&&(b=x);else if(b>-1){for(S=b;S<x;S++)t[S]=m;b=-1}i[x]==w&&(t[x]=0),l|=m}if(h)for(S=0;S<n;S++)if(i[S]==y){t[S]=a;for(var A=S-1;A>=0&&i[A]==C;A--)t[A]=a}}function r(e,t,n){if(!(l<e))if(1!=e||a!=p||u)for(var i,r,s,o,c=n.length,h=0;h<c;){if(t[h]>=e){for(i=h+1;i<c&&t[i]>=e;)i++;for(r=h,s=i-1;r<s;r++,s--)o=n[r],n[r]=n[s],n[s]=o;h=i}h++}else n.reverse()}function s(e,t,n,i){var r,s,o,l,d=t[i];switch(d){case g:case m:c=!1;case b:case $:return d;case v:return c?$:v;case S:return c=!0,!0,m;case C:return b;case x:return i<1||i+1>=t.length||(r=n[i-1])!=v&&r!=$||(s=t[i+1])!=v&&s!=$?b:(c&&(s=$),s==r?s:b);case k:return(r=i>0?n[i-1]:w)==v&&i+1<t.length&&t[i+1]==v?v:b;case A:if(i>0&&n[i-1]==v)return v;if(c)return b;for(l=i+1,o=t.length;l<o&&t[l]==A;)l++;return l<o&&t[l]==v?v:b;case E:for(o=t.length,l=i+1;l<o&&t[l]==E;)l++;if(l<o){var f=e[i],p=f>=1425&&f<=2303||64286==f;if(r=t[l],p&&(r==m||r==S))return m}return i<1||(r=t[i-1])==w?b:n[i-1];case w:return c=!1,u=!0,a;case y:return h=!0,b;case R:case _:case L:case T:case M:c=!1;case P:return b}}function o(e){var t=e.charCodeAt(0),n=t>>8;return 0==n?t>191?g:I[t]:5==n?/[\u0591-\u05f4]/.test(e)?m:g:6==n?/[\u0610-\u061a\u064b-\u065f\u06d6-\u06e4\u06e7-\u06ed]/.test(e)?E:/[\u0660-\u0669\u066b-\u066c]/.test(e)?$:1642==t?A:/[\u06f0-\u06f9]/.test(e)?v:S:32==n&&t<=8287?O[255&t]:254==n&&t>=65136?S:b}var a=0,l=0,c=!1,u=!1,h=!1,d=[[0,3,0,1,0,0,0],[0,3,0,1,2,2,0],[0,3,0,17,2,0,1],[0,3,5,5,4,1,0],[0,3,21,21,4,0,1],[0,3,5,5,4,2,0]],f=[[2,0,1,1,0,1,0],[2,0,1,1,0,2,0],[2,0,2,1,3,2,0],[2,0,2,33,3,1,1]],p=1,g=0,m=1,v=2,$=3,b=4,w=5,y=6,S=7,C=8,x=9,k=10,A=11,E=12,R=13,_=14,M=15,L=16,T=17,P=18,I=[P,P,P,P,P,P,P,P,P,y,w,y,C,w,P,P,P,P,P,P,P,P,P,P,P,P,P,P,w,w,w,y,C,b,b,A,A,A,b,b,b,b,b,k,x,k,x,x,v,v,v,v,v,v,v,v,v,v,x,b,b,b,b,b,b,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,b,b,b,b,b,b,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,b,b,b,b,P,P,P,P,P,P,w,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,x,b,A,A,A,A,b,b,b,b,g,b,b,P,b,b,A,A,v,v,b,g,b,b,b,v,g,b,b,b,b,b],O=[C,C,C,C,C,C,C,C,C,C,C,P,P,P,g,m,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,C,w,R,_,M,L,T,x,A,A,A,A,A,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,x,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,b,C];t.L=g,t.R=m,t.EN=v,t.ON_R=3,t.AN=4,t.R_H=5,t.B=6,t.RLE=7,t.DOT="·",t.doBidiReorder=function(e,n,s){if(e.length<2)return{};var o=e.split(""),l=new Array(o.length),c=new Array(o.length),u=[];a=s?p:0,i(o,u,o.length,n);for(var h=0;h<l.length;l[h]=h,h++);r(2,u,l),r(1,u,l);for(h=0;h<l.length-1;h++)n[h]===$?u[h]=t.AN:u[h]===m&&(n[h]>S&&n[h]<R||n[h]===b||n[h]===P)?u[h]=t.ON_R:h>0&&"ل"===o[h-1]&&/\u0622|\u0623|\u0625|\u0627/.test(o[h])&&(u[h-1]=u[h]=t.R_H,h++);o[o.length-1]===t.DOT&&(u[o.length-1]=t.B),"‫"===o[0]&&(u[0]=t.RLE);for(h=0;h<l.length;h++)c[h]=u[l[h]];return{logicalFromVisual:l,bidiLevels:c}},t.hasBidiCharacters=function(e,t){for(var n=!1,i=0;i<e.length;i++)t[i]=o(e.charAt(i)),!n&&(t[i]==m||t[i]==S||t[i]==$)&&(n=!0);return n},t.getVisualFromLogicalIdx=function(e,t){for(var n=0;n<t.logicalFromVisual.length;n++)if(t.logicalFromVisual[n]==e)return n;return 0}})),ace.define("ace/bidihandler",["require","exports","module","ace/lib/bidiutil","ace/lib/lang"],(function(e,t,n){"use strict";var i=e("./lib/bidiutil"),r=e("./lib/lang"),s=/[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac\u202B]/,o=function(e){this.session=e,this.bidiMap={},this.currentRow=null,this.bidiUtil=i,this.charWidths=[],this.EOL="¬",this.showInvisibles=!0,this.isRtlDir=!1,this.line="",this.wrapIndent=0,this.EOF="¶",this.RLE="‫",this.contentWidth=0,this.fontMetrics=null,this.rtlLineOffset=0,this.wrapOffset=0,this.isMoveLeftOperation=!1,this.seenBidi=s.test(e.getValue())};(function(){this.isBidiRow=function(e,t,n){return!!this.seenBidi&&(e!==this.currentRow&&(this.currentRow=e,this.updateRowLine(t,n),this.updateBidiMap()),this.bidiMap.bidiLevels)},this.onChange=function(e){this.seenBidi?this.currentRow=null:"insert"==e.action&&s.test(e.lines.join("\n"))&&(this.seenBidi=!0,this.currentRow=null)},this.getDocumentRow=function(){var e=0,t=this.session.$screenRowCache;if(t.length){var n=this.session.$getRowCacheIndex(t,this.currentRow);n>=0&&(e=this.session.$docRowCache[n])}return e},this.getSplitIndex=function(){var e=0,t=this.session.$screenRowCache;if(t.length)for(var n,i=this.session.$getRowCacheIndex(t,this.currentRow);this.currentRow-e>0&&(n=this.session.$getRowCacheIndex(t,this.currentRow-e-1))===i;)i=n,e++;else e=this.currentRow;return e},this.updateRowLine=function(e,t){void 0===e&&(e=this.getDocumentRow());var n=e===this.session.getLength()-1?this.EOF:this.EOL;if(this.wrapIndent=0,this.line=this.session.getLine(e),this.isRtlDir=this.line.charAt(0)===this.RLE,this.session.$useWrapMode){var s=this.session.$wrapData[e];s&&(void 0===t&&(t=this.getSplitIndex()),t>0&&s.length?(this.wrapIndent=s.indent,this.wrapOffset=this.wrapIndent*this.charWidths[i.L],this.line=t<s.length?this.line.substring(s[t-1],s[t]):this.line.substring(s[s.length-1])):this.line=this.line.substring(0,s[t])),t==s.length&&(this.line+=this.showInvisibles?n:i.DOT)}else this.line+=this.showInvisibles?n:i.DOT;var o,a=this.session,l=0;this.line=this.line.replace(/\t|[\u1100-\u2029, \u202F-\uFFE6]/g,(function(e,t){return"\t"===e||a.isFullWidth(e.charCodeAt(0))?(o="\t"===e?a.getScreenTabSize(t+l):2,l+=o-1,r.stringRepeat(i.DOT,o)):e})),this.isRtlDir&&(this.fontMetrics.$main.innerHTML=this.line.charAt(this.line.length-1)==i.DOT?this.line.substr(0,this.line.length-1):this.line,this.rtlLineOffset=this.contentWidth-this.fontMetrics.$main.getBoundingClientRect().width)},this.updateBidiMap=function(){var e=[];i.hasBidiCharacters(this.line,e)||this.isRtlDir?this.bidiMap=i.doBidiReorder(this.line,e,this.isRtlDir):this.bidiMap={}},this.markAsDirty=function(){this.currentRow=null},this.updateCharacterWidths=function(e){if(this.characterWidth!==e.$characterSize.width){this.fontMetrics=e;var t=this.characterWidth=e.$characterSize.width,n=e.$measureCharWidth("ה");this.charWidths[i.L]=this.charWidths[i.EN]=this.charWidths[i.ON_R]=t,this.charWidths[i.R]=this.charWidths[i.AN]=n,this.charWidths[i.R_H]=.45*n,this.charWidths[i.B]=this.charWidths[i.RLE]=0,this.currentRow=null}},this.setShowInvisibles=function(e){this.showInvisibles=e,this.currentRow=null},this.setEolChar=function(e){this.EOL=e},this.setContentWidth=function(e){this.contentWidth=e},this.isRtlLine=function(e){return null!=e?this.session.getLine(e).charAt(0)==this.RLE:this.isRtlDir},this.setRtlDirection=function(e,t){for(var n=e.getCursorPosition(),i=e.selection.getSelectionAnchor().row;i<=n.row;i++)t||e.session.getLine(i).charAt(0)!==e.session.$bidiHandler.RLE?t&&e.session.getLine(i).charAt(0)!==e.session.$bidiHandler.RLE&&e.session.doc.insert({column:0,row:i},e.session.$bidiHandler.RLE):e.session.doc.removeInLine(i,0,1)},this.getPosLeft=function(e){e-=this.wrapIndent;var t=this.line.charAt(0)===this.RLE?1:0,n=e>t?this.session.getOverwrite()?e:e-1:t,r=i.getVisualFromLogicalIdx(n,this.bidiMap),s=this.bidiMap.bidiLevels,o=0;!this.session.getOverwrite()&&e<=t&&s[r]%2!=0&&r++;for(var a=0;a<r;a++)o+=this.charWidths[s[a]];return!this.session.getOverwrite()&&e>t&&s[r]%2==0&&(o+=this.charWidths[s[r]]),this.wrapIndent&&(o+=this.isRtlDir?-1*this.wrapOffset:this.wrapOffset),this.isRtlDir&&(o+=this.rtlLineOffset),o},this.getSelections=function(e,t){var n,i=this.bidiMap,r=i.bidiLevels,s=[],o=0,a=Math.min(e,t)-this.wrapIndent,l=Math.max(e,t)-this.wrapIndent,c=!1,u=!1,h=0;this.wrapIndent&&(o+=this.isRtlDir?-1*this.wrapOffset:this.wrapOffset);for(var d,f=0;f<r.length;f++)d=i.logicalFromVisual[f],n=r[f],(c=d>=a&&d<l)&&!u?h=o:!c&&u&&s.push({left:h,width:o-h}),o+=this.charWidths[n],u=c;if(c&&f===r.length&&s.push({left:h,width:o-h}),this.isRtlDir)for(var p=0;p<s.length;p++)s[p].left+=this.rtlLineOffset;return s},this.offsetToCol=function(e){this.isRtlDir&&(e-=this.rtlLineOffset);var t=0,n=(e=Math.max(e,0),0),i=0,r=this.bidiMap.bidiLevels,s=this.charWidths[r[i]];for(this.wrapIndent&&(e-=this.isRtlDir?-1*this.wrapOffset:this.wrapOffset);e>n+s/2;){if(n+=s,i===r.length-1){s=0;break}s=this.charWidths[r[++i]]}return i>0&&r[i-1]%2!=0&&r[i]%2==0?(e<n&&i--,t=this.bidiMap.logicalFromVisual[i]):i>0&&r[i-1]%2==0&&r[i]%2!=0?t=1+(e>n?this.bidiMap.logicalFromVisual[i]:this.bidiMap.logicalFromVisual[i-1]):this.isRtlDir&&i===r.length-1&&0===s&&r[i-1]%2==0||!this.isRtlDir&&0===i&&r[i]%2!=0?t=1+this.bidiMap.logicalFromVisual[i]:(i>0&&r[i-1]%2!=0&&0!==s&&i--,t=this.bidiMap.logicalFromVisual[i]),0===t&&this.isRtlDir&&t++,t+this.wrapIndent}}).call(o.prototype),t.BidiHandler=o})),ace.define("ace/selection",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/lib/event_emitter","ace/range"],(function(e,t,n){"use strict";var i=e("./lib/oop"),r=e("./lib/lang"),s=e("./lib/event_emitter").EventEmitter,o=e("./range").Range,a=function(e){this.session=e,this.doc=e.getDocument(),this.clearSelection(),this.cursor=this.lead=this.doc.createAnchor(0,0),this.anchor=this.doc.createAnchor(0,0),this.$silent=!1;var t=this;this.cursor.on("change",(function(e){t.$cursorChanged=!0,t.$silent||t._emit("changeCursor"),!t.$isEmpty&&!t.$silent&&t._emit("changeSelection"),!t.$keepDesiredColumnOnChange&&e.old.column!=e.value.column&&(t.$desiredColumn=null)})),this.anchor.on("change",(function(){t.$anchorChanged=!0,!t.$isEmpty&&!t.$silent&&t._emit("changeSelection")}))};(function(){i.implement(this,s),this.isEmpty=function(){return this.$isEmpty||this.anchor.row==this.lead.row&&this.anchor.column==this.lead.column},this.isMultiLine=function(){return!this.$isEmpty&&this.anchor.row!=this.cursor.row},this.getCursor=function(){return this.lead.getPosition()},this.setSelectionAnchor=function(e,t){this.$isEmpty=!1,this.anchor.setPosition(e,t)},this.getAnchor=this.getSelectionAnchor=function(){return this.$isEmpty?this.getSelectionLead():this.anchor.getPosition()},this.getSelectionLead=function(){return this.lead.getPosition()},this.isBackwards=function(){var e=this.anchor,t=this.lead;return e.row>t.row||e.row==t.row&&e.column>t.column},this.getRange=function(){var e=this.anchor,t=this.lead;return this.$isEmpty?o.fromPoints(t,t):this.isBackwards()?o.fromPoints(t,e):o.fromPoints(e,t)},this.clearSelection=function(){this.$isEmpty||(this.$isEmpty=!0,this._emit("changeSelection"))},this.selectAll=function(){this.$setSelection(0,0,Number.MAX_VALUE,Number.MAX_VALUE)},this.setRange=this.setSelectionRange=function(e,t){var n=t?e.end:e.start,i=t?e.start:e.end;this.$setSelection(n.row,n.column,i.row,i.column)},this.$setSelection=function(e,t,n,i){var r=this.$isEmpty,s=this.inMultiSelectMode;this.$silent=!0,this.$cursorChanged=this.$anchorChanged=!1,this.anchor.setPosition(e,t),this.cursor.setPosition(n,i),this.$isEmpty=!o.comparePoints(this.anchor,this.cursor),this.$silent=!1,this.$cursorChanged&&this._emit("changeCursor"),(this.$cursorChanged||this.$anchorChanged||r!=this.$isEmpty||s)&&this._emit("changeSelection")},this.$moveSelection=function(e){var t=this.lead;this.$isEmpty&&this.setSelectionAnchor(t.row,t.column),e.call(this)},this.selectTo=function(e,t){this.$moveSelection((function(){this.moveCursorTo(e,t)}))},this.selectToPosition=function(e){this.$moveSelection((function(){this.moveCursorToPosition(e)}))},this.moveTo=function(e,t){this.clearSelection(),this.moveCursorTo(e,t)},this.moveToPosition=function(e){this.clearSelection(),this.moveCursorToPosition(e)},this.selectUp=function(){this.$moveSelection(this.moveCursorUp)},this.selectDown=function(){this.$moveSelection(this.moveCursorDown)},this.selectRight=function(){this.$moveSelection(this.moveCursorRight)},this.selectLeft=function(){this.$moveSelection(this.moveCursorLeft)},this.selectLineStart=function(){this.$moveSelection(this.moveCursorLineStart)},this.selectLineEnd=function(){this.$moveSelection(this.moveCursorLineEnd)},this.selectFileEnd=function(){this.$moveSelection(this.moveCursorFileEnd)},this.selectFileStart=function(){this.$moveSelection(this.moveCursorFileStart)},this.selectWordRight=function(){this.$moveSelection(this.moveCursorWordRight)},this.selectWordLeft=function(){this.$moveSelection(this.moveCursorWordLeft)},this.getWordRange=function(e,t){if(void 0===t){var n=e||this.lead;e=n.row,t=n.column}return this.session.getWordRange(e,t)},this.selectWord=function(){this.setSelectionRange(this.getWordRange())},this.selectAWord=function(){var e=this.getCursor(),t=this.session.getAWordRange(e.row,e.column);this.setSelectionRange(t)},this.getLineRange=function(e,t){var n,i="number"==typeof e?e:this.lead.row,r=this.session.getFoldLine(i);return r?(i=r.start.row,n=r.end.row):n=i,!0===t?new o(i,0,n,this.session.getLine(n).length):new o(i,0,n+1,0)},this.selectLine=function(){this.setSelectionRange(this.getLineRange())},this.moveCursorUp=function(){this.moveCursorBy(-1,0)},this.moveCursorDown=function(){this.moveCursorBy(1,0)},this.wouldMoveIntoSoftTab=function(e,t,n){var i=e.column,r=e.column+t;return n<0&&(i=e.column-t,r=e.column),this.session.isTabStop(e)&&this.doc.getLine(e.row).slice(i,r).split(" ").length-1==t},this.moveCursorLeft=function(){var e,t=this.lead.getPosition();if(e=this.session.getFoldAt(t.row,t.column,-1))this.moveCursorTo(e.start.row,e.start.column);else if(0===t.column)t.row>0&&this.moveCursorTo(t.row-1,this.doc.getLine(t.row-1).length);else{var n=this.session.getTabSize();this.wouldMoveIntoSoftTab(t,n,-1)&&!this.session.getNavigateWithinSoftTabs()?this.moveCursorBy(0,-n):this.moveCursorBy(0,-1)}},this.moveCursorRight=function(){var e,t=this.lead.getPosition();if(e=this.session.getFoldAt(t.row,t.column,1))this.moveCursorTo(e.end.row,e.end.column);else if(this.lead.column==this.doc.getLine(this.lead.row).length)this.lead.row<this.doc.getLength()-1&&this.moveCursorTo(this.lead.row+1,0);else{var n=this.session.getTabSize();t=this.lead;this.wouldMoveIntoSoftTab(t,n,1)&&!this.session.getNavigateWithinSoftTabs()?this.moveCursorBy(0,n):this.moveCursorBy(0,1)}},this.moveCursorLineStart=function(){var e=this.lead.row,t=this.lead.column,n=this.session.documentToScreenRow(e,t),i=this.session.screenToDocumentPosition(n,0),r=this.session.getDisplayLine(e,null,i.row,i.column).match(/^\s*/);r[0].length!=t&&!this.session.$useEmacsStyleLineStart&&(i.column+=r[0].length),this.moveCursorToPosition(i)},this.moveCursorLineEnd=function(){var e=this.lead,t=this.session.getDocumentLastRowColumnPosition(e.row,e.column);if(this.lead.column==t.column){var n=this.session.getLine(t.row);if(t.column==n.length){var i=n.search(/\s+$/);i>0&&(t.column=i)}}this.moveCursorTo(t.row,t.column)},this.moveCursorFileEnd=function(){var e=this.doc.getLength()-1,t=this.doc.getLine(e).length;this.moveCursorTo(e,t)},this.moveCursorFileStart=function(){this.moveCursorTo(0,0)},this.moveCursorLongWordRight=function(){var e=this.lead.row,t=this.lead.column,n=this.doc.getLine(e),i=n.substring(t);this.session.nonTokenRe.lastIndex=0,this.session.tokenRe.lastIndex=0;var r=this.session.getFoldAt(e,t,1);if(r)this.moveCursorTo(r.end.row,r.end.column);else{if(this.session.nonTokenRe.exec(i)&&(t+=this.session.nonTokenRe.lastIndex,this.session.nonTokenRe.lastIndex=0,i=n.substring(t)),t>=n.length)return this.moveCursorTo(e,n.length),this.moveCursorRight(),void(e<this.doc.getLength()-1&&this.moveCursorWordRight());this.session.tokenRe.exec(i)&&(t+=this.session.tokenRe.lastIndex,this.session.tokenRe.lastIndex=0),this.moveCursorTo(e,t)}},this.moveCursorLongWordLeft=function(){var e,t=this.lead.row,n=this.lead.column;if(e=this.session.getFoldAt(t,n,-1))this.moveCursorTo(e.start.row,e.start.column);else{var i=this.session.getFoldStringAt(t,n,-1);null==i&&(i=this.doc.getLine(t).substring(0,n));var s=r.stringReverse(i);if(this.session.nonTokenRe.lastIndex=0,this.session.tokenRe.lastIndex=0,this.session.nonTokenRe.exec(s)&&(n-=this.session.nonTokenRe.lastIndex,s=s.slice(this.session.nonTokenRe.lastIndex),this.session.nonTokenRe.lastIndex=0),n<=0)return this.moveCursorTo(t,0),this.moveCursorLeft(),void(t>0&&this.moveCursorWordLeft());this.session.tokenRe.exec(s)&&(n-=this.session.tokenRe.lastIndex,this.session.tokenRe.lastIndex=0),this.moveCursorTo(t,n)}},this.$shortWordEndIndex=function(e){var t,n=0,i=/\s/,r=this.session.tokenRe;if(r.lastIndex=0,this.session.tokenRe.exec(e))n=this.session.tokenRe.lastIndex;else{for(;(t=e[n])&&i.test(t);)n++;if(n<1)for(r.lastIndex=0;(t=e[n])&&!r.test(t);)if(r.lastIndex=0,n++,i.test(t)){if(n>2){n--;break}for(;(t=e[n])&&i.test(t);)n++;if(n>2)break}}return r.lastIndex=0,n},this.moveCursorShortWordRight=function(){var e=this.lead.row,t=this.lead.column,n=this.doc.getLine(e),i=n.substring(t),r=this.session.getFoldAt(e,t,1);if(r)return this.moveCursorTo(r.end.row,r.end.column);if(t==n.length){var s=this.doc.getLength();do{e++,i=this.doc.getLine(e)}while(e<s&&/^\s*$/.test(i));/^\s+/.test(i)||(i=""),t=0}var o=this.$shortWordEndIndex(i);this.moveCursorTo(e,t+o)},this.moveCursorShortWordLeft=function(){var e,t=this.lead.row,n=this.lead.column;if(e=this.session.getFoldAt(t,n,-1))return this.moveCursorTo(e.start.row,e.start.column);var i=this.session.getLine(t).substring(0,n);if(0===n){do{t--,i=this.doc.getLine(t)}while(t>0&&/^\s*$/.test(i));n=i.length,/\s+$/.test(i)||(i="")}var s=r.stringReverse(i),o=this.$shortWordEndIndex(s);return this.moveCursorTo(t,n-o)},this.moveCursorWordRight=function(){this.session.$selectLongWords?this.moveCursorLongWordRight():this.moveCursorShortWordRight()},this.moveCursorWordLeft=function(){this.session.$selectLongWords?this.moveCursorLongWordLeft():this.moveCursorShortWordLeft()},this.moveCursorBy=function(e,t){var n,i=this.session.documentToScreenPosition(this.lead.row,this.lead.column);0===t&&(0!==e&&(this.session.$bidiHandler.isBidiRow(i.row,this.lead.row)?(n=this.session.$bidiHandler.getPosLeft(i.column),i.column=Math.round(n/this.session.$bidiHandler.charWidths[0])):n=i.column*this.session.$bidiHandler.charWidths[0]),this.$desiredColumn?i.column=this.$desiredColumn:this.$desiredColumn=i.column);var r=this.session.screenToDocumentPosition(i.row+e,i.column,n);0!==e&&0===t&&r.row===this.lead.row&&r.column===this.lead.column&&this.session.lineWidgets&&this.session.lineWidgets[r.row]&&(r.row>0||e>0)&&r.row++,this.moveCursorTo(r.row,r.column+t,0===t)},this.moveCursorToPosition=function(e){this.moveCursorTo(e.row,e.column)},this.moveCursorTo=function(e,t,n){var i=this.session.getFoldAt(e,t,1);i&&(e=i.start.row,t=i.start.column),this.$keepDesiredColumnOnChange=!0;var r=this.session.getLine(e);/[\uDC00-\uDFFF]/.test(r.charAt(t))&&r.charAt(t-1)&&(this.lead.row==e&&this.lead.column==t+1?t-=1:t+=1),this.lead.setPosition(e,t),this.$keepDesiredColumnOnChange=!1,n||(this.$desiredColumn=null)},this.moveCursorToScreen=function(e,t,n){var i=this.session.screenToDocumentPosition(e,t);this.moveCursorTo(i.row,i.column,n)},this.detach=function(){this.lead.detach(),this.anchor.detach(),this.session=this.doc=null},this.fromOrientedRange=function(e){this.setSelectionRange(e,e.cursor==e.start),this.$desiredColumn=e.desiredColumn||this.$desiredColumn},this.toOrientedRange=function(e){var t=this.getRange();return e?(e.start.column=t.start.column,e.start.row=t.start.row,e.end.column=t.end.column,e.end.row=t.end.row):e=t,e.cursor=this.isBackwards()?e.start:e.end,e.desiredColumn=this.$desiredColumn,e},this.getRangeOfMovements=function(e){var t=this.getCursor();try{e(this);var n=this.getCursor();return o.fromPoints(t,n)}catch(e){return o.fromPoints(t,t)}finally{this.moveCursorToPosition(t)}},this.toJSON=function(){if(this.rangeCount)var e=this.ranges.map((function(e){var t=e.clone();return t.isBackwards=e.cursor==e.start,t}));else(e=this.getRange()).isBackwards=this.isBackwards();return e},this.fromJSON=function(e){if(null==e.start){if(this.rangeList){this.toSingleRange(e[0]);for(var t=e.length;t--;){var n=o.fromPoints(e[t].start,e[t].end);e[t].isBackwards&&(n.cursor=n.start),this.addRange(n,!0)}return}e=e[0]}this.rangeList&&this.toSingleRange(e),this.setSelectionRange(e,e.isBackwards)},this.isEqual=function(e){if((e.length||this.rangeCount)&&e.length!=this.rangeCount)return!1;if(!e.length||!this.ranges)return this.getRange().isEqual(e);for(var t=this.ranges.length;t--;)if(!this.ranges[t].isEqual(e[t]))return!1;return!0}}).call(a.prototype),t.Selection=a})),ace.define("ace/tokenizer",["require","exports","module","ace/config"],(function(e,t,n){"use strict";var i=e("./config"),r=2e3,s=function(e){for(var t in this.states=e,this.regExps={},this.matchMappings={},this.states){for(var n=this.states[t],i=[],r=0,s=this.matchMappings[t]={defaultToken:"text"},o="g",a=[],l=0;l<n.length;l++){var c=n[l];if(c.defaultToken&&(s.defaultToken=c.defaultToken),c.caseInsensitive&&(o="gi"),null!=c.regex){c.regex instanceof RegExp&&(c.regex=c.regex.toString().slice(1,-1));var u=c.regex,h=new RegExp("(?:("+u+")|(.))").exec("a").length-2;Array.isArray(c.token)?1==c.token.length||1==h?c.token=c.token[0]:h-1!=c.token.length?(this.reportError("number of classes and regexp groups doesn't match",{rule:c,groupCount:h-1}),c.token=c.token[0]):(c.tokenArray=c.token,c.token=null,c.onMatch=this.$arrayTokens):"function"==typeof c.token&&!c.onMatch&&(c.onMatch=h>1?this.$applyToken:c.token),h>1&&(/\\\d/.test(c.regex)?u=c.regex.replace(/\\([0-9]+)/g,(function(e,t){return"\\"+(parseInt(t,10)+r+1)})):(h=1,u=this.removeCapturingGroups(c.regex)),!c.splitRegex&&"string"!=typeof c.token&&a.push(c)),s[r]=l,r+=h,i.push(u),c.onMatch||(c.onMatch=null)}}i.length||(s[0]=0,i.push("$")),a.forEach((function(e){e.splitRegex=this.createSplitterRegexp(e.regex,o)}),this),this.regExps[t]=new RegExp("("+i.join(")|(")+")|($)",o)}};(function(){this.$setMaxTokenCount=function(e){r=0|e},this.$applyToken=function(e){var t=this.splitRegex.exec(e).slice(1),n=this.token.apply(this,t);if("string"==typeof n)return[{type:n,value:e}];for(var i=[],r=0,s=n.length;r<s;r++)t[r]&&(i[i.length]={type:n[r],value:t[r]});return i},this.$arrayTokens=function(e){if(!e)return[];var t=this.splitRegex.exec(e);if(!t)return"text";for(var n=[],i=this.tokenArray,r=0,s=i.length;r<s;r++)t[r+1]&&(n[n.length]={type:i[r],value:t[r+1]});return n},this.removeCapturingGroups=function(e){return e.replace(/\\.|\[(?:\\.|[^\\\]])*|\(\?[:=!]|(\()/g,(function(e,t){return t?"(?:":e}))},this.createSplitterRegexp=function(e,t){if(-1!=e.indexOf("(?=")){var n=0,i=!1,r={};e.replace(/(\\.)|(\((?:\?[=!])?)|(\))|([\[\]])/g,(function(e,t,s,o,a,l){return i?i="]"!=a:a?i=!0:o?(n==r.stack&&(r.end=l+1,r.stack=-1),n--):s&&(n++,1!=s.length&&(r.stack=n,r.start=l)),e})),null!=r.end&&/^\)*$/.test(e.substr(r.end))&&(e=e.substring(0,r.start)+e.substr(r.end))}return"^"!=e.charAt(0)&&(e="^"+e),"$"!=e.charAt(e.length-1)&&(e+="$"),new RegExp(e,(t||"").replace("g",""))},this.getLineTokens=function(e,t){if(t&&"string"!=typeof t){var n=t.slice(0);"#tmp"===(t=n[0])&&(n.shift(),t=n.shift())}else n=[];var i=t||"start",s=this.states[i];s||(i="start",s=this.states[i]);var o=this.matchMappings[i],a=this.regExps[i];a.lastIndex=0;for(var l,c=[],u=0,h=0,d={type:null,value:""};l=a.exec(e);){var f=o.defaultToken,p=null,g=l[0],m=a.lastIndex;if(m-g.length>u){var v=e.substring(u,m-g.length);d.type==f?d.value+=v:(d.type&&c.push(d),d={type:f,value:v})}for(var $=0;$<l.length-2;$++)if(void 0!==l[$+1]){f=(p=s[o[$]]).onMatch?p.onMatch(g,i,n,e):p.token,p.next&&(i="string"==typeof p.next?p.next:p.next(i,n),(s=this.states[i])||(this.reportError("state doesn't exist",i),i="start",s=this.states[i]),o=this.matchMappings[i],u=m,(a=this.regExps[i]).lastIndex=m),p.consumeLineEnd&&(u=m);break}if(g)if("string"==typeof f)p&&!1===p.merge||d.type!==f?(d.type&&c.push(d),d={type:f,value:g}):d.value+=g;else if(f){d.type&&c.push(d),d={type:null,value:""};for($=0;$<f.length;$++)c.push(f[$])}if(u==e.length)break;if(u=m,h++>r){for(h>2*e.length&&this.reportError("infinite loop with in ace tokenizer",{startState:t,line:e});u<e.length;)d.type&&c.push(d),d={value:e.substring(u,u+=2e3),type:"overflow"};i="start",n=[];break}}return d.type&&c.push(d),n.length>1&&n[0]!==i&&n.unshift("#tmp",i),{tokens:c,state:n.length?n:i}},this.reportError=i.reportError}).call(s.prototype),t.Tokenizer=s})),ace.define("ace/mode/text_highlight_rules",["require","exports","module","ace/lib/lang"],(function(e,t,n){"use strict";var i=e("../lib/lang"),r=function(){this.$rules={start:[{token:"empty_line",regex:"^$"},{defaultToken:"text"}]}};(function(){this.addRules=function(e,t){if(t)for(var n in e){for(var i=e[n],r=0;r<i.length;r++){var s=i[r];(s.next||s.onMatch)&&("string"==typeof s.next&&0!==s.next.indexOf(t)&&(s.next=t+s.next),s.nextState&&0!==s.nextState.indexOf(t)&&(s.nextState=t+s.nextState))}this.$rules[t+n]=i}else for(var n in e)this.$rules[n]=e[n]},this.getRules=function(){return this.$rules},this.embedRules=function(e,t,n,r,s){var o="function"==typeof e?(new e).getRules():e;if(r)for(var a=0;a<r.length;a++)r[a]=t+r[a];else for(var l in r=[],o)r.push(t+l);if(this.addRules(o,t),n){var c=Array.prototype[s?"push":"unshift"];for(a=0;a<r.length;a++)c.apply(this.$rules[r[a]],i.deepCopy(n))}this.$embeds||(this.$embeds=[]),this.$embeds.push(t)},this.getEmbeds=function(){return this.$embeds};var e=function(e,t){return("start"!=e||t.length)&&t.unshift(this.nextState,e),this.nextState},t=function(e,t){return t.shift(),t.shift()||"start"};this.normalizeRules=function(){var n=0,i=this.$rules;Object.keys(i).forEach((function r(s){var o=i[s];o.processed=!0;for(var a=0;a<o.length;a++){var l=o[a],c=null;Array.isArray(l)&&(c=l,l={}),!l.regex&&l.start&&(l.regex=l.start,l.next||(l.next=[]),l.next.push({defaultToken:l.token},{token:l.token+".end",regex:l.end||l.start,next:"pop"}),l.token=l.token+".start",l.push=!0);var u=l.next||l.push;if(u&&Array.isArray(u)){var h=l.stateName;h||("string"!=typeof(h=l.token)&&(h=h[0]||""),i[h]&&(h+=n++)),i[h]=u,l.next=h,r(h)}else"pop"==u&&(l.next=t);if(l.push&&(l.nextState=l.next||l.push,l.next=e,delete l.push),l.rules)for(var d in l.rules)i[d]?i[d].push&&i[d].push.apply(i[d],l.rules[d]):i[d]=l.rules[d];var f="string"==typeof l?l:l.include;if(f&&(c=Array.isArray(f)?f.map((function(e){return i[e]})):i[f]),c){var p=[a,1].concat(c);l.noEscape&&(p=p.filter((function(e){return!e.next}))),o.splice.apply(o,p),a--}l.keywordMap&&(l.token=this.createKeywordMapper(l.keywordMap,l.defaultToken||"text",l.caseInsensitive),delete l.defaultToken)}}),this)},this.createKeywordMapper=function(e,t,n,i){var r=Object.create(null);return Object.keys(e).forEach((function(t){var s=e[t];n&&(s=s.toLowerCase());for(var o=s.split(i||"|"),a=o.length;a--;)r[o[a]]=t})),Object.getPrototypeOf(r)&&(r.__proto__=null),this.$keywordList=Object.keys(r),e=null,n?function(e){return r[e.toLowerCase()]||t}:function(e){return r[e]||t}},this.getKeywords=function(){return this.$keywords}}).call(r.prototype),t.TextHighlightRules=r})),ace.define("ace/mode/behaviour",["require","exports","module"],(function(e,t,n){"use strict";var i=function(){this.$behaviours={}};(function(){this.add=function(e,t,n){switch(void 0){case this.$behaviours:this.$behaviours={};case this.$behaviours[e]:this.$behaviours[e]={}}this.$behaviours[e][t]=n},this.addBehaviours=function(e){for(var t in e)for(var n in e[t])this.add(t,n,e[t][n])},this.remove=function(e){this.$behaviours&&this.$behaviours[e]&&delete this.$behaviours[e]},this.inherit=function(e,t){if("function"==typeof e)var n=(new e).getBehaviours(t);else n=e.getBehaviours(t);this.addBehaviours(n)},this.getBehaviours=function(e){if(!e)return this.$behaviours;for(var t={},n=0;n<e.length;n++)this.$behaviours[e[n]]&&(t[e[n]]=this.$behaviours[e[n]]);return t}}).call(i.prototype),t.Behaviour=i})),ace.define("ace/token_iterator",["require","exports","module","ace/range"],(function(e,t,n){"use strict";var i=e("./range").Range,r=function(e,t,n){this.$session=e,this.$row=t,this.$rowTokens=e.getTokens(t);var i=e.getTokenAt(t,n);this.$tokenIndex=i?i.index:-1};(function(){this.stepBackward=function(){for(this.$tokenIndex-=1;this.$tokenIndex<0;){if(this.$row-=1,this.$row<0)return this.$row=0,null;this.$rowTokens=this.$session.getTokens(this.$row),this.$tokenIndex=this.$rowTokens.length-1}return this.$rowTokens[this.$tokenIndex]},this.stepForward=function(){var e;for(this.$tokenIndex+=1;this.$tokenIndex>=this.$rowTokens.length;){if(this.$row+=1,e||(e=this.$session.getLength()),this.$row>=e)return this.$row=e-1,null;this.$rowTokens=this.$session.getTokens(this.$row),this.$tokenIndex=0}return this.$rowTokens[this.$tokenIndex]},this.getCurrentToken=function(){return this.$rowTokens[this.$tokenIndex]},this.getCurrentTokenRow=function(){return this.$row},this.getCurrentTokenColumn=function(){var e=this.$rowTokens,t=this.$tokenIndex,n=e[t].start;if(void 0!==n)return n;for(n=0;t>0;)n+=e[t-=1].value.length;return n},this.getCurrentTokenPosition=function(){return{row:this.$row,column:this.getCurrentTokenColumn()}},this.getCurrentTokenRange=function(){var e=this.$rowTokens[this.$tokenIndex],t=this.getCurrentTokenColumn();return new i(this.$row,t,this.$row,t+e.value.length)}}).call(r.prototype),t.TokenIterator=r})),ace.define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"],(function(e,t,n){"use strict";var i,r=e("../../lib/oop"),s=e("../behaviour").Behaviour,o=e("../../token_iterator").TokenIterator,a=e("../../lib/lang"),l=["text","paren.rparen","punctuation.operator"],c=["text","paren.rparen","punctuation.operator","comment"],u={},h={'"':'"',"'":"'"},d=function(e){var t=-1;if(e.multiSelect&&(t=e.selection.index,u.rangeCount!=e.multiSelect.rangeCount&&(u={rangeCount:e.multiSelect.rangeCount})),u[t])return i=u[t];i=u[t]={autoInsertedBrackets:0,autoInsertedRow:-1,autoInsertedLineEnd:"",maybeInsertedBrackets:0,maybeInsertedRow:-1,maybeInsertedLineStart:"",maybeInsertedLineEnd:""}},f=function(e,t,n,i){var r=e.end.row-e.start.row;return{text:n+t+i,selection:[0,e.start.column+1,r,e.end.column+(r?0:1)]}},p=function(e){this.add("braces","insertion",(function(t,n,r,s,o){var l=r.getCursorPosition(),c=s.doc.getLine(l.row);if("{"==o){d(r);var u=r.getSelectionRange(),h=s.doc.getTextRange(u);if(""!==h&&"{"!==h&&r.getWrapBehavioursEnabled())return f(u,h,"{","}");if(p.isSaneInsertion(r,s))return/[\]\}\)]/.test(c[l.column])||r.inMultiSelectMode||e&&e.braces?(p.recordAutoInsert(r,s,"}"),{text:"{}",selection:[1,1]}):(p.recordMaybeInsert(r,s,"{"),{text:"{",selection:[1,1]})}else if("}"==o){if(d(r),"}"==c.substring(l.column,l.column+1))if(null!==s.$findOpeningBracket("}",{column:l.column+1,row:l.row})&&p.isAutoInsertedClosing(l,c,o))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}else{if("\n"==o||"\r\n"==o){d(r);var g="";if(p.isMaybeInsertedClosing(l,c)&&(g=a.stringRepeat("}",i.maybeInsertedBrackets),p.clearMaybeInsertedClosing()),"}"===c.substring(l.column,l.column+1)){var m=s.findMatchingBracket({row:l.row,column:l.column+1},"}");if(!m)return null;var v=this.$getIndent(s.getLine(m.row))}else{if(!g)return void p.clearMaybeInsertedClosing();v=this.$getIndent(c)}var $=v+s.getTabString();return{text:"\n"+$+"\n"+v+g,selection:[1,$.length,1,$.length]}}p.clearMaybeInsertedClosing()}})),this.add("braces","deletion",(function(e,t,n,r,s){var o=r.doc.getTextRange(s);if(!s.isMultiLine()&&"{"==o){if(d(n),"}"==r.doc.getLine(s.start.row).substring(s.end.column,s.end.column+1))return s.end.column++,s;i.maybeInsertedBrackets--}})),this.add("parens","insertion",(function(e,t,n,i,r){if("("==r){d(n);var s=n.getSelectionRange(),o=i.doc.getTextRange(s);if(""!==o&&n.getWrapBehavioursEnabled())return f(s,o,"(",")");if(p.isSaneInsertion(n,i))return p.recordAutoInsert(n,i,")"),{text:"()",selection:[1,1]}}else if(")"==r){d(n);var a=n.getCursorPosition(),l=i.doc.getLine(a.row);if(")"==l.substring(a.column,a.column+1))if(null!==i.$findOpeningBracket(")",{column:a.column+1,row:a.row})&&p.isAutoInsertedClosing(a,l,r))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}})),this.add("parens","deletion",(function(e,t,n,i,r){var s=i.doc.getTextRange(r);if(!r.isMultiLine()&&"("==s&&(d(n),")"==i.doc.getLine(r.start.row).substring(r.start.column+1,r.start.column+2)))return r.end.column++,r})),this.add("brackets","insertion",(function(e,t,n,i,r){if("["==r){d(n);var s=n.getSelectionRange(),o=i.doc.getTextRange(s);if(""!==o&&n.getWrapBehavioursEnabled())return f(s,o,"[","]");if(p.isSaneInsertion(n,i))return p.recordAutoInsert(n,i,"]"),{text:"[]",selection:[1,1]}}else if("]"==r){d(n);var a=n.getCursorPosition(),l=i.doc.getLine(a.row);if("]"==l.substring(a.column,a.column+1))if(null!==i.$findOpeningBracket("]",{column:a.column+1,row:a.row})&&p.isAutoInsertedClosing(a,l,r))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}})),this.add("brackets","deletion",(function(e,t,n,i,r){var s=i.doc.getTextRange(r);if(!r.isMultiLine()&&"["==s&&(d(n),"]"==i.doc.getLine(r.start.row).substring(r.start.column+1,r.start.column+2)))return r.end.column++,r})),this.add("string_dquotes","insertion",(function(e,t,n,i,r){var s=i.$mode.$quotes||h;if(1==r.length&&s[r]){if(this.lineCommentStart&&-1!=this.lineCommentStart.indexOf(r))return;d(n);var o=r,a=n.getSelectionRange(),l=i.doc.getTextRange(a);if(""!==l&&(1!=l.length||!s[l])&&n.getWrapBehavioursEnabled())return f(a,l,o,o);if(!l){var c=n.getCursorPosition(),u=i.doc.getLine(c.row),p=u.substring(c.column-1,c.column),g=u.substring(c.column,c.column+1),m=i.getTokenAt(c.row,c.column),v=i.getTokenAt(c.row,c.column+1);if("\\"==p&&m&&/escape/.test(m.type))return null;var $,b=m&&/string|escape/.test(m.type),w=!v||/string|escape/.test(v.type);if(g==o)($=b!==w)&&/string\.end/.test(v.type)&&($=!1);else{if(b&&!w)return null;if(b&&w)return null;var y=i.$mode.tokenRe;y.lastIndex=0;var S=y.test(p);y.lastIndex=0;var C=y.test(p);if(S||C)return null;if(g&&!/[\s;,.})\]\\]/.test(g))return null;$=!0}return{text:$?o+o:"",selection:[1,1]}}}})),this.add("string_dquotes","deletion",(function(e,t,n,i,r){var s=i.$mode.$quotes||h,o=i.doc.getTextRange(r);if(!r.isMultiLine()&&s.hasOwnProperty(o)&&(d(n),i.doc.getLine(r.start.row).substring(r.start.column+1,r.start.column+2)==o))return r.end.column++,r}))};p.isSaneInsertion=function(e,t){var n=e.getCursorPosition(),i=new o(t,n.row,n.column);if(!this.$matchTokenType(i.getCurrentToken()||"text",l)){var r=new o(t,n.row,n.column+1);if(!this.$matchTokenType(r.getCurrentToken()||"text",l))return!1}return i.stepForward(),i.getCurrentTokenRow()!==n.row||this.$matchTokenType(i.getCurrentToken()||"text",c)},p.$matchTokenType=function(e,t){return t.indexOf(e.type||e)>-1},p.recordAutoInsert=function(e,t,n){var r=e.getCursorPosition(),s=t.doc.getLine(r.row);this.isAutoInsertedClosing(r,s,i.autoInsertedLineEnd[0])||(i.autoInsertedBrackets=0),i.autoInsertedRow=r.row,i.autoInsertedLineEnd=n+s.substr(r.column),i.autoInsertedBrackets++},p.recordMaybeInsert=function(e,t,n){var r=e.getCursorPosition(),s=t.doc.getLine(r.row);this.isMaybeInsertedClosing(r,s)||(i.maybeInsertedBrackets=0),i.maybeInsertedRow=r.row,i.maybeInsertedLineStart=s.substr(0,r.column)+n,i.maybeInsertedLineEnd=s.substr(r.column),i.maybeInsertedBrackets++},p.isAutoInsertedClosing=function(e,t,n){return i.autoInsertedBrackets>0&&e.row===i.autoInsertedRow&&n===i.autoInsertedLineEnd[0]&&t.substr(e.column)===i.autoInsertedLineEnd},p.isMaybeInsertedClosing=function(e,t){return i.maybeInsertedBrackets>0&&e.row===i.maybeInsertedRow&&t.substr(e.column)===i.maybeInsertedLineEnd&&t.substr(0,e.column)==i.maybeInsertedLineStart},p.popAutoInsertedClosing=function(){i.autoInsertedLineEnd=i.autoInsertedLineEnd.substr(1),i.autoInsertedBrackets--},p.clearMaybeInsertedClosing=function(){i&&(i.maybeInsertedBrackets=0,i.maybeInsertedRow=-1)},r.inherits(p,s),t.CstyleBehaviour=p})),ace.define("ace/unicode",["require","exports","module"],(function(e,t,n){"use strict";for(var i=[48,9,8,25,5,0,2,25,48,0,11,0,5,0,6,22,2,30,2,457,5,11,15,4,8,0,2,0,18,116,2,1,3,3,9,0,2,2,2,0,2,19,2,82,2,138,2,4,3,155,12,37,3,0,8,38,10,44,2,0,2,1,2,1,2,0,9,26,6,2,30,10,7,61,2,9,5,101,2,7,3,9,2,18,3,0,17,58,3,100,15,53,5,0,6,45,211,57,3,18,2,5,3,11,3,9,2,1,7,6,2,2,2,7,3,1,3,21,2,6,2,0,4,3,3,8,3,1,3,3,9,0,5,1,2,4,3,11,16,2,2,5,5,1,3,21,2,6,2,1,2,1,2,1,3,0,2,4,5,1,3,2,4,0,8,3,2,0,8,15,12,2,2,8,2,2,2,21,2,6,2,1,2,4,3,9,2,2,2,2,3,0,16,3,3,9,18,2,2,7,3,1,3,21,2,6,2,1,2,4,3,8,3,1,3,2,9,1,5,1,2,4,3,9,2,0,17,1,2,5,4,2,2,3,4,1,2,0,2,1,4,1,4,2,4,11,5,4,4,2,2,3,3,0,7,0,15,9,18,2,2,7,2,2,2,22,2,9,2,4,4,7,2,2,2,3,8,1,2,1,7,3,3,9,19,1,2,7,2,2,2,22,2,9,2,4,3,8,2,2,2,3,8,1,8,0,2,3,3,9,19,1,2,7,2,2,2,22,2,15,4,7,2,2,2,3,10,0,9,3,3,9,11,5,3,1,2,17,4,23,2,8,2,0,3,6,4,0,5,5,2,0,2,7,19,1,14,57,6,14,2,9,40,1,2,0,3,1,2,0,3,0,7,3,2,6,2,2,2,0,2,0,3,1,2,12,2,2,3,4,2,0,2,5,3,9,3,1,35,0,24,1,7,9,12,0,2,0,2,0,5,9,2,35,5,19,2,5,5,7,2,35,10,0,58,73,7,77,3,37,11,42,2,0,4,328,2,3,3,6,2,0,2,3,3,40,2,3,3,32,2,3,3,6,2,0,2,3,3,14,2,56,2,3,3,66,5,0,33,15,17,84,13,619,3,16,2,25,6,74,22,12,2,6,12,20,12,19,13,12,2,2,2,1,13,51,3,29,4,0,5,1,3,9,34,2,3,9,7,87,9,42,6,69,11,28,4,11,5,11,11,39,3,4,12,43,5,25,7,10,38,27,5,62,2,28,3,10,7,9,14,0,89,75,5,9,18,8,13,42,4,11,71,55,9,9,4,48,83,2,2,30,14,230,23,280,3,5,3,37,3,5,3,7,2,0,2,0,2,0,2,30,3,52,2,6,2,0,4,2,2,6,4,3,3,5,5,12,6,2,2,6,67,1,20,0,29,0,14,0,17,4,60,12,5,0,4,11,18,0,5,0,3,9,2,0,4,4,7,0,2,0,2,0,2,3,2,10,3,3,6,4,5,0,53,1,2684,46,2,46,2,132,7,6,15,37,11,53,10,0,17,22,10,6,2,6,2,6,2,6,2,6,2,6,2,6,2,6,2,31,48,0,470,1,36,5,2,4,6,1,5,85,3,1,3,2,2,89,2,3,6,40,4,93,18,23,57,15,513,6581,75,20939,53,1164,68,45,3,268,4,27,21,31,3,13,13,1,2,24,9,69,11,1,38,8,3,102,3,1,111,44,25,51,13,68,12,9,7,23,4,0,5,45,3,35,13,28,4,64,15,10,39,54,10,13,3,9,7,22,4,1,5,66,25,2,227,42,2,1,3,9,7,11171,13,22,5,48,8453,301,3,61,3,105,39,6,13,4,6,11,2,12,2,4,2,0,2,1,2,1,2,107,34,362,19,63,3,53,41,11,5,15,17,6,13,1,25,2,33,4,2,134,20,9,8,25,5,0,2,25,12,88,4,5,3,5,3,5,3,2],r=0,s=[],o=0;o<i.length;o+=2)s.push(r+=i[o]),i[o+1]&&s.push(45,r+=i[o+1]);t.wordChars=String.fromCharCode.apply(null,s)})),ace.define("ace/mode/text",["require","exports","module","ace/config","ace/tokenizer","ace/mode/text_highlight_rules","ace/mode/behaviour/cstyle","ace/unicode","ace/lib/lang","ace/token_iterator","ace/range"],(function(e,t,n){"use strict";var i=e("../config"),r=e("../tokenizer").Tokenizer,s=e("./text_highlight_rules").TextHighlightRules,o=e("./behaviour/cstyle").CstyleBehaviour,a=e("../unicode"),l=e("../lib/lang"),c=e("../token_iterator").TokenIterator,u=e("../range").Range,h=function(){this.HighlightRules=s};(function(){this.$defaultBehaviour=new o,this.tokenRe=new RegExp("^["+a.wordChars+"\\$_]+","g"),this.nonTokenRe=new RegExp("^(?:[^"+a.wordChars+"\\$_]|\\s])+","g"),this.getTokenizer=function(){return this.$tokenizer||(this.$highlightRules=this.$highlightRules||new this.HighlightRules(this.$highlightRuleConfig),this.$tokenizer=new r(this.$highlightRules.getRules())),this.$tokenizer},this.lineCommentStart="",this.blockComment="",this.toggleCommentLines=function(e,t,n,i){function r(e){for(var t=n;t<=i;t++)e(s.getLine(t),t)}var s=t.doc,o=!0,a=!0,c=1/0,u=t.getTabSize(),h=!1;if(this.lineCommentStart){if(Array.isArray(this.lineCommentStart))m=this.lineCommentStart.map(l.escapeRegExp).join("|"),p=this.lineCommentStart[0];else m=l.escapeRegExp(this.lineCommentStart),p=this.lineCommentStart;m=new RegExp("^(\\s*)(?:"+m+") ?"),h=t.getUseSoftTabs();b=function(e,t){var n=e.match(m);if(n){var i=n[1].length,r=n[0].length;!f(e,i,r)&&" "==n[0][r-1]&&r--,s.removeInLine(t,i,r)}};var d=p+" ",f=($=function(e,t){o&&!/\S/.test(e)||(f(e,c,c)?s.insertInLine({row:t,column:c},d):s.insertInLine({row:t,column:c},p))},w=function(e,t){return m.test(e)},function(e,t,n){for(var i=0;t--&&" "==e.charAt(t);)i++;if(i%u!=0)return!1;for(i=0;" "==e.charAt(n++);)i++;return u>2?i%u!=u-1:i%u==0})}else{if(!this.blockComment)return!1;var p=this.blockComment.start,g=this.blockComment.end,m=new RegExp("^(\\s*)(?:"+l.escapeRegExp(p)+")"),v=new RegExp("(?:"+l.escapeRegExp(g)+")\\s*$"),$=function(e,t){w(e,t)||o&&!/\S/.test(e)||(s.insertInLine({row:t,column:e.length},g),s.insertInLine({row:t,column:c},p))},b=function(e,t){var n;(n=e.match(v))&&s.removeInLine(t,e.length-n[0].length,e.length),(n=e.match(m))&&s.removeInLine(t,n[1].length,n[0].length)},w=function(e,n){if(m.test(e))return!0;for(var i=t.getTokens(n),r=0;r<i.length;r++)if("comment"===i[r].type)return!0}}var y=1/0;r((function(e,t){var n=e.search(/\S/);-1!==n?(n<c&&(c=n),a&&!w(e,t)&&(a=!1)):y>e.length&&(y=e.length)})),c==1/0&&(c=y,o=!1,a=!1),h&&c%u!=0&&(c=Math.floor(c/u)*u),r(a?b:$)},this.toggleBlockComment=function(e,t,n,i){var r=this.blockComment;if(r){!r.start&&r[0]&&(r=r[0]);var s,o,a=(g=new c(t,i.row,i.column)).getCurrentToken(),l=(t.selection,t.selection.toOrientedRange());if(a&&/comment/.test(a.type)){for(var h,d;a&&/comment/.test(a.type);){if(-1!=(m=a.value.indexOf(r.start))){var f=g.getCurrentTokenRow(),p=g.getCurrentTokenColumn()+m;h=new u(f,p,f,p+r.start.length);break}a=g.stepBackward()}var g;for(a=(g=new c(t,i.row,i.column)).getCurrentToken();a&&/comment/.test(a.type);){var m;if(-1!=(m=a.value.indexOf(r.end))){f=g.getCurrentTokenRow(),p=g.getCurrentTokenColumn()+m;d=new u(f,p,f,p+r.end.length);break}a=g.stepForward()}d&&t.remove(d),h&&(t.remove(h),s=h.start.row,o=-r.start.length)}else o=r.start.length,s=n.start.row,t.insert(n.end,r.end),t.insert(n.start,r.start);l.start.row==s&&(l.start.column+=o),l.end.row==s&&(l.end.column+=o),t.selection.fromOrientedRange(l)}},this.getNextLineIndent=function(e,t,n){return this.$getIndent(t)},this.checkOutdent=function(e,t,n){return!1},this.autoOutdent=function(e,t,n){},this.$getIndent=function(e){return e.match(/^\s*/)[0]},this.createWorker=function(e){return null},this.createModeDelegates=function(e){for(var t in this.$embeds=[],this.$modes={},e)if(e[t]){var n=e[t],r=n.prototype.$id,s=i.$modes[r];s||(i.$modes[r]=s=new n),i.$modes[t]||(i.$modes[t]=s),this.$embeds.push(t),this.$modes[t]=s}var o=["toggleBlockComment","toggleCommentLines","getNextLineIndent","checkOutdent","autoOutdent","transformAction","getCompletions"];for(t=0;t<o.length;t++)!function(e){var n=o[t],i=e[n];e[o[t]]=function(){return this.$delegator(n,arguments,i)}}(this)},this.$delegator=function(e,t,n){var i=t[0];if("string"!=typeof i){if(Array.isArray(i[2])){var r=i[2][i[2].length-1];if(o=this.$modes[r])return o[e].apply(o,[i[1]].concat([].slice.call(t,1)))}i=i[0]}for(var s=0;s<this.$embeds.length;s++)if(this.$modes[this.$embeds[s]]){var o,a=i.split(this.$embeds[s]);if(!a[0]&&a[1])return t[0]=a[1],(o=this.$modes[this.$embeds[s]])[e].apply(o,t)}var l=n.apply(this,t);return n?l:void 0},this.transformAction=function(e,t,n,i,r){if(this.$behaviour){var s=this.$behaviour.getBehaviours();for(var o in s)if(s[o][t]){var a=s[o][t].apply(this,arguments);if(a)return a}}},this.getKeywords=function(e){if(!this.completionKeywords){var t=this.$tokenizer.rules,n=[];for(var i in t)for(var r=t[i],s=0,o=r.length;s<o;s++)if("string"==typeof r[s].token)/keyword|support|storage/.test(r[s].token)&&n.push(r[s].regex);else if("object"==typeof r[s].token)for(var a=0,l=r[s].token.length;a<l;a++)if(/keyword|support|storage/.test(r[s].token[a])){i=r[s].regex.match(/\(.+?\)/g)[a];n.push(i.substr(1,i.length-2))}this.completionKeywords=n}return e?n.concat(this.$keywordList||[]):this.$keywordList},this.$createKeywordList=function(){return this.$highlightRules||this.getTokenizer(),this.$keywordList=this.$highlightRules.$keywordList||[]},this.getCompletions=function(e,t,n,i){return(this.$keywordList||this.$createKeywordList()).map((function(e){return{name:e,value:e,score:0,meta:"keyword"}}))},this.$id="ace/mode/text"}).call(h.prototype),t.Mode=h})),ace.define("ace/apply_delta",["require","exports","module"],(function(e,t,n){"use strict";t.applyDelta=function(e,t,n){var i=t.start.row,r=t.start.column,s=e[i]||"";switch(t.action){case"insert":if(1===t.lines.length)e[i]=s.substring(0,r)+t.lines[0]+s.substring(r);else{var o=[i,1].concat(t.lines);e.splice.apply(e,o),e[i]=s.substring(0,r)+e[i],e[i+t.lines.length-1]+=s.substring(r)}break;case"remove":var a=t.end.column,l=t.end.row;i===l?e[i]=s.substring(0,r)+s.substring(a):e.splice(i,l-i+1,s.substring(0,r)+e[l].substring(a))}}})),ace.define("ace/anchor",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],(function(e,t,n){"use strict";var i=e("./lib/oop"),r=e("./lib/event_emitter").EventEmitter,s=t.Anchor=function(e,t,n){this.$onChange=this.onChange.bind(this),this.attach(e),void 0===n?this.setPosition(t.row,t.column):this.setPosition(t,n)};(function(){function e(e,t,n){var i=n?e.column<=t.column:e.column<t.column;return e.row<t.row||e.row==t.row&&i}function t(t,n,i){var r="insert"==t.action,s=(r?1:-1)*(t.end.row-t.start.row),o=(r?1:-1)*(t.end.column-t.start.column),a=t.start,l=r?a:t.end;return e(n,a,i)?{row:n.row,column:n.column}:e(l,n,!i)?{row:n.row+s,column:n.column+(n.row==l.row?o:0)}:{row:a.row,column:a.column}}i.implement(this,r),this.getPosition=function(){return this.$clipPositionToDocument(this.row,this.column)},this.getDocument=function(){return this.document},this.$insertRight=!1,this.onChange=function(e){if(!(e.start.row==e.end.row&&e.start.row!=this.row||e.start.row>this.row)){var n=t(e,{row:this.row,column:this.column},this.$insertRight);this.setPosition(n.row,n.column,!0)}},this.setPosition=function(e,t,n){var i;if(i=n?{row:e,column:t}:this.$clipPositionToDocument(e,t),this.row!=i.row||this.column!=i.column){var r={row:this.row,column:this.column};this.row=i.row,this.column=i.column,this._signal("change",{old:r,value:i})}},this.detach=function(){this.document.removeEventListener("change",this.$onChange)},this.attach=function(e){this.document=e||this.document,this.document.on("change",this.$onChange)},this.$clipPositionToDocument=function(e,t){var n={};return e>=this.document.getLength()?(n.row=Math.max(0,this.document.getLength()-1),n.column=this.document.getLine(n.row).length):e<0?(n.row=0,n.column=0):(n.row=e,n.column=Math.min(this.document.getLine(n.row).length,Math.max(0,t))),t<0&&(n.column=0),n}}).call(s.prototype)})),ace.define("ace/document",["require","exports","module","ace/lib/oop","ace/apply_delta","ace/lib/event_emitter","ace/range","ace/anchor"],(function(e,t,n){"use strict";var i=e("./lib/oop"),r=e("./apply_delta").applyDelta,s=e("./lib/event_emitter").EventEmitter,o=e("./range").Range,a=e("./anchor").Anchor,l=function(e){this.$lines=[""],0===e.length?this.$lines=[""]:Array.isArray(e)?this.insertMergedLines({row:0,column:0},e):this.insert({row:0,column:0},e)};(function(){i.implement(this,s),this.setValue=function(e){var t=this.getLength()-1;this.remove(new o(0,0,t,this.getLine(t).length)),this.insert({row:0,column:0},e)},this.getValue=function(){return this.getAllLines().join(this.getNewLineCharacter())},this.createAnchor=function(e,t){return new a(this,e,t)},0==="aaa".split(/a/).length?this.$split=function(e){return e.replace(/\r\n|\r/g,"\n").split("\n")}:this.$split=function(e){return e.split(/\r\n|\r|\n/)},this.$detectNewLine=function(e){var t=e.match(/^.*?(\r\n|\r|\n)/m);this.$autoNewLine=t?t[1]:"\n",this._signal("changeNewLineMode")},this.getNewLineCharacter=function(){switch(this.$newLineMode){case"windows":return"\r\n";case"unix":return"\n";default:return this.$autoNewLine||"\n"}},this.$autoNewLine="",this.$newLineMode="auto",this.setNewLineMode=function(e){this.$newLineMode!==e&&(this.$newLineMode=e,this._signal("changeNewLineMode"))},this.getNewLineMode=function(){return this.$newLineMode},this.isNewLine=function(e){return"\r\n"==e||"\r"==e||"\n"==e},this.getLine=function(e){return this.$lines[e]||""},this.getLines=function(e,t){return this.$lines.slice(e,t+1)},this.getAllLines=function(){return this.getLines(0,this.getLength())},this.getLength=function(){return this.$lines.length},this.getTextRange=function(e){return this.getLinesForRange(e).join(this.getNewLineCharacter())},this.getLinesForRange=function(e){var t;if(e.start.row===e.end.row)t=[this.getLine(e.start.row).substring(e.start.column,e.end.column)];else{(t=this.getLines(e.start.row,e.end.row))[0]=(t[0]||"").substring(e.start.column);var n=t.length-1;e.end.row-e.start.row==n&&(t[n]=t[n].substring(0,e.end.column))}return t},this.insertLines=function(e,t){return console.warn("Use of document.insertLines is deprecated. Use the insertFullLines method instead."),this.insertFullLines(e,t)},this.removeLines=function(e,t){return console.warn("Use of document.removeLines is deprecated. Use the removeFullLines method instead."),this.removeFullLines(e,t)},this.insertNewLine=function(e){return console.warn("Use of document.insertNewLine is deprecated. Use insertMergedLines(position, ['', '']) instead."),this.insertMergedLines(e,["",""])},this.insert=function(e,t){return this.getLength()<=1&&this.$detectNewLine(t),this.insertMergedLines(e,this.$split(t))},this.insertInLine=function(e,t){var n=this.clippedPos(e.row,e.column),i=this.pos(e.row,e.column+t.length);return this.applyDelta({start:n,end:i,action:"insert",lines:[t]},!0),this.clonePos(i)},this.clippedPos=function(e,t){var n=this.getLength();void 0===e?e=n:e<0?e=0:e>=n&&(e=n-1,t=void 0);var i=this.getLine(e);return null==t&&(t=i.length),{row:e,column:t=Math.min(Math.max(t,0),i.length)}},this.clonePos=function(e){return{row:e.row,column:e.column}},this.pos=function(e,t){return{row:e,column:t}},this.$clipPosition=function(e){var t=this.getLength();return e.row>=t?(e.row=Math.max(0,t-1),e.column=this.getLine(t-1).length):(e.row=Math.max(0,e.row),e.column=Math.min(Math.max(e.column,0),this.getLine(e.row).length)),e},this.insertFullLines=function(e,t){var n=0;(e=Math.min(Math.max(e,0),this.getLength()))<this.getLength()?(t=t.concat([""]),n=0):(t=[""].concat(t),e--,n=this.$lines[e].length),this.insertMergedLines({row:e,column:n},t)},this.insertMergedLines=function(e,t){var n=this.clippedPos(e.row,e.column),i={row:n.row+t.length-1,column:(1==t.length?n.column:0)+t[t.length-1].length};return this.applyDelta({start:n,end:i,action:"insert",lines:t}),this.clonePos(i)},this.remove=function(e){var t=this.clippedPos(e.start.row,e.start.column),n=this.clippedPos(e.end.row,e.end.column);return this.applyDelta({start:t,end:n,action:"remove",lines:this.getLinesForRange({start:t,end:n})}),this.clonePos(t)},this.removeInLine=function(e,t,n){var i=this.clippedPos(e,t),r=this.clippedPos(e,n);return this.applyDelta({start:i,end:r,action:"remove",lines:this.getLinesForRange({start:i,end:r})},!0),this.clonePos(i)},this.removeFullLines=function(e,t){e=Math.min(Math.max(0,e),this.getLength()-1);var n=(t=Math.min(Math.max(0,t),this.getLength()-1))==this.getLength()-1&&e>0,i=t<this.getLength()-1,r=n?e-1:e,s=n?this.getLine(r).length:0,a=i?t+1:t,l=i?0:this.getLine(a).length,c=new o(r,s,a,l),u=this.$lines.slice(e,t+1);return this.applyDelta({start:c.start,end:c.end,action:"remove",lines:this.getLinesForRange(c)}),u},this.removeNewLine=function(e){e<this.getLength()-1&&e>=0&&this.applyDelta({start:this.pos(e,this.getLine(e).length),end:this.pos(e+1,0),action:"remove",lines:["",""]})},this.replace=function(e,t){return e instanceof o||(e=o.fromPoints(e.start,e.end)),0===t.length&&e.isEmpty()?e.start:t==this.getTextRange(e)?e.end:(this.remove(e),t?this.insert(e.start,t):e.start)},this.applyDeltas=function(e){for(var t=0;t<e.length;t++)this.applyDelta(e[t])},this.revertDeltas=function(e){for(var t=e.length-1;t>=0;t--)this.revertDelta(e[t])},this.applyDelta=function(e,t){var n="insert"==e.action;(n?e.lines.length<=1&&!e.lines[0]:!o.comparePoints(e.start,e.end))||(n&&e.lines.length>2e4?this.$splitAndapplyLargeDelta(e,2e4):(r(this.$lines,e,t),this._signal("change",e)))},this.$splitAndapplyLargeDelta=function(e,t){for(var n=e.lines,i=n.length-t+1,r=e.start.row,s=e.start.column,o=0,a=0;o<i;o=a){a+=t-1;var l=n.slice(o,a);l.push(""),this.applyDelta({start:this.pos(r+o,s),end:this.pos(r+a,s=0),action:e.action,lines:l},!0)}e.lines=n.slice(o),e.start.row=r+o,e.start.column=s,this.applyDelta(e,!0)},this.revertDelta=function(e){this.applyDelta({start:this.clonePos(e.start),end:this.clonePos(e.end),action:"insert"==e.action?"remove":"insert",lines:e.lines.slice()})},this.indexToPosition=function(e,t){for(var n=this.$lines||this.getAllLines(),i=this.getNewLineCharacter().length,r=t||0,s=n.length;r<s;r++)if((e-=n[r].length+i)<0)return{row:r,column:e+n[r].length+i};return{row:s-1,column:e+n[s-1].length+i}},this.positionToIndex=function(e,t){for(var n=this.$lines||this.getAllLines(),i=this.getNewLineCharacter().length,r=0,s=Math.min(e.row,n.length),o=t||0;o<s;++o)r+=n[o].length+i;return r+e.column}}).call(l.prototype),t.Document=l})),ace.define("ace/background_tokenizer",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],(function(e,t,n){"use strict";var i=e("./lib/oop"),r=e("./lib/event_emitter").EventEmitter,s=function(e,t){this.running=!1,this.lines=[],this.states=[],this.currentLine=0,this.tokenizer=e;var n=this;this.$worker=function(){if(n.running){for(var e=new Date,t=n.currentLine,i=-1,r=n.doc,s=t;n.lines[t];)t++;var o=r.getLength(),a=0;for(n.running=!1;t<o;){n.$tokenizeRow(t),i=t;do{t++}while(n.lines[t]);if(++a%5==0&&new Date-e>20){n.running=setTimeout(n.$worker,20);break}}n.currentLine=t,-1==i&&(i=t),s<=i&&n.fireUpdateEvent(s,i)}}};(function(){i.implement(this,r),this.setTokenizer=function(e){this.tokenizer=e,this.lines=[],this.states=[],this.start(0)},this.setDocument=function(e){this.doc=e,this.lines=[],this.states=[],this.stop()},this.fireUpdateEvent=function(e,t){var n={first:e,last:t};this._signal("update",{data:n})},this.start=function(e){this.currentLine=Math.min(e||0,this.currentLine,this.doc.getLength()),this.lines.splice(this.currentLine,this.lines.length),this.states.splice(this.currentLine,this.states.length),this.stop(),this.running=setTimeout(this.$worker,700)},this.scheduleStart=function(){this.running||(this.running=setTimeout(this.$worker,700))},this.$updateOnChange=function(e){var t=e.start.row,n=e.end.row-t;if(0===n)this.lines[t]=null;else if("remove"==e.action)this.lines.splice(t,n+1,null),this.states.splice(t,n+1,null);else{var i=Array(n+1);i.unshift(t,1),this.lines.splice.apply(this.lines,i),this.states.splice.apply(this.states,i)}this.currentLine=Math.min(t,this.currentLine,this.doc.getLength()),this.stop()},this.stop=function(){this.running&&clearTimeout(this.running),this.running=!1},this.getTokens=function(e){return this.lines[e]||this.$tokenizeRow(e)},this.getState=function(e){return this.currentLine==e&&this.$tokenizeRow(e),this.states[e]||"start"},this.$tokenizeRow=function(e){var t=this.doc.getLine(e),n=this.states[e-1],i=this.tokenizer.getLineTokens(t,n,e);return this.states[e]+""!=i.state+""?(this.states[e]=i.state,this.lines[e+1]=null,this.currentLine>e+1&&(this.currentLine=e+1)):this.currentLine==e&&(this.currentLine=e+1),this.lines[e]=i.tokens}}).call(s.prototype),t.BackgroundTokenizer=s})),ace.define("ace/search_highlight",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/range"],(function(e,t,n){"use strict";var i=e("./lib/lang"),r=(e("./lib/oop"),e("./range").Range),s=function(e,t,n){this.setRegexp(e),this.clazz=t,this.type=n||"text"};(function(){this.MAX_RANGES=500,this.setRegexp=function(e){this.regExp+""!=e+""&&(this.regExp=e,this.cache=[])},this.update=function(e,t,n,s){if(this.regExp)for(var o=s.firstRow,a=s.lastRow,l=o;l<=a;l++){var c=this.cache[l];null==c&&((c=i.getMatchOffsets(n.getLine(l),this.regExp)).length>this.MAX_RANGES&&(c=c.slice(0,this.MAX_RANGES)),c=c.map((function(e){return new r(l,e.offset,l,e.offset+e.length)})),this.cache[l]=c.length?c:"");for(var u=c.length;u--;)t.drawSingleLineMarker(e,c[u].toScreenRange(n),this.clazz,s)}}}).call(s.prototype),t.SearchHighlight=s})),ace.define("ace/edit_session/fold_line",["require","exports","module","ace/range"],(function(e,t,n){"use strict";function i(e,t){this.foldData=e,Array.isArray(t)?this.folds=t:t=this.folds=[t];var n=t[t.length-1];this.range=new r(t[0].start.row,t[0].start.column,n.end.row,n.end.column),this.start=this.range.start,this.end=this.range.end,this.folds.forEach((function(e){e.setFoldLine(this)}),this)}var r=e("../range").Range;(function(){this.shiftRow=function(e){this.start.row+=e,this.end.row+=e,this.folds.forEach((function(t){t.start.row+=e,t.end.row+=e}))},this.addFold=function(e){if(e.sameRow){if(e.start.row<this.startRow||e.endRow>this.endRow)throw new Error("Can't add a fold to this FoldLine as it has no connection");this.folds.push(e),this.folds.sort((function(e,t){return-e.range.compareEnd(t.start.row,t.start.column)})),this.range.compareEnd(e.start.row,e.start.column)>0?(this.end.row=e.end.row,this.end.column=e.end.column):this.range.compareStart(e.end.row,e.end.column)<0&&(this.start.row=e.start.row,this.start.column=e.start.column)}else if(e.start.row==this.end.row)this.folds.push(e),this.end.row=e.end.row,this.end.column=e.end.column;else{if(e.end.row!=this.start.row)throw new Error("Trying to add fold to FoldRow that doesn't have a matching row");this.folds.unshift(e),this.start.row=e.start.row,this.start.column=e.start.column}e.foldLine=this},this.containsRow=function(e){return e>=this.start.row&&e<=this.end.row},this.walk=function(e,t,n){var i,r,s=0,o=this.folds,a=!0;null==t&&(t=this.end.row,n=this.end.column);for(var l=0;l<o.length;l++){if(-1==(r=(i=o[l]).range.compareStart(t,n)))return void e(null,t,n,s,a);if(!e(null,i.start.row,i.start.column,s,a)&&e(i.placeholder,i.start.row,i.start.column,s)||0===r)return;a=!i.sameRow,s=i.end.column}e(null,t,n,s,a)},this.getNextFoldTo=function(e,t){for(var n,i,r=0;r<this.folds.length;r++){if(-1==(i=(n=this.folds[r]).range.compareEnd(e,t)))return{fold:n,kind:"after"};if(0===i)return{fold:n,kind:"inside"}}return null},this.addRemoveChars=function(e,t,n){var i,r,s=this.getNextFoldTo(e,t);if(s)if(i=s.fold,"inside"==s.kind&&i.start.column!=t&&i.start.row!=e)window.console&&window.console.log(e,t,i);else if(i.start.row==e){var o=(r=this.folds).indexOf(i);for(0===o&&(this.start.column+=n);o<r.length;o++){if((i=r[o]).start.column+=n,!i.sameRow)return;i.end.column+=n}this.end.column+=n}},this.split=function(e,t){var n=this.getNextFoldTo(e,t);if(!n||"inside"==n.kind)return null;var r=n.fold,s=this.folds,o=this.foldData,a=s.indexOf(r),l=s[a-1];this.end.row=l.end.row,this.end.column=l.end.column;var c=new i(o,s=s.splice(a,s.length-a));return o.splice(o.indexOf(this)+1,0,c),c},this.merge=function(e){for(var t=e.folds,n=0;n<t.length;n++)this.addFold(t[n]);var i=this.foldData;i.splice(i.indexOf(e),1)},this.toString=function(){var e=[this.range.toString()+": ["];return this.folds.forEach((function(t){e.push("  "+t.toString())})),e.push("]"),e.join("\n")},this.idxToPosition=function(e){for(var t=0,n=0;n<this.folds.length;n++){var i=this.folds[n];if((e-=i.start.column-t)<0)return{row:i.start.row,column:i.start.column+e};if((e-=i.placeholder.length)<0)return i.start;t=i.end.column}return{row:this.end.row,column:this.end.column+e}}}).call(i.prototype),t.FoldLine=i})),ace.define("ace/range_list",["require","exports","module","ace/range"],(function(e,t,n){"use strict";var i=e("./range").Range.comparePoints,r=function(){this.ranges=[]};(function(){this.comparePoints=i,this.pointIndex=function(e,t,n){for(var r=this.ranges,s=n||0;s<r.length;s++){var o=r[s],a=i(e,o.end);if(!(a>0)){var l=i(e,o.start);return 0===a?t&&0!==l?-s-2:s:l>0||0===l&&!t?s:-s-1}}return-s-1},this.add=function(e){var t=!e.isEmpty(),n=this.pointIndex(e.start,t);n<0&&(n=-n-1);var i=this.pointIndex(e.end,t,n);return i<0?i=-i-1:i++,this.ranges.splice(n,i-n,e)},this.addList=function(e){for(var t=[],n=e.length;n--;)t.push.apply(t,this.add(e[n]));return t},this.substractPoint=function(e){var t=this.pointIndex(e);if(t>=0)return this.ranges.splice(t,1)},this.merge=function(){var e=[],t=this.ranges;t=t.sort((function(e,t){return i(e.start,t.start)}));for(var n,r=t[0],s=1;s<t.length;s++){n=r,r=t[s];var o=i(n.end,r.start);o<0||(0!=o||n.isEmpty()||r.isEmpty())&&(i(n.end,r.end)<0&&(n.end.row=r.end.row,n.end.column=r.end.column),t.splice(s,1),e.push(r),r=n,s--)}return this.ranges=t,e},this.contains=function(e,t){return this.pointIndex({row:e,column:t})>=0},this.containsPoint=function(e){return this.pointIndex(e)>=0},this.rangeAtPoint=function(e){var t=this.pointIndex(e);if(t>=0)return this.ranges[t]},this.clipRows=function(e,t){var n=this.ranges;if(n[0].start.row>t||n[n.length-1].start.row<e)return[];var i=this.pointIndex({row:e,column:0});i<0&&(i=-i-1);var r=this.pointIndex({row:t,column:0},i);r<0&&(r=-r-1);for(var s=[],o=i;o<r;o++)s.push(n[o]);return s},this.removeAll=function(){return this.ranges.splice(0,this.ranges.length)},this.attach=function(e){this.session&&this.detach(),this.session=e,this.onChange=this.$onChange.bind(this),this.session.on("change",this.onChange)},this.detach=function(){this.session&&(this.session.removeListener("change",this.onChange),this.session=null)},this.$onChange=function(e){for(var t=e.start,n=e.end,i=t.row,r=n.row,s=this.ranges,o=0,a=s.length;o<a;o++){if((u=s[o]).end.row>=i)break}if("insert"==e.action)for(var l=r-i,c=-t.column+n.column;o<a;o++){if((u=s[o]).start.row>i)break;if(u.start.row==i&&u.start.column>=t.column&&(u.start.column!=t.column||!this.$insertRight)&&(u.start.column+=c,u.start.row+=l),u.end.row==i&&u.end.column>=t.column){if(u.end.column==t.column&&this.$insertRight)continue;u.end.column==t.column&&c>0&&o<a-1&&u.end.column>u.start.column&&u.end.column==s[o+1].start.column&&(u.end.column-=c),u.end.column+=c,u.end.row+=l}}else for(l=i-r,c=t.column-n.column;o<a;o++){if((u=s[o]).start.row>r)break;u.end.row<r&&(i<u.end.row||i==u.end.row&&t.column<u.end.column)?(u.end.row=i,u.end.column=t.column):u.end.row==r?u.end.column<=n.column?(l||u.end.column>t.column)&&(u.end.column=t.column,u.end.row=t.row):(u.end.column+=c,u.end.row+=l):u.end.row>r&&(u.end.row+=l),u.start.row<r&&(i<u.start.row||i==u.start.row&&t.column<u.start.column)?(u.start.row=i,u.start.column=t.column):u.start.row==r?u.start.column<=n.column?(l||u.start.column>t.column)&&(u.start.column=t.column,u.start.row=t.row):(u.start.column+=c,u.start.row+=l):u.start.row>r&&(u.start.row+=l)}if(0!=l&&o<a)for(;o<a;o++){var u;(u=s[o]).start.row+=l,u.end.row+=l}}}).call(r.prototype),t.RangeList=r})),ace.define("ace/edit_session/fold",["require","exports","module","ace/range","ace/range_list","ace/lib/oop"],(function(e,t,n){"use strict";function i(e,t){e.row-=t.row,0==e.row&&(e.column-=t.column)}function r(e,t){i(e.start,t),i(e.end,t)}function s(e,t){0==e.row&&(e.column+=t.column),e.row+=t.row}e("../range").Range;var o=e("../range_list").RangeList,a=e("../lib/oop"),l=t.Fold=function(e,t){this.foldLine=null,this.placeholder=t,this.range=e,this.start=e.start,this.end=e.end,this.sameRow=e.start.row==e.end.row,this.subFolds=this.ranges=[]};a.inherits(l,o),function(){this.toString=function(){return'"'+this.placeholder+'" '+this.range.toString()},this.setFoldLine=function(e){this.foldLine=e,this.subFolds.forEach((function(t){t.setFoldLine(e)}))},this.clone=function(){var e=this.range.clone(),t=new l(e,this.placeholder);return this.subFolds.forEach((function(e){t.subFolds.push(e.clone())})),t.collapseChildren=this.collapseChildren,t},this.addSubFold=function(e){if(!this.range.isEqual(e)){if(!this.range.containsRange(e))throw new Error("A fold can't intersect already existing fold"+e.range+this.range);r(e,this.start);for(var t=e.start.row,n=e.start.column,i=0,s=-1;i<this.subFolds.length&&1==(s=this.subFolds[i].range.compare(t,n));i++);var o=this.subFolds[i];if(0==s)return o.addSubFold(e);t=e.range.end.row,n=e.range.end.column;var a=i;for(s=-1;a<this.subFolds.length&&1==(s=this.subFolds[a].range.compare(t,n));a++);this.subFolds[a];if(0==s)throw new Error("A fold can't intersect already existing fold"+e.range+this.range);this.subFolds.splice(i,a-i,e);return e.setFoldLine(this.foldLine),e}},this.restoreRange=function(e){return function(e,t){s(e.start,t),s(e.end,t)}(e,this.start)}}.call(l.prototype)})),ace.define("ace/edit_session/folding",["require","exports","module","ace/range","ace/edit_session/fold_line","ace/edit_session/fold","ace/token_iterator"],(function(e,t,n){"use strict";var i=e("../range").Range,r=e("./fold_line").FoldLine,s=e("./fold").Fold,o=e("../token_iterator").TokenIterator;t.Folding=function(){this.getFoldAt=function(e,t,n){var i=this.getFoldLine(e);if(!i)return null;for(var r=i.folds,s=0;s<r.length;s++){var o=r[s];if(o.range.contains(e,t)){if(1==n&&o.range.isEnd(e,t))continue;if(-1==n&&o.range.isStart(e,t))continue;return o}}},this.getFoldsInRange=function(e){var t=e.start,n=e.end,i=this.$foldData,r=[];t.column+=1,n.column-=1;for(var s=0;s<i.length;s++){var o=i[s].range.compareRange(e);if(2!=o){if(-2==o)break;for(var a=i[s].folds,l=0;l<a.length;l++){var c=a[l];if(-2==(o=c.range.compareRange(e)))break;if(2!=o){if(42==o)break;r.push(c)}}}}return t.column-=1,n.column+=1,r},this.getFoldsInRangeList=function(e){if(Array.isArray(e)){var t=[];e.forEach((function(e){t=t.concat(this.getFoldsInRange(e))}),this)}else t=this.getFoldsInRange(e);return t},this.getAllFolds=function(){for(var e=[],t=this.$foldData,n=0;n<t.length;n++)for(var i=0;i<t[n].folds.length;i++)e.push(t[n].folds[i]);return e},this.getFoldStringAt=function(e,t,n,i){if(!(i=i||this.getFoldLine(e)))return null;for(var r,s,o={end:{column:0}},a=0;a<i.folds.length;a++){var l=(s=i.folds[a]).range.compareEnd(e,t);if(-1==l){r=this.getLine(s.start.row).substring(o.end.column,s.start.column);break}if(0===l)return null;o=s}return r||(r=this.getLine(s.start.row).substring(o.end.column)),-1==n?r.substring(0,t-o.end.column):1==n?r.substring(t-o.end.column):r},this.getFoldLine=function(e,t){var n=this.$foldData,i=0;for(t&&(i=n.indexOf(t)),-1==i&&(i=0);i<n.length;i++){var r=n[i];if(r.start.row<=e&&r.end.row>=e)return r;if(r.end.row>e)return null}return null},this.getNextFoldLine=function(e,t){var n=this.$foldData,i=0;for(t&&(i=n.indexOf(t)),-1==i&&(i=0);i<n.length;i++){var r=n[i];if(r.end.row>=e)return r}return null},this.getFoldedRowCount=function(e,t){for(var n=this.$foldData,i=t-e+1,r=0;r<n.length;r++){var s=n[r],o=s.end.row,a=s.start.row;if(o>=t){a<t&&(a>=e?i-=t-a:i=0);break}o>=e&&(i-=a>=e?o-a:o-e+1)}return i},this.$addFoldLine=function(e){return this.$foldData.push(e),this.$foldData.sort((function(e,t){return e.start.row-t.start.row})),e},this.addFold=function(e,t){var n,i=this.$foldData,o=!1;e instanceof s?n=e:(n=new s(t,e)).collapseChildren=t.collapseChildren,this.$clipRangeToDocument(n.range);var a=n.start.row,l=n.start.column,c=n.end.row,u=n.end.column;if(a<c||a==c&&l<=u-2){var h=this.getFoldAt(a,l,1),d=this.getFoldAt(c,u,-1);if(h&&d==h)return h.addSubFold(n);h&&!h.range.isStart(a,l)&&this.removeFold(h),d&&!d.range.isEnd(c,u)&&this.removeFold(d);var f=this.getFoldsInRange(n.range);f.length>0&&(this.removeFolds(f),f.forEach((function(e){n.addSubFold(e)})));for(var p=0;p<i.length;p++){var g=i[p];if(c==g.start.row){g.addFold(n),o=!0;break}if(a==g.end.row){if(g.addFold(n),o=!0,!n.sameRow){var m=i[p+1];if(m&&m.start.row==c){g.merge(m);break}}break}if(c<=g.start.row)break}return o||(g=this.$addFoldLine(new r(this.$foldData,n))),this.$useWrapMode?this.$updateWrapData(g.start.row,g.start.row):this.$updateRowLengthCache(g.start.row,g.start.row),this.$modified=!0,this._signal("changeFold",{data:n,action:"add"}),n}throw new Error("The range has to be at least 2 characters width")},this.addFolds=function(e){e.forEach((function(e){this.addFold(e)}),this)},this.removeFold=function(e){var t=e.foldLine,n=t.start.row,i=t.end.row,r=this.$foldData,s=t.folds;if(1==s.length)r.splice(r.indexOf(t),1);else if(t.range.isEnd(e.end.row,e.end.column))s.pop(),t.end.row=s[s.length-1].end.row,t.end.column=s[s.length-1].end.column;else if(t.range.isStart(e.start.row,e.start.column))s.shift(),t.start.row=s[0].start.row,t.start.column=s[0].start.column;else if(e.sameRow)s.splice(s.indexOf(e),1);else{var o=t.split(e.start.row,e.start.column);(s=o.folds).shift(),o.start.row=s[0].start.row,o.start.column=s[0].start.column}this.$updating||(this.$useWrapMode?this.$updateWrapData(n,i):this.$updateRowLengthCache(n,i)),this.$modified=!0,this._signal("changeFold",{data:e,action:"remove"})},this.removeFolds=function(e){for(var t=[],n=0;n<e.length;n++)t.push(e[n]);t.forEach((function(e){this.removeFold(e)}),this),this.$modified=!0},this.expandFold=function(e){this.removeFold(e),e.subFolds.forEach((function(t){e.restoreRange(t),this.addFold(t)}),this),e.collapseChildren>0&&this.foldAll(e.start.row+1,e.end.row,e.collapseChildren-1),e.subFolds=[]},this.expandFolds=function(e){e.forEach((function(e){this.expandFold(e)}),this)},this.unfold=function(e,t){var n,r;if(null==e?(n=new i(0,0,this.getLength(),0),t=!0):n="number"==typeof e?new i(e,0,e,this.getLine(e).length):"row"in e?i.fromPoints(e,e):e,r=this.getFoldsInRangeList(n),t)this.removeFolds(r);else for(var s=r;s.length;)this.expandFolds(s),s=this.getFoldsInRangeList(n);if(r.length)return r},this.isRowFolded=function(e,t){return!!this.getFoldLine(e,t)},this.getRowFoldEnd=function(e,t){var n=this.getFoldLine(e,t);return n?n.end.row:e},this.getRowFoldStart=function(e,t){var n=this.getFoldLine(e,t);return n?n.start.row:e},this.getFoldDisplayLine=function(e,t,n,i,r){null==i&&(i=e.start.row),null==r&&(r=0),null==t&&(t=e.end.row),null==n&&(n=this.getLine(t).length);var s=this.doc,o="";return e.walk((function(e,t,n,a){if(!(t<i)){if(t==i){if(n<r)return;a=Math.max(r,a)}o+=null!=e?e:s.getLine(t).substring(a,n)}}),t,n),o},this.getDisplayLine=function(e,t,n,i){var r,s=this.getFoldLine(e);return s?this.getFoldDisplayLine(s,e,t,n,i):(r=this.doc.getLine(e)).substring(i||0,t||r.length)},this.$cloneFoldData=function(){var e=[];return e=this.$foldData.map((function(t){var n=t.folds.map((function(e){return e.clone()}));return new r(e,n)})),e},this.toggleFold=function(e){var t,n,i=this.selection.getRange();if(i.isEmpty()){var r=i.start;if(t=this.getFoldAt(r.row,r.column))return void this.expandFold(t);(n=this.findMatchingBracket(r))?1==i.comparePoint(n)?i.end=n:(i.start=n,i.start.column++,i.end.column--):(n=this.findMatchingBracket({row:r.row,column:r.column+1}))?(1==i.comparePoint(n)?i.end=n:i.start=n,i.start.column++):i=this.getCommentFoldRange(r.row,r.column)||i}else{var s=this.getFoldsInRange(i);if(e&&s.length)return void this.expandFolds(s);1==s.length&&(t=s[0])}if(t||(t=this.getFoldAt(i.start.row,i.start.column)),t&&t.range.toString()==i.toString())this.expandFold(t);else{var o="...";if(!i.isMultiLine()){if((o=this.getTextRange(i)).length<4)return;o=o.trim().substring(0,2)+".."}this.addFold(o,i)}},this.getCommentFoldRange=function(e,t,n){var r=new o(this,e,t),s=r.getCurrentToken(),a=s.type;if(s&&/^comment|string/.test(a)){"comment"==(a=a.match(/comment|string/)[0])&&(a+="|doc-start");var l=new RegExp(a),c=new i;if(1!=n){do{s=r.stepBackward()}while(s&&l.test(s.type));r.stepForward()}if(c.start.row=r.getCurrentTokenRow(),c.start.column=r.getCurrentTokenColumn()+2,r=new o(this,e,t),-1!=n){var u=-1;do{if(s=r.stepForward(),-1==u){var h=this.getState(r.$row);l.test(h)||(u=r.$row)}else if(r.$row>u)break}while(s&&l.test(s.type));s=r.stepBackward()}else s=r.getCurrentToken();return c.end.row=r.getCurrentTokenRow(),c.end.column=r.getCurrentTokenColumn()+s.value.length-2,c}},this.foldAll=function(e,t,n){null==n&&(n=1e5);var i=this.foldWidgets;if(i){t=t||this.getLength();for(var r=e=e||0;r<t;r++)if(null==i[r]&&(i[r]=this.getFoldWidget(r)),"start"==i[r]){var s=this.getFoldWidgetRange(r);if(s&&s.isMultiLine()&&s.end.row<=t&&s.start.row>=e){r=s.end.row;try{var o=this.addFold("...",s);o&&(o.collapseChildren=n)}catch(e){}}}}},this.$foldStyles={manual:1,markbegin:1,markbeginend:1},this.$foldStyle="markbegin",this.setFoldStyle=function(e){if(!this.$foldStyles[e])throw new Error("invalid fold style: "+e+"["+Object.keys(this.$foldStyles).join(", ")+"]");if(this.$foldStyle!=e){this.$foldStyle=e,"manual"==e&&this.unfold();var t=this.$foldMode;this.$setFolding(null),this.$setFolding(t)}},this.$setFolding=function(e){this.$foldMode!=e&&(this.$foldMode=e,this.off("change",this.$updateFoldWidgets),this.off("tokenizerUpdate",this.$tokenizerUpdateFoldWidgets),this._signal("changeAnnotation"),e&&"manual"!=this.$foldStyle?(this.foldWidgets=[],this.getFoldWidget=e.getFoldWidget.bind(e,this,this.$foldStyle),this.getFoldWidgetRange=e.getFoldWidgetRange.bind(e,this,this.$foldStyle),this.$updateFoldWidgets=this.updateFoldWidgets.bind(this),this.$tokenizerUpdateFoldWidgets=this.tokenizerUpdateFoldWidgets.bind(this),this.on("change",this.$updateFoldWidgets),this.on("tokenizerUpdate",this.$tokenizerUpdateFoldWidgets)):this.foldWidgets=null)},this.getParentFoldRangeData=function(e,t){var n=this.foldWidgets;if(!n||t&&n[e])return{};for(var i,r=e-1;r>=0;){var s=n[r];if(null==s&&(s=n[r]=this.getFoldWidget(r)),"start"==s){var o=this.getFoldWidgetRange(r);if(i||(i=o),o&&o.end.row>=e)break}r--}return{range:-1!==r&&o,firstRange:i}},this.onFoldWidgetClick=function(e,t){var n={children:(t=t.domEvent).shiftKey,all:t.ctrlKey||t.metaKey,siblings:t.altKey};if(!this.$toggleFoldWidget(e,n)){var i=t.target||t.srcElement;i&&/ace_fold-widget/.test(i.className)&&(i.className+=" ace_invalid")}},this.$toggleFoldWidget=function(e,t){if(this.getFoldWidget){var n=this.getFoldWidget(e),i=this.getLine(e),r="end"===n?-1:1,s=this.getFoldAt(e,-1===r?0:i.length,r);if(s)return t.children||t.all?this.removeFold(s):this.expandFold(s),s;var o=this.getFoldWidgetRange(e,!0);if(o&&!o.isMultiLine()&&(s=this.getFoldAt(o.start.row,o.start.column,1))&&o.isEqual(s.range))return this.removeFold(s),s;if(t.siblings){var a=this.getParentFoldRangeData(e);if(a.range)var l=a.range.start.row+1,c=a.range.end.row;this.foldAll(l,c,t.all?1e4:0)}else t.children?(c=o?o.end.row:this.getLength(),this.foldAll(e+1,c,t.all?1e4:0)):o&&(t.all&&(o.collapseChildren=1e4),this.addFold("...",o));return o}},this.toggleFoldWidget=function(e){var t=this.selection.getCursor().row;t=this.getRowFoldStart(t);var n=this.$toggleFoldWidget(t,{});if(!n){var i=this.getParentFoldRangeData(t,!0);if(n=i.range||i.firstRange){t=n.start.row;var r=this.getFoldAt(t,this.getLine(t).length,1);r?this.removeFold(r):this.addFold("...",n)}}},this.updateFoldWidgets=function(e){var t=e.start.row,n=e.end.row-t;if(0===n)this.foldWidgets[t]=null;else if("remove"==e.action)this.foldWidgets.splice(t,n+1,null);else{var i=Array(n+1);i.unshift(t,1),this.foldWidgets.splice.apply(this.foldWidgets,i)}},this.tokenizerUpdateFoldWidgets=function(e){var t=e.data;t.first!=t.last&&this.foldWidgets.length>t.first&&this.foldWidgets.splice(t.first,this.foldWidgets.length)}}})),ace.define("ace/edit_session/bracket_match",["require","exports","module","ace/token_iterator","ace/range"],(function(e,t,n){"use strict";var i=e("../token_iterator").TokenIterator,r=e("../range").Range;t.BracketMatch=function(){this.findMatchingBracket=function(e,t){if(0==e.column)return null;var n=t||this.getLine(e.row).charAt(e.column-1);if(""==n)return null;var i=n.match(/([\(\[\{])|([\)\]\}])/);return i?i[1]?this.$findClosingBracket(i[1],e):this.$findOpeningBracket(i[2],e):null},this.getBracketRange=function(e){var t,n=this.getLine(e.row),i=!0,s=n.charAt(e.column-1),o=s&&s.match(/([\(\[\{])|([\)\]\}])/);if(o||(s=n.charAt(e.column),e={row:e.row,column:e.column+1},o=s&&s.match(/([\(\[\{])|([\)\]\}])/),i=!1),!o)return null;if(o[1]){if(!(a=this.$findClosingBracket(o[1],e)))return null;t=r.fromPoints(e,a),i||(t.end.column++,t.start.column--),t.cursor=t.end}else{var a;if(!(a=this.$findOpeningBracket(o[2],e)))return null;t=r.fromPoints(a,e),i||(t.start.column++,t.end.column--),t.cursor=t.start}return t},this.$brackets={")":"(","(":")","]":"[","[":"]","{":"}","}":"{"},this.$findOpeningBracket=function(e,t,n){var r=this.$brackets[e],s=1,o=new i(this,t.row,t.column),a=o.getCurrentToken();if(a||(a=o.stepForward()),a){n||(n=new RegExp("(\\.?"+a.type.replace(".","\\.").replace("rparen",".paren").replace(/\b(?:end)\b/,"(?:start|begin|end)")+")+"));for(var l=t.column-o.getCurrentTokenColumn()-2,c=a.value;;){for(;l>=0;){var u=c.charAt(l);if(u==r){if(0==(s-=1))return{row:o.getCurrentTokenRow(),column:l+o.getCurrentTokenColumn()}}else u==e&&(s+=1);l-=1}do{a=o.stepBackward()}while(a&&!n.test(a.type));if(null==a)break;l=(c=a.value).length-1}return null}},this.$findClosingBracket=function(e,t,n){var r=this.$brackets[e],s=1,o=new i(this,t.row,t.column),a=o.getCurrentToken();if(a||(a=o.stepForward()),a){n||(n=new RegExp("(\\.?"+a.type.replace(".","\\.").replace("lparen",".paren").replace(/\b(?:start|begin)\b/,"(?:start|begin|end)")+")+"));for(var l=t.column-o.getCurrentTokenColumn();;){for(var c=a.value,u=c.length;l<u;){var h=c.charAt(l);if(h==r){if(0==(s-=1))return{row:o.getCurrentTokenRow(),column:l+o.getCurrentTokenColumn()}}else h==e&&(s+=1);l+=1}do{a=o.stepForward()}while(a&&!n.test(a.type));if(null==a)break;l=0}return null}}}})),ace.define("ace/edit_session",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/bidihandler","ace/config","ace/lib/event_emitter","ace/selection","ace/mode/text","ace/range","ace/document","ace/background_tokenizer","ace/search_highlight","ace/edit_session/folding","ace/edit_session/bracket_match"],(function(e,t,n){"use strict";var i=e("./lib/oop"),r=e("./lib/lang"),s=e("./bidihandler").BidiHandler,o=e("./config"),a=e("./lib/event_emitter").EventEmitter,l=e("./selection").Selection,c=e("./mode/text").Mode,u=e("./range").Range,h=e("./document").Document,d=e("./background_tokenizer").BackgroundTokenizer,f=e("./search_highlight").SearchHighlight,p=function(e,t){this.$breakpoints=[],this.$decorations=[],this.$frontMarkers={},this.$backMarkers={},this.$markerId=1,this.$undoSelect=!0,this.$foldData=[],this.id="session"+ ++p.$uid,this.$foldData.toString=function(){return this.join("\n")},this.on("changeFold",this.onChangeFold.bind(this)),this.$onChange=this.onChange.bind(this),"object"==typeof e&&e.getLine||(e=new h(e)),this.setDocument(e),this.selection=new l(this),this.$bidiHandler=new s(this),o.resetOptions(this),this.setMode(t),o._signal("session",this)};p.$uid=0,function(){function e(e){return!(e<4352)&&(e>=4352&&e<=4447||e>=4515&&e<=4519||e>=4602&&e<=4607||e>=9001&&e<=9002||e>=11904&&e<=11929||e>=11931&&e<=12019||e>=12032&&e<=12245||e>=12272&&e<=12283||e>=12288&&e<=12350||e>=12353&&e<=12438||e>=12441&&e<=12543||e>=12549&&e<=12589||e>=12593&&e<=12686||e>=12688&&e<=12730||e>=12736&&e<=12771||e>=12784&&e<=12830||e>=12832&&e<=12871||e>=12880&&e<=13054||e>=13056&&e<=19903||e>=19968&&e<=42124||e>=42128&&e<=42182||e>=43360&&e<=43388||e>=44032&&e<=55203||e>=55216&&e<=55238||e>=55243&&e<=55291||e>=63744&&e<=64255||e>=65040&&e<=65049||e>=65072&&e<=65106||e>=65108&&e<=65126||e>=65128&&e<=65131||e>=65281&&e<=65376||e>=65504&&e<=65510)}i.implement(this,a),this.setDocument=function(e){this.doc&&this.doc.removeListener("change",this.$onChange),this.doc=e,e.on("change",this.$onChange),this.bgTokenizer&&this.bgTokenizer.setDocument(this.getDocument()),this.resetCaches()},this.getDocument=function(){return this.doc},this.$resetRowCache=function(e){if(!e)return this.$docRowCache=[],void(this.$screenRowCache=[]);var t=this.$docRowCache.length,n=this.$getRowCacheIndex(this.$docRowCache,e)+1;t>n&&(this.$docRowCache.splice(n,t),this.$screenRowCache.splice(n,t))},this.$getRowCacheIndex=function(e,t){for(var n=0,i=e.length-1;n<=i;){var r=n+i>>1,s=e[r];if(t>s)n=r+1;else{if(!(t<s))return r;i=r-1}}return n-1},this.resetCaches=function(){this.$modified=!0,this.$wrapData=[],this.$rowLengthCache=[],this.$resetRowCache(0),this.bgTokenizer&&this.bgTokenizer.start(0)},this.onChangeFold=function(e){var t=e.data;this.$resetRowCache(t.start.row)},this.onChange=function(e){this.$modified=!0,this.$bidiHandler.onChange(e),this.$resetRowCache(e.start.row);var t=this.$updateInternalDataOnChange(e);!this.$fromUndo&&this.$undoManager&&(t&&t.length&&(this.$undoManager.add({action:"removeFolds",folds:t},this.mergeUndoDeltas),this.mergeUndoDeltas=!0),this.$undoManager.add(e,this.mergeUndoDeltas),this.mergeUndoDeltas=!0,this.$informUndoManager.schedule()),this.bgTokenizer&&this.bgTokenizer.$updateOnChange(e),this._signal("change",e)},this.setValue=function(e){this.doc.setValue(e),this.selection.moveTo(0,0),this.$resetRowCache(0),this.setUndoManager(this.$undoManager),this.getUndoManager().reset()},this.getValue=this.toString=function(){return this.doc.getValue()},this.getSelection=function(){return this.selection},this.getState=function(e){return this.bgTokenizer.getState(e)},this.getTokens=function(e){return this.bgTokenizer.getTokens(e)},this.getTokenAt=function(e,t){var n,i=this.bgTokenizer.getTokens(e),r=0;if(null==t){var s=i.length-1;r=this.getLine(e).length}else for(s=0;s<i.length&&!((r+=i[s].value.length)>=t);s++);return(n=i[s])?(n.index=s,n.start=r-n.value.length,n):null},this.setUndoManager=function(e){if(this.$undoManager=e,this.$informUndoManager&&this.$informUndoManager.cancel(),e){var t=this;e.addSession(this),this.$syncInformUndoManager=function(){t.$informUndoManager.cancel(),t.mergeUndoDeltas=!1},this.$informUndoManager=r.delayedCall(this.$syncInformUndoManager)}else this.$syncInformUndoManager=function(){}},this.markUndoGroup=function(){this.$syncInformUndoManager&&this.$syncInformUndoManager()},this.$defaultUndoManager={undo:function(){},redo:function(){},reset:function(){},add:function(){},addSelection:function(){},startNewGroup:function(){},addSession:function(){}},this.getUndoManager=function(){return this.$undoManager||this.$defaultUndoManager},this.getTabString=function(){return this.getUseSoftTabs()?r.stringRepeat(" ",this.getTabSize()):"\t"},this.setUseSoftTabs=function(e){this.setOption("useSoftTabs",e)},this.getUseSoftTabs=function(){return this.$useSoftTabs&&!this.$mode.$indentWithTabs},this.setTabSize=function(e){this.setOption("tabSize",e)},this.getTabSize=function(){return this.$tabSize},this.isTabStop=function(e){return this.$useSoftTabs&&e.column%this.$tabSize==0},this.setNavigateWithinSoftTabs=function(e){this.setOption("navigateWithinSoftTabs",e)},this.getNavigateWithinSoftTabs=function(){return this.$navigateWithinSoftTabs},this.$overwrite=!1,this.setOverwrite=function(e){this.setOption("overwrite",e)},this.getOverwrite=function(){return this.$overwrite},this.toggleOverwrite=function(){this.setOverwrite(!this.$overwrite)},this.addGutterDecoration=function(e,t){this.$decorations[e]||(this.$decorations[e]=""),this.$decorations[e]+=" "+t,this._signal("changeBreakpoint",{})},this.removeGutterDecoration=function(e,t){this.$decorations[e]=(this.$decorations[e]||"").replace(" "+t,""),this._signal("changeBreakpoint",{})},this.getBreakpoints=function(){return this.$breakpoints},this.setBreakpoints=function(e){this.$breakpoints=[];for(var t=0;t<e.length;t++)this.$breakpoints[e[t]]="ace_breakpoint";this._signal("changeBreakpoint",{})},this.clearBreakpoints=function(){this.$breakpoints=[],this._signal("changeBreakpoint",{})},this.setBreakpoint=function(e,t){void 0===t&&(t="ace_breakpoint"),t?this.$breakpoints[e]=t:delete this.$breakpoints[e],this._signal("changeBreakpoint",{})},this.clearBreakpoint=function(e){delete this.$breakpoints[e],this._signal("changeBreakpoint",{})},this.addMarker=function(e,t,n,i){var r=this.$markerId++,s={range:e,type:n||"line",renderer:"function"==typeof n?n:null,clazz:t,inFront:!!i,id:r};return i?(this.$frontMarkers[r]=s,this._signal("changeFrontMarker")):(this.$backMarkers[r]=s,this._signal("changeBackMarker")),r},this.addDynamicMarker=function(e,t){if(e.update){var n=this.$markerId++;return e.id=n,e.inFront=!!t,t?(this.$frontMarkers[n]=e,this._signal("changeFrontMarker")):(this.$backMarkers[n]=e,this._signal("changeBackMarker")),e}},this.removeMarker=function(e){var t=this.$frontMarkers[e]||this.$backMarkers[e];t&&(delete(t.inFront?this.$frontMarkers:this.$backMarkers)[e],this._signal(t.inFront?"changeFrontMarker":"changeBackMarker"))},this.getMarkers=function(e){return e?this.$frontMarkers:this.$backMarkers},this.highlight=function(e){if(!this.$searchHighlight){var t=new f(null,"ace_selected-word","text");this.$searchHighlight=this.addDynamicMarker(t)}this.$searchHighlight.setRegexp(e)},this.highlightLines=function(e,t,n,i){"number"!=typeof t&&(n=t,t=e),n||(n="ace_step");var r=new u(e,0,t,1/0);return r.id=this.addMarker(r,n,"fullLine",i),r},this.setAnnotations=function(e){this.$annotations=e,this._signal("changeAnnotation",{})},this.getAnnotations=function(){return this.$annotations||[]},this.clearAnnotations=function(){this.setAnnotations([])},this.$detectNewLine=function(e){var t=e.match(/^.*?(\r?\n)/m);this.$autoNewLine=t?t[1]:"\n"},this.getWordRange=function(e,t){var n=this.getLine(e),i=!1;if(t>0&&(i=!!n.charAt(t-1).match(this.tokenRe)),i||(i=!!n.charAt(t).match(this.tokenRe)),i)var r=this.tokenRe;else if(/^\s+$/.test(n.slice(t-1,t+1)))r=/\s/;else r=this.nonTokenRe;var s=t;if(s>0){do{s--}while(s>=0&&n.charAt(s).match(r));s++}for(var o=t;o<n.length&&n.charAt(o).match(r);)o++;return new u(e,s,e,o)},this.getAWordRange=function(e,t){for(var n=this.getWordRange(e,t),i=this.getLine(n.end.row);i.charAt(n.end.column).match(/[ \t]/);)n.end.column+=1;return n},this.setNewLineMode=function(e){this.doc.setNewLineMode(e)},this.getNewLineMode=function(){return this.doc.getNewLineMode()},this.setUseWorker=function(e){this.setOption("useWorker",e)},this.getUseWorker=function(){return this.$useWorker},this.onReloadTokenizer=function(e){var t=e.data;this.bgTokenizer.start(t.first),this._signal("tokenizerUpdate",e)},this.$modes=o.$modes,this.$mode=null,this.$modeId=null,this.setMode=function(e,t){if(e&&"object"==typeof e){if(e.getTokenizer)return this.$onChangeMode(e);var n=e,i=n.path}else i=e||"ace/mode/text";if(this.$modes["ace/mode/text"]||(this.$modes["ace/mode/text"]=new c),this.$modes[i]&&!n)return this.$onChangeMode(this.$modes[i]),void(t&&t());this.$modeId=i,o.loadModule(["mode",i],function(e){if(this.$modeId!==i)return t&&t();this.$modes[i]&&!n?this.$onChangeMode(this.$modes[i]):e&&e.Mode&&(e=new e.Mode(n),n||(this.$modes[i]=e,e.$id=i),this.$onChangeMode(e)),t&&t()}.bind(this)),this.$mode||this.$onChangeMode(this.$modes["ace/mode/text"],!0)},this.$onChangeMode=function(e,t){if(t||(this.$modeId=e.$id),this.$mode!==e){this.$mode=e,this.$stopWorker(),this.$useWorker&&this.$startWorker();var n=e.getTokenizer();if(void 0!==n.addEventListener){var i=this.onReloadTokenizer.bind(this);n.addEventListener("update",i)}if(this.bgTokenizer)this.bgTokenizer.setTokenizer(n);else{this.bgTokenizer=new d(n);var r=this;this.bgTokenizer.addEventListener("update",(function(e){r._signal("tokenizerUpdate",e)}))}this.bgTokenizer.setDocument(this.getDocument()),this.tokenRe=e.tokenRe,this.nonTokenRe=e.nonTokenRe,t||(e.attachToSession&&e.attachToSession(this),this.$options.wrapMethod.set.call(this,this.$wrapMethod),this.$setFolding(e.foldingRules),this.bgTokenizer.start(0),this._emit("changeMode"))}},this.$stopWorker=function(){this.$worker&&(this.$worker.terminate(),this.$worker=null)},this.$startWorker=function(){try{this.$worker=this.$mode.createWorker(this)}catch(e){o.warn("Could not load worker",e),this.$worker=null}},this.getMode=function(){return this.$mode},this.$scrollTop=0,this.setScrollTop=function(e){this.$scrollTop===e||isNaN(e)||(this.$scrollTop=e,this._signal("changeScrollTop",e))},this.getScrollTop=function(){return this.$scrollTop},this.$scrollLeft=0,this.setScrollLeft=function(e){this.$scrollLeft===e||isNaN(e)||(this.$scrollLeft=e,this._signal("changeScrollLeft",e))},this.getScrollLeft=function(){return this.$scrollLeft},this.getScreenWidth=function(){return this.$computeWidth(),this.lineWidgets?Math.max(this.getLineWidgetMaxWidth(),this.screenWidth):this.screenWidth},this.getLineWidgetMaxWidth=function(){if(null!=this.lineWidgetsWidth)return this.lineWidgetsWidth;var e=0;return this.lineWidgets.forEach((function(t){t&&t.screenWidth>e&&(e=t.screenWidth)})),this.lineWidgetWidth=e},this.$computeWidth=function(e){if(this.$modified||e){if(this.$modified=!1,this.$useWrapMode)return this.screenWidth=this.$wrapLimit;for(var t=this.doc.getAllLines(),n=this.$rowLengthCache,i=0,r=0,s=this.$foldData[r],o=s?s.start.row:1/0,a=t.length,l=0;l<a;l++){if(l>o){if((l=s.end.row+1)>=a)break;o=(s=this.$foldData[r++])?s.start.row:1/0}null==n[l]&&(n[l]=this.$getStringScreenWidth(t[l])[0]),n[l]>i&&(i=n[l])}this.screenWidth=i}},this.getLine=function(e){return this.doc.getLine(e)},this.getLines=function(e,t){return this.doc.getLines(e,t)},this.getLength=function(){return this.doc.getLength()},this.getTextRange=function(e){return this.doc.getTextRange(e||this.selection.getRange())},this.insert=function(e,t){return this.doc.insert(e,t)},this.remove=function(e){return this.doc.remove(e)},this.removeFullLines=function(e,t){return this.doc.removeFullLines(e,t)},this.undoChanges=function(e,t){if(e.length){this.$fromUndo=!0;for(var n=e.length-1;-1!=n;n--){var i=e[n];"insert"==i.action||"remove"==i.action?this.doc.revertDelta(i):i.folds&&this.addFolds(i.folds)}!t&&this.$undoSelect&&(e.selectionBefore?this.selection.fromJSON(e.selectionBefore):this.selection.setRange(this.$getUndoSelection(e,!0))),this.$fromUndo=!1}},this.redoChanges=function(e,t){if(e.length){this.$fromUndo=!0;for(var n=0;n<e.length;n++){var i=e[n];("insert"==i.action||"remove"==i.action)&&this.doc.applyDelta(i)}!t&&this.$undoSelect&&(e.selectionAfter?this.selection.fromJSON(e.selectionAfter):this.selection.setRange(this.$getUndoSelection(e,!1))),this.$fromUndo=!1}},this.setUndoSelect=function(e){this.$undoSelect=e},this.$getUndoSelection=function(e,t){function n(e){return t?"insert"!==e.action:"insert"===e.action}for(var i,r,s=0;s<e.length;s++){var o=e[s];o.start&&(i?n(o)?(r=o.start,-1==i.compare(r.row,r.column)&&i.setStart(r),r=o.end,1==i.compare(r.row,r.column)&&i.setEnd(r),!0):(r=o.start,-1==i.compare(r.row,r.column)&&(i=u.fromPoints(o.start,o.start)),!1):n(o)?(i=u.fromPoints(o.start,o.end),!0):(i=u.fromPoints(o.start,o.start),!1))}return i},this.replace=function(e,t){return this.doc.replace(e,t)},this.moveText=function(e,t,n){var i=this.getTextRange(e),r=this.getFoldsInRange(e),s=u.fromPoints(t,t);if(!n){this.remove(e);var o=e.start.row-e.end.row;(c=o?-e.end.column:e.start.column-e.end.column)&&(s.start.row==e.end.row&&s.start.column>e.end.column&&(s.start.column+=c),s.end.row==e.end.row&&s.end.column>e.end.column&&(s.end.column+=c)),o&&s.start.row>=e.end.row&&(s.start.row+=o,s.end.row+=o)}if(s.end=this.insert(s.start,i),r.length){var a=e.start,l=s.start,c=(o=l.row-a.row,l.column-a.column);this.addFolds(r.map((function(e){return(e=e.clone()).start.row==a.row&&(e.start.column+=c),e.end.row==a.row&&(e.end.column+=c),e.start.row+=o,e.end.row+=o,e})))}return s},this.indentRows=function(e,t,n){n=n.replace(/\t/g,this.getTabString());for(var i=e;i<=t;i++)this.doc.insertInLine({row:i,column:0},n)},this.outdentRows=function(e){for(var t=e.collapseRows(),n=new u(0,0,0,0),i=this.getTabSize(),r=t.start.row;r<=t.end.row;++r){var s=this.getLine(r);n.start.row=r,n.end.row=r;for(var o=0;o<i&&" "==s.charAt(o);++o);o<i&&"\t"==s.charAt(o)?(n.start.column=o,n.end.column=o+1):(n.start.column=0,n.end.column=o),this.remove(n)}},this.$moveLines=function(e,t,n){if(e=this.getRowFoldStart(e),t=this.getRowFoldEnd(t),n<0){if((r=this.getRowFoldStart(e+n))<0)return 0;var i=r-e}else if(n>0){var r;if((r=this.getRowFoldEnd(t+n))>this.doc.getLength()-1)return 0;i=r-t}else{e=this.$clipRowToDocument(e);i=(t=this.$clipRowToDocument(t))-e+1}var s=new u(e,0,t,Number.MAX_VALUE),o=this.getFoldsInRange(s).map((function(e){return(e=e.clone()).start.row+=i,e.end.row+=i,e})),a=0==n?this.doc.getLines(e,t):this.doc.removeFullLines(e,t);return this.doc.insertFullLines(e+i,a),o.length&&this.addFolds(o),i},this.moveLinesUp=function(e,t){return this.$moveLines(e,t,-1)},this.moveLinesDown=function(e,t){return this.$moveLines(e,t,1)},this.duplicateLines=function(e,t){return this.$moveLines(e,t,0)},this.$clipRowToDocument=function(e){return Math.max(0,Math.min(e,this.doc.getLength()-1))},this.$clipColumnToRow=function(e,t){return t<0?0:Math.min(this.doc.getLine(e).length,t)},this.$clipPositionToDocument=function(e,t){if(t=Math.max(0,t),e<0)e=0,t=0;else{var n=this.doc.getLength();e>=n?(e=n-1,t=this.doc.getLine(n-1).length):t=Math.min(this.doc.getLine(e).length,t)}return{row:e,column:t}},this.$clipRangeToDocument=function(e){e.start.row<0?(e.start.row=0,e.start.column=0):e.start.column=this.$clipColumnToRow(e.start.row,e.start.column);var t=this.doc.getLength()-1;return e.end.row>t?(e.end.row=t,e.end.column=this.doc.getLine(t).length):e.end.column=this.$clipColumnToRow(e.end.row,e.end.column),e},this.$wrapLimit=80,this.$useWrapMode=!1,this.$wrapLimitRange={min:null,max:null},this.setUseWrapMode=function(e){if(e!=this.$useWrapMode){if(this.$useWrapMode=e,this.$modified=!0,this.$resetRowCache(0),e){var t=this.getLength();this.$wrapData=Array(t),this.$updateWrapData(0,t-1)}this._signal("changeWrapMode")}},this.getUseWrapMode=function(){return this.$useWrapMode},this.setWrapLimitRange=function(e,t){this.$wrapLimitRange.min===e&&this.$wrapLimitRange.max===t||(this.$wrapLimitRange={min:e,max:t},this.$modified=!0,this.$bidiHandler.markAsDirty(),this.$useWrapMode&&this._signal("changeWrapMode"))},this.adjustWrapLimit=function(e,t){var n=this.$wrapLimitRange;n.max<0&&(n={min:t,max:t});var i=this.$constrainWrapLimit(e,n.min,n.max);return i!=this.$wrapLimit&&i>1&&(this.$wrapLimit=i,this.$modified=!0,this.$useWrapMode&&(this.$updateWrapData(0,this.getLength()-1),this.$resetRowCache(0),this._signal("changeWrapLimit")),!0)},this.$constrainWrapLimit=function(e,t,n){return t&&(e=Math.max(t,e)),n&&(e=Math.min(n,e)),e},this.getWrapLimit=function(){return this.$wrapLimit},this.setWrapLimit=function(e){this.setWrapLimitRange(e,e)},this.getWrapLimitRange=function(){return{min:this.$wrapLimitRange.min,max:this.$wrapLimitRange.max}},this.$updateInternalDataOnChange=function(e){var t=this.$useWrapMode,n=e.action,i=e.start,r=e.end,s=i.row,o=r.row,a=o-s,l=null;if(this.$updating=!0,0!=a)if("remove"===n){this[t?"$wrapData":"$rowLengthCache"].splice(s,a);var c=this.$foldData;l=this.getFoldsInRange(e),this.removeFolds(l);var u=0;if(g=this.getFoldLine(r.row)){g.addRemoveChars(r.row,r.column,i.column-r.column),g.shiftRow(-a);var h=this.getFoldLine(s);h&&h!==g&&(h.merge(g),g=h),u=c.indexOf(g)+1}for(;u<c.length;u++){(g=c[u]).start.row>=r.row&&g.shiftRow(-a)}o=s}else{var d=Array(a);d.unshift(s,0);var f=t?this.$wrapData:this.$rowLengthCache;f.splice.apply(f,d);c=this.$foldData,u=0;if(g=this.getFoldLine(s)){var p=g.range.compareInside(i.row,i.column);0==p?(g=g.split(i.row,i.column))&&(g.shiftRow(a),g.addRemoveChars(o,0,r.column-i.column)):-1==p&&(g.addRemoveChars(s,0,r.column-i.column),g.shiftRow(a)),u=c.indexOf(g)+1}for(;u<c.length;u++){var g;(g=c[u]).start.row>=s&&g.shiftRow(a)}}else a=Math.abs(e.start.column-e.end.column),"remove"===n&&(l=this.getFoldsInRange(e),this.removeFolds(l),a=-a),(g=this.getFoldLine(s))&&g.addRemoveChars(s,i.column,a);return t&&this.$wrapData.length!=this.doc.getLength()&&console.error("doc.getLength() and $wrapData.length have to be the same!"),this.$updating=!1,t?this.$updateWrapData(s,o):this.$updateRowLengthCache(s,o),l},this.$updateRowLengthCache=function(e,t,n){this.$rowLengthCache[e]=null,this.$rowLengthCache[t]=null},this.$updateWrapData=function(e,i){var r,s,o=this.doc.getAllLines(),a=this.getTabSize(),l=this.$wrapData,c=this.$wrapLimit,u=e;for(i=Math.min(i,o.length-1);u<=i;)(s=this.getFoldLine(u,s))?(r=[],s.walk(function(e,i,s,a){var l;if(null!=e){(l=this.$getDisplayTokens(e,r.length))[0]=t;for(var c=1;c<l.length;c++)l[c]=n}else l=this.$getDisplayTokens(o[i].substring(a,s),r.length);r=r.concat(l)}.bind(this),s.end.row,o[s.end.row].length+1),l[s.start.row]=this.$computeWrapSplits(r,c,a),u=s.end.row+1):(r=this.$getDisplayTokens(o[u]),l[u]=this.$computeWrapSplits(r,c,a),u++)};var t=3,n=4;this.$computeWrapSplits=function(e,i,r){function s(){var t=0;if(0===f)return t;if(d)for(var n=0;n<e.length;n++){var i=e[n];if(10==i)t+=1;else{if(11!=i){if(12==i)continue;break}t+=r}}return h&&!1!==d&&(t+=r),Math.min(t,f)}function o(t){for(var n=t-c,i=c;i<t;i++){var r=e[i];12!==r&&2!==r||(n-=1)}a.length||(p=s(),a.indent=p),u+=n,a.push(u),c=t}if(0==e.length)return[];for(var a=[],l=e.length,c=0,u=0,h=this.$wrapAsCode,d=this.$indentedSoftWrap,f=i<=Math.max(2*r,8)||!1===d?0:Math.floor(i/2),p=0;l-c>i-p;){var g=c+i-p;if(e[g-1]>=10&&e[g]>=10)o(g);else if(e[g]!=t&&e[g]!=n){for(var m=Math.max(g-(i-(i>>2)),c-1);g>m&&e[g]<t;)g--;if(h){for(;g>m&&e[g]<t;)g--;for(;g>m&&9==e[g];)g--}else for(;g>m&&e[g]<10;)g--;g>m?o(++g):(2==e[g=c+i]&&g--,o(g-p))}else{for(;g!=c-1&&e[g]!=t;g--);if(g>c){o(g);continue}for(g=c+i;g<e.length&&e[g]==n;g++);if(g==e.length)break;o(g)}}return a},this.$getDisplayTokens=function(t,n){var i,r=[];n=n||0;for(var s=0;s<t.length;s++){var o=t.charCodeAt(s);if(9==o){i=this.getScreenTabSize(r.length+n),r.push(11);for(var a=1;a<i;a++)r.push(12)}else 32==o?r.push(10):o>39&&o<48||o>57&&o<64?r.push(9):o>=4352&&e(o)?r.push(1,2):r.push(1)}return r},this.$getStringScreenWidth=function(t,n,i){if(0==n)return[0,0];var r,s;for(null==n&&(n=1/0),i=i||0,s=0;s<t.length&&(9==(r=t.charCodeAt(s))?i+=this.getScreenTabSize(i):r>=4352&&e(r)?i+=2:i+=1,!(i>n));s++);return[i,s]},this.lineWidgets=null,this.getRowLength=function(e){if(this.lineWidgets)var t=this.lineWidgets[e]&&this.lineWidgets[e].rowCount||0;else t=0;return this.$useWrapMode&&this.$wrapData[e]?this.$wrapData[e].length+1+t:1+t},this.getRowLineCount=function(e){return this.$useWrapMode&&this.$wrapData[e]?this.$wrapData[e].length+1:1},this.getRowWrapIndent=function(e){if(this.$useWrapMode){var t=this.screenToDocumentPosition(e,Number.MAX_VALUE),n=this.$wrapData[t.row];return n.length&&n[0]<t.column?n.indent:0}return 0},this.getScreenLastRowColumn=function(e){var t=this.screenToDocumentPosition(e,Number.MAX_VALUE);return this.documentToScreenColumn(t.row,t.column)},this.getDocumentLastRowColumn=function(e,t){var n=this.documentToScreenRow(e,t);return this.getScreenLastRowColumn(n)},this.getDocumentLastRowColumnPosition=function(e,t){var n=this.documentToScreenRow(e,t);return this.screenToDocumentPosition(n,Number.MAX_VALUE/10)},this.getRowSplitData=function(e){return this.$useWrapMode?this.$wrapData[e]:void 0},this.getScreenTabSize=function(e){return this.$tabSize-e%this.$tabSize},this.screenToDocumentRow=function(e,t){return this.screenToDocumentPosition(e,t).row},this.screenToDocumentColumn=function(e,t){return this.screenToDocumentPosition(e,t).column},this.screenToDocumentPosition=function(e,t,n){if(e<0)return{row:0,column:0};var i,r,s=0,o=0,a=0,l=0,c=this.$screenRowCache,u=this.$getRowCacheIndex(c,e),h=c.length;if(h&&u>=0){a=c[u],s=this.$docRowCache[u];var d=e>c[h-1]}else d=!h;for(var f=this.getLength()-1,p=this.getNextFoldLine(s),g=p?p.start.row:1/0;a<=e&&!(a+(l=this.getRowLength(s))>e||s>=f);)a+=l,++s>g&&(s=p.end.row+1,g=(p=this.getNextFoldLine(s,p))?p.start.row:1/0),d&&(this.$docRowCache.push(s),this.$screenRowCache.push(a));if(p&&p.start.row<=s)i=this.getFoldDisplayLine(p),s=p.start.row;else{if(a+l<=e||s>f)return{row:f,column:this.getLine(f).length};i=this.getLine(s),p=null}var m=0,v=Math.floor(e-a);if(this.$useWrapMode){var $=this.$wrapData[s];$&&(r=$[v],v>0&&$.length&&(m=$.indent,o=$[v-1]||$[$.length-1],i=i.substring(o)))}return void 0!==n&&this.$bidiHandler.isBidiRow(a+v,s,v)&&(t=this.$bidiHandler.offsetToCol(n)),o+=this.$getStringScreenWidth(i,t-m)[1],this.$useWrapMode&&o>=r&&(o=r-1),p?p.idxToPosition(o):{row:s,column:o}},this.documentToScreenPosition=function(e,t){if(void 0===t)var n=this.$clipPositionToDocument(e.row,e.column);else n=this.$clipPositionToDocument(e,t);e=n.row,t=n.column;var i,r=0,s=null;(i=this.getFoldAt(e,t,1))&&(e=i.start.row,t=i.start.column);var o,a=0,l=this.$docRowCache,c=this.$getRowCacheIndex(l,e),u=l.length;if(u&&c>=0){a=l[c],r=this.$screenRowCache[c];var h=e>l[u-1]}else h=!u;for(var d=this.getNextFoldLine(a),f=d?d.start.row:1/0;a<e;){if(a>=f){if((o=d.end.row+1)>e)break;f=(d=this.getNextFoldLine(o,d))?d.start.row:1/0}else o=a+1;r+=this.getRowLength(a),a=o,h&&(this.$docRowCache.push(a),this.$screenRowCache.push(r))}var p="";d&&a>=f?(p=this.getFoldDisplayLine(d,e,t),s=d.start.row):(p=this.getLine(e).substring(0,t),s=e);var g=0;if(this.$useWrapMode){var m=this.$wrapData[s];if(m){for(var v=0;p.length>=m[v];)r++,v++;p=p.substring(m[v-1]||0,p.length),g=v>0?m.indent:0}}return{row:r,column:g+this.$getStringScreenWidth(p)[0]}},this.documentToScreenColumn=function(e,t){return this.documentToScreenPosition(e,t).column},this.documentToScreenRow=function(e,t){return this.documentToScreenPosition(e,t).row},this.getScreenLength=function(){var e=0,t=null;if(this.$useWrapMode)for(var n=this.$wrapData.length,i=0,r=(a=0,(t=this.$foldData[a++])?t.start.row:1/0);i<n;){var s=this.$wrapData[i];e+=s?s.length+1:1,++i>r&&(i=t.end.row+1,r=(t=this.$foldData[a++])?t.start.row:1/0)}else{e=this.getLength();for(var o=this.$foldData,a=0;a<o.length;a++)e-=(t=o[a]).end.row-t.start.row}return this.lineWidgets&&(e+=this.$getWidgetScreenLength()),e},this.$setFontMetrics=function(e){this.$enableVarChar&&(this.$getStringScreenWidth=function(t,n,i){if(0===n)return[0,0];var r,s;for(n||(n=1/0),i=i||0,s=0;s<t.length&&!((i+="\t"===(r=t.charAt(s))?this.getScreenTabSize(i):e.getCharacterWidth(r))>n);s++);return[i,s]})},this.destroy=function(){this.bgTokenizer&&(this.bgTokenizer.setDocument(null),this.bgTokenizer=null),this.$stopWorker()},this.isFullWidth=e}.call(p.prototype),e("./edit_session/folding").Folding.call(p.prototype),e("./edit_session/bracket_match").BracketMatch.call(p.prototype),o.defineOptions(p.prototype,"session",{wrap:{set:function(e){if(e&&"off"!=e?"free"==e?e=!0:"printMargin"==e?e=-1:"string"==typeof e&&(e=parseInt(e,10)||!1):e=!1,this.$wrap!=e)if(this.$wrap=e,e){var t="number"==typeof e?e:null;this.setWrapLimitRange(t,t),this.setUseWrapMode(!0)}else this.setUseWrapMode(!1)},get:function(){return this.getUseWrapMode()?-1==this.$wrap?"printMargin":this.getWrapLimitRange().min?this.$wrap:"free":"off"},handlesSet:!0},wrapMethod:{set:function(e){(e="auto"==e?"text"!=this.$mode.type:"text"!=e)!=this.$wrapAsCode&&(this.$wrapAsCode=e,this.$useWrapMode&&(this.$useWrapMode=!1,this.setUseWrapMode(!0)))},initialValue:"auto"},indentedSoftWrap:{set:function(){this.$useWrapMode&&(this.$useWrapMode=!1,this.setUseWrapMode(!0))},initialValue:!0},firstLineNumber:{set:function(){this._signal("changeBreakpoint")},initialValue:1},useWorker:{set:function(e){this.$useWorker=e,this.$stopWorker(),e&&this.$startWorker()},initialValue:!0},useSoftTabs:{initialValue:!0},tabSize:{set:function(e){isNaN(e)||this.$tabSize===e||(this.$modified=!0,this.$rowLengthCache=[],this.$tabSize=e,this._signal("changeTabSize"))},initialValue:4,handlesSet:!0},navigateWithinSoftTabs:{initialValue:!1},foldStyle:{set:function(e){this.setFoldStyle(e)},handlesSet:!0},overwrite:{set:function(e){this._signal("changeOverwrite")},initialValue:!1},newLineMode:{set:function(e){this.doc.setNewLineMode(e)},get:function(){return this.doc.getNewLineMode()},handlesSet:!0},mode:{set:function(e){this.setMode(e)},get:function(){return this.$modeId},handlesSet:!0}}),t.EditSession=p})),ace.define("ace/search",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/range"],(function(e,t,n){"use strict";var i=e("./lib/lang"),r=e("./lib/oop"),s=e("./range").Range,o=function(){this.$options={}};(function(){this.set=function(e){return r.mixin(this.$options,e),this},this.getOptions=function(){return i.copyObject(this.$options)},this.setOptions=function(e){this.$options=e},this.find=function(e){var t=this.$options,n=this.$matchIterator(e,t);if(!n)return!1;var i=null;return n.forEach((function(e,n,r,o){return i=new s(e,n,r,o),!(n==o&&t.start&&t.start.start&&0!=t.skipCurrent&&i.isEqual(t.start))||(i=null,!1)})),i},this.findAll=function(e){var t=this.$options;if(!t.needle)return[];this.$assembleRegExp(t);var n=t.range,r=n?e.getLines(n.start.row,n.end.row):e.doc.getAllLines(),o=[],a=t.re;if(t.$isMultiLine){var l,c=a.length,u=r.length-c;e:for(var h=a.offset||0;h<=u;h++){for(var d=0;d<c;d++)if(-1==r[h+d].search(a[d]))continue e;var f=r[h],p=r[h+c-1],g=f.length-f.match(a[0])[0].length,m=p.match(a[c-1])[0].length;l&&l.end.row===h&&l.end.column>g||(o.push(l=new s(h,g,h+c-1,m)),c>2&&(h=h+c-2))}}else for(var v=0;v<r.length;v++){var $=i.getMatchOffsets(r[v],a);for(d=0;d<$.length;d++){var b=$[d];o.push(new s(v,b.offset,v,b.offset+b.length))}}if(n){var w=n.start.column,y=n.start.column;for(v=0,d=o.length-1;v<d&&o[v].start.column<w&&o[v].start.row==n.start.row;)v++;for(;v<d&&o[d].end.column>y&&o[d].end.row==n.end.row;)d--;for(o=o.slice(v,d+1),v=0,d=o.length;v<d;v++)o[v].start.row+=n.start.row,o[v].end.row+=n.start.row}return o},this.replace=function(e,t){var n=this.$options,i=this.$assembleRegExp(n);if(n.$isMultiLine)return t;if(i){var r=i.exec(e);if(!r||r[0].length!=e.length)return null;if(t=e.replace(i,t),n.preserveCase){t=t.split("");for(var s=Math.min(e.length,e.length);s--;){var o=e[s];o&&o.toLowerCase()!=o?t[s]=t[s].toUpperCase():t[s]=t[s].toLowerCase()}t=t.join("")}return t}},this.$assembleRegExp=function(e,t){if(e.needle instanceof RegExp)return e.re=e.needle;var n=e.needle;if(!e.needle)return e.re=!1;e.regExp||(n=i.escapeRegExp(n)),e.wholeWord&&(n=function(e,t){function n(e){return/\w/.test(e)||t.regExp?"\\b":""}return n(e[0])+e+n(e[e.length-1])}(n,e));var r=e.caseSensitive?"gm":"gmi";if(e.$isMultiLine=!t&&/[\n\r]/.test(n),e.$isMultiLine)return e.re=this.$assembleMultilineRegExp(n,r);try{var s=new RegExp(n,r)}catch(e){s=!1}return e.re=s},this.$assembleMultilineRegExp=function(e,t){for(var n=e.replace(/\r\n|\r|\n/g,"$\n^").split("\n"),i=[],r=0;r<n.length;r++)try{i.push(new RegExp(n[r],t))}catch(e){return!1}return i},this.$matchIterator=function(e,t){var n=this.$assembleRegExp(t);if(!n)return!1;var i=1==t.backwards,r=0!=t.skipCurrent,s=t.range,o=t.start;o||(o=s?s[i?"end":"start"]:e.selection.getRange()),o.start&&(o=o[r!=i?"end":"start"]);var a=s?s.start.row:0,l=s?s.end.row:e.getLength()-1;if(i)var c=function(e){var n=o.row;if(!h(n,o.column,e)){for(n--;n>=a;n--)if(h(n,Number.MAX_VALUE,e))return;if(0!=t.wrap)for(n=l,a=o.row;n>=a;n--)if(h(n,Number.MAX_VALUE,e))return}};else c=function(e){var n=o.row;if(!h(n,o.column,e)){for(n+=1;n<=l;n++)if(h(n,0,e))return;if(0!=t.wrap)for(n=a,l=o.row;n<=l;n++)if(h(n,0,e))return}};if(t.$isMultiLine)var u=n.length,h=function(t,r,s){var o=i?t-u+1:t;if(!(o<0)){var a=e.getLine(o),l=a.search(n[0]);if(!(!i&&l<r||-1===l)){for(var c=1;c<u;c++)if(-1==(a=e.getLine(o+c)).search(n[c]))return;var h=a.match(n[u-1])[0].length;if(!(i&&h>r))return!!s(o,l,o+u-1,h)||void 0}}};else if(i)h=function(t,i,r){var s,o=e.getLine(t),a=[],l=0;for(n.lastIndex=0;s=n.exec(o);){var c=s[0].length;if(l=s.index,!c){if(l>=o.length)break;n.lastIndex=l+=1}if(s.index+c>i)break;a.push(s.index,c)}for(var u=a.length-1;u>=0;u-=2){var h=a[u-1];if(r(t,h,t,h+(c=a[u])))return!0}};else h=function(t,i,r){var s,o,a=e.getLine(t);for(n.lastIndex=i;o=n.exec(a);){var l=o[0].length;if(r(t,s=o.index,t,s+l))return!0;if(!l&&(n.lastIndex=s+=1,s>=a.length))return!1}};return{forEach:c}}}).call(o.prototype),t.Search=o})),ace.define("ace/keyboard/hash_handler",["require","exports","module","ace/lib/keys","ace/lib/useragent"],(function(e,t,n){"use strict";function i(e,t){this.platform=t||(o.isMac?"mac":"win"),this.commands={},this.commandKeyBinding={},this.addCommands(e),this.$singleCommand=!0}function r(e,t){i.call(this,e,t),this.$singleCommand=!1}var s=e("../lib/keys"),o=e("../lib/useragent"),a=s.KEY_MODS;r.prototype=i.prototype,function(){function e(e){return"object"==typeof e&&e.bindKey&&e.bindKey.position||(e.isDefault?-100:0)}this.addCommand=function(e){this.commands[e.name]&&this.removeCommand(e),this.commands[e.name]=e,e.bindKey&&this._buildKeyHash(e)},this.removeCommand=function(e,t){var n=e&&("string"==typeof e?e:e.name);e=this.commands[n],t||delete this.commands[n];var i=this.commandKeyBinding;for(var r in i){var s=i[r];if(s==e)delete i[r];else if(Array.isArray(s)){var o=s.indexOf(e);-1!=o&&(s.splice(o,1),1==s.length&&(i[r]=s[0]))}}},this.bindKey=function(e,t,n){if("object"==typeof e&&e&&(null==n&&(n=e.position),e=e[this.platform]),e)return"function"==typeof t?this.addCommand({exec:t,bindKey:e,name:t.name||e}):void e.split("|").forEach((function(e){var i="";if(-1!=e.indexOf(" ")){var r=e.split(/\s+/);e=r.pop(),r.forEach((function(e){var t=this.parseKeys(e),n=a[t.hashId]+t.key;i+=(i?" ":"")+n,this._addCommandToBinding(i,"chainKeys")}),this),i+=" "}var s=this.parseKeys(e),o=a[s.hashId]+s.key;this._addCommandToBinding(i+o,t,n)}),this)},this._addCommandToBinding=function(t,n,i){var r,s=this.commandKeyBinding;if(n)if(!s[t]||this.$singleCommand)s[t]=n;else{Array.isArray(s[t])?-1!=(r=s[t].indexOf(n))&&s[t].splice(r,1):s[t]=[s[t]],"number"!=typeof i&&(i=e(n));var o=s[t];for(r=0;r<o.length;r++){if(e(o[r])>i)break}o.splice(r,0,n)}else delete s[t]},this.addCommands=function(e){e&&Object.keys(e).forEach((function(t){var n=e[t];if(n){if("string"==typeof n)return this.bindKey(n,t);"function"==typeof n&&(n={exec:n}),"object"==typeof n&&(n.name||(n.name=t),this.addCommand(n))}}),this)},this.removeCommands=function(e){Object.keys(e).forEach((function(t){this.removeCommand(e[t])}),this)},this.bindKeys=function(e){Object.keys(e).forEach((function(t){this.bindKey(t,e[t])}),this)},this._buildKeyHash=function(e){this.bindKey(e.bindKey,e)},this.parseKeys=function(e){var t=e.toLowerCase().split(/[\-\+]([\-\+])?/).filter((function(e){return e})),n=t.pop(),i=s[n];if(s.FUNCTION_KEYS[i])n=s.FUNCTION_KEYS[i].toLowerCase();else{if(!t.length)return{key:n,hashId:-1};if(1==t.length&&"shift"==t[0])return{key:n.toUpperCase(),hashId:-1}}for(var r=0,o=t.length;o--;){var a=s.KEY_MODS[t[o]];if(null==a)return"undefined"!=typeof console&&console.error("invalid modifier "+t[o]+" in "+e),!1;r|=a}return{key:n,hashId:r}},this.findKeyCommand=function(e,t){var n=a[e]+t;return this.commandKeyBinding[n]},this.handleKeyboard=function(e,t,n,i){if(!(i<0)){var r=a[t]+n,s=this.commandKeyBinding[r];return e.$keyChain&&(e.$keyChain+=" "+r,s=this.commandKeyBinding[e.$keyChain]||s),!s||"chainKeys"!=s&&"chainKeys"!=s[s.length-1]?(e.$keyChain&&(t&&4!=t||1!=n.length?(-1==t||i>0)&&(e.$keyChain=""):e.$keyChain=e.$keyChain.slice(0,-r.length-1)),{command:s}):(e.$keyChain=e.$keyChain||r,{command:"null"})}},this.getStatusText=function(e,t){return t.$keyChain||""}}.call(i.prototype),t.HashHandler=i,t.MultiHashHandler=r})),ace.define("ace/commands/command_manager",["require","exports","module","ace/lib/oop","ace/keyboard/hash_handler","ace/lib/event_emitter"],(function(e,t,n){"use strict";var i=e("../lib/oop"),r=e("../keyboard/hash_handler").MultiHashHandler,s=e("../lib/event_emitter").EventEmitter,o=function(e,t){r.call(this,t,e),this.byName=this.commands,this.setDefaultHandler("exec",(function(e){return e.command.exec(e.editor,e.args||{})}))};i.inherits(o,r),function(){i.implement(this,s),this.exec=function(e,t,n){if(Array.isArray(e)){for(var i=e.length;i--;)if(this.exec(e[i],t,n))return!0;return!1}if("string"==typeof e&&(e=this.commands[e]),!e)return!1;if(t&&t.$readOnly&&!e.readOnly)return!1;if(0!=this.$checkCommandState&&e.isAvailable&&!e.isAvailable(t))return!1;var r={editor:t,command:e,args:n};return r.returnValue=this._emit("exec",r),this._signal("afterExec",r),!1!==r.returnValue},this.toggleRecording=function(e){if(!this.$inReplay)return e&&e._emit("changeStatus"),this.recording?(this.macro.pop(),this.removeEventListener("exec",this.$addCommandToMacro),this.macro.length||(this.macro=this.oldMacro),this.recording=!1):(this.$addCommandToMacro||(this.$addCommandToMacro=function(e){this.macro.push([e.command,e.args])}.bind(this)),this.oldMacro=this.macro,this.macro=[],this.on("exec",this.$addCommandToMacro),this.recording=!0)},this.replay=function(e){if(!this.$inReplay&&this.macro){if(this.recording)return this.toggleRecording(e);try{this.$inReplay=!0,this.macro.forEach((function(t){"string"==typeof t?this.exec(t,e):this.exec(t[0],e,t[1])}),this)}finally{this.$inReplay=!1}}},this.trimMacro=function(e){return e.map((function(e){return"string"!=typeof e[0]&&(e[0]=e[0].name),e[1]||(e=e[0]),e}))}}.call(o.prototype),t.CommandManager=o})),ace.define("ace/commands/default_commands",["require","exports","module","ace/lib/lang","ace/config","ace/range"],(function(e,t,n){"use strict";function i(e,t){return{win:e,mac:t}}var r=e("../lib/lang"),s=e("../config"),o=e("../range").Range;t.commands=[{name:"showSettingsMenu",bindKey:i("Ctrl-,","Command-,"),exec:function(e){s.loadModule("ace/ext/settings_menu",(function(t){t.init(e),e.showSettingsMenu()}))},readOnly:!0},{name:"goToNextError",bindKey:i("Alt-E","F4"),exec:function(e){s.loadModule("./ext/error_marker",(function(t){t.showErrorMarker(e,1)}))},scrollIntoView:"animate",readOnly:!0},{name:"goToPreviousError",bindKey:i("Alt-Shift-E","Shift-F4"),exec:function(e){s.loadModule("./ext/error_marker",(function(t){t.showErrorMarker(e,-1)}))},scrollIntoView:"animate",readOnly:!0},{name:"selectall",bindKey:i("Ctrl-A","Command-A"),exec:function(e){e.selectAll()},readOnly:!0},{name:"centerselection",bindKey:i(null,"Ctrl-L"),exec:function(e){e.centerSelection()},readOnly:!0},{name:"gotoline",bindKey:i("Ctrl-L","Command-L"),exec:function(e,t){"number"!=typeof t&&(t=parseInt(prompt("Enter line number:"),10)),isNaN(t)||e.gotoLine(t)},readOnly:!0},{name:"fold",bindKey:i("Alt-L|Ctrl-F1","Command-Alt-L|Command-F1"),exec:function(e){e.session.toggleFold(!1)},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"unfold",bindKey:i("Alt-Shift-L|Ctrl-Shift-F1","Command-Alt-Shift-L|Command-Shift-F1"),exec:function(e){e.session.toggleFold(!0)},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"toggleFoldWidget",bindKey:i("F2","F2"),exec:function(e){e.session.toggleFoldWidget()},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"toggleParentFoldWidget",bindKey:i("Alt-F2","Alt-F2"),exec:function(e){e.session.toggleFoldWidget(!0)},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"foldall",bindKey:i(null,"Ctrl-Command-Option-0"),exec:function(e){e.session.foldAll()},scrollIntoView:"center",readOnly:!0},{name:"foldOther",bindKey:i("Alt-0","Command-Option-0"),exec:function(e){e.session.foldAll(),e.session.unfold(e.selection.getAllRanges())},scrollIntoView:"center",readOnly:!0},{name:"unfoldall",bindKey:i("Alt-Shift-0","Command-Option-Shift-0"),exec:function(e){e.session.unfold()},scrollIntoView:"center",readOnly:!0},{name:"findnext",bindKey:i("Ctrl-K","Command-G"),exec:function(e){e.findNext()},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"findprevious",bindKey:i("Ctrl-Shift-K","Command-Shift-G"),exec:function(e){e.findPrevious()},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"selectOrFindNext",bindKey:i("Alt-K","Ctrl-G"),exec:function(e){e.selection.isEmpty()?e.selection.selectWord():e.findNext()},readOnly:!0},{name:"selectOrFindPrevious",bindKey:i("Alt-Shift-K","Ctrl-Shift-G"),exec:function(e){e.selection.isEmpty()?e.selection.selectWord():e.findPrevious()},readOnly:!0},{name:"find",bindKey:i("Ctrl-F","Command-F"),exec:function(e){s.loadModule("ace/ext/searchbox",(function(t){t.Search(e)}))},readOnly:!0},{name:"overwrite",bindKey:"Insert",exec:function(e){e.toggleOverwrite()},readOnly:!0},{name:"selecttostart",bindKey:i("Ctrl-Shift-Home","Command-Shift-Home|Command-Shift-Up"),exec:function(e){e.getSelection().selectFileStart()},multiSelectAction:"forEach",readOnly:!0,scrollIntoView:"animate",aceCommandGroup:"fileJump"},{name:"gotostart",bindKey:i("Ctrl-Home","Command-Home|Command-Up"),exec:function(e){e.navigateFileStart()},multiSelectAction:"forEach",readOnly:!0,scrollIntoView:"animate",aceCommandGroup:"fileJump"},{name:"selectup",bindKey:i("Shift-Up","Shift-Up|Ctrl-Shift-P"),exec:function(e){e.getSelection().selectUp()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"golineup",bindKey:i("Up","Up|Ctrl-P"),exec:function(e,t){e.navigateUp(t.times)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selecttoend",bindKey:i("Ctrl-Shift-End","Command-Shift-End|Command-Shift-Down"),exec:function(e){e.getSelection().selectFileEnd()},multiSelectAction:"forEach",readOnly:!0,scrollIntoView:"animate",aceCommandGroup:"fileJump"},{name:"gotoend",bindKey:i("Ctrl-End","Command-End|Command-Down"),exec:function(e){e.navigateFileEnd()},multiSelectAction:"forEach",readOnly:!0,scrollIntoView:"animate",aceCommandGroup:"fileJump"},{name:"selectdown",bindKey:i("Shift-Down","Shift-Down|Ctrl-Shift-N"),exec:function(e){e.getSelection().selectDown()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"golinedown",bindKey:i("Down","Down|Ctrl-N"),exec:function(e,t){e.navigateDown(t.times)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectwordleft",bindKey:i("Ctrl-Shift-Left","Option-Shift-Left"),exec:function(e){e.getSelection().selectWordLeft()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotowordleft",bindKey:i("Ctrl-Left","Option-Left"),exec:function(e){e.navigateWordLeft()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selecttolinestart",bindKey:i("Alt-Shift-Left","Command-Shift-Left|Ctrl-Shift-A"),exec:function(e){e.getSelection().selectLineStart()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotolinestart",bindKey:i("Alt-Left|Home","Command-Left|Home|Ctrl-A"),exec:function(e){e.navigateLineStart()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectleft",bindKey:i("Shift-Left","Shift-Left|Ctrl-Shift-B"),exec:function(e){e.getSelection().selectLeft()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotoleft",bindKey:i("Left","Left|Ctrl-B"),exec:function(e,t){e.navigateLeft(t.times)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectwordright",bindKey:i("Ctrl-Shift-Right","Option-Shift-Right"),exec:function(e){e.getSelection().selectWordRight()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotowordright",bindKey:i("Ctrl-Right","Option-Right"),exec:function(e){e.navigateWordRight()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selecttolineend",bindKey:i("Alt-Shift-Right","Command-Shift-Right|Shift-End|Ctrl-Shift-E"),exec:function(e){e.getSelection().selectLineEnd()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotolineend",bindKey:i("Alt-Right|End","Command-Right|End|Ctrl-E"),exec:function(e){e.navigateLineEnd()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectright",bindKey:i("Shift-Right","Shift-Right"),exec:function(e){e.getSelection().selectRight()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotoright",bindKey:i("Right","Right|Ctrl-F"),exec:function(e,t){e.navigateRight(t.times)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectpagedown",bindKey:"Shift-PageDown",exec:function(e){e.selectPageDown()},readOnly:!0},{name:"pagedown",bindKey:i(null,"Option-PageDown"),exec:function(e){e.scrollPageDown()},readOnly:!0},{name:"gotopagedown",bindKey:i("PageDown","PageDown|Ctrl-V"),exec:function(e){e.gotoPageDown()},readOnly:!0},{name:"selectpageup",bindKey:"Shift-PageUp",exec:function(e){e.selectPageUp()},readOnly:!0},{name:"pageup",bindKey:i(null,"Option-PageUp"),exec:function(e){e.scrollPageUp()},readOnly:!0},{name:"gotopageup",bindKey:"PageUp",exec:function(e){e.gotoPageUp()},readOnly:!0},{name:"scrollup",bindKey:i("Ctrl-Up",null),exec:function(e){e.renderer.scrollBy(0,-2*e.renderer.layerConfig.lineHeight)},readOnly:!0},{name:"scrolldown",bindKey:i("Ctrl-Down",null),exec:function(e){e.renderer.scrollBy(0,2*e.renderer.layerConfig.lineHeight)},readOnly:!0},{name:"selectlinestart",bindKey:"Shift-Home",exec:function(e){e.getSelection().selectLineStart()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectlineend",bindKey:"Shift-End",exec:function(e){e.getSelection().selectLineEnd()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"togglerecording",bindKey:i("Ctrl-Alt-E","Command-Option-E"),exec:function(e){e.commands.toggleRecording(e)},readOnly:!0},{name:"replaymacro",bindKey:i("Ctrl-Shift-E","Command-Shift-E"),exec:function(e){e.commands.replay(e)},readOnly:!0},{name:"jumptomatching",bindKey:i("Ctrl-P","Ctrl-P"),exec:function(e){e.jumpToMatching()},multiSelectAction:"forEach",scrollIntoView:"animate",readOnly:!0},{name:"selecttomatching",bindKey:i("Ctrl-Shift-P","Ctrl-Shift-P"),exec:function(e){e.jumpToMatching(!0)},multiSelectAction:"forEach",scrollIntoView:"animate",readOnly:!0},{name:"expandToMatching",bindKey:i("Ctrl-Shift-M","Ctrl-Shift-M"),exec:function(e){e.jumpToMatching(!0,!0)},multiSelectAction:"forEach",scrollIntoView:"animate",readOnly:!0},{name:"passKeysToBrowser",bindKey:i(null,null),exec:function(){},passEvent:!0,readOnly:!0},{name:"copy",exec:function(e){},readOnly:!0},{name:"cut",exec:function(e){var t=e.$copyWithEmptySelection&&e.selection.isEmpty()?e.selection.getLineRange():e.selection.getRange();e._emit("cut",t),t.isEmpty()||e.session.remove(t),e.clearSelection()},scrollIntoView:"cursor",multiSelectAction:"forEach"},{name:"paste",exec:function(e,t){e.$handlePaste(t)},scrollIntoView:"cursor"},{name:"removeline",bindKey:i("Ctrl-D","Command-D"),exec:function(e){e.removeLines()},scrollIntoView:"cursor",multiSelectAction:"forEachLine"},{name:"duplicateSelection",bindKey:i("Ctrl-Shift-D","Command-Shift-D"),exec:function(e){e.duplicateSelection()},scrollIntoView:"cursor",multiSelectAction:"forEach"},{name:"sortlines",bindKey:i("Ctrl-Alt-S","Command-Alt-S"),exec:function(e){e.sortLines()},scrollIntoView:"selection",multiSelectAction:"forEachLine"},{name:"togglecomment",bindKey:i("Ctrl-/","Command-/"),exec:function(e){e.toggleCommentLines()},multiSelectAction:"forEachLine",scrollIntoView:"selectionPart"},{name:"toggleBlockComment",bindKey:i("Ctrl-Shift-/","Command-Shift-/"),exec:function(e){e.toggleBlockComment()},multiSelectAction:"forEach",scrollIntoView:"selectionPart"},{name:"modifyNumberUp",bindKey:i("Ctrl-Shift-Up","Alt-Shift-Up"),exec:function(e){e.modifyNumber(1)},scrollIntoView:"cursor",multiSelectAction:"forEach"},{name:"modifyNumberDown",bindKey:i("Ctrl-Shift-Down","Alt-Shift-Down"),exec:function(e){e.modifyNumber(-1)},scrollIntoView:"cursor",multiSelectAction:"forEach"},{name:"replace",bindKey:i("Ctrl-H","Command-Option-F"),exec:function(e){s.loadModule("ace/ext/searchbox",(function(t){t.Search(e,!0)}))}},{name:"undo",bindKey:i("Ctrl-Z","Command-Z"),exec:function(e){e.undo()}},{name:"redo",bindKey:i("Ctrl-Shift-Z|Ctrl-Y","Command-Shift-Z|Command-Y"),exec:function(e){e.redo()}},{name:"copylinesup",bindKey:i("Alt-Shift-Up","Command-Option-Up"),exec:function(e){e.copyLinesUp()},scrollIntoView:"cursor"},{name:"movelinesup",bindKey:i("Alt-Up","Option-Up"),exec:function(e){e.moveLinesUp()},scrollIntoView:"cursor"},{name:"copylinesdown",bindKey:i("Alt-Shift-Down","Command-Option-Down"),exec:function(e){e.copyLinesDown()},scrollIntoView:"cursor"},{name:"movelinesdown",bindKey:i("Alt-Down","Option-Down"),exec:function(e){e.moveLinesDown()},scrollIntoView:"cursor"},{name:"del",bindKey:i("Delete","Delete|Ctrl-D|Shift-Delete"),exec:function(e){e.remove("right")},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"backspace",bindKey:i("Shift-Backspace|Backspace","Ctrl-Backspace|Shift-Backspace|Backspace|Ctrl-H"),exec:function(e){e.remove("left")},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"cut_or_delete",bindKey:i("Shift-Delete",null),exec:function(e){if(!e.selection.isEmpty())return!1;e.remove("left")},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removetolinestart",bindKey:i("Alt-Backspace","Command-Backspace"),exec:function(e){e.removeToLineStart()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removetolineend",bindKey:i("Alt-Delete","Ctrl-K|Command-Delete"),exec:function(e){e.removeToLineEnd()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removetolinestarthard",bindKey:i("Ctrl-Shift-Backspace",null),exec:function(e){var t=e.selection.getRange();t.start.column=0,e.session.remove(t)},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removetolineendhard",bindKey:i("Ctrl-Shift-Delete",null),exec:function(e){var t=e.selection.getRange();t.end.column=Number.MAX_VALUE,e.session.remove(t)},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removewordleft",bindKey:i("Ctrl-Backspace","Alt-Backspace|Ctrl-Alt-Backspace"),exec:function(e){e.removeWordLeft()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removewordright",bindKey:i("Ctrl-Delete","Alt-Delete"),exec:function(e){e.removeWordRight()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"outdent",bindKey:i("Shift-Tab","Shift-Tab"),exec:function(e){e.blockOutdent()},multiSelectAction:"forEach",scrollIntoView:"selectionPart"},{name:"indent",bindKey:i("Tab","Tab"),exec:function(e){e.indent()},multiSelectAction:"forEach",scrollIntoView:"selectionPart"},{name:"blockoutdent",bindKey:i("Ctrl-[","Ctrl-["),exec:function(e){e.blockOutdent()},multiSelectAction:"forEachLine",scrollIntoView:"selectionPart"},{name:"blockindent",bindKey:i("Ctrl-]","Ctrl-]"),exec:function(e){e.blockIndent()},multiSelectAction:"forEachLine",scrollIntoView:"selectionPart"},{name:"insertstring",exec:function(e,t){e.insert(t)},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"inserttext",exec:function(e,t){e.insert(r.stringRepeat(t.text||"",t.times||1))},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"splitline",bindKey:i(null,"Ctrl-O"),exec:function(e){e.splitLine()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"transposeletters",bindKey:i("Alt-Shift-X","Ctrl-T"),exec:function(e){e.transposeLetters()},multiSelectAction:function(e){e.transposeSelections(1)},scrollIntoView:"cursor"},{name:"touppercase",bindKey:i("Ctrl-U","Ctrl-U"),exec:function(e){e.toUpperCase()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"tolowercase",bindKey:i("Ctrl-Shift-U","Ctrl-Shift-U"),exec:function(e){e.toLowerCase()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"expandtoline",bindKey:i("Ctrl-Shift-L","Command-Shift-L"),exec:function(e){var t=e.selection.getRange();t.start.column=t.end.column=0,t.end.row++,e.selection.setRange(t,!1)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"joinlines",bindKey:i(null,null),exec:function(e){for(var t=e.selection.isBackwards(),n=t?e.selection.getSelectionLead():e.selection.getSelectionAnchor(),i=t?e.selection.getSelectionAnchor():e.selection.getSelectionLead(),s=e.session.doc.getLine(n.row).length,a=e.session.doc.getTextRange(e.selection.getRange()).replace(/\n\s*/," ").length,l=e.session.doc.getLine(n.row),c=n.row+1;c<=i.row+1;c++){var u=r.stringTrimLeft(r.stringTrimRight(e.session.doc.getLine(c)));0!==u.length&&(u=" "+u),l+=u}i.row+1<e.session.doc.getLength()-1&&(l+=e.session.doc.getNewLineCharacter()),e.clearSelection(),e.session.doc.replace(new o(n.row,0,i.row+2,0),l),a>0?(e.selection.moveCursorTo(n.row,n.column),e.selection.selectTo(n.row,n.column+a)):(s=e.session.doc.getLine(n.row).length>s?s+1:s,e.selection.moveCursorTo(n.row,s))},multiSelectAction:"forEach",readOnly:!0},{name:"invertSelection",bindKey:i(null,null),exec:function(e){var t=e.session.doc.getLength()-1,n=e.session.doc.getLine(t).length,i=e.selection.rangeList.ranges,r=[];i.length<1&&(i=[e.selection.getRange()]);for(var s=0;s<i.length;s++)s==i.length-1&&(i[s].end.row!==t||i[s].end.column!==n)&&r.push(new o(i[s].end.row,i[s].end.column,t,n)),0===s?(0!==i[s].start.row||0!==i[s].start.column)&&r.push(new o(0,0,i[s].start.row,i[s].start.column)):r.push(new o(i[s-1].end.row,i[s-1].end.column,i[s].start.row,i[s].start.column));e.exitMultiSelectMode(),e.clearSelection();for(s=0;s<r.length;s++)e.selection.addRange(r[s],!1)},readOnly:!0,scrollIntoView:"none"}]})),ace.define("ace/clipboard",["require","exports","module"],(function(e,t,n){"use strict";n.exports={lineMode:!1}})),ace.define("ace/editor",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/oop","ace/lib/dom","ace/lib/lang","ace/lib/useragent","ace/keyboard/textinput","ace/mouse/mouse_handler","ace/mouse/fold_handler","ace/keyboard/keybinding","ace/edit_session","ace/search","ace/range","ace/lib/event_emitter","ace/commands/command_manager","ace/commands/default_commands","ace/config","ace/token_iterator","ace/clipboard"],(function(e,t,n){"use strict";e("./lib/fixoldbrowsers");var i=e("./lib/oop"),r=e("./lib/dom"),s=e("./lib/lang"),o=e("./lib/useragent"),a=e("./keyboard/textinput").TextInput,l=e("./mouse/mouse_handler").MouseHandler,c=e("./mouse/fold_handler").FoldHandler,u=e("./keyboard/keybinding").KeyBinding,h=e("./edit_session").EditSession,d=e("./search").Search,f=e("./range").Range,p=e("./lib/event_emitter").EventEmitter,g=e("./commands/command_manager").CommandManager,m=e("./commands/default_commands").commands,v=e("./config"),$=e("./token_iterator").TokenIterator,b=e("./clipboard"),w=function(e,t,n){var i=e.getContainerElement();this.container=i,this.renderer=e,this.id="editor"+ ++w.$uid,this.commands=new g(o.isMac?"mac":"win",m),"object"==typeof document&&(this.textInput=new a(e.getTextAreaContainer(),this),this.renderer.textarea=this.textInput.getElement(),this.$mouseHandler=new l(this),new c(this)),this.keyBinding=new u(this),this.$search=(new d).set({wrap:!0}),this.$historyTracker=this.$historyTracker.bind(this),this.commands.on("exec",this.$historyTracker),this.$initOperationListeners(),this._$emitInputEvent=s.delayedCall(function(){this._signal("input",{}),this.session&&this.session.bgTokenizer&&this.session.bgTokenizer.scheduleStart()}.bind(this)),this.on("change",(function(e,t){t._$emitInputEvent.schedule(31)})),this.setSession(t||n&&n.session||new h("")),v.resetOptions(this),n&&this.setOptions(n),v._signal("editor",this)};w.$uid=0,function(){i.implement(this,p),this.$initOperationListeners=function(){this.commands.on("exec",this.startOperation.bind(this),!0),this.commands.on("afterExec",this.endOperation.bind(this),!0),this.$opResetTimer=s.delayedCall(this.endOperation.bind(this,!0)),this.on("change",function(){this.curOp||(this.startOperation(),this.curOp.selectionBefore=this.$lastSel),this.curOp.docChanged=!0}.bind(this),!0),this.on("changeSelection",function(){this.curOp||(this.startOperation(),this.curOp.selectionBefore=this.$lastSel),this.curOp.selectionChanged=!0}.bind(this),!0)},this.curOp=null,this.prevOp={},this.startOperation=function(e){if(this.curOp){if(!e||this.curOp.command)return;this.prevOp=this.curOp}e||(this.previousCommand=null,e={}),this.$opResetTimer.schedule(),this.curOp=this.session.curOp={command:e.command||{},args:e.args,scrollTop:this.renderer.scrollTop},this.curOp.selectionBefore=this.selection.toJSON()},this.endOperation=function(e){if(this.curOp){if(e&&!1===e.returnValue)return this.curOp=null;if(1==e&&this.curOp.command&&"mouse"==this.curOp.command.name)return;if(this._signal("beforeEndOperation"),!this.curOp)return;var t=this.curOp.command,n=t&&t.scrollIntoView;if(n){switch(n){case"center-animate":n="animate";case"center":this.renderer.scrollCursorIntoView(null,.5);break;case"animate":case"cursor":this.renderer.scrollCursorIntoView();break;case"selectionPart":var i=this.selection.getRange(),r=this.renderer.layerConfig;(i.start.row>=r.lastRow||i.end.row<=r.firstRow)&&this.renderer.scrollSelectionIntoView(this.selection.anchor,this.selection.lead)}"animate"==n&&this.renderer.animateScrolling(this.curOp.scrollTop)}var s=this.selection.toJSON();this.curOp.selectionAfter=s,this.$lastSel=this.selection.toJSON(),this.session.getUndoManager().addSelection(s),this.prevOp=this.curOp,this.curOp=null}},this.$mergeableCommands=["backspace","del","insertstring"],this.$historyTracker=function(e){if(this.$mergeUndoDeltas){var t=this.prevOp,n=this.$mergeableCommands,i=t.command&&e.command.name==t.command.name;if("insertstring"==e.command.name){var r=e.args;void 0===this.mergeNextCommand&&(this.mergeNextCommand=!0),i=i&&this.mergeNextCommand&&(!/\s/.test(r)||/\s/.test(t.args)),this.mergeNextCommand=!0}else i=i&&-1!==n.indexOf(e.command.name);"always"!=this.$mergeUndoDeltas&&Date.now()-this.sequenceStartTime>2e3&&(i=!1),i?this.session.mergeUndoDeltas=!0:-1!==n.indexOf(e.command.name)&&(this.sequenceStartTime=Date.now())}},this.setKeyboardHandler=function(e,t){if(e&&"string"==typeof e&&"ace"!=e){this.$keybindingId=e;var n=this;v.loadModule(["keybinding",e],(function(i){n.$keybindingId==e&&n.keyBinding.setKeyboardHandler(i&&i.handler),t&&t()}))}else this.$keybindingId=null,this.keyBinding.setKeyboardHandler(e),t&&t()},this.getKeyboardHandler=function(){return this.keyBinding.getKeyboardHandler()},this.setSession=function(e){if(this.session!=e){this.curOp&&this.endOperation(),this.curOp={};var t=this.session;if(t){this.session.off("change",this.$onDocumentChange),this.session.off("changeMode",this.$onChangeMode),this.session.off("tokenizerUpdate",this.$onTokenizerUpdate),this.session.off("changeTabSize",this.$onChangeTabSize),this.session.off("changeWrapLimit",this.$onChangeWrapLimit),this.session.off("changeWrapMode",this.$onChangeWrapMode),this.session.off("changeFold",this.$onChangeFold),this.session.off("changeFrontMarker",this.$onChangeFrontMarker),this.session.off("changeBackMarker",this.$onChangeBackMarker),this.session.off("changeBreakpoint",this.$onChangeBreakpoint),this.session.off("changeAnnotation",this.$onChangeAnnotation),this.session.off("changeOverwrite",this.$onCursorChange),this.session.off("changeScrollTop",this.$onScrollTopChange),this.session.off("changeScrollLeft",this.$onScrollLeftChange);var n=this.session.getSelection();n.off("changeCursor",this.$onCursorChange),n.off("changeSelection",this.$onSelectionChange)}this.session=e,e?(this.$onDocumentChange=this.onDocumentChange.bind(this),e.on("change",this.$onDocumentChange),this.renderer.setSession(e),this.$onChangeMode=this.onChangeMode.bind(this),e.on("changeMode",this.$onChangeMode),this.$onTokenizerUpdate=this.onTokenizerUpdate.bind(this),e.on("tokenizerUpdate",this.$onTokenizerUpdate),this.$onChangeTabSize=this.renderer.onChangeTabSize.bind(this.renderer),e.on("changeTabSize",this.$onChangeTabSize),this.$onChangeWrapLimit=this.onChangeWrapLimit.bind(this),e.on("changeWrapLimit",this.$onChangeWrapLimit),this.$onChangeWrapMode=this.onChangeWrapMode.bind(this),e.on("changeWrapMode",this.$onChangeWrapMode),this.$onChangeFold=this.onChangeFold.bind(this),e.on("changeFold",this.$onChangeFold),this.$onChangeFrontMarker=this.onChangeFrontMarker.bind(this),this.session.on("changeFrontMarker",this.$onChangeFrontMarker),this.$onChangeBackMarker=this.onChangeBackMarker.bind(this),this.session.on("changeBackMarker",this.$onChangeBackMarker),this.$onChangeBreakpoint=this.onChangeBreakpoint.bind(this),this.session.on("changeBreakpoint",this.$onChangeBreakpoint),this.$onChangeAnnotation=this.onChangeAnnotation.bind(this),this.session.on("changeAnnotation",this.$onChangeAnnotation),this.$onCursorChange=this.onCursorChange.bind(this),this.session.on("changeOverwrite",this.$onCursorChange),this.$onScrollTopChange=this.onScrollTopChange.bind(this),this.session.on("changeScrollTop",this.$onScrollTopChange),this.$onScrollLeftChange=this.onScrollLeftChange.bind(this),this.session.on("changeScrollLeft",this.$onScrollLeftChange),this.selection=e.getSelection(),this.selection.on("changeCursor",this.$onCursorChange),this.$onSelectionChange=this.onSelectionChange.bind(this),this.selection.on("changeSelection",this.$onSelectionChange),this.onChangeMode(),this.onCursorChange(),this.onScrollTopChange(),this.onScrollLeftChange(),this.onSelectionChange(),this.onChangeFrontMarker(),this.onChangeBackMarker(),this.onChangeBreakpoint(),this.onChangeAnnotation(),this.session.getUseWrapMode()&&this.renderer.adjustWrapLimit(),this.renderer.updateFull()):(this.selection=null,this.renderer.setSession(e)),this._signal("changeSession",{session:e,oldSession:t}),this.curOp=null,t&&t._signal("changeEditor",{oldEditor:this}),e&&e._signal("changeEditor",{editor:this}),e&&e.bgTokenizer&&e.bgTokenizer.scheduleStart()}},this.getSession=function(){return this.session},this.setValue=function(e,t){return this.session.doc.setValue(e),t?1==t?this.navigateFileEnd():-1==t&&this.navigateFileStart():this.selectAll(),e},this.getValue=function(){return this.session.getValue()},this.getSelection=function(){return this.selection},this.resize=function(e){this.renderer.onResize(e)},this.setTheme=function(e,t){this.renderer.setTheme(e,t)},this.getTheme=function(){return this.renderer.getTheme()},this.setStyle=function(e){this.renderer.setStyle(e)},this.unsetStyle=function(e){this.renderer.unsetStyle(e)},this.getFontSize=function(){return this.getOption("fontSize")||r.computedStyle(this.container).fontSize},this.setFontSize=function(e){this.setOption("fontSize",e)},this.$highlightBrackets=function(){if(this.session.$bracketHighlight&&(this.session.removeMarker(this.session.$bracketHighlight),this.session.$bracketHighlight=null),!this.$highlightPending){var e=this;this.$highlightPending=!0,setTimeout((function(){e.$highlightPending=!1;var t=e.session;if(t&&t.bgTokenizer){var n=t.findMatchingBracket(e.getCursorPosition());if(n)var i=new f(n.row,n.column,n.row,n.column+1);else if(t.$mode.getMatching)i=t.$mode.getMatching(e.session);i&&(t.$bracketHighlight=t.addMarker(i,"ace_bracket","text"))}}),50)}},this.$highlightTags=function(){if(!this.$highlightTagPending){var e=this;this.$highlightTagPending=!0,setTimeout((function(){e.$highlightTagPending=!1;var t=e.session;if(t&&t.bgTokenizer){var n=e.getCursorPosition(),i=new $(e.session,n.row,n.column),r=i.getCurrentToken();if(!r||!/\b(?:tag-open|tag-name)/.test(r.type))return t.removeMarker(t.$tagHighlight),void(t.$tagHighlight=null);if(-1==r.type.indexOf("tag-open")||(r=i.stepForward())){var s=r.value,o=0,a=i.stepBackward();if("<"==a.value)do{a=r,(r=i.stepForward())&&r.value===s&&-1!==r.type.indexOf("tag-name")&&("<"===a.value?o++:"</"===a.value&&o--)}while(r&&o>=0);else{do{r=a,a=i.stepBackward(),r&&r.value===s&&-1!==r.type.indexOf("tag-name")&&("<"===a.value?o++:"</"===a.value&&o--)}while(a&&o<=0);i.stepForward()}if(!r)return t.removeMarker(t.$tagHighlight),void(t.$tagHighlight=null);var l=i.getCurrentTokenRow(),c=i.getCurrentTokenColumn(),u=new f(l,c,l,c+r.value.length),h=t.$backMarkers[t.$tagHighlight];t.$tagHighlight&&null!=h&&0!==u.compareRange(h.range)&&(t.removeMarker(t.$tagHighlight),t.$tagHighlight=null),t.$tagHighlight||(t.$tagHighlight=t.addMarker(u,"ace_bracket","text"))}}}),50)}},this.focus=function(){var e=this;setTimeout((function(){e.isFocused()||e.textInput.focus()})),this.textInput.focus()},this.isFocused=function(){return this.textInput.isFocused()},this.blur=function(){this.textInput.blur()},this.onFocus=function(e){this.$isFocused||(this.$isFocused=!0,this.renderer.showCursor(),this.renderer.visualizeFocus(),this._emit("focus",e))},this.onBlur=function(e){this.$isFocused&&(this.$isFocused=!1,this.renderer.hideCursor(),this.renderer.visualizeBlur(),this._emit("blur",e))},this.$cursorChange=function(){this.renderer.updateCursor()},this.onDocumentChange=function(e){var t=this.session.$useWrapMode,n=e.start.row==e.end.row?e.end.row:1/0;this.renderer.updateLines(e.start.row,n,t),this._signal("change",e),this.$cursorChange(),this.$updateHighlightActiveLine()},this.onTokenizerUpdate=function(e){var t=e.data;this.renderer.updateLines(t.first,t.last)},this.onScrollTopChange=function(){this.renderer.scrollToY(this.session.getScrollTop())},this.onScrollLeftChange=function(){this.renderer.scrollToX(this.session.getScrollLeft())},this.onCursorChange=function(){this.$cursorChange(),this.$highlightBrackets(),this.$highlightTags(),this.$updateHighlightActiveLine(),this._signal("changeSelection")},this.$updateHighlightActiveLine=function(){var e,t=this.getSession();if(this.$highlightActiveLine&&("line"==this.$selectionStyle&&this.selection.isMultiLine()||(e=this.getCursorPosition()),this.renderer.theme&&this.renderer.theme.$selectionColorConflict&&!this.selection.isEmpty()&&(e=!1),this.renderer.$maxLines&&1===this.session.getLength()&&!(this.renderer.$minLines>1)&&(e=!1)),t.$highlightLineMarker&&!e)t.removeMarker(t.$highlightLineMarker.id),t.$highlightLineMarker=null;else if(!t.$highlightLineMarker&&e){var n=new f(e.row,e.column,e.row,1/0);n.id=t.addMarker(n,"ace_active-line","screenLine"),t.$highlightLineMarker=n}else e&&(t.$highlightLineMarker.start.row=e.row,t.$highlightLineMarker.end.row=e.row,t.$highlightLineMarker.start.column=e.column,t._signal("changeBackMarker"))},this.onSelectionChange=function(e){var t=this.session;if(t.$selectionMarker&&t.removeMarker(t.$selectionMarker),t.$selectionMarker=null,this.selection.isEmpty())this.$updateHighlightActiveLine();else{var n=this.selection.getRange(),i=this.getSelectionStyle();t.$selectionMarker=t.addMarker(n,"ace_selection",i)}var r=this.$highlightSelectedWord&&this.$getSelectionHighLightRegexp();this.session.highlight(r),this._signal("changeSelection")},this.$getSelectionHighLightRegexp=function(){var e=this.session,t=this.getSelectionRange();if(!t.isEmpty()&&!t.isMultiLine()){var n=t.start.column,i=t.end.column,r=e.getLine(t.start.row),s=r.substring(n,i);if(!(s.length>5e3)&&/[\w\d]/.test(s)){var o=this.$search.$assembleRegExp({wholeWord:!0,caseSensitive:!0,needle:s}),a=r.substring(n-1,i+1);if(o.test(a))return o}}},this.onChangeFrontMarker=function(){this.renderer.updateFrontMarkers()},this.onChangeBackMarker=function(){this.renderer.updateBackMarkers()},this.onChangeBreakpoint=function(){this.renderer.updateBreakpoints()},this.onChangeAnnotation=function(){this.renderer.setAnnotations(this.session.getAnnotations())},this.onChangeMode=function(e){this.renderer.updateText(),this._emit("changeMode",e)},this.onChangeWrapLimit=function(){this.renderer.updateFull()},this.onChangeWrapMode=function(){this.renderer.onResize(!0)},this.onChangeFold=function(){this.$updateHighlightActiveLine(),this.renderer.updateFull()},this.getSelectedText=function(){return this.session.getTextRange(this.getSelectionRange())},this.getCopyText=function(){var e=this.getSelectedText(),t=this.session.doc.getNewLineCharacter(),n=!1;if(!e&&this.$copyWithEmptySelection){n=!0;for(var i=this.selection.getAllRanges(),r=0;r<i.length;r++){var s=i[r];r&&i[r-1].start.row==s.start.row||(e+=this.session.getLine(s.start.row)+t)}}var o={text:e};return this._signal("copy",o),b.lineMode=n?o.text:"",o.text},this.onCopy=function(){this.commands.exec("copy",this)},this.onCut=function(){this.commands.exec("cut",this)},this.onPaste=function(e,t){var n={text:e,event:t};this.commands.exec("paste",this,n)},this.$handlePaste=function(e){"string"==typeof e&&(e={text:e}),this._signal("paste",e);var t=e.text,n=t==b.lineMode,i=this.session;if(!this.inMultiSelectMode||this.inVirtualSelectionMode)n?i.insert({row:this.selection.lead.row,column:0},t):this.insert(t);else if(n)this.selection.rangeList.ranges.forEach((function(e){i.insert({row:e.start.row,column:0},t)}));else{var r=t.split(/\r\n|\r|\n/),s=this.selection.rangeList.ranges;if(r.length>s.length||r.length<2||!r[1])return this.commands.exec("insertstring",this,t);for(var o=s.length;o--;){var a=s[o];a.isEmpty()||i.remove(a),i.insert(a.start,r[o])}}},this.execCommand=function(e,t){return this.commands.exec(e,this,t)},this.insert=function(e,t){var n=this.session,i=n.getMode(),r=this.getCursorPosition();if(this.getBehavioursEnabled()&&!t){var s=i.transformAction(n.getState(r.row),"insertion",this,n,e);s&&(e!==s.text&&(this.inVirtualSelectionMode||(this.session.mergeUndoDeltas=!1,this.mergeNextCommand=!1)),e=s.text)}if("\t"==e&&(e=this.session.getTabString()),this.selection.isEmpty()){if(this.session.getOverwrite()&&-1==e.indexOf("\n")){(o=new f.fromPoints(r,r)).end.column+=e.length,this.session.remove(o)}}else{var o=this.getSelectionRange();r=this.session.remove(o),this.clearSelection()}if("\n"==e||"\r\n"==e){var a=n.getLine(r.row);if(r.column>a.search(/\S|$/)){var l=a.substr(r.column).search(/\S|$/);n.doc.removeInLine(r.row,r.column,r.column+l)}}this.clearSelection();var c=r.column,u=n.getState(r.row),h=(a=n.getLine(r.row),i.checkOutdent(u,a,e));n.insert(r,e);if(s&&s.selection&&(2==s.selection.length?this.selection.setSelectionRange(new f(r.row,c+s.selection[0],r.row,c+s.selection[1])):this.selection.setSelectionRange(new f(r.row+s.selection[0],s.selection[1],r.row+s.selection[2],s.selection[3]))),n.getDocument().isNewLine(e)){var d=i.getNextLineIndent(u,a.slice(0,r.column),n.getTabString());n.insert({row:r.row+1,column:0},d)}h&&i.autoOutdent(u,n,r.row)},this.onTextInput=function(e,t){if(!t)return this.keyBinding.onTextInput(e);this.startOperation({command:{name:"insertstring"}});var n=this.applyComposition.bind(this,e,t);this.selection.rangeCount?this.forEachSelection(n):n(),this.endOperation()},this.applyComposition=function(e,t){var n;(t.extendLeft||t.extendRight)&&((n=this.selection.getRange()).start.column-=t.extendLeft,n.end.column+=t.extendRight,this.selection.setRange(n),!e&&!n.isEmpty()&&this.remove());((e||!this.selection.isEmpty())&&this.insert(e,!0),t.restoreStart||t.restoreEnd)&&((n=this.selection.getRange()).start.column-=t.restoreStart,n.end.column-=t.restoreEnd,this.selection.setRange(n))},this.onCommandKey=function(e,t,n){this.keyBinding.onCommandKey(e,t,n)},this.setOverwrite=function(e){this.session.setOverwrite(e)},this.getOverwrite=function(){return this.session.getOverwrite()},this.toggleOverwrite=function(){this.session.toggleOverwrite()},this.setScrollSpeed=function(e){this.setOption("scrollSpeed",e)},this.getScrollSpeed=function(){return this.getOption("scrollSpeed")},this.setDragDelay=function(e){this.setOption("dragDelay",e)},this.getDragDelay=function(){return this.getOption("dragDelay")},this.setSelectionStyle=function(e){this.setOption("selectionStyle",e)},this.getSelectionStyle=function(){return this.getOption("selectionStyle")},this.setHighlightActiveLine=function(e){this.setOption("highlightActiveLine",e)},this.getHighlightActiveLine=function(){return this.getOption("highlightActiveLine")},this.setHighlightGutterLine=function(e){this.setOption("highlightGutterLine",e)},this.getHighlightGutterLine=function(){return this.getOption("highlightGutterLine")},this.setHighlightSelectedWord=function(e){this.setOption("highlightSelectedWord",e)},this.getHighlightSelectedWord=function(){return this.$highlightSelectedWord},this.setAnimatedScroll=function(e){this.renderer.setAnimatedScroll(e)},this.getAnimatedScroll=function(){return this.renderer.getAnimatedScroll()},this.setShowInvisibles=function(e){this.renderer.setShowInvisibles(e)},this.getShowInvisibles=function(){return this.renderer.getShowInvisibles()},this.setDisplayIndentGuides=function(e){this.renderer.setDisplayIndentGuides(e)},this.getDisplayIndentGuides=function(){return this.renderer.getDisplayIndentGuides()},this.setShowPrintMargin=function(e){this.renderer.setShowPrintMargin(e)},this.getShowPrintMargin=function(){return this.renderer.getShowPrintMargin()},this.setPrintMarginColumn=function(e){this.renderer.setPrintMarginColumn(e)},this.getPrintMarginColumn=function(){return this.renderer.getPrintMarginColumn()},this.setReadOnly=function(e){this.setOption("readOnly",e)},this.getReadOnly=function(){return this.getOption("readOnly")},this.setBehavioursEnabled=function(e){this.setOption("behavioursEnabled",e)},this.getBehavioursEnabled=function(){return this.getOption("behavioursEnabled")},this.setWrapBehavioursEnabled=function(e){this.setOption("wrapBehavioursEnabled",e)},this.getWrapBehavioursEnabled=function(){return this.getOption("wrapBehavioursEnabled")},this.setShowFoldWidgets=function(e){this.setOption("showFoldWidgets",e)},this.getShowFoldWidgets=function(){return this.getOption("showFoldWidgets")},this.setFadeFoldWidgets=function(e){this.setOption("fadeFoldWidgets",e)},this.getFadeFoldWidgets=function(){return this.getOption("fadeFoldWidgets")},this.remove=function(e){this.selection.isEmpty()&&("left"==e?this.selection.selectLeft():this.selection.selectRight());var t=this.getSelectionRange();if(this.getBehavioursEnabled()){var n=this.session,i=n.getState(t.start.row),r=n.getMode().transformAction(i,"deletion",this,n,t);if(0===t.end.column){var s=n.getTextRange(t);if("\n"==s[s.length-1]){var o=n.getLine(t.end.row);/^\s+$/.test(o)&&(t.end.column=o.length)}}r&&(t=r)}this.session.remove(t),this.clearSelection()},this.removeWordRight=function(){this.selection.isEmpty()&&this.selection.selectWordRight(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeWordLeft=function(){this.selection.isEmpty()&&this.selection.selectWordLeft(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeToLineStart=function(){this.selection.isEmpty()&&this.selection.selectLineStart(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeToLineEnd=function(){this.selection.isEmpty()&&this.selection.selectLineEnd();var e=this.getSelectionRange();e.start.column==e.end.column&&e.start.row==e.end.row&&(e.end.column=0,e.end.row++),this.session.remove(e),this.clearSelection()},this.splitLine=function(){this.selection.isEmpty()||(this.session.remove(this.getSelectionRange()),this.clearSelection());var e=this.getCursorPosition();this.insert("\n"),this.moveCursorToPosition(e)},this.transposeLetters=function(){if(this.selection.isEmpty()){var e=this.getCursorPosition(),t=e.column;if(0!==t){var n,i,r=this.session.getLine(e.row);t<r.length?(n=r.charAt(t)+r.charAt(t-1),i=new f(e.row,t-1,e.row,t+1)):(n=r.charAt(t-1)+r.charAt(t-2),i=new f(e.row,t-2,e.row,t)),this.session.replace(i,n),this.session.selection.moveToPosition(i.end)}}},this.toLowerCase=function(){var e=this.getSelectionRange();this.selection.isEmpty()&&this.selection.selectWord();var t=this.getSelectionRange(),n=this.session.getTextRange(t);this.session.replace(t,n.toLowerCase()),this.selection.setSelectionRange(e)},this.toUpperCase=function(){var e=this.getSelectionRange();this.selection.isEmpty()&&this.selection.selectWord();var t=this.getSelectionRange(),n=this.session.getTextRange(t);this.session.replace(t,n.toUpperCase()),this.selection.setSelectionRange(e)},this.indent=function(){var e=this.session,t=this.getSelectionRange();if(!(t.start.row<t.end.row)){if(t.start.column<t.end.column){var n=e.getTextRange(t);if(!/^\s+$/.test(n)){u=this.$getSelectedRows();return void e.indentRows(u.first,u.last,"\t")}}var i=e.getLine(t.start.row),r=t.start,o=e.getTabSize(),a=e.documentToScreenColumn(r.row,r.column);if(this.session.getUseSoftTabs())var l=o-a%o,c=s.stringRepeat(" ",l);else{for(l=a%o;" "==i[t.start.column-1]&&l;)t.start.column--,l--;this.selection.setSelectionRange(t),c="\t"}return this.insert(c)}var u=this.$getSelectedRows();e.indentRows(u.first,u.last,"\t")},this.blockIndent=function(){var e=this.$getSelectedRows();this.session.indentRows(e.first,e.last,"\t")},this.blockOutdent=function(){var e=this.session.getSelection();this.session.outdentRows(e.getRange())},this.sortLines=function(){for(var e=this.$getSelectedRows(),t=this.session,n=[],i=e.first;i<=e.last;i++)n.push(t.getLine(i));n.sort((function(e,t){return e.toLowerCase()<t.toLowerCase()?-1:e.toLowerCase()>t.toLowerCase()?1:0}));var r=new f(0,0,0,0);for(i=e.first;i<=e.last;i++){var s=t.getLine(i);r.start.row=i,r.end.row=i,r.end.column=s.length,t.replace(r,n[i-e.first])}},this.toggleCommentLines=function(){var e=this.session.getState(this.getCursorPosition().row),t=this.$getSelectedRows();this.session.getMode().toggleCommentLines(e,this.session,t.first,t.last)},this.toggleBlockComment=function(){var e=this.getCursorPosition(),t=this.session.getState(e.row),n=this.getSelectionRange();this.session.getMode().toggleBlockComment(t,this.session,n,e)},this.getNumberAt=function(e,t){var n=/[\-]?[0-9]+(?:\.[0-9]+)?/g;n.lastIndex=0;for(var i=this.session.getLine(e);n.lastIndex<t;){var r=n.exec(i);if(r.index<=t&&r.index+r[0].length>=t)return{value:r[0],start:r.index,end:r.index+r[0].length}}return null},this.modifyNumber=function(e){var t=this.selection.getCursor().row,n=this.selection.getCursor().column,i=new f(t,n-1,t,n),r=this.session.getTextRange(i);if(!isNaN(parseFloat(r))&&isFinite(r)){var s=this.getNumberAt(t,n);if(s){var o=s.value.indexOf(".")>=0?s.start+s.value.indexOf(".")+1:s.end,a=s.start+s.value.length-o,l=parseFloat(s.value);l*=Math.pow(10,a),o!==s.end&&n<o?e*=Math.pow(10,s.end-n-1):e*=Math.pow(10,s.end-n),l+=e;var c=(l/=Math.pow(10,a)).toFixed(a),u=new f(t,s.start,t,s.end);this.session.replace(u,c),this.moveCursorTo(t,Math.max(s.start+1,n+c.length-s.value.length))}}else this.toggleWord()},this.$toggleWordPairs=[["first","last"],["true","false"],["yes","no"],["width","height"],["top","bottom"],["right","left"],["on","off"],["x","y"],["get","set"],["max","min"],["horizontal","vertical"],["show","hide"],["add","remove"],["up","down"],["before","after"],["even","odd"],["inside","outside"],["next","previous"],["increase","decrease"],["attach","detach"],["&&","||"],["==","!="]],this.toggleWord=function(){var e=this.selection.getCursor().row,t=this.selection.getCursor().column;this.selection.selectWord();var n=this.getSelectedText(),i=this.selection.getWordRange().start.column,r=n.replace(/([a-z]+|[A-Z]+)(?=[A-Z_]|$)/g,"$1 ").split(/\s/),o=t-i-1;o<0&&(o=0);var a=0,l=0,c=this;n.match(/[A-Za-z0-9_]+/)&&r.forEach((function(t,r){l=a+t.length,o>=a&&o<=l&&(n=t,c.selection.clearSelection(),c.moveCursorTo(e,a+i),c.selection.selectTo(e,l+i)),a=l}));for(var u,h=this.$toggleWordPairs,d=0;d<h.length;d++)for(var f=h[d],p=0;p<=1;p++){var g=+!p,m=n.match(new RegExp("^\\s?_?("+s.escapeRegExp(f[p])+")\\s?$","i"));if(m)n.match(new RegExp("([_]|^|\\s)("+s.escapeRegExp(m[1])+")($|\\s)","g"))&&(u=n.replace(new RegExp(s.escapeRegExp(f[p]),"i"),(function(e){var t=f[g];return e.toUpperCase()==e?t=t.toUpperCase():e.charAt(0).toUpperCase()==e.charAt(0)&&(t=t.substr(0,0)+f[g].charAt(0).toUpperCase()+t.substr(1)),t})),this.insert(u),u="")}},this.removeLines=function(){var e=this.$getSelectedRows();this.session.removeFullLines(e.first,e.last),this.clearSelection()},this.duplicateSelection=function(){var e=this.selection,t=this.session,n=e.getRange(),i=e.isBackwards();if(n.isEmpty()){var r=n.start.row;t.duplicateLines(r,r)}else{var s=i?n.start:n.end,o=t.insert(s,t.getTextRange(n),!1);n.start=s,n.end=o,e.setSelectionRange(n,i)}},this.moveLinesDown=function(){this.$moveLines(1,!1)},this.moveLinesUp=function(){this.$moveLines(-1,!1)},this.moveText=function(e,t,n){return this.session.moveText(e,t,n)},this.copyLinesUp=function(){this.$moveLines(-1,!0)},this.copyLinesDown=function(){this.$moveLines(1,!0)},this.$moveLines=function(e,t){var n,i,r=this.selection;if(!r.inMultiSelectMode||this.inVirtualSelectionMode){var s=r.toOrientedRange();n=this.$getSelectedRows(s),i=this.session.$moveLines(n.first,n.last,t?0:e),t&&-1==e&&(i=0),s.moveBy(i,0),r.fromOrientedRange(s)}else{var o=r.rangeList.ranges;r.rangeList.detach(this.session),this.inVirtualSelectionMode=!0;for(var a=0,l=0,c=o.length,u=0;u<c;u++){var h=u;o[u].moveBy(a,0);for(var d=(n=this.$getSelectedRows(o[u])).first,f=n.last;++u<c;){l&&o[u].moveBy(l,0);var p=this.$getSelectedRows(o[u]);if(t&&p.first!=f)break;if(!t&&p.first>f+1)break;f=p.last}for(u--,a=this.session.$moveLines(d,f,t?0:e),t&&-1==e&&(h=u+1);h<=u;)o[h].moveBy(a,0),h++;t||(a=0),l+=a}r.fromOrientedRange(r.ranges[0]),r.rangeList.attach(this.session),this.inVirtualSelectionMode=!1}},this.$getSelectedRows=function(e){return e=(e||this.getSelectionRange()).collapseRows(),{first:this.session.getRowFoldStart(e.start.row),last:this.session.getRowFoldEnd(e.end.row)}},this.onCompositionStart=function(e){this.renderer.showComposition(e)},this.onCompositionUpdate=function(e){this.renderer.setCompositionText(e)},this.onCompositionEnd=function(){this.renderer.hideComposition()},this.getFirstVisibleRow=function(){return this.renderer.getFirstVisibleRow()},this.getLastVisibleRow=function(){return this.renderer.getLastVisibleRow()},this.isRowVisible=function(e){return e>=this.getFirstVisibleRow()&&e<=this.getLastVisibleRow()},this.isRowFullyVisible=function(e){return e>=this.renderer.getFirstFullyVisibleRow()&&e<=this.renderer.getLastFullyVisibleRow()},this.$getVisibleRowCount=function(){return this.renderer.getScrollBottomRow()-this.renderer.getScrollTopRow()+1},this.$moveByPage=function(e,t){var n=this.renderer,i=this.renderer.layerConfig,r=e*Math.floor(i.height/i.lineHeight);!0===t?this.selection.$moveSelection((function(){this.moveCursorBy(r,0)})):!1===t&&(this.selection.moveCursorBy(r,0),this.selection.clearSelection());var s=n.scrollTop;n.scrollBy(0,r*i.lineHeight),null!=t&&n.scrollCursorIntoView(null,.5),n.animateScrolling(s)},this.selectPageDown=function(){this.$moveByPage(1,!0)},this.selectPageUp=function(){this.$moveByPage(-1,!0)},this.gotoPageDown=function(){this.$moveByPage(1,!1)},this.gotoPageUp=function(){this.$moveByPage(-1,!1)},this.scrollPageDown=function(){this.$moveByPage(1)},this.scrollPageUp=function(){this.$moveByPage(-1)},this.scrollToRow=function(e){this.renderer.scrollToRow(e)},this.scrollToLine=function(e,t,n,i){this.renderer.scrollToLine(e,t,n,i)},this.centerSelection=function(){var e=this.getSelectionRange(),t={row:Math.floor(e.start.row+(e.end.row-e.start.row)/2),column:Math.floor(e.start.column+(e.end.column-e.start.column)/2)};this.renderer.alignCursor(t,.5)},this.getCursorPosition=function(){return this.selection.getCursor()},this.getCursorPositionScreen=function(){return this.session.documentToScreenPosition(this.getCursorPosition())},this.getSelectionRange=function(){return this.selection.getRange()},this.selectAll=function(){this.selection.selectAll()},this.clearSelection=function(){this.selection.clearSelection()},this.moveCursorTo=function(e,t){this.selection.moveCursorTo(e,t)},this.moveCursorToPosition=function(e){this.selection.moveCursorToPosition(e)},this.jumpToMatching=function(e,t){var n=this.getCursorPosition(),i=new $(this.session,n.row,n.column),r=i.getCurrentToken(),s=r||i.stepForward();if(s){var o,a,l=!1,c={},u=n.column-s.start,h={")":"(","(":"(","]":"[","[":"[","{":"{","}":"{"};do{if(s.value.match(/[{}()\[\]]/g)){for(;u<s.value.length&&!l;u++)if(h[s.value[u]])switch(a=h[s.value[u]]+"."+s.type.replace("rparen","lparen"),isNaN(c[a])&&(c[a]=0),s.value[u]){case"(":case"[":case"{":c[a]++;break;case")":case"]":case"}":c[a]--,-1===c[a]&&(o="bracket",l=!0)}}else-1!==s.type.indexOf("tag-name")&&(isNaN(c[s.value])&&(c[s.value]=0),"<"===r.value?c[s.value]++:"</"===r.value&&c[s.value]--,-1===c[s.value]&&(o="tag",l=!0));l||(r=s,s=i.stepForward(),u=0)}while(s&&!l);if(o){var d,p;if("bracket"===o)(d=this.session.getBracketRange(n))||(p=(d=new f(i.getCurrentTokenRow(),i.getCurrentTokenColumn()+u-1,i.getCurrentTokenRow(),i.getCurrentTokenColumn()+u-1)).start,(t||p.row===n.row&&Math.abs(p.column-n.column)<2)&&(d=this.session.getBracketRange(p)));else if("tag"===o){if(!s||-1===s.type.indexOf("tag-name"))return;var g=s.value;if(0===(d=new f(i.getCurrentTokenRow(),i.getCurrentTokenColumn()-2,i.getCurrentTokenRow(),i.getCurrentTokenColumn()-2)).compare(n.row,n.column)){l=!1;do{s=r,(r=i.stepBackward())&&(-1!==r.type.indexOf("tag-close")&&d.setEnd(i.getCurrentTokenRow(),i.getCurrentTokenColumn()+1),s.value===g&&-1!==s.type.indexOf("tag-name")&&("<"===r.value?c[g]++:"</"===r.value&&c[g]--,0===c[g]&&(l=!0)))}while(r&&!l)}s&&s.type.indexOf("tag-name")&&((p=d.start).row==n.row&&Math.abs(p.column-n.column)<2&&(p=d.end))}(p=d&&d.cursor||p)&&(e?d&&t?this.selection.setRange(d):d&&d.isEqual(this.getSelectionRange())?this.clearSelection():this.selection.selectTo(p.row,p.column):this.selection.moveTo(p.row,p.column))}}},this.gotoLine=function(e,t,n){this.selection.clearSelection(),this.session.unfold({row:e-1,column:t||0}),this.exitMultiSelectMode&&this.exitMultiSelectMode(),this.moveCursorTo(e-1,t||0),this.isRowFullyVisible(e-1)||this.scrollToLine(e-1,!0,n)},this.navigateTo=function(e,t){this.selection.moveTo(e,t)},this.navigateUp=function(e){if(this.selection.isMultiLine()&&!this.selection.isBackwards()){var t=this.selection.anchor.getPosition();return this.moveCursorToPosition(t)}this.selection.clearSelection(),this.selection.moveCursorBy(-e||-1,0)},this.navigateDown=function(e){if(this.selection.isMultiLine()&&this.selection.isBackwards()){var t=this.selection.anchor.getPosition();return this.moveCursorToPosition(t)}this.selection.clearSelection(),this.selection.moveCursorBy(e||1,0)},this.navigateLeft=function(e){if(this.selection.isEmpty())for(e=e||1;e--;)this.selection.moveCursorLeft();else{var t=this.getSelectionRange().start;this.moveCursorToPosition(t)}this.clearSelection()},this.navigateRight=function(e){if(this.selection.isEmpty())for(e=e||1;e--;)this.selection.moveCursorRight();else{var t=this.getSelectionRange().end;this.moveCursorToPosition(t)}this.clearSelection()},this.navigateLineStart=function(){this.selection.moveCursorLineStart(),this.clearSelection()},this.navigateLineEnd=function(){this.selection.moveCursorLineEnd(),this.clearSelection()},this.navigateFileEnd=function(){this.selection.moveCursorFileEnd(),this.clearSelection()},this.navigateFileStart=function(){this.selection.moveCursorFileStart(),this.clearSelection()},this.navigateWordRight=function(){this.selection.moveCursorWordRight(),this.clearSelection()},this.navigateWordLeft=function(){this.selection.moveCursorWordLeft(),this.clearSelection()},this.replace=function(e,t){t&&this.$search.set(t);var n=this.$search.find(this.session),i=0;return n?(this.$tryReplace(n,e)&&(i=1),this.selection.setSelectionRange(n),this.renderer.scrollSelectionIntoView(n.start,n.end),i):i},this.replaceAll=function(e,t){t&&this.$search.set(t);var n=this.$search.findAll(this.session),i=0;if(!n.length)return i;var r=this.getSelectionRange();this.selection.moveTo(0,0);for(var s=n.length-1;s>=0;--s)this.$tryReplace(n[s],e)&&i++;return this.selection.setSelectionRange(r),i},this.$tryReplace=function(e,t){var n=this.session.getTextRange(e);return null!==(t=this.$search.replace(n,t))?(e.end=this.session.replace(e,t),e):null},this.getLastSearchOptions=function(){return this.$search.getOptions()},this.find=function(e,t,n){t||(t={}),"string"==typeof e||e instanceof RegExp?t.needle=e:"object"==typeof e&&i.mixin(t,e);var r=this.selection.getRange();null==t.needle&&((e=this.session.getTextRange(r)||this.$search.$options.needle)||(r=this.session.getWordRange(r.start.row,r.start.column),e=this.session.getTextRange(r)),this.$search.set({needle:e})),this.$search.set(t),t.start||this.$search.set({start:r});var s=this.$search.find(this.session);return t.preventScroll?s:s?(this.revealRange(s,n),s):(t.backwards?r.start=r.end:r.end=r.start,void this.selection.setRange(r))},this.findNext=function(e,t){this.find({skipCurrent:!0,backwards:!1},e,t)},this.findPrevious=function(e,t){this.find(e,{skipCurrent:!0,backwards:!0},t)},this.revealRange=function(e,t){this.session.unfold(e),this.selection.setSelectionRange(e);var n=this.renderer.scrollTop;this.renderer.scrollSelectionIntoView(e.start,e.end,.5),!1!==t&&this.renderer.animateScrolling(n)},this.undo=function(){this.session.getUndoManager().undo(this.session),this.renderer.scrollCursorIntoView(null,.5)},this.redo=function(){this.session.getUndoManager().redo(this.session),this.renderer.scrollCursorIntoView(null,.5)},this.destroy=function(){this.renderer.destroy(),this._signal("destroy",this),this.session&&this.session.destroy()},this.setAutoScrollEditorIntoView=function(e){if(e){var t,n=this,i=!1;this.$scrollAnchor||(this.$scrollAnchor=document.createElement("div"));var r=this.$scrollAnchor;r.style.cssText="position:absolute",this.container.insertBefore(r,this.container.firstChild);var s=this.on("changeSelection",(function(){i=!0})),o=this.renderer.on("beforeRender",(function(){i&&(t=n.renderer.container.getBoundingClientRect())})),a=this.renderer.on("afterRender",(function(){if(i&&t&&(n.isFocused()||n.searchBox&&n.searchBox.isFocused())){var e=n.renderer,s=e.$cursorLayer.$pixelPos,o=e.layerConfig,a=s.top-o.offset;null!=(i=s.top>=0&&a+t.top<0||!(s.top<o.height&&s.top+t.top+o.lineHeight>window.innerHeight)&&null)&&(r.style.top=a+"px",r.style.left=s.left+"px",r.style.height=o.lineHeight+"px",r.scrollIntoView(i)),i=t=null}}));this.setAutoScrollEditorIntoView=function(e){e||(delete this.setAutoScrollEditorIntoView,this.off("changeSelection",s),this.renderer.off("afterRender",a),this.renderer.off("beforeRender",o))}}},this.$resetCursorStyle=function(){var e=this.$cursorStyle||"ace",t=this.renderer.$cursorLayer;t&&(t.setSmoothBlinking(/smooth/.test(e)),t.isBlinking=!this.$readOnly&&"wide"!=e,r.setCssClass(t.element,"ace_slim-cursors",/slim/.test(e)))}}.call(w.prototype),v.defineOptions(w.prototype,"editor",{selectionStyle:{set:function(e){this.onSelectionChange(),this._signal("changeSelectionStyle",{data:e})},initialValue:"line"},highlightActiveLine:{set:function(){this.$updateHighlightActiveLine()},initialValue:!0},highlightSelectedWord:{set:function(e){this.$onSelectionChange()},initialValue:!0},readOnly:{set:function(e){this.textInput.setReadOnly(e),this.$resetCursorStyle()},initialValue:!1},copyWithEmptySelection:{set:function(e){this.textInput.setCopyWithEmptySelection(e)},initialValue:!1},cursorStyle:{set:function(e){this.$resetCursorStyle()},values:["ace","slim","smooth","wide"],initialValue:"ace"},mergeUndoDeltas:{values:[!1,!0,"always"],initialValue:!0},behavioursEnabled:{initialValue:!0},wrapBehavioursEnabled:{initialValue:!0},autoScrollEditorIntoView:{set:function(e){this.setAutoScrollEditorIntoView(e)}},keyboardHandler:{set:function(e){this.setKeyboardHandler(e)},get:function(){return this.$keybindingId},handlesSet:!0},value:{set:function(e){this.session.setValue(e)},get:function(){return this.getValue()},handlesSet:!0,hidden:!0},session:{set:function(e){this.setSession(e)},get:function(){return this.session},handlesSet:!0,hidden:!0},showLineNumbers:{set:function(e){this.renderer.$gutterLayer.setShowLineNumbers(e),this.renderer.$loop.schedule(this.renderer.CHANGE_GUTTER),e&&this.$relativeLineNumbers?y.attach(this):y.detach(this)},initialValue:!0},relativeLineNumbers:{set:function(e){this.$showLineNumbers&&e?y.attach(this):y.detach(this)}},hScrollBarAlwaysVisible:"renderer",vScrollBarAlwaysVisible:"renderer",highlightGutterLine:"renderer",animatedScroll:"renderer",showInvisibles:"renderer",showPrintMargin:"renderer",printMarginColumn:"renderer",printMargin:"renderer",fadeFoldWidgets:"renderer",showFoldWidgets:"renderer",displayIndentGuides:"renderer",showGutter:"renderer",fontSize:"renderer",fontFamily:"renderer",maxLines:"renderer",minLines:"renderer",scrollPastEnd:"renderer",fixedWidthGutter:"renderer",theme:"renderer",hasCssTransforms:"renderer",maxPixelHeight:"renderer",useTextareaForIME:"renderer",scrollSpeed:"$mouseHandler",dragDelay:"$mouseHandler",dragEnabled:"$mouseHandler",focusTimeout:"$mouseHandler",tooltipFollowsMouse:"$mouseHandler",firstLineNumber:"session",overwrite:"session",newLineMode:"session",useWorker:"session",useSoftTabs:"session",navigateWithinSoftTabs:"session",tabSize:"session",wrap:"session",indentedSoftWrap:"session",foldStyle:"session",mode:"session"});var y={getText:function(e,t){return(Math.abs(e.selection.lead.row-t)||t+1+(t<9?"·":""))+""},getWidth:function(e,t,n){return Math.max(t.toString().length,(n.lastRow+1).toString().length,2)*n.characterWidth},update:function(e,t){t.renderer.$loop.schedule(t.renderer.CHANGE_GUTTER)},attach:function(e){e.renderer.$gutterLayer.$renderer=this,e.on("changeSelection",this.update),this.update(null,e)},detach:function(e){e.renderer.$gutterLayer.$renderer==this&&(e.renderer.$gutterLayer.$renderer=null),e.off("changeSelection",this.update),this.update(null,e)}};t.Editor=w})),ace.define("ace/undomanager",["require","exports","module","ace/range"],(function(e,t,n){"use strict";function i(e){return{row:e.row,column:e.column}}function r(e){if(e=e||this,Array.isArray(e))return e.map(r).join("\n");var t="";return e.action?(t="insert"==e.action?"+":"-",t+="["+e.lines+"]"):e.value&&(t=Array.isArray(e.value)?e.value.map(s).join("\n"):s(e.value)),e.start&&(t+=s(e)),(e.id||e.rev)&&(t+="\t("+(e.id||e.rev)+")"),t}function s(e){return e.start.row+":"+e.start.column+"=>"+e.end.row+":"+e.end.column}function o(e,t){var n="insert"==e.action,i="insert"==t.action;if(n&&i)if(g(t.start,e.end)>=0)c(t,e,-1);else{if(!(g(t.start,e.start)<=0))return null;c(e,t,1)}else if(n&&!i)if(g(t.start,e.end)>=0)c(t,e,-1);else{if(!(g(t.end,e.start)<=0))return null;c(e,t,-1)}else if(!n&&i)if(g(t.start,e.start)>=0)c(t,e,1);else{if(!(g(t.start,e.start)<=0))return null;c(e,t,1)}else if(!n&&!i)if(g(t.start,e.start)>=0)c(t,e,1);else{if(!(g(t.end,e.start)<=0))return null;c(e,t,-1)}return[t,e]}function a(e,t){for(var n=e.length;n--;)for(var i=0;i<t.length;i++)if(!o(e[n],t[i])){for(;n<e.length;){for(;i--;)o(t[i],e[n]);i=t.length,n++}return[e,t]}return e.selectionBefore=t.selectionBefore=e.selectionAfter=t.selectionAfter=null,[t,e]}function l(e,t){var n="insert"==e.action,i="insert"==t.action;if(n&&i)g(e.start,t.start)<0?c(t,e,1):c(e,t,1);else if(n&&!i)g(e.start,t.end)>=0?c(e,t,-1):(g(e.start,t.start)<=0||c(e,p.fromPoints(t.start,e.start),-1),c(t,e,1));else if(!n&&i)g(t.start,e.end)>=0?c(t,e,-1):(g(t.start,e.start)<=0||c(t,p.fromPoints(e.start,t.start),-1),c(e,t,1));else if(!n&&!i)if(g(t.start,e.end)>=0)c(t,e,-1);else{var r,s;if(!(g(t.end,e.start)<=0))return g(e.start,t.start)<0&&(r=e,e=h(e,t.start)),g(e.end,t.end)>0&&(s=h(e,t.end)),u(t.end,e.start,e.end,-1),s&&!r&&(e.lines=s.lines,e.start=s.start,e.end=s.end,s=e),[t,r,s].filter(Boolean);c(e,t,-1)}return[t,e]}function c(e,t,n){u(e.start,t.start,t.end,n),u(e.end,t.start,t.end,n)}function u(e,t,n,i){e.row==(1==i?t:n).row&&(e.column+=i*(n.column-t.column)),e.row+=i*(n.row-t.row)}function h(e,t){var n=e.lines,r=e.end;e.end=i(t);var s=e.end.row-e.start.row,o=n.splice(s,n.length),a=s?t.column:t.column-e.start.column;return n.push(o[0].substring(0,a)),o[0]=o[0].substr(a),{start:i(t),end:r,lines:o,action:e.action}}function d(e,t){t=function(e){return{start:i(e.start),end:i(e.end),action:e.action,lines:e.lines.slice()}}(t);for(var n=e.length;n--;){for(var r=e[n],s=0;s<r.length;s++){var o=l(r[s],t);t=o[0],2!=o.length&&(o[2]?(r.splice(s+1,1,o[1],o[2]),s++):o[1]||(r.splice(s,1),s--))}r.length||e.splice(n,1)}return e}var f=function(){this.$maxRev=0,this.$fromUndo=!1,this.reset()};(function(){this.addSession=function(e){this.$session=e},this.add=function(e,t,n){this.$fromUndo||e!=this.$lastDelta&&(!1!==t&&this.lastDeltas||(this.lastDeltas=[],this.$undoStack.push(this.lastDeltas),e.id=this.$rev=++this.$maxRev),"remove"!=e.action&&"insert"!=e.action||(this.$lastDelta=e),this.lastDeltas.push(e))},this.addSelection=function(e,t){this.selections.push({value:e,rev:t||this.$rev})},this.startNewGroup=function(){return this.lastDeltas=null,this.$rev},this.markIgnored=function(e,t){null==t&&(t=this.$rev+1);for(var n=this.$undoStack,i=n.length;i--;){var r=n[i][0];if(r.id<=e)break;r.id<t&&(r.ignore=!0)}this.lastDeltas=null},this.getSelection=function(e,t){for(var n=this.selections,i=n.length;i--;){var r=n[i];if(r.rev<e)return t&&(r=n[i+1]),r}},this.getRevision=function(){return this.$rev},this.getDeltas=function(e,t){null==t&&(t=this.$rev+1);for(var n=this.$undoStack,i=null,r=0,s=n.length;s--;){var o=n[s][0];if(o.id<t&&!i&&(i=s+1),o.id<=e){r=s+1;break}}return n.slice(r,i)},this.getChangedRanges=function(e,t){null==t&&(t=this.$rev+1)},this.getChangedLines=function(e,t){null==t&&(t=this.$rev+1)},this.undo=function(e,t){this.lastDeltas=null;var n=this.$undoStack;if(function(e,t){for(var n=t;n--;){var i=e[n];if(i&&!i[0].ignore){for(;n<t-1;){var r=a(e[n],e[n+1]);e[n]=r[0],e[n+1]=r[1],n++}return!0}}}(n,n.length)){e||(e=this.$session),this.$redoStackBaseRev!==this.$rev&&this.$redoStack.length&&(this.$redoStack=[]),this.$fromUndo=!0;var i=n.pop(),r=null;return i&&i.length&&(r=e.undoChanges(i,t),this.$redoStack.push(i),this.$syncRev()),this.$fromUndo=!1,r}},this.redo=function(e,t){if(this.lastDeltas=null,e||(e=this.$session),this.$fromUndo=!0,this.$redoStackBaseRev!=this.$rev){var n=this.getDeltas(this.$redoStackBaseRev,this.$rev+1);(function(e,t){for(var n=0;n<t.length;n++)for(var i=t[n],r=0;r<i.length;r++)d(e,i[r])})(this.$redoStack,n),this.$redoStackBaseRev=this.$rev,this.$redoStack.forEach((function(e){e[0].id=++this.$maxRev}),this)}var i=this.$redoStack.pop(),r=null;return i&&(r=e.redoChanges(i,t),this.$undoStack.push(i),this.$syncRev()),this.$fromUndo=!1,r},this.$syncRev=function(){var e=this.$undoStack,t=e[e.length-1],n=t&&t[0].id||0;this.$redoStackBaseRev=n,this.$rev=n},this.reset=function(){this.lastDeltas=null,this.$lastDelta=null,this.$undoStack=[],this.$redoStack=[],this.$rev=0,this.mark=0,this.$redoStackBaseRev=this.$rev,this.selections=[]},this.canUndo=function(){return this.$undoStack.length>0},this.canRedo=function(){return this.$redoStack.length>0},this.bookmark=function(e){null==e&&(e=this.$rev),this.mark=e},this.isAtBookmark=function(){return this.$rev===this.mark},this.toJSON=function(){},this.fromJSON=function(){},this.hasUndo=this.canUndo,this.hasRedo=this.canRedo,this.isClean=this.isAtBookmark,this.markClean=this.bookmark,this.$prettyPrint=function(e){return e?r(e):r(this.$undoStack)+"\n---\n"+r(this.$redoStack)}}).call(f.prototype);var p=e("./range").Range,g=p.comparePoints;p.comparePoints;t.UndoManager=f})),ace.define("ace/layer/lines",["require","exports","module","ace/lib/dom"],(function(e,t,n){"use strict";var i=e("../lib/dom"),r=function(e,t){this.element=e,this.canvasHeight=t||5e5,this.element.style.height=2*this.canvasHeight+"px",this.cells=[],this.cellCache=[],this.$offsetCoefficient=0};(function(){this.moveContainer=function(e){i.translate(this.element,0,-e.firstRowScreen*e.lineHeight%this.canvasHeight-e.offset*this.$offsetCoefficient)},this.pageChanged=function(e,t){return Math.floor(e.firstRowScreen*e.lineHeight/this.canvasHeight)!==Math.floor(t.firstRowScreen*t.lineHeight/this.canvasHeight)},this.computeLineTop=function(e,t,n){var i=t.firstRowScreen*t.lineHeight,r=Math.floor(i/this.canvasHeight);return n.documentToScreenRow(e,0)*t.lineHeight-r*this.canvasHeight},this.computeLineHeight=function(e,t,n){return t.lineHeight*n.getRowLength(e)},this.getLength=function(){return this.cells.length},this.get=function(e){return this.cells[e]},this.shift=function(){this.$cacheCell(this.cells.shift())},this.pop=function(){this.$cacheCell(this.cells.pop())},this.push=function(e){if(Array.isArray(e)){this.cells.push.apply(this.cells,e);for(var t=i.createFragment(this.element),n=0;n<e.length;n++)t.appendChild(e[n].element);this.element.appendChild(t)}else this.cells.push(e),this.element.appendChild(e.element)},this.unshift=function(e){if(Array.isArray(e)){this.cells.unshift.apply(this.cells,e);for(var t=i.createFragment(this.element),n=0;n<e.length;n++)t.appendChild(e[n].element);this.element.firstChild?this.element.insertBefore(t,this.element.firstChild):this.element.appendChild(t)}else this.cells.unshift(e),this.element.insertAdjacentElement("afterbegin",e.element)},this.last=function(){return this.cells.length?this.cells[this.cells.length-1]:null},this.$cacheCell=function(e){e&&(e.element.remove(),this.cellCache.push(e))},this.createCell=function(e,t,n,r){var s=this.cellCache.pop();if(!s){var o=i.createElement("div");r&&r(o),this.element.appendChild(o),s={element:o,text:"",row:e}}return s.row=e,s}}).call(r.prototype),t.Lines=r})),ace.define("ace/layer/gutter",["require","exports","module","ace/lib/dom","ace/lib/oop","ace/lib/lang","ace/lib/event_emitter","ace/layer/lines"],(function(e,t,n){"use strict";function i(e){var t=document.createTextNode("");e.appendChild(t);var n=r.createElement("span");return e.appendChild(n),e}var r=e("../lib/dom"),s=e("../lib/oop"),o=e("../lib/lang"),a=e("../lib/event_emitter").EventEmitter,l=e("./lines").Lines,c=function(e){this.element=r.createElement("div"),this.element.className="ace_layer ace_gutter-layer",e.appendChild(this.element),this.setShowFoldWidgets(this.$showFoldWidgets),this.gutterWidth=0,this.$annotations=[],this.$updateAnnotations=this.$updateAnnotations.bind(this),this.$lines=new l(this.element),this.$lines.$offsetCoefficient=1};(function(){s.implement(this,a),this.setSession=function(e){this.session&&this.session.removeEventListener("change",this.$updateAnnotations),this.session=e,e&&e.on("change",this.$updateAnnotations)},this.addGutterDecoration=function(e,t){window.console&&console.warn&&console.warn("deprecated use session.addGutterDecoration"),this.session.addGutterDecoration(e,t)},this.removeGutterDecoration=function(e,t){window.console&&console.warn&&console.warn("deprecated use session.removeGutterDecoration"),this.session.removeGutterDecoration(e,t)},this.setAnnotations=function(e){this.$annotations=[];for(var t=0;t<e.length;t++){var n=e[t],i=n.row,r=this.$annotations[i];r||(r=this.$annotations[i]={text:[]});var s=n.text;s=s?o.escapeHTML(s):n.html||"",-1===r.text.indexOf(s)&&r.text.push(s);var a=n.type;"error"==a?r.className=" ace_error":"warning"==a&&" ace_error"!=r.className?r.className=" ace_warning":"info"==a&&!r.className&&(r.className=" ace_info")}},this.$updateAnnotations=function(e){if(this.$annotations.length){var t=e.start.row,n=e.end.row-t;if(0!==n)if("remove"==e.action)this.$annotations.splice(t,n+1,null);else{var i=new Array(n+1);i.unshift(t,1),this.$annotations.splice.apply(this.$annotations,i)}}},this.update=function(e){this.config=e;var t=this.session,n=e.firstRow,r=Math.min(e.lastRow+e.gutterOffset,t.getLength()-1);this.oldLastRow=r,this.config=e,this.$lines.moveContainer(e),this.$updateCursorRow();for(var s=t.getNextFoldLine(n),o=s?s.start.row:1/0,a=null,l=-1,c=n;;){if(c>o&&(c=s.end.row+1,o=(s=t.getNextFoldLine(c,s))?s.start.row:1/0),c>r){for(;this.$lines.getLength()>l+1;)this.$lines.pop();break}(a=this.$lines.get(++l))?a.row=c:(a=this.$lines.createCell(c,e,this.session,i),this.$lines.push(a)),this.$renderCell(a,e,s,c),c++}this._signal("afterRender"),this.$updateGutterWidth(e)},this.$updateGutterWidth=function(e){var t=this.session,n=t.gutterRenderer||this.$renderer,i=t.$firstLineNumber,r=this.$lines.last()?this.$lines.last().text:"";(this.$fixedWidth||t.$useWrapMode)&&(r=t.getLength()+i-1);var s=n?n.getWidth(t,r,e):r.toString().length*e.characterWidth,o=this.$padding||this.$computePadding();(s+=o.left+o.right)!==this.gutterWidth&&!isNaN(s)&&(this.gutterWidth=s,this.element.parentNode.style.width=this.element.style.width=Math.ceil(this.gutterWidth)+"px",this._signal("changeGutterWidth",s))},this.$updateCursorRow=function(){if(this.$highlightGutterLine){var e=this.session.selection.getCursor();this.$cursorRow!==e.row&&(this.$cursorRow=e.row)}},this.updateLineHighlight=function(){if(this.$highlightGutterLine){var e=this.session.selection.cursor.row;if(this.$cursorRow=e,!this.$cursorCell||this.$cursorCell.row!=e){this.$cursorCell&&(this.$cursorCell.element.className=this.$cursorCell.element.className.replace("ace_gutter-active-line ",""));var t=this.$lines.cells;this.$cursorCell=null;for(var n=0;n<t.length;n++){var i=t[n];if(i.row>=this.$cursorRow){if(i.row>this.$cursorRow){var r=this.session.getFoldLine(this.$cursorRow);if(!(n>0&&r&&r.start.row==t[n-1].row))break;i=t[n-1]}i.element.className="ace_gutter-active-line "+i.element.className,this.$cursorCell=i;break}}}}},this.scrollLines=function(e){var t=this.config;if(this.config=e,this.$updateCursorRow(),this.$lines.pageChanged(t,e))return this.update(e);this.$lines.moveContainer(e);var n=Math.min(e.lastRow+e.gutterOffset,this.session.getLength()-1),i=this.oldLastRow;if(this.oldLastRow=n,!t||i<e.firstRow)return this.update(e);if(n<t.firstRow)return this.update(e);if(t.firstRow<e.firstRow)for(var r=this.session.getFoldedRowCount(t.firstRow,e.firstRow-1);r>0;r--)this.$lines.shift();if(i>n)for(r=this.session.getFoldedRowCount(n+1,i);r>0;r--)this.$lines.pop();e.firstRow<t.firstRow&&this.$lines.unshift(this.$renderLines(e,e.firstRow,t.firstRow-1)),n>i&&this.$lines.push(this.$renderLines(e,i+1,n)),this.updateLineHighlight(),this._signal("afterRender"),this.$updateGutterWidth(e)},this.$renderLines=function(e,t,n){for(var r=[],s=t,o=this.session.getNextFoldLine(s),a=o?o.start.row:1/0;s>a&&(s=o.end.row+1,a=(o=this.session.getNextFoldLine(s,o))?o.start.row:1/0),!(s>n);){var l=this.$lines.createCell(s,e,this.session,i);this.$renderCell(l,e,o,s),r.push(l),s++}return r},this.$renderCell=function(e,t,n,i){var s=e.element,o=this.session,a=s.childNodes[0],l=s.childNodes[1],c=o.$firstLineNumber,u=o.$breakpoints,h=o.$decorations,d=o.gutterRenderer||this.$renderer,f=this.$showFoldWidgets&&o.foldWidgets,p=n?n.start.row:Number.MAX_VALUE,g="ace_gutter-cell ";if(this.$highlightGutterLine&&(i==this.$cursorRow||n&&i<this.$cursorRow&&i>=p&&this.$cursorRow<=n.end.row)&&(g+="ace_gutter-active-line ",this.$cursorCell!=e&&(this.$cursorCell&&(this.$cursorCell.element.className=this.$cursorCell.element.className.replace("ace_gutter-active-line ","")),this.$cursorCell=e)),u[i]&&(g+=u[i]),h[i]&&(g+=h[i]),this.$annotations[i]&&(g+=this.$annotations[i].className),s.className!=g&&(s.className=g),f){var m=f[i];null==m&&(m=f[i]=o.getFoldWidget(i))}if(m){g="ace_fold-widget ace_"+m;"start"==m&&i==p&&i<n.end.row?g+=" ace_closed":g+=" ace_open",l.className!=g&&(l.className=g);var v=t.lineHeight+"px";r.setStyle(l.style,"height",v),r.setStyle(l.style,"display","inline-block")}else l&&r.setStyle(l.style,"display","none");var $=(d?d.getText(o,i):i+c).toString();return $!==a.data&&(a.data=$),r.setStyle(e.element.style,"height",this.$lines.computeLineHeight(i,t,o)+"px"),r.setStyle(e.element.style,"top",this.$lines.computeLineTop(i,t,o)+"px"),e.text=$,e},this.$fixedWidth=!1,this.$highlightGutterLine=!0,this.$renderer="",this.setHighlightGutterLine=function(e){this.$highlightGutterLine=e},this.$showLineNumbers=!0,this.$renderer="",this.setShowLineNumbers=function(e){this.$renderer=!e&&{getWidth:function(){return 0},getText:function(){return""}}},this.getShowLineNumbers=function(){return this.$showLineNumbers},this.$showFoldWidgets=!0,this.setShowFoldWidgets=function(e){e?r.addCssClass(this.element,"ace_folding-enabled"):r.removeCssClass(this.element,"ace_folding-enabled"),this.$showFoldWidgets=e,this.$padding=null},this.getShowFoldWidgets=function(){return this.$showFoldWidgets},this.$computePadding=function(){if(!this.element.firstChild)return{left:0,right:0};var e=r.computedStyle(this.element.firstChild);return this.$padding={},this.$padding.left=(parseInt(e.borderLeftWidth)||0)+(parseInt(e.paddingLeft)||0)+1,this.$padding.right=(parseInt(e.borderRightWidth)||0)+(parseInt(e.paddingRight)||0),this.$padding},this.getRegion=function(e){var t=this.$padding||this.$computePadding(),n=this.element.getBoundingClientRect();return e.x<t.left+n.left?"markers":this.$showFoldWidgets&&e.x>n.right-t.right?"foldWidgets":void 0}}).call(c.prototype),t.Gutter=c})),ace.define("ace/layer/marker",["require","exports","module","ace/range","ace/lib/dom"],(function(e,t,n){"use strict";var i=e("../range").Range,r=e("../lib/dom"),s=function(e){this.element=r.createElement("div"),this.element.className="ace_layer ace_marker-layer",e.appendChild(this.element)};(function(){function e(e,t,n,i){return(e?1:0)|(t?2:0)|(n?4:0)|(i?8:0)}this.$padding=0,this.setPadding=function(e){this.$padding=e},this.setSession=function(e){this.session=e},this.setMarkers=function(e){this.markers=e},this.elt=function(e,t){var n=-1!=this.i&&this.element.childNodes[this.i];n?this.i++:(n=document.createElement("div"),this.element.appendChild(n),this.i=-1),n.style.cssText=t,n.className=e},this.update=function(e){if(e){var t;for(var n in this.config=e,this.i=0,this.markers){var i=this.markers[n];if(i.range){var r=i.range.clipRows(e.firstRow,e.lastRow);if(!r.isEmpty())if(r=r.toScreenRange(this.session),i.renderer){var s=this.$getTop(r.start.row,e),o=this.$padding+r.start.column*e.characterWidth;i.renderer(t,r,o,s,e)}else"fullLine"==i.type?this.drawFullLineMarker(t,r,i.clazz,e):"screenLine"==i.type?this.drawScreenLineMarker(t,r,i.clazz,e):r.isMultiLine()?"text"==i.type?this.drawTextMarker(t,r,i.clazz,e):this.drawMultiLineMarker(t,r,i.clazz,e):this.drawSingleLineMarker(t,r,i.clazz+" ace_start ace_br15",e)}else i.update(t,this,this.session,e)}if(-1!=this.i)for(;this.i<this.element.childElementCount;)this.element.removeChild(this.element.lastChild)}},this.$getTop=function(e,t){return(e-t.firstRowScreen)*t.lineHeight},this.drawTextMarker=function(t,n,r,s,o){for(var a=this.session,l=n.start.row,c=n.end.row,u=l,h=0,d=0,f=a.getScreenLastRowColumn(u),p=new i(u,n.start.column,u,d);u<=c;u++)p.start.row=p.end.row=u,p.start.column=u==l?n.start.column:a.getRowWrapIndent(u),p.end.column=f,h=d,d=f,f=u+1<c?a.getScreenLastRowColumn(u+1):u==c?0:n.end.column,this.drawSingleLineMarker(t,p,r+(u==l?" ace_start":"")+" ace_br"+e(u==l||u==l+1&&n.start.column,h<d,d>f,u==c),s,u==c?0:1,o)},this.drawMultiLineMarker=function(e,t,n,i,r){var s=this.$padding,o=i.lineHeight,a=this.$getTop(t.start.row,i),l=s+t.start.column*i.characterWidth;(r=r||"",this.session.$bidiHandler.isBidiRow(t.start.row))?((c=t.clone()).end.row=c.start.row,c.end.column=this.session.getLine(c.start.row).length,this.drawBidiSingleLineMarker(e,c,n+" ace_br1 ace_start",i,null,r)):this.elt(n+" ace_br1 ace_start","height:"+o+"px;right:0;top:"+a+"px;left:"+l+"px;"+(r||""));if(this.session.$bidiHandler.isBidiRow(t.end.row)){var c;(c=t.clone()).start.row=c.end.row,c.start.column=0,this.drawBidiSingleLineMarker(e,c,n+" ace_br12",i,null,r)}else{a=this.$getTop(t.end.row,i);var u=t.end.column*i.characterWidth;this.elt(n+" ace_br12","height:"+o+"px;width:"+u+"px;top:"+a+"px;left:"+s+"px;"+(r||""))}if(!((o=(t.end.row-t.start.row-1)*i.lineHeight)<=0)){a=this.$getTop(t.start.row+1,i);var h=(t.start.column?1:0)|(t.end.column?0:8);this.elt(n+(h?" ace_br"+h:""),"height:"+o+"px;right:0;top:"+a+"px;left:"+s+"px;"+(r||""))}},this.drawSingleLineMarker=function(e,t,n,i,r,s){if(this.session.$bidiHandler.isBidiRow(t.start.row))return this.drawBidiSingleLineMarker(e,t,n,i,r,s);var o=i.lineHeight,a=(t.end.column+(r||0)-t.start.column)*i.characterWidth,l=this.$getTop(t.start.row,i),c=this.$padding+t.start.column*i.characterWidth;this.elt(n,"height:"+o+"px;width:"+a+"px;top:"+l+"px;left:"+c+"px;"+(s||""))},this.drawBidiSingleLineMarker=function(e,t,n,i,r,s){var o=i.lineHeight,a=this.$getTop(t.start.row,i),l=this.$padding;this.session.$bidiHandler.getSelections(t.start.column,t.end.column).forEach((function(e){this.elt(n,"height:"+o+"px;width:"+e.width+(r||0)+"px;top:"+a+"px;left:"+(l+e.left)+"px;"+(s||""))}),this)},this.drawFullLineMarker=function(e,t,n,i,r){var s=this.$getTop(t.start.row,i),o=i.lineHeight;t.start.row!=t.end.row&&(o+=this.$getTop(t.end.row,i)-s),this.elt(n,"height:"+o+"px;top:"+s+"px;left:0;right:0;"+(r||""))},this.drawScreenLineMarker=function(e,t,n,i,r){var s=this.$getTop(t.start.row,i),o=i.lineHeight;this.elt(n,"height:"+o+"px;top:"+s+"px;left:0;right:0;"+(r||""))}}).call(s.prototype),t.Marker=s})),ace.define("ace/layer/text",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/lang","ace/layer/lines","ace/lib/event_emitter"],(function(e,t,n){"use strict";var i=e("../lib/oop"),r=e("../lib/dom"),s=e("../lib/lang"),o=e("./lines").Lines,a=e("../lib/event_emitter").EventEmitter,l=function(e){this.dom=r,this.element=this.dom.createElement("div"),this.element.className="ace_layer ace_text-layer",e.appendChild(this.element),this.$updateEolChar=this.$updateEolChar.bind(this),this.$lines=new o(this.element)};(function(){i.implement(this,a),this.EOF_CHAR="¶",this.EOL_CHAR_LF="¬",this.EOL_CHAR_CRLF="¤",this.EOL_CHAR=this.EOL_CHAR_LF,this.TAB_CHAR="—",this.SPACE_CHAR="·",this.$padding=0,this.MAX_LINE_LENGTH=1e4,this.$updateEolChar=function(){var e=this.session.doc,t="\n"==e.getNewLineCharacter()&&"windows"!=e.getNewLineMode()?this.EOL_CHAR_LF:this.EOL_CHAR_CRLF;if(this.EOL_CHAR!=t)return this.EOL_CHAR=t,!0},this.setPadding=function(e){this.$padding=e,this.element.style.margin="0 "+e+"px"},this.getLineHeight=function(){return this.$fontMetrics.$characterSize.height||0},this.getCharacterWidth=function(){return this.$fontMetrics.$characterSize.width||0},this.$setFontMetrics=function(e){this.$fontMetrics=e,this.$fontMetrics.on("changeCharacterSize",function(e){this._signal("changeCharacterSize",e)}.bind(this)),this.$pollSizeChanges()},this.checkForSizeChanges=function(){this.$fontMetrics.checkForSizeChanges()},this.$pollSizeChanges=function(){return this.$pollSizeChangesTimer=this.$fontMetrics.$pollSizeChanges()},this.setSession=function(e){this.session=e,e&&this.$computeTabString()},this.showInvisibles=!1,this.setShowInvisibles=function(e){return this.showInvisibles!=e&&(this.showInvisibles=e,this.$computeTabString(),!0)},this.displayIndentGuides=!0,this.setDisplayIndentGuides=function(e){return this.displayIndentGuides!=e&&(this.displayIndentGuides=e,this.$computeTabString(),!0)},this.$tabStrings=[],this.onChangeTabSize=this.$computeTabString=function(){var e=this.session.getTabSize();this.tabSize=e;for(var t=this.$tabStrings=[0],n=1;n<e+1;n++)if(this.showInvisibles){(i=this.dom.createElement("span")).className="ace_invisible ace_invisible_tab",i.textContent=s.stringRepeat(this.TAB_CHAR,n),t.push(i)}else t.push(this.dom.createTextNode(s.stringRepeat(" ",n),this.element));if(this.displayIndentGuides){this.$indentGuideRe=/\s\S| \t|\t |\s$/;var i,r="ace_indent-guide",o="",a="";if(this.showInvisibles){r+=" ace_invisible",o=" ace_invisible_space",a=" ace_invisible_tab";var l=s.stringRepeat(this.SPACE_CHAR,this.tabSize),c=s.stringRepeat(this.TAB_CHAR,this.tabSize)}else c=l=s.stringRepeat(" ",this.tabSize);(i=this.dom.createElement("span")).className=r+o,i.textContent=l,this.$tabStrings[" "]=i,(i=this.dom.createElement("span")).className=r+a,i.textContent=c,this.$tabStrings["\t"]=i}},this.updateLines=function(e,t,n){if(this.config.lastRow!=e.lastRow||this.config.firstRow!=e.firstRow)return this.update(e);this.config=e;for(var i=Math.max(t,e.firstRow),r=Math.min(n,e.lastRow),s=this.element.childNodes,o=0,a=e.firstRow;a<i;a++){if(l=this.session.getFoldLine(a)){if(l.containsRow(i)){i=l.start.row;break}a=l.end.row}o++}for(var l,c=!1,u=(a=i,(l=this.session.getNextFoldLine(a))?l.start.row:1/0);a>u&&(a=l.end.row+1,u=(l=this.session.getNextFoldLine(a,l))?l.start.row:1/0),!(a>r);){var h=s[o++];if(h){this.dom.removeChildren(h),this.$renderLine(h,a,a==u&&l);var d=e.lineHeight*this.session.getRowLength(a)+"px";h.style.height!=d&&(c=!0,h.style.height=d)}a++}if(c)for(;o<this.$lines.cells.length;){var f=this.$lines.cells[o++];f.element.style.top=this.$lines.computeLineTop(f.row,e,this.session)+"px"}},this.scrollLines=function(e){var t=this.config;if(this.config=e,this.$lines.pageChanged(t,e))return this.update(e);this.$lines.moveContainer(e);var n=e.lastRow,i=t?t.lastRow:-1;if(!t||i<e.firstRow)return this.update(e);if(n<t.firstRow)return this.update(e);if(!t||t.lastRow<e.firstRow)return this.update(e);if(e.lastRow<t.firstRow)return this.update(e);if(t.firstRow<e.firstRow)for(var r=this.session.getFoldedRowCount(t.firstRow,e.firstRow-1);r>0;r--)this.$lines.shift();if(t.lastRow>e.lastRow)for(r=this.session.getFoldedRowCount(e.lastRow+1,t.lastRow);r>0;r--)this.$lines.pop();e.firstRow<t.firstRow&&this.$lines.unshift(this.$renderLinesFragment(e,e.firstRow,t.firstRow-1)),e.lastRow>t.lastRow&&this.$lines.push(this.$renderLinesFragment(e,t.lastRow+1,e.lastRow))},this.$renderLinesFragment=function(e,t,n){for(var i=[],s=t,o=this.session.getNextFoldLine(s),a=o?o.start.row:1/0;s>a&&(s=o.end.row+1,a=(o=this.session.getNextFoldLine(s,o))?o.start.row:1/0),!(s>n);){var l=this.$lines.createCell(s,e,this.session),c=l.element;this.dom.removeChildren(c),r.setStyle(c.style,"height",this.$lines.computeLineHeight(s,e,this.session)+"px"),r.setStyle(c.style,"top",this.$lines.computeLineTop(s,e,this.session)+"px"),this.$renderLine(c,s,s==a&&o),this.$useLineGroups()?c.className="ace_line_group":c.className="ace_line",i.push(l),s++}return i},this.update=function(e){this.$lines.moveContainer(e),this.config=e;for(var t=e.firstRow,n=e.lastRow,i=this.$lines;i.getLength();)i.pop();i.push(this.$renderLinesFragment(e,t,n))},this.$textToken={text:!0,rparen:!0,lparen:!0},this.$renderToken=function(e,t,n,i){for(var o,a=this,l=/(\t)|( +)|([\x00-\x1f\x80-\xa0\xad\u1680\u180E\u2000-\u200f\u2028\u2029\u202F\u205F\uFEFF\uFFF9-\uFFFC]+)|(\u3000)|([\u1100-\u115F\u11A3-\u11A7\u11FA-\u11FF\u2329-\u232A\u2E80-\u2E99\u2E9B-\u2EF3\u2F00-\u2FD5\u2FF0-\u2FFB\u3001-\u303E\u3041-\u3096\u3099-\u30FF\u3105-\u312D\u3131-\u318E\u3190-\u31BA\u31C0-\u31E3\u31F0-\u321E\u3220-\u3247\u3250-\u32FE\u3300-\u4DBF\u4E00-\uA48C\uA490-\uA4C6\uA960-\uA97C\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFAFF\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE66\uFE68-\uFE6B\uFF01-\uFF60\uFFE0-\uFFE6]|[\uD800-\uDBFF][\uDC00-\uDFFF])/g,c=this.dom.createFragment(this.element),u=0;o=l.exec(i);){var h=o[1],d=o[2],f=o[3],p=o[4],g=o[5];if(a.showInvisibles||!d){var m=u!=o.index?i.slice(u,o.index):"";if(u=o.index+o[0].length,m&&c.appendChild(this.dom.createTextNode(m,this.element)),h){var v=a.session.getScreenTabSize(t+o.index);c.appendChild(a.$tabStrings[v].cloneNode(!0)),t+=v-1}else if(d)if(a.showInvisibles){(b=this.dom.createElement("span")).className="ace_invisible ace_invisible_space",b.textContent=s.stringRepeat(a.SPACE_CHAR,d.length),c.appendChild(b)}else c.appendChild(this.com.createTextNode(d,this.element));else if(f){(b=this.dom.createElement("span")).className="ace_invisible ace_invisible_space ace_invalid",b.textContent=s.stringRepeat(a.SPACE_CHAR,f.length),c.appendChild(b)}else if(p){a.showInvisibles&&a.SPACE_CHAR;t+=1,(b=this.dom.createElement("span")).style.width=2*a.config.characterWidth+"px",b.className=a.showInvisibles?"ace_cjk ace_invisible ace_invisible_space":"ace_cjk",b.textContent=a.showInvisibles?a.SPACE_CHAR:"",c.appendChild(b)}else if(g){t+=1,(b=r.createElement("span")).style.width=2*a.config.characterWidth+"px",b.className="ace_cjk",b.textContent=g,c.appendChild(b)}}}if(c.appendChild(this.dom.createTextNode(u?i.slice(u):i,this.element)),this.$textToken[n.type])e.appendChild(c);else{var $="ace_"+n.type.replace(/\./g," ace_"),b=this.dom.createElement("span");"fold"==n.type&&(b.style.width=n.value.length*this.config.characterWidth+"px"),b.className=$,b.appendChild(c),e.appendChild(b)}return t+i.length},this.renderIndentGuide=function(e,t,n){var i=t.search(this.$indentGuideRe);if(i<=0||i>=n)return t;if(" "==t[0]){for(var r=(i-=i%this.tabSize)/this.tabSize,s=0;s<r;s++)e.appendChild(this.$tabStrings[" "].cloneNode(!0));return t.substr(i)}if("\t"==t[0]){for(s=0;s<i;s++)e.appendChild(this.$tabStrings["\t"].cloneNode(!0));return t.substr(i)}return t},this.$createLineElement=function(e){var t=this.dom.createElement("div");return t.className="ace_line",t.style.height=this.config.lineHeight+"px",t},this.$renderWrappedLine=function(e,t,n){var i=0,r=0,o=n[0],a=0,l=this.$createLineElement();e.appendChild(l);for(var c=0;c<t.length;c++){var u=t[c],h=u.value;if(0==c&&this.displayIndentGuides){if(i=h.length,!(h=this.renderIndentGuide(l,h,o)))continue;i-=h.length}if(i+h.length<o)a=this.$renderToken(l,a,u,h),i+=h.length;else{for(;i+h.length>=o;)a=this.$renderToken(l,a,u,h.substring(0,o-i)),h=h.substring(o-i),i=o,l=this.$createLineElement(),e.appendChild(l),l.appendChild(this.dom.createTextNode(s.stringRepeat(" ",n.indent),this.element)),a=0,o=n[++r]||Number.MAX_VALUE;0!=h.length&&(i+=h.length,a=this.$renderToken(l,a,u,h))}}},this.$renderSimpleLine=function(e,t){var n=0,i=t[0],r=i.value;this.displayIndentGuides&&(r=this.renderIndentGuide(e,r)),r&&(n=this.$renderToken(e,n,i,r));for(var s=1;s<t.length;s++){if(n+(r=(i=t[s]).value).length>this.MAX_LINE_LENGTH)return this.$renderOverflowMessage(e,n,i,r);n=this.$renderToken(e,n,i,r)}},this.$renderOverflowMessage=function(e,t,n,i){this.$renderToken(e,t,n,i.slice(0,this.MAX_LINE_LENGTH-t));var r=this.dom.createElement("span");r.className="ace_inline_button ace_keyword ace_toggle_wrap",r.style.position="absolute",r.style.right="0",r.textContent="<click to see more...>",e.appendChild(r)},this.$renderLine=function(e,t,n){if(!n&&0!=n&&(n=this.session.getFoldLine(t)),n)var i=this.$getFoldLineTokens(t,n);else i=this.session.getTokens(t);var r=e;if(i.length){var s=this.session.getRowSplitData(t);if(s&&s.length){this.$renderWrappedLine(e,i,s);r=e.lastChild}else{r=e;this.$useLineGroups()&&(r=this.$createLineElement(),e.appendChild(r)),this.$renderSimpleLine(r,i)}}else this.$useLineGroups()&&(r=this.$createLineElement(),e.appendChild(r));if(this.showInvisibles&&r){n&&(t=n.end.row);var o=this.dom.createElement("span");o.className="ace_invisible ace_invisible_eol",o.textContent=t==this.session.getLength()-1?this.EOF_CHAR:this.EOL_CHAR,r.appendChild(o)}},this.$getFoldLineTokens=function(e,t){var n=this.session,i=[],r=n.getTokens(e);return t.walk((function(e,t,s,o,a){null!=e?i.push({type:"fold",value:e}):(a&&(r=n.getTokens(t)),r.length&&function(e,t,n){for(var r=0,s=0;s+e[r].value.length<t;)if(s+=e[r].value.length,++r==e.length)return;for(s!=t&&((o=e[r].value.substring(t-s)).length>n-t&&(o=o.substring(0,n-t)),i.push({type:e[r].type,value:o}),s=t+o.length,r+=1);s<n&&r<e.length;){var o;(o=e[r].value).length+s>n?i.push({type:e[r].type,value:o.substring(0,n-s)}):i.push(e[r]),s+=o.length,r+=1}}(r,o,s))}),t.end.row,this.session.getLine(t.end.row).length),i},this.$useLineGroups=function(){return this.session.getUseWrapMode()},this.destroy=function(){}}).call(l.prototype),t.Text=l})),ace.define("ace/layer/cursor",["require","exports","module","ace/lib/dom"],(function(e,t,n){"use strict";var i=e("../lib/dom"),r=function(e){this.element=i.createElement("div"),this.element.className="ace_layer ace_cursor-layer",e.appendChild(this.element),this.isVisible=!1,this.isBlinking=!0,this.blinkInterval=1e3,this.smoothBlinking=!1,this.cursors=[],this.cursor=this.addCursor(),i.addCssClass(this.element,"ace_hidden-cursors"),this.$updateCursors=this.$updateOpacity.bind(this)};(function(){this.$updateOpacity=function(e){for(var t=this.cursors,n=t.length;n--;)i.setStyle(t[n].style,"opacity",e?"":"0")},this.$startCssAnimation=function(){for(var e=this.cursors,t=e.length;t--;)e[t].style.animationDuration=this.blinkInterval+"ms";setTimeout(function(){i.addCssClass(this.element,"ace_animate-blinking")}.bind(this))},this.$stopCssAnimation=function(){i.removeCssClass(this.element,"ace_animate-blinking")},this.$padding=0,this.setPadding=function(e){this.$padding=e},this.setSession=function(e){this.session=e},this.setBlinking=function(e){e!=this.isBlinking&&(this.isBlinking=e,this.restartTimer())},this.setBlinkInterval=function(e){e!=this.blinkInterval&&(this.blinkInterval=e,this.restartTimer())},this.setSmoothBlinking=function(e){e!=this.smoothBlinking&&(this.smoothBlinking=e,i.setCssClass(this.element,"ace_smooth-blinking",e),this.$updateCursors(!0),this.restartTimer())},this.addCursor=function(){var e=i.createElement("div");return e.className="ace_cursor",this.element.appendChild(e),this.cursors.push(e),e},this.removeCursor=function(){if(this.cursors.length>1){var e=this.cursors.pop();return e.parentNode.removeChild(e),e}},this.hideCursor=function(){this.isVisible=!1,i.addCssClass(this.element,"ace_hidden-cursors"),this.restartTimer()},this.showCursor=function(){this.isVisible=!0,i.removeCssClass(this.element,"ace_hidden-cursors"),this.restartTimer()},this.restartTimer=function(){var e=this.$updateCursors;if(clearInterval(this.intervalId),clearTimeout(this.timeoutId),this.$stopCssAnimation(),this.smoothBlinking&&i.removeCssClass(this.element,"ace_smooth-blinking"),e(!0),this.isBlinking&&this.blinkInterval&&this.isVisible)if(this.smoothBlinking&&setTimeout(function(){i.addCssClass(this.element,"ace_smooth-blinking")}.bind(this)),i.HAS_CSS_ANIMATION)this.$startCssAnimation();else{var t=function(){this.timeoutId=setTimeout((function(){e(!1)}),.6*this.blinkInterval)}.bind(this);this.intervalId=setInterval((function(){e(!0),t()}),this.blinkInterval),t()}else this.$stopCssAnimation()},this.getPixelPosition=function(e,t){if(!this.config||!this.session)return{left:0,top:0};e||(e=this.session.selection.getCursor());var n=this.session.documentToScreenPosition(e);return{left:this.$padding+(this.session.$bidiHandler.isBidiRow(n.row,e.row)?this.session.$bidiHandler.getPosLeft(n.column):n.column*this.config.characterWidth),top:(n.row-(t?this.config.firstRowScreen:0))*this.config.lineHeight}},this.isCursorInView=function(e,t){return e.top>=0&&e.top<t.maxHeight},this.update=function(e){this.config=e;var t=this.session.$selectionMarkers,n=0,r=0;void 0!==t&&0!==t.length||(t=[{cursor:null}]);n=0;for(var s=t.length;n<s;n++){var o=this.getPixelPosition(t[n].cursor,!0);if(!((o.top>e.height+e.offset||o.top<0)&&n>1)){var a=this.cursors[r++]||this.addCursor(),l=a.style;this.drawCursor?this.drawCursor(a,o,e,t[n],this.session):this.isCursorInView(o,e)?(i.setStyle(l,"display","block"),i.translate(a,o.left,o.top),i.setStyle(l,"width",Math.round(e.characterWidth)+"px"),i.setStyle(l,"height",e.lineHeight+"px")):i.setStyle(l,"display","none")}}for(;this.cursors.length>r;)this.removeCursor();var c=this.session.getOverwrite();this.$setOverwrite(c),this.$pixelPos=o,this.restartTimer()},this.drawCursor=null,this.$setOverwrite=function(e){e!=this.overwrite&&(this.overwrite=e,e?i.addCssClass(this.element,"ace_overwrite-cursors"):i.removeCssClass(this.element,"ace_overwrite-cursors"))},this.destroy=function(){clearInterval(this.intervalId),clearTimeout(this.timeoutId)}}).call(r.prototype),t.Cursor=r})),ace.define("ace/scrollbar",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/event","ace/lib/event_emitter"],(function(e,t,n){"use strict";var i=e("./lib/oop"),r=e("./lib/dom"),s=e("./lib/event"),o=e("./lib/event_emitter").EventEmitter,a=32768,l=function(e){this.element=r.createElement("div"),this.element.className="ace_scrollbar ace_scrollbar"+this.classSuffix,this.inner=r.createElement("div"),this.inner.className="ace_scrollbar-inner",this.element.appendChild(this.inner),e.appendChild(this.element),this.setVisible(!1),this.skipEvent=!1,s.addListener(this.element,"scroll",this.onScroll.bind(this)),s.addListener(this.element,"mousedown",s.preventDefault)};(function(){i.implement(this,o),this.setVisible=function(e){this.element.style.display=e?"":"none",this.isVisible=e,this.coeff=1}}).call(l.prototype);var c=function(e,t){l.call(this,e),this.scrollTop=0,this.scrollHeight=0,t.$scrollbarWidth=this.width=r.scrollbarWidth(e.ownerDocument),this.inner.style.width=this.element.style.width=(this.width||15)+5+"px",this.$minWidth=0};i.inherits(c,l),function(){this.classSuffix="-v",this.onScroll=function(){if(!this.skipEvent){if(this.scrollTop=this.element.scrollTop,1!=this.coeff){var e=this.element.clientHeight/this.scrollHeight;this.scrollTop=this.scrollTop*(1-e)/(this.coeff-e)}this._emit("scroll",{data:this.scrollTop})}this.skipEvent=!1},this.getWidth=function(){return Math.max(this.isVisible?this.width:0,this.$minWidth||0)},this.setHeight=function(e){this.element.style.height=e+"px"},this.setInnerHeight=this.setScrollHeight=function(e){this.scrollHeight=e,e>a?(this.coeff=a/e,e=a):1!=this.coeff&&(this.coeff=1),this.inner.style.height=e+"px"},this.setScrollTop=function(e){this.scrollTop!=e&&(this.skipEvent=!0,this.scrollTop=e,this.element.scrollTop=e*this.coeff)}}.call(c.prototype);var u=function(e,t){l.call(this,e),this.scrollLeft=0,this.height=t.$scrollbarWidth,this.inner.style.height=this.element.style.height=(this.height||15)+5+"px"};i.inherits(u,l),function(){this.classSuffix="-h",this.onScroll=function(){this.skipEvent||(this.scrollLeft=this.element.scrollLeft,this._emit("scroll",{data:this.scrollLeft})),this.skipEvent=!1},this.getHeight=function(){return this.isVisible?this.height:0},this.setWidth=function(e){this.element.style.width=e+"px"},this.setInnerWidth=function(e){this.inner.style.width=e+"px"},this.setScrollWidth=function(e){this.inner.style.width=e+"px"},this.setScrollLeft=function(e){this.scrollLeft!=e&&(this.skipEvent=!0,this.scrollLeft=this.element.scrollLeft=e)}}.call(u.prototype),t.ScrollBar=c,t.ScrollBarV=c,t.ScrollBarH=u,t.VScrollBar=c,t.HScrollBar=u})),ace.define("ace/renderloop",["require","exports","module","ace/lib/event"],(function(e,t,n){"use strict";var i=e("./lib/event"),r=function(e,t){this.onRender=e,this.pending=!1,this.changes=0,this.$recursionLimit=2,this.window=t||window;var n=this;this._flush=function(e){n.pending=!1;var t=n.changes;if(t&&(i.blockIdle(100),n.changes=0,n.onRender(t)),n.changes){if(n.$recursionLimit--<0)return;n.schedule()}else n.$recursionLimit=2}};(function(){this.schedule=function(e){this.changes=this.changes|e,this.changes&&!this.pending&&(i.nextFrame(this._flush),this.pending=!0)},this.clear=function(e){var t=this.changes;return this.changes=0,t}}).call(r.prototype),t.RenderLoop=r})),ace.define("ace/layer/font_metrics",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/lang","ace/lib/event","ace/lib/useragent","ace/lib/event_emitter"],(function(e,t,n){var i=e("../lib/oop"),r=e("../lib/dom"),s=e("../lib/lang"),o=e("../lib/event"),a=e("../lib/useragent"),l=e("../lib/event_emitter").EventEmitter,c=256,u="function"==typeof ResizeObserver,h=200,d=t.FontMetrics=function(e){this.el=r.createElement("div"),this.$setMeasureNodeStyles(this.el.style,!0),this.$main=r.createElement("div"),this.$setMeasureNodeStyles(this.$main.style),this.$measureNode=r.createElement("div"),this.$setMeasureNodeStyles(this.$measureNode.style),this.el.appendChild(this.$main),this.el.appendChild(this.$measureNode),e.appendChild(this.el),this.$measureNode.innerHTML=s.stringRepeat("X",c),this.$characterSize={width:0,height:0},u?this.$addObserver():this.checkForSizeChanges()};(function(){i.implement(this,l),this.$characterSize={width:0,height:0},this.$setMeasureNodeStyles=function(e,t){e.width=e.height="auto",e.left=e.top="0px",e.visibility="hidden",e.position="absolute",e.whiteSpace="pre",a.isIE<8?e["font-family"]="inherit":e.font="inherit",e.overflow=t?"hidden":"visible"},this.checkForSizeChanges=function(e){if(void 0===e&&(e=this.$measureSizes()),e&&(this.$characterSize.width!==e.width||this.$characterSize.height!==e.height)){this.$measureNode.style.fontWeight="bold";var t=this.$measureSizes();this.$measureNode.style.fontWeight="",this.$characterSize=e,this.charSizes=Object.create(null),this.allowBoldFonts=t&&t.width===e.width&&t.height===e.height,this._emit("changeCharacterSize",{data:e})}},this.$addObserver=function(){var e=this;this.$observer=new window.ResizeObserver((function(t){var n=t[0].contentRect;e.checkForSizeChanges({height:n.height,width:n.width/c})})),this.$observer.observe(this.$measureNode)},this.$pollSizeChanges=function(){if(this.$pollSizeChangesTimer||this.$observer)return this.$pollSizeChangesTimer;var e=this;return this.$pollSizeChangesTimer=o.onIdle((function t(){e.checkForSizeChanges(),o.onIdle(t,500)}),500)},this.setPolling=function(e){e?this.$pollSizeChanges():this.$pollSizeChangesTimer&&(clearInterval(this.$pollSizeChangesTimer),this.$pollSizeChangesTimer=0)},this.$measureSizes=function(e){var t={height:(e||this.$measureNode).clientHeight,width:(e||this.$measureNode).clientWidth/c};return 0===t.width||0===t.height?null:t},this.$measureCharWidth=function(e){return this.$main.innerHTML=s.stringRepeat(e,c),this.$main.getBoundingClientRect().width/c},this.getCharacterWidth=function(e){var t=this.charSizes[e];return void 0===t&&(t=this.charSizes[e]=this.$measureCharWidth(e)/this.$characterSize.width),t},this.destroy=function(){clearInterval(this.$pollSizeChangesTimer),this.$observer&&this.$observer.disconnect(),this.el&&this.el.parentNode&&this.el.parentNode.removeChild(this.el)},this.$getZoom=function e(t){return t?(window.getComputedStyle(t).zoom||1)*e(t.parentElement):1},this.$initTransformMeasureNodes=function(){var e=function(e,t){return["div",{style:"position: absolute;top:"+e+"px;left:"+t+"px;"}]};this.els=r.buildDom([e(0,0),e(h,0),e(0,h),e(h,h)],this.el)},this.transformCoordinates=function(e,t){function n(e,t,n){var i=e[1]*t[0]-e[0]*t[1];return[(-t[1]*n[0]+t[0]*n[1])/i,(+e[1]*n[0]-e[0]*n[1])/i]}function i(e,t){return[e[0]-t[0],e[1]-t[1]]}function r(e,t){return[e[0]+t[0],e[1]+t[1]]}function s(e,t){return[e*t[0],e*t[1]]}function o(e){var t=e.getBoundingClientRect();return[t.left,t.top]}e&&(e=s(1/this.$getZoom(this.el),e));this.els||this.$initTransformMeasureNodes();var a=o(this.els[0]),l=o(this.els[1]),c=o(this.els[2]),u=o(this.els[3]),d=n(i(u,l),i(u,c),i(r(l,c),r(u,a))),f=s(1+d[0],i(l,a)),p=s(1+d[1],i(c,a));if(t){var g=t,m=d[0]*g[0]/h+d[1]*g[1]/h+1,v=r(s(g[0],f),s(g[1],p));return r(s(1/m/h,v),a)}var $=i(e,a),b=n(i(f,s(d[0],$)),i(p,s(d[1],$)),$);return s(h,b)}}).call(d.prototype)})),ace.define("ace/virtual_renderer",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/config","ace/layer/gutter","ace/layer/marker","ace/layer/text","ace/layer/cursor","ace/scrollbar","ace/scrollbar","ace/renderloop","ace/layer/font_metrics","ace/lib/event_emitter","ace/lib/useragent"],(function(e,t,n){"use strict";var i=e("./lib/oop"),r=e("./lib/dom"),s=e("./config"),o=e("./layer/gutter").Gutter,a=e("./layer/marker").Marker,l=e("./layer/text").Text,c=e("./layer/cursor").Cursor,u=e("./scrollbar").HScrollBar,h=e("./scrollbar").VScrollBar,d=e("./renderloop").RenderLoop,f=e("./layer/font_metrics").FontMetrics,p=e("./lib/event_emitter").EventEmitter,g='.ace_br1 {border-top-left-radius    : 3px;}.ace_br2 {border-top-right-radius   : 3px;}.ace_br3 {border-top-left-radius    : 3px; border-top-right-radius:    3px;}.ace_br4 {border-bottom-right-radius: 3px;}.ace_br5 {border-top-left-radius    : 3px; border-bottom-right-radius: 3px;}.ace_br6 {border-top-right-radius   : 3px; border-bottom-right-radius: 3px;}.ace_br7 {border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-right-radius: 3px;}.ace_br8 {border-bottom-left-radius : 3px;}.ace_br9 {border-top-left-radius    : 3px; border-bottom-left-radius:  3px;}.ace_br10{border-top-right-radius   : 3px; border-bottom-left-radius:  3px;}.ace_br11{border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-left-radius:  3px;}.ace_br12{border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}.ace_br13{border-top-left-radius    : 3px; border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}.ace_br14{border-top-right-radius   : 3px; border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}.ace_br15{border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px;}.ace_editor {position: relative;overflow: hidden;font: 12px/normal \'Monaco\', \'Menlo\', \'Ubuntu Mono\', \'Consolas\', \'source-code-pro\', monospace;direction: ltr;text-align: left;-webkit-tap-highlight-color: rgba(0, 0, 0, 0);}.ace_scroller {position: absolute;overflow: hidden;top: 0;bottom: 0;background-color: inherit;-ms-user-select: none;-moz-user-select: none;-webkit-user-select: none;user-select: none;cursor: text;}.ace_content {position: absolute;box-sizing: border-box;min-width: 100%;contain: style size layout;}.ace_dragging .ace_scroller:before{position: absolute;top: 0;left: 0;right: 0;bottom: 0;content: \'\';background: rgba(250, 250, 250, 0.01);z-index: 1000;}.ace_dragging.ace_dark .ace_scroller:before{background: rgba(0, 0, 0, 0.01);}.ace_selecting, .ace_selecting * {cursor: text !important;}.ace_gutter {position: absolute;overflow : hidden;width: auto;top: 0;bottom: 0;left: 0;cursor: default;z-index: 4;-ms-user-select: none;-moz-user-select: none;-webkit-user-select: none;user-select: none;contain: style size layout;}.ace_gutter-active-line {position: absolute;left: 0;right: 0;}.ace_scroller.ace_scroll-left {box-shadow: 17px 0 16px -16px rgba(0, 0, 0, 0.4) inset;}.ace_gutter-cell {position: absolute;top: 0;left: 0;right: 0;padding-left: 19px;padding-right: 6px;background-repeat: no-repeat;}.ace_gutter-cell.ace_error {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAABOFBMVEX/////////QRswFAb/Ui4wFAYwFAYwFAaWGAfDRymzOSH/PxswFAb/SiUwFAYwFAbUPRvjQiDllog5HhHdRybsTi3/Tyv9Tir+Syj/UC3////XurebMBIwFAb/RSHbPx/gUzfdwL3kzMivKBAwFAbbvbnhPx66NhowFAYwFAaZJg8wFAaxKBDZurf/RB6mMxb/SCMwFAYwFAbxQB3+RB4wFAb/Qhy4Oh+4QifbNRcwFAYwFAYwFAb/QRzdNhgwFAYwFAbav7v/Uy7oaE68MBK5LxLewr/r2NXewLswFAaxJw4wFAbkPRy2PyYwFAaxKhLm1tMwFAazPiQwFAaUGAb/QBrfOx3bvrv/VC/maE4wFAbRPBq6MRO8Qynew8Dp2tjfwb0wFAbx6eju5+by6uns4uH9/f36+vr/GkHjAAAAYnRSTlMAGt+64rnWu/bo8eAA4InH3+DwoN7j4eLi4xP99Nfg4+b+/u9B/eDs1MD1mO7+4PHg2MXa347g7vDizMLN4eG+Pv7i5evs/v79yu7S3/DV7/498Yv24eH+4ufQ3Ozu/v7+y13sRqwAAADLSURBVHjaZc/XDsFgGIBhtDrshlitmk2IrbHFqL2pvXf/+78DPokj7+Fz9qpU/9UXJIlhmPaTaQ6QPaz0mm+5gwkgovcV6GZzd5JtCQwgsxoHOvJO15kleRLAnMgHFIESUEPmawB9ngmelTtipwwfASilxOLyiV5UVUyVAfbG0cCPHig+GBkzAENHS0AstVF6bacZIOzgLmxsHbt2OecNgJC83JERmePUYq8ARGkJx6XtFsdddBQgZE2nPR6CICZhawjA4Fb/chv+399kfR+MMMDGOQAAAABJRU5ErkJggg==");background-repeat: no-repeat;background-position: 2px center;}.ace_gutter-cell.ace_warning {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAmVBMVEX///8AAAD///8AAAAAAABPSzb/5sAAAAB/blH/73z/ulkAAAAAAAD85pkAAAAAAAACAgP/vGz/rkDerGbGrV7/pkQICAf////e0IsAAAD/oED/qTvhrnUAAAD/yHD/njcAAADuv2r/nz//oTj/p064oGf/zHAAAAA9Nir/tFIAAAD/tlTiuWf/tkIAAACynXEAAAAAAAAtIRW7zBpBAAAAM3RSTlMAABR1m7RXO8Ln31Z36zT+neXe5OzooRDfn+TZ4p3h2hTf4t3k3ucyrN1K5+Xaks52Sfs9CXgrAAAAjklEQVR42o3PbQ+CIBQFYEwboPhSYgoYunIqqLn6/z8uYdH8Vmdnu9vz4WwXgN/xTPRD2+sgOcZjsge/whXZgUaYYvT8QnuJaUrjrHUQreGczuEafQCO/SJTufTbroWsPgsllVhq3wJEk2jUSzX3CUEDJC84707djRc5MTAQxoLgupWRwW6UB5fS++NV8AbOZgnsC7BpEAAAAABJRU5ErkJggg==");background-position: 2px center;}.ace_gutter-cell.ace_info {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAJ0Uk5TAAB2k804AAAAPklEQVQY02NgIB68QuO3tiLznjAwpKTgNyDbMegwisCHZUETUZV0ZqOquBpXj2rtnpSJT1AEnnRmL2OgGgAAIKkRQap2htgAAAAASUVORK5CYII=");background-position: 2px center;}.ace_dark .ace_gutter-cell.ace_info {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAJFBMVEUAAAChoaGAgIAqKiq+vr6tra1ZWVmUlJSbm5s8PDxubm56enrdgzg3AAAAAXRSTlMAQObYZgAAAClJREFUeNpjYMAPdsMYHegyJZFQBlsUlMFVCWUYKkAZMxZAGdxlDMQBAG+TBP4B6RyJAAAAAElFTkSuQmCC");}.ace_scrollbar {contain: strict;position: absolute;right: 0;bottom: 0;z-index: 6;}.ace_scrollbar-inner {position: absolute;cursor: text;left: 0;top: 0;}.ace_scrollbar-v{overflow-x: hidden;overflow-y: scroll;top: 0;}.ace_scrollbar-h {overflow-x: scroll;overflow-y: hidden;left: 0;}.ace_print-margin {position: absolute;height: 100%;}.ace_text-input {position: absolute;z-index: 0;width: 0.5em;height: 1em;opacity: 0;background: transparent;-moz-appearance: none;appearance: none;border: none;resize: none;outline: none;overflow: hidden;font: inherit;padding: 0 1px;margin: 0 -1px;contain: strict;-ms-user-select: text;-moz-user-select: text;-webkit-user-select: text;user-select: text;white-space: pre!important;}.ace_text-input.ace_composition {background: transparent;color: inherit;z-index: 1000;opacity: 1;}.ace_composition_placeholder { color: transparent }.ace_composition_marker { border-bottom: 1px solid;position: absolute;border-radius: 0;margin-top: 1px;}[ace_nocontext=true] {transform: none!important;filter: none!important;perspective: none!important;clip-path: none!important;mask : none!important;contain: none!important;perspective: none!important;mix-blend-mode: initial!important;z-index: auto;}.ace_layer {z-index: 1;position: absolute;overflow: hidden;word-wrap: normal;white-space: pre;height: 100%;width: 100%;box-sizing: border-box;pointer-events: none;}.ace_gutter-layer {position: relative;width: auto;text-align: right;pointer-events: auto;height: 1000000px;contain: style size layout;}.ace_text-layer {font: inherit !important;position: absolute;height: 1000000px;width: 1000000px;contain: style size layout;}.ace_text-layer > .ace_line, .ace_text-layer > .ace_line_group {contain: style size layout;position: absolute;top: 0;left: 0;right: 0;}.ace_hidpi .ace_text-layer,.ace_hidpi .ace_gutter-layer,.ace_hidpi .ace_content,.ace_hidpi .ace_gutter {contain: strict;will-change: transform;}.ace_hidpi .ace_text-layer > .ace_line, .ace_hidpi .ace_text-layer > .ace_line_group {contain: strict;}.ace_cjk {display: inline-block;text-align: center;}.ace_cursor-layer {z-index: 4;}.ace_cursor {z-index: 4;position: absolute;box-sizing: border-box;border-left: 2px solid;transform: translatez(0);}.ace_multiselect .ace_cursor {border-left-width: 1px;}.ace_slim-cursors .ace_cursor {border-left-width: 1px;}.ace_overwrite-cursors .ace_cursor {border-left-width: 0;border-bottom: 1px solid;}.ace_hidden-cursors .ace_cursor {opacity: 0.2;}.ace_smooth-blinking .ace_cursor {transition: opacity 0.18s;}.ace_animate-blinking .ace_cursor {animation-duration: 1000ms;animation-timing-function: step-end;animation-name: blink-ace-animate;animation-iteration-count: infinite;}.ace_animate-blinking.ace_smooth-blinking .ace_cursor {animation-duration: 1000ms;animation-timing-function: ease-in-out;animation-name: blink-ace-animate-smooth;}@keyframes blink-ace-animate {from, to { opacity: 1; }60% { opacity: 0; }}@keyframes blink-ace-animate-smooth {from, to { opacity: 1; }45% { opacity: 1; }60% { opacity: 0; }85% { opacity: 0; }}.ace_marker-layer .ace_step, .ace_marker-layer .ace_stack {position: absolute;z-index: 3;}.ace_marker-layer .ace_selection {position: absolute;z-index: 5;}.ace_marker-layer .ace_bracket {position: absolute;z-index: 6;}.ace_marker-layer .ace_active-line {position: absolute;z-index: 2;}.ace_marker-layer .ace_selected-word {position: absolute;z-index: 4;box-sizing: border-box;}.ace_line .ace_fold {box-sizing: border-box;display: inline-block;height: 11px;margin-top: -2px;vertical-align: middle;background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAAJCAYAAADU6McMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAJpJREFUeNpi/P//PwOlgAXGYGRklAVSokD8GmjwY1wasKljQpYACtpCFeADcHVQfQyMQAwzwAZI3wJKvCLkfKBaMSClBlR7BOQikCFGQEErIH0VqkabiGCAqwUadAzZJRxQr/0gwiXIal8zQQPnNVTgJ1TdawL0T5gBIP1MUJNhBv2HKoQHHjqNrA4WO4zY0glyNKLT2KIfIMAAQsdgGiXvgnYAAAAASUVORK5CYII="),url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAA3CAYAAADNNiA5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAACJJREFUeNpi+P//fxgTAwPDBxDxD078RSX+YeEyDFMCIMAAI3INmXiwf2YAAAAASUVORK5CYII=");background-repeat: no-repeat, repeat-x;background-position: center center, top left;color: transparent;border: 1px solid black;border-radius: 2px;cursor: pointer;pointer-events: auto;}.ace_dark .ace_fold {}.ace_fold:hover{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAAJCAYAAADU6McMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAJpJREFUeNpi/P//PwOlgAXGYGRklAVSokD8GmjwY1wasKljQpYACtpCFeADcHVQfQyMQAwzwAZI3wJKvCLkfKBaMSClBlR7BOQikCFGQEErIH0VqkabiGCAqwUadAzZJRxQr/0gwiXIal8zQQPnNVTgJ1TdawL0T5gBIP1MUJNhBv2HKoQHHjqNrA4WO4zY0glyNKLT2KIfIMAAQsdgGiXvgnYAAAAASUVORK5CYII="),url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAA3CAYAAADNNiA5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAACBJREFUeNpi+P//fz4TAwPDZxDxD5X4i5fLMEwJgAADAEPVDbjNw87ZAAAAAElFTkSuQmCC");}.ace_tooltip {background-color: #FFF;background-image: linear-gradient(to bottom, transparent, rgba(0, 0, 0, 0.1));border: 1px solid gray;border-radius: 1px;box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);color: black;max-width: 100%;padding: 3px 4px;position: fixed;z-index: 999999;box-sizing: border-box;cursor: default;white-space: pre;word-wrap: break-word;line-height: normal;font-style: normal;font-weight: normal;letter-spacing: normal;pointer-events: none;}.ace_folding-enabled > .ace_gutter-cell {padding-right: 13px;}.ace_fold-widget {box-sizing: border-box;margin: 0 -12px 0 1px;display: none;width: 11px;vertical-align: top;background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAANElEQVR42mWKsQ0AMAzC8ixLlrzQjzmBiEjp0A6WwBCSPgKAXoLkqSot7nN3yMwR7pZ32NzpKkVoDBUxKAAAAABJRU5ErkJggg==");background-repeat: no-repeat;background-position: center;border-radius: 3px;border: 1px solid transparent;cursor: pointer;}.ace_folding-enabled .ace_fold-widget {display: inline-block;   }.ace_fold-widget.ace_end {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAANElEQVR42m3HwQkAMAhD0YzsRchFKI7sAikeWkrxwScEB0nh5e7KTPWimZki4tYfVbX+MNl4pyZXejUO1QAAAABJRU5ErkJggg==");}.ace_fold-widget.ace_closed {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAGCAYAAAAG5SQMAAAAOUlEQVR42jXKwQkAMAgDwKwqKD4EwQ26sSOkVWjgIIHAzPiCgaqiqnJHZnKICBERHN194O5b9vbLuAVRL+l0YWnZAAAAAElFTkSuQmCCXA==");}.ace_fold-widget:hover {border: 1px solid rgba(0, 0, 0, 0.3);background-color: rgba(255, 255, 255, 0.2);box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);}.ace_fold-widget:active {border: 1px solid rgba(0, 0, 0, 0.4);background-color: rgba(0, 0, 0, 0.05);box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);}.ace_dark .ace_fold-widget {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHklEQVQIW2P4//8/AzoGEQ7oGCaLLAhWiSwB146BAQCSTPYocqT0AAAAAElFTkSuQmCC");}.ace_dark .ace_fold-widget.ace_end {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAH0lEQVQIW2P4//8/AxQ7wNjIAjDMgC4AxjCVKBirIAAF0kz2rlhxpAAAAABJRU5ErkJggg==");}.ace_dark .ace_fold-widget.ace_closed {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAFCAYAAACAcVaiAAAAHElEQVQIW2P4//+/AxAzgDADlOOAznHAKgPWAwARji8UIDTfQQAAAABJRU5ErkJggg==");}.ace_dark .ace_fold-widget:hover {box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2);background-color: rgba(255, 255, 255, 0.1);}.ace_dark .ace_fold-widget:active {box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2);}.ace_inline_button {border: 1px solid lightgray;display: inline-block;margin: -1px 8px;padding: 0 5px;pointer-events: auto;cursor: pointer;}.ace_inline_button:hover {border-color: gray;background: rgba(200,200,200,0.2);display: inline-block;pointer-events: auto;}.ace_fold-widget.ace_invalid {background-color: #FFB4B4;border-color: #DE5555;}.ace_fade-fold-widgets .ace_fold-widget {transition: opacity 0.4s ease 0.05s;opacity: 0;}.ace_fade-fold-widgets:hover .ace_fold-widget {transition: opacity 0.05s ease 0.05s;opacity:1;}.ace_underline {text-decoration: underline;}.ace_bold {font-weight: bold;}.ace_nobold .ace_bold {font-weight: normal;}.ace_italic {font-style: italic;}.ace_error-marker {background-color: rgba(255, 0, 0,0.2);position: absolute;z-index: 9;}.ace_highlight-marker {background-color: rgba(255, 255, 0,0.2);position: absolute;z-index: 8;}',m=e("./lib/useragent"),v=m.isIE;r.importCssString(g,"ace_editor.css");var $=function(e,t){var n=this;this.container=e||r.createElement("div"),r.addCssClass(this.container,"ace_editor"),r.HI_DPI&&r.addCssClass(this.container,"ace_hidpi"),this.setTheme(t),this.$gutter=r.createElement("div"),this.$gutter.className="ace_gutter",this.container.appendChild(this.$gutter),this.$gutter.setAttribute("aria-hidden",!0),this.scroller=r.createElement("div"),this.scroller.className="ace_scroller",this.container.appendChild(this.scroller),this.content=r.createElement("div"),this.content.className="ace_content",this.scroller.appendChild(this.content),this.$gutterLayer=new o(this.$gutter),this.$gutterLayer.on("changeGutterWidth",this.onGutterResize.bind(this)),this.$markerBack=new a(this.content);var i=this.$textLayer=new l(this.content);this.canvas=i.element,this.$markerFront=new a(this.content),this.$cursorLayer=new c(this.content),this.$horizScroll=!1,this.$vScroll=!1,this.scrollBar=this.scrollBarV=new h(this.container,this),this.scrollBarH=new u(this.container,this),this.scrollBarV.addEventListener("scroll",(function(e){n.$scrollAnimation||n.session.setScrollTop(e.data-n.scrollMargin.top)})),this.scrollBarH.addEventListener("scroll",(function(e){n.$scrollAnimation||n.session.setScrollLeft(e.data-n.scrollMargin.left)})),this.scrollTop=0,this.scrollLeft=0,this.cursorPos={row:0,column:0},this.$fontMetrics=new f(this.container),this.$textLayer.$setFontMetrics(this.$fontMetrics),this.$textLayer.addEventListener("changeCharacterSize",(function(e){n.updateCharacterSize(),n.onResize(!0,n.gutterWidth,n.$size.width,n.$size.height),n._signal("changeCharacterSize",e)})),this.$size={width:0,height:0,scrollerHeight:0,scrollerWidth:0,$dirty:!0},this.layerConfig={width:1,padding:0,firstRow:0,firstRowScreen:0,lastRow:0,lineHeight:0,characterWidth:0,minHeight:1,maxHeight:1,offset:0,height:1,gutterOffset:1},this.scrollMargin={left:0,right:0,top:0,bottom:0,v:0,h:0},this.margin={left:0,right:0,top:0,bottom:0,v:0,h:0},this.$keepTextAreaAtCursor=!m.isIOS,this.$loop=new d(this.$renderChanges.bind(this),this.container.ownerDocument.defaultView),this.$loop.schedule(this.CHANGE_FULL),this.updateCharacterSize(),this.setPadding(4),s.resetOptions(this),s._emit("renderer",this)};(function(){this.CHANGE_CURSOR=1,this.CHANGE_MARKER=2,this.CHANGE_GUTTER=4,this.CHANGE_SCROLL=8,this.CHANGE_LINES=16,this.CHANGE_TEXT=32,this.CHANGE_SIZE=64,this.CHANGE_MARKER_BACK=128,this.CHANGE_MARKER_FRONT=256,this.CHANGE_FULL=512,this.CHANGE_H_SCROLL=1024,i.implement(this,p),this.updateCharacterSize=function(){this.$textLayer.allowBoldFonts!=this.$allowBoldFonts&&(this.$allowBoldFonts=this.$textLayer.allowBoldFonts,this.setStyle("ace_nobold",!this.$allowBoldFonts)),this.layerConfig.characterWidth=this.characterWidth=this.$textLayer.getCharacterWidth(),this.layerConfig.lineHeight=this.lineHeight=this.$textLayer.getLineHeight(),this.$updatePrintMargin()},this.setSession=function(e){this.session&&this.session.doc.off("changeNewLineMode",this.onChangeNewLineMode),this.session=e,e&&this.scrollMargin.top&&e.getScrollTop()<=0&&e.setScrollTop(-this.scrollMargin.top),this.$cursorLayer.setSession(e),this.$markerBack.setSession(e),this.$markerFront.setSession(e),this.$gutterLayer.setSession(e),this.$textLayer.setSession(e),e&&(this.$loop.schedule(this.CHANGE_FULL),this.session.$setFontMetrics(this.$fontMetrics),this.scrollBarH.scrollLeft=this.scrollBarV.scrollTop=null,this.onChangeNewLineMode=this.onChangeNewLineMode.bind(this),this.onChangeNewLineMode(),this.session.doc.on("changeNewLineMode",this.onChangeNewLineMode))},this.updateLines=function(e,t,n){if(void 0===t&&(t=1/0),this.$changedLines?(this.$changedLines.firstRow>e&&(this.$changedLines.firstRow=e),this.$changedLines.lastRow<t&&(this.$changedLines.lastRow=t)):this.$changedLines={firstRow:e,lastRow:t},this.$changedLines.lastRow<this.layerConfig.firstRow){if(!n)return;this.$changedLines.lastRow=this.layerConfig.lastRow}this.$changedLines.firstRow>this.layerConfig.lastRow||this.$loop.schedule(this.CHANGE_LINES)},this.onChangeNewLineMode=function(){this.$loop.schedule(this.CHANGE_TEXT),this.$textLayer.$updateEolChar(),this.session.$bidiHandler.setEolChar(this.$textLayer.EOL_CHAR)},this.onChangeTabSize=function(){this.$loop.schedule(this.CHANGE_TEXT|this.CHANGE_MARKER),this.$textLayer.onChangeTabSize()},this.updateText=function(){this.$loop.schedule(this.CHANGE_TEXT)},this.updateFull=function(e){e?this.$renderChanges(this.CHANGE_FULL,!0):this.$loop.schedule(this.CHANGE_FULL)},this.updateFontSize=function(){this.$textLayer.checkForSizeChanges()},this.$changes=0,this.$updateSizeAsync=function(){this.$loop.pending?this.$size.$dirty=!0:this.onResize()},this.onResize=function(e,t,n,i){if(!(this.resizing>2)){this.resizing>0?this.resizing++:this.resizing=e?1:0;var r=this.container;i||(i=r.clientHeight||r.scrollHeight),n||(n=r.clientWidth||r.scrollWidth);var s=this.$updateCachedSize(e,t,n,i);if(!this.$size.scrollerHeight||!n&&!i)return this.resizing=0;e&&(this.$gutterLayer.$padding=null),e?this.$renderChanges(s|this.$changes,!0):this.$loop.schedule(s|this.$changes),this.resizing&&(this.resizing=0),this.scrollBarV.scrollLeft=this.scrollBarV.scrollTop=null}},this.$updateCachedSize=function(e,t,n,i){i-=this.$extraHeight||0;var s=0,o=this.$size,a={width:o.width,height:o.height,scrollerHeight:o.scrollerHeight,scrollerWidth:o.scrollerWidth};if(i&&(e||o.height!=i)&&(o.height=i,s|=this.CHANGE_SIZE,o.scrollerHeight=o.height,this.$horizScroll&&(o.scrollerHeight-=this.scrollBarH.getHeight()),this.scrollBarV.element.style.bottom=this.scrollBarH.getHeight()+"px",s|=this.CHANGE_SCROLL),n&&(e||o.width!=n)){s|=this.CHANGE_SIZE,o.width=n,null==t&&(t=this.$showGutter?this.$gutter.offsetWidth:0),this.gutterWidth=t,r.setStyle(this.scrollBarH.element.style,"left",t+"px"),r.setStyle(this.scroller.style,"left",t+this.margin.left+"px"),o.scrollerWidth=Math.max(0,n-t-this.scrollBarV.getWidth()-this.margin.h),r.setStyle(this.$gutter.style,"left",this.margin.left+"px");var l=this.scrollBarV.getWidth()+"px";r.setStyle(this.scrollBarH.element.style,"right",l),r.setStyle(this.scroller.style,"right",l),r.setStyle(this.scroller.style,"bottom",this.scrollBarH.getHeight()),(this.session&&this.session.getUseWrapMode()&&this.adjustWrapLimit()||e)&&(s|=this.CHANGE_FULL)}return o.$dirty=!n||!i,s&&this._signal("resize",a),s},this.onGutterResize=function(e){var t=this.$showGutter?e:0;t!=this.gutterWidth&&(this.$changes|=this.$updateCachedSize(!0,t,this.$size.width,this.$size.height)),this.session.getUseWrapMode()&&this.adjustWrapLimit()||this.$size.$dirty?this.$loop.schedule(this.CHANGE_FULL):this.$computeLayerConfig()},this.adjustWrapLimit=function(){var e=this.$size.scrollerWidth-2*this.$padding,t=Math.floor(e/this.characterWidth);return this.session.adjustWrapLimit(t,this.$showPrintMargin&&this.$printMarginColumn)},this.setAnimatedScroll=function(e){this.setOption("animatedScroll",e)},this.getAnimatedScroll=function(){return this.$animatedScroll},this.setShowInvisibles=function(e){this.setOption("showInvisibles",e),this.session.$bidiHandler.setShowInvisibles(e)},this.getShowInvisibles=function(){return this.getOption("showInvisibles")},this.getDisplayIndentGuides=function(){return this.getOption("displayIndentGuides")},this.setDisplayIndentGuides=function(e){this.setOption("displayIndentGuides",e)},this.setShowPrintMargin=function(e){this.setOption("showPrintMargin",e)},this.getShowPrintMargin=function(){return this.getOption("showPrintMargin")},this.setPrintMarginColumn=function(e){this.setOption("printMarginColumn",e)},this.getPrintMarginColumn=function(){return this.getOption("printMarginColumn")},this.getShowGutter=function(){return this.getOption("showGutter")},this.setShowGutter=function(e){return this.setOption("showGutter",e)},this.getFadeFoldWidgets=function(){return this.getOption("fadeFoldWidgets")},this.setFadeFoldWidgets=function(e){this.setOption("fadeFoldWidgets",e)},this.setHighlightGutterLine=function(e){this.setOption("highlightGutterLine",e)},this.getHighlightGutterLine=function(){return this.getOption("highlightGutterLine")},this.$updatePrintMargin=function(){if(this.$showPrintMargin||this.$printMarginEl){if(!this.$printMarginEl){var e=r.createElement("div");e.className="ace_layer ace_print-margin-layer",this.$printMarginEl=r.createElement("div"),this.$printMarginEl.className="ace_print-margin",e.appendChild(this.$printMarginEl),this.content.insertBefore(e,this.content.firstChild)}var t=this.$printMarginEl.style;t.left=Math.round(this.characterWidth*this.$printMarginColumn+this.$padding)+"px",t.visibility=this.$showPrintMargin?"visible":"hidden",this.session&&-1==this.session.$wrap&&this.adjustWrapLimit()}},this.getContainerElement=function(){return this.container},this.getMouseEventTarget=function(){return this.scroller},this.getTextAreaContainer=function(){return this.container},this.$moveTextAreaToCursor=function(){var e=this.textarea.style;if(this.$keepTextAreaAtCursor){var t=this.$cursorLayer.$pixelPos;if(t){var n=this.$composition;n&&n.markerRange&&(t=this.$cursorLayer.getPixelPosition(n.markerRange.start,!0));var i=this.layerConfig,s=t.top,o=t.left;s-=i.offset;var a=n&&n.useTextareaForIME?this.lineHeight:v?0:1;if(s<0||s>i.height-a)r.translate(this.textarea,0,0);else{var l=1;if(n)if(n.useTextareaForIME){var c=this.textarea.value;l=this.characterWidth*this.session.$getStringScreenWidth(c)[0],a+=2}else s+=this.lineHeight+2;else s+=this.lineHeight;(o-=this.scrollLeft)>this.$size.scrollerWidth-l&&(o=this.$size.scrollerWidth-l),o+=this.gutterWidth+this.margin.left,r.setStyle(e,"height",a+"px"),r.setStyle(e,"width",l+"px"),r.translate(this.textarea,Math.min(o,this.$size.scrollerWidth-l),Math.min(s,this.$size.height-a))}}}else r.translate(this.textarea,-100,0)},this.getFirstVisibleRow=function(){return this.layerConfig.firstRow},this.getFirstFullyVisibleRow=function(){return this.layerConfig.firstRow+(0===this.layerConfig.offset?0:1)},this.getLastFullyVisibleRow=function(){var e=this.layerConfig,t=e.lastRow;return this.session.documentToScreenRow(t,0)*e.lineHeight-this.session.getScrollTop()>e.height-e.lineHeight?t-1:t},this.getLastVisibleRow=function(){return this.layerConfig.lastRow},this.$padding=null,this.setPadding=function(e){this.$padding=e,this.$textLayer.setPadding(e),this.$cursorLayer.setPadding(e),this.$markerFront.setPadding(e),this.$markerBack.setPadding(e),this.$loop.schedule(this.CHANGE_FULL),this.$updatePrintMargin()},this.setScrollMargin=function(e,t,n,i){var r=this.scrollMargin;r.top=0|e,r.bottom=0|t,r.right=0|i,r.left=0|n,r.v=r.top+r.bottom,r.h=r.left+r.right,r.top&&this.scrollTop<=0&&this.session&&this.session.setScrollTop(-r.top),this.updateFull()},this.setMargin=function(e,t,n,i){var r=this.margin;r.top=0|e,r.bottom=0|t,r.right=0|i,r.left=0|n,r.v=r.top+r.bottom,r.h=r.left+r.right,this.$updateCachedSize(!0,this.gutterWidth,this.$size.width,this.$size.height),this.updateFull()},this.getHScrollBarAlwaysVisible=function(){return this.$hScrollBarAlwaysVisible},this.setHScrollBarAlwaysVisible=function(e){this.setOption("hScrollBarAlwaysVisible",e)},this.getVScrollBarAlwaysVisible=function(){return this.$vScrollBarAlwaysVisible},this.setVScrollBarAlwaysVisible=function(e){this.setOption("vScrollBarAlwaysVisible",e)},this.$updateScrollBarV=function(){var e=this.layerConfig.maxHeight,t=this.$size.scrollerHeight;!this.$maxLines&&this.$scrollPastEnd&&(e-=(t-this.lineHeight)*this.$scrollPastEnd,this.scrollTop>e-t&&(e=this.scrollTop+t,this.scrollBarV.scrollTop=null)),this.scrollBarV.setScrollHeight(e+this.scrollMargin.v),this.scrollBarV.setScrollTop(this.scrollTop+this.scrollMargin.top)},this.$updateScrollBarH=function(){this.scrollBarH.setScrollWidth(this.layerConfig.width+2*this.$padding+this.scrollMargin.h),this.scrollBarH.setScrollLeft(this.scrollLeft+this.scrollMargin.left)},this.$frozen=!1,this.freeze=function(){this.$frozen=!0},this.unfreeze=function(){this.$frozen=!1},this.$renderChanges=function(e,t){if(this.$changes&&(e|=this.$changes,this.$changes=0),this.session&&this.container.offsetWidth&&!this.$frozen&&(e||t)){if(this.$size.$dirty)return this.$changes|=e,this.onResize(!0);this.lineHeight||this.$textLayer.checkForSizeChanges(),this._signal("beforeRender"),this.session&&this.session.$bidiHandler&&this.session.$bidiHandler.updateCharacterWidths(this.$fontMetrics);var n=this.layerConfig;if(e&this.CHANGE_FULL||e&this.CHANGE_SIZE||e&this.CHANGE_TEXT||e&this.CHANGE_LINES||e&this.CHANGE_SCROLL||e&this.CHANGE_H_SCROLL){if(e|=this.$computeLayerConfig()|this.$loop.clear(),n.firstRow!=this.layerConfig.firstRow&&n.firstRowScreen==this.layerConfig.firstRowScreen){var i=this.scrollTop+(n.firstRow-this.layerConfig.firstRow)*this.lineHeight;i>0&&(this.scrollTop=i,e|=this.CHANGE_SCROLL,e|=this.$computeLayerConfig()|this.$loop.clear())}n=this.layerConfig,this.$updateScrollBarV(),e&this.CHANGE_H_SCROLL&&this.$updateScrollBarH(),r.translate(this.content,-this.scrollLeft,-n.offset);var s=n.width+2*this.$padding+"px",o=n.minHeight+"px";r.setStyle(this.content.style,"width",s),r.setStyle(this.content.style,"height",o)}return e&this.CHANGE_H_SCROLL&&(r.translate(this.content,-this.scrollLeft,-n.offset),this.scroller.className=this.scrollLeft<=0?"ace_scroller":"ace_scroller ace_scroll-left"),e&this.CHANGE_FULL?(this.$textLayer.update(n),this.$showGutter&&this.$gutterLayer.update(n),this.$markerBack.update(n),this.$markerFront.update(n),this.$cursorLayer.update(n),this.$moveTextAreaToCursor(),void this._signal("afterRender")):e&this.CHANGE_SCROLL?(e&this.CHANGE_TEXT||e&this.CHANGE_LINES?this.$textLayer.update(n):this.$textLayer.scrollLines(n),this.$showGutter&&(e&this.CHANGE_GUTTER||e&this.CHANGE_LINES?this.$gutterLayer.update(n):this.$gutterLayer.scrollLines(n)),this.$markerBack.update(n),this.$markerFront.update(n),this.$cursorLayer.update(n),this.$moveTextAreaToCursor(),void this._signal("afterRender")):(e&this.CHANGE_TEXT?(this.$textLayer.update(n),this.$showGutter&&this.$gutterLayer.update(n)):e&this.CHANGE_LINES?(this.$updateLines()||e&this.CHANGE_GUTTER&&this.$showGutter)&&this.$gutterLayer.update(n):e&this.CHANGE_TEXT||e&this.CHANGE_GUTTER?this.$showGutter&&this.$gutterLayer.update(n):e&this.CHANGE_CURSOR&&this.$highlightGutterLine&&this.$gutterLayer.updateLineHighlight(n),e&this.CHANGE_CURSOR&&(this.$cursorLayer.update(n),this.$moveTextAreaToCursor()),e&(this.CHANGE_MARKER|this.CHANGE_MARKER_FRONT)&&this.$markerFront.update(n),e&(this.CHANGE_MARKER|this.CHANGE_MARKER_BACK)&&this.$markerBack.update(n),void this._signal("afterRender"))}this.$changes|=e},this.$autosize=function(){var e=this.session.getScreenLength()*this.lineHeight,t=this.$maxLines*this.lineHeight,n=Math.min(t,Math.max((this.$minLines||1)*this.lineHeight,e))+this.scrollMargin.v+(this.$extraHeight||0);this.$horizScroll&&(n+=this.scrollBarH.getHeight()),this.$maxPixelHeight&&n>this.$maxPixelHeight&&(n=this.$maxPixelHeight);var i=!(n<=2*this.lineHeight)&&e>t;if(n!=this.desiredHeight||this.$size.height!=this.desiredHeight||i!=this.$vScroll){i!=this.$vScroll&&(this.$vScroll=i,this.scrollBarV.setVisible(i));var r=this.container.clientWidth;this.container.style.height=n+"px",this.$updateCachedSize(!0,this.$gutterWidth,r,n),this.desiredHeight=n,this._signal("autosize")}},this.$computeLayerConfig=function(){var e=this.session,t=this.$size,n=t.height<=2*this.lineHeight,i=this.session.getScreenLength()*this.lineHeight,r=this.$getLongestLine(),s=!n&&(this.$hScrollBarAlwaysVisible||t.scrollerWidth-r-2*this.$padding<0),o=this.$horizScroll!==s;o&&(this.$horizScroll=s,this.scrollBarH.setVisible(s));var a=this.$vScroll;this.$maxLines&&this.lineHeight>1&&this.$autosize();var l=t.scrollerHeight+this.lineHeight,c=!this.$maxLines&&this.$scrollPastEnd?(t.scrollerHeight-this.lineHeight)*this.$scrollPastEnd:0;i+=c;var u=this.scrollMargin;this.session.setScrollTop(Math.max(-u.top,Math.min(this.scrollTop,i-t.scrollerHeight+u.bottom))),this.session.setScrollLeft(Math.max(-u.left,Math.min(this.scrollLeft,r+2*this.$padding-t.scrollerWidth+u.right)));var h=!n&&(this.$vScrollBarAlwaysVisible||t.scrollerHeight-i+c<0||this.scrollTop>u.top),d=a!==h;d&&(this.$vScroll=h,this.scrollBarV.setVisible(h));var f,p,g=this.scrollTop%this.lineHeight,m=Math.ceil(l/this.lineHeight)-1,v=Math.max(0,Math.round((this.scrollTop-g)/this.lineHeight)),$=v+m,b=this.lineHeight;v=e.screenToDocumentRow(v,0);var w=e.getFoldLine(v);w&&(v=w.start.row),f=e.documentToScreenRow(v,0),p=e.getRowLength(v)*b,$=Math.min(e.screenToDocumentRow($,0),e.getLength()-1),l=t.scrollerHeight+e.getRowLength($)*b+p,g=this.scrollTop-f*b;var y=0;return(this.layerConfig.width!=r||o)&&(y=this.CHANGE_H_SCROLL),(o||d)&&(y=this.$updateCachedSize(!0,this.gutterWidth,t.width,t.height),this._signal("scrollbarVisibilityChanged"),d&&(r=this.$getLongestLine())),this.layerConfig={width:r,padding:this.$padding,firstRow:v,firstRowScreen:f,lastRow:$,lineHeight:b,characterWidth:this.characterWidth,minHeight:l,maxHeight:i,offset:g,gutterOffset:b?Math.max(0,Math.ceil((g+t.height-t.scrollerHeight)/b)):0,height:this.$size.scrollerHeight},this.session.$bidiHandler&&this.session.$bidiHandler.setContentWidth(r-this.$padding),y},this.$updateLines=function(){if(this.$changedLines){var e=this.$changedLines.firstRow,t=this.$changedLines.lastRow;this.$changedLines=null;var n=this.layerConfig;if(!(e>n.lastRow+1||t<n.firstRow))return t===1/0?(this.$showGutter&&this.$gutterLayer.update(n),void this.$textLayer.update(n)):(this.$textLayer.updateLines(n,e,t),!0)}},this.$getLongestLine=function(){var e=this.session.getScreenWidth();return this.showInvisibles&&!this.session.$useWrapMode&&(e+=1),this.$textLayer&&e>this.$textLayer.MAX_LINE_LENGTH&&(e=this.$textLayer.MAX_LINE_LENGTH+30),Math.max(this.$size.scrollerWidth-2*this.$padding,Math.round(e*this.characterWidth))},this.updateFrontMarkers=function(){this.$markerFront.setMarkers(this.session.getMarkers(!0)),this.$loop.schedule(this.CHANGE_MARKER_FRONT)},this.updateBackMarkers=function(){this.$markerBack.setMarkers(this.session.getMarkers()),this.$loop.schedule(this.CHANGE_MARKER_BACK)},this.addGutterDecoration=function(e,t){this.$gutterLayer.addGutterDecoration(e,t)},this.removeGutterDecoration=function(e,t){this.$gutterLayer.removeGutterDecoration(e,t)},this.updateBreakpoints=function(e){this.$loop.schedule(this.CHANGE_GUTTER)},this.setAnnotations=function(e){this.$gutterLayer.setAnnotations(e),this.$loop.schedule(this.CHANGE_GUTTER)},this.updateCursor=function(){this.$loop.schedule(this.CHANGE_CURSOR)},this.hideCursor=function(){this.$cursorLayer.hideCursor()},this.showCursor=function(){this.$cursorLayer.showCursor()},this.scrollSelectionIntoView=function(e,t,n){this.scrollCursorIntoView(e,n),this.scrollCursorIntoView(t,n)},this.scrollCursorIntoView=function(e,t,n){if(0!==this.$size.scrollerHeight){var i=this.$cursorLayer.getPixelPosition(e),r=i.left,s=i.top,o=n&&n.top||0,a=n&&n.bottom||0,l=this.$scrollAnimation?this.session.getScrollTop():this.scrollTop;l+o>s?(t&&l+o>s+this.lineHeight&&(s-=t*this.$size.scrollerHeight),0===s&&(s=-this.scrollMargin.top),this.session.setScrollTop(s)):l+this.$size.scrollerHeight-a<s+this.lineHeight&&(t&&l+this.$size.scrollerHeight-a<s-this.lineHeight&&(s+=t*this.$size.scrollerHeight),this.session.setScrollTop(s+this.lineHeight+a-this.$size.scrollerHeight));var c=this.scrollLeft;c>r?(r<this.$padding+2*this.layerConfig.characterWidth&&(r=-this.scrollMargin.left),this.session.setScrollLeft(r)):c+this.$size.scrollerWidth<r+this.characterWidth?this.session.setScrollLeft(Math.round(r+this.characterWidth-this.$size.scrollerWidth)):c<=this.$padding&&r-c<this.characterWidth&&this.session.setScrollLeft(0)}},this.getScrollTop=function(){return this.session.getScrollTop()},this.getScrollLeft=function(){return this.session.getScrollLeft()},this.getScrollTopRow=function(){return this.scrollTop/this.lineHeight},this.getScrollBottomRow=function(){return Math.max(0,Math.floor((this.scrollTop+this.$size.scrollerHeight)/this.lineHeight)-1)},this.scrollToRow=function(e){this.session.setScrollTop(e*this.lineHeight)},this.alignCursor=function(e,t){"number"==typeof e&&(e={row:e,column:0});var n=this.$cursorLayer.getPixelPosition(e),i=this.$size.scrollerHeight-this.lineHeight,r=n.top-i*(t||0);return this.session.setScrollTop(r),r},this.STEPS=8,this.$calcSteps=function(e,t){var n=0,i=this.STEPS,r=[],s=function(e,t,n){return n*(Math.pow(e-1,3)+1)+t};for(n=0;n<i;++n)r.push(s(n/this.STEPS,e,t-e));return r},this.scrollToLine=function(e,t,n,i){var r=this.$cursorLayer.getPixelPosition({row:e,column:0}).top;t&&(r-=this.$size.scrollerHeight/2);var s=this.scrollTop;this.session.setScrollTop(r),!1!==n&&this.animateScrolling(s,i)},this.animateScrolling=function(e,t){var n=this.scrollTop;if(this.$animatedScroll){var i=this;if(e!=n){if(this.$scrollAnimation){var r=this.$scrollAnimation.steps;if(r.length&&(e=r[0])==n)return}var s=i.$calcSteps(e,n);this.$scrollAnimation={from:e,to:n,steps:s},clearInterval(this.$timer),i.session.setScrollTop(s.shift()),i.session.$scrollTop=n,this.$timer=setInterval((function(){s.length?(i.session.setScrollTop(s.shift()),i.session.$scrollTop=n):null!=n?(i.session.$scrollTop=-1,i.session.setScrollTop(n),n=null):(i.$timer=clearInterval(i.$timer),i.$scrollAnimation=null,t&&t())}),10)}}},this.scrollToY=function(e){this.scrollTop!==e&&(this.$loop.schedule(this.CHANGE_SCROLL),this.scrollTop=e)},this.scrollToX=function(e){this.scrollLeft!==e&&(this.scrollLeft=e),this.$loop.schedule(this.CHANGE_H_SCROLL)},this.scrollTo=function(e,t){this.session.setScrollTop(t),this.session.setScrollLeft(t)},this.scrollBy=function(e,t){t&&this.session.setScrollTop(this.session.getScrollTop()+t),e&&this.session.setScrollLeft(this.session.getScrollLeft()+e)},this.isScrollableBy=function(e,t){return t<0&&this.session.getScrollTop()>=1-this.scrollMargin.top||(t>0&&this.session.getScrollTop()+this.$size.scrollerHeight-this.layerConfig.maxHeight<-1+this.scrollMargin.bottom||(e<0&&this.session.getScrollLeft()>=1-this.scrollMargin.left||(e>0&&this.session.getScrollLeft()+this.$size.scrollerWidth-this.layerConfig.width<-1+this.scrollMargin.right||void 0)))},this.pixelToScreenCoordinates=function(e,t){var n;if(this.$hasCssTransforms){n={top:0,left:0};var i=this.$fontMetrics.transformCoordinates([e,t]);e=i[1]-this.gutterWidth-this.margin.left,t=i[0]}else n=this.scroller.getBoundingClientRect();var r=e+this.scrollLeft-n.left-this.$padding,s=r/this.characterWidth,o=Math.floor((t+this.scrollTop-n.top)/this.lineHeight),a=this.$blockCursor?Math.floor(s):Math.round(s);return{row:o,column:a,side:s-a>0?1:-1,offsetX:r}},this.screenToTextCoordinates=function(e,t){var n;if(this.$hasCssTransforms){n={top:0,left:0};var i=this.$fontMetrics.transformCoordinates([e,t]);e=i[1]-this.gutterWidth-this.margin.left,t=i[0]}else n=this.scroller.getBoundingClientRect();var r=e+this.scrollLeft-n.left-this.$padding,s=r/this.characterWidth,o=this.$blockCursor?Math.floor(s):Math.round(s),a=Math.floor((t+this.scrollTop-n.top)/this.lineHeight);return this.session.screenToDocumentPosition(a,Math.max(o,0),r)},this.textToScreenCoordinates=function(e,t){var n=this.scroller.getBoundingClientRect(),i=this.session.documentToScreenPosition(e,t),r=this.$padding+(this.session.$bidiHandler.isBidiRow(i.row,e)?this.session.$bidiHandler.getPosLeft(i.column):Math.round(i.column*this.characterWidth)),s=i.row*this.lineHeight;return{pageX:n.left+r-this.scrollLeft,pageY:n.top+s-this.scrollTop}},this.visualizeFocus=function(){r.addCssClass(this.container,"ace_focus")},this.visualizeBlur=function(){r.removeCssClass(this.container,"ace_focus")},this.showComposition=function(e){this.$composition=e,e.cssText||(e.cssText=this.textarea.style.cssText,e.keepTextAreaAtCursor=this.$keepTextAreaAtCursor),e.useTextareaForIME=this.$useTextareaForIME,this.$useTextareaForIME?(this.$keepTextAreaAtCursor=!0,r.addCssClass(this.textarea,"ace_composition"),this.textarea.style.cssText="",this.$moveTextAreaToCursor(),this.$cursorLayer.element.style.display="none"):e.markerId=this.session.addMarker(e.markerRange,"ace_composition_marker","text")},this.setCompositionText=function(e){var t=this.session.selection.cursor;this.addToken(e,"composition_placeholder",t.row,t.column),this.$moveTextAreaToCursor()},this.hideComposition=function(){this.$composition&&(this.$composition.markerId&&this.session.removeMarker(this.$composition.markerId),r.removeCssClass(this.textarea,"ace_composition"),this.$keepTextAreaAtCursor=this.$composition.keepTextAreaAtCursor,this.textarea.style.cssText=this.$composition.cssText,this.$composition=null,this.$cursorLayer.element.style.display="")},this.addToken=function(e,t,n,i){var r=this.session;r.bgTokenizer.lines[n]=null;var s={type:t,value:e},o=r.getTokens(n);if(null==i)o.push(s);else for(var a=0,l=0;l<o.length;l++){var c=o[l];if(i<=(a+=c.value.length)){var u=c.value.length-(a-i),h=c.value.slice(0,u),d=c.value.slice(u);o.splice(l,1,{type:c.type,value:h},s,{type:c.type,value:d});break}}this.updateLines(n,n)},this.setTheme=function(e,t){function n(n){if(i.$themeId!=e)return t&&t();if(!n||!n.cssClass)throw new Error("couldn't load module "+e+" or it didn't call define");n.$id&&(i.$themeId=n.$id),r.importCssString(n.cssText,n.cssClass,i.container),i.theme&&r.removeCssClass(i.container,i.theme.cssClass);var s="padding"in n?n.padding:"padding"in(i.theme||{})?4:i.$padding;i.$padding&&s!=i.$padding&&i.setPadding(s),i.$theme=n.cssClass,i.theme=n,r.addCssClass(i.container,n.cssClass),r.setCssClass(i.container,"ace_dark",n.isDark),i.$size&&(i.$size.width=0,i.$updateSizeAsync()),i._dispatchEvent("themeLoaded",{theme:n}),t&&t()}var i=this;if(this.$themeId=e,i._dispatchEvent("themeChange",{theme:e}),e&&"string"!=typeof e)n(e);else{var o=e||this.$options.theme.initialValue;s.loadModule(["theme",o],n)}},this.getTheme=function(){return this.$themeId},this.setStyle=function(e,t){r.setCssClass(this.container,e,!1!==t)},this.unsetStyle=function(e){r.removeCssClass(this.container,e)},this.setCursorStyle=function(e){r.setStyle(this.scroller.style,"cursor",e)},this.setMouseCursor=function(e){r.setStyle(this.scroller.style,"cursor",e)},this.attachToShadowRoot=function(){r.importCssString(g,"ace_editor.css",this.container)},this.destroy=function(){this.$fontMetrics.destroy(),this.$cursorLayer.destroy()}}).call($.prototype),s.defineOptions($.prototype,"renderer",{animatedScroll:{initialValue:!1},showInvisibles:{set:function(e){this.$textLayer.setShowInvisibles(e)&&this.$loop.schedule(this.CHANGE_TEXT)},initialValue:!1},showPrintMargin:{set:function(){this.$updatePrintMargin()},initialValue:!0},printMarginColumn:{set:function(){this.$updatePrintMargin()},initialValue:80},printMargin:{set:function(e){"number"==typeof e&&(this.$printMarginColumn=e),this.$showPrintMargin=!!e,this.$updatePrintMargin()},get:function(){return this.$showPrintMargin&&this.$printMarginColumn}},showGutter:{set:function(e){this.$gutter.style.display=e?"block":"none",this.$loop.schedule(this.CHANGE_FULL),this.onGutterResize()},initialValue:!0},fadeFoldWidgets:{set:function(e){r.setCssClass(this.$gutter,"ace_fade-fold-widgets",e)},initialValue:!1},showFoldWidgets:{set:function(e){this.$gutterLayer.setShowFoldWidgets(e),this.$loop.schedule(this.CHANGE_GUTTER)},initialValue:!0},displayIndentGuides:{set:function(e){this.$textLayer.setDisplayIndentGuides(e)&&this.$loop.schedule(this.CHANGE_TEXT)},initialValue:!0},highlightGutterLine:{set:function(e){this.$gutterLayer.setHighlightGutterLine(e),this.$loop.schedule(this.CHANGE_GUTTER)},initialValue:!0},hScrollBarAlwaysVisible:{set:function(e){(!this.$hScrollBarAlwaysVisible||!this.$horizScroll)&&this.$loop.schedule(this.CHANGE_SCROLL)},initialValue:!1},vScrollBarAlwaysVisible:{set:function(e){(!this.$vScrollBarAlwaysVisible||!this.$vScroll)&&this.$loop.schedule(this.CHANGE_SCROLL)},initialValue:!1},fontSize:{set:function(e){"number"==typeof e&&(e+="px"),this.container.style.fontSize=e,this.updateFontSize()},initialValue:12},fontFamily:{set:function(e){this.container.style.fontFamily=e,this.updateFontSize()}},maxLines:{set:function(e){this.updateFull()}},minLines:{set:function(e){this.$minLines<562949953421311||(this.$minLines=0),this.updateFull()}},maxPixelHeight:{set:function(e){this.updateFull()},initialValue:0},scrollPastEnd:{set:function(e){e=+e||0,this.$scrollPastEnd!=e&&(this.$scrollPastEnd=e,this.$loop.schedule(this.CHANGE_SCROLL))},initialValue:0,handlesSet:!0},fixedWidthGutter:{set:function(e){this.$gutterLayer.$fixedWidth=!!e,this.$loop.schedule(this.CHANGE_GUTTER)}},theme:{set:function(e){this.setTheme(e)},get:function(){return this.$themeId||this.theme},initialValue:"./theme/textmate",handlesSet:!0},hasCssTransforms:{},useTextareaForIME:{initialValue:!m.isMobile&&!m.isIE}}),t.VirtualRenderer=$})),ace.define("ace/worker/worker_client",["require","exports","module","ace/lib/oop","ace/lib/net","ace/lib/event_emitter","ace/config"],(function(e,t,n){"use strict";function i(e){if("undefined"==typeof Worker)return{postMessage:function(){},terminate:function(){}};var t=function(e){var t="importScripts('"+s.qualifyURL(e)+"');";try{return new Blob([t],{type:"application/javascript"})}catch(e){var n=new(window.BlobBuilder||window.WebKitBlobBuilder||window.MozBlobBuilder);return n.append(t),n.getBlob("application/javascript")}}(e),n=(window.URL||window.webkitURL).createObjectURL(t);return new Worker(n)}var r=e("../lib/oop"),s=e("../lib/net"),o=e("../lib/event_emitter").EventEmitter,a=e("../config"),l=function(t,n,r,s,o){if(this.$sendDeltaQueue=this.$sendDeltaQueue.bind(this),this.changeListener=this.changeListener.bind(this),this.onMessage=this.onMessage.bind(this),e.nameToUrl&&!e.toUrl&&(e.toUrl=e.nameToUrl),a.get("packaged")||!e.toUrl)s=s||a.moduleUrl(n,"worker");else{var l=this.$normalizePath;s=s||l(e.toUrl("ace/worker/worker.js",null,"_"));var c={};t.forEach((function(t){c[t]=l(e.toUrl(t,null,"_").replace(/(\.js)?(\?.*)?$/,""))}))}this.$worker=i(s),o&&this.send("importScripts",o),this.$worker.postMessage({init:!0,tlns:c,module:n,classname:r}),this.callbackId=1,this.callbacks={},this.$worker.onmessage=this.onMessage};(function(){r.implement(this,o),this.onMessage=function(e){var t=e.data;switch(t.type){case"event":this._signal(t.name,{data:t.data});break;case"call":var n=this.callbacks[t.id];n&&(n(t.data),delete this.callbacks[t.id]);break;case"error":this.reportError(t.data);break;case"log":window.console&&console.log&&console.log.apply(console,t.data)}},this.reportError=function(e){window.console&&console.error&&console.error(e)},this.$normalizePath=function(e){return s.qualifyURL(e)},this.terminate=function(){this._signal("terminate",{}),this.deltaQueue=null,this.$worker.terminate(),this.$worker=null,this.$doc&&this.$doc.off("change",this.changeListener),this.$doc=null},this.send=function(e,t){this.$worker.postMessage({command:e,args:t})},this.call=function(e,t,n){if(n){var i=this.callbackId++;this.callbacks[i]=n,t.push(i)}this.send(e,t)},this.emit=function(e,t){try{t.data&&t.data.err&&(t.data.err={message:t.data.err.message,stack:t.data.err.stack,code:t.data.err.code}),this.$worker.postMessage({event:e,data:{data:t.data}})}catch(e){console.error(e.stack)}},this.attachToDocument=function(e){this.$doc&&this.terminate(),this.$doc=e,this.call("setValue",[e.getValue()]),e.on("change",this.changeListener)},this.changeListener=function(e){this.deltaQueue||(this.deltaQueue=[],setTimeout(this.$sendDeltaQueue,0)),"insert"==e.action?this.deltaQueue.push(e.start,e.lines):this.deltaQueue.push(e.start,e.end)},this.$sendDeltaQueue=function(){var e=this.deltaQueue;e&&(this.deltaQueue=null,e.length>50&&e.length>this.$doc.getLength()>>1?this.call("setValue",[this.$doc.getValue()]):this.emit("change",{data:e}))}}).call(l.prototype);var c=function(e,t,n){this.$sendDeltaQueue=this.$sendDeltaQueue.bind(this),this.changeListener=this.changeListener.bind(this),this.callbackId=1,this.callbacks={},this.messageBuffer=[];var i=null,r=!1,s=Object.create(o),l=this;this.$worker={},this.$worker.terminate=function(){},this.$worker.postMessage=function(e){l.messageBuffer.push(e),i&&(r?setTimeout(c):c())},this.setEmitSync=function(e){r=e};var c=function(){var e=l.messageBuffer.shift();e.command?i[e.command].apply(i,e.args):e.event&&s._signal(e.event,e.data)};s.postMessage=function(e){l.onMessage({data:e})},s.callback=function(e,t){this.postMessage({type:"call",id:t,data:e})},s.emit=function(e,t){this.postMessage({type:"event",name:e,data:t})},a.loadModule(["worker",t],(function(e){for(i=new e[n](s);l.messageBuffer.length;)c()}))};c.prototype=l.prototype,t.UIWorkerClient=c,t.WorkerClient=l,t.createWorker=i})),ace.define("ace/placeholder",["require","exports","module","ace/range","ace/lib/event_emitter","ace/lib/oop"],(function(e,t,n){"use strict";var i=e("./range").Range,r=e("./lib/event_emitter").EventEmitter,s=e("./lib/oop"),o=function(e,t,n,i,r,s){var o=this;this.length=t,this.session=e,this.doc=e.getDocument(),this.mainClass=r,this.othersClass=s,this.$onUpdate=this.onUpdate.bind(this),this.doc.on("change",this.$onUpdate),this.$others=i,this.$onCursorChange=function(){setTimeout((function(){o.onCursorChange()}))},this.$pos=n;var a=e.getUndoManager().$undoStack||e.getUndoManager().$undostack||{length:-1};this.$undoStackDepth=a.length,this.setup(),e.selection.on("changeCursor",this.$onCursorChange)};(function(){s.implement(this,r),this.setup=function(){var e=this,t=this.doc,n=this.session;this.selectionBefore=n.selection.toJSON(),n.selection.inMultiSelectMode&&n.selection.toSingleRange(),this.pos=t.createAnchor(this.$pos.row,this.$pos.column);var r=this.pos;r.$insertRight=!0,r.detach(),r.markerId=n.addMarker(new i(r.row,r.column,r.row,r.column+this.length),this.mainClass,null,!1),this.others=[],this.$others.forEach((function(n){var i=t.createAnchor(n.row,n.column);i.$insertRight=!0,i.detach(),e.others.push(i)})),n.setUndoSelect(!1)},this.showOtherMarkers=function(){if(!this.othersActive){var e=this.session,t=this;this.othersActive=!0,this.others.forEach((function(n){n.markerId=e.addMarker(new i(n.row,n.column,n.row,n.column+t.length),t.othersClass,null,!1)}))}},this.hideOtherMarkers=function(){if(this.othersActive){this.othersActive=!1;for(var e=0;e<this.others.length;e++)this.session.removeMarker(this.others[e].markerId)}},this.onUpdate=function(e){if(this.$updating)return this.updateAnchors(e);var t=e;if(t.start.row===t.end.row&&t.start.row===this.pos.row){this.$updating=!0;var n="insert"===e.action?t.end.column-t.start.column:t.start.column-t.end.column,r=t.start.column>=this.pos.column&&t.start.column<=this.pos.column+this.length+1,s=t.start.column-this.pos.column;if(this.updateAnchors(e),r&&(this.length+=n),r&&!this.session.$fromUndo)if("insert"===e.action)for(var o=this.others.length-1;o>=0;o--){var a={row:(l=this.others[o]).row,column:l.column+s};this.doc.insertMergedLines(a,e.lines)}else if("remove"===e.action)for(o=this.others.length-1;o>=0;o--){var l;a={row:(l=this.others[o]).row,column:l.column+s};this.doc.remove(new i(a.row,a.column,a.row,a.column-n))}this.$updating=!1,this.updateMarkers()}},this.updateAnchors=function(e){this.pos.onChange(e);for(var t=this.others.length;t--;)this.others[t].onChange(e);this.updateMarkers()},this.updateMarkers=function(){if(!this.$updating){var e=this,t=this.session,n=function(n,r){t.removeMarker(n.markerId),n.markerId=t.addMarker(new i(n.row,n.column,n.row,n.column+e.length),r,null,!1)};n(this.pos,this.mainClass);for(var r=this.others.length;r--;)n(this.others[r],this.othersClass)}},this.onCursorChange=function(e){if(!this.$updating&&this.session){var t=this.session.selection.getCursor();t.row===this.pos.row&&t.column>=this.pos.column&&t.column<=this.pos.column+this.length?(this.showOtherMarkers(),this._emit("cursorEnter",e)):(this.hideOtherMarkers(),this._emit("cursorLeave",e))}},this.detach=function(){this.session.removeMarker(this.pos&&this.pos.markerId),this.hideOtherMarkers(),this.doc.removeEventListener("change",this.$onUpdate),this.session.selection.removeEventListener("changeCursor",this.$onCursorChange),this.session.setUndoSelect(!0),this.session=null},this.cancel=function(){if(-1!==this.$undoStackDepth){for(var e=this.session.getUndoManager(),t=(e.$undoStack||e.$undostack).length-this.$undoStackDepth,n=0;n<t;n++)e.undo(this.session,!0);this.selectionBefore&&this.session.selection.fromJSON(this.selectionBefore)}}}).call(o.prototype),t.PlaceHolder=o})),ace.define("ace/mouse/multi_select_handler",["require","exports","module","ace/lib/event","ace/lib/useragent"],(function(e,t,n){function i(e,t){return e.row==t.row&&e.column==t.column}var r=e("../lib/event"),s=e("../lib/useragent");t.onMouseDown=function(e){var t=e.domEvent,n=t.altKey,o=t.shiftKey,a=t.ctrlKey,l=e.getAccelKey(),c=e.getButton();if(a&&s.isMac&&(c=t.button),e.editor.inMultiSelectMode&&2==c)e.editor.textInput.onContextMenu(e.domEvent);else if(a||n||l){if(0===c){var u,h=e.editor,d=h.selection,f=h.inMultiSelectMode,p=e.getDocumentPosition(),g=d.getCursor(),m=e.inSelection()||d.isEmpty()&&i(p,g),v=e.x,$=e.y,b=h.session,w=h.renderer.pixelToScreenCoordinates(v,$),y=w;if(h.$mouseHandler.$enableJumpToDef)a&&n||l&&n?u=o?"block":"add":n&&h.$blockSelectEnabled&&(u="block");else if(l&&!n){if(u="add",!f&&o)return}else n&&h.$blockSelectEnabled&&(u="block");if(u&&s.isMac&&t.ctrlKey&&h.$mouseHandler.cancelContextMenu(),"add"==u){if(!f&&m)return;if(!f){var S=d.toOrientedRange();h.addSelectionMarker(S)}var C=d.rangeList.rangeAtPoint(p);h.inVirtualSelectionMode=!0,o&&(C=null,S=d.ranges[0]||S,h.removeSelectionMarker(S)),h.once("mouseup",(function(){var e=d.toOrientedRange();C&&e.isEmpty()&&i(C.cursor,e.cursor)?d.substractPoint(e.cursor):(o?d.substractPoint(S.cursor):S&&(h.removeSelectionMarker(S),d.addRange(S)),d.addRange(e)),h.inVirtualSelectionMode=!1}))}else if("block"==u){e.stop(),h.inVirtualSelectionMode=!0;var x,k=[],A=function(){var e=h.renderer.pixelToScreenCoordinates(v,$),t=b.screenToDocumentPosition(e.row,e.column,e.offsetX);i(y,e)&&i(t,d.lead)||(y=e,h.selection.moveToPosition(t),h.renderer.scrollCursorIntoView(),h.removeSelectionMarkers(k),k=d.rectangularRangeBlock(y,w),h.$mouseHandler.$clickSelection&&1==k.length&&k[0].isEmpty()&&(k[0]=h.$mouseHandler.$clickSelection.clone()),k.forEach(h.addSelectionMarker,h),h.updateSelectionMarkers())};f&&!l?d.toSingleRange():!f&&l&&(x=d.toOrientedRange(),h.addSelectionMarker(x)),o?w=b.documentToScreenPosition(d.lead):d.moveToPosition(p),y={row:-1,column:-1};var E=A;r.capture(h.container,(function(e){v=e.clientX,$=e.clientY}),(function(e){A(),clearInterval(R),h.removeSelectionMarkers(k),k.length||(k=[d.toOrientedRange()]),x&&(h.removeSelectionMarker(x),d.toSingleRange(x));for(var t=0;t<k.length;t++)d.addRange(k[t]);h.inVirtualSelectionMode=!1,h.$mouseHandler.$clickSelection=null}));var R=setInterval((function(){E()}),20);return e.preventDefault()}}}else 0===c&&e.editor.inMultiSelectMode&&e.editor.exitMultiSelectMode()}})),ace.define("ace/commands/multi_select_commands",["require","exports","module","ace/keyboard/hash_handler"],(function(e,t,n){t.defaultCommands=[{name:"addCursorAbove",exec:function(e){e.selectMoreLines(-1)},bindKey:{win:"Ctrl-Alt-Up",mac:"Ctrl-Alt-Up"},scrollIntoView:"cursor",readOnly:!0},{name:"addCursorBelow",exec:function(e){e.selectMoreLines(1)},bindKey:{win:"Ctrl-Alt-Down",mac:"Ctrl-Alt-Down"},scrollIntoView:"cursor",readOnly:!0},{name:"addCursorAboveSkipCurrent",exec:function(e){e.selectMoreLines(-1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Up",mac:"Ctrl-Alt-Shift-Up"},scrollIntoView:"cursor",readOnly:!0},{name:"addCursorBelowSkipCurrent",exec:function(e){e.selectMoreLines(1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Down",mac:"Ctrl-Alt-Shift-Down"},scrollIntoView:"cursor",readOnly:!0},{name:"selectMoreBefore",exec:function(e){e.selectMore(-1)},bindKey:{win:"Ctrl-Alt-Left",mac:"Ctrl-Alt-Left"},scrollIntoView:"cursor",readOnly:!0},{name:"selectMoreAfter",exec:function(e){e.selectMore(1)},bindKey:{win:"Ctrl-Alt-Right",mac:"Ctrl-Alt-Right"},scrollIntoView:"cursor",readOnly:!0},{name:"selectNextBefore",exec:function(e){e.selectMore(-1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Left",mac:"Ctrl-Alt-Shift-Left"},scrollIntoView:"cursor",readOnly:!0},{name:"selectNextAfter",exec:function(e){e.selectMore(1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Right",mac:"Ctrl-Alt-Shift-Right"},scrollIntoView:"cursor",readOnly:!0},{name:"splitIntoLines",exec:function(e){e.multiSelect.splitIntoLines()},bindKey:{win:"Ctrl-Alt-L",mac:"Ctrl-Alt-L"},readOnly:!0},{name:"alignCursors",exec:function(e){e.alignCursors()},bindKey:{win:"Ctrl-Alt-A",mac:"Ctrl-Alt-A"},scrollIntoView:"cursor"},{name:"findAll",exec:function(e){e.findAll()},bindKey:{win:"Ctrl-Alt-K",mac:"Ctrl-Alt-G"},scrollIntoView:"cursor",readOnly:!0}],t.multiSelectCommands=[{name:"singleSelection",bindKey:"esc",exec:function(e){e.exitMultiSelectMode()},scrollIntoView:"cursor",readOnly:!0,isAvailable:function(e){return e&&e.inMultiSelectMode}}];var i=e("../keyboard/hash_handler").HashHandler;t.keyboardHandler=new i(t.multiSelectCommands)})),ace.define("ace/multi_select",["require","exports","module","ace/range_list","ace/range","ace/selection","ace/mouse/multi_select_handler","ace/lib/event","ace/lib/lang","ace/commands/multi_select_commands","ace/search","ace/edit_session","ace/editor","ace/config"],(function(e,t,n){function i(e,t){return e.row==t.row&&e.column==t.column}function r(e){e.$multiselectOnSessionChange||(e.$onAddRange=e.$onAddRange.bind(e),e.$onRemoveRange=e.$onRemoveRange.bind(e),e.$onMultiSelect=e.$onMultiSelect.bind(e),e.$onSingleSelect=e.$onSingleSelect.bind(e),e.$multiselectOnSessionChange=t.onSessionChange.bind(e),e.$checkMultiselectChange=e.$checkMultiselectChange.bind(e),e.$multiselectOnSessionChange(e),e.on("changeSession",e.$multiselectOnSessionChange),e.on("mousedown",l),e.commands.addCommands(h.defaultCommands),function(e){function t(t){i&&(e.renderer.setMouseCursor(""),i=!1)}var n=e.textInput.getElement(),i=!1;c.addListener(n,"keydown",(function(n){var r=18==n.keyCode&&!(n.ctrlKey||n.shiftKey||n.metaKey);e.$blockSelectEnabled&&r?i||(e.renderer.setMouseCursor("crosshair"),i=!0):i&&t()})),c.addListener(n,"keyup",t),c.addListener(n,"blur",t)}(e))}var s=e("./range_list").RangeList,o=e("./range").Range,a=e("./selection").Selection,l=e("./mouse/multi_select_handler").onMouseDown,c=e("./lib/event"),u=e("./lib/lang"),h=e("./commands/multi_select_commands");t.commands=h.defaultCommands.concat(h.multiSelectCommands);var d=new(0,e("./search").Search),f=e("./edit_session").EditSession;(function(){this.getSelectionMarkers=function(){return this.$selectionMarkers}}).call(f.prototype),function(){this.ranges=null,this.rangeList=null,this.addRange=function(e,t){if(e){if(!this.inMultiSelectMode&&0===this.rangeCount){var n=this.toOrientedRange();if(this.rangeList.add(n),this.rangeList.add(e),2!=this.rangeList.ranges.length)return this.rangeList.removeAll(),t||this.fromOrientedRange(e);this.rangeList.removeAll(),this.rangeList.add(n),this.$onAddRange(n)}e.cursor||(e.cursor=e.end);var i=this.rangeList.add(e);return this.$onAddRange(e),i.length&&this.$onRemoveRange(i),this.rangeCount>1&&!this.inMultiSelectMode&&(this._signal("multiSelect"),this.inMultiSelectMode=!0,this.session.$undoSelect=!1,this.rangeList.attach(this.session)),t||this.fromOrientedRange(e)}},this.toSingleRange=function(e){e=e||this.ranges[0];var t=this.rangeList.removeAll();t.length&&this.$onRemoveRange(t),e&&this.fromOrientedRange(e)},this.substractPoint=function(e){var t=this.rangeList.substractPoint(e);if(t)return this.$onRemoveRange(t),t[0]},this.mergeOverlappingRanges=function(){var e=this.rangeList.merge();e.length&&this.$onRemoveRange(e)},this.$onAddRange=function(e){this.rangeCount=this.rangeList.ranges.length,this.ranges.unshift(e),this._signal("addRange",{range:e})},this.$onRemoveRange=function(e){if(this.rangeCount=this.rangeList.ranges.length,1==this.rangeCount&&this.inMultiSelectMode){var t=this.rangeList.ranges.pop();e.push(t),this.rangeCount=0}for(var n=e.length;n--;){var i=this.ranges.indexOf(e[n]);this.ranges.splice(i,1)}this._signal("removeRange",{ranges:e}),0===this.rangeCount&&this.inMultiSelectMode&&(this.inMultiSelectMode=!1,this._signal("singleSelect"),this.session.$undoSelect=!0,this.rangeList.detach(this.session)),(t=t||this.ranges[0])&&!t.isEqual(this.getRange())&&this.fromOrientedRange(t)},this.$initRangeList=function(){this.rangeList||(this.rangeList=new s,this.ranges=[],this.rangeCount=0)},this.getAllRanges=function(){return this.rangeCount?this.rangeList.ranges.concat():[this.getRange()]},this.splitIntoLines=function(){if(this.rangeCount>1){var e=this.rangeList.ranges,t=e[e.length-1],n=o.fromPoints(e[0].start,t.end);this.toSingleRange(),this.setSelectionRange(n,t.cursor==t.start)}else{n=this.getRange();var i=this.isBackwards(),r=n.start.row,s=n.end.row;if(r==s){if(i)var a=n.end,l=n.start;else a=n.start,l=n.end;return this.addRange(o.fromPoints(l,l)),void this.addRange(o.fromPoints(a,a))}var c=[],u=this.getLineRange(r,!0);u.start.column=n.start.column,c.push(u);for(var h=r+1;h<s;h++)c.push(this.getLineRange(h,!0));(u=this.getLineRange(s,!0)).end.column=n.end.column,c.push(u),c.forEach(this.addRange,this)}},this.toggleBlockSelection=function(){if(this.rangeCount>1){var e=this.rangeList.ranges,t=e[e.length-1],n=o.fromPoints(e[0].start,t.end);this.toSingleRange(),this.setSelectionRange(n,t.cursor==t.start)}else{var i=this.session.documentToScreenPosition(this.cursor),r=this.session.documentToScreenPosition(this.anchor);this.rectangularRangeBlock(i,r).forEach(this.addRange,this)}},this.rectangularRangeBlock=function(e,t,n){var r=[],s=e.column<t.column;if(s)var a=e.column,l=t.column,c=e.offsetX,u=t.offsetX;else a=t.column,l=e.column,c=t.offsetX,u=e.offsetX;var h,d=e.row<t.row;if(d)var f=e.row,p=t.row;else f=t.row,p=e.row;a<0&&(a=0),f<0&&(f=0),f==p&&(n=!0);for(var g=f;g<=p;g++){var m=o.fromPoints(this.session.screenToDocumentPosition(g,a,c),this.session.screenToDocumentPosition(g,l,u));if(m.isEmpty()){if(h&&i(m.end,h))break;h=m.end}m.cursor=s?m.start:m.end,r.push(m)}if(d&&r.reverse(),!n){for(var v=r.length-1;r[v].isEmpty()&&v>0;)v--;if(v>0)for(var $=0;r[$].isEmpty();)$++;for(var b=v;b>=$;b--)r[b].isEmpty()&&r.splice(b,1)}return r}}.call(a.prototype);var p=e("./editor").Editor;(function(){this.updateSelectionMarkers=function(){this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.addSelectionMarker=function(e){e.cursor||(e.cursor=e.end);var t=this.getSelectionStyle();return e.marker=this.session.addMarker(e,"ace_selection",t),this.session.$selectionMarkers.push(e),this.session.selectionMarkerCount=this.session.$selectionMarkers.length,e},this.removeSelectionMarker=function(e){if(e.marker){this.session.removeMarker(e.marker);var t=this.session.$selectionMarkers.indexOf(e);-1!=t&&this.session.$selectionMarkers.splice(t,1),this.session.selectionMarkerCount=this.session.$selectionMarkers.length}},this.removeSelectionMarkers=function(e){for(var t=this.session.$selectionMarkers,n=e.length;n--;){var i=e[n];if(i.marker){this.session.removeMarker(i.marker);var r=t.indexOf(i);-1!=r&&t.splice(r,1)}}this.session.selectionMarkerCount=t.length},this.$onAddRange=function(e){this.addSelectionMarker(e.range),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onRemoveRange=function(e){this.removeSelectionMarkers(e.ranges),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onMultiSelect=function(e){this.inMultiSelectMode||(this.inMultiSelectMode=!0,this.setStyle("ace_multiselect"),this.keyBinding.addKeyboardHandler(h.keyboardHandler),this.commands.setDefaultHandler("exec",this.$onMultiSelectExec),this.renderer.updateCursor(),this.renderer.updateBackMarkers())},this.$onSingleSelect=function(e){this.session.multiSelect.inVirtualMode||(this.inMultiSelectMode=!1,this.unsetStyle("ace_multiselect"),this.keyBinding.removeKeyboardHandler(h.keyboardHandler),this.commands.removeDefaultHandler("exec",this.$onMultiSelectExec),this.renderer.updateCursor(),this.renderer.updateBackMarkers(),this._emit("changeSelection"))},this.$onMultiSelectExec=function(e){var t=e.command,n=e.editor;if(n.multiSelect){if(t.multiSelectAction)"forEach"==t.multiSelectAction?i=n.forEachSelection(t,e.args):"forEachLine"==t.multiSelectAction?i=n.forEachSelection(t,e.args,!0):"single"==t.multiSelectAction?(n.exitMultiSelectMode(),i=t.exec(n,e.args||{})):i=t.multiSelectAction(n,e.args||{});else{var i=t.exec(n,e.args||{});n.multiSelect.addRange(n.multiSelect.toOrientedRange()),n.multiSelect.mergeOverlappingRanges()}return i}},this.forEachSelection=function(e,t,n){if(!this.inVirtualSelectionMode){var i,r=n&&n.keepOrder,s=1==n||n&&n.$byLines,o=this.session,l=this.selection,c=l.rangeList,u=(r?l:c).ranges;if(!u.length)return e.exec?e.exec(this,t||{}):e(this,t||{});var h=l._eventRegistry;l._eventRegistry={};var d=new a(o);this.inVirtualSelectionMode=!0;for(var f=u.length;f--;){if(s)for(;f>0&&u[f].start.row==u[f-1].end.row;)f--;d.fromOrientedRange(u[f]),d.index=f,this.selection=o.selection=d;var p=e.exec?e.exec(this,t||{}):e(this,t||{});!i&&void 0!==p&&(i=p),d.toOrientedRange(u[f])}d.detach(),this.selection=o.selection=l,this.inVirtualSelectionMode=!1,l._eventRegistry=h,l.mergeOverlappingRanges(),l.ranges[0]&&l.fromOrientedRange(l.ranges[0]);var g=this.renderer.$scrollAnimation;return this.onCursorChange(),this.onSelectionChange(),g&&g.from==g.to&&this.renderer.animateScrolling(g.from),i}},this.exitMultiSelectMode=function(){this.inMultiSelectMode&&!this.inVirtualSelectionMode&&this.multiSelect.toSingleRange()},this.getSelectedText=function(){var e="";if(this.inMultiSelectMode&&!this.inVirtualSelectionMode){for(var t=this.multiSelect.rangeList.ranges,n=[],i=0;i<t.length;i++)n.push(this.session.getTextRange(t[i]));var r=this.session.getDocument().getNewLineCharacter();(e=n.join(r)).length==(n.length-1)*r.length&&(e="")}else this.selection.isEmpty()||(e=this.session.getTextRange(this.getSelectionRange()));return e},this.$checkMultiselectChange=function(e,t){if(this.inMultiSelectMode&&!this.inVirtualSelectionMode){var n=this.multiSelect.ranges[0];if(this.multiSelect.isEmpty()&&t==this.multiSelect.anchor)return;var i=t==this.multiSelect.anchor?n.cursor==n.start?n.end:n.start:n.cursor;i.row!=t.row||this.session.$clipPositionToDocument(i.row,i.column).column!=t.column?this.multiSelect.toSingleRange(this.multiSelect.toOrientedRange()):this.multiSelect.mergeOverlappingRanges()}},this.findAll=function(e,t,n){if((t=t||{}).needle=e||t.needle,null==t.needle){var i=this.selection.isEmpty()?this.selection.getWordRange():this.selection.getRange();t.needle=this.session.getTextRange(i)}this.$search.set(t);var r=this.$search.findAll(this.session);if(!r.length)return 0;var s=this.multiSelect;n||s.toSingleRange(r[0]);for(var o=r.length;o--;)s.addRange(r[o],!0);return i&&s.rangeList.rangeAtPoint(i.start)&&s.addRange(i,!0),r.length},this.selectMoreLines=function(e,t){var n=this.selection.toOrientedRange(),i=n.cursor==n.end,r=this.session.documentToScreenPosition(n.cursor);this.selection.$desiredColumn&&(r.column=this.selection.$desiredColumn);var s,a=this.session.screenToDocumentPosition(r.row+e,r.column);if(n.isEmpty())c=a;else var l=this.session.documentToScreenPosition(i?n.end:n.start),c=this.session.screenToDocumentPosition(l.row+e,l.column);i?(s=o.fromPoints(a,c)).cursor=s.start:(s=o.fromPoints(c,a)).cursor=s.end;if(s.desiredColumn=r.column,this.selection.inMultiSelectMode){if(t)var u=n.cursor}else this.selection.addRange(n);this.selection.addRange(s),u&&this.selection.substractPoint(u)},this.transposeSelections=function(e){for(var t=this.session,n=t.multiSelect,i=n.ranges,r=i.length;r--;){if((a=i[r]).isEmpty()){var s=t.getWordRange(a.start.row,a.start.column);a.start.row=s.start.row,a.start.column=s.start.column,a.end.row=s.end.row,a.end.column=s.end.column}}n.mergeOverlappingRanges();var o=[];for(r=i.length;r--;){var a=i[r];o.unshift(t.getTextRange(a))}e<0?o.unshift(o.pop()):o.push(o.shift());for(r=i.length;r--;){s=(a=i[r]).clone();t.replace(a,o[r]),a.start.row=s.start.row,a.start.column=s.start.column}n.fromOrientedRange(n.ranges[0])},this.selectMore=function(e,t,n){var i=this.session,r=i.multiSelect.toOrientedRange();if(!r.isEmpty()||((r=i.getWordRange(r.start.row,r.start.column)).cursor=-1==e?r.start:r.end,this.multiSelect.addRange(r),!n)){var s=i.getTextRange(r),o=function(e,t,n){return d.$options.wrap=!0,d.$options.needle=t,d.$options.backwards=-1==n,d.find(e)}(i,s,e);o&&(o.cursor=-1==e?o.start:o.end,this.session.unfold(o),this.multiSelect.addRange(o),this.renderer.scrollCursorIntoView(null,.5)),t&&this.multiSelect.substractPoint(r.cursor)}},this.alignCursors=function(){var e=this.session,t=e.multiSelect,n=t.ranges,i=-1,r=n.filter((function(e){if(e.cursor.row==i)return!0;i=e.cursor.row}));if(n.length&&r.length!=n.length-1){r.forEach((function(e){t.substractPoint(e.cursor)}));var s=0,a=1/0,l=n.map((function(t){var n=t.cursor,i=e.getLine(n.row).substr(n.column).search(/\S/g);return-1==i&&(i=0),n.column>s&&(s=n.column),i<a&&(a=i),i}));n.forEach((function(t,n){var i=t.cursor,r=s-i.column,c=l[n]-a;r>c?e.insert(i,u.stringRepeat(" ",r-c)):e.remove(new o(i.row,i.column,i.row,i.column-r+c)),t.start.column=t.end.column=s,t.start.row=t.end.row=i.row,t.cursor=t.end})),t.fromOrientedRange(n[0]),this.renderer.updateCursor(),this.renderer.updateBackMarkers()}else{var c=this.selection.getRange(),h=c.start.row,d=c.end.row,f=h==d;if(f){var p,g=this.session.getLength();do{p=this.session.getLine(d)}while(/[=:]/.test(p)&&++d<g);do{p=this.session.getLine(h)}while(/[=:]/.test(p)&&--h>0);h<0&&(h=0),d>=g&&(d=g-1)}var m=this.session.removeFullLines(h,d);m=this.$reAlignText(m,f),this.session.insert({row:h,column:0},m.join("\n")+"\n"),f||(c.start.column=0,c.end.column=m[m.length-1].length),this.selection.setRange(c)}},this.$reAlignText=function(e,t){function n(e){return u.stringRepeat(" ",e)}function i(e){return e[2]?n(r)+e[2]+n(s-e[2].length+o)+e[4].replace(/^([=:])\s+/,"$1 "):e[0]}var r,s,o,a=!0,l=!0;return e.map((function(e){var t=e.match(/(\s*)(.*?)(\s*)([=:].*)/);return t?null==r?(r=t[1].length,s=t[2].length,o=t[3].length,t):(r+s+o!=t[1].length+t[2].length+t[3].length&&(l=!1),r!=t[1].length&&(a=!1),r>t[1].length&&(r=t[1].length),s<t[2].length&&(s=t[2].length),o>t[3].length&&(o=t[3].length),t):[e]})).map(t?i:a?l?function(e){return e[2]?n(r+s-e[2].length)+e[2]+n(o)+e[4].replace(/^([=:])\s+/,"$1 "):e[0]}:i:function(e){return e[2]?n(r)+e[2]+n(o)+e[4].replace(/^([=:])\s+/,"$1 "):e[0]})}}).call(p.prototype),t.onSessionChange=function(e){var t=e.session;t&&!t.multiSelect&&(t.$selectionMarkers=[],t.selection.$initRangeList(),t.multiSelect=t.selection),this.multiSelect=t&&t.multiSelect;var n=e.oldSession;n&&(n.multiSelect.off("addRange",this.$onAddRange),n.multiSelect.off("removeRange",this.$onRemoveRange),n.multiSelect.off("multiSelect",this.$onMultiSelect),n.multiSelect.off("singleSelect",this.$onSingleSelect),n.multiSelect.lead.off("change",this.$checkMultiselectChange),n.multiSelect.anchor.off("change",this.$checkMultiselectChange)),t&&(t.multiSelect.on("addRange",this.$onAddRange),t.multiSelect.on("removeRange",this.$onRemoveRange),t.multiSelect.on("multiSelect",this.$onMultiSelect),t.multiSelect.on("singleSelect",this.$onSingleSelect),t.multiSelect.lead.on("change",this.$checkMultiselectChange),t.multiSelect.anchor.on("change",this.$checkMultiselectChange)),t&&this.inMultiSelectMode!=t.selection.inMultiSelectMode&&(t.selection.inMultiSelectMode?this.$onMultiSelect():this.$onSingleSelect())},t.MultiSelect=r,e("./config").defineOptions(p.prototype,"editor",{enableMultiselect:{set:function(e){r(this),e?(this.on("changeSession",this.$multiselectOnSessionChange),this.on("mousedown",l)):(this.off("changeSession",this.$multiselectOnSessionChange),this.off("mousedown",l))},value:!0},enableBlockSelect:{set:function(e){this.$blockSelectEnabled=e},value:!0}})})),ace.define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],(function(e,t,n){"use strict";var i=e("../../range").Range,r=t.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(e,t,n){var i=e.getLine(n);return this.foldingStartMarker.test(i)?"start":"markbeginend"==t&&this.foldingStopMarker&&this.foldingStopMarker.test(i)?"end":""},this.getFoldWidgetRange=function(e,t,n){return null},this.indentationBlock=function(e,t,n){var r=/\S/,s=e.getLine(t),o=s.search(r);if(-1!=o){for(var a=n||s.length,l=e.getLength(),c=t,u=t;++t<l;){var h=e.getLine(t).search(r);if(-1!=h){if(h<=o)break;u=t}}if(u>c){var d=e.getLine(u).length;return new i(c,a,u,d)}}},this.openingBracketBlock=function(e,t,n,r,s){var o={row:n,column:r+1},a=e.$findClosingBracket(t,o,s);if(a){var l=e.foldWidgets[a.row];return null==l&&(l=e.getFoldWidget(a.row)),"start"==l&&a.row>o.row&&(a.row--,a.column=e.getLine(a.row).length),i.fromPoints(o,a)}},this.closingBracketBlock=function(e,t,n,r,s){var o={row:n,column:r},a=e.$findOpeningBracket(t,o);if(a)return a.column++,o.column--,i.fromPoints(a,o)}}).call(r.prototype)})),ace.define("ace/theme/textmate",["require","exports","module","ace/lib/dom"],(function(e,t,n){"use strict";t.isDark=!1,t.cssClass="ace-tm",t.cssText='.ace-tm .ace_gutter {background: #f0f0f0;color: #333;}.ace-tm .ace_print-margin {width: 1px;background: #e8e8e8;}.ace-tm .ace_fold {background-color: #6B72E6;}.ace-tm {background-color: #FFFFFF;color: black;}.ace-tm .ace_cursor {color: black;}.ace-tm .ace_invisible {color: rgb(191, 191, 191);}.ace-tm .ace_storage,.ace-tm .ace_keyword {color: blue;}.ace-tm .ace_constant {color: rgb(197, 6, 11);}.ace-tm .ace_constant.ace_buildin {color: rgb(88, 72, 246);}.ace-tm .ace_constant.ace_language {color: rgb(88, 92, 246);}.ace-tm .ace_constant.ace_library {color: rgb(6, 150, 14);}.ace-tm .ace_invalid {background-color: rgba(255, 0, 0, 0.1);color: red;}.ace-tm .ace_support.ace_function {color: rgb(60, 76, 114);}.ace-tm .ace_support.ace_constant {color: rgb(6, 150, 14);}.ace-tm .ace_support.ace_type,.ace-tm .ace_support.ace_class {color: rgb(109, 121, 222);}.ace-tm .ace_keyword.ace_operator {color: rgb(104, 118, 135);}.ace-tm .ace_string {color: rgb(3, 106, 7);}.ace-tm .ace_comment {color: rgb(76, 136, 107);}.ace-tm .ace_comment.ace_doc {color: rgb(0, 102, 255);}.ace-tm .ace_comment.ace_doc.ace_tag {color: rgb(128, 159, 191);}.ace-tm .ace_constant.ace_numeric {color: rgb(0, 0, 205);}.ace-tm .ace_variable {color: rgb(49, 132, 149);}.ace-tm .ace_xml-pe {color: rgb(104, 104, 91);}.ace-tm .ace_entity.ace_name.ace_function {color: #0000A2;}.ace-tm .ace_heading {color: rgb(12, 7, 255);}.ace-tm .ace_list {color:rgb(185, 6, 144);}.ace-tm .ace_meta.ace_tag {color:rgb(0, 22, 142);}.ace-tm .ace_string.ace_regex {color: rgb(255, 0, 0)}.ace-tm .ace_marker-layer .ace_selection {background: rgb(181, 213, 255);}.ace-tm.ace_multiselect .ace_selection.ace_start {box-shadow: 0 0 3px 0px white;}.ace-tm .ace_marker-layer .ace_step {background: rgb(252, 255, 0);}.ace-tm .ace_marker-layer .ace_stack {background: rgb(164, 229, 101);}.ace-tm .ace_marker-layer .ace_bracket {margin: -1px 0 0 -1px;border: 1px solid rgb(192, 192, 192);}.ace-tm .ace_marker-layer .ace_active-line {background: rgba(0, 0, 0, 0.07);}.ace-tm .ace_gutter-active-line {background-color : #dcdcdc;}.ace-tm .ace_marker-layer .ace_selected-word {background: rgb(250, 250, 255);border: 1px solid rgb(200, 200, 250);}.ace-tm .ace_indent-guide {background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y;}',t.$id="ace/theme/textmate",e("../lib/dom").importCssString(t.cssText,t.cssClass)})),ace.define("ace/line_widgets",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/range"],(function(e,t,n){"use strict";function i(e){this.session=e,this.session.widgetManager=this,this.session.getRowLength=this.getRowLength,this.session.$getWidgetScreenLength=this.$getWidgetScreenLength,this.updateOnChange=this.updateOnChange.bind(this),this.renderWidgets=this.renderWidgets.bind(this),this.measureWidgets=this.measureWidgets.bind(this),this.session._changedWidgets=[],this.$onChangeEditor=this.$onChangeEditor.bind(this),this.session.on("change",this.updateOnChange),this.session.on("changeFold",this.updateOnFold),this.session.on("changeEditor",this.$onChangeEditor)}e("./lib/oop");var r=e("./lib/dom");e("./range").Range;(function(){this.getRowLength=function(e){var t;return t=this.lineWidgets&&this.lineWidgets[e]&&this.lineWidgets[e].rowCount||0,this.$useWrapMode&&this.$wrapData[e]?this.$wrapData[e].length+1+t:1+t},this.$getWidgetScreenLength=function(){var e=0;return this.lineWidgets.forEach((function(t){t&&t.rowCount&&!t.hidden&&(e+=t.rowCount)})),e},this.$onChangeEditor=function(e){this.attach(e.editor)},this.attach=function(e){e&&e.widgetManager&&e.widgetManager!=this&&e.widgetManager.detach(),this.editor!=e&&(this.detach(),this.editor=e,e&&(e.widgetManager=this,e.renderer.on("beforeRender",this.measureWidgets),e.renderer.on("afterRender",this.renderWidgets)))},this.detach=function(e){var t=this.editor;if(t){this.editor=null,t.widgetManager=null,t.renderer.off("beforeRender",this.measureWidgets),t.renderer.off("afterRender",this.renderWidgets);var n=this.session.lineWidgets;n&&n.forEach((function(e){e&&e.el&&e.el.parentNode&&(e._inDocument=!1,e.el.parentNode.removeChild(e.el))}))}},this.updateOnFold=function(e,t){var n=t.lineWidgets;if(n&&e.action){for(var i=e.data,r=i.start.row,s=i.end.row,o="add"==e.action,a=r+1;a<s;a++)n[a]&&(n[a].hidden=o);n[s]&&(o?n[r]?n[s].hidden=o:n[r]=n[s]:(n[r]==n[s]&&(n[r]=void 0),n[s].hidden=o))}},this.updateOnChange=function(e){var t=this.session.lineWidgets;if(t){var n=e.start.row,i=e.end.row-n;if(0!==i)if("remove"==e.action){t.splice(n+1,i).forEach((function(e){e&&this.removeLineWidget(e)}),this),this.$updateRows()}else{var r=new Array(i);r.unshift(n,0),t.splice.apply(t,r),this.$updateRows()}}},this.$updateRows=function(){var e=this.session.lineWidgets;if(e){var t=!0;e.forEach((function(e,n){if(e)for(t=!1,e.row=n;e.$oldWidget;)e.$oldWidget.row=n,e=e.$oldWidget})),t&&(this.session.lineWidgets=null)}},this.addLineWidget=function(e){this.session.lineWidgets||(this.session.lineWidgets=new Array(this.session.getLength()));var t=this.session.lineWidgets[e.row];t&&(e.$oldWidget=t,t.el&&t.el.parentNode&&(t.el.parentNode.removeChild(t.el),t._inDocument=!1)),this.session.lineWidgets[e.row]=e,e.session=this.session;var n=this.editor.renderer;e.html&&!e.el&&(e.el=r.createElement("div"),e.el.innerHTML=e.html),e.el&&(r.addCssClass(e.el,"ace_lineWidgetContainer"),e.el.style.position="absolute",e.el.style.zIndex=5,n.container.appendChild(e.el),e._inDocument=!0),e.coverGutter||(e.el.style.zIndex=3),null==e.pixelHeight&&(e.pixelHeight=e.el.offsetHeight),null==e.rowCount&&(e.rowCount=e.pixelHeight/n.layerConfig.lineHeight);var i=this.session.getFoldAt(e.row,0);if(e.$fold=i,i){var s=this.session.lineWidgets;e.row!=i.end.row||s[i.start.row]?e.hidden=!0:s[i.start.row]=e}return this.session._emit("changeFold",{data:{start:{row:e.row}}}),this.$updateRows(),this.renderWidgets(null,n),this.onWidgetChanged(e),e},this.removeLineWidget=function(e){if(e._inDocument=!1,e.session=null,e.el&&e.el.parentNode&&e.el.parentNode.removeChild(e.el),e.editor&&e.editor.destroy)try{e.editor.destroy()}catch(e){}if(this.session.lineWidgets){var t=this.session.lineWidgets[e.row];if(t==e)this.session.lineWidgets[e.row]=e.$oldWidget,e.$oldWidget&&this.onWidgetChanged(e.$oldWidget);else for(;t;){if(t.$oldWidget==e){t.$oldWidget=e.$oldWidget;break}t=t.$oldWidget}}this.session._emit("changeFold",{data:{start:{row:e.row}}}),this.$updateRows()},this.getWidgetsAtRow=function(e){for(var t=this.session.lineWidgets,n=t&&t[e],i=[];n;)i.push(n),n=n.$oldWidget;return i},this.onWidgetChanged=function(e){this.session._changedWidgets.push(e),this.editor&&this.editor.renderer.updateFull()},this.measureWidgets=function(e,t){var n=this.session._changedWidgets,i=t.layerConfig;if(n&&n.length){for(var r=1/0,s=0;s<n.length;s++){var o=n[s];if(o&&o.el&&o.session==this.session){if(!o._inDocument){if(this.session.lineWidgets[o.row]!=o)continue;o._inDocument=!0,t.container.appendChild(o.el)}o.h=o.el.offsetHeight,o.fixedWidth||(o.w=o.el.offsetWidth,o.screenWidth=Math.ceil(o.w/i.characterWidth));var a=o.h/i.lineHeight;o.coverLine&&((a-=this.session.getRowLineCount(o.row))<0&&(a=0)),o.rowCount!=a&&(o.rowCount=a,o.row<r&&(r=o.row))}}r!=1/0&&(this.session._emit("changeFold",{data:{start:{row:r}}}),this.session.lineWidgetWidth=null),this.session._changedWidgets=[]}},this.renderWidgets=function(e,t){var n=t.layerConfig,i=this.session.lineWidgets;if(i){for(var r=Math.min(this.firstRow,n.firstRow),s=Math.max(this.lastRow,n.lastRow,i.length);r>0&&!i[r];)r--;this.firstRow=n.firstRow,this.lastRow=n.lastRow,t.$cursorLayer.config=n;for(var o=r;o<=s;o++){var a=i[o];if(a&&a.el)if(a.hidden)a.el.style.top=-100-(a.pixelHeight||0)+"px";else{a._inDocument||(a._inDocument=!0,t.container.appendChild(a.el));var l=t.$cursorLayer.getPixelPosition({row:o,column:0},!0).top;a.coverLine||(l+=n.lineHeight*this.session.getRowLineCount(a.row)),a.el.style.top=l-n.offset+"px";var c=a.coverGutter?0:t.gutterWidth;a.fixedWidth||(c-=t.scrollLeft),a.el.style.left=c+"px",a.fullWidth&&a.screenWidth&&(a.el.style.minWidth=n.width+2*n.padding+"px"),a.fixedWidth?a.el.style.right=t.scrollBar.getWidth()+"px":a.el.style.right=""}}}}}).call(i.prototype),t.LineWidgets=i})),ace.define("ace/ext/error_marker",["require","exports","module","ace/line_widgets","ace/lib/dom","ace/range"],(function(e,t,n){"use strict";function i(e,t,n){var i=e.getAnnotations().sort(o.comparePoints);if(i.length){var r=function(e,t,n){for(var i=0,r=e.length-1;i<=r;){var s=i+r>>1,o=n(t,e[s]);if(o>0)i=s+1;else{if(!(o<0))return s;r=s-1}}return-(i+1)}(i,{row:t,column:-1},o.comparePoints);r<0&&(r=-r-1),r>=i.length?r=n>0?0:i.length-1:0===r&&n<0&&(r=i.length-1);var s=i[r];if(s&&n){if(s.row===t){do{s=i[r+=n]}while(s&&s.row===t);if(!s)return i.slice()}var a=[];t=s.row;do{a[n<0?"unshift":"push"](s),s=i[r+=n]}while(s&&s.row==t);return a.length&&a}}}var r=e("../line_widgets").LineWidgets,s=e("../lib/dom"),o=e("../range").Range;t.showErrorMarker=function(e,t){var n=e.session;n.widgetManager||(n.widgetManager=new r(n),n.widgetManager.attach(e));var o=e.getCursorPosition(),a=o.row,l=n.widgetManager.getWidgetsAtRow(a).filter((function(e){return"errorMarker"==e.type}))[0];l?l.destroy():a-=t;var c,u=i(n,a,t);if(u){var h=u[0];o.column=(h.pos&&"number"!=typeof h.column?h.pos.sc:h.column)||0,o.row=h.row,c=e.renderer.$gutterLayer.$annotations[o.row]}else{if(l)return;c={text:["Looks good!"],className:"ace_ok"}}e.session.unfold(o.row),e.selection.moveToPosition(o);var d={row:o.row,fixedWidth:!0,coverGutter:!0,el:s.createElement("div"),type:"errorMarker"},f=d.el.appendChild(s.createElement("div")),p=d.el.appendChild(s.createElement("div"));p.className="error_widget_arrow "+c.className;var g=e.renderer.$cursorLayer.getPixelPosition(o).left;p.style.left=g+e.renderer.gutterWidth-5+"px",d.el.className="error_widget_wrapper",f.className="error_widget "+c.className,f.innerHTML=c.text.join("<br>"),f.appendChild(s.createElement("div"));var m=function(e,t,n){if(0===t&&("esc"===n||"return"===n))return d.destroy(),{command:"null"}};d.destroy=function(){e.$mouseHandler.isMousePressed||(e.keyBinding.removeKeyboardHandler(m),n.widgetManager.removeLineWidget(d),e.off("changeSelection",d.destroy),e.off("changeSession",d.destroy),e.off("mouseup",d.destroy),e.off("change",d.destroy))},e.keyBinding.addKeyboardHandler(m),e.on("changeSelection",d.destroy),e.on("changeSession",d.destroy),e.on("mouseup",d.destroy),e.on("change",d.destroy),e.session.widgetManager.addLineWidget(d),d.el.onmousedown=e.focus.bind(e),e.renderer.scrollCursorIntoView(null,.5,{bottom:d.el.offsetHeight})},s.importCssString("    .error_widget_wrapper {        background: inherit;        color: inherit;        border:none    }    .error_widget {        border-top: solid 2px;        border-bottom: solid 2px;        margin: 5px 0;        padding: 10px 40px;        white-space: pre-wrap;    }    .error_widget.ace_error, .error_widget_arrow.ace_error{        border-color: #ff5a5a    }    .error_widget.ace_warning, .error_widget_arrow.ace_warning{        border-color: #F1D817    }    .error_widget.ace_info, .error_widget_arrow.ace_info{        border-color: #5a5a5a    }    .error_widget.ace_ok, .error_widget_arrow.ace_ok{        border-color: #5aaa5a    }    .error_widget_arrow {        position: absolute;        border: solid 5px;        border-top-color: transparent!important;        border-right-color: transparent!important;        border-left-color: transparent!important;        top: -5px;    }","")})),ace.define("ace/ace",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/dom","ace/lib/event","ace/range","ace/editor","ace/edit_session","ace/undomanager","ace/virtual_renderer","ace/worker/worker_client","ace/keyboard/hash_handler","ace/placeholder","ace/multi_select","ace/mode/folding/fold_mode","ace/theme/textmate","ace/ext/error_marker","ace/config"],(function(e,t,n){"use strict";e("./lib/fixoldbrowsers");var i=e("./lib/dom"),r=e("./lib/event"),s=e("./range").Range,o=e("./editor").Editor,a=e("./edit_session").EditSession,l=e("./undomanager").UndoManager,c=e("./virtual_renderer").VirtualRenderer;e("./worker/worker_client"),e("./keyboard/hash_handler"),e("./placeholder"),e("./multi_select"),e("./mode/folding/fold_mode"),e("./theme/textmate"),e("./ext/error_marker"),t.config=e("./config"),t.require=e,"function"==typeof define&&(t.define=define),t.edit=function(e,n){if("string"==typeof e){var s=e;if(!(e=document.getElementById(s)))throw new Error("ace.edit can't find div #"+s)}if(e&&e.env&&e.env.editor instanceof o)return e.env.editor;var a="";if(e&&/input|textarea/i.test(e.tagName)){var l=e;a=l.value,e=i.createElement("pre"),l.parentNode.replaceChild(e,l)}else e&&(a=e.textContent,e.innerHTML="");var u=t.createEditSession(a),h=new o(new c(e),u,n),d={document:u,editor:h,onResize:h.resize.bind(h,null)};return l&&(d.textarea=l),r.addListener(window,"resize",d.onResize),h.on("destroy",(function(){r.removeListener(window,"resize",d.onResize),d.editor.container.env=null})),h.container.env=h.env=d,h},t.createEditSession=function(e,t){var n=new a(e,t);return n.setUndoManager(new l),n},t.Range=s,t.Editor=o,t.EditSession=a,t.UndoManager=l,t.VirtualRenderer=c,t.version="1.4.2"})),ace.require(["ace/ace"],(function(e){for(var t in e&&(e.config.init(!0),e.define=ace.define),window.ace||(window.ace=e),e)e.hasOwnProperty(t)&&(window.ace[t]=e[t]);window.ace.default=window.ace,"object"==typeof module&&"object"==typeof exports&&module&&(module.exports=window.ace)})),define("ace",(function(){})),angular.module("ui.ace",[]).constant("uiAceConfig",{}).directive("uiAce",["uiAceConfig",function(e){if(angular.isUndefined(window.ace))throw new Error("ui-ace need ace to work... (o rly?)");return{restrict:"EA",require:"?ngModel",link:function(t,n,i,r){var s,o,a=e.ace||{},l=angular.extend({},a,t.$eval(i.uiAce)),c=window.ace.edit(n[0]),u=c.getSession(),h=function(){var e=arguments[0],n=Array.prototype.slice.call(arguments,1);angular.isDefined(e)&&t.$apply((function(){if(!angular.isFunction(e))throw new Error("ui-ace use a function as callback.");e(n)}))},d=function(e){return function(n){var i=u.getValue();!r||i===r.$viewValue||t.$$phase||t.$root.$$phase||t.$applyAsync((function(){r.$setViewValue(i)})),h(e,n,c)}},f=function(e){return function(){h(e,c)}};i.$observe("readonly",(function(e){c.setReadOnly(!!e||""===e)})),r&&(r.$formatters.push((function(e){if(angular.isUndefined(e)||null===e)return"";if(angular.isObject(e)||angular.isArray(e))throw new Error("ui-ace cannot use an object or an array as a model");return e})),r.$render=function(){u.setValue(r.$viewValue)});var p=function(e,n){e!==n&&((l=angular.extend({},a,t.$eval(i.uiAce))).callbacks=[l.onLoad],l.onLoad!==a.onLoad&&l.callbacks.unshift(a.onLoad),u.removeListener("change",s),s=d(l.onChange),u.on("change",s),c.removeListener("blur",o),o=f(l.onBlur),c.on("blur",o),function(e,t,n){var i,r;if(angular.isDefined(n.workerPath)&&window.ace.require("ace/config").set("workerPath",n.workerPath),angular.isDefined(n.require)&&n.require.forEach((function(e){window.ace.require(e)})),angular.isDefined(n.showGutter)&&e.renderer.setShowGutter(n.showGutter),angular.isDefined(n.useWrapMode)&&t.setUseWrapMode(n.useWrapMode),angular.isDefined(n.showInvisibles)&&e.renderer.setShowInvisibles(n.showInvisibles),angular.isDefined(n.showIndentGuides)&&e.renderer.setDisplayIndentGuides(n.showIndentGuides),angular.isDefined(n.useSoftTabs)&&t.setUseSoftTabs(n.useSoftTabs),angular.isDefined(n.showPrintMargin)&&e.setShowPrintMargin(n.showPrintMargin),angular.isDefined(n.disableSearch)&&n.disableSearch&&e.commands.addCommands([{name:"unfind",bindKey:{win:"Ctrl-F",mac:"Command-F"},exec:function(){return!1},readOnly:!0}]),angular.forEach(n.callbacks,(function(t){angular.isFunction(t)&&t(e)})),angular.isString(n.theme)&&e.setTheme("ace/theme/"+n.theme),angular.isString(n.mode)&&t.setMode("ace/mode/"+n.mode),angular.isDefined(n.firstLineNumber)&&(angular.isNumber(n.firstLineNumber)?t.setOption("firstLineNumber",n.firstLineNumber):angular.isFunction(n.firstLineNumber)&&t.setOption("firstLineNumber",n.firstLineNumber())),angular.isDefined(n.advanced))for(i in n.advanced)r={name:i,value:n.advanced[i]},e.setOption(r.name,r.value);if(angular.isDefined(n.rendererOptions))for(i in n.rendererOptions)r={name:i,value:n.rendererOptions[i]},e.renderer.setOption(r.name,r.value)}(c,u,l))};t.$watch(i.uiAce,p,!0),p(a),n.on("$destroy",(function(){c.session.$stopWorker(),c.destroy()})),t.$watch((function(){return[n[0].offsetWidth,n[0].offsetHeight]}),(function(){c.resize(),c.renderer.updateFull()}),!0)}}}]),define("uiAce",["angular","ace"],(function(){})),angular.module("toastr",[]).directive("toast",["$compile","$interval","toastr",function(e,t,n){return{replace:!0,templateUrl:"templates/toastr/toastr.html",link:function(i,r,s){var o;if(i.toastClass=i.options.toastClass,i.titleClass=i.options.titleClass,i.messageClass=i.options.messageClass,i.options.closeHtml){var a=angular.element(i.options.closeHtml);a.addClass("toast-close-button"),a.attr("ng-click","close()"),e(a)(i),r.prepend(a)}function l(e){return t((function(){n.remove(i.toastId)}),e,1)}i.init=function(){i.options.timeOut&&(o=l(i.options.timeOut))},r.on("mouseenter",(function(){o&&t.cancel(o)})),i.tapToast=function(){i.options.tapToDismiss&&i.close()},i.close=function(){n.remove(i.toastId)},r.on("mouseleave",(function(){0===i.options.timeOut&&0===i.options.extendedTimeOut||(o=l(i.options.extendedTimeOut))}))}}}]).constant("toastrConfig",{allowHtml:!1,closeButton:!1,closeHtml:"<button>&times;</button>",containerId:"toast-container",extendedTimeOut:1e3,iconClasses:{error:"toast-error",info:"toast-info",success:"toast-success",warning:"toast-warning"},messageClass:"toast-message",newestOnTop:!0,positionClass:"toast-top-right",tapToDismiss:!0,timeOut:5e3,titleClass:"toast-title",toastClass:"toast"}).factory("toastr",["$animate","$compile","$document","$rootScope","$sce","toastrConfig","$q",function(e,t,n,i,r,s,o){var a,l=0,c=[],u=o.defer();return{clear:function(e){if(e)f(e.toastId);else for(var t=0;t<c.length;t++)f(c[t].toastId)},error:function(e,t,n){return d({iconClass:h().iconClasses.error,message:e,optionsOverride:n,title:t})},info:function(e,t,n){return d({iconClass:h().iconClasses.info,message:e,optionsOverride:n,title:t})},remove:f,success:function(e,t,n){return d({iconClass:h().iconClasses.success,message:e,optionsOverride:n,title:t})},warning:function(e,t,n){return d({iconClass:h().iconClasses.warning,message:e,optionsOverride:n,title:t})}};function h(){return angular.extend({},s)}function d(s){var o,d,f=h(),p={toastId:l++,scope:i.$new()};return p.iconClass=s.iconClass,s.optionsOverride&&(f=angular.extend(f,s.optionsOverride),p.iconClass=s.optionsOverride.iconClass||p.iconClass),function(e,t,n){n.allowHtml?(e.scope.allowHtml=!0,e.scope.title=r.trustAsHtml(t.title),e.scope.message=r.trustAsHtml(t.message)):(e.scope.title=t.title,e.scope.message=t.message);e.scope.toastType=e.iconClass,e.scope.toastId=e.toastId,e.scope.options={extendedTimeOut:n.extendedTimeOut,messageClass:n.messageClass,tapToDismiss:n.tapToDismiss,timeOut:n.timeOut,titleClass:n.titleClass,toastClass:n.toastClass},n.closeButton&&(e.scope.options.closeHtml=n.closeHtml)}(p,s,f),p.el=(o=p.scope,d=angular.element("<div toast></div>"),t(d)(o)),c.push(p),function(t){if(a)return u.promise;(a=angular.element("<div></div>")).attr("id",t.containerId),a.addClass(t.positionClass),a.css({"pointer-events":"auto"});var i=n.find("body").eq(0);return e.enter(a,i).then((function(){u.resolve()})),u.promise}(f).then((function(){f.newestOnTop?e.enter(p.el,a).then((function(){p.scope.init()})):e.enter(p.el,a,a[0].lastChild).then((function(){p.scope.init()}))})),p}function f(t){var n=function(e){for(var t=0;t<c.length;t++)if(c[t].toastId===e)return c[t]}(t);n&&e.leave(n.el).then((function(){n.scope.$destroy(),a&&0===a.children().length&&(c=[],a.remove(),a=null,u=o.defer())}))}}]),angular.module("toastr").run(["$templateCache",function(e){"use strict";e.put("templates/toastr/toastr.html",'<div class="{{toastClass}} {{toastType}}" ng-click="tapToast()">\n  <div ng-switch on="allowHtml">\n    <div ng-switch-default ng-if="title" class="{{titleClass}}">{{title}}</div>\n    <div ng-switch-default class="{{messageClass}}">{{message}}</div>\n    <div ng-switch-when="true" ng-if="title" class="{{titleClass}}" ng-bind-html="title"></div>\n    <div ng-switch-when="true" class="{{messageClass}}" ng-bind-html="message"></div>\n  </div>\n</div>')}]),define("ngToastr",["angular"],function(e){return function(){return e.ngToastr}}(this)),function(e,t){"function"==typeof define&&define.amd?define("angular-clipboard",["angular"],t):"object"==typeof module&&module.exports?module.exports=t(require("angular")):e.angularClipboard=t(e.angular)}(this,(function(e){return e.module("angular-clipboard",[]).factory("clipboard",["$document","$window",function(e,t){return{copyText:function(n,i){var r=t.pageXOffset||e[0].documentElement.scrollLeft,s=t.pageYOffset||e[0].documentElement.scrollTop,o=function(n,i){var r=e[0].createElement("textarea");return r.style.position="absolute",r.style.fontSize="12pt",r.style.border="0",r.style.padding="0",r.style.margin="0",r.style.left="-10000px",r.style.top=(t.pageYOffset||e[0].documentElement.scrollTop)+"px",r.textContent=n,r}(n);e[0].body.appendChild(o),function(t){try{e[0].body.style.webkitUserSelect="initial";var n=e[0].getSelection();n.removeAllRanges();var i=document.createRange();i.selectNodeContents(t),n.addRange(i),t.select(),t.setSelectionRange(0,999999);try{if(!e[0].execCommand("copy"))throw"failure copy"}finally{n.removeAllRanges()}}finally{e[0].body.style.webkitUserSelect=""}}(o),t.scrollTo(r,s),e[0].body.removeChild(o)},supported:"queryCommandSupported"in e[0]&&e[0].queryCommandSupported("copy")}}]).directive("clipboard",["clipboard",function(t){return{restrict:"A",scope:{onCopied:"&",onError:"&",text:"=",supported:"=?"},link:function(n,i){n.supported=t.supported,i.on("click",(function(r){try{t.copyText(n.text,i[0]),e.isFunction(n.onCopied)&&n.$evalAsync(n.onCopied())}catch(t){e.isFunction(n.onError)&&n.$evalAsync(n.onError({err:t}))}}))}}}])})),define("modules/projections/controllers/_module",["angular"],(function(e){"use strict";return e.module("es-ui.projections.controllers",["es-ui.projections.services"])})),define("modules/projections/controllers/ProjectionsItemDebugCtrl",["./_module"],(function(e){"use strict";return e.controller("ProjectionsItemDebugCtrl",["$scope","$state","$stateParams","$q","$timeout","$window","ProjectionsService","MessageService",function(e,t,n,i,r,s,o,a){function l(t){t||(t="N/A"),e.statusInfo=t}l(""),e.location=n.location,e.aceConfig={mode:"javascript",useWrapMode:!1,showGutter:!0,theme:"monokai",onChange:function(){e.queryUpdated=!0}},e.aceEventsConfig={mode:"json",useWrapMode:!1,showGutter:!0,theme:"monokai"},e.isRunning=!1,e.isUpdating=!1,e.query="",e.events="",e.state="";var c,u,h,d,f,p,g,m,v={};function $(){o.readEvents(h,d).then((function(t){var n=t.data;e.events=JSON.stringify(n,void 0,4),(c=n.events)&&c.length>0?function(){if(u=c[0],p)return void b();l("Running the definition..."),e.$broadcast("load-scripts"),r(b,100)}():(l("No further events are available. Waiting..."),e.isRunning=!0,m=r($,1e3))}),(function(e){a.failure("Failed to read projection events: "+e.message)}))}function b(){(g=document.getElementById("script-placeholder").contentWindow.processor)?(p=!0,l(""),f=null,function(t){t="("+t+")",e.currentPartition=t}(f=h.byCustomPartitions?g.get_state_partition(u.isJson?angular.toJson(u.data):u.data,u.isJson,u.eventStreamId,u.eventType,u.category,u.eventNumber,u.isJson?angular.toJson(u.metadata):u.metadata):h.byStream?u.eventStreamId:""),v[f]?w(v[f]):(l("Loading the projection state..."),o.state(e.location,{partition:f}).then((function(e){w(e.data)}),(function(e){l("Failed to load the projection state: "+e.message)})))):r(b,1e3)}function w(t){var n;l("Ready for debugging!"),e.isRunning=!1,""===t?(g.initialize(),v[f]=g.debugging_get_state()):(t=function(e){try{var t=JSON.parse(e);if(t&&"object"==typeof t&&null!==t)return t}catch(e){}return!1}(t)?t:angular.toJson(t),v[f]=t,g.set_state(t));try{n=angular.fromJson(v[f]),e.state=n}catch(t){e.state=""}}l("Loading definition..."),a.info("The projection will be stopped for debugging"),o.disable(e.location).then((function(){!function(){v={};var t=[],n=o.statistics(e.location),r=o.state(e.location,{timeout:2e3}),s=o.query(e.location);t.push(n),t.push(r),t.push(s),i.allSettled(t).then((function(t){var n,i=t[0],r=t[1],s=t[2];if(i.data.projections[0].status.indexOf("Stopped")>-1&&i.data.projections[0].status.indexOf("Faulted")>-1&&(e.isRunning=!0),n=r.headers()["es-position"],d=angular.fromJson(n),h=s.data.definition,e.query=s.data.query,!d)return a.failure("The projection`s state query did not return an ES-Position header.\nEnsure that the projection is not Completed/Stopped or Faulted.\nWe cannot continue debugging.","Please ensure that the header includes ES-Position."),void(e.isRunning=!0);l(""),$()}),(function(t){var n=t[0],i=t[1],r=t[2];n&&!n.data&&a.failure("Failed to retrieve projection stats: "+n.message),i&&!i.data&&a.failure("Failed to retrieve projection state: "+i.message),r&&!r.data?a.failure("Failed to retrieve projection query: "+r.message):e.query=r.data.query}))}()}),(function(e){a.failure("Failed to stop projection: "+e.message)})),e.runStep=function(){var e=g.process_event(u.isJson?JSON.stringify(u.data):u.data,u.isJson,u.eventStreamId,u.eventType,u.category,u.eventNumber,u.isJson?JSON.stringify(u.metadata):u.metadata,u.isJson?JSON.stringify(u.linkMetadata):u.linkMetadata,f);v[f]=e,w(v[f]),d=u.readerPosition,$()},e.update=function(){e.isUpdating=!0,o.updateQuery(e.location,null,e.query).then((function(){a.info("Projection Updated"),s.location.reload()}),(function(t){e.isUpdating=!1,a.failure("Failed to update projection: "+t.message)}))},e.stop=function(){m&&(r.cancel(m),m=null),o.disable(e.location).then((function(){a.info("Projection Stopped"),e.isRunning=!1}),(function(e){a.failure("Failed to stop projection: "+e.message)}))},e.goBack=function(){n.fromQueryState?t.go("query",{location:e.location}):t.go("^.details")}}])})),define("modules/projections/controllers/ProjectionsItemDeleteCtrl",["./_module"],(function(e){"use strict";return e.controller("ProjectionsItemDeleteCtrl",["$scope","$state","$stateParams","ProjectionsService","MessageService",function(e,t,n,i,r){function s(n){i.remove(e.location,{deleteCheckpointStream:e.deleteCheckpoint?"yes":"no",deleteStateStream:e.deleteState?"yes":"no",deleteEmittedStreams:e.deleteEmittedStreams?"yes":"no"}).then((function(){r.success("Projection has been removed"),t.go("projections.list")}),(function(e){r.failure("Failed to remove projection: "+e.message)}))}e.location=n.location,e.projection={name:"",source:"",state:""},i.state(e.location).then((function(t){e.projection.state=t.data}),(function(e){r.failure("Failed to load the projection state: "+e.message)})),i.query(e.location).then((function(t){e.projection.source=t.data.query,e.projection.name=t.data.name}),(function(e){r.failure("Failed to load projection source: "+e.message)})),e.remove=function(t){t.preventDefault(),t.stopPropagation(),i.disable(e.location).then((function(){s(e.location)}),(function(t){-1!==t.message.indexOf("Not enabled")?s(e.location):r.failure("Failed to stop projection: "+t.message)}))}}])})),define("modules/projections/controllers/ProjectionsItemDetailsCtrl",["./_module"],(function(e){"use strict";return e.controller("ProjectionsItemDetailsCtrl",["$scope","$state","$stateParams","ProjectionsService","ProjectionsMonitor","MessageService",function(e,t,n,i,r,s){var o=null,a=null;e.location=n.location,e.aceConfig={mode:"javascript",useWrapMode:!1,showGutter:!0,theme:"monokai"},r.start(e.location,{partitionProvider:e}).then(null,null,(function(t){var n;t.statistics&&t.statistics.projections.length&&(e.stats=t.statistics.projections[0],e.isTransientProjection="Transient"==e.stats.mode,"$by_category"!==e.stats.name&&"$stream_by_category"!==e.stats.name||(e.aceConfig.mode="text"),null!==o&&(e.stats.eventsPerSecond=(1e3*(e.stats.eventsProcessedAfterRestart-o)/(new Date-a)).toFixed(1)),a=new Date,o=e.stats.eventsProcessedAfterRestart,n=e.stats.status,e.isRunning=!(0===n.indexOf("Loaded")||0===n.indexOf("Stopped")||0===n.indexOf("Completed")||0===n.indexOf("Faulted")),e.isStopped=!!~n.indexOf("Stopped")),t.query&&(t.query.definition?e.stream=t.query.definition.resultStreamName:e.stream=void 0,e.query=t.query.query),t.result&&(e.result=t.result),t.state&&(e.state=t.state)})),e.reset=function(){s.confirm("Projection reset is an unsafe operation. Any previously emitted events will be emitted again to the same streams and handled by their subscribers.\n\rAre you sure?")&&i.reset(e.location).then((function(){s.success("Projection has been reset")}),(function(e){s.failure("Failed to reset projection: "+e.message)}))},e.start=function(){i.enable(e.location).then((function(){s.success("Projection started")}),(function(e){s.failure("Failed to start projection: "+e.message)}))},e.stop=function(){i.disable(e.location).then((function(){s.success("Projection has been stopped")}),(function(e){s.failure("Failed to stop projection: "+e.message)}))},e.$on("$destroy",(function(){r.stop()})),e.clearState=function(){e.state=void 0}}])})),define("modules/projections/controllers/ProjectionsItemEditCtrl",["./_module"],(function(e){"use strict";return e.controller("ProjectionsItemEditCtrl",["$scope","$state","$stateParams","ProjectionsService","ProjectionsMonitor","MessageService",function(e,t,n,i,r,s){e.location=n.location,e.aceConfig={mode:"javascript",useWrapMode:!1,showGutter:!0,theme:"monokai"},i.query(e.location).then((function(t){var n=t.data;e.query=n.query,n.definition?e.stream=n.definition.resultStreamName:e.stream=void 0,e.emit=n.emitEnabled}),(function(e){s.failure("Failed to load projection source: "+e.message)})),r.start(e.location,{partitionProvider:e,ignoreQuery:!0}).then(null,null,(function(t){var n;t.statistics&&t.statistics.projections.length&&(e.stats=t.statistics.projections[0],"$by_category"!==e.stats.name&&"$stream_by_category"!==e.stats.name||(e.aceConfig.mode="text"),n=e.stats.status,e.isRunning=!(0===n.indexOf("Loaded")||0===n.indexOf("Stopped")||0===n.indexOf("Completed")||0===n.indexOf("Faulted")),e.isStopped=!!~n.indexOf("Stopped")),t.result&&(e.result=t.result),t.state&&(e.state=t.state)})),e.save=function(){i.updateQuery(e.location,e.emit?"yes":"no",e.query).then((function(){s.success("Projection saved")}),(function(e){s.failure("Failed to save projection: "+e.message)}))},e.reset=function(){s.confirm("Projection reset is an unsafe operation. Any previously emitted events will be emitted again to the same streams and handled by their subscribers.\n\rAre you sure?")&&i.reset(e.location).then((function(){s.success("Projection has been reset")}),(function(e){s.failure("Failed to reset projection: "+e.message)}))},e.start=function(){i.enable(e.location).then((function(){s.success("Projection started")}),(function(e){s.failure("Failed to start projection: "+e.message)}))},e.stop=function(){i.disable(e.location).then((function(){s.success("Projection stopped")}),(function(e){s.failure("Failed to stop projection: "+e.message)}))},e.$on("$destroy",(function(){r.stop()}))}])})),define("modules/projections/controllers/ProjectionsItemConfigCtrl",["./_module"],(function(e){"use strict";return e.controller("ProjectionsItemConfigCtrl",["$scope","$state","$stateParams","ProjectionsService","ProjectionsMonitor","MessageService",function(e,t,n,i,r,s){e.location=n.location,i.configuration(e.location).then((function(t){e.config=t.data}),(function(t){e.config={},s.failure("Failed to load projection configuration: "+t.message)})),r.start(e.location,{ignoreQuery:!0}).then(null,null,(function(t){t.statistics&&t.statistics.projections.length&&(e.stats=t.statistics.projections[0]),t.result&&(e.result=t.result),t.state&&(e.state=t.state)})),e.save=function(){var t={emitEnabled:e.config.emitEnabled,trackEmittedStreams:e.config.trackEmittedStreams,checkpointAfterMs:e.config.checkpointAfterMs,checkpointHandledThreshold:e.config.checkpointHandledThreshold,checkpointUnhandledBytesThreshold:e.config.checkpointUnhandledBytesThreshold,pendingEventsThreshold:e.config.pendingEventsThreshold,maxWriteBatchLength:e.config.maxWriteBatchLength,maxAllowedWritesInFlight:e.config.maxAllowedWritesInFlight,projectionExecutionTimeout:e.config.projectionExecutionTimeout};i.updateConfiguration(e.location,t).then((function(){s.success("Projection configuration saved")}),(function(e){s.failure("Failed to save projection configuration: "+e.message)}))},e.$on("$destroy",(function(){r.stop()}))}])})),define("modules/projections/controllers/ProjectionsListCtrl",["./_module"],(function(e){"use strict";return e.controller("ProjectionsListCtrl",["$rootScope","$scope","$timeout","ProjectionsService","ProjectionsMapper","poller","MessageService","$state",function(e,t,n,i,r,s,o,a){function l(){if(!e.projectionsEnabled)return o.failure("Projections are not enabled on the node"),void a.go("dashboard.list");var l=s.create({interval:2e3,action:i.all,params:[!1]});l.start(),l.promise.then(null,null,(function(e){t.projections=r.map(e)})),l.promise.catch((function(e){o.failure("Failed to retrieve list of projections: "+e.message),l.stop()})),t.disableAll=function(e){e.preventDefault(),e.stopPropagation(),o.confirm("Are you sure you want to disable & stop all projections?")&&i.disableAll().then((function(){o.success("All projections have been disabled")}),(function(e){o.failure("Failed to disable all the projections: "+e)}))},t.enableAll=function(e){e.preventDefault(),e.stopPropagation(),o.confirm("Are you sure you want to enable & start all projections?")&&i.enableAll().then((function(){o.success("All projections have been enabled")}),(function(e){o.failure("Failed to enable all projections: "+e)}))},t.includeQueries=!1,t.toggleIncludeQueries=function(){t.includeQueries=!t.includeQueries},t.showCopiedMessage=function(e){e.copied=!0,o.success('Copied "'+e.name+'" to clipboard'),n((function(){e.copied=!1}),4e3)};var c=t.$watch("includeQueries",(function(e,t){e!==t&&l.update({params:[e]})}));t.$on("$destroy",(function(){c(),s.clear()}))}if(e.initialized)l();else var c=e.$on("initialized",(function(){l(),c()}))}])})),define("modules/projections/controllers/ProjectionsNewCtrl",["./_module"],(function(e){"use strict";return e.controller("ProjectionsNewCtrl",["$scope","$state","ProjectionsService","MessageService",function(e,t,n,i){function r(e){return e?"yes":"no"}e.aceConfig={mode:"javascript",useWrapMode:!1,showGutter:!0,theme:"monokai"},e.modes=[{value:"onetime",name:"One-Time"},{value:"continuous",name:"Continuous"}],e.mode="onetime",e.enabled=!0,e.checkpointsDisabled=!1,e.checkpoints=!1,e.trackEmittedStreams=!1,e.save=function(){if(e.newProj.$invalid)i.warn("Please fix all validation errors");else{var s={name:e.name,emit:r(e.emit),checkpoints:r(e.checkpoints),enabled:r(e.enabled),trackemittedstreams:r(e.trackemittedstreams)};n.create(e.mode,e.source,s).then((function(e){var n=(0,e.headers)().location;t.go("^.item.details",{location:encodeURIComponent(n)})}),(function(e){i.failure("Failed to create new projection: "+e.message)}))}};var s=e.$watch("mode",(function(t,n){t!==n&&("continuous"===t?(e.checkpoints=!0,e.checkpointsDisabled=!0):(e.checkpointsDisabled=!1,e.checkpoints=!0))}));e.$on("$destroy",(function(){s()}))}])})),define("modules/projections/controllers/ProjectionsStandardCtrl",["./_module"],(function(e){"use strict";return e.controller("ProjectionsStandardCtrl",["$scope","$state","ProjectionsService","MessageService",function(e,t,n,i){e.types=[{value:"native:EventStore.Projections.Core.Standard.IndexStreams",name:"Index Streams"},{value:"native:EventStore.Projections.Core.Standard.CategorizeStreamByPath",name:"Categorize Stream by Path"},{value:"native:EventStore.Projections.Core.Standard.CategorizeEventsByStreamPath",name:"Categorize Event by Stream Path"},{value:"native:EventStore.Projections.Core.Standard.IndexEventsByEventType",name:"Index Events by Event Type"},{value:"native:EventStore.Projections.Core.Standard.StubHandler",name:"Reading Speed Test Handler"}],e.aceConfig={mode:"javascript",useWrapMode:!1,showGutter:!0,theme:"monokai"},e.type="native:EventStore.Projections.Core.Standard.IndexStreams",e.save=function(){e.newProj.$invalid?i.info("Please fix all validation errors"):n.createStandard(e.name,e.type,e.source).then((function(e){var n=(0,e.headers)().location;t.go("^.item.details",{location:encodeURIComponent(n)})}),(function(e){i.failure("Failed to create new standard projection: "+e.message)}))}}])})),define("modules/projections/controllers/QueryCtrl",["./_module"],(function(e){"use strict";return e.controller("QueryCtrl",["$scope","$state","$stateParams","QueryService","ProjectionsMonitor","MessageService","ProjectionsService",function(e,t,n,i,r,s,o){var a;function l(){return r.stop(),i.disable(a)}function c(){e.maximized=!1;i.update(a,e.query).then((function(){var t=i.enable(a);e.state=void 0,r.stop(),r.start(a,{ignoreQuery:!0,ignoreResult:!0}).then(null,null,(function(t){var n,i,r,s;if(t.state&&(e.state=t.state,e.isStopped&&l()),t.statistics&&t.statistics.projections.length){i=(n=t.statistics.projections[0]).status,r=n.stateReason,e.status=i;var o=r.match(/[^\r\n]+/g);e.stateReason=null!==o&&o.length>0?o[0]:r,s=!!~i.indexOf("Stopped")&&!~i.indexOf("Preparing")||!!~i.indexOf("Faulted")||!!~i.indexOf("Completed"),e.isStopped=s,e.progress=n.progress}})),t.catch((function(e){s.failure("Failed to start query: "+e.message),r.stop()}))}),(function(e){404===e.statusCode?s.failure("The query was not updated because it was not found. The query probably expired and was deleted."):s.failure("Failed to update the query: "+e.message)}))}n.location?(a=n.location,o.query(a).then((function(t){e.query=t.data.query}),(function(e){s.failure("Failed to load query source: "+e.message)}))):n.initStreamId?e.query="fromStream('"+n.initStreamId+"')\n  .when({\n  })":e.query=i.retrieveQuery(),e.aceConfig={mode:"javascript",useWrapMode:!1,showGutter:!0,theme:"monokai",onChange:function(){i.rememberQuery(e.query)}},e.disableStop=function(){return!e.isCreated||!!e.isStopped},e.run=function(){e.isCreated?c():i.create(e.query,{emit:"no",checkpoints:"no",enabled:"no"}).then((function(t){var n=t.headers;a=n().location,e.isCreated=!0,c()}),(function(t){e.isCreated=!1,s.failure("Failed to create new query: "+t.message)}))},e.stop=function(){l().catch((function(e){s.failure("Failed to stop query: "+e.message)}))},e.debug=function(){i.disable(a).then((function(){i.reset(a).then((function(){t.go("projections.item.debug",{location:encodeURIComponent(a),fromQueryState:!0},{inherit:!1})}),(function(e){s.failure("Failed to reset query: "+e.message)}))}),(function(e){s.failure("Failed to stop query: "+e.message)}))};var u=e.$watch("query",(function(e,t,n){}));e.$on("$destroy",(function(){u(),r.stop()}))}])})),define("modules/projections/controllers/_index",["./ProjectionsItemDebugCtrl","./ProjectionsItemDeleteCtrl","./ProjectionsItemDetailsCtrl","./ProjectionsItemEditCtrl","./ProjectionsItemConfigCtrl","./ProjectionsListCtrl","./ProjectionsNewCtrl","./ProjectionsStandardCtrl","./QueryCtrl"],(function(){})),define("modules/projections/services/_module",["angular"],(function(e){"use strict";return e.module("es-ui.projections.services",[])})),define("modules/projections/services/ProjectionsService",["./_module"],(function(e){"use strict";return e.provider("ProjectionsService",(function(){this.$get=["$http","$q","urls","constants","UrlBuilder","uri",function(e,t,n,i,r,s){function o(n,i,r){var s=n(),o=t.defer();return s.then((function(n){var s,a=n.data,l=[],c=[];angular.forEach(a.projections,(function(t){s=t.statusUrl+i,t.status!==r&&(l.push(e.post(s)),c.push(t))})),0!==l.length?t.allSettled(l).then((function(e){o.resolve(e)}),(function(e){for(var t="",n=0,i=0;i<e.length;i++)e[i].data||(n>0&&(t+=", "),t+=c[i].name+": "+e[i].message,n+=1);o.reject(t)})):o.resolve([])}),(function(e){o.reject("Failed to retrieve projections list: "+e.message)})),o.promise}return{all:function(t){var i;return i=t?r.build(n.projections.any):r.build(n.projections.allNonTransient),e.get(i)},disableAll:function(){return o(this.all,n.projections.disable,i.projectionStatus.stopped)},enableAll:function(){return o(this.all,n.projections.enable,i.projectionStatus.running)},create:function(t,i,o){var a=s.getQuery(o),l=r.build(n.projections.create,t)+a;return e.post(l,i)},createStandard:function(t,i,s,o){var a=r.build(n.projections.createStandard,t,i);return e.post(a,s)},status:function(t,n){return t=r.simpleBuild("%s",t),e.get(t,n)},partitionedState:function(t){return function(i,o,a){var l;return o&&!o.timeout?(t.partition&&(o.partition=t.partition),l="?"+s.getQuery(o)):(l=t.partition?"?"+s.getQuery({partition:t.partition}):"",a=o),i=r.simpleBuild(n.projections.state,i)+l,e.get(i,a)}},state:function(t,i,o){var a;return i&&!i.timeout?(a=s.getQuery(i),t=r.simpleBuild(n.projections.state,t)+"?"+a):(o=i,t=r.simpleBuild(n.projections.state,t)),e.get(t,o)},result:function(t,i){return t=r.simpleBuild(n.projections.result,t),e.get(t,i)},statistics:function(t,i){return t=r.simpleBuild(n.projections.statistics,t),e.get(t,i)},query:function(t,i,s){return t=i&&!i.timeout?r.simpleBuild(n.projections.queryWithoutConfig,t):r.simpleBuild(n.projections.query,t),e.get(t,s)},readEvents:function(t,i,s){var o,a=r.build(n.projections.readEvents);return o={query:t,position:i,maxEvents:s=s||10},e.post(a,JSON.stringify(o))},remove:function(t,i,o){i.timeout&&(i=void 0);var a=s.getQuery(i);return t=r.simpleBuild(n.projections.remove,t)+a,e.delete(t)},reset:function(t){return t=r.simpleBuild(n.projections.commands.reset,t),e.post(t)},enable:function(t){return t=r.simpleBuild(n.projections.commands.enable,t),e.post(t)},disable:function(t){return t=r.simpleBuild(n.projections.commands.disable,t),e.post(t)},updateQuery:function(t,i,s){return t=i?r.simpleBuild(n.projections.updateQuery,t)+i:r.simpleBuild(n.projections.updatePlainQuery,t),e.put(t,s)},configuration:function(t){return t=r.simpleBuild(n.projections.configuration,t),e.get(t)},updateConfiguration:function(t,i){return t=r.simpleBuild(n.projections.configuration,t),e.put(t,i,{headers:{"Content-Type":"application/json"}})}}}]}))})),define("modules/projections/services/ProjectionsMapper",["./_module"],(function(e){"use strict";return e.provider("ProjectionsMapper",(function(){var e,t={};function n(n){var i,r,s,o,a,l=n.projections,c={},u=new Date,h=0,d=l.length;for(l.sort((function(e,t){return e.name.localeCompare(t.name)}));h<d;h++)a=(i=l[h]).name,o=t[a],c[a]=i,void 0!==o&&e&&(r=i.eventsProcessedAfterRestart-o.eventsProcessedAfterRestart,s=u-e,i.eventsPerSecond=(1e3*r/s).toFixed(1)),i.location=encodeURIComponent(i.statusUrl),l[h]=i;return t=c,e=u,l}this.$get=[function(){return{map:n}}]}))})),define("modules/projections/services/ProjectionsMonitor",["./_module"],(function(e){"use strict";return e.factory("ProjectionsMonitor",["$q","poller","ProjectionsService","MessageService",function(e,t,n,i){var r;function s(e,n,i,r){var s=t.create({interval:1e3,action:n,params:[e]});return s.start(),s.promise.then(null,r,i),s}return{start:function(t,o){return o=o||{},r=e.defer(),o.ignoreStats||s(t,n.statistics,(function(e){r?r.notify({statistics:e}):console.log("deffered is null")}),(function(e){i.failure("Failed to fetch projection statistics: "+e.message)})),!o.ignoreState&&o.partitionProvider?s(t,n.partitionedState(o.partitionProvider),(function(e){r?r.notify({state:e}):console.log("deffered is null")}),(function(e){i.failure("Failed to fetch projection partition state: "+e.message)})):o.ignoreState||o.partitionProvider||s(t,n.state,(function(e){r?r.notify({state:e}):console.log("deffered is null")}),(function(e){i.failure("Failed to fetch projection state: "+e.message)})),o.ignoreQuery||s(t,n.query,(function(e){r?r.notify({query:e}):console.log("deffered is null")}),(function(e){i.failure("Failed to fetch projection query: "+e.message)})),o.ignoreResult||s(t,n.result,(function(e){r?r.notify({result:e}):console.log("deffered is null")}),(function(e){i.failure("Failed to fetch projection result: "+e.message)})),r.promise},stop:function(){t.clear(),null,null,null,null,r&&r.resolve()}}}])})),define("modules/projections/services/QueryService",["./_module"],(function(e){"use strict";return e.provider("QueryService",(function(){this.$get=["$http","$q","urls","UrlBuilder","uri",function(e,t,n,i,r){return{rememberQuery:function(e){localStorage&&localStorage.setItem("latest-query",e)},retrieveQuery:function(){return localStorage&&localStorage.getItem("latest-query")||""},create:function(t,s){var o=r.getQuery(s),a=i.build(n.query.create)+o;return e.post(a,t)},update:function(t,r){return t=i.simpleBuild(n.query.update,t),e.put(t,r)},state:function(t){return t=i.simpleBuild(n.query.state,t),e.get(t)},enable:function(t){return t=i.simpleBuild(n.query.commands.enable,t),e.post(t)},disable:function(t){return t=i.simpleBuild(n.query.commands.disable,t),e.post(t)},reset:function(t){return t=i.simpleBuild(n.query.commands.reset,t),e.post(t)}}}]}))})),define("modules/projections/services/AtomEventsReader",["./_module"],(function(e){"use strict";return e.factory("AtomEventsReader",["$q","$timeout","StreamsService","uri","poller",function(e,t,n,i,r){var s,o;return{start:function(t){return this.stop(),s=e.defer(),(o=r.create({interval:1e3,action:n.streamEvents,params:[t]})).start(),o.promise.then(null,null,(function(e){r.stopAll();var t,o,a,l,c=function(e){var t,n,r,s,o=[],a={};for(t=e.entries,r=e.links.length,n=0;n<r;n++)(s=e.links[n]).fullUri=s.uri,s.uri="#"+i.parse(s.uri).pathname,"previous"===s.relation&&(a={index:n,uri:s.fullUri}),o.push(s);return{headOfStream:e.headOfStream,entries:t,links:o,previous:a}}(e);s.notify(c),t=c.previous,o=e.headOfStream,a=function(){r.resume()},l=function(){r.clear(),s.resolve()},o?(t.uri||a(),n.validateFullUrl(t.uri).then((function(){a()}),(function(e){console.error("Failed to validate URL: "+t.uri+". Error: "+e.message)}))):l()})),o.promise.catch((function(e){r.clear(),s.reject(e)})),s.promise},map:function(e,t){var n,i,r=e.length;for(n=0;n<r;n++)t[(i=e[n]).title]&&(i.showJson=!0),e[n]=i;return e},stop:function(){r.clear(),s=null},pause:function(){r.pauseAll()},resume:function(){r.resume()},resumePaused:function(){r.resumePaused()}}}])})),define("modules/projections/services/_index",["./ProjectionsService","./ProjectionsMapper","./ProjectionsMonitor","./QueryService","./AtomEventsReader"],(function(){})),define("modules/projections/directives/_module",["angular"],(function(e){"use strict";return e.module("es-ui.projections.directives",[])})),define("modules/projections/directives/EsProjDebugFrame",["./_module"],(function(e){"use strict";return e.directive("esProjDebugFrame",["$rootScope",function(e){return{restrict:"A",scope:{esLocation:"="},link:function(t,n){var i='<div id="text"></div><script src="BASE_URI/web/es/js/projections/v8/Prelude/Modules.js"><\/script><script src="BASE_URI/web/es/js/projections/v8/Prelude/Projections.js"><\/script><script src="BASE_URI/web/es/js/projections/es.projections.environment.js"><\/script><script src="BASE_URI/web/es/js/projections/v8/Prelude/1Prelude.js"><\/script><script>window.processor = $initialize_hosted_projections(); processor.set_debugging();<\/script><script src="LOCATION/query"><\/script>';i=(i=i.replace(/BASE_URI/g,e.baseUrl)).replace(/LOCATION/g,decodeURIComponent(t.esLocation)),t.$on("load-scripts",(function(){!function(){var e=document.getElementById("script-placeholder");e&&e.parentNode.removeChild(e)}();var e,t=document.createElement("iframe");t.setAttribute("frameborder","0"),t.setAttribute("width","100%"),t.id="script-placeholder",n[0].appendChild(t),e=t.document,t.contentDocument?e=t.contentDocument:t.contentWindow&&(e=t.contentWindow.document),e.open(),e.writeln(i),e.close()}))}}}])})),define("modules/projections/directives/_index",["./EsProjDebugFrame"],(function(){})),define("modules/projections/templates/templates",["angular"],(function(e){"use strict";!function(t){try{t=e.module("es-ui.projections.templates")}catch(n){t=e.module("es-ui.projections.templates",[])}t.run(["$templateCache",function(e){e.put("projections.item.config.tpl.html",'<header class=page-header><h2 class=page-title>Projection Configuration</h2><ul class=page-nav><li class=page-nav__item><button ng-click=save()>Save</button></li><li class=page-nav__item><a ui-sref=^.details>Back</a></li></ul></header><h3>{{stats.name}} - {{stats.status}}</h3><p><strong>mode: </strong><span>{{stats.mode}}</span></p><p style="background-color: red; color: white" ng-if=stats.stateReason>{{stats.stateReason}}</p><table><tbody><tr class=table-subheading><td colspan=2>Projection Configuration</td></tr><tr><td>Emit Enabled</td><td><input type=checkbox ng-model=config.emitEnabled required class=form-table name=emit></td></tr><tr><td>Track Emitted Streams</td><td><input type=checkbox ng-model=config.trackEmittedStreams required class=form-table name=trackEmittedStreams></td></tr><tr><td>Checkpoint After (ms)</td><td><input ng-model=config.checkpointAfterMs required class=form-table name=checkpointAfterMs></td></tr><tr><td>Checkpoint Handled Threshold</td><td><input ng-model=config.checkpointHandledThreshold required class=form-table name=checkpointHandledThreshold></td></tr><tr><td>Checkpoint Unhandled Threshold (bytes)</td><td><input ng-model=config.checkpointUnhandledBytesThreshold required class=form-table name=checkpointUnhandledBytesThreshold></td></tr><tr><td>Pending Events Threshold</td><td><input ng-model=config.pendingEventsThreshold required class=form-table name=pendingEventsThreshold></td></tr><tr><td>Max Write Batch Length</td><td><input ng-model=config.maxWriteBatchLength required class=form-table name=maxWriteBatchLength></td></tr><tr><td>Maximum Number Of Allowed Writes In Flight</td><td><input ng-model=config.maxAllowedWritesInFlight required class=form-table name=maxAllowedWritesInFlight></td></tr><tr><td>Per Event Projection Processing Timeout</td><td><input ng-model=config.projectionExecutionTimeout required class=form-table name=projectionExecutionTimeout></td></tr></tbody></table>')}])}(),function(t){try{t=e.module("es-ui.projections.templates")}catch(n){t=e.module("es-ui.projections.templates",[])}t.run(["$templateCache",function(e){e.put("projections.item.debug.tpl.html",'<header class=page-header><h2 class=page-title>Projection Debug</h2><ul class=page-nav><li class=page-nav__item><button ng-click=runStep() ng-disabled=isRunning>Run Step</button></li><li class=page-nav__item><button ng-click=stop() ng-disabled=!isRunning>Stop</button></li><li class=page-nav__item><button ng-click=update() ng-disabled=isUpdating>Update</button></li><li class=page-nav__item><a ng-click=goBack()>Back</a></li></ul></header><h3>Current Status: <small>{{statusInfo}}</small></h3><div class=container><div class=container-left><h3 class=block-title>Source</h3><div ng-show=queryUpdated><h4>The query has been updated but not saved. Your changes will not take effect until you hit the "Update" button</h4></div><div ui-ace=aceConfig ng-model=query></div></div><div class=container-right><h3 class=block-title>State {{ currentPartition }}</h3><pre>\n{{ state | json }}\n\t\t\t\t</pre><h3 class=block-title>Events</h3><div ui-ace=aceEventsConfig readonly=true ng-model=events></div></div></div><div class=container><div class=container-left><div class=block><h3 class=block-title>Instructions</h3><ol><li>Make sure you use the Google Chrome browser.</li><li>Open a debugger (<kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>J</kbd> on Windows).</li><li>Check the debugger console for errors (occurred while running the projection definition on while loading state and events).</li><li>Click the ‘Run’ button above.</li><li>Watch for errors in the debugger console</li><li>Check the debugging status on XXXXXXXXX.</li><li>Execution will stop on ‘debugger’ statement immediately before invoking your event handler.</li></ol><p>Any log output and emitted events will appear in the log viewer.</p><p class=note--warning>The projection will be debugged using the browsers javascript engine and may behave differently than when it is running normally</p></div></div><div class=container-right><h3 class=block-title>Log Viewer</h3><div es-proj-debug-frame es-location=location></div></div></div>')}])}(),function(t){try{t=e.module("es-ui.projections.templates")}catch(n){t=e.module("es-ui.projections.templates",[])}t.run(["$templateCache",function(e){e.put("projections.item.delete.tpl.html","<header class=page-header><h2 class=page-title>Delete Projection</h2><ul class=page-nav><li class=page-nav__item><a ng-click=remove($event) href=#>Confirm Delete</a> <a ui-sref=^.details>Back</a></li></ul></header><table><tbody><tr><td>Name</td><td><span>{{ projection.name }}</span></td></tr><tr><td>State</td><td><span>{{ projection.state }}</span></td></tr><tr><td>Source</td><td><pre>\n{{ projection.source }}\n\t\t\t\t</pre></td></tr><tr><td></td><td><label><input type=checkbox ng-model=deleteCheckpoint> Delete Checkpoint Stream</label></td></tr><tr><td></td><td><label><input type=checkbox ng-model=deleteState> Delete State Stream</label></td></tr><tr><td></td><td><label><input type=checkbox ng-model=deleteEmittedStreams> Delete Emitted Streams</label></td></tr></tbody></table>")}])}(),function(t){try{t=e.module("es-ui.projections.templates")}catch(n){t=e.module("es-ui.projections.templates",[])}t.run(["$templateCache",function(e){e.put("projections.item.details.tpl.html",'<header class=page-header><h2 class=page-title>Projection Details</h2><ul class=page-nav><li class=page-nav__item><button ng-click=start() ng-disabled=isRunning href=#>Start</button></li><li class=page-nav__item><button ng-click=stop() ng-disabled=isStopped>Stop</button></li><li class=page-nav__item><a ui-sref=^.edit>Edit</a></li><li class=page-nav__item><a ui-sref=^.config>Config</a></li><li ng-show=!isTransientProjection class=page-nav__item><a ui-sref=^.debug>Debug</a></li><li class=page-nav__item><a ui-sref=^.delete ng-if=!isRunning>Delete</a> <a title="a Projection must be stopped before it may be deleted." ng-if=isRunning ng-disabled=isRunning>Delete</a></li><li ng-show=!isTransientProjection class=page-nav__item><button ng-click=reset($event)>Reset</button></li><li class=page-nav__item><a ui-sref=^.^.list>Back</a></li></ul></header><h3>{{stats.name}} - {{stats.status}}</h3><p><strong>mode: </strong><span>{{stats.mode}}</span></p><p style="background-color: red; color: white" ng-if=stats.stateReason>{{stats.stateReason}}</p><div class=container><div class=container-left><h3 class=block-title>Source</h3><div readonly=true ui-ace=aceConfig ng-model=query></div></div><div class=container-right><table><thead><tr><th colspan=2>Stats</th></tr></thead><tbody><tr><td>Events/sec</td><td>{{ stats.eventsPerSecond }}</td></tr><tr><td>Buffered events</td><td>{{ stats.bufferedEvents }}</td></tr><tr><td>Events processed</td><td>{{ stats.eventsProcessedAfterRestart }}</td></tr><tr><td>Partitions cached</td><td>{{ stats.partitionsCached }}</td></tr><tr><td>Reads in-progress</td><td>{{ stats.readsInProgress }}</td></tr><tr><td>Writes in-progress</td><td>{{ stats.writesInProgress }}</td></tr><tr><td>Write queue</td><td>{{ stats.writePendingEventsAfterCheckpoint }}</td></tr><tr><td>Write queue (chkp)</td><td>{{ stats.writePendingEventsBeforeCheckpoint }}</td></tr><tr><td>Checkpoint status</td><td>{{ stats.checkpointStatus }}</td></tr><tr><td>Position</td><td>{{ stats.position }}</td></tr><tr><td>Last checkpoint</td><td>{{ stats.lastCheckpoint }}</td></tr></tbody></table><table><thead><tr><th colspan=2>Results <span ng-show=stream>(<a ui-sref="streams.item.events({streamId: stream})">{{ stream }}</a>)</span></th></tr></thead><tbody><tr><td colspan=2><pre>{{result | json}}</pre></td></tr></tbody></table><table><thead><tr><th colspan=2>State</th></tr></thead><tbody><tr><td colspan=2><input ng-model=partition ng-change=clearState() placeholder=partition></td></tr><tr><td colspan=2><pre>{{state | json}}</pre></td></tr></tbody></table></div></div>')}])}(),function(t){try{t=e.module("es-ui.projections.templates")}catch(n){t=e.module("es-ui.projections.templates",[])}t.run(["$templateCache",function(e){e.put("projections.item.edit.tpl.html",'<header class=page-header><h2 class=page-title>Projection Edit</h2><ul class=page-nav><li class=page-nav__item><button ng-click=start() ng-disabled=isRunning href=#>Start</button></li><li class=page-nav__item><button ng-click=stop() ng-disabled=isStopped>Stop</button></li><li class=page-nav__item><button ng-click=save()>Save</button></li><li class=page-nav__item><button ng-click=reset($event)>Reset</button></li><li class=page-nav__item ng-hide=maximized><button ng-click="maximized = true">Maximize</button></li><li class=page-nav__item ng-show=maximized><button ng-click="maximized = false">Minimize</button></li><li class=page-nav__item><a ui-sref=^.details>Back</a></li></ul></header><h3>{{stats.name}} - {{stats.status}}</h3><p ng-hide=maximized><strong>mode: </strong><span>{{stats.mode}}</span></p><p style="background-color: red; color: white" ng-if=stats.stateReason>{{stats.stateReason}}</p><div class=container><div class=edit-projection ng-class="{ \'container-left\': !maximized, maximized: maximized }"><h3 class=block-title ng-hide=maximized>Source</h3><div ui-ace=aceConfig ng-model=query></div><label><input type=checkbox ng-model=emit>Emit enabled</label></div><div ng-hide=maximized class=container-right><table><thead><tr><th colspan=2>Results <span ng-show=stream>(<a ui-sref="streams.item.events({streamId: stream})">{{ stream }}</a>)</span></th></tr></thead><tbody><tr><td colspan=2><pre>{{result | json}}</pre></td></tr></tbody><thead><tr><th colspan=2>State</th></tr></thead><tbody><tr><td colspan=2><input ng-model=partition ng-change=clearState() placeholder=partition></td></tr><tr><td colspan=2><pre>{{state | json}}</pre></td></tr></tbody></table></div></div>')}])}(),function(t){try{t=e.module("es-ui.projections.templates")}catch(n){t=e.module("es-ui.projections.templates",[])}t.run(["$templateCache",function(e){e.put("projections.item.tpl.html","<div ui-view></div>")}])}(),function(t){try{t=e.module("es-ui.projections.templates")}catch(n){t=e.module("es-ui.projections.templates",[])}t.run(["$templateCache",function(e){e.put("projections.list.tpl.html",'<header class=page-header><h2 class=page-title>Projections</h2><ul class=page-nav><li class=page-nav__item><a ng-click=disableAll($event)>Disable All</a></li><li class=page-nav__item><a ng-click=enableAll($event)>Enable All</a></li><li class=page-nav__item><a ng-if=includeQueries class=highlight ng-click=toggleIncludeQueries()>Don\'t Include Queries</a> <a ng-if=!includeQueries ng-click=toggleIncludeQueries()>Include Queries</a></li><li class=page-nav__item><a ui-sref=^.new>New Projection</a></li></ul></header><table class=table-projections><thead><tr><th>Name</th><th>Status</th><th>Checkpoint Status</th><th>Mode</th><th>Done</th><th>Read / Write in Progress</th><th>Write Queues</th><th>Partitions Cached</th><th>Rate (events/s)</th><th colspan=2>Events</th></tr><tr><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th class=table-subheading>Processed</th><th class=table-subheading>Buffered</th></tr></thead><tbody ng-repeat="projection in projections"><tr><td><a ui-sref="^.item.details({location: projection.location})">{{ projection.name }}</a><li class="page-nav__item copy-icon-right"><a ui-sref=# clipboard ng-class="{ copied: projection.copied }" text=projection.name on-copied=showCopiedMessage(projection)>⎘</a></li></td><td>{{ projection.status }}</td><td>{{ projection.checkpointStatus == \'\' ? \'-\' : projection.checkpointStatus }}</td><td>{{ projection.mode }}</td><td>{{ projection.progress.toFixed(1) }}%</td><td>{{ projection.readsInProgress }} / {{ projection.writesInProgress }}</td><td>{{ projection.writePendingEventsAfterCheckpoint }} / {{ projection.writePendingEventsBeforeCheckpoint }}</td><td>{{ projection.partitionsCached }}</td><td>{{ projection.eventsPerSecond }}</td><td>{{ projection.eventsProcessedAfterRestart }}</td><td>{{ projection.bufferedEvents }}</td></tr><tr ng-if="projection.status.indexOf(\'Faulted\') !== -1"><td style="background-color: red; color: white; font-size: .9rem; padding-left: 2rem;" colspan=10000>{{ projection.stateReason }}</td></tr><tr ng-hide=projections><td colspan=10><em>No projections</em></td></tr></tbody></table>')}])}(),function(t){try{t=e.module("es-ui.projections.templates")}catch(n){t=e.module("es-ui.projections.templates",[])}t.run(["$templateCache",function(e){e.put("projections.new.tpl.html",'<header class=page-header><h2 class=page-title>New Projection</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.list>Back</a></li></ul></header><div><a ui-sref=^.standard>You can also post a standard projection</a></div><form novalidate name=newProj ng-submit=save() class=new-projection-form><table><tbody><tr><td>Name</td><td><input ng-model=name required class=form-table name=projName ng-class="{ \'form-table--error\' : newProj.projName.$invalid && !newProj.projName.$pristine }"></td></tr><tr><td>Source</td><td><div ui-ace=aceConfig required ng-model=source></div></td></tr><tr><td>Mode</td><td><select ng-model=mode class=form-table ng-options="obj.value as obj.name for obj in modes"></select></td></tr><tr><td>Checkpoints Enabled</td><td><input type=checkbox ng-model=checkpoints ng-disabled=checkpointsDisabled></td></tr><tr><td>Emit Enabled</td><td><input type=checkbox ng-model=emit></td></tr><tr><td>Track Emitted Streams</td><td><input type=checkbox ng-model=trackemittedstreams ng-disabled=trackEmittedStreamsDisabled></td></tr><tr><td>Enabled</td><td><input type=checkbox ng-model=enabled></td></tr></tbody></table><ul class=page-nav><li class=page-nav__item><button type=submit ng-disabled=newProj.$invalid>Create</button></li></ul></form>')}])}(),function(t){try{t=e.module("es-ui.projections.templates")}catch(n){t=e.module("es-ui.projections.templates",[])}t.run(["$templateCache",function(e){e.put("projections.standard.tpl.html",'<header class=page-header><h2 class=page-title>New Standard Projection</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.list>Back</a></li></ul></header><form novalidate name=newProj ng-submit=save()><table><tbody><tr><td>Name</td><td><input ng-model=name required class=form-table name=projName ng-class="{ \'form-table--error\' : newProj.projName.$invalid && !newProj.projName.$pristine }"></td></tr><tr><td>Source</td><td><div ui-ace=aceConfig required ng-model=source></div></td></tr><tr><td>Select Type</td><td><select ng-model=type required class=form-table ng-options="obj.value as obj.name for obj in types"></select></td></tr></tbody></table><ul class=page-nav><li class=page-nav__item><button type=submit ng-disabled=newProj.$invalid>Create</button></li></ul></form>')}])}(),function(t){try{t=e.module("es-ui.projections.templates")}catch(n){t=e.module("es-ui.projections.templates",[])}t.run(["$templateCache",function(e){e.put("projections.tpl.html","<div ui-view></div>")}])}(),function(t){try{t=e.module("es-ui.projections.templates")}catch(n){t=e.module("es-ui.projections.templates",[])}t.run(["$templateCache",function(e){e.put("query.tpl.html",'<header class=page-header><h2 class=page-title>Query</h2><ul class=page-nav><li class=page-nav__item><button ng-click=run()>Run</button></li><li class=page-nav__item><button ng-click=stop() ng-disabled=disableStop()>Break</button></li><li class=page-nav__item><button ng-click=debug() ng-disabled=!isCreated>Debug</button></li><li class=page-nav__item ng-hide=maximized><button ng-click="maximized = true">Maximize</button></li><li class=page-nav__item ng-show=maximized><button ng-click="maximized = false">Minimize</button></li></ul></header><h3 ng-visible=status>{{status}} <span ng-if="isStopped === false && progress > 0">({{ progress | number:2 }}%)</span><br></h3><i>{{stateReason}}</i><div class=container><div class=edit-projection ng-class=" { \'container-left\': !maximized, maximized: maximized }"><h3 class=block-title>Source</h3><div ui-ace=aceConfig ng-model=query></div></div><div ng-hide=maximized class=container-right><h3 class=block-title>State</h3><pre ng-if="state !== undefined">\n{{state | json}}\n\t\t</pre></div></div>')}])}()})),define("modules/projections/_index",["angular","uiRouter","./controllers/_index","./services/_index","./directives/_index","./templates/templates"],(function(e){"use strict";return e.module("es-ui.projections",["ui.router","es-ui.projections.controllers","es-ui.projections.services","es-ui.projections.directives","es-ui.projections.templates"])})),define("modules/projections/module",["./_index"],(function(e){"use strict";return e.config(["$stateProvider",function(e){e.state("projections",{url:"projections",parent:"app",abstract:!0,templateUrl:"projections.tpl.html",data:{title:"Projections"}}).state("projections.list",{url:"",templateUrl:"projections.list.tpl.html",controller:"ProjectionsListCtrl",data:{title:"Projections"}}).state("projections.new",{url:"/new",templateUrl:"projections.new.tpl.html",controller:"ProjectionsNewCtrl",data:{title:"New Projection"}}).state("projections.standard",{url:"/standard",templateUrl:"projections.standard.tpl.html",controller:"ProjectionsStandardCtrl",data:{title:"New Standard Projection"}}).state("projections.item",{url:"/{location}",abstract:!0,templateUrl:"projections.item.tpl.html"}).state("projections.item.details",{url:"",templateUrl:"projections.item.details.tpl.html",controller:"ProjectionsItemDetailsCtrl",data:{title:"Projection Details"}}).state("projections.item.delete",{url:"/delete",templateUrl:"projections.item.delete.tpl.html",controller:"ProjectionsItemDeleteCtrl",data:{title:"Projection Delte"}}).state("projections.item.debug",{url:"/debug?fromQueryState",templateUrl:"projections.item.debug.tpl.html",controller:"ProjectionsItemDebugCtrl",data:{title:"Projection Debug"}}).state("projections.item.edit",{url:"/edit",templateUrl:"projections.item.edit.tpl.html",controller:"ProjectionsItemEditCtrl",data:{title:"Projection Edit"}}).state("projections.item.config",{url:"/config",templateUrl:"projections.item.config.tpl.html",controller:"ProjectionsItemConfigCtrl",data:{title:"Projection Configuration"}}).state("query",{url:"query?location&initStreamId",parent:"app",templateUrl:"query.tpl.html",controller:"QueryCtrl",data:{title:"Query"}})}])})),define("modules/admin/controllers/_module",["angular"],(function(e){"use strict";return e.module("es-ui.admin.controllers",["es-ui.admin.services"])})),define("modules/admin/controllers/AdminCtrl",["./_module"],(function(e){"use strict";return e.controller("AdminCtrl",["$scope","AdminService","MessageService","poller","$state","ScavengeNotificationService","constants","$timeout",function(e,t,n,i,r,s,o,a){e.subSystems=null,e.scavengeHistory=null,e.noSubSystemsText="No sub systems are running.",e.noScavengeHistoryText="No scavenges have been run.",e.polling=!1,t.getSubsystems().then((function(t){var n=t.data;n&&(e.subSystems=n)}),(function(t){401===t.statusCode?e.noSubSystemsText="You are not authorized to view enabled sub systems.":n.failure("Failed to retrieve sub systems: "+t.message)}));var l=function(e){e.preventDefault(),e.stopPropagation()};function c(t){if(t){for(var n={},i=0;i<t.entries.length;i++){var r=t.entries[i],s=JSON.parse(r.data),o=n[s.scavengeId];o||(o={scavengeId:s.scavengeId,nodeEndpoint:s.nodeEndpoint},n[s.scavengeId]=o),"$scavengeStarted"===r.eventType&&(o.startTime=new Date(r.updated)),"$scavengeCompleted"===r.eventType&&(o.endTime=new Date(r.updated),o.result=s.result)}for(var a=Object.keys(n).map((function(e){return n[e]})),l=[],c=0;c<a.length;c++)a[c].startTime&&l.push(a[c]);e.scavengeHistory=l}}e.shutdown=function(e){l(e),n.confirm("Are you sure you wish to shutdown the node?")&&t.shutdown().then((function(){n.success("Server shutdown initiated")}),(function(e){n.failure("Shutdown failed: "+e.message)}))},e.scavenge=function(e){l(e),t.scavenge().then((function(){d()}),(function(e){n.failure("Scavenge failed: "+e.message)}))},e.stopScavenge=function(e,i){l(e),t.stopScavenge(i.scavengeId).then(null,(function(e){n.failure("Stopping scavenge "+i.scavengeId+" failed: "+e.message)}))},e.scavengeHistoryButton=function(){r.go("streams.item.events",{streamId:"$scavenges"})};var u,h={};function d(){!0!==e.polling&&(e.polling=!0,(h=i.create({interval:o.scavengeStatus.pollInterval,action:t.scavengeStatus,params:[]})).start(),h.promise.then(null,(function(t){return 401===t.statusCode?(e.noScavengeHistoryText="You are not authorized to view the scavenge history",void(e.polling=!1)):404===t.statusCode?(e.noScavengeHistoryText="No scavenges have been run.",void(e.polling=!1)):(u&&(a.cancel(u),u=null),void(u=a((function(){d()}),o.scavengeStatus.pollInterval)))}),c))}d(),e.$on("$destroy",(function(){u&&(a.cancel(u),u=null),h.stop()}))}])})),define("modules/admin/controllers/ScavengeCtrl",["./_module"],(function(e){"use strict";return e.controller("ScavengeCtrl",["$scope","$state","AdminService","MessageService","poller","constants",function(e,t,n,i,r,s){e.pagination={pageNumber:parseInt(t.params.page),fromEventNumber:parseInt(t.params.from),pageSize:20,canGoForward:function(){return e.pagination.lastEventPos>0},canGoBackward:function(){return e.pagination.pageNumber>0}},e.scavengeInfo=[],e.scavengeId=t.params.scavengeId;var o=null;function a(t){if(t.length>0){var n=t[t.length-1],i=t[0];e.nodeEndpoint=JSON.parse(i.data).nodeEndpoint,e.pagination.firstEventPos=i.positionEventNumber,e.pagination.lastEventPos=n.positionEventNumber}!function(t){for(var n=[],i=0;i<t.length;i++){var r,s=t[i];switch(s.eventType){case"$scavengeStarted":n.push({status:"Started",type:s.EventType});break;case"$scavengeChunksCompleted":if(r="No chunks scavenged",(o=JSON.parse(s.data)).wasScavenged)r=o.chunkEndNumber-o.chunkStartNumber+1+" chunk(s) scavenged";o.errorMessage&&(r="Error: "+o.errorMessage),n.push({status:"Scavenging chunks "+o.chunkStartNumber+" - "+o.chunkEndNumber+" complete",timeTaken:o.timeTaken,spaceSaved:o.spaceSaved,type:s.eventType,result:r});break;case"$scavengeMergeCompleted":if(r="No chunks merged",(o=JSON.parse(s.data)).wasMerged)r=o.chunkEndNumber-o.chunkStartNumber+1+" chunk(s) merged";o.errorMessage&&(r="Error: "+o.errorMessage),n.push({status:"Merging chunks "+o.chunkStartNumber+" - "+o.chunkEndNumber+" complete",timeTaken:o.timeTaken,spaceSaved:o.spaceSaved,type:s.eventType,result:r});break;case"$scavengeIndexCompleted":var o;r="Index table not scavenged",(o=JSON.parse(s.data)).wasScavenged&&(r=o.entriesDeleted+" index entries scavenged"),o.errorMessage&&(r="Error: "+o.errorMessage);var a="("+o.level+","+o.index+")";n.push({status:"Scavenging index table "+a+" complete",timeTaken:o.timeTaken,spaceSaved:o.spaceSaved,type:s.eventType,result:r});break;case"$scavengeCompleted":var l=JSON.parse(s.data);r=l.result,"Failed"===l.result&&(r+=": "+l.error),n.push({status:"Completed",timeTaken:l.timeTaken,spaceSaved:l.spaceSaved,type:s.EventType,result:r})}e.scavengeInfo=n}}(t)}e.pageForward=function(){if(e.pagination.canGoForward()){var n=e.pagination.pageNumber+1,i=e.pagination.lastEventPos-1;t.go("scavenge",{scavengeId:e.scavengeId,page:n,from:i})}},e.pageBackward=function(){if(e.pagination.canGoBackward()){var n=e.pagination.pageNumber-1,i=e.pagination.firstEventPos+e.pagination.pageSize;t.go("scavenge",{scavengeId:e.scavengeId,page:n,from:i})}},0===e.pagination.pageNumber?(e.pagination.fromEventNumber="head",(o=r.create({interval:s.scavengeStatus.pollInterval,action:n.scavengeInfo,params:[e.scavengeId,e.pagination.fromEventNumber,e.pagination.pageSize]})).start(),o.promise.then(null,(function(e){i.failure("Failed to retrieve scavenge info: "+e.message)}),(function(e){a(e.entries)}))):n.scavengeInfo(e.scavengeId,e.pagination.fromEventNumber,e.pagination.pageSize).then((function(e){a(e.data.entries)}),(function(e){i.failure("Failed to retrieve scavenge info: "+e.message)})),e.$on("$destroy",(function(){o&&o.stop()}))}])})),define("modules/admin/controllers/_index",["./AdminCtrl","./ScavengeCtrl"],(function(){})),define("modules/admin/services/_module",["angular"],(function(e){"use strict";return e.module("es-ui.admin.services",[])})),define("modules/admin/services/AdminService",["./_module"],(function(e){"use strict";return e.provider("AdminService",(function(){this.$get=["$http","urls","UrlBuilder",function(e,t,n){return{halt:function(){var i=n.build(t.admin.halt);return e.post(i)},shutdown:function(){var i=n.build(t.admin.shutdown);return e.post(i)},scavenge:function(){var i=n.build(t.admin.scavenge);return e.post(i)},stopScavenge:function(i){var r=n.build(t.admin.scavenge+"/"+i);return e.delete(r)},getSubsystems:function(){var i=n.build(t.system.subsystems);return e.get(i)},scavengeStatus:function(){var i=n.build(t.streams.scavenges+"?embed=tryharder");return e.get(i)},scavengeInfo:function(i,r,s){var o=n.build(t.streams.scavenges+"/"+i+"/"+r+"/"+s+"?embed=tryharder");return e.get(o)},lastScavengeStatus:function(){var i=n.build(t.streams.scavenges+"/head/1?embed=tryharder");return e.get(i)}}}]}))})),define("modules/admin/services/_index",["./AdminService"],(function(){})),define("modules/admin/templates/templates",["angular"],(function(e){"use strict";!function(t){try{t=e.module("es-ui.admin.templates")}catch(n){t=e.module("es-ui.admin.templates",[])}t.run(["$templateCache",function(e){e.put("admin.tpl.html",'<header class=page-header><h2 class=page-title>Admin</h2><ul class=page-nav><li class=page-nav__item><a href=# ng-click=shutdown($event)>Shutdown Server</a></li><li class=page-nav__item><a href=# ng-click=scavenge($event)>Scavenge</a></li></ul></header><div class=container><div class=container-left><table><thead><tr><th>Enabled Sub Systems</th></tr></thead><tbody><tr ng-repeat="subSystem in subSystems"><td>{{ subSystem }}</td></tr><tr ng-hide=subSystems><td><em>{{noSubSystemsText}}</em></td></tr></tbody></table></div><div class=container-right><table><thead><tr><th>Scavenge</th><th>Started</th><th>Completed</th><th>Result</th></tr></thead><tbody><tr ng-hide=scavengeHistory><td colspan=4><em>{{noScavengeHistoryText}}</em></td></tr><tr ng-repeat="history in scavengeHistory track by history.scavengeId | orderBy : \'startTime\'"><td><a ui-sref="scavenge({scavengeId: history.scavengeId, page: 0, from: 0})">{{history.nodeEndpoint}}<br>{{history.scavengeId}}</a></td><td>{{history.startTime | date:\'yyyy-MM-dd HH:mm\'}}</td><td><span ng-show=history.endTime>{{history.endTime | date:\'yyyy-MM-dd HH:mm\'}}</span><span ng-hide=history.endTime><em>Not Finished</em></span></td><td><span ng-show=history.result>{{history.result}}</span> <span ng-hide=history.result class=page-nav__item><a ui-sref=# ng-click="stopScavenge($event, history)">Cancel</a></span></td></tr></tbody></table><span class=note--warning>If the progress of your scavenge(s) does not appear to be updating, this might indicate that there was an issue writing the status to disk. Please consult your logs.</span><ul class=page-nav><li class=page-nav__item><a ng-click=scavengeHistoryButton()>Scavenge History</a></li></ul></div></div>')}])}(),function(t){try{t=e.module("es-ui.admin.templates")}catch(n){t=e.module("es-ui.admin.templates",[])}t.run(["$templateCache",function(e){e.put("scavenge.tpl.html",'<header class=page-header><h2 class=page-title>Scavenge {{nodeEndpoint}}</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=admin>Back</a></li></ul></header><h3 class=page-title><em>{{scavengeId}}</em></h3><ul style="list-style-type: none; padding:0 0 0.75rem 0 !important"><li class=page-nav__item><a ng-click=pageForward() ng-disabled=!pagination.canGoForward()>Next</a> <a ng-click=pageBackward() ng-disabled=!pagination.canGoBackward()>Previous</a></li></ul><br><div class=container><table><thead><tr><th>Status</th><th>Space Saved (bytes)</th><th>Time Taken</th><th>Result</th></tr></thead><tbody><tr ng-repeat="info in scavengeInfo"><td>{{info.status}}</td><td>{{info.spaceSaved | number}}</td><td>{{info.timeTaken}}</td><td>{{info.result}}</td></tr></tbody></table></div>')}])}()})),define("modules/admin/_index",["angular","uiRouter","./controllers/_index","./services/_index","./templates/templates"],(function(e){"use strict";return e.module("es-ui.admin",["ui.router","es-ui.admin.controllers","es-ui.admin.services","es-ui.admin.templates"])})),define("modules/admin/module",["./_index"],(function(e){"use strict";return e.config(["$stateProvider",function(e){e.state("admin",{url:"admin",parent:"app",templateUrl:"admin.tpl.html",controller:"AdminCtrl",data:{title:"Admin"}}).state("scavenge",{url:"scavenge/{scavengeId}/?page?from",parent:"app",templateUrl:"scavenge.tpl.html",controller:"ScavengeCtrl",data:{title:"Scavenge"}})}])})),define("modules/dashboard/controllers/_module",["angular"],(function(e){"use strict";return e.module("es-ui.dashboard.controllers",["es-ui.dashboard.services"])})),define("modules/dashboard/controllers/DashboardListCtrl",["./_module"],(function(e){"use strict";return e.controller("DashboardListCtrl",["$scope","DashboardService","DashboardMapper","poller","MessageService","constants",function(e,t,n,i,r,s){var o=i.create({interval:1e3,action:t.stats,params:[]});e.queues={},e.queues.__tag="queues",o.start(),o.promise.then(null,null,(function(t){e.queues=n.map(t,e.queues)})),o.promise.catch((function(t){r.failure("Failed to fetch dashboard stats: "+t.message),e.queues=null,o.stop()})),e.tcpStats=[];var a=i.create({interval:s.tcpStats.pollInterval,action:t.tcpStats,params:[]});function l(e,t){if(!t)return null;for(var n=0;n<t.length;n++)if(t[n].connectionId===e)return t[n];return null}a.start(),a.promise.then(null,null,(function(t){for(var n=0;n<t.length;n++){var i=t[n],r=l(i.connectionId,e.tcpStats);i.averageBytesSentPerSecond=r?i.totalBytesSent-r.totalBytesSent:0,i.averageBytesReceivedPerSecond=r?i.totalBytesReceived-r.totalBytesReceived:0}e.tcpStats=t})),a.promise.catch((function(t){r.failure("Failed to fetch TCP connection stats: "+t.message),e.tcpStats=null,a.stop()})),e.tcpStatsPaging={currentPage:0,pageSize:5,canPageNext:function(){return e.tcpStatsPaging.currentPage<e.tcpStats.length/e.tcpStatsPaging.pageSize-1},canPagePrevious:function(){return e.tcpStatsPaging.currentPage>0},nextPage:function(){e.tcpStatsPaging.canPageNext()&&e.tcpStatsPaging.currentPage++},previousPage:function(){e.tcpStatsPaging.canPagePrevious()&&e.tcpStatsPaging.currentPage--}},e.$on("$destroy",(function(){i.clear(),e.queues={},e.tcpStats=[]}))}]).filter("startFrom",(function(){return function(e,t){if(e)return t=parseInt(t),e.slice(t)}}))})),define("modules/dashboard/controllers/DashboardSnapshotCtrl",["./_module"],(function(e){"use strict";return e.controller("DashboardSnaphostCtrl",["$scope","DashboardService","SprintfService","MessageService",function(e,t,n,i){t.stats().then((function(t){var i,r;i=t.data,r="Snapshot taken at: "+(new Date).toString(),r+="\n\r",r+=n.format("%-30s  %15s  %15s  %15s  %15s  %45s","Name","Length","Rate (items/s)","Time (ms/item)","Item Processed","Current/Last message"),r+="\n\r",r+=n.format("%-30s  %8s  %5s","","Current","Peak"),r+="\n\r",r+=n.format("%'=30s  %'=8s  %'=5s  %'=15s  %'=15s  %'=15s  %'=45s","=","=","=","=","=","=","="),angular.forEach(i.es.queue,(function(e){r+="\n\r",r+=n.format("%-30s  %8s  %5s  %15s  %15s  %15s  %45s",e.queueName,e.lengthCurrentTryPeak,e.lengthLifetimePeak,e.avgItemsPerSecond,e.avgProcessingTime.toFixed(3),e.totalItemsProcessed,e.inProgressMessage+" / "+e.lastProcessedMessage)})),e.snapshot=r}),(function(e){i.failure("Failed to retrieve dashboard stats: "+e.message)}))}])})),define("modules/dashboard/controllers/_index",["./DashboardListCtrl","./DashboardSnapshotCtrl"],(function(){})),define("modules/dashboard/services/_module",["angular"],(function(e){"use strict";return e.module("es-ui.dashboard.services",[])})),define("modules/dashboard/services/DashboardMapper",["./_module"],(function(e){"use strict";return e.provider("DashboardMapper",(function(){function e(e,t){var n,i,r,s,o,a={};for(n in e.es.queue)(i=e.es.queue[n]).groupName?(r=a[i.groupName]?a[i.groupName]:{queueName:o=i.groupName,groupName:o,length:0,avgItemsPerSecond:0,avgProcessingTime:0,idleTimePercent:0,lengthCurrentTryPeak:0,lengthLifetimePeak:0,totalItemsProcessed:0,groupQueues:0,queues:[]},s=t[i.groupName],r.show=!!s&&s.show,r.queues.push(i),r.length+=i.length,r.groupQueues+=1,r.avgItemsPerSecond+=i.avgItemsPerSecond,r.totalItemsProcessed+=i.totalItemsProcessed,r.avgProcessingTime=(r.avgProcessingTime+i.avgProcessingTime)/r.groupQueues,r.idleTimePercent=(r.idleTimePercent+i.idleTimePercent)/r.groupQueues,r.lengthCurrentTryPeak=Math.max(r.lengthCurrentTryPeak,i.lengthCurrentTryPeak),r.lengthLifetimePeak=Math.max(r.lengthLifetimePeak,i.lengthLifetimePeak),a[i.groupName]=r):a[i.queueName]=i;return a}this.$get=[function(){return{map:e}}]}))})),define("modules/dashboard/services/DashboardService",["./_module"],(function(e){"use strict";return e.provider("DashboardService",(function(){this.$get=["$http","urls","UrlBuilder",function(e,t,n){return{stats:function(){var i=n.build(t.stats);return e.get(i)},tcpStats:function(){var i=n.build(t.tcpStats);return e.get(i)}}}]}))})),define("modules/dashboard/services/_index",["./DashboardMapper","./DashboardService"],(function(){})),define("modules/dashboard/directives/_module",["angular"],(function(e){"use strict";return e.module("es-ui.dashboard.directives",[])})),define("modules/dashboard/directives/EsQueueRow",["./_module"],(function(e){"use strict";return e.directive("esQueueRow",[function(){return{restrict:"A",templateUrl:"dashboard.row.tpl.html",scope:{esQueue:"="},link:function(){}}}])})),define("modules/dashboard/directives/EsQueueRowHeader",["./_module"],(function(e){"use strict";return e.directive("esQueueRowHeader",[function(){return{restrict:"A",templateUrl:"dashboard.row.header.tpl.html",scope:{esQueue:"="},link:function(e,t){function n(){e.$apply((function(){e.toggle()}))}e.toggle=function(){e.esQueue.show=!e.esQueue.show},t.bind("click",n),e.$on("$destroy",(function(){t.unbind("click",n)}))}}}])})),define("modules/dashboard/directives/_index",["./EsQueueRow","./EsQueueRowHeader"],(function(){})),define("modules/dashboard/templates/templates",["angular"],(function(e){"use strict";!function(t){try{t=e.module("es-ui.dashboard.templates")}catch(n){t=e.module("es-ui.dashboard.templates",[])}t.run(["$templateCache",function(e){e.put("dashboard.list.tpl.html","<header class=page-header><h2 class=page-title>Dashboard</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.snapshot>Snapshot</a></li></ul></header><table class=table-queues><thead><tr><th>Queue Name</th><th colspan=2>Length</th><th>Rate (items/s)</th><th>Time (ms/item)</th><th>Items Processed</th><th>Current / Last Message</th></tr><tr><th></th><th class=table-subheading>Current</th><th class=table-subheading>Peak</th><th></th><th></th><th></th><th></th></tr></thead><tbody ng-repeat=\"(key, prop) in queues track by key\"><tr ng-if=prop.queues class=table-subheading style=\"cursor: pointer;\" es-queue-row-header es-queue=prop></tr><tr ng-if=!prop.queues es-queue-row es-queue=prop></tr><tr ng-show=prop.show ng-repeat=\"item in prop.queues\" class=table-indentedrow es-queue-row es-queue=item></tr></tbody><tbody ng-hide=queues><tr><td colspan=8><em>No stats to display</em></td></tr></tbody></table><br><br><header class=page-header><h2 class=page-title>Connections ({{tcpStats.length}})</h2><ul class=page-nav><li class=page-nav__item><button ng-click=tcpStatsPaging.nextPage() ng-disabled=!tcpStatsPaging.canPageNext()>Next</button></li><li class=page-nav__item><button ng-click=tcpStatsPaging.previousPage() ng-disabled=!tcpStatsPaging.canPagePrevious()>Previous</button></li></ul></header><table class=table-subscriptions><thead><tr><th>Connection</th><th>Client Connection Name</th><th>Type</th><th>IP Address</th><th colspan=3>Sent (Bytes)</th><th colspan=3>Received (Bytes)</th></tr><tr><th></th><th></th><th></th><th></th><th class=table-subheading>Rate (Bytes/s)</th><th class=table-subheading>Current</th><th class=table-subheading>Pending</th><th class=table-subheading>Rate (Bytes/s)</th><th class=table-subheading>Current</th><th class=table-subheading>Pending</th></tr></thead><tbody><tr ng-repeat=\"stat in tcpStats | startFrom:tcpStatsPaging.currentPage * tcpStatsPaging.pageSize | limitTo: tcpStatsPaging.pageSize\"><td>{{stat.connectionId}}</td><td>{{stat.clientConnectionName ? stat.clientConnectionName : 'N/A'}}</td><td>{{stat.isExternalConnection ? 'External' : 'Internal'}} {{stat.isSslConnection ? 'SSL' : ''}}</td><td>{{stat.remoteEndPoint}}</td><td>{{stat.averageBytesSentPerSecond | number}}</td><td>{{stat.totalBytesSent | number}}</td><td>{{stat.pendingSendBytes | number}}</td><td>{{stat.averageBytesReceivedPerSecond | number}}</td><td>{{stat.totalBytesReceived | number}}</td><td>{{stat.pendingReceivedBytes | number}}</td></tr></tbody><tbody ng-hide=tcpStats.length><tr><td colspan=10><em>No Connections</em></td></tr></tbody></table>")}])}(),function(t){try{t=e.module("es-ui.dashboard.templates")}catch(n){t=e.module("es-ui.dashboard.templates",[])}t.run(["$templateCache",function(e){e.put("dashboard.row.header.tpl.html",'<td ng-if=esQueue.show>{{ esQueue.queueName }} <a class=table-collapsetoggle>&minus;</a></td><td ng-if=!esQueue.show>{{ esQueue.queueName }} <a class=table-collapsetoggle>&plus;</a></td><td>{{ esQueue.lengthCurrentTryPeak }}</td><td>{{ esQueue.lengthLifetimePeak }}</td><td>{{ esQueue.avgItemsPerSecond }}</td><td>{{ esQueue.avgProcessingTime.toFixed(3)}}</td><td>{{ esQueue.totalItemsProcessed }}</td><td style="text-align: right">n/a</td>')}])}(),function(t){try{t=e.module("es-ui.dashboard.templates")}catch(n){t=e.module("es-ui.dashboard.templates",[])}t.run(["$templateCache",function(e){e.put("dashboard.row.tpl.html",'<td>{{ esQueue.queueName }}</td><td>{{ esQueue.lengthCurrentTryPeak }}</td><td>{{ esQueue.lengthLifetimePeak }}</td><td>{{ esQueue.avgItemsPerSecond }}</td><td>{{ esQueue.avgProcessingTime.toFixed(3)}}</td><td>{{ esQueue.totalItemsProcessed }}</td><td style="text-align: right">{{ esQueue.inProgressMessage }} / {{ esQueue.lastProcessedMessage }}</td>')}])}(),function(t){try{t=e.module("es-ui.dashboard.templates")}catch(n){t=e.module("es-ui.dashboard.templates",[])}t.run(["$templateCache",function(e){e.put("dashboard.snapshot.tpl.html","<header class=page-header><h2 class=page-title>Dashboard Snapshot</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=dashboard.list>Back</a></li></ul></header><pre ng-bind=snapshot>\n\n</pre>")}])}(),function(t){try{t=e.module("es-ui.dashboard.templates")}catch(n){t=e.module("es-ui.dashboard.templates",[])}t.run(["$templateCache",function(e){e.put("dashboard.tpl.html","<div ui-view></div>")}])}()})),define("modules/dashboard/_index",["angular","uiRouter","./controllers/_index","./services/_index","./directives/_index","./templates/templates"],(function(e){"use strict";return e.module("es-ui.dashboard",["ui.router","es-ui.dashboard.templates","es-ui.dashboard.controllers","es-ui.dashboard.services","es-ui.dashboard.directives"])})),define("modules/dashboard/module",["./_index"],(function(e){"use strict";return e.config(["$stateProvider",function(e){e.state("dashboard",{parent:"app",url:"dashboard",templateUrl:"dashboard.tpl.html",abstract:!0,data:{title:"Dashboard"}}).state("dashboard.list",{url:"",templateUrl:"dashboard.list.tpl.html",controller:"DashboardListCtrl",data:{title:"Dashboard"}}).state("dashboard.snapshot",{url:"/snapshot",templateUrl:"dashboard.snapshot.tpl.html",controller:"DashboardSnaphostCtrl",data:{title:"Dashboard Snapshot"}})}])})),define("modules/clusterstatus/controllers/_module",["angular"],(function(e){"use strict";return e.module("es-ui.clusterstatus.controllers",[])})),define("modules/clusterstatus/controllers/ClusterStatusListCtrl",["./_module"],(function(e){"use strict";return e.controller("ClusterStatusListCtrl",["$scope","poller","ClusterStatusService","InfoService","constants","MessageService",function(e,t,n,i,r,s){e.replicas=[];var o,a="";function l(){var i=t.create({interval:1e3,action:n.gossip,params:[]});i.start(),i.promise.then(null,(function(e){s.failure("Failed to retrieve gossip info: "+e.message)}),(function(i){if(e.lastUpdatedTime=new Date,i.error)e.errorMessage="couldn't connect to manager";else{e.errorMessage="",e.nodes=i.members;var l=d();if(l){var f=l.httpEndPointIp+":"+l.httpEndPointPort;o&&f===a||(a=f,(o=t.create({interval:r.clusterStatus.replicaPollInterval,action:n.replicaStats,params:[a]})).start(),o.promise.then(null,(function(e){s.failure("Failed to retrieve replica stats: "+e.message)}),(function(t){for(var n=d(),i=0;i<t.length;i++){var r=t[i],s=u(r.connectionId,e.replicas);c(r,n,h(r.subscriptionEndpoint,e.nodes),s)}e.replicas=t})))}}}))}function c(e,t,n,i){if(n&&(e.isCatchingUp="CatchingUp"===n.state,e.bytesToCatchUp=t.writerCheckpoint-n.writerCheckpoint,e.catchupStartTime=(new Date).getTime(),e.catchupStartBytesSent=e.totalBytesSent,i)){i.isCatchingUp&&(e.catchupStartTime=i.catchupStartTime,e.catchupStartBytesSent=i.catchupStartBytesSent);var s=((new Date).getTime()-e.catchupStartTime)/r.clusterStatus.replicaPollInterval,o=e.totalBytesSent-e.catchupStartBytesSent;e.approxSpeed=Math.round(o/s);var a=Math.round(e.bytesToCatchUp/e.approxSpeed);a<1&&(a=1),e.estimatedTime=function(e){function t(e){return e<10?"0"+e:e}var n=Math.floor(e%86400/3600),i=Math.floor(e%86400%3600/60),r=e%86400%3600%60;return t(n)+":"+t(i)+":"+t(r)}(a)}}function u(e,t){for(var n=0;n<t.length;n++)if(t[n].connectionId===e)return t[n]}function h(e,t){for(var n=0;n<t.length;n++){var i=t[n].internalSecureTcpPort?t[n].internalSecureTcpPort:t[n].internalTcpPort;if(t[n].internalTcpIp+":"+i===(e=e.replace("Unspecified/","")))return t[n]}}function d(){for(var t=0;t<e.nodes.length;t++)if("Leader"===e.nodes[t].state)return e.nodes[t]}i.getOptions().then((function(e){var t=e.data;for(var n in t)"ClusterSize"===t[n].name&&t[n].value>1&&l()}),(function(e){s.failure("Failed to load options: "+e.message)})),e.$on("$destroy",(function(){t.clear()}))}])})),define("modules/clusterstatus/controllers/ClusterStatusSnapshotCtrl",["./_module"],(function(e){"use strict";return e.controller("ClusterStatusSnapshotCtrl",["$scope","dateFilter","poller","SprintfService","ClusterStatusService","MessageService",function(e,t,n,i,r,s){e.$on("$destroy",(function(){n.clear()})),r.gossip().then((function(n){!function(n){var r=n.members,s=i.format("%s\n","Snapshot taken at "+t(new Date,"yyyy-MM-d HH:mm:ss"));s+=i.format("%-31s %-31s %-23s %-7s %-14s %-19s %-10s\n","Internal Tcp","External Tcp","Http","Status","State","Timestamp (UTC)","Checkpoints");for(var o=0;o<r.length;o++){var a=r[o];s+=i.format("%-30s  %-30s  %-22s  %-6s  %-12s  %19s  %-90s\n",a.internalTcpIp+":"+(a.internalSecureTcpPort||a.internalTcpPort),a.externalTcpIp+":"+(a.externalSecureTcpPort||a.externalTcpPort),a.httpEndPointIp+":"+a.httpEndPointPort,a.isAlive?"Alive":"Unreachable",a.state,t(a.timeStamp,"yyyy-MM-d HH:mm:ss"),"Manager"===a.state?"n/a":i.format("L%d/W%d/C%d/E%d@%d:{%s}",a.lastCommitPosition,a.writerCheckpoint,a.chaserCheckpoint,a.epochNumber,a.epochPosition,a.epochId))}e.snapshot=s}(n.data)}),(function(e){s.failure("Failed to retrieve gossip info: "+e.message)}))}])})),define("modules/clusterstatus/controllers/_index",["./ClusterStatusListCtrl","./ClusterStatusSnapshotCtrl"],(function(){})),define("modules/clusterstatus/services/_module",["angular"],(function(e){"use strict";return e.module("es-ui.clusterstatus.services",[])})),define("modules/clusterstatus/services/ClusterStatusService",["./_module"],(function(e){"use strict";return e.provider("ClusterStatusService",(function(){this.$get=["$http","urls","UrlBuilder","$q","$location",function(e,t,n,i,r){return{gossip:function(){var i=n.build(t.gossip);return e.get(i)},replicaStats:function(n){if(!n){var s=i.defer();return s.resolve({}),s.promise}var o=r.protocol()+"://"+n+t.replicationStats;return e.get(o)}}}]}))})),define("modules/clusterstatus/services/_index",["./ClusterStatusService"],(function(){})),define("modules/clusterstatus/templates/templates",["angular"],(function(e){"use strict";!function(t){try{t=e.module("es-ui.clusterstatus.templates")}catch(n){t=e.module("es-ui.clusterstatus.templates",[])}t.run(["$templateCache",function(e){e.put("clusterstatus.list.tpl.html",'<header class=page-header><h2 class=page-title>Cluster Status</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.snapshot>Snapshot</a></li></ul></header><div class=last-updated>Last updated: <span>{{ lastUpdatedTime | date : \'yyyy-MM-d HH:mm:ss\' }}</span></div><div><table class=table-nodes><thead><tr><th>State</th><th>Status</th><th>Timestamp (UTC)</th><th>Checkpoints</th><th>Tcp</th><th>Http</th><th>Actions</th></tr><tr><th></th><th></th><th></th><th></th><th></th><th></th><th></th></tr></thead><tbody><tr ng-repeat="node in nodes" ng-class="{dead: !node.isAlive}"><td><text ng-if="node.state == \'Leader\'"><b>{{ node.state }}</b></text><text ng-if="node.state == \'Manager\'" style=color:lightgray>{{ node.state }}</text><text ng-if="node.state != \'Leader\' && node.state != \'Manager\'">{{ node.state }}</text></td><td ng-class="{dead: !node.isAlive}"><text ng-if=node.isAlive>Alive</text><text ng-if=!node.isAlive>Unreachable</text></td><td>{{ node.timeStamp | date : \'yyyy-MM-d HH:mm:ss\' }}</td><td><text ng-if="node.state == \'Manager\'">n/a</text><text ng-if="node.state != \'Manager\'">L{{ node.lastCommitPosition}} / W {{node.writerCheckpoint}} / C {{node.chaserCheckpoint}}<br>E{{ node.epochNumber }} @ {{ node.epochPosition }} : { {{ node.epochId }} }</text></td><td>Internal : {{ node.internalTcpIp }}:{{ node.internalSecureTcpPort || node.internalTcpPort }}<br>External : {{ node.externalTcpIp }}:{{ node.externalSecureTcpPort || node.externalTcpPort }}</td><td>{{ node.httpEndPointIp }}:{{ node.httpEndPointPort }}</td><td style=text-align:center;><ul class=page-nav><li class=page-nav__item><a ng-href="//{{node.httpEndPointIp}}:{{node.httpEndPointPort}}/ping?format=json" target=_blank>ping</a></li><li class=page-nav__item><a ng-href=//{{node.httpEndPointIp}}:{{node.httpEndPointPort}} target=_blank>show website</a></li><li class=page-nav__item><a ng-href="//{{node.httpEndPointIp}}:{{node.httpEndPointPort}}/gossip?format=json" target=_blank>show gossip</a></li></ul></td></tr><tr ng-hide=nodes><td colspan=9><em>No nodes in the cluster</em></td></tr></tbody></table><br><div ng-show="replicas.length > 0"><br><header class=page-header><h2 class=page-title>Replica Status</h2></header><table class=table-nodes><thead><tr><th>Replica Endpoint</th><th>Total Sent (bytes)</th><th>Total Received (bytes)</th><th>Pending Send (bytes)</th><th>Pending Receive (bytes)</th><th>Send Queue Size</th><th>To Catch Up (bytes)</th><th>Transfer Speed (bytes/second)</th><th>Estimated Time</th></tr></thead><tbody><tr ng-repeat="replica in replicas"><td>{{replica.subscriptionEndpoint}}</td><td>{{replica.totalBytesSent | number}}</td><td>{{replica.totalBytesReceived | number}}</td><td>{{replica.pendingSendBytes | number}}</td><td>{{replica.pendingReceivedBytes | number}}</td><td>{{replica.sendQueueSize | number}}</td><td ng-if=!replica.isCatchingUp colspan=3>Caught Up</td><td ng-if=replica.isCatchingUp>{{replica.bytesToCatchUp | number}}</td><td ng-if=replica.isCatchingUp>{{replica.approxSpeed | number}}</td><td ng-if=replica.isCatchingUp>{{replica.estimatedTime}}</td></tr></tbody></table></div></div><script>function selectText(element) {\n        var doc = document\n          , text = doc.getElementById(element)\n          , range\n          , selection;\n        if (doc.body.createTextRange) { //ms\n            range = doc.body.createTextRange();\n            range.moveToElementText(text);\n            range.select();\n        } else if (window.getSelection) { //all others\n            selection = window.getSelection();\n            range = doc.createRange();\n            range.selectNodeContents(text);\n            selection.removeAllRanges();\n            selection.addRange(range);\n        }\n    }<\/script>')}])}(),function(t){try{t=e.module("es-ui.clusterstatus.templates")}catch(n){t=e.module("es-ui.clusterstatus.templates",[])}t.run(["$templateCache",function(e){e.put("clusterstatus.snapshot.tpl.html","<header class=page-header><h2 class=page-title>Cluster Status Snapshot</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=clusterstatus.list>Back</a></li></ul></header><pre ng-bind=snapshot>\n\n</pre>")}])}(),function(t){try{t=e.module("es-ui.clusterstatus.templates")}catch(n){t=e.module("es-ui.clusterstatus.templates",[])}t.run(["$templateCache",function(e){e.put("clusterstatus.tpl.html","<div ui-view></div>")}])}()})),define("modules/clusterstatus/_index",["angular","uiRouter","./controllers/_index","./services/_index","./templates/templates"],(function(e){"use strict";return e.module("es-ui.clusterstatus",["ui.router","es-ui.clusterstatus.templates","es-ui.clusterstatus.services","es-ui.clusterstatus.controllers"])})),define("modules/clusterstatus/module",["./_index"],(function(e){"use strict";return e.config(["$stateProvider",function(e){e.state("clusterstatus",{parent:"app",url:"clusterstatus",templateUrl:"clusterstatus.tpl.html",abstract:!0,data:{title:"Cluster Status"}}).state("clusterstatus.list",{url:"",templateUrl:"clusterstatus.list.tpl.html",controller:"ClusterStatusListCtrl",data:{title:"Cluster Status"}}).state("clusterstatus.snapshot",{url:"/snapshot",templateUrl:"clusterstatus.snapshot.tpl.html",controller:"ClusterStatusSnapshotCtrl",data:{title:"Cluster Status Snapshot"}})}])})),define("modules/streams/controllers/_module",["angular"],(function(e){"use strict";return e.module("es-ui.streams.controllers",["es-ui.streams.services"])})),define("modules/streams/controllers/StreamsItemEventCtrl",["./_module"],(function(e){"use strict";function t(e,t,n){404===e.statusCode||410===e.statusCode||n.failure("Failed to load event content for stream '"+t.streamId+"': "+e.message)}return e.controller("StreamsItemEventCtrl",["$scope","$state","$stateParams","StreamsService","MessageService",function(e,n,i,r,s){e.streamId=i.streamId,e.isMetadata=n.current.data.metadata,e.eventNumber=e.isMetadata?"metadata":i.eventNumber,r.eventContent(e.streamId,e.eventNumber).then((function(n){var i=n.data;e.evt=i,e.hasEvent=null!==i.eventNumber&&void 0!==i.eventNumber,e.isNotTheSame=i.positionStreamId!==i.streamId||i.positionEventNumber!==i.eventNumber,e.links=i.links,e.isMetadata||i.hasOwnProperty("positionEventNumber")&&i.hasOwnProperty("positionStreamId")&&(r.eventContent(e.streamId,i.positionEventNumber+1).then((function(){e.next=!0}),(function(n){t(n,e,s)})),i.positionEventNumber-1>=0&&r.eventContent(e.streamId,i.positionEventNumber-1).then((function(){e.prev=!0}),(function(n){t(n,e,s)})))}),(function(n){t(n,e,s)}))}])})),define("modules/streams/controllers/StreamsItemEventsCtrl",["./_module"],(function(e){"use strict";return e.controller("StreamsItemEventsCtrl",["$scope","$state","$stateParams","AtomEventsReader","MessageService","StreamsService",function(e,t,n,i,r,s){var o={};function a(e){void 0!==e?r.confirm("Are you sure you want to delete the stream: "+e+"?")&&s.deleteStream(e).then((function(){r.info("Stream '"+e+"' deleted")}),(function(t){r.failure("Failed to delete stream '"+e+"': "+t.message)})):r.info("You cannot delete this stream as the stream ID is empty or undefined")}e.$parent.streams=[],e.$parent.links=[],e.streamId=n.streamId,e.source=n.source,i.start(n).then(null,(function(t){404===t.statusCode||410===t.statusCode?e.entries=[]:r.failure("Failed to read events for stream '"+e.streamId+"': "+t.message)}),(function(t){e.$parent.headOfStream=t.headOfStream,e.$broadcast("add-link-header",function(e){for(var t=0;t<e.length;t++)if("self"===e[t].relation)return e[t].fullUri}(t.links)),e.$parent.streams=i.map(t.entries,o),e.$parent.links=t.links,"$all"!==e.streamId&&0!==e.streamId.indexOf("$$$")||(e.$parent.links=function(e){for(var t=-1,n=0,i=e.length;n<i;n++)if("metadata"===e[n].relation){t=n;break}-1!==t&&e.splice(t,1);return e}(e.$parent.links))})),e.toggleJson=function(e,t){e.preventDefault(),e.stopPropagation(),t.showJson=!t.showJson,o[t.title]=t.showJson},e.deleteStream=function(t,n){a(e.streamId)},e.$parent.deleteStream=function(){a(e.streamId)},e.$parent.isPolling=!0,e.$parent.togglePause=function(){e.$parent.isPolling?i.pause():i.resumePaused(),e.$parent.isPolling=!e.$parent.isPolling},e.getTextToCopy=function(e){return r.info("The event data for "+e.title+" will be copied to the clipboard","Copied to clipboard"),e.data},e.$on("$destroy",(function(){i.stop(),e.$parent.streams=[],e.$parent.links=[],e.$parent.isPolling=null,o={}}))}])})),define("modules/streams/controllers/StreamsAddEventCtrl",["./_module"],(function(e){"use strict";return e.controller("StreamsAddEventCtrl",["$scope","$state","$q","$stateParams","StreamsService","MessageService",function(e,n,i,r,s,o){if(e.streamId=r.streamId,e.addingToSpecificStream=Boolean(e.streamId),e.eventData="{\n}",e.eventMetadata="{\n}",e.eventId=t(),r.fromEvent){var a=r.fromEvent;e.eventType=a.eventType,e.addingToSpecificStream=!1,e.eventData=a.data,e.eventMetadata=a.metaData}function l(e,t){return i((function(n,i){if(/^\s*$/.test(t))return n(void 0);try{return n(JSON.parse(t))}catch(t){return i({statusText:e+" is not valid JSON."})}}))}e.aceConfig={mode:"json",useWrapMode:!1,showGutter:!0,theme:"monokai"},e.addEvent=function(){i.all([l("Event Data",e.eventData),l("Event Metadata",e.eventMetadata)]).then((function(t){return s.addEvent(e.streamId,{eventId:e.eventId,eventType:e.eventType,data:t[0],metadata:t[1]})})).then((function(){o.success("Event "+e.eventId+"("+e.eventType+") created"),e.eventId=t()}),(function(e){o.failure("Failed to create event: "+e.message)}))}}]);function t(){var e=(new Date).getTime().toString();return[e.slice(-9,-1),e.slice(-5,-1),e.slice(-5,-1),e.slice(-5,-1),e.slice(-13,-1)].join("-")}})),define("modules/streams/controllers/StreamsItemAclCtrl",["./_module"],(function(e){"use strict";return e.controller("StreamsItemAclCtrl",["$scope","$state","$stateParams","StreamsService","MessageService",function(e,t,n,i,r){var s;e.streamId=n.streamId,i.getAcl(e.streamId).then((function(t){var n=t.data;n&&(s=n,n.$acl&&(e.reader=n.$acl.$r,e.writer=n.$acl.$w,e.deleter=n.$acl.$d,e.metareader=n.$acl.$mr,e.metawriter=n.$acl.$mw))}),(function(n){r.failure("Failed to load metadata for stream '"+e.streamId+"': "+n.message),t.go("^.events")})),e.updateAcl=function(){var n=s||{};n.$acl={$r:e.reader,$w:e.writer,$d:e.deleter,$mr:e.metareader,$mw:e.metawriter},i.updateAcl(e.streamId,n).then((function(){r.info("acl updated"),t.go("^.events")}),(function(t){r.failure("Failed to update metadata for stream '"+e.streamId+"': "+t.message)}))}}])})),define("modules/streams/controllers/StreamsListCtrl",["./_module"],(function(e){"use strict";return e.controller("StreamsListCtrl",["$rootScope","$scope","$state","StreamsService","MessageService",function(e,t,n,i,r){function s(e){for(var t,n={},i=0,r=e.length,s=[];i<r;i++)e[i].streamId&&(n[(t=e[i]).streamId]=!0);for(t in n)s.push({streamId:t});return s}t.gotoStream=function(e){e.preventDefault(),e.stopPropagation(),i.checkStreamExists(t.search).then((function(){n.go("^.item.events",{streamId:t.search})}),(function(e){404===e.statusCode?r.warn("The stream '"+t.search+"' does not exist."):r.failure("Failed to read stream '"+t.search+"': "+e.message)}))},t.search="$all",t.noChangedStreamsText="No recently changed streams",t.noCreatedStreamsText="No recently created streams",i.recentlyChangedStreams().then((function(e){t.changedStreams=s(e.data.entries)}),(function(e){401===e.statusCode?t.noChangedStreamsText="You are not authorized to view recently changed streams":404===e.statusCode?t.noChangedStreamsText="No recently changed streams":r.failure("Failed to load recently changed streams: "+e.message)})),i.recentlyCreatedStreams().then((function(e){t.createdStreams=s(e.data.entries)}),(function(e){401===e.statusCode?t.noCreatedStreamsText="You are not authorized to view recently created streams":404===e.statusCode?t.noCreatedStreamsText="No recently created streams":r.failure("Failed to load recently created streams: "+e.message)}))}])})),define("modules/streams/controllers/_index",["./StreamsItemEventCtrl","./StreamsItemEventsCtrl","./StreamsAddEventCtrl","./StreamsItemAclCtrl","./StreamsListCtrl"],(function(){})),define("modules/streams/directives/_module",["angular"],(function(e){"use strict";return e.module("es-ui.streams.directives",[])})),define("modules/streams/directives/EsLinkHeader",["./_module"],(function(e){"use strict";return e.directive("esLinkHeader",[function(){return{restrict:"A",link:function(e){var t=e.$on("add-link-header",(function(e,t){var n;(n=document.querySelector('link[type="application/atom+xml"]'))&&document.head.removeChild(n);var i=document.createElement("link");i.rel="alternative",i.type="application/atom+xml",i.href=t,document.head.appendChild(i)}));e.$on("$destroy",(function(){t()}))}}}])})),define("modules/streams/directives/_index",["./EsLinkHeader"],(function(){})),define("modules/streams/services/_module",["angular"],(function(e){"use strict";return e.module("es-ui.streams.services",[])})),define("modules/streams/services/StreamsService",["./_module"],(function(e){"use strict";return e.provider("StreamsService",(function(){this.$get=["$http","$q","urls","UrlBuilder",function(e,t,n,i){return{getAcl:function(t){var r=i.build(n.streams.metadata,"$$",t);return e.get(r)},updateAcl:function(t,r){var s=i.build(n.streams.updateAcl,t);return e.post(s,JSON.stringify(r),{headers:{"ES-EventType":"$metadata","Content-Type":"application/json"}})},addEvent:function(t,r){var s=i.build(n.streams.events,t);return e.post(s,JSON.stringify([r]),{headers:{"Content-Type":"application/vnd.eventstore.events+json"}})},validateFullUrl:function(t){var r=i.simpleBuild(n.streams.base,t);return e.get(r)},recentlyChangedStreams:function(){var t=i.build(n.streams.recent);return e.get(t)},recentlyCreatedStreams:function(){var t=i.build(n.streams.created);return e.get(t)},streamEvents:function(t){var r=i.build(n.streams.events,t.streamId);return t.position&&(r+="/"+t.position),t.type&&(r+="/"+t.type),t.count&&(r+="/"+t.count),r+=n.streams.tryharder,e.get(r)},eventContent:function(t,r){var s=i.build(n.streams.eventDetails,t,r);return e.get(s,{headers:{Accept:"application/vnd.eventstore.atom+json"}})},checkStreamExists:function(t){var r=i.build(n.streams.events,t);return e.get(r)},deleteStream:function(t){var r=i.build(n.streams.events,t);return e.delete(r)}}}]}))})),define("modules/streams/services/_index",["./StreamsService"],(function(){})),define("modules/streams/templates/templates",["angular"],(function(e){"use strict";!function(t){try{t=e.module("es-ui.streams.templates")}catch(n){t=e.module("es-ui.streams.templates",[])}t.run(["$templateCache",function(e){e.put("streams.event.new.tpl.html",'<header class=page-header><h2 class=page-title>New Event</h2></header><form novalidate name=newEvent ng-submit=save() class=new-subscription-form><table><tbody><tr><td>Stream ID</td><td><input ng-model=streamId class=form-table name=stream ng-class="{ \'form-table--error\' : newEvent.stream.$invalid && !newEvent.stream.$pristine }" ng-disabled=addingToSpecificStream></td></tr><tr><td>Event ID</td><td><input ng-model=eventId class=form-table name=evnt ng-class="{ \'form-table--error\' : newEvent.evnt.$invalid && !newEvent.evnt.$pristine }"></td></tr><tr><td>Event Type</td><td><input ng-model=eventType class=form-table name=eventType ng-class="{ \'form-table--error\' : newEvent.eventType.$invalid && !newEvent.eventType.$pristine }"></td></tr><tr class=table-subheading><td colspan=2>Data</td></tr><tr><td colspan=2><div ui-ace=aceConfig style="min-height: 350px; max-height: 350px" ng-model=eventData></div></td></tr><tr class=table-subheading><td colspan=2>Metadata</td></tr><tr><td colspan=2><div ui-ace=aceConfig style="min-height: 150px; max-height: 150px" ng-model=eventMetadata></div></td></tr></tbody></table><ul class=page-nav><li class=page-nav__item><button type=submit ng-click=addEvent() ng-disabled=newEvent.$invalid>Add</button></li></ul></form>')}])}(),function(t){try{t=e.module("es-ui.streams.templates")}catch(n){t=e.module("es-ui.streams.templates",[])}t.run(["$templateCache",function(e){e.put("streams.item.acl.tpl.html","<header class=page-header><h2 class=page-title>Edit ACL for Event Stream '{{ streamId }}'</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.events>Back</a></li></ul></header><form novalidate name=editAcl ng-submit=updateAcl()><table><tbody><tr><td>Reader</td><td><input name=reader class=form-table ng-model=reader></td></tr><tr><td>Writer</td><td><input name=writer class=form-table ng-model=writer></td></tr><tr><td>Deleter</td><td><input name=deleter class=form-table ng-model=deleter></td></tr><tr><td>Meta Reader</td><td><input name=metareader class=form-table ng-model=metareader></td></tr><tr><td>Meta Writer</td><td><input name=metawriter class=form-table ng-model=metawriter></td></tr></tbody></table><ul class=page-nav><li class=page-nav__item><button type=submit>Save</button></li></ul></form>")}])}(),function(t){try{t=e.module("es-ui.streams.templates")}catch(n){t=e.module("es-ui.streams.templates",[])}t.run(["$templateCache",function(e){e.put("streams.item.event.tpl.html",'<header class=page-header><h2 class=page-title>{{ evt.title }} <small ng-if=isNotTheSame>Link from {{ evt.positionEventNumber + \'@\' + evt.positionStreamId }}</small></h2><ul class=page-nav><li class=page-nav__item><a ng-if=evt ui-sref="^.addStreamEvent({ fromEvent: evt })">Add New Like This</a></li><li class=page-nav__item><a ui-sref=^.events>Back</a></li></ul></header><ul class=page-nav style="padding:0rem 0rem 2rem 0rem !important"><li class=page-nav__item><button ng-disabled=!prev ui-sref=".({streamId: evt.streamId, eventNumber: evt.positionEventNumber - 1})">prev</button></li><li class=page-nav__item><button ng-disabled=!next ui-sref=".({streamId: evt.streamId, eventNumber: evt.positionEventNumber + 1})">next</button></li></ul><br><table><thead><tr><th>No</th><th>Stream</th><th>Type</th><th>Timestamp</th></tr></thead><tbody ng-hide=hasEvent><tr><td colspan=5><em>Event does not exist for stream: {{streamId}}</em></td></tr></tbody><tbody ng-show=hasEvent><tr><td>{{ evt.eventNumber }}</td><td><a ui-sref="^.events({streamId: evt.streamId})">{{ evt.streamId }}</a></td><td>{{ evt.eventType }}</td><td>{{ evt.updated | date:\'yyyy-MM-dd HH:mm:ss\'}}</td></tr><tr ng-if="evt.isJson || evt.isMetaData || evt.isLinkMetaData"><td colspan=4><div ng-if=evt.isJson><strong>Data</strong><pre ng-if=!evt.isRedacted>\n{{ evt.data }}\n\t\t\t\t</pre><span class=note--warning ng-if=evt.isRedacted>This event\'s data was redacted</span></div><div ng-if=evt.isMetaData><strong>Metadata</strong><pre>\n{{ evt.metaData }}\n\t\t\t\t</pre></div><div ng-if=evt.isLinkMetaData><strong>Link metadata</strong><pre>\n{{ evt.content.linkMetaData }}\n\t\t\t\t</pre></div></td></tr></tbody><thead ng-show=hasEvent><tr><th colspan=4>Internal data</th></tr></thead><tbody ng-show=hasEvent><tr><td>EventId</td><td colspan=3>{{ evt.eventId }}</td></tr></tbody></table>')}])}(),function(t){try{t=e.module("es-ui.streams.templates")}catch(n){t=e.module("es-ui.streams.templates",[])}t.run(["$templateCache",function(e){e.put("streams.item.events.tpl.html",'<table><thead><tr><th>Event #</th><th>Name</th><th>Type</th><th>Created Date</th><th></th></tr></thead><tbody ng-repeat="event in streams track by $index"><tr ng-class="{ \'invalid\': !event.streamId }"><td><a ng-if=event.streamId ui-sref="^.event({streamId: event.streamId, eventNumber: event.eventNumber})">{{ event.positionEventNumber }}</a><text ng-if=!event.streamId>{{ event.positionEventNumber }}</text></td><td><a ng-if=event.streamId ui-sref="^.event({streamId: event.streamId, eventNumber: event.eventNumber})">{{ event.title }}</a><text ng-if=!event.streamId>{{ event.title }}</text></td><td>{{ event.eventType }}</td><td>{{ event.updated | date:\'yyyy-MM-dd HH:mm:ss\'}}</td><td><a ng-click="toggleJson($event, event)" style="cursor: pointer;" ng-if="event.isJson || event.isLinkMetaData || event.isMetaData">JSON</a></td></tr><tr ng-show=event.showJson><td colspan=5><div ng-if=event.isJson><strong>Data</strong><pre ng-if=!event.isRedacted>\n{{ event.data }}\t\t\t\t\t\n\t\t\t\t\t</pre><span class=note--warning ng-if=event.isRedacted>This event\'s data was redacted</span></div><div ng-if=event.metaData><strong>Metadata</strong><pre>\n{{ event.metaData }}\t\t\t\t\t\n\t\t\t\t\t</pre></div><div ng-if=event.isLinkMetaData><strong>Link metadata</strong><pre>\n{{ event.linkMetaData }}\t\t\t\t\t\n\t\t\t\t\t</pre></div></td></tr></tbody><tbody ng-if="streams.length < 1"><tr><td colspan=5><div ng-if="$stateParams.hasOwnProperty(\'position\')"><em>No events for stream: {{ $stateParams.streamId }} at position {{ $stateParams.position }}</em></div><div ng-if="!$stateParams.hasOwnProperty(\'position\')"><em>No events for stream: {{ $stateParams.streamId }}</em></div></td></tr></tbody></table>')}])}(),function(t){try{t=e.module("es-ui.streams.templates")}catch(n){t=e.module("es-ui.streams.templates",[])}t.run(["$templateCache",function(e){e.put("streams.item.tpl.html",'<header class=page-header><h2 class=page-title>Event Stream \'{{ streamId }}\'</h2><ul class=page-nav><li class=page-nav__item><a ng-class="{highlight: isPolling == false}" ng-click=togglePause() ng-show=headOfStream>{{ isPolling == true ? \'Pause\' : \'Resume\' }}</a></li><li class=page-nav__item><a ui-sref=.acl ng-show="streamId !== \'$all\'">Edit ACL</a></li><li class=page-nav__item><a ui-sref=.addStreamEvent ng-show="streamId.indexOf(\'$\') !== 0">Add Event</a></li><li class=page-nav__item><a ng-click=deleteStream()>Delete</a></li><li ng-if=projectionsEnabled class=page-nav__item><a ui-sref="query({ initStreamId: streamId })">Query</a></li><li class=page-nav__item><a ui-sref=subscriptions.list ng-show="source == \'persistentSubscriptions\'">Back</a> <a ui-sref=^.list ng-show="source == undefined">Back</a></li></ul></header><ul style="list-style-type: none; padding:0 0 0.75rem 0 !important"><li class=page-nav__item ng-repeat="link in links"><a ng-href={{link.uri}}>{{ link.relation }}</a></li></ul><br><div ui-view es-link-header></div>')}])}(),function(t){try{t=e.module("es-ui.streams.templates")}catch(n){t=e.module("es-ui.streams.templates",[])}t.run(["$templateCache",function(e){e.put("streams.list.tpl.html",'<header class=page-header><h2 class=page-title>Stream Browser</h2><ul class=page-nav><li class=page-nav__item><form><input ui-keypress="{\'enter\': \'gotoStream($event)\'}" ng-model=search placeholder="Search for stream"></form></li><li class=page-nav__item><a ui-sref=.addStreamEvent>Add Event</a></li></ul></header><div class=container><div class=container-left><table><thead><tr><th>Recently Created Streams</th></tr></thead><tbody><tr ng-repeat="stream in createdStreams"><td><a ui-sref="^.item.events({streamId: stream.streamId})">{{ stream.streamId }}</a></td></tr><tr ng-hide=createdStreams><td><em>{{noCreatedStreamsText}}</em></td></tr></tbody></table></div><div class=container-right><table><thead><tr><th>Recently Changed Streams</th></tr></thead><tbody><tr ng-repeat="stream in changedStreams"><td><a ui-sref="^.item.events({streamId: stream.streamId})">{{ stream.streamId }}</a></td></tr><tr ng-hide=changedStreams><td><em>{{noChangedStreamsText}}</em></td></tr></tbody></table></div></div>')}])}(),function(t){try{t=e.module("es-ui.streams.templates")}catch(n){t=e.module("es-ui.streams.templates",[])}t.run(["$templateCache",function(e){e.put("streams.tpl.html","<div ui-view></div>")}])}()})),define("modules/streams/_index",["angular","uiRouter","./controllers/_index","./directives/_index","./services/_index","./templates/templates"],(function(e){"use strict";return e.module("es-ui.streams",["ui.router","es-ui.streams.controllers","es-ui.streams.services","es-ui.streams.templates","es-ui.streams.directives"])})),define("modules/streams/module",["./_index"],(function(e){"use strict";return e.config(["$stateProvider",function(e){e.state("streams",{url:"streams",parent:"app",templateUrl:"streams.tpl.html",abstract:!0}).state("streams.list",{url:"",templateUrl:"streams.list.tpl.html",controller:"StreamsListCtrl",data:{title:"Stream Browser"}}).state("streams.item",{url:"/{streamId}",templateUrl:"streams.item.tpl.html",abstract:!0,controller:["$scope","$stateParams",function(e,t){e.streamId=t.streamId}],data:{title:"Stream"}}).state("streams.item.events",{url:"",templateUrl:"streams.item.events.tpl.html",controller:"StreamsItemEventsCtrl",data:{title:"Stream"}}).state("streams.item.navigation",{url:"/{position}/{type}/{count:[0-9]{1,99}}",templateUrl:"streams.item.events.tpl.html",controller:"StreamsItemEventsCtrl",data:{title:"Stream"}}).state("streams.item.metadata",{url:"/metadata",views:{"@streams":{templateUrl:"streams.item.event.tpl.html",controller:"StreamsItemEventCtrl"}},data:{metadata:!0,title:"Stream Event"}}).state("streams.item.event",{url:"/{eventNumber:[0-9]{1,99}}",views:{"@streams":{templateUrl:"streams.item.event.tpl.html",controller:"StreamsItemEventCtrl"}},data:{title:"Stream Event"}}).state("streams.item.acl",{url:"/acl",views:{"@streams":{templateUrl:"streams.item.acl.tpl.html",controller:"StreamsItemAclCtrl"}},data:{title:"Edit Stream ACL"}}).state("streams.list.addStreamEvent",{url:"/addEvent",views:{"@streams":{templateUrl:"streams.event.new.tpl.html",controller:"StreamsAddEventCtrl"}},data:{title:"Add Event To Stream"}}).state("streams.item.addStreamEvent",{url:"/addEvent",views:{"@streams":{templateUrl:"streams.event.new.tpl.html",controller:"StreamsAddEventCtrl"}},data:{title:"Add Event To Stream"},params:{fromEvent:null,streamId:""}})}])})),define("modules/security/controllers/_module",["angular"],(function(e){"use strict";return e.module("es-ui.security.controllers",[])})),define("modules/security/controllers/SignInCtrl",["./_module"],(function(e){"use strict";return e.controller("SignInCtrl",["$scope","$rootScope","$state","$location","AuthService","MessageService","InfoService",function(e,t,n,i,r,s,o){function a(){if(t.previousUrl&&"/"!==t.previousUrl){var e=t.previousUrl;t.previousUrl=null,i.path(e)}else n.go("dashboard.list")}e.log={username:"",password:""},e.signIn=function(){e.login.$invalid?s.warn("Please fix all validation errors"):r.validate(e.log.username,e.log.password).then((function(){r.setCredentials(e.log.username,e.log.password),o.getOptions().then((function(e){var n=e.data;for(var i in n)"ClusterSize"===n[i].name&&n[i].value>1&&(t.singleNode=!1)}),(function(e){401!==e.statusCode&&s.failure("Failed to load options: "+e.message)})),a()}),(function(e){401===e.statusCode?s.warn("Incorrect user credentials supplied."):s.failure("Failed to validate user: "+e.message)}))},r.existsAndValid().then((function(){a()}))}])})),define("modules/security/controllers/SignOutCtrl",["./_module"],(function(e){"use strict";return e.controller("SignOutCtrl",["$scope","$state","AuthService","$rootScope",function(e,t,n,i){n.clearCredentials(),"oauth"===i.authentication.type?i.hideMenuOptions=!0:t.go("signin")}])})),define("modules/security/controllers/_index",["./SignInCtrl","./SignOutCtrl"],(function(){})),define("modules/security/templates/templates",["angular"],(function(e){"use strict";!function(t){try{t=e.module("es-ui.security.templates")}catch(n){t=e.module("es-ui.security.templates",[])}t.run(["$templateCache",function(e){e.put("signin.tpl.html",'<div class=page-logon es-height><div class=logon-container><h1 class=site-title><a href="javascript:return false;"><img src=images/logo.svg height=29 width=119 alt="Event Store"></a></h1><form novalidate name=login ng-submit=signIn() class=login-form><label for=username>Username</label> <input placeholder=Username autofocus required name=username es-auto-focus ng-class="{ \'form-table--error\' : login.username.$invalid && !login.username.$pristine }" ng-model=log.username> <label for=password>Password</label> <input type=password ng-class="{ \'form-table--error\' : login.password.$invalid && !login.password.$pristine }" name=password class=form-table placeholder=Password ng-model=log.password required> <button type=submit style=cursor:pointer; ng-disabled=login.$invalid>Sign In</button></form></div><footer class=site-footer><p>Event Store</p></footer></div>')}])}()})),define("modules/security/_index",["angular","uiRouter","./controllers/_index","./templates/templates"],(function(e){"use strict";return e.module("es-ui.security",["ui.router","es-ui.security.controllers","es-ui.security.templates"])})),define("modules/security/module",["./_index"],(function(e){"use strict";return e.config(["$stateProvider",function(e){e.state("signin",{url:"signin",templateUrl:"signin.tpl.html",controller:"SignInCtrl",data:{title:"Sign in"}}).state("signout",{url:"signout",parent:"app",template:"<div ui-view>{{logoutText}}</div>",controller:"SignOutCtrl",data:{title:"Sign out"}})}])})),define("modules/users/controllers/_module",["angular"],(function(e){"use strict";return e.module("es-ui.users.controllers",["es-ui.users.services"])})),define("modules/users/controllers/UsersItemDeleteCtrl",["./_module"],(function(e){"use strict";return e.controller("UsersItemDeleteCtrl",["$scope","$state","$stateParams","UserService","MessageService",function(e,t,n,i,r){e.disable=!0,e.confirm=function(n){n.preventDefault(),n.stopPropagation(),i.remove(e.user.loginName).then((function(){r.success("User deleted"),t.go("users.list")}),(function(e){r.failure("Failed to delete user: "+e.message)}))},i.get(n.username).then((function(t){var n=t.data;e.user=n.data,e.disable=!1}),(function(e){404===e.statusCode?r.failure("User does not exist"):r.failure("Failed to get user: "+e.message),t.go("users")}))}])})),define("modules/users/controllers/UsersItemDetailsCtrl",["./_module"],(function(e){"use strict";return e.controller("UsersItemDetailsCtrl",["$scope","$state","$stateParams","UserService","MessageService",function(e,t,n,i,r){i.get(n.username).then((function(t){var n=t.data;e.user=n.data}),(function(e){r.failure("Failed to get user: "+e.message),t.go("users")}))}])})),define("modules/users/controllers/UsersItemDisableCtrl",["./_module"],(function(e){"use strict";return e.controller("UsersItemDisableCtrl",["$scope","$state","$stateParams","UserService","MessageService",function(e,t,n,i,r){e.disable=!0,e.confirm=function(t){t.preventDefault(),t.stopPropagation(),i.disable(e.user.loginName).then((function(){r.success("User disabled"),e.$state.go("^.details")}),(function(e){r.failure("Failed to disable user: "+e.message)}))},i.get(n.username).then((function(n){var i=n.data;e.user=i.data,e.disable=!1,e.user.disabled&&(r.warn("User already disabled"),t.go("^.details"))}),(function(e){404===e.statusCode?r.failure("User does not exist"):r.failure("Failed to get user: "+e.message),t.go("users")}))}])})),define("modules/users/controllers/UsersItemEditCtrl",["./_module"],(function(e){"use strict";return e.controller("UsersItemEditCtrl",["$scope","$state","$stateParams","UserService","MessageService",function(e,t,n,i,r){e.confirm=function(){e.editUsr.$invalid?r.warn("Please fix all validation errors"):i.update(e.user.loginName,e.fullName,e.user.role).then((function(){r.success("user updated"),t.go("^.details")}),(function(e){r.failure("Failed to update user: "+e.message)}))},i.get(n.username).then((function(t){var n=t.data;e.user=n.data,e.user.role=n.data.groups[0],e.fullName=e.user.fullName}),(function(e){404===e.statusCode?r.failure("User does not exist"):r.failure("Failed to get user: "+e.message),t.go("users")}))}])})),define("modules/users/controllers/UsersItemEnableCtrl",["./_module"],(function(e){"use strict";return e.controller("UsersItemEnableCtrl",["$scope","$state","$stateParams","UserService","MessageService",function(e,t,n,i,r){e.disable=!0,e.confirm=function(n){n.preventDefault(),n.stopPropagation(),i.enable(e.user.loginName).then((function(){r.success("user enabled"),t.go("^.details")}),(function(e){r.failure("Failed to enable user: "+e.message)}))},i.get(n.username).then((function(n){var i=n.data;e.user=i.data,e.disable=!1,e.user.disabled||(r.warn("user already enabled"),t.go("^.details"))}),(function(e){404===e.statusCode?r.failure("User does not exist"):r.failure("Failed to get user: "+e.message),t.go("users")}))}])})),define("modules/users/controllers/UsersItemResetCtrl",["./_module"],(function(e){"use strict";return e.controller("UsersItemResetCtrl",["$rootScope","$scope","$state","UserService","MessageService","AuthService",function(e,t,n,i,r,s){t.confirm=function(){t.resetPwd.$invalid?r.warn("Please fix all validation errors"):i.resetPassword(t.user.loginName,t.password).then((function(){r.success("Password has been reset"),s.resetCredentials(t.user.loginName,t.password).then((function(){n.go("^.details")}),(function(){r.failure("We tried to reset the credentials in the cookie and failed. Please log in again."),n.go("signin")}))}),(function(e){r.failure("Failed to reset password: "+e.message)}))},i.get(t.$stateParams.username).then((function(e){var n=e.data;t.user=n.data}),(function(e){404===e.statusCode?r.failure("User does not exist"):r.failure("Failed to get user: "+e.message),n.go("users")}))}])})),define("modules/users/controllers/UsersListCtrl",["./_module"],(function(e){"use strict";return e.controller("UsersListCtrl",["$rootScope","$state","$scope","UserService","poller","MessageService",function(e,t,n,i,r,s){function o(){if(!e.userManagementEnabled)return s.failure("User Management is not available"),void t.go("dashboard.list");var o=r.create({interval:1e3,action:i.all,params:[]});o.start(),o.promise.then(null,null,(function(e){n.users=e.data})),o.promise.catch((function(e){o.stop(),s.failure("Failed to retrieve list of users: "+e.message)})),n.$on("$destroy",(function(){r.clear()}))}if(e.initialized)o();else var a=e.$on("initialized",(function(){o(),a()}))}])})),define("modules/users/controllers/UsersNewCtrl",["./_module"],(function(e){"use strict";return e.controller("UsersNewCtrl",["$scope","$state","UserService","MessageService",function(e,t,n,i){e.newUser={},e.confirm=function(){e.newUsr.$invalid?i.warn("Please fix all validation errors"):n.create(e.newUser).then((function(){i.success("User created"),t.go("^.list")}),(function(e){i.failure("Failed to create user: "+e.message)}))}}])})),define("modules/users/controllers/_index",["./UsersItemDeleteCtrl","./UsersItemDetailsCtrl","./UsersItemDisableCtrl","./UsersItemEditCtrl","./UsersItemEnableCtrl","./UsersItemResetCtrl","./UsersListCtrl","./UsersNewCtrl"],(function(){})),define("modules/users/services/_module",["angular"],(function(e){"use strict";return e.module("es-ui.users.services",[])})),define("modules/users/services/UserService",["./_module"],(function(e){"use strict";return e.provider("UserService",(function(){this.$get=["$http","urls","UrlBuilder",function(e,t,n){return{all:function(){var i=n.build(t.users.list);return e.get(i)},get:function(i){var r=n.build(t.users.get,i);return e.get(r)},create:function(i){var r=n.build(t.users.create);return i.groups=[],i.role&&i.groups.push(i.role),delete i.confirmPassword,e.post(r,i)},update:function(i,r,s){var o=n.build(t.users.update,i),a=[];return s&&a.push(s),e.put(o,{fullName:r,groups:a})},remove:function(i){var r=n.build(t.users.remove,i);return e.delete(r)},disable:function(i){var r=n.build(t.users.disable,i);return e.post(r)},enable:function(i){var r=n.build(t.users.enable,i);return e.post(r)},resetPassword:function(i,r){var s=n.build(t.users.resetPassword,i);return e.post(s,{newPassword:r})}}}]}))})),define("modules/users/services/_index",["./UserService"],(function(){})),define("modules/users/templates/templates",["angular"],(function(e){"use strict";!function(t){try{t=e.module("es-ui.users.templates")}catch(n){t=e.module("es-ui.users.templates",[])}t.run(["$templateCache",function(e){e.put("users.item.delete.tpl.html","<header class=page-header><h2 class=page-title>Delete User {{ user.loginName }}</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.details>Back</a></li></ul></header><pre>\n{{ user | json }}\n</pre><ul class=page-nav><li class=page-nav__item><a href=# ng-click=confirm($event) ng-disabled=disable>Delete</a></li></ul>")}])}(),function(t){try{t=e.module("es-ui.users.templates")}catch(n){t=e.module("es-ui.users.templates",[])}t.run(["$templateCache",function(e){e.put("users.item.details.tpl.html",'<div ui-view><header class=page-header><h2 class=page-title>User Details {{ user.loginName }}</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.edit>Edit</a></li><li class=page-nav__item><a ui-sref=^.delete>Delete</a></li><li class=page-nav__item ng-hide=user.disabled><a ui-sref=^.disable>Disable</a></li><li class=page-nav__item ng-show=user.disabled><a ui-sref=^.enable>Enable</a></li><li class=page-nav__item><a ui-sref=^.reset>Password Reset</a></li><li class=page-nav__item><a ui-sref=^.^.list>Back</a></li></ul></header></div><div><table><tr><th>Fields</th><th>Values</th></tr><tr><td>Login Name</td><td>{{ user.loginName }}</td></tr><tr><td>Full Name</td><td>{{ user.fullName }}</td></tr><tr><td>Groups</td><td><ul ng-repeat="group in user.groups"><li>{{ group }}</li></ul></td></tr><tr><td>Disabled</td><td>{{ user.disabled }}</td></tr><tr><td>API Links</td><td><ul ng-repeat="userData in user.links"><li><b>Link</b> - <a href={{userData.href}} target=_blank>{{ userData.href }}</a></li><li><b>Rel</b> - {{userData.rel}}</li></ul></td></tr></table></div>')}])}(),function(t){try{t=e.module("es-ui.users.templates")}catch(n){t=e.module("es-ui.users.templates",[])}t.run(["$templateCache",function(e){e.put("users.item.disable.tpl.html","<header class=page-header><h2 class=page-title>Disable User {{ user.loginName }}</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.details>Back</a></li></ul></header><pre>\n{{ user | json }}\n</pre><ul class=page-nav><li class=page-nav__item><a href=# ng-click=confirm($event) ng-disabled=disable>Disable</a></li></ul>")}])}(),function(t){try{t=e.module("es-ui.users.templates")}catch(n){t=e.module("es-ui.users.templates",[])}t.run(["$templateCache",function(e){e.put("users.item.edit.tpl.html","<header class=page-header><h2 class=page-title>Edit User {{ user.loginName }}</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.details>Back</a></li></ul></header><form novalidate name=editUsr ng-submit=confirm()><table><tbody><tr><td>Login Name</td><td>{{ user.loginName}}</td></tr><tr><td>Full Name</td><td><input name=fullName class=form-table ng-class=\"{ 'form-table--error' : editUsr.fullName.$invalid && !editUsr.fullName.$pristine }\" ng-model=fullName required></td></tr><tr><td>Groups</td><td><input type=radio name=role ng-model=user.role value=$ops> <label for=isOperations>Is Operations</label> <input type=radio name=role ng-model=user.role value=$admins> <label for=isAdmin>Is Administrator</label> <input type=radio name=role ng-model=user.role> <label for=hasNoRole>None</label></td></tr></tbody></table><ul class=page-nav><li class=page-nav__item><button type=submit ng-disabled=editUsr.$invalid>Update</button></li></ul></form>")}])}(),function(t){try{t=e.module("es-ui.users.templates")}catch(n){t=e.module("es-ui.users.templates",[])}t.run(["$templateCache",function(e){e.put("users.item.enable.tpl.html","<header class=page-header><h2 class=page-title>Enable User {{ user.loginName }}</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.details>Back</a></li></ul></header><pre>\n{{ user | json }}\n</pre><ul class=page-nav><li class=page-nav__item><a href=# ng-click=confirm($event) ng-disabled=disable>Enable</a></li></ul>")}])}(),function(t){try{t=e.module("es-ui.users.templates")}catch(n){t=e.module("es-ui.users.templates",[])}t.run(["$templateCache",function(e){e.put("users.item.reset.tpl.html","<header class=page-header><h2 class=page-title>Reset User {{ user.loginName }} Password</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.details>Back</a></li></ul></header><form novalidate name=resetPwd ng-submit=confirm()><table><tbody><tr><td>Login Name</td><td>{{ user.loginName}}</td></tr><tr><td>Password</td><td><input type=password name=password class=form-table ng-class=\"{ 'form-table--error' : resetPwd.password.$invalid && !resetPwd.password.$pristine }\" ng-model=password required></td></tr><tr><td>Confirm Password</td><td><input type=password class=form-table name=confirmPassword ng-model=confirmPassword ng-class=\"{ 'form-table--error' : resetPwd.confirmPassword.$invalid && !resetPwd.confirmPassword.$pristine }\" es-validate-equals=password></td></tr></tbody></table><ul class=page-nav><li class=page-nav__item><button type=submit ng-disabled=resetPwd.$invalid>Reset password</button></li></ul></form>")}])}(),function(t){try{t=e.module("es-ui.users.templates")}catch(n){t=e.module("es-ui.users.templates",[])}t.run(["$templateCache",function(e){e.put("users.item.tpl.html","<div ui-view></div>")}])}(),function(t){try{t=e.module("es-ui.users.templates")}catch(n){t=e.module("es-ui.users.templates",[])}t.run(["$templateCache",function(e){e.put("users.list.tpl.html","<div ui-view><header class=page-header><h2 class=page-title>Users</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.new>New User</a></li></ul></header><table class=table-queues><thead><tr><th>Login Name</th><th>Full Name</th><th>Groups</th><th>Disabled</th><th>Updated</th></tr></thead><tbody><tr ng-repeat=\"user in users\"><td><a ui-sref=\"^.item.details({username: user.loginName})\">{{ user.loginName }}</a></td><td>{{ user.fullName }}</td><td>{{ user.groups.join(', ') }}</td><td>{{ user.disabled }}</td><td>{{ user.dateLastUpdated | date:'short' }}</td></tr><tr ng-hide=users><td colspan=5><em>No users</em></td></tr></tbody></table></div>")}])}(),function(t){try{t=e.module("es-ui.users.templates")}catch(n){t=e.module("es-ui.users.templates",[])}t.run(["$templateCache",function(e){e.put("users.new.tpl.html","<header class=page-header><h2 class=page-title>New User</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.list>Back</a></li></ul></header><form novalidate name=newUsr ng-submit=confirm()><table><tbody><tr><td>Login Name</td><td><input class=form-table autofocus required name=loginName ng-class=\"{ 'form-table--error' : newUsr.loginName.$invalid && !newUsr.loginName.$pristine }\" ng-model=newUser.loginName></td></tr><tr><td>Full Name</td><td><input ng-class=\"{ 'form-table--error' : newUsr.fullName.$invalid && !newUsr.fullName.$pristine }\" name=fullName class=form-table required ng-model=newUser.fullName></td></tr><tr><td>Password</td><td><input type=password ng-class=\"{ 'form-table--error' : newUsr.password.$invalid && !newUsr.password.$pristine }\" name=password class=form-table ng-model=newUser.password required></td></tr><tr><td>Confirm Password</td><td><input type=password ng-class=\"{ 'form-table--error' : newUsr.confirmPassword.$invalid && !newUsr.confirmPassword.$pristine }\" name=confirmPassword class=form-table required ng-model=newUser.confirmPassword es-validate-equals=newUser.password></td></tr><tr><td>Groups</td><td><input type=radio name=role ng-model=newUser.role value=$ops> <label for=isOperations>Is Operations</label> <input type=radio name=role ng-model=newUser.role value=$admins> <label for=isAdmin>Is Administrator</label> <input type=radio name=role ng-model=user.role> <label for=hasNoRole>None</label></td></tr></tbody></table><ul class=page-nav><li class=page-nav__item><button type=submit ng-disabled=newUsr.$invalid>Create</button></li></ul></form>")}])}(),function(t){try{t=e.module("es-ui.users.templates")}catch(n){t=e.module("es-ui.users.templates",[])}t.run(["$templateCache",function(e){e.put("users.tpl.html","<div ui-view></div>")}])}()})),define("modules/users/_index",["angular","uiRouter","./controllers/_index","./services/_index","./templates/templates"],(function(e){"use strict";return e.module("es-ui.users",["ui.router","es-ui.users.controllers","es-ui.users.services","es-ui.users.templates"])})),define("modules/users/module",["./_index"],(function(e){"use strict";return e.config(["$stateProvider",function(e){e.state("users",{url:"users",parent:"app",templateUrl:"users.tpl.html",abstract:!0,data:{title:"Users"}}).state("users.list",{url:"",templateUrl:"users.list.tpl.html",controller:"UsersListCtrl",data:{title:"Users"}}).state("users.new",{url:"/new",templateUrl:"users.new.tpl.html",controller:"UsersNewCtrl",data:{title:"New User"}}).state("users.item",{url:"/{username}",abstract:!0,templateUrl:"users.item.tpl.html",data:{title:"User Details"}}).state("users.item.details",{url:"",templateUrl:"users.item.details.tpl.html",controller:"UsersItemDetailsCtrl",data:{title:"User Details"}}).state("users.item.edit",{url:"/edit",templateUrl:"users.item.edit.tpl.html",controller:"UsersItemEditCtrl",data:{title:"Edit User"}}).state("users.item.disable",{url:"/disable",templateUrl:"users.item.disable.tpl.html",controller:"UsersItemDisableCtrl",data:{title:"Disable User"}}).state("users.item.enable",{url:"/enable",templateUrl:"users.item.enable.tpl.html",controller:"UsersItemEnableCtrl",data:{title:"Enable User"}}).state("users.item.delete",{url:"/delete",templateUrl:"users.item.delete.tpl.html",controller:"UsersItemDeleteCtrl",data:{title:"Delete User"}}).state("users.item.reset",{url:"/reset",templateUrl:"users.item.reset.tpl.html",controller:"UsersItemResetCtrl",data:{title:"Reset User Password"}})}])})),define("modules/competing/controllers/_module",["angular"],(function(e){"use strict";return e.module("es-ui.competing.controllers",["es-ui.competing.services"])})),define("modules/competing/controllers/SubscriptionsListCtrl",["./_module"],(function(e){"use strict";return e.controller("SubscriptionsListCtrl",["$scope","CompetingService","SubscriptionsMapper","poller","MessageService","urls","UrlBuilder",function(e,t,n,i,r,s,o){var a=i.create({interval:1e3,action:t.subscriptions,params:[]});e.replayParkedMessages=function(e,n){t.replayParked(e,n).then((function(){r.success("Replaying Parked Messages")}),(function(e){r.failure("Failed to initiate replaying of parked messages: "+e.message)}))},e.subscriptions={},a.start(),a.promise.then(null,null,(function(t){e.subscriptions=n.map(t,e.subscriptions)})),a.promise.catch((function(t){r.failure("Failed to retrieve list of subscriptions: "+t.message),e.subscriptions=null,a.stop()})),e.$on("$destroy",(function(){i.clear()}))}])})),define("modules/competing/controllers/SubscriptionsDetailCtrl",["./_module"],(function(e){"use strict";return e.controller("SubscriptionsDetailCtrl",["$scope","$stateParams","CompetingService","MessageService",function(e,t,n,i){e.streamId=t.streamId,e.groupName=t.groupName,n.subscriptionDetail(e.streamId,e.groupName).then((function(t){e.detail=t.data}),(function(e){i.failure("Failed to retrieve subscription details: "+e.message)}))}])})),define("modules/competing/controllers/SubscriptionsNewCtrl",["./_module"],(function(e){"use strict";return e.controller("SubscriptionsNewCtrl",["$scope","$state","CompetingService","MessageService",function(e,t,n,i){e.namedConsumerStrategies=[{value:"RoundRobin",name:"Round Robin"},{value:"DispatchToSingle",name:"Dispatch To Single"},{value:"Pinned",name:"Pinned"},{value:"PinnedByCorrelation",name:"Pinned By Correlation"}],e.checkpoints=1e3,e.resolveLinktos=!1,e.startFrom=0,e.messageTimeoutMilliseconds=1e4,e.extraStatistics=!1,e.maxRetryCount=10,e.liveBufferSize=500,e.bufferSize=500,e.readBatchSize=20,e.checkPointAfterMilliseconds=1e3,e.minCheckPointCount=10,e.maxCheckPointCount=500,e.maxSubscriberCount=10,e.namedConsumerStrategy="RoundRobin",e.save=function(){if(e.newSubscription.$invalid)i.warn("Please fix all validation errors");else{var r={checkpoints:e.checkpoints,resolveLinktos:e.resolveLinktos,startFrom:e.startFrom,messageTimeoutMilliseconds:e.messageTimeoutMilliseconds,extraStatistics:e.extraStatistics,maxRetryCount:e.maxRetryCount,liveBufferSize:e.liveBufferSize,bufferSize:e.bufferSize,readBatchSize:e.readBatchSize,checkPointAfterMilliseconds:e.checkPointAfterMilliseconds,minCheckPointCount:e.minCheckPointCount,maxCheckPointCount:e.maxCheckPointCount,maxSubscriberCount:e.maxSubscriberCount,namedConsumerStrategy:e.namedConsumerStrategy};n.create(e.stream,e.subscription,r).then((function(){i.success("Subscription has been created"),t.go("^.list")}),(function(e){var t=e.message;e.errorData&&e.errorData.reason&&(t=e.errorData.reason),i.failure("Failed to create new subscription: "+t)}))}}}])})),define("modules/competing/controllers/SubscriptionsEditCtrl",["./_module"],(function(e){"use strict";return e.controller("SubscriptionsEditCtrl",["$scope","$state","CompetingService","MessageService",function(e,t,n,i){e.stream=t.params.streamId,e.subscription=t.params.groupName,e.namedConsumerStrategies=[{value:"RoundRobin",name:"Round Robin"},{value:"DispatchToSingle",name:"Dispatch To Single"},{value:"Pinned",name:"Pinned"},{value:"PinnedByCorrelation",name:"Pinned By Correlation"}],n.subscriptionDetail(e.stream,e.subscription).then((function(t){e.config=t.data.config}),(function(e){i.failure("Failed to retrieve subscription details: "+e.message)})),e.namedConsumerStrategy="RoundRobin",e.save=function(){if(e.updateSubscription.$invalid)i.warn("Please fix all validation errors");else{var r={checkpoints:e.config.checkpoints,enabled:e.config.enabled,resolveLinktos:e.config.resolveLinktos,startFrom:e.config.startFrom,messageTimeoutMilliseconds:e.config.messageTimeoutMilliseconds,extraStatistics:e.config.extraStatistics,maxRetryCount:e.config.maxRetryCount,liveBufferSize:e.config.liveBufferSize,bufferSize:e.config.bufferSize,readBatchSize:e.config.readBatchSize,checkPointAfterMilliseconds:e.config.checkPointAfterMilliseconds,minCheckPointCount:e.config.minCheckPointCount,maxCheckPointCount:e.config.maxCheckPointCount,maxSubscriberCount:e.config.maxSubscriberCount,namedConsumerStrategy:e.config.namedConsumerStrategy};n.update(e.stream,e.subscription,r).then((function(e){var n=(0,e.headers)().location;i.success("Subscription has been updated"),t.go("subscriptions.list",{location:encodeURIComponent(n)})}),(function(e){var t=e.message;e.errorData&&e.errorData.reason&&(t=e.errorData.reason),i.failure("Failed to update subscription: "+t)}))}}}])})),define("modules/competing/controllers/SubscriptionsDeleteCtrl",["./_module"],(function(e){"use strict";return e.controller("SubscriptionsDeleteCtrl",["$scope","$state","CompetingService","MessageService",function(e,t,n,i){e.stream=t.params.streamId,e.subscription=t.params.groupName,e.delete=function(){i.confirm("Are you sure you wish to delete the subscription?")&&n.delete(e.stream,e.subscription).then((function(){i.success("Subscription has been deleted"),t.go("subscriptions.list")}),(function(e){i.failure("Failed to delete subscription: "+e.message)}))}}])})),define("modules/competing/controllers/SubscriptionsViewParkedMessagesCtrl",["./_module"],(function(e){"use strict";function t(e,t,n){404===e.statusCode||410===e.statusCode?t.entries=[]:n.failure("Failed to read parked messages: "+e.message)}return e.controller("SubscriptionsViewParkedMessagesCtrl",["$scope","$stateParams","CompetingService","poller","MessageService",function(e,n,i,r,s){e.streamId=n.streamId,e.groupName=n.groupName,e.$parent.showHeader=!1;var o={};i.viewParkedMessagesBackward(e.streamId,e.groupName,"head",20).then((function(t){var n=t.data;null!=n.entries?e.entries=n.entries:e.entries=[]}),(function(n){t(n,e,s)})),e.pageForward=function(n){if(null!=n&&n.length>0){var r=n[0].positionEventNumber+1;i.viewParkedMessagesForward(e.streamId,e.groupName,r,20).then((function(t){var n=t.data;void 0!==n&&void 0!==n.entries&&n.entries.length>0&&(e.entries=n.entries)}),(function(n){t(n,e,s)}))}},e.pageForwardPoll=function(){var t=0;return null!=e.entries&&e.entries.length>0&&(t=e.entries[0].positionEventNumber+1),i.viewParkedMessagesForward(e.streamId,e.groupName,t,20)};var a=r.create({interval:5e3,action:e.pageForwardPoll,params:[]});a.start(),a.promise.then(null,null,(function(t){if(void 0!==t&&void 0!==t.entries&&t.entries.length>0)for(var n in t.entries)t.entries[n].positionEventNumber>e.entries[0].positionEventNumber&&e.entries.unshift(t.entries[n])})),a.promise.catch((function(n){t(n,e,s),a.stop()})),e.pageBackward=function(n){if(a.stop(),null!=n&&n.length>0){var r=n[n.length-1].positionEventNumber-1;i.viewParkedMessagesBackward(e.streamId,e.groupName,r,20).then((function(t){var n=t.data;a.stop(),void 0!==n&&void 0!==n.entries&&n.entries.length>0&&(e.entries=n.entries)}),(function(n){t(n,e,s)}))}},e.pageFirst=function(){i.viewParkedMessagesBackward(e.streamId,e.groupName,"head",20).then((function(t){var n=t.data;void 0!==n&&void 0!==n.entries&&n.entries.length>0&&(e.entries=n.entries)}),(function(n){t(n,e,s)})),a.start()},e.$on("$destroy",(function(){a.stop()})),e.toggleJson=function(e,t){e.preventDefault(),e.stopPropagation(),t.showJson=!t.showJson,o[t.title]=t.showJson}}])})),define("modules/competing/controllers/_index",["./SubscriptionsListCtrl","./SubscriptionsDetailCtrl","./SubscriptionsNewCtrl","./SubscriptionsEditCtrl","./SubscriptionsDeleteCtrl","./SubscriptionsViewParkedMessagesCtrl"],(function(){})),define("modules/competing/services/_module",["angular"],(function(e){"use strict";return e.module("es-ui.competing.services",[])})),define("modules/competing/services/CompetingService",["./_module"],(function(e){"use strict";return e.provider("CompetingService",(function(){this.$get=["$http","urls","UrlBuilder",function(e,t,n){return{subscriptions:function(){var i=n.build(t.competing.subscriptions);return e.get(i)},subscriptionDetail:function(i,r){var s=n.build(t.competing.subscriptionDetails,i,r);return e.get(s)},create:function(i,r,s){var o=n.build(t.competing.create,i,r);return e.put(o,s,{headers:{"Content-Type":"application/json"}})},update:function(i,r,s){var o=n.build(t.competing.update,i,r);return e.post(o,s,{headers:{"Content-Type":"application/json"}})},delete:function(i,r){var s=n.build(t.competing.delete,i,r);return e.delete(s,{headers:{"Content-Type":"application/json"}})},replayParked:function(i,r){var s=n.build(t.competing.replayParked,i,r);return e.post(s,{},{headers:{"Content-Type":"application/json"}})},viewParkedMessagesBackward:function(i,r,s,o){var a=n.build(t.competing.viewParkedMessagesBackward,i,r,s,o);return e.get(a,{headers:{Accept:"application/vnd.eventstore.competingatom+json"}})},viewParkedMessagesForward:function(i,r,s,o){var a=n.build(t.competing.viewParkedMessagesForward,i,r,s,o);return e.get(a,{headers:{Accept:"application/vnd.eventstore.competingatom+json"}})}}}]}))})),define("modules/competing/services/SubscriptionsMapper",["./_module"],(function(e){"use strict";return e.provider("SubscriptionsMapper",(function(){function e(e,t){for(var n in e)if(e[n].groupName===t)return e[n]}function t(e){for(var t in e.groups)if(e.groups[t].status.indexOf("behind")>=0)return e.groups[t].status;return e.groups[0].status}function n(e){return{commit:parseInt(e.split("/")[0].split("C:")[1]),prepare:parseInt(e.split("/")[1].split("P:")[1])}}function i(e,t,i){if(void 0===e)return t;if(void 0===t)return e;if(null===e)return e;if(null===t)return t;if(i){var r=n(e),s=n(t);return Math.max(r.commit,r.prepare)<=Math.max(s.commit,s.prepare)?e:t}return parseInt(e)<=parseInt(t)?e:t}function r(n,r){var s,o,a,l,c=n,u={};for(s in c){var h=(o=c[s]).eventStreamId;h.startsWith("$")&&(h="_"+h);var d=e(r[h]?r[h].groups:[],o.groupName);"$all"===o.eventStreamId?(o.behindByMessages=o.lastKnownEventPosition===o.lastCheckpointedEventPosition?0:void 0,o.behindByTime=void 0,o.behindStatus=""):(null==o.lastKnownEventPosition?o.behindByMessages=0:o.behindByMessages=o.lastKnownEventPosition-o.lastCheckpointedEventPosition+1,o.behindByTime=Math.round(o.behindByMessages/o.averageItemsPerSecond*100)/100,o.behindByTime=isFinite(o.behindByTime)?o.behindByTime:0,o.behindStatus=o.behindByMessages+" / "+o.behindByTime),o.averageItemsPerSecond=d?o.totalItemsProcessed-d.totalItemsProcessed:0,o.inFlightMessages=o.totalInFlightMessages,h?(a=u[h]?u[h]:{streamName:o.eventStreamId,averageItemsPerSecond:0,totalItemsProcessed:0,connectionCount:0,lastKnownEventPosition:void 0,lastCheckpointedEventPosition:void 0,inFlightMessages:0,status:"Idle",behindByMessages:0,behindByTime:0,groups:[]},l=r[h],a.show=!!l&&l.show,a.groups.push(o),a.inFlightMessages+=o.totalInFlightMessages,a.averageItemsPerSecond+=o.averageItemsPerSecond,a.connectionCount+=o.connectionCount,a.lastKnownEventPosition=i(a.lastKnownEventPosition,o.lastKnownEventPosition,"$all"===o.eventStreamId),a.lastCheckpointedEventPosition=i(a.lastCheckpointedEventPosition,o.lastCheckpointedEventPosition,"$all"===o.eventStreamId),"$all"===o.eventStreamId?(a.behindByMessages=void 0,a.behindByTime=void 0,a.behindStatus=""):(a.behindByMessages+=o.behindByMessages,a.behindByTime+=o.behindByTime,a.behindByTime=Math.round(100*o.behindByTime)/100,a.behindStatus=a.behindByMessages+" / "+a.behindByTime),a.status=t(a),u[h]=a):u[h]=o}return u}String.prototype.startsWith||(String.prototype.startsWith=function(e,t){return t=t||0,this.indexOf(e,t)===t}),this.$get=[function(){return{map:r}}]}))})),define("modules/competing/services/_index",["./CompetingService","./SubscriptionsMapper"],(function(){})),define("modules/competing/directives/_module",["angular"],(function(e){"use strict";return e.module("es-ui.competing.directives",[])})),define("modules/competing/directives/EsSubscriptionRow",["./_module"],(function(e){"use strict";return e.directive("esSubscriptionRow",[function(e){return{restrict:"A",templateUrl:"subscription.row.tpl.html",scope:{esSubscription:"="},link:function(){}}}])})),define("modules/competing/directives/EsSubscriptionRowHeader",["./_module"],(function(e){"use strict";return e.directive("esSubscriptionRowHeader",[function(){return{restrict:"A",templateUrl:"subscription.row.header.tpl.html",scope:{esSubscription:"="},link:function(e,t){function n(){e.$apply((function(){e.toggle()}))}e.toggle=function(){e.esSubscription.show=!e.esSubscription.show},t.bind("click",n),e.$on("$destroy",(function(){t.unbind("click",n)}))}}}])})),define("modules/competing/directives/_index",["./EsSubscriptionRow","./EsSubscriptionRowHeader"],(function(){})),define("modules/competing/templates/templates",["angular"],(function(e){"use strict";!function(t){try{t=e.module("es-ui.competing.templates")}catch(n){t=e.module("es-ui.competing.templates",[])}t.run(["$templateCache",function(e){e.put("subscription.row.header.tpl.html","<td ng-if=esSubscription.show>{{ esSubscription.streamName }} <a class=table-collapsetoggle>&minus;</a></td><td ng-if=!esSubscription.show>{{ esSubscription.streamName }} <a class=table-collapsetoggle>&plus;</a></td><td>{{ esSubscription.averageItemsPerSecond }}</td><td>{{ esSubscription.lastKnownEventPosition }}</td><td>{{ esSubscription.lastCheckpointedEventPosition }}</td><td>{{ esSubscription.inFlightMessages }}</td><td>{{ esSubscription.connectionCount }}</td><td>{{ esSubscription.behindStatus }}</td><td></td>")}])}(),function(t){try{t=e.module("es-ui.competing.templates")}catch(n){t=e.module("es-ui.competing.templates",[])}t.run(["$templateCache",function(e){e.put("subscription.row.tpl.html",'<td>{{ esSubscription.groupName }}</td><td>{{ esSubscription.averageItemsPerSecond }}</td><td>{{ esSubscription.lastKnownEventPosition }}</td><td>{{ esSubscription.lastCheckpointedEventPosition }}</td><td>{{ esSubscription.inFlightMessages }}</td><td>{{ esSubscription.connectionCount }}</td><td>{{ esSubscription.behindStatus }}</td><td><ul class=page-nav><li ng-if="esSubscription.eventStreamId !== \'$all\'" class=page-nav__item><a ui-sref="^.item.edit({streamId: esSubscription.eventStreamId, groupName: esSubscription.groupName})">Edit</a></li><li ng-if="esSubscription.eventStreamId !== \'$all\'" class=page-nav__item><a ui-sref="^.item.delete({streamId: esSubscription.eventStreamId, groupName: esSubscription.groupName})">Delete</a></li><li class=page-nav__item><a ui-sref="^.item.detail({streamId: esSubscription.eventStreamId, groupName: esSubscription.groupName})">Detail</a></li><li class=page-nav__item><a ng-click="$parent.replayParkedMessages(esSubscription.eventStreamId, esSubscription.groupName)">Replay Parked Messages</a></li><li class=page-nav__item><a ui-sref="^.item.viewparkedmessages({streamId: esSubscription.eventStreamId, groupName: esSubscription.groupName})">View Parked Messages</a></li></ul></td>')}])}(),function(t){try{t=e.module("es-ui.competing.templates")}catch(n){t=e.module("es-ui.competing.templates",[])}t.run(["$templateCache",function(e){e.put("subscriptions.item.delete.tpl.html","<form novalidate name=deleteSubscription ng-submit=delete() class=delete-subscription-form><table><tbody><tr><td>Group</td><td><input ng-model=subscription required readonly=true class=form-table name=subscription ng-class=\"{ 'form-table--error' : deleteSubscription.subscription.$invalid && !deleteSubscription.subscription.$pristine }\"></td></tr><tr><td>Stream</td><td><input ng-model=stream required readonly=true class=form-table name=stream ng-class=\"{ 'form-table--error' : deleteSubscription.stream.$invalid && !deleteSubscription.stream.$pristine }\"></td></tr></tbody></table><ul class=page-nav><li class=page-nav__item><button type=submit ng-disabled=deleteSubscription.$invalid>Delete</button></li></ul></form>")}])}(),function(t){try{t=e.module("es-ui.competing.templates")}catch(n){t=e.module("es-ui.competing.templates",[])}t.run(["$templateCache",function(e){e.put("subscriptions.item.detail.tpl.html","<div class=container><table><thead><tr><th>Configuration</th></tr></thead><thead><tr><th>Buffer Size</th><th>Check Point After</th><th>Extra Statistics</th><th>Live Buffer Size</th><th>Max Checkpoint Count</th><th>Max Retry Count</th><th>Message Timeout (ms)</th><th>Min Checkpoint Count</th><th>Consumer Strategy</th><th>Read Batch Size</th><th>Resolve Link tos</th><th>Start From</th></tr></thead><tbody><tr><td>{{ detail.config.bufferSize }}</td><td>{{ detail.config.checkPointAfterMilliseconds }}</td><td>{{ detail.config.extraStatistics }}</td><td>{{ detail.config.liveBufferSize }}</td><td>{{ detail.config.maxCheckPointCount }}</td><td>{{ detail.config.maxRetryCount }}</td><td>{{ detail.config.messageTimeoutMilliseconds }}</td><td>{{ detail.config.minCheckPointCount }}</td><td>{{ detail.config.namedConsumerStrategy }}</td><td>{{ detail.config.readBatchSize }}</td><td>{{ detail.config.resolveLinktos }}</td><td>{{ detail.config.startPosition }}</td></tr></tbody></table></div>")}])}(),function(t){try{t=e.module("es-ui.competing.templates")}catch(n){t=e.module("es-ui.competing.templates",[])}t.run(["$templateCache",function(e){e.put("subscriptions.item.edit.tpl.html",'<form novalidate name=updateSubscription ng-submit=save() class=edit-subscription-form><table><tbody><tr class=table-subheading><td colspan=2>Basic Details</td></tr><tr><td>Group</td><td><input ng-model=subscription required class=form-table readonly=true name=subscription></td></tr><tr><td>Stream</td><td><input ng-model=stream required class=form-table readonly=true name=stream></td></tr><tr class=table-subheading><td colspan=2>Configuration</td></tr><tr><td>Resolve Link Tos</td><td><input type=checkbox ng-model=config.resolveLinktos ng-disabled=resolveLinktosDisabled></td></tr><tr><td>Start From</td><td><input ng-model=config.startFrom class=form-table name=startFrom></td></tr><tr><td>Message Timeout (ms)</td><td><input type=number min=0 ng-model=config.messageTimeoutMilliseconds class=form-table name=messageTimeoutMilliseconds></td></tr><tr><td>Extra Statistics</td><td><input type=checkbox ng-model=config.extraStatistics ng-disabled=extraStatisticsDisabled></td></tr><tr><td>Max Retry Count</td><td><input type=number min=0 ng-model=config.maxRetryCount class=form-table name=maxRetryCount></td></tr><tr><td>Live Buffer Size</td><td><input type=number min=0 ng-model=config.liveBufferSize class=form-table name=liveBufferSize></td></tr><tr><td>Buffer Size</td><td><input type=number min=0 ng-model=config.bufferSize class=form-table name=bufferSize></td></tr><tr><td>Read Batch Size</td><td><input type=number min=0 ng-model=config.readBatchSize class=form-table name=readBatchSize></td></tr><tr><td>CheckPoint After (ms)</td><td><input type=number min=0 ng-model=config.checkPointAfterMilliseconds class=form-table name=checkPointAfterMilliseconds></td></tr><tr><td>Min CheckPoint Count</td><td><input type=number min=0 ng-model=config.minCheckPointCount class=form-table name=minCheckPointCount></td></tr><tr><td>Max CheckPoint Count</td><td><input type=number min=0 ng-model=config.maxCheckPointCount class=form-table name=maxCheckPointCount></td></tr><tr><td>Max Subscriber Count</td><td><input type=number min=0 ng-model=config.maxSubscriberCount class=form-table name=maxSubscriberCount></td></tr><tr><td>Named Consumer Strategy</td><td><select ng-model=config.namedConsumerStrategy class=form-table ng-options="obj.value as obj.name for obj in namedConsumerStrategies"></select></td></tr></tbody></table><ul class=page-nav><li class=page-nav__item><button type=submit ng-disabled=updateSubscription.$invalid>Update</button></li></ul></form>')}])}(),function(t){try{t=e.module("es-ui.competing.templates")}catch(n){t=e.module("es-ui.competing.templates",[])}t.run(["$templateCache",function(e){e.put("subscriptions.item.tpl.html",'<div ng-if=showHeader><header class=page-header><h2 class=page-title>Subscription - {{ streamId }}/{{ groupName }}</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.list>Back</a></li></ul></header><ul style="list-style-type: none; padding:0 0 0.75rem 0 !important"><li class=page-nav__item ng-repeat="link in links"><a ng-href={{link.uri}}>{{ link.relation }}</a></li></ul></div><div ui-view es-link-header></div>')}])}(),function(t){try{t=e.module("es-ui.competing.templates")}catch(n){t=e.module("es-ui.competing.templates",[])}t.run(["$templateCache",function(e){e.put("subscriptions.item.viewparkedmessages.tpl.html",'<header class=page-header><h2 class=page-title>View Parked Messages - {{streamId}}::{{groupName}}</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.^.list>Back</a></li></ul></header><ul style="list-style-type: none; padding:0 0 0.75rem 0 !important"><li class=page-nav__item><a ng-click=pageFirst(entries)>First</a> <a ng-click=pageBackward(entries)>Next</a> <a ng-click=pageForward(entries)>Previous</a></li></ul><br><table><thead><tr><th>Event #</th><th>Name</th><th>Type</th><th>Created Date</th><th></th></tr></thead><tbody ng-repeat="event in entries track by event.positionEventNumber"><tr ng-class="{ \'invalid\': !event.streamId }"><td>{{ event.positionEventNumber }}</td><td>{{ event.title }}</td><td>{{ event.eventType }}</td><td>{{ event.updated | date:\'yyyy-MM-dd HH:mm:ss\'}}</td><td><a ng-click="toggleJson($event, event)" style="cursor: pointer;" ng-if="event.isJson || event.isLinkMetaData || event.isMetaData">JSON</a></td></tr><tr ng-show=event.showJson><td colspan=5><div ng-if=event.isJson><strong>Data</strong><pre>{{ event.data }}</pre></div><div ng-if=event.metaData><strong>Metadata</strong><pre>{{ event.metaData }}</pre></div><div ng-if=event.isLinkMetaData><strong>Link metadata</strong><pre>{{ event.linkMetaData }}</pre></div></td></tr></tbody><tbody ng-if="entries.length < 1"><tr><td colspan=5><em>No parked events for subscription {{streamId}}::{{groupName}}</em></td></tr></tbody></table>')}])}(),function(t){try{t=e.module("es-ui.competing.templates")}catch(n){t=e.module("es-ui.competing.templates",[])}t.run(["$templateCache",function(e){e.put("subscriptions.list.tpl.html",'<header class=page-header><h2 class=page-title>Dashboard</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.new>New Subscription</a></li></ul></header><table class=table-subscriptions><thead><tr><th>Stream/Group(s)</th><th>Rate (messages/s)</th><th colspan=3>Messages</th><th>Connections</th><th>Status<br># of msgs / estimated time to catchup in seconds</th><th></th></tr><tr><th></th><th></th><th class=table-subheading title="Last known event position. The value displayed in the subscription\'s header is the minimum value among all groups.">Last Known</th><th class=table-subheading title="Checkpointed event position. The value displayed in the subscription\'s header is the minimum value among all groups.">Checkpoint</th><th class=table-subheading># in Flight</th><th></th><th></th><th></th></tr></thead><tbody ng-repeat="(key, prop) in subscriptions track by key"><tr ng-if=prop.groups class=table-subheading style="cursor: pointer;" es-subscription-row-header es-subscription=prop></tr><tr ng-if=!prop.groups es-subscription-row es-subscription=prop></tr><tr ng-show=prop.show ng-repeat="item in prop.groups" class=table-indentedrow es-subscription-row es-subscription=item></tr></tbody><tbody ng-hide=subscriptions><tr><td colspan=8><em>No subscriptions</em></td></tr></tbody></table>')}])}(),function(t){try{t=e.module("es-ui.competing.templates")}catch(n){t=e.module("es-ui.competing.templates",[])}t.run(["$templateCache",function(e){e.put("subscriptions.new.tpl.html",'<header class=page-header><h2 class=page-title>New Subscription</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.list>Back</a></li></ul></header><form novalidate name=newSubscription ng-submit=save() class=new-subscription-form><table><tbody><tr class=table-subheading><td colspan=2>Basic Details</td></tr><tr><td>Group</td><td><input ng-model=subscription required class=form-table name=subscription ng-class="{ \'form-table--error\' : newSubscription.subscription.$invalid && !newSubscription.subscription.$pristine }"></td></tr><tr><td>Stream</td><td><input ng-model=stream required class=form-table name=stream ng-class="{ \'form-table--error\' : newSubscription.stream.$invalid && !newSubscription.stream.$pristine }"></td></tr><tr class=table-subheading><td colspan=2>Configuration</td></tr><tr><td>Resolve Link Tos</td><td><input type=checkbox ng-model=resolveLinktos ng-disabled=resolveLinktosDisabled></td></tr><tr><td>Start From</td><td><input ng-model=startFrom class=form-table name=startFrom></td></tr><tr><td>Message Timeout (ms)</td><td><input type=number min=0 ng-model=messageTimeoutMilliseconds class=form-table name=messageTimeoutMilliseconds></td></tr><tr><td>Extra Statistics</td><td><input type=checkbox ng-model=extraStatistics ng-disabled=extraStatisticsDisabled></td></tr><tr><td>Max Retry Count</td><td><input type=number min=0 ng-model=maxRetryCount class=form-table name=maxRetryCount></td></tr><tr><td>Live Buffer Size</td><td><input type=number min=0 ng-model=liveBufferSize class=form-table name=liveBufferSize></td></tr><tr><td>Buffer Size</td><td><input type=number min=0 ng-model=bufferSize class=form-table name=bufferSize></td></tr><tr><td>Read Batch Size</td><td><input type=number min=0 ng-model=readBatchSize class=form-table name=readBatchSize></td></tr><tr><td>CheckPoint After (ms)</td><td><input type=number min=0 ng-model=checkPointAfterMilliseconds class=form-table name=checkPointAfterMilliseconds></td></tr><tr><td>Min CheckPoint Count</td><td><input type=number min=0 ng-model=minCheckPointCount class=form-table name=minCheckPointCount></td></tr><tr><td>Max CheckPoint Count</td><td><input type=number min=0 ng-model=maxCheckPointCount class=form-table name=maxCheckPointCount></td></tr><tr><td>Max Subscriber Count</td><td><input type=number min=0 ng-model=maxSubscriberCount class=form-table name=maxSubscriberCount></td></tr><tr><td>Named Consumer Strategy</td><td><select ng-model=namedConsumerStrategy class=form-table ng-options="obj.value as obj.name for obj in namedConsumerStrategies"></select></td></tr></tbody></table><ul class=page-nav><li class=page-nav__item><button type=submit ng-disabled=newSubscription.$invalid>Create</button></li></ul></form>')}])}(),function(t){try{t=e.module("es-ui.competing.templates")}catch(n){t=e.module("es-ui.competing.templates",[])}t.run(["$templateCache",function(e){e.put("subscriptions.tpl.html","<div ui-view></div>")}])}()})),define("modules/competing/_index",["angular","uiRouter","./controllers/_index","./services/_index","./directives/_index","./templates/templates"],(function(e){"use strict";return e.module("es-ui.competing",["ui.router","es-ui.competing.templates","es-ui.competing.controllers","es-ui.competing.services","es-ui.competing.directives"])})),define("modules/competing/module",["./_index"],(function(e){"use strict";return e.config(["$stateProvider",function(e){e.state("subscriptions",{parent:"app",url:"subscriptions",templateUrl:"subscriptions.tpl.html",abstract:!0,data:{title:"Competing Consumers"}}).state("subscriptions.list",{url:"",templateUrl:"subscriptions.list.tpl.html",controller:"SubscriptionsListCtrl",data:{title:"Subscriptions"}}).state("subscriptions.new",{url:"/new",templateUrl:"subscriptions.new.tpl.html",controller:"SubscriptionsNewCtrl",data:{title:"New Subscription"}}).state("subscriptions.item",{url:"/{streamId}/{groupName}",templateUrl:"subscriptions.item.tpl.html",abstract:!0,controller:["$scope","$stateParams",function(e,t){e.streamId=t.streamId,e.groupName=t.groupName,e.showHeader=!0}],data:{title:"Subscriptions"}}).state("subscriptions.item.detail",{url:"",templateUrl:"subscriptions.item.detail.tpl.html",controller:"SubscriptionsDetailCtrl",data:{title:"Subscription Detail"}}).state("subscriptions.item.edit",{url:"/edit",templateUrl:"subscriptions.item.edit.tpl.html",controller:"SubscriptionsEditCtrl",data:{title:"Edit Subscription"}}).state("subscriptions.item.delete",{url:"/delete",templateUrl:"subscriptions.item.delete.tpl.html",controller:"SubscriptionsDeleteCtrl",data:{title:"Delete Subscription"}}).state("subscriptions.item.viewparkedmessages",{url:"/viewparkedmessages/",templateUrl:"subscriptions.item.viewparkedmessages.tpl.html",controller:"SubscriptionsViewParkedMessagesCtrl",data:{title:"View Parked Messages Subscription"}})}])})),
-/**
- * @license AngularJS v1.3.20
- * (c) 2010-2014 Google, Inc. http://angularjs.org
- * License: MIT
- */
-function(e,t,n){"use strict";t.module("ngCookies",["ng"]).factory("$cookies",["$rootScope","$browser",function(e,n){var i,r={},s={},o=!1,a=t.copy,l=t.isUndefined;return n.addPollFn((function(){var t=n.cookies();i!=t&&(i=t,a(t,s),a(t,r),o&&e.$apply())}))(),o=!0,e.$watch((function(){var e,i,o,a;for(e in s)l(r[e])&&(n.cookies(e,undefined),delete s[e]);for(e in r)i=r[e],t.isString(i)||(i=""+i,r[e]=i),i!==s[e]&&(n.cookies(e,i),s[e]=i,a=!0);if(a)for(e in o=n.cookies(),r)r[e]!==o[e]&&(l(o[e])?(delete r[e],delete s[e]):r[e]=s[e]=o[e])})),r}]).factory("$cookieStore",["$cookies",function(e){return{get:function(n){var i=e[n];return i?t.fromJson(i):i},put:function(n,i){e[n]=t.toJson(i)},remove:function(t){delete e[t]}}}])}(window,window.angular),define("ngCookies",["angular"],function(e){return function(){return e.ngCookies}}(this)),define("services/_module",["angular","ngCookies"],(function(e){"use strict";return e.module("es-ui.services",["ngCookies"])})),define("services/Uri",["./_module"],(function(e){"use strict";return e.factory("uri",(function(){var e;return{parse:function(t){return e||(e=document.createElement("a")),e.href=t,{hash:e.hash,host:e.host,hostname:e.hostname,href:t,pathname:e.pathname,port:e.port,protocol:e.protocol,search:e.search,file:e.pathname.split("/").pop(),params:(n=e.search,i={},r=new RegExp("([^?=&]+)(=([^&]*))?","g"),n.replace(r,(function(e,t,n,r){i[t]=r})),i)};var n,i,r},getQuery:function(e){var t,n=[];for(t in e)n.push(t+"="+encodeURIComponent(e[t]));return n.join("&")}}}))})),define("services/Base64",["./_module"],(function(e){"use strict";return e.factory("Base64",["MessageService",function(e){var t=new TextEncoder("utf-8"),n=new TextDecoder("utf-8");return{encode:function(e){var n=t.encode(e),i=String.fromCodePoint(...n);return btoa(i)},decode:function(t){/[^A-Za-z0-9\+\/\=]/g.exec(t)&&e.failure("There were invalid base64 characters in the input text.\nValid base64 characters are A-Z, a-z, 0-9, '+', '/',and '='\nExpect errors in decoding.");var i=atob(t),r=Uint8Array.from(i,(e=>e.codePointAt(0)));return n.decode(r)}}}])})),define("services/Poller",["./_module"],(function(e){"use strict";return e.factory("poller",["$timeout","$q",function(e,t){var n=[];function i(e){this.deferred=t.defer(),this.opts=e,this.canceller=null,this.isPaused=!1}function r(){for(var e=0,t=n.length;e<t;e++)n[e].stop()}return i.prototype={resumePaused:function(){this.isPaused=!1,this.resume()},resume:function(){var n=this;n.isPaused||(n.canceller=t.defer(),function t(){var i=n.opts.params.slice();n.canceller&&(i.push({timeout:n.canceller.promise}),n.opts.action.apply(null,i).then((function(i){n.intervalId=e(t,n.opts.interval),n.deferred.notify(i.data)}),(function(e){n.deferred.reject(e)})))}())},start:function(){return this.resume(),this.promise=this.deferred.promise,this},pause:function(){this.canceller&&this.canceller.resolve("pausing"),e.cancel(this.intervalId),this.isPaused=!0},stop:function(){e.cancel(this.intervalId),this.canceller&&(this.canceller.resolve("pausing"),this.canceller=null)},update:function(e){e.interval=e.interval||this.opts.interval,e.params=e.params||this.opts.params,e.action=this.opts.action,this.opts=e}},{create:function(e){var t=new i(e);return n.push(t),t},stopAll:r,pauseAll:function(){for(var e=0,t=n.length;e<t;e++)n[e].pause()},resumePaused:function(){for(var e=0,t=n.length;e<t;e++)n[e].resumePaused()},clear:function(){r(),n=[]},resume:function(){for(var e=0,t=n.length;e<t;e++)n[e].resume()}}}])})),define("services/UrlBuilder",["./_module","angular"],(function(e,t){"use strict";return e.factory("UrlBuilder",["urls","$rootScope","SprintfService",function(e,n,i){return{simpleBuild:function(e,t){return i.format(e,decodeURIComponent(t))},buildWithoutBaseUrl:function(e){var n=[].slice.call(arguments,1),r=[];return r.push(e),t.forEach(n,(function(e){this.push(encodeURIComponent(e))}),r),e=i.format.apply(null,r)},build:function(e){var r=[].slice.call(arguments,1),s=[];return s.push(e),t.forEach(r,(function(e){this.push(encodeURIComponent(e))}),s),e=i.format.apply(null,s),n.baseUrl+e}}}])})),function(e){var t={not_string:/[^s]/,number:/[diefg]/,json:/[j]/,not_json:/[^j]/,text:/^[^\x25]+/,modulo:/^\x25{2}/,placeholder:/^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-gijosuxX])/,key:/^([a-z_][a-z_\d]*)/i,key_access:/^\.([a-z_][a-z_\d]*)/i,index_access:/^\[(\d+)\]/,sign:/^[\+\-]/};function n(){var e=arguments[0],t=n.cache;return t[e]&&t.hasOwnProperty(e)||(t[e]=n.parse(e)),n.format.call(null,t[e],arguments)}n.format=function(e,i){var s,o,a,l,c,u,h,d,f=1,p=e.length,g="",m=[],v=!0,$="";for(o=0;o<p;o++)if("string"===(g=r(e[o])))m[m.length]=e[o];else if("array"===g){if((l=e[o])[2])for(s=i[f],a=0;a<l[2].length;a++){if(!s.hasOwnProperty(l[2][a]))throw new Error(n("[sprintf] property '%s' does not exist",l[2][a]));s=s[l[2][a]]}else s=l[1]?i[l[1]]:i[f++];if("function"==r(s)&&(s=s()),t.not_string.test(l[8])&&t.not_json.test(l[8])&&"number"!=r(s)&&isNaN(s))throw new TypeError(n("[sprintf] expecting number but found %s",r(s)));switch(t.number.test(l[8])&&(v=s>=0),l[8]){case"b":s=s.toString(2);break;case"c":s=String.fromCharCode(s);break;case"d":case"i":s=parseInt(s,10);break;case"j":s=JSON.stringify(s,null,l[6]?parseInt(l[6]):0);break;case"e":s=l[7]?s.toExponential(l[7]):s.toExponential();break;case"f":s=l[7]?parseFloat(s).toFixed(l[7]):parseFloat(s);break;case"g":s=l[7]?parseFloat(s).toPrecision(l[7]):parseFloat(s);break;case"o":s=s.toString(8);break;case"s":s=(s=String(s))&&l[7]?s.substring(0,l[7]):s;break;case"u":s>>>=0;break;case"x":s=s.toString(16);break;case"X":s=s.toString(16).toUpperCase()}t.json.test(l[8])?m[m.length]=s:(!t.number.test(l[8])||v&&!l[3]?$="":($=v?"+":"-",s=s.toString().replace(t.sign,"")),u=l[4]?"0"===l[4]?"0":l[4].charAt(1):" ",h=l[6]-($+s).length,c=l[6]&&h>0?(d=u,Array(h+1).join(d)):"",m[m.length]=l[5]?$+s+c:"0"===u?$+c+s:c+$+s)}return m.join("")},n.cache={},n.parse=function(e){for(var n=e,i=[],r=[],s=0;n;){if(null!==(i=t.text.exec(n)))r[r.length]=i[0];else if(null!==(i=t.modulo.exec(n)))r[r.length]="%";else{if(null===(i=t.placeholder.exec(n)))throw new SyntaxError("[sprintf] unexpected placeholder");if(i[2]){s|=1;var o=[],a=i[2],l=[];if(null===(l=t.key.exec(a)))throw new SyntaxError("[sprintf] failed to parse named argument key");for(o[o.length]=l[1];""!==(a=a.substring(l[0].length));)if(null!==(l=t.key_access.exec(a)))o[o.length]=l[1];else{if(null===(l=t.index_access.exec(a)))throw new SyntaxError("[sprintf] failed to parse named argument key");o[o.length]=l[1]}i[2]=o}else s|=2;if(3===s)throw new Error("[sprintf] mixing positional and named placeholders is not (yet) supported");r[r.length]=i}n=n.substring(i[0].length)}return r};var i=function(e,t,i){return(i=(t||[]).slice(0)).splice(0,0,e),n.apply(null,i)};function r(e){return Object.prototype.toString.call(e).slice(8,-1).toLowerCase()}"undefined"!=typeof exports?(exports.sprintf=n,exports.vsprintf=i):(e.sprintf=n,e.vsprintf=i,"function"==typeof define&&define.amd&&define("sprintf",[],(function(){return{sprintf:n,vsprintf:i}})))}("undefined"==typeof window?this:window),define("services/SprintfService",["./_module","sprintf"],(function(e,t){"use strict";return e.factory("SprintfService",[function(){return{format:function(){var e=[].slice.call(arguments);return t.sprintf.apply(null,e)}}}])})),define("services/AuthService",["./_module"],(function(e){"use strict";return e.factory("AuthService",["Base64","$q","$cookies","$cookieStore","$http","$rootScope","$location","urls","UrlBuilder",function(e,t,n,i,r,s,o,a,l){function c(){var e=i.get("es-creds");return e?e.credentials:null}var u=c();return u&&(u=u.credentials),{setCredentials:function(t,n){var s=e.encode(t+":"+n);r.defaults.headers.common.Authorization="Basic "+s,function(t,n){var r=i.get("es-creds");r||(r={}),r={credentials:e.encode(t+":"+n)},i.put("es-creds",r)}(t,n)},loadCredentials:function(){var e=c();e&&(r.defaults.headers.common.Authorization="Basic "+e)},clearCredentials:function(){document.execCommand("ClearAuthenticationCache"),r.defaults.headers.common.Authorization=void 0,i.remove("es-creds")},existsAndValid:function(){var i,o=t.defer();if("insecure"===s.authentication.type)o.resolve();else if("oauth"===s.authentication.type){(i=n.oauth_id_token)&&(document.cookie="oauth_id_token=;path=/;max-age=-1",r.defaults.headers.common.Authorization="Bearer "+i);var a=r.defaults.headers.common.Authorization;void 0!==a&&a.startsWith("Bearer ")?o.resolve():o.reject("Not authenticated")}else{var l=c();if(l){var u=e.decode(l).split(":");this.validate(u[0],u[1]).success((function(){o.resolve()})).error((function(){o.reject("Wrong credentials")}))}else o.reject("Data does not exists")}return o.promise},resetCredentials:function(n,i){var r=t.defer(),s=c();return e.decode(s).split(":")[0]===n?this.validate(n,i).success((function(){r.resolve()})).error((function(){r.reject("Wrong credentials")})):r.resolve(),r.promise},validate:function(t,n){var i=e.encode(t+":"+n);return r.defaults.headers.common.Authorization="Basic "+(i||""),r.get(s.baseUrl+a.system.info,{headers:{Accept:"*/*",Authorization:"Basic "+i}})}}}])})),define("services/InfoService",["./_module"],(function(e){"use strict";return e.factory("InfoService",["$http","$rootScope","urls","UrlBuilder",function(e,t,n,i){return{getInfo:function(){var t=i.build(n.system.info);return e.get(t)},getOptions:function(){var t=i.build(n.system.options);return e.get(t)}}}])})),define("services/MessageService",["./_module"],(function(e){"use strict";return e.factory("MessageService",["toastr",function(e){function t(e,t){return{closeButton:!!e||"warning"===t,positionClass:e?"toast-container-modal toast-bottom-full-width":"toast-bottom-full-width",timeOut:e?0:"warning"===t?5e3:"info"===t||"success"===t?2e3:0}}function n(e,t){return(e=e||t)+" (tap notification to dismiss)"}return{success:function(i,r){e.success(i,n(r,"Success"),t(!1,"success"))},info:function(i,r){e.info(i,n(r,"Info"),t(!1,"info"))},warn:function(i,r){e.warning(i,n(r,"Warning"),t(!1,"warning"))},failure:function(i,r){e.error(i,n(r,"Failure"),t(!0,"failure"))},confirm:function(e){return confirm(e)}}}])})),define("services/ScavengeNotificationService",["./_module"],(function(e){"use strict";return e.factory("ScavengeNotificationService",["$http","$timeout","$rootScope","AdminService","MessageService","constants",function(e,t,n,i,r,s){var o="";return{start:function e(){i.lastScavengeStatus().then((function(e){e.data.entries.length>0&&(o=e.data.entries[0].eventId);var n=function(){i.lastScavengeStatus().then((function(e){!function(e){if(e.data&&e.data.entries.length>0){var t=e.data.entries[0];if(t.eventId!==o){o=t.eventId;var n=JSON.parse(t.data),i="Scavenge "+n.scavengeId;"$scavengeStarted"===t.eventType?(i+=" initiated",r.success(i)):n.error?(i+=" failed",r.failure(i)):"Stopped"===n.result?(i+=" stopped",r.success(i)):(i+=" completed",r.success(i))}}}(e),t((function(){n()}),s.scavengeStatus.pollInterval)}),(function(e){401!==e.statusCode&&r.failure("Failed to retrieve last scavenge status: "+e.message)}))};n()}),(function(n){401!==n.statusCode&&(404===n.statusCode?t((function(){e()}),s.scavengeStatus.pollInterval):r.failure("Failed to retrieve last scavenge status: "+n.message))}))}}}])})),define("services/_index",["./Uri","./Base64","./Poller","./UrlBuilder","./SprintfService","./AuthService","./InfoService","./MessageService","./ScavengeNotificationService"],(function(){})),define("directives/_module",["angular"],(function(e){"use strict";return e.module("es-ui.directives",[])})),define("directives/EsValidateEquals",["./_module"],(function(e){"use strict";return e.directive("esValidateEquals",[function(){return{restrict:"A",require:"ngModel",link:function(e,t,n,i){function r(e,t){return e===t?(i.$setValidity("equal",!0),e):void i.$setValidity("equal",!1)}e.$watch(n.esValidateEquals,(function(e){r(i.$viewValue,e)})),i.$parsers.unshift((function(t){return r(t,e.$eval(n.esValidateEquals))})),i.$formatters.unshift((function(t){return r(t,e.$eval(n.esValidateEquals))}))}}}])})),define("directives/EsHeight",["./_module"],(function(e){"use strict";return e.directive("esHeight",[function(){return{restrict:"A",link:function(e,t){t.parent().addClass("login-height")}}}])})),define("directives/EsAutoFocus",["./_module"],(function(e){"use strict";return e.directive("esAutoFocus",["$timeout",function(e){return{restrict:"AC",link:function(t,n){e((function(){n[0].focus()}),0)}}}])})),define("directives/_index",["./EsValidateEquals","./EsHeight","./EsAutoFocus"],(function(){})),define("templates/templates",["angular"],(function(e){"use strict";!function(t){try{t=e.module("es-ui.templates")}catch(n){t=e.module("es-ui.templates",[])}t.run(["$templateCache",function(e){e.put("es-toggable-row.tpl.html",'<td ng-if=esQueue.show>{{ esQueue.queueName }} <a class=table-collapsetoggle>&minus;</a></td><td ng-if=!esQueue.show>{{ esQueue.queueName }} <a class=table-collapsetoggle>&plus;</a></td><td>{{ esQueue.lengthCurrentTryPeak }}</td><td>{{ esQueue.lengthLifetimePeak }}</td><td>{{ esQueue.avgItemsPerSecond }}</td><td>{{ esQueue.avgProcessingTime.toFixed(3)}}</td><td>{{ esQueue.busy }}</td><td>{{ esQueue.totalItemsProcessed }}</td><td style="text-align: right">n/a</td>')}])}(),function(t){try{t=e.module("es-ui.templates")}catch(n){t=e.module("es-ui.templates",[])}t.run(["$templateCache",function(e){e.put("index.tpl.html","<header class=site-header><h1 class=site-title><a ui-sref=dashboard.list><img src=images/logo.svg height=29 width=119 alt=\"Event Store\"></a></h1><ul class=site-nav ng-hide=hideMenuOptions><li class=site-nav__item ng-class=\"{'site-nav__item--active': $state.includes('dashboard') }\"><a ui-sref=dashboard.list>Dashboard</a></li><li ng-if=!singleNode class=site-nav__item ng-class=\"{'site-nav__item--active': $state.includes('clusterstatus') }\"><a ui-sref=clusterstatus.list>Cluster Status</a></li><li class=site-nav__item ng-class=\"{'site-nav__item--active': $state.includes('streams') }\" title=\"{{!streamsBrowserEnabled ? atomDisabledMessage : ''}}\"><a ng-class=\"{'disabled':!streamsBrowserEnabled}\" ui-sref=streams.list>Stream Browser</a></li><li class=site-nav__item ng-class=\"{'site-nav__item--active': $state.includes('projections') }\" title=\"{{!projectionsEnabled ? projectionsNotRunningMessage : ''}}\"><a ng-class=\"{'disabled': !projectionsEnabled}\" ui-sref=projections.list>Projections</a></li><li class=site-nav__item ng-class=\"{'site-nav__item--active': $state.includes('query') }\" title=\"{{!projectionsEnabled ? projectionsNotRunningMessage : ''}}\"><a ng-class=\"{'disabled':!projectionsEnabled}\" ui-sref=query>Query</a></li><li class=site-nav__item ng-class=\"{'site-nav__item--active': $state.includes('competing') }\"><a ui-sref=subscriptions.list>Persistent Subscriptions</a></li><li class=site-nav__item ng-class=\"{'site-nav__item--active': $state.includes('admin') }\"><a ui-sref=admin>Admin</a></li><li class=site-nav__item ng-class=\"{'site-nav__item--active': $state.includes('users') }\"><a ng-class=\"{'disabled': !userManagementEnabled}\" ui-sref=users.list>Users</a></li><li class=site-nav__item ng-class=\"{'site-nav__item--active': $state.includes('signout') }\"><a ng-class=\"{'disabled': !logoutEnabled}\" ui-sref=signout>{{ logoutButtonText }}</a></li></ul></header><header class=navigator-banner-header><a href=https://developers.eventstore.com/navigator/ >The Admin UI is being replaced by <b>Event Store Navigator</b></a></header><main class=site-main><div ui-view></div></main><footer class=site-footer><p>Event Store {{ esVersion }} &middot; <a href=https://eventstore.com/docs/ target=_blank>Documentation</a> &middot; <a href=https://eventstore.com/support/ target=_blank>Support</a></p></footer>")}])}()})),define("templates/_index",["./templates"],(function(){})),define("es-ui",["angular","uiRouter","uiUtils","uiAce","ngToastr","angular-clipboard","./modules/projections/module","./modules/admin/module","./modules/dashboard/module","./modules/clusterstatus/module","./modules/streams/module","./modules/security/module","./modules/users/module","./modules/competing/module","./services/_index","./directives/_index","./templates/_index"],(function(e){"use strict";return e.module("es-ui",["es-ui.projections","es-ui.admin","es-ui.dashboard","es-ui.clusterstatus","es-ui.streams","es-ui.users","es-ui.competing","es-ui.security","es-ui.directives","es-ui.services","es-ui.templates","ui.router","ui.utils","ui.ace","toastr","angular-clipboard"])})),define("run",["es-ui"],(function(e){"use strict";return e.config(["toastrConfig",function(e){angular.extend(e,{timeOut:0,preventDuplicates:!0})}]),e.run(["$rootScope","$location","$state","$stateParams","AuthService","InfoService","MessageService","$http",function(e,t,n,i,r,s,o,a){e.baseUrl=t.protocol()+"://"+t.host()+":"+t.port(),e.projectionsEnabled=!1,e.userManagementEnabled=!1,e.streamsBrowserEnabled=!1,e.initialized=!1,e.logoutEnabled=!0,e.logoutButtonText="Log Out",e.logoutText="You have been logged out.",e.singleNode=!0,r.loadCredentials(),s.getInfo().then((function(i){var l=i.data;e.esVersion=l.esVersion||"0.0.0.0",e.esVersion="0.0.0.0"===e.esVersion?"development build":e.esVersion,e.projectionsEnabled=!0===l.features.projections,e.userManagementEnabled=!0===l.features.userManagement,e.streamsBrowserEnabled=!0===l.features.atomPub,e.authentication=l.authentication,e.logoutEnabled="insecure"!==l.authentication.type,e.logoutButtonText="oauth"===l.authentication.type?"Disconnect":e.logoutButtonText,e.logoutText="oauth"===l.authentication.type?"You have been disconnected.":e.logoutText,e.previousUrl=t.$$path,e.initialized=!0,e.$broadcast("initialized"),r.existsAndValid().then((function(){s.getOptions().then((function(t){var n=t.data;for(var i in n)"ClusterSize"===n[i].name&&n[i].value>1&&(e.singleNode=!1)}),(function(e){401!==e.statusCode&&o.failure("Failed to load options: "+e.message)})),function(){if(e.previousUrl&&"/"!==e.previousUrl){var i=e.previousUrl;e.previousUrl=null,t.path(i)}else n.go("dashboard.list")}()}),(function(){if("oauth"===e.authentication.type){var t=e.authentication.properties.authorization_endpoint,i=encodeURIComponent(e.authentication.properties.client_id),r=encodeURIComponent(e.authentication.properties.response_type),s=encodeURIComponent(e.authentication.properties.scope),l=e.baseUrl+e.authentication.properties.code_challenge_uri;a.get(l).then((function(n){var o=n.data.code_challenge,a=n.data.code_challenge_method,l={code_challenge_correlation_id:n.data.code_challenge_correlation_id};l=btoa(JSON.stringify(l));var c=encodeURIComponent(e.baseUrl+e.authentication.properties.redirect_uri),u=t+"?response_type="+r+"&client_id="+i+"&redirect_uri="+c+"&scope="+s+"&code_challenge="+o+"&code_challenge_method="+a+"&state="+l;window.location.href=u}),(function(){o.failure("Could not fetch OAuth code challenge")}))}else n.go("signin")}))}),(function(e){o.failure("Failed to load /info endpoint: "+e.message),r.clearCredentials()})),e.$state=n,e.$stateParams=i}])})),define("config/constants",["es-ui"],(function(e){"use strict";return e.constant("constants",{projectionStatus:{running:"Running",stopped:"Stopped"},scavengeStatus:{pollInterval:2e3},tcpStats:{pollInterval:1e3},clusterStatus:{replicaPollInterval:1e3}})})),define("config/urls",["es-ui"],(function(e){"use strict";return e.value("baseUrl",""),e.constant("urls",{base:"https://127.0.0.1:2113",stats:"/stats",tcpStats:"/stats/tcp",replicationStats:"/stats/replication",admin:{shutdown:"/admin/shutdown",scavenge:"/admin/scavenge",login:"/admin/login"},gossip:"/gossip",users:{list:"/users/",get:"/users/%s",current:"/users/$current",create:"/users/",update:"/users/%s",remove:"/users/%s",disable:"/users/%s/command/disable",enable:"/users/%s/command/enable",resetPassword:"/users/%s/command/reset-password"},query:{create:"/projections/transient?",update:"%s/query?emit=no",state:"%s/state",commands:{enable:"%s/command/enable",disable:"%s/command/disable",reset:"%s/command/reset"}},projections:{any:"/projections/any",allNonTransient:"/projections/all-non-transient",disable:"/command/disable",enable:"/command/enable",create:"/projections/%s?",createStandard:"/projections/continuous?emit=yes&checkpoints=yes&enabled=yes&name=%s&type=%s",state:"%s/state",result:"%s/result",statistics:"%s/statistics",remove:"%s?",query:"%s/query?config=yes",updateQuery:"%s/query?emit=",updatePlainQuery:"%s/query",queryWithoutConfig:"%s/query?config=no",readEvents:"/projections/read-events",commands:{reset:"%s/command/reset",enable:"%s/command/enable",disable:"%s/command/disable"},configuration:"%s/config"},streams:{base:"%s",recent:"/streams/$all/head/100?embed=rich",created:"/streams/$streams/head/50?embed=rich",events:"/streams/%s",eventDetails:"/streams/%s/%s?embed=tryharder",tryharder:"?embed=tryharder",metadata:"/streams/%s%s/head",updateAcl:"/streams/$$%s",scavenges:"/streams/$scavenges"},system:{subsystems:"/sys/subsystems",info:"/info",options:"/info/options"},competing:{subscriptions:"/subscriptions",subscriptionDetails:"/subscriptions/%s/%s/info",create:"/subscriptions/%s/%s",update:"/subscriptions/%s/%s",delete:"/subscriptions/%s/%s",replayParked:"/subscriptions/%s/%s/replayParked",parkedQueue:"$persistentsubscription-%s::%s-parked",viewParkedMessagesBackward:"/subscriptions/viewparkedmessages/%s/%s/%s/backward/%s?embed=tryharder",viewParkedMessagesForward:"/subscriptions/viewparkedmessages/%s/%s/%s/forward/%s?embed=tryharder"}})})),define("config/values",["es-ui"],(function(e){"use strict";return e.value("baseUrl",{})})),define("config/http",["es-ui"],(function(e){"use strict";return e.config(["$httpProvider",function(e){e.defaults.headers.common.Accept="application/json",e.defaults.headers.get={"ES-LongPoll":5},e.interceptors.push(["$q",function(e){return{responseError:function(t){var n=e.defer(),i={400:"Bad Request",401:"Unauthorized",403:"Forbidden",404:"Not Found",405:"Method Not Allowed",406:"Not Acceptable",409:"Conflict",500:"Internal Server Error",502:"Bad Gateway",503:"Service Unavailable"},r={message:"Unknown error",statusCode:t.status,errorData:t.data},s=t.headers()["content-type"];return s&&-1!==s.indexOf("text/plain")&&""!==t.data?r.message=t.data:""!==t.statusText?r.message=t.statusText:t.status in i&&(r.message=i[t.status]),n.reject(r),n.promise}}}])}])})),define("config/qDecorator",["es-ui"],(function(e){"use strict";return e.config(["$stateProvider","$urlRouterProvider","$httpProvider","$provide",function(e,t,n,i){i.decorator("$q",["$delegate",function(e){var t=e;return t.allSettled=t.allSettled||function(e){var n=t.defer();if(!angular.isArray(e))throw"allSettled can only handle an array of promises (for now)";var i=[],r=[],s=!1;angular.forEach(e,(function(e,t){i[t]=!1}));var o=function(e,t,n,i){var r=!0;angular.forEach(e,(function(e){e||(r=!1)})),r&&(i?n.reject(t):n.resolve(t))};return angular.forEach(e,(function(e,a){t.when(e).then((function(e){i[a]=!0,r[a]=e,o(i,r,n,s)}),(function(e){i[a]=!0,r[a]=e,o(i,r,n,s=!0)}))})),n.promise},t}])}])})),define("config/routes",["es-ui"],(function(e){"use strict";return e.config(["$stateProvider","$urlRouterProvider",function(e,t){t.otherwise("/"),e.state("app",{url:"/",templateUrl:"index.tpl.html",abstract:!0,controller:["$scope",function(e){e.notAdminMessage="You must be an admin to view this item",e.notAdminOrOpsMessage="You must be in the $admins or $ops group to view this item",e.projectionsNotRunningMessage="Projections are not running on Event Store",e.atomDisabledMessage="AtomPub over HTTP has been disabled on the server"}]})}])})),
-/**
- * @license RequireJS domReady 2.0.1 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
- * Available via the MIT or new BSD license.
- * see: http://github.com/requirejs/domReady for details
- */
-define("domReady",[],(function(){"use strict";var e,t,n,i="undefined"!=typeof window&&window.document,r=!i,s=i?document:null,o=[];function a(){var e=o;r&&e.length&&(o=[],function(e){var t;for(t=0;t<e.length;t+=1)e[t](s)}(e))}function l(){r||(r=!0,n&&clearInterval(n),a())}if(i){if(document.addEventListener)document.addEventListener("DOMContentLoaded",l,!1),window.addEventListener("load",l,!1);else if(window.attachEvent){window.attachEvent("onload",l),t=document.createElement("div");try{e=null===window.frameElement}catch(e){}t.doScroll&&e&&window.external&&(n=setInterval((function(){try{t.doScroll(),l()}catch(e){}}),30))}"complete"===document.readyState&&l()}function c(e){return r?e(s):o.push(e),c}return c.version="2.0.1",c.load=function(e,t,n,i){i.isBuild?n(null):c(n)},c})),define("bootstrap",["require","angular","es-ui","run","./config/constants","./config/urls","./config/values","./config/http","./config/qDecorator","./config/routes"],(function(e,t){"use strict";e(["domReady!"],(function(e){t.bootstrap(e,["es-ui"])}))})),define("es-dist-main",["bootstrap","ace"],(function(e,t){var n=ace.require("ace/config"),i="js/ace";n.set("packaged",!0),n.set("workerPath",location.href.replace(location.hash,"").replace("index.html","")+i),n.set("modePath",i),n.set("themePath",i),n.set("basePath",i)})),require(["es-dist-main"]);
\ No newline at end of file
diff --git a/src/EventStore.ClusterNode/ClusterVNodeHostedService.cs b/src/EventStore.ClusterNode/ClusterVNodeHostedService.cs
deleted file mode 100644
index b004d4051a3..00000000000
--- a/src/EventStore.ClusterNode/ClusterVNodeHostedService.cs
+++ /dev/null
@@ -1,360 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.Composition;
-using System.ComponentModel.Composition.Hosting;
-using System.IO;
-using System.Linq;
-using System.Runtime;
-using System.Threading;
-using EventStore.Common.Exceptions;
-using EventStore.Common.Options;
-using EventStore.Common.Utils;
-using EventStore.Core;
-using EventStore.Core.Authentication;
-using EventStore.Core.Bus;
-using EventStore.Core.Services.Transport.Http.Controllers;
-using System.Threading.Tasks;
-using EventStore.Core.Authentication.InternalAuthentication;
-using EventStore.Core.Authentication.PassthroughAuthentication;
-using EventStore.Core.Authorization;
-using EventStore.Core.Certificates;
-using EventStore.Core.Hashing;
-using EventStore.Core.PluginModel;
-using EventStore.Core.Services.PersistentSubscription.ConsumerStrategy;
-using EventStore.PluginHosting;
-using EventStore.Plugins;
-using EventStore.Plugins.Authentication;
-using EventStore.Plugins.Authorization;
-using EventStore.Plugins.MD5;
-using EventStore.Plugins.Subsystems;
-using EventStore.Projections.Core;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Configuration;
-using Serilog;
-using EventStore.Core.LogAbstraction;
-
-namespace EventStore.ClusterNode {
-	public class ClusterVNodeHostedService : IHostedService, IDisposable {
-		private static readonly ILogger Log = Serilog.Log.ForContext<ClusterVNodeHostedService>();
-
-		private readonly ClusterVNodeOptions _options;
-		private readonly ExclusiveDbLock _dbLock;
-		private readonly ClusterNodeMutex _clusterNodeMutex;
-
-		public ClusterVNode Node { get; }
-
-		public ClusterVNodeHostedService(
-			ClusterVNodeOptions options,
-			CertificateProvider certificateProvider,
-			IConfiguration configuration) {
-
-			if (options == null) throw new ArgumentNullException(nameof(options));
-
-			// two plugin mechanisms; pluginLoader is the new one
-			var pluginLoader = new PluginLoader(new DirectoryInfo(Locations.PluginsDirectory));
-			var plugInContainer = FindPlugins();
-
-			options = LoadSubsystemsPlugins(pluginLoader, options);
-
-			try {
-				options = options.WithPlugableComponent(ConfigureMD5());
-			} catch {
-				throw new
-					InvalidConfigurationException(
-						"Failed to configure MD5. If FIPS mode is enabled, please use the FIPS commercial plugin or disable FIPS mode.");
-			}
-
-			var projectionMode = options.DevMode.Dev && options.Projection.RunProjections == ProjectionType.None
-				? ProjectionType.System
-				: options.Projection.RunProjections;
-			var startStandardProjections = options.Projection.StartStandardProjections || options.DevMode.Dev;
-			_options = projectionMode >= ProjectionType.System
-				? options.WithPlugableComponent(new ProjectionsSubsystem(
-					new ProjectionSubsystemOptions(
-						options.Projection.ProjectionThreads,
-						projectionMode,
-						startStandardProjections,
-						TimeSpan.FromMinutes(options.Projection.ProjectionsQueryExpiry),
-						options.Projection.FaultOutOfOrderProjections,
-						options.Projection.ProjectionCompilationTimeout,
-						options.Projection.ProjectionExecutionTimeout)))
-				: options;
-
-			if (!_options.Database.MemDb) {
-				var absolutePath = Path.GetFullPath(_options.Database.Db);
-				if (RuntimeInformation.IsWindows)
-					absolutePath = absolutePath.ToLower();
-
-				_dbLock = new ExclusiveDbLock(absolutePath);
-				if (!_dbLock.Acquire())
-					throw new InvalidConfigurationException($"Couldn't acquire exclusive lock on DB at '{_options.Database.Db}'.");
-			}
-
-			_clusterNodeMutex = new ClusterNodeMutex();
-			if (!_clusterNodeMutex.Acquire())
-				throw new InvalidConfigurationException($"Couldn't acquire exclusive Cluster Node mutex '{_clusterNodeMutex.MutexName}'.");
-
-			var authorizationConfig = string.IsNullOrEmpty(_options.Auth.AuthorizationConfig)
-				? _options.Application.Config
-				: _options.Auth.AuthorizationConfig;
-
-			var authenticationConfig = string.IsNullOrEmpty(_options.Auth.AuthenticationConfig)
-				? _options.Application.Config
-				: _options.Auth.AuthenticationConfig;
-
-			(_options, var policySelectorsFactory) = ConfigurePolicySelectorsFactory();
-			if (_options.Database.DbLogFormat == DbLogFormat.V2) {
-				var logFormatFactory = new LogV2FormatAbstractorFactory();
-            	Node = ClusterVNode.Create(_options, logFormatFactory, GetAuthenticationProviderFactory(),
-	                GetAuthorizationProviderFactory(policySelectorsFactory),
-	                GetPersistentSubscriptionConsumerStrategyFactories(), certificateProvider,
-					configuration);
-			} else if (_options.Database.DbLogFormat == DbLogFormat.ExperimentalV3) {
-				var logFormatFactory = new LogV3FormatAbstractorFactory();
-				Node = ClusterVNode.Create(_options, logFormatFactory, GetAuthenticationProviderFactory(),
-					GetAuthorizationProviderFactory(policySelectorsFactory),
-					GetPersistentSubscriptionConsumerStrategyFactories(), certificateProvider,
-					configuration);
-			} else {
-				throw new ArgumentOutOfRangeException(nameof(_options.Database.DbLogFormat), "Unexpected log format specified.");
-			}
-
-			var enabledNodeSubsystems = projectionMode >= ProjectionType.System
-				? new[] {NodeSubsystems.Projections}
-				: Array.Empty<NodeSubsystems>();
-
-			RegisterWebControllers(enabledNodeSubsystems);
-			return;
-
-			(ClusterVNodeOptions, PolicySelectorsFactory) ConfigurePolicySelectorsFactory() {
-				if (_options.Application.Insecure) {
-					return (_options, new PolicySelectorsFactory());
-				}
-
-				var defaultPolicySelector = new LegacyPolicySelectorFactory(
-					_options.Application.AllowAnonymousEndpointAccess,
-					_options.Application.AllowAnonymousStreamAccess,
-					_options.Application.OverrideAnonymousEndpointAccessForGossip);
-
-				// Temporary: get the policy plugin configuration
-				// TODO: Allow specifying multiple policy selectors
-				var policyPluginType =
-					_options.ConfigurationRoot!.GetValue<string>("EventStore:Plugins:Authorization:PolicyType") ??
-					string.Empty;
-
-				var policyPlugins = pluginLoader.Load<IPolicySelectorFactory>().ToArray();
-				var policySelectors = new Dictionary<string, IPolicySelectorFactory>();
-				foreach (var policyPlugin in policyPlugins)
-				{
-					try {
-						var commandLine = policyPlugin.Name.Replace("Plugin", "").ToLowerInvariant();
-						Log.Information(
-							"Loaded authorization policy plugin: {plugin} version {version} (Command Line: {commandLine})",
-							policyPlugin.Name, policyPlugin.Version, commandLine);
-						policySelectors.Add(commandLine, policyPlugin);
-					} catch (CompositionException ex) {
-						Log.Error(ex, "Error loading authorization policy plugin.");
-					}
-				}
-
-				if (policyPluginType == string.Empty) {
-					Log.Information("Using default authorization policy");
-					return (_options, new PolicySelectorsFactory(defaultPolicySelector));
-				}
-				if (!policySelectors.TryGetValue(policyPluginType, out var selectedPolicy)) {
-					throw new ApplicationInitializationException(
-						$"The authorization policy plugin type {policyPluginType} is not recognised. If this is supposed " +
-						$"to be provided by an authorization policy plugin, confirm the plugin DLL is located in {Locations.PluginsDirectory}." +
-						Environment.NewLine +
-						$"Valid options for authorization policies are: {string.Join(", ", policySelectors.Keys)}.");
-				}
-
-				Log.Information("Using authorization policy plugin: {plugin} version {version}", selectedPolicy.Name,
-					selectedPolicy.Version);
-				// Policies will be applied in order, so the default should always be last
-				var factory = new PolicySelectorsFactory([selectedPolicy, defaultPolicySelector]);
-
-				if (selectedPolicy is IPlugableComponent plugablePolicy) {
-					return (_options.WithPlugableComponent(plugablePolicy), factory);
-				}
-				return (_options, factory);
-			}
-
-			AuthorizationProviderFactory GetAuthorizationProviderFactory(PolicySelectorsFactory policySelectorsFactory) {
-				if (_options.Application.Insecure) {
-					return new AuthorizationProviderFactory(_ => new PassthroughAuthorizationProviderFactory());
-				}
-				var authorizationTypeToPlugin = new Dictionary<string, AuthorizationProviderFactory> {
-					{
-						"internal", new AuthorizationProviderFactory(components =>
-							new InternalAuthorizationProviderFactory(policySelectorsFactory.Create(components))
-						)
-					}
-				};
-
-				foreach (var potentialPlugin in pluginLoader.Load<IAuthorizationPlugin>()) {
-					try {
-						var commandLine = potentialPlugin.CommandLineName.ToLowerInvariant();
-						Log.Information(
-							"Loaded authorization plugin: {plugin} version {version} (Command Line: {commandLine})",
-							potentialPlugin.Name, potentialPlugin.Version, commandLine);
-						authorizationTypeToPlugin.Add(commandLine,
-							new AuthorizationProviderFactory(_ =>
-								potentialPlugin.GetAuthorizationProviderFactory(authorizationConfig)));
-					} catch (CompositionException ex) {
-						Log.Error(ex, "Error loading authentication plugin.");
-					}
-				}
-
-				if (!authorizationTypeToPlugin.TryGetValue(_options.Auth.AuthorizationType.ToLowerInvariant(),
-					out var factory)) {
-					throw new ApplicationInitializationException(
-						$"The authorization type {_options.Auth.AuthorizationType} is not recognised. If this is supposed " +
-						$"to be provided by an authorization plugin, confirm the plugin DLL is located in {Locations.PluginsDirectory}." +
-						Environment.NewLine +
-						$"Valid options for authorization are: {string.Join(", ", authorizationTypeToPlugin.Keys)}.");
-				}
-
-				return factory;
-			}
-
-			static CompositionContainer FindPlugins() {
-				var catalog = new AggregateCatalog();
-
-				catalog.Catalogs.Add(new AssemblyCatalog(typeof(ClusterVNodeHostedService).Assembly));
-
-				if (Directory.Exists(Locations.PluginsDirectory)) {
-					Log.Information("Plugins path: {pluginsDirectory}", Locations.PluginsDirectory);
-
-					Log.Information("Adding: {pluginsDirectory} to the plugin catalog.", Locations.PluginsDirectory);
-					catalog.Catalogs.Add(new DirectoryCatalog(Locations.PluginsDirectory));
-
-					foreach (string dirPath in Directory.GetDirectories(Locations.PluginsDirectory, "*",
-						SearchOption.TopDirectoryOnly)) {
-						Log.Information("Adding: {pluginsDirectory} to the plugin catalog.", dirPath);
-						catalog.Catalogs.Add(new DirectoryCatalog(dirPath));
-					}
-				} else {
-					Log.Information("Cannot find plugins path: {pluginsDirectory}", Locations.PluginsDirectory);
-				}
-
-				return new CompositionContainer(catalog);
-			}
-
-			IPersistentSubscriptionConsumerStrategyFactory[] GetPersistentSubscriptionConsumerStrategyFactories() {
-				var allPlugins = plugInContainer.GetExports<IPersistentSubscriptionConsumerStrategyPlugin>();
-
-				var strategyFactories = new List<IPersistentSubscriptionConsumerStrategyFactory>();
-
-				foreach (var potentialPlugin in allPlugins) {
-					try {
-						var plugin = potentialPlugin.Value;
-						Log.Information("Loaded consumer strategy plugin: {plugin} version {version}.", plugin.Name,
-							plugin.Version);
-						strategyFactories.Add(plugin.GetConsumerStrategyFactory());
-					} catch (CompositionException ex) {
-						Log.Error(ex, "Error loading consumer strategy plugin.");
-					}
-				}
-
-				return strategyFactories.ToArray();
-			}
-
-			AuthenticationProviderFactory GetAuthenticationProviderFactory() {
-				if (_options.Application.Insecure) {
-					return new AuthenticationProviderFactory(_ => new PassthroughAuthenticationProviderFactory());
-				}
-
-				var authenticationTypeToPlugin = new Dictionary<string, AuthenticationProviderFactory> {
-					{
-						"internal", new AuthenticationProviderFactory(components =>
-							new InternalAuthenticationProviderFactory(components, _options.DefaultUser))
-					}
-				};
-
-				foreach (var potentialPlugin in pluginLoader.Load<IAuthenticationPlugin>()) {
-					try {
-						var commandLine = potentialPlugin.CommandLineName.ToLowerInvariant();
-						Log.Information(
-							"Loaded authentication plugin: {plugin} version {version} (Command Line: {commandLine})",
-							potentialPlugin.Name, potentialPlugin.Version, commandLine);
-						authenticationTypeToPlugin.Add(commandLine,
-							new AuthenticationProviderFactory(_ =>
-								potentialPlugin.GetAuthenticationProviderFactory(authenticationConfig)));
-					} catch (CompositionException ex) {
-						Log.Error(ex, "Error loading authentication plugin.");
-					}
-				}
-
-				return authenticationTypeToPlugin.TryGetValue(_options.Auth.AuthenticationType.ToLowerInvariant(),
-					out var factory)
-					? factory
-					: throw new ApplicationInitializationException(
-						$"The authentication type {_options.Auth.AuthenticationType} is not recognised. If this is supposed " +
-						$"to be provided by an authentication plugin, confirm the plugin DLL is located in {Locations.PluginsDirectory}." +
-						Environment.NewLine +
-						$"Valid options for authentication are: {string.Join(", ", authenticationTypeToPlugin.Keys)}.");
-			}
-
-			static ClusterVNodeOptions LoadSubsystemsPlugins(PluginLoader pluginLoader, ClusterVNodeOptions options) {
-				var plugins = pluginLoader.Load<ISubsystemsPlugin>().ToArray();
-				foreach (var plugin in plugins) {
-					Log.Information("Loaded SubsystemsPlugin plugin: {plugin} {version}.",
-						plugin.CommandLineName,
-						plugin.Version);
-					var subsystems = plugin.GetSubsystems();
-					foreach (var subsystem in subsystems) {
-						options = options.WithPlugableComponent(subsystem);
-					}
-				}
-				return options;
-			}
-
-			IPlugableComponent ConfigureMD5() {
-				var md5Provider = GetMD5ProviderFactories().FirstOrDefault()?.Build() ?? new NetMD5Provider();
-				MD5.UseProvider(md5Provider);
-				return md5Provider;
-			}
-
-			IEnumerable<IMD5ProviderFactory> GetMD5ProviderFactories() {
-				var md5ProviderFactories = new List<IMD5ProviderFactory>();
-
-				foreach (var plugin in pluginLoader.Load<IMD5Plugin>()) {
-					try {
-						var commandLine = plugin.CommandLineName.ToLowerInvariant();
-						Log.Information(
-							"Loaded MD5 plugin: {plugin} version {version} (Command Line: {commandLine})",
-							plugin.Name, plugin.Version, commandLine);
-						md5ProviderFactories.Add(plugin.GetMD5ProviderFactory());
-					} catch (CompositionException ex) {
-						Log.Error(ex, "Error loading MD5 plugin: {plugin}.", plugin.Name);
-					}
-				}
-
-				return md5ProviderFactories.ToArray();
-			}
-		}
-
-		private void RegisterWebControllers(NodeSubsystems[] enabledNodeSubsystems) {
-			if (!_options.Interface.DisableAdminUi) {
-				Node.HttpService.SetupController(new ClusterWebUiController(Node.MainQueue,
-					enabledNodeSubsystems));
-			}
-		}
-
-		public Task StartAsync(CancellationToken cancellationToken) =>
-			_options.Application.WhatIf ? Task.CompletedTask : Node.StartAsync(false);
-
-		public Task StopAsync(CancellationToken cancellationToken) =>
-			Node.StopAsync(cancellationToken: cancellationToken);
-
-		public void Dispose() {
-			if (_dbLock is not {IsAcquired: true}) {
-				return;
-			}
-			using (_dbLock) {
-				_dbLock.Release();
-			}
-		}
-	}
-}
diff --git a/src/EventStore.ClusterNode/EventStore.ClusterNode.csproj b/src/EventStore.ClusterNode/EventStore.ClusterNode.csproj
deleted file mode 100644
index 4eb2234a465..00000000000
--- a/src/EventStore.ClusterNode/EventStore.ClusterNode.csproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<OutputType>Exe</OutputType>
-		<ApplicationIcon>app2.ico</ApplicationIcon>
-		<GenerateSupportedRuntime>false</GenerateSupportedRuntime>
-	</PropertyGroup>
-	<ItemGroup>
-		<PackageReference Include="SharpDotYaml.Extensions.Configuration" Version="0.3.0" />
-		<PackageReference Include="System.ComponentModel.Composition" Version="8.0.0" />
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\EventStore.ClusterNode.Web\EventStore.ClusterNode.Web.csproj" />
-		<ProjectReference Include="..\EventStore.Common\EventStore.Common.csproj" />
-		<ProjectReference Include="..\EventStore.Core\EventStore.Core.csproj" />
-		<ProjectReference Include="..\EventStore.PluginHosting\EventStore.PluginHosting.csproj" />
-		<ProjectReference Include="..\EventStore.Projections.Core\EventStore.Projections.Core.csproj" />
-	</ItemGroup>
-	<ItemGroup>
-		<None Include="..\EventStore.Common\Utils\version.properties">
-			<Link>version.properties</Link>
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Update="..\..\LICENSE.md">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Update="..\..\NOTICE.html">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Update="metricsconfig.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Update="kestrelsettings.json">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</None>
-		<None Update="logconfig.json">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-	</ItemGroup>
-	<ItemGroup>
-		<Content Include="app2.ico" />
-		<None Remove="certs\**\*" />
-		<Content Include="certs\**\*" CopyToOutputDirectory="PreserveNewest" />
-	</ItemGroup>
-	<!-- TODO(jen20): Investigate which of these are correct -->
-	<PropertyGroup>
-		<IsMac>false</IsMac>
-		<IsMac Condition="('$(OS)' == 'Unix') And (Exists ('/Library/Frameworks'))">true</IsMac>
-	</PropertyGroup>
-
-</Project>
diff --git a/src/EventStore.ClusterNode/Program.cs b/src/EventStore.ClusterNode/Program.cs
deleted file mode 100644
index 3d0e38f484c..00000000000
--- a/src/EventStore.ClusterNode/Program.cs
+++ /dev/null
@@ -1,319 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Security;
-using System.Security.Authentication;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Common.Exceptions;
-using EventStore.Common.Log;
-using EventStore.Common.Utils;
-using EventStore.Core.Services.Transport.Http;
-using EventStore.Core.Certificates;
-using EventStore.Core;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Server.Kestrel.Core;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Serilog;
-using System.Runtime;
-using EventStore.Common.DevCertificates;
-using EventStore.Core.Configuration;
-using Microsoft.Extensions.Logging;
-using Serilog.Events;
-using RuntimeInformation = System.Runtime.RuntimeInformation;
-
-namespace EventStore.ClusterNode {
-	internal static class Program {
-		public static async Task<int> Main(string[] args) {
-			var configuration = EventStoreConfiguration.Build(args);
-
-			ThreadPool.SetMaxThreads(1000, 1000);
-			var exitCodeSource = new TaskCompletionSource<int>();
-			var cts = new CancellationTokenSource();
-
-			Log.Logger = EventStoreLoggerConfiguration.ConsoleLog;
-			try {
-				var options = ClusterVNodeOptions.FromConfiguration(configuration);
-
-				var logsDirectory = string.IsNullOrWhiteSpace(options.Logging.Log)
-					? Locations.DefaultLogDirectory
-					: options.Logging.Log;
-
-				EventStoreLoggerConfiguration.Initialize(logsDirectory, options.GetComponentName(),
-					options.Logging.LogConsoleFormat,
-					options.Logging.LogFileSize,
-					options.Logging.LogFileInterval,
-					options.Logging.LogFileRetentionCount,
-					options.Logging.DisableLogFile,
-					options.Logging.LogConfig);
-
-				if (options.Application.Help) {
-					await Console.Out.WriteLineAsync(ClusterVNodeOptions.HelpText);
-					return 0;
-				}
-
-				if (options.Application.Version) {
-					await Console.Out.WriteLineAsync(VersionInfo.Text);
-					return 0;
-				}
-
-				if (options.DevMode.RemoveDevCerts) {
-					Log.Information("Removing EventStoreDB dev certs.");
-					CertificateManager.Instance.CleanupHttpsCertificates();
-					Log.Information("Dev certs removed. Exiting.");
-					return 0;
-				}
-
-				Log.Information(
-                    "{description,-25} {version} {edition} ({buildId}/{commitSha}, {timestamp})", "ES VERSION:",
-					VersionInfo.Version, VersionInfo.Edition, VersionInfo.BuildId, VersionInfo.CommitSha, VersionInfo.Timestamp
-                );
-
-				Log.Information("{description,-25} {osArchitecture} ", "OS ARCHITECTURE:", System.Runtime.InteropServices.RuntimeInformation.OSArchitecture);
-				Log.Information("{description,-25} {osFlavor} ({osVersion})", "OS:", RuntimeInformation.OsPlatform, Environment.OSVersion);
-				Log.Information("{description,-25} {osRuntimeVersion} ({architecture}-bit)", "RUNTIME:", RuntimeInformation.RuntimeVersion, RuntimeInformation.RuntimeMode);
-				Log.Information("{description,-25} {maxGeneration} IsServerGC: {isServerGC} Latency Mode: {latencyMode}", "GC:",
-					GC.MaxGeneration == 0 ? "NON-GENERATION (PROBABLY BOEHM)" : $"{GC.MaxGeneration + 1} GENERATIONS",
-					GCSettings.IsServerGC,
-					GCSettings.LatencyMode);
-				Log.Information("{description,-25} {logsDirectory}", "LOGS:", logsDirectory);
-				Log.Information(options.DumpOptions());
-
-				var level = options.Application.AllowUnknownOptions
-					? LogEventLevel.Warning
-					: LogEventLevel.Fatal;
-
-				foreach (var (option, suggestion) in options.Unknown.Options) {
-					if (string.IsNullOrEmpty(suggestion)) {
-						Log.Write(level, "The option {option} is not a known option.", option);
-					} else {
-						Log.Write(level, "The option {option} is not a known option. Did you mean {suggestion}?", option, suggestion);
-					}
-				}
-
-				if (options.UnknownOptionsDetected && !options.Application.AllowUnknownOptions) {
-					Log.Fatal(
-						$"Found unknown options. To continue anyway, set {nameof(ClusterVNodeOptions.ApplicationOptions.AllowUnknownOptions)} to true.");
-					Log.Information("Use the --help option in the command line to see the full list of EventStoreDB configuration options.");
-					return 1;
-				}
-
-				CertificateProvider certificateProvider;
-				if (options.DevMode.Dev) {
-					Log.Information("Dev mode is enabled.");
-					Log.Warning(
-						"\n==============================================================================================================\n" +
-						"DEV MODE IS ON. THIS MODE IS *NOT* RECOMMENDED FOR PRODUCTION USE.\n" +
-						"DEV MODE WILL GENERATE AND TRUST DEV CERTIFICATES FOR RUNNING A SINGLE SECURE NODE ON LOCALHOST.\n" +
-						"==============================================================================================================\n");
-					var manager = CertificateManager.Instance;
-					var result = manager.EnsureDevelopmentCertificate(DateTimeOffset.UtcNow, DateTimeOffset.UtcNow.AddMonths(1));
-					if (result is not (EnsureCertificateResult.Succeeded or EnsureCertificateResult.ValidCertificatePresent)) {
-						Log.Fatal("Could not ensure dev certificate is available. Reason: {result}", result);
-						return 1;
-					}
-
-					var userCerts = manager.ListCertificates(StoreName.My, StoreLocation.CurrentUser, true);
-					var machineCerts = manager.ListCertificates(StoreName.My, StoreLocation.LocalMachine, true);
-					var certs = userCerts.Concat(machineCerts).ToList();
-
-					if (!certs.Any()) {
-						Log.Fatal("Could not create dev certificate.");
-						return 1;
-					}
-					if (!manager.IsTrusted(certs[0]) && RuntimeInformation.IsWindows) {
-						Log.Information("Dev certificate {cert} is not trusted. Adding it to the trusted store.", certs[0]);
-						manager.TrustCertificate(certs[0]);
-					} else {
-						Log.Warning("Automatically trusting dev certs is only supported on Windows.\n" +
-									"Please trust certificate {cert} if it's not trusted already.", certs[0]);
-					}
-
-					Log.Information("Running in dev mode using certificate '{cert}'", certs[0]);
-					certificateProvider = new DevCertificateProvider(certs[0]);
-				} else {
-					certificateProvider = new OptionsCertificateProvider();
-				}
-
-				var deprecationWarnings = options.GetDeprecationWarnings();
-				if (deprecationWarnings != null) {
-					Log.Warning($"DEPRECATED{Environment.NewLine}{deprecationWarnings}");
-				}
-
-				if (!ClusterVNodeOptionsValidator.ValidateForStartup(options)) {
-					return 1;
-				}
-
-				if (options.Application.Insecure) {
-					Log.Warning(
-						"\n==============================================================================================================\n" +
-						"INSECURE MODE IS ON. THIS MODE IS *NOT* RECOMMENDED FOR PRODUCTION USE.\n" +
-						"INSECURE MODE WILL DISABLE ALL AUTHENTICATION, AUTHORIZATION AND TRANSPORT SECURITY FOR ALL CLIENTS AND NODES.\n" +
-						"==============================================================================================================\n");
-				}
-
-				if (options.Application.WhatIf) {
-					return 0;
-				}
-
-				Application.RegisterExitAction(code => {
-					// add a small delay to allow the host to start up in case there's a premature shutdown
-					cts.CancelAfter(TimeSpan.FromSeconds(1));
-					exitCodeSource.SetResult(code);
-				});
-
-				Console.CancelKeyPress += delegate {
-					Application.Exit(0, "Cancelled.");
-				};
-
-				using (var hostedService = new ClusterVNodeHostedService(options, certificateProvider, configuration)) {
-					using var signal = new ManualResetEventSlim(false);
-					_ = Run(hostedService, signal);
-					// ReSharper disable MethodSupportsCancellation
-					signal.Wait();
-					// ReSharper restore MethodSupportsCancellation
-				}
-
-				return await exitCodeSource.Task;
-
-				async Task Run(ClusterVNodeHostedService hostedService, ManualResetEventSlim signal) {
-					try {
-						await new HostBuilder()
-							.ConfigureHostConfiguration(builder => builder.AddEnvironmentVariables("DOTNET_").AddCommandLine(args))
-							.ConfigureAppConfiguration(builder => builder.AddConfiguration(configuration))
-							.ConfigureLogging(logging => logging.ClearProviders().AddSerilog())
-							.ConfigureServices(services => services
-								.Configure<KestrelServerOptions>(configuration.GetSection("Kestrel"))
-								.Configure<HostOptions>(x => {
-									x.ShutdownTimeout = TimeSpan.FromSeconds(5);
-									#if DEBUG
-									x.BackgroundServiceExceptionBehavior = BackgroundServiceExceptionBehavior.StopHost;
-									#endif
-								})
-							)
-							.ConfigureWebHostDefaults(builder => builder
-								.UseKestrel(server => {
-									server.Limits.Http2.KeepAlivePingDelay = TimeSpan.FromMilliseconds(options.Grpc.KeepAliveInterval);
-									server.Limits.Http2.KeepAlivePingTimeout = TimeSpan.FromMilliseconds(options.Grpc.KeepAliveTimeout);
-
-									server.Listen(options.Interface.NodeIp, options.Interface.NodePort, listenOptions =>
-										ConfigureHttpOptions(listenOptions, hostedService, useHttps: !hostedService.Node.DisableHttps));
-
-									if (hostedService.Node.EnableUnixSocket)
-										TryListenOnUnixSocket(hostedService, server);
-								})
-								.ConfigureServices(services => hostedService.Node.Startup.ConfigureServices(services))
-								.Configure(hostedService.Node.Startup.Configure)
-							)
-							// Order is important, configure IHostedService after the WebHost to make the sure
-							// ClusterVNodeHostedService and the subsystems are started after configuration is finished.
-							// Allows the subsystems to resolve dependencies out of the DI in Configure() before being started.
-							// Later it may be possible to use constructor injection instead if it fits with the bootstrapping strategy.
-							.ConfigureServices(services => services.AddSingleton<IHostedService>(hostedService))
-							.RunConsoleAsync(x => x.SuppressStatusMessages = true, cts.Token);
-
-						exitCodeSource.TrySetResult(0);
-					} catch (Exception ex) {
-						Log.Fatal("Error occurred during setup: {e}", ex);
-						exitCodeSource.TrySetResult(1);
-					} finally {
-						signal.Set();
-					}
-				}
-
-			} catch (InvalidConfigurationException ex) {
-				Log.Fatal("Invalid Configuration: " + ex.Message);
-				return 1;
-			}
-			catch (Exception ex) {
-				Log.Fatal(ex, "Host terminated unexpectedly.");
-				return 1;
-			} finally {
-				await Log.CloseAndFlushAsync();
-			}
-		}
-
-		private static void ConfigureHttpOptions(ListenOptions listenOptions, ClusterVNodeHostedService hostedService, bool useHttps) {
-			if (useHttps)
-				listenOptions.UseHttps(CreateServerOptionsSelectionCallback(hostedService), null);
-			else
-				listenOptions.Use(next =>
-					new ClearTextHttpMultiplexingMiddleware(next).OnConnectAsync);
-		}
-
-		private static void TryListenOnUnixSocket(ClusterVNodeHostedService hostedService, KestrelServerOptions server) {
-			if (hostedService.Node.Db.Config.InMemDb) {
-				Log.Information("Not listening on a UNIX domain socket since the database is running in memory.");
-				return;
-			}
-
-			if (!RuntimeInformation.IsLinux && !OperatingSystem.IsWindowsVersionAtLeast(10, 0, 17063)) {
-				Log.Error("Not listening on a UNIX domain socket since it is not supported by the operating system.");
-				return;
-			}
-
-			try {
-				var unixSocket = Path.GetFullPath(Path.Combine(hostedService.Node.Db.Config.Path, "eventstore.sock"));
-
-				if (File.Exists(unixSocket)) {
-					try {
-						File.Delete(unixSocket);
-						Log.Information("Cleaned up stale UNIX domain socket: {unixSocket}", unixSocket);
-					} catch (Exception ex) {
-						Log.Error(ex, "Failed to clean up stale UNIX domain socket: {unixSocket}. Please delete the file manually.", unixSocket);
-						throw;
-					}
-				}
-
-				server.ListenUnixSocket(unixSocket, listenOptions => {
-					listenOptions.Use(next => new UnixSocketConnectionMiddleware(next).OnConnectAsync);
-					ConfigureHttpOptions(listenOptions, hostedService, useHttps: false);
-				});
-				Log.Information("Listening on UNIX domain socket: {unixSocket}", unixSocket);
-			} catch (Exception ex) {
-				Log.Error(ex, "Failed to listen on UNIX domain socket.");
-				throw;
-			}
-		}
-
-		private static ServerOptionsSelectionCallback CreateServerOptionsSelectionCallback(ClusterVNodeHostedService hostedService) {
-			return ((_, _, _, _) => {
-				var serverOptions = new SslServerAuthenticationOptions {
-					ServerCertificateContext = SslStreamCertificateContext.Create(
-						hostedService.Node.CertificateSelector(),
-						hostedService.Node.IntermediateCertificatesSelector(),
-						offline: true),
-					ClientCertificateRequired = true, // request a client certificate but it's not necessary for the client to supply one
-					RemoteCertificateValidationCallback = (_, certificate, chain, sslPolicyErrors) => {
-						if(certificate == null) // not necessary to have a client certificate
-							return true;
-
-						var (isValid, error) =
-							hostedService.Node.InternalClientCertificateValidator(
-								certificate,
-								chain,
-								sslPolicyErrors);
-						if (!isValid && error != null) {
-							Log.Error("Client certificate validation error: {e}", error);
-						}
-
-						return isValid;
-					},
-					CertificateRevocationCheckMode = X509RevocationMode.NoCheck,
-					EnabledSslProtocols = SslProtocols.None, // let the OS choose a secure TLS protocol
-					ApplicationProtocols = new List<SslApplicationProtocol> {
-						SslApplicationProtocol.Http2,
-						SslApplicationProtocol.Http11
-					},
-					AllowRenegotiation = false
-				};
-
-				return ValueTask.FromResult(serverOptions);
-			});
-		}
-	}
-}
diff --git a/src/EventStore.ClusterNode/logconfig.json b/src/EventStore.ClusterNode/logconfig.json
deleted file mode 100644
index 6efad8e8990..00000000000
--- a/src/EventStore.ClusterNode/logconfig.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"Logging": {
-		"LogLevel": {
-			"Default": "Debug",
-			"System": "Warning",
-			"Microsoft": "Warning",
-			"Grpc": "Warning"
-		}
-	}
-}
diff --git a/src/EventStore.Common.Tests/Configuration/SectionTests.cs b/src/EventStore.Common.Tests/Configuration/SectionTests.cs
deleted file mode 100644
index 5ea81595b87..00000000000
--- a/src/EventStore.Common.Tests/Configuration/SectionTests.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using EventStore.Common.Configuration;
-using Microsoft.Extensions.Configuration;
-
-namespace EventStore.Common.Tests.Configuration;
-
-public class SectionTests {
-	[Fact]
-	public void SanityCheck() {
-		var config = new ConfigurationBuilder()
-			.AddInMemoryCollection(new Dictionary<string, string?> {
-				{"a", "v a"},
-				{"sub:a", "v sub:a"},
-			})
-			.AddSection("section2", b => b
-				.AddInMemoryCollection(new Dictionary<string, string?> {
-					{"a", "v section2:a"},
-					{"b", "v section2:b"},
-					{"sub:a", "v section2:sub:a"},
-				})
-				.AddInMemoryCollection(new Dictionary<string, string?> {
-					{"a", "v section2:a2"},
-					{"c", "v section2:c"},
-					{"sub:b", "v section2:sub:b"},
-				}))
-			.AddSection("section3", b => b
-				.AddInMemoryCollection(new Dictionary<string, string?> {
-					{"a", "v section3:a"},
-				}))
-			.Build();
-
-		Assert.Equal("v a", config["a"]);
-		Assert.Equal("v sub:a", config.GetSection("sub")["a"]);
-
-		Assert.Equal("v section2:a2", config.GetSection("section2")["a"]);
-		Assert.Equal("v section2:b", config.GetSection("section2")["b"]);
-		Assert.Equal("v section2:c", config.GetSection("section2")["c"]);
-		
-		Assert.Equal("v section2:sub:a", config.GetSection("section2").GetSection("sub")["a"]);
-		Assert.Equal("v section2:sub:b", config.GetSection("section2").GetSection("sub")["b"]);
-
-		Assert.Equal("v section3:a", config.GetSection("section3")["a"]);
-	}
-}
diff --git a/src/EventStore.Common.Tests/EventStore.Common.Tests.csproj b/src/EventStore.Common.Tests/EventStore.Common.Tests.csproj
deleted file mode 100644
index 3f9c39a126a..00000000000
--- a/src/EventStore.Common.Tests/EventStore.Common.Tests.csproj
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<IsPackable>false</IsPackable>
-	</PropertyGroup>
-	<ItemGroup>
-		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-		<PackageReference Include="System.Net.Http" Version="4.3.4" />
-		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-		<PackageReference Include="xunit" Version="2.6.1" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="6.0.0">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\EventStore.Common\EventStore.Common.csproj" />
-	</ItemGroup>
-</Project>
diff --git a/src/EventStore.Common.Tests/Usings.cs b/src/EventStore.Common.Tests/Usings.cs
deleted file mode 100644
index c802f4480b1..00000000000
--- a/src/EventStore.Common.Tests/Usings.cs
+++ /dev/null
@@ -1 +0,0 @@
-global using Xunit;
diff --git a/src/EventStore.Common/Configuration/ConfigurationRootExtensions.cs b/src/EventStore.Common/Configuration/ConfigurationRootExtensions.cs
deleted file mode 100644
index 8741082187c..00000000000
--- a/src/EventStore.Common/Configuration/ConfigurationRootExtensions.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-#nullable enable
-
-using System;
-using Microsoft.Extensions.Configuration;
-
-namespace EventStore.Common.Configuration {
-	public static class ConfigurationRootExtensions {
-		private static readonly string[] INVALID_DELIMITERS = [";", "\t"];
-
-		public static string[] GetCommaSeparatedValueAsArray(this IConfiguration configuration, string key) {
-			var value = configuration.GetValue<string?>(key);
-			if (string.IsNullOrEmpty(value)) {
-				return Array.Empty<string>();
-			}
-
-			foreach (var invalidDelimiter in INVALID_DELIMITERS) {
-				if (value.Contains(invalidDelimiter)) {
-					throw new ArgumentException($"Invalid delimiter {invalidDelimiter} for {key}");
-				}
-			}
-
-			return value.Split(',', StringSplitOptions.RemoveEmptyEntries);
-		}
-	}
-}
diff --git a/src/EventStore.Common/Configuration/DeprecatedAttribute.cs b/src/EventStore.Common/Configuration/DeprecatedAttribute.cs
deleted file mode 100644
index 2fb896427cc..00000000000
--- a/src/EventStore.Common/Configuration/DeprecatedAttribute.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace EventStore.Common.Configuration {
-	[AttributeUsage(AttributeTargets.Property)]
-	public class DeprecatedAttribute(string message) : Attribute {
-		public string Message { get; } = message;
-	}
-}
diff --git a/src/EventStore.Common/Configuration/EnvironmentOnlyAttribute.cs b/src/EventStore.Common/Configuration/EnvironmentOnlyAttribute.cs
deleted file mode 100644
index b1b25a3bf57..00000000000
--- a/src/EventStore.Common/Configuration/EnvironmentOnlyAttribute.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace EventStore.Common.Configuration {
-	[AttributeUsage(AttributeTargets.Property)]
-	public class EnvironmentOnlyAttribute(string message) : Attribute {
-		public string Message { get; } = message;
-	}
-}
diff --git a/src/EventStore.Common/Configuration/MetricsConfiguration.cs b/src/EventStore.Common/Configuration/MetricsConfiguration.cs
deleted file mode 100644
index cafcc04ee9d..00000000000
--- a/src/EventStore.Common/Configuration/MetricsConfiguration.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.Extensions.Configuration;
-
-namespace EventStore.Common.Configuration {
-	public class MetricsConfiguration {
-		public static MetricsConfiguration Get(IConfiguration configuration) =>
-			configuration
-				.GetSection("EventStore:Metrics")
-				.Get<MetricsConfiguration>() ?? new();
-
-		public enum StatusTracker {
-			Index = 1,
-			Node,
-			Scavenge,
-		}
-
-		public enum Checkpoint {
-			Chaser = 1,
-			Epoch,
-			Index,
-			Proposal,
-			Replication,
-			StreamExistenceFilter,
-			Truncate,
-			Writer,
-		}
-
-		public enum IncomingGrpcCall {
-			Current = 1,
-			Total,
-			Failed,
-			Unimplemented,
-			DeadlineExceeded,
-		}
-
-		public enum GrpcMethod {
-			StreamRead = 1,
-			StreamAppend,
-			StreamBatchAppend,
-			StreamDelete,
-			StreamTombstone,
-		}
-
-		public enum GossipTracker {
-			PullFromPeer = 1,
-			PushToPeer,
-			ProcessingPushFromPeer,
-			ProcessingRequestFromPeer,
-			ProcessingRequestFromGrpcClient,
-			ProcessingRequestFromHttpClient,
-		}
-
-		public enum WriterTracker {
-			FlushSize = 1,
-			FlushDuration,
-		}
-
-		public enum EventTracker {
-			Read = 1,
-			Written,
-		}
-
-		public enum Cache {
-			StreamInfo = 1,
-			Chunk,
-		}
-
-		public enum KestrelTracker {
-			ConnectionCount = 1,
-		}
-
-		public enum SystemTracker {
-			Cpu = 1,
-			LoadAverage1m,
-			LoadAverage5m,
-			LoadAverage15m,
-			FreeMem,
-			TotalMem,
-			DriveTotalBytes,
-			DriveUsedBytes,
-		}
-
-		public enum ProcessTracker {
-			UpTime = 1,
-			Cpu,
-			MemWorkingSet,
-			MemPagedBytes,
-			MemVirtualBytes,
-			ThreadCount,
-			ThreadPoolPendingWorkItemCount,
-			LockContentionCount,
-			ExceptionCount,
-			Gen0CollectionCount,
-			Gen1CollectionCount,
-			Gen2CollectionCount,
-			Gen0Size,
-			Gen1Size,
-			Gen2Size,
-			LohSize,
-			TimeInGc,
-			HeapSize,
-			HeapFragmentation,
-			TotalAllocatedBytes,
-			DiskReadBytes,
-			DiskReadOps,
-			DiskWrittenBytes,
-			DiskWrittenOps,
-			GcPauseDuration,
-		}
-
-		public enum QueueTracker {
-			Busy = 1,
-			Length,
-			Processing,
-		}
-
-		public class LabelMappingCase {
-			public string Regex { get; set; } = "";
-			public string Label { get; set; } = "";
-		}
-
-		public string[] Meters { get; set; } = Array.Empty<string>();
-
-		public Dictionary<StatusTracker, bool> Statuses { get; set; } = new ();
-
-		public Dictionary<Checkpoint, bool> Checkpoints { get; set; } = new();
-
-		public Dictionary<IncomingGrpcCall, bool> IncomingGrpcCalls { get; set; } = new();
-
-		public Dictionary<GrpcMethod, string> GrpcMethods { get; set; } = new();
-
-		public Dictionary<GossipTracker, bool> Gossip { get; set; } = new();
-
-		public Dictionary<KestrelTracker, bool> Kestrel { get; set; } = new();
-
-		public Dictionary<SystemTracker, bool> System { get; set; } = new();
-
-		public Dictionary<ProcessTracker, bool> Process { get; set; } = new();
-
-		public Dictionary<WriterTracker, bool> Writer { get; set; } = new();
-
-		public Dictionary<EventTracker, bool> Events { get; set; } = new();
-
-		public Dictionary<Cache, bool> CacheHitsMisses { get; set; } = new();
-
-		public bool ProjectionStats { get; set; }
-
-		public bool PersistentSubscriptionStats { get; set; } = false;
-
-		public bool ElectionsCount { get; set; } = false;
-
-		public bool CacheResources { get; set; } = false;
-
-		// must be 0, 1, 5, 10 or a multiple of 15
-		public int ExpectedScrapeIntervalSeconds { get; set; }
-
-		public Dictionary<QueueTracker, bool> Queues { get; set; } = new();
-
-		public LabelMappingCase[] QueueLabels { get; set; } = Array.Empty<LabelMappingCase>();
-
-		public LabelMappingCase[] MessageTypes { get; set; } = Array.Empty<LabelMappingCase>();
-	}
-}
diff --git a/src/EventStore.Common/Configuration/SectionProvider.cs b/src/EventStore.Common/Configuration/SectionProvider.cs
deleted file mode 100644
index e79ffdf5ddc..00000000000
--- a/src/EventStore.Common/Configuration/SectionProvider.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Microsoft.Extensions.Configuration;
-
-namespace EventStore.Common.Configuration;
-
-public class SectionProvider : ConfigurationProvider {
-	private readonly IConfiguration _configuration;
-	private readonly string _sectionName;
-
-	public SectionProvider(string sectionName, IConfiguration configuration) {
-		_configuration = configuration;
-		_sectionName = sectionName;
-	}
-
-	public override void Load() {
-		foreach (var kvp in _configuration.AsEnumerable()) {
-			Data[_sectionName + ":" + kvp.Key] = kvp.Value;
-		}
-	}
-}
diff --git a/src/EventStore.Common/Configuration/SensitiveAttribute.cs b/src/EventStore.Common/Configuration/SensitiveAttribute.cs
deleted file mode 100644
index 376273296d2..00000000000
--- a/src/EventStore.Common/Configuration/SensitiveAttribute.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using System;
-
-namespace EventStore.Common.Configuration {
-	[AttributeUsage(AttributeTargets.Property)]
-	public class SensitiveAttribute : Attribute;
-}
diff --git a/src/EventStore.Common/Configuration/UnitAttribute.cs b/src/EventStore.Common/Configuration/UnitAttribute.cs
deleted file mode 100644
index 069b61776ee..00000000000
--- a/src/EventStore.Common/Configuration/UnitAttribute.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-
-namespace EventStore.Common.Configuration;
-
-[AttributeUsage(AttributeTargets.Property)]
-public class UnitAttribute(string unit) : Attribute {
-	public string Unit { get; } = unit;
-}
-
-
-
diff --git a/src/EventStore.Common/DevCertificates/CertificateKeyExportFormat.cs b/src/EventStore.Common/DevCertificates/CertificateKeyExportFormat.cs
deleted file mode 100644
index 96e7fa1ec19..00000000000
--- a/src/EventStore.Common/DevCertificates/CertificateKeyExportFormat.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.Common.DevCertificates {
-	public enum CertificateKeyExportFormat {
-		Pfx,
-		Pem,
-	}
-}
diff --git a/src/EventStore.Common/DevCertificates/CertificateManager.cs b/src/EventStore.Common/DevCertificates/CertificateManager.cs
deleted file mode 100644
index 56472b9ed0b..00000000000
--- a/src/EventStore.Common/DevCertificates/CertificateManager.cs
+++ /dev/null
@@ -1,908 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Diagnostics.Tracing;
-using System.IO;
-using System.Linq;
-using System.Runtime;
-using System.Security.Cryptography.X509Certificates;
-using System.Security.Cryptography;
-using System.Text;
-using EventStore.Common.Utils;
-
-namespace EventStore.Common.DevCertificates {
-
-	public abstract class CertificateManager {
-		internal const int CurrentCertificateVersion = 2;
-		internal const string EventStoreDbHttpsOid = "1.3.6.1.4.1.43941.1.1.1";
-		internal const string EventStoreHttpsOidFriendlyName = "Event Store HTTPS development certificate";
-
-		private const string ServerAuthenticationEnhancedKeyUsageOid = "1.3.6.1.5.5.7.3.1";
-		private const string ServerAuthenticationEnhancedKeyUsageOidFriendlyName = "Server Authentication";
-
-		private const string LocalhostHttpsDnsName = "localhost";
-		private const string LocalhostHttpsDistinguishedName = "CN=" + LocalhostHttpsDnsName;
-
-		public const int RSAMinimumKeySizeInBits = 2048;
-
-#pragma warning disable CA1416 // Validate platform compatibility
-        public static CertificateManager Instance { get; } = RuntimeInformation.IsWindows
-            ? new WindowsCertificateManager()
-            : RuntimeInformation.IsOSX
-                ? new MacOSCertificateManager() as CertificateManager
-                : new UnixCertificateManager();
-#pragma warning restore CA1416 // Validate platform compatibility
-        
-		public static CertificateManagerEventSource Log { get; set; } = new CertificateManagerEventSource();
-
-		// Setting to 0 means we don't append the version byte,
-		// which is what all machines currently have.
-		public int EventStoreHttpsCertificateVersion { get; }
-
-		public string Subject { get; }
-
-		protected CertificateManager() : this(LocalhostHttpsDistinguishedName, CurrentCertificateVersion) {
-		}
-
-		// For testing purposes only
-		internal CertificateManager(string subject, int version) {
-			Subject = subject;
-			EventStoreHttpsCertificateVersion = version;
-		}
-
-		public static bool IsHttpsDevelopmentCertificate(X509Certificate2 certificate) =>
-			certificate.Extensions.OfType<X509Extension>()
-				.Any(e => string.Equals(EventStoreDbHttpsOid, e.Oid?.Value, StringComparison.Ordinal));
-
-		public IList<X509Certificate2> ListCertificates(
-			StoreName storeName,
-			StoreLocation location,
-			bool isValid,
-			bool requireExportable = true) {
-			Log.ListCertificatesStart(location, storeName);
-			var certificates = new List<X509Certificate2>();
-			try {
-				using var store = new X509Store(storeName, location);
-				store.Open(OpenFlags.ReadOnly);
-				certificates.AddRange(store.Certificates.OfType<X509Certificate2>());
-				IEnumerable<X509Certificate2> matchingCertificates = certificates;
-				matchingCertificates = matchingCertificates
-					.Where(c => HasOid(c, EventStoreDbHttpsOid));
-
-				if (Log.IsEnabled()) {
-					Log.DescribeFoundCertificates(ToCertificateDescription(matchingCertificates));
-				}
-
-				if (isValid) {
-					// Ensure the certificate hasn't expired, has a private key and its exportable
-					// (for container/unix scenarios).
-					Log.CheckCertificatesValidity();
-					var now = DateTimeOffset.Now;
-					var validCertificates = matchingCertificates
-						.Where(c => IsValidCertificate(c, now, requireExportable))
-						.OrderByDescending(c => GetCertificateVersion(c))
-						.ToArray();
-
-					if (Log.IsEnabled()) {
-						var invalidCertificates = matchingCertificates.Except(validCertificates);
-						Log.DescribeValidCertificates(ToCertificateDescription(validCertificates));
-						Log.DescribeInvalidCertificates(ToCertificateDescription(invalidCertificates));
-					}
-
-					matchingCertificates = validCertificates;
-				}
-
-				// We need to enumerate the certificates early to prevent disposing issues.
-				matchingCertificates = matchingCertificates.ToList();
-
-				var certificatesToDispose = certificates.Except(matchingCertificates);
-				DisposeCertificates(certificatesToDispose);
-
-				store.Close();
-
-				Log.ListCertificatesEnd();
-				return (IList<X509Certificate2>)matchingCertificates;
-			} catch (Exception e) {
-				if (Log.IsEnabled()) {
-					Log.ListCertificatesError(e.ToString());
-				}
-
-				DisposeCertificates(certificates);
-				certificates.Clear();
-				return certificates;
-			}
-
-			bool HasOid(X509Certificate2 certificate, string oid) =>
-				certificate.Extensions.OfType<X509Extension>()
-					.Any(e => string.Equals(oid, e.Oid?.Value, StringComparison.Ordinal));
-
-			static byte GetCertificateVersion(X509Certificate2 c) {
-				var byteArray = c.Extensions
-					.OfType<X509Extension>()
-					.Single(e => string.Equals(EventStoreDbHttpsOid, e.Oid?.Value, StringComparison.Ordinal))
-					.RawData;
-
-				if ((byteArray.Length == EventStoreHttpsOidFriendlyName.Length && byteArray[0] == (byte)'A') ||
-				    byteArray.Length == 0) {
-					// No Version set, default to 0
-					return 0b0;
-				} else {
-					// Version is in the only byte of the byte array.
-					return byteArray[0];
-				}
-			}
-
-			bool IsValidCertificate(X509Certificate2 certificate, DateTimeOffset currentDate, bool requireExportable) =>
-				certificate.NotBefore <= currentDate &&
-				currentDate <= certificate.NotAfter &&
-				(!requireExportable || IsExportable(certificate)) &&
-				GetCertificateVersion(certificate) >= EventStoreHttpsCertificateVersion;
-		}
-
-		public IList<X509Certificate2> GetHttpsCertificates() =>
-			ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: true, requireExportable: true);
-
-		public EnsureCertificateResult EnsureDevelopmentCertificate(
-			DateTimeOffset notBefore,
-			DateTimeOffset notAfter,
-			string path = null,
-			bool trust = false,
-			bool includePrivateKey = false,
-			string password = null,
-			CertificateKeyExportFormat keyExportFormat = CertificateKeyExportFormat.Pfx,
-			bool isInteractive = true) {
-			var result = EnsureCertificateResult.Succeeded;
-
-			var currentUserCertificates = ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: true,
-				requireExportable: true);
-			var trustedCertificates = ListCertificates(StoreName.My, StoreLocation.LocalMachine, isValid: true,
-				requireExportable: true);
-			var certificates = currentUserCertificates.Concat(trustedCertificates);
-
-			var filteredCertificates = certificates.Where(c => c.Subject == Subject);
-
-			if (Log.IsEnabled()) {
-				var excludedCertificates = certificates.Except(filteredCertificates);
-				Log.FilteredCertificates(ToCertificateDescription(filteredCertificates));
-				Log.ExcludedCertificates(ToCertificateDescription(excludedCertificates));
-			}
-
-			certificates = filteredCertificates;
-
-			X509Certificate2 certificate = null;
-			var isNewCertificate = false;
-			if (certificates.Any()) {
-				certificate = certificates.First();
-				var failedToFixCertificateState = false;
-				if (isInteractive) {
-					// Skip this step if the command is not interactive,
-					// as we don't want to prompt on first run experience.
-					foreach (var candidate in currentUserCertificates) {
-						var status = CheckCertificateState(candidate, true);
-						if (!status.Success) {
-							try {
-								if (Log.IsEnabled()) {
-									Log.CorrectCertificateStateStart(GetDescription(candidate));
-								}
-
-								CorrectCertificateState(candidate);
-								Log.CorrectCertificateStateEnd();
-							} catch (Exception e) {
-								if (Log.IsEnabled()) {
-									Log.CorrectCertificateStateError(e.ToString());
-								}
-
-								result = EnsureCertificateResult.FailedToMakeKeyAccessible;
-								// We don't return early on this type of failure to allow for tooling to
-								// export or trust the certificate even in this situation, as that enables
-								// exporting the certificate to perform any necessary fix with native tooling.
-								failedToFixCertificateState = true;
-							}
-						}
-					}
-				}
-
-				if (!failedToFixCertificateState) {
-					if (Log.IsEnabled()) {
-						Log.ValidCertificatesFound(ToCertificateDescription(certificates));
-					}
-
-					certificate = certificates.First();
-					if (Log.IsEnabled()) {
-						Log.SelectedCertificate(GetDescription(certificate));
-					}
-
-					result = EnsureCertificateResult.ValidCertificatePresent;
-				}
-			} else {
-				Log.NoValidCertificatesFound();
-				try {
-					Log.CreateDevelopmentCertificateStart();
-					isNewCertificate = true;
-					certificate = CreateDevelopmentCertificate(notBefore, notAfter);
-				} catch (Exception e) {
-					if (Log.IsEnabled()) {
-						Log.CreateDevelopmentCertificateError(e.ToString());
-					}
-
-					result = EnsureCertificateResult.ErrorCreatingTheCertificate;
-					return result;
-				}
-
-				Log.CreateDevelopmentCertificateEnd();
-
-				try {
-					certificate = SaveCertificate(certificate);
-				} catch (Exception e) {
-					Log.SaveCertificateInStoreError(e.ToString());
-					result = EnsureCertificateResult.ErrorSavingTheCertificateIntoTheCurrentUserPersonalStore;
-					return result;
-				}
-
-				if (isInteractive) {
-					try {
-						if (Log.IsEnabled()) {
-							Log.CorrectCertificateStateStart(GetDescription(certificate));
-						}
-
-						CorrectCertificateState(certificate);
-						Log.CorrectCertificateStateEnd();
-					} catch (Exception e) {
-						if (Log.IsEnabled()) {
-							Log.CorrectCertificateStateError(e.ToString());
-						}
-
-						// We don't return early on this type of failure to allow for tooling to
-						// export or trust the certificate even in this situation, as that enables
-						// exporting the certificate to perform any necessary fix with native tooling.
-						result = EnsureCertificateResult.FailedToMakeKeyAccessible;
-					}
-				}
-			}
-
-			if (path != null) {
-				try {
-					ExportCertificate(certificate, path, includePrivateKey, password, keyExportFormat);
-				} catch (Exception e) {
-					if (Log.IsEnabled()) {
-						Log.ExportCertificateError(e.ToString());
-					}
-
-					// We don't want to mask the original source of the error here.
-					result = result != EnsureCertificateResult.Succeeded &&
-					         result != EnsureCertificateResult.ValidCertificatePresent
-						? result
-						: EnsureCertificateResult.ErrorExportingTheCertificate;
-
-					return result;
-				}
-			}
-
-			if (trust) {
-				try {
-					TrustCertificate(certificate);
-				} catch (UserCancelledTrustException) {
-					result = EnsureCertificateResult.UserCancelledTrustStep;
-					return result;
-				} catch {
-					result = EnsureCertificateResult.FailedToTrustTheCertificate;
-					return result;
-				}
-			}
-
-			DisposeCertificates(!isNewCertificate ? certificates : certificates.Append(certificate));
-
-			return result;
-		}
-
-		internal ImportCertificateResult ImportCertificate(string certificatePath, string password) {
-			if (!File.Exists(certificatePath)) {
-				Log.ImportCertificateMissingFile(certificatePath);
-				return ImportCertificateResult.CertificateFileMissing;
-			}
-
-			var certificates = ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: false,
-				requireExportable: false);
-			if (certificates.Any()) {
-				if (Log.IsEnabled()) {
-					Log.ImportCertificateExistingCertificates(ToCertificateDescription(certificates));
-				}
-
-				return ImportCertificateResult.ExistingCertificatesPresent;
-			}
-
-			X509Certificate2 certificate;
-			try {
-				Log.LoadCertificateStart(certificatePath);
-				certificate = new X509Certificate2(certificatePath, password,
-					X509KeyStorageFlags.Exportable | X509KeyStorageFlags.EphemeralKeySet);
-				if (Log.IsEnabled()) {
-					Log.LoadCertificateEnd(GetDescription(certificate));
-				}
-			} catch (Exception e) {
-				if (Log.IsEnabled()) {
-					Log.LoadCertificateError(e.ToString());
-				}
-
-				return ImportCertificateResult.InvalidCertificate;
-			}
-
-			if (!IsHttpsDevelopmentCertificate(certificate)) {
-				if (Log.IsEnabled()) {
-					Log.NoHttpsDevelopmentCertificate(GetDescription(certificate));
-				}
-
-				return ImportCertificateResult.NoDevelopmentHttpsCertificate;
-			}
-
-			try {
-				SaveCertificate(certificate);
-			} catch (Exception e) {
-				if (Log.IsEnabled()) {
-					Log.SaveCertificateInStoreError(e.ToString());
-				}
-
-				return ImportCertificateResult.ErrorSavingTheCertificateIntoTheCurrentUserPersonalStore;
-			}
-
-			return ImportCertificateResult.Succeeded;
-		}
-
-		public void CleanupHttpsCertificates() {
-			// On OS X we don't have a good way to manage trusted certificates in the system keychain
-			// so we do everything by invoking the native toolchain.
-			// This has some limitations, like for example not being able to identify our custom OID extension. For that
-			// matter, when we are cleaning up certificates on the machine, we start by removing the trusted certificates.
-			// To do this, we list the certificates that we can identify on the current user personal store and we invoke
-			// the native toolchain to remove them from the sytem keychain. Once we have removed the trusted certificates,
-			// we remove the certificates from the local user store to finish up the cleanup.
-			var certificates = ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: false);
-			var filteredCertificates = certificates.Where(c => c.Subject == Subject);
-
-			if (Log.IsEnabled()) {
-				var excludedCertificates = certificates.Except(filteredCertificates);
-				Log.FilteredCertificates(ToCertificateDescription(filteredCertificates));
-				Log.ExcludedCertificates(ToCertificateDescription(excludedCertificates));
-			}
-
-			foreach (var certificate in filteredCertificates) {
-				RemoveCertificate(certificate, RemoveLocations.All);
-			}
-		}
-
-		public abstract bool IsTrusted(X509Certificate2 certificate);
-
-		protected abstract X509Certificate2 SaveCertificateCore(X509Certificate2 certificate, StoreName storeName,
-			StoreLocation storeLocation);
-
-		protected abstract void TrustCertificateCore(X509Certificate2 certificate);
-
-		protected abstract bool IsExportable(X509Certificate2 c);
-
-		protected abstract void RemoveCertificateFromTrustedRoots(X509Certificate2 certificate);
-
-		protected abstract IList<X509Certificate2> GetCertificatesToRemove(StoreName storeName,
-			StoreLocation storeLocation);
-
-		internal static void ExportCertificate(X509Certificate2 certificate, string path, bool includePrivateKey,
-			string password, CertificateKeyExportFormat format) {
-			if (Log.IsEnabled()) {
-				Log.ExportCertificateStart(GetDescription(certificate), path, includePrivateKey);
-			}
-
-			if (includePrivateKey && password == null) {
-				Log.NoPasswordForCertificate();
-			}
-
-			var targetDirectoryPath = Path.GetDirectoryName(path);
-			if (!string.IsNullOrEmpty(targetDirectoryPath)) {
-				Log.CreateExportCertificateDirectory(targetDirectoryPath);
-				Directory.CreateDirectory(targetDirectoryPath);
-			}
-
-			byte[] bytes;
-			byte[] keyBytes;
-			byte[] pemEnvelope = null;
-			RSA key = null;
-
-			try {
-				if (includePrivateKey) {
-					switch (format) {
-						case CertificateKeyExportFormat.Pfx:
-							bytes = certificate.ExportToPkcs12(password);
-							break;
-						case CertificateKeyExportFormat.Pem:
-							key = certificate.GetRSAPrivateKey()!;
-
-							char[] pem;
-							if (password != null) {
-								// TODO: cleanup cast: https://github.com/dotnet/aspnetcore/issues/41455
-								keyBytes = key.ExportEncryptedPkcs8PrivateKey((ReadOnlySpan<char>)password,
-									new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256,
-										100000));
-								pem = PemEncoding.Write("ENCRYPTED PRIVATE KEY", keyBytes);
-								pemEnvelope = Encoding.ASCII.GetBytes(pem);
-							} else {
-								// Export the key first to an encrypted PEM to avoid issues with System.Security.Cryptography.Cng indicating that the operation is not supported.
-								// This is likely by design to avoid exporting the key by mistake.
-								// To bypass it, we export the certificate to pem temporarily and then we import it and export it as unprotected PEM.
-								// TODO: cleanup cast: https://github.com/dotnet/aspnetcore/issues/41455
-								keyBytes = key.ExportEncryptedPkcs8PrivateKey((ReadOnlySpan<char>)"",
-									new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 1));
-								pem = PemEncoding.Write("ENCRYPTED PRIVATE KEY", keyBytes);
-								key.Dispose();
-								key = RSA.Create();
-								// TODO: cleanup cast: https://github.com/dotnet/aspnetcore/issues/41455
-								key.ImportFromEncryptedPem(pem, (ReadOnlySpan<char>)"");
-								Array.Clear(keyBytes, 0, keyBytes.Length);
-								Array.Clear(pem, 0, pem.Length);
-								keyBytes = key.ExportPkcs8PrivateKey();
-								pem = PemEncoding.Write("PRIVATE KEY", keyBytes);
-								pemEnvelope = Encoding.ASCII.GetBytes(pem);
-							}
-
-							Array.Clear(keyBytes, 0, keyBytes.Length);
-							Array.Clear(pem, 0, pem.Length);
-
-							bytes = Encoding.ASCII.GetBytes(PemEncoding.Write("CERTIFICATE",
-								certificate.Export(X509ContentType.Cert)));
-							break;
-						default:
-							throw new InvalidOperationException("Unknown format.");
-					}
-				} else {
-					if (format == CertificateKeyExportFormat.Pem) {
-						bytes = Encoding.ASCII.GetBytes(PemEncoding.Write("CERTIFICATE",
-							certificate.Export(X509ContentType.Cert)));
-					} else {
-						bytes = certificate.Export(X509ContentType.Cert);
-					}
-				}
-			} catch (Exception e) when (Log.IsEnabled()) {
-				Log.ExportCertificateError(e.ToString());
-				throw;
-			} finally {
-				key?.Dispose();
-			}
-
-			try {
-				Log.WriteCertificateToDisk(path);
-				File.WriteAllBytes(path, bytes);
-			} catch (Exception ex) when (Log.IsEnabled()) {
-				Log.WriteCertificateToDiskError(ex.ToString());
-				throw;
-			} finally {
-				Array.Clear(bytes, 0, bytes.Length);
-			}
-
-			if (includePrivateKey && format == CertificateKeyExportFormat.Pem) {
-				Debug.Assert(pemEnvelope != null);
-
-				try {
-					var keyPath = Path.ChangeExtension(path, ".key");
-					Log.WritePemKeyToDisk(keyPath);
-					File.WriteAllBytes(keyPath, pemEnvelope);
-				} catch (Exception ex) when (Log.IsEnabled()) {
-					Log.WritePemKeyToDiskError(ex.ToString());
-					throw;
-				} finally {
-					Array.Clear(pemEnvelope, 0, pemEnvelope.Length);
-				}
-			}
-		}
-
-		internal X509Certificate2 CreateDevelopmentCertificate(DateTimeOffset notBefore, DateTimeOffset notAfter) {
-			var subject = new X500DistinguishedName(Subject);
-			var extensions = new List<X509Extension>();
-			var sanBuilder = new SubjectAlternativeNameBuilder();
-			sanBuilder.AddDnsName(LocalhostHttpsDnsName);
-
-			var keyUsage =
-				new X509KeyUsageExtension(X509KeyUsageFlags.KeyEncipherment | X509KeyUsageFlags.DigitalSignature,
-					critical: true);
-			var enhancedKeyUsage = new X509EnhancedKeyUsageExtension(
-				new OidCollection() {
-					new Oid(
-						ServerAuthenticationEnhancedKeyUsageOid,
-						ServerAuthenticationEnhancedKeyUsageOidFriendlyName)
-				},
-				critical: true);
-
-			var basicConstraints = new X509BasicConstraintsExtension(
-				certificateAuthority: false,
-				hasPathLengthConstraint: false,
-				pathLengthConstraint: 0,
-				critical: true);
-
-			byte[] bytePayload;
-
-			if (EventStoreHttpsCertificateVersion != 0) {
-				bytePayload = new byte[1];
-				bytePayload[0] = (byte)EventStoreHttpsCertificateVersion;
-			} else {
-				bytePayload = Encoding.ASCII.GetBytes(EventStoreHttpsOidFriendlyName);
-			}
-
-			var aspNetHttpsExtension = new X509Extension(
-				new AsnEncodedData(
-					new Oid(EventStoreDbHttpsOid, EventStoreHttpsOidFriendlyName),
-					bytePayload),
-				critical: false);
-
-			extensions.Add(basicConstraints);
-			extensions.Add(keyUsage);
-			extensions.Add(enhancedKeyUsage);
-			extensions.Add(sanBuilder.Build(critical: true));
-			extensions.Add(aspNetHttpsExtension);
-
-			var certificate = CreateSelfSignedCertificate(subject, extensions, notBefore, notAfter);
-			return certificate;
-		}
-
-		internal X509Certificate2 SaveCertificate(X509Certificate2 certificate) {
-			var name = StoreName.My;
-			var location = StoreLocation.CurrentUser;
-
-			if (Log.IsEnabled()) {
-				Log.SaveCertificateInStoreStart(GetDescription(certificate), name, location);
-			}
-
-			certificate = SaveCertificateCore(certificate, name, location);
-
-			Log.SaveCertificateInStoreEnd();
-			return certificate;
-		}
-
-		public void TrustCertificate(X509Certificate2 certificate) {
-			try {
-				if (Log.IsEnabled()) {
-					Log.TrustCertificateStart(GetDescription(certificate));
-				}
-
-				TrustCertificateCore(certificate);
-				Log.TrustCertificateEnd();
-			} catch (Exception ex) when (Log.IsEnabled()) {
-				Log.TrustCertificateError(ex.ToString());
-				throw;
-			}
-		}
-
-		// Internal, for testing purposes only.
-		internal void RemoveAllCertificates(StoreName storeName, StoreLocation storeLocation) {
-			var certificates = GetCertificatesToRemove(storeName, storeLocation);
-			var certificatesWithName = certificates.Where(c => c.Subject == Subject);
-
-			var removeLocation = storeName == StoreName.My ? RemoveLocations.Local : RemoveLocations.Trusted;
-
-			foreach (var certificate in certificates) {
-				RemoveCertificate(certificate, removeLocation);
-			}
-
-			DisposeCertificates(certificates);
-		}
-
-		internal void RemoveCertificate(X509Certificate2 certificate, RemoveLocations locations) {
-			switch (locations) {
-				case RemoveLocations.Undefined:
-					throw new InvalidOperationException(
-						$"'{nameof(RemoveLocations.Undefined)}' is not a valid location.");
-				case RemoveLocations.Local:
-					RemoveCertificateFromUserStore(certificate);
-					break;
-				case RemoveLocations.Trusted:
-					RemoveCertificateFromTrustedRoots(certificate);
-					break;
-				case RemoveLocations.All:
-					RemoveCertificateFromTrustedRoots(certificate);
-					RemoveCertificateFromUserStore(certificate);
-					break;
-				default:
-					throw new InvalidOperationException("Invalid location.");
-			}
-		}
-
-		internal abstract CheckCertificateStateResult CheckCertificateState(X509Certificate2 candidate,
-			bool interactive);
-
-		internal abstract void CorrectCertificateState(X509Certificate2 candidate);
-
-		internal static X509Certificate2 CreateSelfSignedCertificate(
-			X500DistinguishedName subject,
-			IEnumerable<X509Extension> extensions,
-			DateTimeOffset notBefore,
-			DateTimeOffset notAfter) {
-			using var key = CreateKeyMaterial(RSAMinimumKeySizeInBits);
-
-			var request = new CertificateRequest(subject, key, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
-			foreach (var extension in extensions) {
-				request.CertificateExtensions.Add(extension);
-			}
-
-			var result = request.CreateSelfSigned(notBefore, notAfter);
-			return result;
-
-			static RSA CreateKeyMaterial(int minimumKeySize) {
-				var rsa = RSA.Create(minimumKeySize);
-				if (rsa.KeySize < minimumKeySize) {
-					throw new InvalidOperationException($"Failed to create a key with a size of {minimumKeySize} bits");
-				}
-
-				return rsa;
-			}
-		}
-
-		internal static void DisposeCertificates(IEnumerable<X509Certificate2> disposables) {
-			foreach (var disposable in disposables) {
-				try {
-					disposable.Dispose();
-				} catch {
-				}
-			}
-		}
-
-		private static void RemoveCertificateFromUserStore(X509Certificate2 certificate) {
-			try {
-				if (Log.IsEnabled()) {
-					Log.RemoveCertificateFromUserStoreStart(GetDescription(certificate));
-				}
-
-				using var store = new X509Store(StoreName.My, StoreLocation.CurrentUser);
-				store.Open(OpenFlags.ReadWrite);
-				var matching = store.Certificates
-					.OfType<X509Certificate2>()
-					.Single(c => c.SerialNumber == certificate.SerialNumber);
-
-				store.Remove(matching);
-				store.Close();
-				Log.RemoveCertificateFromUserStoreEnd();
-			} catch (Exception ex) when (Log.IsEnabled()) {
-				Log.RemoveCertificateFromUserStoreError(ex.ToString());
-				throw;
-			}
-		}
-
-		internal static string ToCertificateDescription(IEnumerable<X509Certificate2> certificates) {
-			var list = certificates.ToList();
-			var certificatesDescription = list.Count switch {
-				0 => "no certificates",
-				1 => "1 certificate",
-				_ => $"{list.Count} certificates",
-			};
-			var description = list.OrderBy(c => c.Thumbprint).Select((c, i) => $"    {i + 1}) " + GetDescription(c))
-				.Prepend(certificatesDescription);
-			return string.Join(Environment.NewLine, description);
-		}
-
-		internal static string GetDescription(X509Certificate2 c) =>
-			$"{c.Thumbprint} - {c.Subject} - Valid from {c.NotBefore:u} to {c.NotAfter:u} - IsEventStoreDevelopmentCertificate: {IsHttpsDevelopmentCertificate(c).ToString().ToLowerInvariant()} - IsExportable: {Instance.IsExportable(c).ToString().ToLowerInvariant()}";
-
-		[EventSource(Name = "eventstore-dev-certs")]
-		public sealed class CertificateManagerEventSource : EventSource {
-			[Event(1, Level = EventLevel.Verbose, Message = "Listing certificates from {0}\\{1}")]
-			[UnconditionalSuppressMessage("Trimming", "IL2026",
-				Justification = "Parameters passed to WriteEvent are all primitive values.")]
-			public void ListCertificatesStart(StoreLocation location, StoreName storeName) =>
-				WriteEvent(1, location, storeName);
-
-			[Event(2, Level = EventLevel.Verbose, Message = "Found certificates: {0}")]
-			public void DescribeFoundCertificates(string matchingCertificates) => WriteEvent(2, matchingCertificates);
-
-			[Event(3, Level = EventLevel.Verbose, Message = "Checking certificates validity")]
-			public void CheckCertificatesValidity() => WriteEvent(3);
-
-			[Event(4, Level = EventLevel.Verbose, Message = "Valid certificates: {0}")]
-			public void DescribeValidCertificates(string validCertificates) => WriteEvent(4, validCertificates);
-
-			[Event(5, Level = EventLevel.Verbose, Message = "Invalid certificates: {0}")]
-			public void DescribeInvalidCertificates(string invalidCertificates) => WriteEvent(5, invalidCertificates);
-
-			[Event(6, Level = EventLevel.Verbose, Message = "Finished listing certificates.")]
-			public void ListCertificatesEnd() => WriteEvent(6);
-
-			[Event(7, Level = EventLevel.Error, Message = "An error occurred while listing the certificates: {0}")]
-			public void ListCertificatesError(string e) => WriteEvent(7, e);
-
-			[Event(8, Level = EventLevel.Verbose, Message = "Filtered certificates: {0}")]
-			public void FilteredCertificates(string filteredCertificates) => WriteEvent(8, filteredCertificates);
-
-			[Event(9, Level = EventLevel.Verbose, Message = "Excluded certificates: {0}")]
-			public void ExcludedCertificates(string excludedCertificates) => WriteEvent(9, excludedCertificates);
-
-			[Event(14, Level = EventLevel.Verbose, Message = "Valid certificates: {0}")]
-			public void ValidCertificatesFound(string certificates) => WriteEvent(14, certificates);
-
-			[Event(15, Level = EventLevel.Verbose, Message = "Selected certificate: {0}")]
-			public void SelectedCertificate(string certificate) => WriteEvent(15, certificate);
-
-			[Event(16, Level = EventLevel.Verbose, Message = "No valid certificates found.")]
-			public void NoValidCertificatesFound() => WriteEvent(16);
-
-			[Event(17, Level = EventLevel.Verbose, Message = "Generating HTTPS development certificate.")]
-			public void CreateDevelopmentCertificateStart() => WriteEvent(17);
-
-			[Event(18, Level = EventLevel.Verbose, Message = "Finished generating HTTPS development certificate.")]
-			public void CreateDevelopmentCertificateEnd() => WriteEvent(18);
-
-			[Event(19, Level = EventLevel.Error, Message = "An error has occurred generating the certificate: {0}.")]
-			public void CreateDevelopmentCertificateError(string e) => WriteEvent(19, e);
-
-			[Event(20, Level = EventLevel.Verbose, Message = "Saving certificate '{0}' to store {2}\\{1}.")]
-			[UnconditionalSuppressMessage("Trimming", "IL2026",
-				Justification = "Parameters passed to WriteEvent are all primitive values.")]
-			public void SaveCertificateInStoreStart(string certificate, StoreName name, StoreLocation location) =>
-				WriteEvent(20, certificate, name, location);
-
-			[Event(21, Level = EventLevel.Verbose, Message = "Finished saving certificate to the store.")]
-			public void SaveCertificateInStoreEnd() => WriteEvent(21);
-
-			[Event(22, Level = EventLevel.Error, Message = "An error has occurred saving the certificate: {0}.")]
-			public void SaveCertificateInStoreError(string e) => WriteEvent(22, e);
-
-			[Event(23, Level = EventLevel.Verbose, Message = "Saving certificate '{0}' to {1} {2} private key.")]
-			public void ExportCertificateStart(string certificate, string path, bool includePrivateKey) =>
-				WriteEvent(23, certificate, path, includePrivateKey ? "with" : "without");
-
-			[Event(24, Level = EventLevel.Verbose, Message = "Exporting certificate with private key but no password.")]
-			public void NoPasswordForCertificate() => WriteEvent(24);
-
-			[Event(25, Level = EventLevel.Verbose, Message = "Creating directory {0}.")]
-			public void CreateExportCertificateDirectory(string path) => WriteEvent(25, path);
-
-			[Event(26, Level = EventLevel.Error,
-				Message = "An error has occurred while exporting the certificate: {0}.")]
-			public void ExportCertificateError(string error) => WriteEvent(26, error);
-
-			[Event(27, Level = EventLevel.Verbose, Message = "Writing the certificate to: {0}.")]
-			public void WriteCertificateToDisk(string path) => WriteEvent(27, path);
-
-			[Event(28, Level = EventLevel.Error,
-				Message = "An error has occurred while writing the certificate to disk: {0}.")]
-			public void WriteCertificateToDiskError(string error) => WriteEvent(28, error);
-
-			[Event(29, Level = EventLevel.Verbose, Message = "Trusting the certificate to: {0}.")]
-			public void TrustCertificateStart(string certificate) => WriteEvent(29, certificate);
-
-			[Event(30, Level = EventLevel.Verbose, Message = "Finished trusting the certificate.")]
-			public void TrustCertificateEnd() => WriteEvent(30);
-
-			[Event(31, Level = EventLevel.Error,
-				Message = "An error has occurred while trusting the certificate: {0}.")]
-			public void TrustCertificateError(string error) => WriteEvent(31, error);
-
-			[Event(32, Level = EventLevel.Verbose, Message = "Running the trust command {0}.")]
-			public void MacOSTrustCommandStart(string command) => WriteEvent(32, command);
-
-			[Event(33, Level = EventLevel.Verbose, Message = "Finished running the trust command.")]
-			public void MacOSTrustCommandEnd() => WriteEvent(33);
-
-			[Event(34, Level = EventLevel.Warning,
-				Message = "An error has occurred while running the trust command: {0}.")]
-			public void MacOSTrustCommandError(int exitCode) => WriteEvent(34, exitCode);
-
-			[Event(35, Level = EventLevel.Verbose, Message = "Running the remove trust command for {0}.")]
-			public void MacOSRemoveCertificateTrustRuleStart(string certificate) => WriteEvent(35, certificate);
-
-			[Event(36, Level = EventLevel.Verbose, Message = "Finished running the remove trust command.")]
-			public void MacOSRemoveCertificateTrustRuleEnd() => WriteEvent(36);
-
-			[Event(37, Level = EventLevel.Warning,
-				Message = "An error has occurred while running the remove trust command: {0}.")]
-			public void MacOSRemoveCertificateTrustRuleError(int exitCode) => WriteEvent(37, exitCode);
-
-			[Event(38, Level = EventLevel.Verbose, Message = "The certificate is not trusted: {0}.")]
-			public void MacOSCertificateUntrusted(string certificate) => WriteEvent(38, certificate);
-
-			[Event(39, Level = EventLevel.Verbose, Message = "Removing the certificate from the keychain {0} {1}.")]
-			public void MacOSRemoveCertificateFromKeyChainStart(string keyChain, string certificate) =>
-				WriteEvent(39, keyChain, certificate);
-
-			[Event(40, Level = EventLevel.Verbose, Message = "Finished removing the certificate from the keychain.")]
-			public void MacOSRemoveCertificateFromKeyChainEnd() => WriteEvent(40);
-
-			[Event(41, Level = EventLevel.Warning,
-				Message = "An error has occurred while running the remove trust command: {0}.")]
-			public void MacOSRemoveCertificateFromKeyChainError(int exitCode) => WriteEvent(41, exitCode);
-
-			[Event(42, Level = EventLevel.Verbose, Message = "Removing the certificate from the user store {0}.")]
-			public void RemoveCertificateFromUserStoreStart(string certificate) => WriteEvent(42, certificate);
-
-			[Event(43, Level = EventLevel.Verbose, Message = "Finished removing the certificate from the user store.")]
-			public void RemoveCertificateFromUserStoreEnd() => WriteEvent(43);
-
-			[Event(44, Level = EventLevel.Error,
-				Message = "An error has occurred while removing the certificate from the user store: {0}.")]
-			public void RemoveCertificateFromUserStoreError(string error) => WriteEvent(44, error);
-
-			[Event(45, Level = EventLevel.Verbose,
-				Message = "Adding certificate to the trusted root certification authority store.")]
-			public void WindowsAddCertificateToRootStore() => WriteEvent(45);
-
-			[Event(46, Level = EventLevel.Verbose, Message = "The certificate is already trusted.")]
-			public void WindowsCertificateAlreadyTrusted() => WriteEvent(46);
-
-			[Event(47, Level = EventLevel.Verbose, Message = "Trusting the certificate was cancelled by the user.")]
-			public void WindowsCertificateTrustCanceled() => WriteEvent(47);
-
-			[Event(48, Level = EventLevel.Verbose,
-				Message = "Removing the certificate from the trusted root certification authority store.")]
-			public void WindowsRemoveCertificateFromRootStoreStart() => WriteEvent(48);
-
-			[Event(49, Level = EventLevel.Verbose,
-				Message = "Finished removing the certificate from the trusted root certification authority store.")]
-			public void WindowsRemoveCertificateFromRootStoreEnd() => WriteEvent(49);
-
-			[Event(50, Level = EventLevel.Verbose, Message = "The certificate was not trusted.")]
-			public void WindowsRemoveCertificateFromRootStoreNotFound() => WriteEvent(50);
-
-			[Event(51, Level = EventLevel.Verbose, Message = "Correcting the the certificate state for '{0}'.")]
-			public void CorrectCertificateStateStart(string certificate) => WriteEvent(51, certificate);
-
-			[Event(52, Level = EventLevel.Verbose, Message = "Finished correcting the certificate state.")]
-			public void CorrectCertificateStateEnd() => WriteEvent(52);
-
-			[Event(53, Level = EventLevel.Error,
-				Message = "An error has occurred while correcting the certificate state: {0}.")]
-			public void CorrectCertificateStateError(string error) => WriteEvent(53, error);
-
-			[Event(54, Level = EventLevel.Verbose, Message = "Importing the certificate {1} to the keychain '{0}'.")]
-			internal void MacOSAddCertificateToKeyChainStart(string keychain, string certificate) =>
-				WriteEvent(54, keychain, certificate);
-
-			[Event(55, Level = EventLevel.Verbose, Message = "Finished importing the certificate to the keychain.")]
-			internal void MacOSAddCertificateToKeyChainEnd() => WriteEvent(55);
-
-			[Event(56, Level = EventLevel.Error,
-				Message = "An error has occurred while importing the certificate to the keychain: {0}.")]
-			internal void MacOSAddCertificateToKeyChainError(int exitCode) => WriteEvent(56, exitCode);
-
-			[Event(57, Level = EventLevel.Verbose, Message = "Writing the certificate to: {0}.")]
-			public void WritePemKeyToDisk(string path) => WriteEvent(57, path);
-
-			[Event(58, Level = EventLevel.Error,
-				Message = "An error has occurred while writing the certificate to disk: {0}.")]
-			public void WritePemKeyToDiskError(string error) => WriteEvent(58, error);
-
-			[Event(59, Level = EventLevel.Error, Message = "The file '{0}' does not exist.")]
-			internal void ImportCertificateMissingFile(string certificatePath) => WriteEvent(59, certificatePath);
-
-			[Event(60, Level = EventLevel.Error, Message = "One or more HTTPS certificates exist '{0}'.")]
-			internal void ImportCertificateExistingCertificates(string certificateDescription) =>
-				WriteEvent(60, certificateDescription);
-
-			[Event(61, Level = EventLevel.Verbose, Message = "Loading certificate from path '{0}'.")]
-			internal void LoadCertificateStart(string certificatePath) => WriteEvent(61, certificatePath);
-
-			[Event(62, Level = EventLevel.Verbose, Message = "The certificate '{0}' has been loaded successfully.")]
-			internal void LoadCertificateEnd(string description) => WriteEvent(62, description);
-
-			[Event(63, Level = EventLevel.Error,
-				Message = "An error has occurred while loading the certificate from disk: {0}.")]
-			internal void LoadCertificateError(string error) => WriteEvent(63, error);
-
-			[Event(64, Level = EventLevel.Error,
-				Message = "The provided certificate '{0}' is not a valid Event Store HTTPS development certificate.")]
-			internal void NoHttpsDevelopmentCertificate(string description) => WriteEvent(64, description);
-		}
-
-		internal sealed class UserCancelledTrustException : Exception {
-		}
-
-		internal readonly struct CheckCertificateStateResult {
-			public bool Success { get; }
-			public string FailureMessage { get; }
-
-			public CheckCertificateStateResult(bool success, string failureMessage) {
-				Success = success;
-				FailureMessage = failureMessage;
-			}
-		}
-
-		internal enum RemoveLocations {
-			Undefined,
-			Local,
-			Trusted,
-			All
-		}
-	}
-}
diff --git a/src/EventStore.Common/DevCertificates/CertificatePurpose.cs b/src/EventStore.Common/DevCertificates/CertificatePurpose.cs
deleted file mode 100644
index b02dce19174..00000000000
--- a/src/EventStore.Common/DevCertificates/CertificatePurpose.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.Common.DevCertificates {
-	internal enum CertificatePurpose {
-		All,
-		HTTPS
-	}
-}
diff --git a/src/EventStore.Common/DevCertificates/EnsureCertificateResult.cs b/src/EventStore.Common/DevCertificates/EnsureCertificateResult.cs
deleted file mode 100644
index 9feb7df9489..00000000000
--- a/src/EventStore.Common/DevCertificates/EnsureCertificateResult.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace EventStore.Common.DevCertificates {
-	public enum EnsureCertificateResult {
-		Succeeded = 1,
-		ValidCertificatePresent,
-		ErrorCreatingTheCertificate,
-		ErrorSavingTheCertificateIntoTheCurrentUserPersonalStore,
-		ErrorExportingTheCertificate,
-		FailedToTrustTheCertificate,
-		UserCancelledTrustStep,
-		FailedToMakeKeyAccessible,
-	}
-}
diff --git a/src/EventStore.Common/DevCertificates/ImportCertificateResult.cs b/src/EventStore.Common/DevCertificates/ImportCertificateResult.cs
deleted file mode 100644
index e16f2d6e5c9..00000000000
--- a/src/EventStore.Common/DevCertificates/ImportCertificateResult.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace EventStore.Common.DevCertificates {
-	public enum ImportCertificateResult {
-		Succeeded = 1,
-		CertificateFileMissing,
-		InvalidCertificate,
-		NoDevelopmentHttpsCertificate,
-		ExistingCertificatesPresent,
-		ErrorSavingTheCertificateIntoTheCurrentUserPersonalStore,
-	}
-}
diff --git a/src/EventStore.Common/DevCertificates/MacOSCertificateManager.cs b/src/EventStore.Common/DevCertificates/MacOSCertificateManager.cs
deleted file mode 100644
index 63451f2ea76..00000000000
--- a/src/EventStore.Common/DevCertificates/MacOSCertificateManager.cs
+++ /dev/null
@@ -1,299 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Runtime;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
-using System.Text.RegularExpressions;
-using EventStore.Common.Utils;
-
-namespace EventStore.Common.DevCertificates {
-
-	internal sealed class MacOSCertificateManager : CertificateManager {
-		private const string CertificateSubjectRegex = "CN=(.*[^,]+).*";
-
-		private static readonly string MacOSUserKeyChain =
-            $"{RuntimeInformation.HomeFolder}/Library/Keychains/login.keychain-db";
-
-		private const string MacOSSystemKeyChain = "/Library/Keychains/System.keychain";
-		private const string MacOSFindCertificateCommandLine = "security";
-
-		private const string MacOSFindCertificateCommandLineArgumentsFormat =
-			"find-certificate -c {0} -a -Z -p " + MacOSSystemKeyChain;
-
-		private const string MacOSFindCertificateOutputRegex = "SHA-1 hash: ([0-9A-Z]+)";
-		private const string MacOSRemoveCertificateTrustCommandLine = "sudo";
-
-		private const string MacOSRemoveCertificateTrustCommandLineArgumentsFormat =
-			"security remove-trusted-cert -d {0}";
-
-		private const string MacOSDeleteCertificateCommandLine = "sudo";
-
-		private const string MacOSDeleteCertificateCommandLineArgumentsFormat =
-			"security delete-certificate -Z {0} {1}";
-
-		private const string MacOSTrustCertificateCommandLine = "sudo";
-
-		private const string MacOSTrustCertificateCommandLineArguments =
-			"security add-trusted-cert -d -r trustRoot -k " + MacOSSystemKeyChain + " ";
-
-		private const string MacOSAddCertificateToKeyChainCommandLine = "security";
-
-		private static readonly string MacOSAddCertificateToKeyChainCommandLineArgumentsFormat =
-			"import {0} -k " + MacOSUserKeyChain + " -t cert -f pkcs12 -P {1} -A";
-
-		public const string InvalidCertificateState =
-			"The ASP.NET Core developer certificate is in an invalid state. " +
-			"To fix this issue, run the following commands 'dotnet dev-certs https --clean' and 'dotnet dev-certs https' to remove all existing ASP.NET Core development certificates " +
-			"and create a new untrusted developer certificate. " +
-			"On macOS or Windows, use 'dotnet dev-certs https --trust' to trust the new certificate.";
-
-		public const string KeyNotAccessibleWithoutUserInteraction =
-			"The application is trying to access the ASP.NET Core developer certificate key. " +
-			"A prompt might appear to ask for permission to access the key. " +
-			"When that happens, select 'Always Allow' to grant 'dotnet' access to the certificate key in the future.";
-
-		private static readonly TimeSpan MaxRegexTimeout = TimeSpan.FromMinutes(1);
-
-		public MacOSCertificateManager() {
-		}
-
-		internal MacOSCertificateManager(string subject, int version)
-			: base(subject, version) {
-		}
-
-		protected override void TrustCertificateCore(X509Certificate2 publicCertificate) {
-			var tmpFile = Path.GetTempFileName();
-			try {
-				ExportCertificate(publicCertificate, tmpFile, includePrivateKey: false, password: null,
-					CertificateKeyExportFormat.Pfx);
-				if (Log.IsEnabled()) {
-					Log.MacOSTrustCommandStart(
-						$"{MacOSTrustCertificateCommandLine} {MacOSTrustCertificateCommandLineArguments}{tmpFile}");
-				}
-
-				using (var process = Process.Start(MacOSTrustCertificateCommandLine,
-					       MacOSTrustCertificateCommandLineArguments + tmpFile)) {
-					process.WaitForExit();
-					if (process.ExitCode != 0) {
-						Log.MacOSTrustCommandError(process.ExitCode);
-						throw new InvalidOperationException("There was an error trusting the certificate.");
-					}
-				}
-
-				Log.MacOSTrustCommandEnd();
-			} finally {
-				try {
-					if (File.Exists(tmpFile)) {
-						File.Delete(tmpFile);
-					}
-				} catch {
-					// We don't care if we can't delete the temp file.
-				}
-			}
-		}
-
-		internal override CheckCertificateStateResult CheckCertificateState(X509Certificate2 candidate,
-			bool interactive) {
-			var sentinelPath = Path.Combine(RuntimeInformation.HomeFolder, ".dotnet",
-				$"certificates.{candidate.GetCertHashString(HashAlgorithmName.SHA256)}.sentinel");
-			if (!interactive && !File.Exists(sentinelPath)) {
-				return new CheckCertificateStateResult(false, KeyNotAccessibleWithoutUserInteraction);
-			}
-
-			// Tries to use the certificate key to validate it can't access it
-			try {
-				using var rsa = candidate.GetRSAPrivateKey();
-				if (rsa == null) {
-					return new CheckCertificateStateResult(false, InvalidCertificateState);
-				}
-
-				// Encrypting a random value is the ultimate test for a key validity.
-				// Windows and Mac OS both return HasPrivateKey = true if there is (or there has been) a private key associated
-				// with the certificate at some point.
-				var value = new byte[32];
-				RandomNumberGenerator.Fill(value);
-				rsa.Decrypt(rsa.Encrypt(value, RSAEncryptionPadding.Pkcs1), RSAEncryptionPadding.Pkcs1);
-
-				// If we were able to access the key, create a sentinel so that we don't have to show a prompt
-				// on every kestrel run.
-				if (Directory.Exists(Path.GetDirectoryName(sentinelPath)) && !File.Exists(sentinelPath)) {
-					File.WriteAllText(sentinelPath, "true");
-				}
-
-				// Being able to encrypt and decrypt a payload is the strongest guarantee that the key is valid.
-				return new CheckCertificateStateResult(true, null);
-			} catch (Exception) {
-				return new CheckCertificateStateResult(false, InvalidCertificateState);
-			}
-		}
-
-		internal override void CorrectCertificateState(X509Certificate2 candidate) {
-			var status = CheckCertificateState(candidate, true);
-			if (!status.Success) {
-				throw new InvalidOperationException(InvalidCertificateState);
-			}
-		}
-
-		public override bool IsTrusted(X509Certificate2 certificate) {
-			var subjectMatch = Regex.Match(certificate.Subject, CertificateSubjectRegex, RegexOptions.Singleline,
-				MaxRegexTimeout);
-			if (!subjectMatch.Success) {
-				throw new InvalidOperationException(
-					$"Can't determine the subject for the certificate with subject '{certificate.Subject}'.");
-			}
-
-			var subject = subjectMatch.Groups[1].Value;
-			using var checkTrustProcess = Process.Start(new ProcessStartInfo(
-				MacOSFindCertificateCommandLine,
-				string.Format(CultureInfo.InvariantCulture, MacOSFindCertificateCommandLineArgumentsFormat, subject)) {
-				RedirectStandardOutput = true
-			});
-			var output = checkTrustProcess!.StandardOutput.ReadToEnd();
-			checkTrustProcess.WaitForExit();
-			var matches = Regex.Matches(output, MacOSFindCertificateOutputRegex, RegexOptions.Multiline,
-				MaxRegexTimeout);
-			var hashes = matches.OfType<Match>().Select(m => m.Groups[1].Value).ToList();
-			return hashes.Any(h => string.Equals(h, certificate.Thumbprint, StringComparison.Ordinal));
-		}
-
-		protected override void RemoveCertificateFromTrustedRoots(X509Certificate2 certificate) {
-			if (IsTrusted(certificate)) // On OSX this check just ensures its on the system keychain
-			{
-				// A trusted certificate in OSX is installed into the system keychain and
-				// as a "trust rule" applied to it.
-				// To remove the certificate we first need to remove the "trust rule" and then
-				// remove the certificate from the keychain.
-				// We don't care if we fail to remove the trust rule if
-				// for some reason the certificate became untrusted.
-				// Trying to remove the certificate from the keychain will fail if the certificate is
-				// trusted.
-				try {
-					RemoveCertificateTrustRule(certificate);
-				} catch {
-				}
-
-				RemoveCertificateFromKeyChain(MacOSSystemKeyChain, certificate);
-			} else {
-				Log.MacOSCertificateUntrusted(GetDescription(certificate));
-			}
-		}
-
-		private static void RemoveCertificateTrustRule(X509Certificate2 certificate) {
-			Log.MacOSRemoveCertificateTrustRuleStart(GetDescription(certificate));
-			var certificatePath = Path.GetTempFileName();
-			try {
-				var certBytes = certificate.Export(X509ContentType.Cert);
-				File.WriteAllBytes(certificatePath, certBytes);
-				var processInfo = new ProcessStartInfo(
-					MacOSRemoveCertificateTrustCommandLine,
-					string.Format(
-						CultureInfo.InvariantCulture,
-						MacOSRemoveCertificateTrustCommandLineArgumentsFormat,
-						certificatePath
-					));
-				using var process = Process.Start(processInfo);
-				process!.WaitForExit();
-				if (process.ExitCode != 0) {
-					Log.MacOSRemoveCertificateTrustRuleError(process.ExitCode);
-				}
-
-				Log.MacOSRemoveCertificateTrustRuleEnd();
-			} finally {
-				try {
-					if (File.Exists(certificatePath)) {
-						File.Delete(certificatePath);
-					}
-				} catch {
-					// We don't care about failing to do clean-up on a temp file.
-				}
-			}
-		}
-
-		private static void RemoveCertificateFromKeyChain(string keyChain, X509Certificate2 certificate) {
-			var processInfo = new ProcessStartInfo(
-				MacOSDeleteCertificateCommandLine,
-				string.Format(
-					CultureInfo.InvariantCulture,
-					MacOSDeleteCertificateCommandLineArgumentsFormat,
-					certificate.Thumbprint.ToUpperInvariant(),
-					keyChain
-				)) {
-				RedirectStandardOutput = true,
-				RedirectStandardError = true
-			};
-
-			if (Log.IsEnabled()) {
-				Log.MacOSRemoveCertificateFromKeyChainStart(keyChain, GetDescription(certificate));
-			}
-
-			using (var process = Process.Start(processInfo)) {
-				var output = process!.StandardOutput.ReadToEnd() + process.StandardError.ReadToEnd();
-				process.WaitForExit();
-
-				if (process.ExitCode != 0) {
-					Log.MacOSRemoveCertificateFromKeyChainError(process.ExitCode);
-					throw new InvalidOperationException(
-						$@"There was an error removing the certificate with thumbprint '{certificate.Thumbprint}'.
-{output}");
-				}
-			}
-
-			Log.MacOSRemoveCertificateFromKeyChainEnd();
-		}
-
-		// We don't have a good way of checking on the underlying implementation if ti is exportable, so just return true.
-		protected override bool IsExportable(X509Certificate2 c) => true;
-
-		protected override X509Certificate2 SaveCertificateCore(X509Certificate2 certificate, StoreName storeName,
-			StoreLocation storeLocation) {
-			// security import https.pfx -k $loginKeyChain -t cert -f pkcs12 -P password -A;
-			var passwordBytes = new byte[48];
-			RandomNumberGenerator.Fill(passwordBytes.AsSpan()[0..35]);
-			var password = Convert.ToBase64String(passwordBytes, 0, 36);
-			var certBytes = certificate.ExportToPkcs12(password);
-			var certificatePath = Path.GetTempFileName();
-			File.WriteAllBytes(certificatePath, certBytes);
-
-			var processInfo = new ProcessStartInfo(
-				MacOSAddCertificateToKeyChainCommandLine,
-				string.Format(
-					CultureInfo.InvariantCulture,
-					MacOSAddCertificateToKeyChainCommandLineArgumentsFormat,
-					certificatePath,
-					password
-				)) {
-				RedirectStandardOutput = true,
-				RedirectStandardError = true
-			};
-
-			if (Log.IsEnabled()) {
-				Log.MacOSAddCertificateToKeyChainStart(MacOSUserKeyChain, GetDescription(certificate));
-			}
-
-			using (var process = Process.Start(processInfo)) {
-				var output = process!.StandardOutput.ReadToEnd() + process.StandardError.ReadToEnd();
-				process.WaitForExit();
-
-				if (process.ExitCode != 0) {
-					Log.MacOSAddCertificateToKeyChainError(process.ExitCode);
-					throw new InvalidOperationException(
-						$@"There was an error importing the certificate into the user key chain '{certificate.Thumbprint}'.
-{output}");
-				}
-			}
-
-			Log.MacOSAddCertificateToKeyChainEnd();
-
-			return certificate;
-		}
-
-		protected override IList<X509Certificate2> GetCertificatesToRemove(StoreName storeName,
-			StoreLocation storeLocation) {
-			return ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: false);
-		}
-	}
-}
diff --git a/src/EventStore.Common/DevCertificates/UnixCertificateManager.cs b/src/EventStore.Common/DevCertificates/UnixCertificateManager.cs
deleted file mode 100644
index f5412da2ba7..00000000000
--- a/src/EventStore.Common/DevCertificates/UnixCertificateManager.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Cryptography.X509Certificates;
-using EventStore.Common.Utils;
-
-namespace EventStore.Common.DevCertificates {
-
-	internal sealed class UnixCertificateManager : CertificateManager {
-		public UnixCertificateManager() {
-		}
-
-		internal UnixCertificateManager(string subject, int version)
-			: base(subject, version) {
-		}
-
-		public override bool IsTrusted(X509Certificate2 certificate) => false;
-
-		protected override X509Certificate2 SaveCertificateCore(X509Certificate2 certificate, StoreName storeName,
-			StoreLocation storeLocation) {
-			var export = certificate.ExportToPkcs12(string.Empty);
-			certificate.Dispose();
-			certificate = new X509Certificate2(export, "",
-				X509KeyStorageFlags.PersistKeySet | X509KeyStorageFlags.Exportable);
-			Array.Clear(export, 0, export.Length);
-
-			using (var store = new X509Store(storeName, storeLocation)) {
-				store.Open(OpenFlags.ReadWrite);
-				store.Add(certificate);
-				store.Close();
-			}
-
-			;
-
-			return certificate;
-		}
-
-		internal override CheckCertificateStateResult CheckCertificateState(X509Certificate2 candidate,
-			bool interactive) {
-			// Return true as we don't perform any check.
-			return new CheckCertificateStateResult(true, null);
-		}
-
-		internal override void CorrectCertificateState(X509Certificate2 candidate) {
-			// Do nothing since we don't have anything to check here.
-		}
-
-		protected override bool IsExportable(X509Certificate2 c) => true;
-
-		protected override void TrustCertificateCore(X509Certificate2 certificate) =>
-			throw new InvalidOperationException("Trusting the certificate is not supported on linux");
-
-		protected override void RemoveCertificateFromTrustedRoots(X509Certificate2 certificate) {
-			// No-op here as is benign
-		}
-
-		protected override IList<X509Certificate2> GetCertificatesToRemove(StoreName storeName,
-			StoreLocation storeLocation) {
-			return ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: false, requireExportable: false);
-		}
-	}
-}
diff --git a/src/EventStore.Common/DevCertificates/WindowsCertificateManager.cs b/src/EventStore.Common/DevCertificates/WindowsCertificateManager.cs
deleted file mode 100644
index 556ebcf619b..00000000000
--- a/src/EventStore.Common/DevCertificates/WindowsCertificateManager.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Versioning;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
-using EventStore.Common.Utils;
-
-namespace EventStore.Common.DevCertificates {
-
-	[SupportedOSPlatform("windows")]
-	internal sealed class WindowsCertificateManager : CertificateManager {
-		private const int UserCancelledErrorCode = 1223;
-
-		public WindowsCertificateManager() {
-		}
-
-		// For testing purposes only
-		internal WindowsCertificateManager(string subject, int version)
-			: base(subject, version) {
-		}
-
-		protected override bool IsExportable(X509Certificate2 c) {
-#if XPLAT
-        // For the first run experience we don't need to know if the certificate can be exported.
-        return true;
-#else
-			using var key = c.GetRSAPrivateKey();
-			return (key is RSACryptoServiceProvider rsaPrivateKey &&
-			        rsaPrivateKey.CspKeyContainerInfo.Exportable) ||
-			       (key is RSACng cngPrivateKey &&
-			       cngPrivateKey.Key.ExportPolicy.HasFlag(CngExportPolicies.AllowExport));
-#endif
-		}
-
-		internal override CheckCertificateStateResult CheckCertificateState(X509Certificate2 candidate,
-			bool interactive) {
-			// Return true as we don't perform any check.
-			return new CheckCertificateStateResult(true, null);
-		}
-
-		internal override void CorrectCertificateState(X509Certificate2 candidate) {
-			// Do nothing since we don't have anything to check here.
-		}
-
-		protected override X509Certificate2 SaveCertificateCore(X509Certificate2 certificate, StoreName storeName,
-			StoreLocation storeLocation) {
-			// On non OSX systems we need to export the certificate and import it so that the transient
-			// key that we generated gets persisted.
-			var export = certificate.ExportToPkcs12(string.Empty);
-			certificate.Dispose();
-			certificate = new X509Certificate2(export, "",
-				X509KeyStorageFlags.PersistKeySet | X509KeyStorageFlags.Exportable);
-			Array.Clear(export, 0, export.Length);
-			certificate.FriendlyName = EventStoreHttpsOidFriendlyName;
-
-			using (var store = new X509Store(storeName, storeLocation)) {
-				store.Open(OpenFlags.ReadWrite);
-				store.Add(certificate);
-				store.Close();
-			}
-
-			;
-
-			return certificate;
-		}
-
-		protected override void TrustCertificateCore(X509Certificate2 certificate) {
-			using var publicCertificate = new X509Certificate2(certificate.Export(X509ContentType.Cert));
-
-			publicCertificate.FriendlyName = certificate.FriendlyName;
-
-			using var store = new X509Store(StoreName.Root, StoreLocation.CurrentUser);
-
-			store.Open(OpenFlags.ReadWrite);
-			var existing = store.Certificates.Find(X509FindType.FindByThumbprint, publicCertificate.Thumbprint,
-				validOnly: false);
-			if (existing.Count > 0) {
-				Log.WindowsCertificateAlreadyTrusted();
-				DisposeCertificates(existing.OfType<X509Certificate2>());
-				return;
-			}
-
-			try {
-				Log.WindowsAddCertificateToRootStore();
-				store.Add(publicCertificate);
-				store.Close();
-			} catch (CryptographicException exception) when (exception.HResult == UserCancelledErrorCode) {
-				Log.WindowsCertificateTrustCanceled();
-				throw new UserCancelledTrustException();
-			}
-		}
-
-		protected override void RemoveCertificateFromTrustedRoots(X509Certificate2 certificate) {
-			Log.WindowsRemoveCertificateFromRootStoreStart();
-			using var store = new X509Store(StoreName.Root, StoreLocation.CurrentUser);
-
-			store.Open(OpenFlags.ReadWrite);
-			var matching = store.Certificates
-				.OfType<X509Certificate2>()
-				.SingleOrDefault(c => c.SerialNumber == certificate.SerialNumber);
-
-			if (matching != null) {
-				store.Remove(matching);
-			} else {
-				Log.WindowsRemoveCertificateFromRootStoreNotFound();
-			}
-
-			store.Close();
-			Log.WindowsRemoveCertificateFromRootStoreEnd();
-		}
-
-		public override bool IsTrusted(X509Certificate2 certificate) {
-			return ListCertificates(StoreName.Root, StoreLocation.CurrentUser, isValid: true, requireExportable: false)
-				.Any(c => c.Thumbprint == certificate.Thumbprint);
-		}
-
-		protected override IList<X509Certificate2> GetCertificatesToRemove(StoreName storeName,
-			StoreLocation storeLocation) {
-			return ListCertificates(storeName, storeLocation, isValid: false);
-		}
-	}
-}
diff --git a/src/EventStore.Common/EventStore.Common.csproj b/src/EventStore.Common/EventStore.Common.csproj
deleted file mode 100644
index ad71543190d..00000000000
--- a/src/EventStore.Common/EventStore.Common.csproj
+++ /dev/null
@@ -1,46 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<GitVersion>false</GitVersion>
-	</PropertyGroup>
-	<ItemGroup>
-		<FrameworkReference Include="Microsoft.AspNetCore.App" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="GitInfo" Version="3.3.3">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-		</PackageReference>
-		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-
-		<PackageReference Include="Serilog" Version="4.0.1" />
-		<PackageReference Include="Serilog.Enrichers.Process" Version="3.0.0" />
-		<PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
-		<PackageReference Include="Serilog.Expressions" Version="5.0.0" />
-		<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
-		<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.2" />
-		<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
-		<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
-		<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
-
-		<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
-		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-		<PackageReference Include="YamlDotnet" Version="13.7.1" />
-		<!-- upgrade because of transitive dependency vulnerability https://github.com/advisories/GHSA-hh2w-p6rv-4g7w -->
-		<PackageReference Include="System.Text.Json" Version="8.0.4" />
-		<!-- upgrade because of transitive dependency vulnerability https://github.com/advisories/GHSA-447r-wph3-92pm -->
-		<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
-	</ItemGroup>
-	<ItemGroup>
-	  <None Update="Utils\version.properties">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </None>
-	</ItemGroup>
-	<ItemGroup>
-	  <ProjectReference Include="..\EventStore.SystemRuntime\EventStore.SystemRuntime.csproj" />
-	</ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/src/EventStore.Common/Exceptions/ApplicationInitializationException.cs b/src/EventStore.Common/Exceptions/ApplicationInitializationException.cs
deleted file mode 100644
index 715f40fddd9..00000000000
--- a/src/EventStore.Common/Exceptions/ApplicationInitializationException.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace EventStore.Common.Exceptions {
-	public class ApplicationInitializationException : Exception {
-		public ApplicationInitializationException(string message) : base(message) {
-		}
-
-		public ApplicationInitializationException(string message, Exception innerException) : base(message,
-			innerException) {
-		}
-	}
-}
diff --git a/src/EventStore.Common/Exceptions/InvalidConfigurationException.cs b/src/EventStore.Common/Exceptions/InvalidConfigurationException.cs
deleted file mode 100644
index 6b52ee2d37a..00000000000
--- a/src/EventStore.Common/Exceptions/InvalidConfigurationException.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System;
-
-namespace EventStore.Common.Exceptions {
-	public class InvalidConfigurationException : Exception {
-		public InvalidConfigurationException(string message) : base(message) { }
-	}
-}
diff --git a/src/EventStore.Common/Options/DbLogFormat.cs b/src/EventStore.Common/Options/DbLogFormat.cs
deleted file mode 100644
index 31e811d458a..00000000000
--- a/src/EventStore.Common/Options/DbLogFormat.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.Common.Options {
-	public enum DbLogFormat {
-		V2,
-		ExperimentalV3,
-	}
-}
diff --git a/src/EventStore.Common/Options/LogConsoleFormat.cs b/src/EventStore.Common/Options/LogConsoleFormat.cs
deleted file mode 100644
index ed310da4fbd..00000000000
--- a/src/EventStore.Common/Options/LogConsoleFormat.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.Common.Options {
-	public enum LogConsoleFormat {
-		Plain = 0,
-		Json = 1
-	}
-}
diff --git a/src/EventStore.Common/Options/LogLevel.cs b/src/EventStore.Common/Options/LogLevel.cs
deleted file mode 100644
index 510e514b234..00000000000
--- a/src/EventStore.Common/Options/LogLevel.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace EventStore.Common.Options {
-	public enum LogLevel {
-		Default = 0,
-		Verbose = 1,
-		Debug = 2,
-		Information = 3,
-		Warning = 4,
-		Error = 5,
-		Fatal = 6
-	}
-}
diff --git a/src/EventStore.Common/Options/ProjectionType.cs b/src/EventStore.Common/Options/ProjectionType.cs
deleted file mode 100644
index fdcf336574d..00000000000
--- a/src/EventStore.Common/Options/ProjectionType.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EventStore.Common.Options {
-	public enum ProjectionType {
-		None,
-		System,
-		All
-	}
-}
diff --git a/src/EventStore.Common/Properties/JetbrainsAnnotations.cs b/src/EventStore.Common/Properties/JetbrainsAnnotations.cs
deleted file mode 100644
index f74ffbbe65f..00000000000
--- a/src/EventStore.Common/Properties/JetbrainsAnnotations.cs
+++ /dev/null
@@ -1,627 +0,0 @@
-#pragma warning disable 1591
-// ReSharper disable UnusedMember.Global
-// ReSharper disable UnusedParameter.Local
-// ReSharper disable MemberCanBePrivate.Global
-// ReSharper disable UnusedAutoPropertyAccessor.Global
-// ReSharper disable IntroduceOptionalParameters.Global
-// ReSharper disable MemberCanBeProtected.Global
-// ReSharper disable InconsistentNaming
-
-// ReSharper disable once CheckNamespace
-namespace System {
-	/// <summary>
-	/// Indicates that the value of the marked element could be <c>null</c> sometimes,
-	/// so the check for <c>null</c> is necessary before its usage
-	/// </summary>
-	/// <example><code>
-	/// [CanBeNull] public object Test() { return null; }
-	/// public void UseTest() {
-	///   var p = Test();
-	///   var s = p.ToString(); // Warning: Possible 'System.NullReferenceException'
-	/// }
-	/// </code></example>
-	[AttributeUsage(
-		AttributeTargets.Method | AttributeTargets.Parameter |
-		AttributeTargets.Property | AttributeTargets.Delegate |
-		AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
-	internal sealed class CanBeNullAttribute : Attribute {
-	}
-
-	/// <summary>
-	/// Indicates that the value of the marked element could never be <c>null</c>
-	/// </summary>
-	/// <example><code>
-	/// [NotNull] public object Foo() {
-	///   return null; // Warning: Possible 'null' assignment
-	/// }
-	/// </code></example>
-	[AttributeUsage(
-		AttributeTargets.Method | AttributeTargets.Parameter |
-		AttributeTargets.Property | AttributeTargets.Delegate |
-		AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
-	internal sealed class NotNullAttribute : Attribute {
-	}
-
-	/// <summary>
-	/// Indicates that the marked method builds string by format pattern and (optional) arguments.
-	/// Parameter, which contains format string, should be given in constructor. The format string
-	/// should be in <see cref="string.Format(IFormatProvider,string,object[])"/>-like form
-	/// </summary>
-	/// <example><code>
-	/// [StringFormatMethod("message")]
-	/// public void ShowError(string message, params object[] args) { /* do something */ }
-	/// public void Foo() {
-	///   ShowError("Failed: {0}"); // Warning: Non-existing argument in format string
-	/// }
-	/// </code></example>
-	[AttributeUsage(
-		AttributeTargets.Constructor | AttributeTargets.Method,
-		AllowMultiple = false, Inherited = true)]
-	internal sealed class StringFormatMethodAttribute : Attribute {
-		/// <param name="formatParameterName">
-		/// Specifies which parameter of an annotated method should be treated as format-string
-		/// </param>
-		public StringFormatMethodAttribute(string formatParameterName) {
-			FormatParameterName = formatParameterName;
-		}
-
-		public string FormatParameterName { get; private set; }
-	}
-
-	/// <summary>
-	/// Indicates that the function argument should be string literal and match one
-	/// of the parameters of the caller function. For example, ReSharper annotates
-	/// the parameter of <see cref="System.ArgumentNullException"/>
-	/// </summary>
-	/// <example><code>
-	/// public void Foo(string param) {
-	///   if (param == null)
-	///     throw new ArgumentNullException("par"); // Warning: Cannot resolve symbol
-	/// }
-	/// </code></example>
-	[AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false, Inherited = true)]
-	internal sealed class InvokerParameterNameAttribute : Attribute {
-	}
-
-	/// <summary>
-	/// Indicates that the method is contained in a type that implements
-	/// <see cref="System.ComponentModel.INotifyPropertyChanged"/> interface
-	/// and this method is used to notify that some property value changed
-	/// </summary>
-	/// <remarks>
-	/// The method should be non-static and conform to one of the supported signatures:
-	/// <list>
-	/// <item><c>NotifyChanged(string)</c></item>
-	/// <item><c>NotifyChanged(params string[])</c></item>
-	/// <item><c>NotifyChanged{T}(Expression{Func{T}})</c></item>
-	/// <item><c>NotifyChanged{T,U}(Expression{Func{T,U}})</c></item>
-	/// <item><c>SetProperty{T}(ref T, T, string)</c></item>
-	/// </list>
-	/// </remarks>
-	/// <example><code>
-	/// public class Foo : INotifyPropertyChanged {
-	///   public event PropertyChangedEventHandler PropertyChanged;
-	///   [NotifyPropertyChangedInvocator]
-	///   protected virtual void NotifyChanged(string propertyName) { ... }
-	///
-	///   private string _name;
-	///   public string Name {
-	///     get { return _name; }
-	///     set { _name = value; NotifyChanged("LastName"); /* Warning */ }
-	///   }
-	/// }
-	/// </code>
-	/// Examples of generated notifications:
-	/// <list>
-	/// <item><c>NotifyChanged("Property")</c></item>
-	/// <item><c>NotifyChanged(() =&gt; Property)</c></item>
-	/// <item><c>NotifyChanged((VM x) =&gt; x.Property)</c></item>
-	/// <item><c>SetProperty(ref myField, value, "Property")</c></item>
-	/// </list>
-	/// </example>
-	[AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
-	internal sealed class NotifyPropertyChangedInvocatorAttribute : Attribute {
-		public NotifyPropertyChangedInvocatorAttribute() {
-		}
-
-		public NotifyPropertyChangedInvocatorAttribute(string parameterName) {
-			ParameterName = parameterName;
-		}
-
-		public string ParameterName { get; private set; }
-	}
-
-	/// <summary>
-	/// Describes dependency between method input and output
-	/// </summary>
-	/// <syntax>
-	/// <p>Function Definition Table syntax:</p>
-	/// <list>
-	/// <item>FDT      ::= FDTRow [;FDTRow]*</item>
-	/// <item>FDTRow   ::= Input =&gt; Output | Output &lt;= Input</item>
-	/// <item>Input    ::= ParameterName: Value [, Input]*</item>
-	/// <item>Output   ::= [ParameterName: Value]* {halt|stop|void|nothing|Value}</item>
-	/// <item>Value    ::= true | false | null | notnull | canbenull</item>
-	/// </list>
-	/// If method has single input parameter, it's name could be omitted.<br/>
-	/// Using <c>halt</c> (or <c>void</c>/<c>nothing</c>, which is the same)
-	/// for method output means that the methos doesn't return normally.<br/>
-	/// <c>canbenull</c> annotation is only applicable for output parameters.<br/>
-	/// You can use multiple <c>[ContractAnnotation]</c> for each FDT row,
-	/// or use single attribute with rows separated by semicolon.<br/>
-	/// </syntax>
-	/// <examples><list>
-	/// <item><code>
-	/// [ContractAnnotation("=> halt")]
-	/// public void TerminationMethod()
-	/// </code></item>
-	/// <item><code>
-	/// [ContractAnnotation("halt &lt;= condition: false")]
-	/// public void Assert(bool condition, string text) // regular assertion method
-	/// </code></item>
-	/// <item><code>
-	/// [ContractAnnotation("s:null => true")]
-	/// public bool IsNullOrEmpty(string s) // string.IsNullOrEmpty()
-	/// </code></item>
-	/// <item><code>
-	/// // A method that returns null if the parameter is null, and not null if the parameter is not null
-	/// [ContractAnnotation("null => null; notnull => notnull")]
-	/// public object Transform(object data) 
-	/// </code></item>
-	/// <item><code>
-	/// [ContractAnnotation("s:null=>false; =>true,result:notnull; =>false, result:null")]
-	/// public bool TryParse(string s, out Person result)
-	/// </code></item>
-	/// </list></examples>
-	[AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
-	internal sealed class ContractAnnotationAttribute : Attribute {
-		public ContractAnnotationAttribute([NotNull] string contract)
-			: this(contract, false) {
-		}
-
-		public ContractAnnotationAttribute([NotNull] string contract, bool forceFullStates) {
-			Contract = contract;
-			ForceFullStates = forceFullStates;
-		}
-
-		public string Contract { get; private set; }
-		public bool ForceFullStates { get; private set; }
-	}
-
-	/// <summary>
-	/// Indicates that marked element should be localized or not
-	/// </summary>
-	/// <example><code>
-	/// [LocalizationRequiredAttribute(true)]
-	/// public class Foo {
-	///   private string str = "my string"; // Warning: Localizable string
-	/// }
-	/// </code></example>
-	[AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = true)]
-	internal sealed class LocalizationRequiredAttribute : Attribute {
-		public LocalizationRequiredAttribute() : this(true) {
-		}
-
-		public LocalizationRequiredAttribute(bool required) {
-			Required = required;
-		}
-
-		public bool Required { get; private set; }
-	}
-
-	/// <summary>
-	/// Indicates that the value of the marked type (or its derivatives)
-	/// cannot be compared using '==' or '!=' operators and <c>Equals()</c>
-	/// should be used instead. However, using '==' or '!=' for comparison
-	/// with <c>null</c> is always permitted.
-	/// </summary>
-	/// <example><code>
-	/// [CannotApplyEqualityOperator]
-	/// class NoEquality { }
-	/// class UsesNoEquality {
-	///   public void Test() {
-	///     var ca1 = new NoEquality();
-	///     var ca2 = new NoEquality();
-	///     if (ca1 != null) { // OK
-	///       bool condition = ca1 == ca2; // Warning
-	///     }
-	///   }
-	/// }
-	/// </code></example>
-	[AttributeUsage(
-		AttributeTargets.Interface | AttributeTargets.Class |
-		AttributeTargets.Struct, AllowMultiple = false, Inherited = true)]
-	internal sealed class CannotApplyEqualityOperatorAttribute : Attribute {
-	}
-
-	/// <summary>
-	/// When applied to a target attribute, specifies a requirement for any type marked
-	/// with the target attribute to implement or inherit specific type or types.
-	/// </summary>
-	/// <example><code>
-	/// [BaseTypeRequired(typeof(IComponent)] // Specify requirement
-	/// public class ComponentAttribute : Attribute { }
-	/// [Component] // ComponentAttribute requires implementing IComponent interface
-	/// public class MyComponent : IComponent { }
-	/// </code></example>
-	[AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
-	[BaseTypeRequired(typeof(Attribute))]
-	internal sealed class BaseTypeRequiredAttribute : Attribute {
-		public BaseTypeRequiredAttribute([NotNull] Type baseType) {
-			BaseType = baseType;
-		}
-
-		[NotNull] public Type BaseType { get; private set; }
-	}
-
-	/// <summary>
-	/// Indicates that the marked symbol is used implicitly
-	/// (e.g. via reflection, in external library), so this symbol
-	/// will not be marked as unused (as well as by other usage inspections)
-	/// </summary>
-	[AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = true)]
-	internal sealed class UsedImplicitlyAttribute : Attribute {
-		public UsedImplicitlyAttribute()
-			: this(ImplicitUseKindFlags.Default, ImplicitUseTargetFlags.Default) {
-		}
-
-		public UsedImplicitlyAttribute(ImplicitUseKindFlags useKindFlags)
-			: this(useKindFlags, ImplicitUseTargetFlags.Default) {
-		}
-
-		public UsedImplicitlyAttribute(ImplicitUseTargetFlags targetFlags)
-			: this(ImplicitUseKindFlags.Default, targetFlags) {
-		}
-
-		public UsedImplicitlyAttribute(
-			ImplicitUseKindFlags useKindFlags, ImplicitUseTargetFlags targetFlags) {
-			UseKindFlags = useKindFlags;
-			TargetFlags = targetFlags;
-		}
-
-		public ImplicitUseKindFlags UseKindFlags { get; private set; }
-		public ImplicitUseTargetFlags TargetFlags { get; private set; }
-	}
-
-	/// <summary>
-	/// Should be used on attributes and causes ReSharper
-	/// to not mark symbols marked with such attributes as unused
-	/// (as well as by other usage inspections)
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
-	internal sealed class MeansImplicitUseAttribute : Attribute {
-		public MeansImplicitUseAttribute()
-			: this(ImplicitUseKindFlags.Default, ImplicitUseTargetFlags.Default) {
-		}
-
-		public MeansImplicitUseAttribute(ImplicitUseKindFlags useKindFlags)
-			: this(useKindFlags, ImplicitUseTargetFlags.Default) {
-		}
-
-		public MeansImplicitUseAttribute(ImplicitUseTargetFlags targetFlags)
-			: this(ImplicitUseKindFlags.Default, targetFlags) {
-		}
-
-		public MeansImplicitUseAttribute(
-			ImplicitUseKindFlags useKindFlags, ImplicitUseTargetFlags targetFlags) {
-			UseKindFlags = useKindFlags;
-			TargetFlags = targetFlags;
-		}
-
-		[UsedImplicitly] public ImplicitUseKindFlags UseKindFlags { get; private set; }
-		[UsedImplicitly] public ImplicitUseTargetFlags TargetFlags { get; private set; }
-	}
-
-	[Flags]
-	internal enum ImplicitUseKindFlags {
-		Default = Access | Assign | InstantiatedWithFixedConstructorSignature,
-
-		/// <summary>Only entity marked with attribute considered used</summary>
-		Access = 1,
-
-		/// <summary>Indicates implicit assignment to a member</summary>
-		Assign = 2,
-
-		/// <summary>
-		/// Indicates implicit instantiation of a type with fixed constructor signature.
-		/// That means any unused constructor parameters won't be reported as such.
-		/// </summary>
-		InstantiatedWithFixedConstructorSignature = 4,
-
-		/// <summary>Indicates implicit instantiation of a type</summary>
-		InstantiatedNoFixedConstructorSignature = 8,
-	}
-
-	/// <summary>
-	/// Specify what is considered used implicitly
-	/// when marked with <see cref="MeansImplicitUseAttribute"/>
-	/// or <see cref="UsedImplicitlyAttribute"/>
-	/// </summary>
-	[Flags]
-	internal enum ImplicitUseTargetFlags {
-		Default = Itself,
-		Itself = 1,
-
-		/// <summary>Members of entity marked with attribute are considered used</summary>
-		Members = 2,
-
-		/// <summary>Entity marked with attribute and all its members considered used</summary>
-		WithMembers = Itself | Members
-	}
-
-	/// <summary>
-	/// This attribute is intended to mark publicly available API
-	/// which should not be removed and so is treated as used
-	/// </summary>
-	[MeansImplicitUse]
-	internal sealed class PublicAPIAttribute : Attribute {
-		public PublicAPIAttribute() {
-		}
-
-		public PublicAPIAttribute([NotNull] string comment) {
-			Comment = comment;
-		}
-
-		[NotNull] public string Comment { get; private set; }
-	}
-
-	/// <summary>
-	/// Tells code analysis engine if the parameter is completely handled
-	/// when the invoked method is on stack. If the parameter is a delegate,
-	/// indicates that delegate is executed while the method is executed.
-	/// If the parameter is an enumerable, indicates that it is enumerated
-	/// while the method is executed
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Parameter, Inherited = true)]
-	internal sealed class InstantHandleAttribute : Attribute {
-	}
-
-	/// <summary>
-	/// Indicates that a method does not make any observable state changes.
-	/// The same as <c>System.Diagnostics.Contracts.PureAttribute</c>
-	/// </summary>
-	/// <example><code>
-	/// [Pure] private int Multiply(int x, int y) { return x * y; }
-	/// public void Foo() {
-	///   const int a = 2, b = 2;
-	///   Multiply(a, b); // Waring: Return value of pure method is not used
-	/// }
-	/// </code></example>
-	[AttributeUsage(AttributeTargets.Method, Inherited = true)]
-	internal sealed class PureAttribute : Attribute {
-	}
-
-	/// <summary>
-	/// Indicates that a parameter is a path to a file or a folder
-	/// within a web project. Path can be relative or absolute,
-	/// starting from web root (~)
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Parameter)]
-	internal class PathReferenceAttribute : Attribute {
-		public PathReferenceAttribute() {
-		}
-
-		public PathReferenceAttribute([PathReference] string basePath) {
-			BasePath = basePath;
-		}
-
-		[NotNull] public string BasePath { get; private set; }
-	}
-
-	// ASP.NET MVC attributes
-
-	[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
-	internal sealed class AspMvcAreaMasterLocationFormatAttribute : Attribute {
-		public AspMvcAreaMasterLocationFormatAttribute(string format) {
-		}
-	}
-
-	[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
-	internal sealed class AspMvcAreaPartialViewLocationFormatAttribute : Attribute {
-		public AspMvcAreaPartialViewLocationFormatAttribute(string format) {
-		}
-	}
-
-	[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
-	internal sealed class AspMvcAreaViewLocationFormatAttribute : Attribute {
-		public AspMvcAreaViewLocationFormatAttribute(string format) {
-		}
-	}
-
-	[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
-	internal sealed class AspMvcMasterLocationFormatAttribute : Attribute {
-		public AspMvcMasterLocationFormatAttribute(string format) {
-		}
-	}
-
-	[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
-	internal sealed class AspMvcPartialViewLocationFormatAttribute : Attribute {
-		public AspMvcPartialViewLocationFormatAttribute(string format) {
-		}
-	}
-
-	[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
-	internal sealed class AspMvcViewLocationFormatAttribute : Attribute {
-		public AspMvcViewLocationFormatAttribute(string format) {
-		}
-	}
-
-	/// <summary>
-	/// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter
-	/// is an MVC action. If applied to a method, the MVC action name is calculated
-	/// implicitly from the context. Use this attribute for custom wrappers similar to
-	/// <c>System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String)</c>
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
-	internal sealed class AspMvcActionAttribute : Attribute {
-		public AspMvcActionAttribute() {
-		}
-
-		public AspMvcActionAttribute([NotNull] string anonymousProperty) {
-			AnonymousProperty = anonymousProperty;
-		}
-
-		[NotNull] public string AnonymousProperty { get; private set; }
-	}
-
-	/// <summary>
-	/// ASP.NET MVC attribute. Indicates that a parameter is an MVC area.
-	/// Use this attribute for custom wrappers similar to
-	/// <c>System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String)</c>
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Parameter)]
-	internal sealed class AspMvcAreaAttribute : PathReferenceAttribute {
-		public AspMvcAreaAttribute() {
-		}
-
-		public AspMvcAreaAttribute([NotNull] string anonymousProperty) {
-			AnonymousProperty = anonymousProperty;
-		}
-
-		[NotNull] public string AnonymousProperty { get; private set; }
-	}
-
-	/// <summary>
-	/// ASP.NET MVC attribute. If applied to a parameter, indicates that
-	/// the parameter is an MVC controller. If applied to a method,
-	/// the MVC controller name is calculated implicitly from the context.
-	/// Use this attribute for custom wrappers similar to 
-	/// <c>System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String, String)</c>
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
-	internal sealed class AspMvcControllerAttribute : Attribute {
-		public AspMvcControllerAttribute() {
-		}
-
-		public AspMvcControllerAttribute([NotNull] string anonymousProperty) {
-			AnonymousProperty = anonymousProperty;
-		}
-
-		[NotNull] public string AnonymousProperty { get; private set; }
-	}
-
-	/// <summary>
-	/// ASP.NET MVC attribute. Indicates that a parameter is an MVC Master.
-	/// Use this attribute for custom wrappers similar to
-	/// <c>System.Web.Mvc.Controller.View(String, String)</c>
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Parameter)]
-	internal sealed class AspMvcMasterAttribute : Attribute {
-	}
-
-	/// <summary>
-	/// ASP.NET MVC attribute. Indicates that a parameter is an MVC model type.
-	/// Use this attribute for custom wrappers similar to
-	/// <c>System.Web.Mvc.Controller.View(String, Object)</c>
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Parameter)]
-	internal sealed class AspMvcModelTypeAttribute : Attribute {
-	}
-
-	/// <summary>
-	/// ASP.NET MVC attribute. If applied to a parameter, indicates that
-	/// the parameter is an MVC partial view. If applied to a method,
-	/// the MVC partial view name is calculated implicitly from the context.
-	/// Use this attribute for custom wrappers similar to
-	/// <c>System.Web.Mvc.Html.RenderPartialExtensions.RenderPartial(HtmlHelper, String)</c>
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
-	internal sealed class AspMvcPartialViewAttribute : PathReferenceAttribute {
-	}
-
-	/// <summary>
-	/// ASP.NET MVC attribute. Allows disabling all inspections
-	/// for MVC views within a class or a method.
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
-	internal sealed class AspMvcSupressViewErrorAttribute : Attribute {
-	}
-
-	/// <summary>
-	/// ASP.NET MVC attribute. Indicates that a parameter is an MVC display template.
-	/// Use this attribute for custom wrappers similar to 
-	/// <c>System.Web.Mvc.Html.DisplayExtensions.DisplayForModel(HtmlHelper, String)</c>
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Parameter)]
-	internal sealed class AspMvcDisplayTemplateAttribute : Attribute {
-	}
-
-	/// <summary>
-	/// ASP.NET MVC attribute. Indicates that a parameter is an MVC editor template.
-	/// Use this attribute for custom wrappers similar to
-	/// <c>System.Web.Mvc.Html.EditorExtensions.EditorForModel(HtmlHelper, String)</c>
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Parameter)]
-	internal sealed class AspMvcEditorTemplateAttribute : Attribute {
-	}
-
-	/// <summary>
-	/// ASP.NET MVC attribute. Indicates that a parameter is an MVC template.
-	/// Use this attribute for custom wrappers similar to
-	/// <c>System.ComponentModel.DataAnnotations.UIHintAttribute(System.String)</c>
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Parameter)]
-	internal sealed class AspMvcTemplateAttribute : Attribute {
-	}
-
-	/// <summary>
-	/// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter
-	/// is an MVC view. If applied to a method, the MVC view name is calculated implicitly
-	/// from the context. Use this attribute for custom wrappers similar to
-	/// <c>System.Web.Mvc.Controller.View(Object)</c>
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
-	internal sealed class AspMvcViewAttribute : PathReferenceAttribute {
-	}
-
-	/// <summary>
-	/// ASP.NET MVC attribute. When applied to a parameter of an attribute,
-	/// indicates that this parameter is an MVC action name
-	/// </summary>
-	/// <example><code>
-	/// [ActionName("Foo")]
-	/// public ActionResult Login(string returnUrl) {
-	///   ViewBag.ReturnUrl = Url.Action("Foo"); // OK
-	///   return RedirectToAction("Bar"); // Error: Cannot resolve action
-	/// }
-	/// </code></example>
-	[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property)]
-	internal sealed class AspMvcActionSelectorAttribute : Attribute {
-	}
-
-	[AttributeUsage(
-		AttributeTargets.Parameter | AttributeTargets.Property |
-		AttributeTargets.Field, Inherited = true)]
-	internal sealed class HtmlElementAttributesAttribute : Attribute {
-		public HtmlElementAttributesAttribute() {
-		}
-
-		public HtmlElementAttributesAttribute([NotNull] string name) {
-			Name = name;
-		}
-
-		[NotNull] public string Name { get; private set; }
-	}
-
-	[AttributeUsage(
-		AttributeTargets.Parameter | AttributeTargets.Field |
-		AttributeTargets.Property, Inherited = true)]
-	internal sealed class HtmlAttributeValueAttribute : Attribute {
-		public HtmlAttributeValueAttribute([NotNull] string name) {
-			Name = name;
-		}
-
-		[NotNull] public string Name { get; private set; }
-	}
-
-	// Razor attributes
-
-	/// <summary>
-	/// Razor attribute. Indicates that a parameter or a method is a Razor section.
-	/// Use this attribute for custom wrappers similar to 
-	/// <c>System.Web.WebPages.WebPageBase.RenderSection(String)</c>
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method, Inherited = true)]
-	internal sealed class RazorSectionAttribute : Attribute {
-	}
-}
diff --git a/src/EventStore.Common/Utils/Application.cs b/src/EventStore.Common/Utils/Application.cs
deleted file mode 100644
index 1d9c7fd9a4c..00000000000
--- a/src/EventStore.Common/Utils/Application.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Threading;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Common.Utils {
-	public enum ExitCode {
-		Success = 0,
-		Error = 1
-	}
-
-	public class Application {
-		private static readonly ILogger Log = Serilog.Log.ForContext<Application>();
-
-		private static Action<int> _exit = delegate {
-		};
-
-		private static int _exited;
-
-		public static void RegisterExitAction(Action<int> exitAction) {
-			Ensure.NotNull(exitAction, "exitAction");
-
-			_exit = exitAction;
-		}
-
-		public static void ExitSilent(int exitCode, string reason) => Exit(exitCode, reason, true);
-		public static void Exit(ExitCode exitCode, string reason) => Exit((int)exitCode, reason);
-		public static void Exit(int exitCode, string reason) => Exit(exitCode, reason, false);
-
-		private static void Exit(int exitCode, string reason, bool silent) {
-			if (Interlocked.CompareExchange(ref _exited, 1, 0) != 0)
-				return;
-
-			Ensure.NotNullOrEmpty(reason, "reason");
-
-			if (!silent) {
-				if (exitCode != 0)
-					Log.Error("Exiting with exit code: {exitCode}.\nExit reason: {e}", exitCode, reason);
-				else
-					Log.Information("Exiting with exit code: {exitCode}.\nExit reason: {e}", exitCode, reason);
-			}
-
-			_exit?.Invoke(exitCode);
-		}
-	}
-}
diff --git a/src/EventStore.Common/Utils/BytesFormatter.cs b/src/EventStore.Common/Utils/BytesFormatter.cs
deleted file mode 100644
index 84cb188981a..00000000000
--- a/src/EventStore.Common/Utils/BytesFormatter.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-
-namespace EventStore.Common.Utils {
-	public static class BytesFormatter {
-		private static readonly string[] SizeOrders = new[] {"B", "KiB", "MiB", "GiB", "TiB"};
-		private static readonly string[] SpeedOrders = new[] {"B/s", "KiB/s", "MiB/s", "GiB/s", "TiB/s"};
-		private static readonly string[] NumberOrders = new[] {"", "K", "M", "G", "T"};
-
-		public static string ToFriendlySpeedString(this double bytes) {
-			return FormatSpeed((float)bytes);
-		}
-
-		public static string ToFriendlySizeString(this ulong bytes) {
-			return bytes > long.MaxValue ? "more than long.MaxValue" : ToFriendlySizeString((long)bytes);
-		}
-
-		public static string ToFriendlySizeString(this long bytes) {
-			return FormatLong(bytes, SizeOrders);
-		}
-
-		public static string ToFriendlyNumberString(this ulong number) {
-			return number > long.MaxValue ? "more than long.MaxValue" : ToFriendlyNumberString((long)number);
-		}
-
-		public static string ToFriendlyNumberString(this long number) {
-			return FormatLong(number, NumberOrders);
-		}
-
-		private static string FormatLong(long bytes, IEnumerable<string> orders) {
-			const int scale = 1024;
-			bool isNegative = bytes < 0;
-			bytes = Math.Abs(bytes);
-
-			long max = 1;
-			string finalOrder = string.Empty;
-
-			foreach (var order in orders) {
-				max *= scale;
-				finalOrder = order;
-				if (bytes < max)
-					break;
-			}
-
-			max /= scale;
-
-			var friendlyStr = string.Format(CultureInfo.InvariantCulture,
-				"{0}{1:##0.##}{2}",
-				isNegative ? "-" : string.Empty,
-				bytes * 1.0 / (double)max,
-				finalOrder);
-			return friendlyStr;
-		}
-
-		//the only difference is double vs long
-		private static string FormatSpeed(double bytesPerSec) {
-			const int scale = 1024;
-			bool isNegative = bytesPerSec < 0; // verrry strange, but we need to show this if it happened already
-			bytesPerSec = Math.Abs(bytesPerSec);
-
-			long max = 1;
-			string finalOrder = string.Empty;
-
-			foreach (var speedOrder in SpeedOrders) {
-				max *= scale;
-				finalOrder = speedOrder;
-				if (bytesPerSec < max)
-					break;
-			}
-
-			max /= scale;
-
-			var friendlyStr = string.Format(CultureInfo.InvariantCulture,
-				"{0}{1:##0.##}{2}",
-				isNegative ? "-" : string.Empty,
-				bytesPerSec / (double)max,
-				finalOrder);
-			return friendlyStr;
-		}
-	}
-}
diff --git a/src/EventStore.Common/Utils/CertificateDelegates.cs b/src/EventStore.Common/Utils/CertificateDelegates.cs
deleted file mode 100644
index 7edc1c35147..00000000000
--- a/src/EventStore.Common/Utils/CertificateDelegates.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Net.Security;
-using System.Security.Cryptography.X509Certificates;
-
-namespace EventStore.Common.Utils {
-	public static class CertificateDelegates {
-		public delegate (bool, string) ServerCertificateValidator(X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors, string[] otherNames);
-		public delegate (bool, string) ClientCertificateValidator(X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors);
-	}
-}
diff --git a/src/EventStore.Common/Utils/CertificateExtensions.cs b/src/EventStore.Common/Utils/CertificateExtensions.cs
deleted file mode 100644
index 686ccb82405..00000000000
--- a/src/EventStore.Common/Utils/CertificateExtensions.cs
+++ /dev/null
@@ -1,310 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Formats.Asn1;
-using System.Globalization;
-using System.Linq;
-using System.Net;
-using System.Security.Cryptography;
-using System.Security.Cryptography.Pkcs;
-using System.Security.Cryptography.X509Certificates;
-
-namespace EventStore.Common.Utils {
-	public static class CertificateExtensions {
-		public static IEnumerable<(string name, string type)> GetSubjectAlternativeNames(this X509Certificate2 certificate) {
-			// Implemented based on RFC 5280 (https://datatracker.ietf.org/doc/html/rfc5280)
-			// - Reads IP addresses and DNS names from the Subject Alternative Names extension
-			// - Does not support other name types yet
-
-			X509ExtensionCollection extensions;
-			try {
-				extensions = certificate.Extensions;
-			} catch (CryptographicException) {
-				return null;
-			}
-
-			var sans = new List<(string, string)>();
-			foreach (var extension in extensions) {
-				if (extension.Oid?.Value != "2.5.29.17") continue; // Oid for Subject Alternative Names extension
-				var asnReader = new AsnReader(extension.RawData, AsnEncodingRules.DER).ReadSequence();
-				while (asnReader.HasData) {
-					Asn1Tag tag;
-					try {
-						tag = asnReader.PeekTag();
-					} catch (AsnContentException) {
-						break;
-					}
-
-					switch (tag.TagValue) {
-						case 2: // dNSName [2] IA5String
-							sans.Add((asnReader.ReadCharacterString(UniversalTagNumber.IA5String, tag), CertificateNameType.DnsName));
-							break;
-						case 7: // iPAddress [7] OCTET STRING
-							sans.Add((new IPAddress(asnReader.ReadOctetString(tag)).ToString(), CertificateNameType.IpAddress));
-							break;
-						default:
-							asnReader.ReadEncodedValue();
-							break;
-					}
-				}
-			}
-
-			return sans;
-		}
-
-		public static bool MatchesName(this X509Certificate2 certificate, string name) {
-			// Implemented based on RFC 6125 (https://datatracker.ietf.org/doc/html/rfc6125) with the following changes:
-			// - Does not support SRV-ID and URI-ID identifier types yet
-			// - Partial wildcard support is not implemented since it has been deprecated in most major browsers
-
-			var sans = GetSubjectAlternativeNames(certificate).ToArray();
-			if (sans.Length > 0)
-				return sans.Any(san => MatchesName(san.name, san.type, name));
-
-			var cn = GetCommonName(certificate);
-			return cn != null && MatchesName(cn, CertificateNameType.DnsName, name);
-		}
-
-		public static bool ClientCertificateMatchesName(this X509Certificate2 clientCertificate, string name) {
-			// This method, as a whole, is not based on any standard and is specific to EventStoreDB.
-			// It matches a client certificate's CN against a name as follows:
-			// i)  do an exact (case-insensitive) match if the CN is a wildcard name, otherwise
-			// ii) do an RFC 6125 compliant match (with the implementation limitations mentioned above)
-			//
-			// Basic rules:
-			// CN = *.test.com MUST match with name = *.test.com
-			// CN = *.test.com MUST NOT match with name = abc.test.com
-			// CN = abc.test.com MUST match with name = *.test.com
-			// CN = abc.test.com MUST match with name = abc.test.com
-
-			var cn = clientCertificate.GetCommonName();
-
-			// if the CN is a wildcard name, do an exact (case-insensitive) match
-			// as a standard RFC 6125 compliant match of two wildcard names will fail
-			if (cn.IsWildcardCertificateName())
-				return cn.EqualsOrdinalIgnoreCase(name);
-
-			// otherwise, do a standard RFC 6125 compliant name match
-			return MatchesName(name, CertificateNameType.DnsName, cn);
-		}
-
-		public static string GetCommonName(this X509Certificate2 certificate) => certificate.GetNameInfo(X509NameType.SimpleName, false);
-
-		// FIPS compliant PKCS #12 bundle creation
-		public static byte[] ExportToPkcs12(this X509Certificate2 certificate, string password = null) {
-			password ??= string.Empty;
-
-			using var rsa = RSA.Create();
-			rsa.ImportRSAPrivateKey(certificate.GetRSAPrivateKey()!.ExportRSAPrivateKey(), out _);
-			var builder = new Pkcs12Builder();
-			var safeContents = new Pkcs12SafeContents();
-			var pbeParams = new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 2048);
-			safeContents.AddCertificate(certificate);
-			safeContents.AddShroudedKey(rsa, password, pbeParams);
-			builder.AddSafeContentsEncrypted(safeContents, password, pbeParams);
-			builder.SealWithMac(password, HashAlgorithmName.SHA256, 2048);
-
-			return builder.Encode();
-		}
-
-		private static bool HasNonAsciiChars(string s) => s.Any(t => t > 127);
-
-		private static bool IsInternationalizedDomainNameLabel(string s) {
-			const string ACEPrefix = "xn--";
-			return HasNonAsciiChars(s) || s.StartsWith(ACEPrefix, StringComparison.OrdinalIgnoreCase);
-		}
-
-		// Based on RFC 952
-		private static bool IsValidDnsNameLabel(string label) =>
-			label.All(x => x is >= '0' and <= '9' or >= 'a' and <= 'z' or >= 'A' and <= 'Z' or '-');
-
-		// Based on RFC 6125 (without support for partial wildcard DNS labels
-		// since it has been deprecated by most major browsers)
-		private static bool IsValidCertificateNameFirstLabel(string label) =>
-			label == "*" || IsValidDnsNameLabel(label);
-
-		private static bool IsWildcardCertificateName(this string certName) {
-			if (!certName.StartsWith("*.", StringComparison.Ordinal))
-				return false;
-
-			// the certificate name starts with a wildcard DNS label. to verify if it's a valid wildcard name,
-			// we replace the wildcard by the letter 'a', then match it against the original certificate name
-			return MatchesName(certName, CertificateNameType.DnsName, 'a' + certName[1..]);
-		}
-
-		private static bool MatchesName(string certName, string certNameType, string name) {
-			const string Wildcard = "*";
-			const char Delimiter = '.';
-
-			if (string.IsNullOrEmpty(certName) ||
-			    string.IsNullOrEmpty(name))
-				return false;
-
-			// if at least one of the names is an IP address, do an exact match
-			if (certNameType == CertificateNameType.IpAddress ||
-			    IPAddress.TryParse(certName, out _) ||
-			    IPAddress.TryParse(name, out _))
-				return name.EqualsOrdinalIgnoreCase(certName);
-
-			Debug.Assert(certNameType == CertificateNameType.DnsName);
-
-			var certNameLabels = certName.Split(Delimiter);
-			var dnsNameLabels = name.Split(Delimiter);
-
-			if (certNameLabels.Length != dnsNameLabels.Length)
-				return false;
-
-			if (certNameLabels.Any(string.IsNullOrEmpty) ||
-			    dnsNameLabels.Any(string.IsNullOrEmpty))
-				return false;
-
-			if (certNameLabels.Any(IsInternationalizedDomainNameLabel) ||
-			    dnsNameLabels.Any(IsInternationalizedDomainNameLabel)) {
-				var idnMapping = new IdnMapping();
-				dnsNameLabels = dnsNameLabels.Select(x => idnMapping.GetAscii(x)).ToArray();
-				certNameLabels = certNameLabels.Select(x => idnMapping.GetAscii(x)).ToArray();
-			}
-
-			if (!IsValidCertificateNameFirstLabel(certNameLabels.First()) ||
-			    !certNameLabels.Skip(1).All(IsValidDnsNameLabel) ||
-			    !dnsNameLabels.All(IsValidDnsNameLabel))
-				return false;
-
-			// if first label is not a wildcard, check for an exact match
-			if (certNameLabels.First() != Wildcard)
-				return certNameLabels.EqualsOrdinalIgnoreCase(dnsNameLabels);
-
-			// first label is wildcard, a wildcard FQDN should have at least 3 labels
-			if (certNameLabels.Length <= 2)
-				return false;
-
-			// compare the other labels of the wildcard FQDN
-			return certNameLabels.Skip(1).EqualsOrdinalIgnoreCase(dnsNameLabels.Skip(1));
-		}
-
-		public static IDisposable ConvertToCertificate2(this X509Certificate certificate, out X509Certificate2 certificate2) {
-			if (certificate is X509Certificate2 c2) {
-				certificate2 = c2;
-				return null;
-			}
-
-			certificate2 = new X509Certificate2(certificate);
-			return certificate2;
-		}
-
-		public static bool TryGetKeyUsages(
-			this X509Certificate2 certificate,
-			out X509KeyUsageFlags keyUsages,
-			out bool hasExtendedKeyUsage,
-			out Oid[] extKeyUsages,
-			out string failReason) {
-
-			keyUsages = X509KeyUsageFlags.None;
-			hasExtendedKeyUsage = false;
-			extKeyUsages = [];
-			failReason = "";
-
-			X509ExtensionCollection extensions;
-			try {
-				extensions = certificate.Extensions;
-			} catch (CryptographicException ex) {
-				failReason = ex.Message;
-				return false;
-			}
-
-			foreach (var extension in extensions) {
-				switch (extension.Oid?.Value)
-				{
-					case "2.5.29.15": // Oid for Key Usage extension
-						var keyUsageExt = (X509KeyUsageExtension)extension;
-						keyUsages |= keyUsageExt.KeyUsages;
-						break;
-					case "2.5.29.37": // Oid for Extended Key Usage extension
-						hasExtendedKeyUsage = true;
-						var enhancedKeyUsageExt = (X509EnhancedKeyUsageExtension)extension;
-						extKeyUsages = new Oid[enhancedKeyUsageExt.EnhancedKeyUsages.Count];
-						if (extKeyUsages.Length > 0)
-							enhancedKeyUsageExt.EnhancedKeyUsages.CopyTo(extKeyUsages, 0);
-						break;
-				}
-			}
-
-			return true;
-		}
-
-		private static bool HasCorrectKeyUsages(X509KeyUsageFlags keyUsageFlags, out string failReason) {
-			if (!keyUsageFlags.HasFlag(X509KeyUsageFlags.DigitalSignature)) {
-				failReason = "Missing key usage: Digital Signature";
-				return false;
-			}
-
-			if (!keyUsageFlags.HasFlag(X509KeyUsageFlags.KeyEncipherment) &&
-			    !keyUsageFlags.HasFlag(X509KeyUsageFlags.KeyAgreement)) {
-				failReason = "Missing key usage: Key Encipherment and/or Key Agreement";
-				return false;
-			}
-
-			failReason = string.Empty;
-			return true;
-		}
-
-		private static bool HasServerAuthExtendedKeyUsage(IEnumerable<Oid> extendedKeyUsages, out string failReason) {
-			if (extendedKeyUsages.All(oid => oid.Value != "1.3.6.1.5.5.7.3.1")) { // serverAuth
-				failReason = "Missing extended key usage: Server Authentication";
-				return false;
-			}
-
-			failReason = string.Empty;
-			return true;
-		}
-
-		private static bool HasClientAuthExtendedKeyUsage(IEnumerable<Oid> extendedKeyUsages, out string failReason) {
-			if (extendedKeyUsages.All(oid => oid.Value != "1.3.6.1.5.5.7.3.2")) { // clientAuth
-				failReason = "Missing extended key usage: Client Authentication";
-				return false;
-			}
-
-			failReason = string.Empty;
-			return true;
-		}
-
-		public static bool IsServerCertificate(this X509Certificate2 certificate, out string failReason) {
-			if (!certificate.TryGetKeyUsages(out var keyUsages, out var hasExtKeyUsagesExtension, out var extKeyUsages, out failReason))
-				return false;
-
-			if (!HasCorrectKeyUsages(keyUsages, out failReason))
-				return false;
-
-			// rfc5280 section-4.2.1.12: extended key usages (EKUs) only have to be enforced
-			// if the extension is present at all. here, we don't enforce them for server
-			// certificates for backwards compatibility. however, this also implies that we
-			// _need_ the EKUs to be present for other types of certificates (e.g user certificates)
-			// as otherwise it would cause ambiguity when trying to determine the certificate type.
-			if (hasExtKeyUsagesExtension) {
-				if (!HasServerAuthExtendedKeyUsage(extKeyUsages, out failReason))
-					return false;
-
-				// historically, server certificates also have the clientAuth EKU
-				if (!HasClientAuthExtendedKeyUsage(extKeyUsages, out failReason))
-					return false;
-			}
-
-			failReason = string.Empty;
-			return true;
-		}
-
-		public static bool IsClientCertificate(this X509Certificate2 certificate, out string failReason) {
-			if (!certificate.TryGetKeyUsages(out var keyUsages, out _, out var extKeyUsages, out failReason))
-				return false;
-
-			if (!HasCorrectKeyUsages(keyUsages, out failReason))
-				return false;
-
-			if (!HasClientAuthExtendedKeyUsage(extKeyUsages, out failReason))
-				return false;
-
-			failReason = string.Empty;
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.Common/Utils/CertificateNameType.cs b/src/EventStore.Common/Utils/CertificateNameType.cs
deleted file mode 100644
index cd70f633f11..00000000000
--- a/src/EventStore.Common/Utils/CertificateNameType.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EventStore.Common.Utils {
-	public static class CertificateNameType {
-		// Based on RFC 5280 (https://datatracker.ietf.org/doc/html/rfc5280)
-		public const string IpAddress = "iPAddress";
-		public const string DnsName = "dNSName";
-	}
-}
diff --git a/src/EventStore.Common/Utils/ClaimsPrincipalExtensions.cs b/src/EventStore.Common/Utils/ClaimsPrincipalExtensions.cs
deleted file mode 100644
index e93e61b8076..00000000000
--- a/src/EventStore.Common/Utils/ClaimsPrincipalExtensions.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Security.Claims;
-
-namespace EventStore.Common.Utils {
-	public static class ClaimsPrincipalExtensions {
-		public static bool LegacyRoleCheck(this ClaimsPrincipal user, string role)
-		{
-			return user.HasClaim(ClaimTypes.Name, role) || user.HasClaim(ClaimTypes.Role, role);
-		}
-	}
-}
diff --git a/src/EventStore.Common/Utils/ConcurrentQueueWrapper.cs b/src/EventStore.Common/Utils/ConcurrentQueueWrapper.cs
deleted file mode 100644
index 50abcc1943b..00000000000
--- a/src/EventStore.Common/Utils/ConcurrentQueueWrapper.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using System.Collections.Concurrent;
-using System.Threading;
-
-namespace EventStore.Common.Utils {
-	//Workaround for: https://github.com/dotnet/corefx/issues/29759
-	//As from mono 5.2 and .NET Core 2.0, ConcurrentQueue.Count has knowingly been made slower (in some cases, O(N)) in favor of faster Enqueue() and Dequeue() operations (See: https://github.com/dotnet/corefx/issues/29759#issuecomment-390435245)
-	//This wrapper implements a workaround by maintaining the queue count at the expense of a slightly slower Enqueue()/Dequeue()
-	//Interlocked.Increment/Decrement operations are of the order of 36-90 cycles (similar to a division operation) which is good enough in our case.
-	public class ConcurrentQueueWrapper<T> : ConcurrentQueue<T> {
-		private volatile int _queueCount = 0;
-
-		public new bool IsEmpty {
-			get { return _queueCount <= 0; }
-		}
-
-		public new int Count {
-			get {
-				int curCount = _queueCount;
-				return curCount < 0 ? 0 : curCount;
-			}
-		}
-
-		//Note: The count is not updated atomically together with dequeueing.
-		//This means that the count will be eventually consistent but it's not an issue since between the Count call and any other operation items may be enqueued or dequeued anyway and the count will no longer be valid.
-		public new bool TryDequeue(out T result) {
-			var dequeued = base.TryDequeue(out result);
-			if (dequeued)
-				Interlocked.Decrement(ref _queueCount);
-			return dequeued;
-		}
-
-		//Note: The count is not updated atomically together with dequeueing.
-		//This means that the count will be eventually consistent but it's not an issue since between the Count call and any other operation items may be enqueued or dequeued anyway and the count will no longer be valid.
-		public new void Enqueue(T item) {
-			base.Enqueue(item);
-			Interlocked.Increment(ref _queueCount);
-		}
-	}
-}
-
-/*
-//For future reference, the following code can be used to test if the problem is still occuring.
-//Running the application should make the Main thread use 100% CPU and is very very slow.
-//The code has been tested on Mono 5.2-5.16 (the issue does not occur on earlier versions) and .NET Core 2.0 - .NET Core 3.0 preview
-
-using System;
-using System.Threading;
-using System.Collections.Concurrent;
-
-public class Program
-{
-    private static ConcurrentQueue<int> queue = new ConcurrentQueue<int>();
-    private static volatile bool exit = false;
-
-    public static void Main(string[] args)
-    {
-        Thread t = new Thread(AddEventsThread);
-        t.Name = "AddEventsThread";
-        t.Start();
-
-        Thread.Sleep(5000); //wait for 5 seconds to make sure the AddEventsThread thread has started
-        var queueCount = 0L;
-        var totalElapsed = 0L;
-
-        Console.WriteLine("Starting to hammer queue.Count.");
-
-        for(int i=0;i<1000000;i++){
-            var start = DateTime.UtcNow.Ticks;
-            queueCount = queue.Count;
-            totalElapsed += DateTime.UtcNow.Ticks - start;
-        }
-
-        Console.Out.WriteLine("Total Elapsed: {0}, Queue Count: {1}", totalElapsed, queueCount);
-        exit = true;
-    }
-
-    public static void AddEventsThread(){
-        while(!exit){
-            Console.WriteLine("Enqueing");
-            for(int i=0;i<50000 && !exit;i++){
-                queue.Enqueue(50);
-                Thread.Sleep(1);
-            }
-            Console.WriteLine("Dequeing");
-            for(int i=0;i<50000 && !exit;i++){
-                int result;
-                queue.TryDequeue(out result);
-                Thread.Sleep(1);
-            }
-        }
-    }
-}
-*/
diff --git a/src/EventStore.Common/Utils/ContainerizedEnvironment.cs b/src/EventStore.Common/Utils/ContainerizedEnvironment.cs
deleted file mode 100644
index 8c7d9fd76e8..00000000000
--- a/src/EventStore.Common/Utils/ContainerizedEnvironment.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Runtime;
-
-namespace EventStore.Common.Utils;
-
-public static class ContainerizedEnvironment {
-    public const int ReaderThreadCount       = 4;
-    public const int WorkerThreadCount       = 5;
-    public const int StreamInfoCacheCapacity = 100000;
-
-    public static bool IsRunningInContainer() => RuntimeInformation.IsRunningInContainer;
-}
diff --git a/src/EventStore.Common/Utils/Empty.cs b/src/EventStore.Common/Utils/Empty.cs
deleted file mode 100644
index aa1d30a2ef2..00000000000
--- a/src/EventStore.Common/Utils/Empty.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-
-namespace EventStore.Common.Utils {
-	public static class Empty {
-		public static readonly byte[] ByteArray = new byte[0];
-		public static readonly string[] StringArray = new string[0];
-		public static readonly object[] ObjectArray = new object[0];
-
-		public static readonly Action Action = () => { };
-		public static readonly object Result = new object();
-		public static readonly string Xml = String.Empty;
-		public static readonly string Json = "{}";
-	}
-}
diff --git a/src/EventStore.Common/Utils/EndPointComparer.cs b/src/EventStore.Common/Utils/EndPointComparer.cs
deleted file mode 100644
index eea2260530c..00000000000
--- a/src/EventStore.Common/Utils/EndPointComparer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-
-namespace EventStore.Common.Utils {
-	public class EndPointComparer : IComparer<EndPoint> {
-		public int Compare(EndPoint x, EndPoint y) {
-			if (ReferenceEquals(x, y)) return 0;
-			if (ReferenceEquals(null, y)) return 1;
-			if (ReferenceEquals(null, x)) return -1;
-			var portCompare = x.GetPort().CompareTo(y.GetPort());
-			if (portCompare != 0) return portCompare;
-			return string.Compare(x.GetHost(), y.GetHost(), StringComparison.Ordinal);
-		}
-	}
-	
-	public class EndPointEqualityComparer : IEqualityComparer<EndPoint> {
-		public bool Equals(EndPoint x, EndPoint y) {
-			return x.GetHost().Equals(y.GetHost()) && x.GetPort() == y.GetPort();
-		}
-
-		public int GetHashCode(EndPoint obj) {
-            return obj.GetHost().GetHashCode() ^ obj.GetPort();
-		}
-	}
-}
diff --git a/src/EventStore.Common/Utils/EndpointExtensions.cs b/src/EventStore.Common/Utils/EndpointExtensions.cs
deleted file mode 100644
index bc3c137e0ab..00000000000
--- a/src/EventStore.Common/Utils/EndpointExtensions.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System;
-using System.Linq;
-using System.Net;
-using System.Net.Sockets;
-
-namespace EventStore.Common.Utils {
-	public static class EndpointExtensions {
-		public static string HTTP_SCHEMA => Uri.UriSchemeHttp;
-		public static string HTTPS_SCHEMA => Uri.UriSchemeHttps;
-
-		public static string ToHttpUrl(this EndPoint endPoint, string schema, string rawUrl = null) =>
-			endPoint switch {
-				IPEndPoint ipEndPoint => CreateHttpUrl(schema, ipEndPoint.Address.ToString(), ipEndPoint.Port,
-					rawUrl != null ? rawUrl.TrimStart('/') : string.Empty),
-				DnsEndPoint dnsEndpoint => CreateHttpUrl(schema, dnsEndpoint.Host, dnsEndpoint.Port,
-					rawUrl != null ? rawUrl.TrimStart('/') : string.Empty),
-				_ => null
-			};
-
-		public static string GetHost(this EndPoint endpoint) =>
-			endpoint switch {
-				IPWithClusterDnsEndPoint ipWithClusterDns => ipWithClusterDns.Address.ToString(),
-				IPEndPoint ip => ip.Address.ToString(),
-				DnsEndPoint dns => dns.Host,
-				_ => throw new ArgumentOutOfRangeException(nameof(endpoint), endpoint?.GetType(),
-					"An invalid endpoint has been provided")
-			};
-
-		public static string[] GetOtherNames(this EndPoint endpoint) =>
-			endpoint switch {
-				IPWithClusterDnsEndPoint ipWithClusterDns => new [] { ipWithClusterDns.ClusterDnsName },
-				IPEndPoint => null,
-				DnsEndPoint => null,
-				_ => throw new ArgumentOutOfRangeException(nameof(endpoint), endpoint?.GetType(),
-					"An invalid endpoint has been provided")
-			};
-
-		public static int GetPort(this EndPoint endpoint) =>
-			endpoint switch {
-				IPEndPoint ip => ip.Port,
-				DnsEndPoint dns => dns.Port,
-				_ => throw new ArgumentOutOfRangeException(nameof(endpoint), endpoint?.GetType(),
-					"An invalid endpoint has been provided")
-			};
-
-		public static IPEndPoint ResolveDnsToIPAddress(this EndPoint endpoint) {
-			var entries = Dns.GetHostAddresses(endpoint.GetHost());
-			if (entries.Length == 0)
-				throw new Exception($"Unable get host addresses for DNS host ({endpoint.GetHost()})");
-			var ipaddress = entries.FirstOrDefault(a => a.AddressFamily == AddressFamily.InterNetwork);
-			if (ipaddress == null)
-				throw new Exception($"Could not get an IPv4 address for host '{endpoint.GetHost()}'");
-			return new IPEndPoint(ipaddress, endpoint.GetPort());
-		}
-
-		public static EndPoint WithClusterDns(this DnsEndPoint dnsEndPoint, string clusterDns) {
-			if (clusterDns != null && IPAddress.TryParse(dnsEndPoint.Host, out var ip))
-				return new IPWithClusterDnsEndPoint(ip, clusterDns, dnsEndPoint.Port);
-
-			return dnsEndPoint;
-		}
-
-		public static EndPoint WithClusterDns(this IPEndPoint ipEndPoint, string clusterDns) {
-			if (clusterDns != null)
-				return new IPWithClusterDnsEndPoint(ipEndPoint.Address, clusterDns, ipEndPoint.Port);
-
-			return ipEndPoint;
-		}
-
-		public static DnsEndPoint ToDnsEndPoint(this IPEndPoint ipEndPoint) {
-			return new DnsEndPoint(ipEndPoint.Address.ToString(), ipEndPoint.Port);
-		}
-
-		private static string CreateHttpUrl(string schema, string host, int port, string path) {
-			return $"{schema}://{host}:{port}/{path}";
-		}
-
-		private static readonly EndPointEqualityComparer EndPointEqualityComparer = new EndPointEqualityComparer();
-		public static bool EndPointEquals(this EndPoint x, EndPoint y) => EndPointEqualityComparer.Equals(x, y);
-	}
-}
diff --git a/src/EventStore.Common/Utils/Ensure.cs b/src/EventStore.Common/Utils/Ensure.cs
deleted file mode 100644
index 92046ba1da1..00000000000
--- a/src/EventStore.Common/Utils/Ensure.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System;
-
-namespace EventStore.Common.Utils {
-	public interface IValidator<T> {
-		void Validate(T t);
-	}
-
-	public static class Ensure {
-		public static void NotNull<T>(T argument, string argumentName) where T : class {
-			if (argument == null)
-				throw new ArgumentNullException(argumentName);
-		}
-
-		public static void NotNullOrEmpty(string argument, string argumentName) {
-			if (string.IsNullOrEmpty(argument))
-				throw new ArgumentNullException(argument, argumentName);
-		}
-
-		public static void Positive(int number, string argumentName) {
-			if (number <= 0)
-				throw new ArgumentOutOfRangeException(argumentName, argumentName + " should be positive.");
-		}
-
-		public static void Positive(long number, string argumentName) {
-			if (number <= 0)
-				throw new ArgumentOutOfRangeException(argumentName, argumentName + " should be positive.");
-		}
-
-		public static void Nonnegative(long number, string argumentName) {
-			if (number < 0)
-				throw new ArgumentOutOfRangeException(argumentName, argumentName + " should be non negative.");
-		}
-
-		public static void Nonnegative(int number, string argumentName) {
-			if (number < 0)
-				throw new ArgumentOutOfRangeException(argumentName, argumentName + " should be non negative.");
-		}
-
-		public static void Nonnegative(double number, string argumentName) {
-			if (number < 0)
-				throw new ArgumentOutOfRangeException(argumentName, argumentName + " should be non negative.");
-		}
-
-		public static void NotEmptyGuid(Guid guid, string argumentName) {
-			if (Guid.Empty == guid)
-				throw new ArgumentException(argumentName, argumentName + " should be non-empty GUID.");
-		}
-
-		public static void Equal(int expected, int actual, string argumentName) {
-			if (expected != actual)
-				throw new ArgumentException(string.Format("{0} expected value: {1}, actual value: {2}", argumentName,
-					expected, actual));
-		}
-
-		public static void Equal(long expected, long actual, string argumentName) {
-			if (expected != actual)
-				throw new ArgumentException(string.Format("{0} expected value: {1}, actual value: {2}", argumentName,
-					expected, actual));
-		}
-
-		public static void Equal(bool expected, bool actual, string argumentName) {
-			if (expected != actual)
-				throw new ArgumentException(string.Format("{0} expected value: {1}, actual value: {2}", argumentName,
-					expected, actual));
-		}
-
-		public static void Valid<T>(T t, IValidator<T> validator) {
-			validator?.Validate(t);
-		}
-	}
-}
diff --git a/src/EventStore.Common/Utils/EnumerableExtensions.cs b/src/EventStore.Common/Utils/EnumerableExtensions.cs
deleted file mode 100644
index 8725594441b..00000000000
--- a/src/EventStore.Common/Utils/EnumerableExtensions.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace EventStore.Common.Utils {
-	public static class EnumerableExtensions {
-		public static IEnumerable<T> Safe<T>(this IEnumerable<T> collection) {
-			return collection ?? Enumerable.Empty<T>();
-		}
-
-		public static bool Contains<T>(this IEnumerable<T> collection, Predicate<T> condition) {
-			return collection.Any(x => condition(x));
-		}
-
-		public static bool IsEmpty<T>(this IEnumerable<T> collection) {
-			if (collection == null)
-				return true;
-			var coll = collection as ICollection;
-			if (coll != null)
-				return coll.Count == 0;
-			return !collection.Any();
-		}
-
-		public static bool IsNotEmpty<T>(this IEnumerable<T> collection) {
-			return !IsEmpty(collection);
-		}
-	}
-}
diff --git a/src/EventStore.Common/Utils/FileStreamExtensions.cs b/src/EventStore.Common/Utils/FileStreamExtensions.cs
deleted file mode 100644
index 1a0bae85f4d..00000000000
--- a/src/EventStore.Common/Utils/FileStreamExtensions.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.IO;
-using System.Linq.Expressions;
-using System.Reflection;
-using System.Runtime;
-using System.Runtime.InteropServices;
-using Microsoft.Win32.SafeHandles;
-using ILogger = Serilog.ILogger;
-using RuntimeInformation = System.Runtime.RuntimeInformation;
-
-namespace EventStore.Common.Utils {
-	public static class FileStreamExtensions {
-		private static readonly ILogger Log =
-			Serilog.Log.ForContext(Serilog.Core.Constants.SourceContextPropertyName, "FileStreamExtensions");
-		private static Action<FileStream> FlushSafe;
-
-		[DllImport("kernel32.dll", SetLastError = true)]
-		[return: MarshalAs(UnmanagedType.Bool)]
-		public static extern bool FlushFileBuffers(SafeFileHandle hFile);
-
-		//[DllImport("kernel32.dll", SetLastError = true)]
-		//[return: MarshalAs(UnmanagedType.Bool)]
-		//static extern bool FlushViewOfFile(IntPtr lpBaseAddress, UIntPtr dwNumberOfBytesToFlush);
-
-		static FileStreamExtensions() {
-			ConfigureFlush(disableFlushToDisk: false);
-		}
-
-		public static void FlushToDisk(this FileStream fs) {
-			FlushSafe(fs);
-		}
-
-		public static void ConfigureFlush(bool disableFlushToDisk) {
-			if (disableFlushToDisk) {
-				Log.Information("FlushToDisk: DISABLED");
-				FlushSafe = f => f.Flush(flushToDisk: false);
-				return;
-			}
-
-			if (!RuntimeInformation.IsWindows)
-				FlushSafe = f => f.Flush(flushToDisk: true);
-			else {
-				FlushSafe = f => {
-					f.Flush(flushToDisk: false);
-					if (!FlushFileBuffers(f.SafeFileHandle))
-						throw new Exception($"FlushFileBuffers failed with err: {Marshal.GetLastWin32Error()}");
-				};
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Common/Utils/Helper.cs b/src/EventStore.Common/Utils/Helper.cs
deleted file mode 100644
index f12b7e99412..00000000000
--- a/src/EventStore.Common/Utils/Helper.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using System.IO;
-using System.Reflection;
-using System.Text;
-
-namespace EventStore.Common.Utils {
-	public static class Helper {
-		public static readonly UTF8Encoding UTF8NoBom = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false);
-
-		public static void EatException(Action action) {
-			try {
-				action();
-			} catch (Exception) {
-			}
-		}
-
-		public static T EatException<T>(Func<T> action, T defaultValue = default(T)) {
-			try {
-				return action();
-			} catch (Exception) {
-				return defaultValue;
-			}
-		}
-
-		public static string GetDefaultLogsDir() {
-			return Path.Combine(System.IO.Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "es-logs");
-		}
-
-		public static string FormatBinaryDump(byte[] logBulk) {
-			return FormatBinaryDump(new ArraySegment<byte>(logBulk ?? Empty.ByteArray));
-		}
-
-		public static string FormatBinaryDump(ArraySegment<byte> logBulk) {
-			if (logBulk.Count == 0)
-				return "--- NO DATA ---";
-
-			var sb = new StringBuilder();
-			int cur = 0;
-			int len = logBulk.Count;
-			for (int row = 0, rows = (logBulk.Count + 15) / 16; row < rows; ++row) {
-				sb.AppendFormat("{0:000000}:", row * 16);
-				for (int i = 0; i < 16; ++i, ++cur) {
-					if (cur >= len)
-						sb.Append("   ");
-					else
-						sb.AppendFormat(" {0:X2}", logBulk.Array[logBulk.Offset + cur]);
-				}
-
-				sb.Append("  | ");
-				cur -= 16;
-				for (int i = 0; i < 16; ++i, ++cur) {
-					if (cur < len) {
-						var b = (char)logBulk.Array[logBulk.Offset + cur];
-						sb.Append(char.IsControl(b) ? '.' : b);
-					}
-				}
-
-				sb.AppendLine();
-			}
-
-			return sb.ToString();
-		}
-	}
-}
diff --git a/src/EventStore.Common/Utils/HostName.cs b/src/EventStore.Common/Utils/HostName.cs
deleted file mode 100644
index 242dfc8761f..00000000000
--- a/src/EventStore.Common/Utils/HostName.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Diagnostics;
-
-namespace EventStore.Common.Utils {
-	public class HostName {
-		public static string Combine(Uri responseUrl, string relativeUri, params object[] arg) {
-			try {
-				return CombineHostNameAndPath(responseUrl, relativeUri, arg);
-			} catch (Exception e) {
-				Debug.WriteLine("Failed to combine hostname with relative path: {0}", e.Message);
-				return relativeUri;
-			}
-		}
-
-		private static string CombineHostNameAndPath(Uri responseUrl,
-			string relativeUri,
-			object[] arg) {
-			//TODO: encode???
-			var path = string.Format(relativeUri, arg);
-			if (path.Length > 0 && path[0] == '/') path = path.Substring(1);
-			return new UriBuilder(responseUrl.Scheme, responseUrl.Host, responseUrl.Port, responseUrl.LocalPath + path)
-				.Uri.AbsoluteUri;
-		}
-	}
-}
diff --git a/src/EventStore.Common/Utils/IPEndPointArrayConverter.cs b/src/EventStore.Common/Utils/IPEndPointArrayConverter.cs
deleted file mode 100644
index ccd1ff904f8..00000000000
--- a/src/EventStore.Common/Utils/IPEndPointArrayConverter.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Net;
-using System.Text;
-
-namespace EventStore.Common.Utils {
-	public class IPEndPointArrayConverter : ArrayConverter {
-		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) {
-			return sourceType == typeof(string) || sourceType == typeof(Array) ||
-			       base.CanConvertFrom(context, sourceType);
-		}
-
-		public override object ConvertFrom(ITypeDescriptorContext context, System.Globalization.CultureInfo culture,
-			object value) {
-			if (value.GetType() == typeof(string)) {
-				var valueAsString = value as string;
-				if (valueAsString != null) {
-					var ipEndPointList = valueAsString.Split(new[] {","}, StringSplitOptions.None)
-						.Select(x => (IPEndPoint)new IPEndPointConverter().ConvertFrom(x));
-					return ipEndPointList.ToArray();
-				}
-			} else if (value.GetType().IsArray) {
-				var values = value as IEnumerable;
-				var ipEndPointList = new List<IPEndPoint>();
-				foreach (var val in values) {
-					ipEndPointList.Add((IPEndPoint)new IPEndPointConverter().ConvertFrom(val));
-				}
-
-				return ipEndPointList.ToArray();
-			}
-
-			return base.ConvertFrom(context, culture, value);
-		}
-	}
-}
diff --git a/src/EventStore.Common/Utils/IPEndpointConverter.cs b/src/EventStore.Common/Utils/IPEndpointConverter.cs
deleted file mode 100644
index 4f96e38b4b4..00000000000
--- a/src/EventStore.Common/Utils/IPEndpointConverter.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Net;
-using System.Text;
-
-namespace EventStore.Common.Utils {
-	public class IPEndPointConverter : TypeConverter {
-		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) {
-			return sourceType == typeof(string) || base.CanConvertFrom(context, sourceType);
-		}
-
-		public override object ConvertFrom(ITypeDescriptorContext context, System.Globalization.CultureInfo culture,
-			object value) {
-			var valueAsString = value as string;
-			if (valueAsString != null) {
-				var address = valueAsString.Substring(0, valueAsString.LastIndexOf(':'));
-				var port = valueAsString.Substring(valueAsString.LastIndexOf(':') + 1);
-
-				return new IPEndPoint(IPAddress.Parse(address), Int32.Parse(port));
-			}
-
-			return base.ConvertFrom(context, culture, value);
-		}
-	}
-}
diff --git a/src/EventStore.Common/Utils/IPFinder.cs b/src/EventStore.Common/Utils/IPFinder.cs
deleted file mode 100644
index ce19304203e..00000000000
--- a/src/EventStore.Common/Utils/IPFinder.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Net;
-using System.Net.NetworkInformation;
-
-namespace EventStore.Common.Utils {
-	public static class IPFinder {
-		public static IPAddress GetNonLoopbackAddress() {
-			foreach (var adapter in NetworkInterface.GetAllNetworkInterfaces()) {
-				foreach (UnicastIPAddressInformation address in adapter.GetIPProperties().UnicastAddresses) {
-					if (address.Address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) {
-						if (!IPAddress.IsLoopback(address.Address)) {
-							return address.Address;
-						}
-					}
-				}
-			}
-
-			return null;
-		}
-	}
-}
diff --git a/src/EventStore.Common/Utils/IPWithClusterDnsEndPoint.cs b/src/EventStore.Common/Utils/IPWithClusterDnsEndPoint.cs
deleted file mode 100644
index 875c9d48c40..00000000000
--- a/src/EventStore.Common/Utils/IPWithClusterDnsEndPoint.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Net;
-
-namespace EventStore.Common.Utils {
-	public class IPWithClusterDnsEndPoint : IPEndPoint {
-		public string ClusterDnsName { get; }
-
-		public IPWithClusterDnsEndPoint(IPAddress address, string clusterDns, int port) : base(address, port) {
-			Ensure.NotNull(clusterDns, "clusterDns");
-			Ensure.NotNull(address, "address");
-			ClusterDnsName = clusterDns;
-		}
-
-		public override string ToString() => $"{base.ToString()}/{ClusterDnsName}";
-	}
-}
diff --git a/src/EventStore.Common/Utils/Json.cs b/src/EventStore.Common/Utils/Json.cs
deleted file mode 100644
index d23507e8a39..00000000000
--- a/src/EventStore.Common/Utils/Json.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System;
-using System.Xml;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json.Serialization;
-using Formatting = Newtonsoft.Json.Formatting;
-
-namespace EventStore.Common.Utils {
-	public static class Json {
-		public static readonly JsonSerializerSettings JsonSettings = new JsonSerializerSettings {
-			ContractResolver = new CamelCasePropertyNamesContractResolver(),
-			DateFormatHandling = DateFormatHandling.IsoDateFormat,
-			NullValueHandling = NullValueHandling.Ignore,
-			DefaultValueHandling = DefaultValueHandling.Ignore,
-			MissingMemberHandling = MissingMemberHandling.Ignore,
-			TypeNameHandling = TypeNameHandling.None,
-			Converters = new JsonConverter[] {new StringEnumConverter()}
-		};
-
-		public static byte[] ToJsonBytes(this object source) {
-			string instring = JsonConvert.SerializeObject(source, Formatting.Indented, JsonSettings);
-			return Helper.UTF8NoBom.GetBytes(instring);
-		}
-
-		public static string ToJson(this object source) {
-			string instring = JsonConvert.SerializeObject(source, Formatting.Indented, JsonSettings);
-			return instring;
-		}
-
-		public static string ToCanonicalJson(this object source) {
-			string instring = JsonConvert.SerializeObject(source);
-			return instring;
-		}
-
-		public static T ParseJson<T>(this string json) {
-			var result = JsonConvert.DeserializeObject<T>(json, JsonSettings);
-			return result;
-		}
-
-		public static T ParseJson<T>(this byte[] json) {
-			var result = JsonConvert.DeserializeObject<T>(Helper.UTF8NoBom.GetString(json), JsonSettings);
-			return result;
-		}
-
-		public static T ParseJson<T>(this ReadOnlyMemory<byte> json) {
-			var result = JsonConvert.DeserializeObject<T>(Helper.UTF8NoBom.GetString(json.Span), JsonSettings);
-			return result;
-		}
-
-		public static object DeserializeObject(JObject value, Type type, JsonSerializerSettings settings) {
-			JsonSerializer jsonSerializer = JsonSerializer.Create(settings);
-			return jsonSerializer.Deserialize(new JTokenReader(value), type);
-		}
-
-		public static object DeserializeObject(JObject value, Type type, params JsonConverter[] converters) {
-			var settings = converters == null || converters.Length <= 0
-				? null
-				: new JsonSerializerSettings {Converters = converters};
-			return DeserializeObject(value, type, settings);
-		}
-
-		public static XmlDocument ToXmlDocument(this JObject value, string deserializeRootElementName,
-			bool writeArrayAttribute) {
-			return (XmlDocument)DeserializeObject(value, typeof(XmlDocument), new JsonConverter[] {
-				new XmlNodeConverter {
-					DeserializeRootElementName = deserializeRootElementName,
-					WriteArrayAttribute = writeArrayAttribute
-				}
-			});
-		}
-
-		public static bool IsValidJson(this string value) {
-			try {
-				JToken.Parse(value);
-			} catch {
-				return false;
-			}
-
-			return true;
-		}
-
-		public static bool IsValidJson(this ReadOnlyMemory<byte> value) {
-			if (value.IsEmpty) return false;  //Don't bother letting an Exception getting thrown.
-			try {
-				JToken.Parse(Helper.UTF8NoBom.GetString(value.Span));
-			} catch {
-				return false;
-			}
-
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.Common/Utils/Locations.cs b/src/EventStore.Common/Utils/Locations.cs
deleted file mode 100644
index 7695d7d6b99..00000000000
--- a/src/EventStore.Common/Utils/Locations.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Runtime;
-
-namespace EventStore.Common.Utils {
-	public class Locations {
-		public static readonly string ApplicationDirectory;
-		public static readonly string WebContentDirectory;
-		public static readonly string ProjectionsDirectory;
-		public static readonly string PreludeDirectory;
-		public static readonly string PreludeResourcesPath;
-		public static readonly string PluginsDirectory;
-		public static readonly string DefaultContentDirectory;
-		public static readonly string DefaultConfigurationDirectory;
-		public static readonly string DefaultDataDirectory;
-		public static readonly string DefaultLogDirectory;
-		public static readonly string DefaultTestClientLogDirectory;
-		public static readonly string FallbackDefaultDataDirectory;
-		public static readonly string DefaultTrustedRootCertificateDirectory;
-
-		static Locations() {
-			ApplicationDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ??
-			                       Path.GetFullPath(".");
-
-			PluginsDirectory = Path.Combine(ApplicationDirectory, "plugins");
-			FallbackDefaultDataDirectory = Path.Combine(ApplicationDirectory, "data");
-
-			switch (RuntimeInformation.OsPlatform) {
-				case RuntimeOSPlatform.Linux:
-					DefaultContentDirectory = "/usr/share/eventstore";
-					DefaultConfigurationDirectory = "/etc/eventstore";
-					DefaultDataDirectory = "/var/lib/eventstore";
-					DefaultLogDirectory = "/var/log/eventstore";
-					DefaultTrustedRootCertificateDirectory = "/etc/ssl/certs";
-					DefaultTestClientLogDirectory = Path.Combine(ApplicationDirectory, "testclientlog");
-					if (!Directory.Exists(PluginsDirectory))
-						PluginsDirectory = Path.Combine(DefaultContentDirectory, "plugins");
-					break;
-				case RuntimeOSPlatform.OSX:
-					DefaultContentDirectory = "/usr/local/share/eventstore";
-					DefaultConfigurationDirectory = "/etc/eventstore";
-					DefaultDataDirectory = "/var/lib/eventstore";
-					DefaultLogDirectory = "/var/log/eventstore";
-					DefaultTestClientLogDirectory = Path.Combine(ApplicationDirectory, "testclientlog");
-					if (!Directory.Exists(PluginsDirectory))
-						PluginsDirectory = Path.Combine(DefaultContentDirectory, "plugins");
-					break;
-				default:
-					DefaultContentDirectory = ApplicationDirectory;
-					DefaultConfigurationDirectory = ApplicationDirectory;
-					DefaultDataDirectory = Path.Combine(ApplicationDirectory, "data");
-					DefaultLogDirectory = Path.Combine(ApplicationDirectory, "logs");
-					DefaultTestClientLogDirectory = Path.Combine(ApplicationDirectory, "testclientlog");
-					break;
-			}
-
-			WebContentDirectory = GetPrecededLocation(
-				Path.Combine(ApplicationDirectory, "clusternode-web"),
-				Path.Combine(DefaultContentDirectory, "clusternode-web")
-			);
-			ProjectionsDirectory = GetPrecededLocation(
-				Path.Combine(ApplicationDirectory, "projections"),
-				Path.Combine(DefaultContentDirectory, "projections")
-			);
-			PreludeDirectory = GetPrecededLocation(
-				Path.Combine(ApplicationDirectory, "Prelude"),
-				Path.Combine(DefaultContentDirectory, "Prelude")
-			);
-			PreludeResourcesPath = "EventStore.Projections.Core.Prelude";
-		}
-
-		/// <summary>
-		/// Returns the preceded location by checking the existence of the directory.
-		/// The local directory should be the first priority as the first element followed by
-		/// the global default location as last element.
-		/// </summary>
-		/// <param name="locations">the locations ordered by prioity starting with the preceded location</param>
-		/// <returns>the preceded location</returns>
-		public static string GetPrecededLocation(params string[] locations) {
-			var precedenceList = locations.Distinct().ToList();
-			return precedenceList.FirstOrDefault(Directory.Exists) ??
-			       precedenceList.Last();
-		}
-
-		/// <summary>
-		/// Returns the directories that potentially contain any configuration files.
-		/// </summary>
-		/// <returns></returns>
-		public static string[] GetPotentialConfigurationDirectories() => new[] {
-			DefaultConfigurationDirectory,
-			ApplicationDirectory,
-		}.Distinct().ToArray();
-
-		/// Tries to identify the name and path of the given config file.
-		/// Given a full path to a file it just splits the path into directory and file.
-		/// Given a only config file name, looks for that file in the potential directories.
-		public static bool TryLocateConfigFile(string configFilePath, out string directory, out string fileName) {
-			directory = Path.IsPathRooted(configFilePath)
-				? Path.GetDirectoryName(configFilePath)
-				: GetPotentialConfigurationDirectories().FirstOrDefault(d =>
-					File.Exists(Path.Combine(d, configFilePath)));
-
-			fileName = Path.GetFileName(configFilePath);
-
-			return directory is not null;
-		}
-	}
-}
diff --git a/src/EventStore.Common/Utils/NumberExtensions.cs b/src/EventStore.Common/Utils/NumberExtensions.cs
deleted file mode 100644
index 4f90fdb5f4e..00000000000
--- a/src/EventStore.Common/Utils/NumberExtensions.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-
-namespace EventStore.Common.Utils {
-	public static class NumberExtensions {
-		public static long RoundDownToMultipleOf(this long x, int multiple) {
-			return (x / multiple) * multiple;
-		}
-
-		public static long RoundUpToMultipleOf(this long x, int multiple) {
-			var ret = x.RoundDownToMultipleOf(multiple);
-			if (ret != x) {
-				ret += multiple;
-			}
-			return ret;
-		}
-
-		public static int RoundDownToMultipleOf(this int x, int multiple) {
-			return (x / multiple) * multiple;
-		}
-
-		public static int RoundUpToMultipleOf(this int x, int multiple) {
-			var ret = x.RoundDownToMultipleOf(multiple);
-			if (ret != x) {
-				ret += multiple;
-			}
-			return ret;
-		}
-
-		public static long ScaleByWeight(this long x, int weight, int totalWeight) {
-			if (totalWeight <= 0)
-				throw new ArgumentOutOfRangeException(nameof(totalWeight));
-
-			if (weight < 0 || weight > totalWeight)
-				throw new ArgumentOutOfRangeException(nameof(weight));
-
-			return (long)((double) x * weight / totalWeight);
-		}
-
-		public static long ScaleByPercent(this long x, int percent) =>
-			ScaleByWeight(x, percent, 100);
-
-	}
-}
diff --git a/src/EventStore.Common/Utils/StringExtensions.cs b/src/EventStore.Common/Utils/StringExtensions.cs
deleted file mode 100644
index 271576c7434..00000000000
--- a/src/EventStore.Common/Utils/StringExtensions.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace EventStore.Common.Utils {
-	public static class StringExtensions {
-		public static bool IsEmptyString(this string s) {
-			return string.IsNullOrEmpty(s);
-		}
-
-		public static bool IsNotEmptyString(this string s) {
-			return !string.IsNullOrEmpty(s);
-		}
-
-		public static bool EqualsOrdinalIgnoreCase(this string a, string b) =>
-			string.Compare(a, b, StringComparison.OrdinalIgnoreCase) == 0;
-
-		public static bool EqualsOrdinalIgnoreCase(this IEnumerable<string> a, IEnumerable<string> b) =>
-			a.SequenceEqual(b, StringComparer.OrdinalIgnoreCase);
-	}
-}
diff --git a/src/EventStore.Common/Utils/VersionInfo.cs b/src/EventStore.Common/Utils/VersionInfo.cs
deleted file mode 100644
index 1a0ec50191b..00000000000
--- a/src/EventStore.Common/Utils/VersionInfo.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace EventStore.Common.Utils {
-	public static class VersionInfo {
-		public const string DefaultVersion = "default_version";
-		public const string OldVersion = "old_version";
-		public const string UnknownVersion = "unknown_version";
-
-		public static string BuildId { get; private set; } = "";
-		public static string Edition { get; private set; } = "";
-		public static string VersionPrefix { get; private set; } = "";
-		public static string VersionSuffix { get; private set; } = "";
-		public static string Version => string.IsNullOrWhiteSpace(VersionSuffix)
-			? VersionPrefix
-			: VersionPrefix + "-" + VersionSuffix;
-
-		public static string CommitSha { get; private set; } = ThisAssembly.Git.Commit;
-		public static string Timestamp { get; private set; } = ThisAssembly.Git.CommitDate;
-
-		public static string Text => $"EventStoreDB version {Version} {Edition} ({BuildId}/{CommitSha})";
-
-		static VersionInfo() {
-			// the official release assemblies contain the version prefix (4 part number)
-			// but not the suffix (beta, rc1, rtm, etc) so that the same assembly can be promoted.
-			var versionPrefix = Assembly.GetEntryAssembly().GetName().Version.ToString();
-			if (versionPrefix.EndsWith(".0"))
-				versionPrefix = versionPrefix[..^2];
-			VersionPrefix = versionPrefix;
-
-			var versionFilePath = Path.Join(
-				Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory),
-				"version.properties");
-			var properties = LoadProperties(versionFilePath);
-
-			if (properties.TryGetValue("version_suffix", out var versionSuffix))
-				VersionSuffix = versionSuffix;
-
-			if (properties.TryGetValue("commit_sha", out var commitSha))
-				CommitSha = commitSha;
-
-			if (properties.TryGetValue("timestamp", out var timestamp))
-				Timestamp = timestamp;
-
-			if (properties.TryGetValue("build_id", out var buildId))
-				BuildId = buildId;
-
-			if (properties.TryGetValue("edition", out var edition))
-				Edition = edition;
-		}
-
-		private static Dictionary<string, string> LoadProperties(string file) {
-			using var reader = new StreamReader(file);
-
-			var properties = new Dictionary<string, string>();
-			string line;
-			while ((line = reader.ReadLine()) != null) {
-				var parts = line.Split('=', 2);
-				if (parts.Length == 2)
-					properties[parts[0]] = parts[1];
-			}
-
-			return properties;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/AssertEx.cs b/src/EventStore.Core.Tests/AssertEx.cs
deleted file mode 100644
index ed9a3fd3321..00000000000
--- a/src/EventStore.Core.Tests/AssertEx.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System;
-using System.Threading;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests;
-
-public static class AssertEx {
-	public static async Task<TException> ThrowsAsync<TException>(Func<Task> code)
-		where TException : Exception {
-		var expected = default(TException);
-		try {
-			await code();
-			Assert.Fail($"Expected exception of type: {typeof(TException)} but no exception was thrown");
-		} catch (TException ex) {
-			expected = ex;
-		} catch (Exception ex) {
-			Assert.Fail($"Expected exception of type: {typeof(TException)} but was {ex.GetType()} instead");
-		}
-
-		return expected;
-	}
-
-	public static async Task DoesNotThrowAsync<TException>(Func<Task> code, string message)
-		where TException : Exception {
-		try {
-			await code();
-		} catch (TException) {
-			Assert.Fail(message);
-		}
-	}
-
-	/// <summary>
-	/// Asserts the given function will return true before the timeout expires.
-	/// Repeatedly evaluates the function until true is returned or the timeout expires.
-	/// Will return immediately when the condition is true.
-	/// Evaluates the timeout until expired.
-	/// Will not yield the thread by default, if yielding is required to resolve deadlocks set yieldThread to true.
-	/// </summary>
-	/// <param name="func">The function to evaluate.</param>
-	/// <param name="timeout">A timeout in milliseconds. If not specified, defaults to 1000.</param>
-	/// <param name="msg">A message to display if the condition is not satisfied.</param>
-	/// <param name="onFail">Action to invoke on failure.</param>
-	public static void IsOrBecomesTrue(Func<bool> func, TimeSpan? timeout = null,
-		string msg = "AssertEx.IsOrBecomesTrue() timed out", Action onFail = null,
-		[CallerMemberName] string memberName = "",
-		[CallerFilePath] string sourceFilePath = "",
-		[CallerLineNumber] int sourceLineNumber = 0) {
-
-		if (SpinWait.SpinUntil(func, timeout ?? TimeSpan.FromMilliseconds(1000)))
-			return;
-
-		onFail?.Invoke();
-
-		Assert.Fail($"{msg} in {memberName} {sourceFilePath}:{sourceLineNumber}");
-	}
-}
diff --git a/src/EventStore.Core.Tests/Authentication/PassthroughHttpAuthenticationProviderTests.cs b/src/EventStore.Core.Tests/Authentication/PassthroughHttpAuthenticationProviderTests.cs
deleted file mode 100644
index 66ff50c648d..00000000000
--- a/src/EventStore.Core.Tests/Authentication/PassthroughHttpAuthenticationProviderTests.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Authentication;
-using EventStore.Core.Authentication.DelegatedAuthentication;
-using EventStore.Core.Authentication.PassthroughAuthentication;
-using EventStore.Core.Services.Transport.Http.Authentication;
-using EventStore.Plugins.Authentication;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Authentication;
-
-[TestFixture]
-public class PassthroughHttpAuthenticationProviderTests {
-	[Test]
-	public void WrongProviderThrows() =>
-		Assert.Throws<ArgumentException>(() => new PassthroughHttpAuthenticationProvider(new TestAuthenticationProvider()));
-
-	[TestCaseSource(nameof(TestCases))]
-	public void CorrectProviderDoesNotThrow(IAuthenticationProvider provider) =>
-		Assert.DoesNotThrow(() => new PassthroughHttpAuthenticationProvider(provider));
-
-	public static IEnumerable<object[]> TestCases() {
-		yield return [new DelegatedAuthenticationProvider(new PassthroughAuthenticationProvider())];
-		yield return [new PassthroughAuthenticationProvider()];
-	}
-
-	class TestAuthenticationProvider : AuthenticationProviderBase {
-		public override void Authenticate(AuthenticationRequest authenticationRequest) => 
-			throw new NotImplementedException();
-	}
-}
diff --git a/src/EventStore.Core.Tests/Authentication/StubPasswordHashAlgorithm.cs b/src/EventStore.Core.Tests/Authentication/StubPasswordHashAlgorithm.cs
deleted file mode 100644
index b77199c5b28..00000000000
--- a/src/EventStore.Core.Tests/Authentication/StubPasswordHashAlgorithm.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Authentication.InternalAuthentication;
-
-namespace EventStore.Core.Tests.Authentication {
-	public class StubPasswordHashAlgorithm : PasswordHashAlgorithm {
-		public override void Hash(string password, out string hash, out string salt) {
-			hash = password;
-			salt = ReverseString(password);
-		}
-
-		public override bool Verify(string password, string hash, string salt) {
-			return password == hash && ReverseString(password) == salt;
-		}
-
-		private static string ReverseString(string s) {
-			return new String(s.Reverse().ToArray());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Authentication/when_handling_multiple_requests_with_reset_password_cache_in_between.cs b/src/EventStore.Core.Tests/Authentication/when_handling_multiple_requests_with_reset_password_cache_in_between.cs
deleted file mode 100644
index baa31c74302..00000000000
--- a/src/EventStore.Core.Tests/Authentication/when_handling_multiple_requests_with_reset_password_cache_in_between.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System.Linq;
-using System.Security.Claims;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Authentication {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_multiple_requests_with_reset_password_cache_in_between<TLogFormat, TStreamId> : with_internal_authentication_provider<TLogFormat, TStreamId> {
-		private bool _unauthorized;
-		private ClaimsPrincipal _authenticatedAs;
-		private bool _error;
-
-		protected override void Given() {
-			base.Given();
-			ExistingEvent("$user-user", "$user", null, "{LoginName:'user', Salt:'drowssap',Hash:'password'}");
-		}
-
-		[SetUp]
-		public void SetUp() {
-			SetUpProvider();
-
-			_internalAuthenticationProvider.Authenticate(
-				new TestAuthenticationRequest(
-					name: "user", 
-					suppliedPassword: "password", 
-					unauthorized: () => { }, 
-					authenticated: _ => { }, 
-					error: () => { }, 
-					notReady: () => { }
-				)
-			);
-			
-			_internalAuthenticationProvider.Handle(new("user"));
-			
-			_consumer.HandledMessages.Clear();
-
-			_internalAuthenticationProvider.Authenticate(
-				new TestAuthenticationRequest(
-					name: "user", 
-					suppliedPassword: "password", 
-					unauthorized: () => _unauthorized = true,
-					authenticated: principal => _authenticatedAs = principal, 
-					error: () => _error = true,
-					notReady: () => { }
-				)
-			);
-		}
-
-		[Test]
-		public void authenticates_user() {
-			Assert.IsFalse(_unauthorized);
-			Assert.IsFalse(_error);
-			Assert.NotNull(_authenticatedAs);
-			Assert.IsTrue(_authenticatedAs.Identity!.Name == "user");
-		}
-
-		[Test]
-		public void publishes_some_read_requests() {
-			Assert.Greater(
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsBackward>().Count()
-				+ _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count(), 0);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Authentication/when_handling_multiple_requests_with_the_same_correct_user_name_and_password.cs b/src/EventStore.Core.Tests/Authentication/when_handling_multiple_requests_with_the_same_correct_user_name_and_password.cs
deleted file mode 100644
index 988b0280285..00000000000
--- a/src/EventStore.Core.Tests/Authentication/when_handling_multiple_requests_with_the_same_correct_user_name_and_password.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System.Linq;
-using System.Security.Claims;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Authentication {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_multiple_requests_with_the_same_correct_user_name_and_password<TLogFormat, TStreamId> :
-		with_internal_authentication_provider<TLogFormat, TStreamId> {
-		private bool _unauthorized;
-		private ClaimsPrincipal _authenticatedAs;
-		private bool _error;
-
-		protected override void Given() {
-			base.Given();
-			ExistingEvent("$user-user", "$user", null, "{LoginName:'user', Salt:'drowssap',Hash:'password'}");
-		}
-
-		[SetUp]
-		public void SetUp() {
-			SetUpProvider();
-
-			_internalAuthenticationProvider.Authenticate(
-				new TestAuthenticationRequest("user", "password", () => { }, p => { }, () => { }, () => { }));
-
-			_consumer.HandledMessages.Clear();
-
-			_internalAuthenticationProvider.Authenticate(
-				new TestAuthenticationRequest(
-					"user", "password", () => _unauthorized = true, p => _authenticatedAs = p, () => _error = true,
-					() => { }));
-		}
-
-		[Test]
-		public void authenticates_user() {
-			Assert.IsFalse(_unauthorized);
-			Assert.IsFalse(_error);
-			Assert.NotNull(_authenticatedAs);
-			Assert.IsTrue(_authenticatedAs.Identity.Name == "user");
-		}
-
-		[Test]
-		public void does_not_publish_any_read_requests() {
-			Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsBackward>().Count());
-			Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Authentication/with_internal_authentication_provider.cs b/src/EventStore.Core.Tests/Authentication/with_internal_authentication_provider.cs
deleted file mode 100644
index 2e6c3a40167..00000000000
--- a/src/EventStore.Core.Tests/Authentication/with_internal_authentication_provider.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using EventStore.Core.Authentication.InternalAuthentication;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Plugins.Authentication;
-
-namespace EventStore.Core.Tests.Authentication {
-	public abstract class with_internal_authentication_provider<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		protected new IODispatcher _ioDispatcher;
-		protected InternalAuthenticationProvider _internalAuthenticationProvider;
-
-		protected void SetUpProvider() {
-			_ioDispatcher = new IODispatcher(_bus, _bus);
-			_bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_ioDispatcher.BackwardReader);
-			_bus.Subscribe<ClientMessage.NotHandled>(_ioDispatcher.BackwardReader);
-			_bus.Subscribe(_ioDispatcher.ForwardReader);
-			_bus.Subscribe(_ioDispatcher.Writer);
-			_bus.Subscribe(_ioDispatcher.StreamDeleter);
-			_bus.Subscribe(_ioDispatcher.Awaker);
-			_bus.Subscribe<IODispatcherDelayedMessage>(_ioDispatcher);
-			_bus.Subscribe<ClientMessage.NotHandled>(_ioDispatcher);
-
-			_internalAuthenticationProvider = new(_bus, _ioDispatcher, new StubPasswordHashAlgorithm(), 1000, false, DefaultData.DefaultUserOptions);
-			_bus.Subscribe(_internalAuthenticationProvider);
-		}
-	}
-
-	class TestAuthenticationRequest(
-		string name,
-		string suppliedPassword,
-		Action unauthorized,
-		Action<ClaimsPrincipal> authenticated,
-		Action error,
-		Action notReady
-	) : AuthenticationRequest("test", new Dictionary<string, string> {
-			["uid"] = name,
-			["pwd"] = suppliedPassword
-		}) {
-		public override void Unauthorized() => unauthorized();
-
-		public override void Authenticated(ClaimsPrincipal principal) => authenticated(principal);
-
-		public override void Error() => error();
-
-		public override void NotReady() => notReady();
-	}
-}
diff --git a/src/EventStore.Core.Tests/Authorization/LegacyPolicyVerification.cs b/src/EventStore.Core.Tests/Authorization/LegacyPolicyVerification.cs
deleted file mode 100644
index fce7833491e..00000000000
--- a/src/EventStore.Core.Tests/Authorization/LegacyPolicyVerification.cs
+++ /dev/null
@@ -1,533 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Authorization;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Plugins.Authorization;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Authorization {
-	[TestFixture(true, true, true)]
-	[TestFixture(true, true, false)]
-	[TestFixture(true, false, true)]
-	[TestFixture(true, false, false)]
-	[TestFixture(false, true, true)]
-	[TestFixture(false, true, false)]
-	[TestFixture(false, false, true)]
-	[TestFixture(false, false, false)]
-	public class LegacyPolicyVerification {
-		private const string _streamWithDefaultPermissions = "StreamWithDefaultPermissions";
-		private const string _streamWithCustomPermissions = "StreamWithCustomPermissions";
-
-		private readonly IAuthorizationProvider _authorizationProvider;
-		private readonly AclResponder _aclResponder;
-		private static bool _allowAnonymousEndpointAccess;
-		private static bool _allowAnonymousStreamAccess;
-		private static bool _overrideAnonymousGossipEndpointAccess;
-
-		public LegacyPolicyVerification(bool allowAnonymousEndpointAccess, bool allowAnonymousStreamAccess, bool overrideAnonymousGossipEndpointAccess) {
-			_aclResponder = new AclResponder();
-			_allowAnonymousEndpointAccess = allowAnonymousEndpointAccess;
-			_allowAnonymousStreamAccess = allowAnonymousStreamAccess;
-			_overrideAnonymousGossipEndpointAccess = overrideAnonymousGossipEndpointAccess;
-			_authorizationProvider = new InternalAuthorizationProviderFactory([new LegacyPolicySelectorFactory(
-				allowAnonymousEndpointAccess,
-				allowAnonymousStreamAccess,
-				overrideAnonymousGossipEndpointAccess).Create(_aclResponder, default)])
-				.Build();
-		}
-
-		public abstract class PolicyVerificationParameters {
-			public ClaimsPrincipal User { get; }
-			public Operation Operation { get; }
-			public string Stream { get; }
-			public StorageMessage.EffectiveAcl StreamAcl { get; }
-			public abstract string TestName { get; }
-
-			public PolicyVerificationParameters(ClaimsPrincipal user, Operation operation, string stream, StorageMessage.EffectiveAcl streamAcl) {
-				User = user;
-				Operation = operation;
-				Stream = stream;
-				StreamAcl = streamAcl;
-			}
-
-			public override string ToString() => TestName;
-		}
-
-		public class StaticPolicyVerificationParameters : PolicyVerificationParameters {
-			public bool IsAuthorized { get; }
-			public bool ShouldRequestAcl { get; }
-			public override string TestName => $"{User.Identity?.Name ?? "Anonymous (empty)"} {(IsAuthorized ? "is" : "is not")} authorized to perform operation {Operation}";
-
-			public StaticPolicyVerificationParameters(ClaimsPrincipal user, Operation operation, string stream, StorageMessage.EffectiveAcl streamAcl, bool isAuthorized, bool shouldRequestAcl) :
-			base (user, operation, stream, streamAcl){
-				IsAuthorized = isAuthorized;
-				ShouldRequestAcl = shouldRequestAcl;
-			}
-		}
-
-		public class ConfigurablePolicyVerificationParameters : PolicyVerificationParameters {
-			public Func<bool, bool, bool> AuthorizationCheck { get; }
-			public Func<bool, bool> AclCheck { get; }
-			public override string TestName => $"Verify if Anonymous user is authorized to perform operation {Operation}";
-
-			public ConfigurablePolicyVerificationParameters(ClaimsPrincipal user, Operation operation, string stream, StorageMessage.EffectiveAcl streamAcl, Func<bool, bool, bool> authorizationCheck, Func<bool, bool> aclCheck)
-			: base(user, operation, stream, streamAcl){
-				AuthorizationCheck = authorizationCheck;
-				AclCheck = aclCheck;
-			}
-		}
-
-		public class GossipPolicyVerificationParameters : PolicyVerificationParameters {
-			public Func<bool, bool, bool> AuthorizationCheck { get; }
-
-			public override string TestName =>
-				$"Verify if Anonymous user is authorized to perform gossip operation {Operation}";
-
-			public GossipPolicyVerificationParameters(ClaimsPrincipal user, Operation operation, string stream,
-				StorageMessage.EffectiveAcl streamAcl, Func<bool, bool, bool> authorizationCheck)
-				: base(user, operation, stream, streamAcl) {
-				AuthorizationCheck = authorizationCheck;
-			}
-		}
-
-		public static IEnumerable<PolicyVerificationParameters> PolicyTests() {
-			StorageMessage.EffectiveAcl systemStreamPermission = new StorageMessage.EffectiveAcl(
-				SystemSettings.Default.SystemStreamAcl,
-				SystemSettings.Default.SystemStreamAcl,
-				SystemSettings.Default.SystemStreamAcl
-			);
-
-			StorageMessage.EffectiveAcl defaultUseruserStreamPermission = new StorageMessage.EffectiveAcl(
-				SystemSettings.Default.UserStreamAcl,
-				SystemSettings.Default.UserStreamAcl,
-				SystemSettings.Default.UserStreamAcl
-			);
-
-			StorageMessage.EffectiveAcl userStreamPermission = new StorageMessage.EffectiveAcl(
-				new StreamAcl("test", "test", "test", "test", "test"),
-				SystemSettings.Default.UserStreamAcl,
-				SystemSettings.Default.UserStreamAcl
-			);
-
-			ClaimsPrincipal admin = CreatePrincipal("admin", SystemRoles.Admins);
-			ClaimsPrincipal userAdmin = CreatePrincipal("adminuser", SystemRoles.Admins);
-			ClaimsPrincipal ops = CreatePrincipal("ops", SystemRoles.Operations);
-			ClaimsPrincipal userOps = CreatePrincipal("opsuser", SystemRoles.Operations);
-			ClaimsPrincipal user1 = CreatePrincipal("test");
-			ClaimsPrincipal user2 = CreatePrincipal("test2");
-			ClaimsPrincipal userSystem = SystemAccounts.System;
-
-			var admins = new[] {admin, userAdmin};
-			var operations = new[] {ops, userOps};
-			var users = new[] {user1, user2};
-			var system = new[] {userSystem};
-			var anonymous = new[]{new ClaimsPrincipal(), new ClaimsPrincipal(new ClaimsIdentity(new Claim[]{new Claim(ClaimTypes.Anonymous, ""), })), };
-			foreach (var user in system) {
-				foreach (var operation in SystemOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						true,
-						false
-					);
-				}
-			}
-			foreach (var user in admins) {
-				foreach (var operation in SystemOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						false,
-						false
-					);
-				}
-				foreach (var operation in AdminOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						true,
-						false
-					);
-				}
-				foreach (var operation in OpsOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						true,
-						false
-					);
-				}
-
-				foreach (var operation in UserOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						true,
-						false
-					);
-				}
-				
-				foreach (var operation in AuthenticatedOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						true,
-						false
-					);
-				}
-				
-				foreach (var operation in AnonymousOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						true,
-						false
-					);
-				}
-			}
-
-			foreach (var user in operations) {
-				foreach (var operation in SystemOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						false,
-						false
-					);
-				}
-				foreach (var operation in AdminOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						false,
-						operation.Item3 != null
-					);
-				}
-				foreach (var operation in OpsOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						true,
-						false
-					);
-				}
-
-				foreach (var operation in UserOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						operation.Item2 == null || operation.Item3 == defaultUseruserStreamPermission,
-						operation.Item2 != null
-					);
-				}
-
-				foreach (var operation in AuthenticatedOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						true,
-						operation.Item2 != null
-					);
-				}
-
-				foreach (var operation in AnonymousOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						true,
-						operation.Item2 != null
-					);
-				}
-			}
-
-			foreach (var user in users) {
-				foreach (var operation in SystemOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						false,
-						false
-					);
-				}
-				foreach (var operation in AdminOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						false,
-						operation.Item3 != null
-					);
-				}
-				foreach (var operation in OpsOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						false,
-						false
-					);
-				}
-
-				foreach (var operation in UserOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						operation.Item2 == null || user.Identity.Name != "test2" || operation.Item3 == defaultUseruserStreamPermission,
-						operation.Item3 != null
-					);
-				}
-
-				foreach (var operation in AuthenticatedOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						true,
-						operation.Item3 != null
-					);
-				}
-				foreach (var operation in AnonymousOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						true,
-						operation.Item3 != null
-					);
-				}
-			}
-
-			foreach (var user in anonymous) {
-				foreach (var operation in SystemOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						false,
-						false
-					);
-				}
-				foreach (var operation in AdminOperations()) {
-					yield return new ConfigurablePolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						(_, _) => false,
-						(allowAnonymousStreamAccess) => allowAnonymousStreamAccess
-					);
-				}
-				foreach (var operation in OpsOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						false,
-						operation.Item3 != null
-					);
-				}
-
-				foreach (var operation in UserOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						false,
-						false
-					);
-				}
-
-				foreach (var operation in AuthenticatedOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						false,
-						false
-					);
-				}
-				foreach (var operation in AnonymousOperations()) {
-					yield return new StaticPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						true,
-						operation.Item3 != null
-					);
-				}
-				foreach (var operation in AllowAnonymousEndpointAccessOperations()) {
-					yield return new ConfigurablePolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						(allowAnonymousEndpointAccess, _) => allowAnonymousEndpointAccess,
-						(_) => operation.Item3 != null
-					);
-				}
-				foreach (var operation in AllowAnonymousStreamAccessOperations()) {
-					yield return new ConfigurablePolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						(_, allowAnonymousStreamAccess) => allowAnonymousStreamAccess,
-						(allowAnonymousStreamAccess) => allowAnonymousStreamAccess
-					);
-				}
-
-				foreach (var operation in ClientGossipOperations()) {
-					yield return new GossipPolicyVerificationParameters(user,
-						operation.Item1, operation.Item2, operation.Item3,
-						(allowAnonymousGossipAccess, overrideAnonymousGossipAccess) =>
-							overrideAnonymousGossipAccess || allowAnonymousGossipAccess
-					);
-				}
-			}
-
-			IEnumerable<(Operation, string, StorageMessage.EffectiveAcl)> SystemOperations() {
-				yield return CreateOperation(Operations.Node.Gossip.Update);
-
-				yield return CreateOperation(Operations.Node.Elections.Prepare);
-				yield return CreateOperation(Operations.Node.Elections.PrepareOk);
-				yield return CreateOperation(Operations.Node.Elections.ViewChange);
-				yield return CreateOperation(Operations.Node.Elections.ViewChangeProof);
-				yield return CreateOperation(Operations.Node.Elections.Proposal);
-				yield return CreateOperation(Operations.Node.Elections.Accept);
-				yield return CreateOperation(Operations.Node.Elections.LeaderIsResigning);
-				yield return CreateOperation(Operations.Node.Elections.LeaderIsResigningOk);
-				yield return CreateOperation(Operations.Node.Gossip.Read);
-			}
-
-			IEnumerable<(Operation, string, StorageMessage.EffectiveAcl)> AdminOperations() {
-				yield return (new Operation(Operations.Streams.Read).WithParameter(
-						Operations.Streams.Parameters.StreamId("$$$scavenge")),
-					"$$$scavenge",
-					systemStreamPermission);
-			}
-
-			IEnumerable<(Operation, string, StorageMessage.EffectiveAcl)> OpsOperations() {
-				yield return CreateOperation(Operations.Node.Information.Subsystems);
-
-				yield return CreateOperation(Operations.Node.Shutdown);
-				yield return CreateOperation(Operations.Node.ReloadConfiguration);
-				yield return CreateOperation(Operations.Node.Scavenge.Start);
-				yield return CreateOperation(Operations.Node.Scavenge.Stop);
-				yield return CreateOperation(Operations.Node.Scavenge.Read);
-				yield return CreateOperation(Operations.Node.MergeIndexes);
-				yield return CreateOperation(Operations.Node.SetPriority);
-				yield return CreateOperation(Operations.Node.Resign);
-
-				yield return CreateOperation(Operations.Subscriptions.Create);
-				yield return CreateOperation(Operations.Subscriptions.Update);
-				yield return CreateOperation(Operations.Subscriptions.Delete);
-				yield return CreateOperation(Operations.Subscriptions.Restart);
-
-				yield return CreateOperation(Operations.Node.Information.Histogram);
-				yield return CreateOperation(Operations.Node.Information.Options);
-				yield return (new Operation(Operations.Subscriptions.ReplayParked).WithParameter(Operations.Subscriptions.Parameters.StreamId(_streamWithCustomPermissions)), _streamWithCustomPermissions, null);
-				yield return (new Operation(Operations.Subscriptions.ReplayParked).WithParameter(Operations.Subscriptions.Parameters.StreamId(_streamWithDefaultPermissions)), _streamWithDefaultPermissions, null);
-				
-				yield return CreateOperation(Operations.Projections.UpdateConfiguration);
-				
-				yield return CreateOperation(Operations.Projections.ReadConfiguration);
-				yield return CreateOperation(Operations.Projections.Delete);
-				yield return CreateOperation(Operations.Projections.Restart);
-			}
-
-			IEnumerable<(Operation, string, StorageMessage.EffectiveAcl)> UserOperations() {
-				
-				yield return (new Operation(Operations.Subscriptions.ProcessMessages).WithParameter(Operations.Subscriptions.Parameters.StreamId(_streamWithCustomPermissions)), _streamWithCustomPermissions, userStreamPermission);
-				yield return (new Operation(Operations.Subscriptions.ProcessMessages).WithParameter(Operations.Subscriptions.Parameters.StreamId(_streamWithDefaultPermissions)), _streamWithDefaultPermissions, defaultUseruserStreamPermission);
-				yield return CreateOperation(Operations.Projections.List);
-				yield return CreateOperation(Operations.Projections.Abort);
-				yield return CreateOperation(Operations.Projections.Create);
-				yield return CreateOperation(Operations.Projections.DebugProjection);
-				yield return CreateOperation(Operations.Projections.Disable);
-				yield return CreateOperation(Operations.Projections.Enable);
-				yield return CreateOperation(Operations.Projections.Read);
-				yield return CreateOperation(Operations.Projections.Reset);
-				yield return CreateOperation(Operations.Projections.Update);
-				yield return CreateOperation(Operations.Projections.State);
-				yield return CreateOperation(Operations.Projections.Status);
-				yield return CreateOperation(Operations.Projections.Statistics);
-			}
-
-			IEnumerable<(Operation, string, StorageMessage.EffectiveAcl)> AuthenticatedOperations() {
-				yield return CreateOperation(Operations.Subscriptions.Statistics);
-				yield return CreateOperation(Operations.Projections.List);
-			}
-
-			IEnumerable<(Operation, string, StorageMessage.EffectiveAcl)> AnonymousOperations() {
-				yield return CreateOperation(Operations.Node.Redirect);
-				yield return CreateOperation(Operations.Node.StaticContent);
-				yield return CreateOperation(Operations.Node.Ping);
-				yield return CreateOperation(Operations.Node.Information.Read);
-			}
-
-			IEnumerable<(Operation, string, StorageMessage.EffectiveAcl)> ClientGossipOperations() {
-				yield return CreateOperation(Operations.Node.Gossip.ClientRead);
-			}
-
-			IEnumerable<(Operation, string, StorageMessage.EffectiveAcl)> AllowAnonymousEndpointAccessOperations() {
-				yield return CreateOperation(Operations.Node.Options);
-				yield return CreateOperation(Operations.Node.Statistics.Read);
-				yield return CreateOperation(Operations.Node.Statistics.Replication);
-				yield return CreateOperation(Operations.Node.Statistics.Tcp);
-				yield return CreateOperation(Operations.Node.Statistics.Custom);
-			}
-			
-			IEnumerable<(Operation, string, StorageMessage.EffectiveAcl)> AllowAnonymousStreamAccessOperations() {
-				yield return (new Operation(Operations.Streams.Read).WithParameter(
-						Operations.Streams.Parameters.StreamId(_streamWithDefaultPermissions)),
-					_streamWithDefaultPermissions, defaultUseruserStreamPermission);
-				yield return (new Operation(Operations.Streams.Write).WithParameter(
-						Operations.Streams.Parameters.StreamId(_streamWithDefaultPermissions)),
-					_streamWithDefaultPermissions, defaultUseruserStreamPermission);
-				yield return (new Operation(Operations.Streams.Delete).WithParameter(
-						Operations.Streams.Parameters.StreamId(_streamWithDefaultPermissions)),
-					_streamWithDefaultPermissions, defaultUseruserStreamPermission);
-				yield return (new Operation(Operations.Streams.MetadataRead).WithParameter(
-						Operations.Streams.Parameters.StreamId(_streamWithDefaultPermissions)),
-					_streamWithDefaultPermissions, defaultUseruserStreamPermission);
-				yield return (new Operation(Operations.Streams.MetadataWrite).WithParameter(
-						Operations.Streams.Parameters.StreamId(_streamWithDefaultPermissions)),
-					_streamWithDefaultPermissions, defaultUseruserStreamPermission);
-			}
-			
-			(Operation, string, StorageMessage.EffectiveAcl) CreateOperation(OperationDefinition def) {
-				return (new Operation(def),null, null);
-			}
-
-			ClaimsPrincipal CreatePrincipal(string name, params string[] roles) {
-				var claims =
-					(new[] {new Claim(ClaimTypes.Name, name)}).Concat(roles.Select(x => new Claim(ClaimTypes.Role, x)));
-				return new ClaimsPrincipal(new ClaimsIdentity(claims));
-			}
-		}
-
-		[Test]
-		public async Task VerifyPolicy([ValueSource(nameof(PolicyTests))]PolicyVerificationParameters pvp) {
-			_aclResponder.ExpectedAcl(pvp.Stream, pvp.StreamAcl);
-			var result =
-					await _authorizationProvider.CheckAccessAsync(pvp.User, pvp.Operation, CancellationToken.None);
-			switch (pvp) {
-				case StaticPolicyVerificationParameters staticPvp:
-					Assert.AreEqual(staticPvp.IsAuthorized, result,
-						staticPvp.IsAuthorized ? "was not authorized" : "was authorized");
-					Assert.AreEqual(staticPvp.ShouldRequestAcl, _aclResponder.MessageReceived,
-						staticPvp.ShouldRequestAcl ? "did not request acl" : "requested acl");
-					break;
-				case ConfigurablePolicyVerificationParameters confPvp:
-					Assert.AreEqual(confPvp.AuthorizationCheck(_allowAnonymousEndpointAccess, _allowAnonymousStreamAccess), result,
-						confPvp.AuthorizationCheck(_allowAnonymousEndpointAccess, _allowAnonymousStreamAccess)
-							? "was not authorized"
-							: "was authorized");
-					Assert.AreEqual(confPvp.AclCheck(_allowAnonymousStreamAccess), _aclResponder.MessageReceived,
-						confPvp.AclCheck(_allowAnonymousStreamAccess) ? "did not request acl" : "requested acl");
-					break;
-				case GossipPolicyVerificationParameters gossipPvp:
-					Assert.AreEqual(
-						gossipPvp.AuthorizationCheck(_allowAnonymousEndpointAccess,
-							_overrideAnonymousGossipEndpointAccess), result,
-						gossipPvp.AuthorizationCheck(_allowAnonymousEndpointAccess,
-							_overrideAnonymousGossipEndpointAccess)
-							? "was not authorized"
-							: "was authorized");
-					break;
-			}
-		}
-
-		class AclResponder : IPublisher {
-			public bool MessageReceived { get; private set; }
-			private StorageMessage.EffectiveAcl _acl;
-			private string _expectedStream;
-
-			public AclResponder() {
-				MessageReceived = false;
-			}
-			public void Publish(Message message) {
-				MessageReceived = true;
-				Assert.IsInstanceOf<StorageMessage.EffectiveStreamAclRequest>(message);
-				var request = (StorageMessage.EffectiveStreamAclRequest)message;
-				Assert.AreEqual(_expectedStream, request.StreamId);
-				Assert.NotNull(request.Envelope);
-				request.Envelope.ReplyWith(new StorageMessage.EffectiveStreamAclResponse(_acl));
-			}
-
-			public void ExpectedAcl(string stream, StorageMessage.EffectiveAcl acl) {
-				MessageReceived = false;
-				if (stream == null) return;
-				_expectedStream = SystemStreams.IsMetastream(stream) ? SystemStreams.OriginalStreamOf(stream) : stream;
-				_acl = acl;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Authorization/MultiClaimMatchTests.cs b/src/EventStore.Core.Tests/Authorization/MultiClaimMatchTests.cs
deleted file mode 100644
index b479e1d4397..00000000000
--- a/src/EventStore.Core.Tests/Authorization/MultiClaimMatchTests.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Authorization;
-using EventStore.Plugins.Authorization;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Authorization {
-	[TestFixture]
-	public class MultiClaimMatchTests {
-		[Test]
-		public async Task NoneMatchingHasMatches() {
-			var assertion = new MultipleClaimMatchAssertion(Grant.Deny, MultipleMatchMode.None,
-				new Claim("test1", "value1"), new Claim("test2", "value2"));
-			var cp = new ClaimsPrincipal(new ClaimsIdentity(new Claim[] {new Claim("test1", "value1")}));
-			var context = new EvaluationContext(new Operation("test", "test"), CancellationToken.None);
-			Assert.False(await assertion.Evaluate(cp, new Operation("test", "test"),
-				new PolicyInformation("test", 1, DateTimeOffset.MaxValue), context));
-			Assert.AreEqual(Grant.Unknown, context.Grant);
-		}
-
-		[Test]
-		public async Task NonMatchingHasNoMatches() {
-			var assertion = new MultipleClaimMatchAssertion(Grant.Deny, MultipleMatchMode.None,
-				new Claim("test1", "value1"), new Claim("test2", "value2"));
-			var cp = new ClaimsPrincipal(new ClaimsIdentity(new Claim[] {new Claim("test3", "value3")}));
-			var context = new EvaluationContext(new Operation("test", "test"), CancellationToken.None);
-			Assert.True(await assertion.Evaluate(cp, new Operation("test", "test"),
-				new PolicyInformation("test", 1, DateTimeOffset.MaxValue), context));
-			Assert.AreEqual(Grant.Deny, context.Grant);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Authorization/TestAuthorizationProvider.cs b/src/EventStore.Core.Tests/Authorization/TestAuthorizationProvider.cs
deleted file mode 100644
index cc290599304..00000000000
--- a/src/EventStore.Core.Tests/Authorization/TestAuthorizationProvider.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Plugins;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Tests.Authorization;
-
-class TestAuthorizationProvider : Plugin, IAuthorizationProvider {
-	public ValueTask<bool> CheckAccessAsync(ClaimsPrincipal principal, Operation operation, CancellationToken cancellationToken) => 
-		ValueTask.FromResult(true);
-}
diff --git a/src/EventStore.Core.Tests/AwakeService/TestMessage.cs b/src/EventStore.Core.Tests/AwakeService/TestMessage.cs
deleted file mode 100644
index 3b066ce5d42..00000000000
--- a/src/EventStore.Core.Tests/AwakeService/TestMessage.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Tests.AwakeService {
-	public class TestMessage : Message {
-		public readonly int Kind;
-
-		public TestMessage(int kind) {
-			Kind = kind;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/AwakeService/when_creating.cs b/src/EventStore.Core.Tests/AwakeService/when_creating.cs
deleted file mode 100644
index efde7110562..00000000000
--- a/src/EventStore.Core.Tests/AwakeService/when_creating.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.AwakeService {
-	[TestFixture]
-	public class when_creating {
-		[Test]
-		public void it_can_ce_created() {
-			var it = new Core.Services.AwakeReaderService.AwakeService();
-			Assert.NotNull(it);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/AwakeService/when_handling_comitted_event.cs b/src/EventStore.Core.Tests/AwakeService/when_handling_comitted_event.cs
deleted file mode 100644
index 9a22e2147bb..00000000000
--- a/src/EventStore.Core.Tests/AwakeService/when_handling_comitted_event.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.AwakeService {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_comitted_event<TLogFormat, TStreamId> {
-		private Core.Services.AwakeReaderService.AwakeService _it;
-		private EventRecord _eventRecord;
-		private StorageMessage.EventCommitted _eventCommitted;
-		private Exception _exception;
-
-		[SetUp]
-		public void SetUp() {
-			_exception = null;
-			Given();
-			When();
-		}
-
-		private void Given() {
-			_it = new Core.Services.AwakeReaderService.AwakeService();
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			_eventRecord = new EventRecord(
-				10,
-				LogRecord.Prepare(
-					recordFactory, 500, Guid.NewGuid(), Guid.NewGuid(), 500, 0, streamId, 99, PrepareFlags.Data,
-					eventTypeId, new byte[0], null, DateTime.UtcNow), "Stream", "EventType");
-			_eventCommitted = new StorageMessage.EventCommitted(1000, _eventRecord, isTfEof: true);
-		}
-
-		private void When() {
-			try {
-				_it.Handle(_eventCommitted);
-			} catch (Exception ex) {
-				_exception = ex;
-			}
-		}
-
-		[Test]
-		public void it_is_handled() {
-			Assert.IsNull(_exception, (_exception ?? (object)"").ToString());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/AwakeService/when_handling_committed_event_after_unsybscribe.cs b/src/EventStore.Core.Tests/AwakeService/when_handling_committed_event_after_unsybscribe.cs
deleted file mode 100644
index d5786491163..00000000000
--- a/src/EventStore.Core.Tests/AwakeService/when_handling_committed_event_after_unsybscribe.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Tests.Bus.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.AwakeService {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_committed_event_after_unsybscribe<TLogFormat, TStreamId> {
-		private Core.Services.AwakeReaderService.AwakeService _it;
-		private EventRecord _eventRecord;
-		private StorageMessage.EventCommitted _eventCommitted;
-		private Exception _exception;
-		private IEnvelope _envelope;
-		private SynchronousScheduler _publisher;
-		private TestHandler<TestMessage> _handler;
-		private TestMessage _reply1;
-		private TestMessage _reply2;
-		private TestMessage _reply3;
-		private TestMessage _reply4;
-		private TestMessage _reply5;
-		private Guid _correlationId1;
-		private Guid _correlationId2;
-		private Guid _correlationId3;
-		private Guid _correlationId4;
-		private Guid _correlationId5;
-
-		[SetUp]
-		public void SetUp() {
-			_exception = null;
-			Given();
-			When();
-		}
-
-		private void Given() {
-			_it = new Core.Services.AwakeReaderService.AwakeService();
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			_eventRecord = new EventRecord(
-				100,
-				LogRecord.Prepare(
-					recordFactory, 1500, Guid.NewGuid(), Guid.NewGuid(), 1500, 0, streamId, 99, PrepareFlags.Data,
-					eventTypeId, new byte[0], null, DateTime.UtcNow), "Stream", "EventType");
-			_eventCommitted = new StorageMessage.EventCommitted(2000, _eventRecord, isTfEof: true);
-			_publisher = new();
-			_envelope = _publisher;
-			_handler = new TestHandler<TestMessage>();
-			_publisher.Subscribe(_handler);
-			_reply1 = new TestMessage(1);
-			_reply2 = new TestMessage(2);
-			_reply3 = new TestMessage(3);
-			_reply4 = new TestMessage(4);
-			_reply5 = new TestMessage(5);
-
-			_correlationId1 = Guid.NewGuid();
-			_it.Handle(
-				new AwakeServiceMessage.SubscribeAwake(
-					_envelope, _correlationId1, "Stream", new TFPos(1000, 500), _reply1));
-			_correlationId2 = Guid.NewGuid();
-			_it.Handle(
-				new AwakeServiceMessage.SubscribeAwake(
-					_envelope, _correlationId2, "Stream", new TFPos(100000, 99500), _reply2));
-			_correlationId3 = Guid.NewGuid();
-			_it.Handle(
-				new AwakeServiceMessage.SubscribeAwake(
-					_envelope, _correlationId3, "Stream2", new TFPos(1000, 500), _reply3));
-			_correlationId4 = Guid.NewGuid();
-			_it.Handle(
-				new AwakeServiceMessage.SubscribeAwake(
-					_envelope, _correlationId4, null, new TFPos(1000, 500), _reply4));
-			_correlationId5 = Guid.NewGuid();
-			_it.Handle(
-				new AwakeServiceMessage.SubscribeAwake(
-					_envelope, _correlationId5, null, new TFPos(100000, 99500), _reply5));
-		}
-
-		private void When() {
-			try {
-				_it.Handle(new AwakeServiceMessage.UnsubscribeAwake(_correlationId1));
-				_it.Handle(new AwakeServiceMessage.UnsubscribeAwake(_correlationId2));
-				_it.Handle(new AwakeServiceMessage.UnsubscribeAwake(_correlationId3));
-				_it.Handle(new AwakeServiceMessage.UnsubscribeAwake(_correlationId4));
-				_it.Handle(new AwakeServiceMessage.UnsubscribeAwake(_correlationId5));
-				_it.Handle(_eventCommitted);
-			} catch (Exception ex) {
-				_exception = ex;
-			}
-		}
-
-		[Test]
-		public void it_is_handled() {
-			Assert.IsNull(_exception, (_exception ?? (object)"").ToString());
-		}
-
-		[Test]
-		public void does_not_awake_stream_subscriber_before_position() {
-			Assert.That(!_handler.HandledMessages.Any(m => m.Kind == 1));
-		}
-
-		[Test]
-		public void does_not_awake_stream_subscriber_after_position() {
-			Assert.That(!_handler.HandledMessages.Any(m => m.Kind == 2));
-		}
-
-		[Test]
-		public void does_not_awake_all_subscriber_before_position() {
-			Assert.That(!_handler.HandledMessages.Any(m => m.Kind == 4));
-		}
-
-		[Test]
-		public void does_not_awake_all_subscriber_after_position() {
-			Assert.That(!_handler.HandledMessages.Any(m => m.Kind == 5));
-		}
-
-		[Test]
-		public void does_not_awake_another_stream_subscriber_before_position() {
-			Assert.That(!_handler.HandledMessages.Any(m => m.Kind == 3));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/AwakeService/when_handling_committed_event_with_subscribers.cs b/src/EventStore.Core.Tests/AwakeService/when_handling_committed_event_with_subscribers.cs
deleted file mode 100644
index 6044aa588dd..00000000000
--- a/src/EventStore.Core.Tests/AwakeService/when_handling_committed_event_with_subscribers.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Tests.Bus.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.AwakeService {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_committed_event_with_subscribers<TLogFormat, TStreamId> {
-		private Core.Services.AwakeReaderService.AwakeService _it;
-		private EventRecord _eventRecord;
-		private StorageMessage.EventCommitted _eventCommitted;
-		private Exception _exception;
-		private IEnvelope _envelope;
-		private SynchronousScheduler _publisher;
-		private TestHandler<TestMessage> _handler;
-		private TestMessage _reply1;
-		private TestMessage _reply2;
-		private TestMessage _reply3;
-		private TestMessage _reply4;
-		private TestMessage _reply5;
-
-		[SetUp]
-		public void SetUp() {
-			_exception = null;
-			Given();
-			When();
-		}
-
-		private void Given() {
-			_it = new Core.Services.AwakeReaderService.AwakeService();
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			_eventRecord = new EventRecord(
-				100,
-				LogRecord.Prepare(
-					recordFactory, 1500, Guid.NewGuid(), Guid.NewGuid(), 1500, 0, streamId, 99, PrepareFlags.Data,
-					eventTypeId, new byte[0], null, DateTime.UtcNow), "Stream", "EventType");
-			_eventCommitted = new StorageMessage.EventCommitted(2000, _eventRecord, isTfEof: true);
-			_publisher = new();
-			_envelope = _publisher;
-			_handler = new TestHandler<TestMessage>();
-			_publisher.Subscribe(_handler);
-			_reply1 = new TestMessage(1);
-			_reply2 = new TestMessage(2);
-			_reply3 = new TestMessage(3);
-			_reply4 = new TestMessage(4);
-			_reply5 = new TestMessage(5);
-
-			_it.Handle(
-				new AwakeServiceMessage.SubscribeAwake(
-					_envelope, Guid.NewGuid(), "Stream", new TFPos(1000, 500), _reply1));
-			_it.Handle(
-				new AwakeServiceMessage.SubscribeAwake(
-					_envelope, Guid.NewGuid(), "Stream", new TFPos(100000, 99500), _reply2));
-			_it.Handle(
-				new AwakeServiceMessage.SubscribeAwake(
-					_envelope, Guid.NewGuid(), "Stream2", new TFPos(1000, 500), _reply3));
-			_it.Handle(
-				new AwakeServiceMessage.SubscribeAwake(
-					_envelope, Guid.NewGuid(), null, new TFPos(1000, 500), _reply4));
-			_it.Handle(
-				new AwakeServiceMessage.SubscribeAwake(
-					_envelope, Guid.NewGuid(), null, new TFPos(100000, 99500), _reply5));
-		}
-
-		private void When() {
-			try {
-				_it.Handle(_eventCommitted);
-			} catch (Exception ex) {
-				_exception = ex;
-			}
-		}
-
-		[Test]
-		public void it_is_handled() {
-			Assert.IsNull(_exception, (_exception ?? (object)"").ToString());
-		}
-
-		[Test]
-		public void awakes_stream_subscriber_before_position() {
-			Assert.That(_handler.HandledMessages.Any(m => m.Kind == 1));
-		}
-
-		[Test]
-		public void does_not_awake_stream_subscriber_after_position() {
-			Assert.That(_handler.HandledMessages.All(m => m.Kind != 2));
-		}
-
-		[Test]
-		public void awakes_all_subscriber_before_position() {
-			Assert.That(_handler.HandledMessages.Any(m => m.Kind == 4));
-		}
-
-		[Test]
-		public void does_not_awake_all_subscriber_after_position() {
-			Assert.That(_handler.HandledMessages.All(m => m.Kind != 5));
-		}
-
-		[Test]
-		public void does_not_awake_another_stream_subscriber_before_position() {
-			Assert.That(_handler.HandledMessages.All(m => m.Kind != 3));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/AwakeService/when_handling_subscribe_awake.cs b/src/EventStore.Core.Tests/AwakeService/when_handling_subscribe_awake.cs
deleted file mode 100644
index a4c937eb3c5..00000000000
--- a/src/EventStore.Core.Tests/AwakeService/when_handling_subscribe_awake.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.AwakeReaderService;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.AwakeService {
-	[TestFixture]
-	public class when_handling_subscribe_awake {
-		private Core.Services.AwakeReaderService.AwakeService _it;
-		private Exception _exception;
-		private IEnvelope _envelope;
-
-		[SetUp]
-		public void SetUp() {
-			_exception = null;
-			Given();
-			When();
-		}
-
-		private void Given() {
-			_it = new Core.Services.AwakeReaderService.AwakeService();
-
-			_envelope = new NoopEnvelope();
-		}
-
-		private void When() {
-			try {
-				_it.Handle(
-					new AwakeServiceMessage.SubscribeAwake(
-						_envelope, Guid.NewGuid(), "Stream", new TFPos(1000, 500), new Bus.Helpers.TestMessage()));
-			} catch (Exception ex) {
-				_exception = ex;
-			}
-		}
-
-		[Test]
-		public void it_is_handled() {
-			Assert.IsNull(_exception, (_exception ?? (object)"").ToString());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/AwakeService/when_subscribing_before_last_position_with_already_committed_events.cs b/src/EventStore.Core.Tests/AwakeService/when_subscribing_before_last_position_with_already_committed_events.cs
deleted file mode 100644
index 9d008d2229f..00000000000
--- a/src/EventStore.Core.Tests/AwakeService/when_subscribing_before_last_position_with_already_committed_events.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Tests.Bus.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.AwakeService {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_subscribing_before_last_position_with_already_committed_events<TLogFormat, TStreamId> {
-		private Core.Services.AwakeReaderService.AwakeService _it;
-		private EventRecord _eventRecord;
-		private StorageMessage.EventCommitted _eventCommitted;
-		private Exception _exception;
-		private IEnvelope _envelope;
-		private SynchronousScheduler _publisher;
-		private TestHandler<TestMessage> _handler;
-		private TestMessage _reply1;
-		private TestMessage _reply2;
-		private TestMessage _reply3;
-
-		[SetUp]
-		public void SetUp() {
-			_exception = null;
-			Given();
-			When();
-		}
-
-		private void Given() {
-			_it = new Core.Services.AwakeReaderService.AwakeService();
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			_eventRecord = new EventRecord(
-				100,
-				LogRecord.Prepare(
-					recordFactory, 1500, Guid.NewGuid(), Guid.NewGuid(), 1500, 0, streamId, 99, PrepareFlags.Data,
-					eventTypeId, new byte[0], null, DateTime.UtcNow),"Stream", "EventType");
-			_eventCommitted = new StorageMessage.EventCommitted(2000, _eventRecord, isTfEof: true);
-			_publisher = new();
-			_envelope = _publisher;
-			_handler = new TestHandler<TestMessage>();
-			_publisher.Subscribe(_handler);
-			_reply1 = new TestMessage(1);
-			_reply2 = new TestMessage(3);
-			_reply3 = new TestMessage(4);
-
-			_it.Handle(_eventCommitted);
-		}
-
-		private void When() {
-			try {
-				_it.Handle(
-					new AwakeServiceMessage.SubscribeAwake(
-						_envelope, Guid.NewGuid(), "Stream", new TFPos(1000, 500), _reply1));
-				_it.Handle(
-					new AwakeServiceMessage.SubscribeAwake(
-						_envelope, Guid.NewGuid(), "Stream2", new TFPos(1000, 500), _reply2));
-				_it.Handle(
-					new AwakeServiceMessage.SubscribeAwake(
-						_envelope, Guid.NewGuid(), null, new TFPos(1000, 500), _reply3));
-			} catch (Exception ex) {
-				_exception = ex;
-			}
-		}
-
-		[Test]
-		public void it_is_handled() {
-			Assert.IsNull(_exception, (_exception ?? (object)"").ToString());
-		}
-
-		[Test]
-		public void immediately_awakes_stream_subscriber() {
-			Assert.That(_handler.HandledMessages.Any(m => m.Kind == 1));
-		}
-
-		[Test]
-		public void immediately_awakes_all_subscriber() {
-			Assert.That(_handler.HandledMessages.Any(m => m.Kind == 4));
-		}
-
-		[Test]
-		public void immediately_awakes_another_stream_subscriber() {
-			Assert.That(_handler.HandledMessages.Any(m => m.Kind == 3));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Bus/FakeQueuedHandler.cs b/src/EventStore.Core.Tests/Bus/FakeQueuedHandler.cs
deleted file mode 100644
index 7b64fb6b81a..00000000000
--- a/src/EventStore.Core.Tests/Bus/FakeQueuedHandler.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Monitoring.Stats;
-
-namespace EventStore.Core.Tests.Bus;
-
-public class FakeQueuedHandler : IQueuedHandler {
-	public string Name => string.Empty;
-	public void Handle(Message message) { }
-	public void Publish(Message message) { }
-	public Task Start() => Task.CompletedTask;
-	public void Stop() { }
-	public void RequestStop() { }
-	public QueueStats GetStatistics() => null;
-}
diff --git a/src/EventStore.Core.Tests/Bus/Helpers/BusTestMessages.cs b/src/EventStore.Core.Tests/Bus/Helpers/BusTestMessages.cs
deleted file mode 100644
index f5d89cb3a75..00000000000
--- a/src/EventStore.Core.Tests/Bus/Helpers/BusTestMessages.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Tests.Bus.Helpers {
-	public class TestMessage : Message {
-	}
-
-	public class TestMessage2 : Message {
-	}
-
-	public class TestMessage3 : Message {
-	}
-
-	public class ParentTestMessage : Message {
-	}
-
-	public class ChildTestMessage : ParentTestMessage {
-	}
-
-	public class GrandChildTestMessage : ChildTestMessage {
-	}
-
-	public class TestMessageWithId : Message {
-		public readonly int Id;
-
-		public TestMessageWithId(int id) {
-			Id = id;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Bus/Helpers/Messages.cs b/src/EventStore.Core.Tests/Bus/Helpers/Messages.cs
deleted file mode 100644
index 75b018d8263..00000000000
--- a/src/EventStore.Core.Tests/Bus/Helpers/Messages.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Tests.Bus.Helpers {
-	public class DeferredExecutionTestMessage : Message {
-		private readonly Action _action;
-
-		public DeferredExecutionTestMessage(Action action) {
-			if (action == null)
-				throw new ArgumentNullException("action");
-			_action = action;
-		}
-
-		public void Execute() {
-			_action();
-		}
-	}
-
-	public class ExecutableTestMessage : Message {
-		private readonly Action _action;
-
-		public ExecutableTestMessage(Action action) {
-			if (action == null)
-				throw new ArgumentNullException("action");
-			_action = action;
-		}
-
-		public void Execute() {
-			_action();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Bus/Helpers/NoopConsumer.cs b/src/EventStore.Core.Tests/Bus/Helpers/NoopConsumer.cs
deleted file mode 100644
index 83d89d326af..00000000000
--- a/src/EventStore.Core.Tests/Bus/Helpers/NoopConsumer.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Tests.Bus.Helpers {
-	public class NoopConsumer : IHandle<Message> {
-		public void Handle(Message message) {
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Bus/Helpers/QueuedHandlerTestWithNoopConsumer.cs b/src/EventStore.Core.Tests/Bus/Helpers/QueuedHandlerTestWithNoopConsumer.cs
deleted file mode 100644
index 3338a064b7c..00000000000
--- a/src/EventStore.Core.Tests/Bus/Helpers/QueuedHandlerTestWithNoopConsumer.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Bus.Helpers {
-	public abstract class QueuedHandlerTestWithNoopConsumer {
-		private readonly Func<IHandle<Message>, string, TimeSpan, IQueuedHandler> _queuedHandlerFactory;
-
-		protected IQueuedHandler Queue;
-		protected IHandle<Message> Consumer;
-
-		protected QueuedHandlerTestWithNoopConsumer(
-			Func<IHandle<Message>, string, TimeSpan, IQueuedHandler> queuedHandlerFactory) {
-			Ensure.NotNull(queuedHandlerFactory, "queuedHandlerFactory");
-			_queuedHandlerFactory = queuedHandlerFactory;
-		}
-
-		[SetUp]
-		public virtual void SetUp() {
-			Consumer = new NoopConsumer();
-			Queue = _queuedHandlerFactory(Consumer, "test_name", TimeSpan.FromMilliseconds(5000));
-		}
-
-		[TearDown]
-		public virtual void TearDown() {
-			Queue.Stop();
-			Queue = null;
-			Consumer = null;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Bus/Helpers/QueuedHandlerTestWithWaitingConsumer.cs b/src/EventStore.Core.Tests/Bus/Helpers/QueuedHandlerTestWithWaitingConsumer.cs
deleted file mode 100644
index 75b7831c189..00000000000
--- a/src/EventStore.Core.Tests/Bus/Helpers/QueuedHandlerTestWithWaitingConsumer.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Bus.Helpers {
-	public abstract class QueuedHandlerTestWithWaitingConsumer {
-		private readonly Func<IHandle<Message>, string, TimeSpan, IQueuedHandler> _queuedHandlerFactory;
-
-		protected IQueuedHandler Queue;
-		protected WaitingConsumer Consumer;
-
-		protected QueuedHandlerTestWithWaitingConsumer(
-			Func<IHandle<Message>, string, TimeSpan, IQueuedHandler> queuedHandlerFactory) {
-			Ensure.NotNull(queuedHandlerFactory, "queuedHandlerFactory");
-			_queuedHandlerFactory = queuedHandlerFactory;
-		}
-
-		[SetUp]
-		public virtual void SetUp() {
-			Consumer = new WaitingConsumer(0);
-			Queue = _queuedHandlerFactory(Consumer, "waiting_queue", TimeSpan.FromMilliseconds(5000));
-		}
-
-		[TearDown]
-		public virtual void TearDown() {
-			Queue.Stop();
-			Queue = null;
-			Consumer.Dispose();
-			Consumer = null;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Bus/Helpers/TestHandler.cs b/src/EventStore.Core.Tests/Bus/Helpers/TestHandler.cs
deleted file mode 100644
index d6b6748261f..00000000000
--- a/src/EventStore.Core.Tests/Bus/Helpers/TestHandler.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Tests.Bus.Helpers {
-	public class TestHandler<T> : IHandle<T> where T : Message {
-		public readonly List<T> HandledMessages = new List<T>();
-
-		public void Handle(T message) {
-			HandledMessages.Add(message);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Bus/Helpers/TestMultiHandler.cs b/src/EventStore.Core.Tests/Bus/Helpers/TestMultiHandler.cs
deleted file mode 100644
index 11f2d6ae620..00000000000
--- a/src/EventStore.Core.Tests/Bus/Helpers/TestMultiHandler.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Tests.Bus.Helpers {
-	public class TestMultiHandler : IHandle<TestMessage>, IHandle<TestMessage2>, IHandle<TestMessage3> {
-		public readonly List<Message> HandledMessages = new List<Message>();
-
-		public void Handle(TestMessage message) {
-			HandledMessages.Add(message);
-		}
-
-		public void Handle(TestMessage2 message) {
-			HandledMessages.Add(message);
-		}
-
-		public void Handle(TestMessage3 message) {
-			HandledMessages.Add(message);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Bus/Helpers/WaitingConsumer.cs b/src/EventStore.Core.Tests/Bus/Helpers/WaitingConsumer.cs
deleted file mode 100644
index 7e94e5ebfbd..00000000000
--- a/src/EventStore.Core.Tests/Bus/Helpers/WaitingConsumer.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Tests.Bus.Helpers {
-	public class WaitingConsumer : IHandle<Message>, IDisposable {
-		public readonly List<Message> HandledMessages = new List<Message>();
-
-		private readonly CountdownEvent _countdownEvent;
-
-		public WaitingConsumer(int initialCount) {
-			_countdownEvent = new CountdownEvent(initialCount);
-		}
-
-		public void SetWaitingCount(int count) {
-			_countdownEvent.Reset(count);
-		}
-
-		public bool Wait(int ms = 5000) {
-			return _countdownEvent.Wait(ms);
-		}
-
-		public void Handle(Message message) {
-			HandledMessages.Add(message);
-
-			var typedMsg = message as DeferredExecutionTestMessage;
-			if (typedMsg != null)
-				((Action<DeferredExecutionTestMessage>)(deffered => deffered.Execute()))(typedMsg);
-
-			var executableTestMessage = message as ExecutableTestMessage;
-			if (executableTestMessage != null)
-				((Action<ExecutableTestMessage>)(deffered => deffered.Execute()))(executableTestMessage);
-
-			_countdownEvent.Signal();
-		}
-
-		public void Dispose() {
-			_countdownEvent.Dispose();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Bus/SynchronousScheduler.cs b/src/EventStore.Core.Tests/Bus/SynchronousScheduler.cs
deleted file mode 100644
index 483ecc527ab..00000000000
--- a/src/EventStore.Core.Tests/Bus/SynchronousScheduler.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Bus;
-
-public sealed class SynchronousScheduler(string name = "Test", bool watchSlowMsg = true) : InMemoryBus(name, watchSlowMsg), IPublisher {
-	public void Publish(Message msg) {
-		ArgumentNullException.ThrowIfNull(msg);
-
-		var task = DispatchAsync(msg, CancellationToken.None);
-		if (task.IsCompleted) {
-			task.GetAwaiter().GetResult();
-		} else {
-			var wrapperTask = task.AsTask();
-
-			try {
-				wrapperTask.Wait();
-			} catch (AggregateException e) when (e.InnerExceptions is [var innerEx]) {
-				throw innerEx;
-			} finally {
-				wrapperTask.Dispose();
-			}
-		}
-	}
-
-	ValueTask IAsyncHandle<Message>.HandleAsync(Message msg, CancellationToken token)
-		=> DispatchAsync(msg, token);
-}
diff --git a/src/EventStore.Core.Tests/Bus/queued_handler_should.cs b/src/EventStore.Core.Tests/Bus/queued_handler_should.cs
deleted file mode 100644
index 836f4dd4ceb..00000000000
--- a/src/EventStore.Core.Tests/Bus/queued_handler_should.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Bus.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Bus;
-
-[TestFixture]
-public abstract class queued_handler_should : QueuedHandlerTestWithNoopConsumer {
-	protected queued_handler_should(Func<IHandle<Message>, string, TimeSpan, IQueuedHandler> queuedHandlerFactory)
-		: base(queuedHandlerFactory) {
-	}
-
-	[Test]
-	public void throw_if_handler_is_null() {
-		Assert.Throws<ArgumentNullException>(
-			static () => new QueuedHandlerThreadPool(null, "throwing", new(), new(), watchSlowMsg: false));
-	}
-
-	[Test]
-	public void throw_if_name_is_null() {
-		Assert.Throws<ArgumentNullException>(
-			() => new QueuedHandlerThreadPool(Consumer, null, new(), new(), watchSlowMsg: false));
-	}
-}
-
-[TestFixture]
-public class queued_handler_threadpool_should : queued_handler_should {
-	public queued_handler_threadpool_should()
-		: base((consumer, name, timeout) =>
-			new QueuedHandlerThreadPool(consumer, name, new QueueStatsManager(), new(), false, null, timeout)) {
-	}
-}
diff --git a/src/EventStore.Core.Tests/Bus/when_stopping_queued_handler.cs b/src/EventStore.Core.Tests/Bus/when_stopping_queued_handler.cs
deleted file mode 100644
index 01af619fc75..00000000000
--- a/src/EventStore.Core.Tests/Bus/when_stopping_queued_handler.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Bus.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Bus;
-
-[TestFixture]
-public abstract class when_stopping_queued_handler : QueuedHandlerTestWithNoopConsumer {
-	protected when_stopping_queued_handler(
-		Func<IHandle<Message>, string, TimeSpan, IQueuedHandler> queuedHandlerFactory)
-		: base(queuedHandlerFactory) {
-	}
-
-
-	[Test]
-	public void gracefully_should_not_throw() {
-		Queue.Start();
-		Assert.DoesNotThrow(() => Queue.Stop());
-	}
-
-	[Test]
-	public void gracefully_and_queue_is_not_busy_should_not_take_much_time() {
-		Queue.Start();
-
-		var wait = new ManualResetEventSlim(false);
-
-		ThreadPool.QueueUserWorkItem(_ => {
-			Queue.Stop();
-			wait.Set();
-		});
-
-		Assert.IsTrue(wait.Wait(5000), "Could not stop queue in time.");
-	}
-
-	[Test]
-	public void second_time_should_not_throw() {
-		Queue.Start();
-		Queue.Stop();
-		Assert.DoesNotThrow(() => Queue.Stop());
-	}
-
-	[Test]
-	public void second_time_should_not_take_much_time() {
-		Queue.Start();
-		Queue.Stop();
-
-		var wait = new ManualResetEventSlim(false);
-
-		ThreadPool.QueueUserWorkItem(_ => {
-			Queue.Stop();
-			wait.Set();
-		});
-
-		Assert.IsTrue(wait.Wait(1000), "Could not stop queue in time.");
-	}
-
-	[Test]
-	public void while_queue_is_busy_should_crash_with_timeout() {
-		var consumer = new WaitingConsumer(1);
-		var busyQueue = new QueuedHandlerThreadPool(consumer, "busy_test_queue", new QueueStatsManager(), new(),
-			watchSlowMsg: false,
-			threadStopWaitTimeout: TimeSpan.FromMilliseconds(100));
-		var waitHandle = new ManualResetEvent(false);
-		var handledEvent = new ManualResetEvent(false);
-		try {
-			busyQueue.Start();
-			busyQueue.Publish(new DeferredExecutionTestMessage(() => {
-				handledEvent.Set();
-				waitHandle.WaitOne();
-			}));
-
-			handledEvent.WaitOne();
-			Assert.Throws<TimeoutException>(() => busyQueue.Stop());
-		} finally {
-			waitHandle.Set();
-			consumer.Wait();
-
-			busyQueue.Stop();
-			waitHandle.Dispose();
-			handledEvent.Dispose();
-			consumer.Dispose();
-		}
-	}
-}
-
-[TestFixture]
-public class when_stopping_queued_handler_threadpool : when_stopping_queued_handler {
-	public when_stopping_queued_handler_threadpool()
-		: base((consumer, name, timeout) =>
-			new QueuedHandlerThreadPool(consumer, name, new QueueStatsManager(), new(), false, null, timeout)) {
-	}
-}
diff --git a/src/EventStore.Core.Tests/Caching/AdHocDynamicCache.cs b/src/EventStore.Core.Tests/Caching/AdHocDynamicCache.cs
deleted file mode 100644
index 4bb36058373..00000000000
--- a/src/EventStore.Core.Tests/Caching/AdHocDynamicCache.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using EventStore.Core.Caching;
-
-namespace EventStore.Core.Tests.Caching {
-	public class AdHocDynamicCache : IDynamicCache {
-		private readonly Func<long> _getSize;
-		private readonly Action<long> _setCapacity;
-		private readonly Func<long> _getFreedSize;
-		private readonly Action _resetFreedSize;
-
-		public AdHocDynamicCache(
-			Func<long> getSize,
-			Action<long> setCapacity,
-			Func<long> getFreedSize = null,
-			Action resetFreedSize = null,
-			string name = null) {
-
-			_getSize = getSize;
-			_setCapacity = setCapacity;
-			_getFreedSize = getFreedSize ?? (() => 0);
-			_resetFreedSize = resetFreedSize ?? (() => { });
-
-			Name = name ?? nameof(AdHocDynamicCache);
-		}
-
-		public string Name { get; }
-
-		public long Capacity { get; private set; }
-
-		public void SetCapacity(long value) {
-			Capacity = value;
-			_setCapacity(value);
-		}
-
-		public void ResetFreedSize() {
-			_resetFreedSize();
-		}
-
-		public long Size => _getSize();
-		public long FreedSize => _getFreedSize();
-		public long Count => _getSize(); // one byte per item
-	}
-}
diff --git a/src/EventStore.Core.Tests/Caching/CacheResizerTests.cs b/src/EventStore.Core.Tests/Caching/CacheResizerTests.cs
deleted file mode 100644
index 865cb99d0ff..00000000000
--- a/src/EventStore.Core.Tests/Caching/CacheResizerTests.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-using System;
-using EventStore.Core.Caching;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Caching {
-	[TestFixture]
-	public class CacheResizerTests {
-		[Test]
-		public void dynamic_resizer_loopback() {
-			var cacheResizer = new DynamicCacheResizer(ResizerUnit.Bytes, 10, 100, 12, EmptyDynamicCache.Instance);
-			Assert.AreEqual(12, cacheResizer.Weight);
-		}
-
-		[Test]
-		public void static_resizer_loopback() {
-			var cacheResizer = new StaticCacheResizer(ResizerUnit.Bytes, 10, EmptyDynamicCache.Instance);
-			Assert.AreEqual(0, cacheResizer.Weight);
-		}
-
-		[Test]
-		public void dynamic_resizer_with_zero_weight_throws() =>
-			Assert.Throws<ArgumentOutOfRangeException>(() =>
-					new DynamicCacheResizer(ResizerUnit.Bytes, 0, 0, 0, EmptyDynamicCache.Instance));
-
-		[Test]
-		public void dynamic_resizer_with_negative_weight_throws() =>
-			Assert.Throws<ArgumentOutOfRangeException>(() =>
-				new DynamicCacheResizer(ResizerUnit.Bytes, 0, 0, -1, EmptyDynamicCache.Instance));
-
-		[Test]
-		public void dynamic_resizer_with_negative_min_capacity_throws() =>
-			Assert.Throws<ArgumentOutOfRangeException>(() =>
-				new DynamicCacheResizer(ResizerUnit.Bytes, -1, 0, 10, EmptyDynamicCache.Instance));
-
-		[Test]
-		public void dynamic_resizer_with_negative_max_capacity_throws() =>
-			Assert.Throws<ArgumentOutOfRangeException>(() =>
-				new DynamicCacheResizer(ResizerUnit.Bytes, 0, -1, 10, EmptyDynamicCache.Instance));
-
-		[Test]
-		public void static_resizer_with_negative_capacity_throws() =>
-			Assert.Throws<ArgumentOutOfRangeException>(() =>
-				new StaticCacheResizer(ResizerUnit.Bytes, -1, EmptyDynamicCache.Instance));
-
-		[Test]
-		public void composite_resizer_with_mixed_units_throws() =>
-			Assert.Throws<ArgumentException>(() =>
-				new CompositeCacheResizer("root", 100,
-					new StaticCacheResizer(ResizerUnit.Bytes, 10, EmptyDynamicCache.Instance),
-					new StaticCacheResizer(ResizerUnit.Entries, 10, EmptyDynamicCache.Instance)));
-
-		[Test]
-		public void static_calculates_capacity_correctly() {
-			var cache = new EmptyDynamicCache();
-
-			var sut = new StaticCacheResizer(ResizerUnit.Bytes, 1000, cache);
-
-			sut.CalcCapacityTopLevel(2000);
-			Assert.AreEqual(1000, cache.Capacity);
-
-			sut.CalcCapacityTopLevel(200);
-			Assert.AreEqual(1000, cache.Capacity);
-		}
-
-		[Test]
-		public void dynamic_calculates_capacity_correctly() {
-			var cache = new EmptyDynamicCache();
-
-			var sut = new DynamicCacheResizer(ResizerUnit.Bytes, 1000, 100_000, 50, cache);
-
-			sut.CalcCapacityTopLevel(4000);
-			Assert.AreEqual(4000, cache.Capacity);
-
-			sut.CalcCapacityTopLevel(200);
-			Assert.AreEqual(1000, cache.Capacity);
-		}
-
-		[Test]
-		public void composite_calculates_capacity_correctly_static() {
-			var cacheA = new EmptyDynamicCache();
-			var cacheB = new EmptyDynamicCache();
-
-			var sut = new CompositeCacheResizer("root", 100,
-				new StaticCacheResizer(ResizerUnit.Bytes, 1000, cacheA),
-				new StaticCacheResizer(ResizerUnit.Bytes, 2000, cacheB));
-
-			sut.CalcCapacityTopLevel(4000);
-			Assert.AreEqual(1000, cacheA.Capacity);
-			Assert.AreEqual(2000, cacheB.Capacity);
-
-			sut.CalcCapacityTopLevel(200);
-			Assert.AreEqual(1000, cacheA.Capacity);
-			Assert.AreEqual(2000, cacheB.Capacity);
-		}
-
-		[Test]
-		public void composite_calculates_capacity_correctly_dynamic() {
-			var cacheA = new EmptyDynamicCache();
-			var cacheB = new EmptyDynamicCache();
-
-			var sut = new CompositeCacheResizer("root", 100,
-				new DynamicCacheResizer(ResizerUnit.Bytes, 3000, 100_000, 40, cacheA),
-				new DynamicCacheResizer(ResizerUnit.Bytes, 1000, 100_000, 60, cacheB));
-
-			sut.CalcCapacityTopLevel(10_000);
-			Assert.AreEqual(4000, cacheA.Capacity);
-			Assert.AreEqual(6000, cacheB.Capacity);
-
-			// nb: we overflow the capacity available in order to meet the minimums
-			sut.CalcCapacityTopLevel(5000);
-			Assert.AreEqual(3000, cacheA.Capacity); // <-- minimum
-			Assert.AreEqual(3000, cacheB.Capacity); // <-- 60% of 5000
-
-			sut.CalcCapacityTopLevel(200);
-			Assert.AreEqual(3000, cacheA.Capacity);
-			Assert.AreEqual(1000, cacheB.Capacity);
-
-		}
-
-		[Test]
-		public void composite_calculates_capacity_correctly_mixed() {
-			var cacheA = new EmptyDynamicCache();
-			var cacheB = new EmptyDynamicCache();
-
-			var sut = new CompositeCacheResizer("root", 100,
-				new StaticCacheResizer(ResizerUnit.Bytes, 1000, cacheA),
-				new DynamicCacheResizer(ResizerUnit.Bytes, 1000, 100_000, 60, cacheB));
-
-			sut.CalcCapacityTopLevel(10_000);
-			Assert.AreEqual(1000, cacheA.Capacity);
-			Assert.AreEqual(9000, cacheB.Capacity);
-		}
-
-		[Test]
-		public void composite_calculates_capacity_correctly_complex() {
-			var cacheA = new EmptyDynamicCache();
-			var cacheB = new EmptyDynamicCache();
-			var cacheC = new EmptyDynamicCache();
-			var cacheD = new EmptyDynamicCache();
-
-			// root
-			//  -> static 1000                 A
-			//  -> composite
-			//      -> static 1000             B
-			//      -> dynamic 60% min 1000    C
-			//      -> dynamic 40% min 1000    D
-
-			var sut = new CompositeCacheResizer(
-				name: "root",
-				weight: 100,
-				new StaticCacheResizer(
-					unit: ResizerUnit.Bytes,
-					capacity: 1000,
-					cache: cacheA),
-				new CompositeCacheResizer(
-					name: "composite",
-					weight: 50,
-					new StaticCacheResizer(
-						unit: ResizerUnit.Bytes,
-						capacity: 1000,
-						cache: cacheB),
-					new DynamicCacheResizer(
-						unit: ResizerUnit.Bytes,
-						minCapacity: 1000,
-						maxCapacity: 100_000,
-						weight: 60,
-						cache: cacheC),
-					new DynamicCacheResizer(
-						unit: ResizerUnit.Bytes,
-						minCapacity: 1000,
-						maxCapacity: 100_000,
-						weight: 40,
-						cache: cacheD)));
-
-			// lots of space
-			sut.CalcCapacityTopLevel(12_000);
-
-			Assert.AreEqual(1000, cacheA.Capacity);
-			Assert.AreEqual(1000, cacheB.Capacity);
-			Assert.AreEqual(6000, cacheC.Capacity);
-			Assert.AreEqual(4000, cacheD.Capacity);
-
-			// low space
-			sut.CalcCapacityTopLevel(1_000);
-
-			Assert.AreEqual(1000, cacheA.Capacity);
-			Assert.AreEqual(1000, cacheB.Capacity);
-			Assert.AreEqual(1000, cacheC.Capacity);
-			Assert.AreEqual(1000, cacheD.Capacity);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Caching/DynamicCacheManagerTests.cs b/src/EventStore.Core.Tests/Caching/DynamicCacheManagerTests.cs
deleted file mode 100644
index d38ab2c4e9a..00000000000
--- a/src/EventStore.Core.Tests/Caching/DynamicCacheManagerTests.cs
+++ /dev/null
@@ -1,329 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Caching;
-using EventStore.Core.Messages;
-using EventStore.Core.Metrics;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Services.Replication;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Caching {
-	[TestFixture]
-	public class DynamicCacheManagerTests {
-		private readonly FakePublisher _fakePublisher = new();
-
-		private DynamicCacheManager GenSut(
-			Func<long> getFreeSystemMem,
-			Func<long> getFreeHeapMem,
-			Func<int> getGcCollectionCount,
-			long totalMem,
-			int keepFreeMemPercent,
-			long keepFreeMemBytes,
-			TimeSpan monitoringInterval,
-			TimeSpan minResizeInterval,
-			long minResizeThreshold,
-			ICacheResizer rootCacheResizer) {
-			var sut = new DynamicCacheManager(
-				_fakePublisher,
-				getFreeSystemMem,
-				getFreeHeapMem,
-				getGcCollectionCount,
-				totalMem,
-				keepFreeMemPercent,
-				keepFreeMemBytes,
-				monitoringInterval,
-				minResizeInterval,
-				minResizeThreshold,
-				rootCacheResizer,
-				new CacheResourcesTracker.NoOp());
-			sut.Start();
-
-			_fakePublisher.Messages.Clear();
-
-			return sut;
-		}
-
-		private async Task TickPublished() {
-			while (!_fakePublisher.Messages.ToArray().Any(x => x is TimerMessage.Schedule))
-				await Task.Delay(10);
-
-			_fakePublisher.Messages.Clear();
-		}
-
-		[Test]
-		public async Task ticks() {
-			var sut = GenSut(
-				() => 100,
-				() => 0,
-				() => 0,
-				100,
-				0,
-				0,
-				TimeSpan.MaxValue,
-				TimeSpan.MaxValue,
-				0,
-				new StaticCacheResizer(ResizerUnit.Bytes, 0, EmptyDynamicCache.Instance));
-
-			sut.Handle(new MonitoringMessage.DynamicCacheManagerTick());
-			await TickPublished().WithTimeout(TimeSpan.FromSeconds(10));
-		}
-
-		[TestCase(20, 0, true)]
-		[TestCase(0, 20, true)]
-		[TestCase(20, 0, false)]
-		[TestCase(0, 20, false)]
-		public async Task caches_resized_depending_on_whether_total_free_memory_is_above_or_below_keep_free_mem(int percent, long bytes, bool aboveKeepFreeMem) {
-			long cache1Mem = -1, cache2Mem = -1;
-			var cache1 = new DynamicCacheResizer(ResizerUnit.Bytes, 1, 100_000, 60, new AdHocDynamicCache(
-				() => 0,
-				mem => Interlocked.Exchange(ref cache1Mem, mem),
-				() => 1, // included in total free mem
-				() => { },
-				name: "cache1"));
-
-			var cache2 = new DynamicCacheResizer(ResizerUnit.Bytes, 2, 100_000, 40, new AdHocDynamicCache(
-				() => 0,
-				mem => Interlocked.Exchange(ref cache2Mem, mem),
-				() => 1, // included in total free mem
-				() => { },
-				name: "cache2"));
-
-			var freeSystemMemReq = 0;
-			var freeSystemMem = new[] { 100, 11 + (aboveKeepFreeMem ? 1 : 0)}; // included in total free mem
-
-			var freeHeapMemReq = 0;
-			var freeHeapMem = new[] { 0, 6 }; // included in total free mem
-
-			var sut = GenSut(
-				() => freeSystemMem[freeSystemMemReq++],
-				() => freeHeapMem[freeHeapMemReq++],
-				() => 0,
-				100,
-				percent,
-				bytes,
-				TimeSpan.MaxValue,
-				TimeSpan.MaxValue,
-				0,
-				new CompositeCacheResizer("root", 100, cache1, cache2));
-
-			sut.Handle(new MonitoringMessage.DynamicCacheManagerTick());
-
-			await TickPublished();
-
-			if (aboveKeepFreeMem) {
-				// caches not resized to minimum amount
-				Assert.AreNotEqual(1, Interlocked.Read(ref cache1Mem));
-				Assert.AreNotEqual(2, Interlocked.Read(ref cache2Mem));
-			} else {
-				// caches resized to minimum amount
-				Assert.AreEqual(1, Interlocked.Read(ref cache1Mem));
-				Assert.AreEqual(2, Interlocked.Read(ref cache2Mem));
-			}
-		}
-
-		[TestCase(true)]
-		[TestCase(false)]
-		public async Task caches_resized_depending_on_whether_min_resize_interval_was_exceeded(bool minResizeIntervalExceeded) {
-			long cache1Mem = -1, cache2Mem = -1;
-			var cache1 = new DynamicCacheResizer(ResizerUnit.Bytes, 1, 100_000, 60, new AdHocDynamicCache(
-				() => 0,
-				mem => Interlocked.Exchange(ref cache1Mem, mem), name: "cache1"));
-			var cache2 = new DynamicCacheResizer(ResizerUnit.Bytes, 2, 100_000, 40, new AdHocDynamicCache(
-				() => 0,
-				mem => Interlocked.Exchange(ref cache2Mem, mem), name: "cache2"));
-
-			var request = 0;
-			var freeMem = new[] { 100, 90 };
-
-			var sut = GenSut(
-				() => freeMem[request++],
-				() => 0,
-				() => 0,
-				100,
-				0,
-				0,
-				TimeSpan.MaxValue,
-				minResizeIntervalExceeded ? TimeSpan.Zero : TimeSpan.MaxValue,
-				0,
-				new CompositeCacheResizer("root", 100, cache1, cache2));
-
-			sut.Handle(new MonitoringMessage.DynamicCacheManagerTick());
-
-			await TickPublished();
-
-			if (minResizeIntervalExceeded) {
-				// caches resized according to 90% free memory
-				Assert.AreEqual(54, Interlocked.Read(ref cache1Mem));
-				Assert.AreEqual(36, Interlocked.Read(ref cache2Mem));
-			} else {
-				// caches not resized
-				Assert.AreNotEqual(54, Interlocked.Read(ref cache1Mem));
-				Assert.AreNotEqual(36, Interlocked.Read(ref cache2Mem));
-			}
-		}
-
-		[TestCase(20, 0, true)]
-		[TestCase(0, 20, false)]
-		public async Task caches_resized_depending_on_whether_min_resize_threshold_was_exceeded(int percent, long bytes, bool minResizeThresholdExceeded) {
-			long cache1Mem = -1, cache2Mem = -1;
-			var cache1 = new DynamicCacheResizer(ResizerUnit.Bytes, 1, 100_000, 60, new AdHocDynamicCache(
-				() => 0,
-				mem => Interlocked.Exchange(ref cache1Mem, mem), name: "cache1"));
-
-			var cache2 = new DynamicCacheResizer(ResizerUnit.Bytes, 2, 100_000, 40, new AdHocDynamicCache(
-				() => 0,
-				mem => Interlocked.Exchange(ref cache2Mem, mem), name: "cache2"));
-
-			var freeSystemMemReq = 0;
-			var freeSystemMem = new[] { 100, 19 };
-
-			var sut = GenSut(
-				() => freeSystemMem[freeSystemMemReq++],
-				() => 0,
-				() => 0,
-				100,
-				percent,
-				bytes,
-				TimeSpan.MaxValue,
-				TimeSpan.Zero,
-				minResizeThresholdExceeded ? 0 : 100,
-				new CompositeCacheResizer("root", 100, cache1, cache2));
-
-			sut.Handle(new MonitoringMessage.DynamicCacheManagerTick());
-
-			await TickPublished();
-
-			if (minResizeThresholdExceeded) {
-				// caches resized to minimum amount
-				Assert.AreEqual(1, Interlocked.Read(ref cache1Mem));
-				Assert.AreEqual(2, Interlocked.Read(ref cache2Mem));
-			} else {
-				// memory below keep free mem and min resize interval is zero
-				// but caches not resized to minimum amount due to high min resize threshold (100)
-				Assert.AreNotEqual(1, Interlocked.Read(ref cache1Mem));
-				Assert.AreNotEqual(2, Interlocked.Read(ref cache2Mem));
-			}
-		}
-
-		[Test]
-		public async Task freed_size_is_reset_when_gc_occurs() {
-			var tcs = new TaskCompletionSource<bool>();
-
-			var cache = new AdHocDynamicCache(
-				() => 0,
-				_ => { },
-				() => 0,
-				() => tcs.TrySetResult(true));
-
-			var cacheResizer = new DynamicCacheResizer(ResizerUnit.Bytes, 0, 100_000, 100, cache);
-
-			var sut = GenSut(
-				() => 100,
-				() => 0,
-				() => 1,
-				100,
-				0,
-				0,
-				TimeSpan.MaxValue,
-				TimeSpan.MaxValue,
-				0,
-				new CompositeCacheResizer("root", 100, cacheResizer));
-
-			sut.Handle(new MonitoringMessage.DynamicCacheManagerTick());
-			await TickPublished();
-
-			await tcs.Task.WithTimeout(1000);
-			Assert.True(tcs.Task.Result);
-		}
-
-		[Test]
-		public async Task available_memory_is_recalculated_when_gc_occurs() {
-			var cacheCapacity = -1L;
-
-			var cache = new AdHocDynamicCache(
-				() => 0,
-				x => Interlocked.Exchange(ref cacheCapacity, x));
-
-			var cacheResizer = new DynamicCacheResizer(ResizerUnit.Bytes, 0, 100_000, 100, cache);
-
-			var freeMemReq = 0;
-			var freeMem = new [] { 100 /* init */, 99 /* first calculation */, 98 /* second calculation */};
-
-			var gcCountReq = 0;
-			var gcCount = new[] { 0 /* init */, 0 /* reset freed size check */, 1 /* first calculation */, 1 /* second calculation */};
-
-			var sut = GenSut(
-				() => freeMem[freeMemReq++],
-				() => 0,
-				() => gcCount[gcCountReq++],
-				100,
-				20,
-				20,
-				TimeSpan.MaxValue,
-				TimeSpan.Zero,
-				0,
-				new CompositeCacheResizer("root", 100, cacheResizer));
-
-			sut.Handle(new MonitoringMessage.DynamicCacheManagerTick());
-			await TickPublished();
-
-			Assert.AreEqual(78, cacheCapacity);
-		}
-
-		[Test]
-		public void correct_stats_are_produced() {
-			var cache1 = new DynamicCacheResizer(ResizerUnit.Bytes, 10, 100_000, 100, new AdHocDynamicCache(
-				() => 12,
-				mem => { },
-				name: "test1"));
-			var cache2 = new StaticCacheResizer(ResizerUnit.Bytes, 15, new AdHocDynamicCache(
-				() => 10,
-				mem => { },
-				name: "test2"));
-
-			var sut = GenSut(
-				() => 58,
-				() => 0,
-				() => 0,
-				100,
-				0,
-				0,
-				TimeSpan.MaxValue,
-				TimeSpan.MaxValue,
-				0,
-				new CompositeCacheResizer("cache", 123, cache1, cache2));
-
-			var envelope = new FakeEnvelope();
-			sut.Handle(new MonitoringMessage.InternalStatsRequest(envelope));
-
-			Assert.AreEqual(1, envelope.Replies.Count);
-
-			var msg = (MonitoringMessage.InternalStatsRequestResponse) envelope.Replies.First();
-			var expectedStats = new Dictionary<string, object> {
-				{"es-cache-name", "cache"},
-				{"es-cache-sizeBytes", 22L},
-				{"es-cache-count", 22L},
-				{"es-cache-capacityBytes", 80L},
-				{"es-cache-utilizationPercent", 100.0 * 22 / 80},
-
-				{"es-cache-test1-name", "test1"},
-				{"es-cache-test1-sizeBytes", 12L},
-				{"es-cache-test1-count", 12L},
-				{"es-cache-test1-capacityBytes", 65L},
-				{"es-cache-test1-utilizationPercent", 100.0 * 12 / 65},
-
-				{"es-cache-test2-name", "test2"},
-				{"es-cache-test2-sizeBytes", 10L},
-				{"es-cache-test2-count", 10L},
-				{"es-cache-test2-capacityBytes", 15L},
-				{"es-cache-test2-utilizationPercent", 100.0 * 10 / 15},
-			};
-
-			CollectionAssert.AreEquivalent(expectedStats, msg.Stats);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Caching/EmptyDynamicCache.cs b/src/EventStore.Core.Tests/Caching/EmptyDynamicCache.cs
deleted file mode 100644
index f5d3de094f7..00000000000
--- a/src/EventStore.Core.Tests/Caching/EmptyDynamicCache.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using EventStore.Core.Caching;
-
-namespace EventStore.Core.Tests.Caching {
-	public class EmptyDynamicCache : IDynamicCache {
-		public static EmptyDynamicCache Instance { get; } = new();
-		public string Name => nameof(EmptyDynamicCache);
-		public long Capacity { get; private set; }
-
-		public void SetCapacity(long capacity) {
-			Capacity = capacity;
-		}
-
-		public void ResetFreedSize() {
-		}
-
-		public long Size => 0;
-		public long Count => 0;
-		public long FreedSize => 0;
-	}
-}
diff --git a/src/EventStore.Core.Tests/Caching/EventNumberCachedTests.cs b/src/EventStore.Core.Tests/Caching/EventNumberCachedTests.cs
deleted file mode 100644
index 98427548979..00000000000
--- a/src/EventStore.Core.Tests/Caching/EventNumberCachedTests.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Caching;
-using EventStore.Core.DataStructures;
-using NUnit.Framework;
-using EventNumberCached = EventStore.Core.Services.Storage.ReaderIndex.IndexBackend<string>.EventNumberCached;
-
-namespace EventStore.Core.Tests.Caching {
-	public class EventNumberCachedTests {
-		[Test]
-		public void size_is_measured_correctly() {
-			var mem = MemUsage.Calculate(() =>
-				new EventNumberCached[] { // we need an array to force an allocation
-					new(10, 123)
-				}, out _);
-
-			Assert.AreEqual(mem, EventNumberCached.ApproximateSize + MemSizer.ArraySize);
-		}
-
-		[Test]
-		public void size_in_lru_cache_is_measured_correctly_with_string_key() {
-			var lruCache = new LRUCache<string, EventNumberCached>(string.Empty, 1, (_,_) => 0);
-
-			// initialize any underlying data structures (the dictionary in this case)
-			lruCache.Put("test", new EventNumberCached(0, 0));
-
-			var mem = MemUsage.Calculate(() =>
-				lruCache.Put(new string('x', 10), new EventNumberCached(10, 23)));
-
-			// internally, dictionary items are initialized in batches of ~4
-			// to keep the test simple, we just subtract the dictionary entry size
-			// to account for this already initialized entry.
-			Assert.AreEqual(mem,
-				LRUCache<string, EventNumberCached>.ApproximateItemSize(
-					MemSizer.SizeOf(new string('x', 10)), 0) -
-				MemSizer.SizeOfDictionaryEntry<string, LinkedListNode<EventNumberCached>>());
-		}
-
-		[Test]
-		public void size_in_lru_cache_is_measured_correctly_with_long_key() {
-			var lruCache = new LRUCache<long, EventNumberCached>(string.Empty, 1, (_,_) => 0);
-
-			// initialize any underlying data structures (the dictionary in this case)
-			lruCache.Put(123, new EventNumberCached(0, 0));
-
-			var mem = MemUsage.Calculate(() =>
-				lruCache.Put(456, new EventNumberCached(10, 123)));
-
-			// internally, dictionary items are initialized in batches of ~4
-			// to keep the test simple, we just subtract the dictionary entry size
-			// to account for this already initialized entry.
-			Assert.AreEqual(mem,
-				LRUCache<string, EventNumberCached>.ApproximateItemSize(0, 0) -
-				MemSizer.SizeOfDictionaryEntry<long, LinkedListNode<EventNumberCached>>());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Caching/LRUCacheTests.cs b/src/EventStore.Core.Tests/Caching/LRUCacheTests.cs
deleted file mode 100644
index 5538837f6a9..00000000000
--- a/src/EventStore.Core.Tests/Caching/LRUCacheTests.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-using System;
-using EventStore.Core.DataStructures;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Caching {
-	[TestFixture]
-	public class LRUCacheTests {
-
-		private static LRUCache<TKey, TValue> GenSut<TKey, TValue>(int capacity,
-			LRUCache<TKey, TValue>.CalculateItemSize calculateItemSize = null,
-			LRUCache<TKey, TValue>.CalculateFreedSize calculateFreedSize = null) =>
-			new (string.Empty, capacity, calculateItemSize, calculateFreedSize);
-
-		[Test]
-		public void can_add_and_read_item() {
-			var sut = GenSut<string, int>(3);
-
-			Assert.AreEqual(0, sut.Size);
-			Assert.AreEqual(3, sut.Capacity);
-
-			sut.Put("key", 1337);
-			Assert.AreEqual(1, sut.Size);
-
-			sut.TryGet("key", out var read);
-			Assert.AreEqual(1337, read);
-		}
-
-		[Test]
-		public void can_clear_items() {
-			var sut = GenSut<string, int>(10);
-
-			sut.Put("key1", 1);
-			sut.Put("key2", 2);
-			sut.Put("key3", 3);
-
-			sut.Clear();
-
-			Assert.False(sut.TryGet("key1", out _));
-			Assert.False(sut.TryGet("key2", out _));
-			Assert.False(sut.TryGet("key3", out _));
-		}
-
-		[Test]
-		public void least_recently_added_item_is_replaced_when_capacity_reached() {
-			var sut = GenSut<string, int>(2);
-
-			sut.Put("key1", 1);
-			sut.Put("key2", 1);
-			sut.Put("key3", 1);
-
-			Assert.False(sut.TryGet("key1", out _));
-			Assert.True(sut.TryGet("key2", out _));
-			Assert.True(sut.TryGet("key3", out _));
-		}
-
-		[Test]
-		public void least_recently_used_item_is_replaced_when_capacity_reached() {
-			var sut = GenSut<string, int>(2);
-
-			sut.Put("key1", 1);
-			sut.Put("key2", 1);
-
-			sut.TryGet("key1", out _);
-
-			sut.Put("key3", 1);
-
-			Assert.False(sut.TryGet("key2", out _));
-			Assert.True(sut.TryGet("key1", out _));
-			Assert.True(sut.TryGet("key3", out _));
-		}
-
-		public class WithCustomItemSizeCalculator {
-			private readonly LRUCache<int,int> _sut;
-
-			public WithCustomItemSizeCalculator() =>
-				_sut = GenSut<int, int>(7, (k, v) => k + v);
-
-			[Test]
-			public void size_is_correct_when_items_are_added() {
-				_sut.Put(1, 0);
-				Assert.AreEqual(1, _sut.Size);
-
-				_sut.Put(2, 0);
-				Assert.AreEqual(3, _sut.Size);
-
-				_sut.Put(3, 0);
-				Assert.AreEqual(6, _sut.Size);
-
-				_sut.Put(4, 0);
-				// 1 & 2 should be removed
-				Assert.AreEqual(7, _sut.Size);
-
-				_sut.Put(5, 0);
-				// 3 & 4 should be removed
-				Assert.AreEqual(5, _sut.Size);
-			}
-
-			[Test]
-			public void size_is_correct_when_items_are_updated() {
-				_sut.Put(1, 0);
-				_sut.Put(2, 0);
-				_sut.Put(3, 0);
-				_sut.Put(1, 6); // update should remove 2 & 3
-
-				Assert.AreEqual(7, _sut.Size);
-			}
-
-			[Test]
-			public void size_is_correct_when_items_are_cleared() {
-				_sut.Put(1, 0);
-				_sut.Put(2, 0);
-				_sut.Put(3, 0);
-
-				_sut.Clear();
-
-				Assert.AreEqual(0, _sut.Size);
-			}
-		}
-
-		public class WhenResizing {
-
-			[Test]
-			public void can_increase_capacity() {
-				var sut = GenSut<int, int>(6, (k, v) => k + v);
-
-				sut.Put(1, 0);
-				sut.Put(2, 0);
-				sut.Put(3, 0);
-
-				Assert.AreEqual(6, sut.Size);
-
-				sut.SetCapacity(10);
-
-				Assert.AreEqual(6, sut.Size);
-				Assert.AreEqual(10, sut.Capacity);
-			}
-
-			[Test]
-			public void can_decrease_capacity() {
-				var sut = GenSut<int, int>(6, (k, v) => k + v);
-
-				sut.Put(1, 0);
-				sut.Put(2, 0);
-				sut.Put(3, 0);
-
-				Assert.AreEqual(6, sut.Size);
-
-				sut.SetCapacity(3);
-
-				Assert.AreEqual(3, sut.Size);
-				Assert.AreEqual(3, sut.Capacity);
-			}
-
-			[Test]
-			public void can_set_capacity_to_zero() {
-				var sut = GenSut<int, int>(6, (k, v) => k + v);
-
-				sut.Put(1, 0);
-				sut.Put(2, 0);
-				sut.Put(3, 0);
-
-				Assert.AreEqual(6, sut.Size);
-
-				sut.SetCapacity(0);
-
-				Assert.AreEqual(0, sut.Size);
-				Assert.AreEqual(0, sut.Capacity);
-			}
-
-			[Test]
-			public void throws_when_setting_negative_capacity() {
-				var sut = GenSut<int, int>(6, (k, v) => k + v);
-
-				Assert.Throws<ArgumentOutOfRangeException>(() =>
-					sut.SetCapacity(-1));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Caching/MemSizerTests.cs b/src/EventStore.Core.Tests/Caching/MemSizerTests.cs
deleted file mode 100644
index 79da566b584..00000000000
--- a/src/EventStore.Core.Tests/Caching/MemSizerTests.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Caching;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Caching {
-	// these tests may break in the future if there are changes in the CLR.
-	// the constants can then be adjusted accordingly.
-	[TestFixture]
-	public class MemSizerTests {
-
-		private class TestObject1 {
-			public readonly long TestField1;
-
-			public TestObject1() {
-				TestField1 = 0;
-			}
-		}
-
-		private class TestObject2 {
-			public readonly long TestField1;
-			public readonly long TestField2;
-
-			public TestObject2() {
-				TestField1 = 0;
-				TestField2 = 0;
-			}
-		}
-
-		private struct TestStruct {
-			public readonly long TestField1;
-			public readonly int TestField2;
-			public readonly bool TestField3;
-			public readonly int TestField4;
-
-			public TestStruct(long testField1, int testField2, bool testField3, int testField4) {
-				TestField1 = testField1;
-				TestField2 = testField2;
-				TestField3 = testField3;
-				TestField4 = testField4;
-			}
-		}
-
-		[Test]
-		public void object_header_size_is_correct() {
-			// .NET objects have a minimum size of 24 bytes, but the object header size is 16 bytes long.
-			// to be able to test the correctness of the object header size constant, we need to have at
-			// least one field in the object
-			Assert.AreEqual(
-				MemSizer.ObjectHeaderSize + sizeof(long),
-				MemUsage.Calculate(() => new TestObject1()));
-
-			Assert.AreEqual(
-				MemSizer.ObjectHeaderSize + 2 * sizeof(long),
-				MemUsage.Calculate(() => new TestObject2()));
-		}
-
-		[Test]
-		public void array_size_is_correct() {
-			Assert.AreEqual(
-				MemSizer.ArraySize,
-				MemUsage.Calculate(() => new object[0], out _));
-
-			Assert.AreEqual(
-				MemSizer.ArraySize,
-				MemUsage.Calculate(() => new string[0], out _));
-		}
-
-		[Test]
-		public void string_size_is_correct() {
-			var mem = MemUsage.Calculate(() => new string('x', 1234), out var s);
-			Assert.AreEqual(mem, MemSizer.SizeOf(s));
-		}
-
-		[Test]
-		public void empty_string_size_is_correct() {
-			var mem = MemUsage.Calculate(() => new string('x', 0), out var s);
-			Assert.AreEqual(mem, MemSizer.SizeOf(s));
-		}
-
-		[Test]
-		public void string_array_size_is_correct() {
-			var mem = MemUsage.Calculate(() => {
-				var s1 = new string('x', 123);
-				var s2 = new string('y', 321);
-				return new[] { s1, s2 };
-			}, out var arr);
-
-			Assert.AreEqual(mem, MemSizer.SizeOf(arr));
-		}
-
-		[TestCase("key", "value")]
-		[TestCase("key", 12)]
-		[TestCase("key", 12L)]
-		[TestCase(12, 12L)]
-		[TestCase(12L, 12)]
-		[TestCase("key", true)]
-		[TestCase(12, true)]
-		public void dictionary_entry_size_is_correct_with_primitives<TKey, TValue>(TKey key, TValue value) {
-			var mem3 = MemUsage.Calculate(() => new Dictionary<TKey, TValue>(3));
-			var mem7 = MemUsage.Calculate(() => new Dictionary<TKey, TValue>(7));
-
-			Assert.AreEqual(mem7 - mem3, MemSizer.SizeOfDictionaryEntry<TKey, TValue>() * 4);
-		}
-
-
-		[Test]
-		public void dictionary_entry_size_is_correct_with_object() {
-			var mem3 = MemUsage.Calculate(() => new Dictionary<string, TestObject2>(3));
-			var mem7 = MemUsage.Calculate(() => new Dictionary<string, TestObject2>(7));
-
-			Assert.AreEqual(mem7 - mem3, MemSizer.SizeOfDictionaryEntry<string, TestObject2>() * 4);
-		}
-
-		[Test]
-		public void dictionary_entry_size_is_correct_with_struct() {
-			var mem3 = MemUsage.Calculate(() => new Dictionary<string, TestStruct>(3));
-			var mem7 = MemUsage.Calculate(() => new Dictionary<string, TestStruct>(7));
-
-			Assert.AreEqual(mem7 - mem3, MemSizer.SizeOfDictionaryEntry<string, TestStruct>() * 4);
-		}
-
-		[TestCase("string")]
-		[TestCase(12)]
-		[TestCase(12L)]
-		[TestCase(true)]
-		public void linked_list_node_size_is_correct_with_primitives<T>(T item) {
-			var mem = MemUsage.Calculate(() => new LinkedListNode<T>(item));
-
-			Assert.AreEqual(mem, MemSizer.SizeOfLinkedListNode<T>());
-		}
-
-		[Test]
-		public void linked_list_node_size_is_correct_with_object() {
-			var x = new TestObject1();
-			var mem = MemUsage.Calculate(() => new LinkedListNode<TestObject1>(x));
-
-			Assert.AreEqual(mem, MemSizer.SizeOfLinkedListNode<TestObject1>());
-		}
-
-		[Test]
-		public void linked_list_node_size_is_correct_with_struct() {
-			var x = new TestStruct();
-			var mem = MemUsage.Calculate(() => new LinkedListNode<TestStruct>(x));
-
-			Assert.AreEqual(mem, MemSizer.SizeOfLinkedListNode<TestStruct>());
-		}
-
-		[Test]
-		public void linked_list_entry_size_is_correct() {
-			var linkedList = new LinkedList<string>();
-			var node = new LinkedListNode<string>("test");
-
-			var mem = MemUsage.Calculate(() => linkedList.AddLast(node));
-
-			Assert.AreEqual(mem, MemSizer.LinkedListEntrySize);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Caching/MemUsage.cs b/src/EventStore.Core.Tests/Caching/MemUsage.cs
deleted file mode 100644
index 12dda02b785..00000000000
--- a/src/EventStore.Core.Tests/Caching/MemUsage.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-
-namespace EventStore.Core.Tests.Caching {
-	public class MemUsage {
-		public static long Calculate<T>(Func<T> createObject, out T newObject) {
-			var memBefore = GC.GetAllocatedBytesForCurrentThread();
-			newObject = createObject();
-			var memAfter = GC.GetAllocatedBytesForCurrentThread();
-
-			return memAfter - memBefore;
-		}
-
-		public static long Calculate(Action createObject) {
-			return Calculate<object>(() => {
-				createObject();
-				return null;
-			}, out _);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Caching/MetadataCachedTests.cs b/src/EventStore.Core.Tests/Caching/MetadataCachedTests.cs
deleted file mode 100644
index 792773f7f8c..00000000000
--- a/src/EventStore.Core.Tests/Caching/MetadataCachedTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using EventStore.Core.Caching;
-using EventStore.Core.Data;
-using EventStore.Core.DataStructures;
-using NUnit.Framework;
-using MetadataCached = EventStore.Core.Services.Storage.ReaderIndex.IndexBackend<string>.MetadataCached;
-
-namespace EventStore.Core.Tests.Caching {
-	public class MetadataCachedTests {
-		private static MetadataCached CreateMetadataCachedObject() =>
-			new(0, new StreamMetadata(
-				maxCount: 10,
-				maxAge: new TimeSpan(10),
-				truncateBefore: null,
-				tempStream: false,
-				cacheControl: null,
-				acl: new StreamAcl(
-					new[] { new string(' ', 1), new string(' ', 2) },
-					new[] { new string(' ', 0) },
-					null,
-					null,
-					new[] { new string(' ', 1), new string(' ', 3), new string(' ', 3), new string(' ', 7) }
-				)));
-
-		[Test]
-		public void size_is_measured_correctly() {
-			var mem = MemUsage.Calculate(() =>
-				new[] { // we need an array to force an allocation
-					CreateMetadataCachedObject()
-				}, out var metadata);
-
-			Assert.AreEqual(mem, metadata[0].ApproximateSize + MemSizer.ArraySize);
-		}
-
-		[Test]
-		public void size_in_lru_cache_is_measured_correctly_with_string_key() {
-			var lruCache = new LRUCache<string, MetadataCached>(string.Empty, 1, (_,_) => 0);
-
-			// initialize any underlying data structures (the dictionary in this case)
-			lruCache.Put("test", CreateMetadataCachedObject());
-
-			var mem = MemUsage.Calculate(() =>
-				lruCache.Put(new string('x', 10), CreateMetadataCachedObject()));
-
-			// internally, dictionary items are initialized in batches of ~4
-			// to keep the test simple, we just subtract the dictionary entry size
-			// to account for this already initialized entry.
-			var metadataCached = CreateMetadataCachedObject();
-			Assert.AreEqual(mem,
-				LRUCache<string, MetadataCached>.ApproximateItemSize(
-					MemSizer.SizeOf(new string('x', 10)), metadataCached.ApproximateSize - Unsafe.SizeOf<MetadataCached>()) -
-				MemSizer.SizeOfDictionaryEntry<string, LinkedListNode<MetadataCached>>());
-		}
-
-		[Test]
-		public void size_in_lru_cache_is_measured_correctly_with_long_key() {
-			var lruCache = new LRUCache<long, MetadataCached>(string.Empty, 1, (_,_) => 0);
-
-			// initialize any underlying data structures (the dictionary in this case)
-			lruCache.Put(123, CreateMetadataCachedObject());
-
-			var mem = MemUsage.Calculate(() =>
-				lruCache.Put(456, CreateMetadataCachedObject()));
-
-			// internally, dictionary items are initialized in batches of ~4
-			// to keep the test simple, we just subtract the dictionary entry size
-			// to account for this already initialized entry.
-			var metadataCached = CreateMetadataCachedObject();
-			Assert.AreEqual(mem,
-				LRUCache<string, MetadataCached>.ApproximateItemSize(0, metadataCached.ApproximateSize - Unsafe.SizeOf<MetadataCached>()) -
-				MemSizer.SizeOfDictionaryEntry<string, LinkedListNode<MetadataCached>>());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Certificates/ByteExtensions.cs b/src/EventStore.Core.Tests/Certificates/ByteExtensions.cs
deleted file mode 100644
index 2ae11dff635..00000000000
--- a/src/EventStore.Core.Tests/Certificates/ByteExtensions.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-
-namespace EventStore.Core.Tests.Certificates {
-	public static class ByteExtensions {
-		public static string PEM(this byte[] bytes, string label) {
-			return $"-----BEGIN {label}-----\n" +  Convert.ToBase64String(bytes) + "\n" + $"-----END {label}-----\n";
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Certificates/CertificateExpiryMonitorTests.cs b/src/EventStore.Core.Tests/Certificates/CertificateExpiryMonitorTests.cs
deleted file mode 100644
index b75cd7b34b1..00000000000
--- a/src/EventStore.Core.Tests/Certificates/CertificateExpiryMonitorTests.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using System;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
-using NUnit.Framework;
-using EventStore.Core.Certificates;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Fakes;
-
-namespace EventStore.Core.Tests.Certificates {
-
-	public class CertificateExpiryMonitorTests : with_certificates {
-		private FakePublisher _publisher;
-		private FakeLogger _logger;
-
-		private static X509Certificate2 GenCertificate(TimeSpan timeUntilExpiry) {
-			using var rsa = RSA.Create();
-			var certificate = new CertificateRequest(GenerateSubject(), rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1)
-				.CreateSelfSigned(
-					notBefore: DateTime.Now,
-					notAfter: DateTime.Now + timeUntilExpiry);
-			return certificate;
-		}
-
-		[SetUp]
-		public void SetUp() {
-			_publisher = new();
-			_logger = new();
-		}
-
-		[Test]
-		public void on_start() {
-			// given
-			var certificate = GenCertificate(TimeSpan.FromDays(60));
-			var sut = new CertificateExpiryMonitor(_publisher, () => certificate, _logger);
-
-			// when
-			sut.Handle(new SystemMessage.SystemStart());
-
-			// then
-			Assert.IsInstanceOf<MonitoringMessage.CheckCertificateExpiry>(_publisher.Messages.Single());
-			Assert.IsEmpty(_logger.LogMessages);
-		}
-
-		[Test]
-		public void certificate_is_going_to_expire_within_30_days() {
-			// given
-			var certificate = GenCertificate(TimeSpan.FromDays(29));
-			var sut = new CertificateExpiryMonitor(_publisher, () => certificate, _logger);
-
-			// when
-			sut.Handle(new MonitoringMessage.CheckCertificateExpiry());
-
-			// then
-			var schedule = (TimerMessage.Schedule)_publisher.Messages.Single();
-			Assert.AreEqual(TimeSpan.FromHours(24), schedule.TriggerAfter);
-			Assert.IsInstanceOf<MonitoringMessage.CheckCertificateExpiry>(schedule.ReplyMessage);
-
-			var logMessage = _logger.LogMessages.Single();
-			Assert.AreEqual(
-				"Certificates are going to expire in 29.0 days",
-				logMessage.RenderMessage());
-		}
-
-		[Test]
-		public void certificate_is_not_going_to_expire_within_30_days() {
-			// given
-			var certificate = GenCertificate(TimeSpan.FromDays(31));
-			var sut = new CertificateExpiryMonitor(_publisher, () => certificate, _logger);
-
-			// when
-			sut.Handle(new MonitoringMessage.CheckCertificateExpiry());
-
-			// then
-			var schedule = (TimerMessage.Schedule)_publisher.Messages.Single();
-			Assert.AreEqual(TimeSpan.FromHours(24), schedule.TriggerAfter);
-			Assert.IsInstanceOf<MonitoringMessage.CheckCertificateExpiry>(schedule.ReplyMessage);
-
-			Assert.IsEmpty(_logger.LogMessages);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Certificates/X509Certificate2Extensions.cs b/src/EventStore.Core.Tests/Certificates/X509Certificate2Extensions.cs
deleted file mode 100644
index 1a2589bfda0..00000000000
--- a/src/EventStore.Core.Tests/Certificates/X509Certificate2Extensions.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
-
-namespace EventStore.Core.Tests.Certificates {
-	public static class X509Certificate2Extensions {
-		public static string PemPrivateKey(this X509Certificate2 certificate) {
-			return certificate.GetRSAPrivateKey()!.ExportRSAPrivateKey().PEM("RSA PRIVATE KEY");
-		}
-		
-		public static string PemPkcs8PrivateKey(this X509Certificate2 certificate) {
-			return certificate.GetRSAPrivateKey()!.ExportPkcs8PrivateKey().PEM("PRIVATE KEY");
-		}
-		
-		public static string EncryptedPemPkcs8PrivateKey(this X509Certificate2 certificate, string password) {
-			return certificate.GetRSAPrivateKey()!.ExportEncryptedPkcs8PrivateKey(password.AsSpan(), new PbeParameters(PbeEncryptionAlgorithm.Aes128Cbc, HashAlgorithmName.SHA1, 1)).PEM("ENCRYPTED PRIVATE KEY");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Certificates/certificate_validity_checks.cs b/src/EventStore.Core.Tests/Certificates/certificate_validity_checks.cs
deleted file mode 100644
index f43c498654e..00000000000
--- a/src/EventStore.Core.Tests/Certificates/certificate_validity_checks.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Certificates {
-	public class validity_checks_for_chain_of_length_1 : with_certificate_chain_of_length_1 {
-		[Test]
-		public void leaf_is_valid_node_certificate() => Assert.True(CertificateUtils.IsValidNodeCertificate(_leaf, out _));
-
-		[Test]
-		public void leaf_is_not_valid_intermediate() => Assert.False(CertificateUtils.IsValidIntermediateCertificate(_leaf, out _));
-
-		[Test]
-		public void leaf_is_valid_root() => Assert.True(CertificateUtils.IsValidRootCertificate(_leaf, out _));
-	}
-
-	public class validity_checks_for_chain_of_length_2 : with_certificate_chain_of_length_2 {
-		[Test]
-		public void leaf_is_valid_node_certificate() => Assert.True(CertificateUtils.IsValidNodeCertificate(_leaf, out _));
-
-		[Test]
-		public void leaf_is_valid_intermediate() => Assert.True(CertificateUtils.IsValidIntermediateCertificate(_leaf, out _));
-
-		[Test]
-		public void leaf_is_not_valid_root() => Assert.False(CertificateUtils.IsValidRootCertificate(_leaf, out _));
-
-		[Test]
-		public void root_is_not_valid_node_certificate() => Assert.False(CertificateUtils.IsValidNodeCertificate(_root, out _));
-
-		[Test]
-		public void root_is_not_valid_intermediate() => Assert.False(CertificateUtils.IsValidIntermediateCertificate(_root, out _));
-
-		[Test]
-		public void root_is_valid_root() => Assert.True(CertificateUtils.IsValidRootCertificate(_root, out _));
-	}
-
-	public class validity_checks_for_chain_of_length_3 : with_certificate_chain_of_length_3 {
-		[Test]
-		public void leaf_is_valid_node_certificate() => Assert.True(CertificateUtils.IsValidNodeCertificate(_leaf, out _));
-
-		[Test]
-		public void leaf_is_valid_intermediate() => Assert.True(CertificateUtils.IsValidIntermediateCertificate(_leaf, out _));
-
-		[Test]
-		public void leaf_is_not_valid_root() => Assert.False(CertificateUtils.IsValidRootCertificate(_leaf, out _));
-
-		[Test]
-		public void intermediate_is_not_valid_node_certificate() => Assert.False(CertificateUtils.IsValidNodeCertificate(_intermediate, out _));
-
-		[Test]
-		public void intermediate_is_valid_intermediate() => Assert.True(CertificateUtils.IsValidIntermediateCertificate(_intermediate, out _));
-
-		[Test]
-		public void intermediate_is_not_valid_root() => Assert.False(CertificateUtils.IsValidRootCertificate(_intermediate, out _));
-
-		[Test]
-		public void root_is_not_valid_node_certificate() => Assert.False(CertificateUtils.IsValidNodeCertificate(_root, out _));
-
-		[Test]
-		public void root_is_not_valid_intermediate() => Assert.False(CertificateUtils.IsValidIntermediateCertificate(_root, out _));
-
-		[Test]
-		public void root_is_valid_root() => Assert.True(CertificateUtils.IsValidRootCertificate(_root, out _));
-	}
-
-}
diff --git a/src/EventStore.Core.Tests/Certificates/chain_building.cs b/src/EventStore.Core.Tests/Certificates/chain_building.cs
deleted file mode 100644
index a0b1611a604..00000000000
--- a/src/EventStore.Core.Tests/Certificates/chain_building.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using System.Security.Cryptography.X509Certificates;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Certificates {
-	public class with_valid_chain_of_length_2 : with_certificate_chain_of_length_2 {
-		[Test]
-		public void builds_with_no_error() {
-			var chainStatus = CertificateUtils.BuildChain(
-				_leaf,
-				new X509Certificate2Collection(),
-				new X509Certificate2Collection(_root), out _);
-			Assert.True(chainStatus == X509ChainStatusFlags.NoError);
-		}
-	}
-
-	public class with_valid_chain_of_length_3 : with_certificate_chain_of_length_3 {
-		[Test]
-		public void builds_with_no_error() {
-			var chainStatus = CertificateUtils.BuildChain(
-				_leaf,
-				new X509Certificate2Collection(_intermediate),
-				new X509Certificate2Collection(_root), out _);
-			Assert.True(chainStatus == X509ChainStatusFlags.NoError);
-		}
-	}
-
-	public class with_expired_root_certificate : with_certificate_chain_of_length_3 {
-		public with_expired_root_certificate() : base(rootExpired: true) { }
-
-		[Test]
-		public void builds_with_not_time_valid() {
-			var chainStatus = CertificateUtils.BuildChain(
-				_leaf,
-				new X509Certificate2Collection(_intermediate),
-				new X509Certificate2Collection(_root), out _);
-			Assert.True(chainStatus == X509ChainStatusFlags.NotTimeValid);
-		}
-	}
-
-	public class with_expired_intermediate_certificate : with_certificate_chain_of_length_3 {
-		public with_expired_intermediate_certificate() : base(intermediateExpired: true) { }
-		[Test]
-		public void builds_with_not_time_valid() {
-			var chainStatus = CertificateUtils.BuildChain(
-				_leaf,
-				new X509Certificate2Collection(_intermediate),
-				new X509Certificate2Collection(_root), out _);
-			Assert.True(chainStatus == X509ChainStatusFlags.NotTimeValid);
-		}
-	}
-
-	public class with_expired_leaf_certificate : with_certificate_chain_of_length_3 {
-		public with_expired_leaf_certificate() : base(leafExpired: true) { }
-
-		[Test]
-		public void builds_with_not_time_valid() {
-			var chainStatus = CertificateUtils.BuildChain(
-				_leaf,
-				new X509Certificate2Collection(_intermediate),
-				new X509Certificate2Collection(_root), out _);
-			Assert.True(chainStatus == X509ChainStatusFlags.NotTimeValid);
-		}
-	}
-
-	public class without_intermediate_certificate : with_certificate_chain_of_length_3 {
-		[Test]
-		public void builds_with_partial_chain() {
-			var chainStatus = CertificateUtils.BuildChain(
-				_leaf,
-				new X509Certificate2Collection(),
-				new X509Certificate2Collection(_root), out _);
-			Assert.True(chainStatus == X509ChainStatusFlags.PartialChain);
-		}
-	}
-
-	public class without_root_certificate : with_certificate_chain_of_length_3 {
-		[Test]
-		public void builds_with_partial_chain() {
-			var chainStatus = CertificateUtils.BuildChain(
-				_leaf,
-				new X509Certificate2Collection(_intermediate),
-				new X509Certificate2Collection(), out _);
-			Assert.True(chainStatus == X509ChainStatusFlags.PartialChain);
-		}
-	}
-
-	public class with_untrusted_root : with_certificate_chain_of_length_3 {
-		[Test]
-		public void builds_with_untrusted_root() {
-			var chainStatus = CertificateUtils.BuildChain(
-				_leaf,
-				new X509Certificate2Collection(new []{_intermediate, _root}),
-				new X509Certificate2Collection(), out _);
-			Assert.True(chainStatus == X509ChainStatusFlags.UntrustedRoot);
-		}
-	}
-
-}
diff --git a/src/EventStore.Core.Tests/Certificates/key_usages.cs b/src/EventStore.Core.Tests/Certificates/key_usages.cs
deleted file mode 100644
index a21b996ff9b..00000000000
--- a/src/EventStore.Core.Tests/Certificates/key_usages.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
-using EventStore.Common.Utils;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Certificates {
-	public class key_usages {
-		private readonly Oid _serverAuth = Oid.FromOidValue("1.3.6.1.5.5.7.3.1", OidGroup.EnhancedKeyUsage);
-		private readonly Oid _clientAuth = Oid.FromOidValue("1.3.6.1.5.5.7.3.2", OidGroup.EnhancedKeyUsage);
-		private const X509KeyUsageFlags DefaultKeyUsages = X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.KeyEncipherment;
-
-		private static X509Certificate2 GenSut(X509KeyUsageFlags keyUsages, OidCollection extendedKeyUsages) {
-			using (RSA rsa = RSA.Create()) {
-				var certReq =
-					new CertificateRequest("CN=hello", rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
-
-				var keyUsageExtension = new X509KeyUsageExtension(keyUsages, false);
-				var extendedKeyUsageExtension = new X509EnhancedKeyUsageExtension(extendedKeyUsages, false);
-
-				certReq.CertificateExtensions.Add(keyUsageExtension);
-
-				if (extendedKeyUsages.Count != 0)
-					certReq.CertificateExtensions.Add(extendedKeyUsageExtension);
-
-				return certReq.CreateSelfSigned(DateTimeOffset.UtcNow.AddMonths(-1),
-					DateTimeOffset.UtcNow.AddMonths(1));
-			}
-		}
-
-		private static OidCollection GenOids(params Oid[] oids) {
-			var oidCollection = new OidCollection();
-			foreach (var oid in oids) {
-				oidCollection.Add(oid);
-			}
-
-			return oidCollection;
-		}
-
-		[Test]
-		public void certificate_with_client_auth_eku() {
-			var sut = GenSut(
-				keyUsages: DefaultKeyUsages,
-				extendedKeyUsages: GenOids(_clientAuth));
-
-			Assert.True(sut.IsClientCertificate(out _));
-			Assert.False(sut.IsServerCertificate(out _));
-		}
-
-		[Test]
-		public void certificate_with_client_and_server_auth_eku() {
-			var sut = GenSut(
-				keyUsages: DefaultKeyUsages,
-				extendedKeyUsages: GenOids(_clientAuth, _serverAuth));
-
-			Assert.True(sut.IsServerCertificate(out _));
-			Assert.True(sut.IsClientCertificate(out _));
-		}
-
-		[Test]
-		public void certificate_with_server_auth_eku_only() {
-			var sut = GenSut(
-				keyUsages: DefaultKeyUsages,
-				extendedKeyUsages: GenOids(_serverAuth));
-
-			// historically, server certificates also have the clientAuth EKU
-			Assert.False(sut.IsServerCertificate(out _));
-			Assert.False(sut.IsClientCertificate(out _));
-		}
-
-		[Test]
-		public void certificate_with_no_ekus() {
-			var sut = GenSut(
-				keyUsages: DefaultKeyUsages,
-				extendedKeyUsages: GenOids());
-
-			Assert.True(sut.IsServerCertificate(out _));
-			Assert.False(sut.IsClientCertificate(out _));
-		}
-
-		[Test]
-		public void certificate_with_no_key_usage() {
-			var sut = GenSut(
-				keyUsages: X509KeyUsageFlags.None,
-				extendedKeyUsages: GenOids(_clientAuth, _serverAuth));
-
-			Assert.False(sut.IsClientCertificate(out _));
-			Assert.False(sut.IsServerCertificate(out _));
-		}
-
-		[Test]
-		public void certificate_with_missing_key_usage() {
-			var sut = GenSut(
-				keyUsages: X509KeyUsageFlags.KeyEncipherment,
-				extendedKeyUsages: GenOids(_clientAuth, _serverAuth));
-
-			Assert.False(sut.IsClientCertificate(out _));
-			Assert.False(sut.IsServerCertificate(out _));
-		}
-
-		[Test]
-		public void certificate_with_key_agreement_instead_of_key_encipherment_key_usage() {
-			var sut = GenSut(
-				keyUsages: X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.KeyAgreement,
-				extendedKeyUsages: GenOids(_clientAuth, _serverAuth));
-
-			Assert.True(sut.IsClientCertificate(out _));
-			Assert.True(sut.IsServerCertificate(out _));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Certificates/name_matching.cs b/src/EventStore.Core.Tests/Certificates/name_matching.cs
deleted file mode 100644
index eb4dafa78cb..00000000000
--- a/src/EventStore.Core.Tests/Certificates/name_matching.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-using System;
-using System.Net;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
-using EventStore.Common.Utils;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Certificates {
-	public class name_matching {
-		private X509Certificate2 GenSut(string subjectName, (string name, string type)[] sans)  {
-			using (RSA rsa = RSA.Create())
-			{
-				var certReq = new CertificateRequest(subjectName, rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
-				var sanBuilder = new SubjectAlternativeNameBuilder();
-				foreach (var (name, type) in sans) {
-					switch (type) {
-						case CertificateNameType.IpAddress:
-							sanBuilder.AddIpAddress(IPAddress.Parse(name));
-							break;
-						case CertificateNameType.DnsName:
-							sanBuilder.AddDnsName(name);
-							break;
-					}
-				}
-
-				certReq.CertificateExtensions.Add(sanBuilder.Build());
-				return certReq.CreateSelfSigned(DateTimeOffset.UtcNow.AddMonths(-1), DateTimeOffset.UtcNow.AddMonths(1));
-			}
-		}
-
-		[Test]
-		public void ip_address_matches_ip_san() {
-			var sut = GenSut("CN=test", new [] {
-					("10.123.45.6", CertificateNameType.IpAddress)
-			});
-
-			Assert.True(sut.MatchesName("10.123.45.6"));
-			Assert.False(sut.MatchesName("10.13.45.6"));
-		}
-
-		[Test]
-		public void dns_name_matches_dns_san() {
-			var sut = GenSut("CN=test", new [] {
-				("subdomain.domain.com", CertificateNameType.DnsName)
-			});
-
-			Assert.True(sut.MatchesName("subdomain.domain.com"));
-
-			Assert.False(sut.MatchesName("com"));
-			Assert.False(sut.MatchesName("domain.com"));
-			Assert.False(sut.MatchesName("subdomain"));
-			Assert.False(sut.MatchesName("subdomain.domain"));
-			Assert.False(sut.MatchesName("subdomain.domain.coms"));
-			Assert.False(sut.MatchesName("1subdomain.domain.com"));
-			Assert.False(sut.MatchesName("sub.subdomain.domain.com"));
-		}
-
-		[Test]
-		public void dns_name_matches_dns_san_case_insensitive() {
-			var sut = GenSut("CN=test", new [] {
-				("website.tld", CertificateNameType.DnsName)
-			});
-
-			Assert.True(sut.MatchesName("WeBsIte.tLd"));
-		}
-
-		[Test]
-		public void cn_is_ignored_when_dns_san_is_present() {
-			var sut = GenSut("CN=test", new [] {
-				("website.tld", CertificateNameType.DnsName)
-			});
-
-			Assert.False(sut.MatchesName("test"));
-		}
-
-		[Test]
-		public void cn_is_ignored_when_ip_san_is_present() {
-			var sut = GenSut("CN=test", new [] {
-				("127.0.0.1", CertificateNameType.IpAddress)
-			});
-
-			Assert.False(sut.MatchesName("test"));
-		}
-
-		[Test]
-		public void cn_is_considered_when_no_san_is_present() {
-			var sut = GenSut("CN=test", Array.Empty<(string name, string type)>());
-			Assert.True(sut.MatchesName("test"));
-		}
-
-		[Test]
-		public void dns_name_matches_cn_case_insensitive() {
-			var sut = GenSut("CN=subdomain.domain.com", Array.Empty<(string name, string type)>());
-			Assert.True(sut.MatchesName("SubDomain.DoMaiN.COm"));
-		}
-
-		[Test]
-		public void cn_matches_when_subject_name_contains_other_fields() {
-			var sut = GenSut("CN=a.b.c,OU=Engineering,O=Company, C=Country", Array.Empty<(string name, string type)>());
-			Assert.True(sut.MatchesName("a.b.c"));
-			Assert.False(sut.MatchesName("a.b.c,OU"));
-		}
-
-		[Test]
-		public void dns_name_matches_wildcard_cn() {
-			var sut = GenSut("CN=*.example.com", Array.Empty<(string name, string type)>());
-
-			Assert.True(sut.MatchesName("foo.example.com"));
-
-			Assert.False(sut.MatchesName(".example.com"));
-			Assert.False(sut.MatchesName("bar.foo.example.com"));
-			Assert.False(sut.MatchesName("foo"));
-			Assert.False(sut.MatchesName("foo.example"));
-		}
-
-		[Test]
-		public void dns_name_does_not_match_wildcard_cn_with_less_than_three_domain_labels() {
-			var sut = GenSut("CN=*", Array.Empty<(string name, string type)>());
-			Assert.False(sut.MatchesName("tld"));
-
-			sut = GenSut("CN=*.com", Array.Empty<(string name, string type)>());
-			Assert.False(sut.MatchesName("example.com"));
-		}
-
-		[Test]
-		public void dns_name_matches_wildcard_cn_with_four_domain_labels() {
-			var sut = GenSut("CN=*.test.example.com", Array.Empty<(string name, string type)>());
-			Assert.True(sut.MatchesName("abc.test.example.com"));
-		}
-
-		[Test]
-		public void dns_name_matches_wildcard_dns_san() {
-			var sut = GenSut("CN=test", new [] {
-				("*.example.com", CertificateNameType.DnsName)
-			});
-
-			Assert.True(sut.MatchesName("foo.example.com"));
-
-			Assert.False(sut.MatchesName(".example.com"));
-			Assert.False(sut.MatchesName("bar.foo.example.com"));
-			Assert.False(sut.MatchesName("foo"));
-			Assert.False(sut.MatchesName("foo.example"));
-		}
-
-		[Test]
-		public void dns_name_matches_wildcard_dns_san_case_insensitive() {
-			var sut = GenSut("CN=test", new [] {
-				("*.example.com", CertificateNameType.DnsName)
-			});
-
-			Assert.True(sut.MatchesName("ABcdEF.ExAmPle.CoM"));
-		}
-
-		[Test]
-		public void dns_name_does_not_match_partial_wildcard_prefix_dns_san() {
-			var sut = GenSut("CN=test", new [] {
-				("*s.abcd", CertificateNameType.DnsName)
-			});
-
-			Assert.False(sut.MatchesName("s.abcd"));
-			Assert.False(sut.MatchesName("tests.abcd"));
-		}
-
-		[Test]
-		public void dns_name_does_not_match_partial_wildcard_suffix_dns_san() {
-			var sut = GenSut("CN=test", new [] {
-				("t*.abc", CertificateNameType.DnsName)
-			});
-
-			Assert.False(sut.MatchesName("t.abc"));
-			Assert.False(sut.MatchesName("test.abc"));
-		}
-
-		[Test]
-		public void dns_name_does_not_match_partial_wildcard_dns_san() {
-			var sut = GenSut("CN=test", new [] {
-				("abc*def.tld", CertificateNameType.DnsName)
-			});
-
-			Assert.False(sut.MatchesName("abcdef.tld"));
-			Assert.False(sut.MatchesName("abcHELLOdef.tld"));
-		}
-
-		[Test]
-		public void dns_name_does_not_match_wildcard_in_non_first_dns_san_label() {
-			var sut = GenSut("CN=test", new [] {
-				("hello.*.com", CertificateNameType.DnsName)
-			});
-
-			Assert.False(sut.MatchesName("hello.test.com"));
-			Assert.False(sut.MatchesName("hello.*.com"));
-		}
-
-		[Test]
-		public void dns_name_does_not_match_multiple_wildcards_in_first_dns_san_label() {
-			var sut = GenSut("CN=test", new [] {
-				("a*bc*d.test.com", CertificateNameType.DnsName)
-			});
-
-			Assert.False(sut.MatchesName("a*bc*d.test.com"));
-			Assert.False(sut.MatchesName("abcd.test.com"));
-			Assert.False(sut.MatchesName("a1bc2d.test.com"));
-		}
-
-		[Test]
-		public void invalid_dns_name_does_not_match_wildcard_dns_san() {
-			var sut = GenSut("CN=test", new [] {
-				("*.example.com", CertificateNameType.DnsName)
-			});
-
-			Assert.False(sut.MatchesName("*.example.com"));
-			Assert.False(sut.MatchesName("te+st.example.com"));
-			Assert.False(sut.MatchesName("te$st.example.com"));
-			Assert.False(sut.MatchesName("te=st.example.com"));
-		}
-
-		[Test]
-		public void ip_address_does_not_match_wildcard_dns_san() {
-			var sut = GenSut("CN=test", new [] {
-				("*", CertificateNameType.DnsName)
-			});
-
-			Assert.False(sut.MatchesName("127.0.0.1"));
-		}
-
-		[Test]
-		public void ip_address_does_not_match_wildcard_cn() {
-			var sut = GenSut("CN=*", Array.Empty<(string name, string type)>());
-			Assert.False(sut.MatchesName("127.0.0.1"));
-		}
-
-		[Test]
-		public void dns_name_matches_internationalized_dns_san() {
-			var sut = GenSut("CN=test", new [] {
-				("سلام", CertificateNameType.DnsName),
-				("和平.tld", CertificateNameType.DnsName),
-				("world.สันติภาพ.com", CertificateNameType.DnsName)
-			});
-
-			Assert.True(sut.MatchesName("سلام"));
-			Assert.True(sut.MatchesName("xn--mgbx5cf"));
-
-			Assert.True(sut.MatchesName("和平.tld"));
-			Assert.True(sut.MatchesName("xn--0tr63u.tld"));
-
-			Assert.True(sut.MatchesName("world.สันติภาพ.com"));
-			Assert.True(sut.MatchesName("world.xn--m3chqh1c2bko.com"));
-		}
-
-		[Test]
-		public void dns_name_matches_internationalized_dns_san_with_ace_prefix() {
-			var sut = GenSut("CN=test", new [] {
-				("xn--mgbx5cf", CertificateNameType.DnsName),
-				("xn--0tr63u.tld", CertificateNameType.DnsName),
-				("world.xn--m3chqh1c2bko.com", CertificateNameType.DnsName)
-			});
-
-			Assert.True(sut.MatchesName("سلام"));
-			Assert.True(sut.MatchesName("xn--mgbx5cf"));
-
-			Assert.True(sut.MatchesName("和平.tld"));
-			Assert.True(sut.MatchesName("xn--0tr63u.tld"));
-
-			Assert.True(sut.MatchesName("world.สันติภาพ.com"));
-			Assert.True(sut.MatchesName("world.xn--m3chqh1c2bko.com"));
-		}
-
-		[Test]
-		public void dns_name_matches_internationalized_dns_san_case_insensitive() {
-			var sut = GenSut("CN=test", new [] {
-				("سلام", CertificateNameType.DnsName)
-			});
-
-			Assert.True(sut.MatchesName("Xn--MgBx5Cf"));
-		}
-
-		[Test]
-		public void dns_name_matches_internationalized_cn() {
-			var sut = GenSut("CN=xn--mgbx5cf", Array.Empty<(string name, string type)>());
-			Assert.True(sut.MatchesName("سلام"));
-			Assert.True(sut.MatchesName("xn--mgbx5cf"));
-		}
-
-		[Test]
-		public void dns_name_matches_internationalized_cn_case_insensitive() {
-			var sut = GenSut("CN=xn--mgbx5cf", Array.Empty<(string name, string type)>());
-			Assert.True(sut.MatchesName("Xn--MgBx5Cf"));
-		}
-
-		[Test]
-		public void dns_name_matches_wildcard_internationalized_dns_san() {
-			var sut = GenSut("CN=test", new [] {
-				("*.สันติภาพ.com", CertificateNameType.DnsName)
-			});
-
-			Assert.True(sut.MatchesName("world.สันติภาพ.com"));
-			Assert.True(sut.MatchesName("world.xn--m3chqh1c2bko.com"));
-
-			Assert.True(sut.MatchesName("สันติภาพ.สันติภาพ.com"));
-			Assert.True(sut.MatchesName("xn--m3chqh1c2bko.xn--m3chqh1c2bko.com"));
-		}
-
-		[Test]
-		public void dns_name_does_not_match_internationalized_dns_san_with_illegal_wildcard_characters() {
-			var sut = GenSut("CN=test", new [] {
-				("*.สันติภาพ*.com", CertificateNameType.DnsName),
-				("*.xn--*-yxflvj1d7blq.com", CertificateNameType.DnsName)
-			});
-
-			Assert.False(sut.MatchesName("world.สันติภาพ*.com"));
-			Assert.False(sut.MatchesName("world.xn--*-yxflvj1d7blq.com"));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Certificates/subject_alternative_names.cs b/src/EventStore.Core.Tests/Certificates/subject_alternative_names.cs
deleted file mode 100644
index 88d98570da4..00000000000
--- a/src/EventStore.Core.Tests/Certificates/subject_alternative_names.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using System;
-using System.Linq;
-using System.Net;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
-using EventStore.Common.Utils;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Certificates {
-	public class subject_alternative_names {
-		private X509Certificate2 GenSut((string name, string type)[] sans)  {
-			using (RSA rsa = RSA.Create())
-			{
-				var certReq = new CertificateRequest("CN=hello", rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
-				var sanBuilder = new SubjectAlternativeNameBuilder();
-				foreach (var (name, type) in sans) {
-					switch (type) {
-						case CertificateNameType.IpAddress:
-							sanBuilder.AddIpAddress(IPAddress.Parse(name));
-							break;
-						case CertificateNameType.DnsName:
-							sanBuilder.AddDnsName(name);
-							break;
-						case "email":
-							sanBuilder.AddEmailAddress(name);
-							break;
-						case "uri":
-							sanBuilder.AddUri(new Uri(name));
-							break;
-						case "upn":
-							sanBuilder.AddUserPrincipalName(name);
-							break;
-					}
-				}
-
-				certReq.CertificateExtensions.Add(sanBuilder.Build());
-				return certReq.CreateSelfSigned(DateTimeOffset.UtcNow.AddMonths(-1), DateTimeOffset.UtcNow.AddMonths(1));
-			}
-		}
-
-		[Test]
-		public void can_read_one_ip_address_from_san() {
-			var sut = GenSut(new [] { ("127.0.0.1", CertificateNameType.IpAddress) });
-			var sans = sut.GetSubjectAlternativeNames().ToArray();
-			Assert.AreEqual(1, sans.Length);
-			Assert.AreEqual("127.0.0.1", sans[0].name);
-			Assert.AreEqual(CertificateNameType.IpAddress, sans[0].type);
-		}
-
-		[Test]
-		public void can_read_one_dns_name_from_san() {
-			var sut = GenSut(new [] { ("hello.world", CertificateNameType.DnsName) });
-			var sans = sut.GetSubjectAlternativeNames().ToArray();
-			Assert.AreEqual(1, sans.Length);
-			Assert.AreEqual("hello.world", sans[0].name);
-			Assert.AreEqual(CertificateNameType.DnsName, sans[0].type);
-		}
-
-		[Test]
-		public void can_read_multiple_ips_and_dns_names_from_san() {
-			var sut = GenSut(new [] {
-				("127.0.0.1", CertificateNameType.IpAddress),
-				("hello.world", CertificateNameType.DnsName),
-				("10.0.0.2", CertificateNameType.IpAddress),
-				("good.bye.world", CertificateNameType.DnsName)
-			});
-			var sans = sut.GetSubjectAlternativeNames().ToArray();
-			Assert.AreEqual(4, sans.Length);
-			Assert.AreEqual(new [] {"10.0.0.2", "127.0.0.1"},
-				sans.Where(san => san.type == CertificateNameType.IpAddress)
-					.Select(x => x.name)
-					.OrderBy(x => x).ToArray());
-			Assert.AreEqual(new [] {"good.bye.world", "hello.world"},
-				sans.Where(san => san.type == CertificateNameType.DnsName)
-					.Select(x => x.name)
-					.OrderBy(x => x).ToArray());
-		}
-
-		[Test]
-		public void can_read_multiple_ips_and_dns_names_from_san_with_other_name_types() {
-			var sut = GenSut(new [] {
-				("https://uritest/path", "uri"),
-				("127.0.0.1", CertificateNameType.IpAddress),
-				("test@test.com", "email"),
-				("hello.world", CertificateNameType.DnsName),
-				("https://hello.com/test", "uri"),
-				("10.0.0.2", CertificateNameType.IpAddress),
-				("user@domain.com", "upn"),
-				("good.bye.world", CertificateNameType.DnsName),
-				("test2@test2.com", "email"),
-			});
-			var sans = sut.GetSubjectAlternativeNames().ToArray();
-			Assert.AreEqual(4, sans.Length);
-			Assert.AreEqual(new [] {"10.0.0.2", "127.0.0.1"},
-				sans.Where(san => san.type == CertificateNameType.IpAddress)
-					.Select(x => x.name)
-					.OrderBy(x => x).ToArray());
-			Assert.AreEqual(new [] {"good.bye.world", "hello.world"},
-				sans.Where(san => san.type == CertificateNameType.DnsName)
-					.Select(x => x.name)
-					.OrderBy(x => x).ToArray());
-		}
-
-	}
-
-}
diff --git a/src/EventStore.Core.Tests/Certificates/with_certificate_chain_of_length_1.cs b/src/EventStore.Core.Tests/Certificates/with_certificate_chain_of_length_1.cs
deleted file mode 100644
index cb65efd99b4..00000000000
--- a/src/EventStore.Core.Tests/Certificates/with_certificate_chain_of_length_1.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Security.Cryptography.X509Certificates;
-
-namespace EventStore.Core.Tests.Certificates {
-	public class with_certificate_chain_of_length_1 : with_certificates {
-		protected readonly X509Certificate2 _leaf;
-
-		public with_certificate_chain_of_length_1() {
-			_leaf = CreateCertificate(issuer: false);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Certificates/with_certificate_chain_of_length_2.cs b/src/EventStore.Core.Tests/Certificates/with_certificate_chain_of_length_2.cs
deleted file mode 100644
index 0d3b9c34cc4..00000000000
--- a/src/EventStore.Core.Tests/Certificates/with_certificate_chain_of_length_2.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Security.Cryptography.X509Certificates;
-
-namespace EventStore.Core.Tests.Certificates {
-	public class with_certificate_chain_of_length_2 : with_certificates {
-		protected readonly X509Certificate2 _root, _leaf;
-
-		public with_certificate_chain_of_length_2() {
-			var root = CreateCertificate(issuer: true);
-			var leaf = CreateCertificate(issuer: false, parent: root);
-
-			//get rid of private keys except for the leaf
-			_root = new X509Certificate2(root.Export(X509ContentType.Cert));
-			_leaf = leaf;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Certificates/with_certificate_chain_of_length_3.cs b/src/EventStore.Core.Tests/Certificates/with_certificate_chain_of_length_3.cs
deleted file mode 100644
index ff7710a1916..00000000000
--- a/src/EventStore.Core.Tests/Certificates/with_certificate_chain_of_length_3.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Security.Cryptography.X509Certificates;
-
-namespace EventStore.Core.Tests.Certificates {
-	public class with_certificate_chain_of_length_3 : with_certificates {
-		protected readonly X509Certificate2 _root, _intermediate, _leaf;
-
-		public with_certificate_chain_of_length_3(
-			bool leafExpired = false,
-			bool intermediateExpired = false,
-			bool rootExpired = false) {
-			var root = CreateCertificate(issuer: true, expired: rootExpired);
-			var intermediate = CreateCertificate(issuer: true, parent: root, expired: intermediateExpired);
-			var leaf = CreateCertificate(issuer: false, parent: intermediate, expired: leafExpired);
-
-			//get rid of private keys except for the leaf
-			_root = new X509Certificate2(root.Export(X509ContentType.Cert));
-			_intermediate = new X509Certificate2(intermediate.Export(X509ContentType.Cert));
-			_leaf = leaf;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Certificates/with_certificate_files.cs b/src/EventStore.Core.Tests/Certificates/with_certificate_files.cs
deleted file mode 100644
index 22fc289fec0..00000000000
--- a/src/EventStore.Core.Tests/Certificates/with_certificate_files.cs
+++ /dev/null
@@ -1,518 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Security.Cryptography.Pkcs;
-using System.Security.Cryptography.X509Certificates;
-using EventStore.Common.Utils;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Certificates {
-	public class with_der : with_certificate_chain_of_length_1 {
-		private string _certPath, _keyPath;
-
-		[SetUp]
-		public void Setup() {
-			_certPath = $"{PathName}/leaf.der";
-			_keyPath = $"{PathName}/leaf.key";
-			File.WriteAllBytes(_certPath, _leaf.Export(X509ContentType.Cert));
-			File.WriteAllText(_keyPath, _leaf.PemPrivateKey());
-		}
-
-		[Test]
-		public void can_load_certificate() {
-			var (certificate, intermediates) = CertificateUtils.LoadFromFile(_certPath, _keyPath, string.Empty);
-			Assert.AreEqual(_leaf, certificate);
-			Assert.IsNull(intermediates);
-			Assert.True(certificate.HasPrivateKey);
-		}
-	}
-
-	public class with_der_and_wrong_key : with_certificate_chain_of_length_1 {
-		private string _certPath, _keyPath;
-
-		[SetUp]
-		public void Setup() {
-			_certPath = $"{PathName}/leaf.der";
-			_keyPath = $"{PathName}/leaf.key";
-
-			using var wrongKey = RSA.Create();
-			File.WriteAllBytes(_certPath, _leaf.Export(X509ContentType.Cert));
-			File.WriteAllText(_keyPath, wrongKey.ExportRSAPrivateKey().PEM("RSA PRIVATE KEY"));
-		}
-
-		[Test]
-		public void cannot_load_certificate() {
-			Assert.Throws<ArgumentException>(() =>
-				CertificateUtils.LoadFromFile(_certPath, _keyPath, string.Empty)
-			);
-		}
-	}
-
-	public class with_pem : with_certificate_chain_of_length_1 {
-		private string _certPath, _keyPath;
-
-		[SetUp]
-		public void Setup() {
-			_certPath = $"{PathName}/leaf.pem";
-			_keyPath = $"{PathName}/leaf.key";
-			File.WriteAllText(_certPath, _leaf.Export(X509ContentType.Cert).PEM("CERTIFICATE"));
-			File.WriteAllText(_keyPath, _leaf.PemPrivateKey());
-		}
-
-		[Test]
-		public void can_load_certificate() {
-			var (certificate, intermediates) = CertificateUtils.LoadFromFile(_certPath, _keyPath, string.Empty);
-			Assert.AreEqual(_leaf, certificate);
-			Assert.IsNull(intermediates);
-			Assert.True(certificate.HasPrivateKey);
-		}
-	}
-
-	public class with_pem_and_wrong_key : with_certificate_chain_of_length_1 {
-		private string _certPath, _keyPath;
-
-		[SetUp]
-		public void Setup() {
-			_certPath = $"{PathName}/leaf.pem";
-			_keyPath = $"{PathName}/leaf.key";
-
-			using var wrongKey = RSA.Create();
-			File.WriteAllText(_certPath, _leaf.Export(X509ContentType.Cert).PEM("CERTIFICATE"));
-			File.WriteAllText(_keyPath, wrongKey.ExportRSAPrivateKey().PEM("RSA PRIVATE KEY"));
-		}
-
-		[Test]
-		public void cannot_load_certificate() {
-			Assert.Throws<ArgumentException>(
-				() => CertificateUtils.LoadFromFile(_certPath, _keyPath, string.Empty)
-			);
-		}
-	}
-
-	public class with_password_protected_pkcs12 : with_certificate_chain_of_length_1 {
-		private string _certPath;
-		private const string Password = "test$1234";
-
-		[SetUp]
-		public void Setup() {
-			_certPath = $"{PathName}/leaf.p12";
-			File.WriteAllBytes(_certPath, _leaf.ExportToPkcs12(Password));
-		}
-
-		[Test]
-		public void can_load_certificate() {
-			var (certificate, intermediates) = CertificateUtils.LoadFromFile(_certPath, null, Password);
-			Assert.AreEqual(_leaf, certificate);
-			Assert.IsNull(intermediates);
-			Assert.True(certificate.HasPrivateKey);
-		}
-	}
-	
-	public class with_passwordless_pkcs8_private_key : with_certificate_chain_of_length_1 {
-		private string _certPath;
-		private string _privateKeyPath;
-
-		[SetUp]
-		public void Setup() {
-			_certPath = $"{PathName}/leaf.pem";
-			File.WriteAllText(_certPath, _leaf.Export(X509ContentType.Cert).PEM("CERTIFICATE"));
-			
-			_privateKeyPath = $"{PathName}/leaf.p8";
-			File.WriteAllText(_privateKeyPath, _leaf.PemPkcs8PrivateKey());
-		}
-
-		[Test]
-		public void can_load_certificate_and_private_key() {
-			var (certificate, intermediates) = CertificateUtils.LoadFromFile(_certPath, _privateKeyPath, null);
-			Assert.AreEqual(_leaf, certificate);
-			Assert.IsNull(intermediates);
-			Assert.True(certificate.HasPrivateKey);
-		}
-	}
-	
-	public class with_password_protected_pkcs8_private_key : with_certificate_chain_of_length_1 {
-		private string _certPath;
-		private string _privateKeyPath;
-		private const string Password = "test$1234";
-
-		[SetUp]
-		public void Setup() {
-			_certPath = $"{PathName}/leaf.pem";
-			File.WriteAllText(_certPath, _leaf.Export(X509ContentType.Cert).PEM("CERTIFICATE"));
-			
-			_privateKeyPath = $"{PathName}/leaf.p8";
-			File.WriteAllText(_privateKeyPath, _leaf.EncryptedPemPkcs8PrivateKey(Password));
-		}
-
-		[Test]
-		public void can_load_certificate() {
-			var (certificate, intermediates) = CertificateUtils.LoadFromFile(_certPath, _privateKeyPath, null, Password);
-			Assert.AreEqual(_leaf, certificate);
-			Assert.IsNull(intermediates);
-			Assert.True(certificate.HasPrivateKey);
-		}
-	}
-
-	public class with_passwordless_pkcs12 : with_certificate_chain_of_length_1 {
-		private string _certPath;
-		private const string Password = null;
-
-		[SetUp]
-		public void Setup() {
-			_certPath = $"{PathName}/leaf.p12";
-			File.WriteAllBytes(_certPath, _leaf.ExportToPkcs12(Password));
-		}
-
-		[Test]
-		public void can_load_certificate() {
-			var (certificate, intermediates) = CertificateUtils.LoadFromFile(_certPath, null, Password);
-			Assert.AreEqual(_leaf, certificate);
-			Assert.IsNull(intermediates);
-			Assert.True(certificate.HasPrivateKey);
-		}
-	}
-
-	public class with_pkcs12_and_wrong_key : with_certificate_chain_of_length_1 {
-		private string _certPath;
-		private const string Password = null;
-
-		[SetUp]
-		public void Setup() {
-			_certPath = $"{PathName}/leaf.p12";
-
-			using var wrongKey = RSA.Create();
-			var builder = new Pkcs12Builder();
-			var safeContents = new Pkcs12SafeContents();
-			var pbeParams = new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 2048);
-			safeContents.AddCertificate(_leaf);
-			safeContents.AddShroudedKey(wrongKey, Password, pbeParams);
-			builder.AddSafeContentsEncrypted(safeContents, Password, pbeParams);
-			builder.SealWithMac(Password, HashAlgorithmName.SHA256, 2048);
-
-			File.WriteAllBytes(_certPath, builder.Encode());
-		}
-
-		[Test]
-		public void cannot_load_certificate() {
-			Assert.Throws<ArgumentException>(() =>
-				CertificateUtils.LoadFromFile(_certPath, null, Password)
-			);
-		}
-	}
-
-	public class with_pem_bundle : with_certificate_chain_of_length_3 {
-		private string _certPath, _keyPath;
-
-		[SetUp]
-		public void Setup() {
-			_certPath = $"{PathName}/bundle.pem";
-			_keyPath = $"{PathName}/leaf.key";
-			var leaf = _leaf.Export(X509ContentType.Cert).PEM("CERTIFICATE");
-			var intermediate = _intermediate.Export(X509ContentType.Cert).PEM("CERTIFICATE");
-
-			File.WriteAllText(_certPath, leaf + intermediate);
-			File.WriteAllText(_keyPath, _leaf.PemPrivateKey());
-		}
-
-		[Test]
-		public void can_load_certificate() {
-			var (certificate, intermediates) = CertificateUtils.LoadFromFile(_certPath, _keyPath, string.Empty);
-			Assert.AreEqual(_leaf, certificate);
-			Assert.AreEqual(1, intermediates.Count);
-			Assert.AreEqual(_intermediate, intermediates[0]);
-			Assert.True(certificate.HasPrivateKey);
-			Assert.False(intermediates[0].HasPrivateKey);
-		}
-	}
-
-	public class with_pem_bundle_and_wrong_key : with_certificate_chain_of_length_3 {
-		private string _certPath, _keyPath;
-
-		[SetUp]
-		public void Setup() {
-			_certPath = $"{PathName}/bundle.pem";
-			_keyPath = $"{PathName}/leaf.key";
-			var leaf = _leaf.Export(X509ContentType.Cert).PEM("CERTIFICATE");
-			var intermediate = _intermediate.Export(X509ContentType.Cert).PEM("CERTIFICATE");
-
-			using var wrongKey = RSA.Create();
-			File.WriteAllText(_certPath, leaf + intermediate);
-			File.WriteAllText(_keyPath, wrongKey.ExportRSAPrivateKey().PEM("RSA PRIVATE KEY"));
-		}
-
-		[Test]
-		public void cannot_load_certificate() {
-			Assert.Throws<ArgumentException>(
-			() => CertificateUtils.LoadFromFile(_certPath, _keyPath, string.Empty)
-			);
-		}
-	}
-
-	public class with_wrongly_ordered_pem_bundle : with_certificate_chain_of_length_3 {
-		private string _certPath, _keyPath;
-
-		[SetUp]
-		public void Setup() {
-			_certPath = $"{PathName}/bundle.pem";
-			_keyPath = $"{PathName}/leaf.key";
-			var leaf = _leaf.Export(X509ContentType.Cert).PEM("CERTIFICATE");
-			var intermediate = _intermediate.Export(X509ContentType.Cert).PEM("CERTIFICATE");
-
-			File.WriteAllText(_certPath, intermediate + leaf);
-			File.WriteAllText(_keyPath, _leaf.PemPrivateKey());
-		}
-
-		[Test]
-		public void cannot_load_certificate() {
-			Assert.Throws<ArgumentException>(
-			() => CertificateUtils.LoadFromFile(_certPath, _keyPath, string.Empty)
-			);
-		}
-	}
-
-	public class with_password_protected_pkcs12_bundle : with_certificate_chain_of_length_3 {
-		private string _certPath;
-		private const string Password = "test$1234";
-
-		[SetUp]
-		public void Setup() {
-			_certPath = $"{PathName}/bundle.p12";
-
-			using var rsa = RSA.Create();
-			rsa.ImportRSAPrivateKey(_leaf.GetRSAPrivateKey()!.ExportRSAPrivateKey(), out _);
-			var builder = new Pkcs12Builder();
-			var safeContents = new Pkcs12SafeContents();
-			var pbeParams = new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 2048);
-			safeContents.AddCertificate(_leaf);
-			safeContents.AddCertificate(_intermediate);
-			safeContents.AddShroudedKey(rsa, Password, pbeParams);
-			builder.AddSafeContentsEncrypted(safeContents, Password, pbeParams);
-			builder.SealWithMac(Password, HashAlgorithmName.SHA256, 2048);
-
-			File.WriteAllBytes(_certPath, builder.Encode());
-		}
-
-		[Test]
-		public void can_load_certificate() {
-			var (certificate, intermediates) = CertificateUtils.LoadFromFile(_certPath, null, Password);
-			Assert.AreEqual(_leaf, certificate);
-			Assert.AreEqual(1, intermediates.Count);
-			Assert.AreEqual(_intermediate, intermediates[0]);
-			Assert.True(certificate.HasPrivateKey);
-			Assert.False(intermediates[0].HasPrivateKey);
-		}
-	}
-
-	public class with_passwordless_pkcs12_bundle : with_certificate_chain_of_length_3 {
-		private string _certPath;
-		private const string Password = null;
-
-		[SetUp]
-		public void Setup() {
-			_certPath = $"{PathName}/bundle.p12";
-
-			using var rsa = RSA.Create();
-			rsa.ImportRSAPrivateKey(_leaf.GetRSAPrivateKey()!.ExportRSAPrivateKey(), out _);
-			var builder = new Pkcs12Builder();
-			var safeContents = new Pkcs12SafeContents();
-			var pbeParams = new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 2048);
-			safeContents.AddCertificate(_leaf);
-			safeContents.AddCertificate(_intermediate);
-			safeContents.AddShroudedKey(rsa, Password, pbeParams);
-			builder.AddSafeContentsEncrypted(safeContents, Password, pbeParams);
-			builder.SealWithMac(Password, HashAlgorithmName.SHA256, 2048);
-
-			File.WriteAllBytes(_certPath, builder.Encode());
-		}
-
-		[Test]
-		public void can_load_certificate() {
-			var (certificate, intermediates) = CertificateUtils.LoadFromFile(_certPath, null, Password);
-			Assert.AreEqual(_leaf, certificate);
-			Assert.AreEqual(1, intermediates.Count);
-			Assert.AreEqual(_intermediate, intermediates[0]);
-			Assert.True(certificate.HasPrivateKey);
-			Assert.False(intermediates[0].HasPrivateKey);
-		}
-	}
-
-	public class with_wrongly_ordered_pkcs12_bundle : with_certificate_chain_of_length_3 {
-		private string _certPath;
-		private const string Password = null;
-
-		[SetUp]
-		public void Setup() {
-			_certPath = $"{PathName}/bundle.p12";
-
-			using var rsa = RSA.Create();
-			rsa.ImportRSAPrivateKey(_leaf.GetRSAPrivateKey()!.ExportRSAPrivateKey(), out _);
-			var builder = new Pkcs12Builder();
-			var safeContents = new Pkcs12SafeContents();
-			var pbeParams = new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 2048);
-			safeContents.AddCertificate(_intermediate);
-			safeContents.AddCertificate(_leaf);
-			safeContents.AddShroudedKey(rsa, Password, pbeParams);
-			builder.AddSafeContentsEncrypted(safeContents, Password, pbeParams);
-			builder.SealWithMac(Password, HashAlgorithmName.SHA256, 2048);
-
-			File.WriteAllBytes(_certPath, builder.Encode());
-		}
-
-		[Test]
-		public void cannot_load_certificate() {
-			Assert.Throws<ArgumentException>(
-				() => CertificateUtils.LoadFromFile(_certPath, null, Password)
-			);
-		}
-	}
-
-	public class with_pkcs12_bundle_having_no_keys : with_certificate_chain_of_length_3 {
-		private string _certPath;
-		private const string Password = null;
-
-		[SetUp]
-		public void Setup() {
-			_certPath = $"{PathName}/bundle.p12";
-
-			using var rsa = RSA.Create();
-			rsa.ImportRSAPrivateKey(_leaf.GetRSAPrivateKey()!.ExportRSAPrivateKey(), out _);
-			var builder = new Pkcs12Builder();
-			var safeContents = new Pkcs12SafeContents();
-			var pbeParams = new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 2048);
-			safeContents.AddCertificate(_leaf);
-			safeContents.AddCertificate(_intermediate);
-			builder.AddSafeContentsEncrypted(safeContents, Password, pbeParams);
-			builder.SealWithMac(Password, HashAlgorithmName.SHA256, 2048);
-
-			File.WriteAllBytes(_certPath, builder.Encode());
-		}
-
-		[Test]
-		public void cannot_load_certificate() {
-			var ex = Assert.Throws<Exception>(
-				() => CertificateUtils.LoadFromFile(_certPath, null, Password)
-			);
-			Assert.AreEqual(ex!.Message, "No private keys found");
-		}
-	}
-
-	public class with_pkcs12_bundle_having_no_certificates : with_certificate_chain_of_length_3 {
-		private string _certPath;
-		private const string Password = null;
-
-		[SetUp]
-		public void Setup() {
-			_certPath = $"{PathName}/bundle.p12";
-
-			using var rsa = RSA.Create();
-			rsa.ImportRSAPrivateKey(_leaf.GetRSAPrivateKey()!.ExportRSAPrivateKey(), out _);
-			var builder = new Pkcs12Builder();
-			var safeContents = new Pkcs12SafeContents();
-			var pbeParams = new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 2048);
-			safeContents.AddShroudedKey(rsa, Password, pbeParams);
-			builder.AddSafeContentsEncrypted(safeContents, Password, pbeParams);
-			builder.SealWithMac(Password, HashAlgorithmName.SHA256, 2048);
-
-			File.WriteAllBytes(_certPath, builder.Encode());
-		}
-
-		[Test]
-		public void cannot_load_certificate() {
-			var ex = Assert.Throws<Exception>(
-				() => CertificateUtils.LoadFromFile(_certPath, null, Password)
-			);
-			Assert.AreEqual(ex!.Message, "No certificates found");
-		}
-	}
-
-	public class with_pkcs12_bundle_having_multiple_keys : with_certificate_chain_of_length_3 {
-		private string _certPath;
-		private const string Password = null;
-
-		[SetUp]
-		public void Setup() {
-			_certPath = $"{PathName}/bundle.p12";
-
-			using var rsa = RSA.Create();
-			rsa.ImportRSAPrivateKey(_leaf.GetRSAPrivateKey()!.ExportRSAPrivateKey(), out _);
-
-			using var rsa2 = RSA.Create();
-			var builder = new Pkcs12Builder();
-			var safeContents = new Pkcs12SafeContents();
-			var pbeParams = new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 2048);
-			safeContents.AddCertificate(_intermediate);
-			safeContents.AddCertificate(_leaf);
-			safeContents.AddShroudedKey(rsa, Password, pbeParams);
-			safeContents.AddShroudedKey(rsa2, Password, pbeParams);
-			builder.AddSafeContentsEncrypted(safeContents, Password, pbeParams);
-			builder.SealWithMac(Password, HashAlgorithmName.SHA256, 2048);
-
-			File.WriteAllBytes(_certPath, builder.Encode());
-		}
-
-		[Test]
-		public void cannot_load_certificate() {
-			var ex = Assert.Throws<Exception>(
-				() => CertificateUtils.LoadFromFile(_certPath, null, Password)
-			);
-			Assert.AreEqual(ex!.Message, "Multiple private keys found");
-		}
-	}
-
-	public class with_pkcs12_bundle_having_wrong_key : with_certificate_chain_of_length_3 {
-		private string _certPath;
-		private const string Password = null;
-
-		[SetUp]
-		public void Setup() {
-			_certPath = $"{PathName}/bundle.p12";
-
-			using var rsa = RSA.Create();
-			var builder = new Pkcs12Builder();
-			var safeContents = new Pkcs12SafeContents();
-			var pbeParams = new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 2048);
-			safeContents.AddCertificate(_intermediate);
-			safeContents.AddCertificate(_leaf);
-			safeContents.AddShroudedKey(rsa, Password, pbeParams);
-			builder.AddSafeContentsEncrypted(safeContents, Password, pbeParams);
-			builder.SealWithMac(Password, HashAlgorithmName.SHA256, 2048);
-
-			File.WriteAllBytes(_certPath, builder.Encode());
-		}
-
-		[Test]
-		public void cannot_load_certificate() {
-			Assert.Throws<ArgumentException>(
-				() => CertificateUtils.LoadFromFile(_certPath, null, Password)
-			);
-		}
-	}
-
-	public class when_loading_certificates_from_directory : with_certificate_chain_of_length_1 {
-		private const string CertsDir = "certs";
-
-		[SetUp]
-		public void Setup() {
-			Directory.CreateDirectory($"{PathName}/{CertsDir}");
-			var p = $"{PathName}/{CertsDir}/leaf";
-			File.WriteAllBytes($"{p}.der", _leaf.Export(X509ContentType.Cert));
-			File.WriteAllText($"{p}.crt", _leaf.Export(X509ContentType.Cert).PEM("CERTIFICATE"));
-			File.WriteAllText($"{p}.cer", _leaf.Export(X509ContentType.Cert).PEM("CERTIFICATE"));
-			File.WriteAllText($"{p}.cert", _leaf.Export(X509ContentType.Cert).PEM("CERTIFICATE"));
-			File.WriteAllText($"{p}.pem", _leaf.Export(X509ContentType.Cert).PEM("CERTIFICATE"));
-			File.WriteAllBytes($"{p}.p12", _leaf.ExportToPkcs12());
-			File.WriteAllBytes($"{p}.pfx", _leaf.ExportToPkcs12());
-			File.WriteAllText($"{p}.key", _leaf.PemPrivateKey());
-		}
-
-
-		[Test]
-		public void loads_only_certificates_with_accepted_extensions() {
-			var certs = CertificateUtils.LoadAllCertificates($"{PathName}/{CertsDir}").ToArray();
-			Assert.AreEqual(8 - 3, certs.Length);
-			var accepted = new[]{".crt", ".cert", ".cer", ".pem", ".der"};
-			Assert.True(certs.All(x => accepted.Contains(new FileInfo(x.fileName).Extension)));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Certificates/with_certificates.cs b/src/EventStore.Core.Tests/Certificates/with_certificates.cs
deleted file mode 100644
index 920820cdc90..00000000000
--- a/src/EventStore.Core.Tests/Certificates/with_certificates.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-
-namespace EventStore.Core.Tests.Certificates {
-	public class with_certificates : SpecificationWithDirectoryPerTestFixture {
-		private static readonly Random Random = new();
-		protected static X509Certificate2 CreateCertificate(bool issuer, X509Certificate2 parent = null, bool expired = false) {
-			using var rsa = RSA.Create();
-			var certReq = new CertificateRequest(GenerateSubject(), rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
-			var now = DateTimeOffset.UtcNow;
-			now = new DateTime(now.Year, now.Month, now.Day); // round to nearest day
-			var startDate = now.AddMonths(-1);
-			var endDate = !expired ? now.AddMonths(1) : now.AddDays(-1);
-
-			if (issuer) {
-				certReq.CertificateExtensions.Add(new X509BasicConstraintsExtension(true, false, 0, true));
-			}
-			if (parent == null) {
-				return certReq.CreateSelfSigned(startDate, endDate);
-			}
-
-			var parentKey = parent!.GetRSAPrivateKey()!;
-			var signatureGenerator = X509SignatureGenerator.CreateForRSA(parentKey!, RSASignaturePadding.Pkcs1);
-			return certReq.Create(parent.SubjectName, signatureGenerator, startDate, endDate, GenerateSerialNumber()).CopyWithPrivateKey(rsa);
-		}
-
-		private static string GetCharset() {
-			var charset = "";
-			for (var c = 'a'; c <= 'z'; c++) {
-				charset += c;
-			}
-			for (var c = 'A'; c <= 'Z'; c++) {
-				charset += c;
-			}
-			for (var c = '0'; c <= '9'; c++) {
-				charset += c;
-			}
-			return charset;
-		}
-
-		private static byte[] GenerateSerialNumber() {
-			var charset = GetCharset();
-			string s = "";
-			for (var j = 0; j < 10; j++) {
-				s += charset[Random.Next() % charset.Length];
-			}
-
-			var utf8Encoding = new UTF8Encoding(false);
-			return utf8Encoding.GetBytes(s);
-		}
-
-		protected static string GenerateSubject() {
-			var charset = GetCharset();
-			string s = "";
-			for (var j = 0; j < 10; j++) {
-				s += charset[Random.Next() % charset.Length];
-			}
-
-			return $"CN={s}";
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/DataStructures/concurrent_queue_wrapper_should.cs b/src/EventStore.Core.Tests/ClientAPI/DataStructures/concurrent_queue_wrapper_should.cs
deleted file mode 100644
index 65bdf8901fa..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/DataStructures/concurrent_queue_wrapper_should.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.ClientAPI.Common.Utils.Threading;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.DataStructures {
-	[TestFixture]
-	public class concurrent_queue_wrapper_should {
-		[Test]
-		public void return_correct_counts_and_values_1() {
-			var queue = new ConcurrentQueueWrapper<int>();
-			Assert.AreEqual(0, queue.Count);
-			queue.Enqueue(1234);
-			Assert.AreEqual(1, queue.Count);
-			queue.Enqueue(12345);
-			Assert.AreEqual(2, queue.Count);
-
-			int val;
-			Assert.AreEqual(true, queue.TryDequeue(out val));
-			Assert.AreEqual(1234, val);
-			Assert.AreEqual(1, queue.Count);
-
-			Assert.AreEqual(true, queue.TryDequeue(out val));
-			Assert.AreEqual(12345, val);
-			Assert.AreEqual(0, queue.Count);
-
-			Assert.AreEqual(false, queue.TryDequeue(out val));
-			Assert.AreEqual(false, queue.TryDequeue(out val));
-		}
-
-		[Test]
-		public void return_correct_counts_and_values_2() {
-			var queue = new ConcurrentQueueWrapper<int>();
-			for (int i = 1; i <= 1000; i++) {
-				queue.Enqueue(i);
-				Assert.AreEqual(i, queue.Count);
-			}
-
-			int x;
-			for (int i = 1; i <= 1000; i++) {
-				Assert.AreEqual(true, queue.TryDequeue(out x));
-				Assert.AreEqual(i, x);
-				Assert.AreEqual(1000-i, queue.Count);
-			}
-		}
-	}
-
-	[TestFixture]
-	public class concurrent_queue_wrapper_with_parallel_dequeues_should {
-		private ConcurrentQueueWrapper<int> _concurrentQueue;
-		private const int TOTAL_ENQUEUED_ITEMS = 1000000;
-		private const int NUM_THREADS = 4;
-		private volatile bool _seenNegativeCount;
-		private volatile int _totalDequeued;
-
-		public concurrent_queue_wrapper_with_parallel_dequeues_should() {
-			_concurrentQueue = new ConcurrentQueueWrapper<int>();
-			_seenNegativeCount = false;
-			_totalDequeued = 0;
-		}
-
-		private void DequeueThread() {
-			int x;
-			while (_totalDequeued < TOTAL_ENQUEUED_ITEMS) {
-				var dequeued = _concurrentQueue.TryDequeue(out x);
-				if (_concurrentQueue.Count < 0) _seenNegativeCount = true;
-				if (dequeued) Interlocked.Increment(ref _totalDequeued);
-			}
-		}
-
-		[Test]
-		public void always_return_non_negative_count() {
-			var threads = new Thread[NUM_THREADS];
-			for (int i = 0; i < NUM_THREADS; i++) {
-				threads[i] = new Thread(DequeueThread);
-				threads[i].Start();
-			}
-
-			int x;
-			for (int i = 0; i < TOTAL_ENQUEUED_ITEMS; i++) {
-				_concurrentQueue.Enqueue(1);
-				var dequeued = _concurrentQueue.TryDequeue(out x);
-				if (dequeued) Interlocked.Increment(ref _totalDequeued);
-			}
-
-			for(int i=0;i<NUM_THREADS;i++)
-				threads[i].Join(TimeSpan.FromSeconds(5));
-
-			Assert.AreEqual(false, _seenNegativeCount);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/MiniNodeWithExistingRecords.cs b/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/MiniNodeWithExistingRecords.cs
deleted file mode 100644
index f51c7cb6591..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/MiniNodeWithExistingRecords.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-using System;
-using EventStore.ClientAPI;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.Tests.TransactionLog;
-using NUnit.Framework;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Index;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.Util;
-using System.IO;
-using System.Threading.Tasks;
-using EventStore.Core.LogAbstraction;
-
-namespace EventStore.Core.Tests.ClientAPI.ExpectedVersion64Bit {
-	public abstract class MiniNodeWithExistingRecords<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private readonly TcpType _tcpType = TcpType.Ssl;
-		protected MiniNode<TLogFormat, TStreamId> Node;
-
-		protected readonly int MaxEntriesInMemTable = 20;
-		protected readonly long MetastreamMaxCount = 1;
-		protected readonly bool PerformAdditionalCommitChecks = true;
-		protected readonly byte IndexBitnessVersion = Opts.IndexBitnessVersionDefault;
-		protected LogFormatAbstractor<TStreamId> _logFormatFactory;
-		protected TableIndex<TStreamId> TableIndex;
-		protected IReadIndex<TStreamId> ReadIndex;
-
-		protected TFChunkDb Db;
-		protected TFChunkWriter Writer;
-		protected ICheckpoint WriterCheckpoint;
-		protected ICheckpoint ChaserCheckpoint;
-		protected IODispatcher IODispatcher;
-		protected SynchronousScheduler Bus;
-
-		protected IEventStoreConnection _store;
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.To(node, _tcpType);
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			string dbPath = Path.Combine(PathName, string.Format("mini-node-db-{0}", Guid.NewGuid()));
-
-			_logFormatFactory = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
-				IndexDirectory = GetFilePathFor("index"),
-			});
-
-			Bus = new();
-			IODispatcher = new IODispatcher(Bus, Bus);
-
-			if (!Directory.Exists(dbPath))
-				Directory.CreateDirectory(dbPath);
-
-			var writerCheckFilename = Path.Combine(dbPath, Checkpoint.Writer + ".chk");
-			var chaserCheckFilename = Path.Combine(dbPath, Checkpoint.Chaser + ".chk");
-
-			WriterCheckpoint = new MemoryMappedFileCheckpoint(writerCheckFilename, Checkpoint.Writer);
-			ChaserCheckpoint = new MemoryMappedFileCheckpoint(chaserCheckFilename, Checkpoint.Chaser);
-
-			Db = new TFChunkDb(TFChunkHelper.CreateDbConfig(dbPath, WriterCheckpoint, ChaserCheckpoint, TFConsts.ChunkSize));
-			Db.Open();
-
-			// create DB
-			Writer = new TFChunkWriter(Db);
-			Writer.Open();
-
-			var pm = _logFormatFactory.CreatePartitionManager(
-				reader: new TFChunkReader(Db, WriterCheckpoint),
-				writer: Writer);
-			pm.Initialize();
-
-			WriteTestScenario();
-
-			Writer.Close();
-			Writer = null;
-			WriterCheckpoint.Flush();
-			ChaserCheckpoint.Write(WriterCheckpoint.Read());
-			ChaserCheckpoint.Flush();
-			Db.Close();
-
-			// start node with our created DB
-			Node = new MiniNode<TLogFormat, TStreamId>(PathName, inMemDb: false, dbPath: dbPath);
-			await Node.Start();
-
-			try {
-				await Given().WithTimeout();
-			} catch (Exception ex) {
-				throw new Exception("Given Failed", ex);
-			}
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			_store?.Dispose();
-			_logFormatFactory?.Dispose();
-
-			await Node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-		public abstract void WriteTestScenario();
-		public abstract Task Given();
-
-		protected EventRecord WriteSingleEvent(string eventStreamName,
-			long eventNumber,
-			string data,
-			DateTime? timestamp = null,
-			Guid eventId = default(Guid),
-			string eventType = "some-type") {
-
-			long pos = Writer.Position;
-			_logFormatFactory.StreamNameIndex.GetOrReserve(
-				_logFormatFactory.RecordFactory,
-				eventStreamName,
-				pos,
-				out var eventStreamId,
-				out var streamRecord);
-
-			if (streamRecord != null) {
-				Writer.Write(streamRecord, out pos);
-			}
-
-			_logFormatFactory.EventTypeIndex.GetOrReserveEventType(
-				_logFormatFactory.RecordFactory,
-				eventType,
-				pos,
-				out var eventTypeId,
-				out var eventTypeRecord);
-
-			if (eventTypeRecord != null) {
-				Writer.Write(eventTypeRecord, out pos);
-			}
-
-			var prepare = LogRecord.SingleWrite(
-				_logFormatFactory.RecordFactory,
-				pos,
-				eventId == default(Guid) ? Guid.NewGuid() : eventId,
-				Guid.NewGuid(),
-				eventStreamId,
-				eventNumber - 1,
-				eventTypeId,
-				Helper.UTF8NoBom.GetBytes(data),
-				null,
-				timestamp);
-			Assert.IsTrue(Writer.Write(prepare, out pos));
-			var commit = LogRecord.Commit(pos, prepare.CorrelationId, prepare.LogPosition,
-				eventNumber);
-			Assert.IsTrue(Writer.Write(commit, out pos));
-			Assert.AreEqual(eventStreamId, prepare.EventStreamId);
-
-			var eventRecord = new EventRecord(eventNumber, prepare, eventStreamName, eventType);
-			return eventRecord;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/append_to_stream_with_event_numbers_greater_than_2_billion.cs b/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/append_to_stream_with_event_numbers_greater_than_2_billion.cs
deleted file mode 100644
index 1fa8010e029..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/append_to_stream_with_event_numbers_greater_than_2_billion.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Exceptions;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.ExpectedVersion64Bit {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	[Category("ClientAPI"), Category("LongRunning")]
-	public class append_to_stream_with_event_numbers_greater_than_2_billion<TLogFormat, TStreamId>
-		: MiniNodeWithExistingRecords<TLogFormat, TStreamId> {
-		private const string StreamName = "append_to_stream_with_event_numbers_greater_than_2_billion";
-		private const long intMaxValue = (long)int.MaxValue;
-
-		public override void WriteTestScenario() {
-			WriteSingleEvent(StreamName, intMaxValue + 1, new string('.', 3000));
-			WriteSingleEvent(StreamName, intMaxValue + 2, new string('.', 3000));
-			WriteSingleEvent(StreamName, intMaxValue + 3, new string('.', 3000));
-			WriteSingleEvent(StreamName, intMaxValue + 4, new string('.', 3000));
-			WriteSingleEvent(StreamName, intMaxValue + 5, new string('.', 3000));
-		}
-
-		public override async Task Given() {
-			_store = BuildConnection(Node);
-			await _store.ConnectAsync();
-			await _store.SetStreamMetadataAsync(StreamName, EventStore.ClientAPI.ExpectedVersion.Any,
-				EventStore.ClientAPI.StreamMetadata.Create(truncateBefore: intMaxValue + 1));
-		}
-
-		[Test]
-		public async Task should_be_able_to_append_to_stream() {
-			var evnt = new EventData(Guid.NewGuid(), "EventType", false, new byte[10], new byte[15]);
-			var writeResult = await _store.AppendToStreamAsync(StreamName, intMaxValue + 5, evnt);
-			Assert.AreEqual(intMaxValue + 6, writeResult.NextExpectedVersion);
-
-			var readResult = await _store
-				.ReadStreamEventsForwardAsync(StreamName, intMaxValue + 6, 1, false, DefaultData.AdminCredentials);
-			Assert.AreEqual(SliceReadStatus.Success, readResult.Status);
-			Assert.AreEqual(evnt.EventId, readResult.Events[0].Event.EventId);
-		}
-
-		[Test]
-		public async Task should_throw_wrong_expected_version_when_version_incorrect() {
-			var evnt = new EventData(Guid.NewGuid(), "EventType", false, new byte[10], new byte[15]);
-			await AssertEx.ThrowsAsync<WrongExpectedVersionException>(
-				() => _store.AppendToStreamAsync(StreamName, intMaxValue + 15, evnt));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/catchup_subscription_to_all_with_event_numbers_greater_than_2_billion.cs b/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/catchup_subscription_to_all_with_event_numbers_greater_than_2_billion.cs
deleted file mode 100644
index 2108459464e..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/catchup_subscription_to_all_with_event_numbers_greater_than_2_billion.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System.Collections.Generic;
-using System;
-using EventStore.ClientAPI;
-using NUnit.Framework;
-using EventStore.Core.Data;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.Tests.ClientAPI.ExpectedVersion64Bit {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	[Category("ClientAPI"), Category("LongRunning")]
-	public class catchup_subscription_to_all_with_event_numbers_greater_than_2_billion<TLogFormat, TStreamId>
-		: MiniNodeWithExistingRecords<TLogFormat, TStreamId> {
-		private const long intMaxValue = (long)int.MaxValue;
-
-		private string _streamId = "subscriptions-catchup-all";
-
-		private EventRecord _r1, _r2;
-
-		public override void WriteTestScenario() {
-			_r1 = WriteSingleEvent(_streamId, intMaxValue + 1, new string('.', 3000));
-			_r2 = WriteSingleEvent(_streamId, intMaxValue + 2, new string('.', 3000));
-		}
-
-		public override async Task Given() {
-			_store = BuildConnection(Node);
-			await _store.ConnectAsync();
-			await _store.SetStreamMetadataAsync(_streamId, EventStore.ClientAPI.ExpectedVersion.Any,
-				EventStore.ClientAPI.StreamMetadata.Create(truncateBefore: intMaxValue + 1));
-		}
-
-		[Test]
-		public async Task should_be_able_to_subscribe_to_all_with_catchup_subscription() {
-			var evnt = new EventData(Guid.NewGuid(), "EventType", false, new byte[10], new byte[15]);
-			List<EventStore.ClientAPI.ResolvedEvent> receivedEvents = new List<EventStore.ClientAPI.ResolvedEvent>();
-
-			var countdown = new CountdownEvent(3);
-
-			_store.SubscribeToAllFrom(Position.Start, CatchUpSubscriptionSettings.Default, (s, e) => {
-				if (e.Event.EventStreamId == _streamId) {
-					receivedEvents.Add(e);
-					countdown.Signal();
-				}
-
-				return Task.CompletedTask;
-			}, userCredentials: DefaultData.AdminCredentials);
-
-			await _store.AppendToStreamAsync(_streamId, intMaxValue + 2, evnt);
-
-			Assert.That(countdown.Wait(TimeSpan.FromSeconds(10)), "Timed out waiting for events to appear");
-
-			Assert.AreEqual(_r1.EventId, receivedEvents[0].Event.EventId);
-			Assert.AreEqual(_r2.EventId, receivedEvents[1].Event.EventId);
-			Assert.AreEqual(evnt.EventId, receivedEvents[2].Event.EventId);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/persistent_subscription_with_event_numbers_greater_than_2_billion.cs b/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/persistent_subscription_with_event_numbers_greater_than_2_billion.cs
deleted file mode 100644
index e2cbf9e2761..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/persistent_subscription_with_event_numbers_greater_than_2_billion.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System.Collections.Generic;
-using System;
-using EventStore.ClientAPI;
-using NUnit.Framework;
-using EventStore.Core.Data;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.Tests.ClientAPI.ExpectedVersion64Bit {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	[Category("ClientAPI"), Category("LongRunning")]
-	public class persistent_subscription_with_event_numbers_greater_than_2_billion<TLogFormat, TStreamId>
-		: MiniNodeWithExistingRecords<TLogFormat, TStreamId> {
-		private const long intMaxValue = (long)int.MaxValue;
-
-		private string _streamId = "persistent-subscription-stream";
-
-		private EventRecord _r1, _r2;
-
-		public override void WriteTestScenario() {
-			_r1 = WriteSingleEvent(_streamId, intMaxValue + 1, new string('.', 3000));
-			_r2 = WriteSingleEvent(_streamId, intMaxValue + 2, new string('.', 3000));
-		}
-
-		public override async Task Given() {
-			_store = BuildConnection(Node);
-			await _store.ConnectAsync();
-			await _store.SetStreamMetadataAsync(_streamId, EventStore.ClientAPI.ExpectedVersion.Any,
-				EventStore.ClientAPI.StreamMetadata.Create(truncateBefore: intMaxValue + 1));
-		}
-
-		[Test]
-		public async Task should_be_able_to_create_the_persistent_subscription() {
-			var groupId = "group-" + Guid.NewGuid().ToString();
-			var settings = PersistentSubscriptionSettings.Create().StartFrom(intMaxValue);
-			await _store.CreatePersistentSubscriptionAsync(_streamId, groupId, settings, DefaultData.AdminCredentials);
-		}
-
-		[Test]
-		public async Task should_be_able_to_update_the_persistent_subscription() {
-			var groupId = "group-" + Guid.NewGuid().ToString();
-			var settings = PersistentSubscriptionSettings.Create();
-			await _store.CreatePersistentSubscriptionAsync(_streamId, groupId, settings, DefaultData.AdminCredentials);
-
-			settings = PersistentSubscriptionSettings.Create().StartFrom(intMaxValue);
-			await _store.UpdatePersistentSubscriptionAsync(_streamId, groupId, settings, DefaultData.AdminCredentials);
-		}
-
-		[Test]
-		public async Task should_be_able_to_connect_to_persistent_subscription() {
-			var groupId = "group-" + Guid.NewGuid().ToString();
-			var settings = PersistentSubscriptionSettings.Create().StartFrom(intMaxValue);
-			await _store.CreatePersistentSubscriptionAsync(_streamId, groupId, settings, DefaultData.AdminCredentials);
-
-			var evnt = new EventData(Guid.NewGuid(), "EventType", false, new byte[10], new byte[15]);
-			List<EventStore.ClientAPI.ResolvedEvent> receivedEvents = new List<EventStore.ClientAPI.ResolvedEvent>();
-			var countdown = new CountdownEvent(3);
-			await _store.ConnectToPersistentSubscriptionAsync(_streamId, groupId, (s, e) => {
-				receivedEvents.Add(e);
-				countdown.Signal();
-				return Task.CompletedTask;
-			}, userCredentials: DefaultData.AdminCredentials);
-
-			await _store.AppendToStreamAsync(_streamId, intMaxValue + 2, evnt);
-
-			Assert.That(countdown.Wait(TimeSpan.FromSeconds(5)), "Timed out waiting for events to appear");
-
-			Assert.AreEqual(_r1.EventId, receivedEvents[0].Event.EventId);
-			Assert.AreEqual(_r2.EventId, receivedEvents[1].Event.EventId);
-			Assert.AreEqual(evnt.EventId, receivedEvents[2].Event.EventId);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/read_stream_with_event_numbers_greater_than_2_billion.cs b/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/read_stream_with_event_numbers_greater_than_2_billion.cs
deleted file mode 100644
index 6fc32c93b01..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/read_stream_with_event_numbers_greater_than_2_billion.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System.Collections.Generic;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using NUnit.Framework;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.Tests.ClientAPI.ExpectedVersion64Bit {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	[Category("ClientAPI"), Category("LongRunning")]
-	public class read_stream_with_event_numbers_greater_than_2_billion<TLogFormat, TStreamId>
-		: MiniNodeWithExistingRecords<TLogFormat, TStreamId> {
-		private const string StreamName = "read_stream_with_event_numbers_greater_than_2_billion";
-		private const long intMaxValue = (long)int.MaxValue;
-
-		private EventRecord _r1, _r2, _r3, _r4, _r5;
-
-		public override void WriteTestScenario() {
-			_r1 = WriteSingleEvent(StreamName, intMaxValue + 1, new string('.', 3000));
-			_r2 = WriteSingleEvent(StreamName, intMaxValue + 2, new string('.', 3000));
-			_r3 = WriteSingleEvent(StreamName, intMaxValue + 3, new string('.', 3000));
-			_r4 = WriteSingleEvent(StreamName, intMaxValue + 4, new string('.', 3000));
-			_r5 = WriteSingleEvent(StreamName, intMaxValue + 5, new string('.', 3000));
-		}
-
-		public override async Task Given() {
-			_store = BuildConnection(Node);
-			await _store.ConnectAsync();
-			await _store.SetStreamMetadataAsync(StreamName, EventStore.ClientAPI.ExpectedVersion.Any,
-				EventStore.ClientAPI.StreamMetadata.Create(truncateBefore: intMaxValue + 1));
-		}
-
-		[Test]
-		public async Task read_forward_from_zero() {
-			var result = await _store.ReadStreamEventsForwardAsync(StreamName, 0, 100, false);
-			Assert.AreEqual(0, result.Events.Length);
-			Assert.AreEqual(intMaxValue + 1, result.NextEventNumber);
-		}
-
-		[Test]
-		public async Task should_be_able_to_read_stream_forward() {
-			var result = await _store.ReadStreamEventsForwardAsync(StreamName, intMaxValue, 100, false);
-			Assert.AreEqual(5, result.Events.Count());
-			Assert.AreEqual(_r1.EventId, result.Events[0].Event.EventId);
-			Assert.AreEqual(_r2.EventId, result.Events[1].Event.EventId);
-			Assert.AreEqual(_r3.EventId, result.Events[2].Event.EventId);
-			Assert.AreEqual(_r4.EventId, result.Events[3].Event.EventId);
-			Assert.AreEqual(_r5.EventId, result.Events[4].Event.EventId);
-		}
-
-		[Test]
-		public async Task should_be_able_to_read_stream_backward() {
-			var result = await _store.ReadStreamEventsBackwardAsync(StreamName, intMaxValue + 6, 100, false);
-			Assert.AreEqual(5, result.Events.Count());
-			Assert.AreEqual(_r5.EventId, result.Events[0].Event.EventId);
-			Assert.AreEqual(_r4.EventId, result.Events[1].Event.EventId);
-			Assert.AreEqual(_r3.EventId, result.Events[2].Event.EventId);
-			Assert.AreEqual(_r2.EventId, result.Events[3].Event.EventId);
-			Assert.AreEqual(_r1.EventId, result.Events[4].Event.EventId);
-		}
-
-		[Test]
-		public async Task should_be_able_to_read_each_event() {
-			var record = await _store.ReadEventAsync(StreamName, intMaxValue + 1, false);
-			Assert.AreEqual(EventReadStatus.Success, record.Status);
-			Assert.AreEqual(_r1.EventId, record.Event.Value.Event.EventId);
-
-			record = await _store.ReadEventAsync(StreamName, intMaxValue + 2, false);
-			Assert.AreEqual(EventReadStatus.Success, record.Status);
-			Assert.AreEqual(_r2.EventId, record.Event.Value.Event.EventId);
-
-			record = await _store.ReadEventAsync(StreamName, intMaxValue + 3, false);
-			Assert.AreEqual(EventReadStatus.Success, record.Status);
-			Assert.AreEqual(_r3.EventId, record.Event.Value.Event.EventId);
-
-			record = await _store.ReadEventAsync(StreamName, intMaxValue + 4, false);
-			Assert.AreEqual(EventReadStatus.Success, record.Status);
-			Assert.AreEqual(_r4.EventId, record.Event.Value.Event.EventId);
-
-			record = await _store.ReadEventAsync(StreamName, intMaxValue + 5, false);
-			Assert.AreEqual(EventReadStatus.Success, record.Status);
-			Assert.AreEqual(_r5.EventId, record.Event.Value.Event.EventId);
-		}
-
-		[Test]
-		public async Task should_be_able_to_read_all_forward() {
-			var result = await _store.ReadAllEventsForwardAsync(Position.Start, 100, false, DefaultData.AdminCredentials)
-;
-			Assert.IsTrue(result.Events.Count() > 5);
-
-			var records = result.Events.Where(x => x.OriginalStreamId == StreamName).ToList();
-			Assert.AreEqual(_r1.EventId, records[0].Event.EventId);
-			Assert.AreEqual(_r2.EventId, records[1].Event.EventId);
-			Assert.AreEqual(_r3.EventId, records[2].Event.EventId);
-			Assert.AreEqual(_r4.EventId, records[3].Event.EventId);
-			Assert.AreEqual(_r5.EventId, records[4].Event.EventId);
-		}
-
-		[Test]
-		public async Task should_be_able_to_read_all_backward() {
-			var result = await _store.ReadAllEventsBackwardAsync(Position.End, 100, false, DefaultData.AdminCredentials)
-;
-			Assert.IsTrue(result.Events.Count() > 5);
-
-			var records = result.Events.Where(x => x.OriginalStreamId == StreamName).ToList();
-			Assert.AreEqual(_r5.EventId, records[0].Event.EventId);
-			Assert.AreEqual(_r4.EventId, records[1].Event.EventId);
-			Assert.AreEqual(_r3.EventId, records[2].Event.EventId);
-			Assert.AreEqual(_r2.EventId, records[3].Event.EventId);
-			Assert.AreEqual(_r1.EventId, records[4].Event.EventId);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/read_stream_with_link_to_event_with_event_number_greater_than_int_maxvalue.cs b/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/read_stream_with_link_to_event_with_event_number_greater_than_int_maxvalue.cs
deleted file mode 100644
index 62f21925f4b..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/read_stream_with_link_to_event_with_event_number_greater_than_int_maxvalue.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using EventStore.ClientAPI;
-using EventStore.Core.Data;
-using EventStore.Core.Services;
-using NUnit.Framework;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.Tests.ClientAPI.ExpectedVersion64Bit {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	[Category("ClientAPI"), Category("LongRunning")]
-	public class
-		read_stream_with_link_to_event_with_event_number_greater_than_int_maxvalue<TLogFormat, TStreamId>
-		: MiniNodeWithExistingRecords<TLogFormat, TStreamId> {
-		private const string StreamName = "read_stream_with_link_to_event_with_event_number_greater_than_int_maxvalue";
-		private const long intMaxValue = (long)int.MaxValue;
-
-		private string _linkedStreamName = "linked-" + StreamName;
-		private EventRecord _event1, _event2;
-
-		public override void WriteTestScenario() {
-			_event1 = WriteSingleEvent(StreamName, intMaxValue + 1, new string('.', 3000));
-			_event2 = WriteSingleEvent(StreamName, intMaxValue + 2, new string('.', 3000));
-
-			WriteSingleEvent(_linkedStreamName, 0, string.Format("{0}@{1}", intMaxValue + 1, StreamName),
-				eventType: SystemEventTypes.LinkTo);
-			WriteSingleEvent(_linkedStreamName, 1, string.Format("{0}@{1}", intMaxValue + 2, StreamName),
-				eventType: SystemEventTypes.LinkTo);
-		}
-
-		public override async Task Given() {
-			_store = BuildConnection(Node);
-			await _store.ConnectAsync();
-		}
-
-		[Test]
-		public async Task should_be_able_to_read_link_stream_forward_and_resolve_link_tos() {
-			var readResult = await _store
-				.ReadStreamEventsForwardAsync(_linkedStreamName, 0, 100, true, DefaultData.AdminCredentials);
-			Assert.AreEqual(SliceReadStatus.Success, readResult.Status);
-			Assert.AreEqual(2, readResult.Events.Length);
-			Assert.AreEqual(_event1.EventId, readResult.Events[0].Event.EventId);
-			Assert.AreEqual(_event2.EventId, readResult.Events[1].Event.EventId);
-			Assert.AreEqual(intMaxValue + 1, readResult.Events[0].Event.EventNumber);
-			Assert.AreEqual(intMaxValue + 2, readResult.Events[1].Event.EventNumber);
-		}
-
-		[Test]
-		public async Task should_be_able_to_read_link_stream_backward_and_resolve_link_tos() {
-			var readResult = await _store
-				.ReadStreamEventsBackwardAsync(_linkedStreamName, 10, 100, true, DefaultData.AdminCredentials);
-			Assert.AreEqual(SliceReadStatus.Success, readResult.Status);
-			Assert.AreEqual(2, readResult.Events.Length);
-			Assert.AreEqual(_event2.EventId, readResult.Events[0].Event.EventId);
-			Assert.AreEqual(_event1.EventId, readResult.Events[1].Event.EventId);
-			Assert.AreEqual(intMaxValue + 2, readResult.Events[0].Event.EventNumber);
-			Assert.AreEqual(intMaxValue + 1, readResult.Events[1].Event.EventNumber);
-		}
-
-		[Test]
-		public async Task should_be_able_to_read_all_stream_forward_and_resolve_link_tos() {
-			var readResult = await _store.ReadAllEventsForwardAsync(Position.Start, 100, true, DefaultData.AdminCredentials)
-;
-			var linkedEvents = readResult.Events.Where(x => x.OriginalStreamId == _linkedStreamName).ToList();
-			Assert.AreEqual(2, linkedEvents.Count());
-			Assert.AreEqual(_event1.EventId, linkedEvents[0].Event.EventId);
-			Assert.AreEqual(_event2.EventId, linkedEvents[1].Event.EventId);
-			Assert.AreEqual(intMaxValue + 1, linkedEvents[0].Event.EventNumber);
-			Assert.AreEqual(intMaxValue + 2, linkedEvents[1].Event.EventNumber);
-		}
-
-		[Test]
-		public async Task should_be_able_to_read_all_stream_backward_and_resolve_link_tos() {
-			var readResult = await _store.ReadAllEventsBackwardAsync(Position.End, 100, true, DefaultData.AdminCredentials)
-;
-			var linkedEvents = readResult.Events.Where(x => x.OriginalStreamId == _linkedStreamName).ToList();
-			Assert.AreEqual(2, linkedEvents.Count());
-			Assert.AreEqual(_event2.EventId, linkedEvents[0].Event.EventId);
-			Assert.AreEqual(_event1.EventId, linkedEvents[1].Event.EventId);
-			Assert.AreEqual(intMaxValue + 2, linkedEvents[0].Event.EventNumber);
-			Assert.AreEqual(intMaxValue + 1, linkedEvents[1].Event.EventNumber);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/subscribe_to_stream_with_link_to_event_with_event_number_greater_than_int_maxvalue.cs b/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/subscribe_to_stream_with_link_to_event_with_event_number_greater_than_int_maxvalue.cs
deleted file mode 100644
index 77f731b6b24..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/subscribe_to_stream_with_link_to_event_with_event_number_greater_than_int_maxvalue.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Common.Utils;
-using EventStore.Core.Services;
-using NUnit.Framework;
-using System;
-using System.Threading;
-using ResolvedEvent = EventStore.ClientAPI.ResolvedEvent;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.Tests.ClientAPI.ExpectedVersion64Bit {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	[Category("ClientAPI"), Category("LongRunning")]
-	public class
-		subscribe_to_stream_with_link_to_event_with_event_number_greater_than_int_maxvalue<TLogFormat, TStreamId> :
-			MiniNodeWithExistingRecords<TLogFormat, TStreamId> {
-		private const string StreamName =
-			"subscribe_to_stream_with_link_to_event_with_event_number_greater_than_int_maxvalue";
-
-		private const long intMaxValue = (long)int.MaxValue;
-
-		private string _linkedStreamName = "linked-" + StreamName;
-		private Guid _event1Id;
-
-		private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
-		private ResolvedEvent _receivedEvent;
-
-		public override void WriteTestScenario() {
-			var event1 = WriteSingleEvent(StreamName, intMaxValue + 1, new string('.', 3000));
-			WriteSingleEvent(StreamName, intMaxValue + 2, new string('.', 3000));
-			_event1Id = event1.EventId;
-		}
-
-		public override async Task Given() {
-			_store = BuildConnection(Node);
-			await _store.ConnectAsync();
-
-			await _store.SubscribeToStreamAsync(_linkedStreamName, true, HandleEvent);
-			await _store.AppendToStreamAsync(_linkedStreamName, ExpectedVersion.NoStream,
-				new EventData(Guid.NewGuid(),
-					SystemEventTypes.LinkTo, false, Helper.UTF8NoBom.GetBytes(
-						string.Format("{0}@{1}", intMaxValue + 1, StreamName)
-					), null));
-		}
-
-		private Task HandleEvent(EventStoreSubscription sub, ResolvedEvent resolvedEvent) {
-			_receivedEvent = resolvedEvent;
-			_resetEvent.Set();
-			return Task.CompletedTask;
-		}
-
-		[Test]
-		public void should_receive_and_resolve_the_linked_event() {
-			Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
-			Assert.AreEqual(intMaxValue + 1, _receivedEvent.Event.EventNumber);
-			Assert.AreEqual(_event1Id, _receivedEvent.Event.EventId);
-			Assert.AreEqual(intMaxValue + 1, _receivedEvent.Event.EventNumber);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/subscriptions_on_stream_with_event_numbers_greater_than_2_billion.cs b/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/subscriptions_on_stream_with_event_numbers_greater_than_2_billion.cs
deleted file mode 100644
index 64b548efcc1..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/subscriptions_on_stream_with_event_numbers_greater_than_2_billion.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using System.Collections.Generic;
-using System;
-using EventStore.ClientAPI;
-using NUnit.Framework;
-using EventStore.Core.Data;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Services;
-
-namespace EventStore.Core.Tests.ClientAPI.ExpectedVersion64Bit {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	[Category("ClientAPI"), Category("LongRunning")]
-	public class subscriptions_on_stream_with_event_numbers_greater_than_2_billion<TLogFormat, TStreamId>
-		: MiniNodeWithExistingRecords<TLogFormat, TStreamId> {
-		private const long intMaxValue = (long)int.MaxValue;
-
-		private string _volatileStreamOne = "subscriptions-volatile-1";
-		private string _volatileStreamTwo = "subscriptions-volatile-2";
-		private string _catchupStreamOne = "subscriptions-catchup-1";
-
-		private EventRecord _c1, _c2;
-
-		public override void WriteTestScenario() {
-			WriteSingleEvent(_volatileStreamOne, intMaxValue + 1, new string('.', 3000));
-			WriteSingleEvent(_volatileStreamOne, intMaxValue + 2, new string('.', 3000));
-
-			WriteSingleEvent(_volatileStreamTwo, intMaxValue + 1, new string('.', 3000));
-			WriteSingleEvent(_volatileStreamTwo, intMaxValue + 2, new string('.', 3000));
-
-			_c1 = WriteSingleEvent(_catchupStreamOne, intMaxValue + 1, new string('.', 3000));
-			_c2 = WriteSingleEvent(_catchupStreamOne, intMaxValue + 2, new string('.', 3000));
-		}
-
-		public override async Task Given() {
-			_store = BuildConnection(Node);
-			await _store.ConnectAsync();
-			await _store.SetStreamMetadataAsync(_volatileStreamOne, EventStore.ClientAPI.ExpectedVersion.Any,
-				EventStore.ClientAPI.StreamMetadata.Create(truncateBefore: intMaxValue + 1));
-			await _store.SetStreamMetadataAsync(_volatileStreamTwo, EventStore.ClientAPI.ExpectedVersion.Any,
-				EventStore.ClientAPI.StreamMetadata.Create(truncateBefore: intMaxValue + 1));
-			await _store.SetStreamMetadataAsync(_catchupStreamOne, EventStore.ClientAPI.ExpectedVersion.Any,
-				EventStore.ClientAPI.StreamMetadata.Create(truncateBefore: intMaxValue + 1));
-		}
-
-		[Test]
-		public async Task should_be_able_to_subscribe_to_stream_with_volatile_subscription() {
-			var evnt = new EventData(Guid.NewGuid(), "EventType", false, new byte[10], new byte[15]);
-			EventStore.ClientAPI.ResolvedEvent receivedEvent = new EventStore.ClientAPI.ResolvedEvent();
-			var mre = new ManualResetEvent(false);
-			await _store.SubscribeToStreamAsync(_volatileStreamOne, true, (s, e) => {
-				receivedEvent = e;
-				mre.Set();
-				return Task.CompletedTask;
-			});
-
-			await _store.AppendToStreamAsync(_volatileStreamOne, intMaxValue + 2, evnt);
-			Assert.That(mre.WaitOne(TimeSpan.FromSeconds(5)), "Timed out waiting for events to appear");
-
-			Assert.AreEqual(evnt.EventId, receivedEvent.Event.EventId);
-		}
-
-		[Test]
-		public async Task should_be_able_to_subscribe_to_all_with_volatile_subscription() {
-			var evnt = new EventData(Guid.NewGuid(), "EventType", false, new byte[10], new byte[15]);
-			EventStore.ClientAPI.ResolvedEvent receivedEvent = new EventStore.ClientAPI.ResolvedEvent();
-			var mre = new ManualResetEvent(false);
-			await _store.SubscribeToAllAsync(true, (s, e) => {
-				if (SystemStreams.IsSystemStream(e.OriginalStreamId))
-					return Task.CompletedTask;
-				
-				receivedEvent = e;
-				mre.Set();
-				return Task.CompletedTask;
-			}, userCredentials: DefaultData.AdminCredentials);
-
-			await _store.AppendToStreamAsync(_volatileStreamTwo, intMaxValue + 2, evnt);
-			Assert.That(mre.WaitOne(TimeSpan.FromSeconds(5)), "Timed out waiting for events to appear");
-
-			Assert.AreEqual(evnt.EventId, receivedEvent.Event.EventId);
-		}
-
-		[Test]
-		public async Task should_be_able_to_subscribe_to_stream_with_catchup_subscription() {
-			var evnt = new EventData(Guid.NewGuid(), "EventType", false, new byte[10], new byte[15]);
-			List<EventStore.ClientAPI.ResolvedEvent> receivedEvents = new List<EventStore.ClientAPI.ResolvedEvent>();
-
-			var countdown = new CountdownEvent(3);
-			_store.SubscribeToStreamFrom(_catchupStreamOne, 0, CatchUpSubscriptionSettings.Default, (s, e) => {
-				receivedEvents.Add(e);
-				countdown.Signal();
-				return Task.CompletedTask;
-			});
-
-			await _store.AppendToStreamAsync(_catchupStreamOne, intMaxValue + 2, evnt);
-
-			Assert.That(countdown.Wait(TimeSpan.FromSeconds(5)), "Timed out waiting for events to appear");
-
-			Assert.AreEqual(3, receivedEvents.Count);
-			Assert.AreEqual(_c1.EventId, receivedEvents[0].Event.EventId);
-			Assert.AreEqual(_c2.EventId, receivedEvents[1].Event.EventId);
-			Assert.AreEqual(evnt.EventId, receivedEvents[2].Event.EventId);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/transactions_on_stream_with_event_numbers_greater_than_2_billion.cs b/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/transactions_on_stream_with_event_numbers_greater_than_2_billion.cs
deleted file mode 100644
index c92e1bebfd5..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/ExpectedVersion64Bit/transactions_on_stream_with_event_numbers_greater_than_2_billion.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using NUnit.Framework;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.Tests.ClientAPI.ExpectedVersion64Bit {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	[Category("ClientAPI"), Category("LongRunning")]
-	public class transactions_on_stream_with_event_numbers_greater_than_2_billion<TLogFormat, TStreamId>
-		: MiniNodeWithExistingRecords<TLogFormat, TStreamId> {
-		private const string StreamName = "transactions_on_stream_with_event_numbers_greater_than_2_billion";
-		private const long intMaxValue = (long)int.MaxValue;
-
-		private EventRecord _r1, _r2, _r3, _r4, _r5;
-
-		public override void WriteTestScenario() {
-			_r1 = WriteSingleEvent(StreamName, intMaxValue + 1, new string('.', 3000));
-			_r2 = WriteSingleEvent(StreamName, intMaxValue + 2, new string('.', 3000));
-			_r3 = WriteSingleEvent(StreamName, intMaxValue + 3, new string('.', 3000));
-			_r4 = WriteSingleEvent(StreamName, intMaxValue + 4, new string('.', 3000));
-			_r5 = WriteSingleEvent(StreamName, intMaxValue + 5, new string('.', 3000));
-		}
-
-		public override async Task Given() {
-			_store = BuildConnection(Node);
-			await _store.ConnectAsync();
-			await _store.SetStreamMetadataAsync(StreamName, EventStore.ClientAPI.ExpectedVersion.Any,
-				EventStore.ClientAPI.StreamMetadata.Create(truncateBefore: intMaxValue + 1));
-		}
-
-		[Test]
-		public async Task should_be_able_to_append_to_stream_in_a_transaction() {
-			var evnt1 = new EventData(Guid.NewGuid(), "EventType", false, new byte[10], new byte[15]);
-			var evnt2 = new EventData(Guid.NewGuid(), "EventType", false, new byte[10], new byte[15]);
-
-			var transaction = await _store.StartTransactionAsync(StreamName, intMaxValue + 5, DefaultData.AdminCredentials)
-;
-			await transaction.WriteAsync(evnt1);
-			await transaction.WriteAsync(evnt2);
-			await transaction.CommitAsync();
-
-			var records = await _store.ReadStreamEventsForwardAsync(StreamName, intMaxValue, 10, false);
-			Assert.AreEqual(7, records.Events.Length);
-			Assert.AreEqual(_r1.EventId, records.Events[0].Event.EventId);
-			Assert.AreEqual(_r2.EventId, records.Events[1].Event.EventId);
-			Assert.AreEqual(_r3.EventId, records.Events[2].Event.EventId);
-			Assert.AreEqual(_r4.EventId, records.Events[3].Event.EventId);
-			Assert.AreEqual(_r5.EventId, records.Events[4].Event.EventId);
-			Assert.AreEqual(evnt1.EventId, records.Events[5].Event.EventId);
-			Assert.AreEqual(evnt2.EventId, records.Events[6].Event.EventId);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Helpers/EventDataComparer.cs b/src/EventStore.Core.Tests/ClientAPI/Helpers/EventDataComparer.cs
deleted file mode 100644
index 92c323c82a4..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Helpers/EventDataComparer.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using EventStore.ClientAPI;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.Tests.ClientAPI.Helpers {
-	internal static class EventDataComparer {
-		public static bool Equal(EventData expected, RecordedEvent actual) {
-			if (expected.EventId != actual.EventId)
-				return false;
-
-			if (expected.Type != actual.EventType)
-				return false;
-
-			var expectedDataString = Helper.UTF8NoBom.GetString(expected.Data ?? new byte[0]);
-			var expectedMetadataString = Helper.UTF8NoBom.GetString(expected.Metadata ?? new byte[0]);
-
-			var actualDataString = Helper.UTF8NoBom.GetString(actual.Data ?? new byte[0]);
-			var actualMetadataDataString = Helper.UTF8NoBom.GetString(actual.Metadata ?? new byte[0]);
-
-			return expectedDataString == actualDataString && expectedMetadataString == actualMetadataDataString;
-		}
-
-		public static bool Equal(EventData[] expected, RecordedEvent[] actual) {
-			if (expected.Length != actual.Length)
-				return false;
-
-			for (var i = 0; i < expected.Length; i++) {
-				if (!Equal(expected[i], actual[i]))
-					return false;
-			}
-
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Helpers/EventsStream.cs b/src/EventStore.Core.Tests/ClientAPI/Helpers/EventsStream.cs
deleted file mode 100644
index dc1c110eb91..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Helpers/EventsStream.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-
-namespace EventStore.Core.Tests.ClientAPI.Helpers {
-	internal class EventsStream {
-		private const int SliceSize = 10;
-
-		public static async Task<int> Count(IEventStoreConnection store, string stream) {
-			var result = 0;
-			while (true) {
-				var slice = await store.ReadStreamEventsForwardAsync(stream, result, SliceSize, false);
-				result += slice.Events.Length;
-				if (slice.IsEndOfStream)
-					break;
-			}
-
-			return result;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Helpers/TcpType.cs b/src/EventStore.Core.Tests/ClientAPI/Helpers/TcpType.cs
deleted file mode 100644
index d0b7bdf26c3..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Helpers/TcpType.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.Core.Tests.ClientAPI.Helpers {
-	public enum TcpType {
-		Normal,
-		Ssl
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Helpers/TestConnection.cs b/src/EventStore.Core.Tests/ClientAPI/Helpers/TestConnection.cs
deleted file mode 100644
index fe98393563f..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Helpers/TestConnection.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Net;
-using System.Threading;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Internal;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.Helpers {
-	public static class TestConnection {
-		private static int _nextConnId = -1;
-
-		public static IEventStoreConnection Create(IPEndPoint endPoint, TcpType tcpType = TcpType.Ssl,
-			UserCredentials userCredentials = null) {
-			
-			return EventStoreConnection.Create(Settings(tcpType, userCredentials),
-				endPoint.ToESTcpUri(),
-				$"ESC-{Interlocked.Increment(ref _nextConnId)}");
-		}
-
-		public static IEventStoreConnection To(MiniNode miniNode, TcpType tcpType,
-			UserCredentials userCredentials = null) {
-			return EventStoreConnection.Create(Settings(tcpType, userCredentials),
-				miniNode.TcpEndPoint.ToESTcpUri(),
-				$"ESC-{Interlocked.Increment(ref _nextConnId)}");
-		}
-
-		private static ConnectionSettingsBuilder Settings(TcpType tcpType, UserCredentials userCredentials) {
-			var settings = ConnectionSettings.Create()
-				.SetDefaultUserCredentials(userCredentials)
-				.UseCustomLogger(ClientApiLoggerBridge.Default)
-				.EnableVerboseLogging()
-				.LimitReconnectionsTo(10)
-				.LimitAttemptsForOperationTo(1)				
-				.SetTimeoutCheckPeriodTo(TimeSpan.FromMilliseconds(100))
-				.SetReconnectionDelayTo(TimeSpan.Zero)
-				.FailOnNoServerResponse()
-				//.SetOperationTimeoutTo(TimeSpan.FromDays(1))
-				;
-			if (tcpType == TcpType.Ssl) {
-				settings.DisableServerCertificateValidation();
-			} else {
-				settings.DisableTls();
-			}
-
-			return settings;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Helpers/TestEvent.cs b/src/EventStore.Core.Tests/ClientAPI/Helpers/TestEvent.cs
deleted file mode 100644
index 3f43200762b..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Helpers/TestEvent.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Text;
-using EventStore.ClientAPI;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.Tests.ClientAPI.Helpers {
-	public class TestEvent {
-		public static EventData NewTestEvent(string data = null, string metadata = null, string eventName = "TestEvent") {
-			return NewTestEvent(Guid.NewGuid(), data, metadata, eventName);
-		}
-
-		public static EventData NewTestEvent(Guid eventId, string data = null, string metadata = null, string eventName = "TestEvent") {
-			var encodedData = Helper.UTF8NoBom.GetBytes(data ?? eventId.ToString());
-			var encodedMetadata = Helper.UTF8NoBom.GetBytes(metadata ?? "metadata");
-
-			return new EventData(eventId, eventName, false, encodedData, encodedMetadata);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Helpers/Writer.cs b/src/EventStore.Core.Tests/ClientAPI/Helpers/Writer.cs
deleted file mode 100644
index 2688b4df568..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Helpers/Writer.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.Helpers {
-	internal class StreamWriter {
-		private readonly IEventStoreConnection _store;
-		private readonly string _stream;
-		private readonly long _version;
-
-		public StreamWriter(IEventStoreConnection store, string stream, long version) {
-			_store = store;
-			_stream = stream;
-			_version = version;
-		}
-
-		public async Task<TailWriter> Append(params EventData[] events) {
-			for (var i = 0; i < events.Length; i++) {
-				var expVer = _version == ExpectedVersion.Any ? ExpectedVersion.Any : _version + i;
-				var nextExpVer = (await _store.AppendToStreamAsync(_stream, expVer, new[] { events[i] })).NextExpectedVersion;
-				if (_version != ExpectedVersion.Any)
-					Assert.AreEqual(expVer + 1, nextExpVer);
-			}
-
-			return new TailWriter(_store, _stream);
-		}
-	}
-
-	internal class TailWriter {
-		private readonly IEventStoreConnection _store;
-		private readonly string _stream;
-
-		public TailWriter(IEventStoreConnection store, string stream) {
-			_store = store;
-			_stream = stream;
-		}
-
-		public async Task<TailWriter> Then(EventData @event, long expectedVersion) {
-			await _store.AppendToStreamAsync(_stream, expectedVersion, new[] { @event });
-			return this;
-		}
-	}
-
-	internal class TransactionalWriter {
-		private readonly IEventStoreConnection _store;
-		private readonly string _stream;
-
-		public TransactionalWriter(IEventStoreConnection store, string stream) {
-			_store = store;
-			_stream = stream;
-		}
-
-		public async Task<OngoingTransaction> StartTransaction(long expectedVersion) {
-			return new OngoingTransaction(await _store.StartTransactionAsync(_stream, expectedVersion));
-		}
-
-		public OngoingTransaction ContinueTransaction(long transactionId) {
-			return new OngoingTransaction(_store.ContinueTransaction(transactionId));
-		}
-	}
-
-	//TODO GFY this should be removed and merged with the public idea of a transaction.
-	internal class OngoingTransaction {
-		private readonly EventStoreTransaction _transaction;
-
-		public long TransactionId => _transaction.TransactionId;
-
-		public OngoingTransaction(EventStoreTransaction transaction) {
-			_transaction = transaction;
-		}
-
-		public async Task<OngoingTransaction> Write(params EventData[] events) {
-			await _transaction.WriteAsync(events);
-			return this;
-		}
-
-		public Task<WriteResult> Commit() {
-			return _transaction.CommitAsync();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Security/AuthenticationTestBase.cs b/src/EventStore.Core.Tests/ClientAPI/Security/AuthenticationTestBase.cs
deleted file mode 100644
index c582b85f843..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Security/AuthenticationTestBase.cs
+++ /dev/null
@@ -1,244 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.Security {
-	public abstract class AuthenticationTestBase<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private readonly UserCredentials _userCredentials;
-		private MiniNode<TLogFormat, TStreamId> _node;
-		protected IEventStoreConnection Connection;
-
-		protected AuthenticationTestBase(UserCredentials userCredentials = null) {
-			_userCredentials = userCredentials;
-		}
-
-
-		public virtual IEventStoreConnection SetupConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.Create(node.TcpEndPoint, TcpType.Ssl, _userCredentials);
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName, enableTrustedAuth: true);
-			await _node.Start();
-
-			var userCreateEvent1 = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-			_node.Node.MainQueue.Publish(
-				new UserManagementMessage.Create(
-					new CallbackEnvelope(
-						m => {
-							Assert.IsTrue(m is UserManagementMessage.UpdateResult);
-							var msg = (UserManagementMessage.UpdateResult)m;
-							Assert.IsTrue(msg.Success);
-
-							userCreateEvent1.SetResult(true);
-						}),
-					SystemAccounts.System,
-					"user1",
-					"Test User 1",
-					new string[0],
-					"pa$$1"));
-
-			var userCreateEvent2 = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-			_node.Node.MainQueue.Publish(
-				new UserManagementMessage.Create(
-					new CallbackEnvelope(
-						m => {
-							Assert.IsTrue(m is UserManagementMessage.UpdateResult);
-							var msg = (UserManagementMessage.UpdateResult)m;
-							Assert.IsTrue(msg.Success);
-
-							userCreateEvent2.SetResult(true);
-						}),
-					SystemAccounts.System,
-					"user2",
-					"Test User 2",
-					new string[0],
-					"pa$$2"));
-
-			var adminCreateEvent2 = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-			_node.Node.MainQueue.Publish(
-				new UserManagementMessage.Create(
-					new CallbackEnvelope(
-						m => {
-							Assert.IsTrue(m is UserManagementMessage.UpdateResult);
-							var msg = (UserManagementMessage.UpdateResult)m;
-							Assert.IsTrue(msg.Success);
-
-							adminCreateEvent2.SetResult(true);
-						}),
-					SystemAccounts.System,
-					"adm",
-					"Administrator User",
-					new[] { SystemRoles.Admins },
-					"admpa$$"));
-
-			Assert.IsTrue(await userCreateEvent1.Task.WithTimeout(10000), "User 1 creation failed");
-			Assert.IsTrue(await userCreateEvent2.Task.WithTimeout(10000), "User 2 creation failed");
-			Assert.IsTrue(await adminCreateEvent2.Task.WithTimeout(10000), "Administrator User creation failed");
-
-			Connection = SetupConnection(_node);
-			await Connection.ConnectAsync();
-
-			await Connection.SetStreamMetadataAsync("noacl-stream", ExpectedVersion.NoStream, StreamMetadata.Build());
-			await Connection.SetStreamMetadataAsync(
-				"read-stream",
-				ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetReadRole("user1"));
-			await Connection.SetStreamMetadataAsync(
-				"write-stream",
-				ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetWriteRole("user1"));
-			await Connection.SetStreamMetadataAsync(
-				"metaread-stream",
-				ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetMetadataReadRole("user1"));
-			await Connection.SetStreamMetadataAsync(
-				"metawrite-stream",
-				ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetMetadataWriteRole("user1"));
-
-			await Connection.SetStreamMetadataAsync(
-				"$all",
-				ExpectedVersion.Any,
-				StreamMetadata.Build().SetReadRole("user1"),
-				new UserCredentials("adm", "admpa$$"));
-
-			await Connection.SetStreamMetadataAsync(
-				"$system-acl",
-				ExpectedVersion.NoStream,
-				StreamMetadata.Build()
-					.SetReadRole("user1")
-					.SetWriteRole("user1")
-					.SetMetadataReadRole("user1")
-					.SetMetadataWriteRole("user1"),
-				new UserCredentials("adm", "admpa$$"));
-			await Connection.SetStreamMetadataAsync(
-				"$system-adm",
-				ExpectedVersion.NoStream,
-				StreamMetadata.Build()
-					.SetReadRole(SystemRoles.Admins)
-					.SetWriteRole(SystemRoles.Admins)
-					.SetMetadataReadRole(SystemRoles.Admins)
-					.SetMetadataWriteRole(SystemRoles.Admins),
-				new UserCredentials("adm", "admpa$$"));
-
-			await Connection.SetStreamMetadataAsync(
-				"normal-all",
-				ExpectedVersion.NoStream,
-				StreamMetadata.Build()
-					.SetReadRole(SystemRoles.All)
-					.SetWriteRole(SystemRoles.All)
-					.SetMetadataReadRole(SystemRoles.All)
-					.SetMetadataWriteRole(SystemRoles.All));
-			await Connection.SetStreamMetadataAsync(
-				"$system-all",
-				ExpectedVersion.NoStream,
-				StreamMetadata.Build()
-					.SetReadRole(SystemRoles.All)
-					.SetWriteRole(SystemRoles.All)
-					.SetMetadataReadRole(SystemRoles.All)
-					.SetMetadataWriteRole(SystemRoles.All),
-				new UserCredentials("adm", "admpa$$"));
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			await _node.Shutdown();
-			Connection.Close();
-			await base.TestFixtureTearDown();
-		}
-
-		protected Task ReadEvent(string streamId, string login, string password) {
-			return Connection.ReadEventAsync(streamId, -1, false,
-				login == null && password == null ? null : new UserCredentials(login, password));
-		}
-
-		protected Task ReadStreamForward(string streamId, string login, string password) {
-			return Connection.ReadStreamEventsForwardAsync(streamId, 0, 1, false,
-				login == null && password == null ? null : new UserCredentials(login, password));
-		}
-
-		protected Task ReadStreamBackward(string streamId, string login, string password) {
-			return Connection.ReadStreamEventsBackwardAsync(streamId, 0, 1, false,
-				login == null && password == null ? null : new UserCredentials(login, password));
-		}
-
-		protected Task WriteStream(string streamId, string login, string password) {
-			return Connection.AppendToStreamAsync(streamId, ExpectedVersion.Any, CreateEvents(),
-				login == null && password == null ? null : new UserCredentials(login, password));
-		}
-
-		protected Task<EventStoreTransaction> TransStart(string streamId, string login, string password) {
-			return Connection.StartTransactionAsync(streamId, ExpectedVersion.Any,
-				login == null && password == null ? null : new UserCredentials(login, password));
-		}
-
-		protected Task ReadAllForward(string login, string password) {
-			return Connection.ReadAllEventsForwardAsync(Position.Start, 1, false,
-				login == null && password == null ? null : new UserCredentials(login, password));
-		}
-
-		protected Task ReadAllBackward(string login, string password) {
-			return Connection.ReadAllEventsBackwardAsync(Position.End, 1, false,
-				login == null && password == null ? null : new UserCredentials(login, password));
-		}
-
-		protected Task ReadMeta(string streamId, string login, string password) {
-			return Connection.GetStreamMetadataAsRawBytesAsync(streamId,
-				login == null && password == null ? null : new UserCredentials(login, password));
-		}
-
-		protected Task WriteMeta(string streamId, string login, string password, string metawriteRole) {
-			return Connection.SetStreamMetadataAsync(streamId, ExpectedVersion.Any,
-				metawriteRole == null
-					? StreamMetadata.Build()
-					: StreamMetadata.Build().SetReadRole(metawriteRole)
-						.SetWriteRole(metawriteRole)
-						.SetMetadataReadRole(metawriteRole)
-						.SetMetadataWriteRole(metawriteRole),
-				login == null && password == null ? null : new UserCredentials(login, password));
-		}
-
-		protected async Task SubscribeToStream(string streamId, string login, string password) {
-			using (await Connection.SubscribeToStreamAsync(streamId, false, (x, y) => Task.CompletedTask,
-				(x, y, z) => { },
-				login == null && password == null ? null : new UserCredentials(login, password))) {
-			}
-		}
-
-		protected async Task SubscribeToAll(string login, string password) {
-			using (await Connection.SubscribeToAllAsync(false, (x, y) => Task.CompletedTask, (x, y, z) => { },
-				login == null && password == null ? null : new UserCredentials(login, password))) {
-			}
-		}
-
-		protected async Task<string> CreateStreamWithMeta(StreamMetadata metadata, string streamPrefix = null) {
-			var stream = (streamPrefix ?? string.Empty) + Guid.NewGuid().ToString();
-			await Connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
-				metadata, new UserCredentials("adm", "admpa$$"));
-			return stream;
-		}
-
-		protected Task DeleteStream(string streamId, string login, string password) {
-			return Connection.DeleteStreamAsync(streamId, ExpectedVersion.Any, true,
-				login == null && password == null ? null : new UserCredentials(login, password));
-		}
-
-		protected Task ExpectNoException(Func<Task> action) => action();
-
-		protected EventData[] CreateEvents() {
-			return new[] { new EventData(Guid.NewGuid(), "some-type", false, new byte[] { 1, 2, 3 }, null) };
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Security/all_stream_with_no_acl_security.cs b/src/EventStore.Core.Tests/ClientAPI/Security/all_stream_with_no_acl_security.cs
deleted file mode 100644
index 219ef3b1dff..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Security/all_stream_with_no_acl_security.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.ClientAPI.SystemData;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.Security {
-	[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class all_stream_with_no_acl_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			await Connection.SetStreamMetadataAsync("$all", ExpectedVersion.Any, StreamMetadata.Build(),
-				new UserCredentials("adm", "admpa$$"));
-		}
-
-		[Test]
-		public async Task write_to_all_is_never_allowed() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$all", null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$all", "user1", "pa$$1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$all", "adm", "admpa$$"));
-		}
-
-		[Test]
-		public async Task delete_of_all_is_never_allowed() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream("$all", null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream("$all", "user1", "pa$$1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream("$all", "adm", "admpa$$"));
-		}
-
-
-		[Test]
-		public async Task reading_and_subscribing_is_not_allowed_when_no_credentials_are_passed() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("$all", null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward("$all", null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward("$all", null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta("$all", null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream("$all", null, null));
-		}
-
-		[Test]
-		public async Task reading_and_subscribing_is_not_allowed_for_usual_user() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("$all", "user1", "pa$$1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward("$all", "user1", "pa$$1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward("$all", "user1", "pa$$1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta("$all", "user1", "pa$$1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream("$all", "user1", "pa$$1"));
-		}
-
-		[Test]
-		public async Task reading_and_subscribing_is_allowed_for_admin_user() {
-			await ReadEvent("$all", "adm", "admpa$$");
-			await ReadStreamForward("$all", "adm", "admpa$$");
-			await ReadStreamBackward("$all", "adm", "admpa$$");
-			await ReadMeta("$all", "adm", "admpa$$");
-			await SubscribeToStream("$all", "adm", "admpa$$");
-		}
-
-
-		[Test]
-		public async Task meta_write_is_not_allowed_when_no_credentials_are_passed() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta("$all", null, null, null));
-		}
-
-		[Test]
-		public async Task meta_write_is_not_allowed_for_usual_user() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta("$all", "user1", "pa$$1", null));
-		}
-
-		[Test]
-		public async Task meta_write_is_allowed_for_admin_user() {
-			await WriteMeta("$all", "adm", "admpa$$", null);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Security/authorized_default_credentials_security.cs b/src/EventStore.Core.Tests/ClientAPI/Security/authorized_default_credentials_security.cs
deleted file mode 100644
index d17df5b1fe6..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Security/authorized_default_credentials_security.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.ClientAPI.SystemData;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.Security {
-	[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class authorized_default_credentials_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
-		public authorized_default_credentials_security() : base(new UserCredentials("user1", "pa$$1")) {
-		}
-
-		[Test]
-		public async Task all_operations_succeeds_when_passing_no_explicit_credentials() {
-			await ReadAllForward(null, null);
-			await ReadAllBackward(null, null);
-
-			await ReadEvent("read-stream", null, null);
-			await ReadStreamForward("read-stream", null, null);
-			await ReadStreamBackward("read-stream", null, null);
-
-			await WriteStream("write-stream", null, null);
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				await ExpectNoException(async () => {
-					var trans = await TransStart("write-stream", null, null);
-					await trans.WriteAsync();
-					await trans.CommitAsync();
-				});
-			}
-
-			await ReadMeta("metaread-stream", null, null);
-			await WriteMeta("metawrite-stream", null, null, "user1");
-
-			await SubscribeToStream("read-stream", null, null);
-			await SubscribeToAll(null, null);
-		}
-
-		[Test]
-		public async Task all_operations_are_not_authenticated_when_overriden_with_not_existing_credentials() {
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadAllForward("badlogin", "badpass"));
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadAllBackward("badlogin", "badpass"));
-
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadEvent("read-stream", "badlogin", "badpass"));
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadStreamForward("read-stream", "badlogin", "badpass"));
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadStreamBackward("read-stream", "badlogin", "badpass"));
-
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => WriteStream("write-stream", "badlogin", "badpass"));
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => TransStart("write-stream", "badlogin", "badpass"));
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart("write-stream", null, null)).TransactionId;
-				var trans = Connection.ContinueTransaction(transId, new UserCredentials("badlogin", "badpass"));
-				await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => trans.WriteAsync());
-				await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => trans.CommitAsync());
-			}
-
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadMeta("metaread-stream", "badlogin", "badpass"));
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => WriteMeta("metawrite-stream", "badlogin", "badpass", "user1"));
-
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => SubscribeToStream("read-stream", "badlogin", "badpass"));
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => SubscribeToAll("badlogin", "badpass"));
-		}
-
-		[Test]
-		public async Task all_operations_are_not_authorized_when_overriden_with_not_authorized_credentials() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadAllForward("user2", "pa$$2"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadAllBackward("user2", "pa$$2"));
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("read-stream", "user2", "pa$$2"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward("read-stream", "user2", "pa$$2"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward("read-stream", "user2", "pa$$2"));
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("write-stream", "user2", "pa$$2"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => TransStart("write-stream", "user2", "pa$$2"));
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart("write-stream", null, null)).TransactionId;
-				var trans = Connection.ContinueTransaction(transId, new UserCredentials("user2", "pa$$2"));
-				await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.WriteAsync());
-				await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.CommitAsync());
-			}
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta("metaread-stream", "user2", "pa$$2"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta("metawrite-stream", "user2", "pa$$2", "user1"));
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream("read-stream", "user2", "pa$$2"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToAll("user2", "pa$$2"));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Security/delete_stream_security.cs b/src/EventStore.Core.Tests/ClientAPI/Security/delete_stream_security.cs
deleted file mode 100644
index be92955dab9..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Security/delete_stream_security.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.Core.Services;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.Security {
-	[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class delete_stream_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
-		[Test]
-		public async Task delete_of_all_is_never_allowed() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream("$all", null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream("$all", "user1", "pa$$1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream("$all", "adm", "admpa$$"));
-		}
-
-		[Test]
-		public async Task deleting_normal_no_acl_stream_with_no_user_is_allowed() {
-			var streamId = await CreateStreamWithMeta(StreamMetadata.Build());
-			await DeleteStream(streamId, null, null);
-		}
-
-		[Test]
-		public async Task deleting_normal_no_acl_stream_with_existing_user_is_allowed() {
-			var streamId = await CreateStreamWithMeta(StreamMetadata.Build());
-			await DeleteStream(streamId, "user1", "pa$$1");
-		}
-
-		[Test]
-		public async Task deleting_normal_no_acl_stream_with_admin_user_is_allowed() {
-			var streamId = await CreateStreamWithMeta(StreamMetadata.Build());
-			await DeleteStream(streamId, "adm", "admpa$$");
-		}
-
-
-		[Test]
-		public async Task deleting_normal_user_stream_with_no_user_is_not_allowed() {
-			var streamId = await CreateStreamWithMeta(StreamMetadata.Build().SetDeleteRole("user1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(streamId, null, null));
-		}
-
-		[Test]
-		public async Task deleting_normal_user_stream_with_not_authorized_user_is_not_allowed() {
-			var streamId = await CreateStreamWithMeta(StreamMetadata.Build().SetDeleteRole("user1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(streamId, "user2", "pa$$2"));
-		}
-
-		[Test]
-		public async Task deleting_normal_user_stream_with_authorized_user_is_allowed() {
-			var streamId = await CreateStreamWithMeta(StreamMetadata.Build().SetDeleteRole("user1"));
-			await DeleteStream(streamId, "user1", "pa$$1");
-		}
-
-		[Test]
-		public async Task deleting_normal_user_stream_with_admin_user_is_allowed() {
-			var streamId = await CreateStreamWithMeta(StreamMetadata.Build().SetDeleteRole("user1"));
-			await DeleteStream(streamId, "adm", "admpa$$");
-		}
-
-
-		[Test]
-		public async Task deleting_normal_admin_stream_with_no_user_is_not_allowed() {
-			var streamId = await CreateStreamWithMeta(StreamMetadata.Build().SetDeleteRole(SystemRoles.Admins));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(streamId, null, null));
-		}
-
-		[Test]
-		public async Task deleting_normal_admin_stream_with_existing_user_is_not_allowed() {
-			var streamId = await CreateStreamWithMeta(StreamMetadata.Build().SetDeleteRole(SystemRoles.Admins));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(streamId, "user1", "pa$$1"));
-		}
-
-		[Test]
-		public async Task deleting_normal_admin_stream_with_admin_user_is_allowed() {
-			var streamId = await CreateStreamWithMeta(StreamMetadata.Build().SetDeleteRole(SystemRoles.Admins));
-			await DeleteStream(streamId, "adm", "admpa$$");
-		}
-
-
-		[Test]
-		public async Task deleting_normal_all_stream_with_no_user_is_allowed() {
-			var streamId = await CreateStreamWithMeta(StreamMetadata.Build().SetDeleteRole(SystemRoles.All));
-			await DeleteStream(streamId, null, null);
-		}
-
-		[Test]
-		public async Task deleting_normal_all_stream_with_existing_user_is_allowed() {
-			var streamId = await CreateStreamWithMeta(StreamMetadata.Build().SetDeleteRole(SystemRoles.All));
-			await DeleteStream(streamId, "user1", "pa$$1");
-		}
-
-		[Test]
-		public async Task deleting_normal_all_stream_with_admin_user_is_allowed() {
-			var streamId = await CreateStreamWithMeta(StreamMetadata.Build().SetDeleteRole(SystemRoles.All));
-			await DeleteStream(streamId, "adm", "admpa$$");
-		}
-
-		// $-stream
-
-		[Test]
-		public async Task deleting_system_no_acl_stream_with_no_user_is_not_allowed() {
-			var streamId = await CreateStreamWithMeta(streamPrefix: "$", metadata: StreamMetadata.Build());
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(streamId, null, null));
-		}
-
-		[Test]
-		public async Task deleting_system_no_acl_stream_with_existing_user_is_not_allowed() {
-			var streamId = await CreateStreamWithMeta(streamPrefix: "$", metadata: StreamMetadata.Build());
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(streamId, "user1", "pa$$1"));
-		}
-
-		[Test]
-		public async Task deleting_system_no_acl_stream_with_admin_user_is_allowed() {
-			var streamId = await CreateStreamWithMeta(streamPrefix: "$", metadata: StreamMetadata.Build());
-			await DeleteStream(streamId, "adm", "admpa$$");
-		}
-
-
-		[Test]
-		public async Task deleting_system_user_stream_with_no_user_is_not_allowed() {
-			var streamId = await CreateStreamWithMeta(streamPrefix: "$",
-				metadata: StreamMetadata.Build().SetDeleteRole("user1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(streamId, null, null));
-		}
-
-		[Test]
-		public async Task deleting_system_user_stream_with_not_authorized_user_is_not_allowed() {
-			var streamId = await CreateStreamWithMeta(streamPrefix: "$",
-				metadata: StreamMetadata.Build().SetDeleteRole("user1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(streamId, "user2", "pa$$2"));
-		}
-
-		[Test]
-		public async Task deleting_system_user_stream_with_authorized_user_is_allowed() {
-			var streamId = await CreateStreamWithMeta(streamPrefix: "$",
-				metadata: StreamMetadata.Build().SetDeleteRole("user1"));
-			await DeleteStream(streamId, "user1", "pa$$1");
-		}
-
-		[Test]
-		public async Task deleting_system_user_stream_with_admin_user_is_allowed() {
-			var streamId = await CreateStreamWithMeta(streamPrefix: "$",
-				metadata: StreamMetadata.Build().SetDeleteRole("user1"));
-			await DeleteStream(streamId, "adm", "admpa$$");
-		}
-
-
-		[Test]
-		public async Task deleting_system_admin_stream_with_no_user_is_not_allowed() {
-			var streamId = await CreateStreamWithMeta(streamPrefix: "$",
-				metadata: StreamMetadata.Build().SetDeleteRole(SystemRoles.Admins));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(streamId, null, null));
-		}
-
-		[Test]
-		public async Task deleting_system_admin_stream_with_existing_user_is_not_allowed() {
-			var streamId = await CreateStreamWithMeta(streamPrefix: "$",
-				metadata: StreamMetadata.Build().SetDeleteRole(SystemRoles.Admins));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(streamId, "user1", "pa$$1"));
-		}
-
-		[Test]
-		public async Task deleting_system_admin_stream_with_admin_user_is_allowed() {
-			var streamId = await CreateStreamWithMeta(streamPrefix: "$",
-				metadata: StreamMetadata.Build().SetDeleteRole(SystemRoles.Admins));
-			await DeleteStream(streamId, "adm", "admpa$$");
-		}
-
-
-		[Test]
-		public async Task deleting_system_all_stream_with_no_user_is_allowed() {
-			var streamId = await CreateStreamWithMeta(streamPrefix: "$",
-				metadata: StreamMetadata.Build().SetDeleteRole(SystemRoles.All));
-			await DeleteStream(streamId, null, null);
-		}
-
-		[Test]
-		public async Task deleting_system_all_stream_with_existing_user_is_allowed() {
-			var streamId = await CreateStreamWithMeta(streamPrefix: "$",
-				metadata: StreamMetadata.Build().SetDeleteRole(SystemRoles.All));
-			await DeleteStream(streamId, "user1", "pa$$1");
-		}
-
-		[Test]
-		public async Task deleting_system_all_stream_with_admin_user_is_allowed() {
-			var streamId = await CreateStreamWithMeta(streamPrefix: "$",
-				metadata: StreamMetadata.Build().SetDeleteRole(SystemRoles.All));
-			await DeleteStream(streamId, "adm", "admpa$$");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Security/multiple_role_security.cs b/src/EventStore.Core.Tests/ClientAPI/Security/multiple_role_security.cs
deleted file mode 100644
index b7b3adef864..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Security/multiple_role_security.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Services;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.Security {
-	[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class multiple_role_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var settings = new SystemSettings(
-				new StreamAcl(new[] { "user1", "user2" }, new[] { "$admins", "user1" }, new[] { "user1", SystemRoles.All },
-					null, null),
-				null);
-			await Connection.SetSystemSettingsAsync(settings, new UserCredentials("adm", "admpa$$"));
-		}
-
-		[Test]
-		public async Task multiple_roles_are_handled_correctly() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("usr-stream", null, null));
-			await ReadEvent("usr-stream", "user1", "pa$$1");
-			await ReadEvent("usr-stream", "user2", "pa$$2");
-			await ReadEvent("usr-stream", "adm", "admpa$$");
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("usr-stream", null, null));
-			await WriteStream("usr-stream", "user1", "pa$$1");
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("usr-stream", "user2", "pa$$2"));
-			await WriteStream("usr-stream", "adm", "admpa$$");
-
-			await DeleteStream("usr-stream1", null, null);
-			await DeleteStream("usr-stream2", "user1", "pa$$1");
-			await DeleteStream("usr-stream3", "user2", "pa$$2");
-			await DeleteStream("usr-stream4", "adm", "admpa$$");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Security/overriden_system_stream_security.cs b/src/EventStore.Core.Tests/ClientAPI/Security/overriden_system_stream_security.cs
deleted file mode 100644
index b99d7079ddb..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Security/overriden_system_stream_security.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.ClientAPI.SystemData;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.Security {
-	[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class overriden_system_stream_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var settings = new SystemSettings(userStreamAcl: null,
-				systemStreamAcl: new StreamAcl("user1", "user1", "user1", "user1", "user1"));
-			await Connection.SetSystemSettingsAsync(settings, new UserCredentials("adm", "admpa$$"));
-		}
-
-		[Test]
-		public async Task operations_on_system_stream_succeed_for_authorized_user() {
-			const string stream = "$sys-authorized-user";
-			await ReadEvent(stream, "user1", "pa$$1");
-			await ReadStreamForward(stream, "user1", "pa$$1");
-			await ReadStreamBackward(stream, "user1", "pa$$1");
-
-			await WriteStream(stream, "user1", "pa$$1");
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				await TransStart(stream, "user1", "pa$$1");
-			}
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart(stream, "adm", "admpa$$")).TransactionId;
-				var trans = Connection.ContinueTransaction(transId, new UserCredentials("user1", "pa$$1"));
-				await trans.WriteAsync();
-				await trans.CommitAsync();
-			}
-
-			await ReadMeta(stream, "user1", "pa$$1");
-			await WriteMeta(stream, "user1", "pa$$1", null);
-
-			await SubscribeToStream(stream, "user1", "pa$$1");
-
-			await DeleteStream(stream, "user1", "pa$$1");
-		}
-
-		[Test]
-		public async Task operations_on_system_stream_fail_for_not_authorized_user() {
-			const string stream = "$sys-not-authorized-user";
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent(stream, "user2", "pa$$2"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward(stream, "user2", "pa$$2"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward(stream, "user2", "pa$$2"));
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream(stream, "user2", "pa$$2"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => TransStart(stream, "user2", "pa$$2"));
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart(stream, "adm", "admpa$$")).TransactionId;
-				var trans = Connection.ContinueTransaction(transId, new UserCredentials("user2", "pa$$2"));
-				await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.WriteAsync());
-				await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.CommitAsync());
-			}
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta(stream, "user2", "pa$$2"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta(stream, "user2", "pa$$2", null));
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream(stream, "user2", "pa$$2"));
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(stream, "user2", "pa$$2"));
-		}
-
-		[Test]
-		public async Task operations_on_system_stream_fail_for_anonymous_user() {
-			const string stream = "$sys-anonymous-user";
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent(stream, null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward(stream, null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward(stream, null, null));
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream(stream, null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => TransStart(stream, null, null));
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart(stream, "adm", "admpa$$")).TransactionId;
-				var trans = Connection.ContinueTransaction(transId);
-				await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.WriteAsync());
-				await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.CommitAsync());
-			}
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta(stream, null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta(stream, null, null, null));
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream(stream, null, null));
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(stream, null, null));
-		}
-
-		[Test]
-		public async Task operations_on_system_stream_succeed_for_admin() {
-			const string stream = "$sys-admin";
-			await ReadEvent(stream, "adm", "admpa$$");
-			await ReadStreamForward(stream, "adm", "admpa$$");
-			await ReadStreamBackward(stream, "adm", "admpa$$");
-
-			await WriteStream(stream, "adm", "admpa$$");
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				await TransStart(stream, "adm", "admpa$$");
-			}
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart(stream, "adm", "admpa$$")).TransactionId;
-				var trans = Connection.ContinueTransaction(transId, new UserCredentials("adm", "admpa$$"));
-				await trans.WriteAsync();
-				await trans.CommitAsync();
-			}
-
-			await ReadMeta(stream, "adm", "admpa$$");
-			await WriteMeta(stream, "adm", "admpa$$", null);
-
-			await SubscribeToStream(stream, "adm", "admpa$$");
-
-			await DeleteStream(stream, "adm", "admpa$$");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Security/overriden_system_stream_security_for_all.cs b/src/EventStore.Core.Tests/ClientAPI/Security/overriden_system_stream_security_for_all.cs
deleted file mode 100644
index dfb950d1711..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Security/overriden_system_stream_security_for_all.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Services;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.Security {
-	[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class overriden_system_stream_security_for_all<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var settings = new SystemSettings(
-				userStreamAcl: null,
-				systemStreamAcl: new StreamAcl(SystemRoles.All, SystemRoles.All, SystemRoles.All, SystemRoles.All,
-					SystemRoles.All));
-			await Connection.SetSystemSettingsAsync(settings, new UserCredentials("adm", "admpa$$"));
-		}
-
-		[Test]
-		public async Task operations_on_system_stream_succeeds_for_user() {
-			const string stream = "$sys-authorized-user";
-			await ReadEvent(stream, "user1", "pa$$1");
-			await ReadStreamForward(stream, "user1", "pa$$1");
-			await ReadStreamBackward(stream, "user1", "pa$$1");
-
-			await WriteStream(stream, "user1", "pa$$1");
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				await TransStart(stream, "user1", "pa$$1");
-			}
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart(stream, "adm", "admpa$$")).TransactionId;
-				var trans = Connection.ContinueTransaction(transId, new UserCredentials("user1", "pa$$1"));
-				await trans.WriteAsync();
-				await trans.CommitAsync();
-			}
-
-			await ReadMeta(stream, "user1", "pa$$1");
-			await WriteMeta(stream, "user1", "pa$$1", null);
-
-			await SubscribeToStream(stream, "user1", "pa$$1");
-
-			await DeleteStream(stream, "user1", "pa$$1");
-		}
-
-		[Test]
-		public async Task operations_on_system_stream_fail_for_anonymous_user() {
-			const string stream = "$sys-anonymous-user";
-			await ReadEvent(stream, null, null);
-			await ReadStreamForward(stream, null, null);
-			await ReadStreamBackward(stream, null, null);
-
-			await WriteStream(stream, null, null);
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				await TransStart(stream, null, null);
-			}
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart(stream, "adm", "admpa$$")).TransactionId;
-				var trans = Connection.ContinueTransaction(transId);
-				await trans.WriteAsync();
-				await trans.CommitAsync();
-			}
-
-			await ReadMeta(stream, null, null);
-			await WriteMeta(stream, null, null, null);
-
-			await SubscribeToStream(stream, null, null);
-
-			await DeleteStream(stream, null, null);
-		}
-
-		[Test]
-		public async Task operations_on_system_stream_succeed_for_admin() {
-			const string stream = "$sys-admin";
-			await ReadEvent(stream, "adm", "admpa$$");
-			await ReadStreamForward(stream, "adm", "admpa$$");
-			await ReadStreamBackward(stream, "adm", "admpa$$");
-
-			await WriteStream(stream, "adm", "admpa$$");
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				await TransStart(stream, "adm", "admpa$$");
-			}
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart(stream, "adm", "admpa$$")).TransactionId;
-				var trans = Connection.ContinueTransaction(transId, new UserCredentials("adm", "admpa$$"));
-				await trans.WriteAsync();
-				await trans.CommitAsync();
-			}
-
-			await ReadMeta(stream, "adm", "admpa$$");
-			await WriteMeta(stream, "adm", "admpa$$", null);
-
-			await SubscribeToStream(stream, "adm", "admpa$$");
-
-			await DeleteStream(stream, "adm", "admpa$$");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Security/overriden_user_stream_security.cs b/src/EventStore.Core.Tests/ClientAPI/Security/overriden_user_stream_security.cs
deleted file mode 100644
index 96f2948c1b2..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Security/overriden_user_stream_security.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Services;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.Security {
-	[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class overriden_user_stream_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var settings = new SystemSettings(userStreamAcl: new StreamAcl("user1", "user1", "user1", "user1", "user1"),
-				systemStreamAcl: null);
-			await Connection.SetSystemSettingsAsync(settings, new UserCredentials("adm", "admpa$$"));
-		}
-
-		[Test]
-		public async Task operations_on_user_stream_succeeds_for_authorized_user() {
-			const string stream = "user-authorized-user";
-			await ReadEvent(stream, "user1", "pa$$1");
-			await ReadStreamForward(stream, "user1", "pa$$1");
-			await ReadStreamBackward(stream, "user1", "pa$$1");
-
-			await WriteStream(stream, "user1", "pa$$1");
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				await TransStart(stream, "user1", "pa$$1");
-			}
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart(stream, "adm", "admpa$$")).TransactionId;
-				var trans = Connection.ContinueTransaction(transId, new UserCredentials("user1", "pa$$1"));
-				await trans.WriteAsync();
-				await trans.CommitAsync();
-			}
-
-			await ReadMeta(stream, "user1", "pa$$1");
-			await WriteMeta(stream, "user1", "pa$$1", null);
-
-			await SubscribeToStream(stream, "user1", "pa$$1");
-
-			await DeleteStream(stream, "user1", "pa$$1");
-		}
-
-		[Test]
-		public async Task operations_on_user_stream_fail_for_not_authorized_user() {
-			const string stream = "user-not-authorized";
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent(stream, "user2", "pa$$2"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward(stream, "user2", "pa$$2"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward(stream, "user2", "pa$$2"));
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream(stream, "user2", "pa$$2"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => TransStart(stream, "user2", "pa$$2"));
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart(stream, "adm", "admpa$$")).TransactionId;
-				var trans = Connection.ContinueTransaction(transId, new UserCredentials("user2", "pa$$2"));
-				await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.WriteAsync());
-				await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.CommitAsync());
-			}
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta(stream, "user2", "pa$$2"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta(stream, "user2", "pa$$2", null));
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream(stream, "user2", "pa$$2"));
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(stream, "user2", "pa$$2"));
-		}
-
-		[Test]
-		public async Task operations_on_user_stream_fail_for_anonymous_user() {
-			const string stream = "user-anonymous-user";
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent(stream, null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward(stream, null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward(stream, null, null));
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream(stream, null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => TransStart(stream, null, null));
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart(stream, "adm", "admpa$$")).TransactionId;
-				var trans = Connection.ContinueTransaction(transId);
-				await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.WriteAsync());
-				await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.CommitAsync());
-			}
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta(stream, null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta(stream, null, null, null));
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream(stream, null, null));
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(stream, null, null));
-		}
-
-		[Test]
-		public async Task operations_on_user_stream_succeed_for_admin() {
-			const string stream = "user-admin";
-			await ReadEvent(stream, "adm", "admpa$$");
-			await ReadStreamForward(stream, "adm", "admpa$$");
-			await ReadStreamBackward(stream, "adm", "admpa$$");
-
-			await WriteStream(stream, "adm", "admpa$$");
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				await TransStart(stream, "adm", "admpa$$");
-			}
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart(stream, "adm", "admpa$$")).TransactionId;
-				var trans = Connection.ContinueTransaction(transId, new UserCredentials("adm", "admpa$$"));
-				await trans.WriteAsync();
-				await trans.CommitAsync();
-			}
-
-			await ReadMeta(stream, "adm", "admpa$$");
-			await WriteMeta(stream, "adm", "admpa$$", null);
-
-			await SubscribeToStream(stream, "adm", "admpa$$");
-
-			await DeleteStream(stream, "adm", "admpa$$");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Security/read_all_security.cs b/src/EventStore.Core.Tests/ClientAPI/Security/read_all_security.cs
deleted file mode 100644
index 0d0330004b9..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Security/read_all_security.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.ClientAPI.Exceptions;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.Security {
-	[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_all_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
-		[Test]
-		public async Task reading_all_with_not_existing_credentials_is_not_authenticated() {
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadAllForward("badlogin", "badpass"));
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadAllBackward("badlogin", "badpass"));
-		}
-
-		[Test]
-		public async Task reading_all_with_no_credentials_is_denied() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadAllForward(null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadAllBackward(null, null));
-		}
-
-		[Test]
-		public async Task reading_all_with_not_authorized_user_credentials_is_denied() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadAllForward("user2", "pa$$2"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadAllBackward("user2", "pa$$2"));
-		}
-
-		[Test]
-		public async Task reading_all_with_authorized_user_credentials_succeeds() {
-			await ReadAllForward("user1", "pa$$1");
-			await ReadAllBackward("user1", "pa$$1");
-		}
-
-		[Test]
-		public async Task reading_all_with_admin_credentials_succeeds() {
-			await ReadAllForward("adm", "admpa$$");
-			await ReadAllBackward("adm", "admpa$$");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Security/read_stream_meta_security.cs b/src/EventStore.Core.Tests/ClientAPI/Security/read_stream_meta_security.cs
deleted file mode 100644
index 01b58a80f13..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Security/read_stream_meta_security.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.ClientAPI.Exceptions;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.Security {
-	[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_stream_meta_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
-		[Test]
-		public async Task reading_stream_meta_with_not_existing_credentials_is_not_authenticated() {
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadMeta("metaread-stream", "badlogin", "badpass"));
-		}
-
-		[Test]
-		public async Task reading_stream_meta_with_no_credentials_is_denied() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta("metaread-stream", null, null));
-		}
-
-		[Test]
-		public async Task reading_stream_meta_with_not_authorized_user_credentials_is_denied() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta("metaread-stream", "user2", "pa$$2"));
-		}
-
-		[Test]
-		public async Task reading_stream_meta_with_authorized_user_credentials_succeeds() {
-			await ReadMeta("metaread-stream", "user1", "pa$$1");
-		}
-
-		[Test]
-		public async Task reading_stream_meta_with_admin_user_credentials_succeeds() {
-			await ReadMeta("metaread-stream", "adm", "admpa$$");
-		}
-
-
-		[Test]
-		public async Task reading_no_acl_stream_meta_succeeds_when_no_credentials_are_passed() {
-			await ReadMeta("noacl-stream", null, null);
-		}
-
-		[Test]
-		public async Task reading_no_acl_stream_meta_is_not_authenticated_when_not_existing_credentials_are_passed() {
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadMeta("noacl-stream", "badlogin", "badpass"));
-		}
-
-		[Test]
-		public async Task reading_no_acl_stream_meta_succeeds_when_any_existing_user_credentials_are_passed() {
-			await ReadMeta("noacl-stream", "user1", "pa$$1");
-			await ReadMeta("noacl-stream", "user2", "pa$$2");
-		}
-
-		[Test]
-		public async Task reading_no_acl_stream_meta_succeeds_when_admin_user_credentials_are_passed() {
-			await ReadMeta("noacl-stream", "adm", "admpa$$");
-		}
-
-
-		[Test]
-		public async Task reading_all_access_normal_stream_meta_succeeds_when_no_credentials_are_passed() {
-			await ReadMeta("normal-all", null, null);
-		}
-
-		[Test]
-		public async Task
-			reading_all_access_normal_stream_meta_is_not_authenticated_when_not_existing_credentials_are_passed() {
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadMeta("normal-all", "badlogin", "badpass"));
-		}
-
-		[Test]
-		public async Task reading_all_access_normal_stream_meta_succeeds_when_any_existing_user_credentials_are_passed() {
-			await ReadMeta("normal-all", "user1", "pa$$1");
-			await ReadMeta("normal-all", "user2", "pa$$2");
-		}
-
-		[Test]
-		public async Task reading_all_access_normal_stream_meta_succeeds_when_admin_user_credentials_are_passed() {
-			await ReadMeta("normal-all", "adm", "admpa$$");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Security/read_stream_security.cs b/src/EventStore.Core.Tests/ClientAPI/Security/read_stream_security.cs
deleted file mode 100644
index ccd74ace09b..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Security/read_stream_security.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.ClientAPI.Exceptions;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.Security {
-	[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_stream_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
-		[Test]
-		public async Task reading_stream_with_not_existing_credentials_is_not_authenticated() {
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadEvent("read-stream", "badlogin", "badpass"));
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadStreamForward("read-stream", "badlogin", "badpass"));
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadStreamBackward("read-stream", "badlogin", "badpass"));
-		}
-
-		[Test]
-		public async Task reading_stream_with_no_credentials_is_denied() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("read-stream", null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward("read-stream", null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward("read-stream", null, null));
-		}
-
-		[Test]
-		public async Task reading_stream_with_not_authorized_user_credentials_is_denied() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("read-stream", "user2", "pa$$2"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward("read-stream", "user2", "pa$$2"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward("read-stream", "user2", "pa$$2"));
-		}
-
-		[Test]
-		public async Task reading_stream_with_authorized_user_credentials_succeeds() {
-			await ReadEvent("read-stream", "user1", "pa$$1");
-			await ReadStreamForward("read-stream", "user1", "pa$$1");
-			await ReadStreamBackward("read-stream", "user1", "pa$$1");
-		}
-
-		[Test]
-		public async Task reading_stream_with_admin_user_credentials_succeeds() {
-			await ReadEvent("read-stream", "adm", "admpa$$");
-			await ReadStreamForward("read-stream", "adm", "admpa$$");
-			await ReadStreamBackward("read-stream", "adm", "admpa$$");
-		}
-
-
-		[Test]
-		public async Task reading_no_acl_stream_succeeds_when_no_credentials_are_passed() {
-			await ReadEvent("noacl-stream", null, null);
-			await ReadStreamForward("noacl-stream", null, null);
-			await ReadStreamBackward("noacl-stream", null, null);
-		}
-
-		[Test]
-		public async Task reading_no_acl_stream_is_not_authenticated_when_not_existing_credentials_are_passed() {
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadEvent("noacl-stream", "badlogin", "badpass"));
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadStreamForward("noacl-stream", "badlogin", "badpass"));
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadStreamBackward("noacl-stream", "badlogin", "badpass"));
-		}
-
-		[Test]
-		public async Task reading_no_acl_stream_succeeds_when_any_existing_user_credentials_are_passed() {
-			await ReadEvent("noacl-stream", "user1", "pa$$1");
-			await ReadStreamForward("noacl-stream", "user1", "pa$$1");
-			await ReadStreamBackward("noacl-stream", "user1", "pa$$1");
-			await ReadEvent("noacl-stream", "user2", "pa$$2");
-			await ReadStreamForward("noacl-stream", "user2", "pa$$2");
-			await ReadStreamBackward("noacl-stream", "user2", "pa$$2");
-		}
-
-		[Test]
-		public async Task reading_no_acl_stream_succeeds_when_admin_user_credentials_are_passed() {
-			await ReadEvent("noacl-stream", "adm", "admpa$$");
-			await ReadStreamForward("noacl-stream", "adm", "admpa$$");
-			await ReadStreamBackward("noacl-stream", "adm", "admpa$$");
-		}
-
-
-		[Test]
-		public async Task reading_all_access_normal_stream_succeeds_when_no_credentials_are_passed() {
-			await ReadEvent("normal-all", null, null);
-			await ReadStreamForward("normal-all", null, null);
-			await ReadStreamBackward("normal-all", null, null);
-		}
-
-		[Test]
-		public async Task reading_all_access_normal_stream_is_not_authenticated_when_not_existing_credentials_are_passed() {
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadEvent("normal-all", "badlogin", "badpass"));
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadStreamForward("normal-all", "badlogin", "badpass"));
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadStreamBackward("normal-all", "badlogin", "badpass"));
-		}
-
-		[Test]
-		public async Task reading_all_access_normal_stream_succeeds_when_any_existing_user_credentials_are_passed() {
-			await ReadEvent("normal-all", "user1", "pa$$1");
-			await ReadStreamForward("normal-all", "user1", "pa$$1");
-			await ReadStreamBackward("normal-all", "user1", "pa$$1");
-			await ReadEvent("normal-all", "user2", "pa$$2");
-			await ReadStreamForward("normal-all", "user2", "pa$$2");
-			await ReadStreamBackward("normal-all", "user2", "pa$$2");
-		}
-
-		[Test]
-		public async Task reading_all_access_normal_stream_succeeds_when_admin_user_credentials_are_passed() {
-			await ReadEvent("normal-all", "adm", "admpa$$");
-			await ReadStreamForward("normal-all", "adm", "admpa$$");
-			await ReadStreamBackward("normal-all", "adm", "admpa$$");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Security/stream_security_inheritance.cs b/src/EventStore.Core.Tests/ClientAPI/Security/stream_security_inheritance.cs
deleted file mode 100644
index 6c9f200605e..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Security/stream_security_inheritance.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Services;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.Security {
-	[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class stream_security_inheritance<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var settings = new SystemSettings(userStreamAcl: new StreamAcl(null, "user1", null, null, null),
-				systemStreamAcl: new StreamAcl(null, "user1", null, null, null));
-			await Connection.SetSystemSettingsAsync(settings, new UserCredentials("adm", "admpa$$"));
-
-			await Connection.SetStreamMetadataAsync("user-no-acl", ExpectedVersion.NoStream,
-				StreamMetadata.Build(), new UserCredentials("adm", "admpa$$"));
-			await Connection.SetStreamMetadataAsync("user-w-diff", ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetWriteRole("user2"), new UserCredentials("adm", "admpa$$"));
-			await Connection.SetStreamMetadataAsync("user-w-multiple", ExpectedVersion.NoStream,
-					StreamMetadata.Build().SetWriteRoles(new[] { "user1", "user2" }),
-					new UserCredentials("adm", "admpa$$"))
-				;
-			await Connection.SetStreamMetadataAsync("user-w-restricted", ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetWriteRoles(new string[0]), new UserCredentials("adm", "admpa$$"));
-			await Connection.SetStreamMetadataAsync("user-w-all", ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetWriteRole(SystemRoles.All), new UserCredentials("adm", "admpa$$"));
-
-			await Connection.SetStreamMetadataAsync("user-r-restricted", ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetReadRole("user1"), new UserCredentials("adm", "admpa$$"));
-
-			await Connection.SetStreamMetadataAsync("$sys-no-acl", ExpectedVersion.NoStream,
-				StreamMetadata.Build(), new UserCredentials("adm", "admpa$$"));
-			await Connection.SetStreamMetadataAsync("$sys-w-diff", ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetWriteRole("user2"), new UserCredentials("adm", "admpa$$"));
-			await Connection.SetStreamMetadataAsync("$sys-w-multiple", ExpectedVersion.NoStream,
-					StreamMetadata.Build().SetWriteRoles(new[] { "user1", "user2" }),
-					new UserCredentials("adm", "admpa$$"))
-				;
-			await Connection.SetStreamMetadataAsync("$sys-w-restricted", ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetWriteRoles(new string[0]), new UserCredentials("adm", "admpa$$"));
-			await Connection.SetStreamMetadataAsync("$sys-w-all", ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetWriteRole(SystemRoles.All), new UserCredentials("adm", "admpa$$"));
-		}
-
-		[Test]
-		public async Task acl_inheritance_is_working_properly_on_user_streams() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("user-no-acl", null, null));
-			await WriteStream("user-no-acl", "user1", "pa$$1");
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("user-no-acl", "user2", "pa$$2"));
-			await WriteStream("user-no-acl", "adm", "admpa$$");
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("user-w-diff", null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("user-w-diff", "user1", "pa$$1"));
-			await WriteStream("user-w-diff", "user2", "pa$$2");
-			await WriteStream("user-w-diff", "adm", "admpa$$");
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("user-w-multiple", null, null));
-			await WriteStream("user-w-multiple", "user1", "pa$$1");
-			await WriteStream("user-w-multiple", "user2", "pa$$2");
-			await WriteStream("user-w-multiple", "adm", "admpa$$");
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("user-w-restricted", null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("user-w-restricted", "user1", "pa$$1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("user-w-restricted", "user2", "pa$$2"));
-			await WriteStream("user-w-restricted", "adm", "admpa$$");
-
-			await WriteStream("user-w-all", null, null);
-			await WriteStream("user-w-all", "user1", "pa$$1");
-			await WriteStream("user-w-all", "user2", "pa$$2");
-			await WriteStream("user-w-all", "adm", "admpa$$");
-
-
-			await ReadEvent("user-no-acl", null, null);
-			await ReadEvent("user-no-acl", "user1", "pa$$1");
-			await ReadEvent("user-no-acl", "user2", "pa$$2");
-			await ReadEvent("user-no-acl", "adm", "admpa$$");
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("user-r-restricted", null, null));
-			await ReadEvent("user-r-restricted", "user1", "pa$$1");
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("user-r-restricted", "user2", "pa$$2"));
-			await ReadEvent("user-r-restricted", "adm", "admpa$$");
-		}
-
-		[Test]
-		public async Task acl_inheritance_is_working_properly_on_system_streams() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$sys-no-acl", null, null));
-			await WriteStream("$sys-no-acl", "user1", "pa$$1");
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$sys-no-acl", "user2", "pa$$2"));
-			await WriteStream("$sys-no-acl", "adm", "admpa$$");
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$sys-w-diff", null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$sys-w-diff", "user1", "pa$$1"));
-			await WriteStream("$sys-w-diff", "user2", "pa$$2");
-			await WriteStream("$sys-w-diff", "adm", "admpa$$");
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$sys-w-multiple", null, null));
-			await WriteStream("$sys-w-multiple", "user1", "pa$$1");
-			await WriteStream("$sys-w-multiple", "user2", "pa$$2");
-			await WriteStream("$sys-w-multiple", "adm", "admpa$$");
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$sys-w-restricted", null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$sys-w-restricted", "user1", "pa$$1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$sys-w-restricted", "user2", "pa$$2"));
-			await WriteStream("$sys-w-restricted", "adm", "admpa$$");
-
-			await WriteStream("$sys-w-all", null, null);
-			await WriteStream("$sys-w-all", "user1", "pa$$1");
-			await WriteStream("$sys-w-all", "user2", "pa$$2");
-			await WriteStream("$sys-w-all", "adm", "admpa$$");
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("$sys-no-acl", null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("$sys-no-acl", "user1", "pa$$1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("$sys-no-acl", "user2", "pa$$2"));
-			await ReadEvent("$sys-no-acl", "adm", "admpa$$");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Security/subscribe_to_all_security.cs b/src/EventStore.Core.Tests/ClientAPI/Security/subscribe_to_all_security.cs
deleted file mode 100644
index aee2d534c36..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Security/subscribe_to_all_security.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.ClientAPI.Exceptions;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.Security {
-	[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class subscribe_to_all_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
-		[Test]
-		public async Task subscribing_to_all_with_not_existing_credentials_is_not_authenticated() {
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => SubscribeToAll("badlogin", "badpass"));
-		}
-
-		[Test]
-		public async Task subscribing_to_all_with_no_credentials_is_denied() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToAll(null, null));
-		}
-
-		[Test]
-		public async Task subscribing_to_all_with_not_authorized_user_credentials_is_denied() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToAll("user2", "pa$$2"));
-		}
-
-		[Test]
-		public async Task subscribing_to_all_with_authorized_user_credentials_succeeds() {
-			await SubscribeToAll("user1", "pa$$1");
-		}
-
-		[Test]
-		public async Task subscribing_to_all_with_admin_user_credentials_succeeds() {
-			await SubscribeToAll("adm", "admpa$$");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Security/subscribe_to_stream_security.cs b/src/EventStore.Core.Tests/ClientAPI/Security/subscribe_to_stream_security.cs
deleted file mode 100644
index f95b1c05b4d..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Security/subscribe_to_stream_security.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.ClientAPI.Exceptions;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.Security {
-	[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class subscribe_to_stream_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
-		[Test]
-		public async Task subscribing_to_stream_with_not_existing_credentials_is_not_authenticated() {
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => SubscribeToStream("read-stream", "badlogin", "badpass"));
-		}
-
-		[Test]
-		public async Task subscribing_to_stream_with_no_credentials_is_denied() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream("read-stream", null, null));
-		}
-
-		[Test]
-		public async Task subscribing_to_stream_with_not_authorized_user_credentials_is_denied() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream("read-stream", "user2", "pa$$2"));
-		}
-
-		[Test]
-		public async Task reading_stream_with_authorized_user_credentials_succeeds() {
-			await SubscribeToStream("read-stream", "user1", "pa$$1");
-		}
-
-		[Test]
-		public async Task reading_stream_with_admin_user_credentials_succeeds() {
-			await SubscribeToStream("read-stream", "adm", "admpa$$");
-		}
-
-
-		[Test]
-		public async Task subscribing_to_no_acl_stream_succeeds_when_no_credentials_are_passed() {
-			await SubscribeToStream("noacl-stream", null, null);
-		}
-
-		[Test]
-		public async Task subscribing_to_no_acl_stream_is_not_authenticated_when_not_existing_credentials_are_passed() {
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => SubscribeToStream("noacl-stream", "badlogin", "badpass"));
-		}
-
-		[Test]
-		public async Task subscribing_to_no_acl_stream_succeeds_when_any_existing_user_credentials_are_passed() {
-			await SubscribeToStream("noacl-stream", "user1", "pa$$1");
-			await SubscribeToStream("noacl-stream", "user2", "pa$$2");
-		}
-
-		[Test]
-		public async Task subscribing_to_no_acl_stream_succeeds_when_admin_user_credentials_are_passed() {
-			await SubscribeToStream("noacl-stream", "adm", "admpa$$");
-		}
-
-
-		[Test]
-		public async Task subscribing_to_all_access_normal_stream_succeeds_when_no_credentials_are_passed() {
-			await SubscribeToStream("normal-all", null, null);
-		}
-
-		[Test]
-		public async Task
-			subscribing_to_all_access_normal_stream_is_not_authenticated_when_not_existing_credentials_are_passed() {
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => SubscribeToStream("normal-all", "badlogin", "badpass"));
-		}
-
-		[Test]
-		public async Task subscribing_to_all_access_normal_stream_succeeds_when_any_existing_user_credentials_are_passed() {
-			await SubscribeToStream("normal-all", "user1", "pa$$1");
-			await SubscribeToStream("normal-all", "user2", "pa$$2");
-		}
-
-		[Test]
-		public async Task subscribing_to_all_access_normal_streamm_succeeds_when_admin_user_credentials_are_passed() {
-			await SubscribeToStream("normal-all", "adm", "admpa$$");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Security/system_stream_security.cs b/src/EventStore.Core.Tests/ClientAPI/Security/system_stream_security.cs
deleted file mode 100644
index 0699ae703c3..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Security/system_stream_security.cs
+++ /dev/null
@@ -1,255 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Services;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.Security {
-	[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class system_stream_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
-		[Test]
-		public async Task operations_on_system_stream_with_no_acl_set_fail_for_non_admin() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("$system-no-acl", "user1", "pa$$1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward("$system-no-acl", "user1", "pa$$1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward("$system-no-acl", "user1", "pa$$1"));
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$system-no-acl", "user1", "pa$$1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => TransStart("$system-no-acl", "user1", "pa$$1"));
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart("$system-no-acl", "adm", "admpa$$")).TransactionId;
-				var trans = Connection.ContinueTransaction(transId, new UserCredentials("user1", "pa$$1"));
-				await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.WriteAsync());
-				await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.CommitAsync());
-			}
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta("$system-no-acl", "user1", "pa$$1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta("$system-no-acl", "user1", "pa$$1", null));
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream("$system-no-acl", "user1", "pa$$1"));
-		}
-
-		[Test]
-		public async Task operations_on_system_stream_with_no_acl_set_succeed_for_admin() {
-			await ReadEvent("$system-no-acl", "adm", "admpa$$");
-			await ReadStreamForward("$system-no-acl", "adm", "admpa$$");
-			await ReadStreamBackward("$system-no-acl", "adm", "admpa$$");
-
-			await WriteStream("$system-no-acl", "adm", "admpa$$");
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				await TransStart("$system-no-acl", "adm", "admpa$$");
-			}
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart("$system-no-acl", "adm", "admpa$$")).TransactionId;
-				var trans = Connection.ContinueTransaction(transId, new UserCredentials("adm", "admpa$$"));
-				await trans.WriteAsync();
-				await trans.CommitAsync();
-			}
-
-			await ReadMeta("$system-no-acl", "adm", "admpa$$");
-			await WriteMeta("$system-no-acl", "adm", "admpa$$", null);
-
-			await SubscribeToStream("$system-no-acl", "adm", "admpa$$");
-		}
-
-		[Test]
-		public async Task operations_on_system_stream_with_acl_set_to_usual_user_fail_for_not_authorized_user() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("$system-acl", "user2", "pa$$2"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward("$system-acl", "user2", "pa$$2"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward("$system-acl", "user2", "pa$$2"));
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$system-acl", "user2", "pa$$2"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => TransStart("$system-acl", "user2", "pa$$2"));
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart("$system-acl", "user1", "pa$$1")).TransactionId;
-				var trans = Connection.ContinueTransaction(transId, new UserCredentials("user2", "pa$$2"));
-				await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.WriteAsync());
-				await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.CommitAsync());
-			}
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta("$system-acl", "user2", "pa$$2"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta("$system-acl", "user2", "pa$$2", "user1"));
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream("$system-acl", "user2", "pa$$2"));
-		}
-
-		[Test]
-		public async Task operations_on_system_stream_with_acl_set_to_usual_user_succeed_for_that_user() {
-			await ReadEvent("$system-acl", "user1", "pa$$1");
-			await ReadStreamForward("$system-acl", "user1", "pa$$1");
-			await ReadStreamBackward("$system-acl", "user1", "pa$$1");
-
-			await WriteStream("$system-acl", "user1", "pa$$1");
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				await TransStart("$system-acl", "user1", "pa$$1");
-			}
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart("$system-acl", "adm", "admpa$$")).TransactionId;
-				var trans = Connection.ContinueTransaction(transId, new UserCredentials("user1", "pa$$1"));
-				await trans.WriteAsync();
-				await trans.CommitAsync();
-			}
-
-			await ReadMeta("$system-acl", "user1", "pa$$1");
-			await WriteMeta("$system-acl", "user1", "pa$$1", "user1");
-
-			await SubscribeToStream("$system-acl", "user1", "pa$$1");
-		}
-
-		[Test]
-		public async Task operations_on_system_stream_with_acl_set_to_usual_user_succeed_for_admin() {
-			await ReadEvent("$system-acl", "adm", "admpa$$");
-			await ReadStreamForward("$system-acl", "adm", "admpa$$");
-			await ReadStreamBackward("$system-acl", "adm", "admpa$$");
-
-			await WriteStream("$system-acl", "adm", "admpa$$");
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				await TransStart("$system-acl", "adm", "admpa$$");
-			}
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart("$system-acl", "user1", "pa$$1")).TransactionId;
-				var trans = Connection.ContinueTransaction(transId, new UserCredentials("adm", "admpa$$"));
-				await trans.WriteAsync();
-				await trans.CommitAsync();
-			}
-
-			await ReadMeta("$system-acl", "adm", "admpa$$");
-			await WriteMeta("$system-acl", "adm", "admpa$$", "user1");
-
-			await SubscribeToStream("$system-acl", "adm", "admpa$$");
-		}
-
-
-		[Test]
-		public async Task operations_on_system_stream_with_acl_set_to_admins_fail_for_usual_user() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("$system-adm", "user1", "pa$$1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward("$system-adm", "user1", "pa$$1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward("$system-adm", "user1", "pa$$1"));
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$system-adm", "user1", "pa$$1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => TransStart("$system-adm", "user1", "pa$$1"));
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart("$system-adm", "adm", "admpa$$")).TransactionId;
-				var trans = Connection.ContinueTransaction(transId, new UserCredentials("user1", "pa$$1"));
-				await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.WriteAsync());
-				await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.CommitAsync());
-			}
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta("$system-adm", "user1", "pa$$1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta("$system-adm", "user1", "pa$$1", SystemRoles.Admins));
-
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream("$system-adm", "user1", "pa$$1"));
-		}
-
-		[Test]
-		public async Task operations_on_system_stream_with_acl_set_to_admins_succeed_for_admin() {
-			await ReadEvent("$system-adm", "adm", "admpa$$");
-			await ReadStreamForward("$system-adm", "adm", "admpa$$");
-			await ReadStreamBackward("$system-adm", "adm", "admpa$$");
-
-			await WriteStream("$system-adm", "adm", "admpa$$");
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				await TransStart("$system-adm", "adm", "admpa$$");
-			}
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart("$system-adm", "adm", "admpa$$")).TransactionId;
-				var trans = Connection.ContinueTransaction(transId, new UserCredentials("adm", "admpa$$"));
-				await trans.WriteAsync();
-				await trans.CommitAsync();
-			}
-
-			await ReadMeta("$system-adm", "adm", "admpa$$");
-			await WriteMeta("$system-adm", "adm", "admpa$$", SystemRoles.Admins);
-
-			await SubscribeToStream("$system-adm", "adm", "admpa$$");
-		}
-
-
-		[Test]
-		public async Task operations_on_system_stream_with_acl_set_to_all_succeed_for_not_authenticated_user() {
-			await ReadEvent("$system-all", null, null);
-			await ReadStreamForward("$system-all", null, null);
-			await ReadStreamBackward("$system-all", null, null);
-
-			await WriteStream("$system-all", null, null);
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				await TransStart("$system-all", null, null);
-			}
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart("$system-all", null, null)).TransactionId;
-				var trans = Connection.ContinueTransaction(transId);
-				await trans.WriteAsync();
-				await trans.CommitAsync();
-			}
-
-			await ReadMeta("$system-all", null, null);
-			await WriteMeta("$system-all", null, null, SystemRoles.All);
-
-			await SubscribeToStream("$system-all", null, null);
-		}
-
-		[Test]
-		public async Task operations_on_system_stream_with_acl_set_to_all_succeed_for_usual_user() {
-			await ReadEvent("$system-all", "user1", "pa$$1");
-			await ReadStreamForward("$system-all", "user1", "pa$$1");
-			await ReadStreamBackward("$system-all", "user1", "pa$$1");
-
-			await WriteStream("$system-all", "user1", "pa$$1");
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				await TransStart("$system-all", "user1", "pa$$1");
-			}
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart("$system-all", "user1", "pa$$1")).TransactionId;
-				var trans = Connection.ContinueTransaction(transId, new UserCredentials("user1", "pa$$1"));
-				await trans.WriteAsync();
-				await trans.CommitAsync();
-			}
-
-			await ReadMeta("$system-all", "user1", "pa$$1");
-			await WriteMeta("$system-all", "user1", "pa$$1", SystemRoles.All);
-
-			await SubscribeToStream("$system-all", "user1", "pa$$1");
-		}
-
-		[Test]
-		public async Task operations_on_system_stream_with_acl_set_to_all_succeed_for_admin() {
-			await ReadEvent("$system-all", "adm", "admpa$$");
-			await ReadStreamForward("$system-all", "adm", "admpa$$");
-			await ReadStreamBackward("$system-all", "adm", "admpa$$");
-
-			await WriteStream("$system-all", "adm", "admpa$$");
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				await TransStart("$system-all", "adm", "admpa$$");
-			}
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-				var transId = (await TransStart("$system-all", "adm", "admpa$$")).TransactionId;
-				var trans = Connection.ContinueTransaction(transId, new UserCredentials("adm", "admpa$$"));
-				await trans.WriteAsync();
-				await trans.CommitAsync();
-			}
-
-			await ReadMeta("$system-all", "adm", "admpa$$");
-			await WriteMeta("$system-all", "adm", "admpa$$", SystemRoles.All);
-
-			await SubscribeToStream("$system-all", "adm", "admpa$$");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Security/transactional_write_stream_security.cs b/src/EventStore.Core.Tests/ClientAPI/Security/transactional_write_stream_security.cs
deleted file mode 100644
index c8dc0226cce..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Security/transactional_write_stream_security.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.ClientAPI.SystemData;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.Security {
-	[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class transactional_write_stream_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
-		[Test]
-		public async Task starting_transaction_with_not_existing_credentials_is_not_authenticated() {
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => TransStart("write-stream", "badlogin", "badpass"));
-		}
-
-		[Test]
-		public async Task starting_transaction_to_stream_with_no_credentials_is_denied() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => TransStart("write-stream", null, null));
-		}
-
-		[Test]
-		public async Task starting_transaction_to_stream_with_not_authorized_user_credentials_is_denied() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => TransStart("write-stream", "user2", "pa$$2"));
-		}
-
-		[Test]
-		public async Task starting_transaction_to_stream_with_authorized_user_credentials_succeeds() {
-			await TransStart("write-stream", "user1", "pa$$1");
-		}
-
-		[Test]
-		public async Task starting_transaction_to_stream_with_admin_user_credentials_succeeds() {
-			await TransStart("write-stream", "adm", "admpa$$");
-		}
-
-
-		[Test]
-		public async Task committing_transaction_with_not_existing_credentials_is_not_authenticated() {
-			var t1 = await TransStart("write-stream", "user1", "pa$$1");
-			await t1.WriteAsync(CreateEvents());
-			var t2 = Connection.ContinueTransaction(t1.TransactionId, new UserCredentials("badlogin", "badpass"));
-			
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => t2.CommitAsync());
-		}
-
-		[Test]
-		public async Task committing_transaction_to_stream_with_no_credentials_is_denied() {
-			var t1 = await TransStart("write-stream", "user1", "pa$$1");
-			await t1.WriteAsync();
-			var t2 = Connection.ContinueTransaction(t1.TransactionId);
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => t2.CommitAsync());
-		}
-
-		[Test]
-		public async Task committing_transaction_to_stream_with_not_authorized_user_credentials_is_denied() {
-			var t1 = await TransStart("write-stream", "user1", "pa$$1");
-			await t1.WriteAsync();
-			var t2 = Connection.ContinueTransaction(t1.TransactionId, new UserCredentials("user2", "pa$$2"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => t2.CommitAsync());
-		}
-
-		[Test]
-		public async Task committing_transaction_to_stream_with_authorized_user_credentials_succeeds() {
-			var transId = (await TransStart("write-stream", "user1", "pa$$1")).TransactionId;
-			var t2 = Connection.ContinueTransaction(transId, new UserCredentials("user1", "pa$$1"));
-			await t2.WriteAsync();
-			await t2.CommitAsync();
-		}
-
-		[Test]
-		public async Task committing_transaction_to_stream_with_admin_user_credentials_succeeds() {
-			var transId = (await TransStart("write-stream", "user1", "pa$$1")).TransactionId;
-			var t2 = Connection.ContinueTransaction(transId, new UserCredentials("adm", "admpa$$"));
-			await t2.WriteAsync();
-			await t2.CommitAsync();
-		}
-
-
-		[Test]
-		public void transaction_to_no_acl_stream_succeeds_when_no_credentials_are_passed() {
-			ExpectNoException(async () => {
-				var t = await TransStart("noacl-stream", null, null);
-				await t.WriteAsync(CreateEvents());
-				await t.CommitAsync();
-			});
-		}
-
-		[Test]
-		public async Task transaction_to_no_acl_stream_is_not_authenticated_when_not_existing_credentials_are_passed() {
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => TransStart("noacl-stream", "badlogin", "badpass"));
-		}
-
-		[Test]
-		public void transaction_to_no_acl_stream_succeeds_when_any_existing_user_credentials_are_passed() {
-			ExpectNoException(async () => {
-				var t = await TransStart("noacl-stream", "user1", "pa$$1");
-				await t.WriteAsync(CreateEvents());
-				await t.CommitAsync();
-			});
-			ExpectNoException(async () => {
-				var t = await TransStart("noacl-stream", "user2", "pa$$2");
-				await t.WriteAsync(CreateEvents());
-				await t.CommitAsync();
-			});
-		}
-
-		[Test]
-		public void transaction_to_no_acl_stream_succeeds_when_admin_user_credentials_are_passed() {
-			ExpectNoException(async () => {
-				var t = await TransStart("noacl-stream", "adm", "admpa$$");
-				await t.WriteAsync(CreateEvents());
-				await t.CommitAsync();
-			});
-		}
-
-
-		[Test]
-		public void transaction_to_all_access_normal_stream_succeeds_when_no_credentials_are_passed() {
-			ExpectNoException(async () => {
-				var t = await TransStart("normal-all", null, null);
-				await t.WriteAsync(CreateEvents());
-				await t.CommitAsync();
-			});
-		}
-
-		[Test]
-		public async Task
-			transaction_to_all_access_normal_stream_is_not_authenticated_when_not_existing_credentials_are_passed() {
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => TransStart("normal-all", "badlogin", "badpass"));
-		}
-
-		[Test]
-		public void transaction_to_all_access_normal_stream_succeeds_when_any_existing_user_credentials_are_passed() {
-			ExpectNoException(async () => {
-				var t = await TransStart("normal-all", "user1", "pa$$1");
-				await t.WriteAsync(CreateEvents());
-				await t.CommitAsync();
-			});
-			ExpectNoException(async () => {
-				var t = await TransStart("normal-all", "user2", "pa$$2");
-				await t.WriteAsync(CreateEvents());
-				await t.CommitAsync();
-			});
-		}
-
-		[Test]
-		public void transaction_to_all_access_normal_stream_succeeds_when_admin_user_credentials_are_passed() {
-			ExpectNoException(async () => {
-				var t = await TransStart("normal-all", "adm", "admpa$$");
-				await t.WriteAsync(CreateEvents());
-				await t.CommitAsync();
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Security/write_stream_meta_security.cs b/src/EventStore.Core.Tests/ClientAPI/Security/write_stream_meta_security.cs
deleted file mode 100644
index 95da912b62a..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Security/write_stream_meta_security.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.Core.Services;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.Security {
-	[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class write_stream_meta_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
-		[Test]
-		public async Task writing_meta_with_not_existing_credentials_is_not_authenticated() {
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => WriteMeta("metawrite-stream", "badlogin", "badpass", "user1"));
-		}
-
-		[Test]
-		public async Task writing_meta_to_stream_with_no_credentials_is_denied() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta("metawrite-stream", null, null, "user1"));
-		}
-
-		[Test]
-		public async Task writing_meta_to_stream_with_not_authorized_user_credentials_is_denied() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta("metawrite-stream", "user2", "pa$$2", "user1"));
-		}
-
-		[Test]
-		public async Task writing_meta_to_stream_with_authorized_user_credentials_succeeds() {
-			await WriteMeta("metawrite-stream", "user1", "pa$$1", "user1");
-		}
-
-		[Test]
-		public async Task writing_meta_to_stream_with_admin_user_credentials_succeeds() {
-			await WriteMeta("metawrite-stream", "adm", "admpa$$", "user1");
-		}
-
-
-		[Test]
-		public async Task writing_meta_to_no_acl_stream_succeeds_when_no_credentials_are_passed() {
-			await WriteMeta("noacl-stream", null, null, null);
-		}
-
-		[Test]
-		public async Task writing_meta_to_no_acl_stream_is_not_authenticated_when_not_existing_credentials_are_passed() {
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => WriteMeta("noacl-stream", "badlogin", "badpass", null));
-		}
-
-		[Test]
-		public async Task writing_meta_to_no_acl_stream_succeeds_when_any_existing_user_credentials_are_passed() {
-			await WriteMeta("noacl-stream", "user1", "pa$$1", null);
-			await WriteMeta("noacl-stream", "user2", "pa$$2", null);
-		}
-
-		[Test]
-		public async Task writing_meta_to_no_acl_stream_succeeds_when_admin_user_credentials_are_passed() {
-			await WriteMeta("noacl-stream", "adm", "admpa$$", null);
-		}
-
-
-		[Test]
-		public async Task writing_meta_to_all_access_normal_stream_succeeds_when_no_credentials_are_passed() {
-			await WriteMeta("normal-all", null, null, SystemRoles.All);
-		}
-
-		[Test]
-		public async Task
-			writing_meta_to_all_access_normal_stream_is_not_authenticated_when_not_existing_credentials_are_passed() {
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => WriteMeta("normal-all", "badlogin", "badpass", SystemRoles.All));
-		}
-
-		[Test]
-		public async Task writing_meta_to_all_access_normal_stream_succeeds_when_any_existing_user_credentials_are_passed() {
-			await WriteMeta("normal-all", "user1", "pa$$1", SystemRoles.All);
-			await WriteMeta("normal-all", "user2", "pa$$2", SystemRoles.All);
-		}
-
-		[Test]
-		public async Task writing_meta_to_all_access_normal_stream_succeeds_when_admin_user_credentials_are_passed() {
-			await WriteMeta("normal-all", "adm", "admpa$$", SystemRoles.All);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/Security/write_stream_security.cs b/src/EventStore.Core.Tests/ClientAPI/Security/write_stream_security.cs
deleted file mode 100644
index cfe303f2070..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/Security/write_stream_security.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.ClientAPI.Exceptions;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.Security {
-	[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class write_stream_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
-		[Test]
-		public async Task writing_to_all_is_never_allowed() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$all", null, null));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$all", "user1", "pa$$1"));
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$all", "adm", "admpa$$"));
-		}
-
-		[Test]
-		public async Task writing_with_not_existing_credentials_is_not_authenticated() {
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => WriteStream("write-stream", "badlogin", "badpass"));
-		}
-
-		[Test]
-		public async Task writing_to_stream_with_no_credentials_is_denied() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("write-stream", null, null));
-		}
-
-		[Test]
-		public async Task writing_to_stream_with_not_authorized_user_credentials_is_denied() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("write-stream", "user2", "pa$$2"));
-		}
-
-		[Test]
-		public async Task writing_to_stream_with_authorized_user_credentials_succeeds() {
-			await WriteStream("write-stream", "user1", "pa$$1");
-		}
-
-		[Test]
-		public async Task writing_to_stream_with_admin_user_credentials_succeeds() {
-			await WriteStream("write-stream", "adm", "admpa$$");
-		}
-
-
-		[Test]
-		public async Task writing_to_no_acl_stream_succeeds_when_no_credentials_are_passed() {
-			await WriteStream("noacl-stream", null, null);
-		}
-
-		[Test]
-		public async Task writing_to_no_acl_stream_is_not_authenticated_when_not_existing_credentials_are_passed() {
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => WriteStream("noacl-stream", "badlogin", "badpass"));
-		}
-
-		[Test]
-		public async Task writing_to_no_acl_stream_succeeds_when_any_existing_user_credentials_are_passed() {
-			await WriteStream("noacl-stream", "user1", "pa$$1");
-			await WriteStream("noacl-stream", "user2", "pa$$2");
-		}
-
-		[Test]
-		public async Task writing_to_no_acl_stream_succeeds_when_any_admin_user_credentials_are_passed() {
-			await WriteStream("noacl-stream", "adm", "admpa$$");
-		}
-
-
-		[Test]
-		public async Task writing_to_all_access_normal_stream_succeeds_when_no_credentials_are_passed() {
-			await WriteStream("normal-all", null, null);
-		}
-
-		[Test]
-		public async Task
-			writing_to_all_access_normal_stream_is_not_authenticated_when_not_existing_credentials_are_passed() {
-			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => WriteStream("normal-all", "badlogin", "badpass"));
-		}
-
-		[Test]
-		public async Task writing_to_all_access_normal_stream_succeeds_when_any_existing_user_credentials_are_passed() {
-			await WriteStream("normal-all", "user1", "pa$$1");
-			await WriteStream("normal-all", "user2", "pa$$2");
-		}
-
-		[Test]
-		public async Task writing_to_all_access_normal_stream_succeeds_when_any_admin_user_credentials_are_passed() {
-			await WriteStream("normal-all", "adm", "admpa$$");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/SpecificationWithLinkToToDeletedEvents.cs b/src/EventStore.Core.Tests/ClientAPI/SpecificationWithLinkToToDeletedEvents.cs
deleted file mode 100644
index e78a01c89b5..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/SpecificationWithLinkToToDeletedEvents.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Common;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Messages;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	public abstract class SpecificationWithLinkToToDeletedEvents<TLogFormat, TStreamId>
-		: SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		protected string LinkedStreamName;
-		protected string DeletedStreamName;
-
-		protected override async Task Given() {
-			var creds = DefaultData.AdminCredentials;
-			LinkedStreamName = Guid.NewGuid().ToString();
-			DeletedStreamName = Guid.NewGuid().ToString();
-			await _conn.AppendToStreamAsync(DeletedStreamName, ExpectedVersion.Any, creds,
-					new EventData(Guid.NewGuid(), "testing", true, Encoding.UTF8.GetBytes("{'foo' : 4}"), new byte[0]));
-			await _conn.AppendToStreamAsync(LinkedStreamName, ExpectedVersion.Any, creds,
-				new EventData(Guid.NewGuid(), SystemEventTypes.LinkTo, false,
-					Encoding.UTF8.GetBytes("0@" + DeletedStreamName), new byte[0]));
-			await _conn.DeleteStreamAsync(DeletedStreamName, ExpectedVersion.Any);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/SpecificationWithLinkToToMaxCountDeletedEvents.cs b/src/EventStore.Core.Tests/ClientAPI/SpecificationWithLinkToToMaxCountDeletedEvents.cs
deleted file mode 100644
index 5c8be9efee5..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/SpecificationWithLinkToToMaxCountDeletedEvents.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Common;
-using EventStore.ClientAPI.SystemData;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	public abstract class SpecificationWithLinkToToMaxCountDeletedEvents<TLogFormat, TStreamId>
-		: SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		protected string LinkedStreamName;
-		protected string DeletedStreamName;
-
-		protected override async Task Given() {
-			var creds = DefaultData.AdminCredentials;
-			DeletedStreamName = Guid.NewGuid().ToString();
-			LinkedStreamName = Guid.NewGuid().ToString();
-			await _conn.AppendToStreamAsync(DeletedStreamName, ExpectedVersion.Any, creds,
-				new EventData(Guid.NewGuid(), "testing1", true, Encoding.UTF8.GetBytes("{'foo' : 4}"), new byte[0]));
-			await _conn.SetStreamMetadataAsync(DeletedStreamName, ExpectedVersion.Any,
-				new StreamMetadata(2, null, null, null, null));
-			await _conn.AppendToStreamAsync(DeletedStreamName, ExpectedVersion.Any, creds,
-				new EventData(Guid.NewGuid(), "testing2", true, Encoding.UTF8.GetBytes("{'foo' : 4}"), new byte[0]));
-			await _conn.AppendToStreamAsync(DeletedStreamName, ExpectedVersion.Any, creds,
-				new EventData(Guid.NewGuid(), "testing3", true, Encoding.UTF8.GetBytes("{'foo' : 4}"), new byte[0]));
-			await _conn.AppendToStreamAsync(LinkedStreamName, ExpectedVersion.Any, creds,
-				new EventData(Guid.NewGuid(), SystemEventTypes.LinkTo, false,
-					Encoding.UTF8.GetBytes("0@" + DeletedStreamName), new byte[0]));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/SpecificationWithMiniNode.cs b/src/EventStore.Core.Tests/ClientAPI/SpecificationWithMiniNode.cs
deleted file mode 100644
index 007709d375b..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/SpecificationWithMiniNode.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	public abstract class SpecificationWithMiniNode<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private readonly int _chunkSize;
-		protected MiniNode<TLogFormat, TStreamId> _node;
-		protected IEventStoreConnection _conn;
-		protected virtual TimeSpan Timeout { get; } = TimeSpan.FromMinutes(1);
-
-		protected virtual Task Given() => Task.CompletedTask;
-
-		protected abstract Task When();
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.Create(node.TcpEndPoint, TcpType.Ssl);
-		}
-
-		protected async Task CloseConnectionAndWait(IEventStoreConnection conn) {
-			TaskCompletionSource closed = new TaskCompletionSource();
-			conn.Closed += (_,_) => closed.SetResult();
-			conn.Close();
-			await closed.Task.WithTimeout(Timeout);
-		}
-
-		protected SpecificationWithMiniNode() : this(chunkSize: 1024*1024) { }
-
-		protected SpecificationWithMiniNode(int chunkSize) {
-			_chunkSize = chunkSize;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			
-			MiniNodeLogging.Setup();
-			
-			try {
-				await base.TestFixtureSetUp();
-			} catch (Exception ex) {
-				throw new Exception("TestFixtureSetUp Failed", ex);
-			}
-			
-			try {
-				_node = new MiniNode<TLogFormat, TStreamId>(PathName, chunkSize: _chunkSize);
-				await _node.Start();
-				_conn = BuildConnection(_node);
-				await _conn.ConnectAsync();		
-			} catch (Exception ex) {
-				MiniNodeLogging.WriteLogs();
-				throw new Exception("MiniNodeSetUp Failed", ex);
-			}
-
-			try {
-				await Given().WithTimeout(Timeout);
-			} catch (Exception ex) {
-				MiniNodeLogging.WriteLogs();
-				throw new Exception("Given Failed", ex);
-			}
-
-			try {
-				await When().WithTimeout(Timeout);
-			} catch (Exception ex) {
-				MiniNodeLogging.WriteLogs();
-				throw new Exception("When Failed", ex);
-			}
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			_conn?.Close();
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-
-			MiniNodeLogging.Clear();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/SystemData/clientapi_tcp_package.cs b/src/EventStore.Core.Tests/ClientAPI/SystemData/clientapi_tcp_package.cs
deleted file mode 100644
index a6599710abb..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/SystemData/clientapi_tcp_package.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-using System;
-using EventStore.ClientAPI.SystemData;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.SystemData {
-	[TestFixture, Category("ClientAPI")]
-	public class clientapi_tcp_package {
-		[Test]
-		public void should_throw_argument_null_exception_when_created_as_authorized_but_login_not_provided() {
-			Assert.Throws<ArgumentNullException>(() =>
-				new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, Guid.NewGuid(), null, "pa$$",
-					new byte[] {1, 2, 3}));
-		}
-
-		[Test]
-		public void should_throw_argument_null_exception_when_created_as_authorized_but_password_not_provided() {
-			Assert.Throws<ArgumentNullException>(() =>
-				new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, Guid.NewGuid(), "login", null,
-					new byte[] {1, 2, 3}));
-		}
-
-		[Test]
-		public void should_throw_argument_null_exception_when_created_as_authorized_but_token_not_provided() {
-			Assert.Throws<ArgumentNullException>(() =>
-				new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, Guid.NewGuid(), null,
-					new byte[] {1, 2, 3}));
-		}
-
-		[Test]
-		public void should_throw_argument_exception_when_created_as_not_authorized_but_login_is_provided() {
-			Assert.Throws<ArgumentException>(() =>
-				new TcpPackage(TcpCommand.BadRequest, TcpFlags.None, Guid.NewGuid(), "login", null,
-					new byte[] {1, 2, 3}));
-		}
-
-		[Test]
-		public void should_throw_argument_exception_when_created_as_not_authorized_but_password_is_provided() {
-			Assert.Throws<ArgumentException>(() =>
-				new TcpPackage(TcpCommand.BadRequest, TcpFlags.None, Guid.NewGuid(), null, "pa$$",
-					new byte[] {1, 2, 3}));
-		}
-
-		[Test]
-		public void should_throw_argument_exception_when_created_as_not_authorized_but_token_is_provided() {
-			Assert.Throws<ArgumentException>(() =>
-				new TcpPackage(TcpCommand.BadRequest, TcpFlags.None, Guid.NewGuid(), "token",
-					new byte[] {1, 2, 3}));
-		}
-
-		[Test]
-		public void not_authorized_with_data_should_serialize_and_deserialize_correctly() {
-			var corrId = Guid.NewGuid();
-			var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.None, corrId, null, null, new byte[] {1, 2, 3});
-			var bytes = refPkg.AsArraySegment();
-
-			var pkg = TcpPackage.FromArraySegment(bytes);
-			Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
-			Assert.AreEqual(TcpFlags.None, pkg.Flags);
-			Assert.AreEqual(corrId, pkg.CorrelationId);
-			Assert.False(pkg.Tokens.TryGetValue("uid", out _));
-			Assert.False(pkg.Tokens.TryGetValue("pwd", out _));
-			Assert.False(pkg.Tokens.TryGetValue("jwt", out _));
-
-			Assert.AreEqual(3, pkg.Data.Count);
-			Assert.AreEqual(1, pkg.Data.Array[pkg.Data.Offset + 0]);
-			Assert.AreEqual(2, pkg.Data.Array[pkg.Data.Offset + 1]);
-			Assert.AreEqual(3, pkg.Data.Array[pkg.Data.Offset + 2]);
-		}
-
-		[Test]
-		public void not_authorized_with_empty_data_should_serialize_and_deserialize_correctly() {
-			var corrId = Guid.NewGuid();
-			var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.None, corrId, null, null, new byte[0]);
-			var bytes = refPkg.AsArraySegment();
-
-			var pkg = TcpPackage.FromArraySegment(bytes);
-			Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
-			Assert.AreEqual(TcpFlags.None, pkg.Flags);
-			Assert.AreEqual(corrId, pkg.CorrelationId);
-			Assert.False(pkg.Tokens.TryGetValue("uid", out _));
-			Assert.False(pkg.Tokens.TryGetValue("pwd", out _));
-			Assert.False(pkg.Tokens.TryGetValue("jwt", out _));
-
-			Assert.AreEqual(0, pkg.Data.Count);
-		}
-
-		[Test]
-		public void authorized_with_data_should_serialize_and_deserialize_correctly() {
-			var corrId = Guid.NewGuid();
-			var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, corrId, "login", "pa$$",
-				new byte[] {1, 2, 3});
-			var bytes = refPkg.AsArraySegment();
-
-			var pkg = TcpPackage.FromArraySegment(bytes);
-			Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
-			Assert.AreEqual(TcpFlags.Authenticated, pkg.Flags);
-			Assert.AreEqual(corrId, pkg.CorrelationId);
-			Assert.AreEqual("login", pkg.Tokens["uid"]);
-			Assert.AreEqual("pa$$", pkg.Tokens["pwd"]);
-			Assert.False(pkg.Tokens.TryGetValue("jwt", out _));
-
-			Assert.AreEqual(3, pkg.Data.Count);
-			Assert.AreEqual(1, pkg.Data.Array[pkg.Data.Offset + 0]);
-			Assert.AreEqual(2, pkg.Data.Array[pkg.Data.Offset + 1]);
-			Assert.AreEqual(3, pkg.Data.Array[pkg.Data.Offset + 2]);
-		}
-
-		[Test]
-		public void authorized_with_empty_data_should_serialize_and_deserialize_correctly() {
-			var corrId = Guid.NewGuid();
-			var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, corrId, "login", "pa$$",
-				new byte[0]);
-			var bytes = refPkg.AsArraySegment();
-
-			var pkg = TcpPackage.FromArraySegment(bytes);
-			Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
-			Assert.AreEqual(TcpFlags.Authenticated, pkg.Flags);
-			Assert.AreEqual(corrId, pkg.CorrelationId);
-			Assert.AreEqual("login", pkg.Tokens["uid"]);
-			Assert.AreEqual("pa$$", pkg.Tokens["pwd"]);
-			Assert.False(pkg.Tokens.TryGetValue("jwt", out _));
-
-			Assert.AreEqual(0, pkg.Data.Count);
-		}
-
-		[Test]
-		public void token_authorized_with_data_should_serialize_and_deserialize_correctly() {
-			var corrId = Guid.NewGuid();
-			var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, corrId, "token",
-				new byte[] {1, 2, 3});
-			var bytes = refPkg.AsArraySegment();
-
-			var pkg = TcpPackage.FromArraySegment(bytes);
-			Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
-			Assert.AreEqual(TcpFlags.Authenticated, pkg.Flags);
-			Assert.AreEqual(corrId, pkg.CorrelationId);
-			Assert.AreEqual("token", pkg.Tokens["jwt"]);
-			Assert.False(pkg.Tokens.TryGetValue("uid", out _));
-			Assert.False(pkg.Tokens.TryGetValue("pwd", out _));
-
-			Assert.AreEqual(3, pkg.Data.Count);
-			Assert.AreEqual(1, pkg.Data.Array[pkg.Data.Offset + 0]);
-			Assert.AreEqual(2, pkg.Data.Array[pkg.Data.Offset + 1]);
-			Assert.AreEqual(3, pkg.Data.Array[pkg.Data.Offset + 2]);
-		}
-
-		[Test]
-		public void token_authorized_with_empty_data_should_serialize_and_deserialize_correctly() {
-			var corrId = Guid.NewGuid();
-			var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, corrId, "token",
-				new byte[0]);
-			var bytes = refPkg.AsArraySegment();
-
-			var pkg = TcpPackage.FromArraySegment(bytes);
-			Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
-			Assert.AreEqual(TcpFlags.Authenticated, pkg.Flags);
-			Assert.AreEqual(corrId, pkg.CorrelationId);
-			Assert.AreEqual("token", pkg.Tokens["jwt"]);
-			Assert.False(pkg.Tokens.TryGetValue("uid", out _));
-			Assert.False(pkg.Tokens.TryGetValue("pwd", out _));
-
-			Assert.AreEqual(0, pkg.Data.Count);
-		}
-
-		[Test]
-		public void should_throw_argument_exception_when_login_too_long() {
-			Assert.Throws<ArgumentException>(() => new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated,
-				Guid.NewGuid(), new string('*', TcpPackage.MaxLoginLength + 1), "pa$$", new byte[] {1, 2, 3}));
-		}
-
-		[Test]
-		public void should_throw_argument_exception_when_password_too_long() {
-			Assert.Throws<ArgumentException>(() => new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated,
-				Guid.NewGuid(), "login", new string('*', TcpPackage.MaxPasswordLength + 1), new byte[] {1, 2, 3}));
-		}
-
-		[Test]
-		public void should_throw_argument_exception_when_token_too_long() {
-			Assert.Throws<ArgumentException>(() => new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated,
-				Guid.NewGuid(), new string('*', TcpPackage.MaxTokenLength + 1), new byte[] {1, 2, 3}));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/UserManagement/TestWithNode.cs b/src/EventStore.Core.Tests/ClientAPI/UserManagement/TestWithNode.cs
deleted file mode 100644
index a93ca35a123..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/UserManagement/TestWithNode.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Common.Log;
-using EventStore.ClientAPI.UserManagement;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.UserManagement {
-	[Category("LongRunning"), Category("ClientAPI")]
-	public abstract class TestWithNode<TLogFormat, TStreamId>  : SpecificationWithDirectoryPerTestFixture {
-		protected MiniNode<TLogFormat, TStreamId> _node;
-		protected UsersManager _manager;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-			_manager = new UsersManager(new NoopLogger(), _node.HttpEndPoint, TimeSpan.FromSeconds(5), httpMessageHandler: _node.HttpMessageHandler);
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.Create(node.TcpEndPoint);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/UserManagement/TestWithUser.cs b/src/EventStore.Core.Tests/ClientAPI/UserManagement/TestWithUser.cs
deleted file mode 100644
index 5141cae268a..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/UserManagement/TestWithUser.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.ClientAPI.SystemData;
-
-namespace EventStore.Core.Tests.ClientAPI.UserManagement {
-	public abstract class TestWithUser<TLogFormat, TStreamId>  : TestWithNode<TLogFormat, TStreamId>  {
-		protected string _username = Guid.NewGuid().ToString();
-
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			await _manager.CreateUserAsync(_username, "name", new[] { "foo", "admins" }, "password",
-				new UserCredentials("admin", "changeit"));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/UserManagement/creating_a_user.cs b/src/EventStore.Core.Tests/ClientAPI/UserManagement/creating_a_user.cs
deleted file mode 100644
index 476afe4dc7d..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/UserManagement/creating_a_user.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using EventStore.ClientAPI.SystemData;
-using EventStore.ClientAPI.UserManagement;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.UserManagement {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class creating_a_user<TLogFormat, TStreamId> : TestWithNode<TLogFormat, TStreamId> {
-		[Test]
-		public void creating_a_user_with_null_username_throws() {
-			Assert.Throws<ArgumentNullException>(() =>
-				_manager.CreateUserAsync(null, "greg", new[] { "foo", "bar" }, "foofoofoo"));
-		}
-
-		[Test]
-		public void creating_a_user_with_empty_username_throws() {
-			Assert.Throws<ArgumentNullException>(() =>
-				_manager.CreateUserAsync("", "ouro", new[] { "foo", "bar" }, "foofoofoo"));
-		}
-
-		[Test]
-		public void creating_a_user_with_null_name_throws() {
-			Assert.Throws<ArgumentNullException>(() =>
-				_manager.CreateUserAsync("ouro", null, new[] { "foo", "bar" }, "foofoofoo"));
-		}
-
-		[Test]
-		public void creating_a_user_with_empty_name_throws() {
-			Assert.Throws<ArgumentNullException>(() =>
-				_manager.CreateUserAsync("ouro", "", new[] { "foo", "bar" }, "foofoofoo"));
-		}
-
-
-		[Test]
-		public void creating_a_user_with_null_password_throws() {
-			Assert.Throws<ArgumentNullException>(() =>
-				_manager.CreateUserAsync("ouro", "ouro", new[] { "foo", "bar" }, null));
-		}
-
-		[Test]
-		public void creating_a_user_with_empty_password_throws() {
-			Assert.Throws<ArgumentNullException>(() =>
-				_manager.CreateUserAsync("ouro", "ouro", new[] { "foo", "bar" }, ""));
-		}
-
-		[Test]
-		public async System.Threading.Tasks.Task creating_a_user_with_parameters_can_be_readAsync() {
-			UserDetails d = null;
-			await _manager.CreateUserAsync("ouro", "ourofull", new[] { "foo", "bar" }, "ouro",
-				new UserCredentials("admin", "changeit"));
-			d = await _manager.GetUserAsync("ouro", new UserCredentials("admin", "changeit"));
-
-			Assert.AreEqual("ouro", d.LoginName);
-			Assert.AreEqual("ourofull", d.FullName);
-			Assert.AreEqual("foo", d.Groups[0]);
-			Assert.AreEqual("bar", d.Groups[1]);
-		}
-
-		[Test]
-		public async System.Threading.Tasks.Task creating_a_user_with_unicode_chars_can_be_readAsync() {
-			UserDetails d = null;
-			await _manager.CreateUserAsync("码ou£ro码", "ourofull", new[] { "foo", "bar" }, "ou码码ro",
-				new UserCredentials("admin", "changeit"));
-			d = await _manager.GetUserAsync("码ou£ro码", new UserCredentials("admin", "changeit"));
-
-			Assert.AreEqual("码ou£ro码", d.LoginName);
-			Assert.AreEqual("ourofull", d.FullName);
-			Assert.AreEqual("foo", d.Groups[0]);
-			Assert.AreEqual("bar", d.Groups[1]);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/UserManagement/deleting_a_user.cs b/src/EventStore.Core.Tests/ClientAPI/UserManagement/deleting_a_user.cs
deleted file mode 100644
index 08c7f7d62dc..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/UserManagement/deleting_a_user.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.ClientAPI.SystemData;
-using EventStore.ClientAPI.Transport.Http;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.UserManagement {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class deleting_a_user<TLogFormat, TStreamId> : TestWithNode<TLogFormat, TStreamId>  {
-		[Test]
-		public async Task deleting_non_existing_user_throws() {
-			var ex = await AssertEx.ThrowsAsync<UserCommandFailedException>(() =>
-				_manager.DeleteUserAsync(Guid.NewGuid().ToString(), new UserCredentials("admin", "changeit")));
-			Assert.AreEqual(HttpStatusCode.NotFound, ex.HttpStatusCode);
-		}
-
-		[Test]
-		public async Task deleting_created_user_deletes_it() {
-			var user = Guid.NewGuid().ToString();
-			await _manager.CreateUserAsync(user, "ourofull", new[] { "foo", "bar" }, "ouro",
-				new UserCredentials("admin", "changeit"));
-			await _manager.DeleteUserAsync(user, new UserCredentials("admin", "changeit"));
-		}
-
-
-		[Test]
-		public void deleting_null_user_throws() {
-			Assert.Throws<ArgumentNullException>(() =>
-				_manager.DeleteUserAsync(null, new UserCredentials("admin", "changeit")));
-		}
-
-		[Test]
-		public void deleting_empty_user_throws() {
-			Assert.Throws<ArgumentNullException>(() =>
-				_manager.DeleteUserAsync("", new UserCredentials("admin", "changeit")));
-		}
-
-		[Test]
-		public async Task can_delete_a_user() {
-			await _manager.CreateUserAsync("ouro", "ouro", new[] { "foo", "bar" }, "ouro",
-				new UserCredentials("admin", "changeit"));
-			var x = await _manager.GetUserAsync("ouro", new UserCredentials("admin", "changeit"));
-			await _manager.DeleteUserAsync("ouro", new UserCredentials("admin", "changeit"));
-
-			var ex = await AssertEx.ThrowsAsync<AggregateException>(
-				() => _manager.GetUserAsync("ouro", new UserCredentials("admin", "changeit")));
-			Assert.AreEqual(HttpStatusCode.NotFound,
-				((UserCommandFailedException)ex.InnerException).HttpStatusCode);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/UserManagement/enable_disable_user.cs b/src/EventStore.Core.Tests/ClientAPI/UserManagement/enable_disable_user.cs
deleted file mode 100644
index 164c31b803d..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/UserManagement/enable_disable_user.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.ClientAPI.SystemData;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.UserManagement {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class enable_disable_user<TLogFormat, TStreamId> : TestWithUser<TLogFormat, TStreamId> {
-		[Test]
-		public async Task disable_empty_username_throws() {
-			await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
-				_manager.DisableAsync("", new UserCredentials("admin", "changeit")));
-		}
-
-		[Test]
-		public async Task disable_null_username_throws() {
-			await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
-				_manager.DisableAsync(null, new UserCredentials("admin", "changeit")));
-		}
-
-		[Test]
-		public async Task enable_empty_username_throws() {
-			await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
-				_manager.EnableAsync("", new UserCredentials("admin", "changeit")));
-		}
-
-		[Test]
-		public async Task enable_null_username_throws() {
-			await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
-				_manager.EnableAsync(null, new UserCredentials("admin", "changeit")));
-		}
-
-		[Test]
-		public async Task can_enable_disable_user() {
-			await _manager.DisableAsync(_username, new UserCredentials("admin", "changeit"));
-
-			await AssertEx.ThrowsAsync<UserCommandFailedException>(() =>
-				_manager.DisableAsync("foo", new UserCredentials(_username, "password")));
-
-			await _manager.EnableAsync(_username, new UserCredentials("admin", "changeit"));
-
-			var c = await _manager.GetCurrentUserAsync(new UserCredentials(_username, "password"));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/UserManagement/get_current_user.cs b/src/EventStore.Core.Tests/ClientAPI/UserManagement/get_current_user.cs
deleted file mode 100644
index fac4e7bf029..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/UserManagement/get_current_user.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.ClientAPI.SystemData;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.UserManagement {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class get_current_user<TLogFormat, TStreamId> : TestWithNode<TLogFormat, TStreamId> {
-		[Test]
-		public async Task returns_the_current_user() {
-			var x = await _manager.GetCurrentUserAsync(new UserCredentials("admin", "changeit"));
-			Assert.AreEqual("admin", x.LoginName);
-			Assert.AreEqual("Event Store Administrator", x.FullName);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/UserManagement/list_users.cs b/src/EventStore.Core.Tests/ClientAPI/UserManagement/list_users.cs
deleted file mode 100644
index a79b587aba1..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/UserManagement/list_users.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using EventStore.ClientAPI.SystemData;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.UserManagement {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class list_users<TLogFormat, TStreamId> : TestWithNode<TLogFormat, TStreamId> {
-		[Test]
-		public async System.Threading.Tasks.Task list_all_users_worksAsync() {
-			await _manager.CreateUserAsync("ouro", "ourofull", new[] { "foo", "bar" }, "ouro",
-				new UserCredentials("admin", "changeit"));
-			var x = await _manager.ListAllAsync(new UserCredentials("admin", "changeit"));
-			Assert.AreEqual(3, x.Count);
-			Assert.AreEqual("admin", x[0].LoginName);
-			Assert.AreEqual("Event Store Administrator", x[0].FullName);
-			Assert.AreEqual("ops", x[1].LoginName);
-			Assert.AreEqual("Event Store Operations", x[1].FullName);
-			Assert.AreEqual("ouro", x[2].LoginName);
-			Assert.AreEqual("ourofull", x[2].FullName);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/UserManagement/reset_change_password.cs b/src/EventStore.Core.Tests/ClientAPI/UserManagement/reset_change_password.cs
deleted file mode 100644
index 52f0e987439..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/UserManagement/reset_change_password.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.ClientAPI.SystemData;
-using EventStore.ClientAPI.Transport.Http;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI.UserManagement {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class reset_password<TLogFormat, TStreamId> : TestWithUser<TLogFormat, TStreamId> {
-		[Test]
-		public async Task null_user_name_throws() {
-			await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
-				_manager.ResetPasswordAsync(null, "foo", new UserCredentials("admin", "changeit")));
-		}
-
-		[Test]
-		public async Task empty_user_name_throws() {
-			await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
-				_manager.ResetPasswordAsync("", "foo", new UserCredentials("admin", "changeit")));
-		}
-
-		[Test]
-		public async Task empty_password_throws() {
-			await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
-				_manager.ResetPasswordAsync(_username, "", new UserCredentials("admin", "changeit")));
-		}
-
-		[Test]
-		public async Task null_password_throws() {
-			await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
-				_manager.ResetPasswordAsync(_username, null, new UserCredentials("admin", "changeit")));
-		}
-
-		[Test]
-		public async Task can_reset_password() {
-			await _manager.ResetPasswordAsync(_username, "foo", new UserCredentials("admin", "changeit"));
-			var ex = await AssertEx.ThrowsAsync<UserCommandFailedException>(
-				() => _manager.ChangePasswordAsync(_username, "password", "foobar",
-					new UserCredentials(_username, "password"))
-			);
-			Assert.AreEqual(HttpStatusCode.Unauthorized,
-				ex.HttpStatusCode);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class change_password<TLogFormat, TStreamId> : TestWithUser<TLogFormat, TStreamId> {
-		[Test]
-		public async Task null_username_throws() {
-			await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
-				_manager.ChangePasswordAsync(null, "oldpassword", "newpassword",
-					new UserCredentials("admin", "changeit")));
-		}
-
-		[Test]
-		public async Task empty_username_throws() {
-			await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
-				_manager.ChangePasswordAsync("", "oldpassword", "newpassword", new UserCredentials("admin", "changeit"))
-					);
-		}
-
-		[Test]
-		public async Task null_current_password_throws() {
-			await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
-				_manager.ChangePasswordAsync(_username, null, "newpassword", new UserCredentials("admin", "changeit"))
-					);
-		}
-
-		[Test]
-		public async Task empty_current_password_throws() {
-			await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
-				_manager.ChangePasswordAsync(_username, "", "newpassword", new UserCredentials("admin", "changeit"))
-					);
-		}
-
-		[Test]
-		public async Task null_new_password_throws() {
-			await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
-				_manager.ChangePasswordAsync(_username, "oldpasword", null, new UserCredentials("admin", "changeit"))
-					);
-		}
-
-		[Test]
-		public async Task empty_new_password_throws() {
-			await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
-				_manager.ChangePasswordAsync(_username, "oldpassword", "", new UserCredentials("admin", "changeit"))
-					);
-		}
-
-		[Test]
-		public async Task can_change_password() {
-			await _manager.ChangePasswordAsync(_username, "password", "fubar", new UserCredentials(_username, "password"));
-			var ex = await AssertEx.ThrowsAsync<UserCommandFailedException>(
-				() => _manager.ChangePasswordAsync(_username, "password", "foobar",
-					new UserCredentials(_username, "password"))
-			);
-			Assert.AreEqual(HttpStatusCode.Unauthorized,
-				ex.HttpStatusCode);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string), "newpassword")]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint),   "newpassword")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string), "n£wpasswordUnicode码")]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint),   "n£wpasswordUnicode码")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string), "password")] // same as old password
-	[TestFixture(typeof(LogFormat.V3), typeof(uint),   "password")] // same as old password
-	public class change_password_and_use_the_new_one<TLogFormat, TStreamId> : TestWithUser<TLogFormat, TStreamId> {
-		private readonly string _newPassword;
-		private const string OldPassword = "password";
-		private readonly TimeSpan _passwordChangeDelay = TimeSpan.FromSeconds(20);
-
-		public change_password_and_use_the_new_one(string newPassword) {
-			_newPassword = newPassword;
-		}
-
-		[Test, Category("LongRunning"), Explicit]
-		public async Task can_change_password_and_use_the_new_one() {
-			var oldCredentials = new UserCredentials(_username, OldPassword);
-			var newCredentials = new UserCredentials(_username, _newPassword);
-
-			// change the password to the new one
-			await _manager.ChangePasswordAsync(
-				login: _username,
-				oldPassword: OldPassword,
-				newPassword: _newPassword,
-				userCredentials: oldCredentials);
-
-			// wait for some time to allow the password change notification reader to detect the change
-			await Task.Delay(_passwordChangeDelay);
-
-			// change the password again but with the new credentials to see if they work
-			await _manager.ChangePasswordAsync(
-				login: _username,
-				oldPassword: _newPassword,
-				newPassword: "foobar",
-				userCredentials: newCredentials);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/UserManagement/updating_a_user.cs b/src/EventStore.Core.Tests/ClientAPI/UserManagement/updating_a_user.cs
deleted file mode 100644
index 6fa39fb5379..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/UserManagement/updating_a_user.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Net;
-using System.Threading.Tasks;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.ClientAPI.SystemData;
-using EventStore.ClientAPI.UserManagement;
-using NUnit.Framework;
-using HttpStatusCode = EventStore.ClientAPI.Transport.Http.HttpStatusCode;
-
-namespace EventStore.Core.Tests.ClientAPI.UserManagement {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class updating_a_user<TLogFormat, TStreamId>  : TestWithNode<TLogFormat, TStreamId>  {
-		[Test]
-		public async Task updating_a_user_with_null_username_throws() {
-			await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
-				_manager.UpdateUserAsync(null, "greg", new[] { "foo", "bar" }, new UserCredentials("admin", "changeit")));
-		}
-
-		[Test]
-		public async Task updating_a_user_with_empty_username_throws() {
-			await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
-				_manager.UpdateUserAsync("", "greg", new[] { "foo", "bar" }, new UserCredentials("admin", "changeit")));
-		}
-
-		[Test]
-		public async Task updating_a_user_with_null_name_throws() {
-			await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
-				_manager.UpdateUserAsync("greg", null, new[] { "foo", "bar" }, new UserCredentials("admin", "changeit")));
-		}
-
-		[Test]
-		public async Task updating_a_user_with_empty_name_throws() {
-			await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
-				_manager.UpdateUserAsync("greg", "", new[] { "foo", "bar" }, new UserCredentials("admin", "changeit")));
-		}
-
-		[Test]
-		public async Task updating_non_existing_user_throws() {
-			await AssertEx.ThrowsAsync<UserCommandFailedException>(() => _manager.UpdateUserAsync(Guid.NewGuid().ToString(), "bar",
-				new[] { "foo" }, new UserCredentials("admin", "changeit")));
-		}
-
-		[Test]
-		public async Task updating_a_user_with_parameters_can_be_read() {
-			UserDetails d = null;
-			await _manager.CreateUserAsync("ouro", "ourofull", new[] { "foo", "bar" }, "password",
-				new UserCredentials("admin", "changeit"));
-			await _manager.UpdateUserAsync("ouro", "something", new[] { "bar", "baz" },
-				new UserCredentials("admin", "changeit"));
-			d = await _manager.GetUserAsync("ouro", new UserCredentials("admin", "changeit"));
-			Assert.AreEqual("ouro", d.LoginName);
-			Assert.AreEqual("something", d.FullName);
-			Assert.AreEqual("bar", d.Groups[0]);
-			Assert.AreEqual("baz", d.Groups[1]);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/append_to_stream.cs b/src/EventStore.Core.Tests/ClientAPI/append_to_stream.cs
deleted file mode 100644
index f5f86f4bcbc..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/append_to_stream.cs
+++ /dev/null
@@ -1,664 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class append_to_stream<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private readonly TcpType _tcpType = TcpType.Ssl;
-		private MiniNode<TLogFormat, TStreamId> _node;
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.To(node, _tcpType);
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-		[Test, Category("Network")]
-		public async Task should_allow_appending_zero_events_to_stream_with_no_problems() {
-			const string stream1 = "should_allow_appending_zero_events_to_stream_with_no_problems1";
-			const string stream2 = "should_allow_appending_zero_events_to_stream_with_no_problems2";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				Assert.AreEqual(-1,
-					(await store.AppendToStreamAsync(stream1, ExpectedVersion.Any)).NextExpectedVersion);
-				Assert.AreEqual(-1,
-					(await store.AppendToStreamAsync(stream1, ExpectedVersion.NoStream)).NextExpectedVersion);
-				Assert.AreEqual(-1, (await store.AppendToStreamAsync(stream1, ExpectedVersion.Any)).NextExpectedVersion);
-				Assert.AreEqual(-1,
-					(await store.AppendToStreamAsync(stream1, ExpectedVersion.NoStream)).NextExpectedVersion);
-
-				var read1 = await store.ReadStreamEventsForwardAsync(stream1, 0, 2, resolveLinkTos: false);
-				Assert.That(read1.Events.Length, Is.EqualTo(0));
-
-				Assert.AreEqual(-1, (await store.AppendToStreamAsync(stream2, ExpectedVersion.NoStream)).NextExpectedVersion);
-				Assert.AreEqual(-1, (await store.AppendToStreamAsync(stream2, ExpectedVersion.Any)).NextExpectedVersion);
-				Assert.AreEqual(-1, (await store.AppendToStreamAsync(stream2, ExpectedVersion.NoStream)).NextExpectedVersion);
-				Assert.AreEqual(-1, (await store.AppendToStreamAsync(stream2, ExpectedVersion.Any)).NextExpectedVersion);
-
-				var read2 = await store.ReadStreamEventsForwardAsync(stream2, 0, 2, resolveLinkTos: false);
-				Assert.That(read2.Events.Length, Is.EqualTo(0));
-			}
-		}
-
-		[Test, Category("Network")]
-		public async Task should_create_stream_with_no_stream_exp_ver_on_first_write_if_does_not_exist() {
-			const string stream = "should_create_stream_with_no_stream_exp_ver_on_first_write_if_does_not_exist";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				Assert.AreEqual(0, (await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent()))
-					.NextExpectedVersion);
-
-				var read = await store.ReadStreamEventsForwardAsync(stream, 0, 2, resolveLinkTos: false);
-				Assert.That(read.Events.Length, Is.EqualTo(1));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task should_create_stream_with_any_exp_ver_on_first_write_if_does_not_exist() {
-			const string stream = "should_create_stream_with_any_exp_ver_on_first_write_if_does_not_exist";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				Assert.AreEqual(0, (await store.AppendToStreamAsync(stream, ExpectedVersion.Any, TestEvent.NewTestEvent())).NextExpectedVersion);
-
-				var read = await store.ReadStreamEventsForwardAsync(stream, 0, 2, resolveLinkTos: false);
-				Assert.That(read.Events.Length, Is.EqualTo(1));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task multiple_idempotent_writes() {
-			const string stream = "multiple_idempotent_writes";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = new[] {
-					TestEvent.NewTestEvent(), TestEvent.NewTestEvent(), TestEvent.NewTestEvent(),
-					TestEvent.NewTestEvent()
-				};
-				Assert.AreEqual(3,
-					(await store.AppendToStreamAsync(stream, ExpectedVersion.Any, events)).NextExpectedVersion);
-				Assert.AreEqual(3,
-					(await store.AppendToStreamAsync(stream, ExpectedVersion.Any, events)).NextExpectedVersion);
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task multiple_idempotent_writes_with_same_id_bug_case() {
-			const string stream = "multiple_idempotent_writes_with_same_id_bug_case";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var x = TestEvent.NewTestEvent();
-				var events = new[] { x, x, x, x, x, x };
-				Assert.AreEqual(5, (await store.AppendToStreamAsync(stream, ExpectedVersion.Any, events)).NextExpectedVersion);
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task
-			in_case_where_multiple_writes_of_multiple_events_with_the_same_ids_using_expected_version_any_then_next_expected_version_is_unreliable() {
-			const string stream = "in_wtf_multiple_case_of_multiple_writes_expected_version_any_per_all_same_id";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var x = TestEvent.NewTestEvent();
-				var events = new[] { x, x, x, x, x, x };
-				Assert.AreEqual(5, (await store.AppendToStreamAsync(stream, ExpectedVersion.Any, events)).NextExpectedVersion);
-				var f = await store.AppendToStreamAsync(stream, ExpectedVersion.Any, events);
-				Assert.AreEqual(0, f.NextExpectedVersion);
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task
-			in_case_where_multiple_writes_of_multiple_events_with_the_same_ids_using_expected_version_nostream_then_next_expected_version_is_correct() {
-			const string stream =
-				"in_slightly_reasonable_multiple_case_of_multiple_writes_with_expected_version_per_all_same_id";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var x = TestEvent.NewTestEvent();
-				var events = new[] { x, x, x, x, x, x };
-				Assert.AreEqual(5,
-					(await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, events)).NextExpectedVersion);
-				var f = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, events);
-				Assert.AreEqual(5, f.NextExpectedVersion);
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task should_fail_writing_with_correct_exp_ver_to_deleted_stream() {
-			const string stream = "should_fail_writing_with_correct_exp_ver_to_deleted_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
-
-				await AssertEx.ThrowsAsync<StreamDeletedException>(
-					() => store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent()));
-
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task should_return_log_position_when_writing() {
-			const string stream = "should_return_log_position_when_writing";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var result = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
-				Assert.IsTrue(0 < result.LogPosition.PreparePosition);
-				Assert.IsTrue(0 < result.LogPosition.CommitPosition);
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task should_fail_writing_with_any_exp_ver_to_deleted_stream() {
-			const string stream = "should_fail_writing_with_any_exp_ver_to_deleted_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				try {
-					await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
-				} catch (Exception exc) {
-					Console.WriteLine(exc);
-					Assert.Fail();
-				}
-
-				await AssertEx.ThrowsAsync<StreamDeletedException>(
-					() => store.AppendToStreamAsync(stream, ExpectedVersion.Any, TestEvent.NewTestEvent()));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task should_fail_writing_with_invalid_exp_ver_to_deleted_stream() {
-			const string stream = "should_fail_writing_with_invalid_exp_ver_to_deleted_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
-
-				await AssertEx.ThrowsAsync<StreamDeletedException>(() => store.AppendToStreamAsync(stream, 5, TestEvent.NewTestEvent()));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task should_append_with_correct_exp_ver_to_existing_stream() {
-			const string stream = "should_append_with_correct_exp_ver_to_existing_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
-
-				await store.AppendToStreamAsync(stream, 0, new[] { TestEvent.NewTestEvent() });
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task should_append_with_any_exp_ver_to_existing_stream() {
-			const string stream = "should_append_with_any_exp_ver_to_existing_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				Assert.AreEqual(0, (await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent())).NextExpectedVersion);
-				Assert.AreEqual(1, (await store.AppendToStreamAsync(stream, ExpectedVersion.Any, TestEvent.NewTestEvent())).NextExpectedVersion);
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task should_fail_appending_with_wrong_exp_ver_to_existing_stream() {
-			const string stream = "should_fail_appending_with_wrong_exp_ver_to_existing_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var wev = await AssertEx.ThrowsAsync<WrongExpectedVersionException>(() =>
-					store.AppendToStreamAsync(stream, 1, new[] { TestEvent.NewTestEvent() }));
-				Assert.AreEqual(1, wev.ExpectedVersion);
-				Assert.AreEqual(ExpectedVersion.NoStream, wev.ActualVersion);
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task should_append_with_stream_exists_exp_ver_to_existing_stream() {
-			const string stream = "should_append_with_stream_exists_exp_ver_to_existing_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
-
-				await store.AppendToStreamAsync(stream, ExpectedVersion.StreamExists, TestEvent.NewTestEvent());
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task should_append_with_stream_exists_exp_ver_to_stream_with_multiple_events() {
-			const string stream = "should_append_with_stream_exists_exp_ver_to_stream_with_multiple_events";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				for (var i = 0; i < 5; i++) {
-					await store.AppendToStreamAsync(stream, ExpectedVersion.Any, TestEvent.NewTestEvent());
-				}
-
-				await store.AppendToStreamAsync(stream, ExpectedVersion.StreamExists, TestEvent.NewTestEvent());
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task should_append_with_stream_exists_exp_ver_if_metadata_stream_exists() {
-			const string stream = "should_append_with_stream_exists_exp_ver_if_metadata_stream_exists";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				await store.SetStreamMetadataAsync(stream, ExpectedVersion.Any,
-					new StreamMetadata(10, null, null, null, null));
-
-				await store.AppendToStreamAsync(stream, ExpectedVersion.StreamExists, TestEvent.NewTestEvent());
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task should_fail_appending_with_stream_exists_exp_ver_and_stream_does_not_exist() {
-			const string stream = "should_fail_appending_with_stream_exists_exp_ver_and_stream_does_not_exist";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var wev = await AssertEx.ThrowsAsync<WrongExpectedVersionException>(
-					() => store.AppendToStreamAsync(stream, ExpectedVersion.StreamExists, TestEvent.NewTestEvent()));
-				Assert.AreEqual(ExpectedVersion.StreamExists, wev.ExpectedVersion);
-				Assert.AreEqual(ExpectedVersion.NoStream, wev.ActualVersion);
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task should_fail_appending_with_stream_exists_exp_ver_to_hard_deleted_stream() {
-			const string stream = "should_fail_appending_with_stream_exists_exp_ver_to_hard_deleted_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
-
-				await AssertEx.ThrowsAsync<StreamDeletedException>(
-					() => store.AppendToStreamAsync(stream, ExpectedVersion.StreamExists, TestEvent.NewTestEvent()));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task should_fail_appending_with_stream_exists_exp_ver_to_soft_deleted_stream() {
-			const string stream = "should_fail_appending_with_stream_exists_exp_ver_to_soft_deleted_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
-
-				await store.DeleteStreamAsync(stream, ExpectedVersion.StreamExists, hardDelete: false);
-
-				await AssertEx.ThrowsAsync<StreamDeletedException>(
-					() => store.AppendToStreamAsync(stream, ExpectedVersion.StreamExists, TestEvent.NewTestEvent()));
-			}
-		}
-
-		[Test, Category("Network")]
-		public async Task can_append_multiple_events_at_once() {
-			const string stream = "can_append_multiple_events_at_once";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 100).Select(i => TestEvent.NewTestEvent(i.ToString(), i.ToString()));
-				Assert.AreEqual(99, (await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, events)).NextExpectedVersion);
-			}
-		}
-
-		[Test]
-		public async Task cannot_append_multiple_events_larger_than_chunk_size_at_once() {
-			const string stream = "cannot_append_multiple_events_larger_than_chunk_size_at_once";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var largeData = new string(' ', 20000);
-				var events = Enumerable.Range(0, 100).Select(i => TestEvent.NewTestEvent(largeData, i.ToString()));
-				Assert.ThrowsAsync<InvalidTransactionException>(async () =>
-					await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, events));
-			}
-		}
-
-		[Test]
-		public async Task can_append_to_stream_with_long_name() {
-			var stream = "can_append_to_stream_with_long_name" + new string('A', 300);
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				Assert.AreEqual(0, (await store.AppendToStreamAsync
-					(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent())).NextExpectedVersion);
-			}
-		}
-
-		[Test]
-		public async Task can_append_multiple_events_to_stream_with_long_name_at_once() {
-			var stream = "can_append_multiple_events_to_stream_with_long_name_at_once" + new string('A', 300);
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var events = Enumerable.Range(0, 3).Select(i => TestEvent.NewTestEvent(i.ToString(), i.ToString()));
-				Assert.AreEqual(2, (await store.AppendToStreamAsync
-					(stream, ExpectedVersion.NoStream, events)).NextExpectedVersion);
-			}
-		}
-
-		[Test]
-		public async Task can_append_event_with_long_event_type() {
-			const string stream = "can_append_event_with_long_event_type";
-			var eventType = new string('A', 300);
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				Assert.AreEqual(0, (await store.AppendToStreamAsync
-					(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(eventName: eventType))).NextExpectedVersion);
-			}
-		}
-
-		[Test]
-		public async Task can_append_multiple_events_with_long_event_type_at_once() {
-			const string stream = "can_append_multiple_events_with_long_event_type_at_once";
-			var eventType = new string('A', 300);
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var events = Enumerable.Range(0, 3).Select(i =>
-					TestEvent.NewTestEvent(i.ToString(), i.ToString(), eventName: eventType));
-				Assert.AreEqual(2, (await store.AppendToStreamAsync
-					(stream, ExpectedVersion.NoStream, events)).NextExpectedVersion);
-			}
-		}
-
-		[Test, Category("Network")]
-		public async Task returns_failure_status_when_conditionally_appending_with_version_mismatch() {
-			const string stream = "returns_failure_status_when_conditionally_appending_with_version_mismatch";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var result = await store.ConditionalAppendToStreamAsync(stream, 7, new[] { TestEvent.NewTestEvent() });
-
-				Assert.AreEqual(ConditionalWriteStatus.VersionMismatch, result.Status);
-			}
-		}
-
-		[Test, Category("Network")]
-		public async Task returns_success_status_when_conditionally_appending_with_matching_version() {
-			const string stream = "returns_success_status_when_conditionally_appending_with_matching_version";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var result = await store
-					.ConditionalAppendToStreamAsync(stream, ExpectedVersion.Any, new[] { TestEvent.NewTestEvent() });
-
-				Assert.AreEqual(ConditionalWriteStatus.Succeeded, result.Status);
-				Assert.IsNotNull(result.LogPosition);
-				Assert.IsNotNull(result.NextExpectedVersion);
-			}
-		}
-
-		[Test, Category("Network")]
-		public async Task returns_failure_status_when_conditionally_appending_to_a_deleted_stream() {
-			const string stream = "returns_failure_status_when_conditionally_appending_to_a_deleted_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				await store.AppendToStreamAsync(stream, ExpectedVersion.Any, TestEvent.NewTestEvent());
-				await store.DeleteStreamAsync(stream, ExpectedVersion.Any, true);
-
-				var result = await store
-					.ConditionalAppendToStreamAsync(stream, ExpectedVersion.Any, new[] { TestEvent.NewTestEvent() });
-
-				Assert.AreEqual(ConditionalWriteStatus.StreamDeleted, result.Status);
-			}
-		}
-	}
-
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class ssl_append_to_stream<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private readonly TcpType _tcpType = TcpType.Ssl;
-		protected MiniNode<TLogFormat, TStreamId> _node;
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.To(node, _tcpType);
-		}
-
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public async Task should_allow_appending_zero_events_to_stream_with_no_problems() {
-			const string stream = "should_allow_appending_zero_events_to_stream_with_no_problems";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				Assert.AreEqual(-1,
-					(await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream)).NextExpectedVersion);
-
-				var read = await store.ReadStreamEventsForwardAsync(stream, 0, 2, resolveLinkTos: false);
-				Assert.That(read.Events.Length, Is.EqualTo(0));
-			}
-		}
-
-		[Test]
-		public async Task should_create_stream_with_no_stream_exp_ver_on_first_write_if_does_not_exist() {
-			const string stream = "should_create_stream_with_no_stream_exp_ver_on_first_write_if_does_not_exist";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				Assert.AreEqual(0,
-					(await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent())).NextExpectedVersion);
-
-				var read = await store.ReadStreamEventsForwardAsync(stream, 0, 2, resolveLinkTos: false);
-				Assert.That(read.Events.Length, Is.EqualTo(1));
-			}
-		}
-
-		[Test]
-		public async Task should_create_stream_with_any_exp_ver_on_first_write_if_does_not_exist() {
-			const string stream = "should_create_stream_with_any_exp_ver_on_first_write_if_does_not_exist";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				Assert.AreEqual(0,
-					(await store.AppendToStreamAsync(stream, ExpectedVersion.Any, TestEvent.NewTestEvent())).NextExpectedVersion);
-
-				var read = await store.ReadStreamEventsForwardAsync(stream, 0, 2, resolveLinkTos: false);
-				Assert.That(read.Events.Length, Is.EqualTo(1));
-			}
-		}
-
-		[Test]
-		public async Task should_fail_writing_with_correct_exp_ver_to_deleted_stream() {
-			const string stream = "should_fail_writing_with_correct_exp_ver_to_deleted_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
-
-				await AssertEx.ThrowsAsync<StreamDeletedException>(() =>
-					store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent()));
-			}
-		}
-
-		[Test]
-		public async Task should_fail_writing_with_any_exp_ver_to_deleted_stream() {
-			const string stream = "should_fail_writing_with_any_exp_ver_to_deleted_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
-
-				await AssertEx.ThrowsAsync<StreamDeletedException>(() =>
-					store.AppendToStreamAsync(stream, ExpectedVersion.Any, TestEvent.NewTestEvent()));
-			}
-		}
-
-		[Test]
-		public async Task should_fail_writing_with_invalid_exp_ver_to_deleted_stream() {
-			const string stream = "should_fail_writing_with_invalid_exp_ver_to_deleted_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
-
-				await AssertEx.ThrowsAsync<StreamDeletedException>(() =>
-					store.AppendToStreamAsync(stream, 5, new[] { TestEvent.NewTestEvent() }));
-			}
-		}
-
-		[Test]
-		public async Task should_append_with_correct_exp_ver_to_existing_stream() {
-			const string stream = "should_append_with_correct_exp_ver_to_existing_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				Assert.AreEqual(0,
-					(await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent())).NextExpectedVersion);
-				Assert.AreEqual(1, (await store.AppendToStreamAsync(stream, 0, TestEvent.NewTestEvent())).NextExpectedVersion);
-			}
-		}
-
-		[Test]
-		public async Task should_append_with_any_exp_ver_to_existing_stream() {
-			const string stream = "should_append_with_any_exp_ver_to_existing_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				Assert.AreEqual(0,
-					(await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent())).NextExpectedVersion);
-				Assert.AreEqual(1, (await store.AppendToStreamAsync(stream, ExpectedVersion.Any, TestEvent.NewTestEvent())).NextExpectedVersion);
-			}
-		}
-
-		[Test]
-		public async Task should_return_log_position_when_writing() {
-			const string stream = "should_return_log_position_when_writing";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var result = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
-				Assert.IsTrue(0 < result.LogPosition.PreparePosition);
-				Assert.IsTrue(0 < result.LogPosition.CommitPosition);
-			}
-		}
-
-		[Test]
-		public async Task should_fail_appending_with_wrong_exp_ver_to_existing_stream() {
-			const string stream = "should_fail_appending_with_wrong_exp_ver_to_existing_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				Assert.AreEqual(0,
-					(await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent())).NextExpectedVersion);
-
-				var wev = await AssertEx.ThrowsAsync<WrongExpectedVersionException>(() =>
-					store.AppendToStreamAsync(stream, 1, TestEvent.NewTestEvent()));
-				Assert.AreEqual(1, wev.ExpectedVersion);
-				Assert.AreEqual(0, wev.ActualVersion.GetValueOrDefault(0));
-			}
-		}
-
-		[Test]
-		public async Task can_append_multiple_events_at_once() {
-			const string stream = "can_append_multiple_events_at_once";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 100).Select(i => TestEvent.NewTestEvent(i.ToString(), i.ToString()));
-				Assert.AreEqual(99, (await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, events)).NextExpectedVersion);
-			}
-		}
-
-		[Test]
-		public async Task cannot_append_multiple_events_larger_than_chunk_size_at_once() {
-			const string stream = "cannot_append_multiple_events_larger_than_chunk_size_at_once";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var largeData = new string(' ', 20000);
-				var events = Enumerable.Range(0, 100).Select(i => TestEvent.NewTestEvent(largeData, i.ToString()));
-				Assert.ThrowsAsync<InvalidTransactionException>(async () =>
-					await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, events));
-			}
-		}
-
-		[Test]
-		public async Task can_append_to_stream_with_long_name() {
-			var stream = "can_append_to_stream_with_long_name" + new string('A', 300);
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				Assert.AreEqual(0, (await store.AppendToStreamAsync
-					(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent())).NextExpectedVersion);
-			}
-		}
-
-		[Test]
-		public async Task can_append_multiple_events_to_stream_with_long_name_at_once() {
-			var stream = "can_append_multiple_events_to_stream_with_long_name_at_once" + new string('A', 300);
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var events = Enumerable.Range(0, 3).Select(i => TestEvent.NewTestEvent(i.ToString(), i.ToString()));
-				Assert.AreEqual(2, (await store.AppendToStreamAsync
-					(stream, ExpectedVersion.NoStream, events)).NextExpectedVersion);
-			}
-		}
-
-		[Test]
-		public async Task can_append_event_with_long_event_type() {
-			const string stream = "can_append_event_with_long_event_type";
-			var eventType = new string('A', 300);
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				Assert.AreEqual(0, (await store.AppendToStreamAsync
-					(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(eventName: eventType))).NextExpectedVersion);
-			}
-		}
-
-		[Test]
-		public async Task can_append_multiple_events_with_long_event_type_at_once() {
-			const string stream = "can_append_multiple_events_with_long_event_type_at_once";
-			var eventType = new string('A', 300);
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var events = Enumerable.Range(0, 3).Select(i =>
-					TestEvent.NewTestEvent(i.ToString(), i.ToString(), eventName: eventType));
-				Assert.AreEqual(2, (await store.AppendToStreamAsync
-					(stream, ExpectedVersion.NoStream, events)).NextExpectedVersion);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/append_to_stream_with_hash_collision.cs b/src/EventStore.Core.Tests/ClientAPI/append_to_stream_with_hash_collision.cs
deleted file mode 100644
index a9f5e534549..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/append_to_stream_with_hash_collision.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Core.Tests;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.HashCollisions {
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Hash collisions cannot occur in Log V3")]
-	public class append_to_stream_with_hash_collision<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private MiniNode<TLogFormat, TStreamId> _node;
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.To(node, TcpType.Ssl);
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName,
-				inMemDb: false,
-				memTableSize: 20,
-				hashCollisionReadLimit: 1,
-				indexBitnessVersion: EventStore.Core.Index.PTableVersions.IndexV4,
-				hash32bit: true,
-				streamExistenceFilterSize: 0);
-			await _node.Start();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public async Task should_throw_wrong_expected_version() {
-			const string stream1 = "account--696193173";
-			const string stream2 = "LPN-FC002_LPK51001";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				//Write event to stream 1
-				Assert.AreEqual(0, (await store.AppendToStreamAsync(stream1, ExpectedVersion.NoStream,
-						new EventData(Guid.NewGuid(), "TestEvent", true, null, null))).NextExpectedVersion);
-				//Write 100 events to stream 2 which will have the same hash as stream 1.
-				for (int i = 0; i < 100; i++) {
-					Assert.AreEqual(i, (await store.AppendToStreamAsync(stream2, ExpectedVersion.Any,
-						new EventData(Guid.NewGuid(), "TestEvent", true, null, null))).NextExpectedVersion);
-				}
-			}
-
-			var tcpPort = _node.TcpEndPoint.Port;
-			var httpPort = _node.HttpEndPoint.Port;
-			await _node.Shutdown(keepDb: true);
-
-			//Restart the node to ensure the read index stream info cache is empty
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName,
-				tcpPort, httpPort, inMemDb: false,
-				memTableSize: 20,
-				hashCollisionReadLimit: 1,
-				indexBitnessVersion: EventStore.Core.Index.PTableVersions.IndexV4,
-				hash32bit: true,
-				streamExistenceFilterSize: 0);
-			await _node.Start();
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				await AssertEx.ThrowsAsync<WrongExpectedVersionException>(
-					() => store.AppendToStreamAsync(stream1, ExpectedVersion.Any,
-						new EventData(Guid.NewGuid(), "TestEvent", true, null, null)));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/appending_to_implicitly_created_stream.cs b/src/EventStore.Core.Tests/ClientAPI/appending_to_implicitly_created_stream.cs
deleted file mode 100644
index a485c3f23c7..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/appending_to_implicitly_created_stream.cs
+++ /dev/null
@@ -1,292 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class appending_to_implicitly_created_stream<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private MiniNode<TLogFormat, TStreamId> _node;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.Create(node.TcpEndPoint);
-		}
-
-		/*
-		 * sequence - events written so stream
-		 * 0em1 - event number 0 written with exp version -1 (minus 1)
-		 * 1any - event number 1 written with exp version any
-		 * S_0em1_1em1_E - START bucket, two events in bucket, END bucket
-		*/
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_0em1_1e0_2e1_3e2_4e3_5e4_0em1_idempotent() {
-			const string stream =
-				"appending_to_implicitly_created_stream_sequence_0em1_1e0_2e1_3e2_4e3_5e4_0em1_idempotent";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 6).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				var writer = new StreamWriter(store, stream, -1);
-
-				var tail = await writer.Append(events);
-
-				await tail.Then(events[0], -1);
-
-				var total = await EventsStream.Count(store, stream);
-				Assert.That(total, Is.EqualTo(events.Length));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_0em1_1e0_2e1_3e2_4e3_4e4_0any_idempotent() {
-			const string stream =
-				"appending_to_implicitly_created_stream_sequence_0em1_1e0_2e1_3e2_4e3_4e4_0any_idempotent";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 6).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				var writer = new StreamWriter(store, stream, -1);
-
-				var tail = await writer.Append(events);
-				await tail.Then(events.First(), ExpectedVersion.Any);
-
-				var total = await EventsStream.Count(store, stream);
-				Assert.That(total, Is.EqualTo(events.Length));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e5_non_idempotent() {
-			const string stream =
-				"appending_to_implicitly_created_stream_sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e5_non_idempotent";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 6).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				var writer = new StreamWriter(store, stream, -1);
-
-				var tail = await writer.Append(events);
-				await tail.Then(events.First(), 5);
-
-				var total = await EventsStream.Count(store, stream);
-				Assert.That(total, Is.EqualTo(events.Length + 1));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e6_wev() {
-			const string stream = "appending_to_implicitly_created_stream_sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e6_wev";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 6).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				var writer = new StreamWriter(store, stream, -1);
-
-				var first6 = await writer.Append(events);
-				await AssertEx.ThrowsAsync<WrongExpectedVersionException>(
-					() => first6.Then(events.First(), 6));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e4_wev() {
-			const string stream = "appending_to_implicitly_created_stream_sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e4_wev";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 6).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				var writer = new StreamWriter(store, stream, -1);
-
-				var first6 = await writer.Append(events);
-				await AssertEx.ThrowsAsync<WrongExpectedVersionException>(
-					() => first6.Then(events.First(), 4));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_0em1_0e0_non_idempotent() {
-			const string stream = "appending_to_implicitly_created_stream_sequence_0em1_0e0_non_idempotent";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 1).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				var writer = new StreamWriter(store, stream, -1);
-
-				var tail = await writer.Append(events);
-				await tail.Then(events.First(), 0);
-
-				var total = await EventsStream.Count(store, stream);
-				Assert.That(total, Is.EqualTo(events.Length + 1));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_0em1_0any_idempotent() {
-			const string stream = "appending_to_implicitly_created_stream_sequence_0em1_0any_idempotent";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 1).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				var writer = new StreamWriter(store, stream, -1);
-
-				var tail = await writer.Append(events);
-
-				await tail.Then(events.First(), ExpectedVersion.Any);
-
-				var total = await EventsStream.Count(store, stream);
-				Assert.That(total, Is.EqualTo(events.Length));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_0em1_0em1_idempotent() {
-			const string stream = "appending_to_implicitly_created_stream_sequence_0em1_0em1_idempotent";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 1).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				var writer = new StreamWriter(store, stream, -1);
-
-				var tail = await writer.Append(events);
-				await tail.Then(events.First(), -1);
-
-				var total = await EventsStream.Count(store, stream);
-				Assert.That(total, Is.EqualTo(events.Length));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_0em1_1e0_2e1_1any_1any_idempotent() {
-			const string stream = "appending_to_implicitly_created_stream_sequence_0em1_1e0_2e1_1any_1any_idempotent";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 3).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				var writer = new StreamWriter(store, stream, -1);
-
-
-				var tailWriter = await writer.Append(events);
-				tailWriter = await tailWriter.Then(events[1], ExpectedVersion.Any);
-				await tailWriter.Then(events[1], ExpectedVersion.Any);
-
-				var total = await EventsStream.Count(store, stream);
-				Assert.That(total, Is.EqualTo(events.Length));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_S_0em1_1em1_E_S_0em1_E_idempotent() {
-			const string stream = "appending_to_implicitly_created_stream_sequence_S_0em1_1em1_E_S_0em1_E_idempotent";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 2).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				await store.AppendToStreamAsync(stream, -1, events);
-
-				await store.AppendToStreamAsync(stream, -1, events.First());
-
-				var total = await EventsStream.Count(store, stream);
-				Assert.That(total, Is.EqualTo(events.Length));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_S_0em1_1em1_E_S_0any_E_idempotent() {
-			const string stream = "appending_to_implicitly_created_stream_sequence_S_0em1_1em1_E_S_0any_E_idempotent";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 2).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				await store.AppendToStreamAsync(stream, -1, events);
-
-				await store.AppendToStreamAsync(stream, ExpectedVersion.Any, new[] { events.First() });
-
-				var total = await EventsStream.Count(store, stream);
-				Assert.That(total, Is.EqualTo(events.Length));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_S_0em1_1em1_E_S_1e0_E_idempotent() {
-			const string stream = "appending_to_implicitly_created_stream_sequence_S_0em1_1em1_E_S_1e0_E_idempotent";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 2).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				await store.AppendToStreamAsync(stream, -1, events);
-
-				await store.AppendToStreamAsync(stream, 0, events[1]);
-
-				var total = await EventsStream.Count(store, stream);
-				Assert.That(total, Is.EqualTo(events.Length));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_S_0em1_1em1_E_S_1any_E_idempotent() {
-			const string stream = "appending_to_implicitly_created_stream_sequence_S_0em1_1em1_E_S_1any_E_idempotent";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 2).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				await store.AppendToStreamAsync(stream, -1, events);
-
-				await store.AppendToStreamAsync(stream, ExpectedVersion.Any, events[1]);
-
-				var total = await EventsStream.Count(store, stream);
-				Assert.That(total, Is.EqualTo(events.Length));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_S_0em1_1em1_E_S_0em1_1em1_2em1_E_idempotancy_fail() {
-			const string stream =
-				"appending_to_implicitly_created_stream_sequence_S_0em1_1em1_E_S_0em1_1em1_2em1_E_idempotancy_fail";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 2).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				await store.AppendToStreamAsync(stream, -1, events);
-
-				await AssertEx.ThrowsAsync<WrongExpectedVersionException>(
-					() => store.AppendToStreamAsync(stream, -1,
-						events.Concat(new[] { TestEvent.NewTestEvent(Guid.NewGuid()) })));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/appending_to_implicitly_created_stream_using_transaction.cs b/src/EventStore.Core.Tests/ClientAPI/appending_to_implicitly_created_stream_using_transaction.cs
deleted file mode 100644
index a73ccd43c2c..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/appending_to_implicitly_created_stream_using_transaction.cs
+++ /dev/null
@@ -1,228 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class appending_to_implicitly_created_stream_using_transaction<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private MiniNode<TLogFormat, TStreamId> _node;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-		virtual protected IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.Create(node.TcpEndPoint);
-		}
-
-		/*
-		 * sequence - events written so stream
-		 * 0em1 - event number 0 written with exp version -1 (minus 1)
-		 * 1any - event number 1 written with exp version any
-		 * S_0em1_1em1_E - START bucket, two events in bucket, END bucket
-		*/
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_0em1_1e0_2e1_3e2_4e3_5e4_0em1_idempotent() {
-			const string stream =
-				"appending_to_implicitly_created_stream_using_transaction_sequence_0em1_1e0_2e1_3e2_4e3_5e4_0em1_idempotent";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 6).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				var writer = new TransactionalWriter(store, stream);
-
-				Assert.AreEqual(5, (await (await (await writer.StartTransaction(-1)).Write(events)).Commit()).NextExpectedVersion);
-				Assert.AreEqual(0, (await (await (await writer.StartTransaction(-1)).Write(events.First())).Commit()).NextExpectedVersion);
-
-				var total = await EventsStream.Count(store, stream);
-				Assert.That(total, Is.EqualTo(events.Length));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_0em1_1e0_2e1_3e2_4e3_5e4_0any_idempotent() {
-			const string stream =
-				"appending_to_implicitly_created_stream_using_transaction_sequence_0em1_1e0_2e1_3e2_4e3_5e4_0any_idempotent";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 6).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				var writer = new TransactionalWriter(store, stream);
-
-				Assert.AreEqual(5, (await (await (await writer.StartTransaction(-1)).Write(events)).Commit()).NextExpectedVersion);
-				Assert.AreEqual(0, (await (await (await writer.StartTransaction(ExpectedVersion.Any)).Write(events.First())).Commit()).NextExpectedVersion);
-
-				var total = await EventsStream.Count(store, stream);
-				Assert.That(total, Is.EqualTo(events.Length));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e5_non_idempotent() {
-			const string stream =
-				"appending_to_implicitly_created_stream_using_transaction_sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e5_non_idempotent";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 6).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				var writer = new TransactionalWriter(store, stream);
-
-				Assert.AreEqual(5, (await (await (await writer.StartTransaction(-1)).Write(events)).Commit()).NextExpectedVersion);
-				Assert.AreEqual(6, (await (await (await writer.StartTransaction(5)).Write(events.First())).Commit()).NextExpectedVersion);
-
-				var total = await EventsStream.Count(store, stream);
-				Assert.That(total, Is.EqualTo(events.Length + 1));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e6_wev() {
-			const string stream =
-				"appending_to_implicitly_created_stream_using_transaction_sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e6_wev";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 6).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				var writer = new TransactionalWriter(store, stream);
-
-				Assert.AreEqual(5, (await (await (await writer.StartTransaction(-1)).Write(events)).Commit()).NextExpectedVersion);
-				await AssertEx.ThrowsAsync<WrongExpectedVersionException>(async () =>
-					await (await (await writer.StartTransaction(6)).Write(events.First())).Commit());
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e4_wev() {
-			const string stream =
-				"appending_to_implicitly_created_stream_using_transaction_sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e4_wev";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 6).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				var writer = new TransactionalWriter(store, stream);
-
-				Assert.AreEqual(5, (await (await (await writer.StartTransaction(-1)).Write(events)).Commit()).NextExpectedVersion);
-				await AssertEx.ThrowsAsync<WrongExpectedVersionException>(
-					async () => await (await (await writer.StartTransaction(4)).Write(events.First())).Commit());
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_0em1_0e0_non_idempotent() {
-			const string stream =
-				"appending_to_implicitly_created_stream_using_transaction_sequence_0em1_0e0_non_idempotent";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 1).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				var writer = new TransactionalWriter(store, stream);
-
-				Assert.AreEqual(0, (await (await (await writer.StartTransaction(-1)).Write(events)).Commit()).NextExpectedVersion);
-				Assert.AreEqual(1, (await (await (await writer.StartTransaction(0)).Write(events.First())).Commit()).NextExpectedVersion);
-
-				var total = await EventsStream.Count(store, stream);
-				Assert.That(total, Is.EqualTo(events.Length + 1));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_0em1_0any_idempotent() {
-			const string stream =
-				"appending_to_implicitly_created_stream_using_transaction_sequence_0em1_0any_idempotent";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 1).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				var writer = new TransactionalWriter(store, stream);
-
-				Assert.AreEqual(0,
-					(await (await (await writer.StartTransaction(-1)).Write(events)).Commit()).NextExpectedVersion);
-				Assert.AreEqual(0,
-					(await (await (await writer.StartTransaction(ExpectedVersion.Any)).Write(events.First())).Commit())
-					.NextExpectedVersion);
-
-				var total = await EventsStream.Count(store, stream);
-				Assert.That(total, Is.EqualTo(events.Length));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_0em1_0em1_idempotent() {
-			const string stream =
-				"appending_to_implicitly_created_stream_using_transaction_sequence_0em1_0em1_idempotent";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 1).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				var writer = new TransactionalWriter(store, stream);
-
-				Assert.AreEqual(0, (await (await (await writer.StartTransaction(-1)).Write(events)).Commit()).NextExpectedVersion);
-				Assert.AreEqual(0, (await (await (await writer.StartTransaction(-1)).Write(events.First())).Commit()).NextExpectedVersion);
-
-				var total = await EventsStream.Count(store, stream);
-				Assert.That(total, Is.EqualTo(events.Length));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_0em1_1e0_2e1_1any_1any_idempotent() {
-			const string stream =
-				"appending_to_implicitly_created_stream_using_transaction_sequence_0em1_1e0_2e1_1any_1any_idempotent";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 3).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				var writer = new TransactionalWriter(store, stream);
-
-				Assert.AreEqual(2, (await (await (await writer.StartTransaction(-1)).Write(events)).Commit()).NextExpectedVersion);
-				Assert.AreEqual(1, (await (await (await (await writer.StartTransaction(ExpectedVersion.Any)).Write(events[1])).Write(events[1])).Commit()).NextExpectedVersion);
-
-				var total = await EventsStream.Count(store, stream);
-				Assert.That(total, Is.EqualTo(events.Length));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task sequence_S_0em1_1em1_E_S_0em1_1em1_2em1_E_idempotancy_fail() {
-			const string stream =
-				"appending_to_implicitly_created_stream_using_transaction_sequence_S_0em1_1em1_E_S_0em1_1em1_2em1_E_idempotancy_fail";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = Enumerable.Range(0, 2).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-				var writer = new TransactionalWriter(store, stream);
-
-				Assert.AreEqual(1, (await (await (await writer.StartTransaction(-1)).Write(events)).Commit()).NextExpectedVersion);
-				await AssertEx.ThrowsAsync<WrongExpectedVersionException>(async () =>
-					await (await (await writer.StartTransaction(-1)).Write(events.Concat(new[] { TestEvent.NewTestEvent(Guid.NewGuid()) }).ToArray())).Commit());
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/appending_to_streams_across_restart.cs b/src/EventStore.Core.Tests/ClientAPI/appending_to_streams_across_restart.cs
deleted file mode 100644
index 48866b3570d..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/appending_to_streams_across_restart.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class appending_to_streams_across_restart<TLogFormat, TStreamId> : SpecificationWithDirectory {
-		private MiniNode<TLogFormat, TStreamId> _node;
-
-		virtual protected IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.Create(node.TcpEndPoint);
-		}
-
-		[TearDown]
-		public override async Task TearDown() {
-			await _node?.Shutdown();
-			await base.TearDown();
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task detect_existing_streams_flush() {
-			void CreateNode() {
-				_node = new MiniNode<TLogFormat, TStreamId>(
-					pathname: PathName,
-					dbPath: Path.Combine(PathName, "mini-node-db"),
-					inMemDb: false,
-					streamExistenceFilterSize: 10_000,
-					streamExistenceFilterCheckpointIntervalMs: 100,
-					streamExistenceFilterCheckpointDelayMs: 0);
-			}
-
-			CreateNode();
-			await _node.Start();
-
-			// GIVEN some streams
-			var normal = "detect_existing_streams_normal";
-			var meta = "detect_existing_streams_meta";
-			var committed = "detect_existing_streams_commited_transaction";
-			var uncommitted = "detect_existing_streams_uncommited_transaction";
-
-			EventData[] GenEvents() => Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
-			var eventsByStream = new Dictionary<string, EventData[]>(){
-				{ normal, GenEvents() },
-				{ committed, GenEvents() },
-				{ uncommitted, GenEvents() },
-			};
-
-			var uncommittedTransId = 0L;
-
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				// normal
-				Assert.AreEqual(9, await store
-					.Apply(x => x.AppendToStreamAsync(normal, ExpectedVersion.NoStream, eventsByStream[normal]))
-					.Apply(x => x.NextExpectedVersion));
-
-				// meta
-				Assert.AreEqual(0, await store
-					.Apply(x => x.SetStreamMetadataAsync("meta", ExpectedVersion.NoStream, StreamMetadata.Create(maxCount: 5)))
-					.Apply(x => x.NextExpectedVersion));
-
-				if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
-					// committed
-					Assert.AreEqual(9, await new TransactionalWriter(store, committed)
-						.Apply(x => x.StartTransaction(-1))
-						.Apply(x => x.Write(eventsByStream[committed]))
-						.Apply(x => x.Commit())
-						.Apply(x => x.NextExpectedVersion));
-
-					// uncommitted
-					uncommittedTransId = await new TransactionalWriter(store, uncommitted)
-						.Apply(x => x.StartTransaction(-1))
-						.Apply(x => x.Write(eventsByStream[committed]))
-						.Apply(x => x.TransactionId);
-				}
-
-				// append an event to another stream because the last event is always going to get reinitialised
-				Assert.AreEqual(0, await store
-					.Apply(x => x.AppendToStreamAsync("another-stream", ExpectedVersion.NoStream, TestEvent.NewTestEvent(Guid.NewGuid())))
-					.Apply(x => x.NextExpectedVersion));
-			}
-
-			// WHEN flush and restart
-			await Task.Delay(500);
-			await _node.Shutdown(keepDb: true);
-			CreateNode();
-			await _node.Start();
-
-			// THEN the streams all exist
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				// normal
-				Assert.AreEqual(10, await store
-					.Apply(x => x.AppendToStreamAsync(normal, 9, TestEvent.NewTestEvent(Guid.NewGuid())))
-					.Apply(x => x.NextExpectedVersion));
-
-				Assert.AreEqual(
-					eventsByStream[normal].Length + 1,
-					await EventsStream.Count(store, normal));
-
-				// meta
-				Assert.AreEqual(1, await store
-					.Apply(x => x.SetStreamMetadataAsync("meta", 0, StreamMetadata.Create(maxCount: 6)))
-					.Apply(x => x.NextExpectedVersion));
-
-				Assert.AreEqual(0, await EventsStream.Count(store, meta));
-
-				if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
-					// committed
-					Assert.AreEqual(10, await store
-						.Apply(x => x.AppendToStreamAsync(committed, 9, TestEvent.NewTestEvent(Guid.NewGuid())))
-						.Apply(x => x.NextExpectedVersion));
-
-					Assert.AreEqual(
-						eventsByStream[committed].Length + 1,
-						await EventsStream.Count(store, committed));
-
-					// uncommitted
-					Assert.AreEqual(9, await new TransactionalWriter(store, uncommitted)
-						.Apply(x => x.ContinueTransaction(uncommittedTransId))
-						.Apply(x => x.Commit())
-						.Apply(x => x.NextExpectedVersion));
-
-					Assert.AreEqual(
-						eventsByStream[uncommitted].Length,
-						await EventsStream.Count(store, uncommitted));
-				}
-			}
-		}
-	}
-
-	public static class Extensions {
-		public async static Task<U> Apply<T, U>(this Task<T> x, Func<T, Task<U>> f) {
-			var r = await x;
-			return await f(r);
-		}
-
-		public static U Apply<T, U>(this T x, Func<T, U> f) {
-			return f(x);
-		}
-
-		public async static Task<U> Apply<T, U>(this T x, Func<T, Task<U>> f) {
-			return await f(x);
-		}
-
-		public async static Task<U> Apply<T, U>(this Task<T> x, Func<T, U> f) {
-			var r = await x;
-			return f(r);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/catch_up_subscription_handles_errors.cs b/src/EventStore.Core.Tests/ClientAPI/catch_up_subscription_handles_errors.cs
deleted file mode 100644
index 7b8dd093184..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/catch_up_subscription_handles_errors.cs
+++ /dev/null
@@ -1,642 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.ClientOperations;
-using EventStore.ClientAPI.Common.Log;
-using EventStore.ClientAPI.Internal;
-using EventStore.ClientAPI.SystemData;
-using NUnit.Framework;
-using ClientMessage = EventStore.ClientAPI.Messages.ClientMessage;
-using ResolvedEvent = EventStore.ClientAPI.ResolvedEvent;
-using StreamMetadata = EventStore.ClientAPI.StreamMetadata;
-using SystemSettings = EventStore.ClientAPI.SystemSettings;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[TestFixture, Category("ClientAPI"), Category("LongRunning")]
-	public class catch_up_subscription_handles_errors {
-		private static readonly int TimeoutMs = Debugger.IsAttached ? Timeout.Infinite : 2000;
-		private FakeEventStoreConnection _connection;
-		private IList<ResolvedEvent> _raisedEvents;
-		private bool _liveProcessingStarted;
-		private bool _isDropped;
-		private TaskCompletionSource<bool> _dropEvent;
-		private TaskCompletionSource<bool> _raisedEventEvent;
-		private Exception _dropException;
-		private SubscriptionDropReason _dropReason;
-		private EventStoreStreamCatchUpSubscription _subscription;
-		private static readonly string StreamId = "stream1";
-
-		[SetUp]
-		public void SetUp() {
-			_connection = new FakeEventStoreConnection();
-			_raisedEvents = new List<ResolvedEvent>();
-			_dropEvent = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-			_raisedEventEvent = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-			_liveProcessingStarted = false;
-			_isDropped = false;
-			_dropReason = SubscriptionDropReason.Unknown;
-			_dropException = null;
-
-			var settings = new CatchUpSubscriptionSettings(1, 1, false, false, String.Empty);
-			_subscription = new EventStoreStreamCatchUpSubscription(_connection, new NoopLogger(), StreamId, null, null,
-				(subscription, ev) => {
-					_raisedEvents.Add(ev);
-					if (_raisedEvents.Count >= 2) {
-						_raisedEventEvent.TrySetResult(true);
-					}
-					return Task.CompletedTask;
-				},
-				subscription => { _liveProcessingStarted = true; },
-				(subscription, reason, ex) => {
-					_isDropped = true;
-					_dropReason = reason;
-					_dropException = ex;
-					_dropEvent.TrySetResult(true);
-				},
-				settings);
-		}
-
-		[Test]
-		public async Task read_events_til_stops_subscription_when_throws_immediately() {
-			var expectedException = new ApplicationException("Test");
-
-			_connection.HandleReadStreamEventsForwardAsync((stream, start, max) => {
-				Assert.That(stream, Is.EqualTo(StreamId));
-				Assert.That(start, Is.EqualTo(0));
-				Assert.That(max, Is.EqualTo(1));
-				throw expectedException;
-			});
-
-			await AssertStartFailsAndDropsSubscriptionWithException(expectedException);
-		}
-
-		private async Task AssertStartFailsAndDropsSubscriptionWithException(ApplicationException expectedException) {
-			await AssertEx.ThrowsAsync<ApplicationException>(() => _subscription.StartAsync());
-			Assert.That(_isDropped);
-			Assert.That(_dropReason, Is.EqualTo(SubscriptionDropReason.CatchUpError));
-			Assert.That(_dropException, Is.SameAs(expectedException));
-			Assert.That(_liveProcessingStarted, Is.False);
-		}
-
-		[Test]
-		public async Task read_events_til_stops_subscription_when_throws_asynchronously() {
-			var expectedException = new ApplicationException("Test");
-			_connection.HandleReadStreamEventsForwardAsync((stream, start, max) => {
-				var taskCompletionSource =
-					new TaskCompletionSource<StreamEventsSlice>(TaskCreationOptions.RunContinuationsAsynchronously);
-				Assert.That(stream, Is.EqualTo(StreamId));
-				Assert.That(start, Is.EqualTo(0));
-				Assert.That(max, Is.EqualTo(1));
-				taskCompletionSource.SetException(expectedException);
-				return taskCompletionSource.Task;
-			});
-
-			await AssertStartFailsAndDropsSubscriptionWithException(expectedException);
-		}
-
-		[Test]
-		public async Task read_events_til_stops_subscription_when_second_read_throws_immediately() {
-			var expectedException = new ApplicationException("Test");
-
-			int callCount = 0;
-
-			_connection.HandleReadStreamEventsForwardAsync((stream, start, max) => {
-				Assert.That(stream, Is.EqualTo(StreamId));
-				Assert.That(max, Is.EqualTo(1));
-
-				if (callCount++ == 0) {
-					Assert.That(start, Is.EqualTo(0));
-					var taskCompletionSource =
-						new TaskCompletionSource<StreamEventsSlice>(TaskCreationOptions.RunContinuationsAsynchronously);
-					taskCompletionSource.SetResult(CreateStreamEventsSlice());
-					return taskCompletionSource.Task;
-				} else {
-					Assert.That(start, Is.EqualTo(1));
-					throw expectedException;
-				}
-			});
-
-			await AssertStartFailsAndDropsSubscriptionWithException(expectedException);
-			Assert.That(_raisedEvents.Count, Is.EqualTo(1));
-		}
-
-		[Test]
-		public async Task read_events_til_stops_subscription_when_second_read_throws_asynchronously() {
-			var expectedException = new ApplicationException("Test");
-
-			int callCount = 0;
-
-			_connection.HandleReadStreamEventsForwardAsync((stream, start, max) => {
-				Assert.That(stream, Is.EqualTo(StreamId));
-				Assert.That(max, Is.EqualTo(1));
-
-				if (callCount++ == 0) {
-					Assert.That(start, Is.EqualTo(0));
-					var taskCompletionSource =
-						new TaskCompletionSource<StreamEventsSlice>(TaskCreationOptions.RunContinuationsAsynchronously);
-					taskCompletionSource.SetResult(CreateStreamEventsSlice());
-					return taskCompletionSource.Task;
-				} else {
-					Assert.That(start, Is.EqualTo(1));
-					var taskCompletionSource =
-						new TaskCompletionSource<StreamEventsSlice>(TaskCreationOptions.RunContinuationsAsynchronously);
-					taskCompletionSource.SetException(expectedException);
-					return taskCompletionSource.Task;
-				}
-			});
-
-			await AssertStartFailsAndDropsSubscriptionWithException(expectedException);
-			Assert.That(_raisedEvents.Count, Is.EqualTo(1));
-		}
-
-		[Test]
-		public async Task start_stops_subscription_if_subscribe_fails_immediately() {
-			var expectedException = new ApplicationException("Test");
-
-			_connection.HandleReadStreamEventsForwardAsync((stream, start, max) => {
-				var taskCompletionSource =
-					new TaskCompletionSource<StreamEventsSlice>(TaskCreationOptions.RunContinuationsAsynchronously);
-				taskCompletionSource.SetResult(CreateStreamEventsSlice(isEnd: true));
-				return taskCompletionSource.Task;
-			});
-
-			_connection.HandleSubscribeToStreamAsync((stream, raise, drop) => {
-				Assert.That(stream, Is.EqualTo(StreamId));
-				throw expectedException;
-			});
-
-			await AssertStartFailsAndDropsSubscriptionWithException(expectedException);
-			Assert.That(_raisedEvents.Count, Is.EqualTo(1));
-		}
-
-		[Test]
-		public async Task start_stops_subscription_if_subscribe_fails_async() {
-			var expectedException = new ApplicationException("Test");
-
-			_connection.HandleReadStreamEventsForwardAsync((stream, start, max) => {
-				var taskCompletionSource =
-					new TaskCompletionSource<StreamEventsSlice>(TaskCreationOptions.RunContinuationsAsynchronously);
-				taskCompletionSource.SetResult(CreateStreamEventsSlice(isEnd: true));
-				return taskCompletionSource.Task;
-			});
-
-			_connection.HandleSubscribeToStreamAsync((stream, raise, drop) => {
-				var taskCompletionSource =
-					new TaskCompletionSource<EventStoreSubscription>(TaskCreationOptions
-						.RunContinuationsAsynchronously);
-				taskCompletionSource.SetException(expectedException);
-				return taskCompletionSource.Task;
-			});
-
-			await AssertStartFailsAndDropsSubscriptionWithException(expectedException);
-			Assert.That(_raisedEvents.Count, Is.EqualTo(1));
-		}
-
-		[Test]
-		public async Task start_stops_subscription_if_historical_missed_events_load_fails_immediate() {
-			var expectedException = new ApplicationException("Test");
-
-			int callCount = 0;
-			_connection.HandleReadStreamEventsForwardAsync((stream, start, max) => {
-				if (callCount++ == 0) {
-					var taskCompletionSource =
-						new TaskCompletionSource<StreamEventsSlice>(TaskCreationOptions.RunContinuationsAsynchronously);
-					taskCompletionSource.SetResult(CreateStreamEventsSlice(isEnd: true));
-					return taskCompletionSource.Task;
-				} else {
-					Assert.That(start, Is.EqualTo(1));
-					throw expectedException;
-				}
-			});
-
-			_connection.HandleSubscribeToStreamAsync((stream, raise, drop) => {
-				var taskCompletionSource =
-					new TaskCompletionSource<EventStoreSubscription>(TaskCreationOptions
-						.RunContinuationsAsynchronously);
-				taskCompletionSource.SetResult(CreateVolatileSubscription(raise, drop, 1));
-				return taskCompletionSource.Task;
-			});
-
-			await AssertStartFailsAndDropsSubscriptionWithException(expectedException);
-			Assert.That(_raisedEvents.Count, Is.EqualTo(1));
-		}
-
-
-		[Test]
-		public async Task start_stops_subscription_if_historical_missed_events_load_fails_async() {
-			var expectedException = new ApplicationException("Test");
-
-			int callCount = 0;
-			_connection.HandleReadStreamEventsForwardAsync((stream, start, max) => {
-				if (callCount++ == 0) {
-					var taskCompletionSource =
-						new TaskCompletionSource<StreamEventsSlice>(TaskCreationOptions.RunContinuationsAsynchronously);
-					taskCompletionSource.SetResult(CreateStreamEventsSlice(isEnd: true));
-					return taskCompletionSource.Task;
-				} else {
-					Assert.That(start, Is.EqualTo(1));
-					var taskCompletionSource =
-						new TaskCompletionSource<StreamEventsSlice>(TaskCreationOptions.RunContinuationsAsynchronously);
-					taskCompletionSource.SetException(expectedException);
-					return taskCompletionSource.Task;
-				}
-			});
-
-			_connection.HandleSubscribeToStreamAsync((stream, raise, drop) => {
-				var taskCompletionSource =
-					new TaskCompletionSource<EventStoreSubscription>(TaskCreationOptions
-						.RunContinuationsAsynchronously);
-				taskCompletionSource.SetResult(CreateVolatileSubscription(raise, drop, 1));
-				return taskCompletionSource.Task;
-			});
-
-			await AssertStartFailsAndDropsSubscriptionWithException(expectedException);
-			Assert.That(_raisedEvents.Count, Is.EqualTo(1));
-		}
-
-		[Test]
-		public async Task start_completes_onces_subscription_is_live() {
-			var finalEvent = new ManualResetEventSlim();
-			int callCount = 0;
-			_connection.HandleReadStreamEventsForwardAsync((stream, start, max) => Task.Run(() => {
-				callCount++;
-
-				if (callCount == 1) {
-					return Task.FromResult(CreateStreamEventsSlice(isEnd: true));
-				} else if (callCount == 2) {
-					var result = Task.FromResult(CreateStreamEventsSlice(fromEvent: 1, isEnd: true));
-					Assert.That(finalEvent.Wait(TimeoutMs));
-					return result;
-				} else {
-					throw new InvalidOperationException("Should not get a third call");
-				}
-			}));
-
-			_connection.HandleSubscribeToStreamAsync((stream, raise, drop) =>
-				Task.FromResult<EventStoreSubscription>(CreateVolatileSubscription(raise, drop, 1)));
-
-			var task = _subscription.StartAsync();
-
-			Assert.That(task.Status, Is.Not.EqualTo(TaskStatus.RanToCompletion));
-
-			finalEvent.Set();
-
-			await task.WithTimeout(TimeoutMs);
-		}
-
-		private static VolatileEventStoreSubscription CreateVolatileSubscription(
-			Func<EventStoreSubscription, ResolvedEvent, Task> raise,
-			Action<EventStoreSubscription, SubscriptionDropReason, Exception> drop, int? lastEventNumber) {
-			return new VolatileEventStoreSubscription(
-				new VolatileSubscriptionOperation(new NoopLogger(),
-					new TaskCompletionSource<EventStoreSubscription>(TaskCreationOptions
-						.RunContinuationsAsynchronously), StreamId, false, null, raise, drop, false, () => null),
-				StreamId, -1, lastEventNumber);
-		}
-
-		private static StreamEventsSlice CreateStreamEventsSlice(int fromEvent = 0, int count = 1, bool isEnd = false) {
-			var events = Enumerable.Range(0, count)
-				.Select(
-					i =>
-						new ClientMessage.ResolvedIndexedEvent(
-							new ClientMessage.EventRecord(StreamId, i, Guid.NewGuid().ToByteArray(), null, 0, 0, null,
-								null, null, null), null))
-				.ToArray();
-
-			return new StreamEventsSlice(SliceReadStatus.Success, StreamId, fromEvent, ReadDirection.Forward, events,
-				fromEvent + count, 100, isEnd);
-		}
-	}
-
-	internal class FakeEventStoreConnection : IEventStoreConnection {
-		private Func<Position, int, bool, UserCredentials, Task<AllEventsSlice>> _readAllEventsForwardAsync;
-		private Func<string, long, int, Task<StreamEventsSlice>> _readStreamEventsForwardAsync;
-
-		private Func<string, Func<EventStoreSubscription, ResolvedEvent, Task>,
-				Action<EventStoreSubscription, SubscriptionDropReason, Exception>, Task<EventStoreSubscription>>
-			_subscribeToStreamAsync;
-
-		private Func<bool, Func<EventStoreSubscription, ResolvedEvent, Task>,
-				Action<EventStoreSubscription, SubscriptionDropReason, Exception>, Task<EventStoreSubscription>>
-			_subscribeToAllAsync;
-
-		public void Dispose() {
-			throw new NotImplementedException();
-		}
-
-		public string ConnectionName { get; }
-
-		public ConnectionSettings Settings {
-			get { return null; }
-		}
-
-		public Task ConnectAsync() {
-			throw new NotImplementedException();
-		}
-
-		public void Close() {
-			throw new NotImplementedException();
-		}
-
-		public Task<DeleteResult> DeleteStreamAsync(string stream, long expectedVersion,
-			UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public Task<DeleteResult> DeleteStreamAsync(string stream, long expectedVersion, bool hardDelete,
-			UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public Task<WriteResult> AppendToStreamAsync(string stream, long expectedVersion, params EventData[] events) {
-			throw new NotImplementedException();
-		}
-
-		public Task<WriteResult> AppendToStreamAsync(string stream, long expectedVersion,
-			UserCredentials userCredentials, params EventData[] events) {
-			throw new NotImplementedException();
-		}
-
-		public Task<WriteResult> AppendToStreamAsync(string stream, long expectedVersion, IEnumerable<EventData> events,
-			UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public Task<ConditionalWriteResult> ConditionalAppendToStreamAsync(string stream, long expectedVersion,
-			IEnumerable<EventData> events,
-			UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public Task<EventStoreTransaction> StartTransactionAsync(string stream, long expectedVersion,
-			UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public EventStoreTransaction ContinueTransaction(long transactionId, UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public Task<EventReadResult> ReadEventAsync(string stream, long eventNumber, bool resolveLinkTos,
-			UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public void HandleReadStreamEventsForwardAsync(Func<string, long, int, Task<StreamEventsSlice>> callback) {
-			_readStreamEventsForwardAsync = callback;
-		}
-
-		public Task<StreamEventsSlice> ReadStreamEventsForwardAsync(string stream, long start, int count,
-			bool resolveLinkTos,
-			UserCredentials userCredentials = null) {
-			return _readStreamEventsForwardAsync(stream, start, count);
-		}
-
-		public Task<StreamEventsSlice> ReadStreamEventsBackwardAsync(string stream, long start, int count,
-			bool resolveLinkTos,
-			UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public void HandleReadAllEventsForwardAsync(
-			Func<Position, int, bool, UserCredentials, Task<AllEventsSlice>> callback) {
-			_readAllEventsForwardAsync = callback;
-		}
-
-		public Task<AllEventsSlice> ReadAllEventsForwardAsync(Position position, int maxCount, bool resolveLinkTos,
-			UserCredentials userCredentials = null) {
-			return _readAllEventsForwardAsync(position, maxCount, resolveLinkTos, userCredentials);
-		}
-
-		public Task<AllEventsSlice> FilteredReadAllEventsForwardAsync(Position position, int maxCount, bool resolveLinkTos, Filter filter,
-			UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public Task<AllEventsSlice> FilteredReadAllEventsForwardAsync(Position position, int maxCount, bool resolveLinkTos, Filter filter,
-			int maxSearchWindow, UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public Task<AllEventsSlice> ReadAllEventsBackwardAsync(Position position, int maxCount, bool resolveLinkTos,
-			UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public Task<AllEventsSlice> FilteredReadAllEventsBackwardAsync(Position position, int maxCount, bool resolveLinkTos, Filter filter,
-			int maxSearchWindow, UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public Task<AllEventsSlice> FilteredReadAllEventsBackwardAsync(Position position, int maxCount, bool resolveLinkTos, Filter filter,
-			UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public void HandleSubscribeToStreamAsync(
-			Func<string, Func<EventStoreSubscription, ResolvedEvent, Task>,
-					Action<EventStoreSubscription, SubscriptionDropReason, Exception>, Task<EventStoreSubscription>>
-				callback) {
-			_subscribeToStreamAsync = callback;
-		}
-
-		public Task<EventStoreSubscription> SubscribeToStreamAsync(string stream, bool resolveLinkTos,
-			Func<EventStoreSubscription, ResolvedEvent, Task> eventAppeared,
-			Action<EventStoreSubscription, SubscriptionDropReason, Exception> subscriptionDropped = null,
-			UserCredentials userCredentials = null) {
-			return _subscribeToStreamAsync(stream, eventAppeared, subscriptionDropped);
-		}
-
-		public EventStoreStreamCatchUpSubscription SubscribeToStreamFrom(string stream, long? lastCheckpoint,
-			bool resolveLinkTos,
-			Func<EventStoreCatchUpSubscription, ResolvedEvent, Task> eventAppeared,
-			Action<EventStoreCatchUpSubscription> liveProcessingStarted = null,
-			Action<EventStoreCatchUpSubscription, SubscriptionDropReason, Exception> subscriptionDropped = null,
-			UserCredentials userCredentials = null, int readBatchSize = 500, string subscriptionName = "") {
-			throw new NotImplementedException();
-		}
-
-		public EventStoreStreamCatchUpSubscription SubscribeToStreamFrom(
-			string stream,
-			long? lastCheckpoint,
-			CatchUpSubscriptionSettings settings,
-			Func<EventStoreCatchUpSubscription, ResolvedEvent, Task> eventAppeared,
-			Action<EventStoreCatchUpSubscription> liveProcessingStarted = null,
-			Action<EventStoreCatchUpSubscription, SubscriptionDropReason, Exception> subscriptionDropped = null,
-			UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public void HandleSubscribeToAllAsync(
-			Func<bool, Func<EventStoreSubscription, ResolvedEvent, Task>,
-					Action<EventStoreSubscription, SubscriptionDropReason, Exception>, Task<EventStoreSubscription>>
-				callback) {
-			_subscribeToAllAsync = callback;
-		}
-
-		public Task<EventStoreSubscription> SubscribeToAllAsync(bool resolveLinkTos,
-			Func<EventStoreSubscription, ResolvedEvent, Task> eventAppeared,
-			Action<EventStoreSubscription, SubscriptionDropReason, Exception> subscriptionDropped = null,
-			UserCredentials userCredentials = null) {
-			return _subscribeToAllAsync(resolveLinkTos, eventAppeared, subscriptionDropped);
-		}
-
-		public Task<EventStoreSubscription> FilteredSubscribeToAllAsync(bool resolveLinkTos, Filter filter, Func<EventStoreSubscription, ResolvedEvent, Task> eventAppeared, Func<EventStoreSubscription, Position, Task> checkpointReached,
-			int checkpointInterval, Action<EventStoreSubscription, SubscriptionDropReason, Exception> subscriptionDropped = null, UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public Task<EventStoreSubscription> FilteredSubscribeToAllAsync(bool resolveLinkTos, Filter filter, Func<EventStoreSubscription, ResolvedEvent, Task> eventAppeared,
-			Action<EventStoreSubscription, SubscriptionDropReason, Exception> subscriptionDropped = null, UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public Task<EventStoreSubscription> SubscribeToAllFilteredAsync(bool resolveLinkTos, Filter filter,
-			Func<EventStoreSubscription, ResolvedEvent, Task> eventAppeared,
-			Func<EventStoreSubscription, Position, Task> checkpointReached = null,
-			int? checkpointInterval = null,
-			Action<EventStoreSubscription, SubscriptionDropReason, Exception> subscriptionDropped = null,
-			UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public EventStorePersistentSubscriptionBase ConnectToPersistentSubscription(string stream, string groupName,
-			Func<EventStorePersistentSubscriptionBase, ResolvedEvent, int?, Task> eventAppeared,
-			Action<EventStorePersistentSubscriptionBase, SubscriptionDropReason, Exception> subscriptionDropped = null,
-			UserCredentials userCredentials = null, int bufferSize = 10,
-			bool autoAck = true) {
-			throw new NotImplementedException();
-		}
-
-		public Task<EventStorePersistentSubscriptionBase> ConnectToPersistentSubscriptionAsync(string stream,
-			string groupName, Func<EventStorePersistentSubscriptionBase, ResolvedEvent, int?, Task> eventAppeared,
-			Action<EventStorePersistentSubscriptionBase, SubscriptionDropReason, Exception> subscriptionDropped = null,
-			UserCredentials userCredentials = null, int bufferSize = 10,
-			bool autoAck = true) {
-			throw new NotImplementedException();
-		}
-
-		public EventStoreAllCatchUpSubscription SubscribeToAllFrom(Position? lastCheckpoint, bool resolveLinkTos,
-			Func<EventStoreCatchUpSubscription, ResolvedEvent, Task> eventAppeared,
-			Action<EventStoreCatchUpSubscription> liveProcessingStarted = null,
-			Action<EventStoreCatchUpSubscription, SubscriptionDropReason, Exception> subscriptionDropped = null,
-			UserCredentials userCredentials = null,
-			int readBatchSize = 500,
-			string subscriptionName = "") {
-			throw new NotImplementedException();
-		}
-
-		public EventStoreAllCatchUpSubscription SubscribeToAllFrom(
-			Position? lastCheckpoint,
-			CatchUpSubscriptionSettings settings,
-			Func<EventStoreCatchUpSubscription, ResolvedEvent, Task> eventAppeared,
-			Action<EventStoreCatchUpSubscription> liveProcessingStarted = null,
-			Action<EventStoreCatchUpSubscription, SubscriptionDropReason, Exception> subscriptionDropped = null,
-			UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public EventStoreAllFilteredCatchUpSubscription FilteredSubscribeToAllFrom(Position? lastCheckpoint, Filter filter,
-			CatchUpSubscriptionFilteredSettings settings, Func<EventStoreCatchUpSubscription, ResolvedEvent, Task> eventAppeared, Func<EventStoreCatchUpSubscription, Position, Task> checkpointReached,
-			int checkpointIntervalMultiplier, Action<EventStoreCatchUpSubscription> liveProcessingStarted = null, Action<EventStoreCatchUpSubscription, SubscriptionDropReason, Exception> subscriptionDropped = null,
-			UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public EventStoreAllFilteredCatchUpSubscription FilteredSubscribeToAllFrom(Position? lastCheckpoint, Filter filter,
-			CatchUpSubscriptionFilteredSettings settings, Func<EventStoreCatchUpSubscription, ResolvedEvent, Task> eventAppeared, Action<EventStoreCatchUpSubscription> liveProcessingStarted = null,
-			Action<EventStoreCatchUpSubscription, SubscriptionDropReason, Exception> subscriptionDropped = null, UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public Task UpdatePersistentSubscriptionAsync(string stream, string groupName,
-			PersistentSubscriptionSettings settings,
-			UserCredentials credentials) {
-			throw new NotImplementedException();
-		}
-
-		public Task CreatePersistentSubscriptionAsync(string stream, string groupName,
-			PersistentSubscriptionSettings settings,
-			UserCredentials credentials) {
-			throw new NotImplementedException();
-		}
-
-		public Task DeletePersistentSubscriptionAsync(string stream, string groupName,
-			UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public Task<WriteResult> SetStreamMetadataAsync(string stream, long expectedMetastreamVersion,
-			StreamMetadata metadata,
-			UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public Task<WriteResult> SetStreamMetadataAsync(string stream, long expectedMetastreamVersion, byte[] metadata,
-			UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public Task<StreamMetadataResult>
-			GetStreamMetadataAsync(string stream, UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public Task<RawStreamMetadataResult> GetStreamMetadataAsRawBytesAsync(string stream,
-			UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public Task SetSystemSettingsAsync(SystemSettings settings, UserCredentials userCredentials = null) {
-			throw new NotImplementedException();
-		}
-
-		public event EventHandler<ClientConnectionEventArgs> Connected;
-		public event EventHandler<ClientConnectionEventArgs> Disconnected;
-		public event EventHandler<ClientReconnectingEventArgs> Reconnecting;
-		public event EventHandler<ClientClosedEventArgs> Closed;
-		public event EventHandler<ClientErrorEventArgs> ErrorOccurred;
-		public event EventHandler<ClientAuthenticationFailedEventArgs> AuthenticationFailed;
-
-		protected virtual void OnErrorOccurred(ClientErrorEventArgs e) {
-			var handler = ErrorOccurred;
-			if (handler != null)
-				handler(this, e);
-		}
-
-		protected virtual void OnAuthenticationFailed(ClientAuthenticationFailedEventArgs e) {
-			var handler = AuthenticationFailed;
-			if (handler != null)
-				handler(this, e);
-		}
-
-		protected virtual void OnClosed(ClientClosedEventArgs e) {
-			var handler = Closed;
-			if (handler != null)
-				handler(this, e);
-		}
-
-		protected virtual void OnReconnecting(ClientReconnectingEventArgs e) {
-			var handler = Reconnecting;
-			if (handler != null)
-				handler(this, e);
-		}
-
-		protected virtual void OnDisconnected(ClientConnectionEventArgs e) {
-			var handler = Disconnected;
-			if (handler != null)
-				handler(this, e);
-		}
-
-		public void OnConnected(ClientConnectionEventArgs e) {
-			var handler = Connected;
-			if (handler != null)
-				handler(this, e);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/catchup_filtered_subscription.cs b/src/EventStore.Core.Tests/ClientAPI/catchup_filtered_subscription.cs
deleted file mode 100644
index 35f6f94e56d..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/catchup_filtered_subscription.cs
+++ /dev/null
@@ -1,245 +0,0 @@
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Services;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("LongRunning"), Category("ClientAPI")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class catchup_filtered_subscription<TLogFormat, TStreamId> : SpecificationWithDirectory {
-		private MiniNode<TLogFormat, TStreamId> _node;
-		private IEventStoreConnection _conn;
-		private List<EventData> _testEvents;
-		private List<EventData> _testEventsAfter;
-		private const int Timeout = 10000;
-
-		[SetUp]
-		public override async Task SetUp() {
-			await base.SetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-
-			_conn = BuildConnection(_node);
-			await _conn.ConnectAsync();
-			_conn.SetStreamMetadataAsync(SystemStreams.AllStream, -1,
-				StreamMetadata.Build().SetReadRole(SystemRoles.All),
-				new UserCredentials(SystemUsers.Admin, SystemUsers.DefaultAdminPassword)).Wait();
-
-			_testEvents = Enumerable
-				.Range(0, 10)
-				.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "AEvent"))
-				.ToList();
-
-			_testEvents.AddRange(
-				Enumerable
-					.Range(0, 10)
-					.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "BEvent")).ToList());
-
-			_testEventsAfter = Enumerable
-				.Range(0, 10)
-				.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "AEvent"))
-				.ToList();
-
-			_testEventsAfter.AddRange(
-				Enumerable
-					.Range(0, 10)
-					.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "BEvent")).ToList());
-
-			await _conn.AppendToStreamAsync("stream-a", ExpectedVersion.NoStream, _testEvents.EvenEvents());
-			await _conn.AppendToStreamAsync("stream-b", ExpectedVersion.NoStream, _testEvents.OddEvents());
-		}
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.Create(node.TcpEndPoint);
-		}
-
-		[Test]
-		public void calls_checkpoint_delegate_during_catchup() {
-			var filter = Filter.StreamId.Prefix("stream-a");
-			// in v2 there are 20 events, 10 in stream-a and 10 in stream-b.
-			// in v3 there are additionally two stream records and two event type records
-			var isV2 = LogFormatHelper<TLogFormat, TStreamId>.IsV2;
-			var checkpointReached = new CountdownEvent(isV2 ? 10 : 14);
-			var eventsSeen = 0;
-
-			var settings = new CatchUpSubscriptionFilteredSettings(
-				maxLiveQueueSize: 10000,
-				readBatchSize: 2,
-				verboseLogging: false,
-				resolveLinkTos: true,
-				maxSearchWindow: 2,
-				subscriptionName: String.Empty
-			);
-
-			_conn.FilteredSubscribeToAllFrom(
-				Position.Start,
-				filter,
-				settings,
-				(s, e) => {
-					eventsSeen++;
-					return Task.CompletedTask;
-				},
-				(s, p) => {
-					checkpointReached.Signal();
-					return Task.CompletedTask;
-				}, 1);
-
-			if (!checkpointReached.Wait(Timeout)) {
-				Assert.Fail("Checkpoint reached not called enough times within time limit.");
-			}
-
-			Assert.AreEqual(10, eventsSeen);
-		}
-
-		[Test]
-		public void calls_checkpoint_during_live_processing_stage() {
-			var filter = Filter.StreamId.Prefix("stream-a");
-			var appeared = new CountdownEvent(_testEventsAfter.EvenEvents().Count + 1); // Calls once for switch to live.
-			var eventsSeen = 0;
-			var isLive = false;
-
-			var settings = new CatchUpSubscriptionFilteredSettings(
-				10000,
-				1,
-				verboseLogging: false,
-				resolveLinkTos: true,
-				maxSearchWindow: 1,
-				subscriptionName: String.Empty
-			);
-
-			_conn.FilteredSubscribeToAllFrom(
-				Position.Start,
-				filter,
-				settings,
-				(s, e) => {
-					eventsSeen++;
-					return Task.CompletedTask;
-				},
-				(s, p) => {
-					if (isLive) {
-						appeared.Signal();
-					}
-
-					return Task.CompletedTask;
-				}, 1, s => {
-					isLive = true;
-					_conn.AppendToStreamAsync("stream-a", ExpectedVersion.Any, _testEventsAfter.EvenEvents()).Wait();
-				});
-
-			if (!appeared.Wait(Timeout)) {
-				Assert.Fail("Checkpoint appeared not called enough times within time limit.");
-			}
-
-			Assert.AreEqual(20, eventsSeen);
-		}
-
-		[Test, Category("LongRunning")]
-		public void only_return_events_with_a_given_stream_prefix() {
-			var filter = Filter.StreamId.Prefix("stream-a");
-			var foundEvents = new ConcurrentBag<ResolvedEvent>();
-			var appeared = new CountdownEvent(20);
-
-			Subscribe(filter, foundEvents, appeared);
-
-			if (!appeared.Wait(Timeout)) {
-				Assert.Fail("Appeared countdown event timed out.");
-			}
-
-			Assert.True(foundEvents.All(e => e.Event.EventStreamId == "stream-a"));
-		}
-
-		[Test, Category("LongRunning")]
-		public void only_return_events_with_a_given_event_prefix() {
-			var filter = Filter.EventType.Prefix("AE");
-			var foundEvents = new ConcurrentBag<ResolvedEvent>();
-			var appeared = new CountdownEvent(20);
-
-			Subscribe(filter, foundEvents, appeared);
-
-			if (!appeared.Wait(Timeout)) {
-				Assert.Fail("Appeared countdown event timed out.");
-			}
-
-			Assert.True(foundEvents.All(e => e.Event.EventType == "AEvent"));
-		}
-
-		[Test, Category("LongRunning")]
-		public void only_return_events_that_satisfy_a_given_stream_regex() {
-			var filter = Filter.StreamId.Regex(new Regex(@"^.*eam-b.*$"));
-			var foundEvents = new ConcurrentBag<ResolvedEvent>();
-			var appeared = new CountdownEvent(20);
-
-			Subscribe(filter, foundEvents, appeared);
-
-			if (!appeared.Wait(Timeout)) {
-				Assert.Fail("Appeared countdown event timed out.");
-			}
-
-			Assert.True(foundEvents.All(e => e.Event.EventStreamId == "stream-b"));
-		}
-
-		[Test, Category("LongRunning")]
-		public void only_return_events_that_satisfy_a_given_event_regex() {
-			var filter = Filter.EventType.Regex(new Regex(@"^.*BEv.*$"));
-			var foundEvents = new ConcurrentBag<ResolvedEvent>();
-			var appeared = new CountdownEvent(20);
-
-			Subscribe(filter, foundEvents, appeared);
-
-			if (!appeared.Wait(Timeout)) {
-				Assert.Fail("Appeared countdown event timed out.");
-			}
-
-			Assert.True(foundEvents.All(e => e.Event.EventType == "BEvent"));
-		}
-
-		[Test, Category("LongRunning")]
-		public void only_return_events_that_are_not_system_events() {
-			var filter = Filter.ExcludeSystemEvents;
-			var foundEvents = new ConcurrentBag<ResolvedEvent>();
-			var appeared = new CountdownEvent(20);
-
-			Subscribe(filter, foundEvents, appeared);
-
-			if (!appeared.Wait(Timeout)) {
-				Assert.Fail("Appeared countdown event timed out.");
-			}
-
-			Assert.True(foundEvents.All(e => !e.Event.EventType.StartsWith("$")));
-		}
-
-		private void Subscribe(Filter filter, ConcurrentBag<ResolvedEvent> foundEvents, CountdownEvent appeared) {
-			_conn.FilteredSubscribeToAllFrom(
-				Position.Start,
-				filter,
-				CatchUpSubscriptionFilteredSettings.Default,
-				(s, e) => {
-					foundEvents.Add(e);
-					appeared.Signal();
-					return Task.CompletedTask;
-				},
-				(s, p) => Task.CompletedTask, 5,
-				s => {
-					_conn.AppendToStreamAsync("stream-a", ExpectedVersion.Any, _testEventsAfter.EvenEvents()).Wait();
-					_conn.AppendToStreamAsync("stream-b", ExpectedVersion.Any, _testEventsAfter.OddEvents()).Wait();
-				});
-		}
-
-		[TearDown]
-		public override async Task TearDown() {
-			_conn.Close();
-			await _node.Shutdown();
-			await base.TearDown();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/catchup_subscription_handles_small_batch_sizes.cs b/src/EventStore.Core.Tests/ClientAPI/catchup_subscription_handles_small_batch_sizes.cs
deleted file mode 100644
index 661b2ee35c7..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/catchup_subscription_handles_small_batch_sizes.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Ignore("Very long running")]
-	[Category("LongRunning"), Category("ClientAPI")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class catchup_subscription_handles_small_batch_sizes<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private MiniNode<TLogFormat, TStreamId> _node;
-		private string _streamName = "TestStream";
-		private CatchUpSubscriptionSettings _settings;
-		private IEventStoreConnection _conn;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName, inMemDb: true);
-			await _node.Start();
-
-			_conn = BuildConnection(_node);
-			await _conn.ConnectAsync();
-			//Create 80000 events
-			for (var i = 0; i < 80; i++) {
-				await _conn.AppendToStreamAsync(_streamName, ExpectedVersion.Any, CreateThousandEvents());
-			}
-
-			_settings = new CatchUpSubscriptionSettings(100, 1, false, true, String.Empty);
-		}
-
-		private EventData[] CreateThousandEvents() {
-			var events = new List<EventData>();
-			for (var i = 0; i < 1000; i++) {
-				events.Add(new EventData(Guid.NewGuid(), "testEvent", true,
-					Encoding.UTF8.GetBytes("{ \"Foo\":\"Bar\" }"), null));
-			}
-
-			return events.ToArray();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			_conn.Dispose();
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.Create(node.TcpEndPoint);
-		}
-
-		[Test]
-		public void CatchupSubscriptionToAllHandlesManyEventsWithSmallBatchSize() {
-			var mre = new ManualResetEvent(false);
-			_conn.SubscribeToAllFrom(null, _settings, (sub, evnt) => {
-				if (evnt.OriginalEventNumber % 1000 == 0) {
-					Console.WriteLine("Processed {0} events", evnt.OriginalEventNumber);
-				}
-
-				return Task.CompletedTask;
-			}, (sub) => { mre.Set(); }, null, new UserCredentials("admin", "changeit"));
-
-			if (!mre.WaitOne(TimeSpan.FromMinutes(10)))
-				Assert.Fail("Timed out waiting for test to complete");
-		}
-
-		[Test]
-		public void CatchupSubscriptionToStreamHandlesManyEventsWithSmallBatchSize() {
-			var mre = new ManualResetEvent(false);
-			_conn.SubscribeToStreamFrom(_streamName, null, _settings, (sub, evnt) => {
-				if (evnt.OriginalEventNumber % 1000 == 0) {
-					Console.WriteLine("Processed {0} events", evnt.OriginalEventNumber);
-				}
-
-				return Task.CompletedTask;
-			}, (sub) => { mre.Set(); }, null, new UserCredentials("admin", "changeit"));
-
-			if (!mre.WaitOne(TimeSpan.FromMinutes(10)))
-				Assert.Fail("Timed out waiting for test to complete");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/connect.cs b/src/EventStore.Core.Tests/ClientAPI/connect.cs
deleted file mode 100644
index 7d2dcb48f20..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/connect.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-using System;
-using System.Net;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Internal;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string), TcpType.Normal)]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), TcpType.Normal)]
-	[TestFixture(typeof(LogFormat.V2), typeof(string), TcpType.Ssl)]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), TcpType.Ssl)]
-	public class Connect<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private readonly TcpType _tcpType;
-
-		public Connect(TcpType tcpType) {
-			_tcpType = tcpType;
-		}
-
-		//TODO GFY THESE NEED TO BE LOOKED AT IN LINUX
-		[Test, Category("Network")]
-		public async Task should_not_throw_exception_when_server_is_down() {
-			var ip = IPAddress.Loopback;
-			int port = PortsHelper.GetAvailablePort(ip);
-			using var connection = TestConnection.Create(new IPEndPoint(ip, port), _tcpType);
-			await connection.ConnectAsync();
-		}
-
-		//TODO GFY THESE NEED TO BE LOOKED AT IN LINUX
-		[Test, Category("Network")]
-		public async Task should_throw_exception_when_trying_to_reopen_closed_connection() {
-			ClientApiLoggerBridge.Default.Info("Starting '{0}' test...",
-				"should_throw_exception_when_trying_to_reopen_closed_connection");
-
-			var closed = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-			var settings = ConnectionSettings.Create()
-				.EnableVerboseLogging()
-				.UseCustomLogger(ClientApiLoggerBridge.Default)
-				.LimitReconnectionsTo(0)
-				.WithConnectionTimeoutOf(TimeSpan.FromSeconds(10))
-				.SetReconnectionDelayTo(TimeSpan.FromMilliseconds(0))
-				.FailOnNoServerResponse();
-			if (_tcpType == TcpType.Ssl) {
-				settings.DisableServerCertificateValidation();
-			} else {
-				settings.DisableTls();
-			}
-
-			var ip = IPAddress.Loopback;
-			int port = PortsHelper.GetAvailablePort(ip);
-			using var connection = EventStoreConnection.Create(settings, new IPEndPoint(ip, port).ToESTcpUri());
-			connection.Closed += (s, e) => closed.TrySetResult(true);
-
-			await connection.ConnectAsync();
-
-			await closed.Task.WithTimeout(
-				TimeSpan.FromSeconds(120)); // TCP connection timeout might be even 60 seconds
-
-			await AssertEx.ThrowsAsync<ObjectDisposedException>(() => connection.ConnectAsync().WithTimeout());
-		}
-
-		//TODO GFY THIS TEST TIMES OUT IN LINUX.
-		[Test, Category("Network")]
-		public async Task should_close_connection_after_configured_amount_of_failed_reconnections() {
-			var closed = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-			var settings =
-				ConnectionSettings.Create()
-					.EnableVerboseLogging()
-					.UseCustomLogger(ClientApiLoggerBridge.Default)
-					.LimitReconnectionsTo(1)
-					.WithConnectionTimeoutOf(TimeSpan.FromSeconds(10))
-					.SetReconnectionDelayTo(TimeSpan.FromMilliseconds(0))
-					.FailOnNoServerResponse();
-			if (_tcpType == TcpType.Ssl) {
-				settings.DisableServerCertificateValidation();
-			} else {
-				settings.DisableTls();
-			}
-
-			var ip = IPAddress.Loopback;
-			int port = PortsHelper.GetAvailablePort(ip);
-			using var connection = EventStoreConnection.Create(settings, new IPEndPoint(ip, port).ToESTcpUri());
-			connection.Closed += (s, e) => closed.TrySetResult(true);
-			connection.Connected += (s, e) =>
-				Console.WriteLine("EventStoreConnection '{0}': connected to [{1}]...",
-					e.Connection.ConnectionName, e.RemoteEndPoint);
-			connection.Reconnecting += (s, e) =>
-				Console.WriteLine("EventStoreConnection '{0}': reconnecting...", e.Connection.ConnectionName);
-			connection.Disconnected += (s, e) =>
-				Console.WriteLine("EventStoreConnection '{0}': disconnected from [{1}]...",
-					e.Connection.ConnectionName, e.RemoteEndPoint);
-			connection.ErrorOccurred += (s, e) => Console.WriteLine("EventStoreConnection '{0}': error = {1}",
-				e.Connection.ConnectionName, e.Exception);
-
-			await connection.ConnectAsync();
-
-			await closed.Task.WithTimeout(
-				TimeSpan.FromSeconds(120)); // TCP connection timeout might be even 60 seconds
-
-			await AssertEx.ThrowsAsync<ObjectDisposedException>(() => connection
-				.AppendToStreamAsync("stream", ExpectedVersion.NoStream, TestEvent.NewTestEvent())
-				.WithTimeout());
-		}
-	}
-
-	[TestFixture, Category("ClientAPI"), Category("LongRunning")]
-	public class not_connected_tests {
-		private readonly TcpType _tcpType = TcpType.Ssl;
-
-		[Test]
-		public async Task should_timeout_connection_after_configured_amount_time_on_conenct() {
-			var closed = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-			var settings =
-				ConnectionSettings.Create()
-					.EnableVerboseLogging()
-					.UseCustomLogger(ClientApiLoggerBridge.Default)
-					.LimitReconnectionsTo(0)
-					.SetReconnectionDelayTo(TimeSpan.FromMilliseconds(0))
-					.FailOnNoServerResponse()
-					.WithConnectionTimeoutOf(TimeSpan.FromMilliseconds(1000));
-
-			if (_tcpType == TcpType.Ssl) {
-				settings.DisableServerCertificateValidation();
-			} else {
-				settings.DisableTls();
-			}
-
-			var ip = new IPAddress(new byte[]
-				{8, 8, 8, 8}); //NOTE: This relies on Google DNS server being configured to swallow nonsense traffic
-			const int port = 4567;
-			using (var connection = EventStoreConnection.Create(settings, new IPEndPoint(ip, port).ToESTcpUri())) {
-				connection.Closed += (s, e) => closed.TrySetResult(true);
-				connection.Connected += (s, e) => Console.WriteLine("EventStoreConnection '{0}': connected to [{1}]...",
-					e.Connection.ConnectionName, e.RemoteEndPoint);
-				connection.Reconnecting += (s, e) =>
-					Console.WriteLine("EventStoreConnection '{0}': reconnecting...", e.Connection.ConnectionName);
-				connection.Disconnected += (s, e) =>
-					Console.WriteLine("EventStoreConnection '{0}': disconnected from [{1}]...",
-						e.Connection.ConnectionName, e.RemoteEndPoint);
-				connection.ErrorOccurred += (s, e) => Console.WriteLine("EventStoreConnection '{0}': error = {1}",
-					e.Connection.ConnectionName, e.Exception);
-				await connection.ConnectAsync();
-
-				await closed.Task.WithTimeout(TimeSpan.FromSeconds(15));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/connecting_to_a_persistent_subscription.cs b/src/EventStore.Core.Tests/ClientAPI/connecting_to_a_persistent_subscription.cs
deleted file mode 100644
index 3588a20e0a5..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/connecting_to_a_persistent_subscription.cs
+++ /dev/null
@@ -1,890 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.ClientOperations;
-using EventStore.ClientAPI.Exceptions;
-using NUnit.Framework;
-using EventStore.ClientAPI.Common;
-using EventStore.ClientAPI.Common.Utils;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("LongRunning"), Category("ClientAPI")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class connect_to_non_existing_persistent_subscription_with_permissions<TLogFormat, TStreamId>
-		: SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private Exception _caught;
-
-		protected override Task When() {
-			_caught = Assert.Throws<AggregateException>(
-				() => {
-					_conn.ConnectToPersistentSubscription(
-						"nonexisting2",
-						"foo",
-						(sub, e) => {
-							Console.Write("appeared");
-							return Task.CompletedTask;
-						},
-						(sub, reason, ex) => { },
-						DefaultData.AdminCredentials);
-					throw new Exception("should have thrown");
-				}).InnerException;
-			return Task.CompletedTask;
-		}
-
-		[Test]
-		public void the_completion_fails() {
-			Assert.IsNotNull(_caught);
-		}
-
-		[Test]
-		public void the_exception_is_an_argument_exception() {
-			Assert.IsInstanceOf<ArgumentException>(_caught);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class connect_to_existing_persistent_subscription_with_permissions<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private EventStorePersistentSubscriptionBase _sub;
-		private readonly string _stream = Guid.NewGuid().ToString();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent();
-
-		protected override async Task Given() {
-			await _conn.CreatePersistentSubscriptionAsync(_stream, "agroupname17", _settings,
-				DefaultData.AdminCredentials);
-		}
-
-		protected override Task When() {
-			_sub = _conn.ConnectToPersistentSubscription(_stream,
-				"agroupname17",
-				(sub, e) => {
-					Console.Write("appeared");
-					return Task.CompletedTask;
-				},
-				(sub, reason, ex) => { },
-				DefaultData.AdminCredentials);
-
-			return Task.CompletedTask;
-		}
-
-		[Test]
-		public void the_subscription_succeeds() {
-			Assert.IsNotNull(_sub);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class connect_to_existing_persistent_subscription_without_permissions<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = "$" + Guid.NewGuid();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent();
-
-		protected override Task When() {
-			return _conn.CreatePersistentSubscriptionAsync(_stream, "agroupname55", _settings,
-				DefaultData.AdminCredentials);
-		}
-
-		[Test]
-		public void the_subscription_fails_to_connect() {
-			try {
-				_conn.ConnectToPersistentSubscription(
-					_stream,
-					"agroupname55",
-					(sub, e) => {
-						Console.Write("appeared");
-						return Task.CompletedTask;
-					},
-					(sub, reason, ex) => Console.WriteLine("dropped."));
-				throw new Exception("should have thrown.");
-			} catch (Exception ex) {
-				Assert.IsInstanceOf<AggregateException>(ex);
-				Assert.IsInstanceOf<AccessDeniedException>(ex.InnerException);
-			}
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class connect_to_existing_persistent_subscription_with_max_one_client<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = "$" + Guid.NewGuid();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent()
-			.WithMaxSubscriberCountOf(1);
-
-		private Exception _exception;
-
-		private const string _group = "startinbeginning1";
-
-		protected override async Task Given() {
-			await base.Given();
-			await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
-				DefaultData.AdminCredentials);
-			_conn.ConnectToPersistentSubscription(
-				_stream,
-				_group,
-				(s, e) => {
-					s.Acknowledge(e);
-					return Task.CompletedTask;
-				},
-				(sub, reason, ex) => { },
-				DefaultData.AdminCredentials);
-		}
-
-		protected override Task When() {
-			_exception = Assert.Throws<AggregateException>(() => {
-				_conn.ConnectToPersistentSubscription(
-					_stream,
-					_group,
-					(s, e) => {
-						s.Acknowledge(e);
-						return Task.CompletedTask;
-					},
-					(sub, reason, ex) => { },
-					DefaultData.AdminCredentials);
-				throw new Exception("should have thrown.");
-			}).InnerException;
-			return Task.CompletedTask;
-		}
-
-		[Test]
-		public void the_second_subscription_fails_to_connect() {
-			Assert.IsInstanceOf<MaximumSubscribersReachedException>(_exception);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		connect_to_existing_persistent_subscription_with_start_from_beginning_and_no_stream<TLogFormat, TStreamId> :
-			SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = "$" + Guid.NewGuid();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromBeginning();
-
-		private readonly Guid _id = Guid.NewGuid();
-		private readonly TaskCompletionSource<ResolvedEvent> _firstEventSource = new TaskCompletionSource<ResolvedEvent>(TaskCreationOptions.RunContinuationsAsynchronously);
-
-		private const string _group = "startinbeginning1";
-
-		protected override async Task Given() {
-			await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
-				DefaultData.AdminCredentials);
-			_conn.ConnectToPersistentSubscription(
-				_stream,
-				_group,
-				HandleEvent,
-				(sub, reason, ex) => { },
-				DefaultData.AdminCredentials);
-		}
-
-		protected override Task When() {
-			return _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
-				new EventData(_id, "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
-		}
-
-		private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
-			_firstEventSource.TrySetResult(resolvedEvent);
-			return Task.CompletedTask;
-		}
-
-		[Test]
-		public async Task the_subscription_gets_event_zero_as_its_first_event() {
-			var firstEvent = await _firstEventSource.Task.WithTimeout(TimeSpan.FromSeconds(10));
-			Assert.AreEqual(0, firstEvent.Event.EventNumber);
-			Assert.AreEqual(_id, firstEvent.Event.EventId);
-		}
-	}
-
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		connect_to_existing_persistent_subscription_with_start_from_two_and_no_stream<TLogFormat, TStreamId>
-		: SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = "$" + Guid.NewGuid();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFrom(2);
-
-		private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
-		private readonly Guid _id = Guid.NewGuid();
-		private readonly TaskCompletionSource<ResolvedEvent> _firstEventSource = new TaskCompletionSource<ResolvedEvent>(TaskCreationOptions.RunContinuationsAsynchronously);
-
-		private const string _group = "startinbeginning1";
-
-		protected override async Task Given() {
-			await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
-				DefaultData.AdminCredentials);
-			_conn.ConnectToPersistentSubscription(
-				_stream,
-				_group,
-				HandleEvent,
-				(sub, reason, ex) => { },
-				DefaultData.AdminCredentials);
-		}
-
-		protected override async Task When() {
-			await _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
-					new EventData(Guid.NewGuid(), "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]))
-;
-			await _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
-					new EventData(Guid.NewGuid(), "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]))
-;
-			await _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
-				new EventData(_id, "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
-		}
-
-		private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
-			_firstEventSource.TrySetResult(resolvedEvent);
-			return Task.CompletedTask;
-		}
-
-		[Test]
-		public async Task the_subscription_gets_event_two_as_its_first_event() {
-			var resolvedEvent = await _firstEventSource.Task.WithTimeout(TimeSpan.FromSeconds(10));
-			Assert.AreEqual(2, resolvedEvent.Event.EventNumber);
-			Assert.AreEqual(_id, resolvedEvent.Event.EventId);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		connect_to_existing_persistent_subscription_with_start_from_beginning_and_events_in_it<TLogFormat, TStreamId> :
-			SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = "$" + Guid.NewGuid();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromBeginning();
-
-		private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
-		private ResolvedEvent _firstEvent;
-		private List<Guid> _ids = new List<Guid>();
-		private bool _set = false;
-
-		private const string _group = "startinbeginning1";
-
-		protected override async Task Given() {
-			await WriteEvents(_conn);
-			await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
-				DefaultData.AdminCredentials);
-		}
-
-		private async Task WriteEvents(IEventStoreConnection connection) {
-			for (int i = 0; i < 10; i++) {
-				_ids.Add(Guid.NewGuid());
-				await connection.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
-						new EventData(_ids[i], "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]))
-;
-			}
-		}
-
-		protected override Task When() {
-			_conn.ConnectToPersistentSubscription(
-				_stream,
-				_group,
-				HandleEvent,
-				(sub, reason, ex) => { },
-				DefaultData.AdminCredentials);
-			return Task.CompletedTask;
-		}
-
-		private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
-			if (!_set) {
-				_set = true;
-				_firstEvent = resolvedEvent;
-				_resetEvent.Set();
-			}
-
-			return Task.CompletedTask;
-		}
-
-		[Test]
-		public void the_subscription_gets_event_zero_as_its_first_event() {
-			Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
-			Assert.AreEqual(0, _firstEvent.Event.EventNumber);
-			Assert.AreEqual(_ids[0], _firstEvent.Event.EventId);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		connect_to_existing_persistent_subscription_with_start_from_beginning_not_set_and_events_in_it<TLogFormat, TStreamId> :
-			SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = "$" + Guid.NewGuid();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent();
-
-		private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
-
-		private const string _group = "startinbeginning1";
-
-		protected override async Task Given() {
-			await WriteEvents(_conn);
-			await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
-				DefaultData.AdminCredentials);
-		}
-
-		private async Task WriteEvents(IEventStoreConnection connection) {
-			for (int i = 0; i < 10; i++) {
-				await connection.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
-						new EventData(Guid.NewGuid(), "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"),
-							new byte[0]))
-;
-			}
-		}
-
-		protected override Task When() {
-			_conn.ConnectToPersistentSubscription(
-				_stream,
-				_group,
-				HandleEvent,
-				(sub, reason, ex) => { },
-				DefaultData.AdminCredentials);
-			return Task.CompletedTask;
-		}
-
-		private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
-			_resetEvent.Set();
-			return Task.CompletedTask;
-		}
-
-		[Test]
-		public void the_subscription_gets_no_events() {
-			Assert.IsFalse(_resetEvent.WaitOne(TimeSpan.FromSeconds(1)));
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		connect_to_existing_persistent_subscription_with_start_from_beginning_not_set_and_events_in_it_then_event_written<TLogFormat, TStreamId> :
-			SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = "$" + Guid.NewGuid();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos();
-
-		private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
-		private ResolvedEvent _firstEvent;
-		private Guid _id;
-
-		private const string _group = "startinbeginning1";
-
-		protected override async Task Given() {
-			await WriteEvents(_conn);
-			await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
-				DefaultData.AdminCredentials);
-			_conn.ConnectToPersistentSubscription(
-				_stream,
-				_group,
-				HandleEvent,
-				(sub, reason, ex) => { },
-				DefaultData.AdminCredentials);
-		}
-
-		private async Task WriteEvents(IEventStoreConnection connection) {
-			for (int i = 0; i < 10; i++) {
-				await connection.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
-						new EventData(Guid.NewGuid(), "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"),
-							new byte[0]))
-;
-			}
-		}
-
-		protected override async Task When() {
-			_id = Guid.NewGuid();
-			await _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
-				new EventData(_id, "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
-		}
-
-		private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
-			_firstEvent = resolvedEvent;
-			_resetEvent.Set();
-			return Task.CompletedTask;
-		}
-
-		[Test]
-		public void the_subscription_gets_the_written_event_as_its_first_event() {
-			Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
-			Assert.IsNotNull(_firstEvent);
-			Assert.AreEqual(10, _firstEvent.Event.EventNumber);
-			Assert.AreEqual(_id, _firstEvent.Event.EventId);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		connect_to_existing_persistent_subscription_with_start_from_x_set_higher_than_x_and_events_in_it_then_event_written<TLogFormat, TStreamId> :
-			SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = "$" + Guid.NewGuid();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFrom(11);
-
-		private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
-		private ResolvedEvent _firstEvent;
-		private Guid _id;
-
-		private const string _group = "startinbeginning1";
-
-		protected override async Task Given() {
-			await WriteEvents(_conn);
-			await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
-				DefaultData.AdminCredentials);
-			_conn.ConnectToPersistentSubscription(
-				_stream,
-				_group,
-				HandleEvent,
-				(sub, reason, ex) => { },
-				DefaultData.AdminCredentials);
-		}
-
-		private async Task WriteEvents(IEventStoreConnection connection) {
-			for (int i = 0; i < 11; i++) {
-				await connection.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
-						new EventData(Guid.NewGuid(), "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"),
-							new byte[0]))
-;
-			}
-		}
-
-		protected override Task When() {
-			_id = Guid.NewGuid();
-			return _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
-				new EventData(_id, "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
-		}
-
-		private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
-			_firstEvent = resolvedEvent;
-			_resetEvent.Set();
-			return Task.CompletedTask;
-		}
-
-		[Test]
-		public void the_subscription_gets_the_written_event_as_its_first_event() {
-			Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
-			Assert.IsNotNull(_firstEvent);
-			Assert.AreEqual(11, _firstEvent.Event.EventNumber);
-			Assert.AreEqual(_id, _firstEvent.Event.EventId);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class a_nak_in_subscription_handler_in_autoack_mode_drops_the_subscription<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = "$" + Guid.NewGuid();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromBeginning();
-
-		private readonly ManualResetEvent _resetEvent = new ManualResetEvent(false);
-		private Exception _exception;
-		private SubscriptionDropReason _reason;
-
-		private const string _group = "naktest";
-
-		protected override async Task Given() {
-			await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
-				DefaultData.AdminCredentials);
-			_conn.ConnectToPersistentSubscription(
-				_stream,
-				_group,
-				HandleEvent,
-				Dropped,
-				DefaultData.AdminCredentials);
-		}
-
-		private void Dropped(EventStorePersistentSubscriptionBase sub, SubscriptionDropReason reason,
-			Exception exception) {
-			_exception = exception;
-			_reason = reason;
-			_resetEvent.Set();
-		}
-
-		protected override Task When() {
-			return _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
-					new EventData(Guid.NewGuid(), "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
-		}
-
-		private static Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
-			throw new Exception("test");
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_subscription_gets_dropped() {
-			Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(5)));
-			Assert.AreEqual(SubscriptionDropReason.EventHandlerException, _reason);
-			Assert.AreEqual(typeof(Exception), _exception.GetType());
-			Assert.AreEqual("test", _exception.Message);
-		}
-	}
-
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		connect_to_existing_persistent_subscription_with_start_from_x_set_and_events_in_it_then_event_written<TLogFormat, TStreamId> :
-			SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = "$" + Guid.NewGuid();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFrom(10);
-
-		private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
-		private ResolvedEvent _firstEvent;
-		private Guid _id;
-
-		private const string _group = "startinbeginning1";
-
-		protected override async Task Given() {
-			await WriteEvents(_conn);
-			await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
-				DefaultData.AdminCredentials);
-			_conn.ConnectToPersistentSubscription(
-				_stream,
-				_group,
-				HandleEvent,
-				(sub, reason, ex) => { },
-				DefaultData.AdminCredentials);
-		}
-
-		private async Task WriteEvents(IEventStoreConnection connection) {
-			for (int i = 0; i < 10; i++) {
-				await connection.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
-						new EventData(Guid.NewGuid(), "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"),
-							new byte[0]))
-;
-			}
-		}
-
-		protected override Task When() {
-			_id = Guid.NewGuid();
-			return _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
-				new EventData(_id, "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
-		}
-
-		private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
-			_firstEvent = resolvedEvent;
-			_resetEvent.Set();
-			return Task.CompletedTask;
-		}
-
-		[Test]
-		public void the_subscription_gets_the_written_event_as_its_first_event() {
-			Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
-			Assert.IsNotNull(_firstEvent);
-			Assert.AreEqual(10, _firstEvent.Event.EventNumber);
-			Assert.AreEqual(_id, _firstEvent.Event.EventId);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		connect_to_existing_persistent_subscription_with_start_from_x_set_and_events_in_it<TLogFormat, TStreamId>
-		: SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = "$" + Guid.NewGuid();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFrom(4);
-
-		private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
-		private ResolvedEvent _firstEvent;
-		private Guid _id;
-
-		private const string _group = "startinx2";
-
-		protected override async Task Given() {
-			await WriteEvents(_conn);
-			await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
-				DefaultData.AdminCredentials);
-			_conn.ConnectToPersistentSubscription(
-				_stream,
-				_group,
-				HandleEvent,
-				(sub, reason, ex) => { },
-				DefaultData.AdminCredentials);
-		}
-
-		private async Task WriteEvents(IEventStoreConnection connection) {
-			for (int i = 0; i < 10; i++) {
-				var id = Guid.NewGuid();
-				await connection.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
-					new EventData(id, "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
-				if (i == 4)
-					_id = id;
-			}
-		}
-
-		protected override Task When() {
-			return _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
-				new EventData(_id, "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
-		}
-
-		private bool _set = false;
-
-		private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
-			if (_set)
-				return Task.CompletedTask;
-			_set = true;
-			_firstEvent = resolvedEvent;
-			_resetEvent.Set();
-			return Task.CompletedTask;
-		}
-
-		[Test]
-		public void the_subscription_gets_the_written_event_as_its_first_event() {
-			Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
-			Assert.IsNotNull(_firstEvent);
-			Assert.AreEqual(4, _firstEvent.Event.EventNumber);
-			Assert.AreEqual(_id, _firstEvent.Event.EventId);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	[Category("LongRunning")]
-	public class
-		connect_to_persistent_subscription_with_link_to_event_with_event_number_greater_than_int_maxvalue<TLogFormat, TStreamId> :
-			ExpectedVersion64Bit.MiniNodeWithExistingRecords<TLogFormat, TStreamId> {
-		private const string StreamName =
-			"connect_to_persistent_subscription_with_link_to_event_with_event_number_greater_than_int_maxvalue";
-
-		private const long intMaxValue = (long)int.MaxValue;
-
-		private string _linkedStreamName = "linked-" + StreamName;
-		private const string _group = "group-" + StreamName;
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.ResolveLinkTos()
-			.StartFromBeginning();
-
-		private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
-		private ResolvedEvent _firstEvent;
-		private bool _set = false;
-		private Guid _event1Id;
-
-		public override void WriteTestScenario() {
-			var event1 = WriteSingleEvent(StreamName, intMaxValue + 1, new string('.', 3000));
-			WriteSingleEvent(StreamName, intMaxValue + 2, new string('.', 3000));
-			_event1Id = event1.EventId;
-		}
-
-		public override async Task Given() {
-			_store = BuildConnection(Node);
-			await _store.ConnectAsync();
-
-			await _store.CreatePersistentSubscriptionAsync(_linkedStreamName, _group, _settings,
-				DefaultData.AdminCredentials);
-			_store.ConnectToPersistentSubscription(
-				_linkedStreamName,
-				_group,
-				HandleEvent,
-				(sub, reason, ex) => { },
-				DefaultData.AdminCredentials);
-			await _store.AppendToStreamAsync(_linkedStreamName, ExpectedVersion.Any, new EventData(Guid.NewGuid(),
-				SystemEventTypes.LinkTo, false, Helper.UTF8NoBom.GetBytes(
-					string.Format("{0}@{1}", intMaxValue + 1, StreamName)), null));
-		}
-
-		private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
-			if (!_set) {
-				_set = true;
-				_firstEvent = resolvedEvent;
-				_resetEvent.Set();
-			}
-
-			return Task.CompletedTask;
-		}
-
-		[Test]
-		public void the_subscription_resolves_the_linked_event_correctly() {
-			Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
-			Assert.AreEqual(intMaxValue + 1, _firstEvent.Event.EventNumber);
-			Assert.AreEqual(_event1Id, _firstEvent.Event.EventId);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class connect_to_persistent_subscription_with_retries<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = Guid.NewGuid().ToString("N");
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromBeginning();
-
-		private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
-		private readonly Guid _id = Guid.NewGuid();
-		int? _retryCount;
-		private const string _group = "retries";
-
-		protected override async Task Given() {
-			await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
-				DefaultData.AdminCredentials);
-			await _conn.ConnectToPersistentSubscriptionAsync(
-				_stream,
-				_group,
-				HandleEvent,
-				(sub, reason, ex) => { },
-				DefaultData.AdminCredentials, autoAck: false);
-		}
-
-		protected override Task When() {
-			return _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
-				new EventData(_id, "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
-		}
-
-		private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent,
-			int? retryCount) {
-			if (retryCount > 4) {
-				_retryCount = retryCount;
-				sub.Acknowledge(resolvedEvent);
-				_resetEvent.Set();
-			} else {
-				sub.Fail(resolvedEvent, PersistentSubscriptionNakEventAction.Retry, "Not yet tried enough times");
-			}
-
-			return Task.CompletedTask;
-		}
-
-		[Test]
-		public void events_are_retried_until_success() {
-			Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
-			Assert.AreEqual(5, _retryCount);
-		}
-	}
-
-	//ALL
-
-	/*
-
-	    [TestFixture, Category("LongRunning")]
-	    public class connect_to_non_existing_persistent_all_subscription_with_permissions : SpecificationWithMiniNode
-	    {
-	        private Exception _caught;
-
-	        protected override void When()
-	        {
-	            try
-	            {
-	                _conn.ConnectToPersistentSubscriptionForAll("nonexisting2",
-	                    (sub, e) => Console.Write("appeared"),
-	                    (sub, reason, ex) =>
-	                    {
-	                    }, 
-	                    DefaultData.AdminCredentials);
-	                throw new Exception("should have thrown");
-	            }
-	            catch (Exception ex)
-	            {
-	                _caught = ex;
-	            }
-	        }
-
-	        [Test]
-	        public void the_completion_fails()
-	        {
-	            Assert.IsNotNull(_caught);
-	        }
-
-	        [Test]
-	        public void the_exception_is_an_argument_exception()
-	        {
-	            Assert.IsInstanceOf<ArgumentException>(_caught.InnerException);
-	        }
-	    }
-
-	    [TestFixture, Category("LongRunning")]
-	    public class connect_to_existing_persistent_all_subscription_with_permissions : SpecificationWithMiniNode
-	    {
-	        private EventStorePersistentSubscription _sub;
-	        private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettingsBuilder.Create()
-	                                                                .DoNotResolveLinkTos()
-	                                                                .StartFromCurrent();
-	        protected override void When()
-	        {
-	            _conn.CreatePersistentSubscriptionForAllAsync("agroupname17", _settings, DefaultData.AdminCredentials).Wait();
-	            _sub = _conn.ConnectToPersistentSubscriptionForAll("agroupname17",
-	                (sub, e) => Console.Write("appeared"),
-	                (sub, reason, ex) => { }, DefaultData.AdminCredentials);
-	        }
-
-	        [Test]
-	        public void the_subscription_suceeds()
-	        {
-	            Assert.IsNotNull(_sub);
-	        }
-	    }
-
-	    [TestFixture, Category("LongRunning")]
-	    public class connect_to_existing_persistent_all_subscription_without_permissions : SpecificationWithMiniNode
-	    {
-	        private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettingsBuilder.Create()
-	                                                                .DoNotResolveLinkTos()
-	                                                                .StartFromCurrent();
-
-	        protected override void When()
-	        {
-	            _conn.CreatePersistentSubscriptionForAllAsync("agroupname55", _settings,
-	                DefaultData.AdminCredentials).Wait();
-	        }
-
-	        [Test]
-	        public void the_subscription_fails_to_connect()
-	        {
-	            try
-	            {
-	                _conn.ConnectToPersistentSubscriptionForAll("agroupname55",
-	                    (sub, e) => Console.Write("appeared"),
-	                    (sub, reason, ex) => { });
-	                throw new Exception("should have thrown.");
-	            }
-	            catch (Exception ex)
-	            {
-	                Assert.IsInstanceOf<AggregateException>(ex);
-	                Assert.IsInstanceOf<AccessDeniedException>(ex.InnerException);
-	            }
-	        }
-	    }
-	*/
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/connecting_to_a_persistent_subscription_async.cs b/src/EventStore.Core.Tests/ClientAPI/connecting_to_a_persistent_subscription_async.cs
deleted file mode 100644
index 168cdb02311..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/connecting_to_a_persistent_subscription_async.cs
+++ /dev/null
@@ -1,370 +0,0 @@
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.ClientOperations;
-using EventStore.ClientAPI.Exceptions;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("LongRunning"), Category("ClientAPI")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class connect_to_non_existing_persistent_subscription_with_permissions_async<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private Exception _innerEx;
-
-		protected override async Task When() {
-			_innerEx = await AssertEx.ThrowsAsync<ArgumentException>(() => _conn.ConnectToPersistentSubscriptionAsync(
-				"nonexisting2",
-				"foo",
-				(sub, e) => {
-					Console.Write("appeared");
-					return Task.CompletedTask;
-				},
-				(sub, reason, ex) => { }, DefaultData.AdminCredentials));
-		}
-
-		[Test]
-		public void the_subscription_fails_to_connect_with_argument_exception() {
-			Assert.IsInstanceOf<ArgumentException>(_innerEx);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class connect_to_existing_persistent_subscription_with_permissions_async<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private EventStorePersistentSubscriptionBase _sub;
-		private readonly string _stream = Guid.NewGuid().ToString();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent();
-
-		protected override async Task When() {
-			await _conn.CreatePersistentSubscriptionAsync(_stream, "agroupname17", _settings, DefaultData.AdminCredentials)
-;
-			_sub = await _conn.ConnectToPersistentSubscriptionAsync(_stream,
-				"agroupname17",
-				(sub, e) => {
-					Console.Write("appeared");
-					return Task.CompletedTask;
-				},
-				(sub, reason, ex) => { }, DefaultData.AdminCredentials);
-		}
-
-		[Test]
-		public void the_subscription_succeeds() {
-			Assert.IsNotNull(_sub);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class connect_to_existing_persistent_subscription_without_permissions_async<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = "$" + Guid.NewGuid();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent();
-
-		private Exception _innerEx;
-
-		protected override async Task When() {
-			await _conn.CreatePersistentSubscriptionAsync(_stream, "agroupname55", _settings,
-				DefaultData.AdminCredentials);
-			_innerEx = await AssertEx.ThrowsAsync<AccessDeniedException>(() => _conn.ConnectToPersistentSubscriptionAsync(
-				_stream,
-				"agroupname55",
-				(sub, e) => {
-					Console.Write("appeared");
-					return Task.CompletedTask;
-				},
-				(sub, reason, ex) => Console.WriteLine("dropped.")));
-		}
-
-		[Test]
-		public void the_subscription_fails_to_connect_with_access_denied_exception() {
-			Assert.IsInstanceOf<AccessDeniedException>(_innerEx);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class connect_to_existing_persistent_subscription_with_max_one_client_async<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = "$" + Guid.NewGuid();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent()
-			.WithMaxSubscriberCountOf(1);
-
-		private Exception _innerEx;
-
-		private const string _group = "startinbeginning1";
-		private EventStorePersistentSubscriptionBase _firstConn;
-
-		protected override async Task Given() {
-			await base.Given();
-			await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
-				DefaultData.AdminCredentials);
-			// First connection
-			_firstConn = await _conn.ConnectToPersistentSubscriptionAsync(
-				_stream,
-				_group,
-				(s, e) => {
-					s.Acknowledge(e);
-					return Task.CompletedTask;
-				},
-				(sub, reason, ex) => { },
-				DefaultData.AdminCredentials);
-		}
-
-		protected override async Task When() {
-			_innerEx = await AssertEx.ThrowsAsync<MaximumSubscribersReachedException>(() =>
-				// Second connection
-				_conn.ConnectToPersistentSubscriptionAsync(
-					_stream,
-					_group,
-					(s, e) => {
-						s.Acknowledge(e);
-						return Task.CompletedTask;
-					},
-					(sub, reason, ex) => { },
-					DefaultData.AdminCredentials));
-		}
-
-		[Test]
-		public void the_first_subscription_connects_successfully() {
-			Assert.IsNotNull(_firstConn);
-		}
-
-		[Test]
-		public void the_second_subscription_throws_maximum_subscribers_reached_exception() {
-			Assert.IsInstanceOf<MaximumSubscribersReachedException>(_innerEx);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		connect_to_existing_persistent_subscription_with_start_from_beginning_and_no_stream_async<TLogFormat, TStreamId> :
-			SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = "$" + Guid.NewGuid();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromBeginning();
-
-		private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
-		private ResolvedEvent _firstEvent;
-		private readonly Guid _id = Guid.NewGuid();
-		private bool _set = false;
-
-		private const string _group = "startinbeginning1";
-
-		protected override async Task Given() {
-			await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
-				DefaultData.AdminCredentials);
-
-			await _conn.ConnectToPersistentSubscriptionAsync(
-				_stream,
-				_group,
-				HandleEvent,
-				(sub, reason, ex) => { },
-				DefaultData.AdminCredentials);
-		}
-
-		protected override Task When() {
-			return _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
-				new EventData(_id, "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
-		}
-
-		private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
-			if (_set)
-				return Task.CompletedTask;
-			_set = true;
-			_firstEvent = resolvedEvent;
-			_resetEvent.Set();
-			return Task.CompletedTask;
-		}
-
-		[Test]
-		public void the_subscription_gets_event_zero_as_its_first_event() {
-			Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
-			Assert.AreEqual(0, _firstEvent.Event.EventNumber);
-			Assert.AreEqual(_id, _firstEvent.Event.EventId);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		connect_to_existing_persistent_subscription_with_start_from_two_and_no_stream_async<TLogFormat, TStreamId> :
-			SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = "$" + Guid.NewGuid();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFrom(2);
-
-		private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
-		private ResolvedEvent _firstEvent;
-		private readonly Guid _id = Guid.NewGuid();
-		private bool _set = false;
-
-		private const string _group = "startinbeginning1";
-
-		protected override async Task Given() {
-			await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
-				DefaultData.AdminCredentials);
-			await _conn.ConnectToPersistentSubscriptionAsync(
-				_stream,
-				_group,
-				HandleEvent,
-				(sub, reason, ex) => { },
-				DefaultData.AdminCredentials);
-		}
-
-		protected override async Task When() {
-			await _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
-					new EventData(Guid.NewGuid(), "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
-			await _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
-					new EventData(Guid.NewGuid(), "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
-			await _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
-				new EventData(_id, "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
-		}
-
-		private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
-			if (_set)
-				return Task.CompletedTask;
-			_set = true;
-			_firstEvent = resolvedEvent;
-			_resetEvent.Set();
-			return Task.CompletedTask;
-		}
-
-		[Test]
-		public void the_subscription_gets_event_two_as_its_first_event() {
-			Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
-			Assert.AreEqual(2, _firstEvent.Event.EventNumber);
-			Assert.AreEqual(_id, _firstEvent.Event.EventId);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		connect_to_existing_persistent_subscription_with_start_from_beginning_and_events_in_it_async<TLogFormat, TStreamId> :
-			SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = "$" + Guid.NewGuid();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromBeginning();
-
-		private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
-		private ResolvedEvent _firstEvent;
-		private List<Guid> _ids = new List<Guid>();
-		private bool _set = false;
-
-		private const string _group = "startinbeginning1";
-
-		protected override async Task Given() {
-			await WriteEvents(_conn);
-			await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
-				DefaultData.AdminCredentials);
-		}
-
-		private async Task WriteEvents(IEventStoreConnection connection) {
-			for (int i = 0; i < 10; i++) {
-				_ids.Add(Guid.NewGuid());
-				await connection.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
-						new EventData(_ids[i], "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
-			}
-		}
-
-		protected override Task When() {
-			return _conn.ConnectToPersistentSubscriptionAsync(
-				_stream,
-				_group,
-				HandleEvent,
-				(sub, reason, ex) => { },
-				DefaultData.AdminCredentials);
-		}
-
-		private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
-			if (!_set) {
-				_set = true;
-				_firstEvent = resolvedEvent;
-				_resetEvent.Set();
-			}
-
-			return Task.CompletedTask;
-		}
-
-		[Test]
-		public void the_subscription_gets_event_zero_as_its_first_event() {
-			Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
-			Assert.AreEqual(0, _firstEvent.Event.EventNumber);
-			Assert.AreEqual(_ids[0], _firstEvent.Event.EventId);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		connect_to_existing_persistent_subscription_with_start_from_beginning_not_set_and_events_in_it_async<TLogFormat, TStreamId> :
-			SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = "$" + Guid.NewGuid();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent();
-
-		private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
-
-		private const string _group = "startinbeginning1";
-
-		protected override async Task Given() {
-			await WriteEvents(_conn);
-			await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
-				DefaultData.AdminCredentials);
-		}
-
-		private async Task WriteEvents(IEventStoreConnection connection) {
-			for (int i = 0; i < 10; i++) {
-				await connection.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
-						new EventData(Guid.NewGuid(), "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"),
-							new byte[0]));
-			}
-		}
-
-		protected override Task When() {
-			return _conn.ConnectToPersistentSubscriptionAsync(
-				_stream,
-				_group,
-				HandleEvent,
-				(sub, reason, ex) => { },
-				DefaultData.AdminCredentials);
-		}
-
-		private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
-			_resetEvent.Set();
-			return Task.CompletedTask;
-		}
-
-		[Test]
-		public void the_subscription_gets_no_events() {
-			Assert.IsFalse(_resetEvent.WaitOne(TimeSpan.FromSeconds(1)));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/connecting_with_connection_string.cs b/src/EventStore.Core.Tests/ClientAPI/connecting_with_connection_string.cs
deleted file mode 100644
index 5feaa3b6eab..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/connecting_with_connection_string.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using EventStore.ClientAPI;
-using NUnit.Framework;
-using EventStore.Core.Tests.Helpers;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_connecting_with_connection_string<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private MiniNode<TLogFormat, TStreamId> _node;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public async Task should_not_throw_when_connect_to_is_set() {
-			string connectionString = string.Format("ConnectTo=tcp://{0};", _node.TcpEndPoint);
-			using (var connection = EventStoreConnection.Create(connectionString)) {
-				await connection.ConnectAsync();
-				connection.Close();
-			}
-		}
-
-		[Test]
-		public void should_not_throw_when_only_gossip_seeds_is_set() {
-			string connectionString = string.Format("GossipSeeds={0};", _node.HttpEndPoint);
-			IEventStoreConnection connection = null;
-
-			Assert.DoesNotThrow(() => connection = EventStoreConnection.Create(connectionString));
-			Assert.AreEqual(_node.HttpEndPoint, connection.Settings.GossipSeeds.First().EndPoint);
-
-			connection.Dispose();
-		}
-
-		[Test]
-		public void should_throw_when_gossip_seeds_and_connect_to_is_set() {
-			string connectionString = string.Format("ConnectTo=tcp://{0};GossipSeeds={1}", _node.TcpEndPoint,
-				_node.HttpEndPoint);
-			Assert.Throws<NotSupportedException>(() => EventStoreConnection.Create(connectionString));
-		}
-
-		[Test]
-		public void should_throw_when_neither_gossip_seeds_nor_connect_to_is_set() {
-			string connectionString = string.Format("HeartBeatTimeout=2000");
-			Assert.Throws<Exception>(() => EventStoreConnection.Create(connectionString));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/connection_string.cs b/src/EventStore.Core.Tests/ClientAPI/connection_string.cs
deleted file mode 100644
index 70dee65cd59..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/connection_string.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using EventStore.ClientAPI;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[TestFixture, Category("ClientAPI")]
-	public class connection_string {
-		[Test]
-		public void can_set_bool_value_with_string() {
-			var settings = ConnectionString.GetConnectionSettings("verboselogging=true");
-			Assert.AreEqual(true, settings.VerboseLogging);
-		}
-
-		[Test]
-		public void can_set_with_spaces() {
-			var settings = ConnectionString.GetConnectionSettings("Verbose Logging=true");
-			Assert.AreEqual(true, settings.VerboseLogging);
-		}
-
-
-		[Test]
-		public void can_set_int() {
-			var settings = ConnectionString.GetConnectionSettings("maxretries=55");
-			Assert.AreEqual(55, settings.MaxRetries);
-		}
-
-		[Test]
-		public void can_set_timespan() {
-			var settings = ConnectionString.GetConnectionSettings("heartbeattimeout=5555");
-			Assert.AreEqual(5555, settings.HeartbeatTimeout.TotalMilliseconds);
-		}
-
-		[Test]
-		public void can_set_multiple_values() {
-			var settings = ConnectionString.GetConnectionSettings("heartbeattimeout=5555;maxretries=55");
-			Assert.AreEqual(5555, settings.HeartbeatTimeout.TotalMilliseconds);
-			Assert.AreEqual(55, settings.MaxRetries);
-		}
-
-		[Test]
-		public void can_set_mixed_case() {
-			var settings = ConnectionString.GetConnectionSettings("heArtbeAtTimeout=5555");
-			Assert.AreEqual(5555, settings.HeartbeatTimeout.TotalMilliseconds);
-		}
-
-		[Test]
-		public void can_set_gossip_seeds() {
-			var settings =
-				ConnectionString.GetConnectionSettings(
-					"gossipseeds=111.222.222.111:1111,111.222.222.111:1112,111.222.222.111:1113");
-			Assert.AreEqual(3, settings.GossipSeeds.Length);
-		}
-
-		[Test]
-		public void can_set_default_user_credentials() {
-			var settings = ConnectionString.GetConnectionSettings("DefaultUserCredentials=foo:bar");
-			Assert.AreEqual("foo", settings.DefaultUserCredentials.Username);
-			Assert.AreEqual("bar", settings.DefaultUserCredentials.Password);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/create_persistent_subscription.cs b/src/EventStore.Core.Tests/ClientAPI/create_persistent_subscription.cs
deleted file mode 100644
index d3e44057ffb..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/create_persistent_subscription.cs
+++ /dev/null
@@ -1,290 +0,0 @@
-using System;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Exceptions;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class create_persistent_subscription_on_existing_stream<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = Guid.NewGuid().ToString();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent();
-
-		protected override Task When() {
-			return _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any,
-				new EventData(Guid.NewGuid(), "whatever", true, Encoding.UTF8.GetBytes("{'foo' : 2}"), new Byte[0]));
-		}
-
-		[Test]
-		public async Task the_completion_succeeds() {
-			await _conn.CreatePersistentSubscriptionAsync(_stream, "existing", _settings,
-				DefaultData.AdminCredentials);
-		}
-	}
-
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class create_persistent_subscription_on_non_existing_stream<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = Guid.NewGuid().ToString();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent();
-
-		protected override Task When() => Task.CompletedTask;
-
-		[Test]
-		public async Task the_completion_succeeds() {
-			await _conn.CreatePersistentSubscriptionAsync(_stream, "nonexistinggroup", _settings,
-				DefaultData.AdminCredentials);
-		}
-	}
-
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class create_persistent_subscription_on_all_stream<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent();
-
-		protected override Task When() => Task.CompletedTask;
-
-		[Test]
-		public async Task the_completion_fails_with_invalid_stream() {
-			await AssertEx.ThrowsAsync<InvalidOperationException>(() =>
-				_conn.CreatePersistentSubscriptionAsync("$all", "shitbird", _settings, DefaultData.AdminCredentials));
-		}
-	}
-
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class create_persistent_subscription_with_too_big_message_timeout<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		protected override Task When() => Task.CompletedTask;
-
-		[Test]
-		public void the_build_fails_with_argument_exception() {
-			Assert.Throws<ArgumentException>(() =>
-				PersistentSubscriptionSettings.Create().WithMessageTimeoutOf(TimeSpan.FromDays(25 * 365)).Build());
-		}
-	}
-
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class create_persistent_subscription_with_too_big_checkpoint_after<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		protected override Task When() => Task.CompletedTask;
-
-		[Test]
-		public void the_build_fails_with_argument_exception() {
-			Assert.Throws<ArgumentException>(() =>
-				PersistentSubscriptionSettings.Create().CheckPointAfter(TimeSpan.FromDays(25 * 365)).Build());
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class create_persistent_subscription_with_dont_timeout<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = Guid.NewGuid().ToString();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent()
-			.DontTimeoutMessages();
-
-		protected override Task When() => Task.CompletedTask;
-
-		[Test]
-		public void the_message_timeout_should_be_zero() {
-			Assert.That(_settings.MessageTimeout == TimeSpan.Zero);
-		}
-
-		[Test]
-		public async Task the_subscription_is_created_without_error() {
-			await _conn.CreatePersistentSubscriptionAsync(_stream, "dont-timeout", _settings,
-				DefaultData.AdminCredentials);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class create_duplicate_persistent_subscription_group<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = Guid.NewGuid().ToString();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent();
-
-		protected override Task When() {
-			return _conn.CreatePersistentSubscriptionAsync(_stream, "group32", _settings, DefaultData.AdminCredentials);
-		}
-
-		[Test]
-		public async Task the_completion_fails_with_invalid_operation_exception() {
-			await AssertEx.ThrowsAsync<InvalidOperationException>(
-				() => _conn.CreatePersistentSubscriptionAsync(_stream, "group32", _settings,
-					DefaultData.AdminCredentials));
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		can_create_duplicate_persistent_subscription_group_name_on_different_streams<TLogFormat, TStreamId>
-		: SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = Guid.NewGuid().ToString();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent();
-
-		protected override Task When() {
-			return _conn.CreatePersistentSubscriptionAsync(_stream, "group3211", _settings, DefaultData.AdminCredentials);
-		}
-
-		[Test]
-		public async Task the_completion_succeeds() {
-			await
-				_conn.CreatePersistentSubscriptionAsync("someother" + _stream, "group3211", _settings,
-					DefaultData.AdminCredentials);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class create_persistent_subscription_group_without_permissions<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = Guid.NewGuid().ToString();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent();
-
-		protected override Task When() => Task.CompletedTask;
-
-		[Test]
-		public async Task the_completion_succeeds() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(() =>
-				_conn.CreatePersistentSubscriptionAsync(_stream, "group57", _settings, null));
-		}
-	}
-
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class create_persistent_subscription_after_deleting_the_same<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = Guid.NewGuid().ToString();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent();
-
-		protected override async Task When() {
-			await _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any,
-				new EventData(Guid.NewGuid(), "whatever", true, Encoding.UTF8.GetBytes("{'foo' : 2}"), new Byte[0]));
-			await _conn.CreatePersistentSubscriptionAsync(_stream, "existing", _settings, DefaultData.AdminCredentials);
-			await _conn.DeletePersistentSubscriptionAsync(_stream, "existing", DefaultData.AdminCredentials);
-		}
-
-		[Test]
-		public async Task the_completion_succeeds() {
-			await _conn.CreatePersistentSubscriptionAsync(_stream, "existing", _settings, DefaultData.AdminCredentials);
-		}
-	}
-
-	//ALL
-	/*
-
-		[TestFixture, Category("LongRunning")]
-		public class create_persistent_subscription_on_all : SpecificationWithMiniNode
-		{
-			private PersistentSubscriptionCreateResult _result;
-			private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettingsBuilder.Create()
-																	.DoNotResolveLinkTos()
-																	.StartFromCurrent();
-
-			protected override void When()
-			{
-				_result = _conn.CreatePersistentSubscriptionForAllAsync("group", _settings, DefaultData.AdminCredentials).Result;
-			}
-
-			[Test]
-			public void the_completion_succeeds()
-			{
-				Assert.AreEqual(PersistentSubscriptionCreateStatus.Success, _result.Status);
-			}
-		}
-
-
-		[TestFixture, Category("LongRunning")]
-		public class create_duplicate_persistent_subscription_group_on_all : SpecificationWithMiniNode
-		{
-			private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettingsBuilder.Create()
-																	.DoNotResolveLinkTos()
-																	.StartFromCurrent();
-			protected override void When()
-			{
-				_conn.CreatePersistentSubscriptionForAllAsync("group32", _settings, DefaultData.AdminCredentials).Wait();
-			}
-
-			[Test]
-			public void the_completion_fails_with_invalid_operation_exception()
-			{
-				try
-				{
-					_conn.CreatePersistentSubscriptionForAllAsync("group32", _settings, DefaultData.AdminCredentials).Wait();
-					throw new Exception("expected exception");
-				}
-				catch (Exception ex)
-				{
-					Assert.IsInstanceOf(typeof(AggregateException), ex);
-					var inner = ex.InnerException;
-					Assert.IsInstanceOf(typeof(InvalidOperationException), inner);
-				}
-			}
-		}
-
-		[TestFixture, Category("LongRunning")]
-		public class create_persistent_subscription_group_on_all_without_permissions : SpecificationWithMiniNode
-		{
-			private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettingsBuilder.Create()
-																	.DoNotResolveLinkTos()
-																	.StartFromCurrent();
-			protected override void When()
-			{
-			}
-
-			[Test]
-			public void the_completion_succeeds()
-			{
-				try
-				{
-					_conn.CreatePersistentSubscriptionForAllAsync("group57", _settings, null).Wait();
-					throw new Exception("expected exception");
-				}
-				catch (Exception ex)
-				{
-					Assert.IsInstanceOf(typeof(AggregateException), ex);
-					var inner = ex.InnerException;
-					Assert.IsInstanceOf(typeof(AccessDeniedException), inner);
-				}
-			}
-		}
-	*/
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/deleting_persistent_subscription.cs b/src/EventStore.Core.Tests/ClientAPI/deleting_persistent_subscription.cs
deleted file mode 100644
index 67cb6524edf..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/deleting_persistent_subscription.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class deleting_existing_persistent_subscription_group_with_permissions<TLogFormat, TStreamId>
-		: SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent();
-
-		private readonly string _stream = Guid.NewGuid().ToString();
-
-		protected override Task When() =>
-			_conn.CreatePersistentSubscriptionAsync(_stream, "groupname123", _settings,
-				DefaultData.AdminCredentials);
-
-		[Test]
-		public async Task the_delete_of_group_succeeds() {
-			await _conn.DeletePersistentSubscriptionAsync(_stream, "groupname123", DefaultData.AdminCredentials);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class deleting_existing_persistent_subscription_with_subscriber<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent();
-
-		private readonly string _stream = Guid.NewGuid().ToString();
-		private readonly ManualResetEvent _called = new ManualResetEvent(false);
-
-		protected override async Task Given() {
-			await base.Given();
-			await _conn.CreatePersistentSubscriptionAsync(_stream, "groupname123", _settings,
-				DefaultData.AdminCredentials);
-			_conn.ConnectToPersistentSubscription(_stream, "groupname123",
-				(s, e) => Task.CompletedTask,
-				(s, r, e) => _called.Set(), DefaultData.AdminCredentials);
-		}
-
-		protected override Task When() {
-			return _conn.DeletePersistentSubscriptionAsync(_stream, "groupname123", DefaultData.AdminCredentials);
-		}
-
-		[Test]
-		public void the_subscription_is_dropped() {
-			Assert.IsTrue(_called.WaitOne(TimeSpan.FromSeconds(5)));
-		}
-	}
-
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class deleting_persistent_subscription_group_that_doesnt_exist<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = Guid.NewGuid().ToString();
-
-		protected override Task When() => Task.CompletedTask;
-
-		[Test]
-		public async Task the_delete_fails_with_argument_exception() {
-			await AssertEx.ThrowsAsync<InvalidOperationException>(
-				() =>
-					_conn.DeletePersistentSubscriptionAsync(_stream, Guid.NewGuid().ToString(),
-						DefaultData.AdminCredentials));
-		}
-	}
-
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class deleting_persistent_subscription_group_without_permissions<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = Guid.NewGuid().ToString();
-
-		protected override Task When() => Task.CompletedTask;
-
-		[Test]
-		public async Task the_delete_fails_with_access_denied() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(
-				() => _conn.DeletePersistentSubscriptionAsync(_stream, Guid.NewGuid().ToString()));
-		}
-	}
-
-	//ALL
-	/*
-
-		[TestFixture, Category("LongRunning")]
-		public class deleting_existing_persistent_subscription_group_on_all_with_permissions : SpecificationWithMiniNode
-		{
-			private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettingsBuilder.Create()
-																	.DoNotResolveLinkTos()
-																	.StartFromCurrent();
-			protected override void When()
-			{
-				_conn.CreatePersistentSubscriptionForAllAsync("groupname123", _settings,
-					DefaultData.AdminCredentials).Wait();
-			}
-
-			[Test]
-			public void the_delete_of_group_succeeds()
-			{
-				var result = _conn.DeletePersistentSubscriptionForAllAsync("groupname123", DefaultData.AdminCredentials).Result;
-				Assert.AreEqual(PersistentSubscriptionDeleteStatus.Success, result.Status);
-			}
-		}
-
-		[TestFixture, Category("LongRunning")]
-		public class deleting_persistent_subscription_group_on_all_that_doesnt_exist : SpecificationWithMiniNode
-		{
-			protected override void When()
-			{
-			}
-
-			[Test]
-			public void the_delete_fails_with_argument_exception()
-			{
-				try
-				{
-					_conn.DeletePersistentSubscriptionForAllAsync(Guid.NewGuid().ToString(), DefaultData.AdminCredentials).Wait();
-					throw new Exception("expected exception");
-				}
-				catch (Exception ex)
-				{
-					Assert.IsInstanceOf(typeof(AggregateException), ex);
-					var inner = ex.InnerException;
-					Assert.IsInstanceOf(typeof(InvalidOperationException), inner);
-				}
-			}
-		}
-
-
-		[TestFixture, Category("LongRunning")]
-		public class deleting_persistent_subscription_group_on_all_without_permissions : SpecificationWithMiniNode
-		{
-			protected override void When()
-			{
-			}
-
-			[Test]
-			public void the_delete_fails_with_access_denied()
-			{
-				try
-				{
-					_conn.DeletePersistentSubscriptionForAllAsync(Guid.NewGuid().ToString()).Wait();
-					throw new Exception("expected exception");
-				}
-				catch (Exception ex)
-				{
-					Assert.IsInstanceOf(typeof(AggregateException), ex);
-					var inner = ex.InnerException;
-					Assert.IsInstanceOf(typeof(AccessDeniedException), inner);
-				}
-			}
-		}
-	*/
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/deleting_stream.cs b/src/EventStore.Core.Tests/ClientAPI/deleting_stream.cs
deleted file mode 100644
index 0c49ff0d255..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/deleting_stream.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class deleting_stream<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private MiniNode<TLogFormat, TStreamId> _node;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-		virtual protected IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.Create(node.TcpEndPoint);
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task which_doesnt_exists_should_success_when_passed_empty_stream_expected_version() {
-			const string stream = "which_already_exists_should_success_when_passed_empty_stream_expected_version";
-			using (var connection = BuildConnection(_node)) {
-				await connection.ConnectAsync();
-				await connection.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task which_doesnt_exists_should_success_when_passed_any_for_expected_version() {
-			const string stream = "which_already_exists_should_success_when_passed_any_for_expected_version";
-			using (var connection = BuildConnection(_node)) {
-				await connection.ConnectAsync();
-
-				await connection.DeleteStreamAsync(stream, ExpectedVersion.Any, hardDelete: true);
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task with_invalid_expected_version_should_fail() {
-			const string stream = "with_invalid_expected_version_should_fail";
-			using (var connection = BuildConnection(_node)) {
-				await connection.ConnectAsync();
-
-				await AssertEx.ThrowsAsync<WrongExpectedVersionException>(() =>
-					connection.DeleteStreamAsync(stream, 1, hardDelete: true));
-			}
-		}
-
-		public async Task should_return_log_position_when_writing() {
-			const string stream = "delete_should_return_log_position_when_writing";
-			using (var connection = BuildConnection(_node)) {
-				await connection.ConnectAsync();
-
-				var result = await connection
-					.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
-				var delete = await connection.DeleteStreamAsync(stream, 1, hardDelete: true);
-
-				Assert.IsTrue(0 < result.LogPosition.PreparePosition);
-				Assert.IsTrue(0 < result.LogPosition.CommitPosition);
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task which_was_already_deleted_should_fail() {
-			const string stream = "which_was_allready_deleted_should_fail";
-			using (var connection = BuildConnection(_node)) {
-				await connection.ConnectAsync();
-
-				await connection.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
-
-				await AssertEx.ThrowsAsync<StreamDeletedException>(
-					() => connection.DeleteStreamAsync(stream, ExpectedVersion.Any, hardDelete: true));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/event_store_connection_should.cs b/src/EventStore.Core.Tests/ClientAPI/event_store_connection_should.cs
deleted file mode 100644
index b982e7506d2..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/event_store_connection_should.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string), TcpType.Normal)]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), TcpType.Normal)]
-	[TestFixture(typeof(LogFormat.V2), typeof(string), TcpType.Ssl)]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), TcpType.Ssl)]
-	public class event_store_connection_should<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private readonly TcpType _tcpType;
-		private MiniNode<TLogFormat, TStreamId> _node;
-
-		public event_store_connection_should(TcpType tcpType) {
-			_tcpType = tcpType;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-		[Test]
-		[Category("Network")]
-		public void not_throw_on_close_if_connect_was_not_called() {
-			var connection = TestConnection.To(_node, _tcpType);
-			Assert.DoesNotThrow(connection.Close);
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task not_throw_on_close_if_called_multiple_times() {
-			var connection = TestConnection.To(_node, _tcpType);
-			await connection.ConnectAsync();
-			connection.Close();
-			Assert.DoesNotThrow(connection.Close);
-		}
-
-		/*
-		//TODO WEIRD TEST GFY
-				[Test]
-				[Category("Network")]
-				public void throw_on_connect_called_more_than_once()
-				{
-					var connection = TestConnection.To(_node, _tcpType);
-					Assert.DoesNotThrow(() => connection.ConnectAsync().Wait());
-
-					await AssertEx.ThrowsAsync<>(() => connection.ConnectAsync().Wait(),
-								Throws.Exception.InstanceOf<AggregateException>().With.InnerException.InstanceOf<InvalidOperationException>());
-				}
-
-				[Test]
-				[Category("Network")]
-				public void throw_on_connect_called_after_close()
-				{
-					var connection = TestConnection.To(_node, _tcpType);
-					connection.ConnectAsync().Wait();
-					connection.Close();
-
-					await AssertEx.ThrowsAsync<>(() => connection.ConnectAsync().Wait(),
-								Throws.Exception.InstanceOf<AggregateException>().With.InnerException.InstanceOf<InvalidOperationException>());
-				}
-		*/
-		[Test]
-		[Category("Network")]
-		public async Task throw_invalid_operation_on_every_api_call_if_connect_was_not_called() {
-			var connection = TestConnection.To(_node, _tcpType);
-
-			const string s = "stream";
-			var events = new[] { TestEvent.NewTestEvent() };
-
-			await AssertEx.ThrowsAsync<InvalidOperationException>(() => connection.DeleteStreamAsync(s, 0));
-
-			await AssertEx.ThrowsAsync<InvalidOperationException>(() => connection.AppendToStreamAsync(s, 0, events));
-
-			await AssertEx.ThrowsAsync<InvalidOperationException>(
-				() => connection.ReadStreamEventsForwardAsync(s, 0, 1, resolveLinkTos: false));
-
-			await AssertEx.ThrowsAsync<InvalidOperationException>(
-				() => connection.ReadStreamEventsBackwardAsync(s, 0, 1, resolveLinkTos: false));
-
-			await AssertEx.ThrowsAsync<InvalidOperationException>(
-				() => connection.ReadAllEventsForwardAsync(Position.Start, 1, false));
-
-			await AssertEx.ThrowsAsync<InvalidOperationException>(() =>
-				connection.ReadAllEventsBackwardAsync(Position.End, 1, false));
-
-			await AssertEx.ThrowsAsync<InvalidOperationException>(() => connection.StartTransactionAsync(s, 0));
-
-			await AssertEx.ThrowsAsync<InvalidOperationException>(
-				() => connection.SubscribeToStreamAsync(s, false, (_, __) => Task.CompletedTask, (_, __, ___) => { }));
-
-			await AssertEx.ThrowsAsync<InvalidOperationException>(
-				() => connection.SubscribeToAllAsync(false, (_, __) => Task.CompletedTask, (_, __, ___) => { }));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/isjson_flag_on_event.cs b/src/EventStore.Core.Tests/ClientAPI/isjson_flag_on_event.cs
deleted file mode 100644
index 26cc70c7b98..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/isjson_flag_on_event.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Common.Utils;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class isjson_flag_on_event<TLogFormat, TStreamId> : SpecificationWithDirectory {
-		private MiniNode<TLogFormat, TStreamId> _node;
-
-		[SetUp]
-		public override async Task SetUp() {
-			await base.SetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-		}
-
-		[TearDown]
-		public override async Task TearDown() {
-			await _node.Shutdown();
-			await base.TearDown();
-		}
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.To(node, TcpType.Ssl);
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task should_be_preserved_with_all_possible_write_and_read_methods() {
-			const string stream = "should_be_preserved_with_all_possible_write_methods";
-			using (var connection = BuildConnection(_node)) {
-				await connection.ConnectAsync();
-
-				await connection.AppendToStreamAsync(
-						stream,
-						ExpectedVersion.Any,
-						new EventData(Guid.NewGuid(), "some-type", true,
-							Helper.UTF8NoBom.GetBytes("{\"some\":\"json\"}"), null),
-						new EventData(Guid.NewGuid(), "some-type", true, null,
-							Helper.UTF8NoBom.GetBytes("{\"some\":\"json\"}")),
-						new EventData(Guid.NewGuid(), "some-type", true,
-							Helper.UTF8NoBom.GetBytes("{\"some\":\"json\"}"),
-							Helper.UTF8NoBom.GetBytes("{\"some\":\"json\"}")));
-				var expectedEvents = 3;
-
-				if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
-					using (var transaction = await connection.StartTransactionAsync(stream, ExpectedVersion.Any)) {
-						await transaction.WriteAsync(
-							new EventData(Guid.NewGuid(), "some-type", true,
-								Helper.UTF8NoBom.GetBytes("{\"some\":\"json\"}"), null),
-							new EventData(Guid.NewGuid(), "some-type", true, null,
-								Helper.UTF8NoBom.GetBytes("{\"some\":\"json\"}")),
-							new EventData(Guid.NewGuid(), "some-type", true,
-								Helper.UTF8NoBom.GetBytes("{\"some\":\"json\"}"),
-								Helper.UTF8NoBom.GetBytes("{\"some\":\"json\"}")));
-						await transaction.CommitAsync();
-						expectedEvents += 3;
-					}
-				}
-
-				var done = new ManualResetEventSlim();
-				_node.Node.MainQueue.Publish(new ClientMessage.ReadStreamEventsForward(
-					Guid.NewGuid(), Guid.NewGuid(), new CallbackEnvelope(message => {
-						Assert.IsInstanceOf<ClientMessage.ReadStreamEventsForwardCompleted>(message);
-						var msg = (ClientMessage.ReadStreamEventsForwardCompleted)message;
-						Assert.AreEqual(Data.ReadStreamResult.Success, msg.Result);
-						Assert.AreEqual(expectedEvents, msg.Events.Length);
-						Assert.IsTrue(msg.Events.All(x => (x.OriginalEvent.Flags & PrepareFlags.IsJson) != 0));
-
-						done.Set();
-					}), stream, 0, 100, false, false, null, null, replyOnExpired: false));
-				Assert.IsTrue(done.Wait(10000), "Read was not completed in time.");
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/persistent_connect_integration_tests.cs b/src/EventStore.Core.Tests/ClientAPI/persistent_connect_integration_tests.cs
deleted file mode 100644
index f9dda30f40c..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/persistent_connect_integration_tests.cs
+++ /dev/null
@@ -1,437 +0,0 @@
-using System;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Common;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class happy_case_writing_and_subscribing_to_normal_events_manual_ack<TLogFormat, TStreamId>
-		: SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private const int BufferCount = 10;
-		private const int EventWriteCount = BufferCount * 2;
-
-		private readonly ManualResetEvent _eventsReceived = new ManualResetEvent(false);
-		private int _eventReceivedCount;
-
-		protected override Task When() => Task.WhenAll(_node.Started, _node.AdminUserCreated);
-
-		[Test]
-		public async Task Test() {
-			var streamName = Guid.NewGuid().ToString();
-			var groupName = Guid.NewGuid().ToString();
-			var settings = PersistentSubscriptionSettings
-				.Create()
-				.StartFromCurrent()
-				.ResolveLinkTos()
-				.Build();
-
-			await _conn.CreatePersistentSubscriptionAsync(streamName, groupName, settings, DefaultData.AdminCredentials);
-			await _conn.ConnectToPersistentSubscriptionAsync(streamName, groupName,
-				(subscription, resolvedEvent) => {
-					subscription.Acknowledge(resolvedEvent);
-
-					if (Interlocked.Increment(ref _eventReceivedCount) == EventWriteCount) {
-						_eventsReceived.Set();
-					}
-
-					return Task.CompletedTask;
-				},
-				(sub, reason, exception) =>
-					Console.WriteLine("Subscription dropped (reason:{0}, exception:{1}).", reason, exception),
-				bufferSize: 10, autoAck: false, userCredentials: DefaultData.AdminCredentials);
-
-			for (var i = 0; i < EventWriteCount; i++) {
-				var eventData = new EventData(Guid.NewGuid(), "SomeEvent", false, new byte[0], new byte[0]);
-
-				await _conn.AppendToStreamAsync(streamName, ExpectedVersion.Any, DefaultData.AdminCredentials, eventData);
-			}
-
-			if (!_eventsReceived.WaitOne(TimeSpan.FromSeconds(5))) {
-				throw new Exception("Timed out waiting for events.");
-			}
-		}
-	}
-
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class happy_case_writing_and_subscribing_to_normal_events_auto_ack<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private const int BufferCount = 10;
-		private const int EventWriteCount = BufferCount * 2;
-
-		private readonly ManualResetEvent _eventsReceived = new ManualResetEvent(false);
-		private int _eventReceivedCount;
-
-		protected override Task When() => Task.WhenAll(_node.Started, _node.AdminUserCreated);
-
-		[Test]
-		public async Task Test() {
-			var streamName = Guid.NewGuid().ToString();
-			var groupName = Guid.NewGuid().ToString();
-			var settings = PersistentSubscriptionSettings
-				.Create()
-				.StartFromCurrent()
-				.ResolveLinkTos()
-				.Build();
-			await _conn.CreatePersistentSubscriptionAsync(streamName, groupName, settings, DefaultData.AdminCredentials)
-;
-			await _conn.ConnectToPersistentSubscriptionAsync(streamName, groupName,
-				(subscription, resolvedEvent) => {
-					if (Interlocked.Increment(ref _eventReceivedCount) == EventWriteCount) {
-						_eventsReceived.Set();
-					}
-
-					return Task.CompletedTask;
-				},
-				(sub, reason, exception) =>
-					Console.WriteLine("Subscription dropped (reason:{0}, exception:{1}).", reason, exception),
-				userCredentials: DefaultData.AdminCredentials);
-
-			for (var i = 0; i < EventWriteCount; i++) {
-				var eventData = new EventData(Guid.NewGuid(), "SomeEvent", false, new byte[0], new byte[0]);
-
-				await _conn.AppendToStreamAsync(streamName, ExpectedVersion.Any, DefaultData.AdminCredentials, eventData);
-			}
-
-			if (!_eventsReceived.WaitOne(TimeSpan.FromSeconds(15))) {
-				throw new Exception($"Timed out waiting for events, received {_eventReceivedCount} event(s).");
-			}
-		}
-	}
-
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class happy_case_catching_up_to_normal_events_auto_ack<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private const int BufferCount = 10;
-		private const int EventWriteCount = BufferCount * 2;
-
-		private readonly ManualResetEvent _eventsReceived = new ManualResetEvent(false);
-		private int _eventReceivedCount;
-
-		protected override Task When() => Task.WhenAll(_node.Started, _node.AdminUserCreated);
-
-
-		[Test]
-		public async Task Test() {
-			var streamName = Guid.NewGuid().ToString();
-			var groupName = Guid.NewGuid().ToString();
-			var settings = PersistentSubscriptionSettings
-				.Create()
-				.StartFromBeginning()
-				.ResolveLinkTos()
-				.Build();
-			for (var i = 0; i < EventWriteCount; i++) {
-				var eventData = new EventData(Guid.NewGuid(), "SomeEvent", false, new byte[0], new byte[0]);
-
-				await _conn.AppendToStreamAsync(streamName, ExpectedVersion.Any, DefaultData.AdminCredentials, eventData);
-			}
-
-			await _conn.CreatePersistentSubscriptionAsync(streamName, groupName, settings, DefaultData.AdminCredentials);
-			await _conn.ConnectToPersistentSubscriptionAsync(streamName, groupName,
-				(subscription, resolvedEvent) => {
-					if (Interlocked.Increment(ref _eventReceivedCount) == EventWriteCount) {
-						_eventsReceived.Set();
-					}
-
-					return Task.CompletedTask;
-				},
-				(sub, reason, exception) => {
-					Console.WriteLine($"Subscription dropped (reason:{reason}, exception:{exception}).");
-				},
-				userCredentials: DefaultData.AdminCredentials,
-				autoAck: true);
-
-			if (!_eventsReceived.WaitOne(TimeSpan.FromSeconds(5))) {
-				throw new Exception("Timed out waiting for events.");
-			}
-		}
-	}
-
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class happy_case_catching_up_to_normal_events_manual_ack<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private const int BufferCount = 10;
-		private const int EventWriteCount = BufferCount * 2;
-
-		private readonly ManualResetEvent _eventsReceived = new ManualResetEvent(false);
-		private int _eventReceivedCount;
-
-		protected override Task When() => Task.WhenAll(_node.Started, _node.AdminUserCreated);
-
-
-		[Test]
-		public async Task Test() {
-			var streamName = Guid.NewGuid().ToString();
-			var groupName = Guid.NewGuid().ToString();
-			var settings = PersistentSubscriptionSettings
-				.Create()
-				.StartFromBeginning()
-				.ResolveLinkTos()
-				.Build();
-			for (var i = 0; i < EventWriteCount; i++) {
-				var eventData = new EventData(Guid.NewGuid(), "SomeEvent", false, new byte[0], new byte[0]);
-
-				await _conn.AppendToStreamAsync(streamName, ExpectedVersion.Any, DefaultData.AdminCredentials, eventData);
-			}
-
-			await _conn.CreatePersistentSubscriptionAsync(streamName, groupName, settings, DefaultData.AdminCredentials);
-			await _conn.ConnectToPersistentSubscriptionAsync(streamName, groupName,
-				(subscription, resolvedEvent) => {
-					subscription.Acknowledge(resolvedEvent);
-					if (Interlocked.Increment(ref _eventReceivedCount) == EventWriteCount) {
-						_eventsReceived.Set();
-					}
-
-					return Task.CompletedTask;
-				},
-				(sub, reason, exception) =>
-					Console.WriteLine("Subscription dropped (reason:{0}, exception:{1}).", reason, exception),
-				userCredentials: DefaultData.AdminCredentials,
-				autoAck: false);
-
-			if (!_eventsReceived.WaitOne(TimeSpan.FromSeconds(5))) {
-				throw new Exception("Timed out waiting for events.");
-			}
-		}
-	}
-
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class happy_case_catching_up_to_link_to_events_manual_ack<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private const int BufferCount = 10;
-		private const int EventWriteCount = BufferCount * 2;
-
-		private readonly ManualResetEvent _eventsReceived = new ManualResetEvent(false);
-		private int _eventReceivedCount;
-
-		protected override Task When() => Task.WhenAll(_node.Started, _node.AdminUserCreated);
-
-		[Test]
-		public async Task Test() {
-			var streamName = Guid.NewGuid().ToString();
-			var groupName = Guid.NewGuid().ToString();
-			var settings = PersistentSubscriptionSettings
-				.Create()
-				.StartFromBeginning()
-				.ResolveLinkTos()
-				.Build();
-			for (var i = 0; i < EventWriteCount; i++) {
-				var eventData = new EventData(Guid.NewGuid(), "SomeEvent", false, new byte[0], new byte[0]);
-				await _conn.AppendToStreamAsync(streamName + "original", ExpectedVersion.Any, DefaultData.AdminCredentials,
-					eventData);
-			}
-
-			await _conn.CreatePersistentSubscriptionAsync(streamName, groupName, settings, DefaultData.AdminCredentials);
-			await _conn.ConnectToPersistentSubscriptionAsync(streamName, groupName,
-				(subscription, resolvedEvent) => {
-					subscription.Acknowledge(resolvedEvent);
-					if (Interlocked.Increment(ref _eventReceivedCount) == EventWriteCount) {
-						_eventsReceived.Set();
-					}
-
-					return Task.CompletedTask;
-				},
-				(sub, reason, exception) =>
-					Console.WriteLine("Subscription dropped (reason:{0}, exception:{1}).", reason, exception),
-				userCredentials: DefaultData.AdminCredentials,
-				autoAck: false);
-			for (var i = 0; i < EventWriteCount; i++) {
-				var eventData = new EventData(Guid.NewGuid(), SystemEventTypes.LinkTo, false,
-					Encoding.UTF8.GetBytes(i + "@" + streamName + "original"), null);
-				await _conn.AppendToStreamAsync(streamName, ExpectedVersion.Any, DefaultData.AdminCredentials, eventData);
-			}
-
-			if (!_eventsReceived.WaitOne(TimeSpan.FromSeconds(5))) {
-				throw new Exception("Timed out waiting for events.");
-			}
-		}
-	}
-
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class happy_case_catching_up_to_link_to_events_auto_ack<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private const int BufferCount = 10;
-		private const int EventWriteCount = BufferCount * 2;
-
-		private readonly ManualResetEvent _eventsReceived = new ManualResetEvent(false);
-		private int _eventReceivedCount;
-
-		protected override Task When() => Task.WhenAll(_node.Started, _node.AdminUserCreated);
-
-		[Test]
-		public async Task Test() {
-			var streamName = Guid.NewGuid().ToString();
-			var groupName = Guid.NewGuid().ToString();
-			var settings = PersistentSubscriptionSettings
-				.Create()
-				.StartFromBeginning()
-				.ResolveLinkTos()
-				.Build();
-			for (var i = 0; i < EventWriteCount; i++) {
-				var eventData = new EventData(Guid.NewGuid(), "SomeEvent", false, new byte[0], new byte[0]);
-				await _conn.AppendToStreamAsync(streamName + "original", ExpectedVersion.Any, DefaultData.AdminCredentials,
-					eventData);
-			}
-
-			await _conn.CreatePersistentSubscriptionAsync(streamName, groupName, settings, DefaultData.AdminCredentials);
-			await _conn.ConnectToPersistentSubscriptionAsync(streamName, groupName,
-				(subscription, resolvedEvent) => {
-					if (Interlocked.Increment(ref _eventReceivedCount) == EventWriteCount) {
-						_eventsReceived.Set();
-					}
-
-					return Task.CompletedTask;
-				},
-				(sub, reason, exception) =>
-					Console.WriteLine("Subscription dropped (reason:{0}, exception:{1}).", reason, exception),
-				userCredentials: DefaultData.AdminCredentials,
-				autoAck: true);
-			for (var i = 0; i < EventWriteCount; i++) {
-				var eventData = new EventData(Guid.NewGuid(), SystemEventTypes.LinkTo, false,
-					Encoding.UTF8.GetBytes(i + "@" + streamName + "original"), null);
-				await _conn.AppendToStreamAsync(streamName, ExpectedVersion.Any, DefaultData.AdminCredentials, eventData);
-			}
-
-			if (!_eventsReceived.WaitOne(TimeSpan.FromSeconds(5))) {
-				throw new Exception("Timed out waiting for events.");
-			}
-		}
-	}
-
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_writing_and_subscribing_to_normal_events_manual_nack<TLogFormat, TStreamId>
-		: SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private const int BufferCount = 10;
-		private const int EventWriteCount = BufferCount * 2;
-
-		private readonly ManualResetEvent _eventsReceived = new ManualResetEvent(false);
-		private int _eventReceivedCount;
-
-		protected override Task When() => Task.WhenAll(_node.Started, _node.AdminUserCreated);
-
-		[Test]
-		public async Task Test() {
-			var streamName = Guid.NewGuid().ToString();
-			var groupName = Guid.NewGuid().ToString();
-			var settings = PersistentSubscriptionSettings
-				.Create()
-				.StartFromCurrent()
-				.ResolveLinkTos()
-				.Build();
-
-			await _conn.CreatePersistentSubscriptionAsync(streamName, groupName, settings, DefaultData.AdminCredentials);
-			await _conn.ConnectToPersistentSubscriptionAsync(streamName, groupName,
-				(subscription, resolvedEvent) => {
-					subscription.Fail(resolvedEvent, PersistentSubscriptionNakEventAction.Park, "fail");
-
-					if (Interlocked.Increment(ref _eventReceivedCount) == EventWriteCount) {
-						_eventsReceived.Set();
-					}
-
-					return Task.CompletedTask;
-				},
-				(sub, reason, exception) =>
-					Console.WriteLine("Subscription dropped (reason:{0}, exception:{1}).", reason, exception),
-				bufferSize: 10, autoAck: false, userCredentials: DefaultData.AdminCredentials);
-
-			for (var i = 0; i < EventWriteCount; i++) {
-				var eventData = new EventData(Guid.NewGuid(), "SomeEvent", false, new byte[0], new byte[0]);
-
-				await _conn.AppendToStreamAsync(streamName, ExpectedVersion.Any, DefaultData.AdminCredentials, eventData);
-			}
-
-			if (!_eventsReceived.WaitOne(TimeSpan.FromSeconds(5))) {
-				throw new Exception("Timed out waiting for events.");
-			}
-		}
-	}
-
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_connection_drops_messages_that_have_run_out_of_retries_are_not_retried<TLogFormat, TStreamId>
-		: SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly TaskCompletionSource<bool> _subscriptionDropped = new TaskCompletionSource<bool>();
-		private readonly TaskCompletionSource<bool> _eventReceived = new TaskCompletionSource<bool>();
-		private ResolvedEvent _receivedEvent;
-
-		protected override Task When() => Task.WhenAll(_node.Started, _node.AdminUserCreated);
-
-		[Test]
-		[Retry(10)]
-		public void Test() => Assert.DoesNotThrowAsync(async () => {
-			await CloseConnectionAndWait(_conn);
-			_conn = BuildConnection(_node);
-			AddLogging(_conn);
-			await _conn.ConnectAsync();
-			
-			var streamName = Guid.NewGuid().ToString();
-			var groupName = Guid.NewGuid().ToString();
-			var settings = PersistentSubscriptionSettings
-				.Create()
-				.StartFromCurrent()
-				.WithMaxRetriesOf(0) // Don't retry messages
-				.Build();
-
-			await _conn.CreatePersistentSubscriptionAsync(streamName, groupName, settings, DefaultData.AdminCredentials);
-			await _conn.ConnectToPersistentSubscriptionAsync(streamName, groupName, async (subscription, resolvedEvent) => {
-					await CloseConnectionAndWait(_conn);
-				},
-				(sub, reason, exception) => {
-					Console.WriteLine("Subscription dropped (reason:{0}, exception:{1}). @ {2}", reason, exception, DateTime.Now);
-					_subscriptionDropped.TrySetResult(true);
-				},
-				bufferSize: 10, autoAck: false, userCredentials: DefaultData.AdminCredentials);
-
-			var parkedEventData = new EventData(Guid.NewGuid(), "SomeEvent", false, new byte[0], new byte[0]);
-			await _conn.AppendToStreamAsync(streamName, ExpectedVersion.Any, DefaultData.AdminCredentials, parkedEventData);
-
-			await _subscriptionDropped.Task.WithTimeout();
-
-			_conn = BuildConnection(_node);
-			AddLogging(_conn);
-			await _conn.ConnectAsync();
-
-			await _conn.ConnectToPersistentSubscriptionAsync(streamName, groupName, (subscription, resolvedEvent) => {
-				subscription.Acknowledge(resolvedEvent);
-				_receivedEvent = resolvedEvent;
-				_eventReceived.TrySetResult(true);
-			}, (sub, reason, exception) => {
-				Console.WriteLine("Second Subscription dropped (reason:{0}, exception:{1}).", reason, exception);
-			}, bufferSize: 10, autoAck: false, userCredentials: DefaultData.AdminCredentials);
-
-			// Ensure we only get the new event, not the previous one
-			var newEventData = new EventData(Guid.NewGuid(), "SomeEvent", false, new byte[0], new byte[0]);
-			await _conn.AppendToStreamAsync(streamName, ExpectedVersion.Any, DefaultData.AdminCredentials, newEventData);
-
-			await _eventReceived.Task.WithTimeout();
-			Assert.AreEqual(newEventData.EventId, _receivedEvent.Event.EventId);
-			
-			//flaky: temporarily added for debugging
-			void AddLogging(IEventStoreConnection conn) {
-				conn.AuthenticationFailed += (_, args) => Console.WriteLine($"_conn.AuthenticationFailed: {args.Connection.ConnectionName} @ {DateTime.Now} {TestContext.CurrentContext.CurrentRepeatCount}");
-				conn.Closed += (_, args) => Console.WriteLine($"_conn.Closed: {args.Connection.ConnectionName} @ {DateTime.Now} {TestContext.CurrentContext.CurrentRepeatCount}");
-				conn.Connected += (_, args) => Console.WriteLine($"_conn.Connected: {args.Connection.ConnectionName} @ {DateTime.Now} {TestContext.CurrentContext.CurrentRepeatCount}");
-				conn.Disconnected += (_, args) => Console.WriteLine($"_conn.Disconnected: {args.Connection.ConnectionName} @ {DateTime.Now} {TestContext.CurrentContext.CurrentRepeatCount}");
-				conn.ErrorOccurred += (_, args) => Console.WriteLine($"_conn.ErrorOccurred: {args.Connection.ConnectionName} @ {DateTime.Now} {TestContext.CurrentContext.CurrentRepeatCount}");
-				conn.Reconnecting += (_, args) => Console.WriteLine($"_conn.Reconnecting: {args.Connection.ConnectionName} @ {DateTime.Now} {TestContext.CurrentContext.CurrentRepeatCount}");
-			}
-		});
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/read_all_events_backward_filtered_should.cs b/src/EventStore.Core.Tests/ClientAPI/read_all_events_backward_filtered_should.cs
deleted file mode 100644
index 7491c3b9df8..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/read_all_events_backward_filtered_should.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Core.Services;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using NUnit.Framework;
-using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
-using StreamMetadata = EventStore.ClientAPI.StreamMetadata;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_all_events_backward_filtered_should<TLogFormat, TStreamId>
-		: SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private List<EventData> _testEvents;
-
-		protected override async Task When() {
-			await _conn.SetStreamMetadataAsync("$all", -1,
-					StreamMetadata.Build().SetReadRole(SystemRoles.All),
-					DefaultData.AdminCredentials);
-
-			_testEvents = Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "AEvent"))
-				.ToList();
-			_testEvents.AddRange(
-				Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "BEvent"))
-					.ToList());
-
-			await _conn.AppendToStreamAsync("stream-a", ExpectedVersion.NoStream, _testEvents.EvenEvents());
-			await _conn.AppendToStreamAsync("stream-b", ExpectedVersion.NoStream, _testEvents.OddEvents());
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task only_return_events_with_a_given_stream_prefix() {
-			var filter = Filter.StreamId.Prefix("stream-a");
-
-			var read = await _conn.FilteredReadAllEventsBackwardAsync(Position.End, 4096, false, filter, 4096);
-			Assert.That(EventDataComparer.Equal(
-				_testEvents.EvenEvents().ReverseEvents(),
-				read.Events.Select(x => x.Event).ToArray()));
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task only_return_events_with_a_given_event_prefix() {
-			var filter = Filter.EventType.Prefix("AE");
-
-			// Have to order the events as we are writing to two streams and can't guarantee ordering
-
-			var read = await _conn.FilteredReadAllEventsBackwardAsync(Position.End, 4096, false, filter, 4096);
-			Assert.AreEqual(ReadDirection.Backward, read.ReadDirection);
-			Assert.That(EventDataComparer.Equal(
-				_testEvents.Where(e => e.Type == "AEvent").OrderBy(x => x.EventId).ToArray(),
-				read.Events.Select(x => x.Event).OrderBy(x => x.EventId).ToArray()));
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task only_return_events_that_satisfy_a_given_stream_regex() {
-			var filter = Filter.StreamId.Regex(new Regex(@"^.*m-b.*$"));
-
-			var read = await _conn.FilteredReadAllEventsBackwardAsync(Position.End, 4096, false, filter, 4096);
-			Assert.AreEqual(ReadDirection.Backward, read.ReadDirection);
-			Assert.That(EventDataComparer.Equal(
-				_testEvents.OddEvents().ReverseEvents(),
-				read.Events.Select(x => x.Event).ToArray()));
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task only_return_events_that_satisfy_a_given_event_regex() {
-			var filter = Filter.EventType.Regex(new Regex(@"^.*BEv.*$"));
-
-			// Have to order the events as we are writing to two streams and can't guarantee ordering
-			var read = await _conn.FilteredReadAllEventsBackwardAsync(Position.End, 4096, false, filter, 4096);
-			Assert.AreEqual(ReadDirection.Backward, read.ReadDirection);
-			Assert.That(EventDataComparer.Equal(
-				_testEvents.Where(e => e.Type == "BEvent").OrderBy(x => x.EventId).ToArray(),
-				read.Events.Select(x => x.Event).OrderBy(x => x.EventId).ToArray()));
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task only_return_events_that_are_not_system_events() {
-			var filter = Filter.ExcludeSystemEvents;
-
-			// Have to order the events as we are writing to two streams and can't guarantee ordering
-			var read = await _conn.FilteredReadAllEventsBackwardAsync(Position.End, 4096, false, filter, 4096);
-			Assert.AreEqual(ReadDirection.Backward, read.ReadDirection);
-			Assert.That(!read.Events.Any(e => e.Event.EventType.StartsWith("$")));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/read_all_events_backward_should.cs b/src/EventStore.Core.Tests/ClientAPI/read_all_events_backward_should.cs
deleted file mode 100644
index 19c4fcadaeb..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/read_all_events_backward_should.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Core.Services;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_all_events_backward_should<TLogFormat, TStreamId>
-		: SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private EventData[] _testEvents;
-
-		protected override async Task When() {
-			await _conn.SetStreamMetadataAsync("$all", -1,
-					StreamMetadata.Build().SetReadRole(SystemRoles.All),
-					DefaultData.AdminCredentials);
-
-			_testEvents = Enumerable.Range(0, 20).Select(x => TestEvent.NewTestEvent(x.ToString())).ToArray();
-			await _conn.AppendToStreamAsync("stream", ExpectedVersion.NoStream, _testEvents);
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task return_empty_slice_if_asked_to_read_from_start() {
-			var read = await _conn.ReadAllEventsBackwardAsync(Position.Start, 1, false);
-			Assert.That(read.IsEndOfStream, Is.True);
-			Assert.That(read.Events.Length, Is.EqualTo(0));
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task return_partial_slice_if_not_enough_events() {
-			var read = await _conn.ReadAllEventsBackwardAsync(Position.End, 40, false);
-			Assert.That(read.Events.Length, Is.LessThan(40));
-			Assert.That(EventDataComparer.Equal(_testEvents.Reverse().ToArray(),
-				read.Events.Take(_testEvents.Length).Select(x => x.Event).ToArray()));
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task return_events_in_reversed_order_compared_to_written() {
-			var read = await _conn.ReadAllEventsBackwardAsync(Position.End, _testEvents.Length, false);
-			Assert.That(EventDataComparer.Equal(_testEvents.Reverse().ToArray(),
-				read.Events.Select(x => x.Event).ToArray()));
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task be_able_to_read_all_one_by_one_until_end_of_stream() {
-			var all = new List<RecordedEvent>();
-			var position = Position.End;
-			AllEventsSlice slice;
-
-			while (!(slice = await _conn.ReadAllEventsBackwardAsync(position, 1, false)).IsEndOfStream) {
-				all.Add(slice.Events.Single().Event);
-				position = slice.NextPosition;
-			}
-
-			Assert.That(
-				EventDataComparer.Equal(_testEvents.Reverse().ToArray(), all.Take(_testEvents.Length).ToArray()));
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task be_able_to_read_events_slice_at_time() {
-			var all = new List<RecordedEvent>();
-			var position = Position.End;
-			AllEventsSlice slice;
-
-			while (!(slice = await _conn.ReadAllEventsBackwardAsync(position, 5, false)).IsEndOfStream) {
-				all.AddRange(slice.Events.Select(x => x.Event));
-				position = slice.NextPosition;
-			}
-
-			Assert.That(
-				EventDataComparer.Equal(_testEvents.Reverse().ToArray(), all.Take(_testEvents.Length).ToArray()));
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task throw_when_got_int_max_value_as_maxcount() {
-			await AssertEx.ThrowsAsync<ArgumentException>(
-				() => _conn.ReadAllEventsBackwardAsync(Position.Start, int.MaxValue, resolveLinkTos: false));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/read_all_events_filtered_paging_should.cs b/src/EventStore.Core.Tests/ClientAPI/read_all_events_filtered_paging_should.cs
deleted file mode 100644
index 7fbb72eb294..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/read_all_events_filtered_paging_should.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Core.Services;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using NUnit.Framework;
-using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
-using ResolvedEvent = EventStore.ClientAPI.ResolvedEvent;
-using StreamMetadata = EventStore.ClientAPI.StreamMetadata;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_all_events_filtered_paging_should<TLogFormat, TStreamId>
-		: SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private List<EventData> _testEvents = new List<EventData>();
-
-		private List<EventData> _testEventsA;
-
-		private List<EventData> _testEventsC;
-
-		public read_all_events_filtered_paging_should() : base(chunkSize: 2 * 1024 * 1024) { }
-
-		protected override async Task When() {
-			await _conn.SetStreamMetadataAsync("$all", -1,
-				StreamMetadata.Build().SetReadRole(SystemRoles.All),
-				DefaultData.AdminCredentials);
-
-			_testEventsA = Enumerable
-				.Range(0, 10)
-				.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "AEvent"))
-				.ToList();
-
-			var testEventsB = Enumerable
-				.Range(0, 10000)
-				.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "BEvent"))
-				.ToList();
-
-			_testEventsC = Enumerable
-				.Range(0, 10)
-				.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "CEvent"))
-				.ToList();
-
-			_testEvents.AddRange(_testEventsA);
-			_testEvents.AddRange(testEventsB);
-			_testEvents.AddRange(_testEventsC);
-
-			_conn.AppendToStreamAsync("stream-a", ExpectedVersion.NoStream, _testEvents).Wait();
-		}
-
-		[Test, Category("LongRunning")]
-		public void handle_paging_between_events_forward() {
-			var numberOfEmptySlicesRead = 0;
-
-			var filter = Filter.EventType.Prefix("CE");
-			var sliceStart = Position.Start;
-			var read = new List<ResolvedEvent>();
-			AllEventsSlice slice;
-
-			do {
-				slice = _conn.FilteredReadAllEventsForwardAsync(sliceStart, 50, false, filter, maxSearchWindow: 100)
-					.GetAwaiter()
-					.GetResult();
-
-				if (slice.Events.Length == 0) {
-					numberOfEmptySlicesRead++;
-				} else {
-					read.AddRange(slice.Events);
-				}
-
-				sliceStart = slice.NextPosition;
-			} while (!slice.IsEndOfStream);
-
-			Assert.That(EventDataComparer.Equal(
-				_testEventsC.ToArray(),
-				read.Select(x => x.Event).ToArray()));
-
-			Assert.AreEqual(100, numberOfEmptySlicesRead);
-		}
-
-		[Test, Category("LongRunning")]
-		public void handle_paging_between_events_backward() {
-			var numberOfEmptySlicesRead = 0;
-
-			var filter = Filter.EventType.Prefix("AE");
-			var sliceStart = Position.End;
-			var read = new List<ResolvedEvent>();
-			AllEventsSlice slice;
-
-			do {
-				slice = _conn.FilteredReadAllEventsBackwardAsync(sliceStart, 50, false, filter, maxSearchWindow: 100)
-					.GetAwaiter()
-					.GetResult();
-				if (slice.Events.Length == 0) {
-					numberOfEmptySlicesRead++;
-				} else {
-					read.AddRange(slice.Events);
-				}
-
-				sliceStart = slice.NextPosition;
-			} while (!slice.IsEndOfStream);
-
-			Assert.That(EventDataComparer.Equal(
-				_testEventsA.ReverseEvents(),
-				read.Select(x => x.Event).ToArray()));
-
-			Assert.AreEqual(100, numberOfEmptySlicesRead);
-		}
-
-		[Test, Category("LongRunning")]
-		public void handle_paging_between_events_returns_correct_number_of_events_for_max_search_window_forward() {
-			var filter = Filter.EventType.Prefix("BE");
-
-			var slice = _conn.FilteredReadAllEventsForwardAsync(Position.Start, 30, false, filter, maxSearchWindow: 30)
-				.GetAwaiter()
-				.GetResult();
-
-			// Includes system events at start of stream (inc epoch-information)
-			var expectedCount = 11;
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.IsV3) {
-				// account for stream records: $scavenges, $user-admin, $user-ops, $users, stream-a
-				expectedCount -= 5;
-				// account for event type records: $UserCreated, $User, AEvent, BEvent, CEvent
-				expectedCount -= 5;
-			}
-
-			Assert.AreEqual(expectedCount, slice.Events.Length);
-		}
-
-		[Test, Category("LongRunning")]
-		public void handle_paging_between_events_returns_correct_number_of_events_for_max_search_window_backward() {
-			var filter = Filter.EventType.Prefix("BE");
-
-			var slice = _conn.FilteredReadAllEventsBackwardAsync(Position.End, 20, false, filter, maxSearchWindow: 20)
-				.GetAwaiter()
-				.GetResult();
-
-			Assert.AreEqual(10, slice.Events.Length); // Includes system events
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/read_all_events_forward_filtered_should.cs b/src/EventStore.Core.Tests/ClientAPI/read_all_events_forward_filtered_should.cs
deleted file mode 100644
index 102feca8da4..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/read_all_events_forward_filtered_should.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Core.Services;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using NUnit.Framework;
-using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
-using StreamMetadata = EventStore.ClientAPI.StreamMetadata;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_all_events_forward_filtered_should<TLogFormat, TStreamId>
-		: SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private List<EventData> _testEvents;
-
-		protected override async Task When() {
-			await _conn.SetStreamMetadataAsync("$all", -1,
-					StreamMetadata.Build().SetReadRole(SystemRoles.All),
-					DefaultData.AdminCredentials);
-
-			_testEvents = Enumerable
-				.Range(0, 10)
-				.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "AEvent"))
-				.ToList();
-
-			_testEvents.AddRange(
-				Enumerable
-					.Range(0, 10)
-					.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "BEvent")).ToList());
-
-			await _conn.AppendToStreamAsync("stream-a", ExpectedVersion.NoStream, _testEvents.EvenEvents());
-			await _conn.AppendToStreamAsync("stream-b", ExpectedVersion.NoStream, _testEvents.OddEvents());
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task only_return_events_with_a_given_stream_prefix() {
-			var filter = Filter.StreamId.Prefix("stream-a");
-
-			var read = await _conn.FilteredReadAllEventsForwardAsync(Position.Start, 1000, false, filter, 1000);
-			Assert.That(EventDataComparer.Equal(
-				_testEvents.EvenEvents().ToArray(),
-				read.Events.Select(x => x.Event).ToArray()));
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task only_return_events_with_a_given_event_prefix() {
-			var filter = Filter.EventType.Prefix("AE");
-
-			// Have to order the events as we are writing to two streams and can't guarantee ordering
-			var read = await _conn.FilteredReadAllEventsForwardAsync(Position.Start, 1000, false, filter, 1000);
-			Assert.That(EventDataComparer.Equal(
-				_testEvents.Where(e => e.Type == "AEvent").OrderBy(x => x.EventId).ToArray(),
-				read.Events.Select(x => x.Event).OrderBy(x => x.EventId).ToArray()));
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task only_return_events_that_satisfy_a_given_stream_regex() {
-			var filter = Filter.StreamId.Regex(new Regex(@"^.*eam-b.*$"));
-
-			var read = await _conn.FilteredReadAllEventsForwardAsync(Position.Start, 1000, false, filter, 1000);
-			Assert.AreEqual(ReadDirection.Forward, read.ReadDirection);
-			Assert.That(EventDataComparer.Equal(
-				_testEvents.OddEvents().ToArray(),
-				read.Events.Select(x => x.Event).ToArray()));
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task only_return_events_that_satisfy_a_given_event_regex() {
-			var filter = Filter.EventType.Regex(new Regex(@"^.*BEv.*$"));
-
-			// Have to order the events as we are writing to two streams and can't guarantee ordering
-			var read = await _conn.FilteredReadAllEventsForwardAsync(Position.Start, 1000, false, filter, 1000);
-			Assert.AreEqual(ReadDirection.Forward, read.ReadDirection);
-			Assert.That(EventDataComparer.Equal(
-				_testEvents.Where(e => e.Type == "BEvent").OrderBy(x => x.EventId).ToArray(),
-				read.Events.Select(x => x.Event).OrderBy(x => x.EventId).ToArray()));
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task only_return_events_that_are_not_system_events() {
-			var filter = Filter.ExcludeSystemEvents;
-
-			// Have to order the events as we are writing to two streams and can't guarantee ordering
-			var read = await _conn.FilteredReadAllEventsForwardAsync(Position.Start, 1000, false, filter, 1000);
-			Assert.AreEqual(ReadDirection.Forward, read.ReadDirection);
-			Assert.That(!read.Events.Any(e => e.Event.EventType.StartsWith("$")));
-		}
-	}
-
-	internal static class EventDataExtensions {
-		internal static List<EventData> EvenEvents(this List<EventData> ed) => ed.Where((c, i) => i % 2 == 0).ToList();
-
-		internal static List<EventData> OddEvents(this List<EventData> ed) => ed.Where((c, i) => i % 2 != 0).ToList();
-
-		internal static EventData[] ReverseEvents(this List<EventData> ed) => ed.ToArray().Reverse().ToArray();
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/read_all_events_forward_should.cs b/src/EventStore.Core.Tests/ClientAPI/read_all_events_forward_should.cs
deleted file mode 100644
index 37540764745..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/read_all_events_forward_should.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Core.Services;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_all_events_forward_should<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private EventData[] _testEvents;
-
-		protected override async Task When() {
-			await _conn.SetStreamMetadataAsync("$all", -1,
-					StreamMetadata.Build().SetReadRole(SystemRoles.All),
-					DefaultData.AdminCredentials);
-
-			_testEvents = Enumerable.Range(0, 20).Select(x => TestEvent.NewTestEvent(x.ToString())).ToArray();
-			await _conn.AppendToStreamAsync("stream", ExpectedVersion.NoStream, _testEvents);
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task return_empty_slice_if_asked_to_read_from_end() {
-			var read = await _conn.ReadAllEventsForwardAsync(Position.End, 1, false);
-			Assert.That(read.IsEndOfStream, Is.True);
-			Assert.That(read.Events.Length, Is.EqualTo(0));
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task return_events_in_same_order_as_written() {
-			var read = await _conn.ReadAllEventsForwardAsync(Position.Start, _testEvents.Length + 20, false);
-			Assert.That(EventDataComparer.Equal(
-				_testEvents.ToArray(),
-				read.Events.Skip(read.Events.Length - _testEvents.Length).Select(x => x.Event).ToArray()));
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task be_able_to_read_all_one_by_one_until_end_of_stream() {
-			var all = new List<RecordedEvent>();
-			var position = Position.Start;
-			AllEventsSlice slice;
-
-			while (!(slice = await _conn.ReadAllEventsForwardAsync(position, 1, false)).IsEndOfStream) {
-				all.Add(slice.Events.Single().Event);
-				position = slice.NextPosition;
-			}
-
-			Assert.That(EventDataComparer.Equal(_testEvents, all.Skip(all.Count - _testEvents.Length).ToArray()));
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task be_able_to_read_events_slice_at_time() {
-			var all = new List<RecordedEvent>();
-			var position = Position.Start;
-			AllEventsSlice slice;
-
-			while (!(slice = await _conn.ReadAllEventsForwardAsync(position, 5, false)).IsEndOfStream) {
-				all.AddRange(slice.Events.Select(x => x.Event));
-				position = slice.NextPosition;
-			}
-
-			Assert.That(EventDataComparer.Equal(_testEvents, all.Skip(all.Count - _testEvents.Length).ToArray()));
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task return_partial_slice_if_not_enough_events() {
-			var read = await _conn.ReadAllEventsForwardAsync(Position.Start, 40, false);
-			Assert.That(read.Events.Length, Is.LessThan(40));
-			Assert.That(EventDataComparer.Equal(
-				_testEvents,
-				read.Events.Skip(read.Events.Length - _testEvents.Length).Select(x => x.Event).ToArray()));
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task throw_when_got_int_max_value_as_maxcount() {
-			await AssertEx.ThrowsAsync<ArgumentException>(
-				() => _conn.ReadAllEventsForwardAsync(Position.Start, int.MaxValue, resolveLinkTos: false));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/read_all_events_forward_with_hard_deleted_stream_should.cs b/src/EventStore.Core.Tests/ClientAPI/read_all_events_forward_with_hard_deleted_stream_should.cs
deleted file mode 100644
index e923632d90c..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/read_all_events_forward_with_hard_deleted_stream_should.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Data;
-using EventStore.Core.Services;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
-using StreamMetadata = EventStore.ClientAPI.StreamMetadata;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_all_events_forward_with_hard_deleted_stream_should<TLogFormat, TStreamId>
-		: SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private EventData[] _testEvents;
-
-		protected override async Task When() {
-			await _conn.SetStreamMetadataAsync(
-					"$all", -1, StreamMetadata.Build().SetReadRole(SystemRoles.All),
-					new UserCredentials(SystemUsers.Admin, SystemUsers.DefaultAdminPassword));
-
-			_testEvents = Enumerable.Range(0, 20).Select(x => TestEvent.NewTestEvent(x.ToString())).ToArray();
-			await _conn.AppendToStreamAsync("stream", ExpectedVersion.NoStream, _testEvents);
-			await _conn.DeleteStreamAsync("stream", ExpectedVersion.Any, hardDelete: true);
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task ensure_deleted_stream() {
-			var res = await _conn.ReadStreamEventsForwardAsync("stream", 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.StreamDeleted, res.Status);
-			Assert.AreEqual(0, res.Events.Length);
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task returns_all_events_including_tombstone() {
-			AllEventsSlice read = await _conn.ReadAllEventsForwardAsync(Position.Start, _testEvents.Length + 20, false)
-;
-			Assert.That(
-				EventDataComparer.Equal(
-					_testEvents.ToArray(),
-					read.Events.Skip(read.Events.Length - _testEvents.Length - 1)
-						.Take(_testEvents.Length)
-						.Select(x => x.Event)
-						.ToArray()));
-			var lastEvent = read.Events.Last().Event;
-			Assert.AreEqual("stream", lastEvent.EventStreamId);
-			Assert.AreEqual(SystemEventTypes.StreamDeleted, lastEvent.EventType);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/read_all_events_forward_with_linkto_passed_max_count.cs b/src/EventStore.Core.Tests/ClientAPI/read_all_events_forward_with_linkto_passed_max_count.cs
deleted file mode 100644
index a3230d1f831..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/read_all_events_forward_with_linkto_passed_max_count.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_all_events_forward_with_linkto_passed_max_count<TLogFormat, TStreamId> : SpecificationWithLinkToToMaxCountDeletedEvents<TLogFormat, TStreamId> {
-		private StreamEventsSlice _read;
-
-		protected override async Task When() {
-			_read = await _conn.ReadStreamEventsForwardAsync(LinkedStreamName, 0, 1, true);
-		}
-
-		[Test]
-		public void one_event_is_read() {
-			Assert.AreEqual(1, _read.Events.Length);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/read_all_events_forward_with_linkto_to_deleted_event.cs b/src/EventStore.Core.Tests/ClientAPI/read_all_events_forward_with_linkto_to_deleted_event.cs
deleted file mode 100644
index 6d2a982f980..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/read_all_events_forward_with_linkto_to_deleted_event.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_all_events_forward_with_linkto_to_deleted_event<TLogFormat, TStreamId> : SpecificationWithLinkToToDeletedEvents<TLogFormat, TStreamId> {
-		private StreamEventsSlice _read;
-
-		protected override async Task When() {
-			_read = await _conn.ReadStreamEventsForwardAsync(LinkedStreamName, 0, 1, true, null);
-		}
-
-		[Test]
-		public void one_event_is_read() {
-			Assert.AreEqual(1, _read.Events.Length);
-		}
-
-		[Test]
-		public void the_linked_event_is_not_resolved() {
-			Assert.IsNull(_read.Events[0].Event);
-		}
-
-		[Test]
-		public void the_link_event_is_included() {
-			Assert.IsNotNull(_read.Events[0].OriginalEvent);
-		}
-
-		[Test]
-		public void the_event_is_not_resolved() {
-			Assert.IsFalse(_read.Events[0].IsResolved);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/read_all_events_forward_with_soft_deleted_stream_should.cs b/src/EventStore.Core.Tests/ClientAPI/read_all_events_forward_with_soft_deleted_stream_should.cs
deleted file mode 100644
index c916cd895e7..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/read_all_events_forward_with_soft_deleted_stream_should.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Data;
-using EventStore.Core.Services;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using NUnit.Framework;
-using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
-using StreamMetadata = EventStore.ClientAPI.StreamMetadata;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_all_events_forward_with_soft_deleted_stream_should<TLogFormat, TStreamId>
-		: SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private EventData[] _testEvents;
-
-		protected override async Task When() {
-			await _conn.SetStreamMetadataAsync(
-					"$all", -1, StreamMetadata.Build().SetReadRole(SystemRoles.All),
-					new UserCredentials(SystemUsers.Admin, SystemUsers.DefaultAdminPassword));
-
-			_testEvents = Enumerable.Range(0, 20).Select(x => TestEvent.NewTestEvent(x.ToString())).ToArray();
-			await _conn.AppendToStreamAsync("stream", ExpectedVersion.NoStream, _testEvents);
-			await _conn.DeleteStreamAsync("stream", ExpectedVersion.Any);
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task ensure_deleted_stream() {
-			var res = await _conn.ReadStreamEventsForwardAsync("stream", 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.StreamNotFound, res.Status);
-			Assert.AreEqual(0, res.Events.Length);
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task returns_all_events_including_tombstone() {
-			AllEventsSlice read = await _conn.ReadAllEventsForwardAsync(Position.Start, _testEvents.Length + 20, false)
-;
-			Assert.That(
-				EventDataComparer.Equal(
-					_testEvents.ToArray(),
-					read.Events.Skip(read.Events.Length - _testEvents.Length - 1)
-						.Take(_testEvents.Length)
-						.Select(x => x.Event)
-						.ToArray()));
-			var lastEvent = read.Events.Last().Event;
-			Assert.AreEqual("$$stream", lastEvent.EventStreamId);
-			Assert.AreEqual(SystemEventTypes.StreamMetadata, lastEvent.EventType);
-			var metadata = StreamMetadata.FromJsonBytes(lastEvent.Data);
-			Assert.AreEqual(EventNumber.DeletedStream, metadata.TruncateBefore);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/read_allevents_backward_with_linkto_deleted_event.cs b/src/EventStore.Core.Tests/ClientAPI/read_allevents_backward_with_linkto_deleted_event.cs
deleted file mode 100644
index bdf9a5285dd..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/read_allevents_backward_with_linkto_deleted_event.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_event_of_linkto_to_deleted_event<TLogFormat, TStreamId> : SpecificationWithLinkToToDeletedEvents<TLogFormat, TStreamId> {
-		private EventReadResult _read;
-
-		protected override async Task When() {
-			_read = await _conn.ReadEventAsync(LinkedStreamName, 0, true);
-		}
-
-		[Test]
-		public void the_linked_event_is_returned() {
-			Assert.IsNotNull(_read.Event.Value.Link);
-		}
-
-		[Test]
-		public void the_deleted_event_is_not_resolved() {
-			Assert.IsNull(_read.Event.Value.Event);
-		}
-
-		[Test]
-		public void the_status_is_success() {
-			Assert.AreEqual(EventReadStatus.Success, _read.Status);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_allevents_backward_with_linkto_deleted_event<TLogFormat, TStreamId> : SpecificationWithLinkToToDeletedEvents<TLogFormat, TStreamId> {
-		private StreamEventsSlice _read;
-
-		protected override async Task When() {
-			_read = await _conn.ReadStreamEventsBackwardAsync(LinkedStreamName, 0, 1, true, null);
-		}
-
-		[Test]
-		public void one_event_is_read() {
-			Assert.AreEqual(1, _read.Events.Length);
-		}
-
-		[Test]
-		public void the_linked_event_is_not_resolved() {
-			Assert.IsNull(_read.Events[0].Event);
-		}
-
-		[Test]
-		public void the_link_event_is_included() {
-			Assert.IsNotNull(_read.Events[0].OriginalEvent);
-		}
-
-		[Test]
-		public void the_event_is_not_resolved() {
-			Assert.IsFalse(_read.Events[0].IsResolved);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/read_event_should.cs b/src/EventStore.Core.Tests/ClientAPI/read_event_should.cs
deleted file mode 100644
index e7cdea5ec38..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/read_event_should.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_event_should<TLogFormat, TStreamId>
-		: SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private Guid _eventId0;
-		private Guid _eventId1;
-
-		protected override async Task When() {
-			_eventId0 = Guid.NewGuid();
-			_eventId1 = Guid.NewGuid();
-
-			await _conn.AppendToStreamAsync("test-stream",
-					-1,
-					new EventData(_eventId0, "event0", false, new byte[3], new byte[2]),
-					new EventData(_eventId1, "event1", true, new byte[7], new byte[10]));
-			await _conn.DeleteStreamAsync("deleted-stream", -1, hardDelete: true);
-		}
-
-		[Test, Category("Network")]
-		public async Task throw_if_stream_id_is_null() {
-			await AssertEx.ThrowsAsync<ArgumentNullException>(() => _conn.ReadEventAsync(null, 0, resolveLinkTos: false));
-		}
-
-		[Test, Category("Network")]
-		public async Task throw_if_stream_id_is_empty() {
-			await AssertEx.ThrowsAsync<ArgumentNullException>(() => _conn.ReadEventAsync("", 0, resolveLinkTos: false));
-		}
-
-		[Test, Category("Network")]
-		public async Task throw_if_event_number_is_less_than_minus_one() {
-			await AssertEx.ThrowsAsync<ArgumentOutOfRangeException>(() =>
-				_conn.ReadEventAsync("stream", -2, resolveLinkTos: false));
-		}
-
-		[Test, Category("Network")]
-		public async Task notify_using_status_code_if_stream_not_found() {
-			var res = await _conn.ReadEventAsync("unexisting-stream", 5, false);
-
-			Assert.AreEqual(EventReadStatus.NoStream, res.Status);
-			Assert.IsNull(res.Event);
-			Assert.AreEqual("unexisting-stream", res.Stream);
-			Assert.AreEqual(5, res.EventNumber);
-		}
-
-		[Test, Category("Network")]
-		public async Task return_no_stream_if_requested_last_event_in_empty_stream() {
-			var res = await _conn.ReadEventAsync("some-really-empty-stream", -1, false);
-			Assert.AreEqual(EventReadStatus.NoStream, res.Status);
-		}
-
-		[Test, Category("Network")]
-		public async Task notify_using_status_code_if_stream_was_deleted() {
-			var res = await _conn.ReadEventAsync("deleted-stream", 5, false);
-
-			Assert.AreEqual(EventReadStatus.StreamDeleted, res.Status);
-			Assert.IsNull(res.Event);
-			Assert.AreEqual("deleted-stream", res.Stream);
-			Assert.AreEqual(5, res.EventNumber);
-		}
-
-		[Test, Category("Network")]
-		public async Task notify_using_status_code_if_stream_does_not_have_event() {
-			var res = await _conn.ReadEventAsync("test-stream", 5, false);
-
-			Assert.AreEqual(EventReadStatus.NotFound, res.Status);
-			Assert.IsNull(res.Event);
-			Assert.AreEqual("test-stream", res.Stream);
-			Assert.AreEqual(5, res.EventNumber);
-		}
-
-		[Test, Category("Network")]
-		public async Task return_existing_event() {
-			var res = await _conn.ReadEventAsync("test-stream", 0, false);
-
-			Assert.AreEqual(EventReadStatus.Success, res.Status);
-			Assert.AreEqual(res.Event.Value.OriginalEvent.EventId, _eventId0);
-			Assert.AreEqual("test-stream", res.Stream);
-			Assert.AreEqual(0, res.EventNumber);
-			Assert.AreNotEqual(DateTime.MinValue, res.Event.Value.OriginalEvent.Created);
-			Assert.AreNotEqual(0, res.Event.Value.OriginalEvent.CreatedEpoch);
-		}
-
-		[Test, Category("Network")]
-		public async Task retrieve_the_is_json_flag_properly() {
-			var res = await _conn.ReadEventAsync("test-stream", 1, false);
-
-			Assert.AreEqual(EventReadStatus.Success, res.Status);
-			Assert.AreEqual(res.Event.Value.OriginalEvent.EventId, _eventId1);
-			Assert.IsTrue(res.Event.Value.OriginalEvent.IsJson);
-		}
-
-		[Test, Category("Network")]
-		public async Task return_last_event_in_stream_if_event_number_is_minus_one() {
-			var res = await _conn.ReadEventAsync("test-stream", -1, false);
-
-			Assert.AreEqual(EventReadStatus.Success, res.Status);
-			Assert.AreEqual(res.Event.Value.OriginalEvent.EventId, _eventId1);
-			Assert.AreEqual("test-stream", res.Stream);
-			Assert.AreEqual(-1, res.EventNumber);
-			Assert.AreNotEqual(DateTime.MinValue, res.Event.Value.OriginalEvent.Created);
-			Assert.AreNotEqual(0, res.Event.Value.OriginalEvent.CreatedEpoch);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/read_event_stream_backward_should.cs b/src/EventStore.Core.Tests/ClientAPI/read_event_stream_backward_should.cs
deleted file mode 100644
index 73cd3e6fa67..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/read_event_stream_backward_should.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_event_stream_backward_should<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private MiniNode<TLogFormat, TStreamId> _node;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-		virtual protected IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.Create(node.TcpEndPoint);
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task throw_if_count_le_zero() {
-			const string stream = "read_event_stream_backward_should_throw_if_count_le_zero";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				await AssertEx.ThrowsAsync<ArgumentOutOfRangeException>(() =>
-					store.ReadStreamEventsBackwardAsync(stream, 0, 0, resolveLinkTos: false));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task throw_if_start_less_than_minus_one() {
-			const string stream = "read_event_stream_backward_should_throw_if_start_less_than_minus_one";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				await AssertEx.ThrowsAsync<ArgumentOutOfRangeException>(() =>
-					store.ReadStreamEventsBackwardAsync(stream, -2, 100, resolveLinkTos: false));
-			}
-		}
-
-
-		[Test]
-		[Category("Network")]
-		public async Task notify_using_status_code_if_stream_not_found() {
-			const string stream = "read_event_stream_backward_should_notify_using_status_code_if_stream_not_found";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var read = await store.ReadStreamEventsBackwardAsync(stream, StreamPosition.End, 1,
-					resolveLinkTos: false);
-
-				Assert.That(read.Status, Is.EqualTo(SliceReadStatus.StreamNotFound));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task notify_using_status_code_if_stream_was_deleted() {
-			const string stream = "read_event_stream_backward_should_notify_using_status_code_if_stream_was_deleted";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
-
-				var read = await store.ReadStreamEventsBackwardAsync(stream, StreamPosition.End, 1,
-					resolveLinkTos: false);
-
-				Assert.That(read.Status, Is.EqualTo(SliceReadStatus.StreamDeleted));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task return_no_events_when_called_on_empty_stream() {
-			const string stream = "read_event_stream_backward_should_return_single_event_when_called_on_empty_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var read = await store.ReadStreamEventsBackwardAsync(stream, StreamPosition.End, 1,
-					resolveLinkTos: false);
-
-				Assert.That(read.Events.Length, Is.EqualTo(0));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task return_partial_slice_if_no_enough_events_in_stream() {
-			const string stream =
-				"read_event_stream_backward_should_return_partial_slice_if_no_enough_events_in_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var testEvents = Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent((x + 1).ToString()))
-					.ToArray();
-				var write10 = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, testEvents);
-
-				var read = await store.ReadStreamEventsBackwardAsync(stream, 1, 5, resolveLinkTos: false);
-
-				Assert.That(read.Events.Length, Is.EqualTo(2));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task return_events_reversed_compared_to_written() {
-			const string stream = "read_event_stream_backward_should_return_events_reversed_compared_to_written";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var testEvents = Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent((x + 1).ToString()))
-					.ToArray();
-				var write10 = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, testEvents);
-
-				var read = await store.ReadStreamEventsBackwardAsync(stream, StreamPosition.End, testEvents.Length,
-					resolveLinkTos: false);
-
-				Assert.That(EventDataComparer.Equal(testEvents.Reverse().ToArray(),
-					read.Events.Select(x => x.Event).ToArray()));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task be_able_to_read_single_event_from_arbitrary_position() {
-			const string stream =
-				"read_event_stream_backward_should_be_able_to_read_single_event_from_arbitrary_position";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var testEvents = Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent(x.ToString())).ToArray();
-				var write10 = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, testEvents);
-
-				var read = await store.ReadStreamEventsBackwardAsync(stream, 7, 1, resolveLinkTos: false);
-
-				Assert.That(EventDataComparer.Equal(testEvents[7], read.Events.Single().Event));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task be_able_to_read_first_event() {
-			const string stream = "read_event_stream_backward_should_be_able_to_read_first_event";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var testEvents = Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent((x + 1).ToString()))
-					.ToArray();
-				var write10 = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, testEvents);
-
-				var read = await store.ReadStreamEventsBackwardAsync(stream, StreamPosition.Start, 1,
-					resolveLinkTos: false);
-
-				Assert.That(read.Events.Length, Is.EqualTo(1));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task be_able_to_read_last_event() {
-			const string stream = "read_event_stream_backward_should_be_able_to_read_last_event";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var testEvents = Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent(x.ToString())).ToArray();
-				var write10 = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, testEvents);
-
-				var read = await store.ReadStreamEventsBackwardAsync(stream, StreamPosition.End, 1,
-					resolveLinkTos: false);
-
-				Assert.That(EventDataComparer.Equal(testEvents.Last(), read.Events.Single().Event));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task be_able_to_read_slice_from_arbitrary_position() {
-			const string stream = "read_event_stream_backward_should_be_able_to_read_slice_from_arbitrary_position";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var testEvents = Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent(x.ToString())).ToArray();
-				var write10 = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, testEvents);
-
-				var read = await store.ReadStreamEventsBackwardAsync(stream, 3, 2, resolveLinkTos: false);
-
-				Assert.That(EventDataComparer.Equal(testEvents.Skip(2).Take(2).Reverse().ToArray(),
-					read.Events.Select(x => x.Event).ToArray()));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task throw_when_got_int_max_value_as_maxcount() {
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				await AssertEx.ThrowsAsync<ArgumentException>(() =>
-					store.ReadStreamEventsBackwardAsync("foo", StreamPosition.Start, int.MaxValue,
-						resolveLinkTos: false));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/read_event_stream_forward_should.cs b/src/EventStore.Core.Tests/ClientAPI/read_event_stream_forward_should.cs
deleted file mode 100644
index 6836d3d3551..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/read_event_stream_forward_should.cs
+++ /dev/null
@@ -1,194 +0,0 @@
-using System;
-using System.Globalization;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_event_stream_forward_should<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private MiniNode<TLogFormat, TStreamId> _node;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-		virtual protected IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.Create(node.TcpEndPoint);
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task throw_if_count_le_zero() {
-			const string stream = "read_event_stream_forward_should_throw_if_count_le_zero";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				await AssertEx.ThrowsAsync<ArgumentOutOfRangeException>(() =>
-					store.ReadStreamEventsForwardAsync(stream, 0, 0, resolveLinkTos: false));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task throw_if_start_lt_zero() {
-			const string stream = "read_event_stream_forward_should_throw_if_start_lt_zero";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				await AssertEx.ThrowsAsync<ArgumentOutOfRangeException>(() =>
-					store.ReadStreamEventsForwardAsync(stream, -1, 1, resolveLinkTos: false));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task notify_using_status_code_if_stream_not_found() {
-			const string stream = "read_event_stream_forward_should_notify_using_status_code_if_stream_not_found";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var read = await store.ReadStreamEventsForwardAsync(stream, 0, 1, resolveLinkTos: false);
-
-				Assert.That(read.Status, Is.EqualTo(SliceReadStatus.StreamNotFound));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task notify_using_status_code_if_stream_was_deleted() {
-			const string stream = "read_event_stream_forward_should_notify_using_status_code_if_stream_was_deleted";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var delete = await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
-
-				var read = await store.ReadStreamEventsForwardAsync(stream, 0, 1, resolveLinkTos: false);
-
-				Assert.That(read.Status, Is.EqualTo(SliceReadStatus.StreamDeleted));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task return_no_events_when_called_on_empty_stream() {
-			const string stream = "read_event_stream_forward_should_return_single_event_when_called_on_empty_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var read = await store.ReadStreamEventsForwardAsync(stream, 0, 1, resolveLinkTos: false);
-
-				Assert.That(read.Events.Length, Is.EqualTo(0));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task return_empty_slice_when_called_on_non_existing_range() {
-			const string stream =
-				"read_event_stream_forward_should_return_empty_slice_when_called_on_non_existing_range";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var write10 = await store.AppendToStreamAsync(stream,
-					ExpectedVersion.NoStream,
-					Enumerable.Range(0, 10).Select(x =>
-						TestEvent.NewTestEvent((x + 1).ToString(CultureInfo.InvariantCulture))));
-
-				var read = await store.ReadStreamEventsForwardAsync(stream, 11, 5, resolveLinkTos: false);
-
-				Assert.That(read.Events.Length, Is.EqualTo(0));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task return_partial_slice_if_not_enough_events_in_stream() {
-			const string stream = "read_event_stream_forward_should_return_partial_slice_if_no_enough_events_in_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var write10 = await store.AppendToStreamAsync(stream,
-					ExpectedVersion.NoStream,
-					Enumerable.Range(0, 10).Select(x =>
-						TestEvent.NewTestEvent((x + 1).ToString(CultureInfo.InvariantCulture))));
-
-				var read = await store.ReadStreamEventsForwardAsync(stream, 9, 5, resolveLinkTos: false);
-
-				Assert.That(read.Events.Length, Is.EqualTo(1));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task throw_when_got_int_max_value_as_maxcount() {
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				await AssertEx.ThrowsAsync<ArgumentException>(() =>
-					store.ReadStreamEventsForwardAsync("foo", StreamPosition.Start, int.MaxValue,
-						resolveLinkTos: false));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task return_events_in_same_order_as_written() {
-			const string stream = "read_event_stream_forward_should_return_events_in_same_order_as_written";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var testEvents = Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent(x.ToString())).ToArray();
-				var write10 = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, testEvents);
-
-				var read = await store.ReadStreamEventsForwardAsync(stream, StreamPosition.Start, testEvents.Length,
-					resolveLinkTos: false);
-
-				Assert.That(EventDataComparer.Equal(testEvents, read.Events.Select(x => x.Event).ToArray()));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task be_able_to_read_single_event_from_arbitrary_position() {
-			const string stream = "read_event_stream_forward_should_be_able_to_read_from_arbitrary_position";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var testEvents = Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent(x.ToString())).ToArray();
-				var write10 = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, testEvents);
-
-				var read = await store.ReadStreamEventsForwardAsync(stream, 5, 1, resolveLinkTos: false);
-
-				Assert.That(EventDataComparer.Equal(testEvents[5], read.Events.Single().Event));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task be_able_to_read_slice_from_arbitrary_position() {
-			const string stream = "read_event_stream_forward_should_be_able_to_read_slice_from_arbitrary_position";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var testEvents = Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent(x.ToString())).ToArray();
-				var write10 = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, testEvents);
-
-				var read = await store.ReadStreamEventsForwardAsync(stream, 5, 2, resolveLinkTos: false);
-
-				Assert.That(EventDataComparer.Equal(testEvents.Skip(5).Take(2).ToArray(),
-					read.Events.Select(x => x.Event).ToArray()));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/read_event_with_hash_collision.cs b/src/EventStore.Core.Tests/ClientAPI/read_event_with_hash_collision.cs
deleted file mode 100644
index 15f6fb5c8bc..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/read_event_with_hash_collision.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.HashCollisions {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Hash collisions cannot occur in Log V3")]
-	public class read_event_with_hash_collision<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private MiniNode<TLogFormat, TStreamId> _node;
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.To(node, TcpType.Ssl);
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName,
-				inMemDb: false,
-				memTableSize: 20,
-				hashCollisionReadLimit: 1,
-				indexBitnessVersion: EventStore.Core.Index.PTableVersions.IndexV4,
-				hash32bit: true,
-				streamExistenceFilterSize: 0);
-			await _node.Start();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public async Task should_return_not_found() {
-			const string stream1 = "account--696193173";
-			const string stream2 = "LPN-FC002_LPK51001";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				//Write event to stream 1
-				Assert.AreEqual(0,
-					(await store.AppendToStreamAsync(stream1, ExpectedVersion.NoStream,
-						new EventData(Guid.NewGuid(), "TestEvent", true, null, null))).NextExpectedVersion);
-				//Write 100 events to stream 2 which will have the same hash as stream 1.
-				for (int i = 0; i < 100; i++) {
-					Assert.AreEqual(i,
-						(await store.AppendToStreamAsync(stream2, ExpectedVersion.Any,
-							new EventData(Guid.NewGuid(), "TestEvent", true, null, null))).NextExpectedVersion);
-				}
-			}
-
-			var tcpPort = _node.TcpEndPoint.Port;
-			var httpPort = _node.HttpEndPoint.Port;
-			await _node.Shutdown(keepDb: true);
-
-			//Restart the node to ensure the read index stream info cache is empty
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName,
-				tcpPort, httpPort, inMemDb: false,
-				memTableSize: 20,
-				hashCollisionReadLimit: 1,
-				indexBitnessVersion: EventStore.Core.Index.PTableVersions.IndexV4,
-				hash32bit: true,
-				streamExistenceFilterSize: 0);
-			await _node.Start();
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				Assert.AreEqual(EventReadStatus.NoStream, (await store.ReadEventAsync(stream1, 0, true)).Status);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/read_from_persistent_subscription_with_link_resolution_when_stream_name_contains_at_symbol.cs b/src/EventStore.Core.Tests/ClientAPI/read_from_persistent_subscription_with_link_resolution_when_stream_name_contains_at_symbol.cs
deleted file mode 100644
index 78501e756ae..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/read_from_persistent_subscription_with_link_resolution_when_stream_name_contains_at_symbol.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using NUnit.Framework;
-using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("LongRunning"), Category("ClientAPI")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_from_persistent_subscription_with_link_resolution_when_stream_name_contains_at_symbol<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private string _result;
-
-		protected override async Task When() {
-			var task = new TaskCompletionSource<string>();
-
-			var setts = PersistentSubscriptionSettings.Create()
-				.ResolveLinkTos()
-				.StartFromBeginning();
-
-			await _conn.CreatePersistentSubscriptionAsync("link", "Agroup", setts, DefaultData.AdminCredentials);
-			await _conn.ConnectToPersistentSubscriptionAsync(
-				"link",
-				"Agroup",
-				(sub, @event) => {
-					var data = Encoding.Default.GetString(@event.Event.Data);
-					task.TrySetResult(data);
-					return Task.CompletedTask;
-				},
-				(sub, reason, ex) => { }, DefaultData.AdminCredentials);
-
-			await _conn.AppendToStreamAsync("target@me@com", ExpectedVersion.NoStream, TestEvent.NewTestEvent("data", eventName: "AEvent"));
-			await _conn.AppendToStreamAsync("link", ExpectedVersion.NoStream, TestEvent.NewTestEvent("0@target@me@com", eventName: "$>"));
-
-			_result = await Task.WhenAny(task.Task, Task.Delay(TimeSpan.FromSeconds(30)).ContinueWith(_ => "timeout")).Result;
-		}
-
-		[Test]
-		public void the_subscription_resolve_the_link_properly() {
-			Assert.AreEqual(_result, "data");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/read_stream_events_backward_with_hash_collision.cs b/src/EventStore.Core.Tests/ClientAPI/read_stream_events_backward_with_hash_collision.cs
deleted file mode 100644
index aeeda21134d..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/read_stream_events_backward_with_hash_collision.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.HashCollisions {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Hash collisions cannot occur in Log V3")]
-	public class read_stream_events_backward_with_hash_collision<TLogFormat, TStreamId>
-		: SpecificationWithDirectoryPerTestFixture {
-		private MiniNode<TLogFormat, TStreamId> _node;
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.To(node, TcpType.Ssl);
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName,
-				inMemDb: false,
-				memTableSize: 20,
-				hashCollisionReadLimit: 1,
-				indexBitnessVersion: EventStore.Core.Index.PTableVersions.IndexV4,
-				hash32bit: true,
-				streamExistenceFilterSize: 0);
-			await _node.Start();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public async Task should_return_stream_not_found() {
-			const string stream1 = "account--696193173";
-			const string stream2 = "LPN-FC002_LPK51001";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				//Write event to stream 1
-				Assert.AreEqual(0,
-					(await store.AppendToStreamAsync(stream1, ExpectedVersion.NoStream,
-						new EventData(Guid.NewGuid(), "TestEvent", true, null, null))).NextExpectedVersion);
-				//Write 100 events to stream 2 which will have the same hash as stream 1.
-				for (int i = 0; i < 100; i++) {
-					Assert.AreEqual(i,
-						(await store.AppendToStreamAsync(stream2, ExpectedVersion.Any,
-							new EventData(Guid.NewGuid(), "TestEvent", true, null, null))).NextExpectedVersion);
-				}
-			}
-
-			var tcpPort = _node.TcpEndPoint.Port;
-			var httpPort = _node.HttpEndPoint.Port;
-			await _node.Shutdown(keepDb: true);
-
-			//Restart the node to ensure the read index stream info cache is empty
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName,
-				tcpPort, httpPort, inMemDb: false,
-				memTableSize: 20,
-				hashCollisionReadLimit: 1,
-				indexBitnessVersion: EventStore.Core.Index.PTableVersions.IndexV4,
-				hash32bit: true,
-				streamExistenceFilterSize: 0);
-			await _node.Start();
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				Assert.AreEqual(SliceReadStatus.StreamNotFound,
-					(await store.ReadStreamEventsBackwardAsync(stream1, 0, 1, true)).Status);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/read_stream_events_forward_with_hash_collision.cs b/src/EventStore.Core.Tests/ClientAPI/read_stream_events_forward_with_hash_collision.cs
deleted file mode 100644
index 4c56d90d7d6..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/read_stream_events_forward_with_hash_collision.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.HashCollisions {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Hash collisions cannot occur in Log V3")]
-	public class read_stream_events_forward_with_hash_collision<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private MiniNode<TLogFormat, TStreamId> _node;
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.To(node, TcpType.Ssl);
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName,
-				inMemDb: false,
-				memTableSize: 20,
-				hashCollisionReadLimit: 1,
-				indexBitnessVersion: EventStore.Core.Index.PTableVersions.IndexV4,
-				hash32bit: true,
-				streamExistenceFilterSize: 0);
-			await _node.Start();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public async Task should_return_stream_not_found() {
-			const string stream1 = "account--696193173";
-			const string stream2 = "LPN-FC002_LPK51001";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				//Write event to stream 1
-				Assert.AreEqual(0,
-					(await store.AppendToStreamAsync(stream1, ExpectedVersion.NoStream,
-						new EventData(Guid.NewGuid(), "TestEvent", true, null, null))).NextExpectedVersion);
-				//Write 100 events to stream 2 which will have the same hash as stream 1.
-				for (int i = 0; i < 100; i++) {
-					Assert.AreEqual(i,
-						(await store.AppendToStreamAsync(stream2, ExpectedVersion.Any,
-							new EventData(Guid.NewGuid(), "TestEvent", true, null, null))).NextExpectedVersion);
-				}
-			}
-
-			var tcpPort = _node.TcpEndPoint.Port;
-			var httpPort = _node.HttpEndPoint.Port;
-			await _node.Shutdown(keepDb: true);
-
-			//Restart the node to ensure the read index stream info cache is empty
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName,
-				tcpPort, httpPort, inMemDb: false,
-				memTableSize: 20,
-				hashCollisionReadLimit: 1,
-				indexBitnessVersion: EventStore.Core.Index.PTableVersions.IndexV4,
-				hash32bit: true,
-				streamExistenceFilterSize: 0);
-			await _node.Start();
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				Assert.AreEqual(SliceReadStatus.StreamNotFound,
-					(await store.ReadStreamEventsForwardAsync(stream1, 0, 1, true)).Status);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/read_stream_events_with_unresolved_linkto.cs b/src/EventStore.Core.Tests/ClientAPI/read_stream_events_with_unresolved_linkto.cs
deleted file mode 100644
index 232c4fdbfe6..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/read_stream_events_with_unresolved_linkto.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Data;
-using EventStore.Core.Services;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using NUnit.Framework;
-using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
-using StreamMetadata = EventStore.ClientAPI.StreamMetadata;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_stream_events_with_unresolved_linkto<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private EventData[] _testEvents;
-
-		protected override async Task When() {
-			await _conn.SetStreamMetadataAsync(
-					"$all", -1, StreamMetadata.Build().SetReadRole(SystemRoles.All),
-					new UserCredentials(SystemUsers.Admin, SystemUsers.DefaultAdminPassword));
-
-			_testEvents = Enumerable.Range(0, 20).Select(x => TestEvent.NewTestEvent(x.ToString())).ToArray();
-			await _conn.AppendToStreamAsync("stream", ExpectedVersion.NoStream, _testEvents);
-			await _conn.AppendToStreamAsync(
-					"links", ExpectedVersion.NoStream,
-					new EventData(
-						Guid.NewGuid(), EventStore.ClientAPI.Common.SystemEventTypes.LinkTo, false,
-						Encoding.UTF8.GetBytes("0@stream"), null));
-			await _conn.DeleteStreamAsync("stream", ExpectedVersion.Any);
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task ensure_deleted_stream() {
-			var res = await _conn.ReadStreamEventsForwardAsync("stream", 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.StreamNotFound, res.Status);
-			Assert.AreEqual(0, res.Events.Length);
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task returns_unresolved_linkto() {
-			var read = await _conn.ReadStreamEventsForwardAsync("links", 0, 1, true);
-			Assert.AreEqual(1, read.Events.Length);
-			Assert.IsNull(read.Events[0].Event);
-			Assert.IsNotNull(read.Events[0].Link);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/soft_delete.cs b/src/EventStore.Core.Tests/ClientAPI/soft_delete.cs
deleted file mode 100644
index e89afcfddbd..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/soft_delete.cs
+++ /dev/null
@@ -1,370 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Internal;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class soft_delete<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private MiniNode<TLogFormat, TStreamId> _node;
-		private IEventStoreConnection _conn;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-
-			_conn = BuildConnection(_node);
-			await _conn.ConnectAsync();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			_conn.Close();
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return EventStoreConnection.Create(
-				ConnectionSettings.Create().DisableServerCertificateValidation().Build(),
-				node.TcpEndPoint.ToESTcpUri());
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task soft_deleted_stream_returns_no_stream_and_no_events_on_read() {
-			const string stream = "soft_deleted_stream_returns_no_stream_and_no_events_on_read";
-
-			Assert.AreEqual(1,
-				(await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(),
-					TestEvent.NewTestEvent())).NextExpectedVersion);
-			await _conn.DeleteStreamAsync(stream, 1);
-
-			var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.StreamNotFound, res.Status);
-			Assert.AreEqual(0, res.Events.Length);
-			Assert.AreEqual(1, res.LastEventNumber);
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task soft_deleted_stream_allows_recreation_when_expver_any() {
-			const string stream = "soft_deleted_stream_allows_recreation_when_expver_any";
-
-			Assert.AreEqual(1,
-				(await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(),
-					TestEvent.NewTestEvent())).NextExpectedVersion);
-			await _conn.DeleteStreamAsync(stream, 1);
-
-			var events = new[] { TestEvent.NewTestEvent(), TestEvent.NewTestEvent(), TestEvent.NewTestEvent() };
-			Assert.AreEqual(4,
-				(await _conn.AppendToStreamAsync(stream, ExpectedVersion.Any, events)).NextExpectedVersion);
-
-			await Task.Delay(50); //TODO: This is a workaround until github issue #1744 is fixed
-
-			var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(events.Select(x => x.EventId), res.Events.Select(x => x.OriginalEvent.EventId));
-			Assert.AreEqual(new[] { 2, 3, 4 }, res.Events.Select(x => x.OriginalEvent.EventNumber));
-
-			var meta = await _conn.GetStreamMetadataAsync(stream);
-			Assert.AreEqual(2, meta.StreamMetadata.TruncateBefore);
-			Assert.AreEqual(1, meta.MetastreamVersion);
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task soft_deleted_stream_allows_recreation_when_expver_no_stream() {
-			const string stream = "soft_deleted_stream_allows_recreation_when_expver_no_stream";
-
-			Assert.AreEqual(1,
-				(await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(),
-					TestEvent.NewTestEvent())).NextExpectedVersion);
-			await _conn.DeleteStreamAsync(stream, 1);
-
-			var events = new[] { TestEvent.NewTestEvent(), TestEvent.NewTestEvent(), TestEvent.NewTestEvent() };
-			Assert.AreEqual(4,
-				(await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, events)).NextExpectedVersion);
-
-			await Task.Delay(50); //TODO: This is a workaround until github issue #1744 is fixed
-
-			var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(events.Select(x => x.EventId), res.Events.Select(x => x.OriginalEvent.EventId));
-			Assert.AreEqual(new[] { 2, 3, 4 }, res.Events.Select(x => x.OriginalEvent.EventNumber));
-
-			var meta = await _conn.GetStreamMetadataAsync(stream);
-			Assert.AreEqual(2, meta.StreamMetadata.TruncateBefore);
-			Assert.AreEqual(1, meta.MetastreamVersion);
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task soft_deleted_stream_allows_recreation_when_expver_is_exact() {
-			const string stream = "soft_deleted_stream_allows_recreation_when_expver_is_exact";
-
-			Assert.AreEqual(1,
-				(await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(),
-					TestEvent.NewTestEvent())).NextExpectedVersion);
-			await _conn.DeleteStreamAsync(stream, 1);
-
-			var events = new[] { TestEvent.NewTestEvent(), TestEvent.NewTestEvent(), TestEvent.NewTestEvent() };
-			Assert.AreEqual(4, (await _conn.AppendToStreamAsync(stream, 1, events)).NextExpectedVersion);
-
-			await Task.Delay(50); //TODO: This is a workaround until github issue #1744 is fixed
-
-			var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(events.Select(x => x.EventId), res.Events.Select(x => x.OriginalEvent.EventId));
-			Assert.AreEqual(new[] { 2, 3, 4 }, res.Events.Select(x => x.OriginalEvent.EventNumber));
-
-			var meta = await _conn.GetStreamMetadataAsync(stream);
-			Assert.AreEqual(2, meta.StreamMetadata.TruncateBefore);
-			Assert.AreEqual(1, meta.MetastreamVersion);
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task soft_deleted_stream_when_recreated_preserves_metadata_except_truncatebefore() {
-			const string stream = "soft_deleted_stream_when_recreated_preserves_metadata_except_truncatebefore";
-
-			Assert.AreEqual(1,
-				(await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(),
-					TestEvent.NewTestEvent())).NextExpectedVersion);
-
-			Assert.AreEqual(0, (await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetTruncateBefore(long.MaxValue)
-					.SetMaxCount(100)
-					.SetDeleteRole("some-role")
-					.SetCustomProperty("key1", true)
-					.SetCustomProperty("key2", 17)
-					.SetCustomProperty("key3", "some value"))).NextExpectedVersion);
-
-			var events = new[] { TestEvent.NewTestEvent(), TestEvent.NewTestEvent(), TestEvent.NewTestEvent() };
-			Assert.AreEqual(4, (await _conn.AppendToStreamAsync(stream, 1, events)).NextExpectedVersion);
-			await Task.Delay(50); //TODO: This is a workaround until github issue #1744 is fixed
-
-			var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(events.Select(x => x.EventId), res.Events.Select(x => x.OriginalEvent.EventId));
-			Assert.AreEqual(new[] { 2, 3, 4 }, res.Events.Select(x => x.OriginalEvent.EventNumber));
-
-			var meta = await _conn.GetStreamMetadataAsync(stream);
-			Assert.AreEqual(1, meta.MetastreamVersion);
-			Assert.AreEqual(2, meta.StreamMetadata.TruncateBefore);
-			Assert.AreEqual(100, meta.StreamMetadata.MaxCount);
-			Assert.AreEqual("some-role", meta.StreamMetadata.Acl.DeleteRole);
-			Assert.AreEqual(true, meta.StreamMetadata.GetValue<bool>("key1"));
-			Assert.AreEqual(17, meta.StreamMetadata.GetValue<int>("key2"));
-			Assert.AreEqual("some value", meta.StreamMetadata.GetValue<string>("key3"));
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task soft_deleted_stream_can_be_hard_deleted() {
-			const string stream = "soft_deleted_stream_can_be_deleted";
-
-			Assert.AreEqual(1,
-				actual: (await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(),
-					TestEvent.NewTestEvent())).NextExpectedVersion);
-			await _conn.DeleteStreamAsync(stream, 1);
-			await _conn.DeleteStreamAsync(stream, ExpectedVersion.Any, hardDelete: true);
-
-			var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.StreamDeleted, res.Status);
-			var meta = await _conn.GetStreamMetadataAsync(stream);
-			Assert.AreEqual(true, meta.IsStreamDeleted);
-
-			await AssertEx.ThrowsAsync<StreamDeletedException>(() =>
-				_conn.AppendToStreamAsync(stream, ExpectedVersion.Any, TestEvent.NewTestEvent()));
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task soft_deleted_stream_allows_recreation_only_for_first_write() {
-			const string stream = "soft_deleted_stream_allows_recreation_only_for_first_write";
-
-			Assert.AreEqual(1,
-				(await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(),
-					TestEvent.NewTestEvent())).NextExpectedVersion);
-			await _conn.DeleteStreamAsync(stream, 1);
-
-			var events = new[] { TestEvent.NewTestEvent(), TestEvent.NewTestEvent(), TestEvent.NewTestEvent() };
-			Assert.AreEqual(4,
-				(await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, events)).NextExpectedVersion);
-			await Task.Delay(50); //TODO: This is a workaround until github issue #1744 is fixed
-
-			await AssertEx.ThrowsAsync<WrongExpectedVersionException>(() =>
-				_conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent()));
-
-			var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(events.Select(x => x.EventId), res.Events.Select(x => x.OriginalEvent.EventId));
-			Assert.AreEqual(new[] { 2, 3, 4 }, res.Events.Select(x => x.OriginalEvent.EventNumber));
-
-			var meta = await _conn.GetStreamMetadataAsync(stream);
-			Assert.AreEqual(2, meta.StreamMetadata.TruncateBefore);
-			Assert.AreEqual(1, meta.MetastreamVersion);
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task soft_deleted_stream_appends_both_writes_when_expver_any() {
-			const string stream = "soft_deleted_stream_appends_both_concurrent_writes_when_expver_any";
-
-			Assert.AreEqual(1,
-				(await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(),
-					TestEvent.NewTestEvent())).NextExpectedVersion);
-			await _conn.DeleteStreamAsync(stream, 1);
-
-			var events1 = new[] { TestEvent.NewTestEvent(), TestEvent.NewTestEvent(), TestEvent.NewTestEvent() };
-			var events2 = new[] { TestEvent.NewTestEvent(), TestEvent.NewTestEvent() };
-			Assert.AreEqual(4,
-				(await _conn.AppendToStreamAsync(stream, ExpectedVersion.Any, events1)).NextExpectedVersion);
-			await Task.Delay(50); //TODO: This is a workaround until github issue #1744 is fixed
-
-			Assert.AreEqual(6,
-				(await _conn.AppendToStreamAsync(stream, ExpectedVersion.Any, events2)).NextExpectedVersion);
-
-			var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(6, res.LastEventNumber);
-			Assert.AreEqual(5, res.Events.Length);
-			Assert.AreEqual(events1.Concat(events2).Select(x => x.EventId),
-				res.Events.Select(x => x.OriginalEvent.EventId));
-			Assert.AreEqual(new[] { 2, 3, 4, 5, 6 }, res.Events.Select(x => x.OriginalEvent.EventNumber));
-
-			var meta = await _conn.GetStreamMetadataAsync(stream);
-			Assert.AreEqual(2, meta.StreamMetadata.TruncateBefore);
-			Assert.AreEqual(1, meta.MetastreamVersion);
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task
-			setting_json_metadata_on_empty_soft_deleted_stream_recreates_stream_not_overriding_metadataAsync() {
-			const string stream =
-				"setting_json_metadata_on_empty_soft_deleted_stream_recreates_stream_not_overriding_metadata";
-
-			await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.Any, StreamMetadata.Build()
-				.SetTruncateBefore(long.MaxValue));
-
-			Assert.AreEqual(1, (await _conn.SetStreamMetadataAsync(stream, 0,
-				StreamMetadata.Build().SetMaxCount(100)
-					.SetDeleteRole("some-role")
-					.SetCustomProperty("key1", true)
-					.SetCustomProperty("key2", 17)
-					.SetCustomProperty("key3", "some value"))).NextExpectedVersion);
-
-			await Task.Delay(50); //TODO: This is a workaround until github issue #1744 is fixed
-
-			var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.StreamNotFound, res.Status);
-			Assert.AreEqual(-1, res.LastEventNumber);
-			Assert.AreEqual(0, res.Events.Length);
-
-			var meta = await _conn.GetStreamMetadataAsync(stream);
-			Assert.AreEqual(2, meta.MetastreamVersion);
-			Assert.AreEqual(0, meta.StreamMetadata.TruncateBefore);
-			Assert.AreEqual(100, meta.StreamMetadata.MaxCount);
-			Assert.AreEqual("some-role", meta.StreamMetadata.Acl.DeleteRole);
-			Assert.AreEqual(true, meta.StreamMetadata.GetValue<bool>("key1"));
-			Assert.AreEqual(17, meta.StreamMetadata.GetValue<int>("key2"));
-			Assert.AreEqual("some value", meta.StreamMetadata.GetValue<string>("key3"));
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task
-			setting_json_metadata_on_nonempty_soft_deleted_stream_recreates_stream_not_overriding_metadataAsync() {
-			const string stream =
-				"setting_json_metadata_on_nonempty_soft_deleted_stream_recreates_stream_not_overriding_metadata";
-
-			Assert.AreEqual(1,
-				(await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(),
-					TestEvent.NewTestEvent())).NextExpectedVersion);
-			await _conn.DeleteStreamAsync(stream, 1, hardDelete: false);
-
-			Assert.AreEqual(1, (await _conn.SetStreamMetadataAsync(stream, 0,
-				StreamMetadata.Build().SetMaxCount(100)
-					.SetDeleteRole("some-role")
-					.SetCustomProperty("key1", true)
-					.SetCustomProperty("key2", 17)
-					.SetCustomProperty("key3", "some value"))).NextExpectedVersion);
-
-			await Task.Delay(50); //TODO: This is a workaround until github issue #1744 is fixed
-
-			var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(1, res.LastEventNumber);
-			Assert.AreEqual(0, res.Events.Length);
-
-			var meta = await _conn.GetStreamMetadataAsync(stream);
-			Assert.AreEqual(2, meta.MetastreamVersion);
-			Assert.AreEqual(2, meta.StreamMetadata.TruncateBefore);
-			Assert.AreEqual(100, meta.StreamMetadata.MaxCount);
-			Assert.AreEqual("some-role", meta.StreamMetadata.Acl.DeleteRole);
-			Assert.AreEqual(true, meta.StreamMetadata.GetValue<bool>("key1"));
-			Assert.AreEqual(17, meta.StreamMetadata.GetValue<int>("key2"));
-			Assert.AreEqual("some value", meta.StreamMetadata.GetValue<string>("key3"));
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task
-			setting_nonjson_metadata_on_empty_soft_deleted_stream_recreates_stream_keeping_original_metadataAsync() {
-			const string stream =
-				"setting_nonjson_metadata_on_empty_soft_deleted_stream_recreates_stream_overriding_metadata";
-
-			await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.Any, StreamMetadata.Build()
-				.SetTruncateBefore(long.MaxValue));
-
-			Assert.AreEqual(1, (await _conn.SetStreamMetadataAsync(stream, 0, new byte[256])).NextExpectedVersion);
-
-			await Task.Delay(50); //TODO: This is a workaround until github issue #1744 is fixed
-
-			var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.StreamNotFound, res.Status);
-			Assert.AreEqual(-1, res.LastEventNumber);
-			Assert.AreEqual(0, res.Events.Length);
-
-			var meta = await _conn.GetStreamMetadataAsRawBytesAsync(stream);
-			Assert.AreEqual(1, meta.MetastreamVersion);
-			Assert.AreEqual(new byte[256], meta.StreamMetadata);
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task
-			setting_nonjson_metadata_on_nonempty_soft_deleted_stream_recreates_stream_keeping_original_metadataAsync() {
-			const string stream =
-				"setting_nonjson_metadata_on_nonempty_soft_deleted_stream_recreates_stream_overriding_metadata";
-
-			Assert.AreEqual(1,
-				(await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(),
-					TestEvent.NewTestEvent())).NextExpectedVersion);
-			await _conn.DeleteStreamAsync(stream, 1, hardDelete: false);
-
-			Assert.AreEqual(1, (await _conn.SetStreamMetadataAsync(stream, 0, new byte[256])).NextExpectedVersion);
-			await Task.Delay(50); //TODO: This is a workaround until github issue #1744 is fixed
-
-			var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(1, res.LastEventNumber);
-			Assert.AreEqual(2, res.Events.Length);
-			Assert.AreEqual(new[] { 0, 1 }, res.Events.Select(x => x.OriginalEventNumber).ToArray());
-
-			var meta = await _conn.GetStreamMetadataAsRawBytesAsync(stream);
-			Assert.AreEqual(1, meta.MetastreamVersion);
-			Assert.AreEqual(new byte[256], meta.StreamMetadata);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/subscribe_should.cs b/src/EventStore.Core.Tests/ClientAPI/subscribe_should.cs
deleted file mode 100644
index 7d43c5599d7..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/subscribe_should.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class subscribe_should<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private const int Timeout = 10000;
-
-		private MiniNode<TLogFormat, TStreamId> _node;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.Create(node.TcpEndPoint);
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task be_able_to_subscribe_to_non_existing_stream_and_then_catch_new_event() {
-			const string stream =
-				"subscribe_should_be_able_to_subscribe_to_non_existing_stream_and_then_catch_created_event";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var appeared = new CountdownEvent(1);
-				var dropped = new CountdownEvent(1);
-
-				using (await store.SubscribeToStreamAsync(stream, false, (s, x) => {
-					appeared.Signal();
-					return;
-				}, (s, r, e) => dropped.Signal())) {
-					await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
-					Assert.IsTrue(appeared.Wait(Timeout), "Appeared countdown event timed out.");
-				}
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task allow_multiple_subscriptions_to_same_stream() {
-			const string stream = "subscribe_should_allow_multiple_subscriptions_to_same_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var appeared = new CountdownEvent(2);
-				var dropped = new CountdownEvent(2);
-
-				using (await store.SubscribeToStreamAsync(stream, false, (s, x) => {
-					appeared.Signal();
-					return;
-				}, (s, r, e) => dropped.Signal()))
-				using (await store.SubscribeToStreamAsync(stream, false, (s, x) => {
-					appeared.Signal();
-					return;
-				}, (s, r, e) => dropped.Signal())) {
-					await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
-					Assert.IsTrue(appeared.Wait(Timeout), "Appeared countdown event timed out.");
-				}
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task call_dropped_callback_after_unsubscribe_method_call() {
-			const string stream = "subscribe_should_call_dropped_callback_after_unsubscribe_method_call";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var dropped = new CountdownEvent(1);
-				using (var subscription = await store.SubscribeToStreamAsync(stream, false, (s, x) => Task.CompletedTask,
-					(s, r, e) => dropped.Signal())) {
-					subscription.Unsubscribe();
-				}
-
-				Assert.IsTrue(dropped.Wait(Timeout), "Dropped countdown event timed out.");
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task catch_deleted_events_as_well() {
-			const string stream = "subscribe_should_catch_created_and_deleted_events_as_well";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var appeared = new CountdownEvent(1);
-				var dropped = new CountdownEvent(1);
-				using (await store.SubscribeToStreamAsync(stream, false, (s, x) => {
-					appeared.Signal();
-					return;
-				},
-					(s, r, e) => dropped.Signal())) {
-					await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
-					Assert.IsTrue(appeared.Wait(Timeout), "Appeared countdown event timed out.");
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/subscribe_to_all_catching_up_should.cs b/src/EventStore.Core.Tests/ClientAPI/subscribe_to_all_catching_up_should.cs
deleted file mode 100644
index b74e5fce7f1..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/subscribe_to_all_catching_up_should.cs
+++ /dev/null
@@ -1,265 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Services;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class subscribe_to_all_catching_up_should<TLogFormat, TStreamId> : SpecificationWithDirectory {
-		private static readonly ILogger Log = Serilog.Log.ForContext<subscribe_to_all_catching_up_should<TLogFormat, TStreamId>>();
-		private static readonly TimeSpan Timeout = TimeSpan.FromSeconds(60);
-
-		private MiniNode<TLogFormat, TStreamId> _node;
-		private IEventStoreConnection _conn;
-
-		[SetUp]
-		public override async Task SetUp() {
-			await base.SetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-
-			_conn = BuildConnection(_node);
-			await _conn.ConnectAsync();
-			await _conn.SetStreamMetadataAsync("$all", -1,
-				StreamMetadata.Build().SetReadRole(SystemRoles.All),
-				new UserCredentials(SystemUsers.Admin, SystemUsers.DefaultAdminPassword));
-		}
-
-		[TearDown]
-		public override async Task TearDown() {
-			_conn.Close();
-			await _node.Shutdown();
-			await base.TearDown();
-		}
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.Create(node.TcpEndPoint);
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task call_dropped_callback_after_stop_method_call() {
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var dropped = new CountdownEvent(1);
-				var subscription = store.SubscribeToAllFrom(null,
-					CatchUpSubscriptionSettings.Default,
-					(x, y) => Task.CompletedTask,
-					_ => Log.Information("Live processing started."),
-					(x, y, z) => dropped.Signal());
-
-				Assert.IsFalse(dropped.Wait(0));
-				subscription.Stop(Timeout);
-				Assert.IsTrue(dropped.Wait(Timeout));
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task call_dropped_callback_when_an_error_occurs_while_processing_an_event() {
-			const string stream = "call_dropped_callback_when_an_error_occurs_while_processing_an_event";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				await store.AppendToStreamAsync(stream, ExpectedVersion.Any,
-					new EventData(Guid.NewGuid(), "event", false, new byte[3], null));
-
-				var dropped = new CountdownEvent(1);
-				store.SubscribeToAllFrom(null, CatchUpSubscriptionSettings.Default,
-					(x, y) => { throw new Exception("Error"); },
-					_ => Log.Information("Live processing started."),
-					(x, y, z) => dropped.Signal());
-				Assert.IsTrue(dropped.Wait(Timeout));
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task be_able_to_subscribe_to_empty_db() {
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var appeared = new ManualResetEventSlim(false);
-				var dropped = new CountdownEvent(1);
-
-				var subscription = store.SubscribeToAllFrom(null,
-					CatchUpSubscriptionSettings.Default,
-					(_, x) => {
-						if (!SystemStreams.IsSystemStream(x.OriginalEvent.EventStreamId))
-							appeared.Set();
-						return Task.CompletedTask;
-					},
-					_ => Log.Information("Live processing started."),
-					(_, __, ___) => dropped.Signal());
-
-				await Task.Delay(100); // give time for first pull phase
-				await store.SubscribeToAllAsync(false, (s, x) => Task.CompletedTask, (s, r, e) => { });
-				await Task.Delay(100);
-
-				Assert.IsFalse(appeared.Wait(0), "Some event appeared.");
-				Assert.IsFalse(dropped.Wait(0), "Subscription was dropped prematurely.");
-				subscription.Stop(Timeout);
-				Assert.IsTrue(dropped.Wait(Timeout));
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task read_all_existing_events_and_keep_listening_to_new_ones() {
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = new List<ResolvedEvent>();
-				var appeared = new CountdownEvent(20);
-				var dropped = new CountdownEvent(1);
-
-				for (int i = 0; i < 10; ++i) {
-					await store.AppendToStreamAsync("stream-" + i.ToString(), -1,
-						new EventData(Guid.NewGuid(), "et-" + i.ToString(), false, new byte[3], null));
-				}
-
-				var subscription = store.SubscribeToAllFrom(null,
-					CatchUpSubscriptionSettings.Default,
-					(x, y) => {
-						if (!SystemStreams.IsSystemStream(y.OriginalEvent.EventStreamId)) {
-							events.Add(y);
-							appeared.Signal();
-						}
-
-						return Task.CompletedTask;
-					},
-					_ => Log.Information("Live processing started."),
-					(x, y, z) => dropped.Signal());
-				for (int i = 10; i < 20; ++i) {
-					await store.AppendToStreamAsync("stream-" + i.ToString(), -1,
-						new EventData(Guid.NewGuid(), "et-" + i.ToString(), false, new byte[3], null));
-				}
-
-				if (!appeared.Wait(Timeout)) {
-					Assert.IsFalse(dropped.Wait(0), "Subscription was dropped prematurely.");
-					Assert.Fail("Could not wait for all events.");
-				}
-
-				Assert.AreEqual(20, events.Count);
-				for (int i = 0; i < 20; ++i) {
-					Assert.AreEqual("et-" + i.ToString(), events[i].OriginalEvent.EventType);
-				}
-
-				Assert.IsFalse(dropped.Wait(0));
-				subscription.Stop(Timeout);
-				Assert.IsTrue(dropped.Wait(Timeout));
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task filter_events_and_keep_listening_to_new_ones() {
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = new List<ResolvedEvent>();
-				var appeared = new CountdownEvent(10);
-				var dropped = new CountdownEvent(1);
-
-				for (int i = 0; i < 10; ++i) {
-					await store.AppendToStreamAsync("stream-" + i.ToString(), -1,
-						new EventData(Guid.NewGuid(), "et-" + i.ToString(), false, new byte[3], null));
-				}
-
-				var allSlice = await store.ReadAllEventsForwardAsync(Position.Start, 100, false);
-				var lastEvent = allSlice.Events.Last();
-
-				var subscription = store.SubscribeToAllFrom(lastEvent.OriginalPosition,
-					CatchUpSubscriptionSettings.Default,
-					(x, y) => {
-						if (SystemStreams.IsSystemStream(y.Event.EventStreamId)) {
-							return Task.CompletedTask;
-						}
-						events.Add(y);
-						appeared.Signal();
-						return Task.CompletedTask;
-					},
-					_ => Log.Information("Live processing started."),
-					(x, y, z) => {
-						Log.Information("Subscription dropped: {0}, {1}.", y, z);
-						dropped.Signal();
-					});
-
-				for (int i = 10; i < 20; ++i) {
-					await store.AppendToStreamAsync("stream-" + i.ToString(), -1,
-						new EventData(Guid.NewGuid(), "et-" + i.ToString(), false, new byte[3], null));
-				}
-
-				Log.Information("Waiting for events...");
-				if (!appeared.Wait(Timeout)) {
-					Assert.IsFalse(dropped.Wait(0), "Subscription was dropped prematurely.");
-					Assert.Fail("Could not wait for all events.");
-				}
-
-				Log.Information("Events appeared...");
-				Assert.AreEqual(10, events.Count);
-				for (int i = 0; i < 10; ++i) {
-					Assert.AreEqual("et-" + (10 + i).ToString(), events[i].OriginalEvent.EventType);
-				}
-
-				Assert.IsFalse(dropped.Wait(0));
-				subscription.Stop(Timeout);
-				Assert.IsTrue(dropped.Wait(Timeout));
-
-				Assert.AreEqual(events.Last().OriginalPosition, subscription.LastProcessedPosition);
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task filter_events_and_work_if_nothing_was_written_after_subscription() {
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = new List<ResolvedEvent>();
-				var appeared = new CountdownEvent(1);
-				var dropped = new CountdownEvent(1);
-
-				for (int i = 0; i < 10; ++i) {
-					await store.AppendToStreamAsync("stream-" + i.ToString(), -1,
-						new EventData(Guid.NewGuid(), "et-" + i.ToString(), false, new byte[3], null));
-				}
-
-				var allSlice = await store.ReadAllEventsForwardAsync(Position.Start, 100, false);
-				var lastEvent = allSlice.Events[allSlice.Events.Length - 2];
-
-				var subscription = store.SubscribeToAllFrom(lastEvent.OriginalPosition,
-					CatchUpSubscriptionSettings.Default,
-					(x, y) => {
-						events.Add(y);
-						appeared.Signal();
-						return Task.CompletedTask;
-					},
-					_ => Log.Information("Live processing started."),
-					(x, y, z) => {
-						Log.Information("Subscription dropped: {0}, {1}.", y, z);
-						dropped.Signal();
-					});
-
-				Log.Information("Waiting for events...");
-				if (!appeared.Wait(Timeout)) {
-					Assert.IsFalse(dropped.Wait(0), "Subscription was dropped prematurely.");
-					Assert.Fail("Could not wait for all events.");
-				}
-
-				Log.Information("Events appeared...");
-				Assert.AreEqual(1, events.Count);
-				Assert.AreEqual("et-9", events[0].OriginalEvent.EventType);
-
-				Assert.IsFalse(dropped.Wait(0));
-				subscription.Stop(Timeout);
-				Assert.IsTrue(dropped.Wait(Timeout));
-
-				Assert.AreEqual(events.Last().OriginalPosition, subscription.LastProcessedPosition);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/subscribe_to_all_filtered_should.cs b/src/EventStore.Core.Tests/ClientAPI/subscribe_to_all_filtered_should.cs
deleted file mode 100644
index 8289165f75c..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/subscribe_to_all_filtered_should.cs
+++ /dev/null
@@ -1,256 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Services;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning"), NonParallelizable]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class subscribe_to_all_filtered_should<TLogFormat, TStreamId> : SpecificationWithDirectory {
-		private const int Timeout = 10000;
-
-		private MiniNode<TLogFormat, TStreamId> _node;
-		private IEventStoreConnection _conn;
-		private List<EventData> _testEvents;
-		private List<EventData> _fakeSystemEvents;
-
-		[SetUp]
-		public override async Task SetUp() {
-			await base.SetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-
-			_conn = BuildConnection(_node);
-			await _conn.ConnectAsync();
-			await _conn.SetStreamMetadataAsync("$all", -1,
-				StreamMetadata.Build().SetReadRole(SystemRoles.All),
-				new UserCredentials(SystemUsers.Admin, SystemUsers.DefaultAdminPassword));
-
-			_testEvents = Enumerable
-				.Range(0, 5)
-				.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "AEvent"))
-				.ToList();
-
-			_testEvents.AddRange(
-				Enumerable
-					.Range(0, 5)
-					.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "BEvent")).ToList());
-
-			_fakeSystemEvents = Enumerable
-				.Range(0, 5)
-				.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "$systemEvent"))
-				.ToList();
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task only_return_events_with_a_given_stream_prefix() {
-			var filter = Filter.StreamId.Prefix("stream-a");
-			var foundEvents = new List<ResolvedEvent>();
-
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var appeared = new TaskCompletionSource<bool>();
-
-				using (await store.FilteredSubscribeToAllAsync(false, filter, (s, e) => {
-					foundEvents.Add(e);
-					if (foundEvents.Count == 5) {
-						appeared.TrySetResult(true);
-					}
-					return Task.CompletedTask;
-				}, (s, p) => Task.CompletedTask, 100, (_, reason, ex) => appeared.TrySetException(ex))) {
-					await _conn.AppendToStreamAsync("stream-b", ExpectedVersion.NoStream, _testEvents.EvenEvents());
-					await _conn.AppendToStreamAsync("stream-a", ExpectedVersion.NoStream, _testEvents.OddEvents());
-
-					await appeared.Task.WithTimeout(Timeout);
-
-					Assert.True(foundEvents.All(e => e.Event.EventStreamId == "stream-a"));
-				}
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task only_return_events_with_a_given_event_prefix() {
-			var filter = Filter.EventType.Prefix("AE");
-			var foundEvents = new List<ResolvedEvent>();
-
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var appeared = new TaskCompletionSource<bool>();
-
-				using (await store.FilteredSubscribeToAllAsync(false, filter, (s, e) => {
-					if (e.OriginalStreamId == SystemStreams.EventTypesStream)
-						return Task.CompletedTask;
-					
-					foundEvents.Add(e);
-					if (foundEvents.Count == 5) {
-						appeared.TrySetResult(true);
-					}
-					return Task.CompletedTask;
-				}, (s, p) => Task.CompletedTask, 100)) {
-					await _conn.AppendToStreamAsync("stream-b", ExpectedVersion.NoStream, _testEvents.EvenEvents());
-					await _conn.AppendToStreamAsync("stream-a", ExpectedVersion.NoStream, _testEvents.OddEvents());
-
-					await appeared.Task.WithTimeout(Timeout);
-
-					Assert.True(foundEvents.All(e => e.Event.EventType == "AEvent"));
-				}
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task only_return_events_that_satisfy_a_given_stream_regex() {
-			var filter = Filter.StreamId.Regex(new Regex(@"^.*eam-b.*$"));
-			var foundEvents = new List<ResolvedEvent>();
-
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var appeared = new TaskCompletionSource<bool>();
-
-				using (await store.FilteredSubscribeToAllAsync(false, filter, (s, e) => {
-					foundEvents.Add(e);
-					if (foundEvents.Count == 5) {
-						appeared.TrySetResult(true);
-					}
-					return Task.CompletedTask;
-				}, (s, p) => Task.CompletedTask, 100)) {
-					await _conn.AppendToStreamAsync("stream-a", ExpectedVersion.NoStream, _testEvents.EvenEvents());
-					await _conn.AppendToStreamAsync("stream-b", ExpectedVersion.NoStream, _testEvents.OddEvents());
-
-					await appeared.Task.WithTimeout(Timeout);
-
-					Assert.True(foundEvents.All(e => e.Event.EventStreamId == "stream-b"));
-				}
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task only_return_events_that_satisfy_a_given_event_regex() {
-			var filter = Filter.EventType.Regex(new Regex(@"^.*BEv.*$"));
-			var foundEvents = new ConcurrentBag<ResolvedEvent>();
-
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var appeared = new TaskCompletionSource<bool>();
-
-				using (await store.FilteredSubscribeToAllAsync(false, filter, (s, e) => {
-					foundEvents.Add(e);
-					if (foundEvents.Count == 5) {
-						appeared.TrySetResult(true);
-					}
-					return Task.CompletedTask;
-				}, (s, p) => Task.CompletedTask, 100)) {
-					await _conn.AppendToStreamAsync("stream-a", ExpectedVersion.NoStream, _testEvents.EvenEvents());
-					await _conn.AppendToStreamAsync("stream-b", ExpectedVersion.NoStream, _testEvents.OddEvents());
-
-					await appeared.Task.WithTimeout(Timeout);
-
-					Assert.True(foundEvents.All(e => e.Event.EventType == "BEvent"));
-				}
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task only_return_events_that_are_not_system_events() {
-			var filter = Filter.ExcludeSystemEvents;
-			var foundEvents = new List<ResolvedEvent>();
-
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var appeared = new TaskCompletionSource<bool>();
-
-				using (await store.FilteredSubscribeToAllAsync(false, filter, (s, e) => {
-					foundEvents.Add(e);
-					if (foundEvents.Count == 5) {
-						appeared.TrySetResult(true);
-					}
-					return Task.CompletedTask;
-				}, (s, p) => Task.CompletedTask, 100)) {
-					await _conn.AppendToStreamAsync("stream-a", ExpectedVersion.NoStream, _fakeSystemEvents);
-					await _conn.AppendToStreamAsync("stream-b", ExpectedVersion.NoStream, _testEvents.EvenEvents());
-
-					await appeared.Task.WithTimeout(Timeout);
-
-					Assert.True(foundEvents.All(e => !e.Event.EventType.StartsWith("$")));
-				}
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task throw_an_exception_if_interval_is_negative() {
-			var filter = Filter.ExcludeSystemEvents;
-
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				Assert.Throws<ArgumentOutOfRangeException>(() => {
-					store.FilteredSubscribeToAllAsync(
-						false,
-						filter,
-						(s, e) => Task.CompletedTask,
-						(s, p) => Task.CompletedTask, 0).Wait();
-				});
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task calls_checkpoint_reached_according_to_checkpoint_message_count() {
-			var filter = Filter.ExcludeSystemEvents;
-
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var appeared = new TaskCompletionSource<bool>();
-				var eventsSeen = new List<ResolvedEvent>();
-				var checkpointsSeen = 0;
-
-				if (LogFormatHelper<TLogFormat, TStreamId>.IsV3) {
-					// init stream and event type records so they won't affect the test
-					await _conn.AppendToStreamAsync("stream-a", ExpectedVersion.NoStream);
-					await _conn.AppendToStreamAsync("init-event-types", ExpectedVersion.NoStream, _testEvents);
-				}
-
-				using (await store.FilteredSubscribeToAllAsync(false,
-					filter,
-					(s, e) => {
-						eventsSeen.Add(e);
-						return Task.CompletedTask;
-					},
-					(s, p) => {
-						if (++checkpointsSeen == 5) {
-							appeared.TrySetResult(true);
-						}
-						return Task.CompletedTask;
-					},
-					checkpointInterval: 2)) {
-					
-					await _conn.AppendToStreamAsync("stream-a", ExpectedVersion.NoStream, _testEvents);
-
-					await appeared.Task.WithTimeout(Timeout);
-
-					Assert.AreEqual(5 /*checkpoints*/ * 2 /*considered events*/, eventsSeen.Count);
-					Assert.True(eventsSeen.All(x => x.Event.EventStreamId == "stream-a"));
-				}
-			}
-		}
-
-		[TearDown]
-		public override async Task TearDown() {
-			_conn.Close();
-			await _node.Shutdown();
-			await base.TearDown();
-		}
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.Create(node.TcpEndPoint);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/subscribe_to_all_should.cs b/src/EventStore.Core.Tests/ClientAPI/subscribe_to_all_should.cs
deleted file mode 100644
index f93f85f508e..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/subscribe_to_all_should.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Services;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class subscribe_to_all_should<TLogFormat, TStreamId> : SpecificationWithDirectory {
-		private const int Timeout = 10000;
-
-		private MiniNode<TLogFormat, TStreamId> _node;
-
-		[SetUp]
-		public override async Task SetUp() {
-			await base.SetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-
-			using (var connection = BuildConnection(_node)) {
-				await connection.ConnectAsync();
-				await connection.SetStreamMetadataAsync("$all", -1,
-					StreamMetadata.Build().SetReadRole(SystemRoles.All),
-					new UserCredentials(SystemUsers.Admin, SystemUsers.DefaultAdminPassword));
-			}
-		}
-
-		[TearDown]
-		public override async Task TearDown() {
-			await _node.Shutdown();
-			await base.TearDown();
-		}
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.Create(node.TcpEndPoint);
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task allow_multiple_subscriptions() {
-			const string stream = "subscribe_to_all_should_allow_multiple_subscriptions";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var appeared = new CountdownEvent(2);
-				var dropped = new CountdownEvent(2);
-
-				using (await store.SubscribeToAllAsync(false, (s, x) => {
-					appeared.Signal();
-					return;
-				}, (s, r, e) => dropped.Signal()))
-				using (await store.SubscribeToAllAsync(false, (s, x) => {
-					appeared.Signal();
-					return;
-				}, (s, r, e) => dropped.Signal())) {
-					var create =
-						await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
-
-					Assert.IsTrue(appeared.Wait(Timeout), "Appeared countdown event timed out.");
-				}
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task catch_deleted_events_as_well() {
-			const string stream = "subscribe_to_all_should_catch_created_and_deleted_events_as_well";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var appeared = new CountdownEvent(1);
-				var dropped = new CountdownEvent(1);
-
-				using (await store.SubscribeToAllAsync(false, (s, x) => {
-					appeared.Signal();
-					return Task.CompletedTask;
-				},
-					(s, r, e) => dropped.Signal())) {
-					var delete = await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
-
-					Assert.IsTrue(appeared.Wait(Timeout), "Appeared countdown event didn't fire in time.");
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/subscribe_to_stream_catching_up_should.cs b/src/EventStore.Core.Tests/ClientAPI/subscribe_to_stream_catching_up_should.cs
deleted file mode 100644
index 8088f596704..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/subscribe_to_stream_catching_up_should.cs
+++ /dev/null
@@ -1,322 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class subscribe_to_stream_catching_up_should<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private static readonly ILogger Log =
-			Serilog.Log.ForContext<subscribe_to_stream_catching_up_should<TLogFormat, TStreamId>>();
-
-		private static readonly TimeSpan Timeout = TimeSpan.FromSeconds(500);
-
-		private MiniNode<TLogFormat, TStreamId> _node;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-		virtual protected IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.Create(node.TcpEndPoint);
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task be_able_to_subscribe_to_non_existing_stream() {
-			const string stream = "be_able_to_subscribe_to_non_existing_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var appeared = new ManualResetEventSlim(false);
-				var dropped = new CountdownEvent(1);
-
-				var subscription = store.SubscribeToStreamFrom(stream,
-					null,
-					CatchUpSubscriptionSettings.Default,
-					(_, x) => {
-						appeared.Set();
-						return Task.CompletedTask;
-					},
-					_ => Log.Information("Live processing started."),
-					(_, __, ___) => dropped.Signal());
-
-				await Task.Delay(100); // give time for first pull phase
-				await store.SubscribeToStreamAsync(stream, false, (s, x) => Task.CompletedTask, (s, r, e) => { });
-				await Task.Delay(100);
-				Assert.IsFalse(appeared.Wait(0), "Some event appeared.");
-				Assert.IsFalse(dropped.Wait(0), "Subscription was dropped prematurely.");
-				subscription.Stop(Timeout);
-				Assert.IsTrue(dropped.Wait(Timeout));
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task be_able_to_subscribe_to_non_existing_stream_and_then_catch_event() {
-			const string stream = "be_able_to_subscribe_to_non_existing_stream_and_then_catch_event";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var appeared = new CountdownEvent(1);
-				var dropped = new CountdownEvent(1);
-
-				var subscription = store.SubscribeToStreamFrom(stream,
-					null,
-					CatchUpSubscriptionSettings.Default,
-					(_, x) => {
-						appeared.Signal();
-						return Task.CompletedTask;
-					},
-					_ => Log.Information("Live processing started."),
-					(_, __, ___) => dropped.Signal());
-
-				await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
-
-				if (!appeared.Wait(Timeout)) {
-					Assert.IsFalse(dropped.Wait(0), "Subscription was dropped prematurely.");
-					Assert.Fail("Appeared countdown event timed out.");
-				}
-
-				Assert.IsFalse(dropped.Wait(0));
-				subscription.Stop(Timeout);
-				Assert.IsTrue(dropped.Wait(Timeout));
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task allow_multiple_subscriptions_to_same_stream() {
-			const string stream = "allow_multiple_subscriptions_to_same_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var appeared = new CountdownEvent(2);
-				var dropped1 = new ManualResetEventSlim(false);
-				var dropped2 = new ManualResetEventSlim(false);
-
-				var sub1 = store.SubscribeToStreamFrom(stream,
-					null,
-					CatchUpSubscriptionSettings.Default,
-					(_, e) => {
-						appeared.Signal();
-						return Task.CompletedTask;
-					},
-					_ => Log.Information("Live processing started."),
-					(x, y, z) => dropped1.Set());
-				var sub2 = store.SubscribeToStreamFrom(stream,
-					null,
-					CatchUpSubscriptionSettings.Default,
-					(_, e) => {
-						appeared.Signal();
-						return Task.CompletedTask;
-					},
-					_ => Log.Information("Live processing started."),
-					(x, y, z) => dropped2.Set());
-
-				await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
-
-				if (!appeared.Wait(Timeout)) {
-					Assert.IsFalse(dropped1.Wait(0), "Subscription1 was dropped prematurely.");
-					Assert.IsFalse(dropped2.Wait(0), "Subscription2 was dropped prematurely.");
-					Assert.Fail("Could not wait for all events.");
-				}
-
-				Assert.IsFalse(dropped1.Wait(0));
-				sub1.Stop(Timeout);
-				Assert.IsTrue(dropped1.Wait(Timeout));
-
-				Assert.IsFalse(dropped2.Wait(0));
-				sub2.Stop(Timeout);
-				Assert.IsTrue(dropped2.Wait(Timeout));
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task call_dropped_callback_after_stop_method_call() {
-			const string stream = "call_dropped_callback_after_stop_method_call";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var dropped = new CountdownEvent(1);
-				var subscription = store.SubscribeToStreamFrom(stream,
-					null,
-					CatchUpSubscriptionSettings.Default,
-					(x, y) => Task.CompletedTask,
-					_ => Log.Information("Live processing started."),
-					(x, y, z) => dropped.Signal());
-				Assert.IsFalse(dropped.Wait(0));
-				subscription.Stop(Timeout);
-				Assert.IsTrue(dropped.Wait(Timeout));
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task call_dropped_callback_when_an_error_occurs_while_processing_an_event() {
-			const string stream = "call_dropped_callback_when_an_error_occurs_while_processing_an_event";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				await store.AppendToStreamAsync(stream, ExpectedVersion.Any,
-					new EventData(Guid.NewGuid(), "event", false, new byte[3], null));
-
-				var dropped = new CountdownEvent(1);
-				store.SubscribeToStreamFrom(stream, null,
-					CatchUpSubscriptionSettings.Default,
-					(x, y) => { throw new Exception("Error"); },
-					_ => Log.Information("Live processing started."),
-					(x, y, z) => dropped.Signal());
-				Assert.IsTrue(dropped.Wait(Timeout));
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task read_all_existing_events_and_keep_listening_to_new_ones() {
-			const string stream = "read_all_existing_events_and_keep_listening_to_new_ones";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = new List<ResolvedEvent>();
-				var appeared = new CountdownEvent(20); // events
-				var dropped = new CountdownEvent(1);
-
-				for (int i = 0; i < 10; ++i) {
-					await store.AppendToStreamAsync(stream, i - 1,
-						new EventData(Guid.NewGuid(), "et-" + i.ToString(), false, new byte[3], null));
-				}
-
-				var subscription = store.SubscribeToStreamFrom(stream,
-					null,
-					CatchUpSubscriptionSettings.Default,
-					(x, y) => {
-						events.Add(y);
-						appeared.Signal();
-						return Task.CompletedTask;
-					},
-					_ => Log.Information("Live processing started."),
-					(x, y, z) => dropped.Signal());
-				for (int i = 10; i < 20; ++i) {
-					await store.AppendToStreamAsync(stream, i - 1,
-						new EventData(Guid.NewGuid(), "et-" + i.ToString(), false, new byte[3], null));
-				}
-
-				if (!appeared.Wait(Timeout)) {
-					Assert.IsFalse(dropped.Wait(0), "Subscription was dropped prematurely.");
-					Assert.Fail("Could not wait for all events.");
-				}
-
-				Assert.AreEqual(20, events.Count);
-				for (int i = 0; i < 20; ++i) {
-					Assert.AreEqual("et-" + i.ToString(), events[i].OriginalEvent.EventType);
-				}
-
-				Assert.IsFalse(dropped.Wait(0));
-				subscription.Stop(Timeout);
-				Assert.IsTrue(dropped.Wait(Timeout));
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task filter_events_and_keep_listening_to_new_ones() {
-			const string stream = "filter_events_and_keep_listening_to_new_ones";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = new List<ResolvedEvent>();
-				var appeared = new CountdownEvent(20); // skip first 10 events
-				var dropped = new CountdownEvent(1);
-
-				for (int i = 0; i < 20; ++i) {
-					await store.AppendToStreamAsync(stream, i - 1,
-						new EventData(Guid.NewGuid(), "et-" + i.ToString(), false, new byte[3], null));
-				}
-
-				var subscription = store.SubscribeToStreamFrom(stream,
-					9,
-					CatchUpSubscriptionSettings.Default,
-					(x, y) => {
-						events.Add(y);
-						appeared.Signal();
-						return Task.CompletedTask;
-					},
-					_ => Log.Information("Live processing started."),
-					(x, y, z) => dropped.Signal());
-				for (int i = 20; i < 30; ++i) {
-					await store.AppendToStreamAsync(stream, i - 1,
-						new EventData(Guid.NewGuid(), "et-" + i.ToString(), false, new byte[3], null));
-				}
-
-				if (!appeared.Wait(Timeout)) {
-					Assert.IsFalse(dropped.Wait(0), "Subscription was dropped prematurely.");
-					Assert.Fail("Could not wait for all events.");
-				}
-
-				Assert.AreEqual(20, events.Count);
-				for (int i = 0; i < 20; ++i) {
-					Assert.AreEqual("et-" + (i + 10).ToString(), events[i].OriginalEvent.EventType);
-				}
-
-				Assert.IsFalse(dropped.Wait(0));
-				subscription.Stop(Timeout);
-				Assert.IsTrue(dropped.Wait(Timeout));
-
-				Assert.AreEqual(events.Last().OriginalEventNumber, subscription.LastProcessedEventNumber);
-
-				subscription.Stop(TimeSpan.FromSeconds(0));
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task filter_events_and_work_if_nothing_was_written_after_subscription() {
-			const string stream = "filter_events_and_work_if_nothing_was_written_after_subscription";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var events = new List<ResolvedEvent>();
-				var appeared = new CountdownEvent(10);
-				var dropped = new CountdownEvent(1);
-
-				for (int i = 0; i < 20; ++i) {
-					await store.AppendToStreamAsync(stream, i - 1,
-						new EventData(Guid.NewGuid(), "et-" + i.ToString(), false, new byte[3], null));
-				}
-
-				var subscription = store.SubscribeToStreamFrom(stream,
-					9,
-					CatchUpSubscriptionSettings.Default,
-					(x, y) => {
-						events.Add(y);
-						appeared.Signal();
-						return Task.CompletedTask;
-					},
-					_ => Log.Information("Live processing started."),
-					(x, y, z) => dropped.Signal());
-				if (!appeared.Wait(Timeout)) {
-					Assert.IsFalse(dropped.Wait(0), "Subscription was dropped prematurely.");
-					Assert.Fail("Could not wait for all events.");
-				}
-
-				Assert.AreEqual(10, events.Count);
-				for (int i = 0; i < 10; ++i) {
-					Assert.AreEqual("et-" + (i + 10).ToString(), events[i].OriginalEvent.EventType);
-				}
-
-				Assert.IsFalse(dropped.Wait(0));
-				subscription.Stop(Timeout);
-				Assert.IsTrue(dropped.Wait(Timeout));
-
-				Assert.AreEqual(events.Last().OriginalEventNumber, subscription.LastProcessedEventNumber);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/transaction.cs b/src/EventStore.Core.Tests/ClientAPI/transaction.cs
deleted file mode 100644
index 8b48e5fe4f0..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/transaction.cs
+++ /dev/null
@@ -1,241 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.Common.Utils;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using System.Linq;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class Transaction<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private MiniNode<TLogFormat, TStreamId> _node;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.Create(node.TcpEndPoint);
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task should_start_on_non_existing_stream_with_correct_exp_ver_and_create_stream_on_commit() {
-			const string stream =
-				"should_start_on_non_existing_stream_with_correct_exp_ver_and_create_stream_on_commit";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				using (var transaction = await store.StartTransactionAsync(stream, ExpectedVersion.NoStream)) {
-					await transaction.WriteAsync(TestEvent.NewTestEvent());
-					Assert.AreEqual(0, (await transaction.CommitAsync()).NextExpectedVersion);
-				}
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task should_start_on_non_existing_stream_with_exp_ver_any_and_create_stream_on_commit() {
-			const string stream = "should_start_on_non_existing_stream_with_exp_ver_any_and_create_stream_on_commit";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				using (var transaction = await store.StartTransactionAsync(stream, ExpectedVersion.Any)) {
-					await transaction.WriteAsync(TestEvent.NewTestEvent());
-					Assert.AreEqual(0, (await transaction.CommitAsync()).NextExpectedVersion);
-				}
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task should_fail_to_commit_non_existing_stream_with_wrong_exp_ver() {
-			const string stream = "should_fail_to_commit_non_existing_stream_with_wrong_exp_ver";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				using (var transaction = await store.StartTransactionAsync(stream, 1)) {
-					await transaction.WriteAsync(TestEvent.NewTestEvent());
-					await AssertEx.ThrowsAsync<WrongExpectedVersionException>(() => transaction.CommitAsync());
-				}
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task should_do_nothing_if_commits_no_events_to_empty_stream() {
-			const string stream = "should_do_nothing_if_commits_no_events_to_empty_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				using (var transaction = await store.StartTransactionAsync(stream, ExpectedVersion.NoStream)) {
-					Assert.AreEqual(-1, (await transaction.CommitAsync()).NextExpectedVersion);
-				}
-
-				var result = await store.ReadStreamEventsForwardAsync(stream, 0, 1, resolveLinkTos: false);
-				Assert.That(result.Events.Length, Is.EqualTo(0));
-			}
-		}
-
-		[Test, Category("Network")]
-		public async Task should_do_nothing_if_transactionally_writing_no_events_to_empty_stream() {
-			const string stream = "should_do_nothing_if_transactionally_writing_no_events_to_empty_stream";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				using (var transaction = await store.StartTransactionAsync(stream, ExpectedVersion.NoStream)) {
-					await transaction.WriteAsync();
-					Assert.AreEqual(-1, (await transaction.CommitAsync()).NextExpectedVersion);
-				}
-
-				var result = await store.ReadStreamEventsForwardAsync(stream, 0, 1, resolveLinkTos: false);
-				Assert.That(result.Events.Length, Is.EqualTo(0));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task should_validate_expectations_on_commit() {
-			const string stream = "should_validate_expectations_on_commit";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				using (var transaction = await store.StartTransactionAsync(stream, 100500)) {
-					await transaction.WriteAsync(TestEvent.NewTestEvent());
-					await AssertEx.ThrowsAsync<WrongExpectedVersionException>(() => transaction.CommitAsync());
-				}
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task should_commit_when_writing_with_exp_ver_any_even_while_somene_is_writing_in_parallel() {
-			const string stream =
-				"should_commit_when_writing_with_exp_ver_any_even_while_somene_is_writing_in_parallel";
-
-			const int totalTranWrites = 500;
-			const int totalPlainWrites = 500;
-
-			async Task PlainWrites() {
-				using (var store = BuildConnection(_node)) {
-					await store.ConnectAsync();
-					using (var transaction = await store.StartTransactionAsync(stream, ExpectedVersion.Any)) {
-						var writes = new List<Task>();
-						for (int i = 0; i < totalTranWrites; i++) {
-							writes.Add(transaction.WriteAsync(TestEvent.NewTestEvent(i.ToString(), "trans write")));
-						}
-
-						await Task.WhenAll(writes);
-						await transaction.CommitAsync();
-					}
-				}
-			}
-
-			async Task ParallelWrites() {
-				using (var store = BuildConnection(_node)) {
-					await store.ConnectAsync();
-					var writes = new List<Task>();
-					for (int i = 0; i < totalPlainWrites; i++) {
-						writes.Add(store.AppendToStreamAsync(stream,
-							ExpectedVersion.Any, TestEvent.NewTestEvent(i.ToString(), "plain write")));
-					}
-
-					await Task.WhenAll(writes);
-				}
-			}
-
-			await Task.WhenAll(ParallelWrites(), PlainWrites());
-
-			// check all written
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				var slice = await store.ReadStreamEventsForwardAsync(stream, 0, totalTranWrites + totalPlainWrites,
-					false);
-				Assert.That(slice.Events.Length, Is.EqualTo(totalTranWrites + totalPlainWrites));
-
-				Assert.That(slice.Events.Count(ent => Helper.UTF8NoBom.GetString(ent.Event.Metadata) == "trans write"),
-					Is.EqualTo(totalTranWrites));
-				Assert.That(slice.Events.Count(ent => Helper.UTF8NoBom.GetString(ent.Event.Metadata) == "plain write"),
-					Is.EqualTo(totalPlainWrites));
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task should_fail_to_commit_if_started_with_correct_ver_but_committing_with_bad() {
-			const string stream = "should_fail_to_commit_if_started_with_correct_ver_but_committing_with_bad";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				using (var transaction = await store.StartTransactionAsync(stream, ExpectedVersion.NoStream)) {
-					await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent())
-						;
-					await transaction.WriteAsync(TestEvent.NewTestEvent());
-					await AssertEx.ThrowsAsync<WrongExpectedVersionException>(() => transaction.CommitAsync());
-				}
-			}
-		}
-
-		[Test, Category("Network")]
-		public async Task should_not_fail_to_commit_if_started_with_wrong_ver_but_committing_with_correct_ver() {
-			const string stream = "should_not_fail_to_commit_if_started_with_wrong_ver_but_committing_with_correct_ver";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				using (var transaction = await store.StartTransactionAsync(stream, 0)) {
-					await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent())
-						;
-					await transaction.WriteAsync(TestEvent.NewTestEvent());
-					var writeResult = await transaction.CommitAsync();
-					Assert.AreEqual(1, writeResult.NextExpectedVersion);
-				}
-			}
-		}
-
-		[Test]
-		[Category("Network")]
-		public async Task should_fail_to_commit_if_started_with_correct_ver_but_on_commit_stream_was_deleted() {
-			const string stream = "should_fail_to_commit_if_started_with_correct_ver_but_on_commit_stream_was_deleted";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-				using (var transaction = await store.StartTransactionAsync(stream, ExpectedVersion.NoStream)) {
-					await transaction.WriteAsync(TestEvent.NewTestEvent());
-					await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
-					await AssertEx.ThrowsAsync<StreamDeletedException>(() => transaction.CommitAsync());
-				}
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public async Task idempotency_is_correct_for_explicit_transactions_with_expected_version_any() {
-			const string streamId = "idempotency_is_correct_for_explicit_transactions_with_expected_version_any";
-			using (var store = BuildConnection(_node)) {
-				await store.ConnectAsync();
-
-				var e = new EventData(Guid.NewGuid(), "SomethingHappened", true,
-					Helper.UTF8NoBom.GetBytes("{Value:42}"), null);
-
-				var transaction1 = await store.StartTransactionAsync(streamId, ExpectedVersion.Any);
-				await transaction1.WriteAsync(e);
-				Assert.AreEqual(0, (await transaction1.CommitAsync()).NextExpectedVersion);
-
-				var transaction2 = await store.StartTransactionAsync(streamId, ExpectedVersion.Any);
-				await transaction2.WriteAsync(e);
-				var writeResult = await transaction2.CommitAsync();
-				Assert.AreEqual(0, writeResult.NextExpectedVersion);
-
-				var res = await store.ReadStreamEventsForwardAsync(streamId, 0, 100, false);
-				Assert.AreEqual(1, res.Events.Length);
-				Assert.AreEqual(e.EventId, res.Events[0].Event.EventId);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/update_persistent_subscription.cs b/src/EventStore.Core.Tests/ClientAPI/update_persistent_subscription.cs
deleted file mode 100644
index b48da60ec06..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/update_persistent_subscription.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using System;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Exceptions;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class update_existing_persistent_subscription<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = Guid.NewGuid().ToString();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent();
-
-		protected override async Task Given() {
-			await _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any,
-				new EventData(Guid.NewGuid(), "whatever", true, Encoding.UTF8.GetBytes("{'foo' : 2}"), new Byte[0]));
-			await _conn.CreatePersistentSubscriptionAsync(_stream, "existing", _settings, DefaultData.AdminCredentials);
-		}
-
-		protected override Task When() => Task.CompletedTask;
-
-		[Test]
-		public async Task the_completion_succeeds() {
-			await _conn.UpdatePersistentSubscriptionAsync(_stream, "existing", _settings, DefaultData.AdminCredentials);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class update_existing_persistent_subscription_with_subscribers<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = Guid.NewGuid().ToString();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent();
-
-		private readonly AutoResetEvent _dropped = new AutoResetEvent(false);
-		private SubscriptionDropReason _reason;
-		private Exception _exception;
-		private Exception _caught = null;
-
-		protected override async Task Given() {
-			await _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any,
-				new EventData(Guid.NewGuid(), "whatever", true, Encoding.UTF8.GetBytes("{'foo' : 2}"), new Byte[0]));
-			await _conn.CreatePersistentSubscriptionAsync(_stream, "existing", _settings, DefaultData.AdminCredentials)
-;
-			_conn.ConnectToPersistentSubscription(_stream, "existing", (x, y) => Task.CompletedTask,
-				(sub, reason, ex) => {
-					_dropped.Set();
-					_reason = reason;
-					_exception = ex;
-				}, DefaultData.AdminCredentials);
-		}
-
-		protected override async Task When() {
-			try {
-				await _conn.UpdatePersistentSubscriptionAsync(_stream, "existing", _settings, DefaultData.AdminCredentials);
-			} catch (Exception ex) {
-				_caught = ex;
-			}
-		}
-
-		[Test]
-		public void the_completion_succeeds() {
-			Assert.IsNull(_caught);
-		}
-
-		[Test]
-		public void existing_subscriptions_are_dropped() {
-			Assert.IsTrue(_dropped.WaitOne(TimeSpan.FromSeconds(5)));
-			Assert.AreEqual(SubscriptionDropReason.UserInitiated, _reason);
-			Assert.IsNull(_exception);
-		}
-	}
-
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class update_non_existing_persistent_subscription<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = Guid.NewGuid().ToString();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent();
-
-		protected override Task When() => Task.CompletedTask;
-
-		[Test]
-		public async Task the_completion_fails_with_not_found() {
-			await AssertEx.ThrowsAsync<InvalidOperationException>(
-				() => _conn.UpdatePersistentSubscriptionAsync(_stream, "existing", _settings,
-					DefaultData.AdminCredentials));
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class update_existing_persistent_subscription_without_permissions<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private readonly string _stream = Guid.NewGuid().ToString();
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent();
-
-		protected override async Task When() {
-			await _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any,
-				new EventData(Guid.NewGuid(), "whatever", true, Encoding.UTF8.GetBytes("{'foo' : 2}"), new Byte[0]));
-			await _conn.CreatePersistentSubscriptionAsync(_stream, "existing", _settings, DefaultData.AdminCredentials)
-;
-		}
-
-		[Test]
-		public async Task the_completion_fails_with_access_denied() {
-			await AssertEx.ThrowsAsync<AccessDeniedException>(
-				() => _conn.UpdatePersistentSubscriptionAsync(_stream, "existing", _settings, null));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/when_committing_empty_transaction.cs b/src/EventStore.Core.Tests/ClientAPI/when_committing_empty_transaction.cs
deleted file mode 100644
index 1ff5af0773c..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/when_committing_empty_transaction.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class when_committing_empty_transaction<TLogFormat, TStreamId> : SpecificationWithDirectory {
-		private MiniNode<TLogFormat, TStreamId> _node;
-		private IEventStoreConnection _connection;
-		private EventData _firstEvent;
-
-		[SetUp]
-		public override async Task SetUp() {
-			await base.SetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-
-			_firstEvent = TestEvent.NewTestEvent();
-
-			_connection = BuildConnection(_node);
-			await _connection.ConnectAsync();
-
-			Assert.AreEqual(2, (await _connection.AppendToStreamAsync("test-stream",
-				ExpectedVersion.NoStream,
-				_firstEvent,
-				TestEvent.NewTestEvent(),
-				TestEvent.NewTestEvent())).NextExpectedVersion);
-
-			using (var transaction = await _connection.StartTransactionAsync("test-stream", 2)) {
-				Assert.AreEqual(2, (await transaction.CommitAsync()).NextExpectedVersion);
-			}
-		}
-
-		[TearDown]
-		public override async Task TearDown() {
-			_connection.Close();
-			await _node.Shutdown();
-			await base.TearDown();
-		}
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.Create(node.TcpEndPoint);
-		}
-
-		[Test]
-		public async Task following_append_with_correct_expected_version_are_commited_correctly() {
-			Assert.AreEqual(4,
-				(await _connection.AppendToStreamAsync("test-stream", 2, TestEvent.NewTestEvent(),
-					TestEvent.NewTestEvent())
-				).NextExpectedVersion);
-
-			var res = await _connection.ReadStreamEventsForwardAsync("test-stream", 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(5, res.Events.Length);
-			for (int i = 0; i < 5; ++i) {
-				Assert.AreEqual(i, res.Events[i].OriginalEventNumber);
-			}
-		}
-
-		[Test]
-		public async Task following_append_with_expected_version_any_are_commited_correctly() {
-			Assert.AreEqual(4,
-				(await _connection.AppendToStreamAsync("test-stream", ExpectedVersion.Any, TestEvent.NewTestEvent(),
-					TestEvent.NewTestEvent())).NextExpectedVersion);
-
-			var res = await _connection.ReadStreamEventsForwardAsync("test-stream", 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(5, res.Events.Length);
-			for (int i = 0; i < 5; ++i) {
-				Assert.AreEqual(i, res.Events[i].OriginalEventNumber);
-			}
-		}
-
-		[Test]
-		public async Task committing_first_event_with_expected_version_no_stream_is_idempotent() {
-			Assert.AreEqual(0,
-				(await _connection.AppendToStreamAsync("test-stream", ExpectedVersion.NoStream, _firstEvent))
-				.NextExpectedVersion);
-
-			var res = await _connection.ReadStreamEventsForwardAsync("test-stream", 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(3, res.Events.Length);
-			for (int i = 0; i < 3; ++i) {
-				Assert.AreEqual(i, res.Events[i].OriginalEventNumber);
-			}
-		}
-
-		[Test]
-		public async Task trying_to_append_new_events_with_expected_version_no_stream_fails() {
-			await AssertEx.ThrowsAsync<WrongExpectedVersionException>(() =>
-				_connection.AppendToStreamAsync("test-stream", ExpectedVersion.NoStream, TestEvent.NewTestEvent()));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/when_having_max_count_set_for_stream.cs b/src/EventStore.Core.Tests/ClientAPI/when_having_max_count_set_for_stream.cs
deleted file mode 100644
index 9fe532dfe34..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/when_having_max_count_set_for_stream.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_having_max_count_set_for_stream<TLogFormat, TStreamId> : SpecificationWithDirectory {
-		private const string Stream = "max-count-test-stream";
-
-		private MiniNode<TLogFormat, TStreamId> _node;
-		private IEventStoreConnection _connection;
-		private EventData[] _testEvents;
-
-		[SetUp]
-		public override async Task SetUp() {
-			await base.SetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-
-			_connection = TestConnection.Create(_node.TcpEndPoint);
-			await _connection.ConnectAsync();
-
-			await _connection.SetStreamMetadataAsync(Stream, ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetMaxCount(3));
-
-			_testEvents = Enumerable.Range(0, 5).Select(x => TestEvent.NewTestEvent(data: x.ToString())).ToArray();
-			await _connection.AppendToStreamAsync(Stream, ExpectedVersion.NoStream, _testEvents);
-		}
-
-		[TearDown]
-		public override async Task TearDown() {
-			_connection.Close();
-			await _node.Shutdown();
-			await base.TearDown();
-		}
-
-		[Test]
-		public async Task read_stream_forward_respects_max_count() {
-			var res = await _connection.ReadStreamEventsForwardAsync(Stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
-				res.Events.Select(x => x.Event.EventId).ToArray());
-		}
-
-		[Test]
-		public async Task read_stream_backward_respects_max_count() {
-			var res = await _connection.ReadStreamEventsBackwardAsync(Stream, -1, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
-				res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
-		}
-
-		[Test]
-		public async Task after_setting_less_strict_max_count_read_stream_forward_reads_more_events() {
-			var res = await _connection.ReadStreamEventsForwardAsync(Stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
-				res.Events.Select(x => x.Event.EventId).ToArray());
-
-			await _connection.SetStreamMetadataAsync(Stream, 0, StreamMetadata.Build().SetMaxCount(4));
-
-			res = await _connection.ReadStreamEventsForwardAsync(Stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(4, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(1).Select(x => x.EventId).ToArray(),
-				res.Events.Select(x => x.Event.EventId).ToArray());
-		}
-
-		[Test]
-		public async Task after_setting_more_strict_max_count_read_stream_forward_reads_less_events() {
-			var res = await _connection.ReadStreamEventsForwardAsync(Stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
-				res.Events.Select(x => x.Event.EventId).ToArray());
-
-			await _connection.SetStreamMetadataAsync(Stream, 0, StreamMetadata.Build().SetMaxCount(2));
-
-			res = await _connection.ReadStreamEventsForwardAsync(Stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(2, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(3).Select(x => x.EventId).ToArray(),
-				res.Events.Select(x => x.Event.EventId).ToArray());
-		}
-
-		[Test]
-		public async Task after_setting_less_strict_max_count_read_stream_backward_reads_more_events() {
-			var res = await _connection.ReadStreamEventsBackwardAsync(Stream, -1, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
-				res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
-
-			await _connection.SetStreamMetadataAsync(Stream, 0, StreamMetadata.Build().SetMaxCount(4));
-
-			res = await _connection.ReadStreamEventsBackwardAsync(Stream, -1, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(4, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(1).Select(x => x.EventId).ToArray(),
-				res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
-		}
-
-		[Test]
-		public async Task after_setting_more_strict_max_count_read_stream_backward_reads_less_events() {
-			var res = await _connection.ReadStreamEventsBackwardAsync(Stream, -1, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
-				res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
-
-			await _connection.SetStreamMetadataAsync(Stream, 0, StreamMetadata.Build().SetMaxCount(2));
-
-			res = await _connection.ReadStreamEventsBackwardAsync(Stream, -1, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(2, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(3).Select(x => x.EventId).ToArray(),
-				res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/when_having_truncatebefore_set_for_stream.cs b/src/EventStore.Core.Tests/ClientAPI/when_having_truncatebefore_set_for_stream.cs
deleted file mode 100644
index 55180a750ef..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/when_having_truncatebefore_set_for_stream.cs
+++ /dev/null
@@ -1,363 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_having_truncatebefore_set_for_stream<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private EventData[] _testEvents;
-
-		protected override Task When() {
-			_testEvents = Enumerable.Range(0, 5).Select(x => TestEvent.NewTestEvent(data: x.ToString())).ToArray();
-			return Task.CompletedTask;
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task read_event_respects_truncatebefore() {
-			const string stream = "read_event_respects_truncatebefore";
-			await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
-
-			await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetTruncateBefore(2));
-
-			var res = await _conn.ReadEventAsync(stream, 1, false);
-			Assert.AreEqual(EventReadStatus.NotFound, res.Status);
-
-			res = await _conn.ReadEventAsync(stream, 2, false);
-			Assert.AreEqual(EventReadStatus.Success, res.Status);
-			Assert.AreEqual(_testEvents[2].EventId, res.Event.Value.OriginalEvent.EventId);
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task read_stream_forward_respects_truncatebefore() {
-			const string stream = "read_stream_forward_respects_truncatebefore";
-			await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
-
-			await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetTruncateBefore(2));
-
-			var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
-				res.Events.Select(x => x.Event.EventId).ToArray());
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task read_stream_backward_respects_truncatebefore() {
-			const string stream = "read_stream_backward_respects_truncatebefore";
-			await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
-
-			await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetTruncateBefore(2));
-
-			var res = await _conn.ReadStreamEventsBackwardAsync(stream, -1, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
-				res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task after_setting_less_strict_truncatebefore_read_event_reads_more_events() {
-			const string stream = "after_setting_less_strict_truncatebefore_read_event_reads_more_events";
-
-			await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
-
-			await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetTruncateBefore(2));
-
-			var res = await _conn.ReadEventAsync(stream, 1, false);
-			Assert.AreEqual(EventReadStatus.NotFound, res.Status);
-
-			res = await _conn.ReadEventAsync(stream, 2, false);
-			Assert.AreEqual(EventReadStatus.Success, res.Status);
-			Assert.AreEqual(_testEvents[2].EventId, res.Event.Value.OriginalEvent.EventId);
-
-			await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(1));
-
-			res = await _conn.ReadEventAsync(stream, 0, false);
-			Assert.AreEqual(EventReadStatus.NotFound, res.Status);
-
-			res = await _conn.ReadEventAsync(stream, 1, false);
-			Assert.AreEqual(EventReadStatus.Success, res.Status);
-			Assert.AreEqual(_testEvents[1].EventId, res.Event.Value.OriginalEvent.EventId);
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task after_setting_more_strict_truncatebefore_read_event_reads_less_events() {
-			const string stream = "after_setting_more_strict_truncatebefore_read_event_reads_less_events";
-
-			await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
-
-			await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetTruncateBefore(2));
-
-			var res = await _conn.ReadEventAsync(stream, 1, false);
-			Assert.AreEqual(EventReadStatus.NotFound, res.Status);
-
-			res = await _conn.ReadEventAsync(stream, 2, false);
-			Assert.AreEqual(EventReadStatus.Success, res.Status);
-			Assert.AreEqual(_testEvents[2].EventId, res.Event.Value.OriginalEvent.EventId);
-
-			await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(3));
-
-			res = await _conn.ReadEventAsync(stream, 2, false);
-			Assert.AreEqual(EventReadStatus.NotFound, res.Status);
-
-			res = await _conn.ReadEventAsync(stream, 3, false);
-			Assert.AreEqual(EventReadStatus.Success, res.Status);
-			Assert.AreEqual(_testEvents[3].EventId, res.Event.Value.OriginalEvent.EventId);
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task less_strict_max_count_doesnt_change_anything_for_event_read() {
-			const string stream = "less_strict_max_count_doesnt_change_anything_for_event_read";
-
-			await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
-
-			await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetTruncateBefore(2));
-
-			var res = await _conn.ReadEventAsync(stream, 1, false);
-			Assert.AreEqual(EventReadStatus.NotFound, res.Status);
-
-			res = await _conn.ReadEventAsync(stream, 2, false);
-			Assert.AreEqual(EventReadStatus.Success, res.Status);
-			Assert.AreEqual(_testEvents[2].EventId, res.Event.Value.OriginalEvent.EventId);
-
-			await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(2).SetMaxCount(4));
-
-			res = await _conn.ReadEventAsync(stream, 1, false);
-			Assert.AreEqual(EventReadStatus.NotFound, res.Status);
-
-			res = await _conn.ReadEventAsync(stream, 2, false);
-			Assert.AreEqual(EventReadStatus.Success, res.Status);
-			Assert.AreEqual(_testEvents[2].EventId, res.Event.Value.OriginalEvent.EventId);
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task more_strict_max_count_gives_less_events_for_event_read() {
-			const string stream = "more_strict_max_count_gives_less_events_for_event_read";
-
-			await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
-
-			await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetTruncateBefore(2));
-
-			var res = await _conn.ReadEventAsync(stream, 1, false);
-			Assert.AreEqual(EventReadStatus.NotFound, res.Status);
-
-			res = await _conn.ReadEventAsync(stream, 2, false);
-			Assert.AreEqual(EventReadStatus.Success, res.Status);
-			Assert.AreEqual(_testEvents[2].EventId, res.Event.Value.OriginalEvent.EventId);
-
-			await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(2).SetMaxCount(2));
-
-			res = await _conn.ReadEventAsync(stream, 2, false);
-			Assert.AreEqual(EventReadStatus.NotFound, res.Status);
-
-			res = await _conn.ReadEventAsync(stream, 3, false);
-			Assert.AreEqual(EventReadStatus.Success, res.Status);
-			Assert.AreEqual(_testEvents[3].EventId, res.Event.Value.OriginalEvent.EventId);
-		}
-
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task after_setting_less_strict_truncatebefore_read_stream_forward_reads_more_events() {
-			const string stream = "after_setting_less_strict_truncatebefore_read_stream_forward_reads_more_events";
-
-			await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
-
-			await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetTruncateBefore(2));
-
-			var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
-				res.Events.Select(x => x.Event.EventId).ToArray());
-
-			await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(1));
-
-			res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(4, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(1).Select(x => x.EventId).ToArray(),
-				res.Events.Select(x => x.Event.EventId).ToArray());
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task after_setting_more_strict_truncatebefore_read_stream_forward_reads_less_events() {
-			const string stream = "after_setting_more_strict_truncatebefore_read_stream_forward_reads_less_events";
-
-			await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
-
-			await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetTruncateBefore(2));
-
-			var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
-				res.Events.Select(x => x.Event.EventId).ToArray());
-
-			await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(3));
-
-			res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(2, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(3).Select(x => x.EventId).ToArray(),
-				res.Events.Select(x => x.Event.EventId).ToArray());
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task less_strict_max_count_doesnt_change_anything_for_stream_forward_read() {
-			const string stream = "less_strict_max_count_doesnt_change_anything_for_stream_forward_read";
-
-			await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
-
-			await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetTruncateBefore(2));
-
-			var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
-				res.Events.Select(x => x.Event.EventId).ToArray());
-
-			await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(2).SetMaxCount(4));
-
-			res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
-				res.Events.Select(x => x.Event.EventId).ToArray());
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task more_strict_max_count_gives_less_events_for_stream_forward_read() {
-			const string stream = "more_strict_max_count_gives_less_events_for_stream_forward_read";
-
-			await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
-
-			await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetTruncateBefore(2));
-
-			var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
-				res.Events.Select(x => x.Event.EventId).ToArray());
-
-			await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(2).SetMaxCount(2));
-
-			res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(2, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(3).Select(x => x.EventId).ToArray(),
-				res.Events.Select(x => x.Event.EventId).ToArray());
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task after_setting_less_strict_truncatebefore_read_stream_backward_reads_more_events() {
-			const string stream = "after_setting_less_strict_truncatebefore_read_stream_backward_reads_more_events";
-
-			await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
-
-			await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetTruncateBefore(2));
-
-			var res = await _conn.ReadStreamEventsBackwardAsync(stream, -1, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
-				res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
-
-			await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(1));
-
-			res = await _conn.ReadStreamEventsBackwardAsync(stream, -1, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(4, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(1).Select(x => x.EventId).ToArray(),
-				res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task after_setting_more_strict_truncatebefore_read_stream_backward_reads_less_events() {
-			const string stream = "after_setting_more_strict_truncatebefore_read_stream_backward_reads_less_events";
-
-			await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
-
-			await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetTruncateBefore(2));
-
-			var res = await _conn.ReadStreamEventsBackwardAsync(stream, -1, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
-				res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
-
-			await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(3));
-
-			res = await _conn.ReadStreamEventsBackwardAsync(stream, -1, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(2, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(3).Select(x => x.EventId).ToArray(),
-				res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task less_strict_max_count_doesnt_change_anything_for_stream_backward_read() {
-			const string stream = "less_strict_max_count_doesnt_change_anything_for_stream_backward_read";
-
-			await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
-
-			await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetTruncateBefore(2));
-
-			var res = await _conn.ReadStreamEventsBackwardAsync(stream, -1, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
-				res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
-
-			await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(2).SetMaxCount(4));
-
-			res = await _conn.ReadStreamEventsBackwardAsync(stream, -1, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
-				res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task more_strict_max_count_gives_less_events_for_stream_backward_read() {
-			const string stream = "more_strict_max_count_gives_less_events_for_stream_backward_read";
-
-			await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
-
-			await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
-				StreamMetadata.Build().SetTruncateBefore(2));
-
-			var res = await _conn.ReadStreamEventsBackwardAsync(stream, -1, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(3, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
-				res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
-
-			await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(2).SetMaxCount(2));
-
-			res = await _conn.ReadStreamEventsBackwardAsync(stream, -1, 100, false);
-			Assert.AreEqual(SliceReadStatus.Success, res.Status);
-			Assert.AreEqual(2, res.Events.Length);
-			Assert.AreEqual(_testEvents.Skip(3).Select(x => x.EventId).ToArray(),
-				res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/when_working_with_metadata.cs b/src/EventStore.Core.Tests/ClientAPI/when_working_with_metadata.cs
deleted file mode 100644
index 32ab332ae53..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/when_working_with_metadata.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
-using StreamMetadata = EventStore.ClientAPI.StreamMetadata;
-using Newtonsoft.Json.Linq;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_working_with_metadata<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private MiniNode<TLogFormat, TStreamId> _node;
-		private IEventStoreConnection _connection;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-
-			_connection = BuildConnection(_node);
-			await _connection.ConnectAsync();
-		}
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.Create(node.TcpEndPoint);
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			_connection.Close();
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public async Task when_getting_metadata_for_an_existing_stream_and_no_metadata_exists() {
-			const string stream = "when_getting_metadata_for_an_existing_stream_and_no_metadata_exists";
-
-			await _connection.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
-
-			var meta = await _connection.GetStreamMetadataAsRawBytesAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(false, meta.IsStreamDeleted);
-			Assert.AreEqual(-1, meta.MetastreamVersion);
-			Assert.AreEqual(Helper.UTF8NoBom.GetBytes(""), meta.StreamMetadata);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/when_working_with_stream_metadata_as_byte_array.cs b/src/EventStore.Core.Tests/ClientAPI/when_working_with_stream_metadata_as_byte_array.cs
deleted file mode 100644
index f3f85a3450b..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/when_working_with_stream_metadata_as_byte_array.cs
+++ /dev/null
@@ -1,170 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_working_with_stream_metadata_as_byte_array<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private MiniNode<TLogFormat, TStreamId> _node;
-		private IEventStoreConnection _connection;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-
-			_connection = BuildConnection(_node);
-			await _connection.ConnectAsync();
-		}
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.Create(node.TcpEndPoint);
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			_connection.Close();
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public async Task setting_empty_metadata_works() {
-			const string stream = "setting_empty_metadata_works";
-
-			await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, (byte[])null);
-
-			var meta = await _connection.GetStreamMetadataAsRawBytesAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(false, meta.IsStreamDeleted);
-			Assert.AreEqual(0, meta.MetastreamVersion);
-			Assert.AreEqual(new byte[0], meta.StreamMetadata);
-		}
-
-		[Test]
-		public async Task setting_metadata_few_times_returns_last_metadata() {
-			const string stream = "setting_metadata_few_times_returns_last_metadata";
-
-			var metadataBytes = Guid.NewGuid().ToByteArray();
-			await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, metadataBytes);
-			var meta = await _connection.GetStreamMetadataAsRawBytesAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(false, meta.IsStreamDeleted);
-			Assert.AreEqual(0, meta.MetastreamVersion);
-			Assert.AreEqual(metadataBytes, meta.StreamMetadata);
-
-			metadataBytes = Guid.NewGuid().ToByteArray();
-			await _connection.SetStreamMetadataAsync(stream, 0, metadataBytes);
-			meta = await _connection.GetStreamMetadataAsRawBytesAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(false, meta.IsStreamDeleted);
-			Assert.AreEqual(1, meta.MetastreamVersion);
-			Assert.AreEqual(metadataBytes, meta.StreamMetadata);
-		}
-
-		[Test]
-		public async Task trying_to_set_metadata_with_wrong_expected_version_fails() {
-			const string stream = "trying_to_set_metadata_with_wrong_expected_version_fails";
-			await AssertEx.ThrowsAsync<WrongExpectedVersionException>(() => _connection.SetStreamMetadataAsync(stream, 5, new byte[100]));
-		}
-
-		[Test]
-		public async Task setting_metadata_with_expected_version_any_works() {
-			const string stream = "setting_metadata_with_expected_version_any_works";
-
-			var metadataBytes = Guid.NewGuid().ToByteArray();
-			await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.Any, metadataBytes);
-			var meta = await _connection.GetStreamMetadataAsRawBytesAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(false, meta.IsStreamDeleted);
-			Assert.AreEqual(0, meta.MetastreamVersion);
-			Assert.AreEqual(metadataBytes, meta.StreamMetadata);
-
-			metadataBytes = Guid.NewGuid().ToByteArray();
-			await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.Any, metadataBytes);
-			meta = await _connection.GetStreamMetadataAsRawBytesAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(false, meta.IsStreamDeleted);
-			Assert.AreEqual(1, meta.MetastreamVersion);
-			Assert.AreEqual(metadataBytes, meta.StreamMetadata);
-		}
-
-		[Test]
-		public async Task setting_metadata_for_not_existing_stream_works() {
-			const string stream = "setting_metadata_for_not_existing_stream_works";
-			var metadataBytes = Guid.NewGuid().ToByteArray();
-			await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, metadataBytes);
-
-			var meta = await _connection.GetStreamMetadataAsRawBytesAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(false, meta.IsStreamDeleted);
-			Assert.AreEqual(0, meta.MetastreamVersion);
-			Assert.AreEqual(metadataBytes, meta.StreamMetadata);
-		}
-
-		[Test]
-		public async Task setting_metadata_for_existing_stream_works() {
-			const string stream = "setting_metadata_for_existing_stream_works";
-
-			await _connection.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(),
-				TestEvent.NewTestEvent());
-
-			var metadataBytes = Guid.NewGuid().ToByteArray();
-			await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, metadataBytes);
-
-			var meta = await _connection.GetStreamMetadataAsRawBytesAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(false, meta.IsStreamDeleted);
-			Assert.AreEqual(0, meta.MetastreamVersion);
-			Assert.AreEqual(metadataBytes, meta.StreamMetadata);
-		}
-
-		[Test]
-		public async Task setting_metadata_for_deleted_stream_throws_stream_deleted_exception() {
-			const string stream = "setting_metadata_for_deleted_stream_throws_stream_deleted_exception";
-
-			await _connection.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
-
-			var metadataBytes = Guid.NewGuid().ToByteArray();
-			await AssertEx.ThrowsAsync<StreamDeletedException>(
-				() => _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, metadataBytes));
-		}
-
-		[Test]
-		public async Task getting_metadata_for_nonexisting_stream_returns_empty_byte_array() {
-			const string stream = "getting_metadata_for_nonexisting_stream_returns_empty_byte_array";
-
-			var meta = await _connection.GetStreamMetadataAsRawBytesAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(false, meta.IsStreamDeleted);
-			Assert.AreEqual(-1, meta.MetastreamVersion);
-			Assert.AreEqual(new byte[0], meta.StreamMetadata);
-		}
-
-		[Test]
-		public async Task getting_metadata_for_deleted_stream_returns_empty_byte_array_and_signals_stream_deletion() {
-			const string stream =
-				"getting_metadata_for_deleted_stream_returns_empty_byte_array_and_signals_stream_deletion";
-
-			var metadataBytes = Guid.NewGuid().ToByteArray();
-			await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, metadataBytes);
-
-			await _connection.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
-
-			var meta = await _connection.GetStreamMetadataAsRawBytesAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(true, meta.IsStreamDeleted);
-			Assert.AreEqual(EventNumber.DeletedStream, meta.MetastreamVersion);
-			Assert.AreEqual(new byte[0], meta.StreamMetadata);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientAPI/when_working_with_stream_metadata_as_structured_info.cs b/src/EventStore.Core.Tests/ClientAPI/when_working_with_stream_metadata_as_structured_info.cs
deleted file mode 100644
index d34807f02e6..00000000000
--- a/src/EventStore.Core.Tests/ClientAPI/when_working_with_stream_metadata_as_structured_info.cs
+++ /dev/null
@@ -1,368 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
-using StreamMetadata = EventStore.ClientAPI.StreamMetadata;
-
-namespace EventStore.Core.Tests.ClientAPI {
-	[Category("ClientAPI"), Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_working_with_stream_metadata_as_structured_info<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private MiniNode<TLogFormat, TStreamId> _node;
-		private IEventStoreConnection _connection;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			await _node.Start();
-
-			_connection = BuildConnection(_node);
-			await _connection.ConnectAsync();
-		}
-
-		protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
-			return TestConnection.Create(node.TcpEndPoint);
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			_connection.Close();
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public async Task setting_empty_metadata_works() {
-			const string stream = "setting_empty_metadata_works";
-
-			await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, StreamMetadata.Create());
-
-			var meta = await _connection.GetStreamMetadataAsRawBytesAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(false, meta.IsStreamDeleted);
-			Assert.AreEqual(0, meta.MetastreamVersion);
-			Assert.AreEqual(Helper.UTF8NoBom.GetBytes("{}"), meta.StreamMetadata);
-		}
-
-		[Test]
-		public async Task setting_metadata_few_times_returns_last_metadata_info() {
-			const string stream = "setting_metadata_few_times_returns_last_metadata_info";
-			var metadata =
-				StreamMetadata.Create(17, TimeSpan.FromSeconds(0xDEADBEEF), 10, TimeSpan.FromSeconds(0xABACABA));
-			await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, metadata);
-
-			var meta = await _connection.GetStreamMetadataAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(false, meta.IsStreamDeleted);
-			Assert.AreEqual(0, meta.MetastreamVersion);
-			Assert.AreEqual(metadata.MaxCount, meta.StreamMetadata.MaxCount);
-			Assert.AreEqual(metadata.MaxAge, meta.StreamMetadata.MaxAge);
-			Assert.AreEqual(metadata.TruncateBefore, meta.StreamMetadata.TruncateBefore);
-			Assert.AreEqual(metadata.CacheControl, meta.StreamMetadata.CacheControl);
-
-			metadata = StreamMetadata.Create(37, TimeSpan.FromSeconds(0xBEEFDEAD), 24,
-				TimeSpan.FromSeconds(0xDABACABAD));
-			await _connection.SetStreamMetadataAsync(stream, 0, metadata);
-
-			meta = await _connection.GetStreamMetadataAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(false, meta.IsStreamDeleted);
-			Assert.AreEqual(1, meta.MetastreamVersion);
-			Assert.AreEqual(metadata.MaxCount, meta.StreamMetadata.MaxCount);
-			Assert.AreEqual(metadata.MaxAge, meta.StreamMetadata.MaxAge);
-			Assert.AreEqual(metadata.TruncateBefore, meta.StreamMetadata.TruncateBefore);
-			Assert.AreEqual(metadata.CacheControl, meta.StreamMetadata.CacheControl);
-		}
-
-		[Test]
-		public async Task trying_to_set_metadata_with_wrong_expected_version_fails() {
-			const string stream = "trying_to_set_metadata_with_wrong_expected_version_fails";
-			await AssertEx.ThrowsAsync<WrongExpectedVersionException>(() =>
-				_connection.SetStreamMetadataAsync(stream, 2, StreamMetadata.Create()));
-		}
-
-		[Test]
-		public async Task setting_metadata_with_expected_version_any_works() {
-			const string stream = "setting_metadata_with_expected_version_any_works";
-			var metadata =
-				StreamMetadata.Create(17, TimeSpan.FromSeconds(0xDEADBEEF), 10, TimeSpan.FromSeconds(0xABACABA));
-			await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.Any, metadata);
-
-			var meta = await _connection.GetStreamMetadataAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(false, meta.IsStreamDeleted);
-			Assert.AreEqual(0, meta.MetastreamVersion);
-			Assert.AreEqual(metadata.MaxCount, meta.StreamMetadata.MaxCount);
-			Assert.AreEqual(metadata.MaxAge, meta.StreamMetadata.MaxAge);
-			Assert.AreEqual(metadata.TruncateBefore, meta.StreamMetadata.TruncateBefore);
-			Assert.AreEqual(metadata.CacheControl, meta.StreamMetadata.CacheControl);
-
-			metadata = StreamMetadata.Create(37, TimeSpan.FromSeconds(0xBEEFDEAD), 24,
-				TimeSpan.FromSeconds(0xDABACABAD));
-			await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.Any, metadata);
-
-			meta = await _connection.GetStreamMetadataAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(false, meta.IsStreamDeleted);
-			Assert.AreEqual(1, meta.MetastreamVersion);
-			Assert.AreEqual(metadata.MaxCount, meta.StreamMetadata.MaxCount);
-			Assert.AreEqual(metadata.MaxAge, meta.StreamMetadata.MaxAge);
-			Assert.AreEqual(metadata.TruncateBefore, meta.StreamMetadata.TruncateBefore);
-			Assert.AreEqual(metadata.CacheControl, meta.StreamMetadata.CacheControl);
-		}
-
-		[Test]
-		public async Task setting_metadata_for_not_existing_stream_works() {
-			const string stream = "setting_metadata_for_not_existing_stream_works";
-			var metadata =
-				StreamMetadata.Create(17, TimeSpan.FromSeconds(0xDEADBEEF), 10, TimeSpan.FromSeconds(0xABACABA));
-			await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, metadata);
-
-			var meta = await _connection.GetStreamMetadataAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(false, meta.IsStreamDeleted);
-			Assert.AreEqual(0, meta.MetastreamVersion);
-			Assert.AreEqual(metadata.MaxCount, meta.StreamMetadata.MaxCount);
-			Assert.AreEqual(metadata.MaxAge, meta.StreamMetadata.MaxAge);
-			Assert.AreEqual(metadata.TruncateBefore, meta.StreamMetadata.TruncateBefore);
-			Assert.AreEqual(metadata.CacheControl, meta.StreamMetadata.CacheControl);
-		}
-
-		[Test]
-		public async Task setting_metadata_for_existing_stream_works() {
-			const string stream = "setting_metadata_for_existing_stream_works";
-
-			await _connection.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
-
-			var metadata =
-				StreamMetadata.Create(17, TimeSpan.FromSeconds(0xDEADBEEF), 10, TimeSpan.FromSeconds(0xABACABA));
-			await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, metadata);
-
-			var meta = await _connection.GetStreamMetadataAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(false, meta.IsStreamDeleted);
-			Assert.AreEqual(0, meta.MetastreamVersion);
-			Assert.AreEqual(metadata.MaxCount, meta.StreamMetadata.MaxCount);
-			Assert.AreEqual(metadata.MaxAge, meta.StreamMetadata.MaxAge);
-			Assert.AreEqual(metadata.TruncateBefore, meta.StreamMetadata.TruncateBefore);
-			Assert.AreEqual(metadata.CacheControl, meta.StreamMetadata.CacheControl);
-		}
-
-		[Test]
-		public async Task getting_metadata_for_nonexisting_stream_returns_empty_stream_metadata() {
-			const string stream = "getting_metadata_for_nonexisting_stream_returns_empty_stream_metadata";
-
-			var meta = await _connection.GetStreamMetadataAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(false, meta.IsStreamDeleted);
-			Assert.AreEqual(-1, meta.MetastreamVersion);
-			Assert.AreEqual(null, meta.StreamMetadata.MaxCount);
-			Assert.AreEqual(null, meta.StreamMetadata.MaxAge);
-			Assert.AreEqual(null, meta.StreamMetadata.TruncateBefore);
-			Assert.AreEqual(null, meta.StreamMetadata.CacheControl);
-		}
-
-		[Test, Ignore("You can't get stream metadata for metastream through ClientAPI")]
-		public async Task getting_metadata_for_metastream_returns_correct_metadata() {
-			const string stream = "$$getting_metadata_for_metastream_returns_correct_metadata";
-
-			var meta = await _connection.GetStreamMetadataAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(false, meta.IsStreamDeleted);
-			Assert.AreEqual(-1, meta.MetastreamVersion);
-			Assert.AreEqual(1, meta.StreamMetadata.MaxCount);
-			Assert.AreEqual(null, meta.StreamMetadata.MaxAge);
-			Assert.AreEqual(null, meta.StreamMetadata.TruncateBefore);
-			Assert.AreEqual(null, meta.StreamMetadata.CacheControl);
-		}
-
-		[Test]
-		public async Task getting_metadata_for_deleted_stream_returns_empty_stream_metadata_and_signals_stream_deletion() {
-			const string stream =
-				"getting_metadata_for_deleted_stream_returns_empty_stream_metadata_and_signals_stream_deletion";
-
-			var metadata =
-				StreamMetadata.Create(17, TimeSpan.FromSeconds(0xDEADBEEF), 10, TimeSpan.FromSeconds(0xABACABA));
-			await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, metadata);
-
-			await _connection.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
-
-			var meta = await _connection.GetStreamMetadataAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(true, meta.IsStreamDeleted);
-			Assert.AreEqual(EventNumber.DeletedStream, meta.MetastreamVersion);
-			Assert.AreEqual(null, meta.StreamMetadata.MaxCount);
-			Assert.AreEqual(null, meta.StreamMetadata.MaxAge);
-			Assert.AreEqual(null, meta.StreamMetadata.TruncateBefore);
-			Assert.AreEqual(null, meta.StreamMetadata.CacheControl);
-			Assert.AreEqual(null, meta.StreamMetadata.Acl);
-		}
-
-		[Test]
-		public async Task setting_correctly_formatted_metadata_as_raw_allows_to_read_it_as_structured_metadata() {
-			const string stream =
-				"setting_correctly_formatted_metadata_as_raw_allows_to_read_it_as_structured_metadata";
-
-			var rawMeta = Helper.UTF8NoBom.GetBytes(@"{
-                                                           ""$maxCount"": 17,
-                                                           ""$maxAge"": 123321,
-                                                           ""$tb"": 23,
-                                                           ""$cacheControl"": 7654321,
-                                                           ""$acl"": {
-                                                               ""$r"": ""readRole"",
-                                                               ""$w"": ""writeRole"",
-                                                               ""$d"": ""deleteRole"",
-                                                               ""$mw"": ""metaWriteRole""
-                                                           },
-                                                           ""customString"": ""a string"",
-                                                           ""customInt"": -179,
-                                                           ""customDouble"": 1.7,
-                                                           ""customLong"": 123123123123123123,
-                                                           ""customBool"": true,
-                                                           ""customNullable"": null,
-                                                           ""customRawJson"": {
-                                                               ""subProperty"": 999
-                                                           }
-                                                      }");
-
-			await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, rawMeta);
-
-			var meta = await _connection.GetStreamMetadataAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(false, meta.IsStreamDeleted);
-			Assert.AreEqual(0, meta.MetastreamVersion);
-			Assert.AreEqual(17, meta.StreamMetadata.MaxCount);
-			Assert.AreEqual(TimeSpan.FromSeconds(123321), meta.StreamMetadata.MaxAge);
-			Assert.AreEqual(23, meta.StreamMetadata.TruncateBefore);
-			Assert.AreEqual(TimeSpan.FromSeconds(7654321), meta.StreamMetadata.CacheControl);
-
-			Assert.NotNull(meta.StreamMetadata.Acl);
-			Assert.AreEqual("readRole", meta.StreamMetadata.Acl.ReadRole);
-			Assert.AreEqual("writeRole", meta.StreamMetadata.Acl.WriteRole);
-			Assert.AreEqual("deleteRole", meta.StreamMetadata.Acl.DeleteRole);
-			// meta role removed to allow reading
-			//            Assert.AreEqual("metaReadRole", meta.StreamMetadata.Acl.MetaReadRole);
-			Assert.AreEqual("metaWriteRole", meta.StreamMetadata.Acl.MetaWriteRole);
-
-			Assert.AreEqual("a string", meta.StreamMetadata.GetValue<string>("customString"));
-			Assert.AreEqual(-179, meta.StreamMetadata.GetValue<int>("customInt"));
-			Assert.AreEqual(1.7, meta.StreamMetadata.GetValue<double>("customDouble"));
-			Assert.AreEqual(123123123123123123L, meta.StreamMetadata.GetValue<long>("customLong"));
-			Assert.AreEqual(true, meta.StreamMetadata.GetValue<bool>("customBool"));
-			Assert.AreEqual(null, meta.StreamMetadata.GetValue<int?>("customNullable"));
-			Assert.AreEqual(@"{""subProperty"":999}", meta.StreamMetadata.GetValueAsRawJsonString("customRawJson"));
-		}
-
-		[Test]
-		public async Task setting_structured_metadata_with_custom_properties_returns_them_untouched() {
-			const string stream = "setting_structured_metadata_with_custom_properties_returns_them_untouched";
-
-			StreamMetadata metadata = StreamMetadata.Build()
-				.SetMaxCount(17)
-				.SetMaxAge(TimeSpan.FromSeconds(123321))
-				.SetTruncateBefore(23)
-				.SetCacheControl(TimeSpan.FromSeconds(7654321))
-				.SetReadRole("readRole")
-				.SetWriteRole("writeRole")
-				.SetDeleteRole("deleteRole")
-				//.SetMetadataReadRole("metaReadRole")
-				.SetMetadataWriteRole("metaWriteRole")
-				.SetCustomProperty("customString", "a string")
-				.SetCustomProperty("customInt", -179)
-				.SetCustomProperty("customDouble", 1.7)
-				.SetCustomProperty("customLong", 123123123123123123L)
-				.SetCustomProperty("customBool", true)
-				.SetCustomProperty("customNullable", new int?())
-				.SetCustomPropertyWithValueAsRawJsonString("customRawJson",
-					@"{
-                                                                                                       ""subProperty"": 999
-                                                                                                 }");
-
-			await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, metadata);
-
-			var meta = await _connection.GetStreamMetadataAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(false, meta.IsStreamDeleted);
-			Assert.AreEqual(0, meta.MetastreamVersion);
-			Assert.AreEqual(17, meta.StreamMetadata.MaxCount);
-			Assert.AreEqual(TimeSpan.FromSeconds(123321), meta.StreamMetadata.MaxAge);
-			Assert.AreEqual(23, meta.StreamMetadata.TruncateBefore);
-			Assert.AreEqual(TimeSpan.FromSeconds(7654321), meta.StreamMetadata.CacheControl);
-
-			Assert.NotNull(meta.StreamMetadata.Acl);
-			Assert.AreEqual("readRole", meta.StreamMetadata.Acl.ReadRole);
-			Assert.AreEqual("writeRole", meta.StreamMetadata.Acl.WriteRole);
-			Assert.AreEqual("deleteRole", meta.StreamMetadata.Acl.DeleteRole);
-			//Assert.AreEqual("metaReadRole", meta.StreamMetadata.Acl.MetaReadRole);
-			Assert.AreEqual("metaWriteRole", meta.StreamMetadata.Acl.MetaWriteRole);
-
-			Assert.AreEqual("a string", meta.StreamMetadata.GetValue<string>("customString"));
-			Assert.AreEqual(-179, meta.StreamMetadata.GetValue<int>("customInt"));
-			Assert.AreEqual(1.7, meta.StreamMetadata.GetValue<double>("customDouble"));
-			Assert.AreEqual(123123123123123123L, meta.StreamMetadata.GetValue<long>("customLong"));
-			Assert.AreEqual(true, meta.StreamMetadata.GetValue<bool>("customBool"));
-			Assert.AreEqual(null, meta.StreamMetadata.GetValue<int?>("customNullable"));
-			Assert.AreEqual(@"{""subProperty"":999}", meta.StreamMetadata.GetValueAsRawJsonString("customRawJson"));
-		}
-
-		[Test]
-		public async Task setting_structured_metadata_with_multiple_roles_can_be_read_back() {
-			const string stream = "setting_structured_metadata_with_multiple_roles_can_be_read_back";
-
-			StreamMetadata metadata = StreamMetadata.Build()
-				.SetReadRoles(new[] { "r1", "r2", "r3" })
-				.SetWriteRoles(new[] { "w1", "w2" })
-				.SetDeleteRoles(new[] { "d1", "d2", "d3", "d4" })
-				.SetMetadataWriteRoles(new[] { "mw1", "mw2" });
-
-			await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, metadata);
-
-			var meta = await _connection.GetStreamMetadataAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(false, meta.IsStreamDeleted);
-			Assert.AreEqual(0, meta.MetastreamVersion);
-
-			Assert.NotNull(meta.StreamMetadata.Acl);
-			Assert.AreEqual(new[] { "r1", "r2", "r3" }, meta.StreamMetadata.Acl.ReadRoles);
-			Assert.AreEqual(new[] { "w1", "w2" }, meta.StreamMetadata.Acl.WriteRoles);
-			Assert.AreEqual(new[] { "d1", "d2", "d3", "d4" }, meta.StreamMetadata.Acl.DeleteRoles);
-			Assert.AreEqual(new[] { "mw1", "mw2" }, meta.StreamMetadata.Acl.MetaWriteRoles);
-		}
-
-		[Test]
-		public async Task setting_correct_metadata_with_multiple_roles_in_acl_allows_to_read_it_as_structured_metadata() {
-			const string stream =
-				"setting_correct_metadata_with_multiple_roles_in_acl_allows_to_read_it_as_structured_metadata";
-
-			var rawMeta = Helper.UTF8NoBom.GetBytes(@"{
-                                                           ""$acl"": {
-                                                               ""$r"": [""r1"", ""r2"", ""r3""],
-                                                               ""$w"": [""w1"", ""w2""],
-                                                               ""$d"": [""d1"", ""d2"", ""d3"", ""d4""],
-                                                               ""$mw"": [""mw1"", ""mw2""],
-                                                           }
-                                                      }");
-
-			await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, rawMeta);
-
-			var meta = await _connection.GetStreamMetadataAsync(stream);
-			Assert.AreEqual(stream, meta.Stream);
-			Assert.AreEqual(false, meta.IsStreamDeleted);
-			Assert.AreEqual(0, meta.MetastreamVersion);
-
-			Assert.NotNull(meta.StreamMetadata.Acl);
-			Assert.AreEqual(new[] { "r1", "r2", "r3" }, meta.StreamMetadata.Acl.ReadRoles);
-			Assert.AreEqual(new[] { "w1", "w2" }, meta.StreamMetadata.Acl.WriteRoles);
-			Assert.AreEqual(new[] { "d1", "d2", "d3", "d4" }, meta.StreamMetadata.Acl.DeleteRoles);
-			Assert.AreEqual(new[] { "mw1", "mw2" }, meta.StreamMetadata.Acl.MetaWriteRoles);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientOperations/specification_with_bare_vnode.cs b/src/EventStore.Core.Tests/ClientOperations/specification_with_bare_vnode.cs
deleted file mode 100644
index b232b2f8b15..00000000000
--- a/src/EventStore.Core.Tests/ClientOperations/specification_with_bare_vnode.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading.Tasks;
-using EventStore.Core.Authentication;
-using EventStore.Core.Authentication.InternalAuthentication;
-using EventStore.Core.Authorization;
-using EventStore.Core.Bus;
-using EventStore.Core.Certificates;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Services.Transport.Tcp;
-using Microsoft.AspNetCore.Builder;
-
-namespace EventStore.Core.Tests.ClientOperations {
-	public abstract class specification_with_bare_vnode<TLogFormat, TStreamId> : IPublisher, ISubscriber, IDisposable {
-		private ClusterVNode _node;
-		private readonly List<IDisposable> _disposables = new List<IDisposable>();
-		public void CreateTestNode() {
-			var logFormatFactory = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory;
-			var options = new ClusterVNodeOptions()
-				.ReduceMemoryUsageForTests()
-				.RunInMemory()
-				.Secure(new X509Certificate2Collection(ssl_connections.GetRootCertificate()),
-					ssl_connections.GetServerCertificate());
-			_node = new ClusterVNode<TStreamId>(options, logFormatFactory,
-				new AuthenticationProviderFactory(
-					c => new InternalAuthenticationProviderFactory(c, options.DefaultUser)),
-				new AuthorizationProviderFactory(c => new InternalAuthorizationProviderFactory([
-				new LegacyPolicySelectorFactory(
-					options.Application.AllowAnonymousEndpointAccess,
-					options.Application.AllowAnonymousStreamAccess,
-					options.Application.OverrideAnonymousEndpointAccessForGossip).Create(c.MainQueue, default)])),
-				certificateProvider: new OptionsCertificateProvider());
-
-			var builder = WebApplication.CreateBuilder();
-			_node.Startup.ConfigureServices(builder.Services);
-			var app = builder.Build();
-			_node.Startup.Configure(app);
-
-			_node.StartAsync(true).Wait();
-		}
-		public void Publish(Message message) {
-			_node.MainQueue.Handle(message);
-		}
-
-		public void Subscribe<T>(IAsyncHandle<T> handler) where T : Message {
-			_node.MainBus.Subscribe(handler);
-		}
-
-		public void Unsubscribe<T>(IAsyncHandle<T> handler) where T : Message {
-			_node.MainBus.Unsubscribe(handler);
-		}
-		public Task<T> WaitForNext<T>() where T : Message {
-			var handler = new TaskHandler<T>(_node.MainBus);
-			_disposables.Add(handler);
-			return handler.Message;
-		}
-		private sealed class TaskHandler<T> : IHandle<T>, IDisposable where T : Message {
-			private readonly ISubscriber _source;
-			private readonly TaskCompletionSource<T> _tcs = new TaskCompletionSource<T>();
-			public Task<T> Message => _tcs.Task;
-			public void Handle(T message) {
-				_tcs.SetResult(message);
-				Dispose();
-			}
-			public TaskHandler(ISubscriber source) {
-				_source = source;
-				_source.Subscribe(this);
-			}
-			private bool _disposed;
-			public void Dispose() {
-				if (_disposed) { return; }
-				_disposed = true;
-				try {
-					_source.Unsubscribe(this);
-				} catch (Exception) { /* ignore*/}
-			}
-		}
-		#region IDisposable Support
-		private bool _disposed;
-		protected virtual void Dispose(bool disposing) {
-			if (!_disposed) {
-				if (disposing) {
-					_disposables?.ForEach(d => d?.Dispose());
-					_disposables?.Clear();
-					_node?.StopAsync().Wait();
-				}
-				_disposed = true;
-			}
-		}
-
-		public void Dispose() {
-			Dispose(true);
-		}
-		#endregion
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientOperations/specification_with_request_manager_integration.cs b/src/EventStore.Core.Tests/ClientOperations/specification_with_request_manager_integration.cs
deleted file mode 100644
index 6bb67e4f7eb..00000000000
--- a/src/EventStore.Core.Tests/ClientOperations/specification_with_request_manager_integration.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Services.Replication;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientOperations {
-	public abstract class specification_with_request_manager_integration<TLogFormat, TStreamId> : specification_with_bare_vnode<TLogFormat, TStreamId> {
-		
-		protected long CompletionMessageCount;
-		protected StorageMessage.RequestCompleted CompletionMessage;
-
-		protected Guid InternalCorrId = Guid.NewGuid();
-		protected Guid ClientCorrId = Guid.NewGuid();
-		protected FakeEnvelope Envelope;
-
-		protected abstract IEnumerable<Message> WithInitialMessages();
-		protected abstract Message When();
-
-		[SetUp]
-		public void Setup() {
-			CreateTestNode();
-			Envelope = new FakeEnvelope();
-
-			foreach (var m in WithInitialMessages()) {
-				Publish(m);
-			}
-			Subscribe(new AdHocHandler<StorageMessage.RequestCompleted>(msg => {
-				Interlocked.Exchange(ref CompletionMessage, msg);
-				Interlocked.Increment(ref CompletionMessageCount);
-			}));
-			Publish(When());
-		}
-
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientOperations/when_committing_a_transaction_with_data.cs b/src/EventStore.Core.Tests/ClientOperations/when_committing_a_transaction_with_data.cs
deleted file mode 100644
index d7f5d7d9994..00000000000
--- a/src/EventStore.Core.Tests/ClientOperations/when_committing_a_transaction_with_data.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using EventStore.ClientAPI.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientOperations {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class when_committing_a_transaction_with_data<TLogFormat, TStreamId> : specification_with_request_manager_integration<TLogFormat, TStreamId> {
-		readonly string _streamId = $"new_test_stream_{Guid.NewGuid()}";
-		readonly Event _evt = new Event(Guid.NewGuid(), "SomethingHappened", true, Helper.UTF8NoBom.GetBytes("{Value:42}"), null);
-		long _transactionId;
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			var requestComplete = WaitForNext<StorageMessage.RequestCompleted>();
-			yield return new ClientMessage.TransactionStart(Guid.NewGuid(), Guid.NewGuid(), Envelope, true, _streamId, ExpectedVersion.Any, null);
-			requestComplete.Wait();
-			AssertEx.IsOrBecomesTrue(() => Envelope.Replies.Count > 0);
-			var resp = Envelope.Replies[0] as ClientMessage.TransactionStartCompleted;
-			_transactionId = resp?.TransactionId ?? 0;
-			requestComplete = WaitForNext<StorageMessage.RequestCompleted>();
-			yield return new ClientMessage.TransactionWrite(Guid.NewGuid(), Guid.NewGuid(), Envelope, true, _transactionId, new[] { _evt }, null);
-			requestComplete.Wait();
-			Interlocked.Exchange(ref CompletionMessage, null);
-			Interlocked.Exchange(ref CompletionMessageCount, 0);
-			Envelope.Replies.Clear();
-		}
-
-		protected override Message When() {
-			return new ClientMessage.TransactionCommit(InternalCorrId, ClientCorrId, Envelope, true, _transactionId, null);
-		}
-
-		[Test]
-		public void successful_request_message_is_published() {
-			AssertEx.IsOrBecomesTrue(()=> Interlocked.Read(ref CompletionMessageCount) == 1);
-			Assert.AreEqual(InternalCorrId, CompletionMessage.CorrelationId);
-			Assert.True(CompletionMessage.Success);
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to_with_success() {
-			AssertEx.IsOrBecomesTrue(() => Envelope.Replies.Count > 0);
-			Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.TransactionCommitCompleted>(
-				x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.Success), () => $"Does not contain single successful TransactionCommitCompleted with id {ClientCorrId}");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientOperations/when_starting_a_transaction_expecting_no_stream.cs b/src/EventStore.Core.Tests/ClientOperations/when_starting_a_transaction_expecting_no_stream.cs
deleted file mode 100644
index 78dac2c93c0..00000000000
--- a/src/EventStore.Core.Tests/ClientOperations/when_starting_a_transaction_expecting_no_stream.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientOperations {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class when_starting_a_transaction_expecting_no_stream<TLogFormat, TStreamId> : specification_with_request_manager_integration<TLogFormat, TStreamId> {
-		readonly string _streamId = $"new_test_stream_{Guid.NewGuid()}";
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield break;
-		}
-
-		protected override Message When() {
-			return new ClientMessage.TransactionStart(InternalCorrId, ClientCorrId, Envelope, true, _streamId, ExpectedVersion.NoStream, null);
-		}
-
-		[Test]
-		public void successful_request_message_is_published() {
-			AssertEx.IsOrBecomesTrue(()=> Interlocked.Read(ref CompletionMessageCount) == 1);
-			Assert.AreEqual(InternalCorrId, CompletionMessage.CorrelationId);
-			Assert.True(CompletionMessage.Success);
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to_with_success() {
-			AssertEx.IsOrBecomesTrue(() => Envelope.Replies.Count > 0);
-			Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.TransactionStartCompleted>(
-				x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.Success));
-		}
-
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClientOperations/when_starting_a_transaction_expecting_version_any.cs b/src/EventStore.Core.Tests/ClientOperations/when_starting_a_transaction_expecting_version_any.cs
deleted file mode 100644
index 64596a976bf..00000000000
--- a/src/EventStore.Core.Tests/ClientOperations/when_starting_a_transaction_expecting_version_any.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.ClientOperations {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class when_starting_a_transaction_expecting_version_any<TLogFormat, TStreamId> : specification_with_request_manager_integration<TLogFormat, TStreamId> {
-		readonly string _streamId = $"new_test_stream_{Guid.NewGuid()}";
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield break;
-		}
-
-		protected override Message When() {
-			return new ClientMessage.TransactionStart(InternalCorrId, ClientCorrId, Envelope, true, _streamId, ExpectedVersion.Any, null);
-		}
-
-		[Test]
-		public void successful_request_message_is_published() {
-			AssertEx.IsOrBecomesTrue(()=> Interlocked.Read(ref CompletionMessageCount) == 1);
-			Assert.AreEqual(InternalCorrId, CompletionMessage.CorrelationId);
-			Assert.True(CompletionMessage.Success);
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to_with_success() {
-			AssertEx.IsOrBecomesTrue(() => Envelope.Replies.Count > 0);
-			Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.TransactionStartCompleted>(
-				x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.Success));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Cluster/EventStoreClientCacheTests.cs b/src/EventStore.Core.Tests/Cluster/EventStoreClientCacheTests.cs
deleted file mode 100644
index 7f6ee108424..00000000000
--- a/src/EventStore.Core.Tests/Cluster/EventStoreClientCacheTests.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Cluster;
-using EventStore.Core.Messages;
-using EventStore.Core.Metrics;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Services.Transport.Http.NodeHttpClientFactory;
-using EventStore.Core.Tests.Fakes;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Cluster {
-	public class EventStoreClientCacheTests {
-		private static readonly INodeHttpClientFactory NodeHttpClientFactory = new NodeHttpClientFactory(
-			uriScheme: Uri.UriSchemeHttps,
-			nodeCertificateValidator: delegate { return (true, null); },
-			clientCertificateSelector: null);
-
-		private static readonly Func<EndPoint, IPublisher, EventStoreClusterClient> EventStoreClusterClientFactory =
-			(endpoint, bus) =>
-				new EventStoreClusterClient(
-					bus, Uri.UriSchemeHttps, endpoint, NodeHttpClientFactory, null,
-					new DurationTracker.NoOp(),
-					new DurationTracker.NoOp());
-
-		[Test]
-		public void BusShouldNotBeNull() {
-			Assert.Throws<ArgumentNullException>(() =>
-				new EventStoreClusterClientCache(null, EventStoreClusterClientFactory));
-		}
-
-		[Test]
-		public void ClientFactoryShouldNotBeNull() {
-			Assert.Throws<ArgumentNullException>(() =>
-				new EventStoreClusterClientCache(new FakePublisher(), null));
-		}
-
-		[Test]
-		public void CanGetClientForEndpoint() {
-			var sut = new EventStoreClusterClientCache(new FakePublisher(), EventStoreClusterClientFactory);
-
-			var client = sut.Get(new IPEndPoint(IPAddress.Loopback, 1113));
-
-			Assert.AreEqual(client, sut.Get(new IPEndPoint(IPAddress.Loopback, 1113)));
-		}
-
-		[Test]
-		public async Task CleansCacheOnThreshold() {
-			var interval = TimeSpan.FromMinutes(30);
-			var oldItemThreshold = TimeSpan.FromMilliseconds(500);
-			var sut = new EventStoreClusterClientCache(new FakePublisher(), EventStoreClusterClientFactory, interval,
-				oldItemThreshold);
-			var oldClient = sut.Get(new IPEndPoint(IPAddress.Loopback, 1113));
-
-			sut.Handle(new ClusterClientMessage.CleanCache());
-			await Task.Delay(oldItemThreshold.Add(TimeSpan.FromMilliseconds(500)));
-
-			var newClient = sut.Get(new IPEndPoint(IPAddress.Loopback, 1113));
-			newClient = sut.Get(new IPEndPoint(IPAddress.Loopback, 1113));
-			Assert.AreNotEqual(oldClient, newClient);
-		}
-
-		[Test]
-		public void ShouldScheduleCacheCleanOnTimer() {
-			var interval = TimeSpan.FromMilliseconds(1);
-			var bus = new FakePublisher();
-			var sut = new EventStoreClusterClientCache(bus, EventStoreClusterClientFactory, interval, interval);
-
-			sut.Handle(new SystemMessage.SystemInit());
-
-			Assert.True(bus.Messages.OfType<TimerMessage.Schedule>().Count() == 1);
-		}
-
-		[Test]
-		public async Task ShouldDisposeClientOnceEvictedFromCache() {
-			var interval = TimeSpan.FromMinutes(30);
-			var oldItemThreshold = TimeSpan.FromMilliseconds(500);
-			var sut = new EventStoreClusterClientCache(new FakePublisher(), EventStoreClusterClientFactory, interval,
-				oldItemThreshold);
-			var client = sut.Get(new IPEndPoint(IPAddress.Loopback, 1113));
-			Assert.NotNull(client);
-
-			await Task.Delay(oldItemThreshold.Add(TimeSpan.FromMilliseconds(500)));
-			sut.Handle(new ClusterClientMessage.CleanCache());
-			// Give the cache enough time to dispose the client
-			await Task.Delay(oldItemThreshold);
-
-			Assert.True(client.Disposed);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Cluster/MemberInfoTests.cs b/src/EventStore.Core.Tests/Cluster/MemberInfoTests.cs
deleted file mode 100644
index 9537332e691..00000000000
--- a/src/EventStore.Core.Tests/Cluster/MemberInfoTests.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Net;
-using EventStore.Core.Data;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Cluster {
-	[TestFixture]
-	public class MemberInfoTests {
-		[Test]
-		public void member_with_dns_endpoint_should_equal() {
-			var ipAddress = "127.0.0.1";
-			var port = 1113;
-			var memberWithDnsEndPoint = EventStore.Core.Cluster.MemberInfo.Initial(Guid.Empty, DateTime.UtcNow,
-				VNodeState.Unknown, true,
-				new DnsEndPoint(ipAddress, port),
-				new DnsEndPoint(ipAddress, port),
-				new DnsEndPoint(ipAddress, port),
-				new DnsEndPoint(ipAddress, port),
-				new DnsEndPoint(ipAddress, port),
-				null, 0, 0,
-				0, false);
-
-			var ipEndPoint = new IPEndPoint(IPAddress.Parse(ipAddress), port);
-			var dnsEndPoint = new DnsEndPoint(ipAddress, port);
-
-			Assert.True(memberWithDnsEndPoint.Is(ipEndPoint));
-			Assert.True(memberWithDnsEndPoint.Is(dnsEndPoint));
-		}
-
-		[Test]
-		public void member_with_ip_endpoint_should_equal() {
-			var ipAddress = "127.0.0.1";
-			var port = 1113;
-			var memberWithDnsEndPoint = EventStore.Core.Cluster.MemberInfo.Initial(Guid.Empty, DateTime.UtcNow,
-				VNodeState.Unknown, true,
-				new IPEndPoint(IPAddress.Parse(ipAddress), port),
-				new IPEndPoint(IPAddress.Parse(ipAddress), port),
-				new IPEndPoint(IPAddress.Parse(ipAddress), port),
-				new IPEndPoint(IPAddress.Parse(ipAddress), port),
-				new IPEndPoint(IPAddress.Parse(ipAddress), port),
-				null, 0, 0, 0, false);
-
-			var ipEndPoint = new IPEndPoint(IPAddress.Parse(ipAddress), port);
-			var dnsEndPoint = new DnsEndPoint(ipAddress, port);
-
-			Assert.True(memberWithDnsEndPoint.Is(ipEndPoint));
-			Assert.True(memberWithDnsEndPoint.Is(dnsEndPoint));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ClusterVNodeOptionsExtensions.cs b/src/EventStore.Core.Tests/ClusterVNodeOptionsExtensions.cs
deleted file mode 100644
index 84379662535..00000000000
--- a/src/EventStore.Core.Tests/ClusterVNodeOptionsExtensions.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using EventStore.Core.Services.Monitoring;
-using EventStore.Core.Tests.Helpers;
-
-namespace EventStore.Core.Tests; 
-
-public static class ClusterVNodeOptionsExtensions {
-	public static ClusterVNodeOptions ReduceMemoryUsageForTests(this ClusterVNodeOptions options) {
-		return options with {
-			Cluster = options.Cluster with {
-				StreamInfoCacheCapacity = 10_000
-			},
-			Database = options.Database with {
-				ChunkSize = MiniNode.ChunkSize,
-				ChunksCacheSize = MiniNode.CachedChunkSize,
-				StreamExistenceFilterSize = 10_000,
-				ScavengeBackendCacheSize = 64 * 1024,
-			}
-		};
-	}
-}
diff --git a/src/EventStore.Core.Tests/Constants.cs b/src/EventStore.Core.Tests/Constants.cs
deleted file mode 100644
index e8c4f4617f2..00000000000
--- a/src/EventStore.Core.Tests/Constants.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using EventStore.Core.Settings;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.Util;
-
-namespace EventStore.Core.Tests {
-	public class Constants {
-		public const int PTableInitialReaderCount = ESConsts.PTableInitialReaderCount;
-
-		public const int PTableMaxReaderCountDefault = 1 /* StorageWriter */
-		                                               + 1 /* StorageChaser */
-		                                               + 1 /* Projections */
-		                                               + TFChunkScavenger.MaxThreadCount /* Scavenging (1 per thread) */
-		                                               + 1 /* Subscription LinkTos resolving */
-		                                               + 4 /* Reader Threads Count */
-		                                               + 5 /* just in case reserve :) */;
-	}
-}
-		
diff --git a/src/EventStore.Core.Tests/DataStructures/bloom_filter_integrity_should.cs b/src/EventStore.Core.Tests/DataStructures/bloom_filter_integrity_should.cs
deleted file mode 100644
index 27241df2c1f..00000000000
--- a/src/EventStore.Core.Tests/DataStructures/bloom_filter_integrity_should.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-using System;
-using System.Linq;
-using System.Runtime.InteropServices;
-using EventStore.Core.DataStructures.ProbabilisticFilter;
-using EventStore.Core.Index.Hashes;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.DataStructures {
-	[TestFixture]
-	public class bloom_filter_integrity_should {
-		private static byte[] NewCacheLine(byte b) {
-			var xs = new byte[64];
-			for (int i = 0; i < xs.Length; i++) {
-				xs[i] = b;
-			}
-			return xs;
-		}
-
-		[DatapointSource]
-		public static object[][] RecoverCases = new object[][] {
-			new object[] { "all zeros is valid", true, NewCacheLine(0x00) },
-			new object[] { "all zeros with hash is valid", true, NewCacheLine(0x00).WithHash() },
-			new object[] { "all ones is invalid", false, NewCacheLine(0xFF) },
-			new object[] { "all ones with hash is valid", true, NewCacheLine(0xFF).WithHash() },
-			new object[] { "data but no hash is invalid", false, NewCacheLine(0x00).With(3, 0xAB) },
-			new object[] { "data with hash is valid", true, NewCacheLine(0x00).With(3, 0xAB).WithHash() },
-		};
-
-		[TestCaseSource(nameof(RecoverCases))]
-		public void recover_correctly(string name, bool expected, byte[] bytes) {
-			var originalBytes = bytes.ToArray();
-
-			var byteSpan = bytes.AsSpan();
-
-			if (expected) {
-				Assert.True(BloomFilterIntegrity.ValidateHash(byteSpan));
-
-				// bytes should be unchanged
-				for (var i = 0; i < bytes.Length; i++) {
-					Assert.AreEqual(originalBytes[i], bytes[i]);
-				}
-			} else {
-				Assert.False(BloomFilterIntegrity.ValidateHash(byteSpan));
-
-				// bytes should be all 1s
-				foreach (var b in bytes) {
-					Assert.AreEqual(0b1111_1111, b);
-				}
-			}
-		}
-
-		[DatapointSource]
-		public static object[][] WriteCases = new object[][] {
-			new object[] { "all 0x00", true, NewCacheLine(0x00) },
-			new object[] { "all 0xAA", true, NewCacheLine(0xAA) },
-			new object[] { "all 0xFF - corrupted and made safe", false, NewCacheLine(0xFF) },
-		};
-
-		[TestCaseSource(nameof(WriteCases))]
-		public void write_correctly(string name, bool expected, byte[] bytes) {
-			var originalBytes = bytes.ToArray();
-			var byteSpan = bytes.AsSpan();
-
-			BloomFilterIntegrity.WriteHash(byteSpan);
-
-			// bytes before the hash should be unchanged
-			for (var i = 0; i < bytes.Length - sizeof(uint); i++) {
-				Assert.AreEqual(originalBytes[i], bytes[i]);
-			}
-
-			// cacheline should be valid
-			if (expected) {
-				Assert.True(BloomFilterIntegrity.ValidateHash(byteSpan));
-			} else {
-				Assert.False(BloomFilterIntegrity.ValidateHash(byteSpan));
-			}
-		}
-
-		[TestCase]
-		public void rehash_when_exactly_one_too_many_bits_are_set() {
-			// some data with hash
-			var cacheLine = NewCacheLine(0x01).WithHash();
-
-			// set an extra bit
-			cacheLine[3] = cacheLine[3].SetBit(3);
-			var copy = cacheLine.ToArray();
-
-			// still valid
-			Assert.True(BloomFilterIntegrity.ValidateHash(cacheLine));
-
-			// same data
-			CollectionAssert.AreEqual(copy[..^4], cacheLine[..^4]);
-
-			// changed hash
-			CollectionAssert.AreNotEqual(copy[^4..], cacheLine[^4..]);
-		}
-
-		[TestCase]
-		public void not_rehash_when_very_different() {
-			// some data with hash
-			var cacheLine = NewCacheLine(0x01).WithHash();
-
-			// corrupt it
-			cacheLine.With(0, 0xEE);
-
-			// not valid
-			Assert.False(BloomFilterIntegrity.ValidateHash(cacheLine));
-		}
-	}
-
-	static class ByteArrayExtensions {
-		public static byte[] With(this byte[] self, int offset, byte value) {
-			self[offset] = value;
-			return self;
-		}
-
-		public static byte[] WithHash(this byte[] self) {
-			var hasher = new XXHashUnsafe();
-			var hash = hasher.Hash(self.AsSpan()[..^4]);
-			var hashSpan = MemoryMarshal.AsBytes(MemoryMarshal.CreateReadOnlySpan(ref hash, 1));
-			hashSpan.CopyTo(self.AsSpan()[^4..]);
-			return self;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/DataStructures/byte_extensions_should.cs b/src/EventStore.Core.Tests/DataStructures/byte_extensions_should.cs
deleted file mode 100644
index 92da61560ab..00000000000
--- a/src/EventStore.Core.Tests/DataStructures/byte_extensions_should.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using EventStore.Core.DataStructures.ProbabilisticFilter;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.DataStructures {
-	[TestFixture]
-	public class byte_extensions_should {
-		[DatapointSource]
-		public static object[][] IsBitSetCases = new object[][] {
-			new object[] { true, (byte)0b1111_0000, 0 },
-			new object[] { true, (byte)0b1111_0000, 1 },
-			new object[] { true, (byte)0b1111_0000, 2 },
-			new object[] { true, (byte)0b1111_0000, 3 },
-			new object[] { false, (byte)0b1111_0000, 4 },
-			new object[] { false, (byte)0b1111_0000, 5 },
-			new object[] { false, (byte)0b1111_0000, 6 },
-			new object[] { false, (byte)0b1111_0000, 7 },
-			new object[] { false, (byte)0b0000_1111, 0 },
-			new object[] { false, (byte)0b0000_1111, 1 },
-			new object[] { false, (byte)0b0000_1111, 2 },
-			new object[] { false, (byte)0b0000_1111, 3 },
-			new object[] { true, (byte)0b0000_1111, 4 },
-			new object[] { true, (byte)0b0000_1111, 5 },
-			new object[] { true, (byte)0b0000_1111, 6 },
-			new object[] { true, (byte)0b0000_1111, 7 },
-		};
-
-		[TestCaseSource(nameof(IsBitSetCases))]
-		public void check_bit_correctly(bool expected, byte x, int bitIndex) {
-			Assert.AreEqual(expected, x.IsBitSet(bitIndex));
-		}
-
-		[DatapointSource]
-		public static object[][] SetBitCases = new object[][] {
-			new object[] { (byte)0b1111_0000, (byte)0b1111_0000, 0 },
-			new object[] { (byte)0b1111_0000, (byte)0b1111_0000, 1 },
-			new object[] { (byte)0b1111_0000, (byte)0b1111_0000, 2 },
-			new object[] { (byte)0b1111_0000, (byte)0b1111_0000, 3 },
-			new object[] { (byte)0b1111_1000, (byte)0b1111_0000, 4 },
-			new object[] { (byte)0b1111_0100, (byte)0b1111_0000, 5 },
-			new object[] { (byte)0b1111_0010, (byte)0b1111_0000, 6 },
-			new object[] { (byte)0b1111_0001, (byte)0b1111_0000, 7 },
-			new object[] { (byte)0b1000_1111, (byte)0b0000_1111, 0 },
-			new object[] { (byte)0b0100_1111, (byte)0b0000_1111, 1 },
-			new object[] { (byte)0b0010_1111, (byte)0b0000_1111, 2 },
-			new object[] { (byte)0b0001_1111, (byte)0b0000_1111, 3 },
-			new object[] { (byte)0b0000_1111, (byte)0b0000_1111, 4 },
-			new object[] { (byte)0b0000_1111, (byte)0b0000_1111, 5 },
-			new object[] { (byte)0b0000_1111, (byte)0b0000_1111, 6 },
-			new object[] { (byte)0b0000_1111, (byte)0b0000_1111, 7 },
-		};
-
-		[TestCaseSource(nameof(SetBitCases))]
-		public void set_bit_correctly(byte expected, byte x, int bitIndex) {
-			Assert.AreEqual(expected, x.SetBit(bitIndex));
-		}
-
-		[DatapointSource]
-		public static object[][] UnsetBitCases = new object[][] {
-			new object[] { (byte)0b0111_0000, (byte)0b1111_0000, 0 },
-			new object[] { (byte)0b1011_0000, (byte)0b1111_0000, 1 },
-			new object[] { (byte)0b1101_0000, (byte)0b1111_0000, 2 },
-			new object[] { (byte)0b1110_0000, (byte)0b1111_0000, 3 },
-			new object[] { (byte)0b1111_0000, (byte)0b1111_0000, 4 },
-			new object[] { (byte)0b1111_0000, (byte)0b1111_0000, 5 },
-			new object[] { (byte)0b1111_0000, (byte)0b1111_0000, 6 },
-			new object[] { (byte)0b1111_0000, (byte)0b1111_0000, 7 },
-			new object[] { (byte)0b0000_1111, (byte)0b0000_1111, 0 },
-			new object[] { (byte)0b0000_1111, (byte)0b0000_1111, 1 },
-			new object[] { (byte)0b0000_1111, (byte)0b0000_1111, 2 },
-			new object[] { (byte)0b0000_1111, (byte)0b0000_1111, 3 },
-			new object[] { (byte)0b0000_0111, (byte)0b0000_1111, 4 },
-			new object[] { (byte)0b0000_1011, (byte)0b0000_1111, 5 },
-			new object[] { (byte)0b0000_1101, (byte)0b0000_1111, 6 },
-			new object[] { (byte)0b0000_1110, (byte)0b0000_1111, 7 },
-		};
-
-		[TestCaseSource(nameof(UnsetBitCases))]
-		public void unset_bit_correctly(byte expected, byte x, int bitIndex) {
-			Assert.AreEqual(expected, x.UnsetBit(bitIndex));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/DataStructures/concurrent_queue_wrapper_should.cs b/src/EventStore.Core.Tests/DataStructures/concurrent_queue_wrapper_should.cs
deleted file mode 100644
index aefb9459cb0..00000000000
--- a/src/EventStore.Core.Tests/DataStructures/concurrent_queue_wrapper_should.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Common.Utils;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.DataStructures {
-	[TestFixture]
-	public class concurrent_queue_wrapper_should {
-		[Test]
-		public void return_correct_counts_and_values_1() {
-			var queue = new ConcurrentQueueWrapper<int>();
-			Assert.AreEqual(0, queue.Count);
-			queue.Enqueue(1234);
-			Assert.AreEqual(1, queue.Count);
-			queue.Enqueue(12345);
-			Assert.AreEqual(2, queue.Count);
-
-			int val;
-			Assert.AreEqual(true, queue.TryDequeue(out val));
-			Assert.AreEqual(1234, val);
-			Assert.AreEqual(1, queue.Count);
-
-			Assert.AreEqual(true, queue.TryDequeue(out val));
-			Assert.AreEqual(12345, val);
-			Assert.AreEqual(0, queue.Count);
-
-			Assert.AreEqual(false, queue.TryDequeue(out val));
-			Assert.AreEqual(false, queue.TryDequeue(out val));
-		}
-
-		[Test]
-		public void return_correct_counts_and_values_2() {
-			var queue = new ConcurrentQueueWrapper<int>();
-			for (int i = 1; i <= 1000; i++) {
-				queue.Enqueue(i);
-				Assert.AreEqual(i, queue.Count);
-			}
-
-			int x;
-			for (int i = 1; i <= 1000; i++) {
-				Assert.AreEqual(true, queue.TryDequeue(out x));
-				Assert.AreEqual(i, x);
-				Assert.AreEqual(1000-i, queue.Count);
-			}
-		}
-	}
-
-	[TestFixture]
-	public class concurrent_queue_wrapper_with_parallel_dequeues_should {
-		private ConcurrentQueueWrapper<int> _concurrentQueue;
-		private const int TOTAL_ENQUEUED_ITEMS = 1000000;
-		private const int NUM_THREADS = 4;
-		private volatile bool _seenNegativeCount;
-		private volatile int _totalDequeued;
-
-		public concurrent_queue_wrapper_with_parallel_dequeues_should() {
-			_concurrentQueue = new ConcurrentQueueWrapper<int>();
-			_seenNegativeCount = false;
-			_totalDequeued = 0;
-		}
-
-		private void DequeueThread() {
-			int x;
-			while (_totalDequeued < TOTAL_ENQUEUED_ITEMS) {
-				var dequeued = _concurrentQueue.TryDequeue(out x);
-				if (_concurrentQueue.Count < 0) _seenNegativeCount = true;
-				if (dequeued) Interlocked.Increment(ref _totalDequeued);
-			}
-		}
-
-		[Test]
-		public void always_return_non_negative_count() {
-			var threads = new Thread[NUM_THREADS];
-			for (int i = 0; i < NUM_THREADS; i++) {
-				threads[i] = new Thread(DequeueThread);
-				threads[i].Start();
-			}
-
-			int x;
-			for (int i = 0; i < TOTAL_ENQUEUED_ITEMS; i++) {
-				_concurrentQueue.Enqueue(1);
-				var dequeued = _concurrentQueue.TryDequeue(out x);
-				if (dequeued) Interlocked.Increment(ref _totalDequeued);
-			}
-
-			for(int i=0;i<NUM_THREADS;i++)
-				threads[i].Join(TimeSpan.FromSeconds(5));
-
-			Assert.AreEqual(false, _seenNegativeCount);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/DataStructures/in_memory_bloom_filter_should.cs b/src/EventStore.Core.Tests/DataStructures/in_memory_bloom_filter_should.cs
deleted file mode 100644
index 2033ae4de95..00000000000
--- a/src/EventStore.Core.Tests/DataStructures/in_memory_bloom_filter_should.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.DataStructures.ProbabilisticFilter;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.DataStructures {
-	[TestFixture]
-	public class bloom_filter_should {
-		[Test]
-		public void always_return_true_if_an_item_was_added() {
-			for (int n = 1; n <= 1000; n++) {
-				for (double p = 0.1; p > 1.0e-7; p /= 10.0) {
-					InMemoryBloomFilter filter = new InMemoryBloomFilter(n, p);
-
-					//no items added yet
-					for (int i = 0; i <= n; i++) {
-						Assert.IsFalse(filter.MightContain(i));
-					}
-
-					//add the items
-					for (int i = 0; i <= n; i++) {
-						filter.Add(i);
-					}
-
-					//all the items should exist
-					for (int i = 0; i <= n; i++) {
-						Assert.IsTrue(filter.MightContain(i));
-					}
-				}
-			}
-		}
-
-		[Test, Category("LongRunning")]
-		public void always_return_true_if_an_item_was_added_for_large_n() {
-			int n = 1234567;
-			double p = 1.0e-6;
-
-			InMemoryBloomFilter filter = new InMemoryBloomFilter(n, p);
-
-			//no items added yet
-			for (int i = 0; i <= n; i++) {
-				Assert.IsFalse(filter.MightContain(i));
-			}
-
-			//add the items
-			for (int i = 0; i <= n; i++) {
-				filter.Add(i);
-			}
-
-			//all the items should exist
-			for (int i = 0; i <= n; i++) {
-				Assert.IsTrue(filter.MightContain(i));
-			}
-		}
-
-		[Test]
-		public void support_adding_large_values() {
-			int n = 1234567;
-			double p = 1.0e-6;
-
-			InMemoryBloomFilter filter = new InMemoryBloomFilter(n, p);
-			long[] items = {
-				192389123812L, 286928492L, 27582928698L, 72669175482L, 1738996371L, 939342020387L, 37253255484L,
-				346536436L, 123921398432L, 8324982394329432L, 183874782348723874L, long.MaxValue
-			};
-
-			//no items added yet
-			for (int i = 0; i < items.Length; i++) {
-				Assert.IsFalse(filter.MightContain(items[i]));
-			}
-
-			//add the items
-			for (int i = 0; i < items.Length; i++) {
-				filter.Add(items[i]);
-			}
-
-			//all the items should exist
-			for (int i = 0; i < items.Length; i++) {
-				Assert.IsTrue(filter.MightContain(items[i]));
-			}
-
-			//all the neighbouring items should probably not exist
-			for (int i = 0; i < items.Length; i++) {
-				Assert.IsFalse(filter.MightContain(items[i] - 1));
-				Assert.IsFalse(filter.MightContain(items[i] + 1));
-			}
-		}
-
-		[Test]
-		public void have_false_positives_with_probability_p() {
-			for (int n = 1; n <= 1000; n++) {
-				for (double p = 0.1; p > 1.0e-7; p /= 10.0) {
-					InMemoryBloomFilter filter = new InMemoryBloomFilter(n, p);
-
-					//add only odd numbers
-					for (int i = 1; i <= n; i += 2) {
-						filter.Add(i);
-					}
-
-					//expected number of false positives
-					int expectedFalsePositives = (int)Math.Ceiling(n * p / 2.0);
-
-					//none of these items should exist but there may be some false positives
-					int falsePositives = 0;
-					for (int i = 2; i <= n; i += 2) {
-						if (filter.MightContain(i)) {
-							falsePositives++;
-						}
-					}
-
-					if (falsePositives > 0)
-						Console.Out.WriteLine("n: {0}, p:{1}. Found {2} false positives. Expected false positives: {3}",
-							n, p, falsePositives, expectedFalsePositives);
-
-					Assert.LessOrEqual(falsePositives, expectedFalsePositives);
-				}
-			}
-		}
-
-		[Test]
-		public void have_false_positives_with_probability_p_for_large_n() {
-			int n = 1234567;
-
-			for (double p = 0.1; p > 1.0e-7; p /= 10.0) {
-				InMemoryBloomFilter filter = new InMemoryBloomFilter(n, p);
-
-				//add only odd numbers
-				for (int i = 1; i <= n; i += 2) {
-					filter.Add(i);
-				}
-
-				//expected number of false positives
-				int expectedFalsePositives = (int)Math.Ceiling(n * p / 2.0);
-
-				//none of these items should exist but there may be some false positives
-				int falsePositives = 0;
-				for (int i = 2; i <= n; i += 2) {
-					if (filter.MightContain(i)) {
-						falsePositives++;
-					}
-				}
-
-				if (falsePositives > 0)
-					Console.Out.WriteLine("n: {0}, p:{1}. Found {2} false positives. Expected false positives: {3}", n,
-						p, falsePositives, expectedFalsePositives);
-				Assert.LessOrEqual(falsePositives, expectedFalsePositives);
-			}
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_when_given_non_positive_n() {
-			Assert.Throws<ArgumentOutOfRangeException>(() => new InMemoryBloomFilter(0, 0.1));
-			Assert.Throws<ArgumentOutOfRangeException>(() => new InMemoryBloomFilter(-1, 0.1));
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_when_given_non_positive_p() {
-			Assert.Throws<ArgumentOutOfRangeException>(() => new InMemoryBloomFilter(1, 0.0));
-			Assert.Throws<ArgumentOutOfRangeException>(() => new InMemoryBloomFilter(1, -0.1));
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_when_number_of_bits_too_large() {
-			Assert.Throws<ArgumentOutOfRangeException>(() => new InMemoryBloomFilter(123456789, 0.0000000001));
-		}
-
-		[Test]
-		public void correctly_convert_long_to_bytes() {
-			for (long i = -1000; i <= 1000; i++) {
-				byte[] bytes = InMemoryBloomFilter.toBytes(i);
-				Assert.AreEqual(8, bytes.Length);
-				long v = 0;
-
-				for (int j = 7; j >= 0; j--) {
-					v <<= 8;
-					v |= bytes[j];
-				}
-
-				Assert.AreEqual(i, v);
-			}
-
-			long[] nums = {
-				long.MaxValue, long.MinValue, 0, 192389123812L, 286928492L, 27582928698L, 72669175482L, 1738996371L,
-				939342020387L, 37253255484L, 346536436L, 123921398432L, 8324982394329432L, 183874782348723874L
-			};
-			for (long i = 0; i < nums.Length; i++) {
-				byte[] bytes = InMemoryBloomFilter.toBytes(nums[i]);
-				Assert.AreEqual(8, bytes.Length);
-				long v = 0;
-				for (int j = 7; j >= 0; j--) {
-					v <<= 8;
-					v |= bytes[j];
-				}
-
-				Assert.AreEqual(nums[i], v);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/DataStructures/pairing_heap_should.cs b/src/EventStore.Core.Tests/DataStructures/pairing_heap_should.cs
deleted file mode 100644
index 631486bcf62..00000000000
--- a/src/EventStore.Core.Tests/DataStructures/pairing_heap_should.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.DataStructures;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.DataStructures {
-	[TestFixture]
-	public class pairing_heap_should {
-		PairingHeap<int> _heap;
-
-		[SetUp]
-		public void SetUp() {
-			_heap = new PairingHeap<int>();
-		}
-
-		[TearDown]
-		public void TearDown() {
-			_heap = null;
-		}
-
-		[Test]
-		public void throw_argumentnullexception_when_given_null_comparer() {
-			Assert.Throws<ArgumentNullException>(() => new PairingHeap<int>(null as IComparer<int>));
-		}
-
-		[Test]
-		public void throw_argumentnullexception_when_given_null_compare_func() {
-			Assert.Throws<ArgumentNullException>(() => new PairingHeap<int>(null as Func<int, int, bool>));
-		}
-
-		[Test]
-		public void throw_invalidoperationexception_when_trying_to_find_min_element_on_empty_queue() {
-			Assert.Throws<InvalidOperationException>(() => _heap.FindMin());
-		}
-
-		[Test]
-		public void throw_invalidoperationexception_when_trying_to_delete_min_element_on_empty_queue() {
-			Assert.Throws<InvalidOperationException>(() => _heap.DeleteMin());
-		}
-
-		[Test]
-		public void return_correct_min_element_and_keep_it_in_heap_on_findmin_operation() {
-			_heap.Add(9);
-			_heap.Add(7);
-			_heap.Add(5);
-			_heap.Add(3);
-
-			Assert.That(_heap.FindMin(), Is.EqualTo(3));
-			Assert.That(_heap.Count, Is.EqualTo(4));
-		}
-
-		[Test]
-		public void return_correct_min_element_and_remove_it_from_heap_on_delete_min_operation() {
-			_heap.Add(7);
-			_heap.Add(5);
-			_heap.Add(3);
-
-			Assert.That(_heap.DeleteMin(), Is.EqualTo(3));
-			Assert.That(_heap.Count, Is.EqualTo(2));
-		}
-
-		[Test]
-		public void return_elements_in_sorted_order() {
-			var reference = new[] {2, 5, 7, 9, 11, 27, 32};
-			var returned = new List<int>();
-
-			for (int i = reference.Length - 1; i >= 0; --i) {
-				_heap.Add(reference[i]);
-			}
-
-			while (_heap.Count > 0) {
-				returned.Add(_heap.DeleteMin());
-			}
-
-			Assert.That(returned, Is.EquivalentTo(reference));
-		}
-
-		[Test]
-		public void keep_all_duplicates() {
-			var reference = new[] {2, 5, 5, 7, 9, 9, 11, 11, 11, 27, 32};
-			var returned = new List<int>();
-
-			for (int i = reference.Length - 1; i >= 0; --i) {
-				_heap.Add(reference[i]);
-			}
-
-			while (_heap.Count > 0) {
-				returned.Add(_heap.DeleteMin());
-			}
-
-			Assert.That(returned, Is.EquivalentTo(reference));
-		}
-
-		[Test]
-		public void handle_a_lot_of_elements_and_not_loose_any_elements() {
-			var elements = new List<int>();
-			var rnd = new Random(123456791);
-
-			for (int i = 0; i < 1000; ++i) {
-				var elem = rnd.Next();
-				elements.Add(elem);
-				_heap.Add(elem);
-			}
-
-			elements.Sort();
-
-			var returned = new List<int>();
-			while (_heap.Count > 0) {
-				returned.Add(_heap.DeleteMin());
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/DataStructures/persistent_stream_bloom_filter.cs b/src/EventStore.Core.Tests/DataStructures/persistent_stream_bloom_filter.cs
deleted file mode 100644
index 82bcbd2774a..00000000000
--- a/src/EventStore.Core.Tests/DataStructures/persistent_stream_bloom_filter.cs
+++ /dev/null
@@ -1,256 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using EventStore.Core.DataStructures.ProbabilisticFilter;
-using EventStore.Core.Index.Hashes;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.DataStructures {
-	public enum PersistenceStrategy {
-		MemoryMapped,
-		FileStream,
-	}
-
-	[TestFixture(PersistenceStrategy.MemoryMapped, PersistenceStrategy.MemoryMapped)]
-	[TestFixture(PersistenceStrategy.MemoryMapped, PersistenceStrategy.FileStream)]
-	[TestFixture(PersistenceStrategy.FileStream, PersistenceStrategy.MemoryMapped)]
-	[TestFixture(PersistenceStrategy.FileStream, PersistenceStrategy.FileStream)]
-	public class persistent_stream_bloom_filter : SpecificationWithDirectoryPerTestFixture {
-		private readonly PersistenceStrategy _forCreate;
-		private readonly PersistenceStrategy _forOpen;
-
-		public persistent_stream_bloom_filter(PersistenceStrategy forCreate, PersistenceStrategy forOpen) {
-			_forCreate = forCreate;
-			_forOpen = forOpen;
-		}
-
-		PersistentStreamBloomFilter GenSut(string path, bool create, long size, ILongHasher<string> hasher) =>
-			(create ? _forCreate : _forOpen) switch {
-				PersistenceStrategy.MemoryMapped =>
-					new PersistentStreamBloomFilter(
-						new MemoryMappedFilePersistence(size, path, create),
-						hasher: hasher),
-
-				PersistenceStrategy.FileStream =>
-					new PersistentStreamBloomFilter(
-						new FileStreamPersistence(size, path, create),
-						hasher: hasher),
-
-				_ => throw new ArgumentOutOfRangeException(),
-		};
-
-		private static string GenerateCharset() {
-			var charset = "";
-			for (var c = 'a'; c <= 'z'; c++) {
-				charset += c;
-			}
-			for (var c = 'A'; c <= 'Z'; c++) {
-				charset += c;
-			}
-			for (var c = '0'; c <= '9'; c++) {
-				charset += c;
-			}
-			charset += "!@#$%^&*()-_";
-			return charset;
-		}
-
-		private static string GenerateRandomString(int length, string charset, Random random) {
-			string s = "";
-			for (var j = 0; j < length; j++) {
-				s += charset[random.Next() % charset.Length];
-			}
-
-			return s;
-		}
-
-		private static string[] GenerateRandomStrings(int count, int maxLength) {
-			var random = new Random(123);
-			var strings = new List<string>();
-			var charset = GenerateCharset();
-
-			for (int i = 0; i < count; i++) {
-				int length = 1 + random.Next() % maxLength;
-				strings.Add(GenerateRandomString(length, charset, random));
-			}
-
-			return strings.ToArray();
-		}
-
-		[TestFixture(PersistenceStrategy.MemoryMapped, PersistenceStrategy.MemoryMapped)]
-		[TestFixture(PersistenceStrategy.MemoryMapped, PersistenceStrategy.FileStream)]
-		[TestFixture(PersistenceStrategy.FileStream, PersistenceStrategy.MemoryMapped)]
-		[TestFixture(PersistenceStrategy.FileStream, PersistenceStrategy.FileStream)]
-		private class with_fixed_size_filter : persistent_stream_bloom_filter {
-			private PersistentStreamBloomFilter _filter;
-			private string _path;
-
-			public with_fixed_size_filter(PersistenceStrategy forCreate, PersistenceStrategy forOpen)
-				: base(forCreate, forOpen) {
-			}
-
-			[SetUp]
-			public void SetUp() {
-				_path = GetTempFilePath();
-				_filter = GenSut(_path, create: true, BloomFilterAccessor.MinSizeKB * 1000, hasher: null);
-			}
-
-			[TearDown]
-			public void Teardown() => _filter?.Dispose();
-
-			[Test]
-			public void creates_the_file_on_disk() => Assert.That(File.Exists(_path));
-
-			[Test]
-			public void can_close_and_reopen() {
-				_filter.Add("hello");
-				_filter.Flush();
-				_filter.Dispose();
-				using var newFilter = GenSut(_path, create: false, BloomFilterAccessor.MinSizeKB * 1000, hasher: null);
-				Assert.IsTrue(newFilter.MightContain("hello"));
-			}
-
-			[Test]
-			public void can_detect_incorrect_size() {
-				_filter.Add("hello");
-				_filter.Flush();
-				_filter.Dispose();
-
-				Assert.Throws<SizeMismatchException>(() => {
-					using var newFilter = GenSut(_path, create: false, BloomFilterAccessor.MinSizeKB * 1000 + 1, hasher: null);
-				});
-			}
-
-			[Test]
-			public void creates_correct_header() {
-				_filter.Dispose();
-				using var fileStream = File.Open(_path, FileMode.Open);
-				var binaryReader = new BinaryReader(fileStream);
-
-				var version = binaryReader.ReadByte();
-				binaryReader.ReadByte();
-				binaryReader.ReadByte();
-				binaryReader.ReadByte();
-				var corruptionRebuildCount = binaryReader.ReadInt32();
-				var numBits = binaryReader.ReadInt64();
-				Assert.AreEqual( 0x01, version);
-				Assert.AreEqual( 0, corruptionRebuildCount);
-				Assert.AreEqual(BloomFilterAccessor.MinSizeKB * 1000 * 8, numBits);
-			}
-
-			[Test]
-			public void supports_adding_long_strings() {
-				var charset = GenerateCharset();
-				var random = new Random(123);
-				var longString = GenerateRandomString(10000, charset, random);
-
-				Assert.IsFalse(_filter.MightContain(longString));
-				_filter.Add(longString);
-				Assert.IsTrue(_filter.MightContain(longString));
-			}
-		}
-
-		[Test, Combinatorial]
-		public void has_false_positives_with_probability_p(
-			[Values(BloomFilterAccessor.MinSizeKB*1000,2* BloomFilterAccessor.MinSizeKB*1000)] long size,
-			[Values(0.001,0.02,0.05,0.1,0.2)] double p
-		) {
-			using var filter = GenSut(GetTempFilePath(), create: true, size, hasher: null);
-			var n = (int) filter.CalculateOptimalNumItems(p);
-
-			var random = new Random(123);
-			var charset = GenerateCharset();
-
-			var list = new List<string>();
-
-			var selected = new HashSet<string>();
-			//generate 2n distinct items
-			for (int i = 0; i < 2 * n; i++) {
-				while (true) {
-					var length = 1 + random.Next() % 10;
-					var s = GenerateRandomString(length, charset, random);
-					if (selected.Contains(s)) continue;
-					list.Add(s);
-					selected.Add(s);
-					break;
-				}
-			}
-
-			//add first n distinct items to the filter
-			for (int i = 0; i < n; i++) {
-				filter.Add(list[i]);
-			}
-
-			//expected number of false positives
-			var expectedFalsePositives = Convert.ToInt32(Math.Ceiling(n * p));
-
-			//the second n distinct items should not exist but there may be some false positives
-			var falsePositives = 0;
-			for (var i = n ; i < 2*n; i ++) {
-				if (filter.MightContain(list[i])) {
-					falsePositives++;
-				}
-			}
-
-			//X = random variable that takes value 1 with probability p and value 0 with probability (1-p)
-			//var(X) = E(X^2) - E(X)^2 = p - p*p;
-			//var(X1 + X2 + X3 + ... + Xn) = n*var(Xi); //variance of n uncorrelated random variables
-			//var(X1 + X2 + X3 + ... + Xn) = n*(p-p*p);
-			var variance = n * (p - (p * p));
-			var standardDeviation = Math.Sqrt(variance);
-			var threeStandardDeviations = 3 * standardDeviation; //99.7%
-
-			if (falsePositives > 0)
-				Console.Out.WriteLine("n: {0:N0}, p:{1:N3}. Found {2:N0} false positives. Expected false positives: {3:N0}. Standard deviation: {4:N2}",
-					n, p, falsePositives, expectedFalsePositives, standardDeviation);
-
-			Assert.LessOrEqual(falsePositives, expectedFalsePositives + threeStandardDeviations);
-			Assert.GreaterOrEqual(falsePositives, Math.Max(0, expectedFalsePositives - threeStandardDeviations));
-		}
-
-		[Test, Category("LongRunning")]
-		public void always_returns_true_when_an_item_was_added([Range(10_000, 100_000, 13337)] long size) {
-			using var filter = GenSut(GetTempFilePath(), create: true, size, hasher: null);
-			var strings = GenerateRandomStrings((int)filter.CalculateOptimalNumItems(PersistentBloomFilter.RecommendedFalsePositiveProbability), 100);
-
-			//no items added yet
-			foreach (var s in strings) {
-				Assert.IsFalse(filter.MightContain(s));
-			}
-
-			//add the items and verify their existence
-			foreach (var s in strings) {
-				filter.Add(s);
-				Assert.IsTrue(filter.MightContain(s));
-			}
-
-			//all the items should exist
-			foreach (var s in strings) {
-				Assert.IsTrue(filter.MightContain(s));
-			}
-		}
-
-		[Test]
-		public void throws_argument_out_of_range_exception_when_given_negative_size() {
-			Assert.Throws<ArgumentOutOfRangeException>(() =>
-				GenSut(GetTempFilePath(), create: true, size: -1, hasher: null));
-		}
-
-		[Test]
-		public void throws_argument_out_of_range_exception_when_given_zero_size() {
-			Assert.Throws<ArgumentOutOfRangeException>(() =>
-				GenSut(GetTempFilePath(), create: true, size: 0, hasher: null));
-		}
-
-		[Test]
-		public void throws_argument_out_of_range_exception_when_size_less_than_min_size() {
-			Assert.Throws<ArgumentOutOfRangeException>(() =>
-				GenSut(GetTempFilePath(), create: true, size: BloomFilterAccessor.MinSizeKB * 1000 - 1, hasher: null));
-		}
-
-		[Test]
-		public void throws_argument_out_of_range_exception_when_size_greater_than_max_size() {
-			Assert.Throws<ArgumentOutOfRangeException>(() =>
-				GenSut(GetTempFilePath(), create: true, size: BloomFilterAccessor.MaxSizeKB * 1000 + 1, hasher: null));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/DataStructures/unmanaged_memory_append_only_list_should.cs b/src/EventStore.Core.Tests/DataStructures/unmanaged_memory_append_only_list_should.cs
deleted file mode 100644
index 1accb75988d..00000000000
--- a/src/EventStore.Core.Tests/DataStructures/unmanaged_memory_append_only_list_should.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-using System;
-using EventStore.Core.DataStructures;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.DataStructures {
-	[TestFixture(1)]
-	[TestFixture(2)]
-	[TestFixture(10)]
-	[TestFixture(13)]
-	[TestFixture(100)]
-	public class unmanaged_memory_append_only_list_should {
-		private UnmanagedMemoryAppendOnlyList<int> _list;
-		private readonly int _maxCapacity;
-
-		public unmanaged_memory_append_only_list_should(int maxCapacity) {
-			_maxCapacity = maxCapacity;
-		}
-
-		[SetUp]
-		public void SetUp() {
-			_list = new UnmanagedMemoryAppendOnlyList<int>(_maxCapacity);
-		}
-
-		[TearDown]
-		public void TearDown() {
-			_list?.Dispose();
-		}
-
-		[Test]
-		public void correctly_add_items() {
-			Assert.AreEqual(0, _list.Count);
-
-			for (int i = 1; i <= _maxCapacity; i++) {
-				_list.Add(i);
-				Assert.AreEqual(i, _list.Count);
-			}
-
-			for (int i = 0; i < _maxCapacity; i++) {
-				Assert.AreEqual(i + 1, _list[i]);
-			}
-		}
-
-		[Test]
-		public void return_correct_count_and_items_with_as_span() {
-			Assert.AreEqual(0, _list.AsSpan().Length);
-
-			for (int i = 1; i <= _maxCapacity; i++) {
-				_list.Add(i);
-				var span = _list.AsSpan();
-				Assert.AreEqual(i,span.Length);
-				for (int j = 0; j < i; j++) {
-					Assert.AreEqual(j+1, span[j]);
-				}
-			}
-		}
-
-		[Test]
-		public void correctly_clear_items() {
-			Assert.AreEqual(0, _list.Count);
-
-			//add _maxCapacity items with values 1.._maxCapacity
-			for (int i = 1; i <= _maxCapacity; i++) {
-				_list.Add(i);
-				Assert.AreEqual(i, _list.Count);
-			}
-
-			//clear the list
-			_list.Clear();
-			Assert.AreEqual(0, _list.Count);
-
-			//we should not be able to access any item at indexes 0.._maxCapacity-1
-			for (int i = 0; i < _maxCapacity; i++) {
-				Assert.Throws<IndexOutOfRangeException>(() => {
-					var unused = _list[i];
-				});
-			}
-
-			//add _maxCapacity items with values -1..-_maxCapacity
-			for (int i = 1; i <= _maxCapacity; i++) {
-				_list.Add(-i);
-				Assert.AreEqual(i, _list.Count);
-			}
-
-			//verify that the new items have been correctly added
-			for (int i = 0; i < _maxCapacity; i++) {
-				Assert.AreEqual(-(i + 1), _list[i]);
-			}
-		}
-
-		[Test]
-		public void throw_max_capacity_reached_exception_if_list_is_full() {
-			for (int i = 1; i <= _maxCapacity; i++) {
-				_list.Add(0);
-			}
-
-			Assert.Throws<MaxCapacityReachedException>(() => {
-				_list.Add(0);
-			});
-		}
-
-		[Test]
-		public void throw_index_out_of_range_exception_when_accessing_out_of_bounds_index() {
-			int unused;
-			Assert.Throws<IndexOutOfRangeException>(() => {
-				unused = _list[-1];
-			});
-
-			Assert.Throws<IndexOutOfRangeException>(() => {
-				unused = _list[-2];
-			});
-
-			for (int i = 0; i < _maxCapacity; i++) {
-				Assert.Throws<IndexOutOfRangeException>(() => {
-					unused = _list[i];
-				});
-				_list.Add(0);
-
-				Assert.DoesNotThrow(() => {
-					unused = _list[i];
-				});
-			}
-
-			Assert.Throws<IndexOutOfRangeException>(() => {
-				unused = _list[_maxCapacity];
-			});
-
-			Assert.Throws<IndexOutOfRangeException>(() => {
-				unused = _list[_maxCapacity + 1];
-			});
-		}
-
-		[Test]
-		public void be_passed_by_reference() {
-			Assert.AreEqual(0, _list.Count);
-			Add(_list, 5);
-			Assert.AreEqual(1, _list.Count);
-			Assert.AreEqual(5, _list[0]);
-			Clear(_list);
-			Assert.AreEqual(0, _list.Count);
-		}
-
-		private static void Add(IAppendOnlyList<int> list, int value) {
-			list.Add(value);
-		}
-
-		private static void Clear(IAppendOnlyList<int> list) {
-			list.Clear();
-		}
-	}
-
-	public class unmanaged_memory_append_only_list_with_non_positive_capacity_should {
-		[Test]
-		public void throw_argument_exception() {
-			Assert.Throws<ArgumentException>(() => {
-				var unused = new UnmanagedMemoryAppendOnlyList<int>(0);
-			});
-
-			Assert.Throws<ArgumentException>(() => {
-				var unused = new UnmanagedMemoryAppendOnlyList<int>(-1);
-			});
-
-			Assert.Throws<ArgumentException>(() => {
-				var unused = new UnmanagedMemoryAppendOnlyList<int>(-2);
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/DefaultData.cs b/src/EventStore.Core.Tests/DefaultData.cs
deleted file mode 100644
index bfbd00006fe..00000000000
--- a/src/EventStore.Core.Tests/DefaultData.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Net;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Services;
-
-namespace EventStore.Core.Tests {
-	public class DefaultData {
-		public static string AdminUsername = SystemUsers.Admin;
-		public static string AdminPassword = SystemUsers.DefaultAdminPassword;
-		public static UserCredentials AdminCredentials = new UserCredentials(AdminUsername, AdminPassword);
-		public static NetworkCredential AdminNetworkCredentials = new NetworkCredential(AdminUsername, AdminPassword);
-		public static ClusterVNodeOptions.DefaultUserOptions DefaultUserOptions = new ClusterVNodeOptions.DefaultUserOptions() {
-			DefaultAdminPassword = SystemUsers.DefaultAdminPassword,
-			DefaultOpsPassword = SystemUsers.DefaultOpsPassword
-		};
-	}
-}
diff --git a/src/EventStore.Core.Tests/DirectoryDeleter.cs b/src/EventStore.Core.Tests/DirectoryDeleter.cs
deleted file mode 100644
index 2479291d466..00000000000
--- a/src/EventStore.Core.Tests/DirectoryDeleter.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.IO;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.Tests {
-	public static class DirectoryDeleter {
-		public static async Task TryForceDeleteDirectoryAsync(string path, int retries = 10) {
-			// retry because ClusterNode.StopAsync completes immediately on receiving BecomeShutdown
-			// but BecomeShutdown also causes the StorageReaderService to close the index.
-			for (var i = 0; i < retries; i++) {
-				if (TryForceDeleteDirectory(path))
-					return;
-				await Task.Delay(1000);
-			}
-		}
-		private static bool TryForceDeleteDirectory(string path) {
-			try {
-				ForceDeleteDirectory(path);
-				return true;
-			} catch {
-				return false;
-			}
-		}
-
-		private static void ForceDeleteDirectory(string path) {
-			var directory = new DirectoryInfo(path) { Attributes = FileAttributes.Normal };
-			foreach (var info in directory.GetFileSystemInfos("*", SearchOption.AllDirectories)) {
-				info.Attributes = FileAttributes.Normal;
-			}
-
-			directory.Delete(true);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/DisposableExtensions.cs b/src/EventStore.Core.Tests/DisposableExtensions.cs
deleted file mode 100644
index fa70815dce1..00000000000
--- a/src/EventStore.Core.Tests/DisposableExtensions.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace EventStore.Core.Tests;
-
-public static class DisposableExtensions {
-	public static T DisposeWith<T>(this T disposable, Disposables disposables)
-		where T : IDisposable {
-
-		disposables.Add(disposable);
-		return disposable;
-	}
-}
diff --git a/src/EventStore.Core.Tests/Disposables.cs b/src/EventStore.Core.Tests/Disposables.cs
deleted file mode 100644
index f51c781b602..00000000000
--- a/src/EventStore.Core.Tests/Disposables.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace EventStore.Core.Tests;
-
-public sealed class Disposables : IDisposable {
-	private readonly List<IDisposable> _disposables = new();
-
-	public void Dispose() {
-		for (int i = _disposables.Count - 1; i >= 0; i--) {
-			_disposables[i]?.Dispose();
-		}
-	}
-
-	public void Add(IDisposable disposable) =>
-		_disposables.Add(disposable);
-}
diff --git a/src/EventStore.Core.Tests/EventStore.Core.Tests.csproj b/src/EventStore.Core.Tests/EventStore.Core.Tests.csproj
deleted file mode 100644
index c9ea160c0a2..00000000000
--- a/src/EventStore.Core.Tests/EventStore.Core.Tests.csproj
+++ /dev/null
@@ -1,70 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-	</PropertyGroup>
-	<ItemGroup>
-		<PackageReference Include="EventStore.Client" Version="21.2.0" />
-		<PackageReference Include="FluentAssertions" Version="6.12.0" />
-		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
-		<PackageReference Include="Grpc.Core" Version="2.46.6" />
-		<PackageReference Include="Grpc.Net.Client" Version="2.64.0" />
-		<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
-		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-		<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.10" />
-		<PackageReference Include="NUnit" Version="3.14.0" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-		<PackageReference Include="Google.Protobuf" Version="3.27.2" />
-		<PackageReference Include="Grpc.Tools" Version="2.65.0">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-		</PackageReference>
-		<PackageReference Include="Scrutor" Version="4.2.2" />
-		<PackageReference Include="Serilog.Sinks.InMemory" Version="0.11.0" />
-
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\EventStore.Common\EventStore.Common.csproj" />
-		<ProjectReference Include="..\EventStore.Core\EventStore.Core.csproj" />
-		<ProjectReference Include="..\EventStore.PluginHosting\EventStore.PluginHosting.csproj" />
-		<ProjectReference Include="..\EventStore.Transport.Http\EventStore.Transport.Http.csproj" />
-		<ProjectReference Include="..\EventStore.Transport.Tcp\EventStore.Transport.Tcp.csproj" />
-	</ItemGroup>
-	<ItemGroup>
-		<EmbeddedResource Include="Services\Transport\Tcp\test_certificates\**\*.crt" />
-		<EmbeddedResource Include="Services\Transport\Tcp\test_certificates\**\*.key" />
-		<EmbeddedResource Remove="FakePlugin\**" />
-	</ItemGroup>
-	<ItemGroup>
-		<None Include="TestConfigs\*.yaml">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</None>
-	</ItemGroup>
-	<ItemGroup>
-		<None Include="TestCertificates\*.*">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</None>
-	</ItemGroup>
-	<ItemGroup>
-		<None Include="Resources\es-tile.png">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</None>
-	</ItemGroup>
-	<ItemGroup>
-		<None Include="swagger.yaml">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</None>
-	</ItemGroup>
-	<ItemGroup>
-		<None Include="..\EventStore.Common\Utils\version.properties">
-			<Link>version.properties</Link>
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-	</ItemGroup>
-	<ItemGroup>
-		<None Remove="FakePlugin\**" />
-		<Compile Remove="FakePlugin\**" />
-		<Content Include="FakePlugin\**" CopyToOutputDirectory="Always" />
-	</ItemGroup>
-</Project>
diff --git a/src/EventStore.Core.Tests/ExclusiveDbLockTests.cs b/src/EventStore.Core.Tests/ExclusiveDbLockTests.cs
deleted file mode 100644
index c9665c76120..00000000000
--- a/src/EventStore.Core.Tests/ExclusiveDbLockTests.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests {
-	[TestFixture]
-	public class ExclusiveDbLockTests {
-		[Test]
-		public async Task can_release_when_running_in_task_pool() {
-			using var sut = new ExclusiveDbLock(GetDbPath());
-			Assert.True(sut.Acquire());
-			Assert.True(sut.IsAcquired);
-			await Task.Delay(1);
-			sut.Release();
-		}
-
-		[Test]
-		public void acquiring_twice_throws() {
-			using var sut = new ExclusiveDbLock(GetDbPath());
-			sut.Acquire();
-			Assert.Throws<InvalidOperationException>(() => sut.Acquire());
-		}
-
-		[Test]
-		public void releasing_before_acquiring_throws() {
-			using var sut = new ExclusiveDbLock(GetDbPath());
-			Assert.Throws<InvalidOperationException>(() => sut.Release());
-		}
-
-		private static string GetDbPath() => $"/tmp/eventstore/{Guid.NewGuid()}";
-
-
-	}
-}
diff --git a/src/EventStore.Core.Tests/Fakes/FakeLogger.cs b/src/EventStore.Core.Tests/Fakes/FakeLogger.cs
deleted file mode 100644
index 20caf39f6af..00000000000
--- a/src/EventStore.Core.Tests/Fakes/FakeLogger.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Collections.Generic;
-using Serilog;
-using Serilog.Events;
-
-namespace EventStore.Core.Tests.Fakes;
-
-public class FakeLogger : ILogger {
-	public List<LogEvent> LogMessages { get; } = new();
-
-	public void Write(LogEvent logEvent) {
-		LogMessages.Add(logEvent);
-	}
-}
diff --git a/src/EventStore.Core.Tests/Fakes/FakePublisher.cs b/src/EventStore.Core.Tests/Fakes/FakePublisher.cs
deleted file mode 100644
index 46543f8c227..00000000000
--- a/src/EventStore.Core.Tests/Fakes/FakePublisher.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Tests.Fakes {
-	public class FakePublisher : IPublisher {
-		public readonly List<Message> Messages;
-
-		public FakePublisher() {
-			Messages = new List<Message>();
-		}
-
-		public void Publish(Message message) {
-			Messages.Add(message);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Fakes/FakeTfReader.cs b/src/EventStore.Core.Tests/Fakes/FakeTfReader.cs
deleted file mode 100644
index d9cd564c93b..00000000000
--- a/src/EventStore.Core.Tests/Fakes/FakeTfReader.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog;
-
-namespace EventStore.Core.Tests.Fakes {
-	public class FakeTfReader : ITransactionFileReader {
-		public void Reposition(long position) {
-			throw new NotImplementedException();
-		}
-
-		public SeqReadResult TryReadNext() {
-			throw new NotImplementedException();
-		}
-
-		public SeqReadResult TryReadPrev() {
-			throw new NotImplementedException();
-		}
-
-		public RecordReadResult TryReadAt(long position, bool couldBeScavenged) {
-			throw new NotImplementedException();
-		}
-
-		public bool ExistsAt(long position) {
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Fakes/NoopPublisher.cs b/src/EventStore.Core.Tests/Fakes/NoopPublisher.cs
deleted file mode 100644
index ce616c142de..00000000000
--- a/src/EventStore.Core.Tests/Fakes/NoopPublisher.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Tests.Fakes {
-	public class NoopPublisher : IPublisher {
-		public void Publish(Message message) {
-			// do nothing
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Hashes/MD5HashTests.cs b/src/EventStore.Core.Tests/Hashes/MD5HashTests.cs
deleted file mode 100644
index b76d7877401..00000000000
--- a/src/EventStore.Core.Tests/Hashes/MD5HashTests.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Core.Hashing;
-using EventStore.Core.Util;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Hashes {
-	[TestFixture]
-	public class MD5HashTests {
-		[Test]
-		public void does_not_include_previous_data_in_stream() {
-			var bytes = new byte[1024];
-			for (int i = 15; i < 1024; i++) {
-				bytes[i] = (byte)(i % 255);
-			}
-
-			var stream = new MemoryStream(bytes);
-			stream.Seek(16, SeekOrigin.Begin);
-			var hash = MD5Hash.GetHashFor(stream);
-			Array.Copy(hash, 0, bytes, 0, hash.Length);
-			stream.Seek(16, SeekOrigin.Begin);
-			var hash2 = MD5Hash.GetHashFor(stream);
-			Assert.AreEqual(16, hash.Length);
-			Assert.AreEqual(hash, hash2);
-		}
-
-		[Test]
-		public void changing_data_in_stream_results_in_different_hash() {
-			var bytes = new byte[1024];
-			for (int i = 15; i < 1024; i++) {
-				bytes[i] = (byte)(i % 255);
-			}
-
-			var stream = new MemoryStream(bytes);
-			stream.Seek(16, SeekOrigin.Begin);
-			var hash = MD5Hash.GetHashFor(stream);
-			bytes[243] = 17;
-			stream.Seek(16, SeekOrigin.Begin);
-			var hash2 = MD5Hash.GetHashFor(stream);
-			Assert.AreNotEqual(hash, hash2);
-		}
-
-		[Test]
-		public void includes_correct_substream_data() {
-			var bytes = new byte[1024];
-			for (int i = 15; i < 1024; i++) {
-				bytes[i] = (byte)(i % 255);
-			}
-
-			var stream = new MemoryStream(bytes);
-			var hash = MD5Hash.GetHashFor(stream, 16, bytes.Length - 32);
-
-			using (var md5 = MD5.Create()) {
-				var referenceHash = md5.ComputeHash(bytes, 16, bytes.Length - 32);
-				Assert.AreEqual(16, hash.Length);
-				Assert.AreEqual(referenceHash, hash);
-			}
-		}
-
-		[Test, Category("LongRunning"), Explicit]
-		public void randomized_hash_verification_test() {
-			var buf = new byte[1024];
-			var seed = Environment.TickCount;
-			Console.WriteLine("Seed: {0}", seed);
-			new Random().NextBytes(buf);
-
-			var stream = new MemoryStream(buf);
-
-			using (var md5 = MD5.Create()) {
-				for (int i = 0; i < buf.Length; ++i) {
-					for (int j = i; j < buf.Length + 10; ++j) {
-						var referenceHash = md5.ComputeHash(buf, i, Math.Min(buf.Length - i, j - i + 1));
-						var hash = MD5Hash.GetHashFor(stream, i, j - i + 1);
-						Assert.AreEqual(16, hash.Length);
-						Assert.AreEqual(referenceHash, hash);
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Hashes/SMHasher.cs b/src/EventStore.Core.Tests/Hashes/SMHasher.cs
deleted file mode 100644
index cddc4836f82..00000000000
--- a/src/EventStore.Core.Tests/Hashes/SMHasher.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System;
-using EventStore.Core.Index.Hashes;
-
-namespace EventStore.Core.Tests.Hashes {
-	/// <summary>
-	/// Adapted Verification and Sanity checks from SMHasher
-	/// http://code.google.com/p/smhasher/
-	/// </summary>
-	public static class SMHasher {
-		//-----------------------------------------------------------------------------
-		// This should hopefully be a thorough and unambiguous test of whether a hash
-		// is correctly implemented on a given platform
-		public static bool VerificationTest(IHasher hasher, uint expected) {
-			const int hashBytes = 4;
-
-			var key = new byte[256];
-			var hashes = new byte[hashBytes * 256];
-
-			// Hash keys of the form {0}, {0,1}, {0,1,2}... up to N=255,using 256-N as
-			// the seed
-			for (int i = 0; i < 256; i++) {
-				key[i] = (byte)i;
-
-				var hash = hasher.Hash(key, 0, (uint)i, (uint)(256 - i));
-				Buffer.BlockCopy(BitConverter.GetBytes(hash), 0, hashes, i * hashBytes, hashBytes);
-			}
-
-			// Then hash the result array
-
-			var verification = hasher.Hash(hashes, 0, hashBytes * 256, 0);
-
-			// The first four bytes of that hash, interpreted as a little-endian integer, is our
-			// verification value
-
-			//uint verification = (final[0] << 0) | (final[1] << 8) | (final[2] << 16) | (final[3] << 24);
-
-
-			//----------
-
-			if (expected != verification) {
-				Console.WriteLine("Verification value 0x{0:X8} : Failed! (Expected 0x{1:X8})", verification, expected);
-				return false;
-			} else {
-				Console.WriteLine("Verification value 0x{0:X8} : Passed!", verification);
-				return true;
-			}
-		}
-
-		//----------------------------------------------------------------------------
-		// Basic sanity checks:
-		//     - A hash function should not be reading outside the bounds of the key.
-		//     - Flipping a bit of a key should, with overwhelmingly high probability, result in a different hash.
-		//     - Hashing the same key twice should always produce the same result.
-		//     - The memory alignment of the key should not affect the hash result.
-		public static bool SanityTest(IHasher hasher) {
-			var rnd = new Random(883741);
-
-			bool result = true;
-
-			const int reps = 10;
-			const int keymax = 256;
-			const int pad = 16;
-			const int buflen = keymax + pad * 3;
-
-			byte[] buffer1 = new byte[buflen];
-			byte[] buffer2 = new byte[buflen];
-			//----------
-			for (int irep = 0; irep < reps; irep++) {
-				if (irep % (reps / 10) == 0) Console.Write(".");
-
-				for (int len = 4; len <= keymax; len++) {
-					for (int offset = pad; offset < pad * 2; offset++) {
-//                        byte* key1 = &buffer1[pad];
-//                        byte* key2 = &buffer2[pad+offset];
-
-						rnd.NextBytes(buffer1);
-						rnd.NextBytes(buffer2);
-
-						//memcpy(key2, key1, len);
-						Buffer.BlockCopy(buffer2, pad + offset, buffer1, pad, len);
-
-						// hash1 = hash(key1, len, 0)
-						var hash1 = hasher.Hash(buffer1, pad, (uint)len, 0);
-
-						for (int bit = 0; bit < (len * 8); bit++) {
-							// Flip a bit, hash the key -> we should get a different result.
-							//Flipbit(key2,len,bit);
-							Flipbit(buffer2, pad + offset, len, bit);
-							var hash2 = hasher.Hash(buffer2, pad + offset, (uint)len, 0);
-
-							if (hash1 == hash2)
-								result = false;
-
-							// Flip it back, hash again -> we should get the original result.
-							//flipbit(key2,len,bit);
-							Flipbit(buffer2, pad + offset, len, bit);
-							//hash(key2, len, 0, hash2);
-							hash2 = hasher.Hash(buffer2, pad + offset, (uint)len, 0);
-
-							if (hash1 != hash2)
-								result = false;
-						}
-					}
-				}
-			}
-
-			return result;
-		}
-
-		private static void Flipbit(byte[] array, int offset, int len, int bit) {
-			var byteNum = bit >> 3;
-			bit = bit & 0x7;
-
-			if (byteNum < len)
-				array[offset + byteNum] ^= (byte)(1 << bit);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Hashes/murmur2_hash_should.cs b/src/EventStore.Core.Tests/Hashes/murmur2_hash_should.cs
deleted file mode 100644
index 5b7fe85dee4..00000000000
--- a/src/EventStore.Core.Tests/Hashes/murmur2_hash_should.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using EventStore.Core.Index.Hashes;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Hashes {
-	[TestFixture]
-	public class murmur2_hash_should {
-		public static uint Murmur2ReferenceVerificationValue = 0x27864C1E; // taken from SMHasher
-
-		[Test]
-		public void pass_smhasher_verification_test() {
-			Assert.IsTrue(SMHasher.VerificationTest(new Murmur2Unsafe(), Murmur2ReferenceVerificationValue));
-		}
-
-		[Test, Category("LongRunning"), Explicit]
-		public void pass_smhasher_sanity_test() {
-			Assert.IsTrue(SMHasher.SanityTest(new Murmur2Unsafe()));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Hashes/murmur3a_hash_should.cs b/src/EventStore.Core.Tests/Hashes/murmur3a_hash_should.cs
deleted file mode 100644
index b1fff21da25..00000000000
--- a/src/EventStore.Core.Tests/Hashes/murmur3a_hash_should.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using EventStore.Core.Index.Hashes;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Hashes {
-	[TestFixture]
-	public class murmur3a_hash_should {
-		public static uint Murmur3AReferenceVerificationValue = 0xB0F57EE3; // taken from SMHasher
-
-		[Test]
-		public void pass_smhasher_verification_test() {
-			Assert.IsTrue(SMHasher.VerificationTest(new Murmur3AUnsafe(), Murmur3AReferenceVerificationValue));
-		}
-
-		[Test, Category("LongRunning"), Explicit]
-		public void pass_smhasher_sanity_test() {
-			Assert.IsTrue(SMHasher.SanityTest(new Murmur3AUnsafe()));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Hashes/xxhash_hash_should.cs b/src/EventStore.Core.Tests/Hashes/xxhash_hash_should.cs
deleted file mode 100644
index 5129dfe7eb6..00000000000
--- a/src/EventStore.Core.Tests/Hashes/xxhash_hash_should.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using EventStore.Core.Index.Hashes;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Hashes {
-	[TestFixture]
-	public class xxhash_hash_should {
-		// calculated from reference XXhash implementation at http://code.google.com/p/xxhash/
-		public static uint XXHashReferenceVerificationValue = 0x56D249B1;
-
-		[Test]
-		public void pass_smhasher_verification_test() {
-			Assert.IsTrue(SMHasher.VerificationTest(new XXHashUnsafe(), XXHashReferenceVerificationValue));
-		}
-
-		[Test, Category("LongRunning"), Explicit]
-		public void pass_smhasher_sanity_test() {
-			Assert.IsTrue(SMHasher.SanityTest(new XXHashUnsafe()));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/AbstractorFactoryConfigurator.cs b/src/EventStore.Core.Tests/Helpers/AbstractorFactoryConfigurator.cs
deleted file mode 100644
index a95c978abeb..00000000000
--- a/src/EventStore.Core.Tests/Helpers/AbstractorFactoryConfigurator.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using EventStore.Core.LogAbstraction;
-
-namespace EventStore.Core.Tests.Helpers {
-	public class AbstractorFactoryConfigurator<TStreamId> : ILogFormatAbstractorFactory<TStreamId> {
-		private readonly ILogFormatAbstractorFactory<TStreamId> _wrapped;
-		private readonly Func<LogFormatAbstractorOptions, LogFormatAbstractorOptions> _configure;
-
-		public AbstractorFactoryConfigurator(
-			ILogFormatAbstractorFactory<TStreamId> wrapped,
-			Func<LogFormatAbstractorOptions, LogFormatAbstractorOptions> configure) {
-			_wrapped = wrapped;
-			_configure = configure;
-		}
-
-		public LogFormatAbstractor<TStreamId> Create(LogFormatAbstractorOptions options) =>
-			_wrapped.Create(_configure(options));
-	}
-
-	public static class LogFormatFactoryExtensions {
-		public static ILogFormatAbstractorFactory<TStreamId> Configure<TStreamId>(
-			this ILogFormatAbstractorFactory<TStreamId> factory,
-			Func<LogFormatAbstractorOptions, LogFormatAbstractorOptions> configure) =>
-
-			new AbstractorFactoryConfigurator<TStreamId>(factory, configure);
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/ClientApiLoggerBridge.cs b/src/EventStore.Core.Tests/Helpers/ClientApiLoggerBridge.cs
deleted file mode 100644
index b5ec85029e5..00000000000
--- a/src/EventStore.Core.Tests/Helpers/ClientApiLoggerBridge.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Tests.Helpers {
-	public class ClientApiLoggerBridge : EventStore.ClientAPI.ILogger {
-		public static readonly ClientApiLoggerBridge Default =
-			new ClientApiLoggerBridge(Serilog.Log.ForContext(Serilog.Core.Constants.SourceContextPropertyName,
-				"client-api"));
-
-		private readonly Serilog.ILogger _log;
-
-		public ClientApiLoggerBridge(ILogger log) {
-			Ensure.NotNull(log, "log");
-			_log = log;
-		}
-
-		public void Error(string format, params object[] args) {
-			if (args.Length == 0)
-				_log.Error(format);
-			else
-				_log.Error(format, args);
-		}
-
-		public void Error(Exception ex, string format, params object[] args) {
-			if (args.Length == 0)
-				_log.Error(ex, format);
-			else
-				_log.Error(ex, format, args);
-		}
-
-		public void Info(string format, params object[] args) {
-			if (args.Length == 0)
-				_log.Information(format);
-			else
-				_log.Information(format, args);
-		}
-
-		public void Info(Exception ex, string format, params object[] args) {
-			if (args.Length == 0)
-				_log.Information(ex, format);
-			else
-				_log.Information(ex, format, args);
-		}
-
-		public void Debug(string format, params object[] args) {
-			if (args.Length == 0)
-				_log.Debug(format);
-			else
-				_log.Debug(format, args);
-		}
-
-		public void Debug(Exception ex, string format, params object[] args) {
-			if (args.Length == 0)
-				_log.Debug(ex, format);
-			else
-				_log.Debug(ex, format, args);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/CollectionsExtensions.cs b/src/EventStore.Core.Tests/Helpers/CollectionsExtensions.cs
deleted file mode 100644
index 60ce6cfb6d3..00000000000
--- a/src/EventStore.Core.Tests/Helpers/CollectionsExtensions.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace EventStore.Core.Tests.Helpers {
-	public static class CollectionsExtensions {
-		public static bool ContainsNo<TMessage>(this IEnumerable<object> collection) {
-			return collection.ContainsNo<TMessage>(v => true);
-		}
-
-		public static bool ContainsNo<TMessage>(this IEnumerable<object> collection, Predicate<TMessage> predicate) {
-			return collection.ContainsN<TMessage>(0, predicate);
-		}
-
-		public static bool ContainsSingle<TMessage>(this IEnumerable<object> collection) {
-			return collection.ContainsSingle<TMessage>(v => true);
-		}
-
-		public static bool ContainsSingle<TMessage>(this IEnumerable<object> collection,
-			Predicate<TMessage> predicate) {
-			return collection.ContainsN<TMessage>(1, predicate);
-		}
-
-		public static bool ContainsN<TMessage>(this IEnumerable<object> collection, int n) {
-			return collection.ContainsN<TMessage>(n, v => true);
-		}
-
-		public static bool ContainsN<TMessage>(this IEnumerable<object> collection, int n,
-			Predicate<TMessage> predicate) {
-			return collection.OfType<TMessage>().Count(v => predicate(v)) == n;
-		}
-
-		public static bool IsEmpty(this IEnumerable<object> collection) {
-			return !collection.Any();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/HelperExtensions.cs b/src/EventStore.Core.Tests/Helpers/HelperExtensions.cs
deleted file mode 100644
index f090ceb87e9..00000000000
--- a/src/EventStore.Core.Tests/Helpers/HelperExtensions.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Utils;
-using NUnit.Framework;
-using Newtonsoft.Json.Linq;
-using System.IO;
-using System.Reflection;
-
-namespace EventStore.Core.Tests.Helpers {
-	public static class HelperExtensions {
-		public static bool IsBetween(this int n, int a, int b) {
-			return n >= a && n <= b;
-		}
-
-		public static bool AreEqual<TKey, TValue>(this IDictionary<TKey, TValue> first,
-			IDictionary<TKey, TValue> second) {
-			if (first.Count != second.Count)
-				return false;
-
-			TValue value;
-			return first.All(kvp => second.TryGetValue(kvp.Key, out value) && value.Equals(kvp.Value));
-		}
-
-		public static void AssertJObject(JObject expected, JObject response, string path) {
-			foreach (KeyValuePair<string, JToken> v in expected) {
-				JToken vv;
-				var propertyName = v.Key;
-				if (propertyName.StartsWith("___"))
-					propertyName = "$" + propertyName.Substring(3);
-				if (propertyName.EndsWith("___")) {
-					if (response.TryGetValue(propertyName.Substring(0, propertyName.Length - "___".Length), out vv)) {
-						Assert.Fail("{0}/{1} found, but it is explicitly forbidden", path, propertyName);
-					}
-				} else if (propertyName.EndsWith("___exists")) {
-					if (!response.TryGetValue(propertyName.Substring(0, propertyName.Length - "___exists".Length),
-						out vv)) {
-						Assert.Fail("{0}/{1} not found, but it is explicitly required", path, propertyName);
-					}
-				} else if (!response.TryGetValue(propertyName, out vv)) {
-					Assert.Fail("{0}/{1} not found in '{2}'", path, propertyName, response.ToString());
-				} else {
-					Assert.AreEqual(
-						v.Value.Type, vv.Type, "{0}/{1} type is {2}, but {3} is expected", path, propertyName, vv.Type,
-						v.Value.Type);
-					if (v.Value.Type == JTokenType.Object) {
-						AssertJObject(v.Value as JObject, vv as JObject, path + "/" + propertyName);
-					} else if (v.Value.Type == JTokenType.Array) {
-						AssertJArray(v.Value as JArray, vv as JArray, path + "/" + propertyName);
-					} else if (v.Value is JValue) {
-						Assert.AreEqual(
-							((JValue)(v.Value)).Value, ((JValue)vv).Value,
-							"{0}/{1} value is '{2}' but '{3}' is expected", path, propertyName, vv, v.Value);
-					} else
-						Assert.Fail();
-				}
-			}
-		}
-
-		public static void AssertJArray(JArray expected, JArray response, string path) {
-			for (int index = 0; index < expected.Count; index++) {
-				JToken v = expected.Count > index ? expected[index] : new JValue((object)null);
-				JToken vv = response.Count > index ? response[index] : new JValue((object)null);
-				Assert.AreEqual(
-					v.Type, vv.Type, "{0}/{1} type is {2}, but {3} is expected", path, index, vv.Type,
-					v.Type);
-				if (v.Type == JTokenType.Object) {
-					AssertJObject(v as JObject, vv as JObject, path + "/" + index);
-				} else if (v.Type == JTokenType.Array) {
-					AssertJArray(v as JArray, vv as JArray, path + "/" + index);
-				} else if (v is JValue) {
-					Assert.AreEqual(
-						((JValue)v).Value, ((JValue)vv).Value, "{0}/{1} value is '{2}' but '{3}' is expected", path,
-						index, vv, v);
-				} else
-					Assert.Fail();
-			}
-		}
-
-		public static void AssertJson<T>(T expected, JObject response) {
-			var serialized = expected.ToJson();
-			var jobject = serialized.ParseJson<JObject>();
-
-			var path = "/";
-
-			AssertJObject(jobject, response, path);
-		}
-
-		public static string GetFilePathFromAssembly(string filePath) {
-			var baseDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-			System.Console.WriteLine("Base dir: {0}", baseDir);
-			var result = Path.Combine(baseDir, filePath);
-			System.Console.WriteLine("Result: {0}", result);
-			return result;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/IODispatcherTests/IODispatcherTestHelpers.cs b/src/EventStore.Core.Tests/Helpers/IODispatcherTests/IODispatcherTestHelpers.cs
deleted file mode 100644
index f8c63a0ff68..00000000000
--- a/src/EventStore.Core.Tests/Helpers/IODispatcherTests/IODispatcherTestHelpers.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Text;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.TransactionLog.LogRecords;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Core.Tests.Helpers.IODispatcherTests {
-	public static class IODispatcherTestHelpers {
-		public static ResolvedEvent[] CreateResolvedEvent<TLogFormat, TStreamId>(string stream, string eventType, string data,
-			string metadata = "", long eventNumber = 0) {
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamIdIgnored = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeIdIgnored = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			var record = new EventRecord(eventNumber, LogRecord.Prepare(recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0,
-				streamIdIgnored, eventNumber, PrepareFlags.None, eventTypeIdIgnored, Encoding.UTF8.GetBytes(data),
-				Encoding.UTF8.GetBytes(metadata)), stream, eventType);
-			return new ResolvedEvent[] {
-				ResolvedEvent.ForUnresolvedEvent(record, 0)
-			};
-		}
-
-		public static void SubscribeIODispatcher(IODispatcher ioDispatcher, ISubscriber bus) {
-			bus.Subscribe<IODispatcherDelayedMessage>(ioDispatcher);
-			bus.Subscribe<ClientMessage.NotHandled>(ioDispatcher);
-			bus.Subscribe(ioDispatcher.ForwardReader);
-			bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(ioDispatcher.BackwardReader);
-			bus.Subscribe<ClientMessage.NotHandled>(ioDispatcher.BackwardReader);
-			bus.Subscribe(ioDispatcher.Writer);
-			bus.Subscribe(ioDispatcher.Awaker);
-			bus.Subscribe(ioDispatcher.StreamDeleter);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/IODispatcherTests/QueueWriteEventsTests/when_a_write_completes.cs b/src/EventStore.Core.Tests/Helpers/IODispatcherTests/QueueWriteEventsTests/when_a_write_completes.cs
deleted file mode 100644
index 176914b45a1..00000000000
--- a/src/EventStore.Core.Tests/Helpers/IODispatcherTests/QueueWriteEventsTests/when_a_write_completes.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Core.Services.UserManagement;
-using NUnit.Framework;
-using System;
-
-namespace EventStore.Core.Tests.Helpers.IODispatcherTests.QueueWriteEventsTests {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_a_write_completes<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private bool _completed = false;
-
-		protected override void Given() {
-			AllWritesQueueUp();
-
-			_ioDispatcher.QueueWriteEvents(Guid.NewGuid(), $"stream-{Guid.NewGuid()}", ExpectedVersion.Any,
-				new Event[] {new Event(Guid.NewGuid(), "event-type", false, string.Empty, string.Empty)},
-				SystemAccounts.System, (msg) => { _completed = true; });
-			OneWriteCompletes();
-		}
-
-		[Test]
-		public void should_invoke_callback_when_write_completes() {
-			Assert.IsTrue(_completed);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/IODispatcherTests/QueueWriteEventsTests/when_requesting_multiple_writes_with_different_keys.cs b/src/EventStore.Core.Tests/Helpers/IODispatcherTests/QueueWriteEventsTests/when_requesting_multiple_writes_with_different_keys.cs
deleted file mode 100644
index 12cea146877..00000000000
--- a/src/EventStore.Core.Tests/Helpers/IODispatcherTests/QueueWriteEventsTests/when_requesting_multiple_writes_with_different_keys.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.UserManagement;
-using NUnit.Framework;
-using System;
-using System.Linq;
-
-namespace EventStore.Core.Tests.Helpers.IODispatcherTests.QueueWriteEventsTests {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_requesting_multiple_writes_with_different_keys<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		protected override void Given() {
-			_ioDispatcher.QueueWriteEvents(Guid.NewGuid(), $"stream-{Guid.NewGuid()}", ExpectedVersion.Any,
-				new Event[] {new Event(Guid.NewGuid(), "event-type", false, string.Empty, string.Empty)},
-				SystemAccounts.System, (msg) => { });
-			_ioDispatcher.QueueWriteEvents(Guid.NewGuid(), $"stream-{Guid.NewGuid()}", ExpectedVersion.Any,
-				new Event[] {new Event(Guid.NewGuid(), "event-type", false, string.Empty, string.Empty)},
-				SystemAccounts.System, (msg) => { });
-		}
-
-		[Test]
-		public void should_have_as_many_writes_in_flight_as_unique_keys() {
-			Assert.AreEqual(2, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/IODispatcherTests/QueueWriteEventsTests/when_requesting_multiple_writes_with_the_same_key.cs b/src/EventStore.Core.Tests/Helpers/IODispatcherTests/QueueWriteEventsTests/when_requesting_multiple_writes_with_the_same_key.cs
deleted file mode 100644
index e079c8b6c70..00000000000
--- a/src/EventStore.Core.Tests/Helpers/IODispatcherTests/QueueWriteEventsTests/when_requesting_multiple_writes_with_the_same_key.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.UserManagement;
-using NUnit.Framework;
-using System;
-using System.Linq;
-
-namespace EventStore.Core.Tests.Helpers.IODispatcherTests.QueueWriteEventsTests {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_requesting_multiple_writes_with_the_same_key<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		protected override void Given() {
-			AllWritesQueueUp();
-
-			var key = Guid.NewGuid();
-			_ioDispatcher.QueueWriteEvents(key, $"stream-{Guid.NewGuid()}", ExpectedVersion.Any,
-				new Event[] {new Event(Guid.NewGuid(), "event-type", false, string.Empty, string.Empty)},
-				SystemAccounts.System, (msg) => { });
-			_ioDispatcher.QueueWriteEvents(key, $"stream-{Guid.NewGuid()}", ExpectedVersion.Any,
-				new Event[] {new Event(Guid.NewGuid(), "event-type", false, string.Empty, string.Empty)},
-				SystemAccounts.System, (msg) => { });
-			_ioDispatcher.QueueWriteEvents(key, $"stream-{Guid.NewGuid()}", ExpectedVersion.Any,
-				new Event[] {new Event(Guid.NewGuid(), "event-type", false, string.Empty, string.Empty)},
-				SystemAccounts.System, (msg) => { });
-		}
-
-		[Test]
-		public void should_only_have_a_single_write_in_flight() {
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
-		}
-
-		[Test]
-		public void should_continue_to_only_have_a_single_write_in_flight_as_writes_complete() {
-			var writeRequests = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>();
-
-			//first write
-			_consumer.HandledMessages.Clear();
-			OneWriteCompletes();
-			Assert.AreEqual(1, writeRequests.Count());
-
-			//second write
-			_consumer.HandledMessages.Clear();
-			OneWriteCompletes();
-			Assert.AreEqual(1, writeRequests.Count());
-
-			//third write completes, no more writes left in the queue
-			_consumer.HandledMessages.Clear();
-			OneWriteCompletes();
-			Assert.AreEqual(0, writeRequests.Count());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/async_read_stream_events_backward_with_cancelled_read.cs b/src/EventStore.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/async_read_stream_events_backward_with_cancelled_read.cs
deleted file mode 100644
index 897655a72bb..00000000000
--- a/src/EventStore.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/async_read_stream_events_backward_with_cancelled_read.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Core.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Helpers.IODispatcherTests.ReadEventsTests {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class async_read_stream_events_backward_with_cancelled_read<TLogFormat, TStreamId> : with_read_io_dispatcher<TLogFormat, TStreamId> {
-		private bool _hasTimedOut;
-		private bool _hasRead;
-		private bool _eventSet;
-
-		[OneTimeSetUp]
-		public override void TestFixtureSetUp() {
-			base.TestFixtureSetUp();
-			var mre = new ManualResetEvent(false);
-			var step = _ioDispatcher.BeginReadBackward(
-				_cancellationScope, _eventStreamId, _fromEventNumber, _maxCount, true, _principal,
-				res => {
-					_hasRead = true;
-					mre.Set();
-				},
-				() => {
-					_hasTimedOut = true;
-					mre.Set();
-				}
-			);
-
-			IODispatcherAsync.Run(step);
-			_cancellationScope.Cancel();
-			_eventSet = mre.WaitOne(TimeSpan.FromSeconds(5));
-		}
-
-		[Test]
-		public void should_ignore_read() {
-			Assert.IsFalse(_eventSet);
-			Assert.IsFalse(_hasRead, "Should not have completed read before replying on read message");
-			_readBackward.Envelope.ReplyWith(CreateReadStreamEventsBackwardCompleted(_readBackward));
-			Assert.IsFalse(_hasRead);
-		}
-
-		[Test]
-		public void should_ignore_timeout_message() {
-			Assert.IsFalse(_hasTimedOut, "Should not have timed out before replying on timeout message");
-			_timeoutMessage.Reply();
-			Assert.IsFalse(_hasTimedOut);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/async_read_stream_events_forward_with_cancelled_read.cs b/src/EventStore.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/async_read_stream_events_forward_with_cancelled_read.cs
deleted file mode 100644
index 679fec218a8..00000000000
--- a/src/EventStore.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/async_read_stream_events_forward_with_cancelled_read.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Core.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Helpers.IODispatcherTests.ReadEventsTests {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class async_read_stream_events_forward_with_cancelled_read<TLogFormat, TStreamId> : with_read_io_dispatcher<TLogFormat, TStreamId> {
-		private bool _hasTimedOut;
-		private bool _hasRead;
-		private bool _eventSet;
-
-		[OneTimeSetUp]
-		public override void TestFixtureSetUp() {
-			base.TestFixtureSetUp();
-			var mre = new ManualResetEvent(false);
-			var step = _ioDispatcher.BeginReadForward(
-				_cancellationScope, _eventStreamId, _fromEventNumber, _maxCount, true, _principal,
-				res => {
-					_hasRead = true;
-					mre.Set();
-				},
-				() => {
-					_hasTimedOut = true;
-					mre.Set();
-				}
-			);
-
-			IODispatcherAsync.Run(step);
-			_cancellationScope.Cancel();
-			_eventSet = mre.WaitOne(TimeSpan.FromSeconds(5));
-		}
-
-		[Test]
-		public void should_ignore_read() {
-			Assert.IsFalse(_eventSet);
-			Assert.IsFalse(_hasRead, "Should not have completed read before replying on read message");
-			_readForward.Envelope.ReplyWith(CreateReadStreamEventsForwardCompleted(_readForward));
-			Assert.IsFalse(_hasRead);
-		}
-
-		[Test]
-		public void should_ignore_timeout_message() {
-			Assert.IsFalse(_hasTimedOut, "Should not have timed out before replying on timeout message");
-			_timeoutMessage.Reply();
-			Assert.IsFalse(_hasTimedOut);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_backward_with_successful_read.cs b/src/EventStore.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_backward_with_successful_read.cs
deleted file mode 100644
index 86175dbc183..00000000000
--- a/src/EventStore.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_backward_with_successful_read.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Helpers.IODispatcherTests.ReadEventsTests {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class async_read_stream_events_backward_with_successful_read<TLogFormat, TStreamId> : with_read_io_dispatcher<TLogFormat, TStreamId> {
-		private ClientMessage.ReadStreamEventsBackwardCompleted _result;
-		private bool _hasTimedOut;
-
-		[OneTimeSetUp]
-		public override void TestFixtureSetUp() {
-			base.TestFixtureSetUp();
-			var mre = new ManualResetEvent(false);
-			var step = _ioDispatcher.BeginReadBackward(
-				_cancellationScope, _eventStreamId, _fromEventNumber, _maxCount, true, _principal,
-				res => {
-					_result = res;
-					mre.Set();
-				},
-				() => {
-					_hasTimedOut = true;
-					mre.Set();
-				}
-			);
-
-			IODispatcherAsync.Run(step);
-
-			_readBackward.Envelope.ReplyWith(CreateReadStreamEventsBackwardCompleted(_readBackward));
-			mre.WaitOne(TimeSpan.FromSeconds(10));
-		}
-
-		[Test]
-		public void should_get_read_result() {
-			Assert.IsNotNull(_result);
-			Assert.AreEqual(_maxCount, _result.Events.Length, "Event count");
-			Assert.AreEqual(_eventStreamId, _result.Events[0].OriginalStreamId, "Stream Id");
-			Assert.AreEqual(_fromEventNumber, _result.Events[_maxCount - 1].OriginalEventNumber, "From event number");
-		}
-
-		[Test]
-		public void should_ignore_timeout_message() {
-			Assert.IsFalse(_hasTimedOut, "Should not have timed out before replying on timeout message");
-			_timeoutMessage.Reply();
-			Assert.IsFalse(_hasTimedOut);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_stream_events_backward_with_successful_read<TLogFormat, TStreamId> : with_read_io_dispatcher<TLogFormat, TStreamId> {
-		private ClientMessage.ReadStreamEventsBackwardCompleted _result;
-		private bool _hasTimedOut;
-
-		[OneTimeSetUp]
-		public override void TestFixtureSetUp() {
-			base.TestFixtureSetUp();
-
-			var mre = new ManualResetEvent(false);
-			_ioDispatcher.ReadBackward(
-				_eventStreamId, _fromEventNumber, _maxCount, true, _principal,
-				res => {
-					_result = res;
-					mre.Set();
-				},
-				() => {
-					_hasTimedOut = true;
-					mre.Set();
-				},
-				Guid.NewGuid()
-			);
-
-			_readBackward.Envelope.ReplyWith(CreateReadStreamEventsBackwardCompleted(_readBackward));
-			mre.WaitOne(TimeSpan.FromSeconds(10));
-		}
-
-		[Test]
-		public void should_get_read_result() {
-			Assert.IsNotNull(_result);
-			Assert.AreEqual(_maxCount, _result.Events.Length, "Event count");
-			Assert.AreEqual(_eventStreamId, _result.Events[0].OriginalStreamId, "Stream Id");
-			Assert.AreEqual(_fromEventNumber, _result.Events[_maxCount - 1].OriginalEventNumber, "From event number");
-		}
-
-		[Test]
-		public void should_ignore_timeout_message() {
-			Assert.IsFalse(_hasTimedOut, "Should not have timed out before replying on timeout message");
-			_timeoutMessage.Reply();
-			Assert.IsFalse(_hasTimedOut);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_backward_with_timeout_on_read.cs b/src/EventStore.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_backward_with_timeout_on_read.cs
deleted file mode 100644
index 03dfaba46c0..00000000000
--- a/src/EventStore.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_backward_with_timeout_on_read.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Core.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Helpers.IODispatcherTests.ReadEventsTests {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class async_read_stream_events_backward_with_timeout_on_read<TLogFormat, TStreamId> : with_read_io_dispatcher<TLogFormat, TStreamId> {
-		private bool _didTimeout;
-		private bool _didReceiveRead;
-
-		[OneTimeSetUp]
-		public override void TestFixtureSetUp() {
-			base.TestFixtureSetUp();
-			var mre = new ManualResetEvent(false);
-			var step = _ioDispatcher.BeginReadBackward(
-				_cancellationScope, _eventStreamId, _fromEventNumber, _maxCount, true, _principal,
-				res => {
-					_didReceiveRead = true;
-					mre.Set();
-				},
-				() => {
-					_didTimeout = true;
-					mre.Set();
-				}
-			);
-			IODispatcherAsync.Run(step);
-			Assert.IsNotNull(_timeoutMessage, "Expected TimeoutMessage to not be null");
-
-			_timeoutMessage.Reply();
-			mre.WaitOne(TimeSpan.FromSeconds(10));
-		}
-
-		[Test]
-		public void should_call_timeout_handler() {
-			Assert.IsTrue(_didTimeout);
-		}
-
-		[Test]
-		public void should_ignore_read_complete() {
-			Assert.IsFalse(_didReceiveRead, "Should not have received read completed before replying on message");
-			_readBackward.Envelope.ReplyWith(CreateReadStreamEventsBackwardCompleted(_readBackward));
-			Assert.IsFalse(_didReceiveRead);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_stream_events_backward_with_timeout_on_read<TLogFormat, TStreamId> : with_read_io_dispatcher<TLogFormat, TStreamId> {
-		private bool _didTimeout;
-		private bool _didReceiveRead;
-
-		[OneTimeSetUp]
-		public override void TestFixtureSetUp() {
-			base.TestFixtureSetUp();
-
-			var mre = new ManualResetEvent(false);
-			_ioDispatcher.ReadBackward(
-				_eventStreamId, _fromEventNumber, _maxCount, true, _principal,
-				res => {
-					_didReceiveRead = true;
-					mre.Set();
-				},
-				() => {
-					_didTimeout = true;
-					mre.Set();
-				},
-				Guid.NewGuid()
-			);
-			Assert.IsNotNull(_timeoutMessage, "Expected TimeoutMessage to not be null");
-
-			_timeoutMessage.Reply();
-			mre.WaitOne(TimeSpan.FromSeconds(10));
-		}
-
-		[Test]
-		public void should_call_timeout_handler() {
-			Assert.IsTrue(_didTimeout);
-		}
-
-		[Test]
-		public void should_ignore_read_complete() {
-			Assert.IsFalse(_didReceiveRead, "Should not have received read completed before replying on message");
-			_readBackward.Envelope.ReplyWith(CreateReadStreamEventsBackwardCompleted(_readBackward));
-			Assert.IsFalse(_didReceiveRead);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_forward_with_successful_read.cs b/src/EventStore.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_forward_with_successful_read.cs
deleted file mode 100644
index bb9f2f722fe..00000000000
--- a/src/EventStore.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_forward_with_successful_read.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Helpers.IODispatcherTests.ReadEventsTests {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class async_read_stream_events_forward_with_successful_read<TLogFormat, TStreamId> : with_read_io_dispatcher<TLogFormat, TStreamId> {
-		private ClientMessage.ReadStreamEventsForwardCompleted _result;
-		private bool _hasTimedOut;
-
-		[OneTimeSetUp]
-		public override void TestFixtureSetUp() {
-			base.TestFixtureSetUp();
-			var mre = new ManualResetEvent(false);
-			var step = _ioDispatcher.BeginReadForward(
-				_cancellationScope, _eventStreamId, _fromEventNumber, _maxCount, true, _principal,
-				res => {
-					_result = res;
-					mre.Set();
-				},
-				() => {
-					_hasTimedOut = true;
-					mre.Set();
-				}
-			);
-
-			IODispatcherAsync.Run(step);
-
-			_readForward.Envelope.ReplyWith(CreateReadStreamEventsForwardCompleted(_readForward));
-			mre.WaitOne(TimeSpan.FromSeconds(10));
-		}
-
-		[Test]
-		public void should_get_read_result() {
-			Assert.IsNotNull(_result);
-			Assert.AreEqual(_maxCount, _result.Events.Length, "Event count");
-			Assert.AreEqual(_eventStreamId, _result.Events[0].OriginalStreamId, "Stream Id");
-			Assert.AreEqual(_fromEventNumber, _result.Events[0].OriginalEventNumber, "From event number");
-		}
-
-		[Test]
-		public void should_ignore_timeout_message() {
-			Assert.IsFalse(_hasTimedOut, "Should not have timed out before replying on timeout message");
-			_timeoutMessage.Reply();
-			Assert.IsFalse(_hasTimedOut);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_stream_events_forward_with_successful_read<TLogFormat, TStreamId> : with_read_io_dispatcher<TLogFormat, TStreamId> {
-		private ClientMessage.ReadStreamEventsForwardCompleted _result;
-		private bool _hasTimedOut;
-
-		[OneTimeSetUp]
-		public override void TestFixtureSetUp() {
-			base.TestFixtureSetUp();
-			var mre = new ManualResetEvent(false);
-			_ioDispatcher.ReadForward(
-				_eventStreamId, _fromEventNumber, _maxCount, true, _principal,
-				res => {
-					_result = res;
-					mre.Set();
-				},
-				() => {
-					_hasTimedOut = true;
-					mre.Set();
-				},
-				Guid.NewGuid()
-			);
-
-			_readForward.Envelope.ReplyWith(CreateReadStreamEventsForwardCompleted(_readForward));
-			mre.WaitOne(TimeSpan.FromSeconds(10));
-		}
-
-		[Test]
-		public void should_get_read_result() {
-			Assert.IsNotNull(_result);
-			Assert.AreEqual(_maxCount, _result.Events.Length, "Event count");
-			Assert.AreEqual(_eventStreamId, _result.Events[0].OriginalStreamId, "Stream Id");
-			Assert.AreEqual(_fromEventNumber, _result.Events[0].OriginalEventNumber, "From event number");
-		}
-
-		[Test]
-		public void should_ignore_timeout_message() {
-			Assert.IsFalse(_hasTimedOut, "Should not have timed out before replying on timeout message");
-			_timeoutMessage.Reply();
-			Assert.IsFalse(_hasTimedOut);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_forward_with_timeout_on_read.cs b/src/EventStore.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_forward_with_timeout_on_read.cs
deleted file mode 100644
index 8f4c39c0169..00000000000
--- a/src/EventStore.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_forward_with_timeout_on_read.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Core.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Helpers.IODispatcherTests.ReadEventsTests {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class async_read_stream_events_forward_with_timeout_on_read<TLogFormat, TStreamId> : with_read_io_dispatcher<TLogFormat, TStreamId> {
-		private bool _didTimeout;
-		private bool _didReceiveRead;
-
-		[OneTimeSetUp]
-		public override void TestFixtureSetUp() {
-			base.TestFixtureSetUp();
-
-			var mre = new ManualResetEvent(false);
-			var step = _ioDispatcher.BeginReadForward(
-				_cancellationScope, _eventStreamId, _fromEventNumber, _maxCount, true, _principal,
-				res => {
-					_didReceiveRead = true;
-					mre.Set();
-				},
-				() => {
-					_didTimeout = true;
-					mre.Set();
-				}
-			);
-			IODispatcherAsync.Run(step);
-			Assert.IsNotNull(_timeoutMessage, "Expected TimeoutMessage to not be null");
-
-			_timeoutMessage.Reply();
-			mre.WaitOne(TimeSpan.FromSeconds(10));
-		}
-
-		[Test]
-		public void should_call_timeout_handler() {
-			Assert.IsTrue(_didTimeout);
-		}
-
-		[Test]
-		public void should_ignore_read_complete() {
-			Assert.IsFalse(_didReceiveRead, "Should not have received read completed before replying on message");
-			_readForward.Envelope.ReplyWith(CreateReadStreamEventsForwardCompleted(_readForward));
-			Assert.IsFalse(_didReceiveRead);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class read_stream_events_forward_with_timeout_on_read<TLogFormat, TStreamId> : with_read_io_dispatcher<TLogFormat, TStreamId> {
-		private bool _didTimeout;
-		private bool _didReceiveRead;
-
-		[OneTimeSetUp]
-		public override void TestFixtureSetUp() {
-			base.TestFixtureSetUp();
-			var mre = new ManualResetEvent(false);
-			_ioDispatcher.ReadForward(
-				_eventStreamId, _fromEventNumber, _maxCount, true, _principal,
-				res => {
-					_didReceiveRead = true;
-					mre.Set();
-				},
-				() => {
-					_didTimeout = true;
-					mre.Set();
-				},
-				Guid.NewGuid()
-			);
-			Assert.IsNotNull(_timeoutMessage, "Expected TimeoutMessage to not be null");
-
-			_timeoutMessage.Reply();
-			mre.WaitOne(TimeSpan.FromSeconds(10));
-		}
-
-		[Test]
-		public void should_call_timeout_handler() {
-			Assert.IsTrue(_didTimeout);
-		}
-
-		[Test]
-		public void should_ignore_read_complete() {
-			Assert.IsFalse(_didReceiveRead, "Should not have received read completed before replying on message");
-			_readForward.Envelope.ReplyWith(CreateReadStreamEventsForwardCompleted(_readForward));
-			Assert.IsFalse(_didReceiveRead);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/with_read_io_dispatcher.cs b/src/EventStore.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/with_read_io_dispatcher.cs
deleted file mode 100644
index b50c27bdd6f..00000000000
--- a/src/EventStore.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/with_read_io_dispatcher.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System;
-using System.Security.Claims;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.Services.TimerService;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Helpers.IODispatcherTests.ReadEventsTests {
-	public abstract class with_read_io_dispatcher<TLogFormat, TStreamId> : IHandle<ClientMessage.ReadStreamEventsForward>,
-		IHandle<ClientMessage.ReadStreamEventsBackward>,
-		IHandle<TimerMessage.Schedule> {
-		protected IODispatcher _ioDispatcher;
-		protected readonly ClaimsPrincipal _principal = SystemAccounts.System;
-		protected readonly SynchronousScheduler _bus = new();
-
-		protected readonly IODispatcherAsync.CancellationScope _cancellationScope = new();
-
-		protected ClientMessage.ReadStreamEventsForward _readForward;
-		protected ClientMessage.ReadStreamEventsBackward _readBackward;
-		protected TimerMessage.Schedule _timeoutMessage;
-
-		protected readonly int _maxCount = 1;
-		protected readonly int _fromEventNumber = 10;
-		protected readonly string _eventStreamId = "test";
-
-		[OneTimeSetUp]
-		public virtual void TestFixtureSetUp() {
-			var _queue = new QueuedHandlerThreadPool(_bus,"TestQueuedHandler", new QueueStatsManager(), new());
-			_ioDispatcher = new IODispatcher(_bus, _queue);
-			IODispatcherTestHelpers.SubscribeIODispatcher(_ioDispatcher, _bus);
-			_bus.Subscribe<ClientMessage.ReadStreamEventsForward>(this);
-			_bus.Subscribe<ClientMessage.ReadStreamEventsBackward>(this);
-			_bus.Subscribe<TimerMessage.Schedule>(this);
-			_queue.Start();
-		}
-
-		public virtual void Handle(ClientMessage.ReadStreamEventsForward message) {
-			_readForward = message;
-		}
-
-		public virtual void Handle(ClientMessage.ReadStreamEventsBackward message) {
-			_readBackward = message;
-		}
-
-		public virtual void Handle(TimerMessage.Schedule message) {
-			_timeoutMessage = message;
-		}
-
-		public ClientMessage.ReadStreamEventsForwardCompleted CreateReadStreamEventsForwardCompleted(
-			ClientMessage.ReadStreamEventsForward msg) {
-			var lastEventNumber = msg.FromEventNumber + 1;
-			var nextEventNumber = lastEventNumber + 1;
-			var events =
-				IODispatcherTestHelpers.CreateResolvedEvent<TLogFormat, TStreamId>(msg.EventStreamId, "event_type", "test", eventNumber: 10);
-			var res = new ClientMessage.ReadStreamEventsForwardCompleted(msg.CorrelationId, msg.EventStreamId,
-				msg.FromEventNumber,
-				msg.MaxCount, ReadStreamResult.Success, events, null, false, String.Empty, nextEventNumber,
-				lastEventNumber, false, 0);
-			return res;
-		}
-
-		public ClientMessage.ReadStreamEventsBackwardCompleted CreateReadStreamEventsBackwardCompleted(
-			ClientMessage.ReadStreamEventsBackward msg) {
-			var startEventNumber = msg.FromEventNumber;
-			var nextEventNumber = startEventNumber - 1;
-			var events =
-				IODispatcherTestHelpers.CreateResolvedEvent<TLogFormat, TStreamId>(msg.EventStreamId, "event_type", "test", eventNumber: 10);
-			var res = new ClientMessage.ReadStreamEventsBackwardCompleted(msg.CorrelationId, msg.EventStreamId,
-				msg.FromEventNumber,
-				msg.MaxCount, ReadStreamResult.Success, events, null, false, String.Empty, nextEventNumber,
-				startEventNumber, false, 0);
-			return res;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/LengthPrefixSuffixFramer.cs b/src/EventStore.Core.Tests/Helpers/LengthPrefixSuffixFramer.cs
deleted file mode 100644
index 010c78979eb..00000000000
--- a/src/EventStore.Core.Tests/Helpers/LengthPrefixSuffixFramer.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using EventStore.Core.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Helpers {
-	[TestFixture]
-	public class length_prefix_suffix_framer_should {
-		[Test]
-		public void correctly_frame_byte_array() {
-			var framer = new LengthPrefixSuffixFramer();
-			var data = new byte[] {0x7, 0x17, 0x27};
-			var framedData = MergeBytes(framer.FrameData(new ArraySegment<byte>(data)));
-
-			Assert.AreEqual(11, framedData.Length);
-
-			Assert.AreEqual(0x03, framedData[0]);
-			Assert.AreEqual(0x00, framedData[1]);
-			Assert.AreEqual(0x00, framedData[2]);
-			Assert.AreEqual(0x00, framedData[3]);
-
-			Assert.AreEqual(0x07, framedData[4]);
-			Assert.AreEqual(0x17, framedData[5]);
-			Assert.AreEqual(0x27, framedData[6]);
-
-			Assert.AreEqual(0x03, framedData[7]);
-			Assert.AreEqual(0x00, framedData[8]);
-			Assert.AreEqual(0x00, framedData[9]);
-			Assert.AreEqual(0x00, framedData[10]);
-		}
-
-		private byte[] MergeBytes(IEnumerable<ArraySegment<byte>> frameData) {
-			var bytes = new List<byte>();
-			foreach (var segm in frameData) {
-				for (int i = segm.Offset; i < segm.Offset + segm.Count; ++i) {
-					bytes.Add(segm.Array[i]);
-				}
-			}
-
-			return bytes.ToArray();
-		}
-
-		[Test]
-		public void unframe_record_when_provided_exactly_enough_data_in_one_call() {
-			int unframedCnt = 0;
-			var framer = new LengthPrefixSuffixFramer();
-			framer.RegisterMessageArrivedCallback(r => {
-				unframedCnt += 1;
-				Assert.AreEqual(new byte[] {0x07, 0x17, 0x27}, ReadAll(r));
-			});
-
-			framer.UnFrameData(new ArraySegment<byte>(new byte[] {
-				0x03, 0x00, 0x00, 0x00,
-				0x07, 0x17, 0x27,
-				0x03, 0x00, 0x00, 0x00
-			}));
-
-			Assert.AreEqual(1, unframedCnt);
-		}
-
-		[Test]
-		public void unframe_record_when_provided_with_small_chunks_of_data_at_a_time() {
-			int unframedCnt = 0;
-			var framer = new LengthPrefixSuffixFramer();
-			framer.RegisterMessageArrivedCallback(r => {
-				unframedCnt += 1;
-				Assert.AreEqual(new byte[] {0x07, 0x17, 0x27}, ReadAll(r));
-			});
-
-			framer.UnFrameData(new ArraySegment<byte>(new byte[] {0x03, 0x00}));
-			framer.UnFrameData(new ArraySegment<byte>(new byte[] {0x00, 0x00}));
-			framer.UnFrameData(new ArraySegment<byte>(new byte[] {0x07, 0x17, 0x27}));
-			framer.UnFrameData(new ArraySegment<byte>(new byte[] {0x03, 0x00}));
-
-			Assert.AreEqual(0, unframedCnt);
-			framer.UnFrameData(new ArraySegment<byte>(new byte[] {0x00, 0x00}));
-			Assert.AreEqual(1, unframedCnt);
-		}
-
-		[Test]
-		public void unframe_two_consecutive_records() {
-			int unframedCnt = 0;
-			var framer = new LengthPrefixSuffixFramer();
-			framer.RegisterMessageArrivedCallback(r => {
-				if (unframedCnt == 0)
-					Assert.AreEqual(new byte[] {0x07, 0x17, 0x27}, ReadAll(r));
-				else if (unframedCnt == 1)
-					Assert.AreEqual(new byte[] {0x05, 0x15}, ReadAll(r));
-				else
-					Assert.Fail();
-
-				unframedCnt += 1;
-			});
-
-			framer.UnFrameData(new ArraySegment<byte>(new byte[] {
-				0x03, 0x00, 0x00, 0x00,
-				0x07, 0x17, 0x27
-			}));
-
-			Assert.AreEqual(0, unframedCnt);
-
-			framer.UnFrameData(new ArraySegment<byte>(new byte[] {
-				0x03, 0x00, 0x00, 0x00,
-				0x02, 0x00, 0x00, 0x00,
-				0x05, 0x15
-			}));
-
-			Assert.AreEqual(1, unframedCnt);
-
-			framer.UnFrameData(new ArraySegment<byte>(new byte[] {0x02, 0x00, 0x00, 0x00}));
-
-			Assert.AreEqual(2, unframedCnt);
-		}
-
-		[Test]
-		public void discard_data_when_reset_and_continue_unframing_from_blank_slate() {
-			int unframedCnt = 0;
-			var framer = new LengthPrefixSuffixFramer();
-			framer.RegisterMessageArrivedCallback(r => {
-				if (unframedCnt == 0)
-					Assert.AreEqual(new byte[] {0x07, 0x17, 0x27}, ReadAll(r));
-				else if (unframedCnt == 1)
-					Assert.AreEqual(new byte[] {0x05, 0x15}, ReadAll(r));
-				else
-					Assert.Fail();
-
-				unframedCnt += 1;
-			});
-
-			framer.UnFrameData(new ArraySegment<byte>(new byte[] {
-				0x03, 0x00, 0x00, 0x00,
-				0x07, 0x17, 0x27,
-				0x03, 0x00, 0x00, 0x00,
-				0xAA, 0xBB, 0xCC, 0x00,
-				0x01, 0x02, 0x03, 0x04,
-				0x05, 0x06, 0x07, 0x08
-			}));
-
-			Assert.AreEqual(1, unframedCnt);
-
-			framer.Reset();
-
-			framer.UnFrameData(new ArraySegment<byte>(new byte[] {
-				0x02, 0x00, 0x00, 0x00,
-				0x05, 0x15,
-				0x02, 0x00, 0x00, 0x00
-			}));
-
-			Assert.AreEqual(2, unframedCnt);
-		}
-
-		private byte[] ReadAll(BinaryReader br) {
-			var buf = new byte[100000];
-			int read = br.Read(buf, 0, buf.Length);
-
-			var res = new byte[read];
-			Buffer.BlockCopy(buf, 0, res, 0, read);
-			return res;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/ManualQueue.cs b/src/EventStore.Core.Tests/Helpers/ManualQueue.cs
deleted file mode 100644
index 3d5caae3309..00000000000
--- a/src/EventStore.Core.Tests/Helpers/ManualQueue.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using System.Linq;
-
-namespace EventStore.Core.Tests.Helpers {
-	public class ManualQueue : IPublisher, IHandle<TimerMessage.Schedule> {
-		private readonly Queue<Message> _queue = new();
-		private readonly SynchronousScheduler _bus;
-		private readonly ITimeProvider _time;
-		private readonly List<InternalSchedule> _timerQueue = new();
-		private bool _timerDisabled;
-
-		public ManualQueue(SynchronousScheduler bus, ITimeProvider time) {
-			_bus = bus;
-			_time = time;
-			_bus.Subscribe<TimerMessage.Schedule>(this);
-		}
-
-		public void Publish(Message message) {
-			_queue.Enqueue(message);
-		}
-
-		public int Process() {
-			ProcessTimer();
-			return ProcessNonTimer();
-		}
-
-		public int ProcessNonTimer() {
-			var count = 0;
-			while (_queue.Count > 0) {
-				var message = _queue.Dequeue();
-				_bus.Publish(message);
-				count++;
-				if (count > 1000)
-					throw new Exception("Possible infinite message loop");
-			}
-
-			return count;
-		}
-
-		public void ProcessTimer() {
-			if (!_timerDisabled) {
-				var orderedTimerMessages = _timerQueue.OrderBy(v => v.Scheduled.Add(v.Message.TriggerAfter)).ToArray();
-				_timerQueue.Clear();
-				foreach (var timerMessage in orderedTimerMessages) {
-					if (timerMessage.Scheduled.Add(timerMessage.Message.TriggerAfter) <= _time.UtcNow)
-						timerMessage.Message.Reply();
-					else
-						_timerQueue.Add(timerMessage);
-				}
-			}
-		}
-
-		public IEnumerable<TimerMessage.Schedule> TimerMessagesOfType<T>() {
-			foreach (var message in _timerQueue) {
-				if (message.Message.ReplyMessage is T) {
-					yield return message.Message;
-				}
-			}
-		}
-
-		public void DisableTimer() {
-			_timerDisabled = true;
-		}
-
-		public void EnableTimer(bool process = true) {
-			_timerDisabled = false;
-			if (process)
-				Process();
-		}
-
-		private class InternalSchedule {
-			public readonly TimerMessage.Schedule Message;
-			public readonly DateTime Scheduled;
-
-			public InternalSchedule(TimerMessage.Schedule message, DateTime scheduled) {
-				Message = message;
-				Scheduled = scheduled;
-			}
-		}
-
-		public void Handle(TimerMessage.Schedule message) {
-			_timerQueue.Add(new InternalSchedule(message, _time.UtcNow));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/MiniClusterNode.cs b/src/EventStore.Core.Tests/Helpers/MiniClusterNode.cs
deleted file mode 100644
index ca26f9a6d5c..00000000000
--- a/src/EventStore.Core.Tests/Helpers/MiniClusterNode.cs
+++ /dev/null
@@ -1,308 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Net;
-using System.Net.Http;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading.Tasks;
-using EventStore.Common.Options;
-using EventStore.Common.Utils;
-using EventStore.Core.Authentication;
-using EventStore.Core.Authentication.InternalAuthentication;
-using EventStore.Core.Authorization;
-using EventStore.Core.Bus;
-using EventStore.Core.Certificates;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Monitoring;
-using EventStore.Core.Tests.Http;
-using EventStore.Core.Tests.Services.Transport.Tcp;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.Data;
-using EventStore.Core.Services.PersistentSubscription.ConsumerStrategy;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Server.Kestrel.Core;
-using Microsoft.AspNetCore.Server.Kestrel.Https;
-using ILogger = Serilog.ILogger;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Plugins.Subsystems;
-using EventStore.TcpUnitTestPlugin;
-using Microsoft.Extensions.Configuration;
-using RuntimeInformation = System.Runtime.RuntimeInformation;
-
-namespace EventStore.Core.Tests.Helpers {
-	public class MiniClusterNode<TLogFormat, TStreamId> {
-		public static int RunCount = 0;
-		public static readonly Stopwatch RunningTime = new Stopwatch();
-		public static readonly Stopwatch StartingTime = new Stopwatch();
-		public static readonly Stopwatch StoppingTime = new Stopwatch();
-
-		private static readonly ILogger Log = Serilog.Log.ForContext<MiniClusterNode<TLogFormat, TStreamId>>();
-
-		public IPEndPoint InternalTcpEndPoint { get; }
-		public IPEndPoint ExternalTcpEndPoint { get; }
-		public IPEndPoint HttpEndPoint { get; }
-
-		public readonly int DebugIndex;
-
-		public readonly ClusterVNode Node;
-		public TFChunkDb Db => Node.Db;
-		private readonly string _dbPath;
-		private readonly bool _isReadOnlyReplica;
-		private readonly TaskCompletionSource<bool> _started = new();
-		private readonly TaskCompletionSource<bool> _adminUserCreated = new();
-
-		public Task Started => _started.Task;
-		public Task AdminUserCreated => _adminUserCreated.Task;
-
-		public VNodeState NodeState = VNodeState.Unknown;
-		private readonly IWebHost _host;
-
-		private static bool EnableHttps() => !RuntimeInformation.IsOSX;
-
-        public MiniClusterNode(string pathname, int debugIndex, IPEndPoint internalTcp, IPEndPoint externalTcp,
-			IPEndPoint httpEndPoint, EndPoint[] gossipSeeds, ISubsystem[] subsystems = null,
-			bool enableTrustedAuth = false, int memTableSize = 1000, bool inMemDb = true,
-			bool disableFlushToDisk = false, bool readOnlyReplica = false, int nodePriority = 0,
-			string intHostAdvertiseAs = null, IExpiryStrategy expiryStrategy = null) {
-
-			if (RuntimeInformation.IsOSX) {
-				AppContext.SetSwitch("System.Net.Http.SocketsHttpHandler.Http2UnencryptedSupport",
-					true); //TODO JPB Remove this sadness when dotnet core supports kestrel + http2 on macOS
-			}
-
-			RunningTime.Start();
-			RunCount += 1;
-
-			DebugIndex = debugIndex;
-			InternalTcpEndPoint = internalTcp;
-			ExternalTcpEndPoint = externalTcp;
-			HttpEndPoint = httpEndPoint;
-
-			_dbPath = Path.Combine(
-				pathname,
-				$"mini-cluster-node-db-{externalTcp.Port}-{httpEndPoint.Port}");
-
-			Directory.CreateDirectory(_dbPath);
-			FileStreamExtensions.ConfigureFlush(disableFlushToDisk);
-
-			var useHttps = EnableHttps();
-
-			subsystems ??= [];
-			subsystems = [..subsystems, new TcpApiTestPlugin()];
-
-			var options = new ClusterVNodeOptions {
-				Application = new() {
-					AllowAnonymousEndpointAccess = true,
-					AllowAnonymousStreamAccess = true,
-					Insecure = !useHttps,
-					WorkerThreads = 1,
-					StatsPeriodSec = (int)TimeSpan.FromHours(1).TotalSeconds
-				},
-				Cluster = new() {
-					DiscoverViaDns = false,
-					ClusterDns = string.Empty,
-					GossipSeed = gossipSeeds,
-					ClusterSize = 3,
-					NodePriority = nodePriority,
-					GossipIntervalMs = 2_000,
-					GossipAllowedDifferenceMs = 1_000,
-					GossipTimeoutMs = 2_000,
-					DeadMemberRemovalPeriodSec = 1_800_000,
-					ReadOnlyReplica = readOnlyReplica,
-					Archiver = false,
-					StreamInfoCacheCapacity = 10_000
-				},
-				Interface = new() {
-					ReplicationIp = InternalTcpEndPoint.Address,
-					NodeIp = ExternalTcpEndPoint.Address,
-					ReplicationPort = InternalTcpEndPoint.Port,
-					NodePort = HttpEndPoint.Port,
-					DisableInternalTcpTls = false,
-					ReplicationHeartbeatTimeout = 2_000,
-					ReplicationHeartbeatInterval = 2_000,
-					EnableAtomPubOverHttp = true,
-					EnableTrustedAuth = enableTrustedAuth,
-					ReplicationHostAdvertiseAs = intHostAdvertiseAs
-				},
-				Database = new() {
-					MinFlushDelayMs = TFConsts.MinFlushDelayMs.TotalMilliseconds,
-					PrepareTimeoutMs = 10_000,
-					CommitTimeoutMs = 10_000,
-					WriteTimeoutMs = 10_000,
-					StatsStorage = StatsStorage.None,
-					DisableScavengeMerging = true,
-					ScavengeHistoryMaxAge = 30,
-					SkipDbVerify = true,
-					MaxMemTableSize = memTableSize,
-					MemDb = inMemDb,
-					Db = _dbPath,
-					ChunkSize = MiniNode.ChunkSize,
-					ChunksCacheSize = MiniNode.CachedChunkSize,
-					StreamExistenceFilterSize = 10_000
-				},
-				Projection = new() {
-					RunProjections = ProjectionType.None
-				},
-				PlugableComponents = subsystems
-			};
-
-			var inMemConf = new ConfigurationBuilder()
-				.AddInMemoryCollection(new KeyValuePair<string, string>[] {
-					new("EventStore:TcpPlugin:NodeTcpPort", externalTcp.Port.ToString()),
-					new("EventStore:TcpPlugin:EnableExternalTcp", "true"),
-					new("EventStore:TcpUnitTestPlugin:NodeTcpPort", externalTcp.Port.ToString()),
-					new("EventStore:TcpUnitTestPlugin:NodeHeartbeatInterval", "10000"),
-					new("EventStore:TcpUnitTestPlugin:NodeHeartbeatTimeout", "10000"),
-					new("EventStore:TcpUnitTestPlugin:Insecure", options.Application.Insecure.ToString()),
-				}).Build();
-			var serverCertificate = useHttps ? ssl_connections.GetServerCertificate() : null;
-			var trustedRootCertificates =
-				useHttps ? new X509Certificate2Collection(ssl_connections.GetRootCertificate()) : null;
-			options = useHttps
-				? options.Secure(trustedRootCertificates, serverCertificate)
-				: options;
-
-			_isReadOnlyReplica = readOnlyReplica;
-
-			Log.Information(
-				"\n{0,-25} {1} ({2}/{3}, {4})\n" + "{5,-25} {6} ({7})\n" + "{8,-25} {9} ({10}-bit)\n"
-				+ "{11,-25} {12}\n" + "{13,-25} {14}\n" + "{15,-25} {16}\n" + "{17,-25} {18}\n\n",
-				"ES VERSION:", VersionInfo.Version, VersionInfo.Edition, VersionInfo.CommitSha, VersionInfo.Timestamp,
-				"OS:", RuntimeInformation.OsPlatform, Environment.OSVersion, "RUNTIME:", RuntimeInformation.RuntimeVersion,
-				RuntimeInformation.RuntimeMode, "GC:",
-				GC.MaxGeneration == 0
-					? "NON-GENERATION (PROBABLY BOEHM)"
-					: $"{GC.MaxGeneration + 1} GENERATIONS", "DBPATH:", _dbPath, "ExTCP ENDPOINT:",
-				ExternalTcpEndPoint, "ExHTTP ENDPOINT:", HttpEndPoint);
-
-			var logFormatFactory = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory;
-			Node = new ClusterVNode<TStreamId>(options, logFormatFactory, new AuthenticationProviderFactory(
-					components =>
-						new InternalAuthenticationProviderFactory(components, options.DefaultUser)),
-				new AuthorizationProviderFactory(components =>
-					new InternalAuthorizationProviderFactory([new LegacyPolicySelectorFactory(
-						options.Application.AllowAnonymousEndpointAccess,
-						options.Application.AllowAnonymousStreamAccess,
-						options.Application.OverrideAnonymousEndpointAccessForGossip).Create(components.MainQueue, default)])),
-				Array.Empty<IPersistentSubscriptionConsumerStrategyFactory>(),
-				new OptionsCertificateProvider(),
-				configuration: inMemConf,
-				expiryStrategy,
-				Guid.NewGuid(), debugIndex);
-			Node.HttpService.SetupController(new TestController(Node.MainQueue));
-
-			_host = new WebHostBuilder()
-				.UseKestrel(o => {
-					o.Listen(HttpEndPoint, options => {
-						if (RuntimeInformation.IsOSX) {
-							options.Protocols = HttpProtocols.Http2;
-						} else {
-							options.UseHttps(new HttpsConnectionAdapterOptions {
-								ServerCertificate = serverCertificate,
-								ClientCertificateMode = ClientCertificateMode.AllowCertificate,
-								ClientCertificateValidation = (certificate, chain, sslPolicyErrors) => {
-									var (isValid, error) =
-										ClusterVNode<string>.ValidateClientCertificate(certificate, chain, sslPolicyErrors,() => null,() => trustedRootCertificates);
-									if (!isValid && error != null) {
-										Log.Error("Client certificate validation error: {e}", error);
-									}
-									return isValid;
-								}
-							});
-						}
-					});
-				})
-				.UseStartup(Node.Startup)
-				.Build();
-		}
-
-		public void Start() {
-			StartingTime.Start();
-
-			Node.MainBus.Subscribe(
-				new AdHocHandler<SystemMessage.StateChangeMessage>(m => {
-					NodeState = m.State;
-				}));
-			if (!_isReadOnlyReplica) {
-				Node.MainBus.Subscribe(
-					new AdHocHandler<SystemMessage.BecomeLeader>(m => {
-						NodeState = VNodeState.Leader;
-						_started.TrySetResult(true);
-					}));
-				Node.MainBus.Subscribe(
-					new AdHocHandler<SystemMessage.BecomeFollower>(m => {
-						NodeState = VNodeState.Follower;
-						_started.TrySetResult(true);
-					}));
-			} else {
-				Node.MainBus.Subscribe(
-					new AdHocHandler<SystemMessage.BecomeReadOnlyReplica>(m => {
-						NodeState = VNodeState.ReadOnlyReplica;
-						_started.TrySetResult(true);
-					}));
-			}
-
-			AdHocHandler<StorageMessage.EventCommitted> waitForAdminUser = null!;
-			waitForAdminUser = new AdHocHandler<StorageMessage.EventCommitted>(WaitForAdminUser);
-			Node.MainBus.Subscribe(waitForAdminUser);
-
-			void WaitForAdminUser(StorageMessage.EventCommitted m) {
-				if (m.Event.EventStreamId != "$user-admin") {
-					return;
-				}
-
-				_adminUserCreated.TrySetResult(true);
-				Node.MainBus.Unsubscribe(waitForAdminUser);
-			}
-
-			_host.Start();
-			Node.Start();
-		}
-
-		public HttpClient CreateHttpClient() {
-			var httpClient = new HttpClient(new SocketsHttpHandler {
-				AllowAutoRedirect = false,
-				SslOptions = {
-					RemoteCertificateValidationCallback = delegate { return true; }
-				}
-			}, true);
-
-			var scheme = Node.DisableHttps ? "http://" : "https://";
-			httpClient.BaseAddress = new Uri($"{scheme}{HttpEndPoint}");
-			return httpClient;
-		}
-
-		public async Task Shutdown(bool keepDb = false) {
-			StoppingTime.Start();
-			_host?.Dispose();
-			await Node.StopAsync().WithTimeout(TimeSpan.FromSeconds(20));
-
-			// the same message 'BecomeShutdown' triggers the disposal of the ReadIndex
-			// and also the notification here that the node as stopped so there is a race.
-			// For now let's wait for a moment before we try to delete the directory.
-			await Task.Delay(500);
-
-			if (!keepDb)
-				TryDeleteDirectory(_dbPath);
-
-			StoppingTime.Stop();
-			RunningTime.Stop();
-		}
-
-		public void WaitIdle() {
-#if DEBUG
-			Node.QueueStatsManager.WaitIdle();
-#endif
-		}
-
-		private void TryDeleteDirectory(string directory) {
-			try {
-				Directory.Delete(directory, true);
-			} catch (Exception e) {
-				Debug.WriteLine("Failed to remove directory {0}", directory);
-				Debug.WriteLine(e);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/MiniNode.cs b/src/EventStore.Core.Tests/Helpers/MiniNode.cs
deleted file mode 100644
index be25c7c0344..00000000000
--- a/src/EventStore.Core.Tests/Helpers/MiniNode.cs
+++ /dev/null
@@ -1,334 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Security.Cryptography.X509Certificates;
-using EventStore.Common.Utils;
-using EventStore.Core.Services.Monitoring;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.Http;
-using EventStore.Core.Tests.Services.Transport.Tcp;
-using EventStore.Core.TransactionLog.Chunks;
-using System.Threading.Tasks;
-using EventStore.Core.Authentication;
-using EventStore.Core.Authentication.InternalAuthentication;
-using EventStore.Core.Authorization;
-using EventStore.Core.Bus;
-using EventStore.Core.Certificates;
-using EventStore.Core.Configuration.Sources;
-using EventStore.Core.Messages;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.TestHost;
-using ILogger = Serilog.ILogger;
-using EventStore.Plugins.Subsystems;
-using EventStore.TcpUnitTestPlugin;
-using Microsoft.AspNetCore.Server.Kestrel.Https;
-using Microsoft.AspNetCore.Server.Kestrel.Core;
-using Microsoft.Extensions.Configuration;
-using EventStore.Plugins.Authentication;
-using EventStore.Plugins.Authorization;
-using EventStore.Plugins.Transforms;
-using Microsoft.Extensions.DependencyInjection;
-using RuntimeInformation = System.Runtime.RuntimeInformation;
-using EventStore.Core.Tests.Index.Hashers;
-
-namespace EventStore.Core.Tests.Helpers {
-	public class MiniNode {
-		public const int ChunkSize = 1024 * 1024;
-		public const int CachedChunkSize = ChunkSize + ChunkHeader.Size + ChunkFooter.Size;
-
-		protected static readonly ILogger Log = Serilog.Log.ForContext<MiniNode>();
-		public IPEndPoint TcpEndPoint { get; protected set; }
-		public IPEndPoint IntTcpEndPoint { get; protected set; }
-		public IPEndPoint HttpEndPoint { get; protected set; }
-	}
-
-	public class MiniNode<TLogFormat, TStreamId> : MiniNode, IAsyncDisposable {
-		public static int RunCount;
-		public static readonly Stopwatch RunningTime = new Stopwatch();
-		public static readonly Stopwatch StartingTime = new Stopwatch();
-		public static readonly Stopwatch StoppingTime = new Stopwatch();
-
-		public readonly ClusterVNode Node;
-		public readonly TFChunkDb Db;
-		public readonly string DbPath;
-		public readonly HttpClient HttpClient;
-		public readonly HttpMessageHandler HttpMessageHandler;
-
-		private readonly TestServer _kestrelTestServer;
-		private readonly TaskCompletionSource<bool> _started;
-		private readonly TaskCompletionSource<bool> _adminUserCreated;
-		public Task Started => _started.Task;
-		public Task AdminUserCreated => _adminUserCreated.Task;
-
-		public MiniNode(string pathname,
-			int? tcpPort = null, int? httpPort = null,
-			ISubsystem[] subsystems = null,
-			int chunkSize = ChunkSize, int cachedChunkSize = CachedChunkSize, bool enableTrustedAuth = false,
-			int memTableSize = 1000,
-			bool inMemDb = true, bool disableFlushToDisk = false,
-			string advertisedExtHostAddress = null, int advertisedHttpPort = 0,
-			int hashCollisionReadLimit = Util.Opts.HashCollisionReadLimitDefault,
-			byte indexBitnessVersion = Util.Opts.IndexBitnessVersionDefault,
-			bool hash32bit = false,
-			string dbPath = "", bool isReadOnlyReplica = false,
-			long streamExistenceFilterSize = 10_000,
-			int streamExistenceFilterCheckpointIntervalMs = 30_000,
-			int streamExistenceFilterCheckpointDelayMs = 5_000,
-			int httpClientTimeoutSec = 60,
-			IAuthenticationProviderFactory authenticationProviderFactory = null,
-			IAuthorizationProviderFactory authorizationProviderFactory = null,
-			IExpiryStrategy expiryStrategy = null,
-			string transform = "identity",
-			IReadOnlyList<IDbTransform> newTransforms = null) {
-
-			RunningTime.Start();
-			RunCount += 1;
-
-			var ip = IPAddress.Loopback;
-
-			int extTcpPort = tcpPort ?? PortsHelper.GetAvailablePort(ip);
-			int httpEndPointPort = httpPort ?? PortsHelper.GetAvailablePort(ip);
-			int intTcpPort = PortsHelper.GetAvailablePort(ip);
-
-			if (string.IsNullOrEmpty(dbPath)) {
-				DbPath = Path.Combine(pathname,
-					$"mini-node-db-{extTcpPort}-{httpEndPointPort}");
-			} else {
-				DbPath = dbPath;
-			}
-
-			TcpEndPoint = new IPEndPoint(ip, extTcpPort);
-			IntTcpEndPoint = new IPEndPoint(ip, intTcpPort);
-			HttpEndPoint = new IPEndPoint(ip, httpEndPointPort);
-
-			subsystems ??= [];
-			subsystems = [..subsystems, new TcpApiTestPlugin()];
-
-			var options = new ClusterVNodeOptions {
-					IndexBitnessVersion = indexBitnessVersion,
-					Application = new() {
-						AllowAnonymousEndpointAccess = true,
-						AllowAnonymousStreamAccess = true,
-						StatsPeriodSec = 60 * 60,
-						WorkerThreads = 1
-					},
-					Interface = new() {
-						ReplicationHeartbeatInterval = 10_000,
-						ReplicationHeartbeatTimeout = 10_000,
-						EnableTrustedAuth = enableTrustedAuth,
-						EnableAtomPubOverHttp = true
-					},
-					Cluster = new() {
-						DiscoverViaDns = false,
-						ReadOnlyReplica = isReadOnlyReplica,
-						Archiver = false,
-						StreamInfoCacheCapacity = 10_000
-					},
-					Database = new() {
-						ChunkSize = chunkSize,
-						ChunksCacheSize = cachedChunkSize,
-						SkipDbVerify = true,
-						StatsStorage = StatsStorage.None,
-						MaxMemTableSize = memTableSize,
-						DisableScavengeMerging = true,
-						HashCollisionReadLimit = hashCollisionReadLimit,
-						CommitTimeoutMs = 10_000,
-						PrepareTimeoutMs = 10_000,
-						UnsafeDisableFlushToDisk = disableFlushToDisk,
-						StreamExistenceFilterSize = streamExistenceFilterSize,
-						Transform = transform
-					},
-					PlugableComponents = subsystems,
-					// limitation: the LoadedOptions here will only reflect the defaults and not the rest
-					// of the config specified above. however we only use it for /info/options
-					LoadedOptions = ClusterVNodeOptions.GetLoadedOptions(new ConfigurationBuilder()
-						.AddEventStoreDefaultValues()
-						.Build()),
-				}.Secure(new X509Certificate2Collection(ssl_connections.GetRootCertificate()),
-					ssl_connections.GetServerCertificate())
-				.WithInternalSecureTcpOn(IntTcpEndPoint)
-				.WithExternalSecureTcpOn(TcpEndPoint)
-				.WithHttpOn(HttpEndPoint);
-
-			var inMemConf = new ConfigurationBuilder()
-				.AddInMemoryCollection(new KeyValuePair<string, string>[] {
-					new("EventStore:TcpPlugin:NodeTcpPort", extTcpPort.ToString()),
-					new("EventStore:TcpPlugin:EnableExternalTcp", "true"),
-					new("EventStore:TcpUnitTestPlugin:NodeTcpPort", extTcpPort.ToString()),
-					new("EventStore:TcpUnitTestPlugin:NodeHeartbeatInterval", "10000"),
-					new("EventStore:TcpUnitTestPlugin:NodeHeartbeatTimeout", "10000"),
-					new("EventStore:TcpUnitTestPlugin:Insecure", options.Application.Insecure.ToString()),
-				}).Build();
-
-			if (advertisedExtHostAddress != null)
-				options = options.AdvertiseHttpHostAs(new DnsEndPoint(advertisedExtHostAddress, advertisedHttpPort));
-
-			options = inMemDb
-				? options.RunInMemory()
-				: options.RunOnDisk(DbPath);
-
-			Log.Information("\n{0,-25} {1} ({2}/{3}, {4})\n"
-					 + "{5,-25} {6} ({7})\n"
-					 + "{8,-25} {9} ({10}-bit)\n"
-					 + "{11,-25} {12}\n"
-					 + "{13,-25} {14}\n"
-					 + "{15,-25} {16}\n"
-					 + "{17,-25} {18}\n\n",
-				"ES VERSION:", VersionInfo.Version, VersionInfo.Edition, VersionInfo.CommitSha, VersionInfo.Timestamp,
-				"OS:", RuntimeInformation.OsPlatform, Environment.OSVersion,
-				"RUNTIME:", RuntimeInformation.RuntimeVersion, RuntimeInformation.RuntimeMode,
-				"GC:",
-				GC.MaxGeneration == 0
-					? "NON-GENERATION (PROBABLY BOEHM)"
-					: $"{GC.MaxGeneration + 1} GENERATIONS",
-				"DBPATH:", DbPath,
-				"TCP ENDPOINT:", TcpEndPoint,
-				"HTTP ENDPOINT:", HttpEndPoint);
-
-			var logFormatFactory = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory
-				.Configure(options => options with {
-					StreamExistenceFilterCheckpointDelay = TimeSpan.FromMilliseconds(streamExistenceFilterCheckpointDelayMs),
-					StreamExistenceFilterCheckpointInterval = TimeSpan.FromMilliseconds(streamExistenceFilterCheckpointIntervalMs),
-					HighHasher = hash32bit ? new ConstantHasher(0) : options.HighHasher,
-				});
-
-			Node = new ClusterVNode<TStreamId>(options, logFormatFactory,
-				new AuthenticationProviderFactory(
-					c => authenticationProviderFactory ?? new InternalAuthenticationProviderFactory(
-						c,
-						options.DefaultUser)),
-				new AuthorizationProviderFactory(
-					c => authorizationProviderFactory ?? new InternalAuthorizationProviderFactory([
-					new LegacyPolicySelectorFactory(
-						options.Application.AllowAnonymousEndpointAccess,
-						options.Application.AllowAnonymousStreamAccess,
-						options.Application.OverrideAnonymousEndpointAccessForGossip).Create(c.MainQueue, default)])),
-				expiryStrategy: expiryStrategy,
-				certificateProvider: new OptionsCertificateProvider(),
-				configuration: inMemConf,
-				configureAdditionalNodeServices: services => ConfigureMiniNodeServices(services, newTransforms));
-			Db = Node.Db;
-
-			Node.HttpService.SetupController(new TestController(Node.MainQueue));
-			_kestrelTestServer = new TestServer(new WebHostBuilder()
-				.UseKestrel(o => {
-					o.Listen(HttpEndPoint, options => {
-						if (RuntimeInformation.IsOSX) {
-							options.Protocols = HttpProtocols.Http2;
-						} else {
-							options.UseHttps(new HttpsConnectionAdapterOptions {
-								ServerCertificate = ssl_connections.GetServerCertificate(),
-								ClientCertificateMode = ClientCertificateMode.AllowCertificate,
-								ClientCertificateValidation = (certificate, chain, sslPolicyErrors) => {
-									var (isValid, error) =
-										ClusterVNode<string>.ValidateClientCertificate(certificate, chain, sslPolicyErrors, () => null, () => new X509Certificate2Collection(ssl_connections.GetRootCertificate()));
-									if (!isValid && error != null) {
-										Log.Error("Client certificate validation error: {e}", error);
-									}
-									return isValid;
-								}
-							});
-						}
-					});
-				})
-				.UseStartup(Node.Startup));
-			_started = new TaskCompletionSource<bool>();
-			_adminUserCreated = new TaskCompletionSource<bool>();
-			HttpMessageHandler = _kestrelTestServer.CreateHandler();
-			HttpClient = new HttpClient(HttpMessageHandler) {
-				Timeout = TimeSpan.FromSeconds(httpClientTimeoutSec),
-				BaseAddress = new UriBuilder {
-					Scheme = Uri.UriSchemeHttps
-				}.Uri
-			};
-		}
-
-		private static void ConfigureMiniNodeServices(
-			IServiceCollection services,
-			IReadOnlyList<IDbTransform> newTransforms) {
-			if (newTransforms == null)
-				return;
-
-			services.Decorate<IReadOnlyList<IDbTransform>>(existingTransforms =>
-				DecorateTransforms(existingTransforms, newTransforms));
-		}
-
-		private static IReadOnlyList<IDbTransform> DecorateTransforms(
-			IReadOnlyList<IDbTransform> existingTransforms,
-			IReadOnlyList<IDbTransform> newTransforms) {
-			var transforms = existingTransforms.ToList();
-			transforms.AddRange(newTransforms);
-			return transforms;
-		}
-
-		public async Task Start() {
-			StartingTime.Start();
-			Node.MainBus.Subscribe(
-				new AdHocHandler<SystemMessage.BecomeLeader>(m => {
-					_started.TrySetResult(true);
-				}));
-
-			AdHocHandler<StorageMessage.EventCommitted> waitForAdminUser = null;
-			waitForAdminUser = new AdHocHandler<StorageMessage.EventCommitted>(WaitForAdminUser);
-			Node.MainBus.Subscribe(waitForAdminUser);
-
-			void WaitForAdminUser(StorageMessage.EventCommitted m) {
-				if (m.Event.EventStreamId != "$user-admin") {
-					return;
-				}
-
-				_adminUserCreated.TrySetResult(true);
-				Node.MainBus.Unsubscribe(waitForAdminUser);
-			}
-
-			if (Node.IsShutdown)
-				_started.TrySetResult(true);
-
-			await Node.StartAsync(true).WithTimeout(TimeSpan.FromSeconds(60));
-
-			await Started.WithTimeout();
-
-			StartingTime.Stop();
-			Log.Information("MiniNode successfully started!");
-		}
-
-		public async Task Shutdown(bool keepDb = false) {
-
-			StoppingTime.Start();
-
-			_kestrelTestServer.Dispose();
-			HttpMessageHandler.Dispose();
-			HttpClient.Dispose();
-			await Node.StopAsync(TimeSpan.FromSeconds(20));
-
-			if (!keepDb)
-				TryDeleteDirectory(DbPath);
-
-			StoppingTime.Stop();
-			RunningTime.Stop();
-		}
-
-		public void WaitIdle() {
-#if DEBUG
-			Node.QueueStatsManager.WaitIdle();
-#endif
-		}
-
-		private void TryDeleteDirectory(string directory) {
-			try {
-				Directory.Delete(directory, true);
-			} catch (Exception e) {
-				Debug.WriteLine("Failed to remove directory {0}", directory);
-				Debug.WriteLine(e);
-			}
-		}
-
-		public async ValueTask DisposeAsync() {
-			await Shutdown();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/PortsHelper.cs b/src/EventStore.Core.Tests/Helpers/PortsHelper.cs
deleted file mode 100644
index 710b92b69a7..00000000000
--- a/src/EventStore.Core.Tests/Helpers/PortsHelper.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Net;
-using System.Net.Sockets;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Tests.Helpers {
-	public static class PortsHelper {
-		private static readonly ILogger Log =
-			Serilog.Log.ForContext(Serilog.Core.Constants.SourceContextPropertyName, "PortsHelper");
-		public static int GetAvailablePort(IPAddress ip) {
-			TcpListener l = new TcpListener(ip, 0);
-			l.Start();
-			int port = ((IPEndPoint)l.LocalEndpoint).Port;
-			l.Stop();
-			Log.Information($"Available port found: {port}");
-			return port;
-		}
-
-		public static IPEndPoint GetLoopback() {
-			var ip = IPAddress.Loopback;
-			int port = PortsHelper.GetAvailablePort(ip);
-			return new IPEndPoint(ip, port);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/ReflectionDynamic.cs b/src/EventStore.Core.Tests/Helpers/ReflectionDynamic.cs
deleted file mode 100644
index 45255d366a9..00000000000
--- a/src/EventStore.Core.Tests/Helpers/ReflectionDynamic.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Dynamic;
-using System.Linq;
-using System.Reflection;
-
-namespace EventStore.Core.Tests.Helpers {
-	class PrivateReflectionDynamicObject : DynamicObject {
-		private static readonly IDictionary<Type, IDictionary<string, IProperty>> PropertiesOnType =
-			new ConcurrentDictionary<Type, IDictionary<string, IProperty>>();
-
-		// Simple abstraction to make field and property access consistent
-		interface IProperty {
-			string Name { get; }
-			object GetValue(object obj, object[] index);
-			void SetValue(object obj, object val, object[] index);
-		}
-
-		// IProperty implementation over a PropertyInfo
-		class Property : IProperty {
-			internal PropertyInfo PropertyInfo { get; set; }
-
-			string IProperty.Name {
-				get { return PropertyInfo.Name; }
-			}
-
-			object IProperty.GetValue(object obj, object[] index) {
-				return PropertyInfo.GetValue(obj, index);
-			}
-
-			void IProperty.SetValue(object obj, object val, object[] index) {
-				PropertyInfo.SetValue(obj, val, index);
-			}
-		}
-
-		// IProperty implementation over a FieldInfo
-		class Field : IProperty {
-			internal FieldInfo FieldInfo { get; set; }
-
-			string IProperty.Name {
-				get { return FieldInfo.Name; }
-			}
-
-
-			object IProperty.GetValue(object obj, object[] index) {
-				return FieldInfo.GetValue(obj);
-			}
-
-			void IProperty.SetValue(object obj, object val, object[] index) {
-				FieldInfo.SetValue(obj, val);
-			}
-		}
-
-
-		private object RealObject { get; set; }
-		private const BindingFlags bindingFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
-
-		internal static object WrapObjectIfNeeded(object o) {
-			// Don't wrap primitive types, which don't have many interesting internal APIs
-			if (o == null || o.GetType().IsPrimitive || o is string)
-				return o;
-
-			return new PrivateReflectionDynamicObject() {RealObject = o};
-		}
-
-		public override bool TryGetMember(GetMemberBinder binder, out object result) {
-			IProperty prop = GetProperty(binder.Name);
-
-			// Get the property value
-			result = prop.GetValue(RealObject, index: null);
-
-			// Wrap the sub object if necessary. This allows nested anonymous objects to work.
-			result = WrapObjectIfNeeded(result);
-
-			return true;
-		}
-
-		public override bool TrySetMember(SetMemberBinder binder, object value) {
-			IProperty prop = GetProperty(binder.Name);
-
-			// Set the property value
-			prop.SetValue(RealObject, value, index: null);
-
-			return true;
-		}
-
-		public override bool TryGetIndex(GetIndexBinder binder, object[] indexes, out object result) {
-			// The indexed property is always named "Item" in C#
-			IProperty prop = GetIndexProperty();
-			result = prop.GetValue(RealObject, indexes);
-
-			// Wrap the sub object if necessary. This allows nested anonymous objects to work.
-			result = WrapObjectIfNeeded(result);
-
-			return true;
-		}
-
-		public override bool TrySetIndex(SetIndexBinder binder, object[] indexes, object value) {
-			// The indexed property is always named "Item" in C#
-			IProperty prop = GetIndexProperty();
-			prop.SetValue(RealObject, value, indexes);
-			return true;
-		}
-
-		// Called when a method is called
-		public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result) {
-			result = InvokeMemberOnType(RealObject.GetType(), RealObject, binder.Name, args);
-
-			// Wrap the sub object if necessary. This allows nested anonymous objects to work.
-			result = WrapObjectIfNeeded(result);
-
-			return true;
-		}
-
-		public override bool TryConvert(ConvertBinder binder, out object result) {
-			result = Convert.ChangeType(RealObject, binder.Type);
-			return true;
-		}
-
-		public override string ToString() {
-			return RealObject.ToString();
-		}
-
-		private IProperty GetIndexProperty() {
-			// The index property is always named "Item" in C#
-			return GetProperty("Item");
-		}
-
-		private IProperty GetProperty(string propertyName) {
-			// Get the list of properties and fields for this type
-			IDictionary<string, IProperty> typeProperties = GetTypeProperties(RealObject.GetType());
-
-			// Look for the one we want
-			IProperty property;
-			if (typeProperties.TryGetValue(propertyName, out property)) {
-				return property;
-			}
-
-			// The property doesn't exist
-
-			// Get a list of supported properties and fields and show them as part of the exception message
-			// For fields, skip the auto property backing fields (which name start with <)
-			var propNames = typeProperties.Keys.Where(name => name[0] != '<').OrderBy(name => name);
-			throw new ArgumentException(
-				string.Format(
-					"The property {0} does not exist on type {1}. Supported properties are: {2}",
-					propertyName, RealObject.GetType(), string.Join(", ", propNames)));
-		}
-
-		private static IDictionary<string, IProperty> GetTypeProperties(Type type) {
-			// First, check if we already have it cached
-			IDictionary<string, IProperty> typeProperties;
-			if (PropertiesOnType.TryGetValue(type, out typeProperties)) {
-				return typeProperties;
-			}
-
-			// Not cache, so we need to build it
-
-			typeProperties = new ConcurrentDictionary<string, IProperty>();
-
-			// First, add all the properties
-			foreach (PropertyInfo prop in type.GetProperties(bindingFlags).Where(p => p.DeclaringType == type)) {
-				typeProperties[prop.Name] = new Property() {PropertyInfo = prop};
-			}
-
-			// Now, add all the fields
-			foreach (FieldInfo field in type.GetFields(bindingFlags).Where(p => p.DeclaringType == type)) {
-				typeProperties[field.Name] = new Field() {FieldInfo = field};
-			}
-
-			// Finally, recurse on the base class to add its fields
-			if (type.BaseType != null) {
-				foreach (IProperty prop in GetTypeProperties(type.BaseType).Values) {
-					typeProperties[prop.Name] = prop;
-				}
-			}
-
-			// Cache it for next time
-			PropertiesOnType[type] = typeProperties;
-
-			return typeProperties;
-		}
-
-		private static object InvokeMemberOnType(Type type, object target, string name, object[] args) {
-			try {
-				// Try to incoke the method
-				return type.InvokeMember(
-					name,
-					BindingFlags.InvokeMethod | bindingFlags,
-					null,
-					target,
-					args);
-			} catch (MissingMethodException) {
-				// If we couldn't find the method, try on the base class
-				if (type.BaseType != null) {
-					return InvokeMemberOnType(type.BaseType, target, name, args);
-				}
-
-				//quick greg hack to allow methods to not exist!
-				return null;
-			}
-		}
-	}
-
-	public static class PrivateReflectionDynamicObjectExtensions {
-		public static dynamic AsDynamic(this object o) {
-			return PrivateReflectionDynamicObject.WrapObjectIfNeeded(o);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/TestFixtureWithExistingEvents.cs b/src/EventStore.Core.Tests/Helpers/TestFixtureWithExistingEvents.cs
deleted file mode 100644
index 5c016fab398..00000000000
--- a/src/EventStore.Core.Tests/Helpers/TestFixtureWithExistingEvents.cs
+++ /dev/null
@@ -1,824 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Core.Tests.Bus.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using Newtonsoft.Json.Linq;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Helpers {
-	public abstract class TestFixtureWithExistingEvents<TLogFormat,TStreamId> : TestFixtureWithReadWriteDispatchers,
-		IHandle<ClientMessage.ReadStreamEventsBackward>,
-		IHandle<ClientMessage.ReadStreamEventsForward>,
-		IHandle<ClientMessage.ReadAllEventsForward>,
-		IHandle<ClientMessage.ReadAllEventsBackward>,
-		IHandle<ClientMessage.FilteredReadAllEventsForward>,
-		IHandle<ClientMessage.FilteredReadAllEventsBackward>,
-		IHandle<ClientMessage.WriteEvents>,
-		IHandle<ClientMessage.TransactionStart>,
-		IHandle<ClientMessage.TransactionWrite>,
-		IHandle<ClientMessage.TransactionCommit>,
-		IHandle<ClientMessage.SubscribeToStream>,
-		IHandle<ClientMessage.FilteredSubscribeToStream>,
-		IHandle<ClientMessage.DeleteStream>,
-		IHandle<StorageMessage.EventCommitted>{
-		public class Transaction {
-			private readonly ClientMessage.TransactionStart _startMessage;
-
-			private readonly List<Tuple<int, Event>> _events = new();
-
-			public Transaction(long position, ClientMessage.TransactionStart startMessage) {
-				_startMessage = startMessage;
-			}
-
-			public void Write(ClientMessage.TransactionWrite message, ref int fakePosition) {
-				foreach (var @event in message.Events) {
-					_events.Add(Tuple.Create(fakePosition, @event));
-					fakePosition += 50;
-				}
-			}
-
-			public void Commit(ClientMessage.TransactionCommit message, TestFixtureWithExistingEvents<TLogFormat,TStreamId> fixture) {
-				var commitPosition = fixture._fakePosition;
-				fixture._fakePosition += 50;
-				fixture.ProcessWrite(
-					message.Envelope, message.CorrelationId, _startMessage.EventStreamId, _startMessage.ExpectedVersion,
-					_events.Select(v => v.Item2).ToArray(),
-					(f, l) =>
-						new ClientMessage.TransactionCommitCompleted(
-							message.CorrelationId, message.TransactionId, f, l, -1, -1),
-					new ClientMessage.TransactionCommitCompleted(
-						message.CorrelationId, message.TransactionId, OperationResult.WrongExpectedVersion,
-						"Wrong expected version"),
-					_events.Select(v => (long)v.Item1).ToArray(), commitPosition);
-			}
-		}
-
-		protected TestHandler<ClientMessage.ReadStreamEventsBackward> _listEventsHandler;
-
-		protected readonly Dictionary<string, List<EventRecord>> _streams =
-			new Dictionary<string, List<EventRecord>>();
-
-		protected readonly SortedList<TFPos, EventRecord> _all = new SortedList<TFPos, EventRecord>();
-
-		protected readonly HashSet<string> _deletedStreams = new HashSet<string>();
-
-		protected readonly Dictionary<long, Transaction> _activeTransactions = new Dictionary<long, Transaction>();
-
-		private int _fakePosition = 100;
-		private bool _allWritesSucceed;
-		private readonly HashSet<string> _writesToSucceed = new HashSet<string>();
-		private bool _allWritesQueueUp;
-		private Queue<ClientMessage.WriteEvents> _writesQueue;
-		private Queue<ClientMessage.ReadStreamEventsBackward> _readEventsBackwardsQueue;
-		private bool _readsBackwardsQueuesUp;
-		private bool _readAllEnabled;
-		private bool _noOtherStreams;
-		private bool _notReady;
-		private bool _readsTimeOut;
-		protected List<DateTime> EventTimeStamps = new List<DateTime>();
-
-		protected readonly HashSet<string> _readsToTimeOutOnce = new HashSet<string>();
-
-		private static readonly char[] _linkToSeparator = new[] {'@'};
-
-		protected TFPos ExistingStreamMetadata(string streamId, string metadata) {
-			return ExistingEvent("$$" + streamId, SystemEventTypes.StreamMetadata, "", metadata, isJson: true);
-		}
-
-		protected TFPos ExistingEvent(string streamName, string eventType, string eventMetadata, string eventData,
-			bool isJson = false) {
-			return WriteEvent(streamName, eventType, eventMetadata, eventData, isJson).Item2;
-		}
-
-		protected EventRecord ExistingEventTimeStamp(string streamName, string eventType, string eventMetadata, string eventData,
-			bool isJson = false) {
-			return WriteEvent(streamName, eventType, eventMetadata, eventData, isJson).Item1;
-		}
-
-		protected (EventRecord, TFPos) WriteEvent(string streamName, string eventType, string eventMetadata, string eventData,
-			bool isJson = false) {
-			List<EventRecord> list;
-			if (!_streams.TryGetValue(streamName, out list) || list == null) {
-				list = new List<EventRecord>();
-				_streams[streamName] = list;
-			}
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamIdIgnored = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeIdIgnored = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			var eventRecord = new EventRecord(
-				list.Count,
-				LogRecord.Prepare(
-					recordFactory,
-					_fakePosition, Guid.NewGuid(), Guid.NewGuid(), _fakePosition, 0, streamIdIgnored, list.Count - 1,
-					PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd | (isJson ? PrepareFlags.IsJson : 0),
-					eventTypeIdIgnored, eventData is null ? null : Helper.UTF8NoBom.GetBytes(eventData),
-					eventMetadata == null ? new byte[0] : Helper.UTF8NoBom.GetBytes(eventMetadata),
-					_timeProvider.UtcNow), streamName, eventType);
-			list.Add(eventRecord);
-			var eventPosition = new TFPos(_fakePosition + 50, _fakePosition);
-			_all.Add(eventPosition, eventRecord);
-			_fakePosition += 100;
-			return (eventRecord, eventPosition);
-		}
-
-		protected void NotReady() {
-			_notReady = true;
-		}
-
-		protected void Ready() {
-			_notReady = false;
-		}
-
-		protected void AllReadsTimeOut() {
-			_readsTimeOut = true;
-		}
-
-		protected void EnableReadAll() {
-			_readAllEnabled = true;
-		}
-
-		protected void ReadsBackwardQueuesUp() {
-			_readsBackwardsQueuesUp = true;
-		}
-
-		protected void CompleteOneReadBackwards() {
-			var read = _readEventsBackwardsQueue.Dequeue();
-			ProcessRead(read);
-		}
-
-		protected void NoStream(string streamId) {
-			_streams[streamId] = null;
-		}
-
-		protected void NoOtherStreams() {
-			_noOtherStreams = true;
-		}
-
-		protected void DeletedStream(string streamId) {
-			_deletedStreams.Add(streamId);
-			ExistingStreamMetadata(streamId, CreateStreamDeletedEventJson());
-		}
-
-		private static string CreateStreamDeletedEventJson() {
-			return new StreamMetadata(null, null, EventNumber.DeletedStream, null, null, null).ToJsonString();
-		}
-
-		protected void AllWritesSucceed(bool succeed = true) {
-			_allWritesSucceed = succeed;
-		}
-
-		protected void AllWritesToSucceed(string streamId) {
-			_writesToSucceed.Add(streamId);
-		}
-
-		protected void AllWritesQueueUp() {
-			_allWritesQueueUp = true;
-		}
-
-		protected void TimeOutReadToStreamOnce(string streamId) {
-			_readsToTimeOutOnce.Add(streamId);
-		}
-
-		protected void OneWriteCompletes() {
-			var message = _writesQueue.Dequeue();
-			ProcessWrite(
-				message.Envelope, message.CorrelationId, message.EventStreamId, message.ExpectedVersion, message.Events,
-				(firstEventNumber, lastEventNumber) =>
-					new ClientMessage.WriteEventsCompleted(message.CorrelationId, firstEventNumber, lastEventNumber, -1,
-						-1),
-				new ClientMessage.WriteEventsCompleted(
-					message.CorrelationId, OperationResult.WrongExpectedVersion, "wrong expected version"));
-		}
-
-		protected void CompleteWriteWithResult(OperationResult result) {
-			var message = _writesQueue.Dequeue();
-			ProcessWrite(
-				message.Envelope, message.CorrelationId, message.EventStreamId, ExpectedVersion.Any, message.Events,
-				(firstEventNumber, lastEventNumber) =>
-					new ClientMessage.WriteEventsCompleted(message.CorrelationId, result, String.Empty),
-				new ClientMessage.WriteEventsCompleted(
-					message.CorrelationId, OperationResult.WrongExpectedVersion, "wrong expected version"));
-		}
-
-		protected void AllWriteComplete() {
-			while (_writesQueue.Count > 0)
-				OneWriteCompletes();
-		}
-
-		[SetUp]
-		public void setup1() {
-			_writesQueue = new Queue<ClientMessage.WriteEvents>();
-			_readEventsBackwardsQueue = new Queue<ClientMessage.ReadStreamEventsBackward>();
-			_listEventsHandler = new TestHandler<ClientMessage.ReadStreamEventsBackward>();
-			_bus.Subscribe(_listEventsHandler);
-			_bus.Subscribe<ClientMessage.WriteEvents>(this);
-			_bus.Subscribe<ClientMessage.ReadStreamEventsBackward>(this);
-			_bus.Subscribe<ClientMessage.ReadStreamEventsForward>(this);
-			_bus.Subscribe<ClientMessage.ReadAllEventsForward>(this);
-			_bus.Subscribe<ClientMessage.ReadAllEventsBackward>(this);
-			_bus.Subscribe<ClientMessage.FilteredReadAllEventsForward>(this);
-			_bus.Subscribe<ClientMessage.FilteredReadAllEventsBackward>(this);
-			_bus.Subscribe<ClientMessage.SubscribeToStream>(this);
-			_bus.Subscribe<ClientMessage.FilteredSubscribeToStream>(this);
-			_bus.Subscribe<ClientMessage.DeleteStream>(this);
-			_bus.Subscribe<ClientMessage.TransactionStart>(this);
-			_bus.Subscribe<ClientMessage.TransactionWrite>(this);
-			_bus.Subscribe<ClientMessage.TransactionCommit>(this);
-			_bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_readDispatcher);
-			_bus.Subscribe<ClientMessage.NotHandled>(_readDispatcher);
-			_bus.Subscribe<StorageMessage.EventCommitted>(this);
-			_bus.Subscribe(_writeDispatcher);
-			_bus.Subscribe(_ioDispatcher.StreamDeleter);
-			_bus.Subscribe(_ioDispatcher.Awaker);
-			_streams.Clear();
-			_deletedStreams.Clear();
-			_all.Clear();
-			_readAllEnabled = false;
-			_fakePosition = 100;
-			_activeTransactions.Clear();
-			Given1();
-			Given();
-		}
-
-		protected virtual void Given1() {
-		}
-
-		protected virtual void Given() {
-		}
-
-		public void Handle(ClientMessage.ReadStreamEventsBackward message) {
-			if (_notReady) {
-				message.Envelope.ReplyWith(new ClientMessage.NotHandled(
-					message.CorrelationId,
-					ClientMessage.NotHandled.Types.NotHandledReason.NotReady,
-					default(string)));
-			}
-
-			if (_readsBackwardsQueuesUp) {
-				_readEventsBackwardsQueue.Enqueue(message);
-				return;
-			}
-
-			if (_readsTimeOut) return;
-			if (_readsToTimeOutOnce.Contains(message.EventStreamId)) {
-				Console.WriteLine("[TEST] Timing out read backwards for {0}", message.EventStreamId);
-				_readsToTimeOutOnce.Remove(message.EventStreamId);
-				return;
-			}
-
-			ProcessRead(message);
-		}
-
-		private void ProcessRead(ClientMessage.ReadStreamEventsBackward message) {
-			List<EventRecord> list;
-			if (_deletedStreams.Contains(message.EventStreamId)) {
-				message.Envelope.ReplyWith(
-					new ClientMessage.ReadStreamEventsBackwardCompleted(
-						message.CorrelationId, message.EventStreamId, message.FromEventNumber, message.MaxCount,
-						ReadStreamResult.StreamDeleted, new ResolvedEvent[0], null, false, string.Empty, -1,
-						EventNumber.DeletedStream, true, _fakePosition));
-			} else if (_streams.TryGetValue(message.EventStreamId, out list) || _noOtherStreams) {
-				if (list != null && list.Count > 0 && (list.Last().EventNumber >= message.FromEventNumber)
-				    || (message.FromEventNumber == -1)) {
-					ResolvedEvent[] records =
-						list.Safe()
-							.Reverse()
-							.SkipWhile(v => message.FromEventNumber != -1 && v.EventNumber > message.FromEventNumber)
-							.Take(message.MaxCount)
-							.Select(v => BuildEvent(v, message.ResolveLinkTos))
-							.ToArray();
-					message.Envelope.ReplyWith(
-						new ClientMessage.ReadStreamEventsBackwardCompleted(
-							message.CorrelationId, message.EventStreamId,
-							message.FromEventNumber == -1
-								? (EnumerableExtensions.IsEmpty(list) ? -1 : list.Last().EventNumber)
-								: message.FromEventNumber, message.MaxCount, ReadStreamResult.Success, records, null,
-							false,
-							string.Empty,
-							nextEventNumber: records.Length > 0 ? records.Last().OriginalEvent.EventNumber - 1 : -1,
-							lastEventNumber: list.Safe().Any() ? list.Safe().Last().EventNumber : -1,
-							isEndOfStream: records.Length == 0 || records.Last().OriginalEvent.EventNumber == 0,
-							tfLastCommitPosition: _fakePosition));
-				} else {
-					if (list == null) {
-						message.Envelope.ReplyWith(
-							new ClientMessage.ReadStreamEventsBackwardCompleted(
-								message.CorrelationId, message.EventStreamId, message.FromEventNumber, message.MaxCount,
-								ReadStreamResult.NoStream, new ResolvedEvent[0], null, false, "", nextEventNumber: -1,
-								lastEventNumber: -1,
-								isEndOfStream: true,
-								tfLastCommitPosition: _fakePosition));
-						return;
-					}
-
-					throw new NotImplementedException();
-				}
-			}
-		}
-
-		public void Handle(ClientMessage.ReadStreamEventsForward message) {
-			if (_readsTimeOut) return;
-			if (_readsToTimeOutOnce.Contains(message.EventStreamId)) {
-				Console.WriteLine("[TEST] Timing out read forwards for {0}", message.EventStreamId);
-				_readsToTimeOutOnce.Remove(message.EventStreamId);
-				return;
-			}
-
-			List<EventRecord> list;
-			if (_deletedStreams.Contains(message.EventStreamId)) {
-				message.Envelope.ReplyWith(
-					new ClientMessage.ReadStreamEventsBackwardCompleted(
-						message.CorrelationId, message.EventStreamId, message.FromEventNumber, message.MaxCount,
-						ReadStreamResult.StreamDeleted, new ResolvedEvent[0], null, false, string.Empty, -1,
-						EventNumber.DeletedStream, true, _fakePosition));
-			} else if (_streams.TryGetValue(message.EventStreamId, out list) || _noOtherStreams) {
-				if (list != null && list.Count > 0 && message.FromEventNumber >= 0) {
-					ResolvedEvent[] records =
-						list.Safe()
-							.SkipWhile(v => v.EventNumber < message.FromEventNumber)
-							.Take(message.MaxCount)
-							.Select(v => BuildEvent(v, message.ResolveLinkTos))
-							.ToArray();
-					var lastEventNumber = list.Safe().Any() ? list.Safe().Last().EventNumber : -1;
-					message.Envelope.ReplyWith(
-						new ClientMessage.ReadStreamEventsForwardCompleted(
-							message.CorrelationId, message.EventStreamId,
-							message.FromEventNumber, message.MaxCount, ReadStreamResult.Success, records, null, false,
-							string.Empty,
-							nextEventNumber: records.Length > 0
-								? records.Last().OriginalEvent.EventNumber + 1
-								: lastEventNumber + 1,
-							lastEventNumber: lastEventNumber,
-							isEndOfStream: records.Length == 0 ||
-							               records.Last().OriginalEvent.EventNumber == list.Last().EventNumber,
-							tfLastCommitPosition: _fakePosition));
-				} else {
-					if (list == null) {
-						message.Envelope.ReplyWith(
-							new ClientMessage.ReadStreamEventsForwardCompleted(
-								message.CorrelationId, message.EventStreamId, message.FromEventNumber, message.MaxCount,
-								ReadStreamResult.NoStream, new ResolvedEvent[0], null, false, "", nextEventNumber: -1,
-								lastEventNumber: -1,
-								isEndOfStream: true,
-								tfLastCommitPosition: _fakePosition));
-						return;
-					}
-
-					throw new NotImplementedException();
-/*
-                    message.Envelope.ReplyWith(
-                            new ClientMessage.ReadStreamEventsBackwardCompleted(
-                                    message.CorrelationId,
-                                    message.EventStreamId,
-                                    new EventLinkPair[0],
-                                    ReadStreamResult.Success,
-                                    nextEventNumber: -1,
-                                    lastEventNumber: list.Safe().Last().EventNumber,
-                                    isEndOfStream: true,// NOTE AN: don't know how to correctly determine this here
-                                    lastCommitPosition: _lastPosition));
-*/
-				}
-			}
-		}
-
-		private ResolvedEvent BuildEvent(EventRecord x, bool resolveLinks) {
-			if (x.EventType == "$>" && resolveLinks) {
-				var parts = Helper.UTF8NoBom.GetString(x.Data.Span).Split(_linkToSeparator, 2);
-				List<EventRecord> list;
-				if (_deletedStreams.Contains(parts[1]) || !_streams.TryGetValue(parts[1], out list))
-					return ResolvedEvent.ForFailedResolvedLink(x, ReadEventResult.StreamDeleted);
-				var eventNumber = int.Parse(parts[0]);
-				var target = list[eventNumber];
-
-				return ResolvedEvent.ForResolvedLink(target, x);
-			} else
-				return ResolvedEvent.ForUnresolvedEvent(x);
-		}
-
-		private ResolvedEvent BuildEvent(EventRecord x, bool resolveLinks, long commitPosition) {
-			if (x.EventType == "$>" && resolveLinks) {
-				var parts = Helper.UTF8NoBom.GetString(x.Data.Span).Split(_linkToSeparator, 2);
-				var list = _streams[parts[1]];
-				var eventNumber = int.Parse(parts[0]);
-				var target = list[eventNumber];
-
-				return ResolvedEvent.ForResolvedLink(target, x, commitPosition);
-			} else
-				return ResolvedEvent.ForUnresolvedEvent(x, commitPosition);
-		}
-
-		public void Handle(ClientMessage.WriteEvents message) {
-			if (_allWritesSucceed || _writesToSucceed.Contains(message.EventStreamId)) {
-				ProcessWrite(
-					message.Envelope, message.CorrelationId, message.EventStreamId, message.ExpectedVersion,
-					message.Events,
-					(firstEventNumber, lastEventNumber) =>
-						new ClientMessage.WriteEventsCompleted(message.CorrelationId, firstEventNumber, lastEventNumber,
-							-1, -1),
-					new ClientMessage.WriteEventsCompleted(
-						message.CorrelationId, OperationResult.WrongExpectedVersion, "wrong expected version"));
-			} else if (_allWritesQueueUp)
-				_writesQueue.Enqueue(message);
-		}
-
-		private void ProcessWrite<T>(IEnvelope envelope, Guid correlationId, string streamId, long expectedVersion,
-			Event[] events, Func<int, int, T> writeEventsCompleted, T wrongExpectedVersionResponse,
-			long[] positions = null, long? commitPosition = null) where T : Message {
-			if (positions == null) {
-				positions = new long[events.Length];
-				for (int i = 0; i < positions.Length; i++) {
-					positions[i] = _fakePosition;
-					_fakePosition += 100;
-				}
-			}
-
-			List<EventRecord> list;
-			if (!_streams.TryGetValue(streamId, out list) || list == null) {
-				list = new List<EventRecord>();
-				_streams[streamId] = list;
-			}
-
-			if (expectedVersion != EventStore.ClientAPI.ExpectedVersion.Any) {
-				if (expectedVersion != list.Count - 1) {
-					envelope.ReplyWith(wrongExpectedVersionResponse);
-					return;
-				}
-			}
-
-			var eventRecords = (from ep in events.Zip(positions, (@event, position) => new { @event, position })
-				let e = ep.@event
-				let eventNumber = list.Count
-				//NOTE: ASSUMES STAYS ENUMERABLE
-				let tfPosition = ep.position
-				select
-					new {
-						position = tfPosition,
-						record =
-							new EventRecord(
-								eventNumber, tfPosition, correlationId, e.EventId, tfPosition, 0, streamId,
-								ExpectedVersion.Any, _timeProvider.UtcNow,
-								PrepareFlags.SingleWrite | (e.IsJson ? PrepareFlags.IsJson : PrepareFlags.None),
-								e.EventType, e.Data, e.Metadata)
-					}); //NOTE: DO NOT MAKE ARRAY
-			foreach (var eventRecord in eventRecords) {
-				list.Add(eventRecord.record);
-				var tfPos = new TFPos(commitPosition ?? eventRecord.position + 50, eventRecord.position);
-				_all.Add(tfPos, eventRecord.record);
-				_bus.Publish(
-					new StorageMessage.EventCommitted(tfPos.CommitPosition, eventRecord.record, isTfEof: false));
-			}
-
-			_bus.Publish(new StorageMessage.TfEofAtNonCommitRecord());
-
-			var firstEventNumber = list.Count - events.Length;
-			envelope?.ReplyWith(writeEventsCompleted(firstEventNumber, firstEventNumber + events.Length - 1));
-		}
-
-		public void Handle(StorageMessage.EventCommitted msg) {
-			var metadata = Json.ParseJson<ParkedMessageMetadata>(msg.Event.Metadata);
-			if(metadata != null) EventTimeStamps.Add(metadata.Added.ToUniversalTime());
-		}
-
-		class ParkedMessageMetadata {
-			public DateTime Added { get; set; }
-			public string Reason { get; set; }
-			public long SubscriptionEventNumber { get; set; }
-		}
-
-		public void Handle(ClientMessage.DeleteStream message) {
-			List<EventRecord> list;
-			if (_deletedStreams.Contains(message.EventStreamId)) {
-				message.Envelope.ReplyWith(new ClientMessage.DeleteStreamCompleted(message.CorrelationId,
-					OperationResult.StreamDeleted, string.Empty, -1, -1, -1));
-				return;
-			}
-
-			if (!_streams.TryGetValue(message.EventStreamId, out list) || list == null) {
-				if (message.ExpectedVersion == ExpectedVersion.Any) {
-					message.Envelope.ReplyWith(new ClientMessage.DeleteStreamCompleted(message.CorrelationId,
-						OperationResult.StreamDeleted, string.Empty, -1, -1, -1));
-					_deletedStreams.Add(message.EventStreamId);
-					return;
-				}
-
-				message.Envelope.ReplyWith(new ClientMessage.DeleteStreamCompleted(message.CorrelationId,
-					OperationResult.WrongExpectedVersion, string.Empty));
-				return;
-			}
-
-			_deletedStreams.Add(message.EventStreamId);
-
-			ProcessWrite<Message>(
-				null, message.CorrelationId, SystemStreams.MetastreamOf(message.EventStreamId), ExpectedVersion.Any,
-				new Event[] {
-					new Event(Guid.NewGuid(), SystemEventTypes.StreamMetadata, true, CreateStreamDeletedEventJson(),
-						null)
-				},
-				null, null);
-
-			message.Envelope.ReplyWith(new ClientMessage.DeleteStreamCompleted(message.CorrelationId,
-				OperationResult.Success, string.Empty));
-		}
-
-		public void Handle(ClientMessage.ReadAllEventsForward message) {
-			if (_readsTimeOut) return;
-			if (!_readAllEnabled)
-				return;
-			var from = new TFPos(message.CommitPosition, message.PreparePosition);
-			var records = _all.SkipWhile(v => v.Key < from).Take(message.MaxCount).ToArray();
-			var list = new List<ResolvedEvent>();
-			var pos = from;
-			var next = pos;
-			var prev = new TFPos(pos.CommitPosition, Int64.MaxValue);
-			foreach (KeyValuePair<TFPos, EventRecord> record in records) {
-				pos = record.Key;
-				next = new TFPos(pos.CommitPosition, pos.PreparePosition + 1);
-				list.Add(BuildEvent(record.Value, message.ResolveLinkTos, record.Key.CommitPosition));
-			}
-
-			var events = list.ToArray();
-			message.Envelope.ReplyWith(
-				new ClientMessage.ReadAllEventsForwardCompleted(
-					message.CorrelationId, ReadAllResult.Success, "", events, null, false,
-					message.MaxCount, pos, next, prev, _fakePosition));
-		}
-
-		public void Handle(ClientMessage.ReadAllEventsBackward message) {
-			if (_readsTimeOut) return;
-			if (!_readAllEnabled) return;
-
-			var from = new TFPos(message.CommitPosition, message.PreparePosition);
-			if (from == new TFPos(-1, -1)) // read from end
-				from = new TFPos(long.MaxValue, long.MaxValue);
-
-			var records = _all.Reverse().SkipWhile(v => v.Key > from).Take(message.MaxCount).ToArray();
-			var list = new List<ResolvedEvent>();
-			var pos = from;
-			var next = pos;
-			var prev = new TFPos(pos.CommitPosition, 0);
-			foreach (KeyValuePair<TFPos, EventRecord> record in records) {
-				pos = record.Key;
-				next = new TFPos(pos.CommitPosition, pos.PreparePosition - 1);
-				list.Add(BuildEvent(record.Value, message.ResolveLinkTos, record.Key.CommitPosition));
-			}
-
-			var events = list.ToArray();
-			message.Envelope.ReplyWith(
-				new ClientMessage.ReadAllEventsBackwardCompleted(
-					message.CorrelationId, ReadAllResult.Success, "", events, null, false,
-					message.MaxCount, pos, next, prev, _fakePosition));
-		}
-
-		public void Handle(ClientMessage.FilteredReadAllEventsForward message) {
-			if (_readsTimeOut) return;
-			if (!_readAllEnabled)
-				return;
-			var from = new TFPos(message.CommitPosition, message.PreparePosition);
-			var records = _all.SkipWhile(v => v.Key < from).Where(kvp => message.EventFilter.IsEventAllowed(kvp.Value)).Take(message.MaxCount).ToArray();
-			var list = new List<ResolvedEvent>();
-			var pos = from;
-			var next = pos;
-			var prev = new TFPos(pos.CommitPosition, Int64.MaxValue);
-			foreach (KeyValuePair<TFPos, EventRecord> record in records) {
-				pos = record.Key;
-				next = new TFPos(pos.CommitPosition, pos.PreparePosition + 1);
-				list.Add(BuildEvent(record.Value, message.ResolveLinkTos, record.Key.CommitPosition));
-			}
-
-			var events = list.ToArray();
-			message.Envelope.ReplyWith(
-				new ClientMessage.FilteredReadAllEventsForwardCompleted(
-					message.CorrelationId, FilteredReadAllResult.Success, "", events, null, false,
-					message.MaxCount, pos, next, prev, _fakePosition, list.Count < message.MaxCount, -1));
-		}
-
-		public void Handle(ClientMessage.FilteredReadAllEventsBackward message) {
-			if (_readsTimeOut) return;
-			if (!_readAllEnabled) return;
-
-			var from = new TFPos(message.CommitPosition, message.PreparePosition);
-			if (from == new TFPos(-1, -1)) // read from end
-				from = new TFPos(long.MaxValue, long.MaxValue);
-
-			var records = _all.Reverse().SkipWhile(v => v.Key > from).Where(kvp => message.EventFilter.IsEventAllowed(kvp.Value)).Take(message.MaxCount).ToArray();
-			var list = new List<ResolvedEvent>();
-			var pos = from;
-			var next = pos;
-			var prev = new TFPos(pos.CommitPosition, 0);
-			foreach (KeyValuePair<TFPos, EventRecord> record in records) {
-				pos = record.Key;
-				next = new TFPos(pos.CommitPosition, pos.PreparePosition - 1);
-				list.Add(BuildEvent(record.Value, message.ResolveLinkTos, record.Key.CommitPosition));
-			}
-
-			var events = list.ToArray();
-			message.Envelope.ReplyWith(
-				new ClientMessage.FilteredReadAllEventsBackwardCompleted(
-					message.CorrelationId, FilteredReadAllResult.Success, "", events, null, false,
-					message.MaxCount, pos, next, prev, _fakePosition, list.Count < message.MaxCount));
-		}
-
-		public void Handle(ClientMessage.SubscribeToStream msg) {
-			_streams.TryGetValue(msg.EventStreamId, out var list);
-
-			var lastEventNumber = msg.EventStreamId.IsEmptyString()
-				? (long?)null
-				: list.Safe().Any() ? list.Safe().Last().EventNumber : -1;
-
-			var lastIndexedPos = _all.IsEmpty() ? -1 : _all.Keys[^1].CommitPosition;
-			var subscribedMessage =
-				new ClientMessage.SubscriptionConfirmation(msg.CorrelationId, lastIndexedPos, lastEventNumber);
-			msg.Envelope.ReplyWith(subscribedMessage);
-		}
-
-		public void Handle(ClientMessage.FilteredSubscribeToStream msg) {
-			_streams.TryGetValue(msg.EventStreamId, out var list);
-
-			var lastEventNumber = msg.EventStreamId.IsEmptyString()
-				? (long?)null
-				: list.Safe().Any() ? list.Safe().Last().EventNumber : -1;
-			var lastCommitPos = _fakePosition;
-			var subscribedMessage =
-				new ClientMessage.SubscriptionConfirmation(msg.CorrelationId, lastCommitPos, lastEventNumber);
-			msg.Envelope.ReplyWith(subscribedMessage);
-		}
-
-		public void Handle(ClientMessage.TransactionStart message) {
-			var transactionId = _fakePosition;
-			_activeTransactions.Add(transactionId, new Transaction(transactionId, message));
-			_fakePosition += 50;
-			message.Envelope.ReplyWith(
-				new ClientMessage.TransactionStartCompleted(
-					message.CorrelationId, transactionId, OperationResult.Success, ""));
-		}
-
-		public void Handle(ClientMessage.TransactionWrite message) {
-			Transaction transaction;
-			if (!_activeTransactions.TryGetValue(message.TransactionId, out transaction)) {
-				message.Envelope.ReplyWith(
-					new ClientMessage.TransactionWriteCompleted(
-						message.CorrelationId, message.TransactionId, OperationResult.InvalidTransaction,
-						"Transaction not found"));
-			} else {
-				transaction.Write(message, ref _fakePosition);
-			}
-		}
-
-		public void Handle(ClientMessage.TransactionCommit message) {
-			Transaction transaction;
-			if (!_activeTransactions.TryGetValue(message.TransactionId, out transaction)) {
-				message.Envelope.ReplyWith(
-					new ClientMessage.TransactionWriteCompleted(
-						message.CorrelationId, message.TransactionId, OperationResult.InvalidTransaction,
-						"Transaction not found"));
-			} else {
-				transaction.Commit(message, this);
-			}
-		}
-
-		protected TFPos GetTfPos(string streamId, long eventNumber) {
-			return _all.Last(v => v.Value.EventStreamId == streamId && v.Value.EventNumber == eventNumber).Key;
-		}
-
-		public void AssertLastEvent(string streamId, string data, string message = null, int skip = 0) {
-			message = message ?? string.Format("Invalid last event in the '{0}' stream. ", streamId);
-			List<EventRecord> events;
-			Assert.That(_streams.TryGetValue(streamId, out events), message + "The stream does not exist.");
-			events = events.Take(events.Count - skip).ToList();
-			Assert.IsNotEmpty(events, message + "The stream is empty.");
-			var last = events[events.Count - 1];
-			Assert.AreEqual(data, Encoding.UTF8.GetString(last.Data.Span));
-		}
-
-		public void AssertLastEventJson<T>(string streamId, T json, string message = null, int skip = 0) {
-			message = message ?? string.Format("Invalid last event in the '{0}' stream. ", streamId);
-			List<EventRecord> events;
-			Assert.That(_streams.TryGetValue(streamId, out events), message + "The stream does not exist.");
-			events = events.Take(events.Count - skip).ToList();
-			Assert.IsNotEmpty(events, message + "The stream is empty.");
-			var last = events[events.Count - 1];
-			Assert.IsTrue((last.Flags & PrepareFlags.IsJson) != 0);
-			HelperExtensions.AssertJson(json, last.Data.ParseJson<JObject>());
-		}
-
-		public void AssertLastEventIs(string streamId, string eventType, string message = null, int skip = 0) {
-			message = message ?? string.Format("Invalid last event in the '{0}' stream. ", streamId);
-			List<EventRecord> events;
-			Assert.That(_streams.TryGetValue(streamId, out events), message + "The stream does not exist.");
-			events = events.Take(events.Count - skip).ToList();
-			Assert.IsNotEmpty(events, message + "The stream is empty.");
-			var last = events[events.Count - 1];
-			Assert.AreEqual(eventType, last.EventType);
-		}
-
-		public void AssertStreamTail(string streamId, params string[] data) {
-			var message = string.Format("Invalid events in the '{0}' stream. ", streamId);
-			List<EventRecord> events;
-			Assert.That(_streams.TryGetValue(streamId, out events), message + "The stream does not exist.");
-			var eventsText = events.Skip(events.Count - data.Length).Select(v => Encoding.UTF8.GetString(v.Data.Span))
-				.ToList();
-			if (data.Length > 0)
-				Assert.IsNotEmpty(events, message + "The stream is empty.");
-
-			Assert.That(
-				data.SequenceEqual(eventsText),
-				string.Format(
-					"{0} does end with: {1} the tail is: {2}", streamId, data.Aggregate("", (a, v) => a + " " + v),
-					eventsText.Aggregate("", (a, v) => a + " " + v)));
-		}
-
-		public void AssertStreamTailWithLinks(string streamId, params string[] data) {
-			var message = string.Format("Invalid events in the '{0}' stream. ", streamId);
-			List<EventRecord> events;
-			Assert.That(_streams.TryGetValue(streamId, out events), message + "The stream does not exist.");
-			var eventsText =
-				events.Skip(events.Count - data.Length)
-					.Select(v => new {Text = Encoding.UTF8.GetString(v.Data.Span), EventType = v.EventType})
-					.Select(
-						v =>
-							v.EventType == SystemEventTypes.LinkTo
-								? ResolveEventText(v.Text)
-								: v.EventType + ":" + v.Text)
-					.ToList();
-			if (data.Length > 0)
-				Assert.IsNotEmpty(events, message + "The stream is empty.");
-
-			Assert.That(
-				data.SequenceEqual(eventsText),
-				string.Format(
-					"{0} does not end with: {1}. the tail is: {2}", streamId, data.Aggregate("", (a, v) => a + " " + v),
-					eventsText.Aggregate("", (a, v) => a + " " + v)));
-		}
-
-		private string ResolveEventText(string link) {
-			var stream = SystemEventTypes.StreamReferenceEventToStreamId(SystemEventTypes.LinkTo, link);
-			var eventNumber = SystemEventTypes.EventLinkToEventNumber(link);
-			return _streams[stream][(int)eventNumber].EventType + ":"
-			                                                    +
-			                                                    Encoding.UTF8.GetString(
-				                                                    _streams[stream][(int)eventNumber].Data.Span);
-		}
-
-		public void AssertStreamContains(string streamId, params string[] data) {
-			var message = string.Format("Invalid events in the '{0}' stream. ", streamId);
-			List<EventRecord> events;
-			Assert.That(_streams.TryGetValue(streamId, out events), message + "The stream does not exist.");
-			if (data.Length > 0)
-				Assert.IsNotEmpty(events, message + "The stream is empty.");
-
-			var eventsData = new HashSet<string>(events.Select(v => Encoding.UTF8.GetString(v.Data.Span)));
-			var missing = data.Where(v => !eventsData.Contains(v)).ToArray();
-
-			Assert.That(missing.Length == 0,
-				string.Format("{0} does not contain: {1}", streamId, missing.Aggregate("", (a, v) => a + " " + v)));
-		}
-
-		public void AssertEvent(string streamId, long eventNumber, string data) {
-			throw new NotImplementedException();
-		}
-
-		public void AssertEmptyStream(string streamId) {
-			throw new NotImplementedException();
-		}
-
-		public void AssertEmptyOrNoStream(string streamId) {
-			List<EventRecord> events;
-			Assert.That(
-				!_streams.TryGetValue(streamId, out events) || events.Count == 0,
-				string.Format("The stream {0} should not exist.", streamId));
-		}
-
-		[Conditional("DEBUG")]
-		public void DumpStream(string streamId) {
-#if DEBUG
-			if (_deletedStreams.Contains(streamId))
-				Console.WriteLine("Stream '{0}' has been deleted", streamId);
-
-			List<EventRecord> list;
-			if (!_streams.TryGetValue(streamId, out list) || list == null)
-				Console.WriteLine("Stream '{0}' does not exist", streamId);
-			if (list != null) {
-				for (int index = 0; index < list.Count; index++) {
-					var record = list[index];
-					try {
-						Console.WriteLine("{0}: '{1}' ==> \r\n{2}", index, record.EventType, record.DebugDataView);
-					} catch (Exception ex) {
-						Console.WriteLine("EXCEPTION: {0}", ex);
-					}
-				}
-			}
-#endif
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/TestFixtureWithReadWriteDispatchers.cs b/src/EventStore.Core.Tests/Helpers/TestFixtureWithReadWriteDispatchers.cs
deleted file mode 100644
index 67cd2cc7c58..00000000000
--- a/src/EventStore.Core.Tests/Helpers/TestFixtureWithReadWriteDispatchers.cs
+++ /dev/null
@@ -1,209 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Bus.Helpers;
-using EventStore.Core.Tests.Services.TimeService;
-using NUnit.Framework;
-using System.Linq;
-using EventStore.Core.Metrics;
-using DotNext;
-
-namespace EventStore.Core.Tests.Helpers {
-	public abstract class TestFixtureWithReadWriteDispatchers {
-		protected SynchronousScheduler _bus;
-		protected IQueuedHandler _publisher;
-
-		protected RequestResponseDispatcher<ClientMessage.DeleteStream, ClientMessage.DeleteStreamCompleted>
-			_streamDispatcher;
-
-		protected RequestResponseDispatcher<ClientMessage.WriteEvents, ClientMessage.WriteEventsCompleted>
-			_writeDispatcher;
-
-		protected ReadDispatcher _readDispatcher;
-
-		protected TestHandler<Message> _consumer;
-		protected IODispatcher _ioDispatcher;
-		protected ManualQueue _queue;
-		protected ManualQueue[] _otherQueues;
-		protected FakeTimeProvider _timeProvider;
-		private IEnvelope _envelope;
-
-		protected IEnvelope Envelope {
-			get {
-				if (_envelope == null)
-					_envelope = GetInputQueue();
-				return _envelope;
-			}
-		}
-
-		protected List<Message> HandledMessages {
-			get { return _consumer.HandledMessages; }
-		}
-
-		[SetUp]
-		public void setup0() {
-			_envelope = null;
-			_timeProvider = new FakeTimeProvider();
-			_bus = new SynchronousScheduler();
-			_publisher = new QueuedHandlerThreadPool(_bus,
-				"TestQueue",
-				new QueueStatsManager(),
-				new QueueTrackers(), watchSlowMsg: false);
-			_publisher.Start();
-			_consumer = new TestHandler<Message>();
-			_bus.Subscribe(_consumer);
-			_queue = GiveInputQueue();
-			_otherQueues = null;
-			_ioDispatcher = new IODispatcher(_bus, GetInputQueue());
-			_readDispatcher = _ioDispatcher.BackwardReader;
-			_writeDispatcher = _ioDispatcher.Writer;
-			_streamDispatcher = _ioDispatcher.StreamDeleter;
-
-			_bus.Subscribe(_ioDispatcher.ForwardReader);
-			_bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_ioDispatcher.BackwardReader);
-			_bus.Subscribe<ClientMessage.NotHandled>(_ioDispatcher.BackwardReader);
-			_bus.Subscribe(_ioDispatcher.ForwardReader);
-			_bus.Subscribe(_ioDispatcher.Writer);
-			_bus.Subscribe(_ioDispatcher.StreamDeleter);
-			_bus.Subscribe(_ioDispatcher.Awaker);
-			_bus.Subscribe<IODispatcherDelayedMessage>(_ioDispatcher);
-			_bus.Subscribe<ClientMessage.NotHandled>(_ioDispatcher);
-		}
-
-		protected virtual ManualQueue GiveInputQueue() {
-			return null;
-		}
-
-		protected IPublisher GetInputQueue() {
-			return _queue.As<IPublisher>() ?? _bus;
-		}
-
-		protected void DisableTimer() {
-			_queue.DisableTimer();
-		}
-
-		protected void EnableTimer() {
-			_queue.EnableTimer();
-		}
-
-		protected void WhenLoop() {
-			_queue.Process();
-			var steps = PreWhen().Concat(When());
-			WhenLoop(steps);
-		}
-
-		protected void WhenLoop(IEnumerable<WhenStep> steps) {
-			foreach (var step in steps) {
-				_timeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(10));
-				if (step.Action != null) {
-					step.Action();
-				}
-
-				foreach (var message in step) {
-					if (message != null)
-						_queue.Publish(message);
-				}
-
-				_queue.ProcessTimer();
-				if (_otherQueues != null)
-					foreach (var other in _otherQueues)
-						other.ProcessTimer();
-
-				var count = 1;
-				var total = 0;
-				while (count > 0) {
-					count = 0;
-					count += _queue.ProcessNonTimer();
-					if (_otherQueues != null)
-						foreach (var other in _otherQueues)
-							count += other.ProcessNonTimer();
-					total += count;
-					if (total > 2000)
-						throw new Exception("Infinite loop?");
-				}
-
-				// process final timer messages
-			}
-
-			_queue.Process();
-			if (_otherQueues != null)
-				foreach (var other in _otherQueues)
-					other.Process();
-		}
-
-		public static T EatException<T>(Func<T> func, T defaultValue = default(T)) {
-			try {
-				return func();
-			} catch (Exception) {
-				return defaultValue;
-			}
-		}
-
-		public sealed class WhenStep : IEnumerable<Message> {
-			public readonly Action Action;
-			public readonly Message Message;
-			public readonly IEnumerable<Message> Messages;
-
-			private WhenStep(Message message) {
-				Message = message;
-			}
-
-			internal WhenStep(IEnumerable<Message> messages) {
-				Messages = messages;
-			}
-
-			public WhenStep(params Message[] messages) {
-				Messages = messages;
-			}
-
-			public WhenStep(Action action) {
-				Action = action;
-			}
-
-			internal WhenStep() {
-			}
-
-			public static implicit operator WhenStep(Message message) {
-				return new WhenStep(message);
-			}
-
-			public IEnumerator<Message> GetEnumerator() {
-				return GetMessages().GetEnumerator();
-			}
-
-			private IEnumerable<Message> GetMessages() {
-				if (Message != null)
-					yield return Message;
-				else if (Messages != null)
-					foreach (var message in Messages)
-						yield return message;
-				else yield return null;
-			}
-
-			IEnumerator IEnumerable.GetEnumerator() {
-				return GetEnumerator();
-			}
-		}
-
-		protected virtual IEnumerable<WhenStep> PreWhen() {
-			yield break;
-		}
-
-		protected virtual IEnumerable<WhenStep> When() {
-			yield break;
-		}
-
-		public readonly WhenStep Yield = new WhenStep();
-	}
-
-	public static class TestUtils {
-		public static TestFixtureWithReadWriteDispatchers.WhenStep ToSteps(
-			this IEnumerable<TestFixtureWithReadWriteDispatchers.WhenStep> steps) {
-			return new TestFixtureWithReadWriteDispatchers.WhenStep(steps.SelectMany(v => v));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/TestHelper.cs b/src/EventStore.Core.Tests/Helpers/TestHelper.cs
deleted file mode 100644
index ff37925dee0..00000000000
--- a/src/EventStore.Core.Tests/Helpers/TestHelper.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.Core.Tests.Helpers {
-	public static class TestHelper {
-		public static void Consume<T>(T v) {
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Helpers/WebHostBuilderExtensions.cs b/src/EventStore.Core.Tests/Helpers/WebHostBuilderExtensions.cs
deleted file mode 100644
index 3c887fed45c..00000000000
--- a/src/EventStore.Core.Tests/Helpers/WebHostBuilderExtensions.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace EventStore.Core.Tests.Helpers {
-	internal static class WebHostBuilderExtensions {
-		public static IWebHostBuilder UseStartup(this IWebHostBuilder builder, IStartup startup)
-			=> builder
-				.ConfigureServices(services => services.AddSingleton(startup));
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/ArgumentPassing/matching.cs b/src/EventStore.Core.Tests/Http/ArgumentPassing/matching.cs
deleted file mode 100644
index 09a4024c3dd..00000000000
--- a/src/EventStore.Core.Tests/Http/ArgumentPassing/matching.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using System.Net;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using Newtonsoft.Json.Linq;
-
-namespace EventStore.Core.Tests.Http.ArgumentPassing {
-	namespace matching {
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		class when_matching_against_simple_placeholders<TLogFormat, TStreamId> : HttpBehaviorSpecification<TLogFormat, TStreamId> {
-			private JObject _response;
-
-			protected override Task Given() => Task.CompletedTask;
-			protected override Task When() => Task.CompletedTask;
-
-			[Test]
-			[TestCase("1", "1", "2", "2")]
-			[TestCase("1", "1", "%41", "A")]
-			[TestCase("1", "1", "$", "$")]
-			[TestCase("1", "1", "%24", "$")]
-			[TestCase("%24", "$", "2", "2")]
-			[TestCase("$", "$", "2", "2")]
-			[TestCase("$", "$", "йцукен", "йцукен")]
-			[TestCase("$", "$", "%D0%B9%D1%86%D1%83%D0%BA%D0%B5%D0%BD", "йцукен")]
-			[TestCase("йцукен", "йцукен", "2", "2")]
-			[TestCase("%D0%B9%D1%86%D1%83%D0%BA%D0%B5%D0%BD", "йцукен", "2", "2")]
-			//            [TestCase("%3F", "?", "2", "2")] // ?
-			//            [TestCase("%2F", "/", "2", "2")] // /
-			[TestCase("%20", " ", "2", "2")] // space
-			[TestCase("%25", "%", "2", "2")] // %
-			public async Task returns_ok_status_code(string _a, string _ra, string _b, string _rb) {
-				_response = await GetJson2<JObject>("/test-encoding/" + _a, "b=" + _b);
-				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-				HelperExtensions.AssertJson(new { a = _ra, b = _rb }, _response);
-			}
-
-			[Test]
-			[TestCase("*/*")]
-			[TestCase("application/json")]
-			[TestCase("application/json,*/*;q=0.1")]
-			public async Task can_specify_multple_accepts(string accept) {
-				_response = await GetJson<JObject>("/test-encoding/1", accept: accept);
-				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-				HelperExtensions.AssertJson(new { a = "1" }, _response);
-			}
-		}
-
-		[Category("LongRunning")]
-		[Ignore("Only demonstrates differences between .NET and Mono")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		class when_matching_against_placeholders_with_reserved_characters<TLogFormat, TStreamId> : HttpBehaviorSpecification<TLogFormat, TStreamId> {
-			private JObject _response;
-
-			protected override Task Given() => Task.CompletedTask;
-			protected override Task When() => Task.CompletedTask;
-
-			[Test]
-			// [TestCase("%24", "$", "2", "2")]
-			// [TestCase("$", "$", "2", "2")]
-			// [TestCase("%3F", "?", "2", "2")] // ?
-			// [TestCase("%2F", "/", "2", "2")] // /
-			// [TestCase("%20", " ", "2", "2")] // space
-			// [TestCase("%25", "%", "2", "2")] // %
-			public async Task returns_ok_status_code(string _a, string _ra, string _b, string _rb) {
-				_response = await GetJson2<JObject>("/test-encoding-reserved-" + _a, "?b=" + _b);
-				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-				Console.WriteLine(_response.ToString());
-				HelperExtensions.AssertJson(new { a = _ra, b = _rb }, _response);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/Cluster/when_requesting_from_follower.cs b/src/EventStore.Core.Tests/Http/Cluster/when_requesting_from_follower.cs
deleted file mode 100644
index faeb9981124..00000000000
--- a/src/EventStore.Core.Tests/Http/Cluster/when_requesting_from_follower.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-using System;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.Tests.Integration;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Http.Cluster {
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_requesting_from_follower<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
-		private const string TestStream = "test-stream";
-		private const string TestDeleteStream = "test-stream-to-be-deleted";
-		private IPEndPoint _followerEndPoint;
-		private IPEndPoint _leaderEndPoint;
-		private HttpClient _client;
-
-		protected override async Task Given() {
-			var leader = GetLeader();
-			_leaderEndPoint = leader.HttpEndPoint;
-			var follower = GetFollowers().First();
-			_followerEndPoint = follower.HttpEndPoint;
-			_client = follower.CreateHttpClient();
-			
-			// Wait for the admin user to be created
-			await leader.AdminUserCreated;
-			// Wait for the admin user created event to be replicated before starting our tests
-			var leaderIndex = leader.Db.Config.IndexCheckpoint.Read();
-			AssertEx.IsOrBecomesTrue(()=> follower.Db.Config.IndexCheckpoint.Read() >= leaderIndex, 
-				timeout: TimeSpan.FromSeconds(10),
-				msg: $"Waiting for follower to reach index checkpoint timed out! (LeaderIndex={leaderIndex},FollowerState={follower.NodeState})");
-
-			await AddStreamAndWait(leader, follower, TestDeleteStream);
-			await AddStreamAndWait(leader, follower, TestStream);
-		}
-
-		private async Task AddStreamAndWait(MiniClusterNode<TLogFormat, TStreamId> leader,
-			MiniClusterNode<TLogFormat, TStreamId> follower, string streamName)
-		{
-			var leaderIndex = leader.Db.Config.IndexCheckpoint.Read();
-
-			var response = await PostEvent(_followerEndPoint, $"streams/{streamName}", requireLeader: false);
-			Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
-
-			AssertEx.IsOrBecomesTrue(() => leader.Db.Config.IndexCheckpoint.Read() > leaderIndex,
-				timeout: TimeSpan.FromSeconds(10),
-				msg: "Waiting for event to be processed on leader timed out!");
-			
-			leaderIndex = leader.Db.Config.IndexCheckpoint.Read();
-			AssertEx.IsOrBecomesTrue(() => follower.Db.Config.IndexCheckpoint.Read() >= leaderIndex,
-				timeout: TimeSpan.FromSeconds(10),
-				msg: $"Waiting for event to be synced with follower timed out! ({leaderIndex})");
-		}
-
-		public override Task TestFixtureTearDown() {
-			_client?.Dispose();
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public async Task post_events_should_succeed_when_leader_not_required() {
-			var path = $"streams/{TestStream}";
-			var response = await PostEvent(_followerEndPoint, path, requireLeader: false);
-
-			Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
-		}
-
-		[Test]
-		public async Task delete_stream_should_succeed_when_leader_not_required() {
-			var path = $"streams/{TestDeleteStream}";
-			var response = await DeleteStream(_followerEndPoint, path, requireLeader: false);
-
-			Assert.AreEqual(HttpStatusCode.NoContent, response.StatusCode);
-		}
-
-		[Test]
-		public async Task read_from_stream_forward_should_succeed_when_leader_not_required() {
-			var path = $"streams/{TestStream}/0/forward/1";
-			var response = await ReadStream(_followerEndPoint, path, requireLeader: false);
-
-			Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-		}
-
-		[Test]
-		public async Task read_from_stream_backward_should_succeed_when_leader_not_required() {
-			var path = $"streams/{TestStream}";
-			var response = await ReadStream(_followerEndPoint, path, requireLeader: false);
-
-			Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-		}
-
-		[Test]
-		public async Task read_from_all_forward_should_succeed_when_leader_not_required() {
-			var path = $"streams/$all/00000000000000000000000000000000/forward/1";
-			var response = await ReadStream(_followerEndPoint, path, requireLeader: false);
-
-			Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-		}
-
-		[Test]
-		public async Task read_from_all_backward_should_succeed_when_leader_not_required() {
-			var path = $"streams/$all";
-			var response = await ReadStream(_followerEndPoint, path, requireLeader: false);
-
-			Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-		}
-
-		[Test]
-		public async Task should_redirect_to_leader_when_writing_with_requires_leader() {
-			var path = $"streams/{TestStream}";
-			var response = await PostEvent(_followerEndPoint, path);
-
-			Assert.AreEqual(HttpStatusCode.TemporaryRedirect, response.StatusCode);
-			var leaderLocation = CreateUri(_leaderEndPoint, path);
-			Assert.AreEqual(leaderLocation, response.Headers.Location);
-		}
-
-		[Test]
-		public async Task should_redirect_to_leader_when_deleting_with_requires_leader() {
-			var path = $"streams/{TestDeleteStream}";
-			var response = await DeleteStream(_followerEndPoint, path, requireLeader: true);
-
-			Assert.AreEqual(HttpStatusCode.TemporaryRedirect, response.StatusCode);
-			var leaderLocation = CreateUri(_leaderEndPoint, path);
-			Assert.AreEqual(leaderLocation, response.Headers.Location);
-		}
-
-		[Test]
-		public async Task should_redirect_to_leader_when_reading_from_stream_backwards_with_requires_leader() {
-			var path = $"streams/{TestStream}";
-			var response = await ReadStream(_followerEndPoint, path, requireLeader: true);
-
-			Assert.AreEqual(HttpStatusCode.TemporaryRedirect, response.StatusCode);
-			var leaderLocation = CreateUri(_leaderEndPoint, path);
-			Assert.AreEqual(leaderLocation, response.Headers.Location);
-		}
-
-		[Test]
-		public async Task should_redirect_to_leader_when_reading_from_stream_forwards_with_requires_leader() {
-			var path = $"streams/{TestStream}/0/forward/1";
-			var response = await ReadStream(_followerEndPoint, path, requireLeader: true);
-
-			Assert.AreEqual(HttpStatusCode.TemporaryRedirect, response.StatusCode);
-			var leaderLocation = CreateUri(_leaderEndPoint, path);
-			Assert.AreEqual(leaderLocation, response.Headers.Location);
-		}
-
-		[Test]
-		public async Task should_redirect_to_leader_when_reading_from_all_backwards_with_requires_leader() {
-			var path = $"streams/$all";
-			var response = await ReadStream(_followerEndPoint, path, requireLeader: true);
-
-			Assert.AreEqual(HttpStatusCode.TemporaryRedirect, response.StatusCode);
-			var leaderLocation = CreateUri(_leaderEndPoint, path);
-			Assert.AreEqual(leaderLocation, response.Headers.Location);
-		}
-
-		[Test]
-		public async Task should_redirect_to_leader_when_reading_from_all_forwards_with_requires_leader() {
-			var path = $"streams/$all/00000000000000000000000000000000/forward/1";
-			var response = await ReadStream(_followerEndPoint, path, requireLeader: true);
-
-			Assert.AreEqual(HttpStatusCode.TemporaryRedirect, response.StatusCode);
-			var leaderLocation = CreateUri(_leaderEndPoint, path);
-			Assert.AreEqual(leaderLocation, response.Headers.Location);
-		}
-
-		private Task<HttpResponseMessage> ReadStream(IPEndPoint nodeEndpoint, string path, bool requireLeader) {
-			var uri = CreateUri(nodeEndpoint, path);
-			var request = CreateRequest(uri, HttpMethod.Get, requireLeader);
-			request.Headers.Add("Accept", "application/json");
-			return GetRequestResponse(request);
-		}
-
-		private Task<HttpResponseMessage> DeleteStream(IPEndPoint nodeEndpoint, string path, bool requireLeader = true) {
-			var uri = CreateUri(nodeEndpoint, path);
-			var request = CreateRequest(uri, HttpMethod.Delete, requireLeader);
-			return GetRequestResponse(request);
-		}
-
-		private Task<HttpResponseMessage> PostEvent(IPEndPoint nodeEndpoint, string path, bool requireLeader = true) {
-			var uri = CreateUri(nodeEndpoint, path);
-			var request = CreateRequest(uri, HttpMethod.Post, requireLeader);
-
-			request.Headers.Add("ES-EventType", "SomeType");
-			request.Headers.Add("ES-ExpectedVersion", ExpectedVersion.Any.ToString());
-			request.Headers.Add("ES-EventId", Guid.NewGuid().ToString());
-			var data = "{a : \"1\", b:\"3\", c:\"5\" }";
-			request.Content = new StringContent(data, Encoding.UTF8, "application/json");
-
-			return GetRequestResponse(request);
-		}
-		
-		private static string GetAuthorizationHeader(NetworkCredential credentials)
-			=> Convert.ToBase64String(Encoding.ASCII.GetBytes($"{credentials.UserName}:{credentials.Password}"));
-
-		private HttpRequestMessage CreateRequest(Uri uri, HttpMethod method, bool requireLeader) {
-			var request = new HttpRequestMessage(method, uri);
-			request.Headers.Add("ES-RequireLeader", requireLeader ? "True" : "False");
-			request.Headers.Authorization = new AuthenticationHeaderValue("Basic",
-            					GetAuthorizationHeader(DefaultData.AdminNetworkCredentials));
-			return request;
-		}
-
-		private async Task<HttpResponseMessage> GetRequestResponse(HttpRequestMessage request) {
-			var response = await _client.SendAsync(request);
-			return response;
-		}
-
-		private Uri CreateUri(IPEndPoint nodeEndpoint, string path) {
-			var uriBuilder = new UriBuilder("https", nodeEndpoint.Address.ToString(), nodeEndpoint.Port, path);
-			return uriBuilder.Uri;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/HealthChecks/when_performing_a_live_check.cs b/src/EventStore.Core.Tests/Http/HealthChecks/when_performing_a_live_check.cs
deleted file mode 100644
index dbc8f3754e9..00000000000
--- a/src/EventStore.Core.Tests/Http/HealthChecks/when_performing_a_live_check.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Reflection;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Http.HealthChecks {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_performing_a_live_check<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private MiniNode<TLogFormat, TStreamId> _node;
-		private bool _nodeStarted;
-		[SetUp]
-		public void SetUp() {
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName);
-		}
-
-		[TearDown]
-		public async Task Teardown() {
-			if (_nodeStarted) {
-				await _node.Shutdown();
-			}
-		}
-
-		private static readonly object[] MethodAllowedTestCases = {
-			new object[] {HttpMethod.Head},
-			new object[] {HttpMethod.Get},
-		};
-
-		private static readonly object[] MethodNotAllowedTestCases = typeof(HttpMethod)
-			.GetProperties(BindingFlags.Public | BindingFlags.Static)
-			.Where(pi => pi.PropertyType == typeof(HttpMethod))
-			.Select(pi => (HttpMethod)pi.GetValue(null))
-			.Where(x => x != HttpMethod.Get && x != HttpMethod.Head)
-			.Select(x => new object[] { x })
-			.ToArray();
-
-		[TestCaseSource(nameof(MethodAllowedTestCases))]
-		public async Task before_start_returns_error(HttpMethod method) {
-			using var response = await _node.HttpClient.SendAsync(new HttpRequestMessage(method, "/health/live"));
-			_nodeStarted = false; //just for clarity
-			Assert.GreaterOrEqual((int)response.StatusCode, 500);
-		}
-
-		[TestCaseSource(nameof(MethodAllowedTestCases))]
-		public async Task after_start_returns_success(HttpMethod method) {
-			await _node.Start()
-				.WithTimeout();
-			_nodeStarted = true;
-			using var response = await _node.HttpClient.SendAsync(new HttpRequestMessage(method, "/health/live") {
-				Version = new Version(2, 0)
-			});
-
-			Assert.GreaterOrEqual((int)response.StatusCode, 200);
-			Assert.Less((int)response.StatusCode, 400);
-		}
-
-		[TestCaseSource(nameof(MethodAllowedTestCases))]
-		public async Task with_liveCode_parameter_returns_the_same_liveCode(HttpMethod method) {
-			await _node.Start()
-				.WithTimeout();
-			_nodeStarted = true;
-			using var response = await _node.HttpClient.SendAsync(new HttpRequestMessage(method, "/health/live?liveCode=200") {
-				Version = new Version(2, 0)
-			});
-
-			Assert.AreEqual((int)response.StatusCode, 200);
-		}
-
-		[TestCaseSource(nameof(MethodAllowedTestCases))]
-		public async Task after_shutdown_returns_error(HttpMethod method) {
-			await _node.Start()
-				.WithTimeout();
-			_nodeStarted = true;
-			await _node.Node.StopAsync()
-				.WithTimeout();
-
-			using var response = await _node.HttpClient.SendAsync(new HttpRequestMessage(method, "/health/live"));
-
-			Assert.GreaterOrEqual((int)response.StatusCode, 500);
-		}
-
-		[TestCaseSource(nameof(MethodNotAllowedTestCases))]
-		public async Task using_methods_other_than_get_or_head_returns_method_not_allowed(HttpMethod method) {
-			await _node.Start()
-				.WithTimeout();
-			_nodeStarted = true;
-			using var response = await _node.HttpClient.SendAsync(new HttpRequestMessage(method, "/health/live"));
-
-			Assert.AreEqual(HttpStatusCode.MethodNotAllowed, response.StatusCode);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/HttpBehaviorSpecification.cs b/src/EventStore.Core.Tests/Http/HttpBehaviorSpecification.cs
deleted file mode 100644
index a8c28054df2..00000000000
--- a/src/EventStore.Core.Tests/Http/HttpBehaviorSpecification.cs
+++ /dev/null
@@ -1,447 +0,0 @@
-using System;
-using System.Collections.Specialized;
-using System.IO;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-using EventStore.ClientAPI;
-using EventStore.Common.Utils;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using EventStore.ClientAPI.Transport.Http;
-using Newtonsoft.Json.Serialization;
-using Newtonsoft.Json.Converters;
-
-namespace EventStore.Core.Tests.Http {
-	public abstract class HttpBehaviorSpecification<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		protected MiniNode<TLogFormat, TStreamId> _node;
-		protected IEventStoreConnection _connection;
-		protected HttpResponseMessage _lastResponse;
-		protected string _lastResponseBody;
-		protected byte[] _lastResponseBytes;
-		protected JsonException _lastJsonException;
-
-		private readonly System.Collections.Generic.List<HttpResponseMessage> _allResponses =
-			new System.Collections.Generic.List<HttpResponseMessage>();
-
-		private string _tag = default;
-		private NetworkCredential _defaultCredentials;
-		protected HttpClient _client => _node.HttpClient;
-
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_node = CreateMiniNode();
-			await _node.Start();
-
-			_connection = TestConnection.Create(_node.TcpEndPoint);
-			await _connection.ConnectAsync();
-
-			_lastResponse = null;
-			_lastResponseBody = null;
-			_lastResponseBytes = null;
-			_lastJsonException = null;
-
-			await Given().WithTimeout(TimeSpan.FromMinutes(5));
-
-			await When().WithTimeout(TimeSpan.FromMinutes(5));
-		}
-
-		public string TestStream {
-			get { return "/streams/test" + Tag; }
-		}
-
-		public string TestStreamName {
-			get { return "test" + Tag; }
-		}
-
-		public string TestMetadataStream {
-			get { return "/streams/$$test" + Tag; }
-		}
-
-		public string Tag {
-			get { return _tag; }
-		}
-
-		protected virtual MiniNode<TLogFormat, TStreamId> CreateMiniNode() =>
-			new(PathName);
-
-		protected virtual bool GivenSkipInitializeStandardUsersCheck() => false;
-
-		public override async Task TestFixtureTearDown() {
-			_connection.Close();
-			await _node.Shutdown();
-			await base.TestFixtureTearDown();
-			foreach (var response in _allResponses) {
-				response?.Dispose();
-			}
-		}
-
-		protected HttpRequestMessage CreateRequest(
-			string path, string extra, string method, string contentType, NetworkCredential credentials = null,
-			NameValueCollection headers = null) {
-			credentials ??= _defaultCredentials;
-			var uri = MakeUrl(path, extra);
-			var httpWebRequest = new HttpRequestMessage(new System.Net.Http.HttpMethod(method), uri);
-			if (headers != null) {
-				foreach (var key in headers.AllKeys) {
-					httpWebRequest.Headers.Add(key, headers.GetValues(key));
-				}
-			}
-			if (credentials != null) {
-				httpWebRequest.Headers.Add("authorization", $"Basic {GetAuthorizationHeader(credentials)}");
-			}
-
-			return httpWebRequest;
-		}
-
-		protected HttpRequestMessage CreateRequest(string path, string method, NetworkCredential credentials = null,
-			string extra = null)
-			=> CreateRequest(path, extra, method, null, credentials);
-
-		protected static string GetAuthorizationHeader(NetworkCredential credentials)
-			=> Convert.ToBase64String(Encoding.ASCII.GetBytes($"{credentials.UserName}:{credentials.Password}"));
-
-		protected Uri MakeUrl(string path, string extra = "") {
-			var supplied = string.IsNullOrWhiteSpace(extra)
-				? new Uri(path, UriKind.RelativeOrAbsolute)
-				: new Uri(path + "?" + extra, UriKind.RelativeOrAbsolute);
-
-			if (supplied.IsAbsoluteUri && !supplied.IsFile) // NOTE: is file imporant for mono
-				return supplied;
-
-			var httpEndPoint = _node.HttpEndPoint;
-			var x = new UriBuilder("http", httpEndPoint.Address.ToString(), httpEndPoint.Port, path);
-			x.Query = extra;
-			Console.WriteLine(new string('*', 50) + Environment.NewLine + path + Environment.NewLine + extra +
-							  Environment.NewLine + x.Uri + Environment.NewLine + new string('*', 50));
-
-			return x.Uri;
-		}
-
-		protected Task<HttpResponseMessage> MakeJsonPut<T>(string path, T body, NetworkCredential credentials = null, string extra = null) {
-			credentials ??= _defaultCredentials;
-			var request = CreateRawJsonPostRequest(path, "PUT", body, credentials, extra);
-			return GetRequestResponse(request);
-		}
-
-
-		protected Task<HttpResponseMessage> MakeJsonPost<T>(string path, T body, NetworkCredential credentials = null, string extra = null) {
-			credentials ??= _defaultCredentials;
-			var request = CreateRawJsonPostRequest(path, "POST", body, credentials, extra);
-			return GetRequestResponse(request);
-		}
-
-		protected Task<HttpResponseMessage> MakeArrayEventsPost<T>(string path, T body, NetworkCredential credentials = null, string extra = null) {
-			credentials ??= _defaultCredentials;
-			var request = CreateEventsJsonPostRequest(path, "POST", body, credentials, extra);
-			return GetRequestResponse(request);
-		}
-
-		protected Task<HttpResponseMessage> MakeRawJsonPost<T>(string path, T body, NetworkCredential credentials = null, string extra = null) {
-			credentials ??= _defaultCredentials;
-			var request = CreateRawJsonPostRequest(path, "POST", body, credentials, extra);
-			return GetRequestResponse(request);
-		}
-
-		protected async Task<JObject> MakeJsonPostWithJsonResponse<T>(string path, T body, NetworkCredential credentials = null, string extra = null) {
-			credentials ??= _defaultCredentials;
-			var request = CreateRawJsonPostRequest(path, "POST", body, credentials, extra);
-			_lastResponse = await GetRequestResponse(request);
-			var memoryStream = new MemoryStream();
-			await _lastResponse.Content.CopyToAsync(memoryStream);
-			var bytes = memoryStream.ToArray();
-			_lastResponseBody = Helper.UTF8NoBom.GetString(bytes);
-			try {
-				return _lastResponseBody.ParseJson<JObject>();
-			} catch (JsonException ex) {
-				_lastJsonException = ex;
-				return default;
-			}
-		}
-
-		protected async Task<JObject> MakeJsonEventsPostWithJsonResponse<T>(string path, T body, NetworkCredential credentials = null, string extra = null) {
-			credentials ??= _defaultCredentials;
-			var request = CreateEventsJsonPostRequest(path, "POST", body, credentials, extra);
-			_lastResponse = await GetRequestResponse(request);
-			var memoryStream = new MemoryStream();
-			await _lastResponse.Content.CopyToAsync(memoryStream);
-			var bytes = memoryStream.ToArray();
-			_lastResponseBody = Helper.UTF8NoBom.GetString(bytes);
-			try {
-				return _lastResponseBody.ParseJson<JObject>();
-			} catch (JsonException ex) {
-				_lastJsonException = ex;
-				return default;
-			}
-		}
-
-
-		protected Task<HttpResponseMessage> MakeEventsJsonPut<T>(string path, T body, NetworkCredential credentials, string extra = null) {
-			credentials ??= _defaultCredentials;
-			var request = CreateEventsJsonPostRequest(path, "PUT", body, credentials, extra);
-			return GetRequestResponse(request);
-		}
-
-		protected Task<HttpResponseMessage> MakeRawJsonPut<T>(string path, T body, NetworkCredential credentials, string extra = null) {
-			credentials ??= _defaultCredentials;
-			var request = CreateRawJsonPostRequest(path, "PUT", body, credentials, extra);
-			return GetRequestResponse(request);
-		}
-
-		protected Task<HttpResponseMessage> MakeDelete(string path, NetworkCredential credentials = null, string extra = null) {
-			credentials ??= _defaultCredentials;
-			var request = CreateRequest(path, "DELETE", credentials, extra);
-			return GetRequestResponse(request);
-		}
-
-		protected Task<HttpResponseMessage> MakePost(string path, NetworkCredential credentials = null, string extra = null) {
-			credentials ??= _defaultCredentials;
-			var request = CreateJsonPostRequest(path, credentials, extra);
-			return GetRequestResponse(request);
-		}
-
-		protected async Task<XDocument> GetAtomXml(Uri uri, NetworkCredential credentials = null, string extra = null) {
-			credentials ??= _defaultCredentials;
-			await Get(uri.ToString(), extra, ContentType.Atom, credentials);
-			return XDocument.Parse(_lastResponseBody);
-		}
-
-		protected async Task<XDocument> GetXml(Uri uri, NetworkCredential credentials = null, string extra = null) {
-			credentials ??= _defaultCredentials;
-			await Get(uri.ToString(), null, ContentType.Xml, credentials);
-			return XDocument.Parse(_lastResponseBody);
-		}
-
-		protected async Task<T> GetJson<T>(string path, string accept = null, NetworkCredential credentials = null,
-			NameValueCollection headers = null, string extra = null) {
-			credentials ??= _defaultCredentials;
-			await Get(path, extra, accept, credentials, headers: headers);
-			try {
-				return _lastResponseBody.ParseJson<T>();
-			} catch (JsonException ex) {
-				_lastJsonException = ex;
-				return default;
-			}
-		}
-
-		protected async Task<T> GetJson2<T>(string path, string extra, string accept = null, NetworkCredential credentials = null) {
-			credentials ??= _defaultCredentials;
-			await Get(path, extra, accept, credentials);
-			try {
-				return _lastResponseBody.ParseJson<T>();
-			} catch (JsonException ex) {
-				_lastJsonException = ex;
-				return default;
-			}
-		}
-
-		protected async Task<T> GetJsonWithoutAcceptHeader<T>(string path) {
-			var request = CreateRequest(path, "", "GET", null);
-			_lastResponse = await GetRequestResponse(request);
-			using var memoryStream = new MemoryStream();
-			await _lastResponse.Content.CopyToAsync(memoryStream);
-			var bytes = memoryStream.ToArray();
-			_lastResponseBody = Helper.UTF8NoBom.GetString(bytes);
-			try {
-				return _lastResponseBody.ParseJson<T>();
-			} catch (JsonException ex) {
-				_lastJsonException = ex;
-				return default;
-			}
-		}
-
-		protected async Task Get(string path, string extra, string accept = null, NetworkCredential credentials = null,
-			bool setAcceptHeader = true, NameValueCollection headers = null) {
-			credentials = credentials ?? _defaultCredentials;
-			var request = CreateRequest(path, extra, "GET", null, credentials, headers);
-			if (setAcceptHeader) {
-				request.Headers.Add("accept", accept ?? "application/json");
-			}
-
-			_lastResponse = await GetRequestResponse(request);
-			using var memoryStream = new MemoryStream();
-			await _lastResponse.Content.CopyToAsync(memoryStream);
-			var bytes = memoryStream.ToArray();
-			_lastResponseBytes = bytes;
-			_lastResponseBody = Helper.UTF8NoBom.GetString(bytes);
-		}
-
-		protected async Task<HttpResponseMessage> GetRequestResponse(HttpRequestMessage request) {
-			var response = await _client.SendAsync(request);
-			_allResponses.Add(response);
-
-			/*if (_dumpRequest != null) {
-				var bytes = _dumpRequest(request);
-				if (bytes != null)
-					Console.WriteLine(Encoding.ASCII.GetString(bytes, 0, GetBytesLength(bytes)).TrimEnd('\0'));
-			}
-
-			if (_dumpRequest2 != null) {
-				var bytes = _dumpRequest2(request);
-				if (bytes != null)
-					Console.WriteLine(Encoding.ASCII.GetString(bytes, 0, GetBytesLength(bytes)).TrimEnd('\0'));
-			}
-
-			Console.WriteLine();
-			if (_dumpResponse != null) {
-				var bytes = _dumpResponse(response);
-				var len = _dumpResponse2(response);
-				if (bytes != null)
-					Console.WriteLine(Encoding.ASCII.GetString(bytes, 0, len).TrimEnd('\0'));
-			}*/
-
-			return response;
-		}
-
-		private int GetBytesLength(byte[] bytes) {
-			var index = Array.IndexOf(bytes, 0);
-			return index < 0 ? bytes.Length : index;
-		}
-
-		protected readonly JsonSerializerSettings TestJsonSettings = new JsonSerializerSettings {
-			ContractResolver = new CamelCasePropertyNamesContractResolver(),
-			DateFormatHandling = DateFormatHandling.IsoDateFormat,
-			NullValueHandling = NullValueHandling.Ignore,
-			DefaultValueHandling = DefaultValueHandling.Include,
-			MissingMemberHandling = MissingMemberHandling.Ignore,
-			TypeNameHandling = TypeNameHandling.None,
-			Converters = new JsonConverter[] { new StringEnumConverter() }
-		};
-
-		protected byte[] ToJsonBytes(object source) {
-			string instring = JsonConvert.SerializeObject(source, Newtonsoft.Json.Formatting.Indented, TestJsonSettings);
-			return Helper.UTF8NoBom.GetBytes(instring);
-		}
-
-		protected HttpRequestMessage CreateEventsJsonPostRequest<T>(
-			string path, string method, T body, NetworkCredential credentials = null, string extra = null) {
-			credentials = credentials ?? _defaultCredentials;
-			var request = CreateRequest(path, extra, method, "application/vnd.eventstore.events+json", credentials);
-			request.Content = new ByteArrayContent(ToJsonBytes(body)) {
-				Headers = { ContentType = new MediaTypeHeaderValue("application/vnd.eventstore.events+json") }
-			};
-			return request;
-		}
-
-		protected HttpRequestMessage CreateRawJsonPostRequest<T>(
-			string path, string method, T body, NetworkCredential credentials = null, string extra = null) {
-			credentials ??= _defaultCredentials;
-			var request = CreateRequest(path, extra, method, "application/json", credentials);
-			request.Content = new ByteArrayContent(ToJsonBytes(body)) {
-				Headers = { ContentType = new MediaTypeHeaderValue("application/json") }
-			};
-			return request;
-		}
-		private HttpRequestMessage CreateJsonPostRequest(string path, NetworkCredential credentials = null, string extra = null) {
-			credentials = credentials ?? _defaultCredentials;
-			var request = CreateRequest(path, "POST", credentials, extra);
-
-			return request;
-		}
-		protected void SetDefaultCredentials(NetworkCredential credentials) {
-			_defaultCredentials = credentials;
-		}
-
-		protected abstract Task Given();
-		protected abstract Task When();
-
-		private static Func<HttpResponseMessage, byte[]> CreateDumpResponse() {
-			var r = Expression.Parameter(typeof(HttpResponseMessage), "r");
-			var piCoreResponseData = typeof(HttpResponseMessage).GetProperty(
-				"CoreResponseData",
-				BindingFlags.GetProperty | BindingFlags.NonPublic | BindingFlags.FlattenHierarchy |
-				BindingFlags.Instance);
-			var fim_ConnectStream = piCoreResponseData.PropertyType.GetField("m_ConnectStream",
-				BindingFlags.GetField | BindingFlags.Public | BindingFlags.FlattenHierarchy | BindingFlags.Instance);
-			var connectStreamType = AppDomain.CurrentDomain.GetAssemblies()
-				.Select(a => a.GetType("System.Net.ConnectStream")).Where(t => t != null).FirstOrDefault();
-			var fim_ReadBuffer = connectStreamType.GetField("m_ReadBuffer",
-				BindingFlags.GetField | BindingFlags.NonPublic | BindingFlags.FlattenHierarchy | BindingFlags.Instance);
-			var body = Expression.Field(
-				Expression.Convert(Expression.Field(Expression.Property(r, piCoreResponseData), fim_ConnectStream),
-					connectStreamType), fim_ReadBuffer);
-			var debugExpression = Expression.Lambda<Func<HttpResponseMessage, byte[]>>(body, r);
-			return debugExpression.Compile();
-		}
-
-		private static Func<HttpResponseMessage, int> CreateDumpResponse2() {
-			var r = Expression.Parameter(typeof(HttpResponseMessage), "r");
-			var piCoreResponseData = typeof(HttpResponseMessage).GetProperty(
-				"CoreResponseData",
-				BindingFlags.GetProperty | BindingFlags.NonPublic | BindingFlags.FlattenHierarchy |
-				BindingFlags.Instance);
-			var fim_ConnectStream = piCoreResponseData.PropertyType.GetField("m_ConnectStream",
-				BindingFlags.GetField | BindingFlags.Public | BindingFlags.FlattenHierarchy | BindingFlags.Instance);
-			var connectStreamType = AppDomain.CurrentDomain.GetAssemblies()
-				.Select(a => a.GetType("System.Net.ConnectStream")).Where(t => t != null).FirstOrDefault();
-			var fim_ReadOffset = connectStreamType.GetField("m_ReadOffset",
-				BindingFlags.GetField | BindingFlags.NonPublic | BindingFlags.FlattenHierarchy | BindingFlags.Instance);
-			var fim_ReadBufferSize = connectStreamType.GetField("m_ReadBufferSize",
-				BindingFlags.GetField | BindingFlags.NonPublic | BindingFlags.FlattenHierarchy | BindingFlags.Instance);
-			var stream =
-				Expression.Convert(Expression.Field(Expression.Property(r, piCoreResponseData), fim_ConnectStream),
-					connectStreamType);
-			var body = Expression.Add(Expression.Field(stream, fim_ReadOffset),
-				Expression.Field(stream, fim_ReadBufferSize));
-			var debugExpression = Expression.Lambda<Func<HttpResponseMessage, int>>(body, r);
-			return debugExpression.Compile();
-		}
-
-		private static Func<HttpRequestMessage, byte[]> CreateDumpRequest() {
-			var r = Expression.Parameter(typeof(HttpRequestMessage), "r");
-			var fi_WriteBuffer = typeof(HttpRequestMessage).GetField("_WriteBuffer",
-				BindingFlags.GetField | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.FlattenHierarchy |
-				BindingFlags.Instance);
-			var body = Expression.Field(r, fi_WriteBuffer);
-			var debugExpression = Expression.Lambda<Func<HttpRequestMessage, byte[]>>(body, r);
-			return debugExpression.Compile();
-		}
-
-		private static Func<HttpRequestMessage, byte[]> CreateDumpRequest2() {
-			var r = Expression.Parameter(typeof(HttpRequestMessage), "r");
-			var fi_SubmitWriteStream = typeof(HttpRequestMessage).GetField(
-				"_SubmitWriteStream",
-				BindingFlags.GetField | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.FlattenHierarchy
-				| BindingFlags.Instance);
-			var connectStreamType = AppDomain.CurrentDomain.GetAssemblies()
-				.Select(a => a.GetType("System.Net.ConnectStream")).Where(t => t != null).FirstOrDefault();
-			var piBufferedData = connectStreamType.GetProperty(
-				"BufferedData",
-				BindingFlags.GetProperty | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.FlattenHierarchy
-				| BindingFlags.Instance);
-			var fiheadChunk = piBufferedData.PropertyType.GetField(
-				"headChunk",
-				BindingFlags.GetField | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.FlattenHierarchy
-				| BindingFlags.Instance);
-			var piBuffer = fiheadChunk.FieldType.GetField(
-				"Buffer",
-				BindingFlags.GetProperty | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.FlattenHierarchy
-				| BindingFlags.Instance);
-			var submitWriteStreamExpression = Expression.Field(r, fi_SubmitWriteStream);
-			var headChunk =
-				Expression.Condition(
-					Expression.ReferenceNotEqual(submitWriteStreamExpression,
-						Expression.Constant(null, submitWriteStreamExpression.Type)),
-					Expression.Field(
-						Expression.Property(
-							Expression.Convert(submitWriteStreamExpression, connectStreamType), piBufferedData),
-						fiheadChunk),
-					Expression.Constant(null, fiheadChunk.FieldType));
-			var body =
-				Expression.Condition(
-					Expression.ReferenceNotEqual(headChunk, Expression.Constant(null, headChunk.Type)),
-					Expression.Field(headChunk, piBuffer), Expression.Constant(null, piBuffer.FieldType));
-			var debugExpression = Expression.Lambda<Func<HttpRequestMessage, byte[]>>(body, r);
-			return debugExpression.Compile();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/HttpProtocols/clear_text_http_multiplexing_middleware.cs b/src/EventStore.Core.Tests/Http/HttpProtocols/clear_text_http_multiplexing_middleware.cs
deleted file mode 100644
index ca2702f22ac..00000000000
--- a/src/EventStore.Core.Tests/Http/HttpProtocols/clear_text_http_multiplexing_middleware.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using EventStore.Core.Services.Transport.Http;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Hosting.Server.Features;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.DependencyInjection;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Http.HttpProtocols {
-
-	public class Startup : IStartup{
-		public IServiceProvider ConfigureServices(IServiceCollection services) {
-			return services.AddRouting().BuildServiceProvider();
-		}
-
-		public void Configure(IApplicationBuilder app) {
-			app.UseRouter(router => {
-				router.MapGet("/test", async context => {
-					await context.Response.WriteAsync("hello");
-				});
-			});
-		}
-	}
-
-	[TestFixture]
-	public class clear_text_http_multiplexing_middleware {
-		private IWebHost _host;
-		private string _endpoint;
-
-		[SetUp]
-		public void SetUp() {
-			_host = new WebHostBuilder()
-				.UseKestrel(server => {
-					server.Listen(IPAddress.Loopback, 0, listenOptions => {
-						listenOptions.Use(next => new ClearTextHttpMultiplexingMiddleware(next).OnConnectAsync);
-					});
-				})
-				.UseStartup(new Startup())
-				.Build();
-
-			_host.Start();
-			_endpoint = _host.ServerFeatures.Get<IServerAddressesFeature>().Addresses.Single();
-		}
-
-		[TearDown]
-		public Task Teardown() {
-			_host?.Dispose();
-			return Task.CompletedTask;
-		}
-
-		[Test]
-		public async Task http1_request() {
-			using var client = new HttpClient();
-			var request = new HttpRequestMessage(HttpMethod.Get, _endpoint + "/test");
-			var result = await client.SendAsync(request);
-			Assert.AreEqual(new Version(1,1), result.Version);
-			Assert.AreEqual("hello", await result.Content.ReadAsStringAsync());
-		}
-
-		[Test]
-		public async Task http2_request() {
-			using var client = new HttpClient();
-			var request = new HttpRequestMessage(HttpMethod.Get, _endpoint + "/test") {
-				Version = new Version(2, 0),
-				VersionPolicy = HttpVersionPolicy.RequestVersionExact
-			};
-
-			var result = await client.SendAsync(request);
-			Assert.AreEqual(new Version(2,0), result.Version);
-			Assert.AreEqual("hello", await result.Content.ReadAsStringAsync());
-		}
-
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/HttpResponseHeaderExtensions.cs b/src/EventStore.Core.Tests/Http/HttpResponseHeaderExtensions.cs
deleted file mode 100644
index 2e0f8b64125..00000000000
--- a/src/EventStore.Core.Tests/Http/HttpResponseHeaderExtensions.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Linq;
-using System.Net.Http.Headers;
-
-namespace EventStore.Core.Tests.Http {
-	internal static class HttpResponseHeaderExtensions {
-		public static string GetLocationAsString(this HttpResponseHeaders headers)
-			=> headers.TryGetValues("location", out var values)
-				? values.FirstOrDefault()
-				: default;
-
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/Info/when_getting_options.cs b/src/EventStore.Core.Tests/Http/Info/when_getting_options.cs
deleted file mode 100644
index 9857f457624..00000000000
--- a/src/EventStore.Core.Tests/Http/Info/when_getting_options.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using Newtonsoft.Json.Linq;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Http.Info {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_getting_options<TLogFormat, TStreamId> : HttpBehaviorSpecification<TLogFormat, TStreamId> {
-		protected override Task Given() => Task.CompletedTask;
-
-		protected override async Task When() {
-			await Get("/info/options", "", credentials: DefaultData.AdminNetworkCredentials);
-		}
-
-		[Test]
-		public void sensitive_options_are_hidden_in_response() {
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-
-			var options = _lastResponseBody.ParseJson<JArray>();
-			var sensitiveOption = options.First(x => x.Value<string>("name") == "DefaultAdminPassword");
-			Assert.AreEqual("********", sensitiveOption.Value<string>("value"));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/PersistentSubscription/ack.cs b/src/EventStore.Core.Tests/Http/PersistentSubscription/ack.cs
deleted file mode 100644
index 8c589c8f233..00000000000
--- a/src/EventStore.Core.Tests/Http/PersistentSubscription/ack.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using System.Net;
-using System.Text.RegularExpressions;
-using EventStore.Core.Tests.Http.Users.users;
-using NUnit.Framework;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-using Newtonsoft.Json.Linq;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
-using HttpStatusCode = System.Net.HttpStatusCode;
-using EventStore.Transport.Http;
-
-// ReSharper disable InconsistentNaming
-
-namespace EventStore.Core.Tests.Http.PersistentSubscription {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_acking_a_message<TLogFormat, TStreamId> : with_subscription_having_events<TLogFormat, TStreamId> {
-		private HttpResponseMessage _response;
-		private string _ackLink;
-
-		protected override async Task Given() {
-			await base.Given();
-			var json = await GetJson<JObject>(
-				SubscriptionPath + "/1",
-				ContentType.CompetingJson,
-				_admin);
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-			_ackLink = json["entries"].Children().First()["links"].Children()
-				.First(x => x.Value<string>("relation") == "ack").Value<string>("uri");
-		}
-
-		[TearDown]
-		public void TearDown() {
-			_response.Dispose();
-		}
-
-		protected override async Task When() {
-			_response = await MakePost(_ackLink, _admin);
-		}
-
-		[Test]
-		public void returns_accepted() {
-			Assert.AreEqual(HttpStatusCode.Accepted, _response.StatusCode);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_acking_messages<TLogFormat, TStreamId> : with_subscription_having_events<TLogFormat, TStreamId> {
-		private HttpResponseMessage _response;
-		private string _ackAllLink;
-
-		protected override async Task Given() {
-			await base.Given();
-			var json = await GetJson<JObject>(
-				SubscriptionPath + "/" + Events.Count,
-				ContentType.CompetingJson,
-				_admin);
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-			_ackAllLink = json["links"].Children().First(x => x.Value<string>("relation") == "ackAll")
-				.Value<string>("uri");
-		}
-
-		[TearDown]
-		public void TearDown() {
-			_response.Dispose();
-		}
-
-		protected override async Task When() {
-			_response = await MakePost(_ackAllLink, _admin);
-		}
-
-		[Test]
-		public void returns_accepted() {
-			Assert.AreEqual(HttpStatusCode.Accepted, _response.StatusCode);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/PersistentSubscription/creating.cs b/src/EventStore.Core.Tests/Http/PersistentSubscription/creating.cs
deleted file mode 100644
index b7adbb80589..00000000000
--- a/src/EventStore.Core.Tests/Http/PersistentSubscription/creating.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-using EventStore.Core.Tests.Http.Users.users;
-using NUnit.Framework;
-using System.Collections.Generic;
-using System;
-using System.Threading.Tasks;
-using HttpStatusCode = System.Net.HttpStatusCode;
-using HttpResponseMessage = System.Net.Http.HttpResponseMessage;
-using Newtonsoft.Json.Linq;
-using EventStore.Transport.Http;
-
-namespace EventStore.Core.Tests.Http.PersistentSubscription {
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_creating_a_subscription<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		private HttpResponseMessage _response;
-
-		protected override Task Given() => Task.CompletedTask;
-
-		protected override async Task When() {
-			_response = await MakeJsonPut(
-				"/subscriptions/stream/groupname334",
-				new {
-					ResolveLinkTos = true
-				}, _admin);
-		}
-
-		[OneTimeTearDown]
-		public void TearDown() {
-			_response?.Dispose();
-		}
-
-		[Test]
-		public void returns_created() {
-			Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-		}
-
-		[Test]
-		public void returns_location_header() {
-			Assert.AreEqual("http://" + _node.HttpEndPoint + "/subscriptions/stream/groupname334",
-				_response.Headers.Location.ToString());
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_creating_a_subscription_with_query_params<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		private HttpResponseMessage _response;
-
-		protected override Task Given() => Task.CompletedTask;
-
-		protected override async Task When() {
-			_response = await MakeJsonPut(
-				"/subscriptions/stream/groupname334",
-				new {
-					ResolveLinkTos = true
-				}, _admin, "testing=test");
-		}
-
-		[OneTimeTearDown]
-		public void TearDown() {
-			_response.Dispose();
-		}
-
-		[Test]
-		public void returns_created() {
-			Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-		}
-
-		[Test]
-		public void returns_location_header() {
-			Assert.AreEqual("http://" + _node.HttpEndPoint + "/subscriptions/stream/groupname334",
-				_response.Headers.Location.ToString());
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_creating_a_subscription_without_permissions<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		private HttpResponseMessage _response;
-
-		protected override Task Given() => Task.CompletedTask;
-
-		protected override async Task When() {
-			SetDefaultCredentials(null);
-			_response = await MakeJsonPut(
-				"/subscriptions/stream/groupname337",
-				new {
-					ResolveLinkTos = true
-				});
-		}
-
-		[OneTimeTearDown]
-		public void TearDown() {
-			_response?.Dispose();
-		}
-
-		[Test]
-		public void returns_unauthorised() {
-			Assert.AreEqual(HttpStatusCode.Unauthorized, _response.StatusCode);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_creating_a_duplicate_subscription<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		private HttpResponseMessage _response;
-
-		protected override async Task Given() {
-			_response = await MakeJsonPut(
-				"/subscriptions/stream/groupname453",
-				new {
-					ResolveLinkTos = true
-				}, _admin);
-		}
-
-		protected override async Task When() {
-			_response = await MakeJsonPut(
-				"/subscriptions/stream/groupname453",
-				new {
-					ResolveLinkTos = true
-				}, _admin);
-		}
-
-		[OneTimeTearDown]
-		public void TearDown() {
-			_response?.Dispose();
-		}
-
-		[Test]
-		public void returns_conflict() {
-			Assert.AreEqual(HttpStatusCode.Conflict, _response.StatusCode);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_creating_a_subscription_with_bad_config<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		protected List<object> Events;
-		protected string SubscriptionPath;
-		protected string GroupName;
-		protected HttpResponseMessage Response;
-
-		protected override async Task Given() {
-			Events = new List<object> {
-				new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {A = "1"}},
-				new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {B = "2"}},
-				new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {C = "3"}},
-				new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {D = "4"}}
-			};
-
-			Response = await MakeArrayEventsPost(
-				TestStream,
-				Events,
-				_admin);
-			Assert.AreEqual(HttpStatusCode.Created, Response.StatusCode);
-		}
-
-		protected override async Task When() {
-			GroupName = Guid.NewGuid().ToString();
-			SubscriptionPath = string.Format("/subscriptions/{0}/{1}", TestStream.Substring(9), GroupName);
-			Response = await MakeJsonPut(SubscriptionPath,
-				new {
-					ResolveLinkTos = true,
-					BufferSize = 10,
-					ReadBatchSize = 11
-				},
-				_admin);
-		}
-
-		[OneTimeTearDown]
-		public void TearDown() {
-			Response?.Dispose();
-		}
-
-		[Test]
-		public void returns_bad_request() {
-			Assert.AreEqual(HttpStatusCode.BadRequest, Response.StatusCode);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_creating_persistent_subscription_with_message_timeout_0<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		protected string SubscriptionPath;
-		protected string GroupName;
-		protected HttpResponseMessage Response;
-		protected JObject SubsciptionInfo;
-
-		protected override Task Given() => Task.CompletedTask;
-
-		protected override async Task When() {
-			GroupName = Guid.NewGuid().ToString();
-			SubscriptionPath = string.Format("/subscriptions/{0}/{1}", TestStream.Substring(9), GroupName);
-			Response = await MakeJsonPut(SubscriptionPath,
-				new {
-					ResolveLinkTos = true,
-					MessageTimeoutMilliseconds = 0
-				},
-				_admin);
-
-			SubsciptionInfo = await GetJson<JObject>(SubscriptionPath + "/info", ContentType.Json);
-		}
-
-		[OneTimeTearDown]
-		public void TearDown() {
-			Response?.Dispose();
-		}
-
-		[Test]
-		public void returns_created() {
-			Assert.AreEqual(HttpStatusCode.Created, Response.StatusCode);
-
-		}
-
-		[Test]
-		public void timeout_set_to_0() {
-			Assert.AreEqual(0, SubsciptionInfo.Value<JObject>("config").Value<long?>("messageTimeoutMilliseconds"));
-
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_creating_persistent_subscription_without_message_timeout<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		protected string SubscriptionPath;
-		protected string GroupName;
-		protected HttpResponseMessage Response;
-		protected JObject SubsciptionInfo;
-
-		protected override Task Given() => Task.CompletedTask;
-		protected override async Task When() {
-			GroupName = Guid.NewGuid().ToString();
-			SubscriptionPath = string.Format("/subscriptions/{0}/{1}", TestStream.Substring(9), GroupName);
-			Response = await MakeJsonPut(SubscriptionPath,
-				new {
-					ResolveLinkTos = true,
-				},
-				_admin);
-
-			SubsciptionInfo = await GetJson<JObject>(SubscriptionPath + "/info", ContentType.Json);
-		}
-
-		[OneTimeTearDown]
-		public void TearDown() {
-			Response?.Dispose();
-		}
-
-		[Test]
-		public void returns_created() {
-			Assert.AreEqual(HttpStatusCode.Created, Response.StatusCode);
-
-		}
-
-		[Test]
-		public void timeout_set_to_default_10000() {
-			Assert.AreEqual(10000, SubsciptionInfo.Value<JObject>("config").Value<long?>("messageTimeoutMilliseconds"));
-
-		}
-	}
-
-}
-
diff --git a/src/EventStore.Core.Tests/Http/PersistentSubscription/deleting.cs b/src/EventStore.Core.Tests/Http/PersistentSubscription/deleting.cs
deleted file mode 100644
index 1a3818a1130..00000000000
--- a/src/EventStore.Core.Tests/Http/PersistentSubscription/deleting.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using System;
-using System.Net;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Core.Tests.Http.Users.users;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Http.PersistentSubscription {
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_deleting_non_existing_subscription<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		private HttpResponseMessage _response;
-
-		protected override Task Given() => Task.CompletedTask;
-
-		protected override async Task When() {
-			var req = CreateRequest("/subscriptions/stream/groupname158", "DELETE", _admin);
-			_response = await GetRequestResponse(req);
-		}
-
-		[Test]
-		public void returns_not_found() {
-			Assert.AreEqual(HttpStatusCode.NotFound, _response.StatusCode);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_deleting_an_existing_subscription<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		private HttpResponseMessage _response;
-
-		protected override async Task Given() {
-			_response = await MakeJsonPut(
-				"/subscriptions/stream/groupname156",
-				new {
-					ResolveLinkTos = true
-				}, _admin);
-		}
-
-		protected override async Task When() {
-			var req = CreateRequest("/subscriptions/stream/groupname156", "DELETE", _admin);
-			_response = await GetRequestResponse(req);
-		}
-
-		[Test]
-		public void returns_ok() {
-			Assert.AreEqual(HttpStatusCode.OK, _response.StatusCode);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_deleting_an_existing_subscription_without_permissions<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		private HttpResponseMessage _response;
-
-		protected override async Task Given() {
-			_response = await MakeJsonPut(
-				"/subscriptions/stream/groupname156",
-				new {
-					ResolveLinkTos = true
-				}, _admin);
-		}
-
-		protected override async Task When() {
-			SetDefaultCredentials(null);
-			var req = CreateRequest("/subscriptions/stream/groupname156", "DELETE");
-			_response = await GetRequestResponse(req);
-		}
-
-		[Test]
-		public void returns_unauthorized() {
-			Assert.AreEqual(HttpStatusCode.Unauthorized, _response.StatusCode);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_deleting_an_existing_subscription_with_subscribers<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		private HttpResponseMessage _response;
-		private const string _stream = "astreamname";
-		private readonly string _groupName = Guid.NewGuid().ToString();
-		private SubscriptionDropReason _reason;
-		private Exception _exception;
-		private readonly AutoResetEvent _dropped = new AutoResetEvent(false);
-
-		protected override async Task Given() {
-			_response = await MakeJsonPut(
-				string.Format("/subscriptions/{0}/{1}", _stream, _groupName),
-				new {
-					ResolveLinkTos = true
-				}, _admin);
-			_connection.ConnectToPersistentSubscription(_stream, _groupName, (x, y) => Task.CompletedTask,
-				(sub, reason, e) => {
-					_dropped.Set();
-					_reason = reason;
-					_exception = e;
-				}, DefaultData.AdminCredentials);
-		}
-
-		protected override async Task When() {
-			var req = CreateRequest(string.Format("/subscriptions/{0}/{1}", _stream, _groupName), "DELETE", _admin);
-			_response = await GetRequestResponse(req);
-		}
-
-		[Test]
-		public void returns_ok() {
-			Assert.AreEqual(HttpStatusCode.OK, _response.StatusCode);
-		}
-
-		[Test]
-		public void the_subscription_is_dropped() {
-			Assert.IsTrue(_dropped.WaitOne(TimeSpan.FromSeconds(5)));
-			Assert.AreEqual(SubscriptionDropReason.UserInitiated, _reason);
-			Assert.IsNull(_exception);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/PersistentSubscription/feed.cs b/src/EventStore.Core.Tests/Http/PersistentSubscription/feed.cs
deleted file mode 100644
index 4114d5f498f..00000000000
--- a/src/EventStore.Core.Tests/Http/PersistentSubscription/feed.cs
+++ /dev/null
@@ -1,353 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Net;
-using System.Text;
-using System.Xml;
-using System.Xml.Linq;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Common;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Transport.Http;
-using NUnit.Framework;
-using Newtonsoft.Json.Linq;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.Http.Streams;
-using EventStore.Core.Tests.Http.Users.users;
-using HttpStatusCode = System.Net.HttpStatusCode;
-
-namespace EventStore.Core.Tests.Http.PersistentSubscription {
-	abstract class SpecificationWithLongFeed<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		protected int _numberOfEvents = 5;
-
-		protected string SubscriptionGroupName {
-			get { return "test_subscription_group" + Tag; }
-		}
-
-		protected string _subscriptionEndpoint;
-		protected string _subscriptionStream;
-		protected string _subscriptionGroupName;
-		protected List<Guid> _eventIds = new List<Guid>();
-
-		protected async Task SetupPersistentSubscription(string streamId, string groupName, int messageTimeoutInMs = 10000) {
-			_subscriptionStream = streamId;
-			_subscriptionGroupName = groupName;
-			_subscriptionEndpoint =
-				String.Format("/subscriptions/{0}/{1}", _subscriptionStream, _subscriptionGroupName);
-
-			var response = await MakeJsonPut(
-				_subscriptionEndpoint,
-				new {
-					ResolveLinkTos = true,
-					MessageTimeoutMilliseconds = messageTimeoutInMs
-				}, _admin);
-
-			Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
-		}
-
-		protected async Task<string> PostEvent(int i) {
-			var eventId = Guid.NewGuid();
-			var response = await MakeArrayEventsPost(
-				TestStream, new[] { new { EventId = eventId, EventType = "event-type", Data = new { Number = i } } });
-			_eventIds.Add(eventId);
-			Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
-			return response.Headers.Location.ToString();
-		}
-
-		protected override async Task Given() {
-			await SetupPersistentSubscription(TestStreamName, SubscriptionGroupName);
-			for (var i = 0; i < _numberOfEvents; i++) {
-				await PostEvent(i);
-			}
-		}
-
-		protected string GetLink(JObject feed, string relation) {
-			var rel = (from JObject link in feed["links"]
-					   from JProperty attr in link
-					   where attr.Name == "relation" && (string)attr.Value == relation
-					   select link).SingleOrDefault();
-			return (rel == null) ? (string)null : (string)rel["uri"];
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_retrieving_an_empty_feed<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-		private JObject _feed;
-		private JObject _head;
-		private string _previous;
-
-		protected override async Task Given() {
-			await base.Given();
-			_head = await GetJson<JObject>(_subscriptionEndpoint + "/" + _numberOfEvents, ContentType.CompetingJson);
-			_previous = GetLink(_head, "previous");
-		}
-
-		protected override async Task When() {
-			_feed = await GetJson<JObject>(_previous, ContentType.CompetingJson);
-		}
-
-		[Test]
-		public void returns_ok_status_code() {
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-		}
-
-		[Test]
-		public void does_not_contain_ack_all_link() {
-			var rel = GetLink(_feed, "ackAll");
-			Assert.That(string.IsNullOrEmpty(rel));
-		}
-
-		[Test]
-		public void does_not_contain_nack_all_link() {
-			var rel = GetLink(_feed, "nackAll");
-			Assert.That(string.IsNullOrEmpty(rel));
-		}
-
-		[Test]
-		public void contains_a_link_rel_previous() {
-			var rel = GetLink(_feed, "previous");
-			Assert.That(!string.IsNullOrEmpty(rel));
-		}
-
-		[Test]
-		public void the_feed_is_empty() {
-			Assert.AreEqual(0, _feed["entries"].Count());
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_retrieving_a_feed_with_events<TLogFormat, TStreamId>
-		: SpecificationWithLongFeed<TLogFormat, TStreamId> {
-		private JObject _feed;
-		private List<JToken> _entries;
-
-		protected override async Task When() {
-			var allMessagesFeedLink = String.Format("{0}/{1}", _subscriptionEndpoint, _numberOfEvents);
-			_feed = await GetJson<JObject>(allMessagesFeedLink, ContentType.CompetingJson);
-			_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
-		}
-
-		[Test]
-		public void returns_ok_status_code() {
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-		}
-
-		[Test]
-		public void contains_all_the_events() {
-			Assert.AreEqual(_numberOfEvents, _entries.Count);
-		}
-
-		[Test]
-		public void the_ackAll_link_is_to_correct_uri() {
-			var ids = String.Format("ids={0}", String.Join(",", _eventIds.ToArray()));
-			var ackAllLink = String.Format("subscriptions/{0}/{1}/ack", TestStreamName, SubscriptionGroupName);
-			Assert.AreEqual(MakeUrl(ackAllLink, ids), GetLink(_feed, "ackAll"));
-		}
-
-		[Test]
-		public void the_nackAll_link_is_to_correct_uri() {
-			var ids = String.Format("ids={0}", String.Join(",", _eventIds.ToArray()));
-			var nackAllLink = String.Format("subscriptions/{0}/{1}/nack", TestStreamName, SubscriptionGroupName);
-			Assert.AreEqual(MakeUrl(nackAllLink, ids), GetLink(_feed, "nackAll"));
-		}
-		
-		[Test]
-		public void all_entries_have_retry_count_element() {
-			var allEntriesHaveRetryCount = _feed["entries"].All(entry => entry["retryCount"] != null);
-			Assert.True(allEntriesHaveRetryCount);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_polling_the_head_forward_and_a_new_event_appears<TLogFormat, TStreamId>
-		: SpecificationWithLongFeed<TLogFormat, TStreamId> {
-		private JObject _feed;
-		private JObject _head;
-		private string _previous;
-		private string _lastEventLocation;
-		private List<JToken> _entries;
-
-		protected override async Task Given() {
-			await base.Given();
-			_head = await GetJson<JObject>(_subscriptionEndpoint + "/" + _numberOfEvents, ContentType.CompetingJson);
-			_previous = GetLink(_head, "previous");
-			_lastEventLocation = await PostEvent(-1);
-		}
-
-		protected override async Task When() {
-			_feed = await GetJson<JObject>(_previous, ContentType.CompetingJson);
-			_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
-		}
-
-		[Test]
-		public void returns_ok_status_code() {
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-		}
-
-		[Test]
-		public void returns_a_feed_with_a_single_entry_referring_to_the_last_event() {
-			HelperExtensions.AssertJson(new { entries = new[] { new { Id = _lastEventLocation } } }, _feed);
-		}
-
-		[Test]
-		public void the_ack_link_is_to_correct_uri() {
-			var link = _entries[0]["links"][2];
-			Assert.AreEqual("ack", link["relation"].ToString());
-			var ackLink = String.Format("subscriptions/{0}/{1}/ack/{2}", TestStreamName, SubscriptionGroupName,
-				_eventIds.Last());
-			Assert.AreEqual(MakeUrl(ackLink), link["uri"].ToString());
-		}
-
-		[Test]
-		public void the_nack_link_is_to_correct_uri() {
-			var link = _entries[0]["links"][3];
-			Assert.AreEqual("nack", link["relation"].ToString());
-			var ackLink = String.Format("subscriptions/{0}/{1}/nack/{2}", TestStreamName, SubscriptionGroupName,
-				_eventIds.Last());
-			Assert.AreEqual(MakeUrl(ackLink), link["uri"].ToString());
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_retrieving_a_feed_with_events_with_competing_xml<TLogFormat, TStreamId>
-		: SpecificationWithLongFeed<TLogFormat, TStreamId> {
-		private XDocument document;
-		private XElement[] _entries;
-
-		protected override async Task When() {
-			await Get(MakeUrl(_subscriptionEndpoint + "/" + 1).ToString(), String.Empty, ContentType.Competing);
-			document = XDocument.Parse(_lastResponseBody);
-			_entries = document.GetEntries();
-		}
-
-		[Test]
-		public void the_feed_has_n_events() {
-			Assert.AreEqual(1, _entries.Length);
-		}
-
-		[Test]
-		public void contains_all_the_events() {
-			Assert.AreEqual(1, _entries.Length);
-		}
-
-		[Test]
-		public void the_ackAll_link_is_to_correct_uri() {
-			var ids = String.Format("ids={0}", _eventIds[0]);
-			var ackAllLink = String.Format("subscriptions/{0}/{1}/ack", TestStreamName, SubscriptionGroupName);
-			Assert.AreEqual(MakeUrl(ackAllLink, ids),
-				document.Element(XDocumentAtomExtensions.AtomNamespace + "feed").GetLink("ackAll"));
-		}
-
-		[Test]
-		public void the_nackAll_link_is_to_correct_uri() {
-			var ids = String.Format("ids={0}", _eventIds[0]);
-			var nackAllLink = String.Format("subscriptions/{0}/{1}/nack", TestStreamName, SubscriptionGroupName);
-			Assert.AreEqual(MakeUrl(nackAllLink, ids),
-				document.Element(XDocumentAtomExtensions.AtomNamespace + "feed").GetLink("nackAll"));
-		}
-
-		[Test]
-		public void the_ack_link_is_to_correct_uri() {
-			var result = document.Element(XDocumentAtomExtensions.AtomNamespace + "feed")
-				.Element(XDocumentAtomExtensions.AtomNamespace + "entry")
-				.GetLink("ack");
-			var ackLink = String.Format("subscriptions/{0}/{1}/ack/{2}", TestStreamName, SubscriptionGroupName,
-				_eventIds[0]);
-			Assert.AreEqual(MakeUrl(ackLink), result);
-		}
-
-		[Test]
-		public void the_nack_link_is_to_correct_uri() {
-			var result = document.Element(XDocumentAtomExtensions.AtomNamespace + "feed")
-				.Element(XDocumentAtomExtensions.AtomNamespace + "entry")
-				.GetLink("nack");
-			;
-			var nackLink = String.Format("subscriptions/{0}/{1}/nack/{2}", TestStreamName, SubscriptionGroupName,
-				_eventIds[0]);
-			Assert.AreEqual(MakeUrl(nackLink), result);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_retrieving_a_feed_with_invalid_content_type<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-		protected override Task When() {
-			return Get(MakeUrl(_subscriptionEndpoint + "/" + _numberOfEvents).ToString(), String.Empty, ContentType.Xml);
-		}
-
-		[Test]
-		public void returns_not_acceptable() {
-			Assert.AreEqual(HttpStatusCode.NotAcceptable, _lastResponse.StatusCode);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_retrieving_a_feed_with_events_using_prefix<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-		private JObject _feed;
-		private List<JToken> _entries;
-		private string _prefix;
-
-		protected override async Task When() {
-			_prefix = "myprefix";
-			var headers = new NameValueCollection();
-			headers.Add("X-Forwarded-Prefix", _prefix);
-			var allMessagesFeedLink = String.Format("{0}/{1}", _subscriptionEndpoint, _numberOfEvents);
-			_feed = await GetJson<JObject>(allMessagesFeedLink, ContentType.CompetingJson, headers: headers);
-			_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
-		}
-
-		[Test]
-		public void returns_ok_status_code() {
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-		}
-
-		[Test]
-		public void contains_all_the_events() {
-			Assert.AreEqual(_numberOfEvents, _entries.Count);
-		}
-
-		[Test]
-		public void contains_previous_link_with_prefix() {
-			var previousLink = String.Format("{0}/subscriptions/{1}/{2}/5", _prefix, TestStreamName,
-				SubscriptionGroupName);
-			Assert.AreEqual(MakeUrl(previousLink), GetLink(_feed, "previous"));
-		}
-
-		[Test]
-		public void contains_self_link_with_prefix() {
-			var selfLink = String.Format("{0}/subscriptions/{1}/{2}", _prefix, TestStreamName, SubscriptionGroupName);
-			Assert.AreEqual(MakeUrl(selfLink), GetLink(_feed, "self"));
-		}
-
-		[Test]
-		public void the_ackAll_link_is_to_correct_uri_with_prefix() {
-			var ids = String.Format("ids={0}", String.Join(",", _eventIds.ToArray()));
-			var ackAllLink = String.Format("{0}/subscriptions/{1}/{2}/ack", _prefix, TestStreamName,
-				SubscriptionGroupName);
-			Assert.AreEqual(MakeUrl(ackAllLink, ids), GetLink(_feed, "ackAll"));
-		}
-
-		[Test]
-		public void the_nackAll_link_is_to_correct_uri_with_prefix() {
-			var ids = String.Format("ids={0}", String.Join(",", _eventIds.ToArray()));
-			var nackAllLink = String.Format("{0}/subscriptions/{1}/{2}/nack", _prefix, TestStreamName,
-				SubscriptionGroupName);
-			Assert.AreEqual(MakeUrl(nackAllLink, ids), GetLink(_feed, "nackAll"));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/PersistentSubscription/getting.cs b/src/EventStore.Core.Tests/Http/PersistentSubscription/getting.cs
deleted file mode 100644
index d8213ce51d6..00000000000
--- a/src/EventStore.Core.Tests/Http/PersistentSubscription/getting.cs
+++ /dev/null
@@ -1,310 +0,0 @@
-using System;
-using EventStore.Core.Tests.Http.Users.users;
-using NUnit.Framework;
-using System.Collections.Generic;
-using Newtonsoft.Json.Linq;
-using System.Linq;
-using System.Threading.Tasks;
-using HttpStatusCode = System.Net.HttpStatusCode;
-using EventStore.Transport.Http;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Common;
-
-// ReSharper disable InconsistentNaming
-
-namespace EventStore.Core.Tests.Http.PersistentSubscription {
-	abstract class with_subscription_having_events<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		protected List<object> Events;
-		protected string SubscriptionPath;
-		protected string GroupName;
-		protected int? NumberOfEventsToCreate;
-
-		protected override async Task Given() {
-			Events = new List<object> {
-				new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {A = "1"}},
-				new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {B = "2"}},
-				new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {C = "3"}},
-				new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {D = "4"}}
-			};
-
-			var numberOfEventsToCreate = NumberOfEventsToCreate ?? Events.Count;
-			var response = await MakeArrayEventsPost(
-				TestStream,
-				Events.Take(numberOfEventsToCreate),
-				_admin);
-			Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
-
-			GroupName = Guid.NewGuid().ToString();
-			SubscriptionPath = string.Format("/subscriptions/{0}/{1}", TestStream.Substring(9), GroupName);
-			response = await MakeJsonPut(SubscriptionPath,
-				new {
-					ResolveLinkTos = true,
-					MessageTimeoutMilliseconds = 10000,
-				},
-				_admin);
-			Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
-			AssertEx.IsOrBecomesTrue( () => {
-				var x = GetJson<JObject>(TestStream, accept: ContentType.Json).Result;
-				return x["entries"].Count() == numberOfEventsToCreate;
-			});
-		}
-
-		protected override Task When() => Task.CompletedTask;
-
-		protected async Task SecureStream() {
-			var metadata =
-				(StreamMetadata)
-				StreamMetadata.Build()
-					.SetMetadataReadRole("admin")
-					.SetMetadataWriteRole("admin")
-					.SetReadRole("admin")
-					.SetWriteRole("admin");
-			var jsonMetadata = metadata.AsJsonString();
-			var response = await MakeArrayEventsPost(
-				TestMetadataStream,
-				new[] {
-					new {
-						EventId = Guid.NewGuid(),
-						EventType = SystemEventTypes.StreamMetadata,
-						Data = new JRaw(jsonMetadata)
-					}
-				});
-			Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-class when_getting_messages_without_permission<TLogFormat, TStreamId> : with_subscription_having_events<TLogFormat, TStreamId> {
-		protected override async Task Given() {
-			await base.Given();
-			await SecureStream();
-		}
-
-		protected override async Task When() {
-			SetDefaultCredentials(null);
-			await GetJson<JObject>(
-				SubscriptionPath,
-				ContentType.CompetingJson);
-		}
-
-		[Test]
-		public void returns_unauthorised() {
-			Assert.AreEqual(HttpStatusCode.Unauthorized, _lastResponse.StatusCode);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_getting_messages_from_an_empty_subscription<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		private JObject _response;
-		protected List<object> Events;
-		protected string SubscriptionPath;
-		protected string GroupName;
-
-		protected override async Task Given() {
-			Events = new List<object> {
-				new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {A = "1"}},
-				new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {B = "2"}},
-				new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {C = "3"}},
-				new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {D = "4"}}
-			};
-
-			GroupName = Guid.NewGuid().ToString();
-			SubscriptionPath = string.Format("/subscriptions/{0}/{1}", TestStream.Substring(9), GroupName);
-			var response = await MakeJsonPut(SubscriptionPath,
-				new {
-					ResolveLinkTos = true,
-					MessageTimeoutMilliseconds = 10000
-				},
-				_admin);
-			Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
-
-			response = await MakeArrayEventsPost(
-				TestStream,
-				Events,
-				_admin);
-			Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
-
-			//pull all events out.
-			_response = await GetJson<JObject>(
-				SubscriptionPath + "/" + Events.Count,
-				ContentType.CompetingJson, //todo CLC sort out allowed content types
-				_admin);
-
-			var count = _response["entries"].Count();
-			Assert.AreEqual(Events.Count, count, "Expected {0} events, received {1}", Events.Count, count);
-		}
-
-		protected override async Task When() {
-			_response = await GetJson<JObject>(
-				SubscriptionPath,
-				ContentType.CompetingJson,
-				_admin);
-		}
-
-		[Test]
-		public void return_0_messages() {
-			var count = _response["entries"].Count();
-			Assert.AreEqual(0, count, "Expected {0} events, received {1}", 0, count);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_getting_messages_from_a_subscription_with_n_messages<TLogFormat, TStreamId> : with_subscription_having_events<TLogFormat, TStreamId> {
-		private JObject _response;
-
-		protected override async Task When() {
-			_response = await GetJson<JObject>(
-				SubscriptionPath + "/" + Events.Count,
-				ContentType.CompetingJson, //todo CLC sort out allowed content types
-				_admin);
-		}
-
-		[Test]
-		public void returns_n_messages() {
-			var count = ((JObject)_response)["entries"].Count();
-			Assert.AreEqual(Events.Count, count, "Expected {0} events, received {1}", Events.Count, count);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_getting_messages_from_a_subscription_with_more_than_n_messages<TLogFormat, TStreamId> : with_subscription_having_events<TLogFormat, TStreamId> {
-		private JObject _response;
-
-		protected override async Task When() {
-			_response = await GetJson<JObject>(
-				SubscriptionPath + "/" + (Events.Count - 1),
-				ContentType.CompetingJson, //todo CLC sort out allowed content types
-				_admin);
-		}
-
-		[Test]
-		public void returns_n_messages() {
-			var count = ((JArray)_response["entries"]).Count;
-			Assert.AreEqual(Events.Count - 1, count, "Expected {0} events, received {1}", Events.Count - 1, count);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_getting_messages_from_a_subscription_with_less_than_n_messags<TLogFormat, TStreamId> : with_subscription_having_events<TLogFormat, TStreamId> {
-		private JObject _response;
-
-		protected override async Task When() {
-			_response = await GetJson<JObject>(
-				SubscriptionPath + "/" + (Events.Count + 1),
-				ContentType.CompetingJson, //todo CLC sort out allowed content types
-				_admin);
-		}
-
-		[Test]
-		public void returns_all_messages() {
-			var count = ((JArray)_response["entries"]).Count;
-			Assert.AreEqual(Events.Count, count, "Expected {0} events, received {1}", Events.Count, count);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_getting_messages_from_a_subscription_with_unspecified_count<TLogFormat, TStreamId> : with_subscription_having_events<TLogFormat, TStreamId> {
-		private JObject _response;
-
-		protected override async Task When() {
-			_response = await GetJson<JObject>(
-				SubscriptionPath,
-				ContentType.CompetingJson,
-				_admin);
-		}
-
-		[Test]
-		public void returns_1_message() {
-			var count = ((JArray)_response["entries"]).Count;
-			Assert.AreEqual(1, count, "Expected {0} events, received {1}", 1, count);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_getting_messages_from_a_subscription_with_a_negative_count<TLogFormat, TStreamId> : with_subscription_having_events<TLogFormat, TStreamId> {
-		protected override Task When() {
-			return Get(SubscriptionPath + "/-1",
-				"",
-				ContentType.CompetingJson,
-				_admin);
-		}
-
-		[Test]
-		public void returns_bad_request() {
-			Assert.AreEqual(HttpStatusCode.BadRequest, _lastResponse.StatusCode);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_getting_messages_from_a_subscription_with_a_count_of_0<TLogFormat, TStreamId> : with_subscription_having_events<TLogFormat, TStreamId> {
-		protected override async Task When() {
-			await Get(SubscriptionPath + "/0",
-				"",
-				ContentType.CompetingJson,
-				_admin);
-		}
-
-		[Test]
-		public void returns_bad_request() {
-			Assert.AreEqual(HttpStatusCode.BadRequest, _lastResponse.StatusCode);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_getting_messages_from_a_subscription_with_count_more_than_100<TLogFormat, TStreamId> : with_subscription_having_events<TLogFormat, TStreamId> {
-		protected override async Task When() {
-			await Get(SubscriptionPath + "/101",
-				"",
-				ContentType.CompetingJson,
-				_admin);
-		}
-
-		[Test]
-		public void returns_bad_request() {
-			Assert.AreEqual(HttpStatusCode.BadRequest, _lastResponse.StatusCode);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_getting_messages_from_a_subscription_with_count_not_an_integer<TLogFormat, TStreamId> : with_subscription_having_events<TLogFormat, TStreamId> {
-		protected override Task When() {
-			return Get(SubscriptionPath + "/10.1",
-				"",
-				ContentType.CompetingJson,
-				_admin);
-		}
-
-		[Test]
-		public void returns_bad_request() {
-			Assert.AreEqual(HttpStatusCode.BadRequest, _lastResponse.StatusCode);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_getting_messages_from_a_subscription_with_count_not_a_number<TLogFormat, TStreamId> : with_subscription_having_events<TLogFormat, TStreamId> {
-		protected override Task When() {
-			return Get(SubscriptionPath + "/one",
-				"",
-				ContentType.CompetingJson,
-				_admin);
-		}
-
-		[Test]
-		public void returns_bad_request() {
-			Assert.AreEqual(HttpStatusCode.BadRequest, _lastResponse.StatusCode);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/PersistentSubscription/nack.cs b/src/EventStore.Core.Tests/Http/PersistentSubscription/nack.cs
deleted file mode 100644
index 5926b331eae..00000000000
--- a/src/EventStore.Core.Tests/Http/PersistentSubscription/nack.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using NUnit.Framework;
-using Newtonsoft.Json.Linq;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
-using HttpStatusCode = System.Net.HttpStatusCode;
-using EventStore.Transport.Http;
-
-// ReSharper disable InconsistentNaming
-
-namespace EventStore.Core.Tests.Http.PersistentSubscription {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_nacking_a_message<TLogFormat, TStreamId> : with_subscription_having_events<TLogFormat, TStreamId> {
-		private HttpResponseMessage _response;
-		private string _nackLink;
-
-		protected override async Task Given() {
-			await base.Given();
-			var json = await GetJson<JObject>(
-				SubscriptionPath + "/1",
-				ContentType.CompetingJson,
-				_admin);
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-			Assert.DoesNotThrow(() => {
-				_nackLink = json["entries"].Children().First()["links"].Children()
-					.First(x => x.Value<string>("relation") == "nack").Value<string>("uri");
-			});
-		}
-
-		protected override async Task When() {
-			_response = await MakePost(_nackLink, _admin);
-		}
-
-		[Test]
-		public void returns_accepted() {
-			Assert.AreEqual(HttpStatusCode.Accepted, _response.StatusCode);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_nacking_messages<TLogFormat, TStreamId> : with_subscription_having_events<TLogFormat, TStreamId> {
-		private HttpResponseMessage _response;
-		private string _nackAllLink;
-
-		protected override async Task Given() {
-			await base.Given();
-			var json = await GetJson<JObject>(
-				SubscriptionPath + "/" + Events.Count,
-				ContentType.CompetingJson,
-				_admin);
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-			Assert.DoesNotThrow(() => {
-				_nackAllLink = json["links"].Children().First(x => x.Value<string>("relation") == "nackAll")
-					.Value<string>("uri");
-			});
-		}
-
-		protected override async Task When() {
-			_response = await MakePost(_nackAllLink, _admin);
-		}
-
-		[Test]
-		public void returns_accepted() {
-			Assert.AreEqual(HttpStatusCode.Accepted, _response.StatusCode);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/PersistentSubscription/parked.cs b/src/EventStore.Core.Tests/Http/PersistentSubscription/parked.cs
deleted file mode 100644
index 343f845af1d..00000000000
--- a/src/EventStore.Core.Tests/Http/PersistentSubscription/parked.cs
+++ /dev/null
@@ -1,345 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Net;
-using System.Text.RegularExpressions;
-using EventStore.Core.Tests.Http.Users.users;
-using NUnit.Framework;
-using System.Collections.Generic;
-using System.Threading;
-using Newtonsoft.Json.Linq;
-using System.Linq;
-using HttpStatusCode = System.Net.HttpStatusCode;
-using EventStore.Transport.Http;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Common;
-using EventStore.Core.Data;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-
-namespace EventStore.Core.Tests.Http.PersistentSubscription {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_parking_a_message<TLogFormat, TStreamId> : with_subscription_having_events<TLogFormat, TStreamId> {
-		private string _nackLink;
-		private Guid _eventIdToPark;
-		private Guid _parkedEventId;
-		private List<JToken> _entries;
-		private readonly TaskCompletionSource<bool> _eventParked = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-
-		protected override async Task Given() {
-			NumberOfEventsToCreate = 1;
-			await base.Given();
-			var json = await GetJson2<JObject>(
-				SubscriptionPath + "/1", "embed=rich",
-				ContentType.CompetingJson,
-				_admin);
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-			Assert.DoesNotThrow(() => {
-				_entries = json != null ? json["entries"].ToList() : new List<JToken>();
-	            _nackLink = _entries[0]["links"][3]["uri"].ToString() + "?action=park";
-	            _eventIdToPark = Guid.Parse(_entries[0]["eventId"].ToString());
-			});
-		}
-
-		protected override async Task When() {
-			var parkedStreamId = String.Format("$persistentsubscription-{0}::{1}-parked", TestStreamName, GroupName);
-
-			await _connection.SubscribeToStreamAsync(parkedStreamId, true, (x, y) => {
-					_parkedEventId = y.Event.EventId;
-					_eventParked.TrySetResult(true);
-					return Task.CompletedTask;
-				},
-				(x, y, z) => { },
-				DefaultData.AdminCredentials);
-
-			var response = await MakePost(_nackLink, _admin);
-			Assert.AreEqual(HttpStatusCode.Accepted, response.StatusCode);
-		}
-
-		[Test]
-		public async Task should_have_parked_the_event() {
-			await _eventParked.Task.WithTimeout(5000);
-			Assert.AreEqual(_eventIdToPark, _parkedEventId);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]	
-	class when_replaying_one_all_parked_message<TLogFormat, TStreamId> : with_subscription_having_events<TLogFormat, TStreamId> {
-		private string _nackLink;
-		private Guid _eventIdToPark;
-		private Guid _receivedEventId;
-
-		private string _subscriptionParkedStream;
-		private Guid _writeCorrelationId;
-		private TaskCompletionSource<bool> _eventParked = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-
-		protected override async Task Given() {
-			_connection.Close();
-			_connection.Dispose();
-			NumberOfEventsToCreate = 1;
-			await base.Given();
-
-			_subscriptionParkedStream =
-				"$persistentsubscription-" + TestStream.Substring(9) + "::" + GroupName + "-parked";
-
-			// Subscribe to the writes to ensure the parked message has been written
-			_node.Node.MainBus.Subscribe(new AdHocHandler<StorageMessage.WritePrepares>(Handle));
-			_node.Node.MainBus.Subscribe(new AdHocHandler<StorageMessage.CommitIndexed>(Handle));
-
-			var json = await GetJson2<JObject>(
-				SubscriptionPath + "/1", "embed=rich",
-				ContentType.CompetingJson,
-				_admin);
-
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-
-			var _entries = json != null ? json["entries"].ToList() : new List<JToken>();
-			_nackLink = _entries[0]["links"][3]["uri"].ToString() + "?action=park";
-			_eventIdToPark = Guid.Parse(_entries[0]["eventId"].ToString());
-
-			//Park the message
-			var response = await MakePost(_nackLink, _admin);
-			Assert.AreEqual(HttpStatusCode.Accepted, response.StatusCode);
-		}
-
-		private void Handle(StorageMessage.WritePrepares msg) {
-			if (msg.EventStreamId == _subscriptionParkedStream) {
-				_writeCorrelationId = msg.CorrelationId;
-			}
-		}
-
-		private void Handle(StorageMessage.CommitIndexed msg) {
-			if (msg.CorrelationId == _writeCorrelationId) {
-				_eventParked.TrySetResult(true);
-			}
-		}
-
-		protected override async Task When() {
-			await _eventParked.Task.WithTimeout(10000);
-
-			var response = await MakePost(SubscriptionPath + "/replayParked", _admin);
-			Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-
-			for (var i = 0; i < 10; i++) {
-				var json = await GetJson2<JObject>(
-					SubscriptionPath + "/1", "embed=rich",
-					ContentType.CompetingJson,
-					_admin);
-
-				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-
-				var entries = json != null ? json["entries"].ToList() : new List<JToken>();
-				if (entries.Count != 0) {
-					_receivedEventId = Guid.Parse(entries[0]["eventId"].ToString());
-					break;
-				}
-
-				Console.WriteLine("Received no entries. Attempt {0} of 10", i + 1);
-				await Task.Delay(TimeSpan.FromSeconds(1));
-			}
-		}
-
-		[Test]
-		public void should_receive_the_replayed_event() {
-			Assert.AreEqual(_eventIdToPark, _receivedEventId);
-		}
-	}
-
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_replaying_multiple_all_parked_messages<TLogFormat, TStreamId> : with_subscription_having_events<TLogFormat, TStreamId> {
-		private List<Guid> _parkedEventIds = new List<Guid>();
-		private List<Guid> _receivedEventId = new List<Guid>();
-
-		private string _subscriptionParkedStream;
-		private ConcurrentDictionary<Guid, bool> _writeCorrelationId = new ConcurrentDictionary<Guid, bool>();
-		private TaskCompletionSource<bool> _eventParked = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-		
-		protected override async Task Given() {
-			_connection.Close();
-			_connection.Dispose();
-			NumberOfEventsToCreate = 3;
-			await base.Given();
-
-			_subscriptionParkedStream =
-				"$persistentsubscription-" + TestStream.Substring(9) + "::" + GroupName + "-parked";
-
-			// Subscribe to the writes to ensure the parked message has been written
-			_node.Node.MainBus.Subscribe(new AdHocHandler<StorageMessage.WritePrepares>(Handle));
-			_node.Node.MainBus.Subscribe(new AdHocHandler<StorageMessage.CommitIndexed>(Handle));
-
-			// park 3 events
-			for (int i = 0; i < NumberOfEventsToCreate; i++) {
-				for (var attempt = 0; attempt < 10; attempt++) {
-					var json = await GetJson2<JObject>(
-						SubscriptionPath + "/1", "embed=rich",
-						ContentType.CompetingJson,
-						_admin);
-
-					Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-
-					var entries = json != null ? json["entries"].ToList() : new List<JToken>();
-					if (entries.Count == 1) {
-						//Park the message
-						_parkedEventIds.Add(Guid.Parse(entries[0]["eventId"].ToString()));
-						var nackLink = entries[0]["links"][3]["uri"] + "?action=park";
-						var response = await MakePost(nackLink, _admin);
-						Assert.AreEqual(HttpStatusCode.Accepted, response.StatusCode);
-						break;
-					}
-
-					Console.WriteLine("Received no entries. Attempt {0} of 10", attempt + 1);
-					await Task.Delay(TimeSpan.FromSeconds(1));
-				}
-			}
-		}
-
-		private void Handle(StorageMessage.WritePrepares msg) {
-			if (msg.EventStreamId == _subscriptionParkedStream) {
-				_writeCorrelationId.TryAdd(msg.CorrelationId, true);
-			}
-		}
-
-		private void Handle(StorageMessage.CommitIndexed msg) {
-			if (_writeCorrelationId.TryUpdate(msg.CorrelationId, false, true) && _writeCorrelationId.Count(kvp => !kvp.Value) == NumberOfEventsToCreate) {
-				_eventParked.TrySetResult(true);
-			}
-		}
-
-		protected override async Task When() {
-			await _eventParked.Task.WithTimeout(10000);
-
-			// replay all
-			var response = await MakePost(SubscriptionPath + "/replayParked", _admin);
-			Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-
-			for (int i = 0; i < NumberOfEventsToCreate; i++) {
-				for (var attempt = 0; attempt < 10; attempt++) {
-					var json = await GetJson2<JObject>(
-						SubscriptionPath + "/1", "embed=rich",
-						ContentType.CompetingJson,
-						_admin);
-
-					Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-
-					var entries = json != null ? json["entries"].ToList() : new List<JToken>();
-					if (entries.Count == 1) {
-						_receivedEventId.Add(Guid.Parse(entries[0]["eventId"].ToString()));
-						break;
-					}
-
-					Console.WriteLine("Received no entries. Attempt {0} of 10", attempt + 1);
-					await Task.Delay(TimeSpan.FromSeconds(1));
-				}
-			}
-		}
-
-		[Test]
-		public void should_receive_the_replayed_event() {
-			Assert.AreEqual(_parkedEventIds[0], _receivedEventId[0]);
-			Assert.AreEqual(_parkedEventIds[1], _receivedEventId[1]);
-			Assert.AreEqual(_parkedEventIds[2], _receivedEventId[2]);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_replaying_multiple_some_parked_messages<TLogFormat, TStreamId> : with_subscription_having_events<TLogFormat, TStreamId> {
-		private List<Guid> _parkedEventIds = new List<Guid>();
-		private List<Guid> _receivedEventId = new List<Guid>();
-
-		private string _subscriptionParkedStream;
-		private ConcurrentDictionary<Guid, bool> _writeCorrelationId = new ConcurrentDictionary<Guid, bool>();
-		private TaskCompletionSource<bool> _eventParked = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-
-		protected override async Task Given() {
-			_connection.Close();
-			_connection.Dispose();
-			NumberOfEventsToCreate = 3;
-			await base.Given();
-
-			_subscriptionParkedStream =
-				"$persistentsubscription-" + TestStream.Substring(9) + "::" + GroupName + "-parked";
-
-			// Subscribe to the writes to ensure the parked message has been written
-			_node.Node.MainBus.Subscribe(new AdHocHandler<StorageMessage.WritePrepares>(Handle));
-			_node.Node.MainBus.Subscribe(new AdHocHandler<StorageMessage.CommitIndexed>(Handle));
-
-			// park 3 events
-			for (int i = 0; i < NumberOfEventsToCreate; i++) {
-				for (var attempt = 0; attempt < 10; attempt++) {
-					var json = await GetJson2<JObject>(
-						SubscriptionPath + "/1", "embed=rich",
-						ContentType.CompetingJson,
-						_admin);
-
-					Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-
-					var entries = json != null ? json["entries"].ToList() : new List<JToken>();
-					if (entries.Count == 1) {
-						//Park the message
-						_parkedEventIds.Add(Guid.Parse(entries[0]["eventId"].ToString()));
-						var nackLink = entries[0]["links"][3]["uri"] + "?action=park";
-						var response = await MakePost(nackLink, _admin);
-						Assert.AreEqual(HttpStatusCode.Accepted, response.StatusCode);
-						break;
-					}
-
-					Console.WriteLine("Received no entries. Attempt {0} of 10", attempt + 1);
-					await Task.Delay(TimeSpan.FromSeconds(1));
-				}
-			}
-		}
-
-		private void Handle(StorageMessage.WritePrepares msg) {
-			if (msg.EventStreamId == _subscriptionParkedStream) {
-				_writeCorrelationId.TryAdd(msg.CorrelationId, true);
-			}
-		}
-
-		private void Handle(StorageMessage.CommitIndexed msg) {
-			if (_writeCorrelationId.TryUpdate(msg.CorrelationId, false, true) && _writeCorrelationId.Count(kvp => !kvp.Value) == NumberOfEventsToCreate) {
-				_eventParked.TrySetResult(true);
-			}
-		}
-
-		protected override async Task When() {
-			await _eventParked.Task.WithTimeout(10000);
-
-			// only replay 2 of the 3 messages
-			var response = await MakePost(SubscriptionPath + "/replayParked", _admin, "stopAt=2");
-			Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-
-			for (int i = 0; i < 2; i++) {
-				for (var attempt = 0; attempt < 10; attempt++) {
-					var json = await GetJson2<JObject>(
-						SubscriptionPath + "/1", "embed=rich",
-						ContentType.CompetingJson,
-						_admin);
-
-					Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-
-					var entries = json != null ? json["entries"].ToList() : new List<JToken>();
-					if (entries.Count == 1) {
-						_receivedEventId.Add(Guid.Parse(entries[0]["eventId"].ToString()));
-						break;
-					}
-
-					Console.WriteLine("Received no entries. Attempt {0} of 10", attempt + 1);
-					await Task.Delay(TimeSpan.FromSeconds(1));
-				}
-			}
-		}
-
-		[Test]
-		public void should_receive_the_replayed_event() {
-			Assert.AreEqual(2, _receivedEventId.Count);
-			Assert.AreEqual(3, _parkedEventIds.Count);
-			Assert.AreEqual(_parkedEventIds[0], _receivedEventId[0]);
-			Assert.AreEqual(_parkedEventIds[1], _receivedEventId[1]);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/PersistentSubscription/statistics.cs b/src/EventStore.Core.Tests/Http/PersistentSubscription/statistics.cs
deleted file mode 100644
index f3abf747062..00000000000
--- a/src/EventStore.Core.Tests/Http/PersistentSubscription/statistics.cs
+++ /dev/null
@@ -1,606 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using EventStore.ClientAPI;
-using EventStore.Transport.Http;
-using Newtonsoft.Json.Linq;
-using NUnit.Framework;
-using HttpStatusCode = System.Net.HttpStatusCode;
-using System.Xml.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests.Http.Users.users;
-
-namespace EventStore.Core.Tests.Http.PersistentSubscription {
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class
-		when_getting_statistics_for_new_subscription_for_stream_with_existing_events<TLogFormat, TStreamId> : with_subscription_having_events<TLogFormat, TStreamId> {
-		private JArray _json;
-
-		protected override async Task When() {
-			_json = await GetJson<JArray>("/subscriptions", accept: ContentType.Json);
-		}
-
-		[Test]
-		[Retry(5)]
-		public void returns_ok() {
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-		}
-
-		[Test]
-		[Retry(5)]
-		public void should_reflect_the_known_number_of_events_in_the_stream() {
-			var knownNumberOfEvents = _json[0]["lastKnownEventNumber"].Value<int>() + 1;
-			Assert.AreEqual(Events.Count, knownNumberOfEvents,
-				"Expected the subscription statistics to know about {0} events but seeing {1}", Events.Count,
-				knownNumberOfEvents);
-		}
-	}
-	
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_getting_statistics_for_subscription_with_parked_events<TLogFormat, TStreamId> : with_subscription_having_events<TLogFormat, TStreamId> {
-		private string _nackLink;
-		private JObject _json;
-		private string _streamName;
-
-		private string _subscriptionParkedStream;
-		private Guid _writeCorrelationId;
-		private TaskCompletionSource<bool> _eventParked = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-
-		protected override async Task Given() {
-			_connection.Close();
-			_connection.Dispose();
-			NumberOfEventsToCreate = 1;
-			await base.Given();
-
-			_streamName = TestStream.Substring(9);
-			_subscriptionParkedStream =
-				"$persistentsubscription-" + _streamName + "::" + GroupName + "-parked";
-
-			// Subscribe to the writes to ensure the parked message has been written
-			_node.Node.MainBus.Subscribe(new AdHocHandler<StorageMessage.WritePrepares>(Handle));
-			_node.Node.MainBus.Subscribe(new AdHocHandler<StorageMessage.CommitIndexed>(Handle));
-
-			var json = await GetJson2<JObject>(
-				SubscriptionPath + "/1", "embed=rich",
-				ContentType.CompetingJson,
-				_admin);
-
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-			Assert.DoesNotThrow(() =>
-			{
-				var _entries = json != null ? json["entries"].ToList() : new List<JToken>();
-				_nackLink = _entries[0]["links"][3]["uri"] + "?action=park";
-			});
-
-			//Park the message
-			var response = await MakePost(_nackLink, _admin);
-			Assert.AreEqual(HttpStatusCode.Accepted, response.StatusCode);
-		}
-
-		private void Handle(StorageMessage.WritePrepares msg) {
-			if (msg.EventStreamId == _subscriptionParkedStream) {
-				_writeCorrelationId = msg.CorrelationId;
-			}
-		}
-
-		private void Handle(StorageMessage.CommitIndexed msg) {
-			if (msg.CorrelationId == _writeCorrelationId) {
-				_eventParked.TrySetResult(true);
-			}
-		}
-
-		protected override async Task When() {
-			await _eventParked.Task.WithTimeout();
-			_json = await GetJson<JObject>("/subscriptions/" + _streamName + "/" + GroupName + "/info", ContentType.Json);
-		}
-
-		[Test]
-		[Retry(5)]
-		public void should_show_one_parked_message() {
-			Assert.AreEqual(1, _json["parkedMessageCount"].Value<int>());
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_getting_all_statistics_in_json<TLogFormat, TStreamId> : with_subscription_having_events<TLogFormat, TStreamId> {
-		private JArray _json;
-
-		protected override async Task When() {
-			_json = await GetJson<JArray>("/subscriptions", accept: ContentType.Json);
-		}
-
-		[Test]
-		[Retry(5)]
-		public void returns_ok() {
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-		}
-
-		[Test]
-		[Retry(5)]
-		public void body_contains_valid_json() {
-			Assert.AreEqual(TestStreamName, _json[0]["eventStreamId"].Value<string>());
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_getting_all_statistics_in_xml<TLogFormat, TStreamId> : with_subscription_having_events<TLogFormat, TStreamId> {
-		private XDocument _xml;
-
-		protected override async Task When() {
-			_xml = await GetXml(MakeUrl("/subscriptions"));
-		}
-
-		[Test]
-		[Retry(5)]
-		public void returns_ok() {
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-		}
-
-		[Test]
-		[Retry(5)]
-		public void body_contains_valid_xml() {
-			Assert.AreEqual(TestStreamName, _xml.Descendants("EventStreamId").First().Value);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_getting_non_existent_single_statistics<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		private HttpResponseMessage _response;
-
-		protected override Task Given() => Task.CompletedTask;
-
-		protected override async Task When() {
-			var request = CreateRequest("/subscriptions/fu/fubar", null, "GET", "text/xml");
-			_response = await GetRequestResponse(request);
-		}
-
-		[Test]
-		[Retry(5)]
-		public void returns_not_found() {
-			Assert.AreEqual(HttpStatusCode.NotFound, _response.StatusCode);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_getting_non_existent_stream_statistics<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		private HttpResponseMessage _response;
-
-		protected override Task Given() => Task.CompletedTask;
-
-		protected override async Task When() {
-			var request = CreateRequest("/subscriptions/fubar", null, "GET", "text/xml", null);
-			_response = await GetRequestResponse(request);
-		}
-
-		[Test]
-		[Retry(5)]
-		public void returns_not_found() {
-			Assert.AreEqual(HttpStatusCode.NotFound, _response.StatusCode);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_getting_subscription_statistics_for_individual<TLogFormat, TStreamId> : SpecificationWithPersistentSubscriptionAndConnections<TLogFormat, TStreamId> {
-		private JObject _json;
-
-
-		protected override async Task When() {
-			_json = await GetJson<JObject>("/subscriptions/" + _streamName + "/" + _groupName + "/info", ContentType.Json);
-		}
-
-		[Test]
-		[Retry(5)]
-		public void returns_ok() {
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-		}
-
-		[Test]
-		[Retry(5)]
-		public void detail_rel_href_is_correct() {
-			Assert.AreEqual(
-				string.Format("http://{0}/subscriptions/{1}/{2}/info", _node.HttpEndPoint, _streamName, _groupName),
-				_json["links"][0]["href"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void has_two_rel_links() {
-			Assert.AreEqual(2,
-				_json["links"].Count());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_view_detail_rel_is_correct() {
-			Assert.AreEqual("detail",
-				_json["links"][0]["rel"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_event_stream_is_correct() {
-			Assert.AreEqual(_streamName, _json["eventStreamId"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_groupname_is_correct() {
-			Assert.AreEqual(_groupName, _json["groupName"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_status_is_live() {
-			Assert.AreEqual("Live", _json["status"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void there_are_two_connections() {
-			Assert.AreEqual(2, _json["connections"].Count());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_first_connection_has_endpoint() {
-			Assert.IsNotNull(_json["connections"][0]["from"]);
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_second_connection_has_endpoint() {
-			Assert.IsNotNull(_json["connections"][1]["from"]);
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_first_connection_has_user() {
-			Assert.AreEqual("admin", _json["connections"][0]["username"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_second_connection_has_user() {
-			Assert.AreEqual("admin", _json["connections"][1]["username"].Value<string>());
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_getting_subscription_stats_summary<TLogFormat, TStreamId> : SpecificationWithPersistentSubscriptionAndConnections<TLogFormat, TStreamId> {
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent();
-
-		private JArray _json;
-
-		protected override async Task Given() {
-			await base.Given();
-			await _conn.CreatePersistentSubscriptionAsync(_streamName, "secondgroup", _settings,
-				DefaultData.AdminCredentials);
-			_conn.ConnectToPersistentSubscription(_streamName, "secondgroup",
-				(subscription, @event) => {
-					Console.WriteLine();
-					return Task.CompletedTask;
-				},
-				(subscription, reason, arg3) => Console.WriteLine(),
-				DefaultData.AdminCredentials);
-			_conn.ConnectToPersistentSubscription(_streamName, "secondgroup",
-				(subscription, @event) => {
-					Console.WriteLine();
-					return Task.CompletedTask;
-				},
-				(subscription, reason, arg3) => Console.WriteLine(),
-				DefaultData.AdminCredentials);
-			_conn.ConnectToPersistentSubscription(_streamName, "secondgroup",
-				(subscription, @event) => {
-					Console.WriteLine();
-					return Task.CompletedTask;
-				},
-				(subscription, reason, arg3) => Console.WriteLine(),
-				DefaultData.AdminCredentials);
-		}
-
-		protected override async Task When() {
-			_json = await GetJson<JArray>("/subscriptions", ContentType.Json);
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_response_code_is_ok() {
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_first_event_stream_is_correct() {
-			Assert.AreEqual(_streamName, _json[0]["eventStreamId"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_first_groupname_is_correct() {
-			Assert.AreEqual(_groupName, _json[0]["groupName"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_first_event_stream_detail_uri_is_correct() {
-			Assert.AreEqual(
-				string.Format("http://{0}/subscriptions/{1}/{2}/info", _node.HttpEndPoint, _streamName, _groupName),
-				_json[0]["links"][0]["href"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_first_event_stream_detail_has_one_link() {
-			Assert.AreEqual(1,
-				_json[0]["links"].Count());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_first_event_stream_detail_rel_is_correct() {
-			Assert.AreEqual("detail",
-				_json[0]["links"][0]["rel"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_second_event_stream_detail_uri_is_correct() {
-			Assert.AreEqual(
-				string.Format("http://{0}/subscriptions/{1}/{2}/info", _node.HttpEndPoint, _streamName,
-					"secondgroup"),
-				_json[1]["links"][0]["href"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_second_event_stream_detail_has_one_link() {
-			Assert.AreEqual(1,
-				_json[1]["links"].Count());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_second_event_stream_detail_rel_is_correct() {
-			Assert.AreEqual("detail",
-				_json[1]["links"][0]["rel"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_first_parked_message_queue_uri_is_correct() {
-			Assert.AreEqual(
-				string.Format("http://{0}/streams/%24persistentsubscription-{1}::{2}-parked", _node.HttpEndPoint,
-					_streamName, _groupName), _json[0]["parkedMessageUri"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_second_parked_message_queue_uri_is_correct() {
-			Assert.AreEqual(
-				string.Format("http://{0}/streams/%24persistentsubscription-{1}::{2}-parked", _node.HttpEndPoint,
-					_streamName, "secondgroup"), _json[1]["parkedMessageUri"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_status_is_live() {
-			Assert.AreEqual("Live", _json[0]["status"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void there_are_two_connections() {
-			Assert.AreEqual(2, _json[0]["connectionCount"].Value<int>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_second_subscription_event_stream_is_correct() {
-			Assert.AreEqual(_streamName, _json[1]["eventStreamId"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_second_subscription_groupname_is_correct() {
-			Assert.AreEqual("secondgroup", _json[1]["groupName"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void second_subscription_there_are_three_connections() {
-			Assert.AreEqual(3, _json[1]["connectionCount"].Value<int>());
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_getting_subscription_statistics_for_stream<TLogFormat, TStreamId> : SpecificationWithPersistentSubscriptionAndConnections<TLogFormat, TStreamId> {
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent();
-
-		private JArray _json;
-		private EventStorePersistentSubscriptionBase _sub4;
-		private EventStorePersistentSubscriptionBase _sub3;
-		private EventStorePersistentSubscriptionBase _sub5;
-
-		protected override async Task Given() {
-			await base.Given();
-			await _conn.CreatePersistentSubscriptionAsync(_streamName, "secondgroup", _settings,
-				DefaultData.AdminCredentials);
-			_sub3 = _conn.ConnectToPersistentSubscription(_streamName, "secondgroup",
-				(subscription, @event) => {
-					Console.WriteLine();
-					return Task.CompletedTask;
-				},
-				(subscription, reason, arg3) => Console.WriteLine(), DefaultData.AdminCredentials);
-			_sub4 = _conn.ConnectToPersistentSubscription(_streamName, "secondgroup",
-				(subscription, @event) => {
-					Console.WriteLine();
-					return Task.CompletedTask;
-				},
-				(subscription, reason, arg3) => Console.WriteLine(),
-				DefaultData.AdminCredentials);
-			_sub5 = _conn.ConnectToPersistentSubscription(_streamName, "secondgroup",
-				(subscription, @event) => {
-					Console.WriteLine();
-					return Task.CompletedTask;
-				},
-				(subscription, reason, arg3) => Console.WriteLine(),
-				DefaultData.AdminCredentials);
-		}
-
-		protected override async Task When() {
-			//make mcs stop bitching
-			Console.WriteLine(_sub3);
-			Console.WriteLine(_sub4);
-			Console.WriteLine(_sub5);
-			_json = await GetJson<JArray>("/subscriptions/" + _streamName, ContentType.Json);
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_response_code_is_ok() {
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_first_event_stream_is_correct() {
-			Assert.AreEqual(_streamName, _json[0]["eventStreamId"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_first_groupname_is_correct() {
-			Assert.AreEqual(_groupName, _json[0]["groupName"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_first_event_stream_detail_uri_is_correct() {
-			Assert.AreEqual(
-				string.Format("http://{0}/subscriptions/{1}/{2}/info", _node.HttpEndPoint, _streamName, _groupName),
-				_json[0]["links"][0]["href"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_second_event_stream_detail_uri_is_correct() {
-			Assert.AreEqual(
-				string.Format("http://{0}/subscriptions/{1}/{2}/info", _node.HttpEndPoint, _streamName,
-					"secondgroup"),
-				_json[1]["links"][0]["href"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_first_parked_message_queue_uri_is_correct() {
-			Assert.AreEqual(
-				string.Format("http://{0}/streams/%24persistentsubscription-{1}::{2}-parked", _node.HttpEndPoint,
-					_streamName, _groupName), _json[0]["parkedMessageUri"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_second_parked_message_queue_uri_is_correct() {
-			Assert.AreEqual(
-				string.Format("http://{0}/streams/%24persistentsubscription-{1}::{2}-parked", _node.HttpEndPoint,
-					_streamName, "secondgroup"), _json[1]["parkedMessageUri"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_status_is_live() {
-			Assert.AreEqual("Live", _json[0]["status"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void there_are_two_connections() {
-			Assert.AreEqual(2, _json[0]["connectionCount"].Value<int>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_second_subscription_event_stream_is_correct() {
-			Assert.AreEqual(_streamName, _json[1]["eventStreamId"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void the_second_subscription_groupname_is_correct() {
-			Assert.AreEqual("secondgroup", _json[1]["groupName"].Value<string>());
-		}
-
-		[Test]
-		[Retry(5)]
-		public void second_subscription_there_are_three_connections() {
-			Assert.AreEqual(3, _json[1]["connectionCount"].Value<int>());
-		}
-	}
-
-	public abstract class SpecificationWithPersistentSubscriptionAndConnections<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		protected string _streamName = Guid.NewGuid().ToString();
-		protected string _groupName = Guid.NewGuid().ToString();
-		protected IEventStoreConnection _conn;
-		protected EventStorePersistentSubscriptionBase _sub1;
-		protected EventStorePersistentSubscriptionBase _sub2;
-
-		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
-			.DoNotResolveLinkTos()
-			.StartFromCurrent();
-
-		protected override async Task Given() {
-			_conn = EventStoreConnection.Create(ConnectionSettings.Create().DisableServerCertificateValidation().Build(),
-				_node.TcpEndPoint);
-			await _conn.ConnectAsync();
-			await _conn.CreatePersistentSubscriptionAsync(_streamName, _groupName, _settings,
-				DefaultData.AdminCredentials);
-			_sub1 = _conn.ConnectToPersistentSubscription(_streamName, _groupName,
-				(subscription, @event) => {
-					Console.WriteLine();
-					return Task.CompletedTask;
-				},
-				(subscription, reason, arg3) => Console.WriteLine(), DefaultData.AdminCredentials);
-			_sub2 = _conn.ConnectToPersistentSubscription(_streamName, _groupName,
-				(subscription, @event) => {
-					Console.WriteLine();
-					return Task.CompletedTask;
-				},
-				(subscription, reason, arg3) => Console.WriteLine(),
-				DefaultData.AdminCredentials);
-		}
-
-		protected override Task When() => Task.CompletedTask;
-
-		[OneTimeTearDown]
-		public async Task Teardown() {
-			await _conn.DeletePersistentSubscriptionAsync(_streamName, _groupName, DefaultData.AdminCredentials);
-			_conn.Close();
-			_conn.Dispose();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/PersistentSubscription/updating.cs b/src/EventStore.Core.Tests/Http/PersistentSubscription/updating.cs
deleted file mode 100644
index aa9e5e0e1c4..00000000000
--- a/src/EventStore.Core.Tests/Http/PersistentSubscription/updating.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System;
-using System.Net;
-using System.Net.Http;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Tests.Http.Users.users;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Http.PersistentSubscription {
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_updating_a_subscription_without_permissions<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		private HttpResponseMessage _response;
-
-		protected override async Task Given() {
-			_response = await MakeJsonPut(
-				"/subscriptions/stream/groupname337",
-				new {
-					ResolveLinkTos = true
-				}, _admin);
-		}
-
-		protected override async Task When() {
-			SetDefaultCredentials(null);
-			_response = await MakeJsonPost(
-				"/subscriptions/stream/groupname337",
-				new {
-					ResolveLinkTos = true
-				}, null);
-		}
-
-		[Test]
-		public void returns_unauthorised() {
-			Assert.AreEqual(HttpStatusCode.Unauthorized, _response.StatusCode);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_updating_a_non_existent_subscription_without_permissions<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		private HttpResponseMessage _response;
-
-		protected override Task Given() => Task.CompletedTask;
-
-		protected override async Task When() {
-			_response = await MakeJsonPost(
-				"/subscriptions/stream/groupname3337",
-				new {
-					ResolveLinkTos = true
-				}, new NetworkCredential("admin", "changeit"));
-		}
-
-		[Test]
-		public void returns_not_found() {
-			Assert.AreEqual(HttpStatusCode.NotFound, _response.StatusCode);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_updating_an_existing_subscription<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		private HttpResponseMessage _response;
-		private readonly string _groupName = Guid.NewGuid().ToString();
-		private SubscriptionDropReason _droppedReason;
-		private Exception _exception;
-		private const string _stream = "stream";
-		private AutoResetEvent _dropped = new AutoResetEvent(false);
-
-		protected override async Task Given() {
-			_response = await MakeJsonPut(
-				string.Format("/subscriptions/{0}/{1}", _stream, _groupName),
-				new {
-					ResolveLinkTos = true
-				}, DefaultData.AdminNetworkCredentials);
-			SetupSubscription();
-		}
-
-		private void SetupSubscription() {
-			_connection.ConnectToPersistentSubscription(_stream, _groupName, (x, y) => Task.CompletedTask,
-				(sub, reason, ex) => {
-					_droppedReason = reason;
-					_exception = ex;
-					_dropped.Set();
-				}, DefaultData.AdminCredentials);
-		}
-
-		protected override async Task When() {
-			_response = await MakeJsonPost(
-				string.Format("/subscriptions/{0}/{1}", _stream, _groupName),
-				new {
-					ResolveLinkTos = true
-				}, DefaultData.AdminNetworkCredentials);
-		}
-
-		[Test]
-		public void returns_ok() {
-			Assert.AreEqual(HttpStatusCode.OK, _response.StatusCode);
-		}
-
-		[Test]
-		public void existing_subscriptions_are_dropped() {
-			Assert.IsTrue(_dropped.WaitOne(TimeSpan.FromSeconds(5)));
-			Assert.AreEqual(SubscriptionDropReason.UserInitiated, _droppedReason);
-			Assert.IsNull(_exception);
-		}
-
-		[Test]
-		public void location_header_is_present() {
-			Assert.AreEqual(
-				string.Format("http://{0}/subscriptions/{1}/{2}", _node.HttpEndPoint, _stream, _groupName),
-				_response.Headers.Location.ToString());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/StreamSecurity/SpecificationWithUsers.cs b/src/EventStore.Core.Tests/Http/StreamSecurity/SpecificationWithUsers.cs
deleted file mode 100644
index 17af1f50c64..00000000000
--- a/src/EventStore.Core.Tests/Http/StreamSecurity/SpecificationWithUsers.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using Newtonsoft.Json.Linq;
-
-namespace EventStore.Core.Tests.Http.StreamSecurity {
-	abstract class SpecificationWithUsers<TLogFormat, TStreamId>
-		: HttpBehaviorSpecification<TLogFormat, TStreamId> {
-		protected override async Task Given() {
-			await PostUser("user1", "User 1", "user1!", "other");
-			await PostUser("user2", "User 2", "user2!", "other");
-			await PostUser("guest", "Guest", "guest!");
-		}
-
-		protected readonly NetworkCredential _admin = DefaultData.AdminNetworkCredentials;
-
-		protected override bool GivenSkipInitializeStandardUsersCheck() {
-			return false;
-		}
-
-		protected override MiniNode<TLogFormat, TStreamId> CreateMiniNode() {
-			return new MiniNode<TLogFormat, TStreamId>(PathName,
-				enableTrustedAuth: true);
-		}
-
-		protected async Task PostUser(string login, string userFullName, string password, params string[] groups) {
-			var response = await MakeJsonPost(
-				"/users/", new { LoginName = login + Tag, FullName = userFullName, Groups = groups, Password = password },
-				_admin);
-			Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
-		}
-
-		protected async Task<string> PostMetadata(StreamMetadata metadata) {
-			var response = await MakeArrayEventsPost(
-				TestMetadataStream, new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = metadata } });
-			Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
-			return response.Headers.GetLocationAsString();
-		}
-
-		protected async Task<string> PostEvent(int i) {
-			var response = await MakeArrayEventsPost(
-				TestStream, new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = new { Number = i } } });
-			Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
-			return response.Headers.GetLocationAsString();
-		}
-
-		protected Task<HttpResponseMessage> PostEvent<T>(T data, NetworkCredential credentials = null) {
-			return MakeArrayEventsPost(
-				TestStream, new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = data } }, credentials);
-		}
-
-		protected string GetLink(JObject feed, string relation) {
-			var rel = (from JObject link in feed["links"]
-					   from JProperty attr in link
-					   where attr.Name == "relation" && (string)attr.Value == relation
-					   select link).SingleOrDefault();
-			return (rel == null) ? null : (string)rel["uri"];
-		}
-
-		protected NetworkCredential GetCorrectCredentialsFor(string user) {
-			return new NetworkCredential(user + Tag, user + "!");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/Streams/HttpSpecificationWithLinkToToDeletedEvents.cs b/src/EventStore.Core.Tests/Http/Streams/HttpSpecificationWithLinkToToDeletedEvents.cs
deleted file mode 100644
index 763c97af602..00000000000
--- a/src/EventStore.Core.Tests/Http/Streams/HttpSpecificationWithLinkToToDeletedEvents.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Common;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-
-namespace EventStore.Core.Tests.Http.Streams {
-	public abstract class HttpSpecificationWithLinkToToDeletedEvents<TLogFormat, TStreamId>
-		: HttpBehaviorSpecification<TLogFormat, TStreamId> {
-		protected string LinkedStreamName;
-		protected string DeletedStreamName;
-
-		protected override async Task Given() {
-			var creds = DefaultData.AdminCredentials;
-			LinkedStreamName = Guid.NewGuid().ToString();
-			DeletedStreamName = Guid.NewGuid().ToString();
-			using (var conn = TestConnection.Create(_node.TcpEndPoint)) {
-				await conn.ConnectAsync();
-				await conn.AppendToStreamAsync(DeletedStreamName, ExpectedVersion.Any, creds,
-						new EventData(Guid.NewGuid(), "testing", true, Encoding.UTF8.GetBytes("{'foo' : 4}"),
-							new byte[0]))
-;
-				await conn.AppendToStreamAsync(LinkedStreamName, ExpectedVersion.Any, creds,
-					new EventData(Guid.NewGuid(), SystemEventTypes.LinkTo, false,
-						Encoding.UTF8.GetBytes("0@" + DeletedStreamName), new byte[0]));
-				await conn.DeleteStreamAsync(DeletedStreamName, ExpectedVersion.Any);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/Streams/HttpSpecificationWithLinkToToEvents.cs b/src/EventStore.Core.Tests/Http/Streams/HttpSpecificationWithLinkToToEvents.cs
deleted file mode 100644
index c0ac501d0ae..00000000000
--- a/src/EventStore.Core.Tests/Http/Streams/HttpSpecificationWithLinkToToEvents.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Common;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-
-namespace EventStore.Core.Tests.Http.Streams {
-	public abstract class HttpSpecificationWithLinkToToEvents<TLogFormat, TStreamId>
-		: HttpBehaviorSpecification<TLogFormat, TStreamId> {
-		protected string LinkedStreamName;
-		protected string StreamName;
-		protected string Stream2Name;
-
-		protected override async Task Given() {
-			var creds = DefaultData.AdminCredentials;
-			LinkedStreamName = Guid.NewGuid().ToString();
-			StreamName = Guid.NewGuid().ToString();
-			Stream2Name = Guid.NewGuid().ToString();
-			using (var conn = TestConnection.Create(_node.TcpEndPoint)) {
-				await conn.ConnectAsync();
-				await conn.AppendToStreamAsync(StreamName, ExpectedVersion.Any, creds,
-						new EventData(Guid.NewGuid(), "testing", true, Encoding.UTF8.GetBytes("{'foo' : 4}"),
-							new byte[0]));
-				await conn.AppendToStreamAsync(StreamName, ExpectedVersion.Any, creds,
-						new EventData(Guid.NewGuid(), "testing", true, Encoding.UTF8.GetBytes("{'foo' : 4}"),
-							new byte[0]));
-				await conn.AppendToStreamAsync(Stream2Name, ExpectedVersion.Any, creds,
-					new EventData(Guid.NewGuid(), "testing", true, Encoding.UTF8.GetBytes("{'foo' : 4}"),
-						new byte[0]));
-				await conn.AppendToStreamAsync(LinkedStreamName, ExpectedVersion.Any, creds,
-					new EventData(Guid.NewGuid(), SystemEventTypes.LinkTo, false,
-						Encoding.UTF8.GetBytes("0@" + Stream2Name), new byte[0]));
-				await conn.AppendToStreamAsync(LinkedStreamName, ExpectedVersion.Any, creds,
-					new EventData(Guid.NewGuid(), SystemEventTypes.LinkTo, false,
-						Encoding.UTF8.GetBytes("1@" + StreamName), new byte[0]));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/Streams/SpecificationWithLinkToToMaxCountDeletedEvents.cs b/src/EventStore.Core.Tests/Http/Streams/SpecificationWithLinkToToMaxCountDeletedEvents.cs
deleted file mode 100644
index 37b25ef580e..00000000000
--- a/src/EventStore.Core.Tests/Http/Streams/SpecificationWithLinkToToMaxCountDeletedEvents.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Common;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-
-namespace EventStore.Core.Tests.Http.Streams {
-	public abstract class SpecificationWithLinkToToMaxCountDeletedEvents<TLogFormat, TStreamId>
-		: HttpBehaviorSpecification<TLogFormat, TStreamId> {
-		protected string LinkedStreamName;
-		protected string DeletedStreamName;
-
-		protected override async Task Given() {
-			var creds = DefaultData.AdminCredentials;
-			DeletedStreamName = Guid.NewGuid().ToString();
-			LinkedStreamName = Guid.NewGuid().ToString();
-			using (var conn = TestConnection.Create(_node.TcpEndPoint)) {
-				await conn.ConnectAsync();
-				await conn.AppendToStreamAsync(DeletedStreamName, ExpectedVersion.Any, creds,
-						new EventData(Guid.NewGuid(), "testing1", true, Encoding.UTF8.GetBytes("{'foo' : 4}"),
-							new byte[0]));
-				await conn.SetStreamMetadataAsync(DeletedStreamName, ExpectedVersion.Any,
-					new StreamMetadata(2, null, null, null, null));
-				await conn.AppendToStreamAsync(DeletedStreamName, ExpectedVersion.Any, creds,
-						new EventData(Guid.NewGuid(), "testing2", true, Encoding.UTF8.GetBytes("{'foo' : 4}"),
-							new byte[0]));
-				await conn.AppendToStreamAsync(DeletedStreamName, ExpectedVersion.Any, creds,
-						new EventData(Guid.NewGuid(), "testing3", true, Encoding.UTF8.GetBytes("{'foo' : 4}"),
-							new byte[0]));
-				await conn.AppendToStreamAsync(LinkedStreamName, ExpectedVersion.Any, creds,
-					new EventData(Guid.NewGuid(), SystemEventTypes.LinkTo, false,
-						Encoding.UTF8.GetBytes("0@" + DeletedStreamName), new byte[0]));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/Streams/XDocumentAtomExtensions.cs b/src/EventStore.Core.Tests/Http/Streams/XDocumentAtomExtensions.cs
deleted file mode 100644
index 1536116602c..00000000000
--- a/src/EventStore.Core.Tests/Http/Streams/XDocumentAtomExtensions.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Linq;
-using System.Xml.Linq;
-
-namespace EventStore.Core.Tests.Http.Streams {
-	internal static class XDocumentAtomExtensions {
-		internal static readonly XNamespace AtomNamespace = "http://www.w3.org/2005/Atom";
-
-		public static XElement[] GetEntries(this XDocument self) {
-			var feed = self.Element(AtomNamespace + "feed");
-			if (feed == null)
-				return new XElement[0];
-
-			return feed.Elements(AtomNamespace + "entry").ToArray();
-		}
-
-		public static XElement GetEntry(this XDocument self) {
-			return self.Element(AtomNamespace + "entry");
-		}
-
-		public static string GetLink(this XElement self, string rel) {
-			var matchingLinks = self.Elements(AtomNamespace + "link")
-				.Where(e => e.Attribute("rel").Value == rel)
-				.ToArray();
-
-			if (matchingLinks.Length > 1)
-				throw new ArgumentException("Multiple links found with rel '" + rel + "'", rel);
-			if (matchingLinks.Length == 0)
-				throw new ArgumentException("No link found with rel '" + rel + "'", rel);
-
-			return matchingLinks[0].Attribute("href").Value;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/Streams/append_to_stream.cs b/src/EventStore.Core.Tests/Http/Streams/append_to_stream.cs
deleted file mode 100644
index 43fa0118b09..00000000000
--- a/src/EventStore.Core.Tests/Http/Streams/append_to_stream.cs
+++ /dev/null
@@ -1,512 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Transport.Http;
-using Newtonsoft.Json.Linq;
-using NUnit.Framework;
-using EventStore.Core.Services;
-using HttpStatusCode = System.Net.HttpStatusCode;
-using EventStore.Core.Tests.Http.Users.users;
-using Microsoft.Extensions.Primitives;
-
-namespace EventStore.Core.Tests.Http.Streams {
-	namespace append_to_stream {
-		public abstract class ExpectedVersionSpecification<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-			public string WrongExpectedVersionDesc {
-				get { return "Wrong expected EventNumber"; }
-			}
-
-			public string DeletedStreamDesc {
-				get { return "Stream deleted"; }
-			}
-
-			public Task<HttpResponseMessage> PostEventWithExpectedVersion(long expectedVersion) {
-				var request = CreateRequest(TestStream, "", "POST", "application/json");
-				request.Headers.Add("ES-EventType", "SomeType");
-				request.Headers.Add("ES-ExpectedVersion", expectedVersion.ToString());
-				request.Headers.Add("ES-EventId", Guid.NewGuid().ToString());
-				var data = Encoding.UTF8.GetBytes("{a : \"1\", b:\"3\", c:\"5\" }");
-				request.Content = new ByteArrayContent(data) {
-					Headers = { ContentType = new MediaTypeHeaderValue("application/json") }
-				};
-				return GetRequestResponse(request);
-			}
-
-			public Task TombstoneTestStream() {
-				var deleteRequest = CreateRequest(TestStream, "", "DELETE", "application/json");
-				deleteRequest.Headers.Add("ES-ExpectedVersion", ExpectedVersion.Any.ToString());
-				deleteRequest.Headers.Add("ES-HardDelete", bool.TrueString);
-				return GetRequestResponse(deleteRequest);
-			}
-
-			public Task SoftDeleteTestStream() {
-				var deleteRequest = CreateRequest(TestMetadataStream, "", "POST", "application/json");
-				deleteRequest.Headers.Add("ES-EventType", SystemEventTypes.StreamMetadata);
-				deleteRequest.Headers.Add("ES-ExpectedVersion", ExpectedVersion.Any.ToString());
-				deleteRequest.Headers.Add("ES-EventId", Guid.NewGuid().ToString());
-				deleteRequest.Content = new ByteArrayContent(StreamMetadata
-					.Create(truncateBefore: long.MaxValue)
-					.AsJsonBytes()) {
-					Headers = { ContentType = new MediaTypeHeaderValue("application/json") }
-				};
-				return GetRequestResponse(deleteRequest);
-			}
-
-			public async Task<List<JToken>> GetTestStream() {
-				var stream = await GetJson<JObject>(TestStream + "/0/forward/10", accept: ContentType.Json);
-				return stream != null ? stream["entries"].ToList() : new List<JToken>();
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			should_create_stream_with_no_stream_exp_ver_on_first_write_if_does_not_exist<TLogFormat, TStreamId> :
-				ExpectedVersionSpecification<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-			private List<JToken> _read;
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				_response = await PostEventWithExpectedVersion(ExpectedVersion.NoStream);
-				_read = await GetTestStream();
-			}
-
-			[Test]
-			public void should_return_created_status_code() {
-				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-			}
-
-			[Test]
-			public void should_create_stream() {
-				Assert.AreEqual(1, _read.Count);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class should_fail_appending_with_no_stream_exp_ver_to_existing_stream<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-			private List<JToken> _read;
-
-			protected override Task Given() {
-				return PostEventWithExpectedVersion(ExpectedVersion.Any);
-			}
-
-			protected override async Task When() {
-				_response = await PostEventWithExpectedVersion(ExpectedVersion.NoStream);
-				_read = await GetTestStream();
-			}
-
-			[Test]
-			public void should_return_bad_request_with_wrong_expected_version() {
-				Assert.AreEqual(HttpStatusCode.BadRequest, _response.StatusCode);
-				// Assert.AreEqual(WrongExpectedVersionDesc, _response.StatusDescription);
-			}
-
-			[Test]
-			public void should_return_the_current_version_in_the_header() {
-				Assert.AreEqual("0",
-					new StringValues(_response.Headers.GetValues(SystemHeaders.CurrentVersion).ToArray()));
-			}
-
-			[Test]
-			public void should_not_append_to_stream() {
-				Assert.AreEqual(1, _read.Count);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			should_create_stream_with_any_exp_ver_on_first_write_if_does_not_exist<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-			private List<JToken> _read;
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				_response = await PostEventWithExpectedVersion(ExpectedVersion.Any);
-				_read = await GetTestStream();
-			}
-
-			[Test]
-			public void should_return_created_status_code() {
-				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-			}
-
-			[Test]
-			public void should_create_stream() {
-				Assert.AreEqual(1, _read.Count);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class should_append_with_any_exp_ver_to_existing_stream<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-			private List<JToken> _read;
-
-			protected override async Task Given() {
-				for (var i = 0; i < 3; i++) {
-					await PostEventWithExpectedVersion(ExpectedVersion.Any);
-				}
-			}
-
-			protected override async Task When() {
-				_response = await PostEventWithExpectedVersion(ExpectedVersion.Any);
-				_read = await GetTestStream();
-			}
-
-			[Test]
-			public void should_return_created_status_code() {
-				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-			}
-
-			[Test]
-			public void should_append_event_to_stream() {
-				Assert.AreEqual(4, _read.Count);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class should_fail_appending_with_any_exp_ver_to_deleted_stream<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() {
-				return TombstoneTestStream();
-			}
-
-			protected override async Task When() {
-				_response = await PostEventWithExpectedVersion(ExpectedVersion.Any);
-			}
-
-			[Test]
-			public void should_return_gone_status_code() {
-				Assert.AreEqual(HttpStatusCode.Gone, _response.StatusCode);
-				// Assert.AreEqual(DeletedStreamDesc, _response.StatusDescription);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class should_append_with_correct_exp_ver_to_existing_stream<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-			private List<JToken> _read;
-
-			protected override async Task Given() {
-				for (var i = 0; i < 3; i++) {
-					await PostEventWithExpectedVersion(ExpectedVersion.Any);
-				}
-			}
-
-			protected override async Task When() {
-				_response = await PostEventWithExpectedVersion(2);
-				_read = await GetTestStream();
-			}
-
-			[Test]
-			public void should_return_created_status_code() {
-				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-			}
-
-			[Test]
-			public void should_append_event_to_stream() {
-				Assert.AreEqual(4, _read.Count);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class should_fail_appending_with_wrong_exp_ver_to_existing_stream<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-			private List<JToken> _read;
-
-			protected override async Task Given() {
-				for (var i = 0; i < 2; i++) {
-					await PostEventWithExpectedVersion(ExpectedVersion.Any);
-				}
-			}
-
-			protected override async Task When() {
-				_response = await PostEventWithExpectedVersion(4);
-				_read = await GetTestStream();
-			}
-
-			[Test]
-			public void should_return_bad_request_with_wrong_expected_version() {
-				Assert.AreEqual(HttpStatusCode.BadRequest, _response.StatusCode);
-				//// Assert.AreEqual(WrongExpectedVersionDesc, _response.StatusDescription);
-			}
-
-			[Test]
-			public void should_return_the_current_version_in_the_header() {
-				Assert.AreEqual("1",
-					new StringValues(_response.Headers.GetValues(SystemHeaders.CurrentVersion).ToArray()));
-			}
-
-			[Test]
-			public void should_not_append_event() {
-				Assert.AreEqual(2, _read.Count);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class should_fail_appending_with_wrong_exp_ver_to_new_stream<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-			private List<JToken> _read;
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				_response = await PostEventWithExpectedVersion(1);
-				_read = await GetTestStream();
-			}
-
-			[Test]
-			public void should_return_bad_request_with_wrong_expected_version() {
-				Assert.AreEqual(HttpStatusCode.BadRequest, _response.StatusCode);
-				// Assert.AreEqual(WrongExpectedVersionDesc, _response.StatusDescription);
-			}
-
-			[Test]
-			public void should_return_the_current_version_in_the_header() {
-				Assert.AreEqual("-1",
-					new StringValues(_response.Headers.GetValues(SystemHeaders.CurrentVersion).ToArray()));
-			}
-
-			[Test]
-			public void should_not_append_to_stream() {
-				Assert.AreEqual(0, _read.Count);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class should_fail_appending_with_correct_exp_ver_to_deleted_stream<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() {
-				return TombstoneTestStream();
-			}
-
-			protected override async Task When() {
-				_response = await PostEventWithExpectedVersion(ExpectedVersion.NoStream);
-			}
-
-			[Test]
-			public void should_return_gone_status_code() {
-				Assert.AreEqual(HttpStatusCode.Gone, _response.StatusCode);
-				// Assert.AreEqual(DeletedStreamDesc, _response.StatusDescription);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class should_fail_appending_with_invalid_exp_ver_to_deleted_stream<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() {
-				return TombstoneTestStream();
-			}
-
-			protected override async Task When() {
-				_response = await PostEventWithExpectedVersion(5);
-			}
-
-			[Test]
-			public void should_return_gone_status_code() {
-				Assert.AreEqual(HttpStatusCode.Gone, _response.StatusCode);
-				// Assert.AreEqual(DeletedStreamDesc, _response.StatusDescription);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class should_append_with_stream_exists_exp_ver_to_existing_stream<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-			private List<JToken> _read;
-
-			protected override Task Given() {
-				return PostEventWithExpectedVersion(ExpectedVersion.Any);
-			}
-
-			protected override async Task When() {
-				_response = await PostEventWithExpectedVersion(ExpectedVersion.StreamExists);
-				_read = await GetTestStream();
-			}
-
-			[Test]
-			public void should_return_created_status_code() {
-				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-			}
-
-			[Test]
-			public void should_append_event_to_stream() {
-				Assert.AreEqual(2, _read.Count);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			should_append_with_stream_exists_exp_ver_to_stream_with_multiple_events<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-			private List<JToken> _read;
-
-			protected override async Task Given() {
-				for (var i = 0; i < 2; i++) {
-					await PostEventWithExpectedVersion(ExpectedVersion.Any);
-				}
-			}
-
-			protected override async Task When() {
-				_response = await PostEventWithExpectedVersion(ExpectedVersion.StreamExists);
-				_read = await GetTestStream();
-			}
-
-			[Test]
-			public void should_return_created_status_code() {
-				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-			}
-
-			[Test]
-			public void should_append_event_to_stream() {
-				Assert.AreEqual(3, _read.Count);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class should_append_with_stream_exists_exp_ver_if_metadata_stream_exists<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-			private List<JToken> _read;
-
-			protected override async Task Given() {
-				var request = CreateRequest(TestMetadataStream, "", "POST", "application/json");
-				request.Headers.Add("ES-EventType", "$user-created");
-				request.Headers.Add("ES-ExpectedVersion", ExpectedVersion.Any.ToString());
-				request.Headers.Add("ES-EventId", Guid.NewGuid().ToString());
-				var data = Encoding.UTF8.GetBytes("{a : \"1\", b:\"3\", c:\"5\" }");
-				request.Content = new ByteArrayContent(data) {
-					Headers = { ContentType = new MediaTypeHeaderValue("application/json") }
-				};
-				await GetRequestResponse(request);
-			}
-
-			protected override async Task When() {
-				_response = await PostEventWithExpectedVersion(ExpectedVersion.StreamExists);
-				_read = await GetTestStream();
-			}
-
-			[Test]
-			public void should_return_created_status_code() {
-				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-			}
-
-			[Test]
-			public void should_append_event_to_stream() {
-				Assert.AreEqual(1, _read.Count);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			should_fail_appending_with_stream_exists_exp_ver_and_stream_does_not_exist<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-			private List<JToken> _read;
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				_response = await PostEventWithExpectedVersion(ExpectedVersion.StreamExists);
-				_read = await GetTestStream();
-			}
-
-			[Test]
-			public void should_return_bad_request_with_wrong_expected_version() {
-				Assert.AreEqual(HttpStatusCode.BadRequest, _response.StatusCode);
-				// Assert.AreEqual(WrongExpectedVersionDesc, _response.StatusDescription);
-			}
-
-
-			[Test]
-			public void should_return_the_current_version_in_the_header() {
-				Assert.AreEqual("-1",
-					new StringValues(_response.Headers.GetValues(SystemHeaders.CurrentVersion).ToArray()));
-			}
-
-			[Test]
-			public void should_not_append_event_to_stream() {
-				Assert.AreEqual(0, _read.Count);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			should_fail_appending_with_stream_exists_exp_ver_to_hard_deleted_stream<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() {
-				return TombstoneTestStream();
-			}
-
-			protected override async Task When() {
-				_response = await PostEventWithExpectedVersion(ExpectedVersion.StreamExists);
-			}
-
-			[Test]
-			public void should_return_gone_status_code() {
-				Assert.AreEqual(HttpStatusCode.Gone, _response.StatusCode);
-				// Assert.AreEqual(DeletedStreamDesc, _response.StatusDescription);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			should_fail_appending_with_stream_exists_exp_ver_to_soft_deleted_stream<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() {
-				return SoftDeleteTestStream();
-			}
-
-			protected override async Task When() {
-				_response = await PostEventWithExpectedVersion(ExpectedVersion.StreamExists);
-			}
-
-			[Test]
-			public void should_return_gone_status_code() {
-				Assert.AreEqual(HttpStatusCode.Gone, _response.StatusCode);
-				// Assert.AreEqual(DeletedStreamDesc, _response.StatusDescription);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/Streams/basic.cs b/src/EventStore.Core.Tests/Http/Streams/basic.cs
deleted file mode 100644
index 9bf303392fc..00000000000
--- a/src/EventStore.Core.Tests/Http/Streams/basic.cs
+++ /dev/null
@@ -1,803 +0,0 @@
-using System;
-using System.Text;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Transport.Http;
-using NUnit.Framework;
-using Newtonsoft.Json.Linq;
-using HttpStatusCode = System.Net.HttpStatusCode;
-using System.Linq;
-using System.Xml.Linq;
-using System.IO;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Tests.Http.Users.users;
-using HttpMethod = EventStore.Transport.Http.HttpMethod;
-
-namespace EventStore.Core.Tests.Http.Streams {
-	namespace basic {
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_requesting_a_single_event_in_the_stream_as_atom_json<TLogFormat, TStreamId>
-			: HttpBehaviorSpecificationWithSingleEvent<TLogFormat, TStreamId>  {
-			private JObject _json;
-
-			protected override async Task When() {
-				_json = await GetJson<JObject>(TestStream + "/0", accept: ContentType.AtomJson);
-			}
-
-			[Test]
-			public void request_succeeds() {
-				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-			}
-
-			[Test]
-			public void returns_correct_body() {
-				HelperExtensions.AssertJson(new { Content = new { Data = new { A = "1" } } }, _json);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_requesting_a_single_event_in_the_stream_as_atom_xml<TLogFormat, TStreamId>
-			: HttpBehaviorSpecificationWithSingleEvent<TLogFormat, TStreamId>  {
-			private XDocument document;
-
-			protected override async Task When() {
-				await Get(TestStream + "/0", "", accept: ContentType.Atom);
-				document = XDocument.Parse(_lastResponseBody);
-			}
-
-			[Test]
-			public void request_succeeds() {
-				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-			}
-
-			[Test]
-			public void returns_correct_body() {
-				var val = document.GetEntry()
-					.Elements(XDocumentAtomExtensions.AtomNamespace + "content").First()
-					.Element("data")
-					.Element("a").Value;
-				Assert.AreEqual(val, "1");
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_posting_an_event_as_raw_json_without_eventtype<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				_response = await MakeJsonPost(
-					TestStream,
-					new { A = "1", B = "3", C = "5" });
-			}
-
-			[Test]
-			public void returns_bad_request_status_code() {
-				Assert.AreEqual(HttpStatusCode.BadRequest, _response.StatusCode);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_posting_an_event_to_idempotent_uri_as_events_array<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				_response = await MakeArrayEventsPost(
-					TestStream + "/incoming/" + Guid.NewGuid().ToString(),
-					new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = new { A = "1" } } });
-			}
-
-			[Test]
-			public void returns_bad_request_status_code() {
-				Assert.AreEqual(HttpStatusCode.UnsupportedMediaType, _response.StatusCode);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_posting_an_event_as_json_to_idempotent_uri_without_event_type<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				_response = await MakeJsonPost(
-					TestStream + "/incoming/" + Guid.NewGuid().ToString(),
-					new { A = "1", B = "3", C = "5" });
-			}
-
-			[Test]
-			public void returns_bad_request_status_code() {
-				Assert.AreEqual(HttpStatusCode.BadRequest, _response.StatusCode);
-			}
-		}
-
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_posting_an_event_in_json_to_idempotent_uri_without_event_id<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				var request = CreateRequest(TestStream + "/incoming/" + Guid.NewGuid(), "", "POST",
-					"application/json");
-				request.Headers.Add("ES-EventType", "SomeType");
-				var data = "{a : \"1\", b:\"3\", c:\"5\" }";
-				var bytes = Encoding.UTF8.GetBytes(data);
-				request.Content = new ByteArrayContent(bytes) {
-					Headers = { ContentType = new MediaTypeHeaderValue("application/json") }
-				};
-				_response = await GetRequestResponse(request);
-			}
-
-			[Test]
-			public void returns_created_status_code() {
-				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-			}
-
-			[Test]
-			public void returns_a_location_header() {
-				Assert.That(!string.IsNullOrEmpty(_response.Headers.GetLocationAsString()));
-			}
-
-			[Test]
-			public async Task returns_a_location_header_that_can_be_read_as_json() {
-				var json = await GetJson<JObject>(_response.Headers.GetLocationAsString());
-				HelperExtensions.AssertJson(new { a = "1", b = "3", c = "5" }, json);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_posting_an_event_as_raw_json_without_eventid<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				var request = CreateRequest(TestStream, "", "POST", "application/json");
-				request.Headers.Add("ES-EventType", "SomeType");
-				var data = "{A : \"1\", B:\"3\", C:\"5\" }";
-				var bytes = Encoding.UTF8.GetBytes(data);
-				request.Content = new ByteArrayContent(bytes) {
-					Headers = { ContentType = new MediaTypeHeaderValue("application/json") }
-				};
-				_response = await GetRequestResponse(request);
-			}
-
-			[Test]
-			public void returns_redirectkeepverb_status_code() {
-				Assert.AreEqual(HttpStatusCode.RedirectKeepVerb, _response.StatusCode);
-			}
-
-			[Test]
-			public void returns_a_location_header() {
-				Assert.That(!string.IsNullOrEmpty(_response.Headers.GetLocationAsString()));
-			}
-
-			[Test]
-			public void returns_a_to_incoming() {
-				Assert.IsTrue(_response.Headers.GetLocationAsString().Contains("/incoming/"));
-				//HelperExtensions.AssertJson(new {A = "1"}, json);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_posting_an_event_as_array_with_no_event_type<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				_response = await MakeArrayEventsPost(
-					TestStream,
-					new[] { new { EventId = Guid.NewGuid(), Data = new { A = "1" } } });
-			}
-
-			[Test]
-			public void returns_bad_request_status_code() {
-				Assert.AreEqual(HttpStatusCode.BadRequest, _response.StatusCode);
-			}
-		}
-
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_posting_an_event_as_array<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				_response = await MakeArrayEventsPost(
-					TestStream,
-					new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = new { A = "1" } } });
-			}
-
-			[Test]
-			public void returns_created_status_code() {
-				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-			}
-
-			[Test]
-			public void returns_a_location_header() {
-				Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
-			}
-
-			[Test]
-			public async Task returns_a_location_header_that_can_be_read_as_json() {
-				var json = await GetJson<JObject>(_response.Headers.GetLocationAsString());
-				HelperExtensions.AssertJson(new { A = "1" }, json);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_posting_an_event_as_array_to_stream_with_slash<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				var request = CreateRequest(TestStream + "/", "", "POST", "application/vnd.eventstore.events+json",
-					null);
-				request.Content = new ByteArrayContent(new[]
-					{new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {A = "1"}}}.ToJsonBytes()) {
-					Headers = { ContentType = new MediaTypeHeaderValue("application/vnd.eventstore.events+json") }
-				};
-				_response = await _client.SendAsync(request);
-			}
-
-			[Test]
-			public void returns_permanent_redirect() {
-				Assert.AreEqual(HttpStatusCode.RedirectKeepVerb, _response.StatusCode);
-			}
-
-			[Test]
-			public void redirect_is_cacheable() {
-				Assert.AreEqual(CacheControlHeaderValue.Parse("max-age=31536000, public"),
-					_response.Headers.CacheControl);
-			}
-
-			[Test]
-			public void returns_a_location_header() {
-				Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
-			}
-
-			[Test]
-			public void returns_a_location_header_that_is_to_stream_without_slash() {
-				Assert.AreEqual(MakeUrl(TestStream), _response.Headers.GetLocationAsString());
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_deleting_to_stream_with_slash<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				var request = CreateRequest(TestStream + "/", "", "DELETE", "application/json", null);
-				_response = await _client.SendAsync(request);
-			}
-
-			[Test]
-			public void returns_permanent_redirect() {
-				Assert.AreEqual(HttpStatusCode.RedirectKeepVerb, _response.StatusCode);
-			}
-
-			[Test]
-			public void returns_a_location_header() {
-				Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
-			}
-
-			[Test]
-			public void returns_a_location_header_that_is_to_stream_without_slash() {
-				Assert.AreEqual(MakeUrl(TestStream), _response.Headers.GetLocationAsString());
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_getting_from_stream_with_slash<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				var request = CreateRequest(TestStream + "/", "", "GET", "application/json", null);
-				_response = await _client.SendAsync(request);
-			}
-
-			[Test]
-			public void returns_permanent_redirect() {
-				Assert.AreEqual(HttpStatusCode.RedirectKeepVerb, _response.StatusCode);
-			}
-
-			[Test]
-			public void returns_a_location_header() {
-				Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
-			}
-
-			[Test]
-			public void returns_a_location_header_that_is_to_stream_without_slash() {
-				Assert.AreEqual(MakeUrl(TestStream), _response.Headers.GetLocationAsString());
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_getting_from_all_stream_with_slash<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				var request = CreateRequest("/streams/$all/", "", "GET", "application/json", DefaultData.AdminNetworkCredentials);
-				_response = await _client.SendAsync(request);
-			}
-
-			[Test]
-			public void returns_permanent_redirect() {
-				Assert.AreEqual(HttpStatusCode.RedirectKeepVerb, _response.StatusCode);
-			}
-
-			[Test]
-			public void returns_a_location_header() {
-				Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
-			}
-
-			[Test]
-			public void returns_a_location_header_that_is_to_stream_without_slash() {
-				Assert.AreEqual(MakeUrl("/streams/$all"), _response.Headers.GetLocationAsString());
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_getting_from_encoded_all_stream_with_slash<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				var request = CreateRequest("/streams/$all/", "", "GET", "application/json", null);
-				request.Headers.Authorization = new AuthenticationHeaderValue("Basic",
-					GetAuthorizationHeader(DefaultData.AdminNetworkCredentials));
-				_response = await _client.SendAsync(request);
-			}
-
-			[Test]
-			public void returns_permanent_redirect() {
-				Assert.AreEqual(HttpStatusCode.RedirectKeepVerb, _response.StatusCode);
-			}
-
-			[Test]
-			public void returns_a_location_header() {
-				Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
-			}
-
-			[Test]
-			public void returns_a_location_header_that_is_to_stream_without_slash() {
-				Assert.AreEqual(MakeUrl("/streams/$all").ToString(), _response.Headers.GetLocationAsString());
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_posting_an_event_as_array_to_metadata_stream_with_slash<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				var request = CreateRequest(TestStream + "/metadata/", "", "POST", "application/json", null);
-				request.Content = new ByteArrayContent(
-					new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = new { A = "1" } } }
-						.ToJsonBytes()) {
-					Headers = { ContentType = new MediaTypeHeaderValue("application/json") }
-				};
-				_response = await _client.SendAsync(request);
-			}
-
-			[Test]
-			public void returns_permanent_redirect() {
-				Assert.AreEqual(HttpStatusCode.RedirectKeepVerb, _response.StatusCode);
-			}
-
-			[Test]
-			public void returns_a_location_header() {
-				Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
-			}
-
-			[Test]
-			public void returns_a_location_header_that_is_to_stream_without_slash() {
-				Assert.AreEqual(MakeUrl(TestStream + "/metadata"), _response.Headers.GetLocationAsString());
-			}
-		}
-
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_getting_from_metadata_stream_with_slash<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				var request = CreateRequest(TestStream + "/metadata/", "", "GET", "application/json", null);
-				request.Headers.Authorization = new AuthenticationHeaderValue("Basic",
-					GetAuthorizationHeader(DefaultData.AdminNetworkCredentials));
-				_response = await _client.SendAsync(request);
-			}
-
-			[Test]
-			public void returns_permanent_redirect() {
-				Assert.AreEqual(HttpStatusCode.RedirectKeepVerb, _response.StatusCode);
-			}
-
-			[Test]
-			public void returns_a_location_header() {
-				Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
-			}
-
-			[Test]
-			public void returns_a_location_header_that_is_to_stream_without_slash() {
-				Assert.AreEqual(MakeUrl(TestStream + "/metadata"), _response.Headers.GetLocationAsString());
-			}
-		}
-
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_posting_an_event_without_EventId_as_array<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				_response = await MakeJsonPost(
-					TestStream,
-					new[] { new { EventType = "event-type", Data = new { A = "1" } } });
-			}
-
-			[Test]
-			public void returns_bad_request_status_code() {
-				Assert.AreEqual(HttpStatusCode.BadRequest, _response.StatusCode);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_posting_an_event_without_EventType_as_array<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				_response = await MakeArrayEventsPost(
-					TestStream,
-					new[] { new { EventId = Guid.NewGuid(), Data = new { A = "1" } } });
-			}
-
-			[Test]
-			public void returns_bad_request_status_code() {
-				Assert.AreEqual(HttpStatusCode.BadRequest, _response.StatusCode);
-			}
-		}
-		
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_posting_an_event_with_type<TLogFormat, TStreamId>  : with_admin_user<TLogFormat, TStreamId>  {
-			private HttpResponseMessage _response;
-			private readonly JArray _data = JArray.Parse(@"[{
-					""eventId"": ""fd0489ed-80a5-4004-ad79-1282f657ee27"",
-					""eventType"": ""TestType"",
-					""data"": {
-						""$type"": ""foo_type"",
-						""what"": {
-							""$type"": ""bar_type"",
-							""e622b9f3-ca43-4cf2-9433-8c59b2cb2d3c"": {
-								""$type"": ""baz_type"",
-								""another"": ""value""
-							}
-						},
-					},
-					""metadata"": {
-						""$type"": ""qux_type"",
-					}
-				}]");
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				_response = await MakeArrayEventsPost(
-					TestStream, _data);
-			}
-
-			[Test]
-			public async Task the_json_data_retains_the_type() {
-				var json = await GetJson<JObject>(_response.Headers.GetLocationAsString(), extra: "embed=tryharder", accept: ContentType.AtomJson);
-				HelperExtensions.AssertJson(_data.First()["data"], JObject.Parse(json["content"]["data"].ToString()));
-			}
-			
-			[Test]
-			public async Task the_metadata_retains_the_type() {
-				var json = await GetJson<JObject>(_response.Headers.GetLocationAsString(), extra: "embed=tryharder", accept: ContentType.AtomJson);
-				HelperExtensions.AssertJson(_data.First()["metadata"], JObject.Parse(json["content"]["metadata"].ToString()));
-			}
-		}
-		
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_posting_an_event_with_date_time<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				_response = await MakeArrayEventsPost(
-					TestStream,
-					new[] {
-						new {
-							EventId = Guid.NewGuid(),
-							EventType = "event-type",
-							Data = new {A = "1987-11-07T00:00:00.000+01:00"}
-						},
-					});
-			}
-
-			[Test]
-			public void returns_created_status_code() {
-				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-			}
-
-			[Test]
-			public void returns_a_location_header() {
-				Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
-			}
-
-			[Test]
-			public async Task the_json_data_is_not_mangled() {
-				var json = await GetJson<JObject>(_response.Headers.GetLocationAsString());
-				HelperExtensions.AssertJson(new { A = "1987-11-07T00:00:00.000+01:00" }, json);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_posting_an_events_as_array<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-			private HttpResponseMessage _response;
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				_response = await MakeArrayEventsPost(
-					TestStream,
-					new[] {
-						new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {A = "1"}},
-						new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {A = "2"}},
-					});
-			}
-
-			[Test]
-			public void returns_created_status_code() {
-				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-			}
-
-			[Test]
-			public void returns_a_location_header() {
-				Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
-			}
-
-			[Test]
-			public async Task returns_a_location_header_for_the_first_posted_event() {
-				var json = await GetJson<JObject>(_response.Headers.GetLocationAsString());
-				HelperExtensions.AssertJson(new { A = "1" }, json);
-			}
-		}
-
-		public abstract class HttpBehaviorSpecificationWithSingleEvent<TLogFormat, TStreamId>  : with_admin_user<TLogFormat, TStreamId> {
-			protected HttpResponseMessage _response;
-
-			protected override async Task Given() {
-				_response = await MakeArrayEventsPost(
-					TestStream,
-					new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = new { A = "1" } } });
-				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-			}
-		}
-
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_requesting_a_single_event_that_is_deleted_linkto<TLogFormat, TStreamId>
-			: HttpSpecificationWithLinkToToDeletedEvents<TLogFormat, TStreamId> {
-			protected override Task When() {
-				return Get("/streams/" + LinkedStreamName + "/0", "", "application/json", credentials: DefaultData.AdminNetworkCredentials);
-			}
-
-			[Test]
-			public void the_event_is_gone() {
-				Assert.AreEqual(HttpStatusCode.NotFound, _lastResponse.StatusCode);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_requesting_a_single_event_that_is_maxcount_deleted_linkto<TLogFormat, TStreamId> :
-				SpecificationWithLinkToToMaxCountDeletedEvents<TLogFormat, TStreamId> {
-			protected override Task When() {
-				return Get("/streams/" + LinkedStreamName + "/0", "", "application/json", DefaultData.AdminNetworkCredentials);
-			}
-
-			[Test]
-			public void the_event_is_gone() {
-				Assert.AreEqual(HttpStatusCode.NotFound, _lastResponse.StatusCode);
-			}
-		}
-
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_requesting_a_single_event_in_the_stream_without_an_accept_header<TLogFormat, TStreamId>  :
-				HttpBehaviorSpecificationWithSingleEvent<TLogFormat, TStreamId>  {
-			private XDocument _xmlDocument;
-
-			protected override async Task When() {
-				_xmlDocument = await GetXml(MakeUrl(TestStream + "/0"));
-			}
-
-			[Test]
-			public void request_succeeds() {
-				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-			}
-
-			[Test]
-			public void returns_correct_body() {
-				Assert.AreEqual("1", _xmlDocument.Element("data").Element("a").Value);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_requesting_a_single_event_in_the_stream_as_event_json<TLogFormat, TStreamId>
-			: HttpBehaviorSpecificationWithSingleEvent<TLogFormat, TStreamId>  {
-			private JObject _json;
-
-			protected override async Task When() {
-				_json = await GetJson<JObject>(TestStream + "/0", accept: ContentType.EventJson);
-			}
-
-			[Test]
-			public void request_succeeds() {
-				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-			}
-
-			[Test]
-			public void returns_correct_body() {
-				HelperExtensions.AssertJson(new { Data = new { A = "1" } }, _json);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_requesting_a_single_event_in_the_stream_as_json<TLogFormat, TStreamId> :
-			HttpBehaviorSpecificationWithSingleEvent<TLogFormat, TStreamId>  {
-			private JObject _json;
-
-			protected override async Task When() {
-				_json = await GetJson<JObject>(TestStream + "/0", accept: ContentType.Json);
-			}
-
-			[Test]
-			public void request_succeeds() {
-				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-			}
-
-			[Test]
-			public void returns_correct_body() {
-				HelperExtensions.AssertJson(new { A = "1" }, _json);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_requesting_a_single_event_in_the_stream_as_event_xml<TLogFormat, TStreamId>
-			: HttpBehaviorSpecificationWithSingleEvent<TLogFormat, TStreamId>  {
-			protected override Task When() {
-				return Get(TestStream + "/0", "", accept: ContentType.EventXml);
-			}
-
-			[Test]
-			public void request_succeeds() {
-				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_requesting_a_single_event_in_the_stream_as_xml<TLogFormat, TStreamId>
-			: HttpBehaviorSpecificationWithSingleEvent<TLogFormat, TStreamId> {
-			protected override Task When() {
-				return Get(TestStream + "/0", "", accept: ContentType.Xml);
-			}
-
-			[Test]
-			public void request_succeeds() {
-				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_requesting_a_single_raw_event_in_the_stream_as_raw<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-			protected HttpResponseMessage _response;
-			protected byte[] _data;
-
-			protected override async Task Given() {
-				var request = CreateRequest(TestStream, String.Empty, HttpMethod.Post, "application/octet-stream");
-				request.Headers.Add("ES-EventType", "TestEventType");
-				request.Headers.Add("ES-EventID", Guid.NewGuid().ToString());
-				if (_data == null) {
-					var fileData = HelperExtensions.GetFilePathFromAssembly("Resources/es-tile.png");
-					_data = File.ReadAllBytes(fileData);
-				}
-				request.Content = new ByteArrayContent(_data) {
-					Headers = { ContentType = new MediaTypeHeaderValue("application/octet-stream") }
-				};
-				_response = await GetRequestResponse(request);
-				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-			}
-
-			protected override Task When() {
-				return Get(TestStream + "/0", "", "application/octet-stream");
-			}
-
-			[Test]
-			public void returns_correct_body() {
-				Assert.AreEqual(_data, _lastResponseBytes);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/Streams/description_document.cs b/src/EventStore.Core.Tests/Http/Streams/description_document.cs
deleted file mode 100644
index 17ef482b57b..00000000000
--- a/src/EventStore.Core.Tests/Http/Streams/description_document.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-using System;
-using System.Net;
-using System.Text;
-using EventStore.Core.Tests.ClientAPI;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.Tests.Http.Users;
-using EventStore.Transport.Http;
-using NUnit.Framework;
-using System.Linq;
-using Newtonsoft.Json.Linq;
-using HttpStatusCode = System.Net.HttpStatusCode;
-using EventStore.Core.Services.Transport.Http;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.Http.Users.users;
-
-namespace EventStore.Core.Tests.Http.Streams {
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_getting_a_stream_without_accept_header<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		private JObject _descriptionDocument;
-		private List<JToken> _links;
-
-		protected override Task Given() => Task.CompletedTask;
-
-		protected override async Task When() {
-			_descriptionDocument = await GetJsonWithoutAcceptHeader<JObject>(TestStream);
-		}
-
-		[Test]
-		public void returns_not_acceptable() {
-			Assert.AreEqual(HttpStatusCode.NotAcceptable, _lastResponse.StatusCode);
-		}
-
-		[Test]
-		public void returns_a_description_document() {
-			Assert.IsNotNull(_descriptionDocument);
-			_links = _descriptionDocument != null ? _descriptionDocument["_links"].ToList() : new List<JToken>();
-			Assert.IsNotNull(_links, "Expected there to be links in the description but _links is null");
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_getting_a_stream_with_description_document_media_type<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		private JObject _descriptionDocument;
-		private List<JToken> _links;
-
-		protected override Task Given() => Task.CompletedTask;
-
-		protected override async Task When() {
-			_descriptionDocument = await GetJson<JObject>(TestStream, "application/vnd.eventstore.streamdesc+json", null);
-		}
-
-		[Test]
-		public void returns_ok() {
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-		}
-
-		[Test]
-		public void returns_a_description_document() {
-			Assert.IsNotNull(_descriptionDocument);
-			_links = _descriptionDocument != null ? _descriptionDocument["_links"].ToList() : new List<JToken>();
-			Assert.IsNotNull(_links, "Expected there to be links in the description but _links is null");
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_getting_description_document<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		private JObject _descriptionDocument;
-		private List<JToken> _links;
-
-		protected override Task Given() => Task.CompletedTask;
-
-		protected override async Task When() {
-			_descriptionDocument = await GetJson<JObject>(TestStream, "application/vnd.eventstore.streamdesc+json", null);
-			_links = _descriptionDocument != null ? _descriptionDocument["_links"].ToList() : new List<JToken>();
-		}
-
-		[Test]
-		public void returns_ok() {
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-		}
-
-		[Test]
-		public void returns_a_description_document() {
-			Assert.IsNotNull(_descriptionDocument);
-		}
-
-		[Test]
-		public void contains_the_self_link() {
-			Assert.AreEqual("self", ((JProperty)_links[0]).Name);
-			Assert.AreEqual(TestStream, _descriptionDocument["_links"]["self"]["href"].ToString());
-		}
-
-		[Test]
-		public void self_link_contains_only_the_description_document_content_type() {
-			var supportedContentTypes = _descriptionDocument["_links"]["self"]["supportedContentTypes"].Values<string>()
-				.ToArray();
-			Assert.AreEqual(1, supportedContentTypes.Length);
-			Assert.AreEqual("application/vnd.eventstore.streamdesc+json", supportedContentTypes[0]);
-		}
-
-		[Test]
-		public void contains_the_stream_link() {
-			Assert.AreEqual("stream", ((JProperty)_links[1]).Name);
-			Assert.AreEqual(TestStream, _descriptionDocument["_links"]["stream"]["href"].ToString());
-		}
-
-		[Test]
-		public void stream_link_contains_supported_stream_content_types() {
-			var supportedContentTypes = _descriptionDocument["_links"]["stream"]["supportedContentTypes"]
-				.Values<string>().ToArray();
-			Assert.AreEqual(2, supportedContentTypes.Length);
-			Assert.Contains("application/atom+xml", supportedContentTypes);
-			Assert.Contains("application/vnd.eventstore.atom+json", supportedContentTypes);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_getting_description_document_and_subscription_exists_for_stream<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-		private JObject _descriptionDocument;
-		private List<JToken> _links;
-		private JToken[] _subscriptions;
-		private string _subscriptionUrl;
-
-		protected override async Task Given() {
-			_subscriptionUrl = "/subscriptions/" + TestStreamName + "/groupname334";
-			await MakeJsonPut(
-				_subscriptionUrl,
-				new {
-					ResolveLinkTos = true
-				}, DefaultData.AdminNetworkCredentials);
-		}
-
-		protected override async Task When() {
-			_descriptionDocument = await GetJson<JObject>(TestStream, "application/vnd.eventstore.streamdesc+json", null);
-			_links = _descriptionDocument != null ? _descriptionDocument["_links"].ToList() : new List<JToken>();
-			_subscriptions = _descriptionDocument["_links"]["streamSubscription"].Values<JToken>().ToArray();
-		}
-
-		[Test]
-		public void returns_ok() {
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-		}
-
-		[Test]
-		public void returns_a_description_document() {
-			Assert.IsNotNull(_descriptionDocument);
-		}
-
-		[Test]
-		public void contains_3_links() {
-			Assert.AreEqual(3, _links.Count);
-		}
-
-		[Test]
-		public void contains_the_subscription_link() {
-			Assert.AreEqual("streamSubscription", ((JProperty)_links[2]).Name);
-			Assert.AreEqual(_subscriptionUrl, _subscriptions[0]["href"].ToString());
-		}
-
-		[Test]
-		public void subscriptions_link_contains_supported_subscription_content_types() {
-			var supportedContentTypes = _subscriptions[0]["supportedContentTypes"].Values<string>().ToArray();
-			Assert.AreEqual(2, supportedContentTypes.Length);
-			Assert.Contains("application/vnd.eventstore.competingatom+xml", supportedContentTypes);
-			Assert.Contains("application/vnd.eventstore.competingatom+json", supportedContentTypes);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/Streams/feed.cs b/src/EventStore.Core.Tests/Http/Streams/feed.cs
deleted file mode 100644
index 72b1142edce..00000000000
--- a/src/EventStore.Core.Tests/Http/Streams/feed.cs
+++ /dev/null
@@ -1,899 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Net;
-using System.Net.Http.Headers;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Common;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Transport.Http;
-using NUnit.Framework;
-using Newtonsoft.Json.Linq;
-using HttpStatusCode = System.Net.HttpStatusCode;
-using EventStore.Core.Tests.Http.Users.users;
-
-namespace EventStore.Core.Tests.Http.Streams {
-	namespace feed {
-		public abstract class SpecificationWithLongFeed<TLogFormat, TStreamId>
-			: with_admin_user<TLogFormat, TStreamId> {
-			protected int _numberOfEvents;
-
-			protected override async Task Given() {
-				_numberOfEvents = 25;
-				for (var i = 0; i < _numberOfEvents; i++) {
-					await PostEvent(i);
-				}
-			}
-
-			protected async Task<string> PostEvent(int i) {
-				var response = await MakeArrayEventsPost(
-					TestStream,
-					new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = new { Number = i } } });
-				Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
-				return response.Headers.GetLocationAsString();
-			}
-
-			protected string GetLink(JObject feed, string relation) {
-				var rel = (from JObject link in feed["links"]
-						   from JProperty attr in link
-						   where attr.Name == "relation" && (string)attr.Value == relation
-						   select link).SingleOrDefault();
-				return (rel == null) ? (string)null : (string)rel["uri"];
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_posting_multiple_events<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			protected override Task When() {
-				return GetJson<JObject>(TestStream, ContentType.AtomJson);
-			}
-
-			[Test]
-			public void returns_ok_status_code() {
-				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_feed_head<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			private JObject _feed;
-
-			protected override async Task When() {
-				_feed = await GetJson<JObject>(TestStream, ContentType.AtomJson);
-			}
-
-			[Test]
-			public void returns_ok_status_code() {
-				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-			}
-
-			[Test]
-			public void contains_a_link_rel_previous() {
-				var rel = GetLink(_feed, "previous");
-				Assert.IsNotEmpty(rel);
-			}
-
-			[Test]
-			public void contains_a_link_rel_next() {
-				var rel = GetLink(_feed, "next");
-				Assert.IsNotEmpty(rel);
-			}
-
-			[Test]
-			public void contains_a_link_rel_self() {
-				var rel = GetLink(_feed, "self");
-				Assert.IsNotEmpty(rel);
-			}
-
-			[Test]
-			public void contains_a_link_rel_first() {
-				var rel = GetLink(_feed, "first");
-				Assert.IsNotEmpty(rel);
-			}
-
-			[Test]
-			public void contains_a_link_rel_last() {
-				var rel = GetLink(_feed, "last");
-				Assert.IsNotEmpty(rel);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_feed_head_with_forwarded_prefix<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			private JObject _feed;
-			private string _prefix;
-
-			protected override async Task When() {
-				_prefix = "testprefix";
-				var headers = new NameValueCollection();
-				headers.Add("X-Forwarded-Prefix", _prefix);
-				_feed = await GetJson<JObject>(TestStream, ContentType.AtomJson, headers: headers);
-			}
-
-			[Test]
-			public void returns_ok_status_code() {
-				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-			}
-
-			[Test]
-			public void contains_a_link_rel_previous_with_prefix() {
-				var rel = GetLink(_feed, "previous");
-				Assert.AreEqual(MakeUrl("/" + _prefix + TestStream + "/25/forward/20"), new Uri(rel));
-			}
-
-			[Test]
-			public void contains_a_link_rel_next_with_prefix() {
-				var rel = GetLink(_feed, "next");
-				Assert.AreEqual(MakeUrl("/" + _prefix + TestStream + "/4/backward/20"), new Uri(rel));
-			}
-
-			[Test]
-			public void contains_a_link_rel_self_with_prefix() {
-				var rel = GetLink(_feed, "self");
-				Assert.AreEqual(MakeUrl("/" + _prefix + TestStream), new Uri(rel));
-			}
-
-			[Test]
-			public void contains_a_link_rel_first_with_prefix() {
-				var rel = GetLink(_feed, "first");
-				Assert.AreEqual(MakeUrl("/" + _prefix + TestStream + "/head/backward/20"), new Uri(rel));
-			}
-
-			[Test]
-			public void contains_a_link_rel_last_with_prefix() {
-				var rel = GetLink(_feed, "last");
-				Assert.AreEqual(MakeUrl("/" + _prefix + TestStream + "/0/forward/20"), new Uri(rel));
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_the_previous_link_of_the_feed_head<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			private JObject _feed;
-			private JObject _head;
-			private string _previous;
-
-			protected override async Task Given() {
-				await base.Given();
-				_head = await GetJson<JObject>(TestStream, ContentType.AtomJson);
-				_previous = GetLink(_head, "previous");
-			}
-
-			protected override async Task When() {
-				_feed = await GetJson<JObject>(_previous, ContentType.AtomJson);
-			}
-
-			[Test]
-			public void returns_200_response() {
-				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-			}
-
-			[Test]
-			public void there_is_no_prev_link() {
-				var rel = GetLink(_feed, "prev");
-				Assert.IsNull(rel);
-			}
-
-			[Test]
-			public void there_is_a_next_link() {
-				var rel = GetLink(_feed, "next");
-				Assert.IsNotEmpty(rel);
-			}
-
-			[Test]
-			public void there_is_a_self_link() {
-				var rel = GetLink(_feed, "self");
-				Assert.IsNotEmpty(rel);
-			}
-
-			[Test]
-			public void there_is_a_first_link() {
-				var rel = GetLink(_feed, "first");
-				Assert.IsNotEmpty(rel);
-			}
-
-			[Test]
-			public void there_is_a_last_link() {
-				var rel = GetLink(_feed, "last");
-				Assert.IsNotEmpty(rel);
-			}
-
-			[Test]
-			public void the_feed_is_empty() {
-				Assert.AreEqual(0, _feed["entries"].Count());
-			}
-
-			[Test]
-			public void the_response_is_not_cachable() {
-				Assert.AreEqual(CacheControlHeaderValue.Parse("max-age=0, no-cache, must-revalidate"),
-					_lastResponse.Headers.CacheControl);
-			}
-		}
-
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_reading_a_stream_forward_with_deleted_linktos<TLogFormat, TStreamId>
-			: HttpSpecificationWithLinkToToDeletedEvents<TLogFormat, TStreamId> {
-			private JObject _feed;
-			private List<JToken> _entries;
-
-			protected override async Task When() {
-				_feed = await GetJson<JObject>("/streams/" + LinkedStreamName + "/0/forward/10", accept: ContentType.Json, credentials: DefaultData.AdminNetworkCredentials);
-				_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
-			}
-
-			[Test]
-			public void the_feed_has_one_event() {
-				Assert.AreEqual(1, _entries.Count());
-			}
-
-			[Test]
-			public void the_edit_link_to_is_to_correct_uri() {
-				var foo = _entries[0]["links"][0];
-				Assert.AreEqual("edit", foo["relation"].ToString());
-				Assert.AreEqual(MakeUrl("/streams/" + DeletedStreamName + "/0"), foo["uri"].ToString());
-			}
-
-			[Test]
-			public void the_alt_link_to_is_to_correct_uri() {
-				var foo = _entries[0]["links"][1];
-				Assert.AreEqual("alternate", foo["relation"].ToString());
-				Assert.AreEqual(MakeUrl("/streams/" + DeletedStreamName + "/0"), foo["uri"].ToString());
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_reading_a_stream_forward_with_linkto<TLogFormat, TStreamId>
-			: HttpSpecificationWithLinkToToEvents<TLogFormat, TStreamId> {
-			private JObject _feed;
-			private List<JToken> _entries;
-
-			protected override async Task When() {
-				_feed = await GetJson<JObject>("/streams/" + LinkedStreamName + "/0/forward/10", accept: ContentType.Json);
-				_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
-			}
-
-			[Test]
-			public void the_feed_has_two_events() {
-				Assert.AreEqual(2, _entries.Count());
-			}
-
-			[Test]
-			public void the_second_edit_link_to_is_to_correct_uri() {
-				var foo = _entries[1]["links"][0];
-				Assert.AreEqual("edit", foo["relation"].ToString());
-				Assert.AreEqual(MakeUrl("/streams/" + Stream2Name + "/0"), foo["uri"].ToString());
-			}
-
-			[Test]
-			public void the_second_alt_link_to_is_to_correct_uri() {
-				var foo = _entries[1]["links"][1];
-				Assert.AreEqual("alternate", foo["relation"].ToString());
-				Assert.AreEqual(MakeUrl("/streams/" + Stream2Name + "/0"), foo["uri"].ToString());
-			}
-
-			[Test]
-			public void the_first_edit_link_to_is_to_correct_uri() {
-				var foo = _entries[0]["links"][0];
-				Assert.AreEqual("edit", foo["relation"].ToString());
-				Assert.AreEqual(MakeUrl("/streams/" + StreamName + "/1"), foo["uri"].ToString());
-			}
-
-			[Test]
-			public void the_first_alt_link_to_is_to_correct_uri() {
-				var foo = _entries[0]["links"][1];
-				Assert.AreEqual("alternate", foo["relation"].ToString());
-				Assert.AreEqual(MakeUrl("/streams/" + StreamName + "/1"), foo["uri"].ToString());
-			}
-		}
-
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_reading_a_stream_forward_with_linkto_with_at_sign_in_name<TLogFormat, TStreamId>
-			: HttpBehaviorSpecification<TLogFormat, TStreamId> {
-			protected string LinkedStreamName;
-			protected string StreamName;
-
-			protected override async Task Given() {
-				var creds = DefaultData.AdminCredentials;
-				LinkedStreamName = Guid.NewGuid().ToString();
-				StreamName = Guid.NewGuid() + "@" + Guid.NewGuid() + "@";
-				using (var conn = TestConnection.Create(_node.TcpEndPoint)) {
-					await conn.ConnectAsync();
-					await conn.AppendToStreamAsync(StreamName, ExpectedVersion.Any, creds,
-							new EventData(Guid.NewGuid(), "testing", true, Encoding.UTF8.GetBytes("{'foo' : 4}"),
-								new byte[0]))
-;
-					await conn.AppendToStreamAsync(StreamName, ExpectedVersion.Any, creds,
-							new EventData(Guid.NewGuid(), "testing", true, Encoding.UTF8.GetBytes("{'foo' : 4}"),
-								new byte[0]))
-;
-					await conn.AppendToStreamAsync(StreamName, ExpectedVersion.Any, creds,
-							new EventData(Guid.NewGuid(), "testing", true, Encoding.UTF8.GetBytes("{'foo' : 4}"),
-								new byte[0]))
-;
-					await conn.AppendToStreamAsync(LinkedStreamName, ExpectedVersion.Any, creds,
-						new EventData(Guid.NewGuid(), SystemEventTypes.LinkTo, false,
-							Encoding.UTF8.GetBytes("0@" + StreamName), new byte[0]));
-					await conn.AppendToStreamAsync(LinkedStreamName, ExpectedVersion.Any, creds,
-						new EventData(Guid.NewGuid(), SystemEventTypes.LinkTo, false,
-							Encoding.UTF8.GetBytes("1@" + StreamName), new byte[0]));
-				}
-			}
-
-			private JObject _feed;
-			private List<JToken> _entries;
-
-			protected override async Task When() {
-				_feed = await GetJson<JObject>("/streams/" + LinkedStreamName + "/0/forward/10", accept: ContentType.Json);
-				_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
-			}
-
-			[Test]
-			public void the_feed_has_two_events() {
-				Assert.AreEqual(2, _entries.Count());
-			}
-
-			[Test]
-			public void the_second_edit_link_to_is_to_correct_uri() {
-				var foo = _entries[1]["links"][0];
-				Assert.AreEqual("edit", foo["relation"].ToString());
-				//TODO GFY I really wish we were targeting 4.5 only so I could use Uri.EscapeDataString
-				//given the choice between this and a dependency on system.web well yeah. When we have 4.5
-				//only lets use Uri
-				Assert.AreEqual(MakeUrl("/streams/" + StreamName.Replace("@", "%40") + "/0"), foo["uri"].ToString());
-			}
-
-			[Test]
-			public void the_second_alt_link_to_is_to_correct_uri() {
-				var foo = _entries[1]["links"][1];
-				Assert.AreEqual("alternate", foo["relation"].ToString());
-				Assert.AreEqual(MakeUrl("/streams/" + StreamName.Replace("@", "%40") + "/0"), foo["uri"].ToString());
-			}
-
-			[Test]
-			public void the_first_edit_link_to_is_to_correct_uri() {
-				var foo = _entries[0]["links"][0];
-				Assert.AreEqual("edit", foo["relation"].ToString());
-				Assert.AreEqual(MakeUrl("/streams/" + StreamName.Replace("@", "%40") + "/1"), foo["uri"].ToString());
-			}
-
-			[Test]
-			public void the_first_alt_link_to_is_to_correct_uri() {
-				var foo = _entries[0]["links"][1];
-				Assert.AreEqual("alternate", foo["relation"].ToString());
-				Assert.AreEqual(MakeUrl("/streams/" + StreamName.Replace("@", "%40") + "/1"), foo["uri"].ToString());
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_reading_a_stream_forward_with_maxcount_deleted_linktos<TLogFormat, TStreamId> :
-				SpecificationWithLinkToToMaxCountDeletedEvents<TLogFormat, TStreamId> {
-			private JObject _feed;
-			private List<JToken> _entries;
-
-			protected override async Task When() {
-				_feed = await GetJson<JObject>("/streams/" + LinkedStreamName + "/0/forward/10", accept: ContentType.Json);
-				_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
-			}
-
-			[Test]
-			public void the_feed_has_no_events() {
-				Assert.AreEqual(1, _entries.Count());
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		[Explicit("Failing test for Greg demonstrating NullReferenceException in Convert.cs")]
-		public class
-			when_reading_a_stream_forward_with_maxcount_deleted_linktos_with_rich_entry<TLogFormat, TStreamId> :
-				SpecificationWithLinkToToMaxCountDeletedEvents<TLogFormat, TStreamId> {
-			private JObject _feed;
-			private List<JToken> _entries;
-
-			protected override async Task When() {
-				_feed = await GetJson<JObject>("/streams/" + LinkedStreamName + "/0/forward/10",extra: "embed=rich",
-					accept: ContentType.Json);
-				_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
-			}
-
-			[Test]
-			public void the_feed_has_some_events() {
-				Assert.AreEqual(1, _entries.Count());
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_reading_a_stream_forward_with_deleted_linktos_with_content_enabled_as_xml<TLogFormat, TStreamId> :
-			HttpSpecificationWithLinkToToDeletedEvents<TLogFormat, TStreamId> {
-			private XDocument _feed;
-			private XElement[] _entries;
-
-			protected override async Task When() {
-				_feed = await GetAtomXml(MakeUrl("/streams/" + LinkedStreamName + "/0/forward/10", "embed=content"));
-				_entries = _feed.GetEntries();
-			}
-
-			[Test]
-			public void the_feed_has_one_event() {
-				Assert.AreEqual(1, _entries.Length);
-			}
-
-			[Test]
-			public void the_edit_link_is_to_correct_uri() {
-				var link = _entries[0].GetLink("edit");
-				Assert.AreEqual(MakeUrl("/streams/" + DeletedStreamName + "/0"), link);
-			}
-
-			[Test]
-			public void the_alternate_link_is_to_correct_uri() {
-				var link = _entries[0].GetLink("alternate");
-				Assert.AreEqual(MakeUrl("/streams/" + DeletedStreamName + "/0"), link);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_reading_a_stream_forward_with_deleted_linktos_with_content_enabled<TLogFormat, TStreamId> :
-				HttpSpecificationWithLinkToToDeletedEvents<TLogFormat, TStreamId> {
-			private JObject _feed;
-			private List<JToken> _entries;
-
-			protected override async Task When() {
-				var uri = MakeUrl("/streams/" + LinkedStreamName + "/0/forward/10", "embed=content");
-				_feed = await GetJson<JObject>(uri.ToString(), accept: ContentType.Json, credentials: DefaultData.AdminNetworkCredentials);
-				_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
-			}
-
-			[Test]
-			public void the_feed_has_one_event() {
-				Assert.AreEqual(1, _entries.Count());
-			}
-
-			[Test]
-			public void the_edit_link_to_is_to_correct_uri() {
-				var foo = _entries[0]["links"][0];
-				Assert.AreEqual("edit", foo["relation"].ToString());
-				Assert.AreEqual(MakeUrl("/streams/" + DeletedStreamName + "/0"), foo["uri"].ToString());
-			}
-
-			[Test]
-			public void the_alt_link_to_is_to_correct_uri() {
-				var foo = _entries[0]["links"][1];
-				Assert.AreEqual("alternate", foo["relation"].ToString());
-				Assert.AreEqual(MakeUrl("/streams/" + DeletedStreamName + "/0"), foo["uri"].ToString());
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_reading_a_stream_backward_with_deleted_linktos<TLogFormat, TStreamId>
-			: HttpSpecificationWithLinkToToDeletedEvents<TLogFormat, TStreamId> {
-			private JObject _feed;
-			private List<JToken> _entries;
-
-			protected override async Task When() {
-				_feed = await GetJson<JObject>("/streams/" + LinkedStreamName + "/0/backward/1", accept: ContentType.Json, credentials: DefaultData.AdminNetworkCredentials);
-				_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
-			}
-
-			[Test]
-			public void the_feed_has_one_event() {
-				Assert.AreEqual(1, _entries.Count());
-			}
-
-			[Test]
-			public void the_edit_link_to_is_to_correct_uri() {
-				var foo = _entries[0]["links"][0];
-				Assert.AreEqual("edit", foo["relation"].ToString());
-				Assert.AreEqual(MakeUrl("/streams/" + DeletedStreamName + "/0"), foo["uri"].ToString());
-			}
-
-			[Test]
-			public void the_alt_link_to_is_to_correct_uri() {
-				var foo = _entries[0]["links"][1];
-				Assert.AreEqual("alternate", foo["relation"].ToString());
-				Assert.AreEqual(MakeUrl("/streams/" + DeletedStreamName + "/0"), foo["uri"].ToString());
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_reading_a_stream_backward_with_deleted_linktos_and_embed_of_content<TLogFormat, TStreamId> :
-				HttpSpecificationWithLinkToToDeletedEvents<TLogFormat, TStreamId> {
-			private JObject _feed;
-			private List<JToken> _entries;
-
-			protected override async Task When() {
-				var uri = MakeUrl("/streams/" + LinkedStreamName + "/0/backward/1", "embed=content");
-				_feed = await GetJson<JObject>(uri.ToString(), accept: ContentType.Json, credentials: DefaultData.AdminNetworkCredentials);
-				_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
-			}
-
-			[Test]
-			public void the_feed_has_one_event() {
-				Assert.AreEqual(1, _entries.Count());
-			}
-
-			[Test]
-			public void the_edit_link_to_is_to_correct_uri() {
-				var foo = _entries[0]["links"][0];
-				Assert.AreEqual("edit", foo["relation"].ToString());
-				Assert.AreEqual(MakeUrl("/streams/" + DeletedStreamName + "/0"), foo["uri"].ToString());
-			}
-
-			[Test]
-			public void the_alt_link_to_is_to_correct_uri() {
-				var foo = _entries[0]["links"][1];
-				Assert.AreEqual("alternate", foo["relation"].ToString());
-				Assert.AreEqual(MakeUrl("/streams/" + DeletedStreamName + "/0"), foo["uri"].ToString());
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_polling_the_head_forward_and_a_new_event_appears<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			private JObject _feed;
-			private JObject _head;
-			private string _previous;
-			private string _lastEventLocation;
-
-			protected override async Task Given() {
-				await base.Given();
-				_head = await GetJson<JObject>(TestStream, ContentType.AtomJson);
-				Console.WriteLine(new string('*', 60));
-				Console.WriteLine(_head);
-				Console.WriteLine(TestStream);
-				Console.WriteLine(new string('*', 60));
-				_previous = GetLink(_head, "previous");
-				_lastEventLocation = await PostEvent(-1);
-			}
-
-			protected override async Task When() {
-				_feed = await GetJson<JObject>(_previous, ContentType.AtomJson);
-			}
-
-			[Test]
-			public void returns_ok_status_code() {
-				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-			}
-
-			[Test]
-			public void returns_a_feed_with_a_single_entry_referring_to_the_last_event() {
-				HelperExtensions.AssertJson(new { entries = new[] { new { Id = _lastEventLocation } } }, _feed);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_reading_a_stream_forward_from_beginning_asking_for_less_events_than_in_the_stream<TLogFormat, TStreamId>  :
-				SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			private JObject _feed;
-
-			protected override async Task When() {
-				_feed = await GetJson<JObject>(TestStream + "/0/forward/" + (_numberOfEvents - 1),
-					accept: ContentType.AtomJson);
-			}
-
-			[Test]
-			public void the_head_of_stream_is_false() {
-				Assert.AreEqual(false, _feed.Value<bool>("headOfStream"));
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_reading_a_stream_forward_from_beginning_asking_for_more_events_than_in_the_stream<TLogFormat, TStreamId> :
-				SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			private JObject _feed;
-
-			protected override async Task When() {
-				_feed = await GetJson<JObject>(TestStream + "/0/forward/" + (_numberOfEvents + 1),
-					accept: ContentType.AtomJson);
-			}
-
-			[Test]
-			public void the_head_of_stream_is_true() {
-				Assert.AreEqual(true, _feed.Value<bool>("headOfStream"));
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_reading_a_stream_forward_from_beginning_asking_for_exactly_the_events_in_the_stream<TLogFormat, TStreamId> :
-				SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			private JObject _feed;
-
-			protected override async Task When() {
-				_feed = await GetJson<JObject>(TestStream + "/0/forward/" + _numberOfEvents, accept: ContentType.AtomJson);
-			}
-
-			[Test]
-			public void the_head_of_stream_is_true() {
-				Assert.AreEqual(true, _feed.Value<bool>("headOfStream"));
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_reading_a_stream_forward_with_etag_in_header<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			private JObject _feed;
-
-			protected override async Task When() {
-				_feed = await GetJson<JObject>(TestStream, accept: ContentType.AtomJson);
-				var etag = _feed.Value<string>("eTag");
-				var headers = new NameValueCollection { { "If-None-Match", EntityTagHeaderValue.Parse($@"""{etag}""").Tag } };
-				_feed = await GetJson<JObject>(TestStream, accept: ContentType.AtomJson, headers: headers);
-			}
-
-			[Test]
-			public void should_return_not_modified() {
-				Assert.AreEqual(HttpStatusCode.NotModified, _lastResponse.StatusCode);
-			}
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_reading_the_all_stream_backward_with_resolve_link_to<TLogFormat, TStreamId>
-		: HttpSpecificationWithLinkToToEvents<TLogFormat, TStreamId> {
-		private JObject _feed;
-		private List<JToken> _entries;
-
-		protected override async Task When() {
-			var headers = new NameValueCollection {{"ES-ResolveLinkTos", "True"}};
-			_feed = await GetJson<JObject>("/streams/$all/head/backward/30",
-				ContentType.Json, DefaultData.AdminNetworkCredentials, headers);
-			_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
-		}
-
-		[Test]
-		public void there_are_three_events_for_the_first_original_stream() {
-			var events = _entries.Where(x => x["title"].Value<string>().Contains(StreamName));
-			Assert.AreEqual(3, events.Count());
-		}
-		
-		[Test]
-		public void there_are_two_events_for_the_second_original_stream() {
-			var events = _entries.Where(x => x["title"].Value<string>().Contains(Stream2Name));
-			Assert.AreEqual(2, events.Count());
-		}
-		
-		[Test]
-		public void there_are_no_events_for_the_linked_stream() {
-			var events = _entries.Where(x => x["title"].Value<string>().Contains(LinkedStreamName));
-			Assert.IsEmpty(events);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_reading_the_all_stream_backward_with_resolve_link_to_disabled<TLogFormat, TStreamId>
-		: HttpSpecificationWithLinkToToEvents<TLogFormat, TStreamId> {
-		private JObject _feed;
-		private List<JToken> _entries;
-
-		protected override async Task When() {
-			var headers = new NameValueCollection {{"ES-ResolveLinkTos", "False"}};
-			_feed = await GetJson<JObject>("/streams/$all",
-				ContentType.Json, DefaultData.AdminNetworkCredentials, headers);
-			_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
-		}
-
-		[Test]
-		public void there_are_two_events_for_the_first_original_stream() {
-			var events = _entries.Where(x => x["title"].Value<string>().Contains(StreamName));
-			Assert.AreEqual(2, events.Count());
-		}
-		
-		[Test]
-		public void there_is_one_event_for_the_second_original_stream() {
-			var events = _entries.Where(x => x["title"].Value<string>().Contains(Stream2Name));
-			Assert.AreEqual(1, events.Count());
-		}
-		
-		[Test]
-		public void there_are_two_events_for_the_linked_stream() {
-			var events = _entries.Where(x => x["title"].Value<string>().Contains(LinkedStreamName));
-			Assert.AreEqual(2, events.Count());
-		}
-	}
-		
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_reading_the_all_stream_forward_with_resolve_link_to<TLogFormat, TStreamId>
-		: HttpSpecificationWithLinkToToEvents<TLogFormat, TStreamId> {
-		private JObject _feed;
-		private List<JToken> _entries;
-
-		protected override async Task When() {
-			var headers = new NameValueCollection {{"ES-ResolveLinkTos", "True"}};
-			_feed = await GetJson<JObject>("/streams/$all/00000000000000000000037777777777/forward/30", 
-				ContentType.Json, DefaultData.AdminNetworkCredentials, headers);
-			_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
-		}
-
-		[Test]
-		public void there_are_three_events_for_the_first_original_stream() {
-			var events = _entries.Where(x => x["title"].Value<string>().Contains(StreamName));
-			Assert.AreEqual(3, events.Count());
-		}
-		
-		[Test]
-		public void there_are_two_events_for_the_second_original_stream() {
-			var events = _entries.Where(x => x["title"].Value<string>().Contains(Stream2Name));
-			Assert.AreEqual(2, events.Count());
-		}
-		
-		[Test]
-		public void there_are_no_events_for_the_linked_stream() {
-			var events = _entries.Where(x => x["title"].Value<string>().Contains(LinkedStreamName));
-			Assert.IsEmpty(events);
-		}
-	}
-
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_reading_the_all_stream_forward_with_resolve_link_to_disabled<TLogFormat, TStreamId>
-		: HttpSpecificationWithLinkToToEvents<TLogFormat, TStreamId> {
-		private JObject _feed;
-		private List<JToken> _entries;
-
-		protected override async Task When() {
-			var headers = new NameValueCollection {{"ES-ResolveLinkTos", "False"}};
-			_feed = await GetJson<JObject>("/streams/$all/00000000000000000000037777777777/forward/30", 
-				ContentType.Json, DefaultData.AdminNetworkCredentials, headers);
-			_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
-		}
-
-		[Test]
-		public void there_are_two_events_for_the_first_original_stream() {
-			var events = _entries.Where(x => x["title"].Value<string>().Contains(StreamName));
-			Assert.AreEqual(2, events.Count());
-		}
-		
-		[Test]
-		public void there_is_one_event_for_the_second_original_stream() {
-			var events = _entries.Where(x => x["title"].Value<string>().Contains(Stream2Name));
-			Assert.AreEqual(1, events.Count());
-		}
-		
-		[Test]
-		public void there_are_two_events_for_the_linked_stream() {
-			var events = _entries.Where(x => x["title"].Value<string>().Contains(LinkedStreamName));
-			Assert.AreEqual(2, events.Count());
-		}
-	}
-}
-
-// This test needs to be out of the streams namespace to prevent it from inheriting the wrong mini node.
-namespace EventStore.Core.Tests.Http {
-	public class when_running_the_node_advertising_a_different_ip_as {
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_feed_head_and_http_advertise_ip_is_set<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-			private JObject _feed;
-			private string advertisedAddress = "127.0.10.1";
-			private int advertisedPort = 2116;
-
-			protected override MiniNode<TLogFormat, TStreamId> CreateMiniNode() {
-				return new MiniNode<TLogFormat, TStreamId>(PathName,
-					advertisedExtHostAddress: advertisedAddress, advertisedHttpPort: advertisedPort);
-			}
-
-			protected override async Task Given() {
-				var response = await MakeArrayEventsPost(
-					TestStream,
-					new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = new { Number = 1 } } });
-				Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
-			}
-
-			protected string GetLink(JObject feed, string relation) {
-				var rel = (from JObject link in feed["links"]
-						   from JProperty attr in link
-						   where attr.Name == "relation" && (string)attr.Value == relation
-						   select link).SingleOrDefault();
-				return (rel == null) ? (string)null : (string)rel["uri"];
-			}
-
-			protected string GetFirstEntryLink(JObject feed) {
-				var rel = (from JObject entry in feed["entries"]
-						   from JObject link in entry["links"]
-						   from JProperty attr in link
-						   where attr.Name == "relation" && (string)attr.Value == "edit"
-						   select link).FirstOrDefault();
-				return (rel == null) ? (string)null : (string)rel["uri"];
-			}
-
-			protected override async Task When() {
-				Console.WriteLine("Getting feed");
-				_feed = await GetJson<JObject>(TestStream, ContentType.AtomJson);
-				Console.WriteLine("Feed: {0}", _feed);
-			}
-
-			[Test]
-			public void returns_ok_status_code() {
-				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-			}
-
-			[Test]
-			public void contains_a_link_rel_previous_using_advertised_ip_and_port() {
-				var rel = GetLink(_feed, "previous");
-				Assert.IsNotEmpty(rel);
-				var uri = new Uri(rel);
-				Assert.AreEqual(advertisedAddress.ToString(), uri.Host);
-				Assert.AreEqual(advertisedPort, uri.Port);
-			}
-
-			[Test]
-			public void contains_a_link_rel_self_using_advertised_ip_and_port() {
-				var rel = GetLink(_feed, "self");
-				Assert.IsNotEmpty(rel);
-				var uri = new Uri(rel);
-				Assert.AreEqual(advertisedAddress.ToString(), uri.Host);
-				Assert.AreEqual(advertisedPort, uri.Port);
-			}
-
-			[Test]
-			public void contains_a_link_rel_first_using_advertised_ip_and_port() {
-				var rel = GetLink(_feed, "first");
-				Assert.IsNotEmpty(rel);
-				var uri = new Uri(rel);
-				Assert.AreEqual(advertisedAddress.ToString(), uri.Host);
-				Assert.AreEqual(advertisedPort, uri.Port);
-			}
-
-			[Test]
-			public void contains_an_entry_with_rel_link_using_advertised_ip_and_port() {
-				var rel = GetFirstEntryLink(_feed);
-				Assert.IsNotEmpty(rel);
-				var uri = new Uri(rel);
-				Assert.AreEqual(advertisedAddress.ToString(), uri.Host);
-				Assert.AreEqual(advertisedPort, uri.Port);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/Streams/filtered.cs b/src/EventStore.Core.Tests/Http/Streams/filtered.cs
deleted file mode 100644
index 5f3ab341cad..00000000000
--- a/src/EventStore.Core.Tests/Http/Streams/filtered.cs
+++ /dev/null
@@ -1,457 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.Http.Users.users;
-using Newtonsoft.Json.Linq;
-using NUnit.Framework;
-using HttpStatusCode = System.Net.HttpStatusCode;
-using EventStore.Transport.Http;
-
-namespace EventStore.Core.Tests.Http.Streams {
-	public class Filtered {
-		public abstract class SpecificationWithLongFeed<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
-			protected int NumberOfEvents;
-
-			protected override async Task Given() {
-				NumberOfEvents = 25;
-				for (var i = 0; i < NumberOfEvents; i++) {
-					await PostEvent(i, TestStream + "-ignore", "ignore-event-type");
-					await PostEvent(i, TestStream + "-filter", "event1-type");
-					await PostEvent(i, TestStream + "-filter", "event2-type");
-				}
-			}
-
-			protected async Task<Uri> PostEvent(int i, string streamId, string eventType) {
-				var response = await MakeArrayEventsPost(
-					streamId,
-					new[] { new { EventId = Guid.NewGuid(), EventType = eventType, Data = new { Number = i } } });
-				Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
-				return response.Headers.Location;
-			}
-
-			protected string GetLink(JObject feed, string relation) {
-				var rel = (from JObject link in feed["links"]
-						   from JProperty attr in link
-						   where attr.Name == "relation" && (string)attr.Value == relation
-						   select link).SingleOrDefault();
-				return (rel == null) ? null : (string)rel["uri"];
-			}
-
-			protected List<string> GetEventTypes(JObject feed) =>
-				feed["entries"]
-					.Select(e => e["summary"].Value<string>())
-					.OrderBy(e => e)
-					.ToList();
-
-			protected string AllFilteredStream => "/streams/%24all/filtered";
-
-			protected string AllFilteredStreamForward => "/streams/$all/filtered/00000000000000000000000000000000/forward/14";
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_backward_with_invalid_context<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			protected override Task When() =>
-				GetJson<JObject>(AllFilteredStream,
-					ContentType.AtomJson,
-					DefaultData.AdminNetworkCredentials,
-					extra: "context=foo");
-
-			[Test]
-			public void returns_bad_request_status_code() =>
-				Assert.AreEqual(HttpStatusCode.BadRequest, _lastResponse.StatusCode);
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_backward_with_invalid_type<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			protected override Task When() =>
-				GetJson<JObject>(AllFilteredStream,
-					ContentType.AtomJson,
-					DefaultData.AdminNetworkCredentials,
-					extra: "context=streamid&type=foo");
-
-			[Test]
-			public void returns_bad_request_status_code() =>
-				Assert.AreEqual(HttpStatusCode.BadRequest, _lastResponse.StatusCode);
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_backward_with_invalid_data<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			protected override Task When() =>
-				GetJson<JObject>(AllFilteredStream,
-					ContentType.AtomJson,
-					DefaultData.AdminNetworkCredentials,
-					extra: "context=streamid&type=prefix");
-
-			[Test]
-			public void returns_bad_request_status_code() =>
-				Assert.AreEqual(HttpStatusCode.BadRequest, _lastResponse.StatusCode);
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_backward_feed_head<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			private JObject _feed;
-
-			protected override async Task When() =>
-				_feed = await GetJson<JObject>(AllFilteredStream,
-					ContentType.AtomJson, 
-					DefaultData.AdminNetworkCredentials,
-					extra: "context=eventtype&type=prefix&data=event1-");
-
-			[Test]
-			public void returns_ok_status_code() =>
-				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-
-			[Test]
-			public void contains_a_link_rel_previous() {
-				var rel = GetLink(_feed, "previous");
-				Assert.IsNotEmpty(rel);
-			}
-
-			[Test]
-			public void contains_a_link_rel_next() {
-				var rel = GetLink(_feed, "next");
-				Assert.IsNotEmpty(rel);
-			}
-
-			[Test]
-			public void contains_a_link_rel_self() {
-				var rel = GetLink(_feed, "self");
-				Assert.IsNotEmpty(rel);
-				Assert.AreEqual(
-					MakeUrl(AllFilteredStream),
-					new Uri(rel));
-			}
-
-			[Test]
-			public void contains_a_link_rel_first() {
-				var rel = GetLink(_feed, "first");
-				Assert.IsNotEmpty(rel);
-			}
-
-			[Test]
-			public void contains_a_link_rel_last() {
-				var rel = GetLink(_feed, "last");
-				Assert.IsNotEmpty(rel);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_backward_feed_events_by_event_type_and_prefix<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			private List<string> _eventTypes;
-
-			protected override async Task When() {
-				var feed = await GetJson<JObject>(AllFilteredStream,
-					ContentType.AtomJson, 
-					DefaultData.AdminNetworkCredentials,
-					extra: "context=eventtype&type=prefix&data=event1-,event2-");
-				_eventTypes = GetEventTypes(feed);
-			}
-
-			[Test]
-			public void should_only_contain_filtered_events() {
-				for (var index = 0; index < 7; index++) {
-					Assert.AreEqual("event1-type", _eventTypes[index]);
-					Assert.AreEqual("event2-type", _eventTypes[index + 7]);
-				}
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_backward_feed_events_by_event_type_and_regex<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			private List<string> _eventTypes;
-
-			protected override async Task When() {
-				var feed = await GetJson<JObject>(AllFilteredStream,
-					ContentType.AtomJson, 
-					DefaultData.AdminNetworkCredentials,
-					extra: "context=eventtype&type=regex&data=^.*eventtype1.*$");
-				_eventTypes = GetEventTypes(feed);
-			}
-
-			[Test]
-			public void should_only_contain_filtered_events() {
-				foreach (var eventType in _eventTypes) {
-					Assert.AreEqual("event1-type", eventType);
-				}
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_backward_feed_events_by_stream_id_and_prefix<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			private List<string> _eventTypes;
-
-			protected override async Task When() {
-				var feed = await GetJson<JObject>(AllFilteredStream,
-					ContentType.AtomJson, 
-					DefaultData.AdminNetworkCredentials,
-					extra: $"context=streamid&type=prefix&data={TestStream}-filter");
-				_eventTypes = GetEventTypes(feed);
-			}
-
-			[Test]
-			public void should_only_contain_filtered_events() {
-				foreach (var eventType in _eventTypes) {
-					Assert.AreEqual("event-type", eventType);
-				}
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_backward_feed_events_by_stream_id_and_regex<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			private List<string> _eventTypes;
-
-			protected override async Task When() {
-				var feed = await GetJson<JObject>(AllFilteredStream,
-					ContentType.AtomJson, 
-					DefaultData.AdminNetworkCredentials,
-					extra: $"context=streamid&type=regex&data=^.*{TestStream}-filter.*$");
-				_eventTypes = GetEventTypes(feed);
-			}
-
-			[Test]
-			public void should_only_contain_filtered_events() {
-				foreach (var eventType in _eventTypes) {
-					Assert.AreEqual("event1-type", eventType);
-				}
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_backward_feed_events_filtering_system_events<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			private List<string> _eventTypes;
-
-			protected override async Task When() {
-				var feed = await GetJson<JObject>(AllFilteredStream,
-					ContentType.AtomJson, 
-					DefaultData.AdminNetworkCredentials, 
-					extra: "exclude-system-events=true" );
-				_eventTypes = GetEventTypes(feed);
-			}
-
-			[Test]
-			public void should_only_contain_filtered_events() {
-				foreach (var eventType in _eventTypes) {
-					Assert.IsFalse(eventType.StartsWith("$"));
-				}
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_forward_with_invalid_context<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			protected override Task When() =>
-				GetJson<JObject>(AllFilteredStreamForward,
-					ContentType.AtomJson,
-					DefaultData.AdminNetworkCredentials, 
-					extra: "context=foo");
-
-
-			[Test]
-			public void returns_bad_request_status_code() =>
-				Assert.AreEqual(HttpStatusCode.BadRequest, _lastResponse.StatusCode);
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_forward_with_invalid_type<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			protected override Task When() =>
-				GetJson<JObject>(AllFilteredStreamForward,
-					ContentType.AtomJson,
-					DefaultData.AdminNetworkCredentials, 
-					extra: "context=streamid&type=foo");
-
-			[Test]
-			public void returns_bad_request_status_code() =>
-				Assert.AreEqual(HttpStatusCode.BadRequest, _lastResponse.StatusCode);
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_forward_with_invalid_data<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			protected override Task When() =>
-				GetJson<JObject>(AllFilteredStreamForward,
-					ContentType.AtomJson,
-					DefaultData.AdminNetworkCredentials, 
-					extra: "context=streamid&type=prefix");
-
-			[Test]
-			public void returns_bad_request_status_code() =>
-				Assert.AreEqual(HttpStatusCode.BadRequest, _lastResponse.StatusCode);
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_forward_feed_head<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			private JObject _feed;
-
-			protected override async Task When() =>
-				_feed = await GetJson<JObject>(AllFilteredStreamForward,
-					ContentType.AtomJson, 
-					DefaultData.AdminNetworkCredentials, 
-					extra: "context=eventtype&type=prefix&data=event1-" );
-
-			[Test]
-			public void returns_ok_status_code() =>
-				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-
-			[Test]
-			public void contains_a_link_rel_previous() {
-				var rel = GetLink(_feed, "previous");
-				Assert.IsNotEmpty(rel);
-			}
-
-
-			[Test]
-			public void contains_a_link_rel_self() {
-				var rel = GetLink(_feed, "self");
-				Assert.IsNotEmpty(rel);
-				Assert.AreEqual(
-					MakeUrl(AllFilteredStream),
-					new Uri(rel));
-			}
-
-			[Test]
-			public void contains_a_link_rel_first() {
-				var rel = GetLink(_feed, "first");
-				Assert.IsNotEmpty(rel);
-				Assert.AreEqual(
-					MakeUrl($"{AllFilteredStream}/head/backward/14"),
-					new Uri(rel));
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_forward_feed_events_by_event_type_and_prefix<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			private List<string> _eventTypes;
-
-			protected override async Task When() {
-				var feed = await GetJson<JObject>(AllFilteredStreamForward,
-					ContentType.AtomJson, 
-					DefaultData.AdminNetworkCredentials, 
-					extra: "context=eventtype&type=prefix&data=event1-,event2-");
-				_eventTypes = GetEventTypes(feed);
-			}
-
-			[Test]
-			public void should_only_contain_filtered_events() {
-				for (var index = 0; index < 7; index++) {
-					Assert.AreEqual("event1-type", _eventTypes[index]);
-					Assert.AreEqual("event2-type", _eventTypes[index + 7]);
-				}
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_forward_feed_events_by_event_type_and_regex<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			private List<string> _eventTypes;
-
-			protected override async Task When() {
-				var feed = await GetJson<JObject>(AllFilteredStreamForward,
-					ContentType.AtomJson, 
-					DefaultData.AdminNetworkCredentials, 
-					extra: "context=eventtype&type=regex&data=^.*eventtype1.*$");
-				_eventTypes = GetEventTypes(feed);
-			}
-
-			[Test]
-			public void should_only_contain_filtered_events() {
-				foreach (var eventType in _eventTypes) {
-					Assert.AreEqual("event1-type", eventType);
-				}
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_forward_feed_events_by_stream_id_and_prefix<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			private List<string> _eventTypes;
-
-			protected override async Task When() {
-				var feed = await GetJson<JObject>(AllFilteredStreamForward,
-					ContentType.AtomJson, 
-					DefaultData.AdminNetworkCredentials, 
-					extra: $"context=streamid&type=prefix&data={TestStream}-filter");
-				_eventTypes = GetEventTypes(feed);
-			}
-
-			[Test]
-			public void should_only_contain_filtered_events() {
-				foreach (var eventType in _eventTypes) {
-					Assert.AreEqual("event-type", eventType);
-				}
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_forward_feed_events_by_stream_id_and_regex<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			private List<string> _eventTypes;
-
-			protected override async Task When() {
-				var feed = await GetJson<JObject>(AllFilteredStreamForward,
-					ContentType.AtomJson, 
-					DefaultData.AdminNetworkCredentials, 
-					extra: $"context=streamid&type=regex&data=^.*{TestStream}-filter.*$");
-				_eventTypes = GetEventTypes(feed);
-			}
-
-			[Test]
-			public void should_only_contain_filtered_events() {
-				foreach (var eventType in _eventTypes) {
-					Assert.AreEqual("event1-type", eventType);
-				}
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_forward_feed_events_filtering_system_events<TLogFormat, TStreamId> : SpecificationWithLongFeed<TLogFormat, TStreamId> {
-			private List<string> _eventTypes;
-
-			protected override async Task When() {
-				var feed = await GetJson<JObject>(AllFilteredStreamForward,
-					ContentType.AtomJson, 
-					DefaultData.AdminNetworkCredentials, 
-					extra: "exclude-system-events=true");
-				_eventTypes = GetEventTypes(feed);
-			}
-
-			[Test]
-			public void should_only_contain_filtered_events() {
-				foreach (var eventType in _eventTypes) {
-					Assert.IsFalse(eventType.StartsWith("$"));
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/Streams/idempotency.cs b/src/EventStore.Core.Tests/Http/Streams/idempotency.cs
deleted file mode 100644
index 77623a2d545..00000000000
--- a/src/EventStore.Core.Tests/Http/Streams/idempotency.cs
+++ /dev/null
@@ -1,295 +0,0 @@
-using System;
-using System.Text;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using Newtonsoft.Json.Linq;
-using HttpStatusCode = System.Net.HttpStatusCode;
-using EventStore.Core.Tests.Http.Users.users;
-
-namespace EventStore.Core.Tests.Http.Streams {
-	namespace idempotency {
-		[SetUpFixture]
-		abstract class HttpBehaviorSpecificationOfSuccessfulCreateEvent<TLogFormat, TStreamId>
-			: with_admin_user<TLogFormat, TStreamId> {
-			protected HttpResponseMessage _response;
-
-			[OneTimeSetUp]
-			public override Task TestFixtureSetUp() {
-				return base.TestFixtureSetUp();
-			}
-
-			[OneTimeTearDown]
-			public override Task TestFixtureTearDown() {
-				_response?.Dispose();
-
-				return base.TestFixtureTearDown();
-			}
-
-			[Test]
-			public void response_should_not_be_null() {
-				Assert.IsNotNull(_response);
-			}
-
-			[Test]
-			public void returns_created_status_code() {
-				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-			}
-
-			[Test]
-			public void returns_a_location_header() {
-				Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
-			}
-
-			[Test]
-			public void returns_a_location_header_ending_with_zero() {
-				var location = _response.Headers.GetLocationAsString();
-				var tail = location.Substring(location.Length - "/0".Length);
-				Assert.AreEqual("/0", tail);
-			}
-
-			[Test]
-			public async Task returns_a_location_header_that_can_be_read_as_json() {
-				var json = await GetJson<JObject>(_response.Headers.GetLocationAsString());
-				HelperExtensions.AssertJson(new { A = "1" }, json);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		class when_posting_to_idempotent_guid_id_then_as_array<TLogFormat, TStreamId>
-			: HttpBehaviorSpecificationOfSuccessfulCreateEvent<TLogFormat, TStreamId> {
-			private Guid _eventId;
-
-			protected override Task Given() {
-				_eventId = Guid.NewGuid();
-				return PostEvent();
-			}
-
-			protected override async Task When() {
-				_response = await MakeArrayEventsPost(
-					TestStream,
-					new[] { new { EventId = _eventId, EventType = "event-type", Data = new { A = "1" } } });
-			}
-
-			private async Task PostEvent() {
-				var request = CreateRequest(TestStream + "/incoming/" + _eventId.ToString(), "", "POST",
-					"application/json");
-				request.Headers.Add("ES-EventType", "SomeType");
-				var data = "{a : \"1\"}";
-				var bytes = Encoding.UTF8.GetBytes(data);
-				request.Content = new ByteArrayContent(bytes) {
-					Headers = { ContentType = new MediaTypeHeaderValue("application/json") }
-				};
-				_response = await GetRequestResponse(request);
-				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		class when_posting_to_idempotent_guid_id_twice<TLogFormat, TStreamId>
-			: HttpBehaviorSpecificationOfSuccessfulCreateEvent<TLogFormat, TStreamId>  {
-			private Guid _eventId;
-
-			protected override Task Given() {
-				_eventId = Guid.NewGuid();
-				return PostEvent();
-			}
-
-			protected override Task When() {
-				return PostEvent();
-			}
-
-			private async Task PostEvent() {
-				var request = CreateRequest(TestStream + "/incoming/" + _eventId.ToString(), "", "POST",
-					"application/json");
-				request.Headers.Add("ES-EventType", "SomeType");
-				var data = "{a : \"1\"}";
-				var bytes = Encoding.UTF8.GetBytes(data);
-				request.Content = new ByteArrayContent(bytes) {
-					Headers = { ContentType = new MediaTypeHeaderValue("application/json") }
-				};
-				_response = await GetRequestResponse(request);
-				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-			}
-		}
-
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		class when_posting_to_idempotent_guid_id_three_times<TLogFormat, TStreamId>
-			: HttpBehaviorSpecificationOfSuccessfulCreateEvent<TLogFormat, TStreamId>  {
-			private Guid _eventId;
-
-			protected override async Task Given() {
-				_eventId = Guid.NewGuid();
-				await PostEvent();
-				await PostEvent();
-			}
-
-			protected override Task When() {
-				return PostEvent();
-			}
-
-			private async Task PostEvent() {
-				var request = CreateRequest(TestStream + "/incoming/" + _eventId.ToString(), "", "POST",
-					"application/json");
-				request.Headers.Add("ES-EventType", "SomeType");
-				var data = "{a : \"1\"}";
-				var bytes = Encoding.UTF8.GetBytes(data);
-				request.Content = new ByteArrayContent(bytes) {
-					Headers = { ContentType = new MediaTypeHeaderValue("application/json") }
-				};
-				_response = await GetRequestResponse(request);
-				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-			}
-		}
-
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		class when_posting_an_event_once_raw_once_with_array<TLogFormat, TStreamId>
-			: HttpBehaviorSpecificationOfSuccessfulCreateEvent<TLogFormat, TStreamId>  {
-			private Guid _eventId;
-
-			protected override Task Given() {
-				_eventId = Guid.NewGuid();
-				return PostEvent();
-			}
-
-			protected override async Task When() {
-				_response = await MakeArrayEventsPost(
-					TestStream,
-					new[] { new { EventId = _eventId, EventType = "event-type", Data = new { A = "1" } } });
-			}
-
-			private async Task PostEvent() {
-				var request = CreateRequest(TestStream, "", "POST", "application/json");
-				request.Headers.Add("ES-EventId", _eventId.ToString());
-				request.Headers.Add("ES-EventType", "SomeType");
-				var data = "{a : \"1\"}";
-				var bytes = Encoding.UTF8.GetBytes(data);
-				request.Content = new ByteArrayContent(bytes) {
-					Headers = { ContentType = new MediaTypeHeaderValue("application/json") }
-				};
-				_response = await GetRequestResponse(request);
-				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-			}
-		}
-
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		class when_posting_an_event_twice_raw<TLogFormat, TStreamId>
-			: HttpBehaviorSpecificationOfSuccessfulCreateEvent<TLogFormat, TStreamId> {
-			private Guid _eventId;
-
-			protected override Task Given() {
-				_eventId = Guid.NewGuid();
-				return PostEvent();
-			}
-
-			protected override Task When() {
-				return PostEvent();
-			}
-
-			private async Task PostEvent() {
-				var request = CreateRequest(TestStream, "", "POST", "application/json");
-				request.Headers.Add("ES-EventId", _eventId.ToString());
-				request.Headers.Add("ES-EventType", "SomeType");
-				var data = "{a : \"1\"}";
-				var bytes = Encoding.UTF8.GetBytes(data);
-				request.Content = new ByteArrayContent(bytes) {
-					Headers = { ContentType = new MediaTypeHeaderValue("application/json") }
-				};
-				_response = await GetRequestResponse(request);
-				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		class when_posting_an_event_three_times_raw<TLogFormat, TStreamId>
-			: HttpBehaviorSpecificationOfSuccessfulCreateEvent<TLogFormat, TStreamId> {
-			private Guid _eventId;
-
-			protected override async Task Given() {
-				_eventId = Guid.NewGuid();
-				await PostEvent();
-				await PostEvent();
-			}
-
-			protected override Task When() {
-				return PostEvent();
-			}
-
-			private async Task PostEvent() {
-				var request = CreateRequest(TestStream, "", "POST", "application/json");
-				request.Headers.Add("ES-EventId", _eventId.ToString());
-				request.Headers.Add("ES-EventType", "SomeType");
-				var data = "{a : \"1\"}";
-				var bytes = Encoding.UTF8.GetBytes(data);
-				request.Content = new ByteArrayContent(bytes) {
-					Headers = { ContentType = new MediaTypeHeaderValue("application/json") }
-				};
-				_response = await GetRequestResponse(request);
-				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-			}
-		}
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		class when_posting_an_event_twice_array<TLogFormat, TStreamId>
-			: HttpBehaviorSpecificationOfSuccessfulCreateEvent<TLogFormat, TStreamId> {
-			private Guid _eventId;
-
-			protected override async Task Given() {
-				_eventId = Guid.NewGuid();
-				var response1 = await MakeArrayEventsPost(
-					TestStream,
-					new[] { new { EventId = _eventId, EventType = "event-type", Data = new { A = "1" } } });
-				Assert.AreEqual(HttpStatusCode.Created, response1.StatusCode);
-			}
-
-			protected override async Task When() {
-				_response = await MakeArrayEventsPost(
-					TestStream,
-					new[] { new { EventId = _eventId, EventType = "event-type", Data = new { A = "1" } } });
-			}
-		}
-
-
-		[Category("LongRunning")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		class when_posting_an_event_three_times_as_array<TLogFormat, TStreamId>
-			: HttpBehaviorSpecificationOfSuccessfulCreateEvent<TLogFormat, TStreamId> {
-			private Guid _eventId;
-
-			protected override async Task Given() {
-				_eventId = Guid.NewGuid();
-				var response1 = await MakeArrayEventsPost(
-					TestStream,
-					new[] { new { EventId = _eventId, EventType = "event-type", Data = new { A = "1" } } });
-				Assert.AreEqual(HttpStatusCode.Created, response1.StatusCode);
-				var response2 = await MakeArrayEventsPost(
-					TestStream,
-					new[] { new { EventId = _eventId, EventType = "event-type", Data = new { A = "1" } } });
-				Assert.AreEqual(HttpStatusCode.Created, response2.StatusCode);
-			}
-
-			protected override async Task When() {
-				_response = await MakeArrayEventsPost(
-					TestStream,
-					new[] { new { EventId = _eventId, EventType = "event-type", Data = new { A = "1" } } });
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/Streams/metadata.cs b/src/EventStore.Core.Tests/Http/Streams/metadata.cs
deleted file mode 100644
index 6ab01ae56e4..00000000000
--- a/src/EventStore.Core.Tests/Http/Streams/metadata.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-using System;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.Tests.Http.Streams.basic;
-using Newtonsoft.Json.Linq;
-using NUnit.Framework;
-using System.Xml.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Tests.Http.Users.users;
-
-namespace EventStore.Core.Tests.Http.Streams {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_posting_metadata_as_json_to_non_existing_stream<TLogFormat, TStreamId>
-		: with_admin_user<TLogFormat, TStreamId> {
-		private HttpResponseMessage _response;
-
-		protected override Task Given() => Task.CompletedTask;
-
-		protected override async Task When() {
-			var req = CreateRawJsonPostRequest(TestStream + "/metadata", "POST", new { A = "1" },
-				DefaultData.AdminNetworkCredentials);
-			req.Headers.Add("ES-EventId", Guid.NewGuid().ToString());
-			_response = await _client.SendAsync(req);
-		}
-
-		[Test]
-		public void returns_created_status_code() {
-			Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-		}
-
-		[Test]
-		public void returns_a_location_header() {
-			Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
-		}
-
-		[Test]
-		public async Task returns_a_location_header_that_can_be_read_as_json() {
-			var json = await GetJson<JObject>(_response.Headers.GetLocationAsString());
-			HelperExtensions.AssertJson(new { A = "1" }, json);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_posting_metadata_as_json_to_existing_stream<TLogFormat, TStreamId>
-		: HttpBehaviorSpecificationWithSingleEvent<TLogFormat, TStreamId> {
-		protected override async Task Given() {
-			_response = await MakeArrayEventsPost(
-				TestStream,
-				new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = new { A = "1" } } });
-		}
-
-		protected override async Task When() {
-			var req = CreateRawJsonPostRequest(TestStream + "/metadata", "POST", new { A = "1" },
-				DefaultData.AdminNetworkCredentials);
-			req.Headers.Add("ES-EventId", Guid.NewGuid().ToString());
-			_response = await _client.SendAsync(req);
-		}
-
-		[Test]
-		public void returns_created_status_code() {
-			Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
-		}
-
-		[Test]
-		public void returns_a_location_header() {
-			Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
-		}
-
-		[Test]
-		public async Task returns_a_location_header_that_can_be_read_as_json() {
-			var json = await GetJson<JObject>(_response.Headers.GetLocationAsString());
-			HelperExtensions.AssertJson(new { A = "1" }, json);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_getting_metadata_for_an_existing_stream_without_an_accept_header<TLogFormat, TStreamId> :
-			HttpBehaviorSpecificationWithSingleEvent<TLogFormat, TStreamId> {
-		protected override Task When() {
-			return Get(TestStream + "/metadata", null, null, DefaultData.AdminNetworkCredentials, false);
-		}
-
-		[Test]
-		public void returns_ok_status_code() {
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-		}
-
-		[Test]
-		public void returns_empty_body() {
-			Assert.AreEqual(Empty.Xml, _lastResponseBody);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_getting_metadata_for_an_existing_stream_and_no_metadata_exists<TLogFormat, TStreamId>
-		: HttpBehaviorSpecificationWithSingleEvent<TLogFormat, TStreamId> {
-		protected override async Task Given() {
-			_response = await MakeArrayEventsPost(
-				TestStream,
-				new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = new { A = "1" } } });
-		}
-
-		protected override Task When() {
-			return Get(TestStream + "/metadata", String.Empty, Transport.Http.ContentType.Json,
-				DefaultData.AdminNetworkCredentials);
-		}
-
-		[Test]
-		public void returns_ok_status_code() {
-			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
-		}
-
-		[Test]
-		public void returns_empty_etag() {
-			Assert.Null(_lastResponse.Headers.ETag);
-		}
-
-		[Test]
-		public void returns_empty_body() {
-			Assert.AreEqual(Empty.Json, _lastResponseBody);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/TestController.cs b/src/EventStore.Core.Tests/Http/TestController.cs
deleted file mode 100644
index f5e93ea6311..00000000000
--- a/src/EventStore.Core.Tests/Http/TestController.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using System.Security.Claims;
-using EventStore.Core.Bus;
-using EventStore.Core.Services.Transport.Http;
-using EventStore.Core.Services.Transport.Http.Controllers;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Codecs;
-using EventStore.Transport.Http.EntityManagement;
-using EventStore.Common.Utils;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Tests.Http {
-	public class TestController : CommunicationController {
-		public TestController(IPublisher publisher)
-			: base(publisher) {
-		}
-
-		protected override void SubscribeCore(IHttpService service) {
-			Register(service, "/test1", Test1Handler);
-			Register(service, "/test-anonymous", TestAnonymousHandler);
-			Register(service, "/test-encoding/{a}?b={b}", TestEncodingHandler);
-			Register(service, "/test-encoding-reserved-%20?b={b}",
-				(manager, match) => TestEncodingHandler(manager, match, "%20"));
-			Register(service, "/test-encoding-reserved-%24?b={b}",
-				(manager, match) => TestEncodingHandler(manager, match, "%24"));
-			Register(service, "/test-encoding-reserved-%25?b={b}",
-				(manager, match) => TestEncodingHandler(manager, match, "%25"));
-			Register(service, "/test-encoding-reserved- ?b={b}",
-				(manager, match) => TestEncodingHandler(manager, match, " "));
-			Register(service, "/test-encoding-reserved-$?b={b}",
-				(manager, match) => TestEncodingHandler(manager, match, "$"));
-			Register(service, "/test-encoding-reserved-%?b={b}",
-				(manager, match) => TestEncodingHandler(manager, match, "%"));
-			Register(service, "/test-timeout?sleepfor={sleepfor}",
-				(manager, match) => TestTimeoutHandler(manager, match));
-		}
-
-		private void Register(
-			IHttpService service, string uriTemplate, Action<HttpEntityManager, UriTemplateMatch> handler,
-			string httpMethod = HttpMethod.Get) {
-			Register(service, uriTemplate, httpMethod, handler, Codec.NoCodecs, new ICodec[] {Codec.ManualEncoding}, new Operation(Operations.Node.StaticContent));
-		}
-
-		private void Test1Handler(HttpEntityManager http, UriTemplateMatch match) {
-			if (http.User != null && !http.User.HasClaim(ClaimTypes.Anonymous, ""))
-				http.Reply("OK", 200, "OK", "text/plain");
-			else
-				http.Reply("Please authenticate yourself", 401, "Unauthorized", "text/plain");
-		}
-
-		private void TestAnonymousHandler(HttpEntityManager http, UriTemplateMatch match) {
-			if (!http.User.HasClaim(ClaimTypes.Anonymous, ""))
-				http.Reply("ERROR", 500, "ERROR", "text/plain");
-			else
-				http.Reply("OK", 200, "OK", "text/plain");
-		}
-
-		private void TestEncodingHandler(HttpEntityManager http, UriTemplateMatch match) {
-			var a = match.BoundVariables["a"];
-			var b = match.BoundVariables["b"];
-
-			http.Reply(new {a = a, b = b, rawSegment = http.RequestedUrl.Segments[2]}.ToJson(), 200, "OK",
-				"application/json");
-		}
-
-		private void TestEncodingHandler(HttpEntityManager http, UriTemplateMatch match, string a) {
-			var b = match.BoundVariables["b"];
-
-			http.Reply(
-				new {
-					a = a,
-					b = b,
-					rawSegment = http.RequestedUrl.Segments[1],
-					requestUri = match.RequestUri,
-					rawUrl = http.HttpEntity.Request.RawUrl
-				}.ToJson(), 200, "OK", "application/json");
-		}
-
-		private void TestTimeoutHandler(HttpEntityManager http, UriTemplateMatch match) {
-			var sleepFor = int.Parse(match.BoundVariables["sleepfor"]);
-			System.Threading.Thread.Sleep(sleepFor);
-			http.Reply("OK", 200, "OK", "text/plain");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Http/Users/StreamHelpers.cs b/src/EventStore.Core.Tests/Http/Users/StreamHelpers.cs
deleted file mode 100644
index bdb497974c5..00000000000
--- a/src/EventStore.Core.Tests/Http/Users/StreamHelpers.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.IO;
-using EventStore.Common.Utils;
-using EventStore.Core.Util;
-
-namespace EventStore.Core.Tests.Http.Users {
-	public static class StreamHelpers {
-		public static void WriteJson<T>(this Stream stream, T data) {
-			var bytes = data.ToJsonBytes();
-			stream.Write(bytes, 0, bytes.Length);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/IIndexReaderExtensions.cs b/src/EventStore.Core.Tests/IIndexReaderExtensions.cs
deleted file mode 100644
index e50a38c3082..00000000000
--- a/src/EventStore.Core.Tests/IIndexReaderExtensions.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using EventStore.Core.Services.Storage.ReaderIndex;
-
-namespace EventStore.Core.Tests {
-	public static class IIndexReaderExtensions {
-		public static IndexReadEventResult ReadEvent(this IIndexReader<string> index, string streamName, long eventNumber) =>
-			index.ReadEvent(streamName, streamName, eventNumber);
-
-		public static IndexReadStreamResult ReadStreamEventsBackward(this IIndexReader<string> index, string streamName, long fromEventNumber, int maxCount) =>
-			index.ReadStreamEventsBackward(streamName, streamName, fromEventNumber, maxCount);
-
-		public static IndexReadStreamResult ReadStreamEventsForward(this IIndexReader<string> index, string streamName, long fromEventNumber, int maxCount) =>
-			index.ReadStreamEventsForward(streamName, streamName, fromEventNumber, maxCount);
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/rolling_manual_only_merges.cs b/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/rolling_manual_only_merges.cs
deleted file mode 100644
index 684300abaff..00000000000
--- a/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/rolling_manual_only_merges.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Linq;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.AutoMergeLevelTests {
-	[TestFixture]
-	public class rolling_manual_only_merges : when_max_auto_merge_level_is_set {
-		public rolling_manual_only_merges() : base(0) {
-		}
-
-		[Test]
-		public void alternating_table_dumps_and_manual_merges_should_merge_correctly() {
-			AddTables(1);
-			Assert.AreEqual(1, _result.MergedMap.InOrder().Count());
-			for (int i = 0; i < 100; i++) {
-				AddTables(1);
-				Assert.AreEqual(2, _result.MergedMap.InOrder().Count());
-
-				_result = _result.MergedMap.TryManualMerge(_fileNameProvider,
-					_ptableVersion, 16, false);
-				_result.ToDelete.ForEach(x => x.MarkForDestruction());
-				Assert.AreEqual(1, _result.MergedMap.InOrder().Count());
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_auto_merge_level_is_zero.cs b/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_auto_merge_level_is_zero.cs
deleted file mode 100644
index 565a24a235c..00000000000
--- a/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_auto_merge_level_is_zero.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Linq;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.AutoMergeLevelTests {
-	[TestFixture]
-	public class when_auto_merge_level_is_zero : when_max_auto_merge_level_is_set {
-		public when_auto_merge_level_is_zero() : base(0) {
-		}
-
-		[Test]
-		public void manual_merge_should_merge_all_tables() {
-			AddTables(11);
-			_result = _result.MergedMap.TryManualMerge(
-				_fileNameProvider, _ptableVersion);
-			Assert.AreEqual(1, _result.MergedMap.InOrder().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_max_auto_merge_level_is_reduced.cs b/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_max_auto_merge_level_is_reduced.cs
deleted file mode 100644
index 800f3652899..00000000000
--- a/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_max_auto_merge_level_is_reduced.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Linq;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.AutoMergeLevelTests {
-	public class when_max_auto_merge_level_is_reduced : when_max_auto_merge_level_is_set {
-		public when_max_auto_merge_level_is_reduced() : base(5) {
-		}
-
-		[Test]
-		public void should_merge_levels_above_max_level() {
-			AddTables(201); //gives 1 level 0, 1 level 3 and 6 level 5s
-			Assert.AreEqual(8, _result.MergedMap.InOrder().Count());
-			var filename = GetFilePathFor("changemaxlevel");
-			_result.MergedMap.SaveToFile(filename);
-			_result.MergedMap.Dispose(TimeSpan.FromMilliseconds(100));
-			_map.Dispose(TimeSpan.FromMilliseconds(100));
-			_map = IndexMapTestFactory.FromFile(filename, maxAutoMergeLevel: 3);
-			_result = _map.TryManualMerge(
-				_fileNameProvider,
-				_ptableVersion,
-				skipIndexVerify: _skipIndexVerify);
-			Assert.AreEqual(2, _result.MergedMap.InOrder().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_max_auto_merge_level_is_set.cs b/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_max_auto_merge_level_is_set.cs
deleted file mode 100644
index d5beb0c5d97..00000000000
--- a/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_max_auto_merge_level_is_set.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using EventStore.Core.Tests.Services.Storage.Transactions;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.AutoMergeLevelTests {
-	[TestFixture]
-	public abstract class when_max_auto_merge_level_is_set : SpecificationWithDirectoryPerTestFixture {
-		protected readonly int _maxAutoMergeLevel;
-		protected string _filename;
-		protected IndexMap _map;
-		protected byte _ptableVersion = 4;
-		protected MergeResult _result;
-		protected bool _skipIndexVerify = true;
-		protected GuidFilenameProvider _fileNameProvider;
-
-		public when_max_auto_merge_level_is_set(int maxAutoMergeLevel = 2) {
-			_maxAutoMergeLevel = maxAutoMergeLevel;
-		}
-
-		[OneTimeSetUp]
-		public virtual void Setup() {
-			_filename = GetTempFilePath();
-			_fileNameProvider = new GuidFilenameProvider(PathName);
-			_map = IndexMapTestFactory.FromFile(_filename, maxTablesPerLevel: 2, maxAutoMergeLevel: _maxAutoMergeLevel);
-		}
-
-		protected void AddTables(int count) {
-			var memtable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			memtable.Add(0, 1, 0);
-			var first = _map;
-			if (_result != null)
-				first = _result.MergedMap;
-			var pTable = PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify);
-			_result = first.AddAndMergePTable(pTable,
-				10, 20, _fileNameProvider, _ptableVersion,0, skipIndexVerify: _skipIndexVerify);
-			for (int i = 3; i <= count * 2; i += 2) {
-				pTable = PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify);
-				_result = _result.MergedMap.AddAndMergePTable(
-					pTable,
-					prepareCheckpoint: i * 10,
-					commitCheckpoint: (i + 1) * 10,
-					_fileNameProvider, _ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
-				_result.ToDelete.ForEach(x => x.MarkForDestruction());
-			}
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-			_result.MergedMap.InOrder().ToList().ForEach(x => x.MarkForDestruction());
-			_result.MergedMap.Dispose(TimeSpan.FromMilliseconds(100));
-			_map.Dispose(TimeSpan.FromMilliseconds(100));
-			File.Delete(_filename);
-
-			return base.TestFixtureTearDown();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_multiple_tables_higher_than_manual_merge_level.cs b/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_multiple_tables_higher_than_manual_merge_level.cs
deleted file mode 100644
index 33c68b73d2d..00000000000
--- a/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_multiple_tables_higher_than_manual_merge_level.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Linq;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.AutoMergeLevelTests {
-	[TestFixture]
-	public class when_multiple_tables_higher_than_manual_merge_level : when_max_auto_merge_level_is_set {
-		public override void Setup() {
-			base.Setup();
-			AddTables(8);
-			_map.Dispose(TimeSpan.FromMilliseconds(100));
-			var filename = GetFilePathFor("indexmap");
-			_result.MergedMap.SaveToFile(filename);
-			_result.MergedMap.Dispose(TimeSpan.FromMilliseconds(100));
-			_map = IndexMapTestFactory.FromFile(filename, maxAutoMergeLevel: 1);
-		}
-
-		[Test]
-		public void tables_should_be_merged() {
-			_result = _map.TryManualMerge(
-				_fileNameProvider,
-				_ptableVersion,
-				skipIndexVerify: _skipIndexVerify);
-			Assert.AreEqual(1, _result.MergedMap.InOrder().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_no_tables_are_eligible_for_manual_merge.cs b/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_no_tables_are_eligible_for_manual_merge.cs
deleted file mode 100644
index 3d3333d9fa5..00000000000
--- a/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_no_tables_are_eligible_for_manual_merge.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Linq;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.AutoMergeLevelTests {
-	public class when_no_tables_are_eligible_for_manual_merge : when_max_auto_merge_level_is_set {
-		public override void Setup() {
-			base.Setup();
-			AddTables(8);
-			Assert.AreEqual(2, _result.MergedMap.InOrder().Count());
-
-			_result = _result.MergedMap.TryManualMerge(
-				_fileNameProvider,
-				_ptableVersion,
-				skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-		}
-
-		[Test]
-		public void should_not_manually_merge_any_table() {
-			Assert.AreEqual(1, _result.MergedMap.InOrder().Count());
-			AddTables(3); //adding 3 tables will cause an auto merge, but not enough to give us tables for manual merge
-			Assert.AreEqual(3, _result.MergedMap.InOrder().Count());
-
-			_result = _result.MergedMap.TryManualMerge(
-				_fileNameProvider,
-				_ptableVersion,
-				skipIndexVerify: _skipIndexVerify);
-
-			Assert.False(_result.HasMergedAny);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_no_tables_have_yet_reached_maximum_automerge_level.cs b/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_no_tables_have_yet_reached_maximum_automerge_level.cs
deleted file mode 100644
index 5ec034c909a..00000000000
--- a/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_no_tables_have_yet_reached_maximum_automerge_level.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Linq;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.AutoMergeLevelTests {
-	public class when_no_tables_have_yet_reached_maximum_automerge_level : when_max_auto_merge_level_is_set {
-		[Test]
-		public void should_not_manually_merge_any_table() {
-			AddTables(3);
-			Assert.AreEqual(2, _result.MergedMap.InOrder().Count());
-			var result = _result.MergedMap.TryManualMerge(
-				_fileNameProvider,
-				_ptableVersion,
-				skipIndexVerify: _skipIndexVerify);
-			Assert.False(result.HasMergedAny);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_only_one_table_file_higher_than_manual_merge_level.cs b/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_only_one_table_file_higher_than_manual_merge_level.cs
deleted file mode 100644
index 9535208cf58..00000000000
--- a/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_only_one_table_file_higher_than_manual_merge_level.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using NUnit.Framework;
-using System;
-
-namespace EventStore.Core.Tests.Index.AutoMergeLevelTests {
-	[TestFixture]
-	public class when_only_one_table_file_higher_than_manual_merge_level : when_max_auto_merge_level_is_set {
-		public override void Setup() {
-			base.Setup();
-			AddTables(5);
-			_map.Dispose(TimeSpan.FromMilliseconds(100));
-			var filename = GetFilePathFor("indexmap");
-			_result.MergedMap.SaveToFile(filename);
-			_result.MergedMap.Dispose(TimeSpan.FromMilliseconds(5));
-			_map = IndexMapTestFactory.FromFile(filename, maxAutoMergeLevel: 1);
-		}
-
-		[Test]
-		public void no_table_should_manually_merged() {
-			var result = _map.TryMergeOneLevel(
-				_fileNameProvider,
-				_ptableVersion,
-				skipIndexVerify: _skipIndexVerify
-				);
-			Assert.False(result.HasMergedAny);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_tables_available_for_manual_merge.cs b/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_tables_available_for_manual_merge.cs
deleted file mode 100644
index 90dbb1c9d1a..00000000000
--- a/src/EventStore.Core.Tests/Index/AutoMergeLevelTests/when_tables_available_for_manual_merge.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Linq;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.AutoMergeLevelTests {
-	public class when_tables_available_for_manual_merge : when_max_auto_merge_level_is_set {
-		[Test]
-		public void should_merge_pending_tables_at_max_auto_merge_level() {
-			AddTables(100);
-			Assert.AreEqual(25, _result.MergedMap.InOrder().Count());
-			_result = _result.MergedMap.TryManualMerge(
-				_fileNameProvider,
-				_ptableVersion,
-				skipIndexVerify: _skipIndexVerify);
-			Assert.AreEqual(1, _result.MergedMap.InOrder().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/FakeFilenameProvider.cs b/src/EventStore.Core.Tests/Index/FakeFilenameProvider.cs
deleted file mode 100644
index a21b9fed4cc..00000000000
--- a/src/EventStore.Core.Tests/Index/FakeFilenameProvider.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Index;
-
-namespace EventStore.Core.Tests.Index {
-	public class FakeFilenameProvider : IIndexFilenameProvider {
-		private List<string> _filenames = new List<string>();
-		private int _current;
-
-
-		public FakeFilenameProvider(params string[] fakenames) {
-			_filenames.AddRange(fakenames);
-		}
-
-		public string GetFilenameNewTable() {
-			var ret = _filenames[_current];
-			_current++;
-			return ret;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/FakeIndexHasher.cs b/src/EventStore.Core.Tests/Index/FakeIndexHasher.cs
deleted file mode 100644
index e57a26292ac..00000000000
--- a/src/EventStore.Core.Tests/Index/FakeIndexHasher.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using EventStore.Core.Index.Hashes;
-using System;
-
-namespace EventStore.Core.Tests.Index {
-	public class FakeIndexHasher : IHasher<string> {
-		public uint Hash(byte[] data) {
-			return (uint)data.Length;
-		}
-
-		public uint Hash(string s) {
-			return uint.Parse(s);
-		}
-
-		public uint Hash(byte[] data, int offset, uint len, uint seed) {
-			return (uint)data.Length;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/FakeIndexReader.cs b/src/EventStore.Core.Tests/Index/FakeIndexReader.cs
deleted file mode 100644
index fd6c1307d44..00000000000
--- a/src/EventStore.Core.Tests/Index/FakeIndexReader.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.Tests.Fakes {
-	public class FakeIndexReader : ITransactionFileReader {
-		private readonly Func<long, bool> _existsAt;
-
-		public FakeIndexReader(Func<long, bool> existsAt = null) {
-			_existsAt = existsAt ?? (l => true);
-		}
-
-		public void Reposition(long position) {
-			throw new NotImplementedException();
-		}
-
-		public SeqReadResult TryReadNext() {
-			throw new NotImplementedException();
-		}
-
-		public SeqReadResult TryReadPrev() {
-			throw new NotImplementedException();
-		}
-
-		public RecordReadResult TryReadAt(long position, bool couldBeScavenged) {
-			var record = (LogRecord)new PrepareLogRecord(position, Guid.NewGuid(), Guid.NewGuid(), 0, 0,
-				position.ToString(), null, -1, DateTime.UtcNow, PrepareFlags.None, "type", null,
-				new byte[0], null);
-			return new RecordReadResult(true, position + 1, record, 1);
-		}
-
-		public bool ExistsAt(long position) {
-			return _existsAt(position);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/Hashers/ConstantHasher.cs b/src/EventStore.Core.Tests/Index/Hashers/ConstantHasher.cs
deleted file mode 100644
index 724e4c88f7f..00000000000
--- a/src/EventStore.Core.Tests/Index/Hashers/ConstantHasher.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using EventStore.Core.Index.Hashes;
-
-namespace EventStore.Core.Tests.Index.Hashers {
-	public class ConstantHasher : IHasher<string> {
-		private readonly uint _const;
-		public ConstantHasher(uint @const) {
-			_const = @const;
-		}
-
-		public uint Hash(string s) {
-			return _const;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/Hashers/FirstCharacterHasher.cs b/src/EventStore.Core.Tests/Index/Hashers/FirstCharacterHasher.cs
deleted file mode 100644
index 48e7711287d..00000000000
--- a/src/EventStore.Core.Tests/Index/Hashers/FirstCharacterHasher.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using EventStore.Core.Index.Hashes;
-
-namespace EventStore.Core.Tests.Index.Hashers {
-	public class FirstCharacterHasher : ILongHasher<string> {
-		public ulong Hash(string x) =>
-			(ulong)(x.Length == 0 ? 0 : x[0].GetHashCode());
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/Hashers/HumanReadableHasher.cs b/src/EventStore.Core.Tests/Index/Hashers/HumanReadableHasher.cs
deleted file mode 100644
index b814f6d59c0..00000000000
--- a/src/EventStore.Core.Tests/Index/Hashers/HumanReadableHasher.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.Services;
-
-namespace EventStore.Core.Tests.Index.Hashers {
-	// Generates hashes that are obvious to humans based on the stream name.
-	// The first character of the stream name is the basis of the hash for the corresponding metastream
-	// The second character of the stream name is the basis of the hash for the original stream
-	// e.g.
-	//   "$$ma-1 -> 'm'
-	//   "ma-1" -> 'a' (97)
-	public class HumanReadableHasher : ILongHasher<string> {
-		private readonly HumanReadableHasher32 _hash32;
-
-		public HumanReadableHasher() {
-			_hash32 = new HumanReadableHasher32();
-		}
-
-		public ulong Hash(string x) => _hash32.Hash(x);
-	}
-
-	public class HumanReadableHasher32 : IHasher<string> {
-		public uint Hash(string x) {
-			if (x == "")
-				return 0;
-
-			var c = SystemStreams.IsMetastream(x)
-				? x[2]
-				: x[1];
-
-			return c;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/Hashers/HumanReadableHasherTests.cs b/src/EventStore.Core.Tests/Index/Hashers/HumanReadableHasherTests.cs
deleted file mode 100644
index 54314514dbb..00000000000
--- a/src/EventStore.Core.Tests/Index/Hashers/HumanReadableHasherTests.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.Hashers {
-	public class HumanReadableHasherTests {
-		[Test]
-		public void hashes_original_stream() {
-			var sut = new HumanReadableHasher();
-			Assert.AreEqual('a', sut.Hash("ma-1"));
-		}
-
-		[Test]
-		public void hashes_meta_stream() {
-			var sut = new HumanReadableHasher();
-			Assert.AreEqual('m', sut.Hash("$$ma-1"));
-		}
-
-		[Test]
-		public void hashes_empty_string() {
-			var sut = new HumanReadableHasher();
-			Assert.AreEqual(0UL, sut.Hash(""));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexEntryTests.cs b/src/EventStore.Core.Tests/Index/IndexEntryTests.cs
deleted file mode 100644
index 516ae45da3c..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexEntryTests.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index {
-	[TestFixture]
-	public class IndexEntryTests {
-		[Test]
-		public void key_is_made_of_stream_and_version() {
-			var entry = new IndexEntryV1 {Stream = 0x01, Version = 0x12};
-			Assert.AreEqual(0x0000000100000012, entry.Key);
-		}
-
-		[Test]
-		public void bytes_is_made_of_key_and_position() {
-			unsafe {
-				var entry = new IndexEntryV1 {Stream = 0x0101, Version = 0x1234, Position = 0xFFFF};
-				Assert.AreEqual(0x34, entry.Bytes[0]);
-				Assert.AreEqual(0x12, entry.Bytes[1]);
-				Assert.AreEqual(0x00, entry.Bytes[2]);
-				Assert.AreEqual(0x00, entry.Bytes[3]);
-				Assert.AreEqual(0x01, entry.Bytes[4]);
-				Assert.AreEqual(0x01, entry.Bytes[5]);
-				Assert.AreEqual(0x00, entry.Bytes[6]);
-				Assert.AreEqual(0x00, entry.Bytes[7]);
-				Assert.AreEqual(0xFF, entry.Bytes[8]);
-				Assert.AreEqual(0xFF, entry.Bytes[9]);
-				Assert.AreEqual(0x00, entry.Bytes[10]);
-				Assert.AreEqual(0x00, entry.Bytes[11]);
-				Assert.AreEqual(0x00, entry.Bytes[12]);
-				Assert.AreEqual(0x00, entry.Bytes[13]);
-				Assert.AreEqual(0x00, entry.Bytes[14]);
-				Assert.AreEqual(0x00, entry.Bytes[15]);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexMapExtensions.cs b/src/EventStore.Core.Tests/Index/IndexMapExtensions.cs
deleted file mode 100644
index 7b930782075..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexMapExtensions.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Index;
-
-namespace EventStore.Core.Tests.Index {
-	public static class IndexMapExtensions {
-		public static MergeResult AddAndMergePTable(
-			this IndexMap indexMap,
-			PTable tableToAdd,
-			int prepareCheckpoint,
-			int commitCheckpoint,
-			IIndexFilenameProvider filenameProvider,
-			byte version,
-			int indexCacheDepth = 16,
-			bool skipIndexVerify = false,
-			bool useBloomFilter = true,
-			int lruCacheSize = 1_000_000) {
-
-			var addResult = indexMap.AddPTable(tableToAdd, prepareCheckpoint, commitCheckpoint);
-			if (addResult.CanMergeAny) {
-				var toDelete = new List<PTable>();
-				MergeResult mergeResult;
-				IndexMap curMap = addResult.NewMap;
-				do {
-					mergeResult = curMap.TryMergeOneLevel(
-						filenameProvider,
-						version,
-						indexCacheDepth,
-						skipIndexVerify,
-						useBloomFilter,
-						lruCacheSize
-					);
-
-					curMap = mergeResult.MergedMap;
-					toDelete.AddRange(mergeResult.ToDelete);
-				} while (mergeResult.CanMergeAny);
-
-				return new MergeResult(curMap, toDelete, true, false);
-			}
-			return new MergeResult(addResult.NewMap, new List<PTable>(), false, false);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexMapTestFactory.cs b/src/EventStore.Core.Tests/Index/IndexMapTestFactory.cs
deleted file mode 100644
index 2af84a13f9c..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexMapTestFactory.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-
-namespace EventStore.Core.Tests.Index {
-	public static class IndexMapTestFactory {
-		public static IndexMap FromFile(string filename, int maxTablesPerLevel = 4,
-			bool loadPTables = true,
-			int cacheDepth = 16,
-			bool skipIndexVerify = false,
-			bool useBloomFilter = true,
-			int lruCacheSize = 1_000_000,
-			int threads = 1,
-			int maxAutoMergeLevel = int.MaxValue,
-			int pTableMaxReaderCount = Constants.PTableMaxReaderCountDefault) {
-			return IndexMap.FromFile(filename, maxTablesPerLevel, loadPTables, cacheDepth, skipIndexVerify, useBloomFilter, lruCacheSize, threads,
-				maxAutoMergeLevel, pTableMaxReaderCount);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/PTableReadScenario.cs b/src/EventStore.Core.Tests/Index/IndexV1/PTableReadScenario.cs
deleted file mode 100644
index ffc7430c2ef..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/PTableReadScenario.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	public abstract class PTableReadScenario : SpecificationWithFile {
-		private readonly int _midpointCacheDepth;
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-
-		protected PTable PTable;
-		private bool _skipIndexVerify;
-
-		protected PTableReadScenario(byte ptableVersion, bool skipIndexVerify, int midpointCacheDepth) {
-			_ptableVersion = ptableVersion;
-			_skipIndexVerify = skipIndexVerify;
-			_midpointCacheDepth = midpointCacheDepth;
-		}
-
-		[SetUp]
-		public override void SetUp() {
-			base.SetUp();
-
-			var table = new HashListMemTable(_ptableVersion, maxSize: 50);
-
-			AddItemsForScenario(table);
-
-			PTable = PTable.FromMemtable(table, Filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, cacheDepth: _midpointCacheDepth,
-				skipIndexVerify: _skipIndexVerify);
-		}
-
-		[TearDown]
-		public override void TearDown() {
-			PTable.Dispose();
-
-			base.TearDown();
-		}
-
-		protected abstract void AddItemsForScenario(IMemTable memTable);
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/adding_four_items_to_empty_index_map_with_four_tables_per_level_causes_merge.cs b/src/EventStore.Core.Tests/Index/IndexV1/adding_four_items_to_empty_index_map_with_four_tables_per_level_causes_merge.cs
deleted file mode 100644
index 29145ac8f29..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/adding_four_items_to_empty_index_map_with_four_tables_per_level_causes_merge.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class
-		adding_four_items_to_empty_index_map_with_four_tables_per_level_causes_merge :
-			SpecificationWithDirectoryPerTestFixture {
-		private string _filename;
-		private IndexMap _map;
-		private string _mergeFile;
-		private MergeResult _result;
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-		private bool _skipIndexVerify;
-		private int _maxAutoMergeIndexLevel = 4;
-
-		public adding_four_items_to_empty_index_map_with_four_tables_per_level_causes_merge(byte version,
-			bool skipIndexVerify) {
-			_ptableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_mergeFile = GetTempFilePath();
-			_filename = GetTempFilePath();
-
-			_map = IndexMapTestFactory.FromFile(_filename, maxTablesPerLevel: 4, maxAutoMergeLevel:_maxAutoMergeIndexLevel);
-			var memtable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			memtable.Add(0, 1, 0);
-
-			_result = _map.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 1, 2,
-				new GuidFilenameProvider(PathName),
-				_ptableVersion,
-				0,
-				skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-
-			_result = _result.MergedMap.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 3, 4,
-				new GuidFilenameProvider(PathName),
-				_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-
-			_result = _result.MergedMap.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 4, 5,
-				new GuidFilenameProvider(PathName),
-				_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-
-			_result = _result.MergedMap.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 1,
-				new FakeFilenameProvider(_mergeFile),
-				_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_result.MergedMap.InOrder().ToList().ForEach(x => x.MarkForDestruction());
-			File.Delete(_filename);
-			File.Delete(_mergeFile);
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void the_prepare_checkpoint_is_taken_from_the_latest_added_table() {
-			Assert.AreEqual(0, _result.MergedMap.PrepareCheckpoint);
-		}
-
-		[Test]
-		public void the_commit_checkpoint_is_taken_from_the_latest_added_table() {
-			Assert.AreEqual(1, _result.MergedMap.CommitCheckpoint);
-		}
-
-		[Test]
-		public void there_are_four_items_to_delete() {
-			Assert.AreEqual(4, _result.ToDelete.Count);
-		}
-
-		[Test]
-		public void the_merged_map_has_a_single_file() {
-			Assert.AreEqual(1, _result.MergedMap.GetAllFilenames().Count());
-			Assert.AreEqual(_mergeFile, _result.MergedMap.GetAllFilenames().ToList()[0]);
-		}
-
-		[Test]
-		public void the_original_map_did_not_change() {
-			Assert.AreEqual(0, _map.InOrder().Count());
-			Assert.AreEqual(0, _map.GetAllFilenames().Count());
-		}
-
-		[Test]
-		public void a_merged_file_was_created() {
-			Assert.IsTrue(File.Exists(_mergeFile));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/adding_four_items_to_empty_index_map_with_two_tables_per_level_causes_double_merge.cs b/src/EventStore.Core.Tests/Index/IndexV1/adding_four_items_to_empty_index_map_with_two_tables_per_level_causes_double_merge.cs
deleted file mode 100644
index 8bb59bdc08b..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/adding_four_items_to_empty_index_map_with_two_tables_per_level_causes_double_merge.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using System.IO;
-using System.Linq;
-using EventStore.Core.Index;
-using NUnit.Framework;
-using System;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class
-		adding_four_items_to_empty_index_map_with_two_tables_per_level_causes_double_merge :
-			SpecificationWithDirectoryPerTestFixture {
-		private string _filename;
-		private IndexMap _map;
-		private string _mergeFile;
-		private MergeResult _result;
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-		private bool _skipIndexVerify;
-		private int _maxAutoMergeIndexLevel = 4;
-
-		public adding_four_items_to_empty_index_map_with_two_tables_per_level_causes_double_merge(byte version,
-			bool skipIndexVerify) {
-			_ptableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_mergeFile = GetTempFilePath();
-			_filename = GetTempFilePath();
-
-			_map = IndexMapTestFactory.FromFile(_filename, maxTablesPerLevel: 2, maxAutoMergeLevel: _maxAutoMergeIndexLevel);
-			var memtable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			memtable.Add(0, 1, 0);
-
-			_result = _map.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify),
-				10, 20,
-				new GuidFilenameProvider(PathName), _ptableVersion, 0,
-				skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-			_result = _result.MergedMap.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify),
-				20, 30,
-				new GuidFilenameProvider(PathName), _ptableVersion, 0,
-				skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-			_result = _result.MergedMap.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify),
-				30, 40,
-				new GuidFilenameProvider(PathName), _ptableVersion, 0,
-				skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-			_result = _result.MergedMap.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify),
-				50, 60,
-				new FakeFilenameProvider(_mergeFile + ".firstmerge", _mergeFile), _ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_result.MergedMap.InOrder().ToList().ForEach(x => x.MarkForDestruction());
-			File.Delete(_filename);
-			File.Delete(_mergeFile);
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void the_prepare_checkpoint_is_taken_from_the_latest_added_table() {
-			Assert.AreEqual(50, _result.MergedMap.PrepareCheckpoint);
-		}
-
-		[Test]
-		public void the_commit_checkpoint_is_taken_from_the_latest_added_table() {
-			Assert.AreEqual(60, _result.MergedMap.CommitCheckpoint);
-		}
-
-		[Test]
-		public void there_are_four_items_to_delete() {
-			Assert.AreEqual(4, _result.ToDelete.Count);
-		}
-
-		[Test]
-		public void the_merged_map_has_a_single_file() {
-			Assert.AreEqual(1, _result.MergedMap.GetAllFilenames().Count());
-			Assert.AreEqual(_mergeFile, _result.MergedMap.GetAllFilenames().ToList()[0]);
-		}
-
-		[Test]
-		public void the_original_map_did_not_change() {
-			Assert.AreEqual(0, _map.InOrder().Count());
-			Assert.AreEqual(0, _map.GetAllFilenames().Count());
-		}
-
-		[Test]
-		public void a_merged_file_was_created() {
-			Assert.IsTrue(File.Exists(_mergeFile));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/adding_item_to_empty_index_map.cs b/src/EventStore.Core.Tests/Index/IndexV1/adding_item_to_empty_index_map.cs
deleted file mode 100644
index 3984b6d596d..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/adding_item_to_empty_index_map.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class adding_item_to_empty_index_map : SpecificationWithDirectoryPerTestFixture {
-		private string _filename;
-		private IndexMap _map;
-		private string _tablename;
-		private string _mergeFile;
-		private MergeResult _result;
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-		private bool _skipIndexVerify;
-		private int _maxAutoMergeIndexLevel = 4;
-
-		public adding_item_to_empty_index_map(byte version, bool skipIndexVerify) {
-			_ptableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_filename = GetTempFilePath();
-			_tablename = GetTempFilePath();
-			_mergeFile = GetFilePathFor("mergefile");
-
-			_map = IndexMapTestFactory.FromFile(_filename, maxAutoMergeLevel: _maxAutoMergeIndexLevel);
-			var memtable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			memtable.Add(0, 1, 0);
-			var table = PTable.FromMemtable(memtable, _tablename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify);
-			_result = _map.AddAndMergePTable(table, 7, 11,
-				new FakeFilenameProvider(_mergeFile), _ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
-			table.MarkForDestruction();
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			File.Delete(_filename);
-			File.Delete(_mergeFile);
-			File.Delete(_tablename);
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void the_prepare_checkpoint_is_taken_from_the_latest_added_table() {
-			Assert.AreEqual(7, _result.MergedMap.PrepareCheckpoint);
-		}
-
-		[Test]
-		public void the_commit_checkpoint_is_taken_from_the_latest_added_table() {
-			Assert.AreEqual(11, _result.MergedMap.CommitCheckpoint);
-		}
-
-		[Test]
-		public void there_are_no_items_to_delete() {
-			Assert.AreEqual(0, _result.ToDelete.Count);
-		}
-
-		[Test]
-		public void the_merged_map_has_a_single_file() {
-			Assert.AreEqual(1, _result.MergedMap.GetAllFilenames().Count());
-			Assert.AreEqual(_tablename, _result.MergedMap.GetAllFilenames().ToList()[0]);
-		}
-
-		[Test]
-		public void the_original_map_did_not_change() {
-			Assert.AreEqual(0, _map.InOrder().Count());
-			Assert.AreEqual(0, _map.GetAllFilenames().Count());
-		}
-
-		[Test]
-		public void a_merged_file_was_not_created() {
-			Assert.IsFalse(File.Exists(_mergeFile));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/adding_sixteen_items_to_empty_index_map_with_four_tables_per_level_causes_double_merge.cs b/src/EventStore.Core.Tests/Index/IndexV1/adding_sixteen_items_to_empty_index_map_with_four_tables_per_level_causes_double_merge.cs
deleted file mode 100644
index b593b679afa..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/adding_sixteen_items_to_empty_index_map_with_four_tables_per_level_causes_double_merge.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class
-		adding_sixteen_items_to_empty_index_map_with_four_tables_per_level_causes_double_merge :
-			SpecificationWithDirectoryPerTestFixture {
-		private string _filename;
-		private IndexMap _map;
-		private string _finalmergefile;
-		private string _finalmergefile2;
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-		private int _maxAutoMergeIndexLevel = 4;
-
-		private MergeResult _result;
-		private bool _skipIndexVerify;
-
-		public adding_sixteen_items_to_empty_index_map_with_four_tables_per_level_causes_double_merge(byte version,
-			bool skipIndexVerify) {
-			_ptableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_filename = GetTempFilePath();
-			_finalmergefile = GetTempFilePath();
-			_finalmergefile2 = GetTempFilePath();
-
-			_map = IndexMapTestFactory.FromFile(_filename, maxAutoMergeLevel: _maxAutoMergeIndexLevel);
-			var memtable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			memtable.Add(0, 1, 0);
-			var guidFilename = new GuidFilenameProvider(PathName);
-			_result = _map.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
-				guidFilename,
-				_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-			_result = _result.MergedMap.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
-				guidFilename,
-				_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-			_result = _result.MergedMap.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
-				guidFilename,
-				_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-			_result = _result.MergedMap.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
-				guidFilename,
-				_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-			_result = _result.MergedMap.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
-				guidFilename,
-				_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-			_result = _result.MergedMap.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
-				guidFilename,
-				_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-			_result = _result.MergedMap.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
-				guidFilename,
-				_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-			_result = _result.MergedMap.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
-				guidFilename,
-				_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-			_result = _result.MergedMap.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
-				guidFilename,
-				_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-			_result = _result.MergedMap.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
-				guidFilename,
-				_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-			_result = _result.MergedMap.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
-				guidFilename,
-				_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-			_result = _result.MergedMap.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
-				guidFilename,
-				_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-			_result = _result.MergedMap.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
-				guidFilename,
-				_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-			_result = _result.MergedMap.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
-				guidFilename,
-				_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-			_result = _result.MergedMap.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
-				guidFilename,
-				_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-			_result = _result.MergedMap.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 1, 2,
-				new FakeFilenameProvider(_finalmergefile, _finalmergefile2), _ptableVersion, 0,
-				skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_result.MergedMap.InOrder().ToList().ForEach(x => x.MarkForDestruction());
-			File.Delete(_filename);
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void the_prepare_checkpoint_is_taken_from_the_latest_added_table() {
-			Assert.AreEqual(1, _result.MergedMap.PrepareCheckpoint);
-		}
-
-		[Test]
-		public void the_commit_checkpoint_is_taken_from_the_latest_added_table() {
-			Assert.AreEqual(2, _result.MergedMap.CommitCheckpoint);
-		}
-
-		[Test]
-		public void there_are_eight_items_to_delete() {
-			Assert.AreEqual(8, _result.ToDelete.Count);
-		}
-
-		[Test]
-		public void the_merged_map_has_a_single_file() {
-			Assert.AreEqual(1, _result.MergedMap.GetAllFilenames().Count());
-			Assert.AreEqual(_finalmergefile2, _result.MergedMap.GetAllFilenames().ToList()[0]);
-		}
-
-		[Test]
-		public void the_original_map_did_not_change() {
-			Assert.AreEqual(0, _map.InOrder().Count());
-			Assert.AreEqual(0, _map.GetAllFilenames().Count());
-		}
-
-		[Test]
-		public void a_merged_file_was_created() {
-			Assert.IsTrue(File.Exists(_finalmergefile2));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/adding_two_items_to_empty_index_map_with_two_tables_per_level_causes_merge.cs b/src/EventStore.Core.Tests/Index/IndexV1/adding_two_items_to_empty_index_map_with_two_tables_per_level_causes_merge.cs
deleted file mode 100644
index cd2d1c821ca..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/adding_two_items_to_empty_index_map_with_two_tables_per_level_causes_merge.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class
-		adding_two_items_to_empty_index_map_with_two_tables_per_level_causes_merge :
-			SpecificationWithDirectoryPerTestFixture {
-		private string _filename;
-		private IndexMap _map;
-		private string _mergeFile;
-		private MergeResult _result;
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-		private bool _skipIndexVerify;
-		private int _maxAutoMergeIndexLevel = 4;
-
-		public adding_two_items_to_empty_index_map_with_two_tables_per_level_causes_merge(byte version,
-			bool skipIndexVerify) {
-			_ptableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_filename = GetTempFilePath();
-			_mergeFile = GetTempFilePath();
-
-			_map = IndexMapTestFactory.FromFile(_filename, maxTablesPerLevel: 2, maxAutoMergeLevel: _maxAutoMergeIndexLevel);
-			var memtable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			memtable.Add(0, 1, 0);
-
-			_result = _map.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify),
-				123, 321,
-				new GuidFilenameProvider(PathName), _ptableVersion, 0,
-				skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-			_result = _result.MergedMap.AddAndMergePTable(
-				PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify),
-				100, 400,
-				new FakeFilenameProvider(_mergeFile), _ptableVersion, 0,
-				skipIndexVerify: _skipIndexVerify);
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_result.MergedMap.InOrder().ToList().ForEach(x => x.MarkForDestruction());
-			File.Delete(_filename);
-			File.Delete(_mergeFile);
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void the_prepare_checkpoint_is_taken_from_the_latest_added_table() {
-			Assert.AreEqual(100, _result.MergedMap.PrepareCheckpoint);
-		}
-
-		[Test]
-		public void the_commit_checkpoint_is_taken_from_the_latest_added_table() {
-			Assert.AreEqual(400, _result.MergedMap.CommitCheckpoint);
-		}
-
-		[Test]
-		public void there_are_two_items_to_delete() {
-			Assert.AreEqual(2, _result.ToDelete.Count);
-		}
-
-		[Test]
-		public void the_merged_map_has_a_single_file() {
-			Assert.AreEqual(1, _result.MergedMap.GetAllFilenames().Count());
-			Assert.AreEqual(_mergeFile, _result.MergedMap.GetAllFilenames().ToList()[0]);
-		}
-
-		[Test]
-		public void the_original_map_did_not_change() {
-			Assert.AreEqual(0, _map.InOrder().Count());
-			Assert.AreEqual(0, _map.GetAllFilenames().Count());
-		}
-
-		[Test]
-		public void a_merged_file_was_created() {
-			Assert.IsTrue(File.Exists(_mergeFile));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/corrupt_index_should.cs b/src/EventStore.Core.Tests/Index/IndexV1/corrupt_index_should.cs
deleted file mode 100644
index e14f0802ae4..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/corrupt_index_should.cs
+++ /dev/null
@@ -1,379 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Core.Exceptions;
-using EventStore.Core.Index;
-using NUnit.Framework;
-using System.Collections.Generic;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	public class corrupt_index_should : SpecificationWithDirectoryPerTestFixture {
-		private const int numIndexEntries = 256;
-		private const int depth = 16;
-
-		private string ConstructPTable(byte version) {
-			var memTable = new HashListMemTable(version, numIndexEntries + 1);
-			for (int i = 1; i <= numIndexEntries; ++i) {
-				if (version > PTableVersions.IndexV1)
-					memTable.Add((ulong)i, 1, i * 1337);
-				else
-					memTable.Add(((ulong)i) << 32, 1, i * 1337);
-			}
-
-			string pTableFilename = GetTempFilePath();
-			var pTable = PTable.FromMemtable(memTable, pTableFilename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth);
-			pTable.Dispose();
-			return pTableFilename;
-		}
-
-		private static void CorruptBloomFilter(string bloomFilterFile) {
-			using var stream = File.Open(bloomFilterFile, FileMode.Open);
-			var data = new byte[255];
-			stream.Seek(0, SeekOrigin.Begin);
-			data[0] = 0xFF;
-			stream.Write(data, 0, 1);
-		}
-
-		private static void CorruptPTableFile(string ptableFile, byte version, string corruptionType) {
-			int indexEntrySize = 0;
-			if (version == PTableVersions.IndexV1)
-				indexEntrySize = PTable.IndexEntryV1Size;
-			else if (version == PTableVersions.IndexV2)
-				indexEntrySize = PTable.IndexEntryV2Size;
-			else if (version == PTableVersions.IndexV3)
-				indexEntrySize = PTable.IndexEntryV3Size;
-			else if (version == PTableVersions.IndexV4)
-				indexEntrySize = PTable.IndexEntryV4Size;
-
-			int indexEntryKeySize = 0;
-			if (version == PTableVersions.IndexV1)
-				indexEntryKeySize = PTable.IndexKeyV1Size;
-			else if (version == PTableVersions.IndexV2)
-				indexEntryKeySize = PTable.IndexKeyV2Size;
-			else if (version == PTableVersions.IndexV3)
-				indexEntryKeySize = PTable.IndexKeyV3Size;
-			else if (version == PTableVersions.IndexV4)
-				indexEntryKeySize = PTable.IndexKeyV4Size;
-
-			int numMidpoints = PTable.GetRequiredMidpointCountCached(numIndexEntries, version);
-
-			byte[] data = new byte[255];
-
-			using (FileStream stream = File.Open(ptableFile, FileMode.Open)) {
-				if (corruptionType == "footerFileType") {
-					stream.Seek(PTableHeader.Size + numIndexEntries * indexEntrySize + numMidpoints * indexEntrySize,
-						SeekOrigin.Begin);
-					data[0] = 0xFF;
-					stream.Write(data, 0, 1);
-				} else if (corruptionType == "footerVersion") {
-					stream.Seek(
-						PTableHeader.Size + numIndexEntries * indexEntrySize + numMidpoints * indexEntrySize + 1,
-						SeekOrigin.Begin);
-					data[0] = 0xFF;
-					stream.Write(data, 0, 1);
-				} else if (corruptionType == "negativeIndexEntriesSize") {
-					stream.Seek(
-						PTableHeader.Size + numIndexEntries * indexEntrySize + numMidpoints * indexEntrySize + 2,
-						SeekOrigin.Begin);
-					data[0] = 0xFF;
-					data[1] = 0xFF;
-					data[2] = 0xFF;
-					data[3] = 0xFF;
-					stream.Write(data, 0, 4);
-				} else if (corruptionType == "notMultipleIndexEntrySize") {
-					var footerPosition = PTableHeader.Size + numIndexEntries * indexEntrySize +
-					                     numMidpoints * indexEntrySize;
-					stream.Seek(footerPosition, SeekOrigin.Begin);
-					var buffer = new byte[4096];
-					int read = stream.Read(buffer, 0, 4096);
-
-					//insert a byte
-					stream.Seek(footerPosition, SeekOrigin.Begin);
-					data[0] = 0xFF;
-					stream.Write(data, 0, 1);
-					stream.Write(buffer, 0, read);
-				} else if (corruptionType == "lessThan2Midpoints") {
-					stream.Seek(
-						PTableHeader.Size + numIndexEntries * indexEntrySize + numMidpoints * indexEntrySize + 2,
-						SeekOrigin.Begin);
-					//1 midpoint
-					data[0] = 0x01;
-					data[1] = 0x00;
-					data[2] = 0x00;
-					data[3] = 0x00;
-					stream.Write(data, 0, 4);
-				} else if (corruptionType == "moreMidpointsThanIndexEntries") {
-					stream.Seek(
-						PTableHeader.Size + numIndexEntries * indexEntrySize + numMidpoints * indexEntrySize + 2,
-						SeekOrigin.Begin);
-					//change number of midpoints to 1 more than actual number to trigger the condition
-					var x = numMidpoints + 1;
-					for (int i = 0; i < 4; i++) {
-						data[i] = (byte)(x & 0xFF);
-						x >>= 8;
-					}
-
-					stream.Write(data, 0, 4);
-				} else if (corruptionType == "zeroOutMiddleEntries") {
-					//zeroes out middle index entries - useful for binary search tests
-					List<int> indexEntriesToCorrupt = new List<int>();
-					indexEntriesToCorrupt.Add(numIndexEntries / 2 - 1);
-					indexEntriesToCorrupt.Add(numIndexEntries / 2);
-
-					foreach (int entry in indexEntriesToCorrupt) {
-						stream.Seek(PTableHeader.Size + entry * indexEntrySize, SeekOrigin.Begin);
-						//modify one of the index entry hashes/version
-						stream.Write(data, 0, indexEntryKeySize);
-
-						if (version >= PTableVersions.IndexV4) {
-							//modify one of the midpoint entry hashes/version
-							stream.Seek(PTableHeader.Size + numIndexEntries * indexEntrySize + entry * indexEntrySize,
-								SeekOrigin.Begin);
-							stream.Write(data, 0, indexEntryKeySize);
-						}
-					}
-				} else if (corruptionType == "maxOutMiddleEntries") {
-					//maxes out middle index entries - useful for binary search tests
-					List<int> indexEntriesToCorrupt = new List<int>();
-					indexEntriesToCorrupt.Add(numIndexEntries / 2 - 1);
-					indexEntriesToCorrupt.Add(numIndexEntries / 2);
-
-					for (int i = 0; i < indexEntryKeySize; i++)
-						data[i] = 0xFF;
-
-					foreach (int entry in indexEntriesToCorrupt) {
-						stream.Seek(PTableHeader.Size + entry * indexEntrySize, SeekOrigin.Begin);
-						//modify one of the index entry hashes/version
-						stream.Write(data, 0, indexEntryKeySize);
-
-						if (version >= PTableVersions.IndexV4) {
-							//modify one of the midpoint entry hashes/version
-							stream.Seek(PTableHeader.Size + numIndexEntries * indexEntrySize + entry * indexEntrySize,
-								SeekOrigin.Begin);
-							stream.Write(data, 0, indexEntryKeySize);
-						}
-					}
-				} else if (corruptionType == "midpointItemIndexesNotAscendingOrder") {
-					if (version >= PTableVersions.IndexV4) {
-						//modify one of the midpoint item indexes
-						stream.Seek(
-							PTableHeader.Size + numIndexEntries * indexEntrySize + 3 * indexEntrySize - sizeof(long),
-							SeekOrigin.Begin);
-						stream.Write(data, 0, sizeof(long));
-					}
-				}
-			}
-		}
-
-		private ulong GetOriginalHash(ulong stream, byte version) {
-			if (version == PTableVersions.IndexV1) return stream << 32;
-			else return stream;
-		}
-
-		[TestCase(PTableVersions.IndexV2, false)]
-		[TestCase(PTableVersions.IndexV2, true)]
-		[TestCase(PTableVersions.IndexV3, false)]
-		[TestCase(PTableVersions.IndexV3, true)]
-		[TestCase(PTableVersions.IndexV4, false)]
-		[TestCase(PTableVersions.IndexV4, true)]
-		public void throw_exception_if_index_entries_not_multiple_of_index_entry_size(byte version,
-			bool skipIndexVerify) {
-			string ptableFileName = ConstructPTable(version);
-			CorruptPTableFile(ptableFileName, version, "notMultipleIndexEntrySize");
-			Assert.Throws<CorruptIndexException>(() => PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, skipIndexVerify));
-		}
-
-		[TestCase(PTableVersions.IndexV2, false)]
-		[TestCase(PTableVersions.IndexV2, true)]
-		[TestCase(PTableVersions.IndexV3, false)]
-		[TestCase(PTableVersions.IndexV3, true)]
-		[TestCase(PTableVersions.IndexV4, false)]
-		[TestCase(PTableVersions.IndexV4, true)]
-		public void throw_exception_if_midpoints_index_entries_not_in_descending_order(byte version,
-			bool skipIndexVerify) {
-			string ptableFileName = ConstructPTable(version);
-			CorruptPTableFile(ptableFileName, version, "zeroOutMiddleEntries");
-			Assert.Throws<CorruptIndexException>(() => PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, skipIndexVerify));
-		}
-
-
-		[TestCase(PTableVersions.IndexV4, false)]
-		[TestCase(PTableVersions.IndexV4, true)]
-		public void throw_exception_if_midpoints_item_indexes_not_in_ascending_order(byte version,
-			bool skipIndexVerify) {
-			string ptableFileName = ConstructPTable(version);
-			CorruptPTableFile(ptableFileName, version, "midpointItemIndexesNotAscendingOrder");
-			Assert.Throws<CorruptIndexException>(() => PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, skipIndexVerify));
-		}
-
-		[TestCase(PTableVersions.IndexV2, true)]
-		[TestCase(PTableVersions.IndexV3, true)]
-		[TestCase(PTableVersions.IndexV4, true)]
-		public void throw_exception_if_index_entries_not_descending_during_ptable_get_range(byte version,
-			bool skipIndexVerify) {
-			string ptableFileName = ConstructPTable(version);
-			CorruptPTableFile(ptableFileName, version, "zeroOutMiddleEntries");
-			//loading with a depth of 1 should load only 2 midpoints (first and last index entry)
-			PTable pTable = PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 1, skipIndexVerify);
-			Assert.Throws<MaybeCorruptIndexException>(() =>
-				pTable.GetRange(GetOriginalHash(numIndexEntries / 4, version), 1, 1));
-			pTable.Dispose();
-		}
-
-		[TestCase(PTableVersions.IndexV2, true)]
-		[TestCase(PTableVersions.IndexV3, true)]
-		[TestCase(PTableVersions.IndexV4, true)]
-		public void throw_exception_if_index_entries_not_descending_during_ptable_get_range_2(byte version,
-			bool skipIndexVerify) {
-			string ptableFileName = ConstructPTable(version);
-			CorruptPTableFile(ptableFileName, version, "maxOutMiddleEntries");
-			//loading with a depth of 1 should load only 2 midpoints (first and last index entry)
-			PTable pTable = PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 1, skipIndexVerify);
-			Assert.Throws<MaybeCorruptIndexException>(() =>
-				pTable.GetRange(GetOriginalHash(numIndexEntries / 4, version), 1, 1));
-			pTable.Dispose();
-		}
-
-		[TestCase(PTableVersions.IndexV2, true)]
-		[TestCase(PTableVersions.IndexV3, true)]
-		[TestCase(PTableVersions.IndexV4, true)]
-		public void throw_exception_if_index_entries_not_descending_during_ptable_get_latest_entry(byte version,
-			bool skipIndexVerify) {
-			string ptableFileName = ConstructPTable(version);
-			CorruptPTableFile(ptableFileName, version, "zeroOutMiddleEntries");
-			//loading with a depth of 1 should load only 2 midpoints (first and last index entry)
-			PTable pTable = PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 1, skipIndexVerify);
-			IndexEntry entry;
-			Assert.Throws<MaybeCorruptIndexException>(() =>
-				// changed 2 to 4 here because the corruption actually removes the stream at /2, so it isn't in the bloom filter
-				pTable.TryGetLatestEntry(GetOriginalHash(numIndexEntries / 4, version), out entry));
-			pTable.Dispose();
-		}
-
-		[TestCase(PTableVersions.IndexV2, true)]
-		[TestCase(PTableVersions.IndexV3, true)]
-		[TestCase(PTableVersions.IndexV4, true)]
-		public void throw_exception_if_index_entries_not_descending_during_ptable_get_latest_entry_2(byte version,
-			bool skipIndexVerify) {
-			string ptableFileName = ConstructPTable(version);
-			CorruptPTableFile(ptableFileName, version, "maxOutMiddleEntries");
-			//loading with a depth of 1 should load only 2 midpoints (first and last index entry)
-			PTable pTable = PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 1, skipIndexVerify);
-			IndexEntry entry;
-			Assert.Throws<MaybeCorruptIndexException>(() =>
-				pTable.TryGetLatestEntry(GetOriginalHash(numIndexEntries / 4, version), out entry));
-			pTable.Dispose();
-		}
-
-		[TestCase(PTableVersions.IndexV2, true)]
-		[TestCase(PTableVersions.IndexV3, true)]
-		[TestCase(PTableVersions.IndexV4, true)]
-		public void throw_exception_if_index_entries_not_descending_during_ptable_get_oldest_entry(byte version,
-			bool skipIndexVerify) {
-			string ptableFileName = ConstructPTable(version);
-			CorruptPTableFile(ptableFileName, version, "zeroOutMiddleEntries");
-			//loading with a depth of 1 should load only 2 midpoints (first and last index entry)
-			PTable pTable = PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 1, skipIndexVerify);
-			IndexEntry entry;
-			Assert.Throws<MaybeCorruptIndexException>(() =>
-				pTable.TryGetOldestEntry(GetOriginalHash(numIndexEntries / 4, version), out entry));
-			pTable.Dispose();
-		}
-
-		[TestCase(PTableVersions.IndexV2, true)]
-		[TestCase(PTableVersions.IndexV3, true)]
-		[TestCase(PTableVersions.IndexV4, true)]
-		public void throw_exception_if_index_entries_not_descending_during_ptable_get_oldest_entry_2(byte version,
-			bool skipIndexVerify) {
-			string ptableFileName = ConstructPTable(version);
-			CorruptPTableFile(ptableFileName, version, "maxOutMiddleEntries");
-			//loading with a depth of 1 should load only 2 midpoints (first and last index entry)
-			PTable pTable = PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 1, skipIndexVerify);
-			IndexEntry entry;
-			Assert.Throws<MaybeCorruptIndexException>(() =>
-				pTable.TryGetOldestEntry(GetOriginalHash(numIndexEntries / 4, version), out entry));
-			pTable.Dispose();
-		}
-
-		[TestCase(PTableVersions.IndexV2, true)]
-		[TestCase(PTableVersions.IndexV3, true)]
-		[TestCase(PTableVersions.IndexV4, true)]
-		public void throw_exception_if_index_entries_not_descending_during_ptable_get_one_value(byte version,
-			bool skipIndexVerify) {
-			string ptableFileName = ConstructPTable(version);
-			CorruptPTableFile(ptableFileName, version, "zeroOutMiddleEntries");
-			//loading with a depth of 1 should load only 2 midpoints (first and last index entry)
-			PTable pTable = PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 1, skipIndexVerify);
-			long position;
-			Assert.Throws<MaybeCorruptIndexException>(() =>
-				pTable.TryGetOneValue(GetOriginalHash(numIndexEntries / 4, version), 1, out position));
-			pTable.Dispose();
-		}
-
-		[TestCase(PTableVersions.IndexV2, true)]
-		[TestCase(PTableVersions.IndexV3, true)]
-		[TestCase(PTableVersions.IndexV4, true)]
-		public void throw_exception_if_index_entries_not_descending_during_ptable_get_one_value_2(byte version,
-			bool skipIndexVerify) {
-			string ptableFileName = ConstructPTable(version);
-			CorruptPTableFile(ptableFileName, version, "maxOutMiddleEntries");
-			//loading with a depth of 1 should load only 2 midpoints (first and last index entry)
-			PTable pTable = PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 1, skipIndexVerify);
-			long position;
-			Assert.Throws<MaybeCorruptIndexException>(() =>
-				pTable.TryGetOneValue(GetOriginalHash(numIndexEntries / 4, version), 1, out position));
-			pTable.Dispose();
-		}
-
-		[TestCase(PTableVersions.IndexV4, false)]
-		[TestCase(PTableVersions.IndexV4, true)]
-		public void throw_exception_on_invalid_ptable_filenumber_in_footer(byte version, bool skipIndexVerify) {
-			string ptableFileName = ConstructPTable(version);
-			CorruptPTableFile(ptableFileName, version, "footerFileType");
-			Assert.Throws<CorruptIndexException>(() => PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, skipIndexVerify));
-		}
-
-		[TestCase(PTableVersions.IndexV4, false)]
-		[TestCase(PTableVersions.IndexV4, true)]
-		public void throw_exception_on_header_footer_version_mismatch(byte version, bool skipIndexVerify) {
-			string ptableFileName = ConstructPTable(version);
-			CorruptPTableFile(ptableFileName, version, "footerVersion");
-			Assert.Throws<CorruptIndexException>(() => PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, skipIndexVerify));
-		}
-
-		[TestCase(PTableVersions.IndexV4, false)]
-		[TestCase(PTableVersions.IndexV4, true)]
-		public void throw_exception_if_negative_index_entries_size(byte version, bool skipIndexVerify) {
-			string ptableFileName = ConstructPTable(version);
-			CorruptPTableFile(ptableFileName, version, "negativeIndexEntriesSize");
-			Assert.Throws<CorruptIndexException>(() => PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, skipIndexVerify));
-		}
-
-		[TestCase(PTableVersions.IndexV4, false)]
-		[TestCase(PTableVersions.IndexV4, true)]
-		public void throw_exception_if_less_than_2_midpoints_cached(byte version, bool skipIndexVerify) {
-			string ptableFileName = ConstructPTable(version);
-			CorruptPTableFile(ptableFileName, version, "lessThan2Midpoints");
-			Assert.Throws<CorruptIndexException>(() => PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, skipIndexVerify));
-		}
-
-		[TestCase(PTableVersions.IndexV4, false)]
-		[TestCase(PTableVersions.IndexV4, true)]
-		public void throw_exception_if_more_midpoints_than_index_entries(byte version, bool skipIndexVerify) {
-			string ptableFileName = ConstructPTable(version);
-			CorruptPTableFile(ptableFileName, version, "moreMidpointsThanIndexEntries");
-			Assert.Throws<CorruptIndexException>(() => PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, skipIndexVerify));
-		}
-
-		[TestCase(PTableVersions.IndexV4, false)]
-		[TestCase(PTableVersions.IndexV4, true)]
-		public void continue_without_corrupt_bloom_filter(byte version, bool corrupt) {
-			string ptableFileName = ConstructPTable(version);
-
-			if (corrupt)
-				CorruptBloomFilter(PTable.GenBloomFilterFilename(ptableFileName));
-
-			var table = PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, skipIndexVerify: true);
-			Assert.AreEqual(!corrupt, table.HasBloomFilter);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/destroying_ptable.cs b/src/EventStore.Core.Tests/Index/IndexV1/destroying_ptable.cs
deleted file mode 100644
index e2102f85aeb..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/destroying_ptable.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System.IO;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class destroying_ptable : SpecificationWithFile {
-		private PTable _table;
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-		private bool _skipIndexVerify;
-
-		public destroying_ptable(byte version, bool skipIndexVerify) {
-			_ptableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		[SetUp]
-		public void Setup() {
-			var mtable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			mtable.Add(0x010100000000, 0x0001, 0x0001);
-			mtable.Add(0x010500000000, 0x0001, 0x0002);
-			_table = PTable.FromMemtable(mtable, Filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault,
-				skipIndexVerify: _skipIndexVerify,
-				useBloomFilter: true);
-			_table.MarkForDestruction();
-		}
-
-		[Test]
-		public void the_file_is_deleted() {
-			_table.WaitForDisposal(1000);
-			Assert.IsFalse(File.Exists(Filename));
-			Assert.IsFalse(File.Exists(_table.BloomFilterFilename));
-		}
-
-		[Test]
-		public void wait_for_destruction_returns() {
-			Assert.DoesNotThrow(() => _table.WaitForDisposal(1000));
-		}
-
-		[TearDown]
-		public void Teardown() {
-			_table.WaitForDisposal(1000);
-			File.Delete(Filename);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/index_map_should.cs b/src/EventStore.Core.Tests/Index/IndexV1/index_map_should.cs
deleted file mode 100644
index 84f4aed4f00..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/index_map_should.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Exceptions;
-using EventStore.Core.Index;
-using EventStore.Core.Util;
-using NUnit.Framework;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2)]
-	[TestFixture(PTableVersions.IndexV3)]
-	[TestFixture(PTableVersions.IndexV4)]
-	public class index_map_should : SpecificationWithDirectory {
-		private string _indexMapFileName;
-		private string _ptableFileName;
-		private IndexMap _emptyIndexMap;
-		private PTable _ptable;
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-
-		public index_map_should(byte version) {
-			_ptableVersion = version;
-		}
-
-		[SetUp]
-		public override async Task SetUp() {
-			await base.SetUp();
-
-			_indexMapFileName = GetFilePathFor("index.map");
-			_ptableFileName = GetFilePathFor("ptable");
-
-			_emptyIndexMap = IndexMapTestFactory.FromFile(_indexMapFileName);
-
-			var memTable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			memTable.Add(0, 1, 2);
-			_ptable = PTable.FromMemtable(memTable, _ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault);
-		}
-
-		[TearDown]
-		public override Task TearDown() {
-			_ptable.MarkForDestruction();
-			return base.TearDown();
-		}
-
-		[Test]
-		public void not_allow_negative_prepare_checkpoint_when_adding_ptable() {
-			Assert.Throws<ArgumentOutOfRangeException>(() => _emptyIndexMap.AddPTable(_ptable, -1, 0));
-		}
-
-		[Test]
-		public void not_allow_negative_commit_checkpoint_when_adding_ptable() {
-			Assert.Throws<ArgumentOutOfRangeException>(() => _emptyIndexMap.AddPTable(_ptable, 0, -1));
-		}
-
-		[Test]
-		public void throw_corruptedindexexception_when_prepare_checkpoint_is_less_than_minus_one() {
-			CreateArtificialIndexMapFile(_indexMapFileName, -2, 0, null);
-			Assert.Throws<CorruptIndexException>(() =>
-				IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
-		}
-
-		[Test]
-		public void allow_prepare_checkpoint_equal_to_minus_one_if_no_ptables_are_in_index() {
-			CreateArtificialIndexMapFile(_indexMapFileName, -1, 0, null);
-			Assert.DoesNotThrow(() => {
-				var indexMap = IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2);
-				indexMap.InOrder().ToList().ForEach(x => x.Dispose());
-			});
-		}
-
-		[Test]
-		public void
-			throw_corruptedindexexception_if_prepare_checkpoint_is_minus_one_and_there_are_ptables_in_indexmap() {
-			CreateArtificialIndexMapFile(_indexMapFileName, -1, 0, _ptableFileName);
-			Assert.Throws<CorruptIndexException>(() =>
-				IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
-		}
-
-		[Test]
-		public void throw_corruptedindexexception_when_commit_checkpoint_is_less_than_minus_one() {
-			CreateArtificialIndexMapFile(_indexMapFileName, 0, -2, null);
-			Assert.Throws<CorruptIndexException>(() =>
-				IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
-		}
-
-		[Test]
-		public void allow_commit_checkpoint_equal_to_minus_one_if_no_ptables_are_in_index() {
-			CreateArtificialIndexMapFile(_indexMapFileName, 0, -1, null);
-			Assert.DoesNotThrow(() => {
-				var indexMap = IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2);
-				indexMap.InOrder().ToList().ForEach(x => x.Dispose());
-			});
-		}
-
-		[Test]
-		public void
-			throw_corruptedindexexception_if_commit_checkpoint_is_minus_one_and_there_are_ptables_in_indexmap() {
-			CreateArtificialIndexMapFile(_indexMapFileName, 0, -1, _ptableFileName);
-			Assert.Throws<CorruptIndexException>(() =>
-				IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
-		}
-
-		private void CreateArtificialIndexMapFile(string filePath, long prepareCheckpoint, long commitCheckpoint,
-			string ptablePath) {
-			using (var memStream = new MemoryStream())
-			using (var memWriter = new StreamWriter(memStream)) {
-				memWriter.WriteLine(new string('0', 32)); // pre-allocate space for MD5 hash
-				memWriter.WriteLine("1");
-				memWriter.WriteLine("{0}/{1}", prepareCheckpoint, commitCheckpoint);
-				if (!string.IsNullOrWhiteSpace(ptablePath)) {
-					memWriter.WriteLine("0,0,{0}", ptablePath);
-				}
-
-				memWriter.Flush();
-
-				using (var f = File.OpenWrite(filePath))
-				using (var fileWriter = new StreamWriter(f)) {
-					memStream.Position = 0;
-					memStream.CopyTo(f);
-
-					memStream.Position = 32;
-					var hash = MD5Hash.GetHashFor(memStream);
-					f.Position = 0;
-					for (int i = 0; i < hash.Length; ++i) {
-						fileWriter.Write(hash[i].ToString("X2"));
-					}
-
-					fileWriter.WriteLine();
-					fileWriter.Flush();
-					f.FlushToDisk();
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/index_map_should_detect_corruption.cs b/src/EventStore.Core.Tests/Index/IndexV1/index_map_should_detect_corruption.cs
deleted file mode 100644
index 669c1b19288..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/index_map_should_detect_corruption.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Exceptions;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class index_map_should_detect_corruption : SpecificationWithDirectory {
-		private string _indexMapFileName;
-		private string _ptableFileName;
-		private PTable _ptable;
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-		private bool _skipIndexVerify;
-		private int _maxAutoMergeIndexLevel = 4;
-
-		public index_map_should_detect_corruption(byte version, bool skipIndexVerify) {
-			_ptableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		[SetUp]
-		public override async Task SetUp() {
-			await base.SetUp();
-
-			_indexMapFileName = GetFilePathFor("index.map");
-			_ptableFileName = GetFilePathFor("ptable");
-
-			var indexMap = IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2, maxAutoMergeLevel: _maxAutoMergeIndexLevel);
-			var memtable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			memtable.Add(0, 0, 0);
-			memtable.Add(1, 1, 100);
-			_ptable = PTable.FromMemtable(memtable, _ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify);
-
-			indexMap = indexMap.AddAndMergePTable(_ptable, 0, 0,
-				new GuidFilenameProvider(PathName), _ptableVersion, 0, skipIndexVerify: _skipIndexVerify).MergedMap;
-			indexMap.SaveToFile(_indexMapFileName);
-		}
-
-		[TearDown]
-		public override Task TearDown() {
-			_ptable?.MarkForDestruction();
-			return base.TearDown();
-		}
-
-		[Test]
-		public void when_ptable_file_is_deleted() {
-			_ptable.MarkForDestruction();
-			_ptable = null;
-			File.Delete(_ptableFileName);
-
-			Assert.Throws<CorruptIndexException>(() =>
-				IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
-		}
-
-		[Test]
-		public void when_indexmap_file_does_not_have_md5_checksum() {
-			var lines = File.ReadAllLines(_indexMapFileName);
-			File.WriteAllLines(_indexMapFileName, lines.Skip(1));
-
-			Assert.Throws<CorruptIndexException>(() =>
-				IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
-		}
-
-		[Test]
-		public void when_indexmap_file_does_not_have_latest_commit_position() {
-			var lines = File.ReadAllLines(_indexMapFileName);
-			File.WriteAllLines(_indexMapFileName, lines.Where((x, i) => i != 1));
-
-			Assert.Throws<CorruptIndexException>(() =>
-				IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
-		}
-
-		[Test]
-		public void when_indexmap_file_exists_but_is_empty() {
-			File.WriteAllText(_indexMapFileName, "");
-
-			Assert.Throws<CorruptIndexException>(() =>
-				IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
-		}
-
-		[Test]
-		public void when_indexmap_file_is_garbage() {
-			File.WriteAllText(_indexMapFileName, "alkfjasd;lkf\nasdfasdf\n");
-
-			Assert.Throws<CorruptIndexException>(() =>
-				IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
-		}
-
-		[Test]
-		public void when_checkpoints_pair_is_corrupted() {
-			using (var fs = File.Open(_indexMapFileName, FileMode.Open)) {
-				fs.Position = 34;
-				var b = (byte)fs.ReadByte();
-				b ^= 1;
-				fs.Position = 34;
-				fs.WriteByte(b);
-			}
-
-			Assert.Throws<CorruptIndexException>(() =>
-				IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
-		}
-
-		[Test]
-		public void when_ptable_line_is_missing_one_number() {
-			var lines = File.ReadAllLines(_indexMapFileName);
-			File.WriteAllLines(_indexMapFileName, new[] { lines[0], lines[1], string.Format("0,{0}", _ptableFileName) });
-
-			Assert.Throws<CorruptIndexException>(() =>
-				IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
-		}
-
-		[Test]
-		public void when_ptable_line_constists_only_of_filename() {
-			var lines = File.ReadAllLines(_indexMapFileName);
-			File.WriteAllLines(_indexMapFileName, new[] { lines[0], lines[1], _ptableFileName });
-
-			Assert.Throws<CorruptIndexException>(() =>
-				IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
-		}
-
-		[Test]
-		public void when_ptable_line_is_missing_filename() {
-			var lines = File.ReadAllLines(_indexMapFileName);
-			File.WriteAllLines(_indexMapFileName, new[] { lines[0], lines[1], "0,0" });
-
-			Assert.Throws<CorruptIndexException>(() =>
-				IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
-		}
-
-		[Test]
-		public void when_indexmap_md5_checksum_is_corrupted() {
-			using (var fs = File.Open(_indexMapFileName, FileMode.Open)) {
-				var b = (byte)fs.ReadByte();
-				b ^= 1; // swap single bit
-				fs.Position = 0;
-				fs.WriteByte(b);
-			}
-
-			Assert.Throws<CorruptIndexException>(() =>
-				IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
-		}
-
-		[Test]
-		public void when_ptable_hash_is_corrupted() {
-			_ptable.Dispose();
-			_ptable = null;
-
-			using (var fs = File.Open(_ptableFileName, FileMode.Open)) {
-				fs.Seek(-PTable.MD5Size, SeekOrigin.End);
-				var b = (byte)fs.ReadByte();
-				b ^= 1;
-				fs.Seek(-PTable.MD5Size, SeekOrigin.End);
-				fs.WriteByte(b);
-			}
-
-			Assert.Throws<CorruptIndexException>(() =>
-				IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
-		}
-
-		[Test]
-		public void when_ptable_type_is_corrupted() {
-			_ptable.Dispose();
-			_ptable = null;
-
-			using (var fs = File.Open(_ptableFileName, FileMode.Open)) {
-				fs.Seek(0, SeekOrigin.Begin);
-				fs.WriteByte(123);
-			}
-
-			Assert.Throws<CorruptIndexException>(() =>
-				IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
-		}
-
-		[Test]
-		public void when_ptable_header_is_corrupted() {
-			_ptable.Dispose();
-			_ptable = null;
-
-			using (var fs = File.Open(_ptableFileName, FileMode.Open)) {
-				fs.Position = new Random().Next(0, PTableHeader.Size);
-				var b = (byte)fs.ReadByte();
-				b ^= 1;
-				fs.Position -= 1;
-				fs.WriteByte(b);
-			}
-
-			Assert.Throws<CorruptIndexException>(() =>
-				IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
-		}
-
-		[Test]
-		public void when_ptable_data_is_corrupted() {
-			_ptable.Dispose();
-			_ptable = null;
-
-			using (var fs = File.Open(_ptableFileName, FileMode.Open)) {
-				fs.Position = new Random().Next(PTableHeader.Size, (int)fs.Length);
-				var b = (byte)fs.ReadByte();
-				b ^= 1;
-				fs.Position -= 1;
-				fs.WriteByte(b);
-			}
-
-			Assert.Throws<CorruptIndexException>(() =>
-				IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/opening_a_ptable_with_more_than_32bits_of_records.cs b/src/EventStore.Core.Tests/Index/IndexV1/opening_a_ptable_with_more_than_32bits_of_records.cs
deleted file mode 100644
index 472216bb869..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/opening_a_ptable_with_more_than_32bits_of_records.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Security.Cryptography;
-using System.Threading.Tasks;
-using NUnit.Framework;
-using EventStore.Core.Index;
-using EventStore.Common.Utils;
-using EventStore.Common.Options;
-using MD5 = EventStore.Core.Hashing.MD5;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTable.IndexEntryV1Size), Explicit, Ignore("Long running, unsafe")]
-	public class opening_a_ptable_with_more_than_32bits_of_records : SpecificationWithFilePerTestFixture {
-		public const int MD5Size = 16;
-		public const byte Version = 1;
-		public const int DefaultSequentialBufferSize = 65536;
-
-		private PTable _ptable;
-		private long _size;
-		private long _ptableCount;
-
-		protected int _indexEntrySize = PTable.IndexEntryV1Size;
-
-		public opening_a_ptable_with_more_than_32bits_of_records(int indexEntrySize) {
-			Assert.Inconclusive("Explicit test, Test setup never returns");
-			_indexEntrySize = indexEntrySize;
-		}
-
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_ptableCount = (long)(uint.MaxValue + 10000000L);
-			_size = _ptableCount * (long)_indexEntrySize + PTableHeader.Size + PTable.MD5Size;
-			Console.WriteLine("Creating PTable at {0}. Size of PTable: {1}", Filename, _size);
-			CreatePTableFile(Filename, _size, _indexEntrySize);
-			_ptable = PTable.FromFile(Filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 22, false);
-		}
-
-		public static void CreatePTableFile(string filename, long ptableSize, int indexEntrySize, int cacheDepth = 16) {
-
-			//TODO: fix this unsafe test it will fill the target disk if the test is aborted or an error occurs
-
-			Ensure.NotNullOrEmpty(filename, "filename");
-			Ensure.Nonnegative(cacheDepth, "cacheDepth");
-
-			var sw = Stopwatch.StartNew();
-			var tableId = Guid.NewGuid();
-			using (var fs = new FileStream(filename, FileMode.Create, FileAccess.ReadWrite, FileShare.None,
-				DefaultSequentialBufferSize, FileOptions.SequentialScan)) {
-				fs.SetLength((long)ptableSize);
-				fs.Seek(0, SeekOrigin.Begin);
-
-				var recordCount = (long)((ptableSize - PTableHeader.Size - PTable.MD5Size) / (long)indexEntrySize);
-				using (var md5 = MD5.Create())
-				using (var cs = new CryptoStream(fs, md5, CryptoStreamMode.Write))
-				using (var bs = new BufferedStream(cs, DefaultSequentialBufferSize)) {
-					// WRITE HEADER
-					var headerBytes = new PTableHeader(Version).AsByteArray();
-					cs.Write(headerBytes, 0, headerBytes.Length);
-
-					// WRITE INDEX ENTRIES
-					var buffer = new byte[indexEntrySize];
-					for (long i = 0; i < recordCount; i++) {
-						bs.Write(buffer, 0, indexEntrySize);
-					}
-
-					bs.Flush();
-					cs.FlushFinalBlock();
-
-					// WRITE MD5
-					var hash = md5.Hash;
-					fs.Write(hash, 0, hash.Length);
-				}
-			}
-
-			Console.WriteLine("Created PTable File[{0}, size of {1}] in {2}.", tableId, ptableSize, sw.Elapsed);
-		}
-
-		public override void TestFixtureTearDown() {
-			_ptable.Dispose();
-			base.TestFixtureTearDown();
-		}
-
-		[Test, Explicit,Ignore("Long running, unsafe")]
-		public void count_should_be_right() {
-			Assert.AreEqual(_ptableCount, _ptable.Count);
-		}
-
-		[Test, Explicit,Ignore("Long running, unsafe")]
-		public void filename_is_correct() {
-			Assert.AreEqual(Filename, _ptable.Filename);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/ptable_midpoint_cache_should.cs b/src/EventStore.Core.Tests/Index/IndexV1/ptable_midpoint_cache_should.cs
deleted file mode 100644
index 58a6112abbe..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/ptable_midpoint_cache_should.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using EventStore.Core.Index;
-using NUnit.Framework;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class ptable_midpoint_cache_should : SpecificationWithDirectory {
-		private static readonly ILogger Log = Serilog.Log.ForContext<ptable_midpoint_cache_should>();
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-		private bool _skipIndexVerify;
-
-		public ptable_midpoint_cache_should(byte version, bool skipIndexVerify) {
-			_ptableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		private void construct_valid_cache_for_any_combination_of_params(int maxIndexEntries) {
-			var rnd = new Random(123987);
-			for (int count = 0; count < maxIndexEntries; ++count) {
-				for (int depth = 0; depth < 15; ++depth) {
-					PTable ptable = null;
-					try {
-						Log.Verbose("Creating PTable with count {0}, depth {1}", count, depth);
-						ptable = ConstructPTable(
-							GetFilePathFor(string.Format("{0}-{1}-indexv{2}.ptable", count, depth, _ptableVersion)),
-							count, rnd, depth);
-						ValidateCache(ptable.GetMidPoints(), count, depth);
-					} finally {
-						if (ptable != null) {
-							ptable.Dispose();
-						}
-					}
-				}
-			}
-		}
-
-		private PTable ConstructPTable(string file, int count, Random rnd, int depth) {
-			var memTable = new HashListMemTable(_ptableVersion, 20000);
-			for (int i = 0; i < count; ++i) {
-				memTable.Add((uint)rnd.Next(), rnd.Next(0, 1 << 20), Math.Abs(rnd.Next() * rnd.Next()));
-			}
-
-			var ptable = PTable.FromMemtable(memTable, file, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, skipIndexVerify: _skipIndexVerify);
-			return ptable;
-		}
-
-		private void ValidateCache(ReadOnlySpan<PTable.Midpoint> cache, int count, int depth) {
-			if (count == 0 || depth == 0) {
-				Assert.True(cache.IsEmpty);
-				return;
-			}
-
-			if (count == 1) {
-				Assert.False(cache.IsEmpty);
-				Assert.AreEqual(2, cache.Length);
-				Assert.AreEqual(0, cache[0].ItemIndex);
-				Assert.AreEqual(0, cache[1].ItemIndex);
-				return;
-			}
-
-			Assert.False(cache.IsEmpty);
-			Assert.AreEqual(Math.Min(count, 1 << depth), cache.Length);
-
-			Assert.AreEqual(0, cache[0].ItemIndex);
-			for (int i = 1; i < cache.Length; ++i) {
-				Assert.IsTrue(cache[i - 1].Key.GreaterEqualsThan(cache[i].Key), "Expected {0} to be >= {1}",
-					cache[i - 1].Key, cache[i].Key);
-				Assert.Less(cache[i - 1].ItemIndex, cache[i].ItemIndex);
-			}
-
-			Assert.AreEqual(count - 1, cache[cache.Length - 1].ItemIndex);
-		}
-
-		[Test, Category("LongRunning"), Ignore("Veerrrryyy long running :)")]
-		public void construct_valid_cache_for_any_combination_of_params_large() {
-			construct_valid_cache_for_any_combination_of_params(4096);
-		}
-
-		[Test]
-		public void construct_valid_cache_for_any_combination_of_params_small() {
-			construct_valid_cache_for_any_combination_of_params(20);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/ptable_range_query_tests.cs b/src/EventStore.Core.Tests/Index/IndexV1/ptable_range_query_tests.cs
deleted file mode 100644
index dad0d907bfc..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/ptable_range_query_tests.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false, 1_000_000)]
-	[TestFixture(PTableVersions.IndexV2, true, 1_000_000)]
-	[TestFixture(PTableVersions.IndexV3, false, 1_000_000)]
-	[TestFixture(PTableVersions.IndexV3, true, 1_000_000)]
-	[TestFixture(PTableVersions.IndexV4, false, 1_000_000)]
-	[TestFixture(PTableVersions.IndexV4, true, 1_000_000)]
-	[TestFixture(PTableVersions.IndexV4, false, 0)]
-	[TestFixture(PTableVersions.IndexV4, true, 0)]
-	public class ptable_range_query_tests : SpecificationWithFilePerTestFixture {
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-		private PTable _ptable;
-		private readonly bool _skipIndexVerify;
-		private readonly bool _useBloomFilter;
-		private readonly int _lruCacheSize;
-
-		public ptable_range_query_tests(byte version, bool skipIndexVerify, int lruCacheSize) {
-			_ptableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-			_useBloomFilter = skipIndexVerify; // bloomfilter orthogonal
-			_lruCacheSize = lruCacheSize;
-		}
-
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var table = new HashListMemTable(_ptableVersion, maxSize: 50);
-			table.Add(0x010100000000, 0x0001, 0x0001);
-			table.Add(0x010500000000, 0x0001, 0x0002);
-			table.Add(0x010200000000, 0x0001, 0x0003);
-			table.Add(0x010200000000, 0x0002, 0x0004);
-			table.Add(0x010300000000, 0x0001, 0xFFF1);
-			table.Add(0x010300000000, 0x0003, 0xFFF3);
-			table.Add(0x010300000000, 0x0005, 0xFFF5);
-			_ptable = PTable.FromMemtable(table, Filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, cacheDepth: 0,
-				skipIndexVerify: _skipIndexVerify,
-				useBloomFilter: _useBloomFilter,
-				lruCacheSize: _lruCacheSize);
-		}
-
-		public override void TestFixtureTearDown() {
-			_ptable.Dispose();
-			base.TestFixtureTearDown();
-		}
-
-		private ulong GetHash(ulong value) {
-			return _ptableVersion == PTableVersions.IndexV1 ? value >> 32 : value;
-		}
-
-		[Test]
-		public void range_query_of_non_existing_stream_returns_nothing() {
-			var list = _ptable.GetRange(0x14, 0x01, 0x02).ToArray();
-			Assert.AreEqual(0, list.Length);
-		}
-
-		[Test]
-		public void range_query_of_non_existing_version_returns_nothing() {
-			var list = _ptable.GetRange(0x010100000000, 0x03, 0x05).ToArray();
-			Assert.AreEqual(0, list.Length);
-		}
-
-		[Test]
-		public void range_query_with_hole_returns_items_included() {
-			var list = _ptable.GetRange(0x010300000000, 0x01, 0x05).ToArray();
-			Assert.AreEqual(3, list.Length);
-			Assert.AreEqual(GetHash(0x010300000000), list[0].Stream);
-			Assert.AreEqual(0x05, list[0].Version);
-			Assert.AreEqual(0xfff5, list[0].Position);
-			Assert.AreEqual(GetHash(0x010300000000), list[1].Stream);
-			Assert.AreEqual(0x03, list[1].Version);
-			Assert.AreEqual(0xfff3, list[1].Position);
-			Assert.AreEqual(GetHash(0x010300000000), list[2].Stream);
-			Assert.AreEqual(0x01, list[2].Version);
-			Assert.AreEqual(0xfff1, list[2].Position);
-		}
-
-		[Test]
-		public void query_with_start_in_range_but_not_end_results_returns_items_included() {
-			var list = _ptable.GetRange(0x010300000000, 0x01, 0x04).ToArray();
-			Assert.AreEqual(2, list.Length);
-			Assert.AreEqual(GetHash(0x010300000000), list[0].Stream);
-			Assert.AreEqual(0x03, list[0].Version);
-			Assert.AreEqual(0xfff3, list[0].Position);
-			Assert.AreEqual(GetHash(0x010300000000), list[1].Stream);
-			Assert.AreEqual(0x01, list[1].Version);
-			Assert.AreEqual(0xfff1, list[1].Position);
-		}
-
-		[Test]
-		public void query_with_end_in_range_but_not_start_results_returns_items_included() {
-			var list = _ptable.GetRange(0x010300000000, 0x00, 0x03).ToArray();
-			Assert.AreEqual(2, list.Length);
-			Assert.AreEqual(GetHash(0x010300000000), list[0].Stream);
-			Assert.AreEqual(0x03, list[0].Version);
-			Assert.AreEqual(0xfff3, list[0].Position);
-			Assert.AreEqual(GetHash(0x010300000000), list[1].Stream);
-			Assert.AreEqual(0x01, list[1].Version);
-			Assert.AreEqual(0xfff1, list[1].Position);
-		}
-
-		[Test]
-		public void query_with_end_and_start_exclusive_results_returns_items_included() {
-			var list = _ptable.GetRange(0x010300000000, 0x00, 0x06).ToArray();
-			Assert.AreEqual(3, list.Length);
-			Assert.AreEqual(GetHash(0x010300000000), list[0].Stream);
-			Assert.AreEqual(0x05, list[0].Version);
-			Assert.AreEqual(0xfff5, list[0].Position);
-			Assert.AreEqual(GetHash(0x010300000000), list[1].Stream);
-			Assert.AreEqual(0x03, list[1].Version);
-			Assert.AreEqual(0xfff3, list[1].Position);
-			Assert.AreEqual(GetHash(0x010300000000), list[2].Stream);
-			Assert.AreEqual(0x01, list[2].Version);
-			Assert.AreEqual(0xfff1, list[2].Position);
-		}
-
-		[Test]
-		public void query_with_end_inside_the_hole_in_list_returns_items_included() {
-			var list = _ptable.GetRange(0x010300000000, 0x00, 0x04).ToArray();
-			Assert.AreEqual(2, list.Length);
-			Assert.AreEqual(GetHash(0x010300000000), list[0].Stream);
-			Assert.AreEqual(0x03, list[0].Version);
-			Assert.AreEqual(0xfff3, list[0].Position);
-			Assert.AreEqual(GetHash(0x010300000000), list[1].Stream);
-			Assert.AreEqual(0x01, list[1].Version);
-			Assert.AreEqual(0xfff1, list[1].Position);
-		}
-
-		[Test]
-		public void query_with_start_inside_the_hole_in_list_returns_items_included() {
-			var list = _ptable.GetRange(0x010300000000, 0x02, 0x06).ToArray();
-			Assert.AreEqual(2, list.Length);
-			Assert.AreEqual(GetHash(0x010300000000), list[0].Stream);
-			Assert.AreEqual(0x05, list[0].Version);
-			Assert.AreEqual(0xfff5, list[0].Position);
-			Assert.AreEqual(GetHash(0x010300000000), list[1].Stream);
-			Assert.AreEqual(0x03, list[1].Version);
-			Assert.AreEqual(0xfff3, list[1].Position);
-		}
-
-		[Test]
-		public void query_with_start_and_end_inside_the_hole_in_list_returns_items_included() {
-			var list = _ptable.GetRange(0x010300000000, 0x02, 0x04).ToArray();
-			Assert.AreEqual(1, list.Length);
-			Assert.AreEqual(GetHash(0x010300000000), list[0].Stream);
-			Assert.AreEqual(0x03, list[0].Version);
-			Assert.AreEqual(0xfff3, list[0].Position);
-		}
-
-		[Test]
-		public void query_with_start_and_end_less_than_all_items_returns_nothing() {
-			var list = _ptable.GetRange(0x010300000000, 0x00, 0x00).ToArray();
-			Assert.AreEqual(0, list.Length);
-		}
-
-		[Test]
-		public void query_with_start_and_end_greater_than_all_items_returns_nothing() {
-			var list = _ptable.GetRange(0x010300000000, 0x06, 0x06).ToArray();
-			Assert.AreEqual(0, list.Length);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/ptable_read_scenario_with_items_spanning_few_cache_segments.cs b/src/EventStore.Core.Tests/Index/IndexV1/ptable_read_scenario_with_items_spanning_few_cache_segments.cs
deleted file mode 100644
index fc017976dde..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/ptable_read_scenario_with_items_spanning_few_cache_segments.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-using System.Linq;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false, 10)]
-	[TestFixture(PTableVersions.IndexV2, true, 10)]
-	[TestFixture(PTableVersions.IndexV3, false, 10)]
-	[TestFixture(PTableVersions.IndexV3, true, 10)]
-	[TestFixture(PTableVersions.IndexV4, false, 10)]
-	[TestFixture(PTableVersions.IndexV4, true, 10)]
-	public class
-		searching_ptable_with_items_spanning_few_cache_segments_and_all_items_in_cache :
-			ptable_read_scenario_with_items_spanning_few_cache_segments {
-		public searching_ptable_with_items_spanning_few_cache_segments_and_all_items_in_cache(byte ptableVersion,
-			bool skipIndexVerify, int midpointCacheDepth)
-			: base(ptableVersion, skipIndexVerify, midpointCacheDepth) {
-		}
-	}
-
-	[TestFixture(PTableVersions.IndexV2, false, 0)]
-	[TestFixture(PTableVersions.IndexV2, true, 0)]
-	[TestFixture(PTableVersions.IndexV3, false, 0)]
-	[TestFixture(PTableVersions.IndexV3, true, 0)]
-	[TestFixture(PTableVersions.IndexV4, false, 0)]
-	[TestFixture(PTableVersions.IndexV4, true, 0)]
-	public class
-		searching_ptable_with_items_spanning_few_cache_segments_and_only_some_items_in_cache :
-			ptable_read_scenario_with_items_spanning_few_cache_segments {
-		public searching_ptable_with_items_spanning_few_cache_segments_and_only_some_items_in_cache(byte ptableVersion,
-			bool skipIndexVerify, int midpointCacheDepth)
-			: base(ptableVersion, skipIndexVerify, midpointCacheDepth) {
-		}
-	}
-
-	public abstract class ptable_read_scenario_with_items_spanning_few_cache_segments : PTableReadScenario {
-		protected ptable_read_scenario_with_items_spanning_few_cache_segments(byte ptableVersion, bool skipIndexVerify,
-			int midpointCacheDepth)
-			: base(ptableVersion, skipIndexVerify, midpointCacheDepth) {
-		}
-
-		protected override void AddItemsForScenario(IMemTable memTable) {
-			memTable.Add(0x010100000000, 0, 0x0001);
-			memTable.Add(0x010100000000, 0, 0x0002);
-			memTable.Add(0x010500000000, 0, 0x0003);
-			memTable.Add(0x010500000000, 0, 0x0004);
-			memTable.Add(0x010500000000, 0, 0x0005);
-		}
-
-		private ulong GetHash(ulong value) {
-			return _ptableVersion == PTableVersions.IndexV1 ? value >> 32 : value;
-		}
-
-		[Test]
-		public void the_table_has_five_items() {
-			Assert.AreEqual(5, PTable.Count);
-		}
-
-		[Test]
-		public void the_smallest_items_can_be_found() {
-			long position;
-			Assert.IsTrue(PTable.TryGetOneValue(0x010100000000, 0, out position));
-			Assert.AreEqual(0x0002, position);
-		}
-
-		[Test]
-		public void the_smallest_items_are_returned_in_descending_order() {
-			var entries = PTable.GetRange(0x010100000000, 0, 0).ToArray();
-			Assert.AreEqual(2, entries.Length);
-			Assert.AreEqual(GetHash(0x010100000000), entries[0].Stream);
-			Assert.AreEqual(0, entries[0].Version);
-			Assert.AreEqual(0x0002, entries[0].Position);
-			Assert.AreEqual(GetHash(0x010100000000), entries[1].Stream);
-			Assert.AreEqual(0, entries[1].Version);
-			Assert.AreEqual(0x0001, entries[1].Position);
-		}
-
-		[Test]
-		public void try_get_latest_entry_for_smallest_hash_returns_correct_index_entry() {
-			IndexEntry entry;
-			Assert.IsTrue(PTable.TryGetLatestEntry(0x010100000000, out entry));
-			Assert.AreEqual(GetHash(0x010100000000), entry.Stream);
-			Assert.AreEqual(0, entry.Version);
-			Assert.AreEqual(0x0002, entry.Position);
-		}
-
-		[Test]
-		public void try_get_oldest_entry_for_smallest_hash_returns_correct_index_entry() {
-			IndexEntry entry;
-			Assert.IsTrue(PTable.TryGetOldestEntry(0x010100000000, out entry));
-			Assert.AreEqual(GetHash(0x010100000000), entry.Stream);
-			Assert.AreEqual(0, entry.Version);
-			Assert.AreEqual(0x0001, entry.Position);
-		}
-
-		[Test]
-		public void the_largest_items_can_be_found() {
-			long position;
-			Assert.IsTrue(PTable.TryGetOneValue(0x010500000000, 0, out position));
-			Assert.AreEqual(0x0005, position);
-		}
-
-		[Test]
-		public void the_largest_items_are_returned_in_descending_order() {
-			var entries = PTable.GetRange(0x010500000000, 0, 0).ToArray();
-			Assert.AreEqual(3, entries.Length);
-			Assert.AreEqual(GetHash(0x010500000000), entries[0].Stream);
-			Assert.AreEqual(0, entries[0].Version);
-			Assert.AreEqual(0x0005, entries[0].Position);
-			Assert.AreEqual(GetHash(0x010500000000), entries[1].Stream);
-			Assert.AreEqual(0, entries[1].Version);
-			Assert.AreEqual(0x0004, entries[1].Position);
-			Assert.AreEqual(GetHash(0x010500000000), entries[2].Stream);
-			Assert.AreEqual(0, entries[2].Version);
-			Assert.AreEqual(0x0003, entries[2].Position);
-		}
-
-		[Test]
-		public void try_get_latest_entry_for_largest_hash_returns_correct_index_entry() {
-			IndexEntry entry;
-			Assert.IsTrue(PTable.TryGetLatestEntry(0x010500000000, out entry));
-			Assert.AreEqual(GetHash(0x010500000000), entry.Stream);
-			Assert.AreEqual(0, entry.Version);
-			Assert.AreEqual(0x0005, entry.Position);
-		}
-
-		[Test]
-		public void try_get_oldest_entry_for_largest_hash_returns_correct_index_entry() {
-			IndexEntry entry;
-			Assert.IsTrue(PTable.TryGetOldestEntry(0x010500000000, out entry));
-			Assert.AreEqual(GetHash(0x010500000000), entry.Stream);
-			Assert.AreEqual(0, entry.Version);
-			Assert.AreEqual(0x0003, entry.Position);
-		}
-
-		[Test]
-		public void non_existent_item_cannot_be_found() {
-			long position;
-			Assert.IsFalse(PTable.TryGetOneValue(2, 0, out position));
-		}
-
-		[Test]
-		public void range_query_returns_nothing_for_nonexistent_stream() {
-			var entries = PTable.GetRange(0x010200000000, 0, long.MaxValue).ToArray();
-			Assert.AreEqual(0, entries.Length);
-		}
-
-		[Test]
-		public void try_get_latest_entry_returns_nothing_for_nonexistent_stream() {
-			IndexEntry entry;
-			Assert.IsFalse(PTable.TryGetLatestEntry(0x010200000000, out entry));
-		}
-
-		[Test]
-		public void try_get_oldest_entry_returns_nothing_for_nonexistent_stream() {
-			IndexEntry entry;
-			Assert.IsFalse(PTable.TryGetOldestEntry(0x010200000000, out entry));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/ptable_read_scenario_with_usual_items.cs b/src/EventStore.Core.Tests/Index/IndexV1/ptable_read_scenario_with_usual_items.cs
deleted file mode 100644
index 78d45612b99..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/ptable_read_scenario_with_usual_items.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-using System.Linq;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false, 10)]
-	[TestFixture(PTableVersions.IndexV2, true, 10)]
-	[TestFixture(PTableVersions.IndexV3, false, 10)]
-	[TestFixture(PTableVersions.IndexV3, true, 10)]
-	[TestFixture(PTableVersions.IndexV4, false, 10)]
-	[TestFixture(PTableVersions.IndexV4, true, 10)]
-	public class searching_ptable_with_usual_items_and_all_items_in_cache : ptable_read_scenario_with_usual_items {
-		public searching_ptable_with_usual_items_and_all_items_in_cache(byte ptableVersion, bool skipIndexVerify,
-			int midpointCacheDepth)
-			: base(ptableVersion, skipIndexVerify, midpointCacheDepth) {
-		}
-	}
-
-	[TestFixture(PTableVersions.IndexV2, false, 0)]
-	[TestFixture(PTableVersions.IndexV2, true, 0)]
-	[TestFixture(PTableVersions.IndexV3, false, 0)]
-	[TestFixture(PTableVersions.IndexV3, true, 0)]
-	[TestFixture(PTableVersions.IndexV4, false, 0)]
-	[TestFixture(PTableVersions.IndexV4, true, 0)]
-	public class
-		searching_ptable_with_usual_items_and_only_some_items_in_cache : ptable_read_scenario_with_usual_items {
-		public searching_ptable_with_usual_items_and_only_some_items_in_cache(byte ptableVersion, bool skipIndexVerify,
-			int midpointCacheDepth)
-			: base(ptableVersion, skipIndexVerify, midpointCacheDepth) {
-		}
-	}
-
-	public abstract class ptable_read_scenario_with_usual_items : PTableReadScenario {
-		protected ptable_read_scenario_with_usual_items(byte ptableVersion, bool skipIndexVerify,
-			int midpointCacheDepth)
-			: base(ptableVersion, skipIndexVerify, midpointCacheDepth) {
-		}
-
-		protected override void AddItemsForScenario(IMemTable memTable) {
-			memTable.Add(0x010100000000, 0x0001, 0x0001);
-			memTable.Add(0x010500000000, 0x0001, 0x0002);
-			memTable.Add(0x010200000000, 0x0001, 0x0003);
-			memTable.Add(0x010200000000, 0x0002, 0x0004);
-			memTable.Add(0x010300000000, 0x0001, 0x0005);
-		}
-
-		private ulong GetHash(ulong hash) {
-			return _ptableVersion == PTableVersions.IndexV1 ? hash >> 32 : hash;
-		}
-
-		[Test]
-		public void the_table_has_five_items() {
-			Assert.AreEqual(5, PTable.Count);
-		}
-
-		[Test]
-		public void the_first_item_can_be_found() {
-			long position;
-			Assert.IsTrue(PTable.TryGetOneValue(0x010100000000, 0x0001, out position));
-			Assert.AreEqual(0x0001, position);
-		}
-
-		[Test]
-		public void the_second_item_can_be_found() {
-			long position;
-			Assert.IsTrue(PTable.TryGetOneValue(0x010200000000, 0x0001, out position));
-			Assert.AreEqual(0x0003, position);
-		}
-
-		[Test]
-		public void the_third_item_can_be_found() {
-			long position;
-			Assert.IsTrue(PTable.TryGetOneValue(0x010200000000, 0x0002, out position));
-			Assert.AreEqual(0x0004, position);
-		}
-
-		[Test]
-		public void the_fourth_item_can_be_found() {
-			long position;
-			Assert.IsTrue(PTable.TryGetOneValue(0x010200000000, 0x0002, out position));
-			Assert.AreEqual(0x0004, position);
-		}
-
-
-		[Test]
-		public void the_fifth_item_can_be_found() {
-			long position;
-			Assert.IsTrue(PTable.TryGetOneValue(0x010500000000, 0x0001, out position));
-			Assert.AreEqual(0x0002, position);
-		}
-
-		[Test]
-		public void non_existent_item_cannot_be_found() {
-			long position;
-			Assert.IsFalse(PTable.TryGetOneValue(0x0106, 0x0001, out position));
-		}
-
-		[Test]
-		public void range_query_returns_correct_items() {
-			// for now events are returned in order from larger key to lower
-			var items = PTable.GetRange(0x010200000000, 0x0000, 0x0010).ToArray();
-			Assert.That(items.Length, Is.EqualTo(2));
-			Assert.That(items[1].Stream, Is.EqualTo(GetHash(0x010200000000)));
-			Assert.That(items[1].Version, Is.EqualTo(0x0001));
-			Assert.That(items[1].Position, Is.EqualTo(0x0003));
-			Assert.That(items[0].Stream, Is.EqualTo(GetHash(0x010200000000)));
-			Assert.That(items[0].Version, Is.EqualTo(0x0002));
-			Assert.That(items[0].Position, Is.EqualTo(0x0004));
-		}
-
-		[Test]
-		public void range_query_returns_correct_item1() {
-			var items = PTable.GetRange(0x010200000000, 0x0000, 0x0001).ToArray();
-			Assert.That(items.Length, Is.EqualTo(1));
-			Assert.That(items[0].Stream, Is.EqualTo(GetHash(0x010200000000)));
-			Assert.That(items[0].Version, Is.EqualTo(0x0001));
-			Assert.That(items[0].Position, Is.EqualTo(0x0003));
-		}
-
-		[Test]
-		public void range_query_returns_correct_item2() {
-			var items = PTable.GetRange(0x010200000000, 0x0002, 0x0010).ToArray();
-			Assert.That(items.Length, Is.EqualTo(1));
-			Assert.That(items[0].Stream, Is.EqualTo(GetHash(0x010200000000)));
-			Assert.That(items[0].Version, Is.EqualTo(0x0002));
-			Assert.That(items[0].Position, Is.EqualTo(0x0004));
-		}
-
-		[Test]
-		public void range_query_returns_no_items_when_no_stream_in_sstable() {
-			var items = PTable.GetRange(0x0104, 0x0000, 0x0010);
-			Assert.That(items.Count(), Is.EqualTo(0));
-		}
-
-		[Test]
-		public void range_query_returns_items_when_startkey_is_less_than_current_min() {
-			var items = PTable.GetRange(0x010100000000, 0x0000, 0x0010).ToArray();
-			Assert.That(items.Length, Is.EqualTo(1));
-			Assert.That(items[0].Stream, Is.EqualTo(GetHash(0x010100000000)));
-			Assert.That(items[0].Version, Is.EqualTo(0x0001));
-			Assert.That(items[0].Position, Is.EqualTo(0x0001));
-		}
-
-		[Test]
-		public void range_query_returns_items_when_endkey_is_greater_than_current_max() {
-			var items = PTable.GetRange(0x010500000000, 0x0000, 0x0010).ToArray();
-			Assert.That(items.Length, Is.EqualTo(1));
-			Assert.That(items[0].Stream, Is.EqualTo(GetHash(0x010500000000)));
-			Assert.That(items[0].Version, Is.EqualTo(0x0001));
-			Assert.That(items[0].Position, Is.EqualTo(0x0002));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/ptable_should.cs b/src/EventStore.Core.Tests/Index/IndexV1/ptable_should.cs
deleted file mode 100644
index 4f38cb2547f..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/ptable_should.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class ptable_should : SpecificationWithFilePerTestFixture {
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-		private PTable _ptable;
-		private bool _skipIndexVerify;
-
-		public ptable_should(byte version, bool skipIndexVerify) {
-			_ptableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var table = new HashListMemTable(_ptableVersion, maxSize: 10);
-			table.Add(0x010100000000, 0x0001, 0x0001);
-			_ptable = PTable.FromMemtable(table, Filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, cacheDepth: 0, skipIndexVerify: _skipIndexVerify);
-		}
-
-		public override void TestFixtureTearDown() {
-			_ptable.Dispose();
-			base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_on_range_query_when_provided_with_negative_start_version() {
-			Assert.Throws<ArgumentOutOfRangeException>(() => _ptable.GetRange(0x0000, -1, long.MaxValue).ToArray());
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_on_range_query_when_provided_with_negative_end_version() {
-			Assert.Throws<ArgumentOutOfRangeException>(() => _ptable.GetRange(0x0000, 0, -1).ToArray());
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_on_get_one_entry_query_when_provided_with_negative_version() {
-			long pos;
-			Assert.Throws<ArgumentOutOfRangeException>(() => _ptable.TryGetOneValue(0x0000, -1, out pos));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/saving_index_with_single_item_to_a_file.cs b/src/EventStore.Core.Tests/Index/IndexV1/saving_index_with_single_item_to_a_file.cs
deleted file mode 100644
index 5a51991a195..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/saving_index_with_single_item_to_a_file.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using EventStore.Core.Util;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2)]
-	[TestFixture(PTableVersions.IndexV3)]
-	[TestFixture(PTableVersions.IndexV4)]
-	public class saving_index_with_single_item_to_a_file : SpecificationWithDirectoryPerTestFixture {
-		private string _filename;
-		private IndexMap _map;
-		private string _tablename;
-		private string _mergeFile;
-		private MergeResult _result;
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-		private int _maxAutoMergeIndexLevel = 4;
-
-		public saving_index_with_single_item_to_a_file(byte version) {
-			_ptableVersion = version;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_filename = GetFilePathFor("indexfile");
-			_tablename = GetTempFilePath();
-			_mergeFile = GetFilePathFor("outputfile");
-
-			_map = IndexMapTestFactory.FromFile(_filename, maxAutoMergeLevel: _maxAutoMergeIndexLevel);
-			var memtable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			memtable.Add(0, 2, 7);
-			var table = PTable.FromMemtable(memtable, _tablename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault);
-			_result = _map.AddAndMergePTable(table, 7, 11,
-				new FakeFilenameProvider(_mergeFile), _ptableVersion, 0);
-			_result.MergedMap.SaveToFile(_filename);
-			_result.ToDelete.ForEach(x => x.Dispose());
-			_result.MergedMap.InOrder().ToList().ForEach(x => x.Dispose());
-			table.Dispose();
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_result.ToDelete.ForEach(x => x.MarkForDestruction());
-			_result.MergedMap.InOrder().ToList().ForEach(x => x.MarkForDestruction());
-			_result.MergedMap.InOrder().ToList().ForEach(x => x.WaitForDisposal(1000));
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void the_file_exists() {
-			Assert.IsTrue(File.Exists(_filename));
-		}
-
-		[Test]
-		public void the_file_contains_correct_data() {
-			using (var fs = File.OpenRead(_filename))
-			using (var reader = new StreamReader(fs)) {
-				var text = reader.ReadToEnd();
-				var lines = text.Replace("\r", "").Split('\n');
-
-				fs.Position = 32;
-				var md5 = MD5Hash.GetHashFor(fs);
-				var md5String = BitConverter.ToString(md5).Replace("-", "");
-
-				Assert.AreEqual(6, lines.Count());
-				Assert.AreEqual(md5String, lines[0]);
-				Assert.AreEqual(_map.Version.ToString(), lines[1]);
-				Assert.AreEqual("7/11", lines[2]);
-				Assert.AreEqual(_maxAutoMergeIndexLevel.ToString(), lines[3]);
-				Assert.AreEqual("0,0," + Path.GetFileName(_tablename), lines[4]);
-				Assert.AreEqual("", lines[5]);
-			}
-		}
-
-		[Test]
-		public void saved_file_could_be_read_correctly_and_without_errors() {
-			var map = IndexMapTestFactory.FromFile(_filename, maxAutoMergeLevel: _maxAutoMergeIndexLevel);
-			map.InOrder().ToList().ForEach(x => x.Dispose());
-
-			Assert.AreEqual(7, map.PrepareCheckpoint);
-			Assert.AreEqual(11, map.CommitCheckpoint);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/saving_index_with_six_items_to_a_file.cs b/src/EventStore.Core.Tests/Index/IndexV1/saving_index_with_six_items_to_a_file.cs
deleted file mode 100644
index a9ae4755387..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/saving_index_with_six_items_to_a_file.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using EventStore.Core.Util;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV3)]
-	[TestFixture(PTableVersions.IndexV4)]
-	public class saving_index_with_six_items_to_a_file : SpecificationWithDirectory {
-		private string _filename;
-		private string _tablename;
-		private string _mergeFile;
-		private IndexMap _map;
-		private MergeResult _result;
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-
-		public saving_index_with_six_items_to_a_file(byte version) {
-			_ptableVersion = version;
-		}
-
-		[SetUp]
-		public override async Task SetUp() {
-			await base.SetUp();
-
-			_filename = GetFilePathFor("indexfile");
-			_tablename = GetTempFilePath();
-			_mergeFile = GetFilePathFor("outfile");
-
-			_map = IndexMapTestFactory.FromFile(_filename, maxTablesPerLevel: 4);
-			var memtable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			memtable.Add(0, 2, 123);
-			var table = PTable.FromMemtable(memtable, _tablename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault);
-			_result = _map.AddAndMergePTable(table, 0, 0,
-				new FakeFilenameProvider(_mergeFile), _ptableVersion, 0);
-			_result = _result.MergedMap.AddAndMergePTable(table, 0, 0,
-				new FakeFilenameProvider(_mergeFile), _ptableVersion, 0);
-			_result = _result.MergedMap.AddAndMergePTable(table, 0, 0,
-				new FakeFilenameProvider(_mergeFile), _ptableVersion, 0);
-			var merged = _result.MergedMap.AddAndMergePTable(table, 0, 0,
-				new FakeFilenameProvider(_mergeFile), _ptableVersion, 0);
-			_result = merged.MergedMap.AddAndMergePTable(table, 0, 0,
-				new FakeFilenameProvider(_mergeFile), _ptableVersion, 0);
-			_result = _result.MergedMap.AddAndMergePTable(table, 7, 11,
-				new FakeFilenameProvider(_mergeFile), _ptableVersion, 0);
-			_result.MergedMap.SaveToFile(_filename);
-
-			table.Dispose();
-
-			merged.MergedMap.InOrder().ToList().ForEach(x => x.Dispose());
-			merged.ToDelete.ForEach(x => x.Dispose());
-
-			_result.MergedMap.InOrder().ToList().ForEach(x => x.Dispose());
-			_result.ToDelete.ForEach(x => x.Dispose());
-		}
-
-		[Test]
-		public void the_file_exists() {
-			Assert.IsTrue(File.Exists(_filename));
-		}
-
-		[Test]
-		public void the_file_contains_correct_data() {
-			using (var fs = File.OpenRead(_filename))
-			using (var reader = new StreamReader(fs)) {
-				var text = reader.ReadToEnd();
-				var lines = text.Replace("\r", "").Split('\n');
-
-				fs.Position = 32;
-				var md5 = MD5Hash.GetHashFor(fs);
-				var md5String = BitConverter.ToString(md5).Replace("-", "");
-
-				Assert.AreEqual(8, lines.Count());
-				Assert.AreEqual(md5String, lines[0]);
-				Assert.AreEqual(_map.Version.ToString(), lines[1]);
-				Assert.AreEqual("7/11", lines[2]);
-				Assert.AreEqual(int.MaxValue.ToString(), lines[3]);
-				var name = new FileInfo(_tablename).Name;
-				Assert.AreEqual("0,0," + name, lines[4]);
-				Assert.AreEqual("0,1," + name, lines[5]);
-				Assert.AreEqual("1,0," + Path.GetFileName(_mergeFile), lines[6]);
-				Assert.AreEqual("", lines[7]);
-			}
-		}
-
-		[Test]
-		public void saved_file_could_be_read_correctly_and_without_errors() {
-			var map = IndexMapTestFactory.FromFile(_filename);
-			map.InOrder().ToList().ForEach(x => x.Dispose());
-
-			Assert.AreEqual(7, map.PrepareCheckpoint);
-			Assert.AreEqual(11, map.CommitCheckpoint);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/table_index_on_range_query.cs b/src/EventStore.Core.Tests/Index/IndexV1/table_index_on_range_query.cs
deleted file mode 100644
index d55eb1e461e..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/table_index_on_range_query.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using NUnit.Framework;
-using EventStore.Core.Index.Hashes;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class table_index_on_range_query : SpecificationWithDirectoryPerTestFixture {
-		private TableIndex<string> _tableIndex;
-		private IHasher<string> _lowHasher;
-		private IHasher<string> _highHasher;
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-		private bool _skipIndexVerify;
-
-		public table_index_on_range_query(byte version, bool skipIndexVerify) {
-			_ptableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_lowHasher = new XXHashUnsafe();
-			_highHasher = new Murmur3AUnsafe();
-			_tableIndex = new TableIndex<string>(PathName, _lowHasher, _highHasher, "",
-				() => new HashListMemTable(version: _ptableVersion, maxSize: 40),
-				() => { throw new InvalidOperationException(); },
-				_ptableVersion,
-				5, Constants.PTableMaxReaderCountDefault,
-				maxSizeForMemory: 5,
-				skipIndexVerify: _skipIndexVerify);
-			_tableIndex.Initialize(long.MaxValue);
-
-			_tableIndex.Add(0, "0xDEAD", 0, 0xFF00);
-			_tableIndex.Add(0, "0xDEAD", 1, 0xFF01);
-
-			_tableIndex.Add(0, "0xJEEP", 0, 0xFF00);
-			_tableIndex.Add(0, "0xJEEP", 1, 0xFF01);
-
-			_tableIndex.Add(0, "0xABBA", 0, 0xFF00);
-			_tableIndex.Add(0, "0xABBA", 1, 0xFF01);
-			_tableIndex.Add(0, "0xABBA", 2, 0xFF02);
-			_tableIndex.Add(0, "0xABBA", 3, 0xFF03);
-
-			_tableIndex.Add(0, "0xDEAD", 0, 0xFF10);
-			_tableIndex.Add(0, "0xDEAD", 1, 0xFF11);
-
-			_tableIndex.Add(0, "0xADA", 0, 0xFF00);
-
-			_tableIndex.Add(0, "0xJEEP", 2, 0xFFF0);
-			_tableIndex.Add(0, "0xJEEP", 3, 0xFFF1);
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_tableIndex.Close();
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void should_return_empty_collection_when_stream_is_not_in_db() {
-			var res = _tableIndex.GetRange("0xFEED", 0, 100);
-			Assert.That(res, Is.Empty);
-		}
-
-		[Test]
-		public void should_return_all_applicable_elements_in_correct_order() {
-			var res = _tableIndex.GetRange("0xJEEP", 0, 100).ToList();
-			ulong hash = (ulong)_lowHasher.Hash("0xJEEP");
-			hash = _ptableVersion == PTableVersions.IndexV1 ? hash : hash << 32 | _highHasher.Hash("0xJEEP");
-			Assert.That(res.Count(), Is.EqualTo(4));
-
-			Assert.That(res[0].Stream, Is.EqualTo(hash));
-			Assert.That(res[0].Version, Is.EqualTo(3));
-			Assert.That(res[0].Position, Is.EqualTo(0xFFF1));
-
-			Assert.That(res[1].Stream, Is.EqualTo(hash));
-			Assert.That(res[1].Version, Is.EqualTo(2));
-			Assert.That(res[1].Position, Is.EqualTo(0xFFF0));
-
-			Assert.That(res[2].Stream, Is.EqualTo(hash));
-			Assert.That(res[2].Version, Is.EqualTo(1));
-			Assert.That(res[2].Position, Is.EqualTo(0xFF01));
-
-			Assert.That(res[3].Stream, Is.EqualTo(hash));
-			Assert.That(res[3].Version, Is.EqualTo(0));
-			Assert.That(res[3].Position, Is.EqualTo(0xFF00));
-		}
-
-		[Test]
-		public void should_return_all_elements_with_hash_collisions_in_correct_order() {
-			var res = _tableIndex.GetRange("0xDEAD", 0, 100).ToList();
-			ulong hash = (ulong)_lowHasher.Hash("0xDEAD");
-			hash = _ptableVersion == PTableVersions.IndexV1 ? hash : hash << 32 | _highHasher.Hash("0xDEAD");
-			Assert.That(res.Count(), Is.EqualTo(4));
-			Assert.That(res[0].Stream, Is.EqualTo(hash));
-			Assert.That(res[0].Version, Is.EqualTo(1));
-			Assert.That(res[0].Position, Is.EqualTo(0xFF11));
-
-			Assert.That(res[1].Stream, Is.EqualTo(hash));
-			Assert.That(res[1].Version, Is.EqualTo(1));
-			Assert.That(res[1].Position, Is.EqualTo(0xFF01));
-
-			Assert.That(res[2].Stream, Is.EqualTo(hash));
-			Assert.That(res[2].Version, Is.EqualTo(0));
-			Assert.That(res[2].Position, Is.EqualTo(0xFF10));
-
-			Assert.That(res[3].Stream, Is.EqualTo(hash));
-			Assert.That(res[3].Version, Is.EqualTo(0));
-			Assert.That(res[3].Position, Is.EqualTo(0xFF00));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/table_index_on_try_get_one_value_query.cs b/src/EventStore.Core.Tests/Index/IndexV1/table_index_on_try_get_one_value_query.cs
deleted file mode 100644
index 1c959a36d73..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/table_index_on_try_get_one_value_query.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.TransactionLog;
-using NUnit.Framework;
-using EventStore.Core.Index.Hashes;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class table_index_on_try_get_one_value_query : SpecificationWithDirectoryPerTestFixture {
-		private TableIndex<string> _tableIndex;
-		private IHasher<string> _lowHasher;
-		private IHasher<string> _highHasher;
-		private string _indexDir;
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-		private bool _skipIndexVerify;
-
-		public table_index_on_try_get_one_value_query(byte version, bool skipIndexVerify) {
-			_ptableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_indexDir = PathName;
-			var fakeReader = new TFReaderLease(new FakeTfReader());
-			_lowHasher = new XXHashUnsafe();
-			_highHasher = new Murmur3AUnsafe();
-			_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
-				() => new HashListMemTable(_ptableVersion, maxSize: 10),
-				() => fakeReader,
-				_ptableVersion,
-				5, Constants.PTableMaxReaderCountDefault,
-				maxSizeForMemory: 5,
-				skipIndexVerify: _skipIndexVerify);
-			_tableIndex.Initialize(long.MaxValue);
-
-			_tableIndex.Add(0, "0xDEAD", 0, 0xFF00);
-			_tableIndex.Add(0, "0xDEAD", 1, 0xFF01);
-
-			_tableIndex.Add(0, "0xBEEF", 0, 0xFF00);
-			_tableIndex.Add(0, "0xBEEF", 1, 0xFF01);
-
-			_tableIndex.Add(0, "0xABBA", 0, 0xFF00); // 1st ptable0
-
-			_tableIndex.Add(0, "0xABBA", 1, 0xFF01);
-			_tableIndex.Add(0, "0xABBA", 2, 0xFF02);
-			_tableIndex.Add(0, "0xABBA", 3, 0xFF03);
-
-			_tableIndex.Add(0, "0xADA", 0,
-				0xFF00); // simulates duplicate due to concurrency in TableIndex (see memtable below)
-			_tableIndex.Add(0, "0xDEAD", 0, 0xFF10); // 2nd ptable0
-
-			_tableIndex.Add(0, "0xDEAD", 1, 0xFF11); // in memtable
-			_tableIndex.Add(0, "0xADA", 0, 0xFF00); // in memtable
-		}
-
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_tableIndex.Close();
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void should_return_empty_collection_when_stream_is_not_in_db() {
-			long position;
-			Assert.IsFalse(_tableIndex.TryGetOneValue("0xFEED", 0, out position));
-		}
-
-		[Test]
-		public void should_return_element_with_largest_position_when_hash_collisions() {
-			long position;
-			Assert.IsTrue(_tableIndex.TryGetOneValue("0xDEAD", 0, out position));
-			Assert.AreEqual(0xFF10, position);
-		}
-
-		[Test]
-		public void should_return_only_one_element_if_concurrency_duplicate_happens_on_range_query_as_well() {
-			var res = _tableIndex.GetRange("0xADA", 0, 100).ToList();
-			ulong hash = (ulong)_lowHasher.Hash("0xADA");
-			hash = _ptableVersion == PTableVersions.IndexV1 ? hash : hash << 32 | _highHasher.Hash("0xADA");
-			Assert.That(res.Count(), Is.EqualTo(1));
-			Assert.That(res[0].Stream, Is.EqualTo(hash));
-			Assert.That(res[0].Version, Is.EqualTo(0));
-			Assert.That(res[0].Position, Is.EqualTo(0xFF00));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/table_index_should.cs b/src/EventStore.Core.Tests/Index/IndexV1/table_index_should.cs
deleted file mode 100644
index 7e2fe0c371e..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/table_index_should.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using NUnit.Framework;
-using EventStore.Core.Index.Hashes;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class table_index_should : SpecificationWithDirectoryPerTestFixture {
-		private TableIndex<string> _tableIndex;
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-		private bool _skipIndexVerify;
-
-		public table_index_should(byte version, bool skipIndexVerify) {
-			_ptableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			var lowHasher = new XXHashUnsafe();
-			var highHasher = new Murmur3AUnsafe();
-			_tableIndex = new TableIndex<string>(PathName, lowHasher, highHasher, "",
-				() => new HashListMemTable(_ptableVersion, maxSize: 20),
-				() => { throw new InvalidOperationException(); },
-				_ptableVersion,
-				5, Constants.PTableMaxReaderCountDefault,
-				maxSizeForMemory: 10,
-				skipIndexVerify: _skipIndexVerify);
-			_tableIndex.Initialize(long.MaxValue);
-		}
-
-		public override Task TestFixtureTearDown() {
-			_tableIndex.Close();
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_on_range_query_when_provided_with_negative_start_version() {
-			Assert.Throws<ArgumentOutOfRangeException>(
-				() => _tableIndex.GetRange("0x0000", -1, long.MaxValue).ToArray());
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_on_range_query_when_provided_with_negative_end_version() {
-			Assert.Throws<ArgumentOutOfRangeException>(() => _tableIndex.GetRange("0x0000", 0, -1).ToArray());
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_on_get_one_entry_query_when_provided_with_negative_version() {
-			long pos;
-			Assert.Throws<ArgumentOutOfRangeException>(() => _tableIndex.TryGetOneValue("0x0000", -1, out pos));
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_on_adding_entry_with_negative_commit_position() {
-			Assert.Throws<ArgumentOutOfRangeException>(() => _tableIndex.Add(-1, "0x0000", 0, 0));
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_on_adding_entry_with_negative_version() {
-			Assert.Throws<ArgumentOutOfRangeException>(() => _tableIndex.Add(0, "0x0000", -1, 0));
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_on_adding_entry_with_negative_position() {
-			Assert.Throws<ArgumentOutOfRangeException>(() => _tableIndex.Add(0, "0x0000", 0, -1));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/table_index_with_corrupt_index_entries_should.cs b/src/EventStore.Core.Tests/Index/IndexV1/table_index_with_corrupt_index_entries_should.cs
deleted file mode 100644
index 5ae1c3c94fb..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/table_index_with_corrupt_index_entries_should.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Index;
-using NUnit.Framework;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.Tests.Fakes;
-using System.IO;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using EventStore.Core.Exceptions;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture]
-	public class table_index_with_corrupt_index_entries_should : SpecificationWithDirectoryPerTestFixture {
-		private TableIndex<string> _tableIndex;
-		private IndexMap _indexMap;
-		public const string StreamName = "stream";
-		public const int NumIndexEntries = 512;
-
-		public void ConstructTableIndexWithCorruptIndexEntries(byte version, bool skipIndexVerify,
-			bool createForceVerifyFile = false) {
-			var lowHasher = new XXHashUnsafe();
-			var highHasher = new Murmur3AUnsafe();
-			var fakeReader = new TFReaderLease(new FakeIndexReader());
-
-			_tableIndex = new TableIndex<string>(PathName, lowHasher, highHasher, "",
-				() => new HashListMemTable(version, maxSize: NumIndexEntries),
-				() => fakeReader,
-				version,
-				int.MaxValue, Constants.PTableMaxReaderCountDefault,
-				maxSizeForMemory: NumIndexEntries,
-				skipIndexVerify: skipIndexVerify);
-			_tableIndex.Initialize(long.MaxValue);
-
-			//create index entries
-			for (int i = 1; i <= NumIndexEntries; i++) {
-				_tableIndex.Add(i * 1337, StreamName, i, i * 1337);
-			}
-
-			_tableIndex.Close(false);
-
-			//load index map to obtain ptable filenames
-			_indexMap = IndexMapTestFactory.FromFile(Path.Combine(PathName, TableIndex.IndexMapFilename));
-			List<string> ptableFiles = new List<string>();
-
-			foreach (string ptableFilename in _indexMap.GetAllFilenames()) {
-				ptableFiles.Add(ptableFilename);
-			}
-
-			_indexMap.Dispose(TimeSpan.FromSeconds(5));
-
-			//corrupt ptable files
-			foreach (string ptableFilename in ptableFiles) {
-				CorruptPTableFile(ptableFilename, version, "zeroOutMiddleEntry");
-			}
-
-			//create force verify file if requested
-			if (createForceVerifyFile) {
-				using (FileStream fs = new FileStream(Path.Combine(PathName, TableIndex.ForceIndexVerifyFilename),
-					FileMode.OpenOrCreate)) {
-				}
-
-				;
-			}
-
-			//load table index again
-			_tableIndex = new TableIndex<string>(PathName, lowHasher, highHasher, "",
-				() => new HashListMemTable(version, maxSize: NumIndexEntries),
-				() => fakeReader,
-				version,
-				int.MaxValue, Constants.PTableMaxReaderCountDefault,
-				maxSizeForMemory: NumIndexEntries,
-				skipIndexVerify: skipIndexVerify,
-				indexCacheDepth: 8);
-			_tableIndex.Initialize(long.MaxValue);
-		}
-
-		[TearDown]
-		public void TearDown() {
-			_tableIndex.Close();
-		}
-
-		private ulong GetOriginalHash(ulong stream, byte version) {
-			if (version == PTableVersions.IndexV1)
-				return stream << 32;
-			else
-				return stream;
-		}
-
-		private void CorruptPTableFile(string ptableFile, byte version, string corruptionType) {
-			int indexEntrySize = 0;
-			if (version == PTableVersions.IndexV1)
-				indexEntrySize = PTable.IndexEntryV1Size;
-			else if (version == PTableVersions.IndexV2)
-				indexEntrySize = PTable.IndexEntryV2Size;
-			else if (version == PTableVersions.IndexV3)
-				indexEntrySize = PTable.IndexEntryV3Size;
-			else if (version == PTableVersions.IndexV4)
-				indexEntrySize = PTable.IndexEntryV4Size;
-
-			int indexEntryKeySize = 0;
-			if (version == PTableVersions.IndexV1)
-				indexEntryKeySize = PTable.IndexKeyV1Size;
-			else if (version == PTableVersions.IndexV2)
-				indexEntryKeySize = PTable.IndexKeyV2Size;
-			else if (version == PTableVersions.IndexV3)
-				indexEntryKeySize = PTable.IndexKeyV3Size;
-			else if (version == PTableVersions.IndexV4)
-				indexEntryKeySize = PTable.IndexKeyV4Size;
-
-			byte[] data = new byte[255];
-
-			using (FileStream stream = File.Open(ptableFile, FileMode.Open)) {
-				if (corruptionType == "zeroOutMiddleEntry") {
-					//zeroes out the middle entry - useful for binary search tests
-					List<int> indexEntriesToCorrupt = new List<int>();
-					indexEntriesToCorrupt.Add(NumIndexEntries / 2 - 1);
-
-					foreach (int entry in indexEntriesToCorrupt) {
-						stream.Seek(PTableHeader.Size + entry * indexEntrySize, SeekOrigin.Begin);
-						//modify one of the index entry hashes/version
-						stream.Write(data, 0, indexEntryKeySize);
-
-						if (version >= PTableVersions.IndexV4) {
-							//modify one of the midpoint entry hashes/version
-							stream.Seek(PTableHeader.Size + NumIndexEntries * indexEntrySize + entry * indexEntrySize,
-								SeekOrigin.Begin);
-							stream.Write(data, 0, indexEntryKeySize);
-						}
-					}
-				}
-			}
-		}
-
-		[TestCase(PTableVersions.IndexV2)]
-		[TestCase(PTableVersions.IndexV3)]
-		[TestCase(PTableVersions.IndexV4)]
-		public void throws_corrupt_index_exception_if_verification_enabled(byte version) {
-			//the CorruptIndexException is caught internally and should trigger an index file deletion if caught
-			ConstructTableIndexWithCorruptIndexEntries(version, false);
-			//index map file should be deleted if index verification fails
-			Assert.False(File.Exists(Path.Combine(PathName, TableIndex.IndexMapFilename)));
-			//force verify file should be cleared after rebuild/verification
-			Assert.False(File.Exists(Path.Combine(PathName, TableIndex.ForceIndexVerifyFilename)));
-		}
-
-		[TestCase(PTableVersions.IndexV2)]
-		[TestCase(PTableVersions.IndexV3)]
-		[TestCase(PTableVersions.IndexV4)]
-		public void throws_maybe_corrupt_index_exception_if_verification_disabled(byte version) {
-			//the MaybeCorruptIndexException is caught internally and should trigger an index file deletion if caught
-
-			ConstructTableIndexWithCorruptIndexEntries(version, true);
-			Assert.Throws<MaybeCorruptIndexException>(() => {
-				//since index entries are sorted in descending order, the corrupted index entry corresponds to NumIndexEntries/2+1
-				_tableIndex.GetRange(StreamName, NumIndexEntries / 2 + 1, NumIndexEntries / 2 + 1, null).ToArray();
-			});
-
-			//force verify file should be created
-			Assert.True(File.Exists(Path.Combine(PathName, TableIndex.ForceIndexVerifyFilename)));
-		}
-
-		[TestCase(PTableVersions.IndexV2)]
-		[TestCase(PTableVersions.IndexV3)]
-		[TestCase(PTableVersions.IndexV4)]
-		public void force_verification_of_index_if_verification_disabled_but_force_verification_file_present(
-			byte version) {
-			//the CorruptIndexException is caught internally and should trigger an index file deletion if caught
-			ConstructTableIndexWithCorruptIndexEntries(version, true, createForceVerifyFile: true);
-
-			//index map file should be deleted if index verification fails
-			Assert.False(File.Exists(Path.Combine(PathName, TableIndex.IndexMapFilename)));
-			//force verify file should be cleared after rebuild/verification
-			Assert.False(File.Exists(Path.Combine(PathName, TableIndex.ForceIndexVerifyFilename)));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/table_index_with_two_ptables_and_memtable_on_range_query.cs b/src/EventStore.Core.Tests/Index/IndexV1/table_index_with_two_ptables_and_memtable_on_range_query.cs
deleted file mode 100644
index c8cfde2ece3..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/table_index_with_two_ptables_and_memtable_on_range_query.cs
+++ /dev/null
@@ -1,283 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.TransactionLog;
-using NUnit.Framework;
-using EventStore.Core.Index.Hashes;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false), Category("LongRunning")]
-	[TestFixture(PTableVersions.IndexV2, true), Category("LongRunning")]
-	[TestFixture(PTableVersions.IndexV3, false), Category("LongRunning")]
-	[TestFixture(PTableVersions.IndexV3, true), Category("LongRunning")]
-	[TestFixture(PTableVersions.IndexV4, false), Category("LongRunning")]
-	[TestFixture(PTableVersions.IndexV4, true), Category("LongRunning")]
-	public class table_index_with_two_ptables_and_memtable_on_range_query : SpecificationWithDirectoryPerTestFixture {
-		private TableIndex<string> _tableIndex;
-		private IHasher<string> _lowHasher;
-		private IHasher<string> _highHasher;
-		private string _indexDir;
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-		private bool _skipIndexVerify;
-
-		public table_index_with_two_ptables_and_memtable_on_range_query(byte version, bool skipIndexVerify) {
-			_ptableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_indexDir = PathName;
-			var fakeReader = new TFReaderLease(new FakeIndexReader());
-			_lowHasher = new FakeIndexHasher();
-			_highHasher = new FakeIndexHasher();
-			_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
-				() => new HashListMemTable(_ptableVersion, maxSize: 10),
-				() => fakeReader,
-				_ptableVersion,
-				5, Constants.PTableMaxReaderCountDefault,
-				maxSizeForMemory: 2,
-				maxTablesPerLevel: 2,
-				skipIndexVerify: _skipIndexVerify);
-			_tableIndex.Initialize(long.MaxValue);
-
-			// ptable level 2
-			_tableIndex.Add(0, "1", 0, 0xFF00);
-			_tableIndex.Add(0, "1", 1, 0xFF01);
-			_tableIndex.Add(0, "2", 0, 0xFF00);
-			_tableIndex.Add(0, "2", 1, 0xFF01);
-			_tableIndex.Add(0, "3", 0, 0xFF00);
-			_tableIndex.Add(0, "3", 1, 0xFF01);
-			_tableIndex.Add(0, "3", 0, 0xFF02);
-			_tableIndex.Add(0, "3", 1, 0xFF03);
-
-			// ptable level 1
-			_tableIndex.Add(0, "4", 0, 0xFF00);
-			_tableIndex.Add(0, "5", 10, 0xFFF1);
-			_tableIndex.Add(0, "6", 0, 0xFF00);
-			_tableIndex.Add(0, "1", 0, 0xFF10);
-
-			// ptable level 0
-			_tableIndex.Add(0, "6", 1, 0xFF01);
-			_tableIndex.Add(0, "1", 1, 0xFF11);
-
-			// memtable
-			_tableIndex.Add(0, "4", 0, 0xFF01);
-
-			await Task.Delay(500);
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_tableIndex.Close();
-
-			return base.TestFixtureTearDown();
-		}
-
-		private ulong GetHash(string streamId) {
-			ulong hash = _lowHasher.Hash(streamId);
-			hash = _ptableVersion == PTableVersions.IndexV1 ? hash : hash << 32 | _highHasher.Hash(streamId);
-			return hash;
-		}
-
-		[Test]
-		public void should_not_return_latest_entry_for_nonexisting_stream() {
-			IndexEntry entry;
-			Assert.IsFalse(_tableIndex.TryGetLatestEntry("7", out entry));
-		}
-
-		[Test]
-		public void should_not_return_oldest_entry_for_nonexisting_stream() {
-			IndexEntry entry;
-			Assert.IsFalse(_tableIndex.TryGetLatestEntry("7", out entry));
-		}
-
-		[Test]
-		public void should_return_correct_latest_entry_for_stream_with_latest_entry_in_memtable() {
-			IndexEntry entry;
-			Assert.IsTrue(_tableIndex.TryGetLatestEntry("4", out entry));
-			Assert.AreEqual(GetHash("4"), entry.Stream);
-			Assert.AreEqual(0, entry.Version);
-			Assert.AreEqual(0xFF01, entry.Position);
-		}
-
-		[Test]
-		public void should_return_correct_latest_entry_for_stream_with_latest_entry_in_ptable_0() {
-			IndexEntry entry;
-			Assert.IsTrue(_tableIndex.TryGetLatestEntry("1", out entry));
-			Assert.AreEqual(GetHash("1"), entry.Stream);
-			Assert.AreEqual(1, entry.Version);
-			Assert.AreEqual(0xFF11, entry.Position);
-		}
-
-		[Test]
-		public void should_return_correct_latest_entry_for_another_stream_with_latest_entry_in_ptable_0() {
-			IndexEntry entry;
-			Assert.IsTrue(_tableIndex.TryGetLatestEntry("6", out entry));
-			Assert.AreEqual(GetHash("6"), entry.Stream);
-			Assert.AreEqual(1, entry.Version);
-			Assert.AreEqual(0xFF01, entry.Position);
-		}
-
-		[Test]
-		public void should_return_correct_latest_entry_for_stream_with_latest_entry_in_ptable_1() {
-			IndexEntry entry;
-			Assert.IsTrue(_tableIndex.TryGetLatestEntry("5", out entry));
-			Assert.AreEqual(GetHash("5"), entry.Stream);
-			Assert.AreEqual(10, entry.Version);
-			Assert.AreEqual(0xFFF1, entry.Position);
-		}
-
-		[Test]
-		public void should_return_correct_latest_entry_for_stream_with_latest_entry_in_ptable_2() {
-			IndexEntry entry;
-			Assert.IsTrue(_tableIndex.TryGetLatestEntry("2", out entry));
-			Assert.AreEqual(GetHash("2"), entry.Stream);
-			Assert.AreEqual(1, entry.Version);
-			Assert.AreEqual(0xFF01, entry.Position);
-		}
-
-		[Test]
-		public void should_return_correct_latest_entry_for_another_stream_with_latest_entry_in_ptable_2() {
-			IndexEntry entry;
-			Assert.IsTrue(_tableIndex.TryGetLatestEntry("3", out entry));
-			Assert.AreEqual(GetHash("3"), entry.Stream);
-			Assert.AreEqual(1, entry.Version);
-			Assert.AreEqual(0xFF03, entry.Position);
-		}
-
-		[Test]
-		public void should_return_correct_oldest_entries_for_each_stream() {
-			IndexEntry entry;
-
-			Assert.IsTrue(_tableIndex.TryGetOldestEntry("1", out entry));
-			Assert.AreEqual(GetHash("1"), entry.Stream);
-			Assert.AreEqual(0, entry.Version);
-			Assert.AreEqual(0xFF00, entry.Position);
-
-			Assert.IsTrue(_tableIndex.TryGetOldestEntry("2", out entry));
-			Assert.AreEqual(GetHash("2"), entry.Stream);
-			Assert.AreEqual(0, entry.Version);
-			Assert.AreEqual(0xFF00, entry.Position);
-
-			Assert.IsTrue(_tableIndex.TryGetOldestEntry("3", out entry));
-			Assert.AreEqual(GetHash("3"), entry.Stream);
-			Assert.AreEqual(0, entry.Version);
-			Assert.AreEqual(0xFF00, entry.Position);
-
-			Assert.IsTrue(_tableIndex.TryGetOldestEntry("4", out entry));
-			Assert.AreEqual(GetHash("4"), entry.Stream);
-			Assert.AreEqual(0, entry.Version);
-			Assert.AreEqual(0xFF00, entry.Position);
-
-			Assert.IsTrue(_tableIndex.TryGetOldestEntry("5", out entry));
-			Assert.AreEqual(GetHash("5"), entry.Stream);
-			Assert.AreEqual(10, entry.Version);
-			Assert.AreEqual(0xFFF1, entry.Position);
-
-			Assert.IsTrue(_tableIndex.TryGetOldestEntry("6", out entry));
-			Assert.AreEqual(GetHash("6"), entry.Stream);
-			Assert.AreEqual(0, entry.Version);
-			Assert.AreEqual(0xFF00, entry.Position);
-		}
-
-		[Test]
-		public void should_return_empty_range_for_nonexisting_stream() {
-			var range = _tableIndex.GetRange("7", 0, int.MaxValue).ToArray();
-			Assert.AreEqual(0, range.Length);
-		}
-
-		[Test]
-		public void should_return_correct_full_range_with_descending_order_for_1() {
-			var range = _tableIndex.GetRange("1", 0, long.MaxValue).ToArray();
-			Assert.AreEqual(4, range.Length);
-			Assert.AreEqual(new IndexEntry(GetHash("1"), 1, 0xFF11), range[0]);
-			Assert.AreEqual(new IndexEntry(GetHash("1"), 1, 0xFF01), range[1]);
-			Assert.AreEqual(new IndexEntry(GetHash("1"), 0, 0xFF10), range[2]);
-			Assert.AreEqual(new IndexEntry(GetHash("1"), 0, 0xFF00), range[3]);
-		}
-
-		[Test]
-		public void should_return_correct_full_range_with_descending_order_for_2() {
-			var range = _tableIndex.GetRange("2", 0, long.MaxValue).ToArray();
-			Assert.AreEqual(2, range.Length);
-			Assert.AreEqual(new IndexEntry(GetHash("2"), 1, 0xFF01), range[0]);
-			Assert.AreEqual(new IndexEntry(GetHash("2"), 0, 0xFF00), range[1]);
-		}
-
-		[Test]
-		public void should_return_correct_full_range_with_descending_order_for_3() {
-			var range = _tableIndex.GetRange("3", 0, long.MaxValue).ToArray();
-			Assert.AreEqual(4, range.Length);
-			Assert.AreEqual(new IndexEntry(GetHash("3"), 1, 0xFF03), range[0]);
-			Assert.AreEqual(new IndexEntry(GetHash("3"), 1, 0xFF01), range[1]);
-			Assert.AreEqual(new IndexEntry(GetHash("3"), 0, 0xFF02), range[2]);
-			Assert.AreEqual(new IndexEntry(GetHash("3"), 0, 0xFF00), range[3]);
-		}
-
-		[Test]
-		public void should_return_correct_full_range_with_descending_order_for_4() {
-			var range = _tableIndex.GetRange("4", 0, long.MaxValue).ToArray();
-			Assert.AreEqual(2, range.Length);
-			Assert.AreEqual(new IndexEntry(GetHash("4"), 0, 0xFF01), range[0]);
-			Assert.AreEqual(new IndexEntry(GetHash("4"), 0, 0xFF00), range[1]);
-		}
-
-		[Test]
-		public void should_return_correct_full_range_with_descending_order_for_5() {
-			var range = _tableIndex.GetRange("5", 0, long.MaxValue).ToArray();
-			Assert.AreEqual(1, range.Length);
-			Assert.AreEqual(new IndexEntry(GetHash("5"), 10, 0xFFF1), range[0]);
-		}
-
-		[Test]
-		public void should_return_correct_full_range_with_descending_order_for_6() {
-			var range = _tableIndex.GetRange("6", 0, long.MaxValue).ToArray();
-			Assert.AreEqual(2, range.Length);
-			Assert.AreEqual(new IndexEntry(GetHash("6"), 1, 0xFF01), range[0]);
-			Assert.AreEqual(new IndexEntry(GetHash("6"), 0, 0xFF00), range[1]);
-		}
-
-		[Test]
-		public void should_not_return_one_value_for_nonexistent_stream() {
-			long pos;
-			Assert.IsFalse(_tableIndex.TryGetOneValue("7", 0, out pos));
-		}
-
-		[Test]
-		public void should_return_one_value_for_existing_streams_for_existing_version() {
-			long pos;
-			Assert.IsTrue(_tableIndex.TryGetOneValue("1", 1, out pos));
-			Assert.AreEqual(0xFF11, pos);
-
-			Assert.IsTrue(_tableIndex.TryGetOneValue("2", 0, out pos));
-			Assert.AreEqual(0xFF00, pos);
-
-			Assert.IsTrue(_tableIndex.TryGetOneValue("3", 0, out pos));
-			Assert.AreEqual(0xFF02, pos);
-
-			Assert.IsTrue(_tableIndex.TryGetOneValue("4", 0, out pos));
-			Assert.AreEqual(0xFF01, pos);
-
-			Assert.IsTrue(_tableIndex.TryGetOneValue("5", 10, out pos));
-			Assert.AreEqual(0xFFF1, pos);
-
-			Assert.IsTrue(_tableIndex.TryGetOneValue("6", 1, out pos));
-			Assert.AreEqual(0xFF01, pos);
-		}
-
-		[Test]
-		public void should_not_return_one_value_for_existing_streams_for_nonexistent_version() {
-			long pos;
-			Assert.IsFalse(_tableIndex.TryGetOneValue("1", 2, out pos));
-			Assert.IsFalse(_tableIndex.TryGetOneValue("2", 2, out pos));
-			Assert.IsFalse(_tableIndex.TryGetOneValue("3", 2, out pos));
-			Assert.IsFalse(_tableIndex.TryGetOneValue("4", 1, out pos));
-			Assert.IsFalse(_tableIndex.TryGetOneValue("5", 0, out pos));
-			Assert.IsFalse(_tableIndex.TryGetOneValue("6", 2, out pos));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/when_a_ptable_header_is_corrupt_on_disk.cs b/src/EventStore.Core.Tests/Index/IndexV1/when_a_ptable_header_is_corrupt_on_disk.cs
deleted file mode 100644
index 994c51b92d8..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/when_a_ptable_header_is_corrupt_on_disk.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Core.Exceptions;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2)]
-	[TestFixture(PTableVersions.IndexV3)]
-	[TestFixture(PTableVersions.IndexV4)]
-	public class when_a_ptable_header_is_corrupt_on_disk : SpecificationWithDirectory {
-		private string _filename;
-		private PTable _table;
-		private string _copiedfilename;
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-
-		public when_a_ptable_header_is_corrupt_on_disk(byte version) {
-			_ptableVersion = version;
-		}
-
-		[SetUp]
-		public void Setup() {
-			_filename = GetTempFilePath();
-			_copiedfilename = GetTempFilePath();
-
-			var mtable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			mtable.Add(0x010100000000, 0x0001, 0x0001);
-			mtable.Add(0x010500000000, 0x0001, 0x0002);
-			_table = PTable.FromMemtable(mtable, _filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault);
-			_table.Dispose();
-			File.Copy(_filename, _copiedfilename);
-			using (var f = new FileStream(_copiedfilename, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite)) {
-				f.Seek(22, SeekOrigin.Begin);
-				f.WriteByte(0x22);
-			}
-		}
-
-		[Test]
-		public void the_hash_is_invalid() {
-			var exc = Assert.Throws<CorruptIndexException>(() => _table = PTable.FromFile(_copiedfilename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 16, false));
-			Assert.IsInstanceOf<HashValidationException>(exc.InnerException);
-		}
-
-		[Test]
-		public void no_error_if_index_verification_disabled() {
-			Assert.DoesNotThrow(
-				() => _table = PTable.FromFile(_copiedfilename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 16, true)
-			);
-		}
-
-		[TearDown]
-		public void Teardown() {
-			_table.MarkForDestruction();
-			_table.WaitForDisposal(1000);
-			File.Delete(_filename);
-			File.Delete(_copiedfilename);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/when_a_ptable_is_corrupt_on_disk.cs b/src/EventStore.Core.Tests/Index/IndexV1/when_a_ptable_is_corrupt_on_disk.cs
deleted file mode 100644
index 82e58ae01cc..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/when_a_ptable_is_corrupt_on_disk.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using EventStore.Common.Options;
-using EventStore.Core.Exceptions;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2)]
-	[TestFixture(PTableVersions.IndexV3)]
-	[TestFixture(PTableVersions.IndexV4)]
-	public class when_a_ptable_is_corrupt_on_disk : SpecificationWithDirectory {
-		private string _filename;
-		private PTable _table;
-		private string _copiedfilename;
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-
-		public when_a_ptable_is_corrupt_on_disk(byte version) {
-			_ptableVersion = version;
-		}
-
-		[SetUp]
-		public override async Task SetUp() {
-			await base.SetUp();
-
-			_filename = GetTempFilePath();
-			_copiedfilename = GetTempFilePath();
-			var mtable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			mtable.Add(0x010100000000, 0x0001, 0x0001);
-			mtable.Add(0x010500000000, 0x0001, 0x0002);
-			_table = PTable.FromMemtable(mtable, _filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault);
-			_table.Dispose();
-			File.Copy(_filename, _copiedfilename);
-			using (var f = new FileStream(_copiedfilename, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite)) {
-				f.Seek(130, SeekOrigin.Begin);
-				f.WriteByte(0x22);
-			}
-		}
-
-		[TearDown]
-		public override Task TearDown() {
-			_table.MarkForDestruction();
-			_table.WaitForDisposal(1000);
-
-			return base.TearDown();
-		}
-
-		[Test]
-		public void the_hash_is_invalid() {
-			var exc = Assert.Throws<CorruptIndexException>(() => PTable.FromFile(_copiedfilename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 16, false));
-			Assert.IsInstanceOf<HashValidationException>(exc.InnerException);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/when_a_ptable_is_loaded_from_disk.cs b/src/EventStore.Core.Tests/Index/IndexV1/when_a_ptable_is_loaded_from_disk.cs
deleted file mode 100644
index 3deb48d7d99..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/when_a_ptable_is_loaded_from_disk.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using EventStore.Common.Options;
-using EventStore.Core.Exceptions;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class when_a_ptable_is_loaded_from_disk : SpecificationWithDirectory {
-		private string _filename;
-		private PTable _table;
-		private string _copiedfilename;
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-
-		private bool _skipIndexVerify;
-
-		public when_a_ptable_is_loaded_from_disk(byte version, bool skipIndexVerify) {
-			_ptableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		[SetUp]
-		public override async Task SetUp() {
-			await base.SetUp();
-
-			_filename = GetTempFilePath();
-			_copiedfilename = GetTempFilePath();
-			var mtable = new HashListMemTable(_ptableVersion, maxSize: 1024);
-
-			long logPosition = 0;
-			long eventNumber = 1;
-			ulong streamId = 0x010100000000;
-
-			for (var i = 0; i < 1337; i++) {
-				logPosition++;
-
-				if (i % 37 == 0) {
-					streamId -= 0x1337;
-					eventNumber = 1;
-				} else
-					eventNumber++;
-
-				mtable.Add(streamId, eventNumber, logPosition);
-			}
-
-			_table = PTable.FromMemtable(mtable, _filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify);
-			_table.Dispose();
-			File.Copy(_filename, _copiedfilename);
-		}
-
-		[Test]
-		public void same_midpoints_are_loaded_when_enabling_or_disabling_index_verification() {
-			for (int depth = 2; depth <= 20; depth++) {
-				var ptableWithMD5Verification = PTable.FromFile(_copiedfilename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, false);
-				var ptableWithoutVerification = PTable.FromFile(_copiedfilename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, true);
-				var midPoints1 = ptableWithMD5Verification.GetMidPoints();
-				var midPoints2 = ptableWithoutVerification.GetMidPoints();
-
-				Assert.AreEqual(midPoints1.Length, midPoints2.Length);
-				for (var i = 0; i < midPoints1.Length; i++) {
-					Assert.AreEqual(midPoints1[i].ItemIndex, midPoints2[i].ItemIndex);
-					Assert.AreEqual(midPoints1[i].Key.Stream, midPoints2[i].Key.Stream);
-					Assert.AreEqual(midPoints1[i].Key.Version, midPoints2[i].Key.Version);
-				}
-
-				ptableWithMD5Verification.Dispose();
-				ptableWithoutVerification.Dispose();
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/when_constructing_v1_ptable.cs b/src/EventStore.Core.Tests/Index/IndexV1/when_constructing_v1_ptable.cs
deleted file mode 100644
index d98b48cc459..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/when_constructing_v1_ptable.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using EventStore.Core.Exceptions;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1;
-
-public class when_constructing_v1_ptable : SpecificationWithDirectoryPerTestFixture {
-	[Test]
-	public void an_exception_is_thrown() {
-		Assert.Throws<CorruptIndexException>(() => {
-			using var table = PTable.FromMemtable(
-				new HashListMemTable(PTableVersions.IndexV1, maxSize: 20),
-				GetTempFilePath(),
-				Constants.PTableInitialReaderCount,
-				Constants.PTableMaxReaderCountDefault);
-		});
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/when_creating_large_bloom_filter.cs b/src/EventStore.Core.Tests/Index/IndexV1/when_creating_large_bloom_filter.cs
deleted file mode 100644
index 08e07c41a29..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/when_creating_large_bloom_filter.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using EventStore.Core.DataStructures.ProbabilisticFilter;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	public class when_creating_large_bloom_filter : SpecificationWithDirectory {
-		[Ignore("Quick but requires 4gb disk")]
-		[Test]
-		public void ptable_exceeding_maximum_filter_size_succeeds() {
-			var file = GetTempFilePath();
-
-			// create
-			var filter = PTable.ConstructBloomFilter(
-				useBloomFilter: true,
-				filename: file,
-				indexEntryCount: 16_384_000_000);
-			filter.Dispose();
-
-			// and reopen
-			filter = new PersistentBloomFilter(FileStreamPersistence.FromFile(
-				PTable.GenBloomFilterFilename(file)));
-			filter.Dispose();
-		}
-
-		[Test]
-		public void out_of_memory_returns_null() {
-			var filter = PTable.ConstructBloomFilter(
-				useBloomFilter: true,
-				filename: GetTempFilePath(),
-				indexEntryCount: 1,
-				genBloomFilterSizeBytes: _ => 1_000_000_000_000); // rly big
-
-			Assert.Null(filter);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/when_creating_ptable_from_memtable.cs b/src/EventStore.Core.Tests/Index/IndexV1/when_creating_ptable_from_memtable.cs
deleted file mode 100644
index ed730c5a9e7..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/when_creating_ptable_from_memtable.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class when_creating_ptable_from_memtable : SpecificationWithFile {
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-		private bool _skipIndexVerify;
-
-		public when_creating_ptable_from_memtable(byte version, bool skipIndexVerify) {
-			_ptableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		[Test]
-		public void null_file_throws_null_exception() {
-			Assert.Throws<ArgumentNullException>(() =>
-				PTable.FromMemtable(new HashListMemTable(_ptableVersion, maxSize: 10), null, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault,
-					skipIndexVerify: _skipIndexVerify));
-		}
-
-		[Test]
-		public void null_memtable_throws_null_exception() {
-			Assert.Throws<ArgumentNullException>(() =>
-				PTable.FromMemtable(null, "C:\\foo.txt", Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify));
-		}
-
-		[Test]
-		public void wait_for_destroy_will_timeout() {
-			var table = new HashListMemTable(_ptableVersion, maxSize: 10);
-			table.Add(0x010100000000, 0x0001, 0x0001);
-			var ptable = PTable.FromMemtable(table, Filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify);
-			Assert.Throws<TimeoutException>(() => ptable.WaitForDisposal(1));
-
-			// tear down
-			ptable.MarkForDestruction();
-			ptable.WaitForDisposal(1000);
-		}
-
-		//[Test]
-		//public void non_power_of_two_throws_invalid_operation()
-		//{
-		//    var table = new HashListMemTable(_ptableVersion, );
-		//    table.Add(0x010100000000, 0x0001, 0x0001);
-		//    table.Add(0x010500000000, 0x0001, 0x0002);
-		//    table.Add(0x010200000000, 0x0001, 0x0003);
-		//    Assert.Throws<InvalidOperationException>(() => PTable.FromMemtable(table, "C:\\foo.txt"));
-		//}
-
-		[Test]
-		public void the_file_gets_created_and_can_be_read() {
-			var indexEntrySize = PTable.IndexEntryV4Size;
-			if (_ptableVersion == PTableVersions.IndexV1) {
-				indexEntrySize = PTable.IndexEntryV1Size;
-			} else if (_ptableVersion == PTableVersions.IndexV2) {
-				indexEntrySize = PTable.IndexEntryV2Size;
-			} else if (_ptableVersion == PTableVersions.IndexV3) {
-				indexEntrySize = PTable.IndexEntryV3Size;
-			}
-
-			var table = new HashListMemTable(_ptableVersion, maxSize: 10);
-			table.Add(0x010100000000, 0x0001, 0x0001);
-			table.Add(0x010500000000, 0x0001, 0x0002);
-			table.Add(0x010200000000, 0x0001, 0x0003);
-			table.Add(0x010200000000, 0x0002, 0x0003);
-			using (var sstable = PTable.FromMemtable(table, Filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault,
-				skipIndexVerify: _skipIndexVerify,
-				useBloomFilter: true)) {
-
-				var fileinfo = new FileInfo(Filename);
-				var midpointsCached = PTable.GetRequiredMidpointCountCached(4, _ptableVersion);
-				Assert.AreEqual(
-					PTableHeader.Size + 4 * indexEntrySize + midpointsCached * indexEntrySize +
-					PTableFooter.GetSize(_ptableVersion) + PTable.MD5Size, fileinfo.Length);
-				var items = sstable.IterateAllInOrder().ToList();
-				Assert.AreEqual(GetHash(0x010500000000), items[0].Stream);
-				Assert.AreEqual(0x0001, items[0].Version);
-				Assert.AreEqual(GetHash(0x010200000000), items[1].Stream);
-				Assert.AreEqual(0x0002, items[1].Version);
-				Assert.AreEqual(GetHash(0x010200000000), items[2].Stream);
-				Assert.AreEqual(0x0001, items[2].Version);
-				Assert.AreEqual(GetHash(0x010100000000), items[3].Stream);
-				Assert.AreEqual(0x0001, items[3].Version);
-
-				var stream = (ulong)0x010200000000;
-				Assert.True(sstable.TryGetLatestEntry(stream, out var entry));
-				Assert.AreEqual(GetHash(stream), entry.Stream);
-				Assert.AreEqual(0x0002, entry.Version);
-				Assert.AreEqual(0x0003, entry.Position);
-			}
-		}
-
-		[Test]
-		public void the_hash_of_file_is_valid() {
-			var table = new HashListMemTable(_ptableVersion, maxSize: 10);
-			table.Add(0x010100000000, 0x0001, 0x0001);
-			table.Add(0x010500000000, 0x0001, 0x0002);
-			table.Add(0x010200000000, 0x0001, 0x0003);
-			table.Add(0x010200000000, 0x0002, 0x0003);
-			Assert.DoesNotThrow(() => {
-				using (var sstable = PTable.FromMemtable(table, Filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: false)) {
-				}
-			});
-		}
-
-		private ulong GetHash(ulong value) {
-			return _ptableVersion == PTableVersions.IndexV1 ? value >> 32 : value;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/when_merging_four_ptables.cs b/src/EventStore.Core.Tests/Index/IndexV1/when_merging_four_ptables.cs
deleted file mode 100644
index d04cd5f2712..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/when_merging_four_ptables.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class when_merging_four_ptables : SpecificationWithDirectoryPerTestFixture {
-		private readonly List<string> _files = new List<string>();
-		private readonly List<PTable> _tables = new List<PTable>();
-		private PTable _newtable;
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-
-		private bool _skipIndexVerify;
-
-		public when_merging_four_ptables(byte version, bool skipIndexVerify) {
-			_ptableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			for (int i = 0; i < 4; i++) {
-				_files.Add(GetTempFilePath());
-
-				var table = new HashListMemTable(_ptableVersion, maxSize: 20);
-				for (int j = 0; j < 10; j++) {
-					table.Add((ulong)(0x010100000000 << (j + 1)), i + 1, i * j);
-				}
-
-				_tables.Add(PTable.FromMemtable(table, _files[i], Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify));
-			}
-
-			_files.Add(GetTempFilePath());
-			_newtable = PTable.MergeTo(_tables, _files[4],
-				_ptableVersion, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault,
-				skipIndexVerify: _skipIndexVerify);
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_newtable.Dispose();
-			foreach (var ssTable in _tables) {
-				ssTable.Dispose();
-			}
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void there_are_forty_records_in_merged_index() {
-			Assert.AreEqual(40, _newtable.Count);
-		}
-
-		[Test]
-		public void the_items_are_sorted() {
-			var last = new IndexEntry(ulong.MaxValue, 0, long.MaxValue);
-			foreach (var item in _newtable.IterateAllInOrder()) {
-				Assert.IsTrue((last.Stream == item.Stream ? last.Version > item.Version : last.Stream > item.Stream) ||
-							  ((last.Stream == item.Stream && last.Version == item.Version) &&
-							   last.Position > item.Position));
-				last = item;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/when_merging_ptables.cs b/src/EventStore.Core.Tests/Index/IndexV1/when_merging_ptables.cs
deleted file mode 100644
index 75d535233ca..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/when_merging_ptables.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class when_merging_ptables : SpecificationWithDirectoryPerTestFixture {
-		private readonly List<string> _files = new List<string>();
-		private readonly List<PTable> _tables = new List<PTable>();
-
-		private PTable _newtable;
-		private readonly byte _ptableVersion;
-		private readonly bool _skipIndexVerify;
-
-		public when_merging_ptables(byte version, bool skipIndexVerify) {
-			_ptableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_files.Add(GetTempFilePath());
-			var table = new HashListMemTable(_ptableVersion, maxSize: 20);
-			table.Add(0x0101, 0, 0x0101);
-			table.Add(0x0102, 0, 0x0102);
-			table.Add(0x0103, 0, 0x0103);
-			table.Add(0x0104, 0, 0x0104);
-			_tables.Add(PTable.FromMemtable(table, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault));
-			table = new HashListMemTable(_ptableVersion, maxSize: 20);
-			table.Add(0x0105, 0, 0x0105);
-			table.Add(0x0106, 0, 0x0106);
-			table.Add(0x0107, 0, 0x0107);
-			table.Add(0x0108, 0, 0x0108);
-			_tables.Add(PTable.FromMemtable(table, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault));
-			_newtable = PTable.MergeTo(
-				tables: _tables,
-				outputFile: GetTempFilePath(),
-				version: PTableVersions.IndexV4,
-				initialReaders: Constants.PTableInitialReaderCount,
-				maxReaders: Constants.PTableMaxReaderCountDefault,
-				skipIndexVerify: _skipIndexVerify,
-				useBloomFilter: true);
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_newtable.Dispose();
-			foreach (var ssTable in _tables) {
-				ssTable.Dispose();
-			}
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void merged_ptable_is_64bit() {
-			Assert.AreEqual(PTableVersions.IndexV4, _newtable.Version);
-		}
-
-		[Test]
-		public void there_are_8_records_in_the_merged_index() {
-			Assert.AreEqual(8, _newtable.Count);
-		}
-
-		[Test]
-		public void a_stream_can_be_found() {
-			Assert.True(_newtable.TryGetLatestEntry(0x0108, out var entry));
-			Assert.AreEqual(0x0108, entry.Stream);
-			Assert.AreEqual(0, entry.Version);
-			Assert.AreEqual(0x0108, entry.Position);
-		}
-
-		[Test]
-		public void no_entries_should_have_changed() {
-			foreach (var item in _newtable.IterateAllInOrder()) {
-				Assert.IsTrue((ulong)item.Position == item.Stream, "Expected the Stream (Hash) {0:X} to be equal to {1:X}",
-					item.Stream - 1, item.Position);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/when_merging_ptables_with_entries_to_nonexisting_record.cs b/src/EventStore.Core.Tests/Index/IndexV1/when_merging_ptables_with_entries_to_nonexisting_record.cs
deleted file mode 100644
index 6c0d7d6d2c9..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/when_merging_ptables_with_entries_to_nonexisting_record.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Index;
-using NUnit.Framework;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	public class
-		when_merging_ptables_with_entries_to_nonexisting_record_in_newer_index_versions :
-			SpecificationWithDirectoryPerTestFixture {
-		private readonly List<string> _files = new List<string>();
-		private readonly List<PTable> _tables = new List<PTable>();
-		protected PTable _newtable;
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-
-		private bool _skipIndexVerify;
-
-		public when_merging_ptables_with_entries_to_nonexisting_record_in_newer_index_versions(byte version,
-			bool skipIndexVerify) {
-			_ptableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			for (int i = 0; i < 4; i++) {
-				_files.Add(GetTempFilePath());
-
-				var table = new HashListMemTable(_ptableVersion, maxSize: 30);
-				for (int j = 0; j < 10; j++) {
-					table.Add((ulong)(0x010100000000 << i), j, i * 10 + j);
-				}
-
-				_tables.Add(PTable.FromMemtable(table, _files[i], Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify));
-			}
-
-			_files.Add(GetTempFilePath());
-			_newtable = PTable.MergeTo(_tables, _files[4],
-				_ptableVersion, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault,
-				skipIndexVerify: _skipIndexVerify);
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_newtable.Dispose();
-			foreach (var ssTable in _tables) {
-				ssTable.Dispose();
-			}
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void all_entries_are_left() {
-			Assert.AreEqual(40, _newtable.Count);
-		}
-
-		[Test]
-		public void the_items_are_sorted() {
-			var last = new IndexEntry(ulong.MaxValue, 0, long.MaxValue);
-			foreach (var item in _newtable.IterateAllInOrder()) {
-				Assert.IsTrue((last.Stream == item.Stream ? last.Version > item.Version : last.Stream > item.Stream) ||
-							  ((last.Stream == item.Stream && last.Version == item.Version) &&
-							   last.Position > item.Position));
-				last = item;
-			}
-		}
-
-		[Test]
-		public void the_right_items_are_deleted() {
-			for (int i = 0; i < 4; i++) {
-				for (int j = 0; j < 10; j++) {
-					long position;
-					Assert.IsTrue(_newtable.TryGetOneValue((ulong)(0x010100000000 << i), j, out position));
-					Assert.AreEqual(i * 10 + j, position);
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/when_merging_two_ptables.cs b/src/EventStore.Core.Tests/Index/IndexV1/when_merging_two_ptables.cs
deleted file mode 100644
index 84983416345..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/when_merging_two_ptables.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class when_merging_two_ptables : SpecificationWithDirectoryPerTestFixture {
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-		private readonly List<string> _files = new List<string>();
-		private readonly List<PTable> _tables = new List<PTable>();
-
-		private PTable _newtable;
-
-		private bool _skipIndexVerify;
-
-		public when_merging_two_ptables(byte version, bool skipIndexVerify) {
-			_ptableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		private ulong GetHash(ulong value) {
-			return _ptableVersion == PTableVersions.IndexV1 ? value >> 32 : value;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			for (int i = 0; i < 2; i++) {
-				_files.Add(GetTempFilePath());
-
-				var table = new HashListMemTable(_ptableVersion, maxSize: 20);
-				for (int j = 0; j < 10; j++) {
-					table.Add((ulong)(0x010100000000 << (j + 1)), i + 1, i * j);
-				}
-
-				_tables.Add(PTable.FromMemtable(table, _files[i], Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault,
-					skipIndexVerify: _skipIndexVerify, useBloomFilter: true));
-			}
-
-			_files.Add(GetTempFilePath());
-			_newtable = PTable.MergeTo(_tables, _files[2],
-				_ptableVersion, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault,
-				skipIndexVerify: _skipIndexVerify, useBloomFilter: true);
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_newtable.Dispose();
-			foreach (var ssTable in _tables) {
-				ssTable.Dispose();
-			}
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void there_are_twenty_records_in_merged_index() {
-			Assert.AreEqual(20, _newtable.Count);
-		}
-
-		[Test]
-		public void the_streams_can_be_found() {
-			for (int j = 0; j < 10; j++) {
-				var stream = (ulong)(0x010100000000 << (j + 1));
-				Assert.True(_newtable.TryGetLatestEntry(stream, out var entry));
-				Assert.AreEqual(GetHash(stream), entry.Stream);
-				Assert.AreEqual(2, entry.Version);
-				Assert.AreEqual(1 * j, entry.Position);
-			}
-		}
-
-		[Test]
-		public void the_items_are_sorted() {
-			var last = new IndexEntry(ulong.MaxValue, 0, long.MaxValue);
-			foreach (var item in _newtable.IterateAllInOrder()) {
-				Assert.IsTrue((last.Stream == item.Stream ? last.Version > item.Version : last.Stream > item.Stream) ||
-							  ((last.Stream == item.Stream && last.Version == item.Version) &&
-							   last.Position > item.Position));
-				last = item;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/when_trying_to_get_latest_entry.cs b/src/EventStore.Core.Tests/Index/IndexV1/when_trying_to_get_latest_entry.cs
deleted file mode 100644
index 9ed72e2e8ab..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/when_trying_to_get_latest_entry.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false, 1_000_000)]
-	[TestFixture(PTableVersions.IndexV2, true, 1_000_000)]
-	[TestFixture(PTableVersions.IndexV3, false, 1_000_000)]
-	[TestFixture(PTableVersions.IndexV3, true, 1_000_000)]
-	[TestFixture(PTableVersions.IndexV4, false, 1_000_000)]
-	[TestFixture(PTableVersions.IndexV4, true, 1_000_000)]
-	[TestFixture(PTableVersions.IndexV4, false, 0)]
-	[TestFixture(PTableVersions.IndexV4, true, 0)]
-	public class when_trying_to_get_latest_entry : SpecificationWithFile {
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-
-		private readonly bool _skipIndexVerify;
-		private readonly bool _useBloomFilter;
-		private readonly int _lruCacheSize;
-
-		public when_trying_to_get_latest_entry(byte version, bool skipIndexVerify, int lruCacheSize) {
-			_ptableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-			_useBloomFilter = skipIndexVerify; // bloomfilter orthogonal
-			_lruCacheSize = lruCacheSize;
-		}
-
-		private ulong GetHash(ulong value) {
-			return _ptableVersion == PTableVersions.IndexV1 ? value >> 32 : value;
-		}
-
-		private PTable ConstructPTable(HashListMemTable memTable) {
-			return PTable.FromMemtable(
-				memTable,
-				Filename,
-				Constants.PTableInitialReaderCount,
-				Constants.PTableMaxReaderCountDefault,
-				skipIndexVerify: _skipIndexVerify,
-				useBloomFilter: _useBloomFilter,
-				lruCacheSize: _lruCacheSize);
-		}
-
-		[Test]
-		public void nothing_is_found_on_empty_stream() {
-			var memTable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			memTable.Add(0x010100000000, 0x01, 0xffff);
-			using (var ptable = ConstructPTable(memTable)) {
-				IndexEntry entry;
-				Assert.IsFalse(ptable.TryGetLatestEntry(0x12, out entry));
-			}
-		}
-
-		[Test]
-		public void single_item_is_latest() {
-			var memTable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			memTable.Add(0x010100000000, 0x01, 0xffff);
-			using (var ptable = ConstructPTable(memTable)) {
-				IndexEntry entry;
-				Assert.IsTrue(ptable.TryGetLatestEntry(0x010100000000, out entry));
-				Assert.AreEqual(GetHash(0x010100000000), entry.Stream);
-				Assert.AreEqual(0x01, entry.Version);
-				Assert.AreEqual(0xffff, entry.Position);
-			}
-		}
-
-		[Test]
-		public void correct_entry_is_returned() {
-			var memTable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			memTable.Add(0x010100000000, 0x01, 0xffff);
-			memTable.Add(0x010100000000, 0x02, 0xfff2);
-			using (var ptable = ConstructPTable(memTable)) {
-				IndexEntry entry;
-				Assert.IsTrue(ptable.TryGetLatestEntry(0x010100000000, out entry));
-				Assert.AreEqual(GetHash(0x010100000000), entry.Stream);
-				Assert.AreEqual(0x02, entry.Version);
-				Assert.AreEqual(0xfff2, entry.Position);
-			}
-		}
-
-		[Test]
-		public void when_duplicated_entries_exist_the_one_with_latest_position_is_returned() {
-			var memTable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			memTable.Add(0x010100000000, 0x01, 0xfff1);
-			memTable.Add(0x010100000000, 0x02, 0xfff2);
-			memTable.Add(0x010100000000, 0x01, 0xfff3);
-			memTable.Add(0x010100000000, 0x02, 0xfff4);
-			using (var ptable = ConstructPTable(memTable)) {
-				IndexEntry entry;
-				Assert.IsTrue(ptable.TryGetLatestEntry(0x010100000000, out entry));
-				Assert.AreEqual(GetHash(0x010100000000), entry.Stream);
-				Assert.AreEqual(0x02, entry.Version);
-				Assert.AreEqual(0xfff4, entry.Position);
-			}
-		}
-
-		[Test]
-		public void only_entry_with_largest_position_is_returned_when_triduplicated() {
-			var memTable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			memTable.Add(0x010100000000, 0x01, 0xfff1);
-			memTable.Add(0x010100000000, 0x01, 0xfff3);
-			memTable.Add(0x010100000000, 0x01, 0xfff5);
-			using (var ptable = ConstructPTable(memTable)) {
-				IndexEntry entry;
-				Assert.IsTrue(ptable.TryGetLatestEntry(0x010100000000, out entry));
-				Assert.AreEqual(GetHash(0x010100000000), entry.Stream);
-				Assert.AreEqual(0x01, entry.Version);
-				Assert.AreEqual(0xfff5, entry.Position);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/when_trying_to_get_latest_entry_before_position.cs b/src/EventStore.Core.Tests/Index/IndexV1/when_trying_to_get_latest_entry_before_position.cs
deleted file mode 100644
index eefe9a0c14e..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/when_trying_to_get_latest_entry_before_position.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class when_trying_to_get_latest_entry_before_position : SpecificationWithFile {
-		private readonly byte _pTableVersion;
-		private readonly bool _skipIndexVerify;
-
-		private HashListMemTable _memTable;
-		private PTable _pTable;
-		private readonly long _deletedStreamEventNumber;
-
-		private const ulong HNormal = 0x01UL << 32;
-		private const ulong HTombstoned = 0x02UL << 32;
-		private const ulong HDuplicate = 0x03UL << 32;
-		private const ulong HOutOfOrder = 0x04UL << 32;
-		private const ulong HNotExists = 0x05UL << 32;
-
-		public when_trying_to_get_latest_entry_before_position(byte version, bool skipIndexVerify) {
-			_pTableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-			_deletedStreamEventNumber = version < PTableVersions.IndexV3 ? int.MaxValue : long.MaxValue;
-		}
-
-		private ulong GetHash(ulong value) {
-			return _pTableVersion == PTableVersions.IndexV1 ? value >> 32 : value;
-		}
-
-		[SetUp]
-		public override void SetUp() {
-			base.SetUp();
-			_memTable = new HashListMemTable(_pTableVersion, maxSize: 10);
-			_memTable.Add(HNormal, 0, 0);
-			_memTable.Add(HNormal, 1, 1);
-			_memTable.Add(HNormal, 2, 2);
-			_memTable.Add(HTombstoned, 1, 3);
-			_memTable.Add(HNormal, 5, 4);
-			_memTable.Add(HTombstoned, _deletedStreamEventNumber, 5);
-			_memTable.Add(HDuplicate, 0, 6);
-			_memTable.Add(HDuplicate, 0, 7);
-			_memTable.Add(HDuplicate, 1, 8);
-			_memTable.Add(HDuplicate, 1, 9);
-			_memTable.Add(HOutOfOrder, 0, 10);
-			_memTable.Add(HOutOfOrder, 2, 11);
-			_memTable.Add(HOutOfOrder, 1, 12);
-			_pTable = PTable.FromMemtable(
-				table: _memTable,
-				filename: Filename,
-				initialReaders: Constants.PTableInitialReaderCount,
-				maxReaders: Constants.PTableMaxReaderCountDefault,
-				skipIndexVerify: _skipIndexVerify);
-		}
-
-		[TearDown]
-		public override void TearDown() {
-			_pTable?.Dispose();
-			base.TearDown();
-		}
-
-		private ISearchTable GetTable(bool memTableOrPTable) => memTableOrPTable ? (ISearchTable) _memTable : _pTable;
-
-		[TestCase(true)]
-		[TestCase(false)]
-		public void when_hash_doesnt_exist_returns_false(bool memTableOrPTable) {
-			var table = GetTable(memTableOrPTable);
-			Assert.False(table.TryGetLatestEntry(HNotExists, 10, x => {
-				Assert.AreEqual(GetHash(HNotExists), x.Stream);
-				return true;
-			}, out _));
-		}
-
-		[TestCase(true)]
-		[TestCase(false)]
-		public void when_hash_exists_but_not_before_position_limit_returns_false(bool memTableOrPTable) {
-			var table = GetTable(memTableOrPTable);
-			Assert.False(table.TryGetLatestEntry(HNormal, 0, x => {
-				Assert.AreEqual(GetHash(HNormal), x.Stream);
-				return true;
-			}, out _));
-
-			Assert.False(table.TryGetLatestEntry(HTombstoned, 3, x => {
-				Assert.AreEqual(GetHash(HTombstoned), x.Stream);
-				return true;
-			}, out _));
-
-			Assert.False(table.TryGetLatestEntry(HDuplicate, 6, x => {
-				Assert.AreEqual(GetHash(HDuplicate), x.Stream);
-				return true;
-			}, out _));
-		}
-
-		[TestCase(true)]
-		[TestCase(false)]
-		public void when_hash_exists_before_position_limit_returns_correct_entry(bool memTableOrPTable) {
-			var table = GetTable(memTableOrPTable);
-			Assert.True(table.TryGetLatestEntry(HNormal, 5, x => {
-				Assert.AreEqual(GetHash(HNormal), x.Stream);
-				return true;
-			}, out var res));
-			Assert.AreEqual(4, res.Position);
-			Assert.AreEqual(GetHash(HNormal), res.Stream);
-			Assert.AreEqual(5, res.Version);
-
-			Assert.True(table.TryGetLatestEntry(HTombstoned, 5, x => {
-				Assert.AreEqual(GetHash(HTombstoned), x.Stream);
-				return true;
-			}, out res));
-			Assert.AreEqual(3, res.Position);
-			Assert.AreEqual(GetHash(HTombstoned), res.Stream);
-			Assert.AreEqual(1, res.Version);
-
-			Assert.True(table.TryGetLatestEntry(HDuplicate, 7, x => {
-				Assert.AreEqual(GetHash(HDuplicate), x.Stream);
-				return true;
-			}, out res));
-			Assert.AreEqual(6, res.Position);
-			Assert.AreEqual(GetHash(HDuplicate), res.Stream);
-			Assert.AreEqual(0, res.Version);
-		}
-
-		[TestCase(true)]
-		[TestCase(false)]
-		// at the moment, this TryGetLatestEntry overload is used only for scavenging purposes
-		// and we are only interested with finding the latest event number before a position limit,
-		// not the actual index entry
-		public void when_duplicate_returns_entry_with_highest_position(bool memTableOrPTable) {
-			var table = GetTable(memTableOrPTable);
-
-			Assert.True(table.TryGetLatestEntry(HDuplicate, 8, x => {
-				Assert.AreEqual(GetHash(HDuplicate), x.Stream);
-				return true;
-			}, out var res));
-			Assert.AreEqual(7, res.Position);
-			Assert.AreEqual(GetHash(HDuplicate), res.Stream);
-			Assert.AreEqual(0, res.Version);
-		}
-
-		[TestCase(true)]
-		[TestCase(false)]
-		public void when_hash_collision_returns_correct_result(bool memTableOrPTable) {
-			var table = GetTable(memTableOrPTable);
-
-			Assert.True(table.TryGetLatestEntry(HNormal, 10,
-				x => {
-					Assert.AreEqual(GetHash(HNormal), x.Stream);
-					return x.Position % 2 == 1;
-				}, out var res));
-			Assert.AreEqual(1, res.Position);
-			Assert.AreEqual(GetHash(HNormal), res.Stream);
-			Assert.AreEqual(1, res.Version);
-
-			Assert.False(table.TryGetLatestEntry(HNormal, 10, x => {
-				Assert.AreEqual(GetHash(HNormal), x.Stream);
-				return false;
-			}, out _));
-		}
-
-		[TestCase(true)]
-		[TestCase(false)]
-		// at the moment, this TryGetLatestEntry overload is used only for scavenging purposes.
-		// if an out of order event occurs in the log (due to a bug), the function may return
-		// an index entry with an event number less than the real last event number.
-		// however, the consequences are not so bad: it can only result in less events
-		// being scavenged. during index execution, detection of these out of order events
-		// in PTables is done and logged.
-		public void when_out_of_order_may_return_incorrect_entry_with_smaller_event_number(bool memTableOrPTable) {
-			var table = GetTable(memTableOrPTable);
-			Assert.True(table.TryGetLatestEntry(HOutOfOrder, 12, x => {
-				Assert.AreEqual(GetHash(HOutOfOrder), x.Stream);
-				return true;
-			}, out var res));
-			Assert.AreEqual(GetHash(HOutOfOrder), res.Stream);
-
-			// correct last event number should be 2
-			Assert.AreEqual(0, res.Version);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/when_trying_to_get_next_entry.cs b/src/EventStore.Core.Tests/Index/IndexV1/when_trying_to_get_next_entry.cs
deleted file mode 100644
index eb34e5c59d1..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/when_trying_to_get_next_entry.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class when_trying_to_get_next_entry : SpecificationWithFile {
-		private readonly byte _pTableVersion;
-		private readonly bool _skipIndexVerify;
-
-		private HashListMemTable _memTable;
-		private PTable _pTable;
-		private readonly long _deletedStreamEventNumber;
-
-		private const ulong H1 = 0x01UL << 32;
-		private const ulong H2 = 0x02UL << 32;
-		private const ulong H3 = 0x03UL << 32;
-
-		public when_trying_to_get_next_entry(byte version, bool skipIndexVerify) {
-			_pTableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-			_deletedStreamEventNumber = version < PTableVersions.IndexV3 ? int.MaxValue : long.MaxValue;
-		}
-
-		private ulong GetHash(ulong value) {
-			return _pTableVersion == PTableVersions.IndexV1 ? value >> 32 : value;
-		}
-
-		[SetUp]
-		public override void SetUp() {
-			base.SetUp();
-			_memTable = new HashListMemTable(_pTableVersion, maxSize: 10);
-			_memTable.Add(H1, 0, 0);
-			_memTable.Add(H1, 1, 1);
-			_memTable.Add(H1, 2, 2);
-			_memTable.Add(H2, 1, 3);
-			_memTable.Add(H1, 5, 4);
-			_memTable.Add(H2, _deletedStreamEventNumber, 5);
-			_memTable.Add(H3, 0, 6);
-			_memTable.Add(H3, 0, 7);
-			_memTable.Add(H3, 1, 8);
-			_memTable.Add(H3, 1, 9);
-			_pTable = PTable.FromMemtable(
-				table: _memTable,
-				filename: Filename,
-				initialReaders: Constants.PTableInitialReaderCount,
-				maxReaders: Constants.PTableMaxReaderCountDefault,
-				skipIndexVerify: _skipIndexVerify);
-		}
-
-		[TearDown]
-		public override void TearDown() {
-			_pTable?.Dispose();
-			base.TearDown();
-		}
-
-		private ISearchTable GetTable(bool memTableOrPTable) => memTableOrPTable ? (ISearchTable) _memTable : _pTable;
-
-		[TestCase(true)]
-		[TestCase(false)]
-		public void when_next_entry_doesnt_exist_returns_false(bool memTableOrPTable) {
-			var table = GetTable(memTableOrPTable);
-			Assert.False(table.TryGetNextEntry(H1, 5, out _));
-			Assert.False(table.TryGetNextEntry(H2, _deletedStreamEventNumber, out _));
-		}
-
-		[TestCase(true)]
-		[TestCase(false)]
-		public void when_next_entry_exists_returns_correct_entry(bool memTableOrPTable) {
-			var table = GetTable(memTableOrPTable);
-
-			Assert.True(table.TryGetNextEntry(H1, 0, out var entry));
-			Assert.AreEqual(GetHash(H1), entry.Stream);
-			Assert.AreEqual(1, entry.Version);
-
-			Assert.True(table.TryGetNextEntry(H1, 1, out entry));
-			Assert.AreEqual(GetHash(H1), entry.Stream);
-			Assert.AreEqual(2, entry.Version);
-
-			Assert.True(table.TryGetNextEntry(H1, 2, out entry));
-			Assert.AreEqual(GetHash(H1), entry.Stream);
-			Assert.AreEqual(5, entry.Version);
-
-			Assert.True(table.TryGetNextEntry(H2, 1, out entry));
-			Assert.AreEqual(GetHash(H2), entry.Stream);
-			Assert.AreEqual(_deletedStreamEventNumber, entry.Version);
-		}
-
-		[TestCase(true)]
-		[TestCase(false)]
-		public void when_duplicate_or_collision_returns_correct_next_entry(bool memTableOrPTable) {
-			var table = GetTable(memTableOrPTable);
-
-			Assert.True(table.TryGetNextEntry(H3, 0, out var entry));
-			Assert.AreEqual(GetHash(H3), entry.Stream);
-			Assert.AreEqual(1, entry.Version);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/when_trying_to_get_oldest_entry.cs b/src/EventStore.Core.Tests/Index/IndexV1/when_trying_to_get_oldest_entry.cs
deleted file mode 100644
index 62b7cfc6bc6..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/when_trying_to_get_oldest_entry.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false, 1_000_000)]
-	[TestFixture(PTableVersions.IndexV2, true, 1_000_000)]
-	[TestFixture(PTableVersions.IndexV3, false, 1_000_000)]
-	[TestFixture(PTableVersions.IndexV3, true, 1_000_000)]
-	[TestFixture(PTableVersions.IndexV4, false, 1_000_000)]
-	[TestFixture(PTableVersions.IndexV4, true, 1_000_000)]
-	[TestFixture(PTableVersions.IndexV4, false, 0)]
-	[TestFixture(PTableVersions.IndexV4, true, 0)]
-	public class when_trying_to_get_oldest_entry : SpecificationWithFile {
-		protected byte _ptableVersion = PTableVersions.IndexV1;
-
-		private readonly bool _skipIndexVerify;
-		private readonly bool _useBloomFilter;
-		private readonly int _lruCacheSize;
-
-		public when_trying_to_get_oldest_entry(byte version, bool skipIndexVerify, int lruCacheSize) {
-			_ptableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-			_useBloomFilter = skipIndexVerify; // bloomfilter orthogonal
-			_lruCacheSize = lruCacheSize;
-		}
-
-		private ulong GetHash(ulong value) {
-			return _ptableVersion == PTableVersions.IndexV1 ? value >> 32 : value;
-		}
-
-		private PTable ConstructPTable(HashListMemTable memTable) {
-			return PTable.FromMemtable(
-				memTable,
-				Filename,
-				Constants.PTableInitialReaderCount,
-				Constants.PTableMaxReaderCountDefault,
-				skipIndexVerify: _skipIndexVerify,
-				useBloomFilter: _useBloomFilter,
-				lruCacheSize: _lruCacheSize);
-		}
-
-		[Test]
-		public void nothing_is_found_on_empty_stream() {
-			var memTable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			memTable.Add(0x010100000000, 0x01, 0xffff);
-			using (var ptable = ConstructPTable(memTable)) {
-				IndexEntry entry;
-				Assert.IsFalse(ptable.TryGetOldestEntry(0x12, out entry));
-			}
-		}
-
-		[Test]
-		public void single_item_is_latest() {
-			var memTable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			memTable.Add(0x010100000000, 0x01, 0xffff);
-			using (var ptable = ConstructPTable(memTable)) {
-				IndexEntry entry;
-				Assert.IsTrue(ptable.TryGetOldestEntry(0x010100000000, out entry));
-				Assert.AreEqual(GetHash(0x010100000000), entry.Stream);
-				Assert.AreEqual(0x01, entry.Version);
-				Assert.AreEqual(0xffff, entry.Position);
-			}
-		}
-
-		[Test]
-		public void correct_entry_is_returned() {
-			var memTable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			memTable.Add(0x010100000000, 0x01, 0xffff);
-			memTable.Add(0x010100000000, 0x02, 0xfff2);
-			using (var ptable = ConstructPTable(memTable)) {
-				IndexEntry entry;
-				Assert.IsTrue(ptable.TryGetOldestEntry(0x010100000000, out entry));
-				Assert.AreEqual(GetHash(0x010100000000), entry.Stream);
-				Assert.AreEqual(0x01, entry.Version);
-				Assert.AreEqual(0xffff, entry.Position);
-			}
-		}
-
-		[Test]
-		public void when_duplicated_entries_exist_the_one_with_oldest_position_is_returned() {
-			var memTable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			memTable.Add(0x010100000000, 0x01, 0xfff1);
-			memTable.Add(0x010100000000, 0x02, 0xfff2);
-			memTable.Add(0x010100000000, 0x01, 0xfff3);
-			memTable.Add(0x010100000000, 0x02, 0xfff4);
-			using (var ptable = ConstructPTable(memTable)) {
-				IndexEntry entry;
-				Assert.IsTrue(ptable.TryGetOldestEntry(0x010100000000, out entry));
-				Assert.AreEqual(GetHash(0x010100000000), entry.Stream);
-				Assert.AreEqual(0x01, entry.Version);
-				Assert.AreEqual(0xfff1, entry.Position);
-			}
-		}
-
-		[Test]
-		public void only_entry_with_smallest_position_is_returned_when_triduplicated() {
-			var memTable = new HashListMemTable(_ptableVersion, maxSize: 10);
-			memTable.Add(0x010100000000, 0x01, 0xfff1);
-			memTable.Add(0x010100000000, 0x01, 0xfff3);
-			memTable.Add(0x010100000000, 0x01, 0xfff5);
-			using (var ptable = ConstructPTable(memTable)) {
-				IndexEntry entry;
-				Assert.IsTrue(ptable.TryGetOldestEntry(0x010100000000, out entry));
-				Assert.AreEqual(GetHash(0x010100000000), entry.Stream);
-				Assert.AreEqual(0x01, entry.Version);
-				Assert.AreEqual(0xfff1, entry.Position);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV1/when_trying_to_get_previous_entry.cs b/src/EventStore.Core.Tests/Index/IndexV1/when_trying_to_get_previous_entry.cs
deleted file mode 100644
index 71abd27be93..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV1/when_trying_to_get_previous_entry.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV1 {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class when_trying_to_get_previous_entry : SpecificationWithFile {
-		private readonly byte _pTableVersion;
-		private readonly bool _skipIndexVerify;
-
-		private HashListMemTable _memTable;
-		private PTable _pTable;
-		private readonly long _deletedStreamEventNumber;
-
-		private const ulong H1 = 0x01UL << 32;
-		private const ulong H2 = 0x02UL << 32;
-		private const ulong H3 = 0x03UL << 32;
-
-		public when_trying_to_get_previous_entry(byte version, bool skipIndexVerify) {
-			_pTableVersion = version;
-			_skipIndexVerify = skipIndexVerify;
-			_deletedStreamEventNumber = version < PTableVersions.IndexV3 ? int.MaxValue : long.MaxValue;
-		}
-
-		private ulong GetHash(ulong value) {
-			return _pTableVersion == PTableVersions.IndexV1 ? value >> 32 : value;
-		}
-
-		[SetUp]
-		public override void SetUp() {
-			base.SetUp();
-			_memTable = new HashListMemTable(_pTableVersion, maxSize: 10);
-			_memTable.Add(H1, 0, 0);
-			_memTable.Add(H1, 1, 1);
-			_memTable.Add(H1, 2, 2);
-			_memTable.Add(H2, 1, 3);
-			_memTable.Add(H1, 5, 4);
-			_memTable.Add(H2, _deletedStreamEventNumber, 5);
-			_memTable.Add(H3, 0, 6);
-			_memTable.Add(H3, 0, 7);
-			_memTable.Add(H3, 1, 8);
-			_memTable.Add(H3, 1, 9);
-			_pTable = PTable.FromMemtable(
-				table: _memTable,
-				filename: Filename,
-				initialReaders: Constants.PTableInitialReaderCount,
-				maxReaders: Constants.PTableMaxReaderCountDefault,
-				skipIndexVerify: _skipIndexVerify);
-		}
-
-		[TearDown]
-		public override void TearDown() {
-			_pTable?.Dispose();
-			base.TearDown();
-		}
-
-		private ISearchTable GetTable(bool memTableOrPTable) => memTableOrPTable ? (ISearchTable) _memTable : _pTable;
-
-		[TestCase(true)]
-		[TestCase(false)]
-		public void when_previous_entry_doesnt_exist_returns_false(bool memTableOrPTable) {
-			var table = GetTable(memTableOrPTable);
-			Assert.False(table.TryGetPreviousEntry(H1, 0, out _));
-			Assert.False(table.TryGetPreviousEntry(H2, 1, out _));
-		}
-
-		[TestCase(true)]
-		[TestCase(false)]
-		public void when_previous_entry_exists_returns_correct_entry(bool memTableOrPTable) {
-			var table = GetTable(memTableOrPTable);
-
-			Assert.True(table.TryGetPreviousEntry(H1, 1, out var entry));
-			Assert.AreEqual(GetHash(H1), entry.Stream);
-			Assert.AreEqual(0, entry.Version);
-
-			Assert.True(table.TryGetPreviousEntry(H1, 2, out entry));
-			Assert.AreEqual(GetHash(H1), entry.Stream);
-			Assert.AreEqual(1, entry.Version);
-
-			Assert.True(table.TryGetPreviousEntry(H1, 5, out entry));
-			Assert.AreEqual(GetHash(H1), entry.Stream);
-			Assert.AreEqual(2, entry.Version);
-
-			Assert.True(table.TryGetPreviousEntry(H2, _deletedStreamEventNumber, out entry));
-			Assert.AreEqual(GetHash(H2), entry.Stream);
-			Assert.AreEqual(1, entry.Version);
-		}
-
-		[TestCase(true)]
-		[TestCase(false)]
-		public void when_duplicate_or_collision_returns_correct_previous_entry(bool memTableOrPTable) {
-			var table = GetTable(memTableOrPTable);
-
-			Assert.True(table.TryGetPreviousEntry(H3, 1, out var entry));
-			Assert.AreEqual(GetHash(H3), entry.Stream);
-			Assert.AreEqual(0, entry.Version);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV2/opening_a_ptable_with_more_than_32bits_of_records.cs b/src/EventStore.Core.Tests/Index/IndexV2/opening_a_ptable_with_more_than_32bits_of_records.cs
deleted file mode 100644
index a6dd7a8551d..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV2/opening_a_ptable_with_more_than_32bits_of_records.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Security.Cryptography;
-using System.Diagnostics;
-using System.IO;
-using NUnit.Framework;
-using EventStore.Core.Index;
-using EventStore.Common.Utils;
-using EventStore.Common.Options;
-
-namespace EventStore.Core.Tests.Index.IndexV2 {
-	[TestFixture(PTable.IndexEntryV2Size), Explicit]
-	public class
-		opening_a_ptable_with_more_than_32bits_of_records : IndexV1.opening_a_ptable_with_more_than_32bits_of_records {
-		public opening_a_ptable_with_more_than_32bits_of_records(int indexEntrySize) : base(indexEntrySize) {
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV3/opening_a_ptable_with_more_than_32bits_of_records.cs b/src/EventStore.Core.Tests/Index/IndexV3/opening_a_ptable_with_more_than_32bits_of_records.cs
deleted file mode 100644
index a8a29a445a4..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV3/opening_a_ptable_with_more_than_32bits_of_records.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Security.Cryptography;
-using System.Diagnostics;
-using System.IO;
-using NUnit.Framework;
-using EventStore.Core.Index;
-using EventStore.Common.Utils;
-using EventStore.Common.Options;
-
-namespace EventStore.Core.Tests.Index.IndexV3 {
-	[TestFixture(PTable.IndexEntryV3Size), Explicit]
-	public class
-		opening_a_ptable_with_more_than_32bits_of_records : IndexV1.opening_a_ptable_with_more_than_32bits_of_records {
-		public opening_a_ptable_with_more_than_32bits_of_records(int indexEntrySize) : base(indexEntrySize) {
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV3/when_upgrading_index_to_64bit_stream_version.cs b/src/EventStore.Core.Tests/Index/IndexV3/when_upgrading_index_to_64bit_stream_version.cs
deleted file mode 100644
index 330385e3214..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV3/when_upgrading_index_to_64bit_stream_version.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-using System.Linq;
-using EventStore.Core.Index;
-using EventStore.Core.TransactionLog;
-using NUnit.Framework;
-using EventStore.Core.Index.Hashes;
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.Tests.Index.IndexV3 {
-	[TestFixture, Category("LongRunning")]
-	public class when_upgrading_index_to_64bit_stream_version : SpecificationWithDirectoryPerTestFixture {
-		private TableIndex<string> _tableIndex;
-		private IHasher<string> _lowHasher;
-		private IHasher<string> _highHasher;
-		private string _indexDir;
-		protected byte _ptableVersion;
-
-		public when_upgrading_index_to_64bit_stream_version() {
-			_ptableVersion = PTableVersions.IndexV3;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_indexDir = PathName;
-			var fakeReader = new TFReaderLease(new FakeIndexReader());
-			_lowHasher = new XXHashUnsafe();
-			_highHasher = new Murmur3AUnsafe();
-			_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
-				() => new HashListMemTable(PTableVersions.IndexV2, maxSize: 5),
-				() => fakeReader,
-				PTableVersions.IndexV2,
-				5, Constants.PTableMaxReaderCountDefault,
-				maxSizeForMemory: 5,
-				maxTablesPerLevel: 2);
-			_tableIndex.Initialize(long.MaxValue);
-
-			_tableIndex.Add(1, "testStream-1", 0, 1);
-			_tableIndex.Add(1, "testStream-2", 0, 2);
-			_tableIndex.Add(1, "testStream-1", 1, 3);
-			_tableIndex.Add(1, "testStream-2", 1, 4);
-			_tableIndex.Add(1, "testStream-1", 2, 5);
-
-			_tableIndex.Close(false);
-
-			_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
-				() => new HashListMemTable(_ptableVersion, maxSize: 5),
-				() => fakeReader,
-				_ptableVersion,
-				5, Constants.PTableMaxReaderCountDefault,
-				maxSizeForMemory: 5,
-				maxTablesPerLevel: 2);
-			_tableIndex.Initialize(long.MaxValue);
-
-			_tableIndex.Add(1, "testStream-2", 2, 6);
-			_tableIndex.Add(1, "testStream-1", 3, 7);
-			_tableIndex.Add(1, "testStream-2", 3, 8);
-			_tableIndex.Add(1, "testStream-1", 4, 9);
-			_tableIndex.Add(1, "testStream-2", 4, 10);
-
-			await Task.Delay(500);
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_tableIndex.Close();
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void should_have_entries_in_sorted_order() {
-			var streamId = "testStream-2";
-			var result = _tableIndex.GetRange(streamId, 0, 4).ToArray();
-			var hash = (ulong)_lowHasher.Hash(streamId) << 32 | _highHasher.Hash(streamId);
-
-			Assert.That(result.Count(), Is.EqualTo(5));
-
-			Assert.That(result[0].Stream, Is.EqualTo(hash));
-			Assert.That(result[0].Version, Is.EqualTo(4));
-			Assert.That(result[0].Position, Is.EqualTo(10));
-
-			Assert.That(result[1].Stream, Is.EqualTo(hash));
-			Assert.That(result[1].Version, Is.EqualTo(3));
-			Assert.That(result[1].Position, Is.EqualTo(8));
-
-			Assert.That(result[2].Stream, Is.EqualTo(hash));
-			Assert.That(result[2].Version, Is.EqualTo(2));
-			Assert.That(result[2].Position, Is.EqualTo(6));
-
-			Assert.That(result[3].Stream, Is.EqualTo(hash));
-			Assert.That(result[3].Version, Is.EqualTo(1));
-			Assert.That(result[3].Position, Is.EqualTo(4));
-
-			Assert.That(result[4].Stream, Is.EqualTo(hash));
-			Assert.That(result[4].Version, Is.EqualTo(0));
-			Assert.That(result[4].Position, Is.EqualTo(2));
-
-			streamId = "testStream-1";
-			result = _tableIndex.GetRange(streamId, 0, 4).ToArray();
-			hash = (ulong)_lowHasher.Hash(streamId) << 32 | _highHasher.Hash(streamId);
-
-			Assert.That(result.Count(), Is.EqualTo(5));
-
-			Assert.That(result[0].Stream, Is.EqualTo(hash));
-			Assert.That(result[0].Version, Is.EqualTo(4));
-			Assert.That(result[0].Position, Is.EqualTo(9));
-
-			Assert.That(result[1].Stream, Is.EqualTo(hash));
-			Assert.That(result[1].Version, Is.EqualTo(3));
-			Assert.That(result[1].Position, Is.EqualTo(7));
-
-			Assert.That(result[2].Stream, Is.EqualTo(hash));
-			Assert.That(result[2].Version, Is.EqualTo(2));
-			Assert.That(result[2].Position, Is.EqualTo(5));
-
-			Assert.That(result[3].Stream, Is.EqualTo(hash));
-			Assert.That(result[3].Version, Is.EqualTo(1));
-			Assert.That(result[3].Position, Is.EqualTo(3));
-
-			Assert.That(result[4].Stream, Is.EqualTo(hash));
-			Assert.That(result[4].Version, Is.EqualTo(0));
-			Assert.That(result[4].Position, Is.EqualTo(1));
-		}
-	}
-
-	public class FakeIndexReader : ITransactionFileReader {
-		public void Reposition(long position) {
-			throw new NotImplementedException();
-		}
-
-		public SeqReadResult TryReadNext() {
-			throw new NotImplementedException();
-		}
-
-		public SeqReadResult TryReadPrev() {
-			throw new NotImplementedException();
-		}
-
-		public RecordReadResult TryReadAt(long position, bool couldBeScavenged) {
-			var record = (LogRecord)new PrepareLogRecord(position, Guid.NewGuid(), Guid.NewGuid(), 0, 0,
-				position % 2 == 0 ? "testStream-2" : "testStream-1", null, -1, DateTime.UtcNow, PrepareFlags.None, "type",
-				null, new byte[0], null);
-			return new RecordReadResult(true, position + 1, record, 1);
-		}
-
-		public bool ExistsAt(long position) {
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV4/Utils.cs b/src/EventStore.Core.Tests/Index/IndexV4/Utils.cs
deleted file mode 100644
index db666b12408..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV4/Utils.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Numerics;
-
-namespace EventStore.Core.Tests.Index.IndexV4;
-
-public static class Utils {
-	public static bool IsMidpointIndex(long index, long numIndexEntries, int numMidpoints) {
-		//special cases
-		if (numIndexEntries < 1) return false;
-		if (numIndexEntries == 1) {
-			if (numMidpoints == 2 && index == 0) return true;
-			return false;
-		}
-
-		//a midpoint index entry satisfies:
-		//index = floor (k * (numIndexEntries - 1) / (numMidpoints - 1));    for k = 0 to numMidpoints-1
-		//we need to find if there exists an integer x, such that:
-		//index*(numMidpoints-1)/(numIndexEntries-1) <= x < (index+1)*(numMidpoints-1)/(numIndexEntries-1)
-		var lower = (BigInteger) index * (numMidpoints - 1) / (numIndexEntries - 1);
-		if (((BigInteger) index * (numMidpoints - 1)) % (numIndexEntries - 1) != 0) lower++;
-		var upper = (BigInteger) (index + 1) * (numMidpoints - 1) / (numIndexEntries - 1);
-		if (((BigInteger) (index + 1) * (numMidpoints - 1)) % (numIndexEntries - 1) == 0) upper--;
-		return lower <= upper;
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV4/opening_a_ptable_with_more_than_32bits_of_records.cs b/src/EventStore.Core.Tests/Index/IndexV4/opening_a_ptable_with_more_than_32bits_of_records.cs
deleted file mode 100644
index b4d271d9dc5..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV4/opening_a_ptable_with_more_than_32bits_of_records.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Security.Cryptography;
-using System.Diagnostics;
-using System.IO;
-using NUnit.Framework;
-using EventStore.Core.Index;
-using EventStore.Common.Utils;
-using EventStore.Common.Options;
-
-namespace EventStore.Core.Tests.Index.IndexV4 {
-	[TestFixture(PTable.IndexEntryV4Size), Explicit]
-	public class
-		opening_a_ptable_with_more_than_32bits_of_records : IndexV1.opening_a_ptable_with_more_than_32bits_of_records {
-		public opening_a_ptable_with_more_than_32bits_of_records(int indexEntrySize) : base(indexEntrySize) {
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV4/ptable_midpoint_calculations_should.cs b/src/EventStore.Core.Tests/Index/IndexV4/ptable_midpoint_calculations_should.cs
deleted file mode 100644
index 0e68d9f767b..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV4/ptable_midpoint_calculations_should.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Numerics;
-using EventStore.Core.Index;
-using NUnit.Framework;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Tests.Index.IndexV4 {
-	public class ptable_midpoint_calculations_should : SpecificationWithDirectory {
-		protected byte _ptableVersion = PTableVersions.IndexV4;
-		private static readonly ILogger Log = Serilog.Log.ForContext<ptable_midpoint_calculations_should>();
-
-		private void construct_same_midpoint_indexes_for_any_combination_of_params(int maxIndexEntries) {
-			for (var numIndexEntries = 0; numIndexEntries < maxIndexEntries; numIndexEntries++) {
-				for (var depth = 0; depth < 20; depth++) {
-					var requiredMidpointsCount =
-						PTable.GetRequiredMidpointCountCached(numIndexEntries, _ptableVersion, depth);
-					List<long> requiredMidpoints = new List<long>();
-					for (var k = 0; k < requiredMidpointsCount; k++) {
-						var index = PTable.GetMidpointIndex(k, numIndexEntries, requiredMidpointsCount);
-						requiredMidpoints.Add(index);
-					}
-
-					List<long> calculatedMidpoints = new List<long>();
-					for (var k = 0; k < numIndexEntries; k++) {
-						if (Utils.IsMidpointIndex(k, numIndexEntries, requiredMidpointsCount)) {
-							calculatedMidpoints.Add(k);
-						}
-					}
-
-					if (numIndexEntries == 1 && calculatedMidpoints.Count == 1) {
-						calculatedMidpoints.Add(calculatedMidpoints[0]);
-					}
-
-					if (requiredMidpoints.Count != calculatedMidpoints.Count) {
-						Log.Error(
-							"Midpoint count mismatch for numIndexEntries: {0}, depth:{1} - Expected {2}, Found {3}",
-							numIndexEntries, depth, requiredMidpoints.Count, calculatedMidpoints.Count);
-					}
-
-					Assert.AreEqual(requiredMidpoints.Count, calculatedMidpoints.Count);
-
-					for (var i = 0; i < requiredMidpoints.Count; i++) {
-						if (requiredMidpoints[i] != calculatedMidpoints[i]) {
-							Log.Error(
-								"Midpoint mismatch at index {0} for numIndexEntries: {1}, depth:{2} - Expected {3}, Found {4}",
-								i, numIndexEntries, depth, requiredMidpoints[i], calculatedMidpoints[i]);
-						}
-
-						Assert.AreEqual(requiredMidpoints[i], calculatedMidpoints[i]);
-					}
-				}
-			}
-		}
-
-		[Test, Category("LongRunning"), Ignore("Long running")]
-		public void construct_same_midpoint_indexes_for_any_combination_of_params_large() {
-			construct_same_midpoint_indexes_for_any_combination_of_params(4096);
-		}
-
-		[Test]
-		public void construct_same_midpoint_indexes_for_any_combination_of_params_small() {
-			construct_same_midpoint_indexes_for_any_combination_of_params(200);
-		}
-
-		[Test]
-		public void return_a_positive_index_even_for_really_big_ptables() {
-			var depth = 28;
-			var index = PTable.GetMidpointIndex(
-				k: 265_000_000,
-				numIndexEntries: 46_000_000_000,
-				numMidpoints: 1 << depth);
-
-			Assert.Positive(index);
-		}
-
-		[Test]
-		public void return_correct_indexes_for_really_big_ptables() {
-			var numIndexEntries = 46_000_000_000;
-			var numMidpoints = 1 << 28;
-
-			for (var k = numMidpoints - 1000; k < numMidpoints; k++) {
-				var index = PTable.GetMidpointIndex(k, numIndexEntries, numMidpoints);
-				var correctIndex = GetMidpointIndexBigInt(k, numIndexEntries, numMidpoints);
-				Assert.Positive(correctIndex);
-				Assert.AreEqual(correctIndex, index);
-			}
-		}
-
-		private static long GetMidpointIndexBigInt(int k, long numIndexEntries, int numMidpoints) {
-			if (k == 0)
-				return 0;
-
-			if (k == numMidpoints - 1)
-				return numIndexEntries - 1;
-
-			var res = (BigInteger)k * (numIndexEntries - 1) / (numMidpoints - 1);
-			return (long)res;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV4/when_merging_ptables_vx_to_v4.cs b/src/EventStore.Core.Tests/Index/IndexV4/when_merging_ptables_vx_to_v4.cs
deleted file mode 100644
index 544f9197436..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV4/when_merging_ptables_vx_to_v4.cs
+++ /dev/null
@@ -1,247 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Index;
-using NUnit.Framework;
-using System.IO;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.Tests.Index.IndexV4 {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class when_merging_ptables_vx_to_v4 : SpecificationWithDirectoryPerTestFixture {
-		private readonly List<string> _files = new List<string>();
-		private readonly List<PTable> _tables = new List<PTable>();
-
-		private PTable _newtable;
-		private string _newtableFile;
-		private byte _fromVersion;
-		private bool _skipIndexVerify;
-
-		public when_merging_ptables_vx_to_v4(byte fromVersion, bool skipIndexVerify) {
-			_fromVersion = fromVersion;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_files.Add(GetTempFilePath());
-			var table = new HashListMemTable(_fromVersion, maxSize: 20);
-			if (_fromVersion == PTableVersions.IndexV1) {
-				table.Add(0x010100000000, 0, 0x0101);
-				table.Add(0x010200000000, 0, 0x0102);
-				table.Add(0x010300000000, 0, 0x0103);
-				table.Add(0x010400000000, 0, 0x0104);
-			} else {
-				table.Add(0x0101, 0, 0x0101);
-				table.Add(0x0102, 0, 0x0102);
-				table.Add(0x0103, 0, 0x0103);
-				table.Add(0x0104, 0, 0x0104);
-			}
-
-			_tables.Add(PTable.FromMemtable(table, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify));
-			table = new HashListMemTable(_fromVersion, maxSize: 20);
-
-			if (_fromVersion == PTableVersions.IndexV1) {
-				table.Add(0x010500000000, 0, 0x0105);
-				table.Add(0x010600000000, 0, 0x0106);
-				table.Add(0x010700000000, 0, 0x0107);
-				table.Add(0x010800000000, 0, 0x0108);
-			} else {
-				table.Add(0x0105, 0, 0x0105);
-				table.Add(0x0106, 0, 0x0106);
-				table.Add(0x0107, 0, 0x0107);
-				table.Add(0x0108, 0, 0x0108);
-			}
-
-			_tables.Add(PTable.FromMemtable(table, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify));
-			_newtableFile = GetTempFilePath();
-			_newtable = PTable.MergeTo(_tables, _newtableFile,
-				PTableVersions.IndexV4, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault,
-				skipIndexVerify: _skipIndexVerify);
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_newtable.Dispose();
-			foreach (var ssTable in _tables) {
-				ssTable.Dispose();
-			}
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void merged_ptable_is_64bit() {
-			Assert.AreEqual(PTableVersions.IndexV4, _newtable.Version);
-		}
-
-		[Test]
-		public void there_are_8_records_in_the_merged_index() {
-			Assert.AreEqual(8, _newtable.Count);
-		}
-
-		[Test]
-		public void midpoints_are_cached_in_ptable_footer() {
-			var numIndexEntries = 8;
-			var requiredMidpoints = PTable.GetRequiredMidpointCountCached(numIndexEntries, PTableVersions.IndexV4);
-
-			var newTableFileCopy = GetTempFilePath();
-			File.Copy(_newtableFile, newTableFileCopy);
-			using (var filestream = File.Open(newTableFileCopy, FileMode.Open, FileAccess.Read)) {
-				var footerSize = PTableFooter.GetSize(PTableVersions.IndexV4);
-				Assert.AreEqual(filestream.Length,
-					PTableHeader.Size + numIndexEntries * PTable.IndexEntryV4Size +
-					requiredMidpoints * PTable.IndexEntryV4Size + footerSize + PTable.MD5Size);
-				filestream.Seek(
-					PTableHeader.Size + numIndexEntries * PTable.IndexEntryV4Size +
-					requiredMidpoints * PTable.IndexEntryV4Size, SeekOrigin.Begin);
-
-				var ptableFooter = PTableFooter.FromStream(filestream);
-				Assert.AreEqual(FileType.PTableFile, ptableFooter.FileType);
-				Assert.AreEqual(PTableVersions.IndexV4, ptableFooter.Version);
-				Assert.AreEqual(requiredMidpoints, ptableFooter.NumMidpointsCached);
-			}
-		}
-
-		[Test]
-		public void correct_number_of_midpoints_are_loaded() {
-			Assert.AreEqual(_newtable.GetMidPoints().Length,
-				PTable.GetRequiredMidpointCountCached(8, PTableVersions.IndexV4));
-		}
-
-		[Test]
-		public void all_the_entries_have_upgraded_hashes() {
-			if (_fromVersion == PTableVersions.IndexV1) {
-				foreach (var item in _newtable.IterateAllInOrder()) {
-					Assert.IsTrue((ulong)item.Position == item.Stream - 1,
-						"Expected the Stream (Hash) {0} to be equal to {1}", item.Stream - 1, item.Position);
-				}
-			}
-		}
-
-		[Test]
-		public void none_of_the_entries_have_upgraded_hashes() {
-			if (_fromVersion > PTableVersions.IndexV1) {
-				foreach (var item in _newtable.IterateAllInOrder()) {
-					Assert.IsTrue((ulong)item.Position == item.Stream,
-						"Expected the Stream (Hash) {0} to be equal to {1}", item.Stream, item.Position);
-				}
-			}
-		}
-	}
-
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class when_merging_to_ptable_v4_with_deleted_entries : SpecificationWithDirectoryPerTestFixture {
-		private readonly List<string> _files = new List<string>();
-		private readonly List<PTable> _tables = new List<PTable>();
-		private string _newtableFile;
-
-		private PTable _newtable;
-		private byte _fromVersion;
-		private bool _skipIndexVerify;
-
-		public when_merging_to_ptable_v4_with_deleted_entries(byte fromVersion, bool skipIndexVerify) {
-			_fromVersion = fromVersion;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_files.Add(GetTempFilePath());
-			var table = new HashListMemTable(_fromVersion, maxSize: 20);
-			table.Add(0x010100000000, 0, 1);
-			table.Add(0x010200000000, 0, 2);
-			table.Add(0x010300000000, 0, 3);
-			table.Add(0x010300000000, 1, 4);
-			_tables.Add(PTable.FromMemtable(table, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify));
-			table = new HashListMemTable(_fromVersion, maxSize: 20);
-			table.Add(0x010100000000, 2, 5);
-			table.Add(0x010200000000, 1, 6);
-			table.Add(0x010200000000, 2, 7);
-			table.Add(0x010400000000, 0, 8);
-			table.Add(0x010400000000, 1, 9);
-			_tables.Add(PTable.FromMemtable(table, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify));
-			table = new HashListMemTable(_fromVersion, maxSize: 20);
-			table.Add(0x010100000000, 1, 10);
-			table.Add(0x010100000000, 2, 11);
-			table.Add(0x010500000000, 1, 12);
-			table.Add(0x010500000000, 2, 13);
-			table.Add(0x010500000000, 3, 14);
-			_tables.Add(PTable.FromMemtable(table, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify));
-			_newtableFile = GetTempFilePath();
-			_newtable = PTable.MergeTo(_tables, _newtableFile,
-				PTableVersions.IndexV4, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify);
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_newtable.Dispose();
-			foreach (var ssTable in _tables) {
-				ssTable.Dispose();
-			}
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void merged_ptable_is_64bit() {
-			Assert.AreEqual(PTableVersions.IndexV4, _newtable.Version);
-		}
-
-		[Test]
-		public void there_are_14_records_in_the_merged_index() {
-			Assert.AreEqual(14, _newtable.Count);
-		}
-
-		[Test]
-		public void midpoints_are_cached_in_ptable_footer() {
-			var numIndexEntries = 14;
-			var requiredMidpoints = PTable.GetRequiredMidpointCountCached(numIndexEntries, PTableVersions.IndexV4);
-
-			var newTableFileCopy = GetTempFilePath();
-			File.Copy(_newtableFile, newTableFileCopy);
-			using (var filestream = File.Open(newTableFileCopy, FileMode.Open, FileAccess.Read)) {
-				var footerSize = PTableFooter.GetSize(PTableVersions.IndexV4);
-				Assert.AreEqual(filestream.Length,
-					PTableHeader.Size + numIndexEntries * PTable.IndexEntryV4Size +
-					requiredMidpoints * PTable.IndexEntryV4Size + footerSize + PTable.MD5Size);
-				filestream.Seek(
-					PTableHeader.Size + numIndexEntries * PTable.IndexEntryV4Size +
-					requiredMidpoints * PTable.IndexEntryV4Size, SeekOrigin.Begin);
-
-				var ptableFooter = PTableFooter.FromStream(filestream);
-				Assert.AreEqual(FileType.PTableFile, ptableFooter.FileType);
-				Assert.AreEqual(PTableVersions.IndexV4, ptableFooter.Version);
-				Assert.AreEqual(requiredMidpoints, ptableFooter.NumMidpointsCached);
-			}
-		}
-
-		[Test]
-		public void correct_number_of_midpoints_are_loaded() {
-			Assert.AreEqual(_newtable.GetMidPoints().Length,
-				PTable.GetRequiredMidpointCountCached(14, PTableVersions.IndexV4));
-		}
-
-		[Test]
-		public void the_items_are_sorted() {
-			var last = new IndexEntry(ulong.MaxValue, 0, long.MaxValue);
-			foreach (var item in _newtable.IterateAllInOrder()) {
-				Assert.IsTrue((last.Stream == item.Stream ? last.Version > item.Version : last.Stream > item.Stream) ||
-							  ((last.Stream == item.Stream && last.Version == item.Version) &&
-							   last.Position > item.Position));
-				last = item;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexV4/when_merging_ptables_with_entries_to_nonexisting_record.cs b/src/EventStore.Core.Tests/Index/IndexV4/when_merging_ptables_with_entries_to_nonexisting_record.cs
deleted file mode 100644
index a006e5f7525..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexV4/when_merging_ptables_with_entries_to_nonexisting_record.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexV4 {
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class
-		when_merging_ptables_with_entries_to_nonexisting_record : IndexV1.
-			when_merging_ptables_with_entries_to_nonexisting_record_in_newer_index_versions {
-		public when_merging_ptables_with_entries_to_nonexisting_record(byte version, bool skipIndexVerify) : base(
-			version, skipIndexVerify) {
-		}
-
-		[Test]
-		public void the_correct_midpoints_are_cached() {
-			var midpoints = _newtable.GetMidPoints();
-			var requiredMidpoints = PTable.GetRequiredMidpointCountCached(_newtable.Count, _ptableVersion);
-
-			Assert.AreEqual(requiredMidpoints, midpoints.Length);
-
-			var position = 0;
-			foreach (var item in _newtable.IterateAllInOrder()) {
-				if (Utils.IsMidpointIndex(position, _newtable.Count, requiredMidpoints)) {
-					Assert.AreEqual(item.Stream, midpoints[position].Key.Stream);
-					Assert.AreEqual(item.Version, midpoints[position].Key.Version);
-					Assert.AreEqual(position, midpoints[position].ItemIndex);
-					position++;
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexVAny/create_index_map_from_non_existing_file.cs b/src/EventStore.Core.Tests/Index/IndexVAny/create_index_map_from_non_existing_file.cs
deleted file mode 100644
index 1b7e6a0560c..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexVAny/create_index_map_from_non_existing_file.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Linq;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexVAny {
-	[TestFixture]
-	public class create_index_map_from_non_existing_file {
-		private IndexMap _map;
-
-		[SetUp]
-		public void Setup() {
-			_map = IndexMapTestFactory.FromFile("thisfiledoesnotexist");
-		}
-
-		[Test]
-		public void the_map_is_empty() {
-			Assert.AreEqual(0, _map.InOrder().Count());
-		}
-
-		[Test]
-		public void no_file_names_are_used() {
-			Assert.AreEqual(0, _map.GetAllFilenames().Count());
-		}
-
-		[Test]
-		public void prepare_checkpoint_is_equal_to_minus_one() {
-			Assert.AreEqual(-1, _map.PrepareCheckpoint);
-		}
-
-		[Test]
-		public void commit_checkpoint_is_equal_to_minus_one() {
-			Assert.AreEqual(-1, _map.CommitCheckpoint);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexVAny/midpoint_assertions.cs b/src/EventStore.Core.Tests/Index/IndexVAny/midpoint_assertions.cs
deleted file mode 100644
index b487b33d5a1..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexVAny/midpoint_assertions.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System;
-using System.Collections;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexVAny {
-
-	[TestFixture]
-	public class midpoint_assertions {
-		private const long MAX_INDEX_ENTRIES = 1000000000000L;
-		private const int MAX_TEST_DEPTH = 35;
-		private const int MAX_DEPTH = 28;
-		private static readonly byte[] IndexVersions = { PTableVersions.IndexV1, PTableVersions.IndexV2, PTableVersions.IndexV3, PTableVersions.IndexV4 };
-
-		private static int getIncrement(long numIndexEntries) {
-			if (numIndexEntries < 100)
-				return 1;
-			if (numIndexEntries < 1000000)
-				return 1337;
-			return 133333337;
-		}
-
-		public class TestCases : IEnumerable {
-			public IEnumerator GetEnumerator() {
-				foreach (var version in IndexVersions) {
-					for (int minDepth = 0; minDepth <= MAX_TEST_DEPTH; minDepth++) {
-						yield return new object[] { version, minDepth };
-					}
-				}
-			}
-		}
-
-		[Test, TestCaseSource(typeof(TestCases))]
-		public void file_size_should_be_greater_or_equal_after_adding_midpoints(byte version, int minDepth) {
-			for (long numIndexEntries = 0; numIndexEntries < MAX_INDEX_ENTRIES; numIndexEntries += getIncrement(numIndexEntries)) {
-				string testCase = $"numIndexEntries: {numIndexEntries}, minDepth: {minDepth}, version: {version}";
-				var midpointCount = PTable.GetRequiredMidpointCountCached(numIndexEntries, version, minDepth);
-				if (version < PTableVersions.IndexV4) {
-					Assert.AreEqual(0, midpointCount, testCase);
-				} else {
-					Assert.GreaterOrEqual(midpointCount, Math.Min(1 << Math.Min(MAX_DEPTH, minDepth), numIndexEntries), testCase);
-					Assert.LessOrEqual(midpointCount, Math.Max(2, numIndexEntries), testCase);
-				}
-
-				long fileSizeUpToIndexEntries = PTable.GetFileSizeUpToIndexEntries(numIndexEntries, version);
-				long fileSizeUpToMidpointEntries =
-					PTable.GetFileSizeUpToMidpointEntries(fileSizeUpToIndexEntries, midpointCount, version);
-
-				if (version < PTableVersions.IndexV4) {
-					Assert.AreEqual(fileSizeUpToIndexEntries, fileSizeUpToMidpointEntries, testCase);
-				} else {
-					Assert.GreaterOrEqual(fileSizeUpToMidpointEntries, fileSizeUpToIndexEntries, testCase);
-				}
-			}
-		}
-
-		[Test]
-		public void for_a_fixed_min_depth_and_increasing_index_entries_midpoint_count_should_increase_monotonically() {
-			for (int minDepth = 0; minDepth <= MAX_TEST_DEPTH; minDepth++) {
-				long prevMidpointCount = 0L;
-				for (long numIndexEntries = 0; numIndexEntries < MAX_INDEX_ENTRIES; numIndexEntries += getIncrement(numIndexEntries)) {
-					string testCase = $"numIndexEntries: {numIndexEntries}, minDepth: {minDepth}";
-					var midpointCount = PTable.GetRequiredMidpointCountCached(numIndexEntries, PTableVersions.IndexV4, minDepth);
-					Assert.GreaterOrEqual(midpointCount, prevMidpointCount, testCase);
-					Assert.GreaterOrEqual(midpointCount, Math.Min(1 << Math.Min(MAX_DEPTH, minDepth), numIndexEntries), testCase);
-					Assert.LessOrEqual(midpointCount, Math.Max(2, numIndexEntries), testCase);
-					prevMidpointCount = midpointCount;
-				}
-			}
-		}
-
-		[Test]
-		public void for_a_fixed_number_of_index_entries_and_increasing_min_depth_midpoint_count_should_increase_monotonically() {
-			for (long numIndexEntries = 0; numIndexEntries < MAX_INDEX_ENTRIES; numIndexEntries += getIncrement(numIndexEntries)) {
-				long prevMidpointCount = 0L;
-				for (int minDepth = 0; minDepth <= MAX_TEST_DEPTH; minDepth++) {
-					string testCase = $"numIndexEntries: {numIndexEntries}, minDepth: {minDepth}";
-					var midpointCount = PTable.GetRequiredMidpointCountCached(numIndexEntries, PTableVersions.IndexV4, minDepth);
-					Assert.GreaterOrEqual(midpointCount, prevMidpointCount, testCase);
-					Assert.GreaterOrEqual(midpointCount, Math.Min(1 << Math.Min(MAX_DEPTH, minDepth), numIndexEntries), testCase);
-					Assert.LessOrEqual(midpointCount, Math.Max(2, numIndexEntries), testCase);
-					prevMidpointCount = midpointCount;
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexVAny/saving_empty_index_to_a_file.cs b/src/EventStore.Core.Tests/Index/IndexVAny/saving_empty_index_to_a_file.cs
deleted file mode 100644
index 600451dea80..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexVAny/saving_empty_index_to_a_file.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using EventStore.Core.Util;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexVAny {
-	[TestFixture]
-	public class saving_empty_index_to_a_file : SpecificationWithDirectoryPerTestFixture {
-		private string _filename;
-		private IndexMap _map;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_filename = GetFilePathFor("indexfile");
-			_map = IndexMapTestFactory.FromFile(_filename);
-			_map.SaveToFile(_filename);
-		}
-
-		[Test]
-		public void the_file_exists() {
-			Assert.IsTrue(File.Exists(_filename));
-		}
-
-		[Test]
-		public void the_file_contains_correct_data() {
-			using (var fs = File.OpenRead(_filename))
-			using (var reader = new StreamReader(fs)) {
-				var text = reader.ReadToEnd();
-				var lines = text.Replace("\r", "").Split('\n');
-
-				fs.Position = 32;
-				var md5 = MD5Hash.GetHashFor(fs);
-				var md5String = BitConverter.ToString(md5).Replace("-", "");
-
-				Assert.AreEqual(5, lines.Count());
-				Assert.AreEqual(md5String, lines[0]);
-				Assert.AreEqual(IndexMap.IndexMapVersion.ToString(), lines[1]);
-				Assert.AreEqual("-1/-1", lines[2]);
-				Assert.AreEqual($"{int.MaxValue}", lines[3]);
-				Assert.AreEqual("", lines[4]);
-			}
-		}
-
-		[Test]
-		public void saved_file_could_be_read_correctly_and_without_errors() {
-			var map = IndexMapTestFactory.FromFile(_filename);
-
-			Assert.AreEqual(-1, map.PrepareCheckpoint);
-			Assert.AreEqual(-1, map.CommitCheckpoint);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexVAny/when_opening_ptable_without_right_flag_in_header.cs b/src/EventStore.Core.Tests/Index/IndexVAny/when_opening_ptable_without_right_flag_in_header.cs
deleted file mode 100644
index 0a3ca0bf78f..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexVAny/when_opening_ptable_without_right_flag_in_header.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.IO;
-using EventStore.Common.Options;
-using EventStore.Core.Exceptions;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexVAny {
-	[TestFixture]
-	public class when_opening_ptable_without_right_flag_in_header : SpecificationWithFile {
-		[SetUp]
-		public override void SetUp() {
-			base.SetUp();
-			using (var stream = File.OpenWrite(Filename)) {
-				var bytes = new byte[128];
-				bytes[0] = 0x27;
-				stream.Write(bytes, 0, bytes.Length);
-			}
-		}
-
-		[Test]
-		public void the_invalid_file_exception_is_thrown() {
-			var exc = Assert.Throws<CorruptIndexException>(() => PTable.FromFile(Filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 16, false));
-			Assert.IsInstanceOf<InvalidFileException>(exc.InnerException);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/IndexVAny/when_opening_v1_indexmap.cs b/src/EventStore.Core.Tests/Index/IndexVAny/when_opening_v1_indexmap.cs
deleted file mode 100644
index d6c166cabdb..00000000000
--- a/src/EventStore.Core.Tests/Index/IndexVAny/when_opening_v1_indexmap.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.Core.Exceptions;
-using EventStore.Core.Index;
-using EventStore.Core.Util;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.IndexVAny {
-	[TestFixture]
-	public class when_opening_v1_indexmap : SpecificationWithDirectoryPerTestFixture {
-		private const string
-			V1FileContents =
-				"6954492497DD64BF751FC6CFA0C9CEE2\r\n1\r\n-1/-1\r\n"; //this doesn't matter because the hash will be calculated from the bytes
-
-		//The hash value will change depending on whether the file was written on windows or some other platform
-		private string V2FileContents = Environment.NewLine + "2" + Environment.NewLine + "-1/-1" +
-										Environment.NewLine + "4" + Environment.NewLine;
-
-		private string _filename;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			var ms = new MemoryStream(Encoding.UTF8.GetBytes(V2FileContents));
-			var md5 = MD5Hash.GetHashFor(ms);
-			V2FileContents = BitConverter.ToString(md5).Replace("-", "") + V2FileContents;
-			await base.TestFixtureSetUp();
-
-			_filename = GetFilePathFor("indexfile");
-			File.WriteAllText(_filename, V1FileContents);
-		}
-
-		[Test]
-		public void should_initialize_auto_merge_level_correctly() {
-			var map = IndexMapTestFactory.FromFile(_filename, loadPTables: false, maxAutoMergeLevel: 4);
-
-			var v2File = GetFilePathFor("v1tov2");
-			map.SaveToFile(v2File);
-			Assert.AreEqual(V2FileContents, File.ReadAllText(v2File));
-		}
-	}
-
-	[TestFixture]
-	public class when_opening_indexmap_with_auto_merge_level_set : SpecificationWithDirectoryPerTestFixture {
-		private string _filename;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_filename = GetFilePathFor("indexfile");
-			var empty = IndexMap.CreateEmpty(2, 4, Constants.PTableMaxReaderCountDefault);
-			empty.SaveToFile(_filename);
-		}
-
-		[Test]
-		public void should_throw_if_max_auto_merge_is_larger_than_map_value() {
-			Assert.Throws<CorruptIndexException>(() => IndexMapTestFactory.FromFile(_filename, maxAutoMergeLevel: 5));
-		}
-
-		[Test]
-		public void can_reduce_max_auto_merge_to_lower_than_map_value() {
-			IndexMap map = null;
-			Assert.DoesNotThrow(() => map = IndexMapTestFactory.FromFile(_filename, maxAutoMergeLevel: 3));
-			var newIndexFile = GetFilePathFor("indexfile2");
-			map?.SaveToFile(newIndexFile);
-			var lines = File.ReadAllLines(newIndexFile);
-			Assert.AreEqual(lines[3], "3");
-		}
-
-		[Test]
-		public void should_open_if_auto_merge_levels_match() {
-			Assert.DoesNotThrow(() => IndexMapTestFactory.FromFile(_filename, maxAutoMergeLevel: 4));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/MemTableTests.cs b/src/EventStore.Core.Tests/Index/MemTableTests.cs
deleted file mode 100644
index 22018222afc..00000000000
--- a/src/EventStore.Core.Tests/Index/MemTableTests.cs
+++ /dev/null
@@ -1,661 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index {
-	[TestFixture]
-	public class HashListMemTableTests : MemTableTestsFixture {
-		public HashListMemTableTests()
-			: base(() => new HashListMemTable(PTableVersions.IndexV2, maxSize: 20)) {
-		}
-	}
-
-	[TestFixture]
-	public abstract class MemTableTestsFixture {
-		private readonly Func<IMemTable> _memTableFactory;
-
-		protected IMemTable MemTable;
-
-		protected MemTableTestsFixture(Func<IMemTable> memTableFactory) {
-			_memTableFactory = memTableFactory;
-			Ensure.NotNull(memTableFactory, "memTableFactory");
-		}
-
-		[SetUp]
-		public void SetUp() {
-			MemTable = _memTableFactory();
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_on_range_query_when_provided_with_negative_start_version() {
-			Assert.Throws<ArgumentOutOfRangeException>(() => MemTable.GetRange(0x0000, -1, int.MaxValue).ToArray());
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_on_range_query_when_provided_with_negative_end_version() {
-			Assert.Throws<ArgumentOutOfRangeException>(() => MemTable.GetRange(0x0000, 0, -1).ToArray());
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_on_get_one_entry_query_when_provided_with_negative_version() {
-			long pos;
-			Assert.Throws<ArgumentOutOfRangeException>(() => MemTable.TryGetOneValue(0x0000, -1, out pos));
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_on_adding_entry_with_negative_version() {
-			Assert.Throws<ArgumentOutOfRangeException>(() => MemTable.Add(0x0000, -1, 0));
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_on_adding_entry_with_negative_position() {
-			Assert.Throws<ArgumentOutOfRangeException>(() => MemTable.Add(0x0000, 0, -1));
-		}
-
-		[Test]
-		public void empty_memtable_has_count_of_zero() {
-			Assert.AreEqual(0, MemTable.Count);
-		}
-
-		[Test]
-		public void adding_an_item_increments_count() {
-			MemTable.Add(0x11, 0x01, 0xffff);
-			Assert.AreEqual(1, MemTable.Count);
-		}
-
-		[Test]
-		public void non_existent_item_is_not_found() {
-			MemTable.Add(0x11, 0x01, 0xffff);
-			long position;
-			Assert.IsFalse(MemTable.TryGetOneValue(0x11, 0x02, out position));
-		}
-
-
-		[Test]
-		public void existing_item_is_found() {
-			MemTable.Add(0x11, 0x01, 0xffff);
-			long position;
-			Assert.IsTrue(MemTable.TryGetOneValue(0x11, 0x01, out position));
-		}
-
-		[Test]
-		public void items_come_out_sorted() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x12, 0x01, 0xfff3);
-			MemTable.Add(0x11, 0x02, 0xfff2);
-			var list = new List<IndexEntry>(MemTable.IterateAllInOrder());
-			Assert.AreEqual(3, list.Count);
-			Assert.AreEqual(0x12, list[0].Stream);
-			Assert.AreEqual(0x01, list[0].Version);
-			Assert.AreEqual(0xfff3, list[0].Position);
-			Assert.AreEqual(0x11, list[1].Stream);
-			Assert.AreEqual(0x02, list[1].Version);
-			Assert.AreEqual(0xfff2, list[1].Position);
-			Assert.AreEqual(0x11, list[2].Stream);
-			Assert.AreEqual(0x01, list[2].Version);
-			Assert.AreEqual(0xfff1, list[2].Position);
-		}
-
-		[Test]
-		public void items_come_out_sorted_with_duplicates_in_descending_order() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x12, 0x01, 0xfff3);
-			MemTable.Add(0x12, 0x01, 0xfff4);
-			var list = new List<IndexEntry>(MemTable.IterateAllInOrder());
-			Assert.AreEqual(3, list.Count);
-			Assert.AreEqual(0x12, list[0].Stream);
-			Assert.AreEqual(0x01, list[0].Version);
-			Assert.AreEqual(0xfff4, list[0].Position);
-			Assert.AreEqual(0x12, list[1].Stream);
-			Assert.AreEqual(0x01, list[1].Version);
-			Assert.AreEqual(0xfff3, list[1].Position);
-			Assert.AreEqual(0x11, list[2].Stream);
-			Assert.AreEqual(0x01, list[2].Version);
-			Assert.AreEqual(0xfff1, list[2].Position);
-		}
-
-		[Test]
-		public void can_do_range_query_of_existing_items() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x12, 0x01, 0xfff3);
-			MemTable.Add(0x11, 0x02, 0xfff2);
-			var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x01, 0x02));
-			Assert.AreEqual(2, list.Count);
-			Assert.AreEqual(0x11, list[0].Stream);
-			Assert.AreEqual(0x02, list[0].Version);
-			Assert.AreEqual(0xfff2, list[0].Position);
-			Assert.AreEqual(0x11, list[1].Stream);
-			Assert.AreEqual(0x01, list[1].Version);
-			Assert.AreEqual(0xfff1, list[1].Position);
-		}
-
-		[Test]
-		public void can_do_range_query_of_existing_items_with_duplicates_on_edges() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x11, 0x01, 0xfff5);
-			MemTable.Add(0x12, 0x01, 0xfff3);
-			MemTable.Add(0x11, 0x02, 0xfff2);
-			MemTable.Add(0x11, 0x02, 0xfff7);
-			var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x01, 0x02));
-			Assert.AreEqual(4, list.Count);
-			Assert.AreEqual(0x11, list[0].Stream);
-			Assert.AreEqual(0x02, list[0].Version);
-			Assert.AreEqual(0xfff7, list[0].Position);
-			Assert.AreEqual(0x11, list[1].Stream);
-			Assert.AreEqual(0x02, list[1].Version);
-			Assert.AreEqual(0xfff2, list[1].Position);
-			Assert.AreEqual(0x11, list[2].Stream);
-			Assert.AreEqual(0x01, list[2].Version);
-			Assert.AreEqual(0xfff5, list[2].Position);
-			Assert.AreEqual(0x11, list[3].Stream);
-			Assert.AreEqual(0x01, list[3].Version);
-			Assert.AreEqual(0xfff1, list[3].Position);
-		}
-
-		[Test]
-		public void range_query_of_non_existing_stream_returns_nothing() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x12, 0x01, 0xfff3);
-			MemTable.Add(0x11, 0x02, 0xfff2);
-			var list = new List<IndexEntry>(MemTable.GetRange(0x14, 0x01, 0x02));
-			Assert.AreEqual(0, list.Count);
-		}
-
-		[Test]
-		public void range_query_of_non_existing_version_returns_nothing() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x12, 0x01, 0xfff3);
-			MemTable.Add(0x11, 0x02, 0xfff2);
-			var list = new List<IndexEntry>(MemTable.GetRange(0x01, 0x03, 0x05));
-			Assert.AreEqual(0, list.Count);
-		}
-
-
-		[Test]
-		public void range_query_with_hole_returns_items_included() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x12, 0x01, 0xfff3);
-			MemTable.Add(0x11, 0x02, 0xfff2);
-			MemTable.Add(0x11, 0x04, 0xfff4);
-			var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x01, 0x04));
-			Assert.AreEqual(3, list.Count);
-			Assert.AreEqual(0x11, list[0].Stream);
-			Assert.AreEqual(0x04, list[0].Version);
-			Assert.AreEqual(0xfff4, list[0].Position);
-			Assert.AreEqual(0x11, list[1].Stream);
-			Assert.AreEqual(0x02, list[1].Version);
-			Assert.AreEqual(0xfff2, list[1].Position);
-			Assert.AreEqual(0x11, list[2].Stream);
-			Assert.AreEqual(0x01, list[2].Version);
-			Assert.AreEqual(0xfff1, list[2].Position);
-		}
-
-		[Test]
-		public void query_with_start_in_range_but_not_end_results_returns_items_included() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x12, 0x01, 0xfff3);
-			MemTable.Add(0x11, 0x02, 0xfff2);
-			var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x01, 0x04));
-			Assert.AreEqual(2, list.Count);
-			Assert.AreEqual(0x11, list[0].Stream);
-			Assert.AreEqual(0x02, list[0].Version);
-			Assert.AreEqual(0xfff2, list[0].Position);
-			Assert.AreEqual(0x11, list[1].Stream);
-			Assert.AreEqual(0x01, list[1].Version);
-			Assert.AreEqual(0xfff1, list[1].Position);
-		}
-
-		[Test]
-		public void query_with_end_in_range_but_not_start_results_returns_items_included() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x12, 0x01, 0xfff3);
-			MemTable.Add(0x11, 0x02, 0xfff2);
-			var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x00, 0x02));
-			Assert.AreEqual(2, list.Count);
-			Assert.AreEqual(0x11, list[0].Stream);
-			Assert.AreEqual(0x02, list[0].Version);
-			Assert.AreEqual(0xfff2, list[0].Position);
-			Assert.AreEqual(0x11, list[1].Stream);
-			Assert.AreEqual(0x01, list[1].Version);
-			Assert.AreEqual(0xfff1, list[1].Position);
-		}
-
-		[Test]
-		public void query_with_end_and_start_exclusive_results_returns_items_included() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x12, 0x01, 0xfff3);
-			MemTable.Add(0x11, 0x02, 0xfff2);
-			var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x00, 0x04));
-			Assert.AreEqual(2, list.Count);
-			Assert.AreEqual(0x11, list[0].Stream);
-			Assert.AreEqual(0x02, list[0].Version);
-			Assert.AreEqual(0xfff2, list[0].Position);
-			Assert.AreEqual(0x11, list[1].Stream);
-			Assert.AreEqual(0x01, list[1].Version);
-			Assert.AreEqual(0xfff1, list[1].Position);
-		}
-
-		[Test]
-		public void query_with_end_inside_the_hole_in_list_returns_items_included() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x11, 0x03, 0xfff3);
-			MemTable.Add(0x11, 0x05, 0xfff5);
-			var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x00, 0x04));
-			Assert.AreEqual(2, list.Count);
-			Assert.AreEqual(0x11, list[0].Stream);
-			Assert.AreEqual(0x03, list[0].Version);
-			Assert.AreEqual(0xfff3, list[0].Position);
-			Assert.AreEqual(0x11, list[1].Stream);
-			Assert.AreEqual(0x01, list[1].Version);
-			Assert.AreEqual(0xfff1, list[1].Position);
-		}
-
-		[Test]
-		public void query_with_end_inside_the_hole_in_list_returns_items_included_with_duplicates() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x11, 0x03, 0xfff3);
-			MemTable.Add(0x11, 0x03, 0xfff2);
-			MemTable.Add(0x11, 0x05, 0xfff5);
-			var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x00, 0x04));
-			Assert.AreEqual(3, list.Count);
-			Assert.AreEqual(0x11, list[0].Stream);
-			Assert.AreEqual(0x03, list[0].Version);
-			Assert.AreEqual(0xfff3, list[0].Position);
-			Assert.AreEqual(0x11, list[1].Stream);
-			Assert.AreEqual(0x03, list[1].Version);
-			Assert.AreEqual(0xfff2, list[1].Position);
-			Assert.AreEqual(0x11, list[2].Stream);
-			Assert.AreEqual(0x01, list[2].Version);
-			Assert.AreEqual(0xfff1, list[2].Position);
-		}
-
-		[Test]
-		public void query_with_start_inside_the_hole_in_list_returns_items_included() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x11, 0x03, 0xfff3);
-			MemTable.Add(0x11, 0x05, 0xfff5);
-			var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x02, 0x06));
-			Assert.AreEqual(2, list.Count);
-			Assert.AreEqual(0x11, list[0].Stream);
-			Assert.AreEqual(0x05, list[0].Version);
-			Assert.AreEqual(0xfff5, list[0].Position);
-			Assert.AreEqual(0x11, list[1].Stream);
-			Assert.AreEqual(0x03, list[1].Version);
-			Assert.AreEqual(0xfff3, list[1].Position);
-		}
-
-		[Test]
-		public void query_with_start_inside_the_hole_in_list_returns_duplicated_items_included() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x11, 0x03, 0xfff3);
-			MemTable.Add(0x11, 0x03, 0xfff2);
-			MemTable.Add(0x11, 0x05, 0xfff5);
-			var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x02, 0x06));
-			Assert.AreEqual(3, list.Count);
-			Assert.AreEqual(0x11, list[0].Stream);
-			Assert.AreEqual(0x05, list[0].Version);
-			Assert.AreEqual(0xfff5, list[0].Position);
-			Assert.AreEqual(0x11, list[1].Stream);
-			Assert.AreEqual(0x03, list[1].Version);
-			Assert.AreEqual(0xfff3, list[1].Position);
-			Assert.AreEqual(0x11, list[2].Stream);
-			Assert.AreEqual(0x03, list[2].Version);
-			Assert.AreEqual(0xfff2, list[2].Position);
-		}
-
-		[Test]
-		public void query_with_start_and_end_inside_the_hole_in_list_returns_items_included() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x11, 0x03, 0xfff3);
-			MemTable.Add(0x11, 0x05, 0xfff5);
-			var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x02, 0x04));
-			Assert.AreEqual(1, list.Count);
-			Assert.AreEqual(0x11, list[0].Stream);
-			Assert.AreEqual(0x03, list[0].Version);
-			Assert.AreEqual(0xfff3, list[0].Position);
-		}
-
-		[Test]
-		public void query_with_start_and_end_inside_the_hole_in_list_returns_items_included_with_duplicates() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x11, 0x01, 0xfff2);
-			MemTable.Add(0x11, 0x03, 0xfff3);
-			MemTable.Add(0x11, 0x03, 0xfff4);
-			MemTable.Add(0x11, 0x05, 0xfff5);
-			var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x02, 0x04));
-			Assert.AreEqual(2, list.Count);
-			Assert.AreEqual(0x11, list[0].Stream);
-			Assert.AreEqual(0x03, list[0].Version);
-			Assert.AreEqual(0xfff4, list[0].Position);
-			Assert.AreEqual(0x11, list[1].Stream);
-			Assert.AreEqual(0x03, list[1].Version);
-			Assert.AreEqual(0xfff3, list[1].Position);
-		}
-
-		[Test]
-		public void query_with_start_and_end_less_than_all_items_returns_nothing() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x11, 0x03, 0xfff3);
-			MemTable.Add(0x11, 0x05, 0xfff5);
-			var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x00, 0x00));
-			Assert.AreEqual(0, list.Count);
-		}
-
-		[Test]
-		public void query_with_start_and_end_greater_than_all_items_returns_nothing() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x11, 0x03, 0xfff3);
-			MemTable.Add(0x11, 0x05, 0xfff5);
-			var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x06, 0x06));
-			Assert.AreEqual(0, list.Count);
-		}
-
-		[Test]
-		public void try_get_one_value_returns_value_with_highest_position() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x11, 0x01, 0xfff3);
-			MemTable.Add(0x11, 0x05, 0xfff5);
-			long position;
-			Assert.IsTrue(MemTable.TryGetOneValue(0x11, 0x01, out position));
-			Assert.AreEqual(0xfff3, position);
-		}
-
-		[Test]
-		public void get_range_of_same_version_returns_both_values_in_descending_order_when_duplicated() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x11, 0x01, 0xfff3);
-			MemTable.Add(0x11, 0x05, 0xfff5);
-			var entries = MemTable.GetRange(0x11, 0x01, 0x01).ToArray();
-			Assert.AreEqual(2, entries.Length);
-			Assert.AreEqual(0x11, entries[0].Stream);
-			Assert.AreEqual(0x01, entries[0].Version);
-			Assert.AreEqual(0xfff3, entries[0].Position);
-			Assert.AreEqual(0x11, entries[1].Stream);
-			Assert.AreEqual(0x01, entries[1].Version);
-			Assert.AreEqual(0xfff1, entries[1].Position);
-		}
-
-		[Test]
-		public void try_get_one_value_returns_the_value_with_largest_position_when_triduplicated() {
-			MemTable.Add(0x01, 0x05, 0xfff9);
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x11, 0x01, 0xfff3);
-			MemTable.Add(0x11, 0x05, 0xfff5);
-			MemTable.Add(0x11, 0x01, 0xfff2);
-
-			long position;
-			Assert.IsTrue(MemTable.TryGetOneValue(0x11, 0x01, out position));
-			Assert.AreEqual(0xfff3, position);
-		}
-
-		[Test]
-		public void get_range_of_same_version_returns_both_values_in_descending_order_when_triduplicated() {
-			MemTable.Add(0x01, 0x05, 0xfff9);
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x11, 0x01, 0xfff3);
-			MemTable.Add(0x11, 0x05, 0xfff5);
-			MemTable.Add(0x11, 0x01, 0xfff2);
-
-			var entries = MemTable.GetRange(0x11, 0x01, 0x01).ToArray();
-			Assert.AreEqual(3, entries.Length);
-			Assert.AreEqual(0x11, entries[0].Stream);
-			Assert.AreEqual(0x01, entries[0].Version);
-			Assert.AreEqual(0xfff3, entries[0].Position);
-
-			Assert.AreEqual(0x11, entries[1].Stream);
-			Assert.AreEqual(0x01, entries[1].Version);
-			Assert.AreEqual(0xfff2, entries[1].Position);
-
-			Assert.AreEqual(0x11, entries[2].Stream);
-			Assert.AreEqual(0x01, entries[2].Version);
-			Assert.AreEqual(0xfff1, entries[2].Position);
-		}
-
-		[Test]
-		public void try_get_latest_entry_finds_nothing_on_empty_memtable() {
-			IndexEntry entry;
-			Assert.IsFalse(MemTable.TryGetLatestEntry(0x12, out entry));
-		}
-
-		[Test]
-		public void try_get_latest_entry_finds_nothing_on_empty_stream() {
-			MemTable.Add(0x11, 0x01, 0xffff);
-			IndexEntry entry;
-			Assert.IsFalse(MemTable.TryGetLatestEntry(0x12, out entry));
-		}
-
-		[Test]
-		public void single_item_is_latest() {
-			MemTable.Add(0x11, 0x01, 0xffff);
-			IndexEntry entry;
-			Assert.IsTrue(MemTable.TryGetLatestEntry(0x11, out entry));
-			Assert.AreEqual(0x11, entry.Stream);
-			Assert.AreEqual(0x01, entry.Version);
-			Assert.AreEqual(0xffff, entry.Position);
-		}
-
-		[Test]
-		public void try_get_latest_entry_returns_correct_entry() {
-			MemTable.Add(0x11, 0x01, 0xffff);
-			MemTable.Add(0x11, 0x02, 0xfff2);
-			IndexEntry entry;
-			Assert.IsTrue(MemTable.TryGetLatestEntry(0x11, out entry));
-			Assert.AreEqual(0x11, entry.Stream);
-			Assert.AreEqual(0x02, entry.Version);
-			Assert.AreEqual(0xfff2, entry.Position);
-		}
-
-		[Test]
-		public void try_get_latest_entry_when_duplicated_entries_returns_the_one_with_largest_position() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x11, 0x02, 0xfff2);
-			MemTable.Add(0x11, 0x01, 0xfff3);
-			MemTable.Add(0x11, 0x02, 0xfff4);
-			IndexEntry entry;
-			Assert.IsTrue(MemTable.TryGetLatestEntry(0x11, out entry));
-			Assert.AreEqual(0x11, entry.Stream);
-			Assert.AreEqual(0x02, entry.Version);
-			Assert.AreEqual(0xfff4, entry.Position);
-		}
-
-		[Test]
-		public void try_get_latest_entry_returns_the_entry_with_the_largest_position_when_triduplicated() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x11, 0x01, 0xfff3);
-			MemTable.Add(0x11, 0x01, 0xfff5);
-			IndexEntry entry;
-			Assert.IsTrue(MemTable.TryGetLatestEntry(0x11, out entry));
-			Assert.AreEqual(0x11, entry.Stream);
-			Assert.AreEqual(0x01, entry.Version);
-			Assert.AreEqual(0xfff5, entry.Position);
-		}
-
-		[Test]
-		public void try_get_oldest_entry_finds_nothing_on_empty_memtable() {
-			IndexEntry entry;
-			Assert.IsFalse(MemTable.TryGetOldestEntry(0x12, out entry));
-		}
-
-		[Test]
-		public void try_get_oldest_entry_finds_nothing_on_empty_stream() {
-			MemTable.Add(0x11, 0x01, 0xffff);
-			IndexEntry entry;
-			Assert.IsFalse(MemTable.TryGetOldestEntry(0x12, out entry));
-		}
-
-		[Test]
-		public void single_item_is_oldest() {
-			MemTable.Add(0x11, 0x01, 0xffff);
-			IndexEntry entry;
-			Assert.IsTrue(MemTable.TryGetOldestEntry(0x11, out entry));
-			Assert.AreEqual(0x11, entry.Stream);
-			Assert.AreEqual(0x01, entry.Version);
-			Assert.AreEqual(0xffff, entry.Position);
-		}
-
-		[Test]
-		public void try_get_oldest_entry_returns_correct_entry() {
-			MemTable.Add(0x11, 0x01, 0xffff);
-			MemTable.Add(0x11, 0x02, 0xfff2);
-			IndexEntry entry;
-			Assert.IsTrue(MemTable.TryGetOldestEntry(0x11, out entry));
-			Assert.AreEqual(0x11, entry.Stream);
-			Assert.AreEqual(0x01, entry.Version);
-			Assert.AreEqual(0xffff, entry.Position);
-		}
-
-		[Test]
-		public void try_get_oldest_entry_when_duplicated_entries_returns_the_one_with_smallest_position() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x11, 0x02, 0xfff2);
-			MemTable.Add(0x11, 0x01, 0xfff3);
-			MemTable.Add(0x11, 0x02, 0xfff4);
-			IndexEntry entry;
-			Assert.IsTrue(MemTable.TryGetOldestEntry(0x11, out entry));
-			Assert.AreEqual(0x11, entry.Stream);
-			Assert.AreEqual(0x01, entry.Version);
-			Assert.AreEqual(0xfff1, entry.Position);
-		}
-
-		[Test]
-		public void try_get_oldest_entry_returns_the_entry_with_the_smallest_position_when_triduplicated() {
-			MemTable.Add(0x11, 0x01, 0xfff1);
-			MemTable.Add(0x11, 0x01, 0xfff3);
-			MemTable.Add(0x11, 0x01, 0xfff5);
-			IndexEntry entry;
-			Assert.IsTrue(MemTable.TryGetOldestEntry(0x11, out entry));
-			Assert.AreEqual(0x11, entry.Stream);
-			Assert.AreEqual(0x01, entry.Version);
-			Assert.AreEqual(0xfff1, entry.Position);
-		}
-
-
-		[Test]
-		public void the_smallest_items_with_hash_collisions_can_be_found() {
-			MemTable.Add(0, 0, 0x0001);
-			MemTable.Add(0, 0, 0x0002);
-			MemTable.Add(1, 0, 0x0003);
-			MemTable.Add(1, 0, 0x0004);
-			MemTable.Add(1, 0, 0x0005);
-
-			long position;
-			Assert.IsTrue(MemTable.TryGetOneValue(0, 0, out position));
-			Assert.AreEqual(0x0002, position);
-		}
-
-		[Test]
-		public void the_smallest_items_with_hash_collisions_are_returned_in_descending_order() {
-			MemTable.Add(0, 0, 0x0001);
-			MemTable.Add(0, 0, 0x0002);
-			MemTable.Add(1, 0, 0x0003);
-			MemTable.Add(1, 0, 0x0004);
-			MemTable.Add(1, 0, 0x0005);
-
-			var entries = MemTable.GetRange(0, 0, 0).ToArray();
-			Assert.AreEqual(2, entries.Length);
-			Assert.AreEqual(0, entries[0].Stream);
-			Assert.AreEqual(0, entries[0].Version);
-			Assert.AreEqual(0x0002, entries[0].Position);
-			Assert.AreEqual(0, entries[1].Stream);
-			Assert.AreEqual(0, entries[1].Version);
-			Assert.AreEqual(0x0001, entries[1].Position);
-		}
-
-		[Test]
-		public void try_get_latest_entry_for_smallest_hash_with_collisions_returns_correct_index_entry() {
-			MemTable.Add(0, 0, 0x0001);
-			MemTable.Add(0, 0, 0x0002);
-			MemTable.Add(1, 0, 0x0003);
-			MemTable.Add(1, 0, 0x0004);
-			MemTable.Add(1, 0, 0x0005);
-
-			IndexEntry entry;
-			Assert.IsTrue(MemTable.TryGetLatestEntry(0, out entry));
-			Assert.AreEqual(0, entry.Stream);
-			Assert.AreEqual(0, entry.Version);
-			Assert.AreEqual(0x0002, entry.Position);
-		}
-
-		[Test]
-		public void try_get_oldest_entry_for_smallest_hash_with_collisions_returns_correct_index_entry() {
-			MemTable.Add(0, 0, 0x0001);
-			MemTable.Add(0, 0, 0x0002);
-			MemTable.Add(1, 0, 0x0003);
-			MemTable.Add(1, 0, 0x0004);
-			MemTable.Add(1, 0, 0x0005);
-
-			IndexEntry entry;
-			Assert.IsTrue(MemTable.TryGetOldestEntry(0, out entry));
-			Assert.AreEqual(0, entry.Stream);
-			Assert.AreEqual(0, entry.Version);
-			Assert.AreEqual(0x0001, entry.Position);
-		}
-
-		[Test]
-		public void the_largest_items_with_hash_collisions_can_be_found() {
-			MemTable.Add(0, 0, 0x0001);
-			MemTable.Add(0, 0, 0x0002);
-			MemTable.Add(1, 0, 0x0003);
-			MemTable.Add(1, 0, 0x0004);
-			MemTable.Add(1, 0, 0x0005);
-
-			long position;
-			Assert.IsTrue(MemTable.TryGetOneValue(1, 0, out position));
-			Assert.AreEqual(0x0005, position);
-		}
-
-		[Test]
-		public void the_largest_items_with_hash_collisions_are_returned_in_descending_order() {
-			MemTable.Add(0, 0, 0x0001);
-			MemTable.Add(0, 0, 0x0002);
-			MemTable.Add(1, 0, 0x0003);
-			MemTable.Add(1, 0, 0x0004);
-			MemTable.Add(1, 0, 0x0005);
-
-			var entries = MemTable.GetRange(1, 0, 0).ToArray();
-			Assert.AreEqual(3, entries.Length);
-			Assert.AreEqual(1, entries[0].Stream);
-			Assert.AreEqual(0, entries[0].Version);
-			Assert.AreEqual(0x0005, entries[0].Position);
-			Assert.AreEqual(1, entries[1].Stream);
-			Assert.AreEqual(0, entries[1].Version);
-			Assert.AreEqual(0x0004, entries[1].Position);
-			Assert.AreEqual(1, entries[2].Stream);
-			Assert.AreEqual(0, entries[2].Version);
-			Assert.AreEqual(0x0003, entries[2].Position);
-		}
-
-		[Test]
-		public void try_get_latest_entry_for_largest_hash_collision_returns_correct_index_entry() {
-			MemTable.Add(0, 0, 0x0001);
-			MemTable.Add(0, 0, 0x0002);
-			MemTable.Add(1, 0, 0x0003);
-			MemTable.Add(1, 0, 0x0004);
-			MemTable.Add(1, 0, 0x0005);
-
-			IndexEntry entry;
-			Assert.IsTrue(MemTable.TryGetLatestEntry(1, out entry));
-			Assert.AreEqual(1, entry.Stream);
-			Assert.AreEqual(0, entry.Version);
-			Assert.AreEqual(0x0005, entry.Position);
-		}
-
-		[Test]
-		public void try_get_oldest_entry_for_largest_hash_with_collisions_returns_correct_index_entry() {
-			MemTable.Add(0, 0, 0x0001);
-			MemTable.Add(0, 0, 0x0002);
-			MemTable.Add(1, 0, 0x0003);
-			MemTable.Add(1, 0, 0x0004);
-			MemTable.Add(1, 0, 0x0005);
-
-			IndexEntry entry;
-			Assert.IsTrue(MemTable.TryGetOldestEntry(1, out entry));
-			Assert.AreEqual(1, entry.Stream);
-			Assert.AreEqual(0, entry.Version);
-			Assert.AreEqual(0x0003, entry.Position);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/ReverseComparerTests.cs b/src/EventStore.Core.Tests/Index/ReverseComparerTests.cs
deleted file mode 100644
index b1fff98f89f..00000000000
--- a/src/EventStore.Core.Tests/Index/ReverseComparerTests.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index {
-	[TestFixture]
-	public class ReverseComparerTests {
-		[Test]
-		public void larger_values_return_as_lower() {
-			Assert.AreEqual(-1, new ReverseComparer<int>().Compare(5, 3));
-		}
-
-		[Test]
-		public void smaller_values_return_as_higher() {
-			Assert.AreEqual(1, new ReverseComparer<int>().Compare(3, 5));
-		}
-
-		[Test]
-		public void same_values_are_equal() {
-			Assert.AreEqual(0, new ReverseComparer<int>().Compare(5, 5));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_a_table_index.cs b/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_a_table_index.cs
deleted file mode 100644
index 1d23b407038..00000000000
--- a/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_a_table_index.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.Scavenge {
-	[TestFixture(false)]
-	[TestFixture(true)]
-	class when_scavenging_a_table_index : SpecificationWithDirectoryPerTestFixture {
-		private TableIndex<string> _tableIndex;
-		private IHasher<string> _lowHasher;
-		private IHasher<string> _highHasher;
-		private string _indexDir;
-		private FakeTFScavengerLog _log;
-		private static readonly long[] Deleted = { 200, 300, 500 };
-		private readonly bool _skipIndexVerify;
-		private readonly bool _useBloomFilter;
-
-		public when_scavenging_a_table_index(bool skipIndexVerify) {
-			_skipIndexVerify = skipIndexVerify;
-			_useBloomFilter = skipIndexVerify; // bloomfilter orthogonal
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_indexDir = PathName;
-
-			var fakeReader = new TFReaderLease(new FakeIndexReader(l => !Deleted.Contains(l)));
-
-			_lowHasher = new XXHashUnsafe();
-			_highHasher = new Murmur3AUnsafe();
-			_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
-				() => new HashListMemTable(PTableVersions.IndexV4, maxSize: 5),
-				() => fakeReader,
-				PTableVersions.IndexV4,
-				5, Constants.PTableMaxReaderCountDefault,
-				maxSizeForMemory: 2,
-				maxTablesPerLevel: 5, skipIndexVerify: _skipIndexVerify,
-				useBloomFilter: _useBloomFilter);
-			_tableIndex.Initialize(long.MaxValue);
-
-
-			_tableIndex.Add(1, "testStream-1", 0, 0);
-			_tableIndex.Add(1, "testStream-1", 1, 100);
-			_tableIndex.Add(1, "testStream-1", 2, 200);
-			_tableIndex.Add(1, "testStream-1", 3, 300);
-			_tableIndex.Add(1, "testStream-1", 4, 400);
-			_tableIndex.Add(1, "testStream-1", 5, 500);
-
-			_log = new FakeTFScavengerLog();
-			_tableIndex.Scavenge(_log, CancellationToken.None);
-
-			// Check it's loadable.
-			_tableIndex.Close(false);
-
-			_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
-				() => new HashListMemTable(PTableVersions.IndexV4, maxSize: 5),
-				() => fakeReader,
-				PTableVersions.IndexV4,
-				5, Constants.PTableMaxReaderCountDefault,
-				maxSizeForMemory: 2,
-				maxTablesPerLevel: 5,
-				useBloomFilter: _useBloomFilter);
-
-			_tableIndex.Initialize(long.MaxValue);
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_tableIndex.Close();
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void should_have_logged_each_index_table() {
-			Assert.That(_log.ScavengedIndices.Count, Is.EqualTo(3));
-			Assert.That(_log.ScavengedIndices[0].Scavenged, Is.True);
-			Assert.That(_log.ScavengedIndices[0].Error, Is.Null);
-			Assert.That(_log.ScavengedIndices[0].EntriesDeleted, Is.EqualTo(1));
-			Assert.That(_log.ScavengedIndices[1].Scavenged, Is.True);
-			Assert.That(_log.ScavengedIndices[1].Error, Is.Null);
-			Assert.That(_log.ScavengedIndices[1].EntriesDeleted, Is.EqualTo(2));
-			Assert.That(_log.ScavengedIndices[2].Scavenged, Is.False);
-			Assert.That(_log.ScavengedIndices[2].Error, Is.Empty);
-			Assert.That(_log.ScavengedIndices[2].EntriesDeleted, Is.EqualTo(0));
-		}
-
-		[Test]
-		public void should_have_entries_in_sorted_order() {
-			var streamId = "testStream-1";
-			var result = _tableIndex.GetRange(streamId, 0, 5).ToArray();
-			var hash = (ulong)_lowHasher.Hash(streamId) << 32 | _highHasher.Hash(streamId);
-
-			Assert.That(result.Count(), Is.EqualTo(3));
-
-			Assert.That(result[0].Stream, Is.EqualTo(hash));
-			Assert.That(result[0].Version, Is.EqualTo(4));
-			Assert.That(result[0].Position, Is.EqualTo(400));
-
-			Assert.That(result[1].Stream, Is.EqualTo(hash));
-			Assert.That(result[1].Version, Is.EqualTo(1));
-			Assert.That(result[1].Position, Is.EqualTo(100));
-
-			Assert.That(result[2].Stream, Is.EqualTo(hash));
-			Assert.That(result[2].Version, Is.EqualTo(0));
-			Assert.That(result[2].Position, Is.EqualTo(0));
-		}
-
-
-		[Test]
-		public void old_index_tables_are_deleted() {
-			if (_useBloomFilter) {
-				Assert.That(Directory.EnumerateFiles(_indexDir).Count(), Is.EqualTo(7), "Expected IndexMap and 3 tables and 3 bloom filters.");
-			} else {
-				Assert.That(Directory.EnumerateFiles(_indexDir).Count(), Is.EqualTo(4), "Expected IndexMap and 3 tables.");
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_and_another_table_is_completed_during.cs b/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_and_another_table_is_completed_during.cs
deleted file mode 100644
index 45a2f8835de..00000000000
--- a/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_and_another_table_is_completed_during.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.Scavenge {
-	[TestFixture(false)]
-	[TestFixture(true)]
-	class
-		when_scavenging_a_table_index_and_another_table_is_completed_during : SpecificationWithDirectoryPerTestFixture {
-		private TableIndex<string> _tableIndex;
-		private IHasher<string> _lowHasher;
-		private IHasher<string> _highHasher;
-		private string _indexDir;
-		private FakeTFScavengerLog _log;
-		private readonly bool _useBloomFilter;
-
-		public when_scavenging_a_table_index_and_another_table_is_completed_during(bool useBloomFilter) {
-			_useBloomFilter = useBloomFilter;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_indexDir = PathName;
-
-			var scavengeBlocker = new ManualResetEventSlim(false);
-			var scavengeStarted = new ManualResetEventSlim(false);
-
-			var fakeReader = new TFReaderLease(new FakeIndexReader(l => {
-				scavengeStarted.Set();
-				if (!scavengeBlocker.Wait(5000))
-					throw new Exception("Failed to continue.");
-				return false;
-			}));
-
-			_lowHasher = new XXHashUnsafe();
-			_highHasher = new Murmur3AUnsafe();
-			_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
-				() => new HashListMemTable(PTableVersions.IndexV4, maxSize: 5),
-				() => fakeReader,
-				PTableVersions.IndexV4,
-				5, Constants.PTableMaxReaderCountDefault,
-				maxSizeForMemory: 2,
-				maxTablesPerLevel: 5,
-				useBloomFilter: _useBloomFilter);
-			_tableIndex.Initialize(long.MaxValue);
-
-
-			_tableIndex.Add(1, "testStream-1", 0, 0);
-			_tableIndex.Add(1, "testStream-1", 1, 100);
-			_tableIndex.WaitForBackgroundTasks();
-
-			_log = new FakeTFScavengerLog();
-			var task = Task.Run(() => _tableIndex.Scavenge(_log, CancellationToken.None));
-
-			Assert.That(scavengeStarted.Wait(5000));
-
-			// Add enough for 2 more tables
-			_tableIndex.Add(1, "testStream-1", 2, 200);
-			_tableIndex.Add(1, "testStream-1", 3, 300);
-			_tableIndex.Add(1, "testStream-1", 4, 400);
-			_tableIndex.Add(1, "testStream-1", 5, 500);
-
-			// Release the scavenge process
-			scavengeBlocker.Set();
-			await task;
-
-			// Check it's loadable.
-			_tableIndex.Close(false);
-
-			_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
-				() => new HashListMemTable(PTableVersions.IndexV4, maxSize: 5),
-				() => fakeReader,
-				PTableVersions.IndexV4,
-				5, Constants.PTableMaxReaderCountDefault,
-				maxSizeForMemory: 2,
-				maxTablesPerLevel: 5,
-				useBloomFilter: _useBloomFilter);
-
-			_tableIndex.Initialize(long.MaxValue);
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_tableIndex.Close();
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void should_have_logged_each_index_table() {
-			Assert.That(_log.ScavengedIndices.Count, Is.EqualTo(1));
-			Assert.That(_log.ScavengedIndices[0].Scavenged, Is.True);
-			Assert.That(_log.ScavengedIndices[0].Error, Is.Null);
-			Assert.That(_log.ScavengedIndices[0].EntriesDeleted, Is.EqualTo(2));
-		}
-
-		[Test]
-		public void should_still_have_all_entries_in_sorted_order() {
-			var streamId = "testStream-1";
-			var result = _tableIndex.GetRange(streamId, 0, 5).ToArray();
-			var hash = (ulong)_lowHasher.Hash(streamId) << 32 | _highHasher.Hash(streamId);
-
-			Assert.That(result.Count(), Is.EqualTo(4));
-
-			Assert.That(result[0].Stream, Is.EqualTo(hash));
-			Assert.That(result[0].Version, Is.EqualTo(5));
-			Assert.That(result[0].Position, Is.EqualTo(500));
-
-			Assert.That(result[1].Stream, Is.EqualTo(hash));
-			Assert.That(result[1].Version, Is.EqualTo(4));
-			Assert.That(result[1].Position, Is.EqualTo(400));
-
-			Assert.That(result[2].Stream, Is.EqualTo(hash));
-			Assert.That(result[2].Version, Is.EqualTo(3));
-			Assert.That(result[2].Position, Is.EqualTo(300));
-
-			Assert.That(result[3].Stream, Is.EqualTo(hash));
-			Assert.That(result[3].Version, Is.EqualTo(2));
-			Assert.That(result[3].Position, Is.EqualTo(200));
-		}
-
-
-		[Test]
-		public void all_tables_are_written_to_disk() {
-			if (_useBloomFilter) {
-				Assert.That(Directory.EnumerateFiles(_indexDir).Count(), Is.EqualTo(7), "Expected IndexMap and 3 tables and 3 bloom filters.");
-			} else {
-				Assert.That(Directory.EnumerateFiles(_indexDir).Count(), Is.EqualTo(4), "Expected IndexMap and 3 tables.");
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_cancelled_while_scavenging_table.cs b/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_cancelled_while_scavenging_table.cs
deleted file mode 100644
index 88f4a591c20..00000000000
--- a/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_cancelled_while_scavenging_table.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.Scavenge {
-	[TestFixture]
-	class when_scavenging_a_table_index_cancelled_while_scavenging_table : SpecificationWithDirectoryPerTestFixture {
-		private TableIndex<string> _tableIndex;
-		private IHasher<string> _lowHasher;
-		private IHasher<string> _highHasher;
-		private string _indexDir;
-		private FakeTFScavengerLog _log;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_indexDir = PathName;
-
-			var cancellationTokenSource = new CancellationTokenSource();
-
-			var fakeReader = new TFReaderLease(new FakeIndexReader(l => {
-				cancellationTokenSource.Cancel();
-				return true;
-			}));
-
-			_lowHasher = new XXHashUnsafe();
-			_highHasher = new Murmur3AUnsafe();
-			_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
-				() => new HashListMemTable(PTableVersions.IndexV4, maxSize: 5),
-				() => fakeReader,
-				PTableVersions.IndexV4,
-				5, Constants.PTableMaxReaderCountDefault,
-				maxSizeForMemory: 2,
-				maxTablesPerLevel: 5);
-			_tableIndex.Initialize(long.MaxValue);
-
-			_tableIndex.Add(1, "testStream-1", 0, 0);
-			_tableIndex.Add(1, "testStream-1", 1, 100);
-			_tableIndex.Add(1, "testStream-1", 2, 200);
-			_tableIndex.Add(1, "testStream-1", 3, 300);
-			_tableIndex.Add(1, "testStream-1", 4, 400);
-			_tableIndex.Add(1, "testStream-1", 5, 500);
-
-			_log = new FakeTFScavengerLog();
-
-
-			Assert.That(() => _tableIndex.Scavenge(_log, cancellationTokenSource.Token),
-				Throws.InstanceOf<OperationCanceledException>());
-
-			// Check it's loadable still.
-			_tableIndex.Close(false);
-
-			_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
-				() => new HashListMemTable(PTableVersions.IndexV4, maxSize: 5),
-				() => fakeReader,
-				PTableVersions.IndexV4,
-				5, Constants.PTableMaxReaderCountDefault,
-				maxSizeForMemory: 2,
-				maxTablesPerLevel: 5);
-
-			_tableIndex.Initialize(long.MaxValue);
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_tableIndex.Close();
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void should_have_logged_a_failure() {
-			Assert.That(_log.ScavengedIndices.Count, Is.EqualTo(1));
-			Assert.That(_log.ScavengedIndices[0].Scavenged, Is.False);
-			Assert.That(_log.ScavengedIndices[0].Error, Is.EqualTo("Scavenge cancelled"));
-			Assert.That(_log.ScavengedIndices[0].EntriesDeleted, Is.EqualTo(0));
-		}
-
-		[Test]
-		public void should_still_have_all_entries_in_sorted_order() {
-			var streamId = "testStream-1";
-			var result = _tableIndex.GetRange(streamId, 0, 5).ToArray();
-			var hash = (ulong)_lowHasher.Hash(streamId) << 32 | _highHasher.Hash(streamId);
-
-			Assert.That(result.Count(), Is.EqualTo(6));
-
-			Assert.That(result[0].Stream, Is.EqualTo(hash));
-			Assert.That(result[0].Version, Is.EqualTo(5));
-			Assert.That(result[0].Position, Is.EqualTo(500));
-
-			Assert.That(result[1].Stream, Is.EqualTo(hash));
-			Assert.That(result[1].Version, Is.EqualTo(4));
-			Assert.That(result[1].Position, Is.EqualTo(400));
-
-			Assert.That(result[2].Stream, Is.EqualTo(hash));
-			Assert.That(result[2].Version, Is.EqualTo(3));
-			Assert.That(result[2].Position, Is.EqualTo(300));
-
-			Assert.That(result[3].Stream, Is.EqualTo(hash));
-			Assert.That(result[3].Version, Is.EqualTo(2));
-			Assert.That(result[3].Position, Is.EqualTo(200));
-
-			Assert.That(result[4].Stream, Is.EqualTo(hash));
-			Assert.That(result[4].Version, Is.EqualTo(1));
-			Assert.That(result[4].Position, Is.EqualTo(100));
-
-			Assert.That(result[5].Stream, Is.EqualTo(hash));
-			Assert.That(result[5].Version, Is.EqualTo(0));
-			Assert.That(result[5].Position, Is.EqualTo(0));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_cancelled_while_waiting_for_lock.cs b/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_cancelled_while_waiting_for_lock.cs
deleted file mode 100644
index 7f03d7b7f4f..00000000000
--- a/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_cancelled_while_waiting_for_lock.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.Scavenge {
-	[TestFixture]
-	class when_scavenging_a_table_index_cancelled_while_waiting_for_lock : SpecificationWithDirectoryPerTestFixture {
-		private TableIndex<string> _tableIndex;
-		private IHasher<string> _lowHasher;
-		private IHasher<string> _highHasher;
-		private string _indexDir;
-		private FakeTFScavengerLog _log;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_indexDir = PathName;
-
-			var fakeReader = new TFReaderLease(new FakeIndexReader());
-			_lowHasher = new XXHashUnsafe();
-			_highHasher = new Murmur3AUnsafe();
-			_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
-				() => new HashListMemTable(PTableVersions.IndexV4, maxSize: 5),
-				() => fakeReader,
-				PTableVersions.IndexV4,
-				5, Constants.PTableMaxReaderCountDefault,
-				maxSizeForMemory: 2,
-				maxTablesPerLevel: 5);
-			_tableIndex.Initialize(long.MaxValue);
-
-			_tableIndex.Add(1, "testStream-1", 0, 0);
-			_tableIndex.Add(1, "testStream-1", 1, 100);
-			_tableIndex.Add(1, "testStream-1", 2, 200);
-			_tableIndex.Add(1, "testStream-1", 3, 300);
-			_tableIndex.Add(1, "testStream-1", 4, 400);
-			_tableIndex.Add(1, "testStream-1", 5, 500);
-
-			_log = new FakeTFScavengerLog();
-
-			var cancellationTokenSource = new CancellationTokenSource();
-			cancellationTokenSource.Cancel();
-
-			Assert.That(() => _tableIndex.Scavenge(_log, cancellationTokenSource.Token),
-				Throws.InstanceOf<OperationCanceledException>());
-
-			// Check it's loadable still.
-			_tableIndex.Close(false);
-
-			_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
-				() => new HashListMemTable(PTableVersions.IndexV4, maxSize: 5),
-				() => fakeReader,
-				PTableVersions.IndexV4,
-				5, Constants.PTableMaxReaderCountDefault,
-				maxSizeForMemory: 2,
-				maxTablesPerLevel: 5);
-
-			_tableIndex.Initialize(long.MaxValue);
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_tableIndex.Close();
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void should_still_have_all_entries_in_sorted_order() {
-			var streamId = "testStream-1";
-			var result = _tableIndex.GetRange(streamId, 0, 5).ToArray();
-			var hash = (ulong)_lowHasher.Hash(streamId) << 32 | _highHasher.Hash(streamId);
-
-			Assert.That(result.Count(), Is.EqualTo(6));
-
-			Assert.That(result[0].Stream, Is.EqualTo(hash));
-			Assert.That(result[0].Version, Is.EqualTo(5));
-			Assert.That(result[0].Position, Is.EqualTo(500));
-
-			Assert.That(result[1].Stream, Is.EqualTo(hash));
-			Assert.That(result[1].Version, Is.EqualTo(4));
-			Assert.That(result[1].Position, Is.EqualTo(400));
-
-			Assert.That(result[2].Stream, Is.EqualTo(hash));
-			Assert.That(result[2].Version, Is.EqualTo(3));
-			Assert.That(result[2].Position, Is.EqualTo(300));
-
-			Assert.That(result[3].Stream, Is.EqualTo(hash));
-			Assert.That(result[3].Version, Is.EqualTo(2));
-			Assert.That(result[3].Position, Is.EqualTo(200));
-
-			Assert.That(result[4].Stream, Is.EqualTo(hash));
-			Assert.That(result[4].Version, Is.EqualTo(1));
-			Assert.That(result[4].Position, Is.EqualTo(100));
-
-			Assert.That(result[5].Stream, Is.EqualTo(hash));
-			Assert.That(result[5].Version, Is.EqualTo(0));
-			Assert.That(result[5].Position, Is.EqualTo(0));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_fails.cs b/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_fails.cs
deleted file mode 100644
index 4cc5dae61e2..00000000000
--- a/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_fails.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.Scavenge {
-	[TestFixture(false)]
-	[TestFixture(true)]
-	class when_scavenging_a_table_index_fails : SpecificationWithDirectoryPerTestFixture {
-		private TableIndex<string> _tableIndex;
-		private IHasher<string> _lowHasher;
-		private IHasher<string> _highHasher;
-		private string _indexDir;
-		private FakeTFScavengerLog _log;
-		private readonly bool _useBloomFilter;
-
-		public when_scavenging_a_table_index_fails(bool useBloomFilter) {
-			_useBloomFilter = useBloomFilter;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_indexDir = PathName;
-
-			var fakeReader = new TFReaderLease(new FakeIndexReader());
-			_lowHasher = new XXHashUnsafe();
-			_highHasher = new Murmur3AUnsafe();
-			_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
-				() => new HashListMemTable(PTableVersions.IndexV4, maxSize: 5),
-				() => throw new Exception("Expected exception") /* throw an exception when the first PTable scavenge starts and tries to acquire a reader */,
-				PTableVersions.IndexV4,
-				5, Constants.PTableMaxReaderCountDefault,
-				maxSizeForMemory: 2,
-				maxTablesPerLevel: 5,
-				useBloomFilter: _useBloomFilter);
-			_tableIndex.Initialize(long.MaxValue);
-
-			_tableIndex.Add(1, "testStream-1", 0, 0);
-			_tableIndex.Add(1, "testStream-1", 1, 100);
-			_tableIndex.Add(1, "testStream-1", 2, 200);
-			_tableIndex.Add(1, "testStream-1", 3, 300);
-			_tableIndex.Add(1, "testStream-1", 4, 400);
-			_tableIndex.Add(1, "testStream-1", 5, 500);
-
-			_log = new FakeTFScavengerLog();
-			Assert.That(() => _tableIndex.Scavenge(_log, CancellationToken.None),
-				Throws.Exception.With.Message.EqualTo("Expected exception"));
-
-			// Check it's loadable still.
-			_tableIndex.Close(false);
-
-			_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
-				() => new HashListMemTable(PTableVersions.IndexV4, maxSize: 5),
-				() => fakeReader,
-				PTableVersions.IndexV4,
-				5, Constants.PTableMaxReaderCountDefault,
-				maxSizeForMemory: 2,
-				maxTablesPerLevel: 5,
-				useBloomFilter: _useBloomFilter);
-
-			_tableIndex.Initialize(long.MaxValue);
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_tableIndex.Close();
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void should_have_logged_a_failure() {
-			Assert.That(_log.ScavengedIndices.Count, Is.EqualTo(1));
-			Assert.That(_log.ScavengedIndices[0].Scavenged, Is.False);
-			Assert.That(_log.ScavengedIndices[0].Error, Is.EqualTo("Expected exception"));
-			Assert.That(_log.ScavengedIndices[0].EntriesDeleted, Is.EqualTo(0));
-		}
-
-		[Test]
-		public void should_still_have_all_entries_in_sorted_order() {
-			var streamId = "testStream-1";
-			var result = _tableIndex.GetRange(streamId, 0, 5).ToArray();
-			var hash = (ulong)_lowHasher.Hash(streamId) << 32 | _highHasher.Hash(streamId);
-
-			Assert.That(result.Count(), Is.EqualTo(6));
-
-			Assert.That(result[0].Stream, Is.EqualTo(hash));
-			Assert.That(result[0].Version, Is.EqualTo(5));
-			Assert.That(result[0].Position, Is.EqualTo(500));
-
-			Assert.That(result[1].Stream, Is.EqualTo(hash));
-			Assert.That(result[1].Version, Is.EqualTo(4));
-			Assert.That(result[1].Position, Is.EqualTo(400));
-
-			Assert.That(result[2].Stream, Is.EqualTo(hash));
-			Assert.That(result[2].Version, Is.EqualTo(3));
-			Assert.That(result[2].Position, Is.EqualTo(300));
-
-			Assert.That(result[3].Stream, Is.EqualTo(hash));
-			Assert.That(result[3].Version, Is.EqualTo(2));
-			Assert.That(result[3].Position, Is.EqualTo(200));
-
-			Assert.That(result[4].Stream, Is.EqualTo(hash));
-			Assert.That(result[4].Version, Is.EqualTo(1));
-			Assert.That(result[4].Position, Is.EqualTo(100));
-
-			Assert.That(result[5].Stream, Is.EqualTo(hash));
-			Assert.That(result[5].Version, Is.EqualTo(0));
-			Assert.That(result[5].Position, Is.EqualTo(0));
-		}
-
-		[Test]
-		public void old_index_tables_are_deleted() {
-			if (_useBloomFilter) {
-				Assert.That(Directory.EnumerateFiles(_indexDir).Count(), Is.EqualTo(7), "Expected IndexMap and 3 tables and 3 bloom filters.");
-			} else {
-				Assert.That(Directory.EnumerateFiles(_indexDir).Count(), Is.EqualTo(4), "Expected IndexMap and 3 tables.");
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_an_index.cs b/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_an_index.cs
deleted file mode 100644
index 48412fa0cb4..00000000000
--- a/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_an_index.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.Scavenge {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class when_scavenging_an_index : SpecificationWithDirectoryPerTestFixture {
-		private PTable _newtable;
-		private readonly byte _oldVersion;
-		private bool _skipIndexVerify;
-		private PTable _oldTable;
-
-		public when_scavenging_an_index(byte oldVersion, bool skipIndexVerify) {
-			_oldVersion = oldVersion;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var table = new HashListMemTable(_oldVersion, maxSize: 20);
-			table.Add(0x010100000000, 0, 1);
-			table.Add(0x010200000000, 0, 2);
-			table.Add(0x010300000000, 0, 3);
-			table.Add(0x010300000000, 1, 4);
-			_oldTable = PTable.FromMemtable(table, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault);
-
-			long spaceSaved;
-			Func<IndexEntry, bool> existsAt = x => x.Position % 2 == 0;
-
-			_newtable = PTable.Scavenged(_oldTable, GetTempFilePath(),
-				PTableVersions.IndexV4, existsAt, out spaceSaved, skipIndexVerify: _skipIndexVerify,
-				initialReaders: Constants.PTableInitialReaderCount, maxReaders: Constants.PTableMaxReaderCountDefault,
-				useBloomFilter: true);
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_oldTable.Dispose();
-			_newtable.Dispose();
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void scavenged_ptable_is_newest_version() {
-			Assert.AreEqual(PTableVersions.IndexV4, _newtable.Version);
-		}
-
-		[Test]
-		public void there_are_2_records_in_the_merged_index() {
-			Assert.AreEqual(2, _newtable.Count);
-		}
-
-		[Test]
-		public void a_stream_can_be_found() {
-			var stream = (ulong)0x010300000000;
-			Assert.True(_newtable.TryGetLatestEntry(stream, out var entry));
-			Assert.AreEqual(stream, entry.Stream);
-			Assert.AreEqual(1, entry.Version);
-			Assert.AreEqual(4, entry.Position);
-		}
-
-		[Test]
-		public void the_items_are_sorted() {
-			var last = new IndexEntry(ulong.MaxValue, 0, long.MaxValue);
-			foreach (var item in _newtable.IterateAllInOrder()) {
-				Assert.IsTrue((last.Stream == item.Stream ? last.Version > item.Version : last.Stream > item.Stream) ||
-							  ((last.Stream == item.Stream && last.Version == item.Version) &&
-							   last.Position > item.Position));
-				last = item;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_an_index_fails.cs b/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_an_index_fails.cs
deleted file mode 100644
index 5ab0063cab7..00000000000
--- a/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_an_index_fails.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.Scavenge {
-	[TestFixture]
-	public class when_scavenging_an_index_fails : SpecificationWithDirectoryPerTestFixture {
-		private PTable _oldTable;
-		private string _expectedOutputFile;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var table = new HashListMemTable(PTableVersions.IndexV4, maxSize: 20);
-			table.Add(0x010100000000, 0, 1);
-			table.Add(0x010200000000, 0, 2);
-			table.Add(0x010300000000, 0, 3);
-			table.Add(0x010300000000, 1, 4);
-			_oldTable = PTable.FromMemtable(table, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault);
-
-			long spaceSaved;
-			Func<IndexEntry, bool> existsAt = x => { throw new Exception("Expected exception"); };
-
-			_expectedOutputFile = GetTempFilePath();
-			Assert.That(
-				() => PTable.Scavenged(_oldTable, _expectedOutputFile,
-					PTableVersions.IndexV4, existsAt, out spaceSaved, initialReaders: Constants.PTableInitialReaderCount, maxReaders: Constants.PTableMaxReaderCountDefault,
-					useBloomFilter: true),
-				Throws.Exception.With.Message.EqualTo("Expected exception"));
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_oldTable.Dispose();
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void the_output_file_is_deleted() {
-			Assert.That(File.Exists(_expectedOutputFile), Is.False);
-			Assert.That(File.Exists(PTable.GenBloomFilterFilename(_expectedOutputFile)), Is.False);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_an_index_is_cancelled.cs b/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_an_index_is_cancelled.cs
deleted file mode 100644
index 14804f2051f..00000000000
--- a/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_an_index_is_cancelled.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.Scavenge {
-	[TestFixture]
-	public class when_scavenging_an_index_is_cancelled : SpecificationWithDirectoryPerTestFixture {
-		private PTable _oldTable;
-		private string _expectedOutputFile;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var table = new HashListMemTable(PTableVersions.IndexV4, maxSize: 20);
-			table.Add(0x010100000000, 0, 1);
-			table.Add(0x010200000000, 0, 2);
-			table.Add(0x010300000000, 0, 3);
-			table.Add(0x010300000000, 1, 4);
-			_oldTable = PTable.FromMemtable(table, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault);
-
-			var cancellationTokenSource = new CancellationTokenSource();
-			long spaceSaved;
-			Func<IndexEntry, bool> existsAt = x => {
-				cancellationTokenSource.Cancel();
-				return true;
-			};
-
-			_expectedOutputFile = GetTempFilePath();
-			Assert.That(
-				() => PTable.Scavenged(_oldTable, _expectedOutputFile,
-					PTableVersions.IndexV4, existsAt, out spaceSaved, ct: cancellationTokenSource.Token,
-					initialReaders: Constants.PTableInitialReaderCount, maxReaders: Constants.PTableMaxReaderCountDefault,
-					useBloomFilter: true),
-				Throws.InstanceOf<OperationCanceledException>());
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_oldTable.Dispose();
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void the_output_file_is_deleted() {
-			Assert.That(File.Exists(_expectedOutputFile), Is.False);
-			Assert.That(File.Exists(PTable.GenBloomFilterFilename(_expectedOutputFile)), Is.False);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_an_index_removes_nothing.cs b/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_an_index_removes_nothing.cs
deleted file mode 100644
index f8c1c96ebc9..00000000000
--- a/src/EventStore.Core.Tests/Index/Scavenge/when_scavenging_an_index_removes_nothing.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Index.Scavenge {
-	[TestFixture(PTableVersions.IndexV2, false)]
-	[TestFixture(PTableVersions.IndexV2, true)]
-	[TestFixture(PTableVersions.IndexV3, false)]
-	[TestFixture(PTableVersions.IndexV3, true)]
-	[TestFixture(PTableVersions.IndexV4, false)]
-	[TestFixture(PTableVersions.IndexV4, true)]
-	public class when_scavenging_an_index_removes_nothing : SpecificationWithDirectoryPerTestFixture {
-		private PTable _newtable;
-		private readonly byte _oldVersion;
-		private bool _skipIndexVerify;
-		private PTable _oldTable;
-		private string _expectedOutputFile;
-
-		public when_scavenging_an_index_removes_nothing(byte oldVersion, bool skipIndexVerify) {
-			_oldVersion = oldVersion;
-			_skipIndexVerify = skipIndexVerify;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var table = new HashListMemTable(_oldVersion, maxSize: 20);
-			table.Add(0x010100000000, 0, 1);
-			table.Add(0x010200000000, 0, 2);
-			table.Add(0x010300000000, 0, 3);
-			table.Add(0x010300000000, 1, 4);
-			_oldTable = PTable.FromMemtable(table, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault);
-
-			long spaceSaved;
-			Func<IndexEntry, bool> existsAt = x => true;
-
-			_expectedOutputFile = GetTempFilePath();
-			_newtable = PTable.Scavenged(_oldTable, _expectedOutputFile,
-				PTableVersions.IndexV4, existsAt, out spaceSaved, skipIndexVerify: _skipIndexVerify,
-				initialReaders: Constants.PTableInitialReaderCount, maxReaders: Constants.PTableMaxReaderCountDefault);
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_oldTable.Dispose();
-			_newtable?.Dispose();
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void a_null_object_is_returned_if_the_version_is_unchanged() {
-			if (_oldVersion == PTableVersions.IndexV4) {
-				Assert.IsNull(_newtable);
-			}
-		}
-
-		[Test]
-		public void the_output_file_is_deleted_if_version_is_unchanged() {
-			if (_oldVersion == PTableVersions.IndexV4) {
-				Assert.That(File.Exists(_expectedOutputFile), Is.False);
-			}
-		}
-
-		[Test]
-		public void a_table_with_all_items_is_returned_with_a_newer_version() {
-			if (_oldVersion != PTableVersions.IndexV4) {
-				Assert.IsNotNull(_newtable);
-				Assert.That(_newtable.Count, Is.EqualTo(4));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Infrastructure/IRandTestFinishCondition.cs b/src/EventStore.Core.Tests/Infrastructure/IRandTestFinishCondition.cs
deleted file mode 100644
index 1aec952670a..00000000000
--- a/src/EventStore.Core.Tests/Infrastructure/IRandTestFinishCondition.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace EventStore.Core.Tests.Infrastructure {
-	public interface IRandTestFinishCondition {
-		bool Done { get; }
-		bool Success { get; }
-
-		void Process(int iteration, RandTestQueueItem item);
-		void Log();
-	}
-}
diff --git a/src/EventStore.Core.Tests/Infrastructure/IRandTestItemProcessor.cs b/src/EventStore.Core.Tests/Infrastructure/IRandTestItemProcessor.cs
deleted file mode 100644
index 2fc9be053fa..00000000000
--- a/src/EventStore.Core.Tests/Infrastructure/IRandTestItemProcessor.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-
-namespace EventStore.Core.Tests.Infrastructure {
-	public interface IRandTestItemProcessor {
-		IEnumerable<RandTestQueueItem> ProcessedItems { get; }
-
-		void Process(int iteration, RandTestQueueItem item);
-		void LogMessages();
-	}
-}
diff --git a/src/EventStore.Core.Tests/Infrastructure/RandTestQueueItem.cs b/src/EventStore.Core.Tests/Infrastructure/RandTestQueueItem.cs
deleted file mode 100644
index d74e5ebcd84..00000000000
--- a/src/EventStore.Core.Tests/Infrastructure/RandTestQueueItem.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Net;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Tests.Infrastructure {
-	public class RandTestQueueItem {
-		public readonly int LogicalTime;
-		public readonly int GlobalId;
-		public readonly EndPoint EndPoint;
-		public readonly Message Message;
-		public readonly IPublisher Bus;
-
-		public RandTestQueueItem(int logicalTime, int globalId, EndPoint endPoint, Message message, IPublisher bus) {
-			LogicalTime = logicalTime;
-			GlobalId = globalId;
-			EndPoint = endPoint;
-			Message = message;
-			Bus = bus;
-		}
-
-		public override string ToString() {
-			return string.Format("{0}-{1} :{2} to {3}", LogicalTime, GlobalId, Message, EndPoint.GetPort());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Infrastructure/RandomTestRunner.cs b/src/EventStore.Core.Tests/Infrastructure/RandomTestRunner.cs
deleted file mode 100644
index d645cb35906..00000000000
--- a/src/EventStore.Core.Tests/Infrastructure/RandomTestRunner.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System.Collections.Generic;
-using System.Net;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.DataStructures;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Tests.Infrastructure {
-	public class RandomTestRunner {
-		private readonly int _maxIterCnt;
-		private readonly PairingHeap<RandTestQueueItem> _queue;
-
-		private int _iter;
-		private int _curLogicalTime;
-		private int _globalMsgId;
-
-		public RandomTestRunner(int maxIterCnt) {
-			_maxIterCnt = maxIterCnt;
-			_queue = new PairingHeap<RandTestQueueItem>(new GlobalQueueItemComparer());
-		}
-
-		public bool Run(IRandTestFinishCondition finishCondition, params IRandTestItemProcessor[] processors) {
-			Ensure.NotNull(finishCondition, "finishCondition");
-
-			while (++_iter <= _maxIterCnt && _queue.Count > 0) {
-				var item = _queue.DeleteMin();
-				_curLogicalTime = item.LogicalTime;
-				foreach (var processor in processors) {
-					processor.Process(_iter, item);
-				}
-
-				finishCondition.Process(_iter, item);
-				if (finishCondition.Done)
-					break;
-
-				item.Bus.Publish(item.Message);
-			}
-
-			return finishCondition.Success;
-		}
-
-		public void Enqueue(EndPoint endPoint, Message message, IPublisher bus, int timeDelay = 1) {
-			System.Diagnostics.Debug.Assert(timeDelay >= 1);
-			_queue.Add(new RandTestQueueItem(_curLogicalTime + timeDelay, _globalMsgId++, endPoint, message, bus));
-		}
-
-		private class GlobalQueueItemComparer : IComparer<RandTestQueueItem> {
-			public int Compare(RandTestQueueItem x, RandTestQueueItem y) {
-				if (x.LogicalTime == y.LogicalTime)
-					return x.GlobalId - y.GlobalId;
-				return x.LogicalTime - y.LogicalTime;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Integration/Idempotency/when_soft_deleted_stream_is_written_to_idempotently.cs b/src/EventStore.Core.Tests/Integration/Idempotency/when_soft_deleted_stream_is_written_to_idempotently.cs
deleted file mode 100644
index 88bcb313509..00000000000
--- a/src/EventStore.Core.Tests/Integration/Idempotency/when_soft_deleted_stream_is_written_to_idempotently.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.UserManagement;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Integration.Idempotency {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_soft_deleted_stream_is_written_to_idempotently<TLogFormat, TStreamId> : specification_with_a_single_node<TLogFormat, TStreamId> {
-		private readonly string _streamId;
-		private readonly Event[] _events;
-
-		public when_soft_deleted_stream_is_written_to_idempotently() {
-			_streamId = $"{nameof(when_soft_deleted_stream_is_written_to_idempotently<TLogFormat, TStreamId>)}-{Guid.NewGuid()}";
-			_events = new[] {new Event(Guid.NewGuid(), "event-type", false, new byte[] { }, new byte[] { })};
-		}
-
-		protected override async Task Given() {
-			var writeEventsCompleted = new TaskCompletionSource<bool>();
-			_node.Node.MainQueue.Publish(new ClientMessage.WriteEvents(Guid.NewGuid(), Guid.NewGuid(),
-				new CallbackEnvelope(
-					_ => {
-						writeEventsCompleted.SetResult(true);
-					}), false, _streamId, ExpectedVersion.NoStream, _events, SystemAccounts.System));
-
-			await writeEventsCompleted.Task
-				.WithTimeout(TimeSpan.FromSeconds(2));
-
-			var deleteStreamCompleted = new TaskCompletionSource<bool>();
-			_node.Node.MainQueue.Publish(new ClientMessage.DeleteStream(Guid.NewGuid(), Guid.NewGuid(),
-				new CallbackEnvelope(
-					_ => {
-						deleteStreamCompleted.SetResult(true);
-					}), false, _streamId, ExpectedVersion.Any, false, SystemAccounts.System));
-
-			await deleteStreamCompleted.Task
-				.WithTimeout(TimeSpan.FromSeconds(2));
-		}
-
-		[Test]
-		public async Task should_return_negative_1_as_log_position() {
-			var writeEventsCompleted = new TaskCompletionSource<ClientMessage.WriteEventsCompleted>();
-			
-			_node.Node.MainQueue.Publish(new ClientMessage.WriteEvents(Guid.NewGuid(), Guid.NewGuid(),
-				new CallbackEnvelope(
-					msg => {
-						writeEventsCompleted.SetResult(msg as ClientMessage.WriteEventsCompleted);
-					}), false, _streamId, ExpectedVersion.NoStream, _events, SystemAccounts.System));
-			
-			var completed = await writeEventsCompleted.Task
-				.WithTimeout(TimeSpan.FromSeconds(2));
-			
-			Assert.AreEqual(-1, completed.CommitPosition);
-			Assert.AreEqual(-1, completed.PreparePosition);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Integration/authenticated_requests_made_from_a_follower.cs b/src/EventStore.Core.Tests/Integration/authenticated_requests_made_from_a_follower.cs
deleted file mode 100644
index 21076ecba82..00000000000
--- a/src/EventStore.Core.Tests/Integration/authenticated_requests_made_from_a_follower.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-using System;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text;
-using System.Text.Json;
-using System.Threading.Tasks;
-using EventStore.Client;
-using EventStore.Client.Streams;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Services.Transport.Grpc;
-using Google.Protobuf;
-using Grpc.Core;
-using Grpc.Net.Client;
-using NUnit.Framework;
-using StatusCode = Grpc.Core.StatusCode;
-
-namespace EventStore.Core.Tests.Integration {
-	public abstract class authenticated_requests_made_from_a_follower<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
-		private const string ProtectedStream = "$foo";
-
-		private static readonly string AuthorizationHeaderValue =
-			$"Basic {Convert.ToBase64String(Encoding.ASCII.GetBytes("admin:changeit"))}";
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class via_http_should : authenticated_requests_made_from_a_follower<TLogFormat, TStreamId> {
-			private HttpStatusCode _statusCode;
-
-			protected override async Task Given() {
-				var node = GetFollowers()[0];
-				await Task.WhenAll(node.AdminUserCreated, node.Started);
-				using var httpClient = new HttpClient(new SocketsHttpHandler {
-					SslOptions = {
-						RemoteCertificateValidationCallback = delegate { return true; }
-					}
-				}, true) {
-					BaseAddress = new Uri($"https://{node.HttpEndPoint}/"),
-					DefaultRequestHeaders = {
-						Authorization = AuthenticationHeaderValue.Parse(AuthorizationHeaderValue)
-					}
-				};
-
-				var content = JsonSerializer.SerializeToUtf8Bytes(new [] {
-					new {
-						eventId = Guid.NewGuid(),
-						data = new{},
-						metadata = new{},
-						eventType = "-"
-					}
-				}, new JsonSerializerOptions {
-					PropertyNamingPolicy = JsonNamingPolicy.CamelCase
-				});
-
-				using var response = await httpClient.PostAsync($"/streams/{ProtectedStream}",
-					new ReadOnlyMemoryContent(content) {
-						Headers = { ContentType = new MediaTypeHeaderValue("application/vnd.eventstore.events+json") }
-					});
-
-				_statusCode = response.StatusCode;
-			}
-
-			[Test]
-			[Retry(5)]
-			public void work() => Assert.AreEqual(HttpStatusCode.Created, _statusCode);
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class via_grpc_should : authenticated_requests_made_from_a_follower<TLogFormat, TStreamId> {
-			private Status _status;
-
-			protected override async Task Given() {
-				var node = GetFollowers()[0];
-				await Task.WhenAll(node.AdminUserCreated, node.Started);
-
-				using var channel = GrpcChannel.ForAddress(new Uri($"https://{node.HttpEndPoint}"),
-					new GrpcChannelOptions {
-						HttpClient = new HttpClient(new SocketsHttpHandler {
-							SslOptions = {
-								RemoteCertificateValidationCallback = delegate { return true; }
-							}
-						}, true)
-					});
-				var streamClient = new Streams.StreamsClient(channel);
-				using var call = streamClient.Append(new CallOptions(
-					credentials: CallCredentials.FromInterceptor((_, metadata) => {
-						metadata.Add("authorization", AuthorizationHeaderValue);
-						return Task.CompletedTask;
-					}),
-					deadline: DateTime.UtcNow.AddSeconds(10)));
-
-				await call.RequestStream.WriteAsync(new AppendReq {
-					Options = new AppendReq.Types.Options {
-						NoStream = new Empty(),
-						StreamIdentifier = new StreamIdentifier {
-							StreamName = ByteString.CopyFromUtf8(ProtectedStream)
-						}
-					}
-				});
-				await call.RequestStream.WriteAsync(new AppendReq {
-					ProposedMessage = new AppendReq.Types.ProposedMessage {
-						Id = new UUID {
-							String = Uuid.FromGuid(Guid.NewGuid()).ToString()
-						},
-						CustomMetadata = ByteString.Empty,
-						Data = ByteString.Empty,
-						Metadata = {
-							{EventStore.Core.Services.Transport.Grpc.Constants.Metadata.Type, "-"}, {
-								EventStore.Core.Services.Transport.Grpc.Constants.Metadata.ContentType,
-								EventStore.Core.Services.Transport.Grpc.Constants.Metadata.ContentTypes
-									.ApplicationOctetStream
-							}
-						}
-					}
-				});
-				await call.RequestStream.CompleteAsync();
-				await call.ResponseHeadersAsync;
-				await call.ResponseAsync;
-				_status = call.GetStatus();
-
-				await base.Given();
-			}
-
-			[Test]
-			[Retry(5)]
-			public void work() => Assert.AreEqual(StatusCode.OK, _status.StatusCode);
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class via_tcp_should : authenticated_requests_made_from_a_follower<TLogFormat, TStreamId> {
-			private Exception _caughtException;
-
-			protected override async Task Given() {
-				var node = GetFollowers()[0];
-				await Task.WhenAll(node.AdminUserCreated, node.Started);
-
-				using var connection = EventStoreConnection.Create(ConnectionSettings.Create()
-						.DisableServerCertificateValidation()
-						.PreferFollowerNode(),
-					node.ExternalTcpEndPoint);
-				await connection.ConnectAsync();
-
-				try {
-					await connection.AppendToStreamAsync(ProtectedStream, ExpectedVersion.NoStream,
-						new UserCredentials("admin", "changeit"),
-						new EventData(Guid.NewGuid(), "-", false, Array.Empty<byte>(), Array.Empty<byte>()));
-				} catch (Exception ex) {
-					_caughtException = ex;
-				}
-
-				await base.Given();
-			}
-
-			[Test]
-			[Retry(5)]
-			public void work() => Assert.Null(_caughtException);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Integration/specification_with_a_single_node.cs b/src/EventStore.Core.Tests/Integration/specification_with_a_single_node.cs
deleted file mode 100644
index 9d6a5a36194..00000000000
--- a/src/EventStore.Core.Tests/Integration/specification_with_a_single_node.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-using System.Net;
-using System.Threading;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Bus;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using System.IO;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.Tests.Integration {
-	public abstract class specification_with_a_single_node<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		protected MiniNode<TLogFormat, TStreamId> _node;
-
-		protected virtual TimeSpan Timeout { get; } = TimeSpan.FromSeconds(3);
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName, dbPath: Path.Combine(PathName, "db"), inMemDb: false);
-
-			BeforeNodeStarts();
-
-			await _node.Start();
-
-			try {
-				await Given().WithTimeout(Timeout);
-			} catch (Exception ex) {
-				throw new Exception("Given Failed", ex);
-			}
-		}
-
-		protected virtual void BeforeNodeStarts() {
-		}
-
-		protected virtual Task Given() => Task.CompletedTask;
-
-		protected async Task ShutdownNode() {
-			await _node.Shutdown(keepDb: true);
-			_node = null;
-		}
-
-		protected Task StartNode() {
-			if (_node == null)
-				_node = new MiniNode<TLogFormat, TStreamId>(PathName, dbPath: Path.Combine(PathName, "db"), inMemDb: false);
-
-			BeforeNodeStarts();
-
-			return _node.Start();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			await _node.Shutdown();
-			_node = null;
-			await base.TestFixtureTearDown();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Integration/specification_with_cluster.cs b/src/EventStore.Core.Tests/Integration/specification_with_cluster.cs
deleted file mode 100644
index f1ecfb5bce8..00000000000
--- a/src/EventStore.Core.Tests/Integration/specification_with_cluster.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-using System;
-using System.Net;
-using EventStore.ClientAPI;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Sockets;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Plugins.Subsystems;
-
-namespace EventStore.Core.Tests.Integration {
-	public abstract class specification_with_cluster<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		protected readonly MiniClusterNode<TLogFormat, TStreamId>[] _nodes = new MiniClusterNode<TLogFormat, TStreamId>[3];
-		protected readonly Endpoints[] _nodeEndpoints = new Endpoints[3];
-		protected IEventStoreConnection _conn;
-
-		private readonly Dictionary<int, Func<bool, MiniClusterNode<TLogFormat, TStreamId>>> _nodeCreationFactory = new();
-
-		protected class Endpoints {
-			public readonly IPEndPoint InternalTcp;
-			public readonly IPEndPoint ExternalTcp;
-			public readonly IPEndPoint HttpEndPoint;
-
-			public IEnumerable<int> Ports() {
-				yield return InternalTcp.Port;
-				yield return ExternalTcp.Port;
-				yield return HttpEndPoint.Port;
-			}
-
-			private readonly List<Socket> _sockets;
-
-			public Endpoints() {
-				_sockets = new List<Socket>();
-
-				var defaultLoopBack = new IPEndPoint(IPAddress.Loopback, 0);
-
-				var internalTcp = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-				internalTcp.Bind(defaultLoopBack);
-				_sockets.Add(internalTcp);
-
-				var externalTcp = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-				externalTcp.Bind(defaultLoopBack);
-				_sockets.Add(externalTcp);
-
-				var httpEndPoint = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-				httpEndPoint.Bind(defaultLoopBack);
-				_sockets.Add(httpEndPoint);
-
-				InternalTcp = CopyEndpoint((IPEndPoint)internalTcp.LocalEndPoint);
-				ExternalTcp = CopyEndpoint((IPEndPoint)externalTcp.LocalEndPoint);
-				HttpEndPoint = CopyEndpoint((IPEndPoint)httpEndPoint.LocalEndPoint);
-			}
-
-			public void DisposeSockets() {
-				foreach (var socket in _sockets) {
-					socket.Dispose();
-				}
-			}
-
-			private static IPEndPoint CopyEndpoint(IPEndPoint endpoint) =>
-				new(endpoint.Address, endpoint.Port);
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			MiniNodeLogging.Setup();
-
-			_nodeEndpoints[0] = new Endpoints();
-			_nodeEndpoints[1] = new Endpoints();
-			_nodeEndpoints[2] = new Endpoints();
-
-			_nodeEndpoints[0].DisposeSockets();
-			_nodeEndpoints[1].DisposeSockets();
-			_nodeEndpoints[2].DisposeSockets();
-
-			var duplicates = _nodeEndpoints[0].Ports().Concat(_nodeEndpoints[1].Ports())
-				.Concat(_nodeEndpoints[2].Ports())
-				.GroupBy(x => x)
-				.Where(g => g.Count() > 1)
-				.Select(x => x.Key)
-				.ToList();
-
-			Assert.IsEmpty(duplicates);
-
-			_nodeCreationFactory.Add(0, wait => CreateNode(0,
-				_nodeEndpoints[0], new[] { _nodeEndpoints[1].HttpEndPoint, _nodeEndpoints[2].HttpEndPoint },
-				wait));
-			_nodeCreationFactory.Add(1, wait => CreateNode(1,
-				_nodeEndpoints[1], new[] { _nodeEndpoints[0].HttpEndPoint, _nodeEndpoints[2].HttpEndPoint },
-				wait));
-			_nodeCreationFactory.Add(2, wait => CreateNode(2,
-				_nodeEndpoints[2], new[] { _nodeEndpoints[0].HttpEndPoint, _nodeEndpoints[1].HttpEndPoint },
-				wait));
-
-			_nodes[0] = _nodeCreationFactory[0](true);
-			_nodes[1] = _nodeCreationFactory[1](true);
-			_nodes[2] = _nodeCreationFactory[2](true);
-
-			BeforeNodesStart();
-
-			_nodes[0].Start();
-			_nodes[1].Start();
-			_nodes[2].Start();
-
-			try {
-				await Task.WhenAll(_nodes.Select(x => x.Started)).WithTimeout(TimeSpan.FromSeconds(60));
-			} catch (TimeoutException ex) {
-				if (_nodes.Select(x => x.Started).Count() < 2){
-					MiniNodeLogging.WriteLogs();
-					throw new TimeoutException($"Cluster nodes did not start. Statuses: {_nodes[0].NodeState}/{_nodes[1].NodeState}/{_nodes[2].NodeState}", ex);
-				}
-			}
-
-			// wait for cluster to be fully operational, tests depend on leader and followers
-			AssertEx.IsOrBecomesTrue(() => _nodes.Any(x => x.NodeState == Data.VNodeState.Leader),
-				timeout: TimeSpan.FromSeconds(30),
-				onFail: MiniNodeLogging.WriteLogs,
-				msg: "Waiting for leader timed out!");
-
-			//flaky: most tests only need 1 follower, waiting for 2 causes timeouts
-			AssertEx.IsOrBecomesTrue(() =>
-					_nodes.Any(x => x.NodeState is VNodeState.Follower or VNodeState.ReadOnlyReplica),
-				timeout: TimeSpan.FromSeconds(90),
-				onFail: MiniNodeLogging.WriteLogs,
-				msg: $"Waiting for followers timed out! States={string.Join(", ", _nodes.Select(n => n.NodeState))}");
-
-			_conn = CreateConnection();
-			await _conn.ConnectAsync();
-
-			await Given().WithTimeout(TimeSpan.FromMinutes(2), onFail: MiniNodeLogging.WriteLogs);
-		}
-
-		protected virtual IEventStoreConnection CreateConnection() =>
-			EventStoreConnection.Create(_nodes[0].ExternalTcpEndPoint);
-
-		protected virtual void BeforeNodesStart() {
-		}
-
-		protected virtual Task Given() => Task.CompletedTask;
-
-		protected Task ShutdownNode(int nodeNum) => _nodes[nodeNum].Shutdown(keepDb: true);
-
-		protected virtual MiniClusterNode<TLogFormat, TStreamId> CreateNode(int index, Endpoints endpoints, EndPoint[] gossipSeeds,
-			bool wait = true) => new(
-			PathName, index, endpoints.InternalTcp,
-			endpoints.ExternalTcp, endpoints.HttpEndPoint,
-			subsystems: Array.Empty<ISubsystem>(), gossipSeeds: gossipSeeds, inMemDb: false);
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			_conn?.Close();
-			await Task.WhenAll(
-				_nodes[0].Shutdown(),
-				_nodes[1].Shutdown(),
-				_nodes[2].Shutdown());
-
-			MiniNodeLogging.Clear();
-
-			await base.TestFixtureTearDown();
-		}
-
-		protected static void WaitIdle() {
-		}
-
-		protected MiniClusterNode<TLogFormat, TStreamId> GetLeader() {
-			var leader = _nodes.First(x => x.NodeState == Data.VNodeState.Leader);
-			Assert.NotNull(leader, "Cluster doesn't have a leader available!");
-
-			return leader;
-		}
-
-		protected MiniClusterNode<TLogFormat, TStreamId>[] GetFollowers() {
-			var followers = _nodes.Where(x => x.NodeState == Data.VNodeState.Follower).ToArray();
-			Assert.IsNotEmpty(followers, "Cluster doesn't have followers available!");
-
-			return followers;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Integration/when_a_leader_is_shutdown.cs b/src/EventStore.Core.Tests/Integration/when_a_leader_is_shutdown.cs
deleted file mode 100644
index 3086ec64a36..00000000000
--- a/src/EventStore.Core.Tests/Integration/when_a_leader_is_shutdown.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.Tests.Integration {
-	[Category("LongRunning"), Ignore("Flaky test - e.g. if multiple elections take place")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_a_leader_is_shutdown<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
-		private List<Guid> _epochIds = new List<Guid>();
-		private List<string> _roleAssignments = new List<string>();
-		private CountdownEvent _expectedNumberOfEvents;
-		private object _lock = new object();
-
-		protected override void BeforeNodesStart() {
-			_nodes.ToList().ForEach(x => {
-				x.Node.MainBus.Subscribe(new AdHocHandler<SystemMessage.BecomeLeader>(Handle));
-				x.Node.MainBus.Subscribe(new AdHocHandler<SystemMessage.BecomeFollower>(Handle));
-				x.Node.MainBus.Subscribe(new AdHocHandler<SystemMessage.EpochWritten>(Handle));
-			});
-
-			_expectedNumberOfEvents = new CountdownEvent(3 /*role assignments*/ + 1 /*epoch write*/);
-			base.BeforeNodesStart();
-		}
-
-		protected override async Task Given() {
-			_expectedNumberOfEvents.Wait(5000);
-			var leader = _nodes.First(x => x.NodeState == Data.VNodeState.Leader);
-			await ShutdownNode(leader.DebugIndex);
-			_expectedNumberOfEvents = new CountdownEvent(2 /*role assignments*/ + 1 /*epoch write*/);
-			_expectedNumberOfEvents.Wait(5000);
-			await base.Given();
-		}
-
-		private void Handle(SystemMessage.BecomeLeader msg) {
-			lock (_lock) {
-				_roleAssignments.Add("leader");
-			}
-
-			_expectedNumberOfEvents?.Signal();
-		}
-
-		private void Handle(SystemMessage.BecomeFollower msg) {
-			lock (_lock) {
-				_roleAssignments.Add("follower");
-			}
-
-			_expectedNumberOfEvents?.Signal();
-		}
-
-		private void Handle(SystemMessage.EpochWritten msg) {
-			lock (_lock) {
-				_epochIds.Add(msg.Epoch.EpochId);
-			}
-
-			_expectedNumberOfEvents?.Signal();
-		}
-
-		[Test]
-		public void should_assign_leader_and_follower_roles_correctly() {
-			Assert.AreEqual(5, _roleAssignments.Count());
-
-			Assert.AreEqual(1, _roleAssignments.Take(3).Where(x => x.Equals("leader")).Count());
-			Assert.AreEqual(2, _roleAssignments.Take(3).Where(x => x.Equals("follower")).Count());
-
-			//after shutting down
-			Assert.AreEqual(1, _roleAssignments.Skip(3).Take(2).Where(x => x.Equals("leader")).Count());
-			Assert.AreEqual(1, _roleAssignments.Skip(3).Take(2).Where(x => x.Equals("follower")).Count());
-		}
-
-		[Test]
-		public void should_have_two_unique_epoch_writes() {
-			Assert.AreEqual(2, _epochIds.Distinct().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Integration/when_a_single_node_is_restarted_multiple_times.cs b/src/EventStore.Core.Tests/Integration/when_a_single_node_is_restarted_multiple_times.cs
deleted file mode 100644
index 6c02e4eb85a..00000000000
--- a/src/EventStore.Core.Tests/Integration/when_a_single_node_is_restarted_multiple_times.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.Tests.Integration {
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_a_single_node_is_restarted_multiple_times<TLogFormat, TStreamId> : specification_with_a_single_node<TLogFormat, TStreamId> {
-		private List<Guid> _epochIds = new List<Guid>();
-		private const int _numberOfNodeStarts = 5;
-		private readonly AutoResetEvent _waitForStart = new AutoResetEvent(false);
-
-		protected override TimeSpan Timeout { get; } = TimeSpan.FromMinutes(1);
-
-		protected override void BeforeNodeStarts() {
-			_node.Node.MainBus.Subscribe(new AdHocHandler<SystemMessage.EpochWritten>(Handle));
-			base.BeforeNodeStarts();
-		}
-
-		protected override async Task Given() {
-			for (int i = 0; i < _numberOfNodeStarts - 1; i++) {
-				_waitForStart.WaitOne(5000);
-				await ShutdownNode();
-				await StartNode();
-			}
-
-			_waitForStart.WaitOne(5000);
-			await base.Given();
-		}
-
-		private void Handle(SystemMessage.EpochWritten msg) {
-			_epochIds.Add(msg.Epoch.EpochId);
-			_waitForStart.Set();
-		}
-
-		[Test]
-		public void should_be_a_different_epoch_for_every_startup() {
-			Assert.AreEqual(_numberOfNodeStarts, _epochIds.Distinct().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Integration/when_a_single_node_is_shutdown.cs b/src/EventStore.Core.Tests/Integration/when_a_single_node_is_shutdown.cs
deleted file mode 100644
index fbbd67c0a4c..00000000000
--- a/src/EventStore.Core.Tests/Integration/when_a_single_node_is_shutdown.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Integration {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_a_single_node_is_shutdown<TLogFormat, TStreamId> : SpecificationWithDirectory {
-		[Test]
-		public async Task throws_on_timeout() {
-			var node = new MiniNode<TLogFormat, TStreamId>(PathName);
-			try {
-				await node.Start();
-
-				var shutdownTask = node.Node.StopAsync(TimeSpan.FromMilliseconds(1));
-				Assert.ThrowsAsync<TimeoutException>(() => shutdownTask);
-			} finally {
-				await node.Shutdown();
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Integration/when_cluster_nodes_are_restarted.cs b/src/EventStore.Core.Tests/Integration/when_cluster_nodes_are_restarted.cs
deleted file mode 100644
index 494ecf477db..00000000000
--- a/src/EventStore.Core.Tests/Integration/when_cluster_nodes_are_restarted.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using NUnit.Framework;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.Tests.Integration {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_restarting_one_node_at_a_time<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
-		protected override async Task Given() {
-			await base.Given();
-
-			for (int i = 0; i < 9; i++) {
-				await Task.Delay(2000); //flaky: temporary fix for getting stable cluster
-				
-				await _nodes[i % 3].Shutdown(keepDb: true);
-				await Task.Delay(2000);
-				
-				var node = CreateNode(i % 3, _nodeEndpoints[i % 3],
-					new[] {_nodeEndpoints[(i+1)%3].HttpEndPoint, _nodeEndpoints[(i+2)%3].HttpEndPoint});
-				node.Start();
-				_nodes[i % 3] = node;
-
-				await Task.WhenAll(_nodes.Select(x => x.Started)).WithTimeout(TimeSpan.FromSeconds(30));
-			}
-		}
-
-		[Test]
-		public void cluster_should_stabilize() {
-			var leaders = 0;
-			var followers = 0;
-			var acceptedStates = new[] {VNodeState.Leader, VNodeState.Follower};
-
-			for (int i = 0; i < 3; i++) {
-				AssertEx.IsOrBecomesTrue(() => acceptedStates.Contains(_nodes[i].NodeState),
-					TimeSpan.FromSeconds(5), $"node {i} failed to become a leader/follower");
-
-				var state = _nodes[i].NodeState;
-				if (state == VNodeState.Leader) leaders++;
-				else if (state == VNodeState.Follower) followers++;
-				else throw new Exception($"node {i} in unexpected state {state}");
-			}
-
-			Assert.AreEqual(1, leaders);
-			Assert.AreEqual(2, followers);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Integration/when_node_becomes_leader_with_unindexed_data.cs b/src/EventStore.Core.Tests/Integration/when_node_becomes_leader_with_unindexed_data.cs
deleted file mode 100644
index a2304bc039e..00000000000
--- a/src/EventStore.Core.Tests/Integration/when_node_becomes_leader_with_unindexed_data.cs
+++ /dev/null
@@ -1,307 +0,0 @@
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.Client.Streams;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Transport.Grpc;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Plugins.Subsystems;
-using Google.Protobuf;
-using Grpc.Core;
-using Grpc.Net.Client;
-using Empty = EventStore.Client.Empty;
-using RecordedEvent = EventStore.Client.Streams.ReadResp.Types.ReadEvent.Types.RecordedEvent;
-using GrpcMetadata = EventStore.Core.Services.Transport.Grpc.Constants.Metadata;
-
-namespace EventStore.Core.Tests.Integration {
-	[Explicit]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_node_becomes_leader_with_unindexed_data<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
-		private const string FakeHostAdvertiseAs = "192.168.123.123";
-		private const string Username = "admin";
-		private const string Password = "changeit";
-
-		private const string AuthenticationScheme = "Basic";
-		private readonly string AuthenticationValue = Convert.ToBase64String(Encoding.ASCII.GetBytes($"{Username}:{Password}"));
-		private class CommitTimeoutException : Exception { }
-		private class WrongExpectedVersionException : Exception { }
-
-		private EndPoint[][] _nodeGossipSeeds;
-		private HttpClient _httpClient;
-
-		protected override async Task Given() {
-			_nodeGossipSeeds = new[] {
-				new EndPoint[] {_nodeEndpoints[1].HttpEndPoint, _nodeEndpoints[2].HttpEndPoint},
-				new EndPoint[] {_nodeEndpoints[0].HttpEndPoint, _nodeEndpoints[2].HttpEndPoint},
-				new EndPoint[] {_nodeEndpoints[0].HttpEndPoint, _nodeEndpoints[1].HttpEndPoint}
-			};
-			_httpClient = new HttpClient(new SocketsHttpHandler {
-				SslOptions = {
-					RemoteCertificateValidationCallback = delegate { return true; }
-				}
-			}, true);
-			await base.Given();
-		}
-
-		private CallOptions GetCallOptions() {
-			return new(
-				credentials: CallCredentials.FromInterceptor((_, metadata) => {
-					metadata.Add("authorization", $"{AuthenticationScheme} {AuthenticationValue}");
-					return Task.CompletedTask;
-				}),
-				deadline: DateTime.UtcNow.AddSeconds(5));
-		}
-
-		private async Task AppendEvent(IPEndPoint endpoint, string stream, long expectedVersion) {
-			using var channel = GrpcChannel.ForAddress(new Uri($"https://{endpoint}"),
-				new GrpcChannelOptions { HttpClient = _httpClient });
-			var streamClient = new Streams.StreamsClient(channel);
-			using var call = streamClient.Append(GetCallOptions());
-
-			var optionsAppendReq = new AppendReq {
-				Options = new() {
-					StreamIdentifier = new() {
-						StreamName = ByteString.CopyFromUtf8(stream)
-					},
-				}
-			};
-			switch (expectedVersion) {
-				case ExpectedVersion.Any:
-					optionsAppendReq.Options.Any = new Empty();
-					break;
-				case ExpectedVersion.NoStream:
-					optionsAppendReq.Options.NoStream = new Empty();
-					break;
-				default:
-					optionsAppendReq.Options.Revision = (ulong) expectedVersion;
-					break;
-			}
-
-			await call.RequestStream.WriteAsync(optionsAppendReq);
-			await call.RequestStream.WriteAsync(new AppendReq {
-				ProposedMessage = new() {
-					Id = new() {
-						String = Uuid.FromGuid(Guid.NewGuid()).ToString()
-					},
-					Data = ByteString.Empty,
-					Metadata = {
-						[GrpcMetadata.Type] = "type",
-						[GrpcMetadata.ContentType] = GrpcMetadata.ContentTypes.ApplicationJson
-					}
-				}
-			});
-
-			await call.RequestStream.CompleteAsync();
-			try {
-				var appendResp = await call.ResponseAsync;
-				switch (appendResp.ResultCase)
-				{
-					case AppendResp.ResultOneofCase.Success:
-						return;
-					case AppendResp.ResultOneofCase.WrongExpectedVersion:
-						throw new WrongExpectedVersionException();
-				}
-			}
-			catch (RpcException ex) when (ex.Status.StatusCode == StatusCode.DeadlineExceeded) {
-				throw new CommitTimeoutException();
-			}
-		}
-
-		private async Task<IEnumerable<RecordedEvent>> ReadAllEvents(IPEndPoint endpoint) {
-			using var channel = GrpcChannel.ForAddress(new Uri($"https://{endpoint}"),
-				new GrpcChannelOptions { HttpClient = _httpClient });
-			var streamClient = new Streams.StreamsClient(channel);
-
-			using var call = streamClient.Read(new ReadReq {
-				Options = new() {
-					All = new() {
-						Start = new Empty()
-					},
-					ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
-					Count = ulong.MaxValue,
-					NoFilter = new Empty(),
-					UuidOption = new() { Structured = new() }
-				}
-			}, GetCallOptions());
-
-			return await (from response in call.ResponseStream.ReadAllAsync() where response.Event != null select response.Event.Event).ToListAsync();
-		}
-
-		private MiniClusterNode<TLogFormat, TStreamId> CreateNode(int index, Endpoints endpoints, EndPoint[] gossipSeeds,
-			int nodePriority, string intHostAdvertiseAs) => new(
-			PathName, index, endpoints.InternalTcp,
-			endpoints.ExternalTcp, endpoints.HttpEndPoint,
-			subsystems: Array.Empty<ISubsystem>(), gossipSeeds: gossipSeeds, inMemDb: false,
-			nodePriority: nodePriority, intHostAdvertiseAs: intHostAdvertiseAs);
-
-		private Task StartNode(int i, int priority, string intHostAdvertiseAs = null) {
-			_nodes[i] = CreateNode(i, _nodeEndpoints[i], _nodeGossipSeeds[i], priority, intHostAdvertiseAs);
-			_nodes[i].Start();
-			return Task.CompletedTask;
-		}
-
-		private async Task<HttpStatusCode> GetLiveStatus(IPEndPoint httpEndPoint){
-			var response = await _httpClient.GetAsync($"https://{httpEndPoint}/health/live");
-			return response.StatusCode;
-		}
-
-		private async Task WaitForAllNodesToBeLive() {
-			for (int i = 0; i < 3; i++) {
-				await WaitForNodeToBeLive(i);
-			}
-		}
-
-		private async Task WaitForNodeToBeLive(int idx) {
-			while (await GetLiveStatus(_nodes[idx].HttpEndPoint) != HttpStatusCode.NoContent) {
-				await Task.Delay(100);
-			}
-		}
-
-		private async Task WaitForAllNodesToBeCaughtUp(int maxIdx = 3) {
-			while (true) {
-				var prevWriter = long.MinValue;
-				var prevChaser = long.MinValue;
-				var caughtUp = true;
-				for (int i = 0; i < maxIdx; i++) {
-					var writer = _nodes[i].Db.Config.WriterCheckpoint.ReadNonFlushed();
-					var chaser = _nodes[i].Db.Config.ChaserCheckpoint.ReadNonFlushed();
-
-					if (prevWriter == long.MinValue) prevWriter = writer;
-					if (prevChaser == long.MinValue) prevChaser = chaser;
-					if (chaser != writer || writer != prevWriter) {
-						caughtUp = false;
-					}
-				}
-
-				if (caughtUp) break;
-				await Task.Delay(100);
-			}
-		}
-
-		private async Task ShutdownNode(int i, bool keepDb) => await _nodes[i].Shutdown(keepDb: keepDb);
-
-		private async Task ShutdownAllNodes(int maxIdx = 3, bool keepDb = false) {
-			for (int i = 0; i < maxIdx; i++) {
-				await ShutdownNode(i, keepDb);
-			}
-		}
-
-		private async Task ResignLeader(int leaderIdx) {
-			var httpEndPoint = _nodes[leaderIdx].HttpEndPoint;
-			var request = new HttpRequestMessage(HttpMethod.Post, $"https://{httpEndPoint}/admin/node/resign") {
-				Content = new StringContent(""),
-				Headers = {
-					Authorization = new AuthenticationHeaderValue(AuthenticationScheme, AuthenticationValue)
-				}
-			};
-
-			var response = await _httpClient.SendAsync(request);
-			if (response.StatusCode != HttpStatusCode.OK) {
-				throw new Exception($"Unexpected status code: {response.StatusCode}");
-			}
-
-			var start = DateTime.UtcNow;
-			while (_nodes[leaderIdx].NodeState != VNodeState.Unknown && DateTime.UtcNow - start < TimeSpan.FromSeconds(2)) {
-				await Task.Delay(100);
-			}
-		}
-
-		[SetUp]
-		public async Task SetUp() {
-			// reset the node states between tests
-			for (int i = 0; i < 3; i++) {
-				await _nodes[i].Shutdown(keepDb: false);
-			}
-
-			for (int i = 0; i < 3; i++) {
-				_nodes[i] = CreateNode(i, _nodeEndpoints[i], _nodeGossipSeeds[i], 0, null);
-				_nodes[i].Start();
-			}
-		}
-
-		[TestCase(true)]
-		[TestCase(false)]
-		[Explicit, Category("LongRunning"), Timeout(80000), NonParallelizable]
-		public async Task new_events_should_have_correct_event_numbers(bool appendInitialEvent) {
-			await WaitForAllNodesToBeLive();
-
-			if (appendInitialEvent) {
-				// append event 0@test
-				await AppendEvent(_nodes[0].HttpEndPoint, "test", ExpectedVersion.NoStream);
-			}
-
-			await WaitForAllNodesToBeCaughtUp();
-			await ShutdownAllNodes(keepDb: true);
-
-			// make node 1 become the leader by setting its priority to 1
-			// node 0 can't become a follower since it can't replicate over internal TCP due to the fake --int-host-advertise-as
-			await StartNode(0, priority: 0, intHostAdvertiseAs: FakeHostAdvertiseAs);
-			await StartNode(1, priority: 1, intHostAdvertiseAs: FakeHostAdvertiseAs);
-
-			try {
-				await WaitForNodeToBeLive(1).WithTimeout(TimeSpan.FromSeconds(10));
-				Assert.AreEqual(VNodeState.Leader, _nodes[1].NodeState);
-			} catch (TimeoutException) {
-				// want to get stuck in preleader since replication isn't possible
-				Assert.AreEqual(VNodeState.PreLeader, _nodes[1].NodeState);
-				return;
-			}
-
-			// append event 1@test. Expect a commit timeout since there is no quorum.
-			Assert.ThrowsAsync<CommitTimeoutException>(async () => {
-				await AppendEvent(_nodes[1].HttpEndPoint, "test", appendInitialEvent ? 0 : ExpectedVersion.NoStream);
-			});
-
-			// resign the leader node so that it goes into the Unknown state and to trigger new elections
-			await ResignLeader(1);
-
-			// wait for the node to become Leader again
-			while (_nodes[1].NodeState != VNodeState.Leader) {
-				await Task.Delay(100);
-			}
-
-			// append event 1@test again. Expect a commit timeout since there is no quorum.
-			Assert.ThrowsAsync<CommitTimeoutException>(async () => {
-				await AppendEvent(_nodes[1].HttpEndPoint, "test", appendInitialEvent ? 0 : ExpectedVersion.NoStream);
-			});
-
-			// shut down both nodes
-			await ShutdownAllNodes(maxIdx: 2, keepDb: true);
-
-			// start both nodes again without the fake --int-host-advertise-as so that they can form a cluster
-			await StartNode(0, priority: 0);
-			await StartNode(1, priority: 1);
-			try {
-				await _nodes[0].Started.WithTimeout(TimeSpan.FromSeconds(10));
-				await _nodes[1].Started.WithTimeout(TimeSpan.FromSeconds(10));
-			} catch (TimeoutException) {
-				// this is expected in logv3 because by creating the duplicate events above we also
-				// created duplicate stream records which it will detect and complain about it
-				throw new Exception($"Couldn't start one or more nodes: {_nodes[0].NodeState} {_nodes[1].NodeState}");
-			}
-			Assert.AreEqual(VNodeState.Follower, _nodes[0].NodeState);
-			Assert.AreEqual(VNodeState.Leader, _nodes[1].NodeState);
-
-			// wait for data replication
-			await WaitForAllNodesToBeCaughtUp(maxIdx: 2);
-
-			// read "test" events from $all
-			var events =
-				(await ReadAllEvents(_nodes[1].HttpEndPoint))
-				.Where(x => x.StreamIdentifier!.StreamName.ToStringUtf8() == "test").ToArray();
-
-			Assert.AreEqual(appendInitialEvent ? 3 : 2, events.Length);
-			for (int i = 0; i < (appendInitialEvent ? 3 : 2); i++) {
-				Assert.AreEqual(i, events[i].StreamRevision, $"i = {i}, revision = {events[i].StreamRevision}");
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/LogFormatHelper.cs b/src/EventStore.Core.Tests/LogFormatHelper.cs
deleted file mode 100644
index f7b597523c0..00000000000
--- a/src/EventStore.Core.Tests/LogFormatHelper.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System;
-using EventStore.Core.LogAbstraction;
-using LogV3StreamId = System.UInt32;
-
-namespace EventStore.Core.Tests {
-	public class LogFormat {
-		public class V2{}
-		public class V3{}
-	}
-
-	public static class LogFormatHelper<TLogFormat, TStreamId> {
-		public static bool IsV2 => typeof(TLogFormat) == typeof(LogFormat.V2);
-		public static bool IsV3 => typeof(TLogFormat) == typeof(LogFormat.V3);
-
-		// static v3 but private so that we can be sure we only hand out stateless parts of it
-		readonly static LogFormatAbstractor<LogV3StreamId> _v3 = new LogV3FormatAbstractorFactory().Create(new() {
-			InMemory = true,
-		});
-
-		readonly static LogFormatAbstractor<string> _v2 = new LogV2FormatAbstractorFactory().Create(new() {
-			InMemory = true,
-		});		
-
-		public static T Choose<T>(object v2, object v3) {
-			if (typeof(TLogFormat) == typeof(LogFormat.V2)) {
-				if (typeof(TStreamId) != typeof(string)) throw new InvalidOperationException();
-				return (T)v2;
-			}
-			if(typeof(TLogFormat) == typeof(LogFormat.V3)) {
-				if (typeof(TStreamId) != typeof(LogV3StreamId)) throw new InvalidOperationException($"TStreamId was {typeof(TStreamId)} but expected {typeof(LogV3StreamId)}");
-				return (T)v3;
-			}
-			throw new InvalidOperationException();
-		}
-
-		private static LogFormatAbstractor<TStreamId> _staticLogFormat =
-			Choose<LogFormatAbstractor<TStreamId>>(_v2, _v3);
-
-		public static ILogFormatAbstractorFactory<TStreamId> LogFormatFactory { get; } =
-			Choose<ILogFormatAbstractorFactory<TStreamId>>(new LogV2FormatAbstractorFactory(), new LogV3FormatAbstractorFactory());
-
-		// safe because stateless
-		public static IRecordFactory<TStreamId> RecordFactory { get; } = _staticLogFormat.RecordFactory;
-
-		// safe because stateless
-		public static bool SupportsExplicitTransactions { get; } = _staticLogFormat.SupportsExplicitTransactions;
-
-		// safe because stateless
-		public static TStreamId EmptyStreamId { get; } = _staticLogFormat.EmptyStreamId;
-
-		/// just a valid stream id
-		public static TStreamId StreamId { get; } =	Choose<TStreamId>("stream", 1024U);
-		public static TStreamId StreamId2 { get; } = Choose<TStreamId>("stream2", 1026U);
-
-		public static TStreamId EventTypeId { get; } =	Choose<TStreamId>("eventType", 1024U);
-		public static TStreamId EventTypeId2 { get; } =	Choose<TStreamId>("eventType2", 1025U);
-		public static TStreamId EmptyEventTypeId { get; } = _staticLogFormat.EmptyEventTypeId;
-		
-		public static void CheckIfExplicitTransactionsSupported() {
-			if (typeof(TLogFormat) == typeof(LogFormat.V3)) {
-				throw new InvalidOperationException("Explicit transactions are not supported yet by Log V3");
-			}
-		}
-
-		public static void EnsureV0PrepareSupported() {
-			if (typeof(TLogFormat) == typeof(LogFormat.V3)) {
-				throw new InvalidOperationException("No such thing as a V0 prepare in LogV3");
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/ReadIndexExtensions.cs b/src/EventStore.Core.Tests/ReadIndexExtensions.cs
deleted file mode 100644
index efd183cbd97..00000000000
--- a/src/EventStore.Core.Tests/ReadIndexExtensions.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services;
-using EventStore.Core.Services.Storage.ReaderIndex;
-
-namespace EventStore.Core.Tests {
-	// Extensions to perform streamlookups inline
-	// mainly to facilitate conversion of existing LogV2 tests.
-	public static class IReadIndexExtensions {
-		public static bool IsStreamDeleted<TStreamId>(this IReadIndex<TStreamId> self, string streamName) {
-			var streamId = self.GetStreamId(streamName);
-			return self.IsStreamDeleted(streamId);
-		}
-
-		public static long GetStreamLastEventNumber<TStreamId>(this IReadIndex<TStreamId> self, string streamName) {
-			var streamId = self.GetStreamId(streamName);
-			return self.GetStreamLastEventNumber(streamId);
-		}
-
-		public static IndexReadEventResult ReadEvent<TStreamId>(this IReadIndex<TStreamId> self, string streamName, long eventNumber) {
-			var streamId = self.GetStreamId(streamName);
-			return self.ReadEvent(streamName, streamId, eventNumber);
-		}
-
-		public static IndexReadStreamResult ReadStreamEventsForward<TStreamId>(this IReadIndex<TStreamId> self, string streamName, long fromEventNumber, int maxCount) {
-			var streamId = self.GetStreamId(streamName);
-			return self.ReadStreamEventsForward(streamName, streamId, fromEventNumber, maxCount);
-		}
-
-		public static IndexReadStreamResult ReadStreamEventsBackward<TStreamId>(this IReadIndex<TStreamId> self, string streamName, long fromEventNumber, int maxCount) {
-			var streamId = self.GetStreamId(streamName);
-			return self.ReadStreamEventsBackward(streamName, streamId, fromEventNumber, maxCount);
-		}
-
-		public static StreamMetadata GetStreamMetadata<TStreamId>(this IReadIndex<TStreamId> self, string streamName) {
-			var streamId = self.GetStreamId(streamName);
-			return self.GetStreamMetadata(streamId);
-		}
-
-		public static List<CommitEventRecord> EventRecords(this IndexReadAllResult result) {
-			return result.Records
-				.Where(r => r.Event.EventStreamId != SystemStreams.StreamsCreatedStream
-				            && r.Event.EventStreamId != SystemStreams.EventTypesStream).ToList();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Resources/es-tile.png b/src/EventStore.Core.Tests/Resources/es-tile.png
deleted file mode 100644
index fab90eaf278..00000000000
Binary files a/src/EventStore.Core.Tests/Resources/es-tile.png and /dev/null differ
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/ClusterSettings.cs b/src/EventStore.Core.Tests/Services/ElectionsService/ClusterSettings.cs
deleted file mode 100644
index af9d07b56ae..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/ClusterSettings.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Net;
-using EventStore.Common.Utils;
-using EventStore.Core.Cluster.Settings;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.Tests.Services.ElectionsService {
-	public sealed class ClusterSettings {
-		public string ClusterDns { get; }
-
-		public ClusterVNodeSettings Self { get; }
-		public ClusterVNodeSettings[] GroupMembers { get; }
-
-		public IPEndPoint ClusterManager { get; }
-
-		public int ClusterNodesCount { get; }
-
-		public ClusterSettings(string clusterDns,
-			IPEndPoint clusterManager,
-			ClusterVNodeSettings self,
-			ClusterVNodeSettings[] groupMembers,
-			int expectedNodesCount) {
-			if (string.IsNullOrWhiteSpace(clusterDns))
-				throw new ArgumentException($"Wrong cluster DNS name: {clusterDns}", clusterDns);
-			if (self == null)
-				throw new ArgumentNullException(nameof(self));
-			if (groupMembers == null)
-				throw new ArgumentNullException(nameof(groupMembers));
-			if (clusterManager == null)
-				throw new ArgumentNullException(nameof(clusterManager));
-
-			ClusterDns = clusterDns;
-			Self = self;
-			GroupMembers = groupMembers;
-			ClusterManager = clusterManager;
-			ClusterNodesCount = expectedNodesCount;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/ClusterSettingsFactory.cs b/src/EventStore.Core.Tests/Services/ElectionsService/ClusterSettingsFactory.cs
deleted file mode 100644
index 2f2dc4f837c..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/ClusterSettingsFactory.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Linq;
-using System.Net;
-using System.Runtime.InteropServices;
-using EventStore.Core.Cluster.Settings;
-using EventStore.Core.Tests.Services.Transport.Tcp;
-
-namespace EventStore.Core.Tests.Services.ElectionsService {
-	public class ClusterSettingsFactory {
-		private const int ManagerPort = 1001;
-		private const int StartingPort = 1002;
-
-		private static ClusterVNodeSettings CreateVNode(int nodeNumber, bool isReadOnlyReplica) {
-			int tcpIntPort = StartingPort + nodeNumber * 2,
-				tcpExtPort = tcpIntPort + 1,
-				httpPort = tcpIntPort + 11;
-
-			return new ClusterVNodeSettings(Guid.NewGuid(), 0,
-				GetLoopbackForPort(tcpIntPort), null,
-				GetLoopbackForPort(tcpExtPort), null,
-				GetLoopbackForPort(httpPort), 0,
-				isReadOnlyReplica);
-		}
-
-		private static IPEndPoint GetLoopbackForPort(int port) => new(IPAddress.Loopback, port);
-
-		public static ClusterSettings GetClusterSettings(int selfIndex, int nodesCount, bool isSelfReadOnlyReplica) {
-			if (selfIndex < 0 || selfIndex >= nodesCount)
-				throw new ArgumentOutOfRangeException("selfIndex", "Index of self should be in range of created nodes");
-
-			var clusterManager = GetLoopbackForPort(ManagerPort);
-			var nodes = Enumerable.Range(0, nodesCount).Select(x =>
-				x == selfIndex ? CreateVNode(x, isSelfReadOnlyReplica) : CreateVNode(x, false)).ToArray();
-
-			var self = nodes[selfIndex];
-			var others = nodes.Where((_, i) => i != selfIndex).ToArray();
-
-			return new ClusterSettings("test-dns", clusterManager, self, others, nodes.Length);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/ClusterVNodeSettings.cs b/src/EventStore.Core.Tests/Services/ElectionsService/ClusterVNodeSettings.cs
deleted file mode 100644
index 1e341bd247e..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/ClusterVNodeSettings.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Linq;
-using System.Net;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.TransactionLog.Chunks;
-
-namespace EventStore.Core.Tests.Services.ElectionsService {
-	public class ClusterVNodeSettings {
-		public readonly VNodeInfo NodeInfo;
-
-		public readonly int NodePriority;
-
-		public readonly bool ReadOnlyReplica;
-
-		public ClusterVNodeSettings(Guid instanceId, int debugIndex,
-			IPEndPoint internalTcpEndPoint,
-			IPEndPoint internalSecureTcpEndPoint,
-			IPEndPoint externalTcpEndPoint,
-			IPEndPoint externalSecureTcpEndPoint,
-			IPEndPoint httpEndPoint,
-			int nodePriority,
-			bool readOnlyReplica) {
-			Ensure.NotEmptyGuid(instanceId, "instanceId");
-			Ensure.Equal(false, internalTcpEndPoint == null && internalSecureTcpEndPoint == null, "Both internal TCP endpoints are null");
-
-			Ensure.NotNull(httpEndPoint, nameof(httpEndPoint));
-
-			NodeInfo = new VNodeInfo(instanceId, debugIndex,
-				internalTcpEndPoint, internalSecureTcpEndPoint,
-				externalTcpEndPoint, externalSecureTcpEndPoint,
-				httpEndPoint,
-				readOnlyReplica);
-
-
-			NodePriority = nodePriority;
-			ReadOnlyReplica = readOnlyReplica;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/ElectionServiceUnit.cs b/src/EventStore.Core.Tests/Services/ElectionsService/ElectionServiceUnit.cs
deleted file mode 100644
index d9a25bb1d64..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/ElectionServiceUnit.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Cluster;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.TransactionLog.Checkpoint;
-
-namespace EventStore.Core.Tests.Services.ElectionsService {
-	public class ElectionsServiceUnit {
-		private const int LastCommitPosition = -1;
-		private const int WriterCheckpoint = 0;
-		private const int ChaserCheckpoint = 0;
-		private const int ProposalCheckpoint = -1;
-		private static readonly DateTime InitialDate = new DateTime(2012, 6, 1);
-
-		public ClusterInfo ClusterInfo { get; private set; }
-
-		public EndPoint OwnEndPoint {
-			get { return InitialClusterSettings.Self.NodeInfo.HttpEndPoint; }
-		}
-
-		protected Core.Services.ElectionsService ElectionsService;
-
-		public readonly FakePublisher Publisher;
-		public readonly List<Message> InputMessages;
-
-		private readonly SynchronousScheduler _bus;
-
-		protected readonly ClusterSettings InitialClusterSettings;
-		protected readonly ClusterInfo InitialClusterInfo;
-
-		public ElectionsServiceUnit(ClusterSettings clusterSettings) {
-			Publisher = new FakePublisher();
-
-			_bus = new(GetType().Name);
-			var memberInfo = MemberInfo.Initial(clusterSettings.Self.NodeInfo.InstanceId, InitialDate,
-				VNodeState.Unknown, true,
-				clusterSettings.Self.NodeInfo.InternalTcp,
-				clusterSettings.Self.NodeInfo.InternalSecureTcp,
-				clusterSettings.Self.NodeInfo.ExternalTcp,
-				clusterSettings.Self.NodeInfo.ExternalSecureTcp,
-				clusterSettings.Self.NodeInfo.HttpEndPoint, null, 0, 0,
-				clusterSettings.Self.NodePriority,
-				clusterSettings.Self.ReadOnlyReplica);
-			ElectionsService = new Core.Services.ElectionsService(Publisher,
-				memberInfo,
-				clusterSettings.ClusterNodesCount,
-				new InMemoryCheckpoint(WriterCheckpoint),
-				new InMemoryCheckpoint(ChaserCheckpoint),
-				new InMemoryCheckpoint(ProposalCheckpoint),
-				new FakeEpochManager(),
-				() => -1, 0, new FakeTimeProvider(),
-				TimeSpan.FromMilliseconds(1_000));
-			ElectionsService.SubscribeMessages(_bus);
-
-			InputMessages = new List<Message>();
-
-			InitialClusterSettings = clusterSettings;
-			InitialClusterInfo = BuildClusterInfo(clusterSettings);
-			ClusterInfo = new ClusterInfo(InitialClusterInfo.Members);
-		}
-
-		private ClusterInfo BuildClusterInfo(ClusterSettings clusterSettings) {
-			var members =
-				(new[] {
-					MemberInfo.ForManager(Guid.Empty, InitialDate, true, clusterSettings.ClusterManager)
-				})
-				.Union(new[] {
-					MemberInfo.ForVNode(clusterSettings.Self.NodeInfo.InstanceId,
-						InitialDate,
-						VNodeState.Unknown,
-						true,
-						clusterSettings.Self.NodeInfo.InternalTcp,
-						clusterSettings.Self.NodeInfo.InternalSecureTcp,
-						clusterSettings.Self.NodeInfo.ExternalTcp,
-						clusterSettings.Self.NodeInfo.ExternalSecureTcp,
-						clusterSettings.Self.NodeInfo.HttpEndPoint, null, 0, 0,
-						LastCommitPosition, WriterCheckpoint, ChaserCheckpoint,
-						-1,
-						-1,
-						Guid.Empty, 0, false)
-				})
-				.Union(clusterSettings.GroupMembers
-					.Select(x => MemberInfo.ForVNode(x.NodeInfo.InstanceId,
-						InitialDate,
-						VNodeState.Unknown,
-						true,
-						x.NodeInfo.InternalTcp,
-						x.NodeInfo.InternalSecureTcp,
-						x.NodeInfo.ExternalTcp,
-						x.NodeInfo.ExternalSecureTcp,
-						x.NodeInfo.HttpEndPoint, null, 0, 0,
-						LastCommitPosition, WriterCheckpoint, ChaserCheckpoint,
-						-1,
-						-1,
-						Guid.Empty, 0, false)));
-
-			var ordered = members.OrderBy(x =>
-				string.Format("{0}:{1}", x.HttpEndPoint.ToString(), x.HttpEndPoint.GetPort()));
-
-			return new ClusterInfo(ordered.ToArray());
-		}
-
-		public void Publish(Message message) {
-			InputMessages.Add(message);
-			_bus.Publish(message);
-		}
-
-		public void Publish(IEnumerable<Message> messages) {
-			foreach (var message in messages) {
-				Publish(message);
-			}
-		}
-
-		public T[] ClearMessageFromQueue<T>() {
-			return ClearMessageFromQueue(x => (x is T)).Cast<T>().ToArray();
-		}
-
-		public Message[] ClearMessageFromQueue(Func<Message, bool> predicate) {
-			var removedList = new List<Message>();
-			var removedCount = 0;
-			var index = 0;
-			foreach (var message in Publisher.Messages.ToList()) {
-				if (predicate(message)) {
-					removedList.Add(message);
-					Publisher.Messages.RemoveAt(index - removedCount);
-
-					removedCount += 1;
-				}
-
-				index += 1;
-			}
-
-			return removedList.ToArray();
-		}
-
-		public void RepublishFromPublisher(bool skipScheduledMessages = false) {
-			var messages = new List<Message>();
-			messages.AddRange(Publisher.Messages);
-			Publisher.Messages.Clear();
-
-			messages.Where(x => !(x is TimerMessage.Schedule)).ToList()
-				.ForEach(x => {
-					messages.Remove(x);
-					Publish(x);
-				});
-
-			if (skipScheduledMessages == false) {
-				messages.OfType<TimerMessage.Schedule>().ToList()
-					.ForEach(x => {
-						messages.Remove(x);
-						x.Reply();
-					});
-			}
-		}
-
-		public bool IsCurrent(IPEndPoint endPoint) {
-			return InitialClusterSettings.Self.NodeInfo.Is(endPoint);
-		}
-
-		public MemberInfo GetNodeAt(int index) {
-			return InitialClusterInfo.Members.Where(x => x.State != VNodeState.Manager).ElementAt(index);
-		}
-
-		public IEnumerable<MemberInfo> ListMembers(Func<MemberInfo, bool> predicate = null) {
-			predicate = predicate ?? (x => true);
-			return ClusterInfo.Members.Where(predicate).Select(x =>
-				x.State == VNodeState.Manager
-					? MemberInfo.ForManager(x.InstanceId, x.TimeStamp, x.IsAlive,
-						x.HttpEndPoint)
-					: MemberInfo.ForVNode(x.InstanceId, x.TimeStamp, x.State, x.IsAlive,
-						x.InternalTcpEndPoint, x.InternalSecureTcpEndPoint,
-						x.ExternalTcpEndPoint, x.ExternalSecureTcpEndPoint,
-						x.HttpEndPoint, null, 0, 0,
-						x.LastCommitPosition, x.WriterCheckpoint, x.ChaserCheckpoint,
-						x.EpochPosition, x.EpochNumber, x.EpochId, x.NodePriority, x.IsReadOnlyReplica));
-		}
-
-		public IEnumerable<MemberInfo> ListAliveMembers(Func<MemberInfo, bool> predicate = null) {
-			return ListMembers(predicate).Where(x => x.IsAlive);
-		}
-
-		public void UpdateClusterMemberInfo(int nodeIndex,
-			VNodeState? role = null,
-			bool? isAlive = null,
-			long? writerCheckpoint = null,
-			long? chaserCheckpoint = null) {
-			ClusterInfo.Members[nodeIndex] = ClusterInfo.Members[nodeIndex].Updated(
-				DateTime.UtcNow,
-				state: role,
-				isAlive: isAlive,
-				writerCheckpoint: writerCheckpoint,
-				chaserCheckpoint: chaserCheckpoint);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/ElectionsServiceTests.cs b/src/EventStore.Core.Tests/Services/ElectionsService/ElectionsServiceTests.cs
deleted file mode 100644
index bfc7b9b4ee1..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/ElectionsServiceTests.cs
+++ /dev/null
@@ -1,1505 +0,0 @@
-using System;
-using System.Linq;
-using System.Net;
-using EventStore.Core.Bus;
-using EventStore.Core.Cluster;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.TransactionLog.Checkpoint;
-using FluentAssertions;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.ElectionsService {
-	public abstract class ElectionsFixture {
-		protected readonly VNodeInfo _node;
-		protected readonly VNodeInfo _nodeTwo;
-		protected readonly VNodeInfo _nodeThree;
-		protected FakeTimeProvider _timeProvider;
-		protected Core.Services.ElectionsService _sut;
-		private ISubscriber _bus;
-		protected FakePublisher _publisher;
-		protected Guid _epochId;
-		protected TimeSpan LeaderElectionProgressTimeout = TimeSpan.FromMilliseconds(1_000);
-
-		protected static Func<int, VNodeInfo> NodeFactory = (id) => new VNodeInfo(
-			Guid.Parse($"00000000-0000-0000-0000-00000000000{id}"), id,
-			new IPEndPoint(IPAddress.Loopback, id),
-			new IPEndPoint(IPAddress.Loopback, id),
-			new IPEndPoint(IPAddress.Loopback, id),
-			new IPEndPoint(IPAddress.Loopback, id),
-			new IPEndPoint(IPAddress.Loopback, id), false);
-
-		protected static readonly Func<VNodeInfo, DateTime, VNodeState, bool, int, Guid, int, MemberInfo> MemberInfoFromVNode =
-			(nodeInfo, timestamp, state, isAlive, epochNumber, epochId, priority) => MemberInfo.ForVNode(
-				nodeInfo.InstanceId, timestamp, state, isAlive,
-				nodeInfo.InternalTcp,
-				nodeInfo.InternalSecureTcp, nodeInfo.ExternalTcp, nodeInfo.ExternalSecureTcp,
-				nodeInfo.HttpEndPoint, null, 0, 0,
-				0, 0, 0, 0, epochNumber, epochId, priority,
-				nodeInfo.IsReadOnlyReplica);
-
-		protected ElectionsFixture(VNodeInfo node, VNodeInfo nodeTwo, VNodeInfo nodeThree) {
-			_timeProvider = new FakeTimeProvider();
-			_publisher = new FakePublisher();
-			_bus = new InMemoryBus("Test");
-			_epochId = Guid.NewGuid();
-
-			_node = node;
-			_nodeTwo = nodeTwo;
-			_nodeThree = nodeThree;
-			_sut = new Core.Services.ElectionsService(_publisher,
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0), 3,
-				new InMemoryCheckpoint(0),
-				new InMemoryCheckpoint(0),
-				new InMemoryCheckpoint(-1),
-				new FakeEpochManager(), () => 0L, 0, _timeProvider,
-				LeaderElectionProgressTimeout);
-			_sut.SubscribeMessages(_bus);
-		}
-	}
-
-	public class when_starting_elections : ElectionsFixture {
-		public when_starting_elections()
-			: base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_send_view_change_to_other_members() {
-			_sut.Handle(new ElectionMessage.StartElections());
-
-			var expected = new Message[] {
-				new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint,
-					new ElectionMessage.ViewChange(_node.InstanceId, _node.HttpEndPoint, 0),
-					_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
-				new GrpcMessage.SendOverGrpc(_nodeThree.HttpEndPoint,
-					new ElectionMessage.ViewChange(_node.InstanceId, _node.HttpEndPoint, 0),
-					_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
-				TimerMessage.Schedule.Create(
-					LeaderElectionProgressTimeout,
-					_publisher,
-					new ElectionMessage.ElectionsTimedOut(0)),
-			};
-
-			_publisher.Messages.Should().BeEquivalentTo(expected);
-		}
-	}
-
-	public class when_system_init : ElectionsFixture {
-		public when_system_init()
-			: base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new SystemMessage.SystemInit());
-		}
-
-		[Test]
-		public void should_start_view_change_proof_timer() {
-			var expected = new Message[] {
-				TimerMessage.Schedule.Create(
-					Core.Services.ElectionsService.SendViewChangeProofInterval,
-					_publisher,
-					new ElectionMessage.SendViewChangeProof()),
-			};
-			_publisher.Messages.Should().BeEquivalentTo(expected);
-		}
-	}
-
-	public class when_starting_elections_after_elections_have_started : ElectionsFixture {
-		public when_starting_elections_after_elections_have_started()
-			: base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_starting_elections() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_publisher.Messages.Clear();
-			_sut.Handle(new ElectionMessage.StartElections());
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_node_is_shutting_down_and_starting_elections : ElectionsFixture {
-		public when_node_is_shutting_down_and_starting_elections()
-			: base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_starting_elections() {
-			_sut.Handle(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), false, false));
-			_sut.Handle(new ElectionMessage.StartElections());
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_node_is_shutting_down_and_elections_timed_out : ElectionsFixture {
-		public when_node_is_shutting_down_and_elections_timed_out() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_elections_timed_out() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_publisher.Messages.Clear();
-			_sut.Handle(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), false, false));
-			_sut.Handle(new ElectionMessage.ElectionsTimedOut(0));
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_elections_timeout_for_a_different_view_than_last_attempted_view : ElectionsFixture {
-		public when_elections_timeout_for_a_different_view_than_last_attempted_view() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_elections_timed_out() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_publisher.Messages.Clear();
-			_sut.Handle(new ElectionMessage.ElectionsTimedOut(1));
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_elections_timeout : ElectionsFixture {
-		public when_elections_timeout() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_send_new_view_change_to_other_members() {
-			var view = 0;
-			var newView = view + 1;
-			_sut.Handle(new ElectionMessage.StartElections());
-			_publisher.Messages.Clear();
-			_sut.Handle(new ElectionMessage.ElectionsTimedOut(view));
-
-			var expected = new Message[] {
-				new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint,
-					new ElectionMessage.ViewChange(_node.InstanceId, _node.HttpEndPoint, newView),
-					_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
-				new GrpcMessage.SendOverGrpc(_nodeThree.HttpEndPoint,
-					new ElectionMessage.ViewChange(_node.InstanceId, _node.HttpEndPoint, newView),
-					_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
-				TimerMessage.Schedule.Create(
-					LeaderElectionProgressTimeout,
-					_publisher,
-					new ElectionMessage.ElectionsTimedOut(1)),
-			};
-			_publisher.Messages.Should().BeEquivalentTo(expected);
-		}
-	}
-
-	public class when_node_is_shutting_down_and_view_change_proof_is_triggered : ElectionsFixture {
-		public when_node_is_shutting_down_and_view_change_proof_is_triggered() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_view_change_proof() {
-			_sut.Handle(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), false, false));
-			_sut.Handle(new ElectionMessage.SendViewChangeProof());
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_view_change_proof_is_triggered_and_the_first_election_has_not_completed : ElectionsFixture {
-		public when_view_change_proof_is_triggered_and_the_first_election_has_not_completed() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_schedule_another_view_change_proof() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_publisher.Messages.Clear();
-			_sut.Handle(new ElectionMessage.SendViewChangeProof());
-
-			var expected = new Message[] {
-				TimerMessage.Schedule.Create(
-					Core.Services.ElectionsService.SendViewChangeProofInterval,
-					_publisher,
-					new ElectionMessage.SendViewChangeProof()),
-			};
-			_publisher.Messages.Should().BeEquivalentTo(expected);
-		}
-	}
-
-	public class when_view_change_proof_is_triggered_and_the_first_election_has_completed : ElectionsFixture {
-		public when_view_change_proof_is_triggered_and_the_first_election_has_completed() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_send_view_change_proof_to_other_members() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0, 0,
-				_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
-			var proposalHttpMessage = _publisher.Messages.OfType<GrpcMessage.SendOverGrpc>()
-				.FirstOrDefault(x => x.Message is ElectionMessage.Proposal);
-			var proposalMessage = (ElectionMessage.Proposal)proposalHttpMessage.Message;
-			_publisher.Messages.Clear();
-			_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-				proposalMessage.LeaderId, proposalMessage.LeaderHttpEndPoint, 0));
-			_publisher.Messages.Clear();
-			_sut.Handle(new ElectionMessage.SendViewChangeProof());
-
-			var expected = new Message[] {
-				new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint,
-					new ElectionMessage.ViewChangeProof(_node.InstanceId, _node.HttpEndPoint, 0),
-					_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
-				new GrpcMessage.SendOverGrpc(_nodeThree.HttpEndPoint,
-					new ElectionMessage.ViewChangeProof(_node.InstanceId, _node.HttpEndPoint, 0),
-					_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
-				TimerMessage.Schedule.Create(
-					Core.Services.ElectionsService.SendViewChangeProofInterval,
-					_publisher,
-					new ElectionMessage.SendViewChangeProof()),
-			};
-			_publisher.Messages.Should().BeEquivalentTo(expected);
-		}
-	}
-
-	public class when_receiving_view_change_and_shutting_down : ElectionsFixture {
-		public when_receiving_view_change_and_shutting_down() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_the_view_change() {
-			_publisher.Messages.Clear();
-
-			_sut.Handle(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), false, false));
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, -2));
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_receiving_view_change_and_idle : ElectionsFixture {
-		public when_receiving_view_change_and_idle() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_the_view_change() {
-			_publisher.Messages.Clear();
-
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, -2));
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_receiving_view_change_for_an_earlier_view_than_installed : ElectionsFixture {
-		public when_receiving_view_change_for_an_earlier_view_than_installed() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_the_view_change() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_publisher.Messages.Clear();
-
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, -2));
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_receiving_a_view_change_for_a_later_view_than_last_attempted_view : ElectionsFixture {
-		public when_receiving_a_view_change_for_a_later_view_than_last_attempted_view() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_send_view_change_to_other_members() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_publisher.Messages.Clear();
-
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 10));
-
-			var expected = new Message[] {
-				new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint,
-					new ElectionMessage.ViewChange(_node.InstanceId, _node.HttpEndPoint, 10),
-					_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
-				new GrpcMessage.SendOverGrpc(_nodeThree.HttpEndPoint,
-					new ElectionMessage.ViewChange(_node.InstanceId, _node.HttpEndPoint, 10),
-					_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
-				TimerMessage.Schedule.Create(
-					LeaderElectionProgressTimeout,
-					_publisher,
-					new ElectionMessage.ElectionsTimedOut(10)),
-			};
-
-			_publisher.Messages.Should().BeEquivalentTo(expected);
-		}
-	}
-
-	public class when_receiving_view_change_from_majority_and_acceptor_of_the_current_view : ElectionsFixture {
-		public when_receiving_view_change_from_majority_and_acceptor_of_the_current_view() :
-			base(NodeFactory(1), NodeFactory(2), NodeFactory(3)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_not_initiate_prepare_phase() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_publisher.Messages.Clear();
-
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_receiving_view_change_from_majority : ElectionsFixture {
-		public when_receiving_view_change_from_majority() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_send_prepares_to_other_members() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_publisher.Messages.Clear();
-
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-
-			var expected = new Message[] {
-				new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint,
-					new ElectionMessage.Prepare(_node.InstanceId, _node.HttpEndPoint, 0),
-					_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
-				new GrpcMessage.SendOverGrpc(_nodeThree.HttpEndPoint,
-					new ElectionMessage.Prepare(_node.InstanceId, _node.HttpEndPoint, 0),
-					_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout))
-			};
-			_publisher.Messages.Should().BeEquivalentTo(expected);
-		}
-	}
-
-	public class when_receiving_a_prepare_when_node_is_shutting_down : ElectionsFixture {
-		public when_receiving_a_prepare_when_node_is_shutting_down() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_the_prepare() {
-			_sut.Handle(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), false, false));
-			_sut.Handle(new ElectionMessage.Prepare(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_publisher.Messages.Clear();
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_receiving_a_prepare_for_the_same_node : ElectionsFixture {
-		public when_receiving_a_prepare_for_the_same_node() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_the_prepare() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_publisher.Messages.Clear();
-			_sut.Handle(new ElectionMessage.Prepare(_node.InstanceId, _node.HttpEndPoint, 0));
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_receiving_a_prepare_not_for_the_last_attempted_view : ElectionsFixture {
-		public when_receiving_a_prepare_not_for_the_last_attempted_view() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_the_prepare() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_publisher.Messages.Clear();
-			_sut.Handle(new ElectionMessage.Prepare(_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 1));
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_receiving_a_prepare_from_an_unknown_node : ElectionsFixture {
-		public when_receiving_a_prepare_from_an_unknown_node() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_the_prepare() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_publisher.Messages.Clear();
-			_sut.Handle(new ElectionMessage.Prepare(Guid.NewGuid(), new IPEndPoint(IPAddress.Loopback, 1114), 0));
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_receiving_a_prepare : ElectionsFixture {
-		private readonly ClusterInfo _clusterInfo;
-		public when_receiving_a_prepare() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_clusterInfo = new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0));
-			_sut.Handle(new GossipMessage.GossipUpdated(_clusterInfo));
-		}
-
-		[Test]
-		public void should_reply_with_prepare_ok() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_publisher.Messages.Clear();
-			_sut.Handle(new ElectionMessage.Prepare(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-
-			var expected = new Message[] {
-				new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint,
-					new ElectionMessage.PrepareOk(0,
-						_node.InstanceId, _node.HttpEndPoint, -1, -1, Guid.Empty, Guid.Empty, 0, 0, 0, 0, _clusterInfo),
-					_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
-			};
-			_publisher.Messages.Should().BeEquivalentTo(expected);
-		}
-	}
-
-	public class when_receiving_prepare_ok_and_node_is_shutting_down : ElectionsFixture {
-		public when_receiving_prepare_ok_and_node_is_shutting_down() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_prepare_ok() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_publisher.Messages.Clear();
-			_sut.Handle(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), false, false));
-
-			_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0, 0,
-				_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_receiving_prepare_ok_and_elections_have_not_started : ElectionsFixture {
-		public when_receiving_prepare_ok_and_elections_have_not_started() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_prepare_ok() {
-			_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0, 0,
-				_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_receiving_prepare_ok_for_not_the_current_attempted_view : ElectionsFixture {
-		public when_receiving_prepare_ok_for_not_the_current_attempted_view() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_prepare_ok() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_publisher.Messages.Clear();
-			_sut.Handle(new ElectionMessage.PrepareOk(-1, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0, 0,
-				_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_receiving_a_duplicate_prepare_ok : ElectionsFixture {
-		public when_receiving_a_duplicate_prepare_ok() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_prepare_ok() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_publisher.Messages.Clear();
-
-			_sut.Handle(new ElectionMessage.PrepareOk(0, _node.InstanceId, _node.HttpEndPoint, 0, 0,
-				_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_receiving_majority_prepare_ok : ElectionsFixture {
-		public when_receiving_majority_prepare_ok() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_send_proposal_to_other_members() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_publisher.Messages.Clear();
-
-			_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0, 0,
-				_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
-
-			var proposalHttpMessage = _publisher.Messages.OfType<GrpcMessage.SendOverGrpc>()
-				.FirstOrDefault(x => x.Message is ElectionMessage.Proposal);
-			var proposalMessage = (ElectionMessage.Proposal)proposalHttpMessage.Message;
-
-			var expected = new Message[] {
-				new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint,
-					new ElectionMessage.Proposal(_node.InstanceId, _node.HttpEndPoint,
-						proposalMessage.LeaderId,
-						proposalMessage.LeaderHttpEndPoint, 0, 0, 0, _epochId, Guid.Empty, 0, 0, 0, 0),
-					_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
-				new GrpcMessage.SendOverGrpc(_nodeThree.HttpEndPoint,
-					new ElectionMessage.Proposal(_node.InstanceId, _node.HttpEndPoint,
-						proposalMessage.LeaderId,
-						proposalMessage.LeaderHttpEndPoint, 0, 0, 0, _epochId, Guid.Empty, 0, 0, 0, 0),
-					_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout))
-			};
-			_publisher.Messages.Should().BeEquivalentTo(expected);
-		}
-	}
-
-	public class when_node_is_shutting_down_and_receive_a_proposal : ElectionsFixture {
-		public when_node_is_shutting_down_and_receive_a_proposal() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_proposal() {
-			_sut.Handle(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), false, false));
-			_sut.Handle(new ElectionMessage.Proposal(_node.InstanceId, _node.HttpEndPoint,
-				_node.InstanceId,
-				_node.HttpEndPoint, 0, 0, 0, _epochId, Guid.Empty, 0, 0, 0, 0));
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_receiving_a_proposal_from_the_same_node : ElectionsFixture {
-		public when_receiving_a_proposal_from_the_same_node() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_proposal() {
-			_sut.Handle(new ElectionMessage.Proposal(_node.InstanceId, _node.HttpEndPoint,
-				_node.InstanceId,
-				_node.HttpEndPoint, 0, 0, 0, _epochId, Guid.Empty, 0, 0, 0, 0));
-
-			Assert.IsEmpty(_publisher.Messages,
-				"Nodes do not send proposals to themselves, they accept their own proposal implicitly.");
-		}
-	}
-
-	public class when_receiving_a_proposal_as_the_acceptor_of_the_current_view : ElectionsFixture {
-		public when_receiving_a_proposal_as_the_acceptor_of_the_current_view() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_proposal() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0, 0,
-				_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
-			_publisher.Messages.Clear();
-			_sut.Handle(new ElectionMessage.Proposal(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-				_node.InstanceId,
-				_node.HttpEndPoint, 0, 0, 0, _epochId, Guid.Empty, 0, 0, 0, 0));
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_receiving_a_proposal_not_for_the_current_installed_view : ElectionsFixture {
-		public when_receiving_a_proposal_not_for_the_current_installed_view() :
-			base(NodeFactory(1), NodeFactory(2), NodeFactory(3)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_proposal() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_sut.Handle(new ElectionMessage.Prepare(_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
-			_publisher.Messages.Clear();
-			_sut.Handle(new ElectionMessage.Proposal(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-				_node.InstanceId,
-				_node.HttpEndPoint, 1, 0, 0, _epochId, Guid.Empty, 0, 0, 0, 0));
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_receiving_a_proposal_from_an_unknown_node : ElectionsFixture {
-		public when_receiving_a_proposal_from_an_unknown_node() :
-			base(NodeFactory(1), NodeFactory(2), NodeFactory(3)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_proposal() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_sut.Handle(new ElectionMessage.Prepare(_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
-			_publisher.Messages.Clear();
-			_sut.Handle(new ElectionMessage.Proposal(Guid.NewGuid(), new IPEndPoint(IPAddress.Loopback, 4),
-				_node.InstanceId,
-				_node.HttpEndPoint, 0, 0, 0, _epochId, Guid.Empty, 0, 0, 0, 0));
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_receiving_a_proposal_for_an_unknown_node : ElectionsFixture {
-		public when_receiving_a_proposal_for_an_unknown_node() :
-			base(NodeFactory(1), NodeFactory(2), NodeFactory(3)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_proposal() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_sut.Handle(new ElectionMessage.Prepare(_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
-			_publisher.Messages.Clear();
-			_sut.Handle(new ElectionMessage.Proposal(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-				Guid.NewGuid(),
-				new IPEndPoint(IPAddress.Loopback, 4), 0, 0, 0, _epochId, Guid.Empty, 0, 0, 0, 0));
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_receiving_a_proposal_as_acceptor : ElectionsFixture {
-		public when_receiving_a_proposal_as_acceptor() :
-			base(NodeFactory(1), NodeFactory(2), NodeFactory(3)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_send_an_acceptance_to_other_members() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_sut.Handle(new ElectionMessage.Prepare(_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
-			_publisher.Messages.Clear();
-			_sut.Handle(new ElectionMessage.Proposal(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-				_nodeThree.InstanceId,
-				_nodeThree.HttpEndPoint, 0, 0, 0, _epochId, Guid.Empty, 0, 0, 0, 0));
-
-			var expected = new Message[] {
-				new ElectionMessage.ElectionsDone(0,0,
-					MemberInfo.ForVNode(
-						_nodeThree.InstanceId, _timeProvider.UtcNow, VNodeState.Unknown, true,
-						_nodeThree.InternalTcp,
-						_nodeThree.InternalSecureTcp, _nodeThree.ExternalTcp, _nodeThree.ExternalSecureTcp,
-						_nodeThree.HttpEndPoint, null, 0, 0, 0, 0, 0, 0, 0, _epochId, 0,
-						_nodeThree.IsReadOnlyReplica)),
-				new GrpcMessage.SendOverGrpc(_nodeThree.HttpEndPoint,
-					new ElectionMessage.Accept(_node.InstanceId, _node.HttpEndPoint,
-						_nodeThree.InstanceId,
-						_nodeThree.HttpEndPoint, 0),
-					_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
-				new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint,
-					new ElectionMessage.Accept(_node.InstanceId, _node.HttpEndPoint,
-						_nodeThree.InstanceId,
-						_nodeThree.HttpEndPoint, 0),
-					_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
-			};
-			_publisher.Messages.Should().BeEquivalentTo(expected);
-		}
-	}
-
-	public class when_node_is_shutting_down_and_receiving_accept : ElectionsFixture {
-		public when_node_is_shutting_down_and_receiving_accept() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_accept() {
-			_sut.Handle(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), false, false));
-			_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-				_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_receiving_accept_for_not_the_current_installed_view : ElectionsFixture {
-		public when_receiving_accept_for_not_the_current_installed_view() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_accept() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0, 0,
-				_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
-			_publisher.Messages.Clear();
-
-			_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-				_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 1));
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_receiving_accept_without_a_leader_having_been_proposed : ElectionsFixture {
-		public when_receiving_accept_without_a_leader_having_been_proposed() :
-			base(NodeFactory(1), NodeFactory(2), NodeFactory(3)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_accept() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_sut.Handle(new ElectionMessage.Prepare(_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
-			_publisher.Messages.Clear();
-
-			_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-				_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_receiving_accept_and_leader_proposal_does_not_match_accept_leader : ElectionsFixture {
-		public when_receiving_accept_and_leader_proposal_does_not_match_accept_leader() :
-			base(NodeFactory(1), NodeFactory(2), NodeFactory(3)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_accept() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_sut.Handle(new ElectionMessage.Prepare(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_sut.Handle(new ElectionMessage.Proposal(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-				Guid.NewGuid(),
-				new IPEndPoint(IPAddress.Loopback, 4), 0, 0, 0, _epochId, Guid.Empty, 0, 0, 0, 0));
-			_publisher.Messages.Clear();
-
-			_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-				_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_receiving_majority_accept : ElectionsFixture {
-		public when_receiving_majority_accept() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_complete_elections() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0, 0,
-				_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
-			var proposalHttpMessage = _publisher.Messages.OfType<GrpcMessage.SendOverGrpc>()
-				.FirstOrDefault(x => x.Message is ElectionMessage.Proposal);
-			var proposalMessage = (ElectionMessage.Proposal)proposalHttpMessage.Message;
-			_publisher.Messages.Clear();
-
-			_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-				proposalMessage.LeaderId, proposalMessage.LeaderHttpEndPoint, 0));
-
-			var expected = new Message[] {
-				new ElectionMessage.ElectionsDone(0,0,
-					MemberInfo.ForVNode(
-						_nodeTwo.InstanceId, _timeProvider.UtcNow, VNodeState.Unknown, true,
-						_nodeTwo.InternalTcp,
-						_nodeTwo.InternalSecureTcp, _nodeTwo.ExternalTcp, _nodeTwo.ExternalSecureTcp,
-						_nodeTwo.HttpEndPoint, null, 0, 0, 0, 0, 0, 0, 0, _epochId, 0,
-						_nodeTwo.IsReadOnlyReplica)),
-			};
-			_publisher.Messages.Should().BeEquivalentTo(expected);
-		}
-	}
-
-	public class when_elections_timeout_and_not_electing_leader : ElectionsFixture {
-		public when_elections_timeout_and_not_electing_leader() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_timeout() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0, 0,
-				_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
-			var proposalHttpMessage = _publisher.Messages.OfType<GrpcMessage.SendOverGrpc>()
-				.FirstOrDefault(x => x.Message is ElectionMessage.Proposal);
-			var proposalMessage = (ElectionMessage.Proposal)proposalHttpMessage.Message;
-			_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-				proposalMessage.LeaderId, proposalMessage.LeaderHttpEndPoint, 0));
-			_publisher.Messages.Clear();
-			_sut.Handle(new ElectionMessage.ElectionsTimedOut(0));
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_updating_node_priority : ElectionsFixture {
-		public when_updating_node_priority() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_broadcast_node_priority_update() {
-			var nodePriority = 5;
-			_sut.Handle(new ClientMessage.SetNodePriority(nodePriority));
-
-			var expected = new Message[] {
-				new GossipMessage.UpdateNodePriority(nodePriority)
-			};
-			_publisher.Messages.Should().BeEquivalentTo(expected);
-		}
-	}
-
-	public class when_resigning_node_and_node_is_not_the_current_leader : ElectionsFixture {
-		public when_resigning_node_and_node_is_not_the_current_leader() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_ignore_resign_node_message() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0, 0,
-				_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
-			var proposalHttpMessage = _publisher.Messages.OfType<GrpcMessage.SendOverGrpc>()
-				.FirstOrDefault(x => x.Message is ElectionMessage.Proposal);
-			var proposalMessage = (ElectionMessage.Proposal)proposalHttpMessage.Message;
-			_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-				proposalMessage.LeaderId, proposalMessage.LeaderHttpEndPoint, 0));
-			_publisher.Messages.Clear();
-			_sut.Handle(new ClientMessage.ResignNode());
-
-			Assert.IsEmpty(_publisher.Messages);
-		}
-	}
-
-	public class when_resigning_node_and_is_the_current_leader : ElectionsFixture {
-		public when_resigning_node_and_is_the_current_leader() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_initiate_leader_resignation_and_inform_other_nodes() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, -1, 0,
-				_epochId, Guid.Empty, -1, -1, -1, -1, new ClusterInfo()));
-			_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-				_node.InstanceId, _node.HttpEndPoint, 0));
-			_publisher.Messages.Clear();
-
-			_sut.Handle(new ClientMessage.ResignNode());
-
-			var expected = new Message[] {
-				new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint,
-					new ElectionMessage.LeaderIsResigning(_node.InstanceId, _node.HttpEndPoint),
-					_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
-				new GrpcMessage.SendOverGrpc(_nodeThree.HttpEndPoint,
-					new ElectionMessage.LeaderIsResigning(_node.InstanceId, _node.HttpEndPoint),
-					_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
-			};
-			_publisher.Messages.Should().BeEquivalentTo(expected);
-		}
-	}
-
-	public class when_receiving_leader_is_resigning : ElectionsFixture {
-		public when_receiving_leader_is_resigning() :
-			base(NodeFactory(1), NodeFactory(2), NodeFactory(3)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_reply_with_leader_is_resigning_ok() {
-			_sut.Handle(new ElectionMessage.LeaderIsResigning(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint));
-
-			var expected = new Message[] {
-				new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint,
-					new ElectionMessage.LeaderIsResigningOk(
-						_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-						_node.InstanceId, _node.HttpEndPoint),
-					_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
-			};
-			_publisher.Messages.Should().BeEquivalentTo(expected);
-		}
-	}
-
-	public class when_resigning_node_and_majority_resigning_ok_received : ElectionsFixture {
-		public when_resigning_node_and_majority_resigning_ok_received() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_initiate_leader_resignation() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, -1, 0,
-				_epochId, Guid.Empty, -1, -1, -1, -1, new ClusterInfo()));
-			_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-				_node.InstanceId, _node.HttpEndPoint, 0));
-			_sut.Handle(new ClientMessage.ResignNode());
-			_publisher.Messages.Clear();
-
-			_sut.Handle(new ElectionMessage.LeaderIsResigningOk(
-				_node.InstanceId,
-				_node.HttpEndPoint,
-				_nodeTwo.InstanceId,
-				_nodeTwo.HttpEndPoint));
-
-			var expected = new Message[] {
-				new SystemMessage.InitiateLeaderResignation(),
-			};
-			_publisher.Messages.Should().BeEquivalentTo(expected);
-		}
-	}
-
-	public class when_electing_a_leader_and_leader_node_resigned : ElectionsFixture {
-		public when_electing_a_leader_and_leader_node_resigned() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void should_attempt_not_to_elect_previously_elected_leader() {
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, -1, 0,
-				_epochId, Guid.Empty, -1, -1, -1, -1, new ClusterInfo()));
-			_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-				_node.InstanceId, _node.HttpEndPoint, 0));
-			_publisher.Messages.Clear();
-
-			_sut.Handle(new ClientMessage.ResignNode());
-			_sut.Handle(new ElectionMessage.LeaderIsResigningOk(
-				_node.InstanceId,
-				_node.HttpEndPoint,
-				_nodeTwo.InstanceId,
-				_nodeTwo.HttpEndPoint));
-			_publisher.Messages.Clear();
-
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 3));
-			_sut.Handle(new ElectionMessage.PrepareOk(3, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0, 0,
-				_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
-			var proposalHttpMessage = _publisher.Messages.OfType<GrpcMessage.SendOverGrpc>()
-				.FirstOrDefault(x => x.Message is ElectionMessage.Proposal);
-			var proposalMessage = (ElectionMessage.Proposal)proposalHttpMessage.Message;
-			_publisher.Messages.Clear();
-			_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-				proposalMessage.LeaderId, proposalMessage.LeaderHttpEndPoint, 3));
-
-			var expected = new Message[] {
-				new ElectionMessage.ElectionsDone(3,1,
-					MemberInfo.ForVNode(
-						_nodeTwo.InstanceId, _timeProvider.UtcNow, VNodeState.Unknown, true,
-						_nodeTwo.InternalTcp,
-						_nodeTwo.InternalSecureTcp, _nodeTwo.ExternalTcp, _nodeTwo.ExternalSecureTcp,
-						_nodeTwo.HttpEndPoint, null, 0, 0, 0, 0, 0, 0, 0, _epochId, 0,
-						_nodeTwo.IsReadOnlyReplica)),
-			};
-			_publisher.Messages.Should().BeEquivalentTo(expected);
-		}
-	}
-
-	public class when_a_leader_is_found_during_leader_discovery : ElectionsFixture {
-		public when_a_leader_is_found_during_leader_discovery() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-			var info = MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0);
-			_sut.Handle(new LeaderDiscoveryMessage.LeaderFound(info));
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				info,
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-		}
-
-		[Test]
-		public void view_change_should_trigger_new_elections() {
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 3));
-			_publisher.Messages.Clear();
-
-			_sut.Handle(new ElectionMessage.PrepareOk(3, _nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0, 0,
-				_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
-
-			Assert.NotNull(_publisher.Messages.OfType<GrpcMessage.SendOverGrpc>().FirstOrDefault());
-		}
-	}
-
-	public class when_the_elections_service_is_initialized_as_read_only_replica {
-		[Test]
-		public void should_throw_argument_exception() {
-			var endpoint = new IPEndPoint(IPAddress.Loopback, 1234);
-			var nodeInfo = MemberInfo.Initial(Guid.NewGuid(),
-				DateTime.UtcNow, VNodeState.ReadOnlyLeaderless, true,
-				endpoint,
-				endpoint,
-				endpoint,
-				endpoint,
-				endpoint, null, 0, 0,
-				0,
-				true);
-
-			Assert.Throws<ArgumentException>(() => {
-				new Core.Services.ElectionsService(new FakePublisher(), nodeInfo, 3,
-					new InMemoryCheckpoint(0),
-					new InMemoryCheckpoint(0),
-					new InMemoryCheckpoint(-1),
-					new FakeEpochManager(), () => 0L, 0, new FakeTimeProvider(),
-					TimeSpan.FromMilliseconds(1_000));
-			});
-		}
-	}
-	public class when_electing_a_leader_and_prepare_ok_is_received_from_previous_leader_in_epoch_record : ElectionsFixture {
-		public when_electing_a_leader_and_prepare_ok_is_received_from_previous_leader_in_epoch_record() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
-
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
-
-			_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeThree.InstanceId, _nodeThree.HttpEndPoint, 10, 0,
-				_epochId, _nodeThree.InstanceId, 0, 0, 0, 0, new ClusterInfo()));
-
-			_publisher.Messages.Clear();
-			_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-				_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
-		}
-
-		[Test]
-		public void previous_leader_should_be_elected() {
-			var expected = new Message[] {
-				new ElectionMessage.ElectionsDone(0,0,
-					MemberInfo.ForVNode(
-						_nodeThree.InstanceId, _timeProvider.UtcNow, VNodeState.Unknown, true,
-						_nodeThree.InternalTcp,
-						_nodeThree.InternalSecureTcp, _nodeThree.ExternalTcp, _nodeThree.ExternalSecureTcp,
-						_nodeThree.HttpEndPoint, null, 0, 0,
-						0, 0, 0, 0, 0, _epochId, 0,
-						_nodeThree.IsReadOnlyReplica)),
-			};
-
-			_publisher.Messages.Should().BeEquivalentTo(expected);
-		}
-	}
-
-	public class when_electing_a_leader_and_prepare_ok_is_not_received_from_previous_leader_in_epoch_record : ElectionsFixture {
-		public when_electing_a_leader_and_prepare_ok_is_not_received_from_previous_leader_in_epoch_record() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-
-			//we mark the 3rd node as dead in _node's gossip so that it does not affect the results of the elections
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, false, 0, _epochId, 0))));
-
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
-		}
-
-		public class
-			and_previous_leader_is_present_and_alive_in_cluster_info_in_received_prepare_ok :
-				when_electing_a_leader_and_prepare_ok_is_not_received_from_previous_leader_in_epoch_record {
-
-			public and_previous_leader_is_present_and_alive_in_cluster_info_in_received_prepare_ok() {
-				_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 10, 0,
-					_epochId, _nodeThree.InstanceId, 0, 0, 0, 0,
-					new ClusterInfo(
-						MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0)
-					)));
-
-				_publisher.Messages.Clear();
-			}
-
-			[Test]
-			public void previous_leader_should_be_proposed() {
-				Assert.AreEqual(_nodeThree.InstanceId, _sut.LeaderProposalId);
-			}
-		}
-
-		public class
-			and_previous_leader_is_present_and_alive_but_has_lower_priority_in_cluster_info_in_received_prepare_ok :
-				when_electing_a_leader_and_prepare_ok_is_not_received_from_previous_leader_in_epoch_record {
-
-			public and_previous_leader_is_present_and_alive_but_has_lower_priority_in_cluster_info_in_received_prepare_ok() {
-				_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 10, 0,
-					_epochId, _nodeThree.InstanceId, 0, 0, 0, 0,
-					new ClusterInfo(
-						MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, -1)
-					)));
-
-				_publisher.Messages.Clear();
-			}
-
-			[Test]
-			public void previous_leader_should_be_proposed() {
-				Assert.AreEqual(_nodeThree.InstanceId, _sut.LeaderProposalId);
-			}
-		}
-
-		public class
-			and_previous_leader_is_present_and_alive_in_cluster_info_in_received_prepare_ok_but_is_resigning :
-				when_electing_a_leader_and_prepare_ok_is_not_received_from_previous_leader_in_epoch_record {
-
-			public and_previous_leader_is_present_and_alive_in_cluster_info_in_received_prepare_ok_but_is_resigning() {
-				_sut.Handle(new ElectionMessage.LeaderIsResigning(_nodeThree.InstanceId, _nodeThree.HttpEndPoint));
-
-				_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 10, 0,
-					_epochId, _nodeThree.InstanceId, 0, 0, 0, 0,
-					new ClusterInfo(
-						MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0)
-					)));
-
-				_publisher.Messages.Clear();
-				_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-					_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			}
-
-			[Test]
-			public void previous_leader_should_not_be_elected() {
-				var expected = new Message[] {
-					new ElectionMessage.ElectionsDone(0,0,
-						MemberInfo.ForVNode(
-							_nodeTwo.InstanceId, _timeProvider.UtcNow, VNodeState.Unknown, true,
-							_nodeTwo.InternalTcp,
-							_nodeTwo.InternalSecureTcp, _nodeTwo.ExternalTcp, _nodeTwo.ExternalSecureTcp,
-							_nodeTwo.HttpEndPoint, null, 0, 0,
-							0, 0, 0, 0, 0, _epochId, 0,
-							_nodeTwo.IsReadOnlyReplica)),
-				};
-
-				_publisher.Messages.Should().BeEquivalentTo(expected);
-			}
-		}
-
-		public class
-			and_previous_leader_is_present_and_alive_in_cluster_info_in_received_prepare_ok_and_epoch_number_matches_but_not_epoch_id :
-				when_electing_a_leader_and_prepare_ok_is_not_received_from_previous_leader_in_epoch_record {
-
-			public and_previous_leader_is_present_and_alive_in_cluster_info_in_received_prepare_ok_and_epoch_number_matches_but_not_epoch_id() {
-				_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 10, 0,
-					_epochId, _nodeThree.InstanceId, 0, 0, 0, 0,
-					new ClusterInfo(
-						MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 10, Guid.NewGuid(), 0)
-					)));
-
-				_publisher.Messages.Clear();
-				_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-					_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			}
-
-			[Test]
-			public void previous_leader_should_not_be_elected() {
-				var expected = new Message[] {
-					new ElectionMessage.ElectionsDone(0,0,
-						MemberInfo.ForVNode(
-							_nodeTwo.InstanceId, _timeProvider.UtcNow, VNodeState.Unknown, true,
-							_nodeTwo.InternalTcp,
-							_nodeTwo.InternalSecureTcp, _nodeTwo.ExternalTcp, _nodeTwo.ExternalSecureTcp,
-							_nodeTwo.HttpEndPoint, null, 0, 0,
-							0, 0, 0, 0, 0, _epochId, 0,
-							_nodeTwo.IsReadOnlyReplica)),
-				};
-
-				_publisher.Messages.Should().BeEquivalentTo(expected);
-			}
-		}
-
-		public class
-			and_previous_leader_is_present_and_alive_in_cluster_info_in_received_prepare_ok_and_epoch_number_does_not_match :
-				when_electing_a_leader_and_prepare_ok_is_not_received_from_previous_leader_in_epoch_record {
-			private Guid _otherEpochId = Guid.NewGuid();
-
-			public and_previous_leader_is_present_and_alive_in_cluster_info_in_received_prepare_ok_and_epoch_number_does_not_match() {
-				_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 10, 0,
-					_epochId, _nodeThree.InstanceId, 0, 0, 0, 0,
-					new ClusterInfo(
-						MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 9, _otherEpochId , 0)
-					)));
-
-				_publisher.Messages.Clear();
-			}
-
-			[Test]
-			public void previous_leader_should_be_proposed() {
-				Assert.AreEqual(_nodeThree.InstanceId, _sut.LeaderProposalId);
-			}
-		}
-
-		public class
-			and_previous_leader_is_not_present_in_cluster_info_in_received_prepare_ok :
-				when_electing_a_leader_and_prepare_ok_is_not_received_from_previous_leader_in_epoch_record {
-
-			public and_previous_leader_is_not_present_in_cluster_info_in_received_prepare_ok() {
-				_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 10, 0,
-					_epochId, _nodeThree.InstanceId, 0, 0, 0, 0, new ClusterInfo()));
-
-				_publisher.Messages.Clear();
-				_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-					_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			}
-
-			[Test]
-			public void previous_leader_should_not_be_elected() {
-				var expected = new Message[] {
-					new ElectionMessage.ElectionsDone(0,0,
-						MemberInfo.ForVNode(
-							_nodeTwo.InstanceId, _timeProvider.UtcNow, VNodeState.Unknown, true,
-							_nodeTwo.InternalTcp,
-							_nodeTwo.InternalSecureTcp, _nodeTwo.ExternalTcp, _nodeTwo.ExternalSecureTcp,
-							_nodeTwo.HttpEndPoint, null, 0, 0,
-							0, 0, 0, 0, 0, _epochId, 0,
-							_nodeTwo.IsReadOnlyReplica)),
-				};
-
-				_publisher.Messages.Should().BeEquivalentTo(expected);
-			}
-		}
-
-		public class
-			and_previous_leader_is_present_but_dead_in_cluster_info_in_received_prepare_ok :
-				when_electing_a_leader_and_prepare_ok_is_not_received_from_previous_leader_in_epoch_record {
-
-			public and_previous_leader_is_present_but_dead_in_cluster_info_in_received_prepare_ok() {
-				_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 10, 0,
-					_epochId, _nodeThree.InstanceId, 0, 0, 0, 0,
-					new ClusterInfo(
-						MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, false, 0, _epochId, 0)
-					)));
-
-				_publisher.Messages.Clear();
-				_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-					_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
-			}
-
-			[Test]
-			public void previous_leader_should_not_be_elected() {
-				var expected = new Message[] {
-					new ElectionMessage.ElectionsDone(0,0,
-						MemberInfo.ForVNode(
-							_nodeTwo.InstanceId, _timeProvider.UtcNow, VNodeState.Unknown, true,
-							_nodeTwo.InternalTcp,
-							_nodeTwo.InternalSecureTcp, _nodeTwo.ExternalTcp, _nodeTwo.ExternalSecureTcp,
-							_nodeTwo.HttpEndPoint, null, 0, 0,
-							0, 0, 0, 0, 0, _epochId, 0,
-							_nodeTwo.IsReadOnlyReplica)),
-				};
-
-				_publisher.Messages.Should().BeEquivalentTo(expected);
-			}
-		}
-	}
-
-	public class when_electing_a_leader_and_best_candidate_node_is_dead_in_gossip_info_of_leader_of_elections : ElectionsFixture {
-		public when_electing_a_leader_and_best_candidate_node_is_dead_in_gossip_info_of_leader_of_elections() :
-			base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
-
-			_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
-				MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
-				MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, false, 0, _epochId, 0))));
-
-			_sut.Handle(new ElectionMessage.StartElections());
-			_sut.Handle(new ElectionMessage.ViewChange(_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
-
-			_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeThree.InstanceId, _nodeThree.HttpEndPoint, 10, 0,
-				_epochId, _nodeThree.InstanceId, 0, 0, 0, 0, new ClusterInfo()));
-
-			_publisher.Messages.Clear();
-			_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
-				_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
-		}
-
-		[Test]
-		public void no_leader_should_be_elected() {
-			Assert.AreEqual(0, _publisher.Messages.ToArray().Length);
-		}
-	}
-
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/FakeEpochManager.cs b/src/EventStore.Core.Tests/Services/ElectionsService/FakeEpochManager.cs
deleted file mode 100644
index c8278c4b588..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/FakeEpochManager.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Services.Storage.EpochManager;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.Tests.Services.ElectionsService {
-	internal class FakeEpochManager : IEpochManager {
-
-		public int LastEpochNumber {
-			get {
-				lock (_epochs) {
-					return _epochs.Any() ? _epochs.Last().EpochNumber : -1;
-				}
-			}
-		}
-
-		private readonly List<EpochRecord> _epochs = new List<EpochRecord>();
-		public void Init() {
-		}
-
-		public EpochRecord GetLastEpoch() {
-			lock (_epochs) {
-				return _epochs.LastOrDefault();
-			}
-		}
-
-		public EpochRecord[] GetLastEpochs(int maxCount) {
-			lock (_epochs) {
-				if (maxCount >= _epochs.Count) {
-					return _epochs.ToArray();
-				} else {
-					return _epochs.Skip(_epochs.Count - maxCount).ToArray();
-				}
-			}
-		}
-
-		public EpochRecord GetEpochAfter(int epochNumber, bool throwIfNotFound) {
-			lock (_epochs) {
-				var epoch = _epochs.FirstOrDefault(e => e.EpochNumber == epochNumber);
-				if (epoch != null) {
-					var index = _epochs.IndexOf(epoch);
-					epoch = null;
-					if (index + 1 < _epochs.Count) {
-						epoch = _epochs[index + 1];
-					}
-				}
-
-				if (throwIfNotFound && epoch == null)
-					throw new ArgumentOutOfRangeException(nameof(epochNumber), "Epoch not Found");
-				return epoch;
-			}
-		}
-
-		public bool IsCorrectEpochAt(long epochPosition, int epochNumber, Guid epochId) {
-			lock (_epochs) {
-				var epoch = _epochs.FirstOrDefault(e => e.EpochNumber == epochNumber);
-				if (epoch == null)
-					return false;
-
-				return epoch.EpochPosition == epochPosition &&
-				       epoch.EpochId == epochId;
-			}
-		}
-		
-		public void WriteNewEpoch(int epochNumber) {
-			throw new NotImplementedException();
-		}
-
-		public void CacheEpoch(EpochRecord epoch) {
-			lock (_epochs) {
-				_epochs.Add(epoch);
-			}
-		}
-
-		public bool TryTruncateBefore(long position, out EpochRecord epoch) {
-			throw new NotImplementedException();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/LeaderNode/ElectionsServiceUnitTests.cs b/src/EventStore.Core.Tests/Services/ElectionsService/LeaderNode/ElectionsServiceUnitTests.cs
deleted file mode 100644
index 289d084910a..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/LeaderNode/ElectionsServiceUnitTests.cs
+++ /dev/null
@@ -1,424 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using EventStore.Core.Bus;
-using EventStore.Core.Cluster;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Gossip;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.TransactionLog.Checkpoint;
-using NUnit.Framework;
-using SUT = EventStore.Core.Services.ElectionsService;
-
-namespace EventStore.Core.Tests.Services.ElectionsService {
-	public class ElectionsServiceUnitTests {
-		private Dictionary<IPEndPoint, IPublisher> _nodes;
-		private List<MemberInfo> _members;
-		private FakeTimeProvider _fakeTimeProvider;
-		private FakeScheduler _scheduler;
-
-		[SetUp]
-		public void Setup() {
-			var address = IPAddress.Loopback;
-			var members = new List<MemberInfo>();
-			var seeds = new List<IPEndPoint>();
-			var seedSource = new ReallyNotSafeFakeGossipSeedSource(seeds);
-			_nodes = new Dictionary<IPEndPoint, IPublisher>();
-			for (int i = 0; i < 3; i++) {
-				var inputBus = new SynchronousScheduler($"ELECTIONS-INPUT-BUS-NODE-{i}", watchSlowMsg: false);
-				var outputBus = new SynchronousScheduler($"ELECTIONS-OUTPUT-BUS-NODE-{i}", watchSlowMsg: false);
-				var endPoint = new IPEndPoint(address, 1000 + i);
-				seeds.Add(endPoint);
-				var instanceId = Guid.Parse($"101EFD13-F9CD-49BE-9C6D-E6AF9AF5540{i}");
-				var memberInfo = MemberInfo.ForVNode(instanceId, DateTime.UtcNow, VNodeState.Unknown, true,
-					endPoint, null, endPoint, null, endPoint, null, 0, 0, -1, 0, 0, -1, -1, Guid.Empty, 0, false);
-				members.Add(memberInfo);
-				_fakeTimeProvider = new FakeTimeProvider();
-				_scheduler = new FakeScheduler(new FakeTimer(), _fakeTimeProvider);
-				var timerService = new TimerService(_scheduler);
-
-				var writerCheckpoint = new InMemoryCheckpoint();
-				var readerCheckpoint = new InMemoryCheckpoint();
-				var proposalCheckpoint = new InMemoryCheckpoint(-1);
-				var epochManager = new FakeEpochManager();
-				Func<long> lastCommitPosition = () => -1;
-				var electionsService = new Core.Services.ElectionsService(outputBus,
-					memberInfo,
-					3,
-					writerCheckpoint,
-					readerCheckpoint,
-					proposalCheckpoint,
-					epochManager,
-					() => -1, 0, new FakeTimeProvider(),
-					TimeSpan.FromMilliseconds(1_000));
-				electionsService.SubscribeMessages(inputBus);
-
-				var nodeId = i;
-				outputBus.Subscribe(new AdHocHandler<Message>(
-					m => {
-						switch (m) {
-							case TimerMessage.Schedule sm:
-								TestContext.WriteLine(
-									$"Node {nodeId} : Delay {sm.TriggerAfter} : {sm.ReplyMessage.GetType()}");
-								timerService.Handle(sm);
-								break;
-							default:
-								TestContext.WriteLine($"Node {nodeId} : EP {m.GetType()}");
-								inputBus.Publish(m);
-								break;
-						}
-					}
-				));
-				_nodes.Add(endPoint, inputBus);
-
-				var gossip = new NodeGossipService(outputBus, 3, seedSource, memberInfo, writerCheckpoint, readerCheckpoint,
-					epochManager, lastCommitPosition, 0, TimeSpan.FromMilliseconds(500), TimeSpan.FromDays(1),
-					TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(1800), _fakeTimeProvider);
-				inputBus.Subscribe<SystemMessage.SystemInit>(gossip);
-				inputBus.Subscribe<GossipMessage.RetrieveGossipSeedSources>(gossip);
-				inputBus.Subscribe<GossipMessage.GotGossipSeedSources>(gossip);
-				inputBus.Subscribe<GossipMessage.Gossip>(gossip);
-				inputBus.Subscribe<GossipMessage.GossipReceived>(gossip);
-				inputBus.Subscribe<SystemMessage.StateChangeMessage>(gossip);
-				inputBus.Subscribe<GossipMessage.GossipSendFailed>(gossip);
-				inputBus.Subscribe<GossipMessage.UpdateNodePriority>(gossip);
-				inputBus.Subscribe<SystemMessage.VNodeConnectionEstablished>(gossip);
-				inputBus.Subscribe<SystemMessage.VNodeConnectionLost>(gossip);
-			}
-
-			_members = members;
-		}
-
-		class ReallyNotSafeFakeGossipSeedSource : IGossipSeedSource {
-			private readonly List<IPEndPoint> _ipEndPoints;
-
-			public ReallyNotSafeFakeGossipSeedSource(List<IPEndPoint> ipEndPoints) {
-				_ipEndPoints = ipEndPoints;
-			}
-
-			public IAsyncResult BeginGetHostEndpoints(AsyncCallback requestCallback, object state) {
-				requestCallback(null);
-				return null;
-			}
-
-			public EndPoint[] EndGetHostEndpoints(IAsyncResult asyncResult) {
-				return _ipEndPoints.ToArray();
-			}
-		}
-	}
-
-	public class ChoosingLeaderTests {
-		static IEnumerable<TestCase> CreateCases() {
-			// Tiebreaker: If all else is equal, pick the node with the highest server id
-			yield return new TestCase {
-				ExpectedLeaderCandidateNode = 2,
-				ProposingNode = 0,
-			};
-
-			// If checkpoints are equal, pick the node with the highest priority
-			yield return new TestCase {
-				ExpectedLeaderCandidateNode = 0,
-				NodePriorities = new[] { 3, 2, 1 }
-			};
-
-			// Don't pick the last elected leader if it is resigning
-			yield return new TestCase {
-				ExpectedLeaderCandidateNode = 1,
-				NodePriorities = new[] { 0, 0, 0 },
-				LastElectedLeader = new int?[] { 2, 2, 2 },
-				ResigningLeader = 2
-			};
-
-			// Pick the last elected leader if all else is equal
-			yield return new TestCase {
-				ExpectedLeaderCandidateNode = 0,
-				NodePriorities = new[] { int.MinValue, int.MinValue, int.MinValue },
-				LastElectedLeader = new int?[] { 0, 0, 0 },
-			};
-
-			// Pick the non-resigning node with the highest chaser checkpoint
-			// instead of the resigning leader
-			yield return new TestCase {
-				ExpectedLeaderCandidateNode = 0,
-				LastElectedLeader = new int?[] { 2, 2, 2 },
-				ResigningLeader = 2,
-				ChaserCheckpoints = new long[] { 1, 0, 1 },
-				NodePriorities = new[] { 0, 0, 0 },
-			};
-
-			// Pick the non-resigning node with the highest writer checkpoint
-			// instead of the resigning leader
-			yield return new TestCase {
-				ExpectedLeaderCandidateNode = 1,
-				LastElectedLeader = new int?[] { 2, 2, 2 },
-				ResigningLeader = 2,
-				WriterCheckpoints = new long[] { 0, 1, 1 },
-				NodePriorities = new[] { 0, 0, 0 },
-			};
-
-			// Pick the node with the highest chaser checkpoint
-			// regardless of node priority
-			yield return new TestCase {
-				ExpectedLeaderCandidateNode = 0,
-				LastElectedLeader = new int?[] { 0, 0, 0 },
-				ChaserCheckpoints = new long[] { 1, 0, 0 },
-				NodePriorities = new[] { int.MinValue, 0, 0 },
-			};
-
-			// Pick the node with the highest writer checkpoint
-			// regardless of node priority
-			yield return new TestCase {
-				ExpectedLeaderCandidateNode = 1,
-				LastElectedLeader = new int?[] { 1, 1, 1 },
-				WriterCheckpoints = new long[] { 0, 1, 0 },
-				NodePriorities = new[] { 0, int.MinValue, 0 },
-			};
-
-			// Pick the node with the highest priority over the resigning leader
-			yield return new TestCase {
-				ExpectedLeaderCandidateNode = 0,
-				ResigningLeader = 1,
-				LastElectedLeader = new int?[] { 1, 1, 1 },
-				NodePriorities = new[] { 0, int.MinValue, int.MinValue },
-			};
-
-			// Pick the node with the highest priority between non-resigning nodes
-			// over the resigning leader
-			yield return new TestCase {
-				ExpectedLeaderCandidateNode = 2,
-				ResigningLeader = 0,
-				LastElectedLeader = new int?[] { 0, 0, 0 },
-				ChaserCheckpoints = new long[] { 1, 1, 1 },
-				NodePriorities = new[] { int.MaxValue, 0, 1 },
-			};
-
-			// Pick the node with the highest chaser checkpoint
-			// over the resigning leader, despite node priority
-			yield return new TestCase {
-				ExpectedLeaderCandidateNode = 2,
-				ResigningLeader = 0,
-				LastElectedLeader = new int?[] { 0, 0, 0 },
-				ChaserCheckpoints = new long[] { 1, 0, 1 },
-				NodePriorities = new[] { int.MinValue, 0, int.MinValue },
-			};
-
-			// Pick the node with the highest writer checkpoint
-			// over the resigning leader, despite node priority
-			yield return new TestCase {
-				ExpectedLeaderCandidateNode = 2,
-				WriterCheckpoints = new long[] { 1, 0, 1 },
-				NodePriorities = new[] { int.MinValue, 0, int.MinValue },
-				LastElectedLeader = new int?[] { 0, 0, 0 },
-				ResigningLeader = 0
-			};
-
-			// Prefer the majority last leader, highest epoch, chaser, and priority
-			yield return new TestCase {
-				ExpectedLeaderCandidateNode = 2,
-				LastElectedLeader = new int?[] { 0, 2, 2 },
-				EpochNumbers = new[] { 10, 11, 11 },
-				ChaserCheckpoints = new long[] { 0, 0, 5 },
-				NodePriorities = new[] { 0, 0, 1 },
-			};
-
-			// Prefer the majority last leader, highest chaser, and priority
-			yield return new TestCase {
-				ExpectedLeaderCandidateNode = 2,
-				LastElectedLeader = new int?[] { 0, 2, 2 },
-				EpochNumbers = new[] { 5, 5, 5 },
-				ChaserCheckpoints = new long[] { 0, 0, 5 },
-				NodePriorities = new[] { 0, 0, 1 },
-			};
-
-			// Prefer the majority last leader, highest epoch, chaser, writer, and priority
-			yield return new TestCase {
-				ExpectedLeaderCandidateNode = 2,
-				LastElectedLeader = new int?[] { 0, 2, 2 },
-				EpochNumbers = new[] { 10, 11, 11 },
-				WriterCheckpoints = new[] { 10L, 5, 5 },
-				ChaserCheckpoints = new long[] { 0, 5, 5 },
-				NodePriorities = new[] { 0, 0, 1 },
-			};
-
-			// Prefer the majority last leader, highest epoch, chaser, writer
-			// despite priority
-			yield return new TestCase {
-				ExpectedLeaderCandidateNode = 1,
-				LastElectedLeader = new int?[] { 0, 1, 1 },
-				EpochNumbers = new[] { 10, 11, 11 },
-				WriterCheckpoints = new[] { 10L, 5, 5 },
-				ChaserCheckpoints = new long[] { 0, 5, 5 },
-				NodePriorities = new[] { 0, 0, 1 },
-			};
-
-			// Prefer the majority last leader, highest epoch, and chaser,
-			// despite writer checkpoint
-			yield return new TestCase {
-				ExpectedLeaderCandidateNode = 2,
-				LastElectedLeader = new int?[] { 0, 2, 2 },
-				EpochNumbers = new[] { 10, 11, 11 },
-				WriterCheckpoints = new[] { 10L, 5, 5 },
-				ChaserCheckpoints = new long[] { 0, 5, 5 },
-				NodePriorities = new[] { 0, 0, 0 },
-			};
-		}
-
-		[Test, TestCaseSource(nameof(TestCases))]
-		public void should_select_valid_best_leader_candidate(TestCase tc) {
-			var epochId = Guid.NewGuid();
-			var members = new MemberInfo[3];
-			var prepareOks = new Dictionary<Guid, ElectionMessage.PrepareOk>();
-
-			Func<int, long> writerCheckpoint = i => tc.WriterCheckpoints[i];
-			Func<int, long> chaserCheckpoint = i => tc.ChaserCheckpoints[i];
-			Func<int, int> nodePriority = i => tc.NodePriorities[i];
-			Func<int, int> epochNumber = i => tc.EpochNumbers[i];
-
-			for (int index = 0; index < 3; index++) {
-				members[index] = CreateMemberInfo(index, epochId, writerCheckpoint,
-					chaserCheckpoint, nodePriority, epochNumber);
-			}
-
-			var clusterInfo = new ClusterInfo(members);
-			Func<int, Guid> previousLeaderId = i => !tc.LastElectedLeader[i].HasValue ? Guid.Empty : IdForNode(tc.LastElectedLeader[i].Value);
-
-			for (int index = 0; index < 3; index++) {
-				var prepareOk = CreatePrepareOk(index, epochId, writerCheckpoint, chaserCheckpoint,
-					nodePriority, epochNumber, previousLeaderId, clusterInfo);
-				prepareOks.Add(prepareOk.ServerId, prepareOk);
-			}
-
-			var resigningLeadership = tc.ResigningLeader.HasValue
-				? (Guid?)IdForNode(tc.ResigningLeader.Value)
-				: null;
-			var mc = SUT.GetBestLeaderCandidate(prepareOks, members, resigningLeadership, 0);
-
-			Assert.AreEqual(IdForNode(tc.ExpectedLeaderCandidateNode), mc.InstanceId, $"Expected node {tc.ExpectedLeaderCandidateNode} got node {Array.FindIndex(members, 0, m => m.InstanceId == mc.InstanceId) + 1 }");
-
-			var ownInfo = CreateLeaderCandidate(1, epochId, writerCheckpoint, chaserCheckpoint,
-				nodePriority, epochNumber, previousLeaderId);
-
-			var isLegit = SUT.IsLegitimateLeader(1, EndpointForNode(tc.ProposingNode),
-				IdForNode(tc.ProposingNode), mc, members, null, members[0].InstanceId,
-				ownInfo, resigningLeadership);
-
-			Assert.True(isLegit);
-		}
-
-
-		static ElectionMessage.PrepareOk CreatePrepareOk(int i, Guid epochId,
-			Func<int, long> writerCheckpoint,
-			Func<int, long> chaserCheckpoint,
-			Func<int, int> nodePriority,
-			Func<int, int> epochNumber,
-			Func<int, Guid> previousLeaderId,
-			ClusterInfo clusterInfo) {
-			var id = IdForNode(i);
-			var ep = EndpointForNode(i);
-			return new ElectionMessage.PrepareOk(1, id, ep, epochNumber(i), 1, epochId, previousLeaderId(i), -1, writerCheckpoint(i),
-				chaserCheckpoint(i), nodePriority(i), clusterInfo);
-		}
-
-		static SUT.LeaderCandidate CreateLeaderCandidate(int i, Guid epochId,
-			Func<int, long> writerCheckpoint,
-			Func<int, long> chaserCheckpoint,
-			Func<int, int> nodePriority,
-			Func<int, int> epochNumber,
-			Func<int, Guid> previousLeaderId) {
-			var id = IdForNode(i);
-			var ep = EndpointForNode(i);
-			return new SUT.LeaderCandidate(id, ep, epochNumber(i), 1, epochId, previousLeaderId(i), -1, writerCheckpoint(i),
-				chaserCheckpoint(i), nodePriority(i));
-		}
-
-		static MemberInfo CreateMemberInfo(int i, Guid epochId,
-			Func<int, long> writerCheckpoint,
-			Func<int, long> chaserCheckpoint,
-			Func<int, int> nodePriority,
-			Func<int, int> epochNumber
-			) {
-			var id = IdForNode(i);
-			var ep = EndpointForNode(i);
-			return MemberInfo.ForVNode(id, DateTime.Now, VNodeState.Follower, true, ep, ep, ep, ep, ep, null, 0, 0,
-				 -1, writerCheckpoint(i), chaserCheckpoint(i), 1, epochNumber(i), epochId, nodePriority(i), false);
-		}
-
-		private static IPEndPoint EndpointForNode(int i) {
-			return new IPEndPoint(IPAddress.Loopback, 1000 + i);
-		}
-
-		private static Guid IdForNode(int i) {
-			return Guid.Parse($"101EFD13-F9CD-49BE-9C6D-E6AF9AF5540{i}");
-		}
-
-		static object[] TestCases() {
-			return CreateCases().Cast<object>().ToArray();
-		}
-
-		public class TestCase {
-			public int ExpectedLeaderCandidateNode { get; set; }
-			public int? ResigningLeader { get; set; }
-			public int ProposingNode { get; set; }
-			public int?[] LastElectedLeader { get; set; } = { null, null, null };
-			public long[] WriterCheckpoints { get; set; } = { 1L, 1, 1 };
-			public long[] ChaserCheckpoints { get; set; } = { 1L, 1, 1 };
-			public int[] NodePriorities { get; set; } = { 1, 1, 1 };
-			public int[] EpochNumbers { get; set; } = { -1, -1, -1 };
-
-			private static int _id = 0;
-			private static string GenerateName(int expectedLeaderCandidateNode, int?[] previousLeader,
-				long[] writerCheckpoints,
-				long[] chaserCheckpoints, int[] nodePriorities, int[] epochNumbers) {
-				var nameBuilder = new StringBuilder();
-				nameBuilder.Append($"{_id++} ");
-				if (writerCheckpoints != null) {
-					if (nameBuilder.Length == 0)
-						nameBuilder.Append("Nodes with ");
-					else
-						nameBuilder.Append(" and ");
-					nameBuilder.AppendFormat("writer checkpoints << {0} >>", string.Join(",",
-						writerCheckpoints.Where(x => x != 1).Select((x, i) => $"{i} : wcp {x}")));
-				}
-
-				if (chaserCheckpoints != null) {
-					if (nameBuilder.Length == 0)
-						nameBuilder.Append("Nodes with ");
-					else
-						nameBuilder.Append(" and ");
-					nameBuilder.AppendFormat("chaser checkpoints << {0} >>", string.Join(",",
-						chaserCheckpoints.Where(x => x != 1).Select((x, i) => $"{i} : ccp {x}")));
-				}
-
-				if (nodePriorities != null) {
-					if (nameBuilder.Length == 0)
-						nameBuilder.Append("Nodes with ");
-					else
-						nameBuilder.Append(" and ");
-					nameBuilder.AppendFormat("node priorities << {0} >>", string.Join(",",
-						nodePriorities.Where(x => x != 0).Select((x, i) => $"{i} : np {x}")));
-				}
-				if (epochNumbers != null) {
-					nameBuilder.Append(nameBuilder.Length == 0 ? "Nodes with " : " and ");
-					nameBuilder.AppendFormat("epoch numbers << {0} >>", string.Join(",",
-						epochNumbers.Where(x => x != 0).Select((x, i) => $"{i} : en {x}")));
-				}
-
-				if (nameBuilder.Length == 0)
-					nameBuilder.AppendFormat("All nodes caught up with the same priority expect {0} to be leader",
-						expectedLeaderCandidateNode);
-				var name = nameBuilder.ToString();
-				return name;
-			}
-
-			public override string ToString() {
-				return GenerateName(ExpectedLeaderCandidateNode, LastElectedLeader, WriterCheckpoints, ChaserCheckpoints,
-					NodePriorities, EpochNumbers);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/ElectionParams.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/ElectionParams.cs
deleted file mode 100644
index e89c3b0dbcc..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/ElectionParams.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	public static class ElectionParams {
-		public const int TestRunCount = 50;
-		public const int MaxIterationCount = 25000;
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/ElectionsInstance.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/ElectionsInstance.cs
deleted file mode 100644
index 88bc8ca5c2f..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/ElectionsInstance.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Net;
-using EventStore.Core.Bus;
-
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	internal class ElectionsInstance {
-		public readonly Guid InstanceId;
-		public readonly EndPoint EndPoint;
-
-		public readonly IPublisher InputBus;
-		public readonly IPublisher OutputBus;
-
-		public ElectionsInstance(Guid instanceId, EndPoint endPoint, IPublisher inputBus, IPublisher outputBus) {
-			InstanceId = instanceId;
-			EndPoint = endPoint;
-			InputBus = inputBus;
-			OutputBus = outputBus;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/ElectionsLogger.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/ElectionsLogger.cs
deleted file mode 100644
index 6b9147085e3..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/ElectionsLogger.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Infrastructure;
-
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	internal class ElectionsLogger : IRandTestItemProcessor {
-		public IEnumerable<RandTestQueueItem> ProcessedItems {
-			get { return _items; }
-		}
-
-		public IEnumerable<Message> Messages {
-			get { return _items.Select(x => x.Message); }
-		}
-
-		private readonly List<RandTestQueueItem> _items = new List<RandTestQueueItem>();
-
-		public void Process(int iteration, RandTestQueueItem item) {
-			_items.Add(item);
-		}
-
-		public void LogMessages() {
-			Console.WriteLine("There were a total of {0} messages in this run.", ProcessedItems.Count());
-
-			foreach (var it in ProcessedItems) {
-				Console.WriteLine(it);
-
-				var gossip = it.Message as Messages.GossipMessage.GossipUpdated;
-				if (gossip != null) {
-					Console.WriteLine("=== gsp on {0}", it.EndPoint);
-					Console.WriteLine(gossip.ClusterInfo.ToString().Replace("; ", Environment.NewLine));
-					Console.WriteLine("===");
-				}
-
-				var done = it.Message as Messages.ElectionMessage.ElectionsDone;
-				if (done != null) {
-					Console.WriteLine("=== leader on {0}: {1}", it.EndPoint, done.Leader);
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/ElectionsProgressCondition.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/ElectionsProgressCondition.cs
deleted file mode 100644
index 85d9200c143..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/ElectionsProgressCondition.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using EventStore.Common.Utils;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests.Infrastructure;
-
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	internal class ElectionsProgressCondition : IRandTestFinishCondition {
-		public bool Done { get; protected set; }
-
-		public bool Success {
-			get {
-				var byView = ElectionsResults.Values.GroupBy(x => x.Item1)
-					.Select(x => Tuple.Create(x.Count(), x.Select(y => y.Item2).Distinct().Count()))
-					.ToArray();
-				return byView.Count(x => x.Item1 >= _majorityCount && x.Item2 == 1) == 1;
-			}
-		}
-
-		private readonly int _majorityCount;
-
-		protected readonly Dictionary<EndPoint, Tuple<int, EndPoint>> ElectionsResults =
-			new Dictionary<EndPoint, Tuple<int, EndPoint>>();
-
-		public ElectionsProgressCondition(int instancesCount) {
-			_majorityCount = instancesCount / 2 + 1;
-		}
-
-		public virtual void Process(int iteration, RandTestQueueItem item) {
-			var msg = item.Message as ElectionMessage.ElectionsDone;
-			if (msg != null) {
-				var leader = msg.Leader.HttpEndPoint;
-				ElectionsResults[item.EndPoint] = Tuple.Create(msg.InstalledView, leader);
-				Done = ElectionsResults.Values.Count(x => x.Item1 == msg.InstalledView) >= _majorityCount;
-			}
-		}
-
-		public void Log() {
-			Console.WriteLine("Success Condition data:");
-			Console.WriteLine("node - (installed view, leader)");
-			foreach (var electionsResult in ElectionsResults) {
-				Console.WriteLine("{0} - ({1}, {2})",
-					electionsResult.Key.GetPort(),
-					electionsResult.Value.Item1,
-					electionsResult.Value.Item2.GetPort());
-			}
-
-			Console.WriteLine("end.");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/ElectionsSafetyCondition.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/ElectionsSafetyCondition.cs
deleted file mode 100644
index f72e8861f22..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/ElectionsSafetyCondition.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests.Infrastructure;
-
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	internal class ElectionsSafetyCondition : IRandTestFinishCondition {
-		public bool Done { get; private set; }
-
-		public bool Success {
-			get {
-				if (_electionsResults.Count == 0)
-					return false;
-				var leader = _electionsResults.First().Value;
-				return _electionsResults.Values.All(x => x.Equals(leader)); // same leader for all
-			}
-		}
-
-		private readonly int _instancesCount;
-
-		private readonly Dictionary<EndPoint, EndPoint>
-			_electionsResults = new Dictionary<EndPoint, EndPoint>();
-
-		public ElectionsSafetyCondition(int instancesCount) {
-			_instancesCount = instancesCount;
-		}
-
-		public void Process(int iteration, RandTestQueueItem item) {
-			var electionsMsg = item.Message as ElectionMessage.ElectionsDone;
-			if (electionsMsg != null) {
-				_electionsResults[item.EndPoint] = electionsMsg.Leader.HttpEndPoint;
-				Done = _electionsResults.Count == _instancesCount;
-			}
-		}
-
-		public void Log() {
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/GossipUpdateParams.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/GossipUpdateParams.cs
deleted file mode 100644
index eef869eb74b..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/GossipUpdateParams.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	internal static class GossipUpdateParams {
-		public const int AddNodeProbabilityPercent = 12;
-		public const int KillNodeProbabilityPercent = 5;
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/InnerBusMessagesProcessor.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/InnerBusMessagesProcessor.cs
deleted file mode 100644
index 1b888c69b32..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/InnerBusMessagesProcessor.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Net;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Infrastructure;
-
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	internal class InnerBusMessagesProcessor : IHandle<Message> {
-		private readonly RandomTestRunner _runner;
-		private readonly IPEndPoint _endPoint;
-		private readonly IPublisher _bus;
-
-		public InnerBusMessagesProcessor(RandomTestRunner runner, IPEndPoint endPoint, IPublisher bus) {
-			if (runner == null) throw new ArgumentNullException("runner");
-			if (endPoint == null) throw new ArgumentNullException("endPoint");
-			if (bus == null) throw new ArgumentNullException("bus");
-
-			_runner = runner;
-			_endPoint = endPoint;
-			_bus = bus;
-		}
-
-		public void Handle(Message message) {
-			// timer message and SendOverGrpc is handled differently
-			if (message is TimerMessage.Schedule)
-				return;
-
-			_runner.Enqueue(_endPoint, message, _bus); // process with no delay and no reorderings
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/RandomizedElectionsAndGossipTestCase.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/RandomizedElectionsAndGossipTestCase.cs
deleted file mode 100644
index 4b6d045858f..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/RandomizedElectionsAndGossipTestCase.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System.Collections.Generic;
-using System.Net;
-using EventStore.Core.Cluster;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Infrastructure;
-
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	internal class RandomizedElectionsAndGossipTestCase : RandomizedElectionsTestCase {
-		public delegate MemberInfo[] CreateInitialGossip(ElectionsInstance instance, ElectionsInstance[] allInstances);
-
-		public delegate MemberInfo[] CreateUpdatedGossip(int iteration,
-			RandTestQueueItem item,
-			ElectionsInstance[] instances,
-			MemberInfo[] initialGossip,
-			Dictionary<EndPoint, MemberInfo[]> previousGossip);
-
-		private readonly CreateInitialGossip _createInitialGossip;
-		private readonly CreateUpdatedGossip _createUpdatedGossip;
-
-		private readonly SendOverGrpcBlockingProcessor _sendOverGrpcBlockingProcessor;
-		private readonly UpdateGossipProcessor _updateGossipProcessor;
-
-		public RandomizedElectionsAndGossipTestCase(int maxIterCnt,
-			int instancesCnt,
-			double httpLossProbability,
-			double httpDupProbability,
-			int httpMaxDelay,
-			int timerMinDelay,
-			int timerMaxDelay,
-			CreateInitialGossip createInitialGossip,
-			CreateUpdatedGossip createUpdatedGossip,
-			int? rndSeed = null)
-			: base(maxIterCnt,
-				instancesCnt,
-				httpLossProbability,
-				httpDupProbability,
-				httpMaxDelay,
-				timerMinDelay,
-				timerMaxDelay,
-				rndSeed) {
-			_createInitialGossip = createInitialGossip;
-			_createUpdatedGossip = createUpdatedGossip;
-
-			_sendOverGrpcBlockingProcessor = new SendOverGrpcBlockingProcessor(Rnd,
-				Runner,
-				HttpLossProbability,
-				HttpDupProbability,
-				HttpMaxDelay);
-
-			_updateGossipProcessor = new UpdateGossipProcessor(new ElectionsInstance[0],
-				_sendOverGrpcBlockingProcessor,
-				_createUpdatedGossip,
-				Enqueue
-			);
-		}
-
-		private void Enqueue(RandTestQueueItem item, Message message) {
-			Runner.Enqueue(item.EndPoint, message, item.Bus, 10);
-		}
-
-		protected override IRandTestFinishCondition GetFinishCondition() {
-			return new ElectionsProgressCondition(InstancesCnt);
-		}
-
-		protected override IRandTestItemProcessor[] GetAdditionalProcessors() {
-			return new IRandTestItemProcessor[] {_updateGossipProcessor};
-		}
-
-		protected override GossipMessage.GossipUpdated GetInitialGossipFor(ElectionsInstance instance,
-			List<ElectionsInstance> allInstances) {
-			var members = _createInitialGossip(instance, allInstances.ToArray());
-			_updateGossipProcessor.SetInitialData(allInstances, members);
-
-			return new GossipMessage.GossipUpdated(new ClusterInfo(members));
-		}
-
-		protected override SendOverGrpcProcessor GetSendOverHttpProcessor() {
-			return _sendOverGrpcBlockingProcessor;
-		}
-
-		public int Next(int maxValue) {
-			return Rnd.Next(maxValue);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/RandomizedElectionsTestCase.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/RandomizedElectionsTestCase.cs
deleted file mode 100644
index 260077cae38..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/RandomizedElectionsTestCase.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using EventStore.Core.Bus;
-using EventStore.Core.Cluster;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests.Infrastructure;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.TransactionLog.Checkpoint;
-
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	internal class RandomizedElectionsTestCase {
-		protected readonly int RndSeed;
-		protected readonly Random Rnd;
-
-		protected readonly double HttpLossProbability;
-		protected readonly double HttpDupProbability;
-		protected readonly int HttpMaxDelay;
-
-		protected readonly int InstancesCnt;
-
-		private readonly int _maxIterCnt;
-
-		private readonly int _timerMinDelay;
-		private readonly int _timerMaxDelay;
-
-		private static readonly IPEndPoint BaseEndPoint = new IPEndPoint(IPAddress.Loopback, 1000);
-
-		public readonly RandomTestRunner Runner;
-		public readonly IRandTestItemProcessor Logger;
-		public IRandTestFinishCondition FinishCondition;
-
-		private readonly List<ElectionsInstance> _instances = new List<ElectionsInstance>();
-
-		private readonly bool _isReadOnlyReplica;
-
-		public RandomizedElectionsTestCase(int maxIterCnt,
-			int instancesCnt,
-			double httpLossProbability,
-			double httpDupProbability,
-			int httpMaxDelay,
-			int timerMinDelay,
-			int timerMaxDelay,
-			int? rndSeed = null,
-			bool isReadOnlyReplica = false) {
-			RndSeed = rndSeed ?? Math.Abs(Environment.TickCount);
-			Rnd = new Random(RndSeed);
-
-			_maxIterCnt = maxIterCnt;
-			InstancesCnt = instancesCnt;
-			HttpLossProbability = httpLossProbability;
-			HttpDupProbability = httpDupProbability;
-			HttpMaxDelay = httpMaxDelay;
-			_timerMinDelay = timerMinDelay;
-			_timerMaxDelay = timerMaxDelay;
-			_isReadOnlyReplica = isReadOnlyReplica;
-
-			Runner = new RandomTestRunner(_maxIterCnt);
-			Logger = new ElectionsLogger();
-		}
-
-		public virtual void Init() {
-			var sendOverHttpHandler = GetSendOverHttpProcessor();
-
-			for (int i = 0; i < InstancesCnt; ++i) {
-				var inputBus = new SynchronousScheduler($"ELECTIONS-INPUT-BUS-{i}");
-				var outputBus = new SynchronousScheduler($"ELECTIONS-OUTPUT-BUS-{i}");
-				var endPoint = new IPEndPoint(BaseEndPoint.Address, BaseEndPoint.Port + i);
-				var memberInfo = MemberInfo.Initial(Guid.NewGuid(), DateTime.UtcNow, VNodeState.Unknown, true,
-					endPoint, endPoint, endPoint, endPoint, endPoint, null, 0, 0, 0, false);
-				_instances.Add(new ElectionsInstance(memberInfo.InstanceId, endPoint, inputBus, outputBus));
-
-				sendOverHttpHandler.RegisterEndPoint(endPoint, inputBus);
-
-				var electionsService = new Core.Services.ElectionsService(outputBus,
-					memberInfo,
-					InstancesCnt,
-					new InMemoryCheckpoint(),
-					new InMemoryCheckpoint(),
-					new InMemoryCheckpoint(-1),
-					new FakeEpochManager(),
-					() => -1, 0, new FakeTimeProvider(),
-					TimeSpan.FromMilliseconds(1_000));
-				electionsService.SubscribeMessages(inputBus);
-
-				outputBus.Subscribe(sendOverHttpHandler);
-				outputBus.Subscribe(new TimerMessageProcessor(Rnd,
-					Runner,
-					endPoint,
-					inputBus,
-					_timerMinDelay,
-					_timerMaxDelay));
-				outputBus.Subscribe(new InnerBusMessagesProcessor(Runner, endPoint, inputBus));
-			}
-		}
-
-		protected virtual SendOverGrpcProcessor GetSendOverHttpProcessor() {
-			return new SendOverGrpcProcessor(Rnd,
-				Runner,
-				HttpLossProbability,
-				HttpDupProbability,
-				HttpMaxDelay);
-		}
-
-		protected virtual IRandTestFinishCondition GetFinishCondition() {
-			return new ElectionsProgressCondition(InstancesCnt);
-		}
-
-		protected virtual IRandTestItemProcessor[] GetAdditionalProcessors() {
-			return new IRandTestItemProcessor[] { };
-		}
-
-		protected virtual GossipMessage.GossipUpdated GetInitialGossipFor(ElectionsInstance instance,
-			List<ElectionsInstance> allInstances) {
-			var members = allInstances.Select(
-				x => MemberInfo.ForVNode(x.InstanceId, DateTime.UtcNow, VNodeState.Unknown, true,
-					x.EndPoint, null, x.EndPoint, null,
-					x.EndPoint, null, 0, 0, -1, 0, 0, -1, -1, Guid.Empty, 0, false));
-			var gossip = new GossipMessage.GossipUpdated(new ClusterInfo(members.ToArray()));
-			return gossip;
-		}
-
-		public bool Run() {
-			FinishCondition = GetFinishCondition();
-
-			foreach (var instance in _instances) {
-				Runner.Enqueue(instance.EndPoint, new SystemMessage.SystemInit(), instance.InputBus);
-				Runner.Enqueue(instance.EndPoint, new ElectionMessage.StartElections(), instance.InputBus);
-
-				var gossip = GetInitialGossipFor(instance, _instances);
-				Runner.Enqueue(instance.EndPoint, gossip, instance.InputBus);
-			}
-
-			var additionalProcessors = GetAdditionalProcessors();
-			var processors = new[] {Logger}.Union(additionalProcessors);
-
-			var isGood = Runner.Run(FinishCondition, processors.ToArray());
-
-			if (!isGood) {
-				Console.WriteLine("Unsuccessful run. Parameters:\n"
-				                  + "rndSeed: {0}\n"
-				                  + "maxIterCnt = {1}\n"
-				                  + "instancesCnt = {2}\n"
-				                  + "httpLossProbability = {3}\n"
-				                  + "httpMaxDelay = {4}\n"
-				                  + "timerMinDelay = {5}\n"
-				                  + "timerMaxDelay = {6}\n",
-					RndSeed,
-					_maxIterCnt,
-					InstancesCnt,
-					HttpLossProbability,
-					HttpMaxDelay,
-					_timerMinDelay,
-					_timerMaxDelay);
-			}
-
-			return isGood;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/SendOverGrpcBlockingProcessor.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/SendOverGrpcBlockingProcessor.cs
deleted file mode 100644
index 726cc679c00..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/SendOverGrpcBlockingProcessor.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests.Infrastructure;
-
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	internal class SendOverGrpcBlockingProcessor : SendOverGrpcProcessor {
-		private readonly Dictionary<EndPoint, bool> _endpointsToSkip;
-
-		public SendOverGrpcBlockingProcessor(Random rnd,
-			RandomTestRunner runner,
-			double lossProb,
-			double dupProb,
-			int maxDelay) : base(rnd, runner, lossProb, dupProb, maxDelay) {
-			_endpointsToSkip = new Dictionary<EndPoint, bool>();
-		}
-
-		public void RegisterEndpointToSkip(EndPoint endPoint, bool shouldSkip) {
-			_endpointsToSkip[endPoint] = shouldSkip;
-		}
-
-		protected override bool ShouldSkipMessage(GrpcMessage.SendOverGrpc message) {
-			bool shouldSkip;
-			return _endpointsToSkip.TryGetValue(message.DestinationEndpoint, out shouldSkip) && shouldSkip;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/SendOverGrpcProcessor.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/SendOverGrpcProcessor.cs
deleted file mode 100644
index 518ca6c9ec1..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/SendOverGrpcProcessor.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests.Infrastructure;
-
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	internal class SendOverGrpcProcessor : IHandle<GrpcMessage.SendOverGrpc> {
-		private readonly Random _rnd;
-		private readonly Dictionary<EndPoint, IPublisher> _httpBuses = new Dictionary<EndPoint, IPublisher>();
-		private readonly RandomTestRunner _runner;
-		private readonly double _lossProb;
-		private readonly double _dupProb;
-		private readonly int _maxDelay;
-
-		public SendOverGrpcProcessor(Random rnd, RandomTestRunner runner, double lossProb, double dupProb,
-			int maxDelay) {
-			if (rnd == null) throw new ArgumentNullException("rnd");
-			if (runner == null) throw new ArgumentNullException("runner");
-			if (lossProb < 0.0 || lossProb > 1.0) throw new ArgumentOutOfRangeException("lossProb");
-			if (dupProb < 0.0 || dupProb > 1.0) throw new ArgumentOutOfRangeException("dupProb");
-			if (maxDelay <= 0) throw new ArgumentOutOfRangeException("maxDelay");
-
-			_rnd = rnd;
-			_runner = runner;
-			_lossProb = lossProb;
-			_dupProb = dupProb;
-			_maxDelay = maxDelay;
-		}
-
-		public void RegisterEndPoint(EndPoint endPoint, IPublisher bus) {
-			_httpBuses.Add(endPoint, bus);
-		}
-
-		public void Handle(GrpcMessage.SendOverGrpc message) {
-			if (_rnd.NextDouble() < _lossProb)
-				return;
-
-			if (ShouldSkipMessage(message))
-				return;
-
-			IPublisher publisher;
-			if (!_httpBuses.TryGetValue(message.DestinationEndpoint, out publisher))
-				throw new InvalidOperationException(string.Format("No HTTP bus subscribed for EndPoint: {0}.",
-					message.DestinationEndpoint));
-
-			_runner.Enqueue(message.DestinationEndpoint, message.Message, publisher, 1 + _rnd.Next(_maxDelay));
-
-			if (_rnd.NextDouble() < _dupProb)
-				_runner.Enqueue(message.DestinationEndpoint, message.Message, publisher, 1 + _rnd.Next(_maxDelay));
-		}
-
-		protected virtual bool ShouldSkipMessage(GrpcMessage.SendOverGrpc message) {
-			return false;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/SeqHelpers.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/SeqHelpers.cs
deleted file mode 100644
index e03de31d8cc..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/SeqHelpers.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	public static class SeqHelpers {
-		public static IEnumerable<T> Shuffle<T>(this IEnumerable<T> source, Func<int, int> rndNext) {
-			var array = source.ToArray();
-			var n = array.Length;
-			while (n > 1) {
-				var k = rndNext(n);
-				n--;
-				var temp = array[n];
-				array[n] = array[k];
-				array[k] = temp;
-			}
-
-			return array;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/TimerMessageProcessor.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/TimerMessageProcessor.cs
deleted file mode 100644
index adce2bff264..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/TimerMessageProcessor.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Net;
-using EventStore.Core.Bus;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Infrastructure;
-
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	internal class TimerMessageProcessor : IHandle<TimerMessage.Schedule> {
-		private readonly Random _rnd;
-		private readonly RandomTestRunner _runner;
-		private readonly IPEndPoint _endPoint;
-		private readonly IPublisher _bus;
-		private readonly int _delayMin;
-		private readonly int _delayMax;
-
-		public TimerMessageProcessor(Random rnd,
-			RandomTestRunner runner,
-			IPEndPoint endPoint,
-			IPublisher bus,
-			int delayMin,
-			int delayMax) {
-			if (rnd == null) throw new ArgumentNullException("rnd");
-			if (runner == null) throw new ArgumentNullException("runner");
-			if (endPoint == null) throw new ArgumentNullException("endPoint");
-			if (bus == null) throw new ArgumentNullException("bus");
-			if (delayMin <= 0) throw new ArgumentOutOfRangeException("delayMin");
-			if (delayMin >= delayMax) throw new ArgumentException("DelayMin should be strictly less than DelayMax.");
-
-			_rnd = rnd;
-			_runner = runner;
-			_endPoint = endPoint;
-			_bus = bus;
-			_delayMin = delayMin;
-			_delayMax = delayMax;
-		}
-
-		public void Handle(TimerMessage.Schedule message) {
-			_runner.Enqueue(_endPoint, message.ReplyMessage, _bus, _rnd.Next(_delayMin, _delayMax));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/UpdateGossipProcessor.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/UpdateGossipProcessor.cs
deleted file mode 100644
index e3a2123e1d2..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/UpdateGossipProcessor.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using EventStore.Core.Cluster;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Infrastructure;
-
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	internal class UpdateGossipProcessor : IRandTestItemProcessor {
-		private readonly SendOverGrpcBlockingProcessor _sendOverGrpcProcessor;
-		private readonly RandomizedElectionsAndGossipTestCase.CreateUpdatedGossip _createUpdatedGossip;
-		private readonly Action<RandTestQueueItem, Message> _enqueue;
-		private ElectionsInstance[] _instances;
-		private readonly List<RandTestQueueItem> _processedItems;
-
-		private MemberInfo[] _initialGossip;
-		private Dictionary<EndPoint, MemberInfo[]> _previousGossip;
-
-		public UpdateGossipProcessor(IEnumerable<ElectionsInstance> allInstances,
-			SendOverGrpcBlockingProcessor sendOverGrpcProcessor,
-			RandomizedElectionsAndGossipTestCase.CreateUpdatedGossip createUpdatedGossip,
-			Action<RandTestQueueItem, Message> enqueue) {
-			_sendOverGrpcProcessor = sendOverGrpcProcessor;
-			_createUpdatedGossip = createUpdatedGossip;
-			_enqueue = enqueue;
-			_instances = allInstances.ToArray();
-
-			_processedItems = new List<RandTestQueueItem>();
-			ProcessedItems = _processedItems;
-		}
-
-		public void SetInitialData(IEnumerable<ElectionsInstance> allInstances,
-			IEnumerable<MemberInfo> initialGossip) {
-			_instances = allInstances.ToArray();
-			_initialGossip = initialGossip.ToArray();
-			_previousGossip = _instances.ToDictionary(x => x.EndPoint, v => _initialGossip);
-		}
-
-		public IEnumerable<RandTestQueueItem> ProcessedItems { get; private set; }
-
-		public void Process(int iteration, RandTestQueueItem item) {
-			var electionsDone = item.Message as ElectionMessage.ElectionsDone;
-			if (electionsDone != null) {
-				MemberInfo[] previousMembers;
-				if (_previousGossip.TryGetValue(item.EndPoint, out previousMembers)) {
-					var leaderIndex = Array.FindIndex(previousMembers,
-						x => x.Is(electionsDone.Leader.HttpEndPoint));
-					if (leaderIndex != -1) {
-						var previousLeaderInfo = previousMembers[leaderIndex];
-						var leaderEndPoint = previousLeaderInfo.HttpEndPoint;
-
-						previousMembers[leaderIndex] =
-							MemberInfo.ForVNode(previousLeaderInfo.InstanceId, DateTime.UtcNow, VNodeState.Leader,
-								previousLeaderInfo.IsAlive, leaderEndPoint, null, leaderEndPoint, null, leaderEndPoint, null, 0, 0,
-								-1, 0, 0, -1, -1, Guid.Empty, 0, false);
-					}
-				}
-			}
-
-			var updatedGossip = _createUpdatedGossip(iteration, item, _instances, _initialGossip, _previousGossip);
-			if (updatedGossip != null) {
-				if (updatedGossip.Length > _instances.Length)
-					throw new InvalidDataException(
-						"Gossip should not contain more items than there are servers in the cluster.");
-
-				_processedItems.Add(item);
-
-				foreach (var memberInfo in updatedGossip) {
-					_sendOverGrpcProcessor.RegisterEndpointToSkip(memberInfo.ExternalTcpEndPoint, !memberInfo.IsAlive);
-				}
-
-				var updateGossipMessage = new GossipMessage.GossipUpdated(new ClusterInfo(updatedGossip));
-
-				_enqueue(item, updateGossipMessage);
-				_previousGossip[item.EndPoint] = updatedGossip;
-
-				var leader = updateGossipMessage.ClusterInfo.Members.FirstOrDefault(x => x.IsAlive && x.State == VNodeState.Leader);
-				if (leader == null)
-					_enqueue(item, new ElectionMessage.StartElections());
-			}
-		}
-
-		public void LogMessages() {
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_3_nodes_full_gossip_no_http_loss_no_dup.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_3_nodes_full_gossip_no_http_loss_no_dup.cs
deleted file mode 100644
index dcec27a1844..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_3_nodes_full_gossip_no_http_loss_no_dup.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Linq;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	[TestFixture]
-	public class elections_service_3_nodes_full_gossip_no_http_loss_no_dup {
-		private RandomizedElectionsTestCase _randomCase;
-
-		[SetUp]
-		public void SetUp() {
-			_randomCase = new RandomizedElectionsTestCase(ElectionParams.MaxIterationCount,
-				instancesCnt: 3,
-				httpLossProbability: 0.0,
-				httpDupProbability: 0.0,
-				httpMaxDelay: 20,
-				timerMinDelay: 100,
-				timerMaxDelay: 200);
-			_randomCase.Init();
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public void should_always_arrive_at_coherent_results([Range(0, ElectionParams.TestRunCount - 1)]
-			int run) {
-			var success = _randomCase.Run();
-			if (!success)
-				_randomCase.Logger.LogMessages();
-			Console.WriteLine("There were a total of {0} messages in this run.",
-				_randomCase.Logger.ProcessedItems.Count());
-			Assert.True(success);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_3_nodes_full_gossip_some_http_loss_some_dup.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_3_nodes_full_gossip_some_http_loss_some_dup.cs
deleted file mode 100644
index 71cb1c1ce0b..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_3_nodes_full_gossip_some_http_loss_some_dup.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Linq;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	[TestFixture]
-	public class elections_service_3_nodes_full_gossip_some_http_loss_some_dup {
-		private RandomizedElectionsTestCase _randomCase;
-
-		[SetUp]
-		public void SetUp() {
-			_randomCase = new RandomizedElectionsTestCase(ElectionParams.MaxIterationCount,
-				instancesCnt: 3,
-				httpLossProbability: 0.3,
-				httpDupProbability: 0.3,
-				httpMaxDelay: 20,
-				timerMinDelay: 100,
-				timerMaxDelay: 200);
-			_randomCase.Init();
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public void should_always_arrive_at_coherent_results([Range(0, ElectionParams.TestRunCount - 1)]
-			int run) {
-			var success = _randomCase.Run();
-			if (!success)
-				_randomCase.Logger.LogMessages();
-			Console.WriteLine("There were a total of {0} messages in this run.",
-				_randomCase.Logger.ProcessedItems.Count());
-			Assert.True(success);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_4_nodes_full_gossip_no_http_loss_no_dup.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_4_nodes_full_gossip_no_http_loss_no_dup.cs
deleted file mode 100644
index 1f3ecce71ed..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_4_nodes_full_gossip_no_http_loss_no_dup.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Linq;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	[TestFixture]
-	public class elections_service_4_nodes_full_gossip_no_http_loss_no_dup {
-		private RandomizedElectionsTestCase _randomCase;
-
-		[SetUp]
-		public void SetUp() {
-			_randomCase = new RandomizedElectionsTestCase(ElectionParams.MaxIterationCount,
-				instancesCnt: 6,
-				httpLossProbability: 0.0,
-				httpDupProbability: 0.0,
-				httpMaxDelay: 20,
-				timerMinDelay: 100,
-				timerMaxDelay: 200);
-			_randomCase.Init();
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public void should_always_arrive_at_coherent_results([Range(0, ElectionParams.TestRunCount - 1)]
-			int run) {
-			var success = _randomCase.Run();
-			if (!success)
-				_randomCase.Logger.LogMessages();
-			Console.WriteLine("There were a total of {0} messages in this run.",
-				_randomCase.Logger.ProcessedItems.Count());
-			Assert.True(success);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_4_nodes_full_gossip_some_http_loss_some_dup.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_4_nodes_full_gossip_some_http_loss_some_dup.cs
deleted file mode 100644
index c06fef9b45d..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_4_nodes_full_gossip_some_http_loss_some_dup.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Linq;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	[TestFixture]
-	public class elections_service_4_nodes_full_gossip_some_http_loss_some_dup {
-		private RandomizedElectionsTestCase _randomCase;
-
-		[SetUp]
-		public void SetUp() {
-			_randomCase = new RandomizedElectionsTestCase(ElectionParams.MaxIterationCount,
-				instancesCnt: 4,
-				httpLossProbability: 0.3,
-				httpDupProbability: 0.3,
-				httpMaxDelay: 20,
-				timerMinDelay: 100,
-				timerMaxDelay: 200);
-			_randomCase.Init();
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public void should_always_arrive_at_coherent_results([Range(0, ElectionParams.TestRunCount - 1)]
-			int run) {
-			var success = _randomCase.Run();
-			if (!success)
-				_randomCase.Logger.LogMessages();
-			Console.WriteLine("There were a total of {0} messages in this run.",
-				_randomCase.Logger.ProcessedItems.Count());
-			Assert.True(success);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_4_nodes_full_gossip_some_http_loss_some_dup_rndseed_20676840.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_4_nodes_full_gossip_some_http_loss_some_dup_rndseed_20676840.cs
deleted file mode 100644
index 300d9b1fea3..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_4_nodes_full_gossip_some_http_loss_some_dup_rndseed_20676840.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Linq;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	[TestFixture]
-	public class elections_service_4_nodes_full_gossip_some_http_loss_some_dup_rndseed_20676840 {
-		private RandomizedElectionsTestCase _randomCase;
-
-		[SetUp]
-		public void SetUp() {
-			_randomCase = new RandomizedElectionsTestCase(ElectionParams.MaxIterationCount,
-				instancesCnt: 4,
-				httpLossProbability: 0.5,
-				httpDupProbability: 0.3,
-				httpMaxDelay: 20,
-				timerMinDelay: 100,
-				timerMaxDelay: 200,
-				rndSeed: 20676840);
-
-			_randomCase.Init();
-		}
-
-		[Test]
-		[Category("Network")]
-		public void should_always_arrive_at_coherent_results() {
-			var success = _randomCase.Run();
-			if (!success)
-				_randomCase.Logger.LogMessages();
-			Console.WriteLine("There were a total of {0} messages in this run.",
-				_randomCase.Logger.ProcessedItems.Count());
-			Assert.True(success);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_full_gossip_no_http_loss_no_dup.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_full_gossip_no_http_loss_no_dup.cs
deleted file mode 100644
index b331c510d49..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_full_gossip_no_http_loss_no_dup.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Linq;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	[TestFixture]
-	public class elections_service_5_nodes_full_gossip_no_http_loss_no_dup {
-		private RandomizedElectionsTestCase _randomCase;
-
-		[SetUp]
-		public void SetUp() {
-			_randomCase = new RandomizedElectionsTestCase(ElectionParams.MaxIterationCount,
-				instancesCnt: 5,
-				httpLossProbability: 0.0,
-				httpDupProbability: 0.0,
-				httpMaxDelay: 20,
-				timerMinDelay: 100,
-				timerMaxDelay: 200);
-			_randomCase.Init();
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public void should_always_arrive_at_coherent_results([Range(0, ElectionParams.TestRunCount - 1)]
-			int run) {
-			var success = _randomCase.Run();
-			if (!success)
-				_randomCase.Logger.LogMessages();
-			Console.WriteLine("There were a total of {0} messages in this run.",
-				_randomCase.Logger.ProcessedItems.Count());
-			Assert.True(success);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_full_gossip_some_http_loss_some_dup.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_full_gossip_some_http_loss_some_dup.cs
deleted file mode 100644
index 97b024f245a..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_full_gossip_some_http_loss_some_dup.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Linq;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	[TestFixture]
-	public class elections_service_5_nodes_full_gossip_some_http_loss_some_dup {
-		private RandomizedElectionsTestCase _randomCase;
-
-		[SetUp]
-		public void SetUp() {
-			_randomCase = new RandomizedElectionsTestCase(ElectionParams.MaxIterationCount,
-				instancesCnt: 5,
-				httpLossProbability: 0.3,
-				httpDupProbability: 0.3,
-				httpMaxDelay: 20,
-				timerMinDelay: 100,
-				timerMaxDelay: 200);
-			_randomCase.Init();
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public void should_always_arrive_at_coherent_results([Range(0, ElectionParams.TestRunCount - 1)]
-			int run) {
-			var success = _randomCase.Run();
-			if (!success)
-				_randomCase.Logger.LogMessages();
-			Console.WriteLine("There were a total of {0} messages in this run.",
-				_randomCase.Logger.ProcessedItems.Count());
-			Assert.True(success);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_with_1_known_when_started_and_set_full_imediately.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_with_1_known_when_started_and_set_full_imediately.cs
deleted file mode 100644
index 6508916457a..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_with_1_known_when_started_and_set_full_imediately.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using EventStore.Common.Utils;
-using EventStore.Core.Cluster;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests.Infrastructure;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	[TestFixture]
-	public class elections_service_5_nodes_with_1_known_when_started_and_set_full_imediately {
-		private RandomizedElectionsAndGossipTestCase _randomCase;
-
-		[SetUp]
-		public void SetUp() {
-			_randomCase = new RandomizedElectionsAndGossipTestCase(ElectionParams.MaxIterationCount,
-				instancesCnt: 5,
-				httpLossProbability: 0.3,
-				httpDupProbability: 0.3,
-				httpMaxDelay: 20,
-				timerMinDelay: 100,
-				timerMaxDelay: 200,
-				createInitialGossip: CreateInitialGossip,
-				createUpdatedGossip: CreateUpdatedGossip
-			);
-
-			_randomCase.Init();
-		}
-
-		private MemberInfo[] CreateInitialGossip(ElectionsInstance instance, ElectionsInstance[] allInstances) {
-			return new[] {
-				MemberInfo.ForVNode(instance.InstanceId, DateTime.UtcNow, VNodeState.Unknown, true,
-					instance.EndPoint, null, instance.EndPoint, null, instance.EndPoint, null, 0, 0,
-					-1, 0, 0, -1, -1, Guid.Empty, 0, false)
-			};
-		}
-
-		private MemberInfo[] CreateUpdatedGossip(int iteration,
-			RandTestQueueItem item,
-			ElectionsInstance[] instances,
-			MemberInfo[] initialGossip,
-			Dictionary<EndPoint, MemberInfo[]> previousGossip) {
-			if (previousGossip[item.EndPoint].Length < 5) {
-				Console.WriteLine("Update item: {0} : {1}", iteration, item.EndPoint.GetPort());
-				return instances.Select((x, i) =>
-					MemberInfo.ForVNode(x.InstanceId, DateTime.UtcNow, VNodeState.Unknown, true,
-						x.EndPoint, null, x.EndPoint, null, x.EndPoint, null, 0, 0,
-						-1, 0, 0, -1, -1, Guid.Empty, 0, false)).ToArray();
-			}
-
-			return null;
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public void should_complete_successfully([Range(0, ElectionParams.TestRunCount - 1)]
-			int run) {
-			var success = _randomCase.Run();
-			if (!success)
-				_randomCase.Logger.LogMessages();
-
-			Console.WriteLine("There were a total of {0} messages in this run.",
-				_randomCase.Logger.ProcessedItems.Count());
-			Console.WriteLine("There were {0} GossipUpdated messages in this run.",
-				_randomCase.Logger.ProcessedItems.Count(x => x.Message is GossipMessage.GossipUpdated));
-
-			Assert.True(success);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_with_1_known_when_started_and_set_to_full_later.cs b/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_with_1_known_when_started_and_set_to_full_later.cs
deleted file mode 100644
index 809b83f7e49..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_with_1_known_when_started_and_set_to_full_later.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using EventStore.Common.Utils;
-using EventStore.Core.Cluster;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests.Infrastructure;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.ElectionsService.Randomized {
-	[TestFixture, Ignore("Not sure the finish criteria is correct")]
-	public class elections_service_5_nodes_with_1_known_when_started_and_set_to_full_later {
-		private RandomizedElectionsAndGossipTestCase _randomCase;
-
-		[SetUp]
-		public void SetUp() {
-			_randomCase = new RandomizedElectionsAndGossipTestCase(ElectionParams.MaxIterationCount,
-				instancesCnt: 5,
-				httpLossProbability: 0.3,
-				httpDupProbability: 0.3,
-				httpMaxDelay: 20,
-				timerMinDelay: 100,
-				timerMaxDelay: 200,
-				createInitialGossip: CreateInitialGossip,
-				createUpdatedGossip: CreateUpdatedGossip
-			);
-
-			_randomCase.Init();
-		}
-
-		private MemberInfo[] CreateInitialGossip(ElectionsInstance instance, ElectionsInstance[] allInstances) {
-			return new[] {
-				MemberInfo.ForVNode(instance.InstanceId, DateTime.UtcNow, VNodeState.Unknown, true,
-					instance.EndPoint, null, instance.EndPoint, null, instance.EndPoint, null, 0, 0,
-					-1, 0, 0, -1, -1, Guid.Empty, 0, false)
-			};
-		}
-
-		private MemberInfo[] CreateUpdatedGossip(int iteration,
-			RandTestQueueItem item,
-			ElectionsInstance[] instances,
-			MemberInfo[] initialGossip,
-			Dictionary<EndPoint, MemberInfo[]> previousGossip) {
-			if (iteration == 1 || (iteration % 100 != (item.EndPoint.GetPort() % 1000) && _randomCase.Next(100) < 30))
-				return null;
-
-			if (previousGossip[item.EndPoint].Length < 5) {
-				return instances.Select((x, i) =>
-						MemberInfo.ForVNode(x.InstanceId, DateTime.UtcNow, VNodeState.Unknown, true,
-							x.EndPoint, null, x.EndPoint, null, x.EndPoint, null, 0, 0,
-							-1, 0, 0, -1, -1, Guid.Empty, 0, false))
-					.ToArray();
-			}
-
-			return null;
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public void should_complete_successfully([Range(0, ElectionParams.TestRunCount - 1)]
-			int run) {
-			var success = _randomCase.Run();
-			if (!success)
-				_randomCase.Logger.LogMessages();
-
-			Console.WriteLine("There were a total of {0} messages in this run.",
-				_randomCase.Logger.ProcessedItems.Count());
-			Console.WriteLine("There were {0} GossipUpdated messages in this run.",
-				_randomCase.Logger.ProcessedItems.Count(x => x.Message is GossipMessage.GossipUpdated));
-
-			Assert.True(success);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/ElectionsService/no_quorum_cases.cs b/src/EventStore.Core.Tests/Services/ElectionsService/no_quorum_cases.cs
deleted file mode 100644
index c13992c1e64..00000000000
--- a/src/EventStore.Core.Tests/Services/ElectionsService/no_quorum_cases.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.ElectionsService {
-	[TestFixture]
-	public sealed class elections_service_should_stuck_with_single_node_response {
-		private ElectionsServiceUnit _electionsUnit;
-
-		[SetUp]
-		public void SetUp() {
-			var clusterSettings = ClusterSettingsFactory.GetClusterSettings(1, 3, false);
-
-			_electionsUnit = new ElectionsServiceUnit(clusterSettings);
-
-			ProcessElections();
-		}
-
-		private void ProcessElections() {
-			var gossipUpdate = new GossipMessage.GossipUpdated(_electionsUnit.ClusterInfo);
-			_electionsUnit.Publish(gossipUpdate);
-
-			_electionsUnit.Publish(new ElectionMessage.StartElections());
-
-			_electionsUnit.RepublishFromPublisher();
-		}
-
-		[Test]
-		public void elections_should_time_out() {
-			Assert.That(_electionsUnit.Publisher.Messages.ContainsSingle<ElectionMessage.ElectionsTimedOut>());
-		}
-	}
-
-	[TestFixture]
-	public sealed class elections_service_should_stuck_with_single_node_response_2_iterations {
-		private ElectionsServiceUnit _electionsUnit;
-
-		[SetUp]
-		public void SetUp() {
-			var clusterSettings = ClusterSettingsFactory.GetClusterSettings(1, 3, false);
-
-			_electionsUnit = new ElectionsServiceUnit(clusterSettings);
-
-			ProcessElections();
-		}
-
-		private void ProcessElections() {
-			var gossipUpdate = new GossipMessage.GossipUpdated(_electionsUnit.ClusterInfo);
-			_electionsUnit.Publish(gossipUpdate);
-
-			_electionsUnit.Publish(new ElectionMessage.StartElections());
-
-			_electionsUnit.RepublishFromPublisher();
-
-			_electionsUnit.RepublishFromPublisher();
-			Assert.That(
-				_electionsUnit.Publisher.Messages.All(x => x is GrpcMessage.SendOverGrpc || x is TimerMessage.Schedule),
-				Is.True,
-				"Only SendOverGrpc or Schedule messages are expected.");
-
-			_electionsUnit.RepublishFromPublisher();
-		}
-
-		[Test]
-		public void elections_should_time_out() {
-			Assert.That(_electionsUnit.Publisher.Messages.ContainsSingle<ElectionMessage.ElectionsTimedOut>());
-		}
-	}
-
-	[TestFixture]
-	public sealed class elections_service_should_stuck_with_single_alive_node {
-		private ElectionsServiceUnit _electionsUnit;
-
-		[SetUp]
-		public void SetUp() {
-			var clusterSettings = ClusterSettingsFactory.GetClusterSettings(1, 3, false);
-
-			_electionsUnit = new ElectionsServiceUnit(clusterSettings);
-			_electionsUnit.UpdateClusterMemberInfo(0, isAlive: false);
-			_electionsUnit.UpdateClusterMemberInfo(2, isAlive: false);
-			_electionsUnit.UpdateClusterMemberInfo(3, isAlive: false);
-
-			ProcessElections();
-		}
-
-		private void ProcessElections() {
-			var gossipUpdate = new GossipMessage.GossipUpdated(_electionsUnit.ClusterInfo);
-			_electionsUnit.Publish(gossipUpdate);
-
-			_electionsUnit.Publish(new ElectionMessage.StartElections());
-
-			_electionsUnit.RepublishFromPublisher();
-
-			_electionsUnit.RepublishFromPublisher();
-			Assert.That(
-				_electionsUnit.Publisher.Messages.All(x => x is GrpcMessage.SendOverGrpc || x is TimerMessage.Schedule),
-				Is.True,
-				"Only OverGrpc or Schedule messages are expected.");
-
-			_electionsUnit.RepublishFromPublisher();
-
-			_electionsUnit.RepublishFromPublisher();
-			Assert.That(
-				_electionsUnit.Publisher.Messages.All(x => x is GrpcMessage.SendOverGrpc || x is TimerMessage.Schedule),
-				Is.True,
-				"Only OverGrpc or Schedule messages are expected.");
-
-			_electionsUnit.RepublishFromPublisher();
-		}
-
-		[Test]
-		public void elections_should_time_out() {
-			Assert.That(_electionsUnit.Publisher.Messages.ContainsSingle<ElectionMessage.ElectionsTimedOut>());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/GossipService/NodeGossipServiceTests.cs b/src/EventStore.Core.Tests/Services/GossipService/NodeGossipServiceTests.cs
deleted file mode 100644
index 4d396d763ee..00000000000
--- a/src/EventStore.Core.Tests/Services/GossipService/NodeGossipServiceTests.cs
+++ /dev/null
@@ -1,1115 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using EventStore.Common.Utils;
-using EventStore.Core.Cluster;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Gossip;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Services.ElectionsService;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.TransactionLog.Checkpoint;
-using FluentAssertions;
-using NUnit.Framework;
-using MemberInfo = EventStore.Core.Cluster.MemberInfo;
-
-namespace EventStore.Core.Tests.Services.GossipService {
-	public abstract class NodeGossipServiceTestFixture {
-		protected NodeGossipService SUT;
-		protected FakePublisher _bus;
-		protected VNodeInfo _currentNode;
-		protected VNodeInfo _nodeTwo;
-		protected VNodeInfo _nodeThree;
-		protected VNodeInfo _nodeFour;
-		protected ITimeProvider _timeProvider;
-		protected Func<MemberInfo[], MemberInfo> _getNodeToGossipTo;
-		protected IGossipSeedSource _gossipSeedSource;
-		protected TimeSpan _gossipInterval = TimeSpan.FromMilliseconds(1000);
-		private readonly TimeSpan _allowedTimeDifference = TimeSpan.FromMilliseconds(1000);
-		protected readonly TimeSpan _gossipTimeout = TimeSpan.FromMilliseconds(1000);
-		private readonly TimeSpan _deadMemberRemovalPeriod = TimeSpan.FromSeconds(1800);
-
-
-		public NodeGossipServiceTestFixture() {
-			_bus = new FakePublisher();
-			_timeProvider = new FakeTimeProvider();
-
-			_currentNode = new VNodeInfo(
-				Guid.Parse("00000000-0000-0000-0000-000000000001"), 1,
-				new IPEndPoint(IPAddress.Loopback, 1111),
-				new IPEndPoint(IPAddress.Loopback, 1111),
-				new IPEndPoint(IPAddress.Loopback, 1111),
-				new IPEndPoint(IPAddress.Loopback, 1111),
-				new IPEndPoint(IPAddress.Loopback, 1111), false);
-			_nodeTwo = new VNodeInfo(
-				Guid.Parse("00000000-0000-0000-0000-000000000002"), 2,
-				new IPEndPoint(IPAddress.Loopback, 2222),
-				new IPEndPoint(IPAddress.Loopback, 2222),
-				new IPEndPoint(IPAddress.Loopback, 2222),
-				new IPEndPoint(IPAddress.Loopback, 2222),
-				new IPEndPoint(IPAddress.Loopback, 2222), false);
-			_nodeThree = new VNodeInfo(
-				Guid.Parse("00000000-0000-0000-0000-000000000003"), 3,
-				new IPEndPoint(IPAddress.Loopback, 3333),
-				new IPEndPoint(IPAddress.Loopback, 3333),
-				new IPEndPoint(IPAddress.Loopback, 3333),
-				new IPEndPoint(IPAddress.Loopback, 3333),
-				new IPEndPoint(IPAddress.Loopback, 3333), false);
-			_nodeFour = new VNodeInfo(
-				Guid.Parse("00000000-0000-0000-0000-000000000004"), 4,
-				new IPEndPoint(IPAddress.Loopback, 4444),
-				new IPEndPoint(IPAddress.Loopback, 4444),
-				new IPEndPoint(IPAddress.Loopback, 4444),
-				new IPEndPoint(IPAddress.Loopback, 4444),
-				new IPEndPoint(IPAddress.Loopback, 4444), false);
-
-			_getNodeToGossipTo = infos => infos.First(x => Equals(x.HttpEndPoint, _nodeTwo.HttpEndPoint));
-			_gossipSeedSource = new KnownEndpointGossipSeedSource(new[]
-				{_currentNode.HttpEndPoint, _nodeTwo.HttpEndPoint, _nodeThree.HttpEndPoint});
-		}
-
-		[SetUp]
-		public void Setup() {
-			SUT = new NodeGossipService(_bus, 3, _gossipSeedSource, MemberInfoForVNode(_currentNode, DateTime.UtcNow),
-				new InMemoryCheckpoint(0), new InMemoryCheckpoint(0), new FakeEpochManager(), () => 0L, 0,
-				_gossipInterval, _allowedTimeDifference, _gossipTimeout, _deadMemberRemovalPeriod, _timeProvider, _getNodeToGossipTo);
-
-			foreach (var message in Given()) {
-				SUT.Handle((dynamic)message);
-			}
-
-			_bus.Messages.Clear();
-
-			var when = When();
-			if (when != null) {
-				SUT.Handle((dynamic)when);
-			}
-		}
-
-		protected virtual Message[] Given() => Array.Empty<Message>();
-
-		protected virtual Message When() => null;
-
-		protected void ExpectMessages(params Message[] expected) =>
-			_bus.Messages.Should().BeEquivalentTo(expected);
-
-		protected void ExpectNoMessages() =>
-			Assert.IsEmpty(_bus.Messages);
-
-		protected Message[] GivenSystemInitializedWithKnownGossipSeedSources(params Message[] additionalGivens) {
-			return new Message[] {
-				new SystemMessage.SystemInit(),
-				new GossipMessage.GotGossipSeedSources(new[]
-					{_currentNode.HttpEndPoint, _nodeTwo.HttpEndPoint, _nodeThree.HttpEndPoint})
-			}.Concat(additionalGivens).ToArray();
-		}
-
-		protected static MemberInfo MemberInfoForVNode(VNodeInfo nodeInfo, DateTime utcNow,
-			int? nodePriority = null, int? epochNumber = null, long? writerCheckpoint = null,
-			VNodeState nodeState = VNodeState.Initializing, string esVersion = VersionInfo.DefaultVersion, bool isAlive = true) {
-			return MemberInfo.ForVNode(nodeInfo.InstanceId, utcNow, nodeState, isAlive,
-				nodeInfo.InternalTcp, nodeInfo.InternalSecureTcp, nodeInfo.ExternalTcp,
-				nodeInfo.ExternalSecureTcp, nodeInfo.HttpEndPoint, null, 0, 0,
-				0, writerCheckpoint ?? 0, 0, -1, epochNumber ?? -1, Guid.Empty, nodePriority ?? 0, false, esVersion);
-		}
-
-		/// <summary>
-		/// The initial state for a node currently is represented as a Manager
-		/// </summary>
-		protected static MemberInfo InitialStateForVNode(VNodeInfo nodeInfo, DateTime utcNow, bool isAlive = true, string version = VersionInfo.UnknownVersion) {
-			return MemberInfo.ForManager(Guid.Empty, utcNow, isAlive, nodeInfo.HttpEndPoint, esVersion: version);
-		}
-	}
-
-	public class when_system_initializes : NodeGossipServiceTestFixture {
-		protected override Message[] Given() =>
-			Array.Empty<Message>();
-
-		protected override Message When() =>
-			new SystemMessage.SystemInit();
-
-		[Test]
-		public void should_get_gossip_sources() {
-			ExpectMessages(
-				new GossipMessage.GotGossipSeedSources(new[]
-					{_currentNode.HttpEndPoint, _nodeTwo.HttpEndPoint, _nodeThree.HttpEndPoint}));
-		}
-	}
-
-	public class when_system_initializes_twice : NodeGossipServiceTestFixture {
-		protected override Message[] Given() => new Message[] {
-			new SystemMessage.SystemInit()
-		};
-
-		protected override Message When() =>
-			new SystemMessage.SystemInit();
-
-		[Test]
-		public void should_ignore_system_init() {
-			ExpectNoMessages();
-		}
-	}
-
-	public class when_retrieving_gossip_seed_sources : NodeGossipServiceTestFixture {
-		protected override Message[] Given() => new Message[] {
-			new SystemMessage.SystemInit()
-		};
-
-		protected override Message When() =>
-			new GossipMessage.RetrieveGossipSeedSources();
-
-		[Test]
-		public void should_get_gossip_seeds() {
-			ExpectMessages(
-				new GossipMessage.GotGossipSeedSources(new[]
-					{_currentNode.HttpEndPoint, _nodeTwo.HttpEndPoint, _nodeThree.HttpEndPoint}));
-		}
-	}
-
-	public class when_retrieving_gossip_seed_sources_and_gossip_seed_source_throws : NodeGossipServiceTestFixture {
-		class ThrowingGossipSeedSource : IGossipSeedSource {
-			public IAsyncResult BeginGetHostEndpoints(AsyncCallback requestCallback, object state) {
-				throw new NotImplementedException();
-			}
-
-			public EndPoint[] EndGetHostEndpoints(IAsyncResult asyncResult) {
-				throw new NotImplementedException();
-			}
-		}
-
-		public when_retrieving_gossip_seed_sources_and_gossip_seed_source_throws() {
-			_gossipSeedSource = new ThrowingGossipSeedSource();
-		}
-
-		protected override Message[] Given() => new Message[] {
-			new SystemMessage.SystemInit()
-		};
-
-		protected override Message When() =>
-			new GossipMessage.RetrieveGossipSeedSources();
-
-		[Test]
-		public void should_schedule_retry_retrieve_gossip_seed_sources() {
-			ExpectMessages(
-				TimerMessage.Schedule.Create(GossipServiceBase.DnsRetryTimeout, _bus,
-					new GossipMessage.RetrieveGossipSeedSources()));
-		}
-	}
-
-	public class when_got_gossip_seed_sources : NodeGossipServiceTestFixture {
-		protected override Message[] Given() => new Message[] {
-			new SystemMessage.SystemInit()
-		};
-
-		protected override Message When() =>
-			new GossipMessage.GotGossipSeedSources(new[]
-				{_currentNode.HttpEndPoint, _nodeTwo.HttpEndPoint, _nodeThree.HttpEndPoint});
-
-		[Test]
-		public void should_start_gossiping_and_schedule_another_gossip() {
-			ExpectMessages(
-				new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint, new GossipMessage.SendGossip(new ClusterInfo(
-						MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-						InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow),
-						InitialStateForVNode(_nodeThree, _timeProvider.UtcNow)),
-					_currentNode.HttpEndPoint), _timeProvider.LocalTime.Add(_gossipTimeout)),
-				TimerMessage.Schedule.Create(GossipServiceBase.GossipStartupInterval, _bus,
-					new GossipMessage.Gossip(1)));
-		}
-	}
-
-	public class when_gossip : NodeGossipServiceTestFixture {
-		private int _gossipRound = GossipServiceBase.GossipRoundStartupThreshold + 1;
-
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources();
-
-		protected override Message When() =>
-			new GossipMessage.Gossip(_gossipRound);
-
-		[Test]
-		public void should_send_the_gossip_over_http_and_schedule_the_next_gossip() {
-			ExpectMessages(
-				new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint, new GossipMessage.SendGossip(new ClusterInfo(
-						MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-						InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow),
-						InitialStateForVNode(_nodeThree, _timeProvider.UtcNow)),
-					_currentNode.HttpEndPoint), _timeProvider.LocalTime.Add(_gossipTimeout)),
-				TimerMessage.Schedule.Create(_gossipInterval, _bus,
-					new GossipMessage.Gossip(++_gossipRound)));
-		}
-	}
-
-	public class when_gossip_and_no_node_is_selected_to_gossip_to : NodeGossipServiceTestFixture {
-		private int _gossipRound = GossipServiceBase.GossipRoundStartupThreshold + 1;
-
-		public when_gossip_and_no_node_is_selected_to_gossip_to() {
-			_getNodeToGossipTo = infos => null;
-		}
-
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources();
-
-		protected override Message When() =>
-			new GossipMessage.Gossip(_gossipRound);
-
-		[Test]
-		public void should_just_schedule_next_gossip() {
-			ExpectMessages(TimerMessage.Schedule.Create(_gossipInterval, _bus,
-				new GossipMessage.Gossip(_gossipRound)));
-		}
-	}
-
-	public class when_gossip_and_gossip_service_is_not_in_working_state : NodeGossipServiceTestFixture {
-		protected override Message[] Given() => Array.Empty<Message>();
-
-		protected override Message When() =>
-			new GossipMessage.Gossip(1);
-
-		[Test]
-		public void should_ignore_message() {
-			ExpectNoMessages();
-		}
-	}
-
-	public class when_gossip_and_gossip_round_less_than_startup_gossip_threshold : NodeGossipServiceTestFixture {
-		private int _gossipRound = new Random().Next(0, GossipServiceBase.GossipRoundStartupThreshold);
-
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources();
-
-		protected override Message When() =>
-			new GossipMessage.Gossip(_gossipRound);
-
-		[Test]
-		public void should_use_startup_gossip_interval() {
-			ExpectMessages(
-				new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint, new GossipMessage.SendGossip(new ClusterInfo(
-						MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-						InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow),
-						InitialStateForVNode(_nodeThree, _timeProvider.UtcNow)),
-					_currentNode.HttpEndPoint), _timeProvider.LocalTime.Add(_gossipTimeout)),
-				TimerMessage.Schedule.Create(GossipServiceBase.GossipStartupInterval, _bus,
-					new GossipMessage.Gossip(++_gossipRound)));
-		}
-	}
-
-	public class when_gossip_and_gossip_round_larger_than_startup_gossip_threshold : NodeGossipServiceTestFixture {
-		private int _gossipRound = new Random().Next(GossipServiceBase.GossipRoundStartupThreshold, int.MaxValue);
-
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources();
-
-		protected override Message When() =>
-			new GossipMessage.Gossip(_gossipRound);
-
-		[Test]
-		public void should_use_provided_gossip_interval_for_next_gossip() {
-			ExpectMessages(
-				new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint, new GossipMessage.SendGossip(new ClusterInfo(
-						MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-						InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow),
-						InitialStateForVNode(_nodeThree, _timeProvider.UtcNow)),
-					_currentNode.HttpEndPoint), _timeProvider.LocalTime.Add(_gossipTimeout)),
-				TimerMessage.Schedule.Create(_gossipInterval, _bus,
-					new GossipMessage.Gossip(++_gossipRound)));
-		}
-	}
-
-	public class when_gossip_received_with_older_timestamp_about_peer_node :
-		NodeGossipServiceTestFixture {
-		private readonly DateTime _timestamp = DateTime.Now;
-
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources(
-				new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-						MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-						MemberInfoForVNode(_nodeTwo, _timestamp),
-						MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow)),
-					_nodeTwo.HttpEndPoint)
-			);
-
-		protected override Message When() =>
-			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeTwo, _timestamp.AddMilliseconds(-1)),
-					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow)),
-				_nodeTwo.HttpEndPoint);
-
-		[Test]
-		public void should_accept_the_information_about_the_node_even_if_outdated() {
-			ExpectMessages(
-				new GossipMessage.GossipUpdated(new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeTwo, _timestamp.AddMilliseconds(-1)),
-					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow))));
-		}
-	}
-
-	public class if_gossip_reply_includes_es_version : NodeGossipServiceTestFixture {
-		private Message _capturedMessage;
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources();
-
-		protected override Message When() =>
-			new GossipMessage.GossipReceived(new CallbackEnvelope(CaptureGossipReply), new ClusterInfo(
-					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, epochNumber:  1, esVersion: "1.1.1.2"),
-					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.3")),
-				_nodeTwo.HttpEndPoint);
-
-		private ClusterInfo GetExpectedClusterInfo() {
-			return new ClusterInfo(MemberInfoForVNode(_currentNode, _timeProvider.UtcNow, esVersion: VersionInfo.DefaultVersion),
-				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.2"),
-				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.3"));
-		}
-
-		[Test]
-		public void gossip_update_must_have_es_version() {
-			//updated cluster info should have version info of currentNode, nodeTwo and nodeThree
-			ExpectMessages(new GossipMessage.GossipUpdated(GetExpectedClusterInfo()));
-			//gossip reply should have version info of currentNode, nodeTwo and nodeThree
-			_capturedMessage.Should().BeEquivalentTo(new GossipMessage.SendGossip(GetExpectedClusterInfo(), _currentNode.HttpEndPoint));
-		}
-
-		private void CaptureGossipReply(Message message) => _capturedMessage = message;
-	}
-
-	public class if_gossip_read_reply_includes_es_version : NodeGossipServiceTestFixture {
-		private Message _capturedMessage;
-
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources(new GossipMessage.GossipReceived(
-				new CallbackEnvelope(CaptureGossipReply), new ClusterInfo(
-					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.2"),
-					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.3")),
-				_nodeTwo.HttpEndPoint));
-
-		protected override Message When() =>
-			new GossipMessage.ReadGossip(new CallbackEnvelope(CaptureGossipReply));
-
-		private ClusterInfo GetExpectedClusterInfo() {
-			return new ClusterInfo(
-				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow, esVersion: VersionInfo.DefaultVersion),
-				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.2"),
-				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.3"));
-		}
-
-		[Test]
-		public void reply_should_have_version_info() {
-			_capturedMessage.Should()
-				.BeEquivalentTo(new GossipMessage.SendGossip(GetExpectedClusterInfo(), _currentNode.HttpEndPoint));
-		}
-
-		private void CaptureGossipReply(Message message) => _capturedMessage = message;
-	}
-
-	public class if_client_gossip_reply_includes_es_version : NodeGossipServiceTestFixture {
-		private Message _capturedMessage;
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources(new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, epochNumber:  1, esVersion: "1.1.1.2"),
-					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.3")),
-				_nodeTwo.HttpEndPoint));
-
-		protected override Message When() =>
-			new GossipMessage.ClientGossip(new CallbackEnvelope(CaptureGossipReply));
-
-		private ClientClusterInfo GetExpectedClusterInfo() {
-			return new ClientClusterInfo(new ClusterInfo(
-				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow, esVersion: VersionInfo.DefaultVersion),
-				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.2"),
-				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.3")), _currentNode.HttpEndPoint.GetHost(), _currentNode.HttpEndPoint.GetPort());
-		}
-
-		[Test]
-		public void reply_should_have_version_info() {
-			_capturedMessage.Should()
-				.BeEquivalentTo(new GossipMessage.SendClientGossip(GetExpectedClusterInfo()));
-		}
-
-		private void CaptureGossipReply(Message message) => _capturedMessage = message;
-	}
-
-	public class when_gossip_received_with_lower_epoch_number_about_peer_node :
-		NodeGossipServiceTestFixture {
-		private readonly int _epochNumber = new Random().Next();
-
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources(
-				new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-						MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-						MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, epochNumber: _epochNumber),
-						MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow)),
-					_nodeTwo.HttpEndPoint)
-			);
-
-		protected override Message When() =>
-			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, epochNumber: _epochNumber - 1),
-					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow)),
-				_nodeTwo.HttpEndPoint);
-
-		[Test]
-		public void should_accept_the_information_about_the_node_even_if_outdated() {
-			ExpectMessages(
-				new GossipMessage.GossipUpdated(new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, epochNumber: _epochNumber - 1),
-					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow))));
-		}
-	}
-
-	public class when_gossip_received_with_lower_writer_checkpoint_about_peer_node :
-		NodeGossipServiceTestFixture {
-		private readonly int _writerCheckpoint = new Random().Next();
-
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources(
-				new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-						MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-						MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, writerCheckpoint: _writerCheckpoint),
-						MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow)),
-					_nodeTwo.HttpEndPoint)
-			);
-
-		protected override Message When() =>
-			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, writerCheckpoint: _writerCheckpoint - 1),
-					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow)),
-				_nodeTwo.HttpEndPoint);
-
-		[Test]
-		public void should_accept_the_information_about_the_node_even_if_outdated() {
-			ExpectMessages(
-				new GossipMessage.GossipUpdated(new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, writerCheckpoint: _writerCheckpoint - 1),
-					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow))));
-		}
-	}
-
-	public class when_gossip_received_with_more_recent_timestamp_about_non_peer_node :
-		NodeGossipServiceTestFixture {
-		private readonly DateTime _timestamp = DateTime.Now;
-
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources(
-				new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-						MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-						MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
-						MemberInfoForVNode(_nodeThree, _timestamp)),
-					_nodeTwo.HttpEndPoint)
-			);
-
-		protected override Message When() =>
-			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeThree, _timestamp.AddMilliseconds(1))),
-				_nodeThree.HttpEndPoint);
-
-		[Test]
-		public void should_accept_the_information_if_its_more_recent() {
-			ExpectMessages(
-				new GossipMessage.GossipUpdated(new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeThree, _timestamp.AddMilliseconds(1)))));
-		}
-	}
-
-	public class when_gossip_received_with_higher_epoch_number_about_non_peer_node :
-		NodeGossipServiceTestFixture {
-		private readonly int _epochNumber = new Random().Next();
-
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources(
-				new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-						MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-						MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
-						MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: _epochNumber)),
-					_nodeTwo.HttpEndPoint)
-			);
-
-		protected override Message When() =>
-			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: _epochNumber + 1)),
-				_nodeTwo.HttpEndPoint);
-
-		[Test]
-		public void should_accept_the_information_if_its_more_recent() {
-			ExpectMessages(
-				new GossipMessage.GossipUpdated(new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: _epochNumber + 1))));
-		}
-	}
-
-	public class when_gossip_received_with_higher_writer_checkpoint_about_non_peer_node :
-		NodeGossipServiceTestFixture {
-		private readonly int _writerCheckpoint = new Random().Next();
-
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources(
-				new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-						MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-						MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
-						MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, writerCheckpoint: _writerCheckpoint)),
-					_nodeTwo.HttpEndPoint)
-			);
-
-		protected override Message When() =>
-			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, writerCheckpoint: _writerCheckpoint + 1)),
-				_nodeTwo.HttpEndPoint);
-
-		[Test]
-		public void should_accept_the_information_if_its_more_recent() {
-			ExpectMessages(
-				new GossipMessage.GossipUpdated(new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, writerCheckpoint: _writerCheckpoint + 1))));
-		}
-	}
-
-	public class when_state_changed_to_leader : NodeGossipServiceTestFixture {
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources(
-				new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-						MemberInfoForVNode(_currentNode, _timeProvider.UtcNow, nodeState: VNodeState.Initializing),
-						InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow),
-						InitialStateForVNode(_nodeThree, _timeProvider.UtcNow)),
-					_nodeTwo.HttpEndPoint)
-			);
-
-		protected override Message When() =>
-			new SystemMessage.BecomeLeader(Guid.NewGuid());
-
-		[Test]
-		public void should_update_gossip() {
-			ExpectMessages(
-				new GossipMessage.GossipUpdated(new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow, nodeState: VNodeState.Leader),
-					InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow),
-					InitialStateForVNode(_nodeThree, _timeProvider.UtcNow))));
-		}
-	}
-
-	public class when_state_changed_to_non_leader : NodeGossipServiceTestFixture {
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources(
-				new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow, nodeState: VNodeState.Initializing),
-					InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow),
-					InitialStateForVNode(_nodeThree, _timeProvider.UtcNow)), _nodeTwo.HttpEndPoint)
-			);
-
-		protected override Message When() =>
-			new SystemMessage.BecomeFollower(Guid.NewGuid(), MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow));
-
-		[Test]
-		public void should_update_gossip() {
-			ExpectMessages(
-				new GossipMessage.GossipUpdated(new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow, nodeState: VNodeState.Follower),
-					InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow),
-					InitialStateForVNode(_nodeThree, _timeProvider.UtcNow))));
-		}
-	}
-
-	public class when_gossip_send_failed : NodeGossipServiceTestFixture {
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources();
-
-		protected override Message When() =>
-			new GossipMessage.GossipSendFailed("failed", _nodeTwo.HttpEndPoint);
-
-		[Test]
-		public void should_mark_the_node_as_dead() {
-			ExpectMessages(
-				new GossipMessage.GossipUpdated(new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow, isAlive: false),
-					InitialStateForVNode(_nodeThree, _timeProvider.UtcNow))));
-		}
-	}
-
-	public class when_gossip_send_failed_to_a_dead_node : NodeGossipServiceTestFixture {
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources(
-				new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow, isAlive: false),
-					InitialStateForVNode(_nodeThree, _timeProvider.UtcNow)), _nodeTwo.HttpEndPoint)
-			);
-
-		protected override Message When() => new GossipMessage.GossipSendFailed("failed",
-			_nodeTwo.HttpEndPoint);
-
-		[Test]
-		public void should_ignore_message() {
-			ExpectNoMessages();
-		}
-	}
-
-	public class when_gossip_send_failed_to_the_current_leader_node : NodeGossipServiceTestFixture {
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources(
-				new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-						MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-						MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
-						MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, nodeState: VNodeState.Leader)),
-					_nodeTwo.HttpEndPoint),
-				new SystemMessage.BecomeFollower(Guid.NewGuid(), MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow))
-			);
-
-		protected override Message When() => new GossipMessage.GossipSendFailed("failed",
-			_nodeTwo.HttpEndPoint);
-
-		[Test]
-		public void should_ignore_message_and_wait_for_tcp_to_decide() {
-			ExpectNoMessages();
-		}
-	}
-
-	public class when_vnode_connection_lost : NodeGossipServiceTestFixture {
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources(
-				new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow),
-					InitialStateForVNode(_nodeThree, _timeProvider.UtcNow)), _nodeTwo.HttpEndPoint)
-			);
-
-		protected override Message When() =>
-			new SystemMessage.VNodeConnectionLost(_currentNode.HttpEndPoint, Guid.NewGuid());
-
-		[Test]
-		public void should_issue_get_gossip() {
-			ExpectMessages(
-				new GrpcMessage.SendOverGrpc(_currentNode.HttpEndPoint, new GossipMessage.GetGossip(),
-					_timeProvider.LocalTime.Add(_gossipTimeout)));
-		}
-	}
-
-	public class when_vnode_connection_lost_to_dead_node : NodeGossipServiceTestFixture {
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources(
-				new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow, isAlive: false),
-					InitialStateForVNode(_nodeThree, _timeProvider.UtcNow)), _nodeTwo.HttpEndPoint)
-			);
-
-		protected override Message When() =>
-			new SystemMessage.VNodeConnectionLost(_nodeTwo.HttpEndPoint, Guid.NewGuid());
-
-		[Test]
-		public void should_ignore_message() {
-			ExpectNoMessages();
-		}
-	}
-
-	public class when_get_gossip_received_with_more_recent_timestamp_about_non_peer_node :
-		NodeGossipServiceTestFixture {
-		private readonly DateTime _timestamp = DateTime.Now;
-
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources(
-				new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-						MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-						MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
-						MemberInfoForVNode(_nodeThree, _timestamp)),
-					_nodeTwo.HttpEndPoint)
-			);
-
-		protected override Message When() =>
-			new GossipMessage.GetGossipReceived(new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeThree, _timestamp.AddMilliseconds(1))),
-				_nodeThree.HttpEndPoint);
-
-		[Test]
-		public void should_accept_the_information_if_its_more_recent() {
-			ExpectMessages(
-				new GossipMessage.GossipUpdated(new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeThree, _timestamp.AddMilliseconds(1)))));
-		}
-	}
-
-	public class when_get_gossip_received_with_higher_epoch_number_about_non_peer_node :
-		NodeGossipServiceTestFixture {
-		private readonly int _epochNumber = new Random().Next();
-
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources(
-				new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-						MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-						MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
-						MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: _epochNumber)),
-					_nodeTwo.HttpEndPoint)
-			);
-
-		protected override Message When() =>
-			new GossipMessage.GetGossipReceived(new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: _epochNumber + 1)),
-				_nodeTwo.HttpEndPoint);
-
-		[Test]
-		public void should_accept_the_information_if_its_more_recent() {
-			ExpectMessages(
-				new GossipMessage.GossipUpdated(new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: _epochNumber + 1))));
-		}
-	}
-
-	public class when_get_gossip_received_with_higher_writer_checkpoint_about_non_peer_node :
-		NodeGossipServiceTestFixture {
-		private readonly int _writerCheckpoint = new Random().Next();
-
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources(
-				new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-						MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-						MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
-						MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow,
-							writerCheckpoint: _writerCheckpoint)),
-					_nodeTwo.HttpEndPoint)
-			);
-
-		protected override Message When() =>
-			new GossipMessage.GetGossipReceived(new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow,
-						writerCheckpoint: _writerCheckpoint + 1)),
-				_nodeTwo.HttpEndPoint);
-
-		[Test]
-		public void should_accept_the_information_if_its_more_recent() {
-			ExpectMessages(
-				new GossipMessage.GossipUpdated(new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
-					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow,
-						writerCheckpoint: _writerCheckpoint + 1))));
-		}
-	}
-
-	public class
-		when_get_gossip_received_and_gossip_service_is_not_in_working_state : NodeGossipServiceTestFixture {
-		protected override Message[] Given() => Array.Empty<Message>();
-
-		protected override Message When() =>
-			new GossipMessage.GetGossipReceived(new ClusterInfo(), _nodeTwo.HttpEndPoint);
-
-		[Test]
-		public void should_ignore_message() {
-			ExpectNoMessages();
-		}
-	}
-
-	public class
-		when_get_gossip_failed_and_gossip_service_is_not_in_working_state : NodeGossipServiceTestFixture {
-		protected override Message[] Given() => Array.Empty<Message>();
-
-		protected override Message When() =>
-			new GossipMessage.GetGossipFailed("failed", _nodeTwo.HttpEndPoint);
-
-		[Test]
-		public void should_ignore_message() {
-			ExpectNoMessages();
-		}
-	}
-
-	public class when_get_gossip_failed : NodeGossipServiceTestFixture {
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources(
-				new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-						MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-						InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow, isAlive: true),
-						InitialStateForVNode(_nodeThree, _timeProvider.UtcNow)),
-					_currentNode.HttpEndPoint)
-			);
-
-		protected override Message When() =>
-			new GossipMessage.GetGossipFailed("failed", _nodeTwo.HttpEndPoint);
-
-		[Test]
-		public void should_mark_node_as_dead() {
-			ExpectMessages(
-				new GossipMessage.GossipUpdated(new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow, isAlive: false),
-					InitialStateForVNode(_nodeThree, _timeProvider.UtcNow))));
-		}
-	}
-
-	public class when_vnode_connection_established : NodeGossipServiceTestFixture {
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources(
-				new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-						MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-						InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow, isAlive: false),
-						InitialStateForVNode(_nodeThree, _timeProvider.UtcNow)),
-					_currentNode.HttpEndPoint)
-			);
-
-		protected override Message When() =>
-			new SystemMessage.VNodeConnectionEstablished(_nodeTwo.HttpEndPoint, Guid.NewGuid());
-
-		[Test]
-		public void should_mark_node_as_alive() {
-			ExpectMessages(
-				new GossipMessage.GossipUpdated(new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-					InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow, isAlive: true),
-					InitialStateForVNode(_nodeThree, _timeProvider.UtcNow))
-				));
-		}
-	}
-
-	public class when_elections_are_done : NodeGossipServiceTestFixture {
-		protected override Message[] Given() =>
-			GivenSystemInitializedWithKnownGossipSeedSources(
-				new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
-						MemberInfoForVNode(_currentNode, _timeProvider.UtcNow,
-							nodeState: VNodeState.Initializing),
-						MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, nodeState: VNodeState.Initializing),
-						MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow,
-							nodeState: VNodeState.Initializing)),
-					_nodeTwo.HttpEndPoint)
-			);
-
-		protected override Message When() =>
-			new ElectionMessage.ElectionsDone(0,0,
-				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, nodeState: VNodeState.Leader));
-
-		[Test]
-		public void should_set_leader_node_and_other_nodes_to_unknown() {
-			ExpectMessages(
-				new GossipMessage.GossipUpdated(new ClusterInfo(
-					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow, nodeState: VNodeState.Unknown),
-					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, nodeState: VNodeState.Leader),
-					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, nodeState: VNodeState.Unknown))));
-		}
-	}
-
-	public class when_updating_node_priority : NodeGossipServiceTestFixture {
-		private readonly int _nodePriority = new Random().Next();
-		protected override Message[] Given() => GivenSystemInitializedWithKnownGossipSeedSources();
-
-		protected override Message When() {
-			return new GossipMessage.UpdateNodePriority(_nodePriority);
-		}
-
-		[Test]
-		public void should_set_node_priority() {
-			var clusterInfo = new ClusterInfo(
-				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
-				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
-				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow));
-
-			SUT.Handle(new GossipMessage.GossipReceived(new NoopEnvelope(), clusterInfo,
-				_nodeTwo.HttpEndPoint));
-			var memberInfo = _bus.Messages.OfType<GossipMessage.GossipUpdated>().First().ClusterInfo.Members
-				.First(x => x.InstanceId == _currentNode.InstanceId);
-			Assert.AreEqual(memberInfo.NodePriority, _nodePriority);
-		}
-	}
-
-	public class when_updating_cluster {
-		private static MemberInfo TestNodeFor(int identifier, bool isAlive, DateTime timeStamp) {
-			var ipEndpoint = new IPEndPoint(IPAddress.Loopback, identifier);
-			return MemberInfo.ForVNode(Guid.NewGuid(), timeStamp, VNodeState.Initializing, isAlive,
-				ipEndpoint, ipEndpoint, ipEndpoint, ipEndpoint, ipEndpoint, null, 0, 0,
-				0, 0, 0, -1, -1, Guid.Empty, 0, false);
-		}
-
-		private static object[] AllowedNodeRemovalStates => DeadNodeRemoval.AllowedNodeRemovalStates;
-		private static object[] DisallowedNodeRemovalStates => DeadNodeRemoval.DisallowedNodeRemovalStates;
-
-		[Test]
-		[TestCaseSource(nameof(AllowedNodeRemovalStates))]
-		public void
-			should_remove_dead_members_which_have_timestamps_older_than_the_allowed_dead_member_removal_timeout(VNodeState currentRole) {
-			var timeProvider = new FakeTimeProvider();
-			var deadMemberRemovalTimeout = TimeSpan.FromSeconds(1);
-
-			var nodeToBeRemoved =
-				TestNodeFor(2, isAlive: false, timeProvider.UtcNow.Subtract(deadMemberRemovalTimeout));
-
-			var updatedCluster = GossipServiceBase.UpdateCluster(new ClusterInfo(
-					TestNodeFor(1, isAlive: false, timeProvider.UtcNow),
-					nodeToBeRemoved,
-					TestNodeFor(3, isAlive: false, timeProvider.UtcNow)), info => info,
-				timeProvider, deadMemberRemovalTimeout, currentRole);
-
-			Assert.That(updatedCluster.Members, Has.Length.EqualTo(2));
-			Assert.IsFalse(updatedCluster.Members.Any(x => x.Is(nodeToBeRemoved.HttpEndPoint)));
-		}
-
-		[Test]
-		[TestCaseSource(nameof(AllowedNodeRemovalStates))]
-		public void
-			should_not_remove_alive_members_which_have_timestamps_older_than_the_allowed_dead_member_removal_timeout(VNodeState currentRole) {
-			var timeProvider = new FakeTimeProvider();
-			var deadMemberRemovalTimeout = TimeSpan.FromSeconds(1);
-
-			var nodeToNotBeRemoved =
-				TestNodeFor(2, isAlive: true, timeProvider.UtcNow.Subtract(deadMemberRemovalTimeout));
-
-			var updatedCluster = GossipServiceBase.UpdateCluster(new ClusterInfo(
-					TestNodeFor(1, isAlive: false, timeProvider.UtcNow),
-					nodeToNotBeRemoved,
-					TestNodeFor(3, isAlive: false, timeProvider.UtcNow)), info => info,
-				timeProvider, deadMemberRemovalTimeout, currentRole);
-
-			Assert.That(updatedCluster.Members, Has.Length.EqualTo(3));
-			Assert.IsTrue(updatedCluster.Members.Any(x => x.Is(nodeToNotBeRemoved.HttpEndPoint)));
-		}
-
-		[Test]
-		[TestCaseSource(nameof(DisallowedNodeRemovalStates))]
-		public void
-			should_not_remove_dead_members_which_have_timestamps_older_than_the_allowed_dead_member_removal_timeout_and_the_current_role_is_unknown(VNodeState currentRole) {
-			var timeProvider = new FakeTimeProvider();
-			var deadMemberRemovalTimeout = TimeSpan.FromSeconds(1);
-
-			var nodeToNotBeRemoved =
-				TestNodeFor(2, isAlive: false, timeProvider.UtcNow.Subtract(deadMemberRemovalTimeout));
-
-			var updatedCluster = GossipServiceBase.UpdateCluster(new ClusterInfo(
-					TestNodeFor(1, isAlive: false, timeProvider.UtcNow),
-					nodeToNotBeRemoved,
-					TestNodeFor(3, isAlive: false, timeProvider.UtcNow)), info => info,
-				timeProvider, deadMemberRemovalTimeout, currentRole);
-
-			Assert.That(updatedCluster.Members, Has.Length.EqualTo(3));
-			Assert.IsTrue(updatedCluster.Members.Any(x => x.Is(nodeToNotBeRemoved.HttpEndPoint)));
-		}
-	}
-
-	public class when_merging_clusters {
-		private static MemberInfo TestNodeFor(int identifier, bool isAlive, DateTime timeStamp, VNodeState nodeState) {
-			var ipEndpoint = new IPEndPoint(IPAddress.Loopback, identifier);
-			return MemberInfo.ForVNode(Guid.NewGuid(), timeStamp, nodeState, isAlive,
-				ipEndpoint, ipEndpoint, ipEndpoint, ipEndpoint, ipEndpoint, null, 0, 0,
-				0, 0, 0, -1, -1, Guid.Empty, 0, false);
-		}
-
-		private static object[] AllowedNodeRemovalStates => DeadNodeRemoval.AllowedNodeRemovalStates;
-		private static object[] DisallowedNodeRemovalStates => DeadNodeRemoval.DisallowedNodeRemovalStates;
-
-		[Test]
-		[TestCaseSource(nameof(AllowedNodeRemovalStates))]
-		public void
-			should_remove_dead_members_which_have_timestamps_older_than_the_allowed_dead_member_removal_timeout(VNodeState currentRole) {
-			var timeProvider = new FakeTimeProvider();
-			var deadMemberRemovalTimeout = TimeSpan.FromSeconds(1);
-			var allowedTimeDifference = TimeSpan.FromMilliseconds(1000);
-
-			var me = TestNodeFor(1, isAlive: false, timeProvider.UtcNow, currentRole);
-			var nodeToBeRemoved =
-				TestNodeFor(2, isAlive: false, timeProvider.UtcNow.Subtract(deadMemberRemovalTimeout), VNodeState.Initializing);
-			var peer = TestNodeFor(3, isAlive: false, timeProvider.UtcNow, VNodeState.Initializing);
-			var cluster = new ClusterInfo(me, nodeToBeRemoved, peer);
-
-			var updatedCluster = GossipServiceBase.MergeClusters(
-				cluster, cluster, me.HttpEndPoint,
-				info => info, timeProvider.UtcNow, me, peer.InstanceId,
-				allowedTimeDifference, deadMemberRemovalTimeout);
-
-			Assert.That(updatedCluster.Members, Has.Length.EqualTo(2));
-			Assert.IsFalse(updatedCluster.Members.Any(x => x.Is(nodeToBeRemoved.HttpEndPoint)));
-		}
-
-		[Test]
-		[TestCaseSource(nameof(AllowedNodeRemovalStates))]
-		public void
-			should_not_remove_alive_members_which_have_timestamps_older_than_the_allowed_dead_member_removal_timeout(VNodeState currentRole) {
-			var timeProvider = new FakeTimeProvider();
-			var deadMemberRemovalTimeout = TimeSpan.FromSeconds(1);
-			var allowedTimeDifference = TimeSpan.FromMilliseconds(1000);
-
-			var me = TestNodeFor(1, isAlive: true, timeProvider.UtcNow, currentRole);
-			var nodeToBeRemoved = TestNodeFor(2, isAlive: true, timeProvider.UtcNow.Subtract(deadMemberRemovalTimeout), VNodeState.Initializing);
-			var peer = TestNodeFor(3, isAlive: true, timeProvider.UtcNow, VNodeState.Initializing);
-			var cluster = new ClusterInfo(me, nodeToBeRemoved, peer);
-
-			var updatedCluster = GossipServiceBase.MergeClusters(
-				cluster, cluster, me.HttpEndPoint,
-				info => info, timeProvider.UtcNow, me, peer.InstanceId,
-				allowedTimeDifference, deadMemberRemovalTimeout);
-
-			Assert.That(updatedCluster.Members, Has.Length.EqualTo(3));
-			Assert.IsTrue(updatedCluster.Members.Any(x => x.Is(nodeToBeRemoved.HttpEndPoint)));
-		}
-
-		[Test]
-		[TestCaseSource(nameof(DisallowedNodeRemovalStates))]
-		public void
-			should_not_remove_dead_members_which_have_timestamps_older_than_the_allowed_dead_member_removal_timeout_and_current_role_is_unknown(
-				VNodeState currentRole) {
-			var timeProvider = new FakeTimeProvider();
-			var deadMemberRemovalTimeout = TimeSpan.FromSeconds(1);
-			var allowedTimeDifference = TimeSpan.FromMilliseconds(1000);
-
-			var me = TestNodeFor(1, isAlive: false, timeProvider.UtcNow, currentRole);
-			var nodeToBeRemoved =
-				TestNodeFor(2, isAlive: false, timeProvider.UtcNow.Subtract(deadMemberRemovalTimeout),
-					VNodeState.Initializing);
-			var peer = TestNodeFor(3, isAlive: false, timeProvider.UtcNow, VNodeState.Initializing);
-			var cluster = new ClusterInfo(me, nodeToBeRemoved, peer);
-
-			var updatedCluster = GossipServiceBase.MergeClusters(
-				cluster, cluster, me.HttpEndPoint,
-				info => info, timeProvider.UtcNow, me, peer.InstanceId,
-				allowedTimeDifference, deadMemberRemovalTimeout);
-
-			Assert.That(updatedCluster.Members, Has.Length.EqualTo(3));
-			Assert.IsTrue(updatedCluster.Members.Any(x => x.Is(nodeToBeRemoved.HttpEndPoint)));
-		}
-	}
-
-	public class DeadNodeRemoval {
-		public static readonly object[] DisallowedNodeRemovalStates = {
-			new object[] {VNodeState.Initializing},
-			new object[] {VNodeState.DiscoverLeader},
-			new object[] {VNodeState.Unknown},
-			new object[] {VNodeState.ReadOnlyLeaderless}
-		};
-		public static readonly object[] AllowedNodeRemovalStates = {
-			new object[] {VNodeState.PreReplica},
-			new object[] {VNodeState.CatchingUp},
-			new object[] {VNodeState.Clone},
-			new object[] {VNodeState.Follower},
-			new object[] {VNodeState.PreLeader},
-			new object[] {VNodeState.Leader},
-			new object[] {VNodeState.ShuttingDown},
-			new object[] {VNodeState.Shutdown},
-			new object[] {VNodeState.PreReadOnlyReplica},
-			new object[] {VNodeState.ReadOnlyReplica},
-			new object[] {VNodeState.ResigningLeader},
-		};
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/GossipService/gossip_service_should.cs b/src/EventStore.Core.Tests/Services/GossipService/gossip_service_should.cs
deleted file mode 100644
index 3ebb3cfb5be..00000000000
--- a/src/EventStore.Core.Tests/Services/GossipService/gossip_service_should.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-namespace EventStore.Core.Tests.Services.GossipService {
-	class gossip_service_should {
-		//[Test]
-		//public void UpdateListOfKnownBoxesAndSendMergedInformationBackWhenRequestForKnownBoxesReceived()
-		//{
-		//    var now = DateTime.UtcNow;
-
-		//    var boxAOld = new BoxInfo("box_A", now.AddMinutes(-5));
-		//    var boxANew = new BoxInfo("box_A", now.AddMinutes(-1));
-
-		//    var boxB = new BoxInfo("box_B", now.AddMinutes(-7));
-		//    var boxC = new BoxInfo("box_C", now.AddMinutes(-2));
-
-		//    var boxDOld = new BoxInfo("box_D", now.AddMinutes(-10));
-		//    var boxDNew = new BoxInfo("box_D", now.AddMinutes(-3));
-
-		//    var boxE = new BoxInfo("box_E", now.AddMinutes(-2));
-
-		//    var initialKnownBoxes = new List<BoxInfo> { boxAOld, boxDNew, boxE };
-		//    Announcements.BoxData.KnownBoxes.AddRange(initialKnownBoxes);
-
-		//    var externalNodeKnownBoxes = new List<BoxInfo> { boxANew, boxB, boxC, boxDOld };
-		//    Publish(new BoxMessage.BoxesInformationRequest(externalNodeKnownBoxes));
-
-		//    var genericMessage = BoxMessenger.Messages.Last();
-		//    var responseWithUpdatedListofKnownBoxes = (BoxMessage.BoxesInformationResponse)genericMessage;
-
-		//    var expectedBoxes = new List<BoxInfo> { boxANew, boxB, boxC, boxDNew, boxE };
-		//    CollectionAssert.AreEquivalent(expectedBoxes, responseWithUpdatedListofKnownBoxes.Boxes);
-		//}
-
-		//[Test]
-		//public void UpdateListOfKnownBoxesWhenResponseForAnnouncementReceived()
-		//{
-		//    var now = DateTime.UtcNow;
-
-		//    var boxAOld = new BoxInfo("box_A", now.AddMinutes(-5));
-		//    var boxANew = new BoxInfo("box_A", now.AddMinutes(-1));
-
-		//    var boxB = new BoxInfo("box_B", now.AddMinutes(-7));
-		//    var boxC = new BoxInfo("box_C", now.AddMinutes(-2));
-
-		//    var boxDOld = new BoxInfo("box_D", now.AddMinutes(-10));
-		//    var boxDNew = new BoxInfo("box_D", now.AddMinutes(-3));
-
-		//    var boxE = new BoxInfo("box_E", now.AddMinutes(-2));
-
-
-		//    var initialKnownBoxes = new List<BoxInfo> { boxAOld, boxDNew, boxE };
-		//    Announcements.BoxData.KnownBoxes.AddRange(initialKnownBoxes);
-
-		//    var externalNodeKnownBoxes = new List<BoxInfo> { boxANew, boxB, boxC, boxDOld };
-		//    Publish(new BoxMessage.BoxesInformationRequest(externalNodeKnownBoxes));
-
-		//    var expectedBoxes = new List<BoxInfo> { boxANew, boxB, boxC, boxDNew, boxE };
-
-		//    CollectionAssert.AreEquivalent(expectedBoxes, Announcements.BoxData.KnownBoxes);
-		//}
-
-		//[Test]
-		//public void UpdateListOfKnownBoxesWhenBoxesInformationResponseMessageReceived()
-		//{
-		//    var currentlyKnownBoxes = new List<BoxInfo>
-		//                                  {
-		//                                      new BoxInfo("box_A", DateTime.UtcNow.AddMinutes(-5)),
-		//                                      new BoxInfo("box_B", DateTime.UtcNow.AddMinutes(-7))
-		//                                  };
-		//    var receivedKnownBoxes = new List<BoxInfo>
-		//                                  {
-		//                                      new BoxInfo("box_A", DateTime.UtcNow.AddMinutes(-1)),
-		//                                      new BoxInfo("box_B", DateTime.UtcNow.AddMinutes(-3)),
-		//                                      new BoxInfo("box_C", DateTime.UtcNow.AddMinutes(-5))
-		//                                  };
-
-		//    Announcements.BoxData.KnownBoxes.AddRange(currentlyKnownBoxes);
-
-		//    Publish(new BoxMessage.BoxesInformationResponse(receivedKnownBoxes));
-
-		//    CollectionAssert.AreEquivalent(receivedKnownBoxes, Announcements.BoxData.KnownBoxes);
-		//}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/IndexCommitter/when_constructing_index_committer_service.cs b/src/EventStore.Core.Tests/Services/IndexCommitter/when_constructing_index_committer_service.cs
deleted file mode 100644
index fee0abd8f62..00000000000
--- a/src/EventStore.Core.Tests/Services/IndexCommitter/when_constructing_index_committer_service.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Index;
-using EventStore.Core.Services.Storage;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Services.Storage;
-using EventStore.Core.TransactionLog.Checkpoint;
-using NUnit.Framework;
-// ReSharper disable ObjectCreationAsStatement
-
-namespace EventStore.Core.Tests.Services.IndexCommitter {
-	[TestFixture]
-	public class when_creating_index_committer_service {
-		protected ICheckpoint ReplicationCheckpoint = new InMemoryCheckpoint(0);
-		protected ICheckpoint WriterCheckpoint = new InMemoryCheckpoint(0);
-		protected IPublisher Publisher = new FakePublisher();
-		protected FakeIndexCommitter<string> IndexCommitter = new();
-		protected ITableIndex TableIndex = new FakeTableIndex<string>();
-		private readonly QueueStatsManager _queueStatsManager = new();
-
-		[Test]
-		public void null_index_committer_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => new IndexCommitterService<string>(null, Publisher,
-				 WriterCheckpoint, ReplicationCheckpoint, TableIndex, _queueStatsManager));
-		}
-
-		[Test]
-		public void null_publisher_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => new IndexCommitterService<string>(IndexCommitter, null,
-				 WriterCheckpoint, ReplicationCheckpoint, TableIndex, _queueStatsManager));
-		}
-
-		[Test]
-		public void null_writer_checkpoint_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => new IndexCommitterService<string>(IndexCommitter, Publisher,
-				 null, ReplicationCheckpoint, TableIndex, _queueStatsManager));
-		}
-		[Test]
-		public void null_replication_checkpoint_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => new IndexCommitterService<string>(IndexCommitter, Publisher,
-				 WriterCheckpoint, null, TableIndex, _queueStatsManager));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/IndexCommitter/when_index_commiter_service_receives_replicated_to_prepare_post_position.cs b/src/EventStore.Core.Tests/Services/IndexCommitter/when_index_commiter_service_receives_replicated_to_prepare_post_position.cs
deleted file mode 100644
index 5322e76deb2..00000000000
--- a/src/EventStore.Core.Tests/Services/IndexCommitter/when_index_commiter_service_receives_replicated_to_prepare_post_position.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using EventStore.Core.TransactionLog.Checkpoint;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.IndexCommitter {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_index_committer_service_receives_replicated_to_prepare_post_position<TLogFormat, TStreamId> : with_index_committer_service<TLogFormat, TStreamId> {
-		private readonly Guid _correlationId = Guid.NewGuid();
-		private readonly long _logPrePosition = 4000;
-		private readonly long _logPostPosition = 4001;
-
-		public override void TestFixtureSetUp() {
-			ReplicationCheckpoint = new InMemoryCheckpoint(0);
-			base.TestFixtureSetUp();
-		}
-		public override void Given() { }
-		public override void When() {
-
-			AddPendingPrepare(_logPrePosition, _logPostPosition);
-			Service.Handle(new StorageMessage.CommitAck(_correlationId, _logPrePosition, _logPrePosition, 0, 0));
-			ReplicationCheckpoint.Write(_logPostPosition);
-			ReplicationCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.ReplicatedTo(_logPostPosition));
-		}
-
-		[Test]
-		public void commit_replicated_message_should_have_been_published() {
-			AssertEx.IsOrBecomesTrue(() => 1 == CommitReplicatedMgs.Count);
-			Assert.True(CommitReplicatedMgs.TryDequeue(out var msg));
-			Assert.AreEqual(_logPrePosition, msg.TransactionPosition);
-		}
-		[Test]
-		public void index_written_message_should_have_been_published() {
-			AssertEx.IsOrBecomesTrue(() => 1 == IndexWrittenMgs.Count);
-			Assert.True(IndexWrittenMgs.TryDequeue(out var msg));
-			Assert.AreEqual(_logPrePosition, msg.LogPosition);
-		}
-		[Test]
-		public void index_should_have_been_updated() {
-			AssertEx.IsOrBecomesTrue(() => 1 == IndexCommitter.CommittedPrepares.Count);
-			Assert.True(IndexCommitter.CommittedPrepares.TryDequeue(out var msg));
-			Assert.AreEqual(_logPrePosition, msg.LogPosition);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_duplicate_commit_acks.cs b/src/EventStore.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_duplicate_commit_acks.cs
deleted file mode 100644
index b92bb7fb7cf..00000000000
--- a/src/EventStore.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_duplicate_commit_acks.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.IndexCommitter {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class  when_index_committer_service_receives_duplicate_commit_acks<TLogFormat, TStreamId> : with_index_committer_service<TLogFormat, TStreamId> {
-		private readonly long _logPosition = 4000;
-		private readonly Guid _correlationId = Guid.NewGuid();
-		public override void Given() { }
-		public override void When() {
-			AddPendingPrepare(_logPosition);
-
-			Service.Handle(new StorageMessage.CommitAck(_correlationId, _logPosition, _logPosition, 0, 0));
-			Service.Handle(new StorageMessage.CommitAck(_correlationId, _logPosition, _logPosition, 0, 0));
-			Service.Handle(new ReplicationTrackingMessage.ReplicatedTo( _logPosition));
-		}
-
-		[Test]
-		public void commit_replicated_message_should_not_be_sent() {
-			Assert.AreEqual(0, CommitReplicatedMgs.Count);
-		}
-		[Test]
-		public void index_written_message_should_not_have_been_published() {
-			Assert.AreEqual(0, IndexWrittenMgs.Count);
-		}
-		[Test]
-		public void index_should_not_have_been_updated() {
-			Assert.AreEqual(0, IndexCommitter.CommittedPrepares.Count);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_multiple_acks_for_different_positions.cs b/src/EventStore.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_multiple_acks_for_different_positions.cs
deleted file mode 100644
index 6592117730d..00000000000
--- a/src/EventStore.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_multiple_acks_for_different_positions.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.IndexCommitter {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_index_committer_service_receives_multiple_acks_for_different_positions<TLogFormat, TStreamId> : with_index_committer_service<TLogFormat, TStreamId> {
-
-		private readonly long _logPositionP1 = 1000;
-		private readonly long _logPositionP2 = 2000;
-		private readonly long _logPositionP3 = 3000;
-		private readonly long _logPositionCommit1 = 3100;
-		private readonly long _logPositionCommit2 = 3200;
-		private readonly long _logPositionCommit3 = 3300;
-
-		public override void Given() {
-
-			AddPendingPrepare(_logPositionP1);
-			AddPendingPrepare(_logPositionP2);
-			AddPendingPrepare(_logPositionP3);
-
-			Service.Handle(new StorageMessage.CommitAck(Guid.NewGuid(), _logPositionCommit1, _logPositionP1, 0, 0));
-			Service.Handle(new StorageMessage.CommitAck(Guid.NewGuid(), _logPositionCommit2, _logPositionP2, 0, 0));
-			Service.Handle(new StorageMessage.CommitAck(Guid.NewGuid(), _logPositionCommit3, _logPositionP3, 0, 0));
-		}
-
-		public override void When() {
-			// Reach quorum for middle commit
-			ReplicationCheckpoint.Write(_logPositionCommit2 + 1);
-			ReplicationCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.ReplicatedTo(_logPositionCommit2 + 1));
-
-		}
-
-		[Test]
-		public void commit_replicated_message_should_have_been_published_for_first_two_events() {
-			AssertEx.IsOrBecomesTrue(() => 2 == CommitReplicatedMgs.Count);
-			Assert.True(CommitReplicatedMgs.TryDequeue(out var msg));
-			Assert.AreEqual(_logPositionP1, msg.TransactionPosition);
-			Assert.True(CommitReplicatedMgs.TryDequeue(out msg));
-			Assert.AreEqual(_logPositionP2, msg.TransactionPosition);
-		}
-		[Test]
-		public void index_written_message_should_have_been_published_for_first_two_events() {
-			AssertEx.IsOrBecomesTrue(() => 2 == IndexWrittenMgs.Count);
-			Assert.True(IndexWrittenMgs.TryDequeue(out var msg));
-			Assert.AreEqual(_logPositionCommit1, msg.LogPosition);
-			Assert.True(IndexWrittenMgs.TryDequeue(out msg));
-			Assert.AreEqual(_logPositionCommit2, msg.LogPosition);
-		}
-
-		[Test]
-		public void index_should_have_been_updated() {
-			AssertEx.IsOrBecomesTrue(() => 2 == IndexCommitter.CommittedPrepares.Count);
-			Assert.True(IndexCommitter.CommittedPrepares.TryDequeue(out var msg));
-			Assert.AreEqual(_logPositionP1, msg.LogPosition);
-			Assert.True(IndexCommitter.CommittedPrepares.TryDequeue(out msg));
-			Assert.AreEqual(_logPositionP2, msg.LogPosition);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_multiple_acks_for_different_positions_out_of_order.cs b/src/EventStore.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_multiple_acks_for_different_positions_out_of_order.cs
deleted file mode 100644
index cf851b1c614..00000000000
--- a/src/EventStore.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_multiple_acks_for_different_positions_out_of_order.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.IndexCommitter {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_index_committer_service_receives_multiple_acks_for_different_positions_out_of_order<TLogFormat, TStreamId>
-		: with_index_committer_service<TLogFormat, TStreamId> {
-
-		private readonly Guid _correlationId1 = Guid.NewGuid();
-		private readonly Guid _correlationId2 = Guid.NewGuid();
-
-		private readonly long _logPosition1 = 1000;
-		private readonly long _logPosition2 = 2000;
-		private readonly long _logPosition3 = 3000;
-		private readonly long _logPosition4 = 4000;
-
-		public override void Given() { }
-
-		public override void When() {
-
-
-			AddPendingPrepare(_logPosition2);
-			AddPendingPrepare(_logPosition1);
-			Service.Handle(new StorageMessage.CommitAck(_correlationId2, _logPosition4, _logPosition2, 0, 0));
-			Service.Handle(new StorageMessage.CommitAck(_correlationId1, _logPosition3, _logPosition1, 0, 0));
-
-				
-			ReplicationCheckpoint.Write(_logPosition4 + 1);
-			ReplicationCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.ReplicatedTo(_logPosition4 + 1));
-		}
-		
-		[Test]
-		public void commit_replicated_message_should_have_been_published_for_both_events() {
-			AssertEx.IsOrBecomesTrue(() => 2 == CommitReplicatedMgs.Count);
-			Assert.True(CommitReplicatedMgs.TryDequeue(out var msg));
-			Assert.AreEqual(_correlationId1, msg.CorrelationId);
-			Assert.True(CommitReplicatedMgs.TryDequeue(out msg));
-			Assert.AreEqual(_correlationId2, msg.CorrelationId);
-		}
-		[Test]
-		public void index_written_message_should_have_been_published_for_both_events() {
-			AssertEx.IsOrBecomesTrue(() => 2 == IndexWrittenMgs.Count);
-			Assert.True(IndexWrittenMgs.TryDequeue(out var msg));
-			Assert.AreEqual(_logPosition3, msg.LogPosition);
-			Assert.True(IndexWrittenMgs.TryDequeue(out msg));
-			Assert.AreEqual(_logPosition4, msg.LogPosition);
-		}
-		[Test]
-		public void prepare_ack_message_should_have_been_published_for_both_events() {
-			AssertEx.IsOrBecomesTrue(() => 2 == IndexCommitter.CommittedPrepares.Count);
-			Assert.True(IndexCommitter.CommittedPrepares.TryDequeue(out var msg));
-			Assert.AreEqual(_logPosition1, msg.LogPosition);
-			Assert.True(IndexCommitter.CommittedPrepares.TryDequeue(out msg));
-			Assert.AreEqual(_logPosition2, msg.LogPosition);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_replicated_lower_position.cs b/src/EventStore.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_replicated_lower_position.cs
deleted file mode 100644
index eca57da044e..00000000000
--- a/src/EventStore.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_replicated_lower_position.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using EventStore.Core.TransactionLog.Checkpoint;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.IndexCommitter {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_index_committer_service_receives_replicated_lower_position<TLogFormat, TStreamId>
-		: with_index_committer_service<TLogFormat, TStreamId> {
-		private readonly Guid _correlationId = Guid.NewGuid();
-		private readonly long _logPosition = 2000;
-
-		[OneTimeSetUp]
-		public override void TestFixtureSetUp() {
-			ReplicationCheckpoint = new InMemoryCheckpoint(100);
-			base.TestFixtureSetUp();
-		}
-		public override void Given() { }
-		public override void When() {
-			Service.Handle(new StorageMessage.CommitAck(_correlationId, _logPosition, _logPosition, 0, 0));
-			ReplicationCheckpoint.Write(_logPosition - 1);
-			ReplicationCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.ReplicatedTo(_logPosition - 1));
-		}
-		
-		[Test]
-		public void commit_replicated_message_should_not_have_been_published() {
-			Assert.AreEqual(0, CommitReplicatedMgs.Count);
-		}
-		[Test]
-		public void index_written_message_should_have_not_been_published() {
-			Assert.AreEqual(0, IndexWrittenMgs.Count);
-		}
-		[Test]
-		public void index_written_message_should_not_have_been_published() {
-			Assert.AreEqual(0, IndexWrittenMgs.Count);
-		}
-		[Test]
-		public void index_should_not_have_been_updated() {
-			Assert.AreEqual(0, IndexCommitter.CommittedPrepares.Count);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_replicated_to_prepare_pre_position.cs b/src/EventStore.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_replicated_to_prepare_pre_position.cs
deleted file mode 100644
index aa1b6642665..00000000000
--- a/src/EventStore.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_replicated_to_prepare_pre_position.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using EventStore.Core.TransactionLog.Checkpoint;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.IndexCommitter {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_index_committer_service_receives_replicated_to_prepare_pre_position<TLogFormat, TStreamId> : with_index_committer_service<TLogFormat, TStreamId> {
-		private readonly Guid _correlationId = Guid.NewGuid();
-		private readonly long _logPrePosition = 4000;
-		private readonly long _logPostPosition = 4001;
-
-		public override void TestFixtureSetUp() {
-			ReplicationCheckpoint = new InMemoryCheckpoint(0);
-			base.TestFixtureSetUp();
-		}
-		public override void Given() { }
-		public override void When() {
-
-			AddPendingPrepare(_logPrePosition, _logPostPosition);
-			Service.Handle(new StorageMessage.CommitAck(_correlationId, _logPrePosition, _logPrePosition, 0, 0));
-			ReplicationCheckpoint.Write(_logPrePosition);
-			ReplicationCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.ReplicatedTo(_logPrePosition));
-		}
-
-		[Test]
-		public void commit_replicated_message_should_not_have_been_published() {
-			AssertEx.IsOrBecomesTrue(() => CommitReplicatedMgs.IsEmpty);
-		}
-		[Test]
-		public void index_written_message_should_not_have_been_published() {
-			AssertEx.IsOrBecomesTrue(() => IndexWrittenMgs.IsEmpty);
-		}
-		[Test]
-		public void index_should_not_have_been_updated() {
-			AssertEx.IsOrBecomesTrue(() => IndexCommitter.CommittedPrepares.IsEmpty);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/IndexCommitter/with_index_committer_service.cs b/src/EventStore.Core.Tests/Services/IndexCommitter/with_index_committer_service.cs
deleted file mode 100644
index 6b51a21ac18..00000000000
--- a/src/EventStore.Core.Tests/Services/IndexCommitter/with_index_committer_service.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using EventStore.Core.Bus;
-using EventStore.Core.Index;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Storage;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.Services.Replication;
-using EventStore.Core.Tests.Services.Storage;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.IndexCommitter {
-	public abstract class with_index_committer_service<TLogFormat, TStreamId> {
-		protected ITableIndex TableIndex;
-
-		protected ICheckpoint ReplicationCheckpoint;
-		protected ICheckpoint WriterCheckpoint;
-		protected SynchronousScheduler Publisher = new("publisher");
-		protected ConcurrentQueue<StorageMessage.CommitIndexed> CommitReplicatedMgs = new ConcurrentQueue<StorageMessage.CommitIndexed>();
-		protected ConcurrentQueue<ReplicationTrackingMessage.IndexedTo> IndexWrittenMgs = new ConcurrentQueue<ReplicationTrackingMessage.IndexedTo>();
-
-		protected IndexCommitterService<TStreamId> Service;
-		protected FakeIndexCommitter<TStreamId> IndexCommitter;
-		protected ITFChunkScavengerLogManager TfChunkScavengerLogManager;
-
-		[OneTimeSetUp]
-		public virtual void TestFixtureSetUp() {
-			IndexCommitter = new FakeIndexCommitter<TStreamId>();
-			ReplicationCheckpoint = new InMemoryCheckpoint();
-			WriterCheckpoint = new InMemoryCheckpoint(0);
-			TableIndex = new FakeTableIndex<TStreamId>();
-			TfChunkScavengerLogManager = new FakeTfChunkLogManager();
-			Service = new IndexCommitterService<TStreamId>(IndexCommitter, Publisher, WriterCheckpoint, ReplicationCheckpoint, TableIndex, new QueueStatsManager());
-			Service.Init(0);
-			Publisher.Subscribe(new AdHocHandler<StorageMessage.CommitIndexed>(m => CommitReplicatedMgs.Enqueue(m)));
-			Publisher.Subscribe(new AdHocHandler<ReplicationTrackingMessage.IndexedTo>(m => IndexWrittenMgs.Enqueue(m)));
-			Publisher.Subscribe<ReplicationTrackingMessage.ReplicatedTo>(Service);
-			Given();
-
-			When();
-		}
-
-		[OneTimeTearDown]
-		public virtual void TestFixtureTearDown() {
-			Service.Stop();
-		}
-		public abstract void Given();
-		public abstract void When();
-
-		protected void AddPendingPrepare(long transactionPosition, long postPosition = -1) {
-			postPosition = postPosition == -1 ? transactionPosition : postPosition;
-			var prepare = CreatePrepare(transactionPosition, transactionPosition);
-			Service.AddPendingPrepare(new[] { prepare }, postPosition);
-		}
-
-		protected void AddPendingPrepares(long transactionPosition, long[] logPositions) {
-			var prepares = new List<IPrepareLogRecord<TStreamId>>();
-			foreach (var pos in logPositions) {
-				prepares.Add(CreatePrepare(transactionPosition, pos));
-			}
-
-			Service.AddPendingPrepare(prepares.ToArray(), logPositions[^1]);
-		}
-
-		private IPrepareLogRecord<TStreamId> CreatePrepare(long transactionPosition, long logPosition) {
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			return LogRecord.Prepare(recordFactory, logPosition, Guid.NewGuid(), Guid.NewGuid(), transactionPosition, 0,
-				streamId, -1, PrepareFlags.None, eventTypeId,
-				new byte[10], new byte[0]);
-		}
-
-
-		protected void AddPendingCommit(long transactionPosition, long logPosition, long postPosition = -1) {
-			postPosition = postPosition == -1 ? logPosition : postPosition;
-			var commit = LogRecord.Commit(logPosition, Guid.NewGuid(), transactionPosition, 0);
-			Service.AddPendingCommit(commit, postPosition);
-		}
-	}
-
-	public class FakeIndexCommitter<TStreamId> : IIndexCommitter<TStreamId> {
-		public ConcurrentQueue<IPrepareLogRecord<TStreamId>> CommittedPrepares = new();
-		public ConcurrentQueue<CommitLogRecord> CommittedCommits = new();
-
-		public long LastIndexedPosition { get; set; }
-
-		public void Init(long buildToPosition) {
-		}
-
-		public void Dispose() {
-		}
-
-		public long Commit(CommitLogRecord commit, bool isTfEof, bool cacheLastEventNumber) {
-			CommittedCommits.Enqueue(commit);
-			return 0;
-		}
-
-		public long Commit(IList<IPrepareLogRecord<TStreamId>> committedPrepares, bool isTfEof, bool cacheLastEventNumber) {
-			foreach (var prepare in committedPrepares) {
-				CommittedPrepares.Enqueue(prepare);
-			}
-			return 0;
-		}
-
-		public long GetCommitLastEventNumber(CommitLogRecord commit) {
-			return 0;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Monitoring/FormatterTests.cs b/src/EventStore.Core.Tests/Services/Monitoring/FormatterTests.cs
deleted file mode 100644
index 85a101f6c2f..00000000000
--- a/src/EventStore.Core.Tests/Services/Monitoring/FormatterTests.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using EventStore.Common.Utils;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Monitoring {
-	[TestFixture]
-	public class FormatterTests {
-		[Test]
-		[TestCase(0L, ExpectedResult = "0B")]
-		[TestCase(500L, ExpectedResult = "500B")]
-		[TestCase(1023L, ExpectedResult = "1023B")]
-		[TestCase(1024L, ExpectedResult = "1KiB")]
-		[TestCase(2560L, ExpectedResult = "2.5KiB")]
-		[TestCase(1048576L, ExpectedResult = "1MiB")]
-		[TestCase(502792192L, ExpectedResult = "479.5MiB")]
-		[TestCase(1073741824L, ExpectedResult = "1GiB")]
-		[TestCase(79725330432L, ExpectedResult = "74.25GiB")]
-		[TestCase(1099511627776L, ExpectedResult = "1TiB")]
-		[TestCase(1125899906842624L, ExpectedResult = "1024TiB")]
-		[TestCase(long.MaxValue, ExpectedResult = "8388608TiB")]
-		[TestCase(-1L, ExpectedResult = "-1B")]
-		[TestCase(-1023L, ExpectedResult = "-1023B")]
-		[TestCase(-1024, ExpectedResult = "-1KiB")]
-		[TestCase(-1048576L, ExpectedResult = "-1MiB")]
-		public string test_size_multiple_cases_long(long bytes) {
-			return bytes.ToFriendlySizeString();
-		}
-
-		[Test]
-		[TestCase(0UL, ExpectedResult = "0B")]
-		[TestCase(500UL, ExpectedResult = "500B")]
-		[TestCase(1023UL, ExpectedResult = "1023B")]
-		[TestCase(1024UL, ExpectedResult = "1KiB")]
-		[TestCase(2560UL, ExpectedResult = "2.5KiB")]
-		[TestCase(1048576UL, ExpectedResult = "1MiB")]
-		[TestCase(502792192UL, ExpectedResult = "479.5MiB")]
-		[TestCase(1073741824UL, ExpectedResult = "1GiB")]
-		[TestCase(79725330432UL, ExpectedResult = "74.25GiB")]
-		[TestCase(1099511627776UL, ExpectedResult = "1TiB")]
-		[TestCase(1125899906842624UL, ExpectedResult = "1024TiB")]
-		[TestCase(ulong.MaxValue, ExpectedResult = "more than long.MaxValue")] //16777215TiB
-		public string test_size_multiple_cases_ulong(ulong bytes) {
-			return bytes.ToFriendlySizeString();
-		}
-
-
-		[Test]
-		[TestCase(0D, ExpectedResult = "0B/s")]
-		[TestCase(500L, ExpectedResult = "500B/s")]
-		[TestCase(1023L, ExpectedResult = "1023B/s")]
-		[TestCase(1024L, ExpectedResult = "1KiB/s")]
-		[TestCase(2560L, ExpectedResult = "2.5KiB/s")]
-		[TestCase(1048576L, ExpectedResult = "1MiB/s")]
-		[TestCase(502792192L, ExpectedResult = "479.5MiB/s")]
-		[TestCase(1073741824L, ExpectedResult = "1GiB/s")]
-		[TestCase(79725330432L, ExpectedResult = "74.25GiB/s")]
-		[TestCase(-1L, ExpectedResult = "-1B/s")]
-		[TestCase(-1023L, ExpectedResult = "-1023B/s")]
-		[TestCase(-1024, ExpectedResult = "-1KiB/s")]
-		[TestCase(-1048576L, ExpectedResult = "-1MiB/s")]
-		public string test_speed_multiple_cases(double speed) {
-			return speed.ToFriendlySpeedString();
-		}
-
-
-		[Test]
-		[TestCase(0L, ExpectedResult = "0")]
-		[TestCase(500L, ExpectedResult = "500")]
-		[TestCase(1023L, ExpectedResult = "1023")]
-		[TestCase(1024L, ExpectedResult = "1K")]
-		[TestCase(2560L, ExpectedResult = "2.5K")]
-		[TestCase(1048576L, ExpectedResult = "1M")]
-		[TestCase(502792192L, ExpectedResult = "479.5M")]
-		[TestCase(1073741824L, ExpectedResult = "1G")]
-		[TestCase(79725330432L, ExpectedResult = "74.25G")]
-		[TestCase(1099511627776L, ExpectedResult = "1T")]
-		[TestCase(1125899906842624L, ExpectedResult = "1024T")]
-		[TestCase(long.MaxValue, ExpectedResult = "8388608T")]
-		[TestCase(-1L, ExpectedResult = "-1")]
-		[TestCase(-1023L, ExpectedResult = "-1023")]
-		[TestCase(-1024, ExpectedResult = "-1K")]
-		[TestCase(-1048576L, ExpectedResult = "-1M")]
-		public string test_number_multiple_cases_long(long number) {
-			return number.ToFriendlyNumberString();
-		}
-
-		[Test]
-		[TestCase(0UL, ExpectedResult = "0")]
-		[TestCase(500UL, ExpectedResult = "500")]
-		[TestCase(1023UL, ExpectedResult = "1023")]
-		[TestCase(1024UL, ExpectedResult = "1K")]
-		[TestCase(2560UL, ExpectedResult = "2.5K")]
-		[TestCase(1048576UL, ExpectedResult = "1M")]
-		[TestCase(502792192UL, ExpectedResult = "479.5M")]
-		[TestCase(1073741824UL, ExpectedResult = "1G")]
-		[TestCase(79725330432UL, ExpectedResult = "74.25G")]
-		[TestCase(1099511627776UL, ExpectedResult = "1T")]
-		[TestCase(1125899906842624UL, ExpectedResult = "1024T")]
-		[TestCase(ulong.MaxValue, ExpectedResult = "more than long.MaxValue")] //16777215TiB
-		public string test_number_multiple_cases_ulong(ulong number) {
-			return number.ToFriendlyNumberString();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/PeriodicLogs/PeriodicallyLoggingServiceTests.cs b/src/EventStore.Core.Tests/Services/PeriodicLogs/PeriodicallyLoggingServiceTests.cs
deleted file mode 100644
index 6432642c235..00000000000
--- a/src/EventStore.Core.Tests/Services/PeriodicLogs/PeriodicallyLoggingServiceTests.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.PeriodicLogs;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Fakes;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.PeriodicLogs; 
-
-public class PeriodicallyLoggingServiceTests {
-
-	private FakePublisher _publisher;
-	private FakeLogger _logger;
-	private string _esVersion;
-
-	[SetUp]
-	public void SetUp() {
-		_publisher = new();
-		_logger = new FakeLogger();
-		_esVersion = "0.0.0.0";
-	}
-	
-	[Test]
-	public void on_start() {
-		// given
-		var sut = new PeriodicallyLoggingService(_publisher, _esVersion, _logger);
-		
-		// when
-		sut.Handle(new SystemMessage.SystemStart());
-		
-		// then
-		Assert.IsInstanceOf<MonitoringMessage.CheckEsVersion>(_publisher.Messages.Single());
-		Assert.IsEmpty(_logger.LogMessages);
-	}
-
-	[Test]
-	public void log_es_version_periodically() {
-		// given
-		var sut = new PeriodicallyLoggingService(_publisher, _esVersion, _logger);
-		
-		// when
-		sut.Handle(new MonitoringMessage.CheckEsVersion());
-		
-		// then
-		var schedule = (TimerMessage.Schedule)_publisher.Messages.Single();
-		Assert.AreEqual(TimeSpan.FromHours(12), schedule.TriggerAfter);
-		Assert.IsInstanceOf<MonitoringMessage.CheckEsVersion>(schedule.ReplyMessage);
-
-		var logMessage = _logger.LogMessages.Single();
-		Assert.AreEqual($"Current version of Event Store is : \"0.0.0.0\" ", logMessage.RenderMessage());
-	} 
-
-}
diff --git a/src/EventStore.Core.Tests/Services/PersistentSubscription/OutstandingMessageCacheTests.cs b/src/EventStore.Core.Tests/Services/PersistentSubscription/OutstandingMessageCacheTests.cs
deleted file mode 100644
index 3edf91acee1..00000000000
--- a/src/EventStore.Core.Tests/Services/PersistentSubscription/OutstandingMessageCacheTests.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Services.PersistentSubscription;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.PersistentSubscription {
-	[TestFixture(EventSource.SingleStream)]
-	[TestFixture(EventSource.AllStream)]
-	public class OutstandingMessageCacheTests {
-		private EventSource _eventSource;
-		public OutstandingMessageCacheTests(EventSource eventSource) {
-			_eventSource = eventSource;
-		}
-
-		private OutstandingMessage BuildMessageAt(int eventPosition, EventSource eventSource, Guid? forcedEventId = null) {
-			IPersistentSubscriptionStreamPosition previousEventPosition =
-				eventPosition > 0 ? GetStreamPositionFor(eventPosition - 1) : null;
-			var @event = Helper.GetFakeEventFor(eventPosition, eventSource, forcedEventId);
-			return OutstandingMessage.ForPushedEvent(
-				OutstandingMessage.ForNewEvent(@event, GetStreamPositionFor(eventPosition)),
-				eventPosition, previousEventPosition).message;
-		}
-
-		private Guid GetEventIdFor(int position) {
-			return Helper.GetEventIdFor(position);
-		}
-
-		private IPersistentSubscriptionStreamPosition GetStreamPositionFor(int position) {
-			return Helper.GetStreamPositionFor(position, _eventSource);
-		}
-
-		[Test]
-		public void when_created_has_zero_count() {
-			var cache = new OutstandingMessageCache();
-			Assert.AreEqual(0, cache.Count);
-		}
-
-		[Test]
-		public void can_remove_non_existing_item() {
-			var cache = new OutstandingMessageCache();
-			Assert.DoesNotThrow(() => cache.Remove(Guid.NewGuid()));
-		}
-
-		[Test]
-		public void adding_an_item_causes_count_to_go_up() {
-			var cache = new OutstandingMessageCache();
-			cache.StartMessage(BuildMessageAt(0, _eventSource), DateTime.Now);
-			Assert.AreEqual(1, cache.Count);
-			Assert.AreEqual(GetStreamPositionFor(0), cache.GetLowestPosition().message?.EventPosition);
-		}
-
-		[Test]
-		public void can_add_duplicate() {
-			var cache = new OutstandingMessageCache();
-			var id = Guid.NewGuid();
-			var result1 =
-				cache.StartMessage(BuildMessageAt(0, _eventSource, id), DateTime.Now);
-			var result2 =
-				cache.StartMessage(BuildMessageAt(1, _eventSource, id), DateTime.Now);
-			Assert.AreEqual(1, cache.Count);
-			Assert.AreEqual(GetStreamPositionFor(0), cache.GetLowestPosition().message?.EventPosition);
-			Assert.AreEqual(StartMessageResult.Success, result1);
-			Assert.AreEqual(StartMessageResult.SkippedDuplicate, result2);
-		}
-
-		[Test]
-		public void can_remove_duplicate() {
-			var cache = new OutstandingMessageCache();
-			var id = Guid.NewGuid();
-			cache.StartMessage(BuildMessageAt(0, _eventSource, id), DateTime.Now);
-			cache.StartMessage(BuildMessageAt(1, _eventSource, id), DateTime.Now);
-			cache.Remove(id);
-			Assert.AreEqual(0, cache.Count);
-			Assert.IsNull(cache.GetLowestPosition().message);
-			Assert.AreEqual(long.MaxValue, cache.GetLowestPosition().sequenceNumber);
-		}
-
-		[Test]
-		public void can_remove_existing_item() {
-			var cache = new OutstandingMessageCache();
-			cache.StartMessage(BuildMessageAt(0, _eventSource), DateTime.Now);
-			cache.Remove(GetEventIdFor(0));
-			Assert.AreEqual(0, cache.Count);
-			Assert.IsNull(cache.GetLowestPosition().message);
-			Assert.AreEqual(long.MaxValue, cache.GetLowestPosition().sequenceNumber);
-		}
-
-		[Test]
-		public void lowest_works_on_add() {
-			var cache = new OutstandingMessageCache();
-			cache.StartMessage(BuildMessageAt(9, _eventSource), DateTime.Now);
-			Assert.AreEqual(GetStreamPositionFor(9), cache.GetLowestPosition().message?.EventPosition);
-		}
-
-		[Test]
-		public void lowest_works_on_adds_then_remove() {
-			var cache = new OutstandingMessageCache();
-			cache.StartMessage(BuildMessageAt(7, _eventSource), DateTime.Now);
-			cache.StartMessage(BuildMessageAt(8, _eventSource), DateTime.Now);
-			cache.StartMessage(BuildMessageAt(9, _eventSource), DateTime.Now);
-			cache.Remove(GetEventIdFor(7));
-			Assert.AreEqual(GetStreamPositionFor(8), cache.GetLowestPosition().message?.EventPosition);
-		}
-
-		[Test]
-		public void lowest_on_empty_cache_returns_max() {
-			var cache = new OutstandingMessageCache();
-			Assert.IsNull(cache.GetLowestPosition().message);
-			Assert.AreEqual(long.MaxValue, cache.GetLowestPosition().sequenceNumber);
-		}
-
-		[Test]
-		public void lowest_ignores_replayed_events() {
-			var cache = new OutstandingMessageCache();
-			//normal event:
-			cache.StartMessage(BuildMessageAt(5, _eventSource), DateTime.Now);
-			//replayed event:
-			cache.StartMessage(OutstandingMessage.ForParkedEvent(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "$persistentsubscription-name::group-parked", 4)), DateTime.Now);
-			Assert.AreEqual(GetStreamPositionFor(5), cache.GetLowestPosition().message?.EventPosition);
-		}
-
-		[Test]
-		public void get_expired_messages_returns_max_value_on_empty_cache() {
-			var cache = new OutstandingMessageCache();
-			Assert.AreEqual(0, cache.GetMessagesExpiringBefore(DateTime.Now).Count());
-			Assert.IsNull(cache.GetLowestPosition().message);
-			Assert.AreEqual(long.MaxValue, cache.GetLowestPosition().sequenceNumber);
-		}
-
-		[Test]
-		public void message_that_expires_is_included_in_expired_list() {
-			var cache = new OutstandingMessageCache();
-			cache.StartMessage(BuildMessageAt(0, _eventSource),
-				DateTime.Now.AddSeconds(-1));
-			var expired = cache.GetMessagesExpiringBefore(DateTime.Now).ToList();
-			Assert.AreEqual(1, expired.Count());
-			Assert.AreEqual(GetEventIdFor(0), expired.FirstOrDefault().EventId);
-		}
-
-		[Test]
-		public void message_that_expires_is_included_in_expired_list_with_another_that_should_not() {
-			var cache = new OutstandingMessageCache();
-			cache.StartMessage(BuildMessageAt(0, _eventSource), DateTime.Now.AddSeconds(-1));
-			cache.StartMessage(
-				BuildMessageAt(1, _eventSource), DateTime.Now.AddSeconds(1));
-			var expired = cache.GetMessagesExpiringBefore(DateTime.Now).ToList();
-			Assert.AreEqual(1, expired.Count());
-			Assert.AreEqual(GetEventIdFor(0), expired.FirstOrDefault().EventId);
-		}
-
-		[Test]
-		public void message_that_is_removed_does_not_show_up_in_expired_list() {
-			var cache = new OutstandingMessageCache();
-			cache.StartMessage(BuildMessageAt(1, _eventSource),
-				DateTime.Now.AddSeconds(-11));
-			cache.Remove(GetEventIdFor(1));
-			var expired = cache.WaitingTimeMessages();
-			Assert.AreEqual(0, expired.Count());
-		}
-
-		[Test]
-		public void can_remove_non_first_message_and_have_removed_from_time() {
-			var cache = new OutstandingMessageCache();
-			cache.StartMessage(
-				BuildMessageAt(1, _eventSource),
-				DateTime.Now.AddSeconds(-12));
-			cache.StartMessage(
-				BuildMessageAt(2, _eventSource),
-				DateTime.Now.AddSeconds(-11));
-			cache.Remove(GetEventIdFor(2));
-			var expired = cache.WaitingTimeMessages();
-			Assert.AreEqual(1, expired.Count());
-			Assert.AreEqual(GetEventIdFor(1), expired.FirstOrDefault().Item2.MessageId);
-		}
-
-		[Test]
-		public void can_add_multiple_messages_same_time_different_ids() {
-			var cache = new OutstandingMessageCache();
-			var time = DateTime.Now.AddSeconds(-12);
-			cache.StartMessage(
-				BuildMessageAt(1, _eventSource), time);
-			cache.StartMessage(
-				BuildMessageAt(2, _eventSource), time);
-			var expired = cache.WaitingTimeMessages();
-			Assert.AreEqual(2, expired.Count());
-		}
-
-		[Test]
-		public void can_remove_second_message_same_time_different_ids() {
-			var cache = new OutstandingMessageCache();
-			var time = DateTime.Now.AddSeconds(-12);
-			cache.StartMessage(
-				BuildMessageAt(1, _eventSource), time);
-			cache.StartMessage(
-				BuildMessageAt(2, _eventSource), time);
-			cache.Remove(GetEventIdFor(2));
-			var expired = cache.WaitingTimeMessages();
-			Assert.AreEqual(GetEventIdFor(1), expired.FirstOrDefault().Item2.MessageId);
-			Assert.AreEqual(1, expired.Count());
-		}
-
-		[Test]
-		public void message_that_notexpired_is_not_included_in_expired_list() {
-			var cache = new OutstandingMessageCache();
-			cache.StartMessage(BuildMessageAt(0, _eventSource),
-				DateTime.Now.AddSeconds(1));
-			var expired = cache.GetMessagesExpiringBefore(DateTime.Now).ToList();
-			Assert.AreEqual(0, expired.Count());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionCheckpointReaderTests.cs b/src/EventStore.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionCheckpointReaderTests.cs
deleted file mode 100644
index 9267c416c27..00000000000
--- a/src/EventStore.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionCheckpointReaderTests.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.PersistentSubscription;
-using EventStore.Core.Tests.Helpers.IODispatcherTests;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.PersistentSubscription;
-
-public class PersistentSubscriptionCheckpointReaderTests {
-	[TestCase("SubscriptionCheckpoint")] // old checkpoints
-	[TestCase("$SubscriptionCheckpoint")] // new checkpoints
-	public void can_read_checkpoints(string checkpointEventType) {
-		var bus = new SynchronousScheduler("persistent subscription test bus");
-
-		bus.Subscribe(new AdHocHandler<Messages.ClientMessage.ReadStreamEventsBackward>(msg => {
-			var lastEventNumber = msg.FromEventNumber + 1;
-			var nextEventNumber = lastEventNumber + 1;
-
-			var events = IODispatcherTestHelpers.CreateResolvedEvent<LogFormat.V2, string>(
-				stream: msg.EventStreamId,
-				eventType: checkpointEventType,
-				data: "\"the checkpoint data\"");
-
-			msg.Envelope.ReplyWith(new Messages.ClientMessage.ReadStreamEventsBackwardCompleted(
-				correlationId: msg.CorrelationId,
-				eventStreamId: msg.EventStreamId,
-				fromEventNumber: msg.FromEventNumber,
-				maxCount: msg.MaxCount,
-				result: Data.ReadStreamResult.Success,
-				events: events,
-				streamMetadata: null,
-				isCachePublic: false,
-				error: "",
-				nextEventNumber: nextEventNumber,
-				lastEventNumber: lastEventNumber,
-				isEndOfStream: false,
-				tfLastCommitPosition: 0));
-		}));
-
-		var ioDispatcher = new IODispatcher(bus, bus);
-		IODispatcherTestHelpers.SubscribeIODispatcher(ioDispatcher, bus);
-		var sut = new PersistentSubscriptionCheckpointReader(ioDispatcher);
-
-		var loadedState = "";
-		sut.BeginLoadState("subscriptionA", state => {
-			loadedState = state;
-		});
-
-		AssertEx.IsOrBecomesTrue(() => loadedState == "the checkpoint data");
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionConfigPersistence.cs b/src/EventStore.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionConfigPersistence.cs
deleted file mode 100644
index 1876dafa4a3..00000000000
--- a/src/EventStore.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionConfigPersistence.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using EventStore.Core.Services.PersistentSubscription;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services {
-	[TestFixture]
-	public class PersistentSubscriptionConfigTests {
-		[Test]
-		public void output_can_be_read_as_input_and_keep_same_values() {
-			var config = new PersistentSubscriptionConfig();
-			config.Updated = new DateTime(2014, 08, 14);
-			config.UpdatedBy = "Greg";
-			config.Version = "1";
-			config.Entries = new List<PersistentSubscriptionEntry>();
-			config.Entries.Add(new PersistentSubscriptionEntry()
-				{Group = "foo", ResolveLinkTos = true, Stream = "Stream"});
-			var data = config.GetSerializedForm();
-			var config2 = PersistentSubscriptionConfig.FromSerializedForm(data);
-			Assert.AreEqual(1, config2.Entries.Count);
-			Assert.AreEqual(config.Updated, config2.Updated);
-			Assert.AreEqual(config.UpdatedBy, config2.UpdatedBy);
-		}
-
-		[Test]
-		public void bad_json_causes_bad_config_data_exception() {
-			var bunkdata = Encoding.UTF8.GetBytes("{'some weird stuff' : 'something'}");
-			Assert.Throws<BadConfigDataException>(() => PersistentSubscriptionConfig.FromSerializedForm(bunkdata));
-		}
-
-		[Test]
-		public void random_bad_data_causes_bad_config_data_exception() {
-			var bunkdata = Encoding.UTF8.GetBytes("This ain't even valid json");
-			Assert.Throws<BadConfigDataException>(() => PersistentSubscriptionConfig.FromSerializedForm(bunkdata));
-		}
-
-		[Test]
-		public void event_filter_is_parsed_correctly() {
-			var config = new PersistentSubscriptionConfig();
-			config.Updated = new DateTime(2014, 08, 14);
-			config.UpdatedBy = "admin";
-			config.Version = "1";
-
-			var filter = EventFilter.StreamName.Prefixes(true, "test", "blah");
-			var entry = new PersistentSubscriptionEntry {
-				Group = "foo",
-				Stream = "$all",
-				Filter = EventFilter.ParseToDto(filter)
-			};
-			config.Entries = new List<PersistentSubscriptionEntry>{entry};
-			var data = config.GetSerializedForm();
-			var config2 = PersistentSubscriptionConfig.FromSerializedForm(data);
-			var newFilterDto = config2.Entries[0].Filter;
-			var (success, reason) = EventFilter.TryParse(newFilterDto, out var newFilter);
-			Assert.AreEqual(1, config2.Entries.Count);
-			Assert.IsTrue(success);
-			Assert.AreEqual(filter.ToString(), newFilter.ToString());
-		}
-
-		[Test]
-		public void no_event_filter_is_parsed_correctly() {
-			var config = new PersistentSubscriptionConfig();
-			config.Updated = new DateTime(2014, 08, 14);
-			config.UpdatedBy = "admin";
-			config.Version = "1";
-
-			var entry = new PersistentSubscriptionEntry {
-				Group = "foo",
-				Stream = "$all",
-				Filter = null
-			};
-			config.Entries = new List<PersistentSubscriptionEntry>{entry};
-			var data = config.GetSerializedForm();
-			var config2 = PersistentSubscriptionConfig.FromSerializedForm(data);
-			Assert.AreEqual(1, config2.Entries.Count);
-			Assert.IsNull(config2.Entries[0].Filter);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionMessageParkerTests.cs b/src/EventStore.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionMessageParkerTests.cs
deleted file mode 100644
index 46ccc3bd717..00000000000
--- a/src/EventStore.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionMessageParkerTests.cs
+++ /dev/null
@@ -1,380 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.PersistentSubscription;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.PersistentSubscription {
-	[TestFixture]
-	public class PersistentSubscriptionMessageParkerTests {
-		private static string LinkMetadata =
-			"{\"added\":\"2021-01-19T11:40:46.2592636+01:00\",\"reason\":\"Client explicitly NAK'ed message.\"}";
-
-		private static ResolvedEvent CreateResolvedEvent(long eventNumber, long logPosition) {
-			var record = new EventRecord(eventNumber, logPosition, Guid.NewGuid(), Guid.NewGuid(), 0,
-				0, "foo", ExpectedVersion.Any, DateTime.Now, PrepareFlags.IsCommitted, "test-event",
-				Encoding.UTF8.GetBytes("{\"foo\": \"bar\"}"),
-				new byte[] { });
-			return ResolvedEvent.ForResolvedLink(record, null, 0);
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class given_parked_stream_does_not_exist<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-			private PersistentSubscriptionMessageParker _messageParker;
-			private TaskCompletionSource<bool> _done = new TaskCompletionSource<bool>();
-
-			protected override void Given() {
-				base.Given();
-				NoOtherStreams();
-				_messageParker = new PersistentSubscriptionMessageParker(Guid.NewGuid().ToString(), _ioDispatcher);
-			}
-
-			[Test]
-			public async Task should_have_no_parked_messages() {
-				_messageParker.BeginLoadStats(() => {
-					Assert.Zero(_messageParker.ParkedMessageCount);
-					Assert.Null(_messageParker.GetOldestParkedMessage);
-					_done.TrySetResult(true);
-				});
-				await _done.Task.WithTimeout();
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class given_parked_messages_and_no_truncate_before<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-			private PersistentSubscriptionMessageParker _messageParker;
-			private string _streamId = Guid.NewGuid().ToString();
-			private TaskCompletionSource<bool> _done = new TaskCompletionSource<bool>();
-
-			protected override void Given() {
-				base.Given();
-				_messageParker = new PersistentSubscriptionMessageParker(_streamId, _ioDispatcher);
-				ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "0@foo");
-				ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "1@foo");
-				ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "2@foo");
-				NoOtherStreams();
-			}
-
-			[Test]
-			public async Task should_have_three_parked_messages() {
-				_messageParker.BeginLoadStats(() => {
-					Assert.AreEqual(3, _messageParker.ParkedMessageCount);
-					_done.TrySetResult(true);
-				});
-				await _done.Task.WithTimeout();
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class given_parked_messages_and_no_truncate_before_oldest_parked_message_timestamp<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-			private PersistentSubscriptionMessageParker _messageParker;
-			private string _streamId = Guid.NewGuid().ToString();
-			private TaskCompletionSource<bool> _done = new TaskCompletionSource<bool>();
-			private List<EventRecord> _eventRecords = new List<EventRecord>();
-
-			protected override void Given() {
-				base.Given();
-				_messageParker = new PersistentSubscriptionMessageParker(_streamId, _ioDispatcher);
-				_eventRecords.Add(ExistingEventTimeStamp(_messageParker.ParkedStreamId, "$>", LinkMetadata, "0@foo"));
-				_timeProvider.AddToUtcTime(new TimeSpan(0,0,1,2));
-				_eventRecords.Add(ExistingEventTimeStamp(_messageParker.ParkedStreamId, "$>", LinkMetadata, "1@foo"));
-				_eventRecords.Add(ExistingEventTimeStamp(_messageParker.ParkedStreamId, "$>", LinkMetadata, "2@foo"));
-				NoOtherStreams();
-			}
-
-			[Test]
-			public async Task should_have_the_first_parked_message_timestamp_as_oldest_parked_message_timestamp() {
-				_messageParker.BeginLoadStats(() => {
-					Assert.AreEqual(_eventRecords[0].TimeStamp, _messageParker.GetOldestParkedMessage);
-					_done.TrySetResult(true);
-				});
-				await _done.Task.WithTimeout();
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class given_parked_messages_and_half_are_truncated<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-			private TaskCompletionSource<bool> _done = new TaskCompletionSource<bool>();
-			private PersistentSubscriptionMessageParker _messageParker;
-			private string _streamId = Guid.NewGuid().ToString();
-
-			protected override void Given() {
-				base.Given();
-				_messageParker = new PersistentSubscriptionMessageParker(_streamId, _ioDispatcher);
-				ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "5@foo");
-				ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "6@foo");
-				ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "7@foo");
-				ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "8@foo");
-				ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "9@foo");
-			}
-
-			[Test]
-			public async Task should_have_five_parked_messages() {
-				_messageParker.BeginLoadStats(() => {
-					Assert.AreEqual(5, _messageParker.ParkedMessageCount);
-					_done.TrySetResult(true);
-				});
-				await _done.Task.WithTimeout();
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class given_parked_messages_and_half_are_truncated_oldest_parked_message_timestamp<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-			private TaskCompletionSource<bool> _done = new TaskCompletionSource<bool>();
-			private PersistentSubscriptionMessageParker _messageParker;
-			private string _streamId = Guid.NewGuid().ToString();
-			private List<EventRecord> _eventRecords = new List<EventRecord>();
-
-			protected override void Given() {
-				base.Given();
-				_messageParker = new PersistentSubscriptionMessageParker(_streamId, _ioDispatcher);
-				_eventRecords.Add(ExistingEventTimeStamp(_messageParker.ParkedStreamId, "$>", LinkMetadata, "5@foo"));
-				_timeProvider.AddToUtcTime(new TimeSpan(0,0,1,2));
-				_eventRecords.Add(ExistingEventTimeStamp(_messageParker.ParkedStreamId, "$>", LinkMetadata, "6@foo"));
-				_eventRecords.Add(ExistingEventTimeStamp(_messageParker.ParkedStreamId, "$>", LinkMetadata, "7@foo"));
-				_eventRecords.Add(ExistingEventTimeStamp(_messageParker.ParkedStreamId, "$>", LinkMetadata, "8@foo"));
-				_eventRecords.Add(ExistingEventTimeStamp(_messageParker.ParkedStreamId, "$>", LinkMetadata, "9@foo"));
-			}
-
-			[Test]
-			public async Task should_have_the_first_parked_message_timestamp_as_oldest_parked_message_timestamp() {
-				_messageParker.BeginLoadStats(() => {
-					Assert.AreEqual(_eventRecords[0].TimeStamp,
-						_messageParker.GetOldestParkedMessage);
-					_done.TrySetResult(true);
-				});
-				await _done.Task.WithTimeout();
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class given_parked_messages_and_all_are_truncated<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-			private PersistentSubscriptionMessageParker _messageParker;
-			private string _streamId = Guid.NewGuid().ToString();
-			private TaskCompletionSource<bool> _done = new TaskCompletionSource<bool>();
-
-			protected override void Given() {
-				base.Given();
-				_messageParker = new PersistentSubscriptionMessageParker(_streamId, _ioDispatcher);
-				ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "0@foo");
-				ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "1@foo");
-				ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "2@foo");
-				ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "3@foo");
-				ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "4@foo");
-				ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "5@foo");
-				ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "6@foo");
-				ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "7@foo");
-				ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "8@foo");
-				ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "9@foo");
-				DeletedStream(_messageParker.ParkedStreamId);
-			}
-
-			[Test]
-			public async Task should_have_no_parked_messages() {
-				_messageParker.BeginLoadStats(() => {
-					Assert.Zero(_messageParker.ParkedMessageCount);
-					Assert.Null(_messageParker.GetOldestParkedMessage);
-					_done.TrySetResult(true);
-				});
-				await _done.Task.WithTimeout();
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class given_a_message_is_parked<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-			private PersistentSubscriptionMessageParker _messageParker;
-			private string _streamId = Guid.NewGuid().ToString();
-			private TaskCompletionSource<bool> _done = new TaskCompletionSource<bool>();
-
-			protected override void Given() {
-				base.Given();
-				_messageParker = new PersistentSubscriptionMessageParker(_streamId, _ioDispatcher);
-				NoOtherStreams();
-				AllWritesSucceed();
-			}
-
-			[Test]
-			public async Task should_have_one_parked_message() {
-				_messageParker.BeginParkMessage(CreateResolvedEvent(0, 0), "testing", (_, __) => {
-					Assert.AreEqual(1, _messageParker.ParkedMessageCount);
-					Assert.AreEqual(EventTimeStamps[0], _messageParker.GetOldestParkedMessage);
-					_done.TrySetResult(true);
-				});
-				await _done.Task.WithTimeout();
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class given_messages_are_parked_and_then_replayed<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-			private PersistentSubscriptionMessageParker _messageParker;
-			private string _streamId = Guid.NewGuid().ToString();
-			private TaskCompletionSource<bool> _parked;
-			private TaskCompletionSource<bool> _done = new TaskCompletionSource<bool>();
-
-			protected override void Given() {
-				base.Given();
-
-				AllWritesSucceed();
-
-				_parked = new TaskCompletionSource<bool>();
-				_messageParker = new PersistentSubscriptionMessageParker(_streamId, _ioDispatcher);
-				_messageParker.BeginParkMessage(CreateResolvedEvent(0, 0), "testing", (_, __) => {
-					_messageParker.BeginParkMessage(CreateResolvedEvent(1, 100), "testing", (_, __) => {
-						_parked.SetResult(true);
-					});
-				});
-			}
-
-			[Test]
-			public async Task should_have_no_parked_messages() {
-				await _parked.Task;
-				_messageParker.BeginMarkParkedMessagesReprocessed(2, null, true, () => {
-					Assert.Zero(_messageParker.ParkedMessageCount);
-					Assert.Null(_messageParker.GetOldestParkedMessage);
-					_done.TrySetResult(true);
-				});
-				await _done.Task.WithTimeout();
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class given_message_parked_after_parked_messages_are_replayed<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-			private PersistentSubscriptionMessageParker _messageParker;
-			private string _streamId = Guid.NewGuid().ToString();
-			private TaskCompletionSource<bool> _replayParked;
-			private TaskCompletionSource<bool> _done = new TaskCompletionSource<bool>();
-
-			protected override void Given() {
-				base.Given();
-
-				AllWritesSucceed();
-
-				_replayParked = new TaskCompletionSource<bool>();
-				_messageParker = new PersistentSubscriptionMessageParker(_streamId, _ioDispatcher);
-				_messageParker.BeginParkMessage(CreateResolvedEvent(0, 0), "testing", (_, __) => {
-					_messageParker.BeginParkMessage(CreateResolvedEvent(1, 100), "testing", (_, __) => {
-						_messageParker.BeginMarkParkedMessagesReprocessed(2, null, true, () => {
-							_replayParked.SetResult(true);
-						});
-					});
-				});
-			}
-
-			[Test]
-			public async Task should_have_one_parked_message() {
-				await _replayParked.Task;
-				_timeProvider.AddToUtcTime(new TimeSpan(0,0,1,0));
-				_messageParker.BeginParkMessage(CreateResolvedEvent(2,200), "testing", (_, __) => {
-					Assert.AreEqual(1, _messageParker.ParkedMessageCount);
-					Assert.AreEqual(EventTimeStamps[2], _messageParker.GetOldestParkedMessage);
-					_done.TrySetResult(true);
-				});
-				await _done.Task.WithTimeout();
-			}
-		}
-
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class given_read_backwards_fails_when_getting_stats<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-			private PersistentSubscriptionMessageParker _messageParker;
-			private string _streamId = Guid.NewGuid().ToString();
-			private TaskCompletionSource<bool> _done = new TaskCompletionSource<bool>();
-
-			private TaskCompletionSource<bool> _timerMessageReceived = new TaskCompletionSource<bool>();
-			private IODispatcherDelayedMessage _timerMessage;
-
-			protected override void Given() {
-				base.Given();
-
-				AllReadsTimeOut();
-
-				_messageParker = new PersistentSubscriptionMessageParker(_streamId, _ioDispatcher);
-
-				_bus.Subscribe(new AdHocHandler<TimerMessage.Schedule>(
-					msg => {
-						_timerMessage = msg.ReplyMessage as IODispatcherDelayedMessage;
-						_timerMessageReceived.TrySetResult(true);
-					}));
-			}
-
-			[Test]
-			public async Task should_not_hang() {
-				_messageParker.BeginLoadStats(() => {
-					Assert.Zero(_messageParker.ParkedMessageCount);
-					_done.TrySetResult(true);
-				});
-
-				await _timerMessageReceived.Task.WithTimeout();
-				_ioDispatcher.Handle(_timerMessage);
-
-				await _done.Task.WithTimeout();
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class given_read_forwards_fails_when_getting_stats<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-			private PersistentSubscriptionMessageParker _messageParker;
-			private string _streamId = Guid.NewGuid().ToString();
-			private TaskCompletionSource<bool> _done = new TaskCompletionSource<bool>();
-
-			private TaskCompletionSource<bool> _timerMessagesReceived = new TaskCompletionSource<bool>();
-			private TaskCompletionSource<bool> _readForwardReceived = new TaskCompletionSource<bool>();
-			private List<IODispatcherDelayedMessage> _timerMessages = new List<IODispatcherDelayedMessage>();
-			private Guid _readForwardCorrelationId;
-
-			protected override void Given() {
-				base.Given();
-
-				_messageParker = new PersistentSubscriptionMessageParker(_streamId, _ioDispatcher);
-				ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "0@foo");
-
-				// Disable the forward reader so it times out
-				_bus.Unsubscribe(_ioDispatcher.ForwardReader);
-				_bus.Subscribe(new AdHocHandler<ClientMessage.ReadStreamEventsForward>(msg => {
-					_readForwardCorrelationId = msg.CorrelationId;
-					_readForwardReceived.TrySetResult(true);
-				}));
-				_bus.Subscribe(new AdHocHandler<TimerMessage.Schedule>(
-					msg => {
-						_timerMessages.Add(msg.ReplyMessage as IODispatcherDelayedMessage);
-						if (_timerMessages.Count == 2) _timerMessagesReceived.TrySetResult(true);
-					}));
-			}
-
-			[Test]
-			public async Task should_not_hang() {
-				_messageParker.BeginLoadStats(() => {
-					Assert.AreEqual(1, _messageParker.ParkedMessageCount);
-					_done.TrySetResult(true);
-				});
-
-				await _readForwardReceived.Task.WithTimeout();
-				await _timerMessagesReceived.Task.WithTimeout();
-
-				_ioDispatcher.Handle(_timerMessages.FirstOrDefault(x => x.MessageCorrelationId == _readForwardCorrelationId));
-
-				await _done.Task.WithTimeout();
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionTests.cs b/src/EventStore.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionTests.cs
deleted file mode 100644
index 74b6d2a0448..00000000000
--- a/src/EventStore.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionTests.cs
+++ /dev/null
@@ -1,2653 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Text;
-using System.Threading;
-using EventStore.ClientAPI.Common;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.PersistentSubscription;
-using EventStore.Core.Tests.Services.Replication;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using ExpectedVersion = EventStore.Core.Data.ExpectedVersion;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-using EventStore.Core.Tests.ClientAPI;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Messaging;
-using EventStore.Core.Metrics;
-using EventStore.Core.Services.PersistentSubscription.ConsumerStrategy;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.TransactionLog;
-using EventFilter = EventStore.Core.Services.Storage.ReaderIndex.EventFilter;
-using StreamMetadata = EventStore.Core.Data.StreamMetadata;
-
-namespace EventStore.Core.Tests.Services.PersistentSubscription {
-	public enum EventSource {
-		SingleStream,
-		AllStream,
-		FilteredAllStream
-	}
-
-	[TestFixture(EventSource.SingleStream)]
-	[TestFixture(EventSource.AllStream)]
-	[TestFixture(EventSource.FilteredAllStream)]
-	public class when_creating_persistent_subscription {
-		private Core.Services.PersistentSubscription.PersistentSubscription _sub;
-		private readonly EventSource _eventSource;
-		private readonly string _streamName;
-
-		public when_creating_persistent_subscription(EventSource eventSource) {
-			_eventSource = eventSource;
-			_streamName = _eventSource switch {
-				EventSource.AllStream => "$all",
-				EventSource.FilteredAllStream => "$all",
-				EventSource.SingleStream => "streamName",
-				_ => throw new InvalidOperationException()
-			};
-		}
-
-		[OneTimeSetUp]
-		public void Setup() {
-			_sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-					Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-						.WithEventLoader(new FakeStreamReader())
-						.WithCheckpointReader(new FakeCheckpointReader())
-						.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-						.WithMessageParker(new FakeMessageParker()));
-		}
-
-		[Test]
-		public void subscription_id_is_set() {
-			Assert.AreEqual(_streamName + ":groupName", _sub.SubscriptionId);
-		}
-
-		[Test]
-		public void stream_name_is_set() {
-			Assert.AreEqual(_streamName, _sub.EventSource.ToString());
-		}
-
-		[Test]
-		public void group_name_is_set() {
-			Assert.AreEqual("groupName", _sub.GroupName);
-		}
-
-		[Test]
-		public void there_are_no_clients() {
-			Assert.IsFalse(_sub.HasClients);
-			Assert.AreEqual(0, _sub.ClientCount);
-		}
-
-		[Test]
-		public void null_checkpoint_reader_throws_argument_null() {
-			Assert.Throws<ArgumentNullException>(() => {
-				_sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-					Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-						.WithEventLoader(new FakeStreamReader())
-						.WithCheckpointReader(null)
-						.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-						.WithMessageParker(new FakeMessageParker()));
-			});
-		}
-
-		[Test]
-		public void null_checkpoint_writer_throws_argument_null() {
-			Assert.Throws<ArgumentNullException>(() => {
-				_sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-					Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-						.WithEventLoader(new FakeStreamReader())
-						.WithCheckpointReader(new FakeCheckpointReader())
-						.WithCheckpointWriter(null)
-						.WithMessageParker(new FakeMessageParker()));
-			});
-		}
-
-
-		[Test]
-		public void null_event_reader_throws_argument_null() {
-			Assert.Throws<ArgumentNullException>(() => {
-				_sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-					Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-						.WithEventLoader(null)
-						.WithCheckpointReader(new FakeCheckpointReader())
-						.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-						.WithMessageParker(new FakeMessageParker()));
-			});
-		}
-
-		[Test]
-		public void null_stream_throws_argument_null() {
-			if (_eventSource != EventSource.SingleStream) {
-				return;
-			}
-
-			Assert.Throws<ArgumentNullException>(() => {
-				_sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-					PersistentSubscriptionToStreamParamsBuilder.CreateFor(null, "groupName")
-						.WithEventLoader(new FakeStreamReader())
-						.WithCheckpointReader(new FakeCheckpointReader())
-						.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-						.WithMessageParker(new FakeMessageParker()));
-			});
-		}
-
-		[Test]
-		public void null_groupname_throws_argument_null() {
-			switch (_eventSource)
-			{
-				case EventSource.SingleStream:
-					Assert.Throws<ArgumentNullException>(() => {
-						_sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-							PersistentSubscriptionToStreamParamsBuilder.CreateFor("streamName", null)
-								.WithEventLoader(new FakeStreamReader())
-								.WithCheckpointReader(new FakeCheckpointReader())
-								.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-								.WithMessageParker(new FakeMessageParker()));
-					});
-					break;
-				case EventSource.AllStream:
-					Assert.Throws<ArgumentNullException>(() => {
-						_sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-							PersistentSubscriptionToAllParamsBuilder.CreateFor(null)
-								.WithEventLoader(new FakeStreamReader())
-								.WithCheckpointReader(new FakeCheckpointReader())
-								.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-								.WithMessageParker(new FakeMessageParker()));
-					});
-					break;
-			}
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_updating_all_stream_subscription_with_filter<TLogFormat, TStreamId> {
-
-		private readonly PersistentSubscriptionService<TStreamId> _sut;
-		private readonly FakeStorage _storage;
-		private ClientMessage.CreatePersistentSubscriptionToAll _create;
-		private IEventFilter _filterWhenCreate = EventFilter.EventType.Prefixes(isAllStream: true, new[] { "prefixFilter" });
-
-		public when_updating_all_stream_subscription_with_filter() {
-			var bus = new SynchronousScheduler();
-			var ioDispatcher = new IODispatcher(bus, bus);
-			var trackers = new Trackers();
-
-			_storage = new FakeStorage(cfgs => cfgs.Count() >= 2);
-
-			bus.Subscribe<ClientMessage.ReadStreamEventsBackward>(_storage);
-			bus.Subscribe<ClientMessage.WriteEvents>(_storage);
-			bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(ioDispatcher.BackwardReader);
-			bus.Subscribe<ClientMessage.WriteEventsCompleted>(ioDispatcher.Writer);
-
-			_sut = new PersistentSubscriptionService<TStreamId>(
-				new QueuedHandlerThreadPool(bus, "test", new QueueStatsManager(), new QueueTrackers()),
-				new FakeReadIndex<TLogFormat,TStreamId>(_ => false, new MetaStreamLookup()),
-				ioDispatcher, bus,
-				new PersistentSubscriptionConsumerStrategyRegistry(bus, bus,
-					Array.Empty<IPersistentSubscriptionConsumerStrategyFactory>()), trackers.PersistentSubscriptionTracker);
-
-			_sut.Start();
-			_sut.Handle(new SystemMessage.BecomeLeader(correlationId: Guid.NewGuid()));
-			_sut.Handle(CreateMessage());
-		}
-
-		[Test]
-		public async Task should_not_overwrite_filter() {
-
-			_sut.Handle(UpdateMessage(_create.GroupName, new NoopEnvelope()));
-
-			await _storage.FinishedWriting.Task;
-
-			var filterWhenCreateDto = EventFilter.ParseToDto(_filterWhenCreate);
-			var allFiltersSet = _storage.Configurtations.All(
-				cfg => cfg.Entries.All(
-					e => (e.Filter is not null
-						&& e.Filter.Data.Equals(filterWhenCreateDto.Data)
-						&& e.Filter.IsAllStream)));
-
-			Assert.True(allFiltersSet, "Expected all filters to be set!");
-		}
-
-		[Test]
-		public async Task non_existent_replies_DoesNotExist() {
-			var envelope = new TcsEnvelope<ClientMessage.UpdatePersistentSubscriptionToAllCompleted>();
-			_sut.Handle(UpdateMessage("nonexistent", envelope));
-
-			var response = await envelope.Task;
-
-			Assert.AreEqual(
-				ClientMessage.UpdatePersistentSubscriptionToAllCompleted.UpdatePersistentSubscriptionToAllResult.DoesNotExist,
-				response.Result);
-
-			Assert.AreEqual("Group 'nonexistent' does not exist.", response.Reason);
-		}
-
-		private ClientMessage.CreatePersistentSubscriptionToAll CreateMessage() {
-			_create = new ClientMessage.CreatePersistentSubscriptionToAll(
-				internalCorrId: Guid.NewGuid(),
-				correlationId: Guid.NewGuid(),
-				envelope: new NoopEnvelope(),
-				groupName: "someGroup",
-				eventFilter: _filterWhenCreate,
-				resolveLinkTos: false,
-				startFrom: new(0, 0),
-				messageTimeoutMilliseconds: -1, false,
-				maxRetryCount: 0,
-				bufferSize: 10,
-				liveBufferSize: 0,
-				readbatchSize: 5,
-				checkPointAfterMilliseconds: 0,
-				minCheckPointCount: 0,
-				maxCheckPointCount: 0,
-				maxSubscriberCount: 0,
-				namedConsumerStrategy: "Pinned",
-				user: ClaimsPrincipal.Current);
-
-			return _create;
-		}
-
-		private ClientMessage.UpdatePersistentSubscriptionToAll UpdateMessage(string name, IEnvelope envelope) => new(
-			internalCorrId: Guid.NewGuid(),
-			correlationId: Guid.NewGuid(),
-			envelope: envelope,
-			groupName: name,
-			resolveLinkTos: _create.ResolveLinkTos,
-			startFrom: _create.StartFrom,
-			messageTimeoutMilliseconds: _create.MessageTimeoutMilliseconds,
-			recordStatistics: _create.RecordStatistics,
-			maxRetryCount: _create.MaxRetryCount,
-			bufferSize: _create.BufferSize,
-			liveBufferSize: _create.LiveBufferSize,
-			readbatchSize: _create.ReadBatchSize,
-			checkPointAfterMilliseconds: _create.CheckPointAfterMilliseconds,
-			minCheckPointCount: _create.MinCheckPointCount,
-			maxCheckPointCount: _create.MaxCheckPointCount,
-			maxSubscriberCount: _create.MaxSubscriberCount,
-			namedConsumerStrategy: _create.NamedConsumerStrategy,
-			user: ClaimsPrincipal.Current);
-
-		private class FakeStorage :
-			IHandle<ClientMessage.ReadStreamEventsBackward>,
-			IHandle<ClientMessage.WriteEvents> {
-			private readonly Func<IEnumerable<PersistentSubscriptionConfig>, bool> _isDoneWriting;
-			private readonly List<PersistentSubscriptionConfig> _configurations = new();
-			private readonly Dictionary<string, List<Event>> _streams = new();
-			private readonly TaskCompletionSource _tcs = new();
-
-			public IEnumerable<PersistentSubscriptionConfig> Configurtations => _configurations;
-			public TaskCompletionSource FinishedWriting => _tcs;
-
-			public FakeStorage(Func<IEnumerable<PersistentSubscriptionConfig>, bool> isDoneWriting) {
-				_isDoneWriting = isDoneWriting;
-			}
-
-			public void Handle(ClientMessage.ReadStreamEventsBackward msg) {
-				Data.ReadStreamResult result = Data.ReadStreamResult.NoStream;
-				List<ResolvedEvent> resolvedEvents = new();
-
-				if (_streams.TryGetValue(msg.EventStreamId, out var events)) {
-					result = Data.ReadStreamResult.Success;
-
-					foreach (var ev in events) {
-						var prepareLogRecord = new PrepareLogRecord(
-							// values of most fields are not used and not important for the test
-							logPosition: 0,
-							correlationId: Guid.NewGuid(),
-							eventId: Guid.NewGuid(),
-							transactionPosition: 0,
-							transactionOffset: 0,
-							eventStreamId: msg.EventStreamId,
-							eventStreamIdSize: null,
-							expectedVersion: 0,
-							timeStamp: DateTime.UtcNow,
-							PrepareFlags.Data,
-							eventType: ev.EventType,
-							eventTypeSize: null,
-							data: Array.Empty<byte>(),
-							metadata: Array.Empty<byte>());
-
-						var evRec = new EventRecord(0, prepareLogRecord, msg.EventStreamId, ev.EventType);
-						resolvedEvents.Add(ResolvedEvent.ForUnresolvedEvent(evRec));
-					}
-				}
-
-				msg.Envelope.ReplyWith(new ClientMessage.ReadStreamEventsBackwardCompleted(
-					// values of most fields are not used and not important for the test
-					correlationId: msg.CorrelationId,
-					eventStreamId: msg.EventStreamId,
-					fromEventNumber: 0,
-					maxCount: msg.MaxCount,
-					result: result,
-					events: resolvedEvents.ToArray(),
-					streamMetadata: new StreamMetadata(),
-					isCachePublic: false,
-					error: null,
-					nextEventNumber: -1,
-					lastEventNumber: 0,
-					isEndOfStream: true,
-					tfLastCommitPosition: 0));
-			}
-
-			public void Handle(ClientMessage.WriteEvents msg) {
-				if (!_streams.TryGetValue(msg.EventStreamId, out var events)) {
-					events = new List<Event>();
-					_streams.Add(msg.EventStreamId, events);
-				}
-
-				events.AddRange(msg.Events);
-
-				if (msg.Events.Any(ee => ee.EventType == "$PersistentConfig")) {
-					var cfg = PersistentSubscriptionConfig.FromSerializedForm(msg.Events[0].Data);
-					_configurations.Add(cfg);
-
-					if (_isDoneWriting(_configurations)) {
-						_tcs.SetResult();
-					}
-				}
-
-				msg.Envelope.ReplyWith(new ClientMessage.WriteEventsCompleted(
-					// values are not used and not important for the test
-					msg.CorrelationId,
-					firstEventNumber: 0,
-					lastEventNumber: 0,
-					preparePosition: 0,
-					commitPosition: 0));
-			}
-		}
-
-		private class MetaStreamLookup : IMetastreamLookup<TStreamId> {
-			public bool IsMetaStream(TStreamId streamId) => throw new NotSupportedException();
-
-			public TStreamId MetaStreamOf(TStreamId streamId) => throw new NotSupportedException();
-
-			public TStreamId OriginalStreamOf(TStreamId streamId) => throw new NotSupportedException();
-		}
-	}
-
-
-	[TestFixture(EventSource.SingleStream)]
-	[TestFixture(EventSource.AllStream)]
-	[TestFixture(EventSource.FilteredAllStream)]
-	public class LiveTests {
-		private readonly EventSource _eventSource;
-
-		public LiveTests(EventSource eventSource) {
-			_eventSource = eventSource;
-		}
-
-		[Test]
-		public void live_subscription_pushes_events_to_client() {
-			var envelope = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromCurrent());
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope, 10, "foo", "bar");
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource));
-			Assert.AreEqual(1, envelope.Replies.Count);
-		}
-
-		[Test]
-		public void live_subscription_with_round_robin_two_pushes_events_to_both() {
-			var envelope1 = new FakeEnvelope();
-			var envelope2 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.PreferRoundRobin()
-					.StartFromCurrent());
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope2, 10, "foo", "bar");
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(1, _eventSource));
-			Assert.AreEqual(1, envelope1.Replies.Count);
-			Assert.AreEqual(1, envelope2.Replies.Count);
-		}
-
-		[Test]
-		public void live_subscription_with_prefer_one_and_two_pushes_events_to_both() {
-			var envelope1 = new FakeEnvelope();
-			var envelope2 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.PreferDispatchToSingle()
-					.StartFromCurrent());
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope2, 10, "foo", "bar");
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(1, _eventSource));
-			Assert.AreEqual(2, envelope1.Replies.Count);
-		}
-
-
-		[Test]
-		public void subscription_with_pull_sends_data_to_client() {
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromBeginning());
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.HandleReadCompleted(new[] {Helper.GetFakeEventFor(0, _eventSource)}, Helper.GetStreamPositionFor(1, _eventSource), false);
-			Assert.AreEqual(1, envelope1.Replies.Count);
-		}
-
-		[Test]
-		public void subscription_with_pull_does_not_crash_if_not_ready_yet() {
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromBeginning());
-			Assert.DoesNotThrow(() => {
-				sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-				sub.HandleReadCompleted(new[] {Helper.GetFakeEventFor( 0, _eventSource)}, Helper.GetStreamPositionFor(1, _eventSource),
-					false);
-			});
-		}
-
-		[Test]
-		public void subscription_with_live_data_does_not_crash_if_not_ready_yet() {
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromBeginning());
-			Assert.DoesNotThrow(() => {
-				sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-				sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource));
-			});
-		}
-
-
-		[Test]
-		public void subscription_with_pull_and_round_robin_set_and_two_clients_sends_data_to_client() {
-			var envelope1 = new FakeEnvelope();
-			var envelope2 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.PreferRoundRobin()
-					.StartFromBeginning());
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope2, 10, "foo", "bar");
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource)
-			}, Helper.GetStreamPositionFor(2, _eventSource), false);
-			Assert.AreEqual(1, envelope1.Replies.Count);
-			Assert.AreEqual(1, envelope2.Replies.Count);
-		}
-
-
-		[Test]
-		public void subscription_with_pull_and_prefer_one_set_and_two_clients_sends_data_to_one_client() {
-			var envelope1 = new FakeEnvelope();
-			var envelope2 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.PreferDispatchToSingle()
-					.StartFromBeginning());
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope2, 10, "foo", "bar");
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource)
-			}, Helper.GetStreamPositionFor(2, _eventSource), false);
-			Assert.AreEqual(2, envelope1.Replies.Count);
-		}
-
-		[Test]
-		public async Task
-			when_reading_end_of_stream_and_a_live_event_is_received_subscription_should_read_stream_again() {
-			var eventsFoundSource = new TaskCompletionSource<bool>();
-			var envelope = new FakeEnvelope();
-			var checkpointReader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader(
-						(stream, startEventNumber, countToLoad, batchSize, maxWindowSize, resolveLinkTos, skipFirstEvent, onEventsFound) => {
-							List<ResolvedEvent> events = new List<ResolvedEvent>();
-							int nextPosition;
-							bool isEndOfStream;
-
-							if (startEventNumber.Equals(Helper.GetStreamPositionFor(0, _eventSource))) {
-								//Existing events: #0, #1, #2
-								if (!skipFirstEvent) {
-									events.Add(Helper.GetFakeEventFor(0, _eventSource));
-								}
-								events.Add(Helper.GetFakeEventFor(1, _eventSource));
-								events.Add(Helper.GetFakeEventFor(2, _eventSource));
-								nextPosition = 3;
-								isEndOfStream = true;
-							} else if (startEventNumber.Equals(Helper.GetStreamPositionFor(3, _eventSource))) {
-								//New live event: #3
-								events.Add(Helper.GetFakeEventFor(3, _eventSource));
-								nextPosition = 4;
-								isEndOfStream = true;
-							} else {
-								throw new Exception("Invalid start event number: " + startEventNumber);
-							}
-
-							Task.Delay(100).ContinueWith(action => {
-								onEventsFound(events.ToArray(), Helper.GetStreamPositionFor(nextPosition, _eventSource), isEndOfStream);
-								if (startEventNumber.Equals(Helper.GetStreamPositionFor(3, _eventSource))) {
-									eventsFoundSource.TrySetResult(true);
-								}
-							});
-						}))
-					.WithCheckpointReader(checkpointReader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromBeginning());
-
-			//load the existing checkpoint at event #0
-			//this should trigger reading of events #0, #1 and #2 reaching the end of stream.
-			//the read is handled by the subscription after 100ms
-			checkpointReader.Load(Helper.GetStreamPositionFor(0, _eventSource).ToString());
-
-			//Meanwhile, during this 100ms time window, a new live event #3 comes in and subscription is notified
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(3, _eventSource));
-
-			await eventsFoundSource.Task;
-
-			//the read handled by the subscription after 100ms should trigger a second read to obtain the event #3 (which will be handled after 100ms more)
-
-			//a subscriber coming in a while later, should receive all 3 events
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope, 10, "foo", "bar");
-
-			//all 3 events should be received by the subscriber (except event 0 - the checkpoint which is skipped)
-			Assert.AreEqual(3, envelope.Replies.Count);
-		}
-	}
-
-	public class FilteredAllTests {
-		private EventSource _eventSource = EventSource.FilteredAllStream;
-		[Test]
-		public void live_subscription_with_stream_prefix_filter_pushes_matching_events_to_client() {
-			var envelope = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var streamFilter = EventFilter.StreamName.Prefixes(true, "test");
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", streamFilter)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromCurrent());
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope, 10, "foo", "bar");
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource, streamPrefix:"test"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(1, _eventSource, streamPrefix:"something"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(2, _eventSource, streamPrefix:"test"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(3, _eventSource, streamPrefix:"foo"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(4, _eventSource, streamPrefix:"bar"));
-			Assert.AreEqual(2, envelope.Replies.Count);
-		}
-
-		[Test]
-		public void live_subscription_with_stream_regex_filter_pushes_matching_events_to_client() {
-			var envelope = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var streamFilter = EventFilter.StreamName.Regex(true, "^te");
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", streamFilter)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromCurrent());
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope, 10, "foo", "bar");
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource, streamPrefix:"test"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(1, _eventSource, streamPrefix:"ttest"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(2, _eventSource, streamPrefix:"team"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(3, _eventSource, streamPrefix:"tteam"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(4, _eventSource, streamPrefix:"bar"));
-			Assert.AreEqual(2, envelope.Replies.Count);
-		}
-
-		[Test]
-		public void live_subscription_with_event_type_prefix_filter_pushes_matching_events_to_client() {
-			var envelope = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var eventFilter = EventFilter.EventType.Prefixes(true, "test");
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", eventFilter)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromCurrent());
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope, 10, "foo", "bar");
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource, eventType:"test"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(1, _eventSource, eventType:"something"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(2, _eventSource, eventType:"test"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(3, _eventSource, eventType:"foo"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(4, _eventSource, eventType:"bar"));
-			Assert.AreEqual(2, envelope.Replies.Count);
-		}
-
-		[Test]
-		public void live_subscription_with_event_type_regex_filter_pushes_matching_events_to_client() {
-			var envelope = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var eventFilter = EventFilter.EventType.Regex(true, "^te");
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", eventFilter)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromCurrent());
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope, 10, "foo", "bar");
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource, eventType:"test"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(1, _eventSource, eventType:"ttest"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(2, _eventSource, eventType:"team"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(3, _eventSource, eventType:"tteam"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(4, _eventSource, eventType:"bar"));
-			Assert.AreEqual(2, envelope.Replies.Count);
-		}
-
-		[Test]
-		public void catching_up_subscription_does_write_checkpoint_on_time_when_min_events_have_been_skipped() {
-			IPersistentSubscriptionStreamPosition cp = null;
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var eventFilter = EventFilter.StreamName.Prefixes(true, "stream");
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", eventFilter)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
-					.PreferDispatchToSingle()
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromBeginning()
-					.MinimumToCheckPoint(1)
-					.MaximumToCheckPoint(5));
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
-
-			sub.HandleSkippedEvents(Helper.GetStreamPositionFor(1, _eventSource), 2);
-			sub.NotifyClockTick(DateTime.UtcNow);
-			Assert.AreEqual(Helper.GetStreamPositionFor(1, _eventSource), cp);
-		}
-
-		[Test]
-		public void catching_up_subscription_does_write_checkpoint_when_max_events_have_been_skipped() {
-			IPersistentSubscriptionStreamPosition cp = null;
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var eventFilter = EventFilter.StreamName.Prefixes(true, "stream");
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", eventFilter)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
-					.PreferDispatchToSingle()
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromBeginning()
-					.MinimumToCheckPoint(1)
-					.MaximumToCheckPoint(5));
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
-
-			sub.HandleSkippedEvents(Helper.GetStreamPositionFor(1, _eventSource), 6);
-
-			Assert.AreEqual(Helper.GetStreamPositionFor(1, _eventSource), cp);
-		}
-
-		[Test]
-		public void catching_up_subscription_does_write_checkpoint_when_max_events_seen_and_some_skipped() {
-			IPersistentSubscriptionStreamPosition cp = null;
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var eventFilter = EventFilter.StreamName.Prefixes(true, "stream");
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", eventFilter)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
-					.PreferDispatchToSingle()
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromBeginning()
-					.MinimumToCheckPoint(1)
-					.MaximumToCheckPoint(5));
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
-
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource)
-			}, Helper.GetStreamPositionFor(2, _eventSource), false);
-			sub.AcknowledgeMessagesProcessed(corrid, new[] {
-				Helper.GetEventIdFor(0),
-				Helper.GetEventIdFor(1),
-			});
-
-			sub.HandleSkippedEvents(Helper.GetStreamPositionFor(2, _eventSource), 3);
-			Assert.AreEqual(Helper.GetStreamPositionFor(2, _eventSource), cp);
-		}
-
-		[Test]
-		public void catching_up_subscription_does_not_write_checkpoint_when_max_events_skipped_and_some_messages_outstanding() {
-			IPersistentSubscriptionStreamPosition cp = null;
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var eventFilter = EventFilter.StreamName.Prefixes(true, "stream");
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", eventFilter)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
-					.PreferDispatchToSingle()
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromBeginning()
-					.MinimumToCheckPoint(1)
-					.MaximumToCheckPoint(5));
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
-
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource)
-			}, Helper.GetStreamPositionFor(2, _eventSource), false);
-
-			sub.HandleSkippedEvents(Helper.GetStreamPositionFor(2, _eventSource), 5);
-			Assert.IsNull(cp);
-		}
-
-		[Test]
-		public void live_subscription_does_write_checkpoint_when_max_events_skipped() {
-			IPersistentSubscriptionStreamPosition cp = null;
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var eventFilter = EventFilter.StreamName.Prefixes(true, "foo");
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", eventFilter)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
-					.PreferDispatchToSingle()
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromBeginning()
-					.MinimumToCheckPoint(1)
-					.MaximumToCheckPoint(5));
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
-
-			sub.HandleReadCompleted(Array.Empty<ResolvedEvent>(), new PersistentSubscriptionAllStreamPosition(0, 0), true);
-
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource, streamPrefix: "test"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(1, _eventSource, streamPrefix: "test"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(2, _eventSource, streamPrefix: "test"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(3, _eventSource, streamPrefix: "test"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(4, _eventSource, streamPrefix: "test"));
-			Assert.AreEqual(Helper.GetStreamPositionFor(4, _eventSource), cp);
-		}
-
-		[Test]
-		public void live_subscription_does_write_checkpoint_on_time_when_min_events_skipped() {
-			IPersistentSubscriptionStreamPosition cp = null;
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var eventFilter = EventFilter.StreamName.Prefixes(true, "foo");
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", eventFilter)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
-					.PreferDispatchToSingle()
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromBeginning()
-					.MinimumToCheckPoint(1)
-					.MaximumToCheckPoint(5));
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
-
-			sub.HandleReadCompleted(Array.Empty<ResolvedEvent>(), new PersistentSubscriptionAllStreamPosition(0, 0), true);
-
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource, streamPrefix: "test"));
-
-			sub.NotifyClockTick(DateTime.UtcNow);
-			Assert.AreEqual(Helper.GetStreamPositionFor(0, _eventSource), cp);
-		}
-
-		[Test]
-		public void live_subscription_does_write_checkpoint_when_max_events_seen_and_some_skipped() {
-			IPersistentSubscriptionStreamPosition cp = null;
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var eventFilter = EventFilter.StreamName.Prefixes(true, "foo");
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", eventFilter)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
-					.PreferDispatchToSingle()
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromBeginning()
-					.MinimumToCheckPoint(1)
-					.MaximumToCheckPoint(5));
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
-
-			sub.HandleReadCompleted(Array.Empty<ResolvedEvent>(), new PersistentSubscriptionAllStreamPosition(0, 0), true);
-
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource, streamPrefix: "foo"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(1, _eventSource, streamPrefix: "foo"));
-			sub.AcknowledgeMessagesProcessed(corrid, new[] {
-				Helper.GetEventIdFor(0),
-				Helper.GetEventIdFor(1),
-			});
-
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(2, _eventSource, streamPrefix: "test"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(3, _eventSource, streamPrefix: "test"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(4, _eventSource, streamPrefix: "test"));
-			Assert.AreEqual(Helper.GetStreamPositionFor(4, _eventSource), cp);
-		}
-
-		[Test]
-		public void live_subscription_does_not_write_checkpoint_when_max_events_skipped_and_some_messages_outstanding() {
-			IPersistentSubscriptionStreamPosition cp = null;
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var eventFilter = EventFilter.StreamName.Prefixes(true, "foo");
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", eventFilter)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
-					.PreferDispatchToSingle()
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromBeginning()
-					.MinimumToCheckPoint(1)
-					.MaximumToCheckPoint(5));
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
-
-			sub.HandleReadCompleted(Array.Empty<ResolvedEvent>(), new PersistentSubscriptionAllStreamPosition(0, 0), true);
-
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource, streamPrefix: "foo"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(1, _eventSource, streamPrefix: "foo"));
-
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(2, _eventSource, streamPrefix: "test"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(3, _eventSource, streamPrefix: "test"));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(4, _eventSource, streamPrefix: "test"));
-			Assert.IsNull(cp);
-		}
-	}
-
-	[TestFixture(EventSource.SingleStream)]
-	[TestFixture(EventSource.AllStream)]
-	[TestFixture(EventSource.FilteredAllStream)]
-	public class DeleteTests {
-		private readonly EventSource _eventSource;
-		public DeleteTests(EventSource eventSource) {
-			_eventSource = eventSource;
-		}
-
-		[Test]
-		public void subscription_deletes_checkpoint_when_deleted() {
-			var reader = new FakeCheckpointReader();
-			var deleted = false;
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }, () => { deleted = true; }))
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromCurrent());
-			reader.Load(null);
-			sub.Delete();
-			Assert.IsTrue(deleted);
-		}
-
-		[Test]
-		public void subscription_deletes_parked_messages_when_deleted() {
-			var reader = new FakeCheckpointReader();
-			var deleted = false;
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker(() => { deleted = true; }))
-					.StartFromCurrent());
-			reader.Load(null);
-			sub.Delete();
-			Assert.IsTrue(deleted);
-		}
-	}
-
-	[TestFixture(EventSource.SingleStream)]
-	[TestFixture(EventSource.AllStream)]
-	[TestFixture(EventSource.FilteredAllStream)]
-	public class SynchronousReadingClient {
-		private readonly EventSource _eventSource;
-		public SynchronousReadingClient(EventSource eventSource) {
-			_eventSource = eventSource;
-		}
-
-		[Test]
-		public void subscription_with_less_than_n_events_returns_less_events_to_the_client() {
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromBeginning());
-			reader.Load(null);
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource)
-			}, Helper.GetStreamPositionFor(2, _eventSource), false);
-			var result = sub.GetNextNOrLessMessages(5).ToArray();
-			Assert.AreEqual(2, result.Length);
-			Assert.AreEqual(Helper.GetEventIdFor(0), result[0].ResolvedEvent.Event.EventId);
-			Assert.AreEqual(Helper.GetEventIdFor(1), result[1].ResolvedEvent.Event.EventId);
-		}
-
-		[Test]
-		public void subscription_with_n_events_returns_n_events_to_the_client() {
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromBeginning());
-			reader.Load(null);
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource)
-			}, Helper.GetStreamPositionFor(2, _eventSource), false);
-			var result = sub.GetNextNOrLessMessages(2).ToArray();
-			Assert.AreEqual(2, result.Length);
-			Assert.AreEqual(Helper.GetEventIdFor(0), result[0].ResolvedEvent.Event.EventId);
-			Assert.AreEqual(Helper.GetEventIdFor(1), result[1].ResolvedEvent.Event.EventId);
-		}
-
-		[Test]
-		public void subscription_with_more_than_n_events_returns_n_events_to_the_client() {
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromBeginning());
-			reader.Load(null);
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource),
-				Helper.GetFakeEventFor(2, _eventSource),
-				Helper.GetFakeEventFor(3, _eventSource),
-			}, Helper.GetStreamPositionFor(4, _eventSource), false);
-			var result = sub.GetNextNOrLessMessages(2).ToArray();
-			Assert.AreEqual(2, result.Length);
-			Assert.AreEqual(Helper.GetEventIdFor(0), result[0].ResolvedEvent.Event.EventId);
-			Assert.AreEqual(Helper.GetEventIdFor(1), result[1].ResolvedEvent.Event.EventId);
-		}
-
-
-		[Test]
-		public void subscription_with_no_events_returns_no_events_to_the_client() {
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromBeginning());
-			reader.Load(null);
-			var result = sub.GetNextNOrLessMessages(5);
-			Assert.AreEqual(0, result.Count());
-		}
-	}
-
-	[TestFixture(EventSource.SingleStream)]
-	[TestFixture(EventSource.AllStream)]
-	[TestFixture(EventSource.FilteredAllStream)]
-	public class Checkpointing {
-		private readonly EventSource _eventSource;
-		public Checkpointing(EventSource eventSource) {
-			_eventSource = eventSource;
-		}
-
-		[Test]
-		public void subscription_does_not_write_checkpoint_when_max_not_hit() {
-			IPersistentSubscriptionStreamPosition cp = null;
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
-					.WithMessageParker(new FakeMessageParker())
-					.PreferDispatchToSingle()
-					.StartFromBeginning()
-					.MinimumToCheckPoint(5)
-					.MaximumToCheckPoint(20));
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource)
-			}, Helper.GetStreamPositionFor(2, _eventSource), false);
-			sub.AcknowledgeMessagesProcessed(corrid, new[] { Helper.GetEventIdFor(0) });
-			Assert.IsNull(cp);
-		}
-
-		[Test]
-		public void subscription_does_not_write_checkpoint_when_min_hit() {
-			IPersistentSubscriptionStreamPosition cp = null;
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
-					.WithMessageParker(new FakeMessageParker())
-					.PreferDispatchToSingle()
-					.StartFromBeginning()
-					.MinimumToCheckPoint(1)
-					.MaximumToCheckPoint(20));
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource)
-			}, Helper.GetStreamPositionFor(2, _eventSource), false);
-			sub.AcknowledgeMessagesProcessed(corrid, new[] { Helper.GetEventIdFor(0) });
-			Assert.IsNull(cp);
-		}
-
-		[Test]
-		public void subscription_does_write_checkpoint_when_max_is_hit() {
-			IPersistentSubscriptionStreamPosition cp = null;
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
-					.WithMessageParker(new FakeMessageParker())
-					.PreferDispatchToSingle()
-					.StartFromBeginning()
-					.MaximumToCheckPoint(1));
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource),
-				Helper.GetFakeEventFor(2, _eventSource),
-			}, Helper.GetStreamPositionFor(3, _eventSource), false);
-			sub.AcknowledgeMessagesProcessed(corrid, new[] {
-				Helper.GetEventIdFor(0),
-				Helper.GetEventIdFor(1),
-			});
-			Assert.AreEqual(Helper.GetStreamPositionFor(1, _eventSource), cp);
-		}
-
-		[Test]
-		public void subscription_does_not_include_outstanding_messages_when_max_is_hit() {
-			IPersistentSubscriptionStreamPosition cp = null;
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
-					.WithMessageParker(new FakeMessageParker())
-					.PreferDispatchToSingle()
-					.StartFromBeginning()
-					.MaximumToCheckPoint(1));
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource),
-				Helper.GetFakeEventFor(2, _eventSource),
-				Helper.GetFakeEventFor(3, _eventSource),
-			}, Helper.GetStreamPositionFor(4, _eventSource), false);
-			sub.AcknowledgeMessagesProcessed(corrid, new[] {
-				Helper.GetEventIdFor(0),
-				Helper.GetEventIdFor(1),
-			});
-			Assert.AreEqual(Helper.GetStreamPositionFor(1, _eventSource), cp);
-		}
-
-		[Test]
-		public void subscription_can_write_checkpoint_for_event_number_0() {
-			IPersistentSubscriptionStreamPosition cp = null;
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
-					.WithMessageParker(new FakeMessageParker())
-					.PreferDispatchToSingle()
-					.StartFromBeginning()
-					.MaximumToCheckPoint(1));
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource),
-				Helper.GetFakeEventFor(2, _eventSource),
-				Helper.GetFakeEventFor(3, _eventSource),
-			}, Helper.GetStreamPositionFor(4, _eventSource), false);
-			sub.AcknowledgeMessagesProcessed(corrid, new[] {
-				Helper.GetEventIdFor(0),
-			});
-
-			Assert.AreEqual(Helper.GetStreamPositionFor(0, _eventSource), cp);
-		}
-
-		[Test]
-		public void subscription_checkpoints_when_message_parked_and_max_is_hit() {
-			IPersistentSubscriptionStreamPosition cp = null;
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
-					.WithMessageParker(new FakeMessageParker())
-					.PreferDispatchToSingle()
-					.StartFromBeginning()
-					.MaximumToCheckPoint(1));
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource),
-				Helper.GetFakeEventFor(2, _eventSource),
-				Helper.GetFakeEventFor(3, _eventSource),
-			}, Helper.GetStreamPositionFor(4, _eventSource), false);
-			sub.AcknowledgeMessagesProcessed(corrid, new[] { Helper.GetEventIdFor(0), Helper.GetEventIdFor(2) });
-			sub.NotAcknowledgeMessagesProcessed(corrid, new[] { Helper.GetEventIdFor(1) }, NakAction.Park, "test park");
-			Assert.AreEqual(Helper.GetStreamPositionFor(2, _eventSource), cp);
-		}
-
-		[Test]
-		public void subscription_does_not_include_retry_messages_when_max_is_hit() {
-			IPersistentSubscriptionStreamPosition cp = null;
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
-					.WithMessageParker(new FakeMessageParker())
-					.PreferDispatchToSingle()
-					.StartFromBeginning()
-					.MaximumToCheckPoint(1));
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource),
-				Helper.GetFakeEventFor(2, _eventSource),
-				Helper.GetFakeEventFor(3, _eventSource),
-			}, Helper.GetStreamPositionFor(4, _eventSource), false);
-			sub.NotAcknowledgeMessagesProcessed(corrid, new[] {
-				Helper.GetEventIdFor(2)
-			}, NakAction.Retry, "test retry");
-			sub.AcknowledgeMessagesProcessed(corrid, new[] {
-				Helper.GetEventIdFor(0),
-				Helper.GetEventIdFor(1),
-				Helper.GetEventIdFor(3),
-			});
-			Assert.AreEqual(Helper.GetStreamPositionFor(1, _eventSource), cp);
-		}
-
-		[Test]
-		public void subscription_does_include_all_messages_when_no_retries_or_outstanding_and_max_is_hit() {
-			IPersistentSubscriptionStreamPosition cp = null;
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
-					.WithMessageParker(new FakeMessageParker())
-					.PreferDispatchToSingle()
-					.StartFromBeginning()
-					.MaximumToCheckPoint(1));
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource),
-				Helper.GetFakeEventFor(2, _eventSource)
-			}, Helper.GetStreamPositionFor(3, _eventSource), false);
-			sub.AcknowledgeMessagesProcessed(corrid, new[] {
-				Helper.GetEventIdFor(0),
-				Helper.GetEventIdFor(1),
-				Helper.GetEventIdFor(2)
-			});
-			Assert.AreEqual(Helper.GetStreamPositionFor(2, _eventSource), cp);
-		}
-
-		[Test]
-		public void subscription_does_write_checkpoint_on_time_when_min_is_hit() {
-			IPersistentSubscriptionStreamPosition cp = null;
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
-					.PreferDispatchToSingle()
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromBeginning()
-					.MinimumToCheckPoint(1)
-					.MaximumToCheckPoint(5));
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource),
-				Helper.GetFakeEventFor(2, _eventSource)
-			}, Helper.GetStreamPositionFor(3, _eventSource), false);
-			sub.AcknowledgeMessagesProcessed(corrid, new[] {
-				Helper.GetEventIdFor(0),
-				Helper.GetEventIdFor(1),
-			});
-			sub.NotifyClockTick(DateTime.UtcNow);
-			Assert.AreEqual(Helper.GetStreamPositionFor(1, _eventSource), cp);
-		}
-
-		[Test]
-		public void subscription_does_not_write_checkpoint_on_time_when_min_is_not_hit() {
-			IPersistentSubscriptionStreamPosition cp = null;
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
-					.WithMessageParker(new FakeMessageParker())
-					.PreferDispatchToSingle()
-					.StartFromBeginning()
-					.MinimumToCheckPoint(2)
-					.MaximumToCheckPoint(5));
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource),
-				Helper.GetFakeEventFor(2, _eventSource)
-			}, Helper.GetStreamPositionFor(3, _eventSource), false);
-			sub.AcknowledgeMessagesProcessed(corrid, new[] {
-				Helper.GetEventIdFor(0),
-				Helper.GetEventIdFor(1),
-			});
-			sub.NotifyClockTick(DateTime.UtcNow);
-			Assert.AreEqual(Helper.GetStreamPositionFor(1, _eventSource), cp);
-		}
-
-		[Test]
-		public void subscription_does_write_checkpoint_for_disconnected_clients_on_time_when_min_is_hit() {
-			IPersistentSubscriptionStreamPosition cp = null;
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromBeginning()
-					.MinimumToCheckPoint(1)
-					.MaximumToCheckPoint(5));
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource),
-			}, Helper.GetStreamPositionFor(2, _eventSource), false);
-			sub.GetNextNOrLessMessages(2).ToArray();
-			sub.AcknowledgeMessagesProcessed(corrid, new[] {
-				Helper.GetEventIdFor(0),
-				Helper.GetEventIdFor(1),
-			});
-			sub.NotifyClockTick(DateTime.UtcNow);
-			Assert.AreEqual(Helper.GetStreamPositionFor(1, _eventSource), cp);
-		}
-
-		[Test]
-		public void
-			subscription_writes_correct_checkpoint_when_outstanding_messages_is_empty_and_retry_buffer_is_non_empty() {
-			IPersistentSubscriptionStreamPosition cp = null;
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromBeginning()
-					.MinimumToCheckPoint(1)
-					.MaximumToCheckPoint(1));
-			reader.Load(null);
-
-			var clientConnectionId = Guid.NewGuid();
-			var clientCorrelationId = Guid.NewGuid();
-			sub.AddClient(clientCorrelationId, clientConnectionId, "connection-1", new FakeEnvelope(), 10, "foo", "bar");
-
-			//send events 1-3, ACK event 1 only and Mark checkpoint
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(1, _eventSource),
-				Helper.GetFakeEventFor(2, _eventSource),
-				Helper.GetFakeEventFor(3, _eventSource),
-			}, Helper.GetStreamPositionFor(4, _eventSource), false);
-			sub.GetNextNOrLessMessages(3).ToArray();
-			sub.AcknowledgeMessagesProcessed(clientCorrelationId, new[] {
-				Helper.GetEventIdFor(1)
-			});
-			sub.TryMarkCheckpoint(false);
-
-			//checkpoint should be at event 1
-			Assert.AreEqual(Helper.GetStreamPositionFor(1, _eventSource), cp);
-
-			//events 2 & 3 should still be in _outstandingMessages buffer
-			Assert.AreEqual(sub.OutstandingMessageCount, 2);
-			//retry queue should be empty
-			Assert.True(sub.TryGetStreamBuffer(out var streamBuffer));
-			Assert.AreEqual(streamBuffer.RetryBufferCount, 0);
-
-			//Disconnect the client
-			Assert.IsTrue(sub.RemoveClientByConnectionId(clientConnectionId));
-
-			//this should empty the _outstandingMessages buffer and move events 2 & 3 to the retry queue
-			Assert.AreEqual(sub.OutstandingMessageCount, 0);
-			Assert.AreEqual(streamBuffer.RetryBufferCount, 2);
-
-			//mark the checkpoint which should still be at event 1 although the _lastKnownMessage value is 3.
-			sub.TryMarkCheckpoint(false);
-			Assert.AreEqual(Helper.GetStreamPositionFor(1, _eventSource), cp);
-		}
-
-		[Test]
-		public void
-			subscription_ignores_replayed_events_when_checkpointing() {
-			IPersistentSubscriptionStreamPosition cp = null;
-			var reader = new FakeCheckpointReader();
-			var messageParker = new FakeMessageParker();
-
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
-					.WithMessageParker(messageParker)
-					.StartFromBeginning()
-					.MinimumToCheckPoint(1)
-					.MaximumToCheckPoint(1));
-			reader.Load(null);
-
-			var clientConnectionId = Guid.NewGuid();
-			var clientCorrelationId = Guid.NewGuid();
-			sub.AddClient(clientCorrelationId, clientConnectionId, "connection-1", new FakeEnvelope(), 10, "foo", "bar");
-
-			//handle event number 4@streamName
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(4, _eventSource)
-			}, Helper.GetStreamPositionFor(5, _eventSource), true);
-
-			//get the message and acknowledge receipt
-			sub.GetNextNOrLessMessages(1).ToArray();
-			sub.AcknowledgeMessagesProcessed(clientCorrelationId, new[] { Helper.GetEventIdFor(4) });
-
-			//mark checkpoint and verify that event 4 has been checkpointed
-			sub.TryMarkCheckpoint(false);
-			Assert.AreEqual(Helper.GetStreamPositionFor(4, _eventSource), cp);
-
-			//park an event (this can be done earlier too)
-			var parkedEventId = Guid.NewGuid();
-			var parkedEvent = Helper.BuildFakeEvent(parkedEventId, "type", "$persistentsubscription-streamName::groupName-parked", 15, 15, 15);
-			messageParker.BeginParkMessage(parkedEvent, "parked", (ev, res) => { });
-
-			//retry parked events (this sets correct _state flag so that we can call HandleParkedReadCompleted below)
-			sub.RetryParkedMessages(null);
-
-			//handle parked event 15@$persistentsubscription-streamName::groupName-parked
-			//this should send the parked event to the retry buffer.
-			sub.HandleParkedReadCompleted(new[] {
-				parkedEvent,
-			}, new PersistentSubscriptionSingleStreamPosition(16), true, 17);
-
-			//checkpoint should still be at 4.
-			sub.TryMarkCheckpoint(false);
-			Assert.AreEqual(Helper.GetStreamPositionFor(4, _eventSource), cp);
-
-			//get the message, this should send the parked event to the outstanding message cache
-			sub.GetNextNOrLessMessages(1).ToArray();
-
-			//checkpoint should still be at 4.
-			sub.TryMarkCheckpoint(false);
-			Assert.AreEqual(Helper.GetStreamPositionFor(4, _eventSource), cp);
-
-			//acknowledge receipt of message. the parked event is no longer in retry or outstanding message buffers
-			sub.AcknowledgeMessagesProcessed(clientCorrelationId, new[] { parkedEventId });
-
-			//checkpoint should still be at 4.
-			sub.TryMarkCheckpoint(false);
-			Assert.AreEqual(Helper.GetStreamPositionFor(4, _eventSource), cp);
-		}
-	}
-
-	[TestFixture(EventSource.SingleStream)]
-	[TestFixture(EventSource.AllStream)]
-	[TestFixture(EventSource.FilteredAllStream)]
-	public class LoadCheckpointTests {
-		private readonly EventSource _eventSource;
-		public LoadCheckpointTests(EventSource eventSource) {
-			_eventSource = eventSource;
-		}
-
-		[Test]
-		public void loading_subscription_from_checkpoint_should_set_the_skip_first_event_flag() {
-			bool skip = false;
-			var reader = new FakeCheckpointReader();
-			var streamReader = new FakeStreamReader(
-				(stream, startPosition, countToLoad, batchSize, maxWindowSize, resolveLinkTos, skipFirstEvent, onEventsFound) =>
-				{ skip = skipFirstEvent; }
-			);
-			new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(streamReader)
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.PreferDispatchToSingle()
-					.StartFromBeginning()
-					.MaximumToCheckPoint(1));
-			switch (_eventSource)
-			{
-				case EventSource.SingleStream:
-					reader.Load("1");
-					break;
-				case EventSource.AllStream:
-				case EventSource.FilteredAllStream:
-					reader.Load("C:1/P:1");
-					break;
-			}
-			Assert.IsTrue(skip);
-		}
-
-		[Test]
-		public void loading_subscription_from_checkpoint_should_set_the_last_known_event_number() {
-			var reader = new FakeCheckpointReader();
-			var streamReader = new FakeStreamReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(streamReader)
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.PreferDispatchToSingle()
-					.StartFromBeginning()
-					.MaximumToCheckPoint(1));
-			string checkpoint = "";
-			switch (_eventSource)
-			{
-				case EventSource.SingleStream:
-					checkpoint = "1";
-					reader.Load(checkpoint);
-					break;
-				case EventSource.AllStream:
-				case EventSource.FilteredAllStream:
-					checkpoint = "C:1/P:1";
-					reader.Load(checkpoint);
-					break;
-			}
-
-			var info = sub.GetStatistics();
-			Assert.AreEqual(checkpoint, info.LastCheckpointedEventPosition);
-		}
-
-		[Test]
-		public void loading_subscription_from_no_checkpoint_and_no_start_from_should_read_from_beginning_of_stream() {
-			IPersistentSubscriptionStreamPosition actualStart = null;
-			var reader = new FakeCheckpointReader();
-			var streamReader = new FakeStreamReader(
-				(stream, startPosition, countToLoad, batchSize, maxWindowSize, resolveLinkTos, skipFirstEvent, onEventsFound) => {
-					actualStart = startPosition;
-				});
-			new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(streamReader)
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.PreferDispatchToSingle()
-					.StartFromBeginning()
-					.MaximumToCheckPoint(1));
-			reader.Load(null);
-
-			switch (_eventSource)
-			{
-				case EventSource.SingleStream:
-					Assert.AreEqual(new PersistentSubscriptionSingleStreamPosition(0L), actualStart);
-					break;
-				case EventSource.AllStream:
-				case EventSource.FilteredAllStream:
-					Assert.AreEqual(new PersistentSubscriptionAllStreamPosition(0L, 0L), actualStart);
-					break;
-			}
-		}
-
-		[Test]
-		public void loading_subscription_from_no_checkpoint_and_start_from_is_set_should_read_from_start_from() {
-			IPersistentSubscriptionStreamPosition actualStart = null;
-
-			var reader = new FakeCheckpointReader();
-			var streamReader = new FakeStreamReader(
-				(stream, startPosition, countToLoad, batchSize, maxWindowSize, resolveLinkTos, skipFirstEvent, onEventsFound) => {
-					actualStart = startPosition;
-				});
-			IPersistentSubscriptionStreamPosition startFrom = _eventSource switch {
-				EventSource.SingleStream => new PersistentSubscriptionSingleStreamPosition(10),
-				EventSource.AllStream => new PersistentSubscriptionAllStreamPosition(10, 10),
-				EventSource.FilteredAllStream => new PersistentSubscriptionAllStreamPosition(10, 10),
-				_ => null
-			};
-
-			new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(streamReader)
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.PreferDispatchToSingle()
-					.StartFrom(startFrom)
-					.MaximumToCheckPoint(1));
-			reader.Load(null);
-
-			Assert.AreEqual(startFrom, actualStart);
-		}
-	}
-
-	[TestFixture(EventSource.SingleStream)]
-	[TestFixture(EventSource.AllStream)]
-	[TestFixture(EventSource.FilteredAllStream)]
-	public class TimeoutTests {
-		private readonly EventSource _eventSource;
-		public TimeoutTests(EventSource eventSource) {
-			_eventSource = eventSource;
-		}
-
-		[Test]
-		public void with_no_timeouts_to_happen_no_timeouts_happen() {
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var parker = new FakeMessageParker();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
-					.WithMessageParker(parker)
-					.PreferDispatchToSingle()
-					.StartFromBeginning()
-					.WithMessageTimeoutOf(TimeSpan.FromSeconds(3)));
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource),
-			}, Helper.GetStreamPositionFor(2, _eventSource), false);
-			envelope1.Replies.Clear();
-			sub.NotifyClockTick(DateTime.UtcNow.AddSeconds(1));
-			Assert.AreEqual(0, envelope1.Replies.Count);
-			Assert.AreEqual(0, parker.ParkedEvents.Count);
-		}
-
-		[Test]
-		public void messages_get_timed_out_and_resent_to_clients() {
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var parker = new FakeMessageParker();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
-					.WithMessageParker(parker)
-					.PreferDispatchToSingle()
-					.StartFromBeginning()
-					.WithMessageTimeoutOf(TimeSpan.FromSeconds(1)));
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 1, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 1, "foo", "bar");
-			var id1 = Guid.NewGuid();
-			var id2 = Guid.NewGuid();
-			sub.HandleReadCompleted(new[] {
-				Helper.BuildFakeEvent(id1, "type", "streamName", 0, 1, 1),
-				Helper.BuildLinkEvent(id2, "streamName", 1,
-					Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamSource", 0, 0, 0), false, 2, 2)
-			}, Helper.GetStreamPositionFor(1, _eventSource), false);
-			envelope1.Replies.Clear();
-			sub.NotifyClockTick(DateTime.UtcNow.AddSeconds(3));
-			Assert.AreEqual(2, envelope1.Replies.Count);
-			var msg1 = (Messages.ClientMessage.PersistentSubscriptionStreamEventAppeared)envelope1.Replies[0];
-			var msg2 = (Messages.ClientMessage.PersistentSubscriptionStreamEventAppeared)envelope1.Replies[1];
-			Assert.IsTrue(id1 == msg1.Event.OriginalEvent.EventId || id1 == msg2.Event.OriginalEvent.EventId);
-			Assert.IsTrue(id2 == msg1.Event.OriginalEvent.EventId || id2 == msg2.Event.OriginalEvent.EventId);
-			Assert.AreEqual(0, parker.ParkedEvents.Count);
-		}
-
-		[Test]
-		public void messages_get_timed_out_on_synchronous_reads() {
-			var reader = new FakeCheckpointReader();
-			var parker = new FakeMessageParker();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
-					.WithMessageParker(parker)
-					.PreferDispatchToSingle()
-					.StartFromBeginning()
-					.WithMessageTimeoutOf(TimeSpan.FromSeconds(1)));
-			reader.Load(null);
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource),
-			}, Helper.GetStreamPositionFor(2, _eventSource), false);
-			sub.GetNextNOrLessMessages(2);
-			sub.NotifyClockTick(DateTime.Now.AddSeconds(3));
-			var retries = sub.GetNextNOrLessMessages(2).ToArray();
-			Assert.AreEqual(Helper.GetEventIdFor(0), retries[0].ResolvedEvent.Event.EventId);
-			Assert.AreEqual(Helper.GetEventIdFor(1), retries[1].ResolvedEvent.Event.EventId);
-			Assert.AreEqual(0, parker.ParkedEvents.Count);
-		}
-
-		[Test]
-		public void messages_dont_get_retried_when_acked_on_synchronous_reads() {
-			var reader = new FakeCheckpointReader();
-			var parker = new FakeMessageParker();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
-					.WithMessageParker(parker)
-					.PreferDispatchToSingle()
-					.StartFromBeginning()
-					.WithMessageTimeoutOf(TimeSpan.FromSeconds(1)));
-			reader.Load(null);
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource),
-			}, Helper.GetStreamPositionFor(2, _eventSource), false);
-			sub.GetNextNOrLessMessages(2).ToArray();
-			sub.AcknowledgeMessagesProcessed(Guid.Empty, new[] {
-				Helper.GetEventIdFor(0),
-				Helper.GetEventIdFor(1),
-			});
-			sub.NotifyClockTick(DateTime.Now.AddSeconds(3));
-			var retries = sub.GetNextNOrLessMessages(2).ToArray();
-			Assert.AreEqual(0, retries.Length);
-			Assert.AreEqual(0, parker.ParkedEvents.Count);
-		}
-
-		[Test]
-		public void message_gets_timed_out_and_parked_after_max_retry_count() {
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var parker = new FakeMessageParker();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
-					.WithMessageParker(parker)
-					.PreferDispatchToSingle()
-					.StartFromBeginning()
-					.WithMaxRetriesOf(0)
-					.WithMessageTimeoutOf(TimeSpan.FromSeconds(1)));
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource)
-			}, Helper.GetStreamPositionFor(1, _eventSource), false);
-			envelope1.Replies.Clear();
-			sub.NotifyClockTick(DateTime.UtcNow.AddSeconds(3));
-			Assert.AreEqual(0, envelope1.Replies.Count);
-			Assert.AreEqual(1, parker.ParkedEvents.Count);
-			Assert.AreEqual(Helper.GetEventIdFor(0), parker.ParkedEvents[0].OriginalEvent.EventId);
-		}
-
-		[Test]
-		public void multiple_messages_get_timed_out_and_parked_after_max_retry_count() {
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var parker = new FakeMessageParker();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
-					.WithMessageParker(parker)
-					.PreferDispatchToSingle()
-					.StartFromBeginning()
-					.WithMaxRetriesOf(0)
-					.WithMessageTimeoutOf(TimeSpan.FromSeconds(1)));
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource)
-			}, Helper.GetStreamPositionFor(2, _eventSource), false);
-			envelope1.Replies.Clear();
-			sub.NotifyClockTick(DateTime.UtcNow.AddSeconds(3));
-			Assert.AreEqual(0, envelope1.Replies.Count);
-			Assert.AreEqual(2, parker.ParkedEvents.Count);
-
-			var id1 = Helper.GetEventIdFor(0);
-			var id2 = Helper.GetEventIdFor(1);
-			Assert.IsTrue(id1 == parker.ParkedEvents[0].OriginalEvent.EventId ||
-						  id1 == parker.ParkedEvents[1].OriginalEvent.EventId);
-			Assert.IsTrue(id2 == parker.ParkedEvents[0].OriginalEvent.EventId ||
-						  id2 == parker.ParkedEvents[1].OriginalEvent.EventId);
-		}
-
-		[Test]
-		public void timeout_park_correctly_tracks_the_available_client_slots() {
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var parker = new FakeMessageParker();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
-					.WithMessageParker(parker)
-					.WithMaxRetriesOf(0)
-					.WithMessageTimeoutOf(TimeSpan.Zero)
-					.StartFromBeginning());
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 2, "foo", "bar");
-
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource)
-			}, Helper.GetStreamPositionFor(2, _eventSource), false);
-
-			Assert.AreEqual(2, envelope1.Replies.Count);
-
-			// Should expire first 2 and send to park.
-			sub.NotifyClockTick(DateTime.UtcNow.AddSeconds(1));
-			parker.ParkMessageCompleted(0, OperationResult.Success);
-			parker.ParkMessageCompleted(1, OperationResult.Success);
-			Assert.AreEqual(2, parker.ParkedEvents.Count);
-
-			// The next 2 should still be sent to client.
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource)
-			}, Helper.GetStreamPositionFor(2, _eventSource), false);
-
-			Assert.AreEqual(4, envelope1.Replies.Count);
-		}
-
-		[Test]
-		public void disable_timeout_doesnt_timeout() {
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var parker = new FakeMessageParker();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
-					.WithMessageParker(parker)
-					.WithMaxRetriesOf(0)
-					.PreferDispatchToSingle()
-					.StartFromBeginning()
-					.DontTimeoutMessages());
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource)
-			}, Helper.GetStreamPositionFor(2, _eventSource), false);
-			envelope1.Replies.Clear();
-			// Default timeout is 30s
-			sub.NotifyClockTick(DateTime.UtcNow.AddMinutes(1));
-			Assert.AreEqual(0, envelope1.Replies.Count);
-			Assert.AreEqual(0, parker.ParkedEvents.Count);
-		}
-	}
-
-	[TestFixture(EventSource.SingleStream)]
-	[TestFixture(EventSource.AllStream)]
-	[TestFixture(EventSource.FilteredAllStream)]
-	public class NAKTests {
-		private readonly EventSource _eventSource;
-		public NAKTests(EventSource eventSource) {
-			_eventSource = eventSource;
-		}
-
-		[Test]
-		public void explicit_nak_with_park_parks_the_message() {
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var parker = new FakeMessageParker();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
-					.WithMessageParker(parker)
-					.StartFromBeginning());
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource)
-			}, Helper.GetStreamPositionFor(1, _eventSource), false);
-			envelope1.Replies.Clear();
-			sub.NotAcknowledgeMessagesProcessed(corrid, new[] {
-				Helper.GetEventIdFor(0)
-			}, NakAction.Park, "a reason from client.");
-			Assert.AreEqual(0, envelope1.Replies.Count);
-			Assert.AreEqual(1, parker.ParkedEvents.Count);
-			Assert.AreEqual(Helper.GetEventIdFor(0), parker.ParkedEvents[0].OriginalEvent.EventId);
-		}
-
-		[Test]
-		public void explicit_nak_with_skip_skips_the_message() {
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var parker = new FakeMessageParker();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
-					.WithMessageParker(parker)
-					.StartFromBeginning());
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource)
-			}, Helper.GetStreamPositionFor(1, _eventSource), false);
-			envelope1.Replies.Clear();
-			sub.NotAcknowledgeMessagesProcessed(corrid, new[] { Helper.GetEventIdFor(0) }, NakAction.Skip, "a reason from client.");
-			Assert.AreEqual(0, envelope1.Replies.Count);
-			Assert.AreEqual(0, parker.ParkedEvents.Count);
-		}
-
-		[Test]
-		public void explicit_nak_with_default_retries_the_message() {
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var parker = new FakeMessageParker();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
-					.WithMessageParker(parker)
-					.StartFromBeginning());
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource)
-			}, Helper.GetStreamPositionFor(1, _eventSource), false);
-			envelope1.Replies.Clear();
-			sub.NotAcknowledgeMessagesProcessed(corrid, new[] { Helper.GetEventIdFor(0) }, NakAction.Unknown, "a reason from client.");
-			Assert.AreEqual(1, envelope1.Replies.Count);
-			Assert.AreEqual(0, parker.ParkedEvents.Count);
-		}
-
-		[Test]
-		public void explicit_nak_with_retry_retries_the_message() {
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var parker = new FakeMessageParker();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
-					.WithMessageParker(parker)
-					.StartFromBeginning());
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource)
-			}, Helper.GetStreamPositionFor(1, _eventSource), false);
-			envelope1.Replies.Clear();
-			sub.NotAcknowledgeMessagesProcessed(corrid, new[] { Helper.GetEventIdFor(0) }, NakAction.Retry, "a reason from client.");
-			Assert.AreEqual(1, envelope1.Replies.Count);
-			Assert.AreEqual(Helper.GetEventIdFor(0),
-				((ClientMessage.PersistentSubscriptionStreamEventAppeared)envelope1.Replies[0]).Event.Event.EventId);
-			Assert.AreEqual(0, parker.ParkedEvents.Count);
-		}
-
-		[Test]
-		public void explicit_nak_with_retry_correctly_tracks_the_available_client_slots() {
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var parker = new FakeMessageParker();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
-					.WithMaxRetriesOf(10)
-					.WithMessageParker(parker)
-					.StartFromBeginning());
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
-			var ev = Helper.GetFakeEventFor(0, _eventSource);
-			sub.HandleReadCompleted(new[] {
-				ev,
-			},Helper.GetStreamPositionFor(1, _eventSource), false);
-
-			for (int i = 1; i < 11; i++) {
-				sub.NotAcknowledgeMessagesProcessed(corrid, new[] { Helper.GetEventIdFor(0) }, NakAction.Retry, "a reason from client.");
-				Assert.AreEqual(i + 1, envelope1.Replies.Count);
-			}
-
-			Assert.That(parker.ParkedEvents, Has.No.Member(ev));
-
-			//This time should be parked
-			sub.NotAcknowledgeMessagesProcessed(corrid, new[] { Helper.GetEventIdFor(0) }, NakAction.Retry, "a reason from client.");
-			Assert.AreEqual(11, envelope1.Replies.Count);
-			Assert.That(parker.ParkedEvents, Has.Member(ev));
-		}
-
-		[Test]
-		public void explicit_nak_with_park_correctly_tracks_the_available_client_slots() {
-			var envelope1 = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var parker = new FakeMessageParker();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
-					.WithMessageParker(parker)
-					.WithMaxRetriesOf(0)
-					.WithMessageTimeoutOf(TimeSpan.Zero)
-					.StartFromBeginning());
-			reader.Load(null);
-			var corrid = Guid.NewGuid();
-			sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 1, "foo", "bar");
-
-			sub.HandleReadCompleted(new[] {
-				Helper.GetFakeEventFor(0, _eventSource),
-				Helper.GetFakeEventFor(1, _eventSource),
-				Helper.GetFakeEventFor(2, _eventSource)
-			}, Helper.GetStreamPositionFor(3, _eventSource), false);
-
-			Assert.AreEqual(1, envelope1.Replies.Count);
-
-			sub.NotAcknowledgeMessagesProcessed(corrid, new[] { Helper.GetEventIdFor(0) }, NakAction.Park, "a reason from client.");
-			Assert.AreEqual(2, envelope1.Replies.Count);
-			Assert.That(parker.ParkedEvents, Has.Exactly(1).Matches<ResolvedEvent>(_ => _.Event.EventId == Helper.GetEventIdFor(0) ));
-
-			sub.NotAcknowledgeMessagesProcessed(corrid, new[] { Helper.GetEventIdFor(1) }, NakAction.Park, "a reason from client.");
-			Assert.That(parker.ParkedEvents, Has.Exactly(1).Matches<ResolvedEvent>(_ => _.Event.EventId == Helper.GetEventIdFor(1)));
-			Assert.AreEqual(3, envelope1.Replies.Count);
-		}
-	}
-
-	[TestFixture(EventSource.SingleStream)]
-	[TestFixture(EventSource.AllStream)]
-	[TestFixture(EventSource.FilteredAllStream)]
-	public class AddingClientTests {
-		private readonly EventSource _eventSource;
-		public AddingClientTests(EventSource eventSource) {
-			_eventSource = eventSource;
-		}
-
-		[Test]
-		public void adding_a_client_adds_the_client() {
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(new FakeCheckpointReader())
-					.WithMessageParker(new FakeMessageParker())
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { })));
-
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", new FakeEnvelope(), 1, "foo", "bar");
-			Assert.IsTrue(sub.HasClients);
-			Assert.AreEqual(1, sub.ClientCount);
-		}
-	}
-
-	[TestFixture(EventSource.SingleStream)]
-	[TestFixture(EventSource.AllStream)]
-	[TestFixture(EventSource.FilteredAllStream)]
-	public class RemoveClientTests {
-		private readonly EventSource _eventSource;
-		public RemoveClientTests(EventSource eventSource) {
-			_eventSource = eventSource;
-		}
-
-		[Test]
-		public void unsubscribing_a_client_retries_inflight_messages_immediately() {
-			var client1Envelope = new FakeEnvelope();
-			var client2Envelope = new FakeEnvelope();
-
-			var fakeCheckpointReader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(fakeCheckpointReader)
-					.WithMessageParker(new FakeMessageParker())
-					.PreferRoundRobin()
-					.StartFromCurrent()
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { })));
-
-			fakeCheckpointReader.Load(null);
-
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", client1Envelope, 10, "foo", "bar");
-			var client2Id = Guid.NewGuid();
-			sub.AddClient(client2Id, Guid.NewGuid(), "connection-2", client2Envelope, 10, "foo", "bar");
-
-
-			Assert.IsTrue(sub.HasClients);
-			Assert.AreEqual(2, sub.ClientCount);
-
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(1, _eventSource));
-
-			Assert.AreEqual(1, client1Envelope.Replies.Count);
-			Assert.AreEqual(1, client2Envelope.Replies.Count);
-
-			sub.RemoveClientByCorrelationId(client2Id, false);
-			Assert.AreEqual(1, sub.ClientCount);
-
-			// Message 2 should be retried on client 1 as it wasn't acked.
-			Assert.AreEqual(2, client1Envelope.Replies.Count);
-			Assert.AreEqual(1, client2Envelope.Replies.Count);
-
-			// Retry count should have increased
-			Assert.AreEqual(1,
-				((ClientMessage.PersistentSubscriptionStreamEventAppeared)client1Envelope.Replies.Last()).RetryCount);
-		}
-
-		[Test]
-		public void disconnecting_a_client_retries_inflight_messages_immediately() {
-			var client1Envelope = new FakeEnvelope();
-			var client2Envelope = new FakeEnvelope();
-
-			var fakeCheckpointReader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(fakeCheckpointReader)
-					.WithMessageParker(new FakeMessageParker())
-					.PreferRoundRobin()
-					.StartFromCurrent()
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { })));
-
-			fakeCheckpointReader.Load(null);
-
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", client1Envelope, 10, "foo", "bar");
-			var connectionId = Guid.NewGuid();
-			sub.AddClient(Guid.NewGuid(), connectionId, "connection-2", client2Envelope, 10, "foo", "bar");
-
-			Assert.IsTrue(sub.HasClients);
-			Assert.AreEqual(2, sub.ClientCount);
-
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource));
-			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(1, _eventSource));
-
-			Assert.AreEqual(1, client1Envelope.Replies.Count);
-			Assert.AreEqual(1, client2Envelope.Replies.Count);
-
-			Assert.IsTrue(sub.RemoveClientByConnectionId(connectionId));
-
-			Assert.AreEqual(1, sub.ClientCount);
-
-			// Message 2 should be retried on client 1 as it wasn't acked.
-			Assert.AreEqual(2, client1Envelope.Replies.Count);
-			Assert.AreEqual(1, client2Envelope.Replies.Count);
-
-			// Retry count should have increased
-			Assert.AreEqual(1,
-				((ClientMessage.PersistentSubscriptionStreamEventAppeared)client1Envelope.Replies.Last()).RetryCount);
-		}
-
-		[Test]
-		public void disconnecting_a_client_with_no_persistent_subscription() {
-			var fakeCheckpointReader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(fakeCheckpointReader)
-					.WithMessageParker(new FakeMessageParker())
-					.PreferRoundRobin()
-					.StartFromCurrent()
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { })));
-
-			fakeCheckpointReader.Load(null);
-
-			var clientConnectionId = Guid.NewGuid();
-
-			Assert.IsFalse(sub.RemoveClientByConnectionId(clientConnectionId));
-		}
-	}
-
-	[TestFixture(EventSource.SingleStream)]
-	[TestFixture(EventSource.AllStream)]
-	[TestFixture(EventSource.FilteredAllStream)]
-	public class ParkTests {
-		private readonly EventSource _eventSource;
-		public ParkTests(EventSource eventSource) {
-			_eventSource = eventSource;
-		}
-
-		[Test]
-		public void retrying_parked_messages_with_empty_stream_should_allow_retrying_parked_messages_again() {
-			//setup the persistent subscription
-			var reader = new FakeCheckpointReader();
-			var parker = new FakeMessageParker();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
-					.WithMessageParker(parker)
-					.StartFromBeginning());
-			reader.Load(null);
-
-			Assert.AreEqual(0, parker.BeginReadEndSequenceCount);
-
-			//retry all parked messages
-			sub.RetryParkedMessages(null);
-
-			//this should invoke message parker's BeginReadEndSequence
-			Assert.AreEqual(1, parker.BeginReadEndSequenceCount);
-
-			//retry all parked messages again
-			sub.RetryParkedMessages(null);
-
-			//this should invoke message parker's BeginReadEndSequence again
-			Assert.AreEqual(2, parker.BeginReadEndSequenceCount);
-		}
-
-		[Test]
-		public void retrying_parked_messages_with_stop_at_invokes_readend() {
-			//setup the persistent subscription
-			var reader = new FakeCheckpointReader();
-			var parker = new FakeMessageParker();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
-					.WithMessageParker(parker)
-					.StartFromBeginning());
-			reader.Load(null);
-
-			Assert.AreEqual(0, parker.BeginReadEndSequenceCount);
-
-			//retry parked messages stop at version 5000
-			sub.RetryParkedMessages(5000);
-
-			//this should invoke message parker's BeginReadEndSequence
-			Assert.AreEqual(1, parker.BeginReadEndSequenceCount);
-		}
-
-
-		[Test]
-		public void retrying_parked_messages_without_stop_at_replays_all_parkedEvents() {
-			var messageParker = new FakeMessageParker();
-			var reader = new FakeCheckpointReader();
-
-			List<int> loadCount = new List<int>();
-
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader((stream, startEventNumber, countToLoad, batchSize,
-						maxWindowSize, resolveLinkTos, skipFirstEvent, onEventsFound) => loadCount.Add(countToLoad)))
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
-					.WithMessageParker(messageParker)
-					.StartFromBeginning()
-					.MinimumToCheckPoint(1)
-					.MaximumToCheckPoint(1));
-			reader.Load(null);
-
-			loadCount.Clear(); // clear loads from checkpoint reader
-
-			var clientConnectionId = Guid.NewGuid();
-			var clientCorrelationId = Guid.NewGuid();
-			sub.AddClient(clientCorrelationId, clientConnectionId, "connection-1", new FakeEnvelope(), 50, "foo", "bar");
-
-			//park 19 events
-			var parkedEvents = Enumerable.Range(0, 19)
-				.Select(v => Helper.BuildFakeEvent(Guid.NewGuid(), "type", "$persistentsubscription-streamName::groupName-parked", v, v, v)).ToArray();
-			foreach (var parkedEvent in parkedEvents) {
-				messageParker.BeginParkMessage(parkedEvent, "parked", (ev, res) => { });
-			}
-
-			sub.RetryParkedMessages(null);
-
-			Assert.AreEqual(20, loadCount[0]);
-
-			sub.HandleParkedReadCompleted(
-				parkedEvents,
-				new PersistentSubscriptionSingleStreamPosition(19),
-				true,
-				20);
-
-			Assert.AreEqual(19, messageParker.MarkedAsProcessed);
-			Assert.AreEqual(19, sub.OutstandingMessageCount);
-
-		}
-
-		[Test]
-		public void retrying_parked_messages_with_stop_at_replays_parkedEvents_until_that_version() {
-			var messageParker = new FakeMessageParker();
-			var reader = new FakeCheckpointReader();
-
-			List<int> loadCount = new List<int>();
-
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
-					.WithEventLoader(new FakeStreamReader((stream, startEventNumber, countToLoad, batchSize, maxWindowSize, resolveLinkTos, skipFirstEvent, onEventsFound) => loadCount.Add(countToLoad)))
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
-					.WithMessageParker(messageParker)
-					.StartFromBeginning()
-					.MinimumToCheckPoint(1)
-					.MaximumToCheckPoint(1));
-			reader.Load(null);
-
-			loadCount.Clear(); // clear loads from checkpoint reader
-
-			var clientConnectionId = Guid.NewGuid();
-			var clientCorrelationId = Guid.NewGuid();
-			sub.AddClient(clientCorrelationId, clientConnectionId, "connection-1", new FakeEnvelope(), 50, "foo", "bar");
-
-			//park 19 events
-			var parkedEvents = Enumerable.Range(0, 19)
-				.Select(v => Helper.BuildFakeEvent(Guid.NewGuid(), "type", "$persistentsubscription-streamName::groupName-parked", v, v, v)).ToArray();
-			foreach (var parkedEvent in parkedEvents) {
-				messageParker.BeginParkMessage(parkedEvent, "parked", (ev, res) => { });
-			}
-
-			var stopAt = 7L;
-			sub.RetryParkedMessages(stopAt);
-
-			// stopAt == Count
-			Assert.AreEqual(stopAt + 1, loadCount[0]);
-
-			sub.HandleParkedReadCompleted(
-				parkedEvents.Where(re => re.OriginalEventNumber < 7).ToArray(),
-				new PersistentSubscriptionSingleStreamPosition(7),
-				false,
-				stopAt);
-
-			Assert.AreEqual(7, messageParker.MarkedAsProcessed);
-
-			Assert.AreEqual(7, sub.OutstandingMessageCount);
-
-		}
-	}
-
-	[Ignore("very long test")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class DeadlockTest<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		protected override Task Given() {
-			_conn = BuildConnection(_node);
-			return _conn.ConnectAsync();
-		}
-
-		protected override Task When() => Task.CompletedTask;
-
-		[Test]
-		public async Task read_whilst_ack_doesnt_deadlock_with_request_response_dispatcher() {
-			var persistentSubscriptionSettings = PersistentSubscriptionSettings.Create().Build();
-			var userCredentials = DefaultData.AdminCredentials;
-			await _conn.CreatePersistentSubscriptionAsync("TestStream", "TestGroup", persistentSubscriptionSettings,
-				userCredentials);
-
-			const int count = 5000;
-			await _conn.AppendToStreamAsync("TestStream", ExpectedVersion.Any, CreateEvent().Take(count));
-
-
-			var received = 0;
-			var manualResetEventSlim = new ManualResetEventSlim();
-			var sub1 = _conn.ConnectToPersistentSubscription("TestStream", "TestGroup", (sub, ev) => {
-				received++;
-				if (received == count) {
-					manualResetEventSlim.Set();
-				}
-
-				return Task.CompletedTask;
-			},
-				(sub, reason, ex) => { });
-			Assert.IsTrue(manualResetEventSlim.Wait(TimeSpan.FromSeconds(30)),
-				"Failed to receive all events in 2 minutes. Assume event store is deadlocked.");
-			sub1.Stop(TimeSpan.FromSeconds(10));
-			_conn.Close();
-		}
-
-		private static IEnumerable<EventData> CreateEvent() {
-			while (true) {
-				yield return new EventData(Guid.NewGuid(), "testtype", false, new byte[0], new byte[0]);
-			}
-		}
-	}
-
-	public static class Helper {
-		public static PersistentSubscriptionParamsBuilder CreatePersistentSubscriptionBuilderFor(EventSource eventSource) {
-			switch (eventSource) {
-				case EventSource.SingleStream:
-					return PersistentSubscriptionToStreamParamsBuilder.CreateFor("streamName", "groupName");
-				case EventSource.AllStream:
-					return PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName");
-				case EventSource.FilteredAllStream:
-					return PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName",
-						EventFilter.StreamName.Prefixes(true, "stream"));
-				default:
-					throw new InvalidOperationException();
-			}
-		}
-
-		private static readonly Guid[] eventIds = {
-			//could be generated with a pseudo random number generator but
-			//there's no need for now
-			Guid.Parse("157e9b5a-09b1-49a8-9409-000000000000"),
-			Guid.Parse("e986669f-1845-4a2b-87df-111111111111"),
-			Guid.Parse("c18d692f-ab16-401f-b020-222222222222"),
-			Guid.Parse("2d31ce08-6a5a-48df-b92b-333333333333"),
-			Guid.Parse("aa343d98-41d4-4d9d-8356-444444444444"),
-			Guid.Parse("3bd03065-d0e1-460f-bf2d-555555555555"),
-			Guid.Parse("e18d84f3-72ea-4912-84ac-666666666666"),
-			Guid.Parse("8ee1ee33-07f7-42e7-a64d-777777777777"),
-			Guid.Parse("1594759b-b419-48a4-8a84-888888888888"),
-			Guid.Parse("0a07af23-6b6b-47c7-93c4-999999999999")
-		};
-
-		public static Guid GetEventIdFor(int position) {
-			if (position >= eventIds.Length) {
-				throw new InvalidOperationException();
-			}
-
-			return eventIds[position];
-		}
-
-		public static ResolvedEvent GetFakeEventFor(int position, EventSource eventSource, Guid? forcedEventId = null,
-			string streamPrefix = "", string eventType = "type") {
-			var eventId = forcedEventId ?? GetEventIdFor(position);
-			switch (eventSource) {
-				case EventSource.SingleStream:
-					var streamName = string.IsNullOrEmpty(streamPrefix) ? "streamName" : streamPrefix;
-					return BuildFakeEvent(eventId, eventType, streamName, position, 1234, 1234);
-				case EventSource.AllStream:
-				case EventSource.FilteredAllStream:
-					streamPrefix = string.IsNullOrEmpty(streamPrefix) ? "stream" : streamPrefix;
-					string stream = streamPrefix + (position % 2);
-					int eventNumber = (position / 2) + (position % 2 == 0 ? 2 : 0); //intentionally add offset to make event positions not continuous across all streams
-					var streamPos = GetStreamPositionFor(position, eventSource);
-					return BuildFakeEvent(eventId, eventType, stream, eventNumber, streamPos.TFPosition.Commit, streamPos.TFPosition.Prepare);
-				default:
-					throw new InvalidOperationException();
-			}
-		}
-
-		public static IPersistentSubscriptionStreamPosition GetStreamPositionFor(int position, EventSource eventSource) {
-			return eventSource switch {
-				EventSource.SingleStream => new PersistentSubscriptionSingleStreamPosition(position),
-				EventSource.AllStream => new PersistentSubscriptionAllStreamPosition(1234 + position * 2, 1233 + position * 2),
-				EventSource.FilteredAllStream => new PersistentSubscriptionAllStreamPosition(1234 + position * 2, 1233 + position * 2),
-				_ => throw new InvalidOperationException()
-			};
-		}
-
-		public static ResolvedEvent BuildFakeEvent(Guid id, string type, string stream, long version, long commitPosition=1234567, long preparePosition=1234567) {
-			return BuildFakeEventWithMetadata(id, type, stream, version, new byte[0], commitPosition, preparePosition);
-		}
-
-		public static ResolvedEvent BuildFakeEventWithMetadata(Guid id, string type, string stream, long version, byte[] metaData, long commitPosition=1234567, long preparePosition=1234567) {
-			return
-				ResolvedEvent.ForUnresolvedEvent(new EventRecord(version, preparePosition, Guid.NewGuid(), id, commitPosition, 1234,
-					stream, version,
-					DateTime.UtcNow, PrepareFlags.SingleWrite, type, new byte[0], metaData), commitPosition);
-		}
-
-		public static ResolvedEvent BuildLinkEvent(Guid id, string stream, long version, ResolvedEvent ev, bool resolved = true, long commitPosition=1234567, long preparePosition=1234567) {
-			var link = new EventRecord(version, preparePosition, Guid.NewGuid(), id, commitPosition, 1234, stream, version,
-				DateTime.UtcNow, PrepareFlags.SingleWrite, SystemEventTypes.LinkTo,
-				Encoding.UTF8.GetBytes(string.Format("{0}@{1}", ev.OriginalEventNumber, ev.OriginalStreamId)),
-				new byte[0]);
-			if (resolved)
-				return ResolvedEvent.ForResolvedLink(ev.Event, link, commitPosition);
-			else
-				return ResolvedEvent.ForUnresolvedEvent(link, commitPosition);
-		}
-	}
-
-	class FakeStreamReader : IPersistentSubscriptionStreamReader {
-		private readonly Action<IPersistentSubscriptionEventSource, IPersistentSubscriptionStreamPosition, int, int, int, bool, bool,
-			Action<ResolvedEvent[], IPersistentSubscriptionStreamPosition, bool>> _action = null;
-
-		public FakeStreamReader() {
-		}
-
-		public FakeStreamReader(Action<IPersistentSubscriptionEventSource, IPersistentSubscriptionStreamPosition, int, int, int, bool, bool, Action<ResolvedEvent[], IPersistentSubscriptionStreamPosition, bool>> action) {
-			_action = action;
-		}
-
-		public void BeginReadEvents(IPersistentSubscriptionEventSource stream, IPersistentSubscriptionStreamPosition startEventNumber,
-			int countToLoad, int batchSize, int maxWindowSize, bool resolveLinkTos, bool skipFirstEvent,
-			Action<ResolvedEvent[], IPersistentSubscriptionStreamPosition, bool> onEventsFound,
-			Action<IPersistentSubscriptionStreamPosition, long> onEventsSkipped,
-			Action<string> onError) {
-			if (_action != null) {
-				_action(stream, startEventNumber, countToLoad, batchSize, maxWindowSize, resolveLinkTos, skipFirstEvent, onEventsFound);
-			}
-		}
-	}
-
-	class FakeCheckpointReader : IPersistentSubscriptionCheckpointReader {
-		private Action<string> _onStateLoaded;
-
-		public void BeginLoadState(string subscriptionId, Action<string> onStateLoaded) {
-			_onStateLoaded = onStateLoaded;
-		}
-
-		public void Load(string state) {
-			_onStateLoaded(state);
-		}
-	}
-
-	class FakeMessageParker : IPersistentSubscriptionMessageParker {
-		private Action<ResolvedEvent, OperationResult> _parkMessageCompleted;
-		public List<ResolvedEvent> ParkedEvents = new List<ResolvedEvent>();
-		private readonly Action _deleteAction;
-		private long _lastParkedEventNumber = -1;
-		private long _lastTruncateBefore = -1;
-		public int BeginReadEndSequenceCount { get; private set; } = 0;
-
-		public FakeMessageParker() {
-		}
-
-		public FakeMessageParker(Action deleteAction) {
-			_deleteAction = deleteAction;
-		}
-
-		public long MarkedAsProcessed { get; private set; }
-
-		public void ParkMessageCompleted(int idx, OperationResult result) {
-			_parkMessageCompleted?.Invoke(ParkedEvents[idx], result);
-		}
-
-		public void BeginParkMessage(ResolvedEvent ev, string reason,
-			Action<ResolvedEvent, OperationResult> completed) {
-			ParkedEvents.Add(ev);
-			_lastParkedEventNumber = ev.OriginalEventNumber;
-			_parkMessageCompleted = completed;
-		}
-
-		public void BeginReadEndSequence(Action<long?> completed) {
-			BeginReadEndSequenceCount++;
-			if (_lastParkedEventNumber == -1)
-				completed(null); //NoStream
-			else
-				completed(_lastParkedEventNumber);
-		}
-
-		public void BeginMarkParkedMessagesReprocessed(long sequence, DateTime? dateTime, bool updateOldestParkedMessage) {
-			MarkedAsProcessed = sequence;
-		}
-
-		public void BeginDelete(Action<IPersistentSubscriptionMessageParker> completed) {
-			_deleteAction?.Invoke();
-		}
-
-		public long ParkedMessageCount {
-			get {
-				return _lastParkedEventNumber == -1 ? 0 :
-					_lastTruncateBefore == -1 ? _lastParkedEventNumber + 1 :
-					_lastParkedEventNumber - _lastTruncateBefore + 1;
-			}
-		}
-
-		public void BeginLoadStats(Action completed) {
-			completed();
-		}
-
-		public DateTime? GetOldestParkedMessage { get; }
-	}
-
-
-	class FakeCheckpointWriter : IPersistentSubscriptionCheckpointWriter {
-		private readonly Action<IPersistentSubscriptionStreamPosition> _action;
-		private readonly Action _deleteAction;
-
-		public FakeCheckpointWriter(Action<IPersistentSubscriptionStreamPosition> action, Action deleteAction = null) {
-			_action = action;
-			_deleteAction = deleteAction;
-		}
-
-		public void BeginWriteState(IPersistentSubscriptionStreamPosition state) {
-			_action(state);
-		}
-
-		public void BeginDelete(Action<IPersistentSubscriptionCheckpointWriter> completed) {
-			_deleteAction?.Invoke();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/PersistentSubscription/PinnedByCorrelationConsumerStrategyTests.cs b/src/EventStore.Core.Tests/Services/PersistentSubscription/PinnedByCorrelationConsumerStrategyTests.cs
deleted file mode 100644
index 86c2a5455b6..00000000000
--- a/src/EventStore.Core.Tests/Services/PersistentSubscription/PinnedByCorrelationConsumerStrategyTests.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-namespace EventStore.Core.Tests.Services.PersistentSubscription
-{
-	using System;
-	using System.Text;
-	using Core.Index.Hashes;
-	using Core.Services;
-	using Core.Services.PersistentSubscription;
-	using Core.Services.PersistentSubscription.ConsumerStrategy;
-	using NUnit.Framework;
-	using Replication;
-
-	[TestFixture]
-	public class PinnedByCorrelationConsumerStrategyTests {
-		[Test]
-		public void live_subscription_with_pinned_by_correlation_pushes_events_without_metadata_to_same_client_for_stream_id() {
-			live_subscription_with_pinned_by_correlation_pushes_events_to_same_client_for_stream_id_for_metadata(new byte[0]);
-
-		}
-
-		[Test]
-		public void live_subscription_with_pinned_by_correlation_pushes_events_with_empty_metadata_to_same_client_for_stream_id() {
-			live_subscription_with_pinned_by_correlation_pushes_events_to_same_client_for_stream_id_for_metadata(Encoding.UTF8.GetBytes("{}"));
-		}
-
-		[Test]
-		public void live_subscription_with_pinned_by_correlation_pushes_events_with_metadata_without_closing_brace_to_same_client_for_stream_id() {
-			live_subscription_with_pinned_by_correlation_pushes_events_to_same_client_for_stream_id_for_metadata(Encoding.UTF8.GetBytes("{"));
-		}
-
-		[Test]
-		public void live_subscription_with_pinned_by_correlation_pushes_events_with_metadata_without_correlation_to_same_client_for_stream_id() {
-			live_subscription_with_pinned_by_correlation_pushes_events_to_same_client_for_stream_id_for_metadata(Encoding.UTF8.GetBytes(@"{ ""x"": ""x"" }"));
-		}
-
-		
-		[Test]
-		public void live_subscription_with_pinned_by_correlation_pushes_events_with_metadata_with_invalid_correlation_to_same_client_for_stream_id() {
-			live_subscription_with_pinned_by_correlation_pushes_events_to_same_client_for_stream_id_for_metadata(Encoding.UTF8.GetBytes(@"{ ""$correlationId"": 0 }"));
-		}
-
-		private static void
-			live_subscription_with_pinned_by_correlation_pushes_events_to_same_client_for_stream_id_for_metadata(byte[] metaData)
-		{
-			var client1Envelope = new FakeEnvelope();
-			var client2Envelope = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-
-			var sub = new PersistentSubscription(
-				PersistentSubscriptionToStreamParamsBuilder.CreateFor("$ce-streamName", "groupName")
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.CustomConsumerStrategy(new PinnedByCorrelationPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
-					.StartFromCurrent());
-
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", client1Envelope, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", client2Envelope, 10, "foo", "bar");
-
-			sub.NotifyLiveSubscriptionMessage(
-				Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-1", 0, metaData));
-			sub.NotifyLiveSubscriptionMessage(
-				Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-1", 1, metaData));
-
-			Assert.AreEqual(2, client1Envelope.Replies.Count);
-			Assert.AreEqual(0, client2Envelope.Replies.Count);
-
-			sub.NotifyLiveSubscriptionMessage(
-				Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-2", 2, metaData));
-			sub.NotifyLiveSubscriptionMessage(
-				Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-2", 3, metaData));
-
-			Assert.AreEqual(2, client1Envelope.Replies.Count);
-			Assert.AreEqual(2, client2Envelope.Replies.Count);
-
-			sub.NotifyLiveSubscriptionMessage(
-				Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-1", 4, metaData));
-
-			Assert.AreEqual(3, client1Envelope.Replies.Count);
-			Assert.AreEqual(2, client2Envelope.Replies.Count);
-
-			sub.NotifyLiveSubscriptionMessage(
-				Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-3", 5, metaData));
-
-			Assert.AreEqual(4, client1Envelope.Replies.Count);
-			Assert.AreEqual(2, client2Envelope.Replies.Count);
-		}
-
-		[Test]
-		public void live_subscription_with_pinned_by_correlation_pushes_events_with_metadata_with_valid_correlation_to_same_client_for_correlation_id() {
-			
-			var client1Envelope = new FakeEnvelope();
-			var client2Envelope = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-
-			var sub = new PersistentSubscription(
-				PersistentSubscriptionToStreamParamsBuilder.CreateFor("$ce-streamName", "groupName")
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.CustomConsumerStrategy(new PinnedByCorrelationPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
-					.StartFromCurrent());
-
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", client1Envelope, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", client2Envelope, 10, "foo", "bar");
-
-			CorrelationIdPropertyContext.CorrelationIdProperty = "$correlationId2";
-
-			var metaData1 = Encoding.UTF8.GetBytes(@"{ ""x"": ""x"", ""$correlationId2"": ""1234567890"", ""y"": ""y"" }");
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-1", 0, metaData1));
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-1", 1, metaData1));
-
-			Assert.AreEqual(2, client1Envelope.Replies.Count);
-			Assert.AreEqual(0, client2Envelope.Replies.Count);
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-2", 2, metaData1));
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-2", 3, metaData1));
-
-			Assert.AreEqual(4, client1Envelope.Replies.Count);
-			Assert.AreEqual(0, client2Envelope.Replies.Count);
-
-			var metaData2 = Encoding.UTF8.GetBytes(@"{ ""$correlationId2"": ""1234567891"", ""y"": ""y"" }");
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-1", 4, metaData2));
-
-			Assert.AreEqual(4, client1Envelope.Replies.Count);
-			Assert.AreEqual(1, client2Envelope.Replies.Count);
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-3", 5, metaData2));
-
-			Assert.AreEqual(4, client1Envelope.Replies.Count);
-			Assert.AreEqual(2, client2Envelope.Replies.Count);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/PersistentSubscription/PinnedConsumerStrategyTests.cs b/src/EventStore.Core.Tests/Services/PersistentSubscription/PinnedConsumerStrategyTests.cs
deleted file mode 100644
index 617b33767a8..00000000000
--- a/src/EventStore.Core.Tests/Services/PersistentSubscription/PinnedConsumerStrategyTests.cs
+++ /dev/null
@@ -1,505 +0,0 @@
-using System;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.Services.PersistentSubscription;
-using EventStore.Core.Services.PersistentSubscription.ConsumerStrategy;
-using EventStore.Core.Tests.Services.Replication;
-using EventStore.Core.Tests.Services.Storage;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.PersistentSubscription {
-	[TestFixture]
-	public class PinnedConsumerStrategyTests {
-		[Test]
-		public void live_subscription_with_pinned_pushes_events_to_same_client_for_stream_id() {
-			var client1Envelope = new FakeEnvelope();
-			var client2Envelope = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				PersistentSubscriptionToStreamParamsBuilder.CreateFor("$ce-streamName", "groupName")
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
-					.StartFromCurrent());
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", client1Envelope, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", client2Envelope, 10, "foo", "bar");
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 0));
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 1));
-
-			Assert.AreEqual(2, client1Envelope.Replies.Count);
-			Assert.AreEqual(0, client2Envelope.Replies.Count);
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-2", 2));
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-2", 3));
-
-			Assert.AreEqual(2, client1Envelope.Replies.Count);
-			Assert.AreEqual(2, client2Envelope.Replies.Count);
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 4));
-
-			Assert.AreEqual(3, client1Envelope.Replies.Count);
-			Assert.AreEqual(2, client2Envelope.Replies.Count);
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-3", 5));
-
-			Assert.AreEqual(4, client1Envelope.Replies.Count);
-			Assert.AreEqual(2, client2Envelope.Replies.Count);
-		}
-
-		[Test]
-		public void new_stream_is_round_robinned_to_next_consumer() {
-			var client1Envelope = new FakeEnvelope();
-			var client2Envelope = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				PersistentSubscriptionToStreamParamsBuilder.CreateFor("$ce-streamName", "groupName")
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
-					.StartFromCurrent());
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", client1Envelope, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", client2Envelope, 10, "foo", "bar");
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 0));
-
-			Assert.AreEqual(1, client1Envelope.Replies.Count);
-			Assert.AreEqual(0, client2Envelope.Replies.Count);
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-2", 1));
-
-			Assert.AreEqual(1, client1Envelope.Replies.Count);
-			Assert.AreEqual(1, client2Envelope.Replies.Count);
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-3", 2));
-
-			Assert.AreEqual(2, client1Envelope.Replies.Count);
-			Assert.AreEqual(1, client2Envelope.Replies.Count);
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-4", 4));
-
-			Assert.AreEqual(2, client1Envelope.Replies.Count);
-			Assert.AreEqual(2, client2Envelope.Replies.Count);
-		}
-
-		[Test]
-		public void resolved_link_events_use_event_stream_id() {
-			var client1Envelope = new FakeEnvelope();
-			var client2Envelope = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			const string subsctiptionStream = "$ce-streamName";
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				PersistentSubscriptionToStreamParamsBuilder.CreateFor(subsctiptionStream, "groupName")
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
-					.StartFromCurrent());
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", client1Envelope, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", client2Envelope, 10, "foo", "bar");
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 0,
-				Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 0)));
-
-			Assert.AreEqual(1, client1Envelope.Replies.Count);
-			Assert.AreEqual(0, client2Envelope.Replies.Count);
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 1,
-				Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-2", 0)));
-
-			Assert.AreEqual(1, client1Envelope.Replies.Count);
-			Assert.AreEqual(1, client2Envelope.Replies.Count);
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 2,
-				Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-3", 0)));
-
-			Assert.AreEqual(2, client1Envelope.Replies.Count);
-			Assert.AreEqual(1, client2Envelope.Replies.Count);
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 3,
-				Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-4", 0)));
-
-			Assert.AreEqual(2, client1Envelope.Replies.Count);
-			Assert.AreEqual(2, client2Envelope.Replies.Count);
-		}
-
-		[Test]
-		public void link_events_use_data_to_detect_stream_id() {
-			var client1Envelope = new FakeEnvelope();
-			var client2Envelope = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			const string subsctiptionStream = "$ce-streamName";
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				PersistentSubscriptionToStreamParamsBuilder.CreateFor(subsctiptionStream, "groupName")
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
-					.StartFromCurrent());
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", client1Envelope, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", client2Envelope, 10, "foo", "bar");
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 0,
-				Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 0), false));
-
-			Assert.AreEqual(1, client1Envelope.Replies.Count);
-			Assert.AreEqual(0, client2Envelope.Replies.Count);
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 1,
-				Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-2", 0), false));
-
-			Assert.AreEqual(1, client1Envelope.Replies.Count);
-			Assert.AreEqual(1, client2Envelope.Replies.Count);
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 2,
-				Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-3", 0), false));
-
-			Assert.AreEqual(2, client1Envelope.Replies.Count);
-			Assert.AreEqual(1, client2Envelope.Replies.Count);
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 3,
-				Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-4", 0), false));
-
-			Assert.AreEqual(2, client1Envelope.Replies.Count);
-			Assert.AreEqual(2, client2Envelope.Replies.Count);
-		}
-
-		[Test]
-		public void unsubscribed_client_has_assigned_streams_sent_to_another_client() {
-			var client1Envelope = new FakeEnvelope();
-			var client2Envelope = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			const string subsctiptionStream = "$ce-streamName";
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				PersistentSubscriptionToStreamParamsBuilder.CreateFor(subsctiptionStream, "groupName")
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
-					.StartFromCurrent());
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", client1Envelope, 10, "foo", "bar");
-			var client2Id = Guid.NewGuid();
-			sub.AddClient(client2Id, Guid.NewGuid(), "connection-2", client2Envelope, 10, "foo", "bar");
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 0,
-				Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 0), false));
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 1,
-				Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-2", 0), false));
-
-			Assert.AreEqual(1, client1Envelope.Replies.Count);
-			Assert.AreEqual(1, client2Envelope.Replies.Count);
-
-			sub.RemoveClientByCorrelationId(client2Id, false);
-
-			// Message 2 should be retried on client 1 as it wasn't acked.
-			Assert.AreEqual(2, client1Envelope.Replies.Count);
-			Assert.AreEqual(1, client2Envelope.Replies.Count);
-		}
-
-		[Test]
-		public void new_subscription_gets_work() {
-			var client1Envelope = new FakeEnvelope();
-			var client2Envelope = new FakeEnvelope();
-			var client3Envelope = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			const string subsctiptionStream = "$ce-streamName";
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				PersistentSubscriptionToStreamParamsBuilder.CreateFor(subsctiptionStream, "groupName")
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new ByLengthHasher()))
-					.StartFromCurrent());
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", client1Envelope, 10, "foo", "bar");
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", client2Envelope, 10, "foo", "bar");
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "1", 0));
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "11", 1));
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "111", 2));
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "1111", 3));
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "11111", 4));
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "111111", 5));
-
-			Assert.AreEqual(3, client1Envelope.Replies.Count);
-			Assert.AreEqual(3, client2Envelope.Replies.Count);
-
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-3", client3Envelope, 10, "foo", "bar");
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "1", 6));
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "11", 7));
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "111", 8));
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "1111", 9));
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "11111", 10));
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "111111", 11));
-
-			Assert.AreEqual(5, client1Envelope.Replies.Count);
-			Assert.AreEqual(5, client2Envelope.Replies.Count);
-			Assert.AreEqual(2, client3Envelope.Replies.Count);
-		}
-
-		[Test]
-		public void bad_availablecapacity_scneanrio_causing_null_reference() {
-			var client1Envelope = new FakeEnvelope();
-			var client2Envelope = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			const string subsctiptionStream = "$ce-streamName";
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				PersistentSubscriptionToStreamParamsBuilder.CreateFor(subsctiptionStream, "groupName")
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new ByLengthHasher()))
-					.StartFromCurrent());
-			reader.Load(null);
-			var conn1Id = Guid.NewGuid();
-			sub.AddClient(Guid.NewGuid(), conn1Id, "connection-1", client1Envelope, 10, "foo", "bar");
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "1", 0));
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "11", 1));
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "111", 2));
-
-			Assert.AreEqual(3, client1Envelope.Replies.Count);
-
-			var conn2Id = Guid.NewGuid();
-			sub.AddClient(Guid.NewGuid(), conn2Id, "connection-2", client2Envelope, 10, "foo", "bar");
-
-			Assert.AreEqual(3, client1Envelope.Replies.Count);
-			Assert.AreEqual(0, client2Envelope.Replies.Count);
-
-			Assert.IsTrue(sub.RemoveClientByConnectionId(conn1Id));
-
-			// Used to throw a null reference exception.
-			Assert.That(() => sub.RemoveClientByConnectionId(conn2Id), Throws.Nothing);
-		}
-
-		[Test]
-		public void disconnected_client_has_assigned_streams_sent_to_another_client() {
-			var client1Envelope = new FakeEnvelope();
-			var client2Envelope = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			const string subsctiptionStream = "$ce-streamName";
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				PersistentSubscriptionToStreamParamsBuilder.CreateFor(subsctiptionStream, "groupName")
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
-					.StartFromCurrent());
-			reader.Load(null);
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", client1Envelope, 10, "foo", "bar");
-			var client2Id = Guid.NewGuid();
-			sub.AddClient(Guid.NewGuid(), client2Id, "connection-2", client2Envelope, 10, "foo", "bar");
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 0,
-				Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 0), false));
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 1,
-				Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-2", 0), false));
-
-			Assert.AreEqual(1, client1Envelope.Replies.Count);
-			Assert.AreEqual(1, client2Envelope.Replies.Count);
-
-			Assert.IsTrue(sub.RemoveClientByConnectionId(client2Id));
-
-			// Message 2 should be retried on client 1 as it wasn't acked.
-			Assert.AreEqual(2, client1Envelope.Replies.Count);
-			Assert.AreEqual(1, client2Envelope.Replies.Count);
-		}
-
-		[Test]
-		public void available_capacity_is_tracked() {
-			var client1Envelope = new FakeEnvelope();
-			var client2Envelope = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			const string subsctiptionStream = "$ce-streamName";
-			PersistentSubscriptionParams settings = PersistentSubscriptionToStreamParamsBuilder
-				.CreateFor(subsctiptionStream, "groupName")
-				.WithEventLoader(new FakeStreamReader())
-				.WithCheckpointReader(reader)
-				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-				.WithMessageParker(new FakeMessageParker())
-				.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
-				.StartFromCurrent();
-			var consumerStrategy = (PinnedPersistentSubscriptionConsumerStrategy)settings.ConsumerStrategy;
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(settings);
-			reader.Load(null);
-			var client1Id = Guid.NewGuid();
-			sub.AddClient(Guid.NewGuid(), client1Id, "connection-1", client1Envelope, 14, "foo", "bar");
-
-			Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(14));
-
-			var client2Id = Guid.NewGuid();
-			sub.AddClient(Guid.NewGuid(), client2Id, "connection-2", client2Envelope, 10, "foo", "bar");
-
-			Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(24));
-
-			Assert.IsTrue(sub.RemoveClientByConnectionId(client2Id));
-
-			Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(14));
-
-			Assert.IsTrue(sub.RemoveClientByConnectionId(client1Id));
-
-			Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(0));
-		}
-
-		[Test]
-		public void available_capacity_is_tracked_with_inflight_messages() {
-			var client1Envelope = new FakeEnvelope();
-			var client2Envelope = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			const string subsctiptionStream = "$ce-streamName";
-			PersistentSubscriptionParams settings = PersistentSubscriptionToStreamParamsBuilder
-				.CreateFor(subsctiptionStream, "groupName")
-				.WithEventLoader(new FakeStreamReader())
-				.WithCheckpointReader(reader)
-				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-				.WithMessageParker(new FakeMessageParker())
-				.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
-				.StartFromCurrent();
-			var consumerStrategy = (PinnedPersistentSubscriptionConsumerStrategy)settings.ConsumerStrategy;
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(settings);
-			reader.Load(null);
-			var client1Id = Guid.NewGuid();
-			sub.AddClient(Guid.NewGuid(), client1Id, "connection-1", client1Envelope, 14, "foo", "bar");
-			Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(14));
-
-			var client2Id = Guid.NewGuid();
-			sub.AddClient(Guid.NewGuid(), client2Id, "connection-2", client2Envelope, 10, "foo", "bar");
-
-			Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(24));
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 0,
-				Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 0), false));
-
-			Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(23));
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 1,
-				Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-2", 0), false));
-
-			Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(22));
-
-			Assert.IsTrue(sub.RemoveClientByConnectionId(client2Id));
-
-			Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(12));
-
-			Assert.IsTrue(sub.RemoveClientByConnectionId(client1Id));
-
-			Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(0));
-		}
-
-		[Test]
-		public void available_capacity_is_tracked_with_acked_messages() {
-			var client1Envelope = new FakeEnvelope();
-			var client2Envelope = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			const string subsctiptionStream = "$ce-streamName";
-			PersistentSubscriptionParams settings = PersistentSubscriptionToStreamParamsBuilder
-				.CreateFor(subsctiptionStream, "groupName")
-				.WithEventLoader(new FakeStreamReader())
-				.WithCheckpointReader(reader)
-				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-				.WithMessageParker(new FakeMessageParker())
-				.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
-				.StartFromCurrent();
-			var consumerStrategy = (PinnedPersistentSubscriptionConsumerStrategy)settings.ConsumerStrategy;
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(settings);
-			reader.Load(null);
-			var correlationId1 = Guid.NewGuid();
-			sub.AddClient(correlationId1, Guid.NewGuid(), "connection-1", client1Envelope, 14, "foo", "bar");
-			Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(14));
-
-			var correlationId2 = Guid.NewGuid();
-			sub.AddClient(correlationId2, Guid.NewGuid(), "connection-2", client2Envelope, 10, "foo", "bar");
-
-			Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(24));
-
-			var message1 = Guid.NewGuid();
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(message1, subsctiptionStream, 0,
-				Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 0), false));
-
-			Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(23));
-
-			var message2 = Guid.NewGuid();
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(message2, subsctiptionStream, 1,
-				Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-2", 0), false));
-
-			Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(22));
-
-			sub.AcknowledgeMessagesProcessed(correlationId1, new[] { message1 });
-
-			Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(23));
-
-			sub.AcknowledgeMessagesProcessed(correlationId2, new[] { message2 });
-
-			Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(24));
-		}
-
-		[Test]
-		public void events_are_skipped_if_assigned_client_full() {
-			var client1Envelope = new FakeEnvelope();
-			var client2Envelope = new FakeEnvelope();
-			var reader = new FakeCheckpointReader();
-			const string subsctiptionStream = "$ce-streamName";
-			var sub = new Core.Services.PersistentSubscription.PersistentSubscription(
-				PersistentSubscriptionToStreamParamsBuilder.CreateFor(subsctiptionStream, "groupName")
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(reader)
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
-					.StartFromCurrent());
-			reader.Load(null);
-
-			var correlationId = Guid.NewGuid();
-			sub.AddClient(correlationId, Guid.NewGuid(), "connection-1", client1Envelope, 1, "foo", "bar");
-
-			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", client2Envelope, 1, "foo", "bar");
-
-
-			var message1 = Guid.NewGuid();
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(message1, subsctiptionStream, 0,
-				Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 0), false));
-
-			Assert.That(client1Envelope.Replies.Count, Is.EqualTo(1));
-			Assert.That(client2Envelope.Replies.Count, Is.EqualTo(0));
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 1,
-				Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 0), false));
-
-			Assert.That(client1Envelope.Replies.Count, Is.EqualTo(1));
-			Assert.That(client2Envelope.Replies.Count, Is.EqualTo(0));
-			Assert.True(sub.TryGetStreamBuffer(out var streamBuffer));
-			Assert.That(streamBuffer.BufferCount, Is.EqualTo(1));
-
-			sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 2,
-				Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-2", 0), false));
-
-			Assert.That(client1Envelope.Replies.Count, Is.EqualTo(1));
-			Assert.That(client2Envelope.Replies.Count, Is.EqualTo(1));
-
-			Assert.That(streamBuffer.BufferCount, Is.EqualTo(1));
-
-			sub.AcknowledgeMessagesProcessed(correlationId, new[] { message1 });
-
-			Assert.That(client1Envelope.Replies.Count, Is.EqualTo(2));
-			Assert.That(client2Envelope.Replies.Count, Is.EqualTo(1));
-
-			Assert.That(streamBuffer.BufferCount, Is.EqualTo(0));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/PersistentSubscription/ReadBatchSizeTests.cs b/src/EventStore.Core.Tests/Services/PersistentSubscription/ReadBatchSizeTests.cs
deleted file mode 100644
index aa916f36385..00000000000
--- a/src/EventStore.Core.Tests/Services/PersistentSubscription/ReadBatchSizeTests.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using EventStore.Core.Services.PersistentSubscription;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.PersistentSubscription {
-	[TestFixture]
-	public class ReadBatchSizeTests {
-		[TestCase(1, 1)]
-		[TestCase(2, 1)]
-		public void read_batch_size_greater_or_equal_to_buffer_size_throws(int readBatchSize, int bufferSize) {
-			Assert.Throws<ArgumentOutOfRangeException>(() =>
-				new Core.Services.PersistentSubscription.PersistentSubscription(PersistentSubscriptionToStreamParamsBuilder
-					.CreateFor("stream", "group")
-					.WithEventLoader(new FakeStreamReader())
-					.WithCheckpointReader(new FakeCheckpointReader())
-					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
-					.WithMessageParker(new FakeMessageParker())
-					.StartFromCurrent()
-					.WithReadBatchOf(readBatchSize)
-					.WithHistoryBufferSizeOf(bufferSize)));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/PersistentSubscription/RequestStatisticsTests.cs b/src/EventStore.Core.Tests/Services/PersistentSubscription/RequestStatisticsTests.cs
deleted file mode 100644
index f8ddfe4bd03..00000000000
--- a/src/EventStore.Core.Tests/Services/PersistentSubscription/RequestStatisticsTests.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using EventStore.Core.Services.PersistentSubscription;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.PersistentSubscription {
-	[TestFixture]
-	public class RequestStatisticsTests {
-		[Test]
-		public void DoesNotOverflow() {
-			var elapsedTicks = 0L;
-			var sut = new RequestStatistics(() => elapsedTicks, 1000);
-
-			for (var i = 0; i < 1000; i++) {
-				var id = Guid.NewGuid();
-				sut.StartOperation(id);
-
-				elapsedTicks += TimeSpan.FromMinutes(36).Ticks;
-
-				sut.EndOperation(id);
-			}
-
-			sut.GetMeasurementDetails();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/PersistentSubscription/StreamBufferTests.cs b/src/EventStore.Core.Tests/Services/PersistentSubscription/StreamBufferTests.cs
deleted file mode 100644
index be5086024ba..00000000000
--- a/src/EventStore.Core.Tests/Services/PersistentSubscription/StreamBufferTests.cs
+++ /dev/null
@@ -1,246 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services.PersistentSubscription;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.PersistentSubscription {
-	[TestFixture(EventSource.SingleStream)]
-	[TestFixture(EventSource.AllStream)]
-	public class StreamBufferTests {
-		private EventSource _eventSource;
-
-		public StreamBufferTests(EventSource eventSource) {
-			_eventSource = eventSource;
-		}
-
-		[Test]
-		public void adding_read_message_in_correct_order() {
-			var buffer = new StreamBuffer(10, 10, null, true);
-			buffer.AddReadMessage(BuildMessageAt(0));
-			Assert.AreEqual(1, buffer.BufferCount);
-			OutstandingMessage message = buffer.Scan().First().Message;
-			Assert.AreEqual(GetEventIdFor(0), message.EventId);
-			Assert.IsFalse(buffer.Live);
-		}
-
-		[Test]
-		public void adding_multiple_read_message_in_correct_order() {
-			var buffer = new StreamBuffer(10, 10, null, true);
-			buffer.AddReadMessage(BuildMessageAt(0));
-			buffer.AddReadMessage(BuildMessageAt(1));
-			Assert.AreEqual(2, buffer.BufferCount);
-			var messagePointer = buffer.Scan().First();
-			Assert.AreEqual(GetEventIdFor(0), messagePointer.Message.EventId);
-			messagePointer.MarkSent();
-			Assert.AreEqual(1, buffer.BufferCount);
-			messagePointer = buffer.Scan().First();
-			Assert.AreEqual(GetEventIdFor(1), messagePointer.Message.EventId);
-			messagePointer.MarkSent();
-			Assert.AreEqual(0, buffer.BufferCount);
-			Assert.IsFalse(buffer.Live);
-		}
-
-
-		[Test]
-		public void adding_multiple_read_message_in_wrong_order() {
-			var buffer = new StreamBuffer(10, 10, null, true);
-			buffer.AddReadMessage(BuildMessageAt(1));
-			buffer.AddReadMessage(BuildMessageAt(0));
-			Assert.AreEqual(2, buffer.BufferCount);
-			var messagePointer = buffer.Scan().First();
-			Assert.AreEqual(GetEventIdFor(1), messagePointer.Message.EventId);
-			messagePointer.MarkSent();
-			Assert.AreEqual(1, buffer.BufferCount);
-			messagePointer = buffer.Scan().First();
-			Assert.AreEqual(GetEventIdFor(0), messagePointer.Message.EventId);
-			messagePointer.MarkSent();
-			Assert.AreEqual(0, buffer.BufferCount);
-			Assert.IsFalse(buffer.Live);
-		}
-
-		[Test]
-		public void adding_multiple_same_read_message() {
-			var buffer = new StreamBuffer(10, 10, null, true);
-			buffer.AddReadMessage(BuildMessageAt(0));
-			buffer.AddReadMessage(BuildMessageAt(0));
-			Assert.AreEqual(2, buffer.BufferCount);
-			var messagePointer = buffer.Scan().First();
-			Assert.AreEqual(GetEventIdFor(0), messagePointer.Message.EventId);
-			messagePointer.MarkSent();
-			Assert.AreEqual(1, buffer.BufferCount);
-			messagePointer = buffer.Scan().First();
-			Assert.AreEqual(GetEventIdFor(0), messagePointer.Message.EventId);
-			messagePointer.MarkSent();
-			Assert.AreEqual(0, buffer.BufferCount);
-			Assert.IsFalse(buffer.Live);
-		}
-
-		[Test]
-		public void adding_messages_to_read_after_same_on_live_switches_to_live() {
-			var buffer = new StreamBuffer(10, 10, null, true);
-			buffer.AddLiveMessage(BuildMessageAt(0));
-			buffer.AddReadMessage(BuildMessageAt(0));
-			Assert.IsTrue(buffer.Live);
-			Assert.AreEqual(1, buffer.BufferCount);
-			var messagePointer = buffer.Scan().First();
-			Assert.AreEqual(GetEventIdFor(0), messagePointer.Message.EventId);
-			messagePointer.MarkSent();
-			Assert.AreEqual(0, buffer.BufferCount);
-		}
-
-		[Test]
-		public void adding_messages_to_read_after_later_live_does_not_switch() {
-			var buffer = new StreamBuffer(10, 10, null, true);
-			buffer.AddLiveMessage(BuildMessageAt(5));
-			buffer.AddReadMessage(BuildMessageAt(0));
-			Assert.IsFalse(buffer.Live);
-			Assert.AreEqual(1, buffer.BufferCount);
-			var messagePointer = buffer.Scan().First();
-			Assert.AreEqual(GetEventIdFor(0), messagePointer.Message.EventId);
-			messagePointer.MarkSent();
-			Assert.AreEqual(0, buffer.BufferCount);
-		}
-
-		[Test]
-		public void adding_messages_to_live_without_start_from_beginning() {
-			var buffer = new StreamBuffer(10, 10, null, false);
-			buffer.AddLiveMessage(BuildMessageAt(6));
-			buffer.AddLiveMessage(BuildMessageAt(7));
-			Assert.IsTrue(buffer.Live);
-			Assert.AreEqual(2, buffer.BufferCount);
-			var messagePointer = buffer.Scan().First();
-			Assert.AreEqual(GetEventIdFor(6), messagePointer.Message.EventId);
-			messagePointer.MarkSent();
-			Assert.AreEqual(1, buffer.BufferCount);
-			messagePointer = buffer.Scan().First();
-			Assert.AreEqual(GetEventIdFor(7), messagePointer.Message.EventId);
-			messagePointer.MarkSent();
-			Assert.AreEqual(0, buffer.BufferCount);
-		}
-
-		[Test]
-		public void adding_messages_with_lower_in_live() {
-			var buffer = new StreamBuffer(10, 10, null, true);
-			var id = Guid.NewGuid();
-			buffer.AddLiveMessage(BuildMessageAt(5));
-			buffer.AddLiveMessage(BuildMessageAt(6));
-			buffer.AddLiveMessage(BuildMessageAt(7, id));
-			buffer.AddReadMessage(BuildMessageAt(7));
-			Assert.IsTrue(buffer.Live);
-			Assert.AreEqual(1, buffer.BufferCount);
-			var messagePointer = buffer.Scan().First();
-			Assert.AreEqual(id, messagePointer.Message.EventId);
-			messagePointer.MarkSent();
-			Assert.AreEqual(0, buffer.BufferCount);
-		}
-
-		[Test]
-		public void skipped_messages_are_not_removed() {
-			var buffer = new StreamBuffer(10, 10, null, true);
-			buffer.AddReadMessage(BuildMessageAt(0));
-			buffer.AddReadMessage(BuildMessageAt(1));
-			buffer.AddReadMessage(BuildMessageAt(2));
-			Assert.AreEqual(3, buffer.BufferCount);
-
-			var messagePointer2 = buffer.Scan().Skip(1).First(); // Skip the first message.
-			Assert.AreEqual(GetEventIdFor(1), messagePointer2.Message.EventId);
-			messagePointer2.MarkSent();
-			Assert.AreEqual(2, buffer.BufferCount);
-
-			var messagePointers = buffer.Scan().ToArray();
-			Assert.AreEqual(GetEventIdFor(0), messagePointers[0].Message.EventId);
-			Assert.AreEqual(GetEventIdFor(2), messagePointers[1].Message.EventId);
-		}
-
-		[Test]
-		public void retried_messages_appear_first() {
-			var buffer = new StreamBuffer(10, 10, null, true);
-			buffer.AddReadMessage(BuildMessageAt(0));
-			buffer.AddRetry(BuildMessageAt(2));
-			Assert.AreEqual(2, buffer.BufferCount);
-			Assert.AreEqual(1, buffer.RetryBufferCount);
-			Assert.AreEqual(1, buffer.ReadBufferCount);
-
-			var messagePointer = buffer.Scan().First();
-			Assert.AreEqual(GetEventIdFor(2), messagePointer.Message.EventId);
-			messagePointer.MarkSent();
-			Assert.AreEqual(1, buffer.BufferCount);
-			Assert.AreEqual(0, buffer.RetryBufferCount);
-			Assert.AreEqual(1, buffer.ReadBufferCount);
-
-			messagePointer = buffer.Scan().First();
-			Assert.AreEqual(GetEventIdFor(0), messagePointer.Message.EventId);
-			messagePointer.MarkSent();
-			Assert.AreEqual(0, buffer.BufferCount);
-			Assert.AreEqual(0, buffer.RetryBufferCount);
-			Assert.AreEqual(0, buffer.ReadBufferCount);
-
-			Assert.IsFalse(buffer.Live);
-		}
-
-		[Test]
-		public void retried_messages_appear_in_version_order() {
-			var buffer = new StreamBuffer(10, 10, null, true);
-			var id2Retry1 = Guid.NewGuid();
-			var id2Retry2 = Guid.NewGuid();
-			buffer.AddReadMessage(BuildMessageAt(0));
-			buffer.AddRetry(BuildMessageAt(2, id2Retry1));
-			buffer.AddRetry(BuildMessageAt(3));
-			buffer.AddRetry(BuildMessageAt(1));
-			buffer.AddRetry(BuildMessageAt(2, id2Retry2));
-
-			var messagePointer = buffer.Scan().First();
-			Assert.AreEqual(GetEventIdFor(1), messagePointer.Message.EventId);
-			messagePointer.MarkSent();
-
-			messagePointer = buffer.Scan().First();
-			Assert.AreEqual(id2Retry1, messagePointer.Message.EventId);
-			messagePointer.MarkSent();
-
-			messagePointer = buffer.Scan().First();
-			Assert.AreEqual(id2Retry2, messagePointer.Message.EventId);
-			messagePointer.MarkSent();
-
-			messagePointer = buffer.Scan().First();
-			Assert.AreEqual(GetEventIdFor(3), messagePointer.Message.EventId);
-			messagePointer.MarkSent();
-		}
-
-		[Test]
-		public void lowest_retry_doesnt_assume_order() {
-			var buffer = new StreamBuffer(10, 10, null, true);
-			buffer.AddRetry(BuildMessageAt(4));
-			buffer.AddRetry(BuildMessageAt(2));
-			buffer.AddRetry(BuildMessageAt(3));
-			Assert.AreEqual(2, buffer.GetLowestRetry().sequenceNumber);
-		}
-
-		[Test]
-		public void lowest_retry_ignores_replayed_events() {
-			var buffer = new StreamBuffer(10, 10, null, true);
-			buffer.AddRetry(BuildMessageAt(4));
-			buffer.AddRetry(BuildMessageAt(2));
-			buffer.AddRetry(BuildMessageAt(3));
-			//add parked events
-			buffer.AddRetry(OutstandingMessage.ForParkedEvent(Helper.BuildFakeEvent(Guid.NewGuid(), "foo", "$persistentsubscription-foo::group-parked", 1)));
-			Assert.AreEqual(2, buffer.GetLowestRetry().sequenceNumber);
-		}
-
-		private OutstandingMessage BuildMessageAt(int position, Guid? forcedEventId = null) {
-			IPersistentSubscriptionStreamPosition previousEventPosition =
-				position > 0 ? Helper.GetStreamPositionFor(position - 1, _eventSource) : null;
-			var @event = BuildEventAt(position, forcedEventId);
-			return OutstandingMessage.ForPushedEvent(
-				OutstandingMessage.ForNewEvent(@event, Helper.GetStreamPositionFor(position, _eventSource)), position, previousEventPosition).message;
-		}
-
-		private Guid GetEventIdFor(int position) {
-			return Helper.GetEventIdFor(position);
-		}
-
-		private ResolvedEvent BuildEventAt(int position, Guid? forcedEventId = null) {
-			return Helper.GetFakeEventFor(position, _eventSource, forcedEventId);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/PersistentSubscription/when_an_error_occurs.cs b/src/EventStore.Core.Tests/Services/PersistentSubscription/when_an_error_occurs.cs
deleted file mode 100644
index cc7a80efc97..00000000000
--- a/src/EventStore.Core.Tests/Services/PersistentSubscription/when_an_error_occurs.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-using System;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Metrics;
-using EventStore.Core.Services.PersistentSubscription;
-using EventStore.Core.Services.PersistentSubscription.ConsumerStrategy;
-using EventStore.Core.Tests.TransactionLog;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.PersistentSubscription {
-	[TestFixture]
-	public class PersistentSubscriptionServiceErrorTests {
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public abstract class when_an_error_occurs<TLogFormat, TStreamId, TMessage, TReply, TResult>
-			where TMessage : Message where TReply : Message {
-			private readonly TResult _expectedResult;
-			private readonly PersistentSubscriptionService<TStreamId> _sut;
-			private readonly TaskCompletionSource<Message> _replySource;
-			private readonly CallbackEnvelope _envelope;
-
-			protected when_an_error_occurs(TResult expectedResult) {
-				_expectedResult = expectedResult;
-				_replySource = new TaskCompletionSource<Message>();
-				var bus = new SynchronousScheduler();
-				var trackers = new Trackers();
-				_sut = new PersistentSubscriptionService<TStreamId>(
-					new QueuedHandlerThreadPool(bus, "test",
-						new QueueStatsManager(), new QueueTrackers()),
-					new FakeReadIndex<TLogFormat, TStreamId>(_ => false, new MetaStreamLookup()),
-					new IODispatcher(bus, bus), bus,
-					new PersistentSubscriptionConsumerStrategyRegistry(bus, bus,
-						Array.Empty<IPersistentSubscriptionConsumerStrategyFactory>()), trackers.PersistentSubscriptionTracker);
-				_envelope = new CallbackEnvelope(_replySource.SetResult);
-				_sut.Start();
-			}
-
-			private void Handle(TMessage message) =>
-				typeof(PersistentSubscriptionService<TStreamId>).GetMethod("Handle", new[] { typeof(TMessage) })!
-					.Invoke(_sut, new object[] { message });
-
-			protected abstract TMessage CreateMessage(IEnvelope envelope);
-
-			protected abstract TResult GetResult(TReply reply);
-
-			[Test]
-			public async Task test() {
-				Handle(CreateMessage(_envelope));
-				var result = await _replySource.Task.WithTimeout();
-				Assert.IsInstanceOf<TReply>(result);
-
-				Assert.AreEqual(
-					_expectedResult, GetResult((TReply)result));
-			}
-
-			private class MetaStreamLookup : IMetastreamLookup<TStreamId> {
-				public bool IsMetaStream(TStreamId streamId) => throw new NotSupportedException();
-
-				public TStreamId MetaStreamOf(TStreamId streamId) => throw new NotSupportedException();
-
-				public TStreamId OriginalStreamOf(TStreamId streamId) => throw new NotSupportedException();
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class create_stream<TLogFormat, TStreamId> : when_an_error_occurs<TLogFormat, TStreamId,
-			ClientMessage.CreatePersistentSubscriptionToStream,
-			ClientMessage.CreatePersistentSubscriptionToStreamCompleted,
-			ClientMessage.CreatePersistentSubscriptionToStreamCompleted.CreatePersistentSubscriptionToStreamResult> {
-			public create_stream() : base(ClientMessage.CreatePersistentSubscriptionToStreamCompleted
-				.CreatePersistentSubscriptionToStreamResult.Fail) {
-			}
-
-			protected override ClientMessage.CreatePersistentSubscriptionToStream CreateMessage(IEnvelope envelope) =>
-				new(
-					Guid.NewGuid(), Guid.NewGuid(), envelope, "stream", "group", false, 0L, -1, false, 0, 0, 0, 0, 0, 0,
-					0, 0,
-					null, ClaimsPrincipal.Current);
-
-			protected override
-				ClientMessage.CreatePersistentSubscriptionToStreamCompleted.CreatePersistentSubscriptionToStreamResult
-				GetResult(ClientMessage.CreatePersistentSubscriptionToStreamCompleted reply) => reply.Result;
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class create_all<TLogFormat, TStreamId> : when_an_error_occurs<TLogFormat, TStreamId,
-			ClientMessage.CreatePersistentSubscriptionToAll,
-			ClientMessage.CreatePersistentSubscriptionToAllCompleted,
-			ClientMessage.CreatePersistentSubscriptionToAllCompleted.CreatePersistentSubscriptionToAllResult> {
-			public create_all() : base(ClientMessage.CreatePersistentSubscriptionToAllCompleted
-				.CreatePersistentSubscriptionToAllResult.Fail) {
-			}
-
-			protected override ClientMessage.CreatePersistentSubscriptionToAll CreateMessage(IEnvelope envelope) => new(
-				Guid.NewGuid(), Guid.NewGuid(), envelope, "group", null, false, new(0, 0), -1, false, 0, 0, 0, 0, 0, 0,
-				0, 0, null, ClaimsPrincipal.Current);
-
-			protected override
-				ClientMessage.CreatePersistentSubscriptionToAllCompleted.CreatePersistentSubscriptionToAllResult
-				GetResult(ClientMessage.CreatePersistentSubscriptionToAllCompleted reply) => reply.Result;
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class update_stream<TLogFormat, TStreamId> : when_an_error_occurs<TLogFormat, TStreamId,
-			ClientMessage.UpdatePersistentSubscriptionToStream,
-			ClientMessage.UpdatePersistentSubscriptionToStreamCompleted,
-			ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult> {
-			public update_stream() : base(ClientMessage.UpdatePersistentSubscriptionToStreamCompleted
-				.UpdatePersistentSubscriptionToStreamResult.Fail) {
-			}
-
-			protected override ClientMessage.UpdatePersistentSubscriptionToStream CreateMessage(IEnvelope envelope) =>
-				new(
-					Guid.NewGuid(), Guid.NewGuid(), envelope, "stream", "group", false, 0L, -1, false, 0, 0, 0, 0, 0, 0,
-					0, 0,
-					null, ClaimsPrincipal.Current);
-
-			protected override
-				ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult
-				GetResult(ClientMessage.UpdatePersistentSubscriptionToStreamCompleted reply) => reply.Result;
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class update_all<TLogFormat, TStreamId> : when_an_error_occurs<TLogFormat, TStreamId,
-			ClientMessage.UpdatePersistentSubscriptionToAll,
-			ClientMessage.UpdatePersistentSubscriptionToAllCompleted,
-			ClientMessage.UpdatePersistentSubscriptionToAllCompleted.UpdatePersistentSubscriptionToAllResult> {
-			public update_all() : base(ClientMessage.UpdatePersistentSubscriptionToAllCompleted
-				.UpdatePersistentSubscriptionToAllResult.Fail) {
-			}
-
-			protected override ClientMessage.UpdatePersistentSubscriptionToAll CreateMessage(IEnvelope envelope) => new(
-				Guid.NewGuid(), Guid.NewGuid(), envelope, "group", false, new(0, 0), -1, false, 0, 0, 0, 0, 0, 0,
-				0, 0, null, ClaimsPrincipal.Current);
-
-			protected override
-				ClientMessage.UpdatePersistentSubscriptionToAllCompleted.UpdatePersistentSubscriptionToAllResult
-				GetResult(ClientMessage.UpdatePersistentSubscriptionToAllCompleted reply) => reply.Result;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/PersistentSubscription/when_restarting.cs b/src/EventStore.Core.Tests/Services/PersistentSubscription/when_restarting.cs
deleted file mode 100644
index 1ee64b8bfa6..00000000000
--- a/src/EventStore.Core.Tests/Services/PersistentSubscription/when_restarting.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Integration;
-using EventStore.Core.Tests.Services.Replication;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.PersistentSubscription {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_restarting_with_a_connected_subscription<TLogFormat, TStreamId> : specification_with_a_single_node<TLogFormat, TStreamId> {
-		private readonly ManualResetEvent _subscriptionDropped = new ManualResetEvent(false);
-		private readonly ManualResetEvent _serviceStarted = new ManualResetEvent(false);
-		private readonly ManualResetEvent _serviceStopped = new ManualResetEvent(false);
-
-		protected override Task Given() {
-			var testUser = new ClaimsPrincipal(new ClaimsIdentity(
-				new[] {
-					new Claim(ClaimTypes.Name, "admin"),
-				}, "ES-Test"));
-
-			_node.Node.MainBus.Subscribe(
-				new AdHocHandler<SubscriptionMessage.PersistentSubscriptionsStarted>(_ => _serviceStarted.Set()));
-
-			_node.Node.MainBus.Subscribe(
-				new AdHocHandler<SubscriptionMessage.PersistentSubscriptionsStopped>(_ => _serviceStopped.Set()));
-
-			var streamId = Guid.NewGuid().ToString();
-			var group = Guid.NewGuid().ToString();
-			_node.Node.MainQueue.Handle(new ClientMessage.CreatePersistentSubscriptionToStream(Guid.NewGuid(), Guid.NewGuid(),
-				new FakeEnvelope(), streamId, group, false, 0, 0, false, 0, 20, 20, 10, 1, 1, 10, 1,
-				"RoundRobin",
-				testUser, DateTime.UtcNow));
-
-			_node.Node.MainQueue.Handle(new ClientMessage.ConnectToPersistentSubscriptionToStream(Guid.NewGuid(),
-				Guid.NewGuid(), new CallbackEnvelope(message => {
-					_subscriptionDropped.Set();
-				}), Guid.NewGuid(), Guid.NewGuid().ToString(), group, streamId, 1, "0",
-				testUser));
-
-			_node.Node.MainQueue.Handle(
-				new SubscriptionMessage.PersistentSubscriptionsRestart(new FakeEnvelope()));
-			return base.Given();
-		}
-
-		[Test]
-		public void should_drop_subscription() {
-			Assert.IsTrue(_subscriptionDropped.WaitOne(TimeSpan.FromSeconds(5)));
-		}
-
-		[Test]
-		public void should_have_stopped_the_service() {
-			Assert.IsTrue(_serviceStopped.WaitOne(TimeSpan.FromSeconds(5)));
-		}
-
-		[Test]
-		public void should_have_started_the_service() {
-			Assert.IsTrue(_serviceStarted.WaitOne(TimeSpan.FromSeconds(5)));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RedactionService/EventPositionTests.cs b/src/EventStore.Core.Tests/Services/RedactionService/EventPositionTests.cs
deleted file mode 100644
index 18eadd3ee87..00000000000
--- a/src/EventStore.Core.Tests/Services/RedactionService/EventPositionTests.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-using EventStore.Core.Data.Redaction;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using FluentAssertions;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.RedactionService {
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class EventPositionTests<TLogFormat, TStreamId> : RedactionServiceTestFixture<TLogFormat,TStreamId> {
-		private const string StreamId = nameof(EventPositionTests<TLogFormat, TStreamId>);
-		private readonly Dictionary<long, List<EventPosition>> _positions = new();
-
-		private void WriteEvent(string streamId, long eventNumber, string data) {
-			var eventRecord = WriteSingleEvent(streamId, eventNumber, data);
-			if (!_positions.ContainsKey(eventNumber))
-				_positions[eventNumber] = new();
-
-			var chunk = Db.Manager.GetChunkFor(eventRecord.LogPosition);
-			var eventOffset = chunk.GetActualRawPosition(eventRecord.LogPosition);
-			var eventPosition = new EventPosition(
-				eventRecord.LogPosition, Path.GetFileName(chunk.FileName), chunk.ChunkHeader.MinCompatibleVersion, chunk.IsReadOnly, (uint)eventOffset);
-			_positions[eventNumber].Add(eventPosition);
-		}
-
-		protected override void WriteTestScenario() {
-			WriteEvent(StreamId, 2, "data 2");
-			WriteEvent(StreamId, 0, "data 0");
-			WriteEvent(StreamId, 1, "data 1");
-			WriteEvent(StreamId, 2, "data 2"); // duplicate
-		}
-
-		private async Task<RedactionMessage.GetEventPositionCompleted> GetEventPosition(long eventNumber) {
-			var e = new TcsEnvelope<RedactionMessage.GetEventPositionCompleted>();
-			RedactionService.Handle(new RedactionMessage.GetEventPosition(e, StreamId, eventNumber));
-			return await e.Task;
-		}
-
-		[Test]
-		public async Task can_get_positions_of_event_0() {
-			var msg = await GetEventPosition(0);
-			Assert.AreEqual(GetEventPositionResult.Success, msg.Result);
-			Assert.AreEqual(1, msg.EventPositions.Length);
-			msg.EventPositions.Should().BeEquivalentTo(_positions[0].ToArray());
-		}
-
-		[Test]
-		public async Task can_get_positions_of_event_1() {
-			var msg = await GetEventPosition(1);
-			Assert.AreEqual(GetEventPositionResult.Success, msg.Result);
-			Assert.AreEqual(1, msg.EventPositions.Length);
-			msg.EventPositions.Should().BeEquivalentTo(_positions[1].ToArray());
-		}
-
-		[Test]
-		public async Task can_get_positions_of_event_2() {
-			var msg = await GetEventPosition(2);
-			Assert.AreEqual(GetEventPositionResult.Success, msg.Result);
-			Assert.AreEqual(2, msg.EventPositions.Length);
-			msg.EventPositions.Should().BeEquivalentTo(_positions[2].ToArray());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RedactionService/LockTests.cs b/src/EventStore.Core.Tests/Services/RedactionService/LockTests.cs
deleted file mode 100644
index c43611136a7..00000000000
--- a/src/EventStore.Core.Tests/Services/RedactionService/LockTests.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Data.Redaction;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.RedactionService {
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class LockTests<TLogFormat, TStreamId> : RedactionServiceTestFixture<TLogFormat,TStreamId> {
-		protected override void WriteTestScenario() {}
-
-		private async Task<RedactionMessage.AcquireChunksLockCompleted> TryLock() {
-			var e = new TcsEnvelope<RedactionMessage.AcquireChunksLockCompleted>();
-			RedactionService.Handle(new RedactionMessage.AcquireChunksLock(e));
-			return await e.Task;
-		}
-
-		private async Task<RedactionMessage.ReleaseChunksLockCompleted> TryUnlock(Guid lockId) {
-			var e = new TcsEnvelope<RedactionMessage.ReleaseChunksLockCompleted>();
-			RedactionService.Handle(new RedactionMessage.ReleaseChunksLock(e, lockId));
-			return await e.Task;
-		}
-
-		[Test]
-		public async Task can_lock() {
-			var msg = await TryLock();
-			Assert.AreEqual(AcquireChunksLockResult.Success, msg.Result);
-		}
-
-		[Test]
-		public async Task can_unlock() {
-			var lockMsg = await TryLock();
-			Assert.AreEqual(AcquireChunksLockResult.Success, lockMsg.Result);
-
-			var unlockMsg = await TryUnlock(lockMsg.AcquisitionId);
-			Assert.AreEqual(ReleaseChunksLockResult.Success, unlockMsg.Result);
-		}
-
-		[Test]
-		public async Task cannot_unlock_with_wrong_id() {
-			var lockMsg = await TryLock();
-			Assert.AreEqual(AcquireChunksLockResult.Success, lockMsg.Result);
-
-			var unlockMsg = await TryUnlock(Guid.NewGuid());
-			Assert.AreEqual(ReleaseChunksLockResult.Failed, unlockMsg.Result);
-		}
-
-		[Test]
-		public async Task cannot_unlock_twice_with_same_id() {
-			var lockMsg = await TryLock();
-			Assert.AreEqual(AcquireChunksLockResult.Success, lockMsg.Result);
-
-			var unlockMsg1 = await TryUnlock(lockMsg.AcquisitionId);
-			Assert.AreEqual(ReleaseChunksLockResult.Success, unlockMsg1.Result);
-
-			var unlockMsg2 = await TryUnlock(lockMsg.AcquisitionId);
-			Assert.AreEqual(ReleaseChunksLockResult.Failed, unlockMsg2.Result);
-		}
-
-		[Test]
-		public async Task cannot_unlock_when_unlocked() {
-			var msg = await TryUnlock(Guid.NewGuid());
-			Assert.AreEqual(ReleaseChunksLockResult.Failed, msg.Result);
-		}
-
-		[Test]
-		public async Task cannot_lock_when_locked() {
-			var msg = await TryLock();
-			Assert.AreEqual(AcquireChunksLockResult.Success, msg.Result);
-
-			msg = await TryLock();
-			Assert.AreEqual(AcquireChunksLockResult.Failed, msg.Result);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RedactionService/RedactionServiceTestFixture.cs b/src/EventStore.Core.Tests/Services/RedactionService/RedactionServiceTestFixture.cs
deleted file mode 100644
index 77af5849b84..00000000000
--- a/src/EventStore.Core.Tests/Services/RedactionService/RedactionServiceTestFixture.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Services;
-using EventStore.Core.Synchronization;
-using EventStore.Core.Tests.Bus;
-using EventStore.Core.Tests.Services.Storage;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.RedactionService {
-	[TestFixture]
-	public abstract class RedactionServiceTestFixture<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private SemaphoreSlimLock _switchChunksLock;
-		public RedactionService<TStreamId> RedactionService { get; private set; }
-
-		public RedactionServiceTestFixture() : base(chunkSize: 1024) { }
-
-		[SetUp]
-		public virtual Task SetUp() {
-			_switchChunksLock = new SemaphoreSlimLock();
-			RedactionService = new RedactionService<TStreamId>(new FakeQueuedHandler(), Db, ReadIndex, _switchChunksLock);
-			return Task.CompletedTask;
-		}
-
-		[TearDown]
-		public virtual Task TearDown() {
-			_switchChunksLock?.Dispose();
-			return Task.CompletedTask;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RedactionService/SwitchChunkFailureTests.cs b/src/EventStore.Core.Tests/Services/RedactionService/SwitchChunkFailureTests.cs
deleted file mode 100644
index 876dcd14393..00000000000
--- a/src/EventStore.Core.Tests/Services/RedactionService/SwitchChunkFailureTests.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using EventStore.Core.Data.Redaction;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.Transforms.Identity;
-using EventStore.Plugins.Transforms;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.RedactionService {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class SwitchChunkFailureTests<TLogFormat, TStreamId> : SwitchChunkTests<TLogFormat, TStreamId> {
-		[Test]
-		public async Task cannot_switch_invalid_chunk_filename() {
-			var msg = await SwitchChunk("chunk", FakeChunk);
-			Assert.AreEqual(SwitchChunkResult.TargetChunkFileNameInvalid, msg.Result);
-
-			msg = await SwitchChunk("../chunk-000000.000000", FakeChunk);
-			Assert.AreEqual(SwitchChunkResult.TargetChunkFileNameInvalid, msg.Result);
-
-			msg = await SwitchChunk("..chunk-000000.000000", FakeChunk);
-			Assert.AreEqual(SwitchChunkResult.TargetChunkFileNameInvalid, msg.Result);
-
-			msg = await SwitchChunk("/chunk-000000.000000", FakeChunk);
-			Assert.AreEqual(SwitchChunkResult.TargetChunkFileNameInvalid, msg.Result);
-		}
-
-		[Test]
-		public async Task cannot_switch_non_existent_chunk() {
-			var msg = await SwitchChunk(GetChunk(3, 0), FakeChunk);
-			Assert.AreEqual(SwitchChunkResult.TargetChunkFileNotFound, msg.Result);
-		}
-
-		[Test]
-		public async Task cannot_switch_chunk_not_used_by_db() {
-			File.Copy(GetChunk(0, 0, true), GetChunk(10, 0, true));
-			var msg = await SwitchChunk(GetChunk(10, 0), FakeChunk);
-			Assert.AreEqual(SwitchChunkResult.TargetChunkExcessive, msg.Result);
-		}
-
-		[Test]
-		public async Task cannot_switch_inactive_chunk() {
-			File.Copy(GetChunk(0, 0, true), GetChunk(0, 1, true));
-			var msg = await SwitchChunk(GetChunk(0, 1), FakeChunk);
-			Assert.AreEqual(SwitchChunkResult.TargetChunkInactive, msg.Result);
-		}
-
-		[Test]
-		public async Task cannot_switch_incomplete_chunk() {
-			var msg = await SwitchChunk(GetChunk(2, 0), FakeChunk);
-			Assert.AreEqual(SwitchChunkResult.TargetChunkNotCompleted, msg.Result);
-		}
-
-		[Test]
-		public async Task cannot_switch_with_invalid_chunk_filename() {
-			var msg = await SwitchChunk(GetChunk(0, 0), "chunk.wrong_extension");
-			Assert.AreEqual(SwitchChunkResult.NewChunkFileNameInvalid, msg.Result);
-
-			msg = await SwitchChunk(GetChunk(0, 0), "../chunk.tmp");
-			Assert.AreEqual(SwitchChunkResult.NewChunkFileNameInvalid, msg.Result);
-
-			msg = await SwitchChunk(GetChunk(0, 0), "..chunk.tmp");
-			Assert.AreEqual(SwitchChunkResult.NewChunkFileNameInvalid, msg.Result);
-
-			msg = await SwitchChunk(GetChunk(0, 0), "/chunk.tmp");
-			Assert.AreEqual(SwitchChunkResult.NewChunkFileNameInvalid, msg.Result);
-		}
-
-		[Test]
-		public async Task cannot_switch_with_non_existent_chunk() {
-			var msg = await SwitchChunk(GetChunk(0, 0), "no-chunk.tmp");
-			Assert.AreEqual(SwitchChunkResult.NewChunkFileNotFound, msg.Result);
-		}
-
-		[Test]
-		public async Task cannot_switch_with_incomplete_chunk() {
-			var newChunk = Path.Combine(PathName, $"{nameof(cannot_switch_with_incomplete_chunk)}.tmp");
-			File.Copy(GetChunk(0, 0, true), newChunk);
-
-			// zero out the footer & hash to make it an incomplete chunk
-			File.SetAttributes(newChunk, FileAttributes.Normal);
-			await using (var fs = new FileStream(newChunk, FileMode.Open, FileAccess.ReadWrite, FileShare.None)) {
-				fs.Seek(- (ChunkFooter.Size + ChunkFooter.ChecksumSize), SeekOrigin.End);
-				fs.Write(new byte[ChunkFooter.Size + ChunkFooter.ChecksumSize]);
-			}
-
-			var msg = await SwitchChunk(GetChunk(0, 0), Path.GetFileName(newChunk));
-			Assert.AreEqual(SwitchChunkResult.NewChunkNotCompleted, msg.Result);
-		}
-
-		[Test]
-		public async Task cannot_switch_with_chunk_with_invalid_header_or_footer() {
-			var msg = await SwitchChunk(GetChunk(0, 0), FakeChunk);
-			Assert.AreEqual(SwitchChunkResult.NewChunkHeaderOrFooterInvalid, msg.Result);
-		}
-
-		[Test]
-		public async Task cannot_switch_with_chunk_having_invalid_hash() {
-			var newChunk = Path.Combine(PathName, $"{nameof(cannot_switch_with_chunk_having_invalid_hash)}.tmp");
-			File.Copy(GetChunk(0, 0, true), newChunk);
-
-			// corrupt the file
-			File.SetAttributes(newChunk, FileAttributes.Normal);
-			await using (var fs = new FileStream(newChunk, FileMode.Open, FileAccess.ReadWrite, FileShare.None)) {
-				fs.Seek(123, SeekOrigin.Begin);
-				fs.WriteByte(0xFF);
-			}
-
-			var msg = await SwitchChunk(GetChunk(0, 0), Path.GetFileName(newChunk));
-			Assert.AreEqual(SwitchChunkResult.NewChunkHashInvalid, msg.Result);
-		}
-
-		[Test]
-		public async Task cannot_switch_with_chunk_file_in_use() {
-			var newChunk = Path.Combine(PathName, $"{nameof(cannot_switch_with_chunk_file_in_use)}.tmp");
-
-			File.Copy(GetChunk(0, 0, true), newChunk);
-			File.SetAttributes(newChunk, FileAttributes.Normal);
-			await using (new FileStream(newChunk, FileMode.Open, FileAccess.ReadWrite, FileShare.None)) {
-				var msg = await SwitchChunk(GetChunk(0, 0), Path.GetFileName(newChunk));
-				Assert.AreEqual(SwitchChunkResult.NewChunkOpenFailed, msg.Result);
-			}
-		}
-
-		[Test]
-		public async Task cannot_switch_with_chunk_having_mismatched_range() {
-			var newChunk = $"{nameof(cannot_switch_with_chunk_having_mismatched_range)}-chunk0copy.tmp";
-			File.Copy(GetChunk(0, 0, true), Path.Combine(PathName, newChunk));
-			var msg = await SwitchChunk(GetChunk(1, 0), newChunk);
-			Assert.AreEqual(SwitchChunkResult.ChunkRangeDoesNotMatch, msg.Result);
-
-			newChunk = $"{nameof(cannot_switch_with_chunk_having_mismatched_range)}-chunk-0-2.tmp";
-			var chunkHeader = new ChunkHeader(1, 1, 1024, 0, 2, true, Guid.NewGuid(), TransformType.Identity);
-			var chunk = TFChunk.CreateWithHeader(Path.Combine(PathName, newChunk), chunkHeader, 1024, false, false, false, false,
-				new TFChunkTracker.NoOp(), new IdentityChunkTransformFactory(), ReadOnlyMemory<byte>.Empty);
-			chunk.Dispose();
-			msg = await SwitchChunk(GetChunk(0, 0), newChunk);
-			Assert.AreEqual(SwitchChunkResult.ChunkRangeDoesNotMatch, msg.Result);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RedactionService/SwitchChunkSuccessTests.cs b/src/EventStore.Core.Tests/Services/RedactionService/SwitchChunkSuccessTests.cs
deleted file mode 100644
index f55ade6a6ce..00000000000
--- a/src/EventStore.Core.Tests/Services/RedactionService/SwitchChunkSuccessTests.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System.IO;
-using System.Threading.Tasks;
-using EventStore.Core.Data.Redaction;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-using MD5 = EventStore.Core.Hashing.MD5;
-
-// successful chunk switching tests have individual classes as they modify the database and thus the test fixture cannot be reused
-
-namespace EventStore.Core.Tests.Services.RedactionService {
-	public class SwitchChunkSuccess<TLogFormat, TStreamId> : SwitchChunkTests<TLogFormat, TStreamId> {
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class CanSwitchWithExactCopy : SwitchChunkSuccess<TLogFormat, TStreamId> {
-			[Test]
-			public async Task can_switch_with_exact_copy() {
-				var newChunk = Path.Combine(PathName, $"{nameof(can_switch_with_exact_copy)}.tmp");
-
-				File.Copy(GetChunk(1, 0, true), newChunk);
-				var msg = await SwitchChunk(GetChunk(1, 0), Path.GetFileName(newChunk));
-				Assert.AreEqual(SwitchChunkResult.Success, msg.Result);
-				Assert.True(!File.Exists(newChunk));
-				Assert.True(!File.Exists(GetChunk(1, 0, true)));
-				Assert.True(File.Exists(GetChunk(1, 1, true)));
-				Assert.AreEqual(1, Db.Config.FileNamingStrategy.GetVersionFor(Path.GetFileName(Db.Manager.GetChunk(1).FileName)));
-				Assert.True(File.Exists(GetChunk(0, 0, true)));
-
-				// can switch again
-				File.Copy(GetChunk(1, 1, true), newChunk);
-				msg = await SwitchChunk(GetChunk(1, 1), Path.GetFileName(newChunk));
-				Assert.AreEqual(SwitchChunkResult.Success, msg.Result);
-				Assert.True(!File.Exists(newChunk));
-				Assert.True(!File.Exists(GetChunk(1, 0, true)));
-				Assert.True(!File.Exists(GetChunk(1, 1, true)));
-				Assert.True(File.Exists(GetChunk(1, 2, true)));
-				Assert.AreEqual(2, Db.Config.FileNamingStrategy.GetVersionFor(Path.GetFileName(Db.Manager.GetChunk(1).FileName)));
-				Assert.True(File.Exists(GetChunk(0, 0, true)));
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class CanSwitchWithModifiedCopy : SwitchChunkSuccess<TLogFormat, TStreamId> {
-			[Test]
-			public async Task can_switch_with_modified_copy() {
-				var newChunk = Path.Combine(PathName, $"{nameof(can_switch_with_modified_copy)}.tmp");
-
-				File.Copy(GetChunk(1, 0, true), newChunk);
-
-				// edit the chunk file
-				File.SetAttributes(newChunk, FileAttributes.Normal);
-				await using (var fs = new FileStream(newChunk, FileMode.Open, FileAccess.ReadWrite, FileShare.None)) {
-					// jump in the data and make some modifications
-					fs.Seek(ChunkHeader.Size + 123, SeekOrigin.Begin);
-					fs.WriteByte(0xAB);
-					fs.WriteByte(0xCD);
-
-					// truncate the hash
-					fs.SetLength(fs.Length - ChunkFooter.ChecksumSize);
-
-					// recompute the hash
-					byte[] newHash;
-					fs.Seek(0, SeekOrigin.Begin);
-					using (var md5 = MD5.Create())
-						newHash = await md5.ComputeHashAsync(fs);
-
-					// write the new hash
-					fs.Seek(0, SeekOrigin.End);
-					fs.Write(newHash);
-				}
-
-				var msg = await SwitchChunk(GetChunk(1, 0), Path.GetFileName(newChunk));
-				Assert.AreEqual(SwitchChunkResult.Success, msg.Result);
-				Assert.True(!File.Exists(newChunk));
-				Assert.True(!File.Exists(GetChunk(1, 0, true)));
-				Assert.True(File.Exists(GetChunk(1, 1, true)));
-				Assert.AreEqual(1, Db.Config.FileNamingStrategy.GetVersionFor(Path.GetFileName(Db.Manager.GetChunk(1).FileName)));
-				Assert.True(File.Exists(GetChunk(0, 0, true)));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RedactionService/SwitchChunkTests.cs b/src/EventStore.Core.Tests/Services/RedactionService/SwitchChunkTests.cs
deleted file mode 100644
index 1f289dd115c..00000000000
--- a/src/EventStore.Core.Tests/Services/RedactionService/SwitchChunkTests.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using EventStore.Core.Data.Redaction;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.RedactionService {
-	public abstract class SwitchChunkTests<TLogFormat, TStreamId> : RedactionServiceTestFixture<TLogFormat,TStreamId> {
-		private const string StreamId = nameof(SwitchChunkTests<TLogFormat, TStreamId>);
-		protected const string FakeChunk = "fake_chunk.tmp";
-		private Guid _lockId;
-
-		protected override void WriteTestScenario() {
-			// the writes below create 3 chunks for both V2 & V3 log formats
-			WriteSingleEvent(StreamId, 0, new string('0', 50), retryOnFail: true);
-			WriteSingleEvent(StreamId, 1, new string('1', 50), retryOnFail: true);
-			WriteSingleEvent(StreamId, 2, new string('2', 50), retryOnFail: true);
-			WriteSingleEvent(StreamId, 3, new string('3', 50), retryOnFail: true);
-			WriteSingleEvent(StreamId, 4, new string('4', 50), retryOnFail: true);
-			WriteSingleEvent(StreamId, 5, new string('5', 50), retryOnFail: true);
-			WriteSingleEvent(StreamId, 6, new string('6', 50), retryOnFail: true);
-			WriteSingleEvent(StreamId, 7, new string('7', 50), retryOnFail: true);
-			WriteSingleEvent(StreamId, 8, new string('8', 50), retryOnFail: true);
-
-			var writerPos = Writer.Position;
-			var chunk = Path.GetFileName(Db.Manager.GetChunkFor(writerPos).FileName);
-			var chunkNum = Db.Config.FileNamingStrategy.GetIndexFor(chunk);
-			Assert.AreEqual(2, chunkNum);
-
-			// create an empty file that can be used in tests that require the target or new chunk files to exist
-			using var fs = File.CreateText(Path.Combine(PathName, FakeChunk));
-		}
-
-		[SetUp]
-		public override async Task SetUp() {
-			await base.SetUp();
-			var e = new TcsEnvelope<RedactionMessage.AcquireChunksLockCompleted>();
-			RedactionService.Handle(new RedactionMessage.AcquireChunksLock(e));
-			var result = await e.Task;
-			Assert.NotNull(result);
-			Assert.AreEqual(AcquireChunksLockResult.Success, result.Result);
-			_lockId = result.AcquisitionId;
-		}
-
-		[TearDown]
-		public override async Task TearDown() {
-			var e = new TcsEnvelope<RedactionMessage.ReleaseChunksLockCompleted>();
-			RedactionService.Handle(new RedactionMessage.ReleaseChunksLock(e, _lockId));
-			await e.Task;
-
-			await base.TearDown();
-		}
-
-		protected string GetChunk(int chunkNum, int chunkVersion, bool fullPath = false) {
-			var chunkPath = Db.Config.FileNamingStrategy.GetFilenameFor(chunkNum, chunkVersion);
-			return fullPath ? chunkPath : Path.GetFileName(chunkPath);
-		}
-
-		protected async Task<RedactionMessage.SwitchChunkCompleted> SwitchChunk(string targetChunk, string newChunk) {
-			var e = new TcsEnvelope<RedactionMessage.SwitchChunkCompleted>();
-			RedactionService.Handle(new RedactionMessage.SwitchChunk(e, _lockId, targetChunk, newChunk));
-			return await e.Task;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/FakeEnvelope.cs b/src/EventStore.Core.Tests/Services/Replication/FakeEnvelope.cs
deleted file mode 100644
index 8cbbe090aee..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/FakeEnvelope.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Tests.Services.Replication {
-	public class FakeEnvelope : IEnvelope {
-		public List<Message> Replies = new List<Message>();
-
-		public void ReplyWith<T>(T message) where T : Message {
-			Replies.Add(message);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/FakeTfChunkLogManager.cs b/src/EventStore.Core.Tests/Services/Replication/FakeTfChunkLogManager.cs
deleted file mode 100644
index 47d67fb1235..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/FakeTfChunkLogManager.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.Chunks;
-
-namespace EventStore.Core.Tests.Services.Replication {
-	public class FakeTfChunkLogManager : ITFChunkScavengerLogManager {
-		public void Initialise() {
-		}
-
-		public ITFChunkScavengerLog CreateLog() {
-			return new FakeTFScavengerLog();
-		}
-	}
-
-	public class FakeTfChunkScavengerLog : ITFChunkScavengerLog {
-		public void IndexTableScavenged(int level, int index, TimeSpan elapsed, long entriesDeleted, long entriesKept,
-			long spaceSaved) {
-		}
-
-		public void IndexTableNotScavenged(int level, int index, TimeSpan elapsed, long entriesKept,
-			string errorMessage) {
-		}
-
-		public string ScavengeId { get; }
-		public long SpaceSaved { get; }
-
-		public void ScavengeStarted() {
-		}
-
-		public void ScavengeStarted(bool alwaysKeepScavenged, bool mergeChunks, int startFromChunk, int threads) {
-		}
-
-		public void ChunksScavenged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, long spaceSaved) {
-		}
-
-		public void ChunksNotScavenged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed,
-			string errorMessage) {
-		}
-
-		public void ChunksMerged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, long spaceSaved) {
-		}
-
-		public void ChunksNotMerged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, string errorMessage) {
-		}
-
-		public void ScavengeCompleted(ScavengeResult result, string error, TimeSpan elapsed) {
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/LeaderReplication/when_non_promotable_replica_sends_replica_log_position_ack.cs b/src/EventStore.Core.Tests/Services/Replication/LeaderReplication/when_non_promotable_replica_sends_replica_log_position_ack.cs
deleted file mode 100644
index fc4fe4079ac..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/LeaderReplication/when_non_promotable_replica_sends_replica_log_position_ack.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.LeaderReplication {
-	[TestFixture]
-	public class when_non_promotable_replica_sends_replica_log_position_ack : with_replication_service {
-		private long _logPosition;
-		
-		public override void When() {
-			_logPosition = 4000;
-			Service.Handle(new ReplicationMessage.ReplicaLogPositionAck(ReadOnlyReplicaId, _logPosition, _logPosition));
-		}
-
-		[Test]
-		public void replica_Log_written_to_should_not_be_published() {
-			Assert.AreEqual(0, ReplicaWriteAcks.Count);			
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/LeaderReplication/when_replica_subscribes_with_epochs.cs b/src/EventStore.Core.Tests/Services/Replication/LeaderReplication/when_replica_subscribes_with_epochs.cs
deleted file mode 100644
index 94e1fb93348..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/LeaderReplication/when_replica_subscribes_with_epochs.cs
+++ /dev/null
@@ -1,355 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.LeaderReplication {
-
-	public class when_replica_subscribes_with_no_common_epochs<TLogFormat, TStreamId>
-		: with_replication_service_and_epoch_manager<TLogFormat, TStreamId> {
-		private readonly Guid _replicaId = Guid.NewGuid();
-		private TcpConnectionManager _replicaManager;
-		public override void When() {
-			EpochManager.WriteNewEpoch(0);
-			Writer.Write(CreateLogRecord(0), out _);
-			Writer.Write(CreateLogRecord(1), out _);
-			Writer.Write(CreateLogRecord(2), out _);
-			Writer.Write(CreateLogRecord(3), out _);
-			Writer.Write(CreateLogRecord(4), out _);
-			EpochManager.WriteNewEpoch(1);
-
-			var epochs = new [] {
-				new Epoch(1010, 1, Guid.NewGuid()),
-				new Epoch(999, 2, Guid.NewGuid())
-			};
-
-			AddSubscription(_replicaId, true, epochs, 1010, out _replicaManager);
-		}
-
-		[Test]
-		public void subscription_is_sent_a_replica_subscribed_message_from_start() {
-			var message = GetTcpSendsFor(_replicaManager).Select(x => x.Message).First();
-
-			Assert.IsInstanceOf<ReplicationMessage.ReplicaSubscribed>(message);
-			var subscribed = (ReplicationMessage.ReplicaSubscribed)message;
-			Assert.Zero(subscribed.SubscriptionPosition);
-			Assert.AreEqual(_replicaId, subscribed.SubscriptionId);
-			Assert.AreEqual(LeaderId, subscribed.LeaderId);
-		}
-	}
-
-	public class when_replica_with_same_epochs_subscribes_from_last_epoch_position<TLogFormat, TStreamId>
-		: with_replication_service_and_epoch_manager<TLogFormat, TStreamId> {
-		private readonly Guid _replicaId = Guid.NewGuid();
-		private TcpConnectionManager _replicaManager;
-		private EpochRecord _lastEpoch;
-
-		public override void When() {
-			EpochManager.WriteNewEpoch(0);
-			Writer.Write(CreateLogRecord(0), out _);
-			Writer.Write(CreateLogRecord(1), out _);
-			Writer.Write(CreateLogRecord(2), out _);
-			Writer.Write(CreateLogRecord(3), out _);
-			Writer.Write(CreateLogRecord(4), out _);
-			EpochManager.WriteNewEpoch(1);
-
-			_lastEpoch = EpochManager.GetLastEpoch();
-			var epochs = EpochManager.GetLastEpochs(10)
-				.Select(e => new Epoch(e.EpochPosition, e.EpochNumber, e.EpochId)).ToArray();
-
-			AddSubscription(_replicaId, true, epochs, _lastEpoch.EpochPosition, out _replicaManager);
-		}
-
-		[Test]
-		public void subscription_is_sent_a_replica_subscribed_message_from_last_epoch_position() {
-			var message = GetTcpSendsFor(_replicaManager).Select(x => x.Message).First();
-
-			Assert.IsInstanceOf<ReplicationMessage.ReplicaSubscribed>(message);
-			var subscribed = (ReplicationMessage.ReplicaSubscribed)message;
-			Assert.AreEqual(_lastEpoch.EpochPosition, subscribed.SubscriptionPosition);
-			Assert.AreEqual(_replicaId, subscribed.SubscriptionId);
-			Assert.AreEqual(LeaderId, subscribed.LeaderId);
-		}
-	}
-
-	public class when_replica_with_same_epochs_subscribes_from_position_less_than_last_epoch_position<TLogFormat, TStreamId>
-		: with_replication_service_and_epoch_manager<TLogFormat, TStreamId> {
-		private readonly Guid _replicaId = Guid.NewGuid();
-		private TcpConnectionManager _replicaManager;
-		private EpochRecord _lastEpoch;
-		private long _subscribedPosition;
-
-		public override void When() {
-			EpochManager.WriteNewEpoch(0);
-			Writer.Write(CreateLogRecord(0), out _);
-			Writer.Write(CreateLogRecord(1), out _);
-			Writer.Write(CreateLogRecord(2), out _);
-			Writer.Write(CreateLogRecord(3), out _);
-			Writer.Write(CreateLogRecord(4), out _subscribedPosition);
-			EpochManager.WriteNewEpoch(1);
-
-			_lastEpoch = EpochManager.GetLastEpoch();
-			var epochs = EpochManager.GetLastEpochs(10)
-				.Select(e => new Epoch(e.EpochPosition, e.EpochNumber, e.EpochId)).ToArray();
-
-			AddSubscription(_replicaId, true, epochs, _subscribedPosition, out _replicaManager);
-		}
-
-		[Test]
-		public void subscription_is_sent_a_replica_subscribed_message_from_requested_position() {
-			var message = GetTcpSendsFor(_replicaManager).Select(x => x.Message).First();
-
-			Assert.IsInstanceOf<ReplicationMessage.ReplicaSubscribed>(message);
-			var subscribed = (ReplicationMessage.ReplicaSubscribed)message;
-			Assert.AreEqual(_subscribedPosition, subscribed.SubscriptionPosition);
-			Assert.AreEqual(_replicaId, subscribed.SubscriptionId);
-			Assert.AreEqual(LeaderId, subscribed.LeaderId);
-		}
-	}
-
-	public class when_replica_with_additional_epochs_subscribes_to_position_past_leaders_last_epoch<TLogFormat, TStreamId>
-		: with_replication_service_and_epoch_manager<TLogFormat, TStreamId> {
-		private readonly Guid _replicaId = Guid.NewGuid();
-		private TcpConnectionManager _replicaManager;
-		private List<Epoch> _replicaEpochs;
-
-		public override void When() {
-			EpochManager.WriteNewEpoch(0);
-			Writer.Write(CreateLogRecord(0), out _);
-			Writer.Write(CreateLogRecord(1), out _);
-			Writer.Write(CreateLogRecord(2), out _);
-			Writer.Write(CreateLogRecord(3), out _);
-			Writer.Write(CreateLogRecord(4), out _);
-			EpochManager.WriteNewEpoch(1);
-			Writer.Write(CreateLogRecord(5), out _);
-			Writer.Write(CreateLogRecord(6), out _);
-			Writer.Write(CreateLogRecord(7), out var lastWritePosition);
-			Writer.Flush();
-
-			_replicaEpochs = new List<Epoch> {
-				new Epoch(lastWritePosition + 2000, 4, Guid.NewGuid()),
-				new Epoch(lastWritePosition + 1000, 3, Guid.NewGuid()),
-				new Epoch(lastWritePosition, 2, Guid.NewGuid()),
-			};
-			_replicaEpochs.AddRange(EpochManager.GetLastEpochs(10)
-				.Select(e => new Epoch(e.EpochPosition, e.EpochNumber, e.EpochId)).ToList());
-
-			AddSubscription(_replicaId, true, _replicaEpochs.ToArray(), lastWritePosition + 2000, out _replicaManager);
-		}
-
-		[Test]
-		public void subscription_is_sent_replica_subscribed_message_for_epoch_after_common_epoch() {
-			var message = GetTcpSendsFor(_replicaManager).Select(x => x.Message).First();
-
-			Assert.IsInstanceOf<ReplicationMessage.ReplicaSubscribed>(message);
-			var subscribed = (ReplicationMessage.ReplicaSubscribed)message;
-			Assert.AreEqual(_replicaEpochs[2].EpochPosition, subscribed.SubscriptionPosition);
-			Assert.AreEqual(_replicaId, subscribed.SubscriptionId);
-			Assert.AreEqual(LeaderId, subscribed.LeaderId);
-		}
-	}
-
-	public class when_replica_subscribes_with_epoch_that_doesnt_exist_on_leader_but_is_before_leaders_last_epoch<TLogFormat, TStreamId>
-		: with_replication_service_and_epoch_manager<TLogFormat, TStreamId> {
-		private readonly Guid _replicaId = Guid.NewGuid();
-		private TcpConnectionManager _replicaManager;
-		private List<Epoch> _replicaEpochs;
-
-		public override void When() {
-			EpochManager.WriteNewEpoch(0);
-			Writer.Write(CreateLogRecord(0), out _);
-			Writer.Write(CreateLogRecord(1), out _);
-			Writer.Write(CreateLogRecord(2), out var otherEpochLogPosition);
-			Writer.Write(CreateLogRecord(3), out _);
-			Writer.Write(CreateLogRecord(4), out _);
-			EpochManager.WriteNewEpoch(2);
-
-			var firstEpoch = EpochManager.GetLastEpochs(10).First(e => e.EpochNumber == 0);
-			_replicaEpochs = new List<Epoch> {
-				new Epoch(otherEpochLogPosition, 1, Guid.NewGuid()),
-				new Epoch(firstEpoch.EpochPosition, firstEpoch.EpochNumber, firstEpoch.EpochId)
-			};
-
-			AddSubscription(_replicaId, true, _replicaEpochs.ToArray(), _replicaEpochs[1].EpochPosition, out _replicaManager);
-		}
-
-		[Test]
-		public void subscription_is_sent_replica_subscribed_message_for_epoch_after_common_epoch() {
-			var message = GetTcpSendsFor(_replicaManager).Select(x => x.Message).First();
-
-			Assert.IsInstanceOf<ReplicationMessage.ReplicaSubscribed>(message);
-			var subscribed = (ReplicationMessage.ReplicaSubscribed)message;
-			Assert.AreEqual(_replicaEpochs[0].EpochPosition, subscribed.SubscriptionPosition);
-			Assert.AreEqual(_replicaId, subscribed.SubscriptionId);
-			Assert.AreEqual(LeaderId, subscribed.LeaderId);
-		}
-	}
-
-	public class when_replica_subscribes_with_additional_epoch_past_leaders_writer_checkpoint<TLogFormat, TStreamId>
-		: with_replication_service_and_epoch_manager<TLogFormat, TStreamId> {
-		private readonly Guid _replicaId = Guid.NewGuid();
-		private TcpConnectionManager _replicaManager;
-		private List<Epoch> _replicaEpochs;
-
-		public override void When() {
-			EpochManager.WriteNewEpoch(0);
-			Writer.Write(CreateLogRecord(0), out _);
-			Writer.Write(CreateLogRecord(1), out _);
-			Writer.Write(CreateLogRecord(2), out _);
-			Writer.Write(CreateLogRecord(3), out _);
-			Writer.Write(CreateLogRecord(4), out _);
-			EpochManager.WriteNewEpoch(1);
-
-			var subscribePosition = Writer.Position + 1000;
-			_replicaEpochs = new List<Epoch> {
-				new Epoch(subscribePosition, 2, Guid.NewGuid()),
-			};
-			_replicaEpochs.AddRange(EpochManager.GetLastEpochs(10)
-				.Select(e => new Epoch(e.EpochPosition, e.EpochNumber, e.EpochId)).ToList());
-
-			AddSubscription(_replicaId, true, _replicaEpochs.ToArray(), subscribePosition, out _replicaManager);
-		}
-
-		[Test]
-		public void subscription_is_sent_replica_subscribed_message_for_leaders_writer_checkpoint() {
-			var message = GetTcpSendsFor(_replicaManager).Select(x => x.Message).First();
-
-			Assert.IsInstanceOf<ReplicationMessage.ReplicaSubscribed>(message);
-			var subscribed = (ReplicationMessage.ReplicaSubscribed)message;
-			Assert.AreEqual(Writer.Position, subscribed.SubscriptionPosition);
-			Assert.AreEqual(_replicaId, subscribed.SubscriptionId);
-			Assert.AreEqual(LeaderId, subscribed.LeaderId);
-		}
-	}
-
-	public class when_replica_subscribes_with_additional_epoch_and_leader_has_epoch_after_common_epoch<TLogFormat, TStreamId>
-		: with_replication_service_and_epoch_manager<TLogFormat, TStreamId> {
-		private readonly Guid _replicaId = Guid.NewGuid();
-		private TcpConnectionManager _replicaManager;
-		private List<Epoch> _replicaEpochs;
-
-		public override void When() {
-			EpochManager.WriteNewEpoch(0);
-			Writer.Write(CreateLogRecord(0), out _);
-			Writer.Write(CreateLogRecord(1), out _);
-			Writer.Write(CreateLogRecord(2), out _);
-			EpochManager.WriteNewEpoch(1);
-			Writer.Write(CreateLogRecord(3), out _);
-			Writer.Write(CreateLogRecord(4), out _);
-			EpochManager.WriteNewEpoch(4);
-
-			var subscribePosition = Writer.Position + 1000;
-			_replicaEpochs = new List<Epoch> {
-				new Epoch(subscribePosition, 2, Guid.NewGuid()),
-			};
-			_replicaEpochs.AddRange(EpochManager.GetLastEpochs(10)
-				.Where(e => e.EpochNumber < 4)
-				.Select(e => new Epoch(e.EpochPosition, e.EpochNumber, e.EpochId)).ToList());
-
-			AddSubscription(_replicaId, true, _replicaEpochs.ToArray(), subscribePosition, out _replicaManager);
-		}
-
-		[Test]
-		public void subscription_is_sent_replica_subscribed_message_for_leaders_epoch_after_common_epoch() {
-			var message = GetTcpSendsFor(_replicaManager).Select(x => x.Message).First();
-
-			Assert.IsInstanceOf<ReplicationMessage.ReplicaSubscribed>(message);
-			var subscribed = (ReplicationMessage.ReplicaSubscribed)message;
-			Assert.AreEqual(EpochManager.GetLastEpoch().EpochPosition, subscribed.SubscriptionPosition);
-			Assert.AreEqual(_replicaId, subscribed.SubscriptionId);
-			Assert.AreEqual(LeaderId, subscribed.LeaderId);
-		}
-	}
-
-	public class when_replica_subscribes_with_uncached_epoch<TLogFormat, TStreamId>
-		: with_replication_service_and_epoch_manager<TLogFormat, TStreamId> {
-		private readonly Guid _replicaId = Guid.NewGuid();
-		private TcpConnectionManager _replicaManager;
-		private List<Epoch> _replicaEpochs;
-		public override void When() {
-			EpochManager.WriteNewEpoch(0);
-			Writer.Write(CreateLogRecord(0), out _);
-			EpochManager.WriteNewEpoch(1);
-
-			// The EpochManager for these tests only caches 5 epochs
-			_replicaEpochs = EpochManager.GetLastEpochs(2)
-				.Select(e => new Epoch(e.EpochPosition, e.EpochNumber, e.EpochId)).ToList();
-
-			Writer.Write(CreateLogRecord(1), out _);
-			EpochManager.WriteNewEpoch(2);
-			Writer.Write(CreateLogRecord(2), out _);
-			EpochManager.WriteNewEpoch(3);
-			Writer.Write(CreateLogRecord(3), out _);
-			EpochManager.WriteNewEpoch(4);
-			Writer.Write(CreateLogRecord(4), out _);
-			EpochManager.WriteNewEpoch(5);
-			Writer.Write(CreateLogRecord(5), out _);
-			EpochManager.WriteNewEpoch(6);
-
-			AddSubscription(_replicaId, true, _replicaEpochs.ToArray(), _replicaEpochs[0].EpochPosition, out _replicaManager);
-		}
-
-		[Test]
-		public void subscription_is_sent_a_replica_subscribed_message_common_epoch() {
-			var message = GetTcpSendsFor(_replicaManager).Select(x => x.Message).First();
-
-			Assert.IsInstanceOf<ReplicationMessage.ReplicaSubscribed>(message);
-			var subscribed = (ReplicationMessage.ReplicaSubscribed)message;
-			Assert.AreEqual(_replicaEpochs[0].EpochPosition, subscribed.SubscriptionPosition);
-			Assert.AreEqual(_replicaId, subscribed.SubscriptionId);
-			Assert.AreEqual(LeaderId, subscribed.LeaderId);
-		}
-	}
-
-	public class when_replica_subscribes_with_uncached_epoch_that_does_not_exist_on_leader<TLogFormat, TStreamId>
-		: with_replication_service_and_epoch_manager<TLogFormat, TStreamId> {
-		private readonly Guid _replicaId = Guid.NewGuid();
-		private TcpConnectionManager _replicaManager;
-		private List<Epoch> _replicaEpochs;
-		private EpochRecord[] _uncachedLeaderEpochs;
-		public override void When() {
-			// The EpochManager for these tests only caches 5 epochs
-			// Epochs 2 and 3 don't exist
-			EpochManager.WriteNewEpoch(0);
-			Writer.Write(CreateLogRecord(0), out _);
-			EpochManager.WriteNewEpoch(1);
-			Writer.Write(CreateLogRecord(1), out _);
-
-			_uncachedLeaderEpochs = EpochManager.GetLastEpochs(2);
-
-			EpochManager.WriteNewEpoch(4);
-			Writer.Write(CreateLogRecord(2), out _);
-			EpochManager.WriteNewEpoch(5);
-			Writer.Write(CreateLogRecord(3), out _);
-			EpochManager.WriteNewEpoch(6);
-			Writer.Write(CreateLogRecord(4), out _);
-			EpochManager.WriteNewEpoch(7);
-			Writer.Write(CreateLogRecord(5), out _);
-			EpochManager.WriteNewEpoch(8);
-
-			_replicaEpochs = new List<Epoch> {
-				new Epoch(_uncachedLeaderEpochs[0].EpochPosition + 8000, 3, Guid.NewGuid()),
-				new Epoch(_uncachedLeaderEpochs[0].EpochPosition + 4000, 2, Guid.NewGuid()),
-				new Epoch(_uncachedLeaderEpochs[0].EpochPosition, _uncachedLeaderEpochs[0].EpochNumber, _uncachedLeaderEpochs[0].EpochId),
-				new Epoch(_uncachedLeaderEpochs[1].EpochPosition, _uncachedLeaderEpochs[1].EpochNumber, _uncachedLeaderEpochs[1].EpochId)
-			};
-
-			AddSubscription(_replicaId, true, _replicaEpochs.ToArray(), _replicaEpochs[0].EpochPosition, out _replicaManager);
-		}
-
-		[Test]
-		public void subscription_is_sent_a_replica_subscribed_message_to_epoch_position_after_common_epoch() {
-			var message = GetTcpSendsFor(_replicaManager).Select(x => x.Message).First();
-
-			Assert.IsInstanceOf<ReplicationMessage.ReplicaSubscribed>(message);
-			var subscribed = (ReplicationMessage.ReplicaSubscribed)message;
-			Assert.AreEqual(EpochManager.GetLastEpochs(5).First(x => x.EpochNumber == 4).EpochPosition, subscribed.SubscriptionPosition);
-			Assert.AreEqual(_replicaId, subscribed.SubscriptionId);
-			Assert.AreEqual(LeaderId, subscribed.LeaderId);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/LeaderReplication/when_replication_service_has_replica_disconnected.cs b/src/EventStore.Core.Tests/Services/Replication/LeaderReplication/when_replication_service_has_replica_disconnected.cs
deleted file mode 100644
index 56647544e6f..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/LeaderReplication/when_replication_service_has_replica_disconnected.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.LeaderReplication {
-	[TestFixture]
-	public class when_replication_service_has_replica_disconnected : with_replication_service {
-		
-		public override void When() {
-			ReplicaManager1.Stop();
-			AssertEx.IsOrBecomesTrue(() => ReplicaManager1.IsClosed);
-
-			//trigger main processing loop
-			var writePos = DbConfig.WriterCheckpoint.Read();
-			DbConfig.WriterCheckpoint.Write(writePos + 100);
-			DbConfig.WriterCheckpoint.Flush();
-		}
-		
-		[Test]
-		public void vnode_disconnected_should_be_published() {
-			AssertEx.IsOrBecomesTrue(() => ReplicaLostMessages.Count == 1, msg: "ReplicaLost msg not received");
-			Assert.True(ReplicaLostMessages.TryDequeue(out var lost));
-
-			Assert.AreEqual(ReplicaId, lost.SubscriptionId);
-		}
-
-		[Test]
-		public void post_disconnect_replica_Log_written_to_should_not_be_published() {
-			AssertEx.IsOrBecomesTrue(() => ReplicaLostMessages.Count == 1, msg: "ReplicaLost msg not received");
-			var replicationLogPosition = DbConfig.WriterCheckpoint.Read() + 200;
-			Service.Handle(new ReplicationMessage.ReplicaLogPositionAck(ReplicaId, replicationLogPosition, replicationLogPosition));
-			
-			Assert.True(ReplicaWriteAcks.Count == 0, $"Got unexpected ReplicaLogAck Message");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/LeaderReplication/when_replication_service_recieves_leader_log_commited_to.cs b/src/EventStore.Core.Tests/Services/Replication/LeaderReplication/when_replication_service_recieves_leader_log_commited_to.cs
deleted file mode 100644
index 5d180e8b099..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/LeaderReplication/when_replication_service_recieves_leader_log_commited_to.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Linq;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.LeaderReplication {
-	[TestFixture]
-	public class when_replication_service_recieves_leader_log_commited_to : with_replication_service {
-		private long _logPosition;
-		
-		public override void When() {			
-			_logPosition = 4000;
-			Service.Handle(new ReplicationTrackingMessage.ReplicatedTo(_logPosition));
-		}
-
-		[Test]
-		public void replicated_to_should_be_sent_to_subscriptions() {
-			AssertEx.IsOrBecomesTrue(() => TcpSends.Count > 4, msg:"TcpSend msg not recieved");
-			var sends = TcpSends.Where(tcpSend => tcpSend.Message is ReplicationTrackingMessage.ReplicatedTo).ToList();
-			Assert.AreEqual(4 * 2, sends.Count); //one ReplicatedTo message in sent when the subscription is added and the second one in When()
-			Assert.AreEqual(2, sends.Count(msg => msg.ConnectionManager.ConnectionId == ReplicaSubscriptionId));
-			Assert.AreEqual(2, sends.Count(msg => msg.ConnectionManager.ConnectionId == ReplicaSubscriptionId2));
-			Assert.AreEqual(2, sends.Count(msg => msg.ConnectionManager.ConnectionId == ReadOnlyReplicaSubscriptionId));
-			Assert.AreEqual(2, sends.Count(msg => msg.ConnectionManager.ConnectionId == ReplicaSubscriptionIdV0));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/LeaderReplication/when_replication_service_recieves_replica_log_position_ack.cs b/src/EventStore.Core.Tests/Services/Replication/LeaderReplication/when_replication_service_recieves_replica_log_position_ack.cs
deleted file mode 100644
index 771898a62ab..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/LeaderReplication/when_replication_service_recieves_replica_log_position_ack.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.LeaderReplication {
-	[TestFixture]
-	public class when_replication_service_receives_replica_log_position_ack_subscription_v0 : with_replication_service {
-		private long _replicationLogPosition;
-		private long _writerLogPosition;
-
-		public override void When() {
-			_replicationLogPosition = 4000;
-			_writerLogPosition = 3000;
-			Service.Handle(new ReplicationMessage.ReplicaLogPositionAck(ReplicaIdV0, _replicationLogPosition, _writerLogPosition));
-		}
-
-		[Test]
-		public void replica_Log_written_to_should_be_published() {
-			AssertEx.IsOrBecomesTrue(() => ReplicaWriteAcks.Count == 1, msg: "ReplicaLogWrittenTo msg not received");
-			Assert.True(ReplicaWriteAcks.TryDequeue(out var commit));
-
-			Assert.AreEqual(ReplicaIdV0, commit.SubscriptionId);
-			Assert.AreEqual(_replicationLogPosition, commit.ReplicationLogPosition);
-		}
-	}
-
-	[TestFixture]
-	public class when_replication_service_receives_replica_log_position_ack_subscription_v1 : with_replication_service {
-		private long _replicationLogPosition;
-		private long _writerLogPosition;
-
-		public override void When() {
-			_replicationLogPosition = 4000;
-			_writerLogPosition = 3000;
-			Service.Handle(new ReplicationMessage.ReplicaLogPositionAck(ReplicaId, _replicationLogPosition, _writerLogPosition));
-		}
-
-		[Test]
-		public void replica_Log_written_to_should_be_published() {
-			AssertEx.IsOrBecomesTrue(() => ReplicaWriteAcks.Count == 1, msg: "ReplicaLogWrittenTo msg not received");
-			Assert.True(ReplicaWriteAcks.TryDequeue(out var commit));
-
-			Assert.AreEqual(ReplicaId, commit.SubscriptionId);
-			Assert.AreEqual(_writerLogPosition, commit.ReplicationLogPosition);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/LeaderReplication/with_replication_service.cs b/src/EventStore.Core.Tests/Services/Replication/LeaderReplication/with_replication_service.cs
deleted file mode 100644
index 54a9ae010b0..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/LeaderReplication/with_replication_service.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Threading.Tasks;
-using EventStore.Core.Authentication.InternalAuthentication;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Core.Services.Replication;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.Core.Tests.Authentication;
-using EventStore.Core.Tests.Authorization;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.Tests.Services.ElectionsService;
-using EventStore.Core.Tests.Services.Transport.Tcp;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.Util;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.LeaderReplication {
-	public abstract class with_replication_service : SpecificationWithDirectoryPerTestFixture {
-		protected string EventStreamId = "test_stream";
-		protected int ClusterSize = 3;
-		protected SynchronousScheduler Publisher = new("publisher");
-		protected SynchronousScheduler TcpSendPublisher = new("tcpSend");
-		protected LeaderReplicationService Service;
-		protected ConcurrentQueue<ReplicationTrackingMessage.ReplicaWriteAck> ReplicaWriteAcks = new ConcurrentQueue<ReplicationTrackingMessage.ReplicaWriteAck>();
-		protected ConcurrentQueue<SystemMessage.VNodeConnectionLost> ReplicaLostMessages = new ConcurrentQueue<SystemMessage.VNodeConnectionLost>();
-		protected ConcurrentQueue<TcpMessage.TcpSend> TcpSends = new ConcurrentQueue<TcpMessage.TcpSend>();
-		private int _connectionPendingSendBytesThreshold = 10 * 1024;
-		private int _connectionQueueSizeThreshold = 50000;
-		protected Guid LeaderId = Guid.NewGuid();
-		protected Guid ReplicaId = Guid.NewGuid();
-		protected Guid ReplicaId2 = Guid.NewGuid();
-		protected Guid ReadOnlyReplicaId = Guid.NewGuid();
-		protected Guid ReplicaIdV0 = Guid.NewGuid();
-
-		protected Guid ReplicaSubscriptionId;
-		protected Guid ReplicaSubscriptionId2;
-		protected Guid ReadOnlyReplicaSubscriptionId;
-		protected Guid ReplicaSubscriptionIdV0;
-
-		protected TcpConnectionManager ReplicaManager1;
-		protected TcpConnectionManager ReplicaManager2;
-		protected TcpConnectionManager ReadOnlyReplicaManager;
-		protected TcpConnectionManager ReplicaManagerV0;
-
-		protected TFChunkDbConfig DbConfig;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			Publisher.Subscribe(new AdHocHandler<ReplicationTrackingMessage.ReplicaWriteAck>(msg => ReplicaWriteAcks.Enqueue(msg)));
-			Publisher.Subscribe(new AdHocHandler<SystemMessage.VNodeConnectionLost>(msg => ReplicaLostMessages.Enqueue(msg)));
-			TcpSendPublisher.Subscribe(new AdHocHandler<TcpMessage.TcpSend>(msg => TcpSends.Enqueue(msg)));
-
-			DbConfig = CreateDbConfig();
-			var db = new TFChunkDb(DbConfig);
-			db.Open();
-			Service = new LeaderReplicationService(
-				publisher: Publisher,
-				instanceId: LeaderId,
-				db: db,
-				tcpSendPublisher: TcpSendPublisher,
-				epochManager: new FakeEpochManager(),
-				clusterSize: ClusterSize,
-				unsafeAllowSurplusNodes: false,
-				queueStatsManager: new QueueStatsManager());
-
-			Service.Handle(new SystemMessage.SystemStart());
-			Service.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
-
-			ReplicaSubscriptionId = AddSubscription(ReplicaId, ReplicationSubscriptionVersions.V_CURRENT, true, out ReplicaManager1);
-			ReplicaSubscriptionId2 = AddSubscription(ReplicaId2, ReplicationSubscriptionVersions.V_CURRENT, true, out ReplicaManager2);
-			ReadOnlyReplicaSubscriptionId = AddSubscription(ReadOnlyReplicaId, ReplicationSubscriptionVersions.V_CURRENT, false, out ReadOnlyReplicaManager);
-			ReplicaSubscriptionIdV0 = AddSubscription(ReplicaIdV0, ReplicationSubscriptionVersions.V0, true, out ReplicaManagerV0);
-
-			When();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			await base.TestFixtureTearDown();
-			Service.Handle(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), true, true));
-		}
-
-		private Guid AddSubscription(Guid replicaId, int version, bool isPromotable, out TcpConnectionManager manager) {
-			var tcpConn = new DummyTcpConnection() { ConnectionId = replicaId };
-
-			manager = new TcpConnectionManager(
-				"Test Subscription Connection manager", TcpServiceType.External, new ClientTcpDispatcher(2000),
-				new SynchronousScheduler(), tcpConn, new SynchronousScheduler(),
-				new InternalAuthenticationProvider(InMemoryBus.CreateTest(),
-					new Core.Helpers.IODispatcher(new SynchronousScheduler(), new NoopEnvelope()),
-					new StubPasswordHashAlgorithm(), 1, false, DefaultData.DefaultUserOptions),
-				new AuthorizationGateway(new TestAuthorizationProvider()),
-				TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10), (man, err) => { },
-				_connectionPendingSendBytesThreshold, _connectionQueueSizeThreshold);
-			var subRequest = new ReplicationMessage.ReplicaSubscriptionRequest(
-				Guid.NewGuid(),
-				new NoopEnvelope(),
-				manager,
-				version,
-				0,
-				Guid.NewGuid(),
-				new Epoch[0],
-				PortsHelper.GetLoopback(),
-				LeaderId,
-				replicaId,
-				isPromotable);
-			Service.Handle(subRequest);
-			return tcpConn.ConnectionId;
-		}
-
-
-		public abstract void When();
-		protected void BecomeLeader() {
-			Service.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
-		}
-
-		protected void BecomeUnknown() {
-			Service.Handle(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
-		}
-
-		private TFChunkDbConfig CreateDbConfig() {
-			ICheckpoint writerChk = new InMemoryCheckpoint(Checkpoint.Writer);
-			ICheckpoint chaserChk = new InMemoryCheckpoint(Checkpoint.Chaser);
-			ICheckpoint epochChk = new InMemoryCheckpoint(Checkpoint.Epoch, initValue: -1);
-			ICheckpoint proposalChk = new InMemoryCheckpoint(Checkpoint.Proposal, initValue: -1);
-			ICheckpoint truncateChk = new InMemoryCheckpoint(Checkpoint.Truncate, initValue: -1);
-			ICheckpoint replicationCheckpoint = new InMemoryCheckpoint(-1);
-			ICheckpoint indexCheckpoint = new InMemoryCheckpoint(-1);
-			ICheckpoint streamExistenceFilterCheckpoint = new InMemoryCheckpoint(-1);
-			var nodeConfig = new TFChunkDbConfig(
-				PathName,
-				new VersionedPatternFileNamingStrategy(PathName, "chunk-"),
-				1000,
-				10000,
-				writerChk,
-				chaserChk,
-				epochChk,
-				proposalChk,
-				truncateChk,
-				replicationCheckpoint,
-				indexCheckpoint,
-				streamExistenceFilterCheckpoint,
-				true);
-			return nodeConfig;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/LeaderReplication/with_replication_service_and_epoch_manager.cs b/src/EventStore.Core.Tests/Services/Replication/LeaderReplication/with_replication_service_and_epoch_manager.cs
deleted file mode 100644
index 16bf4efe383..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/LeaderReplication/with_replication_service_and_epoch_manager.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.Core.Authentication.InternalAuthentication;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Core.Services.Replication;
-using EventStore.Core.Services.Storage.EpochManager;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.Core.Tests.Authentication;
-using EventStore.Core.Tests.Authorization;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.Tests.Services.Transport.Tcp;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.LeaderReplication {
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public abstract class with_replication_service_and_epoch_manager<TLogFormat, TStreamId>  : SpecificationWithDirectoryPerTestFixture {
-		private const int _connectionPendingSendBytesThreshold = 10 * 1024;
-		private const int _connectionQueueSizeThreshold = 50000;
-
-		protected int ClusterSize = 3;
-		protected SynchronousScheduler Publisher = new("publisher");
-		protected SynchronousScheduler TcpSendPublisher = new("tcpSend");
-		protected LeaderReplicationService Service;
-		protected ConcurrentQueue<TcpMessage.TcpSend> TcpSends = new ConcurrentQueue<TcpMessage.TcpSend>();
-		protected LogFormatAbstractor<TStreamId> _logFormat;
-		protected Guid LeaderId = Guid.NewGuid();
-
-		protected TFChunkDbConfig DbConfig;
-		protected EpochManager<TStreamId> EpochManager;
-		protected TFChunkDb Db;
-		protected TFChunkWriter Writer;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var indexDirectory = GetFilePathFor("index");
-			_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
-				IndexDirectory = indexDirectory,
-			});
-
-			TcpSendPublisher.Subscribe(new AdHocHandler<TcpMessage.TcpSend>(msg => TcpSends.Enqueue(msg)));
-
-			DbConfig = CreateDbConfig();
-			Db = new TFChunkDb(DbConfig);
-			Db.Open();
-
-			Writer = new TFChunkWriter(Db);
-			Writer.Open();
-
-			EpochManager = new EpochManager<TStreamId>(
-				Publisher,
-				5,
-				DbConfig.EpochCheckpoint,
-				Writer,
-				1, 1,
-				() => new TFChunkReader(Db, Db.Config.WriterCheckpoint,
-					optimizeReadSideCache: Db.Config.OptimizeReadSideCache),
-				_logFormat.RecordFactory,
-				_logFormat.StreamNameIndex,
-				_logFormat.EventTypeIndex,
-				_logFormat.CreatePartitionManager(
-					reader: new TFChunkReader(Db, Db.Config.WriterCheckpoint),
-					writer: Writer),
-				Guid.NewGuid());
-			Service = new LeaderReplicationService(
-				Publisher,
-				LeaderId,
-				Db,
-				TcpSendPublisher,
-				EpochManager,
-				ClusterSize,
-				false,
-				new QueueStatsManager());
-
-			Service.Handle(new SystemMessage.SystemStart());
-			Service.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
-
-			When();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			_logFormat?.Dispose();
-			await base.TestFixtureTearDown();
-			Service.Handle(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), true, true));
-		}
-
-		public IPrepareLogRecord<TStreamId> CreateLogRecord(long eventNumber, string data = "*************") {
-			var tStreamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventType = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			return LogRecord.Prepare(_logFormat.RecordFactory, Writer.Position, Guid.NewGuid(), Guid.NewGuid(), 0, 0,
-				tStreamId, eventNumber, PrepareFlags.None, eventType, Encoding.UTF8.GetBytes(data),
-				null, DateTime.UtcNow);
-		}
-
-		public Guid AddSubscription(Guid replicaId, bool isPromotable, Epoch[] epochs, long logPosition, out TcpConnectionManager manager) {
-			var tcpConn = new DummyTcpConnection() { ConnectionId = replicaId };
-
-			manager = new TcpConnectionManager(
-				"Test Subscription Connection manager", TcpServiceType.External, new ClientTcpDispatcher(2_000),
-				new SynchronousScheduler(), tcpConn, new SynchronousScheduler(),
-				new InternalAuthenticationProvider(InMemoryBus.CreateTest(),
-					new Core.Helpers.IODispatcher(new SynchronousScheduler(), new NoopEnvelope()),
-					new StubPasswordHashAlgorithm(), 1, false, DefaultData.DefaultUserOptions),
-				new AuthorizationGateway(new TestAuthorizationProvider()),
-				TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10), (man, err) => { },
-				_connectionPendingSendBytesThreshold, _connectionQueueSizeThreshold);
-			var subRequest = new ReplicationMessage.ReplicaSubscriptionRequest(
-				Guid.NewGuid(),
-				new NoopEnvelope(),
-				manager,
-				ReplicationSubscriptionVersions.V_CURRENT,
-				logPosition,
-				Guid.NewGuid(),
-				epochs,
-				PortsHelper.GetLoopback(),
-				LeaderId,
-				replicaId,
-				isPromotable);
-			Service.Handle(subRequest);
-			return tcpConn.ConnectionId;
-		}
-
-		public abstract void When();
-
-		public TcpMessage.TcpSend[] GetTcpSendsFor(TcpConnectionManager connection) {
-			var sentMessages = new List<TcpMessage.TcpSend>();
-			while (TcpSends.TryDequeue(out var msg)) {
-				if (msg.ConnectionManager == connection)
-					sentMessages.Add(msg);
-			}
-
-			return sentMessages.ToArray();
-		}
-
-		private TFChunkDbConfig CreateDbConfig() {
-			ICheckpoint writerChk = new InMemoryCheckpoint(Checkpoint.Writer);
-			ICheckpoint chaserChk = new InMemoryCheckpoint(Checkpoint.Chaser);
-			ICheckpoint epochChk = new InMemoryCheckpoint(Checkpoint.Epoch, initValue: -1);
-			ICheckpoint proposalChk = new InMemoryCheckpoint(Checkpoint.Proposal, initValue: -1);
-			ICheckpoint truncateChk = new InMemoryCheckpoint(Checkpoint.Truncate, initValue: -1);
-			ICheckpoint replicationCheckpoint = new InMemoryCheckpoint(-1);
-			ICheckpoint indexCheckpoint = new InMemoryCheckpoint(-1);
-			ICheckpoint streamExistenceFilterCheckpoint = new InMemoryCheckpoint(-1);
-			var nodeConfig = new TFChunkDbConfig(
-				PathName,
-				new VersionedPatternFileNamingStrategy(PathName, "chunk-"),
-				chunkSize: 1000,
-				maxChunksCacheSize: 10000,
-				writerChk,
-				chaserChk,
-				epochChk,
-				proposalChk,
-				truncateChk,
-				replicationCheckpoint,
-				indexCheckpoint,
-				streamExistenceFilterCheckpoint,
-				inMemDb: true);
-			return nodeConfig;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/LogReplication/LeaderInfo.cs b/src/EventStore.Core.Tests/Services/Replication/LogReplication/LeaderInfo.cs
deleted file mode 100644
index 7c512fd1084..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/LogReplication/LeaderInfo.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using EventStore.Core.Bus;
-using EventStore.Core.Cluster;
-using EventStore.Core.Services.Replication;
-using EventStore.Core.Services.Storage;
-using EventStore.Core.Services.Storage.EpochManager;
-using EventStore.Core.TransactionLog.Chunks;
-
-namespace EventStore.Core.Tests.Services.Replication.LogReplication;
-
-internal record LeaderInfo<TStreamId> {
-	public TFChunkDb Db { get; init; }
-	public IPublisher Publisher { get; init; }
-	public LeaderReplicationService ReplicationService { get; init; }
-	public IEpochManager EpochManager { get; init; }
-	public MemberInfo MemberInfo { get; init; }
-	public StorageWriterService<TStreamId> Writer { get; init; }
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/LogReplication/LogReplicationWithExistingDbFixture.cs b/src/EventStore.Core.Tests/Services/Replication/LogReplication/LogReplicationWithExistingDbFixture.cs
deleted file mode 100644
index f771f2cb51b..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/LogReplication/LogReplicationWithExistingDbFixture.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.Transforms.Identity;
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.Services.Replication.LogReplication;
-
-public abstract class LogReplicationWithExistingDbFixture<TLogFormat, TStreamId> : LogReplicationFixture<TLogFormat, TStreamId> {
-	private readonly Random _random = new();
-	protected LogFormatAbstractor<TStreamId> LogFormat;
-	protected const int DataSize = 3333;
-
-	protected override async Task SetUpDbs(TFChunkDb leaderDb, TFChunkDb replicaDb) {
-		await CreateChunks(leaderDb);
-	}
-
-	protected abstract Task CreateChunks(TFChunkDb leaderDb);
-
-	protected static async Task CreateChunk(TFChunkDb db, bool raw, bool complete, int chunkStartNumber, int chunkEndNumber, ILogRecord[] logRecords) {
-		var filename = db.Config.FileNamingStrategy.GetFilenameFor(chunkStartNumber, raw ? 1 : 0);
-
-		if (raw && !complete)
-			throw new InvalidOperationException("A raw chunk must be complete");
-
-		if (!raw && chunkStartNumber != chunkEndNumber)
-			throw new InvalidOperationException(
-				$"{nameof(chunkStartNumber)} should be equal to {nameof(chunkEndNumber)} for non-raw chunks");
-
-		var header = new ChunkHeader(
-			version: TFChunk.CurrentChunkVersion,
-			minCompatibleVersion: TFChunk.CurrentChunkVersion,
-			chunkSize: ChunkSize,
-			chunkStartNumber: chunkStartNumber,
-			chunkEndNumber: chunkEndNumber,
-			isScavenged: raw,
-			chunkId: Guid.NewGuid(),
-			transformType: TransformType.Identity);
-
-		var chunk = TFChunk.CreateWithHeader(
-			filename: filename,
-			header: header,
-			fileSize: TFChunk.GetAlignedSize(db.Config.ChunkSize + ChunkHeader.Size + ChunkFooter.Size),
-			inMem: false,
-			unbuffered: db.Config.Unbuffered,
-			writethrough: db.Config.WriteThrough,
-			reduceFileCachePressure: db.Config.ReduceFileCachePressure,
-			tracker: new TFChunkTracker.NoOp(),
-			transformFactory: new IdentityChunkTransformFactory(),
-			transformHeader: ReadOnlyMemory<byte>.Empty);
-
-		var posMaps = new List<PosMap>();
-
-		for (var i = 0; i < logRecords.Length; i++) {
-			var logRecord = logRecords[i];
-			var logicalPos = chunk.ChunkHeader.GetLocalLogPosition(logRecord.LogPosition);
-			var actualPos = chunk.RawWriterPosition - ChunkHeader.Size;
-			var writeResult = chunk.TryAppend(logRecord);
-
-			if (!writeResult.Success)
-				throw new Exception("Failed to append log record");
-
-			var writerPos = chunk.ChunkHeader.ChunkStartPosition + writeResult.NewPosition;
-
-			// move the (intercepted) writer checkpoint to the expected positions so that they can be compared with the
-			// replica's writer checkpoints during tests
-			if (!raw &&
-			    (logRecord.IsTransactionBoundary() /* complete transaction */
-			     || i == logRecords.Length - 1)) /* incomplete transaction at the end of a chunk - commit for backwards compatibility */
-				db.Config.WriterCheckpoint.Write(writerPos);
-
-			posMaps.Add(new PosMap(logicalPos, actualPos));
-		}
-
-		if (raw)
-			await chunk.CompleteScavenge(posMaps, CancellationToken.None);
-		else if (complete)
-			chunk.Complete();
-		else
-			chunk.Flush();
-
-		if (complete)
-			db.Config.WriterCheckpoint.Write(chunk.ChunkHeader.ChunkEndPosition);
-
-		chunk.Dispose();
-		chunk.WaitForDestroy(0);
-	}
-
-	private ILogRecord CreatePrepare(long logPosition, PrepareFlags flags) {
-		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-		var data = new byte[DataSize];
-		_random.NextBytes(data);
-
-		return LogFormat.RecordFactory.CreatePrepare(
-			logPosition: logPosition,
-			correlationId: Guid.NewGuid(),
-			eventId: Guid.NewGuid(),
-			transactionPosition: 0,
-			transactionOffset: 0,
-			eventStreamId: streamId,
-			expectedVersion: 0,
-			timeStamp: DateTime.UtcNow,
-			flags: flags,
-			eventType: eventTypeId,
-			data: data,
-			metadata: ReadOnlyMemory<byte>.Empty
-		);
-	}
-
-	protected ILogRecord[] GenerateLogRecords(int chunkNumber, int[] transactionSizes, out long writerPos) {
-		var logPosition = chunkNumber * ChunkSize;
-
-		var logRecords = new List<ILogRecord>();
-		foreach (var transactionSize in transactionSizes) {
-			// a negative transaction size represents an incomplete transaction
-			var incomplete = transactionSize < 0;
-			var txSize = Math.Abs(transactionSize);
-
-			for (var i = 0; i < txSize; i++) {
-				var flags = PrepareFlags.Data | PrepareFlags.IsCommitted;
-				if (i == 0) flags |= PrepareFlags.TransactionBegin;
-				if (!incomplete && i == txSize - 1) flags |= PrepareFlags.TransactionEnd;
-				var logRecord = CreatePrepare(logPosition, flags);
-				logPosition += logRecord.GetSizeWithLengthPrefixAndSuffix();
-				logRecords.Add(logRecord);
-			}
-		}
-
-		writerPos = logPosition;
-
-		return logRecords.ToArray();
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/LogReplication/ReplicaInfo.cs b/src/EventStore.Core.Tests/Services/Replication/LogReplication/ReplicaInfo.cs
deleted file mode 100644
index 5343fa9ca68..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/LogReplication/ReplicaInfo.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Core.Bus;
-using EventStore.Core.Services.Replication;
-using EventStore.Core.Services.Storage;
-using EventStore.Core.Services.Storage.EpochManager;
-using EventStore.Core.TransactionLog.Chunks;
-
-namespace EventStore.Core.Tests.Services.Replication.LogReplication;
-
-internal record ReplicaInfo<TStreamId> {
-	public TFChunkDb Db { get; init; }
-	public IPublisher Publisher { get; init; }
-	public ReplicaService ReplicaService { get; init; }
-	public IEpochManager EpochManager { get; init; }
-	public StorageWriterService<TStreamId> Writer { get; init; }
-	public Func<int> GetNumWriterFlushes { get; init; }
-	public ReplicationInterceptor ReplicationInterceptor { get; init; }
-	public AutoResetEvent ConnectionEstablished { get; init; }
-	public Func<long> GetReplicationPosition { get; init; }
-	public Action ResetSubscription { get; init; }
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/LogReplication/ReplicationAck.cs b/src/EventStore.Core.Tests/Services/Replication/LogReplication/ReplicationAck.cs
deleted file mode 100644
index 75d99a348a9..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/LogReplication/ReplicationAck.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.Core.Tests.Services.Replication.LogReplication;
-
-internal record ReplicationAck {
-	public long ReplicationPosition { get; init; }
-	public long WriterPosition { get; init; }
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/LogReplication/Tests/data_chunk_replication_with_existing_db.cs b/src/EventStore.Core.Tests/Services/Replication/LogReplication/Tests/data_chunk_replication_with_existing_db.cs
deleted file mode 100644
index 9eba7fdf814..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/LogReplication/Tests/data_chunk_replication_with_existing_db.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.LogReplication.Tests;
-
-[TestFixture(typeof(LogFormat.V2), typeof(string))]
-[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-public class data_chunk_replication_with_existing_db<TLogFormat, TStreamId> : LogReplicationWithExistingDbFixture<TLogFormat, TStreamId> {
-	private const int NumCheckpoints = 5 + /* chunk 0-0 (non-raw): 3 complete transactions, 1 incomplete transaction
-	                                          at end (checkpointed for backwards compatibility), 1 chunk completion */
-	                                   0   /* chunk 1-1 (non-raw): 0 complete transactions */;
-
-	private const int NumLogicalChunks = 2;
-
-	protected override async Task CreateChunks(TFChunkDb db) {
-		LogFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
-			IndexDirectory = Path.Combine(db.Config.Path, "index")
-		});
-
-		var recs0 = GenerateLogRecords(0, new[] { 1, -3, 2, -1, 3, -5 }, out _);
-		var recs1 = GenerateLogRecords(1, Array.Empty<int>(), out _);
-
-		await CreateChunk(db, raw: false, complete: true,  0, 0, recs0);
-		await CreateChunk(db, raw: false, complete: false, 1, 1, recs1);
-
-		db.Config.WriterCheckpoint.Flush();
-	}
-
-
-	[Test]
-	public async Task can_replicate() {
-		await ConnectReplica();
-		await Replicated();
-
-		VerifyCheckpoints(NumCheckpoints);
-		VerifyDB(NumLogicalChunks);
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/LogReplication/Tests/raw_chunk_replication.cs b/src/EventStore.Core.Tests/Services/Replication/LogReplication/Tests/raw_chunk_replication.cs
deleted file mode 100644
index d60a91d8373..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/LogReplication/Tests/raw_chunk_replication.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.LogReplication.Tests;
-
-[TestFixture(typeof(LogFormat.V2), typeof(string))]
-[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-public class raw_chunk_replication<TLogFormat, TStreamId> : LogReplicationWithExistingDbFixture<TLogFormat, TStreamId> {
-	private const int NumCheckpoints = 1 + /* chunk 0-0 (raw): 1 chunk completion */
-	                                   1 + /* chunk 1-2 (raw): 1 chunk completion */
-	                                   4 + /* chunk 3-3 (non-raw): 3 complete transactions, 1 chunk completion */
-	                                   6 + /* chunk 4-4 (non-raw): 4 complete transactions, 1 incomplete
-	                                          transaction at end (checkpointed for backwards compatibility), 1 chunk completion */
-	                                   1 + /* chunk 5-5 (raw): 1 chunk completion */
-	                                   1 + /* chunk 6-9 (raw): 1 chunk completion */
-	                                   2   /* chunk 10-10 (non-raw): 2 complete transactions */;
-
-	private const int NumLogicalChunks = 11;
-
-	protected override async Task CreateChunks(TFChunkDb db) {
-		LogFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
-			IndexDirectory = Path.Combine(db.Config.Path, "index")
-		});
-
-		var recs0 = GenerateLogRecords(0, new[] { 1, -3, 2, 3 }, out _);
-		var recs1 = GenerateLogRecords(1, new[] { 2, 2, 1, 2, 7, -3 }, out _);
-		var recs3 = GenerateLogRecords(3, new[] { 3, -3, 3, 3 }, out _);
-		var recs4 = GenerateLogRecords(4, new[] { 4, 3, 2, 1, -2 }, out _);
-		var recs5 = GenerateLogRecords(5, new[] { -5 }, out _);
-		var recs6 = GenerateLogRecords(6, new[] { 1, 1, 1, 1, -1 }, out _);
-		var recs10 = GenerateLogRecords(10, new[] { 1, 2 }, out _);
-
-		await CreateChunk(db, raw: true,  complete: true,   0,  0, recs0);
-		await CreateChunk(db, raw: true,  complete: true,   1,  2, recs1);
-		await CreateChunk(db, raw: false, complete: true,   3,  3, recs3);
-		await CreateChunk(db, raw: false, complete: true,   4,  4, recs4);
-		await CreateChunk(db, raw: true,  complete: true,   5,  5, recs5);
-		await CreateChunk(db, raw: true,  complete: true,   6,  9, recs6);
-		await CreateChunk(db, raw: false, complete: false, 10, 10, recs10);
-
-		db.Config.WriterCheckpoint.Flush();
-	}
-
-
-	[Test]
-	public async Task can_replicate() {
-		await ConnectReplica();
-		await Replicated();
-
-		VerifyCheckpoints(NumCheckpoints);
-		VerifyDB(NumLogicalChunks);
-	}
-
-	[Test]
-	public async Task can_replicate_when_interrupted_in_raw_chunk_then_resumed() {
-		await ConnectReplica(pauseReplication: true);
-		await ResumeReplicationUntil(
-			rawChunkStartNumber: 1,
-			rawChunkEndNumber: 2,
-			maxRawPosition: TFConsts.ChunkHeaderSize + DataSize * 3,
-			expectedFlushes: 1);
-
-		VerifyCheckpoints(
-			expectedLeaderCheckpoints: NumCheckpoints,
-			expectedReplicaCheckpoints: 1);
-
-		await ReconnectReplica();
-		await Replicated();
-
-		VerifyCheckpoints(NumCheckpoints);
-		VerifyDB(NumLogicalChunks);
-	}
-
-	[Test]
-	public async Task can_replicate_when_interrupted_at_boundary_of_raw_chunk_with_complete_transactions_then_resumed() {
-		await ConnectReplica(pauseReplication: true);
-		await ResumeReplicationUntil(
-			rawChunkStartNumber: 1,
-			rawChunkEndNumber: 2,
-			maxRawPosition: 0,
-			expectedFlushes: 1);
-
-		VerifyCheckpoints(
-			expectedLeaderCheckpoints: NumCheckpoints,
-			expectedReplicaCheckpoints: 1);
-
-		await ReconnectReplica();
-		await Replicated();
-
-		VerifyCheckpoints(NumCheckpoints);
-		VerifyDB(NumLogicalChunks);
-	}
-
-	[Test]
-	public async Task can_replicate_when_interrupted_at_boundary_of_raw_chunk_with_incomplete_transactions_then_resumed() {
-		await ConnectReplica(pauseReplication: true);
-		await ResumeReplicationUntil(maxLogPosition: 3 * ChunkSize, expectedFlushes: 2);
-
-		VerifyCheckpoints(
-			expectedLeaderCheckpoints: NumCheckpoints,
-			expectedReplicaCheckpoints: 2);
-
-		await ReconnectReplica();
-		await Replicated();
-
-		VerifyCheckpoints(NumCheckpoints);
-		VerifyDB(NumLogicalChunks);
-	}
-
-	[Test]
-	public async Task can_replicate_when_interrupted_at_boundary_of_raw_chunk_with_no_transactions_then_resumed() {
-		await ConnectReplica(pauseReplication: true);
-		await ResumeReplicationUntil(
-			rawChunkStartNumber: 6,
-			rawChunkEndNumber: 9,
-			maxRawPosition: 0,
-			expectedFlushes: 15);
-
-		VerifyCheckpoints(
-			expectedLeaderCheckpoints: NumCheckpoints,
-			expectedReplicaCheckpoints: 13);
-
-		await ReconnectReplica();
-		await Replicated();
-
-		VerifyCheckpoints(NumCheckpoints);
-		VerifyDB(NumLogicalChunks);
-	}
-
-	[Test]
-	public async Task can_replicate_when_interrupted_in_data_chunk_then_resumed() {
-		await ConnectReplica(pauseReplication: true);
-		await ResumeReplicationUntil(maxLogPosition: 3 * ChunkSize + 5 * DataSize, expectedFlushes: 4);
-
-		await ReconnectReplica();
-		await Replicated();
-
-		VerifyCheckpoints(NumCheckpoints);
-		VerifyDB(NumLogicalChunks);
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReadOnlyReplica/connecting_to_read_only_replica.cs b/src/EventStore.Core.Tests/Services/Replication/ReadOnlyReplica/connecting_to_read_only_replica.cs
deleted file mode 100644
index a6da1e3e366..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReadOnlyReplica/connecting_to_read_only_replica.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System.Net;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.Tests.Integration;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Replication.ReadOnlyReplica {
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class connecting_to_read_only_replica<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
-		protected override MiniClusterNode<TLogFormat, TStreamId> CreateNode(int index, Endpoints endpoints, EndPoint[] gossipSeeds,
-			bool wait = true) {
-			var isReadOnly = index == 2;
-			var node = new MiniClusterNode<TLogFormat, TStreamId>(
-				PathName, index, endpoints.InternalTcp,
-				endpoints.ExternalTcp, endpoints.HttpEndPoint, gossipSeeds, inMemDb: false,
-				readOnlyReplica: isReadOnly);
-			if (wait && !isReadOnly)
-				WaitIdle();
-			return node;
-		}
-
-		protected override IEventStoreConnection CreateConnection() {
-			var settings = ConnectionSettings.Create()
-				.DisableServerCertificateValidation()
-				.PerformOnAnyNode();
-			return EventStoreConnection.Create(settings, _nodes[2].ExternalTcpEndPoint);
-		}
-
-		[Test]
-		public async Task append_to_stream_should_fail_with_not_supported_exception() {
-			const string stream = "append_to_stream_should_fail_with_not_supported_exception";
-			await AssertEx.ThrowsAsync<OperationNotSupportedException>(
-				() => _conn.AppendToStreamAsync(stream, ExpectedVersion.Any, TestEvent.NewTestEvent()));
-		}
-
-		[Test]
-		public async Task delete_stream_should_fail_with_not_supported_exception() {
-			const string stream = "delete_stream_should_fail_with_not_supported_exception";
-			await AssertEx.ThrowsAsync<OperationNotSupportedException>(() =>
-				_conn.DeleteStreamAsync(stream, ExpectedVersion.Any));
-		}
-
-		[Test]
-		public async Task start_transaction_should_fail_with_not_supported_exception() {
-			const string stream = "start_transaction_should_fail_with_not_supported_exception";
-			await AssertEx.ThrowsAsync<OperationNotSupportedException>(() =>
-				_conn.StartTransactionAsync(stream, ExpectedVersion.Any));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTestHelper.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTestHelper.cs
deleted file mode 100644
index cb694ac74b2..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTestHelper.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.Tests.Replication.ReadStream {
-	public static class ReplicationTestHelper {
-		private static TimeSpan _timeout = TimeSpan.FromSeconds(20);
-
-		public static ClientMessage.WriteEventsCompleted WriteEvent<TLogFormat, TStreamId>(
-			MiniClusterNode<TLogFormat, TStreamId> node, Event[] events,
-			string streamId) {
-			var resetEvent = new ManualResetEventSlim();
-			ClientMessage.WriteEventsCompleted writeResult = null;
-			node.Node.MainQueue.Publish(new ClientMessage.WriteEvents(Guid.NewGuid(), Guid.NewGuid(),
-				new CallbackEnvelope(msg => {
-					writeResult = (ClientMessage.WriteEventsCompleted)msg;
-					resetEvent.Set();
-				}), false, streamId, -1, events,
-				SystemAccounts.System, new Dictionary<string, string> {
-					["uid"] = SystemUsers.Admin,
-					["pwd"] = SystemUsers.DefaultAdminPassword
-				}));
-			if (!resetEvent.Wait(_timeout)) {
-				Assert.Fail("Timed out waiting for event to be written");
-				return null;
-			}
-
-			return writeResult;
-		}
-
-		public static ClientMessage.ReadAllEventsForwardCompleted ReadAllEventsForward<TLogFormat, TStreamId>(
-			MiniClusterNode<TLogFormat, TStreamId> node,
-			long position) {
-			ClientMessage.ReadAllEventsForwardCompleted readResult = null;
-			var readEvent = new ManualResetEventSlim();
-			var done = false;
-			while (!done) {
-				var read = new ClientMessage.ReadAllEventsForward(Guid.NewGuid(), Guid.NewGuid(), new CallbackEnvelope(
-						msg => {
-							readResult = (ClientMessage.ReadAllEventsForwardCompleted)msg;
-							readEvent.Set();
-						}),
-					0, 0, 100, false, false, null, SystemAccounts.System, replyOnExpired: false);
-				node.Node.MainQueue.Publish(read);
-
-				if (!readEvent.Wait(_timeout)) {
-					Assert.Fail("Timed out waiting for events to be read forward");
-					return null;
-				}
-
-				if (readResult.Result == ReadAllResult.Error) {
-					Assert.Fail("Failed to read forwards. Read result error: {0}", readResult.Error);
-					return null;
-				}
-
-				done = readResult.NextPos.CommitPosition > position;
-				readEvent.Reset();
-			}
-
-			return readResult;
-		}
-
-		public static ClientMessage.ReadAllEventsBackwardCompleted ReadAllEventsBackward<TLogFormat, TStreamId>(
-			MiniClusterNode<TLogFormat, TStreamId> node,
-			long position) {
-			ClientMessage.ReadAllEventsBackwardCompleted readResult = null;
-			var resetEvent = new ManualResetEventSlim();
-			var done = false;
-			while (!done) {
-				resetEvent.Reset();
-				var read = new ClientMessage.ReadAllEventsBackward(Guid.NewGuid(), Guid.NewGuid(), new CallbackEnvelope(
-						msg => {
-							readResult = (ClientMessage.ReadAllEventsBackwardCompleted)msg;
-							resetEvent.Set();
-						}),
-					-1, -1, 100, false, false, null, SystemAccounts.System);
-				node.Node.MainQueue.Publish(read);
-
-				if (!resetEvent.Wait(_timeout)) {
-					Assert.Fail("Timed out waiting for events to be read backward");
-					return null;
-				}
-
-				if (readResult.Result == ReadAllResult.Error) {
-					Assert.Fail("Failed to read backwards. Read result error: {0}", readResult.Error);
-					return null;
-				}
-
-				done = readResult.NextPos.CommitPosition < position;
-			}
-
-			return readResult;
-		}
-
-		public static ClientMessage.ReadStreamEventsForwardCompleted ReadStreamEventsForward<TLogFormat, TStreamId>(
-			MiniClusterNode<TLogFormat, TStreamId> node,
-			string streamId) {
-			ClientMessage.ReadStreamEventsForwardCompleted readResult = null;
-			var resetEvent = new ManualResetEventSlim();
-			var read = new ClientMessage.ReadStreamEventsForward(Guid.NewGuid(), Guid.NewGuid(), new CallbackEnvelope(
-					msg => {
-						readResult = (ClientMessage.ReadStreamEventsForwardCompleted)msg;
-						resetEvent.Set();
-					}), streamId, 0, 10,
-				false, false, null, SystemAccounts.System, replyOnExpired: false);
-			node.Node.MainQueue.Publish(read);
-
-			if (!resetEvent.Wait(_timeout)) {
-				Assert.Fail("Timed out waiting for the stream to be read forward");
-				return null;
-			}
-
-			return readResult;
-		}
-
-		public static ClientMessage.ReadStreamEventsBackwardCompleted ReadStreamEventsBackward<TLogFormat, TStreamId>(
-			MiniClusterNode<TLogFormat, TStreamId> node,
-			string streamId) {
-			ClientMessage.ReadStreamEventsBackwardCompleted readResult = null;
-			var resetEvent = new ManualResetEventSlim();
-			var read = new ClientMessage.ReadStreamEventsBackward(Guid.NewGuid(), Guid.NewGuid(), new CallbackEnvelope(
-					msg => {
-						readResult = (ClientMessage.ReadStreamEventsBackwardCompleted)msg;
-						resetEvent.Set();
-					}), streamId, 9, 10,
-				false, false, null, SystemAccounts.System);
-			node.Node.MainQueue.Publish(read);
-
-			if (!resetEvent.Wait(_timeout)) {
-				Assert.Fail("Timed out waiting for the stream to be read backward");
-				return null;
-			}
-
-			return readResult;
-		}
-
-		public static ClientMessage.ReadEventCompleted ReadEvent<TLogFormat, TStreamId>(
-			MiniClusterNode<TLogFormat, TStreamId> node, string streamId,
-			long eventNumber) {
-			ClientMessage.ReadEventCompleted readResult = null;
-			var resetEvent = new ManualResetEventSlim();
-			var read = new ClientMessage.ReadEvent(Guid.NewGuid(), Guid.NewGuid(), new CallbackEnvelope(msg => {
-					readResult = (ClientMessage.ReadEventCompleted)msg;
-					resetEvent.Set();
-				}), streamId, eventNumber,
-				false, false, SystemAccounts.System);
-			node.Node.MainQueue.Publish(read);
-
-			if (!resetEvent.Wait(_timeout)) {
-				Assert.Fail("Timed out waiting for the event to be read");
-				return null;
-			}
-
-			return readResult;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_does_not_receive_leader_write_notifications.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_does_not_receive_leader_write_notifications.cs
deleted file mode 100644
index 1d9b356a13a..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_does_not_receive_leader_write_notifications.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-	[TestFixture]
-	public class when_3_node_cluster_does_not_receive_leader_write_notifications : with_clustered_replication_tracking_service {
-		private long _logPosition = 4000;
-
-		protected override int ClusterSize => 3;
-
-		public override void When() {
-			BecomeLeader();
-			var replicaId1 = Guid.NewGuid();
-			var replicaId2 = Guid.NewGuid();
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(replicaId1,_logPosition));
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(replicaId2,_logPosition));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-		}
-
-		[Test]
-		public void replicated_to_should_not_be_sent() {
-			Assert.AreEqual(0, ReplicatedTos.Count);			
-		}	
-		[Test]
-		public void replication_checkpoint_should_not_advance() {
-			Assert.AreEqual(0, ReplicationCheckpoint.Read());		
-			Assert.AreEqual(0, ReplicationCheckpoint.ReadNonFlushed());		
-		}	
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_1_write_notification.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_1_write_notification.cs
deleted file mode 100644
index c23afa8418d..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_1_write_notification.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-	[TestFixture]
-	public class when_3_node_cluster_receives_1_write_notification : with_clustered_replication_tracking_service {
-		private long _logPosition = 4000;
-		
-		protected override int ClusterSize => 3;
-
-		public override void When() {
-			BecomeLeader();
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(Guid.NewGuid(), _logPosition));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-		}
-
-		[Test]
-		public void replicated_to_should_not_be_sent() {
-			Assert.AreEqual(0, ReplicatedTos.Count);
-		}
-		[Test]
-		public void replication_checkpoint_should_not_advance() {
-			Assert.AreEqual(0, ReplicationCheckpoint.Read());		
-			Assert.AreEqual(0, ReplicationCheckpoint.ReadNonFlushed());		
-		}	
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_2_write_notifications.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_2_write_notifications.cs
deleted file mode 100644
index ae5a9ad4856..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_2_write_notifications.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-	[TestFixture]
-	public class when_3_node_cluster_receives_2_write_notifications : with_clustered_replication_tracking_service {
-		private long _logPosition = 4000;
-		protected override int ClusterSize => 3;
-
-		public override void When() {
-			BecomeLeader();
-			WriterCheckpoint.Write(_logPosition);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(Guid.NewGuid(), _logPosition));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-		}
-
-		[Test]
-		public void replicated_to_should_be_sent() {
-			AssertEx.IsOrBecomesTrue(() => 1 == ReplicatedTos.Count);
-			Assert.True(ReplicatedTos.TryDequeue(out var msg));
-			Assert.AreEqual(_logPosition, msg.LogPosition);
-		}
-		[Test]
-		public void replication_checkpoint_should_advance() {
-			Assert.AreEqual(_logPosition, ReplicationCheckpoint.Read());
-			Assert.AreEqual(_logPosition, ReplicationCheckpoint.ReadNonFlushed());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_2_write_notifications_out_of_order.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_2_write_notifications_out_of_order.cs
deleted file mode 100644
index cbc5101d4fb..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_2_write_notifications_out_of_order.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-	[TestFixture]
-	public class when_3_node_cluster_receives_2_write_notifications_out_of_order : with_clustered_replication_tracking_service {
-		private long _logPosition = 4000;
-		protected override int ClusterSize => 3;
-
-		public override void When() {
-			BecomeLeader();
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(Guid.NewGuid(), _logPosition));
-			WriterCheckpoint.Write(_logPosition);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-		}
-
-		[Test]
-		public void replicated_to_should_be_sent() {
-			AssertEx.IsOrBecomesTrue(() => 1 == ReplicatedTos.Count);
-			Assert.True(ReplicatedTos.TryDequeue(out var msg));
-			Assert.AreEqual(_logPosition, msg.LogPosition);
-		}
-		[Test]
-		public void replication_checkpoint_should_advance() {
-			Assert.AreEqual(_logPosition, ReplicationCheckpoint.Read());
-			Assert.AreEqual(_logPosition, ReplicationCheckpoint.ReadNonFlushed());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_duplicate_leader_write_notifications.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_duplicate_leader_write_notifications.cs
deleted file mode 100644
index af620cafdb6..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_duplicate_leader_write_notifications.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-	[TestFixture]
-	public class when_3_node_cluster_receives_duplicate_leader_write_notifications : with_clustered_replication_tracking_service {
-		private long _logPosition = 4000;
-
-		protected override int ClusterSize => 3;
-		public override void When() {
-			BecomeLeader();
-			WriterCheckpoint.Write(_logPosition);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());			
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());	
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-		}
-
-		[Test]
-		public void replicated_to_should_not_be_sent() {
-			Assert.AreEqual(0, ReplicatedTos.Count);		
-		}
-		[Test]
-		public void replication_checkpoint_should_not_advance() {
-			Assert.AreEqual(0, ReplicationCheckpoint.Read());		
-			Assert.AreEqual(0, ReplicationCheckpoint.ReadNonFlushed());		
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_duplicate_replica_write_notifications.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_duplicate_replica_write_notifications.cs
deleted file mode 100644
index 446b320f8c9..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_duplicate_replica_write_notifications.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-	[TestFixture]
-	public class when_3_node_cluster_receives_duplicate_replica_write_notifications : with_clustered_replication_tracking_service {
-		private long _logPosition = 4000;
-
-		protected override int ClusterSize => 3;
-
-		public override void When() {
-			BecomeLeader();
-			var replicaId = Guid.NewGuid();
-
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(replicaId, _logPosition));
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(replicaId, _logPosition));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-		}
-
-		[Test]
-		public void replicated_to_should_not_be_sent() {
-			Assert.AreEqual(0, ReplicatedTos.Count);
-		}
-		[Test]
-		public void replication_checkpoint_should_not_advance() {
-			Assert.AreEqual(0, ReplicationCheckpoint.Read());
-			Assert.AreEqual(0, ReplicationCheckpoint.ReadNonFlushed());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_only_leader_write.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_only_leader_write.cs
deleted file mode 100644
index 0d74826ca3c..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_only_leader_write.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-	[TestFixture]
-	public class when_3_node_cluster_receives_only_leader_write : with_clustered_replication_tracking_service {
-		private long _logPosition = 4000;
-
-		protected override int ClusterSize => 3;
-
-		public override void When() {
-			BecomeLeader();
-			WriterCheckpoint.Write(_logPosition);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			AssertEx.IsOrBecomesTrue(()=> Service.IsCurrent());
-		}
-
-		[Test]
-		public void replicated_to_should_not_be_sent() {
-			Assert.AreEqual(0, ReplicatedTos.Count);
-		}
-		[Test]
-		public void replication_checkpoint_should_not_advance() {
-			Assert.AreEqual(0, ReplicationCheckpoint.Read());		
-			Assert.AreEqual(0, ReplicationCheckpoint.ReadNonFlushed());		
-		}	
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_replica_log_overrun.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_replica_log_overrun.cs
deleted file mode 100644
index a1d90bce956..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_replica_log_overrun.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-	[TestFixture]
-	public class when_3_node_cluster_receives_replica_log_overrun : with_clustered_replication_tracking_service {
-		private long _logPosition = 4000;
-		private long _overrunPosition = 5000;
-
-		protected override int ClusterSize => 3;
-
-		public override void When() {
-			BecomeLeader();
-			var replicaId = Guid.NewGuid();
-			WriterCheckpoint.Write(_logPosition);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck( replicaId, _overrunPosition));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-		}
-
-		[Test]
-		public void replicated_to_should_be_sent() {
-			Assert.AreEqual(1, ReplicatedTos.Count);
-			Assert.True(ReplicatedTos.TryDequeue(out var msg));
-			Assert.AreEqual(_logPosition, msg.LogPosition);
-		}	
-		[Test]
-		public void replication_checkpoint_should_advance() {
-			Assert.AreEqual(_logPosition, ReplicationCheckpoint.Read());		
-			Assert.AreEqual(_logPosition, ReplicationCheckpoint.ReadNonFlushed());		
-		}	
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_replica_log_under_run.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_replica_log_under_run.cs
deleted file mode 100644
index a2445fe14d5..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_replica_log_under_run.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-	[TestFixture]
-	public class when_3_node_cluster_receives_replica_log_under_run : with_clustered_replication_tracking_service {
-		private long _logPosition = 4000;
-		private long _underRunPosition = 3000;
-
-		protected override int ClusterSize => 3;
-
-		public override void When() {
-			BecomeLeader();
-			var replicaId = Guid.NewGuid();
-			WriterCheckpoint.Write(_logPosition);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck( replicaId, _underRunPosition));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-		}
-
-		[Test]
-		public void replicated_to_should_be_sent() {
-			Assert.AreEqual(1, ReplicatedTos.Count);
-			Assert.True(ReplicatedTos.TryDequeue(out var msg));
-			Assert.AreEqual(_underRunPosition, msg.LogPosition);
-		}	
-		[Test]
-		public void replication_checkpoint_should_advance() {
-			Assert.AreEqual(_underRunPosition, ReplicationCheckpoint.Read());		
-			Assert.AreEqual(_underRunPosition, ReplicationCheckpoint.ReadNonFlushed());		
-		}	
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_second_ack_from_first_node.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_second_ack_from_first_node.cs
deleted file mode 100644
index 92c352d6fa3..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_second_ack_from_first_node.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-	[TestFixture]
-	public class when_3_node_cluster_receives_second_ack_from_first_node :
-		with_clustered_replication_tracking_service {
-		private readonly long _firstLogPosition = 2000;
-		private readonly long _secondLogPosition = 4000;
-		private readonly Guid _follower1 = Guid.NewGuid();
-		private readonly Guid _follower2 = Guid.NewGuid();
-
-		protected override int ClusterSize => 3;
-
-		public override void When() {
-			BecomeLeader();
-			// All of the nodes have acked the first write
-			WriterCheckpoint.Write(_firstLogPosition);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_follower1, _firstLogPosition));
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_follower2, _firstLogPosition));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-
-			ReplicatedTos.Clear();
-			
-			// Follower 2 has lost connection and does not ack the write
-			WriterCheckpoint.Write(_secondLogPosition);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_follower1, _secondLogPosition));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-		}
-
-		[Test]
-		public void replicated_to_should_be_sent_for_the_second_position() {
-			Assert.True(ReplicatedTos.TryDequeue(out var msg));
-			Assert.AreEqual(_secondLogPosition, msg.LogPosition);
-		}
-
-		[Test]
-		public void replication_checkpoint_should_advance() {
-			Assert.AreEqual(_secondLogPosition, ReplicationCheckpoint.Read());
-			Assert.AreEqual(_secondLogPosition, ReplicationCheckpoint.ReadNonFlushed());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_has_2_lagging_nodes.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_has_2_lagging_nodes.cs
deleted file mode 100644
index 35d171cab1c..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_has_2_lagging_nodes.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-
-	[TestFixture]
-	public class when_5_node_cluster_has_2_lagging_nodes : with_clustered_replication_tracking_service {
-		private readonly long _firstLogPosition = 2000;
-		private readonly long _secondLogPosition = 4000;
-		private Guid[] _followers;
-
-		protected override int ClusterSize => 5;
-		
-		public override void When() {
-			_followers = new [] {Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid()};
-			BecomeLeader();
-			// All of the nodes have acked the first write
-			WriterCheckpoint.Write(_firstLogPosition);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			foreach (var follower in _followers) {
-				Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(follower, _firstLogPosition));
-			}
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-
-			ReplicatedTos.Clear();
-			
-			// Followers 3 and 4 are lagging behind, they ack the previous positions
-			WriterCheckpoint.Write(_secondLogPosition);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_followers[0], _secondLogPosition));
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_followers[1], _secondLogPosition));
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_followers[2], _firstLogPosition));
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_followers[3], _firstLogPosition));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-		}
-
-		[Test]
-		public void replicated_to_should_be_sent_for_the_second_position() {
-			Assert.True(ReplicatedTos.TryDequeue(out var msg));
-			Assert.AreEqual(_secondLogPosition, msg.LogPosition);
-		}
-
-		[Test]
-		public void replication_checkpoint_should_advance() {
-			Assert.AreEqual(_secondLogPosition, ReplicationCheckpoint.Read());
-			Assert.AreEqual(_secondLogPosition, ReplicationCheckpoint.ReadNonFlushed());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_2_write_notifications.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_2_write_notifications.cs
deleted file mode 100644
index 51069b15138..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_2_write_notifications.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-	[TestFixture]
-	public class when_5_node_cluster_receives_2_write_notifications : with_clustered_replication_tracking_service {
-		private long _logPosition = 4000;
-		
-		protected override int ClusterSize => 5;
-
-		public override void When() {
-			BecomeLeader();
-			WriterCheckpoint.Write(_logPosition);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(Guid.NewGuid(), _logPosition));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-		}
-
-		[Test]
-		public void replicated_to_should_not_be_sent() {
-			Assert.AreEqual(0, ReplicatedTos.Count);
-		}
-		[Test]
-		public void replication_checkpoint_should_not_advance() {
-			Assert.AreEqual(0, ReplicationCheckpoint.Read());		
-			Assert.AreEqual(0, ReplicationCheckpoint.ReadNonFlushed());		
-		}	
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_3_write_notifications.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_3_write_notifications.cs
deleted file mode 100644
index 1b41e8ac7e9..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_3_write_notifications.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-	[TestFixture]
-	public class when_5_node_cluster_receives_3_write_notifications : with_clustered_replication_tracking_service {
-		private long _logPosition = 4000;
-		protected override int ClusterSize => 5;
-
-		public override void When() {
-			BecomeLeader();
-			WriterCheckpoint.Write(_logPosition);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			var replicaId = Guid.NewGuid();
-			var replicaId2 = Guid.NewGuid();
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(replicaId, _logPosition));
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(replicaId2, _logPosition));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-		}
-
-		[Test]
-		public void replicated_to_should_be_sent() {
-			Assert.AreEqual(1, ReplicatedTos.Count);
-			Assert.True(ReplicatedTos.TryDequeue(out var msg));
-			Assert.AreEqual(_logPosition, msg.LogPosition);
-		}
-		[Test]
-		public void replication_checkpoint_should_advance() {
-			Assert.AreEqual(_logPosition, ReplicationCheckpoint.Read());		
-			Assert.AreEqual(_logPosition, ReplicationCheckpoint.ReadNonFlushed());		
-		}	
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_duplicate_write_notifications.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_duplicate_write_notifications.cs
deleted file mode 100644
index 6e3ae4c9e60..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_duplicate_write_notifications.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-	[TestFixture]
-	public class when_5_node_cluster_receives_duplicate_write_notifications : with_clustered_replication_tracking_service {
-		private long _logPosition = 4000;
-		
-		protected override int ClusterSize => 5;
-
-		public override void When() {
-			BecomeLeader();
-			WriterCheckpoint.Write(_logPosition);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			var replicaId = Guid.NewGuid();
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(replicaId, _logPosition));
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(replicaId, _logPosition));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-		}
-
-		[Test]
-		public void replicated_to_should_not_be_sent() {
-			Assert.AreEqual(0, ReplicatedTos.Count);
-		}
-		[Test]
-		public void replication_checkpoint_should_not_advance() {
-			Assert.AreEqual(0, ReplicationCheckpoint.Read());		
-			Assert.AreEqual(0, ReplicationCheckpoint.ReadNonFlushed());		
-		}	
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_after_quorum.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_after_quorum.cs
deleted file mode 100644
index 0d38ac62fe9..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_after_quorum.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-	[TestFixture]
-	public class when_5_node_cluster_receives_replica_lost_after_quorum : with_clustered_replication_tracking_service {
-		private readonly long _logPosition = 4000;
-		private readonly Guid _replica1 = Guid.NewGuid();
-		private readonly Guid _replica2 = Guid.NewGuid();
-
-		
-		protected override int ClusterSize => 5;
-
-		public override void When() {
-			BecomeLeader();
-			WriterCheckpoint.Write(_logPosition);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replica1, _logPosition));
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replica2, _logPosition));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-
-			Service.Handle(new SystemMessage.VNodeConnectionLost(
-					PortsHelper.GetLoopback(),
-					Guid.NewGuid(),
-								_replica1));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-		}
-
-		[Test]
-		public void replicated_to_should_be_sent() {
-			AssertEx.IsOrBecomesTrue(() => 1 == ReplicatedTos.Count);
-			Assert.True(ReplicatedTos.TryDequeue(out var msg));
-			Assert.AreEqual(_logPosition, msg.LogPosition);
-		}
-		[Test]
-		public void replication_checkpoint_should_advance() {
-			Assert.AreEqual(_logPosition, ReplicationCheckpoint.Read());
-			Assert.AreEqual(_logPosition, ReplicationCheckpoint.ReadNonFlushed());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_after_quorum_and_continues.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_after_quorum_and_continues.cs
deleted file mode 100644
index 212f2b7cf3d..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_after_quorum_and_continues.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-	[TestFixture]
-	public class when_5_node_cluster_receives_replica_lost_after_quorum_and_continues : with_clustered_replication_tracking_service {
-		private readonly long _logPosition = 4000;
-		private readonly long _logPosition2 = 5000;
-		private readonly Guid _replica1 = Guid.NewGuid();
-		private readonly Guid _replica2 = Guid.NewGuid();
-		private readonly Guid _replica3 = Guid.NewGuid();
-
-		
-		protected override int ClusterSize => 5;
-
-		public override void When() {
-			BecomeLeader();
-			WriterCheckpoint.Write(_logPosition);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replica1, _logPosition));
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replica2, _logPosition));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-
-			Service.Handle(new SystemMessage.VNodeConnectionLost(
-					PortsHelper.GetLoopback(),
-					Guid.NewGuid(),
-								_replica1));
-
-			ReplicatedTos.Clear();
-			WriterCheckpoint.Write(_logPosition2);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replica2, _logPosition2));
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replica3, _logPosition2));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-		}
-
-		[Test]
-		public void replicated_to_should_be_sent() {
-			AssertEx.IsOrBecomesTrue(() => 1 == ReplicatedTos.Count);
-			Assert.True(ReplicatedTos.TryDequeue(out var msg));
-			Assert.AreEqual(_logPosition2, msg.LogPosition);
-		}
-		[Test]
-		public void replication_checkpoint_should_advance() {
-			Assert.AreEqual(_logPosition2, ReplicationCheckpoint.Read());
-			Assert.AreEqual(_logPosition2, ReplicationCheckpoint.ReadNonFlushed());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_and_it_rejoins.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_and_it_rejoins.cs
deleted file mode 100644
index 91191e949ae..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_and_it_rejoins.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-	[TestFixture]
-	public class when_5_node_cluster_receives_replica_lost_and_it_rejoins : with_clustered_replication_tracking_service {
-		//n.b. the replica may get a new id, but we shouldn't fail if it doesn't
-
-		private readonly long _logPosition = 4000;
-		private readonly long _logPosition2 = 5000;
-		private readonly Guid _replicaId1 = Guid.NewGuid();
-		private readonly Guid _replicaId2 = Guid.NewGuid();
-
-		protected override int ClusterSize => 5;
-		
-		public override void When() {
-			BecomeLeader();
-			WriterCheckpoint.Write(_logPosition);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replicaId1, _logPosition));
-			Service.Handle(new SystemMessage.VNodeConnectionLost(
-				PortsHelper.GetLoopback(),
-				Guid.NewGuid(),
-				_replicaId1));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent()); //n.b. we still don't have quorum here
-
-			//moving directly to log position 2 after rejoin
-			WriterCheckpoint.Write(_logPosition2);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replicaId1, _logPosition2));
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replicaId2, _logPosition2));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-		}
-
-		[Test]
-		public void replicated_to_should_be_sent() {
-			AssertEx.IsOrBecomesTrue(() => 1 == ReplicatedTos.Count);
-			Assert.True(ReplicatedTos.TryDequeue(out var msg));
-			Assert.AreEqual(_logPosition2, msg.LogPosition);
-		}
-		[Test]
-		public void replication_checkpoint_should_advance() {
-			Assert.AreEqual(_logPosition2, ReplicationCheckpoint.Read());
-			Assert.AreEqual(_logPosition2, ReplicationCheckpoint.ReadNonFlushed());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_before_quorum.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_before_quorum.cs
deleted file mode 100644
index 8cede001bd0..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_before_quorum.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-	[TestFixture]
-	public class when_5_node_cluster_receives_replica_lost_before_quorum : with_clustered_replication_tracking_service {
-		private readonly long _logPosition = 4000;
-		private readonly Guid _replicaId1 = Guid.NewGuid();
-		private readonly Guid _replicaId2 = Guid.NewGuid();
-		private readonly Guid _replicaId3 = Guid.NewGuid();
-
-		
-		protected override int ClusterSize => 5;
-
-		public override void When() {
-			BecomeLeader();
-			WriterCheckpoint.Write(_logPosition);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replicaId1, _logPosition));
-			Service.Handle(new SystemMessage.VNodeConnectionLost(
-				PortsHelper.GetLoopback(),
-				Guid.NewGuid(),
-				_replicaId1));
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replicaId2, _logPosition));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-		}
-
-		[Test]
-		public void replicated_to_should_not_be_sent() {
-			Assert.AreEqual(0, ReplicatedTos.Count);
-		}
-
-		[Test]
-		public void replication_checkpoint_should_not_advance() {
-			Assert.AreEqual(0, ReplicationCheckpoint.Read());		
-			Assert.AreEqual(0, ReplicationCheckpoint.ReadNonFlushed());		
-		}	
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_before_quorum_and_continues.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_before_quorum_and_continues.cs
deleted file mode 100644
index dbedb442240..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_before_quorum_and_continues.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-	[TestFixture]
-	public class when_5_node_cluster_receives_replica_lost_before_quorum_and_continues : with_clustered_replication_tracking_service {
-		private readonly long _logPosition = 4000;
-		private readonly Guid _replicaId1 = Guid.NewGuid();
-		private readonly Guid _replicaId2 = Guid.NewGuid();
-		private readonly Guid _replicaId3 = Guid.NewGuid();
-
-		
-		protected override int ClusterSize => 5;
-
-		public override void When() {
-			BecomeLeader();
-			WriterCheckpoint.Write(_logPosition);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replicaId1, _logPosition));
-			Service.Handle(new SystemMessage.VNodeConnectionLost(
-				PortsHelper.GetLoopback(),
-				Guid.NewGuid(),
-				_replicaId1));
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replicaId2, _logPosition));
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replicaId3, _logPosition));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-		}
-
-		[Test]
-		public void replicated_to_should_be_sent() {
-			AssertEx.IsOrBecomesTrue(() => 1 == ReplicatedTos.Count);
-			Assert.True(ReplicatedTos.TryDequeue(out var msg));
-			Assert.AreEqual(_logPosition, msg.LogPosition);
-		}
-		[Test]
-		public void replication_checkpoint_should_advance() {
-			Assert.AreEqual(_logPosition, ReplicationCheckpoint.Read());
-			Assert.AreEqual(_logPosition, ReplicationCheckpoint.ReadNonFlushed());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_cluster_receives_multiple_stale_acks.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_cluster_receives_multiple_stale_acks.cs
deleted file mode 100644
index d18714a65e2..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_cluster_receives_multiple_stale_acks.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-	[TestFixture]
-	public class when_cluster_receives_multiple_stale_acks :
-		with_clustered_replication_tracking_service {
-		private readonly long _firstLogPosition = 2000;
-		private readonly Guid _replica1 = Guid.NewGuid();
-		private readonly Guid _replica2 = Guid.NewGuid();
-
-		protected override int ClusterSize => 3;
-
-		public override void When() {
-			BecomeLeader();
-			// All of the nodes have acked the first write
-			WriterCheckpoint.Write(_firstLogPosition);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replica1, _firstLogPosition));
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replica2, _firstLogPosition - 100));
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(Guid.NewGuid(), _firstLogPosition - 100));
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(Guid.NewGuid(), _firstLogPosition - 100));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-		}
-
-		[Test]
-		public void replicated_to_should_be_sent_for_the_first_position() {
-			Assert.True(ReplicatedTos.TryDequeue(out var msg));
-			Assert.AreEqual(_firstLogPosition, msg.LogPosition);
-		}
-
-		[Test]
-		public void replication_checkpoint_be_at_the_first_position() {
-			Assert.AreEqual(_firstLogPosition, ReplicationCheckpoint.Read());
-			Assert.AreEqual(_firstLogPosition, ReplicationCheckpoint.ReadNonFlushed());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_cluster_receives_multiple_stale_acks_and_continues.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_cluster_receives_multiple_stale_acks_and_continues.cs
deleted file mode 100644
index 1f8f9298fed..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_cluster_receives_multiple_stale_acks_and_continues.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-	[TestFixture]
-	public class when_cluster_receives_multiple_stale_acks_and_continues :
-		with_clustered_replication_tracking_service {
-		private readonly long _firstLogPosition = 2000;
-		private readonly long _secondLogPosition = 4000;
-		private readonly Guid _replica1 = Guid.NewGuid();
-		private readonly Guid _replica2 = Guid.NewGuid();
-
-		protected override int ClusterSize => 3;
-
-		public override void When() {
-			BecomeLeader();
-			// All of the nodes have acked the first write
-			WriterCheckpoint.Write(_firstLogPosition);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replica1, _firstLogPosition));
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replica2, _firstLogPosition - 100));
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(Guid.NewGuid(), _firstLogPosition - 100));
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(Guid.NewGuid(), _firstLogPosition - 100));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-
-			ReplicatedTos.Clear();
-			
-			WriterCheckpoint.Write(_secondLogPosition);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replica1, _secondLogPosition));
-			AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
-		}
-
-		
-
-		[Test]
-		public void replicated_to_can_advance_to_second_position() {
-
-			Assert.True(ReplicatedTos.TryDequeue(out var msg));
-			Assert.AreEqual(_secondLogPosition, msg.LogPosition);
-		}
-
-		[Test]
-		public void replication_checkpoint_can_advance_to_second_position() {
-			
-			Assert.AreEqual(_secondLogPosition, ReplicationCheckpoint.Read());
-			Assert.AreEqual(_secondLogPosition, ReplicationCheckpoint.ReadNonFlushed());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_single_node_cluster_receives_1_write_notification.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_single_node_cluster_receives_1_write_notification.cs
deleted file mode 100644
index 673686b0f3e..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/when_single_node_cluster_receives_1_write_notification.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-	[TestFixture]
-	public class when_single_node_cluster_receives_1_write_notification : with_clustered_replication_tracking_service {
-		private long _logPosition = 4000;
-		protected override int ClusterSize => 1;
-
-		public override void When() {
-			BecomeLeader();
-			WriterCheckpoint.Write(_logPosition);
-			WriterCheckpoint.Flush();
-			Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			AssertEx.IsOrBecomesTrue(()=> Service.IsCurrent());
-		}
-
-		[Test]
-		public void replicated_to_should_be_sent() {
-			Assert.AreEqual(1, ReplicatedTos.Count);
-			Assert.True(ReplicatedTos.TryDequeue(out var msg));
-			Assert.AreEqual(_logPosition, msg.LogPosition);
-		}
-		[Test]
-		public void replication_checkpoint_should_advance() {
-			Assert.AreEqual(_logPosition, ReplicationCheckpoint.Read());		
-			Assert.AreEqual(_logPosition, ReplicationCheckpoint.ReadNonFlushed());		
-		}	
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/with_clustered_replication_tracking_service.cs b/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/with_clustered_replication_tracking_service.cs
deleted file mode 100644
index 0b58ffc3424..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/ReplicationTracking/with_clustered_replication_tracking_service.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Net;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Replication;
-using EventStore.Core.TransactionLog.Checkpoint;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Replication.ReplicationTracking {
-	public abstract class with_clustered_replication_tracking_service:
-		IHandle<ReplicationTrackingMessage.ReplicatedTo> {
-		protected string EventStreamId = "test_stream";
-		protected SynchronousScheduler Publisher = new("publisher");
-		protected ReplicationTrackingService Service;
-		protected ConcurrentQueue<ReplicationTrackingMessage.ReplicatedTo> ReplicatedTos = new ConcurrentQueue<ReplicationTrackingMessage.ReplicatedTo>();
-		protected ICheckpoint ReplicationCheckpoint = new InMemoryCheckpoint();
-		protected ICheckpoint WriterCheckpoint = new InMemoryCheckpoint();
-
-		protected abstract int ClusterSize { get; }
-
-		[OneTimeSetUp]
-		public virtual void TestFixtureSetUp() {
-			Publisher.Subscribe<ReplicationTrackingMessage.ReplicatedTo>(this);
-
-			Service = new ReplicationTrackingService(Publisher, ClusterSize,ReplicationCheckpoint, WriterCheckpoint);
-			Service.Start();
-			When();
-		}
-
-		[OneTimeTearDown]
-		public virtual void TestFixtureTearDown() {
-			Service.Stop();
-		}
-
-		public abstract void When();
-
-		protected void BecomeLeader() {
-			Service.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
-		}
-
-		protected void BecomeUnknown() {
-			Service.Handle(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
-		}
-
-		public void Handle(ReplicationTrackingMessage.ReplicatedTo message) {
-			ReplicatedTos.Enqueue(message);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/Subscriptions/TestSubscription.cs b/src/EventStore.Core.Tests/Services/Replication/Subscriptions/TestSubscription.cs
deleted file mode 100644
index cf23dfecd68..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/Subscriptions/TestSubscription.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Threading;
-using System.Collections.Generic;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.UserManagement;
-
-namespace EventStore.Core.Tests.Replication.ReadStream {
-	public class TestSubscription<TLogFormat, TStreamId> {
-		public MiniClusterNode<TLogFormat, TStreamId> Node;
-		public CountdownEvent SubscriptionsConfirmed;
-		public CountdownEvent EventAppeared;
-		public List<ClientMessage.StreamEventAppeared> StreamEvents;
-		public string StreamId;
-
-		public TestSubscription(MiniClusterNode<TLogFormat, TStreamId> node, int expectedEvents, string streamId,
-			CountdownEvent subscriptionsConfirmed) {
-			Node = node;
-			SubscriptionsConfirmed = subscriptionsConfirmed;
-			EventAppeared = new CountdownEvent(expectedEvents);
-			StreamId = streamId;
-		}
-
-		public void CreateSubscription() {
-			var subscribeMsg = new ClientMessage.SubscribeToStream(Guid.NewGuid(), Guid.NewGuid(),
-				new CallbackEnvelope(x => {
-					switch (x.GetType().Name) {
-						case "SubscriptionConfirmation":
-							SubscriptionsConfirmed.Signal();
-							break;
-						case "StreamEventAppeared":
-							EventAppeared.Signal();
-							break;
-						case "SubscriptionDropped":
-							break;
-						default:
-							Assert.Fail("Unexpected message type :" + x.GetType().Name);
-							break;
-					}
-				}), Guid.NewGuid(), StreamId, false, SystemAccounts.System);
-			Node.Node.MainQueue.Publish(subscribeMsg);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Replication/Subscriptions/when_subscribed_to_stream_on_leader_and_event_is_replicated_to_followers.cs b/src/EventStore.Core.Tests/Services/Replication/Subscriptions/when_subscribed_to_stream_on_leader_and_event_is_replicated_to_followers.cs
deleted file mode 100644
index d597227e965..00000000000
--- a/src/EventStore.Core.Tests/Services/Replication/Subscriptions/when_subscribed_to_stream_on_leader_and_event_is_replicated_to_followers.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using NUnit.Framework;
-using EventStore.Core.Tests.Integration;
-using EventStore.Core.Messages;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.Tests.Replication.ReadStream {
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_subscribed_to_stream_on_leader_and_event_is_replicated_to_followers<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
-		private const string _streamId = "test-stream";
-		private CountdownEvent _expectedNumberOfRoleAssignments;
-		private CountdownEvent _subscriptionsConfirmed;
-		private TestSubscription<TLogFormat, TStreamId> _leaderSubscription;
-		private List<TestSubscription<TLogFormat, TStreamId>> _followerSubscriptions;
-
-		private TimeSpan _timeout = TimeSpan.FromSeconds(5);
-
-		protected override void BeforeNodesStart() {
-			_nodes.ToList().ForEach(x =>
-				x.Node.MainBus.Subscribe(new AdHocHandler<SystemMessage.StateChangeMessage>(Handle)));
-			_expectedNumberOfRoleAssignments = new CountdownEvent(3);
-			base.BeforeNodesStart();
-		}
-
-		private void Handle(SystemMessage.StateChangeMessage msg) {
-			switch (msg.State) {
-				case Data.VNodeState.Leader:
-					_expectedNumberOfRoleAssignments.Signal();
-					break;
-				case Data.VNodeState.Follower:
-					_expectedNumberOfRoleAssignments.Signal();
-					break;
-			}
-		}
-
-		protected override async Task Given() {
-			_expectedNumberOfRoleAssignments.Wait(5000);
-
-			var leader = GetLeader();
-			Assert.IsNotNull(leader, "Could not get leader node");
-
-			// Set the checkpoint so the check is not skipped
-			leader.Db.Config.ReplicationCheckpoint.Write(0);
-
-			_subscriptionsConfirmed = new CountdownEvent(3);
-			_leaderSubscription = new TestSubscription<TLogFormat, TStreamId>(leader, 1, _streamId, _subscriptionsConfirmed);
-			_leaderSubscription.CreateSubscription();
-
-			_followerSubscriptions = new List<TestSubscription<TLogFormat, TStreamId>>();
-			var followers = GetFollowers();
-			foreach (var s in followers) {
-				var followerSubscription = new TestSubscription<TLogFormat, TStreamId>(s, 1, _streamId, _subscriptionsConfirmed);
-				_followerSubscriptions.Add(followerSubscription);
-				followerSubscription.CreateSubscription();
-			}
-
-			if (!_subscriptionsConfirmed.Wait(_timeout)) {
-				Assert.Fail($"Timed out waiting for subscriptions to confirm, confirmed {_subscriptionsConfirmed.CurrentCount} need {_subscriptionsConfirmed.InitialCount}.");
-			}
-
-			var events = new Event[] { new Event(Guid.NewGuid(), "test-type", false, new byte[10], new byte[0]) };
-			var writeResult = ReplicationTestHelper.WriteEvent(leader, events, _streamId);
-			Assert.AreEqual(OperationResult.Success, writeResult.Result);
-
-			await base.Given();
-			var replicas = GetFollowers();
-			AssertEx.IsOrBecomesTrue(
-				() => {
-					var leaderIndex = leader.Db.Config.IndexCheckpoint.Read();
-					return replicas[0].Db.Config.IndexCheckpoint.Read() == leaderIndex &&
-					       replicas[1].Db.Config.IndexCheckpoint.Read() == leaderIndex;
-
-				},
-				timeout:TimeSpan.FromSeconds(2));
-		}
-
-		[Test]
-		public void should_receive_event_on_leader() {
-			Assert.IsTrue(_leaderSubscription.EventAppeared.Wait(2000));
-		}
-
-		[Test]
-		public void should_receive_event_on_followers() {
-			if (!(_followerSubscriptions[0].EventAppeared.Wait(2000) && _followerSubscriptions[1].EventAppeared.Wait(2000))) {
-				Assert.Fail("Timed out waiting for follower subscriptions to get events");
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_completes_successfully.cs b/src/EventStore.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_completes_successfully.cs
deleted file mode 100644
index 0a2f600ade9..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_completes_successfully.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using EventStore.Core.Services.RequestManager.Managers;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.DeleteMgr {
-	[TestFixture]
-	public class when_delete_stream_completes_successfully : RequestManagerSpecification<DeleteStream> {
-		private long commitPosition = 1000;
-		private readonly string _streamId = $"DeleteTest-{Guid.NewGuid()}";
-		protected override DeleteStream OnManager(FakePublisher publisher) {
-			return new DeleteStream(
-				publisher,
-				CommitTimeout,
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-			   	streamId: _streamId,
-				expectedVersion: ExpectedVersion.Any,
-				hardDelete: false,
-				commitSource: CommitSource);
-		}
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield return new StorageMessage.CommitIndexed(InternalCorrId, commitPosition, 2, 3, 3);
-		}
-
-		protected override Message When() {
-			return new ReplicationTrackingMessage.IndexedTo(commitPosition);
-		}
-
-		[Test]
-		public void successful_request_message_is_published() {
-			Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
-				x => x.CorrelationId == InternalCorrId && x.Success));
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to_with_success() {
-			Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.DeleteStreamCompleted>(
-				x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.Success && x.CurrentVersion == 3));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_completes_wrong_expected_version.cs b/src/EventStore.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_completes_wrong_expected_version.cs
deleted file mode 100644
index aca4411967b..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_completes_wrong_expected_version.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.RequestManager.Managers;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.DeleteMgr {
-	[TestFixture]
-	public class when_delete_stream_completes_wrong_expected_version : RequestManagerSpecification<DeleteStream> {
-		private long commitPosition = 1000;
-		private readonly string _streamId = $"DeleteTest-{Guid.NewGuid()}";
-
-		protected override DeleteStream OnManager(FakePublisher publisher) {
-			return new DeleteStream(
-				publisher,
-				CommitTimeout,
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				streamId: _streamId,
-				expectedVersion: 10,
-				hardDelete: false,
-				commitSource: CommitSource);
-		}
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield return new StorageMessage.CommitIndexed(InternalCorrId, commitPosition, 2, 3, 3);
-		}
-
-		protected override Message When() {
-			return new StorageMessage.WrongExpectedVersion(InternalCorrId, 3);
-		}
-
-		[Test]
-		public void failed_request_message_is_published() {
-			Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
-				x => x.CorrelationId == InternalCorrId && !x.Success));
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to_with_wrong_expected_version() {
-			Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.DeleteStreamCompleted>(
-				x => x.CorrelationId == ClientCorrId &&
-				     x.Result == OperationResult.WrongExpectedVersion &&
-				     x.CurrentVersion == 3));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_already_committed_after_commit.cs b/src/EventStore.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_already_committed_after_commit.cs
deleted file mode 100644
index 54aecd8a621..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_already_committed_after_commit.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Fakes;
-using NUnit.Framework;
-using EventStore.Core.Services.RequestManager.Managers;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.DeleteMgr {
-	[TestFixture]
-	public class when_delete_stream_gets_already_committed_after_commit : RequestManagerSpecification<DeleteStream> {
-		private long commitPosition = 1000;
-		protected override DeleteStream OnManager(FakePublisher publisher) {
-			return new DeleteStream(
-				publisher, 
-				CommitTimeout, 
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				"test123",
-				ExpectedVersion.Any,
-				false,
-				CommitSource);
-		}
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield return new StorageMessage.CommitIndexed(InternalCorrId, commitPosition, 2, 3, 3);
-			yield return new ReplicationTrackingMessage.ReplicatedTo(commitPosition);		
-		}
-
-		protected override Message When() {			
-			return new StorageMessage.AlreadyCommitted(InternalCorrId, "test123", 0, 1, commitPosition);
-		}
-
-		[Test]
-		public void successful_request_message_is_not_published() {
-			Assert.That(!Produced.Any());
-		}
-
-		[Test]
-		public void the_envelope_is_not_replied_to_with_success() {
-			Assert.That(!Envelope.Replies.Any());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_already_committed_before_commit.cs b/src/EventStore.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_already_committed_before_commit.cs
deleted file mode 100644
index 4a295f4bf61..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_already_committed_before_commit.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using EventStore.Core.Services.RequestManager.Managers;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.DeleteMgr {
-	[TestFixture]
-	public class when_delete_stream_gets_already_committed_before_commit: RequestManagerSpecification<DeleteStream> {
-		private long _commitPosition = 3000;
-		private readonly string _streamId = $"delete_test-{Guid.NewGuid()}";
-		protected override DeleteStream OnManager(FakePublisher publisher) {
-			return new DeleteStream(
-				publisher,
-				CommitTimeout,
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				_streamId,
-				ExpectedVersion.Any,
-				false,
-				CommitSource);
-		}
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield break;
-		}
-
-		protected override Message When() {
-			return new StorageMessage.AlreadyCommitted(InternalCorrId, _streamId, 0, 1, _commitPosition);
-		}
-
-		[Test]
-		public void successful_request_message_is_published() {
-			Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
-				x => x.CorrelationId == InternalCorrId && x.Success));
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to_with_success() {
-			Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.DeleteStreamCompleted>(
-				x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.Success));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_stream_deleted.cs b/src/EventStore.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_stream_deleted.cs
deleted file mode 100644
index 4cf053e8318..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_stream_deleted.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using EventStore.Core.Services.RequestManager.Managers;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.DeleteMgr {
-	[TestFixture]
-	public class when_delete_stream_gets_stream_deleted : RequestManagerSpecification<DeleteStream> {
-		protected override DeleteStream OnManager(FakePublisher publisher) {
-			return new DeleteStream(
-				publisher, 
-				CommitTimeout, 
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				"test123",
-				ExpectedVersion.Any,
-				false,
-				CommitSource);
-		}
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield break;
-		}
-
-		protected override Message When() {
-			return new StorageMessage.StreamDeleted(InternalCorrId);
-		}
-
-		[Test]
-		public void failed_request_message_is_published() {
-			Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
-				x => x.CorrelationId == InternalCorrId && x.Success == false));
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to_with_failure() {
-			Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.DeleteStreamCompleted>(
-				x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.StreamDeleted));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_timeout_after_commit.cs b/src/EventStore.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_timeout_after_commit.cs
deleted file mode 100644
index 10693b9259a..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_timeout_after_commit.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Fakes;
-using NUnit.Framework;
-using EventStore.Core.Services.RequestManager.Managers;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.DeleteMgr {
-	public class when_delete_stream_gets_timeout_after_commit : RequestManagerSpecification<DeleteStream> {
-		private long _commitPosition = 3000;
-		protected override DeleteStream OnManager(FakePublisher publisher) {
-			return new DeleteStream(
-				publisher, 
-				CommitTimeout, 
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				"test123",
-				ExpectedVersion.Any,
-				false,
-				CommitSource);
-		}
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield return new StorageMessage.CommitIndexed(InternalCorrId, _commitPosition, 500, 1, 1);
-			yield return new ReplicationTrackingMessage.ReplicatedTo(_commitPosition);
-		}
-
-		protected override Message When() {			
-			return new StorageMessage.RequestManagerTimerTick(DateTime.UtcNow + TimeSpan.FromMinutes(1));
-		}
-
-		[Test]
-		public void no_additional_messages_are_published() {
-			Assert.That(!Produced.Any());
-		}
-		[Test]
-		public void the_envelope_has_single_successful_reply() {
-			Assert.AreEqual(0, Envelope.Replies.Count);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_timeout_before_commit.cs b/src/EventStore.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_timeout_before_commit.cs
deleted file mode 100644
index b9cc64d1798..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_timeout_before_commit.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.RequestManager.Managers;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.DeleteMgr {
-	public class when_delete_stream_gets_timeout_before_commit : RequestManagerSpecification<DeleteStream> {
-		protected override DeleteStream OnManager(FakePublisher publisher) {
-			return new DeleteStream(
-				publisher, 
-				CommitTimeout, 
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				"test123",
-				ExpectedVersion.Any,
-				false,
-				CommitSource);
-		}
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield break;
-		}
-
-		protected override Message When() {
-			return new StorageMessage.RequestManagerTimerTick(
-				DateTime.UtcNow + PrepareTimeout + TimeSpan.FromMinutes(5));
-		}
-
-		[Test]
-		public void failed_request_message_is_published() {
-			Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
-				x => x.CorrelationId == InternalCorrId && x.Success == false));
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to_with_failure() {
-			Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.DeleteStreamCompleted>(
-				x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.CommitTimeout));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/FakeRequestManager.cs b/src/EventStore.Core.Tests/Services/RequestManagement/FakeRequestManager.cs
deleted file mode 100644
index 3d2d7808023..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/FakeRequestManager.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.RequestManager;
-using EventStore.Core.Services.RequestManager.Managers;
-
-namespace EventStore.Core.Tests.Services.RequestManagement {
-	public class FakeRequestManager : RequestManagerBase {
-		public FakeRequestManager(
-				IPublisher publisher,
-				TimeSpan timeout,
-				IEnvelope clientResponseEnvelope,
-				Guid internalCorrId,
-				Guid clientCorrId,
-				long expectedVersion,
-				CommitSource commitSource,
-				int prepareCount = 0,
-				long transactionId = -1,
-				bool waitForCommit = false)
-			: base(
-				 publisher,
-				 timeout,
-				 clientResponseEnvelope,
-				 internalCorrId,
-				 clientCorrId,
-				 expectedVersion,
-				 commitSource,
-				 prepareCount,
-				 transactionId,
-				 waitForCommit)
-				{}
-		protected override Message WriteRequestMsg => throw new NotImplementedException();
-		protected override Message ClientSuccessMsg => throw new NotImplementedException();
-		protected override Message ClientFailMsg => throw new NotImplementedException();
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/ReadMgr/when_reading_an_event_committed_on_leader_and_on_followers.cs b/src/EventStore.Core.Tests/Services/RequestManagement/ReadMgr/when_reading_an_event_committed_on_leader_and_on_followers.cs
deleted file mode 100644
index 0b9e0a21451..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/ReadMgr/when_reading_an_event_committed_on_leader_and_on_followers.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests.Integration;
-using EventStore.Core.Tests.Replication.ReadStream;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.ReadMgr {
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_reading_an_event_committed_on_leader_and_on_followers<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
-		private CountdownEvent _expectedNumberOfRoleAssignments;
-
-		private string _streamId =
-			"when_reading_an_event_committed_on_leader_and_on_followers-" + Guid.NewGuid().ToString();
-
-		private long _commitPosition;
-		private long _indexPosition;
-
-		protected override void BeforeNodesStart() {
-			_nodes.ToList().ForEach(x =>
-				x.Node.MainBus.Subscribe(new AdHocHandler<SystemMessage.StateChangeMessage>(Handle)));
-			_expectedNumberOfRoleAssignments = new CountdownEvent(3);
-			base.BeforeNodesStart();
-		}
-
-		private void Handle(SystemMessage.StateChangeMessage msg) {
-			switch (msg.State) {
-				case Data.VNodeState.Leader:
-					_expectedNumberOfRoleAssignments.Signal();
-					break;
-				case Data.VNodeState.Follower:
-					_expectedNumberOfRoleAssignments.Signal();
-					break;
-			}
-		}
-
-		protected override async Task Given() {
-			_expectedNumberOfRoleAssignments.Wait(5000);
-
-			var leader = GetLeader();
-			Assert.IsNotNull(leader, "Could not get leader node");
-
-			// Set the checkpoint so the check is not skipped
-			leader.Db.Config.ReplicationCheckpoint.Write(0);
-
-			var events = new Event[] { new Event(Guid.NewGuid(), "test-type", false, new byte[10], new byte[0]) };
-			var writeResult = ReplicationTestHelper.WriteEvent(leader, events, _streamId);
-			Assert.AreEqual(OperationResult.Success, writeResult.Result);
-			_commitPosition = writeResult.CommitPosition;
-			Thread.Sleep(100);
-			Assert.IsTrue(_commitPosition <= GetLeader().Db.Config.ReplicationCheckpoint.Read(),
-				"Replication checkpoint should be greater than event commit position");
-			await base.Given();
-			_indexPosition = leader.Db.Config.IndexCheckpoint.Read();
-		}
-
-		[Test]
-		public void should_be_able_to_read_event_from_all_forward_on_leader() {
-			var readResult = ReplicationTestHelper.ReadAllEventsForward(GetLeader(), _commitPosition);
-			Assert.AreEqual(1, readResult.Events.Count(x => x.OriginalStreamId == _streamId));
-		}
-
-		[Test]
-		public void should_be_able_to_read_event_from_all_backward_on_leader() {
-			var readResult = ReplicationTestHelper.ReadAllEventsBackward(GetLeader(), _commitPosition);
-			Assert.AreEqual(1, readResult.Events.Count(x => x.OriginalStreamId == _streamId));
-		}
-
-		[Test]
-		public void should_be_able_to_read_event_from_stream_forward_on_leader() {
-			var readResult = ReplicationTestHelper.ReadStreamEventsForward(GetLeader(), _streamId);
-			Assert.AreEqual(1, readResult.Events.Count());
-			Assert.AreEqual(ReadStreamResult.Success, readResult.Result);
-		}
-
-		[Test]
-		public void should_be_able_to_read_event_from_stream_backward_on_leader() {
-			var readResult = ReplicationTestHelper.ReadStreamEventsBackward(GetLeader(), _streamId);
-			Assert.AreEqual(ReadStreamResult.Success, readResult.Result);
-			Assert.AreEqual(1, readResult.Events.Count());
-		}
-
-		[Test]
-		public void should_be_able_to_read_event_on_leader() {
-			var readResult = ReplicationTestHelper.ReadEvent(GetLeader(), _streamId, 0);
-			Assert.AreEqual(ReadEventResult.Success, readResult.Result);
-		}
-
-		[Test]
-		[Retry(5)]
-		public void should_be_able_to_read_event_from_all_forward_on_followers() {
-			var followers = GetFollowers();
-			var quorum = (followers.Count() + 1) / 2 + 1;
-			var successfulReads = 0;
-			foreach (var s in followers) {
-				AssertEx.IsOrBecomesTrue(()=> s.Db.Config.IndexCheckpoint.Read() >= _indexPosition);
-				var readResult = ReplicationTestHelper.ReadAllEventsForward(s, _commitPosition);
-				successfulReads += readResult.Events.Count(x => x.OriginalStreamId == _streamId);
-			}
-
-			Assert.GreaterOrEqual(successfulReads, quorum - 1);
-		}
-
-		[Test]
-		[Retry(5)]
-		public void should_be_able_to_read_event_from_all_backward_on_followers() {
-			var followers = GetFollowers();
-			var quorum = (followers.Count() + 1) / 2 + 1;
-			var successfulReads = 0;
-			foreach (var s in followers) {
-				AssertEx.IsOrBecomesTrue(()=> s.Db.Config.IndexCheckpoint.Read() >= _indexPosition);
-				var readResult = ReplicationTestHelper.ReadAllEventsBackward(s, _commitPosition);
-				successfulReads += readResult.Events.Count(x => x.OriginalStreamId == _streamId);
-			}
-
-			Assert.GreaterOrEqual(successfulReads, quorum - 1);
-		}
-
-		[Test]
-		[Retry(5)]
-		public void should_be_able_to_read_event_from_stream_forward_on_followers() {
-			var followers = GetFollowers();
-			var quorum = (followers.Count() + 1) / 2 + 1;
-			var successfulReads = 0;
-			foreach (var s in followers) {
-				AssertEx.IsOrBecomesTrue(()=> s.Db.Config.IndexCheckpoint.Read() >= _indexPosition);
-				var readResult = ReplicationTestHelper.ReadStreamEventsForward(s, _streamId);
-				successfulReads += readResult.Events.Count();
-				Assert.AreEqual(ReadStreamResult.Success, readResult.Result);
-			}
-
-			Assert.GreaterOrEqual(successfulReads, quorum - 1);
-		}
-
-		[Test]
-		[Retry(5)]
-		public void should_be_able_to_read_event_from_stream_backward_on_followers() {
-			var followers = GetFollowers();
-			var quorum = (followers.Count() + 1) / 2 + 1;
-			var successfulReads = 0;
-			foreach (var s in followers) {
-				AssertEx.IsOrBecomesTrue(()=> s.Db.Config.IndexCheckpoint.Read() >= _indexPosition);
-				var readResult = ReplicationTestHelper.ReadStreamEventsBackward(s, _streamId);
-				successfulReads += readResult.Events.Count();
-			}
-
-			Assert.GreaterOrEqual(successfulReads, quorum - 1);
-		}
-
-		[Test]
-		[Retry(5)]
-		public void should_be_able_to_read_event_on_followers() {
-			var followers = GetFollowers();
-			var quorum = (followers.Count() + 1) / 2 + 1;
-			var successfulReads = 0;
-			foreach (var s in followers) {
-				AssertEx.IsOrBecomesTrue(()=> s.Db.Config.IndexCheckpoint.Read() >= _indexPosition);
-				var readResult = ReplicationTestHelper.ReadEvent(s, _streamId, 0);
-				successfulReads += readResult.Result == ReadEventResult.Success ? 1 : 0;
-			}
-
-			Assert.GreaterOrEqual(successfulReads, quorum - 1);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/ReadMgr/when_reading_an_event_from_a_single_node.cs b/src/EventStore.Core.Tests/Services/RequestManagement/ReadMgr/when_reading_an_event_from_a_single_node.cs
deleted file mode 100644
index 77b383dfd00..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/ReadMgr/when_reading_an_event_from_a_single_node.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.Tests.Integration;
-using EventStore.Core.Tests.Replication.ReadStream;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.ReadMgr {
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_reading_an_event_from_a_single_node<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
-		private CountdownEvent _expectedNumberOfRoleAssignments;
-		private string _streamId = "test-stream";
-		private long _commitPosition;
-
-		private MiniClusterNode<TLogFormat, TStreamId> _liveNode;
-
-		protected override void BeforeNodesStart() {
-			_nodes.ToList().ForEach(x =>
-				x.Node.MainBus.Subscribe(new AdHocHandler<SystemMessage.StateChangeMessage>(Handle)));
-			_expectedNumberOfRoleAssignments = new CountdownEvent(3);
-			base.BeforeNodesStart();
-		}
-
-		private void Handle(SystemMessage.StateChangeMessage msg) {
-			switch (msg.State) {
-				case Data.VNodeState.Leader:
-					_expectedNumberOfRoleAssignments.Signal();
-					break;
-				case Data.VNodeState.Follower:
-					_expectedNumberOfRoleAssignments.Signal();
-					break;
-			}
-		}
-
-		protected override async Task Given() {
-			_expectedNumberOfRoleAssignments.Wait(5000);
-
-			_liveNode = GetLeader();
-			Assert.IsNotNull(_liveNode, "Could not get leader node");
-
-			var events = new Event[] { new Event(Guid.NewGuid(), "test-type", false, new byte[10], new byte[0]) };
-			var writeResult = ReplicationTestHelper.WriteEvent(_liveNode, events, _streamId);
-			Assert.AreEqual(OperationResult.Success, writeResult.Result);
-			_commitPosition = writeResult.CommitPosition;
-
-			var followers = GetFollowers();
-			foreach (var s in followers) {
-				await ShutdownNode(s.DebugIndex);
-			}
-
-			await base.Given();
-		}
-
-		[Test]
-		public void should_be_able_to_read_event_from_all_forward() {
-			var readResult = ReplicationTestHelper.ReadAllEventsForward(_liveNode, _commitPosition);
-			Assert.AreEqual(1, readResult.Events.Where(x => x.OriginalStreamId == _streamId).Count());
-		}
-
-		[Test]
-		public void should_be_able_to_read_event_from_all_backward() {
-			var readResult = ReplicationTestHelper.ReadAllEventsBackward(_liveNode, _commitPosition);
-			Assert.AreEqual(1, readResult.Events.Where(x => x.OriginalStreamId == _streamId).Count());
-		}
-
-		[Test]
-		public void should_not_be_able_to_read_event_from_stream_forward() {
-			var readResult = ReplicationTestHelper.ReadStreamEventsForward(_liveNode, _streamId);
-			Assert.AreEqual(1, readResult.Events.Count());
-			Assert.AreEqual(ReadStreamResult.Success, readResult.Result);
-		}
-
-		[Test]
-		public void should_not_be_able_to_read_event_from_stream_backward() {
-			var readResult = ReplicationTestHelper.ReadStreamEventsBackward(_liveNode, _streamId);
-			Assert.AreEqual(1, readResult.Events.Count());
-			Assert.AreEqual(ReadStreamResult.Success, readResult.Result);
-		}
-
-		[Test]
-		public void should_not_be_able_to_read_event() {
-			var readResult = ReplicationTestHelper.ReadEvent(_liveNode, _streamId, 0);
-			Assert.AreEqual(ReadEventResult.Success, readResult.Result);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/RequestManagerSpecification.cs b/src/EventStore.Core.Tests/Services/RequestManagement/RequestManagerSpecification.cs
deleted file mode 100644
index c67110c6907..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/RequestManagerSpecification.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.RequestManager;
-using EventStore.Core.Services.RequestManager.Managers;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Services.Replication;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.RequestManagement {
-	public abstract class RequestManagerSpecification<TManager>
-		where TManager : RequestManagerBase {
-		protected readonly TimeSpan PrepareTimeout = TimeSpan.FromMinutes(5);
-		protected readonly TimeSpan CommitTimeout = TimeSpan.FromMinutes(5);
-
-		protected TManager Manager;
-		protected List<Message> Produced;
-		protected FakePublisher Publisher = new();
-		protected Guid InternalCorrId = Guid.NewGuid();
-		protected Guid ClientCorrId = Guid.NewGuid();
-		protected byte[] Metadata = new byte[255];
-		protected byte[] EventData = new byte[255];
-		protected FakeEnvelope Envelope = new();
-		protected CommitSource CommitSource = new();
-		protected SynchronousScheduler Dispatcher = new(nameof(RequestManagerSpecification<TManager>));
-
-		protected abstract TManager OnManager(FakePublisher publisher);
-		protected abstract IEnumerable<Message> WithInitialMessages();
-		protected virtual void Given(){ }
-		protected abstract Message When();
-
-		protected Event DummyEvent() {
-			return new Event(Guid.NewGuid(), "test", false, EventData, Metadata);
-		}
-
-		protected RequestManagerSpecification() {
-			Dispatcher.Subscribe<ReplicationTrackingMessage.ReplicatedTo>(CommitSource);
-		}
-		[OneTimeSetUp]
-		public virtual void Setup() {
-			Envelope.Replies.Clear();
-			Publisher.Messages.Clear();
-
-			Manager = OnManager(Publisher);
-			Dispatcher.Subscribe<StorageMessage.PrepareAck>(Manager);
-			Dispatcher.Subscribe<StorageMessage.InvalidTransaction>(Manager);
-			Dispatcher.Subscribe<StorageMessage.StreamDeleted>(Manager);
-			Dispatcher.Subscribe<StorageMessage.WrongExpectedVersion>(Manager);
-			Dispatcher.Subscribe<StorageMessage.AlreadyCommitted>(Manager);
-			Dispatcher.Subscribe<StorageMessage.RequestManagerTimerTick>(Manager);
-			Dispatcher.Subscribe<StorageMessage.CommitIndexed>(Manager);
-			Dispatcher.Subscribe<ReplicationTrackingMessage.IndexedTo>(CommitSource);
-			Dispatcher.Subscribe<ReplicationTrackingMessage.ReplicatedTo>(CommitSource);
-
-			Manager.Start();
-			Given();
-			foreach (var msg in WithInitialMessages()) {
-				Dispatcher.Publish(msg);
-			}
-
-			Publisher.Messages.Clear();
-			Envelope.Replies.Clear();
-			Dispatcher.Publish(When());
-			Produced = new List<Message>(Publisher.Messages);
-		}
-
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/Service/RequestManagerServiceSpecification.cs b/src/EventStore.Core.Tests/Services/RequestManagement/Service/RequestManagerServiceSpecification.cs
deleted file mode 100644
index 0dc4809493b..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/Service/RequestManagerServiceSpecification.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.ClientAPI.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Core.Services.RequestManager;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Services.Replication;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.Service {
-	public abstract class RequestManagerServiceSpecification:
-		IHandle<StorageMessage.WritePrepares>,
-		IHandle<StorageMessage.RequestCompleted> {
-		protected readonly TimeSpan PrepareTimeout = TimeSpan.FromMinutes(5);
-		protected readonly TimeSpan CommitTimeout = TimeSpan.FromMinutes(5);
-
-		protected List<Message> Produced = new();
-		protected FakePublisher Publisher = new();
-		protected Guid InternalCorrId = Guid.NewGuid();
-		protected Guid ClientCorrId = Guid.NewGuid();
-		protected byte[] Metadata = Helper.UTF8NoBom.GetBytes("{Value:42}");
-		protected byte[] EventData = Helper.UTF8NoBom.GetBytes("{Value:43}");
-		protected FakeEnvelope Envelope = new();
-		protected SynchronousScheduler Dispatcher = new(nameof(RequestManagerServiceSpecification));
-		protected RequestManagementService Service;
-		protected bool GrantAccess =true;
-		protected long LogPosition = 100;
-		protected PrepareFlags PrepareFlags = PrepareFlags.Data;
-		protected string StreamId = $"{nameof(RequestManagerServiceSpecification)}-{Guid.NewGuid()}";
-
-		protected abstract void Given();
-		protected abstract Message When();
-
-
-		protected RequestManagerServiceSpecification() {
-			Dispatcher.Subscribe<StorageMessage.WritePrepares>(this);
-			Dispatcher.Subscribe<StorageMessage.RequestCompleted>(this);
-
-			Service = new RequestManagementService(
-				Dispatcher,
-				TimeSpan.FromSeconds(2),
-				TimeSpan.FromSeconds(2),
-				explicitTransactionsSupported: true);
-			Dispatcher.Subscribe<ClientMessage.WriteEvents>(Service);
-			Dispatcher.Subscribe<StorageMessage.PrepareAck>(Service);
-			Dispatcher.Subscribe<StorageMessage.InvalidTransaction>(Service);
-			Dispatcher.Subscribe<StorageMessage.StreamDeleted>(Service);
-			Dispatcher.Subscribe<StorageMessage.WrongExpectedVersion>(Service);
-			Dispatcher.Subscribe<StorageMessage.AlreadyCommitted>(Service);
-			Dispatcher.Subscribe<StorageMessage.RequestManagerTimerTick>(Service);
-			Dispatcher.Subscribe<StorageMessage.CommitIndexed>(Service);
-			Dispatcher.Subscribe<ReplicationTrackingMessage.IndexedTo>(Service);
-			Dispatcher.Subscribe<ReplicationTrackingMessage.ReplicatedTo>(Service);
-			Dispatcher.Subscribe<SystemMessage.StateChangeMessage>(Service);
-		}
-		[OneTimeSetUp]
-		public virtual void Setup() {
-			Envelope.Replies.Clear();
-			Publisher.Messages.Clear();
-
-			Given();
-			Envelope.Replies.Clear();
-			Publisher.Messages.Clear();
-
-			Dispatcher.Publish(When());
-
-		}
-
-
-		private static readonly StreamAcl PublicStream = new StreamAcl(SystemRoles.All, SystemRoles.All, SystemRoles.All,
-			SystemRoles.All, SystemRoles.All);
-		public void Handle(StorageMessage.EffectiveStreamAclRequest message) {
-			message.Envelope.ReplyWith(new StorageMessage.EffectiveStreamAclResponse(new StorageMessage.EffectiveAcl(
-				PublicStream, PublicStream, PublicStream
-				)));
-		}
-
-		public void Handle(StorageMessage.WritePrepares message) {
-
-			var transactionPosition = LogPosition;
-			foreach (var _ in message.Events) {
-				Dispatcher.Publish(new StorageMessage.PrepareAck(
-										message.CorrelationId,
-										LogPosition,
-										PrepareFlags));
-				LogPosition += 100;
-			}
-			Dispatcher.Publish(new StorageMessage.CommitIndexed(
-									message.CorrelationId,
-									LogPosition,
-									transactionPosition,
-									0,
-									message.Events.Length));
-		}
-
-		protected Event DummyEvent() {
-			return new Event(Guid.NewGuid(), "SomethingHappened", true, EventData, Metadata);
-		}
-
-		public void Handle(StorageMessage.RequestCompleted message) {
-			Produced.Add(message);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/Service/when_handling_write_stream.cs b/src/EventStore.Core.Tests/Services/RequestManagement/Service/when_handling_write_stream.cs
deleted file mode 100644
index 10c00facefc..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/Service/when_handling_write_stream.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using WriteEventsMgr = EventStore.Core.Services.RequestManager.Managers.WriteEvents;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.Service {
-	[TestFixture]
-	public class when_handling_write_stream : RequestManagerServiceSpecification {
-		protected override void Given() {
-			Dispatcher.Publish(new ClientMessage.WriteEvents(InternalCorrId, ClientCorrId, Envelope, true, StreamId, ExpectedVersion.Any, new[] { DummyEvent() }, null));
-			Dispatcher.Publish(new StorageMessage.CommitIndexed(InternalCorrId, LogPosition, 2, 3, 3));
-			Dispatcher.Publish(new ReplicationTrackingMessage.ReplicatedTo(LogPosition));
-		}
-
-		protected override Message When() {
-			return new ReplicationTrackingMessage.IndexedTo(LogPosition);
-		}
-
-		[Test]
-		public void successful_request_message_is_published() {
-			Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
-				x => x.CorrelationId == InternalCorrId && x.Success));
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to_with_success() {
-			Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.WriteEventsCompleted>(
-				x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.Success));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/Service/when_writing_and_deposed_as_leader.cs b/src/EventStore.Core.Tests/Services/RequestManagement/Service/when_writing_and_deposed_as_leader.cs
deleted file mode 100644
index d1617b0ecc5..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/Service/when_writing_and_deposed_as_leader.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Net;
-using EventStore.Core.Cluster;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.Service {
-	[TestFixture]
-	public class when_writing_and_deposed_as_leader : RequestManagerServiceSpecification{
-		
-		protected override void Given() {
-			Dispatcher.Publish(new SystemMessage.BecomeLeader(Guid.NewGuid()));
-			Dispatcher.Publish(new ClientMessage.WriteEvents(InternalCorrId, ClientCorrId, Envelope, true, StreamId, ExpectedVersion.Any, new[] { DummyEvent() }, null));
-		}
-
-		protected override Message When() {
-			return new SystemMessage.BecomePreReplica(Guid.NewGuid(), Guid.NewGuid(), FakeMemberInfo());
-		}
-	
-		[Test]
-		public void the_envelope_is_replied_to_with_commit_timeout() {
-			Assert.AreEqual(1, Envelope.Replies.Count);
-			Assert.IsInstanceOf<ClientMessage.WriteEventsCompleted>(Envelope.Replies[0]);
-			var response = (ClientMessage.WriteEventsCompleted)Envelope.Replies[0];
-			Assert.AreEqual(OperationResult.CommitTimeout, response.Result);
-			Assert.AreEqual("Request canceled by server", response.Message);
-		}
-
-		private static MemberInfo FakeMemberInfo() {
-			var ipAddress = "127.0.0.1";
-			var port = 1113;
-			return EventStore.Core.Cluster.MemberInfo.Initial(Guid.Empty, DateTime.UtcNow,
-				VNodeState.Unknown, true,
-				new IPEndPoint(IPAddress.Parse(ipAddress), port),
-				new IPEndPoint(IPAddress.Parse(ipAddress), port),
-				new IPEndPoint(IPAddress.Parse(ipAddress), port),
-				new IPEndPoint(IPAddress.Parse(ipAddress), port),
-				new IPEndPoint(IPAddress.Parse(ipAddress), port),
-				null, 0, 0, 0, false);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/Service/when_writing_and_deposed_as_leader_and_replica_moves_forward.cs b/src/EventStore.Core.Tests/Services/RequestManagement/Service/when_writing_and_deposed_as_leader_and_replica_moves_forward.cs
deleted file mode 100644
index 69ab6983d32..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/Service/when_writing_and_deposed_as_leader_and_replica_moves_forward.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.Net;
-using EventStore.Core.Cluster;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.Service
-{
-	[TestFixture]
-	public class when_writing_and_deposed_as_leader_and_replica_moves_forward : RequestManagerServiceSpecification {
-		
-		protected override void Given() {
-			Dispatcher.Publish(new SystemMessage.BecomeLeader(Guid.NewGuid()));
-			Dispatcher.Publish(new ClientMessage.WriteEvents(InternalCorrId, ClientCorrId, Envelope, true, StreamId, ExpectedVersion.Any, new[] { DummyEvent() }, null));
-			Dispatcher.Publish(new SystemMessage.BecomePreReplica(Guid.NewGuid(), Guid.NewGuid(), FakeMemberInfo()));
-		}
-
-		protected override Message When() {
-			return new ReplicationTrackingMessage.IndexedTo(LogPosition);
-		}
-	
-		[Test]
-		public void the_old_write_is_not_acknowledged() {
-			Assert.AreEqual(0, Envelope.Replies.Count);
-		}
-
-		private static MemberInfo FakeMemberInfo() {
-			var ipAddress = "127.0.0.1";
-			var port = 1113;
-			return EventStore.Core.Cluster.MemberInfo.Initial(Guid.Empty, DateTime.UtcNow,
-				VNodeState.Unknown, true,
-				new IPEndPoint(IPAddress.Parse(ipAddress), port),
-				new IPEndPoint(IPAddress.Parse(ipAddress), port),
-				new IPEndPoint(IPAddress.Parse(ipAddress), port),
-				new IPEndPoint(IPAddress.Parse(ipAddress), port),
-				new IPEndPoint(IPAddress.Parse(ipAddress), port),
-				null, 0, 0, 0, false);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_completes_successfully.cs b/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_completes_successfully.cs
deleted file mode 100644
index 4cf252ae185..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_completes_successfully.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using EventStore.Core.Services.RequestManager.Managers;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.TransactionMgr {
-	[TestFixture]
-	public class when_transaction_commit_completes_successfully : RequestManagerSpecification<TransactionCommit> {
-		private long _commitPosition =3000;
-		private long _transactionPosition = 1000;
-		private int transactionId = 2341;
-	
-		protected override TransactionCommit OnManager(FakePublisher publisher) {
-			return new TransactionCommit(
-				publisher,
-				PrepareTimeout,
-				CommitTimeout,
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				transactionId,
-				CommitSource);
-			}
-
-		protected override IEnumerable<Message> WithInitialMessages() {			
-			yield return new StorageMessage.PrepareAck(InternalCorrId, _transactionPosition, PrepareFlags.TransactionEnd);
-			yield return new StorageMessage.CommitAck(InternalCorrId, _commitPosition, _transactionPosition, 1, 3);
-			yield return new ReplicationTrackingMessage.ReplicatedTo(_commitPosition);
-		}
-
-		protected override Message When() {
-			return new StorageMessage.CommitIndexed(InternalCorrId,_commitPosition,_transactionPosition,0,0);
-		}
-
-		[Test]
-		public void successful_request_message_is_published() {
-			Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
-				x => x.CorrelationId == InternalCorrId && x.Success));
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to_with_success() {
-			Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.TransactionCommitCompleted>(
-				x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.Success));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_already_committed_after_committed.cs b/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_already_committed_after_committed.cs
deleted file mode 100644
index 5c776c8c745..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_already_committed_after_committed.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using EventStore.Core.Services.RequestManager.Managers;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.TransactionMgr {
-	[TestFixture]
-	public class when_transaction_commit_gets_already_committed_after_committed : RequestManagerSpecification<TransactionCommit> {
-
-		private int transactionId = 2341;
-		private long commitPosition = 3000;
-		protected override TransactionCommit OnManager(FakePublisher publisher) {
-			return new TransactionCommit(
-				publisher,
-				PrepareTimeout,
-				CommitTimeout,
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				transactionId,
-				CommitSource);
-		}
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield return new StorageMessage.PrepareAck(InternalCorrId, transactionId, PrepareFlags.TransactionEnd);
-			yield return new StorageMessage.CommitIndexed(Guid.NewGuid(), commitPosition, transactionId, 0, 10);
-			yield return new ReplicationTrackingMessage.ReplicatedTo(commitPosition);
-			yield return new StorageMessage.CommitIndexed(InternalCorrId,commitPosition, transactionId,0,0);
-		}
-
-		protected override Message When() {
-			return new StorageMessage.AlreadyCommitted(InternalCorrId, "test123", 0, 1, commitPosition);
-		}
-
-		[Test]
-		public void successful_request_message_is_not_republished() {
-			Assert.That(!Produced.Any());
-		}
-
-		[Test]
-		public void the_envelope_is_not_replied_to_again() {
-			Assert.That(!Envelope.Replies.Any());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_already_committed_before_committed.cs b/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_already_committed_before_committed.cs
deleted file mode 100644
index 36b62b034d3..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_already_committed_before_committed.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using EventStore.Core.Services.RequestManager.Managers;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.TransactionMgr {
-	[TestFixture]
-	public class when_transaction_commit_gets_already_committed_before_committed : RequestManagerSpecification<TransactionCommit> {
-		private long commitPosition = 1000;
-		private int transactionId = 500;
-		
-		protected override TransactionCommit OnManager(FakePublisher publisher) {
-			return new TransactionCommit(
-				publisher,
-				PrepareTimeout,
-				CommitTimeout,
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				transactionId,
-				CommitSource);
-		}
-
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-
-			yield return new StorageMessage.PrepareAck(InternalCorrId, transactionId, PrepareFlags.TransactionEnd);
-		}
-
-		protected override Message When() {
-			return new StorageMessage.AlreadyCommitted(InternalCorrId, "test123", 0, 1, commitPosition);
-		}
-
-		[Test]
-		public void successful_request_message_is_published() {
-			Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
-				x => x.CorrelationId == InternalCorrId && x.Success));
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to_with_success() {
-			Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.TransactionCommitCompleted>(
-				x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.Success));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_prepare_timeout_after_prepares.cs b/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_prepare_timeout_after_prepares.cs
deleted file mode 100644
index b4b4d7e873e..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_prepare_timeout_after_prepares.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using EventStore.Core.Services.RequestManager.Managers;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.TransactionMgr {
-	[TestFixture]
-	public class when_transaction_commit_gets_prepare_timeout_after_prepares : RequestManagerSpecification<TransactionCommit> {
-
-		private int transactionId = 2341;
-		protected override TransactionCommit OnManager(FakePublisher publisher) {
-			return new TransactionCommit(
-				publisher,
-				PrepareTimeout,
-				CommitTimeout,
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				transactionId,
-				CommitSource);
-		}
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield return new StorageMessage.PrepareAck(InternalCorrId, transactionId, PrepareFlags.SingleWrite);
-		}
-
-		protected override Message When() {
-			return new StorageMessage.RequestManagerTimerTick(
-				DateTime.UtcNow + TimeSpan.FromTicks(CommitTimeout.Ticks / 2));
-		}
-
-		[Test]
-		public void no_messages_are_published() {
-			Assert.That(Produced.Count == 0);
-		}
-
-		[Test]
-		public void the_envelope_is_not_replied_to() {
-			Assert.AreEqual(0, Envelope.Replies.Count);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_prepare_timeout_before_prepares.cs b/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_prepare_timeout_before_prepares.cs
deleted file mode 100644
index fbaff8cb239..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_prepare_timeout_before_prepares.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using EventStore.Core.Services.RequestManager.Managers;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.TransactionMgr {
-	[TestFixture]
-	public class when_transaction_commit_gets_prepare_timeout_before_prepares : RequestManagerSpecification<TransactionCommit> {
-		
-		private int transactionId = 2341;
-		protected override TransactionCommit OnManager(FakePublisher publisher) {
-			return new TransactionCommit(
-				publisher,
-				PrepareTimeout,
-				CommitTimeout,
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				transactionId,
-				CommitSource);
-		}
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield break;
-		}
-
-		protected override Message When() {
-			return new StorageMessage.RequestManagerTimerTick(
-				DateTime.UtcNow + PrepareTimeout + TimeSpan.FromMinutes(5));
-		}
-
-		[Test]
-		public void failed_request_message_is_published() {
-			Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
-				x => x.CorrelationId == InternalCorrId && x.Success == false));
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to_with_failure() {
-			Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.TransactionCommitCompleted>(
-				x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.PrepareTimeout));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_stream_deleted.cs b/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_stream_deleted.cs
deleted file mode 100644
index 46973c2f8a8..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_stream_deleted.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using EventStore.Core.Services.RequestManager.Managers;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.TransactionMgr {
-	[TestFixture]
-	public class when_transaction_commit_gets_stream_deleted : RequestManagerSpecification<TransactionCommit> {
-		
-		private int transactionId = 2341;
-		protected override TransactionCommit OnManager(FakePublisher publisher) {
-			return new TransactionCommit(
-				publisher,
-				PrepareTimeout,
-				CommitTimeout,
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				transactionId,
-				CommitSource);
-		}
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield return new ClientMessage.TransactionCommit(InternalCorrId, ClientCorrId, Envelope, true, 4, null);
-		}
-
-		protected override Message When() {
-			return new StorageMessage.StreamDeleted(InternalCorrId);
-		}
-
-		[Test]
-		public void failed_request_message_is_published() {
-			Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
-				x => x.CorrelationId == InternalCorrId && x.Success == false));
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to_with_failure() {
-			Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.TransactionCommitCompleted>(
-				x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.StreamDeleted));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_timeout_before_cluster_commit.cs b/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_timeout_before_cluster_commit.cs
deleted file mode 100644
index 05702d4e4c7..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_timeout_before_cluster_commit.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using EventStore.Core.Services.RequestManager.Managers;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.TransactionMgr {
-	public class when_transaction_commit_gets_timeout_before_cluster_commit : RequestManagerSpecification<TransactionCommit> {
-		
-		private int transactionId = 2341;
-		protected override TransactionCommit OnManager(FakePublisher publisher) {
-			return new TransactionCommit(
-				publisher,
-				PrepareTimeout,
-				CommitTimeout,
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				transactionId,
-				CommitSource);
-		}
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield return new StorageMessage.PrepareAck(InternalCorrId, 100, PrepareFlags.Data);
-			yield return new StorageMessage.PrepareAck(InternalCorrId, 200, PrepareFlags.Data);
-			yield return new StorageMessage.CommitAck(InternalCorrId, 300, 100, 1, 2);
-		}
-
-		protected override Message When() {
-			return new StorageMessage.RequestManagerTimerTick(
-				DateTime.UtcNow + PrepareTimeout + CommitTimeout + TimeSpan.FromMinutes(5));
-		}
-
-		[Test]
-		public void failed_request_message_is_published() {
-			Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
-				x => x.CorrelationId == InternalCorrId && x.Success == false));
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to_with_failure() {
-			Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.TransactionCommitCompleted>(
-				x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.CommitTimeout));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_multiple_write_completes_successfully.cs b/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_multiple_write_completes_successfully.cs
deleted file mode 100644
index 78c714807d8..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_multiple_write_completes_successfully.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.RequestManager.Managers;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.TransactionMgr {
-	[TestFixture]
-	public class when_transaction_multiple_write_completes_successfully : RequestManagerSpecification<TransactionWrite> {
-
-		private long _transactionId = 1000;
-		private long _event1Position = 1500;
-		private long _event2Position = 2000;
-		private long _event3Position = 2500;
-		
-		protected override TransactionWrite OnManager(FakePublisher publisher) {
-			return new TransactionWrite(
-			 	publisher,
-				PrepareTimeout,
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				new[] { DummyEvent(), DummyEvent(), DummyEvent() },
-			    _transactionId,
-				CommitSource);
-		}
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield return new StorageMessage.PrepareAck(InternalCorrId, _event1Position, PrepareFlags.Data);
-			yield return new StorageMessage.PrepareAck(InternalCorrId, _event2Position, PrepareFlags.Data);
-			yield return new StorageMessage.PrepareAck(InternalCorrId, _event3Position, PrepareFlags.Data);
-		}
-
-		protected override Message When() {
-			return new ReplicationTrackingMessage.ReplicatedTo(_event3Position);
-		}
-
-		[Test]
-		public void successful_request_message_is_published() {
-			Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
-				x => x.CorrelationId == InternalCorrId && x.Success));
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to_with_success() {
-			Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.TransactionWriteCompleted>(
-				x =>
-					x.CorrelationId == ClientCorrId &&
-					x.Result == OperationResult.Success &&
-					x.TransactionId == _transactionId));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_multiple_write_does_not_get_prepares.cs b/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_multiple_write_does_not_get_prepares.cs
deleted file mode 100644
index bbc107eb8bf..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_multiple_write_does_not_get_prepares.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.RequestManager.Managers;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.TransactionMgr {
-	[TestFixture]
-	public class when_transaction_multiple_write_does_not_get_prepares : RequestManagerSpecification<TransactionWrite> {
-
-		private long _transactionId = 1000;
-		private long _event1Position = 1500;
-		private long _event2Position = 2000;
-		private long _event3Position = 2500;
-		
-		protected override TransactionWrite OnManager(FakePublisher publisher) {
-			return new TransactionWrite(
-			 	publisher,
-				PrepareTimeout,
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				new[] { DummyEvent(), DummyEvent(), DummyEvent() },
-			    _transactionId,
-				CommitSource);
-		}
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield return new StorageMessage.PrepareAck(InternalCorrId, _event1Position, PrepareFlags.Data);
-			yield return new StorageMessage.PrepareAck(InternalCorrId, _event2Position, PrepareFlags.Data);
-		}
-
-		protected override Message When() {
-			return new ReplicationTrackingMessage.ReplicatedTo(_event3Position);
-		}
-
-		[Test]
-		public void successful_request_message_is_not_published() {
-			Assert.That(!Produced.Any());
-		}
-
-		[Test]
-		public void the_envelope_is_not_replied_to_with_success() {
-			Assert.That(!Envelope.Replies.Any());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_single_write_completes_successfully.cs b/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_single_write_completes_successfully.cs
deleted file mode 100644
index 5eaf32d3c24..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_single_write_completes_successfully.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.RequestManager.Managers;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.TransactionMgr {
-	[TestFixture]
-	public class when_transaction_single_write_completes_successfully : RequestManagerSpecification<TransactionWrite> {
-
-		private long _transactionId = 1000;
-		private long _event1Position = 1500;
-		
-		protected override TransactionWrite OnManager(FakePublisher publisher) {
-			return new TransactionWrite(
-			 	publisher,
-				PrepareTimeout,
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				new[] { DummyEvent()},
-			    _transactionId,
-				CommitSource);
-		}
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield return new StorageMessage.PrepareAck(InternalCorrId, _event1Position, PrepareFlags.Data);
-		}
-
-		protected override Message When() {
-			return new ReplicationTrackingMessage.ReplicatedTo(_event1Position);
-		}
-
-		[Test]
-		public void successful_request_message_is_published() {
-			Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
-				x => x.CorrelationId == InternalCorrId && x.Success));
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to_with_success() {
-			Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.TransactionWriteCompleted>(
-				x =>
-					x.CorrelationId == ClientCorrId &&
-					x.Result == OperationResult.Success &&
-					x.TransactionId == _transactionId));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_start_completes_successfully.cs b/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_start_completes_successfully.cs
deleted file mode 100644
index f3335111456..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_start_completes_successfully.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.RequestManager.Managers;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.TransactionMgr {
-	[TestFixture]
-	public class when_transaction_start_completes_successfully : RequestManagerSpecification<TransactionStart> {
-		private long _commitPosition =3000;
-		private long _transactionPosition = 1564;
-		protected override TransactionStart OnManager(FakePublisher publisher) {
-			return new TransactionStart(
-			 	publisher,
-				PrepareTimeout,
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				$"testStream-{nameof(when_transaction_commit_completes_successfully)}",
-				0,
-				CommitSource);
-			}
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield return new StorageMessage.PrepareAck(InternalCorrId, _transactionPosition, PrepareFlags.TransactionBegin);
-		}
-
-		protected override Message When() {
-			return new ReplicationTrackingMessage.ReplicatedTo(_commitPosition);
-		}
-
-		[Test]
-		public void successful_request_message_is_published() {
-			Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
-				x => x.CorrelationId == InternalCorrId && x.Success));
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to_with_success() {
-			Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.TransactionStartCompleted>(
-				x => 
-					x.CorrelationId == ClientCorrId && 
-					x.Result == OperationResult.Success &&
-					x.TransactionId == _transactionPosition));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_already_committed.cs b/src/EventStore.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_already_committed.cs
deleted file mode 100644
index 01940d04db4..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_already_committed.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using EventStore.Core.Services.RequestManager.Managers;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.WriteStreamMgr {
-	[TestFixture]
-	public class when_write_stream_gets_already_committed : RequestManagerSpecification<WriteEvents> {
-		private long _prepareLogPosition = 100;
-		private long _commitLogPosition = 100;
-		protected override WriteEvents OnManager(FakePublisher publisher) {
-			return new WriteEvents(
-				publisher, 
-				CommitTimeout, 
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				"test123",
-				ExpectedVersion.Any,
-				new[] {DummyEvent()},
-				CommitSource);
-		}
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield return new StorageMessage.PrepareAck(InternalCorrId, _prepareLogPosition, PrepareFlags.SingleWrite|PrepareFlags.Data);			
-		}
-
-		protected override Message When() {
-			return new StorageMessage.AlreadyCommitted(InternalCorrId, "test123", 0, 1, _commitLogPosition);		
-		}
-
-		[Test]
-		public void successful_request_message_is_published() {
-			Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
-				x => x.CorrelationId == InternalCorrId && x.Success));
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to_with_success() {
-			Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.WriteEventsCompleted>(
-				x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.Success));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_already_committed_and_log_is_committed.cs b/src/EventStore.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_already_committed_and_log_is_committed.cs
deleted file mode 100644
index 74e036fb2bd..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_already_committed_and_log_is_committed.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using EventStore.Core.Services.RequestManager.Managers;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.WriteStreamMgr {
-	[TestFixture]
-	public class when_write_stream_gets_already_committed_and_log_is_committed : RequestManagerSpecification<WriteEvents> {
-		private long _prepareLogPosition = 100;
-		private long _commitLogPosition = 100;
-		protected override WriteEvents OnManager(FakePublisher publisher) {
-			return new WriteEvents(
-				publisher, 
-				CommitTimeout, 
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				"test123",
-				ExpectedVersion.Any,
-				new[] {DummyEvent()},
-				CommitSource);
-		}
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield return new StorageMessage.PrepareAck(InternalCorrId, _prepareLogPosition, PrepareFlags.SingleWrite|PrepareFlags.Data);
-			yield return new ReplicationTrackingMessage.ReplicatedTo( _commitLogPosition);
-		}
-
-		protected override Message When() {
-			return new StorageMessage.AlreadyCommitted(InternalCorrId, "test123", 0, 1, _commitLogPosition);
-		}
-
-		[Test]
-		public void successful_request_message_is_published() {
-			Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
-				x => x.CorrelationId == InternalCorrId && x.Success));
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to_with_success() {
-			Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.WriteEventsCompleted>(
-				x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.Success));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_already_committed_and_log_is_not_committed.cs b/src/EventStore.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_already_committed_and_log_is_not_committed.cs
deleted file mode 100644
index 6f20e543ed3..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_already_committed_and_log_is_not_committed.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using EventStore.Core.Services.RequestManager.Managers;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.WriteStreamMgr {
-	[TestFixture]
-	public class when_write_stream_gets_already_committed_and_log_is_not_committed : RequestManagerSpecification<WriteEvents> {
-		private long _commitLogPosition = 1000;
-		protected override WriteEvents OnManager(FakePublisher publisher) {
-			return new WriteEvents(
-				publisher, 
-				CommitTimeout, 
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				"test123",
-				ExpectedVersion.Any,
-				new[] {DummyEvent()},
-				CommitSource);
-		}
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield return new ReplicationTrackingMessage.ReplicatedTo(_commitLogPosition - 1);
-		}
-
-		protected override Message When() {
-			return new StorageMessage.AlreadyCommitted(InternalCorrId, "test123", 0, 1, _commitLogPosition);
-		}
-
-		[Test]
-		public void successful_request_message_is_published() {
-			Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
-				x => x.CorrelationId == InternalCorrId && x.Success));
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to_with_success() {
-			Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.WriteEventsCompleted>(
-				x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.Success));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_stream_deleted.cs b/src/EventStore.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_stream_deleted.cs
deleted file mode 100644
index b3f4e637d57..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_stream_deleted.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using EventStore.Core.Services.RequestManager.Managers;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.WriteStreamMgr {
-	[TestFixture]
-	public class when_write_stream_gets_stream_deleted : RequestManagerSpecification<WriteEvents> {
-		protected override WriteEvents OnManager(FakePublisher publisher) {
-				return new WriteEvents(
-				publisher, 
-				CommitTimeout, 
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				"test123",
-				ExpectedVersion.Any,
-				new[] {DummyEvent()},
-				CommitSource);
-		}
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield break;
-		}
-
-		protected override Message When() {
-			return new StorageMessage.StreamDeleted(InternalCorrId);
-		}
-
-		[Test]
-		public void failed_request_message_is_published() {
-			Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
-				x => x.CorrelationId == InternalCorrId && x.Success == false));
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to_with_failure() {
-			Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.WriteEventsCompleted>(
-				x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.StreamDeleted));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_timeout_after_cluster_commit.cs b/src/EventStore.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_timeout_after_cluster_commit.cs
deleted file mode 100644
index 7a90caf8dec..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_timeout_after_cluster_commit.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using EventStore.Core.Services.RequestManager.Managers;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.WriteStreamMgr {
-	[TestFixture]
-	public class when_write_stream_gets_timeout_after_cluster_commit : RequestManagerSpecification<WriteEvents> {
-		private long _prepareLogPosition = 100;
-		private long _commitPosition = 100;
-		protected override WriteEvents OnManager(FakePublisher publisher) {
-			return new WriteEvents(
-				publisher, 
-				CommitTimeout, 
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				"test123",
-				ExpectedVersion.Any,
-				new[] {DummyEvent()},
-				CommitSource);
-		}
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield return new StorageMessage.PrepareAck(InternalCorrId, _prepareLogPosition, PrepareFlags.SingleWrite|PrepareFlags.Data);
-			yield return new StorageMessage.CommitIndexed(InternalCorrId, _commitPosition, 1, 0, 0);
-			yield return new ReplicationTrackingMessage.ReplicatedTo(_commitPosition);
-		}
-
-		protected override Message When() {
-			return new StorageMessage.RequestManagerTimerTick (DateTime.UtcNow + TimeSpan.FromMinutes(1));
-		}
-
-		[Test]
-		public void no_additional_messages_are_published() {
-			Assert.That(Produced.Count == 0);
-		}
-		[Test]
-		public void the_envelope_has_no_additional_replies() {
-			Assert.AreEqual(0, Envelope.Replies.Count);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_timeout_after_local_commit.cs b/src/EventStore.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_timeout_after_local_commit.cs
deleted file mode 100644
index 9c675c2655a..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_timeout_after_local_commit.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Fakes;
-using NUnit.Framework;
-using EventStore.Core.Services.RequestManager.Managers;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.WriteStreamMgr {
-	[TestFixture]
-	public class when_write_stream_gets_timeout_after_local_commit : RequestManagerSpecification<WriteEvents> {
-		protected override WriteEvents OnManager(FakePublisher publisher) {
-			return new WriteEvents(
-				publisher, 
-				CommitTimeout, 
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				"test123",
-				ExpectedVersion.Any,
-				new[] {DummyEvent()},
-				CommitSource);
-		}
-
-		protected override IEnumerable<Message> WithInitialMessages() {				
-			yield return new StorageMessage.CommitIndexed(InternalCorrId, 1, 1, 0, 0);
-		}
-
-		protected override Message When() {
-			return new StorageMessage.RequestManagerTimerTick(DateTime.UtcNow + CommitTimeout + CommitTimeout);
-		}
-
-		[Test]
-		public void request_completed_as_failed_published() {
-			Assert.AreEqual(1, Produced.Count);
-			Assert.AreEqual(false, ((StorageMessage.RequestCompleted)Produced[0]).Success);
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to() {
-			Assert.AreEqual(1, Envelope.Replies.Count);
-
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_timeout_before_local_commit.cs b/src/EventStore.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_timeout_before_local_commit.cs
deleted file mode 100644
index 0bc338ec4ae..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_timeout_before_local_commit.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Fakes;
-using NUnit.Framework;
-using EventStore.Core.Services.RequestManager.Managers;
-
-namespace EventStore.Core.Tests.Services.RequestManagement.WriteStreamMgr {
-	[TestFixture]
-	public class when_write_stream_gets_timeout_before_local_commit : RequestManagerSpecification<WriteEvents> {
-		protected override WriteEvents OnManager(FakePublisher publisher) {
-			return new WriteEvents(
-				publisher, 
-				CommitTimeout, 
-				Envelope,
-				InternalCorrId,
-				ClientCorrId,
-				"test123",
-				ExpectedVersion.Any,
-				new[] {DummyEvent()},
-				CommitSource);
-		}
-
-		protected override IEnumerable<Message> WithInitialMessages() {
-			yield break;			
-		}
-
-		protected override Message When() {
-			return new StorageMessage.RequestManagerTimerTick(DateTime.UtcNow + CommitTimeout + CommitTimeout);
-		}
-
-		[Test]
-		public void request_completed_as_failed_published() {
-			Assert.AreEqual(1, Produced.Count);
-			Assert.AreEqual(false, ((StorageMessage.RequestCompleted)Produced[0]).Success);
-		}
-
-		[Test]
-		public void the_envelope_is_replied_to() {
-			Assert.AreEqual(1, Envelope.Replies.Count);
-
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/RequestManagement/when_creating_stream_request_manager.cs b/src/EventStore.Core.Tests/Services/RequestManagement/when_creating_stream_request_manager.cs
deleted file mode 100644
index 573033da9d2..00000000000
--- a/src/EventStore.Core.Tests/Services/RequestManagement/when_creating_stream_request_manager.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.RequestManager;
-using NUnit.Framework;
-// ReSharper disable ObjectCreationAsStatement
-
-namespace EventStore.Core.Tests.Services.RequestManagement {
-	[TestFixture]
-	public class when_creating_stream_request_manager {
-		protected static readonly IPublisher Publisher = new SynchronousScheduler();
-		protected static readonly TimeSpan CommitTimeout = TimeSpan.FromMinutes(5);
-		protected static readonly IEnvelope Envelope = new NoopEnvelope();
-		protected static readonly Guid InternalCorrId = Guid.NewGuid();
-		protected static readonly Guid ClientCorrId = Guid.NewGuid();
-		protected static readonly long ExpectedVersion = 1;
-
-
-
-		[Test]
-		public void null_publisher_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() =>
-				new FakeRequestManager(
-					null,
-					CommitTimeout,
-					Envelope,
-					InternalCorrId,
-					ClientCorrId,
-					ExpectedVersion,
-					new CommitSource()));
-		}
-
-		[Test]
-		public void null_envelope_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() =>
-				new FakeRequestManager(
-					Publisher,
-					CommitTimeout,
-					null,
-					InternalCorrId,
-					ClientCorrId,
-					ExpectedVersion,
-					new CommitSource()));
-		}
-		[Test]
-		public void internal_corrId_empty_guid_throws_argument_exception() {
-			Assert.Throws<ArgumentException>(() =>
-				new FakeRequestManager(
-					Publisher,
-					CommitTimeout,
-					Envelope,
-					Guid.Empty,
-					ClientCorrId,
-					ExpectedVersion,
-					new CommitSource()));
-		}
-		[Test]
-		public void client_corrId_empty_guid_throws_argument_exception() {
-			Assert.Throws<ArgumentException>(() =>
-				new FakeRequestManager(
-					Publisher,
-					CommitTimeout,
-					Envelope,
-					InternalCorrId,
-					Guid.Empty,
-					ExpectedVersion,
-					new CommitSource()));
-		}
-
-		[Test]
-		public void empty_commit_source_throws_null_argument_exception() {
-			Assert.Throws<ArgumentNullException>(() =>
-				new FakeRequestManager(
-					Publisher,
-					CommitTimeout,
-					Envelope,
-					InternalCorrId,
-					ClientCorrId,
-					ExpectedVersion,
-					null));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/AllReader/when_a_single_write_before_the_transaction_is_present.cs b/src/EventStore.Core.Tests/Services/Storage/AllReader/when_a_single_write_before_the_transaction_is_present.cs
deleted file mode 100644
index 5a8c0c3bcc6..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/AllReader/when_a_single_write_before_the_transaction_is_present.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.AllReader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class when_a_single_write_before_the_transaction_is_present<TLogFormat, TStreamId> : RepeatableDbTestScenario<TLogFormat, TStreamId> {
-		[Test]
-		public void should_be_able_to_read_the_transactional_writes_when_the_commit_is_present() {
-			CreateDb(
-				Rec.Prepare(0, "single_write_stream_id_1", prepareFlags: PrepareFlags.Data | PrepareFlags.IsCommitted),
-				Rec.TransSt(1, "transaction_stream_id"),
-				Rec.Prepare(1, "transaction_stream_id"),
-				Rec.TransEnd(1, "transaction_stream_id"),
-				Rec.Prepare(2, "single_write_stream_id_2", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted),
-				Rec.Prepare(3, "single_write_stream_id_3", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted),
-				Rec.Prepare(4, "single_write_stream_id_4", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted));
-
-			var firstRead = ReadIndex.ReadAllEventsForward(new Data.TFPos(0, 0), 10);
-
-			Assert.AreEqual(4, firstRead.Records.Count);
-			Assert.AreEqual("single_write_stream_id_1", firstRead.Records[0].Event.EventStreamId);
-			Assert.AreEqual("single_write_stream_id_2", firstRead.Records[1].Event.EventStreamId);
-			Assert.AreEqual("single_write_stream_id_3", firstRead.Records[2].Event.EventStreamId);
-			Assert.AreEqual("single_write_stream_id_4", firstRead.Records[3].Event.EventStreamId);
-
-			CreateDb(
-				Rec.Prepare(0, "single_write_stream_id_1", prepareFlags: PrepareFlags.Data | PrepareFlags.IsCommitted),
-				Rec.TransSt(1, "transaction_stream_id"),
-				Rec.Prepare(1, "transaction_stream_id"),
-				Rec.TransEnd(1, "transaction_stream_id"),
-				Rec.Prepare(2, "single_write_stream_id_2", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted),
-				Rec.Prepare(3, "single_write_stream_id_3", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted),
-				Rec.Prepare(4, "single_write_stream_id_4", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted),
-				Rec.Commit(1, "transaction_stream_id"));
-
-			var transactionRead = ReadIndex.ReadAllEventsForward(firstRead.NextPos, 10);
-
-			Assert.AreEqual(1, transactionRead.Records.Count);
-			Assert.AreEqual("transaction_stream_id", transactionRead.Records[0].Event.EventStreamId);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/AllReader/when_a_single_write_is_after_transaction_end_but_before_commit_is_present.cs b/src/EventStore.Core.Tests/Services/Storage/AllReader/when_a_single_write_is_after_transaction_end_but_before_commit_is_present.cs
deleted file mode 100644
index f9dc0ced53d..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/AllReader/when_a_single_write_is_after_transaction_end_but_before_commit_is_present.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.AllReader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class when_a_single_write_is_after_transaction_end_but_before_commit_is_present<TLogFormat, TStreamId>
-		: RepeatableDbTestScenario<TLogFormat, TStreamId> {
-		[Test]
-		public void should_be_able_to_read_the_transactional_writes_when_the_commit_is_present() {
-			CreateDb(Rec.TransSt(0, "transaction_stream_id"),
-				Rec.Prepare(0, "transaction_stream_id"),
-				Rec.TransEnd(0, "transaction_stream_id"),
-				Rec.Prepare(1, "single_write_stream_id", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted));
-
-			var firstRead = ReadIndex.ReadAllEventsForward(new Data.TFPos(0, 0), 10);
-
-			Assert.AreEqual(1, firstRead.Records.Count);
-			Assert.AreEqual("single_write_stream_id", firstRead.Records[0].Event.EventStreamId);
-
-			CreateDb(Rec.TransSt(0, "transaction_stream_id"),
-				Rec.Prepare(0, "transaction_stream_id"),
-				Rec.TransEnd(0, "transaction_stream_id"),
-				Rec.Prepare(1, "single_write_stream_id", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted),
-				Rec.Commit(0, "transaction_stream_id"));
-
-			var transactionRead = ReadIndex.ReadAllEventsForward(firstRead.NextPos, 10);
-
-			Assert.AreEqual(1, transactionRead.Records.Count);
-			Assert.AreEqual("transaction_stream_id", transactionRead.Records[0].Event.EventStreamId);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/AllReader/when_multiple_single_writes_are_after_transaction_end_but_before_commit_is_present.cs b/src/EventStore.Core.Tests/Services/Storage/AllReader/when_multiple_single_writes_are_after_transaction_end_but_before_commit_is_present.cs
deleted file mode 100644
index a2c18204ff4..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/AllReader/when_multiple_single_writes_are_after_transaction_end_but_before_commit_is_present.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.AllReader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class
-		when_multiple_single_writes_are_after_transaction_end_but_before_commit_is_present<TLogFormat, TStreamId>
-		: RepeatableDbTestScenario<TLogFormat, TStreamId> {
-		[Test]
-		public void should_be_able_to_read_the_transactional_writes_when_the_commit_is_present() {
-			/*
-			 * create a db with a transaction where the commit is not present yet (read happened before the chaser could commit)
-			 * in the following case the read will return the event for the single non-transactional write
-			 * performing a read from the next position returned will fail as the prepares are all less than what we have asked for.
-			 */
-			CreateDb(Rec.TransSt(0, "transaction_stream_id"),
-				Rec.Prepare(0, "transaction_stream_id"),
-				Rec.TransEnd(0, "transaction_stream_id"),
-				Rec.Prepare(1, "single_write_stream_id_1", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted),
-				Rec.Prepare(2, "single_write_stream_id_2", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted),
-				Rec.Prepare(3, "single_write_stream_id_3", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted));
-
-			var firstRead = ReadIndex.ReadAllEventsForward(new Data.TFPos(0, 0), 10);
-
-			Assert.AreEqual(3, firstRead.Records.Count);
-			Assert.AreEqual("single_write_stream_id_1", firstRead.Records[0].Event.EventStreamId);
-			Assert.AreEqual("single_write_stream_id_2", firstRead.Records[1].Event.EventStreamId);
-			Assert.AreEqual("single_write_stream_id_3", firstRead.Records[2].Event.EventStreamId);
-
-			//create the exact same db as above but now with the transaction's commit
-			CreateDb(Rec.TransSt(0, "transaction_stream_id"),
-				Rec.Prepare(0, "transaction_stream_id"),
-				Rec.TransEnd(0, "transaction_stream_id"),
-				Rec.Prepare(1, "single_write_stream_id_1", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted),
-				Rec.Prepare(2, "single_write_stream_id_2", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted),
-				Rec.Prepare(3, "single_write_stream_id_3", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted),
-				Rec.Commit(0, "transaction_stream_id"));
-
-			var transactionRead = ReadIndex.ReadAllEventsForward(firstRead.NextPos, 10);
-
-			Assert.AreEqual(1, transactionRead.Records.Count);
-			Assert.AreEqual("transaction_stream_id", transactionRead.Records[0].Event.EventStreamId);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/AllReader/when_reading_all_with_disallowed_streams.cs b/src/EventStore.Core.Tests/Services/Storage/AllReader/when_reading_all_with_disallowed_streams.cs
deleted file mode 100644
index 95d37e119ea..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/AllReader/when_reading_all_with_disallowed_streams.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Client.Messages;
-using NUnit.Framework;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-
-
-namespace EventStore.Core.Tests.Services.Storage.AllReader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string), "$persistentsubscription-$all::group-checkpoint")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string), "$persistentsubscription-$all::group-parked")]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), "$persistentsubscription-$all::group-checkpoint")]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), "$persistentsubscription-$all::group-parked")]
-	public class when_reading_all_with_disallowed_streams<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		TFPos _forwardReadPos;
-		TFPos _backwardReadPos;
-		private string _disallowedStream;
-		private string _allowedStream1 = "ES1";
-		private string _allowedStream2 = "$persistentsubscription-$all::group-somethingallowed";
-
-		public when_reading_all_with_disallowed_streams(string disallowedStream) {
-			_disallowedStream = disallowedStream;
-		}
-
-		protected override void WriteTestScenario() {
-			var firstEvent = WriteSingleEvent(_allowedStream1, 1, new string('.', 3000), eventId: Guid.NewGuid(),
-				eventType: "event-type-1", retryOnFail: true);
-			WriteSingleEvent(_disallowedStream, 1, new string('.', 3000), eventId: Guid.NewGuid(), eventType: "event-type-2",
-				retryOnFail: true); //disallowed
-			WriteSingleEvent(_allowedStream2, 1, new string('.', 3000), eventId: Guid.NewGuid(), eventType: "event-type-3",
-				retryOnFail: true); //allowed
-
-			_forwardReadPos = new TFPos(firstEvent.LogPosition, firstEvent.LogPosition);
-			_backwardReadPos = new TFPos(Writer.Position, Writer.Position);
-		}
-
-		[Test]
-		public void should_filter_out_disallowed_streams_when_reading_events_forward() {
-			var records = ReadIndex.ReadAllEventsForward(_forwardReadPos, 10).EventRecords();
-			Assert.AreEqual(2, records.Count);
-			Assert.True(records.All(x => x.Event.EventStreamId != _disallowedStream));
-			Assert.True(records.Any(x => x.Event.EventStreamId == _allowedStream1));
-			Assert.True(records.Any(x => x.Event.EventStreamId == _allowedStream2));
-		}
-
-		[Test]
-		public void should_filter_out_disallowed_streams_when_reading_events_forward_with_event_type_prefix() {
-			var filter = new Filter(
-				Filter.Types.FilterContext.EventType,
-				Filter.Types.FilterType.Prefix, new[] {"event-type"});
-			var eventFilter = EventFilter.Get(true, filter);
-
-			var result = ReadIndex.ReadAllEventsForwardFiltered(_forwardReadPos, 10, 10, eventFilter);
-			Assert.AreEqual(2, result.Records.Count);
-			Assert.True(result.Records.All(x => x.Event.EventStreamId != _disallowedStream));
-			Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream1));
-			Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream2));
-		}
-
-		[Test]
-		public void should_filter_out_disallowed_streams_when_reading_events_forward_with_event_type_regex() {
-			var filter = new Filter(
-				Filter.Types.FilterContext.EventType,
-				Filter.Types.FilterType.Regex, new[] {@"^.*event-type-.*$"});
-			var eventFilter = EventFilter.Get(true, filter);
-
-			var result = ReadIndex.ReadAllEventsForwardFiltered(_forwardReadPos, 10, 10, eventFilter);
-			Assert.AreEqual(2, result.Records.Count);
-			Assert.True(result.Records.All(x => x.Event.EventStreamId != _disallowedStream));
-			Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream1));
-			Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream2));
-		}
-
-		[Test]
-		public void should_filter_out_disallowed_streams_when_reading_events_forward_with_stream_id_prefix() {
-			var filter = new Filter(
-				Filter.Types.FilterContext.StreamId,
-				Filter.Types.FilterType.Prefix, new[] {"$persistentsubscripti"});
-			var eventFilter = EventFilter.Get(true, filter);
-
-			var result = ReadIndex.ReadAllEventsForwardFiltered(_forwardReadPos, 10, 10, eventFilter);
-			Assert.AreEqual(1, result.Records.Count);
-			Assert.True(result.Records.All(x => x.Event.EventStreamId != _disallowedStream));
-			Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream2));
-		}
-
-		[Test]
-		public void should_filter_out_disallowed_streams_when_reading_events_forward_with_stream_id_regex() {
-			var filter = new Filter(
-				Filter.Types.FilterContext.StreamId,
-				Filter.Types.FilterType.Regex, new[] {@"^.*istentsubsc.*$"});
-			var eventFilter = EventFilter.Get(true, filter);
-
-			var result = ReadIndex.ReadAllEventsForwardFiltered(_forwardReadPos, 10, 10, eventFilter);
-			Assert.AreEqual(1, result.Records.Count);
-			Assert.True(result.Records.All(x => x.Event.EventStreamId != _disallowedStream));
-			Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream2));
-		}
-
-		[Test]
-		public void should_filter_out_disallowed_streams_when_reading_events_backward() {
-			var records = ReadIndex.ReadAllEventsBackward(_backwardReadPos, 10).EventRecords();
-			Assert.AreEqual(2, records.Count);
-			Assert.True(records.All(x => x.Event.EventStreamId != _disallowedStream));
-			Assert.True(records.Any(x => x.Event.EventStreamId == _allowedStream1));
-			Assert.True(records.Any(x => x.Event.EventStreamId == _allowedStream2));
-		}
-
-		[Test]
-		public void should_filter_out_disallowed_streams_when_reading_events_backward_with_event_type_prefix() {
-			var filter = new Filter(
-				Filter.Types.FilterContext.EventType,
-				Filter.Types.FilterType.Prefix, new[] {"event-type"});
-			var eventFilter = EventFilter.Get(true, filter);
-
-			var result = ReadIndex.ReadAllEventsBackwardFiltered(_backwardReadPos, 10, 10, eventFilter);
-			Assert.AreEqual(2, result.Records.Count);
-			Assert.True(result.Records.All(x => x.Event.EventStreamId != _disallowedStream));
-			Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream1));
-			Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream2));
-		}
-
-		[Test]
-		public void should_filter_out_disallowed_streams_when_reading_events_backward_with_event_type_regex() {
-			var filter = new Filter(
-				Filter.Types.FilterContext.EventType,
-				Filter.Types.FilterType.Regex, new[] {@"^.*event-type-.*$"});
-			var eventFilter = EventFilter.Get(true, filter);
-
-			var result = ReadIndex.ReadAllEventsBackwardFiltered(_backwardReadPos, 10, 10, eventFilter);
-			Assert.AreEqual(2, result.Records.Count);
-			Assert.True(result.Records.All(x => x.Event.EventStreamId != _disallowedStream));
-			Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream1));
-			Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream2));
-		}
-
-		[Test]
-		public void should_filter_out_disallowed_streams_when_reading_events_backward_with_stream_id_prefix() {
-			var filter = new Filter(
-				Filter.Types.FilterContext.StreamId,
-				Filter.Types.FilterType.Prefix, new[] {"$persistentsubscripti"});
-			var eventFilter = EventFilter.Get(true, filter);
-
-			var result = ReadIndex.ReadAllEventsBackwardFiltered(_backwardReadPos, 10, 10, eventFilter);
-			Assert.AreEqual(1, result.Records.Count);
-			Assert.True(result.Records.All(x => x.Event.EventStreamId != _disallowedStream));
-			Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream2));
-		}
-
-		[Test]
-		public void should_filter_out_disallowed_streams_when_reading_events_backward_with_stream_id_regex() {
-			var filter = new Filter(
-				Filter.Types.FilterContext.StreamId,
-				Filter.Types.FilterType.Regex, new[] {@"^.*istentsubsc.*$"});
-			var eventFilter = EventFilter.Get(true, filter);
-
-			var result = ReadIndex.ReadAllEventsBackwardFiltered(_backwardReadPos, 10, 10, eventFilter);
-			Assert.AreEqual(1, result.Records.Count);
-			Assert.True(result.Records.All(x => x.Event.EventStreamId != _disallowedStream));
-			Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream2));
-		}
-
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/AllReader/when_reading_all_with_filtering.cs b/src/EventStore.Core.Tests/Services/Storage/AllReader/when_reading_all_with_filtering.cs
deleted file mode 100644
index 479cd510149..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/AllReader/when_reading_all_with_filtering.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System;
-using EventStore.Client.Messages;
-using NUnit.Framework;
-using EventStore.Core.Data;
-
-using EventStore.Core.Services.Storage.ReaderIndex;
-
-
-namespace EventStore.Core.Tests.Services.Storage.AllReader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_reading_all_with_filtering<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		TFPos _forwardReadPos;
-		TFPos _backwardReadPos;
-
-		protected override void WriteTestScenario() {
-			var firstEvent = WriteSingleEvent("ES1", 1, new string('.', 3000), eventId: Guid.NewGuid(),
-				eventType: "event-type-1", retryOnFail: true);
-			WriteSingleEvent("ES2", 1, new string('.', 3000), eventId: Guid.NewGuid(), eventType: "other-event-type-2",
-				retryOnFail: true);
-			WriteSingleEvent("ES3", 1, new string('.', 3000), eventId: Guid.NewGuid(), eventType: "event-type-3",
-				retryOnFail: true);
-			WriteSingleEvent("ES4", 1, new string('.', 3000), eventId: Guid.NewGuid(), eventType: "other-event-type-4",
-				retryOnFail: true);
-
-			_forwardReadPos = new TFPos(firstEvent.LogPosition, firstEvent.LogPosition);
-			_backwardReadPos = new TFPos(Writer.Position, Writer.Position);
-		}
-
-		[Test]
-		public void should_read_only_events_forward_with_event_type_prefix() {
-			var filter = new Filter(
-				Filter.Types.FilterContext.EventType,
-				Filter.Types.FilterType.Prefix, new[] {"event-type"});
-			var eventFilter = EventFilter.Get(true, filter);
-
-			var result = ReadIndex.ReadAllEventsForwardFiltered(_forwardReadPos, 10, 10, eventFilter);
-			Assert.AreEqual(2, result.Records.Count);
-		}
-
-		[Test]
-		public void should_read_only_events_forward_with_event_type_regex() {
-			var filter = new Filter(
-				Filter.Types.FilterContext.EventType,
-				Filter.Types.FilterType.Regex, new[] {@"^.*other-event.*$"});
-			var eventFilter = EventFilter.Get(true, filter);
-
-			var result = ReadIndex.ReadAllEventsForwardFiltered(_forwardReadPos, 10, 10, eventFilter);
-			Assert.AreEqual(2, result.Records.Count);
-		}
-
-		[Test]
-		public void should_read_only_events_forward_with_stream_id_prefix() {
-			var filter = new Filter(
-				Filter.Types.FilterContext.StreamId,
-				Filter.Types.FilterType.Prefix, new[] {"ES2"});
-			var eventFilter = EventFilter.Get(true, filter);
-
-			var result = ReadIndex.ReadAllEventsForwardFiltered(_forwardReadPos, 10, 10, eventFilter);
-			Assert.AreEqual(1, result.Records.Count);
-		}
-
-		[Test]
-		public void should_read_only_events_forward_with_stream_id_regex() {
-			var filter = new Filter(
-				Filter.Types.FilterContext.StreamId,
-				Filter.Types.FilterType.Regex, new[] {@"^.*ES2.*$"});
-			var eventFilter = EventFilter.Get(true, filter);
-
-			var result = ReadIndex.ReadAllEventsForwardFiltered(_forwardReadPos, 10, 10, eventFilter);
-			Assert.AreEqual(1, result.Records.Count);
-		}
-
-		[Test]
-		public void should_read_only_events_backward_with_event_type_prefix() {
-			var filter = new Filter(
-				Filter.Types.FilterContext.EventType,
-				Filter.Types.FilterType.Prefix, new[] {"event-type"});
-			var eventFilter = EventFilter.Get(true, filter);
-
-			var result = ReadIndex.ReadAllEventsBackwardFiltered(_backwardReadPos, 10, 10, eventFilter);
-			Assert.AreEqual(2, result.Records.Count);
-		}
-
-		[Test]
-		public void should_read_only_events_backward_with_event_type_regex() {
-			var filter = new Filter(
-				Filter.Types.FilterContext.EventType,
-				Filter.Types.FilterType.Regex, new[] {@"^.*other-event.*$"});
-			var eventFilter = EventFilter.Get(true, filter);
-
-			var result = ReadIndex.ReadAllEventsBackwardFiltered(_backwardReadPos, 10, 10, eventFilter);
-			Assert.AreEqual(2, result.Records.Count);
-		}
-
-		[Test]
-		public void should_read_only_events_backward_with_stream_id_prefix() {
-			var filter = new Filter(
-				Filter.Types.FilterContext.StreamId,
-				Filter.Types.FilterType.Prefix, new[] {"ES2"});
-			var eventFilter = EventFilter.Get(true, filter);
-
-			var result = ReadIndex.ReadAllEventsBackwardFiltered(_backwardReadPos, 10, 10, eventFilter);
-			Assert.AreEqual(1, result.Records.Count);
-		}
-
-		[Test]
-		public void should_read_only_events_backward_with_stream_id_regex() {
-			var filter = new Filter(
-				Filter.Types.FilterContext.StreamId,
-				Filter.Types.FilterType.Regex, new[] {@"^.*ES2.*$"});
-			var eventFilter = EventFilter.Get(true, filter);
-
-			var result = ReadIndex.ReadAllEventsBackwardFiltered(_backwardReadPos, 10, 10, eventFilter);
-			Assert.AreEqual(1, result.Records.Count);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/AllReader/when_reading_all_with_filtering_and_transactions.cs b/src/EventStore.Core.Tests/Services/Storage/AllReader/when_reading_all_with_filtering_and_transactions.cs
deleted file mode 100644
index 70c3b59ec1c..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/AllReader/when_reading_all_with_filtering_and_transactions.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.AllReader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class when_reading_all_with_filtering_and_transactions<TLogFormat, TStreamId>
-		: RepeatableDbTestScenario<TLogFormat, TStreamId> {
-
-		[Test]
-		public void should_receive_all_events_forward() {
-			// create a db with explicit transactions, some of which are filtered out on read.
-			// previously, a bug caused those filtered-out records to prevent the successful
-			// reading of subsequent events that are contained within an explicit transaction.
-
-			static Rec[] ExplicitTransaction(int transaction, string stream) => [
-				Rec.TransSt(transaction, stream),
-				Rec.Prepare(transaction, stream),
-				Rec.TransEnd(transaction, stream),
-				Rec.Commit(transaction, stream),
-			];
-
-			var i = 0;
-			CreateDb([
-				.. ExplicitTransaction(i++, "excludedStream"),
-				.. ExplicitTransaction(i++, "includedStream0"),
-				.. ExplicitTransaction(i++, "includedStream1"),
-				.. ExplicitTransaction(i++, "includedStream2"),
-				.. ExplicitTransaction(i++, "includedStream3"),
-				.. ExplicitTransaction(i++, "includedStream4"),
-				.. ExplicitTransaction(i++, "includedStream5"),
-				.. ExplicitTransaction(i++, "includedStream6"),
-				.. ExplicitTransaction(i++, "includedStream7"),
-				.. ExplicitTransaction(i++, "includedStream8"),
-				.. ExplicitTransaction(i++, "includedStream9"),
-			]);
-
-			var read = ReadIndex.ReadAllEventsForwardFiltered(
-				pos: new Data.TFPos(0, 0),
-				maxCount: 10,
-				maxSearchWindow: int.MaxValue,
-				eventFilter: EventFilter.StreamName.Prefixes(false, "included"));
-
-			Assert.AreEqual(10, read.Records.Count);
-			for (int j = 0; j < 10; j++)
-				Assert.AreEqual($"includedStream{j}", read.Records[j].Event.EventStreamId);
-		}
-
-		[Test]
-		public void should_receive_all_events_backward() {
-			// create a db with explicit transactions, some of which are filtered out on read.
-			// previously, a bug caused those filtered-out records to prevent the successful
-			// reading of subsequent events that are contained within an explicit transaction.
-
-			static Rec[] ExplicitTransaction(int transaction, string stream) => [
-				Rec.TransSt(transaction, stream),
-				Rec.Prepare(transaction, stream),
-				Rec.TransEnd(transaction, stream),
-				Rec.Commit(transaction, stream),
-			];
-
-			var i = 0;
-			CreateDb([
-				.. ExplicitTransaction(i++, "includedStream0"),
-				.. ExplicitTransaction(i++, "includedStream1"),
-				.. ExplicitTransaction(i++, "includedStream2"),
-				.. ExplicitTransaction(i++, "includedStream3"),
-				.. ExplicitTransaction(i++, "includedStream4"),
-				.. ExplicitTransaction(i++, "includedStream5"),
-				.. ExplicitTransaction(i++, "includedStream6"),
-				.. ExplicitTransaction(i++, "includedStream7"),
-				.. ExplicitTransaction(i++, "includedStream8"),
-				.. ExplicitTransaction(i++, "includedStream9"),
-				.. ExplicitTransaction(i++, "excludedStream"),
-			]);
-
-			var writerCp = DbRes.Db.Config.WriterCheckpoint.Read();
-			var read = ReadIndex.ReadAllEventsBackwardFiltered(
-				pos: new TFPos(writerCp, writerCp),
-				maxCount: 10,
-				maxSearchWindow: int.MaxValue,
-				eventFilter: EventFilter.StreamName.Prefixes(false, "included"));
-
-			Assert.AreEqual(10, read.Records.Count);
-			for (int j = 9; j <= 0; j--)
-				Assert.AreEqual($"includedStream{j}", read.Records[j].Event.EventStreamId);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/AllReader/when_reading_all_with_last_indexed_set.cs b/src/EventStore.Core.Tests/Services/Storage/AllReader/when_reading_all_with_last_indexed_set.cs
deleted file mode 100644
index ed05a3a0548..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/AllReader/when_reading_all_with_last_indexed_set.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using NUnit.Framework;
-using EventStore.Core.Data;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.Tests.Services.Storage.AllReader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_reading_all<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-
-		protected override void WriteTestScenario() {
-			WritePrepare("ES1", 0, Guid.NewGuid(), "event-type", new string('.', 3000), PrepareFlags.IsCommitted);
-			WritePrepare("ES2", 0, Guid.NewGuid(), "event-type", new string('.', 3000), PrepareFlags.IsCommitted);
-			WritePrepare("ES2", 1, Guid.NewGuid(), "event-type", new string('.', 3000), PrepareFlags.IsCommitted);
-		}
-
-		[Test]
-		public void should_be_able_to_read_all_backwards() {
-			var checkpoint = WriterCheckpoint.Read();
-			var pos = new TFPos(checkpoint, checkpoint);
-			var result = ReadIndex.ReadAllEventsBackward(pos, 10).EventRecords();
-			Assert.AreEqual(3, result.Count);
-		}
-
-		[Test]
-		public void should_be_able_to_read_all_forwards() {
-			var result = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10).EventRecords();
-			Assert.AreEqual(3, result.Count);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/AllReader/when_reading_from_stream_which_is_disallowed_from_all.cs b/src/EventStore.Core.Tests/Services/Storage/AllReader/when_reading_from_stream_which_is_disallowed_from_all.cs
deleted file mode 100644
index 565146e3caf..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/AllReader/when_reading_from_stream_which_is_disallowed_from_all.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.AllReader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string), "$persistentsubscription-$all::group-checkpoint")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string), "$persistentsubscription-$all::group-parked")]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), "$persistentsubscription-$all::group-checkpoint")]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), "$persistentsubscription-$all::group-parked")]
-	public class when_reading_from_stream_which_is_disallowed_from_all<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private string _stream;
-		public when_reading_from_stream_which_is_disallowed_from_all(string stream) {
-			_stream = stream;
-		}
-
-		protected override void WriteTestScenario() {
-			WriteSingleEvent(_stream, 1, new string('.', 3000), eventId: Guid.NewGuid(),
-				eventType: "event-type-1", retryOnFail: true);
-			WriteSingleEvent(_stream, 2, new string('.', 3000), eventId: Guid.NewGuid(),
-				eventType: "event-type-1", retryOnFail: true);
-		}
-
-		[Test]
-		public void should_be_able_to_read_stream_events_forward() {
-			var result = ReadIndex.ReadStreamEventsForward(_stream, 0L, 10);
-			Assert.AreEqual(2, result.Records.Length);
-		}
-
-		[Test]
-		public void should_be_able_to_read_stream_events_backward() {
-			var result = ReadIndex.ReadStreamEventsBackward(_stream, -1, 10);
-			Assert.AreEqual(2, result.Records.Length);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_duplicate_events_in_a_stream.cs b/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_duplicate_events_in_a_stream.cs
deleted file mode 100644
index 625d0f86900..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_duplicate_events_in_a_stream.cs
+++ /dev/null
@@ -1,245 +0,0 @@
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.DataStructures;
-using EventStore.Core.Helpers;
-using EventStore.Core.Index;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.Util;
-using EventStore.Core.Index.Hashes;
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Caching;
-using EventStore.Core.Data;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Metrics;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.BuildingIndex {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_building_an_index_off_tfile_with_duplicate_events_in_a_stream<TLogFormat, TStreamId>
-		: DuplicateReadIndexTestScenario<TLogFormat, TStreamId> {
-		private Guid _id1;
-		private Guid _id2;
-		private Guid _id3;
-		private Guid _id4;
-
-		private long pos0, pos1, pos2, pos3, pos4, pos5, pos6, pos7;
-
-		public when_building_an_index_off_tfile_with_duplicate_events_in_a_stream() : base(maxEntriesInMemTable: 3) {
-		}
-
-		protected override void SetupDB() {
-			_id1 = Guid.NewGuid();
-			_id2 = Guid.NewGuid();
-			_id3 = Guid.NewGuid();
-
-			_logFormat.StreamNameIndex.GetOrReserve(_logFormat.RecordFactory, "duplicate_stream", 0, out var streamId, out var streamRecord);
-			if (streamRecord != null) {
-				Writer.Write(streamRecord, out pos0);
-			}
-
-			var expectedVersion = ExpectedVersion.NoStream;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			//stream id: duplicate_stream at version: 0
-			Writer.Write(LogRecord.Prepare(_logFormat.RecordFactory, pos0, _id1, _id1, pos0, 0, streamId, expectedVersion++,
-				PrepareFlags.SingleWrite, eventTypeId, new byte[0], new byte[0], DateTime.UtcNow), out pos1);
-			Writer.Write(new CommitLogRecord(pos1, _id1, pos0, DateTime.UtcNow, 0), out pos2);
-
-			//stream id: duplicate_stream at version: 1
-			Writer.Write(LogRecord.Prepare(_logFormat.RecordFactory, pos2, _id2, _id2, pos2, 0, streamId, expectedVersion++,
-				PrepareFlags.SingleWrite, eventTypeId, new byte[0], new byte[0], DateTime.UtcNow), out pos3);
-			Writer.Write(new CommitLogRecord(pos3, _id2, pos2, DateTime.UtcNow, 1), out pos4);
-
-			//stream id: duplicate_stream at version: 2
-			Writer.Write(LogRecord.Prepare(_logFormat.RecordFactory, pos4, _id3, _id3, pos4, 0, streamId, expectedVersion++,
-				PrepareFlags.SingleWrite, eventTypeId, new byte[0], new byte[0], DateTime.UtcNow), out pos5);
-			Writer.Write(new CommitLogRecord(pos5, _id3, pos4, DateTime.UtcNow, 2), out pos6);
-		}
-
-		protected override void Given() {
-			_id4 = Guid.NewGuid();
-			long pos8;
-
-			var streamId = _logFormat.StreamIds.LookupValue("duplicate_stream");
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			//stream id: duplicate_stream at version: 0 (duplicate event/index entry)
-			Writer.Write(LogRecord.Prepare(_logFormat.RecordFactory, pos6, _id4, _id4, pos6, 0, streamId, ExpectedVersion.NoStream,
-				PrepareFlags.SingleWrite, eventTypeId, new byte[0], new byte[0], DateTime.UtcNow), out pos7);
-			Writer.Write(new CommitLogRecord(pos7, _id4, pos6, DateTime.UtcNow, 0), out pos8);
-		}
-
-		[Test]
-		public void should_read_the_correct_last_event_number() {
-			var result = ReadIndex.GetStreamLastEventNumber("duplicate_stream");
-			Assert.AreEqual(2, result);
-		}
-	}
-
-	public abstract class DuplicateReadIndexTestScenario<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		protected readonly int MaxEntriesInMemTable;
-		protected readonly int MetastreamMaxCount;
-		protected readonly bool PerformAdditionalCommitChecks;
-		protected readonly byte IndexBitnessVersion;
-		protected LogFormatAbstractor<TStreamId> _logFormat;
-		protected TFChunkWriter Writer;
-		protected IReadIndex<TStreamId> ReadIndex;
-
-		private TFChunkDb _db;
-		private TableIndex<TStreamId> _tableIndex;
-
-		protected DuplicateReadIndexTestScenario(int maxEntriesInMemTable = 20, int metastreamMaxCount = 1,
-			byte indexBitnessVersion = Opts.IndexBitnessVersionDefault, bool performAdditionalChecks = false) {
-			Ensure.Positive(maxEntriesInMemTable, "maxEntriesInMemTable");
-			MaxEntriesInMemTable = maxEntriesInMemTable;
-			MetastreamMaxCount = metastreamMaxCount;
-			IndexBitnessVersion = indexBitnessVersion;
-			PerformAdditionalCommitChecks = performAdditionalChecks;
-		}
-
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var indexDirectory = GetFilePathFor("index");
-			_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
-				IndexDirectory = indexDirectory,
-			});
-
-			var writerCheckpoint = new InMemoryCheckpoint(0);
-			var chaserCheckpoint = new InMemoryCheckpoint(0);
-
-			var bus = new SynchronousScheduler();
-			new IODispatcher(bus, bus);
-
-			_db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, writerCheckpoint, chaserCheckpoint));
-
-			_db.Open();
-			// create db
-			Writer = new TFChunkWriter(_db);
-			Writer.Open();
-			SetupDB();
-			Writer.Close();
-			Writer = null;
-
-			writerCheckpoint.Flush();
-			chaserCheckpoint.Write(writerCheckpoint.Read());
-			chaserCheckpoint.Flush();
-
-			var readers = new ObjectPool<ITransactionFileReader>("Readers", 2, 5,
-				() => new TFChunkReader(_db, _db.Config.WriterCheckpoint));
-			var lowHasher = _logFormat.LowHasher;
-			var highHasher = _logFormat.HighHasher;
-			var emptyStreamId = _logFormat.EmptyStreamId;
-			_tableIndex = new TableIndex<TStreamId>(indexDirectory, lowHasher, highHasher, emptyStreamId,
-				() => new HashListMemTable(IndexBitnessVersion, MaxEntriesInMemTable * 2),
-				() => new TFReaderLease(readers),
-				IndexBitnessVersion,
-				int.MaxValue,
-				Constants.PTableMaxReaderCountDefault,
-				MaxEntriesInMemTable);
-			_logFormat.StreamNamesProvider.SetTableIndex(_tableIndex);
-
-			var readIndex = new ReadIndex<TStreamId>(new NoopPublisher(),
-				readers,
-				_tableIndex,
-				_logFormat.StreamNameIndexConfirmer,
-				_logFormat.StreamIds,
-				_logFormat.StreamNamesProvider,
-				_logFormat.EmptyStreamId,
-				_logFormat.StreamIdValidator,
-				_logFormat.StreamIdSizer,
-				_logFormat.StreamExistenceFilter,
-				_logFormat.StreamExistenceFilterReader,
-				_logFormat.EventTypeIndexConfirmer,
-				new LRUCache<TStreamId, IndexBackend<TStreamId>.EventNumberCached>("LastEventNumber", 100_000),
-				new LRUCache<TStreamId, IndexBackend<TStreamId>.MetadataCached>("StreamMetadata", 100_000),
-				additionalCommitChecks: PerformAdditionalCommitChecks,
-				metastreamMaxCount: MetastreamMaxCount,
-				hashCollisionReadLimit: Opts.HashCollisionReadLimitDefault,
-				skipIndexScanOnReads: Opts.SkipIndexScanOnReadsDefault,
-				replicationCheckpoint: _db.Config.ReplicationCheckpoint,
-				indexCheckpoint: _db.Config.IndexCheckpoint,
-				indexStatusTracker: new IndexStatusTracker.NoOp(),
-				indexTracker: new IndexTracker.NoOp(),
-				cacheTracker: new CacheHitsMissesTracker.NoOp());
-
-
-			readIndex.IndexCommitter.Init(chaserCheckpoint.Read());
-			ReadIndex = readIndex;
-
-			_tableIndex.Close(false);
-
-			Writer = new TFChunkWriter(_db);
-			Writer.Open();
-			Given();
-			Writer.Close();
-			Writer = null;
-
-			writerCheckpoint.Flush();
-			chaserCheckpoint.Write(writerCheckpoint.Read());
-			chaserCheckpoint.Flush();
-
-			_tableIndex = new TableIndex<TStreamId>(indexDirectory, lowHasher, highHasher, emptyStreamId,
-				() => new HashListMemTable(IndexBitnessVersion, MaxEntriesInMemTable * 2),
-				() => new TFReaderLease(readers),
-				IndexBitnessVersion,
-				int.MaxValue,
-				Constants.PTableMaxReaderCountDefault,
-				MaxEntriesInMemTable);
-
-			readIndex = new ReadIndex<TStreamId>(new NoopPublisher(),
-				readers,
-				_tableIndex,
-				_logFormat.StreamNameIndexConfirmer,
-				_logFormat.StreamIds,
-				_logFormat.StreamNamesProvider,
-				_logFormat.EmptyStreamId,
-				_logFormat.StreamIdValidator,
-				_logFormat.StreamIdSizer,
-				_logFormat.StreamExistenceFilter,
-				_logFormat.StreamExistenceFilterReader,
-				_logFormat.EventTypeIndexConfirmer,
-				new LRUCache<TStreamId, IndexBackend<TStreamId>.EventNumberCached>("LastEventNumber", 100_000),
-				new LRUCache<TStreamId, IndexBackend<TStreamId>.MetadataCached>("StreamMetadata", 100_000),
-				additionalCommitChecks: PerformAdditionalCommitChecks,
-				metastreamMaxCount: MetastreamMaxCount,
-				hashCollisionReadLimit: Opts.HashCollisionReadLimitDefault,
-				skipIndexScanOnReads: Opts.SkipIndexScanOnReadsDefault,
-				replicationCheckpoint: _db.Config.ReplicationCheckpoint,
-				indexCheckpoint: _db.Config.IndexCheckpoint,
-				indexStatusTracker: new IndexStatusTracker.NoOp(),
-				indexTracker: new IndexTracker.NoOp(),
-				cacheTracker: new CacheHitsMissesTracker.NoOp());
-
-			readIndex.IndexCommitter.Init(chaserCheckpoint.Read());
-			ReadIndex = readIndex;
-		}
-
-		public override Task TestFixtureTearDown() {
-			_logFormat?.Dispose();
-			ReadIndex.Close();
-			ReadIndex.Dispose();
-
-			_tableIndex.Close();
-
-			_db.Close();
-			_db.Dispose();
-
-			return base.TestFixtureTearDown();
-		}
-
-		protected abstract void SetupDB();
-		protected abstract void Given();
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_multiple_events_in_a_stream.cs b/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_multiple_events_in_a_stream.cs
deleted file mode 100644
index a2175b2592e..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_multiple_events_in_a_stream.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.BuildingIndex {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_building_an_index_off_tfile_with_multiple_events_in_a_stream<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private Guid _id1;
-		private Guid _id2;
-
-		protected override void WriteTestScenario() {
-			_id1 = Guid.NewGuid();
-			_id2 = Guid.NewGuid();
-			long pos0, pos1, pos2, pos3, pos4;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			GetOrReserve("test1", out var streamId, out pos0);
-
-			Writer.Write(LogRecord.SingleWrite(_recordFactory, pos0, _id1, _id1, streamId, ExpectedVersion.NoStream,
-				eventTypeId, new byte[0], new byte[0], DateTime.UtcNow), out pos1);
-			Writer.Write(LogRecord.SingleWrite(_recordFactory, pos1, _id2, _id2, streamId, 0,
-				eventTypeId, new byte[0], new byte[0]), out pos2);
-			Writer.Write(new CommitLogRecord(pos2, _id1, pos0, DateTime.UtcNow, 0), out pos3);
-			Writer.Write(new CommitLogRecord(pos3, _id2, pos1, DateTime.UtcNow, 1), out pos4);
-		}
-
-		[Test]
-		public void no_event_is_returned_when_nonexistent_stream_is_requested() {
-			var result = ReadIndex.ReadEvent("test2", 0);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void the_first_event_can_be_read() {
-			var result = ReadIndex.ReadEvent("test1", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_id1, result.Record.EventId);
-		}
-
-		[Test]
-		public void the_second_event_can_be_read() {
-			var result = ReadIndex.ReadEvent("test1", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_id2, result.Record.EventId);
-		}
-
-		[Test]
-		public void the_third_event_is_not_found() {
-			var result = ReadIndex.ReadEvent("test1", 2);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void the_last_event_is_returned() {
-			var result = ReadIndex.ReadEvent("test1", -1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_id2, result.Record.EventId);
-		}
-
-		[Test]
-		public void the_stream_can_be_read_with_two_events_in_right_order_when_starting_from_specified_event_number() {
-			var result = ReadIndex.ReadStreamEventsBackward("test1", 1, 10);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-
-			Assert.AreEqual(_id1, result.Records[1].EventId);
-			Assert.AreEqual(_id2, result.Records[0].EventId);
-		}
-
-		[Test]
-		public void the_stream_can_be_read_with_two_events_backward_from_end() {
-			var result = ReadIndex.ReadStreamEventsBackward("test1", -1, 10);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-
-			Assert.AreEqual(_id1, result.Records[1].EventId);
-			Assert.AreEqual(_id2, result.Records[0].EventId);
-		}
-
-		[Test]
-		public void the_stream_returns_events_with_correct_pagination() {
-			var result = ReadIndex.ReadStreamEventsBackward("test1", 0, 10);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-
-			Assert.AreEqual(_id1, result.Records[0].EventId);
-		}
-
-		[Test]
-		public void the_stream_returns_nothing_for_nonexistent_page() {
-			var result = ReadIndex.ReadStreamEventsBackward("test1", 100, 10);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void no_events_are_return_if_event_stream_doesnt_exist() {
-			var result = ReadIndex.ReadStreamEventsBackward("test2", 0, 10);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.IsNotNull(result.Records);
-			Assert.IsEmpty(result.Records);
-		}
-
-		[Test]
-		public void read_all_events_forward_returns_all_events_in_correct_order() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10).EventRecords();
-
-			Assert.AreEqual(2, records.Count);
-			Assert.AreEqual(_id1, records[0].Event.EventId);
-			Assert.AreEqual(_id2, records[1].Event.EventId);
-		}
-
-		[Test]
-		public void read_all_events_backward_returns_all_events_in_correct_order() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 10).EventRecords();
-
-			Assert.AreEqual(2, records.Count);
-			Assert.AreEqual(_id1, records[1].Event.EventId);
-			Assert.AreEqual(_id2, records[0].Event.EventId);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_non_zero_capacity.cs b/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_non_zero_capacity.cs
deleted file mode 100644
index 00b8fece58f..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_non_zero_capacity.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using EventStore.Core.Services;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.BuildingIndex {
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_building_an_index_off_tfile_with_non_zero_capacity<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		public when_building_an_index_off_tfile_with_non_zero_capacity() : base(streamInfoCacheCapacity: 20) {
-		}
-
-		protected override void WriteTestScenario() {
-			GetOrReserve("test1", out _, out _);
-			GetOrReserve("test2", out _, out _);
-			GetOrReserve("test3", out _, out _);
-		}
-
-		[Test]
-		public void the_stream_created_records_can_be_read() {
-			var records = ReadIndex.ReadStreamEventsForward(SystemStreams.StreamsCreatedStream, 0, 20).Records;
-			Assert.AreEqual(3, records.Length);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_and_commits.cs b/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_and_commits.cs
deleted file mode 100644
index a892fc61ee6..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_and_commits.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.BuildingIndex {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_building_an_index_off_tfile_with_prepares_and_commits<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private Guid _id1;
-		private Guid _id2;
-		private Guid _id3;
-
-		protected override void WriteTestScenario() {
-			_id1 = Guid.NewGuid();
-			_id2 = Guid.NewGuid();
-			_id3 = Guid.NewGuid();
-			long pos0, pos1, pos2, pos3, pos4, pos5, pos6;
-			GetOrReserve("test1", out var streamId1, out _);
-			GetOrReserve("test2", out var streamId2, out pos0);
-			var expectedVersion1 = ExpectedVersion.NoStream;
-			var expectedVersion2 = ExpectedVersion.NoStream;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			Writer.Write(LogRecord.Prepare(_logFormat.RecordFactory, pos0, _id1, _id1, pos0, 0, streamId1, expectedVersion1++,
-					PrepareFlags.SingleWrite, eventTypeId, new byte[0], new byte[0], DateTime.UtcNow),
-				out pos1);
-			Writer.Write(LogRecord.Prepare(_logFormat.RecordFactory, pos1, _id2, _id2, pos1, 0, streamId2, expectedVersion2++,
-					PrepareFlags.SingleWrite, eventTypeId, new byte[0], new byte[0], DateTime.UtcNow),
-				out pos2);
-			Writer.Write(LogRecord.Prepare(_logFormat.RecordFactory, pos2, _id3, _id3, pos2, 0, streamId2, expectedVersion2++,
-					PrepareFlags.SingleWrite, eventTypeId, new byte[0], new byte[0], DateTime.UtcNow),
-				out pos3);
-			Writer.Write(new CommitLogRecord(pos3, _id1, pos0, DateTime.UtcNow, 0), out pos4);
-			Writer.Write(new CommitLogRecord(pos4, _id2, pos1, DateTime.UtcNow, 0), out pos5);
-			Writer.Write(new CommitLogRecord(pos5, _id3, pos2, DateTime.UtcNow, 1), out pos6);
-		}
-
-		[Test]
-		public void the_first_event_can_be_read() {
-			var result = ReadIndex.ReadEvent("test1", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_id1, result.Record.EventId);
-		}
-
-		[Test]
-		public void the_nonexisting_event_can_not_be_read() {
-			var result = ReadIndex.ReadEvent("test1", 1);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void the_second_event_can_be_read() {
-			var result = ReadIndex.ReadEvent("test2", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_id2, result.Record.EventId);
-		}
-
-		[Test]
-		public void the_last_event_of_first_stream_can_be_read() {
-			var result = ReadIndex.ReadEvent("test1", -1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_id1, result.Record.EventId);
-		}
-
-		[Test]
-		public void the_last_event_of_second_stream_can_be_read() {
-			var result = ReadIndex.ReadEvent("test2", -1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_id3, result.Record.EventId);
-		}
-
-		[Test]
-		public void the_last_event_of_nonexistent_stream_cant_be_read() {
-			var result = ReadIndex.ReadEvent("test7", -1);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void the_stream_can_be_read_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("test1", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_id1, result.Records[0].EventId);
-		}
-
-		[Test]
-		public void the_stream_can_be_read_for_second_stream_from_end() {
-			var result = ReadIndex.ReadStreamEventsBackward("test2", -1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_id3, result.Records[0].EventId);
-		}
-
-		[Test]
-		public void the_stream_can_be_read_for_second_stream_from_event_number() {
-			var result = ReadIndex.ReadStreamEventsBackward("test2", 1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_id3, result.Records[0].EventId);
-		}
-
-		[Test]
-		public void read_all_events_forward_returns_all_events_in_correct_order() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10).EventRecords();
-
-			Assert.AreEqual(3, records.Count);
-			Assert.AreEqual(_id1, records[0].Event.EventId);
-			Assert.AreEqual(_id2, records[1].Event.EventId);
-			Assert.AreEqual(_id3, records[2].Event.EventId);
-		}
-
-		[Test]
-		public void read_all_events_backward_returns_all_events_in_correct_order() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 10).EventRecords();
-
-			Assert.AreEqual(3, records.Count);
-			Assert.AreEqual(_id1, records[2].Event.EventId);
-			Assert.AreEqual(_id2, records[1].Event.EventId);
-			Assert.AreEqual(_id3, records[0].Event.EventId);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_and_commits_for_events_with_version_numbers_greater_than_int_maxvalue.cs b/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_and_commits_for_events_with_version_numbers_greater_than_int_maxvalue.cs
deleted file mode 100644
index 57c0c5a2a4a..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_and_commits_for_events_with_version_numbers_greater_than_int_maxvalue.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.BuildingIndex {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_building_an_index_off_tfile_with_prepares_and_commits_for_events_with_version_numbers_greater_than_int_maxvalue<TLogFormat, TStreamId>
-		: ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private Guid _id1;
-		private Guid _id2;
-		private Guid _id3;
-
-		private long firstEventNumber = (long)int.MaxValue + 1;
-		private long secondEventNumber = (long)int.MaxValue + 2;
-		private long thirdEventNumber = (long)int.MaxValue + 3;
-
-		protected override void WriteTestScenario() {
-			_id1 = Guid.NewGuid();
-			_id2 = Guid.NewGuid();
-			_id3 = Guid.NewGuid();
-			long pos0, pos1, pos2, pos3, pos4, pos5, pos6;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			GetOrReserve("test1", out var test1StreamId, out _);
-			GetOrReserve("test2", out var test2StreamId, out pos0);
-
-			Writer.Write(LogRecord.SingleWrite(_recordFactory, pos0, _id1, _id1, test1StreamId, firstEventNumber,
-				eventTypeId, new byte[0], new byte[0], DateTime.UtcNow), out pos1);
-			Writer.Write(LogRecord.SingleWrite(_recordFactory, pos1, _id2, _id2, test2StreamId, secondEventNumber,
-				eventTypeId, new byte[0], new byte[0], DateTime.UtcNow), out pos2);
-			Writer.Write(LogRecord.SingleWrite(_recordFactory, pos2, _id3, _id3, test2StreamId, thirdEventNumber,
-				eventTypeId, new byte[0], new byte[0], DateTime.UtcNow), out pos3);
-			Writer.Write(new CommitLogRecord(pos3, _id1, pos0, DateTime.UtcNow, firstEventNumber), out pos4);
-			Writer.Write(new CommitLogRecord(pos4, _id2, pos1, DateTime.UtcNow, secondEventNumber), out pos5);
-			Writer.Write(new CommitLogRecord(pos5, _id3, pos2, DateTime.UtcNow, thirdEventNumber), out pos6);
-		}
-
-		[Test]
-		public void the_first_event_can_be_read() {
-			var result = ReadIndex.ReadEvent("test1", firstEventNumber);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_id1, result.Record.EventId);
-		}
-
-		[Test]
-		public void the_nonexisting_event_can_not_be_read() {
-			var result = ReadIndex.ReadEvent("test1", firstEventNumber + 1);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void the_second_event_can_be_read() {
-			var result = ReadIndex.ReadEvent("test2", secondEventNumber);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_id2, result.Record.EventId);
-		}
-
-		[Test]
-		public void the_last_event_of_first_stream_can_be_read() {
-			var result = ReadIndex.ReadEvent("test1", -1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_id1, result.Record.EventId);
-		}
-
-		[Test]
-		public void the_last_event_of_second_stream_can_be_read() {
-			var result = ReadIndex.ReadEvent("test2", -1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_id3, result.Record.EventId);
-		}
-
-		[Test]
-		public void the_stream_can_be_read_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("test1", firstEventNumber, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_id1, result.Records[0].EventId);
-		}
-
-		[Test]
-		public void the_stream_can_be_read_for_second_stream_from_end() {
-			var result = ReadIndex.ReadStreamEventsBackward("test2", -1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_id3, result.Records[0].EventId);
-		}
-
-		[Test]
-		public void the_stream_can_be_read_for_second_stream_from_event_number() {
-			var result = ReadIndex.ReadStreamEventsBackward("test2", thirdEventNumber, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_id3, result.Records[0].EventId);
-		}
-
-		[Test]
-		public void read_all_events_forward_returns_all_events_in_correct_order() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10).EventRecords();
-
-			Assert.AreEqual(3, records.Count);
-			Assert.AreEqual(_id1, records[0].Event.EventId);
-			Assert.AreEqual(_id2, records[1].Event.EventId);
-			Assert.AreEqual(_id3, records[2].Event.EventId);
-		}
-
-		[Test]
-		public void read_all_events_backward_returns_all_events_in_correct_order() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 10).EventRecords();
-
-			Assert.AreEqual(3, records.Count);
-			Assert.AreEqual(_id1, records[2].Event.EventId);
-			Assert.AreEqual(_id2, records[1].Event.EventId);
-			Assert.AreEqual(_id3, records[0].Event.EventId);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_and_commits_for_log_records_of_mixed_versions.cs b/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_and_commits_for_log_records_of_mixed_versions.cs
deleted file mode 100644
index cde4fa1ff00..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_and_commits_for_log_records_of_mixed_versions.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.BuildingIndex {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Not applicable")]
-	public class
-		when_building_an_index_off_tfile_with_prepares_and_commits_for_log_records_of_mixed_versions<TLogFormat, TStreamId> :
-			ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private Guid _id1;
-		private Guid _id2;
-		private Guid _id3;
-
-		protected override void WriteTestScenario() {
-			_id1 = Guid.NewGuid();
-			_id2 = Guid.NewGuid();
-			_id3 = Guid.NewGuid();
-			long pos1, pos2, pos3, pos4, pos5, pos6;
-			Writer.Write(new PrepareLogRecord(0, _id1, _id1, 0, 0, "test1", null, 0, DateTime.UtcNow,
-					PrepareFlags.SingleWrite, "type", null, new byte[0], new byte[0], LogRecordVersion.LogRecordV0),
-				out pos1);
-			Writer.Write(new PrepareLogRecord(pos1, _id2, _id2, pos1, 0, "test2", null, 0, DateTime.UtcNow,
-					PrepareFlags.SingleWrite, "type", null, new byte[0], new byte[0], LogRecordVersion.LogRecordV0),
-				out pos2);
-			Writer.Write(new PrepareLogRecord(pos2, _id3, _id3, pos2, 0, "test2", null, 1, DateTime.UtcNow,
-					PrepareFlags.SingleWrite, "type", null, new byte[0], new byte[0]),
-				out pos3);
-			Writer.Write(new CommitLogRecord(pos3, _id1, 0, DateTime.UtcNow, 0, LogRecordVersion.LogRecordV0),
-				out pos4);
-			Writer.Write(new CommitLogRecord(pos4, _id2, pos1, DateTime.UtcNow, 0, LogRecordVersion.LogRecordV0),
-				out pos5);
-			Writer.Write(new CommitLogRecord(pos5, _id3, pos2, DateTime.UtcNow, 1), out pos6);
-		}
-
-		[Test]
-		public void the_first_event_can_be_read() {
-			var result = ReadIndex.ReadEvent("test1", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_id1, result.Record.EventId);
-		}
-
-		[Test]
-		public void the_nonexisting_event_can_not_be_read() {
-			var result = ReadIndex.ReadEvent("test1", 1);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void the_second_event_can_be_read() {
-			var result = ReadIndex.ReadEvent("test2", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_id2, result.Record.EventId);
-		}
-
-		[Test]
-		public void the_last_event_of_first_stream_can_be_read() {
-			var result = ReadIndex.ReadEvent("test1", -1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_id1, result.Record.EventId);
-		}
-
-		[Test]
-		public void the_last_event_of_second_stream_can_be_read() {
-			var result = ReadIndex.ReadEvent("test2", -1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_id3, result.Record.EventId);
-		}
-
-		[Test]
-		public void the_stream_can_be_read_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("test1", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_id1, result.Records[0].EventId);
-		}
-
-		[Test]
-		public void the_stream_can_be_read_for_second_stream_from_end() {
-			var result = ReadIndex.ReadStreamEventsBackward("test2", -1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_id3, result.Records[0].EventId);
-		}
-
-		[Test]
-		public void the_stream_can_be_read_for_second_stream_from_event_number() {
-			var result = ReadIndex.ReadStreamEventsBackward("test2", 1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_id3, result.Records[0].EventId);
-		}
-
-		[Test]
-		public void read_all_events_forward_returns_all_events_in_correct_order() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10).Records;
-
-			Assert.AreEqual(3, records.Count);
-			Assert.AreEqual(_id1, records[0].Event.EventId);
-			Assert.AreEqual(_id2, records[1].Event.EventId);
-			Assert.AreEqual(_id3, records[2].Event.EventId);
-		}
-
-		[Test]
-		public void read_all_events_backward_returns_all_events_in_correct_order() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 10).Records;
-
-			Assert.AreEqual(3, records.Count);
-			Assert.AreEqual(_id1, records[2].Event.EventId);
-			Assert.AreEqual(_id2, records[1].Event.EventId);
-			Assert.AreEqual(_id3, records[0].Event.EventId);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_but_no_commits.cs b/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_but_no_commits.cs
deleted file mode 100644
index d51e8fcebd3..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_but_no_commits.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.BuildingIndex {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_building_an_index_off_tfile_with_prepares_but_no_commits<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		protected override void WriteTestScenario() {
-			GetOrReserve("test1", out var streamId1, out _);
-			GetOrReserve("test2", out var streamId2, out _);
-			GetOrReserve("test3", out var streamId3, out var p0);
-
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			
-			long p1;
-			Writer.Write(LogRecord.Prepare(_logFormat.RecordFactory, p0, Guid.NewGuid(), Guid.NewGuid(), p0, 0, streamId1, -1,
-					PrepareFlags.SingleWrite, eventTypeId, new byte[0], new byte[0], DateTime.UtcNow),
-				out p1);
-			long p2;
-			Writer.Write(LogRecord.Prepare(_logFormat.RecordFactory, p1, Guid.NewGuid(), Guid.NewGuid(), p1, 0, streamId2, -1,
-					PrepareFlags.SingleWrite, eventTypeId, new byte[0], new byte[0], DateTime.UtcNow),
-				out p2);
-			long p3;
-			Writer.Write(LogRecord.Prepare(_logFormat.RecordFactory, p2, Guid.NewGuid(), Guid.NewGuid(), p2, 0, streamId3, -1,
-					PrepareFlags.SingleWrite, eventTypeId, new byte[0], new byte[0], DateTime.UtcNow),
-				out p3);
-		}
-
-		[Test]
-		public void the_first_stream_is_not_in_index_yet() {
-			var result = ReadIndex.ReadEvent("test1", 0);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void the_second_stream_is_not_in_index_yet() {
-			var result = ReadIndex.ReadEvent("test2", 0);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void the_last_event_is_not_returned_for_stream() {
-			var result = ReadIndex.ReadEvent("test2", -1);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void read_all_events_forward_returns_no_events() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10).EventRecords();
-			Assert.AreEqual(0, records.Count);
-		}
-
-		[Test]
-		public void read_all_events_backward_returns_no_events() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 10).EventRecords();
-			Assert.AreEqual(0, records.Count);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_two_events_in_stream.cs b/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_two_events_in_stream.cs
deleted file mode 100644
index 3d0d0d8050d..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_two_events_in_stream.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.BuildingIndex {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_building_an_index_off_tfile_with_two_events_in_stream<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private Guid _id1;
-		private Guid _id2;
-
-		private IPrepareLogRecord<TStreamId> _prepare1;
-		private IPrepareLogRecord<TStreamId> _prepare2;
-
-		protected override void WriteTestScenario() {
-			_id1 = Guid.NewGuid();
-			_id2 = Guid.NewGuid();
-
-			long pos0, pos1, pos2, pos3, pos4;
-			GetOrReserve("test1", out var streamId1, out pos0);
-			GetOrReserveEventType("eventType", out var eventTypeId, out pos0);
-			_prepare1 = LogRecord.SingleWrite(_recordFactory, pos0, _id1, _id1, streamId1, ExpectedVersion.NoStream, eventTypeId, new byte[0], new byte[0]);
-			Writer.Write(_prepare1, out pos1);
-			_prepare2 = LogRecord.SingleWrite(_recordFactory, pos1, _id2, _id2, streamId1, 0, eventTypeId, new byte[0], new byte[0]);
-			Writer.Write(_prepare2, out pos2);
-			Writer.Write(new CommitLogRecord(pos2, _id1, pos0, DateTime.UtcNow, 0), out pos3);
-			Writer.Write(new CommitLogRecord(pos3, _id2, pos1, DateTime.UtcNow, 1), out pos4);
-		}
-
-		[Test]
-		public void the_first_event_can_be_read() {
-			var result = ReadIndex.ReadEvent("test1", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(new EventRecord(0, _prepare1, "test1", "eventType"), result.Record);
-		}
-
-		[Test]
-		public void the_second_event_can_be_read() {
-			var result = ReadIndex.ReadEvent("test1", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(new EventRecord(1, _prepare2, "test1", "eventType"), result.Record);
-		}
-
-		[Test]
-		public void the_nonexisting_event_can_not_be_read() {
-			var result = ReadIndex.ReadEvent("test1", 2);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-		}
-
-		[Test]
-		public void the_last_event_can_be_read_and_is_correct() {
-			var result = ReadIndex.ReadEvent("test1", -1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(new EventRecord(1, _prepare2, "test1", "eventType"), result.Record);
-		}
-
-		[Test]
-		public void the_first_event_can_be_read_through_range_query() {
-			var result = ReadIndex.ReadStreamEventsBackward("test1", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(new EventRecord(0, _prepare1, "test1", "eventType"), result.Records[0]);
-		}
-
-		[Test]
-		public void the_second_event_can_be_read_through_range_query() {
-			var result = ReadIndex.ReadStreamEventsBackward("test1", 1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(new EventRecord(1, _prepare2, "test1", "eventType"), result.Records[0]);
-		}
-
-		[Test]
-		public void the_stream_can_be_read_as_a_whole_with_specific_from_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("test1", 1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(new EventRecord(1, _prepare2, "test1", "eventType"), result.Records[0]);
-			Assert.AreEqual(new EventRecord(0, _prepare1, "test1", "eventType"), result.Records[1]);
-		}
-
-		[Test]
-		public void the_stream_can_be_read_as_a_whole_with_from_end() {
-			var result = ReadIndex.ReadStreamEventsBackward("test1", -1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(new EventRecord(1, _prepare2, "test1", "eventType"), result.Records[0]);
-			Assert.AreEqual(new EventRecord(0, _prepare1, "test1", "eventType"), result.Records[1]);
-		}
-
-		[Test]
-		public void the_stream_cant_be_read_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("test2", 0, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void read_all_events_forward_returns_all_events_in_correct_order() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10).EventRecords();
-
-			Assert.AreEqual(2, records.Count);
-			Assert.AreEqual(_id1, records[0].Event.EventId);
-			Assert.AreEqual(_id2, records[1].Event.EventId);
-		}
-
-		[Test]
-		public void read_all_events_backward_returns_all_events_in_correct_order() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 10).EventRecords();
-
-			Assert.AreEqual(2, records.Count);
-			Assert.AreEqual(_id1, records[1].Event.EventId);
-			Assert.AreEqual(_id2, records[0].Event.EventId);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/ByLengthHasher.cs b/src/EventStore.Core.Tests/Services/Storage/ByLengthHasher.cs
deleted file mode 100644
index 1ae1709a848..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/ByLengthHasher.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using EventStore.Core.Index.Hashes;
-
-namespace EventStore.Core.Tests.Services.Storage {
-	public class ByLengthHasher : IHasher<string> {
-		public uint Hash(string s) {
-			return (uint)s.Length;
-		}
-
-		public uint Hash(byte[] data) {
-			return (uint)data.Length;
-		}
-
-		public uint Hash(byte[] data, int offset, uint len, uint seed) {
-			return len;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Chaser/when_chaser_reads_commit_event.cs b/src/EventStore.Core.Tests/Services/Storage/Chaser/when_chaser_reads_commit_event.cs
deleted file mode 100644
index bb41e559902..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Chaser/when_chaser_reads_commit_event.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.Chaser {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_chaser_reads_commit_event<TLogFormat, TStreamId> : with_storage_chaser_service<TLogFormat, TStreamId> {
-		private long _logPosition;
-		private Guid _eventId;
-		private Guid _transactionId;
-
-		public override void When() {
-			_eventId = Guid.NewGuid();
-			_transactionId = Guid.NewGuid();
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			var record = LogRecord.Prepare(
-				factory: recordFactory,
-				logPosition: 0,
-				eventId: _eventId,
-				correlationId: _transactionId,
-				transactionPos: 0xDEAD,
-				transactionOffset: 0xBEEF,
-				eventStreamId: streamId,
-				expectedVersion: 1234,
-				timeStamp: new DateTime(2012, 12, 21),
-				flags: PrepareFlags.Data,
-				eventType: eventTypeId,
-				data: new byte[] { 1, 2, 3, 4, 5 },
-				metadata: new byte[] { 7, 17 });
-			Assert.True(Writer.Write(record, out _logPosition));
-			Writer.Flush();
-
-			IndexCommitter.AddPendingPrepare(new[]{ record},_logPosition);
-			var record2 = new CommitLogRecord(
-				logPosition: _logPosition,
-				correlationId: _transactionId,
-				transactionPosition: 0,
-				timeStamp: new DateTime(2012, 12, 21),
-				firstEventNumber: 10);
-
-			Assert.True(Writer.Write(record2, out _logPosition));
-			Writer.Flush();
-		}
-		[Test]
-		public void commit_ack_should_be_published() {
-			AssertEx.IsOrBecomesTrue(() => CommitAcks.Count == 1, msg: "CommitAck msg not received");
-			Assert.True(CommitAcks.TryDequeue(out var commitAck));
-			Assert.AreEqual(_transactionId, commitAck.CorrelationId);
-		}
-
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Chaser/when_chaser_reads_committed_prepare_event.cs b/src/EventStore.Core.Tests/Services/Storage/Chaser/when_chaser_reads_committed_prepare_event.cs
deleted file mode 100644
index a5804aab7fa..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Chaser/when_chaser_reads_committed_prepare_event.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.Chaser {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_chaser_reads_committed_prepare_event<TLogFormat, TStreamId> : with_storage_chaser_service<TLogFormat, TStreamId> {
-		private Guid _eventId;
-		private Guid _transactionId;
-
-		public override void When() {
-			_eventId = Guid.NewGuid();
-			_transactionId = Guid.NewGuid();
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			var record = LogRecord.Prepare(
-				factory: recordFactory,
-				logPosition: 0,
-				eventId: _eventId,
-				correlationId: _transactionId,
-				transactionPos: 0xDEAD,
-				transactionOffset: 0xBEEF,
-				eventStreamId: streamId,
-				expectedVersion: 1234,
-				timeStamp: new DateTime(2012, 12, 21),
-				flags:   PrepareFlags.IsCommitted | PrepareFlags.TransactionEnd,
-				eventType: eventTypeId,
-				data: new byte[] { 1, 2, 3, 4, 5 },
-				metadata: new byte[] { 7, 17 });
-
-			Assert.True(Writer.Write(record, out _));
-			Writer.Flush();
-		}
-		[Test]
-		public void commit_ack_should_be_published() {
-			AssertEx.IsOrBecomesTrue(() => CommitAcks.Count >= 1, msg: "CommitAck msg not received");
-			Assert.True(CommitAcks.TryDequeue(out var commitAck));
-			Assert.AreEqual(_transactionId, commitAck.CorrelationId);
-
-		}
-
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Chaser/when_chaser_reads_prepare_event.cs b/src/EventStore.Core.Tests/Services/Storage/Chaser/when_chaser_reads_prepare_event.cs
deleted file mode 100644
index d972919ed2b..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Chaser/when_chaser_reads_prepare_event.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.Chaser {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_chaser_reads_prepare_event<TLogFormat, TStreamId> : with_storage_chaser_service<TLogFormat, TStreamId> {
-		private Guid _eventId;
-		private Guid _transactionId;
-
-		public override void When() {
-			_eventId = Guid.NewGuid();
-			_transactionId = Guid.NewGuid();
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			var record = LogRecord.Prepare(
-				factory: recordFactory,
-				logPosition: 0,
-				eventId: _eventId,
-				correlationId: _transactionId,
-				transactionPos: 0xDEAD,
-				transactionOffset: 0xBEEF,
-				eventStreamId: streamId,
-				expectedVersion: 1234,
-				timeStamp: new DateTime(2012, 12, 21),
-				flags: PrepareFlags.SingleWrite,
-				eventType: eventTypeId,
-				data: new byte[] { 1, 2, 3, 4, 5 },
-				metadata: new byte[] { 7, 17 });
-
-			Assert.True(Writer.Write(record, out _));
-			Writer.Flush();
-		}
-		[Test]
-		public void prepare_ack_should_be_published() {
-			AssertEx.IsOrBecomesTrue(() => PrepareAcks.Count == 1, msg: "PrepareAck msg not received");
-			Assert.True(PrepareAcks.TryDequeue(out var prepareAck));
-			Assert.AreEqual(_transactionId, prepareAck.CorrelationId);
-
-		}
-
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Chaser/when_chaser_reads_system_event.cs b/src/EventStore.Core.Tests/Services/Storage/Chaser/when_chaser_reads_system_event.cs
deleted file mode 100644
index f1788580789..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Chaser/when_chaser_reads_system_event.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.Chaser {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_chaser_reads_system_event<TLogFormat, TStreamId> : with_storage_chaser_service<TLogFormat, TStreamId> {
-		private Guid _epochId;
-		private int _epochNumber;
-
-		public override void When() {
-			_epochId = Guid.NewGuid();
-			_epochNumber = 7;
-			var epoch = new EpochRecord(0, _epochNumber, _epochId, -1, DateTime.UtcNow, Guid.Empty);
-			var rec = new SystemLogRecord(epoch.EpochPosition, epoch.TimeStamp, SystemRecordType.Epoch,
-				SystemRecordSerialization.Json, epoch.AsSerialized());
-
-			Assert.True(Writer.Write(rec, out _));
-			Writer.Flush();
-		}
-		[Test]
-		public void epoch_should_be_updated() {
-			AssertEx.IsOrBecomesTrue(() => EpochManager.GetLastEpoch() != null);
-			Assert.AreEqual(_epochId, EpochManager.GetLastEpoch().EpochId);
-			Assert.AreEqual(_epochNumber, EpochManager.GetLastEpoch().EpochNumber);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Chaser/with_storage_chaser_service.cs b/src/EventStore.Core.Tests/Services/Storage/Chaser/with_storage_chaser_service.cs
deleted file mode 100644
index bef1ac7d3f5..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Chaser/with_storage_chaser_service.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Storage;
-using EventStore.Core.Services.Storage.EpochManager;
-using EventStore.Core.Tests.Services.ElectionsService;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.Chaser {
-	public abstract class with_storage_chaser_service<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		readonly ICheckpoint _writerChk = new InMemoryCheckpoint(Checkpoint.Writer);
-		readonly ICheckpoint _chaserChk = new InMemoryCheckpoint(Checkpoint.Chaser);
-		readonly ICheckpoint _epochChk = new InMemoryCheckpoint(Checkpoint.Epoch, initValue: -1);
-		readonly ICheckpoint _proposalChk = new InMemoryCheckpoint(Checkpoint.Proposal, initValue: -1);
-		readonly ICheckpoint _truncateChk = new InMemoryCheckpoint(Checkpoint.Truncate, initValue: -1);
-		readonly ICheckpoint _replicationCheckpoint = new InMemoryCheckpoint(-1);
-		readonly ICheckpoint _indexCheckpoint = new InMemoryCheckpoint(-1);
-		readonly ICheckpoint _streamExistenceFilterCheckpoint = new InMemoryCheckpoint(-1);
-
-		protected SynchronousScheduler Publisher = new("publisher");
-		protected StorageChaser<TStreamId> Service;
-		protected FakeIndexCommitterService<TStreamId> IndexCommitter;
-		protected IEpochManager EpochManager;
-		protected TFChunkDb Db;
-		protected TFChunkChaser Chaser;
-		protected TFChunkWriter Writer;
-
-		protected ConcurrentQueue<StorageMessage.PrepareAck> PrepareAcks = new ConcurrentQueue<StorageMessage.PrepareAck>();
-		protected ConcurrentQueue<StorageMessage.CommitAck> CommitAcks = new ConcurrentQueue<StorageMessage.CommitAck>();
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			Db = new TFChunkDb(CreateDbConfig());
-			Db.Open();
-			Chaser = new TFChunkChaser(Db, _writerChk, _chaserChk, false);
-			Chaser.Open();
-			Writer = new TFChunkWriter(Db);
-			Writer.Open();
-
-			IndexCommitter = new FakeIndexCommitterService<TStreamId>();
-			EpochManager = new FakeEpochManager();
-
-			Service = new StorageChaser<TStreamId>(
-				Publisher,
-				_writerChk,
-				Chaser,
-				IndexCommitter,
-				EpochManager,
-				new QueueStatsManager());
-
-			Service.Handle(new SystemMessage.SystemStart());
-			Service.Handle(new SystemMessage.SystemInit());
-
-			Publisher.Subscribe(new AdHocHandler<StorageMessage.CommitAck>(CommitAcks.Enqueue));
-			Publisher.Subscribe(new AdHocHandler<StorageMessage.PrepareAck>(PrepareAcks.Enqueue));
-
-			When();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			await base.TestFixtureTearDown();
-			Service.Handle(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), true, true));
-		}
-
-
-		public abstract void When();
-
-		private TFChunkDbConfig CreateDbConfig() {
-
-			var nodeConfig = new TFChunkDbConfig(
-				PathName,
-				new VersionedPatternFileNamingStrategy(PathName, "chunk-"),
-				1000,
-				10000,
-				_writerChk,
-				_chaserChk,
-				_epochChk,
-				_proposalChk,
-				_truncateChk,
-				_replicationCheckpoint,
-				_indexCheckpoint,
-				_streamExistenceFilterCheckpoint,
-				true);
-			return nodeConfig;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_few_prepares_and_committing_one.cs b/src/EventStore.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_few_prepares_and_committing_one.cs
deleted file mode 100644
index 73ccd33802c..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_few_prepares_and_committing_one.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.CheckCommitStartingAt {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class when_writing_few_prepares_and_committing_one<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private IPrepareLogRecord _prepare0;
-		private IPrepareLogRecord _prepare1;
-		private IPrepareLogRecord _prepare2;
-
-		protected override void WriteTestScenario() {
-			_prepare0 = WritePrepare("ES", expectedVersion: -1);
-			_prepare1 = WritePrepare("ES", expectedVersion: 0);
-			_prepare2 = WritePrepare("ES", expectedVersion: 1);
-			WriteCommit(_prepare0.LogPosition, "ES", eventNumber: 0);
-		}
-
-		[Test]
-		public void check_commmit_on_2nd_prepare_should_return_ok_decision() {
-			var res = ReadIndex.IndexWriter.CheckCommitStartingAt(_prepare1.LogPosition,
-				WriterCheckpoint.ReadNonFlushed());
-
-			Assert.AreEqual(CommitDecision.Ok, res.Decision);
-			Assert.AreEqual("ES", res.EventStreamId);
-			Assert.AreEqual(0, res.CurrentVersion);
-			Assert.AreEqual(-1, res.StartEventNumber);
-			Assert.AreEqual(-1, res.EndEventNumber);
-		}
-
-		[Test]
-		public void check_commmit_on_3rd_prepare_should_return_wrong_expected_version() {
-			var res = ReadIndex.IndexWriter.CheckCommitStartingAt(_prepare2.LogPosition,
-				WriterCheckpoint.ReadNonFlushed());
-
-			Assert.AreEqual(CommitDecision.WrongExpectedVersion, res.Decision);
-			Assert.AreEqual("ES", res.EventStreamId);
-			Assert.AreEqual(0, res.CurrentVersion);
-			Assert.AreEqual(-1, res.StartEventNumber);
-			Assert.AreEqual(-1, res.EndEventNumber);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_few_prepares_with_same_expected_version_and_committing_one_of_them.cs b/src/EventStore.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_few_prepares_with_same_expected_version_and_committing_one_of_them.cs
deleted file mode 100644
index 6042748f764..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_few_prepares_with_same_expected_version_and_committing_one_of_them.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.CheckCommitStartingAt {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class
-		when_writing_few_prepares_with_same_expected_version_and_committing_one_of_them<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private IPrepareLogRecord _prepare0;
-		private IPrepareLogRecord _prepare1;
-		private IPrepareLogRecord _prepare2;
-
-		protected override void WriteTestScenario() {
-			_prepare0 = WritePrepare("ES", expectedVersion: -1);
-			_prepare1 = WritePrepare("ES", expectedVersion: -1);
-			_prepare2 = WritePrepare("ES", expectedVersion: -1);
-			WriteCommit(_prepare1.LogPosition, "ES", eventNumber: 0);
-		}
-
-		[Test]
-		public void other_prepares_cannot_be_committed() {
-			var res = ReadIndex.IndexWriter.CheckCommitStartingAt(_prepare0.LogPosition,
-				WriterCheckpoint.ReadNonFlushed());
-
-			Assert.AreEqual(CommitDecision.WrongExpectedVersion, res.Decision);
-			Assert.AreEqual("ES", res.EventStreamId);
-			Assert.AreEqual(0, res.CurrentVersion);
-			Assert.AreEqual(-1, res.StartEventNumber);
-			Assert.AreEqual(-1, res.EndEventNumber);
-
-			res = ReadIndex.IndexWriter.CheckCommitStartingAt(_prepare2.LogPosition, WriterCheckpoint.ReadNonFlushed());
-
-			Assert.AreEqual(CommitDecision.WrongExpectedVersion, res.Decision);
-			Assert.AreEqual("ES", res.EventStreamId);
-			Assert.AreEqual(0, res.CurrentVersion);
-			Assert.AreEqual(-1, res.StartEventNumber);
-			Assert.AreEqual(-1, res.EndEventNumber);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_few_prepares_with_same_expected_version_and_not_committing_them.cs b/src/EventStore.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_few_prepares_with_same_expected_version_and_not_committing_them.cs
deleted file mode 100644
index 790a3e95ef8..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_few_prepares_with_same_expected_version_and_not_committing_them.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.CheckCommitStartingAt {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_writing_few_prepares_with_same_expected_version_and_not_committing_them<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private IPrepareLogRecord _prepare0;
-		private IPrepareLogRecord _prepare1;
-		private IPrepareLogRecord _prepare2;
-
-		protected override void WriteTestScenario() {
-			_prepare0 = WritePrepare("ES", -1);
-			_prepare1 = WritePrepare("ES", -1);
-			_prepare2 = WritePrepare("ES", -1);
-		}
-
-		[Test]
-		public void every_prepare_can_be_commited() {
-			var res = ReadIndex.IndexWriter.CheckCommitStartingAt(_prepare0.LogPosition,
-				WriterCheckpoint.ReadNonFlushed());
-
-			var streamId = _logFormat.StreamIds.LookupValue("ES");
-
-			Assert.AreEqual(CommitDecision.Ok, res.Decision);
-			Assert.AreEqual(streamId, res.EventStreamId);
-			Assert.AreEqual(-1, res.CurrentVersion);
-			Assert.AreEqual(-1, res.StartEventNumber);
-			Assert.AreEqual(-1, res.EndEventNumber);
-
-			res = ReadIndex.IndexWriter.CheckCommitStartingAt(_prepare1.LogPosition, WriterCheckpoint.ReadNonFlushed());
-
-			Assert.AreEqual(CommitDecision.Ok, res.Decision);
-			Assert.AreEqual(streamId, res.EventStreamId);
-			Assert.AreEqual(-1, res.CurrentVersion);
-			Assert.AreEqual(-1, res.StartEventNumber);
-			Assert.AreEqual(-1, res.EndEventNumber);
-
-			res = ReadIndex.IndexWriter.CheckCommitStartingAt(_prepare2.LogPosition, WriterCheckpoint.ReadNonFlushed());
-
-			Assert.AreEqual(CommitDecision.Ok, res.Decision);
-			Assert.AreEqual(streamId, res.EventStreamId);
-			Assert.AreEqual(-1, res.CurrentVersion);
-			Assert.AreEqual(-1, res.StartEventNumber);
-			Assert.AreEqual(-1, res.EndEventNumber);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_prepares_in_wrong_order_and_committing_in_right_order.cs b/src/EventStore.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_prepares_in_wrong_order_and_committing_in_right_order.cs
deleted file mode 100644
index 8b6b3460b18..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_prepares_in_wrong_order_and_committing_in_right_order.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.CheckCommitStartingAt {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class when_writing_prepares_in_wrong_order_and_committing_in_right_order<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private IPrepareLogRecord _prepare0;
-		private IPrepareLogRecord _prepare1;
-		private IPrepareLogRecord _prepare2;
-		private IPrepareLogRecord _prepare3;
-		private IPrepareLogRecord _prepare4;
-
-		protected override void WriteTestScenario() {
-			_prepare0 = WritePrepare("ES", expectedVersion: -1);
-			_prepare1 = WritePrepare("ES", expectedVersion: 2);
-			_prepare2 = WritePrepare("ES", expectedVersion: 0);
-			_prepare3 = WritePrepare("ES", expectedVersion: 1);
-			_prepare4 = WritePrepare("ES", expectedVersion: 3);
-			WriteCommit(_prepare0.LogPosition, "ES", eventNumber: 0);
-			WriteCommit(_prepare2.LogPosition, "ES", eventNumber: 1);
-			WriteCommit(_prepare3.LogPosition, "ES", eventNumber: 2);
-		}
-
-		[Test]
-		public void check_commmit_on_expected_prepare_should_return_ok_decision() {
-			var res = ReadIndex.IndexWriter.CheckCommitStartingAt(_prepare1.LogPosition,
-				WriterCheckpoint.ReadNonFlushed());
-
-			Assert.AreEqual(CommitDecision.Ok, res.Decision);
-			Assert.AreEqual("ES", res.EventStreamId);
-			Assert.AreEqual(2, res.CurrentVersion);
-			Assert.AreEqual(-1, res.StartEventNumber);
-			Assert.AreEqual(-1, res.EndEventNumber);
-		}
-
-		[Test]
-		public void check_commmit_on_not_expected_prepare_should_return_wrong_expected_version() {
-			var res = ReadIndex.IndexWriter.CheckCommitStartingAt(_prepare4.LogPosition,
-				WriterCheckpoint.ReadNonFlushed());
-
-			Assert.AreEqual(CommitDecision.WrongExpectedVersion, res.Decision);
-			Assert.AreEqual("ES", res.EventStreamId);
-			Assert.AreEqual(2, res.CurrentVersion);
-			Assert.AreEqual(-1, res.StartEventNumber);
-			Assert.AreEqual(-1, res.EndEventNumber);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_single_prepare.cs b/src/EventStore.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_single_prepare.cs
deleted file mode 100644
index 3b9f26ac9c7..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_single_prepare.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.CheckCommitStartingAt {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_writing_single_prepare<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private IPrepareLogRecord _prepare;
-
-		protected override void WriteTestScenario() {
-			_prepare = WritePrepare("ES", -1);
-		}
-
-		[Test]
-		public void check_commmit_should_return_ok_decision() {
-			var res = ReadIndex.IndexWriter.CheckCommitStartingAt(_prepare.LogPosition,
-				WriterCheckpoint.ReadNonFlushed());
-
-			var streamId = _logFormat.StreamIds.LookupValue("ES");
-
-			Assert.AreEqual(CommitDecision.Ok, res.Decision);
-			Assert.AreEqual(streamId, res.EventStreamId);
-			Assert.AreEqual(-1, res.CurrentVersion);
-			Assert.AreEqual(-1, res.StartEventNumber);
-			Assert.AreEqual(-1, res.EndEventNumber);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/ChunkBoundary/when_writing_events_at_chunk_boundary.cs b/src/EventStore.Core.Tests/Services/Storage/ChunkBoundary/when_writing_events_at_chunk_boundary.cs
deleted file mode 100644
index 93aaac04971..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/ChunkBoundary/when_writing_events_at_chunk_boundary.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.ChunkBoundary;
-
-// Note: this test does not verify the behaviour of the StorageWriterService.
-// It only verifies if TFChunkWriter works properly.
-
-[TestFixture(typeof(LogFormat.V2), typeof(string))]
-[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-public class when_writing_events_at_chunk_boundary<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-	private long _writerChk;
-
-	protected override void WriteTestScenario() {
-		WriteSingleEvent("ES", 0, new string('.', 4000));
-		WriteSingleEvent("ES", 1, new string('.', 4000));
-		WriteSingleEvent("ES", 2, new string('.', 4000), retryOnFail: true); // chunk 1
-
-		// verify that the writer is in the correct chunk
-		var chunk = WriterCheckpoint.ReadNonFlushed() / Db.Config.ChunkSize;
-		Assert.AreEqual(1, chunk);
-
-		_writerChk = WriterCheckpoint.Read();
-	}
-
-	[Test]
-	public void writer_checkpoint_is_flushed() {
-		Assert.AreEqual(Db.Config.ChunkSize, _writerChk);
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/deleting_stream_tests_1.cs b/src/EventStore.Core.Tests/Services/Storage/DeletingStream/deleting_stream_tests_1.cs
deleted file mode 100644
index 2cc9a3e8482..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/deleting_stream_tests_1.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.DeletingStream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_deleting_stream_spanning_through_multiple_chunks_and_1_stream_with_same_hash_and_1_stream_with_different_hash_read_index_should<TLogFormat, TStreamId>
-		: ReadIndexTestScenario<TLogFormat, TStreamId> {
-		protected override void WriteTestScenario() {
-			WriteSingleEvent("ES1", 0, new string('.', 3000));
-			WriteSingleEvent("ES1", 1, new string('.', 3000));
-			WriteSingleEvent("ES2", 0, new string('.', 3000));
-
-			WriteSingleEvent("ES", 0, new string('.', 3000), retryOnFail: true); // chunk 2
-			WriteSingleEvent("ES", 1, new string('.', 3000));
-			WriteSingleEvent("ES1", 2, new string('.', 3000));
-
-			WriteSingleEvent("ES2", 1, new string('.', 3000), retryOnFail: true); // chunk 3
-			WriteSingleEvent("ES1", 3, new string('.', 3000));
-			WriteSingleEvent("ES1", 4, new string('.', 3000));
-
-			WriteSingleEvent("ES2", 2, new string('.', 3000), retryOnFail: true); // chunk 4
-			WriteSingleEvent("ES", 2, new string('.', 3000));
-			WriteSingleEvent("ES", 3, new string('.', 3000));
-
-			WriteDelete("ES1");
-		}
-
-		[Test]
-		public void indicate_that_stream_is_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("ES1"));
-		}
-
-		[Test]
-		public void indicate_that_nonexisting_stream_with_same_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("XXX"), Is.False);
-		}
-
-		[Test]
-		public void indicate_that_nonexisting_stream_with_different_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("XXXX"), Is.False);
-		}
-
-		[Test]
-		public void indicate_that_existing_stream_with_same_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("ES2"), Is.False);
-		}
-
-		[Test]
-		public void indicate_that_existing_stream_with_different_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("ES"), Is.False);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/deleting_stream_tests_2.cs b/src/EventStore.Core.Tests/Services/Storage/DeletingStream/deleting_stream_tests_2.cs
deleted file mode 100644
index b659eece806..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/deleting_stream_tests_2.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.DeletingStream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_deleting_streams_with_different_hashes_spanning_through_multiple_chunks_in_db_with_1_stream_with_same_hash_read_index_should<TLogFormat, TStreamId> :
-			ReadIndexTestScenario<TLogFormat, TStreamId> {
-		protected override void WriteTestScenario() {
-			WriteSingleEvent("ES1", 0, new string('.', 3000));
-			WriteSingleEvent("ES1", 1, new string('.', 3000));
-			WriteSingleEvent("ES2", 0, new string('.', 3000));
-
-			WriteSingleEvent("ES", 0, new string('.', 3000), retryOnFail: true); // chunk 2
-			WriteSingleEvent("ES", 1, new string('.', 3000));
-			WriteSingleEvent("ES1", 2, new string('.', 3000));
-
-			WriteSingleEvent("ES2", 1, new string('.', 3000), retryOnFail: true); // chunk 3
-			WriteSingleEvent("ES1", 3, new string('.', 3000));
-			WriteSingleEvent("ES1", 4, new string('.', 3000));
-
-			WriteSingleEvent("ES2", 2, new string('.', 3000), retryOnFail: true); // chunk 4
-			WriteSingleEvent("ES", 2, new string('.', 3000));
-			WriteSingleEvent("ES", 3, new string('.', 2500));
-
-			WriteDelete("ES1");
-			WriteDelete("ES");
-		}
-
-		[Test]
-		public void indicate_that_streams_are_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("ES1"));
-			Assert.That(ReadIndex.IsStreamDeleted("ES"));
-		}
-
-		[Test]
-		public void indicate_that_nonexisting_streams_with_same_hashes_are_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("XXX"), Is.False);
-			Assert.That(ReadIndex.IsStreamDeleted("XX"), Is.False);
-		}
-
-		[Test]
-		public void indicate_that_nonexisting_stream_with_different_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("XXXX"), Is.False);
-		}
-
-		[Test]
-		public void indicate_that_existing_stream_with_different_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("ES2"), Is.False);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/deleting_stream_tests_3.cs b/src/EventStore.Core.Tests/Services/Storage/DeletingStream/deleting_stream_tests_3.cs
deleted file mode 100644
index fe65e5bd08d..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/deleting_stream_tests_3.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.DeletingStream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_deleting_streams_with_same_hash_spanning_through_multiple_chunks_in_db_with_1_stream_with_different_hash_read_index_should<TLogFormat, TStreamId> :
-			ReadIndexTestScenario<TLogFormat, TStreamId> {
-		protected override void WriteTestScenario() {
-			WriteSingleEvent("ES1", 0, new string('.', 3000));
-			WriteSingleEvent("ES1", 1, new string('.', 3000));
-			WriteSingleEvent("ES2", 0, new string('.', 3000));
-
-			WriteSingleEvent("ES", 0, new string('.', 3000), retryOnFail: true); // chunk 2
-			WriteSingleEvent("ES", 1, new string('.', 3000));
-			WriteSingleEvent("ES1", 2, new string('.', 3000));
-
-			WriteSingleEvent("ES2", 1, new string('.', 3000), retryOnFail: true); // chunk 3
-			WriteSingleEvent("ES1", 3, new string('.', 3000));
-			WriteSingleEvent("ES1", 4, new string('.', 3000));
-
-			WriteSingleEvent("ES2", 2, new string('.', 3000), retryOnFail: true); // chunk 4
-			WriteSingleEvent("ES", 2, new string('.', 3000));
-			WriteSingleEvent("ES", 3, new string('.', 2500));
-
-			WriteDelete("ES1");
-			WriteDelete("ES2");
-		}
-
-		[Test]
-		public void indicate_that_streams_are_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("ES1"));
-			Assert.That(ReadIndex.IsStreamDeleted("ES2"));
-		}
-
-		[Test]
-		public void indicate_that_nonexisting_stream_with_same_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("XXX"), Is.False);
-		}
-
-		[Test]
-		public void indicate_that_nonexisting_stream_with_different_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("XXXX"), Is.False);
-		}
-
-		[Test]
-		public void indicate_that_existing_stream_with_different_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("ES"), Is.False);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/is_stream_deleted_should.cs b/src/EventStore.Core.Tests/Services/Storage/DeletingStream/is_stream_deleted_should.cs
deleted file mode 100644
index c12e104c53e..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/is_stream_deleted_should.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.DeletingStream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class is_stream_deleted_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		protected override void WriteTestScenario() {
-		}
-
-		[Test]
-		public void crash_on_null_stream_argument() {
-			Assert.Throws<ArgumentNullException>(() => ReadIndex.IsStreamDeleted(null));
-		}
-
-		[Test]
-		public void throw_on_empty_stream_argument() {
-			Assert.Throws<ArgumentNullException>(() => ReadIndex.IsStreamDeleted(string.Empty));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_spanning_through_multiple_chunks_in_db_with_other_streams_read_index_should.cs b/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_spanning_through_multiple_chunks_in_db_with_other_streams_read_index_should.cs
deleted file mode 100644
index 937c2227ca1..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_spanning_through_multiple_chunks_in_db_with_other_streams_read_index_should.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.DeletingStream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_deleting_stream_spanning_through_multiple_chunks_in_db_with_other_streams_read_index_should<TLogFormat, TStreamId> :
-			ReadIndexTestScenario<TLogFormat, TStreamId> {
-		protected override void WriteTestScenario() {
-			WriteSingleEvent("ES1", 0, new string('.', 3000));
-			WriteSingleEvent("ES1", 1, new string('.', 3000));
-			WriteSingleEvent("ES2", 0, new string('.', 3000));
-
-			WriteSingleEvent("ES", 0, new string('.', 3000), retryOnFail: true); // chunk 2
-			WriteSingleEvent("ES", 1, new string('.', 3000));
-			WriteSingleEvent("ES1", 2, new string('.', 3000));
-
-			WriteSingleEvent("ES2", 1, new string('.', 3000), retryOnFail: true); // chunk 3
-			WriteSingleEvent("ES1", 3, new string('.', 3000));
-			WriteSingleEvent("ES1", 4, new string('.', 3000));
-
-			WriteSingleEvent("ES2", 2, new string('.', 3000), retryOnFail: true); // chunk 4
-			WriteSingleEvent("ES", 2, new string('.', 3000));
-			WriteSingleEvent("ES", 3, new string('.', 3000));
-
-			WriteDelete("ES1");
-		}
-
-		[Test]
-		public void indicate_that_stream_is_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("ES1"));
-		}
-
-		[Test]
-		public void indicate_that_nonexisting_stream_with_same_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("XXX"), Is.False);
-		}
-
-		[Test]
-		public void indicate_that_nonexisting_stream_with_different_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("XXXX"), Is.False);
-		}
-
-		[Test]
-		public void indicate_that_existing_stream_with_same_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("ES2"), Is.False);
-		}
-
-		[Test]
-		public void indicate_that_existing_stream_with_different_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("ES"), Is.False);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_spanning_through_multiple_chunks_read_index_should.cs b/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_spanning_through_multiple_chunks_read_index_should.cs
deleted file mode 100644
index 43cc2120b9b..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_spanning_through_multiple_chunks_read_index_should.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.DeletingStream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_deleting_stream_spanning_through_multiple_chunks_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		protected override void WriteTestScenario() {
-			WriteSingleEvent("ES", 0, new string('.', 3000));
-			WriteSingleEvent("ES", 1, new string('.', 3000));
-			WriteSingleEvent("ES", 2, new string('.', 3000));
-			WriteSingleEvent("ES", 3, new string('.', 3000), retryOnFail: true); // chunk 2
-			WriteSingleEvent("ES", 4, new string('.', 3000));
-			WriteSingleEvent("ES", 5, new string('.', 3000));
-			WriteSingleEvent("ES", 6, new string('.', 3000), retryOnFail: true); // chunk 3
-
-			WriteDelete("ES");
-		}
-
-		[Test]
-		public void indicate_that_stream_is_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("ES"));
-		}
-
-		[Test]
-		public void indicate_that_nonexisting_stream_with_same_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("ZZ"), Is.False);
-		}
-
-		[Test]
-		public void indicate_that_nonexisting_stream_with_different_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("XXX"), Is.False);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_with_1_hash_collision_and_1_stream_with_other_hash_read_index_should.cs b/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_with_1_hash_collision_and_1_stream_with_other_hash_read_index_should.cs
deleted file mode 100644
index 97d745d4e9b..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_with_1_hash_collision_and_1_stream_with_other_hash_read_index_should.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.DeletingStream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_deleting_stream_with_1_hash_collision_and_1_stream_with_other_hash_read_index_should<TLogFormat, TStreamId> :
-			ReadIndexTestScenario<TLogFormat, TStreamId> {
-		protected override void WriteTestScenario() {
-			WriteSingleEvent("S1", 0, "bla1");
-			WriteSingleEvent("S1", 1, "bla1");
-			WriteSingleEvent("S2", 0, "bla1");
-			WriteSingleEvent("S2", 1, "bla1");
-			WriteSingleEvent("S1", 2, "bla1");
-			WriteSingleEvent("SSS", 0, "bla1");
-
-			WriteDelete("S1");
-		}
-
-		[Test]
-		public void indicate_that_stream_is_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("S1"));
-		}
-
-		[Test]
-		public void indicate_that_other_stream_with_same_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("S2"), Is.False);
-		}
-
-		[Test]
-		public void indicate_that_other_stream_with_different_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("SSS"), Is.False);
-		}
-
-		[Test]
-		public void indicate_that_not_existing_stream_with_same_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("XX"), Is.False);
-		}
-
-		[Test]
-		public void indicate_that_not_existing_stream_with_different_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("XXX"), Is.False);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_with_2_hash_collisions_and_mixed_order_read_index_should.cs b/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_with_2_hash_collisions_and_mixed_order_read_index_should.cs
deleted file mode 100644
index 0b9efe2e3bf..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_with_2_hash_collisions_and_mixed_order_read_index_should.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.DeletingStream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_deleting_stream_with_2_hash_collisions_and_mixed_order_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		protected override void WriteTestScenario() {
-			WriteSingleEvent("S1", 0, "bla1");
-			WriteSingleEvent("S1", 1, "bla1");
-			WriteSingleEvent("S2", 0, "bla1");
-			WriteSingleEvent("S2", 1, "bla1");
-			WriteSingleEvent("S1", 2, "bla1");
-			WriteSingleEvent("S3", 0, "bla1");
-
-			WriteDelete("S1");
-		}
-
-		[Test]
-		public void indicate_that_stream_is_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("S1"));
-		}
-
-		[Test]
-		public void indicate_that_other_streams_with_same_hash_are_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("S2"), Is.False);
-			Assert.That(ReadIndex.IsStreamDeleted("S3"), Is.False);
-		}
-
-		[Test]
-		public void indicate_that_not_existing_stream_with_same_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("XX"), Is.False);
-		}
-
-		[Test]
-		public void indicate_that_not_existing_stream_with_different_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("XXX"), Is.False);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_with_version_numbers_greater_than_int_maxvalue.cs b/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_with_version_numbers_greater_than_int_maxvalue.cs
deleted file mode 100644
index c49a3a5f879..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_with_version_numbers_greater_than_int_maxvalue.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.DeletingStream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_deleting_stream_with_version_numbers_greater_than_int_maxvalue<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		long firstEventNumber = (long)int.MaxValue + 1;
-		long secondEventNumber = (long)int.MaxValue + 2;
-		long thirdEventNumber = (long)int.MaxValue + 3;
-
-		protected override void WriteTestScenario() {
-			WriteSingleEvent("ES", firstEventNumber, new string('.', 3000));
-			WriteSingleEvent("KEEP", firstEventNumber, new string('.', 3000));
-			WriteSingleEvent("KEEP", secondEventNumber, new string('.', 3000));
-			WriteSingleEvent("ES", secondEventNumber, new string('.', 3000), retryOnFail: true);
-			WriteSingleEvent("KEEP", thirdEventNumber, new string('.', 3000));
-			WriteSingleEvent("ES", thirdEventNumber, new string('.', 3000));
-
-			WriteDelete("ES");
-		}
-
-		[Test]
-		public void indicate_that_stream_is_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("ES"));
-		}
-
-		[Test]
-		public void indicate_that_other_stream_is_not_deleted() {
-			Assert.IsFalse(ReadIndex.IsStreamDeleted("KEEP"));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_deleting_the_only_existing_stream_in_db_read_index_should.cs b/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_deleting_the_only_existing_stream_in_db_read_index_should.cs
deleted file mode 100644
index e02d3a96020..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_deleting_the_only_existing_stream_in_db_read_index_should.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.DeletingStream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_deleting_the_only_existing_stream_in_db_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		protected override void WriteTestScenario() {
-			WriteSingleEvent("ES", 0, "bla1");
-
-			WriteDelete("ES");
-		}
-
-		[Test]
-		public void indicate_that_stream_is_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("ES"));
-		}
-
-		[Test]
-		public void indicate_that_nonexisting_stream_with_same_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("ZZ"), Is.False);
-		}
-
-		[Test]
-		public void indicate_that_nonexisting_stream_with_different_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("XXX"), Is.False);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_hard_deleting_stream.cs b/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_hard_deleting_stream.cs
deleted file mode 100644
index d8ecbad3eb7..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_hard_deleting_stream.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using NUnit.Framework;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.Services;
-using System;
-using EventStore.Core.TransactionLog;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.LogCommon;
-
-namespace EventStore.Core.Tests.Services.Storage.DeletingStream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_hard_deleting_stream<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		protected override void WriteTestScenario() {
-			WriteSingleEvent("ES1", 0, new string('.', 3000));
-			WriteSingleEvent("ES1", 1, new string('.', 3000));
-			WriteDelete("ES1");
-		}
-
-		[Test]
-		public async Task should_change_expected_version_to_deleted_event_number_when_reading() {
-			var chunk = Db.Manager.GetChunk(0);
-			var chunkRecords = new List<ILogRecord>();
-			RecordReadResult result = await chunk.TryReadFirst(CancellationToken.None);
-			while (result.Success) {
-				chunkRecords.Add(result.LogRecord);
-				result = chunk.TryReadClosestForward(result.NextPosition);
-			}
-
-			Assert.That(chunkRecords.Any(x =>
-				x.RecordType == LogRecordType.Commit && ((CommitLogRecord)x).FirstEventNumber == long.MaxValue));
-			Assert.That(chunkRecords.Any(x =>
-				x.RecordType == LogRecordType.Prepare && ((IPrepareLogRecord<TStreamId>)x).ExpectedVersion == long.MaxValue - 1));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_hard_deleting_stream_with_log_version_0.cs b/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_hard_deleting_stream_with_log_version_0.cs
deleted file mode 100644
index e2dbdb6d354..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_hard_deleting_stream_with_log_version_0.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using NUnit.Framework;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.Services;
-using System;
-using EventStore.Core.TransactionLog;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.LogCommon;
-
-namespace EventStore.Core.Tests.Services.Storage.DeletingStream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "No such thing as a V0 prepare in LogV3")]
-	public class when_hard_deleting_stream_with_log_version_0<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-
-		protected override void WriteTestScenario() {
-			WriteSingleEvent("ES1", 0, new string('.', 3000));
-			WriteSingleEvent("ES1", 1, new string('.', 3000));
-
-			WriteV0HardDelete("ES1");
-		}
-
-		private void WriteV0HardDelete(string eventStreamId) {
-			long pos;
-			var logPosition = Writer.Position;
-			var prepare = new PrepareLogRecord(logPosition, Guid.NewGuid(), Guid.NewGuid(), logPosition, 0,
-				eventStreamId, null,
-				int.MaxValue - 1, DateTime.UtcNow,
-				PrepareFlags.StreamDelete | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-				SystemEventTypes.StreamDeleted, null,
-				new byte[0], new byte[0],
-				prepareRecordVersion: LogRecordVersion.LogRecordV0);
-			Writer.Write(prepare, out pos);
-
-			var commit = new CommitLogRecord(pos, prepare.CorrelationId,
-				prepare.LogPosition, DateTime.UtcNow, int.MaxValue,
-				commitRecordVersion: LogRecordVersion.LogRecordV0);
-			Writer.Write(commit, out pos);
-		}
-
-		[Test]
-		public async Task should_change_expected_version_to_deleted_event_number_when_reading() {
-			var chunk = Db.Manager.GetChunk(0);
-			var chunkRecords = new List<ILogRecord>();
-			RecordReadResult result = await chunk.TryReadFirst(CancellationToken.None);
-			while (result.Success) {
-				chunkRecords.Add(result.LogRecord);
-				result = chunk.TryReadClosestForward(result.NextPosition);
-			}
-
-			Assert.That(chunkRecords.Any(x =>
-				x.RecordType == LogRecordType.Commit && ((CommitLogRecord)x).FirstEventNumber == long.MaxValue));
-			Assert.That(chunkRecords.Any(x =>
-				x.RecordType == LogRecordType.Prepare && ((PrepareLogRecord)x).ExpectedVersion == long.MaxValue - 1));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_reading_deleted_stream.cs b/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_reading_deleted_stream.cs
deleted file mode 100644
index 3f7662396bc..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_reading_deleted_stream.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Services;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.DeletingStream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_reading_deleted_stream<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private Guid _id1;
-		private Guid _id2;
-		private Guid _id3;
-		private Guid _deleteId;
-
-		protected override void WriteTestScenario() {
-			_id1 = Guid.NewGuid();
-			_id2 = Guid.NewGuid();
-			_id3 = Guid.NewGuid();
-			_deleteId = Guid.NewGuid();
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			GetOrReserve("ES", out var streamId, out var pos0);
-			long pos1, pos2, pos3;
-			Writer.Write(LogRecord.SingleWrite(_recordFactory, pos0, _id1, _id1, streamId, ExpectedVersion.NoStream,
-				eventTypeId, new byte[0], new byte[0], DateTime.UtcNow, PrepareFlags.IsCommitted), out pos1);
-			Writer.Write(LogRecord.SingleWrite(_recordFactory, pos1, _id2, _id2, streamId, 0,
-				eventTypeId, new byte[0], new byte[0], DateTime.UtcNow, PrepareFlags.IsCommitted), out pos2);
-			Writer.Write(LogRecord.SingleWrite(_recordFactory, pos2, _id3, _id3, streamId, 1,
-				eventTypeId, new byte[0], new byte[0], DateTime.UtcNow, PrepareFlags.IsCommitted), out pos3);
-			Writer.Write(LogRecord.DeleteTombstone(_recordFactory, pos3, _deleteId, _deleteId, streamId,
-				eventTypeId, EventNumber.DeletedStream - 1, PrepareFlags.IsCommitted), out _);
-		}
-
-		[Test]
-		public void the_stream_is_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("ES"));
-		}
-
-		[Test]
-		public void the_last_event_number_is_deleted_stream() {
-			Assert.AreEqual(EventNumber.DeletedStream, ReadIndex.GetStreamLastEventNumber("ES"));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_reading_deleted_stream_written_with_old_log_record_version.cs b/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_reading_deleted_stream_written_with_old_log_record_version.cs
deleted file mode 100644
index 43f3d74b10a..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_reading_deleted_stream_written_with_old_log_record_version.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Services;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.DeletingStream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "No such thing as a V0 prepare in LogV3")]
-	public class when_reading_deleted_stream_written_with_old_log_record_version<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private Guid _id1;
-		private Guid _id2;
-		private Guid _id3;
-		private Guid _deleteId;
-
-		protected override void WriteTestScenario() {
-			_id1 = Guid.NewGuid();
-			_id2 = Guid.NewGuid();
-			_id3 = Guid.NewGuid();
-			_deleteId = Guid.NewGuid();
-
-			long pos1, pos2, pos3, pos4, pos5, pos6, pos7, pos8;
-			Writer.Write(new PrepareLogRecord(0, _id1, _id1, 0, 0, "ES", null, 0, DateTime.UtcNow,
-					PrepareFlags.SingleWrite, "type", null, new byte[0], new byte[0], LogRecordVersion.LogRecordV0),
-				out pos1);
-			Writer.Write(new PrepareLogRecord(pos1, _id2, _id2, pos1, 0, "ES", null, 1, DateTime.UtcNow,
-					PrepareFlags.SingleWrite, "type", null, new byte[0], new byte[0], LogRecordVersion.LogRecordV0),
-				out pos2);
-			Writer.Write(new PrepareLogRecord(pos2, _id3, _id3, pos2, 0, "ES", null, 2, DateTime.UtcNow,
-					PrepareFlags.SingleWrite, "type", null, new byte[0], new byte[0]),
-				out pos3);
-			Writer.Write(new CommitLogRecord(pos3, _id1, 0, DateTime.UtcNow, 0, LogRecordVersion.LogRecordV0),
-				out pos4);
-			Writer.Write(new CommitLogRecord(pos4, _id2, pos1, DateTime.UtcNow, 1, LogRecordVersion.LogRecordV0),
-				out pos5);
-			Writer.Write(new CommitLogRecord(pos5, _id3, pos2, DateTime.UtcNow, 2, LogRecordVersion.LogRecordV0),
-				out pos6);
-
-
-			Writer.Write(new PrepareLogRecord(pos6, _deleteId, _deleteId, pos6, 0, "ES", null, int.MaxValue - 1,
-					DateTime.UtcNow,
-					PrepareFlags.StreamDelete | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
-					PrepareFlags.None,
-					SystemEventTypes.StreamDeleted, null, Empty.ByteArray, Empty.ByteArray, LogRecordVersion.LogRecordV0),
-				out pos7);
-			Writer.Write(
-				new CommitLogRecord(pos7, _deleteId, pos6, DateTime.UtcNow, int.MaxValue - 1,
-					LogRecordVersion.LogRecordV0), out pos8);
-		}
-
-		[Test]
-		public void the_stream_is_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("ES"));
-		}
-
-		[Test]
-		public void the_last_event_number_is_deleted_stream() {
-			Assert.AreEqual(EventNumber.DeletedStream, ReadIndex.GetStreamLastEventNumber("ES"));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_writing_delete_prepare_but_no_commit_read_index_should.cs b/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_writing_delete_prepare_but_no_commit_read_index_should.cs
deleted file mode 100644
index 7ab46d7121e..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_writing_delete_prepare_but_no_commit_read_index_should.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.DeletingStream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_writing_delete_prepare_but_no_commit_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _event0;
-		private EventRecord _event1;
-
-		protected override void WriteTestScenario() {
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			_event0 = WriteSingleEvent("ES", 0, "bla1");
-			Assert.True(_logFormat.StreamNameIndex.GetOrReserve("ES", out var esStreamId, out _, out _));
-			var prepare = LogRecord.DeleteTombstone(_recordFactory, Writer.Position, Guid.NewGuid(), Guid.NewGuid(),
-				esStreamId, eventTypeId, 1);
-			long pos;
-			Assert.IsTrue(Writer.Write(prepare, out pos));
-
-			_event1 = WriteSingleEvent("ES", 1, "bla1");
-		}
-
-		[Test]
-		public void indicate_that_stream_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("ES"), Is.False);
-		}
-
-		[Test]
-		public void indicate_that_nonexisting_stream_with_same_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("ZZ"), Is.False);
-		}
-
-		[Test]
-		public void indicate_that_nonexisting_stream_with_different_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("XXX"), Is.False);
-		}
-
-		[Test]
-		public void read_single_events_should_return_commited_records() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_event0, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_event1, result.Record);
-		}
-
-		[Test]
-		public void read_stream_events_forward_should_return_commited_records() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_event0, result.Records[0]);
-			Assert.AreEqual(_event1, result.Records[1]);
-		}
-
-		[Test]
-		public void read_stream_events_backward_should_return_commited_records() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_event0, result.Records[1]);
-			Assert.AreEqual(_event1, result.Records[0]);
-		}
-
-		[Test]
-		public void read_all_forward_should_return_all_stream_records_except_uncommited() {
-			var events = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(2, events.Length);
-			Assert.AreEqual(_event0, events[0]);
-			Assert.AreEqual(_event1, events[1]);
-		}
-
-		[Test]
-		public void read_all_backward_should_return_all_stream_records_except_uncommited() {
-			var events = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(2, events.Length);
-			Assert.AreEqual(_event1, events[0]);
-			Assert.AreEqual(_event0, events[1]);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_writing_few_prepares_on_same_event_number_and_commiting_delete_on_this_version_read_index_should.cs b/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_writing_few_prepares_on_same_event_number_and_commiting_delete_on_this_version_read_index_should.cs
deleted file mode 100644
index 121768c32ec..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/when_writing_few_prepares_on_same_event_number_and_commiting_delete_on_this_version_read_index_should.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.DeletingStream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_writing_few_prepares_with_same_event_number_and_commiting_delete_on_this_version_read_index_should<TLogFormat, TStreamId> :
-			ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _deleteTombstone;
-
-		protected override void WriteTestScenario() {
-			long pos;
-			string stream = "ES";
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			GetOrReserve(stream, out var streamId, out pos);
-			GetOrReserveEventType(SystemEventTypes.StreamDeleted, out var streamDeletedEventTypeId, out pos);
-
-			var prepare1 = LogRecord.SingleWrite(_recordFactory, pos, // prepare1
-				Guid.NewGuid(),
-				Guid.NewGuid(),
-				streamId,
-				-1,
-				eventTypeId,
-				LogRecord.NoData,
-				null,
-				DateTime.UtcNow);
-			Assert.IsTrue(Writer.Write(prepare1, out pos));
-
-			var prepare2 = LogRecord.SingleWrite(_recordFactory, pos, // prepare2
-				Guid.NewGuid(),
-				Guid.NewGuid(),
-				streamId,
-				-1,
-				eventTypeId,
-				LogRecord.NoData,
-				null,
-				DateTime.UtcNow);
-			Assert.IsTrue(Writer.Write(prepare2, out pos));
-
-
-			var deletePrepare = LogRecord.DeleteTombstone(_recordFactory, pos, // delete prepare
-				Guid.NewGuid(), Guid.NewGuid(), streamId, streamDeletedEventTypeId, -1);
-			_deleteTombstone = new EventRecord(EventNumber.DeletedStream, deletePrepare, stream, SystemEventTypes.StreamDeleted);
-			Assert.IsTrue(Writer.Write(deletePrepare, out pos));
-
-			var prepare3 = LogRecord.SingleWrite(_recordFactory, pos, // prepare3
-				Guid.NewGuid(),
-				Guid.NewGuid(),
-				streamId,
-				-1,
-				eventTypeId,
-				LogRecord.NoData,
-				null,
-				DateTime.UtcNow);
-			Assert.IsTrue(Writer.Write(prepare3, out pos));
-
-			var commit = LogRecord.Commit(pos, // committing delete
-				deletePrepare.CorrelationId,
-				deletePrepare.LogPosition,
-				EventNumber.DeletedStream);
-			Assert.IsTrue(Writer.Write(commit, out pos));
-		}
-
-		[Test]
-		public void indicate_that_stream_is_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("ES"));
-		}
-
-		[Test]
-		public void indicate_that_nonexisting_stream_with_same_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("ZZ"), Is.False);
-		}
-
-		[Test]
-		public void indicate_that_nonexisting_stream_with_different_hash_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("XXX"), Is.False);
-		}
-
-		[Test]
-		public void read_single_events_with_number_0_should_return_stream_deleted() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.StreamDeleted, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void read_single_events_with_number_1_should_return_stream_deleted() {
-			var result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.StreamDeleted, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void read_stream_events_forward_should_return_stream_deleted() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void read_stream_events_backward_should_return_stream_deleted() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void read_all_forward_should_return_all_stream_records_except_uncommited() {
-			var events = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(1, events.Length);
-			Assert.AreEqual(_deleteTombstone, events[0]);
-		}
-
-		[Test]
-		public void read_all_backward_should_return_all_stream_records_except_uncommited() {
-			var events = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(1, events.Length);
-			Assert.AreEqual(_deleteTombstone, events[0]);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/with_empty_db_read_index_should.cs b/src/EventStore.Core.Tests/Services/Storage/DeletingStream/with_empty_db_read_index_should.cs
deleted file mode 100644
index 503039372d2..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/DeletingStream/with_empty_db_read_index_should.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.DeletingStream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_empty_db_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		protected override void WriteTestScenario() {
-		}
-
-		[Test]
-		public void indicate_that_any_stream_is_not_deleted() {
-			Assert.That(ReadIndex.IsStreamDeleted("X"), Is.False);
-			Assert.That(ReadIndex.IsStreamDeleted("YY"), Is.False);
-			Assert.That(ReadIndex.IsStreamDeleted("ZZZ"), Is.False);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/EpochManager/when_having_TFLog_with_existing_epochs.cs b/src/EventStore.Core.Tests/Services/Storage/EpochManager/when_having_TFLog_with_existing_epochs.cs
deleted file mode 100644
index ade3c3e067e..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/EpochManager/when_having_TFLog_with_existing_epochs.cs
+++ /dev/null
@@ -1,303 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-using NUnit.Framework.Internal;
-using EventStore.Core.Services.Storage.EpochManager;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using System.Threading;
-using EventStore.Core.Services;
-using EventStore.Common.Utils;
-using Newtonsoft.Json.Linq;
-using EventStore.Core.LogV3;
-
-namespace EventStore.Core.Tests.Services.Storage {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_having_TFLog_with_existing_epochs<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture, IDisposable {
-		private TFChunkDb _db;
-		private EpochManager<TStreamId> _epochManager;
-		private LogFormatAbstractor<TStreamId> _logFormat;
-		private LinkedList<EpochRecord> _cache;
-		private TFChunkReader _reader;
-		private TFChunkWriter _writer;
-		private SynchronousScheduler _mainBus;
-		private readonly Guid _instanceId = Guid.NewGuid();
-		private readonly List<Message> _published = new List<Message>();
-		private List<EpochRecord> _epochs;
-
-		private int GetNextEpoch() {
-			return (int)Interlocked.Increment(ref _currentEpoch);
-		}
-		private long _currentEpoch = -1;
-		private EpochManager<TStreamId> GetManager() {
-			return new EpochManager<TStreamId>(_mainBus,
-				10,
-				_db.Config.EpochCheckpoint,
-				_writer,
-				initialReaderCount: 1,
-				maxReaderCount: 5,
-				readerFactory: () => new TFChunkReader(_db, _db.Config.WriterCheckpoint,
-					optimizeReadSideCache: _db.Config.OptimizeReadSideCache),
-				_logFormat.RecordFactory,
-				_logFormat.StreamNameIndex,
-				_logFormat.EventTypeIndex,
-				_logFormat.CreatePartitionManager(
-					reader: new TFChunkReader(_db, _db.Config.WriterCheckpoint),
-					writer: _writer),
-				_instanceId);
-		}
-		private LinkedList<EpochRecord> GetCache(EpochManager<TStreamId> manager) {
-			return (LinkedList<EpochRecord>)typeof(EpochManager<TStreamId>).GetField("_epochs", BindingFlags.NonPublic | BindingFlags.Instance)
-				.GetValue(_epochManager);
-		}
-		private EpochRecord WriteEpoch(int epochNumber, long lastPos, Guid instanceId) {
-			long pos = _writer.Position;
-			var epoch = new EpochRecord(pos, epochNumber, Guid.NewGuid(), lastPos, DateTime.UtcNow, instanceId);
-			var rec = _logFormat.RecordFactory.CreateEpoch(epoch);
-			_writer.Write(rec, out _);
-			_writer.Flush();
-			return epoch;
-		}
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var indexDirectory = GetFilePathFor("index");
-			_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
-				IndexDirectory = indexDirectory,
-			});
-
-			_mainBus = new(nameof(when_having_an_epoch_manager_and_empty_tf_log<TLogFormat, TStreamId>));
-			_mainBus.Subscribe(new AdHocHandler<SystemMessage.EpochWritten>(m => _published.Add(m)));
-			_db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, 0));
-			_db.Open();
-			_reader = new TFChunkReader(_db, _db.Config.WriterCheckpoint);
-			_writer = new TFChunkWriter(_db);
-			_writer.Open();
-
-			_epochManager = GetManager();
-			_epochManager.Init();
-			_cache = GetCache(_epochManager);
-			Assert.NotNull(_cache);
-			Assert.That(_cache.Count == 0);
-			_epochs = new List<EpochRecord>();
-			var lastPos = 0L;
-			for (int i = 0; i < 30; i++) {
-				var epoch = WriteEpoch(GetNextEpoch(), lastPos, _instanceId);
-				_epochs.Add(epoch);
-				lastPos = epoch.EpochPosition;
-			}
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			this.Dispose();
-			await base.TestFixtureTearDown();
-		}
-		// epoch manager is stateful with TFLog,
-		// and TFLog is expesive to build fresh for each test
-		// and the tests depend on previous state in the epoch manager
-		// so this test will run through the test cases
-		// in order
-		[Test]
-		public void can_add_epochs_to_cache() {
-
-			Assert.That(_cache.Count == 0);
-			//add fist epoch to empty cache
-			_epochManager.AddEpochToCache(_epochs[3]);
-
-			Assert.That(_cache.Count == 4);
-			Assert.That(_cache.First.Value.EpochNumber == _epochs[0].EpochNumber);
-			Assert.That(_cache.Last.Value.EpochNumber == _epochs[3].EpochNumber);
-
-			//add new last epoch
-			_epochManager.AddEpochToCache(_epochs[4]);
-
-			Assert.That(_cache.Count == 5);
-			Assert.That(_cache.First.Value.EpochNumber == _epochs[0].EpochNumber);
-			Assert.That(_cache.Last.Value.EpochNumber == _epochs[4].EpochNumber);
-
-			//idempotent add
-			_epochManager.AddEpochToCache(_epochs[1]);
-			_epochManager.AddEpochToCache(_epochs[2]);
-			_epochManager.AddEpochToCache(_epochs[3]);
-
-			Assert.That(_cache.Count == 5);
-			Assert.That(_cache.First.Value.EpochNumber == _epochs[0].EpochNumber);
-			Assert.That(_cache.Last.Value.EpochNumber == _epochs[4].EpochNumber);
-
-			//add new skip 1 last epoch
-			_epochManager.AddEpochToCache(_epochs[6]);
-
-			Assert.That(_cache.Count == 7);
-			Assert.That(_cache.First.Value.EpochNumber == _epochs[0].EpochNumber);
-			Assert.That(_cache.Last.Value.EpochNumber == _epochs[6].EpochNumber);
-
-			//add new skip 5 last epoch
-			_epochManager.AddEpochToCache(_epochs[11]);
-
-			Assert.That(_cache.Count == 10);
-			Assert.That(_cache.First.Value.EpochNumber == _epochs[2].EpochNumber);
-			Assert.That(_cache.Last.Value.EpochNumber == _epochs[11].EpochNumber);
-
-			//add last rolls cache
-			_epochManager.AddEpochToCache(_epochs[12]);
-
-			Assert.That(_cache.Count == 10);
-			Assert.That(_cache.First.Value.EpochNumber == _epochs[3].EpochNumber);
-			Assert.That(_cache.Last.Value.EpochNumber == _epochs[12].EpochNumber);
-
-
-			//add epoch before cache
-			_epochManager.AddEpochToCache(_epochs[1]);
-
-			Assert.That(_cache.Count == 10);
-			Assert.That(_cache.First.Value.EpochNumber == _epochs[3].EpochNumber);
-			Assert.That(_cache.Last.Value.EpochNumber == _epochs[12].EpochNumber);
-
-			//add idempotent first epoch
-			_epochManager.AddEpochToCache(_epochs[2]);
-
-			Assert.That(_cache.Count == 10);
-			Assert.That(_cache.First.Value.EpochNumber == _epochs[3].EpochNumber);
-			Assert.That(_cache.Last.Value.EpochNumber == _epochs[12].EpochNumber);
-
-			//add idempotent last epoch
-			_epochManager.AddEpochToCache(_epochs[12]);
-
-			Assert.That(_cache.Count == 10);
-			Assert.That(_cache.First.Value.EpochNumber == _epochs[3].EpochNumber);
-			Assert.That(_cache.Last.Value.EpochNumber == _epochs[12].EpochNumber);
-
-			//add disjunct skip epoch
-			_epochManager.AddEpochToCache(_epochs[24]);
-
-			Assert.That(_cache.Count == 10);
-			Assert.That(_cache.First.Value.EpochNumber == _epochs[15].EpochNumber);
-			Assert.That(_cache.Last.Value.EpochNumber == _epochs[24].EpochNumber);
-
-
-			//cannot get epoch ahead of last cached on master
-			var nextEpoch = _epochManager.GetEpochAfter(_epochs[24].EpochNumber, false);
-			Assert.Null(nextEpoch);
-
-			Assert.That(_cache.Count == 10);
-			Assert.That(_cache.First.Value.EpochNumber == _epochs[15].EpochNumber);
-			Assert.That(_cache.Last.Value.EpochNumber == _epochs[24].EpochNumber);
-
-			//cannot get epoch ahead of cache on master
-			nextEpoch = _epochManager.GetEpochAfter(_epochs[25].EpochNumber, false);
-			Assert.Null(nextEpoch);
-
-			Assert.That(_cache.Count == 10);
-			Assert.That(_cache.First.Value.EpochNumber == _epochs[15].EpochNumber);
-			Assert.That(_cache.Last.Value.EpochNumber == _epochs[24].EpochNumber);
-
-			//can get next  in cache
-			nextEpoch = _epochManager.GetEpochAfter(_epochs[20].EpochNumber, false);
-
-			Assert.That(nextEpoch.EpochPosition == _epochs[21].EpochPosition);
-			Assert.That(_cache.Count == 10);
-			Assert.That(_cache.First.Value.EpochNumber == _epochs[15].EpochNumber);
-			Assert.That(_cache.Last.Value.EpochNumber == _epochs[24].EpochNumber);
-
-			//can get next from first
-			nextEpoch = _epochManager.GetEpochAfter(_epochs[15].EpochNumber, false);
-
-			Assert.That(nextEpoch.EpochPosition == _epochs[16].EpochPosition);
-			Assert.That(_cache.Count == 10);
-			Assert.That(_cache.First.Value.EpochNumber == _epochs[15].EpochNumber);
-			Assert.That(_cache.Last.Value.EpochNumber == _epochs[24].EpochNumber);
-
-			//can get next epoch from just before cache
-			nextEpoch = _epochManager.GetEpochAfter(_epochs[14].EpochNumber, false);
-
-			Assert.That(nextEpoch.EpochPosition == _epochs[15].EpochPosition);
-			Assert.That(_cache.Count == 10);
-			Assert.That(_cache.First.Value.EpochNumber == _epochs[15].EpochNumber);
-			Assert.That(_cache.Last.Value.EpochNumber == _epochs[24].EpochNumber);
-
-			//can get next epoch from before cache
-			nextEpoch = _epochManager.GetEpochAfter(_epochs[10].EpochNumber, false);
-
-			Assert.That(nextEpoch.EpochPosition == _epochs[11].EpochPosition);
-			Assert.That(_cache.Count == 10);
-			Assert.That(_cache.First.Value.EpochNumber == _epochs[15].EpochNumber);
-			Assert.That(_cache.Last.Value.EpochNumber == _epochs[24].EpochNumber);
-
-			//can get next epoch from 0 epoch
-			nextEpoch = _epochManager.GetEpochAfter(_epochs[0].EpochNumber, false);
-
-			Assert.That(nextEpoch.EpochPosition == _epochs[1].EpochPosition);
-			Assert.That(_cache.Count == 10);
-			Assert.That(_cache.First.Value.EpochNumber == _epochs[15].EpochNumber);
-			Assert.That(_cache.Last.Value.EpochNumber == _epochs[24].EpochNumber);
-
-
-			//can add last epoch in log
-			_epochManager.AddEpochToCache(_epochs[29]);
-
-			Assert.That(_cache.Count == 10);
-			Assert.That(_cache.First.Value.EpochNumber == _epochs[20].EpochNumber);
-			Assert.That(_cache.Last.Value.EpochNumber == _epochs[29].EpochNumber);
-
-			// can write an epoch with epoch information (even though previous epochs
-			// dont have epoch information)
-			_epochManager.WriteNewEpoch(GetNextEpoch());
-			_epochManager.WriteNewEpoch(GetNextEpoch());
-			var epochsWritten = _published.OfType<SystemMessage.EpochWritten>().ToArray();
-			Assert.AreEqual(2, epochsWritten.Length);
-			for (int i = 0; i < epochsWritten.Length; i++) {
-				_reader.Reposition(epochsWritten[i].Epoch.EpochPosition);
-				_reader.TryReadNext(); // read epoch
-				IPrepareLogRecord<TStreamId> epochInfo;
-				while (true) {
-					var result = _reader.TryReadNext();
-					Assert.True(result.Success);
-					if (result.LogRecord is IPrepareLogRecord<TStreamId> prepare) {
-						epochInfo = prepare;
-						break;
-					}
-				}
-				var expectedStreamId = LogFormatHelper<TLogFormat, TStreamId>.Choose<TStreamId>(
-					SystemStreams.EpochInformationStream,
-					LogV3SystemStreams.EpochInformationStreamNumber);
-				var expectedEventType = LogFormatHelper<TLogFormat, TStreamId>.Choose<TStreamId>(
-					SystemEventTypes.EpochInformation,
-					LogV3SystemEventTypes.EpochInformationNumber);
-				Assert.AreEqual(expectedStreamId, epochInfo.EventStreamId);
-				Assert.AreEqual(expectedEventType, epochInfo.EventType);
-				Assert.AreEqual(i - 1, epochInfo.ExpectedVersion);
-				Assert.AreEqual(_instanceId, epochInfo.Data.ParseJson<EpochDto>().LeaderInstanceId);
-			}
-		}
-
-		public class EpochDto {
-			public Guid LeaderInstanceId { get; set; }
-		}
-
-		public void Dispose() {
-			//epochManager?.Dispose();
-			//reader?.Dispose();
-			try {
-				_logFormat?.Dispose();
-				_writer?.Dispose();
-			} catch {
-				//workaround for TearDown error
-			}
-			_db?.Dispose();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/EpochManager/when_having_an_epoch_manager_and_empty_tf_log.cs b/src/EventStore.Core.Tests/Services/Storage/EpochManager/when_having_an_epoch_manager_and_empty_tf_log.cs
deleted file mode 100644
index 363e9e678f4..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/EpochManager/when_having_an_epoch_manager_and_empty_tf_log.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-using NUnit.Framework.Internal;
-using EventStore.Core.Services.Storage.EpochManager;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using System.Threading;
-using EventStore.Core.Services;
-using EventStore.Core.Data;
-using EventStore.Common.Utils;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.LogV3;
-
-namespace EventStore.Core.Tests.Services.Storage {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_having_an_epoch_manager_and_empty_tf_log<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private TFChunkDb _db;
-		private EpochManager<TStreamId> _epochManager;
-		private LogFormatAbstractor<TStreamId> _logFormat;
-		private LinkedList<EpochRecord> _cache;
-		private TFChunkReader _reader;
-		private TFChunkWriter _writer;
-		private SynchronousScheduler _mainBus;
-		private readonly Guid _instanceId = Guid.NewGuid();
-		private readonly List<Message> _published = new();
-
-		private int GetNextEpoch() {
-			return (int)Interlocked.Increment(ref _currentEpoch);
-		}
-		private long _currentEpoch = -1;
-		private EpochManager<TStreamId> GetManager() {
-			return new EpochManager<TStreamId>(_mainBus,
-				10,
-				_db.Config.EpochCheckpoint,
-				_writer,
-				initialReaderCount: 1,
-				maxReaderCount: 5,
-				readerFactory: () => new TFChunkReader(_db, _db.Config.WriterCheckpoint,
-					optimizeReadSideCache: _db.Config.OptimizeReadSideCache),
-				_logFormat.RecordFactory,
-				_logFormat.StreamNameIndex,
-				_logFormat.EventTypeIndex,
-				_logFormat.CreatePartitionManager(
-					reader: new TFChunkReader(_db, _db.Config.WriterCheckpoint),
-					writer: _writer),
-				_instanceId);
-		}
-		private LinkedList<EpochRecord> GetCache(EpochManager<TStreamId> manager) {
-			return (LinkedList<EpochRecord>)typeof(EpochManager<TStreamId>).GetField("_epochs", BindingFlags.NonPublic | BindingFlags.Instance)
-				.GetValue(_epochManager);
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var indexDirectory = GetFilePathFor("index");
-			_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
-				IndexDirectory = indexDirectory,
-			});
-
-			_mainBus = new(nameof(when_having_an_epoch_manager_and_empty_tf_log<TLogFormat, TStreamId>));
-			_mainBus.Subscribe(new AdHocHandler<SystemMessage.EpochWritten>(m => _published.Add(m)));
-			_db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, 0));
-			_db.Open();
-			_reader = new TFChunkReader(_db, _db.Config.WriterCheckpoint);
-			_writer = new TFChunkWriter(_db);
-			_writer.Open();
-
-			_epochManager = GetManager();
-			_epochManager.Init();
-			_cache = GetCache(_epochManager);
-			Assert.NotNull(_cache);
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			_logFormat?.Dispose();
-			_writer?.Dispose();
-			_db?.Dispose();
-			await base.TestFixtureTearDown();
-		}
-
-		// epoch manager is stateful with TFLog,
-		// and TFLog is expesive to build fresh for each test
-		// and the tests depend on previous state in the epoch manager
-		// so this test will run through the test cases
-		// in order
-		[Test]
-		public void can_write_epochs() {
-
-			//can write first epoch
-			_published.Clear();
-			var beforeWrite = DateTime.UtcNow;
-			_epochManager.WriteNewEpoch(GetNextEpoch());
-			Assert.That(_published.Count == 1);
-			var epochWritten = _published[0] as SystemMessage.EpochWritten;
-			Assert.NotNull(epochWritten);
-			Assert.That(epochWritten.Epoch.EpochNumber == 0);
-			Assert.That(epochWritten.Epoch.PrevEpochPosition == -1);
-			Assert.That(epochWritten.Epoch.EpochPosition == 0);
-			Assert.That(epochWritten.Epoch.LeaderInstanceId == _instanceId);
-			Assert.That(epochWritten.Epoch.TimeStamp < DateTime.UtcNow);
-			Assert.That(epochWritten.Epoch.TimeStamp >= beforeWrite);
-
-			// will_cache_epochs_written() {
-
-			for (int i = 0; i < 4; i++) {
-				_epochManager.WriteNewEpoch(GetNextEpoch());
-			}
-			Assert.That(_cache.Count == 5);
-			Assert.That(_cache.First.Value.EpochNumber == 0);
-			Assert.That(_cache.Last.Value.EpochNumber == 4);
-			var epochs = new List<int>();
-			var epoch = _cache.First;
-			while (epoch != null) {
-				epochs.Add(epoch.Value.EpochNumber);
-				epoch = epoch.Next;
-			}
-			CollectionAssert.IsOrdered(epochs);
-
-			// can_write_more_epochs_than_cache_size
-
-			for (int i = 0; i < 16; i++) {
-				_epochManager.WriteNewEpoch(GetNextEpoch());
-			}
-			Assert.That(_cache.Count == 10);
-			Assert.That(_cache.First.Value.EpochNumber == 11);
-			Assert.That(_cache.Last.Value.EpochNumber == 20);
-			epochs = new List<int>();
-			epoch = _cache.First;
-			while (epoch != null) {
-				epochs.Add(epoch.Value.EpochNumber);
-				epoch = epoch.Next;
-			}
-			CollectionAssert.IsOrdered(epochs);
-
-			// has written epoch information
-			var epochsWritten = _published.OfType<SystemMessage.EpochWritten>().ToArray();
-			Assert.AreEqual(1 + 4 + 16, epochsWritten.Length);
-			for (int i = 0; i < epochsWritten.Length; i++) {
-				_reader.Reposition(epochsWritten[i].Epoch.EpochPosition);
-				_reader.TryReadNext(); // read epoch
-				IPrepareLogRecord<TStreamId> epochInfo;
-				while (true) {
-					var result = _reader.TryReadNext();
-					Assert.True(result.Success);
-					if (result.LogRecord is IPrepareLogRecord<TStreamId> prepare) {
-						epochInfo = prepare;
-						break;
-					}
-				}
-				var expectedStreamId = LogFormatHelper<TLogFormat, TStreamId>.Choose<TStreamId>(
-					SystemStreams.EpochInformationStream,
-					LogV3SystemStreams.EpochInformationStreamNumber);
-				var expectedEventType = LogFormatHelper<TLogFormat, TStreamId>.Choose<TStreamId>(
-					SystemEventTypes.EpochInformation,
-					LogV3SystemEventTypes.EpochInformationNumber);
-				Assert.AreEqual(expectedStreamId, epochInfo.EventStreamId);
-				Assert.AreEqual(expectedEventType, epochInfo.EventType);
-				Assert.AreEqual(i - 1, epochInfo.ExpectedVersion);
-				Assert.AreEqual(_instanceId, epochInfo.Data.ParseJson<EpochDto>().LeaderInstanceId);
-			}
-			_published.Clear();
-		}
-
-		public  class EpochDto {
-			public Guid LeaderInstanceId { get; set; }
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/EpochManager/when_starting_having_TFLog_with_existing_epochs.cs b/src/EventStore.Core.Tests/Services/Storage/EpochManager/when_starting_having_TFLog_with_existing_epochs.cs
deleted file mode 100644
index aa5eb228121..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/EpochManager/when_starting_having_TFLog_with_existing_epochs.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.LogV2;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-using NUnit.Framework.Internal;
-using EventStore.Core.Services.Storage.EpochManager;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using System.Threading;
-using EventStore.Core.LogAbstraction;
-
-namespace EventStore.Core.Tests.Services.Storage {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public sealed class when_starting_having_TFLog_with_existing_epochs<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture, IDisposable {
-		private TFChunkDb _db;
-		private EpochManager<TStreamId> _epochManager;
-		private LogFormatAbstractor<TStreamId> _logFormat;
-		private LinkedList<EpochRecord> _cache;
-		private TFChunkReader _reader;
-		private TFChunkWriter _writer;
-		private SynchronousScheduler _mainBus;
-		private readonly Guid _instanceId = Guid.NewGuid();
-		private readonly List<Message> _published = new List<Message>();
-		private List<EpochRecord> _epochs;
-
-		private static int GetNextEpoch() {
-			return (int)Interlocked.Increment(ref _currentEpoch);
-		}
-		private static long _currentEpoch = -1;
-
-		private EpochManager<TStreamId> GetManager() {
-			return new EpochManager<TStreamId>(_mainBus,
-				10,
-				_db.Config.EpochCheckpoint,
-				_writer,
-				initialReaderCount: 1,
-				maxReaderCount: 5,
-				readerFactory: () => new TFChunkReader(_db, _db.Config.WriterCheckpoint,
-					optimizeReadSideCache: _db.Config.OptimizeReadSideCache),
-				_logFormat.RecordFactory,
-				_logFormat.StreamNameIndex,
-				_logFormat.EventTypeIndex,
-				_logFormat.CreatePartitionManager(
-					reader: new TFChunkReader(_db, _db.Config.WriterCheckpoint),
-					writer: _writer),
-				_instanceId);
-		}
-		private LinkedList<EpochRecord> GetCache(EpochManager<TStreamId> manager) {
-			return (LinkedList<EpochRecord>)typeof(EpochManager<TStreamId>).GetField("_epochs", BindingFlags.NonPublic | BindingFlags.Instance)
-				.GetValue(_epochManager);
-		}
-		private EpochRecord WriteEpoch(int epochNumber, long lastPos, Guid instanceId) {
-			long pos = _writer.Position;
-			var epoch = new EpochRecord(pos, epochNumber, Guid.NewGuid(), lastPos, DateTime.UtcNow, instanceId);
-			var rec = new SystemLogRecord(epoch.EpochPosition, epoch.TimeStamp, SystemRecordType.Epoch,
-				SystemRecordSerialization.Json, epoch.AsSerialized());
-			_writer.Write(rec, out _);
-			_writer.Flush();
-			return epoch;
-		}
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var indexDirectory = GetFilePathFor("index");
-			_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
-				IndexDirectory = indexDirectory,
-			});
-
-			_mainBus = new(nameof(when_starting_having_TFLog_with_existing_epochs<TLogFormat, TStreamId>));
-			_mainBus.Subscribe(new AdHocHandler<SystemMessage.EpochWritten>(m => _published.Add(m)));
-			_db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, 0));
-			_db.Open();
-			_reader = new TFChunkReader(_db, _db.Config.WriterCheckpoint);
-			_writer = new TFChunkWriter(_db);
-			_writer.Open();
-			_epochs = new List<EpochRecord>();
-			var lastPos = 0L;
-			for (int i = 0; i < 30; i++) {
-				var epoch = WriteEpoch(GetNextEpoch(), lastPos, _instanceId);
-				_epochs.Add(epoch);
-				lastPos = epoch.EpochPosition;
-			}
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			this.Dispose();
-			await base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void starting_epoch_manager_loads_epochs() {
-
-			_epochManager = GetManager();
-			_epochManager.Init();
-			_cache = GetCache(_epochManager);
-			Assert.NotNull(_cache);
-
-			Assert.That(_cache.Count == 10);
-			Assert.That(_cache.First.Value.EpochNumber == _epochs[20].EpochNumber);
-			Assert.That(_cache.Last.Value.EpochNumber == _epochs[29].EpochNumber);
-
-		}
-		[Test]
-		public void starting_epoch_manager_with_cache_larger_than_epoch_count_loads_all_epochs() {
-
-			_epochManager = new EpochManager<TStreamId>(_mainBus,
-				1000,
-				_db.Config.EpochCheckpoint,
-				_writer,
-				initialReaderCount: 1,
-				maxReaderCount: 5,
-				readerFactory: () => new TFChunkReader(_db, _db.Config.WriterCheckpoint,
-					optimizeReadSideCache: _db.Config.OptimizeReadSideCache),
-				_logFormat.RecordFactory,
-				_logFormat.StreamNameIndex,
-				_logFormat.EventTypeIndex,
-				_logFormat.CreatePartitionManager(
-					reader: new TFChunkReader(_db, _db.Config.WriterCheckpoint),
-					writer: _writer),
-				_instanceId);
-			_epochManager.Init();
-			_cache = GetCache(_epochManager);
-			Assert.NotNull(_cache);
-
-			Assert.That(_cache.Count == 30);
-			Assert.That(_cache.First.Value.EpochNumber == _epochs[0].EpochNumber);
-			Assert.That(_cache.Last.Value.EpochNumber == _epochs[29].EpochNumber);
-
-		}
-		public void Dispose() {
-			//epochManager?.Dispose();
-			//reader?.Dispose();
-			try {
-				_logFormat?.Dispose();
-				_writer?.Dispose();
-			} catch {
-				//workaround for TearDown error
-			}
-			_db?.Dispose();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/EpochManager/when_starting_having_TFLog_with_no_epochs.cs b/src/EventStore.Core.Tests/Services/Storage/EpochManager/when_starting_having_TFLog_with_no_epochs.cs
deleted file mode 100644
index b11430b385b..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/EpochManager/when_starting_having_TFLog_with_no_epochs.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.LogV2;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-using NUnit.Framework.Internal;
-using EventStore.Core.Services.Storage.EpochManager;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using System.Threading;
-using EventStore.Core.LogAbstraction;
-
-namespace EventStore.Core.Tests.Services.Storage {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public sealed class when_starting_having_TFLog_with_no_epochs<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture, IDisposable {
-		private TFChunkDb _db;
-		private EpochManager<TStreamId> _epochManager;
-		private LogFormatAbstractor<TStreamId> _logFormat;
-		private LinkedList<EpochRecord> _cache;
-		private TFChunkReader _reader;
-		private TFChunkWriter _writer;
-		private SynchronousScheduler _mainBus;
-		private readonly Guid _instanceId = Guid.NewGuid();
-		private readonly List<Message> _published = new List<Message>();
-		public when_starting_having_TFLog_with_no_epochs() {
-		}
-
-		private static int GetNextEpoch() {
-			return (int)Interlocked.Increment(ref _currentEpoch);
-		}
-		private static long _currentEpoch = -1;
-		private EpochManager<TStreamId> GetManager() {
-			return new EpochManager<TStreamId>(_mainBus,
-				10,
-				_db.Config.EpochCheckpoint,
-				_writer,
-				initialReaderCount: 1,
-				maxReaderCount: 5,
-				readerFactory: () => new TFChunkReader(_db, _db.Config.WriterCheckpoint,
-					optimizeReadSideCache: _db.Config.OptimizeReadSideCache),
-				_logFormat.RecordFactory,
-				_logFormat.StreamNameIndex,
-				_logFormat.EventTypeIndex,
-				_logFormat.CreatePartitionManager(
-					reader: new TFChunkReader(_db, _db.Config.WriterCheckpoint),
-					writer: _writer),
-				_instanceId);
-		}
-		private LinkedList<EpochRecord> GetCache(EpochManager<TStreamId> manager) {
-			return (LinkedList<EpochRecord>)typeof(EpochManager<TStreamId>).GetField("_epochs", BindingFlags.NonPublic | BindingFlags.Instance)
-				.GetValue(_epochManager);
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var indexDirectory = GetFilePathFor("index");
-			_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
-				IndexDirectory = indexDirectory,
-			});
-
-			_mainBus = new(nameof(when_starting_having_TFLog_with_no_epochs<TLogFormat, TStreamId>));
-			_mainBus.Subscribe(new AdHocHandler<SystemMessage.EpochWritten>(m => _published.Add(m)));
-			_db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, 0));
-			_db.Open();
-			_reader = new TFChunkReader(_db, _db.Config.WriterCheckpoint);
-			_writer = new TFChunkWriter(_db);
-			_writer.Open();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			this.Dispose();
-			await base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void starting_epoch_manager_loads_without_epochs() {
-
-			_epochManager = GetManager();
-			_epochManager.Init();
-			_cache = GetCache(_epochManager);
-			Assert.NotNull(_cache);
-
-			Assert.That(_cache.Count == 0);
-			Assert.That(_cache?.First?.Value == null);
-			Assert.That(_cache?.Last?.Value == null);
-			Assert.That(_epochManager.LastEpochNumber == -1);
-			_epochManager.WriteNewEpoch(0);
-			Assert.That(_cache.Count == 1);
-			Assert.That(_cache.First.Value.EpochNumber == 0);
-			Assert.That(_cache.Last.Value.EpochNumber == 0);
-			Assert.That(_epochManager.LastEpochNumber == 0);
-
-		}
-
-		public void Dispose() {
-			//epochManager?.Dispose();
-			//reader?.Dispose();
-			try {
-				_logFormat?.Dispose();
-				_writer?.Dispose();
-			} catch {
-				//workaround for TearDown error
-			}
-
-			_db?.Dispose();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/EpochManager/when_truncating_the_epoch_checkpoint.cs b/src/EventStore.Core.Tests/Services/Storage/EpochManager/when_truncating_the_epoch_checkpoint.cs
deleted file mode 100644
index 07ab9e165c1..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/EpochManager/when_truncating_the_epoch_checkpoint.cs
+++ /dev/null
@@ -1,239 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-using EventStore.Core.Services.Storage.EpochManager;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.Tests.Services.Storage.EpochManager {
-	public abstract class
-		when_truncating_the_epoch_checkpoint<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private TFChunkDb _db;
-		private EpochManager<TStreamId> _epochManager;
-		private LogFormatAbstractor<TStreamId> _logFormat;
-		private TFChunkWriter _writer;
-		private SynchronousScheduler _mainBus;
-		private List<EpochRecord> _epochs;
-		private readonly Guid _instanceId = Guid.NewGuid();
-		private readonly int _numEpochs;
-		private const int CachedEpochCount = 10;
-
-		private EpochRecord WriteEpoch(int epochNumber, long lastPos, Guid instanceId) {
-			long pos = _writer.Position;
-			var epoch = new EpochRecord(pos, epochNumber, Guid.NewGuid(), lastPos, DateTime.UtcNow, instanceId);
-			var rec = _logFormat.RecordFactory.CreateEpoch(epoch);
-			_writer.Write(rec, out _);
-			_writer.Flush();
-			return epoch;
-		}
-
-		public when_truncating_the_epoch_checkpoint(int numEpochs) {
-			_numEpochs = numEpochs;
-		}
-
-		[SetUp]
-		public void SetUp() {
-			_mainBus = new(nameof(when_having_an_epoch_manager_and_empty_tf_log<TLogFormat, TStreamId>));
-
-			var indexDirectory = GetFilePathFor("index");
-			_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
-				IndexDirectory = indexDirectory,
-			});
-
-			_db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, 0));
-			_db.Open();
-			_writer = new TFChunkWriter(_db);
-			_writer.Open();
-			_epochManager = new EpochManager<TStreamId>(_mainBus,
-				CachedEpochCount,
-				_db.Config.EpochCheckpoint,
-				_writer,
-				initialReaderCount: 1,
-				maxReaderCount: 5,
-				readerFactory: () => new TFChunkReader(_db, _db.Config.WriterCheckpoint,
-					optimizeReadSideCache: _db.Config.OptimizeReadSideCache),
-				_logFormat.RecordFactory,
-				_logFormat.StreamNameIndex,
-				_logFormat.EventTypeIndex,
-				_logFormat.CreatePartitionManager(
-					reader: new TFChunkReader(_db, _db.Config.WriterCheckpoint),
-					writer: _writer),
-				_instanceId);
-
-			_epochManager.Init();
-			_epochs = new List<EpochRecord>();
-
-			var lastPos = 0L;
-			for (int i = 0; i < _numEpochs; i++) {
-				var epoch = WriteEpoch(i, lastPos, _instanceId);
-				_epochManager.AddEpochToCache(epoch);
-				_epochs.Add(epoch);
-				lastPos = epoch.EpochPosition;
-			}
-		}
-
-
-		[TearDown]
-		public void TearDown() {
-			try {
-				_logFormat?.Dispose();
-				_writer?.Dispose();
-			} catch {
-				//workaround for TearDown error
-			}
-
-			_db?.Dispose();
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class with_no_epochs : when_truncating_the_epoch_checkpoint<TLogFormat, TStreamId> {
-			public with_no_epochs() : base(0) { }
-
-			[Test]
-			public void cannot_truncate_before_position_zero() {
-				Assert.False(_epochManager.TryTruncateBefore(0, out _));
-			}
-
-			[Test]
-			public void cannot_truncate_before_arbitrary_position() {
-				Assert.False(_epochManager.TryTruncateBefore(12, out _));
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class with_two_epochs : when_truncating_the_epoch_checkpoint<TLogFormat, TStreamId> {
-			public with_two_epochs() : base(2) { }
-
-			[Test]
-			public void cannot_truncate_before_first_epoch_position() {
-				Assert.False(_epochManager.TryTruncateBefore(_epochs[0].EpochPosition, out _));
-			}
-
-			[Test]
-			public void can_truncate_before_first_epoch_position_plus_one() {
-				Assert.True(_epochManager.TryTruncateBefore(_epochs[0].EpochPosition + 1, out var epoch));
-				Assert.AreEqual(_epochs[0].EpochNumber, epoch.EpochNumber);
-			}
-
-			[Test]
-			public void can_truncate_before_second_epoch_position() {
-				Assert.True(_epochManager.TryTruncateBefore(_epochs[1].EpochPosition, out var epoch));
-				Assert.AreEqual(_epochs[0].EpochNumber, epoch.EpochNumber);
-			}
-
-			[Test]
-			public void can_truncate_before_second_epoch_position_plus_one() {
-				Assert.True(_epochManager.TryTruncateBefore(_epochs[1].EpochPosition + 1, out var epoch));
-				Assert.AreEqual(_epochs[1].EpochNumber, epoch.EpochNumber);
-			}
-
-			[Test]
-			public void checkpoint_is_changed_after_truncation() {
-				Assert.True(_epochManager.TryTruncateBefore(_epochs[0].EpochPosition + 1, out _));
-				Assert.AreEqual(_epochs[0].EpochPosition, _db.Config.EpochCheckpoint.Read());
-			}
-
-			[Test]
-			public void checkpoint_is_unchanged_after_no_truncation() {
-				Assert.False(_epochManager.TryTruncateBefore(_epochs[0].EpochPosition, out _));
-				Assert.AreEqual(_epochs[1].EpochPosition, _db.Config.EpochCheckpoint.Read());
-			}
-
-			[Test]
-			public void cannot_read_checkpoint_even_if_no_truncation() {
-				Assert.False(_epochManager.TryTruncateBefore(_epochs[0].EpochPosition, out _));
-				Assert.Throws<InvalidOperationException>(() => {
-					_epochManager.Init(); // triggers a checkpoint read internally
-				});
-			}
-
-			[Test]
-			public void cannot_read_checkpoint_after_truncation() {
-				Assert.True(_epochManager.TryTruncateBefore(_epochs[0].EpochPosition + 1, out _));
-				Assert.Throws<InvalidOperationException>(() => {
-					_epochManager.Init(); // triggers a checkpoint read internally
-				});
-			}
-
-			[Test]
-			public void cannot_write_checkpoint_even_if_no_truncation() {
-				Assert.False(_epochManager.TryTruncateBefore(_epochs[0].EpochPosition, out _));
-				Assert.Throws<InvalidOperationException>(() => {
-					_epochManager.WriteNewEpoch(2); // triggers a checkpoint write internally
-				});
-			}
-
-			[Test]
-			public void cannot_write_checkpoint_after_truncation() {
-				Assert.True(_epochManager.TryTruncateBefore(_epochs[0].EpochPosition + 1, out _));
-				Assert.Throws<InvalidOperationException>(() => {
-					_epochManager.WriteNewEpoch(2); // triggers a checkpoint write internally
-				});
-			}
-
-			[Test]
-			public void cannot_truncate_twice() {
-				Assert.True(_epochManager.TryTruncateBefore(_epochs[0].EpochPosition + 1, out _));
-				Assert.Throws<InvalidOperationException>(() => {
-					_epochManager.TryTruncateBefore(_epochs[0].EpochPosition + 1, out _);
-				});
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class with_cache_size_minus_three_epochs : when_truncating_the_epoch_checkpoint<TLogFormat, TStreamId> {
-			public with_cache_size_minus_three_epochs() : base(CachedEpochCount - 3) { }
-
-			[Test]
-			public void cannot_truncate_before_first_epoch_position() {
-				Assert.False(_epochManager.TryTruncateBefore(_epochs[0].EpochPosition, out _));
-			}
-
-			[Test]
-			public void can_truncate_before_first_epoch_position_plus_one() {
-				Assert.True(_epochManager.TryTruncateBefore(_epochs[0].EpochPosition + 1, out var epoch));
-				Assert.AreEqual(_epochs[0].EpochNumber, epoch.EpochNumber);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class with_cache_size_epochs : when_truncating_the_epoch_checkpoint<TLogFormat, TStreamId> {
-			public with_cache_size_epochs() : base(CachedEpochCount) { }
-			[Test]
-			public void cannot_truncate_before_first_epoch_position() {
-				Assert.False(_epochManager.TryTruncateBefore(_epochs[0].EpochPosition, out _));
-			}
-
-			[Test]
-			public void can_truncate_before_first_epoch_position_plus_one() {
-				Assert.True(_epochManager.TryTruncateBefore(_epochs[0].EpochPosition + 1, out var epoch));
-				Assert.AreEqual(_epochs[0].EpochNumber, epoch.EpochNumber);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class with_cache_size_plus_two_epochs : when_truncating_the_epoch_checkpoint<TLogFormat, TStreamId> {
-			public with_cache_size_plus_two_epochs() : base(CachedEpochCount + 2) { }
-
-			[Test]
-			public void cannot_truncate_before_third_epoch_position() {
-				Assert.False(_epochManager.TryTruncateBefore(_epochs[2].EpochPosition, out _));
-			}
-
-			[Test]
-			public void can_truncate_before_third_epoch_position_plus_one() {
-				Assert.True(_epochManager.TryTruncateBefore(_epochs[2].EpochPosition + 1, out var epoch));
-				Assert.AreEqual(_epochs[2].EpochNumber, epoch.EpochNumber);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/FakeInMemoryTFReader.cs b/src/EventStore.Core.Tests/Services/Storage/FakeInMemoryTFReader.cs
deleted file mode 100644
index 1f043bfeb2b..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/FakeInMemoryTFReader.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.Tests.Services.Storage {
-	public class FakeInMemoryTfReader : ITransactionFileReader {
-		private Dictionary<long, ILogRecord> _records = new Dictionary<long, ILogRecord>();
-		private long _curPosition = 0;
-		private int _recordOffset;
-
-		public int NumReads { get; private set; }
-
-		public FakeInMemoryTfReader(int recordOffset){
-			_recordOffset = recordOffset;
-		}
-
-		public void AddRecord(ILogRecord record, long position){
-			_records.Add(position, record);
-		}
-
-		public void Reposition(long position) {
-			_curPosition = position;
-		}
-
-		public SeqReadResult TryReadNext() {
-			NumReads++;
-			if (_records.ContainsKey(_curPosition)){
-				var pos = _curPosition;
-				_curPosition += _recordOffset;
-				return new SeqReadResult(true, false, _records[pos], _recordOffset, pos, pos + _recordOffset);
-			} else{
-				return new SeqReadResult(false, false, null, 0, 0, 0);
-			}
-		}
-
-		public SeqReadResult TryReadPrev() {
-			throw new NotImplementedException();
-		}
-
-		public RecordReadResult TryReadAt(long position, bool couldBeScavenged) {
-			NumReads++;
-			if (_records.ContainsKey(position)){
-				return new RecordReadResult(true, 0, _records[position], 0);
-			} else{
-				return new RecordReadResult(false, 0, _records[position], 0);
-			}
-		}
-
-		public bool ExistsAt(long position) {
-			return _records.ContainsKey(position);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/FakeInMemoryTableIndex.cs b/src/EventStore.Core.Tests/Services/Storage/FakeInMemoryTableIndex.cs
deleted file mode 100644
index 6eeffb14ef8..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/FakeInMemoryTableIndex.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-
-namespace EventStore.Core.Tests.Services.Storage {
-	public class FakeInMemoryTableIndex<TStreamId> : ITableIndex<TStreamId> {
-		public long CommitCheckpoint => throw new NotImplementedException();
-
-		public long PrepareCheckpoint => throw new NotImplementedException();
-
-		public bool IsBackgroundTaskRunning => throw new NotImplementedException();
-
-		private Dictionary<TStreamId, List<IndexKey<TStreamId>> > _indexEntries = new Dictionary<TStreamId, List<IndexKey<TStreamId>> >();
-		public void Add(long commitPos, TStreamId streamId, long version, long position)
-		{
-			throw new NotImplementedException();
-		}
-
-		public void AddEntries(long commitPos, IList<IndexKey<TStreamId>> entries)
-		{
-			foreach(var entry in entries){
-				if(!_indexEntries.ContainsKey(entry.StreamId))
-					_indexEntries[entry.StreamId] = new List<IndexKey<TStreamId>>();
-				_indexEntries[entry.StreamId].Add(entry);
-			}
-		}
-
-		public void Close(bool removeFiles = true)
-		{
-		}
-
-		public IEnumerable<ISearchTable> IterateAllInOrder() => throw new NotImplementedException();
-
-		public IReadOnlyList<IndexEntry> GetRange(TStreamId streamId, long startVersion, long endVersion, int? limit = null)
-		{
-			var entries = new List<IndexEntry>();
-			if(_indexEntries.ContainsKey(streamId)){
-				foreach(var entry in _indexEntries[streamId]){
-					if(startVersion <= entry.Version && entry.Version <= endVersion)
-						entries.Add(new IndexEntry(entry.Hash, entry.Version, entry.Position));
-				}
-			}
-			return entries;
-		}
-
-		public IReadOnlyList<IndexEntry> GetRange(ulong stream, long startVersion, long endVersion, int? limit = null) {
-			throw new NotImplementedException();
-		}
-
-		public void Initialize(long chaserCheckpoint)
-		{
-		}
-
-		public Task MergeIndexes()
-		{
-			throw new NotImplementedException();
-		}
-
-		public void Scavenge(IIndexScavengerLog log, CancellationToken ct)
-		{
-			throw new NotImplementedException();
-		}
-
-		public void Scavenge(
-			Func<IndexEntry, bool> shouldKeep,
-			IIndexScavengerLog log,
-			CancellationToken ct)
-		{
-			throw new NotImplementedException();
-		}
-
-		public bool TryGetLatestEntry(TStreamId streamId, out IndexEntry entry)
-		{
-			if(_indexEntries.ContainsKey(streamId)){
-				var entries = _indexEntries[streamId];
-				var lastEntry = entries[entries.Count - 1];
-				entry = new IndexEntry(lastEntry.Hash, lastEntry.Version, lastEntry.Position);
-				return true;
-			}
-			else{
-				entry = new IndexEntry();
-				return false;
-			}
-		}
-
-		public bool TryGetLatestEntry(ulong stream, long beforePosition, Func<IndexEntry, bool> isForThisStream, out IndexEntry entry)
-		{
-			throw new NotImplementedException();
-		}
-
-		public bool TryGetLatestEntry(TStreamId streamId, long beforePosition, Func<IndexEntry, bool> isForThisStream, out IndexEntry entry)
-		{
-			throw new NotImplementedException();
-		}
-
-		public bool TryGetNextEntry(TStreamId streamId, long afterVersion, out IndexEntry entry)
-		{
-			throw new NotImplementedException();
-		}
-
-		public bool TryGetNextEntry(ulong stream, long afterVersion, out IndexEntry entry)
-		{
-			throw new NotImplementedException();
-		}
-
-		public bool TryGetPreviousEntry(TStreamId streamId, long beforeVersion, out IndexEntry entry)
-		{
-			throw new NotImplementedException();
-		}
-
-		public bool TryGetPreviousEntry(ulong stream, long beforeVersion, out IndexEntry entry)
-		{
-			throw new NotImplementedException();
-		}
-
-		public bool TryGetOldestEntry(TStreamId streamId, out IndexEntry entry)
-		{
-			throw new NotImplementedException();
-		}
-
-		public bool TryGetOneValue(TStreamId streamId, long version, out long position)
-		{
-			throw new NotImplementedException();
-		}
-
-		public void WaitForBackgroundTasks(int millisecondsTimeout) {
-			throw new NotImplementedException();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/FakeIndexCommitterService.cs b/src/EventStore.Core.Tests/Services/Storage/FakeIndexCommitterService.cs
deleted file mode 100644
index 87a237f0eec..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/FakeIndexCommitterService.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using EventStore.Core.Services.Storage;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.Tests.Services.Storage {
-	public class FakeIndexCommitterService<TStreamId> : IIndexCommitterService<TStreamId> {
-		public Dictionary<Guid, Transaction> Transactions = new Dictionary<Guid, Transaction>();
-		public List<ILogRecord> Records = new List<ILogRecord>();
-		public long PostPosition;
-		public void AddPendingCommit(CommitLogRecord commit, long postPosition) {
-			if (commit == null)
-				throw new InvalidOperationException("Cannot commit a null transaction");
-			if (Transactions.TryGetValue(commit.CorrelationId, out var transaction)) {
-				transaction.CommitTransaction(commit);
-				Records.Add(commit);
-			} else {
-				throw new InvalidOperationException("Cannot commit an unknown transaction");
-			}
-			PostPosition = postPosition;
-		}
-
-		public void AddPendingPrepare(IPrepareLogRecord<TStreamId>[] prepares, long postPosition) {
-			if (prepares == null)
-				throw new InvalidOperationException("Cannot commit a null transaction");
-			if (prepares.Length <= 0)
-				return;
-			if (!Transactions.TryGetValue(prepares[0].CorrelationId, out var transaction)) {
-				transaction = new Transaction(prepares[0].CorrelationId);
-				Transactions.Add(prepares[0].CorrelationId, transaction);
-				Records.AddRange(prepares);
-			}
-			transaction.AddPrepares(prepares);
-			PostPosition = postPosition;
-		}
-
-		public long GetCommitLastEventNumber(CommitLogRecord record) {
-			if (Transactions.TryGetValue(record.CorrelationId, out var transaction)) {
-				return record.FirstEventNumber + transaction.Prepares.Count;
-			} else {
-				throw new InvalidOperationException("Cannot get last event number for an unknown transaction");
-			}
-		}
-
-		public void Init(long checkpointPosition) { }
-
-		public void Stop() { }
-
-		public class Transaction {
-			public Guid Id { get; }
-			public bool IsCommitted => Commit != null;
-			public CommitLogRecord Commit { get; private set; }
-			public ReadOnlyCollection<IPrepareLogRecord<TStreamId>> Prepares => _prepares.AsReadOnly();
-			private List<IPrepareLogRecord<TStreamId>> _prepares = new List<IPrepareLogRecord<TStreamId>>();
-
-			public Transaction(Guid id, ICollection<IPrepareLogRecord<TStreamId>> prepares = null) {
-				Id = id;
-				if (prepares != null) { AddPrepares(prepares); }
-			}
-			public void CommitTransaction(CommitLogRecord commit) {
-				Commit = commit;
-			}
-			public void AddPrepares(ICollection<IPrepareLogRecord<TStreamId>> prepares) {
-				if (IsCommitted) { throw new InvalidOperationException("Cannot add data to a committed transation"); }
-				_prepares.AddRange(prepares);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/FakeIndexWriter.cs b/src/EventStore.Core.Tests/Services/Storage/FakeIndexWriter.cs
deleted file mode 100644
index 2e704c23d7b..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/FakeIndexWriter.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.Tests.Services.Storage;
-
-public class FakeIndexWriter<TStreamId> : IIndexWriter<TStreamId> {
-	public long CachedTransInfo => 0;
-	public long NotCachedTransInfo => 0;
-	public void Reset() { }
-
-	private TStreamId GetFakeStreamId() {
-		if (typeof(TStreamId) == typeof(long)) {
-			return (TStreamId) (object) 0L;
-		}
-
-		if (typeof(TStreamId) == typeof(string)) {
-			return (TStreamId) (object) string.Empty;
-		}
-
-		throw new NotSupportedException();
-	}
-
-	public CommitCheckResult<TStreamId> CheckCommitStartingAt(long transactionPosition, long commitPosition) {
-		return new CommitCheckResult<TStreamId>(CommitDecision.Ok, GetFakeStreamId(), -1, -1, -1, false);
-	}
-
-	public CommitCheckResult<TStreamId> CheckCommit(TStreamId streamId, long expectedVersion, IEnumerable<Guid> eventIds, bool streamMightExist) {
-		return new CommitCheckResult<TStreamId>(CommitDecision.Ok, streamId, expectedVersion, -1, -1, false);
-	}
-
-	public void PreCommit(CommitLogRecord commit) { }
-
-	public void PreCommit(ReadOnlySpan<IPrepareLogRecord<TStreamId>> committedPrepares) { }
-
-	public void UpdateTransactionInfo(long transactionId, long logPosition, TransactionInfo<TStreamId> transactionInfo) { }
-
-	public TransactionInfo<TStreamId> GetTransactionInfo(long writerCheckpoint, long transactionId) => new();
-
-	public void PurgeNotProcessedCommitsTill(long checkpoint) { }
-
-	public void PurgeNotProcessedTransactions(long checkpoint) { }
-
-	public bool IsSoftDeleted(TStreamId streamId) => false;
-
-	public long GetStreamLastEventNumber(TStreamId streamId) => -1;
-
-	public StreamMetadata GetStreamMetadata(TStreamId streamId) => StreamMetadata.Empty;
-
-	public RawMetaInfo GetStreamRawMeta(TStreamId streamId) => new();
-
-	public TStreamId GetStreamId(string streamName) => GetFakeStreamId();
-
-	public string GetStreamName(TStreamId streamId) => string.Empty;
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/FakeTableIndex.cs b/src/EventStore.Core.Tests/Services/Storage/FakeTableIndex.cs
deleted file mode 100644
index 25f43f1c89a..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/FakeTableIndex.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-
-namespace EventStore.Core.Tests.Services.Storage {
-	public class FakeTableIndex<TStreamId> : ITableIndex<TStreamId> {
-		internal static readonly IndexEntry InvalidIndexEntry = new IndexEntry(0, -1, -1);
-		public int ScavengeCount { get; private set; }
-
-		public long PrepareCheckpoint {
-			get { throw new NotImplementedException(); }
-		}
-
-		public long CommitCheckpoint {
-			get { throw new NotImplementedException(); }
-		}
-
-		public void Initialize(long chaserCheckpoint) {
-		}
-
-		public void Close(bool removeFiles = true) {
-		}
-
-		public void Add(long commitPos, TStreamId streamId, long version, long position) {
-			throw new NotImplementedException();
-		}
-
-		public void AddEntries(long commitPos, IList<IndexKey<TStreamId>> entries) {
-			throw new NotImplementedException();
-		}
-
-		public bool TryGetOneValue(TStreamId streamId, long version, out long position) {
-			position = -1;
-			return false;
-		}
-
-		public bool TryGetLatestEntry(TStreamId streamId, out IndexEntry entry) {
-			entry = InvalidIndexEntry;
-			return false;
-		}
-
-		public bool TryGetLatestEntry(ulong stream, long beforePosition, Func<IndexEntry, bool> isForThisStream, out IndexEntry entry) {
-			throw new NotImplementedException();
-		}
-
-		public bool TryGetLatestEntry(TStreamId streamId, long beforePosition, Func<IndexEntry, bool> isForThisStream, out IndexEntry entry) {
-			throw new NotImplementedException();
-		}
-
-		public bool TryGetOldestEntry(TStreamId streamId, out IndexEntry entry) {
-			entry = InvalidIndexEntry;
-			return false;
-		}
-
-		public bool TryGetNextEntry(TStreamId streamId, long afterVersion, out IndexEntry entry) {
-			throw new NotImplementedException();
-		}
-
-		public bool TryGetNextEntry(ulong stream, long afterVersion, out IndexEntry entry) {
-			throw new NotImplementedException();
-		}
-
-		public bool TryGetPreviousEntry(TStreamId streamId, long beforeVersion, out IndexEntry entry) {
-			throw new NotImplementedException();
-		}
-
-		public bool TryGetPreviousEntry(ulong stream, long beforeVersion, out IndexEntry entry) {
-			throw new NotImplementedException();
-		}
-
-		public IEnumerable<ISearchTable> IterateAllInOrder() => throw new NotImplementedException();
-
-		public IReadOnlyList<IndexEntry> GetRange(TStreamId streamId, long startVersion, long endVersion,
-			int? limit = null) {
-			return Array.Empty<IndexEntry>();
-		}
-
-		public IReadOnlyList<IndexEntry> GetRange(ulong stream, long startVersion, long endVersion, int? limit = null) {
-			throw new NotImplementedException();
-		}
-
-		public void Scavenge(IIndexScavengerLog log, CancellationToken ct) {
-			ScavengeCount++;
-		}
-
-		public void Scavenge(
-			Func<IndexEntry, bool> shouldKeep,
-			IIndexScavengerLog log,
-			CancellationToken ct) {
-
-			Scavenge(log, ct);
-		}
-
-		public Task MergeIndexes() {
-			return Task.CompletedTask;
-		}
-
-		public void WaitForBackgroundTasks(int millisecondsTimeout) {
-			throw new NotImplementedException();
-		}
-
-		public bool IsBackgroundTaskRunning {
-			get { return false; }
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/HashCollisions/GetStreamLastEventNumber_NoCollisions.cs b/src/EventStore.Core.Tests/Services/Storage/HashCollisions/GetStreamLastEventNumber_NoCollisions.cs
deleted file mode 100644
index cf973c48113..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/HashCollisions/GetStreamLastEventNumber_NoCollisions.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.Index.Hashers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.HashCollisions {
-	[TestFixture]
-	public abstract class GetStreamLastEventNumber_NoCollisions : ReadIndexTestScenario<LogFormat.V2, string> {
-		private const string Stream = "ab-1";
-		private const ulong Hash = 98;
-		private const string NonCollidingStream = "cd-1";
-
-		private string GetStreamId(ulong hash) => hash == Hash ? Stream : throw new ArgumentException();
-
-		protected GetStreamLastEventNumber_NoCollisions() : base(
-			maxEntriesInMemTable: 3,
-			lowHasher: new ConstantHasher(0),
-			highHasher: new HumanReadableHasher32()) { }
-
-		public class VerifyNoCollision : GetStreamLastEventNumber_NoCollisions {
-			protected override void WriteTestScenario() { }
-
-			[Test]
-			public void verify_that_streams_do_not_collide() {
-				Assert.AreNotEqual(Hasher.Hash(Stream), Hasher.Hash(NonCollidingStream));
-			}
-		}
-
-		public class WithNoEvents : GetStreamLastEventNumber_NoCollisions {
-			protected override void WriteTestScenario() { }
-
-			[Test]
-			public void with_no_events() {
-				Assert.AreEqual(ExpectedVersion.NoStream,
-					ReadIndex.GetStreamLastEventNumber_NoCollisions(
-						Hash,
-						GetStreamId,
-						long.MaxValue));
-			}
-		}
-
-		public class WithOneEvent : GetStreamLastEventNumber_NoCollisions {
-			protected override void WriteTestScenario() {
-				WriteSingleEvent(Stream, 0, "test data");
-			}
-
-			[Test]
-			public void with_one_event() {
-				Assert.AreEqual(0,
-					ReadIndex.GetStreamLastEventNumber_NoCollisions(
-						Hash,
-						GetStreamId,
-						long.MaxValue));
-			}
-		}
-
-		public class WithMultipleEvents : GetStreamLastEventNumber_NoCollisions {
-			private EventRecord _zeroth, _first, _second, _third;
-
-			protected override void WriteTestScenario() {
-				// PTable 1
-				WriteSingleEvent(NonCollidingStream, 0, string.Empty);
-				WriteSingleEvent(NonCollidingStream, 1, string.Empty);
-				_zeroth = WriteSingleEvent(Stream, 0, string.Empty);
-
-				// PTable 2
-				_first = WriteSingleEvent(Stream, 1, string.Empty);
-				_second = WriteSingleEvent(Stream, 2, string.Empty);
-				WriteSingleEvent(NonCollidingStream, 2, string.Empty);
-
-				// MemTable
-				_third = WriteSingleEvent(Stream, 3, string.Empty);
-				WriteSingleEvent(NonCollidingStream, 3, string.Empty);
-			}
-
-			[Test]
-			public void with_multiple_events() {
-				Assert.AreEqual(3,
-					ReadIndex.GetStreamLastEventNumber_NoCollisions(
-						Hash,
-						GetStreamId,
-						long.MaxValue));
-			}
-
-			[Test]
-			public void with_multiple_events_and_before_position() {
-				Assert.AreEqual(3,
-					ReadIndex.GetStreamLastEventNumber_NoCollisions(
-						Hash,
-						GetStreamId,
-						_third.LogPosition + 1));
-
-				Assert.AreEqual(2,
-					ReadIndex.GetStreamLastEventNumber_NoCollisions(
-						Hash,
-						GetStreamId,
-						_third.LogPosition));
-
-				Assert.AreEqual(1,
-					ReadIndex.GetStreamLastEventNumber_NoCollisions(
-						Hash,
-						GetStreamId,
-						_second.LogPosition));
-
-				Assert.AreEqual(0,
-					ReadIndex.GetStreamLastEventNumber_NoCollisions(
-						Hash,
-						GetStreamId,
-						_first.LogPosition));
-
-				Assert.AreEqual(ExpectedVersion.NoStream,
-					ReadIndex.GetStreamLastEventNumber_NoCollisions(
-						Hash,
-						GetStreamId,
-						_zeroth.LogPosition));
-			}
-		}
-
-		public class WithDeletedStream : GetStreamLastEventNumber_NoCollisions {
-			protected override void WriteTestScenario() {
-				WriteSingleEvent(Stream, 0, "test data");
-				WriteSingleEvent(Stream, 1, "test data");
-
-				var prepare = WriteDeletePrepare(Stream);
-				WriteDeleteCommit(prepare);
-			}
-
-			[Test]
-			public void with_deleted_stream() {
-				Assert.AreEqual(EventNumber.DeletedStream,
-					ReadIndex.GetStreamLastEventNumber_NoCollisions(
-						Hash,
-						GetStreamId,
-						long.MaxValue));
-			}
-		}
-	}
-
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_hash_collisions.cs b/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_hash_collisions.cs
deleted file mode 100644
index 17b02f1b258..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_hash_collisions.cs
+++ /dev/null
@@ -1,491 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using NUnit.Framework;
-using EventStore.Core.Index;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
-using EventStore.Core.Tests.Index.Hashers;
-
-namespace EventStore.Core.Tests.Services.Storage.HashCollisions {
-	// both the stream names hash to the same value using XXHash.
-	// they are different for Murmur3 so we use only XXHashUnsafe here.
-	// we use a fake TransactionFileReader that attributes:
-	//    odd  positions to LPN-FC002_LPK51001
-	//    even positions to account--696193173
-	[TestFixture]
-	public class HashCollisionTestFixture : SpecificationWithDirectoryPerTestFixture {
-		protected int _hashCollisionReadLimit = 5;
-		protected int _maxMemTableSize = 5;
-		protected TableIndex<string> _tableIndex;
-		protected IIndexReader<string> _indexReader;
-		protected IIndexBackend<string> _indexBackend;
-		protected IHasher<string> _lowHasher;
-		protected IHasher<string> _highHasher;
-		protected string _indexDir;
-		protected TFReaderLease _fakeReader;
-		protected LogFormatAbstractor<string> _logFormat;
-
-		protected virtual void given() {
-		}
-
-		protected virtual void when() {
-		}
-
-		[OneTimeSetUp]
-		public void Setup() {
-			given();
-			_indexDir = PathName;
-			_fakeReader = new TFReaderLease(new FakeReader());
-			_indexBackend = new FakeIndexBackend<string>(_fakeReader);
-
-			_logFormat = LogFormatHelper<LogFormat.V2, string>.LogFormatFactory.Create(new() {
-				InMemory = true,
-				LowHasher = new XXHashUnsafe(),
-				HighHasher = new ConstantHasher(0),
-			});
-
-			_lowHasher = _logFormat.LowHasher;
-			_highHasher = _logFormat.HighHasher;
-			_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, _logFormat.EmptyStreamId,
-				() => new HashListMemTable(PTableVersions.IndexV4, maxSize: _maxMemTableSize),
-				() => _fakeReader,
-				PTableVersions.IndexV4,
-				5, Constants.PTableMaxReaderCountDefault,
-				maxSizeForMemory: _maxMemTableSize,
-				maxTablesPerLevel: 2);
-			_logFormat.StreamNamesProvider.SetTableIndex(_tableIndex);
-			_tableIndex.Initialize(long.MaxValue);
-			_indexReader = new IndexReader<string>(_indexBackend, _tableIndex,
-				_logFormat.StreamNamesProvider,
-				_logFormat.StreamIdValidator,
-				_logFormat.StreamExistenceFilterReader,
-				new EventStore.Core.Data.StreamMetadata(),
-				_hashCollisionReadLimit, skipIndexScanOnRead: false);
-
-			when();
-			//wait for the mem table to be dumped
-			System.Threading.Thread.Sleep(500);
-		}
-
-		public override Task TestFixtureTearDown() {
-			_logFormat.Dispose();
-			_tableIndex.Close();
-			return base.TestFixtureTearDown();
-		}
-	}
-
-	class UseMaxAgeFixtureArgs: IEnumerable
-	{
-		public IEnumerator GetEnumerator()
-		{
-			yield return true;
-			yield return false;
-		}
-	}
-
-	[TestFixture]
-	public class when_stream_does_not_exist : HashCollisionTestFixture {
-		protected override void given() {
-			_hashCollisionReadLimit = 5;
-		}
-
-		protected override void when() {
-			//mem table
-			_tableIndex.Add(1, "LPN-FC002_LPK51001", 0, 3);
-			_tableIndex.Add(1, "LPN-FC002_LPK51001", 1, 5);
-		}
-
-		[Test]
-		public void should_return_no_stream() {
-			Assert.AreEqual(ExpectedVersion.NoStream, _indexReader.GetStreamLastEventNumber("account--696193173"));
-		}
-	}
-
-	[TestFixture]
-	[TestFixtureSource(typeof(UseMaxAgeFixtureArgs))]
-	public class when_stream_is_out_of_range_of_read_limit : HashCollisionTestFixture {
-		private readonly bool _useMaxAge;
-		private readonly string stream1Id = "account--696193173";
-		private readonly string stream2Id = "LPN-FC002_LPK51001";
-
-		public when_stream_is_out_of_range_of_read_limit(bool useMaxAge) {
-			_useMaxAge = useMaxAge;
-		}
-
-		protected override void given() {
-			_hashCollisionReadLimit = 1;
-		}
-
-		protected override void when() {
-			if (_useMaxAge) {
-				_indexBackend.SetStreamMetadata(stream1Id, new StreamMetadata(maxAge:TimeSpan.FromDays(1)));
-				_indexBackend.SetStreamMetadata(stream2Id, new StreamMetadata(maxAge:TimeSpan.FromDays(1)));
-			}
-			//ptable 1
-			_tableIndex.Add(1, stream1Id, 0, 0);
-			_tableIndex.Add(1, stream2Id, 0, 3);
-			_tableIndex.Add(1, stream2Id, 1, 5);
-			_tableIndex.Add(1, stream2Id, 2, 7);
-			_tableIndex.Add(1, stream2Id, 3, 9);
-			//mem table
-			_tableIndex.Add(1, stream2Id, 4, 13);
-		}
-
-		[Test]
-		public void should_return_invalid_event_number() {
-			Assert.AreEqual(EventStore.Core.Data.EventNumber.Invalid,
-				_indexReader.GetStreamLastEventNumber(stream1Id));
-		}
-	}
-
-	[TestFixture]
-	[TestFixtureSource(typeof(UseMaxAgeFixtureArgs))]
-	public class when_stream_is_in_of_range_of_read_limit : HashCollisionTestFixture {
-		private readonly bool _useMaxAge;
-		private readonly string stream1Id = "account--696193173";
-		private readonly string stream2Id = "LPN-FC002_LPK51001";
-
-		public when_stream_is_in_of_range_of_read_limit(bool useMaxAge) {
-			_useMaxAge = useMaxAge;
-		}
-
-		protected override void given() {
-			_hashCollisionReadLimit = 5;
-		}
-
-		protected override void when() {
-			if (_useMaxAge) {
-				_indexBackend.SetStreamMetadata(stream1Id, new StreamMetadata(maxAge:TimeSpan.FromDays(1)));
-				_indexBackend.SetStreamMetadata(stream2Id, new StreamMetadata(maxAge:TimeSpan.FromDays(1)));
-			}
-			//ptable 1
-			_tableIndex.Add(1, stream1Id, 0, 0);
-			_tableIndex.Add(1, stream2Id, 0, 3);
-			_tableIndex.Add(1, stream2Id, 1, 5);
-			_tableIndex.Add(1, stream2Id, 2, 7);
-			_tableIndex.Add(1, stream2Id, 3, 9);
-			//mem table
-			_tableIndex.Add(1, stream2Id, 4, 13);
-		}
-
-		[Test]
-		public void should_return_last_event_number() {
-			Assert.AreEqual(0, _indexReader.GetStreamLastEventNumber(stream1Id));
-		}
-	}
-
-	[TestFixture]
-	[TestFixtureSource(typeof(UseMaxAgeFixtureArgs))]
-	public class when_hash_read_limit_is_not_reached : HashCollisionTestFixture {
-		private readonly bool _useMaxAge;
-
-		public when_hash_read_limit_is_not_reached(bool useMaxAge) {
-			_useMaxAge = useMaxAge;
-		}
-
-		protected override void given() {
-			_hashCollisionReadLimit = 3;
-		}
-
-		protected override void when() {
-			string stream1Id = "account--696193173";
-			string stream2Id = "LPN-FC002_LPK51001";
-			if (_useMaxAge) {
-				_indexBackend.SetStreamMetadata(stream1Id, new StreamMetadata(maxAge:TimeSpan.FromDays(1)));
-				_indexBackend.SetStreamMetadata(stream2Id, new StreamMetadata(maxAge:TimeSpan.FromDays(1)));
-			}
-			//ptable 1
-			_tableIndex.Add(1, stream1Id, 0, 0);
-			_tableIndex.Add(1, stream2Id, 0, 3);
-			_tableIndex.Add(1, stream2Id, 1, 5);
-			_tableIndex.Add(1, stream2Id, 2, 7);
-			_tableIndex.Add(1, stream2Id, 3, 9);
-		}
-
-		[Test]
-		public void should_return_invalid_event_number() {
-			Assert.AreEqual(EventStore.Core.Data.EventNumber.Invalid,
-				_indexReader.GetStreamLastEventNumber("account--696193173"));
-		}
-	}
-
-	[TestFixture]
-	[TestFixtureSource(typeof(UseMaxAgeFixtureArgs))]
-	public class when_index_contains_duplicate_entries : HashCollisionTestFixture {
-		private readonly string streamId = "account--696193173";
-		private readonly bool _useMaxAge;
-
-		public when_index_contains_duplicate_entries(bool useMaxAge) {
-			_useMaxAge = useMaxAge;
-		}
-		protected override void given() {
-			_hashCollisionReadLimit = 5;
-		}
-
-		protected override void when() {
-			if (_useMaxAge) {
-				_indexBackend.SetStreamMetadata(streamId, new StreamMetadata(maxAge:TimeSpan.FromDays(1)));
-			}
-			//ptable 1
-			_tableIndex.Add(1, streamId, 0, 2);
-			_tableIndex.Add(1, streamId, 0, 4);
-			_tableIndex.Add(1, streamId, 1, 6);
-			_tableIndex.Add(1, streamId, 2, 8);
-		}
-
-		[Test]
-		public void should_be_able_to_read_stream_events_forward_and_exclude_duplicates() {
-			var result = _indexReader.ReadStreamEventsForward(streamId, 0, int.MaxValue);
-			Assert.AreEqual(3, result.Records.Length);
-
-			Assert.AreEqual(streamId, result.Records[0].EventStreamId);
-			Assert.AreEqual(0, result.Records[0].EventNumber);
-			Assert.AreEqual(2, result.Records[0].LogPosition);
-
-			Assert.AreEqual(streamId, result.Records[1].EventStreamId);
-			Assert.AreEqual(1, result.Records[1].EventNumber);
-			Assert.AreEqual(6, result.Records[1].LogPosition);
-
-			Assert.AreEqual(streamId, result.Records[2].EventStreamId);
-			Assert.AreEqual(2, result.Records[2].EventNumber);
-			Assert.AreEqual(8, result.Records[2].LogPosition);
-		}
-
-		[Test]
-		public void should_be_able_to_read_stream_events_backward_and_exclude_duplicates() {
-			var result = _indexReader.ReadStreamEventsBackward(streamId, 2, int.MaxValue);
-			Assert.AreEqual(3, result.Records.Length);
-
-			Assert.AreEqual(streamId, result.Records[2].EventStreamId);
-			Assert.AreEqual(0, result.Records[2].EventNumber);
-			Assert.AreEqual(2, result.Records[2].LogPosition);
-
-			Assert.AreEqual(streamId, result.Records[1].EventStreamId);
-			Assert.AreEqual(1, result.Records[1].EventNumber);
-			Assert.AreEqual(6, result.Records[1].LogPosition);
-
-			Assert.AreEqual(streamId, result.Records[0].EventStreamId);
-			Assert.AreEqual(2, result.Records[0].EventNumber);
-			Assert.AreEqual(8, result.Records[0].LogPosition);
-		}
-
-		[Test]
-		public void should_be_able_to_read_single_event_and_exclude_duplicates() {
-			var result = _indexReader.ReadEvent(streamId, 0);
-
-			Assert.AreEqual(streamId, result.Record.EventStreamId);
-			Assert.AreEqual(0, result.Record.EventNumber);
-			Assert.AreEqual(2, result.Record.LogPosition);
-		}
-	}
-
-	[TestFixture]
-	[TestFixtureSource(typeof(UseMaxAgeFixtureArgs))]
-	public class
-		when_index_contains_duplicate_entries_and_the_duplicate_is_a_64bit_index_entry : HashCollisionTestFixture {
-		private readonly string streamId = "account--696193173";
-		private readonly bool _useMaxAge;
-
-		public when_index_contains_duplicate_entries_and_the_duplicate_is_a_64bit_index_entry(bool useMaxAge) {
-			_useMaxAge = useMaxAge;
-		}
-
-		protected override void given() {
-			_maxMemTableSize = 3;
-			_hashCollisionReadLimit = 5;
-		}
-
-		protected override void when() {
-			if (_useMaxAge) {
-				_indexBackend.SetStreamMetadata(streamId, new StreamMetadata(maxAge:TimeSpan.FromDays(1)));
-			}
-			//ptable 1 with 32bit indexes
-			_tableIndex.Add(1, streamId, 0, 2);
-			_tableIndex.Add(1, streamId, 1, 4);
-			_tableIndex.Add(1, streamId, 2, 6);
-			System.Threading.Thread.Sleep(500);
-			_tableIndex.Close(false);
-			_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
-				() => new HashListMemTable(PTableVersions.IndexV2, maxSize: _maxMemTableSize),
-				() => _fakeReader,
-				PTableVersions.IndexV2,
-				5, Constants.PTableMaxReaderCountDefault,
-				maxSizeForMemory: _maxMemTableSize,
-				maxTablesPerLevel: 2);
-			_tableIndex.Initialize(long.MaxValue);
-			_indexReader = new IndexReader<string>(
-				_indexBackend, _tableIndex,
-				_logFormat.StreamNamesProvider,
-				_logFormat.StreamIdValidator,
-				_logFormat.StreamExistenceFilterReader,
-				new EventStore.Core.Data.StreamMetadata(),
-				_hashCollisionReadLimit, skipIndexScanOnRead: false);
-			//memtable with 64bit indexes
-			_tableIndex.Add(1, streamId, 0, 8);
-		}
-
-		[Test]
-		public void should_return_the_correct_last_event_number() {
-			var result = _indexReader.GetStreamLastEventNumber(streamId);
-			Assert.AreEqual(2, result);
-		}
-
-		[Test]
-		public void should_be_able_to_read_stream_events_forward_and_exclude_duplicates() {
-			var result = _indexReader.ReadStreamEventsForward(streamId, 0, int.MaxValue);
-			Assert.AreEqual(3, result.Records.Length);
-
-			Assert.AreEqual(streamId, result.Records[0].EventStreamId);
-			Assert.AreEqual(0, result.Records[0].EventNumber);
-			Assert.AreEqual(2, result.Records[0].LogPosition);
-
-			Assert.AreEqual(streamId, result.Records[1].EventStreamId);
-			Assert.AreEqual(1, result.Records[1].EventNumber);
-			Assert.AreEqual(4, result.Records[1].LogPosition);
-
-			Assert.AreEqual(streamId, result.Records[2].EventStreamId);
-			Assert.AreEqual(2, result.Records[2].EventNumber);
-			Assert.AreEqual(6, result.Records[2].LogPosition);
-		}
-
-		[Test]
-		public void should_be_able_to_read_stream_events_backward_and_exclude_duplicates() {
-			var result = _indexReader.ReadStreamEventsBackward(streamId, 2, int.MaxValue);
-			Assert.AreEqual(3, result.Records.Length);
-
-			Assert.AreEqual(streamId, result.Records[2].EventStreamId);
-			Assert.AreEqual(0, result.Records[2].EventNumber);
-			Assert.AreEqual(2, result.Records[2].LogPosition);
-
-			Assert.AreEqual(streamId, result.Records[1].EventStreamId);
-			Assert.AreEqual(1, result.Records[1].EventNumber);
-			Assert.AreEqual(4, result.Records[1].LogPosition);
-
-			Assert.AreEqual(streamId, result.Records[0].EventStreamId);
-			Assert.AreEqual(2, result.Records[0].EventNumber);
-			Assert.AreEqual(6, result.Records[0].LogPosition);
-		}
-
-		[Test]
-		public void should_be_able_to_read_single_event_and_exclude_duplicates() {
-			var result = _indexReader.ReadEvent(streamId, 0);
-
-			Assert.AreEqual(streamId, result.Record.EventStreamId);
-			Assert.AreEqual(0, result.Record.EventNumber);
-			Assert.AreEqual(2, result.Record.LogPosition);
-		}
-	}
-
-	[TestFixture]
-	public class when_stream_has_max_age : HashCollisionTestFixture {
-		private readonly string _oddStream = "LPN-FC002_LPK51001";
-		private readonly string _evenStream = "account--696193173";
-
-		protected override void when() {
-			_indexBackend.SetStreamMetadata(
-				_evenStream,
-				new StreamMetadata(maxAge: TimeSpan.FromDays(1)));
-
-			_tableIndex.Add(1, _evenStream, 5, 0);
-			_tableIndex.Add(1, _evenStream, 6, 2);
-			_tableIndex.Add(1, _oddStream, 5, 3);
-			_tableIndex.Add(1, _oddStream, 6, 5);
-			_tableIndex.Add(1, _oddStream, 7, 7);
-		}
-
-		[Test]
-		public void can_read() {
-			var result = _indexReader.ReadStreamEventsForward(
-				streamName: _evenStream,
-				fromEventNumber: 0,
-				maxCount: 2);
-
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(5, result.Records[0].EventNumber);
-			Assert.AreEqual(6, result.Records[1].EventNumber);
-		}
-	}
-
-	public class FakeIndexBackend<TStreamId> : IIndexBackend<TStreamId> {
-		private readonly TFReaderLease _readerLease;
-		private readonly Dictionary<TStreamId, IndexBackend<TStreamId>.MetadataCached> _streamMetadata =
-			new();
-
-		public FakeIndexBackend(TFReaderLease readerLease) {
-			_readerLease = readerLease;
-		}
-
-		public TFReaderLease BorrowReader() {
-			return _readerLease;
-		}
-
-		public IndexBackend<TStreamId>.EventNumberCached TryGetStreamLastEventNumber(TStreamId streamId) {
-			return new IndexBackend<TStreamId>.EventNumberCached(-1, null); //always return uncached
-		}
-
-		public IndexBackend<TStreamId>.MetadataCached TryGetStreamMetadata(TStreamId streamId) {
-			if (_streamMetadata.TryGetValue(streamId, out var metadata))
-				return metadata;
-			return new IndexBackend<TStreamId>.MetadataCached();
-		}
-
-		public long? UpdateStreamLastEventNumber(int cacheVersion, TStreamId streamId, long? lastEventNumber) {
-			return null;
-		}
-
-		public EventStore.Core.Data.StreamMetadata UpdateStreamMetadata(int cacheVersion, TStreamId streamId,
-			EventStore.Core.Data.StreamMetadata metadata) {
-			_streamMetadata[streamId] = new IndexBackend<TStreamId>.MetadataCached(1, metadata);
-			return metadata;
-		}
-
-		public long? SetStreamLastEventNumber(TStreamId streamId, long lastEventNumber) {
-			return null;
-		}
-
-		public EventStore.Core.Data.StreamMetadata SetStreamMetadata(TStreamId streamId,
-			EventStore.Core.Data.StreamMetadata metadata) {
-			_streamMetadata[streamId] = new IndexBackend<TStreamId>.MetadataCached(1, metadata);
-			return metadata;
-		}
-
-		public void SetSystemSettings(EventStore.Core.Data.SystemSettings systemSettings) {
-		}
-
-		public EventStore.Core.Data.SystemSettings GetSystemSettings() {
-			return null;
-		}
-	}
-
-	public class FakeReader : ITransactionFileReader {
-		public void Reposition(long position) {
-			throw new NotImplementedException();
-		}
-
-		public SeqReadResult TryReadNext() {
-			throw new NotImplementedException();
-		}
-
-		public SeqReadResult TryReadPrev() {
-			throw new NotImplementedException();
-		}
-
-		public RecordReadResult TryReadAt(long position, bool couldBeScavenged) {
-			var record = (LogRecord)new PrepareLogRecord(position, Guid.NewGuid(), Guid.NewGuid(), 0, 0,
-				position % 2 == 0 ? "account--696193173" : "LPN-FC002_LPK51001", null, -1, DateTime.UtcNow, PrepareFlags.None,
-				"type", null, new byte[0], null);
-			return new RecordReadResult(true, position + 1, record, 1);
-		}
-
-		public bool ExistsAt(long position) {
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_no_hash_collisions_read_index_should.cs b/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_no_hash_collisions_read_index_should.cs
deleted file mode 100644
index 16c72d9a04e..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_no_hash_collisions_read_index_should.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.HashCollisions {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_no_hash_collisions_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _prepare1;
-		private EventRecord _prepare2;
-		private EventRecord _prepare3;
-
-		protected override void WriteTestScenario() {
-			_prepare1 = WriteSingleEvent("ES", 0, "test1");
-
-			_prepare2 = WriteSingleEvent("ESES", 0, "test2");
-			_prepare3 = WriteSingleEvent("ESES", 1, "test3");
-		}
-
-		[Test]
-		public void return_minus_one_for_nonexistent_stream_as_last_event_version() {
-			Assert.AreEqual(-1, ReadIndex.GetStreamLastEventNumber("ES-NONEXISTENT"));
-		}
-
-		[Test]
-		public void return_not_found_for_get_record_from_non_existing_stream() {
-			var result = ReadIndex.ReadEvent("ES-NONEXISTING", 0);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_empty_range_on_try_get_records_from_start_for_nonexistent_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("ES-NONEXISTING", 0, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_on_try_get_records_from_end_for_nonexisting_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES-NONEXISTING", 0, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_existing_stream_with_single_event() {
-			Assert.AreEqual(0, ReadIndex.GetStreamLastEventNumber("ES"));
-		}
-
-		[Test]
-		public void return_correct_record_for_event_stream_with_single_event() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_prepare1, result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_try_get_records_from_start_for_event_stream_with_single_event() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_prepare1, result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_range_on_try_get_records_from_end_for_event_stream_with_single_event() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_prepare1, result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_nonexistent_stream_with_same_hash_as_existing_one() {
-			Assert.AreEqual(-1, ReadIndex.GetStreamLastEventNumber("AB"));
-		}
-
-		[Test]
-		public void not_find_record_for_nonexistent_event_stream_with_same_hash_as_existing_one() {
-			var result = ReadIndex.ReadEvent("AB", 0);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void
-			return_empty_range_on_try_get_records_from_start_for_nonexisting_event_stream_with_same_hash_as_existing_one() {
-			var result = ReadIndex.ReadStreamEventsForward("HG", 0, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void
-			return_empty_range_on_try_get_records_from_end_for_nonexisting_event_stream_with_same_hash_as_existing_one() {
-			var result = ReadIndex.ReadStreamEventsBackward("HG", 0, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void not_find_record_with_nonexistent_version_for_event_stream_with_single_event() {
-			var result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void not_find_record_with_non_existing_version_for_event_stream_with_same_hash_as_existing_one() {
-			var result = ReadIndex.ReadEvent("CL", 1);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_existing_stream_with_two_events() {
-			Assert.AreEqual(1, ReadIndex.GetStreamLastEventNumber("ESES"));
-		}
-
-		[Test]
-		public void return_correct_first_record_for_event_stream_with_two_events() {
-			var result = ReadIndex.ReadEvent("ESES", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_prepare2, result.Record);
-		}
-
-		[Test]
-		public void return_correct_second_record_for_event_stream_with_two_events() {
-			var result = ReadIndex.ReadEvent("ESES", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_prepare3, result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_event_stream_with_two_events() {
-			var result = ReadIndex.ReadStreamEventsForward("ESES", 0, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_prepare2, result.Records[0]);
-			Assert.AreEqual(_prepare3, result.Records[1]);
-		}
-
-		[Test]
-		public void
-			return_correct_range_on_from_end_range_query_for_event_stream_with_two_events_with_specific_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("ESES", 1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_prepare3, result.Records[0]);
-			Assert.AreEqual(_prepare2, result.Records[1]);
-		}
-
-		[Test]
-		public void
-			return_correct_range_on_from_end_range_query_for_event_stream_with_two_events_with_from_end_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("ESES", -1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_prepare3, result.Records[0]);
-			Assert.AreEqual(_prepare2, result.Records[1]);
-		}
-
-		[Test]
-		public void not_find_record_with_nonexistent_version_for_event_stream_with_two_events() {
-			var result = ReadIndex.ReadEvent("ESES", 2);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void
-			not_find_record_with_non_existing_version_for_non_existing_event_stream_with_same_hash_as_stream_with_two_events() {
-			var result = ReadIndex.ReadEvent("NONE", 2);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void
-			not_return_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_stream_with_two_events() {
-			var result = ReadIndex.ReadStreamEventsForward("NONE", 0, 2);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void
-			not_return_range_on_from_end_query_for_non_existing_stream_with_same_hash_as_stream_with_two_events() {
-			var result = ReadIndex.ReadStreamEventsBackward("NONE", 0, 2);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void
-			not_return_range_on_from_end_query_with_from_end_version_for_non_existing_stream_with_same_hash_as_stream_with_two_events() {
-			var result = ReadIndex.ReadStreamEventsBackward("NONE", -1, 2);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_single_deleted_event_stream_read_index_should.cs b/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_single_deleted_event_stream_read_index_should.cs
deleted file mode 100644
index 97e424d7d53..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_single_deleted_event_stream_read_index_should.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.HashCollisions {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_single_deleted_event_stream_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _prepare1;
-		private EventRecord _delete1;
-
-		protected override void WriteTestScenario() {
-			_prepare1 = WriteSingleEvent("ES", 0, "test1");
-			_delete1 = WriteDelete("ES");
-		}
-
-		[Test]
-		public void return_minus_one_for_nonexistent_stream_as_last_event_version() {
-			Assert.AreEqual(-1, ReadIndex.GetStreamLastEventNumber("ES-NONEXISTENT"));
-		}
-
-		[Test]
-		public void return_empty_range_on_from_start_range_query_for_non_existing_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("ES-NONEXISTING", 0, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_end_range_query_for_non_existing_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES-NONEXISTING", 0, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_not_found_for_get_record_from_non_existing_stream() {
-			var result = ReadIndex.ReadEvent("ES-NONEXISTING", 0);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_correct_event_version_for_deleted_stream() {
-			Assert.AreEqual(EventNumber.DeletedStream, ReadIndex.GetStreamLastEventNumber("ES"));
-		}
-
-		[Test]
-		public void return_stream_deleted_result_for_deleted_event_stream() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.StreamDeleted, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_start_range_query_for_deleted_event_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 1);
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_end_range_query_for_deleted_event_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", 0, 1);
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_nonexistent_stream_with_same_hash_as_deleted_one() {
-			Assert.AreEqual(-1, ReadIndex.GetStreamLastEventNumber("AB"));
-		}
-
-		[Test]
-		public void not_find_record_for_nonexistent_event_stream_with_same_hash_as_deleted_one() {
-			var result = ReadIndex.ReadEvent("AB", 0);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void
-			return_empty_range_on_from_start_query_for_nonexisting_event_stream_with_same_hash_as_deleted_one() {
-			var result = ReadIndex.ReadStreamEventsForward("HG", 0, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_on_from_end_query_for_nonexisting_event_stream_with_same_hash_as_deleted_one() {
-			var result = ReadIndex.ReadStreamEventsBackward("HG", 0, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void not_find_record_with_nonexistent_version_for_deleted_event_stream() {
-			var result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.StreamDeleted, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void not_find_record_with_non_existing_version_for_event_stream_with_same_hash_as_deleted_one() {
-			var result = ReadIndex.ReadEvent("CL", 1);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_all_events_on_read_all_forward() {
-			var events = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(2, events.Length);
-			Assert.AreEqual(_prepare1, events[0]);
-			Assert.AreEqual(_delete1, events[1]);
-		}
-
-		[Test]
-		public void return_all_events_on_read_all_backward() {
-			var events = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(2, events.Length);
-			Assert.AreEqual(_delete1, events[0]);
-			Assert.AreEqual(_prepare1, events[1]);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_one_event_each_read_index_should.cs b/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_one_event_each_read_index_should.cs
deleted file mode 100644
index 8bec3fa857c..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_one_event_each_read_index_should.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.HashCollisions {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_three_collisioned_streams_one_event_each_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _prepare1;
-		private EventRecord _prepare2;
-		private EventRecord _prepare3;
-
-		protected override void WriteTestScenario() {
-			_prepare1 = WriteSingleEvent("AB", 0, "test1");
-			_prepare2 = WriteSingleEvent("CD", 0, "test2");
-			_prepare3 = WriteSingleEvent("EF", 0, "test3");
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_first_stream() {
-			Assert.AreEqual(0, ReadIndex.GetStreamLastEventNumber("AB"));
-		}
-
-		[Test]
-		public void return_correct_log_record_for_first_stream() {
-			var result = ReadIndex.ReadEvent("AB", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_prepare1, result.Record);
-		}
-
-		[Test]
-		public void not_find_record_with_index_1_in_first_stream() {
-			var result = ReadIndex.ReadEvent("AB", 1);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("AB", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_prepare1, result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("AB", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_prepare1, result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_second_stream() {
-			Assert.AreEqual(0, ReadIndex.GetStreamLastEventNumber("CD"));
-		}
-
-		[Test]
-		public void return_correct_log_record_for_second_stream() {
-			var result = ReadIndex.ReadEvent("CD", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_prepare2, result.Record);
-		}
-
-		[Test]
-		public void not_find_record_with_index_1_in_second_stream() {
-			var result = ReadIndex.ReadEvent("CD", 1);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("CD", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_prepare2, result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("CD", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_prepare2, result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_third_stream() {
-			Assert.AreEqual(0, ReadIndex.GetStreamLastEventNumber("EF"));
-		}
-
-		[Test]
-		public void return_correct_log_record_for_third_stream() {
-			var result = ReadIndex.ReadEvent("EF", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_prepare3, result.Record);
-		}
-
-		[Test]
-		public void not_find_record_with_index_1_in_third_stream() {
-			var result = ReadIndex.ReadEvent("EF", 1);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_third_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("EF", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_prepare3, result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_third_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("EF", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_prepare3, result.Records[0]);
-		}
-
-		[Test]
-		public void return_empty_range_when_asked_to_get_few_events_from_start_starting_from_1_in_first_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("AB", 1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_when_asked_to_get_few_events_from_start_starting_from_1_in_second_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("CD", 1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_when_asked_to_get_few_events_from_start_starting_from_1_in_third_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("EF", 1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_when_asked_to_get_few_events_from_end_starting_from_1_in_first_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("AB", 1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_when_asked_to_get_few_events_from_end_starting_from_1_in_second_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("CD", 1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_when_asked_to_get_few_events_from_end_starting_from_1_in_third_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("EF", 1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_nonexistent_stream_with_same_hash() {
-			Assert.AreEqual(-1, ReadIndex.GetStreamLastEventNumber("ZZ"));
-		}
-
-		[Test]
-		public void not_find_log_record_for_nonexistent_stream_with_same_hash() {
-			var result = ReadIndex.ReadEvent("ZZ", 0);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_start_range_query_for_non_existing_stream_with_same_hash() {
-			var result = ReadIndex.ReadStreamEventsForward("ZZ", 0, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_end_range_query_for_non_existing_stream_with_same_hash() {
-			var result = ReadIndex.ReadStreamEventsBackward("ZZ", 0, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_one_event_each_with_second_stream_deleted_read_index_should.cs b/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_one_event_each_with_second_stream_deleted_read_index_should.cs
deleted file mode 100644
index 6ff57263487..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_one_event_each_with_second_stream_deleted_read_index_should.cs
+++ /dev/null
@@ -1,220 +0,0 @@
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.HashCollisions {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		with_three_collisioned_streams_one_event_each_with_second_stream_deleted_read_index_should<TLogFormat, TStreamId> :
-			ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _prepare1;
-		private EventRecord _prepare2;
-		private EventRecord _delete2;
-		private EventRecord _prepare3;
-
-		protected override void WriteTestScenario() {
-			_prepare1 = WriteSingleEvent("AB", 0, "test1");
-
-			_prepare2 = WriteSingleEvent("CD", 0, "test2");
-			_delete2 = WriteDelete("CD");
-
-			_prepare3 = WriteSingleEvent("EF", 0, "test3");
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_first_stream() {
-			Assert.AreEqual(0, ReadIndex.GetStreamLastEventNumber("AB"));
-		}
-
-		[Test]
-		public void return_correct_log_record_for_first_stream() {
-			var result = ReadIndex.ReadEvent("AB", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_prepare1, result.Record);
-		}
-
-		[Test]
-		public void not_find_record_with_index_1_in_first_stream() {
-			var result = ReadIndex.ReadEvent("AB", 1);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("AB", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_prepare1, result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("AB", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_prepare1, result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_second_stream() {
-			Assert.AreEqual(EventNumber.DeletedStream, ReadIndex.GetStreamLastEventNumber("CD"));
-		}
-
-		[Test]
-		public void not_find_log_record_for_second_stream() {
-			var result = ReadIndex.ReadEvent("CD", 0);
-			Assert.AreEqual(ReadEventResult.StreamDeleted, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void not_find_record_with_index_1_in_second_stream() {
-			var result = ReadIndex.ReadEvent("CD", 1);
-			Assert.AreEqual(ReadEventResult.StreamDeleted, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_start_range_query_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("CD", 0, 1);
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_end_range_query_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("CD", 0, 1);
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_third_stream() {
-			Assert.AreEqual(0, ReadIndex.GetStreamLastEventNumber("EF"));
-		}
-
-		[Test]
-		public void return_correct_log_record_for_third_stream() {
-			var result = ReadIndex.ReadEvent("EF", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_prepare3, result.Record);
-		}
-
-		[Test]
-		public void not_find_record_with_index_1_in_third_stream() {
-			var result = ReadIndex.ReadEvent("EF", 1);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_third_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("EF", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_prepare3, result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_third_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("EF", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_prepare3, result.Records[0]);
-		}
-
-		[Test]
-		public void return_empty_range_when_asked_to_get_few_events_from_start_starting_from_1_in_first_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("AB", 1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_when_asked_to_get_few_events_from_start_starting_from_1_in_second_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("CD", 1, 1);
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_when_asked_to_get_few_events_from_start_starting_from_1_in_third_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("EF", 1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_when_asked_to_get_few_events_from_end_starting_from_1_in_first_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("AB", 1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_when_asked_to_get_few_events_from_end_starting_from_1_in_second_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("CD", 1, 1);
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_when_asked_to_get_few_events_from_end_starting_from_1_in_third_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("EF", 1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_nonexistent_stream_with_same_hash() {
-			Assert.AreEqual(-1, ReadIndex.GetStreamLastEventNumber("ZZ"));
-		}
-
-		[Test]
-		public void not_find_log_record_for_nonexistent_stream_with_same_hash() {
-			var result = ReadIndex.ReadEvent("ZZ", 0);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_start_range_query_for_non_existing_stream_with_same_hash() {
-			var result = ReadIndex.ReadStreamEventsForward("ZZ", 0, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_end_range_query_for_non_existing_stream_with_same_hash() {
-			var result = ReadIndex.ReadStreamEventsBackward("ZZ", 0, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_all_events_on_read_all_forward() {
-			var events = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(4, events.Length);
-			Assert.AreEqual(_prepare1, events[0]);
-			Assert.AreEqual(_prepare2, events[1]);
-			Assert.AreEqual(_delete2, events[2]);
-			Assert.AreEqual(_prepare3, events[3]);
-		}
-
-		[Test]
-		public void return_all_events_on_read_all_backward() {
-			var events = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(4, events.Length);
-			Assert.AreEqual(_prepare1, events[3]);
-			Assert.AreEqual(_prepare2, events[2]);
-			Assert.AreEqual(_delete2, events[1]);
-			Assert.AreEqual(_prepare3, events[0]);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_with_different_number_of_events_each_read_index_should.cs b/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_with_different_number_of_events_each_read_index_should.cs
deleted file mode 100644
index 25233d32b8a..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_with_different_number_of_events_each_read_index_should.cs
+++ /dev/null
@@ -1,624 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using System.Linq;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.HashCollisions {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		with_three_collisioned_streams_with_different_number_of_events_each_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord[] _prepares1;
-		private EventRecord[] _prepares2;
-		private EventRecord[] _prepares3;
-
-		protected override void WriteTestScenario() {
-			_prepares1 = new EventRecord[3];
-			for (int i = 0; i < _prepares1.Length; i++) {
-				_prepares1[i] = WriteSingleEvent("AB", i, "test" + i);
-			}
-
-			_prepares2 = new EventRecord[5];
-			for (int i = 0; i < _prepares2.Length; i++) {
-				_prepares2[i] = WriteSingleEvent("CD", i, "test" + i);
-			}
-
-			_prepares3 = new EventRecord[7];
-			for (int i = 0; i < _prepares3.Length; i++) {
-				_prepares3[i] = WriteSingleEvent("EF", i, "test" + i);
-			}
-		}
-
-		#region first
-
-		[Test]
-		public void return_correct_last_event_version_for_first_stream() {
-			Assert.AreEqual(2, ReadIndex.GetStreamLastEventNumber("AB"));
-		}
-
-		[Test]
-		public void return_minus_one_when_asked_for_last_version_for_stream_with_same_hash_as_first() {
-			Assert.AreEqual(-1, ReadIndex.GetStreamLastEventNumber("FY"));
-		}
-
-		[Test]
-		public void return_correct_first_record_for_first_stream() {
-			var result = ReadIndex.ReadEvent("AB", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_prepares1[0], result.Record);
-		}
-
-		[Test]
-		public void return_correct_last_log_record_for_first_stream() {
-			var result = ReadIndex.ReadEvent("AB", 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_prepares1[2], result.Record);
-		}
-
-		[Test]
-		public void not_find_record_with_version_3_in_first_stream() {
-			var result = ReadIndex.ReadEvent("AB", 3);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_not_found_for_record_version_3_for_stream_with_same_hash_as_first_stream() {
-			var result = ReadIndex.ReadEvent("FY", 3);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_not_found_for_record_version_2_for_stream_with_same_hash_as_first_stream() {
-			var result = ReadIndex.ReadEvent("FY", 2);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_not_found_for_record_version_0_for_stream_with_same_hash_as_first_stream() {
-			var result = ReadIndex.ReadEvent("FY", 0);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("AB", 0, 3);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-
-			for (int i = 0; i < _prepares1.Length; i++) {
-				Assert.AreEqual(_prepares1[i], result.Records[i]);
-			}
-		}
-
-		[Test]
-		public void return_correct_0_1_range_on_from_start_range_query_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("AB", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-
-			Assert.AreEqual(_prepares1[0], result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_1_1_range_on_from_start_range_query_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("AB", 1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-
-			Assert.AreEqual(_prepares1[1], result.Records[0]);
-		}
-
-		[Test]
-		public void return_empty_range_for_3_1_range_on_from_start_range_query_request_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("AB", 3, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
-			var result = ReadIndex.ReadStreamEventsForward("FY", 0, 3);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void
-			return_empty_1_1_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
-			var result = ReadIndex.ReadStreamEventsForward("FY", 1, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void
-			return_empty_3_1_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
-			var result = ReadIndex.ReadStreamEventsForward("FY", 3, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_first_stream_with_specific_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("AB", 2, 3);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-
-			var records = result.Records.Reverse().ToArray();
-
-			for (int i = 0; i < _prepares1.Length; i++) {
-				Assert.AreEqual(_prepares1[i], records[i]);
-			}
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_first_stream_with_from_end_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("AB", -1, 3);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-
-			var records = result.Records.Reverse().ToArray();
-
-			for (int i = 0; i < _prepares1.Length; i++) {
-				Assert.AreEqual(_prepares1[i], records[i]);
-			}
-		}
-
-		[Test]
-		public void return_correct_0_1_range_on_from_end_range_query_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("AB", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-
-			Assert.AreEqual(_prepares1[0], result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_from_end_1_range_on_from_end_range_query_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("AB", -1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-
-			Assert.AreEqual(_prepares1[2], result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_1_1_range_on_from_end_range_query_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("AB", 1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-
-			Assert.AreEqual(_prepares1[1], result.Records[0]);
-		}
-
-		[Test]
-		public void return_empty_range_for_3_1_range_on_from_end_range_query_request_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("AB", 3, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
-			var result = ReadIndex.ReadStreamEventsBackward("FY", 0, 3);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void
-			return_empty_1_1_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
-			var result = ReadIndex.ReadStreamEventsBackward("FY", 1, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void
-			return_empty_3_1_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
-			var result = ReadIndex.ReadStreamEventsBackward("FY", 3, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		#endregion
-
-		#region second
-
-		[Test]
-		public void return_correct_last_event_version_for_second_stream() {
-			Assert.AreEqual(4, ReadIndex.GetStreamLastEventNumber("CD"));
-		}
-
-		[Test]
-		public void return_minus_one_when_aked_for_last_version_for_stream_with_same_hash_as_second() {
-			Assert.AreEqual(-1, ReadIndex.GetStreamLastEventNumber("FY"));
-		}
-
-		[Test]
-		public void return_correct_first_record_for_second_stream() {
-			var result = ReadIndex.ReadEvent("CD", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_prepares2[0], result.Record);
-		}
-
-		[Test]
-		public void return_correct_last_log_record_for_second_stream() {
-			var result = ReadIndex.ReadEvent("CD", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_prepares2[4], result.Record);
-		}
-
-		[Test]
-		public void not_find_record_with_version_5_in_second_stream() {
-			var result = ReadIndex.ReadEvent("CD", 5);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-		}
-
-		[Test]
-		public void return_not_found_for_record_version_5_for_stream_with_same_hash_as_second_stream() {
-			var result = ReadIndex.ReadEvent("FY", 5);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_not_found_for_record_version_4_for_stream_with_same_hash_as_second_stream() {
-			var result = ReadIndex.ReadEvent("FY", 4);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_not_found_for_record_version_0_for_stream_with_same_hash_as_second_stream() {
-			var result = ReadIndex.ReadEvent("FY", 0);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("CD", 0, 5);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-
-			for (int i = 0; i < _prepares2.Length; i++) {
-				Assert.AreEqual(_prepares2[i], result.Records[i]);
-			}
-		}
-
-		[Test]
-		public void return_correct_0_2_range_on_from_start_range_query_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("CD", 0, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-
-			Assert.AreEqual(_prepares2[0], result.Records[0]);
-			Assert.AreEqual(_prepares2[1], result.Records[1]);
-		}
-
-		[Test]
-		public void return_correct_2_2_range_on_from_start_range_query_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("CD", 2, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-
-			Assert.AreEqual(_prepares2[2], result.Records[0]);
-			Assert.AreEqual(_prepares2[3], result.Records[1]);
-		}
-
-		[Test]
-		public void return_empty_range_for_5_1_range_on_from_start_range_query_request_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("CD", 5, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void
-			return_empty_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_second_one() {
-			var result = ReadIndex.ReadStreamEventsForward("FY", 0, 5);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void
-			return_empty_5_1_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_second_one() {
-			var result = ReadIndex.ReadStreamEventsForward("FY", 5, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_second_stream_with_from_end_vesion() {
-			var result = ReadIndex.ReadStreamEventsBackward("CD", -1, 5);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-
-			var records = result.Records.Reverse().ToArray();
-
-			for (int i = 0; i < _prepares2.Length; i++) {
-				Assert.AreEqual(_prepares2[i], records[i]);
-			}
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_second_stream_with_specific_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("CD", 4, 5);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-
-			var records = result.Records.Reverse().ToArray();
-
-			for (int i = 0; i < _prepares2.Length; i++) {
-				Assert.AreEqual(_prepares2[i], records[i]);
-			}
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_second_stream_with_from_end_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("CD", -1, 5);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-
-			var records = result.Records.Reverse().ToArray();
-
-			for (int i = 0; i < _prepares2.Length; i++) {
-				Assert.AreEqual(_prepares2[i], records[i]);
-			}
-		}
-
-		[Test]
-		public void return_correct_0_1_range_on_from_end_range_query_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("CD", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-
-			Assert.AreEqual(_prepares2[0], result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_from_end_1_range_on_from_end_range_query_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("CD", -1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-
-			Assert.AreEqual(_prepares2[4], result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_1_1_range_on_from_end_range_query_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("CD", 1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-
-			Assert.AreEqual(_prepares2[1], result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_from_end_2_range_on_from_end_range_query_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("CD", -1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-
-			Assert.AreEqual(_prepares2[4], result.Records[0]);
-			Assert.AreEqual(_prepares2[3], result.Records[1]);
-		}
-
-		[Test]
-		public void return_empty_range_for_5_1_range_on_from_end_range_query_request_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("CD", 5, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_second_one() {
-			var result = ReadIndex.ReadStreamEventsBackward("FY", 0, 5);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void
-			return_empty_5_1_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_second_one() {
-			var result = ReadIndex.ReadStreamEventsBackward("FY", 5, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		#endregion
-
-		#region third
-
-		[Test]
-		public void return_correct_last_event_version_for_third_stream() {
-			Assert.AreEqual(6, ReadIndex.GetStreamLastEventNumber("EF"));
-		}
-
-		[Test]
-		public void return_minus_one_when_aked_for_last_version_for_stream_with_same_hash_as_third() {
-			Assert.AreEqual(-1, ReadIndex.GetStreamLastEventNumber("FY"));
-		}
-
-		[Test]
-		public void return_correct_first_record_for_third_stream() {
-			var result = ReadIndex.ReadEvent("EF", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_prepares3[0], result.Record);
-		}
-
-		[Test]
-		public void return_correct_last_log_record_for_third_stream() {
-			var result = ReadIndex.ReadEvent("EF", 6);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_prepares3[6], result.Record);
-		}
-
-		[Test]
-		public void not_find_record_with_version_7_in_third_stream() {
-			var result = ReadIndex.ReadEvent("EF", 7);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_not_found_for_record_version_7_for_stream_with_same_hash_as_third_stream() {
-			var result = ReadIndex.ReadEvent("FY", 7);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_third_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("EF", 0, 7);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(7, result.Records.Length);
-
-			for (int i = 0; i < _prepares3.Length; i++) {
-				Assert.AreEqual(_prepares3[i], result.Records[i]);
-			}
-		}
-
-		[Test]
-		public void return_correct_0_7_range_on_from_start_range_query_for_third_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("EF", 0, 7);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(7, result.Records.Length);
-
-			Assert.AreEqual(_prepares3[0], result.Records[0]);
-			Assert.AreEqual(_prepares3[1], result.Records[1]);
-			Assert.AreEqual(_prepares3[2], result.Records[2]);
-			Assert.AreEqual(_prepares3[3], result.Records[3]);
-			Assert.AreEqual(_prepares3[4], result.Records[4]);
-			Assert.AreEqual(_prepares3[5], result.Records[5]);
-			Assert.AreEqual(_prepares3[6], result.Records[6]);
-		}
-
-		[Test]
-		public void return_correct_2_3_range_on_from_start_range_query_for_third_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("EF", 2, 3);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-
-			Assert.AreEqual(_prepares3[2], result.Records[0]);
-			Assert.AreEqual(_prepares3[3], result.Records[1]);
-			Assert.AreEqual(_prepares3[4], result.Records[2]);
-		}
-
-		[Test]
-		public void return_empty_range_for_7_1_range_on_from_start_range_query_request_for_third_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("EF", 7, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_third_one() {
-			var result = ReadIndex.ReadStreamEventsForward("FY", 0, 7);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void
-			return_empty_7_1_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_third_one() {
-			var result = ReadIndex.ReadStreamEventsForward("EF", 7, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_third_stream_from_specific_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("EF", 6, 7);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(7, result.Records.Length);
-
-			var records = result.Records.Reverse().ToArray();
-
-			for (int i = 0; i < _prepares3.Length; i++) {
-				Assert.AreEqual(_prepares3[i], records[i]);
-			}
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_third_stream_with_from_end_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("EF", -1, 7);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(7, result.Records.Length);
-
-			var records = result.Records.Reverse().ToArray();
-
-			for (int i = 0; i < _prepares3.Length; i++) {
-				Assert.AreEqual(_prepares3[i], records[i]);
-			}
-		}
-
-		[Test]
-		public void return_correct_0_1_range_on_from_end_range_query_for_third_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("EF", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-
-			Assert.AreEqual(_prepares3[0], result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_from_end_1_range_on_from_end_range_query_for_third_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("EF", -1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-
-			Assert.AreEqual(_prepares3[6], result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_1_1_range_on_from_end_range_query_for_third_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("EF", 1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-
-			Assert.AreEqual(_prepares3[1], result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_from_end_2_range_on_from_end_range_query_for_third_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("EF", -1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-
-			Assert.AreEqual(_prepares3[6], result.Records[0]);
-			Assert.AreEqual(_prepares3[5], result.Records[1]);
-		}
-
-		[Test]
-		public void return_empty_range_for_7_1_range_on_from_end_range_query_request_for_third_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("EF", 7, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_third_one() {
-			var result = ReadIndex.ReadStreamEventsBackward("FY", 0, 7);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void
-			return_empty_7_1_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_third_one() {
-			var result = ReadIndex.ReadStreamEventsBackward("EF", 7, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		#endregion
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_with_different_number_of_events_third_one_deleted_each_read_index_should.cs b/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_with_different_number_of_events_third_one_deleted_each_read_index_should.cs
deleted file mode 100644
index c348fb8ace0..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_with_different_number_of_events_third_one_deleted_each_read_index_should.cs
+++ /dev/null
@@ -1,615 +0,0 @@
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.HashCollisions {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		with_three_collisioned_streams_with_different_number_of_events_third_one_deleted_each_read_index_should<TLogFormat, TStreamId> :
-			ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord[] _prepares1;
-		private EventRecord[] _prepares2;
-		private EventRecord[] _prepares3;
-		private EventRecord _delete3;
-
-		protected override void WriteTestScenario() {
-			_prepares1 = new EventRecord[3];
-			for (int i = 0; i < _prepares1.Length; i++) {
-				_prepares1[i] = WriteSingleEvent("AB", i, "test" + i);
-			}
-
-			_prepares2 = new EventRecord[5];
-			for (int i = 0; i < _prepares2.Length; i++) {
-				_prepares2[i] = WriteSingleEvent("CD", i, "test" + i);
-			}
-
-			_prepares3 = new EventRecord[7];
-			for (int i = 0; i < _prepares3.Length; i++) {
-				_prepares3[i] = WriteSingleEvent("EF", i, "test" + i);
-			}
-
-			_delete3 = WriteDelete("EF");
-		}
-
-		#region first
-
-		[Test]
-		public void return_correct_last_event_version_for_first_stream() {
-			Assert.AreEqual(2, ReadIndex.GetStreamLastEventNumber("AB"));
-		}
-
-		[Test]
-		public void return_minus_one_when_asked_for_last_version_for_stream_with_same_hash_as_first() {
-			Assert.AreEqual(-1, ReadIndex.GetStreamLastEventNumber("FY"));
-		}
-
-		[Test]
-		public void return_correct_first_record_for_first_stream() {
-			var result = ReadIndex.ReadEvent("AB", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_prepares1[0], result.Record);
-		}
-
-		[Test]
-		public void return_correct_last_log_record_for_first_stream() {
-			var result = ReadIndex.ReadEvent("AB", 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_prepares1[2], result.Record);
-		}
-
-		[Test]
-		public void not_find_record_with_version_3_in_first_stream() {
-			var result = ReadIndex.ReadEvent("AB", 3);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_not_found_for_record_version_3_for_stream_with_same_hash_as_first_stream() {
-			var result = ReadIndex.ReadEvent("FY", 3);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_not_found_for_record_version_2_for_stream_with_same_hash_as_first_stream() {
-			var result = ReadIndex.ReadEvent("FY", 2);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_not_found_for_record_version_0_for_stream_with_same_hash_as_first_stream() {
-			var result = ReadIndex.ReadEvent("FY", 0);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("AB", 0, 3);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-
-			for (int i = 0; i < _prepares1.Length; i++) {
-				Assert.AreEqual(_prepares1[i], result.Records[i]);
-			}
-		}
-
-		[Test]
-		public void return_correct_0_1_range_on_from_start_range_query_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("AB", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-
-			Assert.AreEqual(_prepares1[0], result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_1_1_range_on_from_start_range_query_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("AB", 1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-
-			Assert.AreEqual(_prepares1[1], result.Records[0]);
-		}
-
-		[Test]
-		public void return_empty_range_for_3_1_range_on_from_start_range_query_request_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("AB", 3, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
-			var result = ReadIndex.ReadStreamEventsForward("FY", 0, 3);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void
-			return_empty_1_1_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
-			var result = ReadIndex.ReadStreamEventsForward("FY", 1, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void
-			return_empty_3_1_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
-			var result = ReadIndex.ReadStreamEventsForward("FY", 3, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_first_stream_with_specific_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("AB", 2, 3);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-
-			var records = result.Records.Reverse().ToArray();
-
-			for (int i = 0; i < _prepares1.Length; i++) {
-				Assert.AreEqual(_prepares1[i], records[i]);
-			}
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_first_stream_with_from_end_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("AB", -1, 3);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-
-			var records = result.Records.Reverse().ToArray();
-
-			for (int i = 0; i < _prepares1.Length; i++) {
-				Assert.AreEqual(_prepares1[i], records[i]);
-			}
-		}
-
-		[Test]
-		public void return_correct_0_1_range_on_from_end_range_query_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("AB", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-
-			Assert.AreEqual(_prepares1[0], result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_from_end_1_range_on_from_end_range_query_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("AB", -1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-
-			Assert.AreEqual(_prepares1[2], result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_1_1_range_on_from_end_range_query_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("AB", 1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-
-			Assert.AreEqual(_prepares1[1], result.Records[0]);
-		}
-
-		[Test]
-		public void return_empty_range_for_3_1_range_on_from_end_range_query_request_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("AB", 3, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
-			var result = ReadIndex.ReadStreamEventsBackward("FY", 0, 3);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void
-			return_empty_1_1_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
-			var result = ReadIndex.ReadStreamEventsBackward("FY", 1, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void
-			return_empty_3_1_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
-			var result = ReadIndex.ReadStreamEventsBackward("FY", 3, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		#endregion
-
-		#region second
-
-		[Test]
-		public void return_correct_last_event_version_for_second_stream() {
-			Assert.AreEqual(4, ReadIndex.GetStreamLastEventNumber("CD"));
-		}
-
-		[Test]
-		public void return_minus_one_when_aked_for_last_version_for_stream_with_same_hash_as_second() {
-			Assert.AreEqual(-1, ReadIndex.GetStreamLastEventNumber("FY"));
-		}
-
-		[Test]
-		public void return_correct_first_record_for_second_stream() {
-			var result = ReadIndex.ReadEvent("CD", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_prepares2[0], result.Record);
-		}
-
-		[Test]
-		public void return_correct_last_log_record_for_second_stream() {
-			var result = ReadIndex.ReadEvent("CD", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_prepares2[4], result.Record);
-		}
-
-		[Test]
-		public void not_find_record_with_version_5_in_second_stream() {
-			var result = ReadIndex.ReadEvent("CD", 5);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_not_found_for_record_version_5_for_stream_with_same_hash_as_second_stream() {
-			var result = ReadIndex.ReadEvent("FY", 5);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_not_found_for_record_version_4_for_stream_with_same_hash_as_second_stream() {
-			var result = ReadIndex.ReadEvent("FY", 4);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_not_found_for_record_version_0_for_stream_with_same_hash_as_second_stream() {
-			var result = ReadIndex.ReadEvent("FY", 0);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("CD", 0, 5);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-
-			for (int i = 0; i < _prepares2.Length; i++) {
-				Assert.AreEqual(_prepares2[i], result.Records[i]);
-			}
-		}
-
-		[Test]
-		public void return_correct_0_2_range_on_from_start_range_query_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("CD", 0, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-
-			Assert.AreEqual(_prepares2[0], result.Records[0]);
-			Assert.AreEqual(_prepares2[1], result.Records[1]);
-		}
-
-		[Test]
-		public void return_correct_2_2_range_on_from_start_range_query_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("CD", 2, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-
-			Assert.AreEqual(_prepares2[2], result.Records[0]);
-			Assert.AreEqual(_prepares2[3], result.Records[1]);
-		}
-
-		[Test]
-		public void return_empty_range_for_5_1_range_on_from_start_range_query_request_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("CD", 5, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void
-			return_empty_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_second_one() {
-			var result = ReadIndex.ReadStreamEventsForward("FY", 0, 5);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void
-			return_empty_5_1_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_second_one() {
-			var result = ReadIndex.ReadStreamEventsForward("FY", 5, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_second_stream_with_specific_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("CD", 4, 5);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-
-			var records = result.Records.Reverse().ToArray();
-
-			for (int i = 0; i < _prepares2.Length; i++) {
-				Assert.AreEqual(_prepares2[i], records[i]);
-			}
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_second_stream_with_from_end_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("CD", -1, 5);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-
-			var records = result.Records.Reverse().ToArray();
-
-			for (int i = 0; i < _prepares2.Length; i++) {
-				Assert.AreEqual(_prepares2[i], records[i]);
-			}
-		}
-
-		[Test]
-		public void return_correct_0_1_range_on_from_end_range_query_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("CD", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-
-			Assert.AreEqual(_prepares2[0], result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_from_end_1_range_on_from_end_range_query_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("CD", -1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-
-			Assert.AreEqual(_prepares2[4], result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_1_1_range_on_from_end_range_query_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("CD", 1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-
-			Assert.AreEqual(_prepares2[1], result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_from_end_2_range_on_from_end_range_query_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("CD", -1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-
-			Assert.AreEqual(_prepares2[4], result.Records[0]);
-			Assert.AreEqual(_prepares2[3], result.Records[1]);
-		}
-
-		[Test]
-		public void return_empty_range_for_5_1_range_on_from_end_range_query_request_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("CD", 5, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_second_one() {
-			var result = ReadIndex.ReadStreamEventsBackward("FY", 0, 5);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void
-			return_empty_5_1_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_second_one() {
-			var result = ReadIndex.ReadStreamEventsBackward("FY", 5, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		#endregion
-
-		#region third
-
-		[Test]
-		public void return_correct_last_event_version_for_third_stream() {
-			Assert.AreEqual(EventNumber.DeletedStream, ReadIndex.GetStreamLastEventNumber("EF"));
-		}
-
-		[Test]
-		public void return_minus_one_when_aked_for_last_version_for_stream_with_same_hash_as_third() {
-			Assert.AreEqual(-1, ReadIndex.GetStreamLastEventNumber("FY"));
-		}
-
-		[Test]
-		public void not_find_first_record_for_third_stream() {
-			var result = ReadIndex.ReadEvent("EF", 0);
-			Assert.AreEqual(ReadEventResult.StreamDeleted, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void not_find_last_log_record_for_third_stream() {
-			var result = ReadIndex.ReadEvent("EF", 6);
-			Assert.AreEqual(ReadEventResult.StreamDeleted, result.Result);
-		}
-
-		[Test]
-		public void not_find_record_with_version_7_in_third_stream() {
-			var result = ReadIndex.ReadEvent("EF", 7);
-			Assert.AreEqual(ReadEventResult.StreamDeleted, result.Result);
-		}
-
-		[Test]
-		public void return_not_found_for_record_version_7_for_stream_with_same_hash_as_third_stream() {
-			var result = ReadIndex.ReadEvent("FY", 7);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_start_range_query_for_third_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("EF", 0, 7);
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_0_7_range_on_from_start_range_query_for_third_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("EF", 0, 7);
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_2_3_range_on_from_start_range_query_for_third_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("EF", 2, 3);
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_for_7_1_range_on_from_start_range_query_request_for_third_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("EF", 7, 1);
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_third_one() {
-			var result = ReadIndex.ReadStreamEventsForward("FY", 0, 7);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void
-			return_empty_7_1_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_third_one() {
-			var result = ReadIndex.ReadStreamEventsForward("EF", 7, 1);
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_end_range_query_for_third_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("EF", 0, 7);
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_0_1_range_on_from_end_range_query_for_third_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("EF", 0, 1);
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_1_1_range_on_from_end_range_query_for_third_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("EF", 1, 1);
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_for_7_1_range_on_from_end_range_query_request_for_third_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("EF", 7, 1);
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_third_one() {
-			var result = ReadIndex.ReadStreamEventsBackward("FY", 0, 7);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void
-			return_empty_7_1_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_third_one() {
-			var result = ReadIndex.ReadStreamEventsBackward("EF", 7, 1);
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		#endregion
-
-		#region all
-
-		[Test]
-		public void return_all_prepares_on_read_all_forward() {
-			var events = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(3 + 5 + 7 + 1, events.Length);
-
-			Assert.AreEqual(_prepares1[0], events[0]);
-			Assert.AreEqual(_prepares1[1], events[1]);
-			Assert.AreEqual(_prepares1[2], events[2]);
-
-			Assert.AreEqual(_prepares2[0], events[3]);
-			Assert.AreEqual(_prepares2[1], events[4]);
-			Assert.AreEqual(_prepares2[2], events[5]);
-			Assert.AreEqual(_prepares2[3], events[6]);
-			Assert.AreEqual(_prepares2[4], events[7]);
-
-			Assert.AreEqual(_prepares3[0], events[8]);
-			Assert.AreEqual(_prepares3[1], events[9]);
-			Assert.AreEqual(_prepares3[2], events[10]);
-			Assert.AreEqual(_prepares3[3], events[11]);
-			Assert.AreEqual(_prepares3[4], events[12]);
-			Assert.AreEqual(_prepares3[5], events[13]);
-			Assert.AreEqual(_prepares3[6], events[14]);
-
-			Assert.AreEqual(_delete3, events[15]);
-		}
-
-		[Test]
-		public void return_all_prepares_on_read_all_backward() {
-			var events = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(3 + 5 + 7 + 1, events.Length);
-
-			Assert.AreEqual(_prepares1[0], events[15]);
-			Assert.AreEqual(_prepares1[1], events[14]);
-			Assert.AreEqual(_prepares1[2], events[13]);
-
-			Assert.AreEqual(_prepares2[0], events[12]);
-			Assert.AreEqual(_prepares2[1], events[11]);
-			Assert.AreEqual(_prepares2[2], events[10]);
-			Assert.AreEqual(_prepares2[3], events[9]);
-			Assert.AreEqual(_prepares2[4], events[8]);
-
-			Assert.AreEqual(_prepares3[0], events[7]);
-			Assert.AreEqual(_prepares3[1], events[6]);
-			Assert.AreEqual(_prepares3[2], events[5]);
-			Assert.AreEqual(_prepares3[3], events[4]);
-			Assert.AreEqual(_prepares3[4], events[3]);
-			Assert.AreEqual(_prepares3[5], events[2]);
-			Assert.AreEqual(_prepares3[6], events[1]);
-
-			Assert.AreEqual(_delete3, events[0]);
-		}
-
-		#endregion
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_two_collisioned_streams_one_event_each_first_stream_deleted_read_index_should.cs b/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_two_collisioned_streams_one_event_each_first_stream_deleted_read_index_should.cs
deleted file mode 100644
index 034505689b4..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_two_collisioned_streams_one_event_each_first_stream_deleted_read_index_should.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.HashCollisions {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		with_two_collisioned_streams_one_event_each_first_stream_deleted_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _prepare1;
-		private EventRecord _delete1;
-		private EventRecord _prepare2;
-
-		protected override void WriteTestScenario() {
-			_prepare1 = WriteSingleEvent("AB", 0, "test1");
-			_delete1 = WriteDelete("AB");
-
-			_prepare2 = WriteSingleEvent("CD", 0, "test2");
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_first_stream() {
-			Assert.AreEqual(EventNumber.DeletedStream, ReadIndex.GetStreamLastEventNumber("AB"));
-		}
-
-		[Test]
-		public void not_find_log_record_for_first_stream() {
-			var result = ReadIndex.ReadEvent("AB", 0);
-			Assert.AreEqual(ReadEventResult.StreamDeleted, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_start_range_query_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("AB", 0, 1);
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_end_range_query_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("AB", 0, 1);
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_start_range_query_for_invalid_arguments_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("AB", 1, 1);
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_end_range_query_for_invalid_arguments_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("AB", 1, 1);
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_second_stream() {
-			Assert.AreEqual(0, ReadIndex.GetStreamLastEventNumber("CD"));
-		}
-
-		[Test]
-		public void return_correct_log_record_for_second_stream() {
-			var result = ReadIndex.ReadEvent("CD", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_prepare2, result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("CD", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(_prepare2, result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("CD", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_prepare2, result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_nonexistent_stream_with_same_hash() {
-			Assert.AreEqual(-1, ReadIndex.GetStreamLastEventNumber("EF"));
-		}
-
-		[Test]
-		public void not_find_log_record_for_nonexistent_stream_with_same_hash() {
-			var result = ReadIndex.ReadEvent("EF", 0);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void not_return_range_for_non_existing_stream_with_same_hash() {
-			var result = ReadIndex.ReadStreamEventsBackward("EF", 0, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_all_events_on_read_all_forward() {
-			var events = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(3, events.Length);
-			Assert.AreEqual(_prepare1, events[0]);
-			Assert.AreEqual(_delete1, events[1]);
-			Assert.AreEqual(_prepare2, events[2]);
-		}
-
-		[Test]
-		public void return_all_events_on_read_all_backward() {
-			var events = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(3, events.Length);
-			Assert.AreEqual(_prepare1, events[2]);
-			Assert.AreEqual(_delete1, events[1]);
-			Assert.AreEqual(_prepare2, events[0]);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_two_collisioned_streams_one_event_each_read_index_should.cs b/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_two_collisioned_streams_one_event_each_read_index_should.cs
deleted file mode 100644
index 7f26beb30a0..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/HashCollisions/with_two_collisioned_streams_one_event_each_read_index_should.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.HashCollisions {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_two_collisioned_streams_one_event_each_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _prepare1;
-		private EventRecord _prepare2;
-
-		protected override void WriteTestScenario() {
-			_prepare1 = WriteSingleEvent("AB", 0, "test1");
-			_prepare2 = WriteSingleEvent("CD", 0, "test2");
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_first_stream() {
-			Assert.AreEqual(0, ReadIndex.GetStreamLastEventNumber("AB"));
-		}
-
-		[Test]
-		public void return_correct_log_record_for_first_stream() {
-			var result = ReadIndex.ReadEvent("AB", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_prepare1, result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("AB", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_prepare1, result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("AB", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_prepare1, result.Records[0]);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_start_range_query_for_invalid_arguments_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("AB", 1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_empty_range_on_from_end_range_query_for_invalid_arguments_for_first_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("AB", 1, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_second_stream() {
-			Assert.AreEqual(0, ReadIndex.GetStreamLastEventNumber("CD"));
-		}
-
-		[Test]
-		public void return_correct_log_record_for_second_stream() {
-			var result = ReadIndex.ReadEvent("CD", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_prepare2, result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("CD", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_prepare2, result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_second_stream() {
-			var result = ReadIndex.ReadStreamEventsBackward("CD", 0, 1);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(1, result.Records.Length);
-			Assert.AreEqual(_prepare2, result.Records[0]);
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_nonexistent_stream_with_same_hash() {
-			Assert.AreEqual(-1, ReadIndex.GetStreamLastEventNumber("EF"));
-		}
-
-		[Test]
-		public void not_find_log_record_for_nonexistent_stream_with_same_hash() {
-			var result = ReadIndex.ReadEvent("EF", 0);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void not_return_range_for_non_existing_stream_with_same_hash() {
-			var result = ReadIndex.ReadStreamEventsBackward("EF", 0, 1);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_batch_of_events_after_the_first_batch_has_been_replicated.cs b/src/EventStore.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_batch_of_events_after_the_first_batch_has_been_replicated.cs
deleted file mode 100644
index 0ecec0ea982..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_batch_of_events_after_the_first_batch_has_been_replicated.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.Idempotency {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_writing_a_second_batch_of_events_after_the_first_batch_has_been_replicated<TLogFormat, TStreamId> : WriteEventsToIndexScenario<TLogFormat, TStreamId>{
-		private const int _numEvents = 10;
-		private List<Guid> _eventIds = new List<Guid>();
-		private TStreamId _streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-
-		public override void WriteEvents() {
-			var expectedEventNumber = -1;
-			var transactionPosition = 1000;
-			var eventTypes = new List<TStreamId>();
-
-			for (var i = 0; i < _numEvents; i++) {
-				_eventIds.Add(Guid.NewGuid());
-				eventTypes.Add(LogFormatHelper<TLogFormat, TStreamId>.EventTypeId);
-			}
-
-			var prepares = CreatePrepareLogRecords(_streamId, expectedEventNumber, eventTypes, _eventIds, transactionPosition);
-			var commit = CreateCommitLogRecord(transactionPosition + 1000 * _numEvents, transactionPosition, expectedEventNumber + _numEvents);
-
-			/*First batch write: committed to db and index*/
-			WriteToDB(prepares);
-			PreCommitToIndex(prepares);
-
-			WriteToDB(commit);
-			PreCommitToIndex(commit);
-
-			CommitToIndex(prepares);
-			CommitToIndex(commit);
-		}
-
-		[Test]
-		public void check_commit_with_same_expectedversion_should_return_idempotent_decision() {
-			/*Second, idempotent write*/
-			var commitCheckResult = _indexWriter.CheckCommit(_streamId, -1, _eventIds, streamMightExist: true);
-			Assert.AreEqual(CommitDecision.Idempotent, commitCheckResult.Decision);
-		}
-
-		[Test]
-		public void check_commit_with_expectedversion_any_should_return_idempotent_decision() {
-			/*Second, idempotent write*/
-			var commitCheckResult = _indexWriter.CheckCommit(_streamId, ExpectedVersion.Any, _eventIds, streamMightExist: true);
-			Assert.AreEqual(CommitDecision.Idempotent, commitCheckResult.Decision);
-		}
-
-		[Test]
-		public void check_commit_with_next_expectedversion_should_return_ok_decision() {
-			var commitCheckResult = _indexWriter.CheckCommit(_streamId, _numEvents-1, _eventIds, streamMightExist: true);
-			Assert.AreEqual(CommitDecision.Ok, commitCheckResult.Decision);
-		}
-
-		[Test]
-		public void check_commit_with_incorrect_expectedversion_should_return_wrongexpectedversion_decision() {
-			var commitCheckResult = _indexWriter.CheckCommit(_streamId, _numEvents, _eventIds, streamMightExist: true);
-			Assert.AreEqual(CommitDecision.WrongExpectedVersion, commitCheckResult.Decision);
-		}
-
-		[Test]
-		public void check_commit_with_same_expectedversion_but_different_non_first_event_id_should_return_corruptedidempotency_decision() {
-			/*Second, idempotent write but one of the event ids is different*/
-			var ids = new List<Guid>();
-			foreach(var id in _eventIds)
-				ids.Add(id);
-			
-			ids[ids.Count-2] = Guid.NewGuid();
-
-			var commitCheckResult = _indexWriter.CheckCommit(_streamId, -1, ids, streamMightExist: true);
-			Assert.AreEqual(CommitDecision.CorruptedIdempotency, commitCheckResult.Decision);
-		}
-
-		[Test]
-		public void check_commit_with_same_expectedversion_but_different_first_event_id_should_return_wrongexpectedversion_decision() {
-			/*Second, idempotent write but one of the event ids is different*/
-			var ids = new List<Guid>();
-			foreach(var id in _eventIds)
-				ids.Add(id);
-			
-			ids[0] = Guid.NewGuid();
-
-			var commitCheckResult = _indexWriter.CheckCommit(_streamId, -1, ids, streamMightExist: true);
-			Assert.AreEqual(CommitDecision.WrongExpectedVersion, commitCheckResult.Decision);
-		}
-    }
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_batch_of_events_after_the_first_batch_has_not_yet_been_replicated.cs b/src/EventStore.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_batch_of_events_after_the_first_batch_has_not_yet_been_replicated.cs
deleted file mode 100644
index e31a74c5755..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_batch_of_events_after_the_first_batch_has_not_yet_been_replicated.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.Idempotency {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_writing_a_second_batch_of_events_after_the_first_batch_has_not_yet_been_replicated<TLogFormat, TStreamId> : WriteEventsToIndexScenario<TLogFormat, TStreamId>{
-		private const int _numEvents = 10;
-		private List<Guid> _eventIds = new List<Guid>();
-		private TStreamId _streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-
-        public override void WriteEvents()
-        {
-			var expectedEventNumber = -1;
-			var transactionPosition = 1000;
-			var eventTypes = new List<TStreamId>();
-			
-			for(var i=0;i<_numEvents;i++){
-				_eventIds.Add(Guid.NewGuid());
-				eventTypes.Add(LogFormatHelper<TLogFormat, TStreamId>.EventTypeId);
-			}
-
-			var prepares = CreatePrepareLogRecords(_streamId, expectedEventNumber, eventTypes, _eventIds, transactionPosition);
-			var commit = CreateCommitLogRecord(transactionPosition + 1000 * _numEvents, transactionPosition, expectedEventNumber + _numEvents);
-			
-			/*First batch write: committed to db and pre-committed to index but not yet committed to index*/
-			WriteToDB(prepares);
-			PreCommitToIndex(prepares);
-			
-			WriteToDB(commit);
-			PreCommitToIndex(commit);
-        }
-
-		[Test]
-		public void check_commit_with_same_expectedversion_should_return_idempotentnotready_decision() {
-			/*Second, idempotent write*/
-			var commitCheckResult = _indexWriter.CheckCommit(_streamId, -1, _eventIds, streamMightExist: true);
-			Assert.AreEqual(CommitDecision.IdempotentNotReady, commitCheckResult.Decision);
-		}
-
-		[Test]
-		public void check_commit_with_expectedversion_any_should_return_idempotentnotready_decision() {
-			/*Second, idempotent write*/
-			var commitCheckResult = _indexWriter.CheckCommit(_streamId, ExpectedVersion.Any, _eventIds, streamMightExist: true);
-			Assert.AreEqual(CommitDecision.IdempotentNotReady, commitCheckResult.Decision);
-		}
-
-		[Test]
-		public void check_commit_with_next_expectedversion_should_return_ok_decision() {
-			var commitCheckResult = _indexWriter.CheckCommit(_streamId, _numEvents-1, _eventIds, streamMightExist: true);
-			Assert.AreEqual(CommitDecision.Ok, commitCheckResult.Decision);
-		}
-
-		[Test]
-		public void check_commit_with_incorrect_expectedversion_should_return_wrongexpectedversion_decision() {
-			var commitCheckResult = _indexWriter.CheckCommit(_streamId, _numEvents, _eventIds, streamMightExist: true);
-			Assert.AreEqual(CommitDecision.WrongExpectedVersion, commitCheckResult.Decision);
-		}
-
-		[Test]
-		public void check_commit_with_same_expectedversion_but_different_non_first_event_id_should_return_corruptedidempotency_decision() {
-			/*Second, idempotent write but one of the event ids is different*/
-			var ids = new List<Guid>();
-			foreach(var id in _eventIds)
-				ids.Add(id);
-			
-			ids[ids.Count-2] = Guid.NewGuid();
-
-			var commitCheckResult = _indexWriter.CheckCommit(_streamId, -1, ids, streamMightExist: true);
-			Assert.AreEqual(CommitDecision.CorruptedIdempotency, commitCheckResult.Decision);
-		}
-
-		[Test]
-		public void check_commit_with_same_expectedversion_but_different_first_event_id_should_return_wrongexpectedversion_decision() {
-			/*Second, idempotent write but one of the event ids is different*/
-			var ids = new List<Guid>();
-			foreach(var id in _eventIds)
-				ids.Add(id);
-			
-			ids[0] = Guid.NewGuid();
-
-			var commitCheckResult = _indexWriter.CheckCommit(_streamId, -1, ids, streamMightExist: true);
-			Assert.AreEqual(CommitDecision.WrongExpectedVersion, commitCheckResult.Decision);
-		}
-    }
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_event_after_the_first_event_has_been_replicated.cs b/src/EventStore.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_event_after_the_first_event_has_been_replicated.cs
deleted file mode 100644
index 5358d071d7f..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_event_after_the_first_event_has_been_replicated.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.Idempotency {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_writing_a_second_event_after_the_first_event_has_been_replicated<TLogFormat, TStreamId> : WriteEventsToIndexScenario<TLogFormat, TStreamId>{
-		private Guid _eventId = Guid.NewGuid();
-		private TStreamId _streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-
-		public override void WriteEvents() {
-			var expectedEventNumber = -1;
-			var transactionPosition = 1000;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			var prepares = CreatePrepareLogRecord(_streamId, expectedEventNumber, eventTypeId, _eventId, transactionPosition);
-			var commit = CreateCommitLogRecord(transactionPosition + RecordOffset, transactionPosition, expectedEventNumber + 1);
-
-			/*First write: committed to db and index*/
-			WriteToDB(prepares);
-			PreCommitToIndex(prepares);
-
-			WriteToDB(commit);
-			PreCommitToIndex(commit);
-
-			CommitToIndex(prepares);
-			CommitToIndex(commit);
-		}
-
-		[Test]
-		public void check_commit_with_same_expectedversion_should_return_idempotent_decision() {
-			/*Second, idempotent write*/
-			var commitCheckResult = _indexWriter.CheckCommit(_streamId, -1, new Guid[] { _eventId }, streamMightExist: true);
-			Assert.AreEqual(CommitDecision.Idempotent, commitCheckResult.Decision);
-		}
-
-		[Test]
-		public void check_commit_with_expectedversion_any_should_return_idempotent_decision() {
-			/*Second, idempotent write*/
-			var commitCheckResult = _indexWriter.CheckCommit(_streamId, ExpectedVersion.Any, new Guid[] { _eventId }, streamMightExist: true);
-			Assert.AreEqual(CommitDecision.Idempotent, commitCheckResult.Decision);
-		}
-
-		[Test]
-		public void check_commit_with_next_expectedversion_should_return_ok_decision() {
-			var commitCheckResult = _indexWriter.CheckCommit(_streamId, 0, new Guid[] { _eventId }, streamMightExist: true);
-			Assert.AreEqual(CommitDecision.Ok, commitCheckResult.Decision);
-		}
-
-		[Test]
-		public void check_commit_with_incorrect_expectedversion_should_return_wrongexpectedversion_decision() {
-			var commitCheckResult = _indexWriter.CheckCommit(_streamId, 1, new Guid[] { _eventId }, streamMightExist: true);
-			Assert.AreEqual(CommitDecision.WrongExpectedVersion, commitCheckResult.Decision);
-		}
-    }
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_event_after_the_first_event_has_not_yet_been_replicated.cs b/src/EventStore.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_event_after_the_first_event_has_not_yet_been_replicated.cs
deleted file mode 100644
index 868e595fea5..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_event_after_the_first_event_has_not_yet_been_replicated.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.Idempotency {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_writing_a_second_event_after_the_first_event_has_not_yet_been_replicated<TLogFormat, TStreamId> : WriteEventsToIndexScenario<TLogFormat, TStreamId>{
-		private Guid _eventId = Guid.NewGuid();
-		private TStreamId _streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-
-		public override void WriteEvents() {
-			var expectedEventNumber = -1;
-			var transactionPosition = 1000;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			var prepares = CreatePrepareLogRecord(_streamId, expectedEventNumber, eventTypeId, _eventId, transactionPosition);
-			var commit = CreateCommitLogRecord(transactionPosition + RecordOffset, transactionPosition, expectedEventNumber + 1);
-
-			/*First write: committed to db and pre-committed to index but not yet committed to index*/
-			WriteToDB(prepares);
-			PreCommitToIndex(prepares);
-
-			WriteToDB(commit);
-			PreCommitToIndex(commit);
-		}
-
-		[Test]
-		public void check_commit_with_same_expectedversion_should_return_idempotentnotready_decision() {
-			/*Second, idempotent write*/
-			var commitCheckResult = _indexWriter.CheckCommit(_streamId, -1, new Guid[] { _eventId }, streamMightExist: true);
-			Assert.AreEqual(CommitDecision.IdempotentNotReady, commitCheckResult.Decision);
-		}
-
-		[Test]
-		public void check_commit_with_expectedversion_any_should_return_idempotentnotready_decision() {
-			/*Second, idempotent write*/
-			var commitCheckResult = _indexWriter.CheckCommit(_streamId, ExpectedVersion.Any, new Guid[] { _eventId }, streamMightExist: true);
-			Assert.AreEqual(CommitDecision.IdempotentNotReady, commitCheckResult.Decision);
-		}
-
-		[Test]
-		public void check_commit_with_next_expectedversion_should_return_ok_decision() {
-			/*Second, idempotent write*/
-			var commitCheckResult = _indexWriter.CheckCommit(_streamId, 0, new Guid[] { _eventId }, streamMightExist: true);
-			Assert.AreEqual(CommitDecision.Ok, commitCheckResult.Decision);
-		}
-
-		[Test]
-		public void check_commit_with_incorrect_expectedversion_should_return_wrongexpectedversion_decision() {
-			/*Second, idempotent write*/
-			var commitCheckResult = _indexWriter.CheckCommit(_streamId, 1, new Guid[] { _eventId }, streamMightExist: true);
-			Assert.AreEqual(CommitDecision.WrongExpectedVersion, commitCheckResult.Decision);
-		}
-    }
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/FilteredTableIndex.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/FilteredTableIndex.cs
deleted file mode 100644
index b06f3e456ce..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/FilteredTableIndex.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount.AfterScavenge {
-	// simulates particular entries having been removed from the index by scavenge
-	public class FilteredTableIndex<TStreamId> : ITableIndex<TStreamId> {
-		private readonly ITableIndex<TStreamId> _wrapped;
-		private readonly Func<IndexEntry, bool> _condition;
-		public FilteredTableIndex(ITableIndex<TStreamId> wrapped, Func<IndexEntry, bool> condition) {
-			_wrapped = wrapped;
-			_condition = condition;
-		}
-
-		public long CommitCheckpoint => _wrapped.CommitCheckpoint;
-
-		public long PrepareCheckpoint => _wrapped.PrepareCheckpoint;
-
-		public bool IsBackgroundTaskRunning => _wrapped.IsBackgroundTaskRunning;
-
-		public void Add(long commitPos, TStreamId streamId, long version, long position) {
-			_wrapped.Add(commitPos, streamId, version, position);
-		}
-
-		public void AddEntries(long commitPos, IList<IndexKey<TStreamId>> entries) {
-			_wrapped.AddEntries(commitPos, entries);
-		}
-
-		public void Close(bool removeFiles = true) {
-			_wrapped.Close(removeFiles);
-		}
-
-		public IReadOnlyList<IndexEntry> GetRange(TStreamId streamId, long startVersion, long endVersion, int? limit = null) {
-			return _wrapped
-				.GetRange(streamId, startVersion, endVersion, limit)
-				.Where(_condition)
-				.ToList();
-		}
-
-		public IReadOnlyList<IndexEntry> GetRange(ulong stream, long startVersion, long endVersion, int? limit = null) {
-			return _wrapped
-				.GetRange(stream, startVersion, endVersion, limit)
-				.Where(_condition)
-				.ToList();
-		}
-
-		public void Initialize(long chaserCheckpoint) {
-			_wrapped.Initialize(chaserCheckpoint);
-		}
-
-		public IEnumerable<ISearchTable> IterateAllInOrder() {
-			return _wrapped.IterateAllInOrder();
-		}
-
-		public Task MergeIndexes() {
-			return _wrapped.MergeIndexes();
-		}
-
-		public void Scavenge(IIndexScavengerLog log, CancellationToken ct) {
-			throw new NotImplementedException();
-		}
-
-		public void Scavenge(Func<IndexEntry, bool> shouldKeep, IIndexScavengerLog log, CancellationToken ct) {
-			throw new NotImplementedException();
-		}
-
-		public bool TryGetLatestEntry(TStreamId streamId, out IndexEntry entry) {
-			var got = _wrapped.TryGetLatestEntry(streamId, out entry);
-			if (!got)
-				return false;
-			if (_condition(entry))
-				return true;
-
-			// we got the latest entry from the wrapped but it doesn't pass our condition
-			var range = GetRange(streamId, 0, long.MaxValue);
-			if (range.Count == 0)
-				return false;
-			entry = range[0];
-			return true;
-		}
-
-		public bool TryGetLatestEntry(ulong stream, long beforePosition, Func<IndexEntry, bool> isForThisStream, out IndexEntry entry) {
-			throw new NotImplementedException();
-		}
-
-		public bool TryGetLatestEntry(TStreamId streamId, long beforePosition, Func<IndexEntry, bool> isForThisStream, out IndexEntry entry) {
-			throw new NotImplementedException();
-		}
-
-		public bool TryGetNextEntry(TStreamId streamId, long afterVersion, out IndexEntry entry) {
-			var got = _wrapped.TryGetNextEntry(streamId, afterVersion, out entry);
-			if (!got)
-				return false;
-			if (_condition(entry))
-				return true;
-
-			// we got the next entry from wrapped but it doesn't pass our condition
-			var range = GetRange(streamId, afterVersion, long.MaxValue);
-			if (range.Count == 0)
-				return false;
-			entry = range[^1];
-			return true;
-		}
-
-		public bool TryGetNextEntry(ulong stream, long afterVersion, out IndexEntry entry) {
-			var got = _wrapped.TryGetNextEntry(stream, afterVersion, out entry);
-			if (!got)
-				return false;
-			if (_condition(entry))
-				return true;
-
-			// we got the next entry from wrapped but it doesn't pass our condition
-			var range = GetRange(stream, afterVersion, long.MaxValue);
-			if (range.Count == 0)
-				return false;
-			entry = range[^1];
-			return true;
-		}
-
-		public bool TryGetOldestEntry(TStreamId streamId, out IndexEntry entry) {
-			var got = _wrapped.TryGetOldestEntry(streamId, out entry);
-			if (!got)
-				return false;
-			if (_condition(entry))
-				return true;
-
-			// we got the oldest entry from the wrapped but it doesn't pass our condition
-			var range = GetRange(streamId, 0, long.MaxValue);
-			if (range.Count == 0)
-				return false;
-			entry = range[^1];
-			return true;
-		}
-
-		public bool TryGetOneValue(TStreamId streamId, long version, out long position) {
-			throw new NotImplementedException();
-		}
-
-		public bool TryGetPreviousEntry(TStreamId streamId, long beforeVersion, out IndexEntry entry) {
-			throw new NotImplementedException();
-		}
-
-		public bool TryGetPreviousEntry(ulong stream, long beforeVersion, out IndexEntry entry) {
-			throw new NotImplementedException();
-		}
-
-		public void WaitForBackgroundTasks(int millisecondsTimeout) {
-			_wrapped.WaitForBackgroundTasks(millisecondsTimeout);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_gaps_in_index.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_gaps_in_index.cs
deleted file mode 100644
index ecf6a6b6f01..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_gaps_in_index.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Index;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount.AfterScavenge {
-	public abstract class MaxAgeIterationTests : ReadIndexTestScenario<LogFormat.V2, string> {
-		public ulong _esHash;
-
-		protected abstract long[] ExtantIndexEntries { get; }
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-			var expired = now.AddMinutes(-50);
-
-			var metadata = string.Format(@"{{""$maxAge"":{0}}}", (int)TimeSpan.FromMinutes(10).TotalSeconds);
-
-			WriteStreamMetadata("ES", 0, metadata);
-
-			// the stream had ten events in it but 8 of them have expired leaving only the last two.
-			WriteSingleEvent("ES", 0, "data", expired);
-			WriteSingleEvent("ES", 1, "data", expired);
-			WriteSingleEvent("ES", 2, "data", expired);
-			WriteSingleEvent("ES", 3, "data", expired);
-			WriteSingleEvent("ES", 4, "data", expired);
-			WriteSingleEvent("ES", 5, "data", expired);
-			WriteSingleEvent("ES", 6, "data", expired);
-			WriteSingleEvent("ES", 7, "data", expired);
-			WriteSingleEvent("ES", 8, "data", now);
-			WriteSingleEvent("ES", 9, "data", now);
-			_esHash = Hasher.Hash("ES");
-
-			// dont scavenge the index because we want to keep most of the entries
-			// simulate removal by using FilteredTableIndex
-			Scavenge(completeLast: true, mergeChunks: false, scavengeIndex: false);
-		}
-
-		protected override ITableIndex<string> TransformTableIndex(ITableIndex<string> tableIndex) {
-			return new FilteredTableIndex<string>(
-				tableIndex,
-				// keep everything from other streams, but only the ExtantEntries of "ES"
-				entry => entry.Stream != _esHash || ExtantIndexEntries.Contains(entry.Version));
-		}
-
-		// repeatedly issue reads, each one starting from the previous `nextEventNumber`
-		// until we find the event we are looking for.
-		protected void ReadOneStartingFrom(long fromEventNumber, long expectedEventNumber) {
-			var attempts = new List<long>();
-			for (int i = 0; i < 20; i++) {
-				attempts.Add(fromEventNumber);
-				var result = ReadIndex.ReadStreamEventsForward("ES", fromEventNumber, maxCount: 1);
-
-				if (result.Records.Length != 0) {
-					Assert.AreEqual(expectedEventNumber, result.Records[0].EventNumber);
-					return;
-				}
-
-				fromEventNumber = result.NextEventNumber;
-			}
-
-			throw new Exception("iterated too many times. infinite loop?");
-		}
-
-		protected void ReadOneStartingFromEach() {
-			ReadOneStartingFrom(0, 8);
-			ReadOneStartingFrom(1, 8);
-			ReadOneStartingFrom(2, 8);
-			ReadOneStartingFrom(3, 8);
-			ReadOneStartingFrom(4, 8);
-			ReadOneStartingFrom(5, 8);
-			ReadOneStartingFrom(6, 8);
-			ReadOneStartingFrom(7, 8);
-			ReadOneStartingFrom(8, 8);
-			ReadOneStartingFrom(9, 9);
-		}
-	}
-
-	public class when_having_gaps_in_index_on_maxage_fast_path : MaxAgeIterationTests {
-		protected override long[] ExtantIndexEntries { get; } = new long[] { 0, 1, 2, 3, 4, 5, 6, 8, 9 };
-		
-		[Test]
-		public void works() => ReadOneStartingFromEach();
-	}
-
-	public class when_having_gaps_in_index_on_maxage_fast_path2 : MaxAgeIterationTests {
-		protected override long[] ExtantIndexEntries { get; } = new long[] { 0, 8, 9 };
-
-		[Test]
-		public void works() => ReadOneStartingFromEach();
-	}
-
-	public class when_having_gaps_in_index_on_maxage_fast_path3 : MaxAgeIterationTests {
-		protected override long[] ExtantIndexEntries { get; } = new long[] { 2, 8, 9 };
-
-		[Test]
-		public void works() => ReadOneStartingFromEach();
-	}
-
-	public class when_having_gaps_in_index_on_maxage_fast_path4 : MaxAgeIterationTests {
-		protected override long[] ExtantIndexEntries { get; } = new long[] { 1, 3, 5, 7, 8, 9 };
-
-		[Test]
-		public void works() => ReadOneStartingFromEach();
-	}
-
-	public class when_having_gaps_in_index_on_maxage_fast_path5 : MaxAgeIterationTests {
-		protected override long[] ExtantIndexEntries { get; } = new long[] { 0, 2, 4, 6, 8, 9 };
-
-		[Test]
-		public void works() => ReadOneStartingFromEach();
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_both_maxage_and_maxcount_specified_with_maxage_more_strict.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_both_maxage_and_maxcount_specified_with_maxage_more_strict.cs
deleted file mode 100644
index 27aa32ac76c..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_both_maxage_and_maxcount_specified_with_maxage_more_strict.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount.AfterScavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_having_stream_both_maxage_and_maxcount_specified_with_maxage_more_strict<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r1;
-		private EventRecord _r5;
-		private EventRecord _r6;
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-
-			var metadata = string.Format(@"{{""$maxAge"":{0},""$maxCount"":4}}",
-				(int)TimeSpan.FromMinutes(10).TotalSeconds);
-			_r1 = WriteStreamMetadata("ES", 0, metadata);
-			WriteSingleEvent("ES", 0, "bla1", now.AddMinutes(-50));
-			WriteSingleEvent("ES", 1, "bla1", now.AddMinutes(-20));
-			WriteSingleEvent("ES", 2, "bla1", now.AddMinutes(-11));
-			_r5 = WriteSingleEvent("ES", 3, "bla1", now.AddMinutes(-5));
-			_r6 = WriteSingleEvent("ES", 4, "bla1", now.AddMinutes(-1));
-
-			Scavenge(completeLast: true, mergeChunks: false);
-		}
-
-		[Test]
-		public void single_event_read_doesnt_return_expired_events_and_returns_all_actual_ones() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r5, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r6, result.Record);
-		}
-
-		[Test]
-		public void forward_range_read_doesnt_return_expired_records() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_r5, result.Records[0]);
-			Assert.AreEqual(_r6, result.Records[1]);
-		}
-
-		[Test]
-		public void backward_range_read_doesnt_return_expired_records() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_r6, result.Records[0]);
-			Assert.AreEqual(_r5, result.Records[1]);
-		}
-
-		[Test]
-		public void read_all_forward_doesnt_return_expired_records() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords();
-			Assert.AreEqual(3, records.Count);
-			Assert.AreEqual(_r1, records[0].Event);
-			Assert.AreEqual(_r5, records[1].Event);
-			Assert.AreEqual(_r6, records[2].Event);
-		}
-
-		[Test]
-		public void read_all_backward_doesnt_return_expired_records() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords();
-			Assert.AreEqual(3, records.Count);
-			Assert.AreEqual(_r6, records[0].Event);
-			Assert.AreEqual(_r5, records[1].Event);
-			Assert.AreEqual(_r1, records[2].Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_both_maxage_and_maxcount_specified_with_maxcount_more_strict.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_both_maxage_and_maxcount_specified_with_maxcount_more_strict.cs
deleted file mode 100644
index 6eab5b6d722..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_both_maxage_and_maxcount_specified_with_maxcount_more_strict.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount.AfterScavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_having_stream_both_maxage_and_maxcount_specified_with_maxcount_more_strict<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r1;
-		private EventRecord _r4;
-		private EventRecord _r5;
-		private EventRecord _r6;
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-
-			var metadata = string.Format(@"{{""$maxAge"":{0},""$maxCount"":3}}",
-				(int)TimeSpan.FromMinutes(60).TotalSeconds);
-
-			_r1 = WriteStreamMetadata("ES", 0, metadata);
-			WriteSingleEvent("ES", 0, "bla1", now.AddMinutes(-100));
-			WriteSingleEvent("ES", 1, "bla1", now.AddMinutes(-20));
-			_r4 = WriteSingleEvent("ES", 2, "bla1", now.AddMinutes(-11));
-			_r5 = WriteSingleEvent("ES", 3, "bla1", now.AddMinutes(-5));
-			_r6 = WriteSingleEvent("ES", 4, "bla1", now.AddMinutes(-1));
-
-			Scavenge(completeLast: true, mergeChunks: false);
-		}
-
-		[Test]
-		public void single_event_read_doesnt_return_expired_events_and_returns_all_actual_ones() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r4, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r5, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r6, result.Record);
-		}
-
-		[Test]
-		public void forward_range_read_doesnt_return_expired_records() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_r4, result.Records[0]);
-			Assert.AreEqual(_r5, result.Records[1]);
-			Assert.AreEqual(_r6, result.Records[2]);
-		}
-
-		[Test]
-		public void backward_range_read_doesnt_return_expired_records() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_r6, result.Records[0]);
-			Assert.AreEqual(_r5, result.Records[1]);
-			Assert.AreEqual(_r4, result.Records[2]);
-		}
-
-		[Test]
-		public void read_all_forward_doesnt_return_expired_records() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords();
-			Assert.AreEqual(4, records.Count);
-			Assert.AreEqual(_r1, records[0].Event);
-			Assert.AreEqual(_r4, records[1].Event);
-			Assert.AreEqual(_r5, records[2].Event);
-			Assert.AreEqual(_r6, records[3].Event);
-		}
-
-		[Test]
-		public void read_all_backward_doesnt_return_expired_records() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords();
-			Assert.AreEqual(4, records.Count);
-			Assert.AreEqual(_r6, records[0].Event);
-			Assert.AreEqual(_r5, records[1].Event);
-			Assert.AreEqual(_r4, records[2].Event);
-			Assert.AreEqual(_r1, records[3].Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_with_maxage_specified.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_with_maxage_specified.cs
deleted file mode 100644
index bfc88f139ce..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_with_maxage_specified.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount.AfterScavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_having_stream_with_maxage_specified<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r1;
-		private EventRecord _r5;
-		private EventRecord _r6;
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-
-			var metadata = string.Format(@"{{""$maxAge"":{0}}}", (int)TimeSpan.FromMinutes(10).TotalSeconds);
-
-			_r1 = WriteStreamMetadata("ES", 0, metadata);
-			WriteSingleEvent("ES", 0, "bla1", now.AddMinutes(-50));
-			WriteSingleEvent("ES", 1, "bla1", now.AddMinutes(-20));
-			WriteSingleEvent("ES", 2, "bla1", now.AddMinutes(-11));
-			_r5 = WriteSingleEvent("ES", 3, "bla1", now.AddMinutes(-5));
-			_r6 = WriteSingleEvent("ES", 4, "bla1", now.AddMinutes(-1));
-
-			Scavenge(completeLast: true, mergeChunks: false);
-		}
-
-		[Test]
-		public void single_event_read_doesnt_return_expired_events_and_returns_all_actual_ones() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r5, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r6, result.Record);
-		}
-
-		[Test]
-		public void forward_range_read_doesnt_return_expired_records() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_r5, result.Records[0]);
-			Assert.AreEqual(_r6, result.Records[1]);
-		}
-
-		[Test]
-		public void backward_range_read_doesnt_return_expired_records() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_r6, result.Records[0]);
-			Assert.AreEqual(_r5, result.Records[1]);
-		}
-
-		[Test]
-		public void read_all_forward_doesnt_return_expired_records() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords();
-			Assert.AreEqual(3, records.Count);
-			Assert.AreEqual(_r1, records[0].Event);
-			Assert.AreEqual(_r5, records[1].Event);
-			Assert.AreEqual(_r6, records[2].Event);
-		}
-
-		[Test]
-		public void read_all_backward_doesnt_return_expired_records() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords();
-			Assert.AreEqual(3, records.Count);
-			Assert.AreEqual(_r6, records[0].Event);
-			Assert.AreEqual(_r5, records[1].Event);
-			Assert.AreEqual(_r1, records[2].Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_with_maxcount_specified.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_with_maxcount_specified.cs
deleted file mode 100644
index b8076e4df44..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_with_maxcount_specified.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount.AfterScavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_having_stream_with_maxcount_specified<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r1;
-		private EventRecord _r3;
-		private EventRecord _r4;
-		private EventRecord _r5;
-		private EventRecord _r6;
-
-		protected override void WriteTestScenario() {
-			const string metadata = @"{""$maxCount"":4}";
-
-			_r1 = WriteStreamMetadata("ES", 0, metadata);
-			WriteSingleEvent("ES", 0, "bla1");
-			_r3 = WriteSingleEvent("ES", 1, "bla1");
-			_r4 = WriteSingleEvent("ES", 2, "bla1");
-			_r5 = WriteSingleEvent("ES", 3, "bla1");
-			_r6 = WriteSingleEvent("ES", 4, "bla1");
-
-			Scavenge(completeLast: true, mergeChunks: false);
-		}
-
-		[Test]
-		public void single_event_read_doesnt_return_old_events_and_return_actual_ones() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r3, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r4, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r5, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r6, result.Record);
-		}
-
-		[Test]
-		public void forward_range_read_doesnt_return_old_records() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(4, result.Records.Length);
-			Assert.AreEqual(_r3, result.Records[0]);
-			Assert.AreEqual(_r4, result.Records[1]);
-			Assert.AreEqual(_r5, result.Records[2]);
-			Assert.AreEqual(_r6, result.Records[3]);
-		}
-
-		[Test]
-		public void backward_range_read_doesnt_return_expired_records() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(4, result.Records.Length);
-			Assert.AreEqual(_r6, result.Records[0]);
-			Assert.AreEqual(_r5, result.Records[1]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r3, result.Records[3]);
-		}
-
-		[Test]
-		public void read_all_forward_doesnt_return_expired_records() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords();
-			Assert.AreEqual(5, records.Count);
-			Assert.AreEqual(_r1, records[0].Event);
-			Assert.AreEqual(_r3, records[1].Event);
-			Assert.AreEqual(_r4, records[2].Event);
-			Assert.AreEqual(_r5, records[3].Event);
-			Assert.AreEqual(_r6, records[4].Event);
-		}
-
-		[Test]
-		public void read_all_backward_doesnt_return_expired_records() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords();
-			Assert.AreEqual(5, records.Count);
-			Assert.AreEqual(_r6, records[0].Event);
-			Assert.AreEqual(_r5, records[1].Event);
-			Assert.AreEqual(_r4, records[2].Event);
-			Assert.AreEqual(_r3, records[3].Event);
-			Assert.AreEqual(_r1, records[4].Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_with_truncatebefore_specified.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_with_truncatebefore_specified.cs
deleted file mode 100644
index 42d5157e1e7..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_with_truncatebefore_specified.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using EventStore.Core.Data;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount.AfterScavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_having_stream_with_truncatebefore_specified<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r1;
-		private EventRecord _r3;
-		private EventRecord _r4;
-		private EventRecord _r5;
-		private EventRecord _r6;
-
-		protected override void WriteTestScenario() {
-			const string metadata = @"{""$tb"":1}";
-
-			_r1 = WriteStreamMetadata("ES", 0, metadata);
-			WriteSingleEvent("ES", 0, "bla1");
-			_r3 = WriteSingleEvent("ES", 1, "bla1");
-			_r4 = WriteSingleEvent("ES", 2, "bla1");
-			_r5 = WriteSingleEvent("ES", 3, "bla1");
-			_r6 = WriteSingleEvent("ES", 4, "bla1");
-
-			Scavenge(completeLast: true, mergeChunks: false);
-		}
-
-		[Test]
-		public void single_event_read_doesnt_return_old_events_and_return_actual_ones() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r3, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r4, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r5, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r6, result.Record);
-		}
-
-		[Test]
-		public void forward_range_read_doesnt_return_old_records() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(4, result.Records.Length);
-			Assert.AreEqual(_r3, result.Records[0]);
-			Assert.AreEqual(_r4, result.Records[1]);
-			Assert.AreEqual(_r5, result.Records[2]);
-			Assert.AreEqual(_r6, result.Records[3]);
-		}
-
-		[Test]
-		public void backward_range_read_doesnt_return_expired_records() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(4, result.Records.Length);
-			Assert.AreEqual(_r6, result.Records[0]);
-			Assert.AreEqual(_r5, result.Records[1]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r3, result.Records[3]);
-		}
-
-		[Test]
-		public void read_all_forward_doesnt_return_expired_records() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords();
-			Assert.AreEqual(5, records.Count);
-			Assert.AreEqual(_r1, records[0].Event);
-			Assert.AreEqual(_r3, records[1].Event);
-			Assert.AreEqual(_r4, records[2].Event);
-			Assert.AreEqual(_r5, records[3].Event);
-			Assert.AreEqual(_r6, records[4].Event);
-		}
-
-		[Test]
-		public void read_all_backward_doesnt_return_expired_records() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords();
-			Assert.AreEqual(5, records.Count);
-			Assert.AreEqual(_r6, records[0].Event);
-			Assert.AreEqual(_r5, records[1].Event);
-			Assert.AreEqual(_r4, records[2].Event);
-			Assert.AreEqual(_r3, records[3].Event);
-			Assert.AreEqual(_r1, records[4].Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_age.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_age.cs
deleted file mode 100644
index a3768c1f8db..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_age.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount.ReadRangeAndNextEventNumber {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_reading_stream_with_max_age<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _event2;
-		private EventRecord _event3;
-		private EventRecord _event4;
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-
-			var metadata = string.Format(@"{{""$maxAge"":{0}}}", (int)TimeSpan.FromMinutes(20).TotalSeconds);
-			WriteStreamMetadata("ES", 0, metadata, now.AddMinutes(-100));
-			WriteSingleEvent("ES", 0, "bla", now.AddMinutes(-50)); // expired
-			WriteSingleEvent("ES", 1, "bla", now.AddMinutes(-25)); // expired
-			_event2 = WriteSingleEvent("ES", 2, "bla", now.AddMinutes(-15)); // active
-			_event3 = WriteSingleEvent("ES", 3, "bla", now.AddMinutes(-11)); // active
-			_event4 = WriteSingleEvent("ES", 4, "bla", now.AddMinutes(-3)); // active
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_start_to_expired_next_event_number_is_expired_plus_1_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 0, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(2, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_start_to_active_next_event_number_is_last_read_event_plus_1_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 0, 4);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(4, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(2, records.Length);
-			Assert.AreEqual(_event2, records[0]);
-			Assert.AreEqual(_event3, records[1]);
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_expired_to_active_next_event_number_is_last_read_event_plus_1_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(3, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(1, records.Length);
-			Assert.AreEqual(_event2, records[0]);
-		}
-
-		[Test]
-		public void on_read_forward_from_expired_to_end_next_event_number_is_end_plus_1_and_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 1, 4);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(5, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event2, records[0]);
-			Assert.AreEqual(_event3, records[1]);
-			Assert.AreEqual(_event4, records[2]);
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_expired_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 1, 6);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(5, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event2, records[0]);
-			Assert.AreEqual(_event3, records[1]);
-			Assert.AreEqual(_event4, records[2]);
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_out_of_bounds_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 7, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(5, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-
-		[Test]
-		public void
-			on_read_backward_from_end_to_active_next_event_number_is_last_read_event_minus_1_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 4, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(2, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(2, records.Length);
-			Assert.AreEqual(_event4, records[0]);
-			Assert.AreEqual(_event3, records[1]);
-		}
-
-		[Test]
-		public void
-			on_read_backward_from_end_to_maxage_bound_next_event_number_is_maxage_bound_minus_1_and_its_not_end_of_stream() // just no simple way to tell this
-		{
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 4, 3);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(1, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event4, records[0]);
-			Assert.AreEqual(_event3, records[1]);
-			Assert.AreEqual(_event2, records[2]);
-		}
-
-		[Test]
-		public void on_read_backward_from_active_to_expired_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 3, 3);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(-1, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(2, records.Length);
-			Assert.AreEqual(_event3, records[0]);
-			Assert.AreEqual(_event2, records[1]);
-		}
-
-		[Test]
-		public void on_read_backward_from_expired_to_expired_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(-1, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-		[Test]
-		public void on_read_backward_from_expired_to_before_start_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 1, 5);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(-1, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-		[Test]
-		public void
-			on_read_backward_from_out_of_bounds_to_out_of_bounds_next_event_number_is_end_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 10, 3);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(4, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_age_and_max_count_and_max_age_is_more_strict.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_age_and_max_count_and_max_age_is_more_strict.cs
deleted file mode 100644
index 3fcb37be9e5..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_age_and_max_count_and_max_age_is_more_strict.cs
+++ /dev/null
@@ -1,270 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount.ReadRangeAndNextEventNumber {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_reading_stream_with_max_age_and_max_count_and_max_age_is_more_strict<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _event3;
-		private EventRecord _event4;
-		private EventRecord _event5;
-
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-
-			var metadata = string.Format(@"{{""$maxAge"":{0},""$maxCount"":5}}",
-				(int)TimeSpan.FromMinutes(20).TotalSeconds);
-
-			WriteStreamMetadata("ES", 0, metadata);
-			WriteSingleEvent("ES", 0, "bla", now.AddMinutes(-100)); // expired: maxcount & maxage
-			WriteSingleEvent("ES", 1, "bla", now.AddMinutes(-50)); // expired: maxage
-			WriteSingleEvent("ES", 2, "bla", now.AddMinutes(-25)); // expired: maxage
-			_event3 = WriteSingleEvent("ES", 3, "bla", now.AddMinutes(-15)); // active
-			_event4 = WriteSingleEvent("ES", 4, "bla", now.AddMinutes(-11)); // active
-			_event5 = WriteSingleEvent("ES", 5, "bla", now.AddMinutes(-3)); // active
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_start_to_expired_next_event_number_is_expired_by_age_plus_1_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 0, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(3, res.NextEventNumber); // new path fast forwards to here
-			Assert.AreEqual(5, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_start_to_active_next_event_number_is_last_read_event_plus_1_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 0, 5);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(5, res.NextEventNumber);
-			Assert.AreEqual(5, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(2, records.Length);
-			Assert.AreEqual(_event3, records[0]);
-			Assert.AreEqual(_event4, records[1]);
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_expired_to_active_next_event_number_is_last_read_event_plus_1_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 2, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(4, res.NextEventNumber);
-			Assert.AreEqual(5, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(1, records.Length);
-			Assert.AreEqual(_event3, records[0]);
-		}
-
-		[Test]
-		public void on_read_forward_from_expired_to_end_next_event_number_is_end_plus_1_and_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 2, 4);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(6, res.NextEventNumber);
-			Assert.AreEqual(5, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event3, records[0]);
-			Assert.AreEqual(_event4, records[1]);
-			Assert.AreEqual(_event5, records[2]);
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_expired_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 2, 6);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(6, res.NextEventNumber);
-			Assert.AreEqual(5, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event3, records[0]);
-			Assert.AreEqual(_event4, records[1]);
-			Assert.AreEqual(_event5, records[2]);
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_out_of_bounds_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 7, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(6, res.NextEventNumber);
-			Assert.AreEqual(5, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-
-		[Test]
-		public void
-			on_read_backward_from_end_to_active_next_event_number_is_last_read_event_minus_1_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 5, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(3, res.NextEventNumber);
-			Assert.AreEqual(5, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(2, records.Length);
-			Assert.AreEqual(_event5, records[0]);
-			Assert.AreEqual(_event4, records[1]);
-		}
-
-		[Test]
-		public void
-			on_read_backward_from_end_to_maxage_bound_next_event_number_is_maxage_bound_minus_1_and_its_not_end_of_stream() // just no simple way to tell this
-		{
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 5, 3);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(2, res.NextEventNumber);
-			Assert.AreEqual(5, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event5, records[0]);
-			Assert.AreEqual(_event4, records[1]);
-			Assert.AreEqual(_event3, records[2]);
-		}
-
-		[Test]
-		public void on_read_backward_from_active_to_expired_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 4, 3);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(-1, res.NextEventNumber);
-			Assert.AreEqual(5, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(2, records.Length);
-			Assert.AreEqual(_event4, records[0]);
-			Assert.AreEqual(_event3, records[1]);
-		}
-
-		[Test]
-		public void on_read_backward_from_expired_to_expired_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 2, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(-1, res.NextEventNumber);
-			Assert.AreEqual(5, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-		[Test]
-		public void on_read_backward_from_expired_to_before_start_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 2, 5);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(-1, res.NextEventNumber);
-			Assert.AreEqual(5, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-		[Test]
-		public void
-			on_read_backward_from_out_of_bounds_to_out_of_bounds_next_event_number_is_end_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 10, 3);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(5, res.NextEventNumber);
-			Assert.AreEqual(5, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_reading_stream_with_max_age_and_a_mostly_expired<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat,
-			TStreamId> {
-
-		public when_reading_stream_with_max_age_and_a_mostly_expired() : base(maxEntriesInMemTable: 50,
-			chunkSize: 100000) {
-
-		}
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-
-			var metadata = string.Format(@"{{""$maxAge"":{0}}}",
-				(int)TimeSpan.FromMinutes(20).TotalSeconds);
-
-			WriteStreamMetadata("ES", 0, metadata);
-			var start = 0;
-			var end = 1008;
-			for (int i = start; i < end; i++) {
-				WriteSingleEvent("ES", i, "bla", now.AddMinutes(-100), retryOnFail: true);
-			}
-
-			start = end;
-			end += 5;
-			for (int i = start; i < end; i++) {
-				WriteSingleEvent("ES", i, "bla", now, retryOnFail: true);
-			}
-
-		}
-
-		[Test]
-		public void reading_forward_should_match_reading_backwards_in_reverse() {
-			var backwardsCollected = new List<EventRecord>();
-			var forwardsCollected = new List<EventRecord>();
-			var from = long.MaxValue;
-			while (true) {
-				var backwards = ReadIndex.ReadStreamEventsBackward("ES", from, 7);
-				for (int i = 0; i < backwards.Records.Length; i++) {
-					backwardsCollected.Add(backwards.Records[i]);
-				}
-
-				from = backwards.NextEventNumber;
-				if (backwards.IsEndOfStream) break;
-			}
-
-			from = 0;
-			while (true) {
-				var forwards = ReadIndex.ReadStreamEventsForward("ES", from, 7);
-				for (int i = 0; i < forwards.Records.Length; i++) {
-					forwardsCollected.Add(forwards.Records[i]);
-				}
-
-				from = forwards.NextEventNumber;
-				if (forwards.IsEndOfStream) break;
-			}
-
-			Assert.AreEqual(forwardsCollected.Count, backwardsCollected.Count);
-			backwardsCollected.Reverse();
-			for (int i = 0; i < backwardsCollected.Count; i++) {
-				Assert.AreEqual(backwardsCollected[i].EventId, forwardsCollected[i].EventId);
-				Assert.AreEqual(backwardsCollected[i].EventType, forwardsCollected[i].EventType);
-				Assert.AreEqual(backwardsCollected[i].ExpectedVersion, forwardsCollected[i].ExpectedVersion);
-				Assert.AreEqual(backwardsCollected[i].EventNumber, forwardsCollected[i].EventNumber);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_age_and_max_count_and_max_count_is_more_strict.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_age_and_max_count_and_max_count_is_more_strict.cs
deleted file mode 100644
index b65dc9b808b..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_age_and_max_count_and_max_count_is_more_strict.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount.ReadRangeAndNextEventNumber {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_reading_stream_with_max_age_and_max_count_and_max_count_is_more_strict<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _event2;
-		private EventRecord _event3;
-		private EventRecord _event4;
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-
-			var metadata = string.Format(@"{{""$maxAge"":{0},""$maxCount"":3}}",
-				(int)TimeSpan.FromMinutes(61).TotalSeconds);
-			WriteStreamMetadata("ES", 0, metadata, now.AddMinutes(-100));
-
-			WriteSingleEvent("ES", 0, "bla", now.AddMinutes(-50));
-			WriteSingleEvent("ES", 1, "bla", now.AddMinutes(-25));
-			_event2 = WriteSingleEvent("ES", 2, "bla", now.AddMinutes(-15));
-			_event3 = WriteSingleEvent("ES", 3, "bla", now.AddMinutes(-11));
-			_event4 = WriteSingleEvent("ES", 4, "bla", now.AddMinutes(-3));
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_start_to_expired_next_event_number_is_first_active_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 0, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(2, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_start_to_active_next_event_number_is_last_read_event_plus_1_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 0, 4);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(4, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(2, records.Length);
-			Assert.AreEqual(_event2, records[0]);
-			Assert.AreEqual(_event3, records[1]);
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_expired_to_active_next_event_number_is_last_read_event_plus_1_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(3, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(1, records.Length);
-			Assert.AreEqual(_event2, records[0]);
-		}
-
-		[Test]
-		public void on_read_forward_from_expired_to_end_next_event_number_is_end_plus_1_and_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 1, 4);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(5, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event2, records[0]);
-			Assert.AreEqual(_event3, records[1]);
-			Assert.AreEqual(_event4, records[2]);
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_expired_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 1, 6);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(5, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event2, records[0]);
-			Assert.AreEqual(_event3, records[1]);
-			Assert.AreEqual(_event4, records[2]);
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_out_of_bounds_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 7, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(5, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-
-		[Test]
-		public void
-			on_read_backward_from_end_to_active_next_event_number_is_last_read_event_minus_1_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 4, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(2, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(2, records.Length);
-			Assert.AreEqual(_event4, records[0]);
-			Assert.AreEqual(_event3, records[1]);
-		}
-
-		[Test]
-		public void on_read_backward_from_end_to_maxcount_bound_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 4, 3);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(-1, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event4, records[0]);
-			Assert.AreEqual(_event3, records[1]);
-			Assert.AreEqual(_event2, records[2]);
-		}
-
-		[Test]
-		public void on_read_backward_from_active_to_expired_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 3, 3);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(-1, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(2, records.Length);
-			Assert.AreEqual(_event3, records[0]);
-			Assert.AreEqual(_event2, records[1]);
-		}
-
-		[Test]
-		public void on_read_backward_from_expired_to_expired_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(-1, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-		[Test]
-		public void on_read_backward_from_expired_to_before_start_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 1, 5);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(-1, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-		[Test]
-		public void
-			on_read_backward_from_out_of_bounds_to_out_of_bounds_next_event_number_is_end_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 10, 3);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(4, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_count.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_count.cs
deleted file mode 100644
index 570bec113be..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_count.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-using EventStore.Core.Data;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount.ReadRangeAndNextEventNumber {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_reading_stream_with_max_count<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _event3;
-		private EventRecord _event4;
-		private EventRecord _event5;
-
-		protected override void WriteTestScenario() {
-			WriteStreamMetadata("ES", 0, @"{""$maxCount"":3}");
-			WriteSingleEvent("ES", 0, "bla");
-			WriteSingleEvent("ES", 1, "bla");
-			_event3 = WriteSingleEvent("ES", 2, "bla");
-			_event4 = WriteSingleEvent("ES", 3, "bla");
-			_event5 = WriteSingleEvent("ES", 4, "bla");
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_start_to_expired_next_event_number_is_first_active_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 0, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(2, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_start_to_active_next_event_number_is_last_read_event_plus_1_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 0, 4);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(4, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(2, records.Length);
-			Assert.AreEqual(_event3, records[0]);
-			Assert.AreEqual(_event4, records[1]);
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_expired_to_active_next_event_number_is_last_read_event_plus_1_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(3, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(1, records.Length);
-			Assert.AreEqual(_event3, records[0]);
-		}
-
-		[Test]
-		public void on_read_forward_from_expired_to_end_next_event_number_is_end_plus_1_and_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 1, 4);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(5, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event3, records[0]);
-			Assert.AreEqual(_event4, records[1]);
-			Assert.AreEqual(_event5, records[2]);
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_expired_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 1, 6);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(5, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event3, records[0]);
-			Assert.AreEqual(_event4, records[1]);
-			Assert.AreEqual(_event5, records[2]);
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_out_of_bounds_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 7, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(5, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-
-		[Test]
-		public void
-			on_read_backward_from_end_to_active_next_event_number_is_last_read_event_minus_1_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 4, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(2, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(2, records.Length);
-			Assert.AreEqual(_event5, records[0]);
-			Assert.AreEqual(_event4, records[1]);
-		}
-
-		[Test]
-		public void on_read_backward_from_end_to_maxcount_bound_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 4, 3);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(-1, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event5, records[0]);
-			Assert.AreEqual(_event4, records[1]);
-			Assert.AreEqual(_event3, records[2]);
-		}
-
-		[Test]
-		public void on_read_backward_from_active_to_expired_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 3, 3);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(-1, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(2, records.Length);
-			Assert.AreEqual(_event4, records[0]);
-			Assert.AreEqual(_event3, records[1]);
-		}
-
-		[Test]
-		public void on_read_backward_from_expired_to_expired_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(-1, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-		[Test]
-		public void on_read_backward_from_expired_to_before_start_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 1, 5);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(-1, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-		[Test]
-		public void
-			on_read_backward_from_out_of_bounds_to_out_of_bounds_next_event_number_is_end_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 10, 3);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(4, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_no_max_age_max_count.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_no_max_age_max_count.cs
deleted file mode 100644
index 0a99574ba11..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_no_max_age_max_count.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-using EventStore.Core.Data;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount.ReadRangeAndNextEventNumber {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_reading_stream_with_no_max_age_max_count<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _event0;
-		private EventRecord _event1;
-		private EventRecord _event2;
-		private EventRecord _event3;
-		private EventRecord _event4;
-
-		protected override void WriteTestScenario() {
-			_event0 = WriteSingleEvent("ES", 0, "bla");
-			_event1 = WriteSingleEvent("ES", 1, "bla");
-			_event2 = WriteSingleEvent("ES", 2, "bla");
-			_event3 = WriteSingleEvent("ES", 3, "bla");
-			_event4 = WriteSingleEvent("ES", 4, "bla");
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_start_to_middle_next_event_number_is_middle_plus_1_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 0, 3);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(3, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event0, records[0]);
-			Assert.AreEqual(_event1, records[1]);
-			Assert.AreEqual(_event2, records[2]);
-		}
-
-		[Test]
-		public void on_read_forward_from_the_middle_to_end_next_event_number_is_end_plus_1_and_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 1, 4);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(5, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(4, records.Length);
-			Assert.AreEqual(_event1, records[0]);
-			Assert.AreEqual(_event2, records[1]);
-			Assert.AreEqual(_event3, records[2]);
-			Assert.AreEqual(_event4, records[3]);
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_the_middle_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 1, 5);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(5, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(4, records.Length);
-			Assert.AreEqual(_event1, records[0]);
-			Assert.AreEqual(_event2, records[1]);
-			Assert.AreEqual(_event3, records[2]);
-			Assert.AreEqual(_event4, records[3]);
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_the_out_of_bounds_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 6, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(5, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-
-		[Test]
-		public void
-			on_read_backward_from_the_end_to_middle_next_event_number_is_middle_minus_1_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 4, 3);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(1, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event4, records[0]);
-			Assert.AreEqual(_event3, records[1]);
-			Assert.AreEqual(_event2, records[2]);
-		}
-
-		[Test]
-		public void on_read_backward_from_middle_to_start_next_event_number_is_minus_1_and_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 2, 3);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(-1, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event2, records[0]);
-			Assert.AreEqual(_event1, records[1]);
-			Assert.AreEqual(_event0, records[2]);
-		}
-
-		[Test]
-		public void on_read_backward_from_middle_to_before_start_next_event_number_is_minus_1_and_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 2, 5);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(-1, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event2, records[0]);
-			Assert.AreEqual(_event1, records[1]);
-			Assert.AreEqual(_event0, records[2]);
-		}
-
-		[Test]
-		public void
-			on_read_backward_from_out_of_bounds_to_middle_next_event_number_is_middle_minus_1_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 6, 5);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(1, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event4, records[0]);
-			Assert.AreEqual(_event3, records[1]);
-			Assert.AreEqual(_event2, records[2]);
-		}
-
-		[Test]
-		public void
-			on_read_backward_from_out_of_bounds_to_out_of_bounds_next_event_number_is_end_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 10, 3);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(4, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_start_from.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_start_from.cs
deleted file mode 100644
index d6976b13b2e..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_start_from.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-using EventStore.Core.Data;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount.ReadRangeAndNextEventNumber {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_reading_stream_with_truncatebefore<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _event3;
-		private EventRecord _event4;
-		private EventRecord _event5;
-
-		protected override void WriteTestScenario() {
-			WriteStreamMetadata("ES", 0, @"{""$tb"":2}");
-			WriteSingleEvent("ES", 0, "bla");
-			WriteSingleEvent("ES", 1, "bla");
-			_event3 = WriteSingleEvent("ES", 2, "bla");
-			_event4 = WriteSingleEvent("ES", 3, "bla");
-			_event5 = WriteSingleEvent("ES", 4, "bla");
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_start_to_expired_next_event_number_is_first_active_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 0, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(2, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_start_to_active_next_event_number_is_last_read_event_plus_1_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 0, 4);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(4, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(2, records.Length);
-			Assert.AreEqual(_event3, records[0]);
-			Assert.AreEqual(_event4, records[1]);
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_expired_to_active_next_event_number_is_last_read_event_plus_1_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(3, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(1, records.Length);
-			Assert.AreEqual(_event3, records[0]);
-		}
-
-		[Test]
-		public void on_read_forward_from_expired_to_end_next_event_number_is_end_plus_1_and_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 1, 4);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(5, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event3, records[0]);
-			Assert.AreEqual(_event4, records[1]);
-			Assert.AreEqual(_event5, records[2]);
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_expired_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 1, 6);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(5, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event3, records[0]);
-			Assert.AreEqual(_event4, records[1]);
-			Assert.AreEqual(_event5, records[2]);
-		}
-
-		[Test]
-		public void
-			on_read_forward_from_out_of_bounds_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 7, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(5, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-
-		[Test]
-		public void
-			on_read_backward_from_end_to_active_next_event_number_is_last_read_event_minus_1_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 4, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(2, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(2, records.Length);
-			Assert.AreEqual(_event5, records[0]);
-			Assert.AreEqual(_event4, records[1]);
-		}
-
-		[Test]
-		public void on_read_backward_from_end_to_maxcount_bound_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 4, 3);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(-1, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event5, records[0]);
-			Assert.AreEqual(_event4, records[1]);
-			Assert.AreEqual(_event3, records[2]);
-		}
-
-		[Test]
-		public void on_read_backward_from_active_to_expired_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 3, 3);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(-1, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(2, records.Length);
-			Assert.AreEqual(_event4, records[0]);
-			Assert.AreEqual(_event3, records[1]);
-		}
-
-		[Test]
-		public void on_read_backward_from_expired_to_expired_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(-1, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-		[Test]
-		public void on_read_backward_from_expired_to_before_start_its_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 1, 5);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(-1, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsTrue(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-		[Test]
-		public void
-			on_read_backward_from_out_of_bounds_to_out_of_bounds_next_event_number_is_end_and_its_not_end_of_stream() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", 10, 3);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(4, res.NextEventNumber);
-			Assert.AreEqual(4, res.LastEventNumber);
-			Assert.IsFalse(res.IsEndOfStream);
-
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_very_long_stream_with_max_age_and_mostly_expired_events.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_very_long_stream_with_max_age_and_mostly_expired_events.cs
deleted file mode 100644
index b8d384f72c1..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_very_long_stream_with_max_age_and_mostly_expired_events.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Diagnostics;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount.ReadRangeAndNextEventNumber
-{
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_reading_very_long_stream_with_max_age_and_mostly_expired_events<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		public when_reading_very_long_stream_with_max_age_and_mostly_expired_events():base(maxEntriesInMemTable: 500_000, chunkSize: TFConsts.ChunkSize) {
-			
-		}
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-			var metadata = string.Format(@"{{""$maxAge"":{0}}}", (int)TimeSpan.FromMinutes(20).TotalSeconds);
-			WriteStreamMetadata("ES", 0, metadata, now.AddMinutes(-100));
-			for (int i = 0; i < 1_000_000; i++) {
-				WriteSingleEvent("ES", i, "bla", now.AddMinutes(-50), retryOnFail:true);
-			}
-
-			for (int i = 1_000_000; i < 1_000_015; i++) {
-				WriteSingleEvent("ES", i, "bla", now.AddMinutes(-1), retryOnFail:true);	
-			}
-		}
-
-		[Test, Explicit, Category("LongRunning")]
-		public void on_read_from_beginning() {
-			Stopwatch sw = Stopwatch.StartNew();
-			var res = ReadIndex.ReadStreamEventsForward("ES", 1, 10);
-			var elapsed = sw.Elapsed;
-
-			Assert.AreEqual(1_000_000, res.NextEventNumber);
-			Assert.AreEqual(0, res.Records.Length);
-			Assert.AreEqual(false, res.IsEndOfStream);
-
-			res = ReadIndex.ReadStreamEventsForward("ES", res.NextEventNumber, 10);
-
-			Assert.AreEqual(1_000_010, res.NextEventNumber);
-			Assert.AreEqual(10, res.Records.Length);
-			Assert.AreEqual(false, res.IsEndOfStream);
-
-			res = ReadIndex.ReadStreamEventsForward("ES", res.NextEventNumber, 10);
-
-			Assert.AreEqual(1_000_015, res.NextEventNumber);
-			Assert.AreEqual(5, res.Records.Length);
-			Assert.AreEqual(true, res.IsEndOfStream);
-
-			Assert.Less(elapsed, TimeSpan.FromSeconds(1));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_very_long_stream_with_max_age_and_some_expired_events.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_very_long_stream_with_max_age_and_some_expired_events.cs
deleted file mode 100644
index 3886ea1414e..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_very_long_stream_with_max_age_and_some_expired_events.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using System.Diagnostics;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount.ReadRangeAndNextEventNumber {
-	// test the binary chop where it has to repeatedly lower the high bound
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_reading_very_long_stream_with_max_age_and_some_expired_events<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		public when_reading_very_long_stream_with_max_age_and_some_expired_events() : base(
-			maxEntriesInMemTable: 500_000, chunkSize: TFConsts.ChunkSize) {
-		}
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-			var metadata = string.Format(@"{{""$maxAge"":{0}}}", (int)TimeSpan.FromMinutes(20).TotalSeconds);
-			WriteStreamMetadata("ES", 0, metadata, now.AddMinutes(-100));
-			for (int i = 0; i < 20; i++) {
-				WriteSingleEvent("ES", i, "bla", now.AddMinutes(-50), retryOnFail: true);
-			}
-
-			for (int i = 20; i < 1_000_000; i++) {
-				WriteSingleEvent("ES", i, "bla", now.AddMinutes(-1), retryOnFail: true);
-			}
-		}
-
-		[Test, Explicit, Category("LongRunning")]
-		public void on_read_from_beginning() {
-			Stopwatch sw = Stopwatch.StartNew();
-			var res = ReadIndex.ReadStreamEventsForward("ES", 1, 10);
-			var elapsed = sw.Elapsed;
-
-			Assert.AreEqual(20, res.NextEventNumber);
-			Assert.AreEqual(0, res.Records.Length);
-			Assert.AreEqual(false, res.IsEndOfStream);
-
-			res = ReadIndex.ReadStreamEventsForward("ES", res.NextEventNumber, 10);
-
-			Assert.AreEqual(30, res.NextEventNumber);
-			Assert.AreEqual(10, res.Records.Length);
-			Assert.AreEqual(false, res.IsEndOfStream);
-
-			Assert.Less(elapsed, TimeSpan.FromSeconds(1));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_one_stream_with_maxage_and_other_stream_with_maxcount_and_streams_have_same_hash.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_one_stream_with_maxage_and_other_stream_with_maxcount_and_streams_have_same_hash.cs
deleted file mode 100644
index 433278ff472..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_one_stream_with_maxage_and_other_stream_with_maxcount_and_streams_have_same_hash.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_having_one_stream_with_maxage_and_other_stream_with_maxcount_and_streams_have_same_hash<TLogFormat, TStreamId> :
-			ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r11;
-		private EventRecord _r12;
-		private EventRecord _r13;
-		private EventRecord _r14;
-		private EventRecord _r15;
-		private EventRecord _r16;
-
-		private EventRecord _r21;
-		private EventRecord _r22;
-		private EventRecord _r23;
-		private EventRecord _r24;
-		private EventRecord _r25;
-		private EventRecord _r26;
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-
-			var metadata1 = string.Format(@"{{""$maxAge"":{0}}}", (int)TimeSpan.FromMinutes(25).TotalSeconds);
-			const string metadata2 = @"{""$maxCount"":2}";
-
-			_r11 = WriteStreamMetadata("ES1", 0, metadata1);
-			_r21 = WriteStreamMetadata("ES2", 0, metadata2);
-
-			_r12 = WriteSingleEvent("ES1", 0, "bla1", now.AddMinutes(-100));
-			_r13 = WriteSingleEvent("ES1", 1, "bla1", now.AddMinutes(-20));
-
-			_r22 = WriteSingleEvent("ES2", 0, "bla1", now.AddMinutes(-100));
-			_r23 = WriteSingleEvent("ES2", 1, "bla1", now.AddMinutes(-20));
-
-			_r14 = WriteSingleEvent("ES1", 2, "bla1", now.AddMinutes(-11));
-			_r24 = WriteSingleEvent("ES2", 2, "bla1", now.AddMinutes(-10));
-
-			_r15 = WriteSingleEvent("ES1", 3, "bla1", now.AddMinutes(-5));
-			_r16 = WriteSingleEvent("ES1", 4, "bla1", now.AddMinutes(-2));
-
-			_r25 = WriteSingleEvent("ES2", 3, "bla1", now.AddMinutes(-1));
-			_r26 = WriteSingleEvent("ES2", 4, "bla1", now.AddMinutes(-1));
-		}
-
-		[Test]
-		public void single_event_read_doesnt_return_stream_created_event_for_both_streams() {
-			var result = ReadIndex.ReadEvent("ES1", 0);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES2", 0);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void single_event_read_doesnt_return_expired_events_and_returns_all_actual_ones_for_stream_1() {
-			var result = ReadIndex.ReadEvent("ES1", 0);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES1", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r13, result.Record);
-
-			result = ReadIndex.ReadEvent("ES1", 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r14, result.Record);
-
-			result = ReadIndex.ReadEvent("ES1", 3);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r15, result.Record);
-
-			result = ReadIndex.ReadEvent("ES1", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r16, result.Record);
-		}
-
-		[Test]
-		public void single_event_read_doesnt_return_expired_events_and_returns_all_actual_ones_for_stream_2() {
-			var result = ReadIndex.ReadEvent("ES2", 0);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES2", 1);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES2", 2);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES2", 3);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r25, result.Record);
-
-			result = ReadIndex.ReadEvent("ES2", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r26, result.Record);
-		}
-
-		[Test]
-		public void forward_range_read_doesnt_return_expired_records_for_stream_1() {
-			var result = ReadIndex.ReadStreamEventsForward("ES1", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(4, result.Records.Length);
-			Assert.AreEqual(_r13, result.Records[0]);
-			Assert.AreEqual(_r14, result.Records[1]);
-			Assert.AreEqual(_r15, result.Records[2]);
-			Assert.AreEqual(_r16, result.Records[3]);
-		}
-
-		[Test]
-		public void forward_range_read_doesnt_return_expired_records_for_stream_2() {
-			var result = ReadIndex.ReadStreamEventsForward("ES2", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_r25, result.Records[0]);
-			Assert.AreEqual(_r26, result.Records[1]);
-		}
-
-		[Test]
-		public void backward_range_read_doesnt_return_expired_records_for_stream_1() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES1", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(4, result.Records.Length);
-			Assert.AreEqual(_r16, result.Records[0]);
-			Assert.AreEqual(_r15, result.Records[1]);
-			Assert.AreEqual(_r14, result.Records[2]);
-			Assert.AreEqual(_r13, result.Records[3]);
-		}
-
-		[Test]
-		public void backward_range_read_doesnt_return_expired_records_for_stream_2() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES2", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_r26, result.Records[0]);
-			Assert.AreEqual(_r25, result.Records[1]);
-		}
-
-		[Test]
-		public void read_all_forward_returns_all_records_including_expired_ones() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords();
-			Assert.AreEqual(12, records.Count);
-			Assert.AreEqual(_r11, records[0].Event);
-			Assert.AreEqual(_r21, records[1].Event);
-
-			Assert.AreEqual(_r12, records[2].Event);
-			Assert.AreEqual(_r13, records[3].Event);
-
-			Assert.AreEqual(_r22, records[4].Event);
-			Assert.AreEqual(_r23, records[5].Event);
-
-			Assert.AreEqual(_r14, records[6].Event);
-			Assert.AreEqual(_r24, records[7].Event);
-
-			Assert.AreEqual(_r15, records[8].Event);
-			Assert.AreEqual(_r16, records[9].Event);
-
-			Assert.AreEqual(_r25, records[10].Event);
-			Assert.AreEqual(_r26, records[11].Event);
-		}
-
-		[Test]
-		public void read_all_backward_returns_all_records_including_expired_ones() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords();
-			Assert.AreEqual(12, records.Count);
-			Assert.AreEqual(_r11, records[11].Event);
-			Assert.AreEqual(_r21, records[10].Event);
-
-			Assert.AreEqual(_r12, records[9].Event);
-			Assert.AreEqual(_r13, records[8].Event);
-
-			Assert.AreEqual(_r22, records[7].Event);
-			Assert.AreEqual(_r23, records[6].Event);
-
-			Assert.AreEqual(_r14, records[5].Event);
-			Assert.AreEqual(_r24, records[4].Event);
-
-			Assert.AreEqual(_r15, records[3].Event);
-			Assert.AreEqual(_r16, records[2].Event);
-
-			Assert.AreEqual(_r25, records[1].Event);
-			Assert.AreEqual(_r26, records[0].Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_both_maxage_and_maxcount_specified_with_maxage_more_strict.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_both_maxage_and_maxcount_specified_with_maxage_more_strict.cs
deleted file mode 100644
index 35f17806393..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_both_maxage_and_maxcount_specified_with_maxage_more_strict.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_having_stream_both_maxage_and_maxcount_specified_with_maxage_more_strict<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r1;
-		private EventRecord _r2;
-		private EventRecord _r3;
-		private EventRecord _r4;
-		private EventRecord _r5;
-		private EventRecord _r6;
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-
-			var metadata = string.Format(@"{{""$maxAge"":{0},""$maxCount"":4}}",
-				(int)TimeSpan.FromMinutes(10).TotalSeconds);
-			_r1 = WriteStreamMetadata("ES", 0, metadata);
-			_r2 = WriteSingleEvent("ES", 0, "bla1", now.AddMinutes(-50));
-			_r3 = WriteSingleEvent("ES", 1, "bla1", now.AddMinutes(-20));
-			_r4 = WriteSingleEvent("ES", 2, "bla1", now.AddMinutes(-11));
-			_r5 = WriteSingleEvent("ES", 3, "bla1", now.AddMinutes(-5));
-			_r6 = WriteSingleEvent("ES", 4, "bla1", now.AddMinutes(-1));
-		}
-
-		[Test]
-		public void single_event_read_doesnt_return_expired_events_and_returns_all_actual_ones() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r5, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r6, result.Record);
-		}
-
-		[Test]
-		public void forward_range_read_doesnt_return_expired_records() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_r5, result.Records[0]);
-			Assert.AreEqual(_r6, result.Records[1]);
-		}
-
-		[Test]
-		public void backward_range_read_doesnt_return_expired_records() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_r6, result.Records[0]);
-			Assert.AreEqual(_r5, result.Records[1]);
-		}
-
-		[Test]
-		public void read_all_forward_returns_all_records_including_expired_ones() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r1, records[0].Event);
-			Assert.AreEqual(_r2, records[1].Event);
-			Assert.AreEqual(_r3, records[2].Event);
-			Assert.AreEqual(_r4, records[3].Event);
-			Assert.AreEqual(_r5, records[4].Event);
-			Assert.AreEqual(_r6, records[5].Event);
-		}
-
-		[Test]
-		public void read_all_backward_returns_all_records_including_expired_ones() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r6, records[0].Event);
-			Assert.AreEqual(_r5, records[1].Event);
-			Assert.AreEqual(_r4, records[2].Event);
-			Assert.AreEqual(_r3, records[3].Event);
-			Assert.AreEqual(_r2, records[4].Event);
-			Assert.AreEqual(_r1, records[5].Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_both_maxage_and_maxcount_specified_with_maxcount_more_strict.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_both_maxage_and_maxcount_specified_with_maxcount_more_strict.cs
deleted file mode 100644
index 1761bf61d05..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_both_maxage_and_maxcount_specified_with_maxcount_more_strict.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_having_stream_both_maxage_and_maxcount_specified_with_maxcount_more_strict<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r1;
-		private EventRecord _r2;
-		private EventRecord _r3;
-		private EventRecord _r4;
-		private EventRecord _r5;
-		private EventRecord _r6;
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-			var metadata = string.Format(@"{{""$maxAge"":{0},""$maxCount"":3}}",
-				(int)TimeSpan.FromMinutes(60).TotalSeconds);
-			_r1 = WriteStreamMetadata("ES", 0, metadata);
-			_r2 = WriteSingleEvent("ES", 0, "bla1", now.AddMinutes(-100));
-			_r3 = WriteSingleEvent("ES", 1, "bla1", now.AddMinutes(-20));
-			_r4 = WriteSingleEvent("ES", 2, "bla1", now.AddMinutes(-11));
-			_r5 = WriteSingleEvent("ES", 3, "bla1", now.AddMinutes(-5));
-			_r6 = WriteSingleEvent("ES", 4, "bla1", now.AddMinutes(-1));
-		}
-
-		[Test]
-		public void single_event_read_doesnt_return_expired_events_and_returns_all_actual_ones() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r4, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r5, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r6, result.Record);
-		}
-
-		[Test]
-		public void forward_range_read_doesnt_return_expired_records() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_r4, result.Records[0]);
-			Assert.AreEqual(_r5, result.Records[1]);
-			Assert.AreEqual(_r6, result.Records[2]);
-		}
-
-		[Test]
-		public void backward_range_read_doesnt_return_expired_records() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_r6, result.Records[0]);
-			Assert.AreEqual(_r5, result.Records[1]);
-			Assert.AreEqual(_r4, result.Records[2]);
-		}
-
-		[Test]
-		public void read_all_forward_returns_all_records_including_expired_ones() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r1, records[0].Event);
-			Assert.AreEqual(_r2, records[1].Event);
-			Assert.AreEqual(_r3, records[2].Event);
-			Assert.AreEqual(_r4, records[3].Event);
-			Assert.AreEqual(_r5, records[4].Event);
-			Assert.AreEqual(_r6, records[5].Event);
-		}
-
-		[Test]
-		public void read_all_backward_returns_all_records_including_expired_ones() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r6, records[0].Event);
-			Assert.AreEqual(_r5, records[1].Event);
-			Assert.AreEqual(_r4, records[2].Event);
-			Assert.AreEqual(_r3, records[3].Event);
-			Assert.AreEqual(_r2, records[4].Event);
-			Assert.AreEqual(_r1, records[5].Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_maxage_specified.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_maxage_specified.cs
deleted file mode 100644
index 8dced8c591d..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_maxage_specified.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_having_stream_with_maxage_specified<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r1;
-		private EventRecord _r2;
-		private EventRecord _r3;
-		private EventRecord _r4;
-		private EventRecord _r5;
-		private EventRecord _r6;
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-
-			var metadata = string.Format(@"{{""$maxAge"":{0}}}", (int)TimeSpan.FromMinutes(10).TotalSeconds);
-			_r1 = WriteStreamMetadata("ES", 0, metadata);
-			_r2 = WriteSingleEvent("ES", 0, "bla1", now.AddMinutes(-50));
-			_r3 = WriteSingleEvent("ES", 1, "bla1", now.AddMinutes(-20));
-			_r4 = WriteSingleEvent("ES", 2, "bla1", now.AddMinutes(-11));
-			_r5 = WriteSingleEvent("ES", 3, "bla1", now.AddMinutes(-5));
-			_r6 = WriteSingleEvent("ES", 4, "bla1", now.AddMinutes(-1));
-		}
-
-		[Test]
-		public void single_event_read_doesnt_return_expired_events_and_returns_all_actual_ones() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r5, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r6, result.Record);
-		}
-
-		[Test]
-		public void forward_range_read_doesnt_return_expired_records() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_r5, result.Records[0]);
-			Assert.AreEqual(_r6, result.Records[1]);
-		}
-
-		[Test]
-		public void backward_range_read_doesnt_return_expired_records() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_r6, result.Records[0]);
-			Assert.AreEqual(_r5, result.Records[1]);
-		}
-
-		[Test]
-		public void read_all_forward_returns_all_records_including_expired_ones() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r1, records[0].Event);
-			Assert.AreEqual(_r2, records[1].Event);
-			Assert.AreEqual(_r3, records[2].Event);
-			Assert.AreEqual(_r4, records[3].Event);
-			Assert.AreEqual(_r5, records[4].Event);
-			Assert.AreEqual(_r6, records[5].Event);
-		}
-
-		[Test]
-		public void read_all_backward_returns_all_records_including_expired_ones() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r6, records[0].Event);
-			Assert.AreEqual(_r5, records[1].Event);
-			Assert.AreEqual(_r4, records[2].Event);
-			Assert.AreEqual(_r3, records[3].Event);
-			Assert.AreEqual(_r2, records[4].Event);
-			Assert.AreEqual(_r1, records[5].Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_maxcount_specified.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_maxcount_specified.cs
deleted file mode 100644
index baf5a226725..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_maxcount_specified.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_having_stream_with_maxcount_specified<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r1;
-		private EventRecord _r2;
-		private EventRecord _r3;
-		private EventRecord _r4;
-		private EventRecord _r5;
-		private EventRecord _r6;
-
-		protected override void WriteTestScenario() {
-			const string metadata = @"{""$maxCount"":4}";
-
-			_r1 = WriteStreamMetadata("ES", 0, metadata);
-			_r2 = WriteSingleEvent("ES", 0, "bla1");
-			_r3 = WriteSingleEvent("ES", 1, "bla1");
-			_r4 = WriteSingleEvent("ES", 2, "bla1");
-			_r5 = WriteSingleEvent("ES", 3, "bla1");
-			_r6 = WriteSingleEvent("ES", 4, "bla1");
-		}
-
-		[Test]
-		public void single_event_read_doesnt_return_old_events_and_return_actual_ones() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r3, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r4, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r5, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r6, result.Record);
-		}
-
-		[Test]
-		public void forward_range_read_doesnt_return_old_records() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(4, result.Records.Length);
-			Assert.AreEqual(_r3, result.Records[0]);
-			Assert.AreEqual(_r4, result.Records[1]);
-			Assert.AreEqual(_r5, result.Records[2]);
-			Assert.AreEqual(_r6, result.Records[3]);
-		}
-
-		[Test]
-		public void backward_range_read_doesnt_return_expired_records() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(4, result.Records.Length);
-			Assert.AreEqual(_r6, result.Records[0]);
-			Assert.AreEqual(_r5, result.Records[1]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r3, result.Records[3]);
-		}
-
-		[Test]
-		public void read_all_forward_returns_all_records_including_expired_ones() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r1, records[0].Event);
-			Assert.AreEqual(_r2, records[1].Event);
-			Assert.AreEqual(_r3, records[2].Event);
-			Assert.AreEqual(_r4, records[3].Event);
-			Assert.AreEqual(_r5, records[4].Event);
-			Assert.AreEqual(_r6, records[5].Event);
-		}
-
-		[Test]
-		public void read_all_backward_returns_all_records_including_expired_ones() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r6, records[0].Event);
-			Assert.AreEqual(_r5, records[1].Event);
-			Assert.AreEqual(_r4, records[2].Event);
-			Assert.AreEqual(_r3, records[3].Event);
-			Assert.AreEqual(_r2, records[4].Event);
-			Assert.AreEqual(_r1, records[5].Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_maxcount_specified_and_long_transactions_written.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_maxcount_specified_and_long_transactions_written.cs
deleted file mode 100644
index 3903a0302e6..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_maxcount_specified_and_long_transactions_written.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class when_having_stream_with_maxcount_specified_and_long_transactions_written<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord[] _records;
-
-		protected override void WriteTestScenario() {
-			const string metadata = @"{""$maxCount"":2}";
-
-			_records = new EventRecord[9]; // 3 + 2 + 4
-			WriteStreamMetadata("ES", 0, metadata);
-
-			WriteTransaction(-1, 3);
-			WriteTransaction(2, 2);
-			WriteTransaction(-1 + 3 + 2, 4);
-		}
-
-		private void WriteTransaction(long expectedVersion, int transactionLength) {
-			var begin = WriteTransactionBegin("ES", expectedVersion);
-			for (int i = 0; i < transactionLength; ++i) {
-				var eventNumber = expectedVersion + i + 1;
-				_records[eventNumber] = WriteTransactionEvent(Guid.NewGuid(), begin.LogPosition, i, "ES", eventNumber,
-					"data" + i, PrepareFlags.Data);
-			}
-
-			WriteTransactionEnd(Guid.NewGuid(), begin.LogPosition, "ES");
-			WriteCommit(Guid.NewGuid(), begin.LogPosition, "ES", expectedVersion + 1);
-		}
-
-		[Test]
-		public void forward_range_read_returns_last_transaction_events_and_doesnt_return_expired_ones() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_records[7], result.Records[0]);
-			Assert.AreEqual(_records[8], result.Records[1]);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_truncatebefore_specified.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_truncatebefore_specified.cs
deleted file mode 100644
index 488ff2e3907..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_truncatebefore_specified.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using EventStore.Core.Data;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_having_stream_with_truncatebefore_specified<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r1;
-		private EventRecord _r2;
-		private EventRecord _r3;
-		private EventRecord _r4;
-		private EventRecord _r5;
-		private EventRecord _r6;
-
-		protected override void WriteTestScenario() {
-			const string metadata = @"{""$tb"":2}";
-
-			_r1 = WriteStreamMetadata("ES", 0, metadata);
-			_r2 = WriteSingleEvent("ES", 0, "bla1");
-			_r3 = WriteSingleEvent("ES", 1, "bla1");
-			_r4 = WriteSingleEvent("ES", 2, "bla1");
-			_r5 = WriteSingleEvent("ES", 3, "bla1");
-			_r6 = WriteSingleEvent("ES", 4, "bla1");
-		}
-
-		[Test]
-		public void single_event_read_doesnt_return_old_events_and_return_actual_ones() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r4, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r5, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r6, result.Record);
-		}
-
-		[Test]
-		public void forward_range_read_doesnt_return_old_records() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_r4, result.Records[0]);
-			Assert.AreEqual(_r5, result.Records[1]);
-			Assert.AreEqual(_r6, result.Records[2]);
-		}
-
-		[Test]
-		public void backward_range_read_doesnt_return_expired_records() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_r6, result.Records[0]);
-			Assert.AreEqual(_r5, result.Records[1]);
-			Assert.AreEqual(_r4, result.Records[2]);
-		}
-
-		[Test]
-		public void read_all_forward_returns_all_records_including_expired_ones() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r1, records[0].Event);
-			Assert.AreEqual(_r2, records[1].Event);
-			Assert.AreEqual(_r3, records[2].Event);
-			Assert.AreEqual(_r4, records[3].Event);
-			Assert.AreEqual(_r5, records[4].Event);
-			Assert.AreEqual(_r6, records[5].Event);
-		}
-
-		[Test]
-		public void read_all_backward_returns_all_records_including_expired_ones() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r6, records[0].Event);
-			Assert.AreEqual(_r5, records[1].Event);
-			Assert.AreEqual(_r4, records[2].Event);
-			Assert.AreEqual(_r3, records[3].Event);
-			Assert.AreEqual(_r2, records[4].Event);
-			Assert.AreEqual(_r1, records[5].Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_big_max_age.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_big_max_age.cs
deleted file mode 100644
index 6dab6d65787..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_big_max_age.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_big_max_age<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r1;
-		private EventRecord _r2;
-		private EventRecord _r3;
-		private EventRecord _r4;
-		private EventRecord _r5;
-		private EventRecord _r6;
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-
-			const string metadata = @"{""$maxAge"":2147483647}"; //int.maxValue
-
-			_r1 = WriteStreamMetadata("ES", 0, metadata, now.AddSeconds(-100));
-			_r2 = WriteSingleEvent("ES", 0, "bla1", now.AddSeconds(-50));
-			_r3 = WriteSingleEvent("ES", 1, "bla1", now.AddSeconds(-20));
-			_r4 = WriteSingleEvent("ES", 2, "bla1", now.AddSeconds(-11));
-			_r5 = WriteSingleEvent("ES", 3, "bla1", now.AddSeconds(-5));
-			_r6 = WriteSingleEvent("ES", 4, "bla1", now.AddSeconds(-1));
-		}
-
-		[Test]
-		public void metastream_read_returns_metaevent() {
-			var result = ReadIndex.ReadEvent(SystemStreams.MetastreamOf("ES"), 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r1, result.Record);
-		}
-
-		[Test]
-		public void single_event_read_returns_all_records() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r2, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r3, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r4, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r5, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r6, result.Record);
-		}
-
-		[Test]
-		public void forward_range_read_returns_all_records() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-			Assert.AreEqual(_r2, result.Records[0]);
-			Assert.AreEqual(_r3, result.Records[1]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r5, result.Records[3]);
-			Assert.AreEqual(_r6, result.Records[4]);
-		}
-
-		[Test]
-		public void backward_range_read_returns_all_records() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-			Assert.AreEqual(_r2, result.Records[4]);
-			Assert.AreEqual(_r3, result.Records[3]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r5, result.Records[1]);
-			Assert.AreEqual(_r6, result.Records[0]);
-		}
-
-		[Test]
-		public void read_all_forward_returns_all_records() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r1, records[0].Event);
-			Assert.AreEqual(_r2, records[1].Event);
-			Assert.AreEqual(_r3, records[2].Event);
-			Assert.AreEqual(_r4, records[3].Event);
-			Assert.AreEqual(_r5, records[4].Event);
-			Assert.AreEqual(_r6, records[5].Event);
-		}
-
-		[Test]
-		public void read_all_backward_returns_all_records() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r6, records[0].Event);
-			Assert.AreEqual(_r5, records[1].Event);
-			Assert.AreEqual(_r4, records[2].Event);
-			Assert.AreEqual(_r3, records[3].Event);
-			Assert.AreEqual(_r2, records[4].Event);
-			Assert.AreEqual(_r1, records[5].Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_big_max_count.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_big_max_count.cs
deleted file mode 100644
index 1550de3fb64..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_big_max_count.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_big_max_count<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r1;
-		private EventRecord _r2;
-		private EventRecord _r3;
-		private EventRecord _r4;
-		private EventRecord _r5;
-		private EventRecord _r6;
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-
-			const string metadata = @"{""$maxCount"":2147483647}"; //int.maxValue
-
-			_r1 = WriteStreamMetadata("ES", 0, metadata, now.AddSeconds(-100));
-			_r2 = WriteSingleEvent("ES", 0, "bla1", now.AddSeconds(-50));
-			_r3 = WriteSingleEvent("ES", 1, "bla1", now.AddSeconds(-20));
-			_r4 = WriteSingleEvent("ES", 2, "bla1", now.AddSeconds(-11));
-			_r5 = WriteSingleEvent("ES", 3, "bla1", now.AddSeconds(-5));
-			_r6 = WriteSingleEvent("ES", 4, "bla1", now.AddSeconds(-1));
-		}
-
-		[Test]
-		public void metastream_read_returns_metaevent() {
-			var result = ReadIndex.ReadEvent(SystemStreams.MetastreamOf("ES"), 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r1, result.Record);
-		}
-
-		[Test]
-		public void single_event_read_returns_all_records() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r2, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r3, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r4, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r5, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r6, result.Record);
-		}
-
-		[Test]
-		public void forward_range_read_returns_all_records() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-			Assert.AreEqual(_r2, result.Records[0]);
-			Assert.AreEqual(_r3, result.Records[1]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r5, result.Records[3]);
-			Assert.AreEqual(_r6, result.Records[4]);
-		}
-
-		[Test]
-		public void backward_range_read_returns_all_records() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-			Assert.AreEqual(_r2, result.Records[4]);
-			Assert.AreEqual(_r3, result.Records[3]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r5, result.Records[1]);
-			Assert.AreEqual(_r6, result.Records[0]);
-		}
-
-		[Test]
-		public void read_all_forward_returns_all_records() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r1, records[0].Event);
-			Assert.AreEqual(_r2, records[1].Event);
-			Assert.AreEqual(_r3, records[2].Event);
-			Assert.AreEqual(_r4, records[3].Event);
-			Assert.AreEqual(_r5, records[4].Event);
-			Assert.AreEqual(_r6, records[5].Event);
-		}
-
-		[Test]
-		public void read_all_backward_returns_all_records() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r6, records[0].Event);
-			Assert.AreEqual(_r5, records[1].Event);
-			Assert.AreEqual(_r4, records[2].Event);
-			Assert.AreEqual(_r3, records[3].Event);
-			Assert.AreEqual(_r2, records[4].Event);
-			Assert.AreEqual(_r1, records[5].Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_big_start_from.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_big_start_from.cs
deleted file mode 100644
index fe7aa484309..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_big_start_from.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_softdelete_truncatebefore<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r1;
-		private EventRecord _r2;
-		private EventRecord _r3;
-		private EventRecord _r4;
-		private EventRecord _r5;
-		private EventRecord _r6;
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-
-			const string metadata = @"{""$tb"":9223372036854775807}"; //long.maxValue
-
-			_r1 = WriteStreamMetadata("ES", 0, metadata, now.AddSeconds(-100));
-			_r2 = WriteSingleEvent("ES", 0, "bla1", now.AddSeconds(-50));
-			_r3 = WriteSingleEvent("ES", 1, "bla1", now.AddSeconds(-20));
-			_r4 = WriteSingleEvent("ES", 2, "bla1", now.AddSeconds(-11));
-			_r5 = WriteSingleEvent("ES", 3, "bla1", now.AddSeconds(-5));
-			_r6 = WriteSingleEvent("ES", 4, "bla1", now.AddSeconds(-1));
-		}
-
-		[Test]
-		public void metastream_read_returns_metaevent() {
-			var result = ReadIndex.ReadEvent(SystemStreams.MetastreamOf("ES"), 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r1, result.Record);
-		}
-
-		[Test]
-		public void single_event_read_returns_no_records() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 4);
-			Assert.AreEqual(ReadEventResult.NoStream, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void forward_range_read_returns_no_records() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void backward_range_read_returns_no_records() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
-			Assert.AreEqual(0, result.Records.Length);
-		}
-
-		[Test]
-		public void read_all_forward_returns_all_records() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r1, records[0].Event);
-			Assert.AreEqual(_r2, records[1].Event);
-			Assert.AreEqual(_r3, records[2].Event);
-			Assert.AreEqual(_r4, records[3].Event);
-			Assert.AreEqual(_r5, records[4].Event);
-			Assert.AreEqual(_r6, records[5].Event);
-		}
-
-		[Test]
-		public void read_all_backward_returns_all_records() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r6, records[0].Event);
-			Assert.AreEqual(_r5, records[1].Event);
-			Assert.AreEqual(_r4, records[2].Event);
-			Assert.AreEqual(_r3, records[3].Event);
-			Assert.AreEqual(_r2, records[4].Event);
-			Assert.AreEqual(_r1, records[5].Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_invalid_max_age_and_normal_max_count.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_invalid_max_age_and_normal_max_count.cs
deleted file mode 100644
index 628bf1a5530..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_invalid_max_age_and_normal_max_count.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount {
-	[TestFixture]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_invalid_max_age_and_normal_max_count<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r1;
-		private EventRecord _r2;
-		private EventRecord _r3;
-		private EventRecord _r4;
-		private EventRecord _r5;
-		private EventRecord _r6;
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-
-			const string metadata = @"{""$maxAge"": 1.5, ""$maxCount"":4}";
-
-			_r1 = WriteStreamMetadata("ES", 0, metadata);
-			_r2 = WriteSingleEvent("ES", 0, "bla1", now.AddSeconds(-50));
-			_r3 = WriteSingleEvent("ES", 1, "bla1", now.AddSeconds(-20));
-			_r4 = WriteSingleEvent("ES", 2, "bla1", now.AddSeconds(-11));
-			_r5 = WriteSingleEvent("ES", 3, "bla1", now.AddSeconds(-5));
-			_r6 = WriteSingleEvent("ES", 4, "bla1", now.AddSeconds(-1));
-		}
-
-		[Test]
-		public void on_single_event_read_all_metadata_is_ignored() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r2, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r3, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r4, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r5, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r6, result.Record);
-		}
-
-		[Test]
-		public void on_forward_range_read_metadata_is_ignored() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-			Assert.AreEqual(_r2, result.Records[0]);
-			Assert.AreEqual(_r3, result.Records[1]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r5, result.Records[3]);
-			Assert.AreEqual(_r6, result.Records[4]);
-		}
-
-		[Test]
-		public void on_backward_range_read_metadata_is_ignored() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-			Assert.AreEqual(_r6, result.Records[0]);
-			Assert.AreEqual(_r5, result.Records[1]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r3, result.Records[3]);
-			Assert.AreEqual(_r2, result.Records[4]);
-		}
-
-		[Test]
-		public void on_read_all_forward_metadata_is_ignored() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).Records;
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
-				Assert.AreEqual(6, records.Count);
-				Assert.AreEqual(_r1, records[0].Event);
-				Assert.AreEqual(_r2, records[1].Event);
-				Assert.AreEqual(_r3, records[2].Event);
-				Assert.AreEqual(_r4, records[3].Event);
-				Assert.AreEqual(_r5, records[4].Event);
-				Assert.AreEqual(_r6, records[5].Event);
-			} else {
-				Assert.AreEqual(8, records.Count);
-				Assert.AreEqual("$stream", records[0].Event.EventType);
-				Assert.AreEqual(_r1, records[1].Event); // metadata
-				Assert.AreEqual("$event-type", records[2].Event.EventType);
-				Assert.AreEqual(_r2, records[3].Event);
-				Assert.AreEqual(_r3, records[4].Event);
-				Assert.AreEqual(_r4, records[5].Event);
-				Assert.AreEqual(_r5, records[6].Event);
-				Assert.AreEqual(_r6, records[7].Event);
-			}
-		}
-
-		[Test]
-		public void on_read_all_backward_metadata_is_ignored() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).Records;
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
-				Assert.AreEqual(6, records.Count);
-				Assert.AreEqual(_r6, records[0].Event);
-				Assert.AreEqual(_r5, records[1].Event);
-				Assert.AreEqual(_r4, records[2].Event);
-				Assert.AreEqual(_r3, records[3].Event);
-				Assert.AreEqual(_r2, records[4].Event);
-				Assert.AreEqual(_r1, records[5].Event);
-			} else {
-				Assert.AreEqual(8, records.Count);
-				Assert.AreEqual(_r6, records[0].Event);
-				Assert.AreEqual(_r5, records[1].Event);
-				Assert.AreEqual(_r4, records[2].Event);
-				Assert.AreEqual(_r3, records[3].Event);
-				Assert.AreEqual(_r2, records[4].Event);
-				Assert.AreEqual("$event-type", records[5].Event.EventType);
-				Assert.AreEqual(_r1, records[6].Event); // metadata
-				Assert.AreEqual("$stream", records[7].Event.EventType);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_invalid_max_count_and_normal_max_age.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_invalid_max_count_and_normal_max_age.cs
deleted file mode 100644
index c0958dbe544..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_invalid_max_count_and_normal_max_age.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount {
-	[TestFixture]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_invalid_max_count_and_normal_max_age<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r1;
-		private EventRecord _r2;
-		private EventRecord _r3;
-		private EventRecord _r4;
-		private EventRecord _r5;
-		private EventRecord _r6;
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-
-			const string metadata = @"{""$maxAge"":21,""$maxCount"":2.1}";
-
-			_r1 = WriteStreamMetadata("ES", 0, metadata);
-			_r2 = WriteSingleEvent("ES", 0, "bla1", now.AddSeconds(-50));
-			_r3 = WriteSingleEvent("ES", 1, "bla1", now.AddSeconds(-20));
-			_r4 = WriteSingleEvent("ES", 2, "bla1", now.AddSeconds(-11));
-			_r5 = WriteSingleEvent("ES", 3, "bla1", now.AddSeconds(-5));
-			_r6 = WriteSingleEvent("ES", 4, "bla1", now.AddSeconds(-1));
-		}
-
-		[Test]
-		public void on_single_event_read_metadata_is_ignored() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r2, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r3, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r4, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r5, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r6, result.Record);
-		}
-
-		[Test]
-		public void on_forward_range_read_metadata_is_ignored() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-			Assert.AreEqual(_r2, result.Records[0]);
-			Assert.AreEqual(_r3, result.Records[1]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r5, result.Records[3]);
-			Assert.AreEqual(_r6, result.Records[4]);
-		}
-
-		[Test]
-		public void on_backward_range_read_metadata_is_ignored() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-			Assert.AreEqual(_r6, result.Records[0]);
-			Assert.AreEqual(_r5, result.Records[1]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r3, result.Records[3]);
-			Assert.AreEqual(_r2, result.Records[4]);
-		}
-
-		[Test]
-		public void on_read_all_forward_metadata_is_ignored() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).Records;
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
-				Assert.AreEqual(6, records.Count);
-				Assert.AreEqual(_r1, records[0].Event);
-				Assert.AreEqual(_r2, records[1].Event);
-				Assert.AreEqual(_r3, records[2].Event);
-				Assert.AreEqual(_r4, records[3].Event);
-				Assert.AreEqual(_r5, records[4].Event);
-				Assert.AreEqual(_r6, records[5].Event);
-			} else {
-				Assert.AreEqual(8, records.Count);
-				Assert.AreEqual("$stream", records[0].Event.EventType);
-				Assert.AreEqual(_r1, records[1].Event); // metadata
-				Assert.AreEqual("$event-type", records[2].Event.EventType);
-				Assert.AreEqual(_r2, records[3].Event);
-				Assert.AreEqual(_r3, records[4].Event);
-				Assert.AreEqual(_r4, records[5].Event);
-				Assert.AreEqual(_r5, records[6].Event);
-				Assert.AreEqual(_r6, records[7].Event);
-			}
-		}
-
-		[Test]
-		public void on_read_all_backward_metadata_is_ignored() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).Records;
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
-				Assert.AreEqual(6, records.Count);
-				Assert.AreEqual(_r6, records[0].Event);
-				Assert.AreEqual(_r5, records[1].Event);
-				Assert.AreEqual(_r4, records[2].Event);
-				Assert.AreEqual(_r3, records[3].Event);
-				Assert.AreEqual(_r2, records[4].Event);
-				Assert.AreEqual(_r1, records[5].Event);
-			} else {
-				Assert.AreEqual(8, records.Count);
-				Assert.AreEqual(_r6, records[0].Event);
-				Assert.AreEqual(_r5, records[1].Event);
-				Assert.AreEqual(_r4, records[2].Event);
-				Assert.AreEqual(_r3, records[3].Event);
-				Assert.AreEqual(_r2, records[4].Event);
-				Assert.AreEqual("$event-type", records[5].Event.EventType);
-				Assert.AreEqual(_r1, records[6].Event); // metadata
-				Assert.AreEqual("$stream", records[7].Event.EventType);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_invalid_metadata.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_invalid_metadata.cs
deleted file mode 100644
index 210572698ee..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_invalid_metadata.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_invalid_metadata<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r1;
-		private EventRecord _r2;
-		private EventRecord _r3;
-		private EventRecord _r4;
-		private EventRecord _r5;
-		private EventRecord _r6;
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-
-			const string metadata = @"{""$maxCount"":4,,""$maxAge"":}";
-
-			_r1 = WriteStreamMetadata("ES", 0, metadata, now.AddSeconds(-100));
-			_r2 = WriteSingleEvent("ES", 0, "bla1", now.AddSeconds(-50));
-			_r3 = WriteSingleEvent("ES", 1, "bla1", now.AddSeconds(-20));
-			_r4 = WriteSingleEvent("ES", 2, "bla1", now.AddSeconds(-11));
-			_r5 = WriteSingleEvent("ES", 3, "bla1", now.AddSeconds(-5));
-			_r6 = WriteSingleEvent("ES", 4, "bla1", now.AddSeconds(-1));
-		}
-
-		[Test]
-		public void on_single_event_read_all_metadata_is_ignored() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r2, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r3, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r4, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r5, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r6, result.Record);
-		}
-
-		[Test]
-		public void on_forward_range_read_all_metadata_is_ignored() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-			Assert.AreEqual(_r2, result.Records[0]);
-			Assert.AreEqual(_r3, result.Records[1]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r5, result.Records[3]);
-			Assert.AreEqual(_r6, result.Records[4]);
-		}
-
-		[Test]
-		public void on_backward_range_read_all_metadata_is_ignored() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-			Assert.AreEqual(_r2, result.Records[4]);
-			Assert.AreEqual(_r3, result.Records[3]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r5, result.Records[1]);
-			Assert.AreEqual(_r6, result.Records[0]);
-		}
-
-		[Test]
-		public void on_read_all_forward_all_metadata_is_ignored() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r1, records[0].Event);
-			Assert.AreEqual(_r2, records[1].Event);
-			Assert.AreEqual(_r3, records[2].Event);
-			Assert.AreEqual(_r4, records[3].Event);
-			Assert.AreEqual(_r5, records[4].Event);
-			Assert.AreEqual(_r6, records[5].Event);
-		}
-
-		[Test]
-		public void on_read_all_backward_all_metadata_is_ignored() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r6, records[0].Event);
-			Assert.AreEqual(_r5, records[1].Event);
-			Assert.AreEqual(_r4, records[2].Event);
-			Assert.AreEqual(_r3, records[3].Event);
-			Assert.AreEqual(_r2, records[4].Event);
-			Assert.AreEqual(_r1, records[5].Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_age.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_age.cs
deleted file mode 100644
index b1b43cbce7a..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_age.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_too_big_max_age<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r1;
-		private EventRecord _r2;
-		private EventRecord _r3;
-		private EventRecord _r4;
-		private EventRecord _r5;
-		private EventRecord _r6;
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-
-			const string metadata = @"{""$maxAge"":2147483648}"; //int.maxValue + 1
-
-			_r1 = WriteStreamMetadata("ES", 0, metadata, now.AddSeconds(-100));
-			_r2 = WriteSingleEvent("ES", 0, "bla1", now.AddSeconds(-50));
-			_r3 = WriteSingleEvent("ES", 1, "bla1", now.AddSeconds(-20));
-			_r4 = WriteSingleEvent("ES", 2, "bla1", now.AddSeconds(-11));
-			_r5 = WriteSingleEvent("ES", 3, "bla1", now.AddSeconds(-5));
-			_r6 = WriteSingleEvent("ES", 4, "bla1", now.AddSeconds(-1));
-		}
-
-		[Test]
-		public void single_event_read_returns_all_records() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r2, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r3, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r4, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r5, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r6, result.Record);
-		}
-
-		[Test]
-		public void forward_range_read_returns_all_records() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-			Assert.AreEqual(_r2, result.Records[0]);
-			Assert.AreEqual(_r3, result.Records[1]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r5, result.Records[3]);
-			Assert.AreEqual(_r6, result.Records[4]);
-		}
-
-		[Test]
-		public void backward_range_read_returns_all_records() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-			Assert.AreEqual(_r2, result.Records[4]);
-			Assert.AreEqual(_r3, result.Records[3]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r5, result.Records[1]);
-			Assert.AreEqual(_r6, result.Records[0]);
-		}
-
-		[Test]
-		public void read_all_forward_returns_all_records() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r1, records[0].Event);
-			Assert.AreEqual(_r2, records[1].Event);
-			Assert.AreEqual(_r3, records[2].Event);
-			Assert.AreEqual(_r4, records[3].Event);
-			Assert.AreEqual(_r5, records[4].Event);
-			Assert.AreEqual(_r6, records[5].Event);
-		}
-
-		[Test]
-		public void read_all_backward_returns_all_records() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r6, records[0].Event);
-			Assert.AreEqual(_r5, records[1].Event);
-			Assert.AreEqual(_r4, records[2].Event);
-			Assert.AreEqual(_r3, records[3].Event);
-			Assert.AreEqual(_r2, records[4].Event);
-			Assert.AreEqual(_r1, records[5].Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_age_and_normal_max_count.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_age_and_normal_max_count.cs
deleted file mode 100644
index 70285f32166..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_age_and_normal_max_count.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_too_big_max_age_and_normal_max_count<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r1;
-		private EventRecord _r2;
-		private EventRecord _r3;
-		private EventRecord _r4;
-		private EventRecord _r5;
-		private EventRecord _r6;
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-
-			//i.e. if you pass value > int.maxValue all metadata will be ignored
-			const string metadata = @"{""$maxCount"":2147483648,,""$maxAge"":10}"; //int.maxValue + 1
-
-			_r1 = WriteStreamMetadata("ES", 0, metadata, now.AddSeconds(-100));
-			_r2 = WriteSingleEvent("ES", 0, "bla1", now.AddSeconds(-50));
-			_r3 = WriteSingleEvent("ES", 1, "bla1", now.AddSeconds(-20));
-			_r4 = WriteSingleEvent("ES", 2, "bla1", now.AddSeconds(-11));
-			_r5 = WriteSingleEvent("ES", 3, "bla1", now.AddSeconds(-5));
-			_r6 = WriteSingleEvent("ES", 4, "bla1", now.AddSeconds(-1));
-		}
-
-		[Test]
-		public void on_single_event_read_all_metadata_is_ignored() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r2, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r3, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r4, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r5, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r6, result.Record);
-		}
-
-		[Test]
-		public void on_forward_range_read_all_metadata_is_ignored() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-			Assert.AreEqual(_r2, result.Records[0]);
-			Assert.AreEqual(_r3, result.Records[1]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r5, result.Records[3]);
-			Assert.AreEqual(_r6, result.Records[4]);
-		}
-
-		[Test]
-		public void on_backward_range_read_all_metadata_is_ignored() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-			Assert.AreEqual(_r2, result.Records[4]);
-			Assert.AreEqual(_r3, result.Records[3]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r5, result.Records[1]);
-			Assert.AreEqual(_r6, result.Records[0]);
-		}
-
-		[Test]
-		public void on_read_all_forward_all_metadata_is_ignored() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r1, records[0].Event);
-			Assert.AreEqual(_r2, records[1].Event);
-			Assert.AreEqual(_r3, records[2].Event);
-			Assert.AreEqual(_r4, records[3].Event);
-			Assert.AreEqual(_r5, records[4].Event);
-			Assert.AreEqual(_r6, records[5].Event);
-		}
-
-		[Test]
-		public void on_read_all_backward_all_metadata_is_ignored() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r6, records[0].Event);
-			Assert.AreEqual(_r5, records[1].Event);
-			Assert.AreEqual(_r4, records[2].Event);
-			Assert.AreEqual(_r3, records[3].Event);
-			Assert.AreEqual(_r2, records[4].Event);
-			Assert.AreEqual(_r1, records[5].Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_count.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_count.cs
deleted file mode 100644
index e435703b8f9..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_count.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_too_big_max_count<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r1;
-		private EventRecord _r2;
-		private EventRecord _r3;
-		private EventRecord _r4;
-		private EventRecord _r5;
-		private EventRecord _r6;
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-
-			const string metadata = @"{""$maxCount"":9223372036854775808}"; //long.maxValue + 1
-
-			_r1 = WriteStreamMetadata("ES", 0, metadata, now.AddSeconds(-100));
-			_r2 = WriteSingleEvent("ES", 0, "bla1", now.AddSeconds(-50));
-			_r3 = WriteSingleEvent("ES", 1, "bla1", now.AddSeconds(-20));
-			_r4 = WriteSingleEvent("ES", 2, "bla1", now.AddSeconds(-11));
-			_r5 = WriteSingleEvent("ES", 3, "bla1", now.AddSeconds(-5));
-			_r6 = WriteSingleEvent("ES", 4, "bla1", now.AddSeconds(-1));
-		}
-
-		[Test]
-		public void single_event_read_returns_all_records() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r2, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r3, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r4, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r5, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r6, result.Record);
-		}
-
-		[Test]
-		public void forward_range_read_returns_all_records() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-			Assert.AreEqual(_r2, result.Records[0]);
-			Assert.AreEqual(_r3, result.Records[1]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r5, result.Records[3]);
-			Assert.AreEqual(_r6, result.Records[4]);
-		}
-
-		[Test]
-		public void backward_range_read_returns_all_records() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-			Assert.AreEqual(_r2, result.Records[4]);
-			Assert.AreEqual(_r3, result.Records[3]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r5, result.Records[1]);
-			Assert.AreEqual(_r6, result.Records[0]);
-		}
-
-		[Test]
-		public void read_all_forward_returns_all_records() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r1, records[0].Event);
-			Assert.AreEqual(_r2, records[1].Event);
-			Assert.AreEqual(_r3, records[2].Event);
-			Assert.AreEqual(_r4, records[3].Event);
-			Assert.AreEqual(_r5, records[4].Event);
-			Assert.AreEqual(_r6, records[5].Event);
-		}
-
-		[Test]
-		public void read_all_backward_returns_all_records() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r6, records[0].Event);
-			Assert.AreEqual(_r5, records[1].Event);
-			Assert.AreEqual(_r4, records[2].Event);
-			Assert.AreEqual(_r3, records[3].Event);
-			Assert.AreEqual(_r2, records[4].Event);
-			Assert.AreEqual(_r1, records[5].Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_count_and_normal_max_age.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_count_and_normal_max_age.cs
deleted file mode 100644
index 0a5b3abdd98..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_count_and_normal_max_age.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_too_big_max_count_and_normal_max_age<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r1;
-		private EventRecord _r2;
-		private EventRecord _r3;
-		private EventRecord _r4;
-		private EventRecord _r5;
-		private EventRecord _r6;
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-
-			//i.e. if you pass value > int.maxValue all metadata will be ignored
-			const string
-				metadata =
-					@"{""$maxCount"":4,,""$maxAge"":2147483648}"; //int.maxValue + 1 , js maxvalue is 9007199254740992
-
-			_r1 = WriteStreamMetadata("ES", 0, metadata, now.AddSeconds(-100));
-			_r2 = WriteSingleEvent("ES", 0, "bla1", now.AddSeconds(-50));
-			_r3 = WriteSingleEvent("ES", 1, "bla1", now.AddSeconds(-20));
-			_r4 = WriteSingleEvent("ES", 2, "bla1", now.AddSeconds(-11));
-			_r5 = WriteSingleEvent("ES", 3, "bla1", now.AddSeconds(-5));
-			_r6 = WriteSingleEvent("ES", 4, "bla1", now.AddSeconds(-1));
-		}
-
-		[Test]
-		public void on_single_event_read_all_metadata_is_ignored() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r2, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r3, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r4, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r5, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r6, result.Record);
-		}
-
-		[Test]
-		public void on_forward_range_read_all_metadata_is_ignored() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-			Assert.AreEqual(_r2, result.Records[0]);
-			Assert.AreEqual(_r3, result.Records[1]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r5, result.Records[3]);
-			Assert.AreEqual(_r6, result.Records[4]);
-		}
-
-		[Test]
-		public void on_backward_range_read_all_metadata_is_ignored() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-			Assert.AreEqual(_r2, result.Records[4]);
-			Assert.AreEqual(_r3, result.Records[3]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r5, result.Records[1]);
-			Assert.AreEqual(_r6, result.Records[0]);
-		}
-
-		[Test]
-		public void on_read_all_forward_all_metadata_is_ignored() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r1, records[0].Event);
-			Assert.AreEqual(_r2, records[1].Event);
-			Assert.AreEqual(_r3, records[2].Event);
-			Assert.AreEqual(_r4, records[3].Event);
-			Assert.AreEqual(_r5, records[4].Event);
-			Assert.AreEqual(_r6, records[5].Event);
-		}
-
-		[Test]
-		public void on_read_all_backward_all_metadata_is_ignored() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r6, records[0].Event);
-			Assert.AreEqual(_r5, records[1].Event);
-			Assert.AreEqual(_r4, records[2].Event);
-			Assert.AreEqual(_r3, records[3].Event);
-			Assert.AreEqual(_r2, records[4].Event);
-			Assert.AreEqual(_r1, records[5].Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_start_from.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_start_from.cs
deleted file mode 100644
index 290cd499787..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_start_from.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_too_big_truncatebefore<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r1;
-		private EventRecord _r2;
-		private EventRecord _r3;
-		private EventRecord _r4;
-		private EventRecord _r5;
-		private EventRecord _r6;
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-
-			const string metadata = @"{""$tb"":9223372036854775808}"; //long.maxValue + 1
-
-			_r1 = WriteStreamMetadata("ES", 0, metadata, now.AddSeconds(-100));
-			_r2 = WriteSingleEvent("ES", 0, "bla1", now.AddSeconds(-50));
-			_r3 = WriteSingleEvent("ES", 1, "bla1", now.AddSeconds(-20));
-			_r4 = WriteSingleEvent("ES", 2, "bla1", now.AddSeconds(-11));
-			_r5 = WriteSingleEvent("ES", 3, "bla1", now.AddSeconds(-5));
-			_r6 = WriteSingleEvent("ES", 4, "bla1", now.AddSeconds(-1));
-		}
-
-		[Test]
-		public void single_event_read_returns_all_records() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r2, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r3, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r4, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r5, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 4);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r6, result.Record);
-		}
-
-		[Test]
-		public void forward_range_read_returns_all_records() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-			Assert.AreEqual(_r2, result.Records[0]);
-			Assert.AreEqual(_r3, result.Records[1]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r5, result.Records[3]);
-			Assert.AreEqual(_r6, result.Records[4]);
-		}
-
-		[Test]
-		public void backward_range_read_returns_all_records() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(5, result.Records.Length);
-			Assert.AreEqual(_r2, result.Records[4]);
-			Assert.AreEqual(_r3, result.Records[3]);
-			Assert.AreEqual(_r4, result.Records[2]);
-			Assert.AreEqual(_r5, result.Records[1]);
-			Assert.AreEqual(_r6, result.Records[0]);
-		}
-
-		[Test]
-		public void read_all_forward_returns_all_records() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r1, records[0].Event);
-			Assert.AreEqual(_r2, records[1].Event);
-			Assert.AreEqual(_r3, records[2].Event);
-			Assert.AreEqual(_r4, records[3].Event);
-			Assert.AreEqual(_r5, records[4].Event);
-			Assert.AreEqual(_r6, records[5].Event);
-		}
-
-		[Test]
-		public void read_all_backward_returns_all_records() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r6, records[0].Event);
-			Assert.AreEqual(_r5, records[1].Event);
-			Assert.AreEqual(_r4, records[2].Event);
-			Assert.AreEqual(_r3, records[3].Event);
-			Assert.AreEqual(_r2, records[4].Event);
-			Assert.AreEqual(_r1, records[5].Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_truncatebefore_greater_than_int_maxvalue.cs b/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_truncatebefore_greater_than_int_maxvalue.cs
deleted file mode 100644
index 7c154d78365..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/MaxAgeMaxCount/with_truncatebefore_greater_than_int_maxvalue.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.MaxAgeMaxCount {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_truncatebefore_greater_than_int_maxvalue<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _r1;
-		private EventRecord _r2;
-		private EventRecord _r3;
-		private EventRecord _r4;
-		private EventRecord _r5;
-		private EventRecord _r6;
-
-		private const long first = (long)int.MaxValue + 1;
-		private const long second = (long)int.MaxValue + 2;
-		private const long third = (long)int.MaxValue + 3;
-		private const long fourth = (long)int.MaxValue + 4;
-		private const long fifth = (long)int.MaxValue + 5;
-
-		protected override void WriteTestScenario() {
-			var now = DateTime.UtcNow;
-
-			string metadata = @"{""$tb"":" + third + "}";
-
-			_r1 = WriteStreamMetadata("ES", 0, metadata, now.AddSeconds(-100));
-			_r2 = WriteSingleEvent("ES", first, "bla1", now.AddSeconds(-50));
-			_r3 = WriteSingleEvent("ES", second, "bla1", now.AddSeconds(-20));
-			_r4 = WriteSingleEvent("ES", third, "bla1", now.AddSeconds(-11));
-			_r5 = WriteSingleEvent("ES", fourth, "bla1", now.AddSeconds(-5));
-			_r6 = WriteSingleEvent("ES", fifth, "bla1", now.AddSeconds(-1));
-		}
-
-		[Test]
-		public void metastream_read_returns_metaevent() {
-			var result = ReadIndex.ReadEvent(SystemStreams.MetastreamOf("ES"), 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r1, result.Record);
-		}
-
-		[Test]
-		public void single_event_read_returns_records_after_truncate_before() {
-			var result = ReadIndex.ReadEvent("ES", first);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", second);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-
-			result = ReadIndex.ReadEvent("ES", third);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r4, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", fourth);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r5, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", fifth);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_r6, result.Record);
-		}
-
-		[Test]
-		public void forward_range_read_returns_records_after_truncate_before() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", first, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_r4, result.Records[0]);
-			Assert.AreEqual(_r5, result.Records[1]);
-			Assert.AreEqual(_r6, result.Records[2]);
-		}
-
-		[Test]
-		public void backward_range_read_returns_records_after_truncate_before() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_r6, result.Records[0]);
-			Assert.AreEqual(_r5, result.Records[1]);
-			Assert.AreEqual(_r4, result.Records[2]);
-		}
-
-		[Test]
-		public void read_all_forward_returns_all_records() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r1, records[0].Event);
-			Assert.AreEqual(_r2, records[1].Event);
-			Assert.AreEqual(_r3, records[2].Event);
-			Assert.AreEqual(_r4, records[3].Event);
-			Assert.AreEqual(_r5, records[4].Event);
-			Assert.AreEqual(_r6, records[5].Event);
-		}
-
-		[Test]
-		public void read_all_backward_returns_all_records() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords();
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_r6, records[0].Event);
-			Assert.AreEqual(_r5, records[1].Event);
-			Assert.AreEqual(_r4, records[2].Event);
-			Assert.AreEqual(_r3, records[3].Event);
-			Assert.AreEqual(_r2, records[4].Event);
-			Assert.AreEqual(_r1, records[5].Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Metastreams/read_index_result_original_stream_exists_tests.cs b/src/EventStore.Core.Tests/Services/Storage/Metastreams/read_index_result_original_stream_exists_tests.cs
deleted file mode 100644
index 55610df9566..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Metastreams/read_index_result_original_stream_exists_tests.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Core.Services;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.Metastreams {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		read_index_result_original_stream_exists_tests<TLogFormat, TStreamId>
-		: SimpleDbTestScenario<TLogFormat, TStreamId> {
-
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator.Chunk(
-				Rec.Prepare(0, "existing_stream"),
-				Rec.Commit(0, "existing_stream"),
-				Rec.Prepare(1, "$existing_stream"),
-				Rec.Commit(1, "$existing_stream")
-			).CreateDb();
-		}
-
-		[Test]
-		public void original_stream_exists_is_true_when_reading_metastream_for_existing_stream() {
-			var metaStreamName = SystemStreams.MetastreamOf("existing_stream");
-			var metaStreamId = _logFormat.StreamIds.LookupValue(metaStreamName);
-			var read = ReadIndex.ReadEvent(IndexReader.UnspecifiedStreamName, metaStreamId, 0);
-			Assert.True(read.OriginalStreamExists);
-		}
-
-		[Test]
-		public void original_stream_exists_is_false_when_reading_metastream_for_non_existent_stream() {
-			var metaStreamName = SystemStreams.MetastreamOf("non_existent_stream");
-			var metaStreamId = _logFormat.StreamIds.LookupValue(metaStreamName);
-			var read = ReadIndex.ReadEvent(IndexReader.UnspecifiedStreamName, metaStreamId, 0);
-			Assert.False(read.OriginalStreamExists);
-		}
-
-		[Test]
-		public void original_stream_exists_is_null_when_reading_existing_stream() {
-			var streamId = _logFormat.StreamIds.LookupValue("existing_stream");
-			var read = ReadIndex.ReadEvent(IndexReader.UnspecifiedStreamName, streamId, 0);
-			Assert.IsNull(read.OriginalStreamExists);
-		}
-
-		[Test]
-		public void original_stream_exists_is_null_when_reading_non_existent_stream() {
-			var streamId = _logFormat.StreamIds.LookupValue("non_existent_stream");
-			var read = ReadIndex.ReadEvent(IndexReader.UnspecifiedStreamName, streamId, 0);
-			Assert.IsNull(read.OriginalStreamExists);
-		}
-
-		[Test]
-		public void original_stream_exists_is_true_when_reading_metastream_for_existing_system_stream() {
-			var metaStreamName = SystemStreams.MetastreamOf("$existing_stream");
-			var metaStreamId = _logFormat.StreamIds.LookupValue(metaStreamName);
-			var read = ReadIndex.ReadEvent(IndexReader.UnspecifiedStreamName, metaStreamId, 0);
-			Assert.True(read.OriginalStreamExists);
-		}
-
-		[Test]
-		public void original_stream_exists_is_false_when_reading_metastream_for_non_existent_system_stream() {
-			var metaStreamName = SystemStreams.MetastreamOf("$non_existent_stream");
-			var metaStreamId = _logFormat.StreamIds.LookupValue(metaStreamName);
-			var read = ReadIndex.ReadEvent(IndexReader.UnspecifiedStreamName, metaStreamId, 0);
-			Assert.False(read.OriginalStreamExists);
-		}
-
-		[Test]
-		public void original_stream_exists_is_null_when_reading_existing_system_stream() {
-			var streamId = _logFormat.StreamIds.LookupValue("$existing_stream");
-			var read = ReadIndex.ReadEvent(IndexReader.UnspecifiedStreamName, streamId, 0);
-			Assert.IsNull(read.OriginalStreamExists);
-		}
-
-		[Test]
-		public void original_stream_exists_is_null_when_reading_non_existent_system_stream() {
-			var streamId = _logFormat.StreamIds.LookupValue("$non_existent_stream");
-			var read = ReadIndex.ReadEvent(IndexReader.UnspecifiedStreamName, streamId, 0);
-			Assert.IsNull(read.OriginalStreamExists);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Metastreams/when_having_deleted_stream_and_no_metastream_metastream_is_declared_deleted_as_well.cs b/src/EventStore.Core.Tests/Services/Storage/Metastreams/when_having_deleted_stream_and_no_metastream_metastream_is_declared_deleted_as_well.cs
deleted file mode 100644
index d92ddaa63bf..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Metastreams/when_having_deleted_stream_and_no_metastream_metastream_is_declared_deleted_as_well.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.Metastreams {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_having_deleted_stream_and_no_metastream_metastream_is_declared_deleted_as_well<TLogFormat, TStreamId>
-		: SimpleDbTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator.Chunk(Rec.Prepare(0, "test"),
-					Rec.Commit(0, "test"),
-					Rec.Delete(2, "test"),
-					Rec.Commit(2, "test"))
-				.CreateDb();
-		}
-
-		[Test]
-		public void the_stream_is_deleted() {
-			Assert.IsTrue(ReadIndex.IsStreamDeleted("test"));
-		}
-
-		[Test]
-		public void the_metastream_is_deleted() {
-			Assert.IsTrue(ReadIndex.IsStreamDeleted("$$test"));
-		}
-
-		[Test]
-		public void get_last_event_number_reports_deleted_metastream() {
-			Assert.AreEqual(EventNumber.DeletedStream, ReadIndex.GetStreamLastEventNumber("$$test"));
-		}
-
-		[Test]
-		public void single_event_read_reports_deleted_metastream() {
-			Assert.AreEqual(ReadEventResult.StreamDeleted, ReadIndex.ReadEvent("$$test", 0).Result);
-		}
-
-		[Test]
-		public void last_event_read_reports_deleted_metastream() {
-			Assert.AreEqual(ReadEventResult.StreamDeleted, ReadIndex.ReadEvent("$$test", -1).Result);
-		}
-
-		[Test]
-		public void read_stream_events_forward_reports_deleted_metastream() {
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, ReadIndex.ReadStreamEventsForward("$$test", 0, 100).Result);
-		}
-
-		[Test]
-		public void read_stream_events_backward_reports_deleted_metastream() {
-			Assert.AreEqual(ReadStreamResult.StreamDeleted,
-				ReadIndex.ReadStreamEventsBackward("$$test", 0, 100).Result);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Metastreams/when_having_deleted_stream_its_metastream_is_deleted_as_well.cs b/src/EventStore.Core.Tests/Services/Storage/Metastreams/when_having_deleted_stream_its_metastream_is_deleted_as_well.cs
deleted file mode 100644
index bc8c0299323..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Metastreams/when_having_deleted_stream_its_metastream_is_deleted_as_well.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.Metastreams {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_having_deleted_stream_its_metastream_is_deleted_as_well<TLogFormat, TStreamId>
-		: SimpleDbTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator.Chunk(Rec.Prepare(0, "test"),
-					Rec.Commit(0, "test"),
-					Rec.Prepare(1, "$$test", metadata: new StreamMetadata(2, null, null, null, null)),
-					Rec.Commit(1, "$$test"),
-					Rec.Delete(2, "test"),
-					Rec.Commit(2, "test"))
-				.CreateDb();
-		}
-
-		[Test]
-		public void the_stream_is_deleted() {
-			Assert.IsTrue(ReadIndex.IsStreamDeleted("test"));
-		}
-
-		[Test]
-		public void the_metastream_is_deleted() {
-			Assert.IsTrue(ReadIndex.IsStreamDeleted("$$test"));
-		}
-
-		[Test]
-		public void get_last_event_number_reports_deleted_metastream() {
-			Assert.AreEqual(EventNumber.DeletedStream, ReadIndex.GetStreamLastEventNumber("$$test"));
-		}
-
-		[Test]
-		public void single_event_read_reports_deleted_metastream() {
-			Assert.AreEqual(ReadEventResult.StreamDeleted, ReadIndex.ReadEvent("$$test", 0).Result);
-		}
-
-		[Test]
-		public void last_event_read_reports_deleted_metastream() {
-			Assert.AreEqual(ReadEventResult.StreamDeleted, ReadIndex.ReadEvent("$$test", -1).Result);
-		}
-
-		[Test]
-		public void read_stream_events_forward_reports_deleted_metastream() {
-			Assert.AreEqual(ReadStreamResult.StreamDeleted, ReadIndex.ReadStreamEventsForward("$$test", 0, 100).Result);
-		}
-
-		[Test]
-		public void read_stream_events_backward_reports_deleted_metastream() {
-			Assert.AreEqual(ReadStreamResult.StreamDeleted,
-				ReadIndex.ReadStreamEventsBackward("$$test", 0, 100).Result);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Metastreams/when_having_multiple_metaevents_in_metastream_and_read_index_is_set_to_keep_just_last.cs b/src/EventStore.Core.Tests/Services/Storage/Metastreams/when_having_multiple_metaevents_in_metastream_and_read_index_is_set_to_keep_just_last.cs
deleted file mode 100644
index 8c4c97d9da2..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Metastreams/when_having_multiple_metaevents_in_metastream_and_read_index_is_set_to_keep_just_last.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.Metastreams {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_having_multiple_metaevents_in_metastream_and_read_index_is_set_to_keep_just_last<TLogFormat, TStreamId>
-		: SimpleDbTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator.Chunk(Rec.Prepare(0, "$$test", "0", metadata: new StreamMetadata(maxCount: 10)),
-					Rec.Prepare(0, "$$test", "1", metadata: new StreamMetadata(maxCount: 9)),
-					Rec.Prepare(0, "$$test", "2", metadata: new StreamMetadata(maxCount: 8)),
-					Rec.Prepare(0, "$$test", "3", metadata: new StreamMetadata(maxCount: 7)),
-					Rec.Prepare(0, "$$test", "4", metadata: new StreamMetadata(maxCount: 6)),
-					Rec.Commit(0, "$$test"))
-				.CreateDb();
-		}
-
-		[Test]
-		public void last_event_read_returns_correct_event() {
-			var res = ReadIndex.ReadEvent("$$test", -1);
-			Assert.AreEqual(ReadEventResult.Success, res.Result);
-			Assert.AreEqual("4", res.Record.EventType);
-		}
-
-		[Test]
-		public void last_event_stream_number_is_correct() {
-			Assert.AreEqual(4, ReadIndex.GetStreamLastEventNumber("$$test"));
-		}
-
-		[Test]
-		public void single_event_read_returns_only_last_event() {
-			Assert.AreEqual(ReadEventResult.NotFound, ReadIndex.ReadEvent("$$test", 0).Result);
-			Assert.AreEqual(ReadEventResult.NotFound, ReadIndex.ReadEvent("$$test", 1).Result);
-			Assert.AreEqual(ReadEventResult.NotFound, ReadIndex.ReadEvent("$$test", 2).Result);
-			Assert.AreEqual(ReadEventResult.NotFound, ReadIndex.ReadEvent("$$test", 3).Result);
-
-			var res = ReadIndex.ReadEvent("$$test", 4);
-			Assert.AreEqual(ReadEventResult.Success, res.Result);
-			Assert.AreEqual("4", res.Record.EventType);
-		}
-
-		[Test]
-		public void stream_read_forward_returns_only_last_event() {
-			var res = ReadIndex.ReadStreamEventsForward("$$test", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(1, res.Records.Length);
-			Assert.AreEqual("4", res.Records[0].EventType);
-		}
-
-		[Test]
-		public void stream_read_backward_returns_only_last_event() {
-			var res = ReadIndex.ReadStreamEventsBackward("$$test", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(1, res.Records.Length);
-			Assert.AreEqual("4", res.Records[0].EventType);
-		}
-
-		[Test]
-		public void metastream_metadata_is_correct() {
-			var metadata = ReadIndex.GetStreamMetadata("$$test");
-			Assert.AreEqual(1, metadata.MaxCount);
-			Assert.AreEqual(null, metadata.MaxAge);
-		}
-
-		[Test]
-		public void original_stream_metadata_is_taken_from_last_metaevent() {
-			var metadata = ReadIndex.GetStreamMetadata("test");
-			Assert.AreEqual(6, metadata.MaxCount);
-			Assert.AreEqual(null, metadata.MaxAge);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Metastreams/when_having_multiple_metaevents_in_metastream_and_read_index_is_set_to_keep_last_2.cs b/src/EventStore.Core.Tests/Services/Storage/Metastreams/when_having_multiple_metaevents_in_metastream_and_read_index_is_set_to_keep_last_2.cs
deleted file mode 100644
index 48eaee9e51d..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Metastreams/when_having_multiple_metaevents_in_metastream_and_read_index_is_set_to_keep_last_2.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.Metastreams {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_having_multiple_metaevents_in_metastream_and_read_index_is_set_to_keep_last_2<TLogFormat, TStreamId> : SimpleDbTestScenario<TLogFormat, TStreamId> {
-		public when_having_multiple_metaevents_in_metastream_and_read_index_is_set_to_keep_last_2()
-			: base(metastreamMaxCount: 2) {
-		}
-
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator.Chunk(
-					Rec.Prepare(0, "$$test", "0", metadata: new StreamMetadata(10, null, null, null, null)),
-					Rec.Prepare(0, "$$test", "1", metadata: new StreamMetadata(9, null, null, null, null)),
-					Rec.Prepare(0, "$$test", "2", metadata: new StreamMetadata(8, null, null, null, null)),
-					Rec.Prepare(0, "$$test", "3", metadata: new StreamMetadata(7, null, null, null, null)),
-					Rec.Prepare(0, "$$test", "4", metadata: new StreamMetadata(6, null, null, null, null)),
-					Rec.Commit(0, "$$test"))
-				.CreateDb();
-		}
-
-		[Test]
-		public void last_event_read_returns_correct_event() {
-			var res = ReadIndex.ReadEvent("$$test", -1);
-			Assert.AreEqual(ReadEventResult.Success, res.Result);
-			Assert.AreEqual("4", res.Record.EventType);
-		}
-
-		[Test]
-		public void last_event_stream_number_is_correct() {
-			Assert.AreEqual(4, ReadIndex.GetStreamLastEventNumber("$$test"));
-		}
-
-		[Test]
-		public void single_event_read_returns_last_two_events() {
-			Assert.AreEqual(ReadEventResult.NotFound, ReadIndex.ReadEvent("$$test", 0).Result);
-			Assert.AreEqual(ReadEventResult.NotFound, ReadIndex.ReadEvent("$$test", 1).Result);
-			Assert.AreEqual(ReadEventResult.NotFound, ReadIndex.ReadEvent("$$test", 2).Result);
-
-			var res = ReadIndex.ReadEvent("$$test", 3);
-			Assert.AreEqual(ReadEventResult.Success, res.Result);
-			Assert.AreEqual("3", res.Record.EventType);
-
-			res = ReadIndex.ReadEvent("$$test", 4);
-			Assert.AreEqual(ReadEventResult.Success, res.Result);
-			Assert.AreEqual("4", res.Record.EventType);
-		}
-
-		[Test]
-		public void stream_read_forward_returns_last_two_events() {
-			var res = ReadIndex.ReadStreamEventsForward("$$test", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(2, res.Records.Length);
-			Assert.AreEqual("3", res.Records[0].EventType);
-			Assert.AreEqual("4", res.Records[1].EventType);
-		}
-
-		[Test]
-		public void stream_read_backward_returns_last_two_events() {
-			var res = ReadIndex.ReadStreamEventsBackward("$$test", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, res.Result);
-			Assert.AreEqual(2, res.Records.Length);
-			Assert.AreEqual("4", res.Records[0].EventType);
-			Assert.AreEqual("3", res.Records[1].EventType);
-		}
-
-		[Test]
-		public void metastream_metadata_is_correct() {
-			var metadata = ReadIndex.GetStreamMetadata("$$test");
-			Assert.AreEqual(2, metadata.MaxCount);
-			Assert.AreEqual(null, metadata.MaxAge);
-		}
-
-		[Test]
-		public void original_stream_metadata_is_taken_from_last_metaevent() {
-			var metadata = ReadIndex.GetStreamMetadata("test");
-			Assert.AreEqual(6, metadata.MaxCount);
-			Assert.AreEqual(null, metadata.MaxAge);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/FakeIndexReader.cs b/src/EventStore.Core.Tests/Services/Storage/ReadIndex/FakeIndexReader.cs
deleted file mode 100644
index c0e6cac477d..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/FakeIndexReader.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.Tests.Services.Storage.ReadIndex;
-
-class FakeIndexReader<TStreamId> : IIndexReader<TStreamId> {
-	public long CachedStreamInfo { get; }
-	public long NotCachedStreamInfo { get; }
-	public long HashCollisions { get; }
-
-	public IndexReadEventResult ReadEvent(string streamName, TStreamId streamId, long eventNumber) {
-		throw new NotImplementedException();
-	}
-
-	public IndexReadStreamResult
-		ReadStreamEventsForward(string streamName, TStreamId streamId, long fromEventNumber, int maxCount) {
-		throw new NotImplementedException();
-	}
-
-	public IndexReadStreamResult ReadStreamEventsBackward(string streamName, TStreamId streamId, long fromEventNumber,
-		int maxCount) {
-		throw new NotImplementedException();
-	}
-
-	public StorageMessage.EffectiveAcl GetEffectiveAcl(TStreamId streamId) {
-		throw new NotImplementedException();
-	}
-
-	public IndexReadEventInfoResult ReadEventInfo_KeepDuplicates(TStreamId streamId, long eventNumber) {
-		throw new NotImplementedException();
-	}
-
-	public IndexReadEventInfoResult ReadEventInfoForward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount,
-		long beforePosition) {
-		throw new NotImplementedException();
-	}
-
-	public IndexReadEventInfoResult ReadEventInfoForward_NoCollisions(ulong stream, long fromEventNumber, int maxCount,
-		long beforePosition) {
-		throw new NotImplementedException();
-	}
-
-	public IndexReadEventInfoResult ReadEventInfoBackward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount,
-		long beforePosition) {
-		throw new NotImplementedException();
-	}
-
-	public IndexReadEventInfoResult ReadEventInfoBackward_NoCollisions(ulong stream, Func<ulong, TStreamId> getStreamId, long fromEventNumber,
-		int maxCount, long beforePosition) {
-		throw new NotImplementedException();
-	}
-
-	public IPrepareLogRecord<TStreamId> ReadPrepare(TStreamId streamId, long eventNumber) {
-		throw new NotImplementedException();
-	}
-
-	public TStreamId GetEventStreamIdByTransactionId(long transactionId) {
-		throw new NotImplementedException();
-	}
-
-	public StreamMetadata GetStreamMetadata(TStreamId streamId) {
-		throw new NotImplementedException();
-	}
-
-	public long GetStreamLastEventNumber(TStreamId streamId) {
-		throw new NotImplementedException();
-	}
-
-	public long GetStreamLastEventNumber_KnownCollisions(TStreamId streamId, long beforePosition) {
-		throw new NotImplementedException();
-	}
-
-	public long GetStreamLastEventNumber_NoCollisions(ulong stream, Func<ulong, TStreamId> getStreamId, long beforePosition) {
-		throw new NotImplementedException();
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/GetStreamLastEventNumber_KnownCollisions.cs b/src/EventStore.Core.Tests/Services/Storage/ReadIndex/GetStreamLastEventNumber_KnownCollisions.cs
deleted file mode 100644
index a2ba1b877d6..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/GetStreamLastEventNumber_KnownCollisions.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Core.Tests.Index.Hashers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.ReadIndex {
-	public abstract class GetStreamLastEventNumber_KnownCollisions : ReadIndexTestScenario<LogFormat.V2, string> {
-		private const string Stream = "ab-1";
-		private const string CollidingStream = "cb-1";
-		private const string CollidingStream1 = "db-1";
-
-		protected GetStreamLastEventNumber_KnownCollisions() : base(
-			maxEntriesInMemTable: 3,
-			lowHasher: new ConstantHasher(0),
-			highHasher: new HumanReadableHasher32()) { }
-
-		public class VerifyCollision : GetStreamLastEventNumber_KnownCollisions {
-			protected override void WriteTestScenario() { }
-
-			[Test]
-			public void verify_that_streams_collide() {
-				Assert.AreEqual(Hasher.Hash(Stream), Hasher.Hash(CollidingStream));
-				Assert.AreEqual(Hasher.Hash(Stream), Hasher.Hash(CollidingStream1));
-			}
-		}
-
-		public class WithNoEvents : GetStreamLastEventNumber_KnownCollisions {
-			protected override void WriteTestScenario() {
-				WriteSingleEvent(CollidingStream, 0, "test data");
-				WriteSingleEvent(CollidingStream1, 0, "test data");
-			}
-
-			[Test]
-			public void with_no_events() {
-				Assert.AreEqual(ExpectedVersion.NoStream,
-					ReadIndex.GetStreamLastEventNumber_KnownCollisions(
-						Stream,
-						long.MaxValue));
-			}
-		}
-
-		public class WithOneEvent : GetStreamLastEventNumber_KnownCollisions {
-			protected override void WriteTestScenario() {
-				WriteSingleEvent(Stream, 2, "test data");
-				WriteSingleEvent(CollidingStream, 3, "test data");
-			}
-
-			[Test]
-			public void with_one_event() {
-				Assert.AreEqual(2,
-					ReadIndex.GetStreamLastEventNumber_KnownCollisions(
-						Stream,
-						long.MaxValue));
-
-				Assert.AreEqual(3,
-					ReadIndex.GetStreamLastEventNumber_KnownCollisions(
-						CollidingStream,
-						long.MaxValue));
-
-			}
-		}
-
-		public class WithMultipleEvents : GetStreamLastEventNumber_KnownCollisions {
-			private EventRecord _zeroth, _first, _second, _third;
-
-			protected override void WriteTestScenario() {
-				// PTable 1
-				WriteSingleEvent(CollidingStream, 0, string.Empty);
-				WriteSingleEvent(CollidingStream1, 0, string.Empty);
-				_zeroth = WriteSingleEvent(Stream, 0, string.Empty);
-
-				// PTable 2
-				_first = WriteSingleEvent(Stream, 1, string.Empty);
-				_second = WriteSingleEvent(Stream, 2, string.Empty);
-				WriteSingleEvent(CollidingStream, 1, string.Empty);
-
-				// MemTable
-				_third = WriteSingleEvent(Stream, 3, string.Empty);
-				WriteSingleEvent(CollidingStream, 2, string.Empty);
-			}
-
-			[Test]
-			public void with_multiple_events() {
-				Assert.AreEqual(3,
-					ReadIndex.GetStreamLastEventNumber_KnownCollisions(
-						Stream,
-						long.MaxValue));
-
-				Assert.AreEqual(2,
-					ReadIndex.GetStreamLastEventNumber_KnownCollisions(
-						CollidingStream,
-						long.MaxValue));
-
-				Assert.AreEqual(0,
-					ReadIndex.GetStreamLastEventNumber_KnownCollisions(
-						CollidingStream1,
-						long.MaxValue));
-			}
-
-			[Test]
-			public void with_multiple_events_and_before_position() {
-				Assert.AreEqual(3,
-					ReadIndex.GetStreamLastEventNumber_KnownCollisions(
-						Stream,
-						_third.LogPosition + 1));
-
-				Assert.AreEqual(2,
-					ReadIndex.GetStreamLastEventNumber_KnownCollisions(
-						Stream,
-						_third.LogPosition));
-
-				Assert.AreEqual(1,
-					ReadIndex.GetStreamLastEventNumber_KnownCollisions(
-						Stream,
-						_second.LogPosition));
-
-				Assert.AreEqual(0,
-					ReadIndex.GetStreamLastEventNumber_KnownCollisions(
-						Stream,
-						_first.LogPosition));
-
-				Assert.AreEqual(ExpectedVersion.NoStream,
-					ReadIndex.GetStreamLastEventNumber_KnownCollisions(
-						Stream,
-						_zeroth.LogPosition));
-			}
-		}
-
-		public class WithDeletedStream : GetStreamLastEventNumber_KnownCollisions {
-			protected override void WriteTestScenario() {
-				WriteSingleEvent(Stream, 0, "test data");
-				WriteSingleEvent(CollidingStream, 1, "test data");
-
-				var prepare = WriteDeletePrepare(Stream);
-				WriteDeleteCommit(prepare);
-			}
-
-			[Test]
-			public void with_deleted_stream() {
-				Assert.AreEqual(EventNumber.DeletedStream,
-					ReadIndex.GetStreamLastEventNumber_KnownCollisions(
-						Stream,
-						long.MaxValue));
-
-				Assert.AreEqual(1,
-					ReadIndex.GetStreamLastEventNumber_KnownCollisions(
-						CollidingStream,
-						long.MaxValue));
-			}
-		}
-	}
-
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/GetStreamLastEventNumber_KnownCollisions_Randomized.cs b/src/EventStore.Core.Tests/Services/Storage/ReadIndex/GetStreamLastEventNumber_KnownCollisions_Randomized.cs
deleted file mode 100644
index b4bd909804c..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/GetStreamLastEventNumber_KnownCollisions_Randomized.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.Index.Hashers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.ReadIndex {
-	[TestFixture(3)]
-	[TestFixture(33)]
-	[TestFixture(123)]
-	[TestFixture(523)]
-	public class GetStreamLastEventNumber_KnownCollisions_Randomized : ReadIndexTestScenario<LogFormat.V2, string> {
-		private const string Stream = "ab-1";
-		private const string CollidingStream = "cb-1";
-
-		private readonly Random _random = new Random();
-		private readonly int _numEvents;
-		private readonly List<EventRecord> _events;
-
-		public GetStreamLastEventNumber_KnownCollisions_Randomized(int maxEntriesInMemTable) : base(
-			chunkSize: 1_000_000,
-			maxEntriesInMemTable: maxEntriesInMemTable,
-			lowHasher: new ConstantHasher(0),
-			highHasher: new HumanReadableHasher32()) {
-			_numEvents = _random.Next(100, 400);
-			_events = new List<EventRecord>(_numEvents);
-		}
-
-		protected override void WriteTestScenario() {
-			var streamLast = 0L;
-			var collidingStreamLast = 0L;
-
-			for (int i = 0; i < _numEvents; i++) {
-				if (_random.Next(2) == 0) {
-					_events.Add(WriteSingleEvent(Stream, streamLast++, "test data"));
-				} else {
-					_events.Add(WriteSingleEvent(CollidingStream, collidingStreamLast++, "testing"));
-				}
-			}
-		}
-
-		[Test]
-		public void returns_correct_last_event_number_before_position() {
-			var streamLast = ExpectedVersion.NoStream;
-			var collidingStreamLast = ExpectedVersion.NoStream;
-
-			foreach (var @event in _events)
-			{
-				Assert.AreEqual(streamLast,
-					ReadIndex.GetStreamLastEventNumber_KnownCollisions(Stream, @event.LogPosition));
-
-				Assert.AreEqual(collidingStreamLast,
-					ReadIndex.GetStreamLastEventNumber_KnownCollisions(CollidingStream, @event.LogPosition));
-
-				switch (@event.EventStreamId)
-				{
-					case Stream:
-						streamLast = @event.EventNumber;
-						break;
-					case CollidingStream:
-						collidingStreamLast = @event.EventNumber;
-						break;
-				}
-			}
-		}
-	}
-
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/GetStreamLastEventNumber_NoCollisions_Randomized.cs b/src/EventStore.Core.Tests/Services/Storage/ReadIndex/GetStreamLastEventNumber_NoCollisions_Randomized.cs
deleted file mode 100644
index 12e3a7d4622..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/GetStreamLastEventNumber_NoCollisions_Randomized.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.Index.Hashers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.ReadIndex {
-	[TestFixture(3)]
-	[TestFixture(33)]
-	[TestFixture(123)]
-	[TestFixture(523)]
-	public class GetStreamLastEventNumber_NoCollisions_Randomized : ReadIndexTestScenario<LogFormat.V2, string> {
-		private const string Stream = "ab-1";
-		private const ulong Hash = 98;
-		private const string NonCollidingStream = "cd-1";
-		private string GetStreamId(ulong hash) => hash == Hash ? Stream : throw new ArgumentException();
-
-		private readonly Random _random = new Random();
-		private readonly int _numEvents;
-		private readonly List<EventRecord> _events;
-
-		public GetStreamLastEventNumber_NoCollisions_Randomized(int maxEntriesInMemTable) : base(
-			chunkSize: 1_000_000,
-			maxEntriesInMemTable: maxEntriesInMemTable,
-			lowHasher: new ConstantHasher(0),
-			highHasher: new HumanReadableHasher32()) {
-			_numEvents = _random.Next(100, 400);
-			_events = new List<EventRecord>(_numEvents);
-		}
-
-		protected override void WriteTestScenario() {
-			var streamLast = 0L;
-			var nonCollidingStreamLast = 0L;
-
-			for (int i = 0; i < _numEvents; i++) {
-				if (_random.Next(2) == 0) {
-					_events.Add(WriteSingleEvent(Stream, streamLast++, "test data"));
-				} else {
-					_events.Add(WriteSingleEvent(NonCollidingStream, nonCollidingStreamLast++, "testing"));
-				}
-			}
-		}
-
-		[Test]
-		public void returns_correct_last_event_number_before_position() {
-			var expectedLastEventNumber = ExpectedVersion.NoStream;
-
-			foreach (var @event in _events)
-			{
-				Assert.AreEqual(expectedLastEventNumber,
-					ReadIndex.GetStreamLastEventNumber_NoCollisions(Hash, GetStreamId, @event.LogPosition));
-
-				if (@event.EventStreamId == Stream)
-					expectedLastEventNumber = @event.EventNumber;
-			}
-		}
-	}
-
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_KnownCollisions.cs b/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_KnownCollisions.cs
deleted file mode 100644
index 00fbde3972f..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_KnownCollisions.cs
+++ /dev/null
@@ -1,341 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.Index.Hashers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.ReadIndex {
-	[TestFixture]
-	public abstract class ReadEventInfoBackward_KnownCollisions : ReadIndexTestScenario<LogFormat.V2, string> {
-		private const string Stream = "ab-1";
-		private const string CollidingStream = "cb-1";
-		private const string CollidingStream1 = "db-1";
-
-		protected ReadEventInfoBackward_KnownCollisions() : base(
-			maxEntriesInMemTable: 3,
-			lowHasher: new ConstantHasher(0),
-			highHasher: new HumanReadableHasher32()) { }
-
-		private static void CheckResult(EventRecord[] events, IndexReadEventInfoResult result) {
-			var eventInfos = result.EventInfos.Reverse().ToArray();
-			Assert.AreEqual(events.Length, eventInfos.Length);
-			for (int i = 0; i < events.Length; i++) {
-				Assert.AreEqual(events[i].EventNumber, eventInfos[i].EventNumber);
-				Assert.AreEqual(events[i].LogPosition, eventInfos[i].LogPosition);
-			}
-		}
-
-		public class VerifyCollision : ReadEventInfoBackward_KnownCollisions {
-			protected override void WriteTestScenario() { }
-
-			[Test]
-			public void verify_that_streams_collide() {
-				Assert.AreEqual(Hasher.Hash(Stream), Hasher.Hash(CollidingStream));
-				Assert.AreEqual(Hasher.Hash(Stream), Hasher.Hash(CollidingStream1));
-			}
-		}
-
-		public class WithNoEvents : ReadEventInfoBackward_KnownCollisions {
-			protected override void WriteTestScenario() {
-				WriteSingleEvent(CollidingStream, 0, "test data");
-				WriteSingleEvent(CollidingStream1, 0, "test data");
-			}
-
-			[Test]
-			public void with_no_events() {
-				var result = ReadIndex.ReadEventInfoBackward_KnownCollisions(
-					Stream,
-					0,
-					int.MaxValue,
-					long.MaxValue);
-
-				Assert.AreEqual(0, result.EventInfos.Length);
-				Assert.True(result.IsEndOfStream);
-
-				result = ReadIndex.ReadEventInfoBackward_KnownCollisions(
-					Stream,
-					-1,
-					int.MaxValue,
-					long.MaxValue);
-
-				Assert.AreEqual(0, result.EventInfos.Length);
-				Assert.True(result.IsEndOfStream);
-
-			}
-		}
-
-		public class WithOneEvent : ReadEventInfoBackward_KnownCollisions {
-			private EventRecord _event;
-
-			protected override void WriteTestScenario() {
-				_event = WriteSingleEvent(Stream, 0, "test data");
-				WriteSingleEvent(CollidingStream, 1, "test data");
-			}
-
-			[Test]
-			public void with_one_event() {
-				var result = ReadIndex.ReadEventInfoBackward_KnownCollisions(
-					Stream,
-					0,
-					int.MaxValue,
-					long.MaxValue);
-
-				Assert.AreEqual(1, result.EventInfos.Length);
-				CheckResult(new[] { _event }, result);
-				Assert.True(result.IsEndOfStream);
-
-				result = ReadIndex.ReadEventInfoBackward_KnownCollisions(
-					Stream,
-					1,
-					int.MaxValue,
-					long.MaxValue);
-
-				CheckResult(new[] { _event }, result);
-				Assert.True(result.IsEndOfStream);
-
-				result = ReadIndex.ReadEventInfoBackward_KnownCollisions(
-					Stream,
-					-1,
-					int.MaxValue,
-					long.MaxValue);
-
-				Assert.AreEqual(1, result.EventInfos.Length);
-				CheckResult(new[] { _event }, result);
-				Assert.True(result.IsEndOfStream);
-			}
-		}
-
-		public class WithMultipleEvents : ReadEventInfoBackward_KnownCollisions {
-			private readonly List<EventRecord> _events = new List<EventRecord>();
-
-			protected override void WriteTestScenario() {
-				// PTable 1
-				WriteSingleEvent(CollidingStream, 0, string.Empty);
-				WriteSingleEvent(CollidingStream, 1, string.Empty);
-				_events.Add(WriteSingleEvent(Stream, 0, string.Empty));
-
-				// PTable 2
-				_events.Add(WriteSingleEvent(Stream, 1, string.Empty));
-				_events.Add(WriteSingleEvent(Stream, 2, string.Empty));
-				WriteSingleEvent(CollidingStream, 2, string.Empty);
-
-				// MemTable
-				_events.Add(WriteSingleEvent(Stream, 3, string.Empty));
-				WriteSingleEvent(CollidingStream, 3, string.Empty);
-			}
-
-			[Test]
-			public void with_multiple_events() {
-				for (int fromEventNumber = 0; fromEventNumber <= 4; fromEventNumber++) {
-					var result = ReadIndex.ReadEventInfoBackward_KnownCollisions(
-						Stream,
-						fromEventNumber,
-						int.MaxValue,
-						long.MaxValue);
-
-					CheckResult(_events.Take(fromEventNumber + 1).ToArray(), result);
-					Assert.True(result.IsEndOfStream);
-				}
-			}
-
-			[Test]
-			public void with_multiple_events_and_max_count() {
-				for (int fromEventNumber = 0; fromEventNumber <= 4; fromEventNumber++) {
-					var result = ReadIndex.ReadEventInfoBackward_KnownCollisions(
-						Stream,
-						fromEventNumber,
-						2,
-						long.MaxValue);
-
-					CheckResult(_events.Take(fromEventNumber + 1).Skip(fromEventNumber + 1 - 2).ToArray(), result);
-					if (fromEventNumber - 2 < 0)
-						Assert.True(result.IsEndOfStream);
-					else
-						Assert.AreEqual(fromEventNumber - 2, result.NextEventNumber);
-				}
-			}
-
-			[Test]
-			public void with_multiple_events_and_before_position() {
-				for (int fromEventNumber = 0; fromEventNumber + 1 < _events.Count; fromEventNumber++) {
-					var result = ReadIndex.ReadEventInfoBackward_KnownCollisions(
-						Stream,
-						fromEventNumber,
-						int.MaxValue,
-						_events[fromEventNumber + 1].LogPosition);
-
-					CheckResult(_events.Take(fromEventNumber + 1).ToArray(), result);
-					Assert.True(result.IsEndOfStream);
-
-					result = ReadIndex.ReadEventInfoBackward_KnownCollisions(
-						Stream,
-						-1,
-						int.MaxValue,
-						_events[fromEventNumber + 1].LogPosition);
-
-					CheckResult(_events.Take(fromEventNumber + 1).ToArray(), result);
-					Assert.True(result.IsEndOfStream);
-				}
-			}
-		}
-
-		public class WithDeletedStream : ReadEventInfoBackward_KnownCollisions {
-			private readonly List<EventRecord> _events = new List<EventRecord>();
-
-			protected override void WriteTestScenario() {
-				_events.Add(WriteSingleEvent(Stream, 0, "test data"));
-				WriteSingleEvent(CollidingStream, 1, "test data");
-				_events.Add(WriteSingleEvent(Stream, 1, "test"));
-
-				var prepare = WriteDeletePrepare(Stream);
-				WriteDeleteCommit(prepare);
-			}
-
-			[Test]
-			public void can_read_events() {
-				var result = ReadIndex.ReadEventInfoBackward_KnownCollisions(
-					Stream,
-					1,
-					int.MaxValue,
-					long.MaxValue);
-
-				CheckResult(_events.ToArray(), result);
-				Assert.True(result.IsEndOfStream);
-			}
-
-			[Test]
-			public void can_read_tombstone_event() {
-				var result = ReadIndex.ReadEventInfoBackward_KnownCollisions(
-					Stream,
-					EventNumber.DeletedStream,
-					int.MaxValue,
-					long.MaxValue);
-
-				Assert.AreEqual(1, result.EventInfos.Length);
-				Assert.AreEqual(EventNumber.DeletedStream, result.EventInfos[0].EventNumber);
-				Assert.AreEqual(long.MaxValue - int.MaxValue, result.NextEventNumber);
-
-				result = ReadIndex.ReadEventInfoBackward_KnownCollisions(
-					Stream,
-					-1,
-					int.MaxValue,
-					long.MaxValue);
-
-				Assert.AreEqual(1, result.EventInfos.Length);
-				Assert.AreEqual(EventNumber.DeletedStream, result.EventInfos[0].EventNumber);
-				Assert.AreEqual(long.MaxValue - int.MaxValue, result.NextEventNumber);
-
-				result = ReadIndex.ReadEventInfoBackward_KnownCollisions(
-					Stream,
-					EventNumber.DeletedStream - 1,
-					1,
-					long.MaxValue);
-
-				Assert.AreEqual(0, result.EventInfos.Length);
-				Assert.AreEqual(1, result.NextEventNumber);
-			}
-		}
-
-		public class WithGapsBetweenEvents : ReadEventInfoBackward_KnownCollisions {
-			private readonly List<EventRecord> _events = new List<EventRecord>();
-
-			protected override void WriteTestScenario() {
-				// PTable 1
-				WriteSingleEvent(CollidingStream, 0, string.Empty);
-				WriteSingleEvent(CollidingStream, 1, string.Empty);
-				_events.Add(WriteSingleEvent(Stream, 0, string.Empty));
-
-				// PTable 2
-				_events.Add(WriteSingleEvent(Stream, 4, string.Empty));
-				_events.Add(WriteSingleEvent(Stream, 5, string.Empty));
-				WriteSingleEvent(CollidingStream, 2, string.Empty);
-
-				// MemTable
-				_events.Add(WriteSingleEvent(Stream, 7, string.Empty));
-				WriteSingleEvent(CollidingStream, 3, string.Empty);
-			}
-
-			[Test]
-			public void strictly_returns_up_to_max_count_consecutive_events_from_start_event_number() {
-				var result = ReadIndex.ReadEventInfoBackward_KnownCollisions(
-					Stream,
-					7,
-					int.MaxValue,
-					long.MaxValue);
-
-				CheckResult(_events.ToArray(), result);
-				Assert.True(result.IsEndOfStream);
-
-				result = ReadIndex.ReadEventInfoBackward_KnownCollisions(
-					Stream,
-					7,
-					4,
-					long.MaxValue);
-
-				CheckResult(_events.Skip(1).ToArray(), result);
-				Assert.AreEqual(3, result.NextEventNumber);
-
-				result = ReadIndex.ReadEventInfoBackward_KnownCollisions(
-					Stream,
-					3,
-					1,
-					long.MaxValue);
-
-				Assert.AreEqual(0, result.EventInfos.Length);
-				Assert.AreEqual(2, result.NextEventNumber); // from colliding stream, but doesn't matter much
-
-				result = ReadIndex.ReadEventInfoBackward_KnownCollisions(
-					Stream,
-					2,
-					1,
-					long.MaxValue);
-
-				Assert.AreEqual(0, result.EventInfos.Length);
-				Assert.AreEqual(1, result.NextEventNumber); // from colliding stream, but doesn't matter much
-
-			}
-		}
-
-
-		public class WithDuplicateEvents : ReadEventInfoBackward_KnownCollisions {
-			private readonly List<EventRecord> _events = new List<EventRecord>();
-
-			protected override void WriteTestScenario() {
-				// PTable 1
-				WriteSingleEvent(CollidingStream, 0, string.Empty);
-				WriteSingleEvent(CollidingStream, 1, string.Empty);
-				_events.Add(WriteSingleEvent(Stream, 0, string.Empty));
-
-				// PTable 2
-				_events.Add(WriteSingleEvent(Stream, 1, string.Empty));
-				_events.Add(WriteSingleEvent(Stream, 1, string.Empty));
-				WriteSingleEvent(CollidingStream, 2, string.Empty);
-
-				// MemTable
-				_events.Add(WriteSingleEvent(Stream, 2, string.Empty));
-				_events.Add(WriteSingleEvent(Stream, 2, string.Empty));
-				_events.Add(WriteSingleEvent(Stream, 2, string.Empty));
-			}
-
-			[Test]
-			public void result_is_deduplicated_keeping_oldest_duplicates() {
-				var result = ReadIndex.ReadEventInfoBackward_KnownCollisions(
-					Stream,
-					3,
-					int.MaxValue,
-					long.MaxValue);
-
-				CheckResult(
-					_events
-						.GroupBy(x => x.EventNumber)
-						.Select(x => x.First())
-						.OrderBy(x => x.EventNumber)
-						.ToArray(),
-					result);
-				Assert.True(result.IsEndOfStream);
-			}
-		}
-	}
-
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_KnownCollisions_Randomized.cs b/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_KnownCollisions_Randomized.cs
deleted file mode 100644
index bb0faa8feb9..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_KnownCollisions_Randomized.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.Index.Hashers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.ReadIndex {
-	[TestFixture(3)]
-	[TestFixture(33)]
-	[TestFixture(123)]
-	[TestFixture(523)]
-	public class ReadEventInfoBackward_KnownCollisions_Randomized : ReadIndexTestScenario<LogFormat.V2, string> {
-		private const string Stream = "ab-1";
-		private const string CollidingStream = "cb-1";
-
-		private readonly Random _random = new Random();
-		private readonly int _numEvents;
-		private readonly List<EventRecord> _events;
-
-		public ReadEventInfoBackward_KnownCollisions_Randomized(int maxEntriesInMemTable) : base(
-			chunkSize: 1_000_000,
-			maxEntriesInMemTable: maxEntriesInMemTable,
-			lowHasher: new ConstantHasher(0),
-			highHasher: new HumanReadableHasher32()) {
-			_numEvents = _random.Next(100, 400);
-			_events = new List<EventRecord>(_numEvents);
-		}
-
-		private static void CheckResult(EventRecord[] events, IndexReadEventInfoResult result) {
-			var eventInfos = result.EventInfos.Reverse().ToArray();
-			Assert.AreEqual(events.Length, eventInfos.Length);
-			for (int i = 0; i < events.Length; i++) {
-				Assert.AreEqual(events[i].EventNumber, eventInfos[i].EventNumber);
-				Assert.AreEqual(events[i].LogPosition, eventInfos[i].LogPosition);
-			}
-		}
-
-		protected override void WriteTestScenario() {
-			var streamLast = 0L;
-			var collidingStreamLast = 0L;
-
-			for (int i = 0; i < _numEvents; i++) {
-				if (_random.Next(2) == 0) {
-					_events.Add(WriteSingleEvent(Stream, streamLast++, "test data"));
-				} else {
-					_events.Add(WriteSingleEvent(CollidingStream, collidingStreamLast++, "testing"));
-				}
-			}
-		}
-
-		[Test]
-		public void returns_correct_events_before_position() {
-			var curEvents = new List<EventRecord>();
-
-			foreach (var @event in _events)
-			{
-				IndexReadEventInfoResult result;
-				if (@event.EventStreamId == Stream) {
-					result = ReadIndex.ReadEventInfoBackward_KnownCollisions(Stream,
-						@event.EventNumber - 1, int.MaxValue, @event.LogPosition);
-					CheckResult(curEvents.ToArray(),result);
-					Assert.True(result.IsEndOfStream);
-
-					// events >= @event.EventNumber should be filtered out
-					result = ReadIndex.ReadEventInfoBackward_KnownCollisions(Stream,
-						@event.EventNumber, int.MaxValue, @event.LogPosition);
-					CheckResult(curEvents.ToArray(), result);
-					Assert.True(result.IsEndOfStream);
-
-					result = ReadIndex.ReadEventInfoBackward_KnownCollisions(Stream,
-						@event.EventNumber + 1, int.MaxValue, @event.LogPosition);
-					CheckResult(curEvents.ToArray(), result);
-					Assert.True(result.IsEndOfStream);
-				}
-
-				result = ReadIndex.ReadEventInfoBackward_KnownCollisions(Stream, -1, int.MaxValue, @event.LogPosition);
-				CheckResult(curEvents.ToArray(), result);
-				Assert.True(result.IsEndOfStream);
-
-				if (@event.EventStreamId == Stream)
-					curEvents.Add(@event);
-			}
-		}
-
-		[Test]
-		public void returns_correct_events_with_max_count() {
-			var curEvents = new List<EventRecord>();
-
-			foreach (var @event in _events) {
-				if (@event.EventStreamId != Stream) continue;
-				curEvents.Add(@event);
-
-				int maxCount = Math.Min((int)@event.EventNumber + 1, _random.Next(10, 100));
-				var fromEventNumber = @event.EventNumber;
-
-				Assert.Greater(maxCount, 0);
-				Assert.GreaterOrEqual(fromEventNumber, 0);
-
-				var result = ReadIndex.ReadEventInfoBackward_KnownCollisions(
-					Stream, fromEventNumber, maxCount, long.MaxValue);
-				CheckResult(curEvents.Skip(curEvents.Count - maxCount).ToArray(), result);
-
-				if (fromEventNumber - maxCount < 0)
-					Assert.True(result.IsEndOfStream);
-				else
-					Assert.AreEqual(fromEventNumber - maxCount, result.NextEventNumber);
-			}
-		}
-	}
-
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_NoCollisions.cs b/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_NoCollisions.cs
deleted file mode 100644
index 4b397a0866f..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_NoCollisions.cs
+++ /dev/null
@@ -1,345 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.Index.Hashers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.ReadIndex {
-	[TestFixture]
-	public abstract class ReadEventInfoBackward_NoCollisions : ReadIndexTestScenario<LogFormat.V2, string> {
-		private const string Stream = "ab-1";
-		private const ulong Hash = 98;
-		private const string NonCollidingStream = "cd-1";
-
-		private string GetStreamId(ulong hash) => hash == Hash ? Stream : throw new ArgumentException();
-
-		protected ReadEventInfoBackward_NoCollisions() : base(
-			maxEntriesInMemTable: 3,
-			lowHasher: new ConstantHasher(0),
-			highHasher: new HumanReadableHasher32()) { }
-
-		private static void CheckResult(EventRecord[] events, IndexReadEventInfoResult result) {
-			var eventInfos = result.EventInfos.Reverse().ToArray();
-			Assert.AreEqual(events.Length, eventInfos.Length);
-			for (int i = 0; i < events.Length; i++) {
-				Assert.AreEqual(events[i].EventNumber, eventInfos[i].EventNumber);
-				Assert.AreEqual(events[i].LogPosition, eventInfos[i].LogPosition);
-			}
-		}
-
-		public class VerifyNoCollision : ReadEventInfoBackward_NoCollisions {
-			protected override void WriteTestScenario() { }
-
-			[Test]
-			public void verify_that_streams_do_not_collide() {
-				Assert.AreNotEqual(Hasher.Hash(Stream), Hasher.Hash(NonCollidingStream));
-			}
-		}
-
-		public class WithNoEvents : ReadEventInfoBackward_NoCollisions {
-			protected override void WriteTestScenario() { }
-
-			[Test]
-			public void with_no_events() {
-				var result = ReadIndex.ReadEventInfoBackward_NoCollisions(
-					Hash,
-					GetStreamId,
-					0,
-					int.MaxValue,
-					long.MaxValue);
-
-				Assert.AreEqual(0, result.EventInfos.Length);
-				Assert.True(result.IsEndOfStream);
-
-				result = ReadIndex.ReadEventInfoBackward_NoCollisions(
-					Hash,
-					GetStreamId,
-					-1,
-					int.MaxValue,
-					long.MaxValue);
-
-				Assert.AreEqual(0, result.EventInfos.Length);
-				Assert.True(result.IsEndOfStream);
-			}
-		}
-
-		public class WithOneEvent : ReadEventInfoBackward_NoCollisions {
-			private EventRecord _event;
-
-			protected override void WriteTestScenario() {
-				_event = WriteSingleEvent(Stream, 0, "test data");
-			}
-
-			[Test]
-			public void with_one_event() {
-				var result = ReadIndex.ReadEventInfoBackward_NoCollisions(
-					Hash,
-					GetStreamId,
-					0,
-					int.MaxValue,
-					long.MaxValue);
-
-				Assert.AreEqual(1, result.EventInfos.Length);
-				CheckResult(new[] { _event }, result);
-				Assert.True(result.IsEndOfStream);
-
-				result = ReadIndex.ReadEventInfoBackward_NoCollisions(
-					Hash,
-					GetStreamId,
-					1,
-					int.MaxValue,
-					long.MaxValue);
-
-				CheckResult(new[] { _event }, result);
-				Assert.True(result.IsEndOfStream);
-
-				result = ReadIndex.ReadEventInfoBackward_NoCollisions(
-					Hash,
-					GetStreamId,
-					-1,
-					int.MaxValue,
-					long.MaxValue);
-
-				Assert.AreEqual(1, result.EventInfos.Length);
-				CheckResult(new[] { _event }, result);
-				Assert.True(result.IsEndOfStream);
-			}
-		}
-
-		public class WithMultipleEvents : ReadEventInfoBackward_NoCollisions {
-			private readonly List<EventRecord> _events = new List<EventRecord>();
-
-			protected override void WriteTestScenario() {
-				// PTable 1
-				WriteSingleEvent(NonCollidingStream, 0, string.Empty);
-				WriteSingleEvent(NonCollidingStream, 1, string.Empty);
-				_events.Add(WriteSingleEvent(Stream, 0, string.Empty));
-
-				// PTable 2
-				_events.Add(WriteSingleEvent(Stream, 1, string.Empty));
-				_events.Add(WriteSingleEvent(Stream, 2, string.Empty));
-				WriteSingleEvent(NonCollidingStream, 2, string.Empty);
-
-				// MemTable
-				_events.Add(WriteSingleEvent(Stream, 3, string.Empty));
-				WriteSingleEvent(NonCollidingStream, 3, string.Empty);
-			}
-
-			[Test]
-			public void with_multiple_events() {
-				for (int fromEventNumber = 0; fromEventNumber <= 4; fromEventNumber++) {
-					var result = ReadIndex.ReadEventInfoBackward_NoCollisions(
-						Hash,
-						GetStreamId,
-						fromEventNumber,
-						int.MaxValue,
-						long.MaxValue);
-
-					CheckResult(_events.Take(fromEventNumber + 1).ToArray(), result);
-					Assert.True(result.IsEndOfStream);
-				}
-			}
-
-			[Test]
-			public void with_multiple_events_and_max_count() {
-				for (int fromEventNumber = 0; fromEventNumber <= 4; fromEventNumber++) {
-					var result = ReadIndex.ReadEventInfoBackward_NoCollisions(
-						Hash,
-						GetStreamId,
-						fromEventNumber,
-						2,
-						long.MaxValue);
-
-					CheckResult(_events.Take(fromEventNumber + 1).Skip(fromEventNumber + 1 - 2).ToArray(), result);
-					if (fromEventNumber - 2 < 0)
-						Assert.True(result.IsEndOfStream);
-					else
-						Assert.AreEqual(fromEventNumber - 2, result.NextEventNumber);
-				}
-			}
-
-			[Test]
-			public void with_multiple_events_and_before_position() {
-				for (int fromEventNumber = 0; fromEventNumber + 1 < _events.Count; fromEventNumber++) {
-					var result = ReadIndex.ReadEventInfoBackward_NoCollisions(
-						Hash,
-						GetStreamId,
-						fromEventNumber,
-						int.MaxValue,
-						_events[fromEventNumber + 1].LogPosition);
-
-					CheckResult(_events.Take(fromEventNumber + 1).ToArray(), result);
-					Assert.True(result.IsEndOfStream);
-
-					result = ReadIndex.ReadEventInfoBackward_NoCollisions(
-						Hash,
-						GetStreamId,
-						-1,
-						int.MaxValue,
-						_events[fromEventNumber + 1].LogPosition);
-
-					CheckResult(_events.Take(fromEventNumber + 1).ToArray(), result);
-					Assert.True(result.IsEndOfStream);
-				}
-			}
-		}
-
-		public class WithDeletedStream : ReadEventInfoBackward_NoCollisions {
-			private readonly List<EventRecord> _events = new List<EventRecord>();
-
-			protected override void WriteTestScenario() {
-				_events.Add(WriteSingleEvent(Stream, 0, "test data"));
-				_events.Add(WriteSingleEvent(Stream, 1, "test data"));
-
-				var prepare = WriteDeletePrepare(Stream);
-				WriteDeleteCommit(prepare);
-			}
-
-			[Test]
-			public void can_read_events() {
-				var result = ReadIndex.ReadEventInfoBackward_NoCollisions(
-					Hash,
-					GetStreamId,
-					1,
-					int.MaxValue,
-					long.MaxValue);
-
-				CheckResult(_events.ToArray(), result);
-				Assert.True(result.IsEndOfStream);
-			}
-
-			[Test]
-			public void can_read_tombstone_event() {
-				var result = ReadIndex.ReadEventInfoBackward_NoCollisions(
-					Hash,
-					GetStreamId,
-					EventNumber.DeletedStream,
-					int.MaxValue,
-					long.MaxValue);
-
-				Assert.AreEqual(1, result.EventInfos.Length);
-				Assert.AreEqual(EventNumber.DeletedStream, result.EventInfos[0].EventNumber);
-				Assert.AreEqual(long.MaxValue - int.MaxValue, result.NextEventNumber);
-
-				result = ReadIndex.ReadEventInfoBackward_NoCollisions(
-					Hash,
-					GetStreamId,
-					-1,
-					int.MaxValue,
-					long.MaxValue);
-
-				Assert.AreEqual(1, result.EventInfos.Length);
-				Assert.AreEqual(EventNumber.DeletedStream, result.EventInfos[0].EventNumber);
-				Assert.AreEqual(long.MaxValue - int.MaxValue, result.NextEventNumber);
-
-				result = ReadIndex.ReadEventInfoBackward_NoCollisions(
-					Hash,
-					GetStreamId,
-					EventNumber.DeletedStream - 1,
-					1,
-					long.MaxValue);
-
-				Assert.AreEqual(0, result.EventInfos.Length);
-				Assert.AreEqual(1, result.NextEventNumber);
-			}
-		}
-
-		public class WithGapsBetweenEvents : ReadEventInfoBackward_NoCollisions {
-			private readonly List<EventRecord> _events = new List<EventRecord>();
-
-			protected override void WriteTestScenario() {
-				// PTable 1
-				WriteSingleEvent(NonCollidingStream, 0, string.Empty);
-				WriteSingleEvent(NonCollidingStream, 1, string.Empty);
-				_events.Add(WriteSingleEvent(Stream, 0, string.Empty));
-
-				// PTable 2
-				_events.Add(WriteSingleEvent(Stream, 4, string.Empty));
-				_events.Add(WriteSingleEvent(Stream, 5, string.Empty));
-				WriteSingleEvent(NonCollidingStream, 2, string.Empty);
-
-				// MemTable
-				_events.Add(WriteSingleEvent(Stream, 7, string.Empty));
-				WriteSingleEvent(NonCollidingStream, 3, string.Empty);
-			}
-
-			[Test]
-			public void strictly_returns_up_to_max_count_consecutive_events_from_start_event_number() {
-				var result = ReadIndex.ReadEventInfoBackward_NoCollisions(
-					Hash,
-					GetStreamId,
-					7,
-					int.MaxValue,
-					long.MaxValue);
-
-				CheckResult(_events.ToArray(), result);
-				Assert.True(result.IsEndOfStream);
-
-				result = ReadIndex.ReadEventInfoBackward_NoCollisions(
-					Hash,
-					GetStreamId,
-					7,
-					4,
-					long.MaxValue);
-
-				CheckResult(_events.Skip(1).ToArray(), result);
-				Assert.AreEqual(3, result.NextEventNumber);
-
-
-				result = ReadIndex.ReadEventInfoBackward_NoCollisions(
-					Hash,
-					GetStreamId,
-					3,
-					1,
-					long.MaxValue);
-
-				Assert.AreEqual(0, result.EventInfos.Length);
-				Assert.AreEqual(0, result.NextEventNumber);
-			}
-		}
-
-
-		public class WithDuplicateEvents : ReadEventInfoBackward_NoCollisions {
-			private readonly List<EventRecord> _events = new List<EventRecord>();
-
-			protected override void WriteTestScenario() {
-				// PTable 1
-				WriteSingleEvent(NonCollidingStream, 0, string.Empty);
-				WriteSingleEvent(NonCollidingStream, 1, string.Empty);
-				_events.Add(WriteSingleEvent(Stream, 0, string.Empty));
-
-				// PTable 2
-				_events.Add(WriteSingleEvent(Stream, 1, string.Empty));
-				_events.Add(WriteSingleEvent(Stream, 1, string.Empty));
-				WriteSingleEvent(NonCollidingStream, 2, string.Empty);
-
-				// MemTable
-				_events.Add(WriteSingleEvent(Stream, 2, string.Empty));
-				_events.Add(WriteSingleEvent(Stream, 2, string.Empty));
-				_events.Add(WriteSingleEvent(Stream, 2, string.Empty));
-			}
-
-			[Test]
-			public void result_is_deduplicated_keeping_oldest_duplicates() {
-				var result = ReadIndex.ReadEventInfoBackward_NoCollisions(
-					Hash,
-					GetStreamId,
-					3,
-					int.MaxValue,
-					long.MaxValue);
-
-				CheckResult(
-					_events
-						.GroupBy(x => x.EventNumber)
-						.Select(x => x.First())
-						.OrderBy(x => x.EventNumber)
-						.ToArray(),
-					result);
-				Assert.True(result.IsEndOfStream);
-			}
-		}
-	}
-
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_NoCollisions_Randomized.cs b/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_NoCollisions_Randomized.cs
deleted file mode 100644
index 29e2e48fe3d..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_NoCollisions_Randomized.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.Index.Hashers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.ReadIndex {
-	[TestFixture(3)]
-	[TestFixture(33)]
-	[TestFixture(123)]
-	[TestFixture(523)]
-	public class ReadEventInfoBackward_NoCollisions_Randomized : ReadIndexTestScenario<LogFormat.V2, string> {
-		private const string Stream = "ab-1";
-		private const ulong Hash = 98;
-		private const string NonCollidingStream = "cd-1";
-
-		private string GetStreamId(ulong hash) => hash == Hash ? Stream : throw new ArgumentException();
-
-		private readonly Random _random = new Random();
-		private readonly int _numEvents;
-		private readonly List<EventRecord> _events;
-
-		public ReadEventInfoBackward_NoCollisions_Randomized(int maxEntriesInMemTable) : base(
-			chunkSize: 1_000_000,
-			maxEntriesInMemTable: maxEntriesInMemTable,
-			lowHasher: new ConstantHasher(0),
-			highHasher: new HumanReadableHasher32()) {
-			_numEvents = _random.Next(100, 400);
-			_events = new List<EventRecord>(_numEvents);
-		}
-
-		private static void CheckResult(EventRecord[] events, IndexReadEventInfoResult result) {
-			var eventInfos = result.EventInfos.Reverse().ToArray();
-			Assert.AreEqual(events.Length, eventInfos.Length);
-			for (int i = 0; i < events.Length; i++) {
-				Assert.AreEqual(events[i].EventNumber, eventInfos[i].EventNumber);
-				Assert.AreEqual(events[i].LogPosition, eventInfos[i].LogPosition);
-			}
-		}
-
-		protected override void WriteTestScenario() {
-			var streamLast = 0L;
-			var nonCollidingStreamLast = 0L;
-
-			for (int i = 0; i < _numEvents; i++) {
-				if (_random.Next(2) == 0) {
-					_events.Add(WriteSingleEvent(Stream, streamLast++, "test data"));
-				} else {
-					_events.Add(WriteSingleEvent(NonCollidingStream, nonCollidingStreamLast++, "testing"));
-				}
-			}
-		}
-
-		[Test]
-		public void returns_correct_events_before_position() {
-			var curEvents = new List<EventRecord>();
-
-			foreach (var @event in _events)
-			{
-				IndexReadEventInfoResult result;
-				if (@event.EventStreamId == Stream) {
-					result = ReadIndex.ReadEventInfoBackward_NoCollisions(Hash, GetStreamId,
-						@event.EventNumber - 1, int.MaxValue, @event.LogPosition);
-					CheckResult(curEvents.ToArray(), result);
-					Assert.True(result.IsEndOfStream);
-
-					// events >= @event.EventNumber should be filtered out
-					result = ReadIndex.ReadEventInfoBackward_NoCollisions(Hash, GetStreamId,
-						@event.EventNumber, int.MaxValue, @event.LogPosition);
-					CheckResult(curEvents.ToArray(), result);
-					Assert.True(result.IsEndOfStream);
-
-					result = ReadIndex.ReadEventInfoBackward_NoCollisions(Hash, GetStreamId,
-						@event.EventNumber + 1, int.MaxValue, @event.LogPosition);
-					CheckResult(curEvents.ToArray(), result);
-					Assert.True(result.IsEndOfStream);
-				}
-
-				result = ReadIndex.ReadEventInfoBackward_NoCollisions(Hash, GetStreamId, -1, int.MaxValue,
-					@event.LogPosition);
-				CheckResult(curEvents.ToArray(), result);
-				Assert.True(result.IsEndOfStream);
-
-				if (@event.EventStreamId == Stream)
-					curEvents.Add(@event);
-			}
-		}
-
-		[Test]
-		public void returns_correct_events_with_max_count() {
-			var curEvents = new List<EventRecord>();
-
-			foreach (var @event in _events) {
-				if (@event.EventStreamId != Stream) continue;
-				curEvents.Add(@event);
-
-				int maxCount = Math.Min((int)@event.EventNumber + 1, _random.Next(10, 100));
-				var fromEventNumber = @event.EventNumber;
-
-				Assert.Greater(maxCount, 0);
-				Assert.GreaterOrEqual(fromEventNumber, 0);
-
-				var result =
-					ReadIndex.ReadEventInfoBackward_NoCollisions(
-						Hash, GetStreamId, fromEventNumber, maxCount, long.MaxValue);
-				CheckResult(curEvents.Skip(curEvents.Count - maxCount).ToArray(), result);
-
-				if (fromEventNumber - maxCount < 0)
-					Assert.True(result.IsEndOfStream);
-				else
-					Assert.AreEqual(fromEventNumber - maxCount, result.NextEventNumber);
-			}
-		}
-	}
-
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_KnownCollisions.cs b/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_KnownCollisions.cs
deleted file mode 100644
index 1ec7577bcdd..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_KnownCollisions.cs
+++ /dev/null
@@ -1,353 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.Index.Hashers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.ReadIndex {
-	[TestFixture]
-	public abstract class ReadEventInfoForward_KnownCollisions : ReadIndexTestScenario<LogFormat.V2, string> {
-		private const string Stream = "ab-1";
-		private const string CollidingStream = "cb-1";
-		private const string CollidingStream1 = "db-1";
-
-		protected ReadEventInfoForward_KnownCollisions() : base(
-			maxEntriesInMemTable: 3,
-			lowHasher: new ConstantHasher(0),
-			highHasher: new HumanReadableHasher32()) { }
-
-		private static void CheckResult(EventRecord[] events, IndexReadEventInfoResult result) {
-			Assert.AreEqual(events.Length, result.EventInfos.Length);
-			for (int i = 0; i < events.Length; i++) {
-				Assert.AreEqual(events[i].EventNumber, result.EventInfos[i].EventNumber);
-				Assert.AreEqual(events[i].LogPosition, result.EventInfos[i].LogPosition);
-			}
-		}
-
-		public class VerifyCollision : ReadEventInfoForward_KnownCollisions {
-			protected override void WriteTestScenario() { }
-
-			[Test]
-			public void verify_that_streams_collide() {
-				Assert.AreEqual(Hasher.Hash(Stream), Hasher.Hash(CollidingStream));
-				Assert.AreEqual(Hasher.Hash(Stream), Hasher.Hash(CollidingStream1));
-			}
-		}
-
-		public class WithNoEvents : ReadEventInfoForward_KnownCollisions {
-			protected override void WriteTestScenario() {
-				WriteSingleEvent(CollidingStream, 0, "test data");
-				WriteSingleEvent(CollidingStream1, 0, "test data");
-			}
-
-			[Test]
-			public void with_no_events() {
-				var result = ReadIndex.ReadEventInfoForward_KnownCollisions(
-					Stream,
-					0,
-					int.MaxValue,
-					long.MaxValue);
-
-				Assert.AreEqual(0, result.EventInfos.Length);
-				Assert.True(result.IsEndOfStream);
-			}
-		}
-
-		public class WithOneEvent : ReadEventInfoForward_KnownCollisions {
-			private EventRecord _event, _collidingEvent;
-
-			protected override void WriteTestScenario() {
-				_event = WriteSingleEvent(Stream, 0, "test data");
-				_collidingEvent = WriteSingleEvent(CollidingStream, 0, "test data");
-			}
-
-			[Test]
-			public void with_one_event() {
-				var result = ReadIndex.ReadEventInfoForward_KnownCollisions(
-					Stream,
-					0,
-					int.MaxValue,
-					long.MaxValue);
-
-				Assert.AreEqual(1, result.EventInfos.Length);
-				CheckResult(new[] { _event }, result);
-				Assert.AreEqual(int.MaxValue, result.NextEventNumber);
-
-				result = ReadIndex.ReadEventInfoForward_KnownCollisions(
-					Stream,
-					1,
-					int.MaxValue,
-					long.MaxValue);
-
-				CheckResult(new EventRecord[] { }, result);
-				Assert.True(result.IsEndOfStream);
-
-				result = ReadIndex.ReadEventInfoForward_KnownCollisions(
-					CollidingStream,
-					0,
-					int.MaxValue,
-					long.MaxValue);
-
-				Assert.AreEqual(1, result.EventInfos.Length);
-				CheckResult(new[] { _collidingEvent }, result);
-				Assert.AreEqual(int.MaxValue, result.NextEventNumber);
-
-				result = ReadIndex.ReadEventInfoForward_KnownCollisions(
-					CollidingStream,
-					1,
-					int.MaxValue,
-					long.MaxValue);
-
-				CheckResult(new EventRecord[] { }, result);
-				Assert.True(result.IsEndOfStream);
-			}
-		}
-
-		public class WithMultipleEvents : ReadEventInfoForward_KnownCollisions {
-			private readonly List<EventRecord> _events = new List<EventRecord>();
-
-			protected override void WriteTestScenario() {
-				// PTable 1
-				WriteSingleEvent(CollidingStream, 0, string.Empty);
-				WriteSingleEvent(CollidingStream, 1, string.Empty);
-				_events.Add(WriteSingleEvent(Stream, 0, string.Empty));
-
-				// PTable 2
-				_events.Add(WriteSingleEvent(Stream, 1, string.Empty));
-				_events.Add(WriteSingleEvent(Stream, 2, string.Empty));
-				WriteSingleEvent(CollidingStream, 2, string.Empty);
-
-				// MemTable
-				_events.Add(WriteSingleEvent(Stream, 3, string.Empty));
-				WriteSingleEvent(CollidingStream, 3, string.Empty);
-			}
-
-			[Test]
-			public void with_multiple_events() {
-				for (int fromEventNumber = 0; fromEventNumber <= 4; fromEventNumber++) {
-					var result = ReadIndex.ReadEventInfoForward_KnownCollisions(
-						Stream,
-						fromEventNumber,
-						int.MaxValue,
-						long.MaxValue);
-
-					CheckResult(_events.Skip(fromEventNumber).ToArray(), result);
-					if (fromEventNumber > 3)
-						Assert.True(result.IsEndOfStream);
-					else
-						Assert.AreEqual((long) fromEventNumber + int.MaxValue, result.NextEventNumber);
-				}
-			}
-
-			[Test]
-			public void with_multiple_events_and_max_count() {
-				for (int fromEventNumber = 0; fromEventNumber <= 4; fromEventNumber++) {
-					var result = ReadIndex.ReadEventInfoForward_KnownCollisions(
-						Stream,
-						fromEventNumber,
-						2,
-						long.MaxValue);
-
-					CheckResult(_events.Skip(fromEventNumber).Take(2).ToArray(), result);
-					if (fromEventNumber > 3)
-						Assert.True(result.IsEndOfStream);
-					else
-						Assert.AreEqual((long) fromEventNumber + 2, result.NextEventNumber);
-				}
-			}
-
-			[Test]
-			public void with_multiple_events_and_before_position() {
-				for (int fromEventNumber = 0; fromEventNumber + 1 < _events.Count; fromEventNumber++) {
-					var result = ReadIndex.ReadEventInfoForward_KnownCollisions(
-						Stream,
-						fromEventNumber,
-						int.MaxValue,
-						_events[fromEventNumber + 1].LogPosition);
-
-					CheckResult(_events.Skip(fromEventNumber).Take(1).ToArray(), result);
-					Assert.AreEqual((long) fromEventNumber + int.MaxValue, result.NextEventNumber);
-				}
-			}
-		}
-
-		public class WithDeletedStream : ReadEventInfoForward_KnownCollisions {
-			private readonly List<EventRecord> _events = new List<EventRecord>();
-
-			protected override void WriteTestScenario() {
-				_events.Add(WriteSingleEvent(Stream, 0, "test data"));
-				WriteSingleEvent(CollidingStream, 1, "test data");
-				_events.Add(WriteSingleEvent(Stream, 1, "test"));
-
-				var prepare = WriteDeletePrepare(Stream);
-				WriteDeleteCommit(prepare);
-			}
-
-			[Test]
-			public void can_read_events_and_tombstone_event_not_returned() {
-				var result = ReadIndex.ReadEventInfoForward_KnownCollisions(
-					Stream,
-					0,
-					int.MaxValue,
-					long.MaxValue);
-
-				CheckResult(_events.ToArray(), result);
-				Assert.AreEqual(int.MaxValue, result.NextEventNumber);
-			}
-
-			[Test]
-			public void next_event_number_set_correctly() {
-				var result = ReadIndex.ReadEventInfoForward_KnownCollisions(
-					Stream,
-					2,
-					int.MaxValue,
-					long.MaxValue);
-
-				Assert.AreEqual(0, result.EventInfos.Length);
-				Assert.AreEqual(EventNumber.DeletedStream, result.NextEventNumber);
-			}
-
-			[Test]
-			public void can_read_tombstone_event() {
-				var result = ReadIndex.ReadEventInfoForward_KnownCollisions(
-					Stream,
-					EventNumber.DeletedStream,
-					int.MaxValue,
-					long.MaxValue);
-
-				Assert.AreEqual(1, result.EventInfos.Length);
-				Assert.AreEqual(EventNumber.DeletedStream, result.EventInfos[0].EventNumber);
-				Assert.True(result.IsEndOfStream);
-			}
-		}
-
-		public class WithGapsBetweenEvents : ReadEventInfoForward_KnownCollisions {
-			private readonly List<EventRecord> _events = new List<EventRecord>();
-
-			protected override void WriteTestScenario() {
-				// PTable 1
-				WriteSingleEvent(CollidingStream, 0, string.Empty);
-				WriteSingleEvent(CollidingStream, 1, string.Empty);
-				_events.Add(WriteSingleEvent(Stream, 0, string.Empty));
-
-				// PTable 2
-				_events.Add(WriteSingleEvent(Stream, 4, string.Empty));
-				_events.Add(WriteSingleEvent(Stream, 5, string.Empty));
-				WriteSingleEvent(CollidingStream, 2, string.Empty);
-
-				// MemTable
-				_events.Add(WriteSingleEvent(Stream, 11, string.Empty));
-				WriteSingleEvent(CollidingStream, 3, string.Empty);
-				WriteSingleEvent(CollidingStream1, 15, string.Empty);
-			}
-
-			[Test]
-			public void strictly_returns_up_to_max_count_consecutive_events_from_start_event_number() {
-				var result = ReadIndex.ReadEventInfoForward_KnownCollisions(
-					Stream,
-					0,
-					int.MaxValue,
-					long.MaxValue);
-
-				CheckResult(_events.ToArray(), result);
-				Assert.AreEqual(int.MaxValue, result.NextEventNumber);
-
-				result = ReadIndex.ReadEventInfoForward_KnownCollisions(
-					Stream,
-					0,
-					3,
-					long.MaxValue);
-
-				CheckResult(_events.Take(1).ToArray(), result);
-				Assert.AreEqual(3, result.NextEventNumber);
-
-				result = ReadIndex.ReadEventInfoForward_KnownCollisions(
-					Stream,
-					3,
-					int.MaxValue,
-					long.MaxValue);
-
-				CheckResult(_events.Skip(1).ToArray(), result);
-				Assert.AreEqual((long ) 3 + int.MaxValue, result.NextEventNumber);
-
-				result = ReadIndex.ReadEventInfoForward_KnownCollisions(
-					Stream,
-					4,
-					3,
-					long.MaxValue);
-
-				CheckResult(_events.Skip(1).Take(2).ToArray(), result);
-				Assert.AreEqual(7, result.NextEventNumber);
-
-				result = ReadIndex.ReadEventInfoForward_KnownCollisions(
-					Stream,
-					7,
-					3,
-					long.MaxValue);
-
-				Assert.AreEqual(0, result.EventInfos.Length);
-				Assert.AreEqual(11, result.NextEventNumber);
-
-				result = ReadIndex.ReadEventInfoForward_KnownCollisions(
-					Stream,
-					12,
-					1,
-					long.MaxValue);
-
-				Assert.AreEqual(0, result.EventInfos.Length);
-				Assert.AreEqual(15, result.NextEventNumber); // from colliding stream, but doesn't matter much
-
-				result = ReadIndex.ReadEventInfoForward_KnownCollisions(
-					Stream,
-					12,
-					int.MaxValue,
-					long.MaxValue);
-
-				Assert.AreEqual(0, result.EventInfos.Length);
-				Assert.True(result.IsEndOfStream);
-			}
-		}
-
-
-		public class WithDuplicateEvents : ReadEventInfoForward_KnownCollisions {
-			private readonly List<EventRecord> _events = new List<EventRecord>();
-
-			protected override void WriteTestScenario() {
-				// PTable 1
-				WriteSingleEvent(CollidingStream, 0, string.Empty);
-				WriteSingleEvent(CollidingStream, 1, string.Empty);
-				_events.Add(WriteSingleEvent(Stream, 0, string.Empty));
-
-				// PTable 2
-				_events.Add(WriteSingleEvent(Stream, 1, string.Empty));
-				_events.Add(WriteSingleEvent(Stream, 1, string.Empty));
-				WriteSingleEvent(CollidingStream, 2, string.Empty);
-
-				// MemTable
-				_events.Add(WriteSingleEvent(Stream, 2, string.Empty));
-				_events.Add(WriteSingleEvent(Stream, 2, string.Empty));
-				_events.Add(WriteSingleEvent(Stream, 2, string.Empty));
-			}
-
-			[Test]
-			public void result_is_deduplicated_keeping_oldest_duplicates() {
-				var result = ReadIndex.ReadEventInfoForward_KnownCollisions(
-					Stream,
-					0,
-					int.MaxValue,
-					long.MaxValue);
-
-				CheckResult(
-					_events
-						.GroupBy(x => x.EventNumber)
-						.Select(x => x.First())
-						.OrderBy(x => x.EventNumber)
-						.ToArray(),
-					result);
-				Assert.AreEqual(int.MaxValue, result.NextEventNumber);
-			}
-		}
-	}
-
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_KnownCollisions_Randomized.cs b/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_KnownCollisions_Randomized.cs
deleted file mode 100644
index ba6c57ec2df..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_KnownCollisions_Randomized.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.Index.Hashers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.ReadIndex {
-	[TestFixture(3)]
-	[TestFixture(33)]
-	[TestFixture(123)]
-	[TestFixture(523)]
-	public class ReadEventInfoForward_KnownCollisions_Randomized : ReadIndexTestScenario<LogFormat.V2, string> {
-		private const string Stream = "ab-1";
-		private const string CollidingStream = "cb-1";
-
-		private readonly Random _random = new Random();
-		private readonly int _numEvents;
-		private readonly List<EventRecord> _events;
-
-		public ReadEventInfoForward_KnownCollisions_Randomized(int maxEntriesInMemTable) : base(
-			chunkSize: 1_000_000,
-			maxEntriesInMemTable: maxEntriesInMemTable,
-			lowHasher: new ConstantHasher(0),
-			highHasher: new HumanReadableHasher32()) {
-			_numEvents = _random.Next(100, 400);
-			_events = new List<EventRecord>(_numEvents);
-		}
-
-		private static void CheckResult(EventRecord[] events, IndexReadEventInfoResult result) {
-			Assert.AreEqual(events.Length, result.EventInfos.Length);
-			for (int i = 0; i < events.Length; i++) {
-				Assert.AreEqual(events[i].EventNumber, result.EventInfos[i].EventNumber);
-				Assert.AreEqual(events[i].LogPosition, result.EventInfos[i].LogPosition);
-			}
-		}
-
-		protected override void WriteTestScenario() {
-			var streamLast = 0L;
-			var collidingStreamLast = 0L;
-
-			for (int i = 0; i < _numEvents; i++) {
-				if (_random.Next(2) == 0) {
-					_events.Add(WriteSingleEvent(Stream, streamLast++, "test data"));
-				} else {
-					_events.Add(WriteSingleEvent(CollidingStream, collidingStreamLast++, "testing"));
-				}
-			}
-		}
-
-		[Test]
-		public void returns_correct_events_before_position() {
-			var curEvents = new List<EventRecord>();
-			foreach (var @event in _events) {
-				var result =
-					ReadIndex.ReadEventInfoForward_KnownCollisions(Stream, 0, int.MaxValue, @event.LogPosition);
-				CheckResult(curEvents.ToArray(), result);
-				if (curEvents.Count == 0)
-					Assert.True(result.IsEndOfStream);
-				else
-					Assert.AreEqual(int.MaxValue, result.NextEventNumber);
-
-				if (@event.EventStreamId == Stream)
-					curEvents.Add(@event);
-			}
-		}
-
-		[Test]
-		public void returns_correct_events_with_max_count() {
-			var curEvents = new List<EventRecord>();
-
-			foreach (var @event in _events) {
-				if (@event.EventStreamId != Stream) continue;
-				curEvents.Add(@event);
-
-				int maxCount = Math.Min((int)@event.EventNumber + 1, _random.Next(10, 100));
-				var fromEventNumber = @event.EventNumber - maxCount + 1;
-
-				Assert.Greater(maxCount, 0);
-				Assert.GreaterOrEqual(fromEventNumber, 0);
-
-				var result = ReadIndex.ReadEventInfoForward_KnownCollisions(
-					Stream, fromEventNumber, maxCount, long.MaxValue);
-				CheckResult(curEvents.Skip(curEvents.Count - maxCount).ToArray(), result);
-				Assert.AreEqual(@event.EventNumber + 1, result.NextEventNumber);
-			}
-		}
-	}
-
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_NoCollisions.cs b/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_NoCollisions.cs
deleted file mode 100644
index 3dcdb581d2d..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_NoCollisions.cs
+++ /dev/null
@@ -1,309 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.Index.Hashers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.ReadIndex {
-	[TestFixture]
-	public abstract class ReadEventInfoForward_NoCollisions : ReadIndexTestScenario<LogFormat.V2, string> {
-		private const string Stream = "ab-1";
-		private const ulong Hash = 98;
-		private const string NonCollidingStream = "cd-1";
-
-		protected ReadEventInfoForward_NoCollisions() : base(
-			maxEntriesInMemTable: 3,
-			lowHasher: new ConstantHasher(0),
-			highHasher: new HumanReadableHasher32()) { }
-
-		private static void CheckResult(EventRecord[] events, IndexReadEventInfoResult result) {
-			Assert.AreEqual(events.Length, result.EventInfos.Length);
-			for (int i = 0; i < events.Length; i++) {
-				Assert.AreEqual(events[i].EventNumber, result.EventInfos[i].EventNumber);
-				Assert.AreEqual(events[i].LogPosition, result.EventInfos[i].LogPosition);
-			}
-		}
-
-		public class VerifyNoCollision : ReadEventInfoForward_NoCollisions {
-			protected override void WriteTestScenario() { }
-
-			[Test]
-			public void verify_that_streams_do_not_collide() {
-				Assert.AreNotEqual(Hasher.Hash(Stream), Hasher.Hash(NonCollidingStream));
-			}
-		}
-
-		public class WithNoEvents : ReadEventInfoForward_NoCollisions {
-			protected override void WriteTestScenario() { }
-
-			[Test]
-			public void with_no_events() {
-				var result = ReadIndex.ReadEventInfoForward_NoCollisions(
-					Hash,
-					0,
-					int.MaxValue,
-					long.MaxValue);
-
-				Assert.AreEqual(0, result.EventInfos.Length);
-				Assert.True(result.IsEndOfStream);
-			}
-		}
-
-		public class WithOneEvent : ReadEventInfoForward_NoCollisions {
-			private EventRecord _event;
-
-			protected override void WriteTestScenario() {
-				_event = WriteSingleEvent(Stream, 0, "test data");
-			}
-
-			[Test]
-			public void with_one_event() {
-				var result = ReadIndex.ReadEventInfoForward_NoCollisions(
-					Hash,
-					0,
-					int.MaxValue,
-					long.MaxValue);
-
-				Assert.AreEqual(1, result.EventInfos.Length);
-				Assert.AreEqual(int.MaxValue, result.NextEventNumber);
-				CheckResult(new[] { _event }, result);
-
-				result = ReadIndex.ReadEventInfoForward_NoCollisions(
-					Hash,
-					1,
-					int.MaxValue,
-					long.MaxValue);
-				Assert.True(result.IsEndOfStream);
-				CheckResult(new EventRecord[] { }, result);
-			}
-		}
-
-		public class WithMultipleEvents : ReadEventInfoForward_NoCollisions {
-			private readonly List<EventRecord> _events = new List<EventRecord>();
-
-			protected override void WriteTestScenario() {
-				// PTable 1
-				WriteSingleEvent(NonCollidingStream, 0, string.Empty);
-				WriteSingleEvent(NonCollidingStream, 1, string.Empty);
-				_events.Add(WriteSingleEvent(Stream, 0, string.Empty));
-
-				// PTable 2
-				_events.Add(WriteSingleEvent(Stream, 1, string.Empty));
-				_events.Add(WriteSingleEvent(Stream, 2, string.Empty));
-				WriteSingleEvent(NonCollidingStream, 2, string.Empty);
-
-				// MemTable
-				_events.Add(WriteSingleEvent(Stream, 3, string.Empty));
-				WriteSingleEvent(NonCollidingStream, 3, string.Empty);
-			}
-
-			[Test]
-			public void with_multiple_events() {
-				for (int fromEventNumber = 0; fromEventNumber <= 4; fromEventNumber++) {
-					var result = ReadIndex.ReadEventInfoForward_NoCollisions(
-						Hash,
-						fromEventNumber,
-						int.MaxValue,
-						long.MaxValue);
-
-					CheckResult(_events.Skip(fromEventNumber).ToArray(), result);
-
-					if (fromEventNumber > 3)
-						Assert.True(result.IsEndOfStream);
-					else
-						Assert.AreEqual((long) fromEventNumber + int.MaxValue, result.NextEventNumber);
-				}
-			}
-
-			[Test]
-			public void with_multiple_events_and_max_count() {
-				for (int fromEventNumber = 0; fromEventNumber <= 4; fromEventNumber++) {
-					var result = ReadIndex.ReadEventInfoForward_NoCollisions(
-						Hash,
-						fromEventNumber,
-						2,
-						long.MaxValue);
-
-					CheckResult(_events.Skip(fromEventNumber).Take(2).ToArray(), result);
-					if (fromEventNumber > 3)
-						Assert.True(result.IsEndOfStream);
-					else
-						Assert.AreEqual(fromEventNumber + 2, result.NextEventNumber);
-				}
-			}
-
-			[Test]
-			public void with_multiple_events_and_before_position() {
-				for (int fromEventNumber = 0; fromEventNumber + 1 < _events.Count; fromEventNumber++) {
-					var result = ReadIndex.ReadEventInfoForward_NoCollisions(
-						Hash,
-						fromEventNumber,
-						int.MaxValue,
-						_events[fromEventNumber + 1].LogPosition);
-
-					CheckResult(_events.Skip(fromEventNumber).Take(1).ToArray(), result);
-					Assert.AreEqual((long) fromEventNumber + int.MaxValue, result.NextEventNumber);
-				}
-			}
-		}
-
-		public class WithDeletedStream : ReadEventInfoForward_NoCollisions {
-			private readonly List<EventRecord> _events = new List<EventRecord>();
-
-			protected override void WriteTestScenario() {
-				_events.Add(WriteSingleEvent(Stream, 0, "test data"));
-				_events.Add(WriteSingleEvent(Stream, 1, "test data"));
-
-				var prepare = WriteDeletePrepare(Stream);
-				WriteDeleteCommit(prepare);
-			}
-
-			[Test]
-			public void can_read_events_and_tombstone_event_not_returned() {
-				var result = ReadIndex.ReadEventInfoForward_NoCollisions(
-					Hash,
-					0,
-					int.MaxValue,
-					long.MaxValue);
-
-				CheckResult(_events.ToArray(), result);
-				Assert.AreEqual(int.MaxValue, result.NextEventNumber);
-			}
-
-			[Test]
-			public void next_event_number_set_correctly() {
-				var result = ReadIndex.ReadEventInfoForward_NoCollisions(
-					Hash,
-					2,
-					int.MaxValue,
-					long.MaxValue);
-
-				Assert.AreEqual(0, result.EventInfos.Length);
-				Assert.AreEqual(EventNumber.DeletedStream, result.NextEventNumber);
-			}
-
-			[Test]
-			public void can_read_tombstone_event() {
-				var result = ReadIndex.ReadEventInfoForward_NoCollisions(
-					Hash,
-					EventNumber.DeletedStream,
-					int.MaxValue,
-					long.MaxValue);
-
-				Assert.AreEqual(1, result.EventInfos.Length);
-				Assert.AreEqual(EventNumber.DeletedStream, result.EventInfos[0].EventNumber);
-				Assert.True(result.IsEndOfStream);
-			}
-		}
-
-		public class WithGapsBetweenEvents : ReadEventInfoForward_NoCollisions {
-			private readonly List<EventRecord> _events = new List<EventRecord>();
-
-			protected override void WriteTestScenario() {
-				// PTable 1
-				WriteSingleEvent(NonCollidingStream, 0, string.Empty);
-				WriteSingleEvent(NonCollidingStream, 1, string.Empty);
-				_events.Add(WriteSingleEvent(Stream, 0, string.Empty));
-
-				// PTable 2
-				_events.Add(WriteSingleEvent(Stream, 4, string.Empty));
-				_events.Add(WriteSingleEvent(Stream, 5, string.Empty));
-				WriteSingleEvent(NonCollidingStream, 2, string.Empty);
-
-				// MemTable
-				_events.Add(WriteSingleEvent(Stream, 11, string.Empty));
-				WriteSingleEvent(NonCollidingStream, 3, string.Empty);
-			}
-
-			[Test]
-			public void strictly_returns_up_to_max_count_consecutive_events_from_start_event_number() {
-				var result = ReadIndex.ReadEventInfoForward_NoCollisions(
-					Hash,
-					0,
-					int.MaxValue,
-					long.MaxValue);
-
-				CheckResult(_events.ToArray(), result);
-				Assert.AreEqual(int.MaxValue, result.NextEventNumber);
-
-				result = ReadIndex.ReadEventInfoForward_NoCollisions(
-					Hash,
-					0,
-					3,
-					long.MaxValue);
-
-				CheckResult(_events.Take(1).ToArray(), result);
-				Assert.AreEqual(3, result.NextEventNumber);
-
-				result = ReadIndex.ReadEventInfoForward_NoCollisions(
-					Hash,
-					3,
-					int.MaxValue,
-					long.MaxValue);
-
-				CheckResult(_events.Skip(1).ToArray(), result);
-				Assert.AreEqual((long ) 3 + int.MaxValue, result.NextEventNumber);
-
-				result = ReadIndex.ReadEventInfoForward_NoCollisions(
-					Hash,
-					4,
-					3,
-					long.MaxValue);
-
-				CheckResult(_events.Skip(1).Take(2).ToArray(), result);
-				Assert.AreEqual(7, result.NextEventNumber);
-
-				result = ReadIndex.ReadEventInfoForward_NoCollisions(
-					Hash,
-					7,
-					3,
-					long.MaxValue);
-
-				Assert.AreEqual(0, result.EventInfos.Length);
-				Assert.AreEqual(11, result.NextEventNumber);
-			}
-		}
-
-
-		public class WithDuplicateEvents : ReadEventInfoForward_NoCollisions {
-			private readonly List<EventRecord> _events = new List<EventRecord>();
-
-			protected override void WriteTestScenario() {
-				// PTable 1
-				WriteSingleEvent(NonCollidingStream, 0, string.Empty);
-				WriteSingleEvent(NonCollidingStream, 1, string.Empty);
-				_events.Add(WriteSingleEvent(Stream, 0, string.Empty));
-
-				// PTable 2
-				_events.Add(WriteSingleEvent(Stream, 1, string.Empty));
-				_events.Add(WriteSingleEvent(Stream, 1, string.Empty));
-				WriteSingleEvent(NonCollidingStream, 2, string.Empty);
-
-				// MemTable
-				_events.Add(WriteSingleEvent(Stream, 2, string.Empty));
-				_events.Add(WriteSingleEvent(Stream, 2, string.Empty));
-				_events.Add(WriteSingleEvent(Stream, 2, string.Empty));
-			}
-
-			[Test]
-			public void result_is_deduplicated_keeping_oldest_duplicates() {
-				var result = ReadIndex.ReadEventInfoForward_NoCollisions(
-					Hash,
-					0,
-					int.MaxValue,
-					long.MaxValue);
-
-				CheckResult(
-					_events
-						.GroupBy(x => x.EventNumber)
-						.Select(x => x.First())
-						.OrderBy(x => x.EventNumber)
-						.ToArray(),
-					result);
-				Assert.AreEqual(int.MaxValue, result.NextEventNumber);
-			}
-		}
-	}
-
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_NoCollisions_Randomized.cs b/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_NoCollisions_Randomized.cs
deleted file mode 100644
index 880e6cd2e67..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_NoCollisions_Randomized.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.Index.Hashers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.ReadIndex {
-	[TestFixture(3)]
-	[TestFixture(33)]
-	[TestFixture(123)]
-	[TestFixture(523)]
-	public class ReadEventInfoForward_NoCollisions_Randomized : ReadIndexTestScenario<LogFormat.V2, string> {
-		private const string Stream = "ab-1";
-		private const ulong Hash = 98;
-		private const string NonCollidingStream = "cd-1";
-
-		private readonly Random _random = new Random();
-		private readonly int _numEvents;
-		private readonly List<EventRecord> _events;
-
-		public ReadEventInfoForward_NoCollisions_Randomized(int maxEntriesInMemTable) : base(
-			chunkSize: 1_000_000,
-			maxEntriesInMemTable: maxEntriesInMemTable,
-			lowHasher: new ConstantHasher(0),
-			highHasher: new HumanReadableHasher32()) {
-			_numEvents = _random.Next(100, 400);
-			_events = new List<EventRecord>(_numEvents);
-		}
-
-		private static void CheckResult(EventRecord[] events, IndexReadEventInfoResult result) {
-			Assert.AreEqual(events.Length, result.EventInfos.Length);
-			for (int i = 0; i < events.Length; i++) {
-				Assert.AreEqual(events[i].EventNumber, result.EventInfos[i].EventNumber);
-				Assert.AreEqual(events[i].LogPosition, result.EventInfos[i].LogPosition);
-			}
-		}
-
-		protected override void WriteTestScenario() {
-			var streamLast = 0L;
-			var nonCollidingStreamLast = 0L;
-
-			for (int i = 0; i < _numEvents; i++) {
-				if (_random.Next(2) == 0) {
-					_events.Add(WriteSingleEvent(Stream, streamLast++, "test data"));
-				} else {
-					_events.Add(WriteSingleEvent(NonCollidingStream, nonCollidingStreamLast++, "testing"));
-				}
-			}
-		}
-
-		[Test]
-		public void returns_correct_events_before_position() {
-			var curEvents = new List<EventRecord>();
-
-			foreach (var @event in _events) {
-				var result = ReadIndex.ReadEventInfoForward_NoCollisions(Hash, 0, int.MaxValue, @event.LogPosition);
-				CheckResult(curEvents.ToArray(), result);
-				if (curEvents.Count == 0)
-					Assert.True(result.IsEndOfStream);
-				else
-					Assert.AreEqual(int.MaxValue, result.NextEventNumber);
-
-				if (@event.EventStreamId == Stream)
-					curEvents.Add(@event);
-			}
-		}
-
-		[Test]
-		public void returns_correct_events_with_max_count() {
-			var curEvents = new List<EventRecord>();
-
-			foreach (var @event in _events) {
-				if (@event.EventStreamId != Stream) continue;
-				curEvents.Add(@event);
-
-				int maxCount = Math.Min((int)@event.EventNumber + 1, _random.Next(10, 100));
-				var fromEventNumber = @event.EventNumber - maxCount + 1;
-
-				Assert.Greater(maxCount, 0);
-				Assert.GreaterOrEqual(fromEventNumber, 0);
-
-				var result = ReadIndex.ReadEventInfoForward_NoCollisions(
-					Hash, fromEventNumber, maxCount, long.MaxValue);
-				CheckResult(curEvents.Skip(curEvents.Count - maxCount).ToArray(), result);
-				Assert.AreEqual(@event.EventNumber + 1, result.NextEventNumber);
-			}
-		}
-	}
-
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfo_KeepDuplicates.cs b/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfo_KeepDuplicates.cs
deleted file mode 100644
index 38ca0037d14..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/ReadIndex/ReadEventInfo_KeepDuplicates.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.Index.Hashers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.ReadIndex {
-	[TestFixture]
-	public class ReadEventInfo_KeepDuplicates : ReadIndexTestScenario<LogFormat.V2, string> {
-		private const string Stream = "ab-1";
-		private const string CollidingStream = "cb-1";
-		private const string SoftDeletedStream = "de-1";
-		private const string HardDeletedStream = "fg-1";
-
-		private readonly List<EventRecord> _events = new();
-
-		public ReadEventInfo_KeepDuplicates() : base(
-			maxEntriesInMemTable: 3,
-			lowHasher: new ConstantHasher(0),
-			highHasher: new HumanReadableHasher32()) { }
-
-		private static void CheckResult(EventRecord[] events, IndexReadEventInfoResult result) {
-			Assert.AreEqual(events.Length, result.EventInfos.Length);
-			for (int i = 0; i < events.Length; i++) {
-				Assert.AreEqual(events[i].EventNumber, result.EventInfos[i].EventNumber);
-				Assert.AreEqual(events[i].LogPosition, result.EventInfos[i].LogPosition);
-			}
-		}
-
-		protected override void WriteTestScenario() {
-			// PTable 1
-			_events.Add(WriteSingleEvent(Stream, 0, string.Empty));
-			_events.Add(WriteSingleEvent(Stream, 1, string.Empty));
-			_events.Add(WriteSingleEvent(Stream, 2, string.Empty));
-
-			// PTable 2
-			_events.Add(WriteSingleEvent(Stream, 3, string.Empty));
-			_events.Add(WriteSingleEvent(Stream, 2, string.Empty)); // duplicate
-			_events.Add(WriteSingleEvent(CollidingStream, 3, string.Empty)); // colliding stream
-
-			// PTable 3
-			_events.Add(WriteSingleEvent(Stream, 2, string.Empty)); // duplicate
-			_events.Add(WriteSingleEvent(SoftDeletedStream, 10, string.Empty)); // soft deleted stream
-			_events.Add(WriteSingleEvent(HardDeletedStream, 20, string.Empty)); // hard deleted stream
-
-			// MemTable
-			WriteStreamMetadata(SoftDeletedStream, 0, @"{""$tb"":11}");
-			WriteDelete(HardDeletedStream);
-		}
-
-		[Test]
-		public void returns_correct_info_for_normal_event() {
-			var result = ReadIndex.ReadEventInfo_KeepDuplicates(Stream, 1);
-			var events = _events
-				.Where(x => x.EventStreamId == Stream && x.EventNumber == 1)
-				.ToArray();
-
-			Assert.AreEqual(1, events.Length);
-			Assert.AreEqual(-1, result.NextEventNumber);
-			Assert.AreEqual(true, result.IsEndOfStream);
-			CheckResult(events, result);
-		}
-
-		[Test]
-		public void returns_correct_info_for_duplicate_events() {
-			var result = ReadIndex.ReadEventInfo_KeepDuplicates(Stream, 2);
-			var events = _events
-				.Where(x => x.EventStreamId == Stream && x.EventNumber == 2)
-				.ToArray();
-
-			Assert.AreEqual(3, events.Length);
-			Assert.AreEqual(-1, result.NextEventNumber);
-			Assert.AreEqual(true, result.IsEndOfStream);
-			CheckResult(events, result);
-		}
-
-		[Test]
-		public void returns_correct_info_for_colliding_stream() {
-			var result = ReadIndex.ReadEventInfo_KeepDuplicates(Stream, 3);
-			var events = _events
-				.Where(x => x.EventStreamId == Stream && x.EventNumber == 3)
-				.ToArray();
-
-			Assert.AreEqual(1, events.Length);
-			Assert.AreEqual(-1, result.NextEventNumber);
-			Assert.AreEqual(true, result.IsEndOfStream);
-			CheckResult(events, result);
-
-			result = ReadIndex.ReadEventInfo_KeepDuplicates(CollidingStream, 3);
-			events = _events
-				.Where(x => x.EventStreamId == CollidingStream && x.EventNumber == 3)
-				.ToArray();
-
-			Assert.AreEqual(1, events.Length);
-			Assert.AreEqual(-1, result.NextEventNumber);
-			Assert.AreEqual(true, result.IsEndOfStream);
-			CheckResult(events, result);
-		}
-
-		[Test]
-		public void returns_correct_info_for_soft_deleted_stream() {
-			var result = ReadIndex.ReadEventInfo_KeepDuplicates(SoftDeletedStream, 10);
-			var events = _events
-				.Where(x => x.EventStreamId == SoftDeletedStream && x.EventNumber == 10)
-				.ToArray();
-
-			Assert.AreEqual(1, events.Length);
-			Assert.AreEqual(-1, result.NextEventNumber);
-			Assert.AreEqual(true, result.IsEndOfStream);
-			CheckResult(events, result);
-		}
-
-		[Test]
-		public void returns_correct_info_for_hard_deleted_stream() {
-			var result = ReadIndex.ReadEventInfo_KeepDuplicates(HardDeletedStream, 20);
-			var events = _events
-				.Where(x => x.EventStreamId == HardDeletedStream && x.EventNumber == 20)
-				.ToArray();
-
-			Assert.AreEqual(1, events.Length);
-			Assert.AreEqual(-1, result.NextEventNumber);
-			Assert.AreEqual(true, result.IsEndOfStream);
-			CheckResult(events, result);
-		}
-
-		[Test]
-		public void returns_empty_info_when_event_does_not_exist() {
-			var result = ReadIndex.ReadEventInfo_KeepDuplicates(Stream, 6);
-			var events = _events
-				.Where(x => x.EventStreamId == Stream && x.EventNumber == 6)
-				.ToArray();
-
-			Assert.AreEqual(0, events.Length);
-			Assert.AreEqual(-1, result.NextEventNumber);
-			Assert.AreEqual(true, result.IsEndOfStream);
-
-			result = ReadIndex.ReadEventInfo_KeepDuplicates(CollidingStream, 4);
-			events = _events
-				.Where(x => x.EventStreamId == CollidingStream && x.EventNumber == 4)
-				.ToArray();
-
-			Assert.AreEqual(0, events.Length);
-			Assert.AreEqual(-1, result.NextEventNumber);
-			Assert.AreEqual(true, result.IsEndOfStream);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/ReadIndexTestScenario.cs b/src/EventStore.Core.Tests/Services/Storage/ReadIndexTestScenario.cs
deleted file mode 100644
index 6c4dc47c8cd..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/ReadIndexTestScenario.cs
+++ /dev/null
@@ -1,495 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Caching;
-using EventStore.Core.Data;
-using EventStore.Core.DataStructures;
-using EventStore.Core.Index;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using EventStore.Core.Util;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.LogV3;
-using EventStore.Core.Metrics;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.LogCommon;
-
-namespace EventStore.Core.Tests.Services.Storage {
-	public abstract class ReadIndexTestScenario<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		protected readonly int MaxEntriesInMemTable;
-		protected readonly int StreamInfoCacheCapacity;
-		protected readonly long MetastreamMaxCount;
-		protected readonly bool PerformAdditionalCommitChecks;
-		protected readonly byte IndexBitnessVersion;
-		protected LogFormatAbstractor<TStreamId> _logFormat;
-		protected IRecordFactory<TStreamId> _recordFactory;
-		protected INameIndex<TStreamId> _streamNameIndex;
-		protected INameIndex<TStreamId> _eventTypeIndex;
-		protected ITableIndex<TStreamId> TableIndex;
-		protected IReadIndex<TStreamId> ReadIndex;
-
-		protected IHasher<TStreamId> LowHasher { get; private set; }
-		protected IHasher<TStreamId> HighHasher { get; private set; }
-		protected ILongHasher<TStreamId> Hasher { get; private set; }
-
-		protected TFChunkDb Db;
-		protected TFChunkWriter Writer;
-		protected ICheckpoint WriterCheckpoint;
-		protected ICheckpoint ChaserCheckpoint;
-
-		private readonly int _chunkSize;
-		private TFChunkScavenger<TStreamId> _scavenger;
-		private bool _scavenge;
-		private bool _completeLastChunkOnScavenge;
-		private bool _mergeChunks;
-		private bool _scavengeIndex;
-
-		protected ReadIndexTestScenario(
-			int maxEntriesInMemTable = 20,
-			long metastreamMaxCount = 1,
-			int streamInfoCacheCapacity = 0,
-			byte indexBitnessVersion = Opts.IndexBitnessVersionDefault,
-			bool performAdditionalChecks = true,
-			int chunkSize = 10_000,
-			IHasher<TStreamId> lowHasher = null,
-			IHasher<TStreamId> highHasher = null) {
-
-			Ensure.Positive(maxEntriesInMemTable, "maxEntriesInMemTable");
-			MaxEntriesInMemTable = maxEntriesInMemTable;
-			StreamInfoCacheCapacity = streamInfoCacheCapacity;
-			MetastreamMaxCount = metastreamMaxCount;
-			IndexBitnessVersion = indexBitnessVersion;
-			PerformAdditionalCommitChecks = performAdditionalChecks;
-			LowHasher = lowHasher;
-			HighHasher = highHasher;
-			_chunkSize = chunkSize;
-		}
-
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var indexDirectory = GetFilePathFor("index");
-			_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
-				IndexDirectory = indexDirectory,
-			});
-			_recordFactory = _logFormat.RecordFactory;
-			_streamNameIndex = _logFormat.StreamNameIndex;
-			_eventTypeIndex = _logFormat.EventTypeIndex;
-			LowHasher ??= _logFormat.LowHasher;
-			HighHasher ??= _logFormat.HighHasher;
-			Hasher = new CompositeHasher<TStreamId>(LowHasher, HighHasher);
-
-			WriterCheckpoint = new InMemoryCheckpoint(0);
-			ChaserCheckpoint = new InMemoryCheckpoint(0);
-
-			Db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, WriterCheckpoint, ChaserCheckpoint,
-				replicationCheckpoint: new InMemoryCheckpoint(-1), chunkSize: _chunkSize));
-
-			Db.Open();
-			// create db
-			Writer = new TFChunkWriter(Db);
-			Writer.Open();
-			WriteTestScenario();
-			Writer.Close();
-			Writer = null;
-
-			WriterCheckpoint.Flush();
-			ChaserCheckpoint.Write(WriterCheckpoint.Read());
-			ChaserCheckpoint.Flush();
-
-			var readers = new ObjectPool<ITransactionFileReader>("Readers", 2, 5,
-				() => new TFChunkReader(Db, Db.Config.WriterCheckpoint));
-			var emptyStreamId = _logFormat.EmptyStreamId;
-			TableIndex = TransformTableIndex(new TableIndex<TStreamId>(indexDirectory, LowHasher, HighHasher, emptyStreamId,
-				() => new HashListMemTable(IndexBitnessVersion, MaxEntriesInMemTable * 2),
-				() => new TFReaderLease(readers),
-				IndexBitnessVersion,
-				int.MaxValue,
-				Constants.PTableMaxReaderCountDefault,
-				MaxEntriesInMemTable));
-			_logFormat.StreamNamesProvider.SetTableIndex(TableIndex);
-
-			var readIndex = new ReadIndex<TStreamId>(new NoopPublisher(),
-				readers,
-				TableIndex,
-				_logFormat.StreamNameIndexConfirmer,
-				_logFormat.StreamIds,
-				_logFormat.StreamNamesProvider,
-				_logFormat.EmptyStreamId,
-				_logFormat.StreamIdValidator,
-				_logFormat.StreamIdSizer,
-				_logFormat.StreamExistenceFilter,
-				_logFormat.StreamExistenceFilterReader,
-				_logFormat.EventTypeIndexConfirmer,
-				new LRUCache<TStreamId, IndexBackend<TStreamId>.EventNumberCached>("LastEventNumber", StreamInfoCacheCapacity),
-				new LRUCache<TStreamId, IndexBackend<TStreamId>.MetadataCached>("StreamMetadata", StreamInfoCacheCapacity),
-				additionalCommitChecks: PerformAdditionalCommitChecks,
-				metastreamMaxCount: MetastreamMaxCount,
-				hashCollisionReadLimit: Opts.HashCollisionReadLimitDefault,
-				skipIndexScanOnReads: Opts.SkipIndexScanOnReadsDefault,
-				replicationCheckpoint: Db.Config.ReplicationCheckpoint,
-				indexCheckpoint: Db.Config.IndexCheckpoint,
-				indexStatusTracker: new IndexStatusTracker.NoOp(),
-				indexTracker: new IndexTracker.NoOp(),
-				cacheTracker: new CacheHitsMissesTracker.NoOp());
-
-			readIndex.IndexCommitter.Init(ChaserCheckpoint.Read());
-			ReadIndex = readIndex;
-
-			// wait for tables to be merged
-			TableIndex.WaitForBackgroundTasks(16_000);
-
-			// scavenge must run after readIndex is built
-			if (_scavenge) {
-				if (_completeLastChunkOnScavenge)
-					Db.Manager.GetChunk(Db.Manager.ChunksCount - 1).Complete();
-				_scavenger = new TFChunkScavenger<TStreamId>(Serilog.Log.Logger, Db, new FakeTFScavengerLog(), TableIndex, ReadIndex, _logFormat.Metastreams);
-				await _scavenger.Scavenge(alwaysKeepScavenged: true, mergeChunks: _mergeChunks,
-					scavengeIndex: _scavengeIndex);
-			}
-		}
-
-		public override Task TestFixtureTearDown() {
-			_logFormat?.Dispose();
-			ReadIndex?.Close();
-			ReadIndex?.Dispose();
-
-			TableIndex?.Close();
-
-			Db?.Close();
-			Db?.Dispose();
-
-			return base.TestFixtureTearDown();
-		}
-
-		protected virtual ITableIndex<TStreamId> TransformTableIndex(ITableIndex<TStreamId> tableIndex) {
-			return tableIndex;
-		}
-
-		protected abstract void WriteTestScenario();
-
-		protected void GetOrReserve(string eventStreamName, out TStreamId eventStreamId, out long newPos) {
-			newPos = Writer.Position;
-			_streamNameIndex.GetOrReserve(_logFormat.RecordFactory, eventStreamName, newPos, out eventStreamId, out var streamRecord);
-			if (streamRecord != null) {
-				Writer.Write(streamRecord, out newPos);
-			}
-		}
-		
-		protected void GetOrReserveEventType(string eventType, out TStreamId eventTypeId, out long newPos) {
-			newPos = Writer.Position;
-			_eventTypeIndex.GetOrReserveEventType(_logFormat.RecordFactory, eventType, newPos, out eventTypeId, out var eventTypeRecord);
-			if (eventTypeRecord != null) {
-				Writer.Write(eventTypeRecord, out newPos);
-			}
-		}
-
-		protected EventRecord WriteSingleEvent(string eventStreamName,
-			long eventNumber,
-			string data,
-			DateTime? timestamp = null,
-			Guid eventId = default(Guid),
-			bool retryOnFail = false,
-			string eventType = "some-type") {
-			GetOrReserve(eventStreamName, out var eventStreamId, out var pos);
-			GetOrReserveEventType(eventType, out var eventTypeId, out pos);
-			var prepare = LogRecord.SingleWrite(_recordFactory, pos,
-				eventId == default(Guid) ? Guid.NewGuid() : eventId,
-				Guid.NewGuid(),
-				eventStreamId,
-				eventNumber - 1,
-				eventTypeId,
-				Helper.UTF8NoBom.GetBytes(data),
-				null,
-				timestamp);
-
-			if (!retryOnFail) {
-				Assert.IsTrue(Writer.Write(prepare, out pos));
-			} else {
-				long firstPos = prepare.LogPosition;
-				if (!Writer.Write(prepare, out pos)) {
-					prepare = LogRecord.SingleWrite(_recordFactory, pos,
-						prepare.CorrelationId,
-						prepare.EventId,
-						prepare.EventStreamId,
-						prepare.ExpectedVersion,
-						prepare.EventType,
-						prepare.Data,
-						prepare.Metadata,
-						prepare.TimeStamp);
-					if (!Writer.Write(prepare, out pos))
-						Assert.Fail("Second write try failed when first writing prepare at {0}, then at {1}.", firstPos,
-							prepare.LogPosition);
-				}
-			}
-
-			
-			var commit = LogRecord.Commit(Writer.Position, prepare.CorrelationId, prepare.LogPosition,
-				eventNumber);
-			if (!retryOnFail) {
-				Assert.IsTrue(Writer.Write(commit, out pos));
-			} else {
-				var firstPos = commit.LogPosition;
-				if (!Writer.Write(commit, out pos)) {
-					commit = LogRecord.Commit(pos, prepare.CorrelationId, prepare.LogPosition,
-						eventNumber);
-					if (!Writer.Write(commit, out pos))
-						Assert.Fail("Second write try failed when first writing prepare at {0}, then at {1}.", firstPos,
-							prepare.LogPosition);
-				}
-			}
-			Assert.AreEqual(eventStreamId, prepare.EventStreamId);
-
-			var eventRecord = new EventRecord(eventNumber, prepare, eventStreamName, eventType);
-			return eventRecord;
-		}
-
-		protected EventRecord WriteStreamMetadata(string eventStreamName, long eventNumber, string metadata,
-			DateTime? timestamp = null) {
-			GetOrReserve(SystemStreams.MetastreamOf(eventStreamName), out var eventStreamId, out var pos);
-			GetOrReserveEventType(SystemEventTypes.StreamMetadata, out var eventTypeId, out pos);
-			var prepare = LogRecord.SingleWrite(_recordFactory, pos,
-				Guid.NewGuid(),
-				Guid.NewGuid(),
-				eventStreamId,
-				eventNumber - 1,
-				eventTypeId,
-				Helper.UTF8NoBom.GetBytes(metadata),
-				null,
-				timestamp ?? DateTime.UtcNow,
-				PrepareFlags.IsJson);
-			Assert.IsTrue(Writer.Write(prepare, out pos));
-
-			var commit = LogRecord.Commit(Writer.Position, prepare.CorrelationId, prepare.LogPosition,
-				eventNumber);
-			Assert.IsTrue(Writer.Write(commit, out pos));
-			Assert.AreEqual(eventStreamId, prepare.EventStreamId);
-
-			var eventRecord = new EventRecord(eventNumber, prepare, SystemStreams.MetastreamOf(eventStreamName), SystemEventTypes.StreamMetadata);
-			return eventRecord;
-		}
-
-		protected EventRecord WriteTransactionBegin(string eventStreamName, long expectedVersion, long eventNumber,
-			string eventData) {
-			LogFormatHelper<TLogFormat, TStreamId>.CheckIfExplicitTransactionsSupported();
-			GetOrReserve(eventStreamName, out var eventStreamId, out var pos);
-			GetOrReserveEventType("some-type", out var eventTypeId, out pos);
-			var prepare = LogRecord.Prepare(_recordFactory, pos,
-				Guid.NewGuid(),
-				Guid.NewGuid(),
-				Writer.Position,
-				0,
-				eventStreamId,
-				expectedVersion,
-				PrepareFlags.Data | PrepareFlags.TransactionBegin,
-				eventTypeId,
-				Helper.UTF8NoBom.GetBytes(eventData),
-				null);
-			Assert.IsTrue(Writer.Write(prepare, out pos));
-			Assert.AreEqual(eventStreamId, prepare.EventStreamId);
-
-			return new EventRecord(eventNumber, prepare, eventStreamName, "some-type");
-		}
-
-		protected IPrepareLogRecord<TStreamId> WriteTransactionBegin(string eventStreamName, long expectedVersion) {
-			LogFormatHelper<TLogFormat, TStreamId>.CheckIfExplicitTransactionsSupported();
-			GetOrReserve(eventStreamName, out var eventStreamId, out var pos);
-			var prepare = LogRecord.TransactionBegin(_recordFactory, pos, Guid.NewGuid(), eventStreamId,
-				expectedVersion);
-			Assert.IsTrue(Writer.Write(prepare, out pos));
-			return prepare;
-		}
-
-		protected EventRecord WriteTransactionEvent(Guid correlationId,
-			long transactionPos,
-			int transactionOffset,
-			string eventStreamName,
-			long eventNumber,
-			string eventData,
-			PrepareFlags flags,
-			bool retryOnFail = false,
-			string eventType = "some-type") {
-			LogFormatHelper<TLogFormat, TStreamId>.CheckIfExplicitTransactionsSupported();
-
-			GetOrReserve(eventStreamName, out var eventStreamId, out var pos);
-			GetOrReserveEventType(eventType, out var eventTypeId, out pos);
-
-			var prepare = LogRecord.Prepare(_recordFactory, pos,
-				correlationId,
-				Guid.NewGuid(),
-				transactionPos,
-				transactionOffset,
-				eventStreamId,
-				ExpectedVersion.Any,
-				flags,
-				eventTypeId,
-				Helper.UTF8NoBom.GetBytes(eventData),
-				null);
-
-			if (retryOnFail) {
-				long firstPos = prepare.LogPosition;
-				long newPos;
-				if (!Writer.Write(prepare, out newPos)) {
-					var tPos = prepare.TransactionPosition == prepare.LogPosition
-						? newPos
-						: prepare.TransactionPosition;
-					prepare = prepare.CopyForRetry(
-						logPosition: newPos,
-						transactionPosition: tPos);
-					if (!Writer.Write(prepare, out newPos))
-						Assert.Fail("Second write try failed when first writing prepare at {0}, then at {1}.", firstPos,
-							prepare.LogPosition);
-				}
-
-				Assert.AreEqual(eventStreamId, prepare.EventStreamId);
-				return new EventRecord(eventNumber, prepare, eventStreamName, eventType);
-			}
-
-			Assert.IsTrue(Writer.Write(prepare, out pos));
-
-			Assert.AreEqual(eventStreamId, prepare.EventStreamId);
-			return new EventRecord(eventNumber, prepare, eventStreamName, eventType);
-		}
-
-		protected IPrepareLogRecord<TStreamId> WriteTransactionEnd(Guid correlationId, long transactionId, string eventStreamName) {
-			LogFormatHelper<TLogFormat, TStreamId>.CheckIfExplicitTransactionsSupported();
-			GetOrReserve(eventStreamName, out var eventStreamId, out _);
-			return WriteTransactionEnd(correlationId, transactionId, eventStreamId);
-		}
-
-		protected IPrepareLogRecord<TStreamId> WriteTransactionEnd(Guid correlationId, long transactionId, TStreamId eventStreamId) {
-			LogFormatHelper<TLogFormat, TStreamId>.CheckIfExplicitTransactionsSupported();
-			var prepare = LogRecord.TransactionEnd(_recordFactory, Writer.Position,
-				correlationId,
-				Guid.NewGuid(),
-				transactionId,
-				eventStreamId);
-			long pos;
-			Assert.IsTrue(Writer.Write(prepare, out pos));
-			return prepare;
-		}
-
-		protected IPrepareLogRecord<TStreamId> WritePrepare(string eventStreamName,
-			long expectedVersion,
-			Guid eventId = default(Guid),
-			string eventType = null,
-			string data = null,
-			PrepareFlags additionalFlags = PrepareFlags.None) {
-			GetOrReserve(eventStreamName, out var eventStreamId, out var pos);
-			GetOrReserveEventType(eventType.IsEmptyString() ? "some-type" : eventType, out var eventTypeId, out pos);
-			var prepare = LogRecord.SingleWrite(_recordFactory, pos,
-				Guid.NewGuid(),
-				eventId == default(Guid) ? Guid.NewGuid() : eventId,
-				eventStreamId,
-				expectedVersion,
-				eventTypeId,
-				data.IsEmptyString() ? LogRecord.NoData : Helper.UTF8NoBom.GetBytes(data),
-				LogRecord.NoData,
-				DateTime.UtcNow,
-				additionalFlags);
-			Assert.IsTrue(Writer.Write(prepare, out pos));
-
-			return prepare;
-		}
-
-		protected CommitLogRecord WriteCommit(long preparePos, string eventStreamName, long eventNumber) {
-			LogFormatHelper<TLogFormat, TStreamId>.CheckIfExplicitTransactionsSupported();
-			var commit = LogRecord.Commit(Writer.Position, Guid.NewGuid(), preparePos, eventNumber);
-			long pos;
-			Assert.IsTrue(Writer.Write(commit, out pos));
-			return commit;
-		}
-
-		protected long WriteCommit(Guid correlationId, long transactionId, string eventStreamName, long eventNumber) {
-			LogFormatHelper<TLogFormat, TStreamId>.CheckIfExplicitTransactionsSupported();
-			GetOrReserve(eventStreamName, out var eventStreamId, out _);
-			return WriteCommit(correlationId, transactionId, eventStreamId, eventNumber);
-		}
-
-		protected long WriteCommit(Guid correlationId, long transactionId, TStreamId eventStreamId, long eventNumber) {
-			LogFormatHelper<TLogFormat, TStreamId>.CheckIfExplicitTransactionsSupported();
-			var commit = LogRecord.Commit(Writer.Position, correlationId, transactionId, eventNumber);
-			long pos;
-			Assert.IsTrue(Writer.Write(commit, out pos));
-			return commit.LogPosition;
-		}
-
-		protected EventRecord WriteDelete(string eventStreamName) {
-			GetOrReserve(eventStreamName, out var eventStreamId, out var pos);
-			GetOrReserveEventType(SystemEventTypes.StreamDeleted, out var streamDeletedEventTypeId, out pos);
-			var prepare = LogRecord.DeleteTombstone(_recordFactory, pos,
-				Guid.NewGuid(), Guid.NewGuid(), eventStreamId, streamDeletedEventTypeId, EventNumber.DeletedStream - 1);
-			Assert.IsTrue(Writer.Write(prepare, out pos));
-			var commit = LogRecord.Commit(Writer.Position,
-				prepare.CorrelationId,
-				prepare.LogPosition,
-				EventNumber.DeletedStream);
-			Assert.IsTrue(Writer.Write(commit, out pos));
-			Assert.AreEqual(eventStreamId, prepare.EventStreamId);
-
-			return new EventRecord(EventNumber.DeletedStream, prepare, eventStreamName, SystemEventTypes.StreamDeleted);
-		}
-
-		protected IPrepareLogRecord<TStreamId> WriteDeletePrepare(string eventStreamName) {
-			GetOrReserve(eventStreamName, out var eventStreamId, out var pos);
-			GetOrReserveEventType(SystemEventTypes.StreamDeleted, out var streamDeletedEventTypeId, out pos);
-			var prepare = LogRecord.DeleteTombstone(_recordFactory, pos,
-				Guid.NewGuid(), Guid.NewGuid(), eventStreamId, streamDeletedEventTypeId, ExpectedVersion.Any);
-			Assert.IsTrue(Writer.Write(prepare, out pos));
-
-			return prepare;
-		}
-
-		protected CommitLogRecord WriteDeleteCommit(IPrepareLogRecord prepare) {
-			LogFormatHelper<TLogFormat, TStreamId>.CheckIfExplicitTransactionsSupported();
-			long pos;
-			var commit = LogRecord.Commit(Writer.Position,
-				prepare.CorrelationId,
-				prepare.LogPosition,
-				EventNumber.DeletedStream);
-			Assert.IsTrue(Writer.Write(commit, out pos));
-
-			return commit;
-		}
-
-		// This is LogV2 specific
-		protected PrepareLogRecord WriteSingleEventWithLogVersion0(Guid id, string streamId, long position,
-			long expectedVersion, PrepareFlags? flags = null) {
-			if (!flags.HasValue) {
-				flags = PrepareFlags.SingleWrite;
-			}
-
-			long pos;
-			var record = new PrepareLogRecord(position, id, id, position, 0, streamId, null, expectedVersion, DateTime.UtcNow,
-				flags.Value, "type", null, new byte[10], new byte[0], LogRecordVersion.LogRecordV0);
-			Writer.Write(record, out pos);
-			Writer.Write(
-				new CommitLogRecord(pos, id, position, DateTime.UtcNow, expectedVersion, LogRecordVersion.LogRecordV0),
-				out pos);
-			return record;
-		}
-
-		protected TFPos GetBackwardReadPos() {
-			var pos = new TFPos(WriterCheckpoint.ReadNonFlushed(), WriterCheckpoint.ReadNonFlushed());
-			return pos;
-		}
-
-		protected void Scavenge(bool completeLast, bool mergeChunks, bool scavengeIndex = true) {
-			if (_scavenge)
-				throw new InvalidOperationException("Scavenge can be executed only once in ReadIndexTestScenario");
-			_scavenge = true;
-			_completeLastChunkOnScavenge = completeLast;
-			_mergeChunks = mergeChunks;
-			_scavengeIndex = scavengeIndex;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/RepeatableDbTestScenario.cs b/src/EventStore.Core.Tests/Services/Storage/RepeatableDbTestScenario.cs
deleted file mode 100644
index a348a4089bf..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/RepeatableDbTestScenario.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using EventStore.Common.Utils;
-using EventStore.Core.DataStructures;
-using EventStore.Core.Index;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.Util;
-using NUnit.Framework;
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Caching;
-using EventStore.Core.Metrics;
-
-namespace EventStore.Core.Tests.Services.Storage {
-	[TestFixture]
-	public abstract class RepeatableDbTestScenario<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		protected readonly int MaxEntriesInMemTable;
-		protected TableIndex<TStreamId> TableIndex;
-		protected IReadIndex<TStreamId> ReadIndex;
-		protected LogFormatAbstractor<TStreamId> _logFormat;
-
-		protected DbResult DbRes;
-		protected TFChunkDbCreationHelper<TLogFormat, TStreamId> DbCreationHelper;
-
-		private readonly int _metastreamMaxCount;
-
-		protected RepeatableDbTestScenario(int maxEntriesInMemTable = 20, int metastreamMaxCount = 1) {
-			Ensure.Positive(maxEntriesInMemTable, "maxEntriesInMemTable");
-			MaxEntriesInMemTable = maxEntriesInMemTable;
-			_metastreamMaxCount = metastreamMaxCount;
-		}
-
-		public void CreateDb(params Rec[] records) {
-			if (DbRes != null) {
-				DbRes.Db.Close();
-			}
-
-			var indexDirectory = GetFilePathFor("index");
-			_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
-				IndexDirectory = indexDirectory,
-			});
-
-			var dbConfig = TFChunkHelper.CreateSizedDbConfig(PathName, 0, chunkSize: 1024 * 1024);
-			var dbHelper = new TFChunkDbCreationHelper<TLogFormat, TStreamId>(dbConfig, _logFormat);
-
-			DbRes = dbHelper.Chunk(records).CreateDb();
-
-			DbRes.Db.Config.WriterCheckpoint.Flush();
-			DbRes.Db.Config.ChaserCheckpoint.Write(DbRes.Db.Config.WriterCheckpoint.Read());
-			DbRes.Db.Config.ChaserCheckpoint.Flush();
-
-			var readers = new ObjectPool<ITransactionFileReader>(
-				"Readers", 2, 2, () => new TFChunkReader(DbRes.Db, DbRes.Db.Config.WriterCheckpoint));
-
-			var lowHasher = _logFormat.LowHasher;
-			var highHasher = _logFormat.HighHasher;
-			var emptyStreamId = _logFormat.EmptyStreamId;
-			TableIndex = new TableIndex<TStreamId>(indexDirectory, lowHasher, highHasher, emptyStreamId,
-				() => new HashListMemTable(PTableVersions.IndexV3, MaxEntriesInMemTable * 2),
-				() => new TFReaderLease(readers),
-				PTableVersions.IndexV3,
-				int.MaxValue,
-				Constants.PTableMaxReaderCountDefault,
-				MaxEntriesInMemTable);
-			_logFormat.StreamNamesProvider.SetTableIndex(TableIndex);
-
-			var readIndex = new ReadIndex<TStreamId>(new NoopPublisher(),
-				readers,
-				TableIndex,
-				_logFormat.StreamNameIndexConfirmer,
-				_logFormat.StreamIds,
-				_logFormat.StreamNamesProvider,
-				_logFormat.EmptyStreamId,
-				_logFormat.StreamIdValidator,
-				_logFormat.StreamIdSizer,
-				_logFormat.StreamExistenceFilter,
-				_logFormat.StreamExistenceFilterReader,
-				_logFormat.EventTypeIndexConfirmer,
-				new NoLRUCache<TStreamId, IndexBackend<TStreamId>.EventNumberCached>(),
-				new NoLRUCache<TStreamId, IndexBackend<TStreamId>.MetadataCached>(),
-				additionalCommitChecks: true,
-				metastreamMaxCount: _metastreamMaxCount,
-				hashCollisionReadLimit: Opts.HashCollisionReadLimitDefault,
-				skipIndexScanOnReads: Opts.SkipIndexScanOnReadsDefault,
-				replicationCheckpoint: DbRes.Db.Config.ReplicationCheckpoint,
-				indexCheckpoint: DbRes.Db.Config.IndexCheckpoint,
-				indexStatusTracker: new IndexStatusTracker.NoOp(),
-				indexTracker: new IndexTracker.NoOp(),
-				cacheTracker: new CacheHitsMissesTracker.NoOp());
-
-			readIndex.IndexCommitter.Init(DbRes.Db.Config.ChaserCheckpoint.Read());
-			ReadIndex = readIndex;
-		}
-
-		public override Task TestFixtureTearDown() {
-			_logFormat?.Dispose();
-			DbRes.Db.Close();
-			return base.TestFixtureTearDown();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Scavenge/ScavengeLogManager/ScavengeLogHelper.cs b/src/EventStore.Core.Tests/Services/Storage/Scavenge/ScavengeLogManager/ScavengeLogHelper.cs
deleted file mode 100644
index 699d9fe12b8..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Scavenge/ScavengeLogManager/ScavengeLogHelper.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Services;
-using EventStore.Core.TransactionLog.Chunks;
-
-namespace EventStore.Core.Tests.Services.Storage.Scavenge.ScavengeLogManager {
-	public static class ScavengerLogHelper {
-		public static string ScavengeStreamId(Guid scavengeId) {
-			return $"{SystemStreams.ScavengesStream}-{scavengeId}";
-		}
-
-		public static StreamMetadata CreateScavengeMetadata(TimeSpan scavengeHistoryMaxAge) {
-			return new StreamMetadata(maxAge: scavengeHistoryMaxAge, acl: new(
-				new[] { "$ops" },
-				new string[] { },
-				new string[] { },
-				new string[] { },
-				new string[] { }
-			));
-		}
-
-		public static Dictionary<string, object> CreateScavengeStarted(Guid scavengeId, string nodeEndpoint,
-			int startFromChunk = 0) {
-			return new Dictionary<string, object> {
-				{ "scavengeId", scavengeId },
-				{ "nodeEndpoint", nodeEndpoint },
-				{ "alwaysKeepScavenged", false },
-				{ "mergeChunks", true },
-				{ "startFromChunk", startFromChunk },
-				{ "threads", 1 },
-			};
-		}
-
-		public static Dictionary<string, object> CreateScavengeInterruptedByRestart
-			(Guid scavengeId, string nodeEndpoint, TimeSpan timeTaken, long spaceSaved = 0, int maxChunkScavenged = 0) {
-			return new Dictionary<string, object> {
-				{ "scavengeId", scavengeId },
-				{ "nodeEndpoint", nodeEndpoint },
-				{ "result", ScavengeResult.Interrupted },
-				{ "error", "The node was restarted." },
-				{ "timeTaken", timeTaken },
-				{ "spaceSaved", spaceSaved },
-				{ "maxChunkScavenged", maxChunkScavenged }
-			};
-		}
-
-		public static Dictionary<string, object> CreateScavengeChunkCompleted
-			(Guid scavengeId, string nodeEndpoint, int chunkStart, int chunkEnd, TimeSpan elapsed, long spaceSaved) {
-			return new Dictionary<string, object> {
-				{ "scavengeId", scavengeId },
-				{ "chunkStartNumber", chunkStart },
-				{ "chunkEndNumber", chunkEnd },
-				{ "timeTaken", elapsed },
-				{ "wasScavenged", true },
-				{ "spaceSaved", spaceSaved },
-				{ "nodeEndpoint", nodeEndpoint },
-				{ "errorMessage", "" }
-			};
-		}
-
-		public static Dictionary<string, object> CreateScavengeCompletedSuccessfully(
-			Guid scavengeId, string nodeEndpoint, TimeSpan elapsed, long spaceSaved, int maxChunkScavenged) {
-			return new Dictionary<string, object> {
-				{ "scavengeId", scavengeId },
-				{ "nodeEndpoint", nodeEndpoint },
-				{ "result", ScavengeResult.Success },
-				{ "error", "" },
-				{ "timeTaken", elapsed },
-				{ "spaceSaved", spaceSaved },
-				{ "maxChunkScavenged", maxChunkScavenged }
-			};
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Scavenge/ScavengeLogManager/when_initialising.cs b/src/EventStore.Core.Tests/Services/Storage/Scavenge/ScavengeLogManager/when_initialising.cs
deleted file mode 100644
index 7cee5db4368..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Scavenge/ScavengeLogManager/when_initialising.cs
+++ /dev/null
@@ -1,254 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.Scavenge.ScavengeLogManager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_scavenges_stream_does_not_exist<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private TFChunkScavengerLogManager _logManager;
-		private TaskCompletionSource<ClientMessage.WriteEvents> eventWritten = new();
-		private StreamMetadata _metadata;
-
-		protected override void Given1() {
-			NoOtherStreams();
-			AllWritesSucceed();
-
-			var scavengeHistoryMaxAge = TimeSpan.FromMinutes(5);
-			_metadata = ScavengerLogHelper.CreateScavengeMetadata(scavengeHistoryMaxAge);
-			_bus.Subscribe(new AdHocHandler<ClientMessage.WriteEvents>(m => eventWritten.TrySetResult(m)));
-
-			_logManager = new TFChunkScavengerLogManager("localhost:2113", scavengeHistoryMaxAge, _ioDispatcher);
-			_logManager.Initialise();
-		}
-
-		[Test]
-		public async Task should_write_scavenge_stream_metadata() {
-			var evnt = await eventWritten.Task.WithTimeout();
-			Assert.AreEqual(SystemStreams.MetastreamOf(SystemStreams.ScavengesStream), evnt.EventStreamId);
-			Assert.AreEqual(_metadata.ToJsonBytes(), evnt.Events[0].Data);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_scavenges_stream_has_different_metadata<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private TFChunkScavengerLogManager _logManager;
-		private TaskCompletionSource<ClientMessage.WriteEvents> eventWritten = new();
-		private TimeSpan _scavengeHistoryMaxAge = TimeSpan.FromMinutes(5);
-
-		protected override void Given1() {
-			NoOtherStreams();
-			AllWritesSucceed();
-
-			_bus.Subscribe(new AdHocHandler<ClientMessage.WriteEvents>(m => eventWritten.TrySetResult(m)));
-
-			// Create the existing metadata event with a max age of 30 days
-			var metadata = ScavengerLogHelper.CreateScavengeMetadata(TimeSpan.FromDays(30));
-			ExistingStreamMetadata(SystemStreams.MetastreamOf(SystemStreams.ScavengesStream), metadata.ToJsonString());
-
-			_logManager = new TFChunkScavengerLogManager("localhost:2113", _scavengeHistoryMaxAge, _ioDispatcher);
-			_logManager.Initialise();
-		}
-
-		[Test]
-		public async Task should_write_new_scavenge_stream_metadata() {
-			var evnt = await eventWritten.Task.WithTimeout();
-			Assert.AreEqual(SystemStreams.MetastreamOf(SystemStreams.ScavengesStream), evnt.EventStreamId);
-			var expectedMetadata = ScavengerLogHelper.CreateScavengeMetadata(_scavengeHistoryMaxAge);
-			Assert.AreEqual(expectedMetadata.ToJsonBytes(), evnt.Events[0].Data);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_scavenges_stream_has_correct_metadata<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private TFChunkScavengerLogManager _logManager;
-		private TaskCompletionSource<ClientMessage.ReadStreamEventsBackward> _eventRead = new();
-		private List<ClientMessage.WriteEvents> _writeRequests = new();
-		private TimeSpan _scavengeHistoryMaxAge = TimeSpan.FromMinutes(5);
-
-		protected override void Given1() {
-			NoOtherStreams();
-			AllWritesSucceed();
-
-			_bus.Subscribe(new AdHocHandler<ClientMessage.WriteEvents>(m => _writeRequests.Add(m)));
-			_bus.Subscribe(new AdHocHandler<ClientMessage.ReadStreamEventsBackward>(m => _eventRead.TrySetResult(m)));
-
-			// Create the existing metadata event with the correct max age
-			var metadata = ScavengerLogHelper.CreateScavengeMetadata(_scavengeHistoryMaxAge);
-			ExistingStreamMetadata(SystemStreams.ScavengesStream, metadata.ToJsonString());
-
-			_logManager = new TFChunkScavengerLogManager("localhost:2113", _scavengeHistoryMaxAge, _ioDispatcher);
-			_logManager.Initialise();
-		}
-
-		[Test]
-		public async Task should_not_write_new_metadata() {
-			var evnt = await _eventRead.Task.WithTimeout();
-			await Task.Delay(100); // Give it time to finish any writes if there are any
-			Assert.AreEqual(SystemStreams.MetastreamOf(SystemStreams.ScavengesStream), evnt.EventStreamId);
-			Assert.IsEmpty(_writeRequests);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_previous_scavenge_was_interrupted_but_scavenge_stream_not_written<TLogFormat, TStreamId>
-		: TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private const string _nodeEndpoint = "localhost:2113";
-		private Guid _scavengeId = Guid.NewGuid();
-		private TFChunkScavengerLogManager _logManager;
-		private TaskCompletionSource<ClientMessage.WriteEvents> _eventWritten = new();
-		private string _scavengeStreamId;
-
-		protected override void Given1() {
-			NoOtherStreams();
-			AllWritesSucceed();
-			_scavengeStreamId = ScavengerLogHelper.ScavengeStreamId(_scavengeId);
-
-			_bus.Subscribe(new AdHocHandler<ClientMessage.WriteEvents>(m => {
-				if (m.EventStreamId == _scavengeStreamId
-				    && m.Events[0].EventType == SystemEventTypes.ScavengeCompleted) {
-					_eventWritten.SetResult(m);
-				}
-			}));
-
-			// Create the existing scavenge
-			var scavengeHistoryMaxAge = TimeSpan.FromMinutes(5);
-			ExistingStreamMetadata(SystemStreams.ScavengesStream,
-				ScavengerLogHelper.CreateScavengeMetadata(scavengeHistoryMaxAge).ToJsonString());
-			var startedData = ScavengerLogHelper.CreateScavengeStarted(_scavengeId, _nodeEndpoint);
-			// This should be a linkTo event pointing to the scavenge stream
-			ExistingEvent(SystemStreams.ScavengesStream, SystemEventTypes.ScavengeStarted, "", startedData.ToJson(), true);
-
-			_logManager = new TFChunkScavengerLogManager(_nodeEndpoint, scavengeHistoryMaxAge, _ioDispatcher);
-			_logManager.Initialise();
-		}
-
-		[Test]
-		public async Task should_complete_the_scavenge_as_faulted() {
-			var evnt = await _eventWritten.Task.WithTimeout();
-			var expectedData = ScavengerLogHelper.CreateScavengeInterruptedByRestart(_scavengeId, _nodeEndpoint, TimeSpan.Zero);
-			Assert.AreEqual(expectedData.ToJson(), Encoding.UTF8.GetString(evnt.Events[0].Data));
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_previous_scavenge_was_interrupted_and_some_data_was_scavenged<TLogFormat, TStreamId>
-		: TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private const string _nodeEndpoint = "localhost:2113";
-		private Guid _scavengeId = Guid.NewGuid();
-		private TFChunkScavengerLogManager _logManager;
-		private TaskCompletionSource<ClientMessage.WriteEvents> _eventWritten = new();
-		private string _scavengeStreamId;
-
-		protected override void Given1() {
-			NoOtherStreams();
-			AllWritesSucceed();
-			_scavengeStreamId = ScavengerLogHelper.ScavengeStreamId(_scavengeId);
-
-			_bus.Subscribe(new AdHocHandler<ClientMessage.WriteEvents>(m => {
-				if (m.EventStreamId == _scavengeStreamId
-				    && m.Events[0].EventType == SystemEventTypes.ScavengeCompleted) {
-					_eventWritten.SetResult(m);
-				}
-			}));
-
-			// Create the existing scavenge
-			var scavengeHistoryMaxAge = TimeSpan.FromMinutes(5);
-			var metadata = ScavengerLogHelper.CreateScavengeMetadata(scavengeHistoryMaxAge);
-			ExistingStreamMetadata(SystemStreams.ScavengesStream, metadata.ToJsonString());
-			var startedData = ScavengerLogHelper.CreateScavengeStarted(_scavengeId, _nodeEndpoint);
-			// This should be a linkTo event pointing to the scavenge stream
-			ExistingEvent(SystemStreams.ScavengesStream, SystemEventTypes.ScavengeStarted, "", startedData.ToJson(), true);
-
-			var firstChunk = ScavengerLogHelper.CreateScavengeChunkCompleted(
-				_scavengeId, _nodeEndpoint, 0, 0, TimeSpan.FromSeconds(1), int.MaxValue).ToJson();
-			ExistingEvent(_scavengeStreamId, SystemEventTypes.ScavengeChunksCompleted, "", firstChunk, true);
-
-			var secondChunk = ScavengerLogHelper.CreateScavengeChunkCompleted(
-				_scavengeId, _nodeEndpoint, 1, 1, TimeSpan.FromSeconds(1), int.MaxValue).ToJson();
-			ExistingEvent(_scavengeStreamId, SystemEventTypes.ScavengeChunksCompleted, "", secondChunk, true);
-
-			_logManager = new TFChunkScavengerLogManager(_nodeEndpoint, scavengeHistoryMaxAge, _ioDispatcher);
-			_logManager.Initialise();
-		}
-
-		[Test]
-		public async Task should_complete_the_scavenge_as_faulted() {
-			var evnt = await _eventWritten.Task.WithTimeout();
-			long spaceSavedPerChunk = int.MaxValue;
-			var expectedData = ScavengerLogHelper.CreateScavengeInterruptedByRestart(
-				_scavengeId, _nodeEndpoint, TimeSpan.FromSeconds(2), spaceSavedPerChunk * 2, 1);
-			Assert.AreEqual(expectedData.ToJson(), Encoding.UTF8.GetString(evnt.Events[0].Data));
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_previous_scavenge_was_completed<TLogFormat, TStreamId>
-		: TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private const string _nodeEndpoint = "localhost:2113";
-		private Guid _scavengeId = Guid.NewGuid();
-		private TFChunkScavengerLogManager _logManager;
-		private TaskCompletionSource<ClientMessage.ReadStreamEventsBackward> _eventRead = new();
-		private List<ClientMessage.WriteEvents> _writtenEvents = new();
-		private string _scavengeStreamId;
-
-		protected override void Given1() {
-			NoOtherStreams();
-			AllWritesSucceed();
-			_scavengeStreamId = ScavengerLogHelper.ScavengeStreamId(_scavengeId);
-
-			_bus.Subscribe(new AdHocHandler<ClientMessage.WriteEvents>(m => _writtenEvents.Add(m)));
-			_bus.Subscribe(new AdHocHandler<ClientMessage.ReadStreamEventsBackward>(m => {
-				if (m.EventStreamId == SystemStreams.ScavengesStream) {
-					_eventRead.SetResult(m);
-				}
-			}));
-
-			// Create the existing scavenge
-			var scavengeHistoryMaxAge = TimeSpan.FromMinutes(5);
-			var metadata = ScavengerLogHelper.CreateScavengeMetadata(scavengeHistoryMaxAge);
-			ExistingStreamMetadata(SystemStreams.ScavengesStream, metadata.ToJsonString());
-			var startedData = ScavengerLogHelper.CreateScavengeStarted(_scavengeId, _nodeEndpoint);
-			// This should be a linkTo event pointing to the scavenge stream
-			ExistingEvent(SystemStreams.ScavengesStream, SystemEventTypes.ScavengeStarted, "", startedData.ToJson(), true);
-
-			var firstChunk = ScavengerLogHelper.CreateScavengeChunkCompleted(
-				_scavengeId, _nodeEndpoint, 0, 0, TimeSpan.FromSeconds(1), 10).ToJson();
-			ExistingEvent(_scavengeStreamId, SystemEventTypes.ScavengeChunksCompleted, "", firstChunk, true);
-
-			var secondChunk = ScavengerLogHelper.CreateScavengeChunkCompleted(
-				_scavengeId, _nodeEndpoint, 1, 1, TimeSpan.FromSeconds(1), 10).ToJson();
-			ExistingEvent(_scavengeStreamId, SystemEventTypes.ScavengeChunksCompleted, "", secondChunk, true);
-
-			var scavengeCompleted = ScavengerLogHelper.CreateScavengeCompletedSuccessfully(
-				_scavengeId, _nodeEndpoint, TimeSpan.FromSeconds(2), 20, 1).ToJson();
-			// This should be a linkTo event pointing to the scavenge stream
-			ExistingEvent(SystemStreams.ScavengesStream, SystemEventTypes.ScavengeCompleted, "", scavengeCompleted, true);
-
-			_logManager = new TFChunkScavengerLogManager(_nodeEndpoint, scavengeHistoryMaxAge, _ioDispatcher);
-			_logManager.Initialise();
-		}
-
-		[Test]
-		public async Task should_not_write_any_new_events() {
-			await _eventRead.Task.WithTimeout();
-			await Task.Delay(100); // Give it some time to write any events
-			Assert.IsEmpty(_writtenEvents.Where(x => x.EventStreamId == _scavengeStreamId));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_deleting_duplicate_events.cs b/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_deleting_duplicate_events.cs
deleted file mode 100644
index 80d6aa37ad4..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_deleting_duplicate_events.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System.Linq;
-using EventStore.Core.Data;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.Scavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_deleting_duplicate_events<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _event1;
-		private EventRecord _event2;
-		private EventRecord _event3;
-		private EventRecord _event4;
-		private EventRecord _event5;
-		private EventRecord _event6;
-		private EventRecord _event7;
-		private EventRecord _event8;
-
-		public when_deleting_duplicate_events() : base(
-			indexBitnessVersion: EventStore.Core.Index.PTableVersions.IndexV1, performAdditionalChecks: false) {
-		}
-
-		protected override void WriteTestScenario() {
-			_event1 = WriteSingleEvent("account--696193173", 0, new string('.', 3000), retryOnFail: true);
-			WriteSingleEvent("account--696193173", 0, new string('.', 3000), retryOnFail: true);
-
-			_event2 = WriteSingleEvent("LPN-FC002_LPK51001", 0, new string('.', 3000), retryOnFail: true);
-			WriteSingleEvent("LPN-FC002_LPK51001", 0, new string('.', 3000), retryOnFail: true);
-
-			_event3 = WriteSingleEvent("account--696193173", 1, new string('.', 3000), retryOnFail: true);
-			WriteSingleEvent("account--696193173", 1, new string('.', 3000), retryOnFail: true);
-
-			_event4 = WriteSingleEvent("LPN-FC002_LPK51001", 1, new string('.', 3000), retryOnFail: true);
-			WriteSingleEvent("LPN-FC002_LPK51001", 1, new string('.', 3000), retryOnFail: true);
-
-			_event5 = WriteSingleEvent("account--696193173", 2, new string('.', 3000), retryOnFail: true);
-			WriteSingleEvent("account--696193173", 2, new string('.', 3000), retryOnFail: true);
-
-			_event6 = WriteSingleEvent("LPN-FC002_LPK51001", 2, new string('.', 3000), retryOnFail: true);
-			WriteSingleEvent("LPN-FC002_LPK51001", 2, new string('.', 3000), retryOnFail: true);
-
-			_event7 = WriteSingleEvent("account--696193173", 3, new string('.', 3000), retryOnFail: true);
-			WriteSingleEvent("account--696193173", 3, new string('.', 3000), retryOnFail: true);
-
-			_event8 = WriteSingleEvent("LPN-FC002_LPK51001", 3, new string('.', 3000), retryOnFail: true);
-			WriteSingleEvent("LPN-FC002_LPK51001", 3, new string('.', 3000), retryOnFail: true);
-
-			WriteSingleEvent("RandomStream", 0, new string('.', 3000), retryOnFail: true);
-			WriteSingleEvent("RandomStream", 1, new string('.', 3000), retryOnFail: true);
-
-			Scavenge(completeLast: false, mergeChunks: false);
-		}
-
-		[Test]
-		public void read_all_events_forward_does_not_return_duplicate() {
-			var events = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(11, events.Length);
-			Assert.AreEqual(_event1, events[0]);
-			Assert.AreEqual(_event2, events[1]);
-			Assert.AreEqual(_event3, events[2]);
-			Assert.AreEqual(_event4, events[3]);
-			Assert.AreEqual(_event5, events[4]);
-			Assert.AreEqual(_event6, events[5]);
-			Assert.AreEqual(_event7, events[6]);
-			Assert.AreEqual(_event8, events[7]);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_deleting_single_stream_spanning_through_2_chunks_in_2nd_chunk__in_db_with_3_chunks.cs b/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_deleting_single_stream_spanning_through_2_chunks_in_2nd_chunk__in_db_with_3_chunks.cs
deleted file mode 100644
index 71ffb09c7a2..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_deleting_single_stream_spanning_through_2_chunks_in_2nd_chunk__in_db_with_3_chunks.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.Scavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_deleting_single_stream_spanning_through_2_chunks_in_2nd_chunk_in_db_with_3_chunks<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _event7;
-		private EventRecord _event9;
-
-		protected override void WriteTestScenario() {
-			WriteSingleEvent("ES", 0, new string('.', 3000)); // chunk 1
-			WriteSingleEvent("ES", 1, new string('.', 3000));
-			WriteSingleEvent("ES", 2, new string('.', 3000));
-
-			WriteSingleEvent("ES", 3, new string('.', 3000), retryOnFail: true); // chunk 2
-			WriteSingleEvent("ES", 4, new string('.', 3000));
-
-			_event7 = WriteDelete("ES");
-			_event9 = WriteSingleEvent("ES2", 0, new string('.', 5000), retryOnFail: true); //chunk 3
-
-			Scavenge(completeLast: false, mergeChunks: false);
-		}
-
-		[Test]
-		public void read_all_forward_does_not_return_scavenged_deleted_stream_events_and_return_remaining() {
-			var events = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(2, events.Length);
-			Assert.AreEqual(_event7, events[0]);
-			Assert.AreEqual(_event9, events[1]);
-		}
-
-		[Test]
-		public void read_all_backward_does_not_return_scavenged_deleted_stream_events_and_return_remaining() {
-			var events = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(2, events.Length);
-			Assert.AreEqual(_event7, events[1]);
-			Assert.AreEqual(_event9, events[0]);
-		}
-
-		[Test]
-		public void read_all_backward_from_beginning_of_second_chunk_returns_no_records() {
-			var pos = new TFPos(10000, 10000);
-			var events = ReadIndex.ReadAllEventsBackward(pos, 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(0, events.Length);
-		}
-
-		[Test]
-		public void
-			read_all_forward_from_beginning_of_2nd_chunk_with_max_2_record_returns_delete_record_and_record_from_3rd_chunk() {
-			var events = ReadIndex.ReadAllEventsForward(new TFPos(10000, 10000), 100).EventRecords()
-				.Take(2)
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(2, events.Length);
-			Assert.AreEqual(_event7, events[0]);
-			Assert.AreEqual(_event9, events[1]);
-		}
-
-		[Test]
-		public void read_all_forward_with_max_5_records_returns_2_records_from_2nd_chunk() {
-			var events = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 5).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(2, events.Length);
-			Assert.AreEqual(_event7, events[0]);
-			Assert.AreEqual(_event9, events[1]);
-		}
-
-		[Test]
-		public void is_stream_deleted_returns_true() {
-			Assert.That(ReadIndex.IsStreamDeleted("ES"));
-		}
-
-		[Test]
-		public void last_event_number_returns_stream_deleted() {
-			Assert.AreEqual(EventNumber.DeletedStream, ReadIndex.GetStreamLastEventNumber("ES"));
-		}
-
-		[Test]
-		public void last_physical_record_from_scavenged_stream_should_remain() {
-			// cannot use readIndex here as it doesn't return deleteTombstone
-
-			var chunk = Db.Manager.GetChunk(1);
-			var chunkPos = (int)(_event7.LogPosition % Db.Config.ChunkSize);
-			var res = chunk.TryReadAt(chunkPos, couldBeScavenged: false);
-
-			Assert.IsTrue(res.Success);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_deleting_single_stream_spanning_through_2_chunks_in_db_with_2_chunks.cs b/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_deleting_single_stream_spanning_through_2_chunks_in_db_with_2_chunks.cs
deleted file mode 100644
index 4cfb5341baa..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_deleting_single_stream_spanning_through_2_chunks_in_db_with_2_chunks.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System.Linq;
-using EventStore.Core.Data;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.Scavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_deleting_single_stream_spanning_through_2_chunks_in_db_with_2_chunks<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _event3;
-		private EventRecord _event4;
-		private EventRecord _delete;
-
-		protected override void WriteTestScenario() {
-			WriteSingleEvent("ES", 0, new string('.', 3000));
-			WriteSingleEvent("ES", 1, new string('.', 3000));
-			WriteSingleEvent("ES", 2, new string('.', 3000));
-
-			_event3 = WriteSingleEvent("ES", 3, new string('.', 3000), retryOnFail: true); // chunk 2
-			_event4 = WriteSingleEvent("ES", 4, new string('.', 3000));
-
-			_delete = WriteDelete("ES");
-			Scavenge(completeLast: false, mergeChunks: false);
-		}
-
-		[Test]
-		public void read_all_forward_returns_events_only_from_uncompleted_chunk_and_delete_record() {
-			var events = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(3, events.Length);
-			Assert.AreEqual(_event3, events[0]);
-			Assert.AreEqual(_event4, events[1]);
-			Assert.AreEqual(_delete, events[2]);
-		}
-
-		[Test]
-		public void read_all_backward_returns_events_only_from_uncompleted_chunk_and_delete_record() {
-			var events = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(3, events.Length);
-			Assert.AreEqual(_event3, events[2]);
-			Assert.AreEqual(_event4, events[1]);
-			Assert.AreEqual(_delete, events[0]);
-		}
-
-		[Test]
-		public void read_all_backward_from_beginning_of_second_chunk_returns_no_records() {
-			var pos = new TFPos(10000, 10000);
-			var events = ReadIndex.ReadAllEventsBackward(pos, 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(0, events.Length);
-		}
-
-		[Test]
-		public void read_all_forward_from_beginning_of_second_chunk_with_max_1_record_returns_5th_record() {
-			var events = ReadIndex.ReadAllEventsForward(new TFPos(10000, 10000), 1).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(1, events.Length);
-			Assert.AreEqual(_event3, events[0]);
-		}
-
-		[Test]
-		public void read_all_forward_with_max_5_records_returns_3_records_from_second_chunk_and_delete_record() {
-			var events = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 5).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(3, events.Length);
-			Assert.AreEqual(_event3, events[0]);
-			Assert.AreEqual(_event4, events[1]);
-			Assert.AreEqual(_delete, events[2]);
-		}
-
-		[Test]
-		public void is_stream_deleted_returns_true() {
-			Assert.That(ReadIndex.IsStreamDeleted("ES"));
-		}
-
-		[Test]
-		public void last_event_number_returns_stream_deleted() {
-			Assert.AreEqual(EventNumber.DeletedStream, ReadIndex.GetStreamLastEventNumber("ES"));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_deleting_single_stream_spanning_through_2_chunks_in_db_with_3_chunks.cs b/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_deleting_single_stream_spanning_through_2_chunks_in_db_with_3_chunks.cs
deleted file mode 100644
index 4752114140b..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_deleting_single_stream_spanning_through_2_chunks_in_db_with_3_chunks.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System.Linq;
-using EventStore.Core.Data;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.Scavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_deleting_single_stream_spanning_through_2_chunks_in_db_with_3_chunks<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _event8;
-		private EventRecord _delete;
-
-		protected override void WriteTestScenario() {
-			WriteSingleEvent("ES", 0, new string('.', 3000));
-			WriteSingleEvent("ES", 1, new string('.', 3000));
-			WriteSingleEvent("ES", 2, new string('.', 3000));
-
-			WriteSingleEvent("ES", 3, new string('.', 3000), retryOnFail: true); // chunk 2
-			WriteSingleEvent("ES", 4, new string('.', 3000));
-
-			_event8 = WriteSingleEvent("ES2", 0, new string('.', 5000), retryOnFail: true); //chunk 3
-
-			_delete = WriteDelete("ES");
-			Scavenge(completeLast: false, mergeChunks: false);
-		}
-
-		[Test]
-		public void
-			read_all_forward_does_not_return_scavenged_deleted_stream_events_and_return_remaining_plus_delete_record() {
-			var events = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(2, events.Length);
-			Assert.AreEqual(_event8, events[0]);
-			Assert.AreEqual(_delete, events[1]);
-		}
-
-		[Test]
-		public void
-			read_all_backward_does_not_return_scavenged_deleted_stream_events_and_return_remaining_plus_delete_record() {
-			var events = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(2, events.Length);
-			Assert.AreEqual(_event8, events[1]);
-			Assert.AreEqual(_delete, events[0]);
-		}
-
-		[Test]
-		public void read_all_backward_from_beginning_of_second_chunk_returns_no_records() {
-			var pos = new TFPos(10000, 10000);
-			var events = ReadIndex.ReadAllEventsBackward(pos, 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(0, events.Length);
-		}
-
-		[Test]
-		public void read_all_forward_from_beginning_of_2nd_chunk_with_max_1_record_returns_1st_record_from_3rd_chunk() {
-			var events = ReadIndex.ReadAllEventsForward(new TFPos(10000, 10000), 100).EventRecords()
-				.Take(1)
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(1, events.Length);
-			Assert.AreEqual(_event8, events[0]);
-		}
-
-		[Test]
-		public void read_all_forward_with_max_5_records_returns_2_records_from_2nd_chunk_plus_delete_record() {
-			var events = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 5).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(2, events.Length);
-			Assert.AreEqual(_event8, events[0]);
-			Assert.AreEqual(_delete, events[1]);
-		}
-
-		[Test]
-		public void is_stream_deleted_returns_true() {
-			Assert.That(ReadIndex.IsStreamDeleted("ES"));
-		}
-
-		[Test]
-		public void last_event_number_returns_stream_deleted() {
-			Assert.AreEqual(EventNumber.DeletedStream, ReadIndex.GetStreamLastEventNumber("ES"));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_having_commit_spanning_multiple_chunks.cs b/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_having_commit_spanning_multiple_chunks.cs
deleted file mode 100644
index 0b31ae3f204..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_having_commit_spanning_multiple_chunks.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.Scavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class when_having_commit_spanning_multiple_chunks<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private List<ILogRecord> _survivors;
-		private List<ILogRecord> _scavenged;
-
-		protected override void WriteTestScenario() {
-			_survivors = new List<ILogRecord>();
-			_scavenged = new List<ILogRecord>();
-
-			GetOrReserve("s1", out var s1StreamId, out _);
-			GetOrReserveEventType("event-type", out var eventTypeId, out _);
-			var transPos = Writer.Position;
-
-			for (int i = 0; i < 10; ++i) {
-				var r = LogRecord.Prepare(_recordFactory, Writer.Position,
-					Guid.NewGuid(),
-					Guid.NewGuid(),
-					transPos,
-					i,
-					s1StreamId,
-					i == 0 ? -1 : -2,
-					PrepareFlags.Data | (i == 9 ? PrepareFlags.TransactionEnd : PrepareFlags.None),
-					eventTypeId,
-					new byte[3],
-					new byte[3]);
-				Assert.IsTrue(Writer.Write(r, out _));
-				Writer.CompleteChunk();
-				Writer.AddNewChunk();
-
-				_scavenged.Add(r);
-			}
-
-			var r2 = WriteCommit(transPos, "s1", 0);
-			_survivors.Add(r2);
-
-			Writer.CompleteChunk();
-			Writer.AddNewChunk();
-
-			var r3 = WriteDeletePrepare("s1");
-			_survivors.Add(r3);
-
-			Writer.CompleteChunk();
-			Writer.AddNewChunk();
-
-			var r4 = WriteDeleteCommit(r3);
-			_survivors.Add(r4);
-
-			Writer.CompleteChunk();
-			Writer.AddNewChunk();
-
-			Scavenge(completeLast: false, mergeChunks: true);
-
-			Assert.AreEqual(13, _survivors.Count + _scavenged.Count);
-		}
-
-		[Test]
-		public void all_chunks_are_merged_and_scavenged() {
-			foreach (var rec in _scavenged) {
-				var chunk = Db.Manager.GetChunkFor(rec.LogPosition);
-				Assert.IsFalse(chunk.TryReadAt(rec.LogPosition, couldBeScavenged: true).Success);
-			}
-
-			foreach (var rec in _survivors) {
-				var chunk = Db.Manager.GetChunkFor(rec.LogPosition);
-				var res = chunk.TryReadAt(rec.LogPosition, couldBeScavenged: false);
-				Assert.IsTrue(res.Success);
-				Assert.AreEqual(rec, res.LogRecord);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_running_a_scavenge_from_storage_scavenger.cs b/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_running_a_scavenge_from_storage_scavenger.cs
deleted file mode 100644
index 6462996d408..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_running_a_scavenge_from_storage_scavenger.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Services;
-using EventStore.Core.Services.UserManagement;
-using EventStore.ClientAPI;
-using NUnit.Framework;
-using ILogger = Serilog.ILogger;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.Tests.Services.Storage.Scavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), IgnoreReason = "new scavenge in logv3 later")]
-	public class when_running_scavenge_from_storage_scavenger<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private static readonly ILogger Log = Serilog.Log.ForContext<when_running_scavenge_from_storage_scavenger<TLogFormat, TStreamId>>();
-		private static readonly TimeSpan Timeout = TimeSpan.FromSeconds(60);
-		private MiniNode<TLogFormat, TStreamId> _node;
-		private List<ResolvedEvent> _result;
-
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_node = new MiniNode<TLogFormat, TStreamId>(PathName, inMemDb: false);
-			await _node.Start();
-
-			var scavengeMessage =
-				new ClientMessage.ScavengeDatabase(new NoopEnvelope(), Guid.NewGuid(), SystemAccounts.System, 0, 1, null, null, false);
-			_node.Node.MainQueue.Publish(scavengeMessage);
-
-			try {
-				await When().WithTimeout();
-			} catch (Exception ex) {
-				throw new Exception("When Failed", ex);
-			}
-		}
-
-		[TearDown]
-		public async Task TearDown() {
-			await _node.Shutdown();
-		}
-
-		public async Task When() {
-			using (var conn = TestConnection.Create(_node.TcpEndPoint, TcpType.Ssl, DefaultData.AdminCredentials)) {
-				await conn.ConnectAsync();
-				var countdown = new CountdownEvent(2);
-				_result = new List<ResolvedEvent>();
-
-				conn.SubscribeToStreamFrom(SystemStreams.ScavengesStream, null, CatchUpSubscriptionSettings.Default,
-					(x, y) => {
-						_result.Add(y);
-						countdown.Signal();
-						return Task.CompletedTask;
-					},
-					_ => Log.Information("Processing events started."),
-					(x, y, z) => { Log.Information("Subscription dropped: {0}, {1}.", y, z); }
-				);
-
-				if (!countdown.Wait(Timeout)) {
-					Assert.Fail("Timeout expired while waiting for events.");
-				}
-			}
-		}
-
-		[Test]
-		public void should_create_scavenge_started_event_on_index_stream() {
-			var scavengeStartedEvent =
-				_result.FirstOrDefault(x => x.Event.EventType == SystemEventTypes.ScavengeStarted);
-			Assert.IsNotNull(scavengeStartedEvent);
-		}
-
-		[Test]
-		public void should_create_scavenge_completed_event_on_index_stream() {
-			var scavengeCompletedEvent =
-				_result.FirstOrDefault(x => x.Event.EventType == SystemEventTypes.ScavengeCompleted);
-			Assert.IsNotNull(scavengeCompletedEvent);
-		}
-
-		[Test]
-		public void should_link_started_and_completed_events_to_the_same_stream() {
-			var scavengeStartedEvent =
-				_result.FirstOrDefault(x => x.Event.EventType == SystemEventTypes.ScavengeStarted);
-			var scavengeCompletedEvent =
-				_result.FirstOrDefault(x => x.Event.EventType == SystemEventTypes.ScavengeCompleted);
-			Assert.AreEqual(scavengeStartedEvent.Event.EventStreamId, scavengeCompletedEvent.Event.EventStreamId);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_deleted_records.cs b/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_deleted_records.cs
deleted file mode 100644
index dd0020cc0dc..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_deleted_records.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.Scavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_scavenging_tfchunk_with_deleted_records<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private const string _eventStreamId = "ES";
-		private const string _deletedEventStreamId = "Deleted-ES";
-		private EventRecord _event1, _event2, _event3, _event4, _deleted;
-
-		protected override void WriteTestScenario() {
-			// Stream that will be kept
-			_event1 = WriteSingleEvent(_eventStreamId, 0, "bla1");
-			_event2 = WriteSingleEvent(_eventStreamId, 1, "bla1");
-
-			// Stream that will be deleted
-			WriteSingleEvent(_deletedEventStreamId, 0, "bla1");
-			WriteSingleEvent(_deletedEventStreamId, 1, "bla1");
-			_deleted = WriteDelete(_deletedEventStreamId);
-
-			// Stream that will be kept
-			_event3 = WriteSingleEvent(_eventStreamId, 2, "bla1");
-			_event4 = WriteSingleEvent(_eventStreamId, 3, "bla1");
-
-			Writer.CompleteChunk();
-			Writer.AddNewChunk();
-
-			Scavenge(completeLast: false, mergeChunks: true);
-		}
-
-		[Test]
-		public void should_be_able_to_read_the_all_stream() {
-			var events = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(5, events.Count());
-			Assert.AreEqual(_event1.EventId, events[0].EventId);
-			Assert.AreEqual(_event2.EventId, events[1].EventId);
-			Assert.AreEqual(_deleted.EventId, events[2].EventId);
-			Assert.AreEqual(_event3.EventId, events[3].EventId);
-			Assert.AreEqual(_event4.EventId, events[4].EventId);
-		}
-
-		[Test]
-		public async Task should_have_updated_deleted_stream_event_number() {
-			var chunk = Db.Manager.GetChunk(0);
-			var chunkRecords = new List<ILogRecord>();
-			RecordReadResult result = await chunk.TryReadFirst(CancellationToken.None);
-			while (result.Success) {
-				chunkRecords.Add(result.LogRecord);
-				result = chunk.TryReadClosestForward(result.NextPosition);
-			}
-
-			var id = _logFormat.StreamIds.LookupValue(_deletedEventStreamId);
-			var deletedRecord = (IPrepareLogRecord<TStreamId>)chunkRecords.First(
-				x => x.RecordType == LogRecordType.Prepare
-				     && EqualityComparer<TStreamId>.Default.Equals(((IPrepareLogRecord<TStreamId>)x).EventStreamId, id));
-
-			Assert.AreEqual(EventNumber.DeletedStream - 1, deletedRecord.ExpectedVersion);
-		}
-
-		[Test]
-		public void should_be_able_to_read_the_stream() {
-			var events = ReadIndex.ReadStreamEventsForward(_eventStreamId, 0, 10);
-			Assert.AreEqual(4, events.Records.Length);
-			Assert.AreEqual(_event1.EventId, events.Records[0].EventId);
-			Assert.AreEqual(_event2.EventId, events.Records[1].EventId);
-			Assert.AreEqual(_event3.EventId, events.Records[2].EventId);
-			Assert.AreEqual(_event4.EventId, events.Records[3].EventId);
-		}
-
-		[Test]
-		public void the_deleted_stream_should_be_deleted() {
-			var lastNumber = ReadIndex.GetStreamLastEventNumber(_deletedEventStreamId);
-			Assert.AreEqual(EventNumber.DeletedStream, lastNumber);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_incomplete_chunk.cs b/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_incomplete_chunk.cs
deleted file mode 100644
index 3c19f3dea36..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_incomplete_chunk.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.Scavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string), LogRecordVersion.LogRecordV0)]
-	[TestFixture(typeof(LogFormat.V2), typeof(string), LogRecordVersion.LogRecordV1)]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), LogRecordVersion.LogRecordV1)]
-	public class when_scavenging_tfchunk_with_incomplete_chunk<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		private readonly byte _version = LogRecordVersion.LogRecordV0;
-
-		public when_scavenging_tfchunk_with_incomplete_chunk(byte version) {
-			_version = version;
-		}
-
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator
-				.Chunk(
-					Rec.Prepare(0, "ES1", version: _version),
-					Rec.Commit(0, "ES1", version: _version),
-					Rec.Prepare(1, "ES1", version: _version),
-					Rec.Commit(1, "ES1", version: _version))
-				.Chunk(
-					Rec.Prepare(2, "ES2", version: _version),
-					Rec.Commit(2, "ES2", version: _version),
-					Rec.Prepare(3, "ES2", version: _version),
-					Rec.Commit(3, "ES2", version: _version))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
-				return new[] {
-					new[] {
-						dbResult.Recs[0][0],
-						dbResult.Recs[0][1],
-						dbResult.Recs[0][2],
-						dbResult.Recs[0][3],
-					},
-					new[] {
-						dbResult.Recs[1][0],
-						dbResult.Recs[1][1],
-						dbResult.Recs[1][2],
-						dbResult.Recs[1][3],
-					}
-				};
-			}
-
-			return new[] {
-				new[] {
-					dbResult.Recs[0][0], // "ES1" created
-					dbResult.Recs[0][1],
-					dbResult.Recs[0][2],
-					dbResult.Recs[0][3],
-					dbResult.Recs[0][4],
-				},
-				new[] {
-					dbResult.Recs[1][0], // "ES2" created
-					dbResult.Recs[1][1],
-					dbResult.Recs[1][2],
-					dbResult.Recs[1][3],
-					dbResult.Recs[1][4],
-				}
-			};
-		}
-
-		[Test]
-		public async Task should_not_have_changed_any_records() {
-			await CheckRecords();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_transactions.cs b/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_transactions.cs
deleted file mode 100644
index 1c8a096b163..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_transactions.cs
+++ /dev/null
@@ -1,365 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.Services.Storage;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.Scavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class when_scavenging_tfchunk_with_transactions<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private const string _streamIdOne = "ES-1";
-		private const string _streamIdTwo = "ES-2";
-		private EventRecord _p1, _p2, _p3, _p4, _p5, _random1;
-		private long _t2CommitPos, _t1CommitPos, _postCommitPos;
-
-		protected override void WriteTestScenario() {
-			var t1 = WriteTransactionBegin(_streamIdOne, ExpectedVersion.NoStream);
-			var t2 = WriteTransactionBegin(_streamIdTwo, ExpectedVersion.NoStream);
-
-			_p1 = WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 0,
-				_streamIdOne, 0, "es1", PrepareFlags.Data);
-			_p2 = WriteTransactionEvent(t2.CorrelationId, t2.LogPosition, 0,
-				_streamIdTwo, 0, "abc1", PrepareFlags.Data);
-			_p3 = WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 1,
-				_streamIdOne, 1, "es1", PrepareFlags.Data);
-			_p4 = WriteTransactionEvent(t2.CorrelationId, t2.LogPosition, 1,
-				_streamIdTwo, 1, "abc1", PrepareFlags.Data);
-			_p5 = WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 2,
-				_streamIdOne, 2, "es1", PrepareFlags.Data);
-
-			WriteTransactionEnd(t2.CorrelationId, t2.TransactionPosition, _streamIdTwo);
-			WriteTransactionEnd(t1.CorrelationId, t1.TransactionPosition, _streamIdOne);
-
-			var t2Commit = WriteCommit(t2.TransactionPosition, _streamIdTwo, 0);
-			_t2CommitPos = t2Commit.LogPosition;
-			var t1Commit = WriteCommit(t1.TransactionPosition, _streamIdOne, 0);
-			_t1CommitPos = t1Commit.LogPosition;
-			_postCommitPos =
-				t1Commit.GetNextLogPosition(t1Commit.LogPosition, t1Commit.GetSizeWithLengthPrefixAndSuffix() - 2 * sizeof(int));
-
-			Writer.CompleteChunk();
-			Writer.AddNewChunk();
-
-			// Need to have a second chunk as otherwise the checkpoints will be off
-			_random1 = WriteSingleEvent("random-stream", 0, "bla");
-
-			Scavenge(completeLast: false, mergeChunks: true);
-		}
-
-		[Test]
-		public async Task the_log_records_are_in_first_chunk() {
-			var chunk = Db.Manager.GetChunk(0);
-
-			var chunkRecords = new List<ILogRecord>();
-			RecordReadResult result = await chunk.TryReadFirst(CancellationToken.None);
-			while (result.Success) {
-				chunkRecords.Add(result.LogRecord);
-				result = chunk.TryReadClosestForward(result.NextPosition);
-			}
-
-			Assert.AreEqual(7, chunkRecords.Count);
-		}
-
-		[Test]
-		public async Task the_log_records_are_unchanged_in_second_chunk() {
-			var chunk = Db.Manager.GetChunk(1);
-
-			var chunkRecords = new List<ILogRecord>();
-			RecordReadResult result = await chunk.TryReadFirst(CancellationToken.None);
-			while (result.Success) {
-				chunkRecords.Add(result.LogRecord);
-				result = chunk.TryReadClosestForward(result.NextPosition);
-			}
-
-			Assert.AreEqual(2, chunkRecords.Count);
-		}
-
-		public void return_correct_last_event_version_for_larger_stream() {
-			Assert.AreEqual(2, ReadIndex.GetStreamLastEventNumber(_streamIdOne));
-		}
-
-		[Test]
-		public void return_correct_first_record_for_larger_stream() {
-			var result = ReadIndex.ReadEvent(_streamIdOne, 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p1.EventId, result.Record.EventId);
-		}
-
-		[Test]
-		public void return_correct_second_record_for_larger_stream() {
-			var result = ReadIndex.ReadEvent(_streamIdOne, 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p3.EventId, result.Record.EventId);
-		}
-
-		[Test]
-		public void return_correct_third_record_for_larger_stream() {
-			var result = ReadIndex.ReadEvent(_streamIdOne, 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p5.EventId, result.Record.EventId);
-		}
-
-		[Test]
-		public void not_find_record_with_nonexistent_version_for_larger_stream() {
-			var result = ReadIndex.ReadEvent(_streamIdOne, 3);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_larger_stream() {
-			var result = ReadIndex.ReadStreamEventsForward(_streamIdOne, 0, 3);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_p1.EventId, result.Records[0].EventId);
-			Assert.AreEqual(_p3.EventId, result.Records[1].EventId);
-			Assert.AreEqual(_p5.EventId, result.Records[2].EventId);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_larger_stream_with_specific_version() {
-			var result = ReadIndex.ReadStreamEventsBackward(_streamIdOne, 2, 3);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_p5.EventId, result.Records[0].EventId);
-			Assert.AreEqual(_p3.EventId, result.Records[1].EventId);
-			Assert.AreEqual(_p1.EventId, result.Records[2].EventId);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_larger_stream_with_from_end_version() {
-			var result = ReadIndex.ReadStreamEventsBackward(_streamIdOne, -1, 3);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_p5.EventId, result.Records[0].EventId);
-			Assert.AreEqual(_p3.EventId, result.Records[1].EventId);
-			Assert.AreEqual(_p1.EventId, result.Records[2].EventId);
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_smaller_stream() {
-			Assert.AreEqual(1, ReadIndex.GetStreamLastEventNumber(_streamIdTwo));
-		}
-
-		[Test]
-		public void return_correct_first_record_for_smaller_stream() {
-			var result = ReadIndex.ReadEvent(_streamIdTwo, 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p2.EventId, result.Record.EventId);
-		}
-
-		[Test]
-		public void return_correct_second_record_for_smaller_stream() {
-			var result = ReadIndex.ReadEvent(_streamIdTwo, 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p4.EventId, result.Record.EventId);
-		}
-
-		[Test]
-		public void not_find_record_with_nonexistent_version_for_smaller_stream() {
-			var result = ReadIndex.ReadEvent(_streamIdTwo, 2);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_smaller_stream() {
-			var result = ReadIndex.ReadStreamEventsForward(_streamIdTwo, 0, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_p2.EventId, result.Records[0].EventId);
-			Assert.AreEqual(_p4.EventId, result.Records[1].EventId);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_smaller_stream_with_specific_version() {
-			var result = ReadIndex.ReadStreamEventsBackward(_streamIdTwo, 1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_p4.EventId, result.Records[0].EventId);
-			Assert.AreEqual(_p2.EventId, result.Records[1].EventId);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_smaller_stream_with_from_end_version() {
-			var result = ReadIndex.ReadStreamEventsBackward(_streamIdTwo, -1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_p4.EventId, result.Records[0].EventId);
-			Assert.AreEqual(_p2.EventId, result.Records[1].EventId);
-		}
-
-		[Test]
-		public void read_all_events_forward_returns_all_events_in_correct_order() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10).Records;
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_p2.EventId, records[0].Event.EventId);
-			Assert.AreEqual(_p4.EventId, records[1].Event.EventId);
-			Assert.AreEqual(_p1.EventId, records[2].Event.EventId);
-			Assert.AreEqual(_p3.EventId, records[3].Event.EventId);
-			Assert.AreEqual(_p5.EventId, records[4].Event.EventId);
-			Assert.AreEqual(_random1.EventId, records[5].Event.EventId);
-		}
-
-		[Test]
-		public void read_all_events_backward_returns_all_events_in_correct_order() {
-			var pos = GetBackwardReadPos();
-			var records = ReadIndex.ReadAllEventsBackward(pos, 10).Records;
-
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_random1.EventId, records[0].Event.EventId);
-			Assert.AreEqual(_p5.EventId, records[1].Event.EventId);
-			Assert.AreEqual(_p3.EventId, records[2].Event.EventId);
-			Assert.AreEqual(_p1.EventId, records[3].Event.EventId);
-			Assert.AreEqual(_p4.EventId, records[4].Event.EventId);
-			Assert.AreEqual(_p2.EventId, records[5].Event.EventId);
-		}
-
-		[Test]
-		public void
-			read_all_events_forward_returns_no_transaction_records_when_prepare_position_is_greater_than_last_prepare_in_commit() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(_t1CommitPos, _t1CommitPos), 10).Records;
-			Assert.AreEqual(1, records.Count);
-			Assert.AreEqual(_random1.EventId, records[0].Event.EventId);
-		}
-
-		[Test]
-		public void
-			read_all_events_backwards_returns_nothing_when_prepare_position_is_smaller_than_first_prepare_in_commit() {
-			var records = ReadIndex.ReadAllEventsBackward(new TFPos(_t2CommitPos, 0), 10).Records;
-			Assert.AreEqual(0, records.Count);
-		}
-
-		[Test]
-		public void read_all_events_forward_returns_correct_events_starting_in_the_middle_of_tf() {
-			var res1 = ReadIndex.ReadAllEventsForward(new TFPos(_t2CommitPos, _p4.LogPosition),
-				10); // end of first commit
-			Assert.AreEqual(5, res1.Records.Count);
-			Assert.AreEqual(_p4.EventId, res1.Records[0].Event.EventId);
-			Assert.AreEqual(_p1.EventId, res1.Records[1].Event.EventId);
-			Assert.AreEqual(_p3.EventId, res1.Records[2].Event.EventId);
-			Assert.AreEqual(_p5.EventId, res1.Records[3].Event.EventId);
-			Assert.AreEqual(_random1.EventId, res1.Records[4].Event.EventId);
-
-			var res2 = ReadIndex.ReadAllEventsBackward(res1.PrevPos, 10);
-			Assert.AreEqual(1, res2.Records.Count);
-			Assert.AreEqual(_p2.EventId, res2.Records[0].Event.EventId);
-		}
-
-		[Test]
-		public void read_all_events_backward_returns_correct_events_starting_in_the_middle_of_tf() {
-			var pos = new TFPos(_postCommitPos, _p4.LogPosition); // p3 post position
-			var res1 = ReadIndex.ReadAllEventsBackward(pos, 10);
-
-			Assert.AreEqual(4, res1.Records.Count);
-			Assert.AreEqual(_p3.EventId, res1.Records[0].Event.EventId);
-			Assert.AreEqual(_p1.EventId, res1.Records[1].Event.EventId);
-			Assert.AreEqual(_p4.EventId, res1.Records[2].Event.EventId);
-			Assert.AreEqual(_p2.EventId, res1.Records[3].Event.EventId);
-
-			var res2 = ReadIndex.ReadAllEventsForward(res1.PrevPos, 10);
-			Assert.AreEqual(2, res2.Records.Count);
-			Assert.AreEqual(_p5.EventId, res2.Records[0].Event.EventId);
-		}
-
-		[Test]
-		public void all_records_can_be_read_sequentially_page_by_page_in_forward_pass() {
-			var recs = new[] {_p2, _p4, _p1, _p3, _p5, _random1}; // in committed order
-
-			int count = 0;
-			var pos = new TFPos(0, 0);
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsForward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count].EventId, result.Records[0].Event.EventId);
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void all_records_can_be_read_sequentially_page_by_page_in_backward_pass() {
-			var recs = new[] {_random1, _p5, _p3, _p1, _p4, _p2}; // in reverse committed order
-
-			int count = 0;
-			var pos = GetBackwardReadPos();
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsBackward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count].EventId, result.Records[0].Event.EventId);
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void position_returned_for_prev_page_when_traversing_forward_allow_to_traverse_backward_correctly() {
-			var recs = new[] {_p2, _p4, _p1, _p3, _p5, _random1}; // in committed order
-
-			int count = 0;
-			var pos = new TFPos(0, 0);
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsForward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count].EventId, result.Records[0].Event.EventId);
-
-				var localPos = result.PrevPos;
-				int localCount = 0;
-				IndexReadAllResult localResult;
-				while ((localResult = ReadIndex.ReadAllEventsBackward(localPos, 1)).Records.Count != 0) {
-					Assert.AreEqual(1, localResult.Records.Count);
-					Assert.AreEqual(recs[count - 1 - localCount].EventId, localResult.Records[0].Event.EventId);
-					localPos = localResult.NextPos;
-					localCount += 1;
-				}
-
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void position_returned_for_prev_page_when_traversing_backward_allow_to_traverse_forward_correctly() {
-			var recs = new[] {_random1, _p5, _p3, _p1, _p4, _p2}; // in reverse committed order
-
-			int count = 0;
-			var pos = GetBackwardReadPos();
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsBackward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count].EventId, result.Records[0].Event.EventId);
-
-				var localPos = result.PrevPos;
-				int localCount = 0;
-				IndexReadAllResult localResult;
-				while ((localResult = ReadIndex.ReadAllEventsForward(localPos, 1)).Records.Count != 0) {
-					Assert.AreEqual(1, localResult.Records.Count);
-					Assert.AreEqual(recs[count - 1 - localCount].EventId, localResult.Records[0].Event.EventId);
-					localPos = localResult.NextPos;
-					localCount += 1;
-				}
-
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_version0_log_records_and_deleted_records.cs b/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_version0_log_records_and_deleted_records.cs
deleted file mode 100644
index 0b4462b6dac..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_version0_log_records_and_deleted_records.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.Scavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "No such thing as a V0 prepare in LogV3")]
-	public class when_scavenging_tfchunk_with_version0_log_records_and_deleted_records<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-
-		private const string _eventStreamId = "ES";
-		private const string _deletedEventStreamId = "Deleted-ES";
-		private PrepareLogRecord _event1, _event2, _event3, _event4, _deleted;
-
-		protected override void WriteTestScenario() {
-			// Stream that will be kept
-			_event1 = WriteSingleEventWithLogVersion0(Guid.NewGuid(), _eventStreamId, Writer.Position,
-				0);
-			_event2 = WriteSingleEventWithLogVersion0(Guid.NewGuid(), _eventStreamId, Writer.Position,
-				1);
-
-			// Stream that will be deleted
-			WriteSingleEventWithLogVersion0(Guid.NewGuid(), _deletedEventStreamId, Writer.Position,
-				0);
-			WriteSingleEventWithLogVersion0(Guid.NewGuid(), _deletedEventStreamId, Writer.Position,
-				1);
-			_deleted = WriteSingleEventWithLogVersion0(Guid.NewGuid(), _deletedEventStreamId,
-				Writer.Position, int.MaxValue - 1,
-				PrepareFlags.StreamDelete | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd);
-
-			// Stream that will be kept
-			_event3 = WriteSingleEventWithLogVersion0(Guid.NewGuid(), _eventStreamId, Writer.Position,
-				2);
-			_event4 = WriteSingleEventWithLogVersion0(Guid.NewGuid(), _eventStreamId, Writer.Position,
-				3);
-
-			Writer.CompleteChunk();
-			Writer.AddNewChunk();
-
-			Scavenge(completeLast: false, mergeChunks: true);
-		}
-
-		[Test]
-		public void should_be_able_to_read_the_all_stream() {
-			var events = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).Records.Select(r => r.Event).ToArray();
-			Assert.AreEqual(5, events.Count());
-			Assert.AreEqual(_event1.EventId, events[0].EventId);
-			Assert.AreEqual(_event2.EventId, events[1].EventId);
-			Assert.AreEqual(_deleted.EventId, events[2].EventId);
-			Assert.AreEqual(_event3.EventId, events[3].EventId);
-			Assert.AreEqual(_event4.EventId, events[4].EventId);
-		}
-
-		[Test]
-		public async Task should_have_updated_deleted_stream_event_number() {
-			var chunk = Db.Manager.GetChunk(0);
-			var chunkRecords = new List<ILogRecord>();
-			RecordReadResult result = await chunk.TryReadFirst(CancellationToken.None);
-			while (result.Success) {
-				chunkRecords.Add(result.LogRecord);
-				result = chunk.TryReadClosestForward(result.NextPosition);
-			}
-
-			var deletedRecord = (PrepareLogRecord)chunkRecords.First(x => x.RecordType == LogRecordType.Prepare
-																		  && ((PrepareLogRecord)x).EventStreamId ==
-																		  _deletedEventStreamId);
-
-
-			Assert.AreEqual(EventNumber.DeletedStream - 1, deletedRecord.ExpectedVersion);
-		}
-
-		[Test]
-		public async Task the_log_records_are_still_version_0() {
-			var chunk = Db.Manager.GetChunk(0);
-			var chunkRecords = new List<ILogRecord>();
-			RecordReadResult result = await chunk.TryReadFirst(CancellationToken.None);
-			while (result.Success) {
-				chunkRecords.Add(result.LogRecord);
-				result = chunk.TryReadClosestForward(result.NextPosition);
-			}
-
-			Assert.IsTrue(chunkRecords.All(x => x.Version == LogRecordVersion.LogRecordV0));
-			Assert.AreEqual(10, chunkRecords.Count);
-		}
-
-		[Test]
-		public void should_be_able_to_read_the_stream() {
-			var events = ReadIndex.ReadStreamEventsForward(_eventStreamId, 0, 10);
-			Assert.AreEqual(4, events.Records.Length);
-			Assert.AreEqual(_event1.EventId, events.Records[0].EventId);
-			Assert.AreEqual(_event2.EventId, events.Records[1].EventId);
-			Assert.AreEqual(_event3.EventId, events.Records[2].EventId);
-			Assert.AreEqual(_event4.EventId, events.Records[3].EventId);
-		}
-
-		[Test]
-		public void the_deleted_stream_should_be_deleted() {
-			var lastNumber = ReadIndex.GetStreamLastEventNumber(_deletedEventStreamId);
-			Assert.AreEqual(EventNumber.DeletedStream, lastNumber);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_version0_log_records_using_transactions.cs b/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_version0_log_records_using_transactions.cs
deleted file mode 100644
index a35f9438ecb..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_version0_log_records_using_transactions.cs
+++ /dev/null
@@ -1,414 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.Services.Storage;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.Scavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "No such thing as a V0 prepare in LogV3")]
-	public class when_scavenging_tfchunk_with_version0_log_records_using_transactions<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-
-		private const string _streamIdOne = "ES-1";
-		private const string _streamIdTwo = "ES-2";
-		private PrepareLogRecord _p1, _p2, _p3, _p4, _p5, _random1;
-		private long _t2CommitPos, _t1CommitPos, _postCommitPos;
-
-		protected override void WriteTestScenario() {
-			var t1 = WriteTransactionBeginV0(Guid.NewGuid(), Writer.Position, _streamIdOne,
-				ExpectedVersion.NoStream);
-			var t2 = WriteTransactionBeginV0(Guid.NewGuid(), Writer.Position, _streamIdTwo,
-				ExpectedVersion.NoStream);
-
-			_p1 = WriteTransactionEventV0(t1.CorrelationId, Writer.Position, t1.LogPosition, 0,
-				t1.EventStreamId, 0, "es1", PrepareFlags.Data);
-			_p2 = WriteTransactionEventV0(t2.CorrelationId, Writer.Position, t2.LogPosition, 0,
-				t2.EventStreamId, 0, "abc1", PrepareFlags.Data);
-			_p3 = WriteTransactionEventV0(t1.CorrelationId, Writer.Position, t1.LogPosition, 1,
-				t1.EventStreamId, 1, "es1", PrepareFlags.Data);
-			_p4 = WriteTransactionEventV0(t2.CorrelationId, Writer.Position, t2.LogPosition, 1,
-				t2.EventStreamId, 1, "abc1", PrepareFlags.Data);
-			_p5 = WriteTransactionEventV0(t1.CorrelationId, Writer.Position, t1.LogPosition, 2,
-				t1.EventStreamId, 2, "es1", PrepareFlags.Data);
-
-			WriteTransactionEndV0(t2.CorrelationId, Writer.Position, t2.TransactionPosition,
-				t2.EventStreamId);
-			WriteTransactionEndV0(t1.CorrelationId, Writer.Position, t1.TransactionPosition,
-				t1.EventStreamId);
-
-			_t2CommitPos = WriteCommitV0(t2.CorrelationId, Writer.Position, t2.TransactionPosition,
-				t2.EventStreamId, 0, out _postCommitPos);
-			_t1CommitPos = WriteCommitV0(t1.CorrelationId, Writer.Position, t1.TransactionPosition,
-				t1.EventStreamId, 0, out _postCommitPos);
-
-			Writer.CompleteChunk();
-			Writer.AddNewChunk();
-
-			// Need to have a second chunk as otherwise the checkpoints will be off
-			_random1 = WriteSingleEventWithLogVersion0(Guid.NewGuid(), "random-stream",
-				Writer.Position, 0);
-
-			Scavenge(completeLast: false, mergeChunks: true);
-		}
-
-		private PrepareLogRecord WriteTransactionBeginV0(Guid id, long logPosition, string eventStreamId,
-			long expectedVersion) {
-			var prepare = new PrepareLogRecord(logPosition, id, Guid.NewGuid(), logPosition, -1,
-				eventStreamId, null, expectedVersion,
-				DateTime.UtcNow, PrepareFlags.TransactionBegin, null, null, new byte[0], new byte[0],
-				LogRecordVersion.LogRecordV0);
-			long pos;
-			Assert.IsTrue(Writer.Write(prepare, out pos));
-			return prepare;
-		}
-
-		private PrepareLogRecord WriteTransactionEventV0(Guid correlationId, long logPosition, long transactionPosition,
-			int transactionOffset, string eventStreamId, long eventNumber, string eventData, PrepareFlags flags) {
-			var prepare = new PrepareLogRecord(logPosition, correlationId, Guid.NewGuid(), transactionPosition,
-				transactionOffset,
-				eventStreamId, null, ExpectedVersion.Any, DateTime.UtcNow, flags,
-				"testEventType", null, Encoding.UTF8.GetBytes(eventData), new byte[0],
-				LogRecordVersion.LogRecordV0);
-			long pos;
-			Writer.Write(prepare, out pos);
-			return prepare;
-		}
-
-		private void WriteTransactionEndV0(Guid correlationId, long logPosition, long transactionId,
-			string eventStreamId) {
-			var prepare = new PrepareLogRecord(logPosition, correlationId, Guid.NewGuid(), transactionId, -1,
-				eventStreamId, null, ExpectedVersion.Any,
-				DateTime.UtcNow, PrepareFlags.TransactionEnd, null, null, new byte[0], new byte[0],
-				LogRecordVersion.LogRecordV0);
-			long pos;
-			Writer.Write(prepare, out pos);
-		}
-
-		private long WriteCommitV0(Guid correlationId, long logPosition, long transactionPosition, string eventStreamId,
-			long eventNumber, out long pos) {
-			var commit = new CommitLogRecord(logPosition, correlationId, transactionPosition, DateTime.UtcNow,
-				eventNumber,
-				LogRecordVersion.LogRecordV0);
-
-			Writer.Write(commit, out pos);
-			return commit.LogPosition;
-		}
-
-		[Test]
-		public async Task the_log_records_are_still_version_0_in_first_chunk() {
-			var chunk = Db.Manager.GetChunk(0);
-
-			var chunkRecords = new List<ILogRecord>();
-			RecordReadResult result = await chunk.TryReadFirst(CancellationToken.None);
-			while (result.Success) {
-				chunkRecords.Add(result.LogRecord);
-				result = chunk.TryReadClosestForward(result.NextPosition);
-			}
-
-			Assert.IsTrue(chunkRecords.All(x => x.Version == LogRecordVersion.LogRecordV0));
-			Assert.AreEqual(7, chunkRecords.Count);
-		}
-
-		[Test]
-		public async Task the_log_records_are_unchanged_in_second_chunk() {
-			var chunk = Db.Manager.GetChunk(1);
-
-			var chunkRecords = new List<ILogRecord>();
-			RecordReadResult result = await chunk.TryReadFirst(CancellationToken.None);
-			while (result.Success) {
-				chunkRecords.Add(result.LogRecord);
-				result = chunk.TryReadClosestForward(result.NextPosition);
-			}
-
-			Assert.IsTrue(chunkRecords.All(x => x.Version == LogRecordVersion.LogRecordV0));
-			Assert.AreEqual(2, chunkRecords.Count);
-		}
-
-		public void return_correct_last_event_version_for_larger_stream() {
-			Assert.AreEqual(2, ReadIndex.GetStreamLastEventNumber(_streamIdOne));
-		}
-
-		[Test]
-		public void return_correct_first_record_for_larger_stream() {
-			var result = ReadIndex.ReadEvent(_streamIdOne, 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p1.EventId, result.Record.EventId);
-		}
-
-		[Test]
-		public void return_correct_second_record_for_larger_stream() {
-			var result = ReadIndex.ReadEvent(_streamIdOne, 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p3.EventId, result.Record.EventId);
-		}
-
-		[Test]
-		public void return_correct_third_record_for_larger_stream() {
-			var result = ReadIndex.ReadEvent(_streamIdOne, 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p5.EventId, result.Record.EventId);
-		}
-
-		[Test]
-		public void not_find_record_with_nonexistent_version_for_larger_stream() {
-			var result = ReadIndex.ReadEvent(_streamIdOne, 3);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_larger_stream() {
-			var result = ReadIndex.ReadStreamEventsForward(_streamIdOne, 0, 3);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_p1.EventId, result.Records[0].EventId);
-			Assert.AreEqual(_p3.EventId, result.Records[1].EventId);
-			Assert.AreEqual(_p5.EventId, result.Records[2].EventId);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_larger_stream_with_specific_version() {
-			var result = ReadIndex.ReadStreamEventsBackward(_streamIdOne, 2, 3);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_p5.EventId, result.Records[0].EventId);
-			Assert.AreEqual(_p3.EventId, result.Records[1].EventId);
-			Assert.AreEqual(_p1.EventId, result.Records[2].EventId);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_larger_stream_with_from_end_version() {
-			var result = ReadIndex.ReadStreamEventsBackward(_streamIdOne, -1, 3);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_p5.EventId, result.Records[0].EventId);
-			Assert.AreEqual(_p3.EventId, result.Records[1].EventId);
-			Assert.AreEqual(_p1.EventId, result.Records[2].EventId);
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_smaller_stream() {
-			Assert.AreEqual(1, ReadIndex.GetStreamLastEventNumber(_streamIdTwo));
-		}
-
-		[Test]
-		public void return_correct_first_record_for_smaller_stream() {
-			var result = ReadIndex.ReadEvent(_streamIdTwo, 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p2.EventId, result.Record.EventId);
-		}
-
-		[Test]
-		public void return_correct_second_record_for_smaller_stream() {
-			var result = ReadIndex.ReadEvent(_streamIdTwo, 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p4.EventId, result.Record.EventId);
-		}
-
-		[Test]
-		public void not_find_record_with_nonexistent_version_for_smaller_stream() {
-			var result = ReadIndex.ReadEvent(_streamIdTwo, 2);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_smaller_stream() {
-			var result = ReadIndex.ReadStreamEventsForward(_streamIdTwo, 0, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_p2.EventId, result.Records[0].EventId);
-			Assert.AreEqual(_p4.EventId, result.Records[1].EventId);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_smaller_stream_with_specific_version() {
-			var result = ReadIndex.ReadStreamEventsBackward(_streamIdTwo, 1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_p4.EventId, result.Records[0].EventId);
-			Assert.AreEqual(_p2.EventId, result.Records[1].EventId);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_smaller_stream_with_from_end_version() {
-			var result = ReadIndex.ReadStreamEventsBackward(_streamIdTwo, -1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_p4.EventId, result.Records[0].EventId);
-			Assert.AreEqual(_p2.EventId, result.Records[1].EventId);
-		}
-
-		[Test]
-		public void read_all_events_forward_returns_all_events_in_correct_order() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10).Records;
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_p2.EventId, records[0].Event.EventId);
-			Assert.AreEqual(_p4.EventId, records[1].Event.EventId);
-			Assert.AreEqual(_p1.EventId, records[2].Event.EventId);
-			Assert.AreEqual(_p3.EventId, records[3].Event.EventId);
-			Assert.AreEqual(_p5.EventId, records[4].Event.EventId);
-			Assert.AreEqual(_random1.EventId, records[5].Event.EventId);
-		}
-
-		[Test]
-		public void read_all_events_backward_returns_all_events_in_correct_order() {
-			var pos = GetBackwardReadPos();
-			var records = ReadIndex.ReadAllEventsBackward(pos, 10).Records;
-
-			Assert.AreEqual(6, records.Count);
-			Assert.AreEqual(_random1.EventId, records[0].Event.EventId);
-			Assert.AreEqual(_p5.EventId, records[1].Event.EventId);
-			Assert.AreEqual(_p3.EventId, records[2].Event.EventId);
-			Assert.AreEqual(_p1.EventId, records[3].Event.EventId);
-			Assert.AreEqual(_p4.EventId, records[4].Event.EventId);
-			Assert.AreEqual(_p2.EventId, records[5].Event.EventId);
-		}
-
-		[Test]
-		public void
-			read_all_events_forward_returns_no_transaction_records_when_prepare_position_is_greater_than_last_prepare_in_commit() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(_t1CommitPos, _t1CommitPos), 10).Records;
-			Assert.AreEqual(1, records.Count);
-			Assert.AreEqual(_random1.EventId, records[0].Event.EventId);
-		}
-
-		[Test]
-		public void
-			read_all_events_backwards_returns_nothing_when_prepare_position_is_smaller_than_first_prepare_in_commit() {
-			var records = ReadIndex.ReadAllEventsBackward(new TFPos(_t2CommitPos, 0), 10).Records;
-			Assert.AreEqual(0, records.Count);
-		}
-
-		[Test]
-		public void read_all_events_forward_returns_correct_events_starting_in_the_middle_of_tf() {
-			var res1 = ReadIndex.ReadAllEventsForward(new TFPos(_t2CommitPos, _p4.LogPosition),
-				10); // end of first commit
-			Assert.AreEqual(5, res1.Records.Count);
-			Assert.AreEqual(_p4.EventId, res1.Records[0].Event.EventId);
-			Assert.AreEqual(_p1.EventId, res1.Records[1].Event.EventId);
-			Assert.AreEqual(_p3.EventId, res1.Records[2].Event.EventId);
-			Assert.AreEqual(_p5.EventId, res1.Records[3].Event.EventId);
-			Assert.AreEqual(_random1.EventId, res1.Records[4].Event.EventId);
-
-			var res2 = ReadIndex.ReadAllEventsBackward(res1.PrevPos, 10);
-			Assert.AreEqual(1, res2.Records.Count);
-			Assert.AreEqual(_p2.EventId, res2.Records[0].Event.EventId);
-		}
-
-		[Test]
-		public void read_all_events_backward_returns_correct_events_starting_in_the_middle_of_tf() {
-			var pos = new TFPos(_postCommitPos, _p4.LogPosition); // p3 post position
-			var res1 = ReadIndex.ReadAllEventsBackward(pos, 10);
-
-			Assert.AreEqual(4, res1.Records.Count);
-			Assert.AreEqual(_p3.EventId, res1.Records[0].Event.EventId);
-			Assert.AreEqual(_p1.EventId, res1.Records[1].Event.EventId);
-			Assert.AreEqual(_p4.EventId, res1.Records[2].Event.EventId);
-			Assert.AreEqual(_p2.EventId, res1.Records[3].Event.EventId);
-
-			var res2 = ReadIndex.ReadAllEventsForward(res1.PrevPos, 10);
-			Assert.AreEqual(2, res2.Records.Count);
-			Assert.AreEqual(_p5.EventId, res2.Records[0].Event.EventId);
-		}
-
-		[Test]
-		public void all_records_can_be_read_sequentially_page_by_page_in_forward_pass() {
-			var recs = new[] {_p2, _p4, _p1, _p3, _p5, _random1}; // in committed order
-
-			int count = 0;
-			var pos = new TFPos(0, 0);
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsForward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count].EventId, result.Records[0].Event.EventId);
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void all_records_can_be_read_sequentially_page_by_page_in_backward_pass() {
-			var recs = new[] {_random1, _p5, _p3, _p1, _p4, _p2}; // in reverse committed order
-
-			int count = 0;
-			var pos = GetBackwardReadPos();
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsBackward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count].EventId, result.Records[0].Event.EventId);
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void position_returned_for_prev_page_when_traversing_forward_allow_to_traverse_backward_correctly() {
-			var recs = new[] {_p2, _p4, _p1, _p3, _p5, _random1}; // in committed order
-
-			int count = 0;
-			var pos = new TFPos(0, 0);
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsForward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count].EventId, result.Records[0].Event.EventId);
-
-				var localPos = result.PrevPos;
-				int localCount = 0;
-				IndexReadAllResult localResult;
-				while ((localResult = ReadIndex.ReadAllEventsBackward(localPos, 1)).Records.Count != 0) {
-					Assert.AreEqual(1, localResult.Records.Count);
-					Assert.AreEqual(recs[count - 1 - localCount].EventId, localResult.Records[0].Event.EventId);
-					localPos = localResult.NextPos;
-					localCount += 1;
-				}
-
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void position_returned_for_prev_page_when_traversing_backward_allow_to_traverse_forward_correctly() {
-			var recs = new[] {_random1, _p5, _p3, _p1, _p4, _p2}; // in reverse committed order
-
-			int count = 0;
-			var pos = GetBackwardReadPos();
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsBackward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count].EventId, result.Records[0].Event.EventId);
-
-				var localPos = result.PrevPos;
-				int localCount = 0;
-				IndexReadAllResult localResult;
-				while ((localResult = ReadIndex.ReadAllEventsForward(localPos, 1)).Records.Count != 0) {
-					Assert.AreEqual(1, localResult.Records.Count);
-					Assert.AreEqual(recs[count - 1 - localCount].EventId, localResult.Records[0].Event.EventId);
-					localPos = localResult.NextPos;
-					localCount += 1;
-				}
-
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_and_all_events_and_metaevents_are_in_one_chunk.cs b/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_and_all_events_and_metaevents_are_in_one_chunk.cs
deleted file mode 100644
index ea2feb2ee78..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_and_all_events_and_metaevents_are_in_one_chunk.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.Scavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_stream_is_softdeleted_and_temp_and_all_events_and_metaevents_are_in_one_chunk<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator
-				.Chunk(
-					Rec.Prepare(0, "$$test", metadata: new StreamMetadata(tempStream: true)),
-					Rec.Commit(0, "$$test"),
-					Rec.Prepare(1, "test"),
-					Rec.Commit(1, "test"),
-					Rec.Prepare(2, "test"),
-					Rec.Commit(2, "test"),
-					Rec.Prepare(3, "$$test", metadata: new StreamMetadata(truncateBefore: EventNumber.DeletedStream, tempStream: true)),
-					Rec.Commit(3, "$$test"))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
-				return new[] { new ILogRecord[0] };
-			}
-
-			return new[] {
-				new[] {
-					dbResult.Recs[0][0], // "test" created
-				}
-			};
-		}
-
-		[Test]
-		public async Task scavenging_goes_as_expected() {
-			await CheckRecords();
-		}
-
-		[Test]
-		public void the_stream_is_absent_logically() {
-			Assert.AreEqual(ReadEventResult.NoStream, ReadIndex.ReadEvent("test", 0).Result);
-			Assert.AreEqual(ReadStreamResult.NoStream, ReadIndex.ReadStreamEventsForward("test", 0, 100).Result);
-			Assert.AreEqual(ReadStreamResult.NoStream, ReadIndex.ReadStreamEventsBackward("test", -1, 100).Result);
-		}
-
-		[Test]
-		public void the_metastream_is_absent_logically() {
-			Assert.AreEqual(ReadEventResult.NotFound, ReadIndex.ReadEvent("$$test", 0).Result);
-			Assert.AreEqual(ReadStreamResult.Success, ReadIndex.ReadStreamEventsForward("$$test", 0, 100).Result);
-			Assert.AreEqual(ReadStreamResult.Success, ReadIndex.ReadStreamEventsBackward("$$test", -1, 100).Result);
-		}
-
-		[Test]
-		public void the_stream_is_absent_physically() {
-			var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
-			Assert.IsEmpty(ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000).Records
-				.Where(x => x.Event.EventStreamId == "test"));
-			Assert.IsEmpty(ReadIndex.ReadAllEventsBackward(headOfTf, 1000).Records
-				.Where(x => x.Event.EventStreamId == "test"));
-		}
-
-		[Test]
-		public void the_metastream_is_absent_physically() {
-			var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
-			Assert.IsEmpty(ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000).Records
-				.Where(x => x.Event.EventStreamId == "$$test"));
-			Assert.IsEmpty(ReadIndex.ReadAllEventsBackward(headOfTf, 1000).Records
-				.Where(x => x.Event.EventStreamId == "$$test"));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_but_some_events_are_in_multiple_chunks.cs b/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_but_some_events_are_in_multiple_chunks.cs
deleted file mode 100644
index 744821fea36..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_but_some_events_are_in_multiple_chunks.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.Scavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_stream_is_softdeleted_and_temp_but_some_events_are_in_multiple_chunks_2<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator
-				.Chunk(
-					Rec.Prepare(0, "test"),
-					Rec.Commit(0, "test"))
-				.Chunk(
-					Rec.Prepare(1, "test"),
-					Rec.Commit(1, "test"),
-					Rec.Prepare(2, "$$test", metadata: new StreamMetadata(null, null, EventNumber.DeletedStream, true, null, null)),
-					Rec.Commit(2, "$$test"))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
-				return new[] {
-					new ILogRecord[0],
-					new[] {
-						dbResult.Recs[1][0],
-						dbResult.Recs[1][1],
-						dbResult.Recs[1][2],
-						dbResult.Recs[1][3]
-					}
-				};
-			}
-
-			return new[] {
-				new[] {
-					dbResult.Recs[0][0], // "test" created
-				},
-				new[] {
-					dbResult.Recs[1][0],
-					dbResult.Recs[1][1],
-					dbResult.Recs[1][2],
-					dbResult.Recs[1][3]
-				}
-			};
-		}
-
-		[Test]
-		public async Task scavenging_goes_as_expected() {
-			await CheckRecords();
-		}
-
-		[Test]
-		public void the_stream_is_absent_logically() {
-			Assert.AreEqual(ReadEventResult.NoStream, ReadIndex.ReadEvent("test", 0).Result);
-			Assert.AreEqual(ReadStreamResult.NoStream, ReadIndex.ReadStreamEventsForward("test", 0, 100).Result);
-			Assert.AreEqual(ReadStreamResult.NoStream, ReadIndex.ReadStreamEventsBackward("test", -1, 100).Result);
-		}
-
-		[Test]
-		public void the_metastream_is_present_logically() {
-			Assert.AreEqual(ReadEventResult.Success, ReadIndex.ReadEvent("$$test", -1).Result);
-			Assert.AreEqual(ReadStreamResult.Success, ReadIndex.ReadStreamEventsForward("$$test", 0, 100).Result);
-			Assert.AreEqual(1, ReadIndex.ReadStreamEventsForward("$$test", 0, 100).Records.Length);
-			Assert.AreEqual(ReadStreamResult.Success, ReadIndex.ReadStreamEventsBackward("$$test", -1, 100).Result);
-			Assert.AreEqual(1, ReadIndex.ReadStreamEventsBackward("$$test", -1, 100).Records.Length);
-		}
-
-		[Test]
-		public void the_stream_is_present_physically() {
-			var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
-			Assert.AreEqual(1,
-				ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000).Records
-					.Count(x => x.Event.EventStreamId == "test"));
-			Assert.AreEqual(1,
-				ReadIndex.ReadAllEventsBackward(headOfTf, 1000).Records.Count(x => x.Event.EventStreamId == "test"));
-		}
-
-		[Test]
-		public void the_metastream_is_present_physically() {
-			var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
-			Assert.AreEqual(1,
-				ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000).Records
-					.Count(x => x.Event.EventStreamId == "$$test"));
-			Assert.AreEqual(1,
-				ReadIndex.ReadAllEventsBackward(headOfTf, 1000).Records.Count(x => x.Event.EventStreamId == "$$test"));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_but_some_events_are_in_multiple_chunks_2.cs b/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_but_some_events_are_in_multiple_chunks_2.cs
deleted file mode 100644
index 19dfc122319..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_but_some_events_are_in_multiple_chunks_2.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.Scavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_stream_is_softdeleted_and_temp_but_some_events_are_in_multiple_chunks<TLogFormat, TStreamId> :
-			ScavengeTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator
-				.Chunk(
-					Rec.Prepare(0, "test"),
-					Rec.Commit(0, "test"))
-				.Chunk(
-					Rec.Prepare(1, "test"),
-					Rec.Commit(1, "test"),
-					Rec.Prepare(2, "$$test", metadata: new StreamMetadata(null, null, EventNumber.DeletedStream, true, null, null)),
-					Rec.Commit(2, "$$test"))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
-				return new[] {
-					new ILogRecord[0],
-					new[] {
-						dbResult.Recs[1][0],
-						dbResult.Recs[1][1],
-						dbResult.Recs[1][2],
-						dbResult.Recs[1][3]
-					}
-				};
-			}
-
-			return new[] {
-				new[] {
-					dbResult.Recs[0][0], // "test" created
-				},
-				new[] {
-					dbResult.Recs[1][0],
-					dbResult.Recs[1][1],
-					dbResult.Recs[1][2],
-					dbResult.Recs[1][3]
-				}
-			};
-		}
-
-		[Test]
-		public async Task scavenging_goes_as_expected() {
-			await CheckRecords();
-		}
-
-		[Test]
-		public void the_stream_is_absent_logically() {
-			Assert.AreEqual(ReadEventResult.NoStream, ReadIndex.ReadEvent("test", 0).Result);
-			Assert.AreEqual(ReadStreamResult.NoStream, ReadIndex.ReadStreamEventsForward("test", 0, 100).Result);
-			Assert.AreEqual(ReadStreamResult.NoStream, ReadIndex.ReadStreamEventsBackward("test", -1, 100).Result);
-		}
-
-		[Test]
-		public void the_metastream_is_present_logically() {
-			Assert.AreEqual(ReadEventResult.Success, ReadIndex.ReadEvent("$$test", -1).Result);
-			Assert.AreEqual(ReadStreamResult.Success, ReadIndex.ReadStreamEventsForward("$$test", 0, 100).Result);
-			Assert.AreEqual(1, ReadIndex.ReadStreamEventsForward("$$test", 0, 100).Records.Length);
-			Assert.AreEqual(ReadStreamResult.Success, ReadIndex.ReadStreamEventsBackward("$$test", -1, 100).Result);
-			Assert.AreEqual(1, ReadIndex.ReadStreamEventsBackward("$$test", -1, 100).Records.Length);
-		}
-
-		[Test]
-		public void the_stream_is_present_physically() {
-			var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
-			Assert.AreEqual(1,
-				ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000).Records
-					.Count(x => x.Event.EventStreamId == "test"));
-			Assert.AreEqual(1,
-				ReadIndex.ReadAllEventsBackward(headOfTf, 1000).Records.Count(x => x.Event.EventStreamId == "test"));
-		}
-
-		[Test]
-		public void the_metastream_is_present_physically() {
-			var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
-			Assert.AreEqual(1,
-				ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000).Records
-					.Count(x => x.Event.EventStreamId == "$$test"));
-			Assert.AreEqual(1,
-				ReadIndex.ReadAllEventsBackward(headOfTf, 1000).Records.Count(x => x.Event.EventStreamId == "$$test"));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_but_some_metaevents_are_in_multiple_chunks.cs b/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_but_some_metaevents_are_in_multiple_chunks.cs
deleted file mode 100644
index c3d26db172b..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_but_some_metaevents_are_in_multiple_chunks.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.Scavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_stream_is_softdeleted_and_temp_but_some_metaevents_are_in_multiple_chunks<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator
-				.Chunk(
-					Rec.Prepare(0, "$$test", metadata: new StreamMetadata(tempStream: true)),
-					Rec.Commit(0, "$$test"))
-				.Chunk(
-					Rec.Prepare(1, "test"),
-					Rec.Commit(1, "test"),
-					Rec.Prepare(2, "test"),
-					Rec.Commit(2, "test"),
-					Rec.Prepare(3, "$$test", metadata: new StreamMetadata(truncateBefore: EventNumber.DeletedStream, tempStream: true)),
-					Rec.Commit(3, "$$test"))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
-				return new[] {
-					new ILogRecord[0],
-					new[] {
-						dbResult.Recs[1][2],
-						dbResult.Recs[1][3],
-						dbResult.Recs[1][4],
-						dbResult.Recs[1][5]
-					}
-				};
-			}
-
-			return new[] {
-				new[] {
-					dbResult.Recs[0][0], // "test" created
-				},
-				new[] {
-					dbResult.Recs[1][2],
-					dbResult.Recs[1][3],
-					dbResult.Recs[1][4],
-					dbResult.Recs[1][5]
-				}
-			};
-		}
-
-		[Test]
-		public async Task scavenging_goes_as_expected() {
-			await CheckRecords();
-		}
-
-		[Test]
-		public void the_stream_is_absent_logically() {
-			Assert.AreEqual(ReadEventResult.NoStream, ReadIndex.ReadEvent("test", 0).Result);
-			Assert.AreEqual(ReadStreamResult.NoStream, ReadIndex.ReadStreamEventsForward("test", 0, 100).Result);
-			Assert.AreEqual(ReadStreamResult.NoStream, ReadIndex.ReadStreamEventsBackward("test", -1, 100).Result);
-		}
-
-		[Test]
-		public void the_metastream_is_present_logically() {
-			Assert.AreEqual(ReadEventResult.Success, ReadIndex.ReadEvent("$$test", -1).Result);
-			Assert.AreEqual(ReadStreamResult.Success, ReadIndex.ReadStreamEventsForward("$$test", 0, 100).Result);
-			Assert.AreEqual(1, ReadIndex.ReadStreamEventsForward("$$test", 0, 100).Records.Length);
-			Assert.AreEqual(ReadStreamResult.Success, ReadIndex.ReadStreamEventsBackward("$$test", -1, 100).Result);
-			Assert.AreEqual(1, ReadIndex.ReadStreamEventsBackward("$$test", -1, 100).Records.Length);
-		}
-
-		[Test]
-		public void the_stream_is_present_physically() {
-			var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
-			Assert.AreEqual(1,
-				ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000).Records
-					.Count(x => x.Event.EventStreamId == "test"));
-			Assert.AreEqual(1,
-				ReadIndex.ReadAllEventsBackward(headOfTf, 1000).Records.Count(x => x.Event.EventStreamId == "test"));
-		}
-
-		[Test]
-		public void the_metastream_is_present_physically() {
-			var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
-			Assert.AreEqual(1,
-				ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000).Records
-					.Count(x => x.Event.EventStreamId == "$$test"));
-			Assert.AreEqual(1,
-				ReadIndex.ReadAllEventsBackward(headOfTf, 1000).Records.Count(x => x.Event.EventStreamId == "$$test"));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_with_log_version_0_but_some_events_are_in_multiple_chunks.cs b/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_with_log_version_0_but_some_events_are_in_multiple_chunks.cs
deleted file mode 100644
index bc434e2d355..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_with_log_version_0_but_some_events_are_in_multiple_chunks.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.Scavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "No such thing as a V0 prepare in LogV3")]
-	public class
-		when_stream_is_softdeleted_and_temp_with_log_version_0_but_some_events_are_in_multiple_chunks<TLogFormat, TStreamId> :
-			ScavengeTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			var version = LogRecordVersion.LogRecordV0;
-			return dbCreator.Chunk(Rec.Prepare(0, "test", version: version),
-					Rec.Commit(0, "test", version: version))
-				.Chunk(Rec.Prepare(1, "test", version: version),
-					Rec.Commit(1, "test", version: version),
-					Rec.Prepare(2, "$$test", metadata: new StreamMetadata(null, null, int.MaxValue, true, null, null),
-						version: version),
-					Rec.Commit(2, "$$test", version: version))
-				.Chunk(
-					Rec.Prepare(3, "random",
-						version: version), // Need an incomplete chunk to ensure writer checkpoints are correct
-					Rec.Commit(3, "random", version: version))
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			return new[] {
-				new ILogRecord[0],
-				new[] {
-					dbResult.Recs[1][0],
-					dbResult.Recs[1][1],
-					dbResult.Recs[1][2],
-					dbResult.Recs[1][3]
-				},
-				new[] {
-					dbResult.Recs[2][0],
-					dbResult.Recs[2][1]
-				}
-			};
-		}
-
-		[Test]
-		public async Task scavenging_goes_as_expected() {
-			await CheckRecords();
-		}
-
-		[Test]
-		public void the_stream_is_absent_logically() {
-			Assert.AreEqual(ReadStreamResult.NoStream, ReadIndex.ReadStreamEventsForward("test", 0, 100).Result,
-				"Read test stream forward");
-			Assert.AreEqual(ReadStreamResult.NoStream, ReadIndex.ReadStreamEventsBackward("test", -1, 100).Result,
-				"Read test stream backward");
-			Assert.AreEqual(ReadEventResult.NoStream, ReadIndex.ReadEvent("test", 0).Result,
-				"Read single event from test stream");
-		}
-
-		[Test]
-		public void the_metastream_is_present_logically() {
-			Assert.AreEqual(ReadEventResult.Success, ReadIndex.ReadEvent("$$test", -1).Result);
-			Assert.AreEqual(ReadStreamResult.Success, ReadIndex.ReadStreamEventsForward("$$test", 0, 100).Result);
-			Assert.AreEqual(1, ReadIndex.ReadStreamEventsForward("$$test", 0, 100).Records.Length);
-			Assert.AreEqual(ReadStreamResult.Success, ReadIndex.ReadStreamEventsBackward("$$test", -1, 100).Result);
-			Assert.AreEqual(1, ReadIndex.ReadStreamEventsBackward("$$test", -1, 100).Records.Length);
-		}
-
-		[Test]
-		public void the_stream_is_present_physically() {
-			var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
-			Assert.AreEqual(1,
-				ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000).Records
-					.Count(x => x.Event.EventStreamId == "test"));
-			Assert.AreEqual(1,
-				ReadIndex.ReadAllEventsBackward(headOfTf, 1000).Records.Count(x => x.Event.EventStreamId == "test"));
-		}
-
-		[Test]
-		public void the_metastream_is_present_physically() {
-			var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
-			Assert.AreEqual(1,
-				ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000).Records
-					.Count(x => x.Event.EventStreamId == "$$test"), "Read $$test stream forward");
-			Assert.AreEqual(1,
-				ReadIndex.ReadAllEventsBackward(headOfTf, 10).Records.Count(x => x.Event.EventStreamId == "$$test"),
-				"Read $$test stream backward");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_with_log_record_version_0.cs b/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_with_log_record_version_0.cs
deleted file mode 100644
index 86aab6146eb..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_with_log_record_version_0.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.Scavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "No such thing as a V0 prepare in LogV3")]
-	public class when_stream_is_softdeleted_with_log_record_version_0<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator.Chunk(
-					Rec.Prepare(0, "$$test", metadata: new StreamMetadata(tempStream: true),
-						version: LogRecordVersion.LogRecordV0),
-					Rec.Commit(0, "$$test", version: LogRecordVersion.LogRecordV0),
-					Rec.Prepare(1, "test", version: LogRecordVersion.LogRecordV0),
-					Rec.Commit(1, "test", version: LogRecordVersion.LogRecordV0),
-					Rec.Prepare(2, "test", version: LogRecordVersion.LogRecordV0),
-					Rec.Commit(2, "test", version: LogRecordVersion.LogRecordV0),
-					Rec.Prepare(3, "$$test",
-						metadata: new StreamMetadata(truncateBefore: int.MaxValue, tempStream: true),
-						version: LogRecordVersion.LogRecordV0),
-					Rec.Commit(3, "$$test", version: LogRecordVersion.LogRecordV0))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			return new[] { new ILogRecord[0] };
-		}
-
-		[Test]
-		public async Task scavenging_goes_as_expected() {
-			await CheckRecords();
-		}
-
-		[Test]
-		public void the_stream_is_absent_logically() {
-			Assert.AreEqual(ReadEventResult.NoStream, ReadIndex.ReadEvent("test", 0).Result);
-			Assert.AreEqual(ReadStreamResult.NoStream, ReadIndex.ReadStreamEventsForward("test", 0, 100).Result);
-			Assert.AreEqual(ReadStreamResult.NoStream, ReadIndex.ReadStreamEventsBackward("test", -1, 100).Result);
-		}
-
-		[Test]
-		public void the_metastream_is_absent_logically() {
-			Assert.AreEqual(ReadEventResult.NotFound, ReadIndex.ReadEvent("$$test", 0).Result);
-			Assert.AreEqual(ReadStreamResult.Success, ReadIndex.ReadStreamEventsForward("$$test", 0, 100).Result);
-			Assert.AreEqual(ReadStreamResult.Success, ReadIndex.ReadStreamEventsBackward("$$test", -1, 100).Result);
-		}
-
-		[Test]
-		public void the_stream_is_absent_physically() {
-			var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
-			Assert.IsEmpty(ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000).Records
-				.Where(x => x.Event.EventStreamId == "test"));
-			Assert.IsEmpty(ReadIndex.ReadAllEventsBackward(headOfTf, 1000).Records
-				.Where(x => x.Event.EventStreamId == "test"));
-		}
-
-		[Test]
-		public void the_metastream_is_absent_physically() {
-			var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
-			Assert.IsEmpty(ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000).Records
-				.Where(x => x.Event.EventStreamId == "$$test"));
-			Assert.IsEmpty(ReadIndex.ReadAllEventsBackward(headOfTf, 1000).Records
-				.Where(x => x.Event.EventStreamId == "$$test"));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_with_mixed_log_record_version_0_and_version_1.cs b/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_with_mixed_log_record_version_0_and_version_1.cs
deleted file mode 100644
index bde7ad1ba59..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_with_mixed_log_record_version_0_and_version_1.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.Scavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "No such thing as a V0 prepare in LogV3")]
-	public class when_stream_is_softdeleted_with_mixed_log_record_version_0_and_version_1<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		private const string _deletedStream = "test";
-		private const string _deletedMetaStream = "$$test";
-		private const string _keptStream = "other";
-
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator.Chunk(
-					Rec.Prepare(0, _deletedMetaStream, metadata: new StreamMetadata(tempStream: true),
-						version: LogRecordVersion.LogRecordV0),
-					Rec.Commit(0, _deletedMetaStream, version: LogRecordVersion.LogRecordV0),
-					Rec.Prepare(1, _keptStream, version: LogRecordVersion.LogRecordV1),
-					Rec.Commit(1, _keptStream, version: LogRecordVersion.LogRecordV1),
-					Rec.Prepare(2, _keptStream, version: LogRecordVersion.LogRecordV0),
-					Rec.Commit(2, _keptStream, version: LogRecordVersion.LogRecordV0),
-					Rec.Prepare(3, _deletedStream, version: LogRecordVersion.LogRecordV1),
-					Rec.Commit(3, _deletedStream, version: LogRecordVersion.LogRecordV0),
-					Rec.Prepare(4, _deletedStream, version: LogRecordVersion.LogRecordV0),
-					Rec.Commit(4, _deletedStream, version: LogRecordVersion.LogRecordV1),
-					Rec.Prepare(5, _keptStream, version: LogRecordVersion.LogRecordV1),
-					Rec.Commit(5, _keptStream, version: LogRecordVersion.LogRecordV1),
-					Rec.Prepare(6, _deletedMetaStream,
-						metadata: new StreamMetadata(truncateBefore: EventNumber.DeletedStream, tempStream: true),
-						version: LogRecordVersion.LogRecordV1),
-					Rec.Commit(6, _deletedMetaStream, version: LogRecordVersion.LogRecordV0))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			return new[] {
-				new[] {
-					dbResult.Recs[0][2],
-					dbResult.Recs[0][3],
-					dbResult.Recs[0][4],
-					dbResult.Recs[0][5],
-					dbResult.Recs[0][10],
-					dbResult.Recs[0][11]
-				}
-			};
-		}
-
-		[Test]
-		public async Task scavenging_goes_as_expected() {
-			await CheckRecords();
-		}
-
-		[Test]
-		public void the_stream_is_absent_logically() {
-			Assert.AreEqual(ReadEventResult.NoStream, ReadIndex.ReadEvent(_deletedStream, 0).Result);
-			Assert.AreEqual(ReadStreamResult.NoStream,
-				ReadIndex.ReadStreamEventsForward(_deletedStream, 0, 100).Result);
-			Assert.AreEqual(ReadStreamResult.NoStream,
-				ReadIndex.ReadStreamEventsBackward(_deletedStream, -1, 100).Result);
-		}
-
-		[Test]
-		public void the_metastream_is_absent_logically() {
-			Assert.AreEqual(ReadEventResult.NotFound, ReadIndex.ReadEvent(_deletedMetaStream, 0).Result);
-			Assert.AreEqual(ReadStreamResult.Success,
-				ReadIndex.ReadStreamEventsForward(_deletedMetaStream, 0, 100).Result);
-			Assert.AreEqual(ReadStreamResult.Success,
-				ReadIndex.ReadStreamEventsBackward(_deletedMetaStream, -1, 100).Result);
-		}
-
-		[Test]
-		public void the_stream_is_absent_physically() {
-			var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
-			Assert.IsEmpty(ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000).Records
-				.Where(x => x.Event.EventStreamId == _deletedStream));
-			Assert.IsEmpty(ReadIndex.ReadAllEventsBackward(headOfTf, 1000).Records
-				.Where(x => x.Event.EventStreamId == _deletedStream));
-		}
-
-		[Test]
-		public void the_metastream_is_absent_physically() {
-			var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
-			Assert.IsEmpty(ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000).Records
-				.Where(x => x.Event.EventStreamId == _deletedMetaStream));
-			Assert.IsEmpty(ReadIndex.ReadAllEventsBackward(headOfTf, 1000).Records
-				.Where(x => x.Event.EventStreamId == _deletedMetaStream));
-		}
-
-		[Test]
-		public void the_kept_stream_is_present() {
-			Assert.AreEqual(ReadEventResult.Success, ReadIndex.ReadEvent(_keptStream, 0).Result);
-			Assert.AreEqual(ReadStreamResult.Success, ReadIndex.ReadStreamEventsForward(_keptStream, 0, 100).Result);
-			Assert.AreEqual(ReadStreamResult.Success, ReadIndex.ReadStreamEventsBackward(_keptStream, -1, 100).Result);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_writing_delete_prepare_without_commit_on_stream_spanning_through_2_chunks_in_db_with_2_chunks.cs b/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_writing_delete_prepare_without_commit_on_stream_spanning_through_2_chunks_in_db_with_2_chunks.cs
deleted file mode 100644
index f2fca52c102..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Scavenge/when_writing_delete_prepare_without_commit_on_stream_spanning_through_2_chunks_in_db_with_2_chunks.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.Scavenge {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_writing_delete_prepare_without_commit_and_scavenging<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _event0;
-		private EventRecord _event1;
-
-		protected override void WriteTestScenario() {
-			_event0 = WriteSingleEvent("ES", 0, "bla1");
-			GetOrReserve("ES", out var esStreamId, out var pos);
-			GetOrReserveEventType(SystemEventTypes.StreamDeleted, out var streamDeletedEventTypeId, out pos);
-			var prepare = LogRecord.DeleteTombstone(_recordFactory, pos, Guid.NewGuid(), Guid.NewGuid(),
-				esStreamId, streamDeletedEventTypeId, 2);
-			Assert.IsTrue(Writer.Write(prepare, out pos));
-
-			_event1 = WriteSingleEvent("ES", 1, "bla1");
-			Scavenge(completeLast: false, mergeChunks: false);
-		}
-
-		[Test]
-		public void read_one_by_one_returns_all_commited_events() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_event0, result.Record);
-
-			result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_event1, result.Record);
-		}
-
-		[Test]
-		public void read_stream_events_forward_should_return_all_events() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_event0, result.Records[0]);
-			Assert.AreEqual(_event1, result.Records[1]);
-		}
-
-		[Test]
-		public void read_stream_events_backward_should_return_stream_deleted() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_event1, result.Records[0]);
-			Assert.AreEqual(_event0, result.Records[1]);
-		}
-
-		[Test]
-		public void read_all_forward_returns_all_events() {
-			var events = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(2, events.Length);
-			Assert.AreEqual(_event0, events[0]);
-			Assert.AreEqual(_event1, events[1]);
-		}
-
-		[Test]
-		public void read_all_backward_returns_all_events() {
-			var events = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(2, events.Length);
-			Assert.AreEqual(_event1, events[0]);
-			Assert.AreEqual(_event0, events[1]);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/SimpleDbTestScenario.cs b/src/EventStore.Core.Tests/Services/Storage/SimpleDbTestScenario.cs
deleted file mode 100644
index 74171c937bc..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/SimpleDbTestScenario.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Caching;
-using EventStore.Core.DataStructures;
-using EventStore.Core.Index;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Metrics;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.Util;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage {
-	[TestFixture]
-	public abstract class SimpleDbTestScenario<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		protected readonly int MaxEntriesInMemTable;
-		protected LogFormatAbstractor<TStreamId> _logFormat;
-		protected TableIndex<TStreamId> TableIndex;
-		protected IReadIndex<TStreamId> ReadIndex;
-
-		protected DbResult DbRes;
-
-		protected abstract DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator);
-
-		private readonly long _metastreamMaxCount;
-
-		protected SimpleDbTestScenario(int maxEntriesInMemTable = 20, long metastreamMaxCount = 1) {
-			Ensure.Positive(maxEntriesInMemTable, "maxEntriesInMemTable");
-			MaxEntriesInMemTable = maxEntriesInMemTable;
-			_metastreamMaxCount = metastreamMaxCount;
-		}
-
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var indexDirectory = GetFilePathFor("index");
-			_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
-				IndexDirectory = indexDirectory,
-			});
-
-			var dbConfig = TFChunkHelper.CreateSizedDbConfig(PathName, 0, chunkSize: 1024 * 1024);
-			var dbCreationHelper = new TFChunkDbCreationHelper<TLogFormat, TStreamId>(dbConfig, _logFormat);
-
-			DbRes = CreateDb(dbCreationHelper);
-
-			DbRes.Db.Config.WriterCheckpoint.Flush();
-			DbRes.Db.Config.ChaserCheckpoint.Write(DbRes.Db.Config.WriterCheckpoint.Read());
-			DbRes.Db.Config.ChaserCheckpoint.Flush();
-
-			var readers = new ObjectPool<ITransactionFileReader>(
-				"Readers", 2, 2, () => new TFChunkReader(DbRes.Db, DbRes.Db.Config.WriterCheckpoint));
-
-			var lowHasher = _logFormat.LowHasher;
-			var highHasher = _logFormat.HighHasher;
-			var emptyStreamId = _logFormat.EmptyStreamId;
-			TableIndex = new TableIndex<TStreamId>(indexDirectory, lowHasher, highHasher, emptyStreamId,
-				() => new HashListMemTable(PTableVersions.IndexV2, MaxEntriesInMemTable * 2),
-				() => new TFReaderLease(readers),
-				PTableVersions.IndexV2,
-				int.MaxValue,
-				Constants.PTableMaxReaderCountDefault,
-				MaxEntriesInMemTable);
-			_logFormat.StreamNamesProvider.SetTableIndex(TableIndex);
-
-			var readIndex = new ReadIndex<TStreamId>(new NoopPublisher(),
-				readers,
-				TableIndex,
-				_logFormat.StreamNameIndexConfirmer,
-				_logFormat.StreamIds,
-				_logFormat.StreamNamesProvider,
-				_logFormat.EmptyStreamId,
-				_logFormat.StreamIdValidator,
-				_logFormat.StreamIdSizer,
-				_logFormat.StreamExistenceFilter,
-				_logFormat.StreamExistenceFilterReader,
-				_logFormat.EventTypeIndexConfirmer,
-				new NoLRUCache<TStreamId, IndexBackend<TStreamId>.EventNumberCached>(),
-				new NoLRUCache<TStreamId, IndexBackend<TStreamId>.MetadataCached>(),
-				additionalCommitChecks: true,
-				metastreamMaxCount: _metastreamMaxCount,
-				hashCollisionReadLimit: Opts.HashCollisionReadLimitDefault,
-				skipIndexScanOnReads: Opts.SkipIndexScanOnReadsDefault,
-				replicationCheckpoint: DbRes.Db.Config.ReplicationCheckpoint,
-				indexCheckpoint: DbRes.Db.Config.IndexCheckpoint,
-				indexStatusTracker: new IndexStatusTracker.NoOp(),
-				indexTracker: new IndexTracker.NoOp(),
-				cacheTracker: new CacheHitsMissesTracker.NoOp());
-
-			readIndex.IndexCommitter.Init(DbRes.Db.Config.ChaserCheckpoint.Read());
-			ReadIndex = readIndex;
-		}
-
-		public override Task TestFixtureTearDown() {
-			_logFormat?.Dispose();
-			DbRes.Db.Close();
-
-			return base.TestFixtureTearDown();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Transactions/when_having_multievent_sequential_write_request_read_index_should.cs b/src/EventStore.Core.Tests/Services/Storage/Transactions/when_having_multievent_sequential_write_request_read_index_should.cs
deleted file mode 100644
index 6242b58eda6..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Transactions/when_having_multievent_sequential_write_request_read_index_should.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.Transactions {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class when_having_multievent_sequential_write_request_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _p1;
-		private EventRecord _p2;
-		private EventRecord _p3;
-
-		protected override void WriteTestScenario() {
-			_p1 = WriteTransactionBegin("ES", ExpectedVersion.NoStream, 0, "test1");
-			_p2 = WriteTransactionEvent(_p1.CorrelationId, _p1.LogPosition, 1, _p1.EventStreamId, 1, "test2",
-				PrepareFlags.Data);
-			_p3 = WriteTransactionEvent(_p1.CorrelationId, _p1.LogPosition, 2, _p1.EventStreamId, 2, "test3",
-				PrepareFlags.TransactionEnd | PrepareFlags.Data);
-
-			WriteCommit(_p1.CorrelationId, _p1.LogPosition, _p1.EventStreamId, _p1.EventNumber);
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_stream() {
-			Assert.AreEqual(2, ReadIndex.GetStreamLastEventNumber("ES"));
-		}
-
-		[Test]
-		public void return_correct_first_record_for_stream() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p1, result.Record);
-		}
-
-		[Test]
-		public void return_correct_second_record_for_stream() {
-			var result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p2, result.Record);
-		}
-
-		[Test]
-		public void return_correct_third_record_for_stream() {
-			var result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p3, result.Record);
-		}
-
-		[Test]
-		public void not_find_record_with_nonexistent_version() {
-			var result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 3);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_p1, result.Records[0]);
-			Assert.AreEqual(_p2, result.Records[1]);
-			Assert.AreEqual(_p3, result.Records[2]);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_stream_with_specific_event_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", 2, 3);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_p3, result.Records[0]);
-			Assert.AreEqual(_p2, result.Records[1]);
-			Assert.AreEqual(_p1, result.Records[2]);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_stream_with_from_end_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 3);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_p3, result.Records[0]);
-			Assert.AreEqual(_p2, result.Records[1]);
-			Assert.AreEqual(_p1, result.Records[2]);
-		}
-
-		[Test]
-		public void read_all_events_forward_returns_all_events_in_correct_order() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10).Records;
-
-			Assert.AreEqual(3, records.Count);
-			Assert.AreEqual(_p1, records[0].Event);
-			Assert.AreEqual(_p2, records[1].Event);
-			Assert.AreEqual(_p3, records[2].Event);
-		}
-
-		[Test]
-		public void read_all_events_backward_returns_all_events_in_correct_order() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100).Records;
-
-			Assert.AreEqual(3, records.Count);
-			Assert.AreEqual(_p1, records[2].Event);
-			Assert.AreEqual(_p2, records[1].Event);
-			Assert.AreEqual(_p3, records[0].Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_and_some_uncommited_prepares_in_the_end_read_index_should.cs b/src/EventStore.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_and_some_uncommited_prepares_in_the_end_read_index_should.cs
deleted file mode 100644
index 225f96da755..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_and_some_uncommited_prepares_in_the_end_read_index_should.cs
+++ /dev/null
@@ -1,298 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.Transactions {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class
-		when_having_two_intermingled_transactions_and_some_uncommited_prepares_in_the_end_read_index_should<TLogFormat, TStreamId> :
-			ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _p1;
-		private EventRecord _p2;
-		private EventRecord _p3;
-		private EventRecord _p4;
-		private EventRecord _p5;
-
-		private long _pos6, _pos7, _pos8;
-
-		private long _t1CommitPos;
-		private long _t2CommitPos;
-
-		protected override void WriteTestScenario() {
-			const string streamId1 = "ES";
-			const string streamId2 = "ABC";
-			var t1 = WriteTransactionBegin(streamId1, ExpectedVersion.NoStream);
-			var t2 = WriteTransactionBegin(streamId2, ExpectedVersion.NoStream);
-
-			_p1 = WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 0, streamId1, 0, "es1",
-				PrepareFlags.Data);
-			_p2 = WriteTransactionEvent(t2.CorrelationId, t2.LogPosition, 0, streamId2, 0, "abc1",
-				PrepareFlags.Data);
-			_p3 = WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 1, streamId1, 1, "es1",
-				PrepareFlags.Data);
-			_p4 = WriteTransactionEvent(t2.CorrelationId, t2.LogPosition, 1, streamId2, 1, "abc1",
-				PrepareFlags.Data);
-			_p5 = WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 2, streamId1, 2, "es1",
-				PrepareFlags.Data);
-
-			WriteTransactionEnd(t2.CorrelationId, t2.TransactionPosition, streamId2);
-			WriteTransactionEnd(t1.CorrelationId, t1.TransactionPosition, streamId1);
-
-			_t2CommitPos = WriteCommit(t2.CorrelationId, t2.TransactionPosition, streamId2, _p2.EventNumber);
-			_t1CommitPos = WriteCommit(t1.CorrelationId, t1.TransactionPosition, streamId1, _p1.EventNumber);
-
-			GetOrReserve("t1", out var t1StreamId, out _pos6);
-			GetOrReserveEventType("et", out var eventTypeId, out _pos6);
-			var r6 = LogRecord.Prepare(_recordFactory, _pos6, Guid.NewGuid(), Guid.NewGuid(), _pos6, 0, t1StreamId, -1,
-				PrepareFlags.SingleWrite, eventTypeId, LogRecord.NoData, LogRecord.NoData);
-			Writer.Write(r6, out _pos7);
-			var r7 = LogRecord.Prepare(_recordFactory, _pos7, Guid.NewGuid(), Guid.NewGuid(), _pos7, 0, t1StreamId, -1,
-				PrepareFlags.SingleWrite, eventTypeId, LogRecord.NoData, LogRecord.NoData);
-			Writer.Write(r7, out _pos8);
-			var r8 = LogRecord.Prepare(_recordFactory, _pos8, Guid.NewGuid(), Guid.NewGuid(), _pos8, 0, t1StreamId, -1,
-				PrepareFlags.SingleWrite, eventTypeId, LogRecord.NoData, LogRecord.NoData);
-			long pos9;
-			Writer.Write(r8, out pos9);
-		}
-
-		[Test]
-		public void read_all_events_forward_returns_all_events_in_correct_order() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10).Records;
-
-			Assert.AreEqual(5, records.Count);
-			Assert.AreEqual(_p2, records[0].Event);
-			Assert.AreEqual(_p4, records[1].Event);
-			Assert.AreEqual(_p1, records[2].Event);
-			Assert.AreEqual(_p3, records[3].Event);
-			Assert.AreEqual(_p5, records[4].Event);
-		}
-
-		[Test]
-		public void read_all_events_backward_returns_all_events_in_correct_order() {
-			var records = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 10).Records;
-
-			Assert.AreEqual(5, records.Count);
-			Assert.AreEqual(_p5, records[0].Event);
-			Assert.AreEqual(_p3, records[1].Event);
-			Assert.AreEqual(_p1, records[2].Event);
-			Assert.AreEqual(_p4, records[3].Event);
-			Assert.AreEqual(_p2, records[4].Event);
-		}
-
-		[Test]
-		public void
-			read_all_events_forward_returns_nothing_when_prepare_position_is_greater_than_last_prepare_in_commit() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(_t1CommitPos, _t1CommitPos), 10).Records;
-			Assert.AreEqual(0, records.Count);
-		}
-
-		[Test]
-		public void
-			read_all_events_backwards_returns_nothing_when_prepare_position_is_smaller_than_first_prepare_in_commit() {
-			var records = ReadIndex.ReadAllEventsBackward(new TFPos(_t2CommitPos, 0), 10).Records;
-			Assert.AreEqual(0, records.Count);
-		}
-
-		[Test]
-		public void read_all_events_forward_returns_correct_events_starting_in_the_middle_of_tf() {
-			var res1 = ReadIndex.ReadAllEventsForward(new TFPos(_t2CommitPos, _p4.LogPosition), 10);
-
-			Assert.AreEqual(4, res1.Records.Count);
-			Assert.AreEqual(_p4, res1.Records[0].Event);
-			Assert.AreEqual(_p1, res1.Records[1].Event);
-			Assert.AreEqual(_p3, res1.Records[2].Event);
-			Assert.AreEqual(_p5, res1.Records[3].Event);
-
-			var res2 = ReadIndex.ReadAllEventsBackward(res1.PrevPos, 10);
-			Assert.AreEqual(1, res2.Records.Count);
-			Assert.AreEqual(_p2, res2.Records[0].Event);
-		}
-
-		[Test]
-		public void read_all_events_backward_returns_correct_events_starting_in_the_middle_of_tf() {
-			var pos = new TFPos(_pos6, _p4.LogPosition); // p3 post-pos
-			var res1 = ReadIndex.ReadAllEventsBackward(pos, 10);
-
-			Assert.AreEqual(4, res1.Records.Count);
-			Assert.AreEqual(_p3, res1.Records[0].Event);
-			Assert.AreEqual(_p1, res1.Records[1].Event);
-			Assert.AreEqual(_p4, res1.Records[2].Event);
-			Assert.AreEqual(_p2, res1.Records[3].Event);
-
-			var res2 = ReadIndex.ReadAllEventsForward(res1.PrevPos, 10);
-			Assert.AreEqual(1, res2.Records.Count);
-			Assert.AreEqual(_p5, res2.Records[0].Event);
-		}
-
-		[Test]
-		public void all_records_can_be_read_sequentially_page_by_page_in_forward_pass() {
-			var recs = new[] {_p2, _p4, _p1, _p3, _p5}; // in committed order
-
-			int count = 0;
-			var pos = new TFPos(0, 0);
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsForward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void all_records_can_be_read_sequentially_page_by_page_in_backward_pass() {
-			var recs = new[] {_p5, _p3, _p1, _p4, _p2}; // in reverse committed order
-
-			int count = 0;
-			var pos = GetBackwardReadPos();
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsBackward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void position_returned_for_prev_page_when_traversing_forward_allow_to_traverse_backward_correctly() {
-			var recs = new[] {_p2, _p4, _p1, _p3, _p5}; // in committed order
-
-			int count = 0;
-			var pos = new TFPos(0, 0);
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsForward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-
-				var localPos = result.PrevPos;
-				int localCount = 0;
-				IndexReadAllResult localResult;
-				while ((localResult = ReadIndex.ReadAllEventsBackward(localPos, 1)).Records.Count != 0) {
-					Assert.AreEqual(1, localResult.Records.Count);
-					Assert.AreEqual(recs[count - 1 - localCount], localResult.Records[0].Event);
-					localPos = localResult.NextPos;
-					localCount += 1;
-				}
-
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void position_returned_for_prev_page_when_traversing_backward_allow_to_traverse_forward_correctly() {
-			var recs = new[] {_p5, _p3, _p1, _p4, _p2}; // in reverse committed order
-
-			int count = 0;
-			var pos = GetBackwardReadPos();
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsBackward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-
-				var localPos = result.PrevPos;
-				int localCount = 0;
-				IndexReadAllResult localResult;
-				while ((localResult = ReadIndex.ReadAllEventsForward(localPos, 1)).Records.Count != 0) {
-					Assert.AreEqual(1, localResult.Records.Count);
-					Assert.AreEqual(recs[count - 1 - localCount], localResult.Records[0].Event);
-					localPos = localResult.NextPos;
-					localCount += 1;
-				}
-
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void
-			reading_all_forward_at_position_with_no_commits_after_returns_prev_pos_that_allows_to_traverse_back() {
-			var res1 = ReadIndex.ReadAllEventsForward(new TFPos(_pos6, 0), 100);
-			Assert.AreEqual(0, res1.Records.Count);
-
-			var recs = new[] {_p5, _p3, _p1, _p4, _p2}; // in reverse committed order
-			int count = 0;
-			IndexReadAllResult result;
-			TFPos pos = res1.PrevPos;
-			while ((result = ReadIndex.ReadAllEventsBackward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void reading_all_forward_at_the_very_end_returns_prev_pos_that_allows_to_traverse_back() {
-			var res1 = ReadIndex.ReadAllEventsForward(new TFPos(Db.Config.WriterCheckpoint.Read(), 0), 100);
-			Assert.AreEqual(0, res1.Records.Count);
-
-			var recs = new[] {_p5, _p3, _p1, _p4, _p2}; // in reverse committed order
-			int count = 0;
-			IndexReadAllResult result;
-			TFPos pos = res1.PrevPos;
-			while ((result = ReadIndex.ReadAllEventsBackward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void
-			reading_all_backward_at_position_with_no_commits_before_returns_prev_pos_that_allows_to_traverse_forward() {
-			var res1 = ReadIndex.ReadAllEventsBackward(new TFPos(_t2CommitPos, int.MaxValue), 100);
-			Assert.AreEqual(0, res1.Records.Count);
-
-			var recs = new[] {_p2, _p4, _p1, _p3, _p5};
-			int count = 0;
-			IndexReadAllResult result;
-			TFPos pos = res1.PrevPos;
-			while ((result = ReadIndex.ReadAllEventsForward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void reading_all_backward_at_the_very_beginning_returns_prev_pos_that_allows_to_traverse_forward() {
-			var res1 = ReadIndex.ReadAllEventsBackward(new TFPos(0, int.MaxValue), 100);
-			Assert.AreEqual(0, res1.Records.Count);
-
-			var recs = new[] {_p2, _p4, _p1, _p3, _p5};
-			int count = 0;
-			IndexReadAllResult result;
-			TFPos pos = res1.PrevPos;
-			while ((result = ReadIndex.ReadAllEventsForward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_and_some_uncommited_prepares_spanning_few_chunks_read_index_should.cs b/src/EventStore.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_and_some_uncommited_prepares_spanning_few_chunks_read_index_should.cs
deleted file mode 100644
index d2bd47b826c..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_and_some_uncommited_prepares_spanning_few_chunks_read_index_should.cs
+++ /dev/null
@@ -1,300 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage.Transactions {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class
-		when_having_two_intermingled_transactions_and_some_uncommited_prepares_spanning_few_chunks_read_index_should<TLogFormat, TStreamId> :
-			ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _p1;
-		private EventRecord _p2;
-		private EventRecord _p3;
-		private EventRecord _p4;
-		private EventRecord _p5;
-
-		private long _pos6, _pos7, _pos8;
-
-		private long _t1CommitPos;
-		private long _t2CommitPos;
-
-		protected override void WriteTestScenario() {
-			const string streamId1 = "ES";
-			const string streamId2 = "ABC";
-
-			var t1 = WriteTransactionBegin(streamId1, ExpectedVersion.NoStream);
-			var t2 = WriteTransactionBegin(streamId2, ExpectedVersion.NoStream);
-
-			_p1 = WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 0, streamId1, 0,
-				"es1" + new string('.', 3000), PrepareFlags.Data);
-			_p2 = WriteTransactionEvent(t2.CorrelationId, t2.LogPosition, 0, streamId2, 0,
-				"abc1" + new string('.', 3000), PrepareFlags.Data);
-			_p3 = WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 1, streamId1, 1,
-				"es1" + new string('.', 3000), PrepareFlags.Data);
-			_p4 = WriteTransactionEvent(t2.CorrelationId, t2.LogPosition, 1, streamId2, 1,
-				"abc1" + new string('.', 3000), PrepareFlags.Data, retryOnFail: true);
-			_p5 = WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 2, streamId1, 2,
-				"es1" + new string('.', 3000), PrepareFlags.Data);
-
-			WriteTransactionEnd(t2.CorrelationId, t2.TransactionPosition, streamId2);
-			WriteTransactionEnd(t1.CorrelationId, t1.TransactionPosition, streamId1);
-
-			_t2CommitPos = WriteCommit(t2.CorrelationId, t2.TransactionPosition, streamId2, _p2.EventNumber);
-			_t1CommitPos = WriteCommit(t1.CorrelationId, t1.TransactionPosition, streamId1, _p1.EventNumber);
-
-			GetOrReserve("t1", out var t1StreamId, out _pos6);
-			GetOrReserveEventType("et", out var eventTypeId, out _pos6);
-			var r6 = LogRecord.Prepare(_recordFactory, _pos6, Guid.NewGuid(), Guid.NewGuid(), _pos6, 0, t1StreamId, -1,
-				PrepareFlags.SingleWrite, eventTypeId, LogRecord.NoData, LogRecord.NoData);
-			Writer.Write(r6, out _pos7);
-			var r7 = LogRecord.Prepare(_recordFactory, _pos7, Guid.NewGuid(), Guid.NewGuid(), _pos7, 0, t1StreamId, -1,
-				PrepareFlags.SingleWrite, eventTypeId, LogRecord.NoData, LogRecord.NoData);
-			Writer.Write(r7, out _pos8);
-			var r8 = LogRecord.Prepare(_recordFactory, _pos8, Guid.NewGuid(), Guid.NewGuid(), _pos8, 0, t1StreamId, -1,
-				PrepareFlags.SingleWrite, eventTypeId, LogRecord.NoData, LogRecord.NoData);
-			long pos9;
-			Writer.Write(r8, out pos9);
-		}
-
-		[Test]
-		public void read_all_events_forward_returns_all_events_in_correct_order() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10).Records;
-
-			Assert.AreEqual(5, records.Count);
-			Assert.AreEqual(_p2, records[0].Event);
-			Assert.AreEqual(_p4, records[1].Event);
-			Assert.AreEqual(_p1, records[2].Event);
-			Assert.AreEqual(_p3, records[3].Event);
-			Assert.AreEqual(_p5, records[4].Event);
-		}
-
-		[Test]
-		public void read_all_events_backward_returns_all_events_in_correct_order() {
-			var pos = GetBackwardReadPos();
-			var records = ReadIndex.ReadAllEventsBackward(pos, 10).Records;
-
-			Assert.AreEqual(5, records.Count);
-			Assert.AreEqual(_p5, records[0].Event);
-			Assert.AreEqual(_p3, records[1].Event);
-			Assert.AreEqual(_p1, records[2].Event);
-			Assert.AreEqual(_p4, records[3].Event);
-			Assert.AreEqual(_p2, records[4].Event);
-		}
-
-		[Test]
-		public void
-			read_all_events_forward_returns_nothing_when_prepare_position_is_greater_than_last_prepare_in_commit() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(_t1CommitPos, _t1CommitPos), 10).Records;
-			Assert.AreEqual(0, records.Count);
-		}
-
-		[Test]
-		public void
-			read_all_events_backwards_returns_nothing_when_prepare_position_is_smaller_than_first_prepare_in_commit() {
-			var records = ReadIndex.ReadAllEventsBackward(new TFPos(_t2CommitPos, 0), 10).Records;
-			Assert.AreEqual(0, records.Count);
-		}
-
-		[Test]
-		public void read_all_events_forward_returns_correct_events_starting_in_the_middle_of_tf() {
-			var res1 = ReadIndex.ReadAllEventsForward(new TFPos(_t2CommitPos, _p4.LogPosition), 10);
-
-			Assert.AreEqual(4, res1.Records.Count);
-			Assert.AreEqual(_p4, res1.Records[0].Event);
-			Assert.AreEqual(_p1, res1.Records[1].Event);
-			Assert.AreEqual(_p3, res1.Records[2].Event);
-			Assert.AreEqual(_p5, res1.Records[3].Event);
-
-			var res2 = ReadIndex.ReadAllEventsBackward(res1.PrevPos, 10);
-			Assert.AreEqual(1, res2.Records.Count);
-			Assert.AreEqual(_p2, res2.Records[0].Event);
-		}
-
-		[Test]
-		public void read_all_events_backward_returns_correct_events_starting_in_the_middle_of_tf() {
-			var pos = new TFPos(_pos6, _p4.LogPosition); // p3 post-pos
-			var res1 = ReadIndex.ReadAllEventsBackward(pos, 10);
-
-			Assert.AreEqual(4, res1.Records.Count);
-			Assert.AreEqual(_p3, res1.Records[0].Event);
-			Assert.AreEqual(_p1, res1.Records[1].Event);
-			Assert.AreEqual(_p4, res1.Records[2].Event);
-			Assert.AreEqual(_p2, res1.Records[3].Event);
-
-			var res2 = ReadIndex.ReadAllEventsForward(res1.PrevPos, 10);
-			Assert.AreEqual(1, res2.Records.Count);
-			Assert.AreEqual(_p5, res2.Records[0].Event);
-		}
-
-		[Test]
-		public void all_records_can_be_read_sequentially_page_by_page_in_forward_pass() {
-			var recs = new[] {_p2, _p4, _p1, _p3, _p5}; // in committed order
-
-			int count = 0;
-			var pos = new TFPos(0, 0);
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsForward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void all_records_can_be_read_sequentially_page_by_page_in_backward_pass() {
-			var recs = new[] {_p5, _p3, _p1, _p4, _p2}; // in reverse committed order
-
-			int count = 0;
-			var pos = GetBackwardReadPos();
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsBackward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void position_returned_for_prev_page_when_traversing_forward_allow_to_traverse_backward_correctly() {
-			var recs = new[] {_p2, _p4, _p1, _p3, _p5}; // in committed order
-
-			int count = 0;
-			var pos = new TFPos(0, 0);
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsForward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-
-				var localPos = result.PrevPos;
-				int localCount = 0;
-				IndexReadAllResult localResult;
-				while ((localResult = ReadIndex.ReadAllEventsBackward(localPos, 1)).Records.Count != 0) {
-					Assert.AreEqual(1, localResult.Records.Count);
-					Assert.AreEqual(recs[count - 1 - localCount], localResult.Records[0].Event);
-					localPos = localResult.NextPos;
-					localCount += 1;
-				}
-
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void position_returned_for_prev_page_when_traversing_backward_allow_to_traverse_forward_correctly() {
-			var recs = new[] {_p5, _p3, _p1, _p4, _p2}; // in reverse committed order
-
-			int count = 0;
-			var pos = GetBackwardReadPos();
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsBackward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-
-				var localPos = result.PrevPos;
-				int localCount = 0;
-				IndexReadAllResult localResult;
-				while ((localResult = ReadIndex.ReadAllEventsForward(localPos, 1)).Records.Count != 0) {
-					Assert.AreEqual(1, localResult.Records.Count);
-					Assert.AreEqual(recs[count - 1 - localCount], localResult.Records[0].Event);
-					localPos = localResult.NextPos;
-					localCount += 1;
-				}
-
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void
-			reading_all_forward_at_position_with_no_commits_after_returns_prev_pos_that_allows_to_traverse_back() {
-			var res1 = ReadIndex.ReadAllEventsForward(new TFPos(_pos6, 0), 100);
-			Assert.AreEqual(0, res1.Records.Count);
-
-			var recs = new[] {_p5, _p3, _p1, _p4, _p2}; // in reverse committed order
-			int count = 0;
-			IndexReadAllResult result;
-			TFPos pos = res1.PrevPos;
-			while ((result = ReadIndex.ReadAllEventsBackward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void reading_all_forward_at_the_very_end_returns_prev_pos_that_allows_to_traverse_back() {
-			var res1 = ReadIndex.ReadAllEventsForward(new TFPos(Db.Config.WriterCheckpoint.Read(), 0), 100);
-			Assert.AreEqual(0, res1.Records.Count);
-
-			var recs = new[] {_p5, _p3, _p1, _p4, _p2}; // in reverse committed order
-			int count = 0;
-			IndexReadAllResult result;
-			TFPos pos = res1.PrevPos;
-			while ((result = ReadIndex.ReadAllEventsBackward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void
-			reading_all_backward_at_position_with_no_commits_before_returns_prev_pos_that_allows_to_traverse_forward() {
-			var res1 = ReadIndex.ReadAllEventsBackward(new TFPos(_t2CommitPos, int.MaxValue), 100);
-			Assert.AreEqual(0, res1.Records.Count);
-
-			var recs = new[] {_p2, _p4, _p1, _p3, _p5};
-			int count = 0;
-			IndexReadAllResult result;
-			TFPos pos = res1.PrevPos;
-			while ((result = ReadIndex.ReadAllEventsForward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void reading_all_backward_at_the_very_beginning_returns_prev_pos_that_allows_to_traverse_forward() {
-			var res1 = ReadIndex.ReadAllEventsBackward(new TFPos(0, int.MaxValue), 100);
-			Assert.AreEqual(0, res1.Records.Count);
-
-			var recs = new[] {_p2, _p4, _p1, _p3, _p5};
-			int count = 0;
-			IndexReadAllResult result;
-			TFPos pos = res1.PrevPos;
-			while ((result = ReadIndex.ReadAllEventsForward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_read_index_should.cs b/src/EventStore.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_read_index_should.cs
deleted file mode 100644
index ebe1b5a0ebe..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_read_index_should.cs
+++ /dev/null
@@ -1,321 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.Transactions {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class when_having_two_intermingled_transactions_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _p1;
-		private EventRecord _p2;
-		private EventRecord _p3;
-		private EventRecord _p4;
-		private EventRecord _p5;
-
-		private long _t1CommitPos;
-		private long _t2CommitPos;
-
-		protected override void WriteTestScenario() {
-			const string streamId1 = "ES";
-			const string streamId2 = "ABC";
-
-			var t1 = WriteTransactionBegin(streamId1, ExpectedVersion.NoStream);
-			var t2 = WriteTransactionBegin(streamId2, ExpectedVersion.NoStream);
-
-			_p1 = WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 0, streamId1, 0, "es1",
-				PrepareFlags.Data);
-			_p2 = WriteTransactionEvent(t2.CorrelationId, t2.LogPosition, 0, streamId2, 0, "abc1",
-				PrepareFlags.Data);
-			_p3 = WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 1, streamId1, 1, "es1",
-				PrepareFlags.Data);
-			_p4 = WriteTransactionEvent(t2.CorrelationId, t2.LogPosition, 1, streamId2, 1, "abc1",
-				PrepareFlags.Data);
-			_p5 = WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 2, streamId1, 2, "es1",
-				PrepareFlags.Data);
-
-			WriteTransactionEnd(t2.CorrelationId, t2.TransactionPosition, streamId2);
-			WriteTransactionEnd(t1.CorrelationId, t1.TransactionPosition, streamId1);
-
-			_t2CommitPos = WriteCommit(t2.CorrelationId, t2.TransactionPosition, streamId2, _p2.EventNumber);
-			_t1CommitPos = WriteCommit(t1.CorrelationId, t1.TransactionPosition, streamId1, _p1.EventNumber);
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_larger_stream() {
-			Assert.AreEqual(2, ReadIndex.GetStreamLastEventNumber("ES"));
-		}
-
-		[Test]
-		public void return_correct_first_record_for_larger_stream() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p1, result.Record);
-		}
-
-		[Test]
-		public void return_correct_second_record_for_larger_stream() {
-			var result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p3, result.Record);
-		}
-
-		[Test]
-		public void return_correct_third_record_for_larger_stream() {
-			var result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p5, result.Record);
-		}
-
-		[Test]
-		public void not_find_record_with_nonexistent_version_for_larger_stream() {
-			var result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_larger_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 3);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_p1, result.Records[0]);
-			Assert.AreEqual(_p3, result.Records[1]);
-			Assert.AreEqual(_p5, result.Records[2]);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_larger_stream_with_specific_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", 2, 3);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_p5, result.Records[0]);
-			Assert.AreEqual(_p3, result.Records[1]);
-			Assert.AreEqual(_p1, result.Records[2]);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_larger_stream_with_from_end_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 3);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_p5, result.Records[0]);
-			Assert.AreEqual(_p3, result.Records[1]);
-			Assert.AreEqual(_p1, result.Records[2]);
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_smaller_stream() {
-			Assert.AreEqual(1, ReadIndex.GetStreamLastEventNumber("ABC"));
-		}
-
-		[Test]
-		public void return_correct_first_record_for_smaller_stream() {
-			var result = ReadIndex.ReadEvent("ABC", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p2, result.Record);
-		}
-
-		[Test]
-		public void return_correct_second_record_for_smaller_stream() {
-			var result = ReadIndex.ReadEvent("ABC", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p4, result.Record);
-		}
-
-		[Test]
-		public void not_find_record_with_nonexistent_version_for_smaller_stream() {
-			var result = ReadIndex.ReadEvent("ABC", 2);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_smaller_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("ABC", 0, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_p2, result.Records[0]);
-			Assert.AreEqual(_p4, result.Records[1]);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_smaller_stream_with_specific_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("ABC", 1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_p4, result.Records[0]);
-			Assert.AreEqual(_p2, result.Records[1]);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_smaller_stream_with_from_end_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("ABC", -1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_p4, result.Records[0]);
-			Assert.AreEqual(_p2, result.Records[1]);
-		}
-
-		[Test]
-		public void read_all_events_forward_returns_all_events_in_correct_order() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10).Records;
-
-			Assert.AreEqual(5, records.Count);
-			Assert.AreEqual(_p2, records[0].Event);
-			Assert.AreEqual(_p4, records[1].Event);
-			Assert.AreEqual(_p1, records[2].Event);
-			Assert.AreEqual(_p3, records[3].Event);
-			Assert.AreEqual(_p5, records[4].Event);
-		}
-
-		[Test]
-		public void read_all_events_backward_returns_all_events_in_correct_order() {
-			var pos = GetBackwardReadPos();
-			var records = ReadIndex.ReadAllEventsBackward(pos, 10).Records;
-
-			Assert.AreEqual(5, records.Count);
-			Assert.AreEqual(_p5, records[0].Event);
-			Assert.AreEqual(_p3, records[1].Event);
-			Assert.AreEqual(_p1, records[2].Event);
-			Assert.AreEqual(_p4, records[3].Event);
-			Assert.AreEqual(_p2, records[4].Event);
-		}
-
-		[Test]
-		public void
-			read_all_events_forward_returns_nothing_when_prepare_position_is_greater_than_last_prepare_in_commit() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(_t1CommitPos, _t1CommitPos), 10).Records;
-			Assert.AreEqual(0, records.Count);
-		}
-
-		[Test]
-		public void
-			read_all_events_backwards_returns_nothing_when_prepare_position_is_smaller_than_first_prepare_in_commit() {
-			var records = ReadIndex.ReadAllEventsBackward(new TFPos(_t2CommitPos, 0), 10).Records;
-			Assert.AreEqual(0, records.Count);
-		}
-
-		[Test]
-		public void read_all_events_forward_returns_correct_events_starting_in_the_middle_of_tf() {
-			var res1 = ReadIndex.ReadAllEventsForward(new TFPos(_t2CommitPos, _p4.LogPosition), 10);
-
-			Assert.AreEqual(4, res1.Records.Count);
-			Assert.AreEqual(_p4, res1.Records[0].Event);
-			Assert.AreEqual(_p1, res1.Records[1].Event);
-			Assert.AreEqual(_p3, res1.Records[2].Event);
-			Assert.AreEqual(_p5, res1.Records[3].Event);
-
-			var res2 = ReadIndex.ReadAllEventsBackward(res1.PrevPos, 10);
-			Assert.AreEqual(1, res2.Records.Count);
-			Assert.AreEqual(_p2, res2.Records[0].Event);
-		}
-
-		[Test]
-		public void read_all_events_backward_returns_correct_events_starting_in_the_middle_of_tf() {
-			var pos = new TFPos(Db.Config.WriterCheckpoint.Read(), _p4.LogPosition); // p3 post-pos
-			var res1 = ReadIndex.ReadAllEventsBackward(pos, 10);
-
-			Assert.AreEqual(4, res1.Records.Count);
-			Assert.AreEqual(_p3, res1.Records[0].Event);
-			Assert.AreEqual(_p1, res1.Records[1].Event);
-			Assert.AreEqual(_p4, res1.Records[2].Event);
-			Assert.AreEqual(_p2, res1.Records[3].Event);
-
-			var res2 = ReadIndex.ReadAllEventsForward(res1.PrevPos, 10);
-			Assert.AreEqual(1, res2.Records.Count);
-			Assert.AreEqual(_p5, res2.Records[0].Event);
-		}
-
-		[Test]
-		public void all_records_can_be_read_sequentially_page_by_page_in_forward_pass() {
-			var recs = new[] {_p2, _p4, _p1, _p3, _p5}; // in committed order
-
-			int count = 0;
-			var pos = new TFPos(0, 0);
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsForward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void all_records_can_be_read_sequentially_page_by_page_in_backward_pass() {
-			var recs = new[] {_p5, _p3, _p1, _p4, _p2}; // in reverse committed order
-
-			int count = 0;
-			var pos = GetBackwardReadPos();
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsBackward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void position_returned_for_prev_page_when_traversing_forward_allow_to_traverse_backward_correctly() {
-			var recs = new[] {_p2, _p4, _p1, _p3, _p5}; // in committed order
-
-			int count = 0;
-			var pos = new TFPos(0, 0);
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsForward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-
-				var localPos = result.PrevPos;
-				int localCount = 0;
-				IndexReadAllResult localResult;
-				while ((localResult = ReadIndex.ReadAllEventsBackward(localPos, 1)).Records.Count != 0) {
-					Assert.AreEqual(1, localResult.Records.Count);
-					Assert.AreEqual(recs[count - 1 - localCount], localResult.Records[0].Event);
-					localPos = localResult.NextPos;
-					localCount += 1;
-				}
-
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void position_returned_for_prev_page_when_traversing_backward_allow_to_traverse_forward_correctly() {
-			var recs = new[] {_p5, _p3, _p1, _p4, _p2}; // in reverse committed order
-
-			int count = 0;
-			var pos = GetBackwardReadPos();
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsBackward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-
-				var localPos = result.PrevPos;
-				int localCount = 0;
-				IndexReadAllResult localResult;
-				while ((localResult = ReadIndex.ReadAllEventsForward(localPos, 1)).Records.Count != 0) {
-					Assert.AreEqual(1, localResult.Records.Count);
-					Assert.AreEqual(recs[count - 1 - localCount], localResult.Records[0].Event);
-					localPos = localResult.NextPos;
-					localCount += 1;
-				}
-
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_spanning_few_chunks_read_index_should.cs b/src/EventStore.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_spanning_few_chunks_read_index_should.cs
deleted file mode 100644
index 97ca1841cc8..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_spanning_few_chunks_read_index_should.cs
+++ /dev/null
@@ -1,323 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Services.Storage.ReaderIndex.ReadStreamResult;
-
-namespace EventStore.Core.Tests.Services.Storage.Transactions {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class
-		when_having_two_intermingled_transactions_spanning_few_chunks_read_index_should<TLogFormat, TStreamId>
-		: ReadIndexTestScenario<TLogFormat, TStreamId> {
-		private EventRecord _p1;
-		private EventRecord _p2;
-		private EventRecord _p3;
-		private EventRecord _p4;
-		private EventRecord _p5;
-
-		private long _t1CommitPos;
-		private long _t2CommitPos;
-
-		protected override void WriteTestScenario() {
-			const string streamId1 = "ES";
-			const string streamId2 = "ABC";
-
-			var t1 = WriteTransactionBegin(streamId1, ExpectedVersion.NoStream);
-			var t2 = WriteTransactionBegin(streamId2, ExpectedVersion.NoStream);
-
-			_p1 = WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 0, streamId1, 0,
-				"es1" + new string('.', 3000), PrepareFlags.Data);
-			_p2 = WriteTransactionEvent(t2.CorrelationId, t2.LogPosition, 0, streamId2, 0,
-				"abc1" + new string('.', 3000), PrepareFlags.Data);
-			_p3 = WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 1, streamId1, 1,
-				"es1" + new string('.', 3000), PrepareFlags.Data);
-			_p4 = WriteTransactionEvent(t2.CorrelationId, t2.LogPosition, 1, streamId2, 1,
-				"abc1" + new string('.', 3000), PrepareFlags.Data, retryOnFail: true);
-			_p5 = WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 2, streamId1, 2,
-				"es1" + new string('.', 3000), PrepareFlags.Data);
-
-			WriteTransactionEnd(t2.CorrelationId, t2.TransactionPosition, streamId2);
-			WriteTransactionEnd(t1.CorrelationId, t1.TransactionPosition, streamId1);
-
-			_t2CommitPos = WriteCommit(t2.CorrelationId, t2.TransactionPosition, streamId2, _p2.EventNumber);
-			_t1CommitPos = WriteCommit(t1.CorrelationId, t1.TransactionPosition, streamId1, _p1.EventNumber);
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_larger_stream() {
-			Assert.AreEqual(2, ReadIndex.GetStreamLastEventNumber("ES"));
-		}
-
-		[Test]
-		public void return_correct_first_record_for_larger_stream() {
-			var result = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p1, result.Record);
-		}
-
-		[Test]
-		public void return_correct_second_record_for_larger_stream() {
-			var result = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p3, result.Record);
-		}
-
-		[Test]
-		public void return_correct_third_record_for_larger_stream() {
-			var result = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p5, result.Record);
-		}
-
-		[Test]
-		public void not_find_record_with_nonexistent_version_for_larger_stream() {
-			var result = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_larger_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("ES", 0, 3);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_p1, result.Records[0]);
-			Assert.AreEqual(_p3, result.Records[1]);
-			Assert.AreEqual(_p5, result.Records[2]);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_larger_stream_with_specific_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", 2, 3);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_p5, result.Records[0]);
-			Assert.AreEqual(_p3, result.Records[1]);
-			Assert.AreEqual(_p1, result.Records[2]);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_larger_stream_with_from_end_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("ES", -1, 3);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(3, result.Records.Length);
-			Assert.AreEqual(_p5, result.Records[0]);
-			Assert.AreEqual(_p3, result.Records[1]);
-			Assert.AreEqual(_p1, result.Records[2]);
-		}
-
-		[Test]
-		public void return_correct_last_event_version_for_smaller_stream() {
-			Assert.AreEqual(1, ReadIndex.GetStreamLastEventNumber("ABC"));
-		}
-
-		[Test]
-		public void return_correct_first_record_for_smaller_stream() {
-			var result = ReadIndex.ReadEvent("ABC", 0);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p2, result.Record);
-		}
-
-		[Test]
-		public void return_correct_second_record_for_smaller_stream() {
-			var result = ReadIndex.ReadEvent("ABC", 1);
-			Assert.AreEqual(ReadEventResult.Success, result.Result);
-			Assert.AreEqual(_p4, result.Record);
-		}
-
-		[Test]
-		public void not_find_record_with_nonexistent_version_for_smaller_stream() {
-			var result = ReadIndex.ReadEvent("ABC", 2);
-			Assert.AreEqual(ReadEventResult.NotFound, result.Result);
-			Assert.IsNull(result.Record);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_start_range_query_for_smaller_stream() {
-			var result = ReadIndex.ReadStreamEventsForward("ABC", 0, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_p2, result.Records[0]);
-			Assert.AreEqual(_p4, result.Records[1]);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_smaller_stream_with_specific_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("ABC", 1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_p4, result.Records[0]);
-			Assert.AreEqual(_p2, result.Records[1]);
-		}
-
-		[Test]
-		public void return_correct_range_on_from_end_range_query_for_smaller_stream_with_from_end_version() {
-			var result = ReadIndex.ReadStreamEventsBackward("ABC", -1, 2);
-			Assert.AreEqual(ReadStreamResult.Success, result.Result);
-			Assert.AreEqual(2, result.Records.Length);
-			Assert.AreEqual(_p4, result.Records[0]);
-			Assert.AreEqual(_p2, result.Records[1]);
-		}
-
-		[Test]
-		public void read_all_events_forward_returns_all_events_in_correct_order() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10).Records;
-
-			Assert.AreEqual(5, records.Count);
-			Assert.AreEqual(_p2, records[0].Event);
-			Assert.AreEqual(_p4, records[1].Event);
-			Assert.AreEqual(_p1, records[2].Event);
-			Assert.AreEqual(_p3, records[3].Event);
-			Assert.AreEqual(_p5, records[4].Event);
-		}
-
-		[Test]
-		public void read_all_events_backward_returns_all_events_in_correct_order() {
-			var pos = GetBackwardReadPos();
-			var records = ReadIndex.ReadAllEventsBackward(pos, 10).Records;
-
-			Assert.AreEqual(5, records.Count);
-			Assert.AreEqual(_p5, records[0].Event);
-			Assert.AreEqual(_p3, records[1].Event);
-			Assert.AreEqual(_p1, records[2].Event);
-			Assert.AreEqual(_p4, records[3].Event);
-			Assert.AreEqual(_p2, records[4].Event);
-		}
-
-		[Test]
-		public void
-			read_all_events_forward_returns_nothing_when_prepare_position_is_greater_than_last_prepare_in_commit() {
-			var records = ReadIndex.ReadAllEventsForward(new TFPos(_t1CommitPos, _t1CommitPos), 10).Records;
-			Assert.AreEqual(0, records.Count);
-		}
-
-		[Test]
-		public void
-			read_all_events_backwards_returns_nothing_when_prepare_position_is_smaller_than_first_prepare_in_commit() {
-			var records = ReadIndex.ReadAllEventsBackward(new TFPos(_t2CommitPos, 0), 10).Records;
-			Assert.AreEqual(0, records.Count);
-		}
-
-		[Test]
-		public void read_all_events_forward_returns_correct_events_starting_in_the_middle_of_tf() {
-			var res1 = ReadIndex.ReadAllEventsForward(new TFPos(_t2CommitPos, _p4.LogPosition), 10);
-
-			Assert.AreEqual(4, res1.Records.Count);
-			Assert.AreEqual(_p4, res1.Records[0].Event);
-			Assert.AreEqual(_p1, res1.Records[1].Event);
-			Assert.AreEqual(_p3, res1.Records[2].Event);
-			Assert.AreEqual(_p5, res1.Records[3].Event);
-
-			var res2 = ReadIndex.ReadAllEventsBackward(res1.PrevPos, 10);
-			Assert.AreEqual(1, res2.Records.Count);
-			Assert.AreEqual(_p2, res2.Records[0].Event);
-		}
-
-		[Test]
-		public void read_all_events_backward_returns_correct_events_starting_in_the_middle_of_tf() {
-			var pos = new TFPos(Db.Config.WriterCheckpoint.Read(), _p4.LogPosition); // p3 post-pos
-			var res1 = ReadIndex.ReadAllEventsBackward(pos, 10);
-
-			Assert.AreEqual(4, res1.Records.Count);
-			Assert.AreEqual(_p3, res1.Records[0].Event);
-			Assert.AreEqual(_p1, res1.Records[1].Event);
-			Assert.AreEqual(_p4, res1.Records[2].Event);
-			Assert.AreEqual(_p2, res1.Records[3].Event);
-
-			var res2 = ReadIndex.ReadAllEventsForward(res1.PrevPos, 10);
-			Assert.AreEqual(1, res2.Records.Count);
-			Assert.AreEqual(_p5, res2.Records[0].Event);
-		}
-
-		[Test]
-		public void all_records_can_be_read_sequentially_page_by_page_in_forward_pass() {
-			var recs = new[] {_p2, _p4, _p1, _p3, _p5}; // in committed order
-
-			int count = 0;
-			var pos = new TFPos(0, 0);
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsForward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void all_records_can_be_read_sequentially_page_by_page_in_backward_pass() {
-			var recs = new[] {_p5, _p3, _p1, _p4, _p2}; // in reverse committed order
-
-			int count = 0;
-			var pos = GetBackwardReadPos();
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsBackward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void position_returned_for_prev_page_when_traversing_forward_allow_to_traverse_backward_correctly() {
-			var recs = new[] {_p2, _p4, _p1, _p3, _p5}; // in committed order
-
-			int count = 0;
-			var pos = new TFPos(0, 0);
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsForward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-
-				var localPos = result.PrevPos;
-				int localCount = 0;
-				IndexReadAllResult localResult;
-				while ((localResult = ReadIndex.ReadAllEventsBackward(localPos, 1)).Records.Count != 0) {
-					Assert.AreEqual(1, localResult.Records.Count);
-					Assert.AreEqual(recs[count - 1 - localCount], localResult.Records[0].Event);
-					localPos = localResult.NextPos;
-					localCount += 1;
-				}
-
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-
-		[Test]
-		public void position_returned_for_prev_page_when_traversing_backward_allow_to_traverse_forward_correctly() {
-			var recs = new[] {_p5, _p3, _p1, _p4, _p2}; // in reverse committed order
-
-			int count = 0;
-			var pos = GetBackwardReadPos();
-			IndexReadAllResult result;
-			while ((result = ReadIndex.ReadAllEventsBackward(pos, 1)).Records.Count != 0) {
-				Assert.AreEqual(1, result.Records.Count);
-				Assert.AreEqual(recs[count], result.Records[0].Event);
-
-				var localPos = result.PrevPos;
-				int localCount = 0;
-				IndexReadAllResult localResult;
-				while ((localResult = ReadIndex.ReadAllEventsForward(localPos, 1)).Records.Count != 0) {
-					Assert.AreEqual(1, localResult.Records.Count);
-					Assert.AreEqual(recs[count - 1 - localCount], localResult.Records[0].Event);
-					localPos = localResult.NextPos;
-					localCount += 1;
-				}
-
-				pos = result.NextPos;
-				count += 1;
-			}
-
-			Assert.AreEqual(recs.Length, count);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/Transactions/when_rebuilding_index_for_partially_persisted_transaction.cs b/src/EventStore.Core.Tests/Services/Storage/Transactions/when_rebuilding_index_for_partially_persisted_transaction.cs
deleted file mode 100644
index 45f9f316bfa..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/Transactions/when_rebuilding_index_for_partially_persisted_transaction.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Caching;
-using EventStore.Core.Data;
-using EventStore.Core.DataStructures;
-using EventStore.Core.Index;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using EventStore.Core.Util;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.Metrics;
-
-namespace EventStore.Core.Tests.Services.Storage.Transactions {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class when_rebuilding_index_for_partially_persisted_transaction<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		public when_rebuilding_index_for_partially_persisted_transaction() : base(maxEntriesInMemTable: 10) {
-		}
-
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			ReadIndex.Close();
-			ReadIndex.Dispose();
-			TableIndex.Close(removeFiles: false);
-
-			var readers =
-				new ObjectPool<ITransactionFileReader>("Readers", 2, 2, () => new TFChunkReader(Db, WriterCheckpoint));
-			var lowHasher = _logFormat.LowHasher;
-			var highHasher = _logFormat.HighHasher;
-			var emptyStreamId = _logFormat.EmptyStreamId;
-			TableIndex = new TableIndex<TStreamId>(GetFilePathFor("index"), lowHasher, highHasher, emptyStreamId,
-				() => new HashListMemTable(PTableVersions.IndexV2, maxSize: MaxEntriesInMemTable * 2),
-				() => new TFReaderLease(readers),
-				PTableVersions.IndexV2,
-				5, Constants.PTableMaxReaderCountDefault,
-				MaxEntriesInMemTable);
-			var readIndex = new ReadIndex<TStreamId>(new NoopPublisher(),
-				readers,
-				TableIndex,
-				_logFormat.StreamNameIndexConfirmer,
-				_logFormat.StreamIds,
-				_logFormat.StreamNamesProvider,
-				_logFormat.EmptyStreamId,
-				_logFormat.StreamIdValidator,
-				_logFormat.StreamIdSizer,
-				_logFormat.StreamExistenceFilter,
-				_logFormat.StreamExistenceFilterReader,
-				_logFormat.EventTypeIndexConfirmer,
-				new NoLRUCache<TStreamId, IndexBackend<TStreamId>.EventNumberCached>(),
-				new NoLRUCache<TStreamId, IndexBackend<TStreamId>.MetadataCached>(),
-				additionalCommitChecks: true,
-				metastreamMaxCount: 1,
-				hashCollisionReadLimit: Opts.HashCollisionReadLimitDefault,
-				skipIndexScanOnReads: Opts.SkipIndexScanOnReadsDefault,
-				replicationCheckpoint: Db.Config.ReplicationCheckpoint,
-				indexCheckpoint: Db.Config.IndexCheckpoint,
-				indexStatusTracker: new IndexStatusTracker.NoOp(),
-				indexTracker: new IndexTracker.NoOp(),
-				cacheTracker: new CacheHitsMissesTracker.NoOp());
-			readIndex.IndexCommitter.Init(ChaserCheckpoint.Read());
-			ReadIndex = readIndex;
-		}
-
-		protected override void WriteTestScenario() {
-			var begin = WriteTransactionBegin("ES", ExpectedVersion.Any);
-			for (int i = 0; i < 15; ++i) {
-				WriteTransactionEvent(Guid.NewGuid(), begin.LogPosition, i, "ES", i, "data" + i, PrepareFlags.Data);
-			}
-
-			WriteTransactionEnd(Guid.NewGuid(), begin.LogPosition, "ES");
-			WriteCommit(Guid.NewGuid(), begin.LogPosition, "ES", 0);
-		}
-
-		[Test]
-		public void sequence_numbers_are_not_broken() {
-			for (int i = 0; i < 15; ++i) {
-				var result = ReadIndex.ReadEvent("ES", i);
-				Assert.AreEqual(ReadEventResult.Success, result.Result);
-				Assert.AreEqual(Helper.UTF8NoBom.GetBytes("data" + i), result.Record.Data.ToArray());
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Storage/WriteEventsToIndexScenario.cs b/src/EventStore.Core.Tests/Services/Storage/WriteEventsToIndexScenario.cs
deleted file mode 100644
index 02ac10b56e0..00000000000
--- a/src/EventStore.Core.Tests/Services/Storage/WriteEventsToIndexScenario.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Caching;
-using EventStore.Core.Data;
-using EventStore.Core.DataStructures;
-using EventStore.Core.Index;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Storage {
-	[TestFixture]
-	public abstract class WriteEventsToIndexScenario<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		protected SynchronousScheduler _publisher;
-		protected ITransactionFileReader _tfReader;
-		protected ITableIndex<TStreamId> _tableIndex;
-		protected IIndexBackend<TStreamId> _indexBackend;
-		protected IValueLookup<TStreamId> _streamIds;
-		protected INameLookup<TStreamId> _streamNames;
-		protected ISystemStreamLookup<TStreamId> _systemStreams;
-		protected IStreamNamesProvider<TStreamId> _provider;
-		protected IValidator<TStreamId> _validator;
-		protected ISizer<TStreamId> _sizer;
-		protected IIndexReader<TStreamId> _indexReader;
-		protected IIndexWriter<TStreamId> _indexWriter;
-		protected IIndexCommitter<TStreamId> _indexCommitter;
-		protected ObjectPool<ITransactionFileReader> _readerPool;
-		protected LogFormatAbstractor<TStreamId> _logFormat;
-		protected const int RecordOffset = 1000;
-		public IList<IPrepareLogRecord<TStreamId>> CreatePrepareLogRecord(TStreamId streamId, int expectedVersion, TStreamId eventType, Guid eventId, long transactionPosition){
-			return new[]{
-				PrepareLogRecord.SingleWrite (
-					_logFormat.RecordFactory,
-					transactionPosition,
-					Guid.NewGuid(),
-					eventId,
-					streamId,
-					expectedVersion,
-					eventType,
-					new byte[0],
-					new byte[0],
-					DateTime.Now,
-					PrepareFlags.IsCommitted
-				)
-			};
-		}
-
-		public IList<IPrepareLogRecord<TStreamId>> CreatePrepareLogRecords(TStreamId streamId, int expectedVersion, IList<TStreamId> eventTypes, IList<Guid> eventIds, long transactionPosition){
-			if(eventIds.Count != eventTypes.Count)
-				throw new Exception("eventType and eventIds length mismatch!");
-			if(eventIds.Count == 0)
-				throw new Exception("eventIds is empty");
-			if(eventIds.Count == 1)
-				return CreatePrepareLogRecord(streamId, expectedVersion, eventTypes[0], eventIds[0], transactionPosition);
-
-			var numEvents = eventTypes.Count;
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-
-			var prepares = new List<IPrepareLogRecord<TStreamId>>();
-			for(var i=0;i<numEvents;i++){
-				PrepareFlags flags = PrepareFlags.Data | PrepareFlags.IsCommitted;
-				if(i==0) flags |= PrepareFlags.TransactionBegin;
-				if(i==numEvents-1) flags |= PrepareFlags.TransactionEnd;
-
-				prepares.Add(
-					PrepareLogRecord.Prepare(
-						recordFactory,
-						transactionPosition + RecordOffset * i,
-						Guid.NewGuid(),
-						eventIds[i],
-						transactionPosition,
-						i,
-						streamId,
-						expectedVersion + i,
-						flags,
-						eventTypes[i],
-						new byte[0],
-						new byte[0],
-						DateTime.Now
-				));
-			}
-
-			return prepares;
-		}
-
-		public CommitLogRecord CreateCommitLogRecord(long logPosition, long transactionPosition, long firstEventNumber){
-			return new CommitLogRecord (logPosition, Guid.NewGuid(), transactionPosition, DateTime.Now, 0);
-		}
-
-		public void WriteToDB(IList<IPrepareLogRecord<TStreamId>> prepares){
-			foreach(var prepare in prepares){
-				((FakeInMemoryTfReader)_tfReader).AddRecord(prepare, prepare.LogPosition);
-			}
-		}
-
-		public void WriteToDB(CommitLogRecord commit){
-			((FakeInMemoryTfReader)_tfReader).AddRecord(commit, commit.LogPosition);
-		}
-
-		public void PreCommitToIndex(IList<IPrepareLogRecord<TStreamId>> prepares){
-			_indexWriter.PreCommit(prepares.ToArray());
-		}
-
-		public void PreCommitToIndex(CommitLogRecord commitLogRecord){
-			_indexWriter.PreCommit(commitLogRecord);
-		}
-
-		public void CommitToIndex(IList<IPrepareLogRecord<TStreamId>> prepares){
-			_indexCommitter.Commit(prepares, false, false);
-		}
-
-		public void CommitToIndex(CommitLogRecord commitLogRecord){
-			_indexCommitter.Commit(commitLogRecord, false, false);
-		}
-
-		public abstract void WriteEvents();
-
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
-				IndexDirectory = GetFilePathFor("index"),
-			});
-			_provider = _logFormat.StreamNamesProvider;
-			_publisher = new("publisher");
-			_tfReader = new FakeInMemoryTfReader(RecordOffset);
-			_tableIndex = new FakeInMemoryTableIndex<TStreamId>();
-			_provider.SetTableIndex(_tableIndex);
-			_readerPool = new ObjectPool<ITransactionFileReader>(
-				"ReadIndex readers pool", 5, 100,
-				() => _tfReader);
-			_indexBackend = new IndexBackend<TStreamId>(_readerPool,
-				new LRUCache<TStreamId, IndexBackend<TStreamId>.EventNumberCached>("LastEventNumber", 100_000),
-				new LRUCache<TStreamId, IndexBackend<TStreamId>.MetadataCached>("StreamMetadata", 100_000));
-			_streamIds = _logFormat.StreamIds;
-			_validator = _logFormat.StreamIdValidator;
-			var emptyStreamId = _logFormat.EmptyStreamId;
-			_sizer = _logFormat.StreamIdSizer;
-			_indexReader = new IndexReader<TStreamId>(_indexBackend, _tableIndex, _provider, _validator,
-				_logFormat.StreamExistenceFilterReader, new StreamMetadata(maxCount: 100000), 100, false);
-			_streamNames = _logFormat.StreamNames;
-			_systemStreams = _logFormat.SystemStreams;
-			_indexWriter = new IndexWriter<TStreamId>(_indexBackend, _indexReader, _streamIds, _streamNames,
-				_systemStreams, emptyStreamId, _sizer);
-			_indexCommitter = new IndexCommitter<TStreamId>(_publisher, _indexBackend, _indexReader, _tableIndex,
-				_logFormat.StreamNameIndexConfirmer, _streamNames, _logFormat.EventTypeIndexConfirmer, _logFormat.EventTypes,
-				_systemStreams, _logFormat.StreamExistenceFilter, _logFormat.StreamExistenceFilterInitializer, new InMemoryCheckpoint(-1), new IndexStatusTracker.NoOp(), new IndexTracker.NoOp(), false);
-
-			WriteEvents();
-		}
-
-		public override Task TestFixtureTearDown() {
-			_logFormat?.Dispose();
-			_readerPool.Dispose();
-			return base.TestFixtureTearDown();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/TimeService/time_service_should.cs b/src/EventStore.Core.Tests/Services/TimeService/time_service_should.cs
deleted file mode 100644
index cade64abc59..00000000000
--- a/src/EventStore.Core.Tests/Services/TimeService/time_service_should.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.TimeService {
-	public class FakeScheduler : TimerBasedScheduler {
-		public FakeScheduler(ITimer timer, ITimeProvider timeProvider) : base(timer, timeProvider) {
-		}
-
-		public void TriggerProcessing() {
-			ProcessOperations();
-		}
-	}
-
-	public class FakeTimeProvider : ITimeProvider {
-		public DateTime UtcNow { get; private set; }
-		public DateTime LocalTime { get; private set; }
-
-		public FakeTimeProvider() {
-			UtcNow = DateTime.UtcNow;
-			LocalTime = DateTime.Now;
-		}
-
-		public void SetNewUtcTime(DateTime newTime) {
-			UtcNow = newTime;
-		}
-
-		public void AddToUtcTime(TimeSpan timeSpan) {
-			UtcNow = UtcNow.Add(timeSpan);
-		}
-
-		public void AddToLocalTime(TimeSpan timeSpan) {
-			UtcNow = LocalTime.Add(timeSpan);
-		}
-	}
-
-	public class FakeTimer : ITimer {
-		public void FireIn(int milliseconds, Action callback) {
-			// do smth
-		}
-
-		public void Dispose() {
-		}
-	}
-
-	public class TestResponseMessage : Message {
-		public int Id { get; }
-
-		public TestResponseMessage(int id) {
-			Id = id;
-		}
-	}
-
-	[TestFixture]
-	public class time_service_should : IHandle<TestResponseMessage> {
-		private Action<int, int> _startTimeout;
-		private List<TestResponseMessage> _timerMessages;
-
-		private FakeTimeProvider _timeProvider;
-		private FakeScheduler _scheduler;
-
-		[SetUp]
-		public void SetUp() {
-			_timerMessages = new List<TestResponseMessage>();
-
-			_timeProvider = new FakeTimeProvider();
-			var timer = new FakeTimer();
-			_scheduler = new FakeScheduler(timer, _timeProvider);
-			var timeService = new TimerService(_scheduler);
-
-			_startTimeout = (ms, id) => timeService.Handle(
-				TimerMessage.Schedule.Create(TimeSpan.FromMilliseconds(ms),
-					new SendToThisEnvelope(this),
-					new TestResponseMessage(id)));
-		}
-
-		public void Handle(TestResponseMessage message) {
-			_timerMessages.Add(message);
-		}
-
-		[TearDown]
-		public void TearDown() {
-		}
-
-		[Test]
-		public void respond_with_correct_message() {
-			const int id = 101;
-
-			_startTimeout(0, id);
-			_scheduler.TriggerProcessing();
-
-			Assert.That(_timerMessages.ContainsSingle<TestResponseMessage>(msg => msg != null && msg.Id == id));
-		}
-
-		[Test]
-		public void respond_even_if_fired_too_late() {
-			_startTimeout(-5, 100);
-			_scheduler.TriggerProcessing();
-
-			Assert.That(_timerMessages.ContainsSingle<TestResponseMessage>());
-		}
-
-		[Test]
-		public void not_respond_until_time_elapses() {
-			_startTimeout(5, 100);
-
-			_timeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(4));
-			_scheduler.TriggerProcessing();
-
-			Assert.That(_timerMessages.ContainsNo<TestResponseMessage>());
-		}
-
-		[Test]
-		public void respond_in_correct_time() {
-			_startTimeout(5, 100);
-
-			_timeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(5));
-			_scheduler.TriggerProcessing();
-
-			Assert.That(_timerMessages.ContainsSingle<TestResponseMessage>());
-		}
-
-		[Test]
-		public void fire_timeouts_gradually() {
-			_startTimeout(5, 100);
-			_startTimeout(25, 102);
-			_startTimeout(45, 104);
-			_startTimeout(35, 103);
-			_startTimeout(15, 101);
-
-			_timeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(10)); // 10
-			_scheduler.TriggerProcessing();
-
-			Assert.That(_timerMessages.ContainsSingle<TestResponseMessage>(msg => msg.Id == 100) &&
-			            _timerMessages.ContainsNo<TestResponseMessage>(msg => msg.Id.IsBetween(101, 104)));
-
-			_timeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(10)); // 20
-			_scheduler.TriggerProcessing();
-
-			Assert.That(_timerMessages.ContainsSingle<TestResponseMessage>(msg => msg.Id == 101) &&
-			            _timerMessages.ContainsNo<TestResponseMessage>(msg => msg.Id.IsBetween(102, 104)));
-
-			_timeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(10)); //30
-			_scheduler.TriggerProcessing();
-
-			Assert.That(_timerMessages.ContainsSingle<TestResponseMessage>(msg => msg.Id == 102) &&
-			            _timerMessages.ContainsNo<TestResponseMessage>(msg => msg.Id.IsBetween(103, 104)));
-
-			_timeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(10)); //40
-			_scheduler.TriggerProcessing();
-
-			Assert.That(_timerMessages.ContainsSingle<TestResponseMessage>(msg => msg.Id == 103) &&
-			            _timerMessages.ContainsNo<TestResponseMessage>(msg => msg.Id == 104));
-
-			_timeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(10)); //50
-			_scheduler.TriggerProcessing();
-
-			Assert.That(_timerMessages.ContainsSingle<TestResponseMessage>(msg => msg.Id == 104));
-		}
-
-		[Test]
-		public void fire_all_timeouts_that_are_scheduled_at_same_time() {
-			_startTimeout(5, 100);
-			_startTimeout(5, 101);
-			_startTimeout(5, 102);
-
-			_timeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(5));
-			_scheduler.TriggerProcessing();
-
-			Assert.That(_timerMessages.ContainsN<TestResponseMessage>(3, msg => msg.Id.IsBetween(100, 102)));
-		}
-
-		[Test]
-		public void fire_all_timeouts_after_long_pause() {
-			for (int i = 0; i < 20; i++)
-				_startTimeout(10 + i, 100 + i);
-
-			Assert.That(_timerMessages.ContainsNo<TestResponseMessage>());
-
-			_timeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(1000));
-			_scheduler.TriggerProcessing();
-
-			Assert.That(_timerMessages.ContainsN<TestResponseMessage>(20, msg => msg.Id.IsBetween(100, 119)));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscriptionFiltered.Tests.cs b/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscriptionFiltered.Tests.cs
deleted file mode 100644
index 76703248844..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscriptionFiltered.Tests.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Core.Services.Transport.Enumerators;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Enumerators;
-
-[TestFixture]
-public partial class EnumeratorTests {
-	private static EnumeratorWrapper CreateAllSubscriptionFiltered(
-		IPublisher publisher,
-		Position? checkpoint,
-		IEventFilter eventFilter = null,
-		uint? maxSearchWindow = null,
-		uint checkpointIntervalMultiplier = 1,
-		ClaimsPrincipal user = null) {
-
-		return new EnumeratorWrapper(new Enumerator.AllSubscriptionFiltered(
-			bus: publisher,
-			expiryStrategy: new DefaultExpiryStrategy(),
-			checkpoint: checkpoint,
-			resolveLinks: false,
-			eventFilter: eventFilter,
-			user: user ?? SystemAccounts.System,
-			requiresLeader: false,
-			maxSearchWindow: maxSearchWindow,
-			checkpointIntervalMultiplier: checkpointIntervalMultiplier,
-			cancellationToken: CancellationToken.None));
-	}
-
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class subscribe_filtered_all_from_start<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private readonly List<Guid> _eventIds = new();
-
-		protected override void Given() {
-			EnableReadAll();
-			_eventIds.Add(WriteEvent("test-stream", "type1", "{}", "{Data: 1}").Item1.EventId);
-			WriteEvent("test-stream", "type2", "{}", "{Data: 2}");
-			WriteEvent("test-stream", "type3", "{}", "{Data: 3}");
-		}
-
-		[Test]
-		public async Task should_receive_live_caught_up_message_after_reading_existing_events() {
-			await using var sub = CreateAllSubscriptionFiltered(
-				_publisher, null, EventFilter.EventType.Prefixes(false, "type1"));
-
-			Assert.True(await sub.GetNext() is SubscriptionConfirmation);
-			Assert.AreEqual(_eventIds[0], ((Event)await sub.GetNext()).Id);
-			Assert.True(await sub.GetNext() is Checkpoint);
-			Assert.True(await sub.GetNext() is CaughtUp);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class subscribe_filtered_all_from_end<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		protected override void Given() {
-			EnableReadAll();
-			WriteEvent("test-stream", "type1", "{}", "{Data: 1}");
-			WriteEvent("test-stream", "type2", "{}", "{Data: 2}");
-			WriteEvent("test-stream", "type3", "{}", "{Data: 3}");
-		}
-
-		[Test]
-		public async Task should_receive_live_caught_up_message_immediately() {
-			await using var sub = CreateAllSubscriptionFiltered(
-				_publisher, Position.End, EventFilter.EventType.Prefixes(false, "type1"));
-
-			Assert.True(await sub.GetNext() is SubscriptionConfirmation);
-			Assert.True(await sub.GetNext() is CaughtUp);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class subscribe_filtered_all_from_position<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private readonly List<Guid> _eventIds = new();
-		private TFPos _subscribeFrom;
-
-		protected override void Given() {
-			EnableReadAll();
-			WriteEvent("test-stream", "theType", "{}", "{Data: 1}");
-			WriteEvent("test-stream", "type2", "{}", "{Data: 2}");
-			(_, _subscribeFrom) = WriteEvent("test-stream", "theType", "{}", "{Data: 2}");
-			_eventIds.Add(WriteEvent("test-stream", "theType", "{}", "{Data: 3}").Item1.EventId);
-			WriteEvent("test-stream", "type3", "{}", "{Data: 3}");
-			WriteEvent("test-stream", "type4", "{}", "{Data: 4}");
-		}
-
-		[Test]
-		public async Task should_receive_matching_events_after_start_position() {
-			await using var sub = CreateAllSubscriptionFiltered(
-				_publisher,
-				new Position((ulong)_subscribeFrom.CommitPosition, (ulong)_subscribeFrom.PreparePosition),
-				EventFilter.EventType.Prefixes(false, "theType"));
-
-			Assert.True(await sub.GetNext() is SubscriptionConfirmation);
-			Assert.AreEqual(_eventIds[0], ((Event)await sub.GetNext()).Id);
-			Assert.True(await sub.GetNext() is Checkpoint);
-			Assert.True(await sub.GetNext() is CaughtUp);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.CombinationTests.cs b/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.CombinationTests.cs
deleted file mode 100644
index a88811fce87..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.CombinationTests.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Enumerators;
-
-public partial class EnumeratorTests {
-	[TestFixture]
-	public class TestFixtureWithMiniNodeConnection : SpecificationWithDirectoryPerTestFixture {
-		protected MiniNode<LogFormat.V2, string> Node { get; private set; }
-		protected IEventStoreConnection NodeConnection { get; private set; }
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			Node = new MiniNode<LogFormat.V2, string>(PathName);
-			await Node.Start();
-			NodeConnection = TestConnection.To(Node, TcpType.Ssl, new UserCredentials("admin", "changeit"));
-			await NodeConnection.ConnectAsync();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			NodeConnection?.Dispose();
-			await Node.Shutdown();
-			await base.TestFixtureTearDown();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/AnyStreamRevisionTests.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/AnyStreamRevisionTests.cs
deleted file mode 100644
index 73125a29f34..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/AnyStreamRevisionTests.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Services.Transport.Grpc;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Grpc {
-	[TestFixture]
-	public class AnyStreamRevisionTests {
-		[Test]
-		public void Equality() {
-			var sut = AnyStreamRevision.NoStream;
-			Assert.AreEqual(AnyStreamRevision.NoStream, sut);
-		}
-
-		[Test]
-		public void Inequality() {
-			var sut = AnyStreamRevision.NoStream;
-			Assert.AreNotEqual(AnyStreamRevision.Any, sut);
-		}
-
-		[Test]
-		public void EqualityOperator() {
-			var sut = AnyStreamRevision.NoStream;
-			Assert.True(AnyStreamRevision.NoStream == sut);
-		}
-
-		[Test]
-		public void InequalityOperator() {
-			var sut = AnyStreamRevision.NoStream;
-			Assert.True(AnyStreamRevision.Any != sut);
-		}
-
-		public static IEnumerable<object[]> ArgumentOutOfRangeTestCases() {
-			yield return new object[] { 0 };
-			yield return new object[] { int.MaxValue };
-			yield return new object[] { -3 };
-		}
-
-		[TestCaseSource(nameof(ArgumentOutOfRangeTestCases))]
-		public void ArgumentOutOfRange(int value) {
-			var ex = Assert.Throws<ArgumentOutOfRangeException>(() => new AnyStreamRevision(value));
-			Assert.AreEqual(nameof(value), ex.ParamName);
-		}
-
-
-		public static IEnumerable<object[]> Int64TestCases() {
-			yield return new object[] { -1L, AnyStreamRevision.NoStream };
-			yield return new object[] { -2L, AnyStreamRevision.Any };
-			yield return new object[] { -4L, AnyStreamRevision.StreamExists };
-		}
-
-		[TestCaseSource(nameof(Int64TestCases))]
-		public void FromInt64ExpectedResult(long value, AnyStreamRevision expected)
-			=> Assert.AreEqual(expected, AnyStreamRevision.FromInt64(value));
-
-		[TestCaseSource(nameof(Int64TestCases))]
-		public void ToInt64ExpectedResult(long expected, AnyStreamRevision value)
-			=> Assert.AreEqual(expected, value.ToInt64());
-
-		[Test]
-		public void ExplicitConversionExpectedResult() {
-			const int expected = 1;
-			var actual = (int)new AnyStreamRevision(expected);
-			Assert.AreEqual(expected, actual);
-		}
-
-		[Test]
-		public void ImplicitConversionExpectedResult() {
-			const int expected = 1;
-			int actual = new AnyStreamRevision(expected);
-			Assert.AreEqual(expected, actual);
-		}
-
-		public static IEnumerable<object[]> ToStringTestCases() {
-			yield return new object[] { AnyStreamRevision.Any, nameof(AnyStreamRevision.Any) };
-			yield return new object[] { AnyStreamRevision.NoStream, nameof(AnyStreamRevision.NoStream) };
-			yield return new object[] { AnyStreamRevision.StreamExists, nameof(AnyStreamRevision.StreamExists) };
-		}
-
-		[TestCaseSource(nameof(ToStringTestCases))]
-		public void ToStringExpectedResult(AnyStreamRevision sut, string expected) {
-			Assert.AreEqual(expected, sut.ToString());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/MonitoringTests/StatsTests.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/MonitoringTests/StatsTests.cs
deleted file mode 100644
index 95652691933..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/MonitoringTests/StatsTests.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Client.Monitoring;
-using EventStore.Core.Tests.Integration;
-using Grpc.Net.Client;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Grpc.MonitoringTests {
-	public class StatsTests {
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_reading_stats<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
-			
-			private const int _expected = 3;
-			private const int _refreshTimePeriodInMs = 250;
-			private readonly List<StatsResp> _stats;
-
-			public when_reading_stats() {
-				_stats = new List<StatsResp>();
-			}
-			
-			protected override async Task Given() {
-				var node = GetLeader();
-				await Task.WhenAll(node.AdminUserCreated, node.Started);
-				
-				using var channel = GrpcChannel.ForAddress(new Uri($"https://{node.HttpEndPoint}"),
-					new GrpcChannelOptions {
-						HttpClient = new HttpClient(new SocketsHttpHandler {
-							SslOptions = {
-								RemoteCertificateValidationCallback = delegate { return true; }
-							}
-						}, true)
-					});
-				var client = new Client.Monitoring.Monitoring.MonitoringClient(channel);
-				var request = new StatsReq {
-					RefreshTimePeriodInMs = _refreshTimePeriodInMs
-				};
-				
-				using var resp = client.Stats(request);
-			
-				var count = 0;
-				var cts = new CancellationTokenSource(_refreshTimePeriodInMs * _expected * 2);
-				while (count < _expected && await resp.ResponseStream.MoveNext(cts.Token)) {
-					_stats.Add(resp.ResponseStream.Current);
-					count++;
-				}
-			}
-
-			[Test]
-			public void should_receive_expected_amount_of_stats_messages() {
-				Assert.AreEqual(_expected, _stats.Count);
-			}
-
-		}	
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/CreateTests.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/CreateTests.cs
deleted file mode 100644
index 863c2812db1..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/CreateTests.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Client;
-using EventStore.Client.PersistentSubscriptions;
-using EventStore.Core.Tests.Services.Transport.Grpc.StreamsTests;
-using Google.Protobuf;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Grpc.PersistentSubscriptionTests {
-	[TestFixture(typeof(LogFormat.V2), typeof(string), false)]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), false)]
-	[TestFixture(typeof(LogFormat.V2), typeof(string), true)]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), true)]
-	public class CreateTests<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
-		private readonly bool _legacy;
-
-		public CreateTests(bool legacy) {
-			_legacy = legacy;
-		}
-		protected override Task Given() => Task.CompletedTask;
-
-		protected override Task When() => Task.CompletedTask;
-
-		[Test]
-		public async Task can_create_persistent_subscription() {
-			var client = new PersistentSubscriptions.PersistentSubscriptionsClient(Channel);
-
-			var settings = new CreateReq.Types.Settings {
-				CheckpointAfterMs = 10000,
-				ExtraStatistics = true,
-				MaxCheckpointCount = 20,
-				MinCheckpointCount = 10,
-				MaxRetryCount = 30,
-				MaxSubscriberCount = 40,
-				MessageTimeoutMs = 20000,
-				HistoryBufferSize = 60,
-				LiveBufferSize = 10,
-				ReadBatchSize = 50
-			};
-
-			if (_legacy) {
-#pragma warning disable 612
-				settings.NamedConsumerStrategy = CreateReq.Types.ConsumerStrategy.Pinned;
-#pragma warning restore 612
-			} else {
-				settings.ConsumerStrategy = "Pinned";
-			}
-
-			await client.CreateAsync(
-				new CreateReq {
-					Options = new CreateReq.Types.Options {
-						GroupName = "group",
-						Stream = new CreateReq.Types.StreamOptions {
-							Start = new Empty(),
-							StreamIdentifier = new StreamIdentifier {
-								StreamName = ByteString.CopyFromUtf8("stream")
-							}
-						},
-						Settings = settings
-					}
-				},
-				GetCallOptions(AdminCredentials));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/GetInfoTests.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/GetInfoTests.cs
deleted file mode 100644
index 34de36778c7..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/GetInfoTests.cs
+++ /dev/null
@@ -1,429 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Client;
-using EventStore.Client.PersistentSubscriptions;
-using EventStore.Client.Streams;
-using EventStore.Core.Tests.Services.Transport.Grpc.StreamsTests;
-using Google.Protobuf;
-using Grpc.Core;
-using NUnit.Framework;
-using ReadReq = EventStore.Client.PersistentSubscriptions.ReadReq;
-using ReadResp = EventStore.Client.PersistentSubscriptions.ReadResp;
-using StreamsReadReq = EventStore.Client.Streams.ReadReq;
-using StreamsReadResp = EventStore.Client.Streams.ReadResp;
-
-namespace EventStore.Core.Tests.Services.Transport.Grpc.PersistentSubscriptionTests {
-	public class GetInfoTests {
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_getting_info_for_persistent_subscription_group_on_stream<TLogFormat, TStreamId>
-				: GrpcSpecification<TLogFormat, TStreamId> {
-			private string _groupName = "test-group";
-			private string _streamName = "test-stream";
-			private SubscriptionInfo _actualSubscriptionInfo;
-			private SubscriptionInfo _expectedSubscriptionInfo;
-			private PersistentSubscriptions.PersistentSubscriptionsClient _persistentSubscriptionsClient;
-
-			protected override async Task Given() {
-				_persistentSubscriptionsClient = new PersistentSubscriptions.PersistentSubscriptionsClient(Channel);
-
-				var settings = WithoutExtraStatistics(TestPersistentSubscriptionSettings);
-				
-				await _persistentSubscriptionsClient.CreateAsync(new CreateReq {
-					Options = new CreateReq.Types.Options {
-						GroupName = _groupName,
-						Stream = new CreateReq.Types.StreamOptions {
-							Start = new Empty(),
-							StreamIdentifier = new StreamIdentifier {
-								StreamName = ByteString.CopyFromUtf8(_streamName)
-							}
-						},
-						Settings = settings
-					}
-				}, GetCallOptions(AdminCredentials));
-				
-				// create a connection to the persistent subscription
-				var call = _persistentSubscriptionsClient.Read(GetCallOptions(AdminCredentials));
-				await call.RequestStream.WriteAsync(new ReadReq {
-					Options = new ReadReq.Types.Options {
-						GroupName = _groupName,
-						StreamIdentifier = new StreamIdentifier {
-							StreamName = ByteString.CopyFromUtf8(_streamName)
-						},
-						UuidOption = new ReadReq.Types.Options.Types.UUIDOption {Structured = new Empty()},
-						BufferSize = 10
-					}
-				});
-
-				await call.ResponseStream.MoveNext();
-				
-				Assert.IsTrue(call.ResponseStream.Current.ContentCase == ReadResp.ContentOneofCase.SubscriptionConfirmation);
-
-				var expectedConnection = new SubscriptionInfo.Types.ConnectionInfo() {
-					Username = "admin",
-					AvailableSlots = 10,
-					ConnectionName = "\u003cunknown\u003e"
-				};
-				_expectedSubscriptionInfo = GetSubscriptionInfoFromSettings(settings,
-					_groupName, _streamName, "0", string.Empty, new [] { expectedConnection });
-			}
-
-			private CreateReq.Types.Settings WithoutExtraStatistics(CreateReq.Types.Settings settings) {
-				settings.ExtraStatistics = false;
-				return settings;
-			}
-
-			protected override async Task When() {
-				await WaitForSubscriptionsToBeLive(_persistentSubscriptionsClient, GetCallOptions(AdminCredentials));
-				
-				var resp = await _persistentSubscriptionsClient.GetInfoAsync(new GetInfoReq {
-					Options = new GetInfoReq.Types.Options {
-						GroupName = _groupName,
-						StreamIdentifier = new StreamIdentifier {
-							StreamName = ByteString.CopyFromUtf8(_streamName)
-						}
-					}
-				}, GetCallOptions(AdminCredentials));
-				_actualSubscriptionInfo = resp.SubscriptionInfo;
-			}
-
-			[Test]
-			public void should_receive_the_correct_stats() {
-				Assert.AreEqual(_expectedSubscriptionInfo, _actualSubscriptionInfo);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_listing_persistent_subscriptions_on_stream<TLogFormat, TStreamId>
-				: GrpcSpecification<TLogFormat, TStreamId> {
-			private string _streamName = "test-stream";
-			private List<SubscriptionInfo> _actualSubscriptionInfo;
-			private List<SubscriptionInfo> _expectedSubscriptionInfo = new();
-			private PersistentSubscriptions.PersistentSubscriptionsClient _persistentSubscriptionsClient;
-
-			protected override async Task Given() {
-				_persistentSubscriptionsClient = new PersistentSubscriptions.PersistentSubscriptionsClient(Channel);
-
-				var groupNames = new[] { "groupA", "groupB", "groupC" };
-				foreach (var group in groupNames) {
-					await _persistentSubscriptionsClient.CreateAsync(new CreateReq {
-						Options = new CreateReq.Types.Options {
-							GroupName = group,
-							Stream = new CreateReq.Types.StreamOptions {
-								Start = new Empty(),
-								StreamIdentifier = new StreamIdentifier {
-									StreamName = ByteString.CopyFromUtf8(_streamName)
-								}
-							},
-							Settings = TestPersistentSubscriptionSettings
-						}
-					}, GetCallOptions(AdminCredentials));
-					_expectedSubscriptionInfo.Add(GetSubscriptionInfoFromSettings(
-						TestPersistentSubscriptionSettings, group, _streamName, "0", string.Empty));
-				}
-			}
-
-			protected override async Task When() {
-				await WaitForSubscriptionsToBeLive(_persistentSubscriptionsClient, GetCallOptions(AdminCredentials));
-				
-				ListResp resp = await _persistentSubscriptionsClient.ListAsync(new ListReq {
-					Options = new ListReq.Types.Options {
-						ListForStream = new ListReq.Types.StreamOption{
-							Stream = new StreamIdentifier {
-								StreamName = ByteString.CopyFromUtf8(_streamName)
-							}
-						}
-					}
-				}, GetCallOptions(AdminCredentials));
-				_actualSubscriptionInfo = resp.Subscriptions.ToList();
-			}
-
-			[Test]
-			public void should_receive_the_correct_stats() {
-				CollectionAssert.AreEquivalent(_expectedSubscriptionInfo, _actualSubscriptionInfo);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_listing_persistent_subscriptions_on_all_stream<TLogFormat, TStreamId>
-				: GrpcSpecification<TLogFormat, TStreamId> {
-			private List<SubscriptionInfo> _actualSubscriptionInfo;
-			private List<SubscriptionInfo> _expectedSubscriptionInfo = new();
-			private PersistentSubscriptions.PersistentSubscriptionsClient _persistentSubscriptionsClient;
-
-			protected override async Task Given() {
-				_persistentSubscriptionsClient = new PersistentSubscriptions.PersistentSubscriptionsClient(Channel);
-
-				var groupNames = new[] {"groupA", "groupB", "groupC"};
-				foreach (var group in groupNames) {
-					await _persistentSubscriptionsClient.CreateAsync(new CreateReq {
-						Options = new CreateReq.Types.Options {
-							GroupName = group,
-							All = new CreateReq.Types.AllOptions {
-								Start = new Empty()
-							},
-							Settings = TestPersistentSubscriptionSettings
-						}
-					}, GetCallOptions(AdminCredentials));
-				}
-
-				var events = await GetAllEvents(StreamsClient, GetCallOptions(AdminCredentials));
-
-				var lastPosition = (long)events.Last().Event.CommitPosition;
-				_expectedSubscriptionInfo = groupNames.Select(x =>
-					GetSubscriptionInfoFromSettings(TestPersistentSubscriptionSettings, x, "$all", "C:0/P:0",
-						$"C:{lastPosition}/P:{lastPosition}")).ToList();
-			}
-
-			protected override async Task When() {
-				await WaitForSubscriptionsToBeLive(_persistentSubscriptionsClient, GetCallOptions(AdminCredentials));
-				
-				// Get the subscription info
-				ListResp resp = await _persistentSubscriptionsClient.ListAsync(new ListReq {
-					Options = new ListReq.Types.Options {
-						ListForStream = new ListReq.Types.StreamOption {
-							All = new Empty()
-						}
-					}
-				}, GetCallOptions(AdminCredentials));
-				_actualSubscriptionInfo = resp.Subscriptions.ToList();
-			}
-
-			[Test]
-			public void should_receive_the_correct_stats() {
-				// Set the buffer counts to 0 to make comparison easier
-				_actualSubscriptionInfo.ForEach(x => x.LiveBufferCount = 0);
-				_actualSubscriptionInfo.ForEach(x => x.ReadBufferCount = 0);
-				CollectionAssert.AreEquivalent(_expectedSubscriptionInfo, _actualSubscriptionInfo);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_listing_all_persistent_subscriptions<TLogFormat, TStreamId>
-				: GrpcSpecification<TLogFormat, TStreamId> {
-			private List<SubscriptionInfo> _actualSubscriptionInfo;
-			private List<SubscriptionInfo> _expectedSubscriptionInfo = new();
-			private PersistentSubscriptions.PersistentSubscriptionsClient _persistentSubscriptionsClient;
-
-			protected override async Task Given() {
-				_persistentSubscriptionsClient = new PersistentSubscriptions.PersistentSubscriptionsClient(Channel);
-
-				var subscriptionNames = new Dictionary<string, string[]> {
-					{"streamA", new[] {"groupA"}},
-					{"streamB", new[] {"groupB-1", "groupB-2"}},
-					{"streamC", new[] {"groupC"}},
-				};
-				foreach (var (stream, groupNames) in subscriptionNames) {
-					foreach (var group in groupNames) {
-						await _persistentSubscriptionsClient.CreateAsync(new CreateReq {
-							Options = new CreateReq.Types.Options {
-								GroupName = group,
-								Stream = new CreateReq.Types.StreamOptions {
-									Start = new Empty(),
-									StreamIdentifier = new StreamIdentifier {
-										StreamName = ByteString.CopyFromUtf8(stream)
-									}
-								},
-								Settings = TestPersistentSubscriptionSettings
-							}
-						}, GetCallOptions(AdminCredentials));
-						_expectedSubscriptionInfo.Add(GetSubscriptionInfoFromSettings(
-							TestPersistentSubscriptionSettings, group, stream, "0",	string.Empty));
-					}
-				}
-				await _persistentSubscriptionsClient.CreateAsync(new CreateReq {
-					Options = new CreateReq.Types.Options {
-						GroupName = "groupD",
-						All = new CreateReq.Types.AllOptions {
-							Start = new Empty()
-						},
-						Settings = TestPersistentSubscriptionSettings
-					}
-				}, GetCallOptions(AdminCredentials));
-
-				var events = await GetAllEvents(StreamsClient, GetCallOptions(AdminCredentials));
-
-				var lastPosition = (long)events.Last().Event.CommitPosition;
-				_expectedSubscriptionInfo.Add(GetSubscriptionInfoFromSettings(
-					TestPersistentSubscriptionSettings, "groupD", "$all", "C:0/P:0",
-					$"C:{lastPosition}/P:{lastPosition}"));
-			}
-
-			protected override async Task When() {
-				await WaitForSubscriptionsToBeLive(_persistentSubscriptionsClient, GetCallOptions(AdminCredentials));
-				
-				var resp = await _persistentSubscriptionsClient.ListAsync(new ListReq {
-					Options = new ListReq.Types.Options {
-						ListAllSubscriptions = new Empty()
-					}
-				}, GetCallOptions(AdminCredentials));
-
-				_actualSubscriptionInfo = resp.Subscriptions.ToList();
-			}
-
-			[Test]
-			public void should_receive_the_correct_stats() {
-				// Set the buffer counts to 0 to make comparison easier
-				_actualSubscriptionInfo.ForEach(x => x.LiveBufferCount = 0);
-				_actualSubscriptionInfo.ForEach(x => x.ReadBufferCount = 0);
-				CollectionAssert.AreEquivalent(_expectedSubscriptionInfo, _actualSubscriptionInfo);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_getting_info_for_persistent_subscription_group_on_all<TLogFormat, TStreamId>
-				: GrpcSpecification<TLogFormat, TStreamId> {
-			private string _groupName = "test-group";
-			private SubscriptionInfo _actualSubscriptionInfo;
-			private SubscriptionInfo _expectedSubscriptionInfo;
-			private PersistentSubscriptions.PersistentSubscriptionsClient _persistentSubscriptionsClient;
-
-			protected override async Task Given() {
-				_persistentSubscriptionsClient = new PersistentSubscriptions.PersistentSubscriptionsClient(Channel);
-
-				await _persistentSubscriptionsClient.CreateAsync(new CreateReq {
-					Options = new CreateReq.Types.Options {
-						GroupName = _groupName,
-						All = new CreateReq.Types.AllOptions {
-							Start = new Empty()
-						},
-						Settings = TestPersistentSubscriptionSettings
-					}
-				}, GetCallOptions(AdminCredentials));
-
-				var events = await GetAllEvents(StreamsClient, GetCallOptions(AdminCredentials));
-
-				var lastPosition = (long)events.Last().Event.CommitPosition;
-				_expectedSubscriptionInfo =
-					GetSubscriptionInfoFromSettings(TestPersistentSubscriptionSettings, _groupName,
-						"$all", "C:0/P:0", $"C:{lastPosition}/P:{lastPosition}");
-			}
-
-			protected override async Task When() {
-				await WaitForSubscriptionsToBeLive(_persistentSubscriptionsClient, GetCallOptions(AdminCredentials));
-				
-				var resp = await _persistentSubscriptionsClient.GetInfoAsync(new GetInfoReq {
-					Options = new GetInfoReq.Types.Options {
-						GroupName = _groupName,
-						All = new Empty()
-					}
-				}, GetCallOptions(AdminCredentials));
-				_actualSubscriptionInfo = resp.SubscriptionInfo;
-			}
-
-			[Test]
-			public void should_receive_the_correct_stats() {
-				// Set the buffer counts to 0 to make comparison easier
-				_actualSubscriptionInfo.LiveBufferCount = 0;
-				_actualSubscriptionInfo.ReadBufferCount = 0;
-				Assert.AreEqual(_expectedSubscriptionInfo, _actualSubscriptionInfo);
-			}
-		}
-
-		private static async Task<List<StreamsReadResp>> GetAllEvents(Streams.StreamsClient client, CallOptions callOptions) {
-			var call = client.Read(new() {
-				Options = new() {
-					ReadDirection = StreamsReadReq.Types.Options.Types.ReadDirection.Forwards,
-					Count = 100,
-					NoFilter = new(),
-					UuidOption = new() { Structured = new() },
-					All = new() {
-						Start = new()
-					}
-				}
-			}, callOptions);
-
-			var events = new List<StreamsReadResp>();
-			await foreach (var evnt in call.ResponseStream.ReadAllAsync()) {
-				if (evnt.ContentCase is StreamsReadResp.ContentOneofCase.Event) {
-					events.Add(evnt);
-
-				}
-			}
-			return events;
-		}
-
-		private static CreateReq.Types.Settings TestPersistentSubscriptionSettings => new CreateReq.Types.Settings {
-			CheckpointAfterMs = 10000,
-			ExtraStatistics = true,
-			MaxCheckpointCount = 20,
-			MinCheckpointCount = 10,
-			MaxRetryCount = 30,
-			MaxSubscriberCount = 40,
-			MessageTimeoutMs = 20000,
-			HistoryBufferSize = 60,
-			LiveBufferSize = 10,
-			ConsumerStrategy = "Pinned",
-			ReadBatchSize = 50
-		};
-
-		private static SubscriptionInfo GetSubscriptionInfoFromSettings(
-			CreateReq.Types.Settings settings, string groupName, string streamName, string startFrom,
-			string lastKnownEvent, SubscriptionInfo.Types.ConnectionInfo[] connections=null ) {
-			var info = new SubscriptionInfo() {
-				EventSource = streamName,
-				GroupName = groupName,
-				Status = "Live",
-				AveragePerSecond = 0,
-				TotalItems = 0,
-				CountSinceLastMeasurement = 0,
-				LastCheckpointedEventPosition = string.Empty,
-				LastKnownEventPosition = lastKnownEvent,
-				ResolveLinkTos = settings.ResolveLinks,
-				StartFrom = startFrom,
-				MessageTimeoutMilliseconds = settings.MessageTimeoutMs,
-				ExtraStatistics = settings.ExtraStatistics,
-				MaxRetryCount = settings.MaxRetryCount,
-				LiveBufferSize = settings.LiveBufferSize,
-				BufferSize = settings.HistoryBufferSize,
-				ReadBatchSize = settings.ReadBatchSize,
-				CheckPointAfterMilliseconds = settings.CheckpointAfterMs,
-				MinCheckPointCount = settings.MinCheckpointCount,
-				MaxCheckPointCount = settings.MaxCheckpointCount,
-				ReadBufferCount = 0,
-				LiveBufferCount = 0,
-				RetryBufferCount = 0,
-				TotalInFlightMessages = 0,
-				OutstandingMessagesCount = 0,
-				NamedConsumerStrategy = "Pinned",
-				MaxSubscriberCount = settings.MaxSubscriberCount,
-				ParkedMessageCount = 0
-			};
-
-			if (connections != null) {
-				info.Connections.AddRange(connections);
-			}
-
-			return info;
-		}
-
-		private static async Task WaitForSubscriptionsToBeLive(PersistentSubscriptions.PersistentSubscriptionsClient client, CallOptions callOptions) {
-			var resp = await GetSubscriptions();
-
-			for (int i = 0; resp.Subscriptions.Any(s => s.Status != "Live"); i++) {
-				Assert.AreNotEqual(5, i, "Reached too many retries to get all subscriptions live!");
-				
-				await Task.Delay(500);
-				resp = await GetSubscriptions();
-			}
-			
-			async Task<ListResp> GetSubscriptions() {
-				return await client.ListAsync(new ListReq {
-					Options = new ListReq.Types.Options {
-						ListAllSubscriptions = new Empty()
-					}
-				}, callOptions);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/ReplayParkedTests.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/ReplayParkedTests.cs
deleted file mode 100644
index 50ce612f67e..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/ReplayParkedTests.cs
+++ /dev/null
@@ -1,349 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Client;
-using EventStore.Client.PersistentSubscriptions;
-using EventStore.Client.Streams;
-using EventStore.Core.Services.Transport.Grpc;
-using EventStore.Core.Tests.Services.Transport.Grpc.StreamsTests;
-using Google.Protobuf;
-using Grpc.Core;
-using NUnit.Framework;
-using ReadReq = EventStore.Client.PersistentSubscriptions.ReadReq;
-using ReadResp = EventStore.Client.PersistentSubscriptions.ReadResp;
-using StreamsReadReq = EventStore.Client.Streams.ReadReq;
-using StreamsReadResp = EventStore.Client.Streams.ReadResp;
-
-namespace EventStore.Core.Tests.Services.Transport.Grpc.PersistentSubscriptionTests {
-	public class ReplayParkedTests {
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_replaying_parked_messages_with_no_limit_for_existing_subscription<TLogFormat, TStreamId>
-				: GrpcSpecification<TLogFormat, TStreamId> {
-			private string _groupName = "test-group";
-			private string _streamName = "test-stream";
-			private int _eventCount = 10;
-			private PersistentSubscriptions.PersistentSubscriptionsClient _persistentSubscriptionsClient;
-			private AsyncDuplexStreamingCall<ReadReq, ReadResp> _subscriptionStream;
-			private List<ulong> _expectedEventVersions = new List<ulong>();
-			private List<ulong> _actualEventVersions = new List<ulong>();
-
-			protected override async Task Given() {
-				_persistentSubscriptionsClient = new PersistentSubscriptions.PersistentSubscriptionsClient(Channel);
-
-				await CreateTestPersistentSubscription(_persistentSubscriptionsClient, _streamName, _groupName, GetCallOptions(AdminCredentials));
-
-				_subscriptionStream = await SubscribeToPersistentSubscription(
-					_persistentSubscriptionsClient, _groupName, _streamName, GetCallOptions(AdminCredentials));
-
-				// Write events to the subscription
-				var writeRes = await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						Any = new(),
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) }
-					},
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(_eventCount) },
-					CorrelationId = Uuid.NewUuid().ToDto(),
-				});
-				Assert.NotNull(writeRes.Success);
-
-				// Park all of the messages
-				for(var i = 0; i < _eventCount; i++) {
-					Assert.True(await _subscriptionStream.ResponseStream.MoveNext());
-					Assert.AreEqual(ReadResp.ContentOneofCase.Event, _subscriptionStream.ResponseStream.Current.ContentCase);
-					var evnt = _subscriptionStream.ResponseStream.Current.Event;
-					await _subscriptionStream.RequestStream.WriteAsync(new ReadReq {
-						Nack = new ReadReq.Types.Nack {
-							Action = ReadReq.Types.Nack.Types.Action.Park,
-							Ids = {
-							evnt.Event.Id
-						},
-							Reason = "testing"
-						}
-					});
-				}
-
-				// Check that the events were parked
-				await WaitForEventsInStream(
-					StreamsClient, $"$persistentsubscription-{_streamName}::{_groupName}-parked", _eventCount, GetCallOptions(AdminCredentials));
-			}
-
-			protected override async Task When() {
-				await _persistentSubscriptionsClient.ReplayParkedAsync(new ReplayParkedReq {
-					Options = new ReplayParkedReq.Types.Options {
-						GroupName = _groupName,
-						StreamIdentifier = new StreamIdentifier {
-							StreamName = ByteString.CopyFromUtf8(_streamName)
-						},
-						NoLimit = new()
-					}
-				}, GetCallOptions(AdminCredentials));
-				for (var i = 0; i < _eventCount; i++) {
-					Assert.True(await _subscriptionStream.ResponseStream.MoveNext());
-					var curr = _subscriptionStream.ResponseStream.Current;
-					Assert.AreEqual(ReadResp.ContentOneofCase.Event, curr.ContentCase);
-					_actualEventVersions.Add(curr.Event.Event.StreamRevision);
-
-					// Ack the event otherwise the test can throw an error
-					await _subscriptionStream.RequestStream.WriteAsync(new ReadReq {
-							Ack = new ReadReq.Types.Ack {
-								Ids = {
-								curr.Event.Event.Id
-							},
-						}
-					});
-				}
-			}
-
-			[Test]
-			public void should_receive_replayed_messages() {
-				_expectedEventVersions = Enumerable.Range(0, _eventCount).Select(x => (ulong)x).ToList();
-				CollectionAssert.AreEqual(_expectedEventVersions, _actualEventVersions);
-			}
-
-			[TearDown]
-			public void Teardown() {
-				_subscriptionStream.Dispose();
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_replaying_parked_messages_with_a_replay_limit_for_existing_subscription<TLogFormat, TStreamId>
-				: GrpcSpecification<TLogFormat, TStreamId> {
-			private string _groupName = "test-group";
-			private string _streamName = "test-stream";
-			private int _eventCount = 10;
-			private PersistentSubscriptions.PersistentSubscriptionsClient _persistentSubscriptionsClient;
-			private AsyncDuplexStreamingCall<ReadReq, ReadResp> _subscriptionStream;
-			private List<ulong> _expectedEventVersions = new List<ulong>();
-			private List<ulong> _actualEventVersions = new List<ulong>();
-
-			protected override async Task Given() {
-				_persistentSubscriptionsClient = new PersistentSubscriptions.PersistentSubscriptionsClient(Channel);
-
-				await CreateTestPersistentSubscription(_persistentSubscriptionsClient, _streamName, _groupName, GetCallOptions(AdminCredentials));
-
-				_subscriptionStream = await SubscribeToPersistentSubscription(
-					_persistentSubscriptionsClient, _groupName, _streamName, GetCallOptions(AdminCredentials));
-
-				// Write events to the subscription
-				var writeRes = await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						Any = new(),
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) }
-					},
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(_eventCount) },
-					CorrelationId = Uuid.NewUuid().ToDto(),
-				});
-				Assert.NotNull(writeRes.Success);
-
-				// Park all of the messages
-				for (var i = 0; i < _eventCount; i++) {
-					Assert.True(await _subscriptionStream.ResponseStream.MoveNext());
-					Assert.AreEqual(ReadResp.ContentOneofCase.Event, _subscriptionStream.ResponseStream.Current.ContentCase);
-					var evnt = _subscriptionStream.ResponseStream.Current.Event;
-					//_allEventIds.Add(Uuid.FromDto(evnt.Event.Id));
-					await _subscriptionStream.RequestStream.WriteAsync(new ReadReq {
-						Nack = new ReadReq.Types.Nack {
-							Action = ReadReq.Types.Nack.Types.Action.Park,
-							Ids = {
-							evnt.Event.Id
-						},
-							Reason = "testing"
-						}
-					});
-				}
-
-				// Check that the events were parked
-				await WaitForEventsInStream(
-					StreamsClient, $"$persistentsubscription-{_streamName}::{_groupName}-parked", _eventCount, GetCallOptions(AdminCredentials));
-			}
-
-			protected override async Task When() {
-				await _persistentSubscriptionsClient.ReplayParkedAsync(new ReplayParkedReq {
-					Options = new ReplayParkedReq.Types.Options {
-						GroupName = _groupName,
-						StreamIdentifier = new StreamIdentifier {
-							StreamName = ByteString.CopyFromUtf8(_streamName)
-						},
-						StopAt = 1
-					}
-				}, GetCallOptions(AdminCredentials));
-
-				Assert.True(await _subscriptionStream.ResponseStream.MoveNext());
-				var evnt = _subscriptionStream.ResponseStream.Current.Event.Event;
-				_actualEventVersions.Add(evnt.StreamRevision);
-				// Ack the event otherwise the test can throw an error
-				await _subscriptionStream.RequestStream.WriteAsync(new ReadReq {
-					Ack = new ReadReq.Types.Ack {
-						Ids = {
-							evnt.Id
-						},
-					}
-				});
-
-				// Write one more event so we can be sure the other parked messages aren't being replayed
-				var writeRes = await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						Any = new(),
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) }
-					},
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(1) },
-					CorrelationId = Uuid.NewUuid().ToDto(),
-				});
-				Assert.NotNull(writeRes.Success);
-
-				Assert.True(await _subscriptionStream.ResponseStream.MoveNext());
-				evnt = _subscriptionStream.ResponseStream.Current.Event.Event;
-				_actualEventVersions.Add(evnt.StreamRevision);
-
-				// Ack the event otherwise the test can throw an error
-				await _subscriptionStream.RequestStream.WriteAsync(new ReadReq {
-					Ack = new ReadReq.Types.Ack {
-						Ids = {
-							evnt.Id
-						},
-					}
-				});
-			}
-
-			[Test]
-			public void should_receive_one_replayed_message_and_new_message() {
-				_expectedEventVersions = new List<ulong> { 0, 10 };
-				CollectionAssert.AreEqual(_expectedEventVersions, _actualEventVersions);
-			}
-
-			[TearDown]
-			public void Teardown() {
-				_subscriptionStream.Dispose();
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_replaying_parked_messages_for_non_existent_subscription<TLogFormat, TStreamId>
-				: GrpcSpecification<TLogFormat, TStreamId> {
-			private string _groupName = "test-group";
-			private string _streamName = "test-stream";
-			private PersistentSubscriptions.PersistentSubscriptionsClient _persistentSubscriptionsClient;
-			private Exception _exception;
-
-			protected override Task Given() {
-				_persistentSubscriptionsClient = new PersistentSubscriptions.PersistentSubscriptionsClient(Channel);
-				return Task.CompletedTask;
-			}
-
-			protected override async Task When() {
-				try {
-					await _persistentSubscriptionsClient.ReplayParkedAsync(new ReplayParkedReq {
-						Options = new ReplayParkedReq.Types.Options {
-							GroupName = _groupName,
-							StreamIdentifier = new StreamIdentifier {
-								StreamName = ByteString.CopyFromUtf8(_streamName)
-							},
-							NoLimit = new()
-						}
-					}, GetCallOptions(AdminCredentials));
-				} catch(Exception e) {
-					_exception = e;
-				}
-			}
-
-			[Test]
-			public void should_receive_not_found_error() {
-				Assert.IsInstanceOf<RpcException>(_exception);
-				Assert.AreEqual(StatusCode.NotFound, ((RpcException)_exception).Status.StatusCode);
-			}
-		}
-
-		private static async Task<AsyncDuplexStreamingCall<ReadReq, ReadResp>> SubscribeToPersistentSubscription(
-			PersistentSubscriptions.PersistentSubscriptionsClient client, string groupName, string streamName, CallOptions callOptions) {
-			var call = client.Read(callOptions);
-
-			await call.RequestStream.WriteAsync(new ReadReq {
-				Options = new ReadReq.Types.Options {
-					GroupName = groupName,
-					StreamIdentifier = new StreamIdentifier {
-						StreamName = ByteString.CopyFromUtf8(streamName)
-					},
-					BufferSize = 10,
-					UuidOption = new ReadReq.Types.Options.Types.UUIDOption {
-						Structured = new Empty()
-					}
-				}
-			});
-			if (!await call.ResponseStream.MoveNext() ||
-				call.ResponseStream.Current.ContentCase != ReadResp.ContentOneofCase.SubscriptionConfirmation) {
-				throw new InvalidOperationException();
-			}
-
-			return call;
-		}
-
-		private static async Task<StreamsReadResp[]> WaitForEventsInStream(
-			Streams.StreamsClient streamsClient, string streamName, int count, CallOptions callOptions) {
-			using var call = streamsClient.Read(new() {
-				Options = new() {
-					Subscription = new(),
-					NoFilter = new(),
-					ReadDirection = StreamsReadReq.Types.Options.Types.ReadDirection.Forwards,
-					UuidOption = new() { Structured = new() },
-					Stream = new() {
-						StreamIdentifier = new() {
-							StreamName = ByteString.CopyFromUtf8(streamName)
-						},
-						Start = new()
-					}
-				}
-			}, callOptions);
-
-			var events = new List<StreamsReadResp>();
-			await foreach (var evnt in call.ResponseStream.ReadAllAsync()) {
-				if (evnt.ContentCase is StreamsReadResp.ContentOneofCase.Event) {
-					events.Add(evnt);
-					if (events.Count >= count)
-						break;
-				}
-			}
-			return events.ToArray();
-		}
-
-		private static async Task CreateTestPersistentSubscription(
-			PersistentSubscriptions.PersistentSubscriptionsClient client, string streamName, string groupName, CallOptions callOptions) {
-			var settings = new CreateReq.Types.Settings {
-				CheckpointAfterMs = 10000,
-				ExtraStatistics = true,
-				MaxCheckpointCount = 20,
-				MinCheckpointCount = 10,
-				MaxRetryCount = 30,
-				MaxSubscriberCount = 40,
-				MessageTimeoutMs = 20000,
-				HistoryBufferSize = 60,
-				LiveBufferSize = 10,
-				ConsumerStrategy = "Pinned",
-				ReadBatchSize = 50
-			};
-
-			await client.CreateAsync(new CreateReq {
-				Options = new CreateReq.Types.Options {
-					GroupName = groupName,
-					Stream = new CreateReq.Types.StreamOptions {
-						Start = new Empty(),
-						StreamIdentifier = new StreamIdentifier {
-							StreamName = ByteString.CopyFromUtf8(streamName)
-						}
-					},
-					Settings = settings
-				}
-			}, callOptions);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/RestartSubsystemTests.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/RestartSubsystemTests.cs
deleted file mode 100644
index 9a0af484951..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/RestartSubsystemTests.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Client;
-using EventStore.Client.PersistentSubscriptions;
-using EventStore.Core.Tests.Services.Transport.Grpc.StreamsTests;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Grpc.PersistentSubscriptionTests {
-	internal class RestartSubsystemTests {
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_restarting_the_persistent_subscription_subsystem<TLogFormat, TStreamId>
-				: GrpcSpecification<TLogFormat, TStreamId> {
-			private PersistentSubscriptions.PersistentSubscriptionsClient _persistentSubscriptionsClient;
-			private Exception _exception;
-
-			protected override Task Given() {
-				_persistentSubscriptionsClient = new PersistentSubscriptions.PersistentSubscriptionsClient(Channel);
-				return Task.CompletedTask;
-			}
-
-			protected override async Task When() {
-				try {
-					await _persistentSubscriptionsClient.RestartSubsystemAsync(new Empty(), GetCallOptions(AdminCredentials));
-				} catch (Exception e) {
-					_exception = e;
-				}
-			}
-
-			[Test]
-			public void should_not_throw_an_exception() {
-				Assert.IsNull(_exception);
-			}
-		}
-
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/PositionTests.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/PositionTests.cs
deleted file mode 100644
index 3d0d4744986..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/PositionTests.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Core.Services.Transport.Grpc;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Grpc {
-	public class PositionTests {
-		[Test]
-		public void Equality() {
-			var sut = new Position(6, 5);
-
-			Assert.AreEqual(new Position(6, 5), sut);
-		}
-
-		[Test]
-		public void Inequality() {
-			var sut = new Position(6, 5);
-
-			Assert.AreNotEqual(new Position(7, 6), sut);
-		}
-
-		[Test]
-		public void EqualityOperator() {
-			var sut = new Position(6, 5);
-
-			Assert.True(new Position(6, 5) == sut);
-		}
-
-		[Test]
-		public void InequalityOperator() {
-			var sut = new Position(6, 5);
-
-			Assert.True(new Position(7, 6) != sut);
-		}
-
-		public static IEnumerable<object[]> ArgumentOutOfRangeTestCases() {
-			const string commitPosition = nameof(commitPosition);
-			const string preparePosition = nameof(preparePosition);
-
-			yield return new object[] {5UL, 6UL, commitPosition};
-			yield return new object[] {ulong.MaxValue - 1, 6UL, commitPosition};
-			yield return new object[] {ulong.MaxValue, ulong.MaxValue - 1, preparePosition};
-			yield return new object[] {(ulong)long.MaxValue + 1, (ulong)long.MaxValue, commitPosition};
-		}
-
-		[TestCaseSource(nameof(ArgumentOutOfRangeTestCases))]
-		public void ArgumentOutOfRange(ulong commitPosition, ulong preparePosition, string name) {
-			var ex = Assert.Throws<ArgumentOutOfRangeException>(() => new Position(commitPosition, preparePosition));
-			Assert.AreEqual(name, ex.ParamName);
-		}
-
-		public static IEnumerable<object[]> GreaterThanTestCases() {
-			yield return new object[] {new Position(6, 6), new Position(6, 5)};
-			yield return new object[] {Position.End, new Position(ulong.MaxValue, 0),};
-		}
-
-		[TestCaseSource(nameof(GreaterThanTestCases))]
-		public void GreaterThan(Position left, Position right) => Assert.True(left > right);
-
-		public static IEnumerable<object[]> GreaterThanOrEqualToTestCases()
-			=> GreaterThanTestCases().Concat(new[] {new object[] {Position.Start, Position.Start}});
-
-		[TestCaseSource(nameof(GreaterThanOrEqualToTestCases))]
-		public void GreaterThanOrEqualTo(Position left, Position right) => Assert.True(left >= right);
-
-		public static IEnumerable<object[]> LessThanTestCases() {
-			yield return new object[] {new Position(6, 5), new Position(6, 6)};
-			yield return new object[] {new Position(ulong.MaxValue, 0), Position.End,};
-		}
-
-		[TestCaseSource(nameof(LessThanTestCases))]
-		public void LessThan(Position left, Position right) => Assert.True(left < right);
-
-		public static IEnumerable<object[]> LessThanOrEqualToTestCases()
-			=> LessThanTestCases().Concat(new[] {new object[] {Position.End, Position.End}});
-
-		[TestCaseSource(nameof(LessThanOrEqualToTestCases))]
-		public void LessThanOrEqualTo(Position left, Position right) => Assert.True(left <= right);
-
-		public static IEnumerable<object[]> CompareToTestCases() {
-			yield return new object[] {new Position(6, 5), new Position(6, 6), -1};
-			yield return new object[] {new Position(6, 6), new Position(6, 5), 1};
-			yield return new object[] {new Position(6, 6), new Position(6, 6), 0};
-		}
-
-		[TestCaseSource(nameof(CompareToTestCases))]
-		public void CompareTo(Position left, Position right, int expected) =>
-			Assert.AreEqual(expected, left.CompareTo(right));
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/ServerFeaturesTests/ServerFeaturesTest.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/ServerFeaturesTests/ServerFeaturesTest.cs
deleted file mode 100644
index 3ad41f90398..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/ServerFeaturesTests/ServerFeaturesTest.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
-using EventStore.Client;
-using EventStore.Client.ServerFeatures;
-using EventStore.Core.Tests.Integration;
-using Google.Protobuf.Reflection;
-using Grpc.Net.Client;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Grpc.ServerFeaturesTests {
-	public class ServerFeaturesTest {
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_getting_supported_methods<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
-
-			private List<SupportedMethod> _supportedEndPoints = new ();
-			private List<SupportedMethod> _expectedEndPoints = new ();
-			private string _expectedServerVersion;
-			private string _serverVersion;
-
-			protected override async Task Given() {
-				var streamEndPoints = GetEndPoints(Client.Streams.Streams.Descriptor);
-				foreach (var ep in streamEndPoints) {
-					if (ep.MethodName.Contains("read")) ep.Features.AddRange(new[] {"position", "events"});
-					else if (ep.MethodName.Contains("batchappend")) ep.Features.Add("deadline_duration");
-				}
-
-				var psubEndPoints = GetEndPoints(Client.PersistentSubscriptions.PersistentSubscriptions.Descriptor);
-				foreach (var ep in psubEndPoints) {
-					ep.Features.AddRange(new[] {"stream", "all"});
-				}
-
-				_expectedEndPoints.AddRange(streamEndPoints);
-				_expectedEndPoints.AddRange(psubEndPoints);
-				_expectedEndPoints.AddRange(GetEndPoints(Client.Operations.Operations.Descriptor));
-				_expectedEndPoints.AddRange(GetEndPoints(Client.Users.Users.Descriptor));
-				_expectedEndPoints.AddRange(GetEndPoints(Client.Gossip.Gossip.Descriptor));
-				_expectedEndPoints.AddRange(GetEndPoints(Client.Monitoring.Monitoring.Descriptor));
-				_expectedEndPoints.AddRange(GetEndPoints(Client.Redaction.Redaction.Descriptor));
-				_expectedEndPoints.AddRange(GetEndPoints(ServerFeatures.Descriptor));
-
-				var versionParts = EventStore.Common.Utils.VersionInfo.Version.Split('.');
-				_expectedServerVersion = string.Join('.', versionParts.Take(3));
-
-				var node = GetLeader();
-				await Task.WhenAll(node.AdminUserCreated, node.Started);
-
-				using var channel = GrpcChannel.ForAddress(new Uri($"https://{node.HttpEndPoint}"),
-					new GrpcChannelOptions {
-						HttpClient = new HttpClient(new SocketsHttpHandler {
-							SslOptions = {
-								RemoteCertificateValidationCallback = delegate { return true; }
-							}
-						}, true)
-					});
-				var client = new ServerFeatures.ServerFeaturesClient(channel);
-
-				var resp = await client.GetSupportedMethodsAsync(new Empty());
-				_supportedEndPoints = resp.Methods.ToList();
-				_serverVersion = resp.EventStoreServerVersion;
-
-			}
-			private SupportedMethod[] GetEndPoints(ServiceDescriptor desc) =>
-				desc.Methods.Select(x => new SupportedMethod {
-					MethodName = x.Name.ToLower(),
-					ServiceName = x.Service.FullName.ToLower()
-				}).ToArray();
-
-			[Test]
-			public void should_receive_expected_endpoints() {
-				CollectionAssert.AreEquivalent(_expectedEndPoints, _supportedEndPoints);
-			}
-
-			[Test]
-			public void should_receive_the_correct_eventstore_version() {
-				Assert.AreEqual(_expectedServerVersion, _serverVersion);
-			}
-		}
-	}
-}
-
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamRevisionTests.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamRevisionTests.cs
deleted file mode 100644
index ee3acd1443d..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamRevisionTests.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Services.Transport.Common;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Grpc {
-	public class StreamRevisionTests {
-		[Test]
-		public void Equality() {
-			var sut = new StreamRevision(1);
-			Assert.AreEqual(new StreamRevision(1), sut);
-		}
-
-		[Test]
-		public void Inequality() {
-			var sut = new StreamRevision(1);
-			Assert.AreNotEqual(new StreamRevision(2), sut);
-		}
-
-		[Test]
-		public void EqualityOperator() {
-			var sut = new StreamRevision(1);
-			Assert.True(new StreamRevision(1) == sut);
-		}
-
-		[Test]
-		public void InequalityOperator() {
-			var sut = new StreamRevision(1);
-			Assert.True(new StreamRevision(2) != sut);
-		}
-
-		[Test]
-		public void AdditionOperator() {
-			var sut = StreamRevision.Start;
-			Assert.AreEqual(new StreamRevision(1), sut + 1);
-			Assert.AreEqual(new StreamRevision(1), 1 + sut);
-		}
-
-		public static IEnumerable<object[]> AdditionOutOfBoundsCases() {
-			yield return new object[] {StreamRevision.End, 1UL};
-			yield return new object[] {new StreamRevision(long.MaxValue), long.MaxValue + 2UL};
-		}
-
-		[TestCaseSource(nameof(AdditionOutOfBoundsCases))]
-		public void AdditionOutOfBoundsThrows(StreamRevision streamRevision, ulong operand) {
-			Assert.Throws<OverflowException>(() => {
-				var _ = streamRevision + operand;
-			});
-			Assert.Throws<OverflowException>(() => {
-				var _ = operand + streamRevision;
-			});
-		}
-
-		[Test]
-		public void SubtractionOperator() {
-			var sut = new StreamRevision(1);
-			Assert.AreEqual(new StreamRevision(0), sut - 1);
-			Assert.AreEqual(new StreamRevision(0), 1 - sut);
-		}
-
-		public static IEnumerable<object[]> SubtractionOutOfBoundsCases() {
-			yield return new object[] {new StreamRevision(1), 2UL};
-			yield return new object[] {StreamRevision.Start, 1UL};
-		}
-
-		[TestCaseSource(nameof(SubtractionOutOfBoundsCases))]
-		public void SubtractionOutOfBoundsThrows(StreamRevision streamRevision, ulong operand) {
-			Assert.Throws<OverflowException>(() => {
-				var _ = streamRevision - operand;
-			});
-			Assert.Throws<OverflowException>(() => {
-				var _ = (ulong)streamRevision - new StreamRevision(operand);
-			});
-		}
-
-		public static IEnumerable<object[]> ArgumentOutOfRangeTestCases() {
-			yield return new object[] {long.MaxValue + 1UL};
-			yield return new object[] {ulong.MaxValue - 1UL};
-		}
-
-		[TestCaseSource(nameof(ArgumentOutOfRangeTestCases))]
-		public void ArgumentOutOfRange(ulong value) {
-			var ex = Assert.Throws<ArgumentOutOfRangeException>(() => new StreamRevision(value));
-			Assert.AreEqual(nameof(value), ex.ParamName);
-		}
-
-		public static IEnumerable<object[]> ComparableTestCases() {
-			yield return new object[] {StreamRevision.Start, StreamRevision.Start, 0};
-			yield return new object[] {StreamRevision.Start, StreamRevision.End, -1};
-			yield return new object[] {StreamRevision.End, StreamRevision.Start, 1};
-		}
-
-		[TestCaseSource(nameof(ComparableTestCases))]
-		public void Comparability(StreamRevision left, StreamRevision right, int expected)
-			=> Assert.AreEqual(expected, left.CompareTo(right));
-
-		public static IEnumerable<object[]> Int64TestCases() {
-			yield return new object[] {-1L, StreamRevision.End};
-			yield return new object[] {0L, StreamRevision.Start};
-		}
-
-		[TestCaseSource(nameof(Int64TestCases))]
-		public void FromInt64ExpectedResult(long value, StreamRevision expected)
-			=> Assert.AreEqual(expected, StreamRevision.FromInt64(value));
-
-		[TestCaseSource(nameof(Int64TestCases))]
-		public void ToInt64ExpectedResult(long expected, StreamRevision value)
-			=> Assert.AreEqual(expected, value.ToInt64());
-
-		[Test]
-		public void ExplicitConversionExpectedResult() {
-			const ulong expected = 0UL;
-			var actual = (ulong)new StreamRevision(expected);
-			Assert.AreEqual(expected, actual);
-		}
-
-		[Test]
-		public void ImplicitConversionExpectedResult() {
-			const ulong expected = 0UL;
-			ulong actual = new StreamRevision(expected);
-			Assert.AreEqual(expected, actual);
-		}
-
-		[Test]
-		public void ToStringExpectedResult() {
-			var expected = 0UL.ToString();
-
-			Assert.AreEqual(expected, new StreamRevision(0UL).ToString());
-		}
-
-		[Test]
-		public void ToUInt64ExpectedResult() {
-			var expected = 0UL;
-
-			Assert.AreEqual(expected, new StreamRevision(expected).ToUInt64());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/AppendBatchToStreamTests.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/AppendBatchToStreamTests.cs
deleted file mode 100644
index d30a27c9599..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/AppendBatchToStreamTests.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-using System;
-using Google.Protobuf.WellKnownTypes;
-using System.Threading.Tasks;
-using EventStore.Client;
-using EventStore.Client.Streams;
-using EventStore.Core.Services.Transport.Grpc;
-using Google.Protobuf;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Grpc.StreamsTests {
-	[TestFixture]
-	public class AppendBatchToStreamTests {
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class single_batch<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
-			private BatchAppendResp _response;
-			private readonly Uuid _correlationId;
-
-			public single_batch() {
-				_correlationId = Uuid.NewUuid();
-			}
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				_response = await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						Any = new(),
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8("stream") }
-					},
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(1) },
-					CorrelationId = _correlationId.ToDto()
-				});
-			}
-
-			[Test]
-			public void is_success() {
-				Assert.AreEqual(_response.ResultCase, BatchAppendResp.ResultOneofCase.Success);
-			}
-			
-			[Test]
-			public void is_correlated() {
-				Assert.AreEqual(_correlationId.ToDto(), _response.CorrelationId);
-			}
-		}
-		
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class single_batch_non_structured_uuid<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
-			private BatchAppendResp _response;
-			private readonly Uuid _correlationId;
-
-			public single_batch_non_structured_uuid() {
-				_correlationId = Uuid.NewUuid();
-			}
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				_response = await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						Any = new(),
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8("stream") }
-					},
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(1) },
-					CorrelationId = new() {String = _correlationId.ToString()}
-				});
-			}
-
-			[Test]
-			public void is_success() {
-				Assert.AreEqual(_response.ResultCase, BatchAppendResp.ResultOneofCase.Success);
-			}
-
-			[Test]
-			public void is_correlated() {
-				Assert.AreEqual(new UUID() {String = _correlationId.ToString()}, _response.CorrelationId);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class multiple_batches<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
-			private BatchAppendResp _response;
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				var correlationId = Uuid.NewUuid();
-				_response = await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						Any = new(),
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8("stream") }
-					},
-					IsFinal = false,
-					ProposedMessages = { CreateEvents(1) },
-					CorrelationId = correlationId.ToDto(),
-				}, new() {
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(1) },
-					CorrelationId = correlationId.ToDto()
-				});
-			}
-
-			[Test]
-			public void is_success() {
-				Assert.AreEqual(_response.ResultCase, BatchAppendResp.ResultOneofCase.Success);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class exceeded_deadline<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
-			private BatchAppendResp _response;
-			private readonly Uuid _correlationId;
-
-			public exceeded_deadline() {
-				_correlationId = Uuid.NewUuid();
-			}
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				_response = await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						Any = new(),
-						StreamIdentifier = new() {StreamName = ByteString.CopyFromUtf8("stream")},
-						Deadline = Duration.FromTimeSpan(TimeSpan.Zero)
-					},
-					IsFinal = true,
-					ProposedMessages = {CreateEvents(1)},
-					CorrelationId = _correlationId.ToDto()
-				});
-			}
-
-			[Test]
-			public void is_error() {
-				Assert.AreEqual(_response.ResultCase, BatchAppendResp.ResultOneofCase.Error);
-				Assert.AreEqual(_response.Error.Code, Google.Rpc.Code.DeadlineExceeded);
-			}
-
-			[Test]
-			public void is_correlated() {
-				Assert.AreEqual(_correlationId.ToDto(), _response.CorrelationId);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class exceeded_deadline_timestamp<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
-			private BatchAppendResp _response;
-			private readonly Uuid _correlationId;
-
-			public exceeded_deadline_timestamp() {
-				_correlationId = Uuid.NewUuid();
-			}
-
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				_response = await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						Any = new(),
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8("stream") },
-						Deadline21100 = Timestamp.FromDateTime(DateTime.UtcNow)
-					},
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(1) },
-					CorrelationId = _correlationId.ToDto()
-				});
-			}
-
-			[Test]
-			public void is_error() {
-				Assert.AreEqual(_response.ResultCase, BatchAppendResp.ResultOneofCase.Error);
-				Assert.AreEqual(_response.Error.Code, Google.Rpc.Code.DeadlineExceeded);
-			}
-			
-			[Test]
-			public void is_correlated() {
-				Assert.AreEqual(_correlationId.ToDto(), _response.CorrelationId);
-			}
-		}
-
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/DeleteTests.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/DeleteTests.cs
deleted file mode 100644
index 3023f08d0f3..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/DeleteTests.cs
+++ /dev/null
@@ -1,201 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Client.Streams;
-using EventStore.ClientAPI;
-using EventStore.Core.Services;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Core.Services.Transport.Grpc;
-using Google.Protobuf;
-using Grpc.Core;
-using NUnit.Framework;
-using ExpectedVersion = EventStore.Core.Data.ExpectedVersion;
-using Metadata=EventStore.Core.Services.Transport.Grpc.Constants.Metadata;
-namespace EventStore.Core.Tests.Services.Transport.Grpc.StreamsTests {
-	[TestFixture]
-	public class DeleteTests {
-		private const string StreamName = nameof(DeleteTests);
-
-		public abstract class DeleteExistingStreamSpecification<TLogFormat, TStreamId>
-			: GrpcSpecification<TLogFormat, TStreamId> {
-			private readonly DeleteReq.Types.Options _options;
-			private Exception _caughtException;
-
-			private DeleteExistingStreamSpecification(DeleteReq.Types.Options options) {
-				_options = new(options) {
-					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamName) }
-				};
-			}
-
-			protected DeleteExistingStreamSpecification(StreamRevision expectedStreamRevision) : this(
-				new DeleteReq.Types.Options {
-					Revision = expectedStreamRevision.ToUInt64(),
-				}) {
-			}
-
-			protected DeleteExistingStreamSpecification(long expectedStreamState) : this(expectedStreamState switch {
-				ExpectedVersion.Any => new DeleteReq.Types.Options { Any = new() },
-				ExpectedVersion.NoStream => new DeleteReq.Types.Options { NoStream = new() },
-				ExpectedVersion.StreamExists => new DeleteReq.Types.Options { StreamExists = new() },
-				_ => throw new InvalidOperationException()
-			}) {
-			}
-
-			[Test]
-			public void no_exception_is_thrown() {
-				Assert.Null(_caughtException);
-			}
-
-			[Test]
-			public async Task the_stream_is_deleted() {
-				using var call = StreamsClient.Read(new() {
-					Options = new() {
-						UuidOption = new() { Structured = new() },
-						NoFilter = new(),
-						ResolveLinks = false,
-						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
-						Count = 1,
-						Stream = new() {
-							StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamName) },
-							Start = new()
-						}
-					}
-				}, GetCallOptions());
-
-				var responses = await call.ResponseStream.ReadAllAsync().ToArrayAsync();
-
-				Assert.AreEqual(1, responses.Length);
-				Assert.AreEqual(new ReadResp {
-					StreamNotFound = new() {
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamName) }
-					}
-				}, responses[0]);
-			}
-
-			protected override async Task Given() => await AppendToStreamBatch(new BatchAppendReq {
-				Options = new() {
-					NoStream = new(),
-					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamName) }
-				},
-				CorrelationId = Uuid.NewUuid().ToDto(),
-				IsFinal = true,
-				ProposedMessages = { CreateEvents(1) }
-			});
-
-			protected override async Task When() {
-				using var call = StreamsClient.DeleteAsync(new() {
-					Options = _options
-				}, GetCallOptions());
-
-				try {
-					await call.ResponseAsync;
-				} catch (Exception ex) {
-					_caughtException = ex;
-				}
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class DeleteExistingStreamExpectedRevision<TLogFormat, TStreamId>
-			: DeleteExistingStreamSpecification<TLogFormat, TStreamId> {
-			public DeleteExistingStreamExpectedRevision() : base(StreamRevision.Start) { }
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class DeleteExistingStreamAny<TLogFormat, TStreamId>
-			: DeleteExistingStreamSpecification<TLogFormat, TStreamId> {
-			public DeleteExistingStreamAny() : base(ExpectedVersion.Any) { }
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class DeleteExistingStreamExists<TLogFormat, TStreamId>
-			: DeleteExistingStreamSpecification<TLogFormat, TStreamId> {
-			public DeleteExistingStreamExists() : base(ExpectedVersion.StreamExists) { }
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class DeleteNoStream<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
-			private Exception _caughtException;
-			protected override Task Given() => Task.CompletedTask;
-
-			protected override async Task When() {
-				using var call = StreamsClient.DeleteAsync(new() {
-					Options = new() {
-						NoStream = new(),
-						StreamIdentifier = new() {
-							StreamName = ByteString.CopyFromUtf8(Guid.NewGuid().ToString())
-						}
-					}
-				}, GetCallOptions());
-
-				try {
-					await call.ResponseAsync;
-				} catch (Exception ex) {
-					_caughtException = ex;
-				}
-			}
-
-			[Test]
-			public void an_exception_is_thrown() {
-				Assert.IsInstanceOf<RpcException>(_caughtException);
-				var ex = _caughtException as RpcException;
-				Assert.AreEqual(StatusCode.FailedPrecondition, ex.StatusCode);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class DeleteWithExistingMetadata<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
-			private Exception _caughtException;
-			private readonly string _streamName;
-			private readonly string _metadataStreamName;
-
-			public DeleteWithExistingMetadata() {
-				_streamName = Guid.NewGuid().ToString();
-				_metadataStreamName = SystemStreams.MetastreamOf(_streamName);
-			}
-
-			protected override async Task Given() {
-				using var call = StreamsClient.Append(GetCallOptions());
-				await call.RequestStream.WriteAsync(new() {
-					Options = new() { NoStream = new(), StreamIdentifier = _metadataStreamName }
-				});
-				await call.RequestStream.WriteAsync(new() {
-					ProposedMessage = new() {
-						Id = Uuid.NewUuid().ToDto(),
-						Metadata = {
-							{ Metadata.Type, SystemEventTypes.StreamMetadata },
-							{ Metadata.ContentType, Metadata.ContentTypes.ApplicationJson }
-						},
-						Data = ByteString.CopyFromUtf8(StreamMetadata.Build().Build().AsJsonString())
-					}
-				});
-
-				await call.RequestStream.CompleteAsync();
-
-				await call.ResponseAsync;
-			}
-
-			protected override async Task When() {
-				using var call = StreamsClient.DeleteAsync(new() {
-					Options = new() { NoStream = new(), StreamIdentifier = _streamName }
-				}, GetCallOptions());
-
-				try {
-					await call.ResponseAsync;
-				} catch (Exception ex) {
-					_caughtException = ex;
-				}
-			}
-
-			[Test]
-			public void no_exception_is_thrown() {
-				Assert.Null(_caughtException);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/GrpcSpecification.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/GrpcSpecification.cs
deleted file mode 100644
index 3e8e1803300..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/GrpcSpecification.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.Client.Streams;
-using EventStore.Core.Services.Transport.Grpc;
-using EventStore.Core.Tests.Helpers;
-using Google.Protobuf;
-using Grpc.Core;
-using Grpc.Net.Client;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.TestHost;
-using Microsoft.Extensions.Hosting;
-using NUnit.Framework;
-using Convert = System.Convert;
-using Streams = EventStore.Client.Streams.Streams;
-using GrpcMetadata = EventStore.Core.Services.Transport.Grpc.Constants.Metadata;
-using EventStore.Core.Services.Storage.ReaderIndex;
-
-namespace EventStore.Core.Tests.Services.Transport.Grpc.StreamsTests {
-	public abstract class GrpcSpecification<TLogFormat, TStreamId> {
-		protected readonly GrpcChannel Channel;
-		private readonly MiniNode<TLogFormat, TStreamId> _node;
-		protected MiniNode<TLogFormat, TStreamId> Node => _node;
-		internal Streams.StreamsClient StreamsClient { get; }
-		private readonly BatchAppender _batchAppender;
-
-		protected GrpcSpecification(IExpiryStrategy expiryStrategy = null) {
-			_node = new MiniNode<TLogFormat, TStreamId>(GetType().FullName,
-				inMemDb: true,
-				expiryStrategy: expiryStrategy);
-
-			Channel = GrpcChannel.ForAddress(new UriBuilder {
-				Scheme = Uri.UriSchemeHttps
-			}.Uri, new GrpcChannelOptions {
-				HttpClient = _node.HttpClient,
-				DisposeHttpClient = false,
-			});
-			StreamsClient = new Streams.StreamsClient(Channel);
-			_batchAppender = new BatchAppender(StreamsClient);
-		}
-
-		protected abstract Task Given();
-
-		protected abstract Task When();
-
-		[OneTimeSetUp]
-		public async Task SetUp() {
-			await _node.Start();
-			await _node.AdminUserCreated;
-			_batchAppender.Start();
-			try {
-				await Given().WithTimeout(TimeSpan.FromSeconds(30));
-			} catch (Exception ex) {
-				throw new Exception("Given Failed", ex);
-			}
-
-			try {
-				await When().WithTimeout(TimeSpan.FromSeconds(30));
-			} catch (Exception ex) {
-				throw new Exception("When Failed", ex);
-			}
-		}
-
-		[OneTimeTearDown]
-		public async Task TearDown() {
-			await _batchAppender.DisposeAsync();
-			Channel?.Dispose();
-			await _node.Shutdown();
-		}
-
-		private static CallCredentials CallCredentialsFromUser((string userName, string password) credentials) =>
-			CallCredentials.FromInterceptor((_, metadata) => {
-				metadata.Add(new Metadata.Entry("authorization",
-					$"Basic {Convert.ToBase64String(Encoding.ASCII.GetBytes($"{credentials.userName}:{credentials.password}"))}"));
-
-				return Task.CompletedTask;
-			});
-
-		protected static (string userName, string password) AdminCredentials => ("admin", "changeit");
-
-		protected virtual (string userName, string password) DefaultCredentials => default;
-
-		protected CallOptions GetCallOptions((string userName, string password) credentials = default) =>
-			new(credentials: GetCredentials(credentials == default ? DefaultCredentials : credentials),
-				deadline: Debugger.IsAttached
-					? DateTime.UtcNow.AddDays(1)
-					: new DateTime?());
-
-		private static CallCredentials GetCredentials((string userName, string password) credentials) =>
-			credentials == default ? null : CallCredentialsFromUser(credentials);
-
-		internal ValueTask<BatchAppendResp> AppendToStreamBatch(params BatchAppendReq[] requests) =>
-			_batchAppender.Call(requests);
-
-		internal static IEnumerable<BatchAppendReq.Types.ProposedMessage> CreateEvents(int count) =>
-			Enumerable.Range(0, count).Select(_ => CreateEvent());
-
-		internal static BatchAppendReq.Types.ProposedMessage CreateEvent(string type="-") =>
-			new BatchAppendReq.Types.ProposedMessage {
-				Data = ByteString.Empty,
-				Id = Uuid.NewUuid().ToDto(),
-				CustomMetadata = ByteString.Empty,
-				Metadata = {
-					{GrpcMetadata.ContentType, GrpcMetadata.ContentTypes.ApplicationOctetStream},
-					{GrpcMetadata.Type, type}
-				}
-			};
-		
-		private class BatchAppender : IAsyncDisposable {
-			private readonly Lazy<AsyncDuplexStreamingCall<BatchAppendReq, BatchAppendResp>> _batchAppendLazy;
-			private AsyncDuplexStreamingCall<BatchAppendReq, BatchAppendResp> BatchAppend => _batchAppendLazy.Value;
-			private readonly ConcurrentDictionary<Uuid, TaskCompletionSource<BatchAppendResp>> _responses;
-
-			public BatchAppender(Streams.StreamsClient streamsClient) {
-				_batchAppendLazy = new Lazy<AsyncDuplexStreamingCall<BatchAppendReq, BatchAppendResp>>(() =>
-					streamsClient.BatchAppend(new CallOptions(credentials: GetCredentials(default),
-						deadline: DateTime.UtcNow.AddDays(1))));
-				_responses = new();
-			}
-
-			public void Start() =>
-				Task.Run(async () => {
-					while (await BatchAppend.ResponseStream.MoveNext()) {
-						var response = BatchAppend.ResponseStream.Current;
-						var correlationId = Uuid.FromDto(response.CorrelationId);
-
-						if (_responses.TryRemove(correlationId, out var tcs)) {
-							tcs.TrySetResult(response);
-						}
-					}
-				});
-
-			public ValueTask DisposeAsync() =>
-				_batchAppendLazy.IsValueCreated
-					? new(_batchAppendLazy.Value.RequestStream.CompleteAsync())
-					: new(Task.CompletedTask);
-
-			public async ValueTask<BatchAppendResp> Call(params BatchAppendReq[] requests) {
-				if (requests.Length == 0) {
-					throw new ArgumentException($"Must have at least one {nameof(BatchAppendReq)}.",
-						nameof(requests));
-				}
-
-				if (requests.Select(r => r.CorrelationId).Distinct().Count() > 1) {
-					throw new ArgumentException($"All {nameof(BatchAppendReq)} must have same CorrelationId.",
-						nameof(requests));
-				}
-				var tcs = new TaskCompletionSource<BatchAppendResp>();
-				var correlationId = Uuid.FromDto(requests[0].CorrelationId);
-
-				if (!_responses.TryAdd(correlationId, tcs)) {
-					throw new ArgumentException("CorrelationId is already reserved.", nameof(correlationId));
-				}
-
-				foreach (var request in requests) {
-					await BatchAppend.RequestStream.WriteAsync(request);
-				}
-
-				return await tcs.Task;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/LotsOfExpiriesStrategy.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/LotsOfExpiriesStrategy.cs
deleted file mode 100644
index 50b05eb7fa5..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/LotsOfExpiriesStrategy.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using EventStore.Core.Services.Storage.ReaderIndex;
-
-namespace EventStore.Core.Tests.Services.Transport.Grpc.StreamsTests {
-	public class LotsOfExpiriesStrategy : IExpiryStrategy {
-		private int _counter;
-
-		public DateTime? GetExpiry() {
-			_counter++;
-			if (_counter % 10 == 0) {
-				// ok
-				return null;
-			} else {
-				// expired already
-				return DateTime.UtcNow - TimeSpan.FromSeconds(1);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadAllBackwardsFilteredTests.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadAllBackwardsFilteredTests.cs
deleted file mode 100644
index 3f42d41a1c2..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadAllBackwardsFilteredTests.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Client.Streams;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Core.Services.Transport.Grpc;
-using Google.Protobuf;
-using Grpc.Core;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Grpc.StreamsTests {
-	[TestFixture]
-	public class ReadAllBackwardsFilteredTests {
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_reading_all_backwards_filtered<TLogFormat, TStreamId>
-		  : GrpcSpecification<TLogFormat, TStreamId> {
-			private const string StreamId = nameof(when_reading_all_backwards_filtered<TLogFormat, TStreamId>);
-
-			private Position _positionOfLastWrite;
-			private readonly List<ReadResp> _responses = new();
-
-			protected override async Task Given() {
-				var response = await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamId) },
-						Any = new()
-					},
-					CorrelationId = Uuid.NewUuid().ToDto(),
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(50) }
-				});
-
-				_positionOfLastWrite = new Position(response.Success.Position.CommitPosition,
-					response.Success.Position.PreparePosition);
-			}
-
-			protected override async Task When() {
-				using var call = StreamsClient.Read(new() {
-					Options = new() {
-						UuidOption = new() { Structured = new() },
-						Count = 20,
-						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Backwards,
-						ResolveLinks = true,
-						All = new() {
-							Position = new() {
-								CommitPosition = _positionOfLastWrite.CommitPosition,
-								PreparePosition = _positionOfLastWrite.PreparePosition
-							}
-						},
-						Filter = new() {
-							Max = 32,
-							CheckpointIntervalMultiplier = 4,
-							StreamIdentifier = new() { Prefix = { StreamId } }
-						}
-					}
-				}, GetCallOptions(AdminCredentials));
-				_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
-			}
-
-			[Test]
-			public void should_not_receive_null_events() {
-				Assert.False(_responses
-					.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
-					.Any(x => x.Event is null));
-			}
-
-			[Test]
-			public void should_read_a_number_of_events_equal_to_the_max_count() {
-				Assert.AreEqual(20, _responses.Count(x => x.Event is not null));
-			}
-
-			[Test]
-			public void should_read_the_correct_events() {
-				Assert.True(_responses
-					.Where(x => x.Event is not null)
-					.All(x =>
-						new Position(x.Event.Event.CommitPosition, x.Event.Event.PreparePosition) <=
-						_positionOfLastWrite));
-
-				Assert.AreEqual(48, _responses.First(x => x.Event is not null).Event.Event.StreamRevision);
-				Assert.AreEqual(29, _responses.Last(x => x.Event is not null).Event.Event.StreamRevision);
-
-				Assert.True(_responses
-					.Where(x => x.Event is not null)
-					.All(x => x.Event.Event.StreamIdentifier.StreamName.ToStringUtf8() == StreamId));
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_reading_all_backwards_filtered_from_end<TLogFormat, TStreamId>
-		  : GrpcSpecification<TLogFormat, TStreamId> {
-			private const string StreamId = nameof(when_reading_all_backwards_filtered<TLogFormat, TStreamId>);
-
-			private Position _positionOfLastWrite;
-			private readonly List<ReadResp> _responses = new();
-
-			protected override async Task Given() {
-				var response = await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamId) },
-						Any = new()
-					},
-					CorrelationId = Uuid.NewUuid().ToDto(),
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(50) }
-				});
-
-				_positionOfLastWrite = new Position(response.Success.Position.CommitPosition,
-					response.Success.Position.PreparePosition);
-			}
-
-			protected override async Task When() {
-				using var call = StreamsClient.Read(new() {
-					Options = new() {
-						UuidOption = new() { Structured = new() },
-						Count = 20,
-						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Backwards,
-						ResolveLinks = true,
-						All = new() { End = new() },
-						Filter = new() {
-							Max = 32,
-							CheckpointIntervalMultiplier = 4,
-							StreamIdentifier = new() { Prefix = { StreamId } }
-						}
-					}
-				}, GetCallOptions(AdminCredentials));
-				_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
-			}
-
-			[Test]
-			public void should_not_receive_null_events() {
-				Assert.False(_responses
-					.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
-					.Any(x => x.Event is null));
-			}
-
-			[Test]
-			public void should_read_a_number_of_events_equal_to_the_max_count() {
-				Assert.AreEqual(20, _responses.Count(x => x.Event is not null));
-			}
-
-			[Test]
-			public void should_read_the_correct_events() {
-				Assert.True(_responses
-					.Where(x => x.Event is not null)
-					.All(x =>
-						new Position(x.Event.Event.CommitPosition, x.Event.Event.PreparePosition) <=
-						_positionOfLastWrite));
-
-				Assert.AreEqual(49, _responses.First(x => x.Event is not null).Event.Event.StreamRevision);
-				Assert.AreEqual(30, _responses.Last(x => x.Event is not null).Event.Event.StreamRevision);
-
-				Assert.True(_responses
-					.Where(x => x.Event is not null)
-					.All(x => x.Event.Event.StreamIdentifier.StreamName.ToStringUtf8() == StreamId));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadAllBackwardsTests.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadAllBackwardsTests.cs
deleted file mode 100644
index 3c96d2b5804..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadAllBackwardsTests.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Client.Streams;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Core.Services.Transport.Grpc;
-using Google.Protobuf;
-using Grpc.Core;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Grpc.StreamsTests {
-	[TestFixture]
-	public class ReadAllBackwardsTests {
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_reading_all_backwards<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
-			private const string StreamId = nameof(when_reading_all_backwards<TLogFormat, TStreamId>);
-
-			private readonly List<ReadResp> _responses = new();
-			private Position _positionOfLastWrite;
-
-			protected override async Task Given() {
-				var response = await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamId) },
-						Any = new()
-					},
-					CorrelationId = Uuid.NewUuid().ToDto(),
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(50) }
-				});
-
-				_positionOfLastWrite = new Position(response.Success.Position.CommitPosition,
-					response.Success.Position.PreparePosition);
-			}
-
-			protected override async Task When() {
-				using var call = StreamsClient.Read(new() {
-					Options = new() {
-						UuidOption = new() { Structured = new() },
-						Count = 20,
-						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Backwards,
-						ResolveLinks = false,
-						All = new() {
-							Position = new() {
-								CommitPosition = _positionOfLastWrite.CommitPosition,
-								PreparePosition = _positionOfLastWrite.PreparePosition
-							}
-						},
-						NoFilter = new()
-					}
-				}, GetCallOptions(AdminCredentials));
-				_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
-			}
-
-			[Test]
-			public void should_not_receive_null_events() {
-				Assert.False(_responses
-					.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
-					.Any(x => x.Event is null));
-			}
-
-			[Test]
-			public void should_read_a_number_of_events_equal_to_the_max_count() {
-				Assert.AreEqual(20, _responses.Count(x => x.Event is not null));
-			}
-
-			[Test]
-			public void should_read_the_correct_events() {
-				Assert.True(_responses
-					.Where(x => x.Event is not null)
-					.All(x =>
-						new Position(x.Event.Event.CommitPosition, x.Event.Event.PreparePosition) <=
-						_positionOfLastWrite));
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class
-			when_reading_all_backwards_from_end<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
-			private readonly List<ReadResp> _responses = new();
-			private const string StreamId = nameof(when_reading_all_backwards_from_end<TLogFormat, TStreamId>);
-
-			protected override async Task Given() {
-				await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamId) },
-						Any = new()
-					},
-					CorrelationId = Uuid.NewUuid().ToDto(),
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(50) }
-				});
-			}
-
-			protected override async Task When() {
-				using var call = StreamsClient.Read(new() {
-					Options = new() {
-						UuidOption = new() { Structured = new() },
-						Count = 20,
-						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Backwards,
-						ResolveLinks = false,
-						All = new() { End = new() },
-						NoFilter = new()
-					}
-				}, GetCallOptions(AdminCredentials));
-				_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
-			}
-
-			[Test]
-			public void should_not_receive_null_events() {
-				Assert.False(_responses
-					.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
-					.Any(x => x.Event is null));
-			}
-
-			[Test]
-			public void should_read_a_number_of_events_equal_to_the_max_count() {
-				Assert.AreEqual(20, _responses.Count(x => x.Event is not null));
-			}
-
-			[Test]
-			public void should_read_the_correct_events() {
-				Assert.AreEqual(49, _responses.First(x => x.Event is not null).Event.Event.StreamRevision);
-				Assert.AreEqual(30, _responses.Last(x => x.Event is not null).Event.Event.StreamRevision);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadAllForwardsFilteredTests.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadAllForwardsFilteredTests.cs
deleted file mode 100644
index b10ca35c071..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadAllForwardsFilteredTests.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Client.Streams;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Core.Services.Transport.Grpc;
-using Google.Protobuf;
-using Grpc.Core;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Grpc.StreamsTests {
-	[TestFixture]
-	public class ReadAllForwardsFilteredTests {
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_reading_all_forwards_filtered<TLogFormat, TStreamId>
-		  : GrpcSpecification<TLogFormat, TStreamId> {
-			private const string StreamId = nameof(when_reading_all_forwards_filtered<TLogFormat, TStreamId>);
-
-			private Position _positionOfLastWrite;
-			private readonly List<ReadResp> _responses = new();
-
-			protected override async Task Given() {
-				var response = await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamId) },
-						Any = new()
-					},
-					CorrelationId = Uuid.NewUuid().ToDto(),
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(50) }
-				});
-
-				_positionOfLastWrite = new Position(response.Success.Position.CommitPosition,
-					response.Success.Position.PreparePosition);
-			}
-
-			protected override async Task When() {
-				using var call = StreamsClient.Read(new() {
-					Options = new() {
-						UuidOption = new() { Structured = new() },
-						Count = 20,
-						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
-						ResolveLinks = true,
-						All = new() {
-							Start = new()
-						},
-						Filter = new() {
-							Max = 32,
-							CheckpointIntervalMultiplier = 4,
-							StreamIdentifier = new() { Prefix = { StreamId } }
-						}
-					}
-				}, GetCallOptions(AdminCredentials));
-				_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
-			}
-
-			[Test]
-			public void should_not_receive_null_events() {
-				Assert.False(_responses
-					.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
-					.Any(x => x.Event is null));
-			}
-
-			[Test]
-			public void should_read_a_number_of_events_equal_to_the_max_count() {
-				Assert.AreEqual(20, _responses.Count(x => x.Event is not null));
-			}
-
-			[Test]
-			public void should_read_the_correct_events() {
-				Assert.True(_responses
-					.Where(x => x.Event is not null)
-					.All(x =>
-						new Position(x.Event.Event.CommitPosition, x.Event.Event.PreparePosition) <=
-						_positionOfLastWrite));
-
-				Assert.AreEqual(0, _responses.First(x => x.Event is not null).Event.Event.StreamRevision);
-				Assert.AreEqual(19, _responses.Last(x => x.Event is not null).Event.Event.StreamRevision);
-
-				Assert.True(_responses
-					.Where(x => x.Event is not null)
-					.All(x => x.Event.Event.StreamIdentifier.StreamName.ToStringUtf8() == StreamId));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadStreamsBackwardTests.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadStreamsBackwardTests.cs
deleted file mode 100644
index 02176df650b..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadStreamsBackwardTests.cs
+++ /dev/null
@@ -1,250 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Client.Streams;
-using EventStore.Core.Services.Transport.Grpc;
-using Google.Protobuf;
-using Grpc.Core;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Grpc.StreamsTests {
-	[TestFixture]
-	public class ReadStreamsBackwardTests {
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_reading_backward_from_past_the_end_of_the_stream<TLogFormat, TStreamId>
-			: GrpcSpecification<TLogFormat, TStreamId> {
-			private readonly string _streamName = Guid.NewGuid().ToString();
-			private readonly List<ReadResp> _responses = new();
-			private const ulong MaxCount = 20;
-			private const int EventCount = 30;
-
-			protected override async Task Given() {
-				await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						Any = new(),
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) }
-					},
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(EventCount) },
-					CorrelationId = Uuid.NewUuid().ToDto()
-				});
-			}
-
-			protected override async Task When() {
-				using var call = StreamsClient.Read(new() {
-					Options = new() {
-						Count = MaxCount,
-						Stream = new() {
-							StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) },
-							Revision = 60
-						},
-						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Backwards,
-						UuidOption = new() { Structured = new() },
-						NoFilter = new(),
-						ControlOption = new() { Compatibility = 1 }
-					}
-				});
-				_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
-			}
-
-			[Test]
-			public void should_not_receive_null_events() {
-				Assert.False(_responses
-					.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
-					.Any(x => x.Event is null));
-			}
-
-			[Test]
-			public void should_read_a_number_of_events_equal_to_the_max_count() {
-				Assert.AreEqual(20, _responses.Count(x => x.Event is not null));
-			}
-
-			[Test]
-			public void should_read_the_correct_events() {
-				Assert.AreEqual(29, _responses.First(x => x.Event is not null).Event.Event.StreamRevision);
-				Assert.AreEqual(10, _responses.Last(x => x.Event is not null).Event.Event.StreamRevision);
-			}
-
-			[Test]
-			public void should_indicate_last_position_of_stream() {
-				var streamPosition =
-					_responses.Single(x => x.ContentCase == ReadResp.ContentOneofCase.LastStreamPosition);
-				Assert.AreEqual(29, streamPosition.LastStreamPosition);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_reading_backward_from_the_end_of_the_stream<TLogFormat, TStreamId>
-			: GrpcSpecification<TLogFormat, TStreamId> {
-			private readonly string _streamName = Guid.NewGuid().ToString();
-			private readonly List<ReadResp> _responses = new();
-			private const ulong MaxCount = 20;
-			private const int EventCount = 30;
-
-			protected override async Task Given() {
-				await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						Any = new(),
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) }
-					},
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(EventCount) },
-					CorrelationId = Uuid.NewUuid().ToDto()
-				});
-			}
-
-			protected override async Task When() {
-				using var call = StreamsClient.Read(new() {
-					Options = new() {
-						Count = MaxCount,
-						Stream = new() {
-							StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) },
-							End = new()
-						},
-						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Backwards,
-						UuidOption = new() { Structured = new() },
-						NoFilter = new(),
-						ControlOption = new() { Compatibility = 21}
-					}
-				});
-				_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
-			}
-
-			[Test]
-			public void should_not_receive_null_events() {
-				Assert.False(_responses
-					.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
-					.Any(x => x.Event is null));
-			}
-
-			[Test]
-			public void should_read_a_number_of_events_equal_to_the_max_count() {
-				Assert.AreEqual(20, _responses.Count(x => x.Event is not null));
-			}
-
-			[Test]
-			public void should_read_the_correct_events() {
-				Assert.AreEqual(29, _responses.First(x => x.Event is not null).Event.Event.StreamRevision);
-				Assert.AreEqual(10, _responses.Last(x => x.Event is not null).Event.Event.StreamRevision);
-			}
-
-			[Test]
-			public void should_indicate_last_position_of_stream() {
-				var streamPosition =
-					_responses.Single(x => x.ContentCase == ReadResp.ContentOneofCase.LastStreamPosition);
-				Assert.AreEqual(29, streamPosition.LastStreamPosition);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_reading_backward_from_the_middle_of_the_stream<TLogFormat, TStreamId>
-			: GrpcSpecification<TLogFormat, TStreamId> {
-			private readonly string _streamName = Guid.NewGuid().ToString();
-			private readonly List<ReadResp> _responses = new();
-			private const ulong MaxCount = 20;
-			private const int EventCount = 100;
-
-			protected override async Task Given() {
-				await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						Any = new(),
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) },
-					},
-					CorrelationId = Uuid.NewUuid().ToDto(),
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(EventCount) }
-				});
-			}
-
-			protected override async Task When() {
-				using var call = StreamsClient.Read(new ReadReq {
-					Options = new() {
-						Count = MaxCount,
-						Stream = new() {
-							StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) },
-							Revision = 60
-						},
-						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Backwards,
-						UuidOption = new() { Structured = new() },
-						NoFilter = new(),
-						ControlOption = new() { Compatibility = 1 }
-					}
-				});
-				_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
-			}
-
-			[Test]
-			public void should_not_receive_null_events() {
-				Assert.False(_responses
-					.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
-					.Any(x => x.Event is null));
-			}
-
-			[Test]
-			public void should_read_a_number_of_events_equal_to_the_max_count() {
-				Assert.AreEqual(MaxCount, _responses.Count(x => x.Event is not null));
-			}
-
-			[Test]
-			public void should_read_the_correct_events() {
-				Assert.AreEqual(60, _responses.First(x => x.Event is not null).Event.Event.StreamRevision);
-				Assert.AreEqual(41, _responses.Last(x => x.Event is not null).Event.Event.StreamRevision);
-			}
-
-			[Test]
-			public void should_indicate_last_position_of_stream() {
-				var streamPosition =
-					_responses.Single(x => x.ContentCase == ReadResp.ContentOneofCase.LastStreamPosition);
-				Assert.AreEqual(99, streamPosition.LastStreamPosition);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_reading_backward_from_the_start_of_the_stream<TLogFormat, TStreamId>
-			: GrpcSpecification<TLogFormat, TStreamId> {
-			private readonly string _streamName = Guid.NewGuid().ToString();
-			private readonly List<ReadResp> _responses = new();
-			private const ulong _maxCount = 20;
-			private const int EventCount = 10;
-
-			protected override async Task Given() {
-				await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						Any = new(),
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) },
-					},
-					CorrelationId = Uuid.NewUuid().ToDto(),
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(EventCount) }
-				});
-			}
-
-			protected override async Task When() {
-				using var call = StreamsClient.Read(new ReadReq {
-					Options = new() {
-						Count = _maxCount,
-						Stream = new() {
-							StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) },
-							Start = new()
-						},
-						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Backwards,
-						UuidOption = new() { Structured = new() },
-						NoFilter = new()
-					}
-				});
-				_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
-			}
-
-			[Test]
-			public void should_receive_the_first_event() {
-				Assert.AreEqual(1, _responses.Count(x => x.Event is not null));
-				Assert.AreEqual(0, _responses.First(x=>x.Event is not null).Event.Event.StreamRevision);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadStreamsForwardTests.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadStreamsForwardTests.cs
deleted file mode 100644
index 08da955c903..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadStreamsForwardTests.cs
+++ /dev/null
@@ -1,315 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Client.Streams;
-using EventStore.ClientAPI;
-using EventStore.Core.Services.Transport.Grpc;
-using Google.Protobuf;
-using Grpc.Core;
-using NUnit.Framework;
-using GrpcMetadata = EventStore.Core.Services.Transport.Grpc.Constants.Metadata;
-
-namespace EventStore.Core.Tests.Services.Transport.Grpc.StreamsTests {
-	[TestFixture]
-	public class ReadStreamsForwardTests {
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_reading_forward_from_stream_that_has_been_truncated<TLogFormat, TStreamId>
-			: GrpcSpecification<TLogFormat, TStreamId> {
-			private readonly string _streamName = Guid.NewGuid().ToString();
-			private readonly List<ReadResp> _responses = new();
-			private const ulong MaxCount = 10;
-			private const int EventCount = 100;
-
-			protected override async Task Given() {
-				await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						Any = new(),
-						StreamIdentifier = new() {
-							StreamName = ByteString.CopyFromUtf8(_streamName)
-						}
-					},
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(EventCount) },
-					CorrelationId = Uuid.NewUuid().ToDto()
-				});
-
-				using var call = StreamsClient.Append(GetCallOptions(AdminCredentials));
-				await call.RequestStream.WriteAsync(new() {
-					Options = new() {
-						StreamIdentifier = new(){StreamName = ByteString.CopyFromUtf8($"$${_streamName}")},
-						Any = new()
-					}
-				});
-
-				await call.RequestStream.WriteAsync(new() {
-					ProposedMessage = new() {
-						Id = Uuid.NewUuid().ToDto(),
-						Metadata = {
-							[GrpcMetadata.Type] = "$metadata",
-							[GrpcMetadata.ContentType] = GrpcMetadata.ContentTypes.ApplicationJson
-						},
-						Data = ByteString.CopyFrom(StreamMetadata.Build().SetTruncateBefore(81).Build()
-							.AsJsonBytes())
-					}
-				});
-
-				await call.RequestStream.CompleteAsync();
-
-				await call.ResponseAsync;
-			}
-
-			protected override async Task When() {
-				using var call = StreamsClient.Read(new() {
-					Options = new () {
-						Count = MaxCount,
-						Stream = new() {
-							StreamIdentifier = new() {
-								StreamName = ByteString.CopyFromUtf8(_streamName)
-							},
-							Start = new()
-						},
-						UuidOption = new() { Structured = new() },
-						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
-						NoFilter = new(),
-						ControlOption = new() {
-							Compatibility = 21
-						}
-					}
-				});
-				_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
-			}
-
-			[Test]
-			public void should_not_receive_null_events() {
-				Assert.False(_responses
-					.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
-					.Any(x => x.Event is null));
-			}
-
-			[Test]
-			public void should_read_a_number_of_events_equal_to_the_max_count() {
-				Assert.AreEqual(MaxCount, _responses.Count(x => x.Event is not null));
-			}
-
-			[Test]
-			public void should_start_from_the_truncation_position() {
-				Assert.AreEqual(81, _responses.First(x => x.Event is not null).Event.Event.StreamRevision);
-				Assert.AreEqual(90, _responses.Last(x => x.Event is not null).Event.Event.StreamRevision);
-			}
-
-			[Test]
-			public void should_indicate_first_position_of_stream() {
-				Assert.AreEqual(81,
-					_responses.Single(x => x.ContentCase == ReadResp.ContentOneofCase.FirstStreamPosition)
-						.FirstStreamPosition);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_reading_forward_from_the_start_of_the_stream<TLogFormat, TStreamId>
-			: GrpcSpecification<TLogFormat, TStreamId> {
-			private readonly string _streamName = Guid.NewGuid().ToString();
-			private readonly List<ReadResp> _responses = new();
-			private const ulong MaxCount = 50;
-			private const int EventCount = 100;
-
-			protected override async Task Given() {
-				await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						Any = new(),
-						StreamIdentifier = new() {
-							StreamName = ByteString.CopyFromUtf8(_streamName)
-						}
-					},
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(EventCount) },
-					CorrelationId = Uuid.NewUuid().ToDto()
-				});
-			}
-
-			protected override async Task When() {
-				using var call = StreamsClient.Read(new() {
-					Options = new ReadReq.Types.Options {
-						Count = MaxCount,
-						Stream = new() {
-							StreamIdentifier = new() {
-								StreamName = ByteString.CopyFromUtf8(_streamName)
-							},
-							Start = new()
-						},
-						UuidOption = new() { Structured = new() },
-						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
-						NoFilter = new(),
-						ControlOption = new(){ Compatibility = 21 }
-					}
-				});
-				_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
-			}
-
-			[Test]
-			public void should_not_receive_null_events() {
-				Assert.False(_responses
-					.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
-					.Any(x => x.Event is null));
-			}
-
-			[Test]
-			public void should_read_a_number_of_events_equal_to_the_max_count() {
-				Assert.AreEqual(MaxCount, _responses.Count(x => x.Event is not null));
-			}
-
-			[Test]
-			public void should_read_the_correct_events() {
-				Assert.AreEqual(50, _responses.Count(x => x.Event != null));
-				Assert.AreEqual(49, _responses.Last(x => x.Event is not null).Event.Event.StreamRevision);
-			}
-
-			[Test]
-			public async Task should_have_all_positions() {
-				// each (non transaction) event can be looked up in the all stream using its position
-				var events = _responses
-					.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
-					.Select(x => x.Event.Event);
-
-				foreach (var evt in events) {
-					Assert.AreEqual(evt.CommitPosition, evt.PreparePosition);
-
-					using var call = StreamsClient.Read(new() {
-						Options = new() {
-							UuidOption = new() { Structured = new() },
-							Count = 1,
-							ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
-							ResolveLinks = true,
-							All = new() {
-								Position = new() {
-									CommitPosition = evt.CommitPosition,
-									PreparePosition = evt.PreparePosition,
-								}
-							},
-							NoFilter = new(),
-						}
-					}, GetCallOptions(AdminCredentials));
-					
-					var readEvents = await call.ResponseStream.ReadAllAsync().ToArrayAsync();
-					Assert.AreEqual(1, readEvents.Length);
-					Assert.AreEqual(evt, readEvents[0].Event.Event);
-				}
-			}
-
-			[Test]
-			public void should_indicate_last_position_of_stream() {
-				var streamPosition =
-					_responses.Single(x => x.ContentCase == ReadResp.ContentOneofCase.LastStreamPosition);
-				Assert.AreEqual(99, streamPosition.LastStreamPosition);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_reading_forward_from_the_middle_of_the_stream<TLogFormat, TStreamId>
-			: GrpcSpecification<TLogFormat, TStreamId> {
-			private readonly string _streamName = Guid.NewGuid().ToString();
-			private readonly List<ReadResp> _responses = new();
-			private const ulong MaxCount = 20;
-			private const int EventCount = 100;
-
-			protected override async Task Given() {
-				await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						Any = new(),
-						StreamIdentifier = new() {
-							StreamName = ByteString.CopyFromUtf8(_streamName)
-						}
-					},
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(EventCount) },
-					CorrelationId = Uuid.NewUuid().ToDto()
-				});
-			}
-
-			protected override async Task When() {
-				using var call = StreamsClient.Read(new() {
-					Options = new ReadReq.Types.Options {
-						Count = MaxCount,
-						Stream = new() {
-							StreamIdentifier = new() {
-								StreamName = ByteString.CopyFromUtf8(_streamName)
-							},
-							Revision = 60
-						},
-						UuidOption = new() { Structured = new() },
-						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
-						NoFilter = new(),
-						ControlOption = new() { Compatibility = 1 }
-					}
-				});
-				_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
-			}
-
-			[Test]
-			public void should_not_receive_null_events() {
-				Assert.False(_responses
-					.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
-					.Any(x => x.Event is null));
-			}
-
-			[Test]
-			public void should_read_a_number_of_events_equal_to_the_max_count() {
-				Assert.AreEqual(MaxCount, _responses.Count(x => x.Event is not null));
-			}
-
-			[Test]
-			public void should_read_the_correct_events() {
-				Assert.AreEqual(20, _responses.Count(x => x.Event != null));
-				Assert.AreEqual(79, _responses.Last(x => x.Event is not null).Event.Event.StreamRevision);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_reading_forward_from_stream_with_no_events_after_position<TLogFormat, TStreamId>
-			: GrpcSpecification<TLogFormat, TStreamId> {
-			private readonly string _streamName = Guid.NewGuid().ToString();
-			private readonly List<ReadResp> _responses = new();
-			private const ulong MaxCount = 50;
-
-			protected override async Task Given() {
-				await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						Any = new(),
-						StreamIdentifier = new() {
-							StreamName = ByteString.CopyFromUtf8(_streamName)
-						}
-					},
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(10) },
-					CorrelationId = Uuid.NewUuid().ToDto()
-				});
-			}
-
-			protected override async Task When() {
-				using var call = StreamsClient.Read(new() {
-					Options = new ReadReq.Types.Options {
-						Count = MaxCount,
-						Stream = new() {
-							StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) },
-							Revision = 11
-						},
-						UuidOption = new() { Structured = new() },
-						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
-						NoFilter = new()
-					}
-				});
-				_responses.AddRange(await  call.ResponseStream.ReadAllAsync().ToArrayAsync());
-			}
-
-			[Test]
-			public void should_not_receive_events() {
-				Assert.IsEmpty(_responses.Where(x => x.Event is not null));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/SubscribeToAllFilteredTests.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/SubscribeToAllFilteredTests.cs
deleted file mode 100644
index eb6c4cf28c5..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/SubscribeToAllFilteredTests.cs
+++ /dev/null
@@ -1,476 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Client;
-using EventStore.Client.Streams;
-using EventStore.Core.Services.Transport.Grpc;
-using Google.Protobuf;
-using Grpc.Core;
-using NUnit.Framework;
-using Position = EventStore.Core.Services.Transport.Common.Position;
-using GrpcMetadata = EventStore.Core.Services.Transport.Grpc.Constants.Metadata;
-using LogV3StreamId = System.UInt32;
-
-namespace EventStore.Core.Tests.Services.Transport.Grpc.StreamsTests {
-	[TestFixture]
-	public class SubscribeToAllFilteredTests {
-		public static IEnumerable<object[]> TestCases() {
-			var checkpointIntervalMultipliers = new uint[] { 2, 4, 8 };
-
-			var maxSearchWindows = new uint[] { 1, 32, 64 };
-
-			var filteredEventCount = checkpointIntervalMultipliers.Max() * maxSearchWindows.Max();
-
-			var logFormats = new[] {
-				(typeof(LogFormat.V2), typeof(string)),
-				(typeof(LogFormat.V3), typeof(LogV3StreamId)),
-			};
-
-			return from checkpointInterval in checkpointIntervalMultipliers
-				from maxSearchWindow in maxSearchWindows
-				from logFormat in logFormats
-				select new object[] {
-					logFormat.Item1,
-					logFormat.Item2,
-					checkpointInterval,
-					maxSearchWindow,
-					(int)filteredEventCount
-				};
-		}
-
-		[TestFixtureSource(typeof(SubscribeToAllFilteredTests), nameof(TestCases))]
-		public class when_subscribing_to_all_with_a_filter<TLogFormat, TStreamId>
-			: GrpcSpecification<TLogFormat, TStreamId> {
-			private const string StreamName = "test";
-
-			private int CheckpointCount => _positions.Count;
-
-			private readonly uint _maxSearchWindow;
-			private readonly int _filteredEventCount;
-			private readonly uint _checkpointIntervalMultiplier;
-			private readonly List<Position> _positions;
-			private readonly uint _checkpointInterval;
-
-			private Position _position;
-			private long _expected;
-
-			public when_subscribing_to_all_with_a_filter(uint checkpointIntervalMultiplier, uint maxSearchWindow,
-				int filteredEventCount)
-				: base (new LotsOfExpiriesStrategy()) {
-				_maxSearchWindow = maxSearchWindow;
-				_checkpointIntervalMultiplier = checkpointIntervalMultiplier;
-				_checkpointInterval = checkpointIntervalMultiplier * maxSearchWindow;
-				_filteredEventCount = filteredEventCount;
-				_positions = new List<Position>();
-				_position = Position.End;
-			}
-
-			protected override async Task Given() {
-				await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						Any = new(),
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8("abcd") }
-					},
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(_filteredEventCount) },
-					CorrelationId = Uuid.NewUuid().ToDto()
-				});
-			}
-
-			protected override async Task When() {
-				var success = (await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						Any = new(),
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamName) }
-					},
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(1) },
-					CorrelationId = Uuid.NewUuid().ToDto()
-				})).Success;
-
-				_position = new Position(success.Position.CommitPosition, success.Position.PreparePosition);
-
-				using var skippedEventCall = StreamsClient.Read(new ReadReq {
-					Options = new ReadReq.Types.Options {
-						Count = 4096,
-						All = new() { Start = new() },
-						UuidOption = new() { Structured = new() },
-						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
-						NoFilter = new()
-					}
-				}, GetCallOptions(AdminCredentials));
-				var skippedEventCount = await skippedEventCall.ResponseStream.ReadAllAsync().CountAsync(response =>
-					response.Event is not null &&
-					new Position(response.Event.Event.CommitPosition, response.Event.Event.PreparePosition) <=
-					_position &&
-					response.Event.Event.StreamIdentifier.StreamName.ToStringUtf8() != StreamName);
-
-				// skip the epochinfo - which isn't in unfiltered all reads so we haven't accounted for it above
-				skippedEventCount += 1;
-				_expected = skippedEventCount / _checkpointInterval;
-
-				using var call = StreamsClient.Read(new ReadReq {
-					Options = new ReadReq.Types.Options {
-						Subscription = new(),
-						All = new() { Start = new() },
-						Filter = new() {
-							Max = _maxSearchWindow,
-							CheckpointIntervalMultiplier = _checkpointIntervalMultiplier,
-							StreamIdentifier = new() { Prefix = { StreamName } }
-						},
-						UuidOption = new() { Structured = new() },
-						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards
-					}
-				}, GetCallOptions(AdminCredentials));
-
-				var receivedTheEvent = false;
-				await foreach (var response in call.ResponseStream.ReadAllAsync()) {
-					if (response.ContentCase == ReadResp.ContentOneofCase.CaughtUp) {
-						// we have successfully transitioned to live (and will receive no more events)
-						break;
-					}
-
-					if (response.ContentCase == ReadResp.ContentOneofCase.Checkpoint) {
-						if (receivedTheEvent) {
-							break;
-						}
-						_positions.Add(new Position(response.Checkpoint.CommitPosition,
-							response.Checkpoint.PreparePosition));
-						continue;
-					}
-
-					if (response.ContentCase == ReadResp.ContentOneofCase.Event) {
-						Assert.AreEqual(StreamName, response.Event.Event.StreamIdentifier.StreamName.ToStringUtf8());
-						receivedTheEvent = true;
-					}
-				}
-			}
-
-			[Test]
-			public void receives_the_correct_number_of_checkpoints() {
-				Assert.AreEqual(_expected, CheckpointCount);
-			}
-
-			[Test]
-			public void no_duplicate_checkpoints_received() {
-				Assert.AreEqual(_positions.Distinct().Count(), _positions.Count);
-			}
-		}
-
-		[TestFixtureSource(typeof(SubscribeToAllFilteredTests), nameof(TestCases))]
-		public class when_subscribing_to_all_with_a_filter_live<TLogFormat, TStreamId>
-			: GrpcSpecification<TLogFormat, TStreamId> {
-			private const string StreamName = "test";
-
-			private int CheckpointCount => _positions.Count;
-
-			private readonly uint _maxSearchWindow;
-			private readonly int _filteredEventCount;
-			private readonly uint _checkpointIntervalMultiplier;
-			private readonly List<Position> _positions;
-			private readonly uint _checkpointInterval;
-
-			private Position _position;
-
-			public when_subscribing_to_all_with_a_filter_live(uint checkpointIntervalMultiplier, uint maxSearchWindow,
-				int filteredEventCount) {
-				_maxSearchWindow = maxSearchWindow;
-				_checkpointIntervalMultiplier = checkpointIntervalMultiplier;
-				_checkpointInterval = checkpointIntervalMultiplier * maxSearchWindow;
-				_filteredEventCount = filteredEventCount;
-				_positions = new List<Position>();
-				_position = Position.End;
-			}
-
-			protected override async Task Given() {
-				await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						Any = new(),
-						StreamIdentifier = new() {StreamName = ByteString.CopyFromUtf8("abcd")}
-					},
-					IsFinal = true,
-					ProposedMessages = {CreateEvents(_filteredEventCount)},
-					CorrelationId = Uuid.NewUuid().ToDto()
-				});
-			}
-
-			protected override async Task When() {
-				for (int i = 1; i <= 5; i++) {
-					try {
-						await WhenWhichMightConsumeTooSlow(i);
-						return;
-					} catch (RpcException ex) when(ex.Message.Contains("too slow")) {
-						_positions.Clear();
-						await Task.Delay(500);
-					}
-				}
-			}
-
-			private async Task WhenWhichMightConsumeTooSlow(int attempt) {
-				var streamName = attempt + StreamName;
-				using var call = StreamsClient.Read(new ReadReq {
-					Options = new ReadReq.Types.Options {
-						Subscription = new(),
-						All = new() {End = new()},
-						Filter = new() {
-							Max = _maxSearchWindow,
-							CheckpointIntervalMultiplier = _checkpointIntervalMultiplier,
-							StreamIdentifier = new() {Prefix = {streamName}}
-						},
-						UuidOption = new() {Structured = new()},
-						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards
-					}
-				}, GetCallOptions(AdminCredentials));
-
-				Assert.True(await call.ResponseStream.MoveNext());
-
-				Assert.AreEqual(ReadResp.ContentOneofCase.Confirmation, call.ResponseStream.Current.ContentCase);
-
-				var success = new BatchAppendResp.Types.Success();
-				for (int i = 0; i <= _checkpointInterval ; i++) {
-					success = (await AppendToStreamBatch(new BatchAppendReq {
-						Options = new() {
-							Any = new(),
-							StreamIdentifier = new() {StreamName = ByteString.CopyFromUtf8(streamName)}
-						},
-						IsFinal = true,
-						ProposedMessages = {CreateEvents(1)},
-						CorrelationId = Uuid.NewUuid().ToDto()
-					})).Success;
-				}
-				
-				_position = new Position(success.Position.CommitPosition, success.Position.PreparePosition);
-
-				while (await call.ResponseStream.MoveNext()) {
-					var response = call.ResponseStream.Current;
-					if (response.ContentCase == ReadResp.ContentOneofCase.Checkpoint) {
-						_positions.Add(new Position(response.Checkpoint.CommitPosition,
-							response.Checkpoint.PreparePosition));
-						continue;
-					}
-
-					if (response.ContentCase == ReadResp.ContentOneofCase.Event) {
-						Assert.AreEqual(streamName,
-							response.Event.Event.StreamIdentifier.StreamName.ToStringUtf8());
-						if (!(response.Event.CommitPosition < _position.CommitPosition)) {
-							return;
-						}
-					}
-				}
-			}
-
-			[Test]
-			public void receives_the_correct_number_of_checkpoints() {
-				Assert.AreEqual(1, CheckpointCount);
-			}
-
-			[Test]
-			public void no_duplicate_checkpoints_received() {
-				Assert.AreEqual(_positions.Distinct().Count(), _positions.Count);
-			}
-
-			[Test]
-			public void checkpoint_is_before_last_written_event() {
-				Assert.True(_positions[0] < _position);
-			}
-		}
-		
-		[TestFixture(typeof(LogFormat.V2), typeof(string), 8, 6)]
-		[TestFixture(typeof(LogFormat.V2), typeof(string), 32, 6)]
-		[TestFixture(typeof(LogFormat.V2), typeof(string), 36, 6)]
-		public class when_subscribing_to_all_with_a_filter_and_transitioning_to_live<TLogFormat, TStreamId>
-			: GrpcSpecification<TLogFormat, TStreamId> {
-
-			private const string StreamA = nameof(StreamA);
-			private const string MarkerStream = nameof(MarkerStream);
-			private const string FinishEventType = nameof(FinishEventType);
-			private const int CheckpointIntervalMultiplier = 2;
-			private const int CheckpointInterval = CheckpointIntervalMultiplier * 32; 
-
-			private int _expectedEventCount;
-			private AllStreamPosition _markerPosition;
-			private readonly int _numberOfEventsToCatchUp;
-			private readonly int _expectedCheckpoints;
-			private readonly List<int> _checkpointPositions = new (); 
-			private readonly Dictionary<ReadResp.ContentOneofCase, int> _contentCaseCounts = new ();
-
-			public when_subscribing_to_all_with_a_filter_and_transitioning_to_live(int catchupCount, int expectedCheckpoints)
-				: base (new LotsOfExpiriesStrategy()) {
-				
-				_expectedCheckpoints = expectedCheckpoints;
-				_numberOfEventsToCatchUp = catchupCount;
-
-				foreach (var c in Enum.GetValues<ReadResp.ContentOneofCase>()) {
-					_contentCaseCounts.Add(c, 0);
-				}
-			}
-
-			protected override async Task Given() {
-				// marker stream, start subscription after this
-				var result = await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						Any = new(),
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(MarkerStream) }
-					},
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(1) },
-					CorrelationId = Uuid.NewUuid().ToDto()
-				});
-
-				_markerPosition = result.Success.Position;
-				
-				// initial events used for catching-up the subscription
-				await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						Any = new(),
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamA) }
-					},
-					IsFinal = true,
-					ProposedMessages = { ExpectEvents(CreateEvents(_numberOfEventsToCatchUp)) },
-					CorrelationId = Uuid.NewUuid().ToDto()
-				});
-			}
-
-			protected override async Task When() {
-				var caughtUp = new TaskCompletionSource();
-				var cancelSubscription = new TaskCompletionSource();
-				var _ = Task.Run(async () => {
-					// subscribe
-					using var call = StreamsClient.Read(new ReadReq {
-						Options = new ReadReq.Types.Options {
-							Subscription = new(),
-							All = new() { Position = new ReadReq.Types.Options.Types.Position() {
-								CommitPosition = _markerPosition.CommitPosition,
-								PreparePosition = _markerPosition.PreparePosition
-							}},
-							Filter = new() {
-								Count = new Empty(),
-								CheckpointIntervalMultiplier = CheckpointIntervalMultiplier,
-								EventType = new ReadReq.Types.Options.Types.FilterOptions.Types.Expression() {
-									Regex = "^[^$].*" // exclude system events
-								},
-							},
-							UuidOption = new() { Structured = new() },
-							ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards
-						}
-					}, GetCallOptions(AdminCredentials));
-					
-					// consume
-					var cts = new CancellationTokenSource();
-					var sw = Stopwatch.StartNew();
-					var maxResponseTimeMs = TimeSpan.Zero.TotalMilliseconds;
-					try {
-						await foreach (var response in call.ResponseStream.ReadAllAsync(cts.Token)) {
-							maxResponseTimeMs = Math.Max(maxResponseTimeMs, sw.Elapsed.TotalMilliseconds);
-
-							_contentCaseCounts[response.ContentCase]++;
-
-							switch (response.ContentCase) {
-								case ReadResp.ContentOneofCase.Checkpoint:
-									_checkpointPositions.Add(_contentCaseCounts[ReadResp.ContentOneofCase.Event]);
-									break;
-								case ReadResp.ContentOneofCase.CaughtUp:
-									caughtUp.TrySetResult();
-									break;
-								case ReadResp.ContentOneofCase.Event: {
-									if (response.Event.Event.Metadata[GrpcMetadata.Type] == FinishEventType) {
-										// allow some time for final events, like checkpoints, to arrive
-										cts.CancelAfter(TimeSpan.FromMilliseconds(maxResponseTimeMs * 10));
-									}
-									break;
-								}
-							}
-
-							sw.Restart();
-						}
-					} catch (RpcException ex) when(ex.StatusCode == StatusCode.Cancelled) {
-						// expected
-					}
-					
-					cancelSubscription.TrySetResult();
-				});
-
-				// wait for initial events to be caught-up and subscription transitions to live
-				await caughtUp.Task;
-				
-				for (int i = 0; i < 18; i++) {
-					await AppendToStreamBatch(new BatchAppendReq {
-						Options = new() {
-							Any = new(),
-							StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamA) }
-						},
-						IsFinal = true,
-						ProposedMessages = { ExpectEvents(CreateEvents(20)) },
-						CorrelationId = Uuid.NewUuid().ToDto()
-					});
-
-					await Task.Delay(10);
-				}
-
-				await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						Any = new(),
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamA) }
-					},
-					IsFinal = true,
-					ProposedMessages = {
-						ExpectEvents(CreateEvents(15)),
-						ExpectEvents(CreateEvent(FinishEventType))
-					},
-					CorrelationId = Uuid.NewUuid().ToDto()
-				});
-				
-				await cancelSubscription.Task;
-			}
-
-			private IEnumerable<BatchAppendReq.Types.ProposedMessage> ExpectEvents(
-				IEnumerable<BatchAppendReq.Types.ProposedMessage> events) => ExpectEvents(events.ToArray());
-
-			private IEnumerable<BatchAppendReq.Types.ProposedMessage> ExpectEvents(params BatchAppendReq.Types.ProposedMessage[] events) {
-				_expectedEventCount += events.Length;
-				return events;
-			}
-			
-			[Test]
-			public void receives_the_correct_number_of_confirmations() {
-				Assert.AreEqual(1, _contentCaseCounts[ReadResp.ContentOneofCase.Confirmation]);
-			}
-			
-			[Test]
-			public void receives_the_correct_number_of_events() {
-				Assert.AreEqual(_expectedEventCount, _contentCaseCounts[ReadResp.ContentOneofCase.Event]);
-			}
-			
-			[Test]
-			public void receives_the_correct_number_of_checkpoints() {
-				Assert.AreEqual(_expectedCheckpoints, _contentCaseCounts[ReadResp.ContentOneofCase.Checkpoint]);
-			}
-			
-			[Test]
-			public void receives_the_checkpoints_on_correct_interval() {
-				// ideally the checkpoints should be issued after exactly every `CheckpointInterval` events.
-				// this is how things worked previously but the way the enumerator works has changed for more efficiency:
-				// the enumerator now starts a _permanent_ live subscription to the subscriptions service before catch up starts.
-				// this causes the checkpoints received from the subscriptions service to be offset.
-				// in this test it turns out that it's offset by exactly the number of events to catch up but this is not a strict requirement -
-				// the important thing being verified here is that the checkpoints are received after the correct interval when live.
-
-				var factor = 0L;
-				_checkpointPositions.ForEach(p => Assert.AreEqual(factor++ * CheckpointInterval + _numberOfEventsToCatchUp, p, $"checkpoint at: {p}"));
-			}
-			
-			[Test]
-			public void receives_the_subscription_was_caught_up() {
-				Assert.AreEqual(1, _contentCaseCounts[ReadResp.ContentOneofCase.CaughtUp]);
-			}
-			
-			[Test]
-			public void does_not_receive_the_subscription_fell_behind() {
-				Assert.Zero(_contentCaseCounts[ReadResp.ContentOneofCase.FellBehind]);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/SubscribeToAllTests.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/SubscribeToAllTests.cs
deleted file mode 100644
index 829cca3cefd..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/SubscribeToAllTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Client.Streams;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Core.Services.Transport.Grpc;
-using Google.Protobuf;
-using Grpc.Core;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Grpc.StreamsTests {
-	[TestFixture]
-	public class SubscribeToAllTests {
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_subscribing_to_all<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
-			private const string StreamId = nameof(when_subscribing_to_all<TLogFormat, TStreamId>);
-			private readonly List<ReadResp> _responses = new();
-			private Position _positionOfLastWrite;
-
-			public when_subscribing_to_all() : base(new LotsOfExpiriesStrategy()) {
-			}
-
-			protected override async Task Given() {
-				var response = await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamId) },
-						Any = new(),
-					},
-					CorrelationId = Uuid.NewUuid().ToDto(),
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(120) }
-				});
-				_positionOfLastWrite = new Position(response.Success.Position.CommitPosition,
-					response.Success.Position.PreparePosition);
-			}
-
-			protected override async Task When() {
-				using var call = StreamsClient.Read(new() {
-					Options = new() {
-						Subscription = new(),
-						NoFilter = new(),
-						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
-						UuidOption = new() { Structured = new() },
-						All = new() {
-							Start = new()
-							// Position = new() {
-							// 	CommitPosition = _positionOfLastWrite.CommitPosition,
-							// 	PreparePosition = _positionOfLastWrite.PreparePosition
-							// }
-						}
-					}
-				}, GetCallOptions(AdminCredentials));
-
-				_responses.AddRange(await call.ResponseStream.ReadAllAsync()
-					.TakeWhile(response => response.ContentCase != ReadResp.ContentOneofCase.CaughtUp)
-					.ToArrayAsync());
-			}
-
-			[Test]
-			public void subscription_confirmed() {
-				Assert.AreEqual(ReadResp.ContentOneofCase.Confirmation, _responses[0].ContentCase);
-				Assert.NotNull(_responses[0].Confirmation.SubscriptionId);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_subscribing_to_all_live<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
-			private const string StreamId = nameof(when_subscribing_to_all_live<TLogFormat, TStreamId>);
-			private readonly List<ReadResp> _responses = new();
-
-			protected override async Task Given() {
-				await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamId) },
-						Any = new(),
-					},
-					CorrelationId = Uuid.NewUuid().ToDto(),
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(120) }
-				});
-			}
-
-			protected override async Task When() {
-				using var call = StreamsClient.Read(new() {
-					Options = new() {
-						Subscription = new(),
-						NoFilter = new(),
-						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
-						UuidOption = new() { Structured = new() },
-						All = new() { End = new() }
-					}
-				}, GetCallOptions(AdminCredentials));
-
-				var positionOfLastWrite = Position.End;
-
-				await foreach (var response in call.ResponseStream.ReadAllAsync()) {
-					if (response.ContentCase == ReadResp.ContentOneofCase.Confirmation) {
-						var success = (await AppendToStreamBatch(new BatchAppendReq {
-							Options = new() {
-								Any = new(),
-								StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamId) }
-							},
-							CorrelationId = Uuid.NewUuid().ToDto(),
-							IsFinal = true,
-							ProposedMessages = { CreateEvents(1) }
-						})).Success;
-
-						positionOfLastWrite = new Position(success.Position.CommitPosition, success.Position.PreparePosition);
-						_responses.Add(response);
-					}
-					else if (response.ContentCase == ReadResp.ContentOneofCase.Event) {
-						_responses.Add(response);
-						if (positionOfLastWrite <= new Position(response.Event.Event.CommitPosition, response.Event.Event.PreparePosition)) {
-							break;
-						}
-					}
-				}
-			}
-
-			[Test]
-			public void subscription_confirmed() {
-				Assert.AreEqual(ReadResp.ContentOneofCase.Confirmation, _responses[0].ContentCase);
-				Assert.NotNull(_responses[0].Confirmation.SubscriptionId);
-			}
-
-			[Test]
-			public void reads_all_the_live_events() {
-				Assert.AreEqual(1,
-					_responses.Count(x => x.ContentCase == ReadResp.ContentOneofCase.Event
-					                      && !x.Event.Event.Metadata["type"].StartsWith("$")));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/SubscribeToStreamTests.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/SubscribeToStreamTests.cs
deleted file mode 100644
index 7d43beb41f0..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/SubscribeToStreamTests.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Client.Streams;
-using EventStore.Core.Services.Transport.Grpc;
-using Google.Protobuf;
-using Grpc.Core;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Grpc.StreamsTests {
-	[TestFixture]
-	public class SubscribeToStreamTests {
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_subscribing_to_stream<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
-			private const string StreamId = nameof(when_subscribing_to_stream<TLogFormat, TStreamId>);
-			private readonly List<ReadResp> _responses = new();
-			private ulong _positionOfLastWrite;
-
-			public when_subscribing_to_stream() : base(new LotsOfExpiriesStrategy()) {
-			}
-
-			protected override async Task Given() {
-				var response = await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamId) },
-						Any = new(),
-					},
-					CorrelationId = Uuid.NewUuid().ToDto(),
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(120) }
-				});
-				_positionOfLastWrite = response.Success.CurrentRevision;
-			}
-
-			protected override async Task When() {
-				using var call = StreamsClient.Read(new() {
-					Options = new() {
-						Subscription = new(),
-						NoFilter = new(),
-						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
-						UuidOption = new() { Structured = new() },
-						Stream = new() {
-							Start = new(),
-							StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamId) },
-						},
-					}
-				}, GetCallOptions(AdminCredentials));
-
-				while (await call.ResponseStream.MoveNext()) {
-					var response = call.ResponseStream.Current;
-					if (response.ContentCase == ReadResp.ContentOneofCase.Event &&
-						_positionOfLastWrite == response.Event.Event.StreamRevision) {
-							break;
-					}
-
-					_responses.Add(response);
-				}
-
-				// caught up, now add one more event
-
-				await AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamId) },
-						Any = new(),
-					},
-					CorrelationId = Uuid.NewUuid().ToDto(),
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(1) }
-				});
-
-				// and consume it. this makes sure we didnt fail while transitioning to live
-				Assert.True(await call.ResponseStream.MoveNext());
-			}
-
-			[Test]
-			public void subscription_confirmed() {
-				Assert.AreEqual(ReadResp.ContentOneofCase.Confirmation, _responses[0].ContentCase);
-				Assert.NotNull(_responses[0].Confirmation.SubscriptionId);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/TombstoneTests.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/TombstoneTests.cs
deleted file mode 100644
index 427a57df739..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/StreamsTests/TombstoneTests.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Client.Streams;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Core.Services.Transport.Grpc;
-using Google.Protobuf;
-using Grpc.Core;
-using NUnit.Framework;
-using GrpcConstants = EventStore.Core.Services.Transport.Grpc.Constants;
-
-namespace EventStore.Core.Tests.Services.Transport.Grpc.StreamsTests {
-	[TestFixture]
-	public class TombstoneTests {
-		private const string StreamName = nameof(TombstoneTests);
-
-		public abstract class TombstoneExistingStreamSpecification<TLogFormat, TStreamId>
-			: GrpcSpecification<TLogFormat, TStreamId> {
-			private readonly TombstoneReq.Types.Options _options;
-			private Exception _caughtException;
-
-			private TombstoneExistingStreamSpecification(TombstoneReq.Types.Options options) {
-				_options = new(options) {
-					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamName) }
-				};
-			}
-
-			protected TombstoneExistingStreamSpecification(StreamRevision expectedStreamRevision) : this(
-				new TombstoneReq.Types.Options {
-					Revision = expectedStreamRevision.ToUInt64(),
-				}) { }
-
-			protected TombstoneExistingStreamSpecification(long expectedStreamState) : this(expectedStreamState switch {
-				ExpectedVersion.Any => new TombstoneReq.Types.Options { Any = new() },
-				ExpectedVersion.NoStream => new TombstoneReq.Types.Options { NoStream = new() },
-				ExpectedVersion.StreamExists => new TombstoneReq.Types.Options { StreamExists = new() },
-				_ => throw new InvalidOperationException()
-			}){ }
-
-			[Test]
-			public void no_exception_is_thrown() {
-				Assert.Null(_caughtException);
-			}
-			
-			[Test]
-			public void the_stream_is_deleted() {
-				var ex = Assert.ThrowsAsync<RpcException>(async () => {
-					using var call = StreamsClient.Read(new () {
-						Options = new() {
-							UuidOption = new() { Structured = new() },
-							NoFilter = new(),
-							ResolveLinks = false,
-							ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
-							Count = 1,
-							Stream = new() {
-								StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamName) },
-								Start = new()
-							}
-						}
-					}, GetCallOptions());
-
-					await call.ResponseStream.ReadAllAsync().ToArrayAsync();
-				});
-
-				Assert.NotNull(ex);
-				Assert.AreEqual(StatusCode.FailedPrecondition, ex.Status.StatusCode);
-				Assert.Contains((GrpcConstants.Exceptions.ExceptionKey, GrpcConstants.Exceptions.StreamDeleted),
-					ex.Trailers.Select(x => (x.Key, x.Value)).ToArray());
-			}
-
-			protected override Task Given() => _options.ExpectedStreamRevisionCase switch {
-				TombstoneReq.Types.Options.ExpectedStreamRevisionOneofCase.NoStream => Task.CompletedTask,
-				_ => AppendToStreamBatch(new BatchAppendReq {
-					Options = new() {
-						NoStream = new(),
-						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamName) }
-					},
-					CorrelationId = Uuid.NewUuid().ToDto(),
-					IsFinal = true,
-					ProposedMessages = { CreateEvents(1) }
-				}).AsTask()
-			};
-
-			protected override async Task When() {
-				using var call = StreamsClient.TombstoneAsync(new() {
-					Options = _options
-				}, GetCallOptions());
-
-				try {
-					await call.ResponseAsync;
-				} catch (Exception ex) {
-					_caughtException = ex;
-				}
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class TombstoneExistingStreamExpectedRevision<TLogFormat, TStreamId>
-			: TombstoneExistingStreamSpecification<TLogFormat, TStreamId> {
-			public TombstoneExistingStreamExpectedRevision() : base(StreamRevision.Start) { }
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class TombstoneExistingStreamAny<TLogFormat, TStreamId>
-			: TombstoneExistingStreamSpecification<TLogFormat, TStreamId> {
-			public TombstoneExistingStreamAny() : base(ExpectedVersion.Any) { }
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class TombstoneExistingStreamNoStream<TLogFormat, TStreamId>
-			: TombstoneExistingStreamSpecification<TLogFormat, TStreamId> {
-			public TombstoneExistingStreamNoStream() : base(ExpectedVersion.NoStream) { }
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class TombstoneExistingStreamExists<TLogFormat, TStreamId>
-			: TombstoneExistingStreamSpecification<TLogFormat, TStreamId> {
-			public TombstoneExistingStreamExists() : base(ExpectedVersion.StreamExists) { }
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Grpc/UuidTests.cs b/src/EventStore.Core.Tests/Services/Transport/Grpc/UuidTests.cs
deleted file mode 100644
index 388cb90853b..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Grpc/UuidTests.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using System;
-using EventStore.Core.Services.Transport.Grpc;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Grpc {
-	public class UuidTests {
-		[Test]
-		public void Equality() {
-			var sut = Uuid.NewUuid();
-			Assert.AreEqual(Uuid.FromGuid(sut.ToGuid()), sut);
-		}
-
-		[Test]
-		public void Inequality() {
-			var sut = Uuid.NewUuid();
-			Assert.AreNotEqual(Uuid.NewUuid(), sut);
-		}
-
-		[Test]
-		public void EqualityOperator() {
-			var sut = Uuid.NewUuid();
-			Assert.True(Uuid.FromGuid(sut.ToGuid()) == sut);
-		}
-
-		[Test]
-		public void InequalityOperator() {
-			var sut = Uuid.NewUuid();
-			Assert.True(Uuid.NewUuid() != sut);
-		}
-
-		[Test]
-		public void ArgumentNullException() {
-			var ex = Assert.Throws<ArgumentNullException>(() => Uuid.Parse(null));
-			Assert.AreEqual("value", ex.ParamName);
-		}
-
-		[Test]
-		public void ToGuidReturnsExpectedResult() {
-			var guid = Guid.NewGuid();
-			var sut = Uuid.FromGuid(guid);
-
-			Assert.AreEqual(sut.ToGuid(), guid);
-		}
-
-		[Test]
-		public void ToStringProducesExpectedResult() {
-			var sut = Uuid.NewUuid();
-
-			Assert.AreEqual(sut.ToGuid().ToString(),sut.ToString());
-		}
-
-		[Test]
-		public void ToFormattedStringProducesExpectedResult() {
-			var sut = Uuid.NewUuid();
-
-			Assert.AreEqual(sut.ToGuid().ToString("n"),sut.ToString("n"));
-		}
-
-
-		[Test]
-		public void ToDtoReturnsExpectedResult() {
-			var msb = GetRandomInt64();
-			var lsb = GetRandomInt64();
-
-			var sut = Uuid.FromInt64(msb, lsb);
-
-			var result = sut.ToDto();
-
-			Assert.NotNull(result.Structured);
-			Assert.AreEqual(lsb, result.Structured.LeastSignificantBits);
-			Assert.AreEqual(msb, result.Structured.MostSignificantBits);
-		}
-
-		[Test]
-		public void ParseReturnsExpectedResult() {
-			var guid = Guid.NewGuid();
-
-			var sut = Uuid.Parse(guid.ToString());
-
-			Assert.AreEqual(Uuid.FromGuid(guid), sut);
-		}
-
-		[Test]
-		public void FromInt64ReturnsExpectedResult() {
-			var guid = Guid.Parse("65678f9b-d139-4786-8305-b9166922b378");
-			var sut = Uuid.FromInt64(7306966819824813958L, -9005588373953137800L);
-			var expected = Uuid.FromGuid(guid);
-
-			Assert.AreEqual(expected, sut);
-		}
-
-		private static long GetRandomInt64() {
-			var buffer = new byte[sizeof(long)];
-
-			new Random().NextBytes(buffer);
-
-			return BitConverter.ToInt64(buffer, 0);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Http/Authentication/node_certificate_authentication_provider.cs b/src/EventStore.Core.Tests/Services/Transport/Http/Authentication/node_certificate_authentication_provider.cs
deleted file mode 100644
index 1d43242aafc..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Http/Authentication/node_certificate_authentication_provider.cs
+++ /dev/null
@@ -1,381 +0,0 @@
-using System;
-using System.Linq;
-using System.Net;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading.Tasks;
-using EventStore.Core.Services.Transport.Http.Authentication;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Plugins.Authentication;
-using Microsoft.AspNetCore.Http;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Http.Authentication {
-	public class TestFixtureWithNodeCertificateHttpAuthenticationProvider {
-		protected NodeCertificateAuthenticationProvider _provider;
-
-		protected void SetUpProvider() {
-			_provider = new NodeCertificateAuthenticationProvider(() => "eventstoredb-node");
-		}
-	}
-
-	[TestFixture]
-	public class
-		when_handling_a_request_without_a_client_certificate :
-			TestFixtureWithNodeCertificateHttpAuthenticationProvider {
-		private bool _authenticateResult;
-
-		[SetUp]
-		public void SetUp() {
-			SetUpProvider();
-			var context = new DefaultHttpContext();
-			Assert.IsNull(context.Connection.ClientCertificate);
-			_authenticateResult = _provider.Authenticate(context, out _);
-		}
-
-		[Test]
-		public void returns_false() {
-			Assert.IsFalse(_authenticateResult);
-		}
-	}
-
-	[TestFixture]
-	public class
-		when_handling_a_request_with_a_client_certificate_having_no_san :
-			TestFixtureWithNodeCertificateHttpAuthenticationProvider {
-		private HttpAuthenticationRequest _authenticateRequest;
-		private bool _authenticateResult;
-		private HttpContext _context;
-
-		[SetUp]
-		public void SetUp() {
-			SetUpProvider();
-			_context = new DefaultHttpContext();
-			using (var rsa = RSA.Create()) {
-				var certRequest = new CertificateRequest("CN=test", rsa, HashAlgorithmName.SHA256,
-					RSASignaturePadding.Pkcs1);
-				_context.Connection.ClientCertificate = certRequest.CreateSelfSigned(DateTimeOffset.UtcNow.AddMonths(-1), DateTimeOffset.UtcNow.AddMonths(1));
-			}
-
-			_authenticateResult = _provider.Authenticate(_context, out _authenticateRequest);
-		}
-
-		[Test]
-		public void returns_false() {
-			Assert.IsFalse(_authenticateResult);
-		}
-
-		[Test]
-		public void authentication_request_is_null() {
-			Assert.IsNull(_authenticateRequest);
-		}
-
-		[Test]
-		public void no_roles_are_assigned() {
-			Assert.AreEqual(0, _context.User.Claims.Count());
-		}
-	}
-
-	[TestFixture]
-	public class
-		when_handling_a_request_with_a_client_certificate_having_an_ip_san_but_without_node_cn :
-			TestFixtureWithNodeCertificateHttpAuthenticationProvider {
-		private HttpAuthenticationRequest _authenticateRequest;
-		private bool _authenticateResult;
-		private HttpContext _context;
-
-		[SetUp]
-		public void SetUp() {
-			SetUpProvider();
-			_context = new DefaultHttpContext();
-			X509Certificate2 certificate;
-
-			using (RSA rsa = RSA.Create())
-			{
-				var certReq = new CertificateRequest("CN=hello", rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
-				var sanBuilder = new SubjectAlternativeNameBuilder();
-				sanBuilder.AddIpAddress(IPAddress.Loopback);
-				certReq.CertificateExtensions.Add(sanBuilder.Build());
-				certificate = certReq.CreateSelfSigned(DateTimeOffset.UtcNow.AddMonths(-1), DateTimeOffset.UtcNow.AddMonths(1));
-			}
-
-			_context.Connection.ClientCertificate = certificate;
-			_authenticateResult = _provider.Authenticate(_context, out _authenticateRequest);
-		}
-
-		[Test]
-		public void returns_false() {
-			Assert.IsFalse(_authenticateResult);
-		}
-
-		[Test]
-		public void authentication_request_is_null() {
-			Assert.IsNull(_authenticateRequest);
-		}
-
-		[Test]
-		public void no_roles_are_assigned() {
-			Assert.AreEqual(0, _context.User.Claims.Count());
-		}
-	}
-
-	[TestFixture]
-	public class
-		when_handling_a_request_with_a_client_certificate_having_an_ip_san_and_node_cn :
-			TestFixtureWithNodeCertificateHttpAuthenticationProvider {
-		private HttpAuthenticationRequest _authenticateRequest;
-		private bool _authenticateResult;
-		private HttpContext _context;
-
-		[SetUp]
-		public void SetUp() {
-			SetUpProvider();
-			_context = new DefaultHttpContext();
-			X509Certificate2 certificate;
-
-			using (RSA rsa = RSA.Create())
-			{
-				var certReq = new CertificateRequest("CN=eventstoredb-node", rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
-
-				var sanBuilder = new SubjectAlternativeNameBuilder();
-				sanBuilder.AddIpAddress(IPAddress.Loopback);
-				certReq.CertificateExtensions.Add(sanBuilder.Build());
-
-				certReq.CertificateExtensions.Add(new X509KeyUsageExtension(
-					X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.KeyEncipherment, critical: false));
-
-				certReq.CertificateExtensions.Add(new X509EnhancedKeyUsageExtension(
-					[
-						new("1.3.6.1.5.5.7.3.1"), // serverAuth
-						new("1.3.6.1.5.5.7.3.2"), // clientAuth
-					],
-					critical: false));
-
-				certificate = certReq.CreateSelfSigned(DateTimeOffset.UtcNow.AddMonths(-1), DateTimeOffset.UtcNow.AddMonths(1));
-			}
-
-			_context.Connection.ClientCertificate = certificate;
-			_authenticateResult = _provider.Authenticate(_context, out _authenticateRequest);
-		}
-
-		[Test]
-		public void returns_true() {
-			Assert.IsTrue(_authenticateResult);
-		}
-
-		[Test]
-		public async Task passes_authentication() {
-			var (status, _) = await _authenticateRequest.AuthenticateAsync();
-			Assert.AreEqual(HttpAuthenticationRequestStatus.Authenticated, status);
-		}
-
-		[Test]
-		public async Task sets_user_to_system_user() {
-			var (_, user) = await _authenticateRequest.AuthenticateAsync();
-			Assert.AreEqual(SystemAccounts.System.Claims, user.Claims);
-		}
-	}
-
-	[TestFixture]
-	public class
-		when_handling_a_request_with_a_client_certificate_having_an_ip_san_and_node_cn_with_additional_subject_details :
-			TestFixtureWithNodeCertificateHttpAuthenticationProvider {
-		private HttpAuthenticationRequest _authenticateRequest;
-		private bool _authenticateResult;
-		private HttpContext _context;
-
-		[SetUp]
-		public void SetUp() {
-			SetUpProvider();
-			_context = new DefaultHttpContext();
-			X509Certificate2 certificate;
-
-			using (RSA rsa = RSA.Create())
-			{
-				var certReq = new CertificateRequest("C=UK, O=Event Store Ltd, CN=eventstoredb-node", rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
-
-				var sanBuilder = new SubjectAlternativeNameBuilder();
-				sanBuilder.AddIpAddress(IPAddress.Loopback);
-				certReq.CertificateExtensions.Add(sanBuilder.Build());
-
-				certReq.CertificateExtensions.Add(new X509KeyUsageExtension(
-					X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.KeyEncipherment, critical: false));
-
-				certReq.CertificateExtensions.Add(new X509EnhancedKeyUsageExtension(
-					[
-						new("1.3.6.1.5.5.7.3.1"), // serverAuth
-						new("1.3.6.1.5.5.7.3.2"), // clientAuth
-					],
-					critical: false));
-
-				certificate = certReq.CreateSelfSigned(DateTimeOffset.UtcNow.AddMonths(-1), DateTimeOffset.UtcNow.AddMonths(1));
-			}
-
-			_context.Connection.ClientCertificate = certificate;
-			_authenticateResult = _provider.Authenticate(_context, out _authenticateRequest);
-		}
-
-		[Test]
-		public void returns_true() {
-			Assert.IsTrue(_authenticateResult);
-		}
-
-		[Test]
-		public async Task passes_authentication() {
-			var (status, _) = await _authenticateRequest.AuthenticateAsync();
-			Assert.AreEqual(HttpAuthenticationRequestStatus.Authenticated, status);
-		}
-
-		[Test]
-		public async Task sets_user_to_system_user() {
-			var (_, user) = await _authenticateRequest.AuthenticateAsync();
-			Assert.AreEqual(SystemAccounts.System.Claims, user.Claims);
-		}
-	}
-
-
-	[TestFixture]
-	public class
-		when_handling_a_request_with_a_client_certificate_having_a_dns_san_but_without_node_cn :
-			TestFixtureWithNodeCertificateHttpAuthenticationProvider {
-		private HttpAuthenticationRequest _authenticateRequest;
-		private bool _authenticateResult;
-		private HttpContext _context;
-
-		[SetUp]
-		public void SetUp() {
-			SetUpProvider();
-			_context = new DefaultHttpContext();
-			X509Certificate2 certificate;
-
-			using (RSA rsa = RSA.Create())
-			{
-				var certReq = new CertificateRequest("CN=hello", rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
-				var sanBuilder = new SubjectAlternativeNameBuilder();
-				sanBuilder.AddDnsName("localhost");
-				certReq.CertificateExtensions.Add(sanBuilder.Build());
-				certificate = certReq.CreateSelfSigned(DateTimeOffset.UtcNow.AddMonths(-1), DateTimeOffset.UtcNow.AddMonths(1));
-			}
-
-			_context.Connection.ClientCertificate = certificate;
-			_authenticateResult = _provider.Authenticate(_context, out _authenticateRequest);
-		}
-
-		[Test]
-		public void returns_false() {
-			Assert.IsFalse(_authenticateResult);
-		}
-
-		[Test]
-		public void authentication_request_is_null() {
-			Assert.IsNull(_authenticateRequest);
-		}
-
-		[Test]
-		public void no_roles_are_assigned() {
-			Assert.AreEqual(0, _context.User.Claims.Count());
-		}
-	}
-
-	[TestFixture]
-	public class
-		when_handling_a_request_with_a_client_certificate_having_a_dns_san_and_node_cn :
-			TestFixtureWithNodeCertificateHttpAuthenticationProvider {
-		private HttpAuthenticationRequest _authenticateRequest;
-		private bool _authenticateResult;
-		private HttpContext _context;
-
-		[SetUp]
-		public void SetUp() {
-			SetUpProvider();
-			_context = new DefaultHttpContext();
-			X509Certificate2 certificate;
-
-			using (RSA rsa = RSA.Create())
-			{
-				var certReq = new CertificateRequest("CN=eventstoredb-node", rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
-
-				var sanBuilder = new SubjectAlternativeNameBuilder();
-				sanBuilder.AddDnsName("localhost");
-				certReq.CertificateExtensions.Add(sanBuilder.Build());
-
-				certReq.CertificateExtensions.Add(new X509KeyUsageExtension(
-					X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.KeyEncipherment, critical: false));
-
-				certReq.CertificateExtensions.Add(new X509EnhancedKeyUsageExtension(
-					[
-						new("1.3.6.1.5.5.7.3.1"), // serverAuth
-						new("1.3.6.1.5.5.7.3.2"), // clientAuth
-					],
-					critical: false));
-
-				certificate = certReq.CreateSelfSigned(DateTimeOffset.UtcNow.AddMonths(-1), DateTimeOffset.UtcNow.AddMonths(1));
-			}
-
-			_context.Connection.ClientCertificate = certificate;
-			_authenticateResult = _provider.Authenticate(_context, out _authenticateRequest);
-		}
-
-		[Test]
-		public void returns_true() {
-			Assert.IsTrue(_authenticateResult);
-		}
-
-		[Test]
-		public async Task passes_authentication() {
-			var (status, _) = await _authenticateRequest.AuthenticateAsync();
-			Assert.AreEqual(HttpAuthenticationRequestStatus.Authenticated, status);
-		}
-
-		[Test]
-		public async Task sets_user_to_system_user() {
-			var (_, user) = await _authenticateRequest.AuthenticateAsync();
-			Assert.AreEqual(SystemAccounts.System.Claims, user.Claims);
-		}
-	}
-
-	[TestFixture]
-	public class
-		when_handling_a_request_with_a_client_certificate_having_a_non_dns_or_ip_san_with_node_cn :
-			TestFixtureWithNodeCertificateHttpAuthenticationProvider {
-		private HttpAuthenticationRequest _authenticateRequest;
-		private bool _authenticateResult;
-		private HttpContext _context;
-
-		[SetUp]
-		public void SetUp() {
-			SetUpProvider();
-			_context = new DefaultHttpContext();
-			X509Certificate2 certificate;
-
-			using (RSA rsa = RSA.Create())
-			{
-				var certReq = new CertificateRequest("CN=eventstoredb-node", rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
-				var sanBuilder = new SubjectAlternativeNameBuilder();
-				sanBuilder.AddEmailAddress("hello@hello.org");
-				sanBuilder.AddUserPrincipalName("test@test.com");
-				sanBuilder.AddUri(new Uri("http://localhost"));
-				certReq.CertificateExtensions.Add(sanBuilder.Build());
-				certificate = certReq.CreateSelfSigned(DateTimeOffset.UtcNow.AddMonths(-1), DateTimeOffset.UtcNow.AddMonths(1));
-			}
-
-			_context.Connection.ClientCertificate = certificate;
-			_authenticateResult = _provider.Authenticate(_context, out _authenticateRequest);
-		}
-
-		[Test]
-		public void returns_false() {
-			Assert.IsFalse(_authenticateResult);
-		}
-
-		[Test]
-		public void authentication_request_is_null() {
-			Assert.IsNull(_authenticateRequest);
-		}
-
-		[Test]
-		public void no_roles_are_assigned() {
-			Assert.AreEqual(0, _context.User.Claims.Count());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Http/Authentication/unix_socket_authentication_provider.cs b/src/EventStore.Core.Tests/Services/Transport/Http/Authentication/unix_socket_authentication_provider.cs
deleted file mode 100644
index f833bb2acba..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Http/Authentication/unix_socket_authentication_provider.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using EventStore.Core.Services.Transport.Http;
-using EventStore.Core.Services.Transport.Http.Authentication;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Plugins.Authentication;
-using Microsoft.AspNetCore.Connections.Features;
-using Microsoft.AspNetCore.Http;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Http.Authentication {
-	public class TestFixtureWithUnixSocketAuthenticationProvider {
-		protected UnixSocketAuthenticationProvider _provider;
-
-		protected void SetUpProvider() {
-			_provider = new UnixSocketAuthenticationProvider();
-		}
-	}
-
-	class ConnectionItemsFeature : IConnectionItemsFeature {
-		public IDictionary<object, object> Items { get; set; }
-
-		public ConnectionItemsFeature() {
-			Items = new Dictionary<object, object>();
-		}
-	}
-
-	[TestFixture]
-	public class when_handling_a_request_not_having_the_unix_socket_connection_item : TestFixtureWithUnixSocketAuthenticationProvider {
-		private bool _authenticateResult;
-
-		[SetUp]
-		public void SetUp() {
-			SetUpProvider();
-			var context = new DefaultHttpContext();
-			_authenticateResult = _provider.Authenticate(context, out _);
-		}
-
-		[Test]
-		public void returns_false() {
-			Assert.IsFalse(_authenticateResult);
-		}
-	}
-
-	[TestFixture]
-	public class when_handling_a_request_having_the_unix_socket_connection_item : TestFixtureWithUnixSocketAuthenticationProvider {
-		private bool _authenticateResult;
-		private HttpAuthenticationRequest _authenticateRequest;
-
-		[SetUp]
-		public void SetUp() {
-			SetUpProvider();
-			var context = new DefaultHttpContext();
-			var connectionItemsFeature = new ConnectionItemsFeature();
-			connectionItemsFeature.Items.Add(UnixSocketConnectionMiddleware.UnixSocketConnectionKey, true);
-			context.Features.Set<IConnectionItemsFeature>(connectionItemsFeature);
-
-			_authenticateResult = _provider.Authenticate(context, out _authenticateRequest);
-		}
-
-		[Test]
-		public void returns_true() {
-			Assert.IsTrue(_authenticateResult);
-		}
-
-		[Test]
-		public async Task passes_authentication() {
-			var (status, _) = await _authenticateRequest.AuthenticateAsync();
-			Assert.AreEqual(HttpAuthenticationRequestStatus.Authenticated, status);
-		}
-
-		[Test]
-		public async Task sets_user_to_system_user() {
-			var (_, user) = await _authenticateRequest.AuthenticateAsync();
-			Assert.AreEqual(SystemAccounts.System.Claims, user.Claims);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Http/Authorization/authorization_tests.cs b/src/EventStore.Core.Tests/Services/Transport/Http/Authorization/authorization_tests.cs
deleted file mode 100644
index aff447b6da4..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Http/Authorization/authorization_tests.cs
+++ /dev/null
@@ -1,267 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Tests.Integration;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Http {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class Authorization<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
-		private readonly Dictionary<string, HttpClient> _httpClients = new Dictionary<string, HttpClient>();
-		private TimeSpan _timeout = TimeSpan.FromSeconds(5);
-		private int _leaderId;
-
-
-		private HttpClient CreateHttpClient(string username, string password) {
-			var client = new HttpClient(new HttpClientHandler {
-				AllowAutoRedirect = false,
-				ServerCertificateCustomValidationCallback = delegate { return true; }
-			}) {
-				Timeout = _timeout
-			};
-			
-			if (!string.IsNullOrEmpty(username)) {
-				client.DefaultRequestHeaders.Authorization =
-					new AuthenticationHeaderValue(
-						"Basic", System.Convert.ToBase64String(
-							System.Text.Encoding.ASCII.GetBytes(
-								$"{username}:{password}")));
-			}
-
-			return client;
-		}
-
-		private async Task<int> SendRequest(HttpClient client, HttpMethod method, string url, string body, string contentType) {
-			var request = new HttpRequestMessage();
-			request.Method = method;
-			request.RequestUri = new Uri(url);
-
-			if (body != null) {
-				var bodyBytes = Helper.UTF8NoBom.GetBytes(body);
-				var stream = new MemoryStream(bodyBytes);
-				var content = new StreamContent(stream);
-				content.Headers.ContentLength = bodyBytes.Length;
-				if (contentType != null)
-					content.Headers.ContentType = new MediaTypeHeaderValue(contentType);
-				request.Content = content;
-			}
-
-			var result = await client.SendAsync(request);
-			return (int)result.StatusCode;
-		}
-
-		private HttpMethod GetHttpMethod(string method) {
-			switch (method) {
-				case "GET":
-					return HttpMethod.Get;
-				case "POST":
-					return HttpMethod.Post;
-				case "PUT":
-					return HttpMethod.Put;
-				case "DELETE":
-					return HttpMethod.Delete;
-				default:
-					throw new Exception("Unknown Http Method");
-			}
-		}
-
-		private int GetAuthLevel(string userAuthorizationLevel) {
-			switch (userAuthorizationLevel) {
-				case "None":
-					return 0;
-				case "User":
-					return 1;
-				case "Ops":
-					return 2;
-				case "Admin":
-					return 3;
-				default:
-					throw new Exception("Unknown authorization level");
-			}
-		}
-		public async Task CreateUser(string username, string password) {
-			for (int trial = 1; trial <= 5; trial++) {
-				try {
-					var dataStr = string.Format("{{loginName: '{0}', fullName: '{1}', password: '{2}', groups: []}}", username, username, password);
-					var data = Helper.UTF8NoBom.GetBytes(dataStr);
-					var stream = new MemoryStream(data);
-					var content = new StreamContent(stream);
-					content.Headers.Add("Content-Type", "application/json");
-
-					var res = await _httpClients["Admin"].PostAsync(
-						string.Format("https://{0}/users/", _nodes[_leaderId].HttpEndPoint),
-						content
-					);
-					res.EnsureSuccessStatusCode();
-					break;
-				} catch (HttpRequestException) {
-					if (trial == 5) {
-						throw new Exception(string.Format("Error creating user: {0}", username));
-					}
-					await Task.Delay(1000);
-				}
-			}
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			//find the leader node
-			for (int i = 0; i < _nodes.Length; i++) {
-				if (_nodes[i].NodeState == Data.VNodeState.Leader) {
-					_leaderId = i;
-					break;
-				}
-			}
-
-			_httpClients["Admin"] = CreateHttpClient("admin", "changeit");
-			_httpClients["Ops"] = CreateHttpClient("ops", "changeit");
-			await CreateUser("user", "changeit");
-			_httpClients["User"] = CreateHttpClient("user", "changeit");
-			_httpClients["None"] = CreateHttpClient(null, null);
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			foreach (var kvp in _httpClients) {
-				kvp.Value.Dispose();
-			}
-			return base.TestFixtureTearDown();
-		}
-
-		[Test, Combinatorial]
-		public async Task authorization_tests(
-			[Values(
-				"None",
-				"User",
-				"Ops",
-				"Admin"
-			)] string userAuthorizationLevel,
-			[Values(
-				"/admin/shutdown;POST;Ops", /* this test is not executed for Ops and Admin to prevent the node from shutting down */
-				"/admin/scavenge?startFromChunk={startFromChunk}&threads={threads};POST;Ops",
-				"/admin/scavenge/{scavengeId};DELETE;Ops",
-				"/admin/scavenge/current;GET;Ops",
-				"/admin/scavenge/last;GET;Ops",
-				"/admin/mergeindexes;POST;Ops",
-				"/ping;GET;None",
-				"/info;GET;None",
-				"/info/options;GET;Ops",
-				"/stats;GET;None",
-				"/stats/replication;GET;None",
-				"/stats/tcp;GET;None",
-				"/stats/{*statPath};GET;None",
-				"/streams/{stream};POST;None",
-				"/streams/{stream};DELETE;None",
-				"/streams/{stream}/incoming/{C38FC5D7-C0B6-4F47-A60D-9BF3D1B76BDF};POST;None",
-				"/streams/{stream}/;POST;None",
-				"/streams/{stream}/;DELETE;None",
-				"/streams/{stream}/;GET;None",
-				//These are not valid urls, and by default all users can perform all operations on streams
-				//"/streams/{stream}?embed={embed};GET;User",
-				//"/streams/{stream}/{event}?embed={embed};GET;User",
-				//"/streams/{stream}/{event}/{count}?embed={embed};GET;User",
-				//"/streams/{stream}/{event}/backward/{count}?embed={embed};GET;User",
-				//"/streams/{stream}/metadata;POST;User",
-				//"/streams/{stream}/metadata/;POST;User",
-				//"/streams/{stream}/metadata?embed={embed};GET;User",
-				//"/streams/{stream}/metadata/?embed={embed};GET;User",
-				//"/streams/{stream}/metadata/{event}?embed={embed};GET;User",
-				//"/streams/{stream}/metadata/{event}/{count}?embed={embed};GET;User",
-				//"/streams/{stream}/metadata/{event}/backward/{count}?embed={embed};GET;User",
-				"/streams/$all/;GET;User", /* only redirects, so "User" is allowed */
-				"/streams/%24all/;GET;User", /* only redirects, so "User" is allowed */
-				/* -- with default ACLs, only Admin should be able to read $all -- */
-				"/streams/$all?embed={embed};GET;Admin",
-				"/streams/$all/00000000000000000000000000000000/10?embed={embed};GET;Admin", /* /streams/$all/{position}/{count}?embed={embed} */
-				"/streams/$all/head/backward/10?embed={embed};GET;Admin", /* /streams/$all/{position}/backward/{count}?embed={embed} */
-				"/streams/%24all?embed={embed};GET;Admin",
-				"/streams/%24all/00000000000000000000000000000000/10?embed={embed};GET;Admin", /* /streams/%24all/{position}/{count}?embed={embed} */
-				"/streams/%24all/head/backward/10?embed={embed};GET;Admin", /* /streams/%24all/{position}/backward/{count}?embed={embed} */
-				/* ------------------------------------------------------------- */
-				"/subscriptions;GET;User",
-				"/subscriptions/{stream};GET;User",
-				"/subscriptions/{stream}/{subscription};PUT;Ops",
-				"/subscriptions/{stream}/{subscription};POST;Ops",
-				"/subscriptions/{stream}/{subscription};DELETE;Ops",
-				"/subscriptions/{stream}/{subscription};GET;User",
-				"/subscriptions/{stream}/{subscription}?embed={embed};GET;User",
-				"/subscriptions/{stream}/{subscription}/{count}?embed={embed};GET;User",
-				"/subscriptions/{stream}/{subscription}/info;GET;User",
-				"/subscriptions/{stream}/{subscription}/ack/{messageid};POST;User",
-				"/subscriptions/{stream}/{subscription}/nack/{messageid}?action={action};POST;User",
-				"/subscriptions/{stream}/{subscription}/ack?ids={messageids};POST;User",
-				"/subscriptions/{stream}/{subscription}/nack?ids={messageids}&action={action};POST;User",
-				"/subscriptions/{stream}/{subscription}/replayParked?stopAt=1;POST;Ops",
-				"/users;GET;Admin",
-				"/users/;GET;Admin",
-				"/users/{login};GET;Admin",
-				"/users/$current;GET;User",
-				"/users;POST;Admin",
-				"/users/;POST;Admin",
-				"/users/{login};PUT;Admin",
-				"/users/{login};DELETE;Admin",
-				"/users/{login}/command/enable;POST;Admin",
-				"/users/{login}/command/disable;POST;Admin",
-				"/users/{login}/command/reset-password;POST;Admin",
-				//"/users/{login}/command/change-password;POST;User", Users can only change their own password, so this url won't be correct in these tests
-				"/web/{*remaining_path};GET;None",
-				";GET;None",
-				"/web;GET;None"
-			)] string httpEndpointDetails
-		) {
-			/*use the leader node endpoint to avoid any redirects*/
-			var nodeEndpoint = _nodes[_leaderId].HttpEndPoint;
-			var httpEndpointTokens = httpEndpointDetails.Split(';');
-			var endpointUrl = httpEndpointTokens[0];
-			var httpMethod = GetHttpMethod(httpEndpointTokens[1]);
-			var requiredMinAuthorizationLevel = httpEndpointTokens[2];
-
-			/* this test was done manually for Admin and Ops */
-			if (endpointUrl == "/admin/shutdown" && (userAuthorizationLevel == "Admin" || userAuthorizationLevel == "Ops")) {
-				return;
-			}
-
-			var url = $"https://{nodeEndpoint}{endpointUrl}";
-			var body = GetData(httpMethod, endpointUrl);
-			var contentType = httpMethod == HttpMethod.Post || httpMethod == HttpMethod.Put || httpMethod == HttpMethod.Delete ? "application/json" : null;
-			var statusCode = await SendRequest(_httpClients[userAuthorizationLevel], httpMethod, url, body, contentType);
-
-			if (GetAuthLevel(userAuthorizationLevel) >= GetAuthLevel(requiredMinAuthorizationLevel)) {
-				Assert.AreNotEqual(401, statusCode);
-			} else {
-				if (statusCode >= 300 && statusCode < 400) {
-					//Redirects are always allowed because authorization is done on the canonical url
-					Assert.GreaterOrEqual(statusCode,300);
-					Assert.LessOrEqual(statusCode, 307);
-				} else {
-					if (userAuthorizationLevel == "None") {
-						Assert.GreaterOrEqual(statusCode, 401);
-						Assert.LessOrEqual(statusCode, 403);
-					} else {
-						Assert.AreEqual(401, statusCode);
-					}
-				}
-			}
-		}
-
-		private string GetData(HttpMethod httpMethod, string url) {
-			if (httpMethod == HttpMethod.Post || httpMethod == HttpMethod.Put || httpMethod == HttpMethod.Delete) {
-				if (url.Equals("/users/{login}/command/change-password") || url.Equals("/users/{login}/command/reset-password")) {
-					return "{newPassword: \"changeit\"}";
-				} else if (url.Equals("/users") || url.Equals("/users/")) {
-					return "{loginName: \"test\", fullName: \"test\", password: \"changeit\", groups: []}";
-				}
-				return "{}";
-			} else {
-				return null;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Http/HttpBootstrap.cs b/src/EventStore.Core.Tests/Services/Transport/Http/HttpBootstrap.cs
deleted file mode 100644
index 8958361a9ab..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Http/HttpBootstrap.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Transport.Http;
-using EventStore.Core.Services.Transport.Http.Controllers;
-using EventStore.Core.Tests.Fakes;
-
-namespace EventStore.Core.Tests.Services.Transport.Http {
-	public class HttpBootstrap {
-		public static void Subscribe(ISubscriber bus, KestrelHttpService service) {
-			bus.Subscribe<SystemMessage.SystemInit>(service);
-			bus.Subscribe<SystemMessage.BecomeShuttingDown>(service);
-		}
-
-		public static void Unsubscribe(ISubscriber bus, KestrelHttpService service) {
-			bus.Unsubscribe<SystemMessage.SystemInit>(service);
-			bus.Unsubscribe<SystemMessage.BecomeShuttingDown>(service);
-		}
-
-		public static void RegisterPing(IHttpService service) {
-			service.SetupController(new PingController());
-		}
-
-		public static void RegisterStat(IHttpService service) {
-			service.SetupController(new StatController(new FakePublisher(), new FakePublisher()));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Http/TestAuthenticationProviderFactory.cs b/src/EventStore.Core.Tests/Services/Transport/Http/TestAuthenticationProviderFactory.cs
deleted file mode 100644
index f141671f001..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Http/TestAuthenticationProviderFactory.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Collections.Generic;
-using System.Security.Claims;
-using EventStore.Core.Authentication;
-using EventStore.Plugins.Authentication;
-using Microsoft.Extensions.Logging;
-
-namespace EventStore.Core.Tests.Common.ClusterNodeOptionsTests;
-
-public class TestAuthenticationProviderFactory : IAuthenticationProviderFactory {
-	public IAuthenticationProvider Build(bool logFailedAuthenticationAttempts) => 
-		new TestAuthenticationProvider();
-}
-
-public class TestAuthenticationProvider() : AuthenticationProviderBase(name: "test") {
-	public override void Authenticate(AuthenticationRequest authenticationRequest) => 
-		authenticationRequest.Authenticated(
-			new(new ClaimsIdentity(new[] { new Claim(ClaimTypes.Name, authenticationRequest.Name) }))
-		);
-
-	public override IReadOnlyList<string> GetSupportedAuthenticationSchemes() => ["Basic"];
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Http/atom_specs.cs b/src/EventStore.Core.Tests/Services/Transport/Http/atom_specs.cs
deleted file mode 100644
index 29f4bfef1b3..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Http/atom_specs.cs
+++ /dev/null
@@ -1,229 +0,0 @@
-using System;
-using System.IO;
-using System.Xml;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Atom;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Http {
-	[TestFixture]
-	public class feed_element_must {
-		private const string FeedUrl = "http://127.0.0.1/streams/test";
-		private FeedElement _feed;
-		private XmlWriter _writer;
-
-		[SetUp]
-		public void SetUp() {
-			_feed = new FeedElement();
-			_writer = XmlWriter.Create(new MemoryStream());
-		}
-
-		[TearDown]
-		public void TearDown() {
-			_writer.Close();
-		}
-
-		[Test]
-		public void have_non_empty_title() {
-			//_feed.SetTitle("Event stream 'test'");
-			_feed.SetId(FeedUrl);
-			_feed.SetUpdated(DateTime.UtcNow);
-			_feed.SetAuthor(AtomSpecs.Author);
-			_feed.AddLink("self", FeedUrl, null);
-
-			Assert.Throws<ArgumentNullException>(() => _feed.SetTitle(null));
-			Assert.Throws<AtomSpecificationViolationException>(() => _feed.WriteXml(_writer));
-		}
-
-		[Test]
-		public void have_non_empty_id() {
-			_feed.SetTitle("Event stream 'test'");
-			//_feed.SetId(FeedUrl);
-			_feed.SetUpdated(DateTime.UtcNow);
-			_feed.SetAuthor(AtomSpecs.Author);
-			_feed.AddLink("self", FeedUrl, null);
-
-			Assert.Throws<ArgumentNullException>(() => _feed.SetId(null));
-			Assert.Throws<AtomSpecificationViolationException>(() => _feed.WriteXml(_writer));
-		}
-
-		[Test]
-		public void have_non_empty_updated() {
-			_feed.SetTitle("Event stream 'test'");
-			_feed.SetId(FeedUrl);
-			//_feed.SetUpdated(DateTime.UtcNow);
-			_feed.SetAuthor(AtomSpecs.Author);
-			_feed.AddLink("self", FeedUrl, null);
-
-			Assert.Throws<AtomSpecificationViolationException>(() => _feed.WriteXml(_writer));
-		}
-
-		[Test]
-		public void format_dates_in_RFC_3339() {
-			_feed.SetTitle("Event stream 'test'");
-			_feed.SetId(FeedUrl);
-			_feed.SetUpdated(DateTime.UtcNow);
-			_feed.SetAuthor(AtomSpecs.Author);
-			_feed.AddLink("self", FeedUrl, null);
-
-			Assert.DoesNotThrow(() => _feed.WriteXml(_writer));
-		}
-
-		[Test]
-		public void be_treated_as_valid_with_empty_entries_list() {
-			_feed.SetTitle("Event stream 'test'");
-			_feed.SetId(FeedUrl);
-			_feed.SetUpdated(DateTime.UtcNow);
-			_feed.SetAuthor(AtomSpecs.Author);
-			_feed.AddLink("self", FeedUrl, null);
-
-			Assert.DoesNotThrow(() => _feed.WriteXml(_writer));
-		}
-
-		[Test]
-		public void have_non_empty_author() {
-			_feed.SetTitle("Event stream 'test'");
-			_feed.SetId(FeedUrl);
-			_feed.SetUpdated(DateTime.UtcNow);
-			//_feed.SetAuthor(AtomSpecs.Author);
-			_feed.AddLink("self", FeedUrl, null);
-
-			Assert.Throws<ArgumentNullException>(() => _feed.SetAuthor(null));
-			Assert.Throws<AtomSpecificationViolationException>(() => _feed.WriteXml(_writer));
-		}
-
-		[Test]
-		public void have_at_least_one_link() {
-			_feed.SetTitle("Event stream 'test'");
-			_feed.SetId(FeedUrl);
-			_feed.SetUpdated(DateTime.UtcNow);
-			_feed.SetAuthor(AtomSpecs.Author);
-			//_feed.AddLink("self", FeedUrl, null);
-
-			Assert.Throws<AtomSpecificationViolationException>(() => _feed.WriteXml(_writer));
-		}
-	}
-
-	[TestFixture]
-	public class entry_element_must {
-		[Test]
-		public void have_all_fields_filled() {
-			var writer = XmlWriter.Create(new MemoryStream());
-
-			var entry = new EntryElement();
-			Assert.Throws<AtomSpecificationViolationException>(() => entry.WriteXml(writer));
-
-			entry.SetTitle("test #0");
-			Assert.Throws<AtomSpecificationViolationException>(() => entry.WriteXml(writer));
-
-			entry.SetId("guid");
-			Assert.Throws<AtomSpecificationViolationException>(() => entry.WriteXml(writer));
-
-			entry.SetUpdated(DateTime.UtcNow);
-			Assert.Throws<AtomSpecificationViolationException>(() => entry.WriteXml(writer));
-
-			entry.SetAuthor(AtomSpecs.Author);
-			Assert.Throws<AtomSpecificationViolationException>(() => entry.WriteXml(writer));
-
-			entry.SetSummary("Entry #0");
-
-			Assert.DoesNotThrow(() => entry.WriteXml(writer));
-			writer.Close();
-		}
-	}
-
-	[TestFixture]
-	public class link_element_must {
-		[Test]
-		public void have_href_attribute() {
-			var link = new LinkElement(null);
-			var writer = XmlWriter.Create(new MemoryStream());
-
-			Assert.Throws<AtomSpecificationViolationException>(() => link.WriteXml(writer));
-			writer.Close();
-		}
-	}
-
-	[TestFixture]
-	public class person_element_must {
-		[Test]
-		public void have_exactly_one_name_attribute() {
-			var person = new PersonElement(null);
-			var writer = XmlWriter.Create(new MemoryStream());
-
-			Assert.Throws<AtomSpecificationViolationException>(() => person.WriteXml(writer));
-			writer.Close();
-		}
-	}
-
-	[TestFixture]
-	public class service_document_must {
-		[Test]
-		public void have_at_least_one_workspace() {
-			var writer = XmlWriter.Create(new MemoryStream());
-			var doc = new ServiceDocument();
-
-			Assert.Throws<AtomSpecificationViolationException>(() => doc.WriteXml(writer));
-			writer.Close();
-		}
-	}
-
-	[TestFixture]
-	public class workspace_must {
-		[Test]
-		public void contain_title() {
-			var writer = XmlWriter.Create(new MemoryStream());
-			var workspace = new WorkspaceElement();
-
-			Assert.Throws<AtomSpecificationViolationException>(() => workspace.WriteXml(writer));
-			writer.Close();
-		}
-	}
-
-	[TestFixture]
-	public class collection_element_must {
-		private CollectionElement _collection;
-		private XmlWriter _writer;
-
-		[SetUp]
-		public void SetUp() {
-			_writer = XmlWriter.Create(new MemoryStream());
-			_collection = new CollectionElement();
-		}
-
-		[TearDown]
-		public void TearDown() {
-			_writer.Close();
-		}
-
-		[Test]
-		public void contain_title() {
-			//_collection.SetTitle("title");
-			_collection.SetUri("http://127.0.0.1/streams/test");
-			_collection.AddAcceptType(ContentType.Atom);
-
-			Assert.Throws<AtomSpecificationViolationException>(() => _collection.WriteXml(_writer));
-		}
-
-		[Test]
-		public void contain_uri() {
-			_collection.SetTitle("title");
-			//_collection.SetUri("http://127.0.0.1/streams/test");
-			_collection.AddAcceptType(ContentType.Atom);
-
-			Assert.Throws<AtomSpecificationViolationException>(() => _collection.WriteXml(_writer));
-		}
-	}
-
-	[TestFixture]
-	public class accept_element_must {
-		[Test]
-		public void contain_value() {
-			var writer = XmlWriter.Create(new MemoryStream());
-			var accept = new AcceptElement(null);
-
-			Assert.Throws<AtomSpecificationViolationException>(() => accept.WriteXml(writer));
-			writer.Close();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Http/auto_convertion.cs b/src/EventStore.Core.Tests/Services/Transport/Http/auto_convertion.cs
deleted file mode 100644
index 08eddeaac4e..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Http/auto_convertion.cs
+++ /dev/null
@@ -1,590 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Transport.Http;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Transport.Http.Codecs;
-using NUnit.Framework;
-using Newtonsoft.Json;
-
-namespace EventStore.Core.Tests.Services.Transport.Http {
-	internal static class ByteArrayExtensions {
-		public static string AsString(this byte[] data) {
-			return Helper.UTF8NoBom.GetString(data ?? new byte[0]);
-		}
-	}
-
-	internal static class FakeRequest {
-		internal const string JsonData = "{\"field1\":\"value1\",\"field2\":\"value2\"}";
-		internal const string JsonMetadata = "{\"meta-field1\":\"meta-value1\"}";
-		internal const string JsonData2 = "{\"field1\":\"value1\",\"field2\":\"value2\"}";
-		internal const string JsonMetadata2 = "{\"meta-field1\":\"meta-value1\"}";
-
-		internal const string XmlData = "<field1>value1</field1><field2>value2</field2>";
-		internal const string XmlMetadata = "<meta-field1>meta-value1</meta-field1>";
-		internal const string XmlData2 = "<field1>value1</field1><field2>value2</field2>";
-		internal const string XmlMetadata2 = "<meta-field1>meta-value1</meta-field1>";
-
-		private static string JsonEventWriteFormat {
-			get { return "{{\"eventId\":{0},\"eventType\":{1},\"data\":{2},\"metadata\":{3}}}"; }
-		}
-
-		private static string JsonEventReadFormat {
-			get {
-				return
-					"{{\"eventStreamId\":{0},\"eventNumber\":{1},\"eventType\":{2},\"eventId\":{3},\"data\":{4},\"metadata\":{5}}}";
-			}
-		}
-
-		private static string XmlEventWriteFormat {
-			get {
-				return
-					"<event><eventId>{0}</eventId><eventType>{1}</eventType><data>{2}</data><metadata>{3}</metadata></event>";
-			}
-		}
-
-		private static string XmlEventReadFormat {
-			get {
-				return
-					"<event><eventStreamId>{0}</eventStreamId><eventNumber>{1}</eventNumber><eventType>{2}</eventType><eventId>{3}</eventId><data>{4}</data><metadata>{5}</metadata></event>";
-			}
-		}
-
-		public static string GetJsonWrite(string data, string metadata) {
-			return GetJsonWrite(new[] {Tuple.Create(data, metadata)});
-		}
-
-		public static string GetJsonWrite(params Tuple<string, string>[] events) {
-			return string.Format("[{0}]",
-				string.Join(",", events.Select(x =>
-					string.Format(JsonEventWriteFormat, string.Format("\"{0}\"", Guid.NewGuid()), "\"type\"", x.Item1,
-						x.Item2))));
-		}
-
-		public static string
-			GetJsonEventReadResult(ResolvedEvent evnt, bool dataJson = true, bool metadataJson = true) {
-			return string.Format(JsonEventReadFormat,
-				WrapIntoQuotes(evnt.Event.EventStreamId),
-				evnt.Event.EventNumber,
-				WrapIntoQuotes(evnt.Event.EventType),
-				WrapIntoQuotes(evnt.Event.EventId.ToString()),
-				dataJson ? JsonData : WrapIntoQuotes(AsString(evnt.Event.Data)),
-				metadataJson ? JsonMetadata : WrapIntoQuotes(AsString(evnt.Event.Metadata)));
-		}
-
-		public static string GetJsonEventsReadResult(IEnumerable<ResolvedEvent> events, bool dataJson = true,
-			bool metadataJson = true) {
-			return string.Format("[{0}]",
-				string.Join(",", events.Select(x => GetJsonEventReadResult(x, dataJson, metadataJson))));
-		}
-
-		public static string GetXmlWrite(string data, string metadata) {
-			return GetXmlWrite(new[] {Tuple.Create(data, metadata)});
-		}
-
-		public static string GetXmlWrite(params Tuple<string, string>[] events) {
-			return string.Format("<events>{0}</events>",
-				string.Join("\n", events.Select(x =>
-					string.Format(XmlEventWriteFormat, Guid.NewGuid(), "type", x.Item1, x.Item2))));
-		}
-
-		public static string GetXmlEventReadResult(ResolvedEvent evnt, bool dataJson = true, bool metadataJson = true) {
-			return string.Format(XmlEventReadFormat,
-				evnt.Event.EventStreamId,
-				evnt.Event.EventNumber,
-				evnt.Event.EventType,
-				evnt.Event.EventId,
-				dataJson ? XmlData : AsString(evnt.Event.Data),
-				metadataJson ? XmlMetadata : AsString(evnt.Event.Metadata));
-		}
-
-		public static string GetXmlEventsReadResult(IEnumerable<ResolvedEvent> events, bool dataJson = true,
-			bool metadataJson = true) {
-			return string.Format("<events>{0}</events>",
-				string.Join("\n", events.Select(x => GetXmlEventReadResult(x, dataJson, metadataJson))));
-		}
-
-		public static string AsString(byte[] bytes) {
-			return Helper.UTF8NoBom.GetString(bytes ?? new byte[0]);
-		}
-
-		public static string AsString(ReadOnlyMemory<byte> bytes) {
-			return Helper.UTF8NoBom.GetString(bytes.Span);
-		}
-
-		private static string WrapIntoQuotes(string s) {
-			return string.Format("\"{0}\"", s);
-		}
-	}
-
-	internal abstract class do_not_use_indentation_for_json {
-		[OneTimeSetUp]
-		public void SetUp() {
-			JsonCodec.Formatting = Formatting.None;
-		}
-
-		[OneTimeTearDown]
-		public void TearDown() {
-			JsonCodec.Formatting = Formatting.Indented;
-		}
-	}
-
-	[TestFixture]
-	internal class when_writing_events_and_content_type_is_json : do_not_use_indentation_for_json {
-		[Test]
-		public void should_just_count_as_body_if_just_json() {
-			var codec = Codec.Json;
-			var request = FakeRequest.JsonData;
-			var id = Guid.NewGuid();
-			var type = "EventType";
-			var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, id, type);
-			Assert.NotNull(events);
-			Assert.That(events.Length, Is.EqualTo(1));
-
-			Assert.IsTrue(events[0].IsJson);
-			Assert.AreEqual(events[0].EventId, id);
-			Assert.AreEqual(events[0].EventType, type);
-			Assert.That(events[0].Data.AsString(), Is.EqualTo(FakeRequest.JsonData));
-			Assert.That(events[0].Metadata.AsString(), Is.EqualTo(string.Empty));
-		}
-	}
-
-	[TestFixture]
-	internal class when_writing_events_and_content_type_is_xml {
-		[Test]
-		public void should_just_count_as_body_if_just_xml() {
-			var codec = Codec.Xml;
-			var request = FakeRequest.XmlData;
-			var id = Guid.NewGuid();
-			var type = "EventType";
-			var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, id, type);
-			Assert.NotNull(events);
-			Assert.That(events.Length, Is.EqualTo(1));
-
-			Assert.IsFalse(events[0].IsJson);
-			Assert.AreEqual(events[0].EventId, id);
-			Assert.AreEqual(events[0].EventType, type);
-			Assert.That(events[0].Data.AsString(), Is.EqualTo(FakeRequest.XmlData));
-			Assert.That(events[0].Metadata.AsString(), Is.EqualTo(string.Empty));
-		}
-	}
-
-	[TestFixture]
-	internal class when_writing_events_and_content_type_is_events_json : do_not_use_indentation_for_json {
-		[Test]
-		public void should_store_data_as_json_if_valid_and_metadata_as_string_if_not() {
-			var codec = Codec.EventsJson;
-			var request = FakeRequest.GetJsonWrite(new[] {
-				Tuple.Create(FakeRequest.JsonData, "\"metadata\""),
-				Tuple.Create(FakeRequest.JsonData2, "\"metadata2\"")
-			});
-
-			var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
-			Assert.That(events.Length, Is.EqualTo(2));
-
-			Assert.IsTrue(events[0].IsJson);
-			Assert.That(events[0].Data.AsString(), Is.EqualTo(FakeRequest.JsonData));
-			Assert.That(events[0].Metadata.AsString(), Is.EqualTo("metadata"));
-
-			Assert.IsTrue(events[1].IsJson);
-			Assert.That(events[1].Data.AsString(), Is.EqualTo(FakeRequest.JsonData2));
-			Assert.That(events[1].Metadata.AsString(), Is.EqualTo("metadata2"));
-		}
-
-		[Test]
-		public void should_store_metadata_as_json_if_its_valid_and_data_as_string_if_its_not() {
-			var codec = Codec.EventsJson;
-			var request = FakeRequest.GetJsonWrite(new[] {
-				Tuple.Create("\"data\"", FakeRequest.JsonMetadata),
-				Tuple.Create("\"data2\"", FakeRequest.JsonMetadata2)
-			});
-
-			var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
-			Assert.That(events.Length, Is.EqualTo(2));
-
-			Assert.IsTrue(events[0].IsJson);
-			Assert.That(events[0].Data.AsString(), Is.EqualTo("data"));
-			Assert.That(events[0].Metadata.AsString(), Is.EqualTo(FakeRequest.JsonMetadata));
-
-			Assert.IsTrue(events[1].IsJson);
-			Assert.That(events[1].Data.AsString(), Is.EqualTo("data2"));
-			Assert.That(events[1].Metadata.AsString(), Is.EqualTo(FakeRequest.JsonMetadata2));
-		}
-
-		[Test]
-		public void should_store_both_data_and_metadata_as_json_if_both_are_valid_json_objects() {
-			var codec = Codec.EventsJson;
-			var request = FakeRequest.GetJsonWrite(new[] {
-				Tuple.Create(FakeRequest.JsonData, FakeRequest.JsonMetadata),
-				Tuple.Create(FakeRequest.JsonData2, FakeRequest.JsonMetadata2)
-			});
-
-			var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
-			Assert.That(events.Length, Is.EqualTo(2));
-
-			Assert.IsTrue(events[0].IsJson);
-			Assert.That(events[0].Data.AsString(), Is.EqualTo(FakeRequest.JsonData));
-			Assert.That(events[0].Metadata.AsString(), Is.EqualTo(FakeRequest.JsonMetadata));
-
-			Assert.IsTrue(events[1].IsJson);
-			Assert.That(events[1].Data.AsString(), Is.EqualTo(FakeRequest.JsonData2));
-			Assert.That(events[1].Metadata.AsString(), Is.EqualTo(FakeRequest.JsonMetadata2));
-		}
-
-		[Test]
-		public void should_store_both_data_and_metadata_as_string_if_both_are_not_valid_json_objects() {
-			var codec = Codec.EventsJson;
-			var request = FakeRequest.GetJsonWrite(new[] {
-				Tuple.Create("\"data\"", "\"metadata\""),
-				Tuple.Create("\"data2\"", "\"metadata2\"")
-			});
-
-			var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
-			Assert.That(events.Length, Is.EqualTo(2));
-
-			Assert.IsFalse(events[0].IsJson);
-			Assert.That(events[0].Data.AsString(), Is.EqualTo("data"));
-			Assert.That(events[0].Metadata.AsString(), Is.EqualTo("metadata"));
-
-			Assert.IsFalse(events[1].IsJson);
-			Assert.That(events[1].Data.AsString(), Is.EqualTo("data2"));
-			Assert.That(events[1].Metadata.AsString(), Is.EqualTo("metadata2"));
-		}
-
-		[Test]
-		public void should_do_its_best_at_preserving_data_format_with_multiple_events() {
-			var codec = Codec.EventsJson;
-			var request = FakeRequest.GetJsonWrite(new[] {
-				Tuple.Create(FakeRequest.JsonData, FakeRequest.JsonMetadata),
-				Tuple.Create("\"data2\"", "\"metadata2\"")
-			});
-
-			var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
-			Assert.That(events.Length, Is.EqualTo(2));
-
-			Assert.IsTrue(events[0].IsJson);
-			Assert.That(events[0].Data.AsString(), Is.EqualTo(FakeRequest.JsonData));
-			Assert.That(events[0].Metadata.AsString(), Is.EqualTo(FakeRequest.JsonMetadata));
-
-			Assert.IsFalse(events[1].IsJson);
-			Assert.That(events[1].Data.AsString(), Is.EqualTo("data2"));
-			Assert.That(events[1].Metadata.AsString(), Is.EqualTo("metadata2"));
-		}
-	}
-
-	[TestFixture]
-	internal class when_writing_events_and_content_type_is_events_xml : do_not_use_indentation_for_json {
-		[Test]
-		public void should_convert_data_to_json_if_its_valid_xobject_and_metadata_as_string_if_its_not() {
-			var codec = Codec.EventsXml;
-			var request = FakeRequest.GetXmlWrite(FakeRequest.XmlData, "metadata");
-
-			var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
-			var converted = events.Single();
-
-			Assert.That(converted.IsJson);
-			Assert.That(converted.Data.AsString(), Is.EqualTo(FakeRequest.JsonData));
-			Assert.That(converted.Metadata.AsString(), Is.EqualTo("metadata"));
-		}
-
-		[Test]
-		public void should_convert_metadata_to_json_if_its_valid_xobject_and_data_as_string_if_its_not() {
-			var codec = Codec.EventsXml;
-			var request = FakeRequest.GetXmlWrite("data", FakeRequest.XmlMetadata);
-
-			var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
-			var converted = events.Single();
-
-			Assert.That(converted.IsJson);
-			Assert.That(converted.Data.AsString(), Is.EqualTo("data"));
-			Assert.That(converted.Metadata.AsString(), Is.EqualTo(FakeRequest.JsonMetadata));
-		}
-
-		[Test]
-		public void should_convert_data_and_metadata_to_json_if_both_are_valid_xobjects() {
-			var codec = Codec.EventsXml;
-			var request = FakeRequest.GetXmlWrite(FakeRequest.XmlData, FakeRequest.XmlMetadata);
-
-			var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
-			var converted = events.Single();
-
-			Assert.That(converted.IsJson);
-			Assert.That(converted.Data.AsString(), Is.EqualTo(FakeRequest.JsonData));
-			Assert.That(converted.Metadata.AsString(), Is.EqualTo(FakeRequest.JsonMetadata));
-		}
-
-		[Test]
-		public void should_store_both_data_and_metadata_as_string_if_both_are_not_valid_xobjects_objects() {
-			var codec = Codec.EventsXml;
-			var request = FakeRequest.GetXmlWrite("data", "metadata");
-
-			var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
-			var converted = events.Single();
-
-			Assert.That(!converted.IsJson);
-			Assert.That(converted.Data.AsString(), Is.EqualTo("data"));
-			Assert.That(converted.Metadata.AsString(), Is.EqualTo("metadata"));
-		}
-
-		[Test]
-		public void should_do_its_best_at_preserving_data_format_with_multiple_events() {
-			var codec = Codec.EventsXml;
-			var request = FakeRequest.GetXmlWrite(new[] {
-				Tuple.Create(FakeRequest.XmlData, FakeRequest.XmlMetadata),
-				Tuple.Create("data2", "metadata2")
-			});
-
-			var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
-			Assert.That(events.Length, Is.EqualTo(2));
-
-			Assert.IsTrue(events[0].IsJson);
-			Assert.That(events[0].Data.AsString(), Is.EqualTo(FakeRequest.JsonData));
-			Assert.That(events[0].Metadata.AsString(), Is.EqualTo(FakeRequest.JsonMetadata));
-
-			Assert.IsFalse(events[1].IsJson);
-			Assert.That(events[1].Data.AsString(), Is.EqualTo("data2"));
-			Assert.That(events[1].Metadata.AsString(), Is.EqualTo("metadata2"));
-		}
-	}
-
-	[TestFixture]
-	internal class when_reading_events_and_accept_type_is_json : do_not_use_indentation_for_json {
-		[Test]
-		public void should_return_json_data_if_data_was_originally_written_as_xobject_and_metadata_as_string() {
-			var request = FakeRequest.GetXmlWrite(FakeRequest.XmlData, "metadata");
-
-			var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsXml, Guid.Empty);
-			var evnt = events.Single();
-			var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
-			var expected = FakeRequest.GetJsonEventReadResult(resolvedEvent, dataJson: true, metadataJson: false);
-			var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventJson);
-
-			Assert.That(converted, Is.EqualTo(expected));
-		}
-
-		[Test]
-		public void should_return_json_data_if_data_was_originally_written_as_jobject_and_metadata_as_string() {
-			var request = FakeRequest.GetJsonWrite(FakeRequest.JsonData, "\"metadata\"");
-
-			var events =
-				AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsJson, Guid.Empty);
-			var evnt = events.Single();
-			var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
-			var expected = FakeRequest.GetJsonEventReadResult(resolvedEvent, dataJson: true, metadataJson: false);
-			var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventJson);
-
-			Assert.That(converted, Is.EqualTo(expected));
-		}
-
-		[Test]
-		public void should_return_json_metadata_if_metadata_was_originally_written_as_xobject_and_data_as_string() {
-			var request = FakeRequest.GetXmlWrite("data", FakeRequest.XmlMetadata);
-
-			var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsXml, Guid.Empty);
-			var evnt = events.Single();
-
-			var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
-
-			var expected = FakeRequest.GetJsonEventReadResult(resolvedEvent, dataJson: false, metadataJson: true);
-			var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventJson);
-
-			Assert.That(converted, Is.EqualTo(expected));
-		}
-
-		[Test]
-		public void should_return_json_metadata_if_metadata_was_originally_written_as_jobject_and_data_as_string() {
-			var request = FakeRequest.GetJsonWrite("\"data\"", FakeRequest.JsonMetadata);
-
-			var events =
-				AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsJson, Guid.Empty);
-			var evnt = events.Single();
-			var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
-			var expected = FakeRequest.GetJsonEventReadResult(resolvedEvent, dataJson: false, metadataJson: true);
-			var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventJson);
-
-			Assert.That(converted, Is.EqualTo(expected));
-		}
-
-		[Test]
-		public void should_return_json_data_and_json_metadata_if_both_were_written_as_xobjects() {
-			var request = FakeRequest.GetXmlWrite(FakeRequest.XmlData, FakeRequest.XmlMetadata);
-
-			var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsXml, Guid.Empty);
-			var evnt = events.Single();
-			var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
-			var expected = FakeRequest.GetJsonEventReadResult(resolvedEvent, dataJson: true, metadataJson: true);
-			var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventJson);
-
-			Assert.That(converted, Is.EqualTo(expected));
-		}
-
-		[Test]
-		public void should_return_json_data_and_json_metadata_if_both_were_written_as_jobjects() {
-			var request = FakeRequest.GetJsonWrite(FakeRequest.JsonData, FakeRequest.JsonMetadata);
-
-			var events =
-				AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsJson, Guid.Empty);
-			var evnt = events.Single();
-			var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
-			var expected = FakeRequest.GetJsonEventReadResult(resolvedEvent, dataJson: true, metadataJson: true);
-			var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventJson);
-
-			Assert.That(converted, Is.EqualTo(expected));
-		}
-
-		[Test]
-		public void should_return_string_data_and_string_metadata_if_both_were_written_as_string_using_json_write() {
-			var request = FakeRequest.GetJsonWrite("\"data\"", "\"metadata\"");
-
-			var events =
-				AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsJson, Guid.Empty);
-			var evnt = events.Single();
-			var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
-			var expected = FakeRequest.GetJsonEventReadResult(resolvedEvent, dataJson: false, metadataJson: false);
-			var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventJson);
-
-			Assert.That(converted, Is.EqualTo(expected));
-		}
-
-		[Test]
-		public void should_return_string_data_and_string_metadata_if_both_were_written_as_string_using_xml_write() {
-			var request = FakeRequest.GetXmlWrite("data", "metadata");
-
-			var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsXml, Guid.Empty);
-			var evnt = events.Single();
-			var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
-			var expected = FakeRequest.GetJsonEventReadResult(resolvedEvent, dataJson: false, metadataJson: false);
-			var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventJson);
-
-			Assert.That(converted, Is.EqualTo(expected));
-		}
-
-		private ResolvedEvent GenerateResolvedEvent(byte[] data, byte[] metadata) {
-			return ResolvedEvent.ForUnresolvedEvent(new EventRecord(0, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0,
-				"stream", 0,
-				DateTime.MinValue, PrepareFlags.IsJson, "type", data, metadata));
-		}
-	}
-
-	[TestFixture]
-	internal class when_reading_events_and_accept_type_is_xml : do_not_use_indentation_for_json {
-		[Test]
-		public void should_return_xml_data_if_data_was_originally_written_as_xobject_and_metadata_as_string() {
-			var request = FakeRequest.GetXmlWrite(FakeRequest.XmlData, "metadata");
-
-			var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsXml, Guid.Empty);
-			var evnt = events.Single();
-			var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
-			var expected = FakeRequest.GetXmlEventReadResult(resolvedEvent, dataJson: true, metadataJson: false);
-			var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventXml);
-
-			Assert.That(converted, Is.EqualTo(expected));
-		}
-
-		[Test]
-		public void should_return_xml_data_if_data_was_originally_written_as_jobject_and_metadata_as_string() {
-			var request = FakeRequest.GetJsonWrite(FakeRequest.JsonData, "\"metadata\"");
-
-			var events =
-				AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsJson, Guid.Empty);
-			var evnt = events.Single();
-			var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
-			var expected = FakeRequest.GetXmlEventReadResult(resolvedEvent, dataJson: true, metadataJson: false);
-			var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventXml);
-
-			Assert.That(converted, Is.EqualTo(expected));
-		}
-
-		[Test]
-		public void should_return_xml_metadata_if_metadata_was_originally_written_as_xobject_and_data_as_string() {
-			var request = FakeRequest.GetXmlWrite("data", FakeRequest.XmlMetadata);
-
-			var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsXml, Guid.Empty);
-			var evnt = events.Single();
-			var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
-			var expected = FakeRequest.GetXmlEventReadResult(resolvedEvent, dataJson: false, metadataJson: true);
-			var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventXml);
-
-			Assert.That(converted, Is.EqualTo(expected));
-		}
-
-		[Test]
-		public void should_return_xml_metadata_if_metadata_was_originally_written_as_jobject_and_data_as_string() {
-			var request = FakeRequest.GetJsonWrite("\"data\"", FakeRequest.JsonMetadata);
-
-			var events =
-				AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsJson, Guid.Empty);
-			var evnt = events.Single();
-			var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
-			var expected = FakeRequest.GetXmlEventReadResult(resolvedEvent, dataJson: false, metadataJson: true);
-			var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventXml);
-
-			Assert.That(converted, Is.EqualTo(expected));
-		}
-
-		[Test]
-		public void should_return_xml_data_and_xml_metadata_if_both_were_written_as_xobjects() {
-			var request = FakeRequest.GetXmlWrite(FakeRequest.XmlData, FakeRequest.XmlMetadata);
-
-			var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsXml, Guid.Empty);
-			var evnt = events.Single();
-			var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
-			var expected = FakeRequest.GetXmlEventReadResult(resolvedEvent, dataJson: true, metadataJson: true);
-			var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventXml);
-
-			Assert.That(converted, Is.EqualTo(expected));
-		}
-
-		[Test]
-		public void should_return_xml_data_and_xml_metadata_if_both_were_written_as_jobjects() {
-			var request = FakeRequest.GetJsonWrite(FakeRequest.JsonData, FakeRequest.JsonMetadata);
-
-			var events =
-				AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsJson, Guid.Empty);
-			var evnt = events.Single();
-			var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
-			var expected = FakeRequest.GetXmlEventReadResult(resolvedEvent, dataJson: true, metadataJson: true);
-			var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventXml);
-
-			Assert.That(converted, Is.EqualTo(expected));
-		}
-
-		[Test]
-		public void
-			should_return_string_data_and_string_metadata_if_both_were_written_as_string_using_json_events_write() {
-			var request = FakeRequest.GetJsonWrite("\"data\"", "\"metadata\"");
-
-			var events =
-				AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsJson, Guid.Empty);
-			var evnt = events.Single();
-			var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
-			var expected = FakeRequest.GetXmlEventReadResult(resolvedEvent, dataJson: false, metadataJson: false);
-			var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventXml);
-
-			Assert.That(converted, Is.EqualTo(expected));
-		}
-
-		[Test]
-		public void
-			should_return_string_data_and_string_metadata_if_both_were_written_as_string_using_xml_events_write() {
-			var request = FakeRequest.GetXmlWrite("data", "metadata");
-
-			var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsXml, Guid.Empty);
-			var evnt = events.Single();
-			var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
-			var expected = FakeRequest.GetXmlEventReadResult(resolvedEvent, dataJson: false, metadataJson: false);
-			var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventXml);
-
-			Assert.That(converted, Is.EqualTo(expected));
-		}
-
-		private ResolvedEvent GenerateResolvedEvent(byte[] data, byte[] metadata) {
-			return ResolvedEvent.ForUnresolvedEvent(new EventRecord(0, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0,
-				"stream", 0,
-				DateTime.MinValue, PrepareFlags.IsJson, "type", data, metadata));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Http/build_requested_url_should.cs b/src/EventStore.Core.Tests/Services/Transport/Http/build_requested_url_should.cs
deleted file mode 100644
index 829afb6b057..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Http/build_requested_url_should.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.IO;
-using EventStore.Transport.Http.EntityManagement;
-using NUnit.Framework;
-using System.Net;
-using Microsoft.Extensions.Primitives;
-
-namespace EventStore.Core.Tests.Services.Transport.Http {
-	[TestFixture]
-	class build_requested_url_should {
-		private Uri inputUri = new Uri("http://www.example.com:1234/path/?key=value#anchor");
-
-		[Test]
-		public void with_no_advertise_as_or_headers_uri_is_unchanged() {
-			var requestedUri =
-				HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri,
-					new NameValueCollection()), null, 0);
-
-			Assert.AreEqual(inputUri, requestedUri);
-		}
-
-		[Test]
-		public void with_advertise_http_port_set_only_port_is_changed() {
-			var requestedUri =
-				HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri,
-					new NameValueCollection()), null, 2116);
-
-			Assert.AreEqual(new Uri("http://www.example.com:2116/path/?key=value#anchor"), requestedUri);
-		}
-
-		[Test]
-		public void with_advertise_ip_set_only_host_is_changed() {
-			var requestedUri =
-				HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri,
-					new NameValueCollection()), "127.0.1.13", 0);
-
-			Assert.AreEqual(new Uri("http://127.0.1.13:1234/path/?key=value#anchor"), requestedUri);
-		}
-
-		[Test]
-		public void with_advertise_ip_and_http_port_set_both_host_and_port_is_changed() {
-			var requestedUri =
-				HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri,
-					new NameValueCollection()), "127.0.1.13", 2116);
-
-			Assert.AreEqual(new Uri("http://127.0.1.13:2116/path/?key=value#anchor"), requestedUri);
-		}
-
-		[Test]
-		public void with_port_forward_header_only_port_is_changed() {
-			var headers = new NameValueCollection { { "X-Forwarded-Port", "4321" } };
-			var requestedUri =
-				HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri, headers), null, 0);
-
-			Assert.AreEqual(new Uri("http://www.example.com:4321/path/?key=value#anchor"), requestedUri);
-		}
-
-		[Test]
-		public void non_integer_port_forward_header_is_ignored() {
-			var headers = new NameValueCollection { { "X-Forwarded-Port", "abc" } };
-			var requestedUri =
-				HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri, headers), null, 0);
-
-			Assert.AreEqual(inputUri, requestedUri);
-		}
-
-		[Test]
-		public void with_proto_forward_header_only_scheme_is_changed() {
-			var headers = new NameValueCollection { { "X-Forwarded-Proto", "https" } };
-			var requestedUri =
-				HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri, headers), null, 0);
-
-			Assert.AreEqual(new Uri("https://www.example.com:1234/path/?key=value#anchor"), requestedUri);
-		}
-
-		[Test]
-		public void with_proto_forward_host_only_host_is_changed() {
-			string host = "www.my-host.com";
-			var headers = new NameValueCollection { { "X-Forwarded-Host", host } };
-			var requestedUri =
-				HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri, headers), null, 0);
-			Assert.AreEqual(new Uri("http://www.my-host.com:1234/path/?key=value#anchor"), requestedUri);
-		}
-
-		[Test, Category("prefix")]
-		public void with_forward_prefix_adds_prefix_when_already_prefix() {
-			string prefix = "prefix";
-			var headers = new NameValueCollection { { "X-Forwarded-Prefix", prefix } };
-			var requestedUri =
-				HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri, headers), null, 0);
-			Assert.AreEqual(new Uri("http://www.example.com:1234/prefix/path/?key=value#anchor"), requestedUri);
-		}
-
-
-		[Test, Category("prefix")]
-		public void with_forward_prefix_adds_prefix_when_not_prefix() {
-			var start = new Uri("http://www.my-host.com:1234/?key=value#anchor");
-			string prefix = "prefix";
-			var headers = new NameValueCollection { { "X-Forwarded-Prefix", prefix } };
-			var requestedUri =
-				HttpEntity.BuildRequestedUrl(new FakeHttpRequest(start, headers), null, 0);
-			Assert.AreEqual(new Uri("http://www.my-host.com:1234/prefix/?key=value#anchor"), requestedUri);
-		}
-
-		[Test]
-		public void with_proto_forward_host_and_advertised_ip_forwarded_host_is_used() {
-			string host = "www.my-host.com";
-			var headers = new NameValueCollection { { "X-Forwarded-Host", host } };
-			var requestedUri =
-				HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri, headers), "127.0.10.13",
-					0);
-			Assert.AreEqual(new Uri("http://www.my-host.com:1234/path/?key=value#anchor"), requestedUri);
-		}
-
-		[Test]
-		public void with_proto_forward_host_containing_comma_delimited_list_first_forwarded_host_is_used() {
-			var headers = new NameValueCollection {
-				{"X-Forwarded-Host", "www.my-first-host.com"},
-				{"X-Forwarded-Host", "www.my-second-host.com"}
-			};
-			var requestedUri =
-				HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri, headers), null, 0);
-			Assert.AreEqual(new Uri("http://www.my-first-host.com:1234/path/?key=value#anchor"), requestedUri);
-		}
-
-		[Test]
-		public void with_proto_forward_host_containing_hosts_with_ports_host_and_port_is_used() {
-			string host = "127.0.10.13:2231";
-			var headers = new NameValueCollection { { "X-Forwarded-Host", host } };
-			var requestedUri =
-				HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri, headers), null, 0);
-			Assert.AreEqual(new Uri("http://127.0.10.13:2231/path/?key=value#anchor"), requestedUri);
-		}
-
-		class FakeHttpRequest : IHttpRequest {
-			private readonly NameValueCollection _headers;
-			public string[] AcceptTypes { get; }
-			public long ContentLength64 { get; }
-			public string ContentType { get; }
-			public string HttpMethod { get; }
-			public Stream InputStream { get; }
-			public string RawUrl { get; }
-			public IPEndPoint RemoteEndPoint { get; }
-			public Uri Url { get; }
-
-			public FakeHttpRequest(Uri url, NameValueCollection headers = default) {
-				_headers = headers ?? new NameValueCollection();
-				Url = url;
-			}
-
-			public IEnumerable<string> GetHeaderKeys() => _headers.AllKeys;
-
-			public StringValues GetHeaderValues(string key) => _headers.GetValues(key);
-
-			public IEnumerable<string> GetQueryStringKeys() {
-				throw new NotImplementedException();
-			}
-
-			public StringValues GetQueryStringValues(string key) {
-				throw new NotImplementedException();
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Http/compress_response_should.cs b/src/EventStore.Core.Tests/Services/Transport/Http/compress_response_should.cs
deleted file mode 100644
index bf97aebf0eb..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Http/compress_response_should.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using System;
-using System.Collections.Specialized;
-using System.IO;
-using System.IO.Compression;
-using EventStore.Transport.Http.EntityManagement;
-using NUnit.Framework;
-using System.Net;
-using System.Text;
-using EventStore.Transport.Http;
-
-namespace EventStore.Core.Tests.Services.Transport.Http {
-	[TestFixture]
-	class compress_response_should {
-		private string inputData = "my test string 123456.";
-
-		[Test]
-		public void with_gzip_compression_algo_data_is_gzipped() {
-			var response =
-				HttpEntityManager.CompressResponse(Encoding.ASCII.GetBytes(inputData), CompressionAlgorithms.Gzip);
-
-			String uncompressed;
-
-			using (var inputStream = new MemoryStream(response))
-			using (var uncompressedStream = new GZipStream(inputStream, CompressionMode.Decompress))
-			using (var outputStream = new MemoryStream()) {
-				uncompressedStream.CopyTo(outputStream);
-				uncompressed = Encoding.UTF8.GetString(outputStream.ToArray());
-			}
-
-			Assert.AreEqual(uncompressed, inputData);
-		}
-
-		[Test]
-		public void with_gzip_compression_algo_and_string_larger_than_50kb_data_is_gzipped() {
-			StringBuilder sb = new StringBuilder();
-			for (int i = 0; i < 60 * 1024; i++) sb.Append("A");
-			String testString = sb.ToString();
-
-			var response =
-				HttpEntityManager.CompressResponse(Encoding.ASCII.GetBytes(testString), CompressionAlgorithms.Gzip);
-
-			String uncompressed;
-
-			using (var inputStream = new MemoryStream(response))
-			using (var uncompressedStream = new GZipStream(inputStream, CompressionMode.Decompress))
-			using (var outputStream = new MemoryStream()) {
-				uncompressedStream.CopyTo(outputStream);
-				uncompressed = Encoding.UTF8.GetString(outputStream.ToArray());
-			}
-
-			Assert.AreEqual(uncompressed, testString);
-		}
-
-		[Test]
-		public void with_deflate_compression_algo_data_is_deflated() {
-			var response =
-				HttpEntityManager.CompressResponse(Encoding.ASCII.GetBytes(inputData), CompressionAlgorithms.Deflate);
-
-			String uncompressed;
-
-			using (var inputStream = new MemoryStream(response))
-			using (var uncompressedStream = new DeflateStream(inputStream, CompressionMode.Decompress))
-			using (var outputStream = new MemoryStream()) {
-				uncompressedStream.CopyTo(outputStream);
-				uncompressed = Encoding.UTF8.GetString(outputStream.ToArray());
-			}
-
-			Assert.AreEqual(uncompressed, inputData);
-		}
-
-		[Test]
-		public void with_deflate_compression_algo_and_string_larger_than_50kb_data_is_deflated() {
-			StringBuilder sb = new StringBuilder();
-			for (int i = 0; i < 60 * 1024; i++) sb.Append("A");
-			String testString = sb.ToString();
-
-			var response =
-				HttpEntityManager.CompressResponse(Encoding.ASCII.GetBytes(testString), CompressionAlgorithms.Deflate);
-
-			String uncompressed;
-
-			using (var inputStream = new MemoryStream(response))
-			using (var uncompressedStream = new DeflateStream(inputStream, CompressionMode.Decompress))
-			using (var outputStream = new MemoryStream()) {
-				uncompressedStream.CopyTo(outputStream);
-				uncompressed = Encoding.UTF8.GetString(outputStream.ToArray());
-			}
-
-			Assert.AreEqual(uncompressed, testString);
-		}
-
-		[Test]
-		public void with_invalid_compression_algo_data_remains_the_same() {
-			var response =
-				HttpEntityManager.CompressResponse(Encoding.ASCII.GetBytes(inputData), "invalid_compression_algo");
-			Assert.AreEqual(Encoding.ASCII.GetString(response), inputData);
-		}
-
-		[Test]
-		public void with_null_compression_algo_data_remains_the_same() {
-			var response = HttpEntityManager.CompressResponse(Encoding.ASCII.GetBytes(inputData), null);
-			Assert.AreEqual(Encoding.ASCII.GetString(response), inputData);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Http/media_type.cs b/src/EventStore.Core.Tests/Services/Transport/Http/media_type.cs
deleted file mode 100644
index 6abc98edd1f..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Http/media_type.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-using EventStore.Common.Utils;
-using EventStore.Transport.Http;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Http {
-	[TestFixture]
-	public class media_type {
-		[Test]
-		public void parses_generic_wildcard() {
-			var c = MediaType.Parse("*/*");
-
-			Assert.AreEqual("*", c.Type);
-			Assert.AreEqual("*", c.Subtype);
-			Assert.AreEqual("*/*", c.Range);
-			Assert.AreEqual(1.0f, c.Priority);
-			Assert.IsFalse(c.EncodingSpecified);
-			Assert.IsNull(c.Encoding);
-		}
-
-		[Test]
-		public void parses_generic_wildcard_with_priority() {
-			var c = MediaType.Parse("*/*;q=0.4");
-
-			Assert.AreEqual("*", c.Type);
-			Assert.AreEqual("*", c.Subtype);
-			Assert.AreEqual("*/*", c.Range);
-			Assert.AreEqual(0.4f, c.Priority);
-			Assert.IsFalse(c.EncodingSpecified);
-			Assert.IsNull(c.Encoding);
-		}
-
-		[Test]
-		public void parses_generic_wildcard_with_priority_and_other_param() {
-			var c = MediaType.Parse("*/*;q=0.4;z=7");
-
-			Assert.AreEqual("*", c.Type);
-			Assert.AreEqual("*", c.Subtype);
-			Assert.AreEqual("*/*", c.Range);
-			Assert.AreEqual(0.4f, c.Priority);
-			Assert.IsFalse(c.EncodingSpecified);
-			Assert.IsNull(c.Encoding);
-		}
-
-		[Test]
-		public void parses_partial_wildcard() {
-			var c = MediaType.Parse("text/*");
-
-			Assert.AreEqual("text", c.Type);
-			Assert.AreEqual("*", c.Subtype);
-			Assert.AreEqual("text/*", c.Range);
-			Assert.AreEqual(1f, c.Priority);
-			Assert.IsFalse(c.EncodingSpecified);
-			Assert.IsNull(c.Encoding);
-		}
-
-		[Test]
-		public void parses_specific_media_range_with_priority() {
-			var c = MediaType.Parse("application/xml;q=0.7");
-
-			Assert.AreEqual("application", c.Type);
-			Assert.AreEqual("xml", c.Subtype);
-			Assert.AreEqual("application/xml", c.Range);
-			Assert.AreEqual(0.7f, c.Priority);
-			Assert.IsFalse(c.EncodingSpecified);
-			Assert.IsNull(c.Encoding);
-		}
-
-		[Test]
-		public void parses_with_encoding() {
-			var c = MediaType.Parse("application/json;charset=utf-8");
-
-			Assert.AreEqual("application", c.Type);
-			Assert.AreEqual("json", c.Subtype);
-			Assert.AreEqual("application/json", c.Range);
-			Assert.IsTrue(c.EncodingSpecified);
-			Assert.AreEqual(Helper.UTF8NoBom, c.Encoding);
-		}
-
-		[Test]
-		public void parses_with_encoding_and_priority() {
-			var c = MediaType.Parse("application/json;q=0.3;charset=utf-8");
-
-			Assert.AreEqual("application", c.Type);
-			Assert.AreEqual("json", c.Subtype);
-			Assert.AreEqual("application/json", c.Range);
-			Assert.AreEqual(0.3f, c.Priority);
-			Assert.IsTrue(c.EncodingSpecified);
-			Assert.AreEqual(Helper.UTF8NoBom, c.Encoding);
-		}
-
-		[Test]
-		public void parses_unknown_encoding() {
-			var c = MediaType.Parse("application/json;charset=woftam");
-
-			Assert.AreEqual("application", c.Type);
-			Assert.AreEqual("json", c.Subtype);
-			Assert.AreEqual("application/json", c.Range);
-			Assert.IsTrue(c.EncodingSpecified);
-			Assert.IsNull(c.Encoding);
-		}
-
-		[Test]
-		public void parses_with_spaces_between_parameters() {
-			var c = MediaType.Parse("application/json; charset=woftam");
-
-			Assert.AreEqual("application", c.Type);
-			Assert.AreEqual("json", c.Subtype);
-			Assert.AreEqual("application/json", c.Range);
-			Assert.IsTrue(c.EncodingSpecified);
-			Assert.IsNull(c.Encoding);
-		}
-
-		[Test]
-		public void parses_upper_case_parameters() {
-			var c = MediaType.Parse("application/json; charset=UTF-8");
-
-			Assert.AreEqual("application", c.Type);
-			Assert.AreEqual("json", c.Subtype);
-			Assert.AreEqual("application/json", c.Range);
-			Assert.IsTrue(c.EncodingSpecified);
-			Assert.AreEqual(Helper.UTF8NoBom, c.Encoding);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Http/ping_controller_should.cs b/src/EventStore.Core.Tests/Services/Transport/Http/ping_controller_should.cs
deleted file mode 100644
index 183a39a4d01..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Http/ping_controller_should.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Codecs;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Http {
-	[TestFixture, Category("LongRunning")]
-	public class ping_controller_should : SpecificationWithDirectory {
-		private MiniNode<LogFormat.V2,string> _node;
-
-		[OneTimeSetUp]
-		public override async Task SetUp() {
-			await base.SetUp();
-
-			_node = new MiniNode<LogFormat.V2,string>(PathName);
-			await _node.Start();
-		}
-
-		[OneTimeTearDown]
-		public override async Task TearDown() {
-			await base.TearDown();
-			await _node.Shutdown();
-		}
-
-		[Test]
-		public async Task respond_with_httpmessage_text_message() {
-			var result = await _node.HttpClient.GetAsync("/ping?format=json");
-
-			Assert.True(result.IsSuccessStatusCode);
-
-			var body = await result.Content.ReadAsStringAsync();
-			Assert.NotNull(Codec.Json.From<HttpMessage.TextMessage>(body));
-		}
-
-		[Test]
-		public async Task return_response_in_json_if_requested_by_query_param_and_set_content_type_header() {
-			var result = await _node.HttpClient.GetAsync("/ping?format=json");
-
-			Assert.AreEqual(ContentType.Json, result.Content.Headers.ContentType!.MediaType);
-		}
-
-		[Test]
-		public async Task return_response_in_xml_if_requested_by_query_param_and_set_content_type_header() {
-			var result = await _node.HttpClient.GetAsync("/ping?format=xml");
-
-			Assert.AreEqual(ContentType.Xml, result.Content.Headers.ContentType!.MediaType);
-		}
-
-		[Test]
-		public async Task return_response_in_plaintext_if_requested_by_query_param_and_set_content_type_header() {
-			var result = await _node.HttpClient.GetAsync("/ping?format=text");
-
-			Assert.AreEqual(ContentType.PlainText, result.Content.Headers.ContentType!.MediaType);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Http/speed_test.cs b/src/EventStore.Core.Tests/Services/Transport/Http/speed_test.cs
deleted file mode 100644
index f0603376a78..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Http/speed_test.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Services.Transport.Http;
-using EventStore.Plugins.Authorization;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Codecs;
-
-namespace EventStore.Core.Tests.Services.Transport.Http {
-	public class FakeController : IHttpController {
-		private readonly IUriRouter _router;
-
-		public static readonly ICodec[] SupportedCodecs = new ICodec[]
-			{Codec.Json, Codec.Xml, Codec.ApplicationXml, Codec.Text};
-
-		private IHttpService _http;
-
-		public readonly List<Tuple<string, string>> BoundRoutes = new List<Tuple<string, string>>();
-		public readonly CountdownEvent CountdownEvent;
-
-		public FakeController(int reqCount, IUriRouter router) {
-			_router = router;
-			CountdownEvent = new CountdownEvent(reqCount);
-		}
-
-		public void Subscribe(IHttpService http) {
-			_http = http;
-
-			Register("/", HttpMethod.Get);
-			Register("/ping", HttpMethod.Get);
-			Register("/halt", HttpMethod.Get);
-			Register("/shutdown", HttpMethod.Get);
-			Register("/streams/{stream}", HttpMethod.Post);
-			Register("/streams/{stream}", HttpMethod.Delete);
-			Register("/streams/{stream}?embed={embed}", HttpMethod.Get);
-			Register("/streams/{stream}/{event}?embed={embed}", HttpMethod.Get);
-			Register("/streams/{stream}/{event}/{count}?embed={embed}", HttpMethod.Get);
-			Register("/streams/{stream}/{event}/backward/{count}?embed={embed}", HttpMethod.Get);
-			Register("/streams/{stream}/{event}/forward/{count}?embed={embed}", HttpMethod.Get);
-			Register("/streams/{stream}/{event}/data", HttpMethod.Get);
-			Register("/streams/{stream}/{event}/metadata", HttpMethod.Get);
-			Register("/streams/{stream}/metadata", HttpMethod.Post);
-			Register("/streams/{stream}/metadata?embed={embed}", HttpMethod.Get);
-			Register("/streams/{stream}/metadata/{event}?embed={embed}", HttpMethod.Get);
-			Register("/streams/{stream}/metadata/{event}/{count}?embed={embed}", HttpMethod.Get);
-			Register("/streams/{stream}/metadata/{event}/backward/{count}?embed={embed}", HttpMethod.Get);
-			Register("/streams/{stream}/metadata/{event}/forward/{count}?embed={embed}", HttpMethod.Get);
-			Register("/streams/{stream}/metadata/data", HttpMethod.Get);
-			Register("/streams/{stream}/metadata/metadata", HttpMethod.Get);
-			Register("/streams/{stream}/metadata/{event}/data", HttpMethod.Get);
-			Register("/streams/{stream}/metadata/{event}/metadata", HttpMethod.Get);
-			Register("/streams/$all?embed={embed}", HttpMethod.Get);
-			Register("/streams/$all/{position}/{count}?embed={embed}", HttpMethod.Get);
-			Register("/streams/$all/{position}/backward/{count}?embed={embed}", HttpMethod.Get);
-			Register("/streams/$all/{position}/forward/{count}?embed={embed}", HttpMethod.Get);
-			Register("/projections", HttpMethod.Get);
-			Register("/projections/any", HttpMethod.Get);
-			Register("/projections/all-non-transient", HttpMethod.Get);
-			Register("/projections/transient", HttpMethod.Get);
-			Register("/projections/onetime", HttpMethod.Get);
-			Register("/projections/continuous", HttpMethod.Get);
-			Register("/projections/transient?name={name}&type={type}&enabled={enabled}", HttpMethod.Post);
-			Register(
-				"/projections/onetime?name={name}&type={type}&enabled={enabled}&checkpoints={checkpoints}&emit={emit}",
-				HttpMethod.Post);
-			Register("/projections/continuous?name={name}&type={type}&enabled={enabled}&emit={emit}", HttpMethod.Post);
-			Register("/projection/{name}/query?config={config}", HttpMethod.Get);
-			Register("/projection/{name}/query?type={type}&emit={emit}", HttpMethod.Put);
-			Register("/projection/{name}", HttpMethod.Get);
-			Register(
-				"/projection/{name}?deleteStateStream={deleteStateStream}&deleteCheckpointStream={deleteCheckpointStream}",
-				HttpMethod.Delete);
-			Register("/projection/{name}/statistics", HttpMethod.Get);
-			Register("/projection/{name}/debug", HttpMethod.Get);
-			Register("/projection/{name}/state?partition={partition}", HttpMethod.Get);
-			Register("/projection/{name}/result?partition={partition}", HttpMethod.Get);
-			Register("/projection/{name}/command/disable", HttpMethod.Post);
-			Register("/projection/{name}/command/enable", HttpMethod.Post);
-			Register("/projection/{name}/command/reset", HttpMethod.Post);
-			Register("/stats", HttpMethod.Get);
-			Register("/stats/{*statPath}", HttpMethod.Get);
-			Register("/users/", HttpMethod.Get);
-			Register("/users/{login}", HttpMethod.Get);
-			Register("/users/", HttpMethod.Post);
-			Register("/users/{login}", HttpMethod.Put);
-			Register("/users/{login}", HttpMethod.Delete);
-			Register("/users/{login}/command/enable", HttpMethod.Post);
-			Register("/users/{login}/command/disable", HttpMethod.Post);
-			Register("/users/{login}/command/reset-password", HttpMethod.Post);
-			Register("/users/{login}/command/change-password", HttpMethod.Post);
-		}
-
-		private void Register(string route, string verb) {
-			if (_router == null) {
-				_http.RegisterAction(
-					new ControllerAction(route, verb, Codec.NoCodecs, SupportedCodecs, new Operation()),
-					(x, y) => {
-						x.Reply(new byte[0], 200, "", "", Helper.UTF8NoBom, null, e => new Exception());
-						CountdownEvent.Signal();
-					});
-			} else {
-				_router.RegisterAction(
-					new ControllerAction(route, verb, Codec.NoCodecs, SupportedCodecs, new Operation()),
-					(x, y) => {
-						CountdownEvent.Signal();
-						return new RequestParams(TimeSpan.Zero);
-					});
-			}
-
-			var uriTemplate = new UriTemplate(route);
-			var bound = uriTemplate.BindByPosition(new Uri("http://localhost:12345/"),
-				Enumerable.Range(0,
-						uriTemplate.PathSegmentVariableNames.Count +
-						uriTemplate.QueryValueVariableNames.Count)
-					.Select(x => "abacaba")
-					.ToArray());
-			BoundRoutes.Add(Tuple.Create(bound.AbsoluteUri, verb));
-		}
-	}
-
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Http/uri_router_should.cs b/src/EventStore.Core.Tests/Services/Transport/Http/uri_router_should.cs
deleted file mode 100644
index 40bde3fe773..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Http/uri_router_should.cs
+++ /dev/null
@@ -1,286 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Services.Transport.Http;
-using EventStore.Plugins.Authorization;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Codecs;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Http {
-	[TestFixture]
-	public class naive_uri_router_should : uri_router_should {
-		public naive_uri_router_should() : base(() => new NaiveUriRouter()) {
-		}
-	}
-
-	[TestFixture]
-	public class trie_uri_router_should : uri_router_should {
-		public trie_uri_router_should()
-			: base(() => new TrieUriRouter()) {
-		}
-	}
-
-	public abstract class uri_router_should {
-		private readonly Func<IUriRouter> _uriRouterFactory;
-
-		private IUriRouter _router;
-
-		protected uri_router_should(Func<IUriRouter> uriRouterFactory) {
-			Ensure.NotNull(uriRouterFactory, "uriRouterFactory");
-			_uriRouterFactory = uriRouterFactory;
-		}
-
-		[SetUp]
-		public void SetUp() {
-			_router = _uriRouterFactory();
-
-			var p = new RequestParams(TimeSpan.Zero);
-			_router.RegisterAction(
-				new ControllerAction("/", HttpMethod.Get, Codec.NoCodecs, FakeController.SupportedCodecs, new Operation()), (x, y) => p);
-			_router.RegisterAction(
-				new ControllerAction("/{placeholder}", HttpMethod.Get, Codec.NoCodecs, FakeController.SupportedCodecs, new Operation()),
-				(x, y) => p);
-			_router.RegisterAction(
-				new ControllerAction("/halt", HttpMethod.Get, Codec.NoCodecs, FakeController.SupportedCodecs, new Operation()),
-				(x, y) => p);
-			_router.RegisterAction(
-				new ControllerAction("/streams/{stream}/{event}/backward/{count}?embed={embed}", HttpMethod.Get,
-					Codec.NoCodecs, FakeController.SupportedCodecs, new Operation()), (x, y) => p);
-			_router.RegisterAction(
-				new ControllerAction(
-					"/projection/{name}?deleteStateStream={deleteStateStream}&deleteCheckpointStream={deleteCheckpointStream}",
-					HttpMethod.Get, Codec.NoCodecs, FakeController.SupportedCodecs, new Operation()), (x, y) => p);
-			_router.RegisterAction(
-				new ControllerAction("/s/stats/{*statPath}", HttpMethod.Get, Codec.NoCodecs,
-					FakeController.SupportedCodecs, new Operation()), (x, y) => p);
-			_router.RegisterAction(
-				new ControllerAction("/streams/$all/", HttpMethod.Get, Codec.NoCodecs, FakeController.SupportedCodecs, new Operation()),
-				(x, y) => p);
-			_router.RegisterAction(
-				new ControllerAction("/streams/$$all", HttpMethod.Get, Codec.NoCodecs, FakeController.SupportedCodecs, new Operation()),
-				(x, y) => p);
-			_router.RegisterAction(
-				new ControllerAction("/streams/$mono?param={param}", HttpMethod.Get, Codec.NoCodecs,
-					FakeController.SupportedCodecs, new Operation()), (x, y) => p);
-
-			_router.RegisterAction(
-				new ControllerAction("/streams/test", HttpMethod.Get, Codec.NoCodecs, FakeController.SupportedCodecs, new Operation()),
-				(x, y) => p);
-			_router.RegisterAction(
-				new ControllerAction("/streams/test", HttpMethod.Post, Codec.NoCodecs, FakeController.SupportedCodecs, new Operation()),
-				(x, y) => p);
-
-			_router.RegisterAction(
-				new ControllerAction("/t/{placeholder1}/{placholder2}/{placeholder3}", HttpMethod.Get, Codec.NoCodecs,
-					FakeController.SupportedCodecs, new Operation()), (x, y) => p);
-			_router.RegisterAction(
-				new ControllerAction("/t/{placeholder1}/{placholder2}/something", HttpMethod.Get, Codec.NoCodecs,
-					FakeController.SupportedCodecs, new Operation()), (x, y) => p);
-			_router.RegisterAction(
-				new ControllerAction("/t/{placeholder1}/something/{placeholder3}", HttpMethod.Get, Codec.NoCodecs,
-					FakeController.SupportedCodecs, new Operation()), (x, y) => p);
-			_router.RegisterAction(
-				new ControllerAction("/t/{placeholder1}/something/something", HttpMethod.Get, Codec.NoCodecs,
-					FakeController.SupportedCodecs, new Operation()), (x, y) => p);
-			_router.RegisterAction(
-				new ControllerAction("/t/something/{placholder2}/{placeholder3}", HttpMethod.Get, Codec.NoCodecs,
-					FakeController.SupportedCodecs, new Operation()), (x, y) => p);
-			_router.RegisterAction(
-				new ControllerAction("/t/something/{placholder2}/something", HttpMethod.Get, Codec.NoCodecs,
-					FakeController.SupportedCodecs, new Operation()), (x, y) => p);
-			_router.RegisterAction(
-				new ControllerAction("/t/something/something/{placeholder3}", HttpMethod.Get, Codec.NoCodecs,
-					FakeController.SupportedCodecs, new Operation()), (x, y) => p);
-			_router.RegisterAction(
-				new ControllerAction("/t/something/something/something", HttpMethod.Get, Codec.NoCodecs,
-					FakeController.SupportedCodecs, new Operation()), (x, y) => p);
-		}
-
-		[Test]
-		public void detect_duplicate_route() {
-			Assert.That(() =>
-					_router.RegisterAction(
-						new ControllerAction("/halt", HttpMethod.Get, Codec.NoCodecs, FakeController.SupportedCodecs, new Operation()),
-						(x, y) => new RequestParams(TimeSpan.Zero)),
-				Throws.Exception.InstanceOf<ArgumentException>().With.Message.EqualTo("Duplicate route."));
-		}
-
-		[Test]
-		public void match_root() {
-			var match = _router.GetAllUriMatches(Uri("/"));
-			Assert.AreEqual(1, match.Count);
-			Assert.AreEqual("/", match[0].ControllerAction.UriTemplate);
-			Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
-		}
-
-		[Test]
-		public void match_single_segment_path() {
-			var match = _router.GetAllUriMatches(Uri("/halt"));
-			Assert.AreEqual(2, match.Count);
-			Assert.AreEqual("/{placeholder}", match[0].ControllerAction.UriTemplate);
-			Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
-			Assert.AreEqual("/halt", match[1].ControllerAction.UriTemplate);
-			Assert.AreEqual(HttpMethod.Get, match[1].ControllerAction.HttpMethod);
-		}
-
-		[Test, Ignore("ignore")]
-		public void not_care_about_trailing_slash() {
-			var match = _router.GetAllUriMatches(Uri("/streams/$all"));
-			Assert.AreEqual(1, match.Count);
-			Assert.AreEqual("/streams/$all/", match[0].ControllerAction.UriTemplate);
-			Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
-
-			match = _router.GetAllUriMatches(Uri("/streams/$all/"));
-			Assert.AreEqual(1, match.Count);
-			Assert.AreEqual("/streams/$all/", match[0].ControllerAction.UriTemplate);
-			Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
-		}
-
-		[Test, Ignore("ignore")]
-		public void not_care_about_trailing_slash2() {
-			var match = _router.GetAllUriMatches(Uri("/streams/$$all"));
-			Assert.AreEqual(1, match.Count);
-			Assert.AreEqual("/streams/$$all", match[0].ControllerAction.UriTemplate);
-			Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
-
-			match = _router.GetAllUriMatches(Uri("/streams/$$all/"));
-			Assert.AreEqual(1, match.Count);
-			Assert.AreEqual("/streams/$$all", match[0].ControllerAction.UriTemplate);
-			Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
-		}
-
-		[Test]
-		public void care_about_trailing_slash() {
-			var match = _router.GetAllUriMatches(Uri("/streams/$all/"));
-			Assert.AreEqual(1, match.Count);
-			Assert.AreEqual("/streams/$all/", match[0].ControllerAction.UriTemplate);
-			Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
-
-			match = _router.GetAllUriMatches(Uri("/streams/$all"));
-			Assert.AreEqual(0, match.Count);
-		}
-
-		[Test]
-		public void care_about_trailing_slash2() {
-			var match = _router.GetAllUriMatches(Uri("/streams/$$all"));
-			Assert.AreEqual(1, match.Count);
-			Assert.AreEqual("/streams/$$all", match[0].ControllerAction.UriTemplate);
-			Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
-
-			match = _router.GetAllUriMatches(Uri("/streams/$$all/"));
-			Assert.AreEqual(0, match.Count);
-		}
-
-		[Test]
-		public void match_route_with_dollar_sign() {
-			var match = _router.GetAllUriMatches(Uri("/streams/$mono"));
-			Assert.AreEqual(1, match.Count);
-			Assert.AreEqual("/streams/$mono?param={param}", match[0].ControllerAction.UriTemplate);
-			Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
-
-			match = _router.GetAllUriMatches(Uri("/streams/$mono?param=bla"));
-			Assert.AreEqual(1, match.Count);
-			Assert.AreEqual("/streams/$mono?param={param}", match[0].ControllerAction.UriTemplate);
-			Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
-		}
-
-		[Test]
-		public void match_complex_route_with_placeholders_and_query_params() {
-			var match = _router.GetAllUriMatches(Uri("/streams/test-stream/10/backward/20?embed=true"));
-			Assert.AreEqual(1, match.Count);
-			Assert.AreEqual("/streams/{stream}/{event}/backward/{count}?embed={embed}",
-				match[0].ControllerAction.UriTemplate);
-			Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
-		}
-
-		[Test]
-		public void match_complex_route_with_placeholders_and_query_params_when_no_query_params_are_set() {
-			var match = _router.GetAllUriMatches(Uri("/streams/test-stream/head/backward/20"));
-			Assert.AreEqual(1, match.Count);
-			Assert.AreEqual("/streams/{stream}/{event}/backward/{count}?embed={embed}",
-				match[0].ControllerAction.UriTemplate);
-			Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
-		}
-
-		[Test]
-		public void not_match_partial_route_match() {
-			var match = _router.GetAllUriMatches(Uri("/projection/proj/something"));
-			Assert.AreEqual(0, match.Count);
-		}
-
-		[Test]
-		public void match_all_possible_alternatives() {
-			var match = _router.GetAllUriMatches(Uri("/t/something/something/something"));
-			Assert.AreEqual(8, match.Count);
-			Assert.AreEqual(new[] {
-					"/t/{placeholder1}/{placholder2}/{placeholder3}",
-					"/t/{placeholder1}/{placholder2}/something",
-					"/t/{placeholder1}/something/{placeholder3}",
-					"/t/{placeholder1}/something/something",
-					"/t/something/{placholder2}/{placeholder3}",
-					"/t/something/{placholder2}/something",
-					"/t/something/something/{placeholder3}",
-					"/t/something/something/something"
-				},
-				match.Select(x => x.ControllerAction.UriTemplate).ToArray());
-		}
-
-		[Test]
-		public void match_same_routes_with_different_http_methods() {
-			var match = _router.GetAllUriMatches(Uri("/streams/test"));
-			Assert.AreEqual(2, match.Count);
-			Assert.AreEqual("/streams/test", match[0].ControllerAction.UriTemplate);
-			Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
-			Assert.AreEqual("/streams/test", match[1].ControllerAction.UriTemplate);
-			Assert.AreEqual(HttpMethod.Post, match[1].ControllerAction.HttpMethod);
-		}
-
-		[Test]
-		public void match_greedy_route_with_bare_minimum_of_uri() {
-			var match = _router.GetAllUriMatches(Uri("/s/stats/test"));
-			Assert.AreEqual(1, match.Count);
-			Assert.AreEqual("/s/stats/{*statPath}", match[0].ControllerAction.UriTemplate);
-		}
-
-		[Test]
-		public void match_greedy_route_and_catch_long_uri() {
-			var match = _router.GetAllUriMatches(Uri("/s/stats/some/long/stat/path"));
-			Assert.AreEqual(1, match.Count);
-			Assert.AreEqual("/s/stats/{*statPath}", match[0].ControllerAction.UriTemplate);
-		}
-
-		[Test]
-		public void match_greedy_route_with_empty_path_part_starting_with_slash() {
-			var match = _router.GetAllUriMatches(Uri("/s/stats/"));
-			Assert.AreEqual(1, match.Count);
-			Assert.AreEqual("/s/stats/{*statPath}", match[0].ControllerAction.UriTemplate);
-		}
-
-		[Test]
-		public void not_match_greedy_route_with_empty_path_part_without_slash() {
-			var match = _router.GetAllUriMatches(Uri("/s/stats"));
-			Assert.AreEqual(0, match.Count);
-		}
-
-		[Test]
-		public void match_greedy_route_in_the_root_to_any_path() {
-			var tmpRouter = _uriRouterFactory();
-			tmpRouter.RegisterAction(
-				new ControllerAction("/{*greedy}", HttpMethod.Get, Codec.NoCodecs, FakeController.SupportedCodecs, new Operation()),
-				(x, y) => new RequestParams(TimeSpan.Zero));
-
-			var match = tmpRouter.GetAllUriMatches(Uri("/"));
-			Assert.AreEqual(1, match.Count);
-			Assert.AreEqual("/{*greedy}", match[0].ControllerAction.UriTemplate);
-
-			match = tmpRouter.GetAllUriMatches(Uri("/something"));
-			Assert.AreEqual(1, match.Count);
-			Assert.AreEqual("/{*greedy}", match[0].ControllerAction.UriTemplate);
-		}
-
-		private Uri Uri(string relativePath) {
-			return new Uri("http://localhost:12345" + relativePath);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Http/when_getting_tcp_stats_from_stat_controller.cs b/src/EventStore.Core.Tests/Services/Transport/Http/when_getting_tcp_stats_from_stat_controller.cs
deleted file mode 100644
index 2d5090d045f..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Http/when_getting_tcp_stats_from_stat_controller.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Common.Utils;
-using EventStore.Core.Messages;
-using EventStore.Transport.Http.Codecs;
-using NUnit.Framework;
-using EventStore.Core.Tests.ClientAPI;
-using HttpMethod = System.Net.Http.HttpMethod;
-using HttpStatusCode = System.Net.HttpStatusCode;
-
-namespace EventStore.Core.Tests.Services.Transport.Http {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_getting_tcp_stats_from_stat_controller<TLogFormat, TStreamId>
-		: SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		private IEventStoreConnection _connection;
-		private string _url;
-		private string _clientConnectionName = "test-connection";
-
-		private List<MonitoringMessage.TcpConnectionStats> _results = new List<MonitoringMessage.TcpConnectionStats>();
-		private HttpResponseMessage _response;
-
-		protected override async Task Given() {
-			_url = _node.HttpEndPoint.ToHttpUrl(EndpointExtensions.HTTP_SCHEMA, "/stats/tcp");
-
-			var settings = ConnectionSettings.Create().DisableServerCertificateValidation();
-			_connection = EventStoreConnection.Create(settings, _node.TcpEndPoint, _clientConnectionName);
-			await _connection.ConnectAsync();
-
-			var testEvent = new EventData(Guid.NewGuid(), "TestEvent", true,
-				Encoding.ASCII.GetBytes("{'Test' : 'OneTwoThree'}"), null);
-			await _connection.AppendToStreamAsync("tests", ExpectedVersion.Any, testEvent);
-		}
-
-		protected override async Task When() {
-			_response = await _node.HttpClient.SendAsync(new HttpRequestMessage(HttpMethod.Get, _url));
-			_results = Codec.Json.From<List<MonitoringMessage.TcpConnectionStats>>(
-				await _response.Content.ReadAsStringAsync());
-		}
-
-		[Test]
-		public void should_have_succeeded() {
-			Assert.AreEqual(HttpStatusCode.OK, _response.StatusCode);
-		}
-
-		[Test]
-		public void should_return_the_external_connections() {
-			Assert.AreEqual(2, _results.Count(r => r.IsExternalConnection));
-		}
-
-		[Test]
-		public void should_return_the_total_number_of_bytes_sent_for_external_connections() {
-			Assert.Greater(_results.Sum(r => r.IsExternalConnection ? r.TotalBytesSent : 0), 0);
-		}
-
-		[Test]
-		public void should_return_the_total_number_of_bytes_received_from_external_connections() {
-			Assert.Greater(_results.Sum(r => r.IsExternalConnection ? r.TotalBytesReceived : 0), 0);
-		}
-
-		[Test]
-		public void should_have_set_the_client_connection_name() {
-			Assert.IsTrue(_results.Any(x => x.ClientConnectionName == _clientConnectionName));
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			_connection.Dispose();
-			return base.TestFixtureTearDown();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/TcpClientDispatcherTests.cs b/src/EventStore.Core.Tests/Services/Transport/Tcp/TcpClientDispatcherTests.cs
deleted file mode 100644
index ff39c0ea62b..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Tcp/TcpClientDispatcherTests.cs
+++ /dev/null
@@ -1,299 +0,0 @@
-using EventStore.Core.Bus;
-using EventStore.Core.Services.Transport.Tcp;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Authentication;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using System.Text;
-using EventStore.Client.Messages;
-using EventStore.Core.Authentication.InternalAuthentication;
-using EventStore.Core.LogV2;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.Services;
-using EventStore.Core.Tests.Authorization;
-using EventStore.Core.Util;
-using EventRecord = EventStore.Core.Data.EventRecord;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Core.Tests.Services.Transport.Tcp {
-	[TestFixture]
-	public class TcpClientDispatcherTests {
-		private readonly NoopEnvelope _envelope = new NoopEnvelope();
-
-		private ClientTcpDispatcher _dispatcher;
-		private TcpConnectionManager _connection;
-
-		[OneTimeSetUp]
-		public void Setup() {
-			_dispatcher = new ClientTcpDispatcher(2000);
-
-			var dummyConnection = new DummyTcpConnection();
-			_connection = new TcpConnectionManager(
-				Guid.NewGuid().ToString(), TcpServiceType.External, new ClientTcpDispatcher(2000),
-				new SynchronousScheduler(), dummyConnection, new SynchronousScheduler(), new InternalAuthenticationProvider(
-					InMemoryBus.CreateTest(), new Core.Helpers.IODispatcher(new SynchronousScheduler(), new NoopEnvelope()),
-					new StubPasswordHashAlgorithm(), 1, false, DefaultData.DefaultUserOptions),
-				new AuthorizationGateway(new TestAuthorizationProvider()),
-				TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10), (man, err) => { },
-				Opts.ConnectionPendingSendBytesThresholdDefault, Opts.ConnectionQueueSizeThresholdDefault);
-		}
-
-		[Test]
-		public void
-			when_wrapping_read_stream_events_forward_and_stream_was_deleted_should_not_downgrade_last_event_number_for_v2_clients() {
-			var msg = new ClientMessage.ReadStreamEventsForwardCompleted(Guid.NewGuid(), "test-stream", 0, 100,
-				ReadStreamResult.StreamDeleted, new ResolvedEvent[0], new StreamMetadata(),
-				true, "", -1, long.MaxValue, true, 1000);
-
-			var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
-			Assert.IsNotNull(package, "Package is null");
-			Assert.AreEqual(TcpCommand.ReadStreamEventsForwardCompleted, package.Value.Command, "TcpCommand");
-
-			var dto = package.Value.Data.Deserialize<ReadStreamEventsCompleted>();
-			Assert.IsNotNull(dto, "DTO is null");
-
-			Assert.AreEqual(long.MaxValue, dto.LastEventNumber, "Last Event Number");
-		}
-
-		[Test]
-		public void
-			when_wrapping_read_stream_events_backward_and_stream_was_deleted_should_not_downgrade_last_event_number_for_v2_clients() {
-			var msg = new ClientMessage.ReadStreamEventsBackwardCompleted(Guid.NewGuid(), "test-stream", 0, 100,
-				ReadStreamResult.StreamDeleted, new ResolvedEvent[0], new StreamMetadata(),
-				true, "", -1, long.MaxValue, true, 1000);
-
-			var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
-			Assert.IsNotNull(package, "Package is null");
-			Assert.AreEqual(TcpCommand.ReadStreamEventsBackwardCompleted, package.Value.Command, "TcpCommand");
-
-			var dto = package.Value.Data.Deserialize<ReadStreamEventsCompleted>();
-			Assert.IsNotNull(dto, "DTO is null");
-
-			Assert.AreEqual(long.MaxValue, dto.LastEventNumber, "Last Event Number");
-		}
-
-		[Test]
-		public void
-			when_wrapping_read_all_events_forward_completed_with_deleted_event_should_not_downgrade_last_event_number_for_v2_clients() {
-			var events = new ResolvedEvent[] {
-				ResolvedEvent.ForUnresolvedEvent(CreateDeletedEventRecord(), 0),
-			};
-			var msg = new ClientMessage.ReadAllEventsForwardCompleted(Guid.NewGuid(), ReadAllResult.Success, "", events,
-				new StreamMetadata(), true, 10, new TFPos(0, 0),
-				new TFPos(200, 200), new TFPos(0, 0), 100);
-
-			var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
-			Assert.IsNotNull(package, "Package is null");
-			Assert.AreEqual(TcpCommand.ReadAllEventsForwardCompleted, package.Value.Command, "TcpCommand");
-
-			var dto = package.Value.Data.Deserialize<ReadAllEventsCompleted>();
-			Assert.IsNotNull(dto, "DTO is null");
-			Assert.AreEqual(1, dto.Events.Count(), "Number of events");
-
-			Assert.AreEqual(long.MaxValue, dto.Events[0].Event.EventNumber, "Event Number");
-		}
-
-		[Test]
-		public void
-			when_wrapping_read_all_events_forward_completed_with_link_to_deleted_event_should_not_downgrade_version_for_v2_clients() {
-			var events = new ResolvedEvent[] {
-				ResolvedEvent.ForResolvedLink(CreateLinkEventRecord(), CreateDeletedEventRecord(), 100)
-			};
-			var msg = new ClientMessage.ReadAllEventsForwardCompleted(Guid.NewGuid(), ReadAllResult.Success, "", events,
-				new StreamMetadata(), true, 10, new TFPos(0, 0),
-				new TFPos(200, 200), new TFPos(0, 0), 100);
-
-			var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
-			Assert.IsNotNull(package, "Package is null");
-			Assert.AreEqual(TcpCommand.ReadAllEventsForwardCompleted, package.Value.Command, "TcpCommand");
-
-			var dto = package.Value.Data.Deserialize<ReadAllEventsCompleted>();
-			Assert.IsNotNull(dto, "DTO is null");
-			Assert.AreEqual(1, dto.Events.Count(), "Number of events");
-
-			Assert.AreEqual(0, dto.Events[0].Event.EventNumber, "Event Number");
-			Assert.AreEqual(long.MaxValue, dto.Events[0].Link.EventNumber, "Link Event Number");
-		}
-
-		[Test]
-		public void
-			when_wrapping_read_all_events_backward_completed_with_deleted_event_should_not_downgrade_version_for_v2_clients() {
-			var events = new ResolvedEvent[] {
-				ResolvedEvent.ForUnresolvedEvent(CreateDeletedEventRecord(), 0),
-			};
-			var msg = new ClientMessage.ReadAllEventsBackwardCompleted(Guid.NewGuid(), ReadAllResult.Success, "",
-				events,
-				new StreamMetadata(), true, 10, new TFPos(0, 0),
-				new TFPos(200, 200), new TFPos(0, 0), 100);
-
-			var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
-			Assert.IsNotNull(package, "Package is null");
-			Assert.AreEqual(TcpCommand.ReadAllEventsBackwardCompleted, package.Value.Command, "TcpCommand");
-
-			var dto = package.Value.Data.Deserialize<ReadAllEventsCompleted>();
-			Assert.IsNotNull(dto, "DTO is null");
-			Assert.AreEqual(1, dto.Events.Count(), "Number of events");
-
-			Assert.AreEqual(long.MaxValue, dto.Events[0].Event.EventNumber, "Event Number");
-		}
-
-		[Test]
-		public void
-			when_wrapping_read_all_events_backward_completed_with_link_to_deleted_event_should_not_downgrade_version_for_v2_clients() {
-			var events = new ResolvedEvent[] {
-				ResolvedEvent.ForResolvedLink(CreateLinkEventRecord(), CreateDeletedEventRecord(), 100)
-			};
-			var msg = new ClientMessage.ReadAllEventsBackwardCompleted(Guid.NewGuid(), ReadAllResult.Success, "",
-				events,
-				new StreamMetadata(), true, 10, new TFPos(0, 0),
-				new TFPos(200, 200), new TFPos(0, 0), 100);
-
-			var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
-			Assert.IsNotNull(package, "Package is null");
-			Assert.AreEqual(TcpCommand.ReadAllEventsBackwardCompleted, package.Value.Command, "TcpCommand");
-
-			var dto = package.Value.Data.Deserialize<ReadAllEventsCompleted>();
-			Assert.IsNotNull(dto, "DTO is null");
-			Assert.AreEqual(1, dto.Events.Count(), "Number of events");
-
-			Assert.AreEqual(0, dto.Events[0].Event.EventNumber, "Event Number");
-			Assert.AreEqual(long.MaxValue, dto.Events[0].Link.EventNumber, "Link Event Number");
-		}
-
-		[Test]
-		public void
-			when_wrapping_stream_event_appeared_with_deleted_event_should_not_downgrade_version_for_v2_clients() {
-			var msg = new ClientMessage.StreamEventAppeared(Guid.NewGuid(),
-				ResolvedEvent.ForUnresolvedEvent(CreateDeletedEventRecord(), 0));
-
-			var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
-			Assert.IsNotNull(package, "Package is null");
-			Assert.AreEqual(TcpCommand.StreamEventAppeared, package.Value.Command, "TcpCommand");
-
-			var dto = package.Value.Data.Deserialize<StreamEventAppeared>();
-			Assert.IsNotNull(dto, "DTO is null");
-			Assert.AreEqual(long.MaxValue, dto.Event.Event.EventNumber, "Event Number");
-		}
-
-		[Test]
-		public void
-			when_wrapping_subscribe_to_stream_confirmation_when_stream_deleted_should_not_downgrade_version_for_v2_clients() {
-			var msg = new ClientMessage.SubscriptionConfirmation(Guid.NewGuid(), 100, long.MaxValue);
-			var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
-			Assert.IsNotNull(package, "Package is null");
-			Assert.AreEqual(TcpCommand.SubscriptionConfirmation, package.Value.Command, "TcpCommand");
-
-			var dto = package.Value.Data.Deserialize<SubscriptionConfirmation>();
-			Assert.IsNotNull(dto, "DTO is null");
-			Assert.AreEqual(long.MaxValue, dto.LastEventNumber, "Last Event Number");
-		}
-
-		[Test]
-		public void
-			when_wrapping_subscribe_to_stream_confirmation_when_stream_deleted_should_not_downgrade_last_event_number_for_v2_clients() {
-			var msg = new ClientMessage.SubscriptionConfirmation(Guid.NewGuid(), 100, long.MaxValue);
-			var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
-			Assert.IsNotNull(package, "Package is null");
-			Assert.AreEqual(TcpCommand.SubscriptionConfirmation, package.Value.Command, "TcpCommand");
-
-			var dto = package.Value.Data.Deserialize<SubscriptionConfirmation>();
-			Assert.IsNotNull(dto, "DTO is null");
-			Assert.AreEqual(long.MaxValue, dto.LastEventNumber, "Last Event Number");
-		}
-
-		[Test]
-		public void
-			when_wrapping_stream_event_appeared_with_link_to_deleted_event_should_not_downgrade_version_for_v2_clients() {
-			var msg = new ClientMessage.StreamEventAppeared(Guid.NewGuid(),
-				ResolvedEvent.ForResolvedLink(CreateLinkEventRecord(), CreateDeletedEventRecord(), 0));
-
-			var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
-			Assert.IsNotNull(package, "Package is null");
-			Assert.AreEqual(TcpCommand.StreamEventAppeared, package.Value.Command, "TcpCommand");
-
-			var dto = package.Value.Data.Deserialize<StreamEventAppeared>();
-			Assert.IsNotNull(dto, "DTO is null");
-			Assert.AreEqual(0, dto.Event.Event.EventNumber, "Event Number");
-			Assert.AreEqual(long.MaxValue, dto.Event.Link.EventNumber, "Link Event Number");
-		}
-
-		[Test]
-		public void
-			when_wrapping_persistent_subscription_confirmation_when_stream_deleted_should_not_downgrade_last_event_number_for_v2_clients() {
-			var msg = new ClientMessage.PersistentSubscriptionConfirmation("subscription", Guid.NewGuid(), 100,
-				long.MaxValue);
-			var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
-			Assert.IsNotNull(package, "Package is null");
-			Assert.AreEqual(TcpCommand.PersistentSubscriptionConfirmation, package.Value.Command, "TcpCommand");
-
-			var dto = package.Value.Data.Deserialize<PersistentSubscriptionConfirmation>();
-			Assert.IsNotNull(dto, "DTO is null");
-			Assert.AreEqual(long.MaxValue, dto.LastEventNumber, "Last event number");
-		}
-
-		[Test]
-		public void
-			when_wrapping_scavenge_started_response_should_return_result_and_scavengeId_for_v2_clients() {
-			var scavengeId = Guid.NewGuid().ToString();
-			var msg = new ClientMessage.ScavengeDatabaseStartedResponse(Guid.NewGuid(), scavengeId);
-
-			var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
-			Assert.IsNotNull(package, "Package is null");
-			Assert.AreEqual(TcpCommand.ScavengeDatabaseResponse, package.Value.Command, "TcpCommand");
-
-			var dto = package.Value.Data.Deserialize<ScavengeDatabaseResponse>();
-			Assert.IsNotNull(dto, "DTO is null");
-			Assert.AreEqual(dto.Result, ScavengeDatabaseResponse.Types.ScavengeResult.Started);
-			Assert.AreEqual(dto.ScavengeId, scavengeId);
-		}
-
-		[Test]
-		public void
-			when_wrapping_scavenge_inprogress_response_should_return_result_and_scavengeId_for_v2_clients() {
-			var scavengeId = Guid.NewGuid().ToString();
-			var msg = new ClientMessage.ScavengeDatabaseInProgressResponse(Guid.NewGuid(), scavengeId, reason:"In Progress");
-
-			var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
-			Assert.IsNotNull(package, "Package is null");
-			Assert.AreEqual(TcpCommand.ScavengeDatabaseResponse, package.Value.Command, "TcpCommand");
-
-			var dto = package.Value.Data.Deserialize<ScavengeDatabaseResponse>();
-			Assert.IsNotNull(dto, "DTO is null");
-			Assert.AreEqual(dto.Result, ScavengeDatabaseResponse.Types.ScavengeResult.InProgress);
-			Assert.AreEqual(dto.ScavengeId, scavengeId);
-		}
-
-		[Test]
-		public void
-			when_wrapping_scavenge_unauthorized_response_should_return_result_and_scavengeId_for_v2_clients() {
-			var scavengeId = Guid.NewGuid().ToString();
-			var msg = new ClientMessage.ScavengeDatabaseUnauthorizedResponse(Guid.NewGuid(), scavengeId,"Unauthorized" );
-
-			var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
-			Assert.IsNotNull(package, "Package is null");
-			Assert.AreEqual(TcpCommand.ScavengeDatabaseResponse, package.Value.Command, "TcpCommand");
-
-			var dto = package.Value.Data.Deserialize<ScavengeDatabaseResponse>();
-			Assert.IsNotNull(dto, "DTO is null");
-			Assert.AreEqual(dto.Result, ScavengeDatabaseResponse.Types.ScavengeResult.Unauthorized);
-			Assert.AreEqual(dto.ScavengeId, scavengeId);
-		}
-
-		private EventRecord CreateDeletedEventRecord() {
-			return new EventRecord(long.MaxValue,
-				LogRecord.DeleteTombstone(new LogV2RecordFactory(), 0, Guid.NewGuid(), Guid.NewGuid(),
-					"test-stream", "test-type", long.MaxValue), "test-stream", SystemEventTypes.StreamDeleted);
-		}
-
-		private EventRecord CreateLinkEventRecord() {
-			return new EventRecord(0, LogRecord.Prepare(new LogV2RecordFactory(), 100, Guid.NewGuid(), Guid.NewGuid(), 0, 0,
-				"link-stream", -1, PrepareFlags.SingleWrite | PrepareFlags.Data, SystemEventTypes.LinkTo,
-				Encoding.UTF8.GetBytes(string.Format("{0}@test-stream", long.MaxValue)), new byte[0]), "link-stream", SystemEventTypes.LinkTo);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/TcpConnectionManagerTests.cs b/src/EventStore.Core.Tests/Services/Transport/Tcp/TcpConnectionManagerTests.cs
deleted file mode 100644
index f317d462f3e..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Tcp/TcpConnectionManagerTests.cs
+++ /dev/null
@@ -1,322 +0,0 @@
-using EventStore.Core.Bus;
-using EventStore.Core.Services.Transport.Tcp;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Net;
-using EventStore.Transport.Tcp;
-using System.Net.Sockets;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Authentication;
-using EventStore.Core.TransactionLog.LogRecords;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using System.Threading;
-using EventStore.Client.Messages;
-using EventStore.Core.Authentication.InternalAuthentication;
-using EventStore.Core.Services;
-using EventStore.Core.Settings;
-using EventStore.Core.Tests.Authorization;
-using EventStore.Core.Util;
-using EventRecord = EventStore.Core.Data.EventRecord;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Core.Tests.Services.Transport.Tcp {
-	[TestFixture]
-	public class TcpConnectionManagerTests {
-		private int _connectionPendingSendBytesThreshold = 10 * 1024;
-		private int _connectionQueueSizeThreshold = 50000;
-
-		[Test]
-		public void when_handling_trusted_write_on_external_service() {
-			var package = new TcpPackage(TcpCommand.WriteEvents, TcpFlags.TrustedWrite, Guid.NewGuid(), null, null,
-				new byte[] { });
-
-			var dummyConnection = new DummyTcpConnection();
-
-			var tcpConnectionManager = new TcpConnectionManager(
-				Guid.NewGuid().ToString(), TcpServiceType.External, new ClientTcpDispatcher(2000),
-				new SynchronousScheduler(), dummyConnection, new SynchronousScheduler(),
-				new InternalAuthenticationProvider(
-					InMemoryBus.CreateTest(), new Core.Helpers.IODispatcher(new SynchronousScheduler(), new NoopEnvelope()),
-					new StubPasswordHashAlgorithm(), 1, false, DefaultData.DefaultUserOptions),
-				new AuthorizationGateway(new TestAuthorizationProvider()),
-				TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10), (man, err) => { },
-				_connectionPendingSendBytesThreshold, _connectionQueueSizeThreshold);
-
-			tcpConnectionManager.ProcessPackage(package);
-
-			var data = dummyConnection.ReceivedData.Last();
-			var receivedPackage = TcpPackage.FromArraySegment(data);
-
-			Assert.AreEqual(receivedPackage.Command, TcpCommand.BadRequest, "Expected Bad Request but got {0}",
-				receivedPackage.Command);
-		}
-
-		[Test]
-		public void when_handling_trusted_write_on_internal_service() {
-			ManualResetEvent waiter = new ManualResetEvent(false);
-			ClientMessage.WriteEvents publishedWrite = null;
-			var evnt = new Event(Guid.NewGuid(), "TestEventType", true, new byte[] { }, new byte[] { });
-			var write = new WriteEvents(
-				Guid.NewGuid().ToString(),
-				ExpectedVersion.Any,
-				new[] {
-					new NewEvent(evnt.EventId.ToByteArray(), evnt.EventType, evnt.IsJson ? 1 : 0, 0,
-						evnt.Data, evnt.Metadata)
-				},
-				false);
-
-			var package = new TcpPackage(TcpCommand.WriteEvents, Guid.NewGuid(), write.Serialize());
-			var dummyConnection = new DummyTcpConnection();
-			var publisher = new SynchronousScheduler();
-
-			publisher.Subscribe(new AdHocHandler<ClientMessage.WriteEvents>(x => {
-				publishedWrite = x;
-				waiter.Set();
-			}));
-
-			var tcpConnectionManager = new TcpConnectionManager(
-				Guid.NewGuid().ToString(), TcpServiceType.Internal, new ClientTcpDispatcher(2000),
-				publisher, dummyConnection, publisher,
-				new InternalAuthenticationProvider(publisher, new Core.Helpers.IODispatcher(publisher, new NoopEnvelope()),
-					new StubPasswordHashAlgorithm(), 1, false, DefaultData.DefaultUserOptions),
-				new AuthorizationGateway(new TestAuthorizationProvider()),
-				TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10), (man, err) => { },
-				_connectionPendingSendBytesThreshold, _connectionQueueSizeThreshold);
-
-			tcpConnectionManager.ProcessPackage(package);
-
-			if (!waiter.WaitOne(TimeSpan.FromSeconds(5))) {
-				throw new Exception("Timed out waiting for events.");
-			}
-
-			Assert.AreEqual(evnt.EventId, publishedWrite.Events.First().EventId,
-				"Expected the published write to be the event that was sent through the tcp connection manager to be the event {0} but got {1}",
-				evnt.EventId, publishedWrite.Events.First().EventId);
-		}
-
-		[Test]
-		public void
-			when_limit_pending_and_sending_message_smaller_than_threshold_and_pending_bytes_over_threshold_should_close_connection() {
-			var mre = new ManualResetEventSlim();
-
-			var messageSize = _connectionPendingSendBytesThreshold / 2;
-			var evnt = new EventRecord(0, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, "testStream", 0, DateTime.Now,
-				PrepareFlags.None, "eventType", new byte[messageSize], new byte[0]);
-			var record = ResolvedEvent.ForUnresolvedEvent(evnt, null);
-			var message = new ClientMessage.ReadEventCompleted(Guid.NewGuid(), "testStream", ReadEventResult.Success,
-				record, StreamMetadata.Empty, false, "");
-
-			var dummyConnection = new DummyTcpConnection();
-			dummyConnection.PendingSendBytes = _connectionPendingSendBytesThreshold + 1000;
-
-			var tcpConnectionManager = new TcpConnectionManager(
-				Guid.NewGuid().ToString(), TcpServiceType.External, new ClientTcpDispatcher(2000),
-				new SynchronousScheduler(), dummyConnection, new SynchronousScheduler(),
-				new InternalAuthenticationProvider(
-					InMemoryBus.CreateTest(), new Core.Helpers.IODispatcher(new SynchronousScheduler(),
-						new NoopEnvelope()), null, 1, false, DefaultData.DefaultUserOptions),
-				new AuthorizationGateway(new TestAuthorizationProvider()),
-				TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10), (man, err) => { mre.Set(); },
-				_connectionPendingSendBytesThreshold, _connectionQueueSizeThreshold);
-
-			tcpConnectionManager.SendMessage(message);
-
-			if (!mre.Wait(2000)) {
-				Assert.Fail("Timed out waiting for connection to close");
-			}
-		}
-
-		[Test]
-		public void
-			when_limit_pending_and_sending_message_larger_than_pending_bytes_threshold_but_no_bytes_pending_should_not_close_connection() {
-			var messageSize = _connectionPendingSendBytesThreshold + 1000;
-			var evnt = new EventRecord(0, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, "testStream", 0, DateTime.Now,
-				PrepareFlags.None, "eventType", new byte[messageSize], new byte[0]);
-			var record = ResolvedEvent.ForUnresolvedEvent(evnt, null);
-			var message = new ClientMessage.ReadEventCompleted(Guid.NewGuid(), "testStream", ReadEventResult.Success,
-				record, StreamMetadata.Empty, false, "");
-
-			var dummyConnection = new DummyTcpConnection();
-			dummyConnection.PendingSendBytes = 0;
-
-			var tcpConnectionManager = new TcpConnectionManager(
-				Guid.NewGuid().ToString(), TcpServiceType.External, new ClientTcpDispatcher(2000),
-				new SynchronousScheduler(), dummyConnection, new SynchronousScheduler(),
-				new InternalAuthenticationProvider(InMemoryBus.CreateTest(),
-					new Core.Helpers.IODispatcher(new SynchronousScheduler(), new NoopEnvelope()), null, 1, false, DefaultData.DefaultUserOptions),
-				new AuthorizationGateway(new TestAuthorizationProvider()),
-				TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10), (man, err) => { },
-				_connectionPendingSendBytesThreshold, _connectionQueueSizeThreshold);
-
-			tcpConnectionManager.SendMessage(message);
-
-			var data = dummyConnection.ReceivedData.Last();
-			var receivedPackage = TcpPackage.FromArraySegment(data);
-
-			Assert.AreEqual(receivedPackage.Command, TcpCommand.ReadEventCompleted,
-				"Expected ReadEventCompleted but got {0}", receivedPackage.Command);
-		}
-
-		[Test]
-		public void
-			when_not_limit_pending_and_sending_message_smaller_than_threshold_and_pending_bytes_over_threshold_should_not_close_connection() {
-			var mre = new ManualResetEventSlim();
-
-			var messageSize = _connectionPendingSendBytesThreshold / 2;
-			var evnt = new EventRecord(0, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, "testStream", 0, DateTime.Now,
-				PrepareFlags.None, "eventType", new byte[messageSize], new byte[0]);
-			var record = ResolvedEvent.ForUnresolvedEvent(evnt, null);
-			var message = new ClientMessage.ReadEventCompleted(Guid.NewGuid(), "testStream", ReadEventResult.Success,
-				record, StreamMetadata.Empty, false, "");
-
-			var dummyConnection = new DummyTcpConnection();
-			dummyConnection.PendingSendBytes = _connectionPendingSendBytesThreshold + 1000;
-
-			var tcpConnectionManager = new TcpConnectionManager(
-				Guid.NewGuid().ToString(), TcpServiceType.External, new ClientTcpDispatcher(2000),
-				new SynchronousScheduler(), dummyConnection, new SynchronousScheduler(),
-				new InternalAuthenticationProvider(InMemoryBus.CreateTest(),
-					new Core.Helpers.IODispatcher(new SynchronousScheduler(), new NoopEnvelope()), null, 1, false, DefaultData.DefaultUserOptions),
-				new AuthorizationGateway(new TestAuthorizationProvider()),
-				TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10), (man, err) => { mre.Set(); },
-				ESConsts.UnrestrictedPendingSendBytes, ESConsts.MaxConnectionQueueSize);
-
-			tcpConnectionManager.SendMessage(message);
-
-			var data = dummyConnection.ReceivedData.Last();
-			var receivedPackage = TcpPackage.FromArraySegment(data);
-
-			Assert.AreEqual(receivedPackage.Command, TcpCommand.ReadEventCompleted,
-				"Expected ReadEventCompleted but got {0}", receivedPackage.Command);
-		}
-
-		[Test]
-		public void
-			when_send_queue_size_is_smaller_than_threshold_should_not_close_connection() {
-			var mre = new ManualResetEventSlim();
-
-			var messageSize = _connectionPendingSendBytesThreshold;
-			var evnt = new EventRecord(0, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, "testStream", 0, DateTime.Now,
-				PrepareFlags.None, "eventType", new byte[messageSize], new byte[0]);
-			var record = ResolvedEvent.ForUnresolvedEvent(evnt, null);
-			var message = new ClientMessage.ReadEventCompleted(Guid.NewGuid(), "testStream", ReadEventResult.Success,
-				record, StreamMetadata.Empty, false, "");
-
-			var dummyConnection = new DummyTcpConnection();
-			dummyConnection.SendQueueSize = ESConsts.MaxConnectionQueueSize - 1;
-
-			var tcpConnectionManager = new TcpConnectionManager(
-				Guid.NewGuid().ToString(), TcpServiceType.External, new ClientTcpDispatcher(2000),
-				new SynchronousScheduler(), dummyConnection, new SynchronousScheduler(),
-				new InternalAuthenticationProvider(InMemoryBus.CreateTest(),
-					new Core.Helpers.IODispatcher(new SynchronousScheduler(), new NoopEnvelope()), null, 1, false, DefaultData.DefaultUserOptions),
-				new AuthorizationGateway(new TestAuthorizationProvider()),
-				TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10), (man, err) => { mre.Set(); },
-				ESConsts.UnrestrictedPendingSendBytes, ESConsts.MaxConnectionQueueSize);
-
-			tcpConnectionManager.SendMessage(message);
-
-			var data = dummyConnection.ReceivedData.Last();
-			var receivedPackage = TcpPackage.FromArraySegment(data);
-
-			Assert.AreEqual(receivedPackage.Command, TcpCommand.ReadEventCompleted,
-				"Expected ReadEventCompleted but got {0}", receivedPackage.Command);
-		}
-
-		[Test]
-		public void
-			when_send_queue_size_is_larger_than_threshold_should_close_connection() {
-			var mre = new ManualResetEventSlim();
-
-			var messageSize = _connectionPendingSendBytesThreshold;
-			var evnt = new EventRecord(0, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, "testStream", 0, DateTime.Now,
-				PrepareFlags.None, "eventType", new byte[messageSize], new byte[0]);
-			var record = ResolvedEvent.ForUnresolvedEvent(evnt, null);
-			var message = new ClientMessage.ReadEventCompleted(Guid.NewGuid(), "testStream", ReadEventResult.Success,
-				record, StreamMetadata.Empty, false, "");
-
-			var dummyConnection = new DummyTcpConnection();
-			dummyConnection.SendQueueSize = ESConsts.MaxConnectionQueueSize + 1;
-
-			var tcpConnectionManager = new TcpConnectionManager(
-				Guid.NewGuid().ToString(), TcpServiceType.External, new ClientTcpDispatcher(2000),
-				new SynchronousScheduler(), dummyConnection, new SynchronousScheduler(),
-				new InternalAuthenticationProvider(InMemoryBus.CreateTest(),
-					new Core.Helpers.IODispatcher(new SynchronousScheduler(), new NoopEnvelope()), null, 1, false, DefaultData.DefaultUserOptions),
-				new AuthorizationGateway(new TestAuthorizationProvider()),
-				TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10), (man, err) => { mre.Set(); },
-				ESConsts.UnrestrictedPendingSendBytes, ESConsts.MaxConnectionQueueSize);
-
-			tcpConnectionManager.SendMessage(message);
-
-			if (!mre.Wait(2000)) {
-				Assert.Fail("Timed out waiting for connection to close");
-			}
-		}
-	}
-
-	internal class DummyTcpConnection : ITcpConnection {
-		public Guid ConnectionId {
-			get { return _connectionId; }
-			set { _connectionId = value; }
-		}
-		private Guid _connectionId = Guid.NewGuid();
-		public string ClientConnectionName {
-			get { return _clientConnectionName; }
-		}
-
-		public long TotalBytesSent { get; }
-		public long TotalBytesReceived { get; }
-
-		public bool IsClosed {
-			get { return false; }
-		}
-
-		public IPEndPoint LocalEndPoint {
-			get { return new IPEndPoint(IPAddress.Loopback, 2); }
-		}
-
-		public IPEndPoint RemoteEndPoint {
-			get { return new IPEndPoint(IPAddress.Loopback, 1); }
-		}
-
-		private int _sendQueueSize;
-		public int SendQueueSize {
-			get { return _sendQueueSize; }
-			set { _sendQueueSize = value; }
-		}
-
-		private int _pendingSendBytes;
-
-		public int PendingSendBytes {
-			get { return _pendingSendBytes; }
-			set { _pendingSendBytes = value; }
-		}
-
-		public event Action<ITcpConnection, SocketError> ConnectionClosed;
-		private string _clientConnectionName;
-
-		public void Close(string reason) {
-			var handler = ConnectionClosed;
-			if (handler != null)
-				handler(this, SocketError.Shutdown);
-		}
-
-		public IEnumerable<ArraySegment<byte>> ReceivedData;
-
-		public void EnqueueSend(IEnumerable<ArraySegment<byte>> data) {
-			ReceivedData = data;
-		}
-
-		public void ReceiveAsync(Action<ITcpConnection, IEnumerable<ArraySegment<byte>>> callback) {
-			throw new NotImplementedException();
-		}
-
-		public void SetClientConnectionName(string clientConnectionName) {
-			_clientConnectionName = clientConnectionName;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/TcpConnectionSslTests.cs b/src/EventStore.Core.Tests/Services/Transport/Tcp/TcpConnectionSslTests.cs
deleted file mode 100644
index bb802e469f0..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Tcp/TcpConnectionSslTests.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using EventStore.Transport.Tcp;
-using System.Net.Sockets;
-using System.Reflection;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.Tests.Services.Transport.Tcp {
-	[TestFixture]
-	public class TcpConnectionSslTests {
-		protected static Socket CreateListeningSocket() {
-			var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-			listener.Bind(new IPEndPoint(IPAddress.Loopback, 0));
-			listener.Listen(1);
-			return listener;
-		}
-
-		private IEnumerable<ArraySegment<byte>> GenerateData() {
-			var data = new List<ArraySegment<byte>>();
-			data.Add(new ArraySegment<byte>(new byte[100]));
-			return data;
-		}
-
-		[Test, Timeout(120000)]
-		public async Task no_data_should_be_dispatched_after_tcp_connection_closed() {
-			for (int i = 0; i < 1000; i++) {
-				bool closed = false;
-				bool dataReceivedAfterClose = false;
-				var listeningSocket = CreateListeningSocket();
-
-				var mre = new ManualResetEventSlim(false);
-				var clientTcpConnection = TcpConnectionSsl.CreateConnectingConnection(
-					Guid.NewGuid(),
-					listeningSocket.LocalEndPoint.GetHost(),
-					null,
-					(IPEndPoint)listeningSocket.LocalEndPoint,
-					delegate { return (true, null); },
-					null,
-					new TcpClientConnector(),
-					TimeSpan.FromSeconds(5),
-					(conn) => mre.Set(),
-					(conn, error) => {
-						Assert.Fail($"Connection failed: {error}");
-					},
-					false);
-
-				var serverSocket = listeningSocket.Accept();
-				var serverTcpConnection = TcpConnectionSsl.CreateServerFromSocket(Guid.NewGuid(),
-					(IPEndPoint)serverSocket.RemoteEndPoint, serverSocket, ssl_connections.GetServerCertificate,
-					null, delegate { return (true, null); }, false);
-
-				mre.Wait(TimeSpan.FromSeconds(3));
-				try {
-					clientTcpConnection.ConnectionClosed += (connection, error) => {
-						Volatile.Write(ref closed, true);
-					};
-
-					clientTcpConnection.ReceiveAsync((connection, data) => {
-						if (Volatile.Read(ref closed)) {
-							dataReceivedAfterClose = true;
-						}
-					});
-
-					using (var b = new Barrier(2)) {
-						Task sendData = Task.Factory.StartNew(() => {
-							b.SignalAndWait();
-							for (int i = 0; i < 1000; i++)
-								serverTcpConnection.EnqueueSend(GenerateData());
-						}, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default);
-
-						Task closeConnection = Task.Factory.StartNew(() => {
-							b.SignalAndWait();
-							serverTcpConnection.Close("Intentional close");
-						}, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default);
-
-						await Task.WhenAll(sendData, closeConnection);
-						Assert.False(dataReceivedAfterClose);
-					}
-				} finally {
-					clientTcpConnection.Close("Shut down");
-					serverTcpConnection.Close("Shut down");
-					listeningSocket.Dispose();
-				}
-			}
-		}
-
-		[Test, Timeout(120000)]
-		public void when_connection_closed_quickly_socket_should_be_properly_disposed() {
-			for (int i = 0; i < 1000; i++) {
-				var listeningSocket = CreateListeningSocket();
-				ITcpConnection clientTcpConnection = null;
-				ITcpConnection serverTcpConnection = null;
-				Socket serverSocket = null;
-				try {
-					ManualResetEventSlim mre = new ManualResetEventSlim(false);
-
-					clientTcpConnection = TcpConnectionSsl.CreateConnectingConnection(
-						Guid.NewGuid(),
-						listeningSocket.LocalEndPoint.GetHost(),
-						null,
-						(IPEndPoint)listeningSocket.LocalEndPoint,
-						delegate { return (true, null); },
-						null,
-						new TcpClientConnector(),
-						TimeSpan.FromSeconds(5),
-						(conn) => {},
-						(conn, error) => {},
-						false);
-
-					clientTcpConnection.ConnectionClosed += (conn, error) => {
-						mre.Set();
-					};
-
-					serverSocket = listeningSocket.Accept();
-					clientTcpConnection.Close("Intentional close");
-					serverTcpConnection = TcpConnectionSsl.CreateServerFromSocket(Guid.NewGuid(),
-						(IPEndPoint)serverSocket.RemoteEndPoint, serverSocket, ssl_connections.GetServerCertificate,
-						null, delegate { return (true, null); }, false);
-
-					mre.Wait(TimeSpan.FromSeconds(10));
-					SpinWait.SpinUntil(() => serverTcpConnection.IsClosed, TimeSpan.FromSeconds(10));
-
-					var disposed = false;
-					try {
-						int x = serverSocket.Available;
-					} catch (ObjectDisposedException) {
-						disposed = true;
-					}
-
-					Assert.AreEqual(true, disposed);
-				} finally {
-					clientTcpConnection?.Close("Shut down");
-					serverTcpConnection?.Close("Shut down");
-					listeningSocket.Dispose();
-					serverSocket?.Dispose();
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/TcpConnectionTests.cs b/src/EventStore.Core.Tests/Services/Transport/Tcp/TcpConnectionTests.cs
deleted file mode 100644
index 9be15b0f107..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Tcp/TcpConnectionTests.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Net;
-using EventStore.Transport.Tcp;
-using System.Net.Sockets;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.Tests.Services.Transport.Tcp {
-	[TestFixture]
-	public class TcpConnectionTests {
-		protected static Socket CreateListeningSocket() {
-			var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-			listener.Bind(new IPEndPoint(IPAddress.Loopback, 0));
-			listener.Listen(1);
-			return listener;
-		}
-
-		private IEnumerable<ArraySegment<byte>> GenerateData() {
-			var data = new List<ArraySegment<byte>>();
-			data.Add(new ArraySegment<byte>(new byte[100]));
-			return data;
-		}
-
-		[Test, Timeout(120000)]
-		public async Task no_data_should_be_dispatched_after_tcp_connection_closed() {
-			for (int i = 0; i < 1000; i++) {
-				bool closed = false;
-				bool dataReceivedAfterClose = false;
-				var listeningSocket = CreateListeningSocket();
-				TaskCompletionSource<SocketError> connectionResult = new (TaskCreationOptions.RunContinuationsAsynchronously);
-
-				var clientTcpConnection = TcpConnection.CreateConnectingTcpConnection(
-					Guid.NewGuid(),
-					(IPEndPoint)listeningSocket.LocalEndPoint,
-					new TcpClientConnector(),
-					TimeSpan.FromSeconds(5),
-					(conn) => connectionResult.TrySetResult(SocketError.Success),
-					(conn, error) => connectionResult.TrySetResult(error),
-					false);
-
-				var serverSocket = listeningSocket.Accept();
-				var serverTcpConnection = TcpConnection.CreateAcceptedTcpConnection(Guid.NewGuid(),
-					(IPEndPoint)serverSocket.RemoteEndPoint, serverSocket, false);
-
-				SocketError error = await connectionResult.Task.WithTimeout();
-				Assert.AreEqual(SocketError.Success, error);
-				try {
-					clientTcpConnection.ConnectionClosed += (connection, error) => {
-						Volatile.Write(ref closed, true);
-					};
-
-					clientTcpConnection.ReceiveAsync((connection, data) => {
-						if (Volatile.Read(ref closed)) {
-							dataReceivedAfterClose = true;
-						}
-					});
-
-					using (var b = new Barrier(2)) {
-						Task sendData = Task.Factory.StartNew(() => {
-							b.SignalAndWait();
-							for (int i = 0; i < 1000; i++)
-								serverTcpConnection.EnqueueSend(GenerateData());
-						}, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default);
-
-						Task closeConnection = Task.Factory.StartNew(() => {
-							b.SignalAndWait();
-							serverTcpConnection.Close("Intentional close");
-						}, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default);
-
-						await Task.WhenAll(sendData, closeConnection);
-						Assert.False(dataReceivedAfterClose);
-					}
-				} finally {
-					clientTcpConnection.Close("Shut down");
-					serverTcpConnection.Close("Shut down");
-					listeningSocket.Dispose();
-				}
-			}
-		}
-
-		[Test, Timeout(120000)]
-		public void when_connection_closed_quickly_socket_should_be_properly_disposed() {
-			for (int i = 0; i < 1000; i++) {
-				var listeningSocket = CreateListeningSocket();
-				ITcpConnection clientTcpConnection = null;
-				ITcpConnection serverTcpConnection = null;
-				Socket serverSocket = null;
-				try {
-					ManualResetEventSlim mre = new ManualResetEventSlim(false);
-
-					clientTcpConnection = TcpConnection.CreateConnectingTcpConnection(
-					Guid.NewGuid(),
-					(IPEndPoint)listeningSocket.LocalEndPoint,
-					new TcpClientConnector(),
-					TimeSpan.FromSeconds(5),
-					(conn) => {},
-					(conn, error) => {},
-					false);
-
-					clientTcpConnection.ConnectionClosed += (conn, error) => {
-						mre.Set();
-					};
-
-					serverSocket = listeningSocket.Accept();
-					clientTcpConnection.Close("Intentional close");
-					serverTcpConnection = TcpConnection.CreateAcceptedTcpConnection(Guid.NewGuid(),
-						(IPEndPoint)serverSocket.RemoteEndPoint, serverSocket, false);
-
-					mre.Wait(TimeSpan.FromSeconds(10));
-					SpinWait.SpinUntil(() => serverTcpConnection.IsClosed, TimeSpan.FromSeconds(10));
-
-					var disposed = false;
-					try {
-						int x = serverSocket.Available;
-					} catch (ObjectDisposedException) {
-						disposed = true;
-					}
-
-					Assert.AreEqual(true, disposed);
-				} finally {
-					clientTcpConnection?.Close("Shut down");
-					serverTcpConnection?.Close("Shut down");
-					listeningSocket.Dispose();
-					serverSocket?.Dispose();
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/core_tcp_package.cs b/src/EventStore.Core.Tests/Services/Transport/Tcp/core_tcp_package.cs
deleted file mode 100644
index a1a1d8d2389..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Tcp/core_tcp_package.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-using System;
-using EventStore.Core.Services.Transport.Tcp;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Tcp {
-	[TestFixture]
-	public class core_tcp_package {
-		[Test]
-		public void should_throw_argument_null_exception_when_created_as_authorized_but_login_not_provided() {
-			Assert.Throws<ArgumentNullException>(() =>
-				new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, Guid.NewGuid(), null, "pa$$",
-					new byte[] {1, 2, 3}));
-		}
-
-		[Test]
-		public void should_throw_argument_null_exception_when_created_as_authorized_but_password_not_provided() {
-			Assert.Throws<ArgumentNullException>(() =>
-				new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, Guid.NewGuid(), "login", null,
-					new byte[] {1, 2, 3}));
-		}
-
-		[Test]
-		public void should_throw_argument_null_exception_when_created_as_authorized_but_token_not_provided() {
-			Assert.Throws<ArgumentNullException>(() =>
-				new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, Guid.NewGuid(), null,
-					new byte[] {1, 2, 3}));
-		}
-
-		[Test]
-		public void should_throw_argument_exception_when_created_as_not_authorized_but_login_is_provided() {
-			Assert.Throws<ArgumentException>(() =>
-				new TcpPackage(TcpCommand.BadRequest, TcpFlags.None, Guid.NewGuid(), "login", null,
-					new byte[] {1, 2, 3}));
-		}
-
-		[Test]
-		public void should_throw_argument_exception_when_created_as_not_authorized_but_password_is_provided() {
-			Assert.Throws<ArgumentException>(() =>
-				new TcpPackage(TcpCommand.BadRequest, TcpFlags.None, Guid.NewGuid(), null, "pa$$",
-					new byte[] {1, 2, 3}));
-		}
-
-		[Test]
-		public void should_throw_argument_exception_when_created_as_not_authorized_but_token_is_provided() {
-			Assert.Throws<ArgumentException>(() =>
-				new TcpPackage(TcpCommand.BadRequest, TcpFlags.None, Guid.NewGuid(), "token",
-					new byte[] {1, 2, 3}));
-		}
-
-		[Test]
-		public void not_authorized_with_data_should_serialize_and_deserialize_correctly() {
-			var corrId = Guid.NewGuid();
-			var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.None, corrId, null, null, new byte[] {1, 2, 3});
-			var bytes = refPkg.AsArraySegment();
-
-			var pkg = TcpPackage.FromArraySegment(bytes);
-			Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
-			Assert.AreEqual(TcpFlags.None, pkg.Flags);
-			Assert.AreEqual(corrId, pkg.CorrelationId);
-			Assert.False(pkg.Tokens.TryGetValue("uid", out _));
-			Assert.False(pkg.Tokens.TryGetValue("pwd", out _));
-			Assert.False(pkg.Tokens.TryGetValue("jwt", out _));
-
-			Assert.AreEqual(3, pkg.Data.Count);
-			Assert.AreEqual(1, pkg.Data.Array[pkg.Data.Offset + 0]);
-			Assert.AreEqual(2, pkg.Data.Array[pkg.Data.Offset + 1]);
-			Assert.AreEqual(3, pkg.Data.Array[pkg.Data.Offset + 2]);
-		}
-
-		[Test]
-		public void not_authorized_with_empty_data_should_serialize_and_deserialize_correctly() {
-			var corrId = Guid.NewGuid();
-			var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.None, corrId, null, null, new byte[0]);
-			var bytes = refPkg.AsArraySegment();
-
-			var pkg = TcpPackage.FromArraySegment(bytes);
-			Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
-			Assert.AreEqual(TcpFlags.None, pkg.Flags);
-			Assert.AreEqual(corrId, pkg.CorrelationId);
-			Assert.False(pkg.Tokens.TryGetValue("uid", out _));
-			Assert.False(pkg.Tokens.TryGetValue("pwd", out _));
-			Assert.False(pkg.Tokens.TryGetValue("jwt", out _));
-
-			Assert.AreEqual(0, pkg.Data.Count);
-		}
-
-		[Test]
-		public void authorized_with_data_should_serialize_and_deserialize_correctly() {
-			var corrId = Guid.NewGuid();
-			var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, corrId, "login", "pa$$",
-				new byte[] {1, 2, 3});
-			var bytes = refPkg.AsArraySegment();
-
-			var pkg = TcpPackage.FromArraySegment(bytes);
-			Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
-			Assert.AreEqual(TcpFlags.Authenticated, pkg.Flags);
-			Assert.AreEqual(corrId, pkg.CorrelationId);
-			Assert.AreEqual("login", pkg.Tokens["uid"]);
-			Assert.AreEqual("pa$$", pkg.Tokens["pwd"]);
-			Assert.False(pkg.Tokens.TryGetValue("jwt", out _));
-
-			Assert.AreEqual(3, pkg.Data.Count);
-			Assert.AreEqual(1, pkg.Data.Array[pkg.Data.Offset + 0]);
-			Assert.AreEqual(2, pkg.Data.Array[pkg.Data.Offset + 1]);
-			Assert.AreEqual(3, pkg.Data.Array[pkg.Data.Offset + 2]);
-		}
-
-		[Test]
-		public void authorized_with_empty_data_should_serialize_and_deserialize_correctly() {
-			var corrId = Guid.NewGuid();
-			var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, corrId, "login", "pa$$",
-				new byte[0]);
-			var bytes = refPkg.AsArraySegment();
-
-			var pkg = TcpPackage.FromArraySegment(bytes);
-			Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
-			Assert.AreEqual(TcpFlags.Authenticated, pkg.Flags);
-			Assert.AreEqual(corrId, pkg.CorrelationId);
-			Assert.AreEqual("login", pkg.Tokens["uid"]);
-			Assert.AreEqual("pa$$", pkg.Tokens["pwd"]);
-			Assert.False(pkg.Tokens.TryGetValue("jwt", out _));
-
-			Assert.AreEqual(0, pkg.Data.Count);
-		}
-
-		[Test]
-		public void token_authorized_with_data_should_serialize_and_deserialize_correctly() {
-			var corrId = Guid.NewGuid();
-			var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, corrId, "token",
-				new byte[] {1, 2, 3});
-			var bytes = refPkg.AsArraySegment();
-
-			var pkg = TcpPackage.FromArraySegment(bytes);
-			Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
-			Assert.AreEqual(TcpFlags.Authenticated, pkg.Flags);
-			Assert.AreEqual(corrId, pkg.CorrelationId);
-			Assert.AreEqual("token", pkg.Tokens["jwt"]);
-			Assert.False(pkg.Tokens.TryGetValue("uid", out _));
-			Assert.False(pkg.Tokens.TryGetValue("pwd", out _));
-
-			Assert.AreEqual(3, pkg.Data.Count);
-			Assert.AreEqual(1, pkg.Data.Array[pkg.Data.Offset + 0]);
-			Assert.AreEqual(2, pkg.Data.Array[pkg.Data.Offset + 1]);
-			Assert.AreEqual(3, pkg.Data.Array[pkg.Data.Offset + 2]);
-		}
-
-		[Test]
-		public void token_authorized_with_empty_data_should_serialize_and_deserialize_correctly() {
-			var corrId = Guid.NewGuid();
-			var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, corrId, "token",
-				new byte[0]);
-			var bytes = refPkg.AsArraySegment();
-
-			var pkg = TcpPackage.FromArraySegment(bytes);
-			Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
-			Assert.AreEqual(TcpFlags.Authenticated, pkg.Flags);
-			Assert.AreEqual(corrId, pkg.CorrelationId);
-			Assert.AreEqual("token", pkg.Tokens["jwt"]);
-			Assert.False(pkg.Tokens.TryGetValue("uid", out _));
-			Assert.False(pkg.Tokens.TryGetValue("pwd", out _));
-
-			Assert.AreEqual(0, pkg.Data.Count);
-		}
-
-		[Test]
-		public void should_throw_argument_exception_when_login_too_long() {
-			Assert.Throws<ArgumentException>(() => new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated,
-				Guid.NewGuid(), new string('*', TcpPackage.MaxLoginLength + 1), "pa$$", new byte[] {1, 2, 3}));
-		}
-
-		[Test]
-		public void should_throw_argument_exception_when_password_too_long() {
-			Assert.Throws<ArgumentException>(() => new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated,
-				Guid.NewGuid(), "login", new string('*', TcpPackage.MaxPasswordLength + 1), new byte[] {1, 2, 3}));
-		}
-
-		[Test]
-		public void should_throw_argument_exception_when_token_too_long() {
-			Assert.Throws<ArgumentException>(() => new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated,
-				Guid.NewGuid(), new string('*', TcpPackage.MaxTokenLength + 1), new byte[] {1, 2, 3}));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/ssl_connection.cs b/src/EventStore.Core.Tests/Services/Transport/Tcp/ssl_connection.cs
deleted file mode 100644
index 7741bc5c464..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Tcp/ssl_connection.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Reflection;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Transport.Tcp;
-using NUnit.Framework;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Tests.Services.Transport.Tcp {
-	[TestFixture]
-	public class ssl_connections {
-		private static readonly ILogger Log = Serilog.Log.ForContext<ssl_connections>();
-		private IPAddress _ip;
-		private int _port;
-
-		[SetUp]
-		public void SetUp() {
-			_ip = IPAddress.Loopback;
-			_port = PortsHelper.GetAvailablePort(_ip);
-		}
-		
-		[Test]
-		public void should_connect_to_each_other_and_send_data() {
-			var serverEndPoint = new IPEndPoint(_ip, _port);
-			X509Certificate2 cert = GetServerCertificate();
-
-			var sent = new byte[1000];
-			new Random().NextBytes(sent);
-
-			using var received = new MemoryStream();
-
-			var done = new ManualResetEventSlim();
-
-			var listener = new TcpServerListener(serverEndPoint);
-			listener.StartListening((endPoint, socket) => {
-				var ssl = TcpConnectionSsl.CreateServerFromSocket(Guid.NewGuid(), endPoint, socket,
-					() => cert, null, delegate { return (true, null); },
-					verbose: true);
-				ssl.ConnectionClosed += (x, y) => done.Set();
-				if (ssl.IsClosed)
-					done.Set();
-
-				Action<ITcpConnection, IEnumerable<ArraySegment<byte>>> callback = null;
-				callback = (x, y) => {
-					foreach (var arraySegment in y) {
-						received.Write(arraySegment.Array, arraySegment.Offset, arraySegment.Count);
-						Log.Information("Received: {0} bytes, total: {1}.", arraySegment.Count, received.Length);
-					}
-
-					if (received.Length >= sent.Length) {
-						Log.Information("Done receiving...");
-						done.Set();
-					} else {
-						Log.Information("Receiving...");
-						ssl.ReceiveAsync(callback);
-					}
-				};
-				Log.Information("Receiving...");
-				ssl.ReceiveAsync(callback);
-			}, "Secure");
-
-			var clientSsl = TcpConnectionSsl.CreateConnectingConnection(
-				Guid.NewGuid(),
-				serverEndPoint.GetHost(),
-				null,
-				serverEndPoint,
-				delegate { return (true, null); },
-				null,
-				new TcpClientConnector(),
-				TcpConnectionManager.ConnectionTimeout,
-				conn => {
-					Log.Information("Sending bytes...");
-					conn.EnqueueSend(new[] { new ArraySegment<byte>(sent) });
-				},
-				(conn, err) => {
-					Log.Error("Connecting failed: {0}.", err);
-					done.Set();
-				},
-				verbose: true);
-
-			Assert.IsTrue(done.Wait(20000), "Took too long to receive completion.");
-
-			Log.Information("Stopping listener...");
-			listener.Stop();
-			Log.Information("Closing client TLS connection...");
-			clientSsl.Close("Normal close.");
-			Log.Information("Checking received data...");
-			Assert.AreEqual(sent, received.ToArray());
-		}
-
-		private static X509Certificate2 _root, _server, _otherServer, _untrusted;
-		public static X509Certificate2 GetRootCertificate() {
-			_root ??= GetCertificate("ca", loadKey: false);
-			return new X509Certificate2(_root);
-		}
-
-		public static X509Certificate2 GetServerCertificate() {
-			_server ??= GetCertificate("node1");
-			return new X509Certificate2(_server);
-		}
-
-		public static X509Certificate2 GetOtherServerCertificate() {
-			_otherServer ??= GetCertificate("node2");
-			return new X509Certificate2(_otherServer);
-		}
-
-		public static X509Certificate2 GetUntrustedCertificate() {
-			_untrusted ??= GetCertificate("untrusted");
-			return new X509Certificate2(_untrusted);
-		}
-
-		private static X509Certificate2 GetCertificate(string name, bool loadKey = true) {
-			const string resourcePath = "EventStore.Core.Tests.Services.Transport.Tcp.test_certificates";
-
-			var certBytes = LoadResource($"{resourcePath}.{name}.{name}.crt");
-			var certificate = X509Certificate2.CreateFromPem(Encoding.UTF8.GetString(certBytes));
-
-			if (!loadKey)
-				return certificate;
-
-			var keyBytes = LoadResource($"{resourcePath}.{name}.{name}.key");
-			using var rsa = RSA.Create();
-			rsa.ImportFromPem(Encoding.UTF8.GetString(keyBytes));
-
-			using X509Certificate2 certWithKey = certificate.CopyWithPrivateKey(rsa);
-
-			// recreate the certificate from a PKCS #12 bundle to work around: https://github.com/dotnet/runtime/issues/23749
-			return new X509Certificate2(certWithKey.ExportToPkcs12(), string.Empty, X509KeyStorageFlags.Exportable);
-		}
-
-		private static byte[] LoadResource(string resource) {
-			using var resourceStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(resource);
-			if (resourceStream == null)
-				return null;
-
-			using var memStream = new MemoryStream();
-			resourceStream.CopyTo(memStream);
-			return memStream.ToArray();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/ssl_connections_mutual_auth.cs b/src/EventStore.Core.Tests/Services/Transport/Tcp/ssl_connections_mutual_auth.cs
deleted file mode 100644
index 3b3f64016ab..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Tcp/ssl_connections_mutual_auth.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Security;
-using System.Reflection;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Transport.Tcp;
-using NUnit.Framework;
-using Serilog;
-
-namespace EventStore.Core.Tests.Services.Transport.Tcp {
-	[TestFixture]
-	public class ssl_connections_mutual_auth {
-		private static readonly ILogger Log = Serilog.Log.ForContext<ssl_connections_mutual_auth>();
-		private IPAddress _ip;
-		private int _port;
-
-		[SetUp]
-		public void SetUp() {
-			_ip = IPAddress.Loopback;
-			_port = PortsHelper.GetAvailablePort(_ip);
-		}
-
-		[TestCase(true, true, true, true, true)] //require valid server and client certificate
-		[TestCase(true, false, true, true, false)] //require valid server and client certificate
-		[TestCase(false, true, true, true, false)] //require valid server and client certificate
-		[TestCase(false, false, true, true, false)] //require valid server and client certificate
-		[TestCase(true, true, true, false, true)] //require valid server certificate only
-		[TestCase(true, false, true, false, true)] //require valid server certificate only
-		[TestCase(false, true, true, false, false)] //require valid server certificate only
-		[TestCase(false, false, true, false, false)] //require valid server certificate only
-		[TestCase(true, true, false, true, true)] //require valid client certificate only
-		[TestCase(true, false, false, true, false)] //require valid client certificate only
-		[TestCase(false, true, false, true, true)] //require valid client certificate only
-		[TestCase(false, false, false, true, false)] //require valid client certificate only
-		[TestCase(true, true, false, false, true)] //do not require valid client or server certificate
-		[TestCase(true, false, false, false, true)] //do not require valid client or server certificate
-		[TestCase(false, true, false, false, true)] //do not require valid client or server certificate
-		[TestCase(false, false, false, false, true)] //do not require valid client or server certificate
-		public void should_connect_to_each_other_and_send_data_depending_on_certificate_validity_and_settings (
-		    bool useValidServerCertificate,
-		    bool useValidClientCertificate,
-		    bool validateServerCertificate,
-		    bool validateClientCertificate,
-		    bool shouldConnectSuccessfully
-		) {
-			var serverEndPoint = new IPEndPoint(_ip, _port);
-			var serverCertificate = useValidServerCertificate
-				? ssl_connections.GetServerCertificate()
-				: ssl_connections.GetUntrustedCertificate();
-			var clientCertificate = useValidClientCertificate
-				? ssl_connections.GetOtherServerCertificate()
-				: ssl_connections.GetUntrustedCertificate();
-			var rootCertificates = new X509Certificate2Collection(ssl_connections.GetRootCertificate());
-
-
-			var sent = new byte[1000];
-			new Random().NextBytes(sent);
-
-			var received = new MemoryStream();
-
-			var done = new ManualResetEventSlim();
-
-			var listener = new TcpServerListener(serverEndPoint);
-			listener.StartListening((endPoint, socket) => {
-				var ssl = TcpConnectionSsl.CreateServerFromSocket(Guid.NewGuid(), endPoint, socket, () => serverCertificate,
-					null, (cert, chain, err) => validateClientCertificate ?
-						ClusterVNode<string>.ValidateClientCertificate(cert, chain, err, () => null, () => rootCertificates) : (true, null),
-					verbose: true);
-				ssl.ConnectionClosed += (x, y) => done.Set();
-				if (ssl.IsClosed)
-					done.Set();
-
-				Action<ITcpConnection, IEnumerable<ArraySegment<byte>>> callback = null;
-				callback = (x, y) => {
-					foreach (var arraySegment in y) {
-						received.Write(arraySegment.Array, arraySegment.Offset, arraySegment.Count);
-						Log.Information("Received: {0} bytes, total: {1}.", arraySegment.Count, received.Length);
-					}
-
-					if (received.Length >= sent.Length) {
-						Log.Information("Done receiving...");
-						done.Set();
-					} else {
-						Log.Information("Receiving...");
-						ssl.ReceiveAsync(callback);
-					}
-				};
-				Log.Information("Receiving...");
-				ssl.ReceiveAsync(callback);
-			}, "Secure");
-
-			var clientSsl = TcpConnectionSsl.CreateConnectingConnection(
-				Guid.NewGuid(),
-				serverEndPoint.GetHost(),
-				null,
-				serverEndPoint,
-				(cert, chain, err, _) => validateServerCertificate ? ClusterVNode<string>.ValidateServerCertificate(cert, chain, err, () => null, () => rootCertificates, null) : (true, null),
-				() => new X509CertificateCollection{clientCertificate},
-				new TcpClientConnector(),
-				TcpConnectionManager.ConnectionTimeout,
-				conn => {
-					Log.Information("Sending bytes...");
-					conn.EnqueueSend(new[] { new ArraySegment<byte>(sent) });
-				},
-				(conn, err) => {
-					Log.Error("Connecting failed: {0}.", err);
-					done.Set();
-				},
-				verbose: true);
-
-			Assert.IsTrue(done.Wait(20000), "Took too long to receive completion.");
-
-			Log.Information("Stopping listener...");
-			listener.Stop();
-			Log.Information("Closing client TLS connection...");
-			clientSsl.Close("Normal close.");
-			Log.Information("Checking received data...");
-
-			if(shouldConnectSuccessfully)
-				Assert.AreEqual(sent, received.ToArray());
-			else
-				Assert.AreEqual(new byte[0], received.ToArray());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/when_invalid_data_is_sent_over_tcp.cs b/src/EventStore.Core.Tests/Services/Transport/Tcp/when_invalid_data_is_sent_over_tcp.cs
deleted file mode 100644
index 2e11f10b9d9..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Tcp/when_invalid_data_is_sent_over_tcp.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Sockets;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Tests.Integration;
-using EventStore.Transport.Tcp;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Tcp {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_invalid_data_is_sent_over_tcp<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
-
-		[Timeout(15000)]
-		[TestCase("InternalTcpEndPoint", false)]
-		[TestCase("ExternalTcpEndPoint", false)]
-		public async Task connection_should_be_closed_by_remote_party(string endpointProperty, bool secure) {
-			IPEndPoint endpoint = (IPEndPoint)_nodes[0].GetType().GetProperty(endpointProperty).GetValue(_nodes[0], null);
-			var closedEvent = new ManualResetEventSlim();
-			TaskCompletionSource<SocketError> connectionResult = new (TaskCreationOptions.RunContinuationsAsynchronously);
-
-			ITcpConnection connection;
-			if (!secure) {
-				connection = TcpConnection.CreateConnectingTcpConnection(
-					Guid.NewGuid(),
-					endpoint,
-					new TcpClientConnector(),
-					TimeSpan.FromSeconds(5),
-					(conn) => connectionResult.TrySetResult(SocketError.Success),
-					(conn, error) => connectionResult.TrySetResult(error),
-					false);
-			} else {
-				connection = TcpConnectionSsl.CreateConnectingConnection(
-					Guid.NewGuid(),
-					endpoint.GetHost(),
-					null,
-					endpoint,
-					delegate { return (true, null); },
-					null,
-					new TcpClientConnector(),
-					TimeSpan.FromSeconds(5),
-					(conn) => connectionResult.TrySetResult(SocketError.Success),
-					(conn, error) => connectionResult.TrySetResult(error),
-					false);
-			}
-
-			connection.ConnectionClosed += (conn, error) => closedEvent.Set();
-
-			SocketError result = await connectionResult.Task.WithTimeout();
-			Assert.AreEqual(SocketError.Success, result);
-			var data = new List<ArraySegment<byte>> {
-				new ArraySegment<byte>(new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
-			};
-			connection.EnqueueSend(data);
-			Assert.True(closedEvent.Wait(10000));
-			connection.Close("intentional close");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/with_intermediate_certificates.cs b/src/EventStore.Core.Tests/Services/Transport/Tcp/with_intermediate_certificates.cs
deleted file mode 100644
index 01682477c98..00000000000
--- a/src/EventStore.Core.Tests/Services/Transport/Tcp/with_intermediate_certificates.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-using System;
-using System.Net;
-using System.Net.Security;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.Tests.Certificates;
-using EventStore.Transport.Tcp;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.Transport.Tcp {
-	[TestFixture]
-	public class with_intermediate_certificates : with_certificate_chain_of_length_3 {
-		private TcpServerListener _listener;
-		private IPEndPoint _serverEndPoint;
-		private ITcpConnection _client;
-		private Func<X509Certificate, X509Chain, SslPolicyErrors, (bool, string)> _clientCertValidator;
-		private X509Certificate2 _cert;
-
-		[SetUp]
-		public void SetUp() {
-			// certificate exported to PKCS #12 due to this issue on Windows: https://github.com/dotnet/runtime/issues/45680
-			_cert = new X509Certificate2(_leaf.ExportToPkcs12());
-
-			_clientCertValidator = (_,_,_) => (true, null);
-			_serverEndPoint = new IPEndPoint(IPAddress.Loopback, PortsHelper.GetAvailablePort(IPAddress.Loopback));
-			_listener = new TcpServerListener(_serverEndPoint);
-			_listener.StartListening((endPoint, socket) => {
-				TcpConnectionSsl.CreateServerFromSocket(
-					Guid.NewGuid(),
-					endPoint,
-					socket,
-					() => _cert,
-					() => new X509Certificate2Collection(_intermediate),
-					(cert,chain,errors) => _clientCertValidator(cert, chain, errors),
-					verbose: true);
-			}, "Secure");
-		}
-
-		[Test]
-		public void server_should_send_intermediate_certificate_during_handshake() {
-			var done = new ManualResetEventSlim(false);
-
-			bool gotLeaf = false;
-			bool gotIntermediate = false;
-
-			_client = TcpConnectionSsl.CreateConnectingConnection(
-				Guid.NewGuid(),
-				_serverEndPoint.GetHost(),
-				null,
-				_serverEndPoint,
-				(certificate, chain, _, _) => {
-					gotLeaf = _leaf.Equals(certificate);
-					foreach (var chainElement in chain.ChainElements) {
-						if (chainElement.Certificate.Equals(_intermediate)) {
-							gotIntermediate = true;
-						}
-					}
-
-					done.Set();
-					return (true, null);
-				},
-				null,
-				new TcpClientConnector(),
-				TcpConnectionManager.ConnectionTimeout,
-				conn => { },
-				(conn, err) => { },
-				verbose: true);
-
-			Assert.True(done.Wait(20000), "Took too long to receive completion.");
-			Assert.True(gotLeaf);
-			Assert.True(gotIntermediate);
-		}
-
-		[Test, Ignore("Skipped since it adds an intermediate certificate to the current user's store")]
-		public void client_should_send_intermediate_certificate_during_handshake() {
-			try {
-				// see: https://github.com/dotnet/runtime/issues/47680#issuecomment-771093045
-				AddIntermediateCertificateToStore();
-
-				var done = new ManualResetEventSlim(false);
-
-				bool gotLeaf = false;
-				bool gotIntermediate = false;
-
-				_clientCertValidator = (certificate, chain, _) => {
-					gotLeaf = _leaf.Equals(certificate);
-					foreach (var chainElement in chain.ChainElements) {
-						if (chainElement.Certificate.Equals(_intermediate)) {
-							gotIntermediate = true;
-						}
-					}
-
-					done.Set();
-					return (true, null);
-				};
-
-				_client = TcpConnectionSsl.CreateConnectingConnection(
-					Guid.NewGuid(),
-					_serverEndPoint.GetHost(),
-					null,
-					_serverEndPoint,
-					(_, _, _, _) => (true, null),
-					() => new X509Certificate2Collection(_cert),
-					new TcpClientConnector(),
-					TcpConnectionManager.ConnectionTimeout,
-					conn => { },
-					(conn, err) => { },
-					verbose: true);
-
-				Assert.True(done.Wait(20000), "Took too long to receive completion.");
-				Assert.True(gotLeaf);
-				Assert.True(gotIntermediate);
-			} finally {
-				RemoveIntermediateCertificateFromStore();
-			}
-		}
-
-		private void AddIntermediateCertificateToStore() {
-			using var intermediateStore = new X509Store(StoreName.CertificateAuthority, StoreLocation.CurrentUser);
-			intermediateStore.Open(OpenFlags.ReadWrite);
-			intermediateStore.Add(_intermediate);
-		}
-
-		private void RemoveIntermediateCertificateFromStore() {
-			using var intermediateStore = new X509Store(StoreName.CertificateAuthority, StoreLocation.CurrentUser);
-			intermediateStore.Open(OpenFlags.ReadWrite);
-			intermediateStore.Remove(_intermediate);
-		}
-
-		[TearDown]
-		public void TearDown() {
-			_listener.Stop();
-			_client.Close("Normal close.");
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/UserManagementService/user_management_service.cs b/src/EventStore.Core.Tests/Services/UserManagementService/user_management_service.cs
deleted file mode 100644
index 221542931a8..00000000000
--- a/src/EventStore.Core.Tests/Services/UserManagementService/user_management_service.cs
+++ /dev/null
@@ -1,957 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using EventStore.Core.Messages;
-using EventStore.Core.Services;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.Tests.Authentication;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using EventStore.ClientAPI.Common.Utils;
-using Newtonsoft.Json.Linq;
-
-namespace EventStore.Core.Tests.Services.UserManagementService {
-	public static class user_management_service {
-		public abstract class TestFixtureWithUserManagementService<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-			protected Core.Authentication.InternalAuthentication.UserManagementService _users;
-			protected readonly ClaimsPrincipal _ordinaryUser = new ClaimsPrincipal(new ClaimsIdentity(
-					new [] {
-						new Claim(ClaimTypes.Name,"user1"),
-						new Claim(ClaimTypes.Role,"role1")
-					}
-					, "ES-Test"));
-
-			protected override void Given() {
-				base.Given();
-				NoStream("$user-user1");
-				NoStream("$user-user2");
-				NoStream("$user-user3");
-				NoOtherStreams();
-				AllWritesSucceed();
-
-				_users = new Core.Authentication.InternalAuthentication.UserManagementService(
-					_ioDispatcher, new StubPasswordHashAlgorithm(), skipInitializeStandardUsersCheck: true, 
-					new TaskCompletionSource<bool>(), DefaultData.DefaultUserOptions);
-
-				_bus.Subscribe<UserManagementMessage.Get>(_users);
-				_bus.Subscribe<UserManagementMessage.GetAll>(_users);
-				_bus.Subscribe<UserManagementMessage.Create>(_users);
-				_bus.Subscribe<UserManagementMessage.Update>(_users);
-				_bus.Subscribe<UserManagementMessage.Enable>(_users);
-				_bus.Subscribe<UserManagementMessage.Disable>(_users);
-				_bus.Subscribe<UserManagementMessage.ResetPassword>(_users);
-				_bus.Subscribe<UserManagementMessage.ChangePassword>(_users);
-				_bus.Subscribe<UserManagementMessage.Delete>(_users);
-				_bus.Subscribe<SystemMessage.BecomeLeader>(_users);
-				_bus.Subscribe<SystemMessage.BecomeFollower>(_users);
-				_bus.Subscribe<SystemMessage.BecomeReadOnlyReplica>(_users);
-			}
-
-			protected override ManualQueue GiveInputQueue() {
-				return new ManualQueue(_bus, _timeProvider);
-			}
-
-			[SetUp]
-			public void SetUp() {
-				WhenLoop(GivenCommands());
-				_queue.Process();
-				HandledMessages.Clear();
-				WhenLoop();
-			}
-
-			protected virtual IEnumerable<WhenStep> GivenCommands() {
-				yield break;
-			}
-
-			protected ClientMessage.WriteEvents[] HandledPasswordChangedNotificationWrites() {
-				return HandledMessages.OfType<ClientMessage.WriteEvents>()
-					.Where(
-						v =>
-							v.EventStreamId
-							== Core.Authentication.InternalAuthentication.UserManagementService
-								.UserPasswordNotificationsStreamId).ToArray();
-			}
-
-			protected ClientMessage.WriteEvents[] HandledPasswordChangedNotificationMetaStreamWrites() {
-				return
-					HandledMessages.OfType<ClientMessage.WriteEvents>()
-						.Where(
-							v =>
-								v.EventStreamId
-								== SystemStreams.MetastreamOf(
-									Core.Authentication.InternalAuthentication.UserManagementService
-										.UserPasswordNotificationsStreamId))
-						.ToArray();
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_creating_a_user<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> When() {
-				yield return
-					new UserManagementMessage.Create(
-						Envelope, SystemAccounts.System, "user1", "John Doe", new[] {"admin", "other"}, "Johny123!");
-			}
-
-			[Test]
-			public void replies_success() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.IsTrue(updateResults[0].Success);
-			}
-
-			[Test]
-			public void reply_has_the_correct_login_name() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.AreEqual("user1", updateResults[0].LoginName);
-			}
-
-			[Test]
-			public void creates_an_enabled_user_account_with_correct_details() {
-				_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
-				_queue.Process();
-				var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
-				Assert.NotNull(user);
-				Assert.AreEqual("John Doe", user.Data.FullName);
-				Assert.AreEqual("user1", user.Data.LoginName);
-				Assert.NotNull(user.Data.Groups);
-				Assert.That(user.Data.Groups.Any(v => v == "admin"));
-				Assert.That(user.Data.Groups.Any(v => v == "other"));
-				Assert.AreEqual(false, user.Data.Disabled);
-			}
-
-			[Test]
-			public void creates_an_enabled_user_account_with_the_correct_password() {
-				HandledMessages.Clear();
-				_users.Handle(
-					new UserManagementMessage.ChangePassword(
-						Envelope, SystemAccounts.System, "user1", "Johny123!", "new-password"));
-				_queue.Process();
-				var updateResult = HandledMessages.OfType<UserManagementMessage.UpdateResult>().Last();
-				Assert.NotNull(updateResult);
-				Assert.IsTrue(updateResult.Success);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_ordinary_user_attempts_to_create_a_user<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> When() {
-				yield return
-					new UserManagementMessage.Create(
-						Envelope, _ordinaryUser, "user1", "John Doe", new[] {"admin", "other"}, "Johny123!");
-			}
-
-			[Test]
-			public void replies_unauthorized() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.IsFalse(updateResults[0].Success);
-				Assert.AreEqual(UserManagementMessage.Error.Unauthorized, updateResults[0].Error);
-			}
-
-			[Test]
-			public void does_not_create_a_user_account() {
-				_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
-				_queue.Process();
-				var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
-				Assert.NotNull(user);
-				Assert.IsFalse(user.Success);
-				Assert.AreEqual(UserManagementMessage.Error.NotFound, user.Error);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_creating_an_already_existing_user_account<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> GivenCommands() {
-				yield return
-					new UserManagementMessage.Create(
-						Envelope, SystemAccounts.System, "user1", "Existing John", new[] {"admin", "other"},
-						"existing!");
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return
-					new UserManagementMessage.Create(
-						Envelope, SystemAccounts.System, "user1", "John Doe", new[] {"bad"}, "Johny123!");
-			}
-
-			[Test]
-			public void replies_conflict() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.IsFalse(updateResults[0].Success);
-				Assert.AreEqual(UserManagementMessage.Error.Conflict, updateResults[0].Error);
-			}
-
-			[Test]
-			public void does_not_override_user_details() {
-				_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
-				_queue.Process();
-				var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
-				Assert.NotNull(user);
-				Assert.AreEqual("Existing John", user.Data.FullName);
-				Assert.AreEqual("user1", user.Data.LoginName);
-				Assert.NotNull(user.Data.Groups);
-				Assert.That(user.Data.Groups.Any(v => v == "admin"));
-				Assert.That(user.Data.Groups.Any(v => v == "other"));
-				Assert.AreEqual(false, user.Data.Disabled);
-			}
-
-			[Test]
-			public void does_not_override_user_password() {
-				HandledMessages.Clear();
-				_users.Handle(
-					new UserManagementMessage.ChangePassword(
-						Envelope, SystemAccounts.System, "user1", "existing!", "new-password"));
-				_queue.Process();
-				var updateResult = HandledMessages.OfType<UserManagementMessage.UpdateResult>().Last();
-				Assert.NotNull(updateResult);
-				Assert.IsTrue(updateResult.Success);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_updating_user_details<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> GivenCommands() {
-				yield return
-					new UserManagementMessage.Create(
-						Envelope, SystemAccounts.System, "user1", "John Doe", new[] {"admin", "other"}, "Johny123!");
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return
-					new UserManagementMessage.Update(
-						Envelope, SystemAccounts.System, "user1", "Doe John", new[] {"good"});
-			}
-
-			[Test]
-			public void replies_success() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.IsTrue(updateResults[0].Success);
-			}
-
-			[Test]
-			public void reply_has_the_correct_login_name() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.AreEqual("user1", updateResults[0].LoginName);
-			}
-
-			[Test]
-			public void updates_details() {
-				_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
-				_queue.Process();
-				var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
-				Assert.NotNull(user);
-				Assert.AreEqual("Doe John", user.Data.FullName);
-				Assert.AreEqual("user1", user.Data.LoginName);
-				Assert.NotNull(user.Data.Groups);
-				Assert.That(user.Data.Groups.All(v => v != "admin"));
-				Assert.That(user.Data.Groups.All(v => v != "other"));
-				Assert.That(user.Data.Groups.Any(v => v == "good"));
-				Assert.AreEqual(false, user.Data.Disabled);
-			}
-
-			[Test]
-			public void does_not_update_enabled() {
-				_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
-				_queue.Process();
-				var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
-				Assert.NotNull(user);
-				Assert.AreEqual(false, user.Data.Disabled);
-			}
-
-			[Test]
-			public void does_not_change_password() {
-				HandledMessages.Clear();
-				_users.Handle(
-					new UserManagementMessage.ChangePassword(
-						Envelope, SystemAccounts.System, "user1", "Johny123!", "new-password"));
-				_queue.Process();
-				var updateResult = HandledMessages.OfType<UserManagementMessage.UpdateResult>().Last();
-				Assert.NotNull(updateResult);
-				Assert.IsTrue(updateResult.Success);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_ordinary_user_attempts_to_update_its_own_details<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> GivenCommands() {
-				yield return
-					new UserManagementMessage.Create(
-						Envelope, SystemAccounts.System, "user1", "John Doe", new[] {"admin", "other"}, "Johny123!");
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return
-					new UserManagementMessage.Update(Envelope, _ordinaryUser, "user1", "Doe John", new[] {"good"});
-			}
-
-			[Test]
-			public void replies_unauthorized() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.IsFalse(updateResults[0].Success);
-				Assert.AreEqual(UserManagementMessage.Error.Unauthorized, updateResults[0].Error);
-			}
-
-			[Test]
-			public void details_are_not_changed() {
-				_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
-				_queue.Process();
-				var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
-				Assert.NotNull(user);
-				Assert.AreEqual("John Doe", user.Data.FullName);
-				Assert.AreEqual("user1", user.Data.LoginName);
-				Assert.NotNull(user.Data.Groups);
-				Assert.That(user.Data.Groups.Any(v => v == "admin"));
-				Assert.That(user.Data.Groups.Any(v => v == "other"));
-				Assert.AreEqual(false, user.Data.Disabled);
-			}
-
-			[Test]
-			public void does_not_update_enabled() {
-				_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
-				_queue.Process();
-				var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
-				Assert.NotNull(user);
-				Assert.AreEqual(false, user.Data.Disabled);
-			}
-
-			[Test]
-			public void does_not_change_password() {
-				HandledMessages.Clear();
-				_users.Handle(
-					new UserManagementMessage.ChangePassword(
-						Envelope, SystemAccounts.System, "user1", "Johny123!", "new-password"));
-				_queue.Process();
-				var updateResult = HandledMessages.OfType<UserManagementMessage.UpdateResult>().Last();
-				Assert.NotNull(updateResult);
-				Assert.IsTrue(updateResult.Success);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_updating_non_existing_user_details<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> GivenCommands() {
-				yield break;
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return
-					new UserManagementMessage.Update(
-						Envelope, SystemAccounts.System, "user1", "Doe John", new[] {"admin", "other"});
-			}
-
-			[Test]
-			public void replies_not_found() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.IsFalse(updateResults[0].Success);
-				Assert.AreEqual(UserManagementMessage.Error.NotFound, updateResults[0].Error);
-			}
-
-			[Test]
-			public void reply_has_the_correct_login_name() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.AreEqual("user1", updateResults[0].LoginName);
-			}
-
-			[Test]
-			public void does_not_create_a_user_account() {
-				_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
-				_queue.Process();
-				var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
-				Assert.NotNull(user);
-				Assert.IsFalse(user.Success);
-				Assert.AreEqual(UserManagementMessage.Error.NotFound, user.Error);
-				Assert.Null(user.Data);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_updating_a_disabled_user_account_details<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> GivenCommands() {
-				var replyTo = Envelope;
-				yield return
-					new UserManagementMessage.Create(
-						replyTo, SystemAccounts.System, "user1", "John Doe", new[] {"admin", "other"}, "Johny123!");
-				yield return new UserManagementMessage.Disable(replyTo, SystemAccounts.System, "user1");
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return
-					new UserManagementMessage.Update(
-						Envelope, SystemAccounts.System, "user1", "Doe John", new[] {"good"});
-			}
-
-			[Test]
-			public void replies_success() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.IsTrue(updateResults[0].Success);
-			}
-
-			[Test]
-			public void does_not_update_enabled() {
-				_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
-				_queue.Process();
-				var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
-				Assert.NotNull(user);
-				Assert.AreEqual(true, user.Data.Disabled);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_disabling_an_enabled_user_account<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> GivenCommands() {
-				yield return
-					new UserManagementMessage.Create(
-						Envelope, SystemAccounts.System, "user1", "John Doe", new[] {"admin", "other"}, "Johny123!");
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return new UserManagementMessage.Disable(Envelope, SystemAccounts.System, "user1");
-			}
-
-			[Test]
-			public void replies_success_with_correct_login_name_set() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.IsTrue(updateResults[0].Success);
-				Assert.AreEqual("user1", updateResults[0].LoginName);
-			}
-
-			[Test]
-			public void disables_user_account() {
-				_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
-				_queue.Process();
-				var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
-				Assert.NotNull(user);
-				Assert.AreEqual(true, user.Data.Disabled);
-			}
-
-			[Test]
-			public void writes_password_changed_event() {
-				var writePasswordChanged = HandledPasswordChangedNotificationWrites();
-				Assert.AreEqual(1, writePasswordChanged.Length);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_an_ordinary_user_attempts_to_disable_a_user_account<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> GivenCommands() {
-				yield return
-					new UserManagementMessage.Create(
-						Envelope, SystemAccounts.System, "user1", "John Doe", new[] {"admin", "other"}, "Johny123!");
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return new UserManagementMessage.Disable(Envelope, _ordinaryUser, "user1");
-			}
-
-			[Test]
-			public void replies_unauthorized() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.IsFalse(updateResults[0].Success);
-				Assert.AreEqual(UserManagementMessage.Error.Unauthorized, updateResults[0].Error);
-			}
-
-			[Test]
-			public void user_account_is_not_disabled() {
-				_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
-				_queue.Process();
-				var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
-				Assert.NotNull(user);
-				Assert.AreEqual(false, user.Data.Disabled);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_disabling_a_disabled_user_account<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> GivenCommands() {
-				var replyTo = Envelope;
-				yield return
-					new UserManagementMessage.Create(
-						replyTo, SystemAccounts.System, "user1", "John Doe", new[] {"admin", "other"}, "Johny123!");
-				yield return new UserManagementMessage.Disable(replyTo, SystemAccounts.System, "user1");
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return new UserManagementMessage.Disable(Envelope, SystemAccounts.System, "user1");
-			}
-
-			[Test]
-			public void replies_success_with_correct_login_name_set() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.IsTrue(updateResults[0].Success);
-				Assert.AreEqual("user1", updateResults[0].LoginName);
-			}
-
-			[Test]
-			public void keeps_disabled() {
-				_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
-				_queue.Process();
-				var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
-				Assert.NotNull(user);
-				Assert.AreEqual(true, user.Data.Disabled);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_enabling_a_disabled_user_account<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> GivenCommands() {
-				var replyTo = Envelope;
-				yield return
-					new UserManagementMessage.Create(
-						replyTo, SystemAccounts.System, "user1", "John Doe", new[] {"admin", "other"}, "Johny123!");
-				yield return new UserManagementMessage.Disable(replyTo, SystemAccounts.System, "user1");
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return new UserManagementMessage.Enable(Envelope, SystemAccounts.System, "user1");
-			}
-
-			[Test]
-			public void replies_success_with_correct_login_name_set() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.IsTrue(updateResults[0].Success);
-				Assert.AreEqual("user1", updateResults[0].LoginName);
-			}
-
-			[Test]
-			public void enables_user_account() {
-				_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
-				_queue.Process();
-				var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
-				Assert.NotNull(user);
-				Assert.AreEqual(false, user.Data.Disabled);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_an_ordinary_user_attempts_to_enable_a_user_account<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> GivenCommands() {
-				var replyTo = Envelope;
-				yield return
-					new UserManagementMessage.Create(
-						replyTo, SystemAccounts.System, "user1", "John Doe", new[] {"admin", "other"}, "Johny123!");
-				yield return new UserManagementMessage.Disable(replyTo, SystemAccounts.System, "user1");
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return new UserManagementMessage.Enable(Envelope, _ordinaryUser, "user1");
-			}
-
-			[Test]
-			public void replies_unauthorized() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.IsFalse(updateResults[0].Success);
-				Assert.AreEqual(UserManagementMessage.Error.Unauthorized, updateResults[0].Error);
-			}
-
-			[Test]
-			public void user_account_is_not_enabled() {
-				_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
-				_queue.Process();
-				var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
-				Assert.NotNull(user);
-				Assert.AreEqual(true, user.Data.Disabled);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_enabling_an_enabled_user_account<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> GivenCommands() {
-				yield return
-					new UserManagementMessage.Create(
-						Envelope, SystemAccounts.System, "user1", "John Doe", new[] {"admin", "other"}, "Johny123!");
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return new UserManagementMessage.Enable(Envelope, SystemAccounts.System, "user1");
-			}
-
-			[Test]
-			public void replies_success_with_correct_login_name_set() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.IsTrue(updateResults[0].Success);
-				Assert.AreEqual("user1", updateResults[0].LoginName);
-			}
-
-			[Test]
-			public void keeps_enabled() {
-				_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
-				_queue.Process();
-				var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
-				Assert.NotNull(user);
-				Assert.AreEqual(false, user.Data.Disabled);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_resetting_the_password<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> GivenCommands() {
-				yield return
-					new UserManagementMessage.Create(
-						Envelope, SystemAccounts.System, "user1", "John Doe", new[] {"admin", "other"}, "Johny123!");
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return
-					new UserManagementMessage.ResetPassword(Envelope, SystemAccounts.System, "user1", "new-password");
-			}
-
-			[Test]
-			public void replies_success() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.IsTrue(updateResults[0].Success);
-			}
-
-			[Test]
-			public void reply_has_the_correct_login_name() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.AreEqual("user1", updateResults[0].LoginName);
-			}
-
-			[Test]
-			public void does_not_update_details() {
-				_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
-				_queue.Process();
-				var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
-				Assert.NotNull(user);
-				Assert.AreEqual("John Doe", user.Data.FullName);
-				Assert.AreEqual("user1", user.Data.LoginName);
-				Assert.AreEqual(false, user.Data.Disabled);
-			}
-
-			[Test]
-			public void changes_password() {
-				HandledMessages.Clear();
-				_users.Handle(
-					new UserManagementMessage.ChangePassword(
-						Envelope, SystemAccounts.System, "user1", "new-password", "other-password"));
-				_queue.Process();
-				var updateResult = HandledMessages.OfType<UserManagementMessage.UpdateResult>().Last();
-				Assert.NotNull(updateResult);
-				Assert.IsTrue(updateResult.Success);
-			}
-
-			[Test]
-			public void writes_password_changed_event() {
-				var writePasswordChanged = HandledPasswordChangedNotificationWrites();
-				Assert.AreEqual(1, writePasswordChanged.Length);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_resetting_the_password_twice<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> GivenCommands() {
-				yield return
-					new UserManagementMessage.Create(
-						Envelope, SystemAccounts.System, "user1", "John Doe", new[] {"admin", "other"}, "Johny123!");
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				var replyTo = Envelope;
-				yield return
-					new UserManagementMessage.ResetPassword(replyTo, SystemAccounts.System, "user1", "new-password");
-				yield return
-					new UserManagementMessage.ResetPassword(replyTo, SystemAccounts.System, "user1", "new-password");
-			}
-
-			[Test]
-			public void replies_success() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(2, updateResults.Count);
-				Assert.IsTrue(updateResults[0].Success);
-				Assert.IsTrue(updateResults[1].Success);
-			}
-
-			[Test]
-			public void configures_password_changed_notification_system_stream_only_once() {
-				var writePasswordChanged = HandledPasswordChangedNotificationMetaStreamWrites();
-				Assert.AreEqual(1, writePasswordChanged.Length);
-				var passwordChangedEvent = writePasswordChanged[0].Events.Single();
-				HelperExtensions.AssertJson(new {___maxAge = 3600}, passwordChangedEvent.Data.ParseJson<JObject>());
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_ordinary_user_attempts_to_reset_its_own_password<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> GivenCommands() {
-				yield return
-					new UserManagementMessage.Create(
-						Envelope, SystemAccounts.System, "user1", "John Doe", new[] {"admin", "other"}, "Johny123!");
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return
-					new UserManagementMessage.ResetPassword(Envelope, _ordinaryUser, "user1", "new-password");
-			}
-
-			[Test]
-			public void replies_unauthorized() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.IsFalse(updateResults[0].Success);
-				Assert.AreEqual(UserManagementMessage.Error.Unauthorized, updateResults[0].Error);
-			}
-
-			[Test]
-			public void password_is_not_changed() {
-				HandledMessages.Clear();
-				_users.Handle(
-					new UserManagementMessage.ChangePassword(
-						Envelope, SystemAccounts.System, "user1", "Johny123!", "other-password"));
-				_queue.Process();
-				var updateResult = HandledMessages.OfType<UserManagementMessage.UpdateResult>().Last();
-				Assert.NotNull(updateResult);
-				Assert.IsTrue(updateResult.Success);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_changing_a_password_with_correct_current_password<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> GivenCommands() {
-				yield return
-					new UserManagementMessage.Create(
-						Envelope, SystemAccounts.System, "user1", "John Doe", new[] {"admin", "other"}, "Johny123!");
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return
-					new UserManagementMessage.ChangePassword(
-						Envelope, SystemAccounts.System, "user1", "Johny123!", "new-password");
-			}
-
-			[Test]
-			public void replies_success() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.IsTrue(updateResults[0].Success);
-			}
-
-			[Test]
-			public void reply_has_the_correct_login_name() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.AreEqual("user1", updateResults[0].LoginName);
-			}
-
-			[Test]
-			public void does_not_update_details() {
-				_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
-				_queue.Process();
-				var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
-				Assert.NotNull(user);
-				Assert.AreEqual("John Doe", user.Data.FullName);
-				Assert.AreEqual("user1", user.Data.LoginName);
-				Assert.AreEqual(false, user.Data.Disabled);
-			}
-
-			[Test]
-			public void changes_password() {
-				HandledMessages.Clear();
-				_users.Handle(
-					new UserManagementMessage.ChangePassword(
-						Envelope, SystemAccounts.System, "user1", "new-password", "other-password"));
-				_queue.Process();
-				var updateResult = HandledMessages.OfType<UserManagementMessage.UpdateResult>().Last();
-				Assert.NotNull(updateResult);
-				Assert.IsTrue(updateResult.Success);
-			}
-
-			[Test]
-			public void writes_password_changed_event() {
-				var writePasswordChanged = HandledPasswordChangedNotificationWrites();
-				Assert.AreEqual(1, writePasswordChanged.Length);
-			}
-
-			[Test]
-			public void configures_password_changed_notification_system_stream() {
-				var writePasswordChanged = HandledPasswordChangedNotificationMetaStreamWrites();
-				Assert.AreEqual(1, writePasswordChanged.Length);
-				var passwordChangedEvent = writePasswordChanged[0].Events.Single();
-				HelperExtensions.AssertJson(new {___maxAge = 3600}, passwordChangedEvent.Data.ParseJson<JObject>());
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_changing_a_password_with_incorrect_current_password<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> GivenCommands() {
-				yield return
-					new UserManagementMessage.Create(
-						Envelope, SystemAccounts.System, "user1", "John Doe", new[] {"admin", "other"}, "Johny123!");
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return
-					new UserManagementMessage.ChangePassword(
-						Envelope, SystemAccounts.System, "user1", "incorrect", "new-password");
-			}
-
-			[Test]
-			public void replies_unauthorized() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.IsFalse(updateResults[0].Success);
-				Assert.AreEqual(UserManagementMessage.Error.Unauthorized, updateResults[0].Error);
-			}
-
-			[Test]
-			public void reply_has_the_correct_login_name() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.AreEqual("user1", updateResults[0].LoginName);
-			}
-
-			[Test]
-			public void does_not_update_details() {
-				_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
-				_queue.Process();
-				var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
-				Assert.NotNull(user);
-				Assert.AreEqual("John Doe", user.Data.FullName);
-				Assert.AreEqual("user1", user.Data.LoginName);
-				Assert.AreEqual(false, user.Data.Disabled);
-			}
-
-			[Test]
-			public void does_not_change_the_password() {
-				HandledMessages.Clear();
-				_users.Handle(
-					new UserManagementMessage.ChangePassword(
-						Envelope, SystemAccounts.System, "user1", "Johny123!", "other-password"));
-				_queue.Process();
-				var updateResult = HandledMessages.OfType<UserManagementMessage.UpdateResult>().Last();
-				Assert.NotNull(updateResult);
-				Assert.IsTrue(updateResult.Success);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_deleting_an_existing_user_account<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> GivenCommands() {
-				yield return
-					new UserManagementMessage.Create(
-						Envelope, SystemAccounts.System, "user1", "John Doe", new[] {"admin", "other"}, "Johny123!");
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return new UserManagementMessage.Delete(Envelope, SystemAccounts.System, "user1");
-			}
-
-			[Test]
-			public void replies_success() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.IsTrue(updateResults[0].Success);
-			}
-
-			[Test]
-			public void reply_has_the_correct_login_name() {
-				var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
-				Assert.AreEqual(1, updateResults.Count);
-				Assert.AreEqual("user1", updateResults[0].LoginName);
-			}
-
-			[Test]
-			public void deletes_the_user_account() {
-				_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
-				_queue.Process();
-				var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
-				Assert.NotNull(user);
-				Assert.IsFalse(user.Success);
-				Assert.AreEqual(UserManagementMessage.Error.NotFound, user.Error);
-				Assert.Null(user.Data);
-			}
-
-			[Test]
-			public void writes_password_changed_event() {
-				var writePasswordChanged = HandledPasswordChangedNotificationWrites();
-				Assert.AreEqual(1, writePasswordChanged.Length);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_getting_all_users<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> GivenCommands() {
-				var replyTo = Envelope;
-				yield return
-					new UserManagementMessage.Create(
-						replyTo, SystemAccounts.System, "user1", "John Doe 1", new[] {"admin1", "other"},
-						"Johny123!");
-				yield return
-					new UserManagementMessage.Create(
-						replyTo, SystemAccounts.System, "user2", "John Doe 2", new[] {"admin2", "other"},
-						"Johny123!");
-				yield return
-					new UserManagementMessage.Create(
-						replyTo, SystemAccounts.System, "user3", "Another Doe 1", new[] {"admin3", "other"},
-						"Johny123!");
-				yield return
-					new UserManagementMessage.Create(
-						replyTo, SystemAccounts.System, "another_user", "Another Doe 2", new[] {"admin4", "other"},
-						"Johny123!");
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return new UserManagementMessage.GetAll(Envelope, SystemAccounts.System);
-			}
-
-			[Test]
-			public void returns_all_user_accounts() {
-				var users = HandledMessages.OfType<UserManagementMessage.AllUserDetailsResult>().Single().Data;
-
-				Assert.AreEqual(4, users.Length);
-			}
-
-			[Test]
-			public void returns_in_the_login_name_order() {
-				var users = HandledMessages.OfType<UserManagementMessage.AllUserDetailsResult>().Single().Data;
-
-				Assert.That(
-					new[] {"another_user", "user1", "user2", "user3"}.SequenceEqual(users.Select(v => v.LoginName)));
-			}
-
-			[Test]
-			public void returns_full_names() {
-				var users = HandledMessages.OfType<UserManagementMessage.AllUserDetailsResult>().Single().Data;
-
-				Assert.That(users.Any(v => v.LoginName == "user2" && v.FullName == "John Doe 2"));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/VNode/InaugurationManager/InaugurationManagerTests.cs b/src/EventStore.Core.Tests/Services/VNode/InaugurationManager/InaugurationManagerTests.cs
deleted file mode 100644
index 77677f1e9e2..00000000000
--- a/src/EventStore.Core.Tests/Services/VNode/InaugurationManager/InaugurationManagerTests.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using System;
-using System.Net;
-using EventStore.Core.Cluster;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.VNode;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.VNode.InaugurationManagement {
-	public abstract class InaugurationManagerTests {
-		protected readonly Guid _correlationId1 = Guid.Parse("00000000-0000-0000-0000-0000000000c1");
-		protected readonly Guid _correlationId2 = Guid.Parse("00000000-0000-0000-0000-0000000000c2");
-		protected readonly Guid _correlationId3 = Guid.Parse("00000000-0000-0000-0000-0000000000c3");
-		protected readonly int _epochNumber = 15;
-		protected readonly MemberInfo _leader =
-			MemberInfo.ForVNode(
-				default, default, default, default,
-				new DnsEndPoint("localhost", default), default, default, default,
-				new DnsEndPoint("localhost", default), default, default, default,
-				default, default, default, default, default, default, default, default);
-		protected readonly long _replicationTarget = 400;
-		protected readonly long _indexTarget = 400;
-
-		protected InaugurationManager _sut;
-		protected FakePublisher _publisher;
-		protected InMemoryCheckpoint _replicationCheckpoint;
-		protected InMemoryCheckpoint _indexCheckpoint;
-
-		[SetUp]
-		public void SetUp() {
-			_publisher = new FakePublisher();
-			_replicationCheckpoint = new InMemoryCheckpoint();
-			_indexCheckpoint = new InMemoryCheckpoint();
-			_sut = new InaugurationManager(_publisher, _replicationCheckpoint, _indexCheckpoint, new NodeStatusTracker.NoOp());
-			Given();
-		}
-
-		protected abstract void Given();
-
-		protected void When(Message m) {
-			_sut.Handle((dynamic)m);
-		}
-
-		protected SystemMessage.EpochWritten GenEpoch(int epochNumber) {
-			var epoch = new SystemMessage.EpochWritten(new EpochRecord(
-							epochPosition: _replicationTarget - 1,
-							epochNumber: epochNumber,
-							epochId: Guid.NewGuid(),
-							prevEpochPosition: _replicationTarget - 20,
-							timeStamp: DateTime.UtcNow,
-							leaderInstanceId: Guid.NewGuid()));
-			return epoch;
-		}
-
-		protected void ProgressReplication() {
-			_replicationCheckpoint.Write(_replicationTarget / 2);
-			_replicationCheckpoint.Flush();
-		}
-
-		protected void CompleteReplication() {
-			_replicationCheckpoint.Write(_replicationTarget);
-			_replicationCheckpoint.Flush();
-		}
-
-		protected void ProgressIndexing() {
-			_indexCheckpoint.Write(_indexTarget / 2);
-			_indexCheckpoint.Flush();
-		}
-
-		protected void CompleteIndexing() {
-			_indexCheckpoint.Write(_indexTarget);
-			_indexCheckpoint.Flush();
-		}
-
-		protected static T AssertIsType<T>(object o) {
-			Assert.IsInstanceOf<T>(o);
-			return (T)o;
-		}
-
-		// check that we have reset to initial state, do this by checking we can
-		// proceed forward from it
-		protected void AssertInitial() {
-			Assert.IsEmpty(_publisher.Messages);
-			_sut.Handle(new SystemMessage.BecomePreLeader(_correlationId3));
-			AssertWaitingForChaser(_correlationId3);
-		}
-
-		// check that we have reset to waiting fo chaser, do this by checking we can
-		// proceed forward from it
-		protected void AssertWaitingForChaser(Guid expectedCorrelationId) {
-			Assert.IsEmpty(_publisher.Messages);
-			_sut.Handle(new SystemMessage.ChaserCaughtUp(expectedCorrelationId));
-			Assert.AreEqual(1, _publisher.Messages.Count);
-			Assert.IsInstanceOf<SystemMessage.WriteEpoch>(_publisher.Messages[0]);
-		}
-
-		protected void AssertSentBecomeLeader() {
-			Assert.AreEqual(1, _publisher.Messages.Count);
-			var becomeLeader = AssertIsType<SystemMessage.BecomeLeader>(_publisher.Messages[0]);
-			Assert.AreEqual(_correlationId1, becomeLeader.CorrelationId);
-			_publisher.Messages.Clear();
-			AssertInitial();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/VNode/InaugurationManager/given_initial_state.cs b/src/EventStore.Core.Tests/Services/VNode/InaugurationManager/given_initial_state.cs
deleted file mode 100644
index 0dbb4b66e3f..00000000000
--- a/src/EventStore.Core.Tests/Services/VNode/InaugurationManager/given_initial_state.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.VNode.InaugurationManagement {
-	[TestFixture]
-	public class given_initial_state : InaugurationManagerTests {
-		protected override void Given() {
-			_publisher.Messages.Clear();
-		}
-
-		[Test]
-		public void when_become_pre_leader() {
-			When(new SystemMessage.BecomePreLeader(_correlationId1));
-			AssertWaitingForChaser(_correlationId1);
-		}
-
-		[Test]
-		public void when_become_other_node_state() {
-			When(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
-			AssertInitial();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/VNode/InaugurationManager/given_waiting_for_chaser.cs b/src/EventStore.Core.Tests/Services/VNode/InaugurationManager/given_waiting_for_chaser.cs
deleted file mode 100644
index 1584ad586f9..00000000000
--- a/src/EventStore.Core.Tests/Services/VNode/InaugurationManager/given_waiting_for_chaser.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.VNode.InaugurationManagement {
-
-	[TestFixture]
-	public class given_waiting_for_chaser : InaugurationManagerTests {
-		protected override void Given() {
-			_sut.Handle(new ElectionMessage.ElectionsDone(123, _epochNumber, _leader));
-			_sut.Handle(new SystemMessage.BecomePreLeader(_correlationId1));
-			_publisher.Messages.Clear();
-		}
-
-		[Test]
-		public void when_chaser_caught_up() {
-			When(new SystemMessage.ChaserCaughtUp(_correlationId1));
-			Assert.AreEqual(1, _publisher.Messages.Count);
-			var writeEpoch = AssertIsType<SystemMessage.WriteEpoch>(_publisher.Messages[0]);
-			Assert.AreEqual(_epochNumber, writeEpoch.EpochNumber);
-		}
-
-		[Test]
-		public void when_chaser_caught_up_with_unknown_correlation_id() {
-			When(new SystemMessage.ChaserCaughtUp(_correlationId2));
-			Assert.IsEmpty(_publisher.Messages);
-		}
-
-		[Test]
-		public void when_become_pre_leader() {
-			When(new SystemMessage.BecomePreLeader(_correlationId2));
-			AssertWaitingForChaser(_correlationId2);
-		}
-
-		[Test]
-		public void when_become_other_node_state() {
-			When(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
-			AssertInitial();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/VNode/InaugurationManager/given_waiting_for_conditions.cs b/src/EventStore.Core.Tests/Services/VNode/InaugurationManager/given_waiting_for_conditions.cs
deleted file mode 100644
index cb0667d492f..00000000000
--- a/src/EventStore.Core.Tests/Services/VNode/InaugurationManager/given_waiting_for_conditions.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.VNode.InaugurationManagement {
-	[TestFixture]
-	public class given_waiting_for_conditions : InaugurationManagerTests {
-		protected override void Given() {
-			_sut.Handle(new ElectionMessage.ElectionsDone(123, _epochNumber, _leader));
-			_sut.Handle(new SystemMessage.BecomePreLeader(_correlationId1));
-			_sut.Handle(new SystemMessage.ChaserCaughtUp(_correlationId1));
-			_sut.Handle(GenEpoch(_epochNumber));
-			_publisher.Messages.Clear();
-		}
-
-		[Test]
-		public void when_transition_triggered_by_indexedto() {
-			ProgressReplication();
-			ProgressIndexing();
-			CompleteReplication();
-			CompleteIndexing();
-			Assert.IsEmpty(_publisher.Messages);
-
-			When(new ReplicationTrackingMessage.IndexedTo(_indexCheckpoint.Read()));
-
-			AssertSentBecomeLeader();
-		}
-
-		[Test]
-		public void when_transition_triggered_by_replicatedto() {
-			ProgressReplication();
-			ProgressIndexing();
-			CompleteReplication();
-			CompleteIndexing();
-			Assert.IsEmpty(_publisher.Messages);
-
-			When(new ReplicationTrackingMessage.ReplicatedTo(_replicationCheckpoint.Read()));
-
-			AssertSentBecomeLeader();
-		}
-
-		[Test]
-		public void when_transition_triggered_by_checkconditions() {
-			CompleteReplication();
-			CompleteIndexing();
-			Assert.IsEmpty(_publisher.Messages);
-
-			When(new SystemMessage.CheckInaugurationConditions());
-
-			Assert.AreEqual(2, _publisher.Messages.Count);
-			Assert.IsInstanceOf<TimerMessage.Schedule>(_publisher.Messages[0]);
-			_publisher.Messages.RemoveAt(0);
-
-			AssertSentBecomeLeader();
-		}
-
-		[Test]
-		public void cant_become_leader_twice() {
-			CompleteReplication();
-			CompleteIndexing();
-			Assert.IsEmpty(_publisher.Messages);
-
-			When(new ReplicationTrackingMessage.ReplicatedTo(_replicationCheckpoint.Read()));
-			When(new SystemMessage.CheckInaugurationConditions());
-
-			AssertSentBecomeLeader();
-		}
-
-		[Test]
-		public void when_epoch_written() {
-			When(GenEpoch(_epochNumber));
-			Assert.IsEmpty(_publisher.Messages);
-		}
-
-		[Test]
-		public void when_chaser_caught_up() {
-			When(new SystemMessage.ChaserCaughtUp(_correlationId1));
-			Assert.IsEmpty(_publisher.Messages);
-		}
-
-		[Test]
-		public void when_become_pre_leader() {
-			When(new SystemMessage.BecomePreLeader(_correlationId2));
-			AssertWaitingForChaser(_correlationId2);
-		}
-
-		[Test]
-		public void when_become_other_node_state() {
-			When(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
-			AssertInitial();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/VNode/InaugurationManager/given_writing_epoch.cs b/src/EventStore.Core.Tests/Services/VNode/InaugurationManager/given_writing_epoch.cs
deleted file mode 100644
index f345220c711..00000000000
--- a/src/EventStore.Core.Tests/Services/VNode/InaugurationManager/given_writing_epoch.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.VNode.InaugurationManagement {
-	[TestFixture]
-	public class given_writing_epoch : InaugurationManagerTests {
-		protected override void Given() {
-			_sut.Handle(new ElectionMessage.ElectionsDone(123, _epochNumber, _leader));
-			_sut.Handle(new SystemMessage.BecomePreLeader(_correlationId1));
-			_sut.Handle(new SystemMessage.ChaserCaughtUp(_correlationId1));
-			_publisher.Messages.Clear();
-		}
-
-		[Test]
-		public void when_epoch_written() {
-			When(GenEpoch(_epochNumber));
-			Assert.AreEqual(2, _publisher.Messages.Count);
-			Assert.IsInstanceOf<SystemMessage.EnablePreLeaderReplication>(_publisher.Messages[0]);
-			var schedule = AssertIsType<TimerMessage.Schedule>(_publisher.Messages[1]);
-			Assert.IsInstanceOf<SystemMessage.CheckInaugurationConditions>(schedule.ReplyMessage);
-		}
-
-		[Test]
-		public void when_epoch_written_with_unexpected_number() {
-			When(GenEpoch(_epochNumber + 1));
-			Assert.IsEmpty(_publisher.Messages);
-		}
-
-		[Test]
-		public void when_epoch_written_and_conditions_instantly_met() {
-			CompleteReplication();
-			CompleteIndexing();
-			When(GenEpoch(_epochNumber));
-
-			Assert.AreEqual(3, _publisher.Messages.Count);
-			Assert.IsInstanceOf<SystemMessage.EnablePreLeaderReplication>(_publisher.Messages[0]);
-			Assert.IsInstanceOf<SystemMessage.BecomeLeader>(_publisher.Messages[1]);
-			Assert.IsInstanceOf<TimerMessage.Schedule>(_publisher.Messages[2]);
-		}
-
-		[Test]
-		public void when_chaser_caught_up() {
-			When(new SystemMessage.ChaserCaughtUp(_correlationId1));
-			Assert.IsEmpty(_publisher.Messages);
-		}
-
-		[Test]
-		public void when_become_pre_leader() {
-			When(new SystemMessage.BecomePreLeader(_correlationId2));
-			AssertWaitingForChaser(_correlationId2);
-		}
-
-		[Test]
-		public void when_become_other_node_state() {
-			When(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
-			AssertInitial();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Services/VNode/subsystem_should.cs b/src/EventStore.Core.Tests/Services/VNode/subsystem_should.cs
deleted file mode 100644
index d11f33e4426..00000000000
--- a/src/EventStore.Core.Tests/Services/VNode/subsystem_should.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Plugins;
-using EventStore.Plugins.Subsystems;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.VNode;
-
-[TestFixture]
-public class subsystem_should : SpecificationWithDirectory {
-	[Test]
-	public async Task report_as_initialised_after_being_started_successfully() {
-		var tcs = new TaskCompletionSource();
-
-		await using var node = new MiniNode<LogFormat.V2,string>(PathName, subsystems: [ new FakeSubSystem() ]);
-		node.Node.MainBus.Subscribe(new AdHocHandler<SystemMessage.SystemReady>( t => {
-			tcs.TrySetResult();
-		}));
-
-		_ = node.Start();
-
-		// SystemReady is received after all subsystems have started.
-		await tcs.Task.WithTimeout(TimeSpan.FromSeconds(5));
-	}
-
-	class FakeSubSystem() : SubsystemsPlugin("FakeSubSystem");
-}
diff --git a/src/EventStore.Core.Tests/Services/VNode/vnode_fsm_should.cs b/src/EventStore.Core.Tests/Services/VNode/vnode_fsm_should.cs
deleted file mode 100644
index f715b4767ab..00000000000
--- a/src/EventStore.Core.Tests/Services/VNode/vnode_fsm_should.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System.Threading.Tasks;
-using DotNext.Runtime;
-using EventStore.Core.Data;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.VNode;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Services.VNode {
-	internal abstract class P : Message {
-	}
-
-	internal class A : P {
-	}
-
-	internal class B : P {
-	}
-
-	internal class C : Message {
-	}
-
-	[TestFixture]
-	public class vnode_fsm_should {
-		[Test]
-		public async Task allow_ignoring_messages_by_common_ancestor() {
-			var fsm = new VNodeFSMBuilder(new ValueReference<VNodeState>(VNodeState.Leader))
-				.InAnyState()
-				.When<P>().Ignore()
-				.WhenOther().Do(x => Assert.Fail("{0} slipped through", x.GetType().Name))
-				.Build();
-
-			await fsm.HandleAsync(new A());
-			await fsm.HandleAsync(new B());
-		}
-
-		[Test]
-		public async Task handle_specific_message_even_if_base_message_is_ignored() {
-			bool aHandled = false;
-			var fsm = new VNodeFSMBuilder(new ValueReference<VNodeState>(VNodeState.Leader))
-				.InAnyState()
-				.When<P>().Ignore()
-				.When<A>().Do(x => aHandled = true)
-				.WhenOther().Do(x => Assert.Fail("{0} slipped through", x.GetType().Name))
-				.Build();
-
-			await fsm.HandleAsync(new A());
-			await fsm.HandleAsync(new B());
-
-			Assert.IsTrue(aHandled);
-		}
-
-		[Test]
-		public async Task ignore_base_handler_if_derived_message_published() {
-			var fsm = new VNodeFSMBuilder(new ValueReference<VNodeState>(VNodeState.Leader))
-				.InAnyState()
-				.When<P>()
-				.Do(x => Assert.Fail("shouldn't call this"))
-
-				.InState(VNodeState.Leader)
-				.When<A>()
-				.Ignore()
-				.Build();
-
-			await fsm.HandleAsync(new A());
-		}
-
-		[Test]
-		public async Task ignore_base_handler_if_derived_message_published_diff_reg_order() {
-			var fsm = new VNodeFSMBuilder(new ValueReference<VNodeState>(VNodeState.Leader))
-				.InState(VNodeState.Leader)
-				.When<A>()
-				.Ignore()
-
-				.InAnyState()
-				.When<P>()
-				.Do(x => Assert.Fail("shouldn't call this"))
-				.Build();
-
-			await fsm.HandleAsync(new A());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Settings/ReaderThreadCountCalculatorTests.cs b/src/EventStore.Core.Tests/Settings/ReaderThreadCountCalculatorTests.cs
deleted file mode 100644
index 20e58c1d4a6..00000000000
--- a/src/EventStore.Core.Tests/Settings/ReaderThreadCountCalculatorTests.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using EventStore.Core.Settings;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Settings {
-	[TestFixture]
-	public class ReaderThreadCountCalculatorTests {
-		[TestCase]
-		public void configured_takes_precedence() => Test(configuredCount: 1, processorCount: 4, isRunningInContainer: false, expected: 1);
-
-		[TestCase]
-		public void enforces_minimum() => Test(configuredCount: 0, processorCount: 1, isRunningInContainer: false, expected: 4);
-
-		[TestCase]
-		public void enforces_maximum() => Test(configuredCount: 0, processorCount: 20, isRunningInContainer: false, expected: 16);
-
-		[TestCase]
-		public void at_3_cores() => Test(configuredCount: 0, processorCount: 3, isRunningInContainer: false, expected: 6);
-
-		[TestCase]
-		public void at_4_cores() => Test(configuredCount: 0, processorCount: 4, isRunningInContainer: false, expected: 8);
-
-		[TestCase]
-		public void at_6_cores() => Test(configuredCount: 0, processorCount: 6, isRunningInContainer: false, expected: 12);
-
-		[TestCase]
-		public void running_in_docker_container_at_6_cores() => Test(configuredCount: 0, processorCount: 6, isRunningInContainer: true, expected: 4);
-
-		[TestCase]
-		public void running_in_docker_container_configured_takes_precedence() => Test(configuredCount: 1, processorCount: 4, isRunningInContainer: true, expected: 1);
-
-		public static void Test(int configuredCount, int processorCount, bool isRunningInContainer, int expected) =>
-			Assert.AreEqual(expected, ThreadCountCalculator.CalculateReaderThreadCount(configuredCount, processorCount, isRunningInContainer));
-	}
-}
diff --git a/src/EventStore.Core.Tests/Settings/WorkerThreadCountCalculatorTests.cs b/src/EventStore.Core.Tests/Settings/WorkerThreadCountCalculatorTests.cs
deleted file mode 100644
index 3555197f5da..00000000000
--- a/src/EventStore.Core.Tests/Settings/WorkerThreadCountCalculatorTests.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using EventStore.Core.Settings;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.Settings {
-	[TestFixture]
-	public class WorkerThreadCountCalculatorTests {
-		[TestCase]
-		public void configured_takes_precedence() => Test(configuredCount: 1, readerCount: 10, isRunningInContainer: false, expected: 1);
-
-		[TestCase]
-		public void enforces_minimum() => Test(configuredCount: 0, readerCount: 1, isRunningInContainer: false, expected: 5);
-
-		[TestCase]
-		public void enforces_maximum() => Test(configuredCount: 0, readerCount: 1000, isRunningInContainer: false, expected: 10);
-
-		[TestCase]
-		public void at_4_reader_threads() => Test(configuredCount: 0, readerCount: 4, isRunningInContainer: false, expected: 5);
-
-		[TestCase]
-		public void at_increased_reader_threads() => Test(configuredCount: 0, readerCount: 8, isRunningInContainer: false, expected: 10);
-
-		[TestCase]
-		public void running_in_docker_container_configured_takes_precedence() => Test(configuredCount: 1, readerCount: 4, isRunningInContainer: true, expected: 1);
-
-		[TestCase]
-		public void running_in_docker_container_at_4_reader_threads() => Test(configuredCount: 0, readerCount: 4, isRunningInContainer: true, expected: 5);
-
-		public static void Test(int configuredCount, int readerCount, bool isRunningInContainer, int expected) =>
-			Assert.AreEqual(expected, ThreadCountCalculator.CalculateWorkerThreadCount(configuredCount, readerCount, isRunningInContainer));
-
-	}
-}
diff --git a/src/EventStore.Core.Tests/SpecificationWithDirectory.cs b/src/EventStore.Core.Tests/SpecificationWithDirectory.cs
deleted file mode 100644
index e1179f6c59a..00000000000
--- a/src/EventStore.Core.Tests/SpecificationWithDirectory.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests {
-	public class SpecificationWithDirectory {
-		protected string PathName;
-
-		protected string GetTempFilePath() {
-			return Path.Combine(PathName, string.Format("{0}-{1}", Guid.NewGuid(), GetType().FullName));
-		}
-
-		protected string GetFilePathFor(string fileName) {
-			return Path.Combine(PathName, fileName);
-		}
-
-		[SetUp]
-		public virtual Task SetUp() {
-			var typeName = GetType().Name.Length > 30 ? GetType().Name.Substring(0, 30) : GetType().Name;
-			PathName = Path.Combine(Path.GetTempPath(), string.Format("ES-{0}-{1}", Guid.NewGuid(), typeName));
-			Directory.CreateDirectory(PathName);
-
-			return Task.CompletedTask;
-		}
-
-		[TearDown]
-		public virtual async Task TearDown() {
-			// kill whole tree
-			await DirectoryDeleter.TryForceDeleteDirectoryAsync(PathName, retries: 10);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/SpecificationWithDirectoryPerTestFixture.cs b/src/EventStore.Core.Tests/SpecificationWithDirectoryPerTestFixture.cs
deleted file mode 100644
index a8fa10fb515..00000000000
--- a/src/EventStore.Core.Tests/SpecificationWithDirectoryPerTestFixture.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests {
-	public class SpecificationWithDirectoryPerTestFixture {
-		protected internal string PathName;
-
-		protected string GetTempFilePath() {
-			var typeName = GetType().Name.Length > 30 ? GetType().Name.Substring(0, 30) : GetType().Name;
-			return Path.Combine(PathName, string.Format("{0}-{1}", Guid.NewGuid(), typeName));
-		}
-
-		protected string GetFilePathFor(string fileName) {
-			return Path.Combine(PathName, fileName);
-		}
-
-		[OneTimeSetUp]
-		public virtual Task TestFixtureSetUp() {
-			ThreadPool.SetMinThreads(100, 1000);
-			var typeName = GetType().Name.Length > 30 ? GetType().Name.Substring(0, 30) : GetType().Name;
-			PathName = Path.Combine(Path.GetTempPath(), string.Format("ES-{0}-{1}", Guid.NewGuid(), typeName));
-			Directory.CreateDirectory(PathName);
-			
-			return Task.CompletedTask;
-		}
-
-		[OneTimeTearDown]
-		public virtual async Task TestFixtureTearDown() {
-			// kill whole tree
-			await DirectoryDeleter.TryForceDeleteDirectoryAsync(PathName, retries: 10);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/SpecificationWithFile.cs b/src/EventStore.Core.Tests/SpecificationWithFile.cs
deleted file mode 100644
index 250c64f8eb3..00000000000
--- a/src/EventStore.Core.Tests/SpecificationWithFile.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.IO;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests {
-	public class SpecificationWithFile {
-		protected string Filename;
-
-		[SetUp]
-		public virtual void SetUp() {
-			var typeName = GetType().Name.Length > 30 ? GetType().Name.Substring(0, 30) : GetType().Name;
-			Filename = Path.Combine(Path.GetTempPath(), string.Format("ES-{0}-{1}", Guid.NewGuid(), typeName));
-		}
-
-		[TearDown]
-		public virtual void TearDown() {
-			if (File.Exists(Filename))
-				File.Delete(Filename);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/SpecificationWithFilePerTestFixture.cs b/src/EventStore.Core.Tests/SpecificationWithFilePerTestFixture.cs
deleted file mode 100644
index 77f56c24baf..00000000000
--- a/src/EventStore.Core.Tests/SpecificationWithFilePerTestFixture.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests {
-	public class SpecificationWithFilePerTestFixture {
-		protected string Filename;
-
-		[OneTimeSetUp]
-		public virtual Task TestFixtureSetUp() {
-			var typeName = GetType().Name.Length > 30 ? GetType().Name.Substring(0, 30) : GetType().Name;
-			Filename = Path.Combine(Path.GetTempPath(), string.Format("ES-{0}-{1}", Guid.NewGuid(), typeName));
-			return Task.CompletedTask;
-		}
-
-		[OneTimeTearDown]
-		public virtual void TestFixtureTearDown() {
-			if (File.Exists(Filename))
-				File.Delete(Filename);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TaskExtensions.cs b/src/EventStore.Core.Tests/TaskExtensions.cs
deleted file mode 100644
index 382b355f9ec..00000000000
--- a/src/EventStore.Core.Tests/TaskExtensions.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-using DotNext;
-using static System.Threading.Timeout;
-
-namespace EventStore.Core.Tests {
-	public static class TaskExtensions {
-		public static async Task WithTimeout(this Task task, TimeSpan timeout, Action onFail = null,
-			[CallerMemberName] string memberName = "", [CallerFilePath] string sourceFilePath = "",
-			[CallerLineNumber] int sourceLineNumber = 0) {
-			Debug.Assert(task is not null);
-
-			if (Debugger.IsAttached) {
-				timeout = InfiniteTimeSpan;
-			}
-
-			await task
-				.WaitAsync(timeout)
-				.ConfigureAwait(ConfigureAwaitOptions.SuppressThrowing | ConfigureAwaitOptions.ContinueOnCapturedContext);
-
-			if (!task.IsCompleted) {
-				onFail?.Invoke();
-				throw new TimeoutException($"Timed out waiting for task at: {memberName} {sourceFilePath}:{sourceLineNumber}");
-			}
-
-			await task;
-		}
-
-		public static Task WithTimeout(this Task task, int timeoutMs = 10000, Action onFail = null,
-			[CallerMemberName] string memberName = "", [CallerFilePath] string sourceFilePath = "",
-			[CallerLineNumber] int sourceLineNumber = 0)
-			=> WithTimeout(task, TimeSpan.FromMilliseconds(timeoutMs), onFail, memberName, sourceFilePath,
-				sourceLineNumber);
-
-		public static async Task<T> WithTimeout<T>(this Task<T> task, TimeSpan timeout, Action onFail = null,
-			[CallerMemberName] string memberName = "", [CallerFilePath] string sourceFilePath = "",
-			[CallerLineNumber] int sourceLineNumber = 0) {
-
-			if (Debugger.IsAttached) {
-				timeout = InfiniteTimeSpan;
-			}
-
-			await task.As<Task>()
-				.WaitAsync(timeout)
-				.ConfigureAwait(ConfigureAwaitOptions.SuppressThrowing | ConfigureAwaitOptions.ContinueOnCapturedContext);
-
-			if (!task.IsCompleted) {
-				onFail?.Invoke();
-				throw new TimeoutException(
-					$"Timed out waiting for task at: {memberName} {sourceFilePath}:{sourceLineNumber}");
-			}
-
-			return await task;
-		}
-
-		public static Task<T> WithTimeout<T>(this Task<T> task, int timeoutMs = 10000, Action onFail = null,
-			[CallerMemberName] string memberName = "", [CallerFilePath] string sourceFilePath = "",
-			[CallerLineNumber] int sourceLineNumber = 0)
-			=> WithTimeout<T>(task, TimeSpan.FromMilliseconds(timeoutMs), onFail, memberName, sourceFilePath,
-				sourceLineNumber);
-	}
-}
diff --git a/src/EventStore.Core.Tests/TcpApiTestPlugin/TcpApiTestOptions.cs b/src/EventStore.Core.Tests/TcpApiTestPlugin/TcpApiTestOptions.cs
deleted file mode 100644
index 45c6bfff9b9..00000000000
--- a/src/EventStore.Core.Tests/TcpApiTestPlugin/TcpApiTestOptions.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace EventStore.TcpUnitTestPlugin;
-
-public class TcpApiTestOptions {
-	public int NodeTcpPort { get; init; } = 1113;
-	public int NodeHeartbeatInterval { get; init; } = 2_000;
-	public int NodeHeartbeatTimeout { get; init; } = 1_000;
-	public int ConnectionPendingSendBytesThreshold { get; set; } = 10 * 1_024 * 1_024;
-	public int ConnectionQueueSizeThreshold { get; set; } = 50_000;
-	public int WriteTimeoutMs { get; set; } = 2_000;
-	public bool Insecure { get; init; } = false;
-}
diff --git a/src/EventStore.Core.Tests/TcpApiTestPlugin/TcpApiTestPlugin.cs b/src/EventStore.Core.Tests/TcpApiTestPlugin/TcpApiTestPlugin.cs
deleted file mode 100644
index 8c39efab9af..00000000000
--- a/src/EventStore.Core.Tests/TcpApiTestPlugin/TcpApiTestPlugin.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core;
-using EventStore.Core.Certificates;
-using EventStore.Core.Services;
-using EventStore.Plugins;
-using EventStore.Plugins.Authentication;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Serilog;
-
-namespace EventStore.TcpUnitTestPlugin;
-
-public class TcpApiTestPlugin() : SubsystemsPlugin(name: "TcpTestApi") {
-	static readonly ILogger Logger = Log.ForContext<TcpApiTestPlugin>();
-
-	public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) {
-		var options = configuration.GetSection("EventStore:TcpUnitTestPlugin").Get<TcpApiTestOptions>() ?? new();
-		
-		services.AddHostedService<PublicTcpApiTestService>(serviceProvider => {
-			var components = serviceProvider.GetRequiredService<StandardComponents>();
-			var authGateway = serviceProvider.GetRequiredService<AuthorizationGateway>();
-			var authProvider = serviceProvider.GetRequiredService<IAuthenticationProvider>();
-			
-			return options.Insecure
-				? PublicTcpApiTestService.Insecure(options, authProvider, authGateway, components)
-				: PublicTcpApiTestService.Secure(options, authProvider, authGateway, components, serviceProvider.GetService<CertificateProvider>());
-		});
-	}
-
-	public override Task Start() {
-		Logger.Debug("{Name}-{Version} test plugin is loaded", Name, Version);
-		return Task.CompletedTask;
-	}
-}
diff --git a/src/EventStore.Core.Tests/TestsInitFixture.cs b/src/EventStore.Core.Tests/TestsInitFixture.cs
deleted file mode 100644
index abc61705916..00000000000
--- a/src/EventStore.Core.Tests/TestsInitFixture.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using System.Net;
-using System.Runtime;
-using System.Runtime.InteropServices;
-using EventStore.Common.Utils;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-using RuntimeInformation = System.Runtime.RuntimeInformation;
-
-namespace EventStore.Core.Tests {
-	[SetUpFixture]
-	public class TestsInitFixture {
-		[OneTimeSetUp]
-		public void SetUp() {
-			ServicePointManager.DefaultConnectionLimit = 1000;
-			LogEnvironmentInfo();
-		}
-
-		private void LogEnvironmentInfo() {
-			var log = Serilog.Log.ForContext<TestsInitFixture>();
-
-			log.Information("\n{0,-25} {1} ({2}/{3}, {4})\n"
-					 + "{5,-25} {6} ({7})\n"
-					 + "{8,-25} {9} ({10}-bit)\n"
-					 + "{11,-25} {12}\n\n",
-				"ES VERSION:", VersionInfo.Version, VersionInfo.Edition, VersionInfo.CommitSha, VersionInfo.Timestamp,
-				"OS:", RuntimeInformation.OsPlatform, Environment.OSVersion,
-				"RUNTIME:", RuntimeInformation.RuntimeVersion, RuntimeInformation.RuntimeMode,
-				"GC:",
-				GC.MaxGeneration == 0
-					? "NON-GENERATION (PROBABLY BOEHM)"
-					: $"{GC.MaxGeneration + 1} GENERATIONS"
-            );
-		}
-
-		[OneTimeTearDown]
-		public void TearDown() {
-			var runCount = Math.Max(1, MiniNode<LogFormat.V2,string>.RunCount);
-			var msg = string.Format("Total running time of MiniNode (Log V2): {0} (mean {1})\n" +
-									"Total starting time of MiniNode (Log V2): {2} (mean {3})\n" +
-									"Total stopping time of MiniNode (Log V2): {4} (mean {5})\n" +
-									"Total run count (Log V2): {6}",
-				MiniNode<LogFormat.V2,string>.RunningTime.Elapsed, TimeSpan.FromTicks(MiniNode<LogFormat.V2,string>.RunningTime.Elapsed.Ticks / runCount),
-				MiniNode<LogFormat.V2,string>.StartingTime.Elapsed, TimeSpan.FromTicks(MiniNode<LogFormat.V2,string>.StartingTime.Elapsed.Ticks / runCount),
-				MiniNode<LogFormat.V2,string>.StoppingTime.Elapsed, TimeSpan.FromTicks(MiniNode<LogFormat.V2,string>.StoppingTime.Elapsed.Ticks / runCount),
-				MiniNode<LogFormat.V2,string>.RunCount);
-
-			Console.WriteLine(msg);
-			Console.WriteLine();
-
-			runCount = Math.Max(1, MiniNode<LogFormat.V3,long>.RunCount);
-			msg = string.Format("Total running time of MiniNode (Log V3): {0} (mean {1})\n" +
-			                        "Total starting time of MiniNode (Log V3): {2} (mean {3})\n" +
-			                        "Total stopping time of MiniNode (Log V3): {4} (mean {5})\n" +
-			                        "Total run count (Log V3): {6}",
-				MiniNode<LogFormat.V3,long>.RunningTime.Elapsed, TimeSpan.FromTicks(MiniNode<LogFormat.V3,long>.RunningTime.Elapsed.Ticks / runCount),
-				MiniNode<LogFormat.V3,long>.StartingTime.Elapsed, TimeSpan.FromTicks(MiniNode<LogFormat.V3,long>.StartingTime.Elapsed.Ticks / runCount),
-				MiniNode<LogFormat.V3,long>.StoppingTime.Elapsed, TimeSpan.FromTicks(MiniNode<LogFormat.V3,long>.StoppingTime.Elapsed.Ticks / runCount),
-				MiniNode<LogFormat.V3,long>.RunCount);
-
-			Console.WriteLine(msg);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/FakeReadIndex.cs b/src/EventStore.Core.Tests/TransactionLog/FakeReadIndex.cs
deleted file mode 100644
index 35721d85c5b..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/FakeReadIndex.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	internal class FakeReadIndex<TLogFormat, TStreamId> : IReadIndex<TStreamId> {
-		private readonly IMetastreamLookup<TStreamId> _metastreams;
-
-		public long LastIndexedPosition {
-			get { return 0; }
-		}
-		
-		public IIndexWriter<TStreamId> IndexWriter {
-			get { throw new NotImplementedException(); }
-		}
-
-		private readonly Func<TStreamId, bool> _isStreamDeleted;
-
-		public FakeReadIndex(
-			Func<TStreamId, bool> isStreamDeleted,
-			IMetastreamLookup<TStreamId> metastreams) {
-
-			Ensure.NotNull(isStreamDeleted, "isStreamDeleted");
-			_isStreamDeleted = isStreamDeleted;
-			_metastreams = metastreams;
-		}
-
-		public void Init(long buildToPosition) {
-			throw new NotImplementedException();
-		}
-
-		public void Commit(CommitLogRecord record) {
-			throw new NotImplementedException();
-		}
-
-		public void Commit(IList<IPrepareLogRecord<TStreamId>> commitedPrepares) {
-			throw new NotImplementedException();
-		}
-
-		public ReadIndexStats GetStatistics() {
-			throw new NotImplementedException();
-		}
-
-		public IndexReadEventResult ReadEvent(string streamName, TStreamId streamId, long eventNumber) {
-			throw new NotImplementedException();
-		}
-
-		public IndexReadStreamResult ReadStreamEventsBackward(string streamName, TStreamId streamId, long fromEventNumber, int maxCount) {
-			throw new NotImplementedException();
-		}
-
-		public IndexReadStreamResult ReadStreamEventsForward(string streamName, TStreamId streamId, long fromEventNumber, int maxCount) {
-			throw new NotImplementedException();
-		}
-
-		public IndexReadEventInfoResult ReadEventInfo_KeepDuplicates(TStreamId streamId, long eventNumber) {
-			throw new NotImplementedException();
-		}
-
-		public IndexReadEventInfoResult ReadEventInfoForward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount,
-			long beforePosition) {
-			throw new NotImplementedException();
-		}
-
-		public IndexReadEventInfoResult ReadEventInfoForward_NoCollisions(ulong stream, long fromEventNumber, int maxCount, long beforePosition) {
-			throw new NotImplementedException();
-		}
-
-		public IndexReadEventInfoResult ReadEventInfoBackward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount,
-			long beforePosition) {
-			throw new NotImplementedException();
-		}
-
-		public IndexReadEventInfoResult ReadEventInfoBackward_NoCollisions(ulong stream, Func<ulong, TStreamId> getStreamId, long fromEventNumber,
-			int maxCount, long beforePosition) {
-			throw new NotImplementedException();
-		}
-
-		public IndexReadAllResult ReadAllEventsForward(TFPos pos, int maxCount) {
-			throw new NotImplementedException();
-		}
-
-		public IndexReadAllResult ReadAllEventsBackward(TFPos pos, int maxCount) {
-			throw new NotImplementedException();
-		}
-
-		public IndexReadAllResult ReadAllEventsForwardFiltered(TFPos pos, int maxCount, int maxSearchWindow,
-			IEventFilter eventFilter) {
-			throw new NotImplementedException();
-		}
-
-		public IndexReadAllResult ReadAllEventsBackwardFiltered(TFPos pos, int maxCount, int maxSearchWindow,
-			IEventFilter eventFilter) {
-			throw new NotImplementedException();
-		}
-
-		public bool IsStreamDeleted(TStreamId streamId) {
-			return _isStreamDeleted(streamId);
-		}
-
-		public long GetStreamLastEventNumber(TStreamId streamId) {
-			if (_metastreams.IsMetaStream(streamId))
-				return GetStreamLastEventNumber(_metastreams.OriginalStreamOf(streamId));
-			return _isStreamDeleted(streamId) ? EventNumber.DeletedStream : 1000000;
-		}
-
-		public long GetStreamLastEventNumber_KnownCollisions(TStreamId streamId, long beforePosition) {
-			throw new NotImplementedException();
-		}
-
-		public long GetStreamLastEventNumber_NoCollisions(ulong stream, Func<ulong, TStreamId> getStreamId, long beforePosition) {
-			throw new NotImplementedException();
-		}
-
-		public StorageMessage.EffectiveAcl GetEffectiveAcl(TStreamId streamId) {
-			throw new NotImplementedException();
-		}
-
-		public TStreamId GetEventStreamIdByTransactionId(long transactionId) {
-			throw new NotImplementedException();
-		}
-
-		public StreamAccess CheckStreamAccess(TStreamId streamId, StreamAccessType streamAccessType, ClaimsPrincipal user) {
-			throw new NotImplementedException();
-		}
-
-		public StreamMetadata GetStreamMetadata(TStreamId streamId) {
-			throw new NotImplementedException();
-		}
-
-		public TStreamId GetStreamId(string streamName) {
-			throw new NotImplementedException();
-		}
-
-		public string GetStreamName(TStreamId streamId) {
-			throw new NotImplementedException();
-		}
-
-		public void Close() {
-			throw new NotImplementedException();
-		}
-
-		public void Dispose() {
-			throw new NotImplementedException();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/FlushTimeMeter.cs b/src/EventStore.Core.Tests/TransactionLog/FlushTimeMeter.cs
deleted file mode 100644
index 5d1d5632947..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/FlushTimeMeter.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using EventStore.Common.Utils;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class FlushTimeMeter : SpecificationWithFile {
-		[Test, Ignore("long running")]
-		public void Test() {
-			var rnd = new Random();
-			var sw = Stopwatch.StartNew();
-			var gw = Stopwatch.StartNew();
-			using (var fs = new FileStream(Filename, FileMode.OpenOrCreate)) {
-				const int iter = 1000;
-				for (int bytes = 100; bytes < 1000000; bytes *= 2) {
-					var arr = new byte[bytes];
-					rnd.NextBytes(arr);
-
-					TimeSpan min = TimeSpan.FromHours(1);
-					TimeSpan max = TimeSpan.Zero;
-
-					gw.Restart();
-					for (int i = 0; i < iter; ++i) {
-						fs.Write(arr, 0, arr.Length);
-
-						sw.Restart();
-						fs.FlushToDisk();
-						var elapsed = sw.Elapsed;
-
-						min = elapsed < min ? elapsed : min;
-						max = elapsed > max ? elapsed : max;
-					}
-
-					gw.Stop();
-
-					Console.WriteLine("{0} bytes, Min: {1}, Max: {2}, Avg: {3}",
-						bytes,
-						min,
-						max,
-						TimeSpan.FromTicks(gw.Elapsed.Ticks / iter));
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Optimization/tfchunkreader_existsat_optimizer_should.cs b/src/EventStore.Core.Tests/TransactionLog/Optimization/tfchunkreader_existsat_optimizer_should.cs
deleted file mode 100644
index 65c3361810a..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Optimization/tfchunkreader_existsat_optimizer_should.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.Transforms.Identity;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Optimization {
-	[TestFixture]
-	public class tfchunkreader_existsat_optimizer_should : SpecificationWithDirectoryPerTestFixture {
-		[Test]
-		public void have_a_single_instance() {
-			var instance1 = TFChunkReaderExistsAtOptimizer.Instance;
-			var instance2 = TFChunkReaderExistsAtOptimizer.Instance;
-			Assert.AreEqual(instance1, instance2);
-		}
-
-		[Test]
-		public async Task optimize_only_maxcached_items_at_a_time() {
-			int maxCached = 3;
-			List<TFChunk> chunks = new List<TFChunk>();
-			TFChunkReaderExistsAtOptimizer _existsAtOptimizer = new TFChunkReaderExistsAtOptimizer(maxCached);
-
-			for (int i = 0; i < 7; i++) {
-				var chunk = await CreateChunk(i, true);
-				chunks.Add(chunk);
-				Assert.IsFalse(_existsAtOptimizer.IsOptimized(chunk));
-				_existsAtOptimizer.Optimize(chunk);
-			}
-
-
-			//only the last maxCached chunks should still be optimized
-			int cached = maxCached;
-			for (int i = 7 - 1; i >= 0; i--) {
-				if (cached > 0) {
-					Assert.AreEqual(true, _existsAtOptimizer.IsOptimized(chunks[i]));
-					cached--;
-				} else {
-					Assert.AreEqual(false, _existsAtOptimizer.IsOptimized(chunks[i]));
-				}
-			}
-
-			foreach (var chunk in chunks) {
-				chunk.MarkForDeletion();
-				chunk.WaitForDestroy(5000);
-			}
-		}
-
-		[Test]
-		public async Task optimize_only_scavenged_chunks() {
-			TFChunkReaderExistsAtOptimizer _existsAtOptimizer = new TFChunkReaderExistsAtOptimizer(3);
-			var chunk = await CreateChunk(0, false);
-			_existsAtOptimizer.Optimize(chunk);
-			Assert.AreEqual(false, _existsAtOptimizer.IsOptimized(chunk));
-
-			chunk.MarkForDeletion();
-			chunk.WaitForDestroy(5000);
-		}
-
-		[Test]
-		public async Task posmap_items_should_exist_in_chunk() {
-			TFChunkReaderExistsAtOptimizer _existsAtOptimizer = new TFChunkReaderExistsAtOptimizer(3);
-			List<PosMap> posmap = new();
-			var chunk = await CreateChunk(0, true, posmap);
-
-			//before optimization
-			Assert.AreEqual(false, _existsAtOptimizer.IsOptimized(chunk));
-			foreach (var p in posmap) {
-				Assert.AreEqual(true, chunk.ExistsAt(p.LogPos));
-			}
-
-			//after optimization
-			_existsAtOptimizer.Optimize(chunk);
-			Assert.AreEqual(true, _existsAtOptimizer.IsOptimized(chunk));
-			foreach (var p in posmap) {
-				Assert.AreEqual(true, chunk.ExistsAt(p.LogPos));
-			}
-
-			chunk.MarkForDeletion();
-			chunk.WaitForDestroy(5000);
-		}
-
-		private ValueTask<TFChunk> CreateChunk(int chunkNumber, bool scavenged) {
-			List<PosMap> posmap = new();
-			return CreateChunk(chunkNumber, scavenged, posmap);
-		}
-
-		private async ValueTask<TFChunk> CreateChunk(int chunkNumber, bool scavenged, List<PosMap> posmap) {
-			var map = new List<PosMap>();
-			var chunk = TFChunk.CreateNew(GetFilePathFor("chunk-" + chunkNumber + "-" + Guid.NewGuid()), 1024 * 1024,
-				chunkNumber, chunkNumber, scavenged, false, false, false,
-				false,
-				new TFChunkTracker.NoOp(),
-				new IdentityChunkTransformFactory());
-			long offset = chunkNumber * 1024 * 1024;
-			long logPos = 0 + offset;
-			for (int i = 0, n = ChunkFooter.Size / PosMap.FullSize + 1; i < n; ++i) {
-				if (scavenged)
-					map.Add(new PosMap(logPos, (int)logPos));
-
-				var res = chunk.TryAppend(LogRecord.Commit(logPos, Guid.NewGuid(), logPos, 0));
-				Assert.IsTrue(res.Success);
-				logPos = res.NewPosition + offset;
-			}
-
-			if (scavenged) {
-				posmap.AddRange(map);
-				await chunk.CompleteScavenge(map, CancellationToken.None);
-			} else {
-				posmap.Clear();
-				chunk.Complete();
-			}
-
-			return chunk;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/Helpers/FakeTFScavengerLog.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/Helpers/FakeTFScavengerLog.cs
deleted file mode 100644
index 5764ca3bdc7..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/Helpers/FakeTFScavengerLog.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.TransactionLog.Chunks;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging.Helpers {
-	public class FakeTFScavengerLog : ITFChunkScavengerLog {
-		public string ScavengeId { get; } = "FakeScavenge";
-
-		public long SpaceSaved { get; } = 0;
-
-		public bool AlwaysKeepScavenged { get; private set; }
-		public bool MergeChunks { get; private set; }
-		public int StartFromChunk { get; private set; }
-		public int Threads { get; private set; }
-		public bool Started { get; private set; }
-
-		public bool Completed { get; private set; }
-
-		public string Error { get; private set; }
-
-		public ScavengeResult Result { get; private set; }
-
-		public event EventHandler<EventArgs> StartedCallback;
-		public event EventHandler<ScavengedLog> ChunkScavenged;
-		public event EventHandler<IndexScavengedLog> IndexScavenged;
-		public event EventHandler<EventArgs> CompletedCallback;
-
-		public IList<ScavengedLog> Scavenged { get; } = new List<ScavengedLog>();
-		public IList<ScavengedLog> Merged { get; } = new List<ScavengedLog>();
-		public IList<IndexScavengedLog> ScavengedIndices { get; } = new List<IndexScavengedLog>();
-
-		public void ScavengeStarted() {
-			Started = true;
-			StartedCallback?.Invoke(this, EventArgs.Empty);
-		}
-
-		public void ScavengeStarted(bool alwaysKeepScavenged, bool mergeChunks, int startFromChunk, int threads) {
-			AlwaysKeepScavenged = alwaysKeepScavenged;
-			MergeChunks = mergeChunks;
-			StartFromChunk = startFromChunk;
-			Threads = threads;
-			Started = true;
-			StartedCallback?.Invoke(this, EventArgs.Empty);
-		}
-
-		public void ChunksScavenged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, long spaceSaved) {
-			var scavengedLog = new ScavengedLog(chunkStartNumber, chunkEndNumber, true, "");
-			Scavenged.Add(scavengedLog);
-			ChunkScavenged?.Invoke(this, scavengedLog);
-		}
-
-		public void ChunksNotScavenged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed,
-			string errorMessage) {
-			var scavengedLog = new ScavengedLog(chunkStartNumber, chunkEndNumber, false, "");
-			Scavenged.Add(scavengedLog);
-			ChunkScavenged?.Invoke(this, scavengedLog);
-		}
-
-		public void ChunksMerged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, long spaceSaved) {
-			var scavengedLog = new ScavengedLog(chunkStartNumber, chunkEndNumber, true, "");
-			Merged.Add(scavengedLog);
-			ChunkScavenged?.Invoke(this, scavengedLog);
-		}
-
-		public void ChunksNotMerged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, string errorMessage) {
-			var scavengedLog = new ScavengedLog(chunkStartNumber, chunkEndNumber, false, "");
-			Merged.Add(scavengedLog);
-			ChunkScavenged?.Invoke(this, scavengedLog);
-		}
-
-		public void IndexTableScavenged(int level, int index, TimeSpan elapsed, long entriesDeleted, long entriesKept,
-			long spaceSaved) {
-			var indexScavenged = new IndexScavengedLog(true, null, entriesDeleted);
-			ScavengedIndices.Add(indexScavenged);
-			IndexScavenged?.Invoke(this, indexScavenged);
-		}
-
-		public void IndexTableNotScavenged(int level, int index, TimeSpan elapsed, long entriesKept,
-			string errorMessage) {
-			var indexScavenged = new IndexScavengedLog(false, errorMessage, 0);
-			ScavengedIndices.Add(indexScavenged);
-			IndexScavenged?.Invoke(this, indexScavenged);
-		}
-
-		public void ScavengeCompleted(ScavengeResult result, string error, TimeSpan elapsed) {
-			Completed = true;
-			Result = result;
-			Error = error;
-			CompletedCallback?.Invoke(this, EventArgs.Empty);
-		}
-
-		public class ScavengedLog {
-			public int ChunkStart { get; }
-			public int ChunkEnd { get; }
-			public bool Scavenged { get; }
-			public string Error { get; }
-
-			public ScavengedLog(int chunkStart, int chunkEnd, bool scavenged, string error) {
-				ChunkStart = chunkStart;
-				ChunkEnd = chunkEnd;
-				Scavenged = scavenged;
-				Error = error;
-			}
-		}
-
-		public class IndexScavengedLog {
-			public bool Scavenged { get; }
-			public string Error { get; }
-			public long EntriesDeleted { get; }
-
-			public IndexScavengedLog(bool scavenged, string error, long entriesDeleted) {
-				Scavenged = scavenged;
-				Error = error;
-				EntriesDeleted = entriesDeleted;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/Helpers/ScavengeLifeCycleScenario.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/Helpers/ScavengeLifeCycleScenario.cs
deleted file mode 100644
index bc5fb2a3c4a..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/Helpers/ScavengeLifeCycleScenario.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Tests.Services.Storage;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging.Helpers {
-	[TestFixture]
-	abstract public class ScavengeLifeCycleScenario<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		protected TFChunkDb Db {
-			get { return _dbResult.Db; }
-		}
-
-		private DbResult _dbResult;
-		protected TFChunkScavenger<TStreamId> TfChunkScavenger;
-		protected FakeTFScavengerLog Log;
-		protected FakeTableIndex<TStreamId> FakeTableIndex;
-		protected LogFormatAbstractor<TStreamId> _logFormat;
-
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var indexDirectory = GetFilePathFor("index");
-			_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
-				IndexDirectory = indexDirectory,
-			});
-
-			var dbConfig = TFChunkHelper.CreateSizedDbConfig(PathName, 0, chunkSize: 1024 * 1024);
-			var dbCreationHelper = new TFChunkDbCreationHelper<TLogFormat, TStreamId>(dbConfig, _logFormat);
-
-			_dbResult = dbCreationHelper
-				.Chunk().CompleteLastChunk()
-				.Chunk().CompleteLastChunk()
-				.Chunk()
-				.CreateDb(commit: true);
-
-			_dbResult.Db.Config.WriterCheckpoint.Flush();
-			_dbResult.Db.Config.ChaserCheckpoint.Write(_dbResult.Db.Config.WriterCheckpoint.Read());
-			_dbResult.Db.Config.ChaserCheckpoint.Flush();
-
-			Log = new FakeTFScavengerLog();
-			FakeTableIndex = new FakeTableIndex<TStreamId>();
-			TfChunkScavenger = new TFChunkScavenger<TStreamId>(Serilog.Log.Logger, _dbResult.Db, Log, FakeTableIndex, new FakeReadIndex<TLogFormat, TStreamId>(_ => false, _logFormat.Metastreams),
-				_logFormat.Metastreams);
-
-			try {
-				await When().WithTimeout(TimeSpan.FromMinutes(1));
-			} catch (Exception ex) {
-				throw new Exception("When Failed", ex);
-			}
-		}
-
-		public override Task TestFixtureTearDown() {
-			_logFormat?.Dispose();
-			_dbResult.Db.Close();
-
-			return base.TestFixtureTearDown();
-		}
-
-		protected abstract Task When();
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/Helpers/ScavengeTestScenario.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/Helpers/ScavengeTestScenario.cs
deleted file mode 100644
index 2c7709b8957..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/Helpers/ScavengeTestScenario.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Caching;
-using EventStore.Core.DataStructures;
-using EventStore.Core.Index;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Services;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-using EventStore.Core.Util;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Metrics;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging.Helpers {
-	[TestFixture]
-	public abstract class ScavengeTestScenario<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		protected IReadIndex<TStreamId> ReadIndex;
-
-		protected TFChunkDb Db {
-			get { return _dbResult.Db; }
-		}
-
-		private readonly int _metastreamMaxCount;
-		private DbResult _dbResult;
-		private ILogRecord[][] _keptRecords;
-		private bool _checked;
-		private LogFormatAbstractor<TStreamId> _logFormat;
-
-		protected virtual bool UnsafeIgnoreHardDelete() {
-			return false;
-		}
-
-		protected ScavengeTestScenario(int metastreamMaxCount = 1) {
-			_metastreamMaxCount = metastreamMaxCount;
-		}
-
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var indexDirectory = GetFilePathFor("index");
-			_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
-				IndexDirectory = indexDirectory,
-			});
-
-			var dbConfig = TFChunkHelper.CreateSizedDbConfig(PathName, 0, chunkSize: 1024 * 1024);
-			var dbCreationHelper = new TFChunkDbCreationHelper<TLogFormat, TStreamId>(dbConfig, _logFormat);
-			_dbResult = CreateDb(dbCreationHelper);
-			_keptRecords = KeptRecords(_dbResult);
-
-			_dbResult.Db.Config.WriterCheckpoint.Flush();
-			_dbResult.Db.Config.ChaserCheckpoint.Write(_dbResult.Db.Config.WriterCheckpoint.Read());
-			_dbResult.Db.Config.ChaserCheckpoint.Flush();
-
-			var readerPool = new ObjectPool<ITransactionFileReader>(
-				"ReadIndex readers pool", Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault,
-				() => new TFChunkReader(_dbResult.Db, _dbResult.Db.Config.WriterCheckpoint));
-			var lowHasher = _logFormat.LowHasher;
-			var highHasher = _logFormat.HighHasher;
-			var emptyStreamId = _logFormat.EmptyStreamId;
-			var tableIndex = new TableIndex<TStreamId>(indexDirectory, lowHasher, highHasher, emptyStreamId,
-				() => new HashListMemTable(PTableVersions.IndexV3, maxSize: 200),
-				() => new TFReaderLease(readerPool),
-				PTableVersions.IndexV3,
-				5, Constants.PTableMaxReaderCountDefault,
-				maxSizeForMemory: 100,
-				maxTablesPerLevel: 2);
-			_logFormat.StreamNamesProvider.SetTableIndex(tableIndex);
-			var readIndex = new ReadIndex<TStreamId>(new NoopPublisher(), readerPool, tableIndex,
-				_logFormat.StreamNameIndexConfirmer,
-				_logFormat.StreamIds,
-				_logFormat.StreamNamesProvider,
-				_logFormat.EmptyStreamId,
-				_logFormat.StreamIdValidator,
-				_logFormat.StreamIdSizer,
-				_logFormat.StreamExistenceFilter,
-				_logFormat.StreamExistenceFilterReader,
-				_logFormat.EventTypeIndexConfirmer,
-				new LRUCache<TStreamId, IndexBackend<TStreamId>.EventNumberCached>("LastEventNumber", 100),
-				new LRUCache<TStreamId, IndexBackend<TStreamId>.MetadataCached>("StreamMetadata", 100),
-				true, _metastreamMaxCount,
-				Opts.HashCollisionReadLimitDefault, Opts.SkipIndexScanOnReadsDefault,
-				_dbResult.Db.Config.ReplicationCheckpoint,_dbResult.Db.Config.IndexCheckpoint,
-				new IndexStatusTracker.NoOp(),
-				new IndexTracker.NoOp(),
-				new CacheHitsMissesTracker.NoOp());
-			readIndex.IndexCommitter.Init(_dbResult.Db.Config.WriterCheckpoint.Read());
-			ReadIndex = readIndex;
-
-			var scavenger = new TFChunkScavenger<TStreamId>(Serilog.Log.Logger, _dbResult.Db, new FakeTFScavengerLog(), tableIndex, ReadIndex,
-				_logFormat.Metastreams,
-				unsafeIgnoreHardDeletes: UnsafeIgnoreHardDelete());
-			await scavenger.Scavenge(alwaysKeepScavenged: true, mergeChunks: false);
-		}
-
-		public override async Task TestFixtureTearDown() {
-			_logFormat?.Dispose();
-			ReadIndex.Close();
-			_dbResult.Db.Close();
-
-			await base.TestFixtureTearDown();
-
-			if (!_checked)
-				throw new Exception("Records were not checked. Probably you forgot to call CheckRecords() method.");
-		}
-
-		protected abstract DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator);
-
-		protected abstract ILogRecord[][] KeptRecords(DbResult dbResult);
-
-		protected async Task CheckRecords(CancellationToken token = default) {
-			_checked = true;
-			Assert.AreEqual(_keptRecords.Length, _dbResult.Db.Manager.ChunksCount, "Wrong chunks count.");
-
-			for (int i = 0; i < _keptRecords.Length; ++i) {
-				var chunk = _dbResult.Db.Manager.GetChunk(i);
-
-				var chunkRecords = new List<ILogRecord>();
-				RecordReadResult result = await chunk.TryReadFirst(token);
-				while (result.Success) {
-					chunkRecords.Add(result.LogRecord);
-					result = chunk.TryReadClosestForward((int)result.NextPosition);
-				}
-
-				Assert.AreEqual(_keptRecords[i].Length, chunkRecords.Count, "Wrong number of records in chunk #{0}", i);
-
-				for (int j = 0; j < _keptRecords[i].Length; ++j) {
-					Assert.AreEqual(_keptRecords[i][j], chunkRecords[j], "Wrong log record #{0} read from chunk #{1}",
-						j, i);
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/Helpers/TFChunkDbCreationHelper.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/Helpers/TFChunkDbCreationHelper.cs
deleted file mode 100644
index b05df70c0b2..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/Helpers/TFChunkDbCreationHelper.cs
+++ /dev/null
@@ -1,517 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Services;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging.Helpers {
-	public class TFChunkDbCreationHelper<TLogFormat, TStreamId> {
-		private static EqualityComparer<TStreamId> StreamIdComparer { get; } = EqualityComparer<TStreamId>.Default;
-
-		private readonly TFChunkDbConfig _dbConfig;
-		private readonly TFChunkDb _db;
-
-		private readonly List<Rec[]> _chunkRecs = new List<Rec[]>();
-
-		private bool _completeLast;
-
-		private readonly LogFormatAbstractor<TStreamId> _logFormat;
-		private readonly TStreamId _scavengePointEventTypeId;
-
-		public TFChunkDbCreationHelper(TFChunkDbConfig dbConfig, LogFormatAbstractor<TStreamId> logFormat) {
-			Ensure.NotNull(dbConfig, "dbConfig");
-			_dbConfig = dbConfig;
-			_logFormat = logFormat;
-			_scavengePointEventTypeId = logFormat.EventTypeIndex.GetExisting(SystemEventTypes.ScavengePoint);
-
-			_db = new TFChunkDb(_dbConfig);
-			_db.Open();
-
-			if (_db.Config.WriterCheckpoint.ReadNonFlushed() > 0)
-				throw new Exception("The DB already contains some data.");
-		}
-
-		public TFChunkDbCreationHelper<TLogFormat, TStreamId> Chunk(params Rec[] records) {
-			_chunkRecs.Add(records);
-			return this;
-		}
-
-		public TFChunkDbCreationHelper<TLogFormat, TStreamId> CompleteLastChunk() {
-			_completeLast = true;
-			return this;
-		}
-
-		public DbResult CreateDb(bool commit = false) {
-			var records = new List<ILogRecord>[_chunkRecs.Count];
-			for (int i = 0; i < records.Length; ++i) {
-				records[i] = new();
-			}
-
-			var transactions = new Dictionary<int, TransactionInfo>();
-			var streams = new Dictionary<string, StreamInfo>();
-			var streamUncommitedVersion = new Dictionary<string, long>();
-
-			// for each chunk i
-			for (int i = 0; i < _chunkRecs.Count; ++i) {
-				// for each record j in chunk i
-				for (int j = 0; j < _chunkRecs[i].Length; ++j) {
-					var rec = _chunkRecs[i][j];
-
-					TransactionInfo transInfo;
-					bool transCreate = transactions.TryGetValue(rec.Transaction, out transInfo);
-					if (!transCreate) {
-						if (rec.Type == Rec.RecType.Commit)
-							throw new Exception("Commit for non-existing transaction.");
-
-						transactions[rec.Transaction] = transInfo = new TransactionInfo(rec.StreamId, rec.Id, rec.Id);
-
-						streams[rec.StreamId] = new StreamInfo(-1);
-						streamUncommitedVersion[rec.StreamId] = -1;
-					} else {
-						if (rec.Type == Rec.RecType.TransStart)
-							throw new Exception(string.Format("Unexpected record type: {0}.", rec.Type));
-					}
-
-					if (transInfo.StreamId != rec.StreamId) {
-						throw new Exception(string.Format(
-							"Wrong stream id for transaction. Transaction StreamId: {0}, record StreamId: {1}.",
-							transInfo.StreamId,
-							rec.StreamId));
-					}
-
-					if (rec.Type != Rec.RecType.Commit && transInfo.IsDelete)
-						throw new Exception("Transaction with records after delete record.");
-
-					if (rec.Type == Rec.RecType.Delete)
-						transInfo.IsDelete = true;
-
-					transInfo.LastPrepareId = rec.Id;
-				}
-			}
-
-			long logPos = 0;
-
-			// convert the Recs into LogRecords and write them to the database.
-			// for each chunk i
-			for (int i = 0; i < _chunkRecs.Count; ++i) {
-				var chunk = i == 0 ? _db.Manager.GetChunk(0) : _db.Manager.AddNewChunk();
-				logPos = i * (long)_db.Config.ChunkSize;
-
-				var completedChunk = false;
-				// for each record j in chunk i
-				for (int j = 0; j < _chunkRecs[i].Length; ++j) {
-					if (completedChunk)
-						throw new InvalidOperationException("Don't try to write more data to completed chunk");
-					var rec = _chunkRecs[i][j];
-					var transInfo = transactions[rec.Transaction];
-
-					_logFormat.StreamNameIndex.GetOrReserve(_logFormat.RecordFactory, rec.StreamId, logPos, out var streamNumber, out var streamRecord);
-					if (streamRecord != null) {
-						Write(i, chunk, streamRecord, false, out logPos);
-						records[i].Add(streamRecord);
-					}
-					
-					_logFormat.EventTypeIndex.GetOrReserveEventType(_logFormat.RecordFactory, rec.EventType, logPos, out var eventTypeNumber, out var eventTypeRecord);
-					if (eventTypeRecord != null) {
-						Write(i, chunk, eventTypeRecord, false, out logPos);
-						records[i].Add(eventTypeRecord);
-					}
-
-					long streamVersion = streamUncommitedVersion[rec.StreamId];
-
-					if (rec.EventNumber.HasValue && rec.EventNumber > streamVersion + 1) {
-						// advance the stream
-						streamVersion = rec.EventNumber.Value - 1;
-						streamUncommitedVersion[rec.StreamId] = streamVersion;
-					}
-
-					if (streamVersion == -1
-					    && rec.Type != Rec.RecType.TransStart
-					    && rec.Type != Rec.RecType.Prepare
-					    && rec.Type != Rec.RecType.Delete) {
-						throw new Exception(string.Format("Stream {0} is empty.", rec.StreamId));
-					}
-
-					if (streamVersion == EventNumber.DeletedStream && rec.Type != Rec.RecType.Commit)
-						throw new Exception(string.Format(
-							"Stream {0} was deleted, but we need to write some more prepares.", rec.StreamId));
-
-					if (transInfo.FirstPrepareId == rec.Id) {
-						transInfo.TransactionPosition = logPos;
-						transInfo.TransactionEventNumber = streamVersion + 1;
-						transInfo.TransactionOffset = 0;
-					}
-
-					ILogRecord record;
-
-					var logFormatDefaultExpectedVersion = LogFormatHelper<TLogFormat, TStreamId>.IsV2
-						? ExpectedVersion.Any // V2 transaction writes have expected version: -2, event number: -1
-						: ExpectedVersion.NoStream; // V3 doesn't have transactions so cant have a negative event number
-
-					  var expectedVersion =
-						(rec.EventNumber - 1) ??
-						(transInfo.FirstPrepareId == rec.Id ? streamVersion : logFormatDefaultExpectedVersion);
-
-					switch (rec.Type) {
-						case Rec.RecType.Prepare: {
-							record = CreateLogRecord(rec, streamNumber, eventTypeNumber, transInfo, logPos, expectedVersion);
-
-							if (SystemStreams.IsMetastream(rec.StreamId))
-								transInfo.StreamMetadata = rec.Metadata;
-
-							streamUncommitedVersion[rec.StreamId] += 1;
-							break;
-						}
-
-						case Rec.RecType.Delete: {
-							if (rec.PrepareFlags.HasAnyOf(PrepareFlags.IsCommitted)) {
-								// modern style tombstone has IsCommitted flag and max event number.
-								// introduced in 19f7cd351329f7bd2be0f6c00b4beee45e2a4777
-								expectedVersion = rec.Version == LogRecordVersion.LogRecordV0
-									? int.MaxValue - 1
-									: EventNumber.DeletedStream - 1;
-							} else {
-								// legacy style tombstone has 'normal' expected version in the log record
-								// (probably -1 because it is committed separately)
-								// a subsequent commit record to commit it
-								// special handling in indexcommitter to give it a max event number in
-								// the index.
-							}
-
-							record = CreateLogRecord(rec, streamNumber, eventTypeNumber, transInfo, logPos, expectedVersion);
-
-							streamUncommitedVersion[rec.StreamId] = rec.Version == LogRecordVersion.LogRecordV0
-								? int.MaxValue
-								: EventNumber.DeletedStream;
-							break;
-						}
-
-						case Rec.RecType.TransStart:
-						case Rec.RecType.TransEnd: {
-							record = CreateLogRecord(rec, streamNumber, eventTypeNumber, transInfo, logPos, expectedVersion);
-							break;
-						}
-						case Rec.RecType.Commit: {
-							record = CreateLogRecord(rec, streamNumber, eventTypeNumber, transInfo, logPos, expectedVersion);
-
-							if (transInfo.StreamMetadata != null) {
-								var streamId = SystemStreams.OriginalStreamOf(rec.StreamId);
-								if (!streams.ContainsKey(streamId))
-									streams.Add(streamId, new StreamInfo(-1));
-								streams[streamId].StreamMetadata = transInfo.StreamMetadata;
-							}
-
-							if (transInfo.IsDelete)
-								streams[rec.StreamId].StreamVersion = EventNumber.DeletedStream;
-							else
-								streams[rec.StreamId].StreamVersion =
-									transInfo.TransactionEventNumber + transInfo.TransactionOffset - 1;
-							break;
-						}
-						default:
-							throw new ArgumentOutOfRangeException();
-					}
-
-					Write(i, chunk, record, rec.CommitWrite, out logPos);
-					records[i].Add(record);
-					if (record is IPrepareLogRecord<TStreamId> prepare &&
-						StreamIdComparer.Equals(prepare.EventType, _scavengePointEventTypeId)) {
-						chunk.Complete();
-						completedChunk = true;
-					}
-				}
-
-				if (!completedChunk) {
-					if (i < _chunkRecs.Count - 1 || (_completeLast && i == _chunkRecs.Count - 1)) {
-						chunk.Complete();
-					} else {
-						chunk.Flush();
-					}
-				}
-			}
-
-			if (commit)
-				_db.Config.WriterCheckpoint.Write(logPos);
-
-			_db.Config.WriterCheckpoint.Flush();
-			return new DbResult(_db, records.Select(rs => rs.ToArray()).ToArray(), streams);
-		}
-
-		void Write(int chunkNum, TFChunk chunk, ILogRecord record, bool commitWrite, out long newPos) {
-			var writerRes = chunk.TryAppend(record);
-			if (!writerRes.Success)
-				throw new Exception(string.Format("Could not write log record: {0}", record));
-
-			newPos = chunkNum * (long)_db.Config.ChunkSize + writerRes.NewPosition;
-
-			if (commitWrite)
-				_db.Config.WriterCheckpoint.Write(newPos);
-		}
-
-		private byte[] FormatData(Rec rec) {
-			return rec.Data ?? rec.Metadata?.ToJsonBytes() ?? rec.Id.ToByteArray();
-		}
-
-		private ILogRecord CreateLogRecord(Rec rec, TStreamId streamId, TStreamId eventTypeId, TransactionInfo transInfo, long logPos, long expectedVersion) {
-			switch (rec.Type) {
-				case Rec.RecType.Prepare: {
-					int transOffset = transInfo.TransactionOffset;
-					transInfo.TransactionOffset += 1;
-
-					if (rec.Version == LogRecordVersion.LogRecordV0) {
-						return CreateLogRecordV0(rec, transInfo, transOffset, logPos, expectedVersion,
-							FormatData(rec),
-							rec.PrepareFlags
-							| PrepareFlags.Data
-							| (transInfo.FirstPrepareId == rec.Id ? PrepareFlags.TransactionBegin : PrepareFlags.None)
-							| (transInfo.LastPrepareId == rec.Id ? PrepareFlags.TransactionEnd : PrepareFlags.None)
-							| (rec.Metadata == null ? PrepareFlags.None : PrepareFlags.IsJson));
-					}
-
-					return LogRecord.Prepare(_logFormat.RecordFactory, logPos,
-						Guid.NewGuid(),
-						rec.Id,
-						transInfo.TransactionPosition,
-						transOffset,
-						streamId,
-						expectedVersion,
-						rec.PrepareFlags
-						| (transInfo.FirstPrepareId == rec.Id ? PrepareFlags.TransactionBegin : PrepareFlags.None)
-						| (transInfo.LastPrepareId == rec.Id ? PrepareFlags.TransactionEnd : PrepareFlags.None)
-						| (rec.Metadata == null ? PrepareFlags.None : PrepareFlags.IsJson),
-						eventTypeId,
-						FormatData(rec),
-						null,
-						rec.TimeStamp);
-				}
-
-				case Rec.RecType.Delete: {
-					int transOffset = transInfo.TransactionOffset;
-					transInfo.TransactionOffset += 1;
-
-					if (rec.Version == LogRecordVersion.LogRecordV0) {
-						return CreateLogRecordV0(rec, transInfo, transOffset, logPos, expectedVersion,
-							LogRecord.NoData,
-							rec.PrepareFlags
-							| PrepareFlags.StreamDelete
-							| (transInfo.FirstPrepareId == rec.Id ? PrepareFlags.TransactionBegin : PrepareFlags.None)
-							| (transInfo.LastPrepareId == rec.Id ? PrepareFlags.TransactionEnd : PrepareFlags.None));
-					}
-
-					return LogRecord.Prepare(_logFormat.RecordFactory, logPos,
-						Guid.NewGuid(),
-						rec.Id,
-						transInfo.TransactionPosition,
-						transOffset,
-						streamId,
-						expectedVersion,
-						rec.PrepareFlags
-						| PrepareFlags.StreamDelete
-						| (transInfo.FirstPrepareId == rec.Id ? PrepareFlags.TransactionBegin : PrepareFlags.None)
-						| (transInfo.LastPrepareId == rec.Id ? PrepareFlags.TransactionEnd : PrepareFlags.None),
-						eventTypeId,
-						LogRecord.NoData,
-						null,
-						rec.TimeStamp);
-				}
-
-				case Rec.RecType.TransStart:
-				case Rec.RecType.TransEnd: {
-					if (rec.Version == LogRecordVersion.LogRecordV0) {
-						return CreateLogRecordV0(rec, transInfo, -1, logPos, expectedVersion,
-							LogRecord.NoData,
-							(transInfo.FirstPrepareId == rec.Id ? PrepareFlags.TransactionBegin : PrepareFlags.None)
-							| (transInfo.LastPrepareId == rec.Id ? PrepareFlags.TransactionEnd : PrepareFlags.None));
-					}
-
-					return LogRecord.Prepare(_logFormat.RecordFactory, logPos,
-						Guid.NewGuid(),
-						rec.Id,
-						transInfo.TransactionPosition,
-						-1,
-						streamId,
-						expectedVersion,
-						(transInfo.FirstPrepareId == rec.Id ? PrepareFlags.TransactionBegin : PrepareFlags.None)
-						| (transInfo.LastPrepareId == rec.Id ? PrepareFlags.TransactionEnd : PrepareFlags.None),
-						eventTypeId,
-						LogRecord.NoData,
-						null,
-						rec.TimeStamp);
-				}
-				case Rec.RecType.Commit: {
-					if (rec.Version == LogRecordVersion.LogRecordV0) {
-						return new CommitLogRecord(logPos, Guid.NewGuid(), transInfo.TransactionPosition,
-							DateTime.UtcNow, transInfo.TransactionEventNumber, LogRecordVersion.LogRecordV0);
-					}
-
-					return LogRecord.Commit(logPos, Guid.NewGuid(), transInfo.TransactionPosition,
-						transInfo.TransactionEventNumber);
-				}
-				default:
-					throw new ArgumentOutOfRangeException();
-			}
-		}
-
-		private LogRecord CreateLogRecordV0(Rec rec, TransactionInfo transInfo, int transOffset, long logPos,
-			long expectedVersion, ReadOnlyMemory<byte> data, PrepareFlags flags) {
-
-			LogFormatHelper<TLogFormat, TStreamId>.EnsureV0PrepareSupported();
-
-			return new PrepareLogRecord(logPos,
-				Guid.NewGuid(),
-				rec.Id,
-				transInfo.TransactionPosition,
-				transOffset,
-				rec.StreamId,
-				null,
-				expectedVersion,
-				rec.TimeStamp,
-				flags,
-				rec.EventType,
-				null,
-				data,
-				null,
-				LogRecordVersion.LogRecordV0);
-		}
-	}
-
-	public class TransactionInfo {
-		public readonly string StreamId;
-		public readonly Guid FirstPrepareId;
-		public Guid LastPrepareId;
-		public long TransactionPosition = -1;
-		public int TransactionOffset = 0;
-		public long TransactionEventNumber = -1;
-		public bool IsDelete = false;
-		public StreamMetadata StreamMetadata;
-
-		public TransactionInfo(string streamId, Guid firstPrepareId, Guid lastPrepareId) {
-			StreamId = streamId;
-			FirstPrepareId = firstPrepareId;
-			LastPrepareId = lastPrepareId;
-		}
-	}
-
-	public class StreamInfo {
-		public long StreamVersion;
-		public StreamMetadata StreamMetadata;
-
-		public StreamInfo(long streamVersion) {
-			StreamVersion = streamVersion;
-		}
-	}
-
-	public class DbResult {
-		public TFChunkDb Db { get; }
-		public ILogRecord[][] Recs { get; }
-		public Dictionary<string, StreamInfo> Streams { get; }
-
-		public DbResult(TFChunkDb db, ILogRecord[][] recs, Dictionary<string, StreamInfo> streams) {
-			Ensure.NotNull(db, "db");
-			Ensure.NotNull(recs, "recs");
-			Ensure.NotNull(streams, "streams");
-
-			Db = db;
-			Recs = recs;
-			Streams = streams;
-		}
-	}
-
-	public class Rec {
-		public enum RecType {
-			Prepare,
-			Delete,
-			TransStart,
-			TransEnd,
-			Commit
-		}
-
-		public readonly RecType Type;
-		public readonly Guid Id;
-		public readonly int Transaction;
-		public readonly string StreamId;
-		public readonly string EventType;
-		public readonly DateTime TimeStamp;
-		public readonly long? EventNumber;
-		public readonly byte[] Data;
-		public readonly StreamMetadata Metadata;
-		public readonly PrepareFlags PrepareFlags;
-		public readonly byte Version;
-
-		// commit all writes except incomplete implicit transactions
-		public bool CommitWrite => !(Type == RecType.Prepare &&
-		                             PrepareFlags.HasFlag(PrepareFlags.IsCommitted) &&
-		                             !PrepareFlags.HasFlag(PrepareFlags.TransactionEnd));
-
-		public Rec(RecType type, int transaction, string streamId, string eventType, DateTime? timestamp, byte version,
-			long? eventNumber = null,
-			byte[] data = null,
-			StreamMetadata metadata = null, PrepareFlags prepareFlags = PrepareFlags.Data) {
-			Ensure.NotNullOrEmpty(streamId, "streamId");
-			Ensure.Nonnegative(transaction, "transaction");
-
-			if (data != null && metadata != null)
-				throw new Exception("two kinds of data were specified");
-
-			Type = type;
-			Id = Guid.NewGuid();
-			Transaction = transaction;
-			StreamId = streamId;
-			EventType = eventType ?? string.Empty;
-			TimeStamp = timestamp ?? DateTime.UtcNow;
-			Version = version;
-			EventNumber = eventNumber;
-			Data = data;
-			Metadata = metadata;
-			PrepareFlags = prepareFlags;
-		}
-
-		public static Rec Delete(int transaction, string stream, DateTime? timestamp = null,
-			byte version = PrepareLogRecord.PrepareRecordVersion) {
-			return new Rec(RecType.Delete, transaction, stream, SystemEventTypes.StreamDeleted, timestamp, version);
-		}
-
-		public static Rec CommittedDelete(int transaction, string stream, DateTime? timestamp = null,
-			byte version = PrepareLogRecord.PrepareRecordVersion) {
-			return new Rec(RecType.Delete, transaction, stream, SystemEventTypes.StreamDeleted, timestamp, version,
-				prepareFlags: PrepareFlags.IsCommitted);
-		}
-
-		public static Rec TransSt(int transaction, string stream, DateTime? timestamp = null,
-			byte version = PrepareLogRecord.PrepareRecordVersion) {
-			return new Rec(RecType.TransStart, transaction, stream, null, timestamp, version);
-		}
-
-		public static Rec Prepare(int transaction, string stream, string eventType = null, DateTime? timestamp = null,
-			long? eventNumber = null,
-			byte[] data = null,
-			StreamMetadata metadata = null, PrepareFlags prepareFlags = PrepareFlags.Data,
-			byte version = PrepareLogRecord.PrepareRecordVersion) {
-			return new Rec(RecType.Prepare, transaction, stream, eventType, timestamp, version, eventNumber, data, metadata, prepareFlags);
-		}
-
-		public static Rec Write(int transaction, string stream, string eventType = null, DateTime? timestamp = null,
-			long? eventNumber = null,
-			byte[] data = null,
-			StreamMetadata metadata = null, PrepareFlags prepareFlags = PrepareFlags.SingleWrite | PrepareFlags.IsCommitted,
-			byte version = PrepareLogRecord.PrepareRecordVersion) {
-			return new Rec(RecType.Prepare, transaction, stream, eventType, timestamp, version, eventNumber, data, metadata, prepareFlags);
-		}
-
-		public static Rec TransEnd(int transaction, string stream, DateTime? timestamp = null,
-			byte version = PrepareLogRecord.PrepareRecordVersion) {
-			return new Rec(RecType.TransEnd, transaction, stream, null, timestamp, version);
-		}
-
-		public static Rec Commit(int transaction, string stream, DateTime? timestamp = null,
-			byte version = CommitLogRecord.CommitRecordVersion) {
-			return new Rec(RecType.Commit, transaction, stream, null, timestamp, version);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/scavenged_chunk.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/scavenged_chunk.cs
deleted file mode 100644
index 22ff4a6c51a..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/scavenged_chunk.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.Transforms.Identity;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture]
-	public class scavenged_chunk : SpecificationWithFile {
-		[Test]
-		public async Task is_fully_resident_in_memory_when_cached() {
-			var map = new List<PosMap>();
-			var chunk = TFChunk.CreateNew(Filename, 1024 * 1024, 0, 0, true, false, false, false,
-				false,
-				new TFChunkTracker.NoOp(),
-				new IdentityChunkTransformFactory());
-			long logPos = 0;
-			for (int i = 0, n = ChunkFooter.Size / PosMap.FullSize + 1; i < n; ++i) {
-				map.Add(new PosMap(logPos, (int)logPos));
-				var res = chunk.TryAppend(LogRecord.Commit(logPos, Guid.NewGuid(), logPos, 0));
-				Assert.IsTrue(res.Success);
-				logPos = res.NewPosition;
-			}
-
-			await chunk.CompleteScavenge(map, CancellationToken.None);
-
-			chunk.CacheInMemory();
-
-			Assert.IsTrue(chunk.IsCached);
-
-			var last = chunk.TryReadLast();
-			Assert.IsTrue(last.Success);
-			Assert.AreEqual(map[map.Count - 1].ActualPos, last.LogRecord.LogPosition);
-
-			chunk.MarkForDeletion();
-			chunk.WaitForDestroy(1000);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_deleted_stream_with_a_lot_of_data_is_scavenged.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_deleted_stream_with_a_lot_of_data_is_scavenged.cs
deleted file mode 100644
index 2cdaf904338..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_deleted_stream_with_a_lot_of_data_is_scavenged.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_deleted_stream_with_a_lot_of_data_is_scavenged<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator
-				.Chunk(Rec.Prepare(0, "bla"),
-					Rec.Prepare(0, "bla"),
-					Rec.Commit(0, "bla"),
-					Rec.Prepare(1, "bla"),
-					Rec.Prepare(1, "bla"),
-					Rec.Prepare(1, "bla"),
-					Rec.Prepare(1, "bla"),
-					Rec.Commit(1, "bla"),
-					Rec.Delete(2, "bla"),
-					Rec.Commit(2, "bla"))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			var keep = LogFormatHelper<TLogFormat, TStreamId>.IsV2
-				? new int[] { 8, 9 }
-				: new int[] { 0, 9, 10 }; // "bla" created
-
-			return new[] {
-				dbResult.Recs[0].Where((x, i) => keep.Contains(i)).ToArray(),
-			};
-		}
-
-		[Test]
-		public async Task only_delete_tombstone_records_with_their_commits_are_kept() {
-			await CheckRecords();
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_deleted_stream_with_a_lot_of_data_is_scavenged_with_ingore_harddelete<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		protected override bool UnsafeIgnoreHardDelete() {
-			return true;
-		}
-
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator
-				.Chunk(Rec.Prepare(0, "bla"),
-					Rec.Prepare(0, "bla"),
-					Rec.Commit(0, "bla"),
-					Rec.Prepare(1, "bla"),
-					Rec.Prepare(1, "bla"),
-					Rec.Prepare(1, "bla"),
-					Rec.Prepare(1, "bla"),
-					Rec.Commit(1, "bla"),
-					Rec.Delete(2, "bla"),
-					Rec.Commit(2, "bla"))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			var keep = LogFormatHelper<TLogFormat, TStreamId>.IsV2
-				? new int[] { }
-				: new int[] { 0 }; // "bla" created
-
-			return new[] {
-				dbResult.Recs[0].Where((x, i) => keep.Contains(i)).ToArray(),
-			};
-		}
-
-		[Test]
-		public async Task only_delete_tombstone_records_with_their_commits_are_kept() {
-			await CheckRecords();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_deleted_stream_with_explicit_transaction_is_scavenged.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_deleted_stream_with_explicit_transaction_is_scavenged.cs
deleted file mode 100644
index f7745e0d193..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_deleted_stream_with_explicit_transaction_is_scavenged.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class when_deleted_stream_with_explicit_transaction_is_scavenged<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator
-				.Chunk(Rec.TransSt(0, "bla"),
-					Rec.Prepare(0, "bla"),
-					Rec.Prepare(0, "bla"),
-					Rec.Prepare(0, "bla"),
-					Rec.Prepare(0, "bla"),
-					Rec.TransEnd(0, "bla"),
-					Rec.Commit(0, "bla"),
-					Rec.Delete(1, "bla"),
-					Rec.Commit(1, "bla"))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			return new[] {
-				dbResult.Recs[0].Where((x, i) => new[] {7, 8}.Contains(i)).ToArray(),
-			};
-		}
-
-		[Test]
-		public async Task only_delete_tombstone_records_with_their_commits_are_kept() {
-			await CheckRecords();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_deleted_stream_with_metadata_is_scavenged.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_deleted_stream_with_metadata_is_scavenged.cs
deleted file mode 100644
index 08605dc8dee..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_deleted_stream_with_metadata_is_scavenged.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_deleted_stream_with_metadata_is_scavenged<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator
-				.Chunk(Rec.Prepare(0, "$$bla", metadata: new StreamMetadata(10, null, null, null, null)),
-					Rec.Prepare(0, "$$bla", metadata: new StreamMetadata(2, null, null, null, null)),
-					Rec.Commit(0, "$$bla"),
-					Rec.Delete(1, "bla"),
-					Rec.Commit(1, "bla"))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			return LogFormatHelper<TLogFormat, TStreamId>.IsV2
-				? new[] { dbResult.Recs[0].Where((x, i) => i >= 3).ToArray() }
-				: new[] { dbResult.Recs[0].Where((x, i) => i == 0 || i >= 4).ToArray() };
-		}
-
-		[Test]
-		public async Task metastream_is_scavenged_as_well() {
-			await CheckRecords();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_having_nothing_to_scavenge.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_having_nothing_to_scavenge.cs
deleted file mode 100644
index c5a14a17e96..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_having_nothing_to_scavenge.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_having_nothing_to_scavenge<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator
-				.Chunk(Rec.Prepare(0, "bla"),
-					Rec.Prepare(1, "bla"),
-					Rec.Commit(0, "bla"))
-				.Chunk(Rec.Prepare(2, "bla3"),
-					Rec.Prepare(2, "bla3"),
-					Rec.Commit(1, "bla"),
-					Rec.Commit(2, "bla3"))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			return dbResult.Recs;
-		}
-
-		[Test]
-		public async Task all_records_are_kept_untouched() {
-			await CheckRecords();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_both_max_age_and_max_count_with_stricted_max_age_specified.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_both_max_age_and_max_count_with_stricted_max_age_specified.cs
deleted file mode 100644
index 478271b12ed..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_both_max_age_and_max_count_with_stricted_max_age_specified.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_having_stream_with_both_max_age_and_max_count_with_stricter_max_age_specified<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator
-				.Chunk(
-					Rec.Prepare(3, "$$bla", metadata: new StreamMetadata(5, TimeSpan.FromMinutes(5), null, null, null)),
-					Rec.Commit(3, "$$bla"),
-					Rec.Prepare(0, "bla"),
-					Rec.Commit(0, "bla"),
-					Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(100)),
-					Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(90)),
-					Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(60)),
-					Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(40)),
-					Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(30)),
-					Rec.Commit(1, "bla"),
-					Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(20)),
-					Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(3)),
-					Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(2)),
-					Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(1)),
-					Rec.Commit(2, "bla"))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			var keep = LogFormatHelper<TLogFormat, TStreamId>.IsV2
-				? new int[] { 0, 1, 11, 12, 13, 14 }
-				: new int[] { 0, 1, 2, 12, 13, 14, 15 };
-
-			return new[] {
-				dbResult.Recs[0].Where((x, i) => keep.Contains(i)).ToArray(),
-			};
-		}
-
-		[Test]
-		public async Task expired_prepares_are_scavenged() {
-			await CheckRecords();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_both_max_age_and_max_count_with_stricted_max_count_specified.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_both_max_age_and_max_count_with_stricted_max_count_specified.cs
deleted file mode 100644
index d60fa1bc9c6..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_both_max_age_and_max_count_with_stricted_max_count_specified.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_having_stream_with_both_max_age_and_max_count_with_stricter_max_count_specified<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator
-				.Chunk(
-					Rec.Prepare(0, "$$bla",
-						metadata: new StreamMetadata(3, TimeSpan.FromMinutes(50), null, null, null)),
-					Rec.Commit(0, "$$bla"),
-					Rec.Prepare(3, "bla"),
-					Rec.Commit(3, "bla"),
-					Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(100)),
-					Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(90)),
-					Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(60)),
-					Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(40)),
-					Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(30)),
-					Rec.Commit(1, "bla"),
-					Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(20)),
-					Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(3)),
-					Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(2)),
-					Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(1)),
-					Rec.Commit(2, "bla"))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			var keep = LogFormatHelper<TLogFormat, TStreamId>.IsV2
-				? new int[] { 0, 1, 11, 12, 13, 14 }
-				: new int[] { 0, 1, 2, 12, 13, 14, 15 };
-
-			return new[] {
-				dbResult.Recs[0].Where((x, i) => keep.Contains(i)).ToArray(),
-			};
-		}
-
-		[Test]
-		public async Task expired_prepares_are_scavenged() {
-			await CheckRecords();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_max_age_specified.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_max_age_specified.cs
deleted file mode 100644
index 95097a2aba1..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_max_age_specified.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_having_stream_with_max_age_specified<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator
-				.Chunk(
-					Rec.Prepare(0, "$$bla",
-						metadata: new StreamMetadata(null, TimeSpan.FromMinutes(5), null, null, null)),
-					Rec.Commit(0, "$$bla"),
-					Rec.Prepare(3, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(110)),
-					Rec.Commit(3, "bla"),
-					Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(100)),
-					Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(90)),
-					Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(60)),
-					Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(40)),
-					Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(30)),
-					Rec.Commit(1, "bla"),
-					Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(20)),
-					Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(3)),
-					Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(2)),
-					Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(1)),
-					Rec.Commit(2, "bla"))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			var keep = LogFormatHelper<TLogFormat, TStreamId>.IsV2
-				? new int[] { 0, 1, 11, 12, 13, 14 }
-				: new int[] { 0, 1, 2, 12, 13, 14, 15 };
-
-			return new[] {
-				dbResult.Recs[0].Where((x, i) => keep.Contains(i)).ToArray(),
-			};
-		}
-
-		[Test]
-		public async Task expired_prepares_are_scavenged() {
-			await CheckRecords();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_max_count_specified.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_max_count_specified.cs
deleted file mode 100644
index 937614be9f2..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_max_count_specified.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_having_stream_with_max_count_specified<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator
-				.Chunk(Rec.Prepare(0, "$$bla", metadata: new StreamMetadata(maxCount: 3)),
-					Rec.Commit(0, "$$bla"),
-					Rec.Prepare(1, "bla"),
-					Rec.Commit(1, "bla"),
-					Rec.Prepare(2, "bla"),
-					Rec.Prepare(2, "bla"),
-					Rec.Prepare(2, "bla"),
-					Rec.Prepare(2, "bla"),
-					Rec.Prepare(2, "bla"),
-					Rec.Commit(2, "bla"),
-					Rec.Prepare(3, "bla"),
-					Rec.Prepare(3, "bla"),
-					Rec.Prepare(3, "bla"),
-					Rec.Prepare(3, "bla"),
-					Rec.Commit(3, "bla"))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			var keep = LogFormatHelper<TLogFormat, TStreamId>.IsV2
-				? new int[] { 0, 1, 11, 12, 13, 14 }
-				: new int[] { 0, 1, 2, 12, 13, 14, 15 };
-
-			return new[] {
-				dbResult.Recs[0].Where((x, i) => keep.Contains(i)).ToArray(),
-			};
-		}
-
-		[Test]
-		public async Task expired_prepares_are_scavenged() {
-			await CheckRecords();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_start_from_specified.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_start_from_specified.cs
deleted file mode 100644
index e599fd3077f..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_start_from_specified.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_having_stream_with_truncatebefore_specified<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator
-				.Chunk(Rec.Prepare(0, "$$bla", metadata: new StreamMetadata(truncateBefore: 7)),
-					Rec.Commit(0, "$$bla"),
-					Rec.Prepare(1, "bla"), // event 0
-					Rec.Commit(1, "bla"),
-					Rec.Prepare(2, "bla"), // event 1
-					Rec.Prepare(2, "bla"), // event 2
-					Rec.Prepare(2, "bla"), // event 3
-					Rec.Prepare(2, "bla"), // event 4
-					Rec.Prepare(2, "bla"), // event 5
-					Rec.Commit(2, "bla"),
-					Rec.Prepare(3, "bla"), // event 6
-					Rec.Prepare(3, "bla"), // event 7
-					Rec.Prepare(3, "bla"), // event 8
-					Rec.Prepare(3, "bla"), // event 9
-					Rec.Commit(3, "bla"))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			var keep = LogFormatHelper<TLogFormat, TStreamId>.IsV2
-				? new int[] { 0, 1, 11, 12, 13, 14 }
-				: new int[] { 0, 1, 2, 12, 13, 14, 15 };
-
-			return new[] {
-				dbResult.Recs[0].Where((x, i) => keep.Contains(i)).ToArray(),
-			};
-		}
-
-		[Test]
-		public async Task expired_prepares_are_scavenged() {
-			await CheckRecords();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_strict_max_age_leaving_no_events_in_stream.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_strict_max_age_leaving_no_events_in_stream.cs
deleted file mode 100644
index 67720ae8c35..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_strict_max_age_leaving_no_events_in_stream.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_having_stream_with_strict_max_age_leaving_no_events_in_stream<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator
-				.Chunk(
-					Rec.Prepare(0, "$$bla",
-						metadata: new StreamMetadata(null, TimeSpan.FromMinutes(1), null, null, null)),
-					Rec.Commit(0, "$$bla"),
-					Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(25)),
-					Rec.Commit(1, "bla"),
-					Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(20)),
-					Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(10)),
-					Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(5)),
-					Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(3)),
-					Rec.Commit(2, "bla"))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			var keep = LogFormatHelper<TLogFormat, TStreamId>.IsV2
-				? new int[] { 0, 1, 7, 8 }
-				: new int[] { 0, 1, 2, 8, 9 };
-
-			return new[] {
-				dbResult.Recs[0].Where((x, i) => keep.Contains(i)).ToArray(),
-			};
-		}
-
-		[Test]
-		public async Task expired_prepares_are_scavenged_but_the_last_in_stream_is_physically_kept() {
-			await CheckRecords();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_metastream_is_scavenged_and_read_index_is_set_to_keep_just_last_metaevent.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_metastream_is_scavenged_and_read_index_is_set_to_keep_just_last_metaevent.cs
deleted file mode 100644
index 68a4be277cb..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_metastream_is_scavenged_and_read_index_is_set_to_keep_just_last_metaevent.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_metastream_is_scavenged_and_read_index_is_set_to_keep_just_last_metaevent<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator
-				.Chunk(Rec.Prepare(0, "$$bla", metadata: new StreamMetadata(10, null, null, null, null)),
-					Rec.Prepare(0, "$$bla", metadata: new StreamMetadata(5, null, null, null, null)),
-					Rec.Prepare(0, "$$bla", metadata: new StreamMetadata(3, null, null, null, null)),
-					Rec.Prepare(0, "$$bla", metadata: new StreamMetadata(2, null, null, null, null)),
-					Rec.Commit(0, "$$bla"))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			return LogFormatHelper<TLogFormat, TStreamId>.IsV2
-				? new[] { dbResult.Recs[0].Where((x, i) => i >= 3).ToArray() }
-				: new[] { dbResult.Recs[0].Where((x, i) => i == 0 || i >= 4).ToArray() };
-		}
-
-		[Test]
-		public async Task only_last_metaevent_is_left() {
-			await CheckRecords();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_metastream_is_scavenged_and_read_index_is_set_to_keep_last_3_metaevents.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_metastream_is_scavenged_and_read_index_is_set_to_keep_last_3_metaevents.cs
deleted file mode 100644
index 5d5e0d0fbf4..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_metastream_is_scavenged_and_read_index_is_set_to_keep_last_3_metaevents.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_metastream_is_scavenged_and_read_index_is_set_to_keep_last_3_metaevents<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		public when_metastream_is_scavenged_and_read_index_is_set_to_keep_last_3_metaevents() :
-			base(metastreamMaxCount: 3) {
-		}
-
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator
-				.Chunk(Rec.Prepare(0, "$$bla"),
-					Rec.Prepare(0, "$$bla"),
-					Rec.Prepare(0, "$$bla"),
-					Rec.Prepare(0, "$$bla"),
-					Rec.Prepare(0, "$$bla"),
-					Rec.Commit(0, "$$bla"))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			return LogFormatHelper<TLogFormat, TStreamId>.IsV2
-				? new[] { dbResult.Recs[0].Where((x, i) => i >= 2).ToArray() }
-				: new[] { dbResult.Recs[0].Where((x, i) => i == 0 || i >= 3).ToArray() };
-		}
-
-		[Test]
-		public async Task metastream_is_scavenged_correctly() {
-			await CheckRecords();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_after_chunck_scavenged.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_after_chunck_scavenged.cs
deleted file mode 100644
index ad99e19c586..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_after_chunck_scavenged.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_scavenge_cancelled_after_chunck_scavenged<TLogFormat, TStreamId> : ScavengeLifeCycleScenario<TLogFormat, TStreamId> {
-		protected override async Task When() {
-			var cancellationTokenSource = new CancellationTokenSource();
-
-			Log.ChunkScavenged += (sender, args) => cancellationTokenSource.Cancel();
-			await TfChunkScavenger.Scavenge(true, true, 0, ct: cancellationTokenSource.Token);
-		}
-
-		[Test]
-		public void completed_logged_with_stopped_result() {
-			Assert.That(Log.Completed);
-			Assert.That(Log.Result, Is.EqualTo(ScavengeResult.Stopped));
-		}
-
-		[Test]
-		public void scavenge_record_for_first_and_cancelled_chunk() {
-			Assert.That(Log.Scavenged, Has.Count.EqualTo(1));
-			Assert.That(Log.Scavenged[0].Scavenged, Is.True);
-		}
-
-
-		[Test]
-		public void doesnt_call_scavenge_on_the_table_index() {
-			Assert.That(FakeTableIndex.ScavengeCount, Is.EqualTo(0));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_after_completed.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_after_completed.cs
deleted file mode 100644
index 2a52dc9abe5..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_after_completed.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_scavenge_cancelled_after_completed<TLogFormat, TStreamId> : ScavengeLifeCycleScenario<TLogFormat, TStreamId> {
-		protected override async Task When() {
-			var cancellationTokenSource = new CancellationTokenSource();
-
-			Log.CompletedCallback += (sender, args) => cancellationTokenSource.Cancel();
-			await TfChunkScavenger.Scavenge(true, true, 0, ct: cancellationTokenSource.Token);
-		}
-
-		[Test]
-		public void completed_logged_with_success_result() {
-			Assert.That(Log.Completed);
-			Assert.That(Log.Result, Is.EqualTo(ScavengeResult.Success));
-		}
-
-		[Test]
-		public void scavenge_record_for_all_completed_chunks() {
-			Assert.That(Log.Scavenged, Has.Count.EqualTo(2));
-			Assert.That(Log.Scavenged[0].Scavenged, Is.True);
-			Assert.That(Log.Scavenged[1].Scavenged, Is.True);
-		}
-
-
-		[Test]
-		public void merge_record_for_all_completed_merged() {
-			Assert.That(Log.Merged, Has.Count.EqualTo(1));
-			Assert.That(Log.Merged[0].Scavenged, Is.True);
-		}
-
-
-		[Test]
-		public void calls_scavenge_on_the_table_index() {
-			Assert.That(FakeTableIndex.ScavengeCount, Is.EqualTo(1));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_after_started.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_after_started.cs
deleted file mode 100644
index 0b725ac8568..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_after_started.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_scavenge_cancelled_after_started<TLogFormat, TStreamId> : ScavengeLifeCycleScenario<TLogFormat, TStreamId> {
-		protected override async Task When() {
-			var cancellationTokenSource = new CancellationTokenSource();
-
-			Log.StartedCallback += (sender, args) => cancellationTokenSource.Cancel();
-			await TfChunkScavenger.Scavenge(false, true, 0, ct: cancellationTokenSource.Token);
-		}
-
-		[Test]
-		public void completed_logged_with_stopped_result() {
-			Assert.That(Log.Completed);
-			Assert.That(Log.Result, Is.EqualTo(ScavengeResult.Stopped));
-		}
-
-		[Test]
-		public void no_chunks_scavenged() {
-			Assert.That(Log.Scavenged, Is.Empty);
-		}
-
-		[Test]
-		public void doesnt_call_scavenge_on_the_table_index() {
-			Assert.That(FakeTableIndex.ScavengeCount, Is.EqualTo(0));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_before_started.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_before_started.cs
deleted file mode 100644
index 1a274a3db8b..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_before_started.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_scavenge_cancelled_before_started<TLogFormat, TStreamId> : ScavengeLifeCycleScenario<TLogFormat, TStreamId> {
-		protected override async Task When() {
-			var cancellationTokenSource = new CancellationTokenSource();
-			cancellationTokenSource.Cancel();
-			await TfChunkScavenger.Scavenge(false, true, 0, ct: cancellationTokenSource.Token);
-		}
-
-		[Test]
-		public void completed_logged_with_stopped_result() {
-			Assert.That(Log.Completed);
-			Assert.That(Log.Result, Is.EqualTo(ScavengeResult.Stopped));
-		}
-
-		[Test]
-		public void no_chunks_scavenged() {
-			Assert.That(Log.Scavenged, Is.Empty);
-		}
-
-		[Test]
-		public void doesnt_call_scavenge_on_the_table_index() {
-			Assert.That(FakeTableIndex.ScavengeCount, Is.EqualTo(0));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_from_chunk_number.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_from_chunk_number.cs
deleted file mode 100644
index 1461aeb5ce3..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_from_chunk_number.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_scavenge_from_chunk_number<TLogFormat, TStreamId> : ScavengeLifeCycleScenario<TLogFormat, TStreamId> {
-		protected override Task When() {
-			var cancellationTokenSource = new CancellationTokenSource();
-			return TfChunkScavenger.Scavenge(true, true, 1, ct: cancellationTokenSource.Token);
-		}
-
-		[Test]
-		public void log_started() {
-			Assert.That(Log.Started);
-		}
-
-		[Test]
-		public void log_completed_with_success() {
-			Assert.That(Log.Completed);
-			Assert.That(Log.Result, Is.EqualTo(ScavengeResult.Success));
-		}
-
-		[Test]
-		public void scavenge_record_for_chunks_1_plus() {
-			Assert.That(Log.Scavenged, Has.Count.EqualTo(1));
-			Assert.That(Log.Scavenged[0].Scavenged, Is.True);
-			Assert.That(Log.Scavenged[0].ChunkStart, Is.EqualTo(1));
-			Assert.That(Log.Scavenged[0].ChunkEnd, Is.EqualTo(1));
-		}
-
-		[Test]
-		public void scavenge_record_for_chunks_all() {
-			Assert.That(Log.Merged, Has.Count.EqualTo(1));
-			Assert.That(Log.Merged[0].Scavenged, Is.True);
-			Assert.That(Log.Merged[0].ChunkStart, Is.EqualTo(0));
-			Assert.That(Log.Merged[0].ChunkEnd, Is.EqualTo(1));
-		}
-
-		[Test]
-		public void calls_scavenge_on_the_table_index() {
-			Assert.That(FakeTableIndex.ScavengeCount, Is.EqualTo(1));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_succeeds_without_error.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_succeeds_without_error.cs
deleted file mode 100644
index 4b0e13f4b51..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_succeeds_without_error.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_scavenge_succeeds_without_error<TLogFormat, TStreamId> : ScavengeLifeCycleScenario<TLogFormat, TStreamId> {
-		protected override Task When() {
-			var cancellationTokenSource = new CancellationTokenSource();
-			return TfChunkScavenger.Scavenge(true, true, 0, ct: cancellationTokenSource.Token);
-		}
-
-		[Test]
-		public void log_started() {
-			Assert.That(Log.Started);
-		}
-
-		[Test]
-		public void log_completed_with_success() {
-			Assert.That(Log.Completed);
-			Assert.That(Log.Result, Is.EqualTo(ScavengeResult.Success));
-		}
-
-		[Test]
-		public void scavenge_record_for_all_completed_chunks() {
-			Assert.That(Log.Scavenged, Has.Count.EqualTo(2));
-			Assert.That(Log.Scavenged[0].Scavenged, Is.True);
-			Assert.That(Log.Scavenged[0].ChunkStart, Is.EqualTo(0));
-			Assert.That(Log.Scavenged[0].ChunkEnd, Is.EqualTo(0));
-			Assert.That(Log.Scavenged[1].Scavenged, Is.True);
-			Assert.That(Log.Scavenged[1].ChunkStart, Is.EqualTo(1));
-			Assert.That(Log.Scavenged[1].ChunkEnd, Is.EqualTo(1));
-		}
-
-		[Test]
-		public void merge_record_for_all_completed_merges() {
-			Assert.That(Log.Merged, Has.Count.EqualTo(1));
-			Assert.That(Log.Merged[0].Scavenged, Is.True);
-			Assert.That(Log.Merged[0].ChunkStart, Is.EqualTo(0));
-			Assert.That(Log.Merged[0].ChunkEnd, Is.EqualTo(1));
-		}
-
-		[Test]
-		public void calls_scavenge_on_the_table_index() {
-			Assert.That(FakeTableIndex.ScavengeCount, Is.EqualTo(1));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_throws_exception_on_completed.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_throws_exception_on_completed.cs
deleted file mode 100644
index a8b4eb3c099..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_throws_exception_on_completed.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_scavenge_throws_exception_on_completed<TLogFormat, TStreamId> : ScavengeLifeCycleScenario<TLogFormat, TStreamId> {
-		protected override Task When() {
-			var cancellationTokenSource = new CancellationTokenSource();
-
-			Log.CompletedCallback += (sender, args) => { throw new Exception("Expected exception."); };
-			return TfChunkScavenger.Scavenge(true, true, 0, ct: cancellationTokenSource.Token);
-		}
-
-		[Test]
-		public void no_exception_is_thrown() {
-			Assert.That(Log.Completed);
-			Assert.That(Log.Result, Is.EqualTo(ScavengeResult.Success));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_throws_exception_processing_chunk.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_throws_exception_processing_chunk.cs
deleted file mode 100644
index 4c1a94310ae..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_scavenge_throws_exception_processing_chunk.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_scavenge_throws_exception_processing_chunk<TLogFormat, TStreamId> : ScavengeLifeCycleScenario<TLogFormat, TStreamId> {
-		protected override Task When() {
-			var cancellationTokenSource = new CancellationTokenSource();
-
-			Log.ChunkScavenged += (sender, args) => {
-				if (args.Scavenged)
-					throw new Exception("Expected exception.");
-			};
-
-			return TfChunkScavenger.Scavenge(true, true, 0, ct: cancellationTokenSource.Token);
-		}
-
-		[Test]
-		public void no_exception_is_thrown_to_caller() {
-			Assert.That(Log.Completed);
-			Assert.That(Log.Result, Is.EqualTo(ScavengeResult.Errored));
-		}
-
-		[Test]
-		public void doesnt_call_scavenge_on_the_table_index() {
-			Assert.That(FakeTableIndex.ScavengeCount, Is.EqualTo(0));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_stream_is_deleted.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_stream_is_deleted.cs
deleted file mode 100644
index 3defc5e4744..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_stream_is_deleted.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_stream_is_deleted<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator
-				.Chunk(Rec.Prepare(0, "bla"), Rec.Prepare(0, "bla"), Rec.Commit(0, "bla"))
-				.Chunk(Rec.Delete(1, "bla"), Rec.Commit(1, "bla"))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
-				return new[] {
-					new ILogRecord[0],
-					dbResult.Recs[1]
-				};
-			}
-
-			return new[] {
-				new[] {
-					dbResult.Recs[0][0], // "bla" created
-				},
-				dbResult.Recs[1]
-			};
-		}
-
-		[Test]
-		public async Task stream_created_and_delete_tombstone_with_corresponding_commits_are_kept() {
-			await CheckRecords();
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_stream_is_deleted_with_ignore_hard_deletes<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		protected override bool UnsafeIgnoreHardDelete() {
-			return true;
-		}
-
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator
-				.Chunk(Rec.Prepare(0, "bla"), Rec.Prepare(0, "bla"), Rec.Commit(0, "bla"))
-				.Chunk(Rec.Delete(1, "bla"), Rec.Commit(1, "bla"))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
-				return new[] {
-					new ILogRecord[0],
-					new ILogRecord[0]
-				};
-			}
-
-			return new[] {
-				new[] {
-					dbResult.Recs[0][0], // "bla" created
-				},
-				new ILogRecord[0]
-			};
-		}
-
-		[Test]
-		public async Task stream_created_and_delete_tombstone_with_corresponding_commits_are_kept() {
-			await CheckRecords();
-		}
-	}
-}
-
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_stream_is_deleted_and_bulk_transaction_spans_chunks_boundary.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_stream_is_deleted_and_bulk_transaction_spans_chunks_boundary.cs
deleted file mode 100644
index c8f39b20d44..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_stream_is_deleted_and_bulk_transaction_spans_chunks_boundary.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class when_stream_is_deleted_and_bulk_transaction_spans_chunks_boundary<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator
-				.Chunk(Rec.Prepare(0, "bla"),
-					Rec.Commit(0, "bla"),
-					Rec.Prepare(1, "bla"),
-					Rec.Prepare(1, "bla"),
-					Rec.Prepare(1, "bla"),
-					Rec.Prepare(1, "bla"))
-				.Chunk(Rec.Prepare(1, "bla"),
-					Rec.Prepare(1, "bla"),
-					Rec.Prepare(1, "bla"),
-					Rec.Commit(1, "bla"),
-					Rec.Delete(2, "bla"),
-					Rec.Commit(2, "bla"))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			return new[] {
-				new[] {dbResult.Recs[0][2]}, // first prepare in commit that is in different chunk
-				dbResult.Recs[1].Where((x, i) => i >= 3).ToArray(),
-			};
-		}
-
-		[Test]
-		public async Task first_prepare_of_transaction_is_preserved() {
-			await CheckRecords();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_stream_is_deleted_and_explicit_transaction_spans_chunks_boundary.cs b/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_stream_is_deleted_and_explicit_transaction_spans_chunks_boundary.cs
deleted file mode 100644
index 655d09a7182..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Scavenging/when_stream_is_deleted_and_explicit_transaction_spans_chunks_boundary.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Scavenging {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
-	public class when_stream_is_deleted_and_explicit_transaction_spans_chunks_boundary<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
-		protected override DbResult CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator) {
-			return dbCreator
-				.Chunk(Rec.Prepare(0, "bla"),
-					Rec.Commit(0, "bla"),
-					Rec.TransSt(1, "bla"),
-					Rec.Prepare(1, "bla"),
-					Rec.Prepare(1, "bla"),
-					Rec.Prepare(1, "bla"),
-					Rec.Prepare(1, "bla"))
-				.Chunk(Rec.Prepare(1, "bla"),
-					Rec.Prepare(1, "bla"),
-					Rec.Prepare(1, "bla"),
-					Rec.Prepare(1, "bla"),
-					Rec.Prepare(1, "bla"),
-					Rec.TransEnd(1, "bla"),
-					Rec.Commit(1, "bla"))
-				.Chunk(Rec.Delete(2, "bla"),
-					Rec.Commit(2, "bla"))
-				.CompleteLastChunk()
-				.CreateDb();
-		}
-
-		protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
-			return new[] {
-				new[] {dbResult.Recs[0][2]},
-				new[] {dbResult.Recs[1][6]}, // commit
-				dbResult.Recs[2]
-			};
-		}
-
-		[Test]
-		public async Task first_prepare_of_transaction_is_preserved() {
-			await CheckRecords();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/TFChunkHelper.cs b/src/EventStore.Core.Tests/TransactionLog/TFChunkHelper.cs
deleted file mode 100644
index 763b8679654..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/TFChunkHelper.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using EventStore.Core.Settings;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.Transforms.Identity;
-using EventStore.Core.Util;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	public static class TFChunkHelper {
-		public static TFChunkDbConfig CreateDbConfig(
-			string pathName,
-			long writerCheckpointPosition) {
-			return CreateDbConfigEx(pathName, writerCheckpointPosition,0,-1,-1,-1,10000,-1);
-		}
-		public static TFChunkDbConfig CreateSizedDbConfig(
-			string pathName,
-			long writerCheckpointPosition,
-			int chunkSize) {
-			return CreateDbConfigEx(pathName, writerCheckpointPosition,0,-1,-1,-1,chunkSize,-1);
-		}
-		public static TFChunkDbConfig CreateDbConfigEx(
-			string pathName,
-			long writerCheckpointPosition,
-			long chaserCheckpointPosition,// Default 0
-			long epochCheckpointPosition ,// Default -1
-			long proposalCheckpointPosition ,// Default -1
-			long truncateCheckpoint ,// Default -1
-			int chunkSize ,// Default 10000
-			long maxTruncation // Default -1
-			) {
-			return new TFChunkDbConfig(pathName,
-				new VersionedPatternFileNamingStrategy(pathName, "chunk-"),
-				chunkSize,
-				0,
-				new InMemoryCheckpoint(writerCheckpointPosition),
-				new InMemoryCheckpoint(chaserCheckpointPosition),
-				new InMemoryCheckpoint(epochCheckpointPosition),
-				new InMemoryCheckpoint(proposalCheckpointPosition),
-				new InMemoryCheckpoint(truncateCheckpoint),
-				new InMemoryCheckpoint(-1),
-				new InMemoryCheckpoint(-1),
-				new InMemoryCheckpoint(-1),
-				maxTruncation: maxTruncation);
-		}
-
-		public static TFChunkDbConfig CreateDbConfig(
-			string pathName,
-			ICheckpoint writerCheckpoint,
-			ICheckpoint chaserCheckpoint,
-			int chunkSize = 10000,
-			ICheckpoint replicationCheckpoint = null) {
-			if (replicationCheckpoint == null) replicationCheckpoint = new InMemoryCheckpoint(-1);
-			return new TFChunkDbConfig(
-				pathName,
-				new VersionedPatternFileNamingStrategy(pathName, "chunk-"),
-				chunkSize,
-				0,
-				writerCheckpoint,
-				chaserCheckpoint,
-				new InMemoryCheckpoint(-1),
-				new InMemoryCheckpoint(-1),
-				new InMemoryCheckpoint(-1),
-				replicationCheckpoint,
-				new InMemoryCheckpoint(-1),
-				new InMemoryCheckpoint(-1));
-		}
-
-		public static TFChunk CreateNewChunk(string fileName, int chunkSize = 4096, bool isScavenged = false) {
-			return TFChunk.CreateNew(fileName, chunkSize, 0, 0,
-				isScavenged: isScavenged, inMem: false, unbuffered: false,
-				writethrough: false, reduceFileCachePressure: false, tracker: new TFChunkTracker.NoOp(),
-				transformFactory: new IdentityChunkTransformFactory());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Truncation/TruncateAndReOpenDbScenario.cs b/src/EventStore.Core.Tests/TransactionLog/Truncation/TruncateAndReOpenDbScenario.cs
deleted file mode 100644
index a7ee1c8490a..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Truncation/TruncateAndReOpenDbScenario.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System.IO;
-using System.Threading.Tasks;
-using EventStore.Core.Caching;
-using EventStore.Core.DataStructures;
-using EventStore.Core.Index;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Services.Storage;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.Util;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.Metrics;
-using EventStore.Core.Tests.Services;
-
-namespace EventStore.Core.Tests.TransactionLog.Truncation {
-	public abstract class TruncateAndReOpenDbScenario<TLogFormat, TStreamId> : TruncateScenario<TLogFormat, TStreamId> {
-		protected TruncateAndReOpenDbScenario(int maxEntriesInMemTable = 100, int metastreamMaxCount = 1)
-			: base(maxEntriesInMemTable, metastreamMaxCount) {
-		}
-
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			ReOpenDb();
-		}
-
-		private void ReOpenDb() {
-			Db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, WriterCheckpoint, ChaserCheckpoint));
-
-			Db.Open();
-
-			var indexDirectory = GetFilePathFor("index");
-			_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
-				IndexDirectory = indexDirectory,
-			});
-			var readers = new ObjectPool<ITransactionFileReader>("Readers", 2, 5,
-				() => new TFChunkReader(Db, Db.Config.WriterCheckpoint));
-			var lowHasher = _logFormat.LowHasher;
-			var highHasher = _logFormat.HighHasher;
-			var emptyStreamId = _logFormat.EmptyStreamId;
-			TableIndex = new TableIndex<TStreamId>(indexDirectory, lowHasher, highHasher, emptyStreamId,
-				() => new HashListMemTable(PTableVersions.IndexV3, MaxEntriesInMemTable * 2),
-				() => new TFReaderLease(readers),
-				PTableVersions.IndexV3,
-				int.MaxValue,
-				Constants.PTableMaxReaderCountDefault,
-				MaxEntriesInMemTable);
-			_logFormat.StreamNamesProvider.SetTableIndex(TableIndex);
-			var readIndex = new ReadIndex<TStreamId>(new NoopPublisher(),
-				readers,
-				TableIndex,
-				_logFormat.StreamNameIndexConfirmer,
-				_logFormat.StreamIds,
-				_logFormat.StreamNamesProvider,
-				_logFormat.EmptyStreamId,
-				_logFormat.StreamIdValidator,
-				_logFormat.StreamIdSizer,
-				_logFormat.StreamExistenceFilter,
-				_logFormat.StreamExistenceFilterReader,
-				_logFormat.EventTypeIndexConfirmer,
-				new NoLRUCache<TStreamId, IndexBackend<TStreamId>.EventNumberCached>(),
-				new NoLRUCache<TStreamId, IndexBackend<TStreamId>.MetadataCached>(),
-				additionalCommitChecks: true,
-				metastreamMaxCount: MetastreamMaxCount,
-				hashCollisionReadLimit: Opts.HashCollisionReadLimitDefault,
-				skipIndexScanOnReads: Opts.SkipIndexScanOnReadsDefault,
-				replicationCheckpoint: Db.Config.ReplicationCheckpoint,
-				indexCheckpoint: Db.Config.IndexCheckpoint,
-				indexStatusTracker: new IndexStatusTracker.NoOp(),
-				indexTracker: new IndexTracker.NoOp(),
-				cacheTracker: new CacheHitsMissesTracker.NoOp());
-			readIndex.IndexCommitter.Init(ChaserCheckpoint.Read());
-			ReadIndex = readIndex;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Truncation/TruncateScenario.cs b/src/EventStore.Core.Tests/TransactionLog/Truncation/TruncateScenario.cs
deleted file mode 100644
index fb879a238c3..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Truncation/TruncateScenario.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.Services.Storage;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.Transforms.Identity;
-
-namespace EventStore.Core.Tests.TransactionLog.Truncation {
-	public abstract class TruncateScenario<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
-		protected TFChunkDbTruncator Truncator;
-		protected long TruncateCheckpoint = long.MinValue;
-
-		protected TruncateScenario(int maxEntriesInMemTable = 100, int metastreamMaxCount = 1)
-			: base(maxEntriesInMemTable, metastreamMaxCount) {
-		}
-
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			if (TruncateCheckpoint == long.MinValue)
-				throw new InvalidOperationException("AckCheckpoint must be set in WriteTestScenario.");
-
-			OnBeforeTruncating();
-
-			// need to close db before truncator can delete files
-
-			ReadIndex.Close();
-			ReadIndex.Dispose();
-
-			TableIndex.Close(removeFiles: false);
-
-			Db.Close();
-			Db.Dispose();
-
-			var truncator = new TFChunkDbTruncator(Db.Config, _ => new IdentityChunkTransformFactory());
-			truncator.TruncateDb(TruncateCheckpoint);
-		}
-
-		protected virtual void OnBeforeTruncating() {
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_against_max_truncation_config.cs b/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_against_max_truncation_config.cs
deleted file mode 100644
index 2808dac6525..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_against_max_truncation_config.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog.Validation;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.Transforms.Identity;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Truncation {
-	[TestFixture]
-	public class when_truncating_against_max_truncation_config : SpecificationWithDirectoryPerTestFixture {
-		private TFChunkDbConfig _config;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			// writer checkpoint = 5500, truncate to 0, max truncation = 1000
-			_config = TFChunkHelper.CreateDbConfigEx(PathName, 5500, 5500, 5500, -1, 0, 1000, maxTruncation: 1000);
-
-			DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000001"));
-			DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000002"));
-			DbUtil.CreateMultiChunk(_config, 3, 10, GetFilePathFor("chunk-000003.000001"));
-			DbUtil.CreateMultiChunk(_config, 3, 10, GetFilePathFor("chunk-000003.000002"));
-			DbUtil.CreateMultiChunk(_config, 7, 8, GetFilePathFor("chunk-000007.000001"));
-			DbUtil.CreateOngoingChunk(_config, 11, GetFilePathFor("chunk-000011.000000"));
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void truncate_above_max_throws_exception() {
-			Assert.Throws<Exception>(() => {
-				var truncator = new TFChunkDbTruncator(_config, _ => new IdentityChunkTransformFactory());
-				truncator.TruncateDb(0);
-			});
-		}
-
-		[Test]
-		public void truncate_within_max_does_not_throw_exception() {
-
-			Assert.DoesNotThrow(() => {
-				var truncator = new TFChunkDbTruncator(_config, _ => new IdentityChunkTransformFactory());
-				truncator.TruncateDb(4800);
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_database.cs b/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_database.cs
deleted file mode 100644
index 486ca908cde..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_database.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Truncation {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_truncating_database<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		[Test, Category("LongRunning")]
-		public async Task everything_should_go_fine() {
-			var miniNode = new MiniNode<TLogFormat, TStreamId>(PathName, inMemDb: false);
-			await miniNode.Start();
-
-			var tcpPort = miniNode.TcpEndPoint.Port;
-			var httpPort = miniNode.HttpEndPoint.Port;
-			const int cnt = 50;
-			var countdown = new CountdownEvent(cnt);
-
-			// --- first part of events
-			WriteEvents(cnt, miniNode, countdown);
-			Assert.IsTrue(countdown.Wait(TimeSpan.FromSeconds(10)), "Took too long writing first part of events.");
-			countdown.Reset();
-
-			// -- set up truncation
-			var truncatePosition = miniNode.Db.Config.WriterCheckpoint.ReadNonFlushed();
-			miniNode.Db.Config.TruncateCheckpoint.Write(truncatePosition);
-			miniNode.Db.Config.TruncateCheckpoint.Flush();
-
-			// --- second part of events
-			WriteEvents(cnt, miniNode, countdown);
-			Assert.IsTrue(countdown.Wait(TimeSpan.FromSeconds(10)), "Took too long writing second part of events.");
-			countdown.Reset();
-
-			await miniNode.Shutdown(keepDb: true);
-
-			// --- first restart and truncation
-			miniNode = new MiniNode<TLogFormat, TStreamId>(PathName, tcpPort, httpPort, inMemDb: false);
-			await miniNode.Start();
-			await miniNode.Shutdown(keepDb: true);
-
-			// --- second restart after truncation
-			miniNode = new MiniNode<TLogFormat, TStreamId>(PathName, tcpPort, httpPort, inMemDb: false);
-			await miniNode.Start();
-			Assert.AreEqual(-1, miniNode.Db.Config.TruncateCheckpoint.Read());
-			Assert.That(miniNode.Db.Config.WriterCheckpoint.Read(), Is.GreaterThanOrEqualTo(truncatePosition));
-
-			// -- third part of events
-			WriteEvents(cnt, miniNode, countdown);
-			Assert.IsTrue(countdown.Wait(TimeSpan.FromSeconds(10)), "Took too long writing third part of events.");
-			countdown.Reset();
-
-			await miniNode.Shutdown(keepDb: true);
-
-			// -- third restart
-			miniNode = new MiniNode<TLogFormat, TStreamId>(PathName, tcpPort, httpPort, inMemDb: false);
-			Assert.AreEqual(-1, miniNode.Db.Config.TruncateCheckpoint.Read());
-			await miniNode.Start();
-
-			// -- if we get here -- then everything is ok
-			await miniNode.Shutdown();
-		}
-
-		[Test, Category("LongRunning"), Category("Network")]
-		public async Task with_truncate_position_in_completed_chunk_everything_should_go_fine() {
-			const int chunkSize = 1024 * 1024;
-			const int cachedSize = chunkSize * 3;
-
-			var miniNode = new MiniNode<TLogFormat, TStreamId>(PathName, chunkSize: chunkSize, cachedChunkSize: cachedSize, inMemDb: false);
-			await miniNode.Start();
-
-			var httpPort = miniNode.HttpEndPoint.Port;
-			const int cnt = 1;
-			var countdown = new CountdownEvent(cnt);
-
-			// --- first part of events
-			WriteEvents(cnt, miniNode, countdown, MiniNode<TLogFormat, TStreamId>.ChunkSize / 5 * 3);
-			Assert.IsTrue(countdown.Wait(TimeSpan.FromSeconds(10)), "Took too long writing first part of events.");
-			countdown.Reset();
-
-			// -- set up truncation
-			var truncatePosition = miniNode.Db.Config.WriterCheckpoint.ReadNonFlushed();
-			miniNode.Db.Config.TruncateCheckpoint.Write(truncatePosition);
-			miniNode.Db.Config.TruncateCheckpoint.Flush();
-
-			// --- second part of events
-			WriteEvents(cnt, miniNode, countdown, MiniNode<TLogFormat, TStreamId>.ChunkSize / 2);
-			Assert.IsTrue(countdown.Wait(TimeSpan.FromSeconds(10)), "Took too long writing second part of events.");
-			countdown.Reset();
-
-			await miniNode.Shutdown(keepDb: true);
-
-			var tcpPort = miniNode.TcpEndPoint.Port;
-
-			// --- first restart and truncation
-			miniNode = new MiniNode<TLogFormat, TStreamId>(PathName, tcpPort, httpPort, chunkSize: chunkSize,
-				cachedChunkSize: cachedSize, inMemDb: false);
-			await miniNode.Start();
-			await miniNode.Shutdown(keepDb: true);
-
-			// --- second restart after truncation
-			miniNode = new MiniNode<TLogFormat, TStreamId>(PathName, tcpPort, httpPort, chunkSize: chunkSize,
-				cachedChunkSize: cachedSize, inMemDb: false);
-			await miniNode.Start();
-			Assert.AreEqual(-1, miniNode.Db.Config.TruncateCheckpoint.Read());
-			Assert.That(miniNode.Db.Config.WriterCheckpoint.Read(), Is.GreaterThanOrEqualTo(truncatePosition));
-
-			// -- third part of events
-			WriteEvents(cnt, miniNode, countdown, MiniNode<TLogFormat, TStreamId>.ChunkSize / 5);
-			Assert.IsTrue(countdown.Wait(TimeSpan.FromSeconds(10)), "Took too long writing third part of events.");
-			countdown.Reset();
-
-			// -- if we get here -- then everything is ok
-			await miniNode.Shutdown();
-		}
-
-		private static void WriteEvents(int cnt, MiniNode<TLogFormat, TStreamId> miniNode, CountdownEvent countdown, int dataSize = 4000) {
-			for (int i = 0; i < cnt; ++i) {
-				miniNode.Node.MainQueue.Publish(
-					new ClientMessage.WriteEvents(Guid.NewGuid(), Guid.NewGuid(),
-						new CallbackEnvelope(m => {
-							Assert.IsInstanceOf<ClientMessage.WriteEventsCompleted>(m);
-							var msg = (ClientMessage.WriteEventsCompleted)m;
-							Assert.AreEqual(OperationResult.Success, msg.Result);
-							countdown.Signal();
-						}),
-						true,
-						"test-stream",
-						ExpectedVersion.Any,
-						new[] {
-							new Event(Guid.NewGuid(), "test-event-type", false, new byte[dataSize], null)
-						},
-						null));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_few_chunks_with_index_on_disk.cs b/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_few_chunks_with_index_on_disk.cs
deleted file mode 100644
index 399d2aa1bf6..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_few_chunks_with_index_on_disk.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System.IO;
-using EventStore.Core.Data;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Truncation {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_truncating_few_chunks_with_index_on_disk<TLogFormat, TStreamId> : TruncateScenario<TLogFormat, TStreamId> {
-		private EventRecord _event4;
-
-		private string _chunk0;
-		private string _chunk1;
-		private string _chunk2;
-		private string _chunk3;
-
-		public when_truncating_few_chunks_with_index_on_disk()
-			: base(maxEntriesInMemTable: 3) {
-		}
-
-		protected override void WriteTestScenario() {
-			WriteSingleEvent("ES", 0, new string('.', 4000));
-			WriteSingleEvent("ES", 1, new string('.', 4000));
-			WriteSingleEvent("ES", 2, new string('.', 4000), retryOnFail: true); // ptable 1, chunk 1
-			_event4 = WriteSingleEvent("ES", 3, new string('.', 4000));
-			WriteSingleEvent("ES", 4, new string('.', 4000), retryOnFail: true); // chunk 2
-			WriteSingleEvent("ES", 5, new string('.', 4000)); // ptable 2
-			WriteSingleEvent("ES", 6, new string('.', 4000), retryOnFail: true); // chunk 3 
-
-			TruncateCheckpoint = _event4.LogPosition;
-
-			_chunk0 = GetChunkName(0);
-			_chunk1 = GetChunkName(1);
-			_chunk2 = GetChunkName(2);
-			_chunk3 = GetChunkName(3);
-
-			Assert.IsTrue(File.Exists(_chunk0));
-			Assert.IsTrue(File.Exists(_chunk1));
-			Assert.IsTrue(File.Exists(_chunk2));
-			Assert.IsTrue(File.Exists(_chunk3));
-		}
-
-		private string GetChunkName(int chunkNumber) {
-			var allVersions = Db.Config.FileNamingStrategy.GetAllVersionsFor(chunkNumber);
-			Assert.AreEqual(1, allVersions.Length);
-			return allVersions[0];
-		}
-
-		[Test]
-		public void checksums_should_be_equal_to_ack_checksum() {
-			Assert.AreEqual(TruncateCheckpoint, WriterCheckpoint.Read());
-			Assert.AreEqual(TruncateCheckpoint, ChaserCheckpoint.Read());
-		}
-
-		[Test]
-		public void truncated_chunks_should_be_deleted() {
-			Assert.IsFalse(File.Exists(_chunk2));
-			Assert.IsFalse(File.Exists(_chunk3));
-		}
-
-		[Test]
-		public void not_truncated_chunks_should_survive() {
-			var chunks = Db.Config.FileNamingStrategy.GetAllPresentFiles();
-			Assert.AreEqual(2, chunks.Length);
-			Assert.AreEqual(_chunk0, GetChunkName(0));
-			Assert.AreEqual(_chunk1, GetChunkName(1));
-		}
-
-		[Test]
-		public void read_all_returns_only_survived_events() {
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_few_chunks_with_index_on_disk_and_then_reopening_db.cs b/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_few_chunks_with_index_on_disk_and_then_reopening_db.cs
deleted file mode 100644
index 3b31f2ccd43..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_few_chunks_with_index_on_disk_and_then_reopening_db.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-using System.IO;
-using System.Linq;
-using EventStore.Core.Data;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Truncation {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_truncating_few_chunks_with_index_on_disk_and_then_reopening_db<TLogFormat, TStreamId> : TruncateAndReOpenDbScenario<TLogFormat, TStreamId> {
-		private EventRecord _event1;
-		private EventRecord _event2;
-		private EventRecord _event3;
-		private EventRecord _event4;
-		private EventRecord _event7;
-
-		private string _chunk0;
-		private string _chunk1;
-		private string _chunk2;
-		private string _chunk3;
-
-		public when_truncating_few_chunks_with_index_on_disk_and_then_reopening_db()
-			: base(maxEntriesInMemTable: 3) {
-		}
-
-		protected override void WriteTestScenario() {
-			_event1 = WriteSingleEvent("ES", 0, new string('.', 4000)); // chunk 0
-			_event2 = WriteSingleEvent("ES", 1, new string('.', 4000));
-			_event3 = WriteSingleEvent("ES", 2, new string('.', 4000), retryOnFail: true); // ptable 1, chunk 1
-			_event4 = WriteSingleEvent("ES", 3, new string('.', 4000));
-			WriteSingleEvent("ES", 4, new string('.', 4000), retryOnFail: true); // chunk 2
-			WriteSingleEvent("ES", 5, new string('.', 4000)); // ptable 2
-			_event7 = WriteSingleEvent("ES", 6, new string('.', 4000), retryOnFail: true); // chunk 3 
-
-			TruncateCheckpoint = _event4.LogPosition;
-
-			_chunk0 = GetChunkName(0);
-			_chunk1 = GetChunkName(1);
-			_chunk2 = GetChunkName(2);
-			_chunk3 = GetChunkName(3);
-
-			Assert.IsTrue(File.Exists(_chunk0));
-			Assert.IsTrue(File.Exists(_chunk1));
-			Assert.IsTrue(File.Exists(_chunk2));
-			Assert.IsTrue(File.Exists(_chunk3));
-		}
-
-		private string GetChunkName(int chunkNumber) {
-			var allVersions = Db.Config.FileNamingStrategy.GetAllVersionsFor(chunkNumber);
-			Assert.AreEqual(1, allVersions.Length);
-			return allVersions[0];
-		}
-
-		[Test]
-		public void checksums_should_be_equal_to_ack_checksum() {
-			Assert.AreEqual(TruncateCheckpoint, WriterCheckpoint.Read());
-			Assert.AreEqual(TruncateCheckpoint, ChaserCheckpoint.Read());
-		}
-
-		[Test]
-		public void truncated_chunks_should_be_deleted() {
-			Assert.IsFalse(File.Exists(_chunk2));
-			Assert.IsFalse(File.Exists(_chunk3));
-		}
-
-		[Test]
-		public void not_truncated_chunks_should_survive() {
-			var chunks = Db.Config.FileNamingStrategy.GetAllPresentFiles();
-			Assert.AreEqual(2, chunks.Length);
-			Assert.AreEqual(_chunk0, GetChunkName(0));
-			Assert.AreEqual(_chunk1, GetChunkName(1));
-		}
-
-		[Test]
-		public void read_one_by_one_doesnt_return_truncated_records() {
-			var res = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.Success, res.Result);
-			Assert.AreEqual(_event1, res.Record);
-			res = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.Success, res.Result);
-			Assert.AreEqual(_event2, res.Record);
-			res = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.Success, res.Result);
-			Assert.AreEqual(_event3, res.Record);
-
-			res = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.NotFound, res.Result);
-			Assert.IsNull(res.Record);
-			res = ReadIndex.ReadEvent("ES", 4);
-			Assert.AreEqual(ReadEventResult.NotFound, res.Result);
-			Assert.IsNull(res.Record);
-			res = ReadIndex.ReadEvent("ES", 5);
-			Assert.AreEqual(ReadEventResult.NotFound, res.Result);
-			Assert.IsNull(res.Record);
-			res = ReadIndex.ReadEvent("ES", 6);
-			Assert.AreEqual(ReadEventResult.NotFound, res.Result);
-			Assert.IsNull(res.Record);
-			res = ReadIndex.ReadEvent("ES", 7);
-			Assert.AreEqual(ReadEventResult.NotFound, res.Result);
-			Assert.IsNull(res.Record);
-		}
-
-		[Test]
-		public void read_stream_forward_doesnt_return_truncated_records() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			var records = res.Records;
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event1, records[0]);
-			Assert.AreEqual(_event2, records[1]);
-			Assert.AreEqual(_event3, records[2]);
-		}
-
-		[Test]
-		public void read_stream_backward_doesnt_return_truncated_records() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			var records = res.Records;
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event1, records[2]);
-			Assert.AreEqual(_event2, records[1]);
-			Assert.AreEqual(_event3, records[0]);
-		}
-
-		[Test]
-		public void read_all_returns_only_survived_events() {
-			var res = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100);
-			var records = res.EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event1, records[0]);
-			Assert.AreEqual(_event2, records[1]);
-			Assert.AreEqual(_event3, records[2]);
-		}
-
-		[Test]
-		public void read_all_backward_doesnt_return_truncated_records() {
-			var res = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100);
-			var records = res.EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(3, records.Length);
-			Assert.AreEqual(_event1, records[2]);
-			Assert.AreEqual(_event2, records[1]);
-			Assert.AreEqual(_event3, records[0]);
-		}
-
-		[Test]
-		public void read_all_backward_from_last_truncated_record_returns_no_records() {
-			var pos = new TFPos(_event7.LogPosition, _event3.LogPosition);
-			var res = ReadIndex.ReadAllEventsForward(pos, 100);
-			var records = res.EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(0, records.Length);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_completed_chunk.cs b/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_completed_chunk.cs
deleted file mode 100644
index 54617b5d6c7..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_completed_chunk.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.Tests.TransactionLog.Validation;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.Transforms.Identity;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Truncation {
-	[TestFixture]
-	public class when_truncating_into_the_middle_of_completed_chunk : SpecificationWithDirectoryPerTestFixture {
-		private TFChunkDbConfig _config;
-		private byte[] _file1Contents;
-		private byte[] _file2Contents;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_config = TFChunkHelper.CreateDbConfigEx(PathName, 3711, 5500, 5500, -1, 1111, 1000, -1);
-
-			var rnd = new Random();
-			_file1Contents = new byte[_config.ChunkSize];
-			_file2Contents = new byte[_config.ChunkSize];
-			rnd.NextBytes(_file1Contents);
-			rnd.NextBytes(_file2Contents);
-
-			DbUtil.CreateSingleChunk(_config, 0, GetFilePathFor("chunk-000000.000001"), contents: _file1Contents);
-			DbUtil.CreateSingleChunk(_config, 1, GetFilePathFor("chunk-000001.000002"), contents: _file2Contents);
-			DbUtil.CreateSingleChunk(_config, 2, GetFilePathFor("chunk-000002.000000"));
-			DbUtil.CreateSingleChunk(_config, 3, GetFilePathFor("chunk-000003.000000"));
-
-			var truncator = new TFChunkDbTruncator(_config, _ => new IdentityChunkTransformFactory());
-			truncator.TruncateDb(_config.TruncateCheckpoint.ReadNonFlushed());
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			using (var db = new TFChunkDb(_config)) {
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-			}
-
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000001")));
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000002")));
-			Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void writer_checkpoint_should_be_set_to_exactly_truncation_checkpoint() {
-			Assert.AreEqual(1111, _config.WriterCheckpoint.Read());
-			Assert.AreEqual(1111, _config.WriterCheckpoint.ReadNonFlushed());
-		}
-
-		[Test]
-		public void chaser_checkpoint_should_be_adjusted_if_less_than_actual_truncate_checkpoint() {
-			Assert.AreEqual(1111, _config.ChaserCheckpoint.Read());
-			Assert.AreEqual(1111, _config.ChaserCheckpoint.ReadNonFlushed());
-		}
-
-		[Test]
-		public void epoch_checkpoint_should_be_reset_if_less_than_actual_truncate_checkpoint() {
-			Assert.AreEqual(-1, _config.EpochCheckpoint.Read());
-			Assert.AreEqual(-1, _config.EpochCheckpoint.ReadNonFlushed());
-		}
-
-		[Test]
-		public void truncate_checkpoint_should_be_reset_after_truncation() {
-			Assert.AreEqual(-1, _config.TruncateCheckpoint.Read());
-			Assert.AreEqual(-1, _config.TruncateCheckpoint.ReadNonFlushed());
-		}
-
-		[Test]
-		public void chunks_after_truncation_point_are_deleted() {
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000001")));
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000002")));
-			Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
-		}
-
-		[Test]
-		public void contents_of_first_chunk_should_be_untouched() {
-			var contents = new byte[_config.ChunkSize];
-			using (var fs = File.OpenRead(GetFilePathFor("chunk-000000.000001"))) {
-				fs.Position = ChunkHeader.Size;
-				fs.Read(contents, 0, contents.Length);
-				Assert.AreEqual(_file1Contents, contents);
-			}
-		}
-
-		[Test]
-		public void ongoing_chunk_should_have_full_size_and_filled_with_zeros_after_writer_checkpoint() {
-			var fileInfo = new FileInfo(GetFilePathFor("chunk-000001.000002"));
-			Assert.AreEqual(TFChunk.GetAlignedSize(ChunkHeader.Size + 1000 + ChunkFooter.Size), fileInfo.Length);
-
-			using (var fs = File.OpenRead(fileInfo.FullName)) {
-				var leftDataSize = (int)(_config.WriterCheckpoint.Read() % _config.ChunkSize);
-				var leftData = new byte[leftDataSize];
-				var shouldBeZeros = new byte[_config.ChunkSize - leftDataSize + ChunkFooter.Size];
-
-				fs.Position = ChunkHeader.Size;
-				fs.Read(leftData, 0, leftData.Length);
-
-				var shouldBeLeft = new byte[leftDataSize];
-				Buffer.BlockCopy(_file2Contents, 0, shouldBeLeft, 0, leftDataSize);
-				Assert.AreEqual(shouldBeLeft, leftData);
-
-				fs.Position = ChunkHeader.Size + _config.WriterCheckpoint.Read() % _config.ChunkSize;
-				fs.Read(shouldBeZeros, 0, shouldBeZeros.Length);
-
-				Assert.IsTrue(shouldBeZeros.All(x => x == 0), "Chunk is not zeroed.");
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_multichunk.cs b/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_multichunk.cs
deleted file mode 100644
index d50cd2f4500..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_multichunk.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System.IO;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.Tests.TransactionLog.Validation;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.Transforms.Identity;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Truncation {
-	[TestFixture]
-	public class when_truncating_into_the_middle_of_multichunk : SpecificationWithDirectoryPerTestFixture {
-		private TFChunkDbConfig _config;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_config = TFChunkHelper.CreateDbConfigEx(PathName, 11111, 5500, 5500, -1,5757, 1000, -1);
-
-			DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000001"));
-			DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000002"));
-			DbUtil.CreateSingleChunk(_config, 3, GetFilePathFor("chunk-000003.000000"));
-			DbUtil.CreateMultiChunk(_config, 3, 10, GetFilePathFor("chunk-000003.000001"));
-			DbUtil.CreateMultiChunk(_config, 3, 10, GetFilePathFor("chunk-000003.000002"));
-			DbUtil.CreateSingleChunk(_config, 4, GetFilePathFor("chunk-000004.000000"));
-			DbUtil.CreateMultiChunk(_config, 4, 4, GetFilePathFor("chunk-000004.000002"));
-			DbUtil.CreateMultiChunk(_config, 5, 7, GetFilePathFor("chunk-000005.000001"));
-			DbUtil.CreateMultiChunk(_config, 8, 9, GetFilePathFor("chunk-000008.000001"));
-			DbUtil.CreateOngoingChunk(_config, 11, GetFilePathFor("chunk-000011.000000"));
-
-			var truncator = new TFChunkDbTruncator(_config, _ => new IdentityChunkTransformFactory());
-			truncator.TruncateDb(_config.TruncateCheckpoint.ReadNonFlushed());
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			using (var db = new TFChunkDb(_config)) {
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-			}
-
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000002")));
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000003.000000")));
-			Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void writer_checkpoint_should_be_set_to_start_of_new_chunk() {
-			Assert.AreEqual(3000, _config.WriterCheckpoint.Read());
-			Assert.AreEqual(3000, _config.WriterCheckpoint.ReadNonFlushed());
-		}
-
-		[Test]
-		public void chaser_checkpoint_should_be_adjusted_if_less_than_actual_truncate_checkpoint() {
-			Assert.AreEqual(3000, _config.ChaserCheckpoint.Read());
-			Assert.AreEqual(3000, _config.ChaserCheckpoint.ReadNonFlushed());
-		}
-
-		[Test]
-		public void epoch_checkpoint_should_be_reset_if_less_than_actual_truncate_checkpoint() {
-			Assert.AreEqual(-1, _config.EpochCheckpoint.Read());
-			Assert.AreEqual(-1, _config.EpochCheckpoint.ReadNonFlushed());
-		}
-
-		[Test]
-		public void truncate_checkpoint_should_be_reset_after_truncation() {
-			Assert.AreEqual(-1, _config.TruncateCheckpoint.Read());
-			Assert.AreEqual(-1, _config.TruncateCheckpoint.ReadNonFlushed());
-		}
-
-		[Test]
-		public void all_excessive_chunks_should_be_deleted() {
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000001")));
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000002")));
-			Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_ongoing_chunk.cs b/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_ongoing_chunk.cs
deleted file mode 100644
index f946600224f..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_ongoing_chunk.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.Tests.TransactionLog.Validation;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.Transforms.Identity;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Truncation {
-	[TestFixture]
-	public class when_truncating_into_the_middle_of_ongoing_chunk : SpecificationWithDirectoryPerTestFixture {
-		private TFChunkDbConfig _config;
-		private byte[] _file1Contents;
-		private byte[] _file2Contents;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_config = TFChunkHelper.CreateDbConfigEx(PathName, 1711, 5500, 5500, -1, 1111, 1000, -1);
-
-			var rnd = new Random();
-			_file1Contents = new byte[_config.ChunkSize];
-			_file2Contents = new byte[_config.ChunkSize];
-			rnd.NextBytes(_file1Contents);
-			rnd.NextBytes(_file2Contents);
-
-			DbUtil.CreateSingleChunk(_config, 0, GetFilePathFor("chunk-000000.000001"), contents: _file1Contents);
-			DbUtil.CreateOngoingChunk(_config, 1, GetFilePathFor("chunk-000001.000002"), contents: _file2Contents);
-
-			var truncator = new TFChunkDbTruncator(_config, _ => new IdentityChunkTransformFactory());
-			truncator.TruncateDb(_config.TruncateCheckpoint.ReadNonFlushed());
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			using (var db = new TFChunkDb(_config)) {
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-			}
-
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000001")));
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000002")));
-			Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void writer_checkpoint_should_be_set_to_exactly_truncation_checkpoint() {
-			Assert.AreEqual(1111, _config.WriterCheckpoint.Read());
-			Assert.AreEqual(1111, _config.WriterCheckpoint.ReadNonFlushed());
-		}
-
-		[Test]
-		public void chaser_checkpoint_should_be_adjusted_if_less_than_actual_truncate_checkpoint() {
-			Assert.AreEqual(1111, _config.ChaserCheckpoint.Read());
-			Assert.AreEqual(1111, _config.ChaserCheckpoint.ReadNonFlushed());
-		}
-
-		[Test]
-		public void epoch_checkpoint_should_be_reset_if_less_than_actual_truncate_checkpoint() {
-			Assert.AreEqual(-1, _config.EpochCheckpoint.Read());
-			Assert.AreEqual(-1, _config.EpochCheckpoint.ReadNonFlushed());
-		}
-
-		[Test]
-		public void truncate_checkpoint_should_be_reset_after_truncation() {
-			Assert.AreEqual(-1, _config.TruncateCheckpoint.Read());
-			Assert.AreEqual(-1, _config.TruncateCheckpoint.ReadNonFlushed());
-		}
-
-		[Test]
-		public void all_chunks_are_preserved() {
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000001")));
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000002")));
-			Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
-		}
-
-		[Test]
-		public void contents_of_first_chunk_should_be_untouched() {
-			var contents = new byte[_config.ChunkSize];
-			using (var fs = File.OpenRead(GetFilePathFor("chunk-000000.000001"))) {
-				fs.Position = ChunkHeader.Size;
-				fs.Read(contents, 0, contents.Length);
-				Assert.AreEqual(_file1Contents, contents);
-			}
-		}
-
-		[Test]
-		public void ongoing_chunk_should_have_full_size_and_filled_with_zeros_after_writer_checkpoint() {
-			var fileInfo = new FileInfo(GetFilePathFor("chunk-000001.000002"));
-			Assert.AreEqual(TFChunk.GetAlignedSize(ChunkHeader.Size + 1000 + ChunkFooter.Size), fileInfo.Length);
-
-			using (var fs = File.OpenRead(fileInfo.FullName)) {
-				var leftDataSize = (int)(_config.WriterCheckpoint.Read() % _config.ChunkSize);
-				var leftData = new byte[leftDataSize];
-				var shouldBeZeros = new byte[_config.ChunkSize - leftDataSize + ChunkFooter.Size];
-
-				fs.Position = ChunkHeader.Size;
-				fs.Read(leftData, 0, leftData.Length);
-
-				var shouldBeLeft = new byte[leftDataSize];
-				Buffer.BlockCopy(_file2Contents, 0, shouldBeLeft, 0, leftDataSize);
-				Assert.AreEqual(shouldBeLeft, leftData);
-
-				fs.Position = ChunkHeader.Size + _config.WriterCheckpoint.Read() % _config.ChunkSize;
-				fs.Read(shouldBeZeros, 0, shouldBeZeros.Length);
-
-				Assert.IsTrue(shouldBeZeros.All(x => x == 0), "Chunk is not zeroed!");
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_scavenged_chunk_with_index_in_memory.cs b/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_scavenged_chunk_with_index_in_memory.cs
deleted file mode 100644
index 690abd2be36..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_scavenged_chunk_with_index_in_memory.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System.IO;
-using EventStore.Core.Data;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Truncation {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_truncating_into_the_middle_of_scavenged_chunk_with_index_in_memory<TLogFormat, TStreamId> : TruncateScenario<TLogFormat, TStreamId> {
-		private string chunk0;
-		private string chunk1;
-		private string chunk2;
-		private string chunk3;
-
-		private EventRecord chunkEdge;
-
-		protected override void WriteTestScenario() {
-			WriteSingleEvent("ES1", 0, new string('.', 3000)); // chunk 0
-			WriteSingleEvent("ES1", 1, new string('.', 3000));
-			WriteSingleEvent("ES2", 0, new string('.', 3000));
-			chunkEdge = WriteSingleEvent("ES1", 2, new string('.', 3000), retryOnFail: true); // chunk 1
-			var ackRec = WriteSingleEvent("ES1", 3, new string('.', 3000));
-			WriteSingleEvent("ES1", 4, new string('.', 3000));
-			WriteSingleEvent("ES1", 5, new string('.', 3000), retryOnFail: true); // chunk 2
-			WriteSingleEvent("ES1", 6, new string('.', 3000));
-			WriteSingleEvent("ES1", 7, new string('.', 3000));
-			WriteSingleEvent("ES1", 8, new string('.', 3000), retryOnFail: true); // chunk 3
-
-			WriteDelete("ES1");
-			Scavenge(completeLast: false, mergeChunks: false);
-
-			TruncateCheckpoint = ackRec.LogPosition;
-		}
-
-		protected override void OnBeforeTruncating() {
-			// scavenged chunk names
-			// TODO MM: avoid this complexity - try scavenging exactly at where its invoked and not wait for readIndex to rebuild
-			chunk0 = GetChunkName(0);
-			chunk1 = GetChunkName(1);
-			chunk2 = GetChunkName(2);
-			chunk3 = GetChunkName(3);
-
-			Assert.IsTrue(File.Exists(chunk0));
-			Assert.IsTrue(File.Exists(chunk1));
-			Assert.IsTrue(File.Exists(chunk2));
-			Assert.IsTrue(File.Exists(chunk3));
-		}
-
-		private string GetChunkName(int chunkNumber) {
-			var allVersions = Db.Config.FileNamingStrategy.GetAllVersionsFor(chunkNumber);
-			Assert.AreEqual(1, allVersions.Length);
-			return allVersions[0];
-		}
-
-		[Test]
-		public void checksums_should_be_equal_to_beginning_of_intersected_scavenged_chunk() {
-			Assert.AreEqual(chunkEdge.TransactionPosition, WriterCheckpoint.Read());
-			Assert.AreEqual(chunkEdge.TransactionPosition, ChaserCheckpoint.Read());
-		}
-
-		[Test]
-		public void truncated_chunks_should_be_deleted() {
-			Assert.IsFalse(File.Exists(chunk2));
-			Assert.IsFalse(File.Exists(chunk3));
-		}
-
-		[Test]
-		public void intersecting_chunk_should_be_deleted() {
-			Assert.IsFalse(File.Exists(chunk1));
-		}
-
-		[Test]
-		public void untouched_chunk_should_survive() {
-			var chunks = Db.Config.FileNamingStrategy.GetAllPresentFiles();
-			Assert.AreEqual(1, chunks.Length);
-			Assert.AreEqual(chunk0, GetChunkName(0));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_scavenged_chunk_with_index_in_memory_and_then_reopening_db.cs b/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_scavenged_chunk_with_index_in_memory_and_then_reopening_db.cs
deleted file mode 100644
index 6debdfd2544..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_scavenged_chunk_with_index_in_memory_and_then_reopening_db.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-using System.IO;
-using System.Linq;
-using EventStore.Core.Data;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Truncation {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_truncating_into_the_middle_of_scavenged_chunk_with_index_in_memory_and_then_reopening_db<TLogFormat, TStreamId> :
-			TruncateAndReOpenDbScenario<TLogFormat, TStreamId> {
-		// actually this case is not fully handled by EventStore. When some records have been scavenged, but truncated in a middle of chunk,
-		// we lose the delete record, so we don't consider this stream as deleted, but still we have scavenged a lot of records, that are not scavenged in other replicas.
-		// nonetheless this scenario is very very unlikely to happen, that's why it is not handled. if it still does happen - a whole db on truncated node should be deleted
-
-		private string _chunk0;
-		private string _chunk1;
-		private string _chunk2;
-		private string _chunk3;
-		private EventRecord _event2;
-		private EventRecord _chunkEdge;
-
-		protected override void WriteTestScenario() {
-			WriteSingleEvent("ES1", 0, new string('.', 3000)); // chunk 0
-			WriteSingleEvent("ES1", 1, new string('.', 3000));
-			_event2 = WriteSingleEvent("ES2", 0, new string('.', 3000));
-			_chunkEdge = WriteSingleEvent("ES1", 2, new string('.', 3000), retryOnFail: true); // chunk 1
-			var rec = WriteSingleEvent("ES1", 3, new string('.', 3000));
-			WriteSingleEvent("ES1", 4, new string('.', 3000));
-			WriteSingleEvent("ES1", 5, new string('.', 3000), retryOnFail: true); // chunk 2
-			WriteSingleEvent("ES1", 6, new string('.', 3000));
-			WriteSingleEvent("ES1", 7, new string('.', 3000));
-			WriteSingleEvent("ES1", 8, new string('.', 3000), retryOnFail: true); // chunk 3
-
-			WriteDelete("ES1");
-			Scavenge(completeLast: false, mergeChunks: false);
-
-			TruncateCheckpoint = rec.LogPosition;
-		}
-
-		protected override void OnBeforeTruncating() {
-			// scavenged chunk names
-			// TODO MM: avoid this complexity - try scavenging exactly at where its invoked and not wait for readIndex to rebuild
-			_chunk0 = GetChunkName(0);
-			_chunk1 = GetChunkName(1);
-			_chunk2 = GetChunkName(2);
-			_chunk3 = GetChunkName(3);
-
-			Assert.IsTrue(File.Exists(_chunk0));
-			Assert.IsTrue(File.Exists(_chunk1));
-			Assert.IsTrue(File.Exists(_chunk2));
-			Assert.IsTrue(File.Exists(_chunk3));
-		}
-
-		private string GetChunkName(int chunkNumber) {
-			var allVersions = Db.Config.FileNamingStrategy.GetAllVersionsFor(chunkNumber);
-			Assert.AreEqual(1, allVersions.Length);
-			return allVersions[0];
-		}
-
-		[Test]
-		public void truncated_chunks_should_be_deleted() {
-			Assert.IsFalse(File.Exists(_chunk2));
-			Assert.IsFalse(File.Exists(_chunk3));
-		}
-
-		[Test]
-		public void intersecting_chunk_should_be_deleted() {
-			Assert.IsFalse(File.Exists(_chunk1));
-		}
-
-		[Test]
-		public void untouched_chunk_should_survive() {
-			Assert.AreEqual(_chunk0, GetChunkName(0));
-		}
-
-		[Test]
-		public void checksums_should_be_equal_to_beginning_of_intersected_scavenged_chunk() {
-			Assert.AreEqual(_chunkEdge.TransactionPosition, WriterCheckpoint.Read());
-			Assert.AreEqual(_chunkEdge.TransactionPosition, ChaserCheckpoint.Read());
-		}
-
-		[Test]
-		public void read_one_by_one_returns_survived_records() {
-			var res = ReadIndex.ReadEvent("ES2", 0);
-			Assert.AreEqual(ReadEventResult.Success, res.Result);
-			Assert.AreEqual(_event2, res.Record);
-		}
-
-		[Test]
-		public void there_is_no_previously_scavenged_stream_which_delete_record_was_truncated() {
-			var res = ReadIndex.ReadEvent("ES1", 0);
-			Assert.AreEqual(ReadEventResult.NoStream, res.Result);
-			Assert.IsNull(res.Record);
-		}
-
-		[Test]
-		public void read_stream_forward_doesnt_return_untouched_records() {
-			var res = ReadIndex.ReadStreamEventsForward("ES2", 0, 100);
-			var records = res.Records;
-			Assert.AreEqual(1, records.Length);
-			Assert.AreEqual(_event2, records[0]);
-		}
-
-		[Test]
-		public void read_stream_forward_doesnt_return_truncated_or_scavenged_records_but_returns_stream_created() {
-			var res = ReadIndex.ReadStreamEventsForward("ES1", 0, 100);
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-		[Test]
-		public void read_stream_backward_doesnt_return_untoucned_records() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES2", -1, 100);
-			var records = res.Records;
-			Assert.AreEqual(1, records.Length);
-			Assert.AreEqual(_event2, records[0]);
-		}
-
-		[Test]
-		public void read_stream_backward_doesnt_return_truncated_records() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES1", -1, 100);
-			var records = res.Records;
-			Assert.AreEqual(0, records.Length);
-		}
-
-		[Test]
-		public void read_all_forward_returns_only_survived_events() {
-			var res = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100);
-			var records = res.EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-
-			Assert.AreEqual(1, records.Length);
-			Assert.AreEqual(_event2, records[0]);
-		}
-
-		[Test]
-		public void read_all_backward_doesnt_return_truncated_records() {
-			var res = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100);
-			var records = res.EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-
-			Assert.AreEqual(1, records.Length);
-			Assert.AreEqual(_event2, records[0]);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_right_at_the_end_of_multichunk.cs b/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_right_at_the_end_of_multichunk.cs
deleted file mode 100644
index 937d1ae5d0c..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_right_at_the_end_of_multichunk.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System.IO;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.Tests.TransactionLog.Validation;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.Transforms.Identity;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Truncation {
-	[TestFixture]
-	public class when_truncating_right_at_the_end_of_multichunk : SpecificationWithDirectoryPerTestFixture {
-		private TFChunkDbConfig _config;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_config = TFChunkHelper.CreateDbConfigEx(PathName, 13500, 5500, 5500, -1, 11000, 1000, -1);
-
-			DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000001"));
-			DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000002"));
-			DbUtil.CreateMultiChunk(_config, 3, 10, GetFilePathFor("chunk-000003.000001"));
-			DbUtil.CreateMultiChunk(_config, 3, 10, GetFilePathFor("chunk-000003.000002"));
-			DbUtil.CreateMultiChunk(_config, 7, 8, GetFilePathFor("chunk-000007.000001"));
-			DbUtil.CreateMultiChunk(_config, 11, 12, GetFilePathFor("chunk-000011.000001"));
-			DbUtil.CreateOngoingChunk(_config, 13, GetFilePathFor("chunk-000013.000000"));
-
-			var truncator = new TFChunkDbTruncator(_config, _ => new IdentityChunkTransformFactory());
-			truncator.TruncateDb(_config.TruncateCheckpoint.ReadNonFlushed());
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			using (var db = new TFChunkDb(_config)) {
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-			}
-
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000002")));
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000003.000002")));
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000011.000000")));
-			Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void writer_checkpoint_should_be_set_to_truncate_checkpoint() {
-			Assert.AreEqual(11000, _config.WriterCheckpoint.Read());
-			Assert.AreEqual(11000, _config.WriterCheckpoint.ReadNonFlushed());
-		}
-
-		[Test]
-		public void chaser_checkpoint_should_be_left_as_is_if_less_than_truncate_checkpoint() {
-			Assert.AreEqual(5500, _config.ChaserCheckpoint.Read());
-			Assert.AreEqual(5500, _config.ChaserCheckpoint.ReadNonFlushed());
-		}
-
-		[Test]
-		public void epoch_checkpoint_should_be_left_as_is_if_less_than_truncate_checkpoint() {
-			Assert.AreEqual(5500, _config.EpochCheckpoint.Read());
-			Assert.AreEqual(5500, _config.EpochCheckpoint.ReadNonFlushed());
-		}
-
-		[Test]
-		public void truncate_checkpoint_should_be_reset_after_truncation() {
-			Assert.AreEqual(-1, _config.TruncateCheckpoint.Read());
-			Assert.AreEqual(-1, _config.TruncateCheckpoint.ReadNonFlushed());
-		}
-
-		[Test]
-		public void every_chunk_that_end_by_the_truncation_checkpoint_is_preserved() {
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000001")));
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000002")));
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000003.000001")));
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000003.000002")));
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000007.000001")));
-			Assert.AreEqual(5, Directory.GetFiles(PathName, "*").Length);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_single_uncompleted_chunk_with_index_in_memory_and_then_reopening_db.cs b/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_single_uncompleted_chunk_with_index_in_memory_and_then_reopening_db.cs
deleted file mode 100644
index d13dad3ad50..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_single_uncompleted_chunk_with_index_in_memory_and_then_reopening_db.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using System.Linq;
-using EventStore.Core.Data;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Truncation {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_truncating_single_uncompleted_chunk_with_index_in_memory_and_then_reopening_db<TLogFormat, TStreamId> :
-			TruncateAndReOpenDbScenario<TLogFormat, TStreamId> {
-		private EventRecord _event1;
-		private EventRecord _event2;
-		private EventRecord _event3;
-
-		public when_truncating_single_uncompleted_chunk_with_index_in_memory_and_then_reopening_db()
-			: base(20000) {
-		}
-
-		protected override void WriteTestScenario() {
-			_event1 = WriteSingleEvent("ES", 0, new string('.', 500));
-			_event2 = WriteSingleEvent("ES", 1, new string('.', 500)); // truncated
-			_event3 = WriteSingleEvent("ES", 2, new string('.', 500)); // truncated
-
-			TruncateCheckpoint = _event2.LogPosition;
-		}
-
-		[Test]
-		public void checksums_should_be_equal_to_ack_checksum() {
-			Assert.AreEqual(TruncateCheckpoint, WriterCheckpoint.Read());
-			Assert.AreEqual(TruncateCheckpoint, ChaserCheckpoint.Read());
-		}
-
-		[Test]
-		public void read_one_by_one_doesnt_return_truncated_records() {
-			var res = ReadIndex.ReadEvent("ES", 0);
-			Assert.AreEqual(ReadEventResult.Success, res.Result);
-			Assert.AreEqual(_event1, res.Record);
-
-			res = ReadIndex.ReadEvent("ES", 1);
-			Assert.AreEqual(ReadEventResult.NotFound, res.Result);
-			Assert.IsNull(res.Record);
-
-			res = ReadIndex.ReadEvent("ES", 2);
-			Assert.AreEqual(ReadEventResult.NotFound, res.Result);
-			Assert.IsNull(res.Record);
-
-			res = ReadIndex.ReadEvent("ES", 3);
-			Assert.AreEqual(ReadEventResult.NotFound, res.Result);
-			Assert.IsNull(res.Record);
-		}
-
-		[Test]
-		public void read_stream_forward_doesnt_return_truncated_records() {
-			var res = ReadIndex.ReadStreamEventsForward("ES", 0, 100);
-			var records = res.Records;
-			Assert.AreEqual(1, records.Length);
-			Assert.AreEqual(_event1, records[0]);
-		}
-
-		[Test]
-		public void read_stream_backward_doesnt_return_truncated_records() {
-			var res = ReadIndex.ReadStreamEventsBackward("ES", -1, 100);
-			var records = res.Records;
-			Assert.AreEqual(1, records.Length);
-			Assert.AreEqual(_event1, records[0]);
-		}
-
-		[Test]
-		public void read_all_forward_doesnt_return_truncated_records() {
-			var res = ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100);
-			var records = res.EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(1, records.Length);
-			Assert.AreEqual(_event1, records[0]);
-		}
-
-		[Test]
-		public void read_all_backward_doesnt_return_truncated_records() {
-			var res = ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100);
-			var records = res.EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(1, records.Length);
-			Assert.AreEqual(_event1, records[0]);
-		}
-
-		[Test]
-		public void read_all_backward_from_last_truncated_record_returns_no_records() {
-			var pos = new TFPos(_event3.LogPosition, _event3.LogPosition);
-			var res = ReadIndex.ReadAllEventsForward(pos, 100);
-			var records = res.EventRecords()
-				.Select(r => r.Event)
-				.ToArray();
-			Assert.AreEqual(0, records.Length);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_single_uncompleted_chunk_with_index_on_disk.cs b/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_single_uncompleted_chunk_with_index_on_disk.cs
deleted file mode 100644
index eb039a423cb..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_single_uncompleted_chunk_with_index_on_disk.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using EventStore.Core.Data;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Truncation {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_truncating_single_uncompleted_chunk_with_index_on_disk<TLogFormat, TStreamId> : TruncateScenario<TLogFormat, TStreamId> {
-		private EventRecord _event2;
-
-		public when_truncating_single_uncompleted_chunk_with_index_on_disk()
-			: base(maxEntriesInMemTable: 3) {
-		}
-
-		protected override void WriteTestScenario() {
-			WriteSingleEvent("ES", 0, new string('.', 500));
-			_event2 = WriteSingleEvent("ES", 1, new string('.', 500));
-			WriteSingleEvent("ES", 2, new string('.', 500)); // index goes to disk
-			WriteSingleEvent("ES", 3, new string('.', 500));
-
-			TruncateCheckpoint = _event2.LogPosition;
-		}
-
-		[Test]
-		public void checksums_should_be_equal_to_ack_checksum() {
-			Assert.AreEqual(TruncateCheckpoint, WriterCheckpoint.Read());
-			Assert.AreEqual(TruncateCheckpoint, ChaserCheckpoint.Read());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_to_a_data_chunk_boundary.cs b/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_to_a_data_chunk_boundary.cs
deleted file mode 100644
index 19365f62494..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_to_a_data_chunk_boundary.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog.Validation;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.Transforms.Identity;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Truncation {
-	[TestFixture]
-	public class when_truncating_to_a_data_chunk_boundary : SpecificationWithDirectoryPerTestFixture {
-		private TFChunkDbConfig _config;
-
-		private const int ChunkSize = 1000;
-		private  const long TruncateChk = ChunkSize * 3;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_config = TFChunkHelper.CreateDbConfigEx(PathName, 11111, 5500, 5500, -1, TruncateChk, ChunkSize, -1);
-
-			DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000001"));
-			DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000002"));
-			DbUtil.CreateSingleChunk(_config, 3, GetFilePathFor("chunk-000003.000000"));
-			DbUtil.CreateSingleChunk(_config, 4, GetFilePathFor("chunk-000004.000000"));
-			DbUtil.CreateOngoingChunk(_config, 5, GetFilePathFor("chunk-000005.000000"));
-
-			var truncator = new TFChunkDbTruncator(_config, _ => new IdentityChunkTransformFactory());
-			truncator.TruncateDb(_config.TruncateCheckpoint.ReadNonFlushed());
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			using (var db = new TFChunkDb(_config)) {
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-			}
-
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000002")));
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000003.000000")));
-			Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void chunk_at_boundary_should_be_deleted() {
-			var files = Directory.GetFiles(PathName, "*").Select(Path.GetFileName).Order().ToArray();
-			Assert.AreEqual(new[] { "chunk-000000.000001", "chunk-000000.000002" }, files);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_to_a_scavenged_chunk_boundary.cs b/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_to_a_scavenged_chunk_boundary.cs
deleted file mode 100644
index 3d6235213f3..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_to_a_scavenged_chunk_boundary.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog.Validation;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.Transforms.Identity;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Truncation {
-	[TestFixture]
-	public class when_truncating_to_a_scavenged_chunk_boundary : SpecificationWithDirectoryPerTestFixture {
-		private TFChunkDbConfig _config;
-
-		private const int ChunkSize = 1000;
-		private  const long TruncateChk = ChunkSize * 3;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_config = TFChunkHelper.CreateDbConfigEx(PathName, 11111, 5500, 5500, -1, TruncateChk, ChunkSize, -1);
-
-			DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000001"));
-			DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000002"));
-			DbUtil.CreateMultiChunk(_config, 3, 3, GetFilePathFor("chunk-000003.000001"));
-			DbUtil.CreateSingleChunk(_config, 4, GetFilePathFor("chunk-000004.000000"));
-			DbUtil.CreateOngoingChunk(_config, 5, GetFilePathFor("chunk-000005.000000"));
-
-			var truncator = new TFChunkDbTruncator(_config, _ => new IdentityChunkTransformFactory());
-			truncator.TruncateDb(_config.TruncateCheckpoint.ReadNonFlushed());
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			using (var db = new TFChunkDb(_config)) {
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-			}
-
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000002")));
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000003.000000")));
-			Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void chunk_at_boundary_should_be_deleted() {
-			var files = Directory.GetFiles(PathName, "*").Select(Path.GetFileName).Order().ToArray();
-			Assert.AreEqual(new[] { "chunk-000000.000001", "chunk-000000.000002" }, files);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_to_the_very_beginning_of_db.cs b/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_to_the_very_beginning_of_db.cs
deleted file mode 100644
index d6eeaae1f60..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Truncation/when_truncating_to_the_very_beginning_of_db.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System.IO;
-using System.Threading.Tasks;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.Tests.TransactionLog.Validation;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.Transforms.Identity;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Truncation {
-	[TestFixture]
-	public class when_truncating_to_the_very_beginning_of_multichunk_db : SpecificationWithDirectoryPerTestFixture {
-		private TFChunkDbConfig _config;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_config = TFChunkHelper.CreateDbConfigEx(PathName, 11111, 5500, 5500, -1,0, 1000, -1);
-
-			DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000001"));
-			DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000002"));
-			DbUtil.CreateMultiChunk(_config, 3, 10, GetFilePathFor("chunk-000003.000001"));
-			DbUtil.CreateMultiChunk(_config, 3, 10, GetFilePathFor("chunk-000003.000002"));
-			DbUtil.CreateMultiChunk(_config, 7, 8, GetFilePathFor("chunk-000007.000001"));
-			DbUtil.CreateOngoingChunk(_config, 11, GetFilePathFor("chunk-000011.000000"));
-
-			var truncator = new TFChunkDbTruncator(_config, _ => new IdentityChunkTransformFactory());
-			truncator.TruncateDb(_config.TruncateCheckpoint.ReadNonFlushed());
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			using (var db = new TFChunkDb(_config)) {
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-			}
-
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
-			Assert.AreEqual(1, Directory.GetFiles(PathName, "*").Length);
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void writer_checkpoint_should_be_set_to_start_of_new_chunk() {
-			Assert.AreEqual(0, _config.WriterCheckpoint.Read());
-			Assert.AreEqual(0, _config.WriterCheckpoint.ReadNonFlushed());
-		}
-
-		[Test]
-		public void chaser_checkpoint_should_be_adjusted_if_less_than_actual_truncate_checkpoint() {
-			Assert.AreEqual(0, _config.ChaserCheckpoint.Read());
-			Assert.AreEqual(0, _config.ChaserCheckpoint.ReadNonFlushed());
-		}
-
-		[Test]
-		public void epoch_checkpoint_should_be_reset_if_less_than_actual_truncate_checkpoint() {
-			Assert.AreEqual(-1, _config.EpochCheckpoint.Read());
-			Assert.AreEqual(-1, _config.EpochCheckpoint.ReadNonFlushed());
-		}
-
-		[Test]
-		public void truncate_checkpoint_should_be_reset_after_truncation() {
-			Assert.AreEqual(-1, _config.TruncateCheckpoint.Read());
-			Assert.AreEqual(-1, _config.TruncateCheckpoint.ReadNonFlushed());
-		}
-
-		[Test]
-		public void all_chunks_should_be_deleted() {
-			Assert.AreEqual(0, Directory.GetFiles(PathName, "*").Length);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Unbuffered/UnbufferedTests.cs b/src/EventStore.Core.Tests/TransactionLog/Unbuffered/UnbufferedTests.cs
deleted file mode 100644
index 6585c0fa961..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Unbuffered/UnbufferedTests.cs
+++ /dev/null
@@ -1,703 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Core.TransactionLog.Unbuffered;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Unbuffered {
-	[TestFixture]
-	public class UnbufferedTests : SpecificationWithDirectory {
-		[Test]
-		public void when_resizing_a_file() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-
-			var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096);
-			stream.SetLength(4096 * 1024);
-			stream.Close();
-			Assert.AreEqual(4096 * 1024, new FileInfo(filename).Length);
-		}
-
-		[Test]
-		public void when_expanding_an_aligned_file_by_one_page() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-
-			var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096);
-			
-			var initialFileSize = 4096 * 1024;
-			stream.SetLength(initialFileSize); //initial size of 4MB
-
-			stream.Seek(0, SeekOrigin.End);
-
-			Assert.AreEqual(initialFileSize, stream.Position); //verify position
-			stream.SetLength(initialFileSize + 4096); //expand file by 4KB
-			Assert.AreEqual(initialFileSize, stream.Position); //position should not change
-			
-			stream.Close();
-
-			Assert.AreEqual(initialFileSize + 4096, new FileInfo(filename).Length); //file size should increase by 4KB
-		}
-
-		[Test]
-		public void when_expanding_an_aligned_file_by_one_byte_less_than_one_page() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-
-			var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096);
-			
-			var initialFileSize = 4096 * 1024;
-			stream.SetLength(initialFileSize); //initial size of 4MB
-
-			stream.Seek(0, SeekOrigin.End);
-
-			Assert.AreEqual(initialFileSize, stream.Position); //verify position
-			stream.SetLength(initialFileSize + 4095); //expand file by 4KB - 1
-			Assert.AreEqual(initialFileSize, stream.Position); //position should not change
-			
-			stream.Close();
-
-			Assert.AreEqual(initialFileSize + 4096, new FileInfo(filename).Length); //file size should increase by 4KB
-		}
-
-		[Test]
-		public void when_expanding_an_aligned_file_by_one_byte_more_than_one_page() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-
-			var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096);
-			
-			var initialFileSize = 4096 * 1024;
-			stream.SetLength(initialFileSize); //initial size of 4MB
-
-			stream.Seek(0, SeekOrigin.End);
-
-			Assert.AreEqual(initialFileSize, stream.Position); //verify position
-			stream.SetLength(initialFileSize + 4097); //expand file by 4KB + 1
-			Assert.AreEqual(initialFileSize, stream.Position); //position should not change
-			
-			stream.Close();
-
-			Assert.AreEqual(initialFileSize + 4096 * 2, new FileInfo(filename).Length); //file size should increase by 4KB x 2
-		}
-
-		[Test]
-		public void when_expanding_an_aligned_file_by_one_byte() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-
-			var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096);
-			
-			var initialFileSize = 4096 * 1024;
-			stream.SetLength(initialFileSize); //initial size of 4MB
-
-			stream.Seek(0, SeekOrigin.End);
-
-			Assert.AreEqual(initialFileSize, stream.Position); //verify position
-			stream.SetLength(initialFileSize + 1); //expand file by 1 byte
-			Assert.AreEqual(initialFileSize, stream.Position); //position should not change
-			
-			stream.Close();
-
-			Assert.AreEqual(initialFileSize + 4096, new FileInfo(filename).Length); //file size should increase by 4KB
-		}
-
-		[Test]
-		public void when_truncating_an_aligned_file_by_one_page() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-
-			var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096);
-			
-			var initialFileSize = 4096 * 1024;
-			stream.SetLength(initialFileSize); //initial size of 4MB
-
-			stream.Seek(0, SeekOrigin.End);
-
-			Assert.AreEqual(initialFileSize, stream.Position); //verify position
-			stream.SetLength(initialFileSize - 4096); //truncate file by 4KB
-			Assert.AreEqual(initialFileSize - 4096, stream.Position); //position should decrease by 4KB
-			
-			stream.Close();
-
-			Assert.AreEqual(initialFileSize - 4096, new FileInfo(filename).Length); //file size should decrease by 4KB
-		}
-
-		[Test]
-		public void when_truncating_an_aligned_file_by_one_page_and_position_one_page_from_eof() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-
-			var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096);
-			
-			var initialFileSize = 4096 * 1024;
-			stream.SetLength(initialFileSize); //initial size of 4MB
-
-			stream.Seek(-4096, SeekOrigin.End);
-
-			Assert.AreEqual(initialFileSize - 4096, stream.Position); //verify position
-			stream.SetLength(initialFileSize - 4096); //truncate file by 4KB
-			Assert.AreEqual(initialFileSize - 4096, stream.Position); //position should not change
-			
-			stream.Close();
-
-			Assert.AreEqual(initialFileSize - 4096, new FileInfo(filename).Length); //file size should decrease by 4KB
-		}
-
-		[Test]
-		public void when_truncating_an_aligned_file_by_one_byte_less_than_a_page() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-
-			var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096);
-			
-			var initialFileSize = 4096 * 1024;
-			stream.SetLength(initialFileSize); //initial size of 4MB
-
-			stream.Seek(0, SeekOrigin.End);
-
-			Assert.AreEqual(initialFileSize, stream.Position); //verify position
-			stream.SetLength(initialFileSize - 4095); //truncate file by 4KB - 1
-			Assert.AreEqual(initialFileSize, stream.Position); //position should not change
-			
-			stream.Close();
-
-			Assert.AreEqual(initialFileSize, new FileInfo(filename).Length); //file size should not change
-		}
-
-		[Test]
-		public void when_truncating_an_aligned_file_by_one_byte_more_than_a_page() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-
-			var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096);
-			
-			var initialFileSize = 4096 * 1024;
-			stream.SetLength(initialFileSize); //initial size of 4MB
-
-			stream.Seek(0, SeekOrigin.End);
-
-			Assert.AreEqual(initialFileSize, stream.Position); //verify position
-			stream.SetLength(initialFileSize - 4097); //truncate file by 4KB + 1
-			Assert.AreEqual(initialFileSize - 4096, stream.Position); //position should decrease by 4KB 
-			
-			stream.Close();
-
-			Assert.AreEqual(initialFileSize - 4096, new FileInfo(filename).Length); //file size should decrease by 4KB
-		}
-
-		[Test]
-		public void when_truncating_an_aligned_file_by_one_byte() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-
-			var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096);
-			
-			var initialFileSize = 4096 * 1024;
-			stream.SetLength(initialFileSize); //initial size of 4MB
-
-			stream.Seek(0, SeekOrigin.End);
-
-			Assert.AreEqual(initialFileSize, stream.Position); //verify position
-			stream.SetLength(initialFileSize - 1); //truncate file by 1 byte
-			Assert.AreEqual(initialFileSize, stream.Position); //position should not change
-			
-			stream.Close();
-
-			Assert.AreEqual(initialFileSize, new FileInfo(filename).Length); //file size should not change
-		}
-
-		[Test]
-		public void when_writing_less_than_buffer() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-			var bytes = GetBytes(255);
-			using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-				stream.Write(bytes, 0, bytes.Length);
-				Assert.AreEqual(bytes.Length, stream.Position);
-				Assert.AreEqual(0, new FileInfo(filename).Length);
-			}
-		}
-
-		[Test]
-		public void when_writing_more_than_buffer() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-			var bytes = GetBytes(9000);
-			using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-				stream.Write(bytes, 0, bytes.Length);
-				Assert.AreEqual(4096 * 2, new FileInfo(filename).Length);
-				var read = ReadAllBytesShared(filename);
-				for (var i = 0; i < 4096 * 2; i++) {
-					Assert.AreEqual(i % 256, read[i]);
-				}
-			}
-		}
-
-		[Test]
-		public void when_writing_less_than_buffer_and_closing() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-			var bytes = GetBytes(255);
-			using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-				stream.Write(bytes, 0, bytes.Length);
-			}
-
-			Assert.AreEqual(4096, new FileInfo(filename).Length);
-			var read = ReadAllBytesShared(filename);
-
-			for (var i = 0; i < 255; i++) {
-				Assert.AreEqual(i % 256, read[i]);
-			}
-		}
-
-		[Test, Ignore("Requires a 4gb file")]
-		public void when_seeking_greater_than_2gb() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-			var GIGABYTE = 1024L * 1024L * 1024L;
-			try {
-				using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-					FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-					stream.SetLength(4L * GIGABYTE);
-					stream.Seek(3L * GIGABYTE, SeekOrigin.Begin);
-				}
-			} finally {
-				File.Delete(filename);
-			}
-		}
-
-		[Test]
-		public void when_writing_less_than_buffer_and_seeking() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-			var bytes = GetBytes(255);
-			using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-				stream.Write(bytes, 0, bytes.Length);
-				stream.Seek(0, SeekOrigin.Begin);
-				Assert.AreEqual(0, stream.Position);
-				Assert.AreEqual(4096, new FileInfo(filename).Length);
-				var read = ReadAllBytesShared(filename);
-
-				for (var i = 0; i < 255; i++) {
-					Assert.AreEqual(i % 256, read[i]);
-				}
-			}
-		}
-
-		[Test]
-		public void when_writing_exact_to_alignment_and_writing_again() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-			var bytes = GetBytes(4096);
-			using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-				stream.Write(bytes, 0, bytes.Length);
-				Assert.AreEqual(4096, stream.Position);
-				bytes = GetBytes(15);
-				stream.Write(bytes, 0, bytes.Length);
-				Assert.AreEqual(4111, stream.Position);
-				stream.Flush();
-				Assert.AreEqual(4111, stream.Position);
-				Assert.AreEqual(8192, new FileInfo(filename).Length);
-				var read = ReadAllBytesShared(filename);
-
-				for (var i = 0; i < 255; i++) {
-					Assert.AreEqual(i % 256, read[i]);
-				}
-			}
-		}
-
-		[Test]
-		public void when_writing_then_seeking_exact_to_alignment_and_writing_again() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-			var bytes = GetBytes(8192);
-			using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-				stream.Write(bytes, 0, 5012);
-				Assert.AreEqual(5012, stream.Position);
-				stream.Seek(4096, SeekOrigin.Begin);
-				Assert.AreEqual(4096, stream.Position);
-				bytes = GetBytes(15);
-				stream.Write(bytes, 0, bytes.Length);
-				Assert.AreEqual(4111, stream.Position);
-				stream.Flush();
-				Assert.AreEqual(4111, stream.Position);
-				Assert.AreEqual(8192, new FileInfo(filename).Length);
-				var read = ReadAllBytesShared(filename);
-
-				for (var i = 0; i < 255; i++) {
-					Assert.AreEqual(i % 256, read[i]);
-				}
-			}
-		}
-
-
-		[Test]
-		public void when_seeking_non_exact_to_zero_block_and_writing() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-			MakeFile(filename, 4096 * 64);
-			var bytes = GetBytes(512);
-			using (var stream = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-				stream.Seek(128, SeekOrigin.Begin);
-				stream.Write(bytes, 0, bytes.Length);
-				stream.Flush();
-			}
-
-			using (var stream = new FileStream(filename, FileMode.Open)) {
-				var read = new byte[128];
-				stream.Read(read, 0, 128);
-				for (var i = 0; i < read.Length; i++) {
-					Assert.AreEqual(i, read[i]);
-				}
-			}
-		}
-
-		[Test]
-		public void when_writing_multiple_times() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-			var bytes = GetBytes(256);
-			using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-				stream.Write(bytes, 0, bytes.Length);
-				Assert.AreEqual(256, stream.Position);
-				stream.Flush();
-				Assert.AreEqual(256, stream.Position);
-				stream.Write(bytes, 0, bytes.Length);
-				Assert.AreEqual(512, stream.Position);
-				stream.Flush();
-				Assert.AreEqual(512, stream.Position);
-				Assert.AreEqual(4096, new FileInfo(filename).Length);
-				var read = ReadAllBytesShared(filename);
-
-				for (var i = 0; i < 512; i++) {
-					Assert.AreEqual(i % 256, read[i]);
-				}
-			}
-		}
-
-
-		[Test]
-		public void when_reading_multiple_times() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-			MakeFile(filename, 20000);
-			using (var stream = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-				stream.Seek(4096 + 15, SeekOrigin.Begin);
-				var read = new byte[1000];
-				stream.Read(read, 0, 500);
-				Assert.AreEqual(4096 + 15 + 500, stream.Position);
-				stream.Read(read, 500, 500);
-				Assert.AreEqual(4096 + 15 + 1000, stream.Position);
-				for (var i = 0; i < read.Length; i++) {
-					Assert.AreEqual((i + 15) % 256, read[i]);
-				}
-			}
-		}
-
-		[Test]
-		public void when_reading_multiple_times_no_seek() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-			MakeFile(filename, 20000);
-			using (var stream = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-				var read = new byte[1000];
-				stream.Read(read, 0, 500);
-				Assert.AreEqual(500, stream.Position);
-				stream.Read(read, 500, 500);
-				Assert.AreEqual(1000, stream.Position);
-				for (var i = 0; i < read.Length; i++) {
-					Assert.AreEqual(i % 256, read[i]);
-				}
-			}
-		}
-
-		[Test]
-		public void when_reading_multiple_times_over_page_size() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-			MakeFile(filename, 20000);
-			using (var stream = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-				var read = new byte[6000];
-				stream.Read(read, 0, 3000);
-				Assert.AreEqual(3000, stream.Position);
-				var total = stream.Read(read, 3000, 3000);
-				Assert.AreEqual(3000, total);
-				Assert.AreEqual(6000, stream.Position);
-				for (var i = 0; i < read.Length; i++) {
-					Assert.AreEqual(i % 256, read[i]);
-				}
-			}
-		}
-
-		[Test]
-		public void when_reading_multiple_times_on_page_size() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-			MakeFile(filename, 20000);
-			using (var stream = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-				var read = new byte[6000];
-				stream.Read(read, 0, 3000);
-				Assert.AreEqual(3000, stream.Position);
-				var total = stream.Read(read, 3000, 1096);
-				Assert.AreEqual(1096, total);
-				total = stream.Read(read, 4096, read.Length - 4096);
-				Assert.AreEqual(read.Length - 4096, total);
-				Assert.AreEqual(6000, stream.Position);
-				for (var i = 0; i < read.Length; i++) {
-					Assert.AreEqual(i % 256, read[i]);
-				}
-			}
-		}
-
-
-		[Test]
-		public void when_reading_multiple_times_exact_page_size() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-			MakeFile(filename, 4096 * 100 + 50);
-			Span<byte> expected = GetBytes(4096);
-			using (var stream = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-				var read = new byte[4096];
-				for (var i = 0; i < 100; i++) {
-					var total = stream.Read(read, 0, 4096);
-					Assert.AreEqual(4096 * (i + 1), stream.Position);
-					Assert.AreEqual(4096, total);
-					if (!expected.SequenceEqual(read)) {
-						for (var j = 0; j < read.Length; j++) {
-							Assert.AreEqual(j % 256, read[j]);
-						}
-					}
-				}
-
-				expected = expected.Slice(0, 50);
-				var total2 = stream.Read(read, 0, 50);
-				Assert.AreEqual(409600 + 50, stream.Position);
-				Assert.AreEqual(50, total2);
-				if (!expected.SequenceEqual(read)) {
-					for (var j = 0; j < 50; j++) {
-						Assert.AreEqual(j % 256, read[j]);
-					}
-				}
-			}
-		}
-
-		[Test]
-		public void when_reading_multiple_times_offset_page_size() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-			MakeFile(filename, 4096 * 100 + 50);
-			Span<byte> expected = GetBytes(4096 + 50);
-			expected = expected[50..];
-			using (var stream = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-				stream.Seek(50, SeekOrigin.Begin);
-				var read = new byte[4096];
-				for (var i = 0; i < 100; i++) {
-					var total = stream.Read(read, 0, 4096);
-					Assert.AreEqual(4096 * (i + 1) + 50, stream.Position);
-					Assert.AreEqual(4096, total);
-					if (!expected.SequenceEqual(read)) {
-						for (var j = 0; j < read.Length; j++) {
-							Assert.AreEqual((j + 50) % 256, read[j]);
-						}
-					}
-				}
-
-				Assert.AreEqual(4096 * 100 + 50, stream.Position);
-			}
-		}
-
-		[Test]
-		public void when_writing_more_than_buffer_and_closing() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-			var bytes = GetBytes(9000);
-			using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-				stream.Write(bytes, 0, bytes.Length);
-				stream.Close();
-				Assert.AreEqual(4096 * 3, new FileInfo(filename).Length);
-				var read = File.ReadAllBytes(filename);
-				for (var i = 0; i < 9000; i++) {
-					Assert.AreEqual(i % 256, read[i]);
-				}
-			}
-		}
-
-		[Test]
-		public void when_reading_on_aligned_buffer() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-			MakeFile(filename, 20000);
-			using (var stream = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-				var read = new byte[4096];
-				stream.Read(read, 0, 4096);
-				for (var i = 0; i < 4096; i++) {
-					Assert.AreEqual(i % 256, read[i]);
-				}
-			}
-		}
-
-		[Test]
-		public void when_reading_on_unaligned_buffer() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-			MakeFile(filename, 20000);
-			using (var stream = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-				stream.Seek(15, SeekOrigin.Begin);
-				var read = new byte[999];
-				stream.Read(read, 0, read.Length);
-				for (var i = 0; i < read.Length; i++) {
-					Assert.AreEqual((i + 15) % 256, read[i]);
-				}
-			}
-		}
-
-		[Test]
-		public void seek_and_read_on_unaligned_buffer() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-			MakeFile(filename, 20000);
-			using (var stream = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-				stream.Seek(4096 + 15, SeekOrigin.Begin);
-				Assert.AreEqual(4096 + 15, stream.Position);
-				var read = new byte[999];
-				stream.Read(read, 0, read.Length);
-				Assert.AreEqual(4096 + 15 + 999, stream.Position);
-				for (var i = 0; i < read.Length; i++) {
-					Assert.AreEqual((i + 15) % 256, read[i]);
-				}
-			}
-		}
-
-		[Test]
-		public void seek_end_of_file() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-
-			using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-				stream.Seek(0, SeekOrigin.End);
-				Assert.AreEqual(stream.Length, stream.Position);
-			}
-		}
-
-		[Test]
-		public void seek_origin_end_to_mid_of_file() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-
-			using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-				stream.Seek(-30, SeekOrigin.End);
-				Assert.AreEqual(stream.Length - 30, stream.Position);
-			}
-		}
-
-
-		[Test]
-		public void seek_current_unimplemented() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-
-			using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-				Assert.Throws<NotImplementedException>(() => stream.Seek(0, SeekOrigin.Current));
-			}
-		}
-
-
-		[Test]
-		public void seek_write_seek_read_in_buffer() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-			using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
-				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
-				var buffer = GetBytes(255);
-				stream.Seek(4096 + 15, SeekOrigin.Begin);
-				stream.Write(buffer, 0, buffer.Length);
-				stream.Seek(4096 + 15, SeekOrigin.Begin);
-				var read = new byte[255];
-				stream.Read(read, 0, read.Length);
-				for (var i = 0; i < read.Length; i++) {
-					Assert.AreEqual(i % 255, read[i]);
-				}
-			}
-		}
-
-		[Test]
-		public void same_as_file_stream_on_reads() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-			var bytes = BuildBytes(4096 * 128);
-			File.WriteAllBytes(filename, bytes);
-			using (var f = new FileStream(filename, FileMode.Open, FileAccess.Read)) {
-				using (var b = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.Read, FileShare.Read,
-					4096, 4096, false, 4096)) {
-					Span<byte> readf = new byte[4096];
-					var readb = new byte[4096];
-					for (var i = 0; i < 128; i++) {
-						var totalf = f.Read(readf);
-						var totalb = b.Read(readb, 0, 4096);
-
-						if (!readf[..totalf].SequenceEqual(readb[..totalb])) {
-							for (var j = 0; j < 4096; j++) {
-								Assert.AreEqual(totalf, totalb);
-								Assert.AreEqual(readf[j], readb[j]);
-							}
-						}
-					}
-				}
-			}
-		}
-
-		[Test]
-		public void same_as_file_stream_on_reads_with_bigger_buffer() {
-			var filename = GetFilePathFor(Guid.NewGuid().ToString());
-			var bytes = BuildBytes(4096 * 128);
-			File.WriteAllBytes(filename, bytes);
-			using (var f = new FileStream(filename, FileMode.Open, FileAccess.Read)) {
-				using (var b = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.Read, FileShare.Read,
-					4096, 4096 * 4, false, 4096)) {
-					Span<byte> readf = new byte[4096];
-					var readb = new byte[4096];
-					for (var i = 0; i < 128; i++) {
-						var totalf = f.Read(readf);
-						var totalb = b.Read(readb, 0, 4096);
-
-						if (!readf[..totalf].SequenceEqual(readb[..totalb])) {
-							for (var j = 0; j < 4096; j++) {
-								Assert.AreEqual(totalf, totalb);
-								Assert.AreEqual(readf[j], readb[j]);
-							}
-						}
-					}
-				}
-			}
-		}
-
-		private byte[] BuildBytes(int count) {
-			using var ret = new MemoryStream();
-			for (int i = 0; i < count / 16; i++) {
-				ret.Write(Guid.NewGuid().ToByteArray(), 0, 16);
-			}
-
-			return ret.ToArray();
-		}
-
-
-		private byte[] ReadAllBytesShared(string filename) {
-			using (var fs = File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) {
-				var ret = new byte[fs.Length];
-				fs.Read(ret, 0, (int)fs.Length);
-				return ret;
-			}
-		}
-
-		private void MakeFile(string filename, int size) {
-			var bytes = GetBytes(size);
-			File.WriteAllBytes(filename, bytes);
-		}
-
-		private byte[] GetBytes(int size) {
-			var ret = new byte[size];
-			for (var i = 0; i < size; i++) {
-				ret[i] = (byte)(i % 256);
-			}
-
-			return ret;
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Validation/TFChunkDbCreationTestBase.cs b/src/EventStore.Core.Tests/TransactionLog/Validation/TFChunkDbCreationTestBase.cs
deleted file mode 100644
index e5c2e3fa1c3..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Validation/TFChunkDbCreationTestBase.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.TransactionLog.Validation {
-	public static class DbUtil {
-		public static void CreateSingleChunk(TFChunkDbConfig config, int chunkNum, string filename,
-			int? actualDataSize = null, bool isScavenged = false, byte[] contents = null) {
-			var chunkHeader = new ChunkHeader(TFChunk.CurrentChunkVersion, TFChunk.CurrentChunkVersion,
-				config.ChunkSize,chunkNum, chunkNum, isScavenged, Guid.NewGuid(), TransformType.Identity);
-			var chunkBytes = chunkHeader.AsByteArray();
-			var dataSize = actualDataSize ?? config.ChunkSize;
-			var buf = new byte[ChunkHeader.Size + dataSize + ChunkFooter.Size];
-			Buffer.BlockCopy(chunkBytes, 0, buf, 0, chunkBytes.Length);
-			var chunkFooter = new ChunkFooter(true, true, dataSize, dataSize, 0, new byte[ChunkFooter.ChecksumSize]);
-			chunkBytes = chunkFooter.AsByteArray();
-			Buffer.BlockCopy(chunkBytes, 0, buf, buf.Length - ChunkFooter.Size, chunkBytes.Length);
-
-			if (contents != null) {
-				if (contents.Length != dataSize)
-					throw new Exception("Wrong contents size.");
-				Buffer.BlockCopy(contents, 0, buf, ChunkHeader.Size, contents.Length);
-			}
-
-			File.WriteAllBytes(filename, buf);
-		}
-
-		public static void CreateMultiChunk(TFChunkDbConfig config, int chunkStartNum, int chunkEndNum, string filename,
-			int? physicalSize = null, long? logicalSize = null) {
-			if (chunkStartNum > chunkEndNum) throw new ArgumentException("chunkStartNum");
-
-			var chunkHeader = new ChunkHeader(TFChunk.CurrentChunkVersion, TFChunk.CurrentChunkVersion,
-				config.ChunkSize, chunkStartNum, chunkEndNum, true, Guid.NewGuid(), TransformType.Identity);
-			var chunkBytes = chunkHeader.AsByteArray();
-			var physicalDataSize = physicalSize ?? config.ChunkSize;
-			var logicalDataSize = logicalSize ?? (chunkEndNum - chunkStartNum + 1) * config.ChunkSize;
-			var buf = new byte[ChunkHeader.Size + physicalDataSize + ChunkFooter.Size];
-			Buffer.BlockCopy(chunkBytes, 0, buf, 0, chunkBytes.Length);
-			var chunkFooter = new ChunkFooter(true, true, physicalDataSize, logicalDataSize, 0,
-				new byte[ChunkFooter.ChecksumSize]);
-			chunkBytes = chunkFooter.AsByteArray();
-			Buffer.BlockCopy(chunkBytes, 0, buf, buf.Length - ChunkFooter.Size, chunkBytes.Length);
-			File.WriteAllBytes(filename, buf);
-		}
-
-		public static void CreateOngoingChunk(TFChunkDbConfig config, int chunkNum, string filename,
-			int? actualSize = null, byte[] contents = null) {
-			var chunkHeader = new ChunkHeader(TFChunk.CurrentChunkVersion, TFChunk.CurrentChunkVersion,
-				config.ChunkSize, chunkNum, chunkNum, false,
-				Guid.NewGuid(), TransformType.Identity);
-			var chunkBytes = chunkHeader.AsByteArray();
-			var dataSize = actualSize ?? config.ChunkSize;
-			var buf = new byte[ChunkHeader.Size + dataSize + ChunkFooter.Size];
-			Buffer.BlockCopy(chunkBytes, 0, buf, 0, chunkBytes.Length);
-
-			if (contents != null) {
-				if (contents.Length != dataSize)
-					throw new Exception("Wrong contents size.");
-				Buffer.BlockCopy(contents, 0, buf, ChunkHeader.Size, contents.Length);
-			}
-
-			File.WriteAllBytes(filename, buf);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Validation/when_validating_tfchunk_db.cs b/src/EventStore.Core.Tests/TransactionLog/Validation/when_validating_tfchunk_db.cs
deleted file mode 100644
index e67ee46bbe0..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Validation/when_validating_tfchunk_db.cs
+++ /dev/null
@@ -1,610 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Exceptions;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using NUnit.Framework;
-using Serilog;
-using Serilog.Core;
-using Serilog.Events;
-
-namespace EventStore.Core.Tests.TransactionLog.Validation {
-	[TestFixture]
-	public class when_validating_tfchunk_db : SpecificationWithDirectory {
-		[Test]
-		public void detect_no_database() {
-			var config = TFChunkHelper.CreateSizedDbConfig(PathName, 4000, chunkSize: 1000);
-			using (var db = new TFChunkDb(config)) {
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<ChunkNotFoundException>());
-			}
-		}
-
-		[Test]
-		public void with_file_of_wrong_size_database_corruption_is_detected() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 500);
-			using (var db = new TFChunkDb(config)) {
-				File.WriteAllText(GetFilePathFor("chunk-000000.000000"), "this is just some test blahbydy blah");
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<BadChunkInDatabaseException>());
-			}
-		}
-
-		[Test]
-		public void with_not_enough_files_to_reach_checksum_throws() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 15000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<ChunkNotFoundException>());
-			}
-		}
-
-		[Test]
-		public void allows_with_exactly_enough_file_to_reach_checksum() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 10000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-			}
-		}
-
-		[Test]
-		public void does_not_allow_not_completed_not_last_chunks() {
-			var config = TFChunkHelper.CreateSizedDbConfig(PathName, 4000, chunkSize: 1000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateOngoingChunk(config, 1, GetFilePathFor("chunk-000001.000000"));
-				DbUtil.CreateOngoingChunk(config, 2, GetFilePathFor("chunk-000002.000000"));
-				DbUtil.CreateOngoingChunk(config, 3, GetFilePathFor("chunk-000003.000000"));
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<BadChunkInDatabaseException>());
-			}
-		}
-
-		[Test]
-		public void allows_next_new_chunk_when_checksum_is_exactly_in_between_two_chunks() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 10000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateOngoingChunk(config, 1, GetFilePathFor("chunk-000001.000000"));
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-			}
-		}
-
-		[Test, Ignore("Due to truncation such situation can happen, so must be considered valid.")]
-		public void does_not_allow_next_new_completed_chunk_when_checksum_is_exactly_in_between_two_chunks() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 10000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000000"));
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<BadChunkInDatabaseException>());
-			}
-		}
-
-		[Test]
-		public void
-			allows_last_chunk_to_be_not_completed_when_checksum_is_exactly_in_between_two_chunks_and_no_next_chunk_exists() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 10000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateOngoingChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-			}
-		}
-
-		[Test]
-		public void
-			does_not_allow_pre_last_chunk_to_be_not_completed_when_checksum_is_exactly_in_between_two_chunks_and_next_chunk_exists() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 10000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateOngoingChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateOngoingChunk(config, 1, GetFilePathFor("chunk-000001.000000"));
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<BadChunkInDatabaseException>());
-			}
-		}
-
-		[Test, Ignore("Not valid test now after disabling size validation on ongoing TFChunk ")]
-		public void with_wrong_size_file_less_than_checksum_throws() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 15000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000000"),
-					actualDataSize: config.ChunkSize - 1000);
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<BadChunkInDatabaseException>());
-			}
-		}
-
-		[Test]
-		public void one_sequential_extraneous_file_does_not_throw_corrupt_database_exception() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 9000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateOngoingChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000000"));
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-			}
-		}
-
-		[Test]
-		public void one_sequential_extraneous_file_with_non_zero_version_throws_corrupt_database_exception() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 9000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateOngoingChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000001"));
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<ExtraneousFileFoundException>());
-			}
-		}
-
-		[Test]
-		public void one_non_sequential_extraneous_file_throws_corrupt_database_exception() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 9000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateOngoingChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateSingleChunk(config, 2, GetFilePathFor("chunk-000002.000000"));
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<ExtraneousFileFoundException>());
-			}
-		}
-
-		[Test]
-		public void when_in_multiple_extraneous_latest_version_of_files_throws_corrupt_database_exception() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 15000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateOngoingChunk(config, 1, GetFilePathFor("chunk-000001.000000"));
-				DbUtil.CreateSingleChunk(config, 2, GetFilePathFor("chunk-000002.000000")); // extraneous file, but valid case
-				DbUtil.CreateSingleChunk(config, 3, GetFilePathFor("chunk-000003.000000")); // extraneous file
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<ExtraneousFileFoundException>()
-						.With.InnerException.Message.Contains("chunk-000003.000000"));
-			}
-		}
-
-		[Test]
-		public void when_in_multiple_extraneous_old_version_of_files_throws_corrupt_database_exception() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 15000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateOngoingChunk(config, 1, GetFilePathFor("chunk-000001.000000"));
-				DbUtil.CreateSingleChunk(config, 2, GetFilePathFor("chunk-000002.000000"));
-				DbUtil.CreateSingleChunk(config, 2, GetFilePathFor("chunk-000002.000001"));
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<ExtraneousFileFoundException>()
-						.With.InnerException.Message.Contains("chunk-000002.000000"));
-			}
-		}
-
-		[Test]
-		public void when_in_multiple_missing_file_throws_corrupt_database_exception() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 25000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateOngoingChunk(config, 2, GetFilePathFor("chunk-000002.000000"));
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<ChunkNotFoundException>());
-			}
-		}
-
-		[Test]
-		public void when_in_brand_new_extraneous_files_throws_corrupt_database_exception() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 0);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 4, GetFilePathFor("chunk-000004.000000"));
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<ExtraneousFileFoundException>());
-			}
-		}
-
-		[Test]
-		public void when_a_chaser_checksum_is_ahead_of_writer_checksum_throws_corrupt_database_exception() {
-			var config = TFChunkHelper.CreateDbConfigEx(PathName, 0, 11,-1,-1,-1,1000,-1);
-			using (var db = new TFChunkDb(config)) {
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<ReaderCheckpointHigherThanWriterException>());
-			}
-		}
-
-		[Test]
-		public void when_an_epoch_checksum_is_ahead_of_writer_checksum_throws_corrupt_database_exception() {
-			var config = TFChunkHelper.CreateDbConfigEx(PathName, 0, 0, 11,-1,-1,1000,-1);
-			using (var db = new TFChunkDb(config)) {
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<ReaderCheckpointHigherThanWriterException>());
-			}
-		}
-
-		[Test]
-		public void allows_no_files_when_checkpoint_is_zero() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 0);
-			using (var db = new TFChunkDb(config)) {
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
-			}
-		}
-
-		[Test]
-		public void allows_first_correct_ongoing_chunk_when_checkpoint_is_zero() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 0);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateOngoingChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-			}
-		}
-
-		[Test, Ignore("Due to truncation such situation can happen, so must be considered valid.")]
-		public void does_not_allow_first_completed_chunk_when_checkpoint_is_zero() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 0);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<BadChunkInDatabaseException>());
-			}
-		}
-
-		[Test]
-		public void allows_checkpoint_to_point_into_the_middle_of_completed_chunk_when_enough_actual_data_in_chunk() {
-			var config = TFChunkHelper.CreateSizedDbConfig(PathName, 1500, chunkSize: 1000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000001"), actualDataSize: 500);
-
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
-				Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
-			}
-		}
-
-		[Test, Ignore("We do not check this as it is too erroneous to read ChunkFooter from ongoing chunk...")]
-		public void
-			does_not_allow_checkpoint_to_point_into_the_middle_of_completed_chunk_when_not_enough_actual_data() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 1500);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000001"), actualDataSize: 499);
-
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<BadChunkInDatabaseException>());
-			}
-		}
-
-		[Test]
-		public void does_not_allow_checkpoint_to_point_into_the_middle_of_scavenged_chunk() {
-			var config = TFChunkHelper.CreateSizedDbConfig(PathName, 1500, chunkSize: 1000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000001"), isScavenged: true,
-					actualDataSize: 1000);
-
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<BadChunkInDatabaseException>());
-			}
-		}
-
-		[Test]
-		public void old_version_of_chunks_are_removed() {
-			File.Create(GetFilePathFor("foo")).Close();
-			File.Create(GetFilePathFor("bla")).Close();
-
-			var config = TFChunkHelper.CreateSizedDbConfig(PathName, 350, chunkSize: 100);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000002"));
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000005"));
-				DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000000"));
-				DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000001"));
-				DbUtil.CreateSingleChunk(config, 2, GetFilePathFor("chunk-000002.000000"));
-				DbUtil.CreateSingleChunk(config, 3, GetFilePathFor("chunk-000003.000007"));
-				DbUtil.CreateOngoingChunk(config, 3, GetFilePathFor("chunk-000003.000008"));
-
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-
-				Assert.IsTrue(File.Exists(GetFilePathFor("foo")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("bla")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000005")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000002.000000")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000003.000008")));
-				Assert.AreEqual(6, Directory.GetFiles(PathName, "*").Length);
-			}
-		}
-
-		[Test]
-		public void when_checkpoint_is_on_boundary_of_chunk_last_chunk_is_preserved() {
-			var config = TFChunkHelper.CreateSizedDbConfig(PathName, 200, chunkSize: 100);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000001"));
-				DbUtil.CreateOngoingChunk(config, 2, GetFilePathFor("chunk-000002.000005"));
-
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000002.000005")));
-				Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
-			}
-		}
-
-		[Test]
-		public void
-			when_checkpoint_is_on_boundary_of_new_chunk_last_chunk_is_preserved_and_excessive_versions_are_removed_if_present() {
-			var config = TFChunkHelper.CreateSizedDbConfig(PathName, 200, chunkSize: 100);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000001"));
-				DbUtil.CreateSingleChunk(config, 2, GetFilePathFor("chunk-000002.000000"));
-				DbUtil.CreateOngoingChunk(config, 2, GetFilePathFor("chunk-000002.000001"));
-
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000002.000001")));
-				Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
-			}
-		}
-
-		[Test]
-		public void
-			when_checkpoint_is_exactly_on_the_boundary_of_chunk_the_last_chunk_could_be_not_present_but_should_be_created() {
-			var config = TFChunkHelper.CreateSizedDbConfig(PathName, 200, chunkSize: 100);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000001"));
-
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-				Assert.IsNotNull(db.Manager.GetChunk(2));
-
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000002.000000")));
-				Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
-			}
-		}
-
-		[Test]
-		public void when_checkpoint_is_exactly_on_the_boundary_of_chunk_the_last_chunk_could_be_present() {
-			var config = TFChunkHelper.CreateSizedDbConfig(PathName, 200, chunkSize: 100);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000001"));
-				DbUtil.CreateOngoingChunk(config, 2, GetFilePathFor("chunk-000002.000000"));
-
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-				Assert.IsNotNull(db.Manager.GetChunk(2));
-
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000002.000000")));
-				Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
-			}
-		}
-
-		[Test]
-		public void when_checkpoint_is_on_boundary_of_new_chunk_and_last_chunk_is_truncated_no_exception_is_thrown() {
-			var config = TFChunkHelper.CreateSizedDbConfig(PathName, 200, chunkSize: 100);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000001"),
-					actualDataSize: config.ChunkSize - 10);
-
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-				Assert.IsNotNull(db.Manager.GetChunk(2));
-
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000002.000000")));
-				Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
-			}
-		}
-
-		[Test, Ignore("Not valid test now after disabling size validation on ongoing TFChunk ")]
-		public void
-			when_checkpoint_is_on_boundary_of_new_chunk_and_last_chunk_is_truncated_but_not_completed_exception_is_thrown() {
-			var config = TFChunkHelper.CreateSizedDbConfig(PathName, 200, chunkSize: 100);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateOngoingChunk(config, 1, GetFilePathFor("chunk-000001.000001"),
-					actualSize: config.ChunkSize - 10);
-
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<BadChunkInDatabaseException>());
-			}
-		}
-
-		[Test]
-		public void when_last_chunk_is_scavenged_and_checkpoint_is_on_boundary_of_new_chunk() {
-			var config = TFChunkHelper.CreateSizedDbConfig(PathName, 300, chunkSize: 100);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateMultiChunk(config, 0, 2, GetFilePathFor("chunk-000000.000001"));
-
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-
-				Assert.IsNotNull(db.Manager.GetChunk(3));
-				Assert.AreEqual(300, db.Config.WriterCheckpoint.Read());
-
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000001")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000003.000000")));
-				Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
-			}
-		}
-
-		[Test]
-		public void when_last_chunk_is_scavenged_and_checkpoint_is_at_the_start_of_the_scavenged_chunk() {
-			var config = TFChunkHelper.CreateSizedDbConfig(PathName, 100, chunkSize: 100);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateMultiChunk(config, 1, 3, GetFilePathFor("chunk-000001.000001"));
-
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-
-				Assert.IsNotNull(db.Manager.GetChunk(4));
-				Assert.AreEqual(400, db.Config.WriterCheckpoint.Read());
-
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000004.000000")));
-				Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
-			}
-		}
-
-		[Test]
-		public void when_last_chunk_is_scavenged_and_checkpoint_is_at_the_start_of_the_scavenged_chunk_and_new_chunk_already_exists() {
-			var config = TFChunkHelper.CreateSizedDbConfig(PathName, 100, chunkSize: 100);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateMultiChunk(config, 1, 3, GetFilePathFor("chunk-000001.000001"));
-				DbUtil.CreateSingleChunk(config, 4, GetFilePathFor("chunk-000004.000000"));
-
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-
-				Assert.IsNotNull(db.Manager.GetChunk(4));
-				Assert.AreEqual(400, db.Config.WriterCheckpoint.Read());
-
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000004.000000")));
-				Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
-			}
-		}
-
-		[Test]
-		public void when_last_chunk_is_scavenged_and_checkpoint_is_in_the_middle_of_the_scavenged_chunk() {
-			var config = TFChunkHelper.CreateSizedDbConfig(PathName, 150, chunkSize: 100);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateMultiChunk(config, 1, 3, GetFilePathFor("chunk-000001.000001"));
-
-				Assert.Throws<CorruptDatabaseException>(() => db.Open(verifyHash: false));
-
-				Assert.Throws<ArgumentOutOfRangeException>(() => db.Manager.GetChunk(4));
-				Assert.AreEqual(150, db.Config.WriterCheckpoint.Read());
-
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
-				Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
-			}
-		}
-
-		[Test]
-		public void temporary_files_are_removed() {
-			var config = TFChunkHelper.CreateSizedDbConfig(PathName, 150, chunkSize: 100);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateOngoingChunk(config, 1, GetFilePathFor("chunk-000001.000001"));
-
-				File.Create(GetFilePathFor("bla")).Close();
-				File.Create(GetFilePathFor("bla.scavenge.tmp")).Close();
-				File.Create(GetFilePathFor("bla.tmp")).Close();
-
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("bla")));
-				Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
-			}
-		}
-
-		[Test]
-		public void when_prelast_chunk_corrupted_throw_hash_validation_exception() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 15000);
-			var sink = new TestLogEventSink();
-			using (var log = new LoggerConfiguration()
-				.WriteTo.Sink(sink)
-				.MinimumLevel.Verbose()
-				.CreateLogger())
-			using (var db = new TFChunkDb(config, new TFChunkTracker.NoOp(), log)) {
-				byte[] contents = new byte[config.ChunkSize];
-				for (var i = 0; i < config.ChunkSize; i++) {
-					contents[i] = 0;
-				}
-
-				/*
-				Create a completed chunk and an ongoing chunk
-				 */
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"),
-					actualDataSize: config.ChunkSize,
-					contents: contents);
-				DbUtil.CreateOngoingChunk(config, 1, GetFilePathFor("chunk-000001.000000"));
-				/**
-				Corrupt the prelast completed chunk by modifying bytes of its content
-				 */
-				using (Stream stream = File.Open(GetFilePathFor("chunk-000000.000000"), FileMode.Open)) {
-					var data = new byte[3];
-					data[0] = 1;
-					data[1] = 2;
-					data[2] = 3;
-					stream.Position = ChunkHeader.Size + 15; //arbitrary choice of position to modify
-					stream.Write(data, 0, data.Length);
-				}
-
-				/**
-				Exception being thrown in another thread, using the output to check for the exception
-				 */
-				db.Open(verifyHash: true);
-				//arbitrary wait
-				Thread.Sleep(2000);
-			}
-
-			var thrownException = sink.LogEventReceived.WithTimeout().Result;
-
-			Assert.IsInstanceOf<HashValidationException>(thrownException);
-
-			var output = sink.Output;
-
-			Assert.AreEqual(@"Verification of chunk ""#0-0 (chunk-000000.000000)"" failed, terminating server...",
-				output);
-		}
-
-		private class TestLogEventSink : ILogEventSink {
-			private readonly StringBuilder _output;
-
-			private readonly TaskCompletionSource<Exception> _logEventReceived;
-			public Task<Exception> LogEventReceived => _logEventReceived.Task;
-
-			public string Output => _output.ToString();
-
-			public TestLogEventSink() {
-				_output = new StringBuilder();
-				_logEventReceived = new TaskCompletionSource<Exception>();
-			}
-
-			public void Emit(LogEvent logEvent) {
-				if (logEvent.Exception is null)
-					return;
-				_output.Append(logEvent.RenderMessage());
-				_logEventReceived.TrySetResult(logEvent.Exception);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Validation/when_validating_tfchunk_db_with_multi_chunks.cs b/src/EventStore.Core.Tests/TransactionLog/Validation/when_validating_tfchunk_db_with_multi_chunks.cs
deleted file mode 100644
index a7082a0d975..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Validation/when_validating_tfchunk_db_with_multi_chunks.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-using System.IO;
-using EventStore.Core.Exceptions;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Validation {
-	[TestFixture]
-	public class when_validating_tfchunk_db_with_multi_chunks : SpecificationWithDirectory {
-		[Test]
-		public void with_not_enough_files_to_reach_checksum_throws() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 25000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateMultiChunk(config, 0, 1, GetFilePathFor("chunk-000000.000000"));
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<ChunkNotFoundException>());
-			}
-		}
-
-		[Test]
-		public void with_checksum_inside_multi_chunk_throws() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 25000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateMultiChunk(config, 0, 2, GetFilePathFor("chunk-000000.000000"));
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<ChunkNotFoundException>());
-			}
-		}
-
-		[Test]
-		public void allows_with_exactly_enough_file_to_reach_checksum_while_last_is_multi_chunk() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 30000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateMultiChunk(config, 1, 2, GetFilePathFor("chunk-000001.000001"));
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000003.000000")));
-				Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
-			}
-		}
-
-		[Test]
-		public void allows_next_new_chunk_when_checksum_is_exactly_in_between_two_chunks_if_last_is_ongoing_chunk() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 20000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateMultiChunk(config, 0, 1, GetFilePathFor("chunk-000000.000001"));
-				DbUtil.CreateOngoingChunk(config, 2, GetFilePathFor("chunk-000002.000000"));
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000001")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000002.000000")));
-				Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
-			}
-		}
-
-		[Test, Ignore("Due to truncation such situation can happen, so must be considered valid.")]
-		public void
-			does_not_allow_next_new_chunk_when_checksum_is_exactly_in_between_two_chunks_and_last_is_multi_chunk() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 10000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateMultiChunk(config, 1, 2, GetFilePathFor("chunk-000001.000000"));
-
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<BadChunkInDatabaseException>());
-			}
-		}
-
-		[Test]
-		public void old_version_of_chunks_are_removed() {
-			File.Create(GetFilePathFor("foo")).Close();
-			File.Create(GetFilePathFor("bla")).Close();
-
-			var config = TFChunkHelper.CreateSizedDbConfig(PathName, 450, chunkSize: 100);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000002"));
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000005"));
-				DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000000"));
-				DbUtil.CreateMultiChunk(config, 1, 3, GetFilePathFor("chunk-000001.000001"));
-				DbUtil.CreateSingleChunk(config, 2, GetFilePathFor("chunk-000002.000000"));
-				DbUtil.CreateSingleChunk(config, 3, GetFilePathFor("chunk-000003.000000"));
-				DbUtil.CreateSingleChunk(config, 3, GetFilePathFor("chunk-000003.000001"));
-				DbUtil.CreateSingleChunk(config, 4, GetFilePathFor("chunk-000004.000007"));
-				DbUtil.CreateOngoingChunk(config, 4, GetFilePathFor("chunk-000004.000008"));
-
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-
-				Assert.IsTrue(File.Exists(GetFilePathFor("foo")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("bla")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000005")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000004.000008")));
-				Assert.AreEqual(5, Directory.GetFiles(PathName, "*").Length);
-			}
-		}
-
-		[Test]
-		public void
-			when_checkpoint_is_exactly_on_the_boundary_of_chunk_the_last_chunk_could_be_not_present_but_should_be_created() {
-			var config = TFChunkHelper.CreateSizedDbConfig(PathName, 200, chunkSize: 100);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateMultiChunk(config, 0, 1, GetFilePathFor("chunk-000000.000001"));
-
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-				Assert.IsNotNull(db.Manager.GetChunk(2));
-
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000001")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000002.000000")));
-				Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
-			}
-		}
-
-		[Test]
-		public void when_checkpoint_is_exactly_on_the_boundary_of_chunk_the_last_chunk_could_be_present() {
-			var config = TFChunkHelper.CreateSizedDbConfig(PathName, 200, chunkSize: 100);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateMultiChunk(config, 0, 1, GetFilePathFor("chunk-000000.000002"));
-				DbUtil.CreateOngoingChunk(config, 2, GetFilePathFor("chunk-000002.000001"));
-
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-				Assert.IsNotNull(db.Manager.GetChunk(2));
-
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000002")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000002.000001")));
-				Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
-			}
-		}
-
-		[Test]
-		public void when_checkpoint_is_on_boundary_of_new_chunk_and_last_chunk_is_truncated_no_exception_is_thrown() {
-			var config = TFChunkHelper.CreateSizedDbConfig(PathName, 300, chunkSize: 100);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateMultiChunk(config, 1, 2, GetFilePathFor("chunk-000001.000001"), physicalSize: 50,
-					logicalSize: 150);
-
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-				Assert.IsNotNull(db.Manager.GetChunk(2));
-
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000003.000000")));
-				Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
-			}
-		}
-
-		[Test]
-		public void does_not_allow_checkpoint_to_point_into_the_middle_of_multichunk_chunk() {
-			var config = TFChunkHelper.CreateSizedDbConfig(PathName, 1500, chunkSize: 1000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateMultiChunk(config, 1, 10, GetFilePathFor("chunk-000001.000001"));
-
-				Assert.That(() => db.Open(verifyHash: false),
-					Throws.Exception.InstanceOf<CorruptDatabaseException>()
-						.With.InnerException.InstanceOf<BadChunkInDatabaseException>());
-			}
-		}
-
-		[Test]
-		public void allows_last_chunk_to_be_multichunk_when_checkpoint_point_at_the_start_of_next_chunk() {
-			var config = TFChunkHelper.CreateSizedDbConfig(PathName, 4000, chunkSize: 1000);
-			using (var db = new TFChunkDb(config)) {
-				DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
-				DbUtil.CreateMultiChunk(config, 1, 3, GetFilePathFor("chunk-000001.000001"));
-
-				Assert.DoesNotThrow(() => db.Open(verifyHash: false));
-
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
-				Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000004.000000")));
-				Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/Validation/when_validating_tfchunkdb_without_previous_files.cs b/src/EventStore.Core.Tests/TransactionLog/Validation/when_validating_tfchunkdb_without_previous_files.cs
deleted file mode 100644
index bf0304aa396..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/Validation/when_validating_tfchunkdb_without_previous_files.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using EventStore.Core.Exceptions;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog.Validation {
-	[TestFixture]
-	public class when_validating_tfchunkdb_without_previous_files : SpecificationWithDirectory {
-		[Test]
-		public void with_a_writer_checksum_of_nonzero_and_no_files_a_corrupted_database_exception_is_thrown() {
-			var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, 500));
-			var exc = Assert.Throws<CorruptDatabaseException>(() => db.Open());
-			Assert.IsInstanceOf<ChunkNotFoundException>(exc.InnerException);
-			db.Dispose();
-		}
-
-		[Test]
-		public void with_a_writer_checksum_of_zero_and_no_files_is_valid() {
-			var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, 0));
-			Assert.DoesNotThrow(() => db.Open());
-			db.Dispose();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/commit_log_record_should.cs b/src/EventStore.Core.Tests/TransactionLog/commit_log_record_should.cs
deleted file mode 100644
index a822b062988..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/commit_log_record_should.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class commit_log_record_should {
-		[Test]
-		public void throw_argumentoutofrangeexception_when_given_negative_logposition() {
-			Assert.Throws<ArgumentOutOfRangeException>(() => {
-				new CommitLogRecord(-1, Guid.Empty, 0, DateTime.UtcNow, 0);
-			});
-		}
-
-		[Test]
-		public void throw_argumentexception_when_given_empty_correlationid() {
-			Assert.Throws<ArgumentException>(() => { new CommitLogRecord(0, Guid.Empty, 0, DateTime.UtcNow, 0); });
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_when_given_negative_preparestartposition() {
-			Assert.Throws<ArgumentOutOfRangeException>(() => {
-				new CommitLogRecord(0, Guid.NewGuid(), -1, DateTime.UtcNow, 0);
-			});
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_when_given_negative_eventversion() {
-			Assert.Throws<ArgumentOutOfRangeException>(() => {
-				new CommitLogRecord(0, Guid.NewGuid(), 0, DateTime.UtcNow, -1);
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/prepare_log_record_should.cs b/src/EventStore.Core.Tests/TransactionLog/prepare_log_record_should.cs
deleted file mode 100644
index 1cff2da25e6..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/prepare_log_record_should.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class prepare_log_record_should<TLogFormat, TStreamId> {
-		private readonly IRecordFactory<TStreamId> _recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-		private readonly TStreamId _streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-
-		public prepare_log_record_should() {
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_when_given_negative_logposition() {
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			Assert.Throws<ArgumentOutOfRangeException>(() => {
-				LogRecord.Prepare(_recordFactory, -1, Guid.NewGuid(), Guid.NewGuid(), 0, 0, _streamId, 0,
-					PrepareFlags.None, eventTypeId, new byte[0], null, DateTime.UtcNow);
-			});
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_when_given_negative_transactionposition() {
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			Assert.Throws<ArgumentOutOfRangeException>(() => {
-				LogRecord.Prepare(_recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), -1, 0, _streamId, 0,
-					PrepareFlags.None, eventTypeId, new byte[0], null, DateTime.UtcNow);
-			});
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_when_given_transaction_offset_less_than_minus_one() {
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			Assert.Throws<ArgumentOutOfRangeException>(() => {
-				LogRecord.Prepare(_recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), 0, -2, _streamId, 0,
-					PrepareFlags.None, eventTypeId, new byte[0], null, DateTime.UtcNow);
-			});
-		}
-
-		[Test]
-		public void throw_argumentexception_when_given_empty_correlationid() {
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			Assert.Throws<ArgumentException>(() => {
-				LogRecord.Prepare(_recordFactory, 0, Guid.Empty, Guid.NewGuid(), 0, 0, _streamId, 0,
-					PrepareFlags.None, eventTypeId, new byte[0], null, DateTime.UtcNow);
-			});
-		}
-
-		[Test]
-		public void throw_argumentexception_when_given_empty_eventid() {
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			Assert.Throws<ArgumentException>(() => {
-				LogRecord.Prepare(_recordFactory, 0, Guid.NewGuid(), Guid.Empty, 0, 0, _streamId, 0,
-					PrepareFlags.None, eventTypeId, new byte[0], null, DateTime.UtcNow);
-			});
-		}
-
-		[Test]
-		public void throw_argumentnullexception_when_given_null_eventstreamid() {
-			TStreamId nullStreamId = default;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			var expectedExceptionType = LogFormatHelper<TLogFormat, TStreamId>.Choose<Type>(
-				typeof(ArgumentNullException),
-				typeof(ArgumentOutOfRangeException));
-
-			Assert.Throws(expectedExceptionType, () => {
-				LogRecord.Prepare(_recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, nullStreamId, 0,
-					PrepareFlags.None, eventTypeId, new byte[0], null, DateTime.UtcNow);
-			});
-		}
-
-		[Test]
-		public void throw_argumentexception_when_given_empty_eventstreamid() {
-			var emptyStreamId = LogFormatHelper<TLogFormat, TStreamId>.EmptyStreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			var expectedExceptionType = LogFormatHelper<TLogFormat, TStreamId>.Choose<Type>(
-				typeof(ArgumentNullException),
-				typeof(ArgumentOutOfRangeException));
-
-			Assert.Throws(expectedExceptionType, () => {
-				LogRecord.Prepare(_recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, emptyStreamId, 0,
-					PrepareFlags.None, eventTypeId, new byte[0], null, DateTime.UtcNow);
-			});
-		}
-
-		[Test]
-		public void throw_argumentoutofrangeexception_when_given_incorrect_expectedversion() {
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			Assert.Throws<ArgumentOutOfRangeException>(() => {
-				LogRecord.Prepare(_recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, _streamId, -3,
-					PrepareFlags.None, eventTypeId, new byte[0], null, DateTime.UtcNow);
-			});
-		}
-
-		[Test, Ignore("ReadOnlyMemory will always convert back to empty array if initialized with null array.")]
-		public void throw_argumentnullexception_when_given_null_data() {
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			Assert.Throws<ArgumentNullException>(() => {
-				LogRecord.Prepare(_recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, _streamId, 0,
-					PrepareFlags.None, eventTypeId, null, null, DateTime.UtcNow);
-			});
-		}
-
-		[Test]
-		public void throw_argumentnullexception_when_given_null_eventtype() {
-			Assert.DoesNotThrow(() =>
-				LogRecord.Prepare(_recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, _streamId, 0,
-					PrepareFlags.None, default, new byte[0], null, DateTime.UtcNow));
-		}
-
-		[Test]
-		public void throw_argumentexception_when_given_empty_eventtype() {
-			var emptyEventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			Assert.DoesNotThrow(() =>
-				LogRecord.Prepare(_recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, _streamId, 0,
-					PrepareFlags.None, emptyEventTypeId, new byte[0], null,  DateTime.UtcNow));
-		}
-
-		[Test]
-		public void return_empty_data_when_event_is_redacted() {
-			if (typeof(TLogFormat) == typeof(LogFormat.V3)) {
-				Assert.Ignore("Log V3 does not handle redacted events yet");
-				return;
-			}
-
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			var prepare = LogRecord.Prepare(_recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, _streamId, 0,
-				PrepareFlags.IsRedacted, eventTypeId, new byte[100], null,  DateTime.UtcNow);
-			Assert.AreEqual(0, prepare.Data.Length);
-		}
-
-		[Test]
-		public void write_redacted_data_when_event_is_redacted() {
-			if (typeof(TLogFormat) == typeof(LogFormat.V3)) {
-				Assert.Ignore("Log V3 does not handle redacted events yet");
-				return;
-			}
-
-			var memStream = new MemoryStream();
-			var binaryWriter = new BinaryWriter(memStream);
-
-			const int dataSize = 10000;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			var prepare = LogRecord.Prepare(_recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, _streamId, 0,
-				PrepareFlags.IsRedacted, eventTypeId, new byte[dataSize], null,  DateTime.UtcNow);
-
-			prepare.WriteTo(binaryWriter);
-			Assert.True(memStream.Length >= dataSize);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/tfchunk_get_actual_raw_position_should.cs b/src/EventStore.Core.Tests/TransactionLog/tfchunk_get_actual_raw_position_should.cs
deleted file mode 100644
index 349cdf98f68..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/tfchunk_get_actual_raw_position_should.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class tfchunk_get_actual_raw_position_should<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private readonly TStreamId _streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-		private readonly TStreamId _eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-		private readonly IRecordFactory<TStreamId> _recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-		private readonly Random _random = new();
-
-		private IPrepareLogRecord<TStreamId> CreateRecord(long logPosition, int dataSize) {
-			return LogRecord.Prepare(_recordFactory, logPosition, Guid.NewGuid(), Guid.NewGuid(), 0, 0, _streamId, 1,
-				PrepareFlags.None, _eventTypeId, new byte[dataSize], Array.Empty<byte>(), new DateTime(2000, 1, 1, 12, 0, 0));
-		}
-
-		private async ValueTask<TFChunk> CreateChunk(int numEvents, bool completed, bool scavenged,
-			List<long> logicalPositions, List<PosMap> posMap) {
-			if (scavenged && !completed)
-				throw new ArgumentException("scavenged chunk must be completed");
-
-			var chunk = TFChunkHelper.CreateNewChunk(Path.Combine(PathName, $"{Guid.NewGuid()}.chunk"), 4096, scavenged);
-
-			var actualPos = 0;
-			for (int i = 0; i < numEvents; i++) {
-				long logicalPos;
-				if (!scavenged) {
-					logicalPos = actualPos;
-				} else {
-					logicalPos = actualPos + _random.Next(0, 100);
-					posMap.Add(new PosMap(logicalPos, actualPos));
-				}
-				logicalPositions.Add(logicalPos);
-
-				var result = chunk.TryAppend(CreateRecord(chunk.ChunkHeader.GetGlobalLogPosition(logicalPos), _random.Next(10, 100)));
-				Assert.True(result.Success);
-				actualPos = (int) result.NewPosition;
-			}
-
-			chunk.Flush();
-
-			if (scavenged)
-				await chunk.CompleteScavenge(posMap, CancellationToken.None);
-			else if (completed)
-				chunk.Complete();
-
-			return chunk;
-		}
-
-		[Test]
-		[Repeat(10)]
-		public async Task return_correct_positions_for_an_incomplete_unscavenged_chunk() {
-			var numEvents = _random.Next(10, 20);
-			var logPositions = new List<long>();
-			var posMap = new List<PosMap>();
-
-			var chunk = await CreateChunk(
-				numEvents: numEvents,
-				completed: false,
-				scavenged: false,
-				logPositions,
-				posMap);
-
-			Assert.AreEqual(numEvents, logPositions.Count);
-			foreach(var logPos in logPositions)
-				Assert.AreEqual(ChunkHeader.Size + logPos, chunk.GetActualRawPosition(logPos));
-			Assert.IsEmpty(posMap);
-		}
-
-		[Test]
-		[Repeat(10)]
-		public async Task return_correct_positions_for_a_complete_unscavenged_chunk() {
-			var numEvents = _random.Next(10, 20);
-			var logPositions = new List<long>();
-			var posMap = new List<PosMap>();
-
-			var chunk = await CreateChunk(
-				numEvents: numEvents,
-				completed: true,
-				scavenged: false,
-				logPositions,
-				posMap);
-
-			Assert.AreEqual(numEvents, logPositions.Count);
-			foreach(var logPos in logPositions)
-				Assert.AreEqual(ChunkHeader.Size + logPos, chunk.GetActualRawPosition(logPos));
-			Assert.IsEmpty(posMap);
-		}
-
-		[Test]
-		[Repeat(10)]
-		public async Task return_correct_positions_for_a_scavenged_chunk() {
-			var numEvents = _random.Next(10, 20);
-			var logPositions = new List<long>();
-			var posMap = new List<PosMap>();
-
-			var chunk = await CreateChunk(
-				numEvents: numEvents,
-				completed: true,
-				scavenged: true,
-				logPositions,
-				posMap);
-
-			Assert.AreEqual(numEvents, logPositions.Count);
-			Assert.AreEqual(numEvents, posMap.Count);
-			for (int i = 0; i < numEvents; i++) {
-				Assert.AreEqual(posMap[i].LogPos, logPositions[i]);
-				Assert.AreEqual(ChunkHeader.Size + posMap[i].ActualPos, chunk.GetActualRawPosition(logPositions[i]));
-			}
-		}
-
-		[Test]
-		public async Task return_minus_one_for_positions_that_are_outside_the_range_of_an_unscavenged_chunk() {
-			var logPositions = new List<long>();
-			var posMap = new List<PosMap>();
-
-			var chunk = await CreateChunk(
-				numEvents: 1,
-				completed: true,
-				scavenged: false,
-				logPositions,
-				posMap);
-
-			Assert.AreEqual(1, logPositions.Count);
-			Assert.IsEmpty(posMap);
-
-			Assert.AreEqual(chunk.LogicalDataSize, chunk.PhysicalDataSize);
-			Assert.AreEqual(ChunkHeader.Size + chunk.LogicalDataSize - 1, chunk.GetActualRawPosition(chunk.LogicalDataSize - 1));
-			Assert.AreEqual(-1, chunk.GetActualRawPosition(chunk.LogicalDataSize));
-			Assert.AreEqual(-1, chunk.GetActualRawPosition(chunk.LogicalDataSize + 1));
-		}
-
-		[Test]
-		public async Task return_minus_one_for_positions_that_do_not_exist_in_a_scavenged_chunk() {
-			var logPositions = new List<long>();
-			var posMap = new List<PosMap>();
-
-			var chunk = await CreateChunk(
-				numEvents: 1,
-				completed: true,
-				scavenged: true,
-				logPositions,
-				posMap);
-
-			Assert.AreEqual(1, logPositions.Count);
-			Assert.AreEqual(1, posMap.Count);
-
-			Assert.AreEqual(ChunkHeader.Size + posMap[0].ActualPos, chunk.GetActualRawPosition(logPositions[0]));
-			Assert.AreEqual(-1, chunk.GetActualRawPosition(logPositions[0] + 1));
-		}
-
-		[Test]
-		public async Task throw_argument_out_of_range_exception_for_negative_positions() {
-			var logPositions = new List<long>();
-			var posMap = new List<PosMap>();
-
-			var chunk = await CreateChunk(
-				numEvents: 1,
-				completed: false,
-				scavenged: false,
-				logPositions,
-				posMap);
-
-			Assert.Throws<ArgumentOutOfRangeException>(() => chunk.GetActualRawPosition(-1));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/versioned_pattern_filenaming_strategy.cs b/src/EventStore.Core.Tests/TransactionLog/versioned_pattern_filenaming_strategy.cs
deleted file mode 100644
index 3f3b4aeea6f..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/versioned_pattern_filenaming_strategy.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class versioned_pattern_filenaming_strategy : SpecificationWithDirectory {
-		[Test]
-		public void when_constructed_with_null_path_should_throws_argumentnullexception() {
-			Assert.Throws<ArgumentNullException>(() => new VersionedPatternFileNamingStrategy(null, "prefix"));
-		}
-
-		[Test]
-		public void when_constructed_with_null_prefix_should_throws_argumentnullexception() {
-			Assert.Throws<ArgumentNullException>(() => new VersionedPatternFileNamingStrategy("path", null));
-		}
-
-		[Test]
-		public void when_getting_file_for_positive_index_and_no_version_appends_index_to_name_with_zero_version() {
-			var strategy = new VersionedPatternFileNamingStrategy("path", "prefix-");
-			Assert.AreEqual("path" + Path.DirectorySeparatorChar + "prefix-000001.000000",
-				strategy.GetFilenameFor(1, 0));
-		}
-
-		[Test]
-		public void when_getting_file_for_nonnegative_index_and_version_appends_value_and_provided_version() {
-			var strategy = new VersionedPatternFileNamingStrategy("path", "prefix-");
-			Assert.AreEqual("path" + Path.DirectorySeparatorChar + "prefix-000001.000007",
-				strategy.GetFilenameFor(1, 7));
-		}
-
-		[Test]
-		public void when_getting_file_for_negative_index_throws_argumentoutofrangeexception() {
-			var strategy = new VersionedPatternFileNamingStrategy("Path", "prefix");
-			Assert.Throws<ArgumentOutOfRangeException>(() => strategy.GetFilenameFor(-1, 0));
-		}
-
-		[Test]
-		public void when_getting_file_for_negative_version_throws_argumentoutofrangeexception() {
-			var strategy = new VersionedPatternFileNamingStrategy("Path", "prefix");
-			Assert.Throws<ArgumentOutOfRangeException>(() => strategy.GetFilenameFor(0, -1));
-		}
-
-		[Test]
-		public void returns_all_existing_versions_of_the_same_chunk_in_descending_order_of_versions() {
-			File.Create(GetFilePathFor("foo")).Close();
-			File.Create(GetFilePathFor("bla")).Close();
-
-			File.Create(GetFilePathFor("chunk-000001.000000")).Close();
-			File.Create(GetFilePathFor("chunk-000002.000000")).Close();
-			File.Create(GetFilePathFor("chunk-000003.000000")).Close();
-
-			File.Create(GetFilePathFor("chunk-000005.000000")).Close();
-			File.Create(GetFilePathFor("chunk-000005.000007")).Close();
-			File.Create(GetFilePathFor("chunk-000005.000002")).Close();
-			File.Create(GetFilePathFor("chunk-000005.000005")).Close();
-
-			var strategy = new VersionedPatternFileNamingStrategy(PathName, "chunk-");
-			var versions = strategy.GetAllVersionsFor(5);
-			Assert.AreEqual(4, versions.Length);
-			Assert.AreEqual(GetFilePathFor("chunk-000005.000007"), versions[0]);
-			Assert.AreEqual(GetFilePathFor("chunk-000005.000005"), versions[1]);
-			Assert.AreEqual(GetFilePathFor("chunk-000005.000002"), versions[2]);
-			Assert.AreEqual(GetFilePathFor("chunk-000005.000000"), versions[3]);
-		}
-
-		[Test]
-		public void returns_all_existing_not_temporary_files_with_correct_pattern() {
-			File.Create(GetFilePathFor("foo")).Close();
-			File.Create(GetFilePathFor("bla")).Close();
-			File.Create(GetFilePathFor("chunk-000001.000000.tmp")).Close();
-			File.Create(GetFilePathFor("chunk-001.000")).Close();
-
-			File.Create(GetFilePathFor("chunk-000001.000000")).Close();
-			File.Create(GetFilePathFor("chunk-000002.000000")).Close();
-			File.Create(GetFilePathFor("chunk-000003.000000")).Close();
-
-			File.Create(GetFilePathFor("chunk-000005.000000")).Close();
-			File.Create(GetFilePathFor("chunk-000005.000007")).Close();
-			File.Create(GetFilePathFor("chunk-000005.000002")).Close();
-			File.Create(GetFilePathFor("chunk-000005.000005")).Close();
-
-			var strategy = new VersionedPatternFileNamingStrategy(PathName, "chunk-");
-			var versions = strategy.GetAllPresentFiles();
-			Array.Sort(versions, StringComparer.CurrentCultureIgnoreCase);
-			Assert.AreEqual(7, versions.Length);
-			Assert.AreEqual(GetFilePathFor("chunk-000001.000000"), versions[0]);
-			Assert.AreEqual(GetFilePathFor("chunk-000002.000000"), versions[1]);
-			Assert.AreEqual(GetFilePathFor("chunk-000003.000000"), versions[2]);
-			Assert.AreEqual(GetFilePathFor("chunk-000005.000000"), versions[3]);
-			Assert.AreEqual(GetFilePathFor("chunk-000005.000002"), versions[4]);
-			Assert.AreEqual(GetFilePathFor("chunk-000005.000005"), versions[5]);
-			Assert.AreEqual(GetFilePathFor("chunk-000005.000007"), versions[6]);
-		}
-
-		[Test]
-		public void returns_all_temp_files_in_directory() {
-			File.Create(GetFilePathFor("bla")).Close();
-			File.Create(GetFilePathFor("bla.tmp")).Close();
-			File.Create(GetFilePathFor("bla.temp")).Close();
-
-			File.Create(GetFilePathFor("chunk-000005.000007.tmp")).Close();
-
-			File.Create(GetFilePathFor("foo.tmp")).Close();
-
-			var strategy = new VersionedPatternFileNamingStrategy(PathName, "chunk-");
-			var tempFiles = strategy.GetAllTempFiles();
-
-			Assert.AreEqual(3, tempFiles.Length);
-			Assert.Contains(GetFilePathFor("bla.tmp"), tempFiles);
-			Assert.Contains(GetFilePathFor("chunk-000005.000007.tmp"), tempFiles);
-			Assert.Contains(GetFilePathFor("foo.tmp"), tempFiles);
-		}
-
-		[Test]
-		public void does_not_return_temp_file_that_is_named_as_chunk() {
-			File.Create(GetFilePathFor("chunk-000000.000000.tmp")).Close();
-
-			var strategy = new VersionedPatternFileNamingStrategy(PathName, "chunk-");
-			var tempFiles = strategy.GetAllVersionsFor(0);
-
-			Assert.AreEqual(0, tempFiles.Length);
-		}
-
-		[Test]
-		public void returns_temp_filenames_detectable_by_getalltempfiles_method() {
-			var strategy = new VersionedPatternFileNamingStrategy(PathName, "chunk-");
-			Assert.AreEqual(0, strategy.GetAllTempFiles().Length);
-
-			var tmp1 = strategy.GetTempFilename();
-			var tmp2 = strategy.GetTempFilename();
-			File.Create(tmp1).Close();
-			File.Create(tmp2).Close();
-			var tmp = new[] { tmp1, tmp2 };
-			Array.Sort(tmp);
-
-			var tempFiles = strategy.GetAllTempFiles();
-			Array.Sort(tempFiles);
-			Assert.AreEqual(2, tempFiles.Length);
-			Assert.AreEqual(tmp[0], tempFiles[0]);
-			Assert.AreEqual(tmp[1], tempFiles[1]);
-		}
-
-		[Test]
-		public void returns_file_index_for_correctly_formatted_filename() {
-			var strategy = new VersionedPatternFileNamingStrategy(PathName, "chunk-");
-			Assert.AreEqual(0, strategy.GetIndexFor("chunk-000000.000000"));
-			Assert.AreEqual(1, strategy.GetIndexFor("chunk-000001.000000"));
-			Assert.AreEqual(999999, strategy.GetIndexFor("chunk-999999.000000"));
-		}
-
-		[Test]
-		public void returns_file_version_for_correctly_formatted_filename() {
-			var strategy = new VersionedPatternFileNamingStrategy(PathName, "chunk-");
-			Assert.AreEqual(0, strategy.GetVersionFor("chunk-000002.000000"));
-			Assert.AreEqual(1, strategy.GetVersionFor("chunk-000002.000001"));
-			Assert.AreEqual(999999, strategy.GetVersionFor("chunk-000002.999999"));
-		}
-
-		[Test]
-		public void throws_for_incorrectly_formatted_filename() {
-			var strategy = new VersionedPatternFileNamingStrategy(PathName, "chunk-");
-			Assert.Throws<ArgumentException>(() => strategy.GetIndexFor("chunk-000000.a"));
-			Assert.Throws<ArgumentException>(() => strategy.GetIndexFor("chunk-00000a.000000"));
-			Assert.Throws<ArgumentException>(() => strategy.GetIndexFor("chunk-a.000000"));
-			Assert.Throws<ArgumentException>(() => strategy.GetIndexFor("chunk-000000.00000a"));
-			Assert.Throws<ArgumentException>(() => strategy.GetIndexFor("chunks-000000.00000a"));
-			Assert.Throws<ArgumentException>(() => strategy.GetVersionFor("chunk-000000.a"));
-			Assert.Throws<ArgumentException>(() => strategy.GetVersionFor("chunk-00000a.000000"));
-			Assert.Throws<ArgumentException>(() => strategy.GetVersionFor("chunk-a.000000"));
-			Assert.Throws<ArgumentException>(() => strategy.GetVersionFor("chunk-000000.00000a"));
-			Assert.Throws<ArgumentException>(() => strategy.GetVersionFor("chunks-000000.00000a"));
-			Assert.Throws<ArgumentException>(() => strategy.GetVersionFor("chunks-000000.000000"));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_appending_past_end_of_a_tfchunk.cs b/src/EventStore.Core.Tests/TransactionLog/when_appending_past_end_of_a_tfchunk.cs
deleted file mode 100644
index 0dbbc386c44..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_appending_past_end_of_a_tfchunk.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_appending_past_end_of_a_tfchunk<TLogFormat, TStreamId> : SpecificationWithFile {
-		private TFChunk _chunk;
-		private readonly Guid _corrId = Guid.NewGuid();
-		private readonly Guid _eventId = Guid.NewGuid();
-		private bool _written;
-
-		[SetUp]
-		public override void SetUp() {
-			base.SetUp();
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			var record = LogRecord.Prepare(recordFactory, 15556, _corrId, _eventId, 15556, 0, streamId, 1,
-				PrepareFlags.None, eventTypeId, new byte[12], new byte[15], new DateTime(2000, 1, 1, 12, 0, 0));
-			_chunk = TFChunkHelper.CreateNewChunk(Filename, 20);
-			_written = _chunk.TryAppend(record).Success;
-		}
-
-		[TearDown]
-		public override void TearDown() {
-			_chunk.Dispose();
-			base.TearDown();
-		}
-
-		[Test]
-		public void the_record_is_not_appended() {
-			Assert.IsFalse(_written);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_appending_to_a_tfchunk_and_flushing.cs b/src/EventStore.Core.Tests/TransactionLog/when_appending_to_a_tfchunk_and_flushing.cs
deleted file mode 100644
index eea0e3f3bfe..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_appending_to_a_tfchunk_and_flushing.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_appending_to_a_tfchunk_and_flushing<TLogFormat, TStreamId> : SpecificationWithFilePerTestFixture {
-		private TFChunk _chunk;
-		private readonly Guid _corrId = Guid.NewGuid();
-		private readonly Guid _eventId = Guid.NewGuid();
-		private RecordWriteResult _result;
-		private IPrepareLogRecord<TStreamId> _record;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			_record = LogRecord.Prepare(recordFactory, 0, _corrId, _eventId, 0, 0, streamId, 1,
-				PrepareFlags.None, eventTypeId, new byte[12], new byte[15], new DateTime(2000, 1, 1, 12, 0, 0));
-			_chunk = TFChunkHelper.CreateNewChunk(Filename);
-			_result = _chunk.TryAppend(_record);
-			_chunk.Flush();
-		}
-
-		[OneTimeTearDown]
-		public override void TestFixtureTearDown() {
-			_chunk.Dispose();
-			base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void the_write_result_is_correct() {
-			Assert.IsTrue(_result.Success);
-			Assert.AreEqual(0, _result.OldPosition);
-			Assert.AreEqual(_record.GetSizeWithLengthPrefixAndSuffix(), _result.NewPosition);
-		}
-
-		[Test]
-		public void the_record_is_appended() {
-			Assert.IsTrue(_result.Success);
-		}
-
-		[Test]
-		public void correct_old_position_is_returned() {
-			//position without header (logical position).
-			Assert.AreEqual(0, _result.OldPosition);
-		}
-
-		[Test]
-		public void the_updated_position_is_returned() {
-			//position without header (logical position).
-			Assert.AreEqual(_record.GetSizeWithLengthPrefixAndSuffix(), _result.NewPosition);
-		}
-
-		[Test]
-		public void the_record_can_be_read_at_exact_position() {
-			var res = _chunk.TryReadAt(0, couldBeScavenged: false);
-			Assert.IsTrue(res.Success);
-			Assert.AreEqual(_record, res.LogRecord);
-			Assert.AreEqual(_result.OldPosition, res.LogRecord.LogPosition);
-		}
-
-		[Test]
-		public async Task the_record_can_be_read_as_first_one() {
-			var res = await _chunk.TryReadFirst(CancellationToken.None);
-			Assert.IsTrue(res.Success);
-			Assert.AreEqual(_record, res.LogRecord);
-			Assert.AreEqual(_record.GetSizeWithLengthPrefixAndSuffix(), res.NextPosition);
-		}
-
-		[Test]
-		public void the_record_can_be_read_as_closest_forward_to_pos_zero() {
-			var res = _chunk.TryReadClosestForward(0);
-			Assert.IsTrue(res.Success);
-			Assert.AreEqual(_record, res.LogRecord);
-			Assert.AreEqual(_record.GetSizeWithLengthPrefixAndSuffix(), res.NextPosition);
-		}
-
-		[Test]
-		public void the_record_can_be_read_as_closest_backward_from_end() {
-			var res = _chunk.TryReadClosestBackward(_record.GetSizeWithLengthPrefixAndSuffix());
-			Assert.IsTrue(res.Success);
-			Assert.AreEqual(_record, res.LogRecord);
-			Assert.AreEqual(0, res.NextPosition);
-		}
-
-		[Test]
-		public void the_record_can_be_read_as_last_one() {
-			var res = _chunk.TryReadLast();
-			Assert.IsTrue(res.Success);
-			Assert.AreEqual(_record, res.LogRecord);
-			Assert.AreEqual(0, res.NextPosition);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_appending_to_a_tfchunk_without_flush.cs b/src/EventStore.Core.Tests/TransactionLog/when_appending_to_a_tfchunk_without_flush.cs
deleted file mode 100644
index 537d2f6565f..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_appending_to_a_tfchunk_without_flush.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_appending_to_a_tfchunk_without_flush<TLogFormat, TStreamId> : SpecificationWithFilePerTestFixture {
-		private TFChunk _chunk;
-		private readonly Guid _corrId = Guid.NewGuid();
-		private readonly Guid _eventId = Guid.NewGuid();
-		private RecordWriteResult _result;
-		private IPrepareLogRecord<TStreamId> _record;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			_record = LogRecord.Prepare(recordFactory, 0, _corrId, _eventId, 0, 0, streamId, 1,
-				PrepareFlags.None, eventTypeId, new byte[12], new byte[15], new DateTime(2000, 1, 1, 12, 0, 0));
-			_chunk = TFChunkHelper.CreateNewChunk(Filename);
-			_result = _chunk.TryAppend(_record);
-		}
-
-		[OneTimeTearDown]
-		public override void TestFixtureTearDown() {
-			_chunk.Dispose();
-			base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void the_record_is_appended() {
-			Assert.IsTrue(_result.Success);
-		}
-
-		[Test]
-		public void the_old_position_is_returned() {
-			//position without header.
-			Assert.AreEqual(0, _result.OldPosition);
-		}
-
-		[Test]
-		public void the_updated_position_is_returned() {
-			//position without header.
-			Assert.AreEqual(_record.GetSizeWithLengthPrefixAndSuffix(), _result.NewPosition);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_chasing_a_chunked_transaction_log.cs b/src/EventStore.Core.Tests/TransactionLog/when_chasing_a_chunked_transaction_log.cs
deleted file mode 100644
index 1f85651d26d..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_chasing_a_chunked_transaction_log.cs
+++ /dev/null
@@ -1,352 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Plugins.Transforms;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	public static class LogRecordExtensions {
-		public static void WriteWithLengthPrefixAndSuffixTo(this ILogRecord record, BinaryWriter writer) {
-			using (var memoryStream = new MemoryStream()) {
-				record.WriteTo(new BinaryWriter(memoryStream));
-				var length = (int)memoryStream.Length;
-				writer.Write(length);
-				writer.Write(memoryStream.GetBuffer(), 0, (int)memoryStream.Length);
-				writer.Write(length);
-			}
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_chasing_a_chunked_transaction_log<TLogFormat, TStreamId> : SpecificationWithDirectory {
-		private readonly Guid _correlationId = Guid.NewGuid();
-		private readonly Guid _eventId = Guid.NewGuid();
-
-		[Test]
-		public void try_read_returns_false_when_writer_checkpoint_is_zero() {
-			var writerchk = new InMemoryCheckpoint(0);
-			var chaserchk = new InMemoryCheckpoint();
-			var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, writerchk, chaserchk));
-			db.Open();
-
-			var chaser = new TFChunkChaser(db, writerchk, new InMemoryCheckpoint(), false);
-			chaser.Open();
-
-			ILogRecord record;
-			Assert.IsFalse(chaser.TryReadNext(out record));
-
-			chaser.Close();
-			db.Dispose();
-		}
-
-		[Test]
-		public void try_read_returns_false_when_writer_checksum_is_equal_to_reader_checksum() {
-			var writerchk = new InMemoryCheckpoint();
-			var chaserchk = new InMemoryCheckpoint(Checkpoint.Chaser, 0);
-			var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, writerchk, chaserchk));
-			db.Open();
-			writerchk.Write(12);
-			writerchk.Flush();
-			chaserchk.Write(12);
-			chaserchk.Flush();
-
-			var chaser = new TFChunkChaser(db, writerchk, chaserchk, false);
-			chaser.Open();
-
-			ILogRecord record;
-			Assert.IsFalse(chaser.TryReadNext(out record));
-			Assert.AreEqual(12, chaserchk.Read());
-
-			chaser.Close();
-			db.Dispose();
-		}
-
-		[Test]
-		public void try_read_returns_record_when_writerchecksum_ahead() {
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			var recordToWrite = LogRecord.Prepare(
-				factory: recordFactory,
-				logPosition: 0,
-				correlationId: _correlationId,
-				eventId: _eventId,
-				transactionPos: 0,
-				transactionOffset: 0,
-				eventStreamId: streamId,
-				expectedVersion: 1234,
-				timeStamp: new DateTime(2012, 12, 21),
-				flags: PrepareFlags.None,
-				eventType: eventTypeId,
-				data: new byte[] {1, 2, 3, 4, 5},
-				metadata: new byte[] {7, 17});
-
-			using (var fs = new FileStream(GetFilePathFor("chunk-000000.000000"), FileMode.CreateNew,
-				FileAccess.Write)) {
-				fs.SetLength(ChunkHeader.Size + ChunkFooter.Size + 10000);
-				var chunkHeader = new ChunkHeader(TFChunk.CurrentChunkVersion, TFChunk.CurrentChunkVersion, 10000, 0, 0, false, Guid.NewGuid(), TransformType.Identity)
-					.AsByteArray();
-				var writer = new BinaryWriter(fs);
-				writer.Write(chunkHeader);
-				recordToWrite.WriteWithLengthPrefixAndSuffixTo(writer);
-				fs.Close();
-			}
-
-			var writerchk = new InMemoryCheckpoint(recordToWrite.GetSizeWithLengthPrefixAndSuffix() + 16);
-			var chaserchk = new InMemoryCheckpoint(Checkpoint.Chaser, 0);
-			var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, writerchk, chaserchk));
-			db.Open();
-
-			var chaser = new TFChunkChaser(db, writerchk, chaserchk, false);
-			chaser.Open();
-
-			ILogRecord record;
-			var recordRead = chaser.TryReadNext(out record);
-			chaser.Close();
-
-			Assert.AreEqual(record.GetSizeWithLengthPrefixAndSuffix(), chaserchk.Read());
-			Assert.IsTrue(recordRead);
-			Assert.AreEqual(recordToWrite, record);
-
-			db.Close();
-		}
-
-
-		[Test]
-		public void try_read_returns_record_when_record_bigger_than_internal_buffer() {
-			var writerchk = new InMemoryCheckpoint(0);
-			var chaserchk = new InMemoryCheckpoint(Checkpoint.Chaser, 0);
-
-			var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, writerchk, chaserchk));
-			db.Open();
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			var recordToWrite = LogRecord.Prepare(
-				factory: recordFactory,
-				logPosition: 0,
-				correlationId: _correlationId,
-				eventId: _eventId,
-				transactionPos: 0,
-				transactionOffset: 0,
-				eventStreamId: streamId,
-				expectedVersion: 1234,
-				timeStamp: new DateTime(2012, 12, 21),
-				flags: PrepareFlags.None,
-				eventType: eventTypeId,
-				data: new byte[9000],
-				metadata: new byte[] {7, 17});
-			var writer = new TFChunkWriter(db);
-			writer.Open();
-			long pos;
-			Assert.IsTrue(writer.Write(recordToWrite, out pos));
-			writer.Close();
-
-			writerchk.Write(recordToWrite.GetSizeWithLengthPrefixAndSuffix());
-
-			var reader = new TFChunkChaser(db, writerchk, chaserchk, false);
-			reader.Open();
-
-			ILogRecord record;
-			var readRecord = reader.TryReadNext(out record);
-			reader.Close();
-
-			Assert.IsTrue(readRecord);
-			Assert.AreEqual(record.GetSizeWithLengthPrefixAndSuffix(), chaserchk.Read());
-			Assert.AreEqual(recordToWrite, record);
-
-			db.Close();
-		}
-
-		[Test]
-		public void try_read_returns_record_when_writerchecksum_equal() {
-			var writerchk = new InMemoryCheckpoint(0);
-			var chaserchk = new InMemoryCheckpoint(Checkpoint.Chaser, 0);
-			var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, writerchk, chaserchk));
-			db.Open();
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			var recordToWrite = LogRecord.Prepare(
-				factory: recordFactory,
-				logPosition: 0,
-				correlationId: _correlationId,
-				eventId: _eventId,
-				transactionPos: 0,
-				transactionOffset: 0,
-				eventStreamId: streamId,
-				expectedVersion: 1234,
-				timeStamp: new DateTime(2012, 12, 21),
-				flags: PrepareFlags.None,
-				eventType: eventTypeId,
-				data: new byte[] {1, 2, 3, 4, 5},
-				metadata: new byte[] {7, 17});
-			var writer = new TFChunkWriter(db);
-			writer.Open();
-			long pos;
-			Assert.IsTrue(writer.Write(recordToWrite, out pos));
-			writer.Close();
-
-			writerchk.Write(recordToWrite.GetSizeWithLengthPrefixAndSuffix());
-
-			var chaser = new TFChunkChaser(db, writerchk, chaserchk, false);
-			chaser.Open();
-
-			ILogRecord record;
-			var readRecord = chaser.TryReadNext(out record);
-			chaser.Close();
-
-			Assert.IsTrue(readRecord);
-			Assert.AreEqual(record.GetSizeWithLengthPrefixAndSuffix(), chaserchk.Read());
-			Assert.AreEqual(recordToWrite, record);
-
-			db.Close();
-		}
-
-		/*   [Test]
-		   public void try_read_returns_false_when_writer_checksum_is_ahead_but_not_enough_to_read_record()
-		   {
-		       var writerchk = new InMemoryCheckpoint(50);
-		       var readerchk = new InMemoryCheckpoint("reader", 0);
-		       var config = new TransactionFileDatabaseConfig(PathName, "prefix.tf", 10000, writerchk, new[] { readerchk });
-		       var recordToWrite = LogRecord.Prepare(logPosition: 0,
-		                                                correlationId: _correlationId,
-		                                                eventId: _eventId,
-		                                                transactionPosition: 0,
-		                                                eventStreamId: "WorldEnding",
-		                                                expectedVersion: 1234,
-		                                                timeStamp: new DateTime(2012, 12, 21),
-		                                                flags: PrepareFlags.None,
-		                                                eventType: "type",
-		                                                data: new byte[] { 1, 2, 3, 4, 5 },
-		                                                metadata: new byte[] { 7, 17 });
-		       using (var fs = new FileStream(GetFilePathFor("prefix.tf0"), FileMode.CreateNew, FileAccess.Write))
-		       {
-		           var writer = new BinaryWriter(fs);
-		           recordToWrite.WriteWithLengthPrefixAndSuffixTo(writer);
-		           fs.Close();
-		       }
-
-		       var reader = new MultifileTransactionFileChaser(config, "reader");
-		       reader.Open();
-		       LogRecord record = null;
-		       var readRecord = reader.TryReadNext(out record);
-		       reader.Close();
-
-		       Assert.IsFalse(readRecord);
-		       Assert.AreEqual(0, readerchk.Read());
-		   }
-
-		   [Test]
-		   public void try_read_returns_false_when_writer_checksum_is_ahead_but_not_enough_to_read_length()
-		   {
-		       var writerchk = new InMemoryCheckpoint(3);
-		       var readerchk = new InMemoryCheckpoint("reader", 0);
-		       var config = new TransactionFileDatabaseConfig(PathName, "prefix.tf", 10000, writerchk,
-		                                                      new List<ICheckpoint> { readerchk });
-		       var recordToWrite = LogRecord.Prepare(logPosition: 0,
-		                                                correlationId: _correlationId,
-		                                                eventId: _eventId,
-		                                                transactionPosition: 0,
-		                                                eventStreamId: "WorldEnding",
-		                                                expectedVersion: 1234,
-		                                                timeStamp: new DateTime(2012, 12, 21),
-		                                                flags: PrepareFlags.None,
-		                                                eventType: "type",
-		                                                data: new byte[] { 1, 2, 3, 4, 5 },
-		                                                metadata: new byte[] { 7, 17 });
-		       using (var fs = new FileStream(GetFilePathFor("prefix.tf0"), FileMode.CreateNew, FileAccess.Write))
-		       {
-		           var writer = new BinaryWriter(fs);
-		           recordToWrite.WriteWithLengthPrefixAndSuffixTo(writer);
-		           fs.Close();
-		       }
-
-		       var reader = new MultifileTransactionFileChaser(config, "reader");
-		       reader.Open();
-		       LogRecord record = null;
-		       var readRecord = reader.TryReadNext(out record);
-		       reader.Close();
-		       Assert.IsFalse(readRecord);
-		       Assert.AreEqual(0, readerchk.Read());
-		   }
-
-		   [Test]
-		   public void try_read_returns_properly_when_writer_is_written_to_while_chasing()
-		   {
-		       var writerchk = new InMemoryCheckpoint(0);
-		       var readerchk = new InMemoryCheckpoint("reader", 0);
-		       var config = new TransactionFileDatabaseConfig(PathName, "prefix.tf", 10000, writerchk, new[] { readerchk });
-
-		       var fileName = GetFilePathFor("prefix.tf0");
-		       File.Create(fileName).Close();
-
-		       var reader = new MultifileTransactionFileChaser(config, "reader");
-		       reader.Open();
-
-		       LogRecord record;
-		       Assert.IsFalse(reader.TryReadNext(out record));
-
-		       var recordToWrite = LogRecord.Prepare(logPosition: 0,
-		                                                correlationId: _correlationId,
-		                                                eventId: _eventId,
-		                                                transactionPosition: 0,
-		                                                eventStreamId: "WorldEnding",
-		                                                expectedVersion: 1234,
-		                                                timeStamp: new DateTime(2012, 12, 21),
-		                                                flags: PrepareFlags.None,
-		                                                eventType: "type",
-		                                                data: new byte[] { 1, 2, 3, 4, 5 },
-		                                                metadata: new byte[] { 7, 17 });
-		       var memstream = new MemoryStream();
-		       var writer = new BinaryWriter(memstream);
-		       recordToWrite.WriteWithLengthPrefixAndSuffixTo(writer);
-
-		       using (var fs = new FileStream(fileName, FileMode.Append, FileAccess.Write, FileShare.ReadWrite))
-		       {
-		           fs.Write(memstream.ToArray(), 0, (int)memstream.Length);
-		           fs.Flush(flushToDisk: true);
-		       }
-		       writerchk.Write(memstream.Length);
-
-		       Assert.IsTrue(reader.TryReadNext(out record));
-		       Assert.AreEqual(record, recordToWrite);
-
-		       var recordToWrite2 = LogRecord.Prepare(logPosition: 0,
-		                                                 correlationId: _correlationId,
-		                                                 eventId: _eventId,
-		                                                 transactionPosition: 0,
-		                                                 eventStreamId: "WorldEnding",
-		                                                 expectedVersion: 4321,
-		                                                 timeStamp: new DateTime(2012, 12, 21),
-		                                                 flags: PrepareFlags.None,
-		                                                 eventType: "type",
-		                                                 data: new byte[] { 3, 2, 1 },
-		                                                 metadata: new byte[] { 9 });
-		       memstream.SetLength(0);
-		       recordToWrite2.WriteWithLengthPrefixAndSuffixTo(writer);
-
-		       using (var fs = new FileStream(fileName, FileMode.Append, FileAccess.Write, FileShare.ReadWrite))
-		       {
-		           fs.Write(memstream.ToArray(), 0, (int)memstream.Length);
-		           fs.Flush(flushToDisk: true);
-		       }
-		       writerchk.Write(writerchk.Read() + memstream.Length);
-
-		       Assert.IsTrue(reader.TryReadNext(out record));
-		       Assert.AreEqual(record, recordToWrite2);
-
-		       reader.Close();
-		   }*/
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_closing_the_database.cs b/src/EventStore.Core.Tests/TransactionLog/when_closing_the_database.cs
deleted file mode 100644
index b7fd3a7d042..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_closing_the_database.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Plugins.Transforms;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_closing_the_database<TLogFormat, TStreamId> : SpecificationWithDirectory {
-
-		private TFChunkDb _db;
-
-		private static void CreateChunk(string path, int size) {
-			var chunkHeader = new ChunkHeader(TFChunk.CurrentChunkVersion, TFChunk.CurrentChunkVersion, size, 0, 0, false, Guid.NewGuid(), TransformType.Identity);
-			var chunkBytes = chunkHeader.AsByteArray();
-			var buf = new byte[ChunkHeader.Size + ChunkFooter.Size + chunkHeader.ChunkSize];
-			Buffer.BlockCopy(chunkBytes, 0, buf, 0, chunkBytes.Length);
-			File.WriteAllBytes(path, buf);
-		}
-
-		private static IPrepareLogRecord<TStreamId> CreateRecord() {
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			return LogRecord.Prepare(
-				factory: recordFactory,
-				logPosition: 0,
-				correlationId: Guid.NewGuid(),
-				eventId: Guid.NewGuid(),
-				transactionPos: 0,
-				transactionOffset: 0,
-				eventStreamId: streamId,
-				expectedVersion: -1,
-				timeStamp: new DateTime(2012, 12, 21),
-				flags: PrepareFlags.SingleWrite,
-				eventType: eventTypeId,
-				data: new byte[123],
-				metadata: new byte[] {0x13, 0x37});
-		}
-
-		private static ICheckpoint OpenCheckpoint(string path) =>
-			new FileCheckpoint(path, Path.GetFileName(path));
-
-		[SetUp]
-		public override Task SetUp() {
-			base.SetUp();
-
-			CreateChunk(GetFilePathFor("chunk-000000.000000"), 10_000);
-
-			_db = new TFChunkDb(TFChunkHelper.CreateDbConfig(
-				PathName,
-				OpenCheckpoint(GetFilePathFor("writer.chk")),
-				OpenCheckpoint(GetFilePathFor("chaser.chk")),
-				10_000));
-			_db.Open();
-
-			return Task.CompletedTask;
-		}
-
-		[TestCase(true)]
-		[TestCase(false)]
-		public void checkpoints_should_be_flushed_only_when_chunks_are_properly_closed(bool chunksClosed) {
-			if (!chunksClosed) {
-				// acquire a reader to prevent the chunk from being properly closed
-				_db.Manager.GetChunk(0).AcquireRawReader();
-			}
-
-			var writer = new TFChunkWriter(_db);
-			writer.Open();
-			Assert.IsTrue(writer.Write(CreateRecord(), out _));
-
-			_db.Config.ChaserCheckpoint.Write(1); // any non-zero value just to test if the checkpoint is flushed
-
-			_db.Close();
-
-			// reopen the checkpoints
-			var writerChk = OpenCheckpoint(GetFilePathFor("writer.chk"));
-			var chaserChk = OpenCheckpoint(GetFilePathFor("chaser.chk"));
-
-			if (chunksClosed) {
-				Assert.Greater(writerChk.Read(), 0L);
-				Assert.Greater(chaserChk.Read(), 0L);
-			} else {
-				Assert.AreEqual(0L, writerChk.Read());
-				Assert.AreEqual(0L, chaserChk.Read());
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_creating_chunked_transaction_chaser.cs b/src/EventStore.Core.Tests/TransactionLog/when_creating_chunked_transaction_chaser.cs
deleted file mode 100644
index 093f5176c81..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_creating_chunked_transaction_chaser.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class when_creating_chunked_transaction_chaser : SpecificationWithDirectory {
-		[Test]
-		public void a_null_file_config_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(
-				() => new TFChunkChaser(null, new InMemoryCheckpoint(0), new InMemoryCheckpoint(0), false));
-		}
-
-		[Test]
-		public void a_null_writer_checksum_throws_argument_null_exception() {
-			using var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, 0));
-			Assert.Throws<ArgumentNullException>(() => new TFChunkChaser(db, null, new InMemoryCheckpoint(), false));
-		}
-
-		[Test]
-		public void a_null_chaser_checksum_throws_argument_null_exception() {
-			using var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, 0));
-			Assert.Throws<ArgumentNullException>(() => new TFChunkChaser(db, new InMemoryCheckpoint(), null, false));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_creating_chunked_transaction_file_database.cs b/src/EventStore.Core.Tests/TransactionLog/when_creating_chunked_transaction_file_database.cs
deleted file mode 100644
index ae6aa96c54f..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_creating_chunked_transaction_file_database.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class when_creating_chunked_transaction_file_database {
-		[Test]
-		public void a_null_config_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => new TFChunkDb(null));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_creating_chunked_transaction_file_reader.cs b/src/EventStore.Core.Tests/TransactionLog/when_creating_chunked_transaction_file_reader.cs
deleted file mode 100644
index ab3a8240b44..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_creating_chunked_transaction_file_reader.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class when_creating_chunked_transaction_file_reader : SpecificationWithDirectory {
-		[Test]
-		public void a_null_db_config_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => new TFChunkReader(null, new InMemoryCheckpoint(0)));
-		}
-
-		[Test]
-		public void a_null_checkpoint_throws_argument_null_exception() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 0);
-			using var db = new TFChunkDb(config);
-			Assert.Throws<ArgumentNullException>(() => new TFChunkReader(db, null));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_creating_chunked_transaction_file_writer.cs b/src/EventStore.Core.Tests/TransactionLog/when_creating_chunked_transaction_file_writer.cs
deleted file mode 100644
index a035a3eb80f..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_creating_chunked_transaction_file_writer.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class when_creating_chunked_transaction_file_writer {
-		[Test]
-		public void a_null_config_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => new TFChunkWriter(null));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_creating_tfchunk_from_empty_file.cs b/src/EventStore.Core.Tests/TransactionLog/when_creating_tfchunk_from_empty_file.cs
deleted file mode 100644
index 31f96f8eac9..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_creating_tfchunk_from_empty_file.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class when_creating_tfchunk_from_empty_file : SpecificationWithFile {
-		private TFChunk _chunk;
-
-		[SetUp]
-		public override void SetUp() {
-			base.SetUp();
-			_chunk = TFChunkHelper.CreateNewChunk(Filename, 1024);
-		}
-
-		[TearDown]
-		public override void TearDown() {
-			_chunk.Dispose();
-			base.TearDown();
-		}
-
-		[Test]
-		public void the_chunk_is_cached() {
-			Assert.IsTrue(_chunk.IsCached);
-		}
-
-		[Test]
-		public void the_file_is_created() {
-			Assert.IsTrue(File.Exists(Filename));
-		}
-
-		[Test]
-		public void the_chunk_is_not_readonly() {
-			Assert.IsFalse(_chunk.IsReadOnly);
-		}
-
-		[Test]
-		public void append_does_not_throw_exception() {
-			Assert.DoesNotThrow(() => _chunk.TryAppend(new CommitLogRecord(0, Guid.NewGuid(), 0, DateTime.UtcNow, 0)));
-		}
-
-		[Test]
-		public void there_is_no_record_at_pos_zero() {
-			var res = _chunk.TryReadAt(0, couldBeScavenged: true);
-			Assert.IsFalse(res.Success);
-		}
-
-		[Test]
-		public async Task there_is_no_first_record() {
-			var res = await _chunk.TryReadFirst(CancellationToken.None);
-			Assert.IsFalse(res.Success);
-		}
-
-		[Test]
-		public void there_is_no_closest_forward_record_to_pos_zero() {
-			var res = _chunk.TryReadClosestForward(0);
-			Assert.IsFalse(res.Success);
-		}
-
-		[Test]
-		public void there_is_no_closest_backward_record_from_end() {
-			var res = _chunk.TryReadClosestForward(0);
-			Assert.IsFalse(res.Success);
-		}
-
-		[Test]
-		public void there_is_no_last_record() {
-			var res = _chunk.TryReadLast();
-			Assert.IsFalse(res.Success);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_destroying_a_tfchunk.cs b/src/EventStore.Core.Tests/TransactionLog/when_destroying_a_tfchunk.cs
deleted file mode 100644
index 4ea502171c7..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_destroying_a_tfchunk.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.IO;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class when_destroying_a_tfchunk : SpecificationWithFile {
-		private TFChunk _chunk;
-
-		[SetUp]
-		public override void SetUp() {
-			base.SetUp();
-			_chunk = TFChunkHelper.CreateNewChunk(Filename, 1000);
-			_chunk.MarkForDeletion();
-		}
-
-		[Test]
-		public void the_file_is_deleted() {
-			Assert.IsFalse(File.Exists(Filename));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_destroying_a_tfchunk_that_is_locked.cs b/src/EventStore.Core.Tests/TransactionLog/when_destroying_a_tfchunk_that_is_locked.cs
deleted file mode 100644
index ade3510a2a3..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_destroying_a_tfchunk_that_is_locked.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.IO;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class when_destroying_a_tfchunk_that_is_locked : SpecificationWithFile {
-		private TFChunk _chunk;
-		private TFChunkBulkReader _reader;
-
-		[SetUp]
-		public override void SetUp() {
-			base.SetUp();
-			_chunk = TFChunkHelper.CreateNewChunk(Filename, 1000);
-			_chunk.Complete();
-			_chunk.UnCacheFromMemory();
-			_reader = _chunk.AcquireRawReader();
-			_chunk.MarkForDeletion();
-		}
-
-		[TearDown]
-		public override void TearDown() {
-			_reader.Release();
-			_chunk.MarkForDeletion();
-			_chunk.WaitForDestroy(2000);
-			base.TearDown();
-		}
-
-		[Test]
-		public void the_file_is_not_deleted() {
-			Assert.IsTrue(File.Exists(Filename));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_having_scavenged_tfchunk_with_all_records_removed.cs b/src/EventStore.Core.Tests/TransactionLog/when_having_scavenged_tfchunk_with_all_records_removed.cs
deleted file mode 100644
index d72e4e94669..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_having_scavenged_tfchunk_with_all_records_removed.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Tests.Services.Storage;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_having_scavenged_tfchunk_with_all_records_removed<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private LogFormatAbstractor<TStreamId> _logFormat;
-		private TFChunkDb _db;
-		private TFChunk _scavengedChunk;
-		private int _originalFileSize;
-		private IPrepareLogRecord _p1, _p2, _p3;
-		private CommitLogRecord _c1, _c2, _c3;
-		private RecordWriteResult _res1, _res2, _res3;
-		private RecordWriteResult _cres1, _cres2, _cres3;
-
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
-				IndexDirectory = GetFilePathFor("index"),
-			});
-
-			_db = new TFChunkDb(TFChunkHelper.CreateSizedDbConfig(PathName, 0, chunkSize: 16 * 1024));
-			_db.Open();
-
-			var chunk = _db.Manager.GetChunkFor(0);
-			var streamName = "es-to-scavenge";
-			var pos = 0L;
-			_logFormat.StreamNameIndex.GetOrReserve(_logFormat.RecordFactory, streamName, 0, out var streamId, out var streamRecord);
-			if (streamRecord is not null) {
-				var res = chunk.TryAppend(streamRecord);
-				pos = res.NewPosition;
-			}
-
-			_logFormat.EventTypeIndex.GetOrReserveEventType(_logFormat.RecordFactory, "et1", pos, out var eventTypeId, out var eventTypeRecord);
-			if (eventTypeRecord is not null) {
-				var res = chunk.TryAppend(eventTypeRecord);
-				pos = res.NewPosition;
-			}
-
-			var expectedVersion = ExpectedVersion.NoStream;
-			_p1 = LogRecord.SingleWrite(_logFormat.RecordFactory, pos, Guid.NewGuid(), Guid.NewGuid(), streamId, expectedVersion++, eventTypeId,
-				new byte[2048], new byte[] { 5, 7 });
-			_res1 = chunk.TryAppend(_p1);
-
-			_c1 = LogRecord.Commit(_res1.NewPosition, Guid.NewGuid(), _p1.LogPosition, 0);
-			_cres1 = chunk.TryAppend(_c1);
-
-			_p2 = LogRecord.SingleWrite(_logFormat.RecordFactory, _cres1.NewPosition,
-				Guid.NewGuid(), Guid.NewGuid(), streamId, expectedVersion++, eventTypeId,
-				new byte[2048], new byte[] { 5, 7 });
-			_res2 = chunk.TryAppend(_p2);
-
-			_c2 = LogRecord.Commit(_res2.NewPosition, Guid.NewGuid(), _p2.LogPosition, 1);
-			_cres2 = chunk.TryAppend(_c2);
-
-			_p3 = LogRecord.SingleWrite(_logFormat.RecordFactory, _cres2.NewPosition,
-				Guid.NewGuid(), Guid.NewGuid(), streamId, expectedVersion++, eventTypeId,
-				new byte[2048], new byte[] { 5, 7 });
-			_res3 = chunk.TryAppend(_p3);
-
-			_c3 = LogRecord.Commit(_res3.NewPosition, Guid.NewGuid(), _p3.LogPosition, 2);
-			_cres3 = chunk.TryAppend(_c3);
-
-			chunk.Complete();
-			_originalFileSize = chunk.FileSize;
-
-			_db.Config.WriterCheckpoint.Write(chunk.ChunkHeader.ChunkEndPosition);
-			_db.Config.WriterCheckpoint.Flush();
-			_db.Config.ChaserCheckpoint.Write(chunk.ChunkHeader.ChunkEndPosition);
-			_db.Config.ChaserCheckpoint.Flush();
-
-			var scavenger = new TFChunkScavenger<TStreamId>(Serilog.Log.Logger, _db, new FakeTFScavengerLog(), new FakeTableIndex<TStreamId>(),
-				new FakeReadIndex<TLogFormat, TStreamId>(x => EqualityComparer<TStreamId>.Default.Equals(x, streamId), _logFormat.Metastreams),
-				_logFormat.Metastreams);
-			await scavenger.Scavenge(alwaysKeepScavenged: true, mergeChunks: false);
-
-			_scavengedChunk = _db.Manager.GetChunk(0);
-		}
-
-		public override Task TestFixtureTearDown() {
-			_logFormat?.Dispose();
-			_db.Dispose();
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void first_record_was_written() {
-			Assert.IsTrue(_res1.Success);
-			Assert.IsTrue(_cres1.Success);
-		}
-
-		[Test]
-		public void second_record_was_written() {
-			Assert.IsTrue(_res2.Success);
-			Assert.IsTrue(_cres2.Success);
-		}
-
-		[Test]
-		public void third_record_was_written() {
-			Assert.IsTrue(_res3.Success);
-			Assert.IsTrue(_cres3.Success);
-		}
-
-		[Test]
-		public void prepare1_cant_be_read_at_position() {
-			var res = _scavengedChunk.TryReadAt((int)_p1.LogPosition, couldBeScavenged: true);
-			Assert.IsFalse(res.Success);
-		}
-
-		[Test]
-		public void commit1_cant_be_read_at_position() {
-			var res = _scavengedChunk.TryReadAt((int)_c1.LogPosition, couldBeScavenged: true);
-			Assert.IsFalse(res.Success);
-		}
-
-		[Test]
-		public void prepare2_cant_be_read_at_position() {
-			var res = _scavengedChunk.TryReadAt((int)_p2.LogPosition, couldBeScavenged: true);
-			Assert.IsFalse(res.Success);
-		}
-
-		[Test]
-		public void commit2_cant_be_read_at_position() {
-			var res = _scavengedChunk.TryReadAt((int)_c2.LogPosition, couldBeScavenged: true);
-			Assert.IsFalse(res.Success);
-		}
-
-		[Test]
-		public void prepare3_cant_be_read_at_position() {
-			var res = _scavengedChunk.TryReadAt((int)_p3.LogPosition, couldBeScavenged: true);
-			Assert.IsFalse(res.Success);
-		}
-
-		[Test]
-		public void commit3_cant_be_read_at_position() {
-			var res = _scavengedChunk.TryReadAt((int)_c3.LogPosition, couldBeScavenged: true);
-			Assert.IsFalse(res.Success);
-		}
-
-		[Test]
-		public async Task sequencial_read_returns_no_records() {
-			var records = new List<ILogRecord>();
-			RecordReadResult res = await _scavengedChunk.TryReadFirst(CancellationToken.None);
-			while (res.Success) {
-				records.Add(res.LogRecord);
-				res = _scavengedChunk.TryReadClosestForward((int)res.NextPosition);
-			}
-
-			if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
-				Assert.AreEqual(0, records.Count);
-			}
-			else {
-				Assert.AreEqual(2, records.Count);
-			}
-		}
-
-		[Test]
-		public void scavenged_chunk_should_have_saved_space() {
-			Assert.IsTrue(_scavengedChunk.FileSize < _originalFileSize,
-				String.Format("Expected scavenged file size ({0}) to be less than original file size ({1})",
-					_scavengedChunk.FileSize, _originalFileSize));
-		}
-
-		[Test]
-		public void scavenged_chunk_should_be_aligned() {
-			Assert.IsTrue(_scavengedChunk.FileSize % 4096 == 0);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_marking_for_deletion_a_tfchunk_that_has_been_locked_and_unlocked.cs b/src/EventStore.Core.Tests/TransactionLog/when_marking_for_deletion_a_tfchunk_that_has_been_locked_and_unlocked.cs
deleted file mode 100644
index 67ada21dd98..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_marking_for_deletion_a_tfchunk_that_has_been_locked_and_unlocked.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.IO;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class when_marking_for_deletion_a_tfchunk_that_has_been_locked_and_unlocked : SpecificationWithFile {
-		private TFChunk _chunk;
-
-		[SetUp]
-		public override void SetUp() {
-			base.SetUp();
-			_chunk = TFChunkHelper.CreateNewChunk(Filename, 1000);
-			var reader = _chunk.AcquireRawReader();
-			_chunk.MarkForDeletion();
-			reader.Release();
-		}
-
-		[Test]
-		public void the_file_is_deleted() {
-			Assert.IsFalse(File.Exists(Filename));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_opening_chunked_transaction_file_db_without_previous_files.cs b/src/EventStore.Core.Tests/TransactionLog/when_opening_chunked_transaction_file_db_without_previous_files.cs
deleted file mode 100644
index 68adc6f7482..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_opening_chunked_transaction_file_db_without_previous_files.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.IO;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class when_opening_chunked_transaction_file_db_without_previous_files : SpecificationWithDirectory {
-		[Test]
-		public void with_a_writer_checksum_of_zero_the_first_chunk_is_created_with_correct_name_and_is_aligned() {
-			var config = TFChunkHelper.CreateDbConfig(PathName, 0);
-			var db = new TFChunkDb(config);
-			db.Open();
-			db.Dispose();
-
-			Assert.AreEqual(1, Directory.GetFiles(PathName).Length);
-			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
-			var fileInfo = new FileInfo(GetFilePathFor("chunk-000000.000000"));
-			Assert.AreEqual(12288, fileInfo.Length);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_opening_existing_tfchunk.cs b/src/EventStore.Core.Tests/TransactionLog/when_opening_existing_tfchunk.cs
deleted file mode 100644
index 99aa359012b..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_opening_existing_tfchunk.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.Transforms.Identity;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class when_opening_existing_tfchunk : SpecificationWithFilePerTestFixture {
-		private TFChunk _chunk;
-		private TFChunk _testChunk;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_chunk = TFChunkHelper.CreateNewChunk(Filename);
-			_chunk.Complete();
-			_testChunk = TFChunk.FromCompletedFile(Filename, true, false,
-				reduceFileCachePressure: false, tracker: new TFChunkTracker.NoOp(),
-				getTransformFactory: _ => new IdentityChunkTransformFactory());
-		}
-
-		[TearDown]
-		public override void TestFixtureTearDown() {
-			_chunk.Dispose();
-			_testChunk.Dispose();
-			base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void the_chunk_is_not_cached() {
-			Assert.IsFalse(_testChunk.IsCached);
-		}
-
-		[Test]
-		public void the_chunk_is_readonly() {
-			Assert.IsTrue(_testChunk.IsReadOnly);
-		}
-
-		[Test]
-		public void append_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() =>
-				_testChunk.TryAppend(new CommitLogRecord(0, Guid.NewGuid(), 0, DateTime.UtcNow, 0)));
-		}
-
-		[Test]
-		public void flush_does_not_throw_any_exception() {
-			Assert.DoesNotThrow(() => _testChunk.Flush());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_opening_tfchunk_from_non_existing_file.cs b/src/EventStore.Core.Tests/TransactionLog/when_opening_tfchunk_from_non_existing_file.cs
deleted file mode 100644
index a50e8e8eb0c..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_opening_tfchunk_from_non_existing_file.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using EventStore.Core.Exceptions;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.Transforms.Identity;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class when_opening_tfchunk_from_non_existing_file : SpecificationWithFile {
-		[Test]
-		public void it_should_throw_a_file_not_found_exception() {
-			Assert.Throws<CorruptDatabaseException>(() => TFChunk.FromCompletedFile(Filename, verifyHash: true,
-				unbufferedRead: false, reduceFileCachePressure: false, tracker: new TFChunkTracker.NoOp(),
-				getTransformFactory: _ => new IdentityChunkTransformFactory()));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_reading_a_single_record.cs b/src/EventStore.Core.Tests/TransactionLog/when_reading_a_single_record.cs
deleted file mode 100644
index 2123e8681c2..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_reading_a_single_record.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.LogV2;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_reading_a_single_record<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private const int RecordsCount = 8;
-
-		private TFChunkDb _db;
-		private ILogRecord[] _records;
-		private RecordWriteResult[] _results;
-
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_db = new TFChunkDb(TFChunkHelper.CreateSizedDbConfig(PathName, 0, chunkSize: 4096));
-			_db.Open();
-
-			var chunk = _db.Manager.GetChunk(0);
-			_records = new ILogRecord[RecordsCount];
-			_results = new RecordWriteResult[RecordsCount];
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			var expectedVersion = ExpectedVersion.NoStream;
-			var pos = 0;
-			for (int i = 0; i < RecordsCount; ++i) {
-				if (i > 0 && i % 3 == 0) {
-					pos = i / 3 * _db.Config.ChunkSize;
-					chunk.Complete();
-					chunk = _db.Manager.AddNewChunk();
-				}
-
-				_records[i] = LogRecord.SingleWrite(recordFactory, pos,
-					Guid.NewGuid(), Guid.NewGuid(), streamId, expectedVersion++, eventTypeId,
-					new byte[1200], new byte[] { 5, 7 });
-				_results[i] = chunk.TryAppend(_records[i]);
-
-				pos += _records[i].GetSizeWithLengthPrefixAndSuffix();
-			}
-
-			chunk.Flush();
-			_db.Config.WriterCheckpoint.Write((RecordsCount / 3) * _db.Config.ChunkSize +
-											  _results[RecordsCount - 1].NewPosition);
-			_db.Config.WriterCheckpoint.Flush();
-		}
-
-		public override Task TestFixtureTearDown() {
-			_db.Dispose();
-
-			return base.TestFixtureTearDown();
-		}
-
-		private TFChunkReader GetTFChunkReader(long from) {
-			return new TFChunkReader(_db, _db.Config.WriterCheckpoint, from);
-		}
-
-		[Test]
-		public void all_records_were_written() {
-			var pos = 0;
-			for (int i = 0; i < RecordsCount; ++i) {
-				if (i % 3 == 0)
-					pos = 0;
-
-				Assert.IsTrue(_results[i].Success);
-				Assert.AreEqual(pos, _results[i].OldPosition);
-
-				pos += _records[i].GetSizeWithLengthPrefixAndSuffix();
-				Assert.AreEqual(pos, _results[i].NewPosition);
-			}
-		}
-
-		[Test]
-		public void all_records_can_be_read() {
-			var reader = GetTFChunkReader(0);
-
-			RecordReadResult res;
-			for (var i = 0; i < RecordsCount; i++) {
-				var rec = _records[i];
-				res = reader.TryReadAt(rec.LogPosition, couldBeScavenged: true);
-
-				Assert.IsTrue(res.Success);
-				Assert.AreEqual(rec, res.LogRecord);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_reading_an_empty_chunked_transaction_log.cs b/src/EventStore.Core.Tests/TransactionLog/when_reading_an_empty_chunked_transaction_log.cs
deleted file mode 100644
index 2b2700ef010..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_reading_an_empty_chunked_transaction_log.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System;
-using EventStore.Core.LogV2;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_reading_an_empty_chunked_transaction_log<TLogFormat, TStreamId> : SpecificationWithDirectory {
-		[Test]
-		public void try_read_returns_false_when_writer_checksum_is_zero() {
-			var writerchk = new InMemoryCheckpoint(0);
-			var chaserchk = new InMemoryCheckpoint(0);
-			var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, writerchk, chaserchk));
-			db.Open();
-
-			var reader = new TFChunkReader(db, writerchk, 0);
-			Assert.IsFalse(reader.TryReadNext().Success);
-
-			db.Close();
-		}
-
-		[Test]
-		public void try_read_does_not_cache_anything_and_returns_record_once_it_is_written_later() {
-			var writerchk = new InMemoryCheckpoint(0);
-			var chaserchk = new InMemoryCheckpoint(0);
-			var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, writerchk, chaserchk));
-			db.Open();
-
-			var writer = new TFChunkWriter(db);
-			writer.Open();
-
-			var reader = new TFChunkReader(db, writerchk, 0);
-
-			Assert.IsFalse(reader.TryReadNext().Success);
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			var rec = LogRecord.SingleWrite(recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), streamId, -1, eventTypeId, new byte[] {7}, null);
-			long tmp;
-			Assert.IsTrue(writer.Write(rec, out tmp));
-			writer.Flush();
-			writer.Close();
-
-			var res = reader.TryReadNext();
-			Assert.IsTrue(res.Success);
-			Assert.AreEqual(rec, res.LogRecord);
-
-			db.Close();
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_reading_cached_empty_scavenged_tfchunk.cs b/src/EventStore.Core.Tests/TransactionLog/when_reading_cached_empty_scavenged_tfchunk.cs
deleted file mode 100644
index dda58ae2c55..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_reading_cached_empty_scavenged_tfchunk.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class when_reading_cached_empty_scavenged_tfchunk : SpecificationWithFilePerTestFixture {
-		private TFChunk _chunk;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_chunk = TFChunkHelper.CreateNewChunk(Filename, isScavenged: true);
-			await _chunk.CompleteScavenge(new PosMap[0], CancellationToken.None);
-			_chunk.CacheInMemory();
-		}
-
-		[OneTimeTearDown]
-		public override void TestFixtureTearDown() {
-			_chunk.Dispose();
-			base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void no_record_at_exact_position_can_be_read() {
-			Assert.IsFalse(_chunk.TryReadAt(0, couldBeScavenged: true).Success);
-		}
-
-		[Test]
-		public async Task no_record_can_be_read_as_first_record() {
-			Assert.IsFalse((await _chunk.TryReadFirst(CancellationToken.None)).Success);
-		}
-
-		[Test]
-		public void no_record_can_be_read_as_closest_forward_record() {
-			Assert.IsFalse(_chunk.TryReadClosestForward(0).Success);
-		}
-
-		[Test]
-		public void no_record_can_be_read_as_closest_backward_record() {
-			Assert.IsFalse(_chunk.TryReadClosestBackward(0).Success);
-		}
-
-		[Test]
-		public void no_record_can_be_read_as_last_record() {
-			Assert.IsFalse(_chunk.TryReadLast().Success);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_reading_file_checkpoints.cs b/src/EventStore.Core.Tests/TransactionLog/when_reading_file_checkpoints.cs
deleted file mode 100644
index 7175b104b6e..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_reading_file_checkpoints.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Checkpoint;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class when_reading_file_checkpoints : SpecificationWithFile {
-		[Test]
-		public void mem_mapped_file_checkpoint_can_be_read_as_file_checkpoint() {
-			var memoryMapped = new MemoryMappedFileCheckpoint(Filename);
-			memoryMapped.Write(0xDEAD);
-			memoryMapped.Close(flush: true);
-
-			var fileCheckpoint = new FileCheckpoint(Filename);
-			var read = fileCheckpoint.Read();
-			fileCheckpoint.Close(flush: true);
-			Assert.AreEqual(0xDEAD, read);
-		}
-
-		[Test]
-		public void file_checkpoint_can_be_read_as_mem_mapped_file_checkpoint() {
-			var fileCheckpoint = new FileCheckpoint(Filename);
-			fileCheckpoint.Write(0xDEAD);
-			fileCheckpoint.Close(flush: true);
-
-			var memoryMapped = new MemoryMappedFileCheckpoint(Filename);
-			var read = memoryMapped.Read();
-			memoryMapped.Close(flush: true);
-			Assert.AreEqual(0xDEAD, read);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_reading_from_a_cached_tfchunk.cs b/src/EventStore.Core.Tests/TransactionLog/when_reading_from_a_cached_tfchunk.cs
deleted file mode 100644
index d123a067173..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_reading_from_a_cached_tfchunk.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.Transforms.Identity;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_reading_from_a_cached_tfchunk<TLogFormat, TStreamId> : SpecificationWithFilePerTestFixture {
-		private TFChunk _chunk;
-		private readonly Guid _corrId = Guid.NewGuid();
-		private readonly Guid _eventId = Guid.NewGuid();
-		private TFChunk _cachedChunk;
-		private IPrepareLogRecord<TStreamId> _record;
-		private RecordWriteResult _result;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			_record = LogRecord.Prepare(recordFactory, 0, _corrId, _eventId, 0, 0, streamId, 1,
-				PrepareFlags.None, eventTypeId, new byte[12], new byte[15], new DateTime(2000, 1, 1, 12, 0, 0));
-			_chunk = TFChunkHelper.CreateNewChunk(Filename);
-			_result = _chunk.TryAppend(_record);
-			_chunk.Flush();
-			_chunk.Complete();
-			_cachedChunk = TFChunk.FromCompletedFile(Filename, verifyHash: true, unbufferedRead: false,
-				reduceFileCachePressure: false, tracker: new TFChunkTracker.NoOp(),
-				getTransformFactory: _ => new IdentityChunkTransformFactory());
-			_cachedChunk.CacheInMemory();
-		}
-
-		[OneTimeTearDown]
-		public override void TestFixtureTearDown() {
-			_chunk.Dispose();
-			_cachedChunk.Dispose();
-			base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void the_write_result_is_correct() {
-			Assert.IsTrue(_result.Success);
-			Assert.AreEqual(0, _result.OldPosition);
-			Assert.AreEqual(_record.GetSizeWithLengthPrefixAndSuffix(), _result.NewPosition);
-		}
-
-		[Test]
-		public void the_chunk_is_cached() {
-			Assert.IsTrue(_cachedChunk.IsCached);
-		}
-
-		[Test]
-		public void the_record_can_be_read_at_exact_position() {
-			var res = _cachedChunk.TryReadAt(0, couldBeScavenged: true);
-			Assert.IsTrue(res.Success);
-			Assert.AreEqual(_record, res.LogRecord);
-			Assert.AreEqual(_result.OldPosition, res.LogRecord.LogPosition);
-		}
-
-		[Test]
-		public async Task the_record_can_be_read_as_first_record() {
-			var res = await _cachedChunk.TryReadFirst(CancellationToken.None);
-			Assert.IsTrue(res.Success);
-			Assert.AreEqual(_record.GetSizeWithLengthPrefixAndSuffix(), res.NextPosition);
-			Assert.AreEqual(_record, res.LogRecord);
-			Assert.AreEqual(_result.OldPosition, res.LogRecord.LogPosition);
-		}
-
-		[Test]
-		public void the_record_can_be_read_as_closest_forward_to_zero_pos() {
-			var res = _cachedChunk.TryReadClosestForward(0);
-			Assert.IsTrue(res.Success);
-			Assert.AreEqual(_record.GetSizeWithLengthPrefixAndSuffix(), res.NextPosition);
-			Assert.AreEqual(_record, res.LogRecord);
-			Assert.AreEqual(_result.OldPosition, res.LogRecord.LogPosition);
-		}
-
-		[Test]
-		public void the_record_can_be_read_as_closest_backward_from_end() {
-			var res = _cachedChunk.TryReadClosestBackward(_record.GetSizeWithLengthPrefixAndSuffix());
-			Assert.IsTrue(res.Success);
-			Assert.AreEqual(0, res.NextPosition);
-			Assert.AreEqual(_record, res.LogRecord);
-		}
-
-		[Test]
-		public void the_record_can_be_read_as_last() {
-			var res = _cachedChunk.TryReadLast();
-			Assert.IsTrue(res.Success);
-			Assert.AreEqual(0, res.NextPosition);
-			Assert.AreEqual(_record, res.LogRecord);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_reading_logical_bytes_bulk_from_a_chunk.cs b/src/EventStore.Core.Tests/TransactionLog/when_reading_logical_bytes_bulk_from_a_chunk.cs
deleted file mode 100644
index 2f14e5417a7..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_reading_logical_bytes_bulk_from_a_chunk.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.LogV2;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_reading_logical_bytes_bulk_from_a_chunk<TLogFormat, TStreamId> : SpecificationWithDirectory {
-		public when_reading_logical_bytes_bulk_from_a_chunk() {
-		}
-
-		[Test]
-		public void the_file_will_not_be_deleted_until_reader_released() {
-			var chunk = TFChunkHelper.CreateNewChunk(GetFilePathFor("file1"), 2000);
-			using (var reader = chunk.AcquireDataReader()) {
-				chunk.MarkForDeletion();
-				var buffer = new byte[1024];
-				var result = reader.ReadNextBytes(1024, buffer);
-				Assert.IsFalse(result.IsEOF);
-				Assert.AreEqual(0, result.BytesRead); // no data yet
-			}
-
-			chunk.WaitForDestroy(5000);
-		}
-
-		[Test]
-		public void a_read_on_new_file_can_be_performed_but_returns_nothing() {
-			var chunk = TFChunkHelper.CreateNewChunk(GetFilePathFor("file1"), 2000);
-			using (var reader = chunk.AcquireDataReader()) {
-				var buffer = new byte[1024];
-				var result = reader.ReadNextBytes(1024, buffer);
-				Assert.IsFalse(result.IsEOF);
-				Assert.AreEqual(0, result.BytesRead);
-			}
-
-			chunk.MarkForDeletion();
-			chunk.WaitForDestroy(5000);
-		}
-
-		[Test]
-		public void a_read_past_end_of_completed_chunk_does_not_include_footer() {
-			var chunk = TFChunkHelper.CreateNewChunk(GetFilePathFor("file1"), 300);
-			chunk.Complete(); // chunk has 0 bytes of actual data
-			using (var reader = chunk.AcquireDataReader()) {
-				var buffer = new byte[1024];
-				var result = reader.ReadNextBytes(1024, buffer);
-				Assert.IsTrue(result.IsEOF);
-				Assert.AreEqual(0, result.BytesRead);
-			}
-
-			chunk.MarkForDeletion();
-			chunk.WaitForDestroy(5000);
-		}
-
-		[Test]
-		public async Task a_read_on_scavenged_chunk_does_not_include_map() {
-			var chunk = TFChunkHelper.CreateNewChunk(GetFilePathFor("afile"), 200, isScavenged: true);
-			await chunk.CompleteScavenge([new PosMap(0, 0), new PosMap(1, 1)], CancellationToken.None);
-			using (var reader = chunk.AcquireDataReader()) {
-				var buffer = new byte[1024];
-				var result = reader.ReadNextBytes(1024, buffer);
-				Assert.IsTrue(result.IsEOF);
-				Assert.AreEqual(0, result.BytesRead); //header 128 + footer 128 + map 16
-			}
-
-			chunk.MarkForDeletion();
-			chunk.WaitForDestroy(5000);
-		}
-
-		[Test]
-		public void if_asked_for_more_than_buffer_size_will_only_read_buffer_size() {
-			var chunk = TFChunkHelper.CreateNewChunk(GetFilePathFor("file1"), 3000);
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			var rec = LogRecord.Prepare(recordFactory, 0, Guid.NewGuid(),
-				Guid.NewGuid(), 0, 0, streamId, -1, PrepareFlags.None, eventTypeId,
-				new byte[2000], null);
-			Assert.IsTrue(chunk.TryAppend(rec).Success, "Record was not appended");
-
-			using (var reader = chunk.AcquireDataReader()) {
-				var buffer = new byte[1024];
-				var result = reader.ReadNextBytes(3000, buffer);
-				Assert.IsFalse(result.IsEOF);
-				Assert.AreEqual(1024, result.BytesRead);
-			}
-
-			chunk.MarkForDeletion();
-			chunk.WaitForDestroy(5000);
-		}
-
-		[Test]
-		public void a_read_past_eof_doesnt_return_eof_if_chunk_is_not_yet_completed() {
-			var chunk = TFChunkHelper.CreateNewChunk(GetFilePathFor("file1"), 300);
-			var rec = LogRecord.Commit(0, Guid.NewGuid(), 0, 0);
-			Assert.IsTrue(chunk.TryAppend(rec).Success, "Record was not appended");
-			using (var reader = chunk.AcquireDataReader()) {
-				var buffer = new byte[1024];
-				var result = reader.ReadNextBytes(1024, buffer);
-				Assert.IsFalse(result.IsEOF, "EOF was returned.");
-				//does not include header and footer space
-				Assert.AreEqual(rec.GetSizeWithLengthPrefixAndSuffix(), result.BytesRead,
-					"Read wrong number of bytes.");
-			}
-
-			chunk.MarkForDeletion();
-			chunk.WaitForDestroy(5000);
-		}
-
-		[Test]
-		public void a_read_past_eof_returns_eof_if_chunk_is_completed() {
-			var chunk = TFChunkHelper.CreateNewChunk(GetFilePathFor("file1"), 300);
-
-			var rec = LogRecord.Commit(0, Guid.NewGuid(), 0, 0);
-			Assert.IsTrue(chunk.TryAppend(rec).Success, "Record was not appended");
-			chunk.Complete();
-
-			using (var reader = chunk.AcquireDataReader()) {
-				var buffer = new byte[1024];
-				var result = reader.ReadNextBytes(1024, buffer);
-				Assert.IsTrue(result.IsEOF, "EOF was not returned.");
-				//does not include header and footer space
-				Assert.AreEqual(rec.GetSizeWithLengthPrefixAndSuffix(), result.BytesRead,
-					"Read wrong number of bytes.");
-			}
-
-			chunk.MarkForDeletion();
-			chunk.WaitForDestroy(5000);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_reading_physical_bytes_bulk_from_a_chunk.cs b/src/EventStore.Core.Tests/TransactionLog/when_reading_physical_bytes_bulk_from_a_chunk.cs
deleted file mode 100644
index 44753fdb71b..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_reading_physical_bytes_bulk_from_a_chunk.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class when_reading_physical_bytes_bulk_from_a_chunk : SpecificationWithDirectory {
-		[Test]
-		public void the_file_will_not_be_deleted_until_reader_released() {
-			var chunk = TFChunkHelper.CreateNewChunk(GetFilePathFor("file1"), 2000);
-			using (var reader = chunk.AcquireRawReader()) {
-				chunk.MarkForDeletion();
-				var buffer = new byte[1024];
-				var result = reader.ReadNextBytes(1024, buffer);
-				Assert.IsFalse(result.IsEOF);
-				Assert.AreEqual(1024, result.BytesRead);
-			}
-
-			chunk.WaitForDestroy(5000);
-		}
-
-		[Test]
-		public void a_read_on_new_file_can_be_performed() {
-			var chunk = TFChunkHelper.CreateNewChunk(GetFilePathFor("file1"), 2000);
-			using (var reader = chunk.AcquireRawReader()) {
-				var buffer = new byte[1024];
-				var result = reader.ReadNextBytes(1024, buffer);
-				Assert.IsFalse(result.IsEOF);
-				Assert.AreEqual(1024, result.BytesRead);
-			}
-
-			chunk.MarkForDeletion();
-			chunk.WaitForDestroy(5000);
-		}
-/*
-        [Test]
-        public void a_read_on_scavenged_chunk_includes_map()
-        {
-            var chunk = TFChunk.CreateNew(GetFilePathFor("afile"), 200, 0, 0, isScavenged: true, inMem: false, unbuffered: false, writethrough: false);
-            chunk.CompleteScavenge(new [] {new PosMap(0, 0), new PosMap(1,1) }, false);
-            using (var reader = chunk.AcquireRawReader())
-            {
-                var buffer = new byte[1024];
-                var result = reader.ReadNextBytes(1024, buffer);
-                Assert.IsFalse(result.IsEOF);
-                Assert.AreEqual(ChunkHeader.Size + ChunkHeader.Size + 2 * PosMap.FullSize, result.BytesRead);
-            }
-            chunk.MarkForDeletion();
-            chunk.WaitForDestroy(5000);
-        }
-
-        [Test]
-        public void a_read_past_end_of_completed_chunk_does_include_header_or_footer()
-        {
-            var chunk = TFChunk.CreateNew(GetFilePathFor("File1"), 300, 0, 0, isScavenged: false, inMem: false, unbuffered: false, writethrough: false);
-            chunk.Complete();
-            using (var reader = chunk.AcquireRawReader())
-            {
-                var buffer = new byte[1024];
-                var result = reader.ReadNextBytes(1024, buffer);
-                Assert.IsTrue(result.IsEOF);
-                Assert.AreEqual(ChunkHeader.Size + ChunkFooter.Size, result.BytesRead); //just header + footer = 256
-            }
-            chunk.MarkForDeletion();
-            chunk.WaitForDestroy(5000);
-        }
-*/
-
-		[Test]
-		public void if_asked_for_more_than_buffer_size_will_only_read_buffer_size() {
-			var chunk = TFChunkHelper.CreateNewChunk(GetFilePathFor("file1"), 3000);
-			using (var reader = chunk.AcquireRawReader()) {
-				var buffer = new byte[1024];
-				var result = reader.ReadNextBytes(3000, buffer);
-				Assert.IsFalse(result.IsEOF);
-				Assert.AreEqual(1024, result.BytesRead);
-			}
-
-			chunk.MarkForDeletion();
-			chunk.WaitForDestroy(5000);
-		}
-
-		[Test]
-		public void a_read_past_eof_returns_eof_and_no_footer() {
-			var chunk = TFChunkHelper.CreateNewChunk(GetFilePathFor("file1"), 300);
-			using (var reader = chunk.AcquireRawReader()) {
-				var buffer = new byte[8092];
-				var result = reader.ReadNextBytes(8092, buffer);
-				Assert.IsTrue(result.IsEOF);
-				Assert.AreEqual(4096, result.BytesRead); //does not includes header and footer space
-			}
-
-			chunk.MarkForDeletion();
-			chunk.WaitForDestroy(5000);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_reading_uncached_empty_scavenged_tfchunk.cs b/src/EventStore.Core.Tests/TransactionLog/when_reading_uncached_empty_scavenged_tfchunk.cs
deleted file mode 100644
index e14122efb63..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_reading_uncached_empty_scavenged_tfchunk.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class when_reading_uncached_empty_scavenged_tfchunk : SpecificationWithFilePerTestFixture {
-		private TFChunk _chunk;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_chunk = TFChunkHelper.CreateNewChunk(Filename, isScavenged: true);
-			await _chunk.CompleteScavenge(Array.Empty<PosMap>(), CancellationToken.None);
-		}
-
-		[OneTimeTearDown]
-		public override void TestFixtureTearDown() {
-			_chunk.Dispose();
-			base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void no_record_at_exact_position_can_be_read() {
-			Assert.IsFalse(_chunk.TryReadAt(0, couldBeScavenged: true).Success);
-		}
-
-		[Test]
-		public async Task no_record_can_be_read_as_first_record() {
-			Assert.IsFalse((await _chunk.TryReadFirst(CancellationToken.None)).Success);
-		}
-
-		[Test]
-		public void no_record_can_be_read_as_closest_forward_record() {
-			Assert.IsFalse(_chunk.TryReadClosestForward(0).Success);
-		}
-
-		[Test]
-		public void no_record_can_be_read_as_closest_backward_record() {
-			Assert.IsFalse(_chunk.TryReadClosestBackward(0).Success);
-		}
-
-		[Test]
-		public void no_record_can_be_read_as_last_record() {
-			Assert.IsFalse(_chunk.TryReadLast().Success);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_sequentially_reading_db_with_few_chunks.cs b/src/EventStore.Core.Tests/TransactionLog/when_sequentially_reading_db_with_few_chunks.cs
deleted file mode 100644
index 1952b77c05f..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_sequentially_reading_db_with_few_chunks.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.LogV2;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_sequentially_reading_db_with_few_chunks<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private const int RecordsCount = 8;
-
-		private TFChunkDb _db;
-		private ILogRecord[] _records;
-		private RecordWriteResult[] _results;
-
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_db = new TFChunkDb(TFChunkHelper.CreateSizedDbConfig(PathName, 0, chunkSize: 4096));
-			_db.Open();
-
-			var chunk = _db.Manager.GetChunk(0);
-
-			_records = new ILogRecord[RecordsCount];
-			_results = new RecordWriteResult[RecordsCount];
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			var expectedVersion = ExpectedVersion.NoStream;
-
-			var pos = 0;
-			for (int i = 0; i < RecordsCount; ++i) {
-				if (i > 0 && i % 3 == 0) {
-					pos = i / 3 * _db.Config.ChunkSize;
-					chunk.Complete();
-					chunk = _db.Manager.AddNewChunk();
-				}
-
-				_records[i] = LogRecord.SingleWrite(recordFactory, pos,
-					Guid.NewGuid(), Guid.NewGuid(), streamId, expectedVersion++, eventTypeId,
-					new byte[1200], new byte[] { 5, 7 });
-				_results[i] = chunk.TryAppend(_records[i]);
-
-				pos += _records[i].GetSizeWithLengthPrefixAndSuffix();
-			}
-
-			chunk.Flush();
-			_db.Config.WriterCheckpoint.Write((RecordsCount / 3) * _db.Config.ChunkSize +
-											  _results[RecordsCount - 1].NewPosition);
-			_db.Config.WriterCheckpoint.Flush();
-		}
-
-		public override Task TestFixtureTearDown() {
-			_db.Dispose();
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void all_records_were_written() {
-			var pos = 0;
-			for (int i = 0; i < RecordsCount; ++i) {
-				if (i % 3 == 0)
-					pos = 0;
-
-				Assert.IsTrue(_results[i].Success);
-				Assert.AreEqual(pos, _results[i].OldPosition);
-
-				pos += _records[i].GetSizeWithLengthPrefixAndSuffix();
-				Assert.AreEqual(pos, _results[i].NewPosition);
-			}
-		}
-
-		[Test]
-		public void all_records_could_be_read_with_forward_pass() {
-			var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, 0);
-
-			SeqReadResult res;
-			int count = 0;
-			while ((res = seqReader.TryReadNext()).Success) {
-				var rec = _records[count];
-				Assert.AreEqual(rec, res.LogRecord);
-				Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
-				Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
-
-				++count;
-			}
-
-			Assert.AreEqual(RecordsCount, count);
-		}
-
-		[Test]
-		public void all_records_could_be_read_with_backward_pass() {
-			var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, _db.Config.WriterCheckpoint.Read());
-
-			SeqReadResult res;
-			int count = 0;
-			while ((res = seqReader.TryReadPrev()).Success) {
-				var rec = _records[RecordsCount - count - 1];
-				Assert.AreEqual(rec, res.LogRecord);
-				Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
-				Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
-
-				++count;
-			}
-
-			Assert.AreEqual(RecordsCount, count);
-		}
-
-		[Test]
-		public void all_records_could_be_read_doing_forward_backward_pass() {
-			var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, 0);
-
-			SeqReadResult res;
-			int count1 = 0;
-			while ((res = seqReader.TryReadNext()).Success) {
-				var rec = _records[count1];
-				Assert.AreEqual(rec, res.LogRecord);
-				Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
-				Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
-
-				++count1;
-			}
-
-			Assert.AreEqual(RecordsCount, count1);
-
-			int count2 = 0;
-			while ((res = seqReader.TryReadPrev()).Success) {
-				var rec = _records[RecordsCount - count2 - 1];
-				Assert.AreEqual(rec, res.LogRecord);
-				Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
-				Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
-
-				++count2;
-			}
-
-			Assert.AreEqual(RecordsCount, count2);
-		}
-
-		[Test]
-		public void records_can_be_read_forward_starting_from_any_position() {
-			for (int i = 0; i < RecordsCount; ++i) {
-				var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, _records[i].LogPosition);
-
-				SeqReadResult res;
-				int count = 0;
-				while ((res = seqReader.TryReadNext()).Success) {
-					var rec = _records[i + count];
-					Assert.AreEqual(rec, res.LogRecord);
-					Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
-					Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
-
-					++count;
-				}
-
-				Assert.AreEqual(RecordsCount - i, count);
-			}
-		}
-
-		[Test]
-		public void records_can_be_read_backward_starting_from_any_position() {
-			for (int i = 0; i < RecordsCount; ++i) {
-				var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, _records[i].LogPosition);
-
-				SeqReadResult res;
-				int count = 0;
-				while ((res = seqReader.TryReadPrev()).Success) {
-					var rec = _records[i - count - 1];
-					Assert.AreEqual(rec, res.LogRecord);
-					Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
-					Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
-
-					++count;
-				}
-
-				Assert.AreEqual(i, count);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_sequentially_reading_db_with_one_chunk.cs b/src/EventStore.Core.Tests/TransactionLog/when_sequentially_reading_db_with_one_chunk.cs
deleted file mode 100644
index 8b632096064..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_sequentially_reading_db_with_one_chunk.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.LogV2;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_sequentially_reading_db_with_one_chunk<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private const int RecordsCount = 3;
-
-		private TFChunkDb _db;
-		private ILogRecord[] _records;
-		private RecordWriteResult[] _results;
-
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_db = new TFChunkDb(TFChunkHelper.CreateSizedDbConfig(PathName, 0, chunkSize: 4096));
-			_db.Open();
-
-			var chunk = _db.Manager.GetChunk(0);
-
-			_records = new ILogRecord[RecordsCount];
-			_results = new RecordWriteResult[RecordsCount];
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			var expectedVersion = ExpectedVersion.NoStream;
-
-			for (int i = 0; i < _records.Length; ++i) {
-				_records[i] = LogRecord.SingleWrite(recordFactory, i == 0 ? 0 : _results[i - 1].NewPosition,
-					Guid.NewGuid(), Guid.NewGuid(), streamId, expectedVersion++, eventTypeId,
-					new byte[] { 0, 1, 2 }, new byte[] { 5, 7 });
-				_results[i] = chunk.TryAppend(_records[i]);
-			}
-
-			chunk.Flush();
-			_db.Config.WriterCheckpoint.Write(_results[RecordsCount - 1].NewPosition);
-			_db.Config.WriterCheckpoint.Flush();
-		}
-
-		public override Task TestFixtureTearDown() {
-			_db.Dispose();
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void all_records_were_written() {
-			var pos = 0;
-			for (int i = 0; i < RecordsCount; ++i) {
-				Assert.IsTrue(_results[i].Success);
-				Assert.AreEqual(pos, _results[i].OldPosition);
-
-				pos += _records[i].GetSizeWithLengthPrefixAndSuffix();
-				Assert.AreEqual(pos, _results[i].NewPosition);
-			}
-		}
-
-		[Test]
-		public void all_records_could_be_read_with_forward_pass() {
-			var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, 0);
-
-			SeqReadResult res;
-			int count = 0;
-			while ((res = seqReader.TryReadNext()).Success) {
-				var rec = _records[count];
-				Assert.AreEqual(rec, res.LogRecord);
-				Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
-				Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
-
-				++count;
-			}
-
-			Assert.AreEqual(RecordsCount, count);
-		}
-
-		[Test]
-		public void only_the_last_record_is_marked_eof() {
-			var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, 0);
-
-			SeqReadResult res;
-			int count = 0;
-			while ((res = seqReader.TryReadNext()).Success) {
-				++count;
-				Assert.AreEqual(count == RecordsCount, res.Eof);
-			}
-
-			Assert.AreEqual(RecordsCount, count);
-		}
-
-		[Test]
-		public void all_records_could_be_read_with_backward_pass() {
-			var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, _db.Config.WriterCheckpoint.Read());
-
-			SeqReadResult res;
-			int count = 0;
-			while ((res = seqReader.TryReadPrev()).Success) {
-				var rec = _records[RecordsCount - count - 1];
-				Assert.AreEqual(rec, res.LogRecord);
-				Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
-				Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
-
-				++count;
-			}
-
-			Assert.AreEqual(RecordsCount, count);
-		}
-
-		[Test]
-		public void all_records_could_be_read_doing_forward_backward_pass() {
-			var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, 0);
-
-			SeqReadResult res;
-			int count1 = 0;
-			while ((res = seqReader.TryReadNext()).Success) {
-				var rec = _records[count1];
-				Assert.AreEqual(rec, res.LogRecord);
-				Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
-				Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
-
-				++count1;
-			}
-
-			Assert.AreEqual(RecordsCount, count1);
-
-			int count2 = 0;
-			while ((res = seqReader.TryReadPrev()).Success) {
-				var rec = _records[RecordsCount - count2 - 1];
-				Assert.AreEqual(rec, res.LogRecord);
-				Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
-				Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
-
-				++count2;
-			}
-
-			Assert.AreEqual(RecordsCount, count2);
-		}
-
-		[Test]
-		public void records_can_be_read_forward_starting_from_any_position() {
-			for (int i = 0; i < RecordsCount; ++i) {
-				var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, _records[i].LogPosition);
-
-				SeqReadResult res;
-				int count = 0;
-				while ((res = seqReader.TryReadNext()).Success) {
-					var rec = _records[i + count];
-					Assert.AreEqual(rec, res.LogRecord);
-					Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
-					Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
-
-					++count;
-				}
-
-				Assert.AreEqual(RecordsCount - i, count);
-			}
-		}
-
-		[Test]
-		public void records_can_be_read_backward_starting_from_any_position() {
-			for (int i = 0; i < RecordsCount; ++i) {
-				var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, _records[i].LogPosition);
-
-				SeqReadResult res;
-				int count = 0;
-				while ((res = seqReader.TryReadPrev()).Success) {
-					var rec = _records[i - count - 1];
-					Assert.AreEqual(rec, res.LogRecord);
-					Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
-					Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
-
-					++count;
-				}
-
-				Assert.AreEqual(i, count);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_sequentially_reading_db_with_one_chunk_ending_with_prepare.cs b/src/EventStore.Core.Tests/TransactionLog/when_sequentially_reading_db_with_one_chunk_ending_with_prepare.cs
deleted file mode 100644
index 5f1ed1e4d69..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_sequentially_reading_db_with_one_chunk_ending_with_prepare.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.LogV2;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_sequentially_reading_db_with_one_chunk_ending_with_prepare<TLogFormat, TStreamId> :
-		SpecificationWithDirectoryPerTestFixture {
-		private const int RecordsCount = 3;
-
-		private TFChunkDb _db;
-		private ILogRecord[] _records;
-		private RecordWriteResult[] _results;
-
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			_db = new TFChunkDb(
-				TFChunkHelper.CreateSizedDbConfig(PathName, 0, chunkSize: 4096));
-			_db.Open();
-
-			var chunk = _db.Manager.GetChunk(0);
-
-			_records = new ILogRecord[RecordsCount];
-			_results = new RecordWriteResult[RecordsCount];
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			var expectedVersion = ExpectedVersion.NoStream;
-
-			for (int i = 0; i < _records.Length - 1; ++i) {
-				_records[i] = LogRecord.SingleWrite(
-					recordFactory,
-					i == 0 ? 0 : _results[i - 1].NewPosition,
-					Guid.NewGuid(),
-					Guid.NewGuid(),
-					streamId,
-					expectedVersion++,
-					eventTypeId,
-					new byte[] { 0, 1, 2 },
-					new byte[] { 5, 7 });
-				_results[i] = chunk.TryAppend(_records[i]);
-			}
-
-			_records[_records.Length - 1] = LogRecord.Prepare(
-				recordFactory,
-				_results[_records.Length - 1 - 1].NewPosition,
-				Guid.NewGuid(),
-				Guid.NewGuid(),
-				_results[_records.Length - 1 - 1].NewPosition,
-				0,
-				streamId,
-				expectedVersion++,
-				PrepareFlags.Data,
-				eventTypeId,
-				new byte[] { 0, 1, 2 },
-				new byte[] { 5, 7 });
-			_results[_records.Length - 1] = chunk.TryAppend(_records[_records.Length - 1]);
-
-			chunk.Flush();
-			_db.Config.WriterCheckpoint.Write(_results[RecordsCount - 1].NewPosition);
-			_db.Config.WriterCheckpoint.Flush();
-		}
-
-		public override Task TestFixtureTearDown() {
-			_db.Dispose();
-
-			return base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void only_the_last_record_is_marked_eof() {
-			var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, 0);
-
-			SeqReadResult res;
-			int count = 0;
-			while ((res = seqReader.TryReadNext()).Success) {
-				++count;
-				Assert.AreEqual(count == RecordsCount, res.Eof);
-			}
-
-			Assert.AreEqual(RecordsCount, count);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_uncaching_a_tfchunk.cs b/src/EventStore.Core.Tests/TransactionLog/when_uncaching_a_tfchunk.cs
deleted file mode 100644
index 74182d679a8..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_uncaching_a_tfchunk.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.Transforms.Identity;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_uncaching_a_tfchunk<TLogFormat, TStreamId> : SpecificationWithFilePerTestFixture {
-		private TFChunk _chunk;
-		private readonly Guid _corrId = Guid.NewGuid();
-		private readonly Guid _eventId = Guid.NewGuid();
-		private RecordWriteResult _result;
-		private IPrepareLogRecord<TStreamId> _record;
-		private TFChunk _uncachedChunk;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			_record = LogRecord.Prepare(recordFactory, 0, _corrId, _eventId, 0, 0, streamId, 1,
-				PrepareFlags.None, eventTypeId, new byte[12], new byte[15], new DateTime(2000, 1, 1, 12, 0, 0));
-			_chunk = TFChunkHelper.CreateNewChunk(Filename);
-			_result = _chunk.TryAppend(_record);
-			_chunk.Flush();
-			_chunk.Complete();
-			_uncachedChunk = TFChunk.FromCompletedFile(Filename, verifyHash: true, unbufferedRead: false,
-				reduceFileCachePressure: false, tracker: new TFChunkTracker.NoOp(),
-				getTransformFactory: _ => new IdentityChunkTransformFactory());
-			_uncachedChunk.CacheInMemory();
-			_uncachedChunk.UnCacheFromMemory();
-		}
-
-		[OneTimeTearDown]
-		public override void TestFixtureTearDown() {
-			_chunk.Dispose();
-			_uncachedChunk.Dispose();
-			base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void the_write_result_is_correct() {
-			Assert.IsTrue(_result.Success);
-			Assert.AreEqual(0, _result.OldPosition);
-			Assert.AreEqual(_record.GetSizeWithLengthPrefixAndSuffix(), _result.NewPosition);
-		}
-
-		[Test]
-		public void the_chunk_is_not_cached() {
-			Assert.IsFalse(_uncachedChunk.IsCached);
-		}
-
-		[Test]
-		public void the_record_was_written() {
-			Assert.IsTrue(_result.Success);
-		}
-
-		[Test]
-		public void the_correct_position_is_returned() {
-			Assert.AreEqual(0, _result.OldPosition);
-		}
-
-		[Test]
-		public void the_record_can_be_read() {
-			var res = _uncachedChunk.TryReadAt(0, couldBeScavenged: true);
-			Assert.IsTrue(res.Success);
-			Assert.AreEqual(_record, res.LogRecord);
-			Assert.AreEqual(_result.OldPosition, res.LogRecord.LogPosition);
-			//Assert.AreEqual(_result.NewPosition, res.NewPosition);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_unlocking_a_tfchunk_that_has_been_marked_for_deletion.cs b/src/EventStore.Core.Tests/TransactionLog/when_unlocking_a_tfchunk_that_has_been_marked_for_deletion.cs
deleted file mode 100644
index a7ff5adab1f..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_unlocking_a_tfchunk_that_has_been_marked_for_deletion.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.IO;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class when_unlocking_a_tfchunk_that_has_been_marked_for_deletion : SpecificationWithFile {
-		private TFChunk _chunk;
-
-		[SetUp]
-		public override void SetUp() {
-			base.SetUp();
-			_chunk = TFChunkHelper.CreateNewChunk(Filename, 1000);
-			var reader = _chunk.AcquireRawReader();
-			_chunk.MarkForDeletion();
-			reader.Release();
-		}
-
-		[Test]
-		public void the_file_is_deleted() {
-			Assert.IsFalse(File.Exists(Filename));
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_writing_a_file_checksum_to_a_file.cs b/src/EventStore.Core.Tests/TransactionLog/when_writing_a_file_checksum_to_a_file.cs
deleted file mode 100644
index df50d8a4714..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_writing_a_file_checksum_to_a_file.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Checkpoint;
-using NUnit.Framework;
-using EventStore.Core.Tests.Helpers;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class when_writing_a_file_checksum_to_a_file : SpecificationWithFile {
-		[Test]
-		public void a_null_file_throws_argumentnullexception() {
-			Assert.Throws<ArgumentNullException>(() => new FileCheckpoint(null));
-		}
-
-		[Test]
-		public void name_is_set() {
-			var checksum = new FileCheckpoint(HelperExtensions.GetFilePathFromAssembly("filename"), "test");
-			Assert.AreEqual("test", checksum.Name);
-			checksum.Close(flush: true);
-		}
-
-		[Test]
-		public void reading_off_same_instance_gives_most_up_to_date_info() {
-			var checkSum = new FileCheckpoint(Filename);
-			checkSum.Write(0xDEAD);
-			checkSum.Flush();
-			var read = checkSum.Read();
-			checkSum.Close(flush: true);
-			Assert.AreEqual(0xDEAD, read);
-		}
-
-		[Test]
-		public void can_read_existing_checksum() {
-			var checksum = new FileCheckpoint(Filename);
-			checksum.Write(0xDEAD);
-			checksum.Close(flush: true);
-			checksum = new FileCheckpoint(Filename);
-			var val = checksum.Read();
-			checksum.Close(flush: true);
-			Assert.AreEqual(0xDEAD, val);
-		}
-
-		[Test]
-		public async Task the_new_value_is_not_accessible_if_not_flushed_even_with_delay() {
-			var checkSum = new FileCheckpoint(Filename);
-			checkSum.Write(1011);
-			await Task.Delay(200);
-			Assert.AreEqual(0, checkSum.Read());
-			checkSum.Close(flush: true);
-		}
-
-		[Test]
-		public void the_new_value_is_accessible_after_flush() {
-			var checkSum = new FileCheckpoint(Filename);
-			checkSum.Write(1011);
-			checkSum.Flush();
-			Assert.AreEqual(1011, checkSum.Read());
-			checkSum.Close(flush: true);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_writing_a_memorymappedpoint_to_a_file.cs b/src/EventStore.Core.Tests/TransactionLog/when_writing_a_memorymappedpoint_to_a_file.cs
deleted file mode 100644
index 70615b9febb..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_writing_a_memorymappedpoint_to_a_file.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Checkpoint;
-using NUnit.Framework;
-using RuntimeInformation = System.Runtime.RuntimeInformation;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class when_writing_a_memorymappedpoint_to_a_file : SpecificationWithFile {
-		public override void SetUp() {
-			base.SetUp();
-			if (!RuntimeInformation.IsWindows) {
-				Assert.Ignore($"{nameof(MemoryMappedFileCheckpoint)} is for windows only.");
-			}
-		}
-
-		[Test]
-		public void a_null_file_throws_argumentnullexception() {
-			Assert.Throws<ArgumentNullException>(() => new MemoryMappedFileCheckpoint(null));
-		}
-
-		[Test]
-		public void name_is_set() {
-			var checksum = new MemoryMappedFileCheckpoint(Filename, "test");
-			Assert.AreEqual("test", checksum.Name);
-			checksum.Close(flush: true);
-		}
-
-		[Test]
-		public void reading_off_same_instance_gives_most_up_to_date_info() {
-			var checkSum = new MemoryMappedFileCheckpoint(Filename);
-			checkSum.Write(0xDEAD);
-			checkSum.Flush();
-			var read = checkSum.Read();
-			checkSum.Close(flush: true);
-			Assert.AreEqual(0xDEAD, read);
-		}
-
-		[Test]
-		public void can_read_existing_checksum() {
-			var checksum = new MemoryMappedFileCheckpoint(Filename);
-			checksum.Write(0xDEAD);
-			checksum.Close(flush: true);
-			checksum = new MemoryMappedFileCheckpoint(Filename);
-			var val = checksum.Read();
-			checksum.Close(flush: true);
-			Assert.AreEqual(0xDEAD, val);
-		}
-
-		[Test]
-		public async Task the_new_value_is_not_accessible_if_not_flushed_even_with_delay() {
-			var checkSum = new MemoryMappedFileCheckpoint(Filename);
-			checkSum.Write(1011);
-			await Task.Delay(200);
-			Assert.AreEqual(0, checkSum.Read());
-			checkSum.Close(flush: true);
-		}
-
-		[Test]
-		public async Task the_new_value_is_accessible_after_flush() {
-			var checkSum = new MemoryMappedFileCheckpoint(Filename);
-			checkSum.Write(1011);
-			checkSum.Flush();
-			Assert.AreEqual(1011, checkSum.Read());
-			checkSum.Close(flush: true);
-			await Task.Delay(100);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_writing_a_new_chunked_transaction_file.cs b/src/EventStore.Core.Tests/TransactionLog/when_writing_a_new_chunked_transaction_file.cs
deleted file mode 100644
index 30079523ba2..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_writing_a_new_chunked_transaction_file.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_writing_a_new_chunked_transaction_file<TLogFormat, TStreamId> : SpecificationWithDirectory {
-		private readonly Guid _eventId = Guid.NewGuid();
-		private readonly Guid _correlationId = Guid.NewGuid();
-		private InMemoryCheckpoint _checkpoint;
-
-		[Test]
-		public void a_record_can_be_written() {
-			_checkpoint = new InMemoryCheckpoint(0);
-			var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, _checkpoint, new InMemoryCheckpoint()));
-			db.Open();
-			var tf = new TFChunkWriter(db);
-			tf.Open();
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			var record = LogRecord.Prepare(
-				factory: recordFactory,
-				logPosition: 0,
-				correlationId: _correlationId,
-				eventId: _eventId,
-				transactionPos: 0,
-				transactionOffset: 0,
-				eventStreamId: streamId,
-				expectedVersion: 1234,
-				timeStamp: new DateTime(2012, 12, 21),
-				flags: PrepareFlags.None,
-				eventType: eventTypeId,
-				data: new byte[] {1, 2, 3, 4, 5},
-				metadata: new byte[] {7, 17});
-			long tmp;
-			tf.Write(record, out tmp);
-			tf.Close();
-			db.Dispose();
-
-			Assert.AreEqual(record.GetSizeWithLengthPrefixAndSuffix(), _checkpoint.Read());
-			using (var filestream = File.Open(GetFilePathFor("chunk-000000.000000"), FileMode.Open, FileAccess.Read)) {
-				filestream.Position = ChunkHeader.Size;
-
-				var reader = new BinaryReader(filestream);
-				reader.ReadInt32();
-				var read = LogRecord.ReadFrom(reader, (int)reader.BaseStream.Length);
-				Assert.AreEqual(record, read);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_writing_an_existing_chunked_transaction_file_with_checksum.cs b/src/EventStore.Core.Tests/TransactionLog/when_writing_an_existing_chunked_transaction_file_with_checksum.cs
deleted file mode 100644
index 96d4e6f9ab2..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_writing_an_existing_chunked_transaction_file_with_checksum.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Plugins.Transforms;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_writing_an_existing_chunked_transaction_file_with_checksum<TLogFormat, TStreamId> : SpecificationWithDirectory {
-		private readonly Guid _correlationId = Guid.NewGuid();
-		private readonly Guid _eventId = Guid.NewGuid();
-		private InMemoryCheckpoint _checkpoint;
-
-		[Test]
-		public void a_record_can_be_written() {
-			var filename = GetFilePathFor("chunk-000000.000000");
-			var chunkHeader = new ChunkHeader(TFChunk.CurrentChunkVersion, TFChunk.CurrentChunkVersion, 10000, 0, 0, false, chunkId: Guid.NewGuid(), TransformType.Identity);
-			var chunkBytes = chunkHeader.AsByteArray();
-			var bytes = new byte[ChunkHeader.Size + 10000 + ChunkFooter.Size];
-			Buffer.BlockCopy(chunkBytes, 0, bytes, 0, chunkBytes.Length);
-			File.WriteAllBytes(filename, bytes);
-
-			_checkpoint = new InMemoryCheckpoint(137);
-			var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, _checkpoint, new InMemoryCheckpoint()));
-			db.Open();
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			var tf = new TFChunkWriter(db);
-			tf.Open();
-			var record = LogRecord.Prepare(
-				factory: recordFactory,
-				logPosition: _checkpoint.Read(),
-				correlationId: _correlationId,
-				eventId: _eventId,
-				expectedVersion: 1234,
-				transactionPos: 0,
-				transactionOffset: 0,
-				eventStreamId: streamId,
-				timeStamp: new DateTime(2012, 12, 21),
-				flags: PrepareFlags.None,
-				eventType: eventTypeId,
-				data: new byte[] {1, 2, 3, 4, 5},
-				metadata: new byte[] {7, 17});
-			long tmp;
-			tf.Write(record, out tmp);
-			tf.Close();
-			db.Dispose();
-
-			Assert.AreEqual(record.GetSizeWithLengthPrefixAndSuffix() + 137,
-				_checkpoint.Read()); //137 is fluff assigned to beginning of checkpoint
-			using (var filestream = File.Open(filename, FileMode.Open, FileAccess.Read)) {
-				filestream.Seek(ChunkHeader.Size + 137 + sizeof(int), SeekOrigin.Begin);
-				var reader = new BinaryReader(filestream);
-				var read = LogRecord.ReadFrom(reader, (int)reader.BaseStream.Length);
-				Assert.AreEqual(record, read);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_writing_an_existing_chunked_transaction_file_with_checksum_and_data_bigger_than_buffer.cs b/src/EventStore.Core.Tests/TransactionLog/when_writing_an_existing_chunked_transaction_file_with_checksum_and_data_bigger_than_buffer.cs
deleted file mode 100644
index 1ae3fa3560f..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_writing_an_existing_chunked_transaction_file_with_checksum_and_data_bigger_than_buffer.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Plugins.Transforms;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_writing_an_existing_chunked_transaction_file_with_checksum_and_data_bigger_than_buffer<TLogFormat, TStreamId> :
-			SpecificationWithDirectory {
-		private readonly Guid _correlationId = Guid.NewGuid();
-		private readonly Guid _eventId = Guid.NewGuid();
-		private InMemoryCheckpoint _checkpoint;
-
-		[Test]
-		public void a_record_can_be_written() {
-			var filename = GetFilePathFor("chunk-000000.000000");
-			var chunkHeader = new ChunkHeader(TFChunk.CurrentChunkVersion, TFChunk.CurrentChunkVersion, 10000, 0, 0, false, Guid.NewGuid(), TransformType.Identity);
-			var chunkBytes = chunkHeader.AsByteArray();
-			var buf = new byte[ChunkHeader.Size + ChunkFooter.Size + chunkHeader.ChunkSize];
-			Buffer.BlockCopy(chunkBytes, 0, buf, 0, chunkBytes.Length);
-			File.WriteAllBytes(filename, buf);
-
-			_checkpoint = new InMemoryCheckpoint(137);
-			var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, _checkpoint, new InMemoryCheckpoint(),
-				chunkSize: chunkHeader.ChunkSize));
-			db.Open();
-
-			var
-				bytes = new byte[3994]; // this gives exactly 4097 size of record, with 3993 (rec size 4096) everything works fine!
-			new Random().NextBytes(bytes);
-			var writer = new TFChunkWriter(db);
-			writer.Open();
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			var record = LogRecord.Prepare(
-				factory: recordFactory,
-				logPosition: 137,
-				correlationId: _correlationId,
-				eventId: _eventId,
-				transactionPos: 789,
-				transactionOffset: 543,
-				eventStreamId: streamId,
-				expectedVersion: 1234,
-				timeStamp: new DateTime(2012, 12, 21),
-				flags: PrepareFlags.SingleWrite,
-				eventType: eventTypeId,
-				data: bytes,
-				metadata: new byte[] {0x07, 0x17});
-
-			long pos;
-			Assert.IsTrue(writer.Write(record, out pos));
-			writer.Close();
-			db.Dispose();
-
-			Assert.AreEqual(record.GetSizeWithLengthPrefixAndSuffix() + 137, _checkpoint.Read());
-			using (var filestream = File.Open(filename, FileMode.Open, FileAccess.Read)) {
-				filestream.Seek(ChunkHeader.Size + 137 + sizeof(int), SeekOrigin.Begin);
-				var reader = new BinaryReader(filestream);
-				var read = LogRecord.ReadFrom(reader, (int)reader.BaseStream.Length);
-				Assert.AreEqual(record, read);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_writing_an_existing_chunked_transaction_file_with_not_enough_space_in_chunk.cs b/src/EventStore.Core.Tests/TransactionLog/when_writing_an_existing_chunked_transaction_file_with_not_enough_space_in_chunk.cs
deleted file mode 100644
index 2ea58786814..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_writing_an_existing_chunked_transaction_file_with_not_enough_space_in_chunk.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Plugins.Transforms;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_writing_an_existing_chunked_transaction_file_with_not_enough_space_in_chunk<TLogFormat, TStreamId> : SpecificationWithDirectory {
-		private readonly Guid _correlationId = Guid.NewGuid();
-		private readonly Guid _eventId = Guid.NewGuid();
-		private InMemoryCheckpoint _checkpoint;
-
-		[Test]
-		public void a_record_is_not_written_at_first_but_written_on_second_try() {
-			var filename1 = GetFilePathFor("chunk-000000.000000");
-			var filename2 = GetFilePathFor("chunk-000001.000000");
-			var chunkHeader = new ChunkHeader(TFChunk.CurrentChunkVersion, TFChunk.CurrentChunkVersion, 10000, 0, 0, false, Guid.NewGuid(), TransformType.Identity);
-			var chunkBytes = chunkHeader.AsByteArray();
-			var bytes = new byte[ChunkHeader.Size + 10000 + ChunkFooter.Size];
-			Buffer.BlockCopy(chunkBytes, 0, bytes, 0, chunkBytes.Length);
-			File.WriteAllBytes(filename1, bytes);
-
-			_checkpoint = new InMemoryCheckpoint(0);
-			var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, _checkpoint, new InMemoryCheckpoint()));
-			db.Open();
-			var tf = new TFChunkWriter(db);
-			tf.Open();
-			long pos;
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			var record1 = LogRecord.Prepare(
-				factory: recordFactory,
-				logPosition: 0,
-				correlationId: _correlationId,
-				eventId: _eventId,
-				expectedVersion: 1234,
-				transactionPos: 0,
-				transactionOffset: 0,
-				eventStreamId: streamId,
-				timeStamp: new DateTime(2012, 12, 21),
-				flags: PrepareFlags.None,
-				eventType: eventTypeId,
-				data: new byte[] {1, 2, 3, 4, 5},
-				metadata: new byte[8000]);
-			Assert.IsTrue(tf.Write(record1, out pos)); // almost fill up first chunk
-
-			var record2 = LogRecord.Prepare(
-				factory: recordFactory,
-				logPosition: pos,
-				correlationId: _correlationId,
-				eventId: _eventId,
-				expectedVersion: 1234,
-				transactionPos: pos,
-				transactionOffset: 0,
-				eventStreamId: streamId,
-				timeStamp: new DateTime(2012, 12, 21),
-				flags: PrepareFlags.None,
-				eventType: eventTypeId,
-				data: new byte[] {1, 2, 3, 4, 5},
-				metadata: new byte[8000]);
-			Assert.IsFalse(tf.Write(record2, out pos)); // chunk has too small space
-
-			var record3 = LogRecord.Prepare(
-				factory: recordFactory,
-				logPosition: pos,
-				correlationId: _correlationId,
-				eventId: _eventId,
-				expectedVersion: 1234,
-				transactionPos: pos,
-				transactionOffset: 0,
-				eventStreamId: streamId,
-				timeStamp: new DateTime(2012, 12, 21),
-				flags: PrepareFlags.None,
-				eventType: eventTypeId,
-				data: new byte[] {1, 2, 3, 4, 5},
-				metadata: new byte[2000]);
-			Assert.IsTrue(tf.Write(record3, out pos));
-			tf.Close();
-			db.Dispose();
-
-			Assert.AreEqual(record3.GetSizeWithLengthPrefixAndSuffix() + 10000, _checkpoint.Read());
-			using (var filestream = File.Open(filename2, FileMode.Open, FileAccess.Read)) {
-				filestream.Seek(ChunkHeader.Size + sizeof(int), SeekOrigin.Begin);
-				var reader = new BinaryReader(filestream);
-				var read = LogRecord.ReadFrom(reader, (int)reader.BaseStream.Length);
-				Assert.AreEqual(record3, read);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_writing_commit_record_to_file.cs b/src/EventStore.Core.Tests/TransactionLog/when_writing_commit_record_to_file.cs
deleted file mode 100644
index 2638cbcd542..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_writing_commit_record_to_file.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class when_writing_commit_record_to_file : SpecificationWithDirectoryPerTestFixture {
-		private ITransactionFileWriter _writer;
-		private InMemoryCheckpoint _writerCheckpoint;
-		private readonly Guid _eventId = Guid.NewGuid();
-		private CommitLogRecord _record;
-		private TFChunkDb _db;
-
-		[OneTimeSetUp]
-		public void SetUp() {
-			_writerCheckpoint = new InMemoryCheckpoint();
-			_db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, _writerCheckpoint, new InMemoryCheckpoint(),
-				1024));
-			_db.Open();
-			_writer = new TFChunkWriter(_db);
-			_writer.Open();
-			_record = new CommitLogRecord(logPosition: 0,
-				correlationId: _eventId,
-				transactionPosition: 4321,
-				timeStamp: new DateTime(2012, 12, 21),
-				firstEventNumber: 10);
-			long newPos;
-			_writer.Write(_record, out newPos);
-			_writer.Flush();
-		}
-
-		[OneTimeTearDown]
-		public void Teardown() {
-			_writer.Close();
-			_db.Close();
-		}
-
-		[Test]
-		public void the_data_is_written() {
-			using (var reader = new TFChunkChaser(_db, _writerCheckpoint, _db.Config.ChaserCheckpoint, false)) {
-				reader.Open();
-				ILogRecord r;
-				Assert.IsTrue(reader.TryReadNext(out r));
-
-				Assert.True(r is CommitLogRecord);
-				var c = (CommitLogRecord)r;
-				Assert.AreEqual(c.RecordType, LogRecordType.Commit);
-				Assert.AreEqual(c.LogPosition, 0);
-				Assert.AreEqual(c.CorrelationId, _eventId);
-				Assert.AreEqual(c.TransactionPosition, 4321);
-				Assert.AreEqual(c.TimeStamp, new DateTime(2012, 12, 21));
-			}
-		}
-
-		[Test]
-		public void the_checksum_is_updated() {
-			Assert.AreEqual(_record.GetSizeWithLengthPrefixAndSuffix(), _writerCheckpoint.Read());
-		}
-
-		[Test]
-		public void trying_to_read_past_writer_checksum_returns_false() {
-			var reader = new TFChunkReader(_db, _writerCheckpoint);
-			Assert.IsFalse(reader.TryReadAt(_writerCheckpoint.Read(), couldBeScavenged: true).Success);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_writing_multiple_records_to_a_tfchunk.cs b/src/EventStore.Core.Tests/TransactionLog/when_writing_multiple_records_to_a_tfchunk.cs
deleted file mode 100644
index 23cb8d15198..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_writing_multiple_records_to_a_tfchunk.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_writing_multiple_records_to_a_tfchunk<TLogFormat, TStreamId> : SpecificationWithFilePerTestFixture {
-		private TFChunk _chunk;
-		private readonly Guid _corrId = Guid.NewGuid();
-		private readonly Guid _eventId = Guid.NewGuid();
-		private long _position1;
-		private long _position2;
-		private bool _written1;
-		private bool _written2;
-
-		private IPrepareLogRecord<TStreamId> _prepare1;
-		private IPrepareLogRecord<TStreamId> _prepare2;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_chunk = TFChunkHelper.CreateNewChunk(Filename);
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId1 = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var streamId2 = LogFormatHelper<TLogFormat, TStreamId>.StreamId2;
-			var eventTypeId1 = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-			var eventTypeId2 = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId2;
-
-			_prepare1 = LogRecord.Prepare(recordFactory, 0, _corrId, _eventId, 0, 0, streamId1, 1,
-				PrepareFlags.None, eventTypeId1, new byte[12], new byte[15], new DateTime(2000, 1, 1, 12, 0, 0));
-			var r1 = _chunk.TryAppend(_prepare1);
-			_written1 = r1.Success;
-			_position1 = r1.OldPosition;
-
-			_prepare2 = LogRecord.Prepare(recordFactory, r1.NewPosition, _corrId, _eventId, 0, 0, streamId2, 2,
-				PrepareFlags.None, eventTypeId2, new byte[12], new byte[15], new DateTime(2000, 1, 1, 12, 0, 0));
-			var r2 = _chunk.TryAppend(_prepare2);
-			_written2 = r2.Success;
-			_position2 = r2.OldPosition;
-			_chunk.Flush();
-		}
-
-		[OneTimeTearDown]
-		public override void TestFixtureTearDown() {
-			_chunk.Dispose();
-			base.TestFixtureTearDown();
-		}
-
-		[Test]
-		public void the_chunk_is_cached() {
-			Assert.IsTrue(_chunk.IsCached);
-		}
-
-		[Test]
-		public void the_first_record_was_written() {
-			Assert.IsTrue(_written1);
-		}
-
-		[Test]
-		public void the_second_record_was_written() {
-			Assert.IsTrue(_written2);
-		}
-
-		[Test]
-		public void the_first_record_can_be_read_at_position() {
-			var res = _chunk.TryReadAt((int)_position1, couldBeScavenged: true);
-			Assert.IsTrue(res.Success);
-			Assert.IsTrue(res.LogRecord is IPrepareLogRecord<TStreamId>);
-			Assert.AreEqual(_prepare1, res.LogRecord);
-		}
-
-		[Test]
-		public void the_second_record_can_be_read_at_position() {
-			var res = _chunk.TryReadAt((int)_position2, couldBeScavenged: true);
-			Assert.IsTrue(res.Success);
-			Assert.IsTrue(res.LogRecord is IPrepareLogRecord<TStreamId>);
-			Assert.AreEqual(_prepare2, res.LogRecord);
-		}
-
-		[Test]
-		public async Task the_first_record_can_be_read() {
-			var res = await _chunk.TryReadFirst(CancellationToken.None);
-			Assert.IsTrue(res.Success);
-			Assert.AreEqual(_prepare1.GetSizeWithLengthPrefixAndSuffix(), res.NextPosition);
-			Assert.IsTrue(res.LogRecord is IPrepareLogRecord<TStreamId>);
-			Assert.AreEqual(_prepare1, res.LogRecord);
-		}
-
-		[Test]
-		public void the_second_record_can_be_read_as_closest_forward_after_first() {
-			var res = _chunk.TryReadClosestForward(_prepare1.GetSizeWithLengthPrefixAndSuffix());
-			Assert.IsTrue(res.Success);
-			Assert.AreEqual(_prepare1.GetSizeWithLengthPrefixAndSuffix()
-			                + _prepare2.GetSizeWithLengthPrefixAndSuffix(), res.NextPosition);
-			Assert.IsTrue(res.LogRecord is IPrepareLogRecord<TStreamId>);
-			Assert.AreEqual(_prepare2, res.LogRecord);
-		}
-
-		[Test]
-		public void cannot_read_past_second_record_with_closest_forward_method() {
-			var res = _chunk.TryReadClosestForward(_prepare1.GetSizeWithLengthPrefixAndSuffix()
-			                                       + _prepare2.GetSizeWithLengthPrefixAndSuffix());
-			Assert.IsFalse(res.Success);
-		}
-
-		[Test]
-		public void the_seconds_record_can_be_read_as_last() {
-			var res = _chunk.TryReadLast();
-			Assert.IsTrue(res.Success);
-			Assert.AreEqual(_prepare1.GetSizeWithLengthPrefixAndSuffix(), res.NextPosition);
-			Assert.AreEqual(_prepare2, res.LogRecord);
-		}
-
-		[Test]
-		public void the_first_record_can_be_read_as_closest_backward_after_last() {
-			var res = _chunk.TryReadClosestBackward(_prepare1.GetSizeWithLengthPrefixAndSuffix());
-			Assert.IsTrue(res.Success);
-			Assert.AreEqual(0, res.NextPosition);
-			Assert.AreEqual(_prepare1, res.LogRecord);
-		}
-
-		[Test]
-		public void cannot_read_backward_from_zero_pos() {
-			var res = _chunk.TryReadClosestBackward(0);
-			Assert.IsFalse(res.Success);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/when_writing_prepare_record_to_file.cs b/src/EventStore.Core.Tests/TransactionLog/when_writing_prepare_record_to_file.cs
deleted file mode 100644
index 68fe086ab66..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/when_writing_prepare_record_to_file.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using System;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_writing_prepare_record_to_file<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		private ITransactionFileWriter _writer;
-		private InMemoryCheckpoint _writerCheckpoint;
-		private readonly Guid _eventId = Guid.NewGuid();
-		private readonly Guid _correlationId = Guid.NewGuid();
-		private IPrepareLogRecord<TStreamId> _record;
-		private TFChunkDb _db;
-
-		[OneTimeSetUp]
-		public void SetUp() {
-			_writerCheckpoint = new InMemoryCheckpoint();
-			_db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, _writerCheckpoint, new InMemoryCheckpoint(),
-				1024));
-			_db.Open();
-			_writer = new TFChunkWriter(_db);
-			_writer.Open();
-
-			var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
-			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-			_record = LogRecord.Prepare(
-				factory: recordFactory,
-				logPosition: 0,
-				eventId: _eventId,
-				correlationId: _correlationId,
-				transactionPos: 0xDEAD,
-				transactionOffset: 0xBEEF,
-				eventStreamId: streamId,
-				expectedVersion: 1234,
-				timeStamp: new DateTime(2012, 12, 21),
-				flags: PrepareFlags.SingleWrite,
-				eventType: eventTypeId,
-				data: new byte[] {1, 2, 3, 4, 5},
-				metadata: new byte[] {7, 17});
-			long newPos;
-			_writer.Write(_record, out newPos);
-			_writer.Flush();
-		}
-
-		[OneTimeTearDown]
-		public void Teardown() {
-			_writer.Close();
-			_db.Close();
-		}
-
-		[Test]
-		public void the_data_is_written() {
-			//TODO MAKE THIS ACTUALLY ASSERT OFF THE FILE AND READER FROM KNOWN FILE
-			using (var reader = new TFChunkChaser(_db, _writerCheckpoint, _db.Config.ChaserCheckpoint, false)) {
-				reader.Open();
-				ILogRecord r;
-				Assert.IsTrue(reader.TryReadNext(out r));
-
-				var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
-				var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
-
-				Assert.True(r is IPrepareLogRecord<TStreamId>);
-				var p = (IPrepareLogRecord<TStreamId>)r;
-				Assert.AreEqual(p.RecordType, LogRecordType.Prepare);
-				Assert.AreEqual(p.LogPosition, 0);
-				Assert.AreEqual(p.TransactionPosition, 0xDEAD);
-				Assert.AreEqual(p.TransactionOffset, 0xBEEF);
-				Assert.AreEqual(p.CorrelationId, _correlationId);
-				Assert.AreEqual(p.EventId, _eventId);
-				Assert.AreEqual(p.EventStreamId, streamId);
-				Assert.AreEqual(p.ExpectedVersion, 1234);
-				Assert.That(p.TimeStamp, Is.EqualTo(new DateTime(2012, 12, 21)).Within(7).Milliseconds);
-				Assert.AreEqual(p.Flags, PrepareFlags.SingleWrite);
-				Assert.AreEqual(p.EventType, eventTypeId);
-				Assert.AreEqual(p.Data.Length, 5);
-				Assert.AreEqual(p.Metadata.Length, 2);
-			}
-		}
-
-		[Test]
-		public void the_checksum_is_updated() {
-			Assert.AreEqual(_record.GetSizeWithLengthPrefixAndSuffix(), _writerCheckpoint.Read());
-		}
-
-		[Test]
-		public void trying_to_read_past_writer_checksum_returns_false() {
-			var reader = new TFChunkReader(_db, _writerCheckpoint);
-			Assert.IsFalse(reader.TryReadAt(_writerCheckpoint.Read(), couldBeScavenged: true).Success);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/TransactionLog/with_tfchunk_enumerator.cs b/src/EventStore.Core.Tests/TransactionLog/with_tfchunk_enumerator.cs
deleted file mode 100644
index ada2809906d..00000000000
--- a/src/EventStore.Core.Tests/TransactionLog/with_tfchunk_enumerator.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests.TransactionLog {
-	[TestFixture]
-	public class with_tfchunk_enumerator : SpecificationWithDirectory {
-
-		[Test]
-		public void iterates_chunks_with_correct_callback_order() {
-			File.Create(GetFilePathFor("foo")).Close(); // should be ignored
-			File.Create(GetFilePathFor("bla")).Close(); // should be ignored
-			File.Create(GetFilePathFor("chunk-000001.000000.tmp")).Close(); // should be ignored
-			File.Create(GetFilePathFor("chunk-001.000")).Close(); // should be ignored
-
-			// chunk 0 is missing
-			File.Create(GetFilePathFor("chunk-000001.000000")).Close(); // chunks 1 - 1 (latest)
-			File.Create(GetFilePathFor("chunk-000002.000001")).Close(); // chunks 2 - 2 (latest)
-			// chunks 3 & 4 are missing
-			File.Create(GetFilePathFor("chunk-000005.000000")).Close(); // chunks 5 - 5 (old)
-			File.Create(GetFilePathFor("chunk-000005.000001")).Close(); // chunks 5 - 6 (old)
-			File.Create(GetFilePathFor("chunk-000005.000002")).Close(); // chunks 5 - 7 (latest)
-			File.Create(GetFilePathFor("chunk-000006.000000")).Close(); // chunks 6 - 6 (old)
-			// chunk 7 is not missing - it's merged with chunk 5
-			File.Create(GetFilePathFor("chunk-000008.000007")).Close(); // chunks 8 - 8 (latest)
-			// chunk 9 is missing
-			File.Create(GetFilePathFor("chunk-000010.000005")).Close(); // chunks 10 - 14 (latest)
-			// chunks 15 & 16 are missing
-
-			var strategy = new VersionedPatternFileNamingStrategy(PathName, "chunk-");
-			var chunkEnumerator = new TFChunkEnumerator(strategy);
-			var result = new List<string>();
-			int GetNextFileNumber((string chunk, int chunkNumber, int chunkVersion) t) {
-				return Path.GetFileName(t.chunk) switch {
-					"chunk-000001.000000" => 2,
-					"chunk-000002.000001" => 3,
-					"chunk-000005.000000" => 6,
-					"chunk-000005.000001" => 7,
-					"chunk-000005.000002" => 8,
-					"chunk-000006.000000" => 7,
-					"chunk-000008.000007" => 9,
-					"chunk-000010.000005" => 15,
-					_ => throw new Exception($"Unexpected file: {t.chunk}")
-				};
-			}
-
-			foreach (var chunkInfo in chunkEnumerator.EnumerateChunks(16, GetNextFileNumber)) {
-				switch (chunkInfo) {
-					case LatestVersion(var fileName, var start, var end):
-						result.Add($"latest {Path.GetFileName(fileName)} {start}-{end}");
-						break;
-					case OldVersion(var fileName, var start):
-						result.Add($"old {Path.GetFileName(fileName)} {start}");
-						break;
-					case MissingVersion(var fileName, var start):
-						result.Add($"missing {Path.GetFileName(fileName)} {start}");
-						break;
-					default:
-						throw new ArgumentOutOfRangeException(nameof(chunkInfo));
-				}
-			}
-
-			var expectedResult = new List<string> {
-				"missing chunk-000000.000000 0",
-				"latest chunk-000001.000000 1-1",
-				"latest chunk-000002.000001 2-2",
-				"missing chunk-000003.000000 3",
-				"missing chunk-000004.000000 4",
-				"old chunk-000005.000000 5",
-				"old chunk-000005.000001 5",
-				"latest chunk-000005.000002 5-7",
-				"old chunk-000006.000000 6",
-				"latest chunk-000008.000007 8-8",
-				"missing chunk-000009.000000 9",
-				"latest chunk-000010.000005 10-14",
-				"missing chunk-000015.000000 15",
-				"missing chunk-000016.000000 16"
-			};
-			Assert.AreEqual(expectedResult, result);
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/Transforms/BitFlip/BitFlipChunkReadStream.cs b/src/EventStore.Core.Tests/Transforms/BitFlip/BitFlipChunkReadStream.cs
deleted file mode 100644
index 193858e7b94..00000000000
--- a/src/EventStore.Core.Tests/Transforms/BitFlip/BitFlipChunkReadStream.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.Transforms.BitFlip;
-
-public class BitFlipChunkReadStream(ChunkDataReadStream stream)
-	: ChunkDataReadStream(stream.ChunkFileStream) {
-	public override int Read(byte[] buffer, int offset, int count) {
-		int numRead = base.Read(buffer, offset, count);
-		for (int i = 0; i < count; i++)
-			buffer[i + offset] ^= 0xFF;
-
-		return numRead;
-	}
-}
diff --git a/src/EventStore.Core.Tests/Transforms/BitFlip/BitFlipChunkReadTransform.cs b/src/EventStore.Core.Tests/Transforms/BitFlip/BitFlipChunkReadTransform.cs
deleted file mode 100644
index f3cc7e634f6..00000000000
--- a/src/EventStore.Core.Tests/Transforms/BitFlip/BitFlipChunkReadTransform.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.Transforms.BitFlip;
-
-public class BitFlipChunkReadTransform : IChunkReadTransform {
-	public ChunkDataReadStream TransformData(ChunkDataReadStream dataStream) =>
-		new BitFlipChunkReadStream(dataStream);
-}
diff --git a/src/EventStore.Core.Tests/Transforms/BitFlip/BitFlipChunkTransform.cs b/src/EventStore.Core.Tests/Transforms/BitFlip/BitFlipChunkTransform.cs
deleted file mode 100644
index 382c9c8fc60..00000000000
--- a/src/EventStore.Core.Tests/Transforms/BitFlip/BitFlipChunkTransform.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.Transforms.BitFlip;
-
-public class BitFlipChunkTransform : IChunkTransform {
-	public IChunkReadTransform Read { get; } = new BitFlipChunkReadTransform();
-	public IChunkWriteTransform Write { get; } = new BitFlipChunkWriteTransform();
-}
diff --git a/src/EventStore.Core.Tests/Transforms/BitFlip/BitFlipChunkTransformFactory.cs b/src/EventStore.Core.Tests/Transforms/BitFlip/BitFlipChunkTransformFactory.cs
deleted file mode 100644
index f6c56bd8f61..00000000000
--- a/src/EventStore.Core.Tests/Transforms/BitFlip/BitFlipChunkTransformFactory.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.Transforms.BitFlip;
-
-public class BitFlipChunkTransformFactory : IChunkTransformFactory {
-	public TransformType Type => (TransformType) 0xFF;
-	public int TransformDataPosition(int dataPosition) => dataPosition;
-	public ReadOnlyMemory<byte> CreateTransformHeader() => ReadOnlyMemory<byte>.Empty;
-	public ReadOnlyMemory<byte> ReadTransformHeader(Stream stream) => ReadOnlyMemory<byte>.Empty;
-	public IChunkTransform CreateTransform(ReadOnlyMemory<byte> transformHeader) => new BitFlipChunkTransform();
-}
diff --git a/src/EventStore.Core.Tests/Transforms/BitFlip/BitFlipChunkWriteStream.cs b/src/EventStore.Core.Tests/Transforms/BitFlip/BitFlipChunkWriteStream.cs
deleted file mode 100644
index f1e7dbdaf0c..00000000000
--- a/src/EventStore.Core.Tests/Transforms/BitFlip/BitFlipChunkWriteStream.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.Transforms.BitFlip;
-
-public class BitFlipChunkWriteStream(ChunkDataWriteStream stream) :
-	ChunkDataWriteStream(stream.ChunkFileStream, stream.ChecksumAlgorithm) {
-	public override void Write(byte[] buffer, int offset, int count) {
-		var buf = new byte[count];
-		for (int i = 0; i < count; i++)
-			buf[i] = (byte)(buffer[i + offset] ^ 0xFF);
-		ChunkFileStream.Write(buf, 0, buf.Length);
-		ChecksumAlgorithm.TransformBlock(buf, 0, buf.Length, null, 0);
-	}
-}
diff --git a/src/EventStore.Core.Tests/Transforms/BitFlip/BitFlipChunkWriteTransform.cs b/src/EventStore.Core.Tests/Transforms/BitFlip/BitFlipChunkWriteTransform.cs
deleted file mode 100644
index 0731c2f5203..00000000000
--- a/src/EventStore.Core.Tests/Transforms/BitFlip/BitFlipChunkWriteTransform.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.Transforms.BitFlip;
-
-public class BitFlipChunkWriteTransform : IChunkWriteTransform {
-	private BitFlipChunkWriteStream _transformedStream;
-
-	public ChunkDataWriteStream TransformData(ChunkDataWriteStream dataStream) {
-		_transformedStream = new BitFlipChunkWriteStream(dataStream);
-		return _transformedStream;
-	}
-
-	public void CompleteData(int footerSize, int alignmentSize) {
-		var chunkHeaderAndDataSize = (int)_transformedStream.ChunkFileStream.Position;
-		var alignedSize = GetAlignedSize(chunkHeaderAndDataSize + footerSize, alignmentSize);
-		var paddingSize = alignedSize - chunkHeaderAndDataSize - footerSize;
-		if (paddingSize > 0) {
-			var padding = new byte[paddingSize];
-			_transformedStream.ChunkFileStream.Write(padding);
-			_transformedStream.ChecksumAlgorithm.TransformBlock(padding, 0, padding.Length, null, 0);
-		}
-	}
-
-	public void WriteFooter(ReadOnlySpan<byte> footer, out int fileSize) {
-		_transformedStream.ChunkFileStream.Write(footer);
-		fileSize = (int)_transformedStream.ChunkFileStream.Length;
-	}
-
-	private static int GetAlignedSize(int size, int alignmentSize) {
-		if (size % alignmentSize == 0) return size;
-		return (size / alignmentSize + 1) * alignmentSize;
-	}
-}
diff --git a/src/EventStore.Core.Tests/Transforms/BitFlip/BitFlipDbTransform.cs b/src/EventStore.Core.Tests/Transforms/BitFlip/BitFlipDbTransform.cs
deleted file mode 100644
index aa0d90b9240..00000000000
--- a/src/EventStore.Core.Tests/Transforms/BitFlip/BitFlipDbTransform.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.Transforms.BitFlip;
-
-public class BitFlipDbTransform : IDbTransform {
-	public string Name => "bitflip";
-	public TransformType Type => (TransformType) 0xFF;
-	public IChunkTransformFactory ChunkFactory { get; } = new BitFlipChunkTransformFactory();
-}
diff --git a/src/EventStore.Core.Tests/Transforms/ByteDup/ByteDupChunkReadStream.cs b/src/EventStore.Core.Tests/Transforms/ByteDup/ByteDupChunkReadStream.cs
deleted file mode 100644
index 755a9519b3f..00000000000
--- a/src/EventStore.Core.Tests/Transforms/ByteDup/ByteDupChunkReadStream.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.Transforms.ByteDup;
-
-public class ByteDupChunkReadStream(ChunkDataReadStream stream)
-	: ChunkDataReadStream(stream.ChunkFileStream) {
-	private const int HeaderSize = 128;
-
-	public override int Read(byte[] buffer, int offset, int count) {
-		var buf = new byte[count * 2];
-		int numRead = base.Read(buf, 0, buf.Length);
-		for (int i = 0; i < count; i++)
-			buffer[i + offset] = buf[i * 2];
-
-		return numRead / 2;
-	}
-
-	public override long Seek(long offset, SeekOrigin origin) {
-		if (origin != SeekOrigin.Begin)
-			throw new NotSupportedException();
-
-		Position = offset;
-		return offset;
-	}
-
-	public override long Position {
-		get => HeaderSize + (base.Position - HeaderSize) / 2L;
-		set => base.Position = HeaderSize + (value - HeaderSize) * 2L;
-	}
-}
diff --git a/src/EventStore.Core.Tests/Transforms/ByteDup/ByteDupChunkReadTransform.cs b/src/EventStore.Core.Tests/Transforms/ByteDup/ByteDupChunkReadTransform.cs
deleted file mode 100644
index b6047cffbc8..00000000000
--- a/src/EventStore.Core.Tests/Transforms/ByteDup/ByteDupChunkReadTransform.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.Transforms.ByteDup;
-public class ByteDupChunkReadTransform : IChunkReadTransform {
-	public ChunkDataReadStream TransformData(ChunkDataReadStream dataStream) =>
-		new ByteDupChunkReadStream(dataStream);
-}
diff --git a/src/EventStore.Core.Tests/Transforms/ByteDup/ByteDupChunkTransform.cs b/src/EventStore.Core.Tests/Transforms/ByteDup/ByteDupChunkTransform.cs
deleted file mode 100644
index 80c988b348a..00000000000
--- a/src/EventStore.Core.Tests/Transforms/ByteDup/ByteDupChunkTransform.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.Transforms.ByteDup;
-public class ByteDupChunkTransform : IChunkTransform {
-	public IChunkReadTransform Read { get; } = new ByteDupChunkReadTransform();
-	public IChunkWriteTransform Write { get; } = new ByteDupChunkWriteTransform();
-}
diff --git a/src/EventStore.Core.Tests/Transforms/ByteDup/ByteDupChunkTransformFactory.cs b/src/EventStore.Core.Tests/Transforms/ByteDup/ByteDupChunkTransformFactory.cs
deleted file mode 100644
index e47f05cee91..00000000000
--- a/src/EventStore.Core.Tests/Transforms/ByteDup/ByteDupChunkTransformFactory.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.Transforms.ByteDup;
-public class ByteDupChunkTransformFactory : IChunkTransformFactory {
-	public TransformType Type => (TransformType) 0xFE;
-	public int TransformDataPosition(int dataPosition) => dataPosition * 2;
-	public ReadOnlyMemory<byte> CreateTransformHeader() => ReadOnlyMemory<byte>.Empty;
-	public ReadOnlyMemory<byte> ReadTransformHeader(Stream stream) => ReadOnlyMemory<byte>.Empty;
-	public IChunkTransform CreateTransform(ReadOnlyMemory<byte> transformHeader) => new ByteDupChunkTransform();
-}
diff --git a/src/EventStore.Core.Tests/Transforms/ByteDup/ByteDupChunkWriteStream.cs b/src/EventStore.Core.Tests/Transforms/ByteDup/ByteDupChunkWriteStream.cs
deleted file mode 100644
index da3a9dcb8b5..00000000000
--- a/src/EventStore.Core.Tests/Transforms/ByteDup/ByteDupChunkWriteStream.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.Transforms.ByteDup;
-public class ByteDupChunkWriteStream(ChunkDataWriteStream stream) :
-	ChunkDataWriteStream(stream.ChunkFileStream, stream.ChecksumAlgorithm) {
-	private const int HeaderSize = 128;
-	public override void Write(byte[] buffer, int offset, int count) {
-		var buf = new byte[count * 2];
-		for (int i = 0; i < count; i++)
-			buf[i * 2] = buf[i * 2 + 1] = buffer[i + offset];
-
-		ChunkFileStream.Write(buf, 0, buf.Length);
-		ChecksumAlgorithm.TransformBlock(buf, 0, buf.Length, null, 0);
-	}
-
-	private static long TransformPosition(long position) => HeaderSize + (position - HeaderSize) * 2L;
-	private static long UntransformPosition(long position) => HeaderSize + (position - HeaderSize) / 2L;
-	public override long Position {
-		get => UntransformPosition(base.Position);
-		set => base.Position = TransformPosition(value);
-	}
-
-	public override void SetLength(long value) => ChunkFileStream.SetLength(TransformPosition(value));
-	public override long Length => UntransformPosition(ChunkFileStream.Length);
-}
diff --git a/src/EventStore.Core.Tests/Transforms/ByteDup/ByteDupChunkWriteTransform.cs b/src/EventStore.Core.Tests/Transforms/ByteDup/ByteDupChunkWriteTransform.cs
deleted file mode 100644
index 671ac3cbab9..00000000000
--- a/src/EventStore.Core.Tests/Transforms/ByteDup/ByteDupChunkWriteTransform.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.Transforms.ByteDup;
-public class ByteDupChunkWriteTransform : IChunkWriteTransform {
-	private ByteDupChunkWriteStream _transformedStream;
-
-	public ChunkDataWriteStream TransformData(ChunkDataWriteStream dataStream) {
-		_transformedStream = new ByteDupChunkWriteStream(dataStream);
-		return _transformedStream;
-	}
-
-	public void CompleteData(int footerSize, int alignmentSize) {
-		var chunkHeaderAndDataSize = (int)_transformedStream.ChunkFileStream.Position;
-		var alignedSize = GetAlignedSize(chunkHeaderAndDataSize + footerSize, alignmentSize);
-		var paddingSize = alignedSize - chunkHeaderAndDataSize - footerSize;
-		if (paddingSize > 0) {
-			var padding = new byte[paddingSize];
-			_transformedStream.ChunkFileStream.Write(padding);
-			_transformedStream.ChecksumAlgorithm.TransformBlock(padding, 0, padding.Length, null, 0);
-		}
-	}
-
-	public void WriteFooter(ReadOnlySpan<byte> footer, out int fileSize) {
-		_transformedStream.ChunkFileStream.Write(footer);
-		fileSize = (int)_transformedStream.ChunkFileStream.Length;
-	}
-
-	private static int GetAlignedSize(int size, int alignmentSize) {
-		if (size % alignmentSize == 0) return size;
-		return (size / alignmentSize + 1) * alignmentSize;
-	}
-}
diff --git a/src/EventStore.Core.Tests/Transforms/ByteDup/ByteDupDbTransform.cs b/src/EventStore.Core.Tests/Transforms/ByteDup/ByteDupDbTransform.cs
deleted file mode 100644
index eb1648ee6f7..00000000000
--- a/src/EventStore.Core.Tests/Transforms/ByteDup/ByteDupDbTransform.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.Transforms.ByteDup;
-public class ByteDupDbTransform : IDbTransform {
-	public string Name => "bytedup";
-	public TransformType Type => (TransformType) 0xFE;
-	public IChunkTransformFactory ChunkFactory { get; } = new ByteDupChunkTransformFactory();
-}
diff --git a/src/EventStore.Core.Tests/Transforms/WithHeader/WithHeaderChunkReadStream.cs b/src/EventStore.Core.Tests/Transforms/WithHeader/WithHeaderChunkReadStream.cs
deleted file mode 100644
index c3384f07917..00000000000
--- a/src/EventStore.Core.Tests/Transforms/WithHeader/WithHeaderChunkReadStream.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.Transforms.WithHeader;
-
-public class WithHeaderChunkReadStream(ChunkDataReadStream stream, int transformHeaderSize)
-	: ChunkDataReadStream(stream.ChunkFileStream) {
-
-	public override long Seek(long offset, SeekOrigin origin)
-	{
-		if (origin != SeekOrigin.Begin)
-			throw new NotSupportedException();
-		Position = offset;
-		return offset;
-	}
-
-	public override long Position {
-		get => ChunkFileStream.Position - transformHeaderSize;
-		set => ChunkFileStream.Position = value + transformHeaderSize;
-	}
-}
diff --git a/src/EventStore.Core.Tests/Transforms/WithHeader/WithHeaderChunkReadTransform.cs b/src/EventStore.Core.Tests/Transforms/WithHeader/WithHeaderChunkReadTransform.cs
deleted file mode 100644
index ad6cae9b878..00000000000
--- a/src/EventStore.Core.Tests/Transforms/WithHeader/WithHeaderChunkReadTransform.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.Transforms.WithHeader;
-public class WithHeaderChunkReadTransform(int transformHeaderSize) : IChunkReadTransform {
-	public ChunkDataReadStream TransformData(ChunkDataReadStream dataStream) =>
-		new WithHeaderChunkReadStream(dataStream, transformHeaderSize);
-}
diff --git a/src/EventStore.Core.Tests/Transforms/WithHeader/WithHeaderChunkTransform.cs b/src/EventStore.Core.Tests/Transforms/WithHeader/WithHeaderChunkTransform.cs
deleted file mode 100644
index d6ca34b63fb..00000000000
--- a/src/EventStore.Core.Tests/Transforms/WithHeader/WithHeaderChunkTransform.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.Transforms.WithHeader;
-public class WithHeaderChunkTransform(int transformHeaderSize) : IChunkTransform {
-	public IChunkReadTransform Read { get; } = new WithHeaderChunkReadTransform(transformHeaderSize);
-	public IChunkWriteTransform Write { get; } = new WithHeaderChunkWriteTransform(transformHeaderSize);
-}
diff --git a/src/EventStore.Core.Tests/Transforms/WithHeader/WithHeaderChunkTransformFactory.cs b/src/EventStore.Core.Tests/Transforms/WithHeader/WithHeaderChunkTransformFactory.cs
deleted file mode 100644
index f9f7539921c..00000000000
--- a/src/EventStore.Core.Tests/Transforms/WithHeader/WithHeaderChunkTransformFactory.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.IO;
-using System.Security.Cryptography;
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.Transforms.WithHeader;
-public class WithHeaderChunkTransformFactory : IChunkTransformFactory {
-	private const int TransformHeaderSize = 133;
-	private readonly byte[] _header;
-
-	public TransformType Type => (TransformType) 0xFD;
-	public int TransformDataPosition(int dataPosition) => TransformHeaderSize + dataPosition;
-
-	public WithHeaderChunkTransformFactory() {
-		_header = new byte[TransformHeaderSize];
-		RandomNumberGenerator.Fill(_header);
-	}
-
-	public ReadOnlyMemory<byte> CreateTransformHeader() => _header;
-
-	public ReadOnlyMemory<byte> ReadTransformHeader(Stream stream) {
-		var buffer = new byte[TransformHeaderSize];
-		stream.ReadExactly(buffer);
-		return buffer.AsMemory();
-	}
-
-	public IChunkTransform CreateTransform(ReadOnlyMemory<byte> transformHeader) =>
-		new WithHeaderChunkTransform(transformHeader.Length);
-}
diff --git a/src/EventStore.Core.Tests/Transforms/WithHeader/WithHeaderChunkWriteStream.cs b/src/EventStore.Core.Tests/Transforms/WithHeader/WithHeaderChunkWriteStream.cs
deleted file mode 100644
index f145e8d3d2e..00000000000
--- a/src/EventStore.Core.Tests/Transforms/WithHeader/WithHeaderChunkWriteStream.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.Transforms.WithHeader;
-
-public class WithHeaderChunkWriteStream(ChunkDataWriteStream stream, int transformHeaderSize) :
-	ChunkDataWriteStream(stream.ChunkFileStream, stream.ChecksumAlgorithm) {
-	public override long Position {
-		get => ChunkFileStream.Position - transformHeaderSize;
-		set => ChunkFileStream.Position = value + transformHeaderSize;
-	}
-
-	public override void SetLength(long value) => ChunkFileStream.SetLength(value + transformHeaderSize);
-	public override long Length => ChunkFileStream.Length + transformHeaderSize;
-}
diff --git a/src/EventStore.Core.Tests/Transforms/WithHeader/WithHeaderChunkWriteTransform.cs b/src/EventStore.Core.Tests/Transforms/WithHeader/WithHeaderChunkWriteTransform.cs
deleted file mode 100644
index cfbfe273714..00000000000
--- a/src/EventStore.Core.Tests/Transforms/WithHeader/WithHeaderChunkWriteTransform.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.Transforms.WithHeader;
-public class WithHeaderChunkWriteTransform(int transformHeaderSize) : IChunkWriteTransform {
-	private ChunkDataWriteStream _transformedStream;
-
-	public ChunkDataWriteStream TransformData(ChunkDataWriteStream stream) {
-		_transformedStream = new WithHeaderChunkWriteStream(stream, transformHeaderSize);
-		return _transformedStream;
-	}
-
-	public void CompleteData(int footerSize, int alignmentSize) {
-		var chunkHeaderAndDataSize = (int)_transformedStream.ChunkFileStream.Position;
-		var alignedSize = GetAlignedSize(chunkHeaderAndDataSize + footerSize, alignmentSize);
-		var paddingSize = alignedSize - chunkHeaderAndDataSize - footerSize;
-		if (paddingSize > 0) {
-			var padding = new byte[paddingSize];
-			_transformedStream.ChunkFileStream.Write(padding);
-			_transformedStream.ChecksumAlgorithm.TransformBlock(padding, 0, padding.Length, null, 0);
-		}
-	}
-
-	public void WriteFooter(ReadOnlySpan<byte> footer, out int fileSize) {
-		_transformedStream.ChunkFileStream.Write(footer);
-		fileSize = (int)_transformedStream.ChunkFileStream.Length;
-	}
-
-	private static int GetAlignedSize(int size, int alignmentSize) {
-		if (size % alignmentSize == 0) return size;
-		return (size / alignmentSize + 1) * alignmentSize;
-	}
-}
diff --git a/src/EventStore.Core.Tests/Transforms/WithHeader/WithHeaderDbTransform.cs b/src/EventStore.Core.Tests/Transforms/WithHeader/WithHeaderDbTransform.cs
deleted file mode 100644
index 8b20fe39335..00000000000
--- a/src/EventStore.Core.Tests/Transforms/WithHeader/WithHeaderDbTransform.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Tests.Transforms.WithHeader;
-public class WithHeaderDbTransform : IDbTransform {
-	public string Name => "withheader";
-	public TransformType Type => (TransformType) 0xFD;
-	public IChunkTransformFactory ChunkFactory { get; } = new WithHeaderChunkTransformFactory();
-}
diff --git a/src/EventStore.Core.Tests/VerifyIntPtrSize.cs b/src/EventStore.Core.Tests/VerifyIntPtrSize.cs
deleted file mode 100644
index 43c1a7b103a..00000000000
--- a/src/EventStore.Core.Tests/VerifyIntPtrSize.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests {
-	[TestFixture]
-	public class VerifyIntPtrSize {
-		[Test]
-		public void TestIntPtrSize() {
-			Assert.AreEqual(8, IntPtr.Size);
-		}
-	}
-
-	public static class WebHostBuilderExtensions {
-		public static IWebHostBuilder UseStartup(this IWebHostBuilder builder, IStartup startup)
-			=> builder
-				.ConfigureServices(services => services.AddSingleton(startup));
-	}
-}
diff --git a/src/EventStore.Core.Tests/copying_metadata.cs b/src/EventStore.Core.Tests/copying_metadata.cs
deleted file mode 100644
index 24dfb8b853a..00000000000
--- a/src/EventStore.Core.Tests/copying_metadata.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using EventStore.ClientAPI;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests {
-	[TestFixture]
-	public class copying_metadata {
-		[Test]
-		public void copies_empty_metadata() {
-			var empty = StreamMetadata.Build().Build();
-			var copied = empty.Copy().Build();
-			Assert.AreEqual(empty.AsJsonString(), copied.AsJsonString());
-		}
-
-		[Test]
-		public void copies_all_values() {
-			var source = StreamMetadata.Build()
-				.SetCacheControl(TimeSpan.FromDays(1))
-				.SetCustomProperty("Test", "Value")
-				.SetReadRole("foo")
-				.SetWriteRole("bar")
-				.SetDeleteRole("baz")
-				.SetMetadataReadRole("qux")
-				.SetMetadataWriteRole("quux")
-				.SetMaxAge(TimeSpan.FromHours(1))
-				.SetMaxCount(2)
-				.SetTruncateBefore(4)
-				.Build();
-			var copied = source.Copy().Build();
-			Assert.AreEqual(source.AsJsonString(), copied.AsJsonString());
-		}
-
-		[Test]
-		public void can_mutate_copy() {
-			var source = StreamMetadata.Build()
-				.SetCacheControl(TimeSpan.FromDays(1))
-				.SetCustomProperty("Test", "Value")
-				.SetReadRole("foo")
-				.SetWriteRole("bar")
-				.SetDeleteRole("baz")
-				.SetMetadataReadRole("qux")
-				.SetMetadataWriteRole("quux")
-				.SetMaxAge(TimeSpan.FromHours(1))
-				.SetMaxCount(2)
-				.SetTruncateBefore(4)
-				.Build();
-
-			var expected = StreamMetadata.Build()
-				.SetCacheControl(TimeSpan.FromDays(1))
-				.SetCustomProperty("Test", "Value")
-				.SetCustomProperty("Test2", "Value2")
-				.SetReadRole("foo")
-				.SetWriteRole("bar")
-				.SetDeleteRole("baz")
-				.SetMetadataReadRole("qux")
-				.SetMetadataWriteRole("quux")
-				.SetMaxAge(TimeSpan.FromHours(1))
-				.SetMaxCount(4)
-				.SetTruncateBefore(4)
-				.Build();
-
-
-			var copied = source.Copy()
-				.SetMaxCount(4)
-				.SetCustomProperty("Test2", "Value2")
-				.Build();
-
-			Assert.AreEqual(expected.AsJsonString(), copied.AsJsonString());
-		}
-	}
-}
diff --git a/src/EventStore.Core.Tests/mono_filestream_bug.cs b/src/EventStore.Core.Tests/mono_filestream_bug.cs
deleted file mode 100644
index d65805ac04c..00000000000
--- a/src/EventStore.Core.Tests/mono_filestream_bug.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.IO;
-using NUnit.Framework;
-
-namespace EventStore.Core.Tests {
-	[TestFixture]
-	public class mono_uritemplate_bug {
-		[Test]
-		public void when_validating_a_uri_template_with_url_encoded_chars() {
-			var template = new UriTemplate("/streams/$all?embed={embed}");
-			var uri = new Uri("http://127.0.0.1/streams/$all");
-			var baseaddress = new Uri("http://127.0.0.1");
-			Assert.IsTrue(template.Match(baseaddress, uri) != null);
-		}
-	}
-
-
-	[TestFixture, Ignore("Known bug in Mono, waiting for fix.")]
-	public class mono_filestream_bug {
-		[Test]
-		public void show_time() {
-			const int pos = 1;
-			const int bufferSize = 128;
-
-			var filename = Path.GetTempFileName();
-			File.WriteAllBytes(filename, new byte[pos + 1]); // init file with zeros
-
-			var bytes = new byte[bufferSize + 1 /* THIS IS WHAT MAKES A BIG DIFFERENCE */];
-			new Random().NextBytes(bytes);
-
-			using (var file = new FileStream(filename, FileMode.Open, FileAccess.ReadWrite, FileShare.Read,
-				bufferSize, FileOptions.SequentialScan)) {
-				file.Read(new byte[pos], 0, pos); // THIS READ IS CRITICAL, WITHOUT IT EVERYTHING WORKS
-				Assert.AreEqual(pos,
-					file.Position); // !!! here it says position is correct, but writes at different position !!!
-				// file.Position = pos; // !!! this fixes test !!!
-				file.Write(bytes, 0, bytes.Length);
-
-				//Assert.AreEqual(pos + bytes.Length, file.Length); -- fails
-			}
-
-			using (var filestream = File.Open(filename, FileMode.Open, FileAccess.Read)) {
-				var bb = new byte[bytes.Length];
-				filestream.Position = pos;
-				filestream.Read(bb, 0, bb.Length);
-				Assert.AreEqual(bytes, bb);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/AssertEx.cs b/src/EventStore.Core.XUnit.Tests/AssertEx.cs
deleted file mode 100644
index a440a1471f9..00000000000
--- a/src/EventStore.Core.XUnit.Tests/AssertEx.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests;
-
-public static class AssertEx {
-	public static void IsOrBecomesTrue(
-		Func<bool> func,
-		TimeSpan? timeout = null,
-		string msg = "AssertEx.IsOrBecomesTrue() timed out",
-		[CallerMemberName] string memberName = "",
-		[CallerFilePath] string sourceFilePath = "",
-		[CallerLineNumber] int sourceLineNumber = 0) {
-
-		Assert.True(
-			SpinWait.SpinUntil(func, timeout ?? TimeSpan.FromMilliseconds(1000)),
-			$"{msg} in {memberName} {sourceFilePath}:{sourceLineNumber}");
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/ClusterVNodeOptionsScenarios.cs b/src/EventStore.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/ClusterVNodeOptionsScenarios.cs
deleted file mode 100644
index f3ac8cd44a0..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/ClusterVNodeOptionsScenarios.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading.Tasks;
-using EventStore.Core.Authentication;
-using EventStore.Core.Authentication.InternalAuthentication;
-using EventStore.Core.Authorization;
-using EventStore.Core.Certificates;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Services.Transport.Tcp;
-using NUnit.Framework;
-
-namespace EventStore.Core.XUnit.Tests.Configuration.ClusterNodeOptionsTests {
-	[TestFixture]
-	public abstract class SingleNodeScenario<TLogFormat, TStreamId> {
-		protected ClusterVNode _node;
-		protected ClusterVNodeOptions _options;
-		private ILogFormatAbstractorFactory<TStreamId> _logFormatFactory;
-		private readonly bool _disableMemoryOptimization;
-
-		public SingleNodeScenario (bool disableMemoryOptimization=false) {
-			_disableMemoryOptimization = disableMemoryOptimization;
-		}
-
-		[OneTimeSetUp]
-		public virtual void TestFixtureSetUp() {
-			_logFormatFactory = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory;
-
-			var options = _disableMemoryOptimization
-				? new ClusterVNodeOptions()
-				: new ClusterVNodeOptions().ReduceMemoryUsageForTests();
-
-			_options = WithOptions(options
-				.RunInMemory()
-				.Secure(new X509Certificate2Collection(ssl_connections.GetRootCertificate()),
-					ssl_connections.GetServerCertificate()));
-			_node = new ClusterVNode<TStreamId>(_options, _logFormatFactory,
-				new AuthenticationProviderFactory(c =>
-					new InternalAuthenticationProviderFactory(c, _options.DefaultUser)),
-				new AuthorizationProviderFactory(c => new InternalAuthorizationProviderFactory([
-				new LegacyPolicySelectorFactory(
-					_options.Application.AllowAnonymousEndpointAccess,
-					_options.Application.AllowAnonymousStreamAccess,
-					_options.Application.OverrideAnonymousEndpointAccessForGossip).Create(c.MainQueue, c.MainBus)])),
-				certificateProvider: new OptionsCertificateProvider());
-			_node.Start();
-		}
-
-		[OneTimeTearDown]
-		public virtual Task TestFixtureTearDown() => _node?.StopAsync() ?? Task.CompletedTask;
-
-		protected abstract ClusterVNodeOptions WithOptions(ClusterVNodeOptions options);
-
-	}
-
-	[TestFixture, Category("LongRunning")]
-	public abstract class ClusterMemberScenario<TLogFormat, TStreamId> {
-		protected ClusterVNode _node;
-		protected int _clusterSize = 3;
-		protected int _quorumSize;
-		protected ClusterVNodeOptions _options;
-		protected ILogFormatAbstractorFactory<TStreamId> _logFormatFactory;
-
-		[OneTimeSetUp]
-		public virtual void TestFixtureSetUp() {
-			_logFormatFactory = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory;
-			_quorumSize = _clusterSize / 2 + 1;
-
-			_options = WithOptions(new ClusterVNodeOptions()
-				.ReduceMemoryUsageForTests()
-				.InCluster(_clusterSize)
-				.RunInMemory()
-				.Secure(new X509Certificate2Collection(ssl_connections.GetRootCertificate()),
-					ssl_connections.GetServerCertificate()));
-			_node = new ClusterVNode<TStreamId>(_options, _logFormatFactory,
-				new AuthenticationProviderFactory(_ =>
-					new InternalAuthenticationProviderFactory(_, _options.DefaultUser)),
-				new AuthorizationProviderFactory(c => new InternalAuthorizationProviderFactory([
-					new LegacyPolicySelectorFactory(
-							_options.Application.AllowAnonymousEndpointAccess,
-							_options.Application.AllowAnonymousStreamAccess,
-							_options.Application.OverrideAnonymousEndpointAccessForGossip).Create(c.MainQueue, c.MainBus)])),
-				certificateProvider: new OptionsCertificateProvider());
-			_node.Start();
-		}
-
-		[OneTimeTearDown]
-		public virtual Task TestFixtureTearDown() => _node?.StopAsync() ?? Task.CompletedTask;
-
-		protected abstract ClusterVNodeOptions WithOptions(ClusterVNodeOptions options);
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_cluster_node_and_custom_settings.cs b/src/EventStore.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_cluster_node_and_custom_settings.cs
deleted file mode 100644
index 094eafe9b51..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_cluster_node_and_custom_settings.cs
+++ /dev/null
@@ -1,272 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Net;
-using EventStore.Common.Utils;
-using EventStore.Core.Certificates;
-using EventStore.Core.Configuration.Sources;
-using EventStore.Core.Services;
-using EventStore.Core.Tests;
-using Microsoft.Extensions.Configuration;
-using NUnit.Framework;
-
-namespace EventStore.Core.XUnit.Tests.Configuration.ClusterNodeOptionsTests.when_building {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_cluster_dns_name<TLogFormat, TStreamId> : ClusterMemberScenario<TLogFormat, TStreamId> {
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) =>
-			options with {
-				Cluster = options.Cluster with {
-					ClusterDns = "ClusterDns"
-				}
-			};
-
-		[Test]
-		public void should_set_discover_via_dns_to_true() {
-			Assert.IsTrue(_options.Cluster.DiscoverViaDns);
-		}
-
-		[Test]
-		public void should_set_cluster_dns_name() {
-			Assert.AreEqual("ClusterDns", _options.Cluster.ClusterDns);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_dns_discovery_disabled_and_no_gossip_seeds<TLogFormat, TStreamId> {
-		private Exception _caughtException;
-		protected ClusterVNodeOptions _options;
-
-		[OneTimeSetUp]
-		public void TestFixtureSetUp() {
-			_options = new ClusterVNodeOptions {
-					Cluster = new() {
-						DiscoverViaDns = false
-					}
-				}
-				.ReduceMemoryUsageForTests()
-				.RunInMemory();
-			try {
-				_ = new ClusterVNode<TStreamId>(_options, LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory,
-					certificateProvider: new OptionsCertificateProvider());
-			} catch (Exception e) {
-				_caughtException = e;
-			}
-		}
-
-		[Test]
-		public void should_throw_an_exception() {
-			Assert.IsNotNull(_caughtException);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_dns_discovery_disabled_and_gossip_seeds_defined<TLogFormat, TStreamId> : ClusterMemberScenario<TLogFormat, TStreamId> {
-		private EndPoint[] _gossipSeeds = {
-			new DnsEndPoint("127.0.1.10", 1111),
-			new DnsEndPoint("127.0.1.10", 1112),
-		};
-
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) =>
-			options.WithGossipSeeds(_gossipSeeds);
-
-		[Test]
-		public void should_set_discover_via_dns_to_false() {
-			Assert.IsFalse(_options.Cluster.DiscoverViaDns);
-		}
-
-		[Test]
-		public void should_set_the_gossip_seeds() {
-			CollectionAssert.AreEqual(_gossipSeeds, _options.Cluster.GossipSeed);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_custom_gossip_seeds<TLogFormat, TStreamId> : ClusterMemberScenario<TLogFormat, TStreamId> {
-		private readonly DnsEndPoint[] _gossipSeeds = { new("127.0.1.15", 2112), new("127.0.1.15", 3112) };
-
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) =>
-			options.WithGossipSeeds(_gossipSeeds);
-
-		[Test]
-		public void should_turn_off_discovery_by_dns() {
-			Assert.IsFalse(_options.Cluster.DiscoverViaDns);
-		}
-
-		[Test]
-		public void should_set_the_gossip_seeds() {
-			CollectionAssert.AreEqual(_gossipSeeds, _options.Cluster.GossipSeed);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_custom_external_ip_address_as_advertise_info<TLogFormat, TStreamId> : ClusterMemberScenario<TLogFormat, TStreamId> {
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) {
-			return options
-				.Insecure()
-				.WithExternalTcpOn(new IPEndPoint(IPAddress.Loopback, 11130))
-				.WithInternalTcpOn(new IPEndPoint(IPAddress.Loopback, 11120))
-				.AdvertiseExternalHostAs(new DnsEndPoint("196.168.1.1", 11131))
-				.AdvertiseHttpHostAs(new DnsEndPoint("196.168.1.1", 21130));
-		}
-
-		[Test]
-		public void should_set_the_custom_advertise_info_for_external() {
-			Assert.AreEqual(new DnsEndPoint("196.168.1.1", 21130),
-				_node.GossipAdvertiseInfo.HttpEndPoint);
-		}
-
-		[Test]
-		public void should_set_the_loopback_address_as_advertise_info_for_internal() {
-			Assert.AreEqual(new DnsEndPoint(IPAddress.Loopback.ToString(), 11120), _node.GossipAdvertiseInfo.InternalTcp);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_0_0_0_0_as_external_ip_address_and_custom_advertise_info<TLogFormat, TStreamId> : ClusterMemberScenario<TLogFormat, TStreamId> {
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) {
-			return options
-				.Insecure()
-				.WithInternalTcpOn(new IPEndPoint(IPAddress.Any, 11120))
-				.WithExternalTcpOn(new IPEndPoint(IPAddress.Any, 11130))
-				.AdvertiseExternalHostAs(new DnsEndPoint("10.0.0.1", 11131));
-		}
-
-		[Test]
-		public void should_set_the_custom_advertise_info_for_external() {
-			Assert.AreEqual(new DnsEndPoint("10.0.0.1", 2113),
-				_node.GossipAdvertiseInfo.HttpEndPoint);
-		}
-
-		[Test]
-		public void should_set_the_non_loopback_address_as_advertise_info_for_internal() {
-			Assert.AreEqual(new DnsEndPoint(IPFinder.GetNonLoopbackAddress().ToString(), 11120),
-				_node.GossipAdvertiseInfo.InternalTcp);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_0_0_0_0_as_external_ip_address_with_no_explicit_advertise_info_set<TLogFormat, TStreamId> : ClusterMemberScenario<TLogFormat, TStreamId> {
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) {
-			return options
-				.Insecure()
-				.WithHttpOn(new IPEndPoint(IPAddress.Any, 21130))
-				.WithExternalTcpOn(new IPEndPoint(IPAddress.Any, 11130))
-				.WithInternalTcpOn(new IPEndPoint(IPAddress.Loopback, 11120));
-		}
-
-		[Test]
-		public void should_use_the_non_default_loopback_ip_as_advertise_info_for_external() {
-			Assert.AreEqual(new DnsEndPoint(IPFinder.GetNonLoopbackAddress().ToString(), 21130),
-				_node.GossipAdvertiseInfo.HttpEndPoint);
-		}
-
-		[Test]
-		public void should_use_loopback_ip_as_advertise_info_for_internal() {
-			Assert.AreEqual(new DnsEndPoint(IPAddress.Loopback.ToString(), 11120), _node.GossipAdvertiseInfo.InternalTcp);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		with_0_0_0_0_for_internal_and_external_ips_with_advertise_info_set_for_external<TLogFormat, TStreamId> : ClusterMemberScenario<TLogFormat, TStreamId> {
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) {
-			return options
-				.Insecure()
-				.WithHttpOn(new IPEndPoint(IPAddress.Loopback, 21130))
-				.WithExternalTcpOn(new IPEndPoint(IPAddress.Loopback, 11130))
-				.WithInternalTcpOn(new IPEndPoint(IPAddress.Any, 11120))
-				.AdvertiseExternalHostAs(new DnsEndPoint("10.0.0.1", 11131))
-				.AdvertiseHttpHostAs(new DnsEndPoint("10.0.0.1", 21131));
-		}
-
-		[Test]
-		public void should_set_the_custom_advertise_info_for_external() {
-			Assert.AreEqual(new DnsEndPoint("10.0.0.1", 21131),
-				_node.GossipAdvertiseInfo.HttpEndPoint);
-		}
-
-		[Test]
-		public void should_use_the_non_default_loopback_ip_as_advertise_info_for_internal() {
-			Assert.AreEqual(new DnsEndPoint(IPFinder.GetNonLoopbackAddress().ToString(), 11120),
-				_node.GossipAdvertiseInfo.InternalTcp);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_cluster_custom_password_for_admin_and_ops_user<TLogFormat, TStreamId> : ClusterMemberScenario<TLogFormat, TStreamId> {
-		private const string _adminPassword = "Admin";
-		private const string _opsPassword = "Ops";
-
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) =>
-			options with {
-				DefaultUser = new ClusterVNodeOptions.DefaultUserOptions { DefaultAdminPassword = _adminPassword, DefaultOpsPassword = _opsPassword }
-			};
-
-		[Test]
-		public void should_set_the_custom_admin_and_ops_user_password() {
-			Assert.AreEqual(_adminPassword, _options.DefaultUser.DefaultAdminPassword);
-			Assert.AreEqual(_opsPassword, _options.DefaultUser.DefaultOpsPassword);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_cluster_custom_settings_check_for_environment_only_options<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat,
-			TStreamId> {
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) =>
-			options with {
-			};
-
-		private IConfigurationRoot _configurationRoot;
-
-		[Test]
-		public void should_return_error_when_default_password_options_pass_through_command_line() {
-			var args = new[] {
-				"--DefaultAdminPassword=Admin2023#",
-				"--DefaultOpsPassword=Ops2023#"
-			};
-
-			_configurationRoot = new ConfigurationBuilder()
-				.AddEventStoreDefaultValues(new Dictionary<string, object> {
-					[nameof(ClusterVNodeOptions.DefaultUser.DefaultAdminPassword)] = SystemUsers.DefaultAdminPassword,
-					[nameof(ClusterVNodeOptions.DefaultUser.DefaultOpsPassword)] = SystemUsers.DefaultOpsPassword
-				})
-				.AddEventStoreCommandLine(args)
-				.Build();
-
-			var clusterVNodeOptions = ClusterVNodeOptions.FromConfiguration(_configurationRoot);
-
-			Assert.NotNull(clusterVNodeOptions.CheckForEnvironmentOnlyOptions());
-		}
-
-		[Test]
-		public void should_return_null_when_default_password_options_pass_through_environment_variables() {
-			var args = Array.Empty<string>();
-			IDictionary environmentVariables = new Dictionary<string, string>();
-			environmentVariables.Add("EVENTSTORE_DEFAULT_ADMIN_PASSWORD", "Admin#");
-			environmentVariables.Add("EVENTSTORE_DEFAULT_OPS_PASSWORD", "Ops#");
-
-			_configurationRoot = new ConfigurationBuilder()
-				.AddEventStoreDefaultValues(new Dictionary<string, object> {
-					[nameof(ClusterVNodeOptions.DefaultUser.DefaultAdminPassword)] = SystemUsers.DefaultAdminPassword,
-					[nameof(ClusterVNodeOptions.DefaultUser.DefaultOpsPassword)] = SystemUsers.DefaultOpsPassword
-				})
-				.AddEventStoreCommandLine(args)
-				.AddEventStoreEnvironmentVariables(environmentVariables)
-				.Build();
-
-			var clusterVNodeOptions = ClusterVNodeOptions.FromConfiguration(_configurationRoot);
-
-			Assert.Null(clusterVNodeOptions.CheckForEnvironmentOnlyOptions());
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_default_settings.cs b/src/EventStore.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_default_settings.cs
deleted file mode 100644
index f9010979f03..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_default_settings.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-using System;
-using System.Net;
-using EventStore.Common.Options;
-using EventStore.Common.Utils;
-using EventStore.Core.Authentication.DelegatedAuthentication;
-using EventStore.Core.Services.Monitoring;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.Chunks;
-using NUnit.Framework;
-
-namespace EventStore.Core.XUnit.Tests.Configuration.ClusterNodeOptionsTests.when_building {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_default_node_as_single_node<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat, TStreamId> {
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) {
-			return options;
-		}
-
-		public with_default_node_as_single_node() : base(disableMemoryOptimization: true) {
-		}
-
-		[Test]
-		public void should_create_single_cluster_node() {
-			Assert.IsNotNull(_node);
-			Assert.AreEqual(1, _options.Cluster.ClusterSize, "ClusterNodeCount");
-			Assert.IsInstanceOf<DelegatedAuthenticationProvider>(_node.AuthenticationProvider);
-			Assert.AreEqual(StatsStorage.File, _options.Database.StatsStorage);
-		}
-
-		[Test]
-		public void should_have_default_endpoints() {
-			Assert.AreEqual(new IPEndPoint(IPAddress.Loopback, 1112), _node.NodeInfo.InternalSecureTcp);
-			Assert.AreEqual(new IPEndPoint(IPAddress.Loopback, 2113), _node.NodeInfo.HttpEndPoint);
-		}
-
-		[Test]
-		public void should_use_tls() {
-			Assert.IsFalse(_options.Interface.DisableInternalTcpTls);
-		}
-
-		[Test]
-		public void should_set_command_line_args_to_default_values() {
-			Assert.AreEqual(false, _options.Interface.EnableTrustedAuth, "EnableTrustedAuth");
-			Assert.AreEqual(false, _options.Application.LogHttpRequests, "LogHttpRequests");
-			Assert.AreEqual(0, _options.Application.WorkerThreads, "WorkerThreads");
-			Assert.AreEqual(true, _options.Cluster.DiscoverViaDns, "DiscoverViaDns");
-			Assert.AreEqual(30, _options.Application.StatsPeriodSec, "StatsPeriod");
-			Assert.AreEqual(false, _options.Application.DisableHttpCaching, "DisableHTTPCaching");
-			Assert.AreEqual(false, _options.Database.SkipDbVerify, "VerifyDbHash");
-			Assert.AreEqual(TFConsts.MinFlushDelayMs.TotalMilliseconds, _options.Database.MinFlushDelayMs, "MinFlushDelay");
-			Assert.AreEqual(30, _options.Database.ScavengeHistoryMaxAge,
-				"ScavengeHistoryMaxAge");
-			Assert.AreEqual(false, _options.Database.DisableScavengeMerging,
-				"DisableScavengeMerging");
-			Assert.AreEqual(false, _options.Interface.DisableAdminUi, "AdminOnPublic");
-			Assert.AreEqual(false, _options.Interface.DisableStatsOnHttp, "StatsOnPublic");
-			Assert.AreEqual(false, _options.Interface.DisableGossipOnHttp, "GossipOnPublic");
-			Assert.AreEqual(1_000_000, _options.Database.MaxMemTableSize, "MaxMemtableEntryCount");
-			Assert.AreEqual(false, _options.Projection.RunProjections > ProjectionType.System,
-				"StartStandardProjections");
-			Assert.AreEqual(false, _options.Database.UnsafeIgnoreHardDelete,
-				"UnsafeIgnoreHardDeletes");
-			Assert.That(string.IsNullOrEmpty(_options.Database.Index), "IndexPath");
-			Assert.AreEqual(2000, _options.Database.PrepareTimeoutMs, "PrepareTimeout");
-			Assert.AreEqual(2000, _options.Database.CommitTimeoutMs, "CommitTimeout");
-			Assert.AreEqual(2000, _options.Database.WriteTimeoutMs, "WriteTimeout");
-
-			Assert.AreEqual(700, _options.Interface.ReplicationHeartbeatInterval, "ReplicationHeartbeatInterval");
-
-			Assert.AreEqual(700, _options.Interface.ReplicationHeartbeatTimeout,
-				"ReplicationHeartbeatTimeout");
-
-			Assert.AreEqual(TFConsts.ChunkSize, _node.Db.Config.ChunkSize, "ChunkSize");
-			Assert.AreEqual(TFConsts.ChunksCacheSize, _node.Db.Config.MaxChunksCacheSize, "MaxChunksCacheSize");
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_default_node_as_node_in_a_cluster<TLogFormat, TStreamId> : ClusterMemberScenario<TLogFormat, TStreamId> {
-		[Test]
-		public void should_create_single_cluster_node() {
-			Assert.IsNotNull(_node);
-			Assert.AreEqual(_clusterSize, _options.Cluster.ClusterSize, "ClusterNodeCount");
-			Assert.IsInstanceOf<DelegatedAuthenticationProvider>(_node.AuthenticationProvider);
-			Assert.AreEqual(StatsStorage.File, _options.Database.StatsStorage);
-		}
-
-		[Test]
-		public void should_have_default_secure_endpoints() {
-			var internalTcp = new IPEndPoint(IPAddress.Loopback, 1112);
-			var externalTcp = new IPEndPoint(IPAddress.Loopback, 1113);
-			var httpEndPoint = new IPEndPoint(IPAddress.Loopback, 2113);
-
-			Assert.AreEqual(internalTcp, _node.NodeInfo.InternalSecureTcp);
-			Assert.AreEqual(httpEndPoint, _node.NodeInfo.HttpEndPoint);
-
-			Assert.AreEqual(internalTcp.ToDnsEndPoint(), _node.GossipAdvertiseInfo.InternalSecureTcp);
-			Assert.AreEqual(httpEndPoint.ToDnsEndPoint(), _node.GossipAdvertiseInfo.HttpEndPoint);
-		}
-
-		[Test]
-		public void should_use_tls() {
-			Assert.IsFalse(_options.Interface.DisableInternalTcpTls);
-		}
-
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) {
-			return options;
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_default_node_as_node_in_an_insecure_cluster<TLogFormat, TStreamId> : ClusterMemberScenario<TLogFormat, TStreamId> {
-		[Test]
-		public void should_create_single_cluster_node() {
-			Assert.IsNotNull(_node);
-			Assert.AreEqual(_clusterSize, _options.Cluster.ClusterSize, "ClusterNodeCount");
-			Assert.IsInstanceOf<DelegatedAuthenticationProvider>(_node.AuthenticationProvider);
-			Assert.AreEqual(StatsStorage.File, _options.Database.StatsStorage);
-		}
-
-		[Test]
-		public void should_have_default_endpoints() {
-			var internalTcp = new IPEndPoint(IPAddress.Loopback, 1112);
-			var externalTcp = new IPEndPoint(IPAddress.Loopback, 1113);
-			var httpEndPoint = new IPEndPoint(IPAddress.Loopback, 2113);
-
-			Assert.AreEqual(internalTcp, _node.NodeInfo.InternalTcp);
-			Assert.AreEqual(httpEndPoint, _node.NodeInfo.HttpEndPoint);
-
-			Assert.AreEqual(internalTcp.ToDnsEndPoint(), _node.GossipAdvertiseInfo.InternalTcp);
-			Assert.AreEqual(httpEndPoint.ToDnsEndPoint(), _node.GossipAdvertiseInfo.HttpEndPoint);
-		}
-
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) {
-			return options.Insecure();
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_secure_tcp.cs b/src/EventStore.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_secure_tcp.cs
deleted file mode 100644
index 9a39babee4f..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_secure_tcp.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System;
-using System.IO;
-using System.Net;
-using System.Security.Cryptography.X509Certificates;
-using EventStore.Common.Utils;
-using EventStore.Core.Certificates;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Services.Transport.Tcp;
-using NUnit.Framework;
-
-namespace EventStore.Core.XUnit.Tests.Configuration.ClusterNodeOptionsTests.when_building {
-	[Category("LongRunning")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_ssl_enabled_and_using_a_security_certificate_from_file<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat, TStreamId> {
-		private readonly IPEndPoint _internalSecTcp = new(IPAddress.Parse("127.0.1.15"), 1114);
-		private readonly IPEndPoint _externalSecTcp = new(IPAddress.Parse("127.0.1.15"), 1115);
-
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) {
-
-			return options.WithInternalSecureTcpOn(_internalSecTcp).WithExternalSecureTcpOn(_externalSecTcp) with {
-				CertificateFile = new() {
-					CertificateFile = GetCertificatePath(),
-					CertificatePrivateKeyFile = string.Empty,
-					CertificatePassword = "password"
-				}
-			};
-		}
-
-		[Test]
-		public void should_set_tls_to_enabled() {
-			Assert.IsFalse(_options.Interface.DisableInternalTcpTls);
-		}
-
-		[Test]
-		public void should_set_certificate() {
-			Assert.AreNotEqual("n/a", _options.Certificate == null ? "n/a" : _options.Certificate.ToString());
-		}
-
-		[Test]
-		public void should_set_internal_secure_tcp_endpoint() {
-			Assert.AreEqual(_internalSecTcp, _node.NodeInfo.InternalSecureTcp);
-		}
-
-		private string GetCertificatePath() {
-			var filePath = Path.Combine(Path.GetTempPath(), $"cert-{Guid.NewGuid()}.p12");
-			var cert = ssl_connections.GetUntrustedCertificate();
-
-			using var fileStream = File.Create(filePath);
-			fileStream.Write(cert.ExportToPkcs12());
-
-			return filePath;
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_ssl_enabled_and_using_a_security_certificate<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat, TStreamId> {
-		private readonly IPEndPoint _internalSecTcp = new(IPAddress.Parse("127.0.1.15"), 1114);
-		private readonly IPEndPoint _externalSecTcp = new(IPAddress.Parse("127.0.1.15"), 1115);
-		private readonly X509Certificate2 _certificate = ssl_connections.GetServerCertificate();
-
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) {
-			return options
-				.WithInternalSecureTcpOn(_internalSecTcp)
-				.WithExternalSecureTcpOn(_externalSecTcp)
-				.Secure(new X509Certificate2Collection(ssl_connections.GetRootCertificate()), _certificate);
-		}
-
-		[Test]
-		public void should_set_tls_to_enabled() {
-			Assert.IsFalse(_options.Interface.DisableInternalTcpTls);
-		}
-
-		[Test]
-		public void should_set_certificate() {
-			Assert.AreNotEqual("n/a", _options.Certificate == null ? "n/a" : _options.Certificate.ToString());
-		}
-
-		[Test]
-		public void should_set_internal_secure_tcp_endpoint() {
-			Assert.AreEqual(_internalSecTcp, _node.NodeInfo.InternalSecureTcp);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_secure_tcp_endpoints_and_no_certificates<TLogFormat, TStreamId> {
-		private ClusterVNodeOptions _options;
-		private Exception _caughtException;
-
-		[OneTimeSetUp]
-		public void SetUp() {
-			var baseIpAddress = IPAddress.Parse("127.0.1.15");
-			var internalSecTcp = new IPEndPoint(baseIpAddress, 1114);
-			var externalSecTcp = new IPEndPoint(baseIpAddress, 1115);
-			_options = new ClusterVNodeOptions()
-				.ReduceMemoryUsageForTests()
-				.RunInMemory()
-				.WithInternalSecureTcpOn(internalSecTcp)
-				.WithExternalSecureTcpOn(externalSecTcp);
-			try {
-				_ = new ClusterVNode<TStreamId>(_options, LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory,
-					certificateProvider: new OptionsCertificateProvider());
-			} catch (Exception ex) {
-				_caughtException = ex;
-			}
-		}
-
-		[Test]
-		public void should_throw_an_exception() {
-			Assert.IsNotNull(_caughtException);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_single_node_and_custom_settings.cs b/src/EventStore.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_single_node_and_custom_settings.cs
deleted file mode 100644
index c3921ff19c8..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_single_node_and_custom_settings.cs
+++ /dev/null
@@ -1,236 +0,0 @@
-#nullable enable
-using System;
-using System.IO;
-using System.Net;
-using EventStore.Core.Configuration.Sources;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.Chunks;
-using FluentAssertions;
-using Microsoft.Extensions.Configuration;
-using NUnit.Framework;
-
-namespace EventStore.Core.XUnit.Tests.Configuration.ClusterNodeOptionsTests.when_building {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_run_on_disk<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat, TStreamId> {
-		private readonly string _dbPath = Path.Combine(Path.GetTempPath(), $"Test-{Guid.NewGuid()}");
-
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) => options.RunOnDisk(_dbPath);
-
-		[Test]
-		public void should_set_memdb_to_false() {
-			Assert.IsFalse(_node.Db.Config.InMemDb);
-		}
-
-		[Test]
-		public void should_set_the_db_path() {
-			Assert.AreEqual(_dbPath, _node.Db.Config.Path);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_run_in_memory<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat, TStreamId> {
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) =>
-			options.RunInMemory();
-
-		[Test]
-		public void should_set_memdb_to_true() {
-			Assert.IsTrue(_node.Db.Config.InMemDb);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_custom_ip_endpoints<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat, TStreamId> {
-		private readonly IPEndPoint _httpEndPoint = new(IPAddress.Parse("127.0.1.15"), 1113);
-		private readonly IPEndPoint _internalTcp = new(IPAddress.Parse("127.0.1.15"), 1114);
-		private readonly IPEndPoint _externalTcp = new(IPAddress.Parse("127.0.1.15"), 1115);
-
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) {
-			return options
-				.WithHttpOn(_httpEndPoint)
-				.WithExternalSecureTcpOn(_externalTcp)
-				.WithInternalSecureTcpOn(_internalTcp);
-		}
-
-		[Test]
-		public void should_set_http_endpoint() {
-			Assert.AreEqual(_httpEndPoint, _node.NodeInfo.HttpEndPoint);
-		}
-
-		[Test]
-		public void should_set_internal_tcp_endpoint() {
-			Assert.AreEqual(_internalTcp, _node.NodeInfo.InternalSecureTcp);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_custom_chunk_size<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat, TStreamId> {
-		private readonly int _chunkSize = 268435;
-
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) => options with {
-			Database = options.Database with {
-				ChunkSize = _chunkSize
-			}
-		};
-
-		[Test]
-		public void should_set_chunk_size() {
-			Assert.AreEqual(_chunkSize, _node.Db.Config.ChunkSize);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_custom_chunk_cache_size<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat, TStreamId> {
-		private readonly long _chunkCacheSize = 268435712;
-
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) => options with {
-			Database = options.Database with {
-				ChunksCacheSize = _chunkCacheSize
-			}
-		};
-
-		[Test]
-		public void should_set_max_chunk_cache_size() {
-			Assert.AreEqual(_chunkCacheSize, _node.Db.Config.MaxChunksCacheSize);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		with_custom_number_of_cached_chunks<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat, TStreamId> {
-		private readonly int _cachedChunks = 10;
-
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) => options with {
-			Database = options.Database with {
-				CachedChunks = _cachedChunks
-			}
-		};
-
-		[Test]
-		public void should_set_max_chunk_size_to_the_size_of_the_number_of_cached_chunks() {
-			var chunkSizeResult = _cachedChunks * (long)(TFConsts.ChunkSize + ChunkHeader.Size + ChunkFooter.Size);
-			Assert.AreEqual(chunkSizeResult, _node.Db.Config.MaxChunksCacheSize);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_custom_advertise_as<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat, TStreamId> {
-		private readonly IPEndPoint _intTcpEndpoint = new(IPAddress.Parse(InternalIp), 1111);
-		private readonly IPEndPoint _extTcpEndpoint = new(IPAddress.Parse(ExternalIp), 1113);
-		private readonly IPEndPoint _httpEndpoint = new(IPAddress.Parse(ExternalIp), 1116);
-		const string InternalIp = "127.0.1.1";
-		const string ExternalIp = "127.0.1.2";
-
-
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) {
-			return options
-				.WithHttpOn(_httpEndpoint)
-				.WithExternalSecureTcpOn(_extTcpEndpoint)
-				.WithInternalSecureTcpOn(_intTcpEndpoint)
-				.AdvertiseInternalHostAs(new DnsEndPoint($"{InternalIp}.com", _intTcpEndpoint.Port + 1000))
-				.AdvertiseExternalHostAs(new DnsEndPoint($"{ExternalIp}.com", _extTcpEndpoint.Port + 1000))
-				.AdvertiseHttpHostAs(new DnsEndPoint($"{ExternalIp}.com", _httpEndpoint.Port + 1000));
-		}
-
-		[Test]
-		public void should_set_the_advertise_as_info_to_the_specified() {
-			Assert.AreEqual(null, _node.GossipAdvertiseInfo.InternalTcp);
-			Assert.AreEqual(null, _node.GossipAdvertiseInfo.ExternalTcp);
-			Assert.AreEqual(new DnsEndPoint($"{InternalIp}.com", _intTcpEndpoint.Port + 1000),
-				_node.GossipAdvertiseInfo.InternalSecureTcp);
-			Assert.AreEqual(new DnsEndPoint($"{ExternalIp}.com", _httpEndpoint.Port + 1000),
-				_node.GossipAdvertiseInfo.HttpEndPoint);
-			Assert.AreEqual($"{InternalIp}.com", _node.GossipAdvertiseInfo.AdvertiseInternalHostAs);
-			Assert.AreEqual($"{ExternalIp}.com", _node.GossipAdvertiseInfo.AdvertiseExternalHostAs);
-			Assert.AreEqual(_httpEndpoint.Port + 1000, _node.GossipAdvertiseInfo.AdvertiseHttpPortAs);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		with_custom_password_for_admin_and_ops_user<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat, TStreamId> {
-		private const string _adminPassword = "Admin";
-		private const string _opsPassword = "Ops";
-
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) =>
-			options with {
-				DefaultUser = new ClusterVNodeOptions.DefaultUserOptions
-					{ DefaultAdminPassword = _adminPassword, DefaultOpsPassword = _opsPassword }
-			};
-
-		[Test]
-		public void should_set_the_custom_admin_and_ops_user_password() {
-			Assert.AreEqual(_adminPassword, _options.DefaultUser.DefaultAdminPassword);
-			Assert.AreEqual(_opsPassword, _options.DefaultUser.DefaultOpsPassword);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		with_custom_settings_check_for_environment_only_options<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat,
-		TStreamId> {
-		protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) => options with { };
-
-		[Test]
-		public void should_return_error_when_default_password_options_pass_through_command_line() {
-			var configuration = new ConfigurationBuilder()
-				.AddEventStoreDefaultValues()
-				.AddEventStoreCommandLine(
-					"--DefaultAdminPassword=Admin#",
-					"--DefaultOpsPassword=Ops#")
-				.Build();
-
-			var options = ClusterVNodeOptions.FromConfiguration(configuration);
-
-			var result = options.CheckForEnvironmentOnlyOptions();
-
-			result.Should().NotBeNull();
-		}
-
-		[Test]
-		public void should_return_null_when_default_password_options_pass_through_environment_variables() {
-			var configuration = new ConfigurationBuilder()
-				.AddEventStoreDefaultValues()
-				.AddEventStoreEnvironmentVariables(
-					("EVENTSTORE_DEFAULT_ADMIN_PASSWORD", "Admin#"),
-					("EVENTSTORE_DEFAULT_OPS_PASSWORD", "Ops#")
-				)
-				.AddEventStoreCommandLine()
-				.Build();
-
-			var options = ClusterVNodeOptions.FromConfiguration(configuration);
-
-			var result = options.CheckForEnvironmentOnlyOptions();
-
-			result.Should().BeNull();
-		}
-
-		[Test]
-		public void ignores_subsection_arguments() {
-			var configuration = new ConfigurationBuilder()
-				// we should be able to stop doing this soon as long as we bind the options automatically
-				.AddEventStoreDefaultValues()
-				.AddEventStoreEnvironmentVariables(
-					("EVENTSTORE__METRICS__X", "xxx"),
-					("EVENTSTORE__PLUGINS__Y", "yyy")
-				)
-				.AddEventStoreCommandLine(
-					"--EventStore:Metrics:A aaa " +
-					"--EventStore:Plugins:B bbb"
-				)
-				.Build();
-
-			var options = ClusterVNodeOptions.FromConfiguration(configuration);
-
-			options.Unknown.Options.Should().BeEmpty();
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Configuration/ClusterVNodeOptionsPrinterTests.cs b/src/EventStore.Core.XUnit.Tests/Configuration/ClusterVNodeOptionsPrinterTests.cs
deleted file mode 100644
index f0c1daa3fa9..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Configuration/ClusterVNodeOptionsPrinterTests.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-#nullable enable
-
-using System;
-using System.Collections.Generic;
-using EventStore.Common.Options;
-using EventStore.Core.Configuration;
-using EventStore.Core.Configuration.Sources;
-using FluentAssertions;
-using Microsoft.Extensions.Configuration;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Configuration {
-	public class ClusterVNodeOptionsPrinterTests {
-		[Fact]
-		public void prints_options() {
-			var config = new ConfigurationBuilder()
-				.AddEventStoreDefaultValues(new Dictionary<string, string?> {
-					{ "ChunkSize", "10000"},
-					{ "ChunksCacheSize", "20000" },
-					{ "ClusterSize", "1" },
-					{ "UnsafeAllowSurplusNodes", "false" },
-				})
-				.AddEventStoreEnvironmentVariables(
-					("EVENTSTORE_SOME_UNKNOWN_OPTION", "77"),
-					("EVENTSTORE_CLUSTER_GOSSIP_PORT", "99"),
-					("EVENTSTORE_UNSAFE_ALLOW_SURPLUS_NODES", "true"),
-					("EVENTSTORE_CONFIG", "/path/to/config/envvar"),
-					("EVENTSTORE_RUN_PROJECTIONS", "All"))
-				.AddEventStoreCommandLine(
-					"--config", "/path/to/config/commandline",
-					"--cluster-gossip-port=88",
-					$"--default-ops-password={Guid.NewGuid()}")
-				.Build();
-
-			var loadedOptions = ClusterVNodeOptions.GetLoadedOptions(config);
-
-			var output = ClusterVNodeOptionsPrinter.Print(loadedOptions);
-
-			output.Should().Be(@"
-MODIFIED OPTIONS:
-    APPLICATION OPTIONS:
-         CONFIG:                             /path/to/config/commandline (Command Line)
-
-    CLUSTER OPTIONS:
-         CLUSTER GOSSIP PORT:                88 (Command Line)
-         UNSAFE ALLOW SURPLUS NODES:         true (Environment Variables)
-
-    DEFAULT USER OPTIONS:
-         DEFAULT OPS PASSWORD:               ******** (Command Line)
-
-    PROJECTION OPTIONS:
-         RUN PROJECTIONS:                    All (Environment Variables)
-
-
-DEFAULT OPTIONS:
-    CLUSTER OPTIONS:
-         CLUSTER SIZE:                       1 (<DEFAULT>)
-
-    DATABASE OPTIONS:
-         CHUNK SIZE:                         10000 (<DEFAULT>)
-         CHUNKS CACHE SIZE:                  20000 (<DEFAULT>)
-");
-		}
-
-		[Fact]
-		public void loaded_options_do_not_contain_sensitive_values() {
-			var secretText = Guid.NewGuid().ToString();
-
-			var config = new ConfigurationBuilder()
-				.AddEventStoreDefaultValues()
-				.AddEventStoreCommandLine($"--default-ops-password={secretText}")
-				.Build();
-
-			var loadedOptions = ClusterVNodeOptions.GetLoadedOptions(config);
-
-			var option = loadedOptions["EventStore:DefaultOpsPassword"];
-
-			option.DisplayValue.Should().BeEquivalentTo("********");
-		}
-
-		[Fact]
-		public void loaded_options_show_allowed_values() {
-			var config = new ConfigurationBuilder()
-				.AddEventStoreDefaultValues()
-				.Build();
-
-			var loadedOptions = ClusterVNodeOptions.GetLoadedOptions(config);
-
-			var option = loadedOptions["EventStore:DbLogFormat"];
-
-			option.Metadata.AllowedValues.Should().BeEquivalentTo(Enum.GetNames(typeof(DbLogFormat)));
-		}
-
-		[Fact]
-		public void loaded_option_provided_by_another_source_shows_the_correct_source() {
-			var config = new ConfigurationBuilder()
-				.AddEventStoreDefaultValues()
-				.AddEventStoreEnvironmentVariables(
-					("EVENTSTORE_CLUSTER_SIZE", "15"),
-					("EVENTSTORE_LOG_LEVEL", "Fatal"))
-				.AddEventStoreCommandLine($"--log-level=Information")
-				.Build();
-
-			var loadedOptions = ClusterVNodeOptions.GetLoadedOptions(config);
-
-			// default
-			var insecure = loadedOptions["EventStore:Insecure"];
-			insecure.DisplayValue.Should().BeEquivalentTo("false");
-			insecure.SourceDisplayName.Should().BeEquivalentTo("<DEFAULT>");
-
-			// environment variables
-			var clusterSize = loadedOptions["EventStore:ClusterSize"];
-			clusterSize.DisplayValue.Should().BeEquivalentTo("15");
-			clusterSize.SourceDisplayName.Should().BeEquivalentTo("Environment Variables");
-
-			// command line
-			var logLevel = loadedOptions["EventStore:LogLevel"];
-			logLevel.DisplayValue.Should().BeEquivalentTo("Information");
-			logLevel.SourceDisplayName.Should().BeEquivalentTo("Command Line");
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Configuration/ClusterVNodeOptionsTests.cs b/src/EventStore.Core.XUnit.Tests/Configuration/ClusterVNodeOptionsTests.cs
deleted file mode 100644
index e8e2f252935..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Configuration/ClusterVNodeOptionsTests.cs
+++ /dev/null
@@ -1,260 +0,0 @@
-#nullable enable
-
-using System;
-using System.IO;
-using System.Linq;
-using System.Net;
-using EventStore.Common.Exceptions;
-using EventStore.Common.Options;
-using EventStore.Core.Configuration;
-using EventStore.Core.Configuration.Sources;
-using FluentAssertions;
-using Microsoft.Extensions.Configuration;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Configuration;
-
-public class ClusterVNodeOptionsTests {
-	static ClusterVNodeOptions GetOptions(string args) {
-		var configuration = EventStoreConfiguration.Build(args.Split());
-		return ClusterVNodeOptions.FromConfiguration(configuration);
-	}
-
-	[Fact]
-	public void builds_proper() {
-		var options = new ClusterVNodeOptions();
-	}
-
-	[Fact]
-	public void confirm_suggested_option() {
-		var options = GetOptions("--cluster-sze 3");
-
-		var (key, value) = options.Unknown.Options[0];
-		Assert.Equal("ClusterSze", key);
-		Assert.Equal("ClusterSize", value);
-	}
-
-	[Fact]
-	public void when_we_dont_have_that_option() {
-		var options = GetOptions("--something-that-is-wildly-off 3");
-
-		var (key, value) = options.Unknown.Options[0];
-		Assert.Equal("SomethingThatIsWildlyOff", key);
-		Assert.Equal("", value);
-	}
-
-	[Fact]
-	public void valid_parameters() {
-		var options = GetOptions("--cluster-size 3");
-
-		var values = options.Unknown.Options;
-		Assert.Empty(values);
-	}
-
-	[Fact]
-	public void unknown_options_suggests_option_with_four_characters_off() {
-		var options = GetOptions("--cluse-ie 3");
-
-		var (key, value) = options.Unknown.Options[0];
-		Assert.Equal("CluseIe", key);
-		Assert.Equal("ClusterSize", value);
-	}
-
-	[Fact]
-	public void print_help_text() {
-		var helpText = ClusterVNodeOptions.HelpText;
-		helpText.Should().NotBeEmpty();
-	}
-
-	[Fact]
-	public void unknown_options_ignores_subsection_arguments() {
-		var configuration = new ConfigurationBuilder()
-			.AddEventStoreDefaultValues()
-			.AddEventStoreEnvironmentVariables(
-				("EVENTSTORE__METRICS__X", "xxx"),
-				("EVENTSTORE__PLUGINS__Y", "yyy")
-			)
-			.AddEventStoreCommandLine(
-				"--EventStore:Metrics:A aaa " +
-				"--EventStore:Plugins:B bbb"
-			)
-			.Build();
-
-		var options = ClusterVNodeOptions.FromConfiguration(configuration);
-
-		options.Unknown.Options.Should().BeEmpty();
-	}
-	
-	[Fact]
-	public void unknown_options_ignores_repeated_keys_from_other_sources() {
-		Environment.SetEnvironmentVariable("EVENTSTORE__CLUSTER_SIZE", "3");
-		
-		var configuration = new ConfigurationBuilder()
-			.AddEnvironmentVariables()
-			.AddEventStoreEnvironmentVariables()
-			.Build();
-
-		var options = ClusterVNodeOptions.FromConfiguration(configuration);
-
-		options.Unknown.Options.Should().BeEmpty();
-	}
-
-	[Fact]
-	public void validation_should_return_error_when_default_password_options_pass_through_command_line() {
-		var configuration =  new ConfigurationBuilder()
-			.AddEventStoreDefaultValues()
-			.AddEventStoreCommandLine(
-				"--DefaultAdminPassword=Admin#",
-				"--DefaultOpsPassword=Ops#")
-			.Build();
-
-		var options = ClusterVNodeOptions.FromConfiguration(configuration);
-
-		var result = options.CheckForEnvironmentOnlyOptions();
-
-		result.Should().BeEquivalentTo(
-			"Provided by: Command Line. " +
-			"The Admin user password can only be set using Environment Variables" + Environment.NewLine +
-			"Provided by: Command Line. " +
-			"The Ops user password can only be set using Environment Variables" + Environment.NewLine);
-	}
-
-	[Fact]
-	public void validation_should_return_null_when_default_password_options_pass_through_environment_variables() {
-		var configuration = new ConfigurationBuilder()
-			.AddEventStoreDefaultValues()
-			.AddEventStoreEnvironmentVariables(
-				("EVENTSTORE_DEFAULT_ADMIN_PASSWORD", "Admin#"),
-				("EVENTSTORE_DEFAULT_OPS_PASSWORD", "Ops#")
-			)
-			.AddEventStoreCommandLine()
-			.Build();
-
-		var options = ClusterVNodeOptions.FromConfiguration(configuration);
-
-		var result = options.CheckForEnvironmentOnlyOptions();
-
-		result.Should().BeNull();
-	}
-
-	[Fact]
-	public void can_set_gossip_seed_values() {
-		EndPoint[] endpoints = [
-			new IPEndPoint(IPAddress.Loopback, 1113),
-			new DnsEndPoint("some-host", 1114),
-			new DnsEndPoint("127.0.1.15", 1115)
-		];
-
-		var values = string.Join(",", endpoints.Select(x => $"{x}"));
-
-		var config = new ConfigurationBuilder()
-			.AddEventStoreEnvironmentVariables(("EVENTSTORE_GOSSIP_SEED", values))
-			.Build();
-
-		var options = ClusterVNodeOptions.FromConfiguration(config);
-
-		options.Cluster.GossipSeed.Should().BeEquivalentTo(endpoints);
-	}
-
-	[Theory]
-	[InlineData("127.0.0.1", "You must specify the ports in the gossip seed.")]
-	[InlineData("127.0.0.1:3.1415", "Invalid format for gossip seed port: 3.1415.")]
-	[InlineData("hostA;hostB", "Invalid delimiter for gossip seed value: hostA;hostB.")]
-	[InlineData("hostA\thostB", "Invalid delimiter for gossip seed value: hostA\thostB.")]
-	public void reports_gossip_seed_errors(string gossipSeed, string expectedError) {
-		var config = new ConfigurationBuilder()
-			.AddEventStoreEnvironmentVariables(("EVENTSTORE_GOSSIP_SEED", gossipSeed))
-			.Build();
-
-		var ex = Assert.Throws<InvalidConfigurationException>(() =>
-			ClusterVNodeOptions.FromConfiguration(config));
-
-		Assert.Equal(
-			"Failed to convert configuration value at 'EventStore:GossipSeed' to type 'System.Net.EndPoint[]'. " + expectedError,
-			ex.Message);
-	}
-
-	[Theory]
-	[InlineData("127.0.0.1.0", "An invalid IP address was specified.")]
-	public void reports_ip_address_errors(string nodeIp, string expectedError) {
-		var config = new ConfigurationBuilder()
-			.AddEventStoreEnvironmentVariables(("EVENTSTORE_NODE_IP", nodeIp))
-			.Build();
-
-		var ex = Assert.Throws<InvalidConfigurationException>(() =>
-			ClusterVNodeOptions.FromConfiguration(config));
-
-		Assert.Equal(
-			"Failed to convert configuration value at 'EventStore:NodeIp' to type 'System.Net.IPAddress'. " + expectedError,
-			ex.Message);
-	}
-
-	[Fact]
-	public void can_set_cluster_size_from_env_vars() {
-		var config = new ConfigurationBuilder()
-			.AddEventStoreEnvironmentVariables(("EVENTSTORE_CLUSTER_SIZE", "23"))
-			.Build();
-
-		var options = ClusterVNodeOptions.FromConfiguration(config);
-
-		options.Cluster.ClusterSize.Should().Be(23);
-	}
-
-	[Fact]
-	public void can_set_cluster_size_from_args() {
-		var config = new ConfigurationBuilder()
-			.AddEventStoreCommandLine("--CLUSTER-SIZE=23")
-			.Build();
-
-		var options = ClusterVNodeOptions.FromConfiguration(config);
-
-		options.Cluster.ClusterSize.Should().Be(23);
-	}
-
-	[Fact]
-	public void can_set_cluster_size_from_config_file() {
-		var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Configuration", "test.eventstore.conf");
-
-		var config = new ConfigurationBuilder()
-			.AddEventStoreYamlConfigFile(path, optional: false)
-			.Build();
-
-		var options = ClusterVNodeOptions.FromConfiguration(config);
-
-		options.Cluster.ClusterSize.Should().Be(23);
-	}
-
-	[Fact]
-	public void can_set_log_level_from_env_vars() {
-		var config = new ConfigurationBuilder()
-			.AddEventStoreEnvironmentVariables(("EVENTSTORE_LOG_LEVEL", LogLevel.Fatal.ToString()))
-			.Build();
-
-		var options = ClusterVNodeOptions.FromConfiguration(config);
-
-		options.Logging.LogLevel.Should().Be(LogLevel.Fatal);
-	}
-
-	[Fact]
-	public void no_defaults_are_deprecated() {
-		var config = new ConfigurationBuilder()
-			.AddEventStoreDefaultValues()
-			.Build();
-
-		var options = ClusterVNodeOptions.FromConfiguration(config);
-		options.GetDeprecationWarnings().Should().BeNullOrEmpty();
-	}
-
-	[Fact]
-	public void can_get_deprecation_warnings() {
-		var config = new ConfigurationBuilder()
-			.AddEventStoreDefaultValues()
-			.AddEventStoreEnvironmentVariables(("EVENTSTORE_ENABLE_ATOM_PUB_OVER_HTTP", "true"))
-			.Build();
-
-		var options = ClusterVNodeOptions.FromConfiguration(config);
-		options.GetDeprecationWarnings().Should().Be(
-			"AtomPub over HTTP Interface has been deprecated as of version 20.6.0. It is recommended to use gRPC instead" +
-			Environment.NewLine);
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Configuration/ClusterVNodeOptionsValidatorTests.cs b/src/EventStore.Core.XUnit.Tests/Configuration/ClusterVNodeOptionsValidatorTests.cs
deleted file mode 100644
index 66994bd2ceb..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Configuration/ClusterVNodeOptionsValidatorTests.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using EventStore.Common.Exceptions;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Configuration;
-
-// Some other tests are in ClusterNodeOptionsTests/when_building
-public class ClusterVNodeOptionsValidatorTests {
-	[Theory]
-	[InlineData(false, false, true)]
-	[InlineData(false, true, true)]
-	[InlineData(true, false, false)]
-	[InlineData(true, true, true)]
-	public void archiver_requires_read_only_replica(bool archiver, bool readOnlyReplica, bool expectedValid) {
-		// given
-		var options = new ClusterVNodeOptions {
-			Cluster = new() {
-				Archiver = archiver,
-				ClusterSize = 3,
-				ReadOnlyReplica = readOnlyReplica,
-			}
-		};
-
-		// when
-		void When() {
-			ClusterVNodeOptionsValidator.Validate(options);
-		}
-
-		// then
-		if (expectedValid) {
-			When();
-		} else {
-			Assert.Throws<InvalidConfigurationException>(When);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Configuration/EventStoreConfigurationKeysTests.cs b/src/EventStore.Core.XUnit.Tests/Configuration/EventStoreConfigurationKeysTests.cs
deleted file mode 100644
index 9b56e778890..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Configuration/EventStoreConfigurationKeysTests.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// ReSharper disable CheckNamespace
-
-using EventStore.Core.Configuration.Sources;
-using FluentAssertions;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Configuration {
-	public class EventStoreConfigurationKeysTests {
-		[Theory]
-		[InlineData("EVENTSTORE_StreamInfoCacheCapacity", "EventStore:StreamInfoCacheCapacity")]
-		[InlineData("EVENTSTORE_STREAM_INFO_CACHE_CAPACITY", "EventStore:StreamInfoCacheCapacity")]
-		[InlineData("EVENTSTORE__STREAM_INFO_CACHE_CAPACITY", "EventStore:StreamInfoCacheCapacity")]
-		[InlineData("EVENTSTORE__CLUSTER__STREAM_INFO_CACHE_CAPACITY", "EventStore:Cluster:StreamInfoCacheCapacity")]
-		[InlineData("EVENTSTORE__KEY_WITH_UNDERSCORES__ANOTHER_ONE", "EventStore:KeyWithUnderscores:AnotherOne")]
-		[InlineData("StreamInfoCacheCapacity", "EventStore:StreamInfoCacheCapacity")]
-		[InlineData("stream-info-cache-capacity", "EventStore:StreamInfoCacheCapacity")]
-		[InlineData("EventStore:Cluster:StreamInfoCacheCapacity", "EventStore:Cluster:StreamInfoCacheCapacity")]
-		[InlineData("GossipSeed", "EventStore:GossipSeed")]
-		[InlineData("EVENTSTORE_GOSSIP_SEED", "EventStore:GossipSeed")]
-		[InlineData("EVENTSTORE_GOSSIPSEED", "EventStore:GossipSeed")]
-		public void NormalizesEventStoreKeys(string key, string normalizedKey) {
-			EventStoreConfigurationKeys.Normalize(key).Should().Be(normalizedKey);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Configuration/Sources/CommandLineConfigurationSourceTests.cs b/src/EventStore.Core.XUnit.Tests/Configuration/Sources/CommandLineConfigurationSourceTests.cs
deleted file mode 100644
index 309671b68cf..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Configuration/Sources/CommandLineConfigurationSourceTests.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using EventStore.Core.Configuration.Sources;
-using FluentAssertions;
-using Microsoft.Extensions.Configuration;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Configuration {
-	public class CommandLineConfigurationSourceTests {
-		[Theory]
-		[InlineData(new[] { "--stream_info_cache_capacity=99" }, "EventStore:StreamInfoCacheCapacity", "99")]
-		[InlineData(new[] { "--stream_info_cache_capacity", "99" }, "EventStore:StreamInfoCacheCapacity", "99")]
-		[InlineData(new[] { "--stream-info-cache-capacity=99" }, "EventStore:StreamInfoCacheCapacity", "99")]
-		[InlineData(new[] { "--stream-info-cache-capacity", "99" }, "EventStore:StreamInfoCacheCapacity", "99")]
-		[InlineData(new[] { "--EventStore:StreamInfoCacheCapacity=99" }, "EventStore:StreamInfoCacheCapacity", "99")]
-		[InlineData(new[] { "--EventStore:StreamInfoCacheCapacity", "99" }, "EventStore:StreamInfoCacheCapacity", "99")]
-		[InlineData(new[] { "--EventStore:Stream-Info-Cache-Capacity=99" }, "EventStore:StreamInfoCacheCapacity", "99")]
-		[InlineData(new[] { "--EventStore:Stream-Info-Cache-Capacity", "99" }, "EventStore:StreamInfoCacheCapacity", "99")]
-		[InlineData(new[] { "--EventStore:Stream_Info_Cache_Capacity=99" }, "EventStore:StreamInfoCacheCapacity", "99")]
-		[InlineData(new[] { "--EventStore:Stream_Info_Cache_Capacity", "99" }, "EventStore:StreamInfoCacheCapacity", "99")]
-		public void AddsArguments(string[] arguments, string normalizedKey, string expectedValue) {
-			// Act
-			var configuration = new ConfigurationBuilder()
-				.AddEventStoreCommandLine(arguments)
-				.Build();
-
-			// Assert
-			configuration.GetValue<string>(normalizedKey).Should().Be(expectedValue);
-		}
-
-		static IConfiguration BuildConfiguration(params string[] args) =>
-			new ConfigurationBuilder()
-				.AddEventStoreCommandLine(args)
-				.Build()
-				.GetSection(EventStoreConfigurationKeys.Prefix);
-
-		[Fact]
-		public void normalize_keys() {
-			var configuration = BuildConfiguration("--cluster-size", "3", "--log", "/tmp/eventstore/logs");
-			Assert.Equal(3, configuration.GetValue<int>("ClusterSize"));
-			Assert.Equal("/tmp/eventstore/logs", configuration.GetValue<string>("Log"));
-		}
-
-		[Fact]
-		public void normalize_keys_boolean_plus_sign() {
-			var configuration = BuildConfiguration("--whatever+");
-			Assert.Equal("true", configuration.GetValue<string>("Whatever"));
-		}
-
-		[Fact]
-		public void normalize_keys_boolean_negative_sign() {
-			var configuration = BuildConfiguration("--whatever-");
-			Assert.Equal("false", configuration.GetValue<string>("Whatever"));
-		}
-
-		[Fact]
-		public void normalize_keys_boolean_no_value() {
-			var configuration = BuildConfiguration("--whatever");
-			Assert.Equal("true", configuration.GetValue<string>("Whatever"));
-		}
-
-		[Fact]
-		public void normalize_keys_equals() {
-			var configuration = BuildConfiguration("--cluster-size=3");
-			Assert.Equal(3, configuration.GetValue<int>("ClusterSize"));
-		}
-
-		[Fact]
-		public void normalize_keys_one_dash() {
-			var configuration = BuildConfiguration("-cluster-size=3");
-			Assert.Equal(3, configuration.GetValue<int>("ClusterSize"));
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Configuration/Sources/DefaultValuesConfigurationSourceTests.cs b/src/EventStore.Core.XUnit.Tests/Configuration/Sources/DefaultValuesConfigurationSourceTests.cs
deleted file mode 100644
index aa08ebd2f1e..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Configuration/Sources/DefaultValuesConfigurationSourceTests.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Linq;
-using EventStore.Core.Configuration.Sources;
-using FluentAssertions;
-using Microsoft.Extensions.Configuration;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Configuration {
-	public class DefaultValuesConfigurationSourceTests {
-		[Fact]
-		public void Adds() {
-			// Arrange
-			var defaults = ClusterVNodeOptions.DefaultValues.OrderBy(x => x.Key).ToList();
-		
-			// Act
-			var configuration = new ConfigurationBuilder()
-				.AddEventStoreDefaultValues()
-				.Build()
-				.GetSection(EventStoreConfigurationKeys.Prefix);
-		
-			// Assert
-			foreach (var (key, expectedValue) in defaults) {
-				configuration.GetValue<object>(key)
-					.Should()
-					.BeEquivalentTo(expectedValue?.ToString(), $"because {key} should be {expectedValue}");
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Configuration/Sources/EnvironmentVariablesConfigurationSourceTests.cs b/src/EventStore.Core.XUnit.Tests/Configuration/Sources/EnvironmentVariablesConfigurationSourceTests.cs
deleted file mode 100644
index f9d23461cd0..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Configuration/Sources/EnvironmentVariablesConfigurationSourceTests.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Configuration.Sources;
-using FluentAssertions;
-using Microsoft.Extensions.Configuration;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Configuration {
-	public class EventStoreEnvironmentVariablesSourceTests {
-		[Theory]
-		[InlineData("EVENTSTORE_STREAM_INFO_CACHE_CAPACITY", "EventStore:StreamInfoCacheCapacity")]
-		public void AddsEventStoreEnvVars(string key, string normalizedKey) {
-			// Arrange
-			var environment = new Dictionary<string, string> { { key, key } };
-
-			// Act
-			var configuration = new ConfigurationBuilder()
-				.AddEventStoreEnvironmentVariables(environment)
-				.Build();
-
-			// Assert
-			configuration
-				.AsEnumerable()
-				.Any(x => x.Key == normalizedKey)
-				.Should().BeTrue();
-		}
-
-		[Theory]
-		[InlineData("StreamInfoCacheCapacity")]
-		[InlineData("stream-info-cache-capacity")]
-		[InlineData("EventStore:Cluster:StreamInfoCacheCapacity")]
-		[InlineData("UNSUPPORTED_EVENTSTORE_TCP_API_ENABLED")]
-		public void IgnoresOtherEnvVars(string key) {
-			// Arrange
-			var environment = new Dictionary<string, string> { { key, key } };
-
-			// Act
-			var configuration = new ConfigurationBuilder()
-				.AddEventStoreEnvironmentVariables(environment)
-				.Build();
-
-			// Assert
-			configuration.AsEnumerable()
-				.Any().Should().BeFalse();
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/DataStructures/ProbabilisticFilter/AlignedMemoryTests.cs b/src/EventStore.Core.XUnit.Tests/DataStructures/ProbabilisticFilter/AlignedMemoryTests.cs
deleted file mode 100644
index fcd3afa2966..00000000000
--- a/src/EventStore.Core.XUnit.Tests/DataStructures/ProbabilisticFilter/AlignedMemoryTests.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using EventStore.Core.DataStructures.ProbabilisticFilter;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.DataStructures.ProbabilisticFilter {
-	public unsafe class AlignedMemoryTests {
-		[Theory]
-		[InlineData(1, 1)]
-		[InlineData(3, 8)]
-		[InlineData(8, 3)]
-		[InlineData(30_000, 8 * 1024)]
-		[InlineData(int.MaxValue + 8L, 8 * 1024)]
-		public void Works(long size, int alignTo) {
-			using var sut = new AlignedMemory(size, alignTo);
-
-			Assert.True((long)sut.Pointer % alignTo == 0);
-
-			if (size <= int.MaxValue) {
-				Assert.Equal(size, sut.AsSpan().Length);
-				sut.AsSpan().Clear(); // can write to the span
-			}
-		}
-
-		[Fact]
-		public void finalizer_does_not_crash_process_when_oom() {
-			Assert.Throws<OutOfMemoryException>(() => new AlignedMemory(1_000_000_000_000, 1));
-			GC.Collect();
-			GC.WaitForPendingFinalizers();
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/DataStructures/ProbabilisticFilter/BloomFilterAccessorTests.cs b/src/EventStore.Core.XUnit.Tests/DataStructures/ProbabilisticFilter/BloomFilterAccessorTests.cs
deleted file mode 100644
index 58d59c449ff..00000000000
--- a/src/EventStore.Core.XUnit.Tests/DataStructures/ProbabilisticFilter/BloomFilterAccessorTests.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-using System;
-using EventStore.Core.DataStructures.ProbabilisticFilter;
-using Xunit;
-
-#pragma warning disable xUnit1026 // Theory methods should use all of their parameters
-namespace EventStore.Core.XUnit.Tests.DataStructures.ProbabilisticFilter {
-	public unsafe class BloomFilterAccessorTests {
-		BloomFilterAccessor GenSut(long logicalFilterSize, BloomFilterAccessor.OnPageDirty onPageDirty = null) {
-			return new BloomFilterAccessor(
-				logicalFilterSize: logicalFilterSize,
-				cacheLineSize: BloomFilterIntegrity.CacheLineSize,
-				hashSize: BloomFilterIntegrity.HashSize,
-				pageSize: BloomFilterIntegrity.PageSize,
-				onPageDirty: onPageDirty ?? (pageNumber => { }),
-				log: Serilog.Log.Logger);
-		}
-
-		[Fact]
-		public void CorrectProperties() {
-			var sut = GenSut(10 * 1024);
-			Assert.Equal(BloomFilterIntegrity.CacheLineSize, sut.CacheLineSize);
-			Assert.Equal(BloomFilterIntegrity.HashSize, sut.HashSize);
-			Assert.Equal(BloomFilterIntegrity.PageSize, sut.PageSize);
-		}
-
-		[Theory]
-		[InlineData(10_000)]
-		[InlineData(10_001)]
-		[InlineData(256_000_000)]
-		public void CalculatesLogicalSize(int size) {
-			var sut = GenSut(size);
-
-			Assert.Equal(size, sut.LogicalFilterSize);
-			Assert.Equal(size * 8, sut.LogicalFilterSizeBits);
-		}
-
-		[Theory]
-		// we have a 64 bytes in the file for every 60 bytes of logical filter.
-		// plus 64 bytes for the header
-		// and another 64 bytes since it hits the boundary (unnecessary but change would be breaking)
-		[InlineData(60 * 500, 64 * 500 + 64 + 64, "")]
-		[InlineData(60 * 500 - 1, 64 * 500 + 64, "one less byte would need one less cache line")]
-		[InlineData(60 * 500 + 59, 64 * 500 + 64 + 64, "adding 59 more bytes still fits")]
-		[InlineData(60 * 500 + 60, 64 * 500 + 64 + 64 + 64, "but a 60th byte requires an extra cache line")]
-		public void CalculatesFileSize(int size, int expected, string detail) {
-			var sut = GenSut(size);
-			Assert.Equal(expected, sut.FileSize);
-			Assert.True(sut.FileSize % 64 == 0);
-			Assert.Equal(expected / 64, sut.NumCacheLines);
-		}
-
-		// we don't mind how many pages there are (within reason) as long as there are enough
-		[Fact]
-		public void CanGetPageForLastBit() {
-			for (int size = 10_000; size < 40_000; size++) {
-				var sut = GenSut(size);
-				var lastBit = size * 8 - 1;
-				var lastByte = sut.GetBytePositionInFile(lastBit);
-				var pageOfLastBit = sut.GetPageNumber(lastByte);
-				Assert.True(lastByte < sut.FileSize);
-				Assert.True(pageOfLastBit < sut.NumPages);
-				Assert.True(pageOfLastBit >= sut.NumPages - 2);
-			}
-		}
-
-		[Fact]
-		public void CalculatesBytePositionInFile() {
-			var sut = GenSut(10_000);
-			Assert.Equal(64, sut.GetBytePositionInFile(0));
-			Assert.Equal(64, sut.GetBytePositionInFile(1));
-			Assert.Equal(64, sut.GetBytePositionInFile(7));
-			Assert.Equal(65, sut.GetBytePositionInFile(8));
-			// jumps over the 4 bytes for the hash
-			Assert.Equal(64 + 59, sut.GetBytePositionInFile(60 * 8 - 1));
-			Assert.Equal(64 + 64, sut.GetBytePositionInFile(60 * 8));
-		}
-
-		[Fact]
-		public void CalculatesPagePositionInFile() {
-			var sut = GenSut(10_000);
-			var expectedFirstPageSize = 8 * 1024 - 64;
-			var expectedLastPageSize = 2560;
-			Assert.Equal((64, expectedFirstPageSize), sut.GetPagePositionInFile(0));
-			Assert.Equal((8 * 1024, expectedLastPageSize), sut.GetPagePositionInFile(1));
-			Assert.Equal(sut.FileSize, 64 + expectedFirstPageSize + expectedLastPageSize);
-			Assert.Throws<ArgumentOutOfRangeException>(() => sut.GetPagePositionInFile(2));
-		}
-
-		[Fact]
-		public void CalculatesPagePositionInFileLarge() {
-			var sut = GenSut(4_000_000_000);
-			Assert.Equal((64, 8 * 1024 - 64), sut.GetPagePositionInFile(0));
-			Assert.Equal((4_266_663_936, 2816), sut.GetPagePositionInFile(520_833));
-		}
-
-		[Fact]
-		public void CalculatesPageNumber() {
-			var sut = GenSut(10_000);
-			Assert.Equal(0, sut.GetPageNumber(0));
-			Assert.Equal(0, sut.GetPageNumber(8 * 1024 - 1));
-			Assert.Equal(1, sut.GetPageNumber(8 * 1024));
-			Assert.Equal(1, sut.GetPageNumber(sut.FileSize));
-		}
-
-		[Fact]
-		public void CanSetAndTestBits() {
-			var dirtyPage = -1L;
-			var sut = GenSut(10_000, pageNumber => dirtyPage = pageNumber);
-			using var mem = new AlignedMemory(sut.FileSize, 64);
-			sut.Pointer = mem.Pointer;
-			sut.FillWithZeros();
-
-			Assert.False(sut.IsBitSet(0));
-			sut.SetBit(0);
-			Assert.True(sut.IsBitSet(0));
-			Assert.False(sut.IsBitSet(1));
-			Assert.Equal(0, dirtyPage);
-		}
-
-		[Fact]
-		public void CanSetAndTestBitsLargeFile() {
-			var dirtyPage = -1L;
-			var sut = GenSut(4_000_000_000, pageNumber => dirtyPage = pageNumber);
-			using var mem = new AlignedMemory(sut.FileSize, 64);
-			sut.Pointer = mem.Pointer;
-
-			sut.SetBit(0);
-			Assert.True(sut.IsBitSet(0));
-			Assert.Equal(0, dirtyPage);
-
-			sut.SetBit(4_000_000_000L * 8);
-			Assert.True(sut.IsBitSet(4_000_000_000L * 8));
-			Assert.Equal(520_833, dirtyPage);
-		}
-
-		[Fact]
-		public void CanVerifySuccessfully() {
-			var sut = GenSut(10_000);
-			using var mem = new AlignedMemory(sut.FileSize, 64);
-			sut.Pointer = mem.Pointer;
-			sut.FillWithZeros();
-
-			sut.SetBit(0);
-			sut.Verify(0, 0);
-		}
-
-		[Fact]
-		public void CanFailToVerify() {
-			var sut = GenSut(10_000);
-			using var mem = new AlignedMemory(sut.FileSize, 64);
-			sut.Pointer = mem.Pointer;
-			sut.FillWithZeros();
-
-			ref var b = ref sut.ReadBytes(bytePositionInFile: 64, count: 1)[0];
-			Assert.False(b.IsBitSet(0));
-			sut.SetBit(0); // set the bit through the filter
-			Assert.True(b.IsBitSet(0)); // affected our reference
-
-			sut.Verify(0, 0);
-
-			b = b.SetBit(2); // setting the bit directly not through the accessor
-			b = b.SetBit(3);
-
-			// corruption doesn't meet 5% threshold
-			sut.Verify(corruptionRebuildCount: 0, corruptionThreshold: 5);
-
-			Assert.Throws<CorruptedHashException>(() => {
-				// corruption does meet 0% threshold
-				sut.Verify(0, 0);
-			});
-
-		}
-
-		[Fact]
-		public void ComplainsAboutUnalignedPointer() {
-			var sut = GenSut(10_000);
-			var ex = Assert.Throws<InvalidOperationException>(() => sut.Pointer = (byte*)123);
-			Assert.Equal("Pointer 123 is not aligned to a cacheline (64)", ex.Message);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/DataStructures/ProbabilisticFilter/PersistenceStrategyTests.cs b/src/EventStore.Core.XUnit.Tests/DataStructures/ProbabilisticFilter/PersistenceStrategyTests.cs
deleted file mode 100644
index 8147906eb0f..00000000000
--- a/src/EventStore.Core.XUnit.Tests/DataStructures/ProbabilisticFilter/PersistenceStrategyTests.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using EventStore.Core.DataStructures.ProbabilisticFilter;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.DataStructures.ProbabilisticFilter {
-	public abstract class PersistenceStrategyTests {
-		protected abstract IPersistenceStrategy GenSut(
-			long size, bool create, string fileName);
-
-		protected IPersistenceStrategy CreateSut(long size, string fileName = "thefilter") {
-			var sut = GenSut(size, create: true, fileName);
-			sut.Init();
-			sut.WriteHeader(new Header { NumBits = size * 8, Version = Header.CurrentVersion });
-			return sut;
-		}
-
-		protected IPersistenceStrategy OpenSut(long size, string fileName = "thefilter") {
-			var sut = GenSut(size, create: false, fileName);
-			sut.Init();
-			var header = sut.ReadHeader();
-			Assert.Equal(size * 8, header.NumBits);
-			return sut;
-		}
-
-		[Fact]
-		public void AfterInitializationIsFilledWithZeroes() {
-			using (var sut = CreateSut(10_000)) {
-				for (var bitPosition = 0; bitPosition < 10_000 * 8; bitPosition++) {
-					Assert.False(sut.DataAccessor.IsBitSet(bitPosition));
-				}
-
-				sut.Flush();
-			}
-
-			// and after reopening
-			using (var sut = OpenSut(10_000)) {
-				for (var bitPosition = 0; bitPosition < 10_000 * 8; bitPosition++) {
-					Assert.False(sut.DataAccessor.IsBitSet(bitPosition));
-				}
-			}
-		}
-
-		[Fact]
-		public void FlushesEntireLogicalFilter() {
-			using (var sut = CreateSut(10_000)) {
-				for (var bitPosition = 0; bitPosition < 10_000 * 8; bitPosition++) {
-					Assert.False(sut.DataAccessor.IsBitSet(bitPosition));
-					sut.DataAccessor.SetBit(bitPosition);
-				}
-
-				sut.Flush();
-			}
-
-			// and after reopening
-			using (var sut = OpenSut(10_000)) {
-				for (var bitPosition = 0; bitPosition < 10_000 * 8; bitPosition++) {
-					Assert.True(sut.DataAccessor.IsBitSet(bitPosition));
-				}
-			}
-		}
-
-		public class MemoryMappedFilePersistenceTests :
-			PersistenceStrategyTests,
-			IClassFixture<DirectoryFixture<MemoryMappedFilePersistenceTests>> {
-
-			private readonly DirectoryFixture<MemoryMappedFilePersistenceTests> _fixture;
-
-			public MemoryMappedFilePersistenceTests(
-				DirectoryFixture<MemoryMappedFilePersistenceTests> fixture) {
-
-				_fixture = fixture;
-			}
-
-			protected override IPersistenceStrategy GenSut(
-				long size, bool create, string fileName) {
-
-				return new MemoryMappedFilePersistence(
-					size, _fixture.GetFilePathFor(fileName), create);
-			}
-		}
-
-		public class FileStreamFilePersistenceTests :
-			PersistenceStrategyTests,
-			IClassFixture<DirectoryFixture<FileStreamFilePersistenceTests>> {
-
-			private readonly DirectoryFixture<FileStreamFilePersistenceTests> _fixture;
-
-			public FileStreamFilePersistenceTests(
-				DirectoryFixture<FileStreamFilePersistenceTests> fixture) {
-
-				_fixture = fixture;
-			}
-
-			protected override FileStreamPersistence GenSut(
-				long size, bool create, string fileName) {
-
-				return new FileStreamPersistence(
-					size, _fixture.GetFilePathFor(fileName), create);
-			}
-
-			[Theory]
-			[InlineData(10_000, 96)]
-			[InlineData(256_000_000, 96)]
-			[InlineData(4_000_000_000, 1120, Skip = "big")]
-			public void CalculatesIntendedFlushSize(long size, long expectedFlushBatchSize) {
-				var sut = GenSut(size, create: true, "thefilter");
-				sut.Init();
-				Assert.Equal(128, sut.FlushBatchDelay);
-				Assert.Equal(expectedFlushBatchSize, sut.FlushBatchSize);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/DirectoryFixture.cs b/src/EventStore.Core.XUnit.Tests/DirectoryFixture.cs
deleted file mode 100644
index cac913ba8d2..00000000000
--- a/src/EventStore.Core.XUnit.Tests/DirectoryFixture.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests {
-	public class DirectoryFixture<T> : IAsyncLifetime {
-		public string Directory;
-
-		public DirectoryFixture() {
-			var typeName = typeof(T).Name.Length > 30 ? typeof(T).Name.Substring(0, 30) : typeof(T).Name;
-			Directory = Path.Combine(Path.GetTempPath(), string.Format("ESX-{0}-{1}", Guid.NewGuid(), typeName));
-			System.IO.Directory.CreateDirectory(Directory);
-		}
-
-		~DirectoryFixture() {
-			DirectoryDeleter.TryForceDeleteDirectoryAsync(Directory).Wait();
-		}
-
-		public string GetTempFilePath() {
-			return Path.Combine(Directory, string.Format("{0}-{1}", Guid.NewGuid(), typeof(T).FullName));
-		}
-
-		public string GetFilePathFor(string fileName) {
-			return Path.Combine(Directory, fileName);
-		}
-
-		public Task InitializeAsync() {
-			return Task.CompletedTask;
-		}
-
-		public async Task DisposeAsync() {
-			await DirectoryDeleter.TryForceDeleteDirectoryAsync(Directory);
-#pragma warning disable CA1816 // Dispose methods should call SuppressFinalize
-			GC.SuppressFinalize(this);
-#pragma warning restore CA1816 // Dispose methods should call SuppressFinalize
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/DirectoryPerTest.cs b/src/EventStore.Core.XUnit.Tests/DirectoryPerTest.cs
deleted file mode 100644
index c8b30a04458..00000000000
--- a/src/EventStore.Core.XUnit.Tests/DirectoryPerTest.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Threading.Tasks;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests {
-	public class DirectoryPerTest<T> : IAsyncLifetime {
-		protected DirectoryFixture<T> Fixture { get; private set; } = new();
-
-		public async Task InitializeAsync() {
-			await Fixture.InitializeAsync();
-		}
-
-		public async Task DisposeAsync() {
-			await Fixture.DisposeAsync();
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/EnvelopePublisher.cs b/src/EventStore.Core.XUnit.Tests/EnvelopePublisher.cs
deleted file mode 100644
index f03c7ad2b28..00000000000
--- a/src/EventStore.Core.XUnit.Tests/EnvelopePublisher.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.XUnit.Tests;
-
-class EnvelopePublisher : IPublisher {
-	private readonly IEnvelope _envelope;
-
-	public EnvelopePublisher(IEnvelope envelope) {
-		_envelope = envelope;
-	}
-
-	public void Publish(Message message) {
-		_envelope.ReplyWith(message);
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/EventStore.Core.XUnit.Tests.csproj b/src/EventStore.Core.XUnit.Tests/EventStore.Core.XUnit.Tests.csproj
deleted file mode 100644
index ebe16a1bbf2..00000000000
--- a/src/EventStore.Core.XUnit.Tests/EventStore.Core.XUnit.Tests.csproj
+++ /dev/null
@@ -1,38 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-	</PropertyGroup>
-	<ItemGroup>
-		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-		<PackageReference Include="System.Linq.Async" Version="6.0.1" />
-		<PackageReference Include="xunit" Version="2.6.1" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="6.0.0">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0-preview.3.24209.3" />
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\EventStore.Core.Tests\EventStore.Core.Tests.csproj" />
-		<ProjectReference Include="..\EventStore.Core\EventStore.Core.csproj" />
-		<ProjectReference Include="..\EventStore.SourceGenerators\EventStore.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-	</ItemGroup>
-	<ItemGroup>
-		<None Update="xunit.runner.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Include="..\EventStore.Common\Utils\version.properties">
-			<Link>version.properties</Link>
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Update="Configuration\test.eventstore.conf">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-	</ItemGroup>
-</Project>
diff --git a/src/EventStore.Core.XUnit.Tests/Helpers/FakeDisposable.cs b/src/EventStore.Core.XUnit.Tests/Helpers/FakeDisposable.cs
deleted file mode 100644
index 20ef5f98516..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Helpers/FakeDisposable.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-
-namespace EventStore.Core.XUnit.Tests.Helpers {
-	public class FakeDisposable: IDisposable {
-		private readonly Action _disposeAction;
-
-		public FakeDisposable(Action disposeAction) {
-			_disposeAction = disposeAction;
-		}
-
-		public void Dispose() => _disposeAction?.Invoke();
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Helpers/ReusableBufferTests.cs b/src/EventStore.Core.XUnit.Tests/Helpers/ReusableBufferTests.cs
deleted file mode 100644
index 68efd929fd8..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Helpers/ReusableBufferTests.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using System;
-using EventStore.Core.Helpers;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Helpers {
-	public class ReusableBufferTests {
-		private readonly ReusableBuffer _reusableBuffer;
-
-		public ReusableBufferTests() {
-			_reusableBuffer = new ReusableBuffer(defaultSize: 10);
-		}
-
-		[Theory]
-		[InlineData(1)]
-		[InlineData(3)]
-		[InlineData(10)]
-		[InlineData(14)]
-		public void can_acquire_buffer_as_byte_array(int numBytes) {
-			var buffer = _reusableBuffer.AcquireAsByteArray(numBytes);
-			Assert.True(buffer.Length >= numBytes);
-		}
-
-		[Theory]
-		[InlineData(1)]
-		[InlineData(3)]
-		[InlineData(10)]
-		[InlineData(14)]
-		public void can_acquire_buffer_as_span(int numBytes) {
-			var buffer = _reusableBuffer.AcquireAsSpan(numBytes);
-			Assert.Equal(numBytes, buffer.Length);
-		}
-
-		[Theory]
-		[InlineData(1)]
-		[InlineData(3)]
-		[InlineData(10)]
-		[InlineData(14)]
-		public void can_acquire_buffer_as_memory(int numBytes) {
-			var buffer = _reusableBuffer.AcquireAsMemory(numBytes);
-			Assert.Equal(numBytes, buffer.Length);
-		}
-
-		[Fact]
-		public void can_reacquire_buffer_if_released() {
-			_reusableBuffer.AcquireAsByteArray(5);
-			_reusableBuffer.Release();
-			_reusableBuffer.AcquireAsByteArray(5);
-		}
-
-		[Fact]
-		public void cannot_acquire_buffer_if_not_released() {
-			_reusableBuffer.AcquireAsByteArray(5);
-			Assert.Throws<InvalidOperationException>(() => _reusableBuffer.AcquireAsByteArray(5));
-		}
-
-		[Fact]
-		public void cannot_release_buffer_if_not_acquired() {
-			Assert.Throws<InvalidOperationException>(() => _reusableBuffer.Release());
-		}
-
-		[Fact]
-		public void throws_when_size_zero_or_negative() {
-			Assert.Throws<ArgumentOutOfRangeException>(() => _reusableBuffer.AcquireAsByteArray(-1));
-			Assert.Throws<ArgumentOutOfRangeException>(() => _reusableBuffer.AcquireAsByteArray(0));
-			Assert.Throws<ArgumentOutOfRangeException>(() => new ReusableBuffer(0));
-			Assert.Throws<ArgumentOutOfRangeException>(() => new ReusableBuffer(-1));
-		}
-
-		[Fact]
-		public void can_acquire_buffer_of_different_lengths() {
-			for (int i = 1; i <= 100; i++) {
-				var buffer = _reusableBuffer.AcquireAsByteArray(i);
-				Assert.True(buffer.Length >= i);
-				_reusableBuffer.Release();
-			}
-
-			for (int i = 100; i >= 1; i--) {
-				var buffer = _reusableBuffer.AcquireAsByteArray(i);
-				Assert.True(buffer.Length >= i);
-				_reusableBuffer.Release();
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Index/IndexStatusTrackerTests.cs b/src/EventStore.Core.XUnit.Tests/Index/IndexStatusTrackerTests.cs
deleted file mode 100644
index 97c4efd8c99..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Index/IndexStatusTrackerTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System;
-using System.Diagnostics.Metrics;
-using System.Linq;
-using EventStore.Core.Index;
-using EventStore.Core.Metrics;
-using EventStore.Core.XUnit.Tests.Metrics;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Index {
-	public class IndexStatusTrackerTests : IDisposable {
-		private readonly TestMeterListener<long> _listener;
-		private readonly FakeClock _clock = new();
-		private readonly StatusMetric _metric;
-		private readonly IndexStatusTracker _sut;
-
-		public IndexStatusTrackerTests() {
-			var meter = new Meter($"{typeof(IndexStatusTrackerTests)}");
-			_listener = new TestMeterListener<long>(meter);
-			_metric = new StatusMetric(
-				meter,
-				"eventstore-statuses",
-				_clock);
-			_sut = new IndexStatusTracker(_metric);
-		}
-
-		public void Dispose() {
-			_listener.Dispose();
-		}
-
-		[Fact]
-		public void can_observe_opening() {
-			_clock.SecondsSinceEpoch = 500;
-			AssertMeasurements("Idle", 500);
-
-			using (_sut.StartOpening()) {
-				_clock.SecondsSinceEpoch = 501;
-				AssertMeasurements("Opening", 501);
-			}
-
-			_clock.SecondsSinceEpoch = 502;
-			AssertMeasurements("Idle", 502);
-		}
-
-		[Fact]
-		public void can_observe_rebuilding() {
-			_clock.SecondsSinceEpoch = 500;
-			AssertMeasurements("Idle", 500);
-
-			using (_sut.StartRebuilding()) {
-				_clock.SecondsSinceEpoch = 501;
-				AssertMeasurements("Rebuilding", 501);
-			}
-
-			_clock.SecondsSinceEpoch = 502;
-			AssertMeasurements("Idle", 502);
-		}
-
-		[Fact]
-		public void can_observe_initializing() {
-			_clock.SecondsSinceEpoch = 500;
-			AssertMeasurements("Idle", 500);
-
-			using (_sut.StartInitializing()) {
-				_clock.SecondsSinceEpoch = 501;
-				AssertMeasurements("Initializing", 501);
-			}
-
-			_clock.SecondsSinceEpoch = 502;
-			AssertMeasurements("Idle", 502);
-		}
-
-		[Fact]
-		public void can_observe_merging() {
-			_clock.SecondsSinceEpoch = 500;
-			AssertMeasurements("Idle", 500);
-
-			using (_sut.StartMerging()) {
-				_clock.SecondsSinceEpoch = 501;
-				AssertMeasurements("Merging", 501);
-			}
-
-			_clock.SecondsSinceEpoch = 502;
-			AssertMeasurements("Idle", 502);
-		}
-
-		[Fact]
-		public void can_observe_scavenging() {
-			_clock.SecondsSinceEpoch = 500;
-			AssertMeasurements("Idle", 500);
-
-			using (_sut.StartScavenging()) {
-				_clock.SecondsSinceEpoch = 501;
-				AssertMeasurements("Scavenging", 501);
-			}
-
-			_clock.SecondsSinceEpoch = 502;
-			AssertMeasurements("Idle", 502);
-		}
-
-		void AssertMeasurements(string expectedStatus, int expectedValue) {
-			_listener.Observe();
-
-			Assert.Collection(
-				_listener.RetrieveMeasurements("eventstore-statuses"),
-				m => {
-					Assert.Equal(expectedValue, m.Value);
-					Assert.Collection(
-						m.Tags.ToArray(),
-						t => {
-							Assert.Equal("name", t.Key);
-							Assert.Equal("Index", t.Value);
-						},
-						t => {
-							Assert.Equal("status", t.Key);
-							Assert.Equal(expectedStatus, t.Value);
-						});
-				});
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/LogAbstraction/CombinedHasherTests.cs b/src/EventStore.Core.XUnit.Tests/LogAbstraction/CombinedHasherTests.cs
deleted file mode 100644
index 66c7f2e3fe6..00000000000
--- a/src/EventStore.Core.XUnit.Tests/LogAbstraction/CombinedHasherTests.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using EventStore.Core.LogAbstraction;
-using Xunit;
-using LogV3StreamId = System.UInt32;
-
-namespace EventStore.Core.XUnit.Tests.LogAbstraction {
-	public class CombinedHasherTests {
-		[Theory]
-		[InlineData(0)]
-		[InlineData(5)]
-		[InlineData(LogV3StreamId.MaxValue)]
-		[InlineData(LogV3StreamId.MinValue)]
-		public void identity(LogV3StreamId x) {
-			var low = (long)new IdentityLowHasher().Hash(x);
-			var high = (long)new IdentityHighHasher().Hash(x);
-			long actual = (high << 32) | low;
-			Assert.Equal(x, actual);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/LogAbstraction/Common/NoExistenceFilterReaderTests.cs b/src/EventStore.Core.XUnit.Tests/LogAbstraction/Common/NoExistenceFilterReaderTests.cs
deleted file mode 100644
index db708fe6b78..00000000000
--- a/src/EventStore.Core.XUnit.Tests/LogAbstraction/Common/NoExistenceFilterReaderTests.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using EventStore.Core.LogAbstraction.Common;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.LogAbstraction.Common {
-	public class NoExistenceFilterReaderTests {
-		[Fact]
-		public void might_contain_anything() {
-			var sut = new NoExistenceFilterReader();
-			Assert.True(sut.MightContain(4)); // chosen by fair dice roll
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/LogAbstraction/Common/NoNameExistenceFilterTests.cs b/src/EventStore.Core.XUnit.Tests/LogAbstraction/Common/NoNameExistenceFilterTests.cs
deleted file mode 100644
index 8751fda8341..00000000000
--- a/src/EventStore.Core.XUnit.Tests/LogAbstraction/Common/NoNameExistenceFilterTests.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.LogAbstraction.Common;
-
-namespace EventStore.Core.XUnit.Tests.LogAbstraction.Common {
-	public class NoNameExistenceFilterTests : INameExistenceFilterTests {
-		protected override INameExistenceFilter Sut { get; set; } =
-			new NoNameExistenceFilter();
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/LogAbstraction/Common/StreamExistenceFilterTests.cs b/src/EventStore.Core.XUnit.Tests/LogAbstraction/Common/StreamExistenceFilterTests.cs
deleted file mode 100644
index 7857395e597..00000000000
--- a/src/EventStore.Core.XUnit.Tests/LogAbstraction/Common/StreamExistenceFilterTests.cs
+++ /dev/null
@@ -1,202 +0,0 @@
-using System;
-using System.IO;
-using System.Threading;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.LogAbstraction.Common;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.XUnit.Tests.Helpers;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.LogAbstraction.Common {
-	public class StreamExistenceFilterTests :
-		INameExistenceFilterTests,
-		IClassFixture<DirectoryFixture<StreamExistenceFilterTests>> {
-		private readonly DirectoryFixture<StreamExistenceFilterTests> _fixture;
-
-		public StreamExistenceFilterTests(DirectoryFixture<StreamExistenceFilterTests> fixture) {
-			_fixture = fixture;
-			Sut = GenSut();
-			Sut.Initialize(new MockExistenceFilterInitializer(), 0);
-		}
-
-		protected override INameExistenceFilter Sut { get; set; }
-
-		private StreamExistenceFilter GenSut(
-			[System.Runtime.CompilerServices.CallerMemberName] string name = "",
-			TimeSpan? checkpointInterval = null,
-			long size = 10_000,
-			bool useHasher = true) {
-
-			checkpointInterval ??= TimeSpan.FromMilliseconds(10);
-			var checkpointPath = Path.Combine(_fixture.Directory, $"{name}.chk");
-			var checkpoint = new FileCheckpoint(checkpointPath, name, initValue: -1);
-			var filter = new StreamExistenceFilter(
-				directory: _fixture.Directory,
-				checkpoint: checkpoint,
-				filterName: name,
-				size: size,
-				checkpointInterval: checkpointInterval.Value,
-				checkpointDelay: TimeSpan.Zero,
-				hasher: useHasher ? Hasher : null);
-			DisposeLater(new FakeDisposable(() => checkpoint.Close(flush: true)));
-			DisposeLater(filter);
-			return filter;
-		}
-
-		[Fact]
-		public void can_add() {
-			var name = "can_add";
-			Assert.False(Sut.MightContain(name));
-			Sut.Add(name);
-			Assert.True(Sut.MightContain(name));
-			Sut.Verify(corruptionThreshold: 0);
-		}
-
-		[Fact]
-		public void can_add_without_hasher() {
-			var sut = GenSut(useHasher: false);
-			sut.Initialize(new MockExistenceFilterInitializer(), 0);
-			var name = "can_add_without_hasher";
-			Assert.False(sut.MightContain(name));
-			sut.Add(name);
-			Assert.True(sut.MightContain(name));
-			sut.Verify(corruptionThreshold: 0);
-		}
-
-		[Fact]
-		public void ensures_initialized() {
-			var sut = GenSut();
-			Assert.Throws<InvalidOperationException>(() => {
-				sut.MightContain("something");
-			});
-			sut.Verify(corruptionThreshold: 0);
-		}
-
-		[Fact]
-		public void can_truncate() {
-			var sut = GenSut();
-			sut.Initialize(new MockExistenceFilterInitializer("0", "1", "2"), 0);
-			Assert.Equal(2L, sut.CurrentCheckpoint);
-			// wait for flush so that we have something to truncate (or it will do nothing)
-			AssertEx.IsOrBecomesTrue(() => sut.CurrentCheckpointFlushed == 2, TimeSpan.FromSeconds(20));
-
-			// truncate works
-			sut.Dispose();
-			sut = GenSut();
-			sut.TruncateTo(1);
-			Assert.Equal(1L, sut.CurrentCheckpoint);
-
-			// even after restart
-			sut.Dispose();
-			sut = GenSut();
-			Assert.Equal(1L, sut.CurrentCheckpoint);
-		}
-
-		[Fact]
-		public void on_restart_checkpoint_does_not_exceed_data() {
-			var sut = GenSut();
-			sut.Initialize(new MockExistenceFilterInitializer(), 0);
-
-			Assert.Equal(-1, sut.CurrentCheckpoint);
-			Assert.False(sut.MightContain("0"));
-			Assert.False(sut.MightContain("1"));
-
-			sut.Add("0");
-			sut.CurrentCheckpoint = 0;
-
-			Assert.Equal(0, sut.CurrentCheckpoint);
-			Assert.True(sut.MightContain("0"));
-			Assert.False(sut.MightContain("1"));
-
-			// wait for flush of 0
-			AssertEx.IsOrBecomesTrue(() => sut.CurrentCheckpointFlushed == 0, TimeSpan.FromSeconds(20));
-
-			sut.Add("1");
-			sut.CurrentCheckpoint = 1;
-
-			Assert.Equal(1, sut.CurrentCheckpoint);
-			Assert.True(sut.MightContain("0"));
-			Assert.True(sut.MightContain("1"));
-
-			// do not wait for flush of 1
-
-			// when restart
-			sut.Dispose();
-			sut = GenSut();
-			sut.Initialize(new MockExistenceFilterInitializer(), 0);
-
-			// then 
-			Assert.Equal(0, sut.CurrentCheckpoint);
-			Assert.True(sut.MightContain("0"));
-			// "1" will have been flushed when disposing
-			// Assert.False(sut.MightContain("1"));
-			sut.Verify(corruptionThreshold: 0);
-		}
-
-		[Fact]
-		public void when_flushed_then_checkpoint_is_persisted() {
-			var sut = GenSut();
-			sut.Initialize(new MockExistenceFilterInitializer("0", "1", "2"), 0);
-
-			// wait for flush, then close
-			AssertEx.IsOrBecomesTrue(() => sut.CurrentCheckpointFlushed == 2, TimeSpan.FromSeconds(20));
-			sut.Dispose();
-
-			// reopen, checkpoint should still be the same
-			sut = GenSut();
-			Assert.Equal(2L, sut.CurrentCheckpoint);
-			sut.Verify(corruptionThreshold: 0);
-		}
-
-		[Fact]
-		public void when_missing_dat_then_reset_checkpoint() {
-			var sut = GenSut();
-			sut.Initialize(new MockExistenceFilterInitializer("0", "1", "2"), 0);
-
-			// wait for flush, then close
-			AssertEx.IsOrBecomesTrue(() => sut.CurrentCheckpointFlushed == 2, TimeSpan.FromSeconds(20));
-			sut.Dispose();
-
-			// delete dat file. on reopening checkpoint must be reset
-			File.Delete(sut.DataFilePath);
-			sut = GenSut();
-			Assert.Equal(-1L, sut.CurrentCheckpoint);
-			sut.Verify(corruptionThreshold: 0);
-		}
-
-		[Fact]
-		public void when_changing_size_then_reset_checkpoint() {
-			var sut = GenSut(size: 10_000);
-			sut.Initialize(new MockExistenceFilterInitializer("0", "1", "2"), 0);
-
-			// wait for flush, then close
-			AssertEx.IsOrBecomesTrue(() => sut.CurrentCheckpointFlushed == 2, TimeSpan.FromSeconds(20));
-			sut.Dispose();
-
-			// change size. on reopening checkpoint must be reset
-			sut = GenSut(size: 20_000);
-			Assert.Equal(-1L, sut.CurrentCheckpoint);
-			sut.Verify(corruptionThreshold: 0);
-		}
-
-		[Fact]
-		public void writes_can_be_read_by_another_thread() {
-			var sut = GenSut();
-			sut.Initialize(new MockExistenceFilterInitializer(), 0);
-
-			var theValue = 12345;
-
-			var reader = new Thread(() => {
-				var x = 0;
-				while (!sut.MightContain($"{theValue}")) {
-					x = x * 1;
-				}
-			});
-
-			reader.Start();
-			Thread.Sleep(100);
-			sut.Add($"{theValue}");
-			Assert.True(reader.Join(TimeSpan.FromSeconds(1)));
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/LogAbstraction/INameExistenceFilterTests.cs b/src/EventStore.Core.XUnit.Tests/LogAbstraction/INameExistenceFilterTests.cs
deleted file mode 100644
index de29f898ec3..00000000000
--- a/src/EventStore.Core.XUnit.Tests/LogAbstraction/INameExistenceFilterTests.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.LogAbstraction;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.LogAbstraction {
-	public abstract class INameExistenceFilterTests : IDisposable {
-		private readonly List<IDisposable> _disposables = new();
-
-		protected abstract INameExistenceFilter Sut { get; set; }
-		protected virtual ILongHasher<string> Hasher { get; set; } =
-			new CompositeHasher<string>(new XXHashUnsafe(), new Murmur3AUnsafe());
-
-		protected void DisposeLater(IDisposable disposable) {
-			_disposables.Add(disposable);
-		}
-
-		public void Dispose() {
-			Sut?.Dispose();
-			foreach (var disposable in _disposables)
-				disposable.Dispose();
-		}
-
-		[Fact]
-		public void can_initialize() {
-			var names = new[] { "can_initialize" };
-			var initializer = new MockExistenceFilterInitializer(names);
-			Sut.Initialize(initializer, 0);
-
-			foreach (var name in names)
-				Assert.True(Sut.MightContain(name));
-			Sut.Verify(corruptionThreshold: 0);
-		}
-
-		[Fact]
-		public void can_add_name() {
-			var name = "can_add_name";
-			Sut.Add(name);
-			Assert.True(Sut.MightContain(name));
-			Sut.Verify(corruptionThreshold: 0);
-		}
-
-		[Fact]
-		public void can_add_hash() {
-			var name = "can_add_hash";
-			Sut.Add(Hasher.Hash(name));
-			Assert.True(Sut.MightContain(name));
-			Sut.Verify(corruptionThreshold: 0);
-		}
-
-		[Fact]
-		public void can_add_many() {
-			for (int i = 0; i < 1000; i++)
-				Sut.Add($"{i}");
-			for (int i = 0; i < 1000; i++)
-				Assert.True(Sut.MightContain($"{i}"));
-			Sut.Verify(corruptionThreshold: 0);
-		}
-
-		[Fact]
-		public void can_checkpoint() {
-			Assert.Equal(-1L, Sut.CurrentCheckpoint);
-			Sut.CurrentCheckpoint = 5;
-			Assert.Equal(5, Sut.CurrentCheckpoint);
-			Sut.Verify(corruptionThreshold: 0);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/LogAbstraction/IdentityHighHasherTests.cs b/src/EventStore.Core.XUnit.Tests/LogAbstraction/IdentityHighHasherTests.cs
deleted file mode 100644
index 2ae844424ad..00000000000
--- a/src/EventStore.Core.XUnit.Tests/LogAbstraction/IdentityHighHasherTests.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using EventStore.Core.LogAbstraction;
-using Xunit;
-using LogV3StreamId = System.UInt32;
-
-namespace EventStore.Core.XUnit.Tests.LogAbstraction {
-	public class IdentityHighHasherTests {
-		[Theory]
-		[InlineData(0, 0)]
-		[InlineData(5, 0)]
-		[InlineData(0xAAAA_BBBB, 0)]
-		[InlineData(0xFFFF_FFFF, 0)]
-		public void hashes_correctly(LogV3StreamId x, uint expected) {
-			var sut = new IdentityHighHasher();
-			Assert.Equal(expected, sut.Hash(x));
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/LogAbstraction/IdentityLowHasherTests.cs b/src/EventStore.Core.XUnit.Tests/LogAbstraction/IdentityLowHasherTests.cs
deleted file mode 100644
index 958a3e56d82..00000000000
--- a/src/EventStore.Core.XUnit.Tests/LogAbstraction/IdentityLowHasherTests.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using EventStore.Core.LogAbstraction;
-using Xunit;
-using LogV3StreamId = System.UInt32;
-
-namespace EventStore.Core.XUnit.Tests.LogAbstraction {
-	public class IdentityLowHasherTests {
-		[Theory]
-		[InlineData(0, 0)]
-		[InlineData(5, 5)]
-		[InlineData(0xAAAA_BBBB, 0xAAAA_BBBB)]
-		[InlineData(0xFFFF_FFFF, 0xFFFF_FFFF)]
-		public void hashes_correctly(LogV3StreamId x, uint expected) {
-			var sut = new IdentityLowHasher();
-			Assert.Equal(expected, sut.Hash(x));
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/LogAbstraction/LogFormatAbstractorV2Tests.cs b/src/EventStore.Core.XUnit.Tests/LogAbstraction/LogFormatAbstractorV2Tests.cs
deleted file mode 100644
index 6548437dc79..00000000000
--- a/src/EventStore.Core.XUnit.Tests/LogAbstraction/LogFormatAbstractorV2Tests.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.LogRecords;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.LogAbstraction {
-	// checks the abstractor wires things up properly
-	public class LogFormatAbstractorV2Tests :
-		DirectoryPerTest<LogFormatAbstractorV2Tests>,
-		IDisposable {
-
-		private readonly DirectoryFixture<LogFormatAbstractorV2Tests> _fixture = new();
-		private readonly LogFormatAbstractor<string> _sut;
-
-		public LogFormatAbstractorV2Tests() {
-			_sut = new LogV2FormatAbstractorFactory().Create(new() {
-				IndexDirectory = _fixture.Directory,
-				InMemory = false,
-				StreamExistenceFilterSize = 1_000_000,
-				StreamExistenceFilterCheckpoint = new InMemoryCheckpoint(),
-			});
-		}
-
-		public void Dispose() {
-			_sut.Dispose();
-		}
-
-		[Fact]
-		public void can_init() {
-			_sut.StreamExistenceFilter.Initialize(new MockExistenceFilterInitializer("1"), 0);
-			Assert.True(_sut.StreamExistenceFilterReader.MightContain("1"));
-		}
-
-		[Fact]
-		public void can_confirm() {
-			_sut.StreamExistenceFilter.Initialize(new MockExistenceFilterInitializer(), 0);
-
-			var prepare = LogRecord.SingleWrite(
-				factory: _sut.RecordFactory,
-				logPosition: 100,
-				correlationId: Guid.NewGuid(),
-				eventId: Guid.NewGuid(),
-				eventStreamId: "streamA",
-				expectedVersion: -1,
-				eventType: "eventType",
-				data: ReadOnlyMemory<byte>.Empty,
-				metadata: ReadOnlyMemory<byte>.Empty);
-
-			Assert.False(_sut.StreamExistenceFilterReader.MightContain("streamA"));
-
-			_sut.StreamNameIndexConfirmer.Confirm(
-				new[] { prepare },
-				catchingUp: false,
-				backend: null);
-
-			Assert.True(_sut.StreamExistenceFilterReader.MightContain("streamA"));
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/LogAbstraction/LogFormatAbstractorV3Tests.cs b/src/EventStore.Core.XUnit.Tests/LogAbstraction/LogFormatAbstractorV3Tests.cs
deleted file mode 100644
index 3d90467e87d..00000000000
--- a/src/EventStore.Core.XUnit.Tests/LogAbstraction/LogFormatAbstractorV3Tests.cs
+++ /dev/null
@@ -1,416 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using EventStore.Core.Data;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.LogV3;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.LogRecords;
-using Xunit;
-using StreamId = System.UInt32;
-using EventTypeId = System.UInt32;
-
-namespace EventStore.Core.XUnit.Tests.LogAbstraction {
-	// check that lookups of the various combinations of virtual/normal/meta
-	// work in both directions and in the stream index.
-	public class LogFormatAbstractorV3Tests : IDisposable {
-		readonly static string _outputDir = $"testoutput/{nameof(LogFormatAbstractorV3Tests)}";
-		readonly LogFormatAbstractor<StreamId> _sut = new LogV3FormatAbstractorFactory().Create(new() {
-			IndexDirectory = _outputDir,
-			InMemory = false,
-			StreamExistenceFilterSize = 1_000_000,
-			StreamExistenceFilterCheckpoint = new InMemoryCheckpoint(),
-		});
-
-		readonly string _stream = "account-abc";
-		readonly string _systemStream = "$something-parked";
-		readonly StreamId _streamId;
-		readonly StreamId _systemStreamId;
-		readonly string _eventType = "some-event";
-		readonly EventTypeId _eventTypeId;
-		readonly MockIndexReader _mockIndexReader = new();
-		readonly int _numStreams;
-		readonly int _numEventTypes;
-
-		public LogFormatAbstractorV3Tests() {
-			TryDeleteDirectory();
-			_sut.StreamNamesProvider.SetReader(_mockIndexReader);
-			_sut.StreamExistenceFilter.Initialize(_sut.StreamExistenceFilterInitializer, 0);
-			Assert.False(GetOrReserve(_stream, out _streamId, out _, out _));
-			Assert.False(GetOrReserve(_systemStream, out _systemStreamId, out _, out _));
-			Assert.False(GetOrReserveEventType(_eventType, out _eventTypeId, out _, out _));
-			
-			_numStreams = 2;
-			_numEventTypes = 1;
-		}
-
-		public void Dispose() {
-			_sut.Dispose();
-			TryDeleteDirectory();
-		}
-
-		void TryDeleteDirectory() {
-			try {
-				Directory.Delete(_outputDir, recursive: true);
-			} catch { }
-		}
-
-		// it is up to the user of the V3 abstractor to index created streams, simulate that here.
-		// this is because we are currently using the normal event index to look up the stream names
-		bool GetOrReserve(string streamName, out StreamId streamId, out StreamId createdId, out string createdName) {
-			_sut.StreamNameIndex.GetOrReserve(
-				recordFactory: _sut.RecordFactory,
-				streamName: streamName,
-				logPosition: 123,
-				streamId: out streamId,
-				streamRecord: out var record);
-			
-			if (record is LogV3StreamRecord streamRecord) {
-				createdId = streamRecord.Record.SubHeader.ReferenceNumber;
-				createdName = streamRecord.StreamName;
-				_mockIndexReader.Add(streamRecord.ExpectedVersion + 1, streamRecord);
-				_sut.StreamNameIndexConfirmer.Confirm(
-					replicatedPrepares: new[] { streamRecord },
-					catchingUp: false,
-					backend: new MockIndexBackend<StreamId>());
-				return false;
-			} else {
-				createdId = default;
-				createdName = default;
-				return true;
-			}
-		}
-
-		bool GetOrReserveEventType(string eventType, out StreamId eventTypeId, out EventTypeId createdId, out string createdName) {
-			_sut.EventTypeIndex.GetOrReserveEventType(
-				recordFactory: _sut.RecordFactory,
-				eventType: eventType,
-				logPosition: 456,
-				eventTypeId: out eventTypeId,
-				eventTypeRecord: out var record);
-
-			if (record is LogV3EventTypeRecord eventTypeRecord) {
-				createdId = eventTypeRecord.Record.SubHeader.ReferenceNumber;
-				createdName = eventTypeRecord.EventTypeName;
-				_mockIndexReader.Add(eventTypeRecord.ExpectedVersion + 1, eventTypeRecord);
-				_sut.EventTypeIndexConfirmer.Confirm(
-					replicatedPrepares: new[] { eventTypeRecord },
-					catchingUp: false,
-					backend: new MockIndexBackend<EventTypeId>());
-				return false;
-			} else {
-				createdId = default;
-				createdName = default;
-				return true;
-			}
-		}
-
-		[Fact]
-		public void can_add_another_event_type() {
-			Assert.False(GetOrReserveEventType("new-event-type-1", out var newEventTypeId1, out var createdId1, out var createdName1));
-			Assert.False(GetOrReserveEventType("new-event-type-2", out var newEventTypeId2, out var createdId2, out var createdName2));
-			Assert.Equal(newEventTypeId1 + 1, newEventTypeId2);
-			Assert.Equal(newEventTypeId1, createdId1);
-			Assert.Equal(newEventTypeId2, createdId2);
-			Assert.Equal("new-event-type-1", createdName1);
-			Assert.Equal("new-event-type-2", createdName2);
-			Assert.Equal(_numEventTypes + 2, _mockIndexReader.EventTypeCount);
-		}
-		
-		[Fact]
-		public void can_find_existing_event_type() {
-			Assert.True(GetOrReserveEventType(_eventType, out var eventTypeId, out _, out _));
-			Assert.Equal(_numEventTypes, _mockIndexReader.EventTypeCount);
-			Assert.Equal(_eventTypeId, eventTypeId);
-			_sut.EventTypes.LookupName(_eventTypeId);
-			Assert.Equal(_eventType, _sut.EventTypes.LookupName(_eventTypeId));
-		}
-		
-		[Theory]
-		[InlineData(0, ""/* empty event type */)]
-		[InlineData(1, "$event-type")]
-		[InlineData(2, "$stream")]
-		[InlineData(3, "$metadata")] 
-		[InlineData(4, "$streamDeleted")]
-		public void can_find_virtual_event_type(EventTypeId expectedId, string name) {
-			Assert.True(GetOrReserveEventType(name, out var eventTypeId, out _, out _));
-			Assert.Equal(_numEventTypes, _mockIndexReader.EventTypeCount);
-			Assert.Equal(expectedId, eventTypeId);
-			Assert.Equal(name, _sut.EventTypes.LookupName(expectedId));
-		}
-
-		[Fact]
-		public void uses_correct_event_type_interval() {
-			var expectedEventTypeNumber1 = LogV3SystemEventTypes.FirstRealEventTypeNumber + _numEventTypes;
-			Assert.False(GetOrReserveEventType("new-event-type-1", out var newEventTypeId1, out var createdId1, out var createdName1));
-			Assert.False(GetOrReserveEventType("new-event-type-2", out var newEventTypeId2, out var createdId2, out var createdName2));
-			Assert.Equal(expectedEventTypeNumber1, newEventTypeId1);
-			Assert.Equal(expectedEventTypeNumber1 + 1, newEventTypeId2);
-			Assert.True(_sut.EventTypes.TryGetName((uint)expectedEventTypeNumber1, out var eventType1));
-			Assert.True(_sut.EventTypes.TryGetName((uint)expectedEventTypeNumber1 + 1, out var eventType2));
-		}
-		
-		[Fact]
-		public void can_add_another_stream() {
-			Assert.False(GetOrReserve("new-stream-1", out var newStreamId1, out var createdId1, out var createdName1));
-			Assert.False(GetOrReserve("new-stream-2", out var newStreamId2, out var createdId2, out var createdName2));
-			Assert.Equal(newStreamId1 + 2, newStreamId2);
-			Assert.Equal(newStreamId1, createdId1);
-			Assert.Equal(newStreamId2, createdId2);
-			Assert.Equal("new-stream-1", createdName1);
-			Assert.Equal("new-stream-2", createdName2);
-			Assert.Equal(_numStreams + 2, _mockIndexReader.StreamCount);
-		}
-
-		[Fact]
-		public void can_add_another_meta_stream() {
-			Assert.False(GetOrReserve("$$new-stream-3", out var newStreamId1, out var createdId1, out var createdName1));
-			Assert.False(GetOrReserve("$$new-stream-4", out var newStreamId2, out var createdId2, out var createdName2));
-			Assert.Equal(_numStreams + 2, _mockIndexReader.StreamCount);
-
-			// ids should be 2 apart to leave room for meta
-			Assert.Equal(newStreamId1 + 2, newStreamId2);
-
-			// the stream actually created is not the meta but the main counterpart of it
-			Assert.Equal("new-stream-3", createdName1);
-			Assert.Equal("new-stream-4", createdName2);
-			Assert.Equal(newStreamId1 - 1, createdId1);
-			Assert.Equal(newStreamId2 - 1, createdId2);
-		}
-
-		[Fact]
-		public void can_add_another_system_stream() {
-			Assert.False(GetOrReserve("$new-stream-5", out var newStreamId1, out var createdId1, out var createdName1));
-			Assert.False(GetOrReserve("$new-stream-6", out var newStreamId2, out var createdId2, out var createdName2));
-			Assert.Equal(_numStreams + 2, _mockIndexReader.StreamCount);
-
-			// ids should be 2 apart to leave room for meta
-			Assert.Equal(newStreamId1 + 2, newStreamId2);
-
-			// the stream actually created is the system stream
-			Assert.Equal("$new-stream-5", createdName1);
-			Assert.Equal("$new-stream-6", createdName2);
-			Assert.Equal(newStreamId1, createdId1);
-			Assert.Equal(newStreamId2, createdId2);
-		}
-
-		[Fact]
-		public void can_add_another_system_meta_stream() {
-			Assert.False(GetOrReserve("$$$new-stream-7", out var newStreamId1, out var createdId1, out var createdName1));
-			Assert.False(GetOrReserve("$$$new-stream-8", out var newStreamId2, out var createdId2, out var createdName2));
-			Assert.Equal(_numStreams + 2, _mockIndexReader.StreamCount);
-
-			// ids should be 2 apart to leave room for meta
-			Assert.Equal(newStreamId1 + 2, newStreamId2);
-
-			// the stream actually created is not the meta but the main counterpart of it
-			Assert.Equal("$new-stream-7", createdName1);
-			Assert.Equal("$new-stream-8", createdName2);
-			Assert.Equal(newStreamId1 - 1, createdId1);
-			Assert.Equal(newStreamId2 - 1, createdId2);
-		}
-
-		[Fact]
-		public void can_find_existing_stream() {
-			Assert.True(GetOrReserve(_stream, out var streamId, out _, out _));
-			Assert.Equal(_numStreams, _mockIndexReader.StreamCount);
-			Assert.Equal(_streamId, streamId);
-			Assert.Equal(_streamId, _sut.StreamIds.LookupValue(_stream));
-			Assert.Equal(_stream, _sut.StreamNames.LookupName(_streamId));
-			Assert.False(_sut.SystemStreams.IsMetaStream(streamId));
-			Assert.False(_sut.SystemStreams.IsSystemStream(streamId));
-			Assert.True(_sut.StreamExistenceFilter.MightContain(_stream));
-		}
-
-		[Fact]
-		public void can_find_existing_meta_stream() {
-			var metaStreamName = "$$" + _stream;
-			var expectedMetaStreamId = _streamId + 1;
-			Assert.True(GetOrReserve(metaStreamName, out var streamId, out _, out _));
-			Assert.Equal(_numStreams, _mockIndexReader.StreamCount);
-			Assert.Equal(expectedMetaStreamId, streamId);
-			Assert.Equal(expectedMetaStreamId, _sut.StreamIds.LookupValue(metaStreamName));
-			Assert.Equal(metaStreamName, _sut.StreamNames.LookupName(expectedMetaStreamId));
-			Assert.True(_sut.SystemStreams.IsMetaStream(streamId));
-			Assert.True(_sut.SystemStreams.IsSystemStream(streamId));
-		}
-
-		[Fact]
-		public void can_find_existing_system_stream() {
-			Assert.True(GetOrReserve(_systemStream, out var streamId, out _, out _));
-			Assert.Equal(_numStreams, _mockIndexReader.StreamCount);
-			Assert.Equal(_systemStreamId, streamId);
-			Assert.Equal(_systemStreamId, _sut.StreamIds.LookupValue(_systemStream));
-			Assert.Equal(_systemStream, _sut.StreamNames.LookupName(_systemStreamId));
-			Assert.False(_sut.SystemStreams.IsMetaStream(streamId));
-			Assert.True(_sut.SystemStreams.IsSystemStream(streamId));
-		}
-
-		[Fact]
-		public void can_find_existing_system_meta_stream() {
-			var metaStreamName = "$$" + _systemStream;
-			var expectedMetaStreamId = _systemStreamId + 1;
-			Assert.True(GetOrReserve(metaStreamName, out var streamId, out _, out _));
-			Assert.Equal(_numStreams, _mockIndexReader.StreamCount);
-			Assert.Equal(expectedMetaStreamId, streamId);
-			Assert.Equal(expectedMetaStreamId, _sut.StreamIds.LookupValue(metaStreamName));
-			Assert.Equal(metaStreamName, _sut.StreamNames.LookupName(expectedMetaStreamId));
-			Assert.True(_sut.SystemStreams.IsMetaStream(streamId));
-			Assert.True(_sut.SystemStreams.IsSystemStream(streamId));
-		}
-
-		[Theory]
-		[InlineData(4, "$all")]
-		[InlineData(6, "$streams-created")]
-		[InlineData(8, "$settings")]
-		public void can_find_virtual_stream(StreamId expectedId, string name) {
-			Assert.True(GetOrReserve(name, out var streamId, out _, out _));
-			Assert.Equal(_numStreams, _mockIndexReader.StreamCount);
-			Assert.Equal(expectedId, streamId);
-			Assert.Equal(expectedId, _sut.StreamIds.LookupValue(name));
-			Assert.Equal(name, _sut.StreamNames.LookupName(expectedId));
-			Assert.False(_sut.SystemStreams.IsMetaStream(streamId));
-			Assert.True(_sut.SystemStreams.IsSystemStream(streamId));
-		}
-
-		[Fact]
-		public void can_find_virtual_meta_stream() {
-			Assert.True(GetOrReserve("$$$all", out var streamId, out _, out _));
-			Assert.Equal(_numStreams, _mockIndexReader.StreamCount);
-			Assert.Equal(5U, streamId);
-			Assert.Equal(5U, _sut.StreamIds.LookupValue("$$$all"));
-			Assert.Equal("$$$all", _sut.StreamNames.LookupName(5));
-			Assert.True(_sut.SystemStreams.IsMetaStream(streamId));
-			Assert.True(_sut.SystemStreams.IsSystemStream(streamId));
-		}
-
-		[Theory]
-		[InlineData(LogV3SystemStreams.NoUserStream, false, false, "new-user-stream")]
-		[InlineData(LogV3SystemStreams.NoUserMetastream, true, true, "$$new-user-stream")]
-		[InlineData(LogV3SystemStreams.NoSystemStream, false, true, "$new-system-stream")]
-		[InlineData(LogV3SystemStreams.NoSystemMetastream, true, true, "$$$new-system-stream")]
-		public void can_attempt_to_lookup_non_existent_streams(StreamId expectedId, bool expectedIsMeta, bool expectedIsSystem, string name) {
-			Assert.Equal(expectedId, _sut.StreamIds.LookupValue(name));
-			Assert.Equal(expectedIsMeta, _sut.SystemStreams.IsMetaStream(expectedId));
-			Assert.Equal(expectedIsSystem, _sut.SystemStreams.IsSystemStream(expectedId));
-		}
-
-		[Theory]
-		[InlineData("")]
-		[InlineData("$$new-user-stream")]
-		[InlineData("$all")]
-		public void cannot_add_certain_kinds_of_streams_to_filter(string name) {
-			Assert.Throws<ArgumentException>(() => _sut.StreamExistenceFilter.Add(name));
-		}
-
-		class MockIndexReader : IIndexReader<StreamId> {
-			private Dictionary<StreamId, Dictionary<long, IPrepareLogRecord<StreamId>>> _index = new() {
-				{LogV3SystemStreams.StreamsCreatedStreamNumber, new()},
-				{LogV3SystemStreams.EventTypesStreamNumber, new()} 
-			};
-			
-			public void Add(long eventNumber, IPrepareLogRecord<StreamId> record) => _index[record.EventStreamId].Add(eventNumber, record);
-			
-			public int StreamCount => _index[LogV3SystemStreams.StreamsCreatedStreamNumber].Count;
-			public int EventTypeCount => _index[LogV3SystemStreams.EventTypesStreamNumber].Count;
-
-			public IPrepareLogRecord<StreamId> ReadPrepare(StreamId streamId, long eventNumber) {
-				// simulates what would be in the index.
-				return _index[streamId][eventNumber];
-			}
-
-			public long CachedStreamInfo => throw new NotImplementedException();
-
-			public long NotCachedStreamInfo => throw new NotImplementedException();
-
-			public long HashCollisions => throw new NotImplementedException();
-
-			public StorageMessage.EffectiveAcl GetEffectiveAcl(StreamId streamId) =>
-				throw new NotImplementedException();
-
-			public IndexReadEventInfoResult ReadEventInfo_KeepDuplicates(uint streamId, long eventNumber) {
-				throw new NotImplementedException();
-			}
-
-			public StreamId GetEventStreamIdByTransactionId(long transactionId) =>
-				throw new NotImplementedException();
-
-			public long GetStreamLastEventNumber(StreamId streamId) {
-				if (streamId == LogV3SystemStreams.StreamsCreatedStreamNumber)
-					return _index[streamId].Count - 1;
-				throw new NotImplementedException();
-			}
-
-			public StreamMetadata GetStreamMetadata(StreamId streamId) =>
-				throw new NotImplementedException();
-
-			public IndexReadEventResult ReadEvent(string streamName, StreamId streamId, long eventNumber) =>
-				throw new NotImplementedException();
-
-			public IndexReadStreamResult ReadStreamEventsBackward(string streamName, StreamId streamId, long fromEventNumber, int maxCount) =>
-				throw new NotImplementedException();
-
-			public IndexReadStreamResult ReadStreamEventsForward(string streamName, StreamId streamId, long fromEventNumber, int maxCount) =>
-				throw new NotImplementedException();
-
-			public IndexReadEventInfoResult ReadEventInfoForward_KnownCollisions(uint streamId, long fromEventNumber, int maxCount, long beforePosition) =>
-				throw new NotImplementedException();
-
-			public IndexReadEventInfoResult ReadEventInfoForward_NoCollisions(ulong stream, long fromEventNumber, int maxCount, long beforePosition) =>
-				throw new NotImplementedException();
-
-			public IndexReadEventInfoResult ReadEventInfoBackward_KnownCollisions(uint streamId, long fromEventNumber, int maxCount, long beforePosition) =>
-				throw new NotImplementedException();
-
-			public IndexReadEventInfoResult ReadEventInfoBackward_NoCollisions(ulong stream, Func<ulong, uint> getStreamId, long fromEventNumber, int maxCount, long beforePosition) =>
-				throw new NotImplementedException();
-
-			public long GetStreamLastEventNumber_KnownCollisions(uint streamId, long beforePosition) =>
-				throw new NotImplementedException();
-
-			public long GetStreamLastEventNumber_NoCollisions(ulong stream, Func<ulong, uint> getStreamId, long beforePosition) =>
-				throw new NotImplementedException();
-		}
-	}
-
-	public class MockIndexBackend<TStreamId> : IIndexBackend<TStreamId> {
-		public TFReaderLease BorrowReader() {
-			throw new NotImplementedException();
-		}
-
-		public SystemSettings GetSystemSettings() {
-			throw new NotImplementedException();
-		}
-
-		public long? SetStreamLastEventNumber(TStreamId streamId, long lastEventNumber) {
-			return null;
-		}
-
-		public StreamMetadata SetStreamMetadata(TStreamId streamId, StreamMetadata metadata) {
-			throw new NotImplementedException();
-		}
-
-		public void SetSystemSettings(SystemSettings systemSettings) {
-			throw new NotImplementedException();
-		}
-
-		public IndexBackend<TStreamId>.EventNumberCached TryGetStreamLastEventNumber(TStreamId streamId) {
-			throw new NotImplementedException();
-		}
-
-		public IndexBackend<TStreamId>.MetadataCached TryGetStreamMetadata(TStreamId streamId) {
-			throw new NotImplementedException();
-		}
-
-		public long? UpdateStreamLastEventNumber(int cacheVersion, TStreamId streamId, long? lastEventNumber) {
-			throw new NotImplementedException();
-		}
-
-		public StreamMetadata UpdateStreamMetadata(int cacheVersion, TStreamId streamId, StreamMetadata metadata) {
-			throw new NotImplementedException();
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/LogAbstraction/MockExistenceFilterInitializer.cs b/src/EventStore.Core.XUnit.Tests/LogAbstraction/MockExistenceFilterInitializer.cs
deleted file mode 100644
index c1fd8039690..00000000000
--- a/src/EventStore.Core.XUnit.Tests/LogAbstraction/MockExistenceFilterInitializer.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using EventStore.Core.LogAbstraction;
-
-namespace EventStore.Core.XUnit.Tests.LogAbstraction {
-	public class MockExistenceFilterInitializer : INameExistenceFilterInitializer {
-		private readonly string[] _names;
-
-		public MockExistenceFilterInitializer(params string[] names) {
-			_names = names;
-		}
-
-		public void Initialize(INameExistenceFilter filter, long truncateToPosition) {
-			int checkpoint = 0;
-			foreach (var name in _names) {
-				filter.Add(name);
-				filter.CurrentCheckpoint = checkpoint++;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/LogV2/LogV2StreamExistenceFilterInitializerTests.cs b/src/EventStore.Core.XUnit.Tests/LogV2/LogV2StreamExistenceFilterInitializerTests.cs
deleted file mode 100644
index 59ff55c6b07..00000000000
--- a/src/EventStore.Core.XUnit.Tests/LogV2/LogV2StreamExistenceFilterInitializerTests.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-using System;
-using EventStore.Core.Index;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.LogV2;
-using EventStore.Core.Tests.Services.Storage;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.LogRecords;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.LogV2 {
-	public class LogV2StreamExistenceFilterInitializerTests : DirectoryPerTest<LogV2StreamExistenceFilterInitializerTests> {
-		private readonly TableIndex<string> _tableIndex;
-		private readonly LogV2StreamExistenceFilterInitializer _sut;
-		private readonly FakeInMemoryTfReader _log;
-		private readonly MockExistenceFilter _filter;
-		private readonly int _recordOffset = 100;
-		private long _nextLogPosition = 0;
-
-		public LogV2StreamExistenceFilterInitializerTests() {
-			_log = new FakeInMemoryTfReader(recordOffset: _recordOffset);
-			_tableIndex = new TableIndex<string>(
-				directory: Fixture.Directory,
-				lowHasher: new XXHashUnsafe(),
-				highHasher: new Murmur3AUnsafe(),
-				emptyStreamId: string.Empty,
-				memTableFactory: () => new HashListMemTable(
-					version: PTableVersions.IndexV4,
-					maxSize: 1_000_000 * 2),
-				maxSizeForMemory: 100_000,
-				tfReaderFactory: () => new TFReaderLease(_log),
-				ptableVersion: PTableVersions.IndexV4,
-				maxAutoMergeIndexLevel: int.MaxValue,
-				pTableMaxReaderCount: 5);
-			_tableIndex.Initialize(0);
-
-			_sut = new LogV2StreamExistenceFilterInitializer(
-				tfReaderFactory: () => new TFReaderLease(_log),
-				tableIndex: _tableIndex);
-			var hasher = new CompositeHasher<string>(new XXHashUnsafe(), new Murmur3AUnsafe());
-			_filter = new MockExistenceFilter(hasher);
-
-		}
-
-		private void AddEventToSut(string stream, int eventNumber) {
-			var record = LogRecord.SingleWrite(
-				factory: new LogV2RecordFactory(),
-				logPosition: _nextLogPosition,
-				correlationId: Guid.NewGuid(),
-				eventId: Guid.NewGuid(),
-				eventStreamId: stream,
-				expectedVersion: eventNumber - 1,
-				eventType: "eventType",
-				data: ReadOnlyMemory<byte>.Empty,
-				metadata: ReadOnlyMemory<byte>.Empty);
-
-			_log.AddRecord(record, _nextLogPosition);
-			_tableIndex.Add(
-				commitPos: _nextLogPosition,
-				streamId: stream,
-				version: record.ExpectedVersion + 1,
-				position: _nextLogPosition);
-
-			_nextLogPosition += _recordOffset;
-		}
-
-		[Fact]
-		public void can_initialize_empty() {
-			Assert.Equal(-1, _filter.CurrentCheckpoint);
-			_sut.Initialize(_filter, 0);
-			Assert.Equal(-1, _filter.CurrentCheckpoint);
-			Assert.Empty(_filter.Hashes);
-			Assert.Equal(1, _log.NumReads);
-		}
-
-		[Theory]
-		[InlineData(100, 600)] // if we do truncate (to 100)
-		[InlineData(1000, 1000)] // if we dont truncate
-		[InlineData(2000, 1000)] // if we dont truncate
-		public void can_truncate(long truncateTo, long expectedCheckpoint) {
-			_filter.CurrentCheckpoint = 1000;
-
-			AddEventToSut("1", 0);
-			AddEventToSut("2", 0);
-			AddEventToSut("3", 0);
-			AddEventToSut("4", 0);
-			AddEventToSut("5", 0);
-			AddEventToSut("6", 0);
-
-			_sut.Initialize(_filter, truncateTo);
-
-			Assert.Equal(expectedCheckpoint, _filter.CurrentCheckpoint);
-		}
-
-		[Fact]
-		public void can_initialize_from_beginning() {
-			// (implementation detail: initializes from index)
-			AddEventToSut("1", 0);
-			AddEventToSut("1", 1);
-			AddEventToSut("2", 0);
-			AddEventToSut("2", 1);
-			AddEventToSut("3", 0);
-			AddEventToSut("3", 1);
-
-			_sut.Initialize(_filter, 0);
-
-			Assert.Equal(600, _filter.CurrentCheckpoint);
-			Assert.Equal(3, _filter.Hashes.Count);
-			Assert.Equal(2, _log.NumReads);
-		}
-
-		// this ensures every record is processed because each stream has 1 record
-		[Fact]
-		public void can_initialize_from_beginning_unique() {
-			// (implementation detail: initializes from index)
-			AddEventToSut("1", 0);
-			AddEventToSut("2", 0);
-			AddEventToSut("3", 0);
-			AddEventToSut("4", 0);
-			AddEventToSut("5", 0);
-			AddEventToSut("6", 0);
-
-			_sut.Initialize(_filter, 0);
-
-			Assert.Equal(600, _filter.CurrentCheckpoint);
-			Assert.Equal(6, _filter.Hashes.Count);
-			Assert.Equal(2, _log.NumReads);
-		}
-
-		[Fact]
-		public void can_initialize_incremental() {
-			// (implementation detail: initializes from log)
-			_filter.CurrentCheckpoint = 0;
-
-			AddEventToSut("1", 0);
-			AddEventToSut("1", 1);
-			AddEventToSut("2", 0);
-			AddEventToSut("2", 1);
-			AddEventToSut("3", 0);
-			AddEventToSut("3", 1);
-
-			_sut.Initialize(_filter, 0);
-
-			Assert.Equal(600, _filter.CurrentCheckpoint);
-			Assert.Equal(3, _filter.Hashes.Count);
-			Assert.Equal(7, _log.NumReads);
-		}
-
-		// while initialising from the index there might be an index merge causing a filedeletedexception
-		// before the fix this test fairly reliably fails on my machine due to the indexes being deleted.
-		// after the fix the window for getting the filedeletedexception is small so the test
-		// is unlikely to exercise it.
-		[Fact(Skip = "manual")]
-		public void can_initalize_during_merge() {
-			var eventsPerStream = 1_000;
-			var numStreams = 1_000;
-			var numEvents = eventsPerStream * numStreams;
-			for (int i = 0; i < numStreams; i++) {
-				for (int j = 0; j < eventsPerStream; j++) {
-					AddEventToSut(stream: $"stream-{i}", eventNumber: j);
-				}
-			}
-
-			var hasher = new CompositeHasher<string>(new XXHashUnsafe(), new Murmur3AUnsafe());
-			// addDelayMs: we want to initialize the filter slowly, to give the ptables longer to move around
-			var slowFilter = new MockExistenceFilter(hasher, addDelayMs: 1);
-			_sut.Initialize(slowFilter, 0);
-
-			Assert.Equal(numEvents * _recordOffset, slowFilter.CurrentCheckpoint);
-			Assert.Equal(numStreams, slowFilter.Hashes.Count);
-			Assert.Equal(2, _log.NumReads);
-		}
-
-		[Fact]
-		public void cannot_initialize_with_v1_indexes() {
-			var tableIndex = new TableIndex<string>(
-				directory: Fixture.Directory,
-				lowHasher: new XXHashUnsafe(),
-				highHasher: new Murmur3AUnsafe(),
-				emptyStreamId: string.Empty,
-				memTableFactory: () => new HashListMemTable(
-					version: PTableVersions.IndexV1,
-					maxSize: 1_000_000 * 2),
-				tfReaderFactory: () => throw new Exception("index tried to read the log"),
-				ptableVersion: PTableVersions.IndexV1,
-				maxAutoMergeIndexLevel: int.MaxValue,
-				pTableMaxReaderCount: 5);
-			tableIndex.Initialize(0);
-
-			var sut = new LogV2StreamExistenceFilterInitializer(
-				tfReaderFactory: () => throw new Exception("initializer tried to read the log"),
-				tableIndex: tableIndex);
-
-			var filter = new MockExistenceFilter(hasher: null);
-
-			var ex = Assert.Throws<NotSupportedException>(() => {
-				sut.Initialize(filter, 0);
-			});
-			Assert.Equal(
-				"The Stream Existence Filter is not supported with V1 index files. " +
-				"Please disable the filter by setting StreamExistenceFilterSize to 0, or rebuild the indexes.",
-				ex.Message);
-			Assert.Equal(0, _log.NumReads);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/LogV2/MockExistenceFilter.cs b/src/EventStore.Core.XUnit.Tests/LogV2/MockExistenceFilter.cs
deleted file mode 100644
index feadac90453..00000000000
--- a/src/EventStore.Core.XUnit.Tests/LogV2/MockExistenceFilter.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System.Collections.Generic;
-using System.Threading;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.LogAbstraction;
-
-namespace EventStore.Core.XUnit.Tests.LogV2 {
-	public class MockExistenceFilter : INameExistenceFilter {
-		private readonly ILongHasher<string> _hasher;
-		private readonly int _addDelayMs;
-
-		public MockExistenceFilter(ILongHasher<string> hasher, int addDelayMs = 0) {
-			_hasher = hasher;
-			_addDelayMs = addDelayMs;
-		}
-
-		public HashSet<ulong> Hashes { get; } = new();
-
-		public long CurrentCheckpoint { get; set; } = -1;
-
-		public void Add(string name) {
-			if (_addDelayMs > 0)
-				Thread.Sleep(_addDelayMs);
-			Hashes.Add(_hasher.Hash(name));
-		}
-
-		public void Add(ulong hash) {
-			if (_addDelayMs > 0)
-				Thread.Sleep(_addDelayMs);
-			Hashes.Add(hash);
-		}
-
-		public void Dispose() {
-		}
-
-		public void Initialize(INameExistenceFilterInitializer source, long truncateToPosition) {
-			source.Initialize(this, truncateToPosition);
-		}
-
-		public void TruncateTo(long checkpoint) {
-			CurrentCheckpoint = checkpoint;
-		}
-
-		public void Verify(double corruptionThreshold) { }
-
-		public bool MightContain(string name) {
-			return Hashes.Contains(_hasher.Hash(name));
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/LogV3/EventTypeIdConverterTests.cs b/src/EventStore.Core.XUnit.Tests/LogV3/EventTypeIdConverterTests.cs
deleted file mode 100644
index b2e1c101430..00000000000
--- a/src/EventStore.Core.XUnit.Tests/LogV3/EventTypeIdConverterTests.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using EventStore.Core.LogV3;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.LogV3 {
-	public class EventTypeIdConverterTests {
-
-		[Fact]
-		public void returns_expected_event_type_id() {
-			// guards against unexpected interval change
-
-			var index = 0;
-			Assert.Equal(GetExpectedEventId(index), EventTypeIdConverter.ToEventTypeId(index));
-
-			index = 9;
-			Assert.Equal(GetExpectedEventId(index), EventTypeIdConverter.ToEventTypeId(index));
-		}
-
-		[Fact]
-		public void returns_expected_event_number() {
-			// guards against unexpected interval change
-
-			var eventTypeId = 3000U;
-			Assert.Equal(GetExpectedEventNumber(eventTypeId), EventTypeIdConverter.ToEventNumber(eventTypeId));
-
-			eventTypeId = 3001U;
-			Assert.Equal(GetExpectedEventNumber(eventTypeId), EventTypeIdConverter.ToEventNumber(eventTypeId));
-		}
-
-		private long GetExpectedEventId(int index) {
-			var offset = LogV3SystemEventTypes.FirstRealEventTypeNumber;
-			return index * LogV3SystemEventTypes.EventTypeInterval + offset;
-		}
-
-		private long GetExpectedEventNumber(uint eventTypeId) {
-			var offset = LogV3SystemEventTypes.FirstRealEventTypeNumber;
-			return (eventTypeId - offset) / LogV3SystemEventTypes.EventTypeInterval;
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/LogV3/EventTypeIndexTests.cs b/src/EventStore.Core.XUnit.Tests/LogV3/EventTypeIndexTests.cs
deleted file mode 100644
index b3976d2aab7..00000000000
--- a/src/EventStore.Core.XUnit.Tests/LogV3/EventTypeIndexTests.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using System.IO;
-using System.Threading;
-using EventStore.Core.LogAbstraction.Common;
-using EventStore.Core.LogV3;
-using EventStore.Core.LogV3.FASTER;
-using EventStore.Core.TransactionLog.LogRecords;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.LogV3 {
-	public class EventTypeIndexTests : IDisposable {
-		readonly string _outputDir = $"testoutput/{nameof(EventTypeIndexTests)}";
-		FASTERNameIndexPersistence _persistence;
-		NameIndex _sut;
-
-		public EventTypeIndexTests() {
-			TryDeleteDirectory();
-			GenSut();
-		}
-
-		void TryDeleteDirectory() {
-			try {
-				Directory.Delete(_outputDir, recursive: true);
-			} catch { }
-		}
-
-		void GenSut() {
-			_sut?.CancelReservations();
-			_persistence?.Dispose();
-			_persistence = new FASTERNameIndexPersistence(
-				indexName: "EventTypeIndexPersistence",
-				logDir: _outputDir,
-				firstValue: LogV3SystemEventTypes.FirstRealEventTypeNumber,
-				valueInterval: LogV3SystemEventTypes.EventTypeInterval,
-				initialReaderCount: 1,
-				maxReaderCount: 1,
-				enableReadCache: true,
-				checkpointInterval: Timeout.InfiniteTimeSpan);
-
-			_sut = new(
-				indexName: "EventTypeIndex",
-				firstValue: LogV3SystemEventTypes.FirstRealEventTypeNumber,
-				valueInterval: LogV3SystemEventTypes.EventTypeInterval,
-				existenceFilter: new NoNameExistenceFilter(),
-				persistence: _persistence,
-				metastreams: null,
-				recordTypeToHandle: typeof(LogV3EventTypeRecord));
-		}
-
-		public void Dispose() {
-			_persistence?.Dispose();
-			TryDeleteDirectory();
-		}
-
-		[Fact]
-		public void uses_correct_interval() {
-			Assert.False(_sut.GetOrReserve("eventTypeA", out var eventTypeNumberA, out var newNumberA, out var newNameA));
-			Assert.Equal("eventTypeA", newNameA);
-			Assert.Equal(LogV3SystemEventTypes.FirstRealEventTypeNumber, eventTypeNumberA);
-			Assert.Equal(LogV3SystemEventTypes.FirstRealEventTypeNumber, newNumberA);
-
-			Assert.False(_sut.GetOrReserve("eventTypeB", out var eventTypeNumberB, out var newNumberB, out var newNameB));
-			Assert.Equal("eventTypeB", newNameB);
-			Assert.Equal(LogV3SystemEventTypes.FirstRealEventTypeNumber + 1, eventTypeNumberB);
-			Assert.Equal(LogV3SystemEventTypes.FirstRealEventTypeNumber + 1, newNumberB);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/LogV3/LogV3RecordFactoryTests.cs b/src/EventStore.Core.XUnit.Tests/LogV3/LogV3RecordFactoryTests.cs
deleted file mode 100644
index bfc4f25e145..00000000000
--- a/src/EventStore.Core.XUnit.Tests/LogV3/LogV3RecordFactoryTests.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using EventStore.Core.LogV3;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.LogV3 {
-	// we dont want too many tests here, rather pass this factory into the higher up
-	// integration tests like we do for the v2 factory.
-	public class LogV3RecordFactoryTests {
-		readonly Guid _guid1 = Guid.Parse("00000000-0000-0000-0000-000000000001");
-		readonly Guid _guid2 = Guid.Parse("00000000-0000-0000-0000-000000000002");
-		readonly DateTime _dateTime1 = new(0x08_D9_15_80_C3_A1_00_00);
-		readonly long _long1 = 1;
-		readonly long _long2 = 2;
-		readonly long _long4 = 4;
-		readonly uint _uint3000 = 3000;
-		readonly ushort _ushort = 5;
-		readonly string _string1 = "string-one";
-		readonly LogV3RecordFactory _sut = new();
-		readonly PrepareFlags _prepareflags = PrepareFlags.SingleWrite;
-		readonly ReadOnlyMemory<byte> _bytes1 = new byte[] { 0x10 }; 
-		readonly ReadOnlyMemory<byte> _bytes2 = new byte[] { 0x20, 0x01 };
-
-		[Fact]
-		public void can_create_epoch() {
-			var epochNumber = 5;
-			var epochIn = new EpochRecord(
-				epochPosition: _long1,
-				epochNumber: epochNumber,
-				epochId: _guid1,
-				prevEpochPosition: _long2,
-				timeStamp: _dateTime1,
-				leaderInstanceId: _guid2);
-
-			var systemEpoch = _sut.CreateEpoch(epochIn);
-
-			var epochOut = systemEpoch.GetEpochRecord();
-
-			Assert.Equal(_long1, systemEpoch.LogPosition);
-			Assert.Equal(LogRecordType.System, systemEpoch.RecordType);
-			Assert.Equal(SystemRecordType.Epoch, systemEpoch.SystemRecordType);
-			Assert.Equal(_long1, systemEpoch.Version);
-
-			Assert.Equal(epochIn.EpochPosition, epochOut.EpochPosition);
-			Assert.Equal(epochIn.TimeStamp, epochOut.TimeStamp);
-			Assert.Equal(epochIn.EpochId, epochOut.EpochId);
-			Assert.Equal(epochIn.EpochNumber, epochOut.EpochNumber);
-			Assert.Equal(epochIn.PrevEpochPosition, epochOut.PrevEpochPosition);
-			Assert.Equal(epochIn.LeaderInstanceId, epochOut.LeaderInstanceId);
-		}
-
-		[Fact]
-		public void can_create_prepare() {
-			var prepare = _sut.CreatePrepare(
-				logPosition: _long1,
-				correlationId: _guid1,
-				eventId: _guid2,
-				// must be same as logPosition
-				transactionPosition: _long1,
-				// must be 0 since only one event is supported at the moment
-				transactionOffset: 0,
-				eventStreamId: _uint3000,
-				expectedVersion: _long4,
-				timeStamp: _dateTime1,
-				flags: _prepareflags,
-				eventType: _uint3000,
-				data: _bytes1,
-				metadata: _bytes2);
-
-			Assert.Equal(_long1, prepare.LogPosition);
-			Assert.Equal(_guid1, prepare.CorrelationId);
-			Assert.Equal(_guid2, prepare.EventId);
-			Assert.Equal(_long1, prepare.TransactionPosition);
-			Assert.Equal(0, prepare.TransactionOffset);
-			Assert.Equal(_uint3000, prepare.EventStreamId);
-			Assert.Equal(_long4, prepare.ExpectedVersion);
-			Assert.Equal(_dateTime1, prepare.TimeStamp);
-			Assert.Equal(_prepareflags, prepare.Flags);
-			Assert.Equal(_uint3000, prepare.EventType);
-			Assert.Equal(MemoryMarshal.ToEnumerable(_bytes1), MemoryMarshal.ToEnumerable(prepare.Data));
-			Assert.Equal(MemoryMarshal.ToEnumerable(_bytes2), MemoryMarshal.ToEnumerable(prepare.Metadata));
-		}
-
-		[Fact]
-		public void can_create_event_type() {
-			var eventType = (LogV3EventTypeRecord)_sut.CreateEventTypeRecord(
-				eventTypeId: _guid1,
-				parentEventTypeId: _guid2,
-				eventType: _string1,
-				eventTypeNumber: _uint3000,
-				eventTypeVersion: _ushort,
-				logPosition: _long1,
-				timeStamp: _dateTime1);
-			
-			Assert.Equal(_guid1, eventType.EventId);
-			Assert.Equal(_guid2, eventType.ParentEventId);
-			Assert.Equal(_string1, eventType.EventTypeName);
-			Assert.Equal(_uint3000, eventType.EventTypeNumber);
-			Assert.Equal(_ushort, eventType.EventTypeVersion);
-			Assert.Equal(_long1, eventType.LogPosition);
-			Assert.Equal(_dateTime1, eventType.TimeStamp);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/LogV3/LogV3SizerTests.cs b/src/EventStore.Core.XUnit.Tests/LogV3/LogV3SizerTests.cs
deleted file mode 100644
index e225f03b119..00000000000
--- a/src/EventStore.Core.XUnit.Tests/LogV3/LogV3SizerTests.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using EventStore.Core.LogV3;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.LogV3 {
-	public class LogV3SizerTests {
-		[Fact]
-		public void can_get_size() {
-			var sut = new LogV3Sizer();
-			Assert.Equal(4, sut.GetSizeInBytes(12345));
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/LogV3/LogV3StreamExistenceFilterInitializerTests.cs b/src/EventStore.Core.XUnit.Tests/LogV3/LogV3StreamExistenceFilterInitializerTests.cs
deleted file mode 100644
index 4da9de73665..00000000000
--- a/src/EventStore.Core.XUnit.Tests/LogV3/LogV3StreamExistenceFilterInitializerTests.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.LogV3;
-using Xunit;
-using StreamId = System.UInt32;
-
-namespace EventStore.Core.XUnit.Tests.LogV3 {
-	public class LogV3StreamExistenceFilterInitializerTests {
-		[Fact]
-		public void can_initialize_empty() {
-			var sut = new LogV3StreamExistenceFilterInitializer(new MockNameLookup(new()));
-
-			var filter = new MockExistenceFilter();
-			filter.Initialize(sut, 0);
-
-			Assert.Equal(-1, filter.CurrentCheckpoint);
-			Assert.Empty(filter.Streams);
-		}
-
-		[Fact]
-		public void can_initialize_non_empty() {
-			var sut = new LogV3StreamExistenceFilterInitializer(new MockNameLookup(
-				new Dictionary<StreamId, string> {
-					{ 1024, "1024" },
-					{ 1026, "1026" },
-			}));
-
-			var filter = new MockExistenceFilter();
-			filter.Initialize(sut, 0);
-
-			Assert.Equal(1026, filter.CurrentCheckpoint);
-			Assert.True(filter.MightContain("1024"));
-			Assert.True(filter.MightContain("1026"));
-			Assert.False(filter.MightContain("1028"));
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/LogV3/LogV3StreamIdValidatorTests.cs b/src/EventStore.Core.XUnit.Tests/LogV3/LogV3StreamIdValidatorTests.cs
deleted file mode 100644
index 39af7cfab78..00000000000
--- a/src/EventStore.Core.XUnit.Tests/LogV3/LogV3StreamIdValidatorTests.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using EventStore.Core.LogV3;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.LogV3 {
-	public class LogV3StreamIdValidatorTests {
-		readonly LogV3StreamIdValidator _sut = new();
-
-		[Fact]
-		public void accepts_positive() {
-			_sut.Validate(1);
-		}
-
-		[Fact]
-		public void accepts_zero() {
-			_sut.Validate(0);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/LogV3/MockExistenceFilter.cs b/src/EventStore.Core.XUnit.Tests/LogV3/MockExistenceFilter.cs
deleted file mode 100644
index c9e67a6f093..00000000000
--- a/src/EventStore.Core.XUnit.Tests/LogV3/MockExistenceFilter.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.LogAbstraction;
-
-namespace EventStore.Core.XUnit.Tests.LogV3 {
-	public class MockExistenceFilter : INameExistenceFilter {
-		public HashSet<string> Streams { get; } = new();
-
-		public long CurrentCheckpoint { get; set; } = -1;
-
-		public void Add(string name) {
-			Streams.Add(name);
-		}
-
-		public void Add(ulong hash) {
-			throw new System.NotImplementedException();
-		}
-
-		public void Dispose() {
-		}
-
-		public void Initialize(INameExistenceFilterInitializer source, long truncateToPosition) {
-			source.Initialize(this, truncateToPosition);
-		}
-
-		public void TruncateTo(long checkpoint) {
-			CurrentCheckpoint = checkpoint;
-		}
-
-		public void Verify(double corruptionThreshold) { }
-
-		public bool MightContain(string item) {
-			return Streams.Contains(item);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/LogV3/MockNameLookup.cs b/src/EventStore.Core.XUnit.Tests/LogV3/MockNameLookup.cs
deleted file mode 100644
index e134eb26a43..00000000000
--- a/src/EventStore.Core.XUnit.Tests/LogV3/MockNameLookup.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.LogAbstraction;
-using StreamId = System.UInt32;
-
-namespace EventStore.Core.XUnit.Tests.LogV3 {
-	class MockNameLookup : INameLookup<StreamId> {
-		private readonly Dictionary<StreamId, string> _dict;
-
-		public MockNameLookup(Dictionary<StreamId, string> dict) {
-			_dict = dict;
-		}
-
-		public bool TryGetLastValue(out StreamId last) {
-			last = _dict.Count != 0 ? _dict.Keys.Max() : 0;
-			return _dict.Count != 0;
-		}
-
-		public bool TryGetName(StreamId key, out string name) {
-			return _dict.TryGetValue(key, out name);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/LogV3/PartitionManagerTests.cs b/src/EventStore.Core.XUnit.Tests/LogV3/PartitionManagerTests.cs
deleted file mode 100644
index 9f06986a0f2..00000000000
--- a/src/EventStore.Core.XUnit.Tests/LogV3/PartitionManagerTests.cs
+++ /dev/null
@@ -1,242 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.LogV3;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.LogV3 {
-
-	public class PartitionManagerTests {
-		
-		[Fact]
-		public void creates_new_root_partition_on_first_epoch() {
-			var reader = new FakeReader(withoutRecords: true);
-			var writer = new FakeWriter();
-
-			IPartitionManager partitionManager = new PartitionManager(reader, writer, new LogV3RecordFactory());
-			
-			partitionManager.Initialize();
-			
-			Assert.Collection(writer.WrittenRecords,
-				r => {
-					Assert.Equal(LogRecordType.PartitionType, r.RecordType);
-					Assert.IsType<PartitionTypeLogRecord>(r);
-					Assert.Equal("Root", ((PartitionTypeLogRecord)r).Record.StringPayload);
-					Assert.Equal(partitionManager.RootTypeId, ((PartitionTypeLogRecord)r).Record.Header.RecordId);
-					Assert.Equal(Guid.Empty, ((PartitionTypeLogRecord)r).Record.SubHeader.PartitionId);
-				},
-				r => {
-					Assert.Equal(LogRecordType.Partition, r.RecordType);
-					Assert.IsType<PartitionLogRecord>(r);
-					Assert.Equal("Root", ((PartitionLogRecord)r).Record.StringPayload);
-					Assert.Equal(partitionManager.RootId, ((PartitionLogRecord)r).Record.Header.RecordId);
-					Assert.Equal(partitionManager.RootTypeId, ((PartitionLogRecord)r).Record.SubHeader.PartitionTypeId);
-					Assert.Equal(Guid.Empty, ((PartitionLogRecord)r).Record.SubHeader.ParentPartitionId);
-				});
-			
-			Assert.True(writer.IsFlushed);
-		}
-
-		[Fact]
-		public void configures_record_factory_with_root_partition_id() {
-			var reader = new FakeReader();
-			var recordFactory = new LogV3RecordFactory();
-
-			IPartitionManager partitionManager = new PartitionManager(reader, new FakeWriter(), recordFactory);
-			
-			partitionManager.Initialize();
-
-			var streamRecord = (LogV3StreamRecord)recordFactory.CreateStreamRecord(Guid.NewGuid(), 1, DateTime.UtcNow, 1, "stream-1");
-			Assert.Equal(partitionManager.RootId, streamRecord.Record.SubHeader.PartitionId);
-		}
-		
-		[Fact]
-		public void reads_root_partition_once_initialized() {
-			var rootPartitionId = Guid.NewGuid();
-			var rootPartitionTypeId = Guid.NewGuid();
-			var reader = new FakeReader(rootPartitionId, rootPartitionTypeId);
-			var writer = new FakeWriter();
-
-			IPartitionManager partitionManager = new PartitionManager(reader, writer, new LogV3RecordFactory());
-			
-			partitionManager.Initialize();
-			
-			Assert.Empty(writer.WrittenRecords);
-			Assert.Equal(rootPartitionId, partitionManager.RootId);
-			Assert.Equal(rootPartitionTypeId, partitionManager.RootTypeId);
-		}
-		
-		[Fact]
-		public void reads_root_partition_only_once() {
-			var reader = new FakeReader();
-			var writer = new FakeWriter();
-
-			IPartitionManager partitionManager = new PartitionManager(reader, writer, new LogV3RecordFactory());
-
-			partitionManager.Initialize();
-			partitionManager.Initialize();
-			
-			Assert.Empty(writer.WrittenRecords);
-			Assert.Equal(2, reader.ReadCount);
-		}
-		
-		[Fact]
-		public void creates_root_partition_in_case_it_partially_failed_previously() {
-			var rootPartitionTypeId = Guid.NewGuid();
-			var reader = new FakeReader(rootPartitionId: null, rootPartitionTypeId);
-			var writer = new FakeWriter();
-
-			IPartitionManager partitionManager = new PartitionManager(reader, writer, new LogV3RecordFactory());
-		
-			partitionManager.Initialize();
-		
-			Assert.True(partitionManager.RootId.HasValue);
-			Assert.Equal(rootPartitionTypeId, partitionManager.RootTypeId);
-			Assert.Collection(writer.WrittenRecords,
-				r => {
-					Assert.Equal(LogRecordType.Partition, r.RecordType);
-					Assert.IsType<PartitionLogRecord>(r);
-					Assert.Equal("Root", ((PartitionLogRecord)r).Record.StringPayload);
-					Assert.Equal(partitionManager.RootId, ((PartitionLogRecord)r).Record.Header.RecordId);
-					Assert.Equal(partitionManager.RootTypeId, ((PartitionLogRecord)r).Record.SubHeader.PartitionTypeId);
-					Assert.Equal(Guid.Empty, ((PartitionLogRecord)r).Record.SubHeader.ParentPartitionId);
-				});
-		}
-		
-		[Fact]
-		public void throws_on_unexpected_log_record_type() {
-			var reader = new FakeReader(UnexpectedLogRecord);
-
-			IPartitionManager partitionManager = new PartitionManager(reader, new FakeWriter(), new LogV3RecordFactory());
-			
-			Assert.Throws<ArgumentOutOfRangeException>(() => partitionManager.Initialize());
-		}
-		
-		[Fact]
-		public void throws_on_unexpected_system_log_record_type() {
-			var reader = new FakeReader(UnexpectedSystemLogRecord);
-
-			IPartitionManager partitionManager = new PartitionManager(reader, new FakeWriter(), new LogV3RecordFactory());
-			
-			Assert.Throws<ArgumentOutOfRangeException>(() => partitionManager.Initialize());
-		}
-
-		private LogV3StreamRecord UnexpectedLogRecord => new LogV3StreamRecord(
-			streamId: Guid.NewGuid(),
-			logPosition: 0,
-			timeStamp: DateTime.UtcNow,
-			streamNumber: 1,
-			streamName: "unexpected-stream",
-			partitionId: Guid.NewGuid());
-		
-		private SystemLogRecord UnexpectedSystemLogRecord => new SystemLogRecord(
-			logPosition: 0,
-			timeStamp: DateTime.UtcNow,
-			systemRecordType: SystemRecordType.Invalid,
-			systemRecordSerialization: SystemRecordSerialization.Invalid,
-			data: new byte[0]);
-	}
-	
-	class FakeWriter: ITransactionFileWriter {
-		public long Position { get; }
-		public long FlushedPosition { get; }
-
-		public FakeWriter() {
-			WrittenRecords = new List<ILogRecord>();
-		}
-		
-		public bool IsFlushed { get; private set; }
-		public List<ILogRecord> WrittenRecords { get; }
-		
-		public void Open() {}
-		public bool CanWrite(int numBytes) => true;
-		public bool Write(ILogRecord record, out long newPos) {
-			WrittenRecords.Add(record);
-			newPos = record.LogPosition + 1;
-			return true;
-		}
-
-		public void OpenTransaction() => throw new NotImplementedException();
-
-		public void WriteToTransaction(ILogRecord record, out long newPos) => throw new NotImplementedException();
-
-		public bool TryWriteToTransaction(ILogRecord record, out long newPos) => throw new NotImplementedException();
-
-		public void CommitTransaction() => throw new NotImplementedException();
-
-		public bool HasOpenTransaction() => throw new NotImplementedException();
-
-		public void Flush() {
-			IsFlushed = true;
-		}
-
-		public void Close() {}
-
-		public void Dispose() {}
-	}
-	
-	class FakeReader : ITransactionFileReader {
-		private readonly List<SeqReadResult> _results = new List<SeqReadResult>();
-		private int _resultIndex = 0;
-		private int _readCount = 0;
-
-		public int ReadCount => _readCount;
-
-		public FakeReader(ILogRecord record) {
-			_results.Add(new SeqReadResult(true, false, record, 0, 0, 0));
-		}
-		
-		public FakeReader(bool withoutRecords = false) : this(Guid.NewGuid(), Guid.NewGuid(), withoutRecords) {
-		}
-		
-		public FakeReader(Guid? rootPartitionId, Guid? rootPartitionTypeId, bool withoutRecords = false) {
-			if (withoutRecords) {
-				_results.Add(SeqReadResult.Failure);
-				return;
-			}
-
-			if (rootPartitionTypeId.HasValue) {
-				var rootPartitionType = new PartitionTypeLogRecord(
-        			DateTime.UtcNow, 2, rootPartitionTypeId.Value, Guid.Empty, "Root");	
-				
-				_results.Add(new SeqReadResult(true, false, rootPartitionType, 0, 0, 0));
-			}
-
-			if (rootPartitionId.HasValue && rootPartitionTypeId.HasValue) {
-				var rootPartition = new PartitionLogRecord(
-    				DateTime.UtcNow, 3, rootPartitionId.Value, rootPartitionTypeId.Value, Guid.Empty, 0, 0, "Root");
-    			
-    			_results.Add(new SeqReadResult(true, false, rootPartition, 0, 0, 0));			
-			}
-		}
-		
-		public void Reposition(long position) {
-			_resultIndex = (int) position;
-		}
-
-		public SeqReadResult TryReadNext() {
-			_readCount++;
-			
-			if(_resultIndex < _results.Count)
-				return _results[_resultIndex++];
-			
-			return SeqReadResult.Failure;
-		}
-
-		public SeqReadResult TryReadPrev() {
-			throw new NotImplementedException();
-		}
-
-		public RecordReadResult TryReadAt(long position, bool couldBeScavenged) {
-			throw new NotImplementedException();
-		}
-
-		public bool ExistsAt(long position) {
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/LogV3/StreamNameIndexTests.cs b/src/EventStore.Core.XUnit.Tests/LogV3/StreamNameIndexTests.cs
deleted file mode 100644
index 213cb90cbd1..00000000000
--- a/src/EventStore.Core.XUnit.Tests/LogV3/StreamNameIndexTests.cs
+++ /dev/null
@@ -1,392 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.LogAbstraction.Common;
-using EventStore.Core.LogV3;
-using EventStore.Core.LogV3.FASTER;
-using EventStore.Core.TransactionLog.LogRecords;
-using Xunit;
-using StreamId = System.UInt32;
-
-namespace EventStore.Core.XUnit.Tests.LogV3 {
-	public class StreamNameIndexTests : IDisposable {
-		readonly string _outputDir = $"testoutput/{nameof(StreamNameIndexTests)}";
-		FASTERNameIndexPersistence _persistence;
-		NameIndex _sut;
-
-		public StreamNameIndexTests() {
-			TryDeleteDirectory();
-			GenSut();
-		}
-
-		void TryDeleteDirectory() {
-			try {
-				Directory.Delete(_outputDir, recursive: true);
-			} catch { }
-		}
-
-		void GenSut() {
-			_sut?.CancelReservations();
-			_persistence?.Dispose();
-			_persistence = new FASTERNameIndexPersistence(
-				indexName: "StreamNameIndexPersistence",
-				logDir: _outputDir,
-				firstValue: LogV3SystemStreams.FirstRealStream,
-				valueInterval: LogV3SystemStreams.StreamInterval,
-				initialReaderCount: 1,
-				maxReaderCount: 1,
-				enableReadCache: true,
-				checkpointInterval: Timeout.InfiniteTimeSpan);
-
-			_sut = new(
-				indexName: "StreamNameIndex",
-				firstValue: LogV3SystemStreams.FirstRealStream,
-				valueInterval: LogV3SystemStreams.StreamInterval,
-				existenceFilter: new NoNameExistenceFilter(),
-				persistence: _persistence,
-				metastreams: new LogV3Metastreams(),
-				recordTypeToHandle: typeof(LogV3StreamRecord));
-		}
-
-		public void Dispose() {
-			_persistence?.Dispose();
-			TryDeleteDirectory();
-		}
-
-		[Fact]
-		public void can_handle_slightly_larger_name() {
-			// fails if we copy the spanbyte returned from GetKey in scan (!)
-			var name = "abcdefghijklmopqrstuv";
-			_persistence.Add(name, 1024);
-			Assert.Collection(
-				_persistence.Scan(),
-				x => {
-					Assert.Equal(name, x.Name);
-					Assert.Equal(1024U, x.Value);
-				});
-		}
-
-		[Fact]
-		public void can_reserve_and_confirm() {
-			// reserve streamA
-			Assert.False(_sut.GetOrReserve("streamA", out var streamNumber, out var newNumber, out var newName));
-			Assert.Equal("streamA", newName);
-			Assert.Equal(LogV3SystemStreams.FirstRealStream, streamNumber);
-			Assert.Equal(LogV3SystemStreams.FirstRealStream, newNumber);
-
-			// can be found by writer
-			Assert.True(_sut.GetOrReserve("streamA", out streamNumber, out _, out _));
-			Assert.Equal(LogV3SystemStreams.FirstRealStream, streamNumber);
-
-			// cannot be found by reader
-			Assert.False(_persistence.TryGetValue("streamA", out _));
-
-			// confirm (i.e. it has now has been replicated)
-			_sut.Confirm("streamA", streamNumber);
-
-			// can be found by writer and reader
-			Assert.True(_sut.GetOrReserve("streamA", out streamNumber, out _, out _));
-			Assert.Equal(LogV3SystemStreams.FirstRealStream, streamNumber);
-			Assert.True(_persistence.TryGetValue("streamA", out streamNumber));
-			Assert.Equal(LogV3SystemStreams.FirstRealStream, streamNumber);
-		}
-
-		[Fact]
-		public void can_unsolicited_confirm() {
-			_sut.Confirm("streamA", 1024);
-			_sut.Confirm("streamB", 1026);
-			Assert.False(_sut.GetOrReserve("streamC", out var numberC, out _, out _));
-			Assert.Equal(1028U, numberC);
-		}
-
-		[Fact]
-		public void can_cancel_reservations() {
-			Assert.False(_sut.GetOrReserve("streamA", out var numberA, out _, out _));
-			Assert.Equal(1024U, numberA);
-			_sut.CancelReservations();
-			Assert.False(_sut.GetOrReserve("streamC", out var numberC, out _, out _));
-			Assert.Equal(numberA, numberC);
-		}
-
-		[Fact]
-		public async Task can_checkpoint_log() {
-			// reserve A and B
-			Assert.False(_sut.GetOrReserve("streamA", out var numberA, out _, out _));
-			Assert.False(_sut.GetOrReserve("streamB", out var numberB, out _, out _));
-
-			// persist A
-			_sut.Confirm("streamA", numberA);
-
-			// checkpoint (persists to disk)
-			await _persistence.CheckpointLogAsync();
-
-			// simulate restart
-			GenSut();
-
-			// A can be found by writer and reader
-			Assert.True(_sut.GetOrReserve("streamA", out var numberAAfterRecovery, out _, out _));
-			Assert.Equal(numberA, numberAAfterRecovery);
-			Assert.True(_persistence.TryGetValue("streamA", out numberAAfterRecovery));
-			Assert.Equal(numberA, numberAAfterRecovery);
-
-			// B cannot be found by writer or reader
-			Assert.False(_sut.GetOrReserve("streamB", out var _, out _, out _));
-			Assert.False(_persistence.TryGetValue("streamB", out _));
-		}
-
-		[Fact]
-		public async Task can_truncate_then_catchup() {
-			// put a stream into the index and persist it
-			_sut.GetOrReserve("streamA", out var streamAId, out _, out _);
-			await _persistence.CheckpointLogAsync();
-
-			// call init with an empty source, removing streamA.
-			_sut.InitializeWithConfirmed(new MockNameLookup(new()));
-
-			// simulate restart
-			GenSut();
-
-			// when adding new stream
-			_sut.GetOrReserve("streamB", out var streamBId, out _, out _);
-
-			// expect that it has the same id as A, since that was truncated.
-			Assert.Equal(streamAId, streamBId);
-		}
-
-		static readonly IEnumerable<(StreamId StreamId, string StreamName)> _streamsSource =
-			Enumerable
-				.Range(0, int.MaxValue)
-				.Select(x => {
-					var streamId = StreamIdConverter.ToStreamId(x);
-					return (StreamId: streamId, StreamName: $"stream{streamId}");
-				});
-
-		// populate the sut with a given number of confirmed streams.
-		void PopulateSut(int numStreams) {
-			var xs = _streamsSource.Take(numStreams).ToList();
-				
-			foreach (var (streamId, streamName) in xs) {
-				_sut.GetOrReserve(streamName, out var outStreamId, out var _, out var _);
-				Assert.Equal(streamId, outStreamId);
-				_sut.Confirm(streamName, streamId);
-			}
-		}
-
-		void DeleteStreams(int numTotalStreams, int numToDelete) {
-			var streamsStream = GenerateStreamsStream(numTotalStreams - numToDelete);
-			var source = new MockNameLookup(streamsStream.ToDictionary(x => x.StreamId, x => x.StreamName));
-			_sut.InitializeWithConfirmed(source);
-		}
-
-		static IList<(StreamId StreamId, string StreamName)> GenerateStreamsStream(int numStreams) {
-			return _streamsSource.Take(numStreams).ToList();
-		}
-
-		void TestInit(int numInStreamNameIndex, int numInStandardIndex) {
-			// given: sut populated with x streams
-			PopulateSut(numInStreamNameIndex);
-
-			// when: initialisting with source populated with y streams
-			var streamsStream = GenerateStreamsStream(numInStandardIndex);
-			var source = new MockNameLookup(streamsStream.ToDictionary(x => x.StreamId, x => x.StreamName));
-			_sut.InitializeWithConfirmed(source);
-
-			// then: after initialisation sut should contains the same as source.
-			// check that all of the streams stream is in the stream name index
-			var i = 0;
-			for (; i < streamsStream.Count; i++) {
-				var (streamId, streamName) = streamsStream[i];
-				Assert.True(_sut.GetOrReserve(streamName, out var outStreamId, out var _, out var _));
-				Assert.Equal(streamId, outStreamId);
-			}
-
-			// check that the streamnameindex doesn't contain anything extra.
-			foreach (var (name, value) in _persistence.Scan()) {
-				Assert.True(source.TryGetName(value, out var outName));
-				Assert.Equal(name, outName);
-			}
-
-			// and the next created stream has the right number
-			Assert.False(_sut.GetOrReserve($"{Guid.NewGuid()}", out var newStreamId, out var _, out var _));
-			Assert.Equal(streamsStream.Last().StreamId + 2, newStreamId);
-		}
-
-		[Fact]
-		public void on_init_can_catchup() {
-			TestInit(
-				numInStreamNameIndex: 3000,
-				numInStandardIndex: 5000);
-		}
-
-		[Fact]
-		public void on_init_can_catchup_from_0() {
-			TestInit(
-				numInStreamNameIndex: 0,
-				numInStandardIndex: 5000);
-		}
-
-		[Fact]
-		public void on_init_can_truncate() {
-			TestInit(
-				numInStreamNameIndex: 5000,
-				numInStandardIndex: 3000);
-		}
-
-		[Fact]
-		void can_use_read_cache_for_getoradd() {
-			GenSut();
-			var numStreams = 100_000;
-			PopulateSut(numStreams);
-
-			void GetOrReserve() {
-				Assert.True(_sut.GetOrReserve("stream2000", out var streamId, out _, out _));
-				Assert.Equal(2000U, streamId);
-			}
-
-			GetOrReserve();
-
-			var sw = new Stopwatch();
-			sw.Start();
-			for (int i = 0; i < 100_000; i++)
-				GetOrReserve();
-			Assert.True(sw.ElapsedMilliseconds < 1000);
-		}
-
-		[Fact]
-		void can_use_read_cache_for_lookup() {
-			GenSut();
-			var numStreams = 100_000;
-			PopulateSut(numStreams);
-
-			Assert.Equal(2000U, _persistence.LookupValue("stream2000"));
-
-			var sw = new Stopwatch();
-			sw.Start();
-			for (int i = 0; i < 100_000; i++)
-				Assert.Equal(2000U, _persistence.LookupValue("stream2000"));
-			Assert.True(sw.ElapsedMilliseconds < 1000);
-		}
-
-		[Fact]
-		public void can_scan() {
-			var numStreams = 5000;
-			PopulateSut(numStreams);
-
-			var scanned = _persistence.Scan().ToList();
-
-			Assert.Equal(numStreams, scanned.Count);
-
-			var expectedStreamId = LogV3SystemStreams.FirstRealStream;
-			for (int i = 0; i < numStreams; i++) {
-				Assert.Equal(expectedStreamId, scanned[i].Value);
-				Assert.Equal($"stream{expectedStreamId}", scanned[i].Name);
-				expectedStreamId += LogV3SystemStreams.StreamInterval;
-			}
-		}
-
-		[Fact]
-		public void can_scan_backwards() {
-			var numStreams = 5000;
-			PopulateSut(numStreams);
-
-			var scanned = _persistence.ScanBackwards().ToList();
-			scanned.Reverse();
-
-			Assert.Equal(numStreams, scanned.Count);
-
-			var expectedStreamId = LogV3SystemStreams.FirstRealStream;
-			for (int i = 0; i < numStreams; i++) {
-				Assert.Equal(expectedStreamId, scanned[i].Value);
-				Assert.Equal($"stream{expectedStreamId}", scanned[i].Name);
-				expectedStreamId += LogV3SystemStreams.StreamInterval;
-			}
-		}
-
-		[Fact]
-		public void can_scan_empty_range() {
-			var numStreams = 10000;
-			PopulateSut(numStreams);
-
-			var scanned = _persistence.Scan(0, 0).ToList();
-			Assert.Empty(scanned);
-		}
-
-		[Fact]
-		public void can_scan_forwards_skipping_truncated() {
-			var numStreams = 10000;
-			var deletedStreams = 500;
-			var remainingStreams = numStreams - deletedStreams;
-			PopulateSut(numStreams);
-			DeleteStreams(numStreams, deletedStreams);
-
-			var scanned = _persistence.Scan().ToList();
-
-			Assert.Equal(remainingStreams, scanned.Count);
-
-			var expectedStreamId = LogV3SystemStreams.FirstRealStream;
-			for (int i = 0; i < remainingStreams; i++) {
-				Assert.Equal(expectedStreamId, scanned[i].Value);
-				Assert.Equal($"stream{expectedStreamId}", scanned[i].Name);
-				expectedStreamId += LogV3SystemStreams.StreamInterval;
-			}
-		}
-
-		[Fact]
-		public void can_scan_backwards_skipping_truncated() {
-			var numStreams = 10000;
-			var deletedStreams = 500;
-			var remainingStreams = numStreams - deletedStreams;
-			PopulateSut(numStreams);
-			DeleteStreams(numStreams, deletedStreams);
-
-			var scanned = _persistence.ScanBackwards().ToList();
-			scanned.Reverse();
-
-			Assert.Equal(remainingStreams, scanned.Count);
-
-			var expectedStreamId = LogV3SystemStreams.FirstRealStream;
-			for (int i = 0; i < remainingStreams; i++) {
-				Assert.Equal(expectedStreamId, scanned[i].Value);
-				Assert.Equal($"stream{expectedStreamId}", scanned[i].Name);
-				expectedStreamId += LogV3SystemStreams.StreamInterval;
-			}
-		}
-
-		[Fact(Skip = "slow ~10s")]
-		//[Fact]
-		public void can_have_multiple_readers() {
-			var numStreams = 100_000;
-			PopulateSut(numStreams);
-
-			var mres = new ManualResetEventSlim();
-			void RunThread() {
-				try {
-					var expectedStreamId = LogV3SystemStreams.FirstRealStream;
-					for (int i = 0; i < numStreams; i++) {
-						var streamId = _persistence.LookupValue($"stream{expectedStreamId}");
-						if (streamId != expectedStreamId)
-							mres.Set();
-						expectedStreamId += LogV3SystemStreams.StreamInterval;
-					}
-				} catch {
-					mres.Set();
-				}
-			}
-
-			var t1 = new Thread(RunThread);
-			var t2 = new Thread(RunThread);
-
-			t1.Start();
-			t2.Start();
-
-			t1.Join();
-			t2.Join();
-
-			Assert.False(mres.IsSet);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Metrics/AverageMetricTests.cs b/src/EventStore.Core.XUnit.Tests/Metrics/AverageMetricTests.cs
deleted file mode 100644
index 15de132deea..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Metrics/AverageMetricTests.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System.Diagnostics.Metrics;
-using EventStore.Core.Metrics;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Metrics;
-
-public class AverageMetricTests {
-	[Fact]
-	public void calculates_average() {
-		using var meter = new Meter($"{typeof(QueueProcessingTrackerTests)}");
-		using var listener = new TestMeterListener<double>(meter);
-		var sut = new AverageMetric(meter, "the-metric", "seconds", label => new("queue", label));
-		sut.Register("readers", () => 1);
-		sut.Register("readers", () => 2);
-		sut.Register("writer", () => 3);
-		listener.Observe();
-
-		Assert.Collection(
-			listener.RetrieveMeasurements("the-metric-seconds"),
-			m => {
-				Assert.Equal(1.5, m.Value);
-				Assert.Collection(
-					m.Tags,
-					t => {
-						Assert.Equal("queue", t.Key);
-						Assert.Equal("readers", t.Value);
-					});
-			},
-			m => {
-				Assert.Equal(3, m.Value);
-				Assert.Collection(
-					m.Tags,
-					t => {
-						Assert.Equal("queue", t.Key);
-						Assert.Equal("writer", t.Value);
-					});
-			});
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Metrics/CacheResourcesTrackerTests.cs b/src/EventStore.Core.XUnit.Tests/Metrics/CacheResourcesTrackerTests.cs
deleted file mode 100644
index 459fda7b993..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Metrics/CacheResourcesTrackerTests.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using System.Diagnostics.Metrics;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using EventStore.Core.Metrics;
-using EventStore.Core.Tests;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Metrics;
-
-public sealed class CacheResourcesTrackerTests : IDisposable {
-	private readonly Disposables _disposables = new();
-
-	public void Dispose() {
-		_disposables?.Dispose();
-	}
-
-	private (CacheResourcesTracker, TestMeterListener<long>) GenSut(
-		[CallerMemberName] string callerName = "") {
-
-		var meter = new Meter($"{typeof(CacheResourcesTrackerTests)}-{callerName}").DisposeWith(_disposables);
-		var listener = new TestMeterListener<long>(meter).DisposeWith(_disposables);
-		var metrics = new CacheResourcesMetrics(meter, "the-metric");
-		var sut =  new CacheResourcesTracker(metrics);
-		return (sut, listener);
-	}
-
-	[Fact]
-	public void observes_all_caches() {
-		var (sut, listener) = GenSut();
-
-		sut.Register("cacheA", Caching.ResizerUnit.Entries, () => new("", "",
-			capacity: 1,
-			size: 2,
-			count: 3,
-			numChildren: 0));
-
-		sut.Register("cacheB", Caching.ResizerUnit.Bytes, () => new("", "",
-			capacity: 4,
-			size: 5,
-			count: 6,
-			numChildren: 0));
-
-		listener.Observe();
-		AssertMeasurements(listener, "the-metric-entries",
-			AssertMeasurement("cacheA", "capacity", 1),
-			AssertMeasurement("cacheA", "size", 2),
-			AssertMeasurement("cacheA", "count", 3),
-			AssertMeasurement("cacheB", "count", 6));
-
-		AssertMeasurements(listener, "the-metric-bytes",
-			AssertMeasurement("cacheB", "capacity", 4),
-			AssertMeasurement("cacheB", "size", 5));
-	}
-
-	static Action<TestMeterListener<long>.TestMeasurement> AssertMeasurement(
-		string cacheKey,
-		string kind,
-		long expectedValue) =>
-
-		actualMeasurement => {
-			Assert.Equal(expectedValue, actualMeasurement.Value);
-			Assert.Collection(
-				actualMeasurement.Tags.ToArray(),
-				tag => {
-					Assert.Equal("cache", tag.Key);
-					Assert.Equal(cacheKey, tag.Value);
-				},
-				tag => {
-					Assert.Equal("kind", tag.Key);
-					Assert.Equal(kind, tag.Value);
-				});
-		};
-
-	static void AssertMeasurements(
-		TestMeterListener<long> listener,
-		string metric,
-		params Action<TestMeterListener<long>.TestMeasurement>[] actions) {
-
-		Assert.Collection(listener.RetrieveMeasurements(metric), actions);
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Metrics/DurationTrackerTests.cs b/src/EventStore.Core.XUnit.Tests/Metrics/DurationTrackerTests.cs
deleted file mode 100644
index 7b83c78d4d7..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Metrics/DurationTrackerTests.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System;
-using System.Diagnostics.Metrics;
-using EventStore.Core.Metrics;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Metrics {
-	public class DurationTrackerTests : IDisposable {
-		private readonly TestMeterListener<double> _listener;
-		private readonly FakeClock _clock = new();
-		private readonly DurationTracker _sut;
-
-		public DurationTrackerTests() {
-			var meter = new Meter($"{typeof(DurationTrackerTests)}");
-			_listener = new TestMeterListener<double>(meter);
-			var durationMetric = new DurationMetric(meter, "the-histogram", _clock);
-			_sut = new DurationTracker(durationMetric, "the-duration");
-		}
-
-		public void Dispose() {
-			_listener.Dispose();
-		}
-
-		[Fact]
-		public void records_success() {
-			_clock.SecondsSinceEpoch = 500;
-			using (_sut.Start()) {
-				_clock.SecondsSinceEpoch = 501;
-			}
-
-			AssertMeasurements("successful", 1);
-		}
-
-		[Fact]
-		public void records_failure() {
-			_clock.SecondsSinceEpoch = 500;
-			using (var duration = _sut.Start()) {
-				_clock.SecondsSinceEpoch = 501;
-				duration.SetException(new Exception("failed"));
-			}
-
-			AssertMeasurements("failed", 1);
-		}
-
-		void AssertMeasurements(
-			string expectedStatus,
-			int expectedValue) {
-
-			Assert.Collection(
-				_listener.RetrieveMeasurements("the-histogram-seconds"),
-				m => {
-					Assert.Equal(expectedValue, m.Value);
-					Assert.Collection(
-						m.Tags,
-						t => {
-							Assert.Equal("activity", t.Key);
-							Assert.Equal("the-duration", t.Value);
-						},
-						t => {
-							Assert.Equal("status", t.Key);
-							Assert.Equal(expectedStatus, t.Value);
-						});
-				});
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Metrics/ElectionsCounterTrackerTests.cs b/src/EventStore.Core.XUnit.Tests/Metrics/ElectionsCounterTrackerTests.cs
deleted file mode 100644
index 8e4207d0a5b..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Metrics/ElectionsCounterTrackerTests.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Metrics;
-using System.Net;
-using System.Runtime.CompilerServices;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Metrics;
-using EventStore.Core.Tests;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Metrics;
-
-public class ElectionsCounterTrackerTests : IDisposable {
-	private readonly Disposables _disposables = new();
-	private readonly ElectionMessage.ElectionsDone _electionsDoneMessage;
-
-	public ElectionsCounterTrackerTests() {
-		var endPoint = new DnsEndPoint("127.0.0.1", 1113);
-		var memberInfo = Cluster.MemberInfo.Initial(Guid.Empty, DateTime.UtcNow,
-			VNodeState.Unknown, true,
-			endPoint, endPoint, endPoint, endPoint, endPoint,
-			null, 0, 0, 0, false);
-		_electionsDoneMessage = new ElectionMessage.ElectionsDone(1, 1, memberInfo);
-	}
-
-	public void Dispose() {
-		_disposables?.Dispose();
-	}
-
-	private (ElectionsCounterTracker, TestMeterListener<long>) GenSut(
-		[CallerMemberName] string callerName = "") {
-
-		var meter = new Meter($"{typeof(ElectionsCounterTrackerTests)}--{callerName}").DisposeWith(_disposables);
-		var listener = new TestMeterListener<long>(meter).DisposeWith(_disposables);
-		var metric = new CounterMetric(meter, "test-metric", unit: "");
-		var sut = new ElectionsCounterTracker(new CounterSubMetric(metric, []));
-
-		return (sut, listener);
-	}
-
-	[Fact]
-	public void test_election_count_for_one_election() {
-		var (sut, listener) = GenSut();
-		sut.Handle(_electionsDoneMessage);
-
-		AssertMeasurements(listener, AssertMeasurement(1));
-	}
-
-	[Fact]
-	public void test_election_count_for_five_elections() {
-		var (sut, listener) = GenSut();
-		sut.Handle(_electionsDoneMessage);
-		sut.Handle(_electionsDoneMessage);
-		sut.Handle(_electionsDoneMessage);
-		sut.Handle(_electionsDoneMessage);
-		sut.Handle(_electionsDoneMessage);
-
-		AssertMeasurements(listener, AssertMeasurement(5));
-	}
-
-	static Action<TestMeterListener<long>.TestMeasurement> AssertMeasurement(
-		int expectedValue) =>
-		actualMeasurement => {
-			Assert.Equal(expectedValue, actualMeasurement.Value);
-		};
-
-	static void AssertMeasurements(
-		TestMeterListener<long> listener,
-		params Action<TestMeterListener<long>.TestMeasurement>[] actions) {
-
-		listener.Observe();
-		Assert.Collection(listener.RetrieveMeasurements("test-metric"), actions);
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Metrics/FakeClock.cs b/src/EventStore.Core.XUnit.Tests/Metrics/FakeClock.cs
deleted file mode 100644
index 0238f27279c..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Metrics/FakeClock.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using EventStore.Core.Time;
-
-namespace EventStore.Core.XUnit.Tests.Metrics {
-	internal class FakeClock : IClock {
-		public Instant Now => Instant.FromSeconds(SecondsSinceEpoch);
-
-		public long SecondsSinceEpoch { get; set; }
-
-		public void AdvanceSeconds(long seconds) {
-			SecondsSinceEpoch += seconds;
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Metrics/InstantTests.cs b/src/EventStore.Core.XUnit.Tests/Metrics/InstantTests.cs
deleted file mode 100644
index 3ce1c8ad957..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Metrics/InstantTests.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using EventStore.Core.Time;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Metrics;
-
-public class InstantTests {
-	[Fact]
-	public void can_measure_elapsed() {
-		var x = Instant.FromSeconds(4);
-		var y = Instant.FromSeconds(6);
-		Assert.Equal(2, y.ElapsedSecondsSince(x));
-	}
-
-	[Fact]
-	public void add() {
-		Assert.Equal(
-			Instant.FromSeconds(4),
-			Instant.FromSeconds(3).Add(TimeSpan.FromSeconds(1)));
-	}
-
-	[Fact]
-	public void equal_to() {
-		Assert.False(Instant.FromSeconds(3) == Instant.FromSeconds(4));
-		Assert.True(Instant.FromSeconds(3) == Instant.FromSeconds(3));
-	}
-
-	[Fact]
-	public void not_equal_to() {
-		Assert.True(Instant.FromSeconds(3) != Instant.FromSeconds(4));
-		Assert.False(Instant.FromSeconds(3) != Instant.FromSeconds(3));
-	}
-
-	[Fact]
-	public void less_than() {
-		Assert.True(Instant.FromSeconds(3) < Instant.FromSeconds(4));
-		Assert.False(Instant.FromSeconds(3) < Instant.FromSeconds(3));
-		Assert.False(Instant.FromSeconds(3) < Instant.FromSeconds(2));
-	}
-
-	[Fact]
-	public void greater_than() {
-		Assert.False(Instant.FromSeconds(3) > Instant.FromSeconds(4));
-		Assert.False(Instant.FromSeconds(3) > Instant.FromSeconds(3));
-		Assert.True(Instant.FromSeconds(3) > Instant.FromSeconds(2));
-	}
-
-	[Fact]
-	public void less_than_or_equal_to() {
-		Assert.True(Instant.FromSeconds(3) <= Instant.FromSeconds(4));
-		Assert.True(Instant.FromSeconds(3) <= Instant.FromSeconds(3));
-		Assert.False(Instant.FromSeconds(3) <= Instant.FromSeconds(2));
-	}
-
-	[Fact]
-	public void greater_than_or_equal_to() {
-		Assert.False(Instant.FromSeconds(3) >= Instant.FromSeconds(4));
-		Assert.True(Instant.FromSeconds(3) >= Instant.FromSeconds(3));
-		Assert.True(Instant.FromSeconds(3) >= Instant.FromSeconds(2));
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Metrics/QueueBusyTrackerTests.cs b/src/EventStore.Core.XUnit.Tests/Metrics/QueueBusyTrackerTests.cs
deleted file mode 100644
index e658dcf0dcb..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Metrics/QueueBusyTrackerTests.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Diagnostics.Metrics;
-using System.Threading.Tasks;
-using EventStore.Core.Metrics;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Metrics;
-
-public class QueueBusyTrackerTests {
-	[Fact]
-	public async Task records() {
-		using var meter = new Meter($"{typeof(QueueProcessingTrackerTests)}");
-		using var listener = new TestMeterListener<double>(meter);
-		var metric = new AverageMetric(meter, "the-metric", "seconds", label => new("queue", label));
-		var sut = new QueueBusyTracker(metric, "the-queue");
-
-		sut.EnterBusy();
-		await Task.Delay(1);
-		sut.EnterIdle();
-		listener.Observe();
-
-		Assert.Collection(
-			listener.RetrieveMeasurements("the-metric-seconds"),
-			m => {
-				Assert.True(m.Value > 0.0001);
-				Assert.Collection(
-					m.Tags,
-					t => {
-						Assert.Equal("queue", t.Key);
-						Assert.Equal("the-queue", t.Value);
-					});
-			});
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Metrics/QueueProcessingTrackerTests.cs b/src/EventStore.Core.XUnit.Tests/Metrics/QueueProcessingTrackerTests.cs
deleted file mode 100644
index 8ce2b79cb76..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Metrics/QueueProcessingTrackerTests.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Diagnostics.Metrics;
-using EventStore.Core.Metrics;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Metrics {
-	public class QueueProcessingTrackerTests : IDisposable {
-		private readonly TestMeterListener<double> _listener;
-		private readonly FakeClock _clock = new();
-		private readonly QueueProcessingTracker _sut;
-
-		public QueueProcessingTrackerTests() {
-			var meter = new Meter($"{typeof(QueueProcessingTrackerTests)}");
-			var metric = new DurationMetric(meter, "the-metric", _clock);
-			_listener = new TestMeterListener<double>(meter);
-			_sut = new(metric, "the-queue");
-		}
-
-		public void Dispose() {
-			_listener.Dispose();
-		}
-
-		[Fact]
-		public void records() {
-			_clock.SecondsSinceEpoch = 500;
-			var start = _clock.Now;
-			_clock.SecondsSinceEpoch = 501;
-			var end = _sut.RecordNow(start, "the-message-type");
-			var elapsedSeconds = end.ElapsedSecondsSince(start);
-			Assert.Equal(1.000, elapsedSeconds);
-			AssertMeasurements(1);
-		}
-
-		void AssertMeasurements(int expectedValue) {
-
-			Assert.Collection(
-				_listener.RetrieveMeasurements("the-metric-seconds"),
-				m => {
-					Assert.Equal(expectedValue, m.Value);
-					Assert.Collection(
-						m.Tags,
-						t => {
-							Assert.Equal("queue", t.Key);
-							Assert.Equal("the-queue", t.Value);
-						},
-						t => {
-							Assert.Equal("message-type", t.Key);
-							Assert.Equal("the-message-type", t.Value);
-						});
-				});
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Metrics/QueueTrackersTests.cs b/src/EventStore.Core.XUnit.Tests/Metrics/QueueTrackersTests.cs
deleted file mode 100644
index 7b7c77bdf22..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Metrics/QueueTrackersTests.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-using EventStore.Core.Metrics;
-using EventStore.Core.Time;
-using Xunit;
-using Conf = EventStore.Common.Configuration.MetricsConfiguration;
-
-namespace EventStore.Core.XUnit.Tests.Metrics {
-	public class QueueTrackersTests {
-		[Fact]
-		public void default_trackers_yields_noop_tracker() {
-			var sut = new QueueTrackers();
-			var tracker = sut.GetTrackerForQueue("MainQueue");
-			Assert.Equal("NoOp", tracker.Name);
-		}
-
-		[Fact]
-		public void not_matched_yields_noop_tracker() {
-			var sut = GenSut(
-				new Conf.LabelMappingCase {
-					Regex = "MainQueue",
-					Label = "MainQueue",
-				});
-
-
-			var tracker = sut.GetTrackerForQueue("MainQueue");
-			Assert.Equal("MainQueue", tracker.Name);
-
-			tracker = sut.GetTrackerForQueue("WriterQueue");
-			Assert.Equal("NoOp", tracker.Name);
-		}
-
-		[Fact]
-		public void empty_tracker_yields_no_op() {
-			var sut = GenSut(
-				new Conf.LabelMappingCase {
-					Regex = "MainQueue",
-					Label = "",
-				},
-				new Conf.LabelMappingCase {
-					Regex = "WriterQueue",
-					Label = "WriterQueue",
-				});
-
-
-			var tracker = sut.GetTrackerForQueue("WriterQueue");
-			Assert.Equal("WriterQueue", tracker.Name);
-
-			tracker = sut.GetTrackerForQueue("MainQueue");
-			Assert.Equal("NoOp", tracker.Name);
-		}
-
-		[Fact]
-		public void unspecified_label_yields_no_op() {
-			var sut = GenSut(
-				new Conf.LabelMappingCase {
-					Regex = "MainQueue",
-					// no Label
-				});
-
-			var tracker = sut.GetTrackerForQueue("MainQueue");
-			Assert.Equal("NoOp", tracker.Name);
-		}
-
-		[Fact]
-		public void unspecified_regex_does_not_match() {
-			var sut = GenSut(
-				new Conf.LabelMappingCase {
-					// no Regex
-					Label = "MainQueue",
-				});
-
-			var tracker = sut.GetTrackerForQueue("MainQueue");
-			Assert.Equal("NoOp", tracker.Name);
-		}
-
-		[Fact]
-		public void patterns_applied_in_order() {
-			var sut = GenSut(
-				new Conf.LabelMappingCase {
-					Regex = "MainQueue",
-					Label = "MainQueue",
-				},
-				new Conf.LabelMappingCase {
-					Regex = ".*",
-					Label = "OtherQueue",
-				});
-
-			var tracker = sut.GetTrackerForQueue("MainQueue");
-			Assert.Equal("MainQueue", tracker.Name);
-
-			tracker = sut.GetTrackerForQueue("WriterQueue");
-			Assert.Equal("OtherQueue", tracker.Name);
-		}
-
-		[Fact]
-		public void matches_groups() {
-			var sut = GenSut(
-				new Conf.LabelMappingCase {
-					Regex = "Worker #(.*)",
-					Label = "Worker Queue $1",
-				});
-
-			var tracker = sut.GetTrackerForQueue("Worker #3");
-			Assert.Equal("Worker Queue 3", tracker.Name);
-		}
-
-		QueueTrackers GenSut(params Conf.LabelMappingCase[] map) =>
-			new(map,
-				x => new FakeTracker { Name = x },
-				x => new FakeTracker { Name = x },
-				x => new FakeTracker { Name = x });
-
-		class FakeTracker : IDurationMaxTracker, IQueueProcessingTracker, IQueueBusyTracker {
-			public string Name { get; init; }
-
-			public void EnterBusy() {
-			}
-
-			public void EnterIdle() {
-			}
-
-			public Instant RecordNow(Instant start) => start;
-
-			public Instant RecordNow(Instant start, string messageType) => start;
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Metrics/TestMeterListener.cs b/src/EventStore.Core.XUnit.Tests/Metrics/TestMeterListener.cs
deleted file mode 100644
index 350100d447b..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Metrics/TestMeterListener.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Metrics;
-
-namespace EventStore.Core.XUnit.Tests.Metrics {
-	public class TestMeterListener<T> : IDisposable where T : struct {
-		private readonly MeterListener _listener;
-		private readonly Dictionary<string, List<TestMeasurement>> _measurementsByInstrument;
-
-		public TestMeterListener(Meter meter) {
-			_measurementsByInstrument = new();
-			_listener = new MeterListener {
-				InstrumentPublished = (instrument, listener) => {
-					if (instrument.Meter == meter) {
-						listener.EnableMeasurementEvents(instrument);
-					}
-				}
-			};
-			_listener.SetMeasurementEventCallback<T>(OnMeasurement);
-			_listener.Start();
-		}
-
-		public void Dispose() {
-			_listener?.Dispose();
-		}
-
-		public void Observe() {
-			_listener.RecordObservableInstruments();
-		}
-
-		// gets the measurements for a given instrument and clears them
-		public IReadOnlyList<TestMeasurement> RetrieveMeasurements(string instrumentName) {
-			if (!_measurementsByInstrument.Remove(instrumentName, out var measurements)) {
-				return Array.Empty<TestMeasurement>();
-			}
-
-			return measurements;
-		}
-
-		private void OnMeasurement(
-			Instrument instrument,
-			T value,
-			ReadOnlySpan<KeyValuePair<string, object>> tags,
-			object state) {
-
-			var instrumentName = GenName(instrument);
-			if (!_measurementsByInstrument.TryGetValue(instrumentName, out var measurements)) {
-				measurements = new();
-				_measurementsByInstrument[instrumentName] = measurements;
-			}
-
-			measurements.Add(new TestMeasurement {
-				Value = value,
-				Tags = tags.ToArray(),
-			});
-		}
-
-		private static string GenName(Instrument instrument) =>
-			string.IsNullOrWhiteSpace(instrument.Unit)
-			? instrument.Name
-			: instrument.Name + "-" + instrument.Unit;
-
-		public class TestMeasurement {
-			public T Value { get; init; }
-			public KeyValuePair<string, object>[] Tags { get; init; }
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/ArrayExtensions.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/ArrayExtensions.cs
deleted file mode 100644
index 9f42900750a..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/ArrayExtensions.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Linq;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public static class ArrayExtensions {
-		public static T[] KeepIndexes<T>(this T[] self, params int[] indexes) {
-			foreach (var i in indexes) {
-				Assert.True(i < self.Length, $"error in test: index {i} does not exist");
-			}
-
-			return self.Where((x, i) => indexes.Contains(i)).ToArray();
-		}
-
-		public static T[] KeepNone<T>(this T[] self) => Array.Empty<T>();
-
-		public static T[] KeepAll<T>(this T[] self) => self;
-	}
-
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/CalculationStatusTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/CalculationStatusTests.cs
deleted file mode 100644
index 5f9035ebc10..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/CalculationStatusTests.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.Scavenging;
-using EventStore.Core.XUnit.Tests.Scavenge.Sqlite;
-using Xunit;
-using static EventStore.Core.XUnit.Tests.Scavenge.StreamMetadatas;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class CalculationStatusTests : SqliteDbPerTest<CalculationStatusTests> {
-		async Task RunAsync(
-			CalculationStatus expected,
-			StreamMetadata metadata,
-			int numEvents,
-			bool isTombstoned) {
-
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", metadata: metadata))
-					.Chunk(Enumerable
-						.Range(0, numEvents)
-						.Select(_ => Rec.Write(t++, "ab-1"))
-						.ToArray())
-					.Chunk(isTombstoned
-						? Rec.CommittedDelete(t++, "ab-1")
-						: Rec.Write(t++, "cd-2"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertState(state => {
-					if (expected == CalculationStatus.Spent) {
-						// it should be deleted
-						Assert.False(state.TryGetOriginalStreamData("ab-1", out _));
-					} else {
-						// it should be present with the expected status
-						Assert.True(state.TryGetOriginalStreamData("ab-1", out var data));
-						Assert.Equal(expected, data.Status);
-					}
-				})
-				.RunAsync();
-
-		}
-
-		[Fact]
-		public async Task max_age() {
-			await RunAsync(
-				expected: CalculationStatus.Active,
-				metadata: new StreamMetadata(maxAge: TimeSpan.FromMinutes(1)),
-				numEvents: 1,
-				isTombstoned: false);
-		}
-
-		[Fact]
-		public async Task max_count() {
-			await RunAsync(
-				expected: CalculationStatus.Active,
-				metadata: new StreamMetadata(maxCount: 1),
-				numEvents: 1,
-				isTombstoned: false);
-		}
-
-		[Fact]
-		public async Task truncate_before_active() {
-			await RunAsync(
-				expected: CalculationStatus.Active,
-				metadata: new StreamMetadata(truncateBefore: 5),
-				numEvents: 5,
-				isTombstoned: false);
-		}
-
-		[Fact]
-		public async Task truncate_before_spent() {
-			await RunAsync(
-				expected: CalculationStatus.Spent,
-				metadata: new StreamMetadata(truncateBefore: 5),
-				numEvents: 6,
-				isTombstoned: false);
-		}
-
-		[Fact]
-		public async Task truncate_before_max() {
-			await RunAsync(
-				expected: CalculationStatus.Spent,
-				metadata: SoftDelete,
-				numEvents: 6,
-				isTombstoned: false);
-		}
-
-		[Fact]
-		public async Task tombstoned() {
-			await RunAsync(
-				expected: CalculationStatus.Archived,
-				metadata: new StreamMetadata(),
-				numEvents: 1,
-				isTombstoned: true);
-		}
-
-		[Fact]
-		public async Task tombstoned_and_max_age() {
-			await RunAsync(
-				expected: CalculationStatus.Archived,
-				metadata: new StreamMetadata(maxAge: TimeSpan.FromMinutes(1)),
-				numEvents: 1,
-				isTombstoned: true);
-		}
-
-		[Fact]
-		public async Task tombstoned_and_max_count() {
-			await RunAsync(
-				expected: CalculationStatus.Archived,
-				metadata: new StreamMetadata(maxCount: 1),
-				numEvents: 1,
-				isTombstoned: true);
-		}
-
-		[Fact]
-		public async Task tombstoned_and_truncate_before_active() {
-			await RunAsync(
-				expected: CalculationStatus.Archived,
-				metadata: new StreamMetadata(truncateBefore: 5),
-				numEvents: 5,
-				isTombstoned: true);
-		}
-
-		[Fact]
-		public async Task tombstoned_and_truncate_before_spent() {
-			await RunAsync(
-				expected: CalculationStatus.Archived,
-				metadata: new StreamMetadata(truncateBefore: 5),
-				numEvents: 6,
-				isTombstoned: true);
-		}
-
-		[Fact]
-		public async Task tombstoned_and_truncate_before_max() {
-			await RunAsync(
-				expected: CalculationStatus.Archived,
-				metadata: SoftDelete,
-				numEvents: 6,
-				isTombstoned: true);
-		}
-
-		[Fact]
-		public async Task blank() {
-			await RunAsync(
-				expected: CalculationStatus.Spent,
-				metadata: new StreamMetadata(),
-				numEvents: 1,
-				isTombstoned: false);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/CancellationAndContinuationTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/CancellationAndContinuationTests.cs
deleted file mode 100644
index bf90d48d3e5..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/CancellationAndContinuationTests.cs
+++ /dev/null
@@ -1,910 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Scavenging;
-using EventStore.Core.XUnit.Tests.Scavenge.Sqlite;
-using Xunit;
-using static EventStore.Core.XUnit.Tests.Scavenge.StreamMetadatas;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class CancellationAndContinuationTests : SqliteDbPerTest<CancellationAndContinuationTests> {
-		// in these tests we we want to
-		// - run a scavenge
-		// - have a log record trigger the cancellation of that scavenge at a particular point
-		// - check that the checkpoint has been set correctly in the scavenge state
-		// - complete the scavenge
-		// - check it continued from the checkpoint
-		// - check it produced the right results
-
-		[Fact]
-		public async Task accumulator_checkpoints_immediately() {
-			var t = 0;
-			var logger = new FakeTFScavengerLog();
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$cd-cancel-accumulation"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.WithLogger(logger)
-				.CancelWhenAccumulatingMetaRecordFor("cd-cancel-accumulation")
-				.AssertTrace(
-					Tracer.Line("Accumulating from start to SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 0"),
-					Tracer.Line("    Rollback"),
-					Tracer.Line("Exception accumulating"))
-				.AssertState(state => {
-					Assert.Equal(ScavengeResult.Stopped, logger.Result);
-					Assert.True(state.TryGetCheckpoint(out var checkpoint));
-					var accumulating = Assert.IsType<ScavengeCheckpoint.Accumulating>(checkpoint);
-					Assert.Null(accumulating.DoneLogicalChunkNumber);
-				})
-				.RunAsync();
-		}
-
-		[Fact]
-		public async Task calculator_checkpoints_immediately() {
-			var t = 0;
-			var logger = new FakeTFScavengerLog();
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "cd-cancel-calculation"),
-						Rec.Write(t++, "$$cd-cancel-calculation", metadata: MaxCount1))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.WithLogger(logger)
-				.CancelWhenCalculatingOriginalStream("cd-cancel-calculation")
-				.AssertTrace(
-					Tracer.Line("Accumulating from start to SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 0"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 1"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Calculating SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("    Rollback"),
-					Tracer.Line("Exception calculating"))
-				.AssertState(state => {
-					Assert.Equal(ScavengeResult.Stopped, logger.Result);
-					Assert.True(state.TryGetCheckpoint(out var checkpoint));
-					var calculating = Assert.IsType<ScavengeCheckpoint.Calculating<string>>(checkpoint);
-					Assert.Equal("None", calculating.DoneStreamHandle.ToString());
-				})
-				.RunAsync();
-		}
-
-		[Fact]
-		public async Task chunk_executor_checkpoints_immediately() {
-			var t = 0;
-			var logger = new FakeTFScavengerLog();
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "$$ab-1", metadata: MaxCount1),
-						Rec.Write(t++, "cd-cancel-chunk-execution"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.WithLogger(logger)
-				.CancelWhenExecutingChunk("cd-cancel-chunk-execution")
-				.AssertTrace(
-					Tracer.Line("Accumulating from start to SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 0"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 1"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Calculating SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        SetDiscardPoints(98, Active, Discard before 1, Discard before 1)"),
-					Tracer.Line("        Checkpoint: Calculating SP-0 done Hash: 98"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Executing chunks for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Opening Chunk 0-0"),
-					Tracer.Line("Exception executing chunks"))
-				.AssertState(state => {
-					Assert.Equal(ScavengeResult.Stopped, logger.Result);
-					Assert.True(state.TryGetCheckpoint(out var checkpoint));
-					var executing = Assert.IsType<ScavengeCheckpoint.ExecutingChunks>(checkpoint);
-					Assert.Null(executing.DoneLogicalChunkNumber);
-				})
-				.RunAsync();
-		}
-
-		[Fact]
-		public async Task index_executor_checkpoints_immediately() {
-			var t = 0;
-			var logger = new FakeTFScavengerLog();
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "cd-cancel-index-execution"),
-						Rec.Write(t++, "ab-1"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.WithLogger(logger)
-				.CancelWhenExecutingIndexEntry("cd-cancel-index-execution")
-				.AssertTrace(
-					Tracer.Line("Accumulating from start to SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 0"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 1"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Calculating SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Executing chunks for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Merging chunks for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Merging chunks for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Executing index for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing index for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Exception executing index"))
-				.AssertState(state => {
-					Assert.Equal(ScavengeResult.Stopped, logger.Result);
-					Assert.True(state.TryGetCheckpoint(out var checkpoint));
-					var executing = Assert.IsType<ScavengeCheckpoint.ExecutingIndex>(checkpoint);
-				})
-				.RunAsync();
-		}
-
-		[Fact]
-		public async Task cleaner_checkpoints_immediately() {
-			var t = 0;
-			var logger = new FakeTFScavengerLog();
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(Rec.Write(t++, "ab-1"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.WithLogger(logger)
-				.CancelWhenCheckpointing<ScavengeCheckpoint.Cleaning>()
-				.AssertTrace(
-					Tracer.Line("Accumulating from start to SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 0"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 1"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Calculating SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Executing chunks for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Merging chunks for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Merging chunks for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Executing index for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing index for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Cleaning for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Cleaning for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Exception cleaning"))
-				.AssertState(state => {
-					Assert.Equal(ScavengeResult.Stopped, logger.Result);
-					Assert.True(state.TryGetCheckpoint(out var checkpoint));
-					var executing = Assert.IsType<ScavengeCheckpoint.Cleaning>(checkpoint);
-				})
-				.RunAsync();
-		}
-
-		[Fact]
-		public async Task can_cancel_during_accumulation_and_resume() {
-			var t = 0;
-			var logger = new FakeTFScavengerLog();
-			var scenario = new Scenario<LogFormat.V2, string>();
-			var db = await scenario
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount2),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"))
-					.Chunk(
-						Rec.Write(t++, "$$cd-cancel-accumulation"))
-					.Chunk(
-						Rec.Write(t++, "ab-1"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.WithLogger(logger)
-				.CancelWhenAccumulatingMetaRecordFor("cd-cancel-accumulation")
-				.AssertTrace(
-					Tracer.Line("Accumulating from start to SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 0"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 1"),
-					Tracer.Line("    Rollback"),
-					Tracer.Line("Exception accumulating"))
-				.AssertState(state => {
-					Assert.Equal(ScavengeResult.Stopped, logger.Result);
-					Assert.True(state.TryGetCheckpoint(out var checkpoint));
-					var accumulating = Assert.IsType<ScavengeCheckpoint.Accumulating>(checkpoint);
-					Assert.Equal(0, accumulating.DoneLogicalChunkNumber);
-				})
-				.RunAsync();
-
-			// now complete the scavenge
-			await new Scenario<LogFormat.V2, string>()
-				.WithTracerFrom(scenario)
-				.WithDbPath(Fixture.Directory)
-				.WithDb(db)
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertTrace(
-					// accumulation continues from checkpoint
-					Tracer.Line("Accumulating from checkpoint: Accumulating SP-0 done Chunk 0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 1"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 2"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 2"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 3"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 3"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					// the rest is fresh for SP-0
-					Tracer.Line("Calculating SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        SetDiscardPoints(98, Active, Discard before 1, Discard before 1)"),
-					Tracer.Line("        SetDiscardPoints(100, Spent, Keep all, Keep all)"),
-					Tracer.Line("        Checkpoint: Calculating SP-0 done Hash: 100"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Executing chunks for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Opening Chunk 0-0"),
-					Tracer.Line("    Switched in chunk-000000.000001"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 2"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Merging chunks for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Merging chunks for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Executing index for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing index for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Cleaning for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Cleaning for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Cleaning for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Begin"),
-					Tracer.Line("    Checkpoint: Done SP-0"),
-					Tracer.Line("Commit"))
-				.AssertState(state => {
-					// scavenge completed
-					Assert.True(state.TryGetCheckpoint(out var checkpoint));
-					var done = Assert.IsType<ScavengeCheckpoint.Done>(checkpoint);
-					Assert.Equal("SP-0", done.ScavengePoint.GetName());
-				})
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(0, 2),
-					x.Recs[1].KeepIndexes(0),
-					x.Recs[2].KeepIndexes(0),
-					x.Recs[3],
-				});
-		}
-
-		[Fact]
-		public async Task can_cancel_during_calculation_and_resume() {
-			var t = 0;
-			var scenario = new Scenario<LogFormat.V2, string>();
-			var logger = new FakeTFScavengerLog();
-			var db = await scenario
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"))
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "cd-cancel-calculation"),
-						Rec.Write(t++, "$$cd-cancel-calculation", metadata: MaxCount1))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.WithLogger(logger)
-				.CancelWhenCalculatingOriginalStream("cd-cancel-calculation")
-				.AssertTrace(
-					Tracer.Line("Accumulating from start to SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 0"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 1"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 2"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 2"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Calculating SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        SetDiscardPoints(98, Active, Discard before 2, Discard before 2)"),
-					// throw while calculating 100
-					Tracer.Line("    Rollback"),
-					Tracer.Line("Exception calculating"))
-				.AssertState(state => {
-					Assert.Equal(ScavengeResult.Stopped, logger.Result);
-					Assert.True(state.TryGetCheckpoint(out var checkpoint));
-					var calculating = Assert.IsType<ScavengeCheckpoint.Calculating<string>>(checkpoint);
-					Assert.Equal("None", calculating.DoneStreamHandle.ToString());
-				})
-				.RunAsync();
-
-			// now complete the scavenge
-			await new Scenario<LogFormat.V2, string>()
-				.WithTracerFrom(scenario)
-				.WithDbPath(Fixture.Directory)
-				.WithDb(db)
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertTrace(
-					// no accumulation
-					// calculation continues from checkpoint
-					Tracer.Line("Calculating from checkpoint: Calculating SP-0 done None"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        SetDiscardPoints(98, Active, Discard before 2, Discard before 2)"),
-					Tracer.Line("        Checkpoint: Calculating SP-0 done Hash: 100"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					// the rest is fresh for SP-0
-					Tracer.Line("Executing chunks for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Opening Chunk 0-0"),
-					Tracer.Line("    Switched in chunk-000000.000001"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Merging chunks for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Merging chunks for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Executing index for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing index for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Cleaning for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Cleaning for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Cleaning for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Begin"),
-					Tracer.Line("    Checkpoint: Done SP-0"),
-					Tracer.Line("Commit"))
-				.AssertState(state => {
-					// scavenge completed
-					Assert.True(state.TryGetCheckpoint(out var checkpoint));
-					var done = Assert.IsType<ScavengeCheckpoint.Done>(checkpoint);
-				})
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(0),
-					x.Recs[1].KeepIndexes(0, 1, 2),
-					x.Recs[2],
-				});
-		}
-
-		[Fact]
-		public async Task can_cancel_during_chunk_execution_and_resume() {
-			var t = 0;
-			var logger = new FakeTFScavengerLog();
-			var scenario = new Scenario<LogFormat.V2, string>();
-			var db = await scenario
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "$$ab-2", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "cd-cancel-chunk-execution"),
-						Rec.Write(t++, "ab-2"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.WithLogger(logger)
-				.CancelWhenExecutingChunk("cd-cancel-chunk-execution")
-				.AssertTrace(
-					Tracer.Line("Accumulating from start to SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 0"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 1"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 2"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 2"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Calculating SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        SetDiscardPoints(ab-1, Active, Discard before 1, Discard before 1)"),
-					// no discard points to set for ab-2
-					Tracer.Line("        Checkpoint: Calculating SP-0 done Id: ab-2"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Executing chunks for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Opening Chunk 1-1"),
-					Tracer.Line("Exception executing chunks"))
-				.AssertState(state => {
-					Assert.Equal(ScavengeResult.Stopped, logger.Result);
-					Assert.True(state.TryGetCheckpoint(out var checkpoint));
-					var executing = Assert.IsType<ScavengeCheckpoint.ExecutingChunks>(checkpoint);
-					Assert.Equal(0, executing.DoneLogicalChunkNumber);
-				})
-				.RunAsync();
-
-			// now complete the scavenge
-			await new Scenario<LogFormat.V2, string>()
-				.WithTracerFrom(scenario)
-				.WithDbPath(Fixture.Directory)
-				.WithDb(db)
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertTrace(
-					// no accumulation
-					// no calculation
-					// chunk execution continues from checkpoint
-					Tracer.Line("Executing chunks from checkpoint: Executing chunks for SP-0 done Chunk 0"),
-					Tracer.Line("    Opening Chunk 1-1"),
-					Tracer.Line("    Switched in chunk-000001.000001"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					// the rest is fresh for SP-0
-					Tracer.Line("Merging chunks for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Merging chunks for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Executing index for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing index for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Cleaning for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Cleaning for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Cleaning for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Begin"),
-					Tracer.Line("    Checkpoint: Done SP-0"),
-					Tracer.Line("Commit"))
-				.AssertState(state => {
-					// scavenge completed
-					Assert.True(state.TryGetCheckpoint(out var checkpoint));
-					var done = Assert.IsType<ScavengeCheckpoint.Done>(checkpoint);
-				})
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(0),
-					x.Recs[1].KeepIndexes(1, 2, 3, 4),
-					x.Recs[2],
-				});
-		}
-
-		[Fact]
-		public async Task can_cancel_during_index_execution_and_resume() {
-			var t = 0;
-			var logger = new FakeTFScavengerLog();
-			var scenario = new Scenario<LogFormat.V2, string>();
-			var db = await scenario
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"))
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "cd-cancel-index-execution"),
-						Rec.Write(t++, "ab-1"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.WithLogger(logger)
-				.CancelWhenExecutingIndexEntry("cd-cancel-index-execution")
-				.AssertTrace(
-					Tracer.Line("Accumulating from start to SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 0"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 1"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 2"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 2"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Calculating SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        SetDiscardPoints(98, Active, Discard before 3, Discard before 3)"),
-					Tracer.Line("        Checkpoint: Calculating SP-0 done Hash: 98"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Executing chunks for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Opening Chunk 0-0"),
-					Tracer.Line("    Switched in chunk-000000.000001"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Opening Chunk 1-1"),
-					Tracer.Line("    Switched in chunk-000001.000001"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Merging chunks for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Merging chunks for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Executing index for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing index for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Exception executing index"))
-				.AssertState(state => {
-					Assert.Equal(ScavengeResult.Stopped, logger.Result);
-					Assert.True(state.TryGetCheckpoint(out var checkpoint));
-					var executing = Assert.IsType<ScavengeCheckpoint.ExecutingIndex>(checkpoint);
-				})
-				.RunAsync();
-
-			// now complete the scavenge
-			await new Scenario<LogFormat.V2, string>()
-				.WithTracerFrom(scenario)
-				.WithDbPath(Fixture.Directory)
-				.WithDb(db)
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				// makes sure we dont reaccumulate
-				.CancelWhenAccumulatingMetaRecordFor("ab-1")
-				// make sure we dont recalculate
-				.CancelWhenCalculatingOriginalStream("ab-1")
-				// make sure we dont rescavenge the chunks
-				.CancelWhenExecutingChunk("ab-1")
-				.AssertTrace(
-					Tracer.Line("Executing index from checkpoint: Executing index for SP-0"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Cleaning for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Cleaning for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Cleaning for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Begin"),
-					Tracer.Line("    Checkpoint: Done SP-0"),
-					Tracer.Line("Commit"))
-				.AssertState(state => {
-					// scavenge completed
-					Assert.True(state.TryGetCheckpoint(out var checkpoint));
-					var done = Assert.IsType<ScavengeCheckpoint.Done>(checkpoint);
-				})
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(0),
-					x.Recs[1].KeepIndexes(1, 2),
-					x.Recs[2],
-				});
-		}
-
-		[Fact]
-		public async Task can_cancel_during_cleaning_and_resume() {
-			var t = 0;
-			var scenario = new Scenario<LogFormat.V2, string>();
-			var logger = new FakeTFScavengerLog();
-			var db = await scenario
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: TruncateBefore1),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.WithLogger(logger)
-				.CancelWhenCheckpointing<ScavengeCheckpoint.Cleaning>()
-				.AssertState(state => {
-					Assert.Equal(ScavengeResult.Stopped, logger.Result);
-					Assert.True(state.TryGetCheckpoint(out var checkpoint));
-					var executing = Assert.IsType<ScavengeCheckpoint.Cleaning>(checkpoint);
-				})
-				.RunAsync();
-
-			// now complete the scavenge
-			await new Scenario<LogFormat.V2, string>()
-				.WithTracerFrom(scenario)
-				.WithDbPath(Fixture.Directory)
-				.WithDb(db)
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertTrace(
-					Tracer.Line("Cleaning from checkpoint Cleaning for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Cleaning for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Begin"),
-					Tracer.Line("    Checkpoint: Done SP-0"),
-					Tracer.Line("Commit"))
-				.AssertState(state => {
-					// scavenge completed
-					Assert.True(state.TryGetCheckpoint(out var checkpoint));
-					var done = Assert.IsType<ScavengeCheckpoint.Done>(checkpoint);
-
-					Assert.False(state.TryGetOriginalStreamData("ab-1", out _));
-					Assert.False(state.TryGetMetastreamData("$$ab-1", out _));
-				})
-				.RunAsync();
-		}
-
-		[Fact]
-		public async Task can_complete() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertTrace(
-					Tracer.Line("Accumulating from start to SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 0"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 1"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Calculating SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        SetDiscardPoints(98, Active, Discard before 1, Discard before 1)"),
-					Tracer.Line("        Checkpoint: Calculating SP-0 done Hash: 98"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Executing chunks for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Opening Chunk 0-0"),
-					Tracer.Line("    Switched in chunk-000000.000001"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Merging chunks for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Merging chunks for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Executing index for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing index for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Cleaning for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Cleaning for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Cleaning for SP-0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Begin"),
-					Tracer.Line("    Checkpoint: Done SP-0"),
-					Tracer.Line("Commit"))
-				.AssertState(state => {
-					Assert.True(state.TryGetCheckpoint(out var checkpoint));
-					var executing = Assert.IsType<ScavengeCheckpoint.Done>(checkpoint);
-				})
-				.RunAsync();
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/ChunkMergingTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/ChunkMergingTests.cs
deleted file mode 100644
index e73c368fa1d..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/ChunkMergingTests.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.XUnit.Tests.Scavenge.Sqlite;
-using Xunit;
-using static EventStore.Core.XUnit.Tests.Scavenge.StreamMetadatas;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class ChunkMergingTests : SqliteDbPerTest<ChunkMergingTests> {
-		[Fact]
-		public async Task can_merge() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithMergeChunks(true)
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "cd-2")) // keep
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"), // keep
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1)) // keep
-					.Chunk(ScavengePointRec(t++))) // keep
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new ILogRecord[][] {
-						// chunk 0, 1 and 2 are the same chunk now
-						new[] {
-							x.Recs[0][1],
-							x.Recs[1][1],
-							x.Recs[1][2],
-							x.Recs[2][0],
-						},
-						new[] {
-							x.Recs[0][1],
-							x.Recs[1][1],
-							x.Recs[1][2],
-							x.Recs[2][0],
-						},
-						new[] {
-							x.Recs[0][1],
-							x.Recs[1][1],
-							x.Recs[1][2],
-							x.Recs[2][0],
-						}
-					},
-					x => null);
-		}
-
-		[Fact]
-		public async Task can_not_merge() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "cd-2"))
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					// chunks not merged
-					x.Recs[0].KeepIndexes(1),
-					x.Recs[1].KeepIndexes(1, 2),
-					x.Recs[2].KeepIndexes(0),
-				});
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/ChunkWeightTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/ChunkWeightTests.cs
deleted file mode 100644
index 1a0ae7449fb..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/ChunkWeightTests.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.Scavenging;
-using EventStore.Core.XUnit.Tests.Scavenge.Sqlite;
-using Xunit;
-using static EventStore.Core.XUnit.Tests.Scavenge.StreamMetadatas;
-
-#pragma warning disable CS0162 // Unreachable code detected
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class ChunkWeightTests : SqliteDbPerTest<ChunkWeightTests> {
-		[Fact]
-		public async Task simple() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "ab-1"), // weight: 2
-						Rec.Write(t++, "ab-1"), // weight: 2
-						Rec.Write(t++, "ab-1"))
-					.Chunk(
-						ScavengePointRec(t++, threshold: 1000)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertState(state => {
-					Assert.Equal(4, state.SumChunkWeights(0, 0));
-					Assert.Equal(0, state.SumChunkWeights(1, 1));
-				})
-				.RunAsync();
-		}
-
-		[Fact]
-		public async Task max_age_maybe_discard() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1", timestamp: Expired), // weight: 1
-						Rec.Write(t++, "ab-1", timestamp: Expired), // weight: 1
-						Rec.Write(t++, "ab-1", timestamp: Active), // weight: 1
-						Rec.Write(t++, "ab-1", timestamp: Active), // weight: 0 - last event
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxAgeMetadata))
-					.Chunk(
-						ScavengePointRec(t++, threshold: 1000)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertState(state => {
-					Assert.Equal(3, state.SumChunkWeights(0, 0));
-					Assert.Equal(0, state.SumChunkWeights(1, 1));
-					Assert.True(state.TryGetOriginalStreamData("ab-1", out var data));
-					Assert.Equal(DiscardPoint.DiscardBefore(0), data.DiscardPoint);
-					Assert.Equal(DiscardPoint.DiscardBefore(3), data.MaybeDiscardPoint);
-				})
-				.RunAsync();
-		}
-
-		[Fact]
-		public async Task non_contiguous_events() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1", eventNumber: 0), // weight: 2
-						Rec.Write(t++, "ab-1", eventNumber: 1), // weight: 2
-						Rec.Write(t++, "ab-1", eventNumber: 5), // weight: 2
-						Rec.Write(t++, "ab-1", eventNumber: 6), // weight: 2
-						Rec.Write(t++, "ab-1", eventNumber: 7), // weight: 0 - last event
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
-					.Chunk(
-						ScavengePointRec(t++, threshold: 1000)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertState(state => {
-					Assert.Equal(8, state.SumChunkWeights(0, 0));
-					Assert.Equal(0, state.SumChunkWeights(1, 1));
-					Assert.True(state.TryGetOriginalStreamData("ab-1", out var data));
-					Assert.Equal(DiscardPoint.DiscardBefore(7), data.DiscardPoint);
-					Assert.Equal(DiscardPoint.DiscardBefore(7), data.MaybeDiscardPoint);
-				})
-				.RunAsync();
-		}
-
-		[Fact]
-		public async Task long_stream() {
-			if (Scenario.CollideEverything) {
-				// TODO: something weird happens here, possibly the system doesn't properly handle
-				// $$$settings (or any metadatastream?) colliding with a long stream, which this scenario
-				// causes.
-				return;
-			}
-
-			var t = 0;
-
-			var numRecords = 260;
-
-			var records = new Rec[numRecords];
-			for (var i = 0; i < numRecords; i++) {
-				records[i] = Rec.Write(t++, "ab-1");
-			}
-
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						records)
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						ScavengePointRec(t++, threshold: 1000)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertState(state => {
-					Assert.Equal(numRecords * 2, state.SumChunkWeights(0, 0));
-					Assert.Equal(0, state.SumChunkWeights(1, 1));
-					Assert.True(state.TryGetOriginalStreamData("ab-1", out var data));
-					Assert.Equal(DiscardPoint.DiscardBefore(numRecords), data.DiscardPoint);
-					Assert.Equal(DiscardPoint.DiscardBefore(numRecords), data.MaybeDiscardPoint);
-				})
-				.RunAsync();
-		}
-
-		[Fact]
-		public async Task metadata_replaced_by_metadata() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1)) // weight: 2
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						ScavengePointRec(t++, threshold: 1000)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertState(state => {
-					Assert.Equal(2, state.SumChunkWeights(0, 0));
-					Assert.Equal(0, state.SumChunkWeights(1, 1));
-				})
-				.RunAsync();
-		}
-
-		[Fact]
-		public async Task metadata_replaced_by_tombstone() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1)) // weight: 2
-					.Chunk(
-						Rec.CommittedDelete(t++, "ab-1"),
-						ScavengePointRec(t++, threshold: 1000)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertState(state => {
-					Assert.Equal(2, state.SumChunkWeights(0, 0));
-					Assert.Equal(0, state.SumChunkWeights(1, 1));
-				})
-				.RunAsync();
-		}
-
-		[Fact]
-		public async Task metadata_replaced_multiple_times() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1)) // weight: 2
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1), // weight: 2
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1)) // weight: 2
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1), // weight: 2
-						Rec.CommittedDelete(t++, "ab-1"),
-						ScavengePointRec(t++, threshold: 1000)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertState(state => {
-					Assert.Equal(2, state.SumChunkWeights(0, 0));
-					Assert.Equal(4, state.SumChunkWeights(1, 1));
-					Assert.Equal(2, state.SumChunkWeights(2, 2));
-				})
-				.RunAsync();
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/CollisionDetectorTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/CollisionDetectorTests.cs
deleted file mode 100644
index 2d08d1724fd..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/CollisionDetectorTests.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Tests.Index.Hashers;
-using EventStore.Core.TransactionLog.Scavenging;
-using EventStore.Core.TransactionLog.Scavenging.Sqlite;
-using EventStore.Core.XUnit.Tests.Scavenge.Sqlite;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class CollisionDetectorTests : SqliteDbPerTest<CollisionDetectorTests> {
-		public static IEnumerable<object[]> TheCases() {
-			var none = Array.Empty<string>();
-			
-			// the first letter of the stream name determines the hash
-			// each row represents a record but here the only thing we need to know about it is
-			// its stream name and the collisions it generates when we add it.
-			yield return Case(
-				"seen stream before. was a collision first time we saw it",
-				("a-stream1",          CollisionResult.NoCollision,  "", none),
-				("a-streamOfInterest", CollisionResult.NewCollision, "a-stream1", new[] { "a-stream1", "a-streamOfInterest" }),
-				("b-stream2",          CollisionResult.NoCollision,  "", none),
-				("a-streamOfInterest", CollisionResult.OldCollision, "", none));
-
-			yield return Case(
-				"seen stream before. was not a collision but has since been collided with",
-				("a-streamOfInterest", CollisionResult.NoCollision,  "", none),
-				("a-stream1",          CollisionResult.NewCollision, "a-streamOfInterest", new[] { "a-stream1", "a-streamOfInterest" }),
-				("b-stream2",          CollisionResult.NoCollision,  "", none),
-				("a-streamOfInterest", CollisionResult.OldCollision, "", none));
-
-			yield return Case(
-				"seen stream before. was not a collision and still isnt",
-				("a-streamOfInterest", CollisionResult.NoCollision, "", none),
-				("b-stream2",          CollisionResult.NoCollision, "", none),
-				("a-streamOfInterest", CollisionResult.NoCollision, "", none));
-
-			yield return Case(
-				"first time seeing stream. no collision",
-				("a-stream1",          CollisionResult.NoCollision, "", none),
-				("b-stream2",          CollisionResult.NoCollision, "", none),
-				("c-streamOfInterest", CollisionResult.NoCollision, "", none));
-
-			yield return Case(
-				"first time seeing stream. collides with previous stream",
-				("a-stream1",          CollisionResult.NoCollision,  "", none),
-				("b-stream2",          CollisionResult.NoCollision,  "", none),
-				("a-streamOfInterest", CollisionResult.NewCollision, "a-stream1", new[] { "a-stream1", "a-streamOfInterest" }));
-
-			yield return Case(
-				"three way collision",
-				("a-stream1", CollisionResult.NoCollision,  "", none),
-				("a-stream2", CollisionResult.NewCollision, "a-stream1", new[] { "a-stream1", "a-stream2" }),
-				("a-stream3", CollisionResult.NewCollision, "a-stream1", new[] { "a-stream3" }));
-
-			yield return Case(
-				"in combination",
-				("a-stream1", CollisionResult.NoCollision,  "", none), // 2b
-				("a-stream2", CollisionResult.NewCollision, "a-stream1", new[] { "a-stream1", "a-stream2" }), // 2a
-				("b-stream3", CollisionResult.NoCollision,  "", none),
-				("a-stream4", CollisionResult.NewCollision, "a-stream1", new[] { "a-stream4" }),
-				("b-stream3", CollisionResult.NoCollision,  "", none), // 1c
-				("a-stream1", CollisionResult.OldCollision, "", none), // 1b
-				("a-stream2", CollisionResult.OldCollision, "", none)); // 1a
-
-			object[] Case(string name, params (string, CollisionResult, string oldUser, string[])[] data) {
-				return new object[] {
-					name, data
-				};
-			}
-		}
-
-		[Theory]
-		[MemberData(nameof(TheCases))]
-		public void Works(
-			string caseName,
-			(string StreamName, CollisionResult CollisionResult, string ExpectedOldUser, string[] NewCollisions)[] data) {
-
-			Assert.NotNull(caseName);
-
-			var log = data.Select(x => x.StreamName).ToArray();
-			var hasher = new FirstCharacterHasher();
-
-			// index maps hashes to lists of log positions
-			var index = new Dictionary<ulong, List<int>>();
-
-			// populate the index
-			for (var i = 0; i < log.Length; i++) {
-				var streamName = log[i];
-				var hash = hasher.Hash(streamName);
-				if (!index.TryGetValue(hash, out var entries)) {
-					entries = new List<int>();
-					index[hash] = entries;
-				}
-
-				// which order is more realistic? this way shows the need for filtering by position anyway
-				entries.Insert(0, i);
-			}
-
-			var hashes = new SqliteScavengeMap<ulong, string>("hashes");
-			hashes.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var collisions = new SqliteCollisionScavengeMap<string>();
-			collisions.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var sut = new CollisionDetector<string>(
-				Serilog.Log.Logger,
-				new LruCachingScavengeMap<ulong, string>(
-					"HashUsers",
-					hashes,
-					cacheMaxCount: 1000),
-				collisions,
-				hasher);
-
-			var expectedCollisions = new HashSet<string>();
-
-			for (var i = 0; i < data.Length; i++) {
-				foreach (var newCollision in data[i].NewCollisions)
-					expectedCollisions.Add(newCollision);
-
-				var result = sut.DetectCollisions(data[i].StreamName, out var oldUser);
-				Assert.Equal(result, data[i].CollisionResult);
-				Assert.Equal(
-					expectedCollisions.OrderBy(x => x),
-					sut.AllCollisions());
-
-				if (result == CollisionResult.NewCollision)
-					Assert.Equal(data[i].ExpectedOldUser, oldUser);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/CollisionMapTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/CollisionMapTests.cs
deleted file mode 100644
index 2b5346dd282..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/CollisionMapTests.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using EventStore.Core.Tests.Index.Hashers;
-using EventStore.Core.TransactionLog.Scavenging;
-using EventStore.Core.TransactionLog.Scavenging.Sqlite;
-using EventStore.Core.XUnit.Tests.Scavenge.Sqlite;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	// generally the properties we need of the CollisionManager are tested at a higher
-	// level. but a couple of fiddly bits are checked in here
-	public class CollisionMapTests : SqliteDbPerTest<CollisionMapTests> {
-		[Fact]
-		public void sanity() {
-			var collisions = new SqliteCollisionScavengeMap<string>();
-			collisions.Initialize(new SqliteBackend(Fixture.DbConnection));
-			var sut = GenSut(collisions);
-
-			// add a non-collision for ab-1
-			sut["ab-1"] = "foo";
-
-			// value can be retrieved
-			Assert.True(sut.TryGetValue("ab-1", out var actual));
-			Assert.Equal("foo", actual);
-
-			// "a-1" collides with "a-2".
-			collisions["ab-1"] = Unit.Instance;
-			collisions["ab-2"] = Unit.Instance;
-			sut.NotifyCollision("ab-1");
-
-			// value for "a-1" can still be retrieved
-			Assert.True(sut.TryGetValue("ab-1", out actual));
-			Assert.Equal("foo", actual);
-
-			// "a-2" not retrieveable since we never set it
-			Assert.False(sut.TryGetValue("ab-2", out _));
-		}
-
-		private CollisionMap<string, string> GenSut(IScavengeMap<string, Unit> collisions) {
-			var nonCollisionsMap = new SqliteScavengeMap<ulong, string>("non_collisions");
-			nonCollisionsMap.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var collisionsMap = new SqliteScavengeMap<string, string>("collisions");
-			collisionsMap.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var sut = new CollisionMap<string, string>(
-				new HumanReadableHasher(),
-				x => collisionsMap.TryGetValue(x, out _),
-				nonCollisionsMap,
-				collisionsMap);
-
-			return sut;
-		}
-	}
-
-	public class OriginalStreamCollisionMapTests : SqliteDbPerTest<OriginalStreamCollisionMapTests> {
-		[Fact]
-		public void can_enumerate() {
-			var collisions = new SqliteCollisionScavengeMap<string>();
-			collisions.Initialize(new SqliteBackend(Fixture.DbConnection));
-			var sut = GenSut(collisions);
-
-			collisions["ac-1"] = Unit.Instance;
-			collisions["ac-2"] = Unit.Instance;
-			collisions["ac-3"] = Unit.Instance;
-
-			// non collisions
-			sut["ad-4"] = new OriginalStreamData { MaxCount = 4, Status = CalculationStatus.Active };
-			sut["ae-5"] = new OriginalStreamData { MaxCount = 5, Status = CalculationStatus.Active };
-			sut["af-6"] = new OriginalStreamData { MaxCount = 6, Status = CalculationStatus.Active };
-			// collisions
-			sut["ac-1"] = new OriginalStreamData { MaxCount = 1, Status = CalculationStatus.Active };
-			sut["ac-2"] = new OriginalStreamData { MaxCount = 2, Status = CalculationStatus.Active };
-			sut["ac-3"] = new OriginalStreamData { MaxCount = 3, Status = CalculationStatus.Active };
-
-			// no checkpoint
-			Assert.Collection(
-				sut.EnumerateActive(checkpoint: default),
-				x => Assert.Equal("(Id: ac-1, 1)", $"({x.Item1}, {x.Item2.MaxCount})"),
-				x => Assert.Equal("(Id: ac-2, 2)", $"({x.Item1}, {x.Item2.MaxCount})"),
-				x => Assert.Equal("(Id: ac-3, 3)", $"({x.Item1}, {x.Item2.MaxCount})"),
-				x => Assert.Equal("(Hash: 100, 4)", $"({x.Item1}, {x.Item2.MaxCount})"),
-				x => Assert.Equal("(Hash: 101, 5)", $"({x.Item1}, {x.Item2.MaxCount})"),
-				x => Assert.Equal("(Hash: 102, 6)", $"({x.Item1}, {x.Item2.MaxCount})"));
-
-			// id checkpoint
-			Assert.Collection(
-				sut.EnumerateActive(checkpoint: StreamHandle.ForStreamId("ac-2")),
-				x => Assert.Equal("(Id: ac-3, 3)", $"({x.Item1}, {x.Item2.MaxCount})"),
-				x => Assert.Equal("(Hash: 100, 4)", $"({x.Item1}, {x.Item2.MaxCount})"),
-				x => Assert.Equal("(Hash: 101, 5)", $"({x.Item1}, {x.Item2.MaxCount})"),
-				x => Assert.Equal("(Hash: 102, 6)", $"({x.Item1}, {x.Item2.MaxCount})"));
-
-			// hash checkpoint
-			Assert.Collection(
-				sut.EnumerateActive(checkpoint: StreamHandle.ForHash<string>(101)),
-				x => Assert.Equal("(Hash: 102, 6)", $"({x.Item1}, {x.Item2.MaxCount})"));
-
-			// end checkpoint
-			Assert.Empty(sut.EnumerateActive(checkpoint: StreamHandle.ForHash<string>(102)));
-		}
-
-		private OriginalStreamCollisionMap<string> GenSut(IScavengeMap<string, Unit> collisions) {
-			var nonCollisionsMap = new SqliteOriginalStreamScavengeMap<ulong>("non_collisions");
-			nonCollisionsMap.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var collisionsMap = new SqliteOriginalStreamScavengeMap<string>("collisions");
-			collisionsMap.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var sut = new OriginalStreamCollisionMap<string>(
-				new HumanReadableHasher(),
-				x => collisions.TryGetValue(x, out _),
-				nonCollisionsMap,
-				collisionsMap);
-
-			return sut;
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/CombinationCriteriaTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/CombinationCriteriaTests.cs
deleted file mode 100644
index 394c6af2518..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/CombinationCriteriaTests.cs
+++ /dev/null
@@ -1,271 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.XUnit.Tests.Scavenge.Sqlite;
-using Xunit;
-using static EventStore.Core.XUnit.Tests.Scavenge.StreamMetadatas;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class CombinationCriteriaTests : SqliteDbPerTest<CombinationCriteriaTests> {
-		// in combination, we discard the event if any of the criteria says we can discard it.
-		// 'then' means the latter taking priority
-		[Fact]
-		public async Task max_count_then_tombstone() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount2),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.CommittedDelete(t++, "ab-1"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(3),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task max_count_discards_more_than_max_age() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1", timestamp: Expired), // 0
-						Rec.Write(t++, "ab-1", timestamp: Expired), // 1 <-- maxage discard
-						Rec.Write(t++, "ab-1", timestamp: Active), // 2 
-						Rec.Write(t++, "ab-1", timestamp: Active), // 3 <-- maxcount discard
-						Rec.Write(t++, "ab-1", timestamp: Active), // 4 <-- keep
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: new StreamMetadata(
-							maxAge: MaxAgeTimeSpan,
-							maxCount: 1)))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(4, 5),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task max_count_discards_more_than_truncate_before() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1"), // 0
-						Rec.Write(t++, "ab-1"), // 1 <-- tb discard
-						Rec.Write(t++, "ab-1"), // 2 
-						Rec.Write(t++, "ab-1"), // 3 <-- maxcount discard
-						Rec.Write(t++, "ab-1"), // 4 <-- keep
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: new StreamMetadata(
-							truncateBefore: 2,
-							maxCount: 1)))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(4, 5),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task max_count_discards_more_than_max_age_and_truncate_before() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1", timestamp: Expired), // 0
-						Rec.Write(t++, "ab-1", timestamp: Expired), // 1 <-- maxage discard
-						Rec.Write(t++, "ab-1", timestamp: Active), // 2 
-						Rec.Write(t++, "ab-1", timestamp: Active), // 3 <-- tb discard
-						Rec.Write(t++, "ab-1", timestamp: Active), // 4 
-						Rec.Write(t++, "ab-1", timestamp: Active), // 5 <-- maxcount discard
-						Rec.Write(t++, "ab-1", timestamp: Active), // 6 <-- keep
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: new StreamMetadata(
-							maxAge: MaxAgeTimeSpan,
-							truncateBefore: 4,
-							maxCount: 1)))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(6, 7),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task truncate_before_discards_more_than_max_count() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1"), // 0
-						Rec.Write(t++, "ab-1"), // 1 <-- maxcount discard
-						Rec.Write(t++, "ab-1"), // 2 
-						Rec.Write(t++, "ab-1"), // 3 <-- tb discard
-						Rec.Write(t++, "ab-1"), // 4 <-- keep
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: new StreamMetadata(
-							maxCount: 3,
-							truncateBefore: 4)))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(4, 5),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task truncate_before_discards_more_than_max_age() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1", timestamp: Expired), // 0
-						Rec.Write(t++, "ab-1", timestamp: Expired), // 1 <-- maxage discard
-						Rec.Write(t++, "ab-1", timestamp: Active), // 2 
-						Rec.Write(t++, "ab-1", timestamp: Active), // 3 <-- tb discard
-						Rec.Write(t++, "ab-1", timestamp: Active), // 4 <-- keep
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: new StreamMetadata(
-							maxAge: MaxAgeTimeSpan,
-							truncateBefore: 4)))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(4, 5),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task truncate_before_discards_more_than_max_age_and_max_count() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1", timestamp: Expired), // 0
-						Rec.Write(t++, "ab-1", timestamp: Expired), // 1 <-- maxage discard
-						Rec.Write(t++, "ab-1", timestamp: Active), // 2 
-						Rec.Write(t++, "ab-1", timestamp: Active), // 3 <-- maxcount discard
-						Rec.Write(t++, "ab-1", timestamp: Active), // 4 
-						Rec.Write(t++, "ab-1", timestamp: Active), // 5 <-- tb discard
-						Rec.Write(t++, "ab-1", timestamp: Active), // 6 <-- keep
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: new StreamMetadata(
-							maxAge: MaxAgeTimeSpan,
-							maxCount: 3,
-							truncateBefore: 6)))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(6, 7),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task max_age_discards_more_than_max_count() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1", timestamp: Expired), // 0
-						Rec.Write(t++, "ab-1", timestamp: Expired), // 1 <-- maxcount discard
-						Rec.Write(t++, "ab-1", timestamp: Expired), // 2 
-						Rec.Write(t++, "ab-1", timestamp: Expired), // 3 <-- maxage discard
-						Rec.Write(t++, "ab-1", timestamp: Active), // 4 <-- keep
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: new StreamMetadata(
-							maxCount: 3,
-							maxAge: MaxAgeTimeSpan)))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(4, 5),
-						x.Recs[1],
-					},
-					Scenario.CollideEverything
-						? default(Func<DbResult, LogRecord[][]>)
-						: x => new[] {
-							x.Recs[0].KeepIndexes(2, 3, 4, 5),
-							x.Recs[1],
-						});
-		}
-
-		[Fact]
-		public async Task max_age_discards_more_than_truncate_before() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1", timestamp: Expired), // 0
-						Rec.Write(t++, "ab-1", timestamp: Expired), // 1 <-- tb discard
-						Rec.Write(t++, "ab-1", timestamp: Expired), // 2 
-						Rec.Write(t++, "ab-1", timestamp: Expired), // 3 <-- maxage discard
-						Rec.Write(t++, "ab-1", timestamp: Active), // 4 <-- keep
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: new StreamMetadata(
-							truncateBefore: 2,
-							maxAge: MaxAgeTimeSpan)))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(4, 5),
-						x.Recs[1],
-					},
-					Scenario.CollideEverything
-						? default(Func<DbResult, LogRecord[][]>)
-						: x => new[] {
-							x.Recs[0].KeepIndexes(2, 3, 4, 5),
-							x.Recs[1],
-						});
-		}
-
-		[Fact]
-		public async Task max_age_discards_more_than_truncate_before_and_max_count() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1", timestamp: Expired), // 0
-						Rec.Write(t++, "ab-1", timestamp: Expired), // 1 <-- maxcount discard
-						Rec.Write(t++, "ab-1", timestamp: Expired), // 2 
-						Rec.Write(t++, "ab-1", timestamp: Expired), // 3 <-- tb discard
-						Rec.Write(t++, "ab-1", timestamp: Expired), // 4 
-						Rec.Write(t++, "ab-1", timestamp: Expired), // 5 <-- maxage discard
-						Rec.Write(t++, "ab-1", timestamp: Active), // 6 <-- keep
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: new StreamMetadata(
-							maxCount: 5,
-							truncateBefore: 4,
-							maxAge: MaxAgeTimeSpan)))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(6, 7),
-						x.Recs[1],
-					},
-					Scenario.CollideEverything
-						? default(Func<DbResult, LogRecord[][]>)
-						: x => new[] {
-							x.Recs[0].KeepIndexes(4, 5, 6, 7),
-							x.Recs[1],
-						});
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/DiscardPointTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/DiscardPointTests.cs
deleted file mode 100644
index 36c54a77825..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/DiscardPointTests.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using EventStore.Core.TransactionLog.Scavenging;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class DiscardPointTests {
-		[Fact]
-		public void can_keep_all() {
-			var sut = DiscardPoint.KeepAll;
-
-			Assert.False(sut.ShouldDiscard(0));
-			Assert.False(sut.ShouldDiscard(1));
-			Assert.False(sut.ShouldDiscard(long.MaxValue));
-		}
-
-		[Fact]
-		public void can_discard_before() {
-			var sut = DiscardPoint.DiscardBefore(500);
-
-			Assert.True(sut.ShouldDiscard(0));
-			Assert.True(sut.ShouldDiscard(499));
-			Assert.False(sut.ShouldDiscard(500));
-		}
-
-		[Fact]
-		public void can_discard_including() {
-			var sut = DiscardPoint.DiscardIncluding(500);
-
-			Assert.True(sut.ShouldDiscard(0));
-			Assert.True(sut.ShouldDiscard(500));
-			Assert.False(sut.ShouldDiscard(501));
-		}
-
-		[Fact]
-		public void can_discard_any_of() {
-			var sut = DiscardPoint.DiscardBefore(50)
-				.Or(DiscardPoint.DiscardBefore(500));
-
-			Assert.True(sut.ShouldDiscard(0));
-			Assert.True(sut.ShouldDiscard(499));
-			Assert.False(sut.ShouldDiscard(500));
-		}
-
-		[Fact]
-		public void equals() {
-			Assert.Equal(DiscardPoint.DiscardBefore(3), DiscardPoint.DiscardBefore(3));
-			Assert.Equal(DiscardPoint.DiscardBefore(3), DiscardPoint.DiscardIncluding(2));
-			Assert.NotEqual(DiscardPoint.DiscardBefore(3), DiscardPoint.DiscardBefore(4));
-		}
-
-		[Fact]
-		public void equals_operator() {
-			Assert.True(DiscardPoint.DiscardBefore(3) == DiscardPoint.DiscardBefore(3));
-			Assert.True(DiscardPoint.DiscardBefore(3) == DiscardPoint.DiscardIncluding(2));
-			Assert.False(DiscardPoint.DiscardBefore(3) == DiscardPoint.DiscardBefore(4));
-		}
-
-		[Fact]
-		public void not_equals_operator() {
-			Assert.False(DiscardPoint.DiscardBefore(3) != DiscardPoint.DiscardBefore(3));
-			Assert.False(DiscardPoint.DiscardBefore(3) != DiscardPoint.DiscardIncluding(2));
-			Assert.True(DiscardPoint.DiscardBefore(3) != DiscardPoint.DiscardBefore(4));
-		}
-
-		[Fact]
-		public void less_than_operator() {
-			Assert.False(DiscardPoint.DiscardBefore(3) < DiscardPoint.DiscardBefore(3));
-			Assert.False(DiscardPoint.DiscardBefore(3) < DiscardPoint.DiscardBefore(2));
-			Assert.True(DiscardPoint.DiscardBefore(3) < DiscardPoint.DiscardBefore(4));
-		}
-
-		[Fact]
-		public void greater_than_operator() {
-			Assert.False(DiscardPoint.DiscardBefore(3) > DiscardPoint.DiscardBefore(3));
-			Assert.True(DiscardPoint.DiscardBefore(3) > DiscardPoint.DiscardBefore(2));
-			Assert.False(DiscardPoint.DiscardBefore(3) > DiscardPoint.DiscardBefore(4));
-		}
-
-		[Fact]
-		public void get_hash_code() {
-			Assert.Equal(3.GetHashCode(), DiscardPoint.DiscardBefore(3).GetHashCode());
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/IndexExecutorTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/IndexExecutorTests.cs
deleted file mode 100644
index 098eeadac21..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/IndexExecutorTests.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.XUnit.Tests.Scavenge.Sqlite;
-using Xunit;
-using static EventStore.Core.XUnit.Tests.Scavenge.StreamMetadatas;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	// these systemtically exercise the cases in the IndexExecutor
-	// we still do so by testing high level scavenge cases because we are well geared up
-	// for that and testing the IndexExeecutor directly would involve more mocks than it is worth.
-	public class IndexExecutorTests : SqliteDbPerTest<IndexExecutorTests> {
-		[Fact]
-		public async Task nothing_to_scavenge() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(0, 1, 2),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task simple_scavenge() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount2))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(1, 2, 3),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task with_collision() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "cb-2"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount2))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(1, 2, 3, 4),
-					x.Recs[1],
-				});
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocIndexReaderInterceptor.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocIndexReaderInterceptor.cs
deleted file mode 100644
index 5d8094f9855..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocIndexReaderInterceptor.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.Scavenging;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class AdHocIndexReaderInterceptor<TStreamId> : IIndexReaderForCalculator<TStreamId> {
-		private readonly IIndexReaderForCalculator<TStreamId> _wrapped;
-		private readonly Func<
-			Func<StreamHandle<TStreamId>, long, int, ScavengePoint, IndexReadEventInfoResult>,
-			StreamHandle<TStreamId>, long, int, ScavengePoint, IndexReadEventInfoResult> _f;
-
-
-		public AdHocIndexReaderInterceptor(
-			IIndexReaderForCalculator<TStreamId> wrapped,
-			Func<
-				Func<StreamHandle<TStreamId>, long, int, ScavengePoint, IndexReadEventInfoResult>,
-				StreamHandle<TStreamId>, long, int, ScavengePoint, IndexReadEventInfoResult> f) {
-
-			_wrapped = wrapped;
-			_f = f;
-		}
-
-		public long GetLastEventNumber(
-			StreamHandle<TStreamId> streamHandle,
-			ScavengePoint scavengePoint) {
-
-			return _wrapped.GetLastEventNumber(streamHandle, scavengePoint);
-		}
-
-		public IndexReadEventInfoResult ReadEventInfoForward(
-			StreamHandle<TStreamId> stream,
-			long fromEventNumber,
-			int maxCount,
-			ScavengePoint scavengePoint) {
-
-			return _f(_wrapped.ReadEventInfoForward, stream, fromEventNumber, maxCount, scavengePoint);
-		}
-
-		public bool IsTombstone(long logPosition) {
-			return _wrapped.IsTombstone(logPosition);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocIndexScavengerInterceptor.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocIndexScavengerInterceptor.cs
deleted file mode 100644
index 2b6148c83df..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocIndexScavengerInterceptor.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Core.Index;
-using EventStore.Core.TransactionLog.Scavenging;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class AdHocIndexScavengerInterceptor : IIndexScavenger {
-		private readonly IIndexScavenger _wrapped;
-		private readonly Func<Func<IndexEntry, bool>, Func<IndexEntry, bool>> _f;
-
-		public AdHocIndexScavengerInterceptor(
-			IIndexScavenger wrapped,
-			Func<Func<IndexEntry, bool>, Func<IndexEntry, bool>> f) {
-
-			_wrapped = wrapped;
-			_f = f;
-		}
-
-		public void ScavengeIndex(
-			long scavengePoint,
-			Func<IndexEntry, bool> shouldKeep,
-			IIndexScavengerLog log,
-			CancellationToken cancellationToken) {
-
-			_wrapped.ScavengeIndex(scavengePoint, _f(shouldKeep), log, cancellationToken);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocMetastreamLookupInterceptor.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocMetastreamLookupInterceptor.cs
deleted file mode 100644
index 779746cf2c6..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocMetastreamLookupInterceptor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using EventStore.Core.LogAbstraction;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class AdHocMetastreamLookupInterceptor<TStreamId> : IMetastreamLookup<TStreamId> {
-		private readonly IMetastreamLookup<TStreamId> _wrapped;
-		private readonly Func<Func<TStreamId, bool>, TStreamId, bool> _f;
-
-		public AdHocMetastreamLookupInterceptor(
-			IMetastreamLookup<TStreamId> wrapped,
-			Func<Func<TStreamId, bool>, TStreamId, bool> f) {
-
-			_wrapped = wrapped;
-			_f = f;
-		}
-
-		public bool IsMetaStream(TStreamId streamId) =>
-			_f(_wrapped.IsMetaStream, streamId);
-
-		public TStreamId MetaStreamOf(TStreamId streamId) =>
-			_wrapped.MetaStreamOf(streamId);
-
-		public TStreamId OriginalStreamOf(TStreamId streamId) =>
-			_wrapped.OriginalStreamOf(streamId);
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocScavengeBackendInterceptor.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocScavengeBackendInterceptor.cs
deleted file mode 100644
index e42de72a79c..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocScavengeBackendInterceptor.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.Scavenging;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class AdHocScavengeBackendInterceptor<TStreamId> : IScavengeStateBackend<TStreamId> {
-		private readonly IScavengeStateBackend<TStreamId> _wrapped;
-		public AdHocScavengeBackendInterceptor(IScavengeStateBackend<TStreamId> wrapped) {
-			_wrapped = wrapped;
-			CollisionStorage = wrapped.CollisionStorage;
-			Hashes = wrapped.Hashes;
-			MetaStorage = wrapped.MetaStorage;
-			MetaCollisionStorage = wrapped.MetaCollisionStorage;
-			OriginalStorage = wrapped.OriginalStorage;
-			OriginalCollisionStorage = wrapped.OriginalCollisionStorage;
-			CheckpointStorage = wrapped.CheckpointStorage;
-			ChunkTimeStampRanges = wrapped.ChunkTimeStampRanges;
-			ChunkWeights = wrapped.ChunkWeights;
-			TransactionManager = wrapped.TransactionManager;
-		}
-
-		public void Dispose() => _wrapped.Dispose();
-		public void LogStats() => _wrapped.LogStats();
-		public IScavengeMap<TStreamId, Unit> CollisionStorage { get; set; }
-		public IScavengeMap<ulong, TStreamId> Hashes { get; set; }
-		public IMetastreamScavengeMap<ulong> MetaStorage { get; set; }
-		public IMetastreamScavengeMap<TStreamId> MetaCollisionStorage { get; set; }
-		public IOriginalStreamScavengeMap<ulong> OriginalStorage { get; set; }
-		public IOriginalStreamScavengeMap<TStreamId> OriginalCollisionStorage { get; set; }
-		public IScavengeMap<Unit, ScavengeCheckpoint> CheckpointStorage { get; set; }
-		public IScavengeMap<int, ChunkTimeStampRange> ChunkTimeStampRanges { get; set; }
-		public IChunkWeightScavengeMap ChunkWeights { get; set; }
-		public ITransactionManager TransactionManager { get; set; }
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocTransactionManager.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocTransactionManager.cs
deleted file mode 100644
index 3f523fd8d6f..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocTransactionManager.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.Scavenging;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class AdHocTransactionManager : ITransactionManager {
-		private readonly ITransactionManager _wrapped;
-		private readonly Action<Action<ScavengeCheckpoint>, ScavengeCheckpoint> _f;
-
-		public AdHocTransactionManager(
-			ITransactionManager wrapped,
-			Action<Action<ScavengeCheckpoint>, ScavengeCheckpoint> f) {
-
-			_wrapped = wrapped;
-			_f = f;
-		}
-
-		public void RegisterOnRollback(Action onRollback) {
-			_wrapped.RegisterOnRollback(onRollback);
-		}
-
-		public void UnregisterOnRollback() {
-			_wrapped.UnregisterOnRollback();
-		}
-
-		public void Begin() {
-			_wrapped.Begin();
-		}
-
-		public void Commit(ScavengeCheckpoint checkpoint) {
-			_f(_wrapped.Commit, checkpoint);
-		}
-
-		public void Rollback() {
-			_wrapped.Rollback();
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/MockScavengePointSource.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/MockScavengePointSource.cs
deleted file mode 100644
index 56c5b1862ac..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/MockScavengePointSource.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Services;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.TransactionLog.Scavenging;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	// The real ScavengePointSource is a bit awkward to use in the tests because it uses the IODispatcher
-	// Also even if we plumbed in the necessary components to the test to get that to work, it would
-	// still have to write the scavengepoint to the chunks and also to the index in order to behave in
-	// reasonable way.
-	public class MockScavengePointSource : IScavengePointSource {
-		private readonly ILogRecord[][] _log;
-		private readonly DateTime _effectiveNow;
-		private readonly List<ScavengePoint> _added;
-
-		public MockScavengePointSource(
-			DbResult dbResult,
-			DateTime effectiveNow,
-			List<ScavengePoint> added) {
-
-			_log = dbResult.Recs;
-			_effectiveNow = effectiveNow;
-			_added = added;
-		}
-
-		public Task<ScavengePoint> GetLatestScavengePointOrDefaultAsync(
-			CancellationToken cancellationToken) {
-
-			ScavengePoint scavengePoint = default;
-
-			foreach (var record in AllRecords()) {
-				if (record is PrepareLogRecord prepare &&
-					prepare.EventType == SystemEventTypes.ScavengePoint) {
-
-					var payload = ScavengePointPayload.FromBytes(prepare.Data);
-
-					scavengePoint = new ScavengePoint(
-						position: record.LogPosition,
-						eventNumber: prepare.ExpectedVersion + 1,
-						effectiveNow: prepare.TimeStamp,
-						threshold: payload.Threshold);
-				}
-			}
-
-			return Task.FromResult(scavengePoint);
-		}
-
-		public async Task<ScavengePoint> AddScavengePointAsync(
-			long expectedVersion,
-			int threshold,
-			CancellationToken cancellationToken) {
-
-			var latestScavengePoint = await GetLatestScavengePointOrDefaultAsync(cancellationToken);
-			var actualVersion = latestScavengePoint != null
-				? latestScavengePoint.EventNumber
-				: -1;
-
-			if (actualVersion != expectedVersion) {
-				throw new InvalidOperationException(
-					$"wrong version number {expectedVersion} vs {actualVersion}");
-			}
-
-			// this is only used in a specific way, when CancelOnNewScavengePoint is called.
-			// the scavenge point isn't used for a scavenge, we just assert that the scavenge
-			// created it properly
-			var scavengePoint = new ScavengePoint(
-				position: -1,
-				eventNumber: expectedVersion + 1,
-				effectiveNow: _effectiveNow,
-				threshold: threshold);
-
-			_added.Add(scavengePoint);
-			throw new OperationCanceledException();
-		}
-
-		private IEnumerable<ILogRecord> AllRecords() {
-			for (var chunkIndex = 0; chunkIndex < _log.Length; chunkIndex++) {
-				for (var recordIndex = 0; recordIndex < _log[chunkIndex].Length; recordIndex++) {
-					yield return _log[chunkIndex][recordIndex];
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/ScavengeStateBuilder.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/ScavengeStateBuilder.cs
deleted file mode 100644
index d3006369c16..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/ScavengeStateBuilder.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Threading;
-using EventStore.Core.DataStructures;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Scavenging;
-using EventStore.Core.TransactionLog.Scavenging.Sqlite;
-using Microsoft.Data.Sqlite;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class ScavengeStateBuilder<TStreamId> {
-		private readonly ILongHasher<TStreamId> _hasher;
-		private readonly IMetastreamLookup<TStreamId> _metastreamLookup;
-
-		private Tracer _tracer;
-		private ObjectPool<SqliteConnection> _connectionPool;
-		private Type _cancelWhenCheckpointingType;
-		private CancellationTokenSource _cancellationTokenSource;
-		private Action<ScavengeState<TStreamId>> _mutateState;
-
-		public ScavengeStateBuilder(
-			ILongHasher<TStreamId> hasher,
-			IMetastreamLookup<TStreamId> metastreamLookup) {
-
-			_hasher = hasher;
-			_metastreamLookup = metastreamLookup;
-			_mutateState = x => { };
-		}
-
-		public ScavengeStateBuilder<TStreamId> TransformBuilder(
-			Func<ScavengeStateBuilder<TStreamId>, ScavengeStateBuilder<TStreamId>> f) =>
-			f(this);
-
-		public ScavengeStateBuilder<TStreamId> CancelWhenCheckpointing(Type type, CancellationTokenSource cts) {
-			_cancelWhenCheckpointingType = type;
-			_cancellationTokenSource = cts;
-			return this;
-		}
-
-		public ScavengeStateBuilder<TStreamId> MutateState(Action<ScavengeState<TStreamId>> f) {
-			var wrapped = _mutateState;
-			_mutateState = state => {
-				wrapped(state);
-				f(state);
-			};
-			return this;
-		}
-
-		public ScavengeStateBuilder<TStreamId> WithTracer(Tracer tracer) {
-			_tracer = tracer;
-			return this;
-		}
-
-		public ScavengeStateBuilder<TStreamId> WithConnectionPool(ObjectPool<SqliteConnection> connectionPool) {
-			_connectionPool = connectionPool;
-			return this;
-		}
-
-		public ScavengeState<TStreamId> Build() {
-			var state = BuildInternal();
-			state.Init();
-			_mutateState(state);
-			return state;
-		}
-
-		private ScavengeState<TStreamId> BuildInternal() {
-			if (_connectionPool == null)
-				throw new Exception("call WithConnectionPool(...)");
-
-			var map = new ConcurrentDictionary<IScavengeStateBackend<TStreamId>, SqliteConnection>();
-			var backendPool = new ObjectPool<IScavengeStateBackend<TStreamId>>(
-				objectPoolName: "scavenge backend pool",
-				initialCount: 1,
-				maxCount: TFChunkScavenger.MaxThreadCount + 1,
-				factory: () => {
-					var connection = _connectionPool.Get();
-					var sqlite = new SqliteScavengeBackend<TStreamId>(Serilog.Log.Logger);
-					sqlite.Initialize(connection);
-
-					var backend = new AdHocScavengeBackendInterceptor<TStreamId>(sqlite);
-
-					var transactionFactory = sqlite.TransactionFactory;
-
-					if (_tracer != null)
-						transactionFactory = new TracingTransactionFactory<SqliteTransaction>(transactionFactory, _tracer);
-
-					ITransactionManager transactionManager = new TransactionManager<SqliteTransaction>(
-						transactionFactory,
-						backend.CheckpointStorage);
-
-					transactionManager = new AdHocTransactionManager(
-						transactionManager,
-						(continuation, checkpoint) => {
-							if (checkpoint.GetType() == _cancelWhenCheckpointingType) {
-								_cancellationTokenSource.Cancel();
-							}
-							continuation(checkpoint);
-						});
-
-					if (_tracer != null) {
-						backend.TransactionManager = new TracingTransactionManager(transactionManager, _tracer);
-						backend.OriginalStorage =
-							new TracingOriginalStreamScavengeMap<ulong>(backend.OriginalStorage, _tracer);
-						backend.OriginalCollisionStorage =
-							new TracingOriginalStreamScavengeMap<TStreamId>(backend.OriginalCollisionStorage, _tracer);
-					}
-					map[backend] = connection;
-					return backend;
-				},
-				dispose: backend => _connectionPool.Return(map[backend]));
-
-			var scavengeState = new ScavengeState<TStreamId>(
-				Serilog.Log.Logger,
-				_hasher,
-				_metastreamLookup,
-				backendPool,
-				100_000);
-
-			return scavengeState;
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/Scenario.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/Scenario.cs
deleted file mode 100644
index d74f77ca419..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/Scenario.cs
+++ /dev/null
@@ -1,731 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.DataStructures;
-using EventStore.Core.Index;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Metrics;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Settings;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Index.Hashers;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.TransactionLog.Scavenging;
-using EventStore.Core.Transforms;
-using EventStore.Core.Util;
-using Xunit;
-using static EventStore.Core.XUnit.Tests.Scavenge.StreamMetadatas;
-
-#pragma warning disable CS0162 // Unreachable code detected
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class Scenario {
-		protected const int Threads = 1;
-		public const bool CollideEverything = false;
-	}
-
-	// sort of similar to ScavengeTestScenario
-	public class Scenario<TLogFormat, TStreamId> : Scenario {
-		private static EqualityComparer<TStreamId> StreamIdComparer { get; } =
-			EqualityComparer<TStreamId>.Default;
-
-		private Func<TFChunkDbConfig, LogFormatAbstractor<TStreamId>, DbResult> _getDb;
-		private Func<ScavengeStateBuilder<TStreamId>, ScavengeStateBuilder<TStreamId>> _stateTransform;
-		private Action<ScavengeState<TStreamId>> _assertState;
-		private List<ScavengePoint> _newScavengePoint;
-		private ITFChunkScavengerLog _logger;
-
-		private bool _mergeChunks;
-		private bool _syncOnly;
-		private string _dbPath;
-		private TStreamId _accumulatingCancellationTrigger;
-		private TStreamId _calculatingCancellationTrigger;
-		private TStreamId _executingChunkCancellationTrigger;
-		private TStreamId _executingIndexEntryCancellationTrigger;
-		private Type _cancelWhenCheckpointingType;
-		private (string Message, int Line)[] _expectedTrace;
-		private bool _unsafeIgnoreHardDeletes;
-		private readonly HashSet<int> _chunkNumsToEmpty = new();
-
-		protected Tracer Tracer { get; set; }
-
-		public Scenario() {
-			_getDb = (_, _) => throw new Exception("db not configured. call WithDb");
-			_stateTransform = x => x;
-			Tracer = new Tracer();
-		}
-
-		public Scenario<TLogFormat, TStreamId> WithTracerFrom(Scenario<TLogFormat, TStreamId> scenario) {
-			Tracer = scenario.Tracer;
-			return this;
-		}
-
-		public Scenario<TLogFormat, TStreamId> WithUnsafeIgnoreHardDeletes(
-			bool unsafeIgnoreHardDeletes = true) {
-
-			_unsafeIgnoreHardDeletes = unsafeIgnoreHardDeletes;
-			return this;
-		}
-
-		public Scenario<TLogFormat, TStreamId> WithDbPath(string path) {
-			_dbPath = path;
-			return this;
-		}
-
-		public Scenario<TLogFormat, TStreamId> WithDb(DbResult db) {
-			_getDb = (_, _) => {
-				db.Db.Open();
-				return db;
-			};
-			return this;
-		}
-
-		public Scenario<TLogFormat, TStreamId> WithDb(
-			Func<
-				TFChunkDbCreationHelper<TLogFormat, TStreamId>,
-				TFChunkDbCreationHelper<TLogFormat, TStreamId>> f) {
-
-			_getDb = (dbConfig, logFormat) =>
-				f(new TFChunkDbCreationHelper<TLogFormat, TStreamId>(dbConfig, logFormat)).CreateDb();
-			return this;
-		}
-
-		public Scenario<TLogFormat, TStreamId> WithLogger(ITFChunkScavengerLog logger) {
-			_logger = logger;
-			return this;
-		}
-
-		public Scenario<TLogFormat, TStreamId> WithState(
-			Func<ScavengeStateBuilder<TStreamId>, ScavengeStateBuilder<TStreamId>> f) {
-
-			var wrapped = _stateTransform;
-			_stateTransform = builder => builder
-				.TransformBuilder(wrapped)
-				.TransformBuilder(f);
-			return this;
-		}
-
-		public Scenario<TLogFormat, TStreamId> AssertState(Action<ScavengeState<TStreamId>> f) {
-			_assertState = f;
-			return this;
-		}
-
-		public Scenario<TLogFormat, TStreamId> MutateState(Action<ScavengeState<TStreamId>> f) {
-			var wrapped = _stateTransform;
-			_stateTransform = builder => builder
-				.TransformBuilder(wrapped)
-				.MutateState(f);
-			return this;
-		}
-
-		public Scenario<TLogFormat, TStreamId> WithMergeChunks(bool mergeChunks = true) {
-			_mergeChunks = mergeChunks;
-			return this;
-		}
-
-		public Scenario<TLogFormat, TStreamId> WithSyncOnly(bool syncOnly = true) {
-			_syncOnly = syncOnly;
-			return this;
-		}
-
-		public Scenario<TLogFormat, TStreamId> CancelOnNewScavengePoint(
-			List<ScavengePoint> newScavengePoint) {
-
-			_newScavengePoint = newScavengePoint;
-			return this;
-		}
-
-		public Scenario<TLogFormat, TStreamId> CancelWhenAccumulatingMetaRecordFor(TStreamId trigger) {
-			_accumulatingCancellationTrigger = trigger;
-			return this;
-		}
-
-		// note for this to work the trigger stream needs metadata so it will be calculated
-		// and it needs to have at least one record
-		public Scenario<TLogFormat, TStreamId> CancelWhenCalculatingOriginalStream(TStreamId trigger) {
-			_calculatingCancellationTrigger = trigger;
-			return this;
-		}
-
-		public Scenario<TLogFormat, TStreamId> CancelWhenExecutingChunk(TStreamId trigger) {
-			_executingChunkCancellationTrigger = trigger;
-			return this;
-		}
-
-		public Scenario<TLogFormat, TStreamId> CancelWhenExecutingIndexEntry(TStreamId trigger) {
-			_executingIndexEntryCancellationTrigger = trigger;
-			return this;
-		}
-
-		public Scenario<TLogFormat, TStreamId> CancelWhenCheckpointing<TCheckpoint>() {
-			_cancelWhenCheckpointingType = typeof(TCheckpoint);
-			return this;
-		}
-
-		// Assert methods can be used to input checks that are internal to the scavenge
-		// This is not black box testing, handle with care.
-		public delegate Scenario<TLogFormat, TStreamId> TraceDelegate(params string[] expected);
-
-		public Scenario<TLogFormat, TStreamId> AssertTrace(params (string, int)[] expected) {
-			_expectedTrace = expected;
-			return this;
-		}
-
-		public Scenario<TLogFormat, TStreamId> EmptyChunk(int chunkNumber) {
-			_chunkNumsToEmpty.Add(chunkNumber);
-			return this;
-		}
-
-		public async Task<DbResult> RunAsync(
-			Func<DbResult, ILogRecord[][]> getExpectedKeptRecords = null,
-			Func<DbResult, ILogRecord[][]> getExpectedKeptIndexEntries = null) {
-
-			return await RunInternalAsync(
-				getExpectedKeptRecords,
-				getExpectedKeptIndexEntries);
-		}
-
-		private async Task<DbResult> RunInternalAsync(
-			Func<DbResult, ILogRecord[][]> getExpectedKeptRecords,
-			Func<DbResult, ILogRecord[][]> getExpectedKeptIndexEntries) {
-
-			if (string.IsNullOrEmpty(_dbPath))
-				throw new Exception("call WithDbPath");
-
-			var indexPath = Path.Combine(_dbPath, "index");
-			var logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
-				IndexDirectory = indexPath,
-			});
-
-			var dbConfig = TFChunkHelper.CreateSizedDbConfig(_dbPath, 0, chunkSize: 1024 * 1024);
-			var dbTransformManager = DbTransformManager.Default;
-
-			var dbResult = _getDb(dbConfig, logFormat);
-			var keptRecords = getExpectedKeptRecords != null
-				? getExpectedKeptRecords(dbResult)
-				: null;
-
-			var keptIndexEntries = getExpectedKeptIndexEntries != null
-				? getExpectedKeptIndexEntries(dbResult)
-				: keptRecords;
-
-			dbResult.Db.Config.WriterCheckpoint.Flush();
-			dbResult.Db.Config.ChaserCheckpoint.Write(dbResult.Db.Config.WriterCheckpoint.Read());
-			dbResult.Db.Config.ChaserCheckpoint.Flush();
-			dbResult.Db.Config.ReplicationCheckpoint.Write(dbResult.Db.Config.WriterCheckpoint.Read());
-			dbResult.Db.Config.ReplicationCheckpoint.Flush();
-
-			var readerPool = new ObjectPool<ITransactionFileReader>(
-				objectPoolName: "ReadIndex readers pool",
-				initialCount: ESConsts.PTableInitialReaderCount,
-				maxCount: ESConsts.PTableInitialReaderCount,
-				factory: () => new TFChunkReader(dbResult.Db, dbResult.Db.Config.WriterCheckpoint));
-
-			var lowHasher = logFormat.LowHasher;
-			var highHasher = logFormat.HighHasher;
-
-			var humanHashers = true;
-			if (CollideEverything) {
-				if (LogFormatHelper<TLogFormat, TStreamId>.IsV3)
-					throw new Exception("Cant cause collisions in V3");
-				lowHasher = new ConstantHasher(0) as IHasher<TStreamId>;
-				highHasher = new ConstantHasher(0) as IHasher<TStreamId>;
-			} else if (humanHashers) {
-				if (LogFormatHelper<TLogFormat, TStreamId>.IsV3)
-					throw new Exception("Cant cause collisions in V3");
-				lowHasher = new ConstantHasher(0) as IHasher<TStreamId>;
-				highHasher = new HumanReadableHasher32() as IHasher<TStreamId>;
-			}
-
-			var hasher = new CompositeHasher<TStreamId>(lowHasher, highHasher);
-
-			var tableIndex = new TableIndex<TStreamId>(
-				directory: indexPath,
-				lowHasher: lowHasher,
-				highHasher: highHasher,
-				emptyStreamId: logFormat.EmptyStreamId,
-				memTableFactory: () => new HashListMemTable(PTableVersions.IndexV4, maxSize: 200),
-				tfReaderFactory: () => new TFReaderLease(readerPool),
-				ptableVersion: PTableVersions.IndexV4,
-				maxAutoMergeIndexLevel: int.MaxValue,
-				pTableMaxReaderCount: ESConsts.PTableInitialReaderCount,
-				maxSizeForMemory: 1, // convert everything to ptables immediately
-				maxTablesPerLevel: 2,
-				inMem: false);
-			logFormat.StreamNamesProvider.SetTableIndex(tableIndex);
-
-			var readIndex = new ReadIndex<TStreamId>(
-				bus: new NoopPublisher(),
-				readerPool: readerPool,
-				tableIndex: tableIndex,
-				logFormat.StreamNameIndexConfirmer,
-				logFormat.StreamIds,
-				logFormat.StreamNamesProvider,
-				logFormat.EmptyStreamId,
-				logFormat.StreamIdValidator,
-				logFormat.StreamIdSizer,
-				logFormat.StreamExistenceFilter,
-				logFormat.StreamExistenceFilterReader,
-				logFormat.EventTypeIndexConfirmer,
-				new LRUCache<TStreamId, IndexBackend<TStreamId>.EventNumberCached>("LastEventNumber", 100),
-				new LRUCache<TStreamId, IndexBackend<TStreamId>.MetadataCached>("StreamMetadata", 100),
-				additionalCommitChecks: true,
-				metastreamMaxCount: 1,
-				hashCollisionReadLimit: Opts.HashCollisionReadLimitDefault,
-				skipIndexScanOnReads: Opts.SkipIndexScanOnReadsDefault,
-				replicationCheckpoint: dbResult.Db.Config.ReplicationCheckpoint,
-				indexCheckpoint: dbResult.Db.Config.IndexCheckpoint,
-				indexStatusTracker: new IndexStatusTracker.NoOp(),
-				indexTracker: new IndexTracker.NoOp(),
-				cacheTracker: new CacheHitsMissesTracker.NoOp());
-
-			readIndex.IndexCommitter.Init(dbResult.Db.Config.WriterCheckpoint.Read());
-			// wait for tables to be merged. for one of the tests this takes a while
-			for (int i = 0; i < 10; i++) {
-				try {
-					tableIndex.WaitForBackgroundTasks();
-					break;
-				} catch {
-				}
-			}
-
-			await EmptyRequestedChunks(dbResult.Db);
-
-			Scavenger<TStreamId> sut = null;
-			try {
-				var cancellationTokenSource = new CancellationTokenSource();
-				var metastreamLookup = logFormat.Metastreams;
-
-				var scavengeState = new ScavengeStateBuilder<TStreamId>(hasher, metastreamLookup)
-					.TransformBuilder(_stateTransform)
-					.CancelWhenCheckpointing(_cancelWhenCheckpointingType, cancellationTokenSource)
-					.WithTracer(Tracer)
-					.Build();
-
-				IChunkReaderForAccumulator<TStreamId> chunkReader = new ChunkReaderForAccumulator<TStreamId>(
-					dbResult.Db.Manager,
-					metastreamLookup,
-					logFormat.StreamIdConverter,
-					dbResult.Db.Config.ReplicationCheckpoint,
-					dbConfig.ChunkSize);
-
-				var indexReader = new IndexReaderForAccumulator<TStreamId>(readIndex);
-
-				var accumulatorMetastreamLookup = new AdHocMetastreamLookupInterceptor<TStreamId>(
-					metastreamLookup,
-					(continuation, streamId) => {
-						if (StreamIdComparer.Equals(streamId, _accumulatingCancellationTrigger))
-							cancellationTokenSource.Cancel();
-						return continuation(streamId);
-					});
-
-				var calculatorIndexReader = new AdHocIndexReaderInterceptor<TStreamId>(
-					new IndexReaderForCalculator<TStreamId>(
-						readIndex,
-						() => new TFReaderLease(readerPool),
-						scavengeState.LookupUniqueHashUser),
-					(f, handle, from, maxCount, x) => {
-						if (_calculatingCancellationTrigger != null)
-							if ((handle.Kind == StreamHandle.Kind.Hash && handle.StreamHash == hasher.Hash(_calculatingCancellationTrigger)) ||
-								(handle.Kind == StreamHandle.Kind.Id && StreamIdComparer.Equals(handle.StreamId, _calculatingCancellationTrigger))) {
-
-								cancellationTokenSource.Cancel();
-							}
-						return f(handle, from, maxCount, x);
-					});
-
-				var chunkExecutorMetastreamLookup = new AdHocMetastreamLookupInterceptor<TStreamId>(
-					metastreamLookup,
-					(continuation, streamId) => {
-						if (StreamIdComparer.Equals(streamId, _executingChunkCancellationTrigger))
-							cancellationTokenSource.Cancel();
-						return continuation(streamId);
-					});
-
-				var indexScavenger = new IndexScavenger(tableIndex);
-				var cancellationWrappedIndexScavenger = new AdHocIndexScavengerInterceptor(
-					indexScavenger,
-					f => entry => {
-						if (_executingIndexEntryCancellationTrigger != null &&
-							entry.Stream == hasher.Hash(_executingIndexEntryCancellationTrigger)) {
-
-							cancellationTokenSource.Cancel();
-						}
-						return f(entry);
-					});
-
-				var cancellationCheckPeriod = 1;
-				var checkpointPeriod = 2;
-				var restPeriod = 5;
-
-				// add tracing
-				chunkReader = new TracingChunkReaderForAccumulator<TStreamId>(chunkReader, Tracer.Trace);
-
-				var logger = Serilog.Log.Logger;
-
-				var throttle = new Throttle(
-					logger,
-					TimeSpan.FromMilliseconds(1000),
-					TimeSpan.FromMilliseconds(1000),
-					activePercent: 100);
-
-				IAccumulator<TStreamId> accumulator = new Accumulator<TStreamId>(
-					logger: logger,
-					chunkSize: dbConfig.ChunkSize,
-					metastreamLookup: accumulatorMetastreamLookup,
-					chunkReader: chunkReader,
-					index: indexReader,
-					cancellationCheckPeriod: cancellationCheckPeriod,
-					throttle: throttle);
-
-				ICalculator<TStreamId> calculator = new Calculator<TStreamId>(
-					logger: logger,
-					index: calculatorIndexReader,
-					chunkSize: dbConfig.ChunkSize,
-					cancellationCheckPeriod: cancellationCheckPeriod,
-					buffer: new(checkpointPeriod),
-					throttle: throttle);
-
-				IChunkExecutor<TStreamId> chunkExecutor = new ChunkExecutor<TStreamId, ILogRecord>(
-					logger: logger,
-					metastreamLookup: chunkExecutorMetastreamLookup,
-					chunkManager: new TracingChunkManagerForChunkExecutor<TStreamId, ILogRecord>(
-						new ChunkManagerForExecutor<TStreamId>(
-							logger,
-							dbResult.Db.Manager,
-							dbConfig,
-							dbTransformManager),
-						Tracer),
-					chunkSize: dbConfig.ChunkSize,
-					unsafeIgnoreHardDeletes: _unsafeIgnoreHardDeletes,
-					cancellationCheckPeriod: cancellationCheckPeriod,
-					threads: Threads,
-					throttle: throttle);
-
-				IChunkMerger chunkMerger = new ChunkMerger(
-					logger: logger,
-					mergeChunks: _mergeChunks,
-					new OldScavengeChunkMergerBackend(logger, dbResult.Db),
-					throttle: throttle);
-
-				IIndexExecutor<TStreamId> indexExecutor = new IndexExecutor<TStreamId>(
-					logger: logger,
-					indexScavenger: cancellationWrappedIndexScavenger,
-					streamLookup: new ChunkReaderForIndexExecutor<TStreamId>(() => new TFReaderLease(readerPool)),
-					unsafeIgnoreHardDeletes: _unsafeIgnoreHardDeletes,
-					restPeriod: restPeriod,
-					throttle: throttle);
-
-				ICleaner cleaner = new Cleaner(logger, unsafeIgnoreHardDeletes: _unsafeIgnoreHardDeletes);
-
-				accumulator = new TracingAccumulator<TStreamId>(accumulator, Tracer);
-				calculator = new TracingCalculator<TStreamId>(calculator, Tracer);
-				chunkExecutor = new TracingChunkExecutor<TStreamId>(chunkExecutor, Tracer);
-				chunkMerger = new TracingChunkMerger(chunkMerger, Tracer);
-				indexExecutor = new TracingIndexExecutor<TStreamId>(indexExecutor, Tracer);
-				cleaner = new TracingCleaner(cleaner, Tracer);
-
-				// if test provided its own logger it can check its own status
-				var expectSuccess = _logger == null;
-				var successLogger = expectSuccess ? new FakeTFScavengerLog() : null;
-
-				sut = new Scavenger<TStreamId>(
-					logger: logger,
-					checkPreconditions: () => { },
-					scavengeState,
-					accumulator,
-					calculator,
-					chunkExecutor,
-					chunkMerger,
-					indexExecutor,
-					cleaner,
-					new MockScavengePointSource(
-						dbResult,
-						EffectiveNow,
-						_newScavengePoint ?? new List<ScavengePoint>()),
-					_logger ?? successLogger,
-					statusTracker: new ScavengeStatusTracker.NoOp(),
-					thresholdForNewScavenge: 0,
-					syncOnly: _syncOnly,
-					throttle.PrettyPrint);
-
-				Tracer.Reset();
-				await sut.ScavengeAsync(cancellationTokenSource.Token);
-
-				// check if successful
-				if (_logger == null) {
-					Assert.True(successLogger.Completed);
-					Assert.True(
-						successLogger.Result == Core.TransactionLog.Chunks.ScavengeResult.Success,
-						$"Status: {successLogger.Result}. Error: {successLogger.Error}");
-				}
-
-				// check the trace. only when Threads == 1 or the order isn't guaranteed.
-				// only when not colliding everything, because the collisions will change the trace
-				if (_expectedTrace != null && Threads == 1 && !CollideEverything) {
-					var expected = _expectedTrace;
-					var actual = Tracer.ToArray();
-					for (var i = 0; i < Math.Max(expected.Length, actual.Length); i++) {
-
-						if (expected[i] == Tracer.AnythingElse) {
-							// actual can be anything it likes from this point on
-							break;
-						}
-
-						var line = expected[i].Line;
-						Assert.True(
-							i < expected.Length,
-							i < actual.Length
-								? $"Actual trace contains extra entries starting with: {actual[i]}"
-								: "impossible");
-
-						Assert.True(
-							i < actual.Length,
-							$"Expected trace contains extra entries starting from line {line}: {expected[i].Message}");
-
-						Assert.True(
-							expected[i].Message == actual[i],
-							$"Trace mismatch at line {line}. \r\n" +
-							$" Expected: {expected[i].Message} \r\n" +
-							$" Actual:   {actual[i]}");
-					}
-				}
-
-				// See a list of the stream collisions
-				//   - naively calculate list of collisions
-				var hashesInUse = new Dictionary<ulong, TStreamId>();
-				var collidingStreams = new HashSet<TStreamId>();
-
-				void RegisterUse(TStreamId streamId) {
-					var hash = hasher.Hash(streamId);
-					if (hashesInUse.TryGetValue(hash, out var user)) {
-						if (StreamIdComparer.Equals(user, streamId)) {
-							// in use by us. not a collision.
-						} else {
-							// collision. register both as collisions.
-							collidingStreams.Add(streamId);
-							collidingStreams.Add(user);
-						}
-					} else {
-						// hash was not in use. so it isn't a collision.
-						hashesInUse[hash] = streamId;
-					}
-				}
-
-				foreach (var chunk in dbResult.Recs) {
-					foreach (var record in chunk) {
-						if (record is not IPrepareLogRecord<TStreamId> prepare)
-							continue;
-
-						RegisterUse(prepare.EventStreamId);
-
-						if (prepare.Flags.HasAnyOf(PrepareFlags.StreamDelete)) {
-							RegisterUse(metastreamLookup.MetaStreamOf(prepare.EventStreamId));
-						}
-
-						if (metastreamLookup.IsMetaStream(prepare.EventStreamId)) {
-							RegisterUse(metastreamLookup.OriginalStreamOf(prepare.EventStreamId));
-						}
-					}
-				}
-
-				if (CollideEverything) {
-					// collidingStreams is all collisions in the log, not just up to the scavenge point
-					// so can contains extra collisions, which becomes apparent when everything collides.
-				} else {
-					//   - Assert list of collisions.
-					Assert.Equal(collidingStreams.OrderBy(x => x), scavengeState.AllCollisions().OrderBy(x => x));
-				}
-
-				// The records we expected to keep are kept
-				// The index entries we expected to be kept are kept
-				if (keptRecords != null) {
-					await CheckRecords(keptRecords, dbResult, cancellationTokenSource.Token);
-					CheckIndex(keptIndexEntries, readIndex, collidingStreams, hasher);
-				}
-
-				_assertState?.Invoke(scavengeState);
-
-				return dbResult;
-
-			} finally {
-				sut?.Dispose();
-				readIndex.Close();
-				dbResult.Db.Close();
-			}
-		}
-
-		// nicked from scavengetestscenario
-		private static async ValueTask CheckRecords(ILogRecord[][] expected, DbResult actual, CancellationToken token = default) {
-			Assert.True(
-				expected.Length == actual.Db.Manager.ChunksCount,
-				"Wrong number of chunks. " +
-				$"Expected {expected.Length}. Actual {actual.Db.Manager.ChunksCount}");
-
-			for (int i = 0; i < expected.Length; ++i) {
-				var chunk = actual.Db.Manager.GetChunk(i);
-
-				var chunkRecords = new List<ILogRecord>();
-				var result = await chunk.TryReadFirst(token);
-				while (result.Success) {
-					chunkRecords.Add(result.LogRecord);
-					result = chunk.TryReadClosestForward((int)result.NextPosition);
-				}
-
-				Assert.True(
-					expected[i].Length == chunkRecords.Count,
-					$"Wrong number of records in chunk #{i}. " +
-					$"Expected {expected[i].Length}. Actual {chunkRecords.Count}");
-
-				for (int j = 0; j < expected[i].Length; ++j) {
-					Assert.True(
-						expected[i][j].Equals(chunkRecords[j]),
-						$"Wrong log record #{j} read from chunk #{i}. " +
-						$"Expected {expected[i][j]}.\r\n" +
-						$"Actual   {chunkRecords[j]}");
-				}
-			}
-		}
-
-		// we want to check that the index contains everything it is supposed to
-		// and we want to check that the index doesn't contain anything extra.
-		private static void CheckIndex(
-			ILogRecord[][] expected,
-			IReadIndex<TStreamId> actual,
-			HashSet<TStreamId> collisions,
-			ILongHasher<TStreamId> hasher) {
-
-			if (expected == null) {
-				// test didn't ask us to check the index
-				return;
-			}
-
-			// check we have everything we are supposed to
-			// cant use normal stream reads because they will apply metadata etc.
-			var minEventNumbers = new Dictionary<TStreamId, long>();
-			var maxEventNumbers = new Dictionary<TStreamId, long>();
-
-			foreach (var chunk in expected) {
-				foreach (var record in chunk) {
-					if (record is not IPrepareLogRecord<TStreamId> prepare)
-						throw new Exception("expected to find commit record in index but this is impossible");
-
-					var streamId = prepare.EventStreamId;
-					var eventNumber = prepare.ExpectedVersion + 1;
-
-					// indexcommitter blesses tombstones with EventNumber.DeletedStream when they are
-					// committed with an explicit commit record
-					if (prepare.Flags.HasAnyOf(PrepareFlags.StreamDelete) &&
-						prepare.Flags.HasNoneOf(PrepareFlags.IsCommitted))
-						eventNumber = EventNumber.DeletedStream;
-
-					if (!minEventNumbers.TryGetValue(streamId, out var min))
-						min = eventNumber;
-					minEventNumbers[streamId] = Math.Min(eventNumber, min);
-
-					if (!maxEventNumbers.TryGetValue(streamId, out var max))
-						max = eventNumber;
-					maxEventNumbers[streamId] = Math.Max(eventNumber, max);
-
-					var result = collisions.Contains(streamId)
-						? actual.ReadEventInfoForward_KnownCollisions(
-							streamId: streamId,
-							fromEventNumber: eventNumber,
-							maxCount: 1,
-							beforePosition: long.MaxValue)
-						: actual.ReadEventInfoForward_NoCollisions(
-							stream: hasher.Hash(streamId),
-							fromEventNumber: eventNumber,
-							maxCount: 1,
-						beforePosition: long.MaxValue);
-
-					if (result.EventInfos.Length != 1) {
-						// remember this applies metadata, so is of limited use
-						var wholeStream = actual.ReadStreamEventsForward($"{streamId}", streamId, fromEventNumber: 0, maxCount: 100);
-						Assert.True(result.EventInfos.Length == 1, $"Couldn't find {streamId}:{eventNumber} in index.");
-					}
-
-
-					var info = result.EventInfos[0];
-					Assert.Equal(prepare.LogPosition, info.LogPosition);
-					Assert.Equal(eventNumber, info.EventNumber);
-				}
-			}
-
-			// check we don't have anything extra
-			// (we can't easily check that there aren't unexpected streams in the index, but risk of this
-			// is low)
-			// nothing before the min, or after the max that we found in the log.
-			foreach (var kvp in minEventNumbers) {
-				var streamId = kvp.Key;
-				var min = kvp.Value;
-				var max = maxEventNumbers[streamId];
-
-				var result = collisions.Contains(streamId)
-					? actual.ReadEventInfoForward_KnownCollisions(
-						streamId: streamId,
-						fromEventNumber: 0,
-						maxCount: 1000,
-						beforePosition: long.MaxValue)
-					: actual.ReadEventInfoForward_NoCollisions(
-						stream: hasher.Hash(streamId),
-						fromEventNumber: 0,
-						maxCount: 1000,
-						beforePosition: long.MaxValue);
-
-				if (result.EventInfos.Length > 100)
-					throw new Exception("wasn't expecting a stream this long in the tests");
-
-				Assert.All(result.EventInfos, info => {
-					Assert.True(info.EventNumber >= min);
-					Assert.True(info.EventNumber <= max);
-				});
-			}
-		}
-
-		private async ValueTask EmptyRequestedChunks(TFChunkDb db) {
-			foreach (var chunkNum in _chunkNumsToEmpty) {
-				var chunk = db.Manager.GetChunk(chunkNum);
-				var header = chunk.ChunkHeader;
-
-				var newChunkHeader = new ChunkHeader(
-					version: header.Version,
-					minCompatibleVersion: header.MinCompatibleVersion,
-					chunkSize: header.ChunkSize,
-					chunkStartNumber: header.ChunkStartNumber,
-					chunkEndNumber: header.ChunkEndNumber,
-					isScavenged: true,
-					chunkId: Guid.NewGuid(),
-					transformType: header.TransformType);
-
-				var transformFactory = db.TransformManager.GetFactoryForExistingChunk(header.TransformType);
-				var newChunk = TFChunk.CreateWithHeader(
-					filename: $"{chunk.FileName}.tmp",
-					header: newChunkHeader,
-					fileSize: ChunkHeader.Size,
-					inMem: false,
-					unbuffered: false,
-					writethrough: false,
-					reduceFileCachePressure: false,
-					tracker: new TFChunkTracker.NoOp(),
-					transformFactory: transformFactory,
-					transformHeader: transformFactory.CreateTransformHeader());
-
-				await newChunk.CompleteScavenge(null, CancellationToken.None);
-
-				db.Manager.SwitchChunk(newChunk, false, false);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/StreamMetadatas.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/StreamMetadatas.cs
deleted file mode 100644
index c42e78f0124..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/StreamMetadatas.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.Scavenging;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class StreamMetadatas {
-		public static StreamMetadata TruncateBefore1 { get; } = new StreamMetadata(truncateBefore: 1);
-		public static StreamMetadata TruncateBefore2 { get; } = new StreamMetadata(truncateBefore: 2);
-		public static StreamMetadata TruncateBefore3 { get; } = new StreamMetadata(truncateBefore: 3);
-		public static StreamMetadata TruncateBefore4 { get; } = new StreamMetadata(truncateBefore: 4);
-
-		public static StreamMetadata MaxCount1 { get; } = new StreamMetadata(maxCount: 1);
-		public static StreamMetadata MaxCount2 { get; } = new StreamMetadata(maxCount: 2);
-		public static StreamMetadata MaxCount3 { get; } = new StreamMetadata(maxCount: 3);
-		public static StreamMetadata MaxCount4 { get; } = new StreamMetadata(maxCount: 4);
-		public static StreamMetadata MaxCount50 { get; } = new StreamMetadata(maxCount: 50);
-
-		public static TimeSpan MaxAgeTimeSpan { get; } = TimeSpan.FromDays(2);
-		public static StreamMetadata MaxAgeMetadata { get; } =
-			new StreamMetadata(maxAge: MaxAgeTimeSpan);
-
-		public static StreamMetadata SoftDelete { get; } =
-			new StreamMetadata(truncateBefore: EventNumber.DeletedStream);
-
-		public static DateTime EffectiveNow { get; } = new DateTime(2022, 1, 5, 00, 00, 00);
-		public static DateTime Expired { get; } = EffectiveNow - TimeSpan.FromDays(3);
-		public static DateTime Cutoff { get; } = EffectiveNow - MaxAgeTimeSpan;
-		public static DateTime Active { get; } = EffectiveNow - TimeSpan.FromDays(1);
-
-		public static Rec ScavengePointRec(int transaction, int threshold = 0, DateTime? timeStamp = null) => Rec.Write(
-			transaction: transaction,
-			stream: SystemStreams.ScavengePointsStream,
-			eventType: SystemEventTypes.ScavengePoint,
-			timestamp: timeStamp ?? EffectiveNow,
-			data: new ScavengePointPayload {
-				Threshold = threshold,
-			}.ToJsonBytes());
-
-		public static ScavengePoint ScavengePoint(int chunk, long eventNumber) => new ScavengePoint(
-			position: PositionOfChunk(chunk),
-			eventNumber: eventNumber,
-			effectiveNow: EffectiveNow,
-			threshold: 0);
-
-		public const long ChunkSize = 1024 * 1024;
-		public static long PositionOfChunk(int logicalChunkNumber) => ChunkSize * logicalChunkNumber;
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/Tracer.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/Tracer.cs
deleted file mode 100644
index 5fe7ae850cc..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/Tracer.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class Tracer {
-		private readonly List<string> _traces = new List<string>();
-		private int _depth;
-
-		public Tracer() {
-		}
-
-		public string[] ToArray() => _traces.ToArray();
-
-		public void Reset() {
-			_traces.Clear();
-		}
-
-		public void Trace(string x) {
-			_traces.Add(new string(' ', _depth * 4) + x);
-		}
-
-		public void TraceIn(string x) {
-			Trace(x);
-			_depth++;
-		}
-
-		public void TraceOut(string x) {
-			_depth--;
-			Trace(x);
-		}
-
-		public static (string, int)  Line(string x, [CallerLineNumber] int sourceLineNumber = 0) =>
-			(x, sourceLineNumber);
-
-		// :S
-		public static (string, int) AnythingElse { get; } = ("ANYTHING_ELSE", 0);
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingAccumulator.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingAccumulator.cs
deleted file mode 100644
index d44215187ee..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingAccumulator.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System.Threading;
-using EventStore.Core.TransactionLog.Scavenging;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class TracingAccumulator<TStreamId> : IAccumulator<TStreamId> {
-		private readonly IAccumulator<TStreamId> _wrapped;
-		private readonly Tracer _tracer;
-
-		public TracingAccumulator(IAccumulator<TStreamId> wrapped, Tracer tracer) {
-			_wrapped = wrapped;
-			_tracer = tracer;
-		}
-
-		public void Accumulate(
-			ScavengePoint prevScavengePoint,
-			ScavengePoint scavengePoint,
-			IScavengeStateForAccumulator<TStreamId> state,
-			CancellationToken cancellationToken) {
-
-			_tracer.TraceIn($"Accumulating from {prevScavengePoint?.GetName() ?? "start"} to {scavengePoint.GetName()}");
-			try {
-				_wrapped.Accumulate(prevScavengePoint, scavengePoint, state, cancellationToken);
-				_tracer.TraceOut("Done");
-			} catch {
-				_tracer.TraceOut("Exception accumulating");
-				throw;
-			}
-		}
-
-		public void Accumulate(
-			ScavengeCheckpoint.Accumulating checkpoint,
-			IScavengeStateForAccumulator<TStreamId> state,
-			CancellationToken cancellationToken) {
-
-			_tracer.TraceIn($"Accumulating from checkpoint: {checkpoint}");
-			try {
-				_wrapped.Accumulate(checkpoint, state, cancellationToken);
-				_tracer.TraceOut("Done");
-			} catch {
-				_tracer.TraceOut("Exception accumulating");
-				throw;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingCalculator.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingCalculator.cs
deleted file mode 100644
index 5dc1ecfa737..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingCalculator.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System.Threading;
-using EventStore.Core.TransactionLog.Scavenging;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class TracingCalculator<TStreamId> : ICalculator<TStreamId> {
-		private readonly ICalculator<TStreamId> _wrapped;
-		private readonly Tracer _tracer;
-
-		public TracingCalculator(ICalculator<TStreamId> wrapped, Tracer tracer) {
-			_wrapped = wrapped;
-			_tracer = tracer;
-		}
-
-		public void Calculate(
-			ScavengePoint scavengePoint,
-			IScavengeStateForCalculator<TStreamId> source,
-			CancellationToken cancellationToken) {
-
-			_tracer.TraceIn($"Calculating {scavengePoint.GetName()}");
-			try {
-				_wrapped.Calculate(scavengePoint, source, cancellationToken);
-				_tracer.TraceOut("Done");
-			} catch {
-				_tracer.TraceOut("Exception calculating");
-				throw;
-			}
-		}
-
-		public void Calculate(
-			ScavengeCheckpoint.Calculating<TStreamId> checkpoint,
-			IScavengeStateForCalculator<TStreamId> source,
-			CancellationToken cancellationToken) {
-
-			_tracer.TraceIn($"Calculating from checkpoint: {checkpoint}");
-			try {
-				_wrapped.Calculate(checkpoint, source, cancellationToken);
-				_tracer.TraceOut("Done");
-			} catch {
-				_tracer.TraceOut("Exception calculating");
-				throw;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkExecutor.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkExecutor.cs
deleted file mode 100644
index 458e66d8176..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkExecutor.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Scavenging;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class TracingChunkExecutor<TStreamId> : IChunkExecutor<TStreamId> {
-		private readonly IChunkExecutor<TStreamId> _wrapped;
-		private readonly Tracer _tracer;
-
-		public TracingChunkExecutor(IChunkExecutor<TStreamId> wrapped, Tracer tracer) {
-			_wrapped = wrapped;
-			_tracer = tracer;
-		}
-
-		public async ValueTask Execute(
-			ScavengePoint scavengePoint,
-			IScavengeStateForChunkExecutor<TStreamId> state,
-			ITFChunkScavengerLog scavengerLogger,
-			CancellationToken cancellationToken) {
-
-			_tracer.TraceIn($"Executing chunks for {scavengePoint.GetName()}");
-			try {
-				await _wrapped.Execute(scavengePoint, state, scavengerLogger, cancellationToken);
-				_tracer.TraceOut("Done");
-			} catch {
-				_tracer.TraceOut("Exception executing chunks");
-				throw;
-			}
-		}
-
-		public async ValueTask Execute(
-			ScavengeCheckpoint.ExecutingChunks checkpoint,
-			IScavengeStateForChunkExecutor<TStreamId> state,
-			ITFChunkScavengerLog scavengerLogger,
-			CancellationToken cancellationToken) {
-
-			_tracer.TraceIn($"Executing chunks from checkpoint: {checkpoint}");
-			try {
-				await _wrapped.Execute(checkpoint, state, scavengerLogger, cancellationToken);
-				_tracer.TraceOut("Done");
-			} catch {
-				_tracer.TraceOut("Exception executing chunks");
-				throw;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkManagerForChunkExecutor.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkManagerForChunkExecutor.cs
deleted file mode 100644
index 79bee4d9cd9..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkManagerForChunkExecutor.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using EventStore.Core.TransactionLog.Scavenging;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class TracingChunkManagerForChunkExecutor<TStreamId, TRecord> :
-		IChunkManagerForChunkExecutor<TStreamId, TRecord> {
-
-		private readonly IChunkManagerForChunkExecutor<TStreamId, TRecord> _wrapped;
-		private readonly Tracer _tracer;
-
-		public TracingChunkManagerForChunkExecutor(
-			IChunkManagerForChunkExecutor<TStreamId, TRecord> wrapped, Tracer tracer) {
-
-			_wrapped = wrapped;
-			_tracer = tracer;
-		}
-
-		public IChunkWriterForExecutor<TStreamId, TRecord> CreateChunkWriter(
-			IChunkReaderForExecutor<TStreamId, TRecord> sourceChunk) {
-
-			return new TracingChunkWriterForExecutor<TStreamId, TRecord>(
-				_wrapped.CreateChunkWriter(sourceChunk),
-				_tracer);
-		}
-
-		public IChunkReaderForExecutor<TStreamId, TRecord> GetChunkReaderFor(long position) {
-			var reader = _wrapped.GetChunkReaderFor(position);
-			return new TrackingChunkReaderForExecutor<TStreamId, TRecord>(reader, _tracer);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkMerger.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkMerger.cs
deleted file mode 100644
index 7f4bc608919..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkMerger.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Scavenging;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class TracingChunkMerger : IChunkMerger {
-		private readonly IChunkMerger _wrapped;
-		private readonly Tracer _tracer;
-
-		public TracingChunkMerger(IChunkMerger wrapped, Tracer tracer) {
-			_wrapped = wrapped;
-			_tracer = tracer;
-		}
-
-		public async ValueTask MergeChunks(
-			ScavengePoint scavengePoint,
-			IScavengeStateForChunkMerger state,
-			ITFChunkScavengerLog scavengerLogger,
-			CancellationToken cancellationToken) {
-
-			_tracer.TraceIn($"Merging chunks for {scavengePoint.GetName()}");
-			try {
-				await _wrapped.MergeChunks(scavengePoint, state, scavengerLogger, cancellationToken);
-				_tracer.TraceOut("Done");
-			} catch {
-				_tracer.TraceOut("Exception merging chunks");
-				throw;
-			}
-		}
-
-		public async ValueTask MergeChunks(
-			ScavengeCheckpoint.MergingChunks checkpoint,
-			IScavengeStateForChunkMerger state,
-			ITFChunkScavengerLog scavengerLogger,
-			CancellationToken cancellationToken) {
-
-			_tracer.TraceIn($"Merging chunks from checkpoint: {checkpoint}");
-			try {
-				await _wrapped.MergeChunks(checkpoint, state, scavengerLogger, cancellationToken);
-				_tracer.TraceOut("Done");
-			} catch {
-				_tracer.TraceOut("Exception merging chunks");
-				throw;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkReaderForAccumulator.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkReaderForAccumulator.cs
deleted file mode 100644
index 96eaa620b58..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkReaderForAccumulator.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.TransactionLog.Scavenging;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class TracingChunkReaderForAccumulator<TStreamId> : IChunkReaderForAccumulator<TStreamId> {
-		private readonly IChunkReaderForAccumulator<TStreamId> _wrapped;
-		private readonly Action<string> _trace;
-
-		public TracingChunkReaderForAccumulator(
-			IChunkReaderForAccumulator<TStreamId> wrapped,
-			Action<string> trace) {
-
-			_wrapped = wrapped;
-			_trace = trace;
-		}
-
-		public IEnumerable<AccumulatorRecordType> ReadChunkInto(
-			int logicalChunkNumber,
-			RecordForAccumulator<TStreamId>.OriginalStreamRecord originalStreamRecord,
-			RecordForAccumulator<TStreamId>.MetadataStreamRecord metadataStreamRecord,
-			RecordForAccumulator<TStreamId>.TombStoneRecord tombStoneRecord) {
-
-			var ret = _wrapped.ReadChunkInto(
-				logicalChunkNumber,
-				originalStreamRecord,
-				metadataStreamRecord,
-				tombStoneRecord);
-
-			_trace($"Reading Chunk {logicalChunkNumber}");
-			return ret;
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkWriterForExecutor.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkWriterForExecutor.cs
deleted file mode 100644
index 7508ed6c6a9..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkWriterForExecutor.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Scavenging;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class TracingChunkWriterForExecutor<TStreamId, TRecord> :
-		IChunkWriterForExecutor<TStreamId, TRecord> {
-
-		private readonly IChunkWriterForExecutor<TStreamId, TRecord> _wrapped;
-		private readonly Tracer _tracer;
-
-		public TracingChunkWriterForExecutor(
-			IChunkWriterForExecutor<TStreamId, TRecord> wrapped,
-			Tracer tracer) {
-
-			_wrapped = wrapped;
-			_tracer = tracer;
-		}
-
-		public string FileName => _wrapped.FileName;
-
-		public void WriteRecord(RecordForExecutor<TStreamId, TRecord> record) {
-			_wrapped.WriteRecord(record);
-		}
-
-		public async ValueTask<(string, long)> Complete(CancellationToken token) {
-			var result = await _wrapped.Complete(token);
-			_tracer.Trace($"Switched in {Path.GetFileName(result.NewFileName)}");
-
-			return result;
-		}
-
-		public void Abort(bool deleteImmediately) {
-			_wrapped.Abort(deleteImmediately);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingCleaner.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingCleaner.cs
deleted file mode 100644
index 8e5456dd215..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingCleaner.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System.Threading;
-using EventStore.Core.TransactionLog.Scavenging;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class TracingCleaner : ICleaner {
-		private readonly ICleaner _wrapped;
-		private readonly Tracer _tracer;
-
-		public TracingCleaner(ICleaner wrapped, Tracer tracer) {
-			_wrapped = wrapped;
-			_tracer = tracer;
-		}
-
-		public void Clean(
-			ScavengePoint scavengePoint,
-			IScavengeStateForCleaner state,
-			CancellationToken cancellationToken) {
-
-			_tracer.TraceIn($"Cleaning for {scavengePoint.GetName()}");
-			try {
-				_wrapped.Clean(scavengePoint, state, cancellationToken);
-				_tracer.TraceOut("Done");
-			} catch {
-				_tracer.TraceOut("Exception cleaning");
-				throw;
-			}
-		}
-
-		public void Clean(
-			ScavengeCheckpoint.Cleaning checkpoint,
-			IScavengeStateForCleaner state,
-			CancellationToken cancellationToken) {
-
-			_tracer.TraceIn($"Cleaning from checkpoint {checkpoint}");
-			try {
-				_wrapped.Clean(checkpoint, state, cancellationToken);
-				_tracer.TraceOut("Done");
-			} catch {
-				_tracer.TraceOut("Exception cleaning");
-				throw;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingIndexExecutor.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingIndexExecutor.cs
deleted file mode 100644
index 00ca07fb16f..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingIndexExecutor.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Threading;
-using EventStore.Core.Index;
-using EventStore.Core.TransactionLog.Scavenging;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class TracingIndexExecutor<TStreamId> : IIndexExecutor<TStreamId> {
-		private readonly IIndexExecutor<TStreamId> _wrapped;
-		private readonly Tracer _tracer;
-
-		public TracingIndexExecutor(IIndexExecutor<TStreamId> wrapped, Tracer tracer) {
-			_wrapped = wrapped;
-			_tracer = tracer;
-		}
-
-		public void Execute(
-			ScavengePoint scavengePoint,
-			IScavengeStateForIndexExecutor<TStreamId> state,
-			IIndexScavengerLog scavengerLogger,
-			CancellationToken cancellationToken) {
-
-			_tracer.TraceIn($"Executing index for {scavengePoint.GetName()}");
-			try {
-				_wrapped.Execute(scavengePoint, state, scavengerLogger, cancellationToken);
-				_tracer.TraceOut("Done");
-			} catch {
-				_tracer.TraceOut("Exception executing index");
-				throw;
-			}
-		}
-
-		public void Execute(
-			ScavengeCheckpoint.ExecutingIndex checkpoint,
-			IScavengeStateForIndexExecutor<TStreamId> state,
-			IIndexScavengerLog scavengerLogger,
-			CancellationToken cancellationToken) {
-
-			_tracer.TraceIn($"Executing index from checkpoint: {checkpoint}");
-			try {
-				_wrapped.Execute(checkpoint, state, scavengerLogger, cancellationToken);
-				_tracer.TraceOut("Done");
-			} catch {
-				_tracer.TraceOut("Exception executing index");
-				throw;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingOriginalStreamScavengeMap.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingOriginalStreamScavengeMap.cs
deleted file mode 100644
index 75ef3c48697..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingOriginalStreamScavengeMap.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.TransactionLog.Scavenging;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class TracingOriginalStreamScavengeMap<TKey> : IOriginalStreamScavengeMap<TKey> {
-		private readonly IOriginalStreamScavengeMap<TKey> _wrapped;
-		private readonly Tracer _tracer;
-
-		public TracingOriginalStreamScavengeMap(
-			IOriginalStreamScavengeMap<TKey> wrapped,
-			Tracer tracer) {
-
-			_wrapped = wrapped;
-			_tracer = tracer;
-		}
-
-		public OriginalStreamData this[TKey key] { set => _wrapped[key] = value; }
-
-		public void DeleteMany(bool deleteArchived) {
-			_wrapped.DeleteMany(deleteArchived);
-		}
-
-		public IEnumerable<KeyValuePair<TKey, OriginalStreamData>> AllRecords() =>
-			_wrapped.AllRecords();
-
-		public IEnumerable<KeyValuePair<TKey, OriginalStreamData>> ActiveRecords() =>
-			_wrapped.ActiveRecords();
-
-		public IEnumerable<KeyValuePair<TKey, OriginalStreamData>> ActiveRecordsFromCheckpoint(TKey checkpoint) =>
-			_wrapped.ActiveRecordsFromCheckpoint(checkpoint);
-
-		public void SetDiscardPoints(
-			TKey key,
-			CalculationStatus status,
-			DiscardPoint discardPoint,
-			DiscardPoint maybeDiscardPoint) {
-
-			_tracer.Trace($"SetDiscardPoints({key}, {status}, {discardPoint}, {maybeDiscardPoint})");
-			_wrapped.SetDiscardPoints(key, status, discardPoint, maybeDiscardPoint);
-		}
-
-		public void SetMetadata(TKey key, StreamMetadata metadata) {
-			_wrapped.SetMetadata(key, metadata);
-		}
-
-		public void SetTombstone(TKey key) {
-			_wrapped.SetTombstone(key);
-		}
-
-		public bool TryGetChunkExecutionInfo(TKey key, out ChunkExecutionInfo details) {
-			return _wrapped.TryGetChunkExecutionInfo(key, out details);
-		}
-
-		public bool TryGetValue(TKey key, out OriginalStreamData value) {
-			return _wrapped.TryGetValue(key, out value);
-		}
-
-		public bool TryRemove(TKey key, out OriginalStreamData value) {
-			return _wrapped.TryRemove(key, out value);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingTransactionFactory.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingTransactionFactory.cs
deleted file mode 100644
index 66427017ad8..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingTransactionFactory.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using EventStore.Core.TransactionLog.Scavenging;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class TracingTransactionFactory<TTransaction> : ITransactionFactory<TTransaction> {
-		private readonly ITransactionFactory<TTransaction> _wrapped;
-		private readonly Tracer _tracer;
-
-		public TracingTransactionFactory(ITransactionFactory<TTransaction> wrapped, Tracer tracer) {
-			_wrapped = wrapped;
-			_tracer = tracer;
-		}
-
-		public TTransaction Begin() {
-			_tracer.TraceIn("Begin");
-			return _wrapped.Begin();
-		}
-
-		public void Commit(TTransaction transaction) {
-			_wrapped.Commit(transaction);
-			_tracer.TraceOut("Commit");
-		}
-
-		public void Rollback(TTransaction transaction) {
-			_wrapped.Rollback(transaction);
-			_tracer.TraceOut("Rollback");
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingTransactionManager.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingTransactionManager.cs
deleted file mode 100644
index 691df41dc74..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TracingTransactionManager.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.Scavenging;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class TracingTransactionManager : ITransactionManager {
-		private readonly ITransactionManager _wrapped;
-		private readonly Tracer _tracer;
-
-		public TracingTransactionManager(ITransactionManager wrapped, Tracer tracer) {
-			_wrapped = wrapped;
-			_tracer = tracer;
-		}
-
-		public void RegisterOnRollback(Action onRollback) {
-			_wrapped.RegisterOnRollback(onRollback);
-		}
-
-		public void UnregisterOnRollback() {
-			_wrapped.UnregisterOnRollback();
-		}
-
-		public void Begin() {
-			_wrapped.Begin();
-		}
-
-		public void Commit(ScavengeCheckpoint checkpoint) {
-			_tracer.Trace($"Checkpoint: {checkpoint}");
-			_wrapped.Commit(checkpoint);
-		}
-
-		public void Rollback() {
-			_wrapped.Rollback();
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TrackingChunkReaderForExecutor.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TrackingChunkReaderForExecutor.cs
deleted file mode 100644
index 68b28078c92..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Infrastructure/TrackingChunkReaderForExecutor.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.Collections.Generic;
-using System.Threading;
-using EventStore.Core.TransactionLog.Scavenging;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class TrackingChunkReaderForExecutor<TStreamId, TRecord> :
-		IChunkReaderForExecutor<TStreamId, TRecord> {
-
-		private readonly IChunkReaderForExecutor<TStreamId, TRecord> _wrapped;
-		private readonly Tracer _tracer;
-
-		public TrackingChunkReaderForExecutor(
-			IChunkReaderForExecutor<TStreamId, TRecord> wrapped,
-			Tracer tracer) {
-
-			_wrapped = wrapped;
-			_tracer = tracer;
-		}
-
-		public string Name => _wrapped.Name;
-
-		public int FileSize => _wrapped.FileSize;
-
-		public int ChunkStartNumber => _wrapped.ChunkStartNumber;
-
-		public int ChunkEndNumber => _wrapped.ChunkEndNumber;
-
-		public bool IsReadOnly => _wrapped.IsReadOnly;
-
-		public long ChunkStartPosition => _wrapped.ChunkStartPosition;
-
-		public long ChunkEndPosition => _wrapped.ChunkEndPosition;
-
-		public IAsyncEnumerable<bool> ReadInto(
-			RecordForExecutor<TStreamId, TRecord>.NonPrepare nonPrepare,
-			RecordForExecutor<TStreamId, TRecord>.Prepare prepare,
-			CancellationToken token) {
-
-			_tracer.Trace($"Opening Chunk {ChunkStartNumber}-{ChunkEndNumber}");
-			return _wrapped.ReadInto(nonPrepare, prepare, token);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/LogOrderingTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/LogOrderingTests.cs
deleted file mode 100644
index 342de8edc68..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/LogOrderingTests.cs
+++ /dev/null
@@ -1,250 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.Scavenging;
-using EventStore.Core.XUnit.Tests.Scavenge.Sqlite;
-using Xunit;
-using static EventStore.Core.XUnit.Tests.Scavenge.StreamMetadatas;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class LogDisorderingTests : SqliteDbPerTest<LogDisorderingTests> {
-		// if a metadata was ever written with the wrong event number (e.g. 0) due to old bugs
-		// the rest of the system will not respect it, so scavenge must not either
-		[Fact]
-		public async Task wrong_order_metadata_does_not_apply() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(Rec.Write(t++, "ab-1"))
-					.Chunk(Rec.Write(t++, "ab-1"))
-					.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 5, metadata: MaxCount2))
-					.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 0, metadata: MaxCount1))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-						x.Recs[0],
-						x.Recs[1],
-						x.Recs[2],
-						x.Recs[3].KeepNone(),
-						x.Recs[4],
-					});
-		}
-
-		[Fact]
-		public async Task wrong_order_metadata_does_not_apply_a() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(Rec.Write(t++, "ab-1")) // 0
-					.Chunk(Rec.Write(t++, "ab-1")) // 1
-					.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 0, metadata: MaxCount2)) // 2 apply
-					.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 0, metadata: MaxCount1)) // 3 skip
-					.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 0, metadata: MaxCount1)) // 4 skip
-					.Chunk(ScavengePointRec(t++, threshold: 1000)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertState(state => {
-					Assert.Equal(0, state.SumChunkWeights(0, 0));
-					Assert.Equal(0, state.SumChunkWeights(1, 1));
-					Assert.Equal(0, state.SumChunkWeights(2, 2));
-					Assert.Equal(2, state.SumChunkWeights(3, 3));
-					Assert.Equal(2, state.SumChunkWeights(4, 4));
-
-					Assert.True(state.TryGetOriginalStreamData("ab-1", out var originalStreamData));
-					// not present because there is nothing to discard
-					Assert.False(state.TryGetMetastreamData("$$ab-1", out var metastreamData));
-			
-					Assert.Equal(DiscardPoint.KeepAll, originalStreamData.DiscardPoint);
-					Assert.Equal(DiscardPoint.KeepAll, metastreamData.DiscardPoint);
-				})
-				.RunAsync();
-		}
-
-		[Fact]
-		public async Task wrong_order_metadata_does_not_apply_b() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(Rec.Write(t++, "ab-1")) // 0
-					.Chunk(Rec.Write(t++, "ab-1")) // 1
-					.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 3, metadata: MaxCount1)) // 2 apply
-					.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 4, metadata: MaxCount2)) // 3 apply
-					.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 4, metadata: MaxCount1)) // 4 skip
-					.Chunk(ScavengePointRec(t++, threshold: 1000)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertState(state => {
-					Assert.Equal(0, state.SumChunkWeights(0, 0));
-					Assert.Equal(0, state.SumChunkWeights(1, 1));
-					Assert.Equal(2, state.SumChunkWeights(2, 2));
-					Assert.Equal(0, state.SumChunkWeights(3, 3));
-					Assert.Equal(2, state.SumChunkWeights(4, 4));
-
-					Assert.True(state.TryGetOriginalStreamData("ab-1", out var originalStreamData));
-					Assert.True(state.TryGetMetastreamData("$$ab-1", out var metastreamData));
-
-					Assert.Equal(DiscardPoint.KeepAll, originalStreamData.DiscardPoint);
-					Assert.Equal(DiscardPoint.DiscardBefore(4), metastreamData.DiscardPoint);
-				})
-				.RunAsync();
-		}
-
-		[Fact]
-		public async Task wrong_order_metadata_does_not_apply_c() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(Rec.Write(t++, "ab-1")) // 0
-					.Chunk(Rec.Write(t++, "ab-1")) // 1
-					.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 3, metadata: MaxCount1)) // 2 apply
-					.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 4, metadata: MaxCount2)) // 3 apply
-					.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 0, metadata: MaxCount1)) // 4 skip
-					.Chunk(ScavengePointRec(t++, threshold: 1000)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertState(state => {
-					Assert.Equal(0, state.SumChunkWeights(0, 0));
-					Assert.Equal(0, state.SumChunkWeights(1, 1));
-					Assert.Equal(2, state.SumChunkWeights(2, 2));
-					Assert.Equal(0, state.SumChunkWeights(3, 3));
-					Assert.Equal(2, state.SumChunkWeights(4, 4));
-
-					Assert.True(state.TryGetOriginalStreamData("ab-1", out var originalStreamData));
-					Assert.True(state.TryGetMetastreamData("$$ab-1", out var metastreamData));
-
-					Assert.Equal(DiscardPoint.KeepAll, originalStreamData.DiscardPoint);
-					Assert.Equal(DiscardPoint.DiscardBefore(4), metastreamData.DiscardPoint);
-				})
-				.RunAsync();
-		}
-
-		[Fact]
-		public async Task wrong_order_metadata_does_not_apply_d() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(Rec.Write(t++, "ab-1")) // 0
-					.Chunk(Rec.Write(t++, "ab-1")) // 1
-					.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 4, metadata: MaxCount2)) // 2 apply
-					.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 2, metadata: MaxCount1)) // 3 skip
-					.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 0, metadata: MaxCount1)) // 4 skip
-					.Chunk(ScavengePointRec(t++, threshold: 1000)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertState(state => {
-					Assert.Equal(0, state.SumChunkWeights(0, 0));
-					Assert.Equal(0, state.SumChunkWeights(1, 1));
-					Assert.Equal(0, state.SumChunkWeights(2, 2));
-					Assert.Equal(2, state.SumChunkWeights(3, 3));
-					Assert.Equal(2, state.SumChunkWeights(4, 4));
-
-					Assert.True(state.TryGetOriginalStreamData("ab-1", out var originalStreamData));
-					Assert.True(state.TryGetMetastreamData("$$ab-1", out var metastreamData));
-
-					Assert.Equal(DiscardPoint.KeepAll, originalStreamData.DiscardPoint);
-					Assert.Equal(DiscardPoint.DiscardBefore(4), metastreamData.DiscardPoint);
-				})
-				.RunAsync();
-		}
-
-		[Fact]
-		public async Task wrong_order_metadata_does_not_apply_e() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(Rec.Write(t++, "ab-1")) // 0
-					.Chunk(Rec.Write(t++, "ab-1")) // 1
-					.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 4, metadata: MaxCount2)) // 2 apply
-					.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 2, metadata: MaxCount1)) // 3 skip
-					.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 3, metadata: MaxCount1)) // 4 skip
-					.Chunk(ScavengePointRec(t++, threshold: 1000)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertState(state => {
-					Assert.Equal(0, state.SumChunkWeights(0, 0));
-					Assert.Equal(0, state.SumChunkWeights(1, 1));
-					Assert.Equal(0, state.SumChunkWeights(2, 2));
-					Assert.Equal(2, state.SumChunkWeights(3, 3));
-					Assert.Equal(2, state.SumChunkWeights(4, 4));
-
-					Assert.True(state.TryGetOriginalStreamData("ab-1", out var originalStreamData));
-					Assert.True(state.TryGetMetastreamData("$$ab-1", out var metastreamData));
-
-					Assert.Equal(DiscardPoint.KeepAll, originalStreamData.DiscardPoint);
-					Assert.Equal(DiscardPoint.DiscardBefore(4), metastreamData.DiscardPoint);
-				})
-				.RunAsync();
-		}
-
-		[Fact]
-		public async Task wrong_order_metadata_then_right_does_apply() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(Rec.Write(t++, "ab-1"))
-					.Chunk(Rec.Write(t++, "ab-1"))
-					.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 5, metadata: MaxCount1))
-					.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 0, metadata: MaxCount3))
-					.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 6, metadata: MaxCount2))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-						x.Recs[0],
-						x.Recs[1],
-						x.Recs[2].KeepNone(),
-						x.Recs[3].KeepNone(),
-						x.Recs[4],
-						x.Recs[5],
-					});
-		}
-
-		[Fact]
-		public async Task wrong_order_in_original_stream_a() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1", eventNumber: 0),
-						Rec.Write(t++, "ab-1", eventNumber: 1),
-						Rec.Write(t++, "ab-1", eventNumber: 2),
-						Rec.Write(t++, "ab-1", eventNumber: 0),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(2, 4),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task wrong_order_in_original_stream_b() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1", eventNumber: 0),
-						Rec.Write(t++, "ab-1", eventNumber: 0),
-						Rec.Write(t++, "ab-1", eventNumber: 0),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new[] {
-						// they all have the same eventnumber so they will all be kept
-						x.Recs[0].KeepIndexes(0, 1, 2, 3),
-						x.Recs[1],
-					},
-					x => new[] {
-						// however, only 0 and 3 can be found in the index when looking up by eventNumber
-						// since 0, 1 and 2 all have event number 0.
-						x.Recs[0].KeepIndexes(0, 3),
-						x.Recs[1],
-					});
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/LruCachingScavengeMapTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/LruCachingScavengeMapTests.cs
deleted file mode 100644
index 8de1514f0e2..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/LruCachingScavengeMapTests.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using EventStore.Core.TransactionLog.Scavenging;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class LruCachingScavengeMapTests {
-		[Fact]
-		public void writing_writes_through() {
-			var wrapped = new InMemoryScavengeMap<string, int>();
-			var sut = new LruCachingScavengeMap<string, int>("", wrapped, cacheMaxCount: 100);
-
-			// given empty wrapped
-
-			// when we write
-			sut["3"] = 3;
-
-			// then it writes through
-			Assert.True(wrapped.TryGetValue("3", out var v));
-			Assert.Equal(3, v);
-		}
-
-		[Fact]
-		public void reading_reads_through() {
-			var wrapped = new InMemoryScavengeMap<string, int>();
-			var sut = new LruCachingScavengeMap<string, int>("", wrapped, cacheMaxCount: 100);
-
-			// given some data in the wrapped
-			wrapped["3"] = 3;
-
-			// then we can read that data
-			Assert.True(sut.TryGetValue("3", out var v));
-			Assert.Equal(3, v);
-		}
-
-		[Fact]
-		public void reading_populates_cache() {
-			var wrapped = new InMemoryScavengeMap<string, int>();
-			var sut = new LruCachingScavengeMap<string, int>("", wrapped, cacheMaxCount: 100);
-
-			// given some data in the wrapped
-			wrapped["3"] = 3;
-
-			// when we read that data
-			sut.TryGetValue("3", out _);
-
-			// then subsequent read comes from cache
-			wrapped["3"] = 4;
-			Assert.True(sut.TryGetValue("3", out var v));
-			Assert.Equal(3, v);
-		}
-
-		[Fact]
-		public void writing_populates_cache() {
-			var wrapped = new InMemoryScavengeMap<string, int>();
-			var sut = new LruCachingScavengeMap<string, int>("", wrapped, cacheMaxCount: 100);
-
-			// given empty wrapped
-
-			// when we write
-			sut["3"] = 3;
-
-			// then subsequent read comes from cache
-			wrapped["3"] = 4;
-			Assert.True(sut.TryGetValue("3", out var v));
-			Assert.Equal(3, v);
-		}
-
-		[Fact]
-		public void can_tryget_non_existent() {
-			var wrapped = new InMemoryScavengeMap<string, int>();
-			var sut = new LruCachingScavengeMap<string, int>("", wrapped, cacheMaxCount: 100);
-
-			// given empty wrapped
-
-			// then reading returns false
-			Assert.False(sut.TryGetValue("3", out var _));
-		}
-
-		[Fact]
-		public void can_tryremove_uncached() {
-			var wrapped = new InMemoryScavengeMap<string, int>();
-			var sut = new LruCachingScavengeMap<string, int>("", wrapped, cacheMaxCount: 100);
-
-			// given some data in the wrapped
-			wrapped["3"] = 3;
-
-			// then we can remove it
-			Assert.True(sut.TryRemove("3", out var v));
-			Assert.Equal(3, v);
-
-			// and can no longer find it
-			Assert.False(sut.TryGetValue("3", out _));
-			Assert.False(wrapped.TryGetValue("3", out _));
-		}
-
-		[Fact]
-		public void can_tryremove_cached() {
-			var wrapped = new InMemoryScavengeMap<string, int>();
-			var sut = new LruCachingScavengeMap<string, int>("", wrapped, cacheMaxCount: 100);
-
-			// given some data in the wrapped
-			wrapped["3"] = 3;
-
-			// when we read it
-			sut.TryGetValue("3", out _);
-
-			// then we can remove it
-			Assert.True(sut.TryRemove("3", out var v));
-			Assert.Equal(3, v);
-
-			// and can no longer find it
-			Assert.False(sut.TryGetValue("3", out _));
-			Assert.False(wrapped.TryGetValue("3", out _));
-		}
-
-		[Fact]
-		public void can_tryremove_non_existent() {
-			var wrapped = new InMemoryScavengeMap<string, int>();
-			var sut = new LruCachingScavengeMap<string, int>("", wrapped, cacheMaxCount: 100);
-
-			// given empty wrapped
-
-			// then removing returns false
-			Assert.False(sut.TryRemove("3", out var _));
-		}
-	}
-
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/MaxAgeTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/MaxAgeTests.cs
deleted file mode 100644
index 1b8d2c50c14..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/MaxAgeTests.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.XUnit.Tests.Scavenge.Sqlite;
-using Xunit;
-using static EventStore.Core.XUnit.Tests.Scavenge.StreamMetadatas;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	// for testing the maxage functionality specifically
-	public class MaxAgeTests : SqliteDbPerTest<MaxAgeTests> {
-		[Fact]
-		public async Task simple_maxage() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1", timestamp: Expired),
-						Rec.Write(t++, "ab-1", timestamp: Expired),
-						Rec.Write(t++, "ab-1", timestamp: Active),
-						Rec.Write(t++, "ab-1", timestamp: Active),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxAgeMetadata))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(2, 3, 4),
-						x.Recs[1],
-					},
-					Scenario.CollideEverything
-						// index is the same as the log because it tries to find the log records
-						// and fails, so must remove the index entries.
-						? default(Func<DbResult, LogRecord[][]>)
-						// records kept in the index because they are 'maybe' expired
-						: x => new[] {
-							x.Recs[0],
-							x.Recs[1],
-						});
-		}
-
-		[Fact]
-		public async Task keep_last_event() {
-			// records kept in the index because they are 'maybe' expired
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1", timestamp: Expired),
-						Rec.Write(t++, "ab-1", timestamp: Expired),
-						Rec.Write(t++, "ab-1", timestamp: Expired),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxAgeMetadata))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(2, 3),
-						x.Recs[1],
-					},
-					Scenario.CollideEverything
-						? default(Func<DbResult, LogRecord[][]>)
-						: x => new[] {
-							x.Recs[0],
-							x.Recs[1],
-						});
-		}
-
-		[Fact]
-		public async Task whole_chunk_expired() {
-			// the records can be removed from the chunks and the index
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1", timestamp: Expired),
-						Rec.Write(t++, "ab-1", timestamp: Expired),
-						Rec.Write(t++, "ab-1", timestamp: Expired))
-					.Chunk(
-						Rec.Write(t++, "ab-1", timestamp: Active),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxAgeMetadata))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(),
-						x.Recs[1].KeepIndexes(0, 1),
-						x.Recs[2],
-					});
-		}
-
-		[Fact]
-		public async Task whole_chunk_expired_keep_last_event() {
-			// the records can be removed from the chunks and the index
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1", timestamp: Expired),
-						Rec.Write(t++, "ab-1", timestamp: Expired),
-						Rec.Write(t++, "ab-1", timestamp: Expired))
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxAgeMetadata))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(2),
-						x.Recs[1].KeepIndexes(0),
-						x.Recs[2],
-					});
-		}
-
-		[Fact]
-		public async Task whole_chunk_active() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1", timestamp: Active),
-						Rec.Write(t++, "ab-1", timestamp: Active),
-						Rec.Write(t++, "ab-1", timestamp: Active))
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxAgeMetadata))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new[] {
-						x.Recs[0],
-						x.Recs[1],
-						x.Recs[2],
-					});
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/MaxCountTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/MaxCountTests.cs
deleted file mode 100644
index 7f1e3138f56..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/MaxCountTests.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.XUnit.Tests.Scavenge.Sqlite;
-using Xunit;
-using static EventStore.Core.XUnit.Tests.Scavenge.StreamMetadatas;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	// for testing the maxcount functionality specifically
-	public class MaxCountTests : SqliteDbPerTest<MaxCountTests> {
-		[Fact]
-		public async Task simple_maxcount() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(3, 4),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task no_stream() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0],
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task large_maxcount() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount50))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0],
-					x.Recs[1],
-				});
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/MiscellaneousTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/MiscellaneousTests.cs
deleted file mode 100644
index 50bcc8be81c..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/MiscellaneousTests.cs
+++ /dev/null
@@ -1,457 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.XUnit.Tests.Scavenge.Sqlite;
-using Xunit;
-using static EventStore.Core.XUnit.Tests.Scavenge.StreamMetadatas;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	// for testing functionality that isn't specific to particular discard criteria
-	public class MiscellaneousTests : SqliteDbPerTest<MiscellaneousTests> {
-		[Fact]
-		public async Task Trivial() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						// the first letter of the stream name determines its hash value
-						// ab-1: a stream called "ab-1" which hashes to "b"
-						Rec.Write(t++, "ab-1"),
-
-						// setting metadata for ab-1, which hashes to "a" and does not collide with "b"
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(0, 1),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task seen_stream_before() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(0, 1),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task collision() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-2"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(0, 1),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task metadata_non_colliding() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(0, 1),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task metadata_colliding() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "aa-1"),
-						Rec.Write(t++, "$$aa-1", "$metadata", metadata: MaxCount1))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(0, 1),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task metadata_applies_to_correct_stream_in_hidden_collision() {
-			// metastream sets metadata for stream ab-1 (which hashes to b)
-			// but that stream doesn't exist.
-			// make sure that cb-2 (which also hashes to b) does not pick up that metadata.
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "cb-2"),
-						Rec.Write(t++, "cb-2"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(0, 1, 2),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task metadatas_for_different_streams_non_colliding() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "$$cd-2", "$metadata", metadata: MaxCount2),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount3),
-						Rec.Write(t++, "$$cd-2", "$metadata", metadata: MaxCount4))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(2, 3),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task metadatas_for_different_streams_all_colliding() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$aa-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "$$aa-2", "$metadata", metadata: MaxCount2),
-						Rec.Write(t++, "$$aa-1", "$metadata", metadata: MaxCount3),
-						Rec.Write(t++, "$$aa-2", "$metadata", metadata: MaxCount4))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(2, 3),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task metadatas_for_different_streams_original_streams_colliding() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "$$cb-2", "$metadata", metadata: MaxCount2),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount3),
-						Rec.Write(t++, "$$cb-2", "$metadata", metadata: MaxCount4))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(2, 3),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task metadatas_for_different_streams_meta_streams_colliding() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "$$ac-2", "$metadata", metadata: MaxCount2),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount3),
-						Rec.Write(t++, "$$ac-2", "$metadata", metadata: MaxCount4))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(2, 3),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task metadatas_for_different_streams_original_and_meta_colliding() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "$$ab-2", "$metadata", metadata: MaxCount2),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount3),
-						Rec.Write(t++, "$$ab-2", "$metadata", metadata: MaxCount4))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(2, 3),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task metadatas_for_different_streams_cross_colliding() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "$$ba-2", "$metadata", metadata: MaxCount2),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount3),
-						Rec.Write(t++, "$$ba-2", "$metadata", metadata: MaxCount4))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(2, 3),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task metadatas_for_same_stream() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount2))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(1),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task metadata_first() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-						x.Recs[0].KeepIndexes(0, 4),
-						x.Recs[1],
-					});
-		}
-
-		[Fact]
-		public async Task nonexistent_stream() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-						x.Recs[0].KeepIndexes(0),
-						x.Recs[1],
-					});
-		}
-
-		[Fact]
-		public async Task multiple_streams() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "cd-2"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "cd-2"),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "$$cd-2", "$metadata", metadata: MaxCount1))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-						x.Recs[0].KeepIndexes(2, 3, 4, 5),
-						x.Recs[1],
-					});
-		}
-
-		[Fact]
-		public async Task metadata_gets_scavenged() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount2))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-						x.Recs[0].KeepIndexes(1),
-						x.Recs[1],
-					});
-		}
-
-		[Fact]
-		public async Task metadata_for_metadata_stream_gets_scavenged() {
-			// currently requires a threshold = -1 scavenge to force this.
-			// see comments in accumulator.cs
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "$$$$ab-1", "$metadata", metadata: MaxCount2))
-					.Chunk(ScavengePointRec(t++, threshold: -1)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-						x.Recs[0].KeepIndexes(1),
-						x.Recs[1],
-					});
-		}
-
-		[Fact]
-		public async Task metadata_for_metadata_stream_does_not_apply() {
-			// e.g. can't increase the maxcount to three
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$$$ab-1", "$metadata", metadata: MaxCount3),
-						Rec.Write(t++, "$$ab-1"),
-						Rec.Write(t++, "$$ab-1"),
-						Rec.Write(t++, "$$ab-1"),
-						Rec.Write(t++, "$$ab-1"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-						x.Recs[0].KeepIndexes(0, 4),
-						x.Recs[1],
-					});
-		}
-
-		[Fact]
-		public async Task unusual_metadata_still_takes_effect() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						// this 'metadata' record has a strange type, and does not parse to metadata
-						// still, its effect is to reset the metadata of the stream.
-						Rec.Write(
-							transaction: t++,
-							stream: "$$ab-1",
-							eventType: "sneaky",
-							data: BitConverter.GetBytes(0xBAD_1DEA)))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-						x.Recs[0].KeepIndexes(1, 2, 3),
-						x.Recs[1],
-					});
-		}
-
-		[Fact]
-		public async Task metadata_in_normal_stream_is_ignored() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-						x.Recs[0],
-						x.Recs[1],
-					});
-		}
-
-		[Fact]
-		public async Task metadata_in_transaction_not_supported() {
-			var logger = new FakeTFScavengerLog();
-
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.TransSt(0, "$$ab-1"),
-						Rec.Prepare(0, "$$ab-1", "$metadata", metadata: MaxCount1))
-					.Chunk(ScavengePointRec(1)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.WithLogger(logger)
-				.RunAsync();
-
-			Assert.True(logger.Completed);
-			Assert.Equal(EventStore.Core.TransactionLog.Chunks.ScavengeResult.Errored, logger.Result);
-			Assert.Equal("Error while scavenging DB: Found metadata in transaction in stream $$ab-1.", logger.Error);
-		}
-
-		[Fact]
-		public async Task transactions_not_scavenged() {
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(0, "ab-1"),
-						Rec.TransSt(1, "ab-1"),
-						Rec.Prepare(1, "ab-1"),
-						Rec.TransEnd(1, "ab-1"),
-						Rec.Commit(1, "ab-1"),
-						Rec.Write(2, "ab-1"),
-						Rec.Write(3, "$$ab-1", "$metadata", metadata: MaxCount1))
-					.Chunk(ScavengePointRec(4)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(1, 2, 3, 4, 5, 6),
-						x.Recs[1],
-					},
-					// still removed from the index
-					x => new[] {
-						x.Recs[0].KeepIndexes(5, 6),
-						x.Recs[1],
-					});
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/PortedFromOldScavenge/ScavengeTestScenarioPortedScavengeTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/PortedFromOldScavenge/ScavengeTestScenarioPortedScavengeTests.cs
deleted file mode 100644
index a556547570d..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/PortedFromOldScavenge/ScavengeTestScenarioPortedScavengeTests.cs
+++ /dev/null
@@ -1,497 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.XUnit.Tests.Scavenge.Sqlite;
-using EventStore.LogCommon;
-using Xunit;
-using static EventStore.Core.XUnit.Tests.Scavenge.StreamMetadatas;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge.PortedFromOldScavenge {
-	// old scavenge tests that derived from ScavengeTestScenario
-	public class ScavengeTestScenarioPortedScavengeTests : SqliteDbPerTest<ScavengeTestScenarioPortedScavengeTests> {
-		[Fact]
-		public async Task when_scavenging_tfchunk_with_version0_log_records_and_incomplete_chunk() {
-			const byte version = LogRecordVersion.LogRecordV0;
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ES1", version: version),
-						Rec.Write(t++, "ES1", version: version))
-					.CompleteLastChunk()
-					.Chunk(
-						Rec.Write(t++, "ES2", version: version),
-						Rec.Write(t++, "ES2", version: version))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepAll(),
-					x.Recs[1].KeepAll(),
-					x.Recs[2].KeepAll(),
-				});
-		}
-
-		// temp streams not supported:
-		// when_stream_is_softdeleted_and_temp_and_all_events_and_metaevents_are_in_one_chunk
-		// when_stream_is_softdeleted_and_temp_but_some_events_are_in_multiple_chunks
-		// when_stream_is_softdeleted_and_temp_but_some_metaevents_are_in_multiple_chunks
-		// when_stream_is_softdeleted_and_temp_with_log_version_0_but_some_events_are_in_multiple_chunks
-		// when_stream_is_softdeleted_with_log_record_version_0
-		// when_stream_is_softdeleted_with_mixed_log_record_version_0_and_version_1
-		//
-		// not applicable:
-		// when_metastream_is_scavenged_and_read_index_is_set_to_keep_last_3_metaevents
-
-
-		[Fact]
-		public async Task when_deleted_stream_with_a_lot_of_data_is_scavenged() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.CommittedDelete(t++, "bla"))
-					.CompleteLastChunk()
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(9),
-					x.Recs[1].KeepAll(),
-				});
-		}
-
-		[Fact]
-		public async Task when_deleted_stream_with_a_lot_of_data_is_scavenged_with_ingore_harddelete() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithUnsafeIgnoreHardDeletes(true)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.CommittedDelete(t++, "bla"))
-					.CompleteLastChunk()
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepNone(),
-					x.Recs[1].KeepAll(),
-				});
-		}
-
-		[Fact]
-		public async Task when_deleted_stream_with_explicit_transaction_is_scavenged() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithUnsafeIgnoreHardDeletes(true)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.CommittedDelete(t++, "bla"))
-					.CompleteLastChunk()
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepNone(),
-					x.Recs[1].KeepAll(),
-				});
-		}
-
-		[Fact]
-		public async Task when_deleted_stream_with_metadata_is_scavenged() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$bla", metadata: new StreamMetadata(10, null, null, null, null)),
-						Rec.Write(t++, "$$bla", metadata: new StreamMetadata(2, null, null, null, null)),
-						Rec.CommittedDelete(t++, "bla"))
-					.CompleteLastChunk()
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(2),
-					x.Recs[1].KeepAll(),
-				});
-		}
-
-		[Fact]
-		public async Task when_having_nothing_to_scavenge() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"))
-					.Chunk(
-						Rec.Write(t++, "bla3"),
-						Rec.Write(t++, "bla3"))
-					.CompleteLastChunk()
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepAll(),
-					x.Recs[1].KeepAll(),
-					x.Recs[2].KeepAll(),
-				});
-		}
-
-		[Fact]
-		public async Task when_having_stream_with_both_max_age_and_max_count_with_stricter_max_age_specified() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$bla", metadata: new StreamMetadata(5, TimeSpan.FromMinutes(5), null, null, null)),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(100)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(90)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(60)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(40)),
-
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(30)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(20)),
-
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(3)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(2)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(1)))
-					.CompleteLastChunk()
-					.Chunk(ScavengePointRec(t++, timeStamp: DateTime.UtcNow)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(0, 8, 9, 10),
-						x.Recs[1].KeepAll(),
-					},
-					Scenario.CollideEverything
-						? default(Func<DbResult, LogRecord[][]>)
-						: x => new[] {
-							x.Recs[0].KeepIndexes(0, 6, 7, 8, 9, 10),
-							x.Recs[1],
-						});
-		}
-
-		[Fact]
-		public async Task when_having_stream_with_both_max_age_and_max_count_with_stricter_max_count_specified() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$bla", metadata: new StreamMetadata(3, TimeSpan.FromMinutes(50), null, null, null)),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(100)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(90)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(60)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(40)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(30)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(20)),
-
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(3)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(2)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(1)))
-					.CompleteLastChunk()
-					.Chunk(ScavengePointRec(t++, timeStamp: DateTime.UtcNow)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(0, 8, 9, 10),
-					x.Recs[1].KeepAll(),
-				});
-		}
-
-		[Fact]
-		public async Task when_having_stream_with_max_age_specified() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$bla", metadata: new StreamMetadata(null, TimeSpan.FromMinutes(5), null, null, null)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(110)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(100)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(90)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(60)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(40)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(30)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(20)),
-
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(3)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(2)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(1)))
-					.CompleteLastChunk()
-					.Chunk(ScavengePointRec(t++, timeStamp: DateTime.UtcNow)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(0, 8, 9, 10),
-						x.Recs[1].KeepAll(),
-					},
-					Scenario.CollideEverything
-						? default(Func<DbResult, LogRecord[][]>)
-						: x => new[] {
-							x.Recs[0].KeepIndexes(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10),
-							x.Recs[1],
-						});
-		}
-
-		[Fact]
-		public async Task when_having_stream_with_max_count_specified() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$bla", metadata: new StreamMetadata(maxCount: 3)),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"))
-					.CompleteLastChunk()
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(0, 8, 9, 10),
-					x.Recs[1].KeepAll(),
-				});
-		}
-
-		[Fact]
-		public async Task when_having_stream_with_truncatebefore_specified() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$bla", metadata: new StreamMetadata(truncateBefore: 7)),
-						Rec.Write(t++, "bla"), // event 0
-						Rec.Write(t++, "bla"), // event 1
-						Rec.Write(t++, "bla"), // event 2
-						Rec.Write(t++, "bla"), // event 3
-						Rec.Write(t++, "bla"), // event 4
-						Rec.Write(t++, "bla"), // event 5
-						Rec.Write(t++, "bla"), // event 6
-						Rec.Write(t++, "bla"), // event 7
-						Rec.Write(t++, "bla"), // event 8
-						Rec.Write(t++, "bla")) // event 9
-					.CompleteLastChunk()
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(0, 8, 9, 10),
-					x.Recs[1].KeepAll(),
-				});
-		}
-
-		[Fact]
-		public async Task when_having_stream_with_strict_max_age_leaving_no_events_in_stream() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$bla", metadata: new StreamMetadata(null, TimeSpan.FromMinutes(1), null, null, null)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(25)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(20)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(10)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(5)),
-						Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(3)))
-					.CompleteLastChunk()
-					.Chunk(ScavengePointRec(t++, timeStamp: DateTime.UtcNow)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(0, 5),
-						x.Recs[1].KeepAll(),
-					},
-					Scenario.CollideEverything
-						? default(Func<DbResult, LogRecord[][]>)
-						: x => new[] {
-							x.Recs[0].KeepIndexes(0, 1, 2, 3, 4, 5),
-							x.Recs[1],
-						});
-		}
-
-		[Fact]
-		public async Task when_metastream_is_scavenged_and_read_index_is_set_to_keep_just_last_metaevent() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$bla", metadata: new StreamMetadata(10, null, null, null, null)),
-						Rec.Write(t++, "$$bla", metadata: new StreamMetadata(5, null, null, null, null)),
-						Rec.Write(t++, "$$bla", metadata: new StreamMetadata(3, null, null, null, null)),
-						Rec.Write(t++, "$$bla", metadata: new StreamMetadata(2, null, null, null, null)))
-					.CompleteLastChunk()
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(3),
-					x.Recs[1].KeepAll(),
-				});
-		}
-
-		[Fact]
-		public async Task when_stream_is_deleted() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "bla"),
-						Rec.Write(t++, "bla"))
-					.Chunk(
-						Rec.CommittedDelete(t++, "bla"))
-					.CompleteLastChunk()
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepNone(),
-					x.Recs[1].KeepAll(),
-					x.Recs[2].KeepAll(),
-				});
-		}
-
-		[Fact]
-		public async Task when_stream_is_deleted_with_ignore_hard_deletes() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithUnsafeIgnoreHardDeletes(true)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "bla"), 
-						Rec.Write(t++, "bla"))
-					.Chunk(
-						Rec.CommittedDelete(t++, "bla"))
-					.CompleteLastChunk()
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepNone(),
-					x.Recs[1].KeepNone(),
-					x.Recs[2].KeepAll(),
-				});
-		}
-
-		// old scavenge removes transaction 0 entirely because it is contained within one chunk
-		// old scavenge keeps the begin and commit for transaction 1 because it spans chunks
-		// new scavenge has less transaction handling and treats both transactions the same.
-		[Fact]
-		public async Task when_stream_is_deleted_and_bulk_transaction_spans_chunks_boundary() {
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Prepare(0, "bla"), // keep (old would discard)
-						Rec.Commit(0, "bla"), // keep (old would discard)
-						Rec.Prepare(1, "bla"), // keep
-						Rec.Prepare(1, "bla"),
-						Rec.Prepare(1, "bla"),
-						Rec.Prepare(1, "bla"))
-					.Chunk(
-						Rec.Prepare(1, "bla"),
-						Rec.Prepare(1, "bla"),
-						Rec.Prepare(1, "bla"),
-						Rec.Commit(1, "bla"), // keep
-						Rec.Delete(2, "bla"), // keep
-						Rec.Commit(2, "bla")) // keep
-					.CompleteLastChunk()
-					.Chunk(ScavengePointRec(3)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(0, 1, 2),
-						x.Recs[1].KeepIndexes(3, 4, 5),
-						x.Recs[2].KeepAll(),
-					},
-					x => new[] {
-						x.Recs[0].KeepIndexes(),
-						x.Recs[1].KeepIndexes(4),
-						x.Recs[2].KeepAll(),
-					});
-		}
-
-		[Fact]
-		public async Task when_stream_is_deleted_and_explicit_transaction_spans_chunks_boundary() {
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Prepare(0, "bla"), // keep (old would discard)
-						Rec.Commit(0, "bla"), // keep (old would discard)
-						Rec.TransSt(1, "bla"), // keep
-						Rec.Prepare(1, "bla"),
-						Rec.Prepare(1, "bla"),
-						Rec.Prepare(1, "bla"),
-						Rec.Prepare(1, "bla"))
-					.Chunk(
-						Rec.Prepare(1, "bla"),
-						Rec.Prepare(1, "bla"),
-						Rec.Prepare(1, "bla"),
-						Rec.Prepare(1, "bla"),
-						Rec.Prepare(1, "bla"),
-						Rec.TransEnd(1, "bla"),
-						Rec.Commit(1, "bla")) // keep
-					.Chunk(
-						Rec.Delete(2, "bla"), // keep
-						Rec.Commit(2, "bla")) // keep
-					.CompleteLastChunk()
-					.Chunk(ScavengePointRec(3)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(0, 1, 2),
-						x.Recs[1].KeepIndexes(6),
-						x.Recs[2].KeepIndexes(0, 1),
-						x.Recs[3].KeepAll(),
-					},
-					x => new[] {
-						x.Recs[0].KeepIndexes(),
-						x.Recs[1].KeepIndexes(),
-						x.Recs[2].KeepIndexes(0),
-						x.Recs[3].KeepAll(),
-					});
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/ScavengeCheckpointTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/ScavengeCheckpointTests.cs
deleted file mode 100644
index 14e88eccb75..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/ScavengeCheckpointTests.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using EventStore.Core.TransactionLog.Scavenging;
-using Xunit;
-using static EventStore.Core.XUnit.Tests.Scavenge.StreamMetadatas;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class ScavengeCheckpointTests {
-		private T RoundTrip<T>(T input, string expectedJson) where T : ScavengeCheckpoint {
-			var json = ScavengeCheckpointJsonPersistence<string>.Serialize(input);
-			Assert.True(ScavengeCheckpointJsonPersistence<string>.TryDeserialize(
-				json,
-				out var deserialized));
-			Assert.Equal(expectedJson, json);
-			Assert.Equal(input.ScavengePoint.Position, deserialized.ScavengePoint.Position);
-			Assert.Equal(input.ScavengePoint.EffectiveNow, deserialized.ScavengePoint.EffectiveNow);
-			return Assert.IsType<T>(deserialized);
-		}
-
-		private readonly ScavengePoint _scavengePoint = new ScavengePoint(
-			position: 1234,
-			eventNumber: 5,
-			effectiveNow: EffectiveNow,
-			threshold: 567);
-
-		[Theory]
-		[InlineData(null, @"{""scavengePoint"":{""position"":1234,""eventNumber"":5,""effectiveNow"":""2022-01-05T00:00:00"",""threshold"":567},""schemaVersion"":""V0"",""checkpointStage"":""Accumulating""}")]
-		[InlineData(5, @"{""scavengePoint"":{""position"":1234,""eventNumber"":5,""effectiveNow"":""2022-01-05T00:00:00"",""threshold"":567},""schemaVersion"":""V0"",""checkpointStage"":""Accumulating"",""doneLogicalChunkNumber"":5}")]
-		public void can_round_trip_accumulating(int? x, string expectedJson) {
-			var cp = RoundTrip(new ScavengeCheckpoint.Accumulating(_scavengePoint, x), expectedJson);
-			Assert.Equal(x, cp.DoneLogicalChunkNumber);
-		}
-
-		[Fact]
-		public void can_round_trip_calculating_default() {
-			var cp = RoundTrip(
-				new ScavengeCheckpoint.Calculating<string>(_scavengePoint, default),
-				@"{""scavengePoint"":{""position"":1234,""eventNumber"":5,""effectiveNow"":""2022-01-05T00:00:00"",""threshold"":567},""schemaVersion"":""V0"",""checkpointStage"":""Calculating""}");
-			Assert.Equal(default, cp.DoneStreamHandle);
-		}
-
-		[Fact]
-		public void can_round_trip_calculating_streamid() {
-			var cp = RoundTrip(
-				new ScavengeCheckpoint.Calculating<string>(_scavengePoint, StreamHandle.ForStreamId("stream1")),
-				@"{""scavengePoint"":{""position"":1234,""eventNumber"":5,""effectiveNow"":""2022-01-05T00:00:00"",""threshold"":567},""schemaVersion"":""V0"",""checkpointStage"":""Calculating""," + 
-				@"""doneStreamHandle"":{""kind"":""Id"",""streamId"":""stream1""}}");
-			Assert.Equal("Id: stream1", cp.DoneStreamHandle.ToString());
-		}
-
-		[Fact]
-		public void can_round_trip_calculating_hash() {
-			var cp = RoundTrip(
-				new ScavengeCheckpoint.Calculating<string>(_scavengePoint, StreamHandle.ForHash<string>(97)),
-				@"{""scavengePoint"":{""position"":1234,""eventNumber"":5,""effectiveNow"":""2022-01-05T00:00:00"",""threshold"":567},""schemaVersion"":""V0"",""checkpointStage"":""Calculating""," +
-				@"""doneStreamHandle"":{""kind"":""Hash"",""streamHash"":97}}");
-			Assert.Equal("Hash: 97", cp.DoneStreamHandle.ToString());
-		}
-
-		[Theory]
-		[InlineData(null, @"{""scavengePoint"":{""position"":1234,""eventNumber"":5,""effectiveNow"":""2022-01-05T00:00:00"",""threshold"":567},""schemaVersion"":""V0"",""checkpointStage"":""ExecutingChunks""}")]
-		[InlineData(5, @"{""scavengePoint"":{""position"":1234,""eventNumber"":5,""effectiveNow"":""2022-01-05T00:00:00"",""threshold"":567},""schemaVersion"":""V0"",""checkpointStage"":""ExecutingChunks"",""doneLogicalChunkNumber"":5}")]
-		public void can_round_trip_executing_chunks(int? x, string expectedJson) {
-			var cp = RoundTrip(new ScavengeCheckpoint.ExecutingChunks(_scavengePoint, x), expectedJson);
-			Assert.Equal(x, cp.DoneLogicalChunkNumber);
-		}
-
-		[Fact]
-		public void can_round_trip_merging_chunks() {
-			var cp = RoundTrip(
-				new ScavengeCheckpoint.MergingChunks(_scavengePoint),
-				@"{""scavengePoint"":{""position"":1234,""eventNumber"":5,""effectiveNow"":""2022-01-05T00:00:00"",""threshold"":567},""schemaVersion"":""V0"",""checkpointStage"":""MergingChunks""}");
-		}
-
-		[Fact]
-		public void can_round_trip_executing_index() {
-			var cp = RoundTrip(
-				new ScavengeCheckpoint.ExecutingIndex(_scavengePoint),
-				@"{""scavengePoint"":{""position"":1234,""eventNumber"":5,""effectiveNow"":""2022-01-05T00:00:00"",""threshold"":567},""schemaVersion"":""V0"",""checkpointStage"":""ExecutingIndex""}");
-		}
-
-		[Fact]
-		public void can_round_trip_cleaning() {
-			var cp = RoundTrip(
-				new ScavengeCheckpoint.Cleaning(_scavengePoint),
-				@"{""scavengePoint"":{""position"":1234,""eventNumber"":5,""effectiveNow"":""2022-01-05T00:00:00"",""threshold"":567},""schemaVersion"":""V0"",""checkpointStage"":""Cleaning""}");
-		}
-
-		[Fact]
-		public void can_round_trip_done() {
-			var cp = RoundTrip(
-				new ScavengeCheckpoint.Done(_scavengePoint),
-				@"{""scavengePoint"":{""position"":1234,""eventNumber"":5,""effectiveNow"":""2022-01-05T00:00:00"",""threshold"":567},""schemaVersion"":""V0"",""checkpointStage"":""Done""}");
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/ScavengeStateTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/ScavengeStateTests.cs
deleted file mode 100644
index 8f07f13d56f..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/ScavengeStateTests.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.LogV2;
-using EventStore.Core.Tests.Index.Hashers;
-using EventStore.Core.TransactionLog.Scavenging;
-using EventStore.Core.XUnit.Tests.Scavenge.Sqlite;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	// generally the properties we need of the ScavengeState are tested at a higher
-	// level. but a couple of fiddly bits are checked in here
-	public class ScavengeStateTests : SqliteDbPerTest<ScavengeStateTests> {
-		[Fact]
-		public void pending_changes_are_still_read() {
-			var hasher = new HumanReadableHasher();
-			var metastreamLookup = new LogV2SystemStreams();
-			var sut = new ScavengeStateBuilder<string>(hasher, metastreamLookup)
-				.WithConnectionPool(Fixture.DbConnectionPool)
-				.Build();
-
-			var trans = sut.BeginTransaction();
-
-			sut.IncreaseChunkWeight(5, 20);
-			sut.IncreaseChunkWeight(6, 40);
-			sut.SetMetastreamDiscardPoint("$$ab-1", DiscardPoint.DiscardBefore(20));
-
-			Assert.Equal(60, sut.SumChunkWeights(5, 6));
-			Assert.True(sut.TryGetMetastreamData("$$ab-1", out var actual));
-			Assert.Equal(DiscardPoint.DiscardBefore(20), actual.DiscardPoint);
-			trans.Commit(new ScavengeCheckpoint.Accumulating(
-				new ScavengePoint(default, default, default, default),
-				20));
-			sut.Dispose();
-		}
-
-		[Fact]
-		public void transaction_rollback_undoes_pending_changes() {
-			var hasher = new HumanReadableHasher();
-			var metastreamLookup = new LogV2SystemStreams();
-			var sut = new ScavengeStateBuilder<string>(hasher, metastreamLookup)
-				.WithConnectionPool(Fixture.DbConnectionPool)
-				.Build();
-
-			sut.IncreaseChunkWeight(5, 20);
-			sut.DetectCollisions("$$ab-1");
-			sut.SetMetastreamDiscardPoint("$$ab-1", DiscardPoint.DiscardBefore(20));
-
-			var trans = sut.BeginTransaction();
-
-			sut.IncreaseChunkWeight(6, 40);
-			sut.SetMetastreamDiscardPoint("$$ab-1", DiscardPoint.DiscardBefore(50));
-			sut.DetectCollisions("$$ab-2");
-			sut.SetMetastreamDiscardPoint("$$ab-2", DiscardPoint.DiscardBefore(50));
-			sut.DetectCollisions("$$cd-3");
-			sut.SetMetastreamDiscardPoint("$$cd-3", DiscardPoint.DiscardBefore(50));
-
-			trans.Rollback();
-
-			Assert.Equal(20, sut.SumChunkWeights(5, 6));
-			Assert.True(sut.TryGetMetastreamData("$$ab-1", out var actual));
-			Assert.Equal(DiscardPoint.DiscardBefore(20), actual.DiscardPoint);
-			sut.DetectCollisions("$$ab-2");
-			Assert.False(sut.TryGetMetastreamData("$$ab-2", out _));
-			sut.DetectCollisions("$$cd-3");
-			Assert.False(sut.TryGetMetastreamData("$$cd-3", out _));
-			sut.Dispose();
-		}
-
-		[Fact]
-		public void active_iteration_no_checkpoint() {
-			var hasher = new CompositeHasher<string>(
-				new XXHashUnsafe(),
-				new Murmur3AUnsafe());
-
-			var metastreamLookup = new LogV2SystemStreams();
-			var sut = new ScavengeStateBuilder<string>(hasher, metastreamLookup)
-				.WithConnectionPool(Fixture.DbConnectionPool)
-				.Build();
-
-			var numStreams = 100;
-
-			// 'accumulate'
-			for (var i = 0; i < numStreams; i++) {
-				var streamId = $"s-{i}";
-				var metastreamId = $"$$s-{i}";
-				sut.DetectCollisions(streamId);
-				sut.DetectCollisions(metastreamId);
-				sut.SetOriginalStreamMetadata(streamId, metadata: new StreamMetadata(maxCount: i + 1));
-			}
-
-			Assert.Empty(sut.AllCollisions());
-
-			// 'calculate'
-			var processed = 0;
-			long? lastHash = null;
-
-			var xs = sut.OriginalStreamsToCalculate(default);
-			foreach (var (handle, data) in xs) {
-				processed++;
-				Assert.Equal(StreamHandle.Kind.Hash, handle.Kind);
-				if (lastHash >= (long)handle.StreamHash) {
-					throw new Exception("repeated");
-				}
-				lastHash = (long)handle.StreamHash;
-
-				sut.SetOriginalStreamDiscardPoints(
-					handle,
-					CalculationStatus.Spent,
-					DiscardPoint.KeepAll,
-					DiscardPoint.KeepAll);
-			}
-
-			// processedd each stream exactly once
-			Assert.Equal(numStreams, processed);
-			sut.Dispose();
-		}
-
-		[Fact]
-		public void active_iteration_with_checkpoint() {
-			var hasher = new CompositeHasher<string>(
-				new XXHashUnsafe(),
-				new Murmur3AUnsafe());
-
-			var metastreamLookup = new LogV2SystemStreams();
-			var sut = new ScavengeStateBuilder<string>(hasher, metastreamLookup)
-				.WithConnectionPool(Fixture.DbConnectionPool)
-				.Build();
-
-			var numStreams = 100;
-			var stopAfter = 50;
-
-			// 'accumulate'
-			for (var i = 0; i < numStreams; i++) {
-				var streamId = $"s-{i}";
-				var metastreamId = $"$$s-{i}";
-				sut.DetectCollisions(streamId);
-				sut.DetectCollisions(metastreamId);
-				sut.SetOriginalStreamMetadata(streamId, metadata: new StreamMetadata(maxCount: i + 1));
-			}
-
-			Assert.Empty(sut.AllCollisions());
-
-			// 'calculate'
-			var processed = 0;
-			var checkpoint = new StreamHandle<string>();
-			long? lastHash = null;
-
-			void Calculate(IEnumerable<(StreamHandle<string>, OriginalStreamData)> xs) {
-				foreach (var (handle, data) in xs) {
-					processed++;
-					Assert.Equal(StreamHandle.Kind.Hash, handle.Kind);
-					if (lastHash >= (long)handle.StreamHash) {
-						throw new Exception("repeated");
-					}
-					lastHash = (long)handle.StreamHash;
-
-					sut.SetOriginalStreamDiscardPoints(
-						handle,
-						CalculationStatus.Spent,
-						DiscardPoint.KeepAll,
-						DiscardPoint.KeepAll);
-
-					checkpoint = handle;
-
-					if (processed == stopAfter)
-						break;
-				}
-			}
-
-			Calculate(sut.OriginalStreamsToCalculate(checkpoint));
-			Assert.Equal(50, processed);
-			Calculate(sut.OriginalStreamsToCalculate(checkpoint));
-
-			// processedd each stream exactly once
-			Assert.Equal(numStreams, processed);
-			sut.Dispose();
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/ScavengeStatusTrackerTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/ScavengeStatusTrackerTests.cs
deleted file mode 100644
index cf64a7cfd3d..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/ScavengeStatusTrackerTests.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using System.Diagnostics.Metrics;
-using System.Linq;
-using EventStore.Core.Metrics;
-using EventStore.Core.TransactionLog.Scavenging;
-using EventStore.Core.XUnit.Tests.Metrics;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class ScavengeStatusTrackerTests : IDisposable {
-		private readonly TestMeterListener<long> _listener;
-		private readonly FakeClock _clock = new();
-		private readonly StatusMetric _metric;
-		private readonly ScavengeStatusTracker _sut;
-
-		public ScavengeStatusTrackerTests() {
-			var meter = new Meter($"{typeof(ScavengeStatusTrackerTests)}");
-			_listener = new TestMeterListener<long>(meter);
-			_metric = new StatusMetric(
-				meter,
-				"eventstore-statuses",
-				_clock);
-			_sut = new ScavengeStatusTracker(_metric);
-		}
-
-		public void Dispose() {
-			_listener?.Dispose();
-		}
-
-		[Fact]
-		public void can_observe_activity() {
-			_clock.SecondsSinceEpoch = 500;
-			AssertMeasurements("Idle", 500);
-
-			using (_sut.StartActivity("Accumulation")) {
-				_clock.SecondsSinceEpoch = 501;
-				AssertMeasurements("Accumulation Phase", 501);
-			}
-
-			_clock.SecondsSinceEpoch = 502;
-			AssertMeasurements("Idle", 502);
-		}
-
-		void AssertMeasurements(string expectedStatus, int expectedValue) {
-			_listener.Observe();
-
-			Assert.Collection(
-				_listener.RetrieveMeasurements("eventstore-statuses"),
-				m => {
-					Assert.Equal(expectedValue, m.Value);
-					Assert.Collection(
-						m.Tags.ToArray(),
-						t => {
-							Assert.Equal("name", t.Key);
-							Assert.Equal("Scavenge", t.Value);
-						},
-						t => {
-							Assert.Equal("status", t.Key);
-							Assert.Equal(expectedStatus, t.Value);
-						});
-				});
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/ScavengeTransactionTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/ScavengeTransactionTests.cs
deleted file mode 100644
index e248262e63d..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/ScavengeTransactionTests.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.Scavenging;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class ScavengeTransactionTests {
-		class MockTransactionFactory : ITransactionFactory<int> {
-			public int BeginCount { get; private set; }
-			public int CommitCount { get; private set; }
-			public int RollbackCount { get; private set; }
-
-			public int Begin() {
-				return BeginCount++;
-			}
-
-			public void Commit(int transaction) {
-				CommitCount++;
-			}
-
-			public void Rollback(int transaction) {
-				RollbackCount++;
-			}
-		}
-
-		[Fact]
-		public void can_commit_then_begin() {
-			var storage = new InMemoryScavengeMap<Unit, ScavengeCheckpoint>();
-			var backend = new MockTransactionFactory();
-			var sut = new TransactionManager<int>(backend, storage);
-
-			var expectedCheckpoint = new ScavengeCheckpoint.Accumulating(
-				new ScavengePoint(default, default, default, default),
-				5);
-
-			Assert.Equal(0, backend.BeginCount);
-			Assert.Equal(0, backend.CommitCount);
-			Assert.Equal(0, backend.RollbackCount);
-
-			sut.Begin();
-
-			Assert.Equal(1, backend.BeginCount);
-			Assert.Equal(0, backend.CommitCount);
-			Assert.Equal(0, backend.RollbackCount);
-
-			sut.Commit(expectedCheckpoint);
-			Assert.True(storage.TryGetValue(Unit.Instance, out var actualCheckpoint));
-			Assert.Equal(expectedCheckpoint, actualCheckpoint);
-
-			Assert.Equal(1, backend.BeginCount);
-			Assert.Equal(1, backend.CommitCount);
-			Assert.Equal(0, backend.RollbackCount);
-
-			sut.Begin();
-
-			Assert.Equal(2, backend.BeginCount);
-			Assert.Equal(1, backend.CommitCount);
-			Assert.Equal(0, backend.RollbackCount);
-		}
-
-		[Fact]
-		public void can_rollback_then_begin() {
-			var backend = new MockTransactionFactory();
-			var sut = new TransactionManager<int>(
-				backend,
-				new InMemoryScavengeMap<Unit, ScavengeCheckpoint>());
-
-			Assert.Equal(0, backend.BeginCount);
-			Assert.Equal(0, backend.CommitCount);
-			Assert.Equal(0, backend.RollbackCount);
-
-			sut.Begin();
-
-			Assert.Equal(1, backend.BeginCount);
-			Assert.Equal(0, backend.CommitCount);
-			Assert.Equal(0, backend.RollbackCount);
-
-			sut.Rollback();
-
-			Assert.Equal(1, backend.BeginCount);
-			Assert.Equal(0, backend.CommitCount);
-			Assert.Equal(1, backend.RollbackCount);
-
-			sut.Begin();
-
-			Assert.Equal(2, backend.BeginCount);
-			Assert.Equal(0, backend.CommitCount);
-			Assert.Equal(1, backend.RollbackCount);
-		}
-
-		[Fact]
-		public void cannot_begin_twice() {
-			var sut = new TransactionManager<int>(
-				new MockTransactionFactory(),
-				new InMemoryScavengeMap<Unit, ScavengeCheckpoint>());
-
-			sut.Begin();
-
-			Assert.Throws<InvalidOperationException>(() => {
-				sut.Begin();
-			});
-		}
-
-		[Fact]
-		public void cannot_commit_twice() {
-			var sut = new TransactionManager<int>(
-				new MockTransactionFactory(),
-				new InMemoryScavengeMap<Unit, ScavengeCheckpoint>());
-
-			sut.Begin();
-			sut.Commit(null);
-
-			Assert.Throws<InvalidOperationException>(() => {
-				sut.Commit(null);
-			});
-		}
-
-		[Fact]
-		public void cannot_commit_then_rollback() {
-			var sut = new TransactionManager<int>(
-				new MockTransactionFactory(),
-				new InMemoryScavengeMap<Unit, ScavengeCheckpoint>());
-
-			sut.Begin();
-			sut.Commit(null);
-
-			Assert.Throws<InvalidOperationException>(() => {
-				sut.Rollback();
-			});
-		}
-
-		[Fact]
-		public void cannot_rollback_twice() {
-			var sut = new TransactionManager<int>(
-				new MockTransactionFactory(),
-				new InMemoryScavengeMap<Unit, ScavengeCheckpoint>());
-
-			sut.Begin();
-			sut.Rollback();
-
-			Assert.Throws<InvalidOperationException>(() => {
-				sut.Rollback();
-			});
-		}
-
-		[Fact]
-		public void cannot_rollback_then_commit() {
-			var sut = new TransactionManager<int>(
-				new MockTransactionFactory(),
-				new InMemoryScavengeMap<Unit, ScavengeCheckpoint>());
-
-			sut.Begin();
-			sut.Rollback();
-
-			Assert.Throws<InvalidOperationException>(() => {
-				sut.Commit(null);
-			});
-		}
-
-		[Fact]
-		public void cannot_commit_without_beginning() {
-			var sut = new TransactionManager<int>(
-				new MockTransactionFactory(),
-				new InMemoryScavengeMap<Unit, ScavengeCheckpoint>());
-
-			Assert.Throws<InvalidOperationException>(() => {
-				sut.Commit(null);
-			});
-		}
-
-		[Fact]
-		public void cannot_rollback_without_beginning() {
-			var sut = new TransactionManager<int>(
-				new MockTransactionFactory(),
-				new InMemoryScavengeMap<Unit, ScavengeCheckpoint>());
-
-			Assert.Throws<InvalidOperationException>(() => {
-				sut.Rollback();
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/SoftDeleteTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/SoftDeleteTests.cs
deleted file mode 100644
index 4f4e302f157..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/SoftDeleteTests.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.Scavenging;
-using EventStore.Core.XUnit.Tests.Scavenge.Sqlite;
-using Xunit;
-using static EventStore.Core.XUnit.Tests.Scavenge.StreamMetadatas;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class SoftDeleteTests : SqliteDbPerTest<SoftDeleteTests> {
-		[Fact]
-		public async Task undelete_when_soft_delete_across_chunk_boundary() {
-			// accumulation has to go up to the scavenge point and not stop at the end of the chunk
-			// before, otherwise we could accidentally scavenge the new stream.
-			// the important point is that the scavenge point can't 'appear' to be between the
-			// new records and the new metadata. this could cause problems any time
-			// the scavenge point operates as if it were in the middle of events supposed to be written
-			// transactionally.
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						// stream before deletion
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						// delete
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: SoftDelete),
-						// new write that undeletes the stream, but the metadata lands
-						// in the next chunk
-						Rec.Write(t++, "ab-1"))
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: TruncateBefore3),
-						ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(4),
-						x.Recs[1].KeepIndexes(0, 1),
-					});
-		}
-
-		[Fact]
-		public async Task simple_soft_delete() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: SoftDelete))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertState(state => {
-					Assert.False(state.TryGetOriginalStreamData("ab-1", out _));
-					Assert.False(state.TryGetMetastreamData("$$ab-1", out _));
-				})
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(2, 3), // keep the last event
-						x.Recs[1],
-					});
-		}
-
-		[Fact]
-		public async Task soft_delete_and_recreate() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: SoftDelete),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: TruncateBefore3))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(4, 5),
-						x.Recs[1],
-					});
-		}
-
-		[Fact]
-		public async Task can_recreate_soft_deleted_stream_after_scavenge() {
-			var t = 0;
-
-			// SP-0 scavenge
-			var scenario = new Scenario<LogFormat.V2, string>();
-			var db = await scenario
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						// stream before deletion
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						// delete
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: SoftDelete))
-					.Chunk(ScavengePointRec(t++)) // SP-0
-					.Chunk(
-						// recreate
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: TruncateBefore3))
-					.Chunk(ScavengePointRec(t++))) // SP-1
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.MutateState(x => {
-					// make it scavenge SP-0
-					x.SetCheckpoint(new ScavengeCheckpoint.Accumulating(
-						ScavengePoint(
-							chunk: 1,
-							eventNumber: 0),
-						doneLogicalChunkNumber: null));
-				})
-				.AssertTrace(
-					Tracer.Line("Accumulating from checkpoint: Accumulating SP-0 done None"),
-					Tracer.AnythingElse)
-				.AssertState(state => {
-					Assert.False(state.TryGetOriginalStreamData("ab-1", out _));
-					Assert.False(state.TryGetMetastreamData("$$ab-1", out _));
-				})
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(2, 3),
-						x.Recs[1],
-						x.Recs[2],
-						x.Recs[3],
-					});
-
-			// SP-1 scavenge
-			await new Scenario<LogFormat.V2, string>()
-				.WithTracerFrom(scenario)
-				.WithDbPath(Fixture.Directory)
-				.WithDb(db)
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertTrace(
-					Tracer.Line("Accumulating from SP-0 to SP-1"),
-					Tracer.AnythingElse)
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(),
-					x.Recs[1],
-					x.Recs[2].KeepIndexes(0, 1),
-					x.Recs[3],
-				});
-		}
-
-		[Fact]
-		public async Task can_soft_delete_recreate_and_hard_delete() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						// soft delete
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: SoftDelete),
-						// recreate
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: TruncateBefore3),
-						// hard delete
-						Rec.CommittedDelete(t++, "ab-1"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(6),
-						x.Recs[1],
-					});
-		}
-
-		[Fact]
-		public async Task can_soft_delete_and_hard_delete() {
-			// this might not actually be supported by the database
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						// soft delete
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: SoftDelete),
-						// hard delete
-						Rec.CommittedDelete(t++, "ab-1"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(4),
-						x.Recs[1],
-					});
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteChunkTimeStampRangeScavengeMapTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteChunkTimeStampRangeScavengeMapTests.cs
deleted file mode 100644
index 91fc35cfb13..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteChunkTimeStampRangeScavengeMapTests.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.Scavenging;
-using EventStore.Core.TransactionLog.Scavenging.Sqlite;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge.Sqlite {
-	public class SqliteChunkTimeStampRangeScavengeMapTests : SqliteDbPerTest<SqliteChunkTimeStampRangeScavengeMapTests> {
-		
-		[Fact]
-		public void can_set_chunk_time_stamp_range() {
-			var sut = new SqliteChunkTimeStampRangeScavengeMap();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var data = new ChunkTimeStampRange(min: DateTime.UtcNow, DateTime.UtcNow.AddDays(1));
-
-			sut[33] = data;
-
-			Assert.True(sut.TryGetValue(33, out var v));
-			Assert.Equal(data, v);
-		}
-		
-		[Fact]
-		public void can_overwrite_existing() {
-			var sut = new SqliteChunkTimeStampRangeScavengeMap();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			sut[33] = new ChunkTimeStampRange(min: DateTime.Now, DateTime.Now.AddDays(1));
-			
-			var data = new ChunkTimeStampRange(min: DateTime.Now.AddDays(1), DateTime.Now.AddDays(2));
-
-			sut[33] = data;
-			
-			Assert.True(sut.TryGetValue(33, out var v));
-			Assert.Equal(data, v);
-		}
-
-		[Fact]
-		public void can_get_all_records() {
-			var sut = new SqliteChunkTimeStampRangeScavengeMap();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var osd = GetChunkTimeStampRangeTestData();
-			
-			sut[0] = osd[0];
-			sut[1] = osd[1];
-			sut[2] = osd[2];
-			sut[3] = osd[3];
-			sut[4] = osd[4];
-
-			Assert.Collection(sut.AllRecords(),
-				item => {
-					Assert.Equal(0, item.Key);
-					Assert.Equal(osd[0], item.Value);
-				},
-				item => {
-					Assert.Equal(1, item.Key);
-					Assert.Equal(osd[1], item.Value);
-				},
-				item => {
-					Assert.Equal(2, item.Key);
-					Assert.Equal(osd[2], item.Value);
-				},
-				item => {
-					Assert.Equal(3, item.Key);
-					Assert.Equal(osd[3], item.Value);
-				},
-				item => {
-					Assert.Equal(4, item.Key);
-					Assert.Equal(osd[4], item.Value);
-				});
-		}
-
-		[Fact]
-		public void can_remove_value_from_map() {
-			var sut = new SqliteChunkTimeStampRangeScavengeMap();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var osd = GetChunkTimeStampRangeTestData();
-			
-			sut[33] = osd[0];
-			sut[1] = osd[1];
-
-			Assert.True(sut.TryGetValue(33, out _));
-			Assert.True(sut.TryRemove(33, out var removedValue));
-			Assert.Equal(osd[0], removedValue);
-			Assert.False(sut.TryGetValue(33, out _));
-			
-			Assert.True(sut.TryGetValue(1, out var v));
-			Assert.Equal(osd[1], v);
-		}
-		
-		[Fact]
-		public void can_try_remove_value_from_map() {
-			var sut = new SqliteChunkTimeStampRangeScavengeMap();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			Assert.False(sut.TryRemove(33, out _));
-		}
-
-		private ChunkTimeStampRange[] GetChunkTimeStampRangeTestData() {
-			return new[] {
-				new ChunkTimeStampRange(min: DateTime.MinValue, DateTime.UtcNow.AddDays(2)),
-				new ChunkTimeStampRange(min: DateTime.UtcNow.AddDays(2), DateTime.UtcNow.AddDays(3)),
-				new ChunkTimeStampRange(min: DateTime.UtcNow.AddDays(3), DateTime.UtcNow.AddDays(4)),
-				new ChunkTimeStampRange(min: DateTime.UtcNow.AddDays(4), DateTime.UtcNow.AddDays(5)),
-				new ChunkTimeStampRange(min: DateTime.UtcNow.AddDays(5), DateTime.MaxValue)
-			};
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteChunkWeightScavengeMapTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteChunkWeightScavengeMapTests.cs
deleted file mode 100644
index ee97c24ae2c..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteChunkWeightScavengeMapTests.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.TransactionLog.Scavenging.Sqlite;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge.Sqlite {
-	public class SqliteChunkWeightScavengeMapTests : SqliteDbPerTest<SqliteChunkWeightScavengeMapTests> {
-
-		[Fact]
-		public void can_increase_existing_chunk_weight() {
-			var sut = new SqliteChunkWeightScavengeMap();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-			
-			sut[3] = 0.5f;
-			
-			sut.IncreaseWeight(3, 0.1f);
-
-			Assert.True(sut.TryGetValue(3, out var v1));
-			Assert.Equal(0.6f, v1);
-		}
-		
-		[Fact]
-		public void can_decrease_existing_chunk_weight() {
-			var sut = new SqliteChunkWeightScavengeMap();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-			
-			sut[3] = 0.5f;
-			
-			sut.IncreaseWeight(3, -0.1f);
-
-			Assert.True(sut.TryGetValue(3, out var v));
-			Assert.Equal(0.4f, v);
-		}
-		
-		[Fact]
-		public void can_increase_non_existing_chunk_weight() {
-			var sut = new SqliteChunkWeightScavengeMap();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-			
-			sut.IncreaseWeight(13, 0.33f);
-
-			Assert.True(sut.TryGetValue(13, out var v));
-			Assert.Equal(0.33f, v);
-		}
-
-		[Fact]
-		public void can_see_if_all_weights_zero_false() {
-			var sut = new SqliteChunkWeightScavengeMap();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-			sut[2] = 0.1f;
-			sut[4] = -0.1f;
-			Assert.False(sut.AllWeightsAreZero());
-		}
-
-		[Fact]
-		public void can_see_if_all_weights_zero_true() {
-			var sut = new SqliteChunkWeightScavengeMap();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-			sut[2] = 0.0f;
-			Assert.True(sut.AllWeightsAreZero());
-		}
-
-		[Fact]
-		public void can_see_if_all_weights_zero_true_empty() {
-			var sut = new SqliteChunkWeightScavengeMap();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-			Assert.True(sut.AllWeightsAreZero());
-		}
-
-		[Fact]
-		public void can_sum_chunk_weights() {
-			var sut = new SqliteChunkWeightScavengeMap();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-			
-			sut[0] = 0.1f;
-			sut[1] = 0.1f;
-			sut[2] = 0.1f;
-			sut[3] = 0.1f;
-			sut[4] = 0.1f;
-
-			var value = sut.SumChunkWeights(1, 3);
-			
-			Assert.Equal(0.3f, value);
-		}
-		
-		[Fact]
-		public void can_sum_non_existing_chunk_weights() {
-			var sut = new SqliteChunkWeightScavengeMap();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-			
-			var value = sut.SumChunkWeights(1, 3);
-			
-			Assert.Equal(0.0f, value);
-		}
-		
-		[Fact]
-		public void can_reset_chunk_weights() {
-			var sut = new SqliteChunkWeightScavengeMap();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-			
-			sut[0] = 0.1f;
-			sut[1] = 0.1f;
-			sut[2] = 0.1f;
-			sut[3] = 0.1f;
-			sut[4] = 0.1f;
-
-			sut.ResetChunkWeights(1, 3);
-			
-			Assert.Collection(sut.AllRecords(),
-				item => Assert.Equal(new KeyValuePair<int,float>(0, 0.1f), item),
-				item => Assert.Equal(new KeyValuePair<int,float>(4, 0.1f), item));
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteCollisionScavengeMapTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteCollisionScavengeMapTests.cs
deleted file mode 100644
index 93e9bc9365e..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteCollisionScavengeMapTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.TransactionLog.Scavenging;
-using EventStore.Core.TransactionLog.Scavenging.Sqlite;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge.Sqlite {
-	public class SqliteCollisionScavengeMapTests : SqliteDbPerTest<SqliteCollisionScavengeMapTests> {
-		
-		[Fact]
-		public void can_set_value() {
-			var sut = new SqliteCollisionScavengeMap<int>();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-			
-			sut[33] = Unit.Instance;
-
-			Assert.True(sut.TryGetValue(33, out var v));
-			Assert.Equal(Unit.Instance, v);
-		}
-		
-		[Fact]
-		public void can_overwrite_value() {
-			var sut = new SqliteCollisionScavengeMap<string>();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			sut["33"] = Unit.Instance;
-			sut["33"] = Unit.Instance;
-
-			Assert.True(sut.TryGetValue("33", out var v));
-			Assert.Equal(Unit.Instance, v);
-		}
-		
-		[Fact]
-		public void can_get_all_records() {
-			var sut = new SqliteCollisionScavengeMap<int>();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			sut[0] = Unit.Instance;
-			sut[1] = Unit.Instance;
-			sut[2] = Unit.Instance;
-			sut[3] = Unit.Instance;
-			sut[4] = Unit.Instance;
-			
-			Assert.Collection(sut.AllRecords(),
-				item => Assert.Equal(new KeyValuePair<int,Unit>(0, Unit.Instance), item),
-				item => Assert.Equal(new KeyValuePair<int,Unit>(1, Unit.Instance), item),
-				item => Assert.Equal(new KeyValuePair<int,Unit>(2, Unit.Instance), item),
-				item => Assert.Equal(new KeyValuePair<int,Unit>(3, Unit.Instance), item),
-				item => Assert.Equal(new KeyValuePair<int,Unit>(4, Unit.Instance), item));
-		}
-
-		[Fact]
-		public void can_try_get_value_of_non_existing() {
-			var sut = new SqliteCollisionScavengeMap<int>();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			Assert.False(sut.TryGetValue(33, out var v));
-			Assert.Equal(default, v);
-		}
-		
-		[Fact]
-		public void can_remove_value() {
-			var sut = new SqliteCollisionScavengeMap<int>();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			sut[0] = Unit.Instance;
-			
-			Assert.True(sut.TryRemove(0, out var v));
-			Assert.Equal(Unit.Instance, v);
-		}
-		
-		[Fact]
-		public void can_try_remove_value() {
-			var sut = new SqliteCollisionScavengeMap<string>();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			Assert.False(sut.TryRemove("0", out var v));
-			Assert.Equal(default, v);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteDbFixture.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteDbFixture.cs
deleted file mode 100644
index 87c8dff3c05..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteDbFixture.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System.IO;
-using System.Threading.Tasks;
-using EventStore.Core.DataStructures;
-using EventStore.Core.TransactionLog.Chunks;
-using Microsoft.Data.Sqlite;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge.Sqlite {
-	public class SqliteDbFixture<T> : IAsyncLifetime {
-		private readonly string _connectionString;
-
-		public SqliteConnection DbConnection { get; set; }
-		public ObjectPool<SqliteConnection> DbConnectionPool { get; set; }
-
-		public string Directory { get; }
-
-		public SqliteDbFixture(string dir) {
-			Directory = dir;
-			var fileName = typeof(T).Name + ".db";
-			var connectionStringBuilder = new SqliteConnectionStringBuilder();
-			connectionStringBuilder.Pooling = false; // prevents the db files from being locked
-			connectionStringBuilder.DataSource = Path.Combine(dir, fileName);
-			_connectionString = connectionStringBuilder.ConnectionString;
-		}
-		
-		public Task InitializeAsync() {
-			DbConnection = new SqliteConnection(_connectionString);
-			DbConnectionPool = new ObjectPool<SqliteConnection>(
-				objectPoolName: "sqlite connections",
-				initialCount: 0,
-				maxCount: TFChunkScavenger.MaxThreadCount + 1,
-				factory: () => {
-					var dbConnection = new SqliteConnection(_connectionString);
-					dbConnection.Open();
-					return dbConnection;
-				},
-				dispose: dbConnection => {
-					dbConnection.Close();
-					dbConnection.Dispose();
-				});
-			return DbConnection.OpenAsync();
-		}
-
-		public Task DisposeAsync() {
-			DbConnection.Close();
-			DbConnection.Dispose();
-			DbConnectionPool.Dispose();
-			return Task.CompletedTask;
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteDbPerTest.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteDbPerTest.cs
deleted file mode 100644
index 475add59eec..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteDbPerTest.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Threading.Tasks;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge.Sqlite {
-	public class SqliteDbPerTest<T> : IAsyncLifetime {
-		protected SqliteDbFixture<T> Fixture { get; }
-		private DirectoryFixture<T> DirFixture { get; }
-
-		public SqliteDbPerTest() {
-			DirFixture = new DirectoryFixture<T>();
-			Fixture = new SqliteDbFixture<T>(DirFixture.Directory);
-		}
-		
-		public async Task InitializeAsync() {
-			await DirFixture.InitializeAsync();
-			await Fixture.InitializeAsync();
-		}
-
-		public async Task DisposeAsync() {
-			await Fixture.DisposeAsync();
-			await DirFixture.DisposeAsync();
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteMetastreamScavengeMapTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteMetastreamScavengeMapTests.cs
deleted file mode 100644
index 2eff26d1e30..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteMetastreamScavengeMapTests.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-using EventStore.Core.TransactionLog.Scavenging;
-using EventStore.Core.TransactionLog.Scavenging.Sqlite;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge.Sqlite {
-	public class SqliteMetastreamScavengeMapTests : SqliteDbPerTest<SqliteMetastreamScavengeMapTests> {
-		
-		[Fact]
-		public void can_set_metastream_data() {
-			var sut = new SqliteMetastreamScavengeMap<ulong>("SetData");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var data = new MetastreamData(isTombstoned: true, DiscardPoint.DiscardIncluding(5));
-
-			sut[33] = data;
-
-			Assert.True(sut.TryGetValue(33, out var v));
-			Assert.Equal(data, v);
-		}
-		
-		[Fact]
-		public void can_overwrite_existing() {
-			var sut = new SqliteMetastreamScavengeMap<ulong>("Overwrite");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			sut[33] = new MetastreamData(isTombstoned: true, DiscardPoint.DiscardIncluding(5));
-			
-			var data = new MetastreamData(isTombstoned: false, DiscardPoint.DiscardIncluding(15));
-
-			sut[33] = data;
-			
-			Assert.True(sut.TryGetValue(33, out var v));
-			Assert.Equal(data, v);
-		}
-
-		[Fact]
-		public void can_set_tombstone_of_existing() {
-			var sut = new SqliteMetastreamScavengeMap<ulong>("TombstoneSetExisting");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var data = new MetastreamData(isTombstoned: false, DiscardPoint.DiscardIncluding(5));
-
-			sut[33] = data;
-			
-			sut.SetTombstone(33);
-			data = new MetastreamData(isTombstoned: true, data.DiscardPoint);
-			
-			Assert.True(sut.TryGetValue(33, out var v));
-			Assert.Equal(data, v);
-		}
-		
-		[Fact]
-		public void can_set_tombstone_of_non_existing() {
-			var sut = new SqliteMetastreamScavengeMap<ulong>("TombstoneSetNonExisting");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			sut.SetTombstone(33);
-			
-			Assert.True(sut.TryGetValue(33, out var v));
-			Assert.Equal(new MetastreamData(isTombstoned: true, DiscardPoint.KeepAll), v);
-		}
-		
-		[Fact]
-		public void can_set_discard_point_of_existing() {
-			var sut = new SqliteMetastreamScavengeMap<ulong>("DiscardPointExisting");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var data = new MetastreamData(isTombstoned: false, DiscardPoint.DiscardIncluding(5));
-			sut[33] = data;
-
-			var discardPoint = DiscardPoint.DiscardIncluding(55);
-			sut.SetDiscardPoint(33, discardPoint);
-			
-			Assert.True(sut.TryGetValue(33, out var v));
-			Assert.Equal(data.IsTombstoned, v.IsTombstoned);
-			Assert.Equal(discardPoint, v.DiscardPoint);
-		}
-		
-		[Fact]
-		public void can_set_discard_point_of_non_existing() {
-			var sut = new SqliteMetastreamScavengeMap<ulong>("DiscardPointNonExisting");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var discardPoint = DiscardPoint.DiscardIncluding(12);
-			sut.SetDiscardPoint(33, discardPoint);
-
-			Assert.True(sut.TryGetValue(33, out var v));
-			Assert.False(v.IsTombstoned);
-			Assert.Equal(discardPoint, v.DiscardPoint);
-		}
-		
-		[Fact]
-		public void can_get_all_records() {
-			var sut = new SqliteMetastreamScavengeMap<ulong>("EnumerateAll");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var osd = GetMetastreamTestData();
-			
-			sut[0] = osd[0];
-			sut[1] = osd[1];
-			sut[2] = osd[2];
-			sut[3] = osd[3];
-			sut[4] = osd[4];
-
-			Assert.Collection(sut.AllRecords(),
-				item => {
-					Assert.Equal(0ul, item.Key);
-					Assert.Equal(osd[0], item.Value);
-				},
-				item => {
-					Assert.Equal(1ul, item.Key);
-					Assert.Equal(osd[1], item.Value);
-				},
-				item => {
-					Assert.Equal(2ul, item.Key);
-					Assert.Equal(osd[2], item.Value);
-				},
-				item => {
-					Assert.Equal(3ul, item.Key);
-					Assert.Equal(osd[3], item.Value);
-				},
-				item => {
-					Assert.Equal(4ul, item.Key);
-					Assert.Equal(osd[4], item.Value);
-				});
-		}
-
-		[Fact]
-		public void can_remove_value_from_map() {
-			var sut = new SqliteMetastreamScavengeMap<ulong>("Remove");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var osd = GetMetastreamTestData();
-			
-			sut[33] = osd[0];
-			sut[1] = osd[1];
-
-			Assert.True(sut.TryGetValue(33, out _));
-			Assert.True(sut.TryRemove(33, out var removedValue));
-			Assert.Equal(osd[0], removedValue);
-			Assert.False(sut.TryGetValue(33, out _));
-			
-			Assert.True(sut.TryGetValue(1, out var v));
-			Assert.Equal(osd[1], v);
-		}
-		
-		[Fact]
-		public void can_try_remove_value_from_map() {
-			var sut = new SqliteMetastreamScavengeMap<ulong>("OriginalStreamScavengeMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			Assert.False(sut.TryRemove(33, out _));
-		}
-		
-		[Fact]
-		public void can_remove_all() {
-			var sut = new SqliteMetastreamScavengeMap<ulong>("EnumerateAll");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var osd = GetMetastreamTestData();
-			
-			sut[0] = osd[0];
-			sut[1] = osd[1];
-			sut[2] = osd[2];
-			sut[3] = osd[3];
-			sut[4] = osd[4];
-
-			sut.DeleteAll();
-
-			Assert.Empty(sut.AllRecords());
-		}
-
-		private MetastreamData[] GetMetastreamTestData() {
-			return new[] {
-				new MetastreamData(isTombstoned: false, DiscardPoint.DiscardIncluding(5)),
-				new MetastreamData(isTombstoned: false, DiscardPoint.DiscardIncluding(50)),
-				new MetastreamData(isTombstoned: true, DiscardPoint.DiscardIncluding(15)),
-				new MetastreamData(isTombstoned: false, DiscardPoint.DiscardIncluding(25)),
-				new MetastreamData(isTombstoned: true, DiscardPoint.DiscardIncluding(53))
-			};
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteOriginalStreamScavengeMapTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteOriginalStreamScavengeMapTests.cs
deleted file mode 100644
index 94ba07209e8..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteOriginalStreamScavengeMapTests.cs
+++ /dev/null
@@ -1,527 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.TransactionLog.Scavenging;
-using EventStore.Core.TransactionLog.Scavenging.Sqlite;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge.Sqlite {
-	public class SqliteOriginalStreamScavengeMapTests : SqliteDbPerTest<SqliteOriginalStreamScavengeMapTests> {
-
-		[Fact]
-		public void can_set_original_stream_data() {
-			var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var data = new OriginalStreamData {
-				DiscardPoint = DiscardPoint.DiscardIncluding(5),
-				IsTombstoned = true,
-				MaxAge = TimeSpan.FromDays(13),
-				MaxCount = 33,
-				MaybeDiscardPoint = DiscardPoint.DiscardBefore(long.MaxValue-1),
-				TruncateBefore = 43,
-				Status = CalculationStatus.Archived
-			};
-
-			sut[33] = data;
-
-			Assert.True(sut.TryGetValue(33, out var v));
-			Assert.Equal(data, v, OriginalStreamDataComparer.Default);
-		}
-		
-		[Fact]
-		public void can_overwrite_existing() {
-			var sut = new SqliteOriginalStreamScavengeMap<int>("OverwriteOriginalStreamScavengeMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			sut[33] = new OriginalStreamData {
-				DiscardPoint = DiscardPoint.DiscardIncluding(5),
-				IsTombstoned = true,
-				MaxAge = TimeSpan.FromDays(13),
-				MaxCount = 33,
-				MaybeDiscardPoint = DiscardPoint.DiscardBefore(long.MaxValue-1),
-				TruncateBefore = 43,
-				Status = CalculationStatus.Active
-			};
-			
-			var data = new OriginalStreamData {
-				DiscardPoint = DiscardPoint.DiscardIncluding(50),
-				IsTombstoned = true,
-				MaxAge = TimeSpan.FromDays(30),
-				MaxCount = 303,
-				MaybeDiscardPoint = DiscardPoint.DiscardBefore(long.MaxValue-100),
-				TruncateBefore = 430,
-				Status = CalculationStatus.Archived
-			};
-
-			sut[33] = data;
-			
-			Assert.True(sut.TryGetValue(33, out var v));
-			Assert.Equal(data, v, OriginalStreamDataComparer.Default);
-		}
-		
-		[Fact]
-		public void can_set_tombstone_of_existing() {
-			var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var data = new OriginalStreamData {
-				DiscardPoint = DiscardPoint.DiscardIncluding(5),
-				MaxAge = TimeSpan.FromDays(13),
-				MaxCount = 33,
-				MaybeDiscardPoint = DiscardPoint.DiscardBefore(12),
-				TruncateBefore = 43,
-				Status = CalculationStatus.Archived
-			};
-
-			sut[33] = data;
-			
-			sut.SetTombstone(33);
-			data.IsTombstoned = true;
-			data.Status = CalculationStatus.Active;
-			
-			Assert.True(sut.TryGetValue(33, out var v));
-			Assert.Equal(data, v, OriginalStreamDataComparer.Default);
-		}
-		
-		[Fact]
-		public void can_set_tombstone_of_non_existing() {
-			var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			sut.SetTombstone(33);
-			
-			Assert.True(sut.TryGetValue(33, out var v));
-			Assert.Equal(new OriginalStreamData {
-				IsTombstoned = true,
-				Status = CalculationStatus.Active
-			}, v, OriginalStreamDataComparer.Default);
-		}
-		
-		[Fact]
-		public void can_set_stream_metadata_of_existing() {
-			var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var data = new OriginalStreamData() {
-				DiscardPoint = DiscardPoint.DiscardIncluding(5),
-				MaybeDiscardPoint = DiscardPoint.DiscardBefore(12),
-				Status = CalculationStatus.Archived
-			};
-
-			sut[33] = data;
-
-			var metadata = new StreamMetadata(
-				maxAge: TimeSpan.FromDays(13),
-				maxCount: 33,
-				truncateBefore: 43);
-			
-			sut.SetMetadata(33, metadata);
-			data.MaxAge = metadata.MaxAge;
-			data.MaxCount = metadata.MaxCount;
-			data.TruncateBefore = metadata.TruncateBefore;
-			data.Status = CalculationStatus.Active;
-			
-			Assert.True(sut.TryGetValue(33, out var v));
-			Assert.Equal(data, v, OriginalStreamDataComparer.Default);
-		}
-		
-		[Fact]
-		public void can_set_stream_metadata_without_max_age() {
-			var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var metadata = new StreamMetadata(
-				maxCount: 33,
-				truncateBefore: 43);
-			
-			sut.SetMetadata(33, metadata);
-			
-			Assert.True(sut.TryGetValue(33, out var v));
-			Assert.Equal(new OriginalStreamData() {
-				MaxCount = metadata.MaxCount,
-				TruncateBefore = metadata.TruncateBefore,
-				Status = CalculationStatus.Active
-			}, v, OriginalStreamDataComparer.Default);
-		}
-		
-		[Fact]
-		public void can_set_stream_metadata_without_max_count() {
-			var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var metadata = new StreamMetadata(
-				maxAge: TimeSpan.FromDays(13),
-				truncateBefore: 43);
-			
-			sut.SetMetadata(33, metadata);
-			
-			Assert.True(sut.TryGetValue(33, out var v));
-			Assert.Equal(new OriginalStreamData() {
-				MaxAge = metadata.MaxAge,
-				TruncateBefore = metadata.TruncateBefore,
-				Status = CalculationStatus.Active
-			}, v, OriginalStreamDataComparer.Default);
-		}
-		
-		[Fact]
-		public void can_set_stream_metadata_without_truncating() {
-			var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var metadata = new StreamMetadata(
-				maxAge: TimeSpan.FromDays(13),
-				maxCount: 33);
-			
-			sut.SetMetadata(33, metadata);
-			
-			Assert.True(sut.TryGetValue(33, out var v));
-			Assert.Equal(new OriginalStreamData() {
-				MaxAge = metadata.MaxAge,
-				MaxCount = metadata.MaxCount,
-				Status = CalculationStatus.Active
-			}, v, OriginalStreamDataComparer.Default);
-		}
-		
-		[Fact]
-		public void can_set_stream_metadata_of_non_existing() {
-			var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var metadata = new StreamMetadata(
-				maxAge: TimeSpan.FromDays(13),
-				maxCount: 33,
-				truncateBefore: 43);
-			
-			sut.SetMetadata(33, metadata);
-			
-			Assert.True(sut.TryGetValue(33, out var v));
-			Assert.Equal(new OriginalStreamData() {
-				MaxAge = metadata.MaxAge,
-				MaxCount = metadata.MaxCount,
-				TruncateBefore = metadata.TruncateBefore,
-				Status = CalculationStatus.Active
-			}, v, OriginalStreamDataComparer.Default);
-		}
-		
-		[Fact]
-		public void can_set_discard_points_of_existing() {
-			var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var data = new OriginalStreamData() {
-				MaxAge = TimeSpan.FromDays(13),
-				MaxCount = 33,
-				TruncateBefore = 43,
-			};
-
-			sut[33] = data;
-
-			data.Status = CalculationStatus.Spent;
-			data.DiscardPoint = DiscardPoint.DiscardIncluding(5);
-			data.MaybeDiscardPoint = DiscardPoint.DiscardIncluding(12);
-			sut.SetDiscardPoints(33, data.Status, data.DiscardPoint, data.MaybeDiscardPoint);
-			
-			Assert.True(sut.TryGetValue(33, out var v));
-			Assert.Equal(data, v, OriginalStreamDataComparer.Default);
-		}
-		
-		[Fact]
-		public void can_set_discard_points_of_non_existing() {
-			var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var discardPoint = DiscardPoint.DiscardIncluding(5);
-			var maybeDiscardPoint = DiscardPoint.DiscardIncluding(12);
-			sut.SetDiscardPoints(33, CalculationStatus.Archived, discardPoint, maybeDiscardPoint);
-
-			Assert.True(sut.TryGetValue(33, out var v));
-			Assert.Equal(new OriginalStreamData() {
-				DiscardPoint = discardPoint,
-				MaybeDiscardPoint = maybeDiscardPoint,
-				Status = CalculationStatus.Archived
-			}, v, OriginalStreamDataComparer.Default);
-		}
-		
-		[Fact]
-		public void can_get_chunk_execution_info() {
-			var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var data = new OriginalStreamData() {
-				DiscardPoint = DiscardPoint.DiscardIncluding(5),
-				MaybeDiscardPoint = DiscardPoint.DiscardIncluding(43),
-				MaxAge = TimeSpan.FromDays(13),
-				IsTombstoned = true
-			};
-
-			sut[33] = data;
-
-			Assert.True(sut.TryGetChunkExecutionInfo(33, out var v));
-			Assert.Equal(new ChunkExecutionInfo(
-				data.IsTombstoned,
-				data.DiscardPoint,
-				data.MaybeDiscardPoint,
-				data.MaxAge), v);
-		}
-		
-		[Fact]
-		public void can_try_get_chunk_execution_info_when_only_tombstoned() {
-			var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-			
-			sut.SetTombstone(33);
-
-			Assert.True(sut.TryGetChunkExecutionInfo(33, out var v));
-			Assert.True(v.IsTombstoned);
-			Assert.Null(v.MaxAge);
-			Assert.Equal(DiscardPoint.KeepAll, v.DiscardPoint);
-			Assert.Equal(DiscardPoint.KeepAll, v.MaybeDiscardPoint);
-		}
-		
-		[Fact]
-		public void can_try_get_chunk_execution_info_of_non_existing() {
-			var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			Assert.False(sut.TryGetChunkExecutionInfo(33, out var v));
-			Assert.Equal(default, v);
-		}
-
-		[Fact]
-		public void can_get_all_records() {
-			var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var osd = GetOriginalStreamTestData();
-			
-			sut[0] = osd[0];
-			sut[1] = osd[1];
-			sut[2] = osd[2];
-			sut[3] = osd[3];
-			sut[4] = osd[4];
-
-			Assert.Collection(sut.AllRecords(),
-				item => {
-					Assert.Equal(0, item.Key);
-					Assert.Equal(osd[0], item.Value, OriginalStreamDataComparer.Default);
-				},
-				item => {
-					Assert.Equal(1, item.Key);
-					Assert.Equal(osd[1], item.Value, OriginalStreamDataComparer.Default);
-				},
-				item => {
-					Assert.Equal(2, item.Key);
-					Assert.Equal(osd[2], item.Value, OriginalStreamDataComparer.Default);
-				},
-				item => {
-					Assert.Equal(3, item.Key);
-					Assert.Equal(osd[3], item.Value, OriginalStreamDataComparer.Default);
-				},
-				item => {
-					Assert.Equal(4, item.Key);
-					Assert.Equal(osd[4], item.Value, OriginalStreamDataComparer.Default);
-				});
-		}
-
-		[Fact]
-		public void can_get_active_records() {
-			var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var osd = GetOriginalStreamTestData();
-			
-			osd[0].Status = CalculationStatus.Archived;
-			osd[1].Status = CalculationStatus.Spent;
-			osd[2].Status = CalculationStatus.Active;
-			osd[3].Status = CalculationStatus.Active;
-			osd[4].Status = CalculationStatus.None;
-			
-			sut[0] = osd[0];
-			sut[1] = osd[1];
-			sut[2] = osd[2];
-			sut[3] = osd[3];
-			sut[4] = osd[4];
-
-			Assert.Collection(sut.ActiveRecords(),
-				item => {
-					Assert.Equal(2, item.Key);
-					Assert.Equal(osd[2], item.Value, OriginalStreamDataComparer.Default);
-				},
-				item => {
-					Assert.Equal(3, item.Key);
-					Assert.Equal(osd[3], item.Value, OriginalStreamDataComparer.Default);
-				});
-		}
-		
-		[Fact]
-		public void can_get_all_active_records_from_checkpoint() {
-			var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var osd = GetOriginalStreamTestData();
-
-			osd[0].Status = CalculationStatus.Active;
-			osd[1].Status = CalculationStatus.Active;
-			osd[2].Status = CalculationStatus.Active;
-			osd[3].Status = CalculationStatus.Active;
-			osd[4].Status = CalculationStatus.Archived;
-			
-			sut[0] = osd[0];
-			sut[1] = osd[1];
-			sut[2] = osd[2];
-			sut[3] = osd[3];
-			sut[4] = osd[4];
-			
-			Assert.Collection(sut.ActiveRecordsFromCheckpoint(1),
-				item => {
-					Assert.Equal(2, item.Key);
-					Assert.Equal(osd[2], item.Value, OriginalStreamDataComparer.Default);
-				},
-				item => {
-					Assert.Equal(3, item.Key);
-					Assert.Equal(osd[3], item.Value, OriginalStreamDataComparer.Default);
-				});
-		}
-		
-		[Fact]
-		public void can_remove_value_from_map() {
-			var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var osd = GetOriginalStreamTestData();
-			
-			sut[33] = osd[0];
-			sut[1] = osd[1];
-
-			Assert.True(sut.TryGetValue(33, out _));
-			Assert.True(sut.TryRemove(33, out var removedValue));
-			Assert.Equal(osd[0], removedValue, OriginalStreamDataComparer.Default);
-			Assert.False(sut.TryGetValue(33, out _));
-			
-			Assert.True(sut.TryGetValue(1, out var v));
-			Assert.Equal(osd[1], v, OriginalStreamDataComparer.Default);
-		}
-		
-		[Fact]
-		public void can_try_remove_value_from_map() {
-			var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			Assert.False(sut.TryRemove(33, out _));
-		}
-
-		[Fact]
-		public void can_remove_multiple_records_at_once() {
-			var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var osd = GetOriginalStreamTestData();
-
-			osd[0].Status = CalculationStatus.Archived;
-			osd[1].Status = CalculationStatus.Spent;
-			osd[2].Status = CalculationStatus.Spent;
-			osd[3].Status = CalculationStatus.Active;
-			osd[4].Status = CalculationStatus.Archived;
-			
-			sut[0] = osd[0];
-			sut[1] = osd[1];
-			sut[2] = osd[2];
-			sut[3] = osd[3];
-			sut[4] = osd[4];
-			
-			sut.DeleteMany(deleteArchived: false);
-			
-			Assert.Collection(sut.AllRecords(),
-				item => { Assert.Equal(CalculationStatus.Archived, item.Value.Status); },
-				item => { Assert.Equal(CalculationStatus.Active, item.Value.Status); },
-				item => { Assert.Equal(CalculationStatus.Archived, item.Value.Status); });
-		}
-		
-		[Fact]
-		public void can_remove_multiple_records_at_once_including_archived() {
-			var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var osd = GetOriginalStreamTestData();
-
-			osd[0].Status = CalculationStatus.Archived;
-			osd[1].Status = CalculationStatus.Spent;
-			osd[2].Status = CalculationStatus.Spent;
-			osd[3].Status = CalculationStatus.Active;
-			osd[4].Status = CalculationStatus.Archived;
-			
-			sut[0] = osd[0];
-			sut[1] = osd[1];
-			sut[2] = osd[2];
-			sut[3] = osd[3];
-			sut[4] = osd[4];
-			
-			sut.DeleteMany(deleteArchived: true);
-			
-			Assert.Collection(sut.AllRecords(),
-				item => { Assert.Equal(CalculationStatus.Active, item.Value.Status); });
-		}
-		
-		private OriginalStreamData[] GetOriginalStreamTestData() {
-			return new[] {
-				new OriginalStreamData() {
-					IsTombstoned = false,
-					MaxAge = TimeSpan.FromDays(3),
-					MaxCount = 10,
-					TruncateBefore = 1
-				},
-				new OriginalStreamData() {
-					DiscardPoint = DiscardPoint.DiscardBefore(10),
-					IsTombstoned = true,
-					MaxAge = TimeSpan.FromDays(3),
-					MaxCount = 100,
-					TruncateBefore = 13,
-					MaybeDiscardPoint = DiscardPoint.DiscardBefore(21)
-				},
-				new OriginalStreamData() {
-					DiscardPoint = DiscardPoint.DiscardBefore(20),
-					MaxAge = TimeSpan.FromHours(12),
-					MaybeDiscardPoint = DiscardPoint.DiscardBefore(21)
-				},
-				new OriginalStreamData() {
-					DiscardPoint = DiscardPoint.DiscardBefore(10),
-					IsTombstoned = true,
-					MaxAge = TimeSpan.FromDays(33),
-					TruncateBefore = 11,
-				},
-				new OriginalStreamData() {
-					DiscardPoint = DiscardPoint.DiscardBefore(300),
-					MaxAge = TimeSpan.FromDays(300),
-					MaxCount = 1000,
-					TruncateBefore = 1333,
-					MaybeDiscardPoint = DiscardPoint.DiscardBefore(500)
-				}
-			};
-		}
-		
-		public class OriginalStreamDataComparer : IEqualityComparer<OriginalStreamData> {
-			
-			public static readonly OriginalStreamDataComparer Default = new OriginalStreamDataComparer();
-			
-			public bool Equals(OriginalStreamData x, OriginalStreamData y)
-			{
-				if (x is null || y is null) {
-					return false;
-				}
-
-				return x.MaxCount == y.MaxCount &&
-				       x.MaxAge == y.MaxAge &&
-				       x.TruncateBefore == y.TruncateBefore &&
-				       x.IsTombstoned == y.IsTombstoned &&
-				       x.DiscardPoint == y.DiscardPoint &&
-				       x.MaybeDiscardPoint == y.MaybeDiscardPoint && 
-				       x.Status == y.Status;
-			}
-
-			public int GetHashCode(OriginalStreamData obj) {
-				throw new NotImplementedException();
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteScavengeBackendTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteScavengeBackendTests.cs
deleted file mode 100644
index f39b337b5e4..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteScavengeBackendTests.cs
+++ /dev/null
@@ -1,301 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
-using EventStore.Core.TransactionLog.Scavenging;
-using EventStore.Core.TransactionLog.Scavenging.Sqlite;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge.Sqlite {
-	public class SqliteScavengeBackendTests : SqliteDbPerTest<SqliteScavengeBackendTests>  {
-		private readonly ITestOutputHelper _testOutputHelper;
-
-		public SqliteScavengeBackendTests(ITestOutputHelper testOutputHelper) {
-			_testOutputHelper = testOutputHelper;
-		}
-
-		[Fact]
-		public void should_successfully_enable_features_on_initialization() {
-			var sut = new SqliteScavengeBackend<string>(Serilog.Log.Logger);
-			var result = Record.Exception(() => sut.Initialize(Fixture.DbConnection));
-			Assert.Null(result);
-		}
-		
-		[Fact]
-		public void should_initialize_multiple_times_without_error() {
-			var sut = new SqliteScavengeBackend<string>(Serilog.Log.Logger);
-			var result = Record.Exception(() => sut.Initialize(Fixture.DbConnection));
-			Assert.Null(result);
-			
-			result = Record.Exception(() => sut.Initialize(Fixture.DbConnection));
-			Assert.Null(result);
-		}
-
-		[Fact]
-		public void should_commit_and_read_in_a_transaction_successfully() {
-			var sut = new SqliteScavengeBackend<string>(Serilog.Log.Logger);
-			sut.Initialize(Fixture.DbConnection);
-			
-			var add = sut.TransactionFactory.Begin();
-			sut.CheckpointStorage[Unit.Instance] = new ScavengeCheckpoint.ExecutingIndex(
-				new ScavengePoint(1,1, DateTime.UtcNow, 1));
-			sut.ChunkTimeStampRanges[0] = new ChunkTimeStampRange(DateTime.Now, DateTime.Now.AddMinutes(1));
-			sut.ChunkWeights[0] = 1f;
-			sut.CollisionStorage["collision-1"] = Unit.Instance;
-			sut.Hashes[0] = "hash-one";
-			sut.MetaCollisionStorage["collision-1"] = MetastreamData.Empty;
-			sut.MetaStorage[0] = MetastreamData.Empty;
-			sut.OriginalStorage[0] = new OriginalStreamData() {
-				Status = CalculationStatus.Active,
-				DiscardPoint = DiscardPoint.KeepAll,
-				IsTombstoned = true,
-				MaxAge = TimeSpan.FromSeconds(30),
-				MaxCount = 10,
-				TruncateBefore = 5,
-				MaybeDiscardPoint = DiscardPoint.DiscardBefore(2)
-			};
-			sut.TransactionFactory.Commit(add);
-			
-			var read = sut.TransactionFactory.Begin();
-			Assert.True(sut.CheckpointStorage.TryGetValue(Unit.Instance, out _));
-			Assert.True(sut.ChunkTimeStampRanges.TryGetValue(0, out _));
-			Assert.True(sut.ChunkWeights.TryGetValue(0, out _));
-			Assert.True(sut.CollisionStorage.TryGetValue("collision-1", out _));
-			Assert.True(sut.Hashes.TryGetValue(0, out _));
-			Assert.True(sut.MetaCollisionStorage.TryGetValue("collision-1", out _));
-			Assert.True(sut.MetaStorage.TryGetValue(0, out _));
-			Assert.True(sut.OriginalStorage.TryGetValue(0, out _));
-			sut.TransactionFactory.Commit(read);
-		}
-
-		[Fact]
-		public void should_commit_and_read_all_in_a_transaction_successfully() {
-			var sut = new SqliteScavengeBackend<string>(Serilog.Log.Logger);
-			sut.Initialize(Fixture.DbConnection);
-			
-			var add = sut.TransactionFactory.Begin();
-			sut.ChunkTimeStampRanges[0] = new ChunkTimeStampRange(DateTime.Now, DateTime.Now.AddMinutes(1));
-			sut.ChunkWeights[0] = 1f;
-			sut.CollisionStorage["collision-1"] = Unit.Instance;
-			sut.Hashes[0] = "hash-one";
-			sut.MetaCollisionStorage["collision-1"] = MetastreamData.Empty;
-			sut.MetaStorage[0] = MetastreamData.Empty;
-			sut.OriginalStorage[0] = new OriginalStreamData() {
-				Status = CalculationStatus.Active,
-				DiscardPoint = DiscardPoint.KeepAll,
-				IsTombstoned = true,
-				MaxAge = TimeSpan.FromSeconds(30),
-				MaxCount = 10,
-				TruncateBefore = 5,
-				MaybeDiscardPoint = DiscardPoint.DiscardBefore(2)
-			};
-			sut.TransactionFactory.Commit(add);
-			
-			var read = sut.TransactionFactory.Begin();
-			Assert.NotEmpty(sut.ChunkTimeStampRanges.AllRecords());
-			Assert.NotEmpty(sut.ChunkWeights.AllRecords());
-			Assert.NotEmpty(sut.CollisionStorage.AllRecords());
-			Assert.NotEmpty(sut.Hashes.AllRecords());
-			Assert.NotEmpty(sut.MetaCollisionStorage.AllRecords());
-			Assert.NotEmpty(sut.MetaStorage.AllRecords());
-			Assert.NotEmpty(sut.OriginalStorage.AllRecords());
-			sut.TransactionFactory.Commit(read);
-		}
-		
-		[Fact]
-		public void should_commit_and_delete_in_a_transaction_successfully() {
-			var sut = new SqliteScavengeBackend<string>(Serilog.Log.Logger);
-			sut.Initialize(Fixture.DbConnection);
-			
-			var checkpoint = new ScavengeCheckpoint.ExecutingIndex(new ScavengePoint(1,1, DateTime.UtcNow, 1));
-			
-			var add = sut.TransactionFactory.Begin();
-			sut.CheckpointStorage[Unit.Instance] = checkpoint;
-			sut.ChunkTimeStampRanges[0] = new ChunkTimeStampRange(DateTime.Now, DateTime.Now.AddMinutes(1));
-			sut.ChunkWeights[0] = 1f;
-			sut.CollisionStorage["collision-1"] = Unit.Instance;
-			sut.Hashes[0] = "hash-one";
-			sut.MetaCollisionStorage["collision-1"] = MetastreamData.Empty;
-			sut.MetaStorage[0] = MetastreamData.Empty;
-			sut.OriginalStorage[0] = new OriginalStreamData() {
-				Status = CalculationStatus.Active,
-				DiscardPoint = DiscardPoint.KeepAll,
-				IsTombstoned = true,
-				MaxAge = TimeSpan.FromSeconds(30),
-				MaxCount = 10,
-				TruncateBefore = 5,
-				MaybeDiscardPoint = DiscardPoint.DiscardBefore(2)
-			};
-			sut.TransactionFactory.Commit(add);
-			
-			var delete = sut.TransactionFactory.Begin();
-			Assert.True(sut.CheckpointStorage.TryRemove(Unit.Instance, out _));
-			Assert.True(sut.ChunkTimeStampRanges.TryRemove(0, out _));
-			Assert.True(sut.ChunkWeights.TryRemove(0, out _));
-			Assert.True(sut.CollisionStorage.TryRemove("collision-1", out _));
-			Assert.True(sut.Hashes.TryRemove(0, out _));
-			Assert.True(sut.MetaCollisionStorage.TryRemove("collision-1", out _));
-			Assert.True(sut.MetaStorage.TryRemove(0, out _));
-			Assert.True(sut.OriginalStorage.TryRemove(0, out _));
-			sut.TransactionFactory.Commit(delete);
-		}
-		
-		[Fact]
-		public void should_restore_previous_state_on_rollback() {
-			var sut = new SqliteScavengeBackend<string>(Serilog.Log.Logger);
-			sut.Initialize(Fixture.DbConnection);
-
-			// Setup
-			var tx1 = sut.TransactionFactory.Begin();
-			sut.ChunkWeights[0] = 1f;
-			sut.ChunkWeights[1] = 1f;
-			sut.ChunkWeights[2] = 1f;
-			
-			sut.Hashes[0] = "hash-one";
-			sut.Hashes[1] = "hash-two";
-			sut.Hashes[2] = "hash-three";
-			sut.TransactionFactory.Commit(tx1);
-			
-			// Rollback
-			var tx2 = sut.TransactionFactory.Begin();
-			sut.ChunkWeights[3] = 2f;
-			sut.ChunkWeights[4] = 2f;
-			
-			sut.Hashes[3] = "hash-four";
-			sut.Hashes[4] = "hash-five";
-			
-			Assert.Equal(5, sut.ChunkWeights.AllRecords().Count());
-			Assert.Equal(5, sut.Hashes.AllRecords().Count());
-			
-			sut.TransactionFactory.Rollback(tx2);
-			
-			Assert.Equal(3, sut.ChunkWeights.AllRecords().Count());
-			Assert.Equal(3, sut.Hashes.AllRecords().Count());
-		}
-		
-		[Fact(Skip = "Long running, run manually")]
-		public void test_memory_usage() {
-			const ulong streamCount = 1_000_000;
-			const int chunkCount = 100;
-			const int collisionStorageCount = 5;
-			const int cacheSizeInBytes = 4 * 1024 * 1024;
-
-			var sut = new SqliteScavengeBackend<string>(Serilog.Log.Logger, cacheSizeInBytes);
-			sut.Initialize(Fixture.DbConnection);
-
-			var stopwatch = new Stopwatch();
-			stopwatch.Start();
-
-			var transaction = sut.TransactionFactory.Begin();
-			for (ulong i = 0; i < streamCount; i++) {
-				var streamId = Guid.NewGuid().ToString();
-				sut.Hashes[i] = streamId;
-				sut.MetaStorage[i] = new MetastreamData(false, DiscardPoint.KeepAll);
-				sut.OriginalStorage[i] = new OriginalStreamData() {
-					Status = CalculationStatus.Active,
-					DiscardPoint = DiscardPoint.KeepAll,
-					IsTombstoned = false,
-					MaxAge = TimeSpan.FromHours(1),
-					MaxCount = 10,
-					MaybeDiscardPoint = DiscardPoint.KeepAll,
-					TruncateBefore = 15
-				};
-			}
-
-			for (int i = 0; i < chunkCount; i++) {
-				sut.ChunkWeights[i] = 0.5f;
-				sut.ChunkTimeStampRanges[i] = new ChunkTimeStampRange(DateTime.Today, DateTime.Today.AddHours(1*i));
-			}
-
-			for (int i = 0; i < collisionStorageCount; i++) {
-				sut.CollisionStorage[$"stream-collision-{i}"] = Unit.Instance;
-				sut.MetaCollisionStorage[$"meta-stream-collision-{i}"] = new MetastreamData(isTombstoned: true, DiscardPoint.KeepAll);
-				sut.OriginalCollisionStorage[$"stream-collision-{i}"] = new OriginalStreamData() {
-					Status = CalculationStatus.Archived,
-					DiscardPoint = DiscardPoint.KeepAll,
-					IsTombstoned = false,
-					MaxAge = TimeSpan.FromHours(1),
-					MaxCount = 10,
-					MaybeDiscardPoint = DiscardPoint.KeepAll,
-					TruncateBefore = 15
-				};
-			}
-			
-			sut.TransactionFactory.Commit(transaction);
-			stopwatch.Stop();
-			
-			var stats = sut.GetStats();
-			_testOutputHelper.WriteLine(
-				$"SQLite Memory Usage: {stats.MemoryUsage:N0} " +
-				$"Db Size: {stats.DatabaseSize:N0} " +
-				$"Cache Size: {stats.CacheSize:N0} for {streamCount:N0} streams in {stopwatch.Elapsed}");
-		}
-		
-		[Fact (Skip = "Long running, run manually")]
-		public void test_index_with_archived() {
-			const ulong archivedCount = 50_000_000;
-			const ulong streamCount = 1_000_000;
-			const int chunkCount = 100;
-			const int collisionStorageCount = 5;
-			const int cacheSizeInBytes = 4 * 1024 * 1024;
-
-			var sut = new SqliteScavengeBackend<string>(Serilog.Log.Logger, cacheSizeInBytes);
-			sut.Initialize(Fixture.DbConnection);
-
-			var insert = new Stopwatch();
-			insert.Start();
-
-			var transaction = sut.TransactionFactory.Begin();
-			for (ulong i = 0; i < archivedCount + streamCount; i++) {
-				var streamId = Guid.NewGuid().ToString();
-				sut.Hashes[i] = streamId;
-				sut.MetaStorage[i] = new MetastreamData(false, DiscardPoint.KeepAll);
-				sut.OriginalStorage[i] = new OriginalStreamData() {
-					Status = i < archivedCount ? CalculationStatus.Archived : CalculationStatus.Active,
-					DiscardPoint = DiscardPoint.KeepAll,
-					IsTombstoned = false,
-					MaxAge = TimeSpan.FromHours(1),
-					MaxCount = 10,
-					MaybeDiscardPoint = DiscardPoint.KeepAll,
-					TruncateBefore = 15
-				};
-			}
-
-			for (int i = 0; i < chunkCount; i++) {
-				sut.ChunkWeights[i] = 0.5f;
-				sut.ChunkTimeStampRanges[i] = new ChunkTimeStampRange(DateTime.Today, DateTime.Today.AddHours(1*i));
-			}
-
-			for (int i = 0; i < collisionStorageCount; i++) {
-				sut.CollisionStorage[$"stream-collision-{i}"] = Unit.Instance;
-				sut.MetaCollisionStorage[$"meta-stream-collision-{i}"] = new MetastreamData(isTombstoned: true, DiscardPoint.KeepAll);
-				sut.OriginalCollisionStorage[$"stream-collision-{i}"] = new OriginalStreamData() {
-					Status = CalculationStatus.Archived,
-					DiscardPoint = DiscardPoint.KeepAll,
-					IsTombstoned = false,
-					MaxAge = TimeSpan.FromHours(1),
-					MaxCount = 10,
-					MaybeDiscardPoint = DiscardPoint.KeepAll,
-					TruncateBefore = 15
-				};
-			}
-			
-			sut.TransactionFactory.Commit(transaction);
-			insert.Stop();
-
-			var readStopwatch = new Stopwatch();
-			readStopwatch.Start();
-			ulong k = 0;
-			foreach (var active in sut.OriginalStorage.ActiveRecordsFromCheckpoint(1_000_000)) {
-				k += active.Key;
-			}
-			readStopwatch.Stop();
-
-			var stats = sut.GetStats();
-			_testOutputHelper.WriteLine(
-				$"Read all active records from checkpoint in: {readStopwatch.Elapsed} " +
-				$"with {archivedCount:N0} archived & {streamCount:N0} active, inserted in {insert.Elapsed}. " +
-				$"DB Size: {stats.DatabaseSize:N0}");
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteScavengeCheckpointMapTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteScavengeCheckpointMapTests.cs
deleted file mode 100644
index ca5e1c3f035..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteScavengeCheckpointMapTests.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.Scavenging;
-using EventStore.Core.TransactionLog.Scavenging.Sqlite;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge.Sqlite {
-	public class SqliteScavengeCheckpointMapTests : SqliteDbPerTest<SqliteScavengeCheckpointMapTests> {
-
-		[Fact]
-		public void can_store_checkpoint() {
-			var sut = new SqliteScavengeCheckpointMap<int>();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var scavengePoint = new ScavengePoint(
-				position: 303,
-				eventNumber: 5,
-				effectiveNow: DateTime.UtcNow,
-				threshold: 6);
-			sut[Unit.Instance] = new ScavengeCheckpoint.Accumulating(scavengePoint, 22);
-
-			Assert.True(sut.TryGetValue(Unit.Instance, out var v));
-			Assert.NotNull(v);
-			Assert.IsType<ScavengeCheckpoint.Accumulating>(v);
-			Assert.Equal(22, ((ScavengeCheckpoint.Accumulating)v).DoneLogicalChunkNumber);
-			Assert.Equal(scavengePoint.Position, v.ScavengePoint.Position);
-			Assert.Equal(scavengePoint.EventNumber, v.ScavengePoint.EventNumber);
-			Assert.Equal(scavengePoint.EffectiveNow, v.ScavengePoint.EffectiveNow);
-			Assert.Equal(scavengePoint.Threshold, v.ScavengePoint.Threshold);
-		}
-
-		[Fact]
-		public void can_overwrite_current_checkpoint() {
-			var sut = new SqliteScavengeCheckpointMap<int>();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			sut[Unit.Instance] = new ScavengeCheckpoint.Accumulating(
-				new ScavengePoint(
-					position: 303,
-					eventNumber: 5,
-					effectiveNow: DateTime.UtcNow.AddHours(-1),
-					threshold: 6),
-				22);
-
-			var scavengePoint = new ScavengePoint(
-				position: 909,
-				eventNumber: 6,
-				effectiveNow: DateTime.UtcNow,
-				threshold: 7);
-
-			sut[Unit.Instance] = new ScavengeCheckpoint.ExecutingChunks(scavengePoint, 43);
-			
-			Assert.True(sut.TryGetValue(Unit.Instance, out var v));
-			Assert.NotNull(v);
-			Assert.IsType<ScavengeCheckpoint.ExecutingChunks>(v);
-			Assert.Equal(43, ((ScavengeCheckpoint.ExecutingChunks)v).DoneLogicalChunkNumber);
-			Assert.Equal(scavengePoint.Position, v.ScavengePoint.Position);
-			Assert.Equal(scavengePoint.EventNumber, v.ScavengePoint.EventNumber);
-			Assert.Equal(scavengePoint.EffectiveNow, v.ScavengePoint.EffectiveNow);
-			Assert.Equal(scavengePoint.Threshold, v.ScavengePoint.Threshold);
-		}
-
-		[Fact]
-		public void can_remove_current_checkpoint() {
-			var sut = new SqliteScavengeCheckpointMap<int>();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			var scavengePoint = new ScavengePoint(
-				position: 303,
-				eventNumber: 5,
-				effectiveNow: DateTime.UtcNow,
-				threshold: 6);
-			sut[Unit.Instance] = new ScavengeCheckpoint.Accumulating(scavengePoint, 22);
-
-			Assert.True(sut.TryRemove(Unit.Instance, out var v));
-			Assert.NotNull(v);
-			Assert.IsType<ScavengeCheckpoint.Accumulating>(v);
-			Assert.Equal(scavengePoint.Position, v.ScavengePoint.Position);
-			Assert.Equal(scavengePoint.EventNumber, v.ScavengePoint.EventNumber);
-			Assert.Equal(scavengePoint.EffectiveNow, v.ScavengePoint.EffectiveNow);
-			Assert.Equal(scavengePoint.Threshold, v.ScavengePoint.Threshold);
-		}
-
-		[Fact]
-		public void can_try_remove_checkpoint() {
-			var sut = new SqliteScavengeCheckpointMap<int>();
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			Assert.False(sut.TryRemove(Unit.Instance, out _));
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteScavengeMapTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteScavengeMapTests.cs
deleted file mode 100644
index 351df88ecd0..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteScavengeMapTests.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.TransactionLog.Scavenging.Sqlite;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge.Sqlite {
-	public class SqliteScavengeMapTests : SqliteDbPerTest<SqliteScavengeMapTests> {
-		
-		[Fact]
-		public void throws_on_unsupported_type() {
-			Assert.Throws<ArgumentException>(
-				() => new SqliteScavengeMap<byte, int>("UnsupportedKeyTypeMap"));
-			
-			Assert.Throws<ArgumentException>(
-				() => new SqliteScavengeMap<int, byte>("UnsupportedValueTypeMap"));
-		}
-		
-		[Fact]
-		public void initializes_table_only_once() {
-			var sut = new SqliteScavengeMap<int, int>("SomeMap");
-			var sqliteBackend = new SqliteBackend(Fixture.DbConnection);
-			
-			sut.Initialize(sqliteBackend);
-			
-			sut[33] = 1;
-			
-			Assert.Null(Record.Exception(() => sut.Initialize(sqliteBackend)));
-			Assert.True(sut.TryGetValue(33, out var value));
-			Assert.Equal(1, value);
-		}
-		
-		[Fact]
-		public void can_use_int_float_map() {
-			var sut = new SqliteScavengeMap<int, float>("IntFloatMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			sut[33] = 1;
-			sut[1] = 33;
-			
-			Assert.True(sut.TryGetValue(33, out var v1));
-			Assert.Equal(1, v1);
-			
-			Assert.True(sut.TryGetValue(1, out var v2));
-			Assert.Equal(33, v2);
-		}
-
-		[Fact]
-		public void can_use_string_map() {
-			var sut = new SqliteScavengeMap<string, string>("StringMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			sut["string"] = "string";
-			
-			Assert.True(sut.TryGetValue("string", out var v));
-			Assert.Equal("string", v);
-		}
-		
-		[Fact]
-		public void can_overwrite_value() {
-			var sut = new SqliteScavengeMap<string, string>("OverwriteStringMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			sut["string"] = "string-one";
-			sut["string"] = "string-two";
-			
-			Assert.True(sut.TryGetValue("string", out var v));
-			Assert.Equal("string-two", v);
-		}
-
-		[Fact]
-		public void can_store_max_unsigned_long() {
-			var sut = new SqliteScavengeMap<ulong, ulong>("UnsignedLongMaxValueMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			sut[ulong.MaxValue] = ulong.MaxValue;
-			
-			Assert.True(sut.TryGetValue(ulong.MaxValue, out var v));
-			Assert.Equal(ulong.MaxValue, v);
-		}
-		
-		[Fact]
-		public void can_remove_value_from_map() {
-			var sut = new SqliteScavengeMap<int, int>("RemoveValueMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			sut[33] = 1;
-			sut[1] = 33;
-
-			Assert.True(sut.TryGetValue(33, out _));
-			Assert.True(sut.TryRemove(33, out var removedValue));
-			Assert.Equal(1, removedValue);
-			Assert.False(sut.TryGetValue(33, out _));
-			
-			Assert.True(sut.TryGetValue(1, out var v));
-			Assert.Equal(33, v);
-		}
-		
-		[Fact]
-		public void can_try_remove_value_from_map() {
-			var sut = new SqliteScavengeMap<int, int>("TryRemoveValueMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-
-			Assert.False(sut.TryRemove(33, out _));
-		}
-		
-		[Fact]
-		public void can_get_all_records() {
-			var sut = new SqliteScavengeMap<int, int>("EnumerateMap");
-			sut.Initialize(new SqliteBackend(Fixture.DbConnection));
-
-			sut[0] = 4;
-			sut[1] = 3;
-			sut[2] = 2;
-			sut[3] = 1;
-			sut[4] = 0;
-			
-			Assert.Collection(sut.AllRecords(),
-				item => Assert.Equal(new KeyValuePair<int,int>(0,4), item),
-				item => Assert.Equal(new KeyValuePair<int,int>(1,3), item),
-				item => Assert.Equal(new KeyValuePair<int,int>(2,2), item),
-				item => Assert.Equal(new KeyValuePair<int,int>(3,1), item),
-				item => Assert.Equal(new KeyValuePair<int,int>(4,0), item));
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteTypeMappingTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteTypeMappingTests.cs
deleted file mode 100644
index c62bf0621ca..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/Sqlite/SqliteTypeMappingTests.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using EventStore.Core.TransactionLog.Scavenging.Sqlite;
-using Microsoft.Data.Sqlite;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge.Sqlite {
-	public class SqliteTypeMappingTests {
-		[Fact]
-		public void can_map() {
-			Assert.Equal(SqliteType.Integer, SqliteTypeMapping.Map<int>());
-			Assert.Equal(SqliteType.Real, SqliteTypeMapping.Map<float>());
-			Assert.Equal(SqliteType.Integer, SqliteTypeMapping.Map<long>());
-			Assert.Equal(SqliteType.Integer, SqliteTypeMapping.Map<ulong>());
-			Assert.Equal(SqliteType.Text, SqliteTypeMapping.Map<string>());
-		}
-
-		[Fact]
-		public void can_get_type_name() {
-			Assert.Equal("INTEGER", SqliteTypeMapping.GetTypeName<int>());
-			Assert.Equal("REAL", SqliteTypeMapping.GetTypeName<float>());
-			Assert.Equal("INTEGER", SqliteTypeMapping.GetTypeName<long>());
-			Assert.Equal("INTEGER", SqliteTypeMapping.GetTypeName<ulong>());
-			Assert.Equal("TEXT", SqliteTypeMapping.GetTypeName<string>());
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/StreamHandleTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/StreamHandleTests.cs
deleted file mode 100644
index 6a33db2e79d..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/StreamHandleTests.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using EventStore.Core.TransactionLog.Scavenging;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class StreamHandleTests {
-		[Fact]
-		public void equals_int() {
-			Assert.Equal(new StreamHandle<int>(), new StreamHandle<int>());
-			Assert.Equal(StreamHandle.ForStreamId(5), StreamHandle.ForStreamId(5));
-			Assert.Equal(StreamHandle.ForHash<int>(5), StreamHandle.ForHash<int>(5));
-
-			Assert.NotEqual(StreamHandle.ForStreamId(5), StreamHandle.ForStreamId(6));
-			Assert.NotEqual(StreamHandle.ForHash<int>(5), StreamHandle.ForHash<int>(6));
-
-			Assert.NotEqual(StreamHandle.ForStreamId(5), StreamHandle.ForHash<int>(5));
-
-			Assert.NotEqual(new StreamHandle<int>(), StreamHandle.ForHash<int>(5));
-			Assert.NotEqual(new StreamHandle<int>(), StreamHandle.ForStreamId(5));
-		}
-
-		[Fact]
-		public void equals_string() {
-			Assert.Equal(new StreamHandle<string>(), new StreamHandle<string>());
-			Assert.Equal(StreamHandle.ForStreamId("5"), StreamHandle.ForStreamId("5"));
-			Assert.Equal(StreamHandle.ForHash<string>(5), StreamHandle.ForHash<string>(5));
-
-			Assert.NotEqual(StreamHandle.ForStreamId("5"), StreamHandle.ForStreamId("6"));
-			Assert.NotEqual(StreamHandle.ForHash<string>(5), StreamHandle.ForHash<string>(6));
-
-			Assert.NotEqual(StreamHandle.ForStreamId("5"), StreamHandle.ForHash<string>(5));
-
-			Assert.NotEqual(new StreamHandle<string>(), StreamHandle.ForHash<string>(5));
-			Assert.NotEqual(new StreamHandle<string>(), StreamHandle.ForStreamId("5"));
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/SubsequentScavengeTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/SubsequentScavengeTests.cs
deleted file mode 100644
index a0c4d88836b..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/SubsequentScavengeTests.cs
+++ /dev/null
@@ -1,562 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Scavenging;
-using EventStore.Core.XUnit.Tests.Scavenge.Sqlite;
-using Xunit;
-using static EventStore.Core.XUnit.Tests.Scavenge.StreamMetadatas;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	// these tests test that the right steps happen and the right results are obtained when scavenge is
-	// run on a database that has already been scavenged.
-	// a new scavenge point may need to be created, but not necessarily.
-	public class SubsequentScavengeTests : SqliteDbPerTest<SubsequentScavengeTests> {
-		[Fact]
-		public async Task can_create_first_scavenge_point() {
-			// first scavenge creates the first scavenge point SP-1
-			var newScavengePoint = new List<ScavengePoint>();
-			var t = 0;
-			var logger = new FakeTFScavengerLog();
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"))
-					.Chunk())
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.WithLogger(logger)
-				.CancelOnNewScavengePoint(newScavengePoint)
-				.RunAsync();
-
-			Assert.Equal(ScavengeResult.Stopped, logger.Result);
-			Assert.Collection(
-				newScavengePoint,
-				sp => {
-					Assert.Equal(EffectiveNow, sp.EffectiveNow);
-					Assert.Equal(0, sp.EventNumber);
-					Assert.Equal(0, sp.Threshold);
-				});
-		}
-
-		[Fact]
-		public async Task can_create_subsequent_scavenge_point() {
-			// set up some state and some chunks simulating a scavenge that has been completed
-			// and then some new records added. it should create a new SP
-			var newScavengePoint = new List<ScavengePoint>();
-			var t = 0;
-			var logger = new FakeTFScavengerLog();
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						// events 0-4 removed in a previous scavenge
-						Rec.Write(t++, "ab-1", eventNumber: 5))
-					.Chunk(
-						ScavengePointRec(t++))
-					.Chunk(
-						// two new records written since the previous scavenge
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"))
-					.Chunk())
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.WithLogger(logger)
-				.MutateState(x => {
-					x.SetOriginalStreamMetadata("ab-1", MaxCount1);
-					x.SetOriginalStreamDiscardPoints(
-						StreamHandle.ForHash<string>(98),
-						CalculationStatus.Active,
-						DiscardPoint.DiscardBefore(5),
-						DiscardPoint.DiscardBefore(5));
-					x.SetCheckpoint(new ScavengeCheckpoint.Done(ScavengePoint(
-						chunk: 1,
-						eventNumber: 0)));
-				})
-				.CancelOnNewScavengePoint(newScavengePoint)
-				.RunAsync();
-
-			Assert.Equal(ScavengeResult.Stopped, logger.Result);
-			Assert.Collection(
-				newScavengePoint,
-				sp => {
-					Assert.Equal(EffectiveNow, sp.EffectiveNow);
-					Assert.Equal(1, sp.EventNumber);
-					Assert.Equal(0, sp.Threshold);
-				});
-		}
-
-		[Fact]
-		public async Task can_find_existing_scavenge_point() {
-			// set up some state and some chunks simulating a scavenge that has been completed
-			// and then some new records added including a SP. it should perform an an incremental
-			// scavenge using that SP.
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						// events 0-4 removed in a previous scavenge
-						Rec.Write(t++, "ab-1", eventNumber: 5))
-					.Chunk(
-						ScavengePointRec(t++)) // <-- SP-0 scavenged previously
-					.Chunk(
-						// five new records written since the previous scavenge
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"))
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						ScavengePointRec(t++)) // <-- SP-1 added by another node
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						ScavengePointRec(t++)) // <-- SP-2 added by another node
-					.Chunk(
-						Rec.Write(t++, "ab-1"))
-					.CompleteLastChunk())
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.MutateState(x => {
-					x.SetOriginalStreamMetadata("ab-1", MaxCount1);
-					x.SetOriginalStreamDiscardPoints(
-						StreamHandle.ForHash<string>(98),
-						CalculationStatus.Active,
-						DiscardPoint.DiscardBefore(5),
-						DiscardPoint.DiscardBefore(5));
-					x.SetCheckpoint(new ScavengeCheckpoint.Done(ScavengePoint(
-						chunk: 1,
-						eventNumber: 0)));
-					for (int i = 0; i < 6; i++)
-						x.SetChunkTimeStampRange(i, new ChunkTimeStampRange(DateTime.UtcNow, DateTime.UtcNow));
-				})
-				.AssertTrace(
-					Tracer.Line("Accumulating from SP-0 to SP-2"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Accumulating SP-2 done Chunk 1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 2"),
-					Tracer.Line("        Checkpoint: Accumulating SP-2 done Chunk 2"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 3"),
-					Tracer.Line("        Checkpoint: Accumulating SP-2 done Chunk 3"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 4"),
-					Tracer.Line("        Checkpoint: Accumulating SP-2 done Chunk 4"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Calculating SP-2"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Calculating SP-2 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        SetDiscardPoints(98, Active, Discard before 9, Discard before 9)"),
-					Tracer.Line("        Checkpoint: Calculating SP-2 done Hash: 98"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Executing chunks for SP-2"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-2 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Opening Chunk 0-0"),
-					Tracer.Line("    Switched in chunk-000000.000001"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-2 done Chunk 0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-2 done Chunk 1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Opening Chunk 2-2"),
-					Tracer.Line("    Switched in chunk-000002.000001"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-2 done Chunk 2"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Opening Chunk 3-3"),
-					Tracer.Line("    Switched in chunk-000003.000001"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-2 done Chunk 3"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-2 done Chunk 4"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Merging chunks for SP-2"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Merging chunks for SP-2"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Executing index for SP-2"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing index for SP-2"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Cleaning for SP-2"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Cleaning for SP-2"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Cleaning for SP-2"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Begin"),
-					Tracer.Line("    Checkpoint: Done SP-2"),
-					Tracer.Line("Commit"))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(0),
-					x.Recs[1].KeepIndexes(0),
-					x.Recs[2].KeepIndexes(),
-					x.Recs[3].KeepIndexes(1),
-					x.Recs[4].KeepIndexes(0, 1),
-					x.Recs[5].KeepIndexes(0),
-				});
-		}
-
-		// syncOnly prevents a new scavenge point from being created, it only scavenges an existing one.
-		// so we need to check
-		// - that it scavenges as normal if there is one to do
-		// - that it stops successfully if there isn't one at all
-		// - that it stops successfully if it has done all of them.
-		[Fact]
-		public async Task can_sync_only_with_scavenge_point_to_do() {
-			// first scavenge creates the first scavenge point SP-1
-			var newScavengePoint = new List<ScavengePoint>();
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"))
-					.Chunk(ScavengePointRec(t++))) // SP-0
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.WithSyncOnly(true)
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(0, 2),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task can_sync_only_with_no_scavenge_point() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1")))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.WithSyncOnly(true)
-				.AssertTrace()
-				.RunAsync(x => new[] {
-					x.Recs[0], // not scavenged
-				});
-		}
-
-		[Fact]
-		public async Task can_sync_only_with_completed_scavenge_point() {
-			var newScavengePoint = new List<ScavengePoint>();
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(ScavengePointRec(t++)) // SP-0
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1")))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.MutateState(x => {
-					x.SetCheckpoint(new ScavengeCheckpoint.Done(ScavengePoint(
-						chunk: 0,
-						eventNumber: 0)));
-				})
-				.WithSyncOnly(true)
-				.AssertTrace()
-				.RunAsync(x => new[] {
-					x.Recs[0],
-					x.Recs[1], // not scavenged
-				});
-		}
-
-		[Fact]
-		public async Task can_subsequent_scavenge_without_state() {
-			// say we deleted the state, or old scavenge has been run but not new scavenge
-			// so there is no state.
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						// events 0-4 removed in a previous scavenge
-						Rec.Write(t++, "ab-1", eventNumber: 5))
-					.Chunk(
-						ScavengePointRec(t++)) // <-- SP-0 previous scavenge
-					.Chunk(
-						// five new records written since the previous scavenge
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"))
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						ScavengePointRec(t++)) // <-- SP-1 added by another node
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						ScavengePointRec(t++)) // <-- SP-2 added by another node
-					.Chunk(
-						Rec.Write(t++, "ab-1"))
-					.CompleteLastChunk())
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.MutateState(x => {
-				})
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(0),
-					x.Recs[1].KeepIndexes(0),
-					x.Recs[2].KeepIndexes(),
-					x.Recs[3].KeepIndexes(1),
-					x.Recs[4].KeepIndexes(0, 1),
-					x.Recs[5].KeepIndexes(0),
-				});
-		}
-
-		[Fact]
-		public async Task accumulates_from_right_place_sp_in_chunk_0() {
-			// set up as if we have done a scavenge with a SP in chunk 0
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(ScavengePointRec(t++)) // SP-0
-					.Chunk(ScavengePointRec(t++, threshold: 1))) // SP-1
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.MutateState(x => {
-					x.SetCheckpoint(new ScavengeCheckpoint.Done(ScavengePoint(
-						chunk: 0,
-						eventNumber: 0)));
-				})
-				.AssertTrace(
-					Tracer.Line("Accumulating from SP-0 to SP-1"),
-					// the important bit: we start accumulation from the chunk after the SP is in
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Accumulating SP-1 done Chunk 0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 1"),
-					Tracer.Line("        Checkpoint: Accumulating SP-1 done Chunk 1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Calculating SP-1"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Calculating SP-1 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Executing chunks for SP-1"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-1 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-1 done Chunk 0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Merging chunks for SP-1"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Merging chunks for SP-1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Executing index for SP-1"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing index for SP-1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Cleaning for SP-1"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Cleaning for SP-1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Cleaning for SP-1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Begin"),
-					Tracer.Line("    Checkpoint: Done SP-1"),
-					Tracer.Line("Commit"))
-				.RunAsync(x => new[] {
-					x.Recs[0],
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task accumulates_from_right_place_sp_in_chunk_2() {
-			// set up as if we have done a scavenge with a SP in chunk 2
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(ScavengePointRec(t++)) // SP-0
-					.Chunk(ScavengePointRec(t++)) // SP-1
-					.Chunk(ScavengePointRec(t++)) // SP-2
-					.Chunk(ScavengePointRec(t++, threshold: 1))) // SP-3
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.MutateState(x => {
-					x.SetCheckpoint(new ScavengeCheckpoint.Done(ScavengePoint(
-						chunk: 2,
-						eventNumber: 2)));
-				})
-				.AssertTrace(
-					Tracer.Line("Accumulating from SP-2 to SP-3"),
-					// the important bit: we start accumulation from the chunk after the prev SP is in
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Accumulating SP-3 done Chunk 2"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 3"),
-					Tracer.Line("        Checkpoint: Accumulating SP-3 done Chunk 3"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Calculating SP-3"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Calculating SP-3 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Executing chunks for SP-3"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-3 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-3 done Chunk 0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-3 done Chunk 1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-3 done Chunk 2"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Merging chunks for SP-3"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Merging chunks for SP-3"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Executing index for SP-3"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing index for SP-3"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Cleaning for SP-3"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Cleaning for SP-3"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Cleaning for SP-3"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Begin"),
-					Tracer.Line("    Checkpoint: Done SP-3"),
-					Tracer.Line("Commit"))
-				.RunAsync(x => new[] {
-					x.Recs[0],
-					x.Recs[1],
-					x.Recs[2],
-					x.Recs[3],
-				});
-		}
-
-		[Fact]
-		public async Task cannot_move_discard_points_backward() {
-			// scavenge where SP-0 has been run. about to run SP-1
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.Write(t++, "ab-1"), // 0
-						Rec.Write(t++, "ab-1"), // 1
-						Rec.Write(t++, "ab-1")) // 2
-					.Chunk(
-						ScavengePointRec(t++)) // <-- SP-0
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount4),
-						Rec.Write(t++, "ab-1"), // 3
-						Rec.Write(t++, "ab-1")) // 4
-					.Chunk(
-						ScavengePointRec(t++))) // <-- SP-1
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.MutateState(x => {
-					x.DetectCollisions("$$ab-1");
-					x.DetectCollisions("ab-1");
-					x.SetOriginalStreamMetadata("ab-1", MaxCount1);
-					x.SetOriginalStreamDiscardPoints(
-						Scenario.CollideEverything
-							? StreamHandle.ForStreamId("ab-1")
-							: StreamHandle.ForHash<string>(98),
-						CalculationStatus.Active,
-						DiscardPoint.DiscardBefore(2),
-						DiscardPoint.DiscardBefore(2));
-					x.SetCheckpoint(new ScavengeCheckpoint.Done(ScavengePoint(
-						chunk: 1,
-						eventNumber: 0)));
-
-					for (int i = 0; i < 4; i++)
-						x.SetChunkTimeStampRange(i, new ChunkTimeStampRange(DateTime.UtcNow, DateTime.UtcNow));
-				})
-				.AssertState(state => {
-					// we changed the maxcount to 4, but we expect the discard points to remain
-					// where they are rather than moving back to DiscardBefore(1)
-					Assert.True(state.TryGetOriginalStreamData("ab-1", out var data));
-					Assert.Equal(DiscardPoint.DiscardBefore(2), data.DiscardPoint);
-					Assert.Equal(DiscardPoint.DiscardBefore(2), data.MaybeDiscardPoint);
-				})
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(3),
-					x.Recs[1],
-					x.Recs[2],
-					x.Recs[3],
-				});
-		}
-
-		[Fact]
-		public async Task stream_starts_after_scavenge_point() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: TruncateBefore4),
-						ScavengePointRec(t++))
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1")))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0],
-					x.Recs[1],
-				});
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/ThresholdTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/ThresholdTests.cs
deleted file mode 100644
index e4512cd817b..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/ThresholdTests.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.XUnit.Tests.Scavenge.Sqlite;
-using Xunit;
-using static EventStore.Core.XUnit.Tests.Scavenge.StreamMetadatas;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class ThresholdTests : SqliteDbPerTest<ThresholdTests> {
-		[Fact]
-		public async Task negative_threshold_executes_all_chunks() {
-			var threshold = -1;
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					// chunk 0: weight 2
-					.Chunk(
-						Rec.Write(t++, "ab-1"))
-					// chunk 1: weight 4
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"))
-					// chunk 2: weight 0
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						ScavengePointRec(t++, threshold: threshold))
-					.CompleteLastChunk())
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertTrace(
-					Tracer.Line("Accumulating from start to SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 0"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 1"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 2"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 2"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Calculating SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        SetDiscardPoints(98, Active, Discard before 3, Discard before 3)"),
-					Tracer.Line("        Checkpoint: Calculating SP-0 done Hash: 98"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Executing chunks for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Opening Chunk 0-0"),
-					Tracer.Line("    Switched in chunk-000000.000001"), // executed
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 0"),
-					Tracer.Line("    Commit"),
-
-					Tracer.Line("    Opening Chunk 1-1"),
-					Tracer.Line("    Switched in chunk-000001.000001"), // executed
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 1"),
-					Tracer.Line("    Commit"),
-
-					Tracer.Line("    Opening Chunk 2-2"),
-					Tracer.Line("    Switched in chunk-000002.000001"), // executed
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 2"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.AnythingElse)
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(), // executed
-						x.Recs[1].KeepIndexes(), // executed
-						x.Recs[2], // executed
-					},
-					x => new[] {
-						x.Recs[0].KeepIndexes(),
-						x.Recs[1].KeepIndexes(),
-						x.Recs[2],
-					});
-		}
-
-		[Fact]
-		public async Task zero_threshold_executes_all_chunks_with_positive_weight() {
-			var threshold = 0;
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					// chunk 0: weight 2
-					.Chunk(
-						Rec.Write(t++, "ab-1"))
-					// chunk 1: weight 4
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"))
-					// chunk 2: weight 0
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						ScavengePointRec(t++, threshold: threshold))
-					.CompleteLastChunk())
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertTrace(
-					Tracer.Line("Accumulating from start to SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 0"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 1"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Reading Chunk 2"),
-					Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 2"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Calculating SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        SetDiscardPoints(98, Active, Discard before 3, Discard before 3)"),
-					Tracer.Line("        Checkpoint: Calculating SP-0 done Hash: 98"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.Line("Executing chunks for SP-0"),
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done None"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("    Opening Chunk 0-0"),
-					Tracer.Line("    Switched in chunk-000000.000001"), // executed
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 0"),
-					Tracer.Line("    Commit"),
-
-					Tracer.Line("    Opening Chunk 1-1"),
-					Tracer.Line("    Switched in chunk-000001.000001"), // executed
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 1"),
-					Tracer.Line("    Commit"),
-
-					//               no opening or switch, not executed.
-					Tracer.Line("    Begin"),
-					Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 2"),
-					Tracer.Line("    Commit"),
-					Tracer.Line("Done"),
-
-					Tracer.AnythingElse)
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(), // executed
-						x.Recs[1].KeepIndexes(), // executed
-						x.Recs[2], // not executed
-					},
-					x => new[] {
-						x.Recs[0].KeepIndexes(),
-						x.Recs[1].KeepIndexes(),
-						x.Recs[2],
-					});
-		}
-
-		[Fact]
-		public async Task positive_threshold_executes_all_chunks_that_exceed_it() {
-			var threshold = 2;
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					// chunk 0: weight 2
-					.Chunk(
-						Rec.Write(t++, "ab-1"))
-					// chunk 1: weight 4
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"))
-					// chunk 2: weight 0
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
-						ScavengePointRec(t++, threshold: threshold))
-					.CompleteLastChunk())
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new[] {
-						x.Recs[0], // not executed so still has its records
-						x.Recs[1].KeepIndexes(), // executed
-						x.Recs[2], // not executed
-					},
-					x => new[] {
-						x.Recs[0].KeepIndexes(),
-						x.Recs[1].KeepIndexes(),
-						x.Recs[2],
-					});
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/TombstoneTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/TombstoneTests.cs
deleted file mode 100644
index d97aa5775a0..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/TombstoneTests.cs
+++ /dev/null
@@ -1,232 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.XUnit.Tests.Scavenge.Sqlite;
-using Xunit;
-using static EventStore.Core.XUnit.Tests.Scavenge.StreamMetadatas;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class TombstoneTests : SqliteDbPerTest<TombstoneTests> {
-		[Fact]
-		public async Task simple_tombstone() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.CommittedDelete(t++, "ab-1"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(1),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task single_tombstone() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.CommittedDelete(t++, "ab-1"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(0),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task tombstone_with_metadata() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", metadata: MaxCount1),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.CommittedDelete(t++, "ab-1"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertState(state => {
-					Assert.True(state.TryGetOriginalStreamData("ab-1", out _));
-					Assert.False(state.TryGetMetastreamData("$$ab-1", out _));
-				})
-				.RunAsync(x => new[] {
-					// when the stream is hard deleted we can get rid of _all_ the metadata too
-					// do not keep the last metadata record
-					x.Recs[0].KeepIndexes(3),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task tombstone_with_meta_collision() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						// ab-1 has metadata but not tombstone
-						Rec.Write(t++, "$$ab-1", metadata: MaxCount1),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"))
-					.Chunk(
-						// ab-2 is tombstoned
-						Rec.Write(t++, "ab-2"),
-						Rec.Write(t++, "ab-2"),
-						Rec.CommittedDelete(t++, "ab-2"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(0, 2), // "ab-1" keep last event and metadata
-					x.Recs[1].KeepIndexes(2), // "ab-2" keeps tombstone
-					x.Recs[2],
-				});
-		}
-
-		[Fact]
-		public async Task tombstone_in_metadata_stream_not_supported() {
-			// eventstore refuses denies access to write such a tombstone in the first place,
-			// including in ESv5
-			var logger = new FakeTFScavengerLog();
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.CommittedDelete(t++, "$$ab-1"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.WithLogger(logger)
-				.RunAsync();
-
-			Assert.True(logger.Completed);
-			Assert.Equal(EventStore.Core.TransactionLog.Chunks.ScavengeResult.Errored, logger.Result);
-			Assert.Equal("Error while scavenging DB: Found Tombstone in metadata stream $$ab-1.", logger.Error);
-		}
-
-		[Fact]
-		public async Task tombstone_in_transaction_not_supported() {
-			// if we wanted to support this we would have to apply the tombstone at the point that it
-			// gets committed. also chunkexecutor would have to be careful not to discard the tombstone
-			// of a tombstoned stream even though it can discard pretty much everything in transactions
-			// in that case
-			var logger = new FakeTFScavengerLog();
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.TransSt(0, "ab-1"),
-						Rec.Delete(0, "ab-1"))
-					.Chunk(ScavengePointRec(1)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.WithLogger(logger)
-				.RunAsync();
-
-			Assert.True(logger.Completed);
-			Assert.Equal(EventStore.Core.TransactionLog.Chunks.ScavengeResult.Errored, logger.Result);
-			Assert.Equal("Error while scavenging DB: Found Tombstone in transaction in stream ab-1.", logger.Error);
-		}
-
-		[Fact]
-		public async Task tombstone_stream_with_transaction() {
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(0, "ab-1"),
-						Rec.TransSt(1, "ab-1"), // <-- keep transaction start
-						Rec.Prepare(1, "ab-1"),
-						Rec.TransEnd(1, "ab-1"),
-						Rec.Commit(1, "ab-1"), // <-- keep comit
-						Rec.Write(2, "ab-1"),
-						Rec.Write(3, "$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.CommittedDelete(4, "ab-1")) // <-- keep tombstone
-					.Chunk(ScavengePointRec(5)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(1, 4, 7),
-						x.Recs[1],
-					},
-					x => new[] {
-						x.Recs[0].KeepIndexes(7),
-						x.Recs[1],
-					});
-		}
-
-		[Fact]
-		public async Task tombstone_stream_with_transaction_and_unsafe_ignore_hard_deletes() {
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithUnsafeIgnoreHardDeletes(true)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(0, "ab-1"),
-						Rec.TransSt(1, "ab-1"),
-						Rec.Prepare(1, "ab-1"),
-						Rec.TransEnd(1, "ab-1"),
-						Rec.Commit(1, "ab-1"), // <-- keep commit only
-						Rec.Write(2, "ab-1"),
-						Rec.Write(3, "$$ab-1", "$metadata", metadata: MaxCount1),
-						Rec.CommittedDelete(4, "ab-1"))
-					.Chunk(ScavengePointRec(5)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(
-					x => new[] {
-						x.Recs[0].KeepIndexes(4),
-						x.Recs[1],
-					},
-					x => new[] {
-						x.Recs[0].KeepIndexes(),
-						x.Recs[1],
-					});
-		}
-
-		// see comments in EventCalculator.cs
-		[Fact]
-		public async Task int32max_tombstone_with_subsequent_events() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						// old data
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-
-						// int32max tombstone that has not been upgraded in the index
-						Rec.Write(t++, "ab-1",
-							eventType: "$streamDeleted",
-							eventNumber: int.MaxValue,
-							prepareFlags:
-								PrepareFlags.StreamDelete |
-								PrepareFlags.TransactionBegin |
-								PrepareFlags.TransactionEnd |
-								PrepareFlags.IsCommitted),
-
-						// additional data
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertState(state => {
-					// still counted as tombstoned by scavenge
-					Assert.True(state.TryGetOriginalStreamData("ab-1", out var data));
-					Assert.True(data.IsTombstoned);
-				})
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(2, 3, 4), // keep the int32max tombstone
-					x.Recs[1],
-				});
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/TruncateBeforeTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/TruncateBeforeTests.cs
deleted file mode 100644
index 378ed46a31e..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/TruncateBeforeTests.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.XUnit.Tests.Scavenge.Sqlite;
-using Xunit;
-using static EventStore.Core.XUnit.Tests.Scavenge.StreamMetadatas;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	// for testing the truncatebefore functionality specifically
-	public class TruncateBeforeTests : SqliteDbPerTest<TruncateBeforeTests> {
-		[Fact]
-		public async Task simple_truncatebefore() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: TruncateBefore3))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(3, 4),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task keep_last_event() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "$$ab-1", "$metadata", metadata: TruncateBefore4))
-					.Chunk(ScavengePointRec(t++)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(1,2),
-					x.Recs[1],
-				});
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/UnsafeIgnoreHardDeletesTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/UnsafeIgnoreHardDeletesTests.cs
deleted file mode 100644
index 16ea73982d1..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/UnsafeIgnoreHardDeletesTests.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.Scavenging;
-using EventStore.Core.XUnit.Tests.Scavenge.Sqlite;
-using Xunit;
-using static EventStore.Core.XUnit.Tests.Scavenge.StreamMetadatas;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class UnsafeIgnoreHardDeletesTests : SqliteDbPerTest<UnsafeIgnoreHardDeletesTests> {
-		[Fact]
-		public async Task simple_tombstone() {
-			var t = 0;
-			await new Scenario<LogFormat.V2, string>()
-				.WithUnsafeIgnoreHardDeletes()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", metadata: MaxCount1),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.CommittedDelete(t++, "ab-1"))
-					.Chunk(ScavengePointRec(t++, threshold: 1000)))
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.AssertState(state => {
-					Assert.False(state.TryGetOriginalStreamData("ab-1", out _));
-					Assert.False(state.TryGetMetastreamData("$$ab-1", out _));
-				})
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(),
-					x.Recs[1],
-				});
-		}
-
-		[Fact]
-		public async Task tombstone_then_normal_scavenge_then_unsafeharddeletes() {
-			// after the normal scavenge of a tombstoned stream we still need to be
-			// able to remove the tombstone with a unsafeharddeletes scavenge
-
-			// the normal scavenge with the tombstone
-			var t = 0;
-			var scenario = new Scenario<LogFormat.V2, string>();
-			var db = await scenario
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", metadata: MaxCount1),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"),
-						Rec.CommittedDelete(t++, "ab-1"))
-					.Chunk(ScavengePointRec(t++)) // SP-0
-					.Chunk(ScavengePointRec(t++))) // SP-1
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.MutateState(x => {
-					// make it scavenge SP-0
-					x.SetCheckpoint(new ScavengeCheckpoint.Accumulating(
-						ScavengePoint(
-							chunk: 1,
-							eventNumber: 0),
-						doneLogicalChunkNumber: null));
-				})
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(3), // only the tombstone is kept
-					x.Recs[1],
-					x.Recs[2],
-				});
-
-			// the second scavenge with unsafeharddeletes should remove the tombstone
-			await new Scenario<LogFormat.V2, string>()
-				.WithDbPath(Fixture.Directory)
-				.WithDb(db)
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.WithUnsafeIgnoreHardDeletes()
-				.AssertState(state => {
-					Assert.False(state.TryGetOriginalStreamData("ab-1", out _));
-					Assert.False(state.TryGetMetastreamData("$$ab-1", out _));
-				})
-				.RunAsync(x => new[] {
-						x.Recs[0].KeepIndexes(), // tombstone has gone
-						x.Recs[1],
-						x.Recs[2],
-					});
-		}
-
-		[Fact]
-		public async Task normal_scavenge_then_tombstone_then_unsafeharddeletes() {
-			// after the normal scavenge runs and clears the metastreamdatas,
-			// we need to be able to tombstone a stream and still be able to remove
-			// the leftover metadata record.
-
-			// the normal scavenge with the tombstone
-			var t = 0;
-			var scenario = new Scenario<LogFormat.V2, string>();
-			var db = await scenario
-				.WithDbPath(Fixture.Directory)
-				.WithDb(x => x
-					.Chunk(
-						Rec.Write(t++, "$$ab-1", metadata: MaxCount1),
-						Rec.Write(t++, "ab-1"),
-						Rec.Write(t++, "ab-1"))
-					.Chunk(ScavengePointRec(t++)) // SP-0
-					.Chunk(Rec.CommittedDelete(t++, "ab-1"))
-					.Chunk(ScavengePointRec(t++))) // SP-1
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.MutateState(x => {
-					// make it scavenge SP-0
-					x.SetCheckpoint(new ScavengeCheckpoint.Accumulating(
-						ScavengePoint(
-							chunk: 1,
-							eventNumber: 0),
-						doneLogicalChunkNumber: null));
-				})
-				.AssertTrace(
-					Tracer.Line("Accumulating from checkpoint: Accumulating SP-0 done None"),
-					Tracer.AnythingElse)
-				// result of scavenging SP-0
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(0, 2),
-					x.Recs[1],
-					x.Recs[2],
-					x.Recs[3],
-				});
-
-			// the second scavenge with unsafeharddeletes
-			await new Scenario<LogFormat.V2, string>()
-				.WithTracerFrom(scenario)
-				.WithDbPath(Fixture.Directory)
-				.WithDb(db)
-				.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
-				.WithUnsafeIgnoreHardDeletes()
-				.AssertTrace(
-					Tracer.Line("Accumulating from SP-0 to SP-1"),
-					Tracer.AnythingElse)
-				.AssertState(state => {
-					Assert.False(state.TryGetOriginalStreamData("ab-1", out _));
-					Assert.False(state.TryGetMetastreamData("$$ab-1", out _));
-				})
-				.RunAsync(x => new[] {
-					x.Recs[0].KeepIndexes(), // metadata record has gone
-					x.Recs[1],
-					x.Recs[2].KeepIndexes(), // tombstone has gone
-					x.Recs[3],
-				});
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/WeightAccumulatorTests.cs b/src/EventStore.Core.XUnit.Tests/Scavenge/WeightAccumulatorTests.cs
deleted file mode 100644
index 4f8f19e2ef8..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/WeightAccumulatorTests.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.TransactionLog.Scavenging;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Scavenge {
-	public class WeightAccumulatorTests {
-		private readonly WeightAccumulator _sut;
-		private readonly MockIncreaseChunkWeights _state;
-
-		class MockIncreaseChunkWeights : IIncreaseChunkWeights {
-			private readonly Dictionary<int, float> _weights = new Dictionary<int, float>();
-
-			public void IncreaseChunkWeight(int logicalChunkNumber, float extraWeight) {
-				if (!_weights.TryGetValue(logicalChunkNumber, out var w))
-					w = 0;
-				_weights[logicalChunkNumber] = w + extraWeight;
-			}
-
-			public float SumChunkWeights(int from, int to) =>
-				_weights
-					.Where(x => from <= x.Key && x.Key <= to)
-					.Select(x => x.Value)
-					.Sum();
-		}
-
-		public WeightAccumulatorTests() {
-			_state = new MockIncreaseChunkWeights();
-			_sut = new WeightAccumulator(_state);
-		}
-
-		[Fact]
-		public void sanity() {
-			_sut.OnDiscard(0);
-			_sut.OnDiscard(1);
-			_sut.OnMaybeDiscard(0);
-
-			Assert.Equal(0, _state.SumChunkWeights(0, 0));
-			Assert.Equal(0, _state.SumChunkWeights(1, 1));
-
-			_sut.Flush();
-			Assert.Equal(3, _state.SumChunkWeights(0, 0));
-			Assert.Equal(2, _state.SumChunkWeights(1, 1));
-
-			_sut.OnMaybeDiscard(1);
-			_sut.Flush();
-			Assert.Equal(3, _state.SumChunkWeights(0, 0));
-			Assert.Equal(3, _state.SumChunkWeights(1, 1));
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Services/Storage/InMemory/NodeStateListenerServiceTests.cs b/src/EventStore.Core.XUnit.Tests/Services/Storage/InMemory/NodeStateListenerServiceTests.cs
deleted file mode 100644
index 64a32f61d91..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Services/Storage/InMemory/NodeStateListenerServiceTests.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Text.Json;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Core.Services.Storage.InMemory;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Services.Storage.InMemory;
-
-public class NodeStateListenerServiceTests {
-	private readonly NodeStateListenerService _sut;
-	private readonly ChannelReader<Message> _channelReader;
-
-	public NodeStateListenerServiceTests() {
-		var channel = Channel.CreateUnbounded<Message>();
-		_channelReader = channel.Reader;
-		_sut = new NodeStateListenerService(
-			new EnvelopePublisher(new ChannelEnvelope(channel)),
-			new InMemoryLog());
-	}
-
-	[Fact]
-	public async Task notify_state_change() {
-		_sut.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
-		var @event = Assert.IsType<StorageMessage.InMemoryEventCommitted>(await _channelReader.ReadAsync());
-
-		Assert.Equal(SystemStreams.NodeStateStream, @event.Event.EventStreamId);
-		Assert.Equal(NodeStateListenerService.EventType, @event.Event.EventType);
-		Assert.Equal(0, @event.Event.EventNumber);
-		Assert.Equal(JsonSerializer.SerializeToUtf8Bytes(new {
-			State = VNodeState.Leader.ToString(),
-		}), @event.Event.Data.ToArray());
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Services/VNode/NodeStatusTrackerTests.cs b/src/EventStore.Core.XUnit.Tests/Services/VNode/NodeStatusTrackerTests.cs
deleted file mode 100644
index d8f8195ce9b..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Services/VNode/NodeStatusTrackerTests.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System;
-using System.Diagnostics.Metrics;
-using System.Linq;
-using EventStore.Core.Metrics;
-using EventStore.Core.Services.VNode;
-using EventStore.Core.XUnit.Tests.Metrics;
-using Xunit;
-
-namespace EventStore.Core.TransactionLog.Services.VNode {
-	public class NodeStatusTrackerTests : IDisposable {
-		private readonly TestMeterListener<long> _listener;
-		private readonly FakeClock _clock = new();
-		private readonly StatusMetric _metric;
-		private readonly NodeStatusTracker _sut;
-
-		public NodeStatusTrackerTests() {
-			var meter = new Meter($"{typeof(NodeStatusTrackerTests)}");
-			_listener = new TestMeterListener<long>(meter);
-			_metric = new StatusMetric(
-				meter,
-				"eventstore-statuses",
-				_clock);
-			_sut = new NodeStatusTracker(_metric);
-		}
-
-		public void Dispose() {
-			_listener?.Dispose();
-		}
-
-		[Fact]
-		public void can_observe_state_change() {
-			_clock.SecondsSinceEpoch = 500;
-			AssertMeasurements("Initializing", 500);
-
-			_sut.OnStateChange(Data.VNodeState.PreReplica);
-			_clock.SecondsSinceEpoch = 501;
-			AssertMeasurements("PreReplica", 501);
-
-			_sut.OnStateChange(Data.VNodeState.Follower);
-			_clock.SecondsSinceEpoch = 502;
-			AssertMeasurements("Follower", 502);
-		}
-
-		[Fact]
-		public void can_observe_initial() {
-			_clock.SecondsSinceEpoch = 500;
-			_sut.OnStateChange(Data.VNodeState.PreLeader);
-			_sut.OnStateChange(InaugurationManager.ManagerState.BecomingLeader);
-			AssertMeasurements("PreLeader - BecomingLeader", 500);
-
-			_clock.SecondsSinceEpoch = 502;
-			_sut.OnStateChange(InaugurationManager.ManagerState.Idle);
-			AssertMeasurements("PreLeader", 502);
-		}
-
-		[Fact]
-		public void can_observe_waiting_for_chaser() {
-			_clock.SecondsSinceEpoch = 500;
-			_sut.OnStateChange(Data.VNodeState.PreLeader);
-			AssertMeasurements("PreLeader", 500);
-
-			_clock.SecondsSinceEpoch = 502;
-			_sut.OnStateChange(InaugurationManager.ManagerState.WaitingForChaser);
-			AssertMeasurements("PreLeader - WaitingForChaser", 502);
-		}
-
-		[Fact]
-		public void can_observe_writing_epoch() {
-			_clock.SecondsSinceEpoch = 500;
-			_sut.OnStateChange(Data.VNodeState.PreLeader);
-			AssertMeasurements("PreLeader", 500);
-
-			_clock.SecondsSinceEpoch = 502;
-			_sut.OnStateChange(InaugurationManager.ManagerState.WritingEpoch);
-			AssertMeasurements("PreLeader - WritingEpoch", 502);
-		}
-
-		[Fact]
-		public void can_observe_waiting_for_conditions() {
-			_clock.SecondsSinceEpoch = 500;
-			_sut.OnStateChange(Data.VNodeState.PreLeader);
-			AssertMeasurements("PreLeader", 500);
-
-			_clock.SecondsSinceEpoch = 502;
-			_sut.OnStateChange(InaugurationManager.ManagerState.WaitingForConditions);
-			AssertMeasurements("PreLeader - WaitingForConditions", 502);
-		}
-
-		[Fact]
-		public void can_observe_becoming_leader() {
-			_clock.SecondsSinceEpoch = 500;
-			_sut.OnStateChange(Data.VNodeState.PreLeader);
-			AssertMeasurements("PreLeader", 500);
-
-			_clock.SecondsSinceEpoch = 502;
-			_sut.OnStateChange(InaugurationManager.ManagerState.BecomingLeader);
-			AssertMeasurements("PreLeader - BecomingLeader", 502);
-		}
-
-		void AssertMeasurements(string expectedStatus, int expectedValue) {
-			_listener.Observe();
-
-			Assert.Collection(
-				_listener.RetrieveMeasurements("eventstore-statuses"),
-				m => {
-					Assert.Equal(expectedValue, m.Value);
-					Assert.Collection(
-						m.Tags.ToArray(),
-						t => {
-							Assert.Equal("name", t.Key);
-							Assert.Equal("Node", t.Value);
-						},
-						t => {
-							Assert.Equal("status", t.Key);
-							Assert.Equal(expectedStatus, t.Value);
-						});
-				});
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/TransactionLog/Checkpoint/CheckpointMetricTests.cs b/src/EventStore.Core.XUnit.Tests/TransactionLog/Checkpoint/CheckpointMetricTests.cs
deleted file mode 100644
index 61a1169916d..00000000000
--- a/src/EventStore.Core.XUnit.Tests/TransactionLog/Checkpoint/CheckpointMetricTests.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Diagnostics.Metrics;
-using System.Linq;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.XUnit.Tests.Metrics;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.TransactionLog.Checkpoint {
-	public class CheckpointMetricTests {
-		[Fact]
-		public void can_collect() {
-			using var meter = new Meter($"{typeof(CheckpointMetricTests)}");
-			using var listener = new TestMeterListener<long>(meter);
-			var metric = new CheckpointMetric(
-				meter,
-				"eventstore-checkpoints",
-				new InMemoryCheckpoint("checkpoint", 5));
-
-			listener.Observe();
-			Assert.Collection(
-				listener.RetrieveMeasurements("eventstore-checkpoints"),
-				measurement => {
-					Assert.Equal(5, measurement.Value);
-					Assert.Collection(
-						measurement.Tags.ToArray(),
-						tag => {
-							Assert.Equal("name", tag.Key);
-							Assert.Equal("checkpoint", tag.Value);
-						},
-						tag => {
-							Assert.Equal("read", tag.Key);
-							Assert.Equal("non-flushed", tag.Value);
-						});
-				});
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/TransactionLog/Chunks/ChunkFooterTests.cs b/src/EventStore.Core.XUnit.Tests/TransactionLog/Chunks/ChunkFooterTests.cs
deleted file mode 100644
index 91af5a99dc2..00000000000
--- a/src/EventStore.Core.XUnit.Tests/TransactionLog/Chunks/ChunkFooterTests.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.TransactionLog.Chunks;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.TransactionLog.Chunks;
-
-public class ChunkFooterTests {
-	[Theory]
-	[InlineData(false, false)]
-	[InlineData(false, true)]
-	[InlineData(true, false)]
-	[InlineData(true, true)]
-	public void can_round_trip(bool isCompleted, bool isMap12Bytes) {
-		var hash = new byte[ChunkFooter.ChecksumSize];
-		Random.Shared.NextBytes(hash);
-
-		var source = new ChunkFooter(
-			isCompleted: isCompleted,
-			isMap12Bytes: isMap12Bytes,
-			physicalDataSize: Random.Shared.Next(500, 600),
-			logicalDataSize: Random.Shared.Next(600, 700),
-			mapSize: Random.Shared.Next(500, 600).RoundUpToMultipleOf(24),
-			md5Hash: hash);
-
-		var destination = new ChunkFooter(source.AsByteArray());
-
-		Assert.Equal(source.IsCompleted, destination.IsCompleted);
-		Assert.Equal(source.IsMap12Bytes, destination.IsMap12Bytes);
-		Assert.Equal(source.PhysicalDataSize, destination.PhysicalDataSize);
-		Assert.Equal(source.LogicalDataSize, destination.LogicalDataSize);
-		Assert.Equal(source.MapSize, destination.MapSize);
-		Assert.Equal(source.MD5Hash, destination.MD5Hash);
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/TransactionLog/Chunks/TFChunkTrackerTests.cs b/src/EventStore.Core.XUnit.Tests/TransactionLog/Chunks/TFChunkTrackerTests.cs
deleted file mode 100644
index 799d2e36f6f..00000000000
--- a/src/EventStore.Core.XUnit.Tests/TransactionLog/Chunks/TFChunkTrackerTests.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Metrics;
-using System.Linq;
-using EventStore.Core.Metrics;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.XUnit.Tests.Metrics;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.TransactionLog.Chunks;
-
-public class TFChunkTrackerTests : IDisposable {
-	const long WriterCheckpoint = 4_500;
-	const int ChunkSize = 1_000;
-
-	private readonly TFChunkTracker _sut;
-	private readonly TestMeterListener<long> _listener;
-
-	public TFChunkTrackerTests() {
-		var meter = new Meter($"{typeof(TFChunkTrackerTests)}");
-		_listener = new TestMeterListener<long>(meter);
-		var byteMetric = new CounterMetric(meter, "eventstore-io", unit: "bytes");
-		var eventMetric = new CounterMetric(meter, "eventstore-io", unit: "events");
-		var writerCheckpoint = new InMemoryCheckpoint(WriterCheckpoint);
-
-		var readTag = new KeyValuePair<string, object>("activity", "read");
-		_sut = new TFChunkTracker(
-			readDistribution: new LogicalChunkReadDistributionMetric(meter, "chunk-read-distribution", writerCheckpoint, ChunkSize),
-			readBytes: new CounterSubMetric(byteMetric, [readTag]),
-			readEvents: new CounterSubMetric(eventMetric, [readTag]));
-	}
-
-	public void Dispose() {
-		_listener.Dispose();
-	}
-
-	[Fact]
-	public void can_observe_prepare_log() {
-		var prepare = CreatePrepare(
-			data: new byte[5],
-			meta: new byte[5]);
-
-		_sut.OnRead(prepare);
-		_listener.Observe();
-
-		AssertEventsRead(1);
-		AssertBytesRead(10);
-	}
-
-	[Fact]
-	public void disregard_system_log() {
-		var system = CreateSystemRecord();
-		_sut.OnRead(system);
-		_listener.Observe();
-
-		AssertEventsRead(0);
-		AssertBytesRead(0);
-	}
-
-	[Fact]
-	public void disregard_commit_log() {
-		var system = CreateCommit();
-		_sut.OnRead(system);
-		_listener.Observe();
-
-		AssertEventsRead(0);
-		AssertBytesRead(0);
-	}
-
-	[Theory]
-	[InlineData(5_500, -1)]
-	[InlineData(4_501, 0)]
-	[InlineData(4_500, 0)]
-	[InlineData(4_000, 0)]
-	[InlineData(3_999, 1)]
-	[InlineData(3_000, 1)]
-	[InlineData(2_000, 2)]
-	[InlineData(1_000, 3)]
-	[InlineData(999, 4)]
-	[InlineData(1, 4)]
-	[InlineData(0, 4)]
-	public void records_read_distribution(long logPosition, long expectedChunk) {
-		_sut.OnRead(CreatePrepare(data: new byte[5], meta: new byte[5], logPosition: logPosition));
-
-		_listener.Observe();
-		var actual = _listener.RetrieveMeasurements("chunk-read-distribution");
-		Assert.Collection(
-			actual,
-			m => {
-				Assert.Equal(expectedChunk, m.Value);
-				Assert.Empty(m.Tags);
-			});
-	}
-
-	private void AssertEventsRead(long? expectedEventsRead) =>
-		AssertMeasurements("eventstore-io-events", expectedEventsRead);
-
-	private void AssertBytesRead(long? expectedBytesRead) =>
-		AssertMeasurements("eventstore-io-bytes", expectedBytesRead);
-
-	private void AssertMeasurements(string instrumentName, long? expectedValue) {
-		var actual = _listener.RetrieveMeasurements(instrumentName);
-
-		if (expectedValue is null) {
-			Assert.Empty(actual);
-		} else {
-			Assert.Collection(
-				actual,
-				m => {
-					Assert.Equal(expectedValue, m.Value);
-					Assert.Collection(m.Tags.ToArray(), t => {
-						Assert.Equal("activity", t.Key);
-						Assert.Equal("read", t.Value);
-					});
-				});
-		}
-	}
-
-	private static PrepareLogRecord CreatePrepare(byte[] data, byte[] meta, long logPosition = 42) {
-		return new PrepareLogRecord(logPosition, Guid.NewGuid(), Guid.NewGuid(), 42, 42, "tests", null, 42, DateTime.Now,
-			PrepareFlags.Data, "type-test", null, data, meta);
-	}
-
-	private static SystemLogRecord CreateSystemRecord() {
-		return new SystemLogRecord(42, DateTime.Now, SystemRecordType.Epoch, SystemRecordSerialization.Binary, Array.Empty<byte>());
-	}
-
-	private static CommitLogRecord CreateCommit() {
-		return new CommitLogRecord(42, Guid.NewGuid(), 42, DateTime.Now, 42);
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/TransactionLog/LogRecords/PrepareLogRecordViewTests.cs b/src/EventStore.Core.XUnit.Tests/TransactionLog/LogRecords/PrepareLogRecordViewTests.cs
deleted file mode 100644
index a1f92719bd3..00000000000
--- a/src/EventStore.Core.XUnit.Tests/TransactionLog/LogRecords/PrepareLogRecordViewTests.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using System.IO;
-using System.Text;
-using EventStore.Core.TransactionLog.LogRecords;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.TransactionLog.LogRecords {
-	public class PrepareLogRecordViewTests {
-		private PrepareLogRecordView _prepare;
-		private const long LogPosition = 123;
-		private readonly Guid _correlationId = Guid.NewGuid();
-		private readonly Guid _eventId = Guid.NewGuid();
-		private const long TransactionPosition = 456;
-		private const int TransactionOffset = 321;
-		private const string EventStreamId = "test_stream";
-		private const long ExpectedVersion = 789;
-		private readonly DateTime _timestamp = DateTime.Now;
-		private const PrepareFlags Flags = PrepareFlags.SingleWrite;
-		private const string EventType = "test_event_type";
-		private readonly byte[] _data = { 0xDE, 0XAD, 0xC0, 0XDE };
-		private readonly byte[] _metadata = { 0XC0, 0xDE };
-		private const byte Version = 1;
-
-		public PrepareLogRecordViewTests() {
-			var prepare = new PrepareLogRecord(
-				LogPosition,
-				_correlationId,
-				_eventId,
-				TransactionPosition,
-				TransactionOffset,
-				EventStreamId,
-				null,
-				ExpectedVersion,
-				_timestamp,
-				Flags,
-				EventType,
-				null,
-				_data,
-				_metadata,
-				Version);
-
-			using var memoryStream = new MemoryStream();
-			var writer = new BinaryWriter(memoryStream);
-			prepare.WriteTo(writer);
-
-			var recordLen = (int)memoryStream.Length;
-			var record = memoryStream.GetBuffer();
-			_prepare = new PrepareLogRecordView(record, recordLen);
-		}
-
-		[Fact]
-		public void should_have_correct_properties() {
-			Assert.Equal(LogPosition, _prepare.LogPosition);
-			Assert.Equal(_correlationId, _prepare.CorrelationId);
-			Assert.Equal(_eventId, _prepare.EventId);
-			Assert.Equal(TransactionPosition, _prepare.TransactionPosition);
-			Assert.Equal(TransactionOffset, _prepare.TransactionOffset);
-			Assert.True(_prepare.EventStreamId.SequenceEqual(Encoding.UTF8.GetBytes(EventStreamId)));
-			Assert.Equal(ExpectedVersion, _prepare.ExpectedVersion);
-			Assert.Equal(_timestamp, _prepare.TimeStamp);
-			Assert.Equal(Flags, _prepare.Flags);
-			Assert.True(_prepare.Data.SequenceEqual(_data));
-			Assert.True(_prepare.Metadata.SequenceEqual(_metadata));
-			Assert.Equal(Version, _prepare.Version);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/TransactionLog/LogRecords/SizeOnDiskTests.cs b/src/EventStore.Core.XUnit.Tests/TransactionLog/LogRecords/SizeOnDiskTests.cs
deleted file mode 100644
index 71d28f11779..00000000000
--- a/src/EventStore.Core.XUnit.Tests/TransactionLog/LogRecords/SizeOnDiskTests.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Core.TransactionLog.LogRecords;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.TransactionLog.LogRecords {
-	public class SizeOnDiskTests {
-		[Theory]
-		[InlineData(1)]
-		[InlineData(127)] // just before needing an extra byte for the 7bit encoding
-		[InlineData(128)] // just after
-		[InlineData(100_000)]
-		public void size_on_disk_is_correct(int stringLength) {
-			var theString = new string('a', stringLength);
-
-			var prepare = new PrepareLogRecord(
-				logPosition: 123,
-				correlationId: Guid.NewGuid(),
-				eventId: Guid.NewGuid(),
-				transactionPosition: 456,
-				transactionOffset: 321,
-				eventStreamId: theString,
-				eventStreamIdSize: null,
-				expectedVersion: 789,
-				timeStamp: DateTime.Now,
-				flags: PrepareFlags.SingleWrite,
-				eventType: theString,
-				eventTypeSize: null,
-				data: new byte[] { 0xDE, 0XAD, 0xC0, 0XDE },
-				metadata: new byte[] { 0XC0, 0xDE },
-				prepareRecordVersion: 1);
-
-			using var memoryStream = new MemoryStream();
-			var writer = new BinaryWriter(memoryStream);
-			var length = 111;
-
-			writer.Write(length);
-			prepare.WriteTo(writer);
-			writer.Write(length);
-
-			var recordLen = (int)memoryStream.Length;
-
-			Assert.Equal(recordLen, prepare.SizeOnDisk);
-		}
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Transforms/Identity/IdentityDbTransformTests.cs b/src/EventStore.Core.XUnit.Tests/Transforms/Identity/IdentityDbTransformTests.cs
deleted file mode 100644
index d01f39c6f6e..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Transforms/Identity/IdentityDbTransformTests.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Security.Cryptography;
-using EventStore.Core.Transforms.Identity;
-using EventStore.Plugins.Transforms;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Transforms.Identity;
-
-public class IdentityDbTransformTests {
-	private readonly IdentityDbTransform _dbTransform;
-	private readonly IChunkTransform _chunkTransform;
-
-	public IdentityDbTransformTests() {
-		_dbTransform = new IdentityDbTransform();
-		_chunkTransform = _dbTransform.ChunkFactory.CreateTransform(ReadOnlyMemory<byte>.Empty);
-	}
-
-	[Fact]
-	public void db_transform_has_correct_type() => Assert.Equal(TransformType.Identity, _dbTransform.Type);
-
-	[Fact]
-	public void db_transform_has_correct_name() => Assert.Equal("identity", _dbTransform.Name);
-
-	[Fact]
-	public void chunk_factory_has_correct_type() => Assert.Equal(TransformType.Identity, _dbTransform.ChunkFactory.Type);
-
-	[Fact]
-	public void chunk_factory_creates_correct_header() => Assert.Equal(ReadOnlyMemory<byte>.Empty, _dbTransform.ChunkFactory.CreateTransformHeader());
-
-	[Fact]
-	public void chunk_factory_reads_correct_header() => Assert.Equal(ReadOnlyMemory<byte>.Empty, _dbTransform.ChunkFactory.ReadTransformHeader(null!));
-
-	[Fact]
-	public void chunk_transform_properly_transforms_reads() {
-		const int dataSize = 1024;
-
-		var data = new byte[dataSize];
-		RandomNumberGenerator.Fill(data);
-		using var memStream = new MemoryStream(data);
-
-		var transformedStream = _chunkTransform.Read.TransformData(new ChunkDataReadStream(memStream));
-		var transformedData = new byte[dataSize];
-		transformedStream.ReadExactly(transformedData, 0, dataSize);
-
-		Assert.True(data.SequenceEqual(transformedData));
-	}
-
-	[Fact]
-	public void chunk_transform_properly_transforms_writes() {
-		const int dataSize = 2000;
-		const int footerSize = 10;
-		const int alignmentSize = 1024;
-
-		var data = new byte[dataSize];
-		RandomNumberGenerator.Fill(data);
-
-		var footer = new byte[footerSize];
-		RandomNumberGenerator.Fill(footer);
-
-		var alignedSize = GetAlignedSize(dataSize + footerSize, alignmentSize);
-		var paddingSize = alignedSize - dataSize - footerSize;
-
-		using var md5 = MD5.Create();
-		var transformedData = new byte[alignedSize];
-		using var stream = new MemoryStream(transformedData);
-		var transformedStream = _chunkTransform.Write.TransformData(new ChunkDataWriteStream(stream, md5));
-
-		transformedStream.Write(data);
-		_chunkTransform.Write.CompleteData(footerSize, alignmentSize);
-		_chunkTransform.Write.WriteFooter(footer, out var fileSize);
-		md5.TransformFinalBlock(footer, 0, footerSize);
-
-		Assert.Equal(alignedSize, fileSize);
-		Assert.True(data.SequenceEqual(transformedData[..dataSize]));
-		Assert.True(new byte[paddingSize].SequenceEqual(transformedData[dataSize..^footerSize]));
-		Assert.True(footer.SequenceEqual(transformedData[^footerSize..]));
-		Assert.Equal(md5.Hash, MD5.HashData(transformedData));
-	}
-
-	private static int GetAlignedSize(int size, int alignment) {
-		if (size % alignment == 0)
-			return size;
-
-		return ((size / alignment) + 1) * alignment;
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Util/FunctionsTests.cs b/src/EventStore.Core.XUnit.Tests/Util/FunctionsTests.cs
deleted file mode 100644
index 0a27d355399..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Util/FunctionsTests.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using EventStore.Core.Util;
-using EventStore.Core.XUnit.Tests.Metrics;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Util;
-
-public class FunctionsTests {
-	[Fact]
-	public void sanity_check() {
-		var clock = new FakeClock();
-		clock.SecondsSinceEpoch = 12345;
-		var calls = 0;
-		var f = () => ++calls;
-		var debounced = f.Debounce(TimeSpan.FromSeconds(5), clock);
-
-		// no calls to begin with
-		Assert.Equal(0, calls);
-
-		// calls in the first place
-		Assert.Equal(1, debounced());
-
-
-		// cached for second call
-		Assert.Equal(1, debounced());
-
-		// still cached after some time has passed
-		clock.AdvanceSeconds(3);
-		Assert.Equal(1, debounced());
-
-		// called again after more time has passed.
-		clock.AdvanceSeconds(3);
-		Assert.Equal(2, debounced());
-	}
-}
diff --git a/src/EventStore.Core.XUnit.Tests/Utils/NumberExtensionsTests.cs b/src/EventStore.Core.XUnit.Tests/Utils/NumberExtensionsTests.cs
deleted file mode 100644
index 4c4425289d1..00000000000
--- a/src/EventStore.Core.XUnit.Tests/Utils/NumberExtensionsTests.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using EventStore.Common.Utils;
-using Xunit;
-
-namespace EventStore.Core.XUnit.Tests.Utils {
-	public class NumberExtensionsTests {
-		[Fact]
-		public void CanRoundUp() {
-			Assert.Equal(0, 0L.RoundUpToMultipleOf(4));
-			Assert.Equal(4, 1L.RoundUpToMultipleOf(4));
-			Assert.Equal(4, 2L.RoundUpToMultipleOf(4));
-			Assert.Equal(4, 3L.RoundUpToMultipleOf(4));
-			Assert.Equal(4, 4L.RoundUpToMultipleOf(4));
-			Assert.Equal(8, 5L.RoundUpToMultipleOf(4));
-		}
-
-		[Fact]
-		public void CanRoundDown() {
-			Assert.Equal(0, 3L.RoundDownToMultipleOf(4));
-			Assert.Equal(4, 4L.RoundDownToMultipleOf(4));
-			Assert.Equal(4, 5L.RoundDownToMultipleOf(4));
-			Assert.Equal(4, 6L.RoundDownToMultipleOf(4));
-			Assert.Equal(4, 7L.RoundDownToMultipleOf(4));
-			Assert.Equal(8, 8L.RoundDownToMultipleOf(4));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Authentication/AuthenticationProviderFactory.cs b/src/EventStore.Core/Authentication/AuthenticationProviderFactory.cs
deleted file mode 100644
index 166f84899bb..00000000000
--- a/src/EventStore.Core/Authentication/AuthenticationProviderFactory.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using EventStore.Plugins.Authentication;
-
-namespace EventStore.Core.Authentication {
-	public class AuthenticationProviderFactory {
-		private readonly Func<AuthenticationProviderFactoryComponents, IAuthenticationProviderFactory>
-			_authenticationProviderFactory;
-
-		public AuthenticationProviderFactory(
-			Func<AuthenticationProviderFactoryComponents, IAuthenticationProviderFactory>
-				authenticationProviderFactory) {
-			_authenticationProviderFactory = authenticationProviderFactory;
-		}
-
-		public IAuthenticationProviderFactory GetFactory(
-			AuthenticationProviderFactoryComponents authenticationProviderFactoryComponents) =>
-			_authenticationProviderFactory(authenticationProviderFactoryComponents);
-	}
-}
diff --git a/src/EventStore.Core/Authentication/AuthenticationProviderFactoryComponents.cs b/src/EventStore.Core/Authentication/AuthenticationProviderFactoryComponents.cs
deleted file mode 100644
index eb4933b1abd..00000000000
--- a/src/EventStore.Core/Authentication/AuthenticationProviderFactoryComponents.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using EventStore.Core.Bus;
-using EventStore.Core.Services;
-using EventStore.Core.Services.Transport.Http;
-
-namespace EventStore.Core.Authentication;
-
-public record AuthenticationProviderFactoryComponents {
-	public IPublisher MainQueue { get; init; }
-	public ISubscriber MainBus { get; init; }
-	public IPublisher WorkersQueue { get; init; }
-	public InMemoryBus[] WorkerBuses { get; init; }
-	public HttpSendService HttpSendService { get; init; }
-	public IHttpService HttpService { get; init; }
-}
diff --git a/src/EventStore.Core/Authentication/DelegatedAuthentication/DelegatedClaimsIdentity.cs b/src/EventStore.Core/Authentication/DelegatedAuthentication/DelegatedClaimsIdentity.cs
deleted file mode 100644
index 2484816f273..00000000000
--- a/src/EventStore.Core/Authentication/DelegatedAuthentication/DelegatedClaimsIdentity.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-
-namespace EventStore.Core.Authentication.DelegatedAuthentication;
-
-public class DelegatedClaimsIdentity(IReadOnlyDictionary<string, string> tokens) :
-	ClaimsIdentity(tokens.Select(pair => new Claim(pair.Key, pair.Value)));
diff --git a/src/EventStore.Core/Authentication/InternalAuthentication/AllUsersReader.cs b/src/EventStore.Core/Authentication/InternalAuthentication/AllUsersReader.cs
deleted file mode 100644
index 136a8094ea5..00000000000
--- a/src/EventStore.Core/Authentication/InternalAuthentication/AllUsersReader.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.UserManagement;
-
-namespace EventStore.Core.Authentication.InternalAuthentication {
-	public class AllUsersReader {
-		private const string UserEventType = "$User";
-		private const string UserStreamPrefix = "$user-";
-		private readonly IODispatcher _ioDispatcher;
-		private readonly List<UserManagementMessage.UserData> _results = new List<UserManagementMessage.UserData>();
-		private Action<UserManagementMessage.Error, UserManagementMessage.UserData[]> _onCompleted;
-		private bool _aborted;
-
-		public AllUsersReader(IODispatcher ioDispatcher) {
-			_ioDispatcher = ioDispatcher;
-		}
-
-		public void Run(Action<UserManagementMessage.Error, UserManagementMessage.UserData[]> completed) {
-			if (completed == null) throw new ArgumentNullException(nameof(completed));
-			if (_onCompleted != null) throw new InvalidOperationException("AllUsersReader cannot be re-used");
-
-			_onCompleted = completed;
-
-			BeginReadForward(0);
-		}
-
-		private void BeginReadForward(long fromEventNumber) {
-			_ioDispatcher.ReadForward(
-				"$users", fromEventNumber, 1, false, SystemAccounts.System, ReadUsersForwardCompleted);
-		}
-
-		private void ReadUsersForwardCompleted(ClientMessage.ReadStreamEventsForwardCompleted result) {
-			if (_aborted)
-				return;
-			switch (result.Result) {
-				case ReadStreamResult.Success:
-					foreach (var loginName in from eventData in result.Events
-						let @event = eventData.Event
-						where @event.EventType == UserEventType
-						let stringData = Helper.UTF8NoBom.GetString(@event.Data.Span)
-						select stringData)
-						BeginReadUserDetails(loginName, () => {
-							if (!result.IsEndOfStream)
-								BeginReadForward(result.NextEventNumber);
-							else
-								TryComplete();
-						});
-
-					break;
-				case ReadStreamResult.NoStream:
-					Abort(UserManagementMessage.Error.NotFound);
-					break;
-				default:
-					Abort(UserManagementMessage.Error.Error);
-					break;
-			}
-		}
-
-		private void Abort(UserManagementMessage.Error error) {
-			_onCompleted(error, null);
-			_onCompleted = null;
-			_aborted = true;
-		}
-
-		private void BeginReadUserDetails(string loginName, Action next) {
-			_ioDispatcher.ReadBackward(
-				UserStreamPrefix + loginName, -1, 1, false, SystemAccounts.System,
-				result => {
-					ReadUserDetailsBackwardCompleted(loginName, result);
-					next();
-				});
-		}
-
-		private void ReadUserDetailsBackwardCompleted(
-			string loginName, ClientMessage.ReadStreamEventsBackwardCompleted result) {
-			if (_aborted)
-				return;
-			switch (result.Result) {
-				case ReadStreamResult.Success:
-					if (_results.Any(x => x.LoginName == loginName)) break;
-					if (result.Events.Length != 1) {
-						AddLoadedUserDetails(loginName, "", new string[] { }, true, null);
-					} else {
-						try {
-							var eventRecord = result.Events[0].Event;
-							var userData = eventRecord.Data.ParseJson<UserData>();
-							AddLoadedUserDetails(
-								userData.LoginName, userData.FullName, userData.Groups, userData.Disabled,
-								new DateTimeOffset(eventRecord.TimeStamp, TimeSpan.FromHours(0)));
-						} catch {
-							Abort(UserManagementMessage.Error.Error);
-						}
-					}
-
-					break;
-				case ReadStreamResult.NoStream:
-					break;
-				case ReadStreamResult.StreamDeleted:
-					// ignore - deleted
-					break;
-				default:
-					Abort(UserManagementMessage.Error.Error);
-					break;
-			}
-		}
-
-		private void TryComplete() {
-			if (!_aborted)
-				_onCompleted(UserManagementMessage.Error.Success, _results.ToArray());
-		}
-
-		private void AddLoadedUserDetails(
-			string loginName, string fullName, string[] groups, bool disabled, DateTimeOffset? dateLastUpdated) {
-			_results.Add(new UserManagementMessage.UserData(loginName, fullName, groups, disabled, dateLastUpdated));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Authentication/InternalAuthentication/PasswordHashAlgorithm.cs b/src/EventStore.Core/Authentication/InternalAuthentication/PasswordHashAlgorithm.cs
deleted file mode 100644
index befb3f5e3b1..00000000000
--- a/src/EventStore.Core/Authentication/InternalAuthentication/PasswordHashAlgorithm.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.Core.Authentication.InternalAuthentication;
-
-public abstract class PasswordHashAlgorithm {
-	public abstract void Hash(string password, out string hash, out string salt);
-	public abstract bool Verify(string password, string hash, string salt);
-}
diff --git a/src/EventStore.Core/Authentication/PassthroughAuthentication/PassthroughAuthenticationProvider.cs b/src/EventStore.Core/Authentication/PassthroughAuthentication/PassthroughAuthenticationProvider.cs
deleted file mode 100644
index 68096ab3cf0..00000000000
--- a/src/EventStore.Core/Authentication/PassthroughAuthentication/PassthroughAuthenticationProvider.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-#nullable enable
-
-using System.Collections.Generic;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Plugins.Authentication;
-
-namespace EventStore.Core.Authentication.PassthroughAuthentication;
-
-public class PassthroughAuthenticationProvider() : AuthenticationProviderBase(name: "insecure")  {
-	public override void Authenticate(AuthenticationRequest authenticationRequest) =>
-		authenticationRequest.Authenticated(SystemAccounts.System);
-
-	public override IReadOnlyList<string> GetSupportedAuthenticationSchemes() => ["Insecure"];
-}
diff --git a/src/EventStore.Core/Authentication/PassthroughAuthentication/PassthroughAuthenticationProviderFactory.cs b/src/EventStore.Core/Authentication/PassthroughAuthentication/PassthroughAuthenticationProviderFactory.cs
deleted file mode 100644
index 03c1c0fb2aa..00000000000
--- a/src/EventStore.Core/Authentication/PassthroughAuthentication/PassthroughAuthenticationProviderFactory.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using EventStore.Plugins.Authentication;
-
-namespace EventStore.Core.Authentication.PassthroughAuthentication;
-
-public class PassthroughAuthenticationProviderFactory : IAuthenticationProviderFactory {
-	public IAuthenticationProvider Build(bool logFailedAuthenticationAttempts) => new PassthroughAuthenticationProvider();
-}
diff --git a/src/EventStore.Core/Authorization/AllowAnonymousAssertion.cs b/src/EventStore.Core/Authorization/AllowAnonymousAssertion.cs
deleted file mode 100644
index daf6edaad74..00000000000
--- a/src/EventStore.Core/Authorization/AllowAnonymousAssertion.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Security.Claims;
-using System.Threading.Tasks;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Authorization {
-	internal class AllowAnonymousAssertion : IAssertion {
-		public Grant Grant { get; } = Grant.Allow;
-
-		public AssertionInformation Information { get; } =
-			new AssertionInformation("authenticated", "not anonymous", Grant.Unknown);
-
-		public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
-			EvaluationContext context) {
-			context.Add(new AssertionMatch(policy, new AssertionInformation("match", "allow anonymous", Grant.Allow)));
-			return new ValueTask<bool>(true);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Authorization/AndAssertion.cs b/src/EventStore.Core/Authorization/AndAssertion.cs
deleted file mode 100644
index 0daee88984a..00000000000
--- a/src/EventStore.Core/Authorization/AndAssertion.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Authorization {
-	internal class AndAssertion : IAssertion {
-		private readonly ReadOnlyMemory<IAssertion> _assertions;
-		private readonly AssertionInformation _failedToMatchAllSubAssertions;
-
-		public AndAssertion(params IAssertion[] assertions) {
-			_assertions = assertions.OrderBy(x => x.Grant).ToArray();
-			_failedToMatchAllSubAssertions = new AssertionInformation("and",
-				$"({string.Join(",", _assertions.Span.ToArray().Select(x => x.ToString()))})", Grant.Deny);
-			Information = new AssertionInformation("and",
-				$"({string.Join(",", _assertions.ToArray().Select(x => x.ToString()))})", Grant.Unknown);
-		}
-
-		public AssertionInformation Information { get; }
-
-		public Grant Grant { get; } = Grant.Unknown;
-
-		public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
-			EvaluationContext context) {
-			var remaining = _assertions;
-			while (!remaining.IsEmpty && context.Grant != Grant.Deny) {
-				var pending = remaining.Span[0].Evaluate(cp, operation, policy, context);
-				remaining = remaining.Slice(1);
-				if (!pending.IsCompleted)
-					return EvaluateAsync(pending, remaining, cp, operation, policy, context);
-				if (!pending.Result) {
-					context.Add(new AssertionMatch(policy, _failedToMatchAllSubAssertions));
-					return new ValueTask<bool>(false);
-				}
-			}
-
-			return new ValueTask<bool>(true);
-		}
-
-		private async ValueTask<bool> EvaluateAsync(ValueTask<bool> pending, ReadOnlyMemory<IAssertion> remaining,
-			ClaimsPrincipal cp, Operation operation, PolicyInformation policy, EvaluationContext result) {
-			bool evaluated;
-			while ((evaluated = await pending) && !remaining.IsEmpty) {
-				pending = remaining.Span[0].Evaluate(cp, operation, policy, result);
-				remaining = remaining.Slice(1);
-			}
-
-			if (!evaluated)
-				result.Add(new AssertionMatch(policy, _failedToMatchAllSubAssertions));
-			return evaluated;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Authorization/AssertionComparer.cs b/src/EventStore.Core/Authorization/AssertionComparer.cs
deleted file mode 100644
index f514d50e64f..00000000000
--- a/src/EventStore.Core/Authorization/AssertionComparer.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace EventStore.Core.Authorization {
-	public sealed class AssertionComparer : IComparer<IAssertion> {
-		private static readonly MethodInfo OpenTypeComparer =
-			new Func<IAssertion, IAssertion, int>(Compare<object>).Method.GetGenericMethodDefinition();
-
-		private AssertionComparer() { }
-
-		public static IComparer<IAssertion> Instance { get; } = new AssertionComparer();
-
-		public int Compare(IAssertion x, IAssertion y) {
-			var grant = x.Grant.CompareTo(y.Grant);
-			if (grant != 0) return grant * -1;
-
-			var type = Comparer<Type>.Default.Compare(x.GetType(), y.GetType());
-			if (type != 0) return type;
-
-			var closed = (Func<IAssertion, IAssertion, int>)OpenTypeComparer.MakeGenericMethod(x.GetType())
-				.CreateDelegate(typeof(Func<IAssertion, IAssertion, int>));
-			return closed(x, y);
-		}
-
-		private static int Compare<T>(IAssertion x, IAssertion y) {
-			if (x is IComparable<T> comparable)
-				return comparable.CompareTo((T)y);
-			throw new NotSupportedException(
-				"Assertion classes must implement IComparable<T> where T is the Assertion class");
-		}
-	}
-}
diff --git a/src/EventStore.Core/Authorization/AssertionInformation.cs b/src/EventStore.Core/Authorization/AssertionInformation.cs
deleted file mode 100644
index 577090e330e..00000000000
--- a/src/EventStore.Core/Authorization/AssertionInformation.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace EventStore.Core.Authorization {
-	public struct AssertionInformation {
-		public Grant Grant { get; }
-		private readonly string _assertion;
-
-		public AssertionInformation(string type, string assertion, Grant grant) {
-			Grant = grant;
-			_assertion = $"{type}:{assertion}:{grant}";
-		}
-
-		public override string ToString() {
-			return _assertion;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Authorization/AssertionMatch.cs b/src/EventStore.Core/Authorization/AssertionMatch.cs
deleted file mode 100644
index 6d8f2d9a89d..00000000000
--- a/src/EventStore.Core/Authorization/AssertionMatch.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-
-namespace EventStore.Core.Authorization {
-	public readonly struct AssertionMatch {
-		public readonly PolicyInformation Policy;
-		public readonly AssertionInformation Assertion;
-		public readonly IReadOnlyList<Claim> Matches;
-
-		public AssertionMatch(PolicyInformation policy, AssertionInformation assertion, params Claim[] matches) : this(
-			policy, assertion, (IReadOnlyList<Claim>)matches) {
-		}
-
-		public AssertionMatch(PolicyInformation policy, AssertionInformation assertion, IReadOnlyList<Claim> matches) {
-			Policy = policy;
-			Assertion = assertion;
-			Matches = matches;
-		}
-
-		public override string ToString() {
-			return $"{Policy} : {Assertion}, ${string.Join(Environment.NewLine + "\t", Matches)}";
-		}
-	}
-}
diff --git a/src/EventStore.Core/Authorization/AuthorizationProviderFactory.cs b/src/EventStore.Core/Authorization/AuthorizationProviderFactory.cs
deleted file mode 100644
index 984624e6877..00000000000
--- a/src/EventStore.Core/Authorization/AuthorizationProviderFactory.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Authorization {
-	public class AuthorizationProviderFactory {
-		private readonly Func<AuthorizationProviderFactoryComponents, IAuthorizationProviderFactory>
-			_authorizationProviderFactory;
-
-		public AuthorizationProviderFactory(
-			Func<AuthorizationProviderFactoryComponents, IAuthorizationProviderFactory>
-				authorizationProviderFactory) {
-			_authorizationProviderFactory = authorizationProviderFactory;
-		}
-
-		public IAuthorizationProviderFactory GetFactory(
-			AuthorizationProviderFactoryComponents authorizationProviderFactoryComponents) =>
-			_authorizationProviderFactory(authorizationProviderFactoryComponents);
-	}
-}
diff --git a/src/EventStore.Core/Authorization/AuthorizationProviderFactoryComponents.cs b/src/EventStore.Core/Authorization/AuthorizationProviderFactoryComponents.cs
deleted file mode 100644
index 78d09da43b0..00000000000
--- a/src/EventStore.Core/Authorization/AuthorizationProviderFactoryComponents.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using EventStore.Core.Bus;
-
-namespace EventStore.Core.Authorization {
-	public class AuthorizationProviderFactoryComponents {
-		public IPublisher MainQueue { get; set; }
-		public ISubscriber MainBus { get; set; }
-	}
-}
diff --git a/src/EventStore.Core/Authorization/ClaimMatchAssertion.cs b/src/EventStore.Core/Authorization/ClaimMatchAssertion.cs
deleted file mode 100644
index 0b87def376f..00000000000
--- a/src/EventStore.Core/Authorization/ClaimMatchAssertion.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Authorization {
-	public class ClaimMatchAssertion : IComparable<ClaimMatchAssertion>, IAssertion {
-		private readonly Claim _claim;
-
-		public ClaimMatchAssertion(Grant grant, Claim claim) {
-			_claim = claim;
-			Grant = grant;
-			Information = new AssertionInformation("equal", _claim.ToString(), grant);
-		}
-
-		public AssertionInformation Information { get; }
-
-		public Grant Grant { get; }
-
-		public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
-			EvaluationContext context) {
-			// ReSharper disable once PatternAlwaysOfType
-			if (cp.FindFirst(x =>
-				string.Equals(x.Type, _claim.Type, StringComparison.Ordinal) &&
-				string.Equals(x.Value, _claim.Value, StringComparison.Ordinal)) is Claim matched) {
-				context.Add(new AssertionMatch(policy, Information, matched));
-				return new ValueTask<bool>(true);
-			}
-
-			return new ValueTask<bool>(false);
-		}
-
-		public int CompareTo(ClaimMatchAssertion other) {
-			if (other == null)
-				throw new ArgumentNullException(nameof(other));
-
-			var grant = Grant.CompareTo(other.Grant);
-			if (grant != 0)
-				return grant * -1;
-			var type = string.CompareOrdinal(_claim.Type, other._claim.Type);
-			if (type != 0)
-				return type;
-			return string.CompareOrdinal(_claim.Value, other._claim.Value);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Authorization/ClaimValueMatchesParameterValueAssertion.cs b/src/EventStore.Core/Authorization/ClaimValueMatchesParameterValueAssertion.cs
deleted file mode 100644
index e0572f405b8..00000000000
--- a/src/EventStore.Core/Authorization/ClaimValueMatchesParameterValueAssertion.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Authorization {
-	public class ClaimValueMatchesParameterValueAssertion : IAssertion {
-		private readonly string _claimType;
-		private readonly string _parameterName;
-
-		public ClaimValueMatchesParameterValueAssertion(string claimType, string parameterName, Grant grant) {
-			_claimType = claimType;
-			_parameterName = parameterName;
-			Grant = grant;
-			Information = new AssertionInformation("match", $"{_claimType} : {_parameterName}", Grant);
-		}
-
-		public AssertionInformation Information { get; }
-		public Grant Grant { get; }
-
-		public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
-			EvaluationContext context) {
-			if (cp.FindFirst(_claimType) is Claim matchedClaim &&
-			    operation.Parameters.Span.Contains(new Parameter(_parameterName, matchedClaim.Value))) {
-				context.Add(new AssertionMatch(policy, Information, matchedClaim));
-				return new ValueTask<bool>(true);
-			}
-
-			return new ValueTask<bool>(false);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Authorization/EvaluationContext.cs b/src/EventStore.Core/Authorization/EvaluationContext.cs
deleted file mode 100644
index c883efa0c17..00000000000
--- a/src/EventStore.Core/Authorization/EvaluationContext.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Collections.Generic;
-using System.Threading;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Authorization {
-	public class EvaluationContext {
-		private readonly List<AssertionMatch> _matches;
-		private readonly Operation _operation;
-
-		public EvaluationContext(Operation operation, CancellationToken cancellationToken) {
-			CancellationToken = cancellationToken;
-			_operation = operation;
-			_matches = new List<AssertionMatch>();
-			Grant = Grant.Unknown;
-		}
-
-		public CancellationToken CancellationToken { get; }
-		public Grant Grant { get; private set; }
-
-		public void Add(AssertionMatch match) {
-			if (match.Assertion.Grant > Grant)
-				Grant = match.Assertion.Grant;
-			_matches.Add(match);
-		}
-
-		public EvaluationResult ToResult() {
-			return new EvaluationResult(_operation, Grant, _matches);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Authorization/EvaluationResult.cs b/src/EventStore.Core/Authorization/EvaluationResult.cs
deleted file mode 100644
index 5341e72695e..00000000000
--- a/src/EventStore.Core/Authorization/EvaluationResult.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Authorization {
-	public readonly struct EvaluationResult {
-		public readonly Grant Grant;
-		public readonly Operation Operation;
-		public readonly IReadOnlyList<AssertionMatch> Matches;
-
-		public EvaluationResult(Operation operation, Grant grant, params AssertionMatch[] matches) : this(operation,
-			grant, (IReadOnlyList<AssertionMatch>)matches) {
-		}
-
-		public EvaluationResult(Operation operation, Grant grant, IReadOnlyList<AssertionMatch> matches) {
-			Grant = grant;
-			Matches = matches;
-			Operation = operation;
-		}
-
-		public override string ToString() {
-			return $"{Operation} {Grant} : {string.Join(Environment.NewLine, Matches)}";
-		}
-	}
-}
diff --git a/src/EventStore.Core/Authorization/Grant.cs b/src/EventStore.Core/Authorization/Grant.cs
deleted file mode 100644
index 80119aaeb77..00000000000
--- a/src/EventStore.Core/Authorization/Grant.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EventStore.Core.Authorization {
-	public enum Grant {
-		Unknown = 0,
-		Allow = 1,
-		Deny = 2
-	}
-}
diff --git a/src/EventStore.Core/Authorization/IAssertion.cs b/src/EventStore.Core/Authorization/IAssertion.cs
deleted file mode 100644
index f5a0b5f9669..00000000000
--- a/src/EventStore.Core/Authorization/IAssertion.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Security.Claims;
-using System.Threading.Tasks;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Authorization {
-	public interface IAssertion {
-		Grant Grant { get; }
-		AssertionInformation Information { get; }
-
-		ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
-			EvaluationContext context);
-	}
-}
diff --git a/src/EventStore.Core/Authorization/IPolicyEvaluator.cs b/src/EventStore.Core/Authorization/IPolicyEvaluator.cs
deleted file mode 100644
index a4e2fa5bd17..00000000000
--- a/src/EventStore.Core/Authorization/IPolicyEvaluator.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Authorization {
-	public interface IPolicyEvaluator {
-		ValueTask<EvaluationResult> EvaluateAsync(ClaimsPrincipal cp, Operation operation,
-			CancellationToken cancellationToken);
-	}
-}
diff --git a/src/EventStore.Core/Authorization/IStreamPermissionAssertion.cs b/src/EventStore.Core/Authorization/IStreamPermissionAssertion.cs
deleted file mode 100644
index 7097147bef0..00000000000
--- a/src/EventStore.Core/Authorization/IStreamPermissionAssertion.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace EventStore.Core.Authorization;
-
-public interface IStreamPermissionAssertion : IAssertion {
-}
diff --git a/src/EventStore.Core/Authorization/InternalAuthorizationProviderFactory.cs b/src/EventStore.Core/Authorization/InternalAuthorizationProviderFactory.cs
deleted file mode 100644
index 01361ed6b82..00000000000
--- a/src/EventStore.Core/Authorization/InternalAuthorizationProviderFactory.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Authorization {
-	public class InternalAuthorizationProviderFactory : IAuthorizationProviderFactory {
-		private readonly IPolicySelector[] _policySelectors;
-
-		public InternalAuthorizationProviderFactory(IPolicySelector[] policySelectors) {
-			_policySelectors = policySelectors;
-		}
-
-		public IAuthorizationProvider Build() {
-			return new PolicyAuthorizationProvider(
-			new MultiPolicyEvaluator(_policySelectors), logAuthorization: true, logSuccesses: false);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Authorization/LegacyStreamPermissionAssertion.cs b/src/EventStore.Core/Authorization/LegacyStreamPermissionAssertion.cs
deleted file mode 100644
index 5ff8107515f..00000000000
--- a/src/EventStore.Core/Authorization/LegacyStreamPermissionAssertion.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-using System;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Authorization {
-	public class
-		LegacyStreamPermissionAssertion : IStreamPermissionAssertion {
-		private readonly IPublisher _publisher;
-
-		public LegacyStreamPermissionAssertion(IPublisher publisher) {
-			_publisher = publisher;
-		}
-
-		public AssertionInformation Information { get; } =
-			new AssertionInformation("stream", "legacy acl", Grant.Unknown);
-
-		public Grant Grant { get; } = Grant.Unknown;
-
-		public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
-			EvaluationContext context) {
-			var streamId = FindStreamId(operation.Parameters.Span, context.CancellationToken);
-
-			if (streamId.IsCompleted)
-				return CheckStreamAccess(cp, operation, policy, context, streamId.Result);
-			return CheckStreamAccessAsync(streamId, cp, operation, policy, context);
-		}
-
-		private async ValueTask<bool> CheckStreamAccessAsync(ValueTask<string> pending, ClaimsPrincipal cp,
-			Operation operation, PolicyInformation policy, EvaluationContext result) {
-			var streamId = await pending;
-			return await CheckStreamAccess(cp, operation, policy, result, streamId);
-		}
-
-		private ValueTask<bool> CheckStreamAccess(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
-			EvaluationContext context, string streamId) {
-			if (streamId == null) {
-				context.Add(new AssertionMatch(policy,
-					new AssertionInformation("streamId", "streamId is null", Grant.Deny)));
-				return new ValueTask<bool>(true);
-			}
-
-			if (streamId == "")
-				streamId = SystemStreams.AllStream;
-			if (streamId == SystemStreams.AllStream &&
-			    (operation == Operations.Streams.Delete || operation == Operations.Streams.Write)) {
-				context.Add(new AssertionMatch(policy,
-					new AssertionInformation("streamId", $"{operation.Action} denied on $all", Grant.Deny)));
-				return new ValueTask<bool>(true);
-			}
-
-			var action = operation.Action;
-			if (SystemStreams.IsMetastream(streamId)) {
-				action = operation.Action switch {
-					"read" => "metadataRead",
-					"write" => "metadataWrite",
-					_ => null
-				};
-				streamId = SystemStreams.OriginalStreamOf(streamId);
-			}
-
-			return action switch {
-				"read" => Check(cp, operation, action, streamId, policy, context),
-				"write" => Check(cp, operation, action, streamId, policy, context),
-				"delete" => Check(cp, operation, action, streamId, policy, context),
-				"metadataWrite" => Check(cp, operation, action, streamId, policy, context),
-				"metadataRead" => Check(cp, operation, action, streamId, policy, context),
-				null => InvalidMetadataOperation(operation, policy, context),
-				_ => throw new ArgumentOutOfRangeException(nameof(operation.Action), action)
-			};
-		}
-
-		private ValueTask<bool> Check(ClaimsPrincipal cp, Operation operation, string action, string streamId,
-			PolicyInformation policy, EvaluationContext context) {
-#pragma warning disable CA2012
-			var preChecks = IsSystemOrAdmin(cp, operation, policy, context);
-#pragma warning restore CA2012
-			if (preChecks.IsCompleted && preChecks.Result) return preChecks;
-
-			return CheckAsync(preChecks, cp, action, streamId, policy, context);
-		}
-
-		private ValueTask<bool> IsSystemOrAdmin(ClaimsPrincipal cp, Operation operation,
-			PolicyInformation policy, EvaluationContext context) {
-			var isSystem = WellKnownAssertions.System.Evaluate(cp, operation, policy, context);
-			if (isSystem.IsCompleted) {
-				if (isSystem.Result)
-					return isSystem;
-				return WellKnownAssertions.Admin.Evaluate(cp, operation, policy, context);
-			}
-
-			// This should never be run, but is required for the compilation to be reasonable
-			return IsSystemOrAdminAsync(isSystem, cp, operation, policy, context);
-		}
-
-		private async ValueTask<bool> IsSystemOrAdminAsync(ValueTask<bool> isSystem, ClaimsPrincipal cp,
-			Operation operation,
-			PolicyInformation policy, EvaluationContext context) {
-			if (await isSystem) return true;
-
-			return await WellKnownAssertions.Admin.Evaluate(cp, operation, policy, context);
-		}
-
-		private async ValueTask<bool> CheckAsync(ValueTask<bool> preChecks, ClaimsPrincipal cp, string action,
-			string streamId, PolicyInformation policy, EvaluationContext context) {
-			var isSystemOrAdmin = await preChecks;
-			if (isSystemOrAdmin)
-				return true;
-			var acl = await StorageMessage.EffectiveAcl.LoadAsync(_publisher, streamId, context.CancellationToken);
-			var roles = RolesFor(action, acl);
-			if (roles.Any(x => x == SystemRoles.All)) {
-				context.Add(new AssertionMatch(policy,
-					new AssertionInformation("stream", "public stream", Grant.Allow)));
-				return true;
-			}
-
-			for (int i = 0; i < roles.Length; i++) {
-				var role = roles[i];
-				if (cp.FindFirst(x => (x.Type == ClaimTypes.Name || x.Type == ClaimTypes.Role) && x.Value == role)
-				    is Claim matched) {
-					context.Add(new AssertionMatch(policy, new AssertionInformation("role match", role, Grant.Allow),
-						matched));
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		private ValueTask<bool> InvalidMetadataOperation(Operation operation, PolicyInformation policy,
-			EvaluationContext result) {
-			result.Add(new AssertionMatch(policy,
-				new AssertionInformation("metadata", $"invalid metadata operation {operation.Action}",
-					Grant.Deny)));
-			return new ValueTask<bool>(true);
-		}
-
-		private ValueTask<string> FindStreamId(ReadOnlySpan<Parameter> parameters,
-			CancellationToken cancellationToken) {
-			string transactionId = null;
-			for (int i = 0; i < parameters.Length; i++) {
-				if (parameters[i].Name == "streamId")
-					return new ValueTask<string>(parameters[i].Value);
-				if (parameters[i].Name == "transactionId")
-					transactionId = parameters[i].Value;
-			}
-
-			if (transactionId != null) return FindStreamFromTransactionId(long.Parse(transactionId), cancellationToken);
-			return new ValueTask<string>((string)null);
-		}
-
-		private ValueTask<string> FindStreamFromTransactionId(long transactionId, CancellationToken cancellationToken) {
-			var envelope = new StreamIdFromTransactionIdEnvelope();
-			_publisher.Publish(
-				new StorageMessage.StreamIdFromTransactionIdRequest(transactionId, envelope, cancellationToken));
-			return new ValueTask<string>(envelope.Task);
-		}
-
-		private string[] RolesFor(string action, StorageMessage.EffectiveAcl acl) {
-			return action switch {
-				"read" => acl.Stream?.ReadRoles ?? acl.System?.ReadRoles ?? acl.Default?.ReadRoles,
-				"write" => acl.Stream?.WriteRoles ?? acl.System?.WriteRoles ?? acl.Default?.WriteRoles,
-				"delete" => acl.Stream?.DeleteRoles ?? acl.System?.DeleteRoles ?? acl.Default?.DeleteRoles,
-				"metadataRead" => acl.Stream?.MetaReadRoles ?? acl.System?.MetaReadRoles ?? acl.Default?.MetaReadRoles,
-				"metadataWrite" => acl.Stream?.MetaWriteRoles ??
-				                   acl.System?.MetaWriteRoles ?? acl.Default?.MetaWriteRoles,
-				_ => Array.Empty<string>()
-			};
-		}
-
-		private class StreamIdFromTransactionIdEnvelope : IEnvelope {
-			private readonly TaskCompletionSource<string> _tcs;
-
-			public StreamIdFromTransactionIdEnvelope() {
-				_tcs = new TaskCompletionSource<string>();
-			}
-
-			public Task<string> Task => _tcs.Task;
-
-			public void ReplyWith<T>(T message) where T : Message {
-				if (message is StorageMessage.StreamIdFromTransactionIdResponse response)
-					_tcs.TrySetResult(response.StreamId);
-				else if (message is StorageMessage.OperationCancelledMessage cancelled)
-					_tcs.TrySetCanceled(cancelled.CancellationToken);
-				else
-					_tcs.TrySetException(new InvalidOperationException($"Wrong message type {message.GetType()}"));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Authorization/MultiPolicyEvaluator.cs b/src/EventStore.Core/Authorization/MultiPolicyEvaluator.cs
deleted file mode 100644
index 60173e63dfa..00000000000
--- a/src/EventStore.Core/Authorization/MultiPolicyEvaluator.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Authorization {
-	public class MultiPolicyEvaluator : IPolicyEvaluator {
-		private static readonly AssertionInformation DeniedByDefault = new("default", "denied by default", Grant.Deny);
-
-		private readonly IPolicySelector[] _policySelectors;
-		private readonly PolicyInformation _policyInfo;
-
-		public MultiPolicyEvaluator(IPolicySelector[] policySelectors) {
-			_policySelectors = policySelectors;
-			_policyInfo = new PolicyInformation("multi-policy", 1, DateTimeOffset.MinValue);
-		}
-
-		public async ValueTask<EvaluationResult>
-			EvaluateAsync(ClaimsPrincipal cp, Operation operation, CancellationToken ct) {
-			var evaluationContext = new EvaluationContext(operation, ct);
-			foreach (var policySelector in _policySelectors) {
-				var policy = policySelector.Select();
-				var policyInfo = policy.Information;
-				if (policy.TryGetAssertions(operation, out var assertions)) {
-					while (!assertions.IsEmpty && evaluationContext.Grant != Grant.Deny) {
-						if (ct.IsCancellationRequested) break;
-						var assertion = assertions.Span[0];
-						assertions = assertions.Slice(1);
-						await assertion.Evaluate(cp, operation, policyInfo, evaluationContext);
-					}
-				}
-
-				if (evaluationContext.Grant != Grant.Unknown) {
-					return evaluationContext.ToResult();
-				}
-			}
-
-			evaluationContext.Add(new AssertionMatch(_policyInfo, DeniedByDefault));
-			return evaluationContext.ToResult();
-		}
-	}
-}
diff --git a/src/EventStore.Core/Authorization/MultipleClaimMatchAssertion.cs b/src/EventStore.Core/Authorization/MultipleClaimMatchAssertion.cs
deleted file mode 100644
index 1a20c4ff88d..00000000000
--- a/src/EventStore.Core/Authorization/MultipleClaimMatchAssertion.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Authorization {
-	public class MultipleClaimMatchAssertion : IComparable<MultipleClaimMatchAssertion>, IAssertion {
-		private readonly IReadOnlyList<Claim> _claims;
-		private readonly MultipleMatchMode _mode;
-
-		public MultipleClaimMatchAssertion(Grant grant, MultipleMatchMode mode, params Claim[] claims) {
-			if (claims.Length == 0) throw new ArgumentException("Value cannot be an empty collection.", nameof(claims));
-
-
-			_mode = mode;
-			Grant = grant;
-			_claims = claims.OrderBy(x => x.Type).ToArray();
-			var sb = new StringBuilder();
-			foreach (var claim in _claims) sb.AppendLine($"{claim.Type} {claim.Value}");
-
-			var assertion = sb.ToString();
-			Information = mode switch {
-				MultipleMatchMode.All => new AssertionInformation("all", assertion, grant),
-				MultipleMatchMode.Any => new AssertionInformation("any", assertion, Grant),
-				MultipleMatchMode.None => new AssertionInformation("none", assertion, Grant),
-				_ => throw new ArgumentOutOfRangeException(nameof(mode))
-			};
-		}
-
-		public AssertionInformation Information { get; }
-
-		public Grant Grant { get; }
-
-		public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
-			EvaluationContext context) {
-			var matches = new List<Claim>(_claims.Count);
-
-			foreach (var claim in _claims)
-				if (cp.FindFirst(x =>
-					string.Equals(x.Type, claim.Type, StringComparison.Ordinal) &&
-					string.Equals(x.Value, claim.Value, StringComparison.Ordinal)) is Claim matched) {
-					matches.Add(matched);
-					if (_mode != MultipleMatchMode.All) break;
-				}
-
-			var matchFound = false;
-			switch (_mode) {
-				case MultipleMatchMode.All:
-					if (matches.Count == _claims.Count) {
-						context.Add(new AssertionMatch(policy, Information, matches));
-						matchFound = true;
-					}
-
-					break;
-				case MultipleMatchMode.Any:
-					if (matches.Count > 0) {
-						context.Add(new AssertionMatch(policy, Information, matches));
-						matchFound = true;
-					}
-
-					break;
-				case MultipleMatchMode.None:
-					if (matches.Count == 0) {
-						context.Add(new AssertionMatch(policy, Information, matches));
-						matchFound = true;
-					}
-
-					break;
-				default:
-					throw new ArgumentOutOfRangeException();
-			}
-
-
-			return new ValueTask<bool>(matchFound);
-		}
-
-
-		public int CompareTo(MultipleClaimMatchAssertion other) {
-			var grant = Grant.CompareTo(other.Grant);
-			if (grant != 0)
-				return grant * -1;
-			var length = Comparer<int>.Default.Compare(_claims.Count, other._claims.Count);
-			if (length != 0)
-				return length;
-			for (int i = 0; i < _claims.Count; i++) {
-				var type = string.CompareOrdinal(_claims[i].Type, other._claims[i].Type);
-				if (type != 0)
-					return type;
-				var value = string.CompareOrdinal(_claims[i].Value, other._claims[i].Value);
-				if (value != 0)
-					return value;
-			}
-
-			return 0;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Authorization/MultipleMatchMode.cs b/src/EventStore.Core/Authorization/MultipleMatchMode.cs
deleted file mode 100644
index 690bcd0aa5e..00000000000
--- a/src/EventStore.Core/Authorization/MultipleMatchMode.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EventStore.Core.Authorization {
-	public enum MultipleMatchMode {
-		All,
-		Any,
-		None
-	}
-}
diff --git a/src/EventStore.Core/Authorization/OrAssertion.cs b/src/EventStore.Core/Authorization/OrAssertion.cs
deleted file mode 100644
index 762c70f6a8d..00000000000
--- a/src/EventStore.Core/Authorization/OrAssertion.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Authorization {
-	internal class OrAssertion : IAssertion {
-		private readonly ReadOnlyMemory<IAssertion> _assertions;
-
-		public OrAssertion(params IAssertion[] assertions) {
-			_assertions = assertions.OrderBy(x => x.Grant).ToArray();
-			Information = new AssertionInformation("or", $"({string.Join(",", _assertions)})", Grant.Unknown);
-		}
-
-		public AssertionInformation Information { get; }
-
-		public Grant Grant { get; } = Grant.Unknown;
-
-		public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
-			EvaluationContext context) {
-			var remaining = _assertions;
-			while (!remaining.IsEmpty && context.Grant != Grant.Deny) {
-				var pending = remaining.Span[0].Evaluate(cp, operation, policy, context);
-				remaining = remaining.Slice(1);
-				if (!pending.IsCompleted)
-					return EvaluateAsync(pending, remaining, cp, operation, policy, context);
-				if (pending.Result) return new ValueTask<bool>(true);
-			}
-
-			return new ValueTask<bool>(false);
-		}
-
-		private async ValueTask<bool> EvaluateAsync(ValueTask<bool> pending, ReadOnlyMemory<IAssertion> remaining,
-			ClaimsPrincipal cp, Operation operation, PolicyInformation policy, EvaluationContext result) {
-			bool evaluated;
-			while (!(evaluated = await pending) && !remaining.IsEmpty) {
-				pending = remaining.Span[0].Evaluate(cp, operation, policy, result);
-				remaining = remaining.Slice(1);
-			}
-
-			return evaluated;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Authorization/PassthroughAuthorizationProvider.cs b/src/EventStore.Core/Authorization/PassthroughAuthorizationProvider.cs
deleted file mode 100644
index ce91db56f50..00000000000
--- a/src/EventStore.Core/Authorization/PassthroughAuthorizationProvider.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-#nullable enable
-
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Authorization;
-
-public class PassthroughAuthorizationProvider : AuthorizationProviderBase {
-	public override ValueTask<bool> CheckAccessAsync(ClaimsPrincipal principal, Operation operation, CancellationToken cancellationToken) =>
-		ValueTask.FromResult(true);
-}
diff --git a/src/EventStore.Core/Authorization/PassthroughAuthorizationProviderFactory.cs b/src/EventStore.Core/Authorization/PassthroughAuthorizationProviderFactory.cs
deleted file mode 100644
index 95111d834be..00000000000
--- a/src/EventStore.Core/Authorization/PassthroughAuthorizationProviderFactory.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Authorization {
-	public class PassthroughAuthorizationProviderFactory : IAuthorizationProviderFactory {
-		public IAuthorizationProvider Build() => new PassthroughAuthorizationProvider();
-	}
-}
diff --git a/src/EventStore.Core/Authorization/Policy.cs b/src/EventStore.Core/Authorization/Policy.cs
deleted file mode 100644
index ade9362841f..00000000000
--- a/src/EventStore.Core/Authorization/Policy.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Authorization {
-	public class Policy {
-		private readonly Dictionary<OperationDefinition, List<IAssertion>> _assertions;
-		private readonly long _version;
-		private bool _sealed;
-
-		public Policy(string name, long version, DateTimeOffset validFrom) {
-			_version = version;
-			Name = name;
-			ValidFrom = validFrom;
-			_assertions = new Dictionary<OperationDefinition, List<IAssertion>>();
-			_sealed = false;
-		}
-
-		public string Name { get; }
-		public DateTimeOffset ValidFrom { get; }
-
-		public void AddMatchAnyAssertion(OperationDefinition operation, Grant grant, params Claim[] claims) {
-			var assertion = new MultipleClaimMatchAssertion(grant, MultipleMatchMode.Any, claims);
-			Add(operation, assertion);
-		}
-
-		public void AddClaimMatchAssertion(OperationDefinition operation, Grant grant, Claim claim) {
-			var assertion = new ClaimMatchAssertion(grant, claim);
-			Add(operation, assertion);
-		}
-
-		public void Add(OperationDefinition operation, IAssertion assertion) {
-			if (_sealed)
-				throw new InvalidOperationException("policy has been sealed and no further changes can be made");
-			if (!_assertions.TryGetValue(operation, out var assertions))
-				_assertions[operation] = assertions = new List<IAssertion>();
-			var insertAt = assertions.BinarySearch(assertion, AssertionComparer.Instance);
-			if (insertAt >= 0)
-				throw new InvalidOperationException("Assertion already exists");
-			assertions.Insert(~insertAt, assertion);
-		}
-
-		public ReadOnlyPolicy AsReadOnly() {
-			_sealed = true;
-			return new ReadOnlyPolicy(Name, _version, ValidFrom,
-				_assertions
-					.ToDictionary<KeyValuePair<OperationDefinition, List<IAssertion>>, OperationDefinition,
-						ReadOnlyMemory<IAssertion>>(x => x.Key, x => x.Value.ToArray()));
-		}
-
-		public void AllowAnonymous(in OperationDefinition operation) {
-			Add(operation, new AllowAnonymousAssertion());
-		}
-
-		public void RequireAuthenticated(in OperationDefinition operation) {
-			Add(operation, new RequireAuthenticatedAssertion());
-		}
-	}
-}
diff --git a/src/EventStore.Core/Authorization/PolicyInformation.cs b/src/EventStore.Core/Authorization/PolicyInformation.cs
deleted file mode 100644
index 956c8b4021b..00000000000
--- a/src/EventStore.Core/Authorization/PolicyInformation.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-
-namespace EventStore.Core.Authorization {
-	public class PolicyInformation {
-		public readonly DateTimeOffset Expires;
-		public readonly string Name;
-
-		public PolicyInformation(string name, long version, DateTimeOffset expires) {
-			Version = version;
-			Name = name;
-			Expires = expires;
-		}
-
-		public long Version { get; }
-
-		public override string ToString() {
-			return $"Policy : {Name} {Version} {Expires}";
-		}
-	}
-}
diff --git a/src/EventStore.Core/Authorization/PolicySelectorsFactory.cs b/src/EventStore.Core/Authorization/PolicySelectorsFactory.cs
deleted file mode 100644
index 89eb79ba603..00000000000
--- a/src/EventStore.Core/Authorization/PolicySelectorsFactory.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Linq;
-using EventStore.Core.Bus;
-
-namespace EventStore.Core.Authorization;
-
-// TODO: Move this to EventStore.Plugins when we're decoupling the StreamPolicies Plugin
-public interface IPolicySelectorFactory {
-	public string CommandLineName { get; }
-	public string Name { get; }
-	public string Version { get; }
-	public IPolicySelector Create(IPublisher publisher, ISubscriber subscriber);
-}
-
-public interface IPolicySelector {
-	ReadOnlyPolicy Select();
-}
-
-public class PolicySelectorsFactory(params IPolicySelectorFactory[] policySelectorFactories) {
-	public IPolicySelector[] Create(
-		AuthorizationProviderFactoryComponents authorizationProviderFactoryComponents) =>
-		policySelectorFactories
-			.Select(
-				p => p.Create(
-					authorizationProviderFactoryComponents.MainQueue,
-					authorizationProviderFactoryComponents.MainBus))
-			.ToArray();
-}
diff --git a/src/EventStore.Core/Authorization/ReadOnlyPolicy.cs b/src/EventStore.Core/Authorization/ReadOnlyPolicy.cs
deleted file mode 100644
index 115b169e51a..00000000000
--- a/src/EventStore.Core/Authorization/ReadOnlyPolicy.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Authorization {
-	public class ReadOnlyPolicy {
-		private readonly IReadOnlyDictionary<OperationDefinition, ReadOnlyMemory<IAssertion>> _assertions;
-		private readonly string _name;
-		private readonly DateTimeOffset _validFrom;
-		private readonly long _version;
-
-		public ReadOnlyPolicy(string name, long version, DateTimeOffset validFrom,
-			IReadOnlyDictionary<OperationDefinition, ReadOnlyMemory<IAssertion>> assertions) {
-			_name = name;
-			_version = version;
-			_validFrom = validFrom;
-			_assertions = assertions;
-		}
-
-		public PolicyInformation Information => new PolicyInformation(_name, _version, DateTimeOffset.MaxValue);
-
-		public bool TryGetAssertions(OperationDefinition operation, out ReadOnlyMemory<IAssertion> assertions) {
-			return _assertions.TryGetValue(operation, out assertions);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Authorization/RequireAuthenticatedAssertion.cs b/src/EventStore.Core/Authorization/RequireAuthenticatedAssertion.cs
deleted file mode 100644
index 662c9c1644b..00000000000
--- a/src/EventStore.Core/Authorization/RequireAuthenticatedAssertion.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Authorization {
-	internal class RequireAuthenticatedAssertion : IAssertion {
-		public Grant Grant { get; } = Grant.Unknown;
-
-		public AssertionInformation Information { get; } =
-			new AssertionInformation("match", "authenticated", Grant.Unknown);
-
-		public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
-			EvaluationContext context) {
-			if (!cp.Claims.Any() ||
-			    cp.Claims.Any(x => string.Equals(x.Type, ClaimTypes.Anonymous, StringComparison.Ordinal)))
-				context.Add(new AssertionMatch(policy, new AssertionInformation("match", "authenticated", Grant.Deny)));
-			else
-				context.Add(new AssertionMatch(policy,
-					new AssertionInformation("match", "authenticated", Grant.Allow)));
-			return new ValueTask<bool>(true);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Authorization/RequireStreamReadAssertion.cs b/src/EventStore.Core/Authorization/RequireStreamReadAssertion.cs
deleted file mode 100644
index 7bbfd20afec..00000000000
--- a/src/EventStore.Core/Authorization/RequireStreamReadAssertion.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Authorization {
-	public class RequireStreamReadAssertion : IAssertion {
-		private static readonly Operation StreamRead = new Operation(Operations.Streams.Read);
-		private readonly IStreamPermissionAssertion _streamAssertion;
-
-		public RequireStreamReadAssertion(IStreamPermissionAssertion streamAssertion) {
-			_streamAssertion = streamAssertion;
-			Information = streamAssertion.Information;
-		}
-
-		public AssertionInformation Information { get; }
-		public Grant Grant { get; } = Grant.Unknown;
-
-		public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
-			EvaluationContext context) {
-			if (operation == Operations.Subscriptions.ProcessMessages ||
-			    operation == Operations.Subscriptions.ReplayParked) {
-				var stream = FindStreamId(operation.Parameters.Span);
-				return _streamAssertion.Evaluate(cp,
-					StreamRead.WithParameter(Operations.Streams.Parameters.StreamId(stream)), policy, context);
-			}
-
-			return new ValueTask<bool>(false);
-		}
-
-		private string FindStreamId(ReadOnlySpan<Parameter> parameters) {
-			for (int i = 0; i < parameters.Length; i++)
-				if (parameters[i].Name == "streamId")
-					return parameters[i].Value;
-
-			return null;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Authorization/StaticPolicySelector.cs b/src/EventStore.Core/Authorization/StaticPolicySelector.cs
deleted file mode 100644
index cee7b75bbc4..00000000000
--- a/src/EventStore.Core/Authorization/StaticPolicySelector.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace EventStore.Core.Authorization;
-
-public class StaticPolicySelector(ReadOnlyPolicy policy) : IPolicySelector {
-	public ReadOnlyPolicy Select() => policy;
-}
diff --git a/src/EventStore.Core/Authorization/WellKnownAssertions.cs b/src/EventStore.Core/Authorization/WellKnownAssertions.cs
deleted file mode 100644
index a5b5e78c1a4..00000000000
--- a/src/EventStore.Core/Authorization/WellKnownAssertions.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Security.Claims;
-using EventStore.Core.Services;
-
-namespace EventStore.Core.Authorization {
-	public static class WellKnownAssertions {
-		public static readonly IAssertion System = new MultipleClaimMatchAssertion(Grant.Allow, MultipleMatchMode.All,
-			new Claim(ClaimTypes.Name, "system"), new Claim(ClaimTypes.Authentication, "ES-Legacy"));
-
-		public static readonly IAssertion Admin = new MultipleClaimMatchAssertion(Grant.Allow, MultipleMatchMode.Any,
-			new Claim(ClaimTypes.Name, "admin"), new Claim(ClaimTypes.Role, SystemRoles.Admins));
-	}
-}
diff --git a/src/EventStore.Core/Bus/AdHocHandler.cs b/src/EventStore.Core/Bus/AdHocHandler.cs
deleted file mode 100644
index 1d8664268a9..00000000000
--- a/src/EventStore.Core/Bus/AdHocHandler.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using DotNext;
-using EventStore.Common.Utils;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Bus;
-
-public sealed class AdHocHandler<T>(Func<T, CancellationToken, ValueTask> handle) : IAsyncHandle<T> where T : Message {
-	public AdHocHandler(Action<T> handle) : this(handle.ToAsync()) {
-	}
-
-	ValueTask IAsyncHandle<T>.HandleAsync(T message, CancellationToken token) => handle.Invoke(message, token);
-}
-
-public struct AdHocHandlerStruct<T> : IHandle<T>, IHandleTimeout where T : Message {
-	private readonly Action<T> _handle;
-	private readonly Action _timeout;
-
-	public AdHocHandlerStruct(Action<T> handle, Action timeout) {
-		Ensure.NotNull(handle, "handle");
-
-		HandlesTimeout = timeout is not null;
-		_handle = handle;
-		_timeout = timeout.OrNoOp();
-	}
-
-	public bool HandlesTimeout { get; }
-
-	public void Handle(T response) {
-		_handle(response);
-	}
-
-	public void Timeout() {
-		_timeout();
-	}
-}
diff --git a/src/EventStore.Core/Bus/IHandle.cs b/src/EventStore.Core/Bus/IHandle.cs
deleted file mode 100644
index f83a33c8461..00000000000
--- a/src/EventStore.Core/Bus/IHandle.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Bus;
-
-public interface IAsyncHandle<in T> where T : Message {
-	ValueTask HandleAsync(T message, CancellationToken token);
-}
-
-public interface IHandle<in T> : IAsyncHandle<T> where T : Message {
-	void Handle(T message);
-
-	ValueTask IAsyncHandle<T>.HandleAsync(T message, CancellationToken token) {
-		var task = ValueTask.CompletedTask;
-		try {
-			Handle(message);
-		} catch (Exception e) {
-			task = ValueTask.FromException(e);
-		}
-
-		return task;
-	}
-}
diff --git a/src/EventStore.Core/Bus/IHandleAlt.cs b/src/EventStore.Core/Bus/IHandleAlt.cs
deleted file mode 100644
index 822dc3262e3..00000000000
--- a/src/EventStore.Core/Bus/IHandleAlt.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Bus {
-	public interface IHandleAlt<T> : IHandle<T> where T : Message {
-		bool HandlesAlt { get; }
-	}
-}
diff --git a/src/EventStore.Core/Bus/IHandleTimeout.cs b/src/EventStore.Core/Bus/IHandleTimeout.cs
deleted file mode 100644
index 39643ba88d0..00000000000
--- a/src/EventStore.Core/Bus/IHandleTimeout.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.Core.Bus {
-	public interface IHandleTimeout {
-		bool HandlesTimeout { get; }
-		void Timeout();
-	}
-}
diff --git a/src/EventStore.Core/Bus/IMonitoredQueue.cs b/src/EventStore.Core/Bus/IMonitoredQueue.cs
deleted file mode 100644
index b6195914b79..00000000000
--- a/src/EventStore.Core/Bus/IMonitoredQueue.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using EventStore.Core.Services.Monitoring.Stats;
-
-namespace EventStore.Core.Bus {
-	public interface IMonitoredQueue {
-		//NOTE: This interface provides direct access to a queue internals breaking encapsulation of these objects.  
-		//      This is implemented this way to minimize impact on performance and to allow monitor detect problems
-
-		//      The monitored queue can be represented as IHandle<PollQueueStatistics> unless this impl can interfere 
-		//      with queue message handling itself
-		string Name { get; }
-		QueueStats GetStatistics();
-	}
-}
diff --git a/src/EventStore.Core/Bus/IPublisher.cs b/src/EventStore.Core/Bus/IPublisher.cs
deleted file mode 100644
index 2331f867bcc..00000000000
--- a/src/EventStore.Core/Bus/IPublisher.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Bus;
-
-public interface IPublisher : IHandle<Message>, IEnvelope {
-	void Publish(Message message);
-
-	void IHandle<Message>.Handle(Message message) => Publish(message);
-
-	void IEnvelope<Message>.ReplyWith<T>(T message) => Publish(message);
-}
diff --git a/src/EventStore.Core/Bus/IQueuedHandler.cs b/src/EventStore.Core/Bus/IQueuedHandler.cs
deleted file mode 100644
index 12b2cd98c53..00000000000
--- a/src/EventStore.Core/Bus/IQueuedHandler.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Services.Monitoring.Stats;
-
-namespace EventStore.Core.Bus;
-
-public interface IQueuedHandler : IPublisher {
-	string Name { get; }
-	Task Start();
-	void Stop();
-
-	void RequestStop();
-	
-	QueueStats GetStatistics();
-}
diff --git a/src/EventStore.Core/Bus/ISubscriber.cs b/src/EventStore.Core/Bus/ISubscriber.cs
deleted file mode 100644
index 80f48531f55..00000000000
--- a/src/EventStore.Core/Bus/ISubscriber.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Bus;
-
-public interface ISubscriber {
-	void Subscribe<T>(IAsyncHandle<T> handler) where T : Message;
-	void Unsubscribe<T>(IAsyncHandle<T> handler) where T : Message;
-}
diff --git a/src/EventStore.Core/Bus/MultiQueuedHandler.cs b/src/EventStore.Core/Bus/MultiQueuedHandler.cs
deleted file mode 100644
index 29bea48ad3a..00000000000
--- a/src/EventStore.Core/Bus/MultiQueuedHandler.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Bus;
-
-public class MultiQueuedHandler : IPublisher {
-	private readonly ReadOnlyMemory<IQueuedHandler> _queues;
-	private int _nextQueueNum = -1;
-
-	public MultiQueuedHandler(int queueCount,
-		Func<int, IQueuedHandler> queueFactory) {
-		Ensure.Positive(queueCount, "queueCount");
-		Ensure.NotNull(queueFactory, "queueFactory");
-
-		var queues = new IQueuedHandler[queueCount];
-		for (int i = 0; i < queues.Length; ++i) {
-			queues[i] = queueFactory(i);
-		}
-
-		_queues = queues;
-	}
-
-	private int NextQueueHash() => Interlocked.Increment(ref _nextQueueNum);
-
-	public IEnumerable<Task> Start() {
-		var queues = _queues.Span;
-		var tasks = new Task[queues.Length];
-
-		for (var i = 0; i < queues.Length; i++) {
-			tasks[i] = queues[i].Start();
-		}
-
-		return tasks;
-	}
-
-	public void Stop() {
-		var stopTasks = new Task[_queues.Length];
-		var queues = _queues.Span;
-		for (int i = 0; i < queues.Length; ++i) {
-			stopTasks[i] = Task.Factory.StartNew(queues[i].Stop);
-		}
-
-		Task.WaitAll(stopTasks);
-	}
-
-	public void Publish(Message message) {
-		int queueHash = (message as IQueueAffineMessage)?.QueueId ?? NextQueueHash();
-		var queueNum = (int)((uint)queueHash % _queues.Length);
-		_queues.Span[queueNum].Publish(message);
-	}
-
-	public void PublishToAll(Message message) {
-		foreach (var queue in _queues.Span) {
-			queue.Publish(message);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Bus/QueueBatchDequeueResult.cs b/src/EventStore.Core/Bus/QueueBatchDequeueResult.cs
deleted file mode 100644
index 7e8e2206044..00000000000
--- a/src/EventStore.Core/Bus/QueueBatchDequeueResult.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace EventStore.Core.Bus {
-	/// <summary>
-	/// A struct providing information for <see cref="ISingleConsumerMessageQueue.TryDequeue"/> result.
-	/// </summary>
-	public struct QueueBatchDequeueResult {
-		public int DequeueCount;
-		public int EstimateCurrentQueueCount;
-	}
-}
diff --git a/src/EventStore.Core/Bus/QueueItem.cs b/src/EventStore.Core/Bus/QueueItem.cs
deleted file mode 100644
index c125cd64fec..00000000000
--- a/src/EventStore.Core/Bus/QueueItem.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using EventStore.Core.Messaging;
-using EventStore.Core.Time;
-
-namespace EventStore.Core.Bus;
-
-public struct QueueItem {
-	public QueueItem(Instant enqueuedAt, Message message) {
-		EnqueuedAt = enqueuedAt;
-		Message = message;
-	}
-
-	public Instant EnqueuedAt { get; }
-	public Message Message { get; }
-}
diff --git a/src/EventStore.Core/Bus/QueueMonitor.cs b/src/EventStore.Core/Bus/QueueMonitor.cs
deleted file mode 100644
index b1ff174aa5c..00000000000
--- a/src/EventStore.Core/Bus/QueueMonitor.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Services.Monitoring.Stats;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Bus {
-	public class QueueMonitor {
-		private static readonly ILogger Log = Serilog.Log.ForContext<QueueMonitor>();
-		public static readonly QueueMonitor Default = new QueueMonitor();
-
-		private readonly ConcurrentDictionary<IMonitoredQueue, IMonitoredQueue> _queues =
-			new ConcurrentDictionary<IMonitoredQueue, IMonitoredQueue>();
-
-		private QueueMonitor() {
-		}
-
-		public void Register(IMonitoredQueue monitoredQueue) {
-			_queues[monitoredQueue] = monitoredQueue;
-		}
-
-		public void Unregister(IMonitoredQueue monitoredQueue) {
-			IMonitoredQueue v;
-			_queues.TryRemove(monitoredQueue, out v);
-		}
-
-		public QueueStats[] GetStats() {
-			var stats = _queues.Keys.OrderBy(x => x.Name).Select(queue => queue.GetStatistics()).ToArray();
-			return stats;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Bus/QueueStatsCollector.cs b/src/EventStore.Core/Bus/QueueStatsCollector.cs
deleted file mode 100644
index d3606fc1011..00000000000
--- a/src/EventStore.Core/Bus/QueueStatsCollector.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Monitoring.Stats;
-
-namespace EventStore.Core.Bus {
-	public class QueueStatsCollector {
-		private static readonly TimeSpan MinRefreshPeriod = TimeSpan.FromMilliseconds(100);
-
-		public readonly string Name;
-		public readonly string GroupName;
-
-		public Type InProgressMessage {
-			get { return _inProgressMsgType; }
-		}
-
-		private readonly object
-			_statisticsLock =
-				new object(); // this lock is mostly acquired from a single thread (+ rarely to get statistics), so performance penalty is not too high
-
-		private readonly Stopwatch _busyWatch = new Stopwatch();
-		private readonly Stopwatch _idleWatch = new Stopwatch();
-		private readonly Stopwatch _totalIdleWatch = new Stopwatch();
-		private readonly Stopwatch _totalBusyWatch = new Stopwatch();
-		private readonly Stopwatch _totalTimeWatch = new Stopwatch();
-		private TimeSpan _lastTotalIdleTime;
-		private TimeSpan _lastTotalBusyTime;
-		private TimeSpan _lastTotalTime;
-
-		private long _totalItems;
-		private long _lastTotalItems;
-		private int _lifetimeQueueLengthPeak;
-		private int _currentQueueLengthPeak;
-		private Type _lastProcessedMsgType;
-		private Type _inProgressMsgType;
-
-		private bool _wasIdle;
-
-#if DEBUG
-		private volatile bool _started;
-		private volatile bool _stopped;
-		private int _length;
-#endif
-		public QueueStatsCollector(string name, string groupName = null) {
-			Ensure.NotNull(name, "name");
-
-			Name = name;
-			GroupName = groupName;
-		}
-
-		public void Start() {
-			_totalTimeWatch.Start();
-#if DEBUG
-			Debug.Assert(!_started,
-				string.Format("QueueStatsCollector [{0}] was already started when Start() entered", Name));
-			Debug.Assert(!_stopped,
-				string.Format("QueueStatsCollector [{0}] was stopped when Start() entered", Name));
-			_started = true;
-#endif
-			EnterIdle();
-		}
-
-		public void Stop() {
-#if DEBUG
-			Debug.Assert(_started,
-				string.Format("QueueStatsCollector [{0}] was not started when Stop() entered", Name));
-			Debug.Assert(!_stopped,
-				string.Format("QueueStatsCollector [{0}] was already stopped when Stop() entered", Name));
-#endif
-			EnterIdle();
-			_totalTimeWatch.Stop();
-#if DEBUG
-			_stopped = true;
-#endif
-		}
-
-		public void ProcessingStarted<T>(int queueLength) {
-			ProcessingStarted(typeof(T), queueLength);
-		}
-
-		public void ProcessingStarted(Type msgType, int queueLength) {
-			_lifetimeQueueLengthPeak = _lifetimeQueueLengthPeak > queueLength ? _lifetimeQueueLengthPeak : queueLength;
-			_currentQueueLengthPeak = _currentQueueLengthPeak > queueLength ? _currentQueueLengthPeak : queueLength;
-
-			_inProgressMsgType = msgType;
-		}
-
-		public void ProcessingEnded(int itemsProcessed) {
-			Interlocked.Add(ref _totalItems, itemsProcessed);
-			_lastProcessedMsgType = _inProgressMsgType;
-			_inProgressMsgType = null;
-		}
-
-		public void EnterIdle() {
-#if DEBUG
-			Debug.Assert(_started,
-				string.Format("QueueStatsCollector [{0}] was not started when EnterIdle() entered", Name));
-#endif
-			if (_wasIdle)
-				return;
-			_wasIdle = true;
-
-			//NOTE: the following locks are primarily acquired in main thread,
-			//      so not too high performance penalty
-			lock (_statisticsLock) {
-				_totalIdleWatch.Start();
-				_idleWatch.Restart();
-
-				_totalBusyWatch.Stop();
-				_busyWatch.Reset();
-			}
-		}
-
-		public void EnterBusy() {
-#if DEBUG
-			Debug.Assert(_started,
-				string.Format("QueueStatsCollector [{0}] was not started when EnterBusy() entered", Name));
-#endif
-			if (!_wasIdle)
-				return;
-			_wasIdle = false;
-
-			lock (_statisticsLock) {
-				_totalIdleWatch.Stop();
-				_idleWatch.Reset();
-
-				_totalBusyWatch.Start();
-				_busyWatch.Restart();
-			}
-		}
-
-		public QueueStats GetStatistics(int currentQueueLength) {
-			lock (_statisticsLock) {
-				var totalTime = _totalTimeWatch.Elapsed;
-				var totalIdleTime = _totalIdleWatch.Elapsed;
-				var totalBusyTime = _totalBusyWatch.Elapsed;
-				var totalItems = Interlocked.Read(ref _totalItems);
-
-				var lastRunMs = totalTime - _lastTotalTime;
-				var lastItems = totalItems - _lastTotalItems;
-				var avgItemsPerSecond = lastRunMs.Ticks != 0
-					? (int)(TimeSpan.TicksPerSecond * lastItems / lastRunMs.Ticks)
-					: 0;
-				var avgProcessingTime =
-					lastItems != 0 ? (totalBusyTime - _lastTotalBusyTime).TotalMilliseconds / lastItems : 0;
-				var idleTimePercent = Math.Min(100.0,
-					lastRunMs.Ticks != 0 ? 100.0 * (totalIdleTime - _lastTotalIdleTime).Ticks / lastRunMs.Ticks : 100);
-
-				var stats = new QueueStats(
-					Name,
-					GroupName,
-					currentQueueLength,
-					avgItemsPerSecond,
-					avgProcessingTime,
-					idleTimePercent,
-					_busyWatch.IsRunning ? _busyWatch.Elapsed : (TimeSpan?)null,
-					_idleWatch.IsRunning ? _idleWatch.Elapsed : (TimeSpan?)null,
-					totalItems,
-					_currentQueueLengthPeak,
-					_lifetimeQueueLengthPeak,
-					_lastProcessedMsgType,
-					_inProgressMsgType);
-
-				if (totalTime - _lastTotalTime >= MinRefreshPeriod) {
-					_lastTotalTime = totalTime;
-					_lastTotalIdleTime = totalIdleTime;
-					_lastTotalBusyTime = totalBusyTime;
-					_lastTotalItems = totalItems;
-
-					_currentQueueLengthPeak = 0;
-				}
-
-				return stats;
-			}
-		}
-
-		[Conditional("DEBUG")]
-		public void Enqueued() {
-#if DEBUG
-			Interlocked.Increment(ref _length);
-#endif
-		}
-
-		[Conditional("DEBUG")]
-		public void Dequeued(Message msg) {
-#if DEBUG
-			Debug.Assert(_started,
-				string.Format("QueueStatsCollector [{0}] was not started when Dequeued() entered", Name));
-			Debug.Assert(!_stopped,
-				string.Format("QueueStatsCollector [{0}] was stopped when Dequeued() entered", Name));
-			Interlocked.Decrement(ref _length);
-#endif
-		}
-
-#if DEBUG
-		public bool IsIdle() {
-			var curLength = Interlocked.CompareExchange(ref _length, 0, 0);
-			return !_started || _stopped || curLength == 0;
-		}
-
-		public bool IsStopped() {
-			return _stopped;
-		}
-#endif
-	}
-}
diff --git a/src/EventStore.Core/Bus/QueueStatsManager.cs b/src/EventStore.Core/Bus/QueueStatsManager.cs
deleted file mode 100644
index 14a22607cea..00000000000
--- a/src/EventStore.Core/Bus/QueueStatsManager.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Diagnostics;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Monitoring.Stats;
-using EventStore.Core.TransactionLog.Checkpoint;
-
-namespace EventStore.Core.Bus {
-	public class QueueStatsManager {
-#if DEBUG
-		private IReadOnlyCheckpoint _writerCheckpoint;
-		private IReadOnlyCheckpoint _chaserCheckpoint;
-		private ConcurrentDictionary<QueueStatsCollector, bool> _queueStatsCollectors = new ConcurrentDictionary<QueueStatsCollector, bool>();
-#endif
-		public QueueStatsManager() {
-		}
-
-		public QueueStatsCollector CreateQueueStatsCollector(string name, string groupName = null) {
-			var statsCollector = new QueueStatsCollector(name, groupName);
-#if DEBUG
-			_queueStatsCollectors.AddOrUpdate(statsCollector, (statsCollector) => true,
-				(statsCollector, curValue) => throw new Exception("This should never happen"));
-#endif
-			return statsCollector;
-		}
-
-#if DEBUG
-		private void WaitStop(int multiplier = 1) {
-			var counter = 0;
-			foreach (var kvp in _queueStatsCollectors) {
-				var queueStatsCollector = kvp.Key;
-				while (!queueStatsCollector.IsStopped()) {
-					Console.WriteLine($"Waiting for STOP state for queue {queueStatsCollector.Name}...");
-					counter++;
-					if (counter > 150 * multiplier)
-						throw new ApplicationException($"Infinite WaitStop() loop for queue {queueStatsCollector.Name}?");
-					Thread.Sleep(100);
-				}
-			}
-		}
-
-		public void WaitIdle(bool waitForCheckpoints = true, bool waitForNonEmptyTf = false,
-			int multiplier = 1) {
-			var counter = 0;
-
-			var singlePass = false;
-			do {
-				singlePass = true;
-				foreach (var kvp in _queueStatsCollectors) {
-					var queueStatsCollector = kvp.Key;
-					while (!queueStatsCollector.IsIdle()) {
-						Console.WriteLine($"Waiting for IDLE state for queue {queueStatsCollector.Name}...");
-						counter++;
-						singlePass = false;
-						if (counter > 150 * multiplier)
-							throw new ApplicationException($"Infinite WaitIdle() loop for queue: {queueStatsCollector.Name}?");
-						Thread.Sleep(100);
-					}
-				}
-			} while (!singlePass);
-
-			var successes = 0;
-			do {
-				if ((waitForCheckpoints && AreCheckpointsDifferent()) ||
-				    (waitForNonEmptyTf && _writerCheckpoint.Read() == 0)) {
-					Console.WriteLine("Waiting for IDLE state on checkpoints...");
-					counter++;
-					if (counter > 150 * multiplier)
-						throw new ApplicationException("Infinite WaitIdle() loop on checkpoints?");
-					Thread.Sleep(100);
-				} else {
-					successes++;
-				}
-			} while (successes < 2);
-		}
-
-		private bool AreCheckpointsDifferent() {
-			return _writerCheckpoint!=null && _chaserCheckpoint!=null && _writerCheckpoint.ReadNonFlushed() != _chaserCheckpoint.Read();
-		}
-
-		public void InitializeCheckpoints(
-			IReadOnlyCheckpoint writerCheckpoint,
-			IReadOnlyCheckpoint chaserCheckpoint) {
-			_writerCheckpoint = writerCheckpoint;
-			_chaserCheckpoint = chaserCheckpoint;
-		}
-#endif
-	}
-}
diff --git a/src/EventStore.Core/Bus/QueuedHandlerThreadPool.cs b/src/EventStore.Core/Bus/QueuedHandlerThreadPool.cs
deleted file mode 100644
index a9834199a33..00000000000
--- a/src/EventStore.Core/Bus/QueuedHandlerThreadPool.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Monitoring.Stats;
-using System.Threading.Tasks;
-using EventStore.Core.Metrics;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Bus;
-
-	/// <summary>
-	/// Lightweight in-memory queue with a separate thread in which it passes messages
-	/// to the consumer. It also tracks statistics about the message processing to help
-	/// in identifying bottlenecks
-	/// </summary>
-	public class QueuedHandlerThreadPool : IQueuedHandler, IMonitoredQueue, IThreadPoolWorkItem {
-		private static readonly TimeSpan DefaultStopWaitTimeout = TimeSpan.FromSeconds(10);
-		public static readonly TimeSpan VerySlowMsgThreshold = TimeSpan.FromSeconds(7);
-		private static readonly ILogger Log = Serilog.Log.ForContext<QueuedHandlerThreadPool>();
-
-		public int MessageCount {
-			get { return _queue.Count; }
-		}
-
-		public string Name {
-			get { return _queueStats.Name; }
-		}
-
-		private readonly Func<Message, CancellationToken, ValueTask> _consumer;
-
-		private readonly bool _watchSlowMsg;
-		private readonly TimeSpan _slowMsgThreshold;
-
-		private readonly ConcurrentQueueWrapper<QueueItem> _queue = new();
-
-		private CancellationTokenSource _lifetimeSource;
-		private readonly CancellationToken _lifetimeToken; // cached to avoid ObjectDisposedException
-		private readonly ManualResetEventSlim _stopped = new(true);
-		private readonly TimeSpan _threadStopWaitTimeout;
-
-		// monitoring
-		private readonly QueueMonitor _queueMonitor;
-		private readonly QueueStatsCollector _queueStats;
-		private readonly QueueTracker _tracker;
-
-		private int _isRunning;
-		private int _queueStatsState; //0 - never started, 1 - started, 2 - stopped
-
-		private readonly TaskCompletionSource<object> _tcs = new();
-
-		public QueuedHandlerThreadPool(IAsyncHandle<Message> consumer,
-			string name,
-			QueueStatsManager queueStatsManager,
-			QueueTrackers trackers,
-			bool watchSlowMsg = true,
-			TimeSpan? slowMsgThreshold = null,
-			TimeSpan? threadStopWaitTimeout = null,
-			string groupName = null) {
-			Ensure.NotNull(consumer, "consumer");
-			Ensure.NotNull(name, "name");
-
-			// Pef: devirt interface
-			_consumer = consumer.HandleAsync;
-
-			_lifetimeSource = new();
-			_lifetimeToken = _lifetimeSource.Token;
-
-			_watchSlowMsg = watchSlowMsg;
-			_slowMsgThreshold = slowMsgThreshold ?? InMemoryBus.DefaultSlowMessageThreshold;
-			_threadStopWaitTimeout = threadStopWaitTimeout ?? DefaultStopWaitTimeout;
-
-			_queueMonitor = QueueMonitor.Default;
-			_queueStats = queueStatsManager.CreateQueueStatsCollector(name, groupName);
-			_tracker = trackers.GetTrackerForQueue(name);
-		}
-
-		public Task Start() {
-			_queueMonitor.Register(this);
-			return _tcs.Task;
-		}
-
-		private void Cancel() {
-			if (Interlocked.Exchange(ref _lifetimeSource, null) is { } cts) {
-				using (cts) {
-					cts.Cancel();
-				}
-			}
-		}
-
-		public void Stop() {
-			Cancel();
-			if (!_stopped.Wait(_threadStopWaitTimeout))
-				throw new TimeoutException(string.Format("Unable to stop thread '{0}'.", Name));
-			TryStopQueueStats();
-			_queueMonitor.Unregister(this);
-		}
-
-		public void RequestStop() {
-			Cancel();
-			TryStopQueueStats();
-			_queueMonitor.Unregister(this);
-		}
-
-		private void TryStopQueueStats() {
-			if (Interlocked.CompareExchange(ref _isRunning, 1, 0) == 0) {
-				if (Interlocked.CompareExchange(ref _queueStatsState, 2, 1) == 1)
-					_queueStats.Stop();
-				Interlocked.CompareExchange(ref _isRunning, 0, 1);
-			}
-		}
-
-		async void IThreadPoolWorkItem.Execute() {
-			try {
-				if (Interlocked.CompareExchange(ref _queueStatsState, 1, 0) == 0)
-					_queueStats.Start();
-
-				bool proceed = true;
-				while (proceed) {
-					_stopped.Reset();
-					_queueStats.EnterBusy();
-					_tracker.EnterBusy();
-
-					while (!_lifetimeToken.IsCancellationRequested && _queue.TryDequeue(out var item)) {
-						var start = _tracker.RecordMessageDequeued(item.EnqueuedAt);
-						var msg = item.Message;
-#if DEBUG
-						_queueStats.Dequeued(msg);
-#endif
-						try {
-							var queueCnt = _queue.Count;
-							_queueStats.ProcessingStarted(msg.GetType(), queueCnt);
-
-							if (_watchSlowMsg) {
-								await _consumer.Invoke(msg, _lifetimeToken);
-
-								var end = _tracker.RecordMessageProcessed(start, msg.Label);
-								var elapsed = TimeSpan.FromSeconds(end.ElapsedSecondsSince(start));
-
-								if (elapsed > _slowMsgThreshold) {
-									Log.Debug(
-										"SLOW QUEUE MSG [{queue}]: {message} - {elapsed}ms. Q: {prevQueueCount}/{curQueueCount}. {messageDetail}.",
-										_queueStats.Name, _queueStats.InProgressMessage.Name,
-										(int)elapsed.TotalMilliseconds, queueCnt, _queue.Count, msg);
-									if (elapsed > VerySlowMsgThreshold &&
-									    !(msg is SystemMessage.SystemInit))
-										Log.Error(
-											"---!!! VERY SLOW QUEUE MSG [{queue}]: {message} - {elapsed}ms. Q: {prevQueueCount}/{curQueueCount}.",
-											_queueStats.Name, _queueStats.InProgressMessage.Name,
-											(int)elapsed.TotalMilliseconds, queueCnt, _queue.Count);
-								}
-							} else {
-								await _consumer.Invoke(msg, _lifetimeToken);
-								_tracker.RecordMessageProcessed(start, msg.Label);
-							}
-
-							_queueStats.ProcessingEnded(1);
-						} catch (Exception ex) {
-							Log.Error(ex,
-								"Error while processing message {message} in queued handler '{queue}'.", msg,
-								_queueStats.Name);
-#if DEBUG
-							throw;
-#endif
-						}
-					}
-
-					_queueStats.EnterIdle();
-					_tracker.EnterIdle();
-					Interlocked.CompareExchange(ref _isRunning, 0, 1);
-					if (_lifetimeToken.IsCancellationRequested) {
-						TryStopQueueStats();
-					}
-
-					_stopped.Set();
-
-					// try to reacquire lock if needed
-					proceed = !_lifetimeToken.IsCancellationRequested
-					          && _queue.Count > 0
-					          && Interlocked.CompareExchange(ref _isRunning, 1, 0) == 0;
-				}
-			} catch (OperationCanceledException e) when (e.CancellationToken == _lifetimeToken) {
-				_tcs.TrySetCanceled(e.CancellationToken);
-			} catch (Exception ex) {
-				_tcs.TrySetException(ex);
-				throw;
-			}
-		}
-
-		public void Publish(Message message) {
-			//Ensure.NotNull(message, "message");
-#if DEBUG
-			_queueStats.Enqueued();
-#endif
-			_queue.Enqueue(new(_tracker.Now, message));
-			if (!_lifetimeToken.IsCancellationRequested && Interlocked.CompareExchange(ref _isRunning, 1, 0) == 0) {
-				ThreadPool.UnsafeQueueUserWorkItem(this, preferLocal: false);
-			}
-		}
-
-		public QueueStats GetStatistics() {
-			return _queueStats.GetStatistics(_queue.Count);
-		}
-	}
diff --git a/src/EventStore.Core/Caching/CacheResizer.cs b/src/EventStore.Core/Caching/CacheResizer.cs
deleted file mode 100644
index c68a0ef3013..00000000000
--- a/src/EventStore.Core/Caching/CacheResizer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.Caching {
-	public abstract class CacheResizer {
-		public string Name => Cache.Name;
-		public long Size => Cache.Size;
-		public long Count => Cache.Count;
-		public long FreedSize => Cache.FreedSize;
-		protected IDynamicCache Cache { get; }
-		public ResizerUnit Unit { get; }
-
-		protected CacheResizer(
-			ResizerUnit unit,
-			IDynamicCache cache) {
-			Ensure.NotNull(cache, nameof(cache));
-
-			Cache = cache;
-			Unit = unit;
-		}
-
-		protected string BuildStatsKey(string parentKey) =>
-			parentKey.Length == 0 ? Name : $"{parentKey}-{Name}";
-
-		protected static string GetParentKey(string key) {
-			var index = key.LastIndexOf('-');
-			return index < 0 ? null : key[..index];
-		}
-	}
-}
diff --git a/src/EventStore.Core/Caching/CacheStats.cs b/src/EventStore.Core/Caching/CacheStats.cs
deleted file mode 100644
index 7db2ac24b7f..00000000000
--- a/src/EventStore.Core/Caching/CacheStats.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace EventStore.Core.Caching {
-	public struct CacheStats {
-		public string Key { get; }
-		public string Name { get; }
-		public long Capacity { get; }
-		public long Size { get; }
-		public long Count { get; }
-		public int NumChildren { get; }
-		public double UtilizationPercent => Capacity != 0 ? 100.0 * Size / Capacity : 0;
-
-		public CacheStats(string key, string name, long capacity, long size, long count, int numChildren) {
-			Key = key;
-			Name = name;
-			Capacity = capacity;
-			Size = size;
-			Count = count;
-			NumChildren = numChildren;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Caching/CompositeCacheResizer.cs b/src/EventStore.Core/Caching/CompositeCacheResizer.cs
deleted file mode 100644
index a923aee5ab3..00000000000
--- a/src/EventStore.Core/Caching/CompositeCacheResizer.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.Caching {
-	public class CompositeCacheResizer : CacheResizer, ICacheResizer {
-		private readonly ICacheResizer[] _children;
-
-		public CompositeCacheResizer(string name, int weight, params ICacheResizer[] children)
-			: base(GetUniqueUnit(children), new CompositeCache(name, children)) {
-			Weight = weight;
-			_children = children;
-			ReservedCapacity = _children.Sum(x => x.ReservedCapacity);
-		}
-
-		public int Weight { get; }
-
-		public long ReservedCapacity { get; }
-
-		public void CalcCapacity(long unreservedCapacity, int totalWeight) {
-			var totalCapacity = unreservedCapacity + ReservedCapacity;
-			Cache.SetCapacity(totalCapacity.ScaleByWeight(Weight, totalWeight));
-		}
-
-		public void ResetFreedSize() {
-			Cache.ResetFreedSize();
-		}
-
-		public IEnumerable<CacheStats> GetStats(string parentKey) {
-			var key = BuildStatsKey(parentKey);
-			var size = 0L;
-			var count = 0L;
-			var numChildren = 0;
-
-			foreach (var child in _children) {
-				foreach (var childStats in child.GetStats(key)) {
-					if (GetParentKey(childStats.Key) == key) {
-						size += childStats.Size;
-						count += childStats.Count;
-						numChildren++;
-					}
-
-					yield return childStats;
-				}
-			}
-
-			yield return new CacheStats(key, Name, Cache.Capacity, size, count, numChildren);
-		}
-
-		private static ResizerUnit GetUniqueUnit(ICacheResizer[] children) {
-			if (children.Length < 1)
-				throw new ArgumentException("There must be at least one child", nameof(children));
-
-			var unit = children[0].Unit;
-
-			if (children.Any(x => x.Unit != unit))
-				throw new ArgumentException("All children must have the same unit", nameof(children));
-
-			return unit;
-		}
-
-		class CompositeCache : IDynamicCache {
-			private readonly ICacheResizer[] _children;
-			private readonly int _childrenWeight;
-			private readonly long _reservedCapacity;
-
-			public CompositeCache(string name, params ICacheResizer[] children) {
-				Ensure.NotNullOrEmpty(name, nameof(name));
-				Name = name;
-				_children = children;
-				_childrenWeight = children.Sum(static x => x.Weight);
-				_reservedCapacity = children.Sum(static x => x.ReservedCapacity);
-			}
-
-			public string Name { get; }
-
-			public long Capacity { get; private set; }
-
-			public void SetCapacity(long value) {
-				// todo: could consider taking into account capacity not used by children because
-				// they took their maximum values
-				Capacity = value;
-				var unreservedCapacity = Math.Max(Capacity - _reservedCapacity, 0);
-				foreach (var child in _children) {
-					child.CalcCapacity(unreservedCapacity, _childrenWeight);
-				}
-			}
-
-			public void ResetFreedSize() {
-				foreach (var child in _children)
-					child.ResetFreedSize();
-			}
-
-			public long Size => _children.Sum(static x => x.Size);
-			public long Count => _children.Sum(static x => x.Count);
-			public long FreedSize => _children.Sum(static x => x.FreedSize);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Caching/DynamicCacheManager.cs b/src/EventStore.Core/Caching/DynamicCacheManager.cs
deleted file mode 100644
index dcf1d1ce035..00000000000
--- a/src/EventStore.Core/Caching/DynamicCacheManager.cs
+++ /dev/null
@@ -1,240 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Metrics;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Util;
-using Serilog;
-
-namespace EventStore.Core.Caching {
-	public class DynamicCacheManager:
-		IHandle<MonitoringMessage.DynamicCacheManagerTick>,
-		IHandle<MonitoringMessage.InternalStatsRequest> {
-
-		protected static readonly ILogger Log = Serilog.Log.ForContext<DynamicCacheManager>();
-
-		private readonly IPublisher _bus;
-		private readonly Func<long> _getFreeSystemMem;
-		private readonly Func<long> _getFreeHeapMem;
-		private readonly Func<int> _getGcCollectionCount;
-		private readonly long _totalMem;
-		private readonly int _keepFreeMemPercent;
-		private readonly long _keepFreeMemBytes;
-		private readonly long _keepFreeMem;
-		private readonly TimeSpan _minResizeInterval;
-		private readonly long _minResizeThreshold;
-		private readonly ICacheResizer _rootCacheResizer;
-		private readonly Message _scheduleTick;
-		private readonly Func<Dictionary<string, CacheStats>> _fetchOrGetCachedStats;
-		private readonly ICacheResourcesTracker _cacheResourcesTracker;
-
-		private DateTime _lastResize = DateTime.UtcNow;
-		private long _lastAvailableMem;
-		private long _lastGcCount;
-
-		public DynamicCacheManager(
-			IPublisher bus,
-			Func<long> getFreeSystemMem,
-			Func<long> getFreeHeapMem,
-			Func<int> getGcCollectionCount,
-			long totalMem,
-			int keepFreeMemPercent,
-			long keepFreeMemBytes,
-			TimeSpan monitoringInterval,
-			TimeSpan minResizeInterval,
-			long minResizeThreshold,
-			ICacheResizer rootCacheResizer,
-			ICacheResourcesTracker cacheResourcesTracker) {
-
-			if (keepFreeMemPercent is < 0 or > 100)
-				throw new ArgumentException($"{nameof(keepFreeMemPercent)} must be between 0 to 100 inclusive.");
-
-			if (keepFreeMemBytes < 0)
-				throw new ArgumentException($"{nameof(keepFreeMemBytes)} must be non-negative.");
-
-			_bus = bus;
-			_getFreeSystemMem = getFreeSystemMem;
-			_getFreeHeapMem = getFreeHeapMem;
-			_getGcCollectionCount = getGcCollectionCount;
-			_totalMem = totalMem;
-			_keepFreeMemPercent = keepFreeMemPercent;
-			_keepFreeMemBytes = keepFreeMemBytes;
-			_keepFreeMem = Math.Max(_keepFreeMemBytes, _totalMem.ScaleByPercent(_keepFreeMemPercent));
-			_minResizeInterval = minResizeInterval;
-			_minResizeThreshold = minResizeThreshold;
-			_rootCacheResizer = rootCacheResizer;
-			_scheduleTick = TimerMessage.Schedule.Create(
-				monitoringInterval,
-				_bus,
-				new MonitoringMessage.DynamicCacheManagerTick());
-			_cacheResourcesTracker = cacheResourcesTracker;
-			_fetchOrGetCachedStats = Functions.Debounce(
-				() => _rootCacheResizer.GetStats(string.Empty).ToDictionary(stats => stats.Key),
-				TimeSpan.FromSeconds(1));
-		}
-
-		private readonly struct AvailableMemoryInfo {
-			public long AvailableMem { get; } // available memory for static and dynamic caches
-			public long FreeSystemMem { get; } // free memory on the system
-			public long FreeHeapMem { get; } // free memory within the heap
-			public long CachedMem { get; } // approximate amount of memory used by static and dynamic caches
-			public long FreedMem { get; } // approximate amount of managed memory freed by caches but not yet collected
-			public long TotalFreeMem => FreeSystemMem + FreeHeapMem + FreedMem;
-
-			public AvailableMemoryInfo(long availableMem, long freeSystemMem, long freeHeapMem, long cachedMem, long freedMem) {
-				AvailableMem = availableMem;
-				FreeSystemMem = freeSystemMem;
-				FreeHeapMem = freeHeapMem;
-				CachedMem = cachedMem;
-				FreedMem = freedMem;
-			}
-		}
-
-		public void Start() {
-			if (_rootCacheResizer.Unit == ResizerUnit.Entries) {
-				_rootCacheResizer.CalcCapacityTopLevel(_rootCacheResizer.ReservedCapacity);
-			} else {
-				var availableMem = GetAvailableMemoryInfo().AvailableMem;
-				_lastAvailableMem = availableMem;
-				ResizeCaches(availableMem);
-
-				Thread.MemoryBarrier();
-
-				Tick();
-			}
-
-			var allStats = _fetchOrGetCachedStats();
-			foreach (var stat in allStats.Values) {
-				var key = stat.Key;
-				Log.Information("Cache {key} capacity initialized to {capacity:N0} {unit}",
-					key, stat.Capacity, _rootCacheResizer.Unit);
-				
-				if (stat.NumChildren == 0)
-					_cacheResourcesTracker.Register(stat.Name, _rootCacheResizer.Unit, () => _fetchOrGetCachedStats()[key]);
-			}
-		}
-
-		public void Handle(MonitoringMessage.DynamicCacheManagerTick message) {
-			ThreadPool.QueueUserWorkItem(_ => {
-				try {
-					Thread.MemoryBarrier();
-					ResizeCachesIfNeeded();
-					Thread.MemoryBarrier();
-				} finally {
-					Tick();
-				}
-			});
-		}
-
-		public void Handle(MonitoringMessage.InternalStatsRequest message) {
-			Thread.MemoryBarrier(); // just to ensure we're seeing latest values
-
-			var stats = new Dictionary<string, object>();
-			var cachesStats = _rootCacheResizer.GetStats(string.Empty);
-
-			foreach(var cacheStat in cachesStats) {
-				var statNamePrefix = $"es-{cacheStat.Key}-";
-				stats[statNamePrefix + "name"] = cacheStat.Name;
-				stats[statNamePrefix + "count"] = cacheStat.Count;
-				stats[statNamePrefix + "size" + _rootCacheResizer.Unit] = cacheStat.Size;
-				stats[statNamePrefix + "capacity" + _rootCacheResizer.Unit] = cacheStat.Capacity;
-				stats[statNamePrefix + "utilizationPercent"] = cacheStat.UtilizationPercent;
-			}
-
-			message.Envelope.ReplyWith(new MonitoringMessage.InternalStatsRequestResponse(stats));
-		}
-
-		private bool ResizeConditionsMet(out AvailableMemoryInfo availableMemInfo) {
-			availableMemInfo = GetAvailableMemoryInfo();
-
-			// not much has changed since the last resize, don't resize again.
-			if (Math.Abs(availableMemInfo.AvailableMem - _lastAvailableMem) < _minResizeThreshold)
-				return false;
-
-			// we're low on memory, resize.
-			if (availableMemInfo.TotalFreeMem < _keepFreeMem)
-				return true;
-
-			// we've not resized for a while now, resize.
-			if (DateTime.UtcNow - _lastResize >= _minResizeInterval)
-				return true;
-
-			return false;
-		}
-
-		private void ResizeCachesIfNeeded() {
-			if (FullGcHasRun())
-				_rootCacheResizer.ResetFreedSize();
-
-			if (!ResizeConditionsMet(out var availableMemInfo))
-				return;
-
-			Log.Debug("Resizing caches.");
-
-			if (availableMemInfo.TotalFreeMem < _keepFreeMem)
-				Log.Verbose("Total free memory is lower than "
-				          + "{thresholdPercent}% or {thresholdBytes:N0} bytes.\n"
-				          + "Free system memory: {freeSystemMem:N0} bytes.\n"
-				          + "Free heap memory: {freeHeapMem:N0} bytes.\n"
-				          + "Freed memory: {freedMem:N0} bytes.\n\n"
-				          + "Total free memory: {totalFreeMem:N0} bytes.\n",
-					_keepFreeMemPercent,
-					_keepFreeMemBytes,
-					availableMemInfo.FreeSystemMem,
-					availableMemInfo.FreeHeapMem,
-					availableMemInfo.FreedMem,
-					availableMemInfo.TotalFreeMem);
-
-			try {
-				ResizeCaches(availableMemInfo.AvailableMem);
-			} catch (Exception ex) {
-				Log.Error(ex, "Error while resizing caches");
-			} finally {
-				_lastResize = DateTime.UtcNow;
-				_lastAvailableMem = availableMemInfo.AvailableMem;
-			}
-		}
-
-		private bool FullGcHasRun() =>
-			_lastGcCount < (_lastGcCount = _getGcCollectionCount());
-
-		private void ResizeCaches(long availableMem) {
-			_rootCacheResizer.CalcCapacityTopLevel(availableMem);
-		}
-
-		private AvailableMemoryInfo GetAvailableMemoryInfo() {
-			do {
-				var freeSystemMem = _getFreeSystemMem();
-				var freeHeapMem = _getFreeHeapMem();
-				var cachedMem = _rootCacheResizer.Size;
-				var freedMem = _rootCacheResizer.FreedSize;
-
-				var availableMem = Math.Max(0L, freeSystemMem + freeHeapMem + cachedMem + freedMem - _keepFreeMem);
-
-				Log.Verbose("Calculating memory available for caching based on:\n" +
-				            "Total memory: {totalMem:N0} bytes\n" +
-				            "Free system memory: {freeSystemMem:N0} bytes\n" +
-				            "Free heap memory: {freeHeapMem:N0} bytes\n" +
-				            "Cached memory: ~{cachedMem:N0} bytes\n" +
-				            "Freed memory: ~{freedMem:N0} bytes\n" +
-				            "Keep free memory: {keepFreeMem:N0} bytes (higher of {keepFreeMemPercent}% total mem & {keepFreeMemBytes:N0} bytes)\n\n" +
-				            "Memory available for caching: ~{availableMem:N0} bytes\n",
-					_totalMem, freeSystemMem, freeHeapMem, cachedMem, freedMem,
-					_keepFreeMem, _keepFreeMemPercent, _keepFreeMemBytes,
-					availableMem);
-
-				if (FullGcHasRun())
-					_rootCacheResizer.ResetFreedSize();
-				else
-					return new AvailableMemoryInfo(availableMem, freeSystemMem, freeHeapMem, cachedMem, freedMem);
-			} while (true);
-		}
-
-		private void Tick() => _bus.Publish(_scheduleTick);
-	}
-}
diff --git a/src/EventStore.Core/Caching/DynamicCacheResizer.cs b/src/EventStore.Core/Caching/DynamicCacheResizer.cs
deleted file mode 100644
index b49a5b17c98..00000000000
--- a/src/EventStore.Core/Caching/DynamicCacheResizer.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using EventStore.Common.Utils;
-using Serilog;
-
-namespace EventStore.Core.Caching {
-	public class DynamicCacheResizer : CacheResizer, ICacheResizer {
-		private readonly long _minCapacity;
-		private readonly long _maxCapacity;
-
-		public DynamicCacheResizer(ResizerUnit unit, long minCapacity, long maxCapacity, int weight, IDynamicCache cache)
-			: base(unit, cache) {
-			Ensure.Positive(weight, nameof(weight));
-			Ensure.Nonnegative(minCapacity, nameof(minCapacity));
-			Ensure.Nonnegative(maxCapacity, nameof(maxCapacity));
-
-			Weight = weight;
-			_minCapacity = minCapacity;
-			_maxCapacity = maxCapacity;
-		}
-
-		public int Weight { get; }
-
-		public long ReservedCapacity => 0;
-
-		public void CalcCapacity(long unreservedCapacity, int totalWeight) {
-			var sw = Stopwatch.StartNew();
-
-			var oldCapacity = Cache.Capacity;
-			var capacity = Math.Clamp(
-				value: unreservedCapacity.ScaleByWeight(Weight, totalWeight),
-				min: _minCapacity,
-				max: _maxCapacity);
-			Cache.SetCapacity(capacity);
-
-			sw.Stop();
-
-			var diff = capacity - oldCapacity;
-			Log.Debug(
-				"{name} dynamically allotted {capacity:N0} " + Unit + " ({diff:+#,#;-#,#;+0}). Took {elapsed:N0} ms.",
-				Name, Cache.Capacity, diff, sw.ElapsedMilliseconds);
-		}
-
-		public void ResetFreedSize() {
-			Cache.ResetFreedSize();
-		}
-
-		public IEnumerable<CacheStats> GetStats(string parentKey) {
-			yield return new CacheStats(BuildStatsKey(parentKey), Name, Cache.Capacity, Size, Count, numChildren: 0);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Caching/ICacheResizer.cs b/src/EventStore.Core/Caching/ICacheResizer.cs
deleted file mode 100644
index 9efb942bdbb..00000000000
--- a/src/EventStore.Core/Caching/ICacheResizer.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System.Collections.Generic;
-
-namespace EventStore.Core.Caching {
-	// The resizer is responsible for resizing its associated cache.
-	// The resizer can be part of a hierarchy of resizers.
-	// Children can _reserve_ capacity, making it unavailable to be distributed by weight.
-	//     Capacity = ReservedCapacity + UnreservedCapacity
-	// To trigger resizing, the parent calls the CalcCapacity method, passing in
-	//   - its unreserved capacity (i.e. the capacity to be shared among the children by weight)
-	//   - total weight of the children (so that they can draw the correct amount according to their weight)
-	public interface ICacheResizer {
-		string Name { get; }
-
-		ResizerUnit Unit { get; }
-
-		// How much of the capacity given to this resizer is reserved.
-		// The remaining (unreserved) capacity can be allotted by weight among the children.
-		long ReservedCapacity { get; }
-
-		// Weight relative to siblings when drawing from the unreserved capacity
-		int Weight { get; }
-
-		// How much of the capacity is currently utilized
-		long Size { get; }
-
-		// Number of items in cache
-		long Count { get; }
-
-		// Approximate amount freed but not yet garbage collected
-		long FreedSize { get; }
-
-		void CalcCapacity(long unreservedCapacity, int totalWeight);
-
-		void ResetFreedSize();
-
-		IEnumerable<CacheStats> GetStats(string parentKey);
-	}
-
-	// We support Entries for backwards compatibility. In the future all cache
-	// sizes will likely be specified in bytes and we can remove this enum.
-	public enum ResizerUnit {
-		Bytes,
-		Entries,
-	}
-
-	public static class CacheResizerExtensions {
-		// Helper for the top level to just pass in the totalCapacity
-		public static void CalcCapacityTopLevel(this ICacheResizer self, long totalCapacity) {
-			self.CalcCapacity(
-				unreservedCapacity: totalCapacity - self.ReservedCapacity,
-				totalWeight: self.Weight);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Caching/IDynamicCache.cs b/src/EventStore.Core/Caching/IDynamicCache.cs
deleted file mode 100644
index 5fe6b5a0421..00000000000
--- a/src/EventStore.Core/Caching/IDynamicCache.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace EventStore.Core.Caching {
-	// This has its capacity adjusted by the ICacheResizer
-	public interface IDynamicCache {
-		string Name { get; }
-		long Capacity { get; }
-		long Size { get; }
-		// Number of items in cache
-		long Count { get; }
-		// Approximate amount freed but not yet garbage collected
-		long FreedSize { get; }
-		void SetCapacity(long capacity);
-		void ResetFreedSize();
-		// todo: hits and misses
-	}
-}
diff --git a/src/EventStore.Core/Caching/MemSizer.cs b/src/EventStore.Core/Caching/MemSizer.cs
deleted file mode 100644
index eabd6c35637..00000000000
--- a/src/EventStore.Core/Caching/MemSizer.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.Caching {
-	public class MemSizer {
-		public const int ObjectHeaderSize = 16;
-		public const int ArraySize = 24;
-		public const int StringSize = 20;
-		private const int DictionaryEntryOverhead = 12;
-		private const int LinkedListNodeOverhead = 40;
-		public const int LinkedListEntrySize = 0;
-
-		public static int SizeOf(string s) {
-			if (string.IsNullOrEmpty(s))
-				return 0;
-			return (StringSize + s.Length * 2 + 1).RoundUpToMultipleOf(IntPtr.Size);
-		}
-
-		public static int SizeOf(string[] arr) {
-			if (arr == null)
-				return 0;
-
-			var size = 0;
-			size += ArraySize; // string array
-			size += arr.Length * Unsafe.SizeOf<string>(); // string refs
-			size += arr.Sum(static x => SizeOf(x)); // strings
-			return size;
-		}
-
-		public static int SizeOfDictionaryEntry<TKey, TValue>() =>
-			DictionaryEntryOverhead + (Unsafe.SizeOf<TKey>() + Unsafe.SizeOf<TValue>()).RoundUpToMultipleOf(IntPtr.Size);
-
-		public static int SizeOfLinkedListNode<T>() =>
-			LinkedListNodeOverhead + Unsafe.SizeOf<T>().RoundUpToMultipleOf(IntPtr.Size);
-	}
-}
diff --git a/src/EventStore.Core/Caching/StaticCacheResizer.cs b/src/EventStore.Core/Caching/StaticCacheResizer.cs
deleted file mode 100644
index 76e513928a5..00000000000
--- a/src/EventStore.Core/Caching/StaticCacheResizer.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-using Serilog;
-
-namespace EventStore.Core.Caching {
-	public class StaticCacheResizer : CacheResizer, ICacheResizer {
-		private readonly long _capacity;
-
-		public StaticCacheResizer(ResizerUnit unit, long capacity, IDynamicCache cache)
-			: base(unit, cache) {
-			Ensure.Nonnegative(capacity, nameof(capacity));
-			_capacity = capacity;
-		}
-
-		public int Weight => 0;
-
-		public long ReservedCapacity => _capacity;
-
-		public void CalcCapacity(long unreservedCapacity, int totalWeight) {
-			Cache.SetCapacity(_capacity);
-			Log.Debug(
-				"{name} statically allotted {capacity:N0} " + Unit,
-				Name, Cache.Capacity);
-		}
-
-		public void ResetFreedSize() {
-			Cache.ResetFreedSize();
-		}
-
-		public IEnumerable<CacheStats> GetStats(string parentKey) {
-			yield return new CacheStats(BuildStatsKey(parentKey), Name, Cache.Capacity, Size, Count, numChildren: 0);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Certificates/CertificateProvider.cs b/src/EventStore.Core/Certificates/CertificateProvider.cs
deleted file mode 100644
index 4fde2e8dd55..00000000000
--- a/src/EventStore.Core/Certificates/CertificateProvider.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Security.Cryptography.X509Certificates;
-
-namespace EventStore.Core.Certificates {
-	public abstract class CertificateProvider {
-		public X509Certificate2 Certificate;
-		public X509Certificate2Collection IntermediateCerts;
-		public X509Certificate2Collection TrustedRootCerts;
-		public abstract LoadCertificateResult LoadCertificates(ClusterVNodeOptions options);
-		public abstract string GetReservedNodeCommonName();
-	}
-
-	public enum LoadCertificateResult {
-		Success = 1,
-		VerificationFailed,
-		Skipped
-	}
-}
diff --git a/src/EventStore.Core/Certificates/CertificateUtils.cs b/src/EventStore.Core/Certificates/CertificateUtils.cs
deleted file mode 100644
index c4454b77cfc..00000000000
--- a/src/EventStore.Core/Certificates/CertificateUtils.cs
+++ /dev/null
@@ -1,316 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Security.Cryptography.Pkcs;
-using System.Security.Cryptography.X509Certificates;
-using EventStore.Common.Utils;
-using System.Text;
-using EventStore.Core.Exceptions;
-
-namespace EventStore.Core {
-	public static class CertificateUtils {
-		public static X509Certificate2 LoadFromStore(StoreLocation storeLocation, StoreName storeName,
-			string certificateSubjectName, string certificateThumbprint) {
-			var store = new X509Store(storeName, storeLocation);
-			return GetCertificateFromStore(store, certificateSubjectName, certificateThumbprint);
-		}
-
-		public static X509Certificate2 LoadFromStore(StoreName storeName, string certificateSubjectName,
-			string certificateThumbprint) {
-			var store = new X509Store(storeName);
-			return GetCertificateFromStore(store, certificateSubjectName, certificateThumbprint);
-		}
-
-		private static bool TryReadPkcs12CertificateBundle
-			(string certificatePath,
-			string password,
-			out X509Certificate2 certificate,
-			out X509Certificate2Collection intermediates) {
-			var pkcs12Info =  Pkcs12Info.Decode(File.ReadAllBytes(certificatePath), out _);
-
-			var certs = new X509Certificate2Collection();
-			using var rsa = RSA.Create();
-			var privateKeyFound = false;
-
-			foreach (var safeContents in pkcs12Info.AuthenticatedSafe) {
-				if (safeContents.ConfidentialityMode == Pkcs12ConfidentialityMode.Password) {
-					safeContents.Decrypt(password);
-				}
-
-				foreach (var bag in safeContents.GetBags()) {
-					switch (bag)
-					{
-						case Pkcs12CertBag certBag:
-							certs.Add(certBag.GetCertificate());
-							break;
-						case Pkcs12ShroudedKeyBag shroudedKeyBag:
-						{
-							if (privateKeyFound) {
-								throw new Exception("Multiple private keys found");
-							}
-							var encryptedKey = shroudedKeyBag.EncryptedPkcs8PrivateKey;
-							rsa.ImportEncryptedPkcs8PrivateKey(password.AsSpan(), encryptedKey.Span, out _);
-							privateKeyFound = true;
-							break;
-						}
-					}
-				}
-			}
-
-			if (certs.Count == 0) {
-				throw new Exception("No certificates found");
-			}
-
-			if (!privateKeyFound) {
-				throw new Exception("No private keys found");
-			}
-
-			using var publicCertificate = certs[0];
-			using var publicWithPrivate = publicCertificate.CopyWithPrivateKey(rsa);
-			certs.RemoveAt(0);
-			certificate = new X509Certificate2(publicWithPrivate.ExportToPkcs12());
-			intermediates = certs.Count == 0 ? null : certs;
-			return true;
-		}
-
-		public static (X509Certificate2 certificate, X509Certificate2Collection intermediates) LoadFromFile(
-			string certificatePath,
-			string privateKeyPath,
-			string certificatePassword, string certificatePrivateKeyPassword = null) {
-
-			if (string.IsNullOrEmpty(privateKeyPath)) {
-				// no private key file - assume PKCS12 format
-				// the check is done on the private key file since an empty password may still be valid
-
-				try {
-					if (TryReadPkcs12CertificateBundle(
-						certificatePath,
-						certificatePassword,
-						out var nodeCertificate,
-						out var intermediateCertificates)) {
-						return (nodeCertificate, intermediateCertificates);
-					}
-				} catch(CryptographicException) {
-					// ignored
-				}
-
-				// if the above attempt failed, try to load the certificate via the standard constructor
-				var certificate = new X509Certificate2(certificatePath, certificatePassword);
-				if (!certificate.HasPrivateKey)
-					throw new NoCertificatePrivateKeyException();
-				return (certificate, null);
-			}
-
-			string[] allLines = File.ReadAllLines(privateKeyPath);
-			var header = allLines[0].Replace("-", "");
-			var privateKey = Convert.FromBase64String(string.Join(string.Empty, allLines.Skip(1).SkipLast(1)));
-
-			using var rsa = RSA.Create();
-			switch (header) {
-				case "BEGIN PRIVATE KEY":
-					rsa.ImportPkcs8PrivateKey(new ReadOnlySpan<byte>(privateKey), out _);
-					break;
-				case "BEGIN RSA PRIVATE KEY":
-					rsa.ImportRSAPrivateKey(new ReadOnlySpan<byte>(privateKey), out _);
-					break;
-				case "BEGIN ENCRYPTED PRIVATE KEY":
-					if (certificatePrivateKeyPassword is null) {
-						throw new ArgumentException(
-							"A password is required to read the certificate's private key file.");
-					}
-					try {
-						rsa.ImportEncryptedPkcs8PrivateKey(new ReadOnlySpan<byte>(Encoding.UTF8.GetBytes(certificatePrivateKeyPassword)), new ReadOnlySpan<byte>(privateKey), out _);
-					} catch (CryptographicException e) {
-						throw new ArgumentException(
-							"Failed to read the certificate's private key file. The password may be incorrect or the private key may not be an RSA key.", e);
-					}
-					break;
-				default:
-					throw new NotSupportedException($"Unsupported private key file format: {header}");
-					
-			}
-			
-
-			// assume it's a PEM bundle
-			var certificateBundle = new X509Certificate2Collection();
-			var bundleLoadSucceeded = false;
-			try {
-				certificateBundle.ImportFromPemFile(certificatePath);
-				bundleLoadSucceeded = true;
-			} catch {
-				// ignored
-			}
-
-			if (!bundleLoadSucceeded || certificateBundle.Count == 0) {
-				// make a last attempt to open the certificate, leaving the file format guess-work to the library
-				certificateBundle.Add(new X509Certificate2(certificatePath, certificatePassword));
-			}
-
-			using var publicCertificate = certificateBundle[0];
-			using var publicWithPrivate = publicCertificate.CopyWithPrivateKey(rsa);
-			var serverCertificate = new X509Certificate2(publicWithPrivate.ExportToPkcs12());
-			certificateBundle.RemoveAt(0);
-			var intermediates = certificateBundle.Count == 0 ? null : certificateBundle;
-
-			return (serverCertificate, intermediates);
-		}
-
-		private static X509Certificate2 GetCertificateFromStore(X509Store store, string certificateSubjectName,
-			string certificateThumbprint) {
-			try {
-				store.Open(OpenFlags.OpenExistingOnly);
-			} catch (Exception exc) {
-				throw new Exception(
-					string.Format("Could not open certificate store '{0}' in location {1}'.", store.Name,
-						store.Location), exc);
-			}
-
-			if (!string.IsNullOrWhiteSpace(certificateThumbprint)) {
-				var certificates = store.Certificates.Find(X509FindType.FindByThumbprint, certificateThumbprint, true);
-				if (certificates.Count == 0)
-					throw new Exception($"Could not find valid certificate with thumbprint '{certificateThumbprint}'.");
-
-				if (certificates.Count > 1)
-					throw new Exception(
-						$"Could not determine a unique certificate from thumbprint '{certificateThumbprint}'.");
-
-				return certificates[0];
-			}
-
-			if (!string.IsNullOrWhiteSpace(certificateSubjectName)) {
-				var certificates =
-					store.Certificates.Find(X509FindType.FindBySubjectName, certificateSubjectName, true);
-				if (certificates.Count == 0)
-					throw new Exception(
-						$"Could not find valid certificate with subject name '{certificateSubjectName}'.");
-
-				if (certificates.Count == 1) {
-					return certificates[0];
-				}
-
-				// If we get multiple of the same certificate, pick the one which expires last to allow rolling certificates
-				var certs = certificates.GetEnumerator();
-				X509Certificate2 mostRecentCert = null;
-				while (certs.MoveNext()) {
-					if (certs.Current is null) {
-						continue;
-					}
-
-					if (mostRecentCert is null) {
-						mostRecentCert = certs.Current;
-					} else if (certs.Current.NotAfter > mostRecentCert.NotAfter) {
-						mostRecentCert = certs.Current;
-					}
-				}
-
-				return mostRecentCert;
-			}
-
-			throw new ArgumentException(
-				"No thumbprint or subject name was specified for a certificate, but a certificate store was specified.");
-		}
-
-		public static IEnumerable<(string fileName,X509Certificate2 certificate)> LoadAllCertificates(string path) {
-			var files = Directory.GetFiles(path);
-			var acceptedExtensions = new[] {".crt", ".cert", ".cer", ".pem", ".der"};
-			foreach (var file in files) {
-				var fileInfo = new FileInfo(file);
-				var extension = fileInfo.Extension;
-				if (acceptedExtensions.Contains(extension)) {
-					X509Certificate2 cert;
-					try {
-						cert = new X509Certificate2(File.ReadAllBytes(file));
-					} catch (Exception exc) {
-						throw new AggregateException($"Error loading certificate file: {file}", exc);
-					}
-					yield return (file, cert);
-				}
-			}
-		}
-
-		public static StoreLocation GetCertificateStoreLocation(string certificateStoreLocation) {
-			if (!Enum.TryParse(certificateStoreLocation, out StoreLocation location))
-				throw new Exception($"Could not find certificate store location '{certificateStoreLocation}'");
-			return location;
-		}
-
-		public static StoreName GetCertificateStoreName(string certificateStoreName) {
-			if (!Enum.TryParse(certificateStoreName, out StoreName name))
-				throw new Exception($"Could not find certificate store name '{certificateStoreName}'");
-			return name;
-		}
-
-		public static X509ChainStatusFlags BuildChain(X509Certificate certificate,
-			X509Certificate2Collection intermediateCerts, X509Certificate2Collection trustedRootCerts,
-			out List<string> statusInformation) {
-			using var chain = new X509Chain {
-				ChainPolicy = {
-					RevocationMode = X509RevocationMode.NoCheck,
-					TrustMode = X509ChainTrustMode.CustomRootTrust,
-					DisableCertificateDownloads = true
-				}
-			};
-
-			if (trustedRootCerts != null) {
-				foreach (var cert in trustedRootCerts) {
-					chain.ChainPolicy.CustomTrustStore.Add(cert);
-				}
-			}
-
-			if (intermediateCerts != null) {
-				foreach (var cert in intermediateCerts) {
-					chain.ChainPolicy.ExtraStore.Add(cert);
-				}
-			}
-
-			chain.Build(new X509Certificate2(certificate));
-
-			var chainStatus = X509ChainStatusFlags.NoError;
-			statusInformation = new List<string>();
-
-			var cn = ((X509Certificate2)certificate).GetCommonName();
-
-			foreach (var status in chain.ChainStatus) {
-				chainStatus |= status.Status;
-				statusInformation.Add($"{cn} : {status.StatusInformation}");
-			}
-
-			return chainStatus;
-		}
-
-		public static bool IsValidNodeCertificate(X509Certificate2 certificate, out string error) {
-			if (certificate.HasPrivateKey) {
-				error = null;
-				return true;
-			}
-
-			error = $"Node's certificate with thumbprint '{certificate.Thumbprint}' has no associated private key.";
-			return false;
-		}
-
-		public static bool IsValidIntermediateCertificate(X509Certificate2 certificate, out string error) {
-			if (certificate.SubjectName.Name != certificate.IssuerName.Name) {
-				error = null;
-				return true;
-			}
-
-			error = $"Certificate with thumbprint '{certificate.Thumbprint}' does not appear to be a valid intermediate certificate " +
-			        $"since it is self-signed (subject = {certificate.SubjectName.Name}, issuer = {certificate.IssuerName.Name}).";
-			return false;
-		}
-
-		public static bool IsValidRootCertificate(X509Certificate2 certificate, out string error) {
-			if (certificate.SubjectName.Name == certificate.IssuerName.Name) {
-				error = null;
-				return true;
-			}
-
-			error =
-				$"Certificate with thumbprint '{certificate.Thumbprint}' does not appear to be a valid root certificate " +
-				$"since it is not self-signed (subject = {certificate.SubjectName.Name}, issuer = {certificate.IssuerName.Name}).";
-			return false;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Certificates/DevCertificateProvider.cs b/src/EventStore.Core/Certificates/DevCertificateProvider.cs
deleted file mode 100644
index 871fa7409d8..00000000000
--- a/src/EventStore.Core/Certificates/DevCertificateProvider.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Security.Cryptography.X509Certificates;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.Certificates {
-	public class DevCertificateProvider : CertificateProvider {
-		public DevCertificateProvider(X509Certificate2 certificate) {
-			Certificate = certificate;
-			TrustedRootCerts = new X509Certificate2Collection(certificate);
-		}
-		public override LoadCertificateResult LoadCertificates(ClusterVNodeOptions options) {
-			return LoadCertificateResult.Skipped;
-		}
-
-		public override string GetReservedNodeCommonName() {
-			return Certificate.GetCommonName();
-		}
-	}
-}
diff --git a/src/EventStore.Core/Certificates/OptionsCertificateProvider.cs b/src/EventStore.Core/Certificates/OptionsCertificateProvider.cs
deleted file mode 100644
index e070bf17069..00000000000
--- a/src/EventStore.Core/Certificates/OptionsCertificateProvider.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-using System;
-using System.Runtime;
-using System.Security.Cryptography.X509Certificates;
-using EventStore.Common.Utils;
-using Serilog;
-
-namespace EventStore.Core.Certificates {
-	public class OptionsCertificateProvider: CertificateProvider {
-		private static readonly ILogger Log = Serilog.Log.ForContext<ClusterVNode>();
-		private string _cachedReservedNodeCN;
-
-		public override LoadCertificateResult LoadCertificates(ClusterVNodeOptions options) {
-			if (options.Application.Insecure) {
-				Log.Information("Skipping reload of certificates since TLS is disabled.");
-				return LoadCertificateResult.Skipped;
-			}
-
-			var (certificate, intermediates) = options.LoadNodeCertificate();
-
-			string reservedNodeCN;
-			var reservedNodeCNOption = nameof(options.Certificate.CertificateReservedNodeCommonName);
-
-			if (options.Certificate.CertificateReservedNodeCommonName.IsNotEmptyString()) {
-				reservedNodeCN = options.Certificate.CertificateReservedNodeCommonName;
-				if (!certificate.ClientCertificateMatchesName(reservedNodeCN)) {
-					var certificateCN = certificate.GetCommonName();
-					Log.Error(
-						"Certificate CN: {certificateCN} does not match with the {reservedNodeCNOption} configuration setting: {reservedNodeCN}",
-						certificateCN, reservedNodeCNOption, reservedNodeCN);
-					return LoadCertificateResult.VerificationFailed;
-				}
-				Log.Information("{reservedNodeCNOption} configured to: {reservedNodeCN}",
-					reservedNodeCNOption, reservedNodeCN);
-			} else {
-				reservedNodeCN = certificate.GetCommonName();
-				Log.Information("{reservedNodeCNOption} auto-configured to: {reservedNodeCN} based on certificate",
-					reservedNodeCNOption, reservedNodeCN);
-			}
-
-			var previousThumbprint = Certificate?.Thumbprint;
-			var newThumbprint = certificate.Thumbprint;
-			Log.Information("Loading the node's certificate. Subject: {subject}, Previous thumbprint: {previousThumbprint}, New thumbprint: {newThumbprint}",
-				certificate.SubjectName.Name, previousThumbprint, newThumbprint);
-			
-			if (intermediates != null) {
-				foreach (var intermediateCert in intermediates) {
-					Log.Information("Loading intermediate certificate. Subject: {subject}, Thumbprint: {thumbprint}", intermediateCert.SubjectName.Name, intermediateCert.Thumbprint);
-				}
-			}
-
-			var trustedRootCerts = options.LoadTrustedRootCertificates();
-
-			foreach (var trustedRootCert in trustedRootCerts) {
-				Log.Information("Loading trusted root certificate. Subject: {subject}, Thumbprint: {thumbprint}", trustedRootCert.SubjectName.Name, trustedRootCert.Thumbprint);
-			}
-
-			if (!VerifyCertificates(certificate, intermediates, trustedRootCerts)) {
-				return LoadCertificateResult.VerificationFailed;
-			}
-
-			// no need for a lock here since reference assignment is atomic. however, other threads may not immediately
-			// see the changes and the order in which they see the changes is also not guaranteed as we don't have any
-			// memory barriers here. this is not a problem as in the worst case, it will cause the certificate verifications
-			// to fail when establishing/receiving a connection and the next connection retries will succeed.
-			Certificate = certificate;
-			IntermediateCerts = intermediates;
-			TrustedRootCerts = trustedRootCerts;
-			_cachedReservedNodeCN = reservedNodeCN;
-
-			Log.Information("All certificates successfully loaded.");
-			return LoadCertificateResult.Success;
-		}
-
-		public override string GetReservedNodeCommonName() {
-			return _cachedReservedNodeCN ?? throw new InvalidOperationException("Certificates are not loaded.");
-		}
-
-		private static bool VerifyCertificates(X509Certificate2 nodeCertificate, X509Certificate2Collection intermediates, X509Certificate2Collection trustedRoots) {
-			bool error = false;
-
-			if (!CertificateUtils.IsValidNodeCertificate(nodeCertificate, out var errorMsg)) {
-				Log.Error(errorMsg);
-				error = true;
-			}
-
-			if (intermediates != null) {
-				foreach (var cert in intermediates) {
-					if (!CertificateUtils.IsValidIntermediateCertificate(cert, out errorMsg)) {
-						Log.Error($"{errorMsg} Please bundle only intermediate certificates (if any) and not root certificates with the node's certificate.");
-						error = true;
-					}
-				}
-			}
-
-			if (trustedRoots != null && trustedRoots.Count > 0) {
-				foreach (var cert in trustedRoots) {
-					if (!CertificateUtils.IsValidRootCertificate(cert, out errorMsg)) {
-						Log.Error($"{errorMsg} If you have intermediate certificates, please bundle them with the node's certificate (in PEM or PKCS #12 format).");
-						error = true;
-					}
-				}
-			} else {
-				Log.Error("No trusted root certificates loaded");
-				error = true;
-			}
-
-			if (error) return false;
-
-			var chainStatus = CertificateUtils.BuildChain(nodeCertificate, intermediates, trustedRoots, out var chainStatusInformation );
-
-			if (chainStatus != X509ChainStatusFlags.NoError) {
-				Log.Error(
-					"Failed to build the certificate chain with the node's own certificate up to the root. " +
-					"If you have intermediate certificates, please bundle them with the node's certificate (in PEM or PKCS #12 format). Errors:-");
-				foreach (var status in chainStatusInformation) {
-					Log.Error(status);
-				}
-
-				error = true;
-			}
-
-			if (!error && intermediates != null) {
-				chainStatus = CertificateUtils.BuildChain(nodeCertificate, null, trustedRoots, out chainStatusInformation);
-
-				// Adding the intermediate certificates to the store is required so that
-				// i)  the full certificate chain (excluding the root) is sent from client to server (on both Windows/Linux)
-				//     and from server to client (on Windows only) during the TLS connection establishment
-				// ii) to prevent AIA certificate downloads
-				//
-				// see: https://github.com/dotnet/runtime/issues/47680#issuecomment-771093045
-				// and https://github.com/dotnet/runtime/issues/59979
-
-				if (chainStatus != X509ChainStatusFlags.NoError) {
-					Log.Warning(
-						"For correct functioning and optimal performance, please add your intermediate certificates to the current user's " +
-							(RuntimeInformation.IsWindows ?
-							"'Intermediate Certification Authorities' certificate store." :
-							"'CertificateAuthority' certificate store using the dotnet-certificate-tool.")
-					);
-				}
-			}
-
-			if (!error) {
-				Log.Information("Certificate chain verification successful.");
-			}
-
-			return !error;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Cluster/ClientClusterInfo.cs b/src/EventStore.Core/Cluster/ClientClusterInfo.cs
deleted file mode 100644
index 04236b754b5..00000000000
--- a/src/EventStore.Core/Cluster/ClientClusterInfo.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.Cluster {
-	public class ClientClusterInfo {
-		public ClientMemberInfo[] Members { get; set; }
-		public string ServerIp { get; set; }
-		public int ServerPort { get; set; }
-
-		public ClientClusterInfo() {
-		}
-
-		public ClientClusterInfo(ClusterInfo clusterInfo, string serverIp, int serverPort) {
-			Members = clusterInfo.Members.Select(x => new ClientMemberInfo(x)).ToArray();
-			ServerIp = serverIp;
-			ServerPort = serverPort;
-		}
-
-		public override string ToString() {
-			return string.Format("Server: {0}:{1}, Members: [{2}]",
-				ServerIp, ServerPort,
-				Members != null ? string.Join(",", Members.Select(m => m.ToString())) : "null");
-		}
-
-		public class ClientMemberInfo {
-			public Guid InstanceId { get; set; }
-
-			public DateTime TimeStamp { get; set; }
-			public VNodeState State { get; set; }
-			public bool IsAlive { get; set; }
-
-			public string InternalTcpIp { get; set; }
-			public int InternalTcpPort { get; set; }
-			public int InternalSecureTcpPort { get; set; }
-
-			public string ExternalTcpIp { get; set; }
-			public int ExternalTcpPort { get; set; }
-			public int ExternalSecureTcpPort { get; set; }
-
-			public string InternalHttpEndPointIp { get; set; }
-			public int InternalHttpEndPointPort { get; set; }
-
-			public string HttpEndPointIp { get; set; }
-			public int HttpEndPointPort { get; set; }
-
-			public long LastCommitPosition { get; set; }
-			public long WriterCheckpoint { get; set; }
-			public long ChaserCheckpoint { get; set; }
-
-			public long EpochPosition { get; set; }
-			public int EpochNumber { get; set; }
-			public Guid EpochId { get; set; }
-
-			public int NodePriority { get; set; }
-			public bool IsReadOnlyReplica { get; set; }
-			
-			public string ESVersion { get; set; }
-
-			public ClientMemberInfo() {
-			}
-
-			public ClientMemberInfo(MemberInfo member) {
-				InstanceId = member.InstanceId;
-
-				TimeStamp = member.TimeStamp;
-				State = member.State;
-				IsAlive = member.IsAlive;
-
-				InternalTcpIp = member.InternalTcpEndPoint is null
-					? member.InternalSecureTcpEndPoint.GetHost()
-					: member.InternalTcpEndPoint.GetHost();
-				InternalSecureTcpPort = member.InternalSecureTcpEndPoint?.GetPort() ?? 0;
-				InternalTcpPort = member.InternalTcpEndPoint?.GetPort() ?? 0;
-
-				InternalHttpEndPointIp = member.HttpEndPoint.GetHost();
-				InternalHttpEndPointPort = member.HttpEndPoint.GetPort();
-
-				HttpEndPointIp = string.IsNullOrEmpty(member.AdvertiseHostToClientAs)
-					? member.HttpEndPoint.GetHost()
-					: member.AdvertiseHostToClientAs;
-				HttpEndPointPort = member.AdvertiseHttpPortToClientAs == 0
-					? member.HttpEndPoint.GetPort()
-					: member.AdvertiseHttpPortToClientAs;
-
-				ExternalTcpIp = string.IsNullOrEmpty(member.AdvertiseHostToClientAs)
-					? member.ExternalSecureTcpEndPoint?.GetHost() ??
-					  member.ExternalTcpEndPoint?.GetHost() ?? member.HttpEndPoint.GetHost()
-					: member.AdvertiseHostToClientAs;
-
-				ExternalTcpPort = member.AdvertiseTcpPortToClientAs == 0
-					? member.ExternalTcpEndPoint?.GetPort() ?? 0
-					: member.AdvertiseTcpPortToClientAs;
-				ExternalSecureTcpPort = member.AdvertiseTcpPortToClientAs == 0
-					? member.ExternalSecureTcpEndPoint?.GetPort() ?? 0
-					: member.AdvertiseTcpPortToClientAs;
-
-				LastCommitPosition = member.LastCommitPosition;
-				WriterCheckpoint = member.WriterCheckpoint;
-				ChaserCheckpoint = member.ChaserCheckpoint;
-
-				EpochPosition = member.EpochPosition;
-				EpochNumber = member.EpochNumber;
-				EpochId = member.EpochId;
-
-				NodePriority = member.NodePriority;
-				IsReadOnlyReplica = member.IsReadOnlyReplica;
-
-				ESVersion = member.ESVersion;
-			}
-
-			public override string ToString() {
-				return
-					$"InstanceId: {InstanceId:B}, TimeStamp: {TimeStamp:yyyy-MM-dd HH:mm:ss.fff}, State: {State}, IsAlive: {IsAlive}, " +
-					$"InternalTcpIp: {InternalTcpIp}, InternalTcpPort: {InternalTcpPort}, InternalSecureTcpPort: {InternalSecureTcpPort}, " +
-					$"ExternalTcpIp: {ExternalTcpIp}, ExternalTcpPort: {ExternalTcpPort}, ExternalSecureTcpPort: {ExternalSecureTcpPort}, " +
-					$"InternalHttpEndPointIp: {InternalHttpEndPointIp}, InternalHttpEndPointPort: {InternalHttpEndPointPort}, " +
-					$"HttpEndPointIp: {HttpEndPointIp}, HttpEndPointPort: {HttpEndPointPort}, " +
-					$"LastCommitPosition: {LastCommitPosition}, WriterCheckpoint: {WriterCheckpoint}, ChaserCheckpoint: {ChaserCheckpoint}, " +
-					$"EpochPosition: {EpochPosition}, EpochNumber: {EpochNumber}, EpochId: {EpochId:B}, NodePriority: {NodePriority}, " +
-					$"IsReadOnlyReplica: {IsReadOnlyReplica}, ESVersion: ${ESVersion}";
-			}
-		}
-	}
-}
-
diff --git a/src/EventStore.Core/Cluster/ClusterInfo.cs b/src/EventStore.Core/Cluster/ClusterInfo.cs
deleted file mode 100644
index 14a09458660..00000000000
--- a/src/EventStore.Core/Cluster/ClusterInfo.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using EventStore.Client;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Transport.Grpc;
-
-namespace EventStore.Core.Cluster {
-	public class ClusterInfo {
-		private static readonly EndPointComparer Comparer = new EndPointComparer();
-
-		public readonly MemberInfo[] Members;
-
-		public ClusterInfo(params MemberInfo[] members) : this((IEnumerable<MemberInfo>)members) {
-		}
-
-		public ClusterInfo(IEnumerable<MemberInfo> members) {
-			Members = members.Safe().OrderByDescending<MemberInfo, EndPoint>(x => x.HttpEndPoint, Comparer)
-				.ToArray();
-		}
-
-		public ClusterInfo(ClusterInfoDto dto) {
-			Members = dto.Members.Safe().Select(x => new MemberInfo(x))
-				.OrderByDescending<MemberInfo, EndPoint>(x => x.HttpEndPoint, Comparer).ToArray();
-		}
-
-		public override string ToString() {
-			return string.Join("\n", Members.Select(s => s.ToString()));
-		}
-
-		public bool HasChangedSince(ClusterInfo other) {
-			if (ReferenceEquals(null, other)) return true;
-			if (ReferenceEquals(this, other)) return false;
-
-			if (other.Members.Length != Members.Length)
-				return true;
-
-			for (int i = 0; i < Members.Length; i++) {
-				if (!Members[i].Equals(other.Members[i]))
-					return true;
-			}
-
-			return false;
-		}
-		
-		internal static ClusterInfo FromGrpcClusterInfo(EventStore.Cluster.ClusterInfo grpcCluster, string clusterDns) {
-			var receivedMembers = Array.ConvertAll(grpcCluster.Members.ToArray(), x =>
-				new MemberInfo(
-					Uuid.FromDto(x.InstanceId).ToGuid(), x.TimeStamp.FromTicksSinceEpoch(), (VNodeState)x.State,
-					x.IsAlive,
-					!x.InternalTcpUsesTls ? new DnsEndPoint(x.InternalTcp.Address, (int)x.InternalTcp.Port).WithClusterDns(clusterDns) : null,
-					x.InternalTcpUsesTls ? new DnsEndPoint(x.InternalTcp.Address, (int)x.InternalTcp.Port).WithClusterDns(clusterDns) : null,
-					!x.ExternalTcpUsesTls && x.ExternalTcp != null
-						? new DnsEndPoint(x.ExternalTcp.Address, (int)x.ExternalTcp.Port).WithClusterDns(clusterDns)
-						: null,
-					x.ExternalTcpUsesTls && x.ExternalTcp != null
-						? new DnsEndPoint(x.ExternalTcp.Address, (int)x.ExternalTcp.Port).WithClusterDns(clusterDns)
-						: null,
-					new DnsEndPoint(x.HttpEndPoint.Address, (int)x.HttpEndPoint.Port).WithClusterDns(clusterDns),
-					x.AdvertiseHostToClientAs, (int)x.AdvertiseHttpPortToClientAs, (int)x.AdvertiseTcpPortToClientAs,
-					x.LastCommitPosition, x.WriterCheckpoint, x.ChaserCheckpoint,
-					x.EpochPosition, x.EpochNumber, Uuid.FromDto(x.EpochId).ToGuid(), x.NodePriority,
-					x.IsReadOnlyReplica, x.EsVersion == String.Empty ? null : x.EsVersion
-				)).ToArray();
-			return new ClusterInfo(receivedMembers);
-		}
-
-		internal static EventStore.Cluster.ClusterInfo ToGrpcClusterInfo(ClusterInfo cluster) {
-			var members = Array.ConvertAll(cluster.Members, x => new EventStore.Cluster.MemberInfo {
-				InstanceId = Uuid.FromGuid(x.InstanceId).ToDto(),
-				TimeStamp = x.TimeStamp.ToTicksSinceEpoch(),
-				State = (EventStore.Cluster.MemberInfo.Types.VNodeState)x.State,
-				IsAlive = x.IsAlive,
-				HttpEndPoint = new EventStore.Cluster.EndPoint(
-					x.HttpEndPoint.GetHost(),
-					(uint)x.HttpEndPoint.GetPort()),
-				InternalTcp = x.InternalSecureTcpEndPoint != null ?
-					new EventStore.Cluster.EndPoint(
-						x.InternalSecureTcpEndPoint.GetHost(),
-						(uint)x.InternalSecureTcpEndPoint.GetPort()) :
-					new EventStore.Cluster.EndPoint(
-					x.InternalTcpEndPoint.GetHost(),
-					(uint)x.InternalTcpEndPoint.GetPort()),
-				InternalTcpUsesTls = x.InternalSecureTcpEndPoint != null,
-				ExternalTcp = x.ExternalSecureTcpEndPoint != null ?
-					new EventStore.Cluster.EndPoint(
-						x.ExternalSecureTcpEndPoint.GetHost(),
-						(uint)x.ExternalSecureTcpEndPoint.GetPort()) :
-					x.ExternalTcpEndPoint != null ?
-					new EventStore.Cluster.EndPoint(
-					x.ExternalTcpEndPoint.GetHost(),
-					(uint)x.ExternalTcpEndPoint.GetPort()) : null,
-				ExternalTcpUsesTls = x.ExternalSecureTcpEndPoint != null,
-				LastCommitPosition = x.LastCommitPosition,
-				WriterCheckpoint = x.WriterCheckpoint,
-				ChaserCheckpoint = x.ChaserCheckpoint,
-				EpochPosition = x.EpochPosition,
-				EpochNumber = x.EpochNumber,
-				EpochId = Uuid.FromGuid(x.EpochId).ToDto(),
-				NodePriority = x.NodePriority,
-				IsReadOnlyReplica = x.IsReadOnlyReplica,
-				AdvertiseHostToClientAs = x.AdvertiseHostToClientAs ?? "",
-				AdvertiseHttpPortToClientAs = (uint)x.AdvertiseHttpPortToClientAs,
-				AdvertiseTcpPortToClientAs = (uint)x.AdvertiseTcpPortToClientAs,
-				EsVersion = x.ESVersion ?? String.Empty
-			}).ToArray();
-			var info = new EventStore.Cluster.ClusterInfo();
-			info.Members.AddRange(members);
-			return info;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Cluster/EndPoint.cs b/src/EventStore.Core/Cluster/EndPoint.cs
deleted file mode 100644
index b56f5e82d9d..00000000000
--- a/src/EventStore.Core/Cluster/EndPoint.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace EventStore.Cluster {
-	public partial class EndPoint {
-		public EndPoint(string address, uint port) {
-			address_ = address;
-			port_ = port;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Cluster/EventStoreClusterClient.Elections.cs b/src/EventStore.Core/Cluster/EventStoreClusterClient.Elections.cs
deleted file mode 100644
index 1495c73eec5..00000000000
--- a/src/EventStore.Core/Cluster/EventStoreClusterClient.Elections.cs
+++ /dev/null
@@ -1,200 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Cluster;
-using EventStore.Common.Utils;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Transport.Grpc;
-using EndPoint = System.Net.EndPoint;
-using GossipEndPoint = EventStore.Cluster.EndPoint;
-
-namespace EventStore.Core.Cluster {
-	public partial class EventStoreClusterClient {
-		public void SendViewChange(ElectionMessage.ViewChange msg, EndPoint destinationEndpoint, DateTime deadline) {
-			SendViewChangeAsync(msg.ServerId, msg.ServerHttpEndPoint, msg.AttemptedView, deadline).ContinueWith(r => {
-				if (r.Exception != null) {
-					Log.Information(r.Exception, "View Change Send Failed to {Server}", destinationEndpoint);
-				}
-			});
-		}
-
-		public void SendViewChangeProof(ElectionMessage.ViewChangeProof msg, EndPoint destinationEndpoint,
-			DateTime deadline) {
-			SendViewChangeProofAsync(msg.ServerId, msg.ServerHttpEndPoint, msg.InstalledView, deadline).ContinueWith(
-				r => {
-					if (r.Exception != null) {
-						Log.Information(r.Exception, "View Change Proof Send Failed to {Server}",
-							destinationEndpoint);
-					}
-				});
-		}
-
-		public void SendPrepare(ElectionMessage.Prepare msg, EndPoint destinationEndpoint, DateTime deadline) {
-			SendPrepareAsync(msg.ServerId, msg.ServerHttpEndPoint, msg.View, deadline).ContinueWith(r => {
-				if (r.Exception != null) {
-					Log.Information(r.Exception, "Prepare Send Failed to {Server}", destinationEndpoint);
-				}
-			});
-		}
-
-		public void SendPrepareOk(ElectionMessage.PrepareOk prepareOk, EndPoint destinationEndpoint,
-			DateTime deadline) {
-			SendPrepareOkAsync(prepareOk.View, prepareOk.ServerId, prepareOk.ServerHttpEndPoint, prepareOk.EpochNumber,
-					prepareOk.EpochPosition, prepareOk.EpochId, prepareOk.EpochLeaderInstanceId, prepareOk.LastCommitPosition,
-					prepareOk.WriterCheckpoint,
-					prepareOk.ChaserCheckpoint, prepareOk.NodePriority, prepareOk.ClusterInfo, deadline)
-				.ContinueWith(r => {
-					if (r.Exception != null) {
-						Log.Information(r.Exception, "Prepare OK Send Failed to {Server}",
-							destinationEndpoint);
-					}
-				});
-		}
-
-		public void SendProposal(ElectionMessage.Proposal proposal, EndPoint destinationEndpoint, DateTime deadline) {
-			SendProposalAsync(proposal.ServerId, proposal.ServerHttpEndPoint, proposal.LeaderId,
-					proposal.LeaderHttpEndPoint,
-					proposal.View, proposal.EpochNumber, proposal.EpochPosition, proposal.EpochId,proposal.EpochLeaderInstanceId,
-					proposal.LastCommitPosition, proposal.WriterCheckpoint, proposal.ChaserCheckpoint,
-					proposal.NodePriority,
-					deadline)
-				.ContinueWith(r => {
-					if (r.Exception != null) {
-						Log.Information(r.Exception, "Proposal Send Failed to {Server}",
-							destinationEndpoint);
-					}
-				});
-		}
-
-		public void SendAccept(ElectionMessage.Accept accept, EndPoint destinationEndpoint, DateTime deadline) {
-			SendAcceptAsync(accept.ServerId, accept.ServerHttpEndPoint, accept.LeaderId, accept.LeaderHttpEndPoint,
-					accept.View, deadline)
-				.ContinueWith(r => {
-					if (r.Exception != null) {
-						Log.Information(r.Exception, "Accept Send Failed to {Server}", destinationEndpoint);
-					}
-				});
-		}
-
-		public void SendLeaderIsResigning(ElectionMessage.LeaderIsResigning resigning, EndPoint destinationEndpoint,
-			DateTime deadline) {
-			SendLeaderIsResigningAsync(resigning.LeaderId, resigning.LeaderHttpEndPoint, deadline).ContinueWith(r => {
-				if (r.Exception != null) {
-					Log.Information(r.Exception, "Leader is Resigning Send Failed to {Server}", destinationEndpoint);
-				}
-			});
-		}
-
-		public void SendLeaderIsResigningOk(ElectionMessage.LeaderIsResigningOk resigningOk,
-			EndPoint destinationEndpoint, DateTime deadline) {
-			SendLeaderIsResigningOkAsync(resigningOk.LeaderId, resigningOk.LeaderHttpEndPoint,
-				resigningOk.ServerId, resigningOk.ServerHttpEndPoint, deadline).ContinueWith(r => {
-				if (r.Exception != null) {
-					Log.Information(r.Exception, "Leader is Resigning Ok Send Failed to {Server}", destinationEndpoint);
-				}
-			});
-		}
-
-		private async Task SendViewChangeAsync(Guid serverId, EndPoint serverHttpEndPoint, int attemptedView,
-			DateTime deadline) {
-			var request = new ViewChangeRequest {
-				ServerId = Uuid.FromGuid(serverId).ToDto(),
-				ServerHttp = new GossipEndPoint(serverHttpEndPoint.GetHost(), (uint)serverHttpEndPoint.GetPort()),
-				AttemptedView = attemptedView
-			};
-			await _electionsClient.ViewChangeAsync(request, deadline: deadline.ToUniversalTime());
-		}
-
-		private async Task SendViewChangeProofAsync(Guid serverId, EndPoint serverHttpEndPoint, int installedView,
-			DateTime deadline) {
-			var request = new ViewChangeProofRequest {
-				ServerId = Uuid.FromGuid(serverId).ToDto(),
-				ServerHttp = new GossipEndPoint(serverHttpEndPoint.GetHost(), (uint)serverHttpEndPoint.GetPort()),
-				InstalledView = installedView
-			};
-			await _electionsClient.ViewChangeProofAsync(request, deadline: deadline.ToUniversalTime());
-		}
-
-		private async Task SendPrepareAsync(Guid serverId, EndPoint serverHttpEndPoint, int view, DateTime deadline) {
-			var request = new PrepareRequest {
-				ServerId = Uuid.FromGuid(serverId).ToDto(),
-				ServerHttp = new GossipEndPoint(serverHttpEndPoint.GetHost(), (uint)serverHttpEndPoint.GetPort()),
-				View = view
-			};
-			await _electionsClient.PrepareAsync(request, deadline: deadline.ToUniversalTime());
-		}
-
-		private async Task SendPrepareOkAsync(int view, Guid serverId, EndPoint serverHttpEndPoint, int epochNumber,
-			long epochPosition, Guid epochId, Guid epochLeaderInstanceId, long lastCommitPosition, long writerCheckpoint, long chaserCheckpoint,
-			int nodePriority, ClusterInfo clusterInfo, DateTime deadline) {
-			var request = new PrepareOkRequest {
-				View = view,
-				ServerId = Uuid.FromGuid(serverId).ToDto(),
-				ServerHttp = new GossipEndPoint(serverHttpEndPoint.GetHost(), (uint)serverHttpEndPoint.GetPort()),
-				EpochNumber = epochNumber,
-				EpochPosition = epochPosition,
-				EpochId = Uuid.FromGuid(epochId).ToDto(),
-				EpochLeaderInstanceId = Uuid.FromGuid(epochLeaderInstanceId).ToDto(),
-				LastCommitPosition = lastCommitPosition,
-				WriterCheckpoint = writerCheckpoint,
-				ChaserCheckpoint = chaserCheckpoint,
-				NodePriority = nodePriority,
-				ClusterInfo = ClusterInfo.ToGrpcClusterInfo(clusterInfo)
-			};
-			await _electionsClient.PrepareOkAsync(request, deadline: deadline.ToUniversalTime());
-		}
-
-		private async Task SendProposalAsync(Guid serverId, EndPoint serverHttpEndPoint, Guid leaderId,
-			EndPoint leaderHttp, int view, int epochNumber, long epochPosition, Guid epochId, Guid epochLeaderInstanceId,
-			long lastCommitPosition, long writerCheckpoint, long chaserCheckpoint, int nodePriority,
-			DateTime deadline) {
-			var request = new ProposalRequest {
-				ServerId = Uuid.FromGuid(serverId).ToDto(),
-				ServerHttp = new GossipEndPoint(serverHttpEndPoint.GetHost(), (uint)serverHttpEndPoint.GetPort()),
-				LeaderId = Uuid.FromGuid(leaderId).ToDto(),
-				LeaderHttp = new GossipEndPoint(leaderHttp.GetHost(), (uint)leaderHttp.GetPort()),
-				View = view,
-				EpochNumber = epochNumber,
-				EpochPosition = epochPosition,
-				EpochId = Uuid.FromGuid(epochId).ToDto(),
-				EpochLeaderInstanceId = Uuid.FromGuid(epochLeaderInstanceId).ToDto(),
-				LastCommitPosition = lastCommitPosition,
-				WriterCheckpoint = writerCheckpoint,
-				ChaserCheckpoint = chaserCheckpoint,
-				NodePriority = nodePriority
-			};
-			await _electionsClient.ProposalAsync(request, deadline: deadline.ToUniversalTime());
-		}
-
-		private async Task SendAcceptAsync(Guid serverId, EndPoint serverHttpEndPoint, Guid leaderId,
-			EndPoint leaderHttp, int view, DateTime deadline) {
-			var request = new AcceptRequest {
-				ServerId = Uuid.FromGuid(serverId).ToDto(),
-				ServerHttp = new GossipEndPoint(serverHttpEndPoint.GetHost(), (uint)serverHttpEndPoint.GetPort()),
-				LeaderId = Uuid.FromGuid(leaderId).ToDto(),
-				LeaderHttp = new GossipEndPoint(leaderHttp.GetHost(), (uint)leaderHttp.GetPort()),
-				View = view
-			};
-			await _electionsClient.AcceptAsync(request);
-			_electionsClient.Accept(request, deadline: deadline.ToUniversalTime());
-		}
-
-		private async Task SendLeaderIsResigningAsync(Guid leaderId, EndPoint leaderHttp, DateTime deadline) {
-			var request = new LeaderIsResigningRequest {
-				LeaderId = Uuid.FromGuid(leaderId).ToDto(),
-				LeaderHttp = new GossipEndPoint(leaderHttp.GetHost(), (uint)leaderHttp.GetPort()),
-			};
-			await _electionsClient.LeaderIsResigningAsync(request, deadline: deadline.ToUniversalTime());
-		}
-
-		private async Task SendLeaderIsResigningOkAsync(Guid leaderId, EndPoint leaderHttp,
-			Guid serverId, EndPoint serverHttpEndPoint, DateTime deadline) {
-			var request = new LeaderIsResigningOkRequest {
-				LeaderId = Uuid.FromGuid(leaderId).ToDto(),
-				LeaderHttp = new GossipEndPoint(leaderHttp.GetHost(), (uint)leaderHttp.GetPort()),
-				ServerId = Uuid.FromGuid(serverId).ToDto(),
-				ServerHttp = new GossipEndPoint(serverHttpEndPoint.GetHost(), (uint)serverHttpEndPoint.GetPort()),
-			};
-			await _electionsClient.LeaderIsResigningOkAsync(request, deadline: deadline.ToUniversalTime());
-		}
-	}
-}
diff --git a/src/EventStore.Core/Cluster/EventStoreClusterClient.Gossip.cs b/src/EventStore.Core/Cluster/EventStoreClusterClient.Gossip.cs
deleted file mode 100644
index b1676feee81..00000000000
--- a/src/EventStore.Core/Cluster/EventStoreClusterClient.Gossip.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Client;
-using EventStore.Cluster;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Common.Utils;
-using Empty = EventStore.Client.Empty;
-using ILogger = Serilog.ILogger;
-using EndPoint = System.Net.EndPoint;
-using GossipEndPoint = EventStore.Cluster.EndPoint;
-
-namespace EventStore.Core.Cluster {
-	public partial class EventStoreClusterClient {
-		private static readonly ILogger Log = Serilog.Log.ForContext<EventStoreClusterClient>();
-
-		public void SendGossip(GossipMessage.SendGossip sendGossip, EndPoint destinationEndpoint, DateTime deadline) {
-			SendGossipAsync(sendGossip.ClusterInfo, sendGossip.ServerEndPoint, deadline).ContinueWith(
-				async response => {
-					try {
-						_bus.Publish(new GossipMessage.GossipReceived(new CallbackEnvelope(_ => { }),
-							await response, destinationEndpoint));
-					} catch (Exception ex) {
-						_bus.Publish(new GossipMessage.GossipSendFailed(ex.Message, destinationEndpoint));
-					}
-				});
-		}
-
-		public void GetGossip(EndPoint destinationEndpoint, DateTime deadline) {
-			GetGossipAsync(deadline).ContinueWith(async response => {
-				try {
-					_bus.Publish(new GossipMessage.GetGossipReceived(await response,
-						destinationEndpoint));
-				} catch (Exception ex) {
-					_bus.Publish(new GossipMessage.GetGossipFailed(ex.Message, destinationEndpoint));
-				}
-			});
-		}
-
-		private async Task<ClusterInfo> SendGossipAsync(ClusterInfo clusterInfo,
-			EndPoint server, DateTime deadline) {
-
-			using var duration = _gossipSendTracker.Start();
-			try {
-				var request = new GossipRequest {
-					Info = ClusterInfo.ToGrpcClusterInfo(clusterInfo),
-					Server = new GossipEndPoint(server.GetHost(), (uint)server.GetPort())
-				};
-				var clusterInfoDto = await _gossipClient.UpdateAsync(request, deadline: deadline.ToUniversalTime());
-				return ClusterInfo.FromGrpcClusterInfo(clusterInfoDto, _clusterDns);
-			}
-			catch (Exception ex) {
-				duration.SetException(ex);
-				throw;
-			}
-		}
-
-		private async Task<ClusterInfo> GetGossipAsync(DateTime deadline) {
-			using var duration = _gossipGetTracker.Start();
-			try {
-				var clusterInfoDto = await _gossipClient.ReadAsync(new Empty(), deadline: deadline.ToUniversalTime());
-				return ClusterInfo.FromGrpcClusterInfo(clusterInfoDto, _clusterDns);
-			} catch (Exception ex) {
-				duration.SetException(ex);
-				throw;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Cluster/EventStoreClusterClient.cs b/src/EventStore.Core/Cluster/EventStoreClusterClient.cs
deleted file mode 100644
index 87b5654038f..00000000000
--- a/src/EventStore.Core/Cluster/EventStoreClusterClient.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Net;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Metrics;
-using EventStore.Core.Services.Transport.Http.NodeHttpClientFactory;
-using Grpc.Net.Client;
-using Serilog.Extensions.Logging;
-
-namespace EventStore.Core.Cluster {
-
-	public partial class EventStoreClusterClient : IDisposable {
-		private readonly EventStore.Cluster.Gossip.GossipClient _gossipClient;
-		private readonly EventStore.Cluster.Elections.ElectionsClient _electionsClient;
-
-		private readonly GrpcChannel _channel;
-		private readonly IPublisher _bus;
-		private readonly string _clusterDns;
-		private readonly IDurationTracker _gossipSendTracker;
-		private readonly IDurationTracker _gossipGetTracker;
-
-		public bool Disposed { get; private set; }
-
-		public EventStoreClusterClient(
-			IPublisher bus,
-			string uriScheme,
-			EndPoint nodeEndPoint,
-			INodeHttpClientFactory nodeHttpClientFactory,
-			string clusterDns,
-			IDurationTracker gossipSendTracker,
-			IDurationTracker gossipGetTracker) {
-
-			_clusterDns = clusterDns;
-
-			var httpClient = nodeHttpClientFactory.CreateHttpClient(nodeEndPoint.GetOtherNames());
-			httpClient.Timeout = Timeout.InfiniteTimeSpan;
-			httpClient.DefaultRequestVersion = new Version(2, 0);
-
-			var address = new UriBuilder(uriScheme, nodeEndPoint.GetHost(), nodeEndPoint.GetPort()).Uri;
-			_channel = GrpcChannel.ForAddress(address, new GrpcChannelOptions {
-				HttpClient = httpClient,
-				LoggerFactory = new SerilogLoggerFactory()
-			});
-			var callInvoker = _channel.CreateCallInvoker();
-			_gossipClient = new EventStore.Cluster.Gossip.GossipClient(callInvoker);
-			_electionsClient = new EventStore.Cluster.Elections.ElectionsClient(callInvoker);
-			_bus = bus;
-			_gossipSendTracker = gossipSendTracker;
-			_gossipGetTracker = gossipGetTracker;
-		}
-
-		public void Dispose() {
-			if (Disposed) return;
-			_channel.Dispose();
-			Disposed = true;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Cluster/EventStoreClusterClientCache.cs b/src/EventStore.Core/Cluster/EventStoreClusterClientCache.cs
deleted file mode 100644
index d164c8f4d92..00000000000
--- a/src/EventStore.Core/Cluster/EventStoreClusterClientCache.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Net;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using Microsoft.Extensions.Caching.Memory;
-
-namespace EventStore.Core.Cluster {
-	public class EventStoreClusterClientCache :
-		IHandle<ClusterClientMessage.CleanCache>,
-		IHandle<SystemMessage.SystemInit> {
-		private readonly TimeSpan _cacheCleaningInterval = TimeSpan.FromMinutes(1);
-
-		//TODO: Align with Gossip Dead Member Removal Time once the options is in ClusterNodeOptions
-		private readonly TimeSpan _oldCacheItemThreshold = TimeSpan.FromMinutes(30);
-		private readonly IPublisher _bus;
-		private readonly Func<EndPoint, IPublisher, EventStoreClusterClient> _clientFactory;
-		private readonly IEnvelope _publishEnvelope;
-		private readonly MemoryCache _cache;
-
-		public EventStoreClusterClientCache(IPublisher bus,
-			Func<EndPoint, IPublisher, EventStoreClusterClient> clientFactory, TimeSpan? cacheCleaningInterval = null,
-			TimeSpan? oldCacheItemThreshold = null) {
-			_bus = bus ?? throw new ArgumentNullException(nameof(bus));
-			_clientFactory = clientFactory ?? throw new ArgumentNullException(nameof(clientFactory));
-
-			_cacheCleaningInterval = cacheCleaningInterval ?? _cacheCleaningInterval;
-			_oldCacheItemThreshold = oldCacheItemThreshold ?? _oldCacheItemThreshold;
-
-			_publishEnvelope = _bus;
-			_cache = new MemoryCache(new MemoryCacheOptions {
-				ExpirationScanFrequency = _oldCacheItemThreshold
-			});
-		}
-
-		private void Start() {
-			_bus.Publish(TimerMessage.Schedule.Create(_cacheCleaningInterval, _publishEnvelope,
-				new ClusterClientMessage.CleanCache()));
-		}
-
-		public EventStoreClusterClient Get(EndPoint endpoint) {
-			return _cache.GetOrCreate(endpoint, item => {
-				item.SlidingExpiration = _oldCacheItemThreshold;
-				item.RegisterPostEvictionCallback(callback: EvictionCallback);
-				return _clientFactory(endpoint, _bus);
-			});
-		}
-
-		private static void EvictionCallback(object key, object value, EvictionReason reason, object state) {
-			if (value is IDisposable disposable) {
-				disposable.Dispose();
-			}
-		}
-
-		public void Handle(ClusterClientMessage.CleanCache message) {
-			_cache.Compact(0);
-			_bus.Publish(TimerMessage.Schedule.Create(_cacheCleaningInterval, _publishEnvelope,
-				new ClusterClientMessage.CleanCache()));
-		}
-
-		public void Handle(SystemMessage.SystemInit message) {
-			Start();
-		}
-	}
-}
diff --git a/src/EventStore.Core/Cluster/MemberInfo.cs b/src/EventStore.Core/Cluster/MemberInfo.cs
deleted file mode 100644
index f7016715c4c..00000000000
--- a/src/EventStore.Core/Cluster/MemberInfo.cs
+++ /dev/null
@@ -1,271 +0,0 @@
-using System;
-using System.Net;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.Cluster {
-	public class MemberInfo : IEquatable<MemberInfo> {
-		public readonly Guid InstanceId;
-
-		public readonly DateTime TimeStamp;
-		public readonly VNodeState State;
-		public readonly bool IsAlive;
-
-		public readonly EndPoint InternalTcpEndPoint;
-		public readonly EndPoint InternalSecureTcpEndPoint;
-		public readonly EndPoint ExternalTcpEndPoint;
-		public readonly EndPoint ExternalSecureTcpEndPoint;
-		public readonly EndPoint HttpEndPoint;
-		public readonly string AdvertiseHostToClientAs;
-		public readonly int AdvertiseHttpPortToClientAs;
-		public readonly int AdvertiseTcpPortToClientAs;
-
-		public readonly long LastCommitPosition;
-		public readonly long WriterCheckpoint;
-		public readonly long ChaserCheckpoint;
-		public readonly long EpochPosition;
-		public readonly int EpochNumber;
-		public readonly Guid EpochId;
-
-		public readonly int NodePriority;
-		public readonly bool IsReadOnlyReplica;
-
-		public readonly string ESVersion;
-		
-		public static MemberInfo ForManager(Guid instanceId, DateTime timeStamp, bool isAlive,
-			EndPoint httpEndPoint, string esVersion = VersionInfo.UnknownVersion) {
-			return new MemberInfo(instanceId, timeStamp, VNodeState.Manager, isAlive,
-				httpEndPoint, null, httpEndPoint, null,
-				httpEndPoint, null, 0, 0,
-				-1, -1, -1, -1, -1, Guid.Empty, 0, false, esVersion);
-		}
-
-		public static MemberInfo ForVNode(Guid instanceId,
-			DateTime timeStamp,
-			VNodeState state,
-			bool isAlive,
-			EndPoint internalTcpEndPoint,
-			EndPoint internalSecureTcpEndPoint,
-			EndPoint externalTcpEndPoint,
-			EndPoint externalSecureTcpEndPoint,
-			EndPoint httpEndPoint,
-			string advertiseHostToClientAs,
-			int advertiseHttpPortToClientAs,
-			int advertiseTcpPortToClientAs,
-			long lastCommitPosition,
-			long writerCheckpoint,
-			long chaserCheckpoint,
-			long epochPosition,
-			int epochNumber,
-			Guid epochId,
-			int nodePriority,
-			bool isReadOnlyReplica, string esVersion = VersionInfo.UnknownVersion) {
-			if (state == VNodeState.Manager)
-				throw new ArgumentException(string.Format("Wrong State for VNode: {0}", state), "state");
-			return new MemberInfo(instanceId, timeStamp, state, isAlive,
-				internalTcpEndPoint, internalSecureTcpEndPoint,
-				externalTcpEndPoint, externalSecureTcpEndPoint,
-				httpEndPoint, advertiseHostToClientAs, advertiseHttpPortToClientAs, advertiseTcpPortToClientAs,
-				lastCommitPosition, writerCheckpoint, chaserCheckpoint,
-				epochPosition, epochNumber, epochId, nodePriority, isReadOnlyReplica, esVersion);
-		}
-		
-		public static MemberInfo Initial(Guid instanceId,
-			DateTime timeStamp,
-			VNodeState state,
-			bool isAlive,
-			EndPoint internalTcpEndPoint,
-			EndPoint internalSecureTcpEndPoint,
-			EndPoint externalTcpEndPoint,
-			EndPoint externalSecureTcpEndPoint,
-			EndPoint httpEndPoint,
-			string advertiseHostToClientAs,
-			int advertiseHttpPortToClientAs,
-			int advertiseTcpPortToClientAs,
-			int nodePriority,
-			bool isReadOnlyReplica, string esVersion = VersionInfo.UnknownVersion) {
-			if (state == VNodeState.Manager)
-				throw new ArgumentException(string.Format("Wrong State for VNode: {0}", state), "state");
-			return new MemberInfo(instanceId, timeStamp, state, isAlive,
-				internalTcpEndPoint, internalSecureTcpEndPoint,
-				externalTcpEndPoint, externalSecureTcpEndPoint,
-				httpEndPoint, advertiseHostToClientAs, advertiseHttpPortToClientAs, advertiseTcpPortToClientAs,
-				-1, -1, -1, -1, -1, Guid.Empty, nodePriority, isReadOnlyReplica, esVersion);
-		}
-
-		internal MemberInfo(Guid instanceId, DateTime timeStamp, VNodeState state, bool isAlive,
-			EndPoint internalTcpEndPoint, EndPoint internalSecureTcpEndPoint,
-			EndPoint externalTcpEndPoint, EndPoint externalSecureTcpEndPoint,
-			EndPoint httpEndPoint, string advertiseHostToClientAs, int advertiseHttpPortToClientAs, int advertiseTcpPortToClientAs,
-			long lastCommitPosition, long writerCheckpoint, long chaserCheckpoint,
-			long epochPosition, int epochNumber, Guid epochId, int nodePriority, bool isReadOnlyReplica, string esVersion = null) {
-			Ensure.Equal(false, internalTcpEndPoint == null && internalSecureTcpEndPoint == null, "Both internal TCP endpoints are null");
-			Ensure.NotNull(httpEndPoint, nameof(httpEndPoint));
-
-			InstanceId = instanceId;
-
-			TimeStamp = timeStamp;
-			State = state;
-			IsAlive = isAlive;
-
-			InternalTcpEndPoint = internalTcpEndPoint;
-			InternalSecureTcpEndPoint = internalSecureTcpEndPoint;
-			ExternalTcpEndPoint = externalTcpEndPoint;
-			ExternalSecureTcpEndPoint = externalSecureTcpEndPoint;
-			HttpEndPoint = httpEndPoint;
-			AdvertiseHostToClientAs = advertiseHostToClientAs;
-			AdvertiseHttpPortToClientAs = advertiseHttpPortToClientAs;
-			AdvertiseTcpPortToClientAs = advertiseTcpPortToClientAs;
-
-			LastCommitPosition = lastCommitPosition;
-			WriterCheckpoint = writerCheckpoint;
-			ChaserCheckpoint = chaserCheckpoint;
-
-			EpochPosition = epochPosition;
-			EpochNumber = epochNumber;
-			EpochId = epochId;
-
-			NodePriority = nodePriority;
-			IsReadOnlyReplica = isReadOnlyReplica;
-
-			ESVersion = esVersion;
-		}
-
-		internal MemberInfo(MemberInfoDto dto) {
-			InstanceId = dto.InstanceId;
-			TimeStamp = dto.TimeStamp;
-			State = dto.State;
-			IsAlive = dto.IsAlive;
-			InternalTcpEndPoint = new DnsEndPoint(dto.InternalTcpIp, dto.InternalTcpPort);
-			InternalSecureTcpEndPoint = dto.InternalSecureTcpPort > 0
-				? new DnsEndPoint(dto.InternalTcpIp, dto.InternalSecureTcpPort)
-				: null;
-			ExternalTcpEndPoint = dto.ExternalTcpIp != null ? new DnsEndPoint(dto.ExternalTcpIp, dto.ExternalTcpPort) : null;
-			ExternalSecureTcpEndPoint = dto.ExternalTcpIp != null && dto.ExternalSecureTcpPort > 0
-				? new DnsEndPoint(dto.ExternalTcpIp, dto.ExternalSecureTcpPort)
-				: null;
-			HttpEndPoint = new DnsEndPoint(dto.HttpEndPointIp, dto.HttpEndPointPort);
-			AdvertiseHostToClientAs = dto.AdvertiseHostToClientAs;
-			AdvertiseHttpPortToClientAs = dto.AdvertiseHttpPortToClientAs;
-			AdvertiseTcpPortToClientAs = dto.AdvertiseTcpPortToClientAs;
-			LastCommitPosition = dto.LastCommitPosition;
-			WriterCheckpoint = dto.WriterCheckpoint;
-			ChaserCheckpoint = dto.ChaserCheckpoint;
-			EpochPosition = dto.EpochPosition;
-			EpochNumber = dto.EpochNumber;
-			EpochId = dto.EpochId;
-			NodePriority = dto.NodePriority;
-			IsReadOnlyReplica = dto.IsReadOnlyReplica;
-		}
-
-		public bool Is(EndPoint endPoint) {
-			return endPoint != null
-			       && HttpEndPoint.EndPointEquals(endPoint)
-			          || (InternalTcpEndPoint != null && InternalTcpEndPoint.EndPointEquals(endPoint))
-			          || (InternalSecureTcpEndPoint != null && InternalSecureTcpEndPoint.EndPointEquals(endPoint))
-			          || (ExternalTcpEndPoint != null && ExternalTcpEndPoint.EndPointEquals(endPoint))
-			          || (ExternalSecureTcpEndPoint != null && ExternalSecureTcpEndPoint.EndPointEquals(endPoint));
-		}
-		
-		public MemberInfo Updated(DateTime utcNow,
-			VNodeState? state = null,
-			bool? isAlive = null,
-			long? lastCommitPosition = null,
-			long? writerCheckpoint = null,
-			long? chaserCheckpoint = null,
-			EpochRecord epoch = null,
-			int? nodePriority = null, string esVersion = null) {
-			return new MemberInfo(InstanceId,
-				utcNow,
-				state ?? State,
-				isAlive ?? IsAlive,
-				InternalTcpEndPoint,
-				InternalSecureTcpEndPoint,
-				ExternalTcpEndPoint,
-				ExternalSecureTcpEndPoint,
-				HttpEndPoint,
-				AdvertiseHostToClientAs,
-				AdvertiseHttpPortToClientAs,
-				AdvertiseTcpPortToClientAs,
-				lastCommitPosition ?? LastCommitPosition,
-				writerCheckpoint ?? WriterCheckpoint,
-				chaserCheckpoint ?? ChaserCheckpoint,
-				epoch != null ? epoch.EpochPosition : EpochPosition,
-				epoch != null ? epoch.EpochNumber : EpochNumber,
-				epoch != null ? epoch.EpochId : EpochId,
-				nodePriority ?? NodePriority,
-				IsReadOnlyReplica, esVersion ?? ESVersion);
-		}
-
-		public override string ToString() {
-			if (State == VNodeState.Manager)
-				return
-					$"MAN {InstanceId:B} <{(IsAlive ? "LIVE" : "DEAD")}> [{State}, {HttpEndPoint}] | {TimeStamp:yyyy-MM-dd HH:mm:ss.fff}";
-			return
-				$"Priority: {NodePriority} VND {InstanceId:B} <{(IsAlive ? "LIVE" : "DEAD")}> [{State}, " +
-				$"{(InternalTcpEndPoint == null ? "n/a" : InternalTcpEndPoint.ToString())}, " +
-				$"{(InternalSecureTcpEndPoint == null ? "n/a" : InternalSecureTcpEndPoint.ToString())}, " +
-				$"{(ExternalTcpEndPoint == null ? "n/a" : ExternalTcpEndPoint.ToString())}, " +
-				$"{(ExternalSecureTcpEndPoint == null ? "n/a" : ExternalSecureTcpEndPoint.ToString())}, " +
-				$"{HttpEndPoint}, (ADVERTISED: HTTP:{AdvertiseHostToClientAs}:{AdvertiseHttpPortToClientAs}, TCP:{AdvertiseHostToClientAs}:{AdvertiseTcpPortToClientAs}), " +
-				$"Version: {ESVersion}] " + 
-				$"{LastCommitPosition}/{WriterCheckpoint}/{ChaserCheckpoint}/E{EpochNumber}@{EpochPosition}:{EpochId:B} | {TimeStamp:yyyy-MM-dd HH:mm:ss.fff}";
-		}
-
-		public bool Equals(MemberInfo other) {
-			// we ignore timestamp and checkpoints for equality comparison
-			if (ReferenceEquals(null, other)) return false;
-			if (ReferenceEquals(this, other)) return true;
-			return other.InstanceId == InstanceId
-			       && other.State == State
-			       && other.IsAlive == IsAlive
-			       && Equals(other.InternalTcpEndPoint, InternalTcpEndPoint)
-			       && Equals(other.InternalSecureTcpEndPoint, InternalSecureTcpEndPoint)
-			       && Equals(other.ExternalTcpEndPoint, ExternalTcpEndPoint)
-			       && Equals(other.ExternalSecureTcpEndPoint, ExternalSecureTcpEndPoint)
-			       && Equals(other.HttpEndPoint, HttpEndPoint)
-			       && other.AdvertiseHostToClientAs == AdvertiseHostToClientAs
-			       && other.AdvertiseHttpPortToClientAs == AdvertiseHttpPortToClientAs
-			       && other.AdvertiseTcpPortToClientAs == AdvertiseTcpPortToClientAs
-			       && other.EpochPosition == EpochPosition
-			       && other.EpochNumber == EpochNumber
-			       && other.EpochId == EpochId
-			       && other.NodePriority == NodePriority
-				   && other.IsReadOnlyReplica == IsReadOnlyReplica
-			       && other.ESVersion == ESVersion;
-		}
-
-		public override bool Equals(object obj) {
-			if (ReferenceEquals(null, obj)) return false;
-			if (ReferenceEquals(this, obj)) return true;
-			if (obj.GetType() != typeof(MemberInfo)) return false;
-			return Equals((MemberInfo)obj);
-		}
-
-		public override int GetHashCode() {
-			unchecked {
-				int result = InstanceId.GetHashCode();
-				result = (result * 397) ^ State.GetHashCode();
-				result = (result * 397) ^ IsAlive.GetHashCode();
-				result = (result * 397) ^ (InternalTcpEndPoint != null ? InternalTcpEndPoint.GetHashCode() : 0);
-				result = (result * 397) ^
-				         (InternalSecureTcpEndPoint != null ? InternalSecureTcpEndPoint.GetHashCode() : 0);
-				result = (result * 397) ^ (ExternalTcpEndPoint != null ? ExternalTcpEndPoint.GetHashCode() : 0);
-				result = (result * 397) ^
-				         (ExternalSecureTcpEndPoint != null ? ExternalSecureTcpEndPoint.GetHashCode() : 0);
-				result = (result * 397) ^ HttpEndPoint.GetHashCode();
-				result = (result * 397) ^ (AdvertiseHostToClientAs != null ? AdvertiseHostToClientAs.GetHashCode() : 0);
-				result = (result * 397) ^ AdvertiseHttpPortToClientAs.GetHashCode();
-				result = (result * 397) ^ AdvertiseTcpPortToClientAs.GetHashCode();
-				result = (result * 397) ^ EpochPosition.GetHashCode();
-				result = (result * 397) ^ EpochNumber.GetHashCode();
-				result = (result * 397) ^ EpochId.GetHashCode();
-				result = (result * 397) ^ NodePriority;
-				result = (result * 397) ^ (ESVersion != null ? ESVersion.GetHashCode() : 0);
-				return result;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Cluster/ReplicationPartials.cs b/src/EventStore.Core/Cluster/ReplicationPartials.cs
deleted file mode 100644
index 63d498d46ac..00000000000
--- a/src/EventStore.Core/Cluster/ReplicationPartials.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using Google.Protobuf;
-
-// ReSharper disable once CheckNamespace
-namespace EventStore.Cluster {
-	partial class ReplicaLogWrite {
-		public ReplicaLogWrite(long logPosition, byte[] replicaId) {
-			LogPosition = logPosition;
-			ReplicaId = ByteString.CopyFrom(replicaId);
-		}
-	}
-	partial class ReplicatedTo {
-		public ReplicatedTo(long logPosition) {
-			LogPosition = logPosition;
-		}
-	}
-
-	partial class Epoch {
-		public Epoch(long epochPosition, int epochNumber, byte[] epochId) {
-			EpochPosition = epochPosition;
-			EpochNumber = epochNumber;
-			EpochId = ByteString.CopyFrom(epochId);
-		}
-	}
-	partial class SubscribeReplica {
-		public SubscribeReplica(long logPosition, byte[] chunkId, Epoch[] lastEpochs, byte[] ip, int port,
-			byte[] leaderId, byte[] subscriptionId, bool isPromotable, int version) {
-			LogPosition = logPosition;
-			ChunkId = ByteString.CopyFrom(chunkId);
-			LastEpochs.AddRange(lastEpochs);
-
-			Ip = ByteString.CopyFrom(ip);
-			Port = port;
-			LeaderId = ByteString.CopyFrom(leaderId);
-			SubscriptionId = ByteString.CopyFrom(subscriptionId);
-			IsPromotable = isPromotable;
-			Version = version;
-		}
-	}
-
-	partial class ReplicaSubscriptionRetry {
-		public ReplicaSubscriptionRetry(byte[] leaderId, byte[] subscriptionId) {
-			Ensure.NotNull(leaderId, "leaderId");
-			Ensure.NotNull(subscriptionId, "subscriptionId");
-
-			LeaderId = ByteString.CopyFrom(leaderId);
-			SubscriptionId = ByteString.CopyFrom(subscriptionId);
-		}
-	}
-	partial class ReplicaSubscribed {
-		public ReplicaSubscribed(byte[] leaderId, byte[] subscriptionId, long subscriptionPosition) {
-			Ensure.NotNull(leaderId, "leaderId");
-			Ensure.NotNull(subscriptionId, "subscriptionId");
-			Ensure.Nonnegative(subscriptionPosition, "subscriptionPosition");
-
-			LeaderId = ByteString.CopyFrom(leaderId);
-			SubscriptionId = ByteString.CopyFrom(subscriptionId);
-			SubscriptionPosition = subscriptionPosition;
-		}
-	}
-
-	partial class ReplicaLogPositionAck {
-		public ReplicaLogPositionAck(
-			byte[] subscriptionId,
-			long replicationLogPosition,
-			long writerLogPosition) {
-
-			SubscriptionId = ByteString.CopyFrom(subscriptionId);
-			ReplicationLogPosition = replicationLogPosition;
-			WriterLogPosition = writerLogPosition;
-		}
-	}
-
-	partial class CreateChunk {
-		public CreateChunk(byte[] leaderId, byte[] subscriptionId, byte[] chunkHeaderBytes, int fileSize,
-			bool isScavengedChunk, ReadOnlySpan<byte> transformHeaderBytes) {
-			Ensure.NotNull(leaderId, "leaderId");
-			Ensure.NotNull(subscriptionId, "subscriptionId");
-			Ensure.NotNull(chunkHeaderBytes, "chunkHeaderBytes");
-
-			LeaderId = ByteString.CopyFrom(leaderId);
-			SubscriptionId = ByteString.CopyFrom(subscriptionId);
-			ChunkHeaderBytes = ByteString.CopyFrom(chunkHeaderBytes);
-			FileSize = fileSize;
-			IsScavengedChunk = isScavengedChunk;
-			TransformHeaderBytes = ByteString.CopyFrom(transformHeaderBytes);
-		}
-	}
-
-	partial class RawChunkBulk {
-		public RawChunkBulk(byte[] leaderId,
-			byte[] subscriptionId,
-			int chunkStartNumber,
-			int chunkEndNumber,
-			int rawPosition,
-			byte[] rawBytes,
-			bool completeChunk) {
-			Ensure.NotNull(leaderId, "leaderId");
-			Ensure.NotNull(subscriptionId, "subscriptionId");
-			Ensure.NotNull(rawBytes, "rawBytes");
-			Ensure.Positive(rawBytes.Length, "rawBytes.Length"); // we should never send empty array, NEVER
-
-			LeaderId = ByteString.CopyFrom(leaderId);
-			;
-			SubscriptionId = ByteString.CopyFrom(subscriptionId);
-			ChunkStartNumber = chunkStartNumber;
-			ChunkEndNumber = chunkEndNumber;
-			RawPosition = rawPosition;
-			RawBytes = ByteString.CopyFrom(rawBytes);
-			CompleteChunk = completeChunk;
-		}
-	}
-	partial class DataChunkBulk {
-
-		public DataChunkBulk(byte[] leaderId,
-			byte[] subscriptionId,
-			int chunkStartNumber,
-			int chunkEndNumber,
-			long subscriptionPosition,
-			byte[] dataBytes,
-			bool completeChunk) {
-			Ensure.NotNull(leaderId, "leaderId");
-			Ensure.NotNull(subscriptionId, "subscriptionId");
-			Ensure.NotNull(dataBytes, "rawBytes");
-			Ensure.Nonnegative(dataBytes.Length,
-				"dataBytes.Length"); // we CAN send empty dataBytes array here, unlike as with completed chunks
-
-			LeaderId = ByteString.CopyFrom(leaderId);
-			SubscriptionId = ByteString.CopyFrom(subscriptionId);
-			ChunkStartNumber = chunkStartNumber;
-			ChunkEndNumber = chunkEndNumber;
-			SubscriptionPosition = subscriptionPosition;
-			DataBytes = ByteString.CopyFrom(dataBytes);
-			CompleteChunk = completeChunk;
-		}
-	}
-
-	partial class FollowerAssignment {
-		public FollowerAssignment(byte[] leaderId, byte[] subscriptionId) {
-			LeaderId = ByteString.CopyFrom(leaderId);
-			SubscriptionId = ByteString.CopyFrom(subscriptionId);
-		}
-	}
-
-	partial class CloneAssignment {
-		public CloneAssignment(byte[] leaderId, byte[] subscriptionId) {
-			LeaderId = ByteString.CopyFrom(leaderId);
-			SubscriptionId = ByteString.CopyFrom(subscriptionId);
-		}
-	}
-
-	partial class DropSubscription {
-		public DropSubscription(byte[] leaderId, byte[] subscriptionId) {
-			LeaderId = ByteString.CopyFrom(leaderId);
-			SubscriptionId = ByteString.CopyFrom(subscriptionId);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Cluster/Settings/ClusterConsts.cs b/src/EventStore.Core/Cluster/Settings/ClusterConsts.cs
deleted file mode 100644
index fc678509743..00000000000
--- a/src/EventStore.Core/Cluster/Settings/ClusterConsts.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace EventStore.Core.Cluster.Settings {
-	public static class ClusterConsts {
-		public const int SubscriptionLastEpochCount = 20;
-		public static readonly TimeSpan TruncationSyncTimeout = TimeSpan.FromSeconds(60);
-	}
-}
diff --git a/src/EventStore.Core/Cluster/Settings/ClusterVNodeAuthenticationType.cs b/src/EventStore.Core/Cluster/Settings/ClusterVNodeAuthenticationType.cs
deleted file mode 100644
index 0739cb3390f..00000000000
--- a/src/EventStore.Core/Cluster/Settings/ClusterVNodeAuthenticationType.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.Core.Cluster.Settings {
-	public enum ClusterVNodeAuthenticationType {
-		Internal,
-		Ldaps
-	}
-}
diff --git a/src/EventStore.Core/ClusterNodeMutex.cs b/src/EventStore.Core/ClusterNodeMutex.cs
deleted file mode 100644
index 5c9502986e9..00000000000
--- a/src/EventStore.Core/ClusterNodeMutex.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Security.AccessControl;
-using System.Threading;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core {
-	public class ClusterNodeMutex {
-		private static readonly ILogger Log = Serilog.Log.ForContext<ClusterNodeMutex>();
-
-		public readonly string MutexName;
-
-		public bool IsAcquired {
-			get { return _acquired; }
-		}
-
-		private Mutex _clusterNodeMutex;
-		private bool _acquired;
-
-		public ClusterNodeMutex() {
-			MutexName = string.Format("ESCLUSTERNODE:{0}", Process.GetCurrentProcess().Id);
-		}
-
-		public bool Acquire() {
-			if (_acquired)
-				throw new InvalidOperationException(string.Format("Cluster Node mutex '{0}' is already acquired.",
-					MutexName));
-
-			try {
-				_clusterNodeMutex = new Mutex(initiallyOwned: true, name: MutexName, createdNew: out _acquired);
-			} catch (AbandonedMutexException exc) {
-				Log.Information(exc,
-					"Cluster Node mutex '{mutex}' is said to be abandoned. "
-					+ "Probably previous instance of server was terminated abruptly.",
-					MutexName);
-			}
-
-			return _acquired;
-		}
-
-		public void Release() {
-			if (!_acquired)
-				throw new InvalidOperationException(string.Format("Cluster Node mutex '{0}' was not acquired.",
-					MutexName));
-			_clusterNodeMutex.ReleaseMutex();
-		}
-
-		public static bool IsPresent(int pid) {
-			var mutexName = string.Format("ESCLUSTERNODE:{0}", pid);
-			try {
-				using (Mutex.OpenExisting(mutexName)) {
-					return true;
-				}
-			} catch (WaitHandleCannotBeOpenedException) {
-				return false;
-			} catch (Exception exc) {
-				Log.Debug(exc, "Exception while trying to open Cluster Node mutex '{mutex}': {e}.", mutexName,
-					exc.Message);
-			}
-
-			return false;
-		}
-	}
-}
diff --git a/src/EventStore.Core/ClusterVNodeStartup.cs b/src/EventStore.Core/ClusterVNodeStartup.cs
deleted file mode 100644
index 4155b98d954..00000000000
--- a/src/EventStore.Core/ClusterVNodeStartup.cs
+++ /dev/null
@@ -1,323 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Common.Configuration;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.Transport.Grpc;
-using EventStore.Core.Services.Transport.Grpc.Cluster;
-using EventStore.Core.Services.Transport.Http;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Plugins;
-using EventStore.Plugins.Authentication;
-using EventStore.Plugins.Authorization;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using OpenTelemetry;
-using OpenTelemetry.Metrics;
-using OpenTelemetry.Resources;
-using MidFunc = System.Func<
-	Microsoft.AspNetCore.Http.HttpContext,
-	System.Func<System.Threading.Tasks.Task>,
-	System.Threading.Tasks.Task
->;
-using Operations = EventStore.Core.Services.Transport.Grpc.Operations;
-using ClusterGossip = EventStore.Core.Services.Transport.Grpc.Cluster.Gossip;
-using ClientGossip = EventStore.Core.Services.Transport.Grpc.Gossip;
-using ServerFeatures = EventStore.Core.Services.Transport.Grpc.ServerFeatures;
-
-#nullable enable
-namespace EventStore.Core {
-	public class ClusterVNodeStartup<TStreamId> : IStartup, IHandle<SystemMessage.SystemReady>,
-		IHandle<SystemMessage.BecomeShuttingDown> {
-
-		private readonly IReadOnlyList<IPlugableComponent> _plugableComponents;
-		private readonly IPublisher _mainQueue;
-		private readonly IPublisher _monitoringQueue;
-		private readonly ISubscriber _mainBus;
-		private readonly IAuthenticationProvider _authenticationProvider;
-		private readonly int _maxAppendSize;
-		private readonly TimeSpan _writeTimeout;
-		private readonly IExpiryStrategy _expiryStrategy;
-		private readonly KestrelHttpService _httpService;
-		private readonly IConfiguration _configuration;
-		private readonly Trackers _trackers;
-		private readonly StatusCheck _statusCheck;
-		private readonly Func<IServiceCollection, IServiceCollection> _configureNodeServices;
-		private readonly Action<IApplicationBuilder> _configureNode;
-
-		private bool _ready;
-		private readonly IAuthorizationProvider _authorizationProvider;
-		private readonly MultiQueuedHandler _httpMessageHandler;
-		private readonly string _clusterDns;
-
-		public ClusterVNodeStartup(
-			IReadOnlyList<IPlugableComponent> plugableComponents,
-			IPublisher mainQueue,
-			IPublisher monitoringQueue,
-			ISubscriber mainBus,
-			MultiQueuedHandler httpMessageHandler,
-			IAuthenticationProvider authenticationProvider,
-			IAuthorizationProvider authorizationProvider,
-			int maxAppendSize,
-			TimeSpan writeTimeout,
-			IExpiryStrategy expiryStrategy,
-			KestrelHttpService httpService,
-			IConfiguration configuration,
-			Trackers trackers,
-			string clusterDns,
-			Func<IServiceCollection, IServiceCollection> configureNodeServices,
-			Action<IApplicationBuilder> configureNode) {
-
-			Ensure.Positive(maxAppendSize, nameof(maxAppendSize));
-
-			if (httpService == null) {
-				throw new ArgumentNullException(nameof(httpService));
-			}
-
-			ArgumentNullException.ThrowIfNull(configuration);
-
-			if (mainBus == null) {
-				throw new ArgumentNullException(nameof(mainBus));
-			}
-
-			if (monitoringQueue == null) {
-				throw new ArgumentNullException(nameof(monitoringQueue));
-			}
-			_plugableComponents = plugableComponents;
-			_mainQueue = mainQueue;
-			_monitoringQueue = monitoringQueue;
-			_mainBus = mainBus;
-			_httpMessageHandler = httpMessageHandler;
-			_authenticationProvider = authenticationProvider;
-			_authorizationProvider = authorizationProvider ?? throw new ArgumentNullException(nameof(authorizationProvider));
-			_maxAppendSize = maxAppendSize;
-			_writeTimeout = writeTimeout;
-			_expiryStrategy = expiryStrategy;
-			_httpService = httpService;
-			_configuration = configuration;
-			_trackers = trackers;
-			_clusterDns = clusterDns;
-			_configureNodeServices = configureNodeServices ?? throw new ArgumentNullException(nameof(configureNodeServices));
-			_configureNode = configureNode ?? throw new ArgumentNullException(nameof(configureNode));
-			_statusCheck = new StatusCheck(this);
-		}
-
-		public void Configure(IApplicationBuilder app) {
-			_configureNode(app);
-
-			var internalDispatcher = new InternalDispatcherEndpoint(_mainQueue, _httpMessageHandler);
-			_mainBus.Subscribe(internalDispatcher);
-
-			app = app.Map("/health", _statusCheck.Configure)
-				// AuthenticationMiddleware uses _httpAuthenticationProviders and assigns
-				// the resulting ClaimsPrinciple to HttpContext.User
-				.UseMiddleware<AuthenticationMiddleware>()
-
-				// UseAuthentication/UseAuthorization allow the rest of the pipeline to access auth
-				// in a conventional way (e.g. with AuthorizeAttribute). The server doesn't make use
-				// of this yet but plugins may. The registered authentication scheme (es auth)
-				// is driven by the HttpContext.User established above
-				.UseAuthentication()
-				.UseRouting()
-				.UseAuthorization();
-
-			// allow all subsystems to register their legacy controllers before calling MapLegacyHttp
-			foreach (var component in _plugableComponents)
-				component.ConfigureApplication(app, _configuration);
-
-			app.UseEndpoints(ep => {
-					_authenticationProvider.ConfigureEndpoints(ep);
-
-					ep.MapGrpcService<PersistentSubscriptions>();
-					ep.MapGrpcService<Users>();
-					ep.MapGrpcService<Streams<TStreamId>>();
-					ep.MapGrpcService<ClusterGossip>();
-					ep.MapGrpcService<Elections>();
-					ep.MapGrpcService<Operations>();
-					ep.MapGrpcService<ClientGossip>();
-					ep.MapGrpcService<Monitoring>();
-					ep.MapGrpcService<ServerFeatures>();
-
-					// enable redaction service on unix sockets only
-					ep.MapGrpcService<Redaction>().AddEndpointFilter(async (c, next) => {
-						if (!c.HttpContext.IsUnixSocketConnection())
-							return Results.BadRequest("Redaction is only available via Unix Sockets");
-						return await next(c).ConfigureAwait(false);
-					});
-
-					// Map the legacy controller endpoints with special middleware pipeline
-					ep.MapLegacyHttp(
-						ep.CreateApplicationBuilder()
-							// Select an appropriate controller action and codec.
-							//    Success -> Add InternalContext (HttpEntityManager, urimatch, ...) to HttpContext
-							//    Fail -> Pipeline terminated with response.
-							.UseMiddleware<KestrelToInternalBridgeMiddleware>()
-
-							// Looks up the InternalContext to perform the check.
-							// Terminal if auth check is not successful.
-							.UseMiddleware<AuthorizationMiddleware>()
-
-							// Open telemetry currently guarded by our custom authz for consistency with stats
-							.UseOpenTelemetryPrometheusScrapingEndpoint()
-
-							// Internal dispatcher looks up the InternalContext to call the appropriate controller
-							.Use(x => internalDispatcher.InvokeAsync)
-							.Build(),
-						_httpService);
-				});
-		}
-
-		public IServiceProvider ConfigureServices(IServiceCollection services) {
-			var metricsConfiguration = MetricsConfiguration.Get(_configuration);
-
-			services = services
-				.AddRouting()
-				.AddAuthentication(o => o
-					.AddScheme<EventStoreAuthenticationHandler>("es auth", displayName: null))
-					.Services
-				.AddAuthorization()
-				.AddSingleton(_authenticationProvider)
-				.AddSingleton(_authorizationProvider)
-				.AddSingleton<ISubscriber>(_mainBus)
-				.AddSingleton<IPublisher>(_mainQueue)
-				.AddSingleton<AuthenticationMiddleware>()
-				.AddSingleton<AuthorizationMiddleware>()
-				.AddSingleton(new KestrelToInternalBridgeMiddleware(_httpService.UriRouter, _httpService.LogHttpRequests, _httpService.AdvertiseAsHost, _httpService.AdvertiseAsPort))
-				.AddSingleton(new Streams<TStreamId>(_mainQueue, _maxAppendSize,
-					_writeTimeout, _expiryStrategy,
-					_trackers.GrpcTrackers,
-					_authorizationProvider))
-				.AddSingleton(new PersistentSubscriptions(_mainQueue, _authorizationProvider))
-				.AddSingleton(new Users(_mainQueue, _authorizationProvider))
-				.AddSingleton(new Operations(_mainQueue, _authorizationProvider))
-				.AddSingleton(new ClusterGossip(_mainQueue, _authorizationProvider, _clusterDns,
-					updateTracker: _trackers.GossipTrackers.ProcessingPushFromPeer,
-					readTracker: _trackers.GossipTrackers.ProcessingRequestFromPeer))
-				.AddSingleton(new Elections(_mainQueue, _authorizationProvider, _clusterDns))
-				.AddSingleton(new ClientGossip(_mainQueue, _authorizationProvider, _trackers.GossipTrackers.ProcessingRequestFromGrpcClient))
-				.AddSingleton(new Monitoring(_monitoringQueue))
-				.AddSingleton(new Redaction(_mainQueue, _authorizationProvider))
-				.AddSingleton<ServerFeatures>()
-
-				// OpenTelemetry
-				.AddOpenTelemetry()
-				.WithMetrics(meterOptions => meterOptions
-					.SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("eventstore"))
-					.AddMeter(metricsConfiguration.Meters)
-					.AddView(i => {
-						if (i.Name == MetricsBootstrapper.LogicalChunkReadDistributionName)
-							// 20 buckets, 0, 1, 2, 4, 8, ...
-							return new ExplicitBucketHistogramConfiguration {
-								Boundaries = [
-									0,
-									.. Enumerable.Range(0, count: 19).Select(x => 1 << x)
-								]
-							};
-						else if (i.Name.StartsWith("eventstore-") &&
-							i.Name.EndsWith("-latency") &&
-							i.Unit == "seconds")
-							return new ExplicitBucketHistogramConfiguration {
-								Boundaries = [
-									0.001, //    1 ms
-									0.005, //    5 ms
-									0.01,  //   10 ms
-									0.05,  //   50 ms
-									0.1,   //  100 ms
-									0.5,   //  500 ms
-									1,     // 1000 ms
-									5,     // 5000 ms
-								]
-							};
-						else if (i.Name.StartsWith("eventstore-") && i.Unit == "seconds")
-							return new ExplicitBucketHistogramConfiguration {
-								Boundaries = [
-									0.000_001, // 1 microsecond
-									0.000_01,
-									0.000_1,
-									0.001, // 1 millisecond
-									0.01,
-									0.1,
-									1, // 1 second
-									10,
-								]
-							};
-						return default;
-					})
-					.AddPrometheusExporter(options => options.ScrapeResponseCacheDurationMilliseconds = 1000))
-				.Services
-
-				// gRPC
-				.AddSingleton<RetryInterceptor>()
-				.AddGrpc(options => {
-					options.Interceptors.Add<RetryInterceptor>();
-				})
-				.AddServiceOptions<Streams<TStreamId>>(options =>
-					options.MaxReceiveMessageSize = TFConsts.EffectiveMaxLogRecordSize)
-				.Services;
-
-			services = _configureNodeServices(services);
-
-			foreach (var component in _plugableComponents)
-				component.ConfigureServices(services, _configuration);
-
-			return services.BuildServiceProvider();
-		}
-
-		public void Handle(SystemMessage.SystemReady _) => _ready = true;
-
-		public void Handle(SystemMessage.BecomeShuttingDown _) => _ready = false;
-
-		private class StatusCheck {
-			private readonly ClusterVNodeStartup<TStreamId> _startup;
-			private readonly int _livecode = 204;
-
-			public StatusCheck(ClusterVNodeStartup<TStreamId> startup) {
-				if (startup == null) {
-					throw new ArgumentNullException(nameof(startup));
-				}
-
-				_startup = startup;
-			}
-
-			public void Configure(IApplicationBuilder builder) =>
-				builder.Use(GetAndHeadOnly)
-					.UseRouter(router => router
-						.MapMiddlewareGet("live", inner => inner.Use(Live)));
-
-			private MidFunc Live => (context, next) => {
-				if (_startup._ready) {
-					if (context.Request.Query.TryGetValue("liveCode", out var expected) &&
-						int.TryParse(expected, out var statusCode)) {
-						context.Response.StatusCode = statusCode;
-					} else {
-						context.Response.StatusCode = _livecode;
-					}
-				} else {
-					context.Response.StatusCode = 503;
-				}
-				return Task.CompletedTask;
-			};
-
-			private static MidFunc GetAndHeadOnly => (context, next) => {
-				switch (context.Request.Method) {
-					case "HEAD":
-						context.Request.Method = "GET";
-						return next();
-					case "GET":
-						return next();
-					default:
-						context.Response.StatusCode = 405;
-						return Task.CompletedTask;
-				}
-			};
-		}
-	}
-}
diff --git a/src/EventStore.Core/Configuration/ClusterVNodeOptions.Framework.cs b/src/EventStore.Core/Configuration/ClusterVNodeOptions.Framework.cs
deleted file mode 100644
index 83d6913eda7..00000000000
--- a/src/EventStore.Core/Configuration/ClusterVNodeOptions.Framework.cs
+++ /dev/null
@@ -1,234 +0,0 @@
-// ReSharper disable CheckNamespace
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-using System.Runtime;
-using System.Text;
-using EventStore.Common.Configuration;
-using EventStore.Core.Configuration;
-using EventStore.Core.Configuration.Sources;
-using Microsoft.Extensions.Configuration;
-
-#nullable enable
-namespace EventStore.Core {
-	public partial record ClusterVNodeOptions {
-		private static readonly IEnumerable<Type> OptionSections;
-		public static readonly string HelpText;
-		public string GetComponentName() => $"{Interface.NodeIp}-{Interface.NodePort}-cluster-node";
-		public static readonly List<SectionMetadata> Metadata;
-
-		static ClusterVNodeOptions() {
-			OptionSections = typeof(ClusterVNodeOptions)
-				.GetProperties(BindingFlags.Public | BindingFlags.Instance)
-				.Where(p => p.GetCustomAttribute<OptionGroupAttribute>() != null)
-				.Select(p => p.PropertyType);
-
-			HelpText = GetHelpText();
-
-			Metadata = typeof(ClusterVNodeOptions)
-				.GetProperties(BindingFlags.Public | BindingFlags.Instance)
-				.Where(prop => prop.GetCustomAttribute<OptionGroupAttribute>() != null)
-				.Select(SectionMetadata.FromPropertyInfo)
-				.ToList();
-
-			DefaultValues = OptionSections.SelectMany(GetDefaultValues);
-
-			return;
-
-			static IEnumerable<KeyValuePair<string, object?>> GetDefaultValues(Type type) {
-				var defaultInstance = Activator.CreateInstance(type)!;
-
-				return type.GetProperties().Select(property =>
-					new KeyValuePair<string, object?>(property.Name, property.PropertyType switch {
-						{IsArray: true} => string.Join(",",
-							((Array)(property.GetValue(defaultInstance) ?? Array.Empty<object>())).OfType<object>()),
-						_ => property.GetValue(defaultInstance)
-					}));
-			}
-		}
-
-		public static IEnumerable<KeyValuePair<string, object?>> DefaultValues { get; }
-
-		public string? DumpOptions() =>
-			ConfigurationRoot == null ? null : ClusterVNodeOptionsPrinter.Print(LoadedOptions);
-
-		public IReadOnlyDictionary<string, LoadedOption> LoadedOptions { get; init; } =
-			new Dictionary<string, LoadedOption>();
-
-		public string? GetDeprecationWarnings() {
-			var defaultValues = new Dictionary<string, object?>(DefaultValues, StringComparer.OrdinalIgnoreCase);
-
-			var deprecationWarnings = from section in OptionSections
-				from option in section.GetProperties()
-				let deprecationWarning = option.GetCustomAttribute<DeprecatedAttribute>()?.Message
-				where deprecationWarning is not null
-				let value = ConfigurationRoot?.GetValue<string?>(EventStoreConfigurationKeys.Normalize(option.Name))
-				where defaultValues.TryGetValue(option.Name, out var defaultValue)
-				      && !string.Equals(value, defaultValue?.ToString(), StringComparison.OrdinalIgnoreCase)
-				      select deprecationWarning;
-
-			var builder = deprecationWarnings
-				.Aggregate(new StringBuilder(), (builder, deprecationWarning) => builder.AppendLine(deprecationWarning));
-
-			return builder.Length != 0 ? builder.ToString() : null;
-		}
-
-		public string? CheckForEnvironmentOnlyOptions() =>
-			ConfigurationRoot.CheckProvidersForEnvironmentVariables(OptionSections);
-
-		public static IReadOnlyDictionary<string, LoadedOption> GetLoadedOptions(IConfigurationRoot configurationRoot) {
-			var loadedOptions = new Dictionary<string, LoadedOption>();
-
-			// because we always start with defaults, we can just add them all first.
-			// then we can override them with the actual values.
-			foreach (var provider in configurationRoot.Providers) {
-				var providerType = provider.GetType();
-
-				foreach (var option in Metadata.SelectMany(x => x.Options)) {
-					if (!provider.TryGet(option.Value.Key, out var value)) continue;
-
-					var title = GetTitle(option);
-					var sourceDisplayName = GetSourceDisplayName(providerType);
-					var isDefault = providerType == typeof(EventStoreDefaultValuesConfigurationProvider);
-
-					loadedOptions[option.Value.Key] = new(
-						metadata: option.Value,
-						title: title,
-						value: value,
-						sourceDisplayName: sourceDisplayName,
-						isDefault: isDefault
-					);
-				}
-			}
-
-			return loadedOptions;
-
-			static string GetTitle(KeyValuePair<string, OptionMetadata> option) =>
-				CombineByPascalCase(EventStoreConfigurationKeys.StripConfigurationPrefix(option.Value.Key)).ToUpper();
-		}
-
-		public static string GetSourceDisplayName(Type source) {
-			var name = source == typeof(EventStoreDefaultValuesConfigurationProvider)
-				? "<DEFAULT>"
-				: CombineByPascalCase(
-					source.Name
-						.Replace("EventStore", "")
-						.Replace("ConfigurationProvider", "")
-				);
-
-			return name;
-		}
-
-		private static string GetHelpText() {
-			const string OPTION = nameof(OPTION);
-			const string DESCRIPTION = nameof(DESCRIPTION);
-
-			var optionColumnWidth = Options().Max(o =>
-				OptionHeaderColumnWidth(o.Name, DefaultValue(o)));
-
-			var header = $"{OPTION.PadRight(optionColumnWidth, ' ')}{DESCRIPTION}";
-			
-			var environmentOnlyOptions = OptionSections.SelectMany(section => section.GetProperties())
-				.Where(option => option.GetCustomAttribute<EnvironmentOnlyAttribute>() != null)
-				.Select(option => option)
-				.ToList();
-
-			var environmentOnlyOptionsBuilder = environmentOnlyOptions
-				.Aggregate(new StringBuilder(),
-					(builder, property) => builder.Append(GetEnvironmentOption(property, optionColumnWidth)).AppendLine())
-				.ToString();
-
-			var options = Options().Where(option =>
-				environmentOnlyOptions.All(environmentOption => environmentOption.Name != option.Name)).ToList();
-
-			var optionGroups = options.GroupBy(option =>
-				option.DeclaringType?.GetCustomAttribute<DescriptionAttribute>()?.Description ?? string.Empty);
-
-			return optionGroups
-				.Aggregate(new StringBuilder().Append(header).AppendLine(), (builder, optionGroup) =>
-					optionGroup.Aggregate(
-						builder.AppendLine().Append(optionGroup.Key).AppendLine(),
-						(stringBuilder, property) => stringBuilder.Append(Line(property)).AppendLine()))
-				.AppendLine().AppendLine("EnvironmentOnly Options").Append(environmentOnlyOptionsBuilder)
-				.ToString();
-			
-
-			string Line(PropertyInfo property) {
-				var description = property.GetCustomAttribute<DescriptionAttribute>()?.Description;
-				if (property.PropertyType.IsEnum) {
-					description += $" ({string.Join(", ", Enum.GetNames(property.PropertyType))})";
-				}
-
-				return GetOption(property).PadRight(optionColumnWidth, ' ') + description;
-			}
-
-			string GetOption(PropertyInfo property) {
-				var builder = new StringBuilder();
-				builder.AppendJoin(string.Empty, GnuOption(property.Name));
-
-				var defaultValue = DefaultValue(property);
-				if (defaultValue != string.Empty) {
-					builder.Append(" (Default:").Append(defaultValue).Append(')');
-				}
-
-				return builder.ToString();
-			}
-			
-			static IEnumerable<PropertyInfo> Options() => OptionSections.SelectMany(type => type.GetProperties());
-
-			static int OptionWidth(string name, string @default) =>
-				(name + @default).Count(char.IsUpper) + 1 + 1 + (name + @default).Length;
-
-			int OptionHeaderColumnWidth(string name, string @default) =>
-				Math.Max(OptionWidth(name, @default) + 1, OPTION.Length);
-
-			static string DefaultValue(PropertyInfo option) {
-				var value = option.GetValue(Activator.CreateInstance(option.DeclaringType!));
-				return (value, RuntimeInformation.IsWindows) switch {
-					(bool b, false) => b.ToString().ToLower(),
-					(bool b, true) => b.ToString(),
-					(Array {Length: 0}, _) => string.Empty,
-					(Array {Length: >0} a, _) => string.Join(",", a.OfType<object>()),
-					_ => value?.ToString() ?? string.Empty
-				};
-			}
-
-			static IEnumerable<char> GnuOption(string x) {
-				yield return '-';
-				foreach (var c in x) {
-					if (char.IsUpper(c)) {
-						yield return '-';
-					}
-
-					yield return char.ToLower(c);
-				}
-			}
-
-			static string GetEnvironmentOption(PropertyInfo property, int optionColumnWidth) {
-				const string Prefix = "EVENTSTORE";
-
-				var builder = new StringBuilder();
-
-				builder.Append($"{Prefix}_")
-					.Append(CombineByPascalCase(property.Name, "_").ToUpper());
-
-				var description = property.GetCustomAttribute<EnvironmentOnlyAttribute>()?.Message;
-
-				return builder.ToString().PadRight(optionColumnWidth, ' ') + description;
-
-			}
-		}
-
-		static string CombineByPascalCase(string name, string token = " ") {
-			var regex = new System.Text.RegularExpressions.Regex(
-				@"(?<=[A-Z])(?=[A-Z][a-z])|(?<=[^A-Z])(?=[A-Z])|(?<=[A-Za-z])(?=[^A-Za-z])");
-			return regex.Replace(name, token);
-		}
-
-		[AttributeUsage(AttributeTargets.Property)]
-		internal class OptionGroupAttribute : Attribute;
-	}
-}
diff --git a/src/EventStore.Core/Configuration/ClusterVNodeOptions.cs b/src/EventStore.Core/Configuration/ClusterVNodeOptions.cs
deleted file mode 100644
index 9de7e49f9f3..00000000000
--- a/src/EventStore.Core/Configuration/ClusterVNodeOptions.cs
+++ /dev/null
@@ -1,810 +0,0 @@
-// ReSharper disable CheckNamespace
-
-#nullable enable
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Security.Cryptography.X509Certificates;
-using EventStore.Common.Configuration;
-using EventStore.Common.Options;
-using EventStore.Common.Utils;
-using EventStore.Core.Configuration;
-using EventStore.Core.Configuration.Sources;
-using EventStore.Core.Services.Monitoring;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.Util;
-using EventStore.Plugins;
-using EventStore.Plugins.Subsystems;
-using JetBrains.Annotations;
-using Microsoft.Extensions.Configuration;
-using Serilog;
-using Quickenshtein;
-
-namespace EventStore.Core {
-	[PublicAPI]
-	public partial record ClusterVNodeOptions {
-		public ClusterVNodeOptions() => FileStreamExtensions.ConfigureFlush(Database.UnsafeDisableFlushToDisk);
-
-		public IConfigurationRoot? ConfigurationRoot { get; init; }
-		[OptionGroup] public ApplicationOptions Application { get; init; } = new();
-		[OptionGroup] public DevModeOptions DevMode { get; init; } = new();
-		[OptionGroup] public DefaultUserOptions DefaultUser { get; init; } = new();
-		[OptionGroup] public LoggingOptions Logging { get; init; } = new();
-		[OptionGroup] public AuthOptions Auth { get; init; } = new();
-		[OptionGroup] public CertificateOptions Certificate { get; init; } = new();
-		[OptionGroup] public CertificateFileOptions CertificateFile { get; init; } = new();
-		[OptionGroup] public CertificateStoreOptions CertificateStore { get; init; } = new();
-		[OptionGroup] public ClusterOptions Cluster { get; init; } = new();
-		[OptionGroup] public DatabaseOptions Database { get; init; } = new();
-		[OptionGroup] public GrpcOptions Grpc { get; init; } = new();
-		[OptionGroup] public InterfaceOptions Interface { get; init; } = new();
-		[OptionGroup] public ProjectionOptions Projection { get; init; } = new();
-		public UnknownOptions Unknown { get; init; } = new([]);
-
-		public byte IndexBitnessVersion { get; init; } = Index.PTableVersions.IndexV4;
-
-		public X509Certificate2? ServerCertificate { get; init; }
-		public X509Certificate2Collection? TrustedRootCertificates { get; init; }
-		public IReadOnlyList<IPlugableComponent> PlugableComponents { get; init; } = [];
-
-		public IReadOnlyList<ISubsystem> Subsystems => PlugableComponents.OfType<ISubsystem>().ToArray();
-
-		public bool UnknownOptionsDetected => Unknown.Options.Any();
-
-		public static ClusterVNodeOptions FromConfiguration(IConfigurationRoot configurationRoot) {
-			var configuration = configurationRoot.GetRequiredSection("EventStore");
-
-			// required because of a bug in the configuration system that
-			// is not reading the attribute from the property itself
-			TypeDescriptor.AddAttributes(typeof(EndPoint[]), new TypeConverterAttribute(typeof(GossipSeedConverter)));
-			TypeDescriptor.AddAttributes(typeof(IPAddress), new TypeConverterAttribute(typeof(IPAddressConverter)));
-
-			// with full keys we would not even need to do all these binds, just a single one
-			// configurationRoot.BindOptions<ClusterVNodeOptions>();
-
-			var options = new ClusterVNodeOptions {
-				Application = configuration.BindOptions<ApplicationOptions>(),
-				DevMode = configuration.BindOptions<DevModeOptions>(),
-				DefaultUser = configuration.BindOptions<DefaultUserOptions>(),
-				Logging = configuration.BindOptions<LoggingOptions>(),
-				Auth = configuration.BindOptions<AuthOptions>(),
-				Certificate = configuration.BindOptions<CertificateOptions>(),
-				CertificateFile = configuration.BindOptions<CertificateFileOptions>(),
-				CertificateStore = configuration.BindOptions<CertificateStoreOptions>(),
-				Cluster = configuration.BindOptions<ClusterOptions>(),
-				Database = configuration.BindOptions<DatabaseOptions>(),
-				Grpc = configuration.BindOptions<GrpcOptions>(),
-				Interface = configuration.BindOptions<InterfaceOptions>(),
-				Projection = configuration.BindOptions<ProjectionOptions>(),
-
-				Unknown = UnknownOptions.FromConfiguration(configuration),
-				ConfigurationRoot = configurationRoot,
-				LoadedOptions = GetLoadedOptions(configurationRoot)
-			};
-
-			return options;
-		}
-
-		[Description("Default User Options")]
-		public record DefaultUserOptions {
-			[Description("Admin Default password"), Sensitive, EnvironmentOnly("The Admin user password can only be set using Environment Variables")]
-			public string DefaultAdminPassword { get; init; } = "changeit";
-
-			[Description("Ops Default password"), Sensitive, EnvironmentOnly("The Ops user password can only be set using Environment Variables")]
-			public string DefaultOpsPassword { get; init; } = "changeit";
-		}
-
-		[Description("Dev Mode Options")]
-		public record DevModeOptions {
-			[Description("Runs EventStoreDB in dev mode. This will create and add dev certificates to your certificate store, enable atompub over http, and run standard projections.")]
-			public bool Dev { get; init; } = false;
-
-			[Description("Removes any dev certificates installed on this computer without starting EventStoreDB.")]
-			public bool RemoveDevCerts { get; init; } = false;
-		}
-
-		[Description("Application Options")]
-		public record ApplicationOptions {
-			[Description("Show help.")] public bool Help { get; init; } = false;
-
-			[Description("Show version.")] public bool Version { get; init; } = false;
-
-			[Description("Configuration files.")]
-			public string Config { get; init; } =
-				Path.Combine(Locations.DefaultConfigurationDirectory, DefaultFiles.DefaultConfigFile);
-
-			[Description("Print effective configuration to console and then exit.")]
-			public bool WhatIf { get; init; } = false;
-
-			[Description("Allows EventStoreDB to run with unknown configuration options present.")]
-			public bool AllowUnknownOptions { get; init; } = false;
-
-			[Description("Disable HTTP caching.")] public bool DisableHttpCaching { get; init; } = false;
-
-			[Description("The number of seconds between statistics gathers."),
-			 Unit("s")]
-			public int StatsPeriodSec { get; init; } = 30;
-
-			[Description("The number of threads to use for pool of worker services. Set to '0' to scale automatically (Default)")]
-			public int WorkerThreads { get; init; } = 0;
-
-			[Description("Enables the tracking of various histograms in the backend, " +
-			             "typically only used for debugging, etc.")]
-			[Deprecated("The EnableHistograms setting has been deprecated as of version 24.10.0 and currently has no effect. " +
-						"Please contact EventStore if this feature is of interest to you.")]
-			public bool EnableHistograms { get; init; } = false;
-
-			[Description("Log Http Requests and Responses before processing them.")]
-			public bool LogHttpRequests { get; init; } = false;
-
-			[Description("Log the failed authentication attempts.")]
-			public bool LogFailedAuthenticationAttempts { get; init; } = false;
-
-			[Description("Skip Index Scan on Reads. This skips the index scan which was used " +
-			             "to stop reading duplicates.")]
-			public bool SkipIndexScanOnReads { get; init; } = false;
-
-			[Description("The maximum size of appends, in bytes. May not exceed 16MB.")]
-			public int MaxAppendSize { get; init; } = 1_024 * 1_024;
-
-			[Description("Disable Authentication, Authorization and TLS on all TCP/HTTP interfaces.")]
-			public bool Insecure { get; init; } = false;
-
-			[Description("Allow anonymous access to HTTP API endpoints.")]
-			public bool AllowAnonymousEndpointAccess { get; init; } = false;
-
-			[Description("Allow anonymous access to streams.")]
-			public bool AllowAnonymousStreamAccess { get; init; } = false;
-
-			[Description("Overrides anonymous access for the gossip endpoint. If set to true, the gossip endpoint will accept anonymous access. " +
-			             $"Otherwise anonymous access will be dis/allowed based on the value of the '{nameof(AllowAnonymousEndpointAccess)}' option")]
-			public bool OverrideAnonymousEndpointAccessForGossip { get; init; } = true;
-
-			[Description("Disable telemetry data collection."), EnvironmentOnly("You can only opt-out of telemetry using Environment Variables")]
-			public bool TelemetryOptout { get; init; } = false;
-		}
-
-		[Description("Logging Options")]
-		public record LoggingOptions {
-			[Description("Path where to keep log files.")]
-			public string Log { get; init; } = Locations.DefaultLogDirectory;
-
-			[Description("The name of the log configuration file.")]
-			public string LogConfig { get; init; } = "logconfig.json";
-
-			[Description("Sets the minimum log level. For more granular settings, please edit logconfig.json.")]
-			public LogLevel LogLevel { get; init; } = LogLevel.Default;
-
-			[Description("Which format (plain, json) to use when writing to the console.")]
-			public LogConsoleFormat LogConsoleFormat { get; init; } = LogConsoleFormat.Plain;
-
-			[Description("Maximum size of each log file.")]
-			public int LogFileSize { get; init; } = 1024 * 1024 * 1024;
-
-			[Description("How often to rotate logs.")]
-			public RollingInterval LogFileInterval { get; init; } = RollingInterval.Day;
-
-			[Description("How many log files to hold on to.")]
-			public int LogFileRetentionCount { get; init; } = 31;
-
-			[Description("Disable log to disk.")]
-			public bool DisableLogFile { get; init; } = false;
-		}
-
-		[Description("Authentication/Authorization Options")]
-		public record AuthOptions {
-			[Description("The type of authorization to use.")]
-			public string AuthorizationType { get; init; } = "internal";
-
-			[Description("Path to the configuration file for authorization configuration (if applicable).")]
-			public string? AuthorizationConfig { get; init; }
-
-			[Description("The type of Authentication to use.")]
-			public string AuthenticationType { get; init; } = "internal";
-
-			[Description("Path to the configuration file for Authentication configuration (if applicable).")]
-			public string? AuthenticationConfig { get; init; }
-
-			[Description("Disables first level authorization checks on all HTTP endpoints. " +
-			             "This option can be enabled for backwards compatibility with EventStore 5.0.1 or earlier.")]
-			public bool DisableFirstLevelHttpAuthorization { get; init; } = false;
-		}
-
-		[Description("Certificate Options (from file)")]
-		public record CertificateFileOptions {
-			[Description("The path to a PKCS #12 (.p12/.pfx) or an X.509 (.pem, .crt, .cer, .der) certificate file. " +
-			             "If you have intermediate certificates, they should be bundled together in a PEM or PKCS #12 file containing the node's certificate followed by the intermediate certificates.")]
-			public string? CertificateFile { get; init; }
-
-			[Description("The path to the certificate private key file (.key) if an X.509 (.pem, .crt, .cer, .der) " +
-			             "certificate file is provided.")]
-			public string? CertificatePrivateKeyFile { get; init; }
-
-			[Description("The password to the certificate if a PKCS #12 (.p12/.pfx) certificate file is provided."),
-			 Sensitive]
-			public string? CertificatePassword { get; init; }
-
-			[Description("The password to the certificate private key file if an encrypted PKCS #8 private key file is provided."),
-			 Sensitive]
-			public string? CertificatePrivateKeyPassword { get; init; }
-		}
-
-		[Description("Certificate Options")]
-		public record CertificateOptions {
-			[Description("The path to a directory which contains trusted X.509 (.pem, .crt, .cer, .der) " +
-			             "root certificate files.")]
-			public string? TrustedRootCertificatesPath { get; init; } =
-				Locations.DefaultTrustedRootCertificateDirectory;
-
-			[Description("The pattern the CN (Common Name) of a connecting EventStoreDB node must match to be authenticated. A wildcard FQDN can be specified if using wildcard certificates or if the CN is not the same on all nodes. Leave empty to automatically use the CN of this node's certificate.")]
-			public string CertificateReservedNodeCommonName { get; init; } = string.Empty;
-		}
-
-		[Description("Certificate Options (from store)")]
-		public record CertificateStoreOptions {
-			[Description("The certificate store location name.")]
-			public string CertificateStoreLocation { get; init; } = string.Empty;
-
-			[Description("The certificate store name.")]
-			public string CertificateStoreName { get; init; } = string.Empty;
-
-			[Description("The certificate store subject name.")]
-			public string CertificateSubjectName { get; init; } = string.Empty;
-
-			[Description("The certificate fingerprint/thumbprint.")]
-			public string CertificateThumbprint { get; init; } = string.Empty;
-
-			[Description("The name of the certificate store that contains the trusted root certificate.")]
-			public string TrustedRootCertificateStoreName { get; init; } = string.Empty;
-
-			[Description("The certificate store location that contains the trusted root certificate.")]
-			public string TrustedRootCertificateStoreLocation { get; init; } = string.Empty;
-
-			[Description("The trusted root certificate subject name.")]
-			public string TrustedRootCertificateSubjectName { get; init; } = string.Empty;
-
-			[Description("The trusted root certificate fingerprint/thumbprint.")]
-			public string TrustedRootCertificateThumbprint { get; init; } = string.Empty;
-		}
-
-		[Description("Cluster Options")]
-		public record ClusterOptions {
-			[Description("The maximum number of entries to keep in the stream info cache. Set to '0' to scale automatically (Default)")]
-			public int StreamInfoCacheCapacity { get; init; } = 0;
-
-			[Description("The number of nodes in the cluster.")]
-			public int ClusterSize { get; init; } = 1;
-
-			[Description("The node priority used during leader election.")]
-			public int NodePriority { get; init; } = 0;
-
-			[Description("Whether to use DNS lookup to discover other cluster nodes.")]
-			public bool DiscoverViaDns { get; init; } = true;
-
-			[Description("DNS name from which other nodes can be discovered.")]
-			public string ClusterDns { get; init; } = "fake.dns";
-
-			[Description("The port on which cluster nodes' managers are running.")]
-			public int ClusterGossipPort { get; init; } = 2113;
-
-			[Description("Endpoints for other cluster nodes from which to seed gossip.")]
-			public EndPoint[] GossipSeed { get; init; } = [];
-
-			[Description("The interval, in ms, nodes should try to gossip with each other."),
-			 Unit("ms")]
-			public int GossipIntervalMs { get; init; } = 2_000;
-
-			[Description("The amount of drift, in ms, between clocks on nodes allowed before gossip is rejected."),
-			 Unit("ms")]
-			public int GossipAllowedDifferenceMs { get; init; } = 60_000;
-
-			[Description("The timeout, in ms, on gossip to another node."),
-			 Unit("ms")]
-			public int GossipTimeoutMs { get; init; } = 2_500;
-
-			[Description("Sets this node as a read only replica that is not allowed to participate in elections " +
-			             "or accept writes from clients.")]
-			public bool ReadOnlyReplica { get; init; } = false;
-
-			[Description("Sets this node as an Archiver node. Requires ReadOnlyReplica to be true. Experimental.")]
-			public bool Archiver { get; init; } = false;
-
-			[Description("Allow more nodes than the cluster size to join the cluster as clones. " +
-			             "(UNSAFE: can cause data loss if a clone is promoted as leader)")]
-			public bool UnsafeAllowSurplusNodes { get; init; } = false;
-
-			[Description("The number of seconds a dead node will remain in the gossip before being pruned."),
-			 Unit("s")]
-			public int DeadMemberRemovalPeriodSec { get; init; } = 1_800;
-
-			[Description("The timeout, in milliseconds, on election messages to other nodes."),
-			 Unit("ms")]
-			public int LeaderElectionTimeoutMs { get; init; } = 1_000;
-
-			public int QuorumSize => ClusterSize == 1 ? 1 : ClusterSize / 2 + 1;
-		}
-
-		[Description("Database Options")]
-		public record DatabaseOptions {
-			[Description("The minimum flush delay in milliseconds."),
-			 Unit("ms")]
-			public double MinFlushDelayMs { get; init; } = TFConsts.MinFlushDelayMs.TotalMilliseconds;
-
-			[Description("Disables the merging of chunks when scavenge is running.")]
-			public bool DisableScavengeMerging { get; init; } = false;
-
-			[Description("The number of days to keep scavenge history."),
-			Unit("d")]
-			public int ScavengeHistoryMaxAge { get; init; } = 30;
-
-			[Description("The number of chunks to cache in unmanaged memory.")]
-			public int CachedChunks { get; init; } = -1;
-
-			[Description("The amount of unmanaged memory to use for caching chunks in bytes.")]
-			public long ChunksCacheSize { get; init; } = TFConsts.ChunksCacheSize;
-
-			[Description("Adjusts the maximum size of a mem table.")]
-			public int MaxMemTableSize { get; init; } = 1_000_000;
-
-			[Description("The number of events to read per candidate in the case of a hash collision.")]
-			public int HashCollisionReadLimit { get; init; } = 100;
-
-			[Description("The path the db should be loaded/saved to.")]
-			public string Db { get; init; } = Locations.DefaultDataDirectory;
-
-			[Description("The path the index should be loaded/saved to.")]
-			public string? Index { get; init; } = null;
-
-			[Description("The type of transformation to apply to the database.")]
-			public string Transform { get; init; } = "identity";
-
-			[Description("Keep everything in memory, no directories or files are created.")]
-			public bool MemDb { get; init; } = false;
-
-			[Description("Creates a Bloom filter file for each new index file to speed up index reads.")]
-			public bool UseIndexBloomFilters { get; init; } = true;
-
-			[Description("The maximum number of entries to keep in each index cache.")]
-			public int IndexCacheSize { get; init; } = 0;
-
-			[Description("Bypasses the checking of file hashes of database during startup " +
-			             "(allows for faster startup).")]
-			public bool SkipDbVerify { get; init; } = false;
-
-			[Description("Enables Write Through when writing to the file system, this bypasses filesystem caches.")]
-			public bool WriteThrough { get; init; } = false;
-
-			[Description("Enables Unbuffered/DirectIO when writing to the file system, this bypasses filesystem " +
-			             "caches.")]
-			[Deprecated("The Unbuffered setting has been deprecated as of version 24.6.0 and currently has no effect. " +
-			            "Please contact EventStore if this feature is of interest to you.")]
-			public bool Unbuffered { get; init; } = false;
-
-			[Description("The initial number of readers to start when opening a TFChunk.")]
-			[Deprecated("The ChunkInitialReaderCount parameter has been deprecated as of version 24.6.0 and currently has no effect.")]
-			public int ChunkInitialReaderCount { get; init; } = 5;
-
-			[Description("Prepare timeout (in milliseconds)."),
-			 Unit("ms")]
-			public int PrepareTimeoutMs { get; init; } = 2_000;
-
-			[Description("Commit timeout (in milliseconds)."),
-			 Unit("ms")]
-			public int CommitTimeoutMs { get; init; } = 2_000;
-
-			[Description("Write timeout (in milliseconds)."),
-			 Unit("ms")]
-			public int WriteTimeoutMs { get; init; } = 2_000;
-
-			[Description("Disable flushing to disk. (UNSAFE: on power off)")]
-			public bool UnsafeDisableFlushToDisk { get; init; }
-
-			[Description("Disables Hard Deletes. (UNSAFE: use to remove hard deletes)")]
-			[Deprecated("This setting is unsafe and not recommended")]
-			public bool UnsafeIgnoreHardDelete { get; init; } = false;
-
-			[Description("Bypasses the checking of file hashes of indexes during startup and after index merges " +
-			             "(allows for faster startup and less disk pressure after merges).")]
-			public bool SkipIndexVerify { get; init; } = false;
-
-			[Description("Sets the depth to cache for the mid point cache in index.")]
-			public int IndexCacheDepth { get; init; } = 16;
-
-			[Description("Makes index merges faster and reduces disk pressure during merges.")]
-			[Deprecated("This setting is ignored by the new scavenge algorithm and will be removed in future versions.")]
-			public bool OptimizeIndexMerge { get; init; } = false;
-
-			[Description("Always keeps the newer chunks from a scavenge operation.")]
-			[Deprecated("This setting is ignored by the new scavenge algorithm and will be removed in future versions.")]
-			public bool AlwaysKeepScavenged { get; init; } = false;
-
-			[Description("Change the way the DB files are opened to reduce their stickiness in the system file cache.")]
-			public bool ReduceFileCachePressure { get; init; } = false;
-
-			[Description("Number of threads to be used to initialize the database. " +
-			             "Will be capped at host processor count.")]
-			public int InitializationThreads { get; init; } = 1;
-
-			[Description("The number of reader threads to use for processing reads. Set to '0' to scale automatically (Default)")]
-			public int ReaderThreadsCount { get; init; } = 0;
-
-			[Description("During large Index Merge operations, writes may be slowed down. Set this to the maximum " +
-			             "index file level for which automatic merges should happen. Merging indexes above this level " +
-			             "should be done manually.")]
-			public int MaxAutoMergeIndexLevel { get; init; } = int.MaxValue;
-
-			[Description("Set this option to write statistics to the database.")]
-			public bool WriteStatsToDb {
-				get => (StatsStorage.Stream & StatsStorage) != 0;
-				init => StatsStorage =
-					value
-						? StatsStorage.StreamAndFile
-						: StatsStorage.File; // TODO SS: not sure if we should do this here
-			}
-
-			[Description("When truncate.chk is set, the database will be truncated on startup. " +
-			             "This is a safety check to ensure large amounts of data truncation does not happen " +
-			             "accidentally. This value should be set in the low 10,000s for allow for " +
-			             "standard cluster recovery operations. -1 is no max.")]
-			public long MaxTruncation { get; init; } = 256 * 1_024 * 1_024;
-
-			public int ChunkSize { get; init; } = TFConsts.ChunkSize;
-
-			public StatsStorage StatsStorage { get; init; } = StatsStorage.File;
-
-			[Description("The log format version to use for storing the event log. " +
-			             "V3 is currently in development and should only be used for testing purposes.")]
-			public DbLogFormat DbLogFormat { get; init; } = DbLogFormat.V2;
-
-			[Description("The amount of memory & disk space, in bytes, to use for the stream existence filter. " +
-			             "This should be set to roughly the maximum number of streams you expect to have in your database, " +
-			             "i.e if you expect to have a max of 500 million streams, use a value of 500 megabytes. " +
-			             "The value you select should also fit entirely in memory to avoid any performance degradation. " +
-			             "Use 0 to disable the filter. Resizing the filter will cause a full rebuild.")]
-			public long StreamExistenceFilterSize { get; init; } = Opts.StreamExistenceFilterSizeDefault;
-
-			[Description("The page size of the scavenge database.")]
-			public int ScavengeBackendPageSize { get; init; } = Opts.ScavengeBackendPageSizeDefault;
-
-			[Description("The amount of memory to use for backend caching in bytes.")]
-			public long ScavengeBackendCacheSize { get; init; } = Opts.ScavengeBackendCacheSizeDefault;
-
-			[Description("The number of stream hashes to remember when checking for collisions.")]
-			public int ScavengeHashUsersCacheCapacity { get; init; } = Opts.ScavengeHashUsersCacheCapacityDefault;
-		}
-
-		[Description("gRPC Options")]
-		public record GrpcOptions {
-			[Description("Controls the period (in milliseconds) after which a keepalive ping " +
-			             "is sent on the transport."),
-			 Unit("ms")]
-			public int KeepAliveInterval { get; init; } = 10_000;
-
-			[Description("Controls the amount of time (in milliseconds) the sender of the keepalive ping waits " +
-			             "for an acknowledgement. If it does not receive an acknowledgment within this time, " +
-			             "it will close the connection."),
-			 Unit("ms")]
-			public int KeepAliveTimeout { get; init; } = 10_000;
-
-			internal static GrpcOptions FromConfiguration(IConfiguration configurationRoot) => new() {
-				KeepAliveInterval = configurationRoot.GetValue<int>(nameof(KeepAliveInterval)),
-				KeepAliveTimeout = configurationRoot.GetValue<int>(nameof(KeepAliveTimeout))
-			};
-		}
-
-		[Description("Interface Options")]
-		public record InterfaceOptions {
-#pragma warning disable 0618
-			[Description("Internal IP Address."),
-			 Deprecated(
-				 "The IntIp parameter has been deprecated as of version 23.10.0. It is recommended to use the ReplicationIp parameter instead.")]
-			[Obsolete("IntIp is deprecated, use ReplicationIp instead")]
-			public IPAddress IntIp { get; init; } = IPAddress.Loopback;
-
-			private readonly IPAddress _replicationIp = IPAddress.Loopback;
-			[Description("The IP Address used by internal replication between nodes in the cluster.")]
-			public IPAddress ReplicationIp {
-				get {
-					return _replicationIp.Equals(IPAddress.Loopback) ? IntIp : _replicationIp;
-				}
-				init { _replicationIp = value; }
-			}
-
-			[Description("External IP Address."),
-			 Deprecated(
-				 "The ExtIp parameter has been deprecated as of version 23.10.0. It is recommended to use the NodeIp parameter instead.")]
-			[Obsolete("ExtIp is deprecated, use NodeIp instead")]
-			public IPAddress ExtIp { get; init; } = IPAddress.Loopback;
-
-			private readonly IPAddress _nodeIp = IPAddress.Loopback;
-			[Description("The IP Address for the node.")]
-			public IPAddress NodeIp {
-				get {
-					return _nodeIp.Equals(IPAddress.Loopback) ? ExtIp : _nodeIp;
-				}
-				init { _nodeIp = value; }
-			}
-
-			[Description("The port to run the HTTP server on."),
-			 Deprecated(
-				 "The HttpPort parameter has been deprecated as of version 23.10.0. It is recommended to use the NodePort parameter instead.")]
-			[Obsolete("HttpPort is deprecated, use NodePort instead")]
-			public int HttpPort { get; init; } = 2113;
-
-			private readonly int _nodePort = 2113;
-
-			[Description("The Port to run the HTTP server on.")]
-			public int NodePort {
-				get {
-					return _nodePort == 2113 ? HttpPort : _nodePort;
-				}
-				init {
-					_nodePort = value;
-				}
-			}
-
-			[Description("Internal TCP Port."),
-			 Deprecated(
-				 "The IntTcpPort parameter has been deprecated as of version 23.10.0. It is recommended to use the ReplicationPort parameter instead.")]
-			[Obsolete("IntTcpPort is deprecated, use ReplicationPort instead")]
-			public int IntTcpPort { get; init; } = 1112;
-
-			private readonly int _replicationPort = 1112;
-			[Description("The TCP port used by internal replication between nodes in the cluster.")]
-			public int ReplicationPort {
-				get {
-					return _replicationPort == 1112 ? IntTcpPort : _replicationPort;
-				}
-				init {
-					_replicationPort = value;
-				}
-			}
-
-			[Description("Advertise the Node's host name to other nodes and external clients as.")]
-			public string? NodeHostAdvertiseAs { get; init; } = null;
-
-			[Description("Advertise Internal Tcp Address As."),
-			 Deprecated(
-				 "The IntHostAdvertiseAs parameter has been deprecated as of version 23.10.0. It is recommended to use the ReplicationHostAdvertiseAs parameter instead.")]
-			[Obsolete("IntHostAdvertiseAs is deprecated, use ReplicationHostAdvertiseAs instead")]
-			public string? IntHostAdvertiseAs { get; init; } = null;
-
-			private readonly string? _replicationHostAdvertiseAs = null;
-			[Description("Advertise the Replication host name to other nodes in the cluster as.")]
-			public string? ReplicationHostAdvertiseAs {
-				get {
-					return _replicationHostAdvertiseAs ?? IntHostAdvertiseAs;
-				}
-				init {
-					_replicationHostAdvertiseAs = value;
-				}
-			}
-
-			[Description("Advertise Host in Gossip to Client As.")]
-			public string? AdvertiseHostToClientAs { get; init; } = null;
-
-			[Description("Advertise HTTP Port in Gossip to Client As."),
-			 Deprecated(
-				 "The AdvertiseHttpPortToClientAs parameter has been deprecated as of version 23.10.0. It is recommended to use the AdvertiseNodePortToClientAs parameter instead.")]
-			[Obsolete("AdvertiseHttpPortToClientAs is deprecated, use AdvertiseNodePortToClientAs instead")]
-			public int AdvertiseHttpPortToClientAs { get; init; } = 0;
-
-			private readonly int _advertiseNodePortToClientAs = 0;
-
-			[Description("Advertise Node Port in Gossip to Client As.")]
-			public int AdvertiseNodePortToClientAs {
-				get {
-					return _advertiseNodePortToClientAs == 0
-						? AdvertiseHttpPortToClientAs
-						: _advertiseNodePortToClientAs;
-				}
-				init {
-					_advertiseNodePortToClientAs = value;
-				}
-			}
-
-			[Description("Advertise Http Port As."),
-			 Deprecated(
-				 "The HttpPortAdvertiseAs parameter has been deprecated as of version 23.10.0. It is recommended to use the NodePortAdvertiseAs parameter instead.")]
-			[Obsolete("HttpPortAdvertiseAs is deprecated, use NodePortAdvertiseAs instead")]
-			public int HttpPortAdvertiseAs { get; init; } = 0;
-
-			private readonly int _nodePortAdvertiseAs = 0;
-			[Description("Advertise Http Port As.")]
-			public int NodePortAdvertiseAs {
-				get {
-					return _nodePortAdvertiseAs == 0 ? HttpPortAdvertiseAs : _nodePortAdvertiseAs;
-				}
-				init {
-					_nodePortAdvertiseAs = value;
-				}
-			}
-
-			[Description("Advertise Internal Tcp Port As."),
-			 Deprecated(
-				 "The IntTcpPortAdvertiseAs parameter has been deprecated as of version 23.10.0. It is recommended to use the ReplicationTcpPortAdvertiseAs parameter instead.")]
-			[Obsolete("IntTcpPortAdvertiseAs is deprecated, use ReplicationTcpPortAdvertiseAs instead")]
-			public int IntTcpPortAdvertiseAs { get; init; } = 0;
-
-			private readonly int _replicationTcpPortAdvertiseAs = 0;
-			[Description("Advertise Replication Tcp Port As.")]
-			public int ReplicationTcpPortAdvertiseAs {
-				get {
-					return _replicationTcpPortAdvertiseAs == 0 ? IntTcpPortAdvertiseAs : _replicationTcpPortAdvertiseAs;
-				}
-				init {
-					_replicationTcpPortAdvertiseAs = value;
-				}
-			}
-
-			[Description("Heartbeat timeout for internal TCP sockets."),
-			 Unit("ms"),
-			 Deprecated(
-				 "The IntTcpHeartbeatTimeout parameter has been deprecated as of version 23.10.0. It is recommended to use the ReplicationHeartbeatTimeout parameter instead.")]
-			[Obsolete("IntTcpHeartbeatTimeout is deprecated, use ReplicationHeartbeatTimeout instead")]
-			public int IntTcpHeartbeatTimeout { get; init; } = 700;
-
-			private readonly int _replicationHeartbeatTimeout = 700;
-			[Description("Heartbeat timeout for Replication TCP sockets."),
-			 Unit("ms")]
-			public int ReplicationHeartbeatTimeout {
-				get {
-					return _replicationHeartbeatTimeout == 700 ? IntTcpHeartbeatTimeout : _replicationHeartbeatTimeout;
-				}
-				init {
-					_replicationHeartbeatTimeout = value;
-				}
-			}
-
-			[Description("Heartbeat interval for internal TCP sockets."),
-			 Unit("ms"),
-			 Deprecated(
-				 "The IntTcpHeartbeatInterval parameter has been deprecated as of version 23.10.0. It is recommended to use the ReplicationHeartbeatInterval parameter instead.")]
-			[Obsolete("IntTcpHeartbeatInterval is deprecated, use ReplicationHeartbeatInterval instead")]
-			public int IntTcpHeartbeatInterval { get; init; } = 700;
-
-			private readonly int _replicationHeartbeatInterval = 700;
-			[Description("Heartbeat interval for Replication TCP sockets."),
-			 Unit("ms")]
-			public int ReplicationHeartbeatInterval {
-				get {
-					return _replicationHeartbeatInterval == 700
-						? IntTcpHeartbeatInterval
-						: _replicationHeartbeatInterval;
-				}
-				init {
-					_replicationHeartbeatInterval = value;
-				}
-			}
-
-			[Description("Whether to allow local connections via a UNIX domain socket.")]
-			public bool EnableUnixSocket { get; init; } = false;
-
-			[Description("When enabled, tells a single node to run gossip as if it is a cluster."),
-			 Deprecated("The '" + nameof(GossipOnSingleNode) + "' option has been deprecated as of version 21.2.")]
-			public bool? GossipOnSingleNode { get; init; } = null;
-
-			[Description("The maximum number of pending send bytes allowed before a connection is closed.")]
-			public int ConnectionPendingSendBytesThreshold { get; init; } = 10 * 1_024 * 1_024;
-
-			[Description("The maximum number of pending connection operations allowed before a connection is closed.")]
-			public int ConnectionQueueSizeThreshold { get; init; } = 50_000;
-
-			[Description("Disables the admin ui on the HTTP endpoint.")]
-			public bool DisableAdminUi { get; init; } = false;
-
-			[Description("Disables statistics requests on the HTTP endpoint.")]
-			public bool DisableStatsOnHttp { get; init; } = false;
-
-			[Description("Disables gossip requests on the HTTP endpoint.")]
-			public bool DisableGossipOnHttp { get; init; } = false;
-
-			[Description("Enables trusted authentication by an intermediary in the HTTP.")]
-			public bool EnableTrustedAuth { get; init; } = false;
-
-			[Description("Whether to disable secure internal TCP communication."),
-			 Deprecated("The '" + nameof(DisableInternalTcpTls) +
-			            "' option has been deprecated as of version 20.6.1 and currently has no effect. Please use the '" +
-			            nameof(Application.Insecure) + "' option instead.")]
-			public bool DisableInternalTcpTls { get; init; } = false;
-
-			[Description("Enable AtomPub over HTTP Interface."),
-			 Deprecated("AtomPub over HTTP Interface has been deprecated as of version 20.6.0. It is recommended to use gRPC instead")]
-			public bool EnableAtomPubOverHttp { get; init; } = false;
-#pragma warning restore 0618
-		}
-
-		[Description("Projection Options")]
-		public record ProjectionOptions {
-			public const int DefaultProjectionExecutionTimeout = 250;
-			[Description("Enables the running of projections. System runs built-in projections, " +
-			             "All runs user projections.")]
-			public ProjectionType RunProjections { get; init; }
-
-			[Description("Start the built in system projections.")]
-			public bool StartStandardProjections { get; init; } = false;
-
-			[Description("The number of threads to use for projections.")]
-			public int ProjectionThreads { get; init; } = 3;
-
-			[Description("The number of minutes a query can be idle before it expires."),
-			 Unit("m")]
-			public int ProjectionsQueryExpiry { get; init; } = 5;
-
-			[Description("Fault the projection if the Event number that was expected in the stream differs " +
-			             "from what is received. This may happen if events have been deleted or expired.")]
-			public bool FaultOutOfOrderProjections { get; init; } = false;
-
-			[Description("The time in milliseconds allowed for the compilation phase of user projections"),
-			 Unit("ms")]
-			public int ProjectionCompilationTimeout { get; set; } = 500;
-
-			[Description("The maximum execution time in milliseconds for executing a handler in a user projection. It can be overridden for a specific projection by setting ProjectionExecutionTimeout config for that projection"),
-			 Unit("ms")]
-			public int ProjectionExecutionTimeout { get; set; } = DefaultProjectionExecutionTimeout;
-		}
-
-		public record UnknownOptions(IReadOnlyList<(string, string)> Options) {
-			/// <summary>
-			/// Identifies unknown options in the configuration and provides suggestions for known options.
-			/// </summary>
-			public static UnknownOptions FromConfiguration(IConfiguration configuration) {
-				var knownKeys = Metadata
-					.SelectMany(x => x.Options)
-					.Select(x => x.Key)
-					.ToHashSet(StringComparer.OrdinalIgnoreCase);
-
-				var unknownKeys = FindUnknownKeys(configuration, knownKeys);
-
-				var result = unknownKeys
-					.Select(unknownKey => CreateUnknownOptionResult(knownKeys, unknownKey))
-					.ToList();
-
-				return new(result);
-
-				static IEnumerable<string> FindUnknownKeys(IConfiguration configuration,
-					IReadOnlySet<string> knownKeys) {
-					var unknownKeys = configuration
-						.AsEnumerable()
-						.Select(kvp => kvp.Key)
-						.Where(key => key != EventStoreConfigurationKeys.Prefix
-						              && !knownKeys.Contains(EventStoreConfigurationKeys.Normalize(key)))
-						.ToList();
-
-					var unknownSections = FindUnknownSections(unknownKeys);
-
-					return unknownKeys
-						.Where(key => !unknownSections.Any(key.StartsWith));
-				}
-
-				static HashSet<string> FindUnknownSections(IEnumerable<string> keys) {
-					// if it has more than 2 sections, we found a value with an unknown section
-					var hashSet = new HashSet<string>();
-
-					foreach (var key in keys.Where(key => key.Split(":").Length > 2))
-						hashSet.Add(key[..key.LastIndexOf(':')]);
-
-					return hashSet;
-				}
-
-				static (string UnknownKey, string SuggestedKey) CreateUnknownOptionResult(IEnumerable<string> knownKeys,
-					string unknownKey, int distanceThreshold = 5) {
-					var suggestion = knownKeys
-						.Select(key => (AllowedKey: key, Distance: Levenshtein.GetDistance(unknownKey, key)))
-						.MinBy(x => x.Distance);
-
-					return (
-						UnknownKey: EventStoreConfigurationKeys.StripConfigurationPrefix(unknownKey),
-						SuggestedKey: suggestion.Distance > distanceThreshold
-							? ""
-							: EventStoreConfigurationKeys.StripConfigurationPrefix(suggestion.AllowedKey)
-					);
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Configuration/ClusterVNodeOptionsExtensions.cs b/src/EventStore.Core/Configuration/ClusterVNodeOptionsExtensions.cs
deleted file mode 100644
index a1c03fc9ee2..00000000000
--- a/src/EventStore.Core/Configuration/ClusterVNodeOptionsExtensions.cs
+++ /dev/null
@@ -1,309 +0,0 @@
-// ReSharper disable CheckNamespace
-
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Security.Cryptography.X509Certificates;
-using EventStore.Common.Exceptions;
-using EventStore.Common.Utils;
-using EventStore.Plugins;
-using Serilog;
-
-namespace EventStore.Core {
-	public static class ClusterVNodeOptionsExtensions {
-		public static ClusterVNodeOptions Reload(this ClusterVNodeOptions options) =>
-			options.ConfigurationRoot == null
-				? options
-				: ClusterVNodeOptions.FromConfiguration(options.ConfigurationRoot);
-
-		public static ClusterVNodeOptions WithPlugableComponent(this ClusterVNodeOptions options, IPlugableComponent plugableComponent) =>
-			options with { PlugableComponents = [..options.PlugableComponents, plugableComponent] };
-
-		public static ClusterVNodeOptions InCluster(this ClusterVNodeOptions options, int clusterSize) => options with {
-			Cluster = options.Cluster with {
-				ClusterSize = clusterSize <= 1
-					? throw new ArgumentOutOfRangeException(nameof(clusterSize), clusterSize,
-						$"{nameof(clusterSize)} must be greater than 1.")
-					: clusterSize
-			}
-		};
-
-		/// <summary>
-		/// Returns a builder set to run in memory only
-		/// </summary>
-		/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
-		/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
-		public static ClusterVNodeOptions RunInMemory(this ClusterVNodeOptions options) => options with {
-			Database = options.Database with {
-				MemDb = true,
-				Db = new ClusterVNodeOptions().Database.Db
-			}
-		};
-
-		/// <summary>
-		/// Returns a builder set to write database files to the specified path
-		/// </summary>
-		/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
-		/// <param name="path">The path on disk in which to write the database files</param>
-		/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
-		public static ClusterVNodeOptions RunOnDisk(this ClusterVNodeOptions options, string path) => options with {
-			Database = options.Database with {
-				MemDb = false,
-				Db = path
-			}
-		};
-
-		/// <summary>
-		/// Runs the node in insecure mode.
-		/// </summary>
-		/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
-		/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
-		public static ClusterVNodeOptions Insecure(this ClusterVNodeOptions options) => options with {
-			Application = options.Application with {
-				Insecure = true
-			},
-			ServerCertificate = null,
-			TrustedRootCertificates = null
-		};
-
-		/// <summary>
-		/// Runs the node in secure mode.
-		/// </summary>
-		/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
-		/// <param name="trustedRootCertificates">A <see cref="X509Certificate2Collection"/> containing trusted root <see cref="X509Certificate2"/></param>
-		/// <param name="serverCertificate">A <see cref="X509Certificate2"/> for the server</param>
-		/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
-		public static ClusterVNodeOptions Secure(this ClusterVNodeOptions options,
-			X509Certificate2Collection trustedRootCertificates, X509Certificate2 serverCertificate) => options with {
-			Application = options.Application with {
-				Insecure = false,
-			},
-			ServerCertificate = serverCertificate,
-			TrustedRootCertificates = trustedRootCertificates
-		};
-
-		/// <summary>
-		/// Sets gossip seeds to the specified value and turns off dns discovery
-		/// </summary>
-		/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
-		/// <param name="gossipSeeds">The list of gossip seeds</param>
-		/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
-		public static ClusterVNodeOptions WithGossipSeeds(this ClusterVNodeOptions options, EndPoint[] gossipSeeds) =>
-			options with {
-				Cluster = options.Cluster with {
-					GossipSeed = gossipSeeds,
-					DiscoverViaDns = false,
-					ClusterDns = string.Empty
-				}
-			};
-
-		/// <summary>
-		/// Sets the external tcp endpoint to the specified value
-		/// </summary>
-		/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
-		/// <param name="endPoint">The external secure endpoint to use</param>
-		/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
-		public static ClusterVNodeOptions WithExternalSecureTcpOn(
-			this ClusterVNodeOptions options, IPEndPoint endPoint) =>
-			options with {
-				Interface = options.Interface with {
-					NodeIp = endPoint.Address,
-				}
-			};
-
-		/// <summary>
-		/// Sets the internal secure tcp endpoint to the specified value
-		/// </summary>
-		/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
-		/// <param name="endPoint">The internal secure endpoint to use</param>
-		/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
-		public static ClusterVNodeOptions WithInternalSecureTcpOn(
-			this ClusterVNodeOptions options, IPEndPoint endPoint) =>
-			options with {
-				Interface = options.Interface with {
-					ReplicationIp = endPoint.Address,
-					DisableInternalTcpTls = false,
-					ReplicationPort = endPoint.Port
-				}
-			};
-
-		/// <summary>
-		/// Sets the external tcp endpoint to the specified value
-		/// </summary>
-		/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
-		/// <param name="endPoint">The external endpoint to use</param>
-		/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
-		public static ClusterVNodeOptions WithExternalTcpOn(
-			this ClusterVNodeOptions options, IPEndPoint endPoint) =>
-			options with {
-				Interface = options.Interface with {
-					NodeIp = endPoint.Address,
-				}
-			};
-
-		/// <summary>
-		/// Sets the internal tcp endpoint to the specified value
-		/// </summary>
-		/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
-		/// <param name="endPoint">The internal endpoint to use</param>
-		/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
-		public static ClusterVNodeOptions WithInternalTcpOn(
-			this ClusterVNodeOptions options, IPEndPoint endPoint) =>
-			options with {
-				Interface = options.Interface with {
-					ReplicationIp = endPoint.Address,
-					ReplicationPort = endPoint.Port,
-					DisableInternalTcpTls = true
-				}
-			};
-
-		/// <summary>
-		/// Sets the http endpoint to the specified value
-		/// </summary>
-		/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
-		/// <param name="endPoint">The http endpoint to use</param>
-		/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
-		public static ClusterVNodeOptions WithHttpOn(
-			this ClusterVNodeOptions options, IPEndPoint endPoint) =>
-			options with {
-				Interface = options.Interface with {
-					NodeIp = endPoint.Address,
-					NodePort = endPoint.Port
-				}
-			};
-
-		/// <summary>
-		/// Sets up the External Host that would be advertised
-		/// </summary>
-		/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
-		/// <param name="endPoint">The advertised host</param>
-		/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
-		public static ClusterVNodeOptions
-			AdvertiseExternalHostAs(this ClusterVNodeOptions options, EndPoint endPoint) =>
-			options with {
-				Interface = options.Interface with {
-					NodeHostAdvertiseAs = endPoint.GetHost(),
-				}
-			};
-
-		/// <summary>
-		/// Sets up the Internal Host that would be advertised
-		/// </summary>
-		/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
-		/// <param name="endPoint">The advertised host</param>
-		/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
-		public static ClusterVNodeOptions
-			AdvertiseInternalHostAs(this ClusterVNodeOptions options, EndPoint endPoint) =>
-			options with {
-				Interface = options.Interface with {
-					ReplicationHostAdvertiseAs = endPoint.GetHost(),
-					ReplicationTcpPortAdvertiseAs = endPoint.GetPort()
-				}
-			};
-
-		/// <summary>
-		/// </summary>
-		/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
-		/// <param name="endPoint">The advertised host</param>
-		/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
-		public static ClusterVNodeOptions AdvertiseHttpHostAs(this ClusterVNodeOptions options, EndPoint endPoint) =>
-			options with {
-				Interface = options.Interface with {
-					NodeHostAdvertiseAs = endPoint.GetHost(),
-					NodePortAdvertiseAs = endPoint.GetPort()
-				}
-			};
-
-		/// <summary>
-		/// </summary>
-		/// <param name="options"></param>
-		/// <returns></returns>
-		/// <exception cref="InvalidConfigurationException"></exception>
-		public static (X509Certificate2 certificate, X509Certificate2Collection intermediates) LoadNodeCertificate(
-			this ClusterVNodeOptions options) {
-			if (options.ServerCertificate != null) {
-				//used by test code paths only
-				return (options.ServerCertificate!, null);
-			}
-
-
-			if (!string.IsNullOrWhiteSpace(options.CertificateStore.CertificateStoreLocation)) {
-				var location =
-					CertificateUtils.GetCertificateStoreLocation(options.CertificateStore.CertificateStoreLocation);
-				var name = CertificateUtils.GetCertificateStoreName(options.CertificateStore.CertificateStoreName);
-				return (CertificateUtils.LoadFromStore(location, name, options.CertificateStore.CertificateSubjectName,
-					options.CertificateStore.CertificateThumbprint), null);
-			}
-
-			if (!string.IsNullOrWhiteSpace(options.CertificateStore.CertificateStoreName)) {
-				var name = CertificateUtils.GetCertificateStoreName(options.CertificateStore.CertificateStoreName);
-				return (
-					CertificateUtils.LoadFromStore(name, options.CertificateStore.CertificateSubjectName,
-						options.CertificateStore.CertificateThumbprint), null);
-			}
-
-			if (options.CertificateFile.CertificateFile.IsNotEmptyString()) {
-				Log.Information("Loading the node's certificate(s) from file: {path}",
-					options.CertificateFile.CertificateFile);
-				return CertificateUtils.LoadFromFile(options.CertificateFile.CertificateFile,
-					options.CertificateFile.CertificatePrivateKeyFile, options.CertificateFile.CertificatePassword,
-					options.CertificateFile.CertificatePrivateKeyPassword);
-			}
-
-			throw new InvalidConfigurationException(
-				"A certificate is required unless insecure mode (--insecure) is set.");
-		}
-
-		/// <summary>
-		/// Loads an <see cref="X509Certificate2Collection"/> from the options set.
-		/// If either TrustedRootCertificateStoreLocation or TrustedRootCertificateStoreName is set,
-		/// then the certificates will only be loaded from the certificate store.
-		/// Otherwise, the certificates will be loaded from the path specified by TrustedRootCertificatesPath.
-		/// </summary>
-		/// <param name="options"></param>
-		/// <returns></returns>
-		/// <exception cref="InvalidConfigurationException"></exception>
-		public static X509Certificate2Collection LoadTrustedRootCertificates(this ClusterVNodeOptions options) {
-			if (options.TrustedRootCertificates != null) return options.TrustedRootCertificates;
-			var trustedRootCerts = new X509Certificate2Collection();
-
-			if (!string.IsNullOrWhiteSpace(options.CertificateStore.TrustedRootCertificateStoreLocation)) {
-				var location =
-					CertificateUtils.GetCertificateStoreLocation(options.CertificateStore
-						.TrustedRootCertificateStoreLocation);
-				var name = CertificateUtils.GetCertificateStoreName(options.CertificateStore
-					.TrustedRootCertificateStoreName);
-				trustedRootCerts.Add(CertificateUtils.LoadFromStore(location, name,
-					options.CertificateStore.TrustedRootCertificateSubjectName,
-					options.CertificateStore.TrustedRootCertificateThumbprint));
-				return trustedRootCerts;
-			}
-
-			if (!string.IsNullOrWhiteSpace(options.CertificateStore.TrustedRootCertificateStoreName)) {
-				var name = CertificateUtils.GetCertificateStoreName(options.CertificateStore
-					.TrustedRootCertificateStoreName);
-				trustedRootCerts.Add(CertificateUtils.LoadFromStore(name,
-					options.CertificateStore.TrustedRootCertificateSubjectName,
-					options.CertificateStore.TrustedRootCertificateThumbprint));
-				return trustedRootCerts;
-			}
-
-			if (string.IsNullOrEmpty(options.Certificate.TrustedRootCertificatesPath)) {
-				throw new InvalidConfigurationException(
-					$"{nameof(options.Certificate.TrustedRootCertificatesPath)} must be specified unless insecure mode (--insecure) is set.");
-			}
-
-			Log.Information("Loading trusted root certificates.");
-			foreach (var (fileName, cert) in CertificateUtils
-				         .LoadAllCertificates(options.Certificate.TrustedRootCertificatesPath)) {
-				trustedRootCerts.Add(cert);
-				Log.Information("Loading trusted root certificate file: {file}", fileName);
-			}
-
-			if (trustedRootCerts.Count == 0)
-				throw new InvalidConfigurationException(
-					$"No trusted root certificate files were loaded from the specified path: {options.Certificate.TrustedRootCertificatesPath}");
-			return trustedRootCerts;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Configuration/ConfigurationBuilderExtensions.cs b/src/EventStore.Core/Configuration/ConfigurationBuilderExtensions.cs
deleted file mode 100644
index 22403c1e233..00000000000
--- a/src/EventStore.Core/Configuration/ConfigurationBuilderExtensions.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-#nullable enable
-
-using System.IO;
-using System.Linq;
-using EventStore.Common.Utils;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.FileProviders;
-
-namespace EventStore.Core.Configuration {
-	public static class ConfigurationBuilderExtensions {
-		public static IConfigurationBuilder AddEsdbConfigFile(this IConfigurationBuilder builder, string configFilePath,
-			bool optional = false, bool reloadOnChange = false) {
-			if (!Locations.TryLocateConfigFile(configFilePath, out var directory, out var fileName)) {
-				if (optional)
-					return builder;
-
-				throw new FileNotFoundException(
-					$"Could not find {configFilePath} in the following directories: {string.Join(", ", Locations.GetPotentialConfigurationDirectories())}");
-			}
-
-			builder.AddJsonFile(config => {
-				config.Optional = optional;
-				config.FileProvider = new PhysicalFileProvider(directory) {
-					UseActivePolling = reloadOnChange,
-					UsePollingFileWatcher = reloadOnChange
-				};
-				config.OnLoadException = context => Serilog.Log.Error(context.Exception, "err");
-				config.Path = fileName;
-				config.ReloadOnChange = reloadOnChange;
-			});
-
-			return builder;
-		}
-
-		public static IConfigurationBuilder AddEsdbConfigFiles(this IConfigurationBuilder builder, string subdirectory,
-			string pattern) {
-			// when searching for a file we check the directories in forward order until we find it
-			// so when adding all the files we apply them in reverse order to keep the same precedence
-			foreach (var directory in Locations.GetPotentialConfigurationDirectories().Reverse()) {
-				var configDirectory = Path.Combine(directory, subdirectory);
-				if (!Directory.Exists(configDirectory))
-					continue;
-
-				foreach (var configFile in Directory.EnumerateFiles(configDirectory, pattern).Order()) {
-					builder.AddEsdbConfigFile(configFile, optional: true, reloadOnChange: true);
-				}
-			}
-
-			return builder;
-		}
-
-		public static IConfigurationBuilder AddEsdbConfigFiles(this IConfigurationBuilder builder, string pattern) =>
-			builder.AddEsdbConfigFiles("config", pattern);
-	}
-}
diff --git a/src/EventStore.Core/Configuration/ConfigurationProviderExtensions.cs b/src/EventStore.Core/Configuration/ConfigurationProviderExtensions.cs
deleted file mode 100644
index 9c820f983c6..00000000000
--- a/src/EventStore.Core/Configuration/ConfigurationProviderExtensions.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Configuration.Sources;
-using Microsoft.Extensions.Configuration;
-
-namespace EventStore.Core.Configuration {
-	public static class ConfigurationProviderExtensions {
-		public static IEnumerable<string> GetChildKeys(this IConfigurationProvider provider) => 
-			provider.GetChildKeys([], EventStoreConfigurationKeys.Prefix);
-	}
-}
diff --git a/src/EventStore.Core/Configuration/ConfigurationRootExtensions.cs b/src/EventStore.Core/Configuration/ConfigurationRootExtensions.cs
deleted file mode 100644
index 211ae2892f1..00000000000
--- a/src/EventStore.Core/Configuration/ConfigurationRootExtensions.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-#nullable enable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using EventStore.Common.Configuration;
-using EventStore.Common.Exceptions;
-using EventStore.Core.Configuration.Sources;
-using Microsoft.Extensions.Configuration;
-
-namespace EventStore.Core.Configuration;
-
-public static class ConfigurationRootExtensions {
-	public static string? CheckProvidersForEnvironmentVariables(this IConfigurationRoot? configurationRoot, IEnumerable<Type> optionSections) {
-		if (configurationRoot == null)
-			return null;
-
-		var environmentOptionsOnly = optionSections.SelectMany(section => section.GetProperties())
-			.Where(option => option.GetCustomAttribute<EnvironmentOnlyAttribute>() != null)
-			.Select(option => option)
-			.ToArray();
-
-		var errorBuilder = new StringBuilder();
-
-		foreach (var provider in configurationRoot.Providers) {
-			var source = provider.GetType();
-
-			if (source == typeof(EventStoreDefaultValuesConfigurationProvider) ||
-				source == typeof(EventStoreEnvironmentVariablesConfigurationProvider))
-				continue;
-
-			var errorDescriptions =
-				from key in provider.GetChildKeys()
-				from property in environmentOptionsOnly
-				where string.Equals(property.Name, key, StringComparison.CurrentCultureIgnoreCase)
-				select property.GetCustomAttribute<EnvironmentOnlyAttribute>()?.Message;
-
-			errorBuilder.Append(
-				errorDescriptions
-					.Aggregate(
-						new StringBuilder(),
-						(sb, err) => sb.AppendLine($"Provided by: {ClusterVNodeOptions.GetSourceDisplayName(provider.GetType())}. {err}")
-					)
-			);
-		}
-
-		return errorBuilder.Length != 0 ? errorBuilder.ToString() : null;
-	}
-
-	public static T BindOptions<T>(this IConfiguration configuration) where T : new() {
-		try {
-			return configuration.Get<T>() ?? new T();
-		} catch (InvalidOperationException ex) {
-			var messages = new string?[] { ex.Message, ex.InnerException?.Message }
-				.Where(x => !string.IsNullOrWhiteSpace(x))
-				.Select(x => x?.TrimEnd('.'));
-
-			throw new InvalidConfigurationException(string.Join(". ", messages) + ".");
-		}
-	}
-}
diff --git a/src/EventStore.Core/Configuration/EventStoreConfiguration.cs b/src/EventStore.Core/Configuration/EventStoreConfiguration.cs
deleted file mode 100644
index 47a1ec8c9ea..00000000000
--- a/src/EventStore.Core/Configuration/EventStoreConfiguration.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-#nullable enable
-
-using System;
-using System.Collections;
-using EventStore.Common.Configuration;
-using EventStore.Core.Configuration.Sources;
-using Microsoft.Extensions.Configuration;
-
-namespace EventStore.Core.Configuration {
-	public static class EventStoreConfiguration {
-		public static IConfigurationRoot Build(string[] args, IDictionary environment) {
-
-			// resolve the main configuration file
-			var configFile = ResolveConfigurationFile(args, environment);
-
-			// Create a single IConfiguration object that contains the whole configuration, including
-			// plugin configuration. We will add it to the DI and make it available to the plugins.
-			//
-			// Three json files are loaded explicitly for backwards compatibility
-			// - metricsconfig.json needs loading into the EventStore:Metrics section.
-			// - kestrelsettings.json is not located in a config/ directory
-			// - logconfig.json is not located in a config/ directory
-			var builder = new ConfigurationBuilder()
-				// we should be able to stop doing this soon as long as we bind the options automatically
-				.AddEventStoreDefaultValues()
-				.AddEventStoreYamlConfigFile(configFile.Path, configFile.Optional)
-
-				.AddSection("EventStore:Metrics", x => x.AddEsdbConfigFile("metricsconfig.json", true, true))
-
-				// The other config files are added to the root, and must put themselves in the appropriate sections
-				.AddEsdbConfigFile("kestrelsettings.json", true, true)
-				.AddEsdbConfigFile("logconfig.json", true, true)
-
-				// Load all json files in the  `config` subdirectory (if it exists) of each configuration
-				// directory. We use the subdirectory to ensure that we only load configuration files.
-				.AddEsdbConfigFiles("*.json")
-
-				#if DEBUG
-				// load all json files in the current directory
-				.AddJsonFile("appsettings.json", true)
-				.AddJsonFile("appsettings.Development.json", true)
-				#endif
-
-				.AddEnvironmentVariables()
-				.AddEventStoreEnvironmentVariables(environment)
-
-				// follows current behaviour yet Env Vars should take precedence
-				// to handle real-world deployment pipeline scenarios
-				.AddEventStoreCommandLine(args);
-
-			return builder.Build();
-		}
-
-		public static IConfigurationRoot Build(params string[] args) {
-			var environment = Environment.GetEnvironmentVariables();
-			return Build(args, environment);
-		}
-
-		private static (string Path, bool Optional) ResolveConfigurationFile(string[] args, IDictionary environment) {
-			var configuration = new ConfigurationBuilder()
-				.AddEventStoreEnvironmentVariables(environment)
-				.AddEventStoreCommandLine(args)
-				.Build();
-
-			var configFilePath = configuration.GetValue<string?>("EventStore:Config");
-
-			return string.IsNullOrEmpty(configFilePath)
-				// get the default config file path
-				? (new ClusterVNodeOptions.ApplicationOptions().Config, true)
-				// if the user has specified a config file make it non optional
-				: (configFilePath, false);
-		}
-
-		public static IConfigurationBuilder AddEventStoreYamlConfigFile(this IConfigurationBuilder builder, string path,
-			bool optional = true) {
-			if (string.IsNullOrWhiteSpace(path))
-				throw new ArgumentException("Value cannot be null or whitespace.", nameof(path));
-
-			var yamlSource = new YamlConfigurationSource {
-				Path = path,
-				Optional = optional,
-				ReloadOnChange = true,
-				Prefix = EventStoreConfigurationKeys.Prefix
-			};
-
-			yamlSource.ResolveFileProvider();
-
-			return builder.Add(yamlSource);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Configuration/Sources/EventStoreCommandLineConfigurationExtensions.cs b/src/EventStore.Core/Configuration/Sources/EventStoreCommandLineConfigurationExtensions.cs
deleted file mode 100644
index d8da645658a..00000000000
--- a/src/EventStore.Core/Configuration/Sources/EventStoreCommandLineConfigurationExtensions.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-#nullable enable
-
-using Microsoft.Extensions.Configuration;
-
-namespace EventStore.Core.Configuration.Sources {
-	public static class EventStoreCommandLineConfigurationExtensions {
-		public static IConfigurationBuilder AddEventStoreCommandLine(this IConfigurationBuilder builder, params string[] args) =>
-			builder.Add(new EventStoreCommandLineConfigurationSource(args));
-	}
-}
diff --git a/src/EventStore.Core/Configuration/Sources/EventStoreCommandLineConfigurationProvider.cs b/src/EventStore.Core/Configuration/Sources/EventStoreCommandLineConfigurationProvider.cs
deleted file mode 100644
index 9917d0858e7..00000000000
--- a/src/EventStore.Core/Configuration/Sources/EventStoreCommandLineConfigurationProvider.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-#nullable enable
-
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.Extensions.Configuration.CommandLine;
-using static System.StringComparer;
-
-namespace EventStore.Core.Configuration.Sources {
-	public class EventStoreCommandLineConfigurationProvider(IEnumerable<string> args)
-		: CommandLineConfigurationProvider(args) {
-
-		public override void Load() {
-			base.Load();
-
-			Data = Data.Keys
-				.ToDictionary(
-					EventStoreConfigurationKeys.Normalize,
-					x => Data[x], OrdinalIgnoreCase
-				);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Configuration/Sources/EventStoreCommandLineConfigurationSource.cs b/src/EventStore.Core/Configuration/Sources/EventStoreCommandLineConfigurationSource.cs
deleted file mode 100644
index 3d56fba28fb..00000000000
--- a/src/EventStore.Core/Configuration/Sources/EventStoreCommandLineConfigurationSource.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-#nullable enable
-
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.Extensions.Configuration;
-
-namespace EventStore.Core.Configuration.Sources {
-	public class EventStoreCommandLineConfigurationSource : IConfigurationSource {
-		public EventStoreCommandLineConfigurationSource(string[] args) {
-			Args = args.Select(NormalizeKeys).Select(NormalizeBooleans);
-
-			return;
-
-			static string NormalizeKeys(string x) => x[0] == '-' && x[1] != '-' ? $"-{x}" : x;
-
-			string NormalizeBooleans(string x, int i) {
-				if (!x.StartsWith("--"))
-					return x;
-
-				if (x.EndsWith('+'))
-					return $"{x[..^1]}=true";
-
-				if (x.EndsWith('-'))
-					return $"{x[..^1]}=false";
-
-				if (x.Contains('='))
-					return x;
-
-				if (i != args.Length - 1 && !args[i + 1].StartsWith("--"))
-					return x;
-
-				return $"{x}=true";
-			}
-		}
-
-		private IEnumerable<string> Args { get; set; }
-
-		public IConfigurationProvider Build(IConfigurationBuilder builder) =>
-			new EventStoreCommandLineConfigurationProvider(Args);
-	}
-}
diff --git a/src/EventStore.Core/Configuration/Sources/EventStoreConfigurationKeys.cs b/src/EventStore.Core/Configuration/Sources/EventStoreConfigurationKeys.cs
deleted file mode 100644
index 739d9acc24c..00000000000
--- a/src/EventStore.Core/Configuration/Sources/EventStoreConfigurationKeys.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-#nullable enable
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Reflection;
-using Microsoft.Extensions.Configuration;
-using static System.String;
-using static System.StringComparison;
-
-namespace EventStore.Core.Configuration.Sources {
-	public static class EventStoreConfigurationKeys {
-		public const string Prefix = "EventStore";
-
-		private const string EnvVarKeyDelimiter = "__";
-		private const string ArgWordDelimiter = "-";
-		private const string EnvVarWordDelimiter = "_";
-
-		private static readonly char[] Delimiters = { '-', '_', ':' };
-
-		private static readonly IReadOnlyList<string> SectionKeys;
-		private static readonly IReadOnlyList<string> OptionsKeys;
-		private static readonly IReadOnlyList<string> AllKnownKeys;
-
-		static EventStoreConfigurationKeys() {
-			SectionKeys = typeof(ClusterVNodeOptions).GetProperties()
-				.Where(prop => prop.GetCustomAttribute<ClusterVNodeOptions.OptionGroupAttribute>() != null)
-				.Select(property => property.Name)
-				.ToList();
-
-			OptionsKeys = typeof(ClusterVNodeOptions).GetProperties()
-				.Where(prop => prop.GetCustomAttribute<ClusterVNodeOptions.OptionGroupAttribute>() != null)
-				.SelectMany(
-					property => property.PropertyType.GetProperties(BindingFlags.Public | BindingFlags.Instance))
-				.Select(x => x.Name)
-				.ToList();
-
-			AllKnownKeys = SectionKeys.Concat(OptionsKeys).Distinct(StringComparer.InvariantCultureIgnoreCase).ToList();
-		}
-
-		// outputs a key for IConfiguration e.g. EventStore:StreamInfoCacheCapacity
-		public static string Normalize(string key) {
-			// if the key doesn't contain any delimiters,
-			// we can just get out, transforming the key
-			// if needed because of cli lowercase args
-			if (!key.Any(Delimiters.Contains))
-				return $"{Prefix}:{Transform(key)}";
-
-			// remove the prefix and normalize the key
-			var keys = (key.StartsWith(Prefix, OrdinalIgnoreCase) ? key.Remove(0, Prefix.Length) : key)
-				.Replace(EnvVarKeyDelimiter, ConfigurationPath.KeyDelimiter)
-				.Replace(ArgWordDelimiter, EnvVarWordDelimiter)
-				.Split(ConfigurationPath.KeyDelimiter)
-				.Where(x => x.Length > 0)
-				.Select(Transform);
-
-			return $"{Prefix}:{Join(ConfigurationPath.KeyDelimiter, keys)}";
-
-			// because we know all keys, we can ensure the name is always correct
-			static string Transform(string key) {
-				var value = Pascalize(key);
-				return AllKnownKeys.FirstOrDefault(x => x.Equals(value, OrdinalIgnoreCase)) ?? value;
-			}
-
-			static string Pascalize(string key) =>
-				Join(Empty, key
-					.ToLowerInvariant()
-					.Split(EnvVarWordDelimiter)
-					.Select(word => new string(word.Select((c, i) => i == 0 ? char.ToUpper(c) : c).ToArray()))
-				);
-		}
-
-		/// <summary>
-		/// Determines if the given key is an event store environment variable.
-		/// </summary>
-		public static bool IsEventStoreEnvVar(string? key) => 
-			key is not null && key.StartsWith($"{Prefix}{EnvVarWordDelimiter}", OrdinalIgnoreCase);
-
-		/// <summary>
-		/// Only normalizes the given key if it is an event store environment variable.
-		/// </summary>
-		public static bool TryNormalizeEnvVar(string key, [MaybeNullWhen(false)] out string normalizedKey) =>
-			(normalizedKey = IsEventStoreEnvVar(key) ? Normalize(key) : null) is not null;
-
-		/// <summary>
-		/// Only normalizes the given key if it is an event store environment variable.
-		/// </summary>
-		public static bool TryNormalizeEnvVar(object? key, [MaybeNullWhen(false)] out string normalizedKey) =>
-			TryNormalizeEnvVar(key?.ToString() ?? Empty, out normalizedKey);
-
-		public static string StripConfigurationPrefix(string key) =>
-			key.StartsWith($"{Prefix}:", OrdinalIgnoreCase) ? key.Remove(0, Prefix.Length + 1) : key;
-	}
-}
diff --git a/src/EventStore.Core/Configuration/Sources/EventStoreDefaultValuesConfigurationSource.cs b/src/EventStore.Core/Configuration/Sources/EventStoreDefaultValuesConfigurationSource.cs
deleted file mode 100644
index 9da5f540429..00000000000
--- a/src/EventStore.Core/Configuration/Sources/EventStoreDefaultValuesConfigurationSource.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-#nullable enable
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Configuration.Memory;
-using static System.StringComparer;
-
-namespace EventStore.Core.Configuration.Sources {
-	public class EventStoreDefaultValuesConfigurationSource(IEnumerable<KeyValuePair<string, string?>>? initialData = null) : IConfigurationSource {
-		private IEnumerable<KeyValuePair<string, string?>> InitialData { get; } =
-			initialData ?? new Dictionary<string, string?>();
-
-		public IConfigurationProvider Build(IConfigurationBuilder builder) =>
-			new EventStoreDefaultValuesConfigurationProvider(InitialData);
-	}
-
-	public class EventStoreDefaultValuesConfigurationProvider(IEnumerable<KeyValuePair<string, string?>> initialData)
-		: MemoryConfigurationProvider(new(){
-			InitialData = initialData.ToDictionary(
-				kvp => $"{Prefix}:{kvp.Key}",
-				kvp => kvp.Value,
-				OrdinalIgnoreCase)
-		}) {
-
-		private const string Prefix = "EventStore";
-	}
-
-	public static class EventStoreDefaultValuesConfigurationExtensions {
-		public static IConfigurationBuilder AddEventStoreDefaultValues(this IConfigurationBuilder configurationBuilder,
-			IEnumerable<KeyValuePair<string, string?>> initialData) =>
-			configurationBuilder.Add(new EventStoreDefaultValuesConfigurationSource(initialData));
-
-		public static IConfigurationBuilder AddEventStoreDefaultValues(this IConfigurationBuilder builder,
-			IEnumerable<KeyValuePair<string, object?>>? initialData) =>
-			initialData is not null
-				? builder.AddEventStoreDefaultValues(initialData
-					.Select(x => new KeyValuePair<string, string?>(x.Key, x.Value?.ToString())).ToArray())
-				: builder;
-
-		public static IConfigurationBuilder AddEventStoreDefaultValues(this IConfigurationBuilder builder) =>
-			builder.AddEventStoreDefaultValues(ClusterVNodeOptions.DefaultValues);
-	}
-}
diff --git a/src/EventStore.Core/Configuration/Sources/EventStoreEnvironmentVariablesConfigurationExtensions.cs b/src/EventStore.Core/Configuration/Sources/EventStoreEnvironmentVariablesConfigurationExtensions.cs
deleted file mode 100644
index 285de56a289..00000000000
--- a/src/EventStore.Core/Configuration/Sources/EventStoreEnvironmentVariablesConfigurationExtensions.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-#nullable enable
-
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.Extensions.Configuration;
-
-namespace EventStore.Core.Configuration.Sources {
-	public static class EventStoreEnvironmentVariablesConfigurationExtensions {
-		public static IConfigurationBuilder AddEventStoreEnvironmentVariables(this IConfigurationBuilder builder, IDictionary? environment = null) =>
-			builder.Add(new EventStoreEnvironmentVariablesSource(environment));
-	
-		public static IConfigurationBuilder AddEventStoreEnvironmentVariables(this IConfigurationBuilder builder, Dictionary<string, string> environment) =>
-			builder.Add(new EventStoreEnvironmentVariablesSource(environment));
-	
-		public static IConfigurationBuilder AddEventStoreEnvironmentVariables(this IConfigurationBuilder builder, params (string Key, string Value)[] environment) =>
-			builder.Add(new EventStoreEnvironmentVariablesSource(environment.ToDictionary(x => x.Key, x => x.Value)));
-	}
-}
diff --git a/src/EventStore.Core/Configuration/Sources/EventStoreEnvironmentVariablesConfigurationProvider.cs b/src/EventStore.Core/Configuration/Sources/EventStoreEnvironmentVariablesConfigurationProvider.cs
deleted file mode 100644
index 8a5a387e975..00000000000
--- a/src/EventStore.Core/Configuration/Sources/EventStoreEnvironmentVariablesConfigurationProvider.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-#nullable enable
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using Microsoft.Extensions.Configuration;
-using static System.Environment;
-
-namespace EventStore.Core.Configuration.Sources {
-	public class EventStoreEnvironmentVariablesConfigurationProvider(IDictionary? environment = null) : ConfigurationProvider {
-		IDictionary? Environment { get; } = environment;
-
-		public override void Load() {
-			var environment = Environment ?? GetEnvironmentVariables();
-	
-			var data = new Dictionary<string, string?>(StringComparer.OrdinalIgnoreCase);
-		
-			foreach (var key in environment.Keys) {
-				if (EventStoreConfigurationKeys.TryNormalizeEnvVar(key, out var normalizedKey)) 
-					data[normalizedKey] = environment[key]?.ToString();
-			}
-	
-			Data = data;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Configuration/Sources/EventStoreEnvironmentVariablesSource.cs b/src/EventStore.Core/Configuration/Sources/EventStoreEnvironmentVariablesSource.cs
deleted file mode 100644
index 5aa8b7cc8b2..00000000000
--- a/src/EventStore.Core/Configuration/Sources/EventStoreEnvironmentVariablesSource.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-#nullable enable
-
-using System.Collections;
-using Microsoft.Extensions.Configuration;
-
-namespace EventStore.Core.Configuration.Sources {
-	public class EventStoreEnvironmentVariablesSource(IDictionary? environment = null) : IConfigurationSource {
-		public IConfigurationProvider Build(IConfigurationBuilder builder) =>
-			new EventStoreEnvironmentVariablesConfigurationProvider(environment);
-	}
-}
diff --git a/src/EventStore.Core/Configuration/Sources/YamlConfigurationSource.cs b/src/EventStore.Core/Configuration/Sources/YamlConfigurationSource.cs
deleted file mode 100644
index 41c453f9ed3..00000000000
--- a/src/EventStore.Core/Configuration/Sources/YamlConfigurationSource.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-#nullable enable
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Microsoft.Extensions.Configuration;
-using YamlDotNet.RepresentationModel;
-using static System.StringComparer;
-
-namespace EventStore.Core.Configuration.Sources {
-	public class YamlConfigurationSource : FileConfigurationSource {
-		public string? Prefix { get; init; }
-
-		public override IConfigurationProvider Build(IConfigurationBuilder builder) {
-			FileProvider ??= builder.GetFileProvider();
-			return new YamlConfigurationProvider(this);
-		}
-	}
-
-	internal class YamlConfigurationProvider(YamlConfigurationSource configurationSource)
-		: FileConfigurationProvider(configurationSource) {
-
-		public override void Load(Stream stream) {
-			var parsed = new YamlConfigurationFileParser().Parse(stream);
-			var prefix = configurationSource.Prefix;
-
-			Data = string.IsNullOrWhiteSpace(prefix)
-				? parsed
-				: parsed.ToDictionary(kvp => $"{prefix}:{kvp.Key}", kvp => kvp.Value, OrdinalIgnoreCase);
-		}
-	}
-
-	internal class YamlConfigurationFileParser {
-		private readonly SortedDictionary<string, string?> _data = new(OrdinalIgnoreCase);
-
-		private readonly Stack<string> _context = new();
-		private string _currentPath = string.Empty;
-
-		public IDictionary<string, string?> Parse(Stream input) {
-			_data.Clear();
-			_context.Clear();
-
-			// https://dotnetfiddle.net/rrR2Bb
-			var yaml = new YamlStream();
-			yaml.Load(new StreamReader(input, true));
-
-			if (yaml.Documents.Any()) {
-				var mapping = (YamlMappingNode)yaml.Documents[0].RootNode;
-
-				// The document node is a mapping node
-				VisitYamlMappingNode(mapping);
-			}
-
-			return _data;
-		}
-
-		private void VisitYamlNodePair(KeyValuePair<YamlNode, YamlNode> yamlNodePair) {
-			var context = ((YamlScalarNode)yamlNodePair.Key).Value!;
-			VisitYamlNode(context, yamlNodePair.Value);
-		}
-
-		private void VisitYamlNode(string context, YamlNode node) {
-			if (node is YamlScalarNode scalarNode)
-				VisitYamlScalarNode(context, scalarNode);
-
-			if (node is YamlSequenceNode sequenceNode)
-				VisitYamlSequenceNode(context, sequenceNode);
-		}
-
-		private void VisitYamlScalarNode(string context, YamlScalarNode yamlValue) {
-			//a node with a single 1-1 mapping
-			EnterContext(context);
-			var currentKey = _currentPath;
-
-			if (_data.ContainsKey(currentKey))
-				throw new FormatException($"Duplicate key '{currentKey}' found.");
-
-			if (currentKey.Contains(":")) {
-				var key = currentKey.Split(":").First();
-				var value = IsNullValue(yamlValue) ? null : yamlValue.Value;
-				_data[key] = _data.ContainsKey(key) ? $"{_data[key]},{value}" : value;
-			} else {
-				_data[currentKey] = IsNullValue(yamlValue) ? null : yamlValue.Value;
-			}
-
-			ExitContext();
-		}
-
-		private void VisitYamlMappingNode(YamlMappingNode node) {
-			foreach (var yamlNodePair in node.Children) {
-				VisitYamlNodePair(yamlNodePair);
-			}
-		}
-
-		private void VisitYamlSequenceNode(string context, YamlSequenceNode yamlValue) {
-			//a node with an associated list
-			EnterContext(context);
-			VisitYamlSequenceNode(yamlValue);
-			ExitContext();
-		}
-
-		private void VisitYamlSequenceNode(YamlSequenceNode node) {
-			for (int i = 0; i < node.Children.Count; i++) {
-				VisitYamlNode(i.ToString(), node.Children[i]);
-			}
-		}
-
-		private void EnterContext(string context) {
-			_context.Push(context);
-			_currentPath = ConfigurationPath.Combine(_context.Reverse());
-		}
-
-		private void ExitContext() {
-			_context.Pop();
-			_currentPath = ConfigurationPath.Combine(_context.Reverse());
-		}
-
-		private bool IsNullValue(YamlScalarNode yamlValue) =>
-			yamlValue.Style == YamlDotNet.Core.ScalarStyle.Plain &&
-			yamlValue.Value is "~" or "null" or "Null" or "NULL";
-	}
-}
diff --git a/src/EventStore.Core/Configuration/TypeConverters.cs b/src/EventStore.Core/Configuration/TypeConverters.cs
deleted file mode 100644
index 2ce6aadedab..00000000000
--- a/src/EventStore.Core/Configuration/TypeConverters.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-#nullable enable
-
-using System;
-using System.ComponentModel;
-using System.Globalization;
-using System.Linq;
-using System.Net;
-
-namespace EventStore.Core.Configuration {
-	public class GossipEndPointConverter : TypeConverter {
-		public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType) =>
-			sourceType == typeof(string) || base.CanConvertFrom(context, sourceType);
-
-		public override object? ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value) =>
-			value is string stringValue
-				? ParseGossipEndPoint(stringValue)
-				: base.ConvertFrom(context, culture, value);
-
-		private static EndPoint ParseGossipEndPoint(string value) {
-			var parts = value.Split(':', 2);
-
-			if (parts.Length != 2)
-				throw new("You must specify the ports in the gossip seed");
-
-			if (!int.TryParse(parts[1], out var port))
-				throw new($"Invalid format for gossip seed port: {parts[1]}");
-
-			return IPAddress.TryParse(parts[0], out var ip)
-				? new IPEndPoint(ip, port)
-				: new DnsEndPoint(parts[0], port);
-		}
-	}
-
-	public class GossipSeedConverter : ArrayConverter {
-		private static readonly char[] InvalidDelimiters = [';', '\t'];
-
-		private static readonly GossipEndPointConverter _gossipEndPointConverter = new();
-
-		public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType) =>
-			sourceType == typeof(string) || base.CanConvertFrom(context, sourceType);
-
-		public override object? ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value) {
-			if (value is not string stringValue)
-				return base.ConvertFrom(context, culture, value);
-
-			if (stringValue.Any(c => InvalidDelimiters.Contains(c)))
-				throw new ArgumentException($"Invalid delimiter for gossip seed value: {stringValue}");
-
-			var values = stringValue.Split(',', StringSplitOptions.RemoveEmptyEntries);
-
-			var gossipEndPoints = values
-				.Select(x => (EndPoint)_gossipEndPointConverter.ConvertFrom(context, culture, x)!)
-				.ToArray();
-
-			return gossipEndPoints;
-		}
-	}
-
-	public class IPAddressConverter : TypeConverter {
-		public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType) =>
-			sourceType == typeof(string) || base.CanConvertFrom(context, sourceType);
-
-		public override object? ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value) =>
-			value is string stringValue
-				? IPAddress.Parse(stringValue)
-				: base.ConvertFrom(context, culture, value);
-	}
-}
diff --git a/src/EventStore.Core/Data/CommitEventRecord.cs b/src/EventStore.Core/Data/CommitEventRecord.cs
deleted file mode 100644
index a4ce01e8cb2..00000000000
--- a/src/EventStore.Core/Data/CommitEventRecord.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace EventStore.Core.Data {
-	public struct CommitEventRecord {
-		public readonly EventRecord Event;
-		public readonly long CommitPosition;
-
-		public CommitEventRecord(EventRecord @event, long commitPosition) {
-			Event = @event;
-			CommitPosition = commitPosition;
-		}
-
-		public override string ToString() {
-			return string.Format("CommitPosition: {0}, Event: {1}", CommitPosition, Event);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Data/Epoch.cs b/src/EventStore.Core/Data/Epoch.cs
deleted file mode 100644
index d3d87ed1017..00000000000
--- a/src/EventStore.Core/Data/Epoch.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-
-namespace EventStore.Core.Data {
-	public class Epoch {
-		public readonly long EpochPosition;
-		public readonly int EpochNumber;
-		public readonly Guid EpochId;
-
-		public Epoch(long epochPosition, int epochNumber, Guid epochId) {
-			EpochPosition = epochPosition;
-			EpochNumber = epochNumber;
-			EpochId = epochId;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Data/Event.cs b/src/EventStore.Core/Data/Event.cs
deleted file mode 100644
index 8dff261e181..00000000000
--- a/src/EventStore.Core/Data/Event.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.TransactionLog.Chunks;
-
-namespace EventStore.Core.Data {
-	public class Event {
-		public readonly Guid EventId;
-		public readonly string EventType;
-		public readonly bool IsJson;
-		public readonly byte[] Data;
-		public readonly byte[] Metadata;
-
-		public Event(Guid eventId, string eventType, bool isJson, string data, string metadata)
-			: this(
-				eventId, eventType, isJson, Helper.UTF8NoBom.GetBytes(data),
-				metadata != null ? Helper.UTF8NoBom.GetBytes(metadata) : null) {
-		}
-
-		public static int SizeOnDisk(string eventType, byte[] data, byte[] metadata) =>
-			data?.Length ?? 0 + metadata?.Length ?? 0 + eventType.Length * 2;
-
-		private static bool ExceedsMaximumSizeOnDisk(string eventType, byte[] data, byte[] metadata) =>
-			SizeOnDisk(eventType, data, metadata) > TFConsts.EffectiveMaxLogRecordSize;
-
-		public Event(Guid eventId, string eventType, bool isJson, byte[] data, byte[] metadata) {
-			if (eventId == Guid.Empty)
-				throw new ArgumentException("Empty eventId provided.", nameof(eventId));
-			if (string.IsNullOrEmpty(eventType))
-				throw new ArgumentException("Empty eventType provided.", nameof(eventType));
-			if (ExceedsMaximumSizeOnDisk(eventType, data, metadata))
-				throw new ArgumentException("Record is too big.", nameof(data));
-
-			EventId = eventId;
-			EventType = eventType;
-			IsJson = isJson;
-			Data = data ?? Array.Empty<byte>();
-			Metadata = metadata ?? Array.Empty<byte>();
-		}
-	}
-}
diff --git a/src/EventStore.Core/Data/EventInfo.cs b/src/EventStore.Core/Data/EventInfo.cs
deleted file mode 100644
index ce49968f1a9..00000000000
--- a/src/EventStore.Core/Data/EventInfo.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace EventStore.Core.Data {
-	public readonly struct EventInfo {
-		public readonly long LogPosition;
-		public readonly long EventNumber;
-
-		public EventInfo(long logPosition, long eventNumber) {
-			LogPosition = logPosition;
-			EventNumber = eventNumber;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Data/EventNumber.cs b/src/EventStore.Core/Data/EventNumber.cs
deleted file mode 100644
index de28ccbad7d..00000000000
--- a/src/EventStore.Core/Data/EventNumber.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.Core.Data {
-	public static class EventNumber {
-		public const long DeletedStream = long.MaxValue;
-		public const long Invalid = int.MinValue;
-	}
-}
diff --git a/src/EventStore.Core/Data/EventRecord.cs b/src/EventStore.Core/Data/EventRecord.cs
deleted file mode 100644
index 3ffe249a969..00000000000
--- a/src/EventStore.Core/Data/EventRecord.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-using System;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.Data {
-	public class EventRecord : IEquatable<EventRecord> {
-		public bool IsJson {
-			get { return (Flags & PrepareFlags.IsJson) == PrepareFlags.IsJson; }
-		}
-
-		public bool IsSelfCommitted => Flags.HasAnyOf(PrepareFlags.IsCommitted);
-
-		public readonly long EventNumber;
-		public readonly long LogPosition;
-		public readonly Guid CorrelationId;
-		public readonly Guid EventId;
-		public readonly long TransactionPosition;
-		public readonly int TransactionOffset;
-		public readonly string EventStreamId;
-		public readonly long ExpectedVersion;
-		public readonly DateTime TimeStamp;
-		public readonly PrepareFlags Flags;
-		public readonly string EventType;
-		public readonly ReadOnlyMemory<byte> Data;
-		public readonly ReadOnlyMemory<byte> Metadata;
-
-		public EventRecord(long eventNumber, IPrepareLogRecord prepare, string eventStreamId, string eventType) {
-			Ensure.Nonnegative(eventNumber, "eventNumber");
-			Ensure.NotNull(eventStreamId, "eventStreamId");
-
-			EventNumber = eventNumber;
-			LogPosition = prepare.LogPosition;
-			CorrelationId = prepare.CorrelationId;
-			EventId = prepare.EventId;
-			TransactionPosition = prepare.TransactionPosition;
-			TransactionOffset = prepare.TransactionOffset;
-			EventStreamId = eventStreamId;
-			ExpectedVersion = prepare.ExpectedVersion;
-			TimeStamp = prepare.TimeStamp;
-
-			Flags = prepare.Flags;
-			EventType = eventType ?? string.Empty;
-			Data = prepare.Data;
-			Metadata = prepare.Metadata;
-		}
-
-		// called from tests only
-		public EventRecord(long eventNumber,
-			long logPosition,
-			Guid correlationId,
-			Guid eventId,
-			long transactionPosition,
-			int transactionOffset,
-			string eventStreamId,
-			long expectedVersion,
-			DateTime timeStamp,
-			PrepareFlags flags,
-			string eventType,
-			byte[] data,
-			byte[] metadata) {
-			Ensure.Nonnegative(logPosition, "logPosition");
-			Ensure.Nonnegative(transactionPosition, "transactionPosition");
-			if (transactionOffset < -1)
-				throw new ArgumentOutOfRangeException("transactionOffset");
-			Ensure.NotNull(eventStreamId, "eventStreamId");
-			Ensure.Nonnegative(eventNumber, "eventNumber");
-			Ensure.NotEmptyGuid(eventId, "eventId");
-			Ensure.NotNull(data, "data");
-
-			EventNumber = eventNumber;
-			LogPosition = logPosition;
-			CorrelationId = correlationId;
-			EventId = eventId;
-			TransactionPosition = transactionPosition;
-			TransactionOffset = transactionOffset;
-			EventStreamId = eventStreamId;
-			ExpectedVersion = expectedVersion;
-			TimeStamp = timeStamp;
-			Flags = flags;
-			EventType = eventType ?? string.Empty;
-			Data = data ?? Empty.ByteArray;
-			Metadata = metadata ?? Empty.ByteArray;
-		}
-
-		public bool Equals(EventRecord other) {
-			if (ReferenceEquals(null, other)) return false;
-			if (ReferenceEquals(this, other)) return true;
-			return EventNumber == other.EventNumber
-			       && LogPosition == other.LogPosition
-			       && CorrelationId.Equals(other.CorrelationId)
-			       && EventId.Equals(other.EventId)
-			       && TransactionPosition == other.TransactionPosition
-			       && TransactionOffset == other.TransactionOffset
-			       && string.Equals(EventStreamId, other.EventStreamId)
-			       && ExpectedVersion == other.ExpectedVersion
-			       && TimeStamp.Equals(other.TimeStamp)
-			       && Flags.Equals(other.Flags)
-			       && string.Equals(EventType, other.EventType)
-			       && Data.Span.SequenceEqual(other.Data.Span)
-			       && Metadata.Span.SequenceEqual(other.Metadata.Span);
-		}
-
-		public override bool Equals(object obj) {
-			if (ReferenceEquals(null, obj)) return false;
-			if (ReferenceEquals(this, obj)) return true;
-			if (obj.GetType() != GetType()) return false;
-			return Equals((EventRecord)obj);
-		}
-
-		public override int GetHashCode() {
-			unchecked {
-				int hashCode = EventNumber.GetHashCode();
-				hashCode = (hashCode * 397) ^ LogPosition.GetHashCode();
-				hashCode = (hashCode * 397) ^ CorrelationId.GetHashCode();
-				hashCode = (hashCode * 397) ^ EventId.GetHashCode();
-				hashCode = (hashCode * 397) ^ TransactionPosition.GetHashCode();
-				hashCode = (hashCode * 397) ^ TransactionOffset;
-				hashCode = (hashCode * 397) ^ EventStreamId.GetHashCode();
-				hashCode = (hashCode * 397) ^ ExpectedVersion.GetHashCode();
-				hashCode = (hashCode * 397) ^ TimeStamp.GetHashCode();
-				hashCode = (hashCode * 397) ^ Flags.GetHashCode();
-				hashCode = (hashCode * 397) ^ EventType.GetHashCode();
-				hashCode = (hashCode * 397) ^ Data.GetHashCode();
-				hashCode = (hashCode * 397) ^ Metadata.GetHashCode();
-				return hashCode;
-			}
-		}
-
-		public static bool operator ==(EventRecord left, EventRecord right) {
-			return Equals(left, right);
-		}
-
-		public static bool operator !=(EventRecord left, EventRecord right) {
-			return !Equals(left, right);
-		}
-
-		public override string ToString() {
-			return string.Format("EventNumber: {0}, "
-			                     + "LogPosition: {1}, "
-			                     + "CorrelationId: {2}, "
-			                     + "EventId: {3}, "
-			                     + "TransactionPosition: {4}, "
-			                     + "TransactionOffset: {5}, "
-			                     + "EventStreamId: {6}, "
-			                     + "ExpectedVersion: {7}, "
-			                     + "TimeStamp: {8}, "
-			                     + "Flags: {9}, "
-			                     + "EventType: {10}",
-				EventNumber,
-				LogPosition,
-				CorrelationId,
-				EventId,
-				TransactionPosition,
-				TransactionOffset,
-				EventStreamId,
-				ExpectedVersion,
-				TimeStamp,
-				Flags,
-				EventType);
-		}
-
-#if DEBUG
-		public string DebugDataView {
-			get { return Encoding.UTF8.GetString(Data.Span); }
-		}
-
-		public string DebugMetadataView {
-			get { return Encoding.UTF8.GetString(Metadata.Span); }
-		}
-#endif
-	}
-}
diff --git a/src/EventStore.Core/Data/ExpectedVersion.cs b/src/EventStore.Core/Data/ExpectedVersion.cs
deleted file mode 100644
index 56c54b0c4e9..00000000000
--- a/src/EventStore.Core/Data/ExpectedVersion.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace EventStore.Core.Data {
-	public static class ExpectedVersion {
-		public const long Any = -2;
-
-		public const long NoStream = -1;
-
-		public const long Invalid = -3;
-		public const long StreamExists = -4;
-	}
-}
diff --git a/src/EventStore.Core/Data/FilteredReadAllResult.cs b/src/EventStore.Core/Data/FilteredReadAllResult.cs
deleted file mode 100644
index 4abeea4918e..00000000000
--- a/src/EventStore.Core/Data/FilteredReadAllResult.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace EventStore.Core.Data
-{
-    public enum FilteredReadAllResult
-    {
-        Success = 0,
-        NotModified = 1,
-        Error = 2,
-        AccessDenied = 3,
-        Expired = 4,
-        InvalidPosition = 5,
-    }
-}
diff --git a/src/EventStore.Core/Data/GossipAdvertiseInfo.cs b/src/EventStore.Core/Data/GossipAdvertiseInfo.cs
deleted file mode 100644
index 6cc4edc02a2..00000000000
--- a/src/EventStore.Core/Data/GossipAdvertiseInfo.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Net;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.Data {
-	public class GossipAdvertiseInfo {
-		public DnsEndPoint InternalTcp { get; }
-		public DnsEndPoint InternalSecureTcp { get; }
-		public DnsEndPoint ExternalTcp { get; }
-		public DnsEndPoint ExternalSecureTcp { get; }
-		public DnsEndPoint HttpEndPoint { get; }
-		public string AdvertiseInternalHostAs { get; }
-		public string AdvertiseExternalHostAs { get; }
-		public int AdvertiseHttpPortAs { get; }
-		public string AdvertiseHostToClientAs { get; }
-		public int AdvertiseHttpPortToClientAs { get; }
-		public int AdvertiseTcpPortToClientAs { get; }
-
-		public GossipAdvertiseInfo(DnsEndPoint internalTcp, DnsEndPoint internalSecureTcp,
-			DnsEndPoint externalTcp, DnsEndPoint externalSecureTcp,
-			DnsEndPoint httpEndPoint,
-			string advertiseInternalHostAs, string advertiseExternalHostAs, int advertiseHttpPortAs,
-			string advertiseHostToClientAs, int advertiseHttpPortToClientAs, int advertiseTcpPortToClientAs) {
-			Ensure.Equal(false, internalTcp == null && internalSecureTcp == null, "Both internal TCP endpoints are null");
-
-			InternalTcp = internalTcp;
-			InternalSecureTcp = internalSecureTcp;
-			ExternalTcp = externalTcp;
-			ExternalSecureTcp = externalSecureTcp;
-			HttpEndPoint = httpEndPoint;
-			AdvertiseInternalHostAs = advertiseInternalHostAs;
-			AdvertiseExternalHostAs = advertiseExternalHostAs;
-			AdvertiseHttpPortAs = advertiseHttpPortAs;
-			AdvertiseHostToClientAs = advertiseHostToClientAs;
-			AdvertiseHttpPortToClientAs = advertiseHttpPortToClientAs;
-			AdvertiseTcpPortToClientAs = advertiseTcpPortToClientAs;
-		}
-
-		public override string ToString() {
-			return string.Format(
-				$"IntTcp: {InternalTcp}, IntSecureTcp: {InternalSecureTcp}\n" +
-				$"ExtTcp: {ExternalTcp}, ExtSecureTcp: {ExternalSecureTcp}\n" +
-				$"Http: {HttpEndPoint}, HttpAdvertiseAs: {AdvertiseExternalHostAs}:{AdvertiseHttpPortAs},\n" +
-				$"HttpAdvertiseToClientAs: {AdvertiseHostToClientAs}:{AdvertiseHttpPortToClientAs},\n" +
-				$"TcpAdvertiseToClientAs: {AdvertiseHostToClientAs}:{AdvertiseTcpPortToClientAs}");
-		}
-	}
-}
diff --git a/src/EventStore.Core/Data/LowerUpper.cs b/src/EventStore.Core/Data/LowerUpper.cs
deleted file mode 100644
index 72474ffad1c..00000000000
--- a/src/EventStore.Core/Data/LowerUpper.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace EventStore.Core.Data {
-	public struct Range {
-		public readonly long Lower;
-		public readonly long Upper;
-
-		public Range(long lower, long upper) {
-			Lower = lower;
-			Upper = upper;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Data/ReadAllResult.cs b/src/EventStore.Core/Data/ReadAllResult.cs
deleted file mode 100644
index d1dd69eba25..00000000000
--- a/src/EventStore.Core/Data/ReadAllResult.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace EventStore.Core.Data {
-	public enum ReadAllResult {
-		Success = 0,
-		NotModified = 1,
-		Error = 2,
-		AccessDenied = 3,
-		Expired = 4,
-		InvalidPosition = 5
-	}
-}
diff --git a/src/EventStore.Core/Data/ReadEventResult.cs b/src/EventStore.Core/Data/ReadEventResult.cs
deleted file mode 100644
index d8a6751103a..00000000000
--- a/src/EventStore.Core/Data/ReadEventResult.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace EventStore.Core.Data {
-	public enum ReadEventResult {
-		Success = 0,
-		NotFound = 1,
-		NoStream = 2,
-		StreamDeleted = 3,
-		Error = 4,
-		AccessDenied = 5
-	}
-}
diff --git a/src/EventStore.Core/Data/ReadStreamResult.cs b/src/EventStore.Core/Data/ReadStreamResult.cs
deleted file mode 100644
index 1291d16f4d7..00000000000
--- a/src/EventStore.Core/Data/ReadStreamResult.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace EventStore.Core.Data {
-	public enum ReadStreamResult {
-		Success = 0,
-		NoStream = 1,
-		StreamDeleted = 2,
-		NotModified = 3,
-		Error = 4,
-		AccessDenied = 5,
-		Expired = 6,
-	}
-}
diff --git a/src/EventStore.Core/Data/Redaction/AcquireChunksLockResult.cs b/src/EventStore.Core/Data/Redaction/AcquireChunksLockResult.cs
deleted file mode 100644
index 39840a59ce4..00000000000
--- a/src/EventStore.Core/Data/Redaction/AcquireChunksLockResult.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace EventStore.Core.Data.Redaction {
-	public enum AcquireChunksLockResult {
-		None = 0,
-		Success = 1,
-		Failed = 2
-	}
-
-	public static class AcquireChunksLockResultExtensions {
-		public static string GetErrorMessage(this AcquireChunksLockResult result) {
-			return result switch {
-				AcquireChunksLockResult.Failed => "Failed to acquire lock.",
-				_ => result.ToString()
-			};
-		}
-	}
-}
diff --git a/src/EventStore.Core/Data/Redaction/EventPosition.cs b/src/EventStore.Core/Data/Redaction/EventPosition.cs
deleted file mode 100644
index 3b58cf41143..00000000000
--- a/src/EventStore.Core/Data/Redaction/EventPosition.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-namespace EventStore.Core.Data.Redaction {
-	public readonly struct EventPosition {
-		public long LogPosition { get; }
-		public ChunkInfo ChunkInfo { get; }
-
-		public EventPosition(long logPosition, string chunkFile, byte chunkVersion, bool chunkComplete, uint chunkEventOffset) {
-			LogPosition = logPosition;
-			ChunkInfo = new ChunkInfo(chunkFile, chunkVersion, chunkComplete, chunkEventOffset);
-		}
-	}
-
-	public readonly struct ChunkInfo {
-		public string FileName { get; }
-		public byte Version { get; }
-		public bool IsComplete { get; }
-		public uint EventOffset { get; }
-
-		public ChunkInfo(string fileName, byte version, bool isComplete, uint eventOffset) {
-			FileName = fileName;
-			Version = version;
-			IsComplete = isComplete;
-			EventOffset = eventOffset;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Data/Redaction/GetEventPositionResult.cs b/src/EventStore.Core/Data/Redaction/GetEventPositionResult.cs
deleted file mode 100644
index 10e6ae8f059..00000000000
--- a/src/EventStore.Core/Data/Redaction/GetEventPositionResult.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace EventStore.Core.Data.Redaction {
-	public enum GetEventPositionResult {
-		None = 0,
-		Success = 1,
-		UnexpectedError = 2
-	}
-
-	public static class GetEventPositionResultExtensions {
-		public static string GetErrorMessage(this GetEventPositionResult result) {
-			return result switch {
-				GetEventPositionResult.UnexpectedError => "An unexpected error has occurred.",
-				_ => result.ToString()
-			};
-		}
-	}
-}
diff --git a/src/EventStore.Core/Data/Redaction/ReleaseChunksLockResult.cs b/src/EventStore.Core/Data/Redaction/ReleaseChunksLockResult.cs
deleted file mode 100644
index b5fd3eb3d16..00000000000
--- a/src/EventStore.Core/Data/Redaction/ReleaseChunksLockResult.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace EventStore.Core.Data.Redaction {
-	public enum ReleaseChunksLockResult {
-		None = 0,
-		Success = 1,
-		Failed = 2
-	}
-
-	public static class ReleaseChunksLockResultExtensions {
-		public static string GetErrorMessage(this ReleaseChunksLockResult result) {
-			return result switch {
-				ReleaseChunksLockResult.Failed => "Failed to release lock.",
-				_ => result.ToString()
-			};
-		}
-	}
-}
diff --git a/src/EventStore.Core/Data/Redaction/SwitchChunkResult.cs b/src/EventStore.Core/Data/Redaction/SwitchChunkResult.cs
deleted file mode 100644
index 222c048c6cd..00000000000
--- a/src/EventStore.Core/Data/Redaction/SwitchChunkResult.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-namespace EventStore.Core.Data.Redaction {
-	public enum SwitchChunkResult {
-		None = 0,
-		Success = 1,
-		TargetChunkFileNameInvalid = 2,
-		TargetChunkFileNotFound = 3,
-		TargetChunkExcessive = 4,
-		TargetChunkInactive = 5,
-		TargetChunkNotCompleted = 6,
-		NewChunkFileNameInvalid = 7,
-		NewChunkFileNotFound = 8,
-		NewChunkNotCompleted = 9,
-		NewChunkHeaderOrFooterInvalid = 10,
-		NewChunkHashInvalid = 11,
-		NewChunkOpenFailed = 12,
-		ChunkRangeDoesNotMatch = 13,
-		UnexpectedError = 14,
-		TargetChunkFormatNotSupported = 15,
-	}
-
-	public static class SwitchChunkResultExtensions {
-		public static string GetErrorMessage(this SwitchChunkResult result) {
-			return result switch {
-				SwitchChunkResult.TargetChunkFileNameInvalid => "The target chunk's file name is not valid.",
-				SwitchChunkResult.TargetChunkFileNotFound => "The target chunk file was not found in the database directory.",
-				SwitchChunkResult.TargetChunkExcessive => "The target chunk file is not part of the database.",
-				SwitchChunkResult.TargetChunkInactive => "The target chunk file is not actively used by the database.",
-				SwitchChunkResult.TargetChunkNotCompleted => "The target chunk is not a completed chunk.",
-				SwitchChunkResult.NewChunkFileNameInvalid => "The new chunk's file name is not valid.",
-				SwitchChunkResult.NewChunkFileNotFound => "The new chunk file was not found in the database directory.",
-				SwitchChunkResult.NewChunkNotCompleted => "The new chunk is not a completed chunk.",
-				SwitchChunkResult.NewChunkHeaderOrFooterInvalid => "The new chunk's header or footer is not valid.",
-				SwitchChunkResult.NewChunkHashInvalid => "The new chunk has failed hash verification.",
-				SwitchChunkResult.NewChunkOpenFailed => "An error has occurred when opening the new chunk.",
-				SwitchChunkResult.ChunkRangeDoesNotMatch => "The target chunk's range and the new chunk's range do not match.",
-				SwitchChunkResult.UnexpectedError => "An unexpected error has occurred.",
-				SwitchChunkResult.TargetChunkFormatNotSupported => "The target chunk's file format is not supported.",
-				_ => result.ToString()
-			};
-		}
-	}
-}
diff --git a/src/EventStore.Core/Data/ResolvedEvent.cs b/src/EventStore.Core/Data/ResolvedEvent.cs
deleted file mode 100644
index 5cde65beeb3..00000000000
--- a/src/EventStore.Core/Data/ResolvedEvent.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-
-namespace EventStore.Core.Data {
-	public struct ResolvedEvent : IEquatable<ResolvedEvent> {
-		public static readonly ResolvedEvent[] EmptyArray = new ResolvedEvent[0];
-		public static readonly ResolvedEvent EmptyEvent = new ResolvedEvent();
-
-		public readonly EventRecord Event;
-		public readonly EventRecord Link;
-		private readonly long? _originalEventCommitPosition;
-
-		public EventRecord OriginalEvent {
-			get { return Link ?? Event; }
-		}
-
-		/// <summary>
-		/// Position of the OriginalEvent (unresolved link or event) if available
-		/// </summary>
-		public TFPos? OriginalPosition => Link is not null ? LinkPosition : EventPosition;
-
-		public TFPos? EventPosition => CalculatePosition(Event);
-
-		public TFPos? LinkPosition => CalculatePosition(Link);
-
-		public readonly ReadEventResult ResolveResult;
-
-		public string OriginalStreamId {
-			get { return OriginalEvent.EventStreamId; }
-		}
-
-		public long OriginalEventNumber {
-			get { return OriginalEvent.EventNumber; }
-		}
-
-
-		private ResolvedEvent(EventRecord @event, EventRecord link, long? commitPosition,
-			ReadEventResult resolveResult = default(ReadEventResult)) {
-			Event = @event;
-			Link = link;
-			_originalEventCommitPosition = commitPosition;
-			ResolveResult = resolveResult;
-		}
-
-		public static ResolvedEvent ForUnresolvedEvent(EventRecord @event, long? commitPosition = null) {
-			return new ResolvedEvent(@event, null, commitPosition);
-		}
-
-		public static ResolvedEvent ForResolvedLink(EventRecord @event, EventRecord link, long? commitPosition = null) {
-			return new ResolvedEvent(@event, link, commitPosition);
-		}
-
-		public static ResolvedEvent ForFailedResolvedLink(EventRecord link, ReadEventResult resolveResult,
-			long? commitPosition = null) {
-			return new ResolvedEvent(null, link, commitPosition, resolveResult);
-		}
-
-		public ResolvedEvent WithoutPosition() {
-			return new ResolvedEvent(Event, Link, null, ResolveResult);
-		}
-
-		private TFPos? CalculatePosition(EventRecord @event) {
-			if (@event is null)
-				return null;
-
-			// if this is the original event and we know where it was committed
-			if (@event == OriginalEvent && _originalEventCommitPosition.HasValue)
-				return new TFPos(_originalEventCommitPosition.Value, @event.LogPosition);
-
-			// we don't know where this event was committed, unless it committed itself
-			if (@event.IsSelfCommitted)
-				return new TFPos(@event.LogPosition, @event.LogPosition);
-
-			// we don't know where this event was committed
-			return null;
-		}
-
-		public bool Equals(ResolvedEvent other) =>
-			Equals(Event, other.Event) && Equals(Link, other.Link) &&
-			_originalEventCommitPosition == other._originalEventCommitPosition &&
-			ResolveResult == other.ResolveResult;
-
-		public override bool Equals(object obj) =>
-			obj is ResolvedEvent other && Equals(other);
-
-		public override int GetHashCode() =>
-			HashCode.Combine(Event, Link, _originalEventCommitPosition, (int)ResolveResult);
-
-		public static bool operator ==(ResolvedEvent left, ResolvedEvent right) => left.Equals(right);
-
-		public static bool operator !=(ResolvedEvent left, ResolvedEvent right) => !left.Equals(right);
-	}
-}
diff --git a/src/EventStore.Core/Data/StreamAcl.cs b/src/EventStore.Core/Data/StreamAcl.cs
deleted file mode 100644
index 821cd5e93ae..00000000000
--- a/src/EventStore.Core/Data/StreamAcl.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.Runtime.CompilerServices;
-using EventStore.Common.Utils;
-using EventStore.Core.Caching;
-
-namespace EventStore.Core.Data {
-	public class StreamAcl {
-		public readonly string[] ReadRoles;
-		public readonly string[] WriteRoles;
-		public readonly string[] DeleteRoles;
-		public readonly string[] MetaReadRoles;
-		public readonly string[] MetaWriteRoles;
-
-		public StreamAcl(string readRole, string writeRole, string deleteRole, string metaReadRole,
-			string metaWriteRole)
-			: this(readRole == null ? null : new[] {readRole},
-				writeRole == null ? null : new[] {writeRole},
-				deleteRole == null ? null : new[] {deleteRole},
-				metaReadRole == null ? null : new[] {metaReadRole},
-				metaWriteRole == null ? null : new[] {metaWriteRole}) {
-		}
-
-		public StreamAcl(string[] readRoles, string[] writeRoles, string[] deleteRoles, string[] metaReadRoles,
-			string[] metaWriteRoles) {
-			ReadRoles = readRoles;
-			WriteRoles = writeRoles;
-			DeleteRoles = deleteRoles;
-			MetaReadRoles = metaReadRoles;
-			MetaWriteRoles = metaWriteRoles;
-		}
-
-		public override string ToString() {
-			return string.Format("Read: {0}, Write: {1}, Delete: {2}, MetaRead: {3}, MetaWrite: {4}",
-				ReadRoles == null ? "<null>" : "[" + string.Join(",", ReadRoles) + "]",
-				WriteRoles == null ? "<null>" : "[" + string.Join(",", WriteRoles) + "]",
-				DeleteRoles == null ? "<null>" : "[" + string.Join(",", DeleteRoles) + "]",
-				MetaReadRoles == null ? "<null>" : "[" + string.Join(",", MetaReadRoles) + "]",
-				MetaWriteRoles == null ? "<null>" : "[" + string.Join(",", MetaWriteRoles) + "]");
-		}
-
-		public int ApproximateSize {
-			get {
-				var size = 0;
-				size += MemSizer.ObjectHeaderSize; // StreamAcl object header
-				size += (Unsafe.SizeOf<string[]>() * 5) // string arrays refs
-					.RoundUpToMultipleOf(IntPtr.Size); // padding
-				size += MemSizer.SizeOf(ReadRoles);
-				size += MemSizer.SizeOf(WriteRoles);
-				size += MemSizer.SizeOf(DeleteRoles);
-				size += MemSizer.SizeOf(MetaReadRoles);
-				size += MemSizer.SizeOf(MetaWriteRoles);
-
-				return size;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Data/StreamMetadata.cs b/src/EventStore.Core/Data/StreamMetadata.cs
deleted file mode 100644
index b4eebc8b183..00000000000
--- a/src/EventStore.Core/Data/StreamMetadata.cs
+++ /dev/null
@@ -1,327 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.CompilerServices;
-using EventStore.Common.Utils;
-using EventStore.Core.Caching;
-using EventStore.Core.Services;
-using EventStore.LogCommon;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace EventStore.Core.Data {
-	public class StreamMetadata {
-		public static readonly StreamMetadata Empty = new StreamMetadata();
-
-		public readonly long? MaxCount;
-		public readonly TimeSpan? MaxAge;
-
-		public readonly long? TruncateBefore;
-		public readonly bool? TempStream;
-
-		public readonly TimeSpan? CacheControl;
-		public readonly StreamAcl Acl;
-
-		public StreamMetadata(long? maxCount = null, TimeSpan? maxAge = null,
-			long? truncateBefore = null, bool? tempStream = null,
-			TimeSpan? cacheControl = null, StreamAcl acl = null) {
-			if (maxCount <= 0)
-				throw new ArgumentOutOfRangeException(
-					"maxCount", string.Format("{0} should be positive value.", SystemMetadata.MaxCount));
-			if (maxAge <= TimeSpan.Zero)
-				throw new ArgumentOutOfRangeException(
-					"maxAge", string.Format("{0} should be positive time span.", SystemMetadata.MaxAge));
-			if (truncateBefore < 0)
-				throw new ArgumentOutOfRangeException(
-					"truncateBefore",
-					string.Format("{0} should be non-negative value.", SystemMetadata.TruncateBefore));
-			if (cacheControl <= TimeSpan.Zero)
-				throw new ArgumentOutOfRangeException(
-					"cacheControl", string.Format("{0} should be positive time span.", SystemMetadata.CacheControl));
-
-			MaxCount = maxCount;
-			MaxAge = maxAge;
-			TruncateBefore = truncateBefore;
-			TempStream = tempStream;
-			CacheControl = cacheControl;
-			Acl = acl;
-		}
-
-		public override string ToString() {
-			return string.Format(
-				"MaxCount: {0}, MaxAge: {1}, TruncateBefore: {2}, TempStream: {3}, CacheControl: {4}, Acl: {5}",
-				MaxCount, MaxAge, TruncateBefore, TempStream, CacheControl, Acl);
-		}
-
-		public static StreamMetadata TryFromJsonBytes(byte prepareVersion, ReadOnlyMemory<byte> bytes) =>
-			TryFromJsonBytes(prepareVersion, bytes.Span);
-
-		public static StreamMetadata TryFromJsonBytes(byte prepareVersion, ReadOnlySpan<byte> json) {
-			try {
-				var metadata = FromJsonBytes(json);
-				metadata = UpgradeMetadata(prepareVersion, metadata);
-				return metadata;
-			} catch {
-				// this can happen if the json is malformed, or if any of the things that we expect to be
-				// longs are bigger than longs which can happen if you try to set something to
-				// long.maxvalue in the webui because javascript translates it into a number that is
-				// bigger than long.max
-				return Empty;
-			}
-		}
-
-		public static StreamMetadata UpgradeMetadata(byte prepareVersion, StreamMetadata metadata) {
-			if (prepareVersion == LogRecordVersion.LogRecordV0 && metadata.TruncateBefore == int.MaxValue) {
-				metadata = new StreamMetadata(
-					maxCount: metadata.MaxCount,
-					maxAge: metadata.MaxAge,
-					truncateBefore: EventNumber.DeletedStream,
-					tempStream: metadata.TempStream,
-					cacheControl: metadata.CacheControl,
-					acl: metadata.Acl);
-			}
-
-			return metadata;
-		}
-
-		public static StreamMetadata FromJsonBytes(ReadOnlyMemory<byte> json) => FromJsonBytes(json.Span);
-
-		public static StreamMetadata FromJsonBytes(ReadOnlySpan<byte> json) {
-			using (var reader = new JsonTextReader(new StreamReader(new MemoryStream(json.ToArray())))) {
-				return FromJsonReader(reader);
-			}
-		}
-
-		public static StreamMetadata FromJson(string json) {
-			using (var reader = new JsonTextReader(new StringReader(json))) {
-				return FromJsonReader(reader);
-			}
-		}
-
-		public static StreamMetadata FromJsonReader(JsonTextReader reader) {
-			Check(reader.Read(), reader);
-			Check(JsonToken.StartObject, reader);
-
-			long? maxCount = null;
-			TimeSpan? maxAge = null;
-			long? truncateBefore = null;
-			bool? tempStream = null;
-			TimeSpan? cacheControl = null;
-			StreamAcl acl = null;
-
-			while (true) {
-				Check(reader.Read(), reader);
-				if (reader.TokenType == JsonToken.EndObject)
-					break;
-				Check(JsonToken.PropertyName, reader);
-				var name = (string)reader.Value;
-				switch (name) {
-					case SystemMetadata.MaxCount: {
-						Check(reader.Read(), reader);
-						Check(JsonToken.Integer, reader);
-						maxCount = (long)reader.Value;
-						break;
-					}
-					case SystemMetadata.MaxAge: {
-						Check(reader.Read(), reader);
-						Check(JsonToken.Integer, reader);
-						maxAge = TimeSpan.FromSeconds((long)reader.Value);
-						break;
-					}
-					case SystemMetadata.TruncateBefore: {
-						Check(reader.Read(), reader);
-						Check(JsonToken.Integer, reader);
-						truncateBefore = (long)reader.Value;
-						break;
-					}
-					case SystemMetadata.TempStream: {
-						Check(reader.Read(), reader);
-						Check(JsonToken.Boolean, reader);
-						tempStream = (bool)reader.Value;
-						break;
-					}
-					case SystemMetadata.CacheControl: {
-						Check(reader.Read(), reader);
-						Check(JsonToken.Integer, reader);
-						cacheControl = TimeSpan.FromSeconds((long)reader.Value);
-						break;
-					}
-					case SystemMetadata.Acl: {
-						acl = ReadAcl(reader);
-						break;
-					}
-					default: {
-						Check(reader.Read(), reader);
-						// skip
-						JToken.ReadFrom(reader);
-						break;
-					}
-				}
-			}
-
-			return new StreamMetadata(
-				maxCount > 0 ? maxCount : null, maxAge > TimeSpan.Zero ? maxAge : null,
-				truncateBefore >= 0 ? truncateBefore : null, tempStream,
-				cacheControl > TimeSpan.Zero ? cacheControl : null, acl);
-		}
-
-		internal static StreamAcl ReadAcl(JsonTextReader reader) {
-			Check(reader.Read(), reader);
-			Check(JsonToken.StartObject, reader);
-
-			string[] read = null;
-			string[] write = null;
-			string[] delete = null;
-			string[] metaRead = null;
-			string[] metaWrite = null;
-
-			while (true) {
-				Check(reader.Read(), reader);
-				if (reader.TokenType == JsonToken.EndObject)
-					break;
-				Check(JsonToken.PropertyName, reader);
-				var name = (string)reader.Value;
-				switch (name) {
-					case SystemMetadata.AclRead:
-						read = ReadRoles(reader);
-						break;
-					case SystemMetadata.AclWrite:
-						write = ReadRoles(reader);
-						break;
-					case SystemMetadata.AclDelete:
-						delete = ReadRoles(reader);
-						break;
-					case SystemMetadata.AclMetaRead:
-						metaRead = ReadRoles(reader);
-						break;
-					case SystemMetadata.AclMetaWrite:
-						metaWrite = ReadRoles(reader);
-						break;
-				}
-			}
-
-			return new StreamAcl(read, write, delete, metaRead, metaWrite);
-		}
-
-		private static string[] ReadRoles(JsonTextReader reader) {
-			Check(reader.Read(), reader);
-			if (reader.TokenType == JsonToken.String)
-				return new[] {(string)reader.Value};
-
-			if (reader.TokenType == JsonToken.StartArray) {
-				var roles = new List<string>();
-				while (true) {
-					Check(reader.Read(), reader);
-					if (reader.TokenType == JsonToken.EndArray)
-						break;
-					Check(JsonToken.String, reader);
-					roles.Add((string)reader.Value);
-				}
-
-				return roles.ToArray();
-			}
-
-			throw new Exception("Invalid JSON");
-		}
-
-		private static void Check(JsonToken type, JsonTextReader reader) {
-			if (reader.TokenType != type)
-				throw new Exception("Invalid JSON");
-		}
-
-		private static void Check(bool read, JsonTextReader reader) {
-			if (!read)
-				throw new Exception("Invalid JSON");
-		}
-
-		public byte[] ToJsonBytes() {
-			using (var memoryStream = new MemoryStream()) {
-				using (var jsonWriter = new JsonTextWriter(new StreamWriter(memoryStream, Helper.UTF8NoBom))) {
-					WriteAsJson(jsonWriter);
-				}
-
-				return memoryStream.ToArray();
-			}
-		}
-
-		public string ToJsonString() {
-			using (var stringWriter = new StringWriter()) {
-				using (var jsonWriter = new JsonTextWriter(stringWriter)) {
-					WriteAsJson(jsonWriter);
-				}
-
-				return stringWriter.ToString();
-			}
-		}
-
-		private void WriteAsJson(JsonTextWriter jsonWriter) {
-			jsonWriter.WriteStartObject();
-			if (MaxCount.HasValue) {
-				jsonWriter.WritePropertyName(SystemMetadata.MaxCount);
-				jsonWriter.WriteValue(MaxCount.Value);
-			}
-
-			if (MaxAge.HasValue) {
-				jsonWriter.WritePropertyName(SystemMetadata.MaxAge);
-				jsonWriter.WriteValue((long)MaxAge.Value.TotalSeconds);
-			}
-
-			if (TruncateBefore.HasValue) {
-				jsonWriter.WritePropertyName(SystemMetadata.TruncateBefore);
-				jsonWriter.WriteValue(TruncateBefore.Value);
-			}
-
-			if (TempStream.HasValue) {
-				jsonWriter.WritePropertyName(SystemMetadata.TempStream);
-				jsonWriter.WriteValue(TempStream.Value);
-			}
-
-			if (CacheControl.HasValue) {
-				jsonWriter.WritePropertyName(SystemMetadata.CacheControl);
-				jsonWriter.WriteValue((long)CacheControl.Value.TotalSeconds);
-			}
-
-			if (Acl != null) {
-				jsonWriter.WritePropertyName(SystemMetadata.Acl);
-				WriteAcl(jsonWriter, Acl);
-			}
-
-			jsonWriter.WriteEndObject();
-		}
-
-		internal static void WriteAcl(JsonTextWriter jsonWriter, StreamAcl acl) {
-			jsonWriter.WriteStartObject();
-			WriteAclRoles(jsonWriter, SystemMetadata.AclRead, acl.ReadRoles);
-			WriteAclRoles(jsonWriter, SystemMetadata.AclWrite, acl.WriteRoles);
-			WriteAclRoles(jsonWriter, SystemMetadata.AclDelete, acl.DeleteRoles);
-			WriteAclRoles(jsonWriter, SystemMetadata.AclMetaRead, acl.MetaReadRoles);
-			WriteAclRoles(jsonWriter, SystemMetadata.AclMetaWrite, acl.MetaWriteRoles);
-			jsonWriter.WriteEndObject();
-		}
-
-		private static void WriteAclRoles(JsonTextWriter jsonWriter, string propertyName, string[] roles) {
-			if (roles == null)
-				return;
-			jsonWriter.WritePropertyName(propertyName);
-			if (roles.Length == 1) {
-				jsonWriter.WriteValue(roles[0]);
-			} else {
-				jsonWriter.WriteStartArray();
-				Array.ForEach(roles, jsonWriter.WriteValue);
-				jsonWriter.WriteEndArray();
-			}
-		}
-
-		public int ApproximateSize =>
-			MemSizer.ObjectHeaderSize // StreamMetadata object header
-			+ (
-				Unsafe.SizeOf<long?>() // MaxCount
-				+ Unsafe.SizeOf<TimeSpan?>() // MaxAge
-				+ Unsafe.SizeOf<long?>() // TruncateBefore
-				+ Unsafe.SizeOf<bool?>() // TempStream
-				+ Unsafe.SizeOf<TimeSpan?>() // CacheControl
-				+ Unsafe.SizeOf<StreamAcl>()
-			).RoundUpToMultipleOf(IntPtr.Size) // padding
-			+ (Acl?.ApproximateSize ?? 0); // Acl
-	}
-}
diff --git a/src/EventStore.Core/Data/SystemSettings.cs b/src/EventStore.Core/Data/SystemSettings.cs
deleted file mode 100644
index dbdc8b584d1..00000000000
--- a/src/EventStore.Core/Data/SystemSettings.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Common.Utils;
-using EventStore.Core.Services;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace EventStore.Core.Data {
-	public class SystemSettings {
-		public static readonly SystemSettings Default = new SystemSettings(
-			new StreamAcl(SystemRoles.All, SystemRoles.All, SystemRoles.All, SystemRoles.All, SystemRoles.All),
-			new StreamAcl(SystemRoles.Admins, SystemRoles.Admins, SystemRoles.Admins, SystemRoles.Admins,
-				SystemRoles.Admins));
-
-		public readonly StreamAcl UserStreamAcl;
-		public readonly StreamAcl SystemStreamAcl;
-
-		public SystemSettings(StreamAcl userStreamAcl, StreamAcl systemStreamAcl) {
-			UserStreamAcl = userStreamAcl;
-			SystemStreamAcl = systemStreamAcl;
-		}
-
-		public override string ToString() {
-			return string.Format("UserStreamAcl: ({0}), SystemStreamAcl: ({1})", UserStreamAcl, SystemStreamAcl);
-		}
-
-		public static SystemSettings FromJsonBytes(ReadOnlyMemory<byte> json) {
-			using (var reader = new JsonTextReader(new StreamReader(new MemoryStream(json.ToArray())))) {
-				Check(reader.Read(), reader);
-				Check(JsonToken.StartObject, reader);
-
-				StreamAcl userStreamAcl = null;
-				StreamAcl systemStreamAcl = null;
-
-				while (true) {
-					Check(reader.Read(), reader);
-					if (reader.TokenType == JsonToken.EndObject)
-						break;
-					Check(JsonToken.PropertyName, reader);
-					var name = (string)reader.Value;
-					switch (name) {
-						case SystemMetadata.UserStreamAcl:
-							userStreamAcl = StreamMetadata.ReadAcl(reader);
-							break;
-						case SystemMetadata.SystemStreamAcl:
-							systemStreamAcl = StreamMetadata.ReadAcl(reader);
-							break;
-						default: {
-							Check(reader.Read(), reader);
-							// skip
-							JToken.ReadFrom(reader);
-							break;
-						}
-					}
-				}
-
-				return new SystemSettings(userStreamAcl, systemStreamAcl);
-			}
-		}
-
-		private static void Check(JsonToken type, JsonTextReader reader) {
-			if (reader.TokenType != type)
-				throw new Exception("Invalid JSON");
-		}
-
-		private static void Check(bool read, JsonTextReader reader) {
-			if (!read)
-				throw new Exception("Invalid JSON");
-		}
-
-		public byte[] ToJsonBytes() {
-			using (var memoryStream = new MemoryStream()) {
-				using (var jsonWriter = new JsonTextWriter(new StreamWriter(memoryStream, Helper.UTF8NoBom))) {
-					WriteAsJson(jsonWriter);
-				}
-
-				return memoryStream.ToArray();
-			}
-		}
-
-		public string ToJsonString() {
-			using (var stringWriter = new StringWriter()) {
-				using (var jsonWriter = new JsonTextWriter(stringWriter)) {
-					WriteAsJson(jsonWriter);
-				}
-
-				return stringWriter.ToString();
-			}
-		}
-
-		private void WriteAsJson(JsonTextWriter jsonWriter) {
-			jsonWriter.WriteStartObject();
-			if (UserStreamAcl != null) {
-				jsonWriter.WritePropertyName(SystemMetadata.UserStreamAcl);
-				StreamMetadata.WriteAcl(jsonWriter, UserStreamAcl);
-			}
-
-			if (SystemStreamAcl != null) {
-				jsonWriter.WritePropertyName(SystemMetadata.SystemStreamAcl);
-				StreamMetadata.WriteAcl(jsonWriter, SystemStreamAcl);
-			}
-
-			jsonWriter.WriteEndObject();
-		}
-	}
-}
diff --git a/src/EventStore.Core/Data/TFPos.cs b/src/EventStore.Core/Data/TFPos.cs
deleted file mode 100644
index cbb6c300039..00000000000
--- a/src/EventStore.Core/Data/TFPos.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using System.Diagnostics.Contracts;
-
-namespace EventStore.Core.Data {
-	public struct TFPos : IEquatable<TFPos>, IComparable<TFPos> {
-		public static readonly TFPos Invalid = new TFPos(-1, -1);
-		public static readonly TFPos HeadOfTf = new TFPos(-1, -1);
-
-		public readonly long CommitPosition;
-		public readonly long PreparePosition;
-
-		public TFPos(long commitPosition, long preparePosition) {
-			CommitPosition = commitPosition;
-			PreparePosition = preparePosition;
-		}
-
-		[Pure]
-		public string AsString() {
-			return string.Format("{0:X16}{1:X16}", CommitPosition, PreparePosition);
-		}
-
-		public static bool TryParse(string s, out TFPos pos) {
-			pos = Invalid;
-			if (s == null || s.Length != 32)
-				return false;
-
-			long commitPos;
-			long preparePos;
-			if (!long.TryParse(s.Substring(0, 16), System.Globalization.NumberStyles.HexNumber, null, out commitPos))
-				return false;
-			if (!long.TryParse(s.Substring(16, 16), System.Globalization.NumberStyles.HexNumber, null, out preparePos))
-				return false;
-			pos = new TFPos(commitPos, preparePos);
-			return true;
-		}
-
-		public int CompareTo(TFPos other) {
-			if (CommitPosition < other.CommitPosition)
-				return -1;
-			if (CommitPosition > other.CommitPosition)
-				return 1;
-			return PreparePosition.CompareTo(other.PreparePosition);
-		}
-
-		public bool Equals(TFPos other) {
-			return this == other;
-		}
-
-		public override bool Equals(object obj) {
-			if (ReferenceEquals(null, obj)) return false;
-			return obj is TFPos && Equals((TFPos)obj);
-		}
-
-		public override int GetHashCode() {
-			unchecked {
-				return (CommitPosition.GetHashCode() * 397) ^ PreparePosition.GetHashCode();
-			}
-		}
-
-		public static bool operator ==(TFPos left, TFPos right) {
-			return left.CommitPosition == right.CommitPosition && left.PreparePosition == right.PreparePosition;
-		}
-
-		public static bool operator !=(TFPos left, TFPos right) {
-			return !(left == right);
-		}
-
-		public static bool operator <=(TFPos left, TFPos right) {
-			return !(left > right);
-		}
-
-		public static bool operator >=(TFPos left, TFPos right) {
-			return !(left < right);
-		}
-
-		public static bool operator <(TFPos left, TFPos right) {
-			return left.CommitPosition < right.CommitPosition
-			       || (left.CommitPosition == right.CommitPosition && left.PreparePosition < right.PreparePosition);
-		}
-
-		public static bool operator >(TFPos left, TFPos right) {
-			return left.CommitPosition > right.CommitPosition
-			       || (left.CommitPosition == right.CommitPosition && left.PreparePosition > right.PreparePosition);
-		}
-
-		public override string ToString() {
-			return string.Format("C:{0}/P:{1}", CommitPosition, PreparePosition);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Data/VNodeInfo.cs b/src/EventStore.Core/Data/VNodeInfo.cs
deleted file mode 100644
index 8650cb1dee6..00000000000
--- a/src/EventStore.Core/Data/VNodeInfo.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.Net;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.Data {
-	public class VNodeInfo {
-		public readonly Guid InstanceId;
-		public readonly int DebugIndex;
-		public readonly IPEndPoint InternalTcp;
-		public readonly IPEndPoint InternalSecureTcp;
-		public readonly IPEndPoint ExternalTcp;
-		public readonly IPEndPoint ExternalSecureTcp;
-		public readonly EndPoint HttpEndPoint;
-		public readonly bool IsReadOnlyReplica;
-
-		public VNodeInfo(Guid instanceId, int debugIndex,
-			IPEndPoint internalTcp, IPEndPoint internalSecureTcp,
-			IPEndPoint externalTcp, IPEndPoint externalSecureTcp,
-			EndPoint httpEndPoint,
-			bool isReadOnlyReplica) {
-			Ensure.NotEmptyGuid(instanceId, "instanceId");
-			Ensure.Equal(false, internalTcp == null && internalSecureTcp == null, "Both internal TCP endpoints are null");
-			Ensure.NotNull(httpEndPoint, nameof(httpEndPoint));
-
-			DebugIndex = debugIndex;
-			InstanceId = instanceId;
-			InternalTcp = internalTcp;
-			InternalSecureTcp = internalSecureTcp;
-			ExternalTcp = externalTcp;
-			ExternalSecureTcp = externalSecureTcp;
-			HttpEndPoint = httpEndPoint;
-			IsReadOnlyReplica = isReadOnlyReplica;
-		}
-
-		public bool Is(EndPoint endPoint) {
-			return endPoint != null
-			       && HttpEndPoint.Equals(endPoint)
-			           || (InternalTcp != null && InternalTcp.Equals(endPoint))
-			           || (InternalSecureTcp != null && InternalSecureTcp.Equals(endPoint))
-			           || (ExternalTcp != null && ExternalTcp.Equals(endPoint))
-			           || (ExternalSecureTcp != null && ExternalSecureTcp.Equals(endPoint));
-		}
-
-		public override string ToString() {
-			return string.Format("InstanceId: {0:B}, InternalTcp: {1}, InternalSecureTcp: {2}, " +
-			                     "ExternalTcp: {3}, ExternalSecureTcp: {4}, HttpEndPoint: {5}," +
-								 "IsReadOnlyReplica: {6}",
-				InstanceId,
-				InternalTcp,
-				InternalSecureTcp,
-				ExternalTcp,
-				ExternalSecureTcp,
-				HttpEndPoint,
-				IsReadOnlyReplica);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Data/VNodeState.cs b/src/EventStore.Core/Data/VNodeState.cs
deleted file mode 100644
index ee5115d3bb3..00000000000
--- a/src/EventStore.Core/Data/VNodeState.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.ComponentModel;
-
-namespace EventStore.Core.Data {
-	//WARNING: new states must be added at the bottom of the enum otherwise it may break cluster and client compatibility
-	public enum VNodeState {
-		Initializing = 0,
-		DiscoverLeader = 1,
-		Unknown = 2,
-		PreReplica = 3,
-		CatchingUp = 4,
-		Clone = 5,
-		Follower = 6,
-		PreLeader = 7,
-		Leader = 8,
-		Manager = 9,
-		ShuttingDown = 10,
-		Shutdown = 11,
-		ReadOnlyLeaderless = 12,
-		PreReadOnlyReplica = 13,
-		ReadOnlyReplica = 14,
-		ResigningLeader = 15,
-
-		[EditorBrowsable(EditorBrowsableState.Never)]
-		MaxValue = ResigningLeader,
-	}
-
-	public static class VNodeStateExtensions {
-		public static bool IsReplica(this VNodeState state) {
-			return state is VNodeState.CatchingUp or VNodeState.Clone or VNodeState.Follower
-				or VNodeState.ReadOnlyReplica;
-		}
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/BoundedQueue.cs b/src/EventStore.Core/DataStructures/BoundedQueue.cs
deleted file mode 100644
index 9b512e8f515..00000000000
--- a/src/EventStore.Core/DataStructures/BoundedQueue.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System.Collections.Generic;
-
-namespace EventStore.Core.DataStructures {
-	public class BoundedQueue<T> {
-		private readonly int _maxCapacity;
-		private readonly Queue<T> _queue;
-
-		public int MaxCapacity {
-			get { return _maxCapacity; }
-		}
-
-		public int Count {
-			get { return _queue.Count; }
-		}
-
-		public BoundedQueue(int maxCapacity) {
-			_queue = new Queue<T>(maxCapacity);
-			_maxCapacity = maxCapacity;
-		}
-
-		public void Enqueue(T obj) {
-			if (_queue.Count >= _maxCapacity) Dequeue();
-			_queue.Enqueue(obj);
-		}
-
-		public T Dequeue() {
-			return _queue.Dequeue();
-		}
-
-		public T Peek() {
-			return _queue.Peek();
-		}
-
-		public bool CanAccept() {
-			return _queue.Count < _maxCapacity;
-		}
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/ILRUCache.cs b/src/EventStore.Core/DataStructures/ILRUCache.cs
deleted file mode 100644
index eba9b2d673a..00000000000
--- a/src/EventStore.Core/DataStructures/ILRUCache.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using EventStore.Core.Caching;
-
-namespace EventStore.Core.DataStructures {
-	public interface ILRUCache : IDynamicCache {
-		void Clear();
-	}
-
-	public interface ILRUCache<TKey, TValue>: ILRUCache {
-		bool TryGet(TKey key, out TValue value);
-		TValue Put(TKey key, TValue value);
-
-		TValue Put<T>(TKey key, T userData, Func<TKey, T, TValue> addFactory,
-			Func<TKey, TValue, T, TValue> updateFactory);
-	}
-
-	public interface IStickyLRUCache<TKey, TValue> {
-		void Clear();
-		bool TryGet(TKey key, out TValue value);
-		TValue Put(TKey key, TValue value, int stickiness);
-		TValue Put(TKey key, Func<TKey, TValue> addFactory, Func<TKey, TValue, TValue> updateFactory, int stickiness);
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/LRUCache.cs b/src/EventStore.Core/DataStructures/LRUCache.cs
deleted file mode 100644
index 1045d3c182f..00000000000
--- a/src/EventStore.Core/DataStructures/LRUCache.cs
+++ /dev/null
@@ -1,294 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Caching;
-using Serilog;
-
-namespace EventStore.Core.DataStructures {
-	public class LRUCache {
-		protected static readonly ILogger Log = Serilog.Log.ForContext<LRUCache>();
-	}
-
-	public class LRUCache<TKey, TValue> : LRUCache, ILRUCache<TKey, TValue> {
-		private class LRUItem {
-			public TKey Key;
-			public TValue Value;
-
-			// calculation excludes the size of refs of
-			// the key & value to avoid double counting
-			public static int Size =>
-				MemSizer.ObjectHeaderSize +
-				(
-					Unsafe.SizeOf<TKey>() +
-					Unsafe.SizeOf<TValue>()
-				).RoundUpToMultipleOf(IntPtr.Size);
-		}
-
-		public delegate int CalculateItemSize(TKey key, TValue value);
-		public delegate int CalculateFreedSize(TKey key, TValue value, bool keyFreed, bool valueFreed, bool nodeFreed);
-
-		private readonly LinkedList<LRUItem> _orderList = new();
-		private readonly Dictionary<TKey, LinkedListNode<LRUItem>> _items = new();
-		private readonly Queue<LinkedListNode<LRUItem>> _nodesPool = new();
-		private readonly object _lock = new();
-		private readonly Func<object, bool> _onPut, _onRemove; //_onPut is not called if a key-value pair already exists in the cache
-		private readonly string _unit;
-		private readonly CalculateItemSize _calculateItemSize;
-		private readonly CalculateFreedSize _calculateFreedSize;
-
-		private long _capacity;
-		private long _size;
-		private long _freedSize;
-
-		private static readonly CalculateItemSize _unitSize = delegate { return 1; };
-		private static readonly CalculateFreedSize _zeroSize = delegate { return 0; };
-
-		public string Name { get; }
-		public long Size => Interlocked.Read(ref _size);
-		public long FreedSize => Interlocked.Read(ref _freedSize);
-		public long Capacity => Interlocked.Read(ref _capacity);
-		public long Count {
-			get {
-				lock (_lock) {
-					return _items.Count;
-				}
-			}
-		}
-
-		public LRUCache(
-			string name,
-			long capacity,
-			CalculateItemSize calculateItemSize = null,
-			CalculateFreedSize calculateFreedSize = null,
-			string unit = null) {
-
-			Ensure.NotNull(name, nameof(name));
-			Ensure.Nonnegative(capacity, nameof(capacity));
-			Name = name;
-			_capacity = capacity;
-			_size = 0L;
-			_calculateItemSize = calculateItemSize ?? _unitSize;
-			_calculateFreedSize = calculateFreedSize ?? _zeroSize;
-			_unit = unit ?? "items";
-		}
-
-		public LRUCache(
-			string name,
-			long capacity,
-			Func<object, bool> onPut,
-			Func<object, bool> onRemove) {
-			Ensure.NotNull(name, nameof(name));
-			Ensure.Nonnegative(capacity, "capacity");
-			Name = name;
-			_capacity = capacity;
-			_size = 0L;
-			_onPut = onPut;
-			_onRemove = onRemove;
-			_calculateItemSize = _unitSize;
-			_calculateFreedSize = _zeroSize;
-			_unit = "items";
-		}
-
-		public static int ApproximateItemSize(int keyRefsSize, int valueRefsSize) =>
-			LRUItem.Size +
-			keyRefsSize +
-			valueRefsSize +
-			MemSizer.SizeOfLinkedListNode<LRUItem>() + // linked list node
-			MemSizer.SizeOfDictionaryEntry<TKey, LinkedListNode<LRUItem>>() + // _items entry
-			MemSizer.LinkedListEntrySize; // _orderList entry
-
-		private void PutItem(TKey key, TValue value) {
-			lock (_lock) {
-				var node = GetNode();
-				node.Value.Key = key;
-				node.Value.Value = value;
-
-				var itemSize = _calculateItemSize(key, value);
-				EnsureCapacity(itemSize, true, out _, out _);
-
-				_items.Add(key, node);
-				_orderList.AddLast(node);
-				_size += itemSize;
-
-				_onPut?.Invoke(node.Value.Value);
-			}
-		}
-
-		private void UpdateItem(LinkedListNode<LRUItem> node, TValue value) {
-			lock (_lock) {
-				const bool reuseNode = true;
-				_size -= _calculateItemSize(node.Value.Key, node.Value.Value);
-				_size += _calculateItemSize(node.Value.Key, value);
-				_freedSize += _calculateFreedSize(node.Value.Key, node.Value.Value, false, true, !reuseNode);
-
-				node.Value.Value = value;
-
-				if (!ReferenceEquals(node, _orderList.Last)) {
-					_orderList.Remove(node);
-					_orderList.AddLast(node);
-				}
-
-				if (_size > _capacity)
-					EnsureCapacity(0, reuseNode, out _, out _);
-			}
-		}
-
-		private void RemoveItem(TKey key) {
-			lock (_lock) {
-				LinkedListNode<LRUItem> node;
-				if (_items.TryGetValue(key, out node)) {
-					_orderList.Remove(node);
-					_items.Remove(key);
-					_size -= _calculateItemSize(key, node.Value.Value);
-					_freedSize += _calculateFreedSize(node.Value.Key, node.Value.Value, true, true, false);
-
-					var value = node.Value.Value;
-					ReturnNode(node);
-
-					_onRemove?.Invoke(value);
-				}
-			}
-		}
-
-		private void RemoveFirstItem(bool reuseNode) {
-			lock (_lock) {
-				var node = _orderList.First;
-				if (node == null)
-					return;
-
-				_orderList.Remove(node);
-				_items.Remove(node.Value.Key);
-				_size -= _calculateItemSize(node.Value.Key, node.Value.Value);
-				_freedSize += _calculateFreedSize(node.Value.Key, node.Value.Value, true, true, !reuseNode);
-
-				var value = node.Value.Value;
-				if (reuseNode)
-					ReturnNode(node);
-
-				_onRemove?.Invoke(value);
-			}
-		}
-
-		public bool TryGet(TKey key, out TValue value) {
-			lock (_lock) {
-				LinkedListNode<LRUItem> node;
-				if (_items.TryGetValue(key, out node)) {
-					_orderList.Remove(node);
-					_orderList.AddLast(node);
-					value = node.Value.Value;
-					return true;
-				}
-
-				value = default;
-				return false;
-			}
-		}
-
-		public TValue Put(TKey key, TValue value) {
-			lock (_lock) {
-				LinkedListNode<LRUItem> node;
-				if (!_items.TryGetValue(key, out node))
-					PutItem(key, value);
-				else
-					UpdateItem(node, value);
-
-				return value;
-			}
-		}
-
-		public void Remove(TKey key) {
-			lock (_lock) {
-				RemoveItem(key);
-			}
-		}
-
-		public void Clear() {
-			lock (_lock) {
-				while (_orderList.Count > 0)
-					RemoveFirstItem(false);
-			}
-		}
-
-		public TValue Put<T>(TKey key, T userData, Func<TKey, T, TValue> addFactory,
-			Func<TKey, TValue, T, TValue> updateFactory) {
-			lock (_lock) {
-				TValue value;
-				LinkedListNode<LRUItem> node;
-				if (!_items.TryGetValue(key, out node)) {
-					value = addFactory(key, userData);
-					PutItem(key, value);
-				} else {
-					value = updateFactory(key, node.Value.Value, userData);
-					UpdateItem(node, value);
-				}
-
-				return value;
-			}
-		}
-
-		private void EnsureCapacity(int forItemSize, bool reuseNodes, out int removedCount, out long removedSize) {
-			lock (_lock) {
-				var initialCount = _items.Count;
-				var initialSize = _size;
-
-				while (_items.Count > 0 && _size + forItemSize > _capacity)
-					RemoveFirstItem(reuseNodes);
-
-				removedCount = initialCount - _items.Count;
-				removedSize = initialSize - _size;
-			}
-		}
-
-		public void SetCapacity(long newCapacity) {
-			const int resizeBatchSize = 100_000;
-
-			if (newCapacity < 0)
-				throw new ArgumentOutOfRangeException(nameof(newCapacity));
-
-			var removedCount = 0;
-			var removedSize = 0L;
-
-			// when decreasing the capacity, remove items batch by batch to prevent
-			// other threads from starving when trying to access the cache.
-			// when increasing, jump straight up.
-			var curCapacity = Interlocked.Read(ref _capacity);
-
-			while (curCapacity != newCapacity) {
-				curCapacity = Math.Max(curCapacity - resizeBatchSize, newCapacity);
-				Interlocked.Exchange(ref _capacity, curCapacity);
-				EnsureCapacity(0, false, out var curRemovedCount, out var curRemovedSize);
-				removedCount += curRemovedCount;
-				removedSize += curRemovedSize;
-			}
-
-			if (removedCount > 0)
-				Log.Information(
-					"{name} cache removed {removedCount:N0} entries amounting to ~{removedSize:N0} " + _unit,
-					Name, removedCount, removedSize);
-		}
-
-		public void ResetFreedSize() {
-			// note: if something's already holding the lock when this method is called,
-			// the calculation may become off by a few items, but it doesn't matter much
-			// since the freed size is only an approximation.
-			lock (_lock) {
-				_freedSize = 0;
-			}
-		}
-
-		private LinkedListNode<LRUItem> GetNode() {
-			if (_nodesPool.Count > 0)
-				return _nodesPool.Dequeue();
-			return new LinkedListNode<LRUItem>(new LRUItem());
-		}
-
-		private void ReturnNode(LinkedListNode<LRUItem> node) {
-			// set to default to allow memory to be gced
-			node.Value.Key = default;
-			node.Value.Value = default;
-			_nodesPool.Enqueue(node);
-		}
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/NoLRUCache.cs b/src/EventStore.Core/DataStructures/NoLRUCache.cs
deleted file mode 100644
index 16f34a8112a..00000000000
--- a/src/EventStore.Core/DataStructures/NoLRUCache.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-
-namespace EventStore.Core.DataStructures {
-	public class NoLRUCache<TKey, TValue> : ILRUCache<TKey, TValue> {
-		public string Name => "No Cache";
-		public long Size => 0;
-		public long Count => 0;
-		public long FreedSize => 0;
-		public long Capacity { get; private set; }
-
-		public void SetCapacity(long value) {
-			Capacity = value;
-		}
-
-		public void ResetFreedSize() {
-		}
-
-		public void Clear() {
-		}
-
-		public bool TryGet(TKey key, out TValue value) {
-			value = default(TValue);
-			return false;
-		}
-
-		public TValue Put(TKey key, TValue value) {
-			return value;
-		}
-
-		public TValue Put<T>(TKey key, T userData, Func<TKey, T, TValue> addFactory,
-			Func<TKey, TValue, T, TValue> updateFactory) {
-			return addFactory(key, userData);
-		}
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/ObjectPool.cs b/src/EventStore.Core/DataStructures/ObjectPool.cs
deleted file mode 100644
index ffdbfa53b77..00000000000
--- a/src/EventStore.Core/DataStructures/ObjectPool.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Common.Utils;
-using System.Collections.Concurrent;
-
-namespace EventStore.Core.DataStructures {
-	public class ObjectPoolDisposingException : Exception {
-		public ObjectPoolDisposingException(string poolName)
-			: this(poolName, null) {
-		}
-
-		public ObjectPoolDisposingException(string poolName, Exception innerException)
-			: base(string.Format("Object pool '{0}' is disposing/disposed while Get operation is requested.", poolName),
-				innerException) {
-			Ensure.NotNullOrEmpty(poolName, "poolName");
-		}
-	}
-
-	public class ObjectPoolMaxLimitReachedException : Exception {
-		public ObjectPoolMaxLimitReachedException(string poolName, int maxLimit)
-			: this(poolName, maxLimit, null) {
-		}
-
-		public ObjectPoolMaxLimitReachedException(string poolName, int maxLimit, Exception innerException)
-			: base(string.Format("Object pool '{0}' has reached its max limit for items: {1}.", poolName, maxLimit),
-				innerException) {
-			Ensure.NotNullOrEmpty(poolName, "poolName");
-			Ensure.Nonnegative(maxLimit, "maxLimit");
-		}
-	}
-
-	public class ObjectPool<T> : IDisposable {
-		public readonly string ObjectPoolName;
-
-		private readonly ConcurrentQueue<T> _queue = new ConcurrentQueue<T>();
-		private readonly int _maxCount;
-		private readonly Func<T> _factory;
-		private readonly Action<T> _dispose;
-		private readonly Action<ObjectPool<T>> _onPoolDisposed;
-
-		private int _count;
-		private volatile bool _disposing;
-		private int _poolDisposed;
-
-		public ObjectPool(string objectPoolName,
-			int initialCount,
-			int maxCount,
-			Func<T> factory,
-			Action<T> dispose = null,
-			Action<ObjectPool<T>> onPoolDisposed = null) {
-			Ensure.NotNullOrEmpty(objectPoolName, "objectPoolName");
-			Ensure.Nonnegative(initialCount, "initialCount");
-			Ensure.Nonnegative(maxCount, "maxCount");
-			if (initialCount > maxCount)
-				throw new ArgumentOutOfRangeException("initialCount", "initialCount is greater than maxCount.");
-			Ensure.NotNull(factory, "factory");
-
-			ObjectPoolName = objectPoolName;
-			_maxCount = maxCount;
-			_count = initialCount;
-			_factory = factory;
-			_dispose = dispose ?? (x => { });
-			_onPoolDisposed = onPoolDisposed ?? (x => { });
-
-			for (int i = 0; i < initialCount; ++i) {
-				_queue.Enqueue(factory());
-			}
-		}
-
-		public void MarkForDisposal() {
-			Dispose();
-		}
-
-		public void Dispose() {
-			_disposing = true;
-			Thread.MemoryBarrier();
-			TryDestruct();
-		}
-
-		public T Get() {
-			if (_disposing)
-				throw new ObjectPoolDisposingException(ObjectPoolName);
-
-			T item;
-			if (_queue.TryDequeue(out item))
-				return item;
-
-			if (_disposing)
-				throw new ObjectPoolDisposingException(ObjectPoolName);
-
-			var newCount = Interlocked.Increment(ref _count);
-			if (newCount > _maxCount)
-				throw new ObjectPoolMaxLimitReachedException(ObjectPoolName, _maxCount);
-
-			if (_disposing) {
-				if (Interlocked.Decrement(ref _count) == 0)
-					OnPoolDisposed(); // now we possibly should "turn light off"
-				throw new ObjectPoolDisposingException(ObjectPoolName);
-			}
-
-			// if we get here, then it is safe to return newly created item to user, object pool won't be disposed 
-			// until that item is returned to pool
-			return _factory();
-		}
-
-		public void Return(T item) {
-			_queue.Enqueue(item);
-			Thread.MemoryBarrier();
-			if (_disposing)
-				TryDestruct();
-		}
-
-		private void TryDestruct() {
-			int count = int.MaxValue;
-
-			T item;
-			while (_queue.TryDequeue(out item)) {
-				_dispose(item);
-				count = Interlocked.Decrement(ref _count);
-			}
-
-			if (count < 0)
-				throw new Exception("Somehow we managed to decrease count of pool items below zero.");
-			if (count == 0) // we are the last who should "turn the light off" 
-				OnPoolDisposed();
-		}
-
-		private void OnPoolDisposed() {
-			// ensure that we call _onPoolDisposed just once
-			if (Interlocked.CompareExchange(ref _poolDisposed, 1, 0) == 0)
-				_onPoolDisposed(this);
-		}
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/PairingHeap.cs b/src/EventStore.Core/DataStructures/PairingHeap.cs
deleted file mode 100644
index 2ee0c1352a3..00000000000
--- a/src/EventStore.Core/DataStructures/PairingHeap.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-#define USE_POOL
-
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.DataStructures {
-	public class PairingHeap<T> {
-#if USE_POOL
-		private readonly ObjectPool<HeapNode> _nodePool = new ObjectPool<HeapNode>(100, () => new HeapNode());
-#endif
-		public int Count {
-			get { return _count; }
-		}
-
-		private HeapNode _root;
-		private int _count;
-		private readonly Func<T, T, bool> _compare;
-
-		public PairingHeap() : this(null, null as IComparer<T>) {
-		}
-
-		public PairingHeap(IComparer<T> comparer) : this(null, comparer) {
-			if (comparer == null)
-				throw new ArgumentNullException("comparer");
-		}
-
-		public PairingHeap(Func<T, T, bool> compare) : this(null, compare) {
-			if (compare == null)
-				throw new ArgumentNullException("compare");
-		}
-
-		public PairingHeap(IEnumerable<T> items) : this(items, null as IComparer<T>) {
-		}
-
-		public PairingHeap(IEnumerable<T> items, Func<T, T, bool> compare) {
-			if (compare == null) {
-				var comparer = Comparer<T>.Default;
-				_compare = (x, y) => comparer.Compare(x, y) < 0;
-			} else {
-				_compare = compare;
-			}
-
-			if (items != null) {
-				foreach (var item in items) {
-					Add(item);
-				}
-			}
-		}
-
-		public PairingHeap(IEnumerable<T> items, IComparer<T> comparer) {
-			var comp = comparer ?? Comparer<T>.Default;
-			_compare = (x, y) => comp.Compare(x, y) < 0;
-
-			if (items != null) {
-				foreach (var item in items) {
-					Add(item);
-				}
-			}
-		}
-
-		public void Add(T x) {
-#if USE_POOL
-			var newNode = _nodePool.Get();
-#else
-            var newNode = new HeapNode();
-#endif
-			newNode.Item = x;
-			_root = Meld(_root, newNode);
-			_count += 1;
-		}
-
-		public T FindMin() {
-			if (Count == 0)
-				throw new InvalidOperationException();
-			return _root.Item;
-		}
-
-		public T DeleteMin() {
-			if (Count == 0)
-				throw new InvalidOperationException();
-
-			var oldRoot = _root;
-			var res = _root.Item;
-			_root = Pair(_root.SubHeaps);
-			_count -= 1;
-#if USE_POOL
-			oldRoot.Next = null;
-			oldRoot.SubHeaps = null;
-			_nodePool.Return(oldRoot);
-#endif
-			return res;
-		}
-
-		private HeapNode Meld(HeapNode heap1, HeapNode heap2) {
-			if (heap1 == null)
-				return heap2;
-			if (heap2 == null)
-				return heap1;
-
-			if (_compare(heap1.Item, heap2.Item)) {
-				heap2.Next = heap1.SubHeaps;
-				heap1.SubHeaps = heap2;
-				return heap1;
-			} else {
-				heap1.Next = heap2.SubHeaps;
-				heap2.SubHeaps = heap1;
-				return heap2;
-			}
-		}
-
-		private HeapNode Pair(HeapNode node) {
-			HeapNode tail = null;
-			HeapNode cur = node;
-
-			while (cur?.Next != null) {
-				var n1 = cur;
-				var n2 = cur.Next;
-				cur = cur.Next.Next;
-
-				n1.Next = tail;
-				n2.Next = n1;
-				tail = n2;
-			}
-
-			while (tail != null) {
-				var n = tail;
-				tail = tail.Next.Next;
-				cur = Meld(cur, Meld(n, n.Next));
-			}
-
-			return cur;
-		}
-
-		private class HeapNode {
-			public T Item;
-			public HeapNode SubHeaps;
-			public HeapNode Next;
-		}
-
-#if USE_POOL
-		private class ObjectPool<TItem> where TItem : class {
-			private readonly ConcurrentQueueWrapper<TItem> _items = new ConcurrentQueueWrapper<TItem>();
-
-			private readonly int _count;
-			private readonly Func<TItem> _creator;
-
-			public ObjectPool(int count, Func<TItem> creator) {
-				if (count < 0)
-					throw new ArgumentOutOfRangeException();
-				if (creator == null)
-					throw new ArgumentNullException("creator");
-
-				_count = count;
-				_creator = creator;
-
-				for (int i = 0; i < count; ++i) {
-					_items.Enqueue(creator());
-				}
-			}
-
-			public TItem Get() {
-				TItem res;
-				if (_items.TryDequeue(out res))
-					return res;
-				return _creator();
-			}
-
-			public void Return(TItem item) {
-				if (_items.Count < _count)
-					_items.Enqueue(item);
-			}
-		}
-#endif
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/ProbabilisticFilter/AlignedMemory.cs b/src/EventStore.Core/DataStructures/ProbabilisticFilter/AlignedMemory.cs
deleted file mode 100644
index 806759d20fd..00000000000
--- a/src/EventStore.Core/DataStructures/ProbabilisticFilter/AlignedMemory.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.DataStructures.ProbabilisticFilter {
-	// net6 can do aligned allocations directly
-	// but we need to overallocate and do our own alignment.
-	public sealed unsafe class AlignedMemory : IDisposable {
-		private readonly IntPtr _intPtr;
-		private readonly long _size;
-		private readonly long _bytesAllocated;
-		private bool _disposed;
-
-		/// contents of memory are not initialized
-		public AlignedMemory(long size, int alignTo) : this(new IntPtr(size), alignTo) {
-		}
-
-		// todo probably better to use a safe handle
-		~AlignedMemory() => Dispose();
-
-		/// contents of memory are not initialized
-		public AlignedMemory(IntPtr size, int alignTo) {
-			_size = (long)size;
-			var bytesToAllocate = size + alignTo;
-			_intPtr = Marshal.AllocHGlobal(bytesToAllocate);
-			_bytesAllocated = (long)bytesToAllocate;
-			GC.AddMemoryPressure(_bytesAllocated);
-			Pointer = (byte*)((long)_intPtr).RoundUpToMultipleOf(alignTo);
-		}
-
-		public byte* Pointer { get; }
-
-		public Span<byte> AsSpan() {
-			if (_size > int.MaxValue)
-				throw new InvalidOperationException("Size is too big to fit in one span");
-			return new(Pointer, (int)_size);
-		}
-
-		public void Dispose() {
-			if (_disposed)
-				return;
-
-			_disposed = true;
-			GC.SuppressFinalize(this);
-
-			if (_intPtr == IntPtr.Zero) {
-				// didn't manage to allocate or add pressure (OOM), so do not free.
-				return;
-			}
-
-			Marshal.FreeHGlobal(_intPtr);
-			GC.RemoveMemoryPressure(_bytesAllocated);
-		}
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/ProbabilisticFilter/BloomFilterAccessor.cs b/src/EventStore.Core/DataStructures/ProbabilisticFilter/BloomFilterAccessor.cs
deleted file mode 100644
index ab5c6b019ee..00000000000
--- a/src/EventStore.Core/DataStructures/ProbabilisticFilter/BloomFilterAccessor.cs
+++ /dev/null
@@ -1,235 +0,0 @@
-using System;
-using System.Runtime.CompilerServices;
-using EventStore.Common.Utils;
-using Serilog;
-
-namespace EventStore.Core.DataStructures.ProbabilisticFilter {
-	// encapsulates access to a persistent bloom filter through a byte* and specified sizes.
-	// this does the necessary pointer arithmetic and bounds checking.
-	// no synchronisation in here.
-	//
-	// First cache line(64 bytes) contains the header and nothing else
-	// Subsequent cachelines contain 60 bytes of bloom filter bits then a 4 byte hash of those bits.
-	//
-	// The hashes are as granular as they are so that the hash can be 
-	// cheaply calculated inline with the write (since we loaded the cacheline into
-	// memory anyway) which guarantees, since there is a writer lock, that
-	// the cacheline at any time only has at most one bit set that isn't hashed, which was
-	// important for the memory mapped persistece (since the OS can flush it at any time)
-	public unsafe class BloomFilterAccessor {
-		public delegate void OnPageDirty(long pageNumber);
-
-		public const long MinSizeKB = 10;
-		public const long MaxSizeKB = 4_000_000;
-		private readonly OnPageDirty _onPageDirty;
-		private readonly ILogger _log;
-
-		public BloomFilterAccessor(
-			long logicalFilterSize,
-			int cacheLineSize,
-			int hashSize,
-			int pageSize,
-			OnPageDirty onPageDirty,
-			ILogger log) {
-
-			Ensure.Positive(logicalFilterSize, nameof(logicalFilterSize));
-			Ensure.Positive(cacheLineSize, nameof(cacheLineSize));
-			Ensure.Positive(hashSize, nameof(hashSize));
-			Ensure.Positive(pageSize, nameof(pageSize));
-
-			if (logicalFilterSize < MinSizeKB * 1000 || logicalFilterSize > MaxSizeKB * 1000) {
-				throw new ArgumentOutOfRangeException(
-					nameof(logicalFilterSize),
-					logicalFilterSize,
-					$"size should be between {MinSizeKB:N0} KB and {MaxSizeKB:N0} KB inclusive");
-			}
-
-			if (Header.Size > cacheLineSize)
-				throw new Exception("header needs to fit in a cache line");
-
-			if (pageSize % cacheLineSize != 0)
-				throw new ArgumentException(
-					$"PageSize {pageSize} must be a multiple of CacheLineSize {cacheLineSize}");
-
-			LogicalFilterSize = logicalFilterSize;
-			LogicalFilterSizeBits = logicalFilterSize * 8;
-			CacheLineSize = cacheLineSize;
-			HashSize = hashSize;
-			PageSize = pageSize;
-			_onPageDirty = onPageDirty;
-			_log = log;
-
-			// add room for filter bits, rounded down to nearest cacheline
-			FileSize = GetBytePositionInFile(LogicalFilterSizeBits).RoundDownToMultipleOf(cacheLineSize);
-			// with an extra cacheline so we have at least as much logical filter space as asked for
-			// can't change this to a call to .RoundUpToMultipleOf without breaking the existing filters.
-			FileSize += cacheLineSize;
-
-			// last page may be a partial page
-			NumPages = FileSize / PageSize;
-			if (FileSize % PageSize != 0)
-				NumPages++;
-		}
-
-		public long LogicalFilterSize { get; }
-		public long LogicalFilterSizeBits { get; }
-		public int CacheLineSize { get; }
-		public int HashSize { get; }
-		public int PageSize { get; }
-		public long FileSize { get; }
-
-		// last page may be a partial page
-		public long NumPages { get; }
-
-		// FileSize is definitely a multiple of CacheLineSize
-		public long NumCacheLines => FileSize / CacheLineSize;
-
-		// Pointer to the beginning of the file
-		private byte* _pointer;
-		public byte* Pointer {
-			get => _pointer;
-			set {
-				if ((long)value % CacheLineSize != 0)
-					throw new InvalidOperationException($"Pointer {(long)value} is not aligned to a cacheline ({CacheLineSize})");
-
-				_pointer = value;
-			}
-		}
-
-		// converts a bit position in the logical filter into a byte position in the file
-		public long GetBytePositionInFile(long bitPosition) {
-			var bytePositionInFile = bitPosition / 8;
-
-			// account for 4 bytes at the end of each cache line being a hash
-			bytePositionInFile += bytePositionInFile / (CacheLineSize - HashSize) * HashSize;
-
-			// first cache line is reserved for the header
-			bytePositionInFile += CacheLineSize;
-
-			return bytePositionInFile;
-		}
-
-		// converts page number into byte position of the page in the file
-		// the pages are aligned with the beginning of the file so that they are aligned on disk
-		// the first page is therefore slightly smaller to account for the header cache line.
-		public (long PositionInFile, int PageSize) GetPagePositionInFile(long pageNumber) {
-			if (pageNumber >= NumPages)
-				throw new ArgumentOutOfRangeException(nameof(pageNumber), pageNumber, "");
-
-			var positionInFile = pageNumber * PageSize;
-
-			var pageSize = Math.Min(PageSize, FileSize - positionInFile);
-
-			if (pageNumber == 0) {
-				pageSize -= CacheLineSize;
-				positionInFile += CacheLineSize;
-			}
-
-			return (positionInFile, (int)pageSize);
-		}
-
-		// determines which page a bytePosition in the file is for.
-		public long GetPageNumber(long bytePositionInFile) {
-			return bytePositionInFile / PageSize;
-		}
-
-		private void EnsureBounds(long bytePosition, int length) {
-			if (bytePosition > FileSize - length) {
-				throw new ArgumentOutOfRangeException(
-					nameof(bytePosition),
-					bytePosition,
-					$"Position {bytePosition:N0} + length {length:N0} = {bytePosition + length:N0} out of file size {FileSize:N0}");
-			}
-		}
-
-		private ref byte ReadByte(long bytePositionInFile) {
-			EnsureBounds(bytePositionInFile, length: 1);
-			return ref *(Pointer + bytePositionInFile);
-		}
-
-		private Span<byte> ReadCacheLineFor(long bytePositionInFile) {
-			bytePositionInFile = bytePositionInFile.RoundDownToMultipleOf(CacheLineSize);
-			return ReadBytes(bytePositionInFile, CacheLineSize);
-		}
-
-		public Span<byte> ReadBytes(long bytePositionInFile, int count) {
-			EnsureBounds(bytePositionInFile, count);
-			return new Span<byte>(Pointer + bytePositionInFile, count);
-		}
-
-		public bool IsBitSet(long bitPosition) {
-			var bytePositionInFile = GetBytePositionInFile(bitPosition);
-			var byteValue = ReadByte(bytePositionInFile);
-			return byteValue.IsBitSet(bitPosition % 8);
-		}
-
-		public void SetBit(long bitPosition) {
-			var bytePositionInFile = GetBytePositionInFile(bitPosition);
-			ref var byteValue = ref ReadByte(bytePositionInFile);
-			byte oldByte = byteValue;
-			byteValue = byteValue.SetBit(bitPosition % 8);
-
-			if (byteValue != oldByte) {
-				var cacheLine = ReadCacheLineFor(bytePositionInFile);
-
-				// it would be possible to delegate the hash calculation call to the persistence
-				// strategy. memmap would calculate it synchronously, filestream could defer
-				// it until flush (and wouldn't even need to set it in the memory area, only
-				// in the file. not worth the effort at the moment, however.
-				BloomFilterIntegrity.WriteHash(cacheLine);
-
-				if (_onPageDirty is not null) {
-					var pageNumber = GetPageNumber(bytePositionInFile);
-					_onPageDirty(pageNumber);
-				}
-			}
-		}
-
-		public void FillWithZeros() {
-			_log.Debug("Zeroing bloom filter...");
-			var bytesToClear = FileSize;
-			var startAddress = Pointer;
-			while (bytesToClear > 0) {
-				uint bytesToClearInBlock = bytesToClear > uint.MaxValue
-					? uint.MaxValue
-					: (uint)bytesToClear;
-				Unsafe.InitBlock(ref *startAddress, 0, bytesToClearInBlock);
-				startAddress += bytesToClearInBlock;
-				bytesToClear -= bytesToClearInBlock;
-			}
-			_log.Debug("Done zeroing bloom filter");
-		}
-
-		// corruptionThreshold = 0.05 => tolerate up to 5% corruption
-		public void Verify(int corruptionRebuildCount, double corruptionThreshold) {
-			Ensure.Nonnegative(corruptionThreshold, nameof(corruptionThreshold));
-
-			_log.Debug("Verifying bloom filter...");
-			var corruptedCacheLines = 0;
-
-			for (long i = CacheLineSize; i < FileSize; i += CacheLineSize) {
-				var cacheLine = ReadCacheLineFor(i);
-				if (!BloomFilterIntegrity.ValidateHash(cacheLine)) {
-					corruptedCacheLines++;
-					_log.Verbose("Invalid cache line starting at {i:N0} / {fileSize:N0}", i, FileSize);
-				}
-			}
-
-			var corruptionThresholdPercent = corruptionThreshold * 100;
-			var corruptedPercent = (double)corruptedCacheLines / NumCacheLines * 100;
-			if (corruptedPercent > corruptionThreshold * 100)
-				throw new CorruptedHashException(
-					corruptionRebuildCount,
-					$"{corruptedCacheLines:N0} corruption(s) detected ({corruptedPercent:N2}%). Threshold {corruptionThresholdPercent:N2}%");
-
-			if (corruptedCacheLines == 0) {
-				_log.Debug("Done verifying bloom filter");
-			} else {
-				_log.Warning("Done verifying bloom filter: {corruptedCacheLines:N0} corruption(s) detected ({corruptedPercent:N2}%). Threshold {corruptionThresholdPercent:N2}%",
-					corruptedCacheLines,
-					corruptedPercent,
-					corruptionThresholdPercent);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/ProbabilisticFilter/BloomFilterIntegrity.cs b/src/EventStore.Core/DataStructures/ProbabilisticFilter/BloomFilterIntegrity.cs
deleted file mode 100644
index 827f6e29e18..00000000000
--- a/src/EventStore.Core/DataStructures/ProbabilisticFilter/BloomFilterIntegrity.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using EventStore.Common.Utils;
-using EventStore.Core.Index.Hashes;
-using Serilog;
-
-namespace EventStore.Core.DataStructures.ProbabilisticFilter {
-	// This class is responsible for maintaining and validating a 4 byte hash at the end
-	// of the cache line.
-	public class BloomFilterIntegrity {
-		public const int CacheLineSize = 64;
-		public const int HashSize = 4;
-		// amount of filter that is marked dirty for flushing
-		public const int PageSize = 8 * 1024;
-
-		private const int UintHashIndex = (CacheLineSize - HashSize) / HashSize;
-		static readonly ILogger Log = Serilog.Log.ForContext<BloomFilterIntegrity>();
-
-		private static readonly IHasher _hasher = new XXHashUnsafe(0xc58f1a7b);
-
-		public static void WriteHash(Span<byte> cacheLine) {
-			Ensure.Equal(CacheLineSize, cacheLine.Length, "cacheline length");
-
-			if (IsAllOnes(cacheLine)) {
-				// corrupted line made safe, dont make it valid again by writing the hash
-				return;
-			}
-
-			var hash = _hasher.Hash(cacheLine[..^HashSize]);
-			var uints = MemoryMarshal.Cast<byte, uint>(cacheLine);
-			uints[UintHashIndex] = hash;
-		}
-
-		// If the hash is correct, return true.
-		// If the hash is not correct, but can be corrected then correct it and return true.
-		// If the hash is not correct and cannot be corrected then set all the bits in the
-		// cacheline and return false. The data is made safe for the bloom filter.
-		public static bool ValidateHash(Span<byte> cacheLine) {
-			Ensure.Equal(CacheLineSize, cacheLine.Length, "cacheline length");
-
-			if (IsAllOnes(cacheLine)) {
-				// all bytes 0xFFs. Corrupted data that has been made safe.
-				return false;
-			}
-
-			if (IsAllZeros(cacheLine)) {
-				// all bytes 0x00s. Empty data
-				return true;
-			}
-
-			// check the hash
-			var cacheToHash = cacheLine[..^HashSize];
-			var hash = _hasher.Hash(cacheToHash);
-			var targetHash = MemoryMarshal.Cast<byte, uint>(cacheLine)[UintHashIndex];
-			if (hash == targetHash)
-				return true;
-
-			// corrupt, try to recover.
-			if (CanRehash(cacheToHash, targetHash)) {
-				WriteHash(cacheLine);
-				Log.Verbose("Corrected a hash");
-				return true;
-			}
-
-			// corrupt and could not recover, set all bytes to 0xFFs to make safe
-			var ulongs = MemoryMarshal.Cast<byte, ulong>(cacheLine);
-			for (int i = 0; i < ulongs.Length; i++) {
-				ulongs[i] = ulong.MaxValue;
-			}
-
-			return false;
-		}
-
-		// The hash can be wrong simply because the flush happened between when
-		// we set the bit and set the new hash. We can detect this by unsetting
-		// a single bit that is set and see if it produces the hash that is recorded
-		// in the cacheline. If so, then we can have confidence that the data is
-		// actually correct and we can simply rehash it.
-		private static bool CanRehash(ReadOnlySpan<byte> dataToHash, uint targetHash) {
-			var copy = dataToHash.ToArray().AsSpan();
-
-			for (var byteIndex1 = 0; byteIndex1 < copy.Length; byteIndex1++) {
-				for (var bitIndex1 = 0; bitIndex1 < 8; bitIndex1++) {
-					if (!copy[byteIndex1].IsBitSet(bitIndex1))
-						continue;
-
-					copy[byteIndex1] = copy[byteIndex1].UnsetBit(bitIndex1);
-
-					if (_hasher.Hash(copy) == targetHash)
-						return true;
-
-					copy[byteIndex1] = copy[byteIndex1].SetBit(bitIndex1);
-				}
-			}
-
-			return false;
-		}
-
-		private static bool IsAllZeros(ReadOnlySpan<byte> cacheLine) {
-			var ulongs = MemoryMarshal.Cast<byte, ulong>(cacheLine);
-			for (int i = 0; i < ulongs.Length; i++) {
-				if (ulongs[i] != ulong.MinValue)
-					return false;
-			}
-			return true;
-		}
-
-		private static bool IsAllOnes(ReadOnlySpan<byte> cacheLine) {
-			var ulongs = MemoryMarshal.Cast<byte, ulong>(cacheLine);
-			for (int i = 0; i < ulongs.Length; i++) {
-				if (ulongs[i] != ulong.MaxValue)
-					return false;
-			}
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/ProbabilisticFilter/ByteExtensions.cs b/src/EventStore.Core/DataStructures/ProbabilisticFilter/ByteExtensions.cs
deleted file mode 100644
index 5e0977a05a0..00000000000
--- a/src/EventStore.Core/DataStructures/ProbabilisticFilter/ByteExtensions.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace EventStore.Core.DataStructures.ProbabilisticFilter {
-	public static class ByteExtensions {
-		public static bool IsBitSet(this byte x, long bitIndex) {
-			return (x & (1 << (int)(7 - bitIndex))) != 0;
-		}
-
-		public static byte SetBit(this byte x, long bitIndex) {
-			return (byte)(x | (1 << (int)(7 - bitIndex)));
-		}
-
-		public static byte UnsetBit(this byte x, long bitIndex) {
-			return (byte)(x & ~(1 << (int)(7 - bitIndex)));
-		}
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/ProbabilisticFilter/CorruptedFileException.cs b/src/EventStore.Core/DataStructures/ProbabilisticFilter/CorruptedFileException.cs
deleted file mode 100644
index a1ed7baf830..00000000000
--- a/src/EventStore.Core/DataStructures/ProbabilisticFilter/CorruptedFileException.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System;
-
-namespace EventStore.Core.DataStructures.ProbabilisticFilter {
-	public class CorruptedFileException : Exception {
-		public CorruptedFileException(string error, Exception inner = null) : base(error, inner) { }
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/ProbabilisticFilter/CorruptedHashException.cs b/src/EventStore.Core/DataStructures/ProbabilisticFilter/CorruptedHashException.cs
deleted file mode 100644
index df19ee0e77a..00000000000
--- a/src/EventStore.Core/DataStructures/ProbabilisticFilter/CorruptedHashException.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-
-namespace EventStore.Core.DataStructures.ProbabilisticFilter {
-	public class CorruptedHashException : Exception {
-		public CorruptedHashException(int rebuildCount, string error) : base(error) {
-			RebuildCount = rebuildCount;
-		}
-
-		public int RebuildCount { get; }
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/ProbabilisticFilter/FileStreamPersistence.cs b/src/EventStore.Core/DataStructures/ProbabilisticFilter/FileStreamPersistence.cs
deleted file mode 100644
index 38c16283a38..00000000000
--- a/src/EventStore.Core/DataStructures/ProbabilisticFilter/FileStreamPersistence.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Threading;
-using EventStore.Common.Utils;
-using Serilog;
-
-namespace EventStore.Core.DataStructures.ProbabilisticFilter {
-	public unsafe class FileStreamPersistence : IPersistenceStrategy {
-		protected static readonly ILogger Log = Serilog.Log.ForContext<FileStreamPersistence>();
-
-		// We synchronize access to _dirtyPageBitmap because
-		// Flush can be called at the same time as OnPageDirty (we dont pause writes into the
-		// bloom filter while it is flushing). And they both write to the bitmap (to unset and
-		// set bits respectively)
-		// This lock is often obtained while holding the write lock to the filter
-		// therefore don't make any non-trivial external calls while holding this lock
-		private readonly object _bitmapLock = new();
-		private readonly long _logicalFilterSize;
-		private readonly string _path;
-		private AlignedMemory _bloomFilterMemory;
-		private AlignedMemory _dirtyPageBitmap;
-		private bool _disposed;
-
-		public FileStreamPersistence(long size, string path, bool create) {
-			Ensure.NotNull(path, nameof(path));
-			_logicalFilterSize = size;
-			_path = path;
-			Create = create;
-		}
-
-		// when we want to open an existing filter and we don't mind what size it is
-		public static FileStreamPersistence FromFile(string path) {
-			Ensure.NotNull(path, nameof(path));
-
-			var header = ReadHeader(path);
-			return new FileStreamPersistence(
-				size: header.NumBits / 8,
-				path: path,
-				create: false);
-		}
-
-		public BloomFilterAccessor DataAccessor { get; private set; }
-		public bool Create { get; }
-
-		// ms to wait after each batch flush. allows breathing room for other writes to continue.
-		public int FlushBatchDelay { get; private set; }
-
-		// max number of pages to flush to disk in each batch
-		public long FlushBatchSize { get; private set; }
-
-		public void Init() {
-			DataAccessor = new BloomFilterAccessor(
-				logicalFilterSize: _logicalFilterSize,
-				cacheLineSize: BloomFilterIntegrity.CacheLineSize,
-				hashSize: BloomFilterIntegrity.HashSize,
-				pageSize: BloomFilterIntegrity.PageSize,
-				onPageDirty: OnPageDirty,
-				log: Log);
-
-			// instead of flushing all the dirty pages as fast as we can, we flush them in batches
-			// with a sleep between each flush to allow other writes to proceed.
-			// we could consider making these configurable but we have set defaults as follows
-			// based on 8 KiB pages:
-			//  1. sleep 128ms between batches to gives a good chunk of time for other writes
-			//  2. calculate how many pages to flush per batch in order to give no more than 60s
-			//     of sleep total. if the whole filter is dirty, total sleep will add up to 60s.
-			// this will yield bigger batches for bigger filters, but they ought also to be running
-			// on faster disks.
-			//
-			// For default filter this yields a batch size of 96 pages, 0.75 MiB
-			// For max size filter this yield a batch size of 1120 pages, 8.75 MiB
-			// For PTables up to 24gb this yields a batch size of 96 pages.
-			FlushBatchDelay = 128;
-			FlushBatchSize = DataAccessor.NumPages * FlushBatchDelay / 60_000;
-			FlushBatchSize = Math.Max(FlushBatchSize, 96);
-			FlushBatchSize = FlushBatchSize.RoundUpToMultipleOf(32);
-
-			// dirtypages: one bit per page, but pad to the nearest cacheline boundary
-			var numBits = DataAccessor.NumPages;
-			var numBitsPadded = numBits.RoundUpToMultipleOf(BloomFilterIntegrity.CacheLineSize * 8);
-			_dirtyPageBitmap = new AlignedMemory(
-				size: numBitsPadded / 8,
-				alignTo: BloomFilterIntegrity.CacheLineSize);
-			_dirtyPageBitmap.AsSpan().Clear(); // alignedmemory isn't initialized otherwise
-
-			// main filter:
-			_bloomFilterMemory = new AlignedMemory(
-				size: new IntPtr(DataAccessor.FileSize),
-				alignTo: BloomFilterIntegrity.CacheLineSize);
-			DataAccessor.Pointer = _bloomFilterMemory.Pointer;
-
-			// initialize the aligned memory
-			if (Create) {
-				DataAccessor.FillWithZeros();
-			} else {
-				// load the whole filter into memory for rapid access
-				BulkLoadExisting();
-			}
-		}
-
-		private void BulkLoadExisting() {
-			Log.Information(
-				"Reading persisted bloom filter {path} of size {size:N0} bytes into memory...",
-				_path,
-				DataAccessor.FileSize);
-
-			var sw = Stopwatch.StartNew();
-
-			using var bulkFileStream = new FileStream(
-				_path,
-				FileMode.Open,
-				FileAccess.Read,
-				FileShare.ReadWrite,
-				bufferSize: 65_536,
-				// consider if we should do something similar to chunk file reduce file cache pressure?
-				options: FileOptions.SequentialScan);
-
-			if (bulkFileStream.Length != DataAccessor.FileSize)
-				throw new SizeMismatchException(
-					$"The expected file size ({DataAccessor.FileSize:N0}) does not match " +
-					$"the actual file size ({bulkFileStream.Length:N0}) of file {_path}");
-
-			// linux only reads 2147479552 at a time (4095 bytes less than intmax)
-			var blockSize = int.MaxValue / 2;
-			var bytesToRead = DataAccessor.FileSize;
-			var bytesRead = 0L;
-			while (bytesToRead > 0) {
-				var bytesToReadInBlock = bytesToRead > blockSize
-					? blockSize
-					: (int)bytesToRead;
-				
-				// consider reading in buffer size blocks. or using random access in net6
-				var read = bulkFileStream.Read(new Span<byte>(DataAccessor.Pointer + bytesRead, bytesToReadInBlock));
-				if (read != bytesToReadInBlock)
-					throw new Exception($"Read fewer bytes ({read}) from bloom filter ({_path}) than expected ({bytesToReadInBlock})");
-				bytesRead += bytesToReadInBlock;
-				bytesToRead -= bytesToReadInBlock;
-			}
-
-			var elapsed = sw.Elapsed;
-			var fileSizeMb = DataAccessor.FileSize / 1000 / 1000;
-			var megaBytesPerSecond = fileSizeMb / elapsed.TotalSeconds;
-			Log.Information(
-				"Read persisted bloom filter {path} into memory. Took {elapsed}. {megaBytesPerSecond:N2} MB/s",
-				_path,
-				elapsed,
-				megaBytesPerSecond);
-		}
-
-		private void OnPageDirty(long pageNumber) {
-			lock (_bitmapLock) {
-				ThrowIfDisposed();
-				var byteIndex = (int)(pageNumber / 8);
-				var bitIndex = pageNumber % 8;
-				ref var byteValue = ref _dirtyPageBitmap.AsSpan()[byteIndex];
-				byteValue = byteValue.SetBit(bitIndex);
-			}
-		}
-
-		public void Flush() {
-			using var fileStream = new FileStream(
-				_path,
-				FileMode.OpenOrCreate,
-				FileAccess.ReadWrite,
-				FileShare.ReadWrite,
-				bufferSize: DataAccessor.PageSize);
-
-			fileStream.SetLength(DataAccessor.FileSize);
-			Span<byte> localCacheLine = stackalloc byte[BloomFilterIntegrity.CacheLineSize];
-			localCacheLine.Clear();
-
-			var pageNumber = 0L;
-			var flushedPages = 0L;
-			var pauses = 0;
-
-			var activelyFlushing = Stopwatch.StartNew();
-			// consider Interlocked.Or/And into/outof the dirty page map. could remove need for lock
-			for (
-				var remaining = _dirtyPageBitmap.AsSpan();
-				!remaining.IsEmpty;
-				remaining = remaining[BloomFilterIntegrity.CacheLineSize..]
-				) {
-
-				lock (_bitmapLock) {
-					ThrowIfDisposed();
-					var cacheLine = remaining[..BloomFilterIntegrity.CacheLineSize];
-					cacheLine.CopyTo(localCacheLine);
-					cacheLine.Clear();
-				}
-
-				foreach (var @byte in localCacheLine) {
-					//we could skip based on 0L without checking each bit/byte
-					for (var bitOffset = 0; bitOffset < 8; bitOffset++) {
-						if (@byte.IsBitSet(bitOffset)) {
-							WritePage(pageNumber, fileStream);
-							flushedPages++;
-
-							// could be an unnecessary delay at the end
-							if (flushedPages % FlushBatchSize == 0) {
-								fileStream.FlushToDisk();
-								activelyFlushing.Stop();
-								pauses++;
-								Thread.Sleep(FlushBatchDelay);
-								activelyFlushing.Start();
-							}
-						}
-
-						pageNumber++;
-						if (pageNumber == DataAccessor.NumPages)
-							goto Done;
-					}
-				}
-			}
-
-			Done:
-			fileStream.FlushToDisk();
-
-			activelyFlushing.Stop();
-
-			var flushedBytes = flushedPages * DataAccessor.PageSize;
-			var flushedMegaBytes = (float)flushedBytes / 1000 / 1000;
-			var activeFlushRateMBperS = flushedMegaBytes / activelyFlushing.Elapsed.TotalSeconds;
-
-			Log.Verbose(
-				"Flushed {pages:N0} pages out of {totalPages:N0}. {bytes:N0} bytes. " +
-				"Delay {delay} ms per batch. Total delay {totalDelay:N0} ms. " +
-				"Actively flushing: {activeFlushTime} {activeFlushRate:N2} MB/s. ",
-				flushedPages, DataAccessor.NumPages, flushedBytes,
-				FlushBatchDelay, FlushBatchDelay * pauses,
-				activelyFlushing.Elapsed, activeFlushRateMBperS);
-		}
-
-		private void WritePage(long pageNumber, FileStream fileStream) {
-			var (fileOffset, pageSize) = DataAccessor.GetPagePositionInFile(pageNumber);
-			fileStream.Seek(offset: fileOffset, SeekOrigin.Begin);
-			fileStream.Write(DataAccessor.ReadBytes(fileOffset, pageSize));
-		}
-
-		// todo later: maybe could be a common implementation across the strategies that reads
-		// from the DataAccessor
-		public Header ReadHeader() => ReadHeader(_path);
-
-		private static Header ReadHeader(string path) {
-			using var fileStream = new FileStream(
-				path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-
-			try {
-				//read the version first
-				fileStream.Seek(offset: 0, SeekOrigin.Begin);
-				byte version = (byte)fileStream.ReadByte();
-				if (version != Header.CurrentVersion) {
-					throw new CorruptedFileException($"Unsupported version: {version}");
-				}
-
-				//then the full header
-				var headerBytes = new byte[Header.Size].AsSpan();
-
-				fileStream.Seek(offset: 0, SeekOrigin.Begin);
-				var read = fileStream.Read(headerBytes);
-				if (read != Header.Size) {
-					throw new CorruptedFileException(
-						$"File header size ({read} bytes) does not match expected header size ({Header.Size} bytes)");
-				}
-
-				return MemoryMarshal.AsRef<Header>(headerBytes);
-			} catch (Exception exc) when (exc is not CorruptedFileException) {
-				throw new CorruptedFileException("Failed to read the header", exc);
-			}
-		}
-
-		public void WriteHeader(Header header) {
-			Log.Information("Writing header and expanding file...");
-			using var fileStream = new FileStream(
-				_path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite);
-			var span = MemoryMarshal.CreateReadOnlySpan(ref header, 1);
-			var headerBytes = MemoryMarshal.Cast<Header, byte>(span);
-
-			// this doesn't technically guarantee that the file is zeroed, but we expect file systems
-			// that could reasonably be running eventstore to do this for us because giving us other
-			// peoples data would be a security problem. if some filesystem does not to this the filter
-			// will be recognised as corrupt the next time it is opened.
-			fileStream.SetLength(DataAccessor.FileSize);
-			fileStream.Seek(offset: 0, SeekOrigin.Begin);
-			fileStream.Write(headerBytes);
-			fileStream.Seek(-1, SeekOrigin.End);
-			fileStream.WriteByte(0);
-			fileStream.FlushToDisk();
-			Log.Information("Wrote header and expanded file");
-		}
-
-		private void ThrowIfDisposed() {
-			if (_disposed) {
-				throw new ObjectDisposedException(nameof(FileStreamPersistence));
-			}
-		}
-
-		public void Dispose() {
-			lock (_bitmapLock) {
-				if (_disposed)
-					return;
-
-				_disposed = true;
-
-				if (DataAccessor is not null)
-					DataAccessor.Pointer = default;
-
-				_bloomFilterMemory?.Dispose();
-				_dirtyPageBitmap?.Dispose();
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/ProbabilisticFilter/Header.cs b/src/EventStore.Core/DataStructures/ProbabilisticFilter/Header.cs
deleted file mode 100644
index f32510f6843..00000000000
--- a/src/EventStore.Core/DataStructures/ProbabilisticFilter/Header.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Runtime.InteropServices;
-
-namespace EventStore.Core.DataStructures.ProbabilisticFilter {
-	[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
-	public struct Header {
-		public const byte CurrentVersion = 1;
-		public const int Size = 16;
-
-		[FieldOffset(0)] private byte _version;
-		[FieldOffset(4)] private int _corruptionRebuildCount;
-		[FieldOffset(8)] private long _numBits;
-
-
-		public byte Version {
-			get => _version;
-			set => _version = value;
-		}
-
-		public int CorruptionRebuildCount {
-			get => _corruptionRebuildCount;
-			set => _corruptionRebuildCount = value;
-		}
-
-		public long NumBits {
-			get => _numBits;
-			set => _numBits = value;
-		}
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/ProbabilisticFilter/IPersistenceStrategy.cs b/src/EventStore.Core/DataStructures/ProbabilisticFilter/IPersistenceStrategy.cs
deleted file mode 100644
index 48ec84b86e1..00000000000
--- a/src/EventStore.Core/DataStructures/ProbabilisticFilter/IPersistenceStrategy.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace EventStore.Core.DataStructures.ProbabilisticFilter {
-	public interface IPersistenceStrategy : IDisposable {
-		BloomFilterAccessor DataAccessor { get; }
-		bool Create { get; }
-		void Init();
-		void Flush();
-		Header ReadHeader();
-		void WriteHeader(Header header);
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/ProbabilisticFilter/IProbabilisticFilter.cs b/src/EventStore.Core/DataStructures/ProbabilisticFilter/IProbabilisticFilter.cs
deleted file mode 100644
index 50006b21fd3..00000000000
--- a/src/EventStore.Core/DataStructures/ProbabilisticFilter/IProbabilisticFilter.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-
-namespace EventStore.Core.DataStructures.ProbabilisticFilter {
-	public interface IProbabilisticFilter<in TItem> {
-		void Add(TItem item);
-		bool MightContain(TItem item);
-	}
-
-	public interface IProbabilisticFilter {
-		void Add(ReadOnlySpan<byte> item);
-		bool MightContain(ReadOnlySpan<byte> item);
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/ProbabilisticFilter/InMemoryBloomFilter.cs b/src/EventStore.Core/DataStructures/ProbabilisticFilter/InMemoryBloomFilter.cs
deleted file mode 100644
index 387eafd0bbd..00000000000
--- a/src/EventStore.Core/DataStructures/ProbabilisticFilter/InMemoryBloomFilter.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Index.Hashes;
-
-namespace EventStore.Core.DataStructures.ProbabilisticFilter {
-	public class InMemoryBloomFilter : IProbabilisticFilter<long> {
-		/*
-		    Bloom filter implementation based on the following paper by Adam Kirsch and Michael Mitzenmacher:
-		    "Less Hashing, Same Performance: Building a Better Bloom Filter"
-		    https://www.eecs.harvard.edu/~michaelm/postscripts/rsa2008.pdf
-
-		    Only two 32-bit hash functions can be used to simulate additional hash functions of the form g(x) = h1(x) + i*h2(x)
-		*/
-		int m; //number of bits
-		int k; //number of hash functions
-		ulong[] bits; //bit array
-		const int LONG_SIZE = sizeof(long); //64 bits
-
-		public int NumBits {
-			get { return m; }
-		}
-
-		public int NumHashFunctions {
-			get { return k; }
-		}
-
-		private static IHasher hasher1 = new XXHashUnsafe(), hasher2 = new Murmur3AUnsafe();
-
-		public InMemoryBloomFilter(int n, double p) {
-			Ensure.Positive(n, "n");
-			if (p <= 0.0 || p >= 0.5)
-				throw new ArgumentOutOfRangeException("p", "p should be between 0 and 0.5 exclusive");
-
-			//calculate number of hash functions to use
-			k = (int)Math.Ceiling(-Math.Log(p) / Math.Log(2));
-			k = Math.Max(2, k);
-
-			//calculate number of bits required
-			long m = (long)Math.Ceiling(-n * Math.Log(p) / Math.Log(2) / Math.Log(2));
-			long buckets = m / LONG_SIZE;
-			if (m % LONG_SIZE != 0) buckets++;
-			if (m > Int32.MaxValue) {
-				throw new ArgumentOutOfRangeException("p",
-					"calculated number of bits, m, is too large: " + m + ". please choose a larger value of p.");
-			}
-
-			this.m = (int)m;
-			bits = new ulong[buckets];
-		}
-
-		public void Add(long item) {
-			byte[] bytes = toBytes(item);
-			int hash1 = (int)hasher1.Hash(bytes);
-			int hash2 = (int)hasher2.Hash(bytes);
-
-			int hash = hash1;
-			for (int i = 0; i < k; i++) {
-				hash += hash2;
-				hash &= Int32.MaxValue; //make positive
-				int idx = (hash % m);
-				bits[idx / LONG_SIZE] |= (1UL << (idx % LONG_SIZE));
-			}
-		}
-
-		public bool MightContain(long item) {
-			byte[] bytes = toBytes(item);
-			int hash1 = (int)hasher1.Hash(bytes);
-			int hash2 = (int)hasher2.Hash(bytes);
-
-			int hash = hash1;
-			for (int i = 0; i < k; i++) {
-				hash += hash2;
-				hash &= Int32.MaxValue; //make positive
-				int idx = (hash % m);
-				if ((bits[idx / LONG_SIZE] & (1UL << (idx % LONG_SIZE))) == 0)
-					return false;
-			}
-
-			return true;
-		}
-
-		public static byte[] toBytes(long value) {
-			byte[] bytes = new byte[8];
-			for (int i = 0; i < 8; i++) {
-				bytes[i] |= (byte)(value & 0xFF);
-				value >>= 8;
-			}
-
-			return bytes;
-		}
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/ProbabilisticFilter/MemoryMappedFilePersistence.cs b/src/EventStore.Core/DataStructures/ProbabilisticFilter/MemoryMappedFilePersistence.cs
deleted file mode 100644
index c459a355dc9..00000000000
--- a/src/EventStore.Core/DataStructures/ProbabilisticFilter/MemoryMappedFilePersistence.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-using System;
-using System.IO;
-using System.IO.MemoryMappedFiles;
-using System.Runtime.InteropServices;
-using EventStore.Common.Utils;
-using Serilog;
-
-namespace EventStore.Core.DataStructures.ProbabilisticFilter {
-	public unsafe class MemoryMappedFilePersistence : IPersistenceStrategy {
-		public static readonly ILogger Log = Serilog.Log.ForContext<MemoryMappedFilePersistence>();
-		private readonly long _size;
-		private readonly string _path;
-		private MemoryMappedFile _mmf;
-		private MemoryMappedViewAccessor _mmfWriteAccessor;
-		private FileStream _fileStream;
-		private bool _disposed;
-
-		public MemoryMappedFilePersistence(long size, string path, bool create) {
-			Ensure.NotNull(path, nameof(path));
-
-			_size = size;
-			_path = path;
-			Create = create;
-		}
-
-		public BloomFilterAccessor DataAccessor { get; private set; }
-		public bool Create { get; }
-
-		public void Init() {
-			DataAccessor = new BloomFilterAccessor(
-				logicalFilterSize: _size,
-				cacheLineSize: BloomFilterIntegrity.CacheLineSize,
-				hashSize: BloomFilterIntegrity.HashSize,
-				pageSize: BloomFilterIntegrity.PageSize,
-				onPageDirty: null,
-				log: Log);
-
-			_fileStream = new FileStream(
-				_path,
-				// todo: OpenOrCreate can be CreateNew if the mininode closed the file before declaring itself 'stopped'
-				Create ? FileMode.OpenOrCreate : FileMode.Open,
-				FileAccess.ReadWrite,
-				FileShare.ReadWrite);
-
-			if (Create) {
-				_fileStream.SetLength(DataAccessor.FileSize);
-			} else {
-				// existing
-				if (_fileStream.Length != DataAccessor.FileSize)
-					throw new SizeMismatchException(
-						$"The expected file size ({DataAccessor.FileSize:N0}) does not match " +
-						$"the actual file size ({_fileStream.Length:N0}) of file {_path}");
-			}
-
-			_mmf = MemoryMappedFile.CreateFromFile(
-				fileStream: _fileStream,
-				mapName: null,
-				capacity: 0,
-				access: MemoryMappedFileAccess.ReadWrite,
-				inheritability: HandleInheritability.None,
-				leaveOpen: false);
-
-			_mmfWriteAccessor = _mmf.CreateViewAccessor(
-				offset: DataAccessor.CacheLineSize,
-				size: 0, // whole file
-				access: MemoryMappedFileAccess.ReadWrite);
-
-			// acquired pointer unaffected by the accessor offset
-			// to the beginning of the file (i.e. the header)
-			byte* pointer = null;
-			_mmfWriteAccessor.SafeMemoryMappedViewHandle.AcquirePointer(ref pointer);
-			DataAccessor.Pointer = pointer;
-
-			if (Create) {
-				DataAccessor.FillWithZeros();
-			} else {
-				// do not fill with zeros; would overwrite the data.
-			}
-		}
-
-		public void Flush() {
-			_mmfWriteAccessor.Flush();
-			_fileStream.FlushToDisk();
-		}
-
-		// todo later: maybe could be a common implementation across the strategies that reads
-		// from the DataAccessor
-		public Header ReadHeader() {
-			try {
-				//read the version first
-				using (var headerAccessor = _mmf.CreateViewAccessor(0, 1, MemoryMappedFileAccess.Read)) {
-					byte version = headerAccessor.ReadByte(0);
-					if (version != Header.CurrentVersion) {
-						throw new CorruptedFileException($"Unsupported version: {version}");
-					}
-				}
-
-				//then the full header
-				var headerBytes = new byte[Header.Size].AsSpan();
-				using (var headerAccessor = _mmf.CreateViewStream(0, Header.Size, MemoryMappedFileAccess.Read)) {
-					int read = headerAccessor.Read(headerBytes);
-					if (read != Header.Size) {
-						throw new CorruptedFileException(
-							$"File header size ({read} bytes) does not match expected header size ({Header.Size} bytes)");
-					}
-				}
-
-				return MemoryMarshal.AsRef<Header>(headerBytes);
-			} catch (Exception exc) when (exc is not CorruptedFileException) {
-				throw new CorruptedFileException("Failed to read the header", exc);
-			}
-		}
-
-		public void WriteHeader(Header header) {
-			var span = MemoryMarshal.CreateReadOnlySpan(ref header, 1);
-			var headerBytes = MemoryMarshal.Cast<Header, byte>(span);
-			using var headerAccessor = _mmf.CreateViewStream(0, Header.Size, MemoryMappedFileAccess.Write);
-			headerAccessor.Write(headerBytes);
-			headerAccessor.Flush();
-		}
-
-		public void Dispose() {
-			if (_disposed)
-				return;
-
-			_disposed = true;
-
-			if (DataAccessor is not null)
-				DataAccessor.Pointer = default;
-			_mmfWriteAccessor?.SafeMemoryMappedViewHandle.ReleasePointer();
-			_mmfWriteAccessor?.Dispose();
-			_mmf?.Dispose();
-		}
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/ProbabilisticFilter/PersistentBloomFilter.cs b/src/EventStore.Core/DataStructures/ProbabilisticFilter/PersistentBloomFilter.cs
deleted file mode 100644
index 5cdef558855..00000000000
--- a/src/EventStore.Core/DataStructures/ProbabilisticFilter/PersistentBloomFilter.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Core.Index.Hashes;
-using Serilog;
-
-namespace EventStore.Core.DataStructures.ProbabilisticFilter {
-	// the bloom filter has a pluggable strategy for persisting data. the IPersistenceStrategy
-	// provides us with a BloomFilterAccessor that we can use to manipulate the data.
-	// we deal with actually bloom filter hashing in here and synchronise the access to the data.
-	public class PersistentBloomFilter : IProbabilisticFilter, IDisposable {
-		/*
-		    Bloom filter implementation based on the following paper by Adam Kirsch and Michael Mitzenmacher:
-		    "Less Hashing, Same Performance: Building a Better Bloom Filter"
-		    https://www.eecs.harvard.edu/~michaelm/postscripts/rsa2008.pdf
-
-		    Only two 32-bit hash functions can be used to simulate additional hash functions of the form g(x) = h1(x) + i*h2(x)
-		*/
-
-		protected static readonly ILogger Log = Serilog.Log.ForContext<PersistentBloomFilter>();
-		public const double RecommendedFalsePositiveProbability = 0.02;
-		private const int NumHashFunctions = 6;
-
-		private readonly IHasher[] _hashers = {
-			new XXHashUnsafe(seed: 0xC0015EEDU),
-			new Murmur3AUnsafe(seed: 0xC0015EEDU),
-			new XXHashUnsafe(seed: 0x13375EEDU),
-			new Murmur3AUnsafe(seed: 0x13375EEDU)
-		};
-
-		private readonly Header _header;
-		private readonly object _writeLock = new();
-		private readonly BloomFilterAccessor _data;
-		private readonly IPersistenceStrategy _persistenceStrategy;
-
-		/// <summary>
-		/// Bloom filter implementation which uses a file for persistence.
-		/// </summary>
-		/// Add and MightContain can be called concurrently on different threads.
-		/// If the call to Add is complete then a call to MightContain will find the added value.
-		public PersistentBloomFilter(
-			IPersistenceStrategy persistenceStrategy,
-			int corruptionRebuildCount = 0) {
-
-			try {
-				_persistenceStrategy = persistenceStrategy;
-				// initialisation and verification can involve writing
-				// there will be no contention since we are in the constructor, but
-				// we want to ensure our writes are available to the readers
-				lock (_writeLock) {
-					_persistenceStrategy.Init();
-					_data = _persistenceStrategy.DataAccessor;
-					var numBits = _data.LogicalFilterSizeBits;
-					if (_persistenceStrategy.Create) {
-						_header = new Header() {
-							Version = Header.CurrentVersion,
-							CorruptionRebuildCount = corruptionRebuildCount,
-							NumBits = numBits
-						};
-
-						_persistenceStrategy.WriteHeader(_header);
-					} else {
-						_header = _persistenceStrategy.ReadHeader();
-						if (_header.NumBits != numBits) {
-							throw new SizeMismatchException(
-								$"The configured number of bytes ({(numBits / 8):N0}) does not match the number of bytes in file header ({(_header.NumBits / 8):N0}).");
-						}
-						Verify(0.05);
-					}
-				}
-			} catch {
-				Dispose();
-				throw;
-			}
-		}
-
-		public int CorruptionRebuildCount => _header.CorruptionRebuildCount;
-
-		/// <summary>
-		/// Calculates optimal number of items in the bloom filter for a specific false positive probability, p
-		/// </summary>
-		/// <param name="p">Desired false positive probability</param>
-		/// <returns></returns>
-		public long CalculateOptimalNumItems(double p = RecommendedFalsePositiveProbability) {
-			return Convert.ToInt64(Math.Floor(
-				Math.Log(1 - Math.Pow(p, 1.0 / NumHashFunctions)) /
-				Math.Log(Math.Pow(1 - 1.0 / _data.LogicalFilterSizeBits, NumHashFunctions)
-			)));
-		}
-
-		public bool MightContain(ReadOnlySpan<byte> bytes) {
-			long hash1 = ((long)_hashers[0].Hash(bytes) << 32) | _hashers[1].Hash(bytes);
-			long hash2 = ((long)_hashers[2].Hash(bytes) << 32) | _hashers[3].Hash(bytes);
-
-			// guarantee our LOADs are executed now and not prior.
-			// dual with the memory barrier implicit in the Add(...) method
-			Thread.MemoryBarrier();
-
-			long hash = hash1;
-			for (int i = 0; i < NumHashFunctions; i++) {
-				hash += hash2;
-				hash &= long.MaxValue; // make non-negative
-				long bitPosition = hash % _data.LogicalFilterSizeBits;
-				if (!_data.IsBitSet(bitPosition))
-					return false;
-			}
-
-			return true;
-		}
-
-		public void Add(ReadOnlySpan<byte> bytes) {
-			long hash1 = ((long)_hashers[0].Hash(bytes) << 32) | _hashers[1].Hash(bytes);
-			long hash2 = ((long)_hashers[2].Hash(bytes) << 32) | _hashers[3].Hash(bytes);
-
-			// guarantee only one writer
-			lock (_writeLock) {
-				long hash = hash1;
-				// possible SIMD optimisation?
-				for (int i = 0; i < NumHashFunctions; i++) {
-					hash += hash2;
-					hash &= long.MaxValue; // make non-negative
-					long bitPosition = hash % _data.LogicalFilterSizeBits;
-					// Consider returning the dirty page from set bit and calling the
-					// persistence strategy directly from here to remove the callback delegate
-					_data.SetBit(bitPosition);
-				}
-				// lock release guarantees our STOREs are executed before we return
-				// todo: confirm is this is true on ARM
-			}
-		}
-
-		// not re-entrant
-		public void Flush() {
-			// need to be sure the read operations were not done in advance of this point
-			// not 100% sure, however, that the barrier is required.
-			Thread.MemoryBarrier();
-			_persistenceStrategy.Flush();
-		}
-
-		public void Dispose() {
-			_persistenceStrategy.Dispose();
-		}
-
-		// corruptionThreshold = 0.05 => tolerate up to 5% corruption
-		public void Verify(double corruptionThreshold) {
-			lock (_writeLock) {
-				_data.Verify(_header.CorruptionRebuildCount, corruptionThreshold);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/ProbabilisticFilter/PersistentStreamBloomFilter.cs b/src/EventStore.Core/DataStructures/ProbabilisticFilter/PersistentStreamBloomFilter.cs
deleted file mode 100644
index 8c1a74b888a..00000000000
--- a/src/EventStore.Core/DataStructures/ProbabilisticFilter/PersistentStreamBloomFilter.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using EventStore.Common.Utils;
-using EventStore.Core.Index.Hashes;
-
-namespace EventStore.Core.DataStructures.ProbabilisticFilter {
-	// this class exists to deal with the fact that v3 stores strings in the bloom filter
-	// but v2 stores hashes (to make it faster to rebuild from the standard index)
-	//
-	// if you provide a ILongHasher then strings are hashed using it and the resulting ulong
-	// added to the filter. if you add a ulong directly, it must be the result of the same hash.
-	public class PersistentStreamBloomFilter : PersistentBloomFilter {
-		private readonly ILongHasher<string> _hasher;
-
-		public PersistentStreamBloomFilter(
-			IPersistenceStrategy persistenceStrategy,
-			ILongHasher<string> hasher,
-			int corruptionRebuildCount = 0) :
-
-			base(persistenceStrategy, corruptionRebuildCount) {
-			_hasher = hasher;
-		}
-
-		public void Add(string stream) {
-			if (_hasher != null) {
-				var hash = _hasher.Hash(stream);
-				Add(GetSpan(ref hash));
-			} else {
-				Add(MemoryMarshal.AsBytes(stream.AsSpan()));
-			}
-		}
-
-		public void Add(ulong streamHash) {
-			Ensure.NotNull(_hasher, "Hasher");
-			Add(GetSpan(ref streamHash));
-		}
-
-		public bool MightContain(string stream) {
-			if (_hasher != null) {
-				var hash = _hasher.Hash(stream);
-				return MightContain(GetSpan(ref hash));
-			} else {
-				return MightContain(MemoryMarshal.AsBytes(stream.AsSpan()));
-			}
-		}
-
-		private static ReadOnlySpan<byte> GetSpan(ref ulong streamHash) =>
-			MemoryMarshal.AsBytes(MemoryMarshal.CreateReadOnlySpan(ref streamHash, 1));
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/ProbabilisticFilter/SizeMismatchException.cs b/src/EventStore.Core/DataStructures/ProbabilisticFilter/SizeMismatchException.cs
deleted file mode 100644
index 2246fae55d6..00000000000
--- a/src/EventStore.Core/DataStructures/ProbabilisticFilter/SizeMismatchException.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System;
-
-namespace EventStore.Core.DataStructures.ProbabilisticFilter {
-	public class SizeMismatchException : Exception {
-		public SizeMismatchException(string error) : base(error) { }
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/StickyLRUCache.cs b/src/EventStore.Core/DataStructures/StickyLRUCache.cs
deleted file mode 100644
index 17206f2b254..00000000000
--- a/src/EventStore.Core/DataStructures/StickyLRUCache.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.DataStructures {
-	public class StickyLRUCache<TKey, TValue> : IStickyLRUCache<TKey, TValue> {
-		private class LRUItem {
-			public TKey Key;
-			public TValue Value;
-			public int Stickiness;
-		}
-
-		private readonly LinkedList<LRUItem> _orderList = new LinkedList<LRUItem>();
-
-		private readonly Dictionary<TKey, LinkedListNode<LRUItem>> _items =
-			new Dictionary<TKey, LinkedListNode<LRUItem>>();
-
-		private readonly Queue<LinkedListNode<LRUItem>> _nodesPool = new Queue<LinkedListNode<LRUItem>>();
-
-		private readonly int _maxCount;
-
-		public StickyLRUCache(int maxCount) {
-			Ensure.Nonnegative(maxCount, "maxCount");
-
-			_maxCount = maxCount;
-		}
-
-		public void Clear() {
-			while (_orderList.Count > 0) {
-				var node = _orderList.First;
-				_orderList.RemoveFirst();
-				ReturnNode(node);
-			}
-
-			_items.Clear();
-		}
-
-		public bool TryGet(TKey key, out TValue value) {
-			LinkedListNode<LRUItem> node;
-			if (_items.TryGetValue(key, out node)) {
-				_orderList.Remove(node);
-				_orderList.AddLast(node);
-				value = node.Value.Value;
-				return true;
-			}
-
-			value = default(TValue);
-			return false;
-		}
-
-		public TValue Put(TKey key, TValue value, int stickiness) {
-			LinkedListNode<LRUItem> node;
-			if (!_items.TryGetValue(key, out node)) {
-				node = GetNode();
-				node.Value.Key = key;
-				node.Value.Value = value;
-				node.Value.Stickiness = stickiness;
-
-				EnsureCapacity();
-
-				_items.Add(key, node);
-			} else {
-				node.Value.Value = value;
-				node.Value.Stickiness += stickiness;
-				_orderList.Remove(node);
-			}
-
-			_orderList.AddLast(node);
-			return value;
-		}
-
-		public void Remove(TKey key) {
-			LinkedListNode<LRUItem> node;
-			if (_items.TryGetValue(key, out node)) {
-				_orderList.Remove(node);
-				_items.Remove(key);
-			}
-		}
-
-		public TValue Put(TKey key, Func<TKey, TValue> addFactory, Func<TKey, TValue, TValue> updateFactory,
-			int stickiness) {
-			LinkedListNode<LRUItem> node;
-			if (!_items.TryGetValue(key, out node)) {
-				node = GetNode();
-				node.Value.Key = key;
-				node.Value.Value = addFactory(key);
-				node.Value.Stickiness = stickiness;
-
-				EnsureCapacity();
-
-				_items.Add(key, node);
-			} else {
-				node.Value.Value = updateFactory(key, node.Value.Value);
-				node.Value.Stickiness += stickiness;
-				_orderList.Remove(node);
-			}
-
-			_orderList.AddLast(node);
-			return node.Value.Value;
-		}
-
-		private void EnsureCapacity() {
-			while (_items.Count > 0 && _items.Count >= _maxCount) {
-				var node = _orderList.First;
-				if (node.Value.Stickiness == 0) {
-					_orderList.Remove(node);
-					_items.Remove(node.Value.Key);
-					ReturnNode(node);
-				} else {
-					_orderList.Remove(node);
-					_orderList.AddLast(node);
-					break; // hope garbage will be freed on later puts
-				}
-			}
-		}
-
-		private LinkedListNode<LRUItem> GetNode() {
-			if (_nodesPool.Count > 0)
-				return _nodesPool.Dequeue();
-			return new LinkedListNode<LRUItem>(new LRUItem());
-		}
-
-		private void ReturnNode(LinkedListNode<LRUItem> node) {
-			_nodesPool.Enqueue(node);
-		}
-	}
-}
diff --git a/src/EventStore.Core/DataStructures/UnmanagedMemoryAppendOnlyList.cs b/src/EventStore.Core/DataStructures/UnmanagedMemoryAppendOnlyList.cs
deleted file mode 100644
index f62e6e7d253..00000000000
--- a/src/EventStore.Core/DataStructures/UnmanagedMemoryAppendOnlyList.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using System.Threading;
-
-namespace EventStore.Core.DataStructures {
-
-	public interface IAppendOnlyList<in T> {
-		void Add(T item);
-		void Clear();
-		int Count { get; }
-	}
-
-	public sealed class UnmanagedMemoryAppendOnlyList<T> : IAppendOnlyList<T>, IDisposable {
-		private readonly int _maxCapacity;
-		private readonly IntPtr _dataPtr = IntPtr.Zero;
-		private readonly long _dataBytesAllocated;
-
-		private int _count;
-		private bool _disposed;
-
-		public UnmanagedMemoryAppendOnlyList(int maxCapacity) {
-			if (maxCapacity <= 0) {
-				throw new ArgumentException($"{nameof(maxCapacity)} must be positive");
-			}
-
-			_maxCapacity = maxCapacity;
-			_count = 0;
-			long bytesToAllocate = (long)_maxCapacity * Marshal.SizeOf(typeof(T));
-			_dataPtr = Marshal.AllocHGlobal(new IntPtr(bytesToAllocate));
-			Thread.MemoryBarrier();
-			_dataBytesAllocated = bytesToAllocate;
-
-			if (_dataBytesAllocated > 0) {
-				GC.AddMemoryPressure(_dataBytesAllocated);
-			}
-		}
-
-		~UnmanagedMemoryAppendOnlyList() => Dispose(false);
-
-		public void Add(T item) {
-			if (_count >= _maxCapacity)
-				throw new MaxCapacityReachedException();
-
-			unsafe
-			{
-				new Span<T>(_dataPtr.ToPointer(), _maxCapacity) {
-					[_count] = item
-				};
-			}
-			_count++;
-		}
-
-		public void Clear() {
-			_count = 0;
-		}
-
-		public int Count => _count;
-		public ReadOnlySpan<T> AsSpan() {
-			if (_dataPtr == IntPtr.Zero)
-				return ReadOnlySpan<T>.Empty;
-
-			unsafe {
-				return new ReadOnlySpan<T>(_dataPtr.ToPointer(), _maxCapacity).Slice(0, _count);
-			}
-		}
-
-		public T this[int index] {
-			get {
-				if (index < 0 || index >= _count) {
-					throw new IndexOutOfRangeException();
-				}
-
-				unsafe
-				{
-					return new ReadOnlySpan<T>(_dataPtr.ToPointer(), _maxCapacity)[index];
-				}
-			}
-		}
-
-		public void Dispose() {
-			Dispose(true);
-			GC.SuppressFinalize(this);
-		}
-
-		private void Dispose(bool disposing) {
-			if (_disposed) {
-				return;
-			}
-
-			if (disposing) {
-				//dispose any managed objects here
-			}
-
-			if (_dataPtr != IntPtr.Zero) {
-				Marshal.FreeHGlobal(_dataPtr);
-				Thread.MemoryBarrier();
-				if (_dataBytesAllocated > 0) {
-					GC.RemoveMemoryPressure(_dataBytesAllocated);
-				}
-			}
-
-			_disposed = true;
-		}
-	}
-
-	public class MaxCapacityReachedException : Exception {
-		public MaxCapacityReachedException() : base("Max capacity reached") {
-		}
-	}
-}
diff --git a/src/EventStore.Core/EpochExtensions.cs b/src/EventStore.Core/EpochExtensions.cs
deleted file mode 100644
index d55fad78a4a..00000000000
--- a/src/EventStore.Core/EpochExtensions.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-
-namespace EventStore.Core {
-	internal static class EpochExtensions {
-		public static DateTime FromTicksSinceEpoch(this long value) =>
-			new DateTime(DateTime.UnixEpoch.Ticks + value, DateTimeKind.Utc);
-
-		public static long ToTicksSinceEpoch(this DateTime value) =>
-			(value - DateTime.UnixEpoch).Ticks;
-	}
-}
diff --git a/src/EventStore.Core/EventStore.Core.csproj b/src/EventStore.Core/EventStore.Core.csproj
deleted file mode 100644
index 809e35fcca4..00000000000
--- a/src/EventStore.Core/EventStore.Core.csproj
+++ /dev/null
@@ -1,91 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<NoWarn>CS1998</NoWarn> <!--Temporary solution to migrate TFChunk API to async-->
-	</PropertyGroup>
-	<ItemGroup>
-		<FrameworkReference Include="Microsoft.AspNetCore.App" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="EventStore.Plugins" Version="24.10.3" />
-		<PackageReference Include="Google.Protobuf" Version="3.27.2" />
-		<PackageReference Include="Grpc.AspNetCore" Version="2.64.0" />
-		<PackageReference Include="Grpc.Tools" Version="2.65.0">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-		</PackageReference>
-		<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
-		<PackageReference Include="librdkafka.redist" Version="2.5.0" />
-		<PackageReference Include="Microsoft.FASTER.Core" Version="1.9.16" />
-		<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.4.0-rc.1" />
-		<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.4.0-rc.1" />
-		<PackageReference Include="Quickenshtein" Version="1.5.1" />
-		<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
-		<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
-		<PackageReference Include="System.IO.Pipelines" Version="8.0.0" />
-		<PackageReference Include="System.Linq.Async" Version="6.0.1" />
-		<PackageReference Include="System.Net.Http" Version="4.3.4" />
-		<PackageReference Include="Microsoft.Diagnostics.NETCore.Client" Version="0.2.452401" />
-		<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.6" />
-		<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.0" />
-		<PackageReference Include="DotNext" Version="5.13.0" />
-		<PackageReference Include="DotNext.IO" Version="5.13.0" />
-		<PackageReference Include="DotNext.Threading" Version="5.13.0" />
-		<PackageReference Include="DotNext.Unsafe" Version="5.13.0" />
-		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\EventStore.Common\EventStore.Common.csproj" />
-		<ProjectReference Include="..\EventStore.LogV3\EventStore.LogV3.csproj" />
-		<ProjectReference Include="..\EventStore.Native\EventStore.Native.csproj" />
-		<ProjectReference Include="..\EventStore.Transport.Http\EventStore.Transport.Http.csproj" />
-		<ProjectReference Include="..\EventStore.Transport.Tcp\EventStore.Transport.Tcp.csproj" />
-		<ProjectReference Include="..\EventStore.NETCore.Compatibility\EventStore.NETCore.Compatibility.csproj" />
-		<ProjectReference Include="..\EventStore.SourceGenerators\EventStore.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-	</ItemGroup>
-	<ItemGroup>
-		<Protobuf Include="..\Protos\ClientAPI\ClientMessageDtos.proto">
-			<Link>Services\Transport\Tcp\protos\ClientMessageDtos.proto</Link>
-		</Protobuf>
-		<Protobuf Include="..\Protos\Grpc\code.proto" GrpcServices="Server" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
-			<Link>Services\Transport\Grpc\Protos\code.proto</Link>
-		</Protobuf>
-		<Protobuf Include="../Protos/Grpc/cluster.proto" GrpcServices="Both" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
-			<Link>Services\Transport\Grpc\Protos\cluster.proto</Link>
-		</Protobuf>
-		<Protobuf Include="..\Protos\Grpc\gossip.proto" GrpcServices="Server" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
-			<Link>Services\Transport\Grpc\Protos\gossip.proto</Link>
-		</Protobuf>
-		<Protobuf Include="..\Protos\Grpc\operations.proto" GrpcServices="Server" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
-			<Link>Services\Transport\Grpc\Protos\operations.proto</Link>
-		</Protobuf>
-		<Protobuf Include="..\Protos\Grpc\persistent.proto" GrpcServices="Both" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
-			<Link>Services\Transport\Grpc\Protos\persistent.proto</Link>
-		</Protobuf>
-		<Protobuf Include="..\Protos\Grpc\shared.proto" GrpcServices="Server" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
-			<Link>Services\Transport\Grpc\Protos\shared.proto</Link>
-		</Protobuf>
-		<Protobuf Include="..\Protos\Grpc\status.proto" GrpcServices="Server" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
-			<Link>Services\Transport\Grpc\Protos\status.proto</Link>
-		</Protobuf>
-		<Protobuf Include="..\Protos\Grpc\streams.proto" GrpcServices="Both" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
-			<Link>Services\Transport\Grpc\Protos\streams.proto</Link>
-		</Protobuf>
-		<Protobuf Include="..\Protos\Grpc\users.proto" GrpcServices="Server" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
-			<Link>Services\Transport\Grpc\Protos\users.proto</Link>
-		</Protobuf>
-		<Protobuf Include="..\Protos\Grpc\monitoring.proto" GrpcServices="Both" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
-			<Link>Services\Transport\Grpc\Protos\monitoring.proto</Link>
-		</Protobuf>
-		<Protobuf Include="..\Protos\Grpc\serverfeatures.proto" GrpcServices="Both" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
-			<Link>Services\Transport\Grpc\Protos\serverfeatures.proto</Link>
-		</Protobuf>
-		<Protobuf Include="..\Protos\Grpc\redaction.proto" GrpcServices="Server" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
-			<Link>Services\Transport\Grpc\Protos\redaction.proto</Link>
-		</Protobuf>
-	</ItemGroup>
-	<ItemGroup>
-		<Folder Include="Services\Transport\Tcp\protos\" />
-	</ItemGroup>
-</Project>
diff --git a/src/EventStore.Core/EventStoreLegacyHttpMiddleware.cs b/src/EventStore.Core/EventStoreLegacyHttpMiddleware.cs
deleted file mode 100644
index ccb3ca2d41c..00000000000
--- a/src/EventStore.Core/EventStoreLegacyHttpMiddleware.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Services.Transport.Http;
-using EventStore.Plugins.Authorization;
-using EventStore.Transport.Http;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Routing;
-
-namespace EventStore.Core {
-	public static class EventStoreLegacyHttpMiddleware {
-		public static IEndpointRouteBuilder MapLegacyHttp(
-			this IEndpointRouteBuilder app, RequestDelegate dispatcher,
-			params IHttpService[] httpServices) {
-			if (app == null) throw new ArgumentNullException(nameof(app));
-			if (httpServices == null) throw new ArgumentNullException(nameof(httpServices));
-
-			var actions = httpServices
-				.SelectMany(x => x.Actions.Select(action =>
-					(ConvertToRoute(action.UriTemplate), action.HttpMethod, action.Operation)))
-				.ToArray();
-
-			var actionsToRegister = actions
-				.Concat(actions
-					.Select(_ => _.Item1)
-					.Select(route => (route, HttpMethod.Options, new Func<UriTemplateMatch, Operation>(_ => new Operation(Operations.Node.Options)))))
-				.Distinct(RouteAndMethodComparer.Instance);
-
-			foreach (var action in actionsToRegister) {
-				RegisterRoute(app, action);
-			}
-
-			return app;
-
-			void RegisterRoute(
-				IEndpointRouteBuilder builder,
-				(string route, string method, Func<UriTemplateMatch, Operation> operation) action) => builder
-					.MapMethods(
-						action.route,
-						action.method == HttpMethod.Get
-							? new[] {HttpMethod.Get, HttpMethod.Head}
-							: new[] {action.method},
-						dispatcher)
-					.WithMetadata(action.operation);
-
-			static string ConvertToRoute(string uriTemplate) {
-				var route = uriTemplate.Split('?').First();
-				return System.Net.WebUtility.UrlDecode(route.EndsWith("/") ? route[..^1] : route);
-			}
-		} 
-		class RouteAndMethodComparer : EqualityComparer<(string, string, Func<UriTemplateMatch, Operation>)> {
-			public static readonly RouteAndMethodComparer Instance = new RouteAndMethodComparer();
-			public override bool Equals((string, string, Func<UriTemplateMatch, Operation>) x, (string, string, Func<UriTemplateMatch, Operation>) y) {
-				return string.Equals(x.Item1, y.Item1, StringComparison.Ordinal) &&
-				       string.Equals(x.Item2, y.Item2, StringComparison.Ordinal);
-			}
-
-			public override int GetHashCode((string, string, Func<UriTemplateMatch, Operation>) obj) {
-				return HashCode.Combine(obj.Item1, obj.Item2);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Exceptions/BadChunkInDatabaseException.cs b/src/EventStore.Core/Exceptions/BadChunkInDatabaseException.cs
deleted file mode 100644
index ef05977b4fe..00000000000
--- a/src/EventStore.Core/Exceptions/BadChunkInDatabaseException.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace EventStore.Core.Exceptions {
-	public class BadChunkInDatabaseException : Exception {
-		public BadChunkInDatabaseException(string message) : base(message) {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Exceptions/ChunkNotFoundException.cs b/src/EventStore.Core/Exceptions/ChunkNotFoundException.cs
deleted file mode 100644
index d409ee1c6a5..00000000000
--- a/src/EventStore.Core/Exceptions/ChunkNotFoundException.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace EventStore.Core.Exceptions {
-	public class ChunkNotFoundException : Exception {
-		public ChunkNotFoundException(string chunkName) : base(chunkName + " not found.") {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Exceptions/CorruptDatabaseException.cs b/src/EventStore.Core/Exceptions/CorruptDatabaseException.cs
deleted file mode 100644
index 9a9bd5b7f51..00000000000
--- a/src/EventStore.Core/Exceptions/CorruptDatabaseException.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-
-namespace EventStore.Core.Exceptions {
-	public class CorruptDatabaseException : Exception {
-		public CorruptDatabaseException(Exception inner) : base("Corrupt database detected.", inner) {
-		}
-
-		public CorruptDatabaseException(string message, Exception inner) : base(message, inner) {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Exceptions/CorruptIndexException.cs b/src/EventStore.Core/Exceptions/CorruptIndexException.cs
deleted file mode 100644
index 2e911fd8695..00000000000
--- a/src/EventStore.Core/Exceptions/CorruptIndexException.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-
-namespace EventStore.Core.Exceptions {
-	public class CorruptIndexException : Exception {
-		public CorruptIndexException() {
-		}
-
-		public CorruptIndexException(Exception innerException) : base("Corrupted index.", innerException) {
-		}
-
-		public CorruptIndexException(string message) : base(message) {
-		}
-
-		public CorruptIndexException(string message, Exception innerException) : base(message, innerException) {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Exceptions/ExtraneousFileFoundException.cs b/src/EventStore.Core/Exceptions/ExtraneousFileFoundException.cs
deleted file mode 100644
index e6ca60beab5..00000000000
--- a/src/EventStore.Core/Exceptions/ExtraneousFileFoundException.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace EventStore.Core.Exceptions {
-	public class ExtraneousFileFoundException : Exception {
-		public ExtraneousFileFoundException(string message) : base(message) {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Exceptions/FileBeingDeletedException.cs b/src/EventStore.Core/Exceptions/FileBeingDeletedException.cs
deleted file mode 100644
index 21b2b5f620e..00000000000
--- a/src/EventStore.Core/Exceptions/FileBeingDeletedException.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-
-namespace EventStore.Core.Exceptions {
-	public class FileBeingDeletedException : Exception {
-		public FileBeingDeletedException() {
-		}
-
-		public FileBeingDeletedException(string message) : base(message) {
-		}
-
-		public FileBeingDeletedException(string message, Exception innerException) : base(message, innerException) {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Exceptions/HashValidationException.cs b/src/EventStore.Core/Exceptions/HashValidationException.cs
deleted file mode 100644
index 22bab6e19ce..00000000000
--- a/src/EventStore.Core/Exceptions/HashValidationException.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-
-namespace EventStore.Core.Exceptions {
-	public class HashValidationException : Exception {
-		public HashValidationException() {
-		}
-
-		public HashValidationException(string message) : base(message) {
-		}
-
-		public HashValidationException(string message, Exception innerException) : base(message, innerException) {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Exceptions/InvalidFileException.cs b/src/EventStore.Core/Exceptions/InvalidFileException.cs
deleted file mode 100644
index fb5122876eb..00000000000
--- a/src/EventStore.Core/Exceptions/InvalidFileException.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-
-namespace EventStore.Core.Exceptions {
-	public class InvalidFileException : Exception {
-		public InvalidFileException() {
-		}
-
-		public InvalidFileException(string message) : base(message) {
-		}
-
-		public InvalidFileException(string message, Exception innerException) : base(message, innerException) {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Exceptions/MaybeCorruptIndexException.cs b/src/EventStore.Core/Exceptions/MaybeCorruptIndexException.cs
deleted file mode 100644
index e9e1621478e..00000000000
--- a/src/EventStore.Core/Exceptions/MaybeCorruptIndexException.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-
-namespace EventStore.Core.Exceptions {
-	public class MaybeCorruptIndexException : Exception {
-		public MaybeCorruptIndexException() {
-		}
-
-		public MaybeCorruptIndexException(Exception innerException) : base("May be corrupted index.", innerException) {
-		}
-
-		public MaybeCorruptIndexException(string message) : base(message) {
-		}
-
-		public MaybeCorruptIndexException(string message, Exception innerException) : base(message, innerException) {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Exceptions/NoCertificatePrivateKeyException.cs b/src/EventStore.Core/Exceptions/NoCertificatePrivateKeyException.cs
deleted file mode 100644
index 9eb60b4a188..00000000000
--- a/src/EventStore.Core/Exceptions/NoCertificatePrivateKeyException.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace EventStore.Core.Exceptions {
-	public class NoCertificatePrivateKeyException : Exception {
-		public NoCertificatePrivateKeyException() : base() {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Exceptions/PTableNotFoundException.cs b/src/EventStore.Core/Exceptions/PTableNotFoundException.cs
deleted file mode 100644
index 7262bb5a4c9..00000000000
--- a/src/EventStore.Core/Exceptions/PTableNotFoundException.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace EventStore.Core.Exceptions {
-	public class PTableNotFoundException : Exception {
-		public PTableNotFoundException(string ptableName) : base("PTable " + ptableName + " not found.") {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Exceptions/PossibleToHandleOutOfMemoryException.cs b/src/EventStore.Core/Exceptions/PossibleToHandleOutOfMemoryException.cs
deleted file mode 100644
index 53b2b5c0dd1..00000000000
--- a/src/EventStore.Core/Exceptions/PossibleToHandleOutOfMemoryException.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-
-namespace EventStore.Core.Exceptions {
-	internal class PossibleToHandleOutOfMemoryException : OutOfMemoryException {
-		public PossibleToHandleOutOfMemoryException() {
-		}
-
-		public PossibleToHandleOutOfMemoryException(string message) : base(message) {
-		}
-
-		public PossibleToHandleOutOfMemoryException(string message, Exception innerException) : base(message,
-			innerException) {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Exceptions/ReaderCheckpointHigherThanWriterException.cs b/src/EventStore.Core/Exceptions/ReaderCheckpointHigherThanWriterException.cs
deleted file mode 100644
index ad576853543..00000000000
--- a/src/EventStore.Core/Exceptions/ReaderCheckpointHigherThanWriterException.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-
-namespace EventStore.Core.Exceptions {
-	public class ReaderCheckpointHigherThanWriterException : Exception {
-		public ReaderCheckpointHigherThanWriterException(string checkpointName)
-			: base(string.Format("Checkpoint '{0}' has greater value than writer checkpoint.", checkpointName)) {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Exceptions/SystemStreamNotFoundException.cs b/src/EventStore.Core/Exceptions/SystemStreamNotFoundException.cs
deleted file mode 100644
index 706e40463fe..00000000000
--- a/src/EventStore.Core/Exceptions/SystemStreamNotFoundException.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace EventStore.Core.Exceptions {
-	class SystemStreamNotFoundException : Exception {
-		public SystemStreamNotFoundException(string message) : base(message) {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Exceptions/UnableToAcquireLockInReasonableTimeException.cs b/src/EventStore.Core/Exceptions/UnableToAcquireLockInReasonableTimeException.cs
deleted file mode 100644
index 9ec1706ddf5..00000000000
--- a/src/EventStore.Core/Exceptions/UnableToAcquireLockInReasonableTimeException.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using System;
-
-namespace EventStore.Core.Exceptions {
-	public class UnableToAcquireLockInReasonableTimeException : Exception {
-	}
-}
diff --git a/src/EventStore.Core/Exceptions/UnableToReadPastEndOfStreamException.cs b/src/EventStore.Core/Exceptions/UnableToReadPastEndOfStreamException.cs
deleted file mode 100644
index 972c5ea6d50..00000000000
--- a/src/EventStore.Core/Exceptions/UnableToReadPastEndOfStreamException.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-
-namespace EventStore.Core.Exceptions {
-	internal class UnableToReadPastEndOfStreamException : Exception {
-		public UnableToReadPastEndOfStreamException() {
-		}
-
-		public UnableToReadPastEndOfStreamException(string message) : base(message) {
-		}
-
-		public UnableToReadPastEndOfStreamException(string message, Exception innerException) : base(message,
-			innerException) {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Exceptions/UnsupportedFileVersionException.cs b/src/EventStore.Core/Exceptions/UnsupportedFileVersionException.cs
deleted file mode 100644
index b1168f94d15..00000000000
--- a/src/EventStore.Core/Exceptions/UnsupportedFileVersionException.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-
-namespace EventStore.Core.Exceptions {
-	public class UnsupportedFileVersionException : Exception {
-		public UnsupportedFileVersionException(string filename, byte fileVersion, byte lastSupportedVersion,
-			string message = "")
-			: base(string.Format("File {0} has unsupported version: {1}. The latest supported version is: {2}. {3}",
-				filename,
-				fileVersion,
-				lastSupportedVersion,
-				message)) {
-		}
-	}
-}
diff --git a/src/EventStore.Core/ExclusiveDbLock.cs b/src/EventStore.Core/ExclusiveDbLock.cs
deleted file mode 100644
index da33c84ab7d..00000000000
--- a/src/EventStore.Core/ExclusiveDbLock.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using System.IO;
-using System.Security.Cryptography;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Util;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core {
-	public class ExclusiveDbLock : IDisposable {
-		private static readonly ILogger Log = Serilog.Log.ForContext<ExclusiveDbLock>();
-
-		public readonly string MutexName;
-
-		public bool IsAcquired => _acquired;
-
-		private Mutex _dbMutex;
-		private bool _acquired;
-
-		public ExclusiveDbLock(string dbPath) {
-			Ensure.NotNullOrEmpty(dbPath, "dbPath");
-			MutexName = @"Global\ESDB-HASHED:" + GetDbPathHash(dbPath);
-		}
-
-		public bool Acquire() {
-			if (_acquired)
-				throw new InvalidOperationException($"DB mutex '{MutexName}' is already acquired.");
-
-			try {
-				_dbMutex?.Dispose();
-				_dbMutex = new Mutex(initiallyOwned: true, name: MutexName, createdNew: out _acquired);
-				_dbMutex.WaitOne(TimeSpan.FromSeconds(5));
-			} catch (AbandonedMutexException exc) {
-				Log.Warning(exc,
-					"DB mutex '{mutex}' is said to be abandoned. "
-					+ "Probably previous instance of server was terminated abruptly.",
-					MutexName);
-			}
-
-			return _acquired;
-		}
-
-		private static string GetDbPathHash(string dbPath) {
-			using var memStream = new MemoryStream(Helper.UTF8NoBom.GetBytes(dbPath));
-			return BitConverter.ToString(MD5Hash.GetHashFor(memStream)).Replace("-", "");
-		}
-
-		public void Release() {
-			if (!_acquired)
-				throw new InvalidOperationException($"DB mutex '{MutexName}' was not acquired.");
-			try {
-				_dbMutex.ReleaseMutex();
-			} catch (ApplicationException ex) {
-				Log.Warning(ex, "Error occurred while releasing lock.");
-			} finally {
-				_acquired = false;
-			}
-		}
-
-		public void Dispose() {
-			if (_acquired) {
-				Release();
-			}
-			_dbMutex?.Dispose();
-		}
-	}
-}
diff --git a/src/EventStore.Core/Hashing/MD5.cs b/src/EventStore.Core/Hashing/MD5.cs
deleted file mode 100644
index 94ec1aa88d9..00000000000
--- a/src/EventStore.Core/Hashing/MD5.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Security.Cryptography;
-using EventStore.Common.Utils;
-using EventStore.Plugins.MD5;
-
-namespace EventStore.Core.Hashing;
-
-public class MD5 {
-	private static IMD5Provider _provider = new NetMD5Provider();
-
-	public static HashAlgorithm Create() => _provider.Create();
-
-	public static void UseProvider(IMD5Provider md5Provider) {
-		Ensure.NotNull(md5Provider, nameof(md5Provider));
-
-		try {
-			using var _ = md5Provider.Create();
-		} catch (Exception ex) {
-			throw new AggregateException("Failed to use the specified MD5 provider.", ex);
-		}
-
-		_provider = md5Provider;
-	}
-}
diff --git a/src/EventStore.Core/Hashing/NetMD5Provider.cs b/src/EventStore.Core/Hashing/NetMD5Provider.cs
deleted file mode 100644
index 321fdf5c832..00000000000
--- a/src/EventStore.Core/Hashing/NetMD5Provider.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Security.Cryptography;
-using EventStore.Plugins;
-using EventStore.Plugins.MD5;
-
-namespace EventStore.Core.Hashing;
-
-public class NetMD5Provider : Plugin, IMD5Provider {
-	public HashAlgorithm Create() => System.Security.Cryptography.MD5.Create();
-}
diff --git a/src/EventStore.Core/Helpers/IODispatcher.cs b/src/EventStore.Core/Helpers/IODispatcher.cs
deleted file mode 100644
index 4f5af7bb823..00000000000
--- a/src/EventStore.Core/Helpers/IODispatcher.cs
+++ /dev/null
@@ -1,949 +0,0 @@
-using System;
-using System.Security.Claims;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Services.TimerService;
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-
-namespace EventStore.Core.Helpers {
-	
-	public sealed class IODispatcher : IHandle<IODispatcherDelayedMessage>, IHandle<ClientMessage.NotHandled> {
-		public sealed class RequestTracking {
-			public RequestTracking(bool trackPendingRequests) {
-				_trackPendingRequests = trackPendingRequests;
-			}
-
-			private readonly WriterQueueSet _writerQueueSet = new WriterQueueSet();
-			private readonly PendingWrites _pendingWrites = new PendingWrites();
-			private readonly PendingReads _pendingReads = new PendingReads();
-			private readonly bool _trackPendingRequests;
-			private readonly HashSet<Guid> _allPendingRequests = new HashSet<Guid>();
-			private bool _draining;
-			private Action _onRequestsDrained;
-			private readonly object _lockObject = new object();
-
-			public void StartDraining(Action onRequestsDrained) {
-				lock (_lockObject) {
-					if (_allPendingRequests.IsEmpty()) {
-						onRequestsDrained?.Invoke();
-						return;
-					}
-					_draining = true;
-					_onRequestsDrained = onRequestsDrained;
-				}
-			}
-
-			public void AddPendingRequest(Guid correlationId) {
-				lock (_lockObject) {
-					if (!_trackPendingRequests)
-						return;
-			
-					_allPendingRequests.Add(correlationId);
-				}
-			}
-
-			public void RemovePendingRequest(Guid correlationId) {
-				lock (_lockObject) {
-					if (!_trackPendingRequests)
-						return;
-
-					_allPendingRequests.Remove(correlationId);
-					if (_draining && _allPendingRequests.IsEmpty()) {
-						_onRequestsDrained?.Invoke();
-						_onRequestsDrained = null;
-						_draining = false;
-					}
-				}
-			}
-
-			public void AddPendingRead(Guid corrId) {
-				lock (_lockObject) {
-					AddPendingRequest(corrId);
-					_pendingReads.Register(corrId);
-				}
-			}
-
-			public bool RemovePendingRead(Guid corrId) {
-				lock (_lockObject) {
-					RemovePendingRequest(corrId);
-					if (!_pendingReads.IsRegistered(corrId))
-						return false;
-					_pendingReads.Remove(corrId);
-					return true;
-				}
-			}
-
-			private void WorkQueue(
-				Guid key,
-				RequestResponseDispatcher<ClientMessage.WriteEvents, ClientMessage.WriteEventsCompleted> writer) {
-
-				if (_writerQueueSet.IsBusy(key))
-					return;
-				if (!_writerQueueSet.HasPendingWrites(key))
-					return;
-				var write = _writerQueueSet.Dequeue(key);
-				if (write != null) {
-					writer.Publish(write, (msg) => Handle(key, msg, writer));
-				}
-			}
-
-			private void Handle(
-				Guid key,
-				ClientMessage.WriteEventsCompleted message,
-				RequestResponseDispatcher<ClientMessage.WriteEvents, ClientMessage.WriteEventsCompleted> writer) {
-
-				lock (_lockObject) {
-					_writerQueueSet.Finish(key);
-
-					_pendingWrites.CompleteRequest(message);
-					RemovePendingRequest(message.CorrelationId);
-
-					WorkQueue(key, writer);
-				}
-			}
-
-			public void QueuePendingWrite(
-				Guid key,
-				Guid corrId,
-				Action<ClientMessage.WriteEventsCompleted> action,
-				ClientMessage.WriteEvents message,
-				RequestResponseDispatcher<ClientMessage.WriteEvents, ClientMessage.WriteEventsCompleted> writer) {
-
-				lock (_lockObject) {
-					AddPendingRequest(corrId);
-					_pendingWrites.CaptureCallback(corrId, action);
-
-					_writerQueueSet.AddToQueue(key, message);
-
-					WorkQueue(key, writer);
-				}
-			}
-		}
-
-		public const int ReadTimeoutMs = 10000;
-
-		private readonly Guid _selfId = Guid.NewGuid();
-		private readonly IPublisher _publisher;
-		private readonly IEnvelope _inputQueueEnvelope;
-		private readonly RequestTracking _requestTracker;
-
-		public readonly
-			RequestResponseDispatcher
-			<ClientMessage.ReadStreamEventsForward, ClientMessage.ReadStreamEventsForwardCompleted> ForwardReader;
-
-		public ReadDispatcher BackwardReader { get; }
-
-		public readonly RequestResponseDispatcher<ClientMessage.WriteEvents, ClientMessage.WriteEventsCompleted> Writer;
-
-		public readonly RequestResponseDispatcher<ClientMessage.DeleteStream, ClientMessage.DeleteStreamCompleted>
-			StreamDeleter;
-
-		public readonly RequestResponseDispatcher<AwakeServiceMessage.SubscribeAwake, IODispatcherDelayedMessage>
-			Awaker;
-
-		public readonly RequestResponseDispatcher<ClientMessage.ReadEvent, ClientMessage.ReadEventCompleted> EventReader;
-		
-		public readonly
-			RequestResponseDispatcher
-			<ClientMessage.ReadAllEventsForward, ClientMessage.ReadAllEventsForwardCompleted> AllForwardReader;
-
-		public readonly
-			RequestResponseDispatcher
-			<ClientMessage.ReadAllEventsBackward, ClientMessage.ReadAllEventsBackwardCompleted> AllBackwardReader;
-
-		public readonly
-			RequestResponseDispatcher
-			<ClientMessage.FilteredReadAllEventsForward, ClientMessage.FilteredReadAllEventsForwardCompleted> AllForwardFilteredReader;
-
-		public readonly
-			RequestResponseDispatcher
-			<ClientMessage.FilteredReadAllEventsBackward, ClientMessage.FilteredReadAllEventsBackwardCompleted> AllBackwardFilteredReader;
-
-		public IODispatcher(IPublisher publisher, IEnvelope envelope, bool trackPendingRequests=false) {
-			_publisher = publisher;
-			_inputQueueEnvelope = envelope;
-			_requestTracker = new RequestTracking(trackPendingRequests);
-			
-			ForwardReader =
-				new RequestResponseDispatcher
-					<ClientMessage.ReadStreamEventsForward, ClientMessage.ReadStreamEventsForwardCompleted>(
-						publisher,
-						v => v.CorrelationId,
-						v => v.CorrelationId,
-						envelope);
-
-			BackwardReader = new ReadDispatcher(
-				publisher,
-				v => v.CorrelationId,
-				v => v.CorrelationId,
-				v => v.CorrelationId,
-				envelope);
-
-			Writer =
-				new RequestResponseDispatcher<ClientMessage.WriteEvents, ClientMessage.WriteEventsCompleted>(
-					publisher,
-					v => v.CorrelationId,
-					v => v.CorrelationId,
-					envelope);
-
-			StreamDeleter =
-				new RequestResponseDispatcher<ClientMessage.DeleteStream, ClientMessage.DeleteStreamCompleted>(
-					publisher,
-					v => v.CorrelationId,
-					v => v.CorrelationId,
-					envelope);
-
-			Awaker =
-				new RequestResponseDispatcher<AwakeServiceMessage.SubscribeAwake, IODispatcherDelayedMessage>(
-					publisher,
-					v => v.CorrelationId,
-					v => v.CorrelationId,
-					envelope,
-					cancelMessageFactory: requestId => new AwakeServiceMessage.UnsubscribeAwake(requestId));
-
-			EventReader =
-				new RequestResponseDispatcher<ClientMessage.ReadEvent, ClientMessage.ReadEventCompleted>(
-					publisher,
-					v => v.CorrelationId,
-					v => v.CorrelationId,
-					envelope);
-			
-			AllForwardReader =
-				new RequestResponseDispatcher
-					<ClientMessage.ReadAllEventsForward, ClientMessage.ReadAllEventsForwardCompleted>(
-						publisher,
-						v => v.CorrelationId,
-						v => v.CorrelationId,
-						envelope);
-
-			AllBackwardReader =
-				new RequestResponseDispatcher
-					<ClientMessage.ReadAllEventsBackward, ClientMessage.ReadAllEventsBackwardCompleted>(
-						publisher,
-						v => v.CorrelationId,
-						v => v.CorrelationId,
-						envelope);
-
-			AllForwardFilteredReader =
-				new RequestResponseDispatcher
-					<ClientMessage.FilteredReadAllEventsForward, ClientMessage.FilteredReadAllEventsForwardCompleted>(
-						publisher,
-						v => v.CorrelationId,
-						v => v.CorrelationId,
-						envelope);
-
-			AllBackwardFilteredReader =
-				new RequestResponseDispatcher
-					<ClientMessage.FilteredReadAllEventsBackward, ClientMessage.FilteredReadAllEventsBackwardCompleted>(
-						publisher,
-						v => v.CorrelationId,
-						v => v.CorrelationId,
-						envelope);
-		}
-
-		public void StartDraining(Action onRequestsDrained) {
-			_requestTracker.StartDraining(onRequestsDrained);
-		}
-
-		private void AddPendingRequest(Guid correlationId) {
-			_requestTracker.AddPendingRequest(correlationId);
-		}
-		
-		private void RemovePendingRequest(Guid correlationId) {
-			_requestTracker.RemovePendingRequest(correlationId);
-		}
-
-		public Guid ReadBackward(
-			string streamId,
-			long fromEventNumber,
-			int maxCount,
-			bool resolveLinks,
-			ClaimsPrincipal principal,
-			Action<ClientMessage.ReadStreamEventsBackwardCompleted> action,
-			Guid? corrId = null) {
-			if (!corrId.HasValue)
-				corrId = Guid.NewGuid();
-
-			return BackwardReader.Publish(
-				new ClientMessage.ReadStreamEventsBackward(
-						corrId.Value,
-						corrId.Value,
-						BackwardReader.Envelope,
-						streamId,
-						fromEventNumber,
-						maxCount,
-						resolveLinks,
-						false,
-						null,
-						principal),
-				new ReadStreamEventsBackwardHandlers.Optimistic(action));
-		}
-
-		public Guid ReadBackward(
-			string streamId,
-			long fromEventNumber,
-			int maxCount,
-			bool resolveLinks,
-			ClaimsPrincipal principal,
-			Action<ClientMessage.ReadStreamEventsBackwardCompleted> action,
-			Action timeoutAction,
-			Guid corrId) {
-
-			var handler = new ReadStreamEventsBackwardHandlers.Tracking(
-				corrId,
-				_requestTracker,
-				new ReadStreamEventsBackwardHandlers.AdHoc(
-					handled: action,
-					notHandled: null,
-					timedout: timeoutAction));
-
-			BackwardReader.Publish(
-				new ClientMessage.ReadStreamEventsBackward(
-					corrId,
-					corrId,
-					BackwardReader.Envelope,
-					streamId,
-					fromEventNumber,
-					maxCount,
-					resolveLinks,
-					false,
-					null,
-					principal),
-				handler);
-
-			Delay(TimeSpan.FromMilliseconds(ReadTimeoutMs), BackwardReader, corrId);
-			return corrId;
-		}
-
-		public Guid ReadBackward(
-			string streamId,
-			long fromEventNumber,
-			int maxCount,
-			bool resolveLinks,
-			ClaimsPrincipal principal,
-			IReadStreamEventsBackwardHandler handler,
-			Guid corrId) {
-
-			var trackingHandler = new ReadStreamEventsBackwardHandlers.Tracking(
-				corrId, _requestTracker, handler);
-
-			BackwardReader.Publish(
-				new ClientMessage.ReadStreamEventsBackward(
-					corrId,
-					corrId,
-					BackwardReader.Envelope,
-					streamId,
-					fromEventNumber,
-					maxCount,
-					resolveLinks,
-					false,
-					null,
-					principal),
-				trackingHandler);
-
-			Delay(TimeSpan.FromMilliseconds(ReadTimeoutMs), BackwardReader, corrId);
-			return corrId;
-		}
-
-		public Guid ReadForward(
-			string streamId,
-			long fromEventNumber,
-			int maxCount,
-			bool resolveLinks,
-			ClaimsPrincipal principal,
-			Action<ClientMessage.ReadStreamEventsForwardCompleted> action,
-			Guid? corrId = null) {
-			if (!corrId.HasValue)
-				corrId = Guid.NewGuid();
-			return
-				ForwardReader.Publish(
-					new ClientMessage.ReadStreamEventsForward(
-						corrId.Value,
-						corrId.Value,
-						ForwardReader.Envelope,
-						streamId,
-						fromEventNumber,
-						maxCount,
-						resolveLinks,
-						false,
-						null,
-						principal,
-						replyOnExpired: false),
-					action);
-		}
-
-		public Guid ReadForward(
-			string streamId,
-			long fromEventNumber,
-			int maxCount,
-			bool resolveLinks,
-			ClaimsPrincipal principal,
-			Action<ClientMessage.ReadStreamEventsForwardCompleted> action,
-			Action timeoutAction,
-			Guid corrId) {
-			_requestTracker.AddPendingRead(corrId);
-
-			ForwardReader.Publish(
-				new ClientMessage.ReadStreamEventsForward(
-					corrId,
-					corrId,
-					ForwardReader.Envelope,
-					streamId,
-					fromEventNumber,
-					maxCount,
-					resolveLinks,
-					false,
-					null,
-					principal,
-					replyOnExpired: false),
-				res => {
-					if (_requestTracker.RemovePendingRead(res.CorrelationId)) {
-						action(res);
-					}
-				},
-				() => {
-					if (_requestTracker.RemovePendingRead(corrId)) {
-						timeoutAction();
-					}
-				});
-			Delay(TimeSpan.FromMilliseconds(ReadTimeoutMs), ForwardReader, corrId);
-			return corrId;
-		}
-		
-		public Guid ReadEvent(
-			string streamId,
-			long fromEventNumber,
-			ClaimsPrincipal principal,
-			Action<ClientMessage.ReadEventCompleted> action,
-			Action timeoutAction,
-			Guid corrId) {
-			_requestTracker.AddPendingRead(corrId);
-
-			EventReader.Publish(
-				new ClientMessage.ReadEvent(
-					corrId,
-					corrId,
-					EventReader.Envelope,
-					streamId,
-					fromEventNumber,
-					false,
-					false,
-					principal),
-				res => {
-					if (_requestTracker.RemovePendingRead(res.CorrelationId)) {
-						action(res);
-					}
-				},
-				() => {
-					if (_requestTracker.RemovePendingRead(corrId)) {
-						timeoutAction();
-					}
-				});
-			Delay(TimeSpan.FromMilliseconds(ReadTimeoutMs), EventReader, corrId);
-			return corrId;
-		}
-
-		public Guid ReadAllForward(
-			long commitPosition,
-			long preparePosition,
-			int maxCount,
-			bool resolveLinks,
-			bool requireLeader,
-			long? validationTfLastCommitPosition,
-			ClaimsPrincipal user,
-			TimeSpan? longPollTimeout,
-			Action<ClientMessage.ReadAllEventsForwardCompleted> action,
-			Action timeoutAction,
-			Guid corrId) {
-			_requestTracker.AddPendingRead(corrId);
-
-			AllForwardReader.Publish(
-				new ClientMessage.ReadAllEventsForward(
-					corrId,
-					corrId,
-					AllForwardReader.Envelope,
-					commitPosition,
-					preparePosition,
-					maxCount,
-					resolveLinks,
-					requireLeader,
-					validationTfLastCommitPosition,
-					user,
-					replyOnExpired: false,
-					longPollTimeout: longPollTimeout
-					),
-				res => {
-					if (_requestTracker.RemovePendingRead(res.CorrelationId)) {
-						action(res);
-					}
-				},
-				() => {
-					if (_requestTracker.RemovePendingRead(corrId)) {
-						timeoutAction();
-					}
-				});
-			Delay(TimeSpan.FromMilliseconds(ReadTimeoutMs), AllForwardReader, corrId);
-			return corrId;
-		}
-
-		public Guid ReadAllBackward(
-			long commitPosition,
-			long preparePosition,
-			int maxCount,
-			bool resolveLinks,
-			bool requireLeader,
-			long? validationTfLastCommitPosition,
-			ClaimsPrincipal user,
-			TimeSpan? longPollTimeout,
-			Action<ClientMessage.ReadAllEventsBackwardCompleted> action,
-			Action timeoutAction,
-			Guid corrId) {
-			_requestTracker.AddPendingRead(corrId);
-
-			AllBackwardReader.Publish(
-				new ClientMessage.ReadAllEventsBackward(
-					corrId,
-					corrId,
-					AllBackwardReader.Envelope,
-					commitPosition,
-					preparePosition,
-					maxCount,
-					resolveLinks,
-					requireLeader,
-					validationTfLastCommitPosition,
-					user
-				),
-				res => {
-					if (_requestTracker.RemovePendingRead(res.CorrelationId)) {
-						action(res);
-					}
-				},
-				() => {
-					if (_requestTracker.RemovePendingRead(corrId)) {
-						timeoutAction();
-					}
-				});
-			Delay(TimeSpan.FromMilliseconds(ReadTimeoutMs), AllBackwardReader, corrId);
-			return corrId;
-		}
-
-		public Guid ReadAllForwardFiltered(
-			long commitPosition,
-			long preparePosition,
-			int maxCount,
-			bool resolveLinks,
-			bool requireLeader,
-			int maxSearchWindow,
-			long? validationTfLastCommitPosition,
-			IEventFilter eventFilter,
-			ClaimsPrincipal user,
-			TimeSpan? longPollTimeout,
-			Action<ClientMessage.FilteredReadAllEventsForwardCompleted> action,
-			Action timeoutAction,
-			Guid corrId) {
-			_requestTracker.AddPendingRead(corrId);
-
-			AllForwardFilteredReader.Publish(
-				new ClientMessage.FilteredReadAllEventsForward(
-					corrId,
-					corrId,
-					AllForwardFilteredReader.Envelope,
-					commitPosition,
-					preparePosition,
-					maxCount,
-					resolveLinks,
-					requireLeader,
-					maxSearchWindow,
-					validationTfLastCommitPosition,
-					eventFilter,
-					user,
-					replyOnExpired: false,
-					longPollTimeout: longPollTimeout
-				),
-				res => {
-					if (_requestTracker.RemovePendingRead(res.CorrelationId)) {
-						action(res);
-					}
-				},
-				() => {
-					if (_requestTracker.RemovePendingRead(corrId)) {
-						timeoutAction();
-					}
-				});
-			Delay(TimeSpan.FromMilliseconds(ReadTimeoutMs), AllForwardFilteredReader, corrId);
-			return corrId;
-		}
-		
-		public Guid ReadAllBackwardFiltered(
-			long commitPosition,
-			long preparePosition,
-			int maxCount,
-			bool resolveLinks,
-			bool requireLeader,
-			int maxSearchWindow,
-			long? validationTfLastCommitPosition,
-			IEventFilter eventFilter,
-			ClaimsPrincipal user,
-			Action<ClientMessage.FilteredReadAllEventsBackwardCompleted> action,
-			Action timeoutAction,
-			Guid corrId) {
-			_requestTracker.AddPendingRead(corrId);
-
-			AllBackwardFilteredReader.Publish(
-				new ClientMessage.FilteredReadAllEventsBackward(
-					corrId,
-					corrId,
-					AllBackwardFilteredReader.Envelope,
-					commitPosition,
-					preparePosition,
-					maxCount,
-					resolveLinks,
-					requireLeader,
-					maxSearchWindow,
-					validationTfLastCommitPosition,
-					eventFilter,
-					user
-				),
-				res => {
-					if (_requestTracker.RemovePendingRead(res.CorrelationId)) {
-						action(res);
-					}
-				},
-				() => {
-					if (_requestTracker.RemovePendingRead(corrId)) {
-						timeoutAction();
-					}
-				});
-			Delay(TimeSpan.FromMilliseconds(ReadTimeoutMs), AllBackwardFilteredReader, corrId);
-			return corrId;
-		}
-
-		public void ConfigureStreamAndWriteEvents(
-			string streamId,
-			long expectedVersion,
-			Lazy<StreamMetadata> streamMetadata,
-			Event[] events,
-			ClaimsPrincipal principal,
-			Action<ClientMessage.WriteEventsCompleted> action) {
-			if (expectedVersion != ExpectedVersion.Any && expectedVersion != ExpectedVersion.NoStream)
-				WriteEvents(streamId, expectedVersion, events, principal, action);
-			else
-				ReadBackward(
-					streamId,
-					-1,
-					1,
-					false,
-					principal,
-					completed => {
-						switch (completed.Result) {
-							case ReadStreamResult.Success:
-							case ReadStreamResult.NoStream:
-								if (completed.Events != null && completed.Events.Length > 0)
-									WriteEvents(streamId, expectedVersion, events, principal, action);
-								else
-									UpdateStreamAcl(
-										streamId,
-										ExpectedVersion.Any,
-										principal,
-										streamMetadata.Value,
-										metaCompleted =>
-											WriteEvents(streamId, expectedVersion, events, principal, action));
-								break;
-							case ReadStreamResult.AccessDenied:
-								action(
-									new ClientMessage.WriteEventsCompleted(
-										Guid.NewGuid(),
-										OperationResult.AccessDenied,
-										""));
-								break;
-							case ReadStreamResult.StreamDeleted:
-								action(
-									new ClientMessage.WriteEventsCompleted(
-										Guid.NewGuid(),
-										OperationResult.StreamDeleted,
-										""));
-								break;
-							default:
-								throw new NotSupportedException();
-						}
-					});
-		}
-
-		public Guid WriteEvents(
-			string streamId,
-			long expectedVersion,
-			Event[] events,
-			ClaimsPrincipal principal,
-			Action<ClientMessage.WriteEventsCompleted> action) {
-			var corrId = Guid.NewGuid();
-			AddPendingRequest(corrId);
-			return
-				Writer.Publish(
-					new ClientMessage.WriteEvents(
-						corrId,
-						corrId,
-						Writer.Envelope,
-						false,
-						streamId,
-						expectedVersion,
-						events,
-						principal),
-					res => {
-						RemovePendingRequest(res.CorrelationId);
-						action(res);
-					});
-		}
-
-		private class PendingWrites {
-			private readonly Dictionary<Guid, Action<ClientMessage.WriteEventsCompleted>> _map;
-
-			public PendingWrites() {
-				_map = new Dictionary<Guid, Action<ClientMessage.WriteEventsCompleted>>();
-			}
-
-			public void CaptureCallback(Guid correlationId, Action<ClientMessage.WriteEventsCompleted> action) {
-				_map.Add(correlationId, action);
-			}
-
-			public void CompleteRequest(ClientMessage.WriteEventsCompleted message) {
-				Action<ClientMessage.WriteEventsCompleted> action;
-				if (_map.TryGetValue(message.CorrelationId, out action)) {
-					_map.Remove(message.CorrelationId);
-					action(message);
-				}
-			}
-		}
-
-		private class PendingReads {
-			private readonly HashSet<Guid> _pendingReads = new HashSet<Guid>();
-
-			public void Register(Guid id) {
-				_pendingReads.Add(id);
-			}
-
-			public bool IsRegistered(Guid id) {
-				var ret = _pendingReads.Contains(id);
-				return ret;
-			}
-
-			public void Remove(Guid id) {
-				_pendingReads.Remove(id);
-			}
-		}
-
-		private class WriterQueueSet {
-			private readonly Dictionary<Guid, WriterQueue> _queues;
-
-			public WriterQueueSet() {
-				_queues = new Dictionary<Guid, WriterQueue>();
-			}
-
-			public void AddToQueue(Guid key, ClientMessage.WriteEvents message) {
-				WriterQueue writerQueue;
-				if (!_queues.TryGetValue(key, out writerQueue)) {
-					writerQueue = new WriterQueue();
-					_queues.Add(key, writerQueue);
-				}
-
-				writerQueue.Enqueue(message);
-			}
-
-			public void Finish(Guid key) {
-				var queue = GetQueue(key);
-				if (queue == null) return;
-				queue.IsBusy = false;
-
-				CleanupQueue(key, queue);
-			}
-
-			public bool IsBusy(Guid key) =>
-				GetQueue(key)?.IsBusy ?? false;
-
-			public bool HasPendingWrites(Guid key) =>
-				GetQueue(key)?.Count > 0;
-
-			public ClientMessage.WriteEvents Dequeue(Guid key) =>
-				GetQueue(key)?.Dequeue();
-
-			private WriterQueue GetQueue(Guid key) {
-				WriterQueue queue;
-				_queues.TryGetValue(key, out queue);
-				return queue;
-			}
-
-			private void CleanupQueue(Guid key, WriterQueue queue) {
-				if (queue.IsBusy) return;
-				if (queue.Count > 0) return;
-				_queues.Remove(key);
-			}
-		}
-
-		private class WriterQueue {
-			private readonly Queue<ClientMessage.WriteEvents> _queue;
-			public bool IsBusy;
-			public int Count => _queue.Count;
-
-			public WriterQueue() {
-				IsBusy = false;
-				_queue = new Queue<ClientMessage.WriteEvents>();
-			}
-
-			public void Enqueue(ClientMessage.WriteEvents message) {
-				_queue.Enqueue(message);
-			}
-
-			public ClientMessage.WriteEvents Dequeue() {
-				if (_queue.Count == 0) return null;
-
-				IsBusy = true;
-
-				return _queue.Dequeue();
-			}
-		}
-
-		public Guid QueueWriteEvents(
-			Guid key,
-			string streamId,
-			long expectedVersion,
-			Event[] events,
-			ClaimsPrincipal principal,
-			Action<ClientMessage.WriteEventsCompleted> action) {
-			var corrId = Guid.NewGuid();
-			
-			var message = new ClientMessage.WriteEvents(
-				corrId,
-				corrId,
-				Writer.Envelope,
-				false,
-				streamId,
-				expectedVersion,
-				events,
-				principal);
-			_requestTracker.QueuePendingWrite(key, corrId, action, message, Writer);
-			
-			return corrId;
-		}
-
-		public Guid WriteEvent(
-			string streamId,
-			long expectedVersion,
-			Event @event,
-			ClaimsPrincipal principal,
-			Action<ClientMessage.WriteEventsCompleted> action) {
-			var corrId = Guid.NewGuid();
-			AddPendingRequest(corrId);
-			return
-				Writer.Publish(
-					new ClientMessage.WriteEvents(
-						corrId,
-						corrId,
-						Writer.Envelope,
-						false,
-						streamId,
-						expectedVersion,
-						new[] {@event},
-						principal),
-					res => {
-						RemovePendingRequest(res.CorrelationId);
-						action(res);
-					});
-		}
-
-		public Guid DeleteStream(
-			string streamId,
-			long expectedVersion,
-			bool hardDelete,
-			ClaimsPrincipal principal,
-			Action<ClientMessage.DeleteStreamCompleted> action) {
-			var corrId = Guid.NewGuid();
-			AddPendingRequest(corrId);
-			return StreamDeleter.Publish(
-				new ClientMessage.DeleteStream(
-					corrId,
-					corrId,
-					Writer.Envelope,
-					false,
-					streamId,
-					expectedVersion,
-					hardDelete,
-					principal),
-				res => {
-					RemovePendingRequest(res.CorrelationId);
-					action(res);
-				});
-		}
-
-		public void SubscribeAwake(
-			string streamId,
-			TFPos from,
-			Action<IODispatcherDelayedMessage> action,
-			Guid? correlationId = null) {
-			var corrId = correlationId ?? Guid.NewGuid();
-			AddPendingRequest(corrId);
-			Awaker.Publish(
-				new AwakeServiceMessage.SubscribeAwake(
-					Awaker.Envelope,
-					corrId,
-					streamId,
-					from,
-					new IODispatcherDelayedMessage(corrId, null)),
-				res => {
-					RemovePendingRequest(res.CorrelationId);
-					action(res);
-				});
-		}
-
-		public void UnsubscribeAwake(Guid correlationId) {
-			Awaker.Cancel(correlationId);
-		}
-
-		public void UpdateStreamAcl(
-			string streamId,
-			long expectedVersion,
-			ClaimsPrincipal principal,
-			StreamMetadata metadata,
-			Action<ClientMessage.WriteEventsCompleted> completed) {
-			WriteEvents(
-				SystemStreams.MetastreamOf(streamId),
-				expectedVersion,
-				new[] {new Event(Guid.NewGuid(), SystemEventTypes.StreamMetadata, true, metadata.ToJsonBytes(), null)},
-				principal,
-				completed);
-		}
-
-		public void Delay(TimeSpan delay, Action<Guid> timeout) {
-			_publisher.Publish(
-				TimerMessage.Schedule.Create(
-					delay,
-					_inputQueueEnvelope,
-					new IODispatcherDelayedMessage(_selfId, new AdHocCorrelatedTimeout(timeout))));
-		}
-
-		private void Delay(TimeSpan delay, ICorrelatedTimeout timeout, Guid messageCorrelationId) {
-			_publisher.Publish(
-				TimerMessage.Schedule.Create(
-					delay,
-					_inputQueueEnvelope,
-					new IODispatcherDelayedMessage(_selfId, timeout, messageCorrelationId)));
-		}
-
-		public void Handle(IODispatcherDelayedMessage message) {
-			if (_selfId != message.CorrelationId)
-				return;
-			message.Timeout();
-		}
-
-		public void Handle(ClientMessage.NotHandled message) {
-			// we do not remove the pending read here but only the pending request.
-			// the pending read will be removed when calling the timeout action
-			_requestTracker.RemovePendingRequest(message.CorrelationId);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Helpers/IODispatcherAsync.cs b/src/EventStore.Core/Helpers/IODispatcherAsync.cs
deleted file mode 100644
index 274e5034c70..00000000000
--- a/src/EventStore.Core/Helpers/IODispatcherAsync.cs
+++ /dev/null
@@ -1,331 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Core.Services.TimerService;
-using System.Threading;
-
-namespace EventStore.Core.Helpers {
-	public static class IODispatcherAsync {
-		public class CancellationScope {
-			private bool _cancelled = false;
-			private readonly HashSet<Guid> _ids = new HashSet<Guid>();
-
-			public Guid Register(Guid id) {
-				_ids.Add(id);
-				return id;
-			}
-
-			public bool Cancelled(Guid id) {
-				_ids.Remove(id);
-				return _cancelled;
-			}
-
-			public void Cancel() {
-				_cancelled = true;
-			}
-		}
-
-		public delegate void Step(IEnumerator<Step> nextSteps);
-
-		public static void Run(this IEnumerable<Step> actions) {
-			var actionsEnumerator = actions.GetEnumerator();
-			Run(actionsEnumerator);
-		}
-
-		public static void Run(this Step action) {
-			Run(new[] {action});
-		}
-
-		public static Step BeginReadForward(
-			this IODispatcher ioDispatcher,
-			CancellationScope cancellationScope,
-			string streamId,
-			long fromEventNumber,
-			int maxCount,
-			bool resolveLinks,
-			ClaimsPrincipal principal,
-			Action<ClientMessage.ReadStreamEventsForwardCompleted> handler,
-			Action timeoutHandler) {
-			return
-				steps => {
-					var corrId = Guid.NewGuid();
-					cancellationScope.Register(corrId);
-					ioDispatcher.ReadForward(
-						streamId,
-						fromEventNumber,
-						maxCount,
-						resolveLinks,
-						principal,
-						response => {
-							if (cancellationScope.Cancelled(response.CorrelationId)) return;
-							handler(response);
-							Run(steps);
-						},
-						() => {
-							if (cancellationScope.Cancelled(corrId)) return;
-							timeoutHandler();
-							Run(steps);
-						},
-						corrId);
-				};
-		}
-
-		public static Step BeginReadBackward(
-			this IODispatcher ioDispatcher,
-			CancellationScope cancellationScope,
-			string streamId,
-			long fromEventNumber,
-			int maxCount,
-			bool resolveLinks,
-			ClaimsPrincipal principal,
-			Action<ClientMessage.ReadStreamEventsBackwardCompleted> handler,
-			Action timeoutHandler) {
-			return
-				steps => {
-					var corrId = Guid.NewGuid();
-					cancellationScope.Register(corrId);
-					ioDispatcher.ReadBackward(
-						streamId,
-						fromEventNumber,
-						maxCount,
-						resolveLinks,
-						principal,
-						response => {
-							if (cancellationScope.Cancelled(response.CorrelationId)) return;
-							handler(response);
-							Run(steps);
-						},
-						() => {
-							if (cancellationScope.Cancelled(corrId)) return;
-							timeoutHandler();
-							Run(steps);
-						},
-						corrId);
-				};
-		}
-
-		public static Step BeginWriteEvents(
-			this IODispatcher ioDispatcher,
-			CancellationScope cancellationScope,
-			string streamId,
-			long expectedVersion,
-			ClaimsPrincipal principal,
-			Event[] events,
-			Action<ClientMessage.WriteEventsCompleted> handler) {
-			return
-				steps =>
-					WriteEventsWithRetry(ioDispatcher, cancellationScope, streamId, expectedVersion, principal, events,
-						handler, steps);
-		}
-
-		public static Step BeginDeleteStream(
-			this IODispatcher ioDispatcher,
-			CancellationScope cancellationScope,
-			string streamId,
-			long expectedVersion,
-			bool hardDelete,
-			ClaimsPrincipal principal,
-			Action<ClientMessage.DeleteStreamCompleted> handler) {
-			return
-				steps =>
-					DeleteStreamWithRetry(
-						ioDispatcher,
-						cancellationScope,
-						streamId,
-						expectedVersion,
-						hardDelete,
-						principal,
-						handler,
-						steps);
-		}
-
-		public static Step BeginSubscribeAwake(
-			this IODispatcher ioDispatcher,
-			CancellationScope cancellationScope,
-			string streamId,
-			TFPos from,
-			Action<IODispatcherDelayedMessage> handler,
-			Guid? correlationId = null) {
-			return steps => ioDispatcher.SubscribeAwake(
-				streamId,
-				@from,
-				message => {
-					if (cancellationScope.Cancelled(message.CorrelationId)) return;
-					handler(message);
-					Run(steps);
-				},
-				correlationId);
-		}
-
-		public static Step BeginUpdateStreamAcl(
-			this IODispatcher ioDispatcher,
-			CancellationScope cancellationScope,
-			string streamId,
-			long expectedVersion,
-			ClaimsPrincipal principal,
-			StreamMetadata metadata,
-			Action<ClientMessage.WriteEventsCompleted> handler) {
-			return
-				steps =>
-					UpdateStreamAclWithRetry(
-						ioDispatcher,
-						cancellationScope,
-						streamId,
-						expectedVersion,
-						principal,
-						metadata,
-						handler,
-						steps);
-		}
-
-		public static Step BeginDelay(
-			this IODispatcher ioDispatcher,
-			CancellationScope cancellationScope,
-			TimeSpan timeout,
-			Action handler) {
-			return steps => ioDispatcher.Delay(
-				timeout,
-				_ => {
-					if (cancellationScope.Cancelled(Guid.Empty)) return;
-					handler();
-					Run(steps);
-				});
-		}
-
-		private static void WriteEventsWithRetry(
-			this IODispatcher ioDispatcher,
-			CancellationScope cancellationScope,
-			string streamId,
-			long expectedVersion,
-			ClaimsPrincipal principal,
-			Event[] events,
-			Action<ClientMessage.WriteEventsCompleted> handler,
-			IEnumerator<Step> steps) {
-			PerformWithRetry(
-				ioDispatcher,
-				handler,
-				steps,
-				expectedVersion == ExpectedVersion.Any,
-				TimeSpan.FromMilliseconds(100),
-				action =>
-					cancellationScope.Register(
-						ioDispatcher.WriteEvents(
-							streamId,
-							expectedVersion,
-							events,
-							principal,
-							response => {
-								if (cancellationScope.Cancelled(response.CorrelationId)) return;
-								action(response, response.Result);
-							})));
-		}
-
-		private static void DeleteStreamWithRetry(
-			this IODispatcher ioDispatcher,
-			CancellationScope cancellationScope,
-			string streamId,
-			long expectedVersion,
-			bool hardDelete,
-			ClaimsPrincipal principal,
-			Action<ClientMessage.DeleteStreamCompleted> handler,
-			IEnumerator<Step> steps) {
-			PerformWithRetry(
-				ioDispatcher,
-				handler,
-				steps,
-				expectedVersion == ExpectedVersion.Any,
-				TimeSpan.FromMilliseconds(100),
-				action =>
-					cancellationScope.Register(
-						ioDispatcher.DeleteStream(
-							streamId,
-							expectedVersion,
-							hardDelete,
-							principal,
-							response => {
-								if (cancellationScope.Cancelled(response.CorrelationId)) return;
-								action(response, response.Result);
-							})));
-		}
-
-
-		private static void UpdateStreamAclWithRetry(
-			this IODispatcher ioDispatcher,
-			CancellationScope cancellationScope,
-			string streamId,
-			long expectedVersion,
-			ClaimsPrincipal principal,
-			StreamMetadata metadata,
-			Action<ClientMessage.WriteEventsCompleted> handler,
-			IEnumerator<Step> steps) {
-			PerformWithRetry(
-				ioDispatcher,
-				handler,
-				steps,
-				expectedVersion == ExpectedVersion.Any,
-				TimeSpan.FromMilliseconds(100),
-				action =>
-					cancellationScope.Register(
-						ioDispatcher.WriteEvents(
-							SystemStreams.MetastreamOf(streamId),
-							expectedVersion,
-							new[] {
-								new Event(Guid.NewGuid(), SystemEventTypes.StreamMetadata, true, metadata.ToJsonBytes(),
-									null)
-							},
-							principal,
-							response => {
-								if (cancellationScope.Cancelled(response.CorrelationId)) return;
-								action(response, response.Result);
-							})));
-		}
-
-		private static void PerformWithRetry<T>(
-			this IODispatcher ioDispatcher,
-			Action<T> handler,
-			IEnumerator<Step> steps,
-			bool retryExpectedVersion,
-			TimeSpan timeout,
-			Action<Action<T, OperationResult>> action) {
-			action(
-				(response, result) => {
-					if (ShouldRetry(result, retryExpectedVersion)) {
-						ioDispatcher.Delay(
-							timeout,
-							_ => {
-								if (timeout < TimeSpan.FromSeconds(10))
-									timeout += timeout;
-								PerformWithRetry(ioDispatcher, handler, steps, retryExpectedVersion, timeout, action);
-							});
-					} else {
-						handler(response);
-						Run(steps);
-					}
-				});
-		}
-
-		private static bool ShouldRetry(OperationResult result, bool retryExpectedVersion) {
-			switch (result) {
-				case OperationResult.CommitTimeout:
-				case OperationResult.ForwardTimeout:
-				case OperationResult.PrepareTimeout:
-					return true;
-				case OperationResult.WrongExpectedVersion:
-					return retryExpectedVersion;
-				default:
-					return false;
-			}
-		}
-
-		private static void Run(IEnumerator<Step> actions) {
-			if (actions.MoveNext()) {
-				var action = actions.Current;
-				action(actions);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Helpers/IODispatcherDelayedMessage.cs b/src/EventStore.Core/Helpers/IODispatcherDelayedMessage.cs
deleted file mode 100644
index b4745dfaee2..00000000000
--- a/src/EventStore.Core/Helpers/IODispatcherDelayedMessage.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Helpers {
-	[DerivedMessage(CoreMessage.IODispatcher)]
-	public sealed partial class IODispatcherDelayedMessage : Message {
-		private readonly Guid _correlationId;
-		private readonly ICorrelatedTimeout _timeout;
-		private readonly Guid? _messageCorrelationId;
-
-		public IODispatcherDelayedMessage(Guid correlationId, ICorrelatedTimeout timeout) {
-			_timeout = timeout;
-			_correlationId = correlationId;
-		}
-
-		public IODispatcherDelayedMessage(Guid correlationId, ICorrelatedTimeout timeout, Guid messageCorrelationId) {
-			_timeout = timeout;
-			_correlationId = correlationId;
-			_messageCorrelationId = messageCorrelationId;
-		}
-
-		public void Timeout() {
-			_timeout.Timeout(_messageCorrelationId ?? Guid.Empty);
-		}
-
-		public Guid CorrelationId {
-			get { return _correlationId; }
-		}
-
-		public Guid? MessageCorrelationId {
-			get { return _messageCorrelationId; }
-		}
-	}
-}
diff --git a/src/EventStore.Core/Helpers/LengthPrefixSuffixFramer.cs b/src/EventStore.Core/Helpers/LengthPrefixSuffixFramer.cs
deleted file mode 100644
index 24df1eea41f..00000000000
--- a/src/EventStore.Core/Helpers/LengthPrefixSuffixFramer.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using EventStore.Common.Utils;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Transport.Tcp.Framing;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Helpers {
-	public class LengthPrefixSuffixFramer : IMessageFramer<BinaryReader> {
-		private static readonly ILogger Log = Serilog.Log.ForContext<LengthPrefixSuffixFramer>();
-
-		private const int PrefixLength = sizeof(int);
-
-		public bool HasData {
-			get { return _memStream.Length > 0; }
-		}
-
-		private readonly int _maxPackageSize;
-		private Action<BinaryReader> _packageHandler = _ => { };
-
-		private readonly MemoryStream _memStream;
-		private readonly BinaryReader _binaryReader;
-
-		private int _prefixBytes;
-		private int _packageLength;
-
-		public LengthPrefixSuffixFramer(int maxPackageSize = TFConsts.MaxLogRecordSize) {
-			Ensure.Positive(maxPackageSize, "maxPackageSize");
-
-			_maxPackageSize = maxPackageSize;
-			_memStream = new MemoryStream();
-			_binaryReader = new BinaryReader(_memStream);
-		}
-
-		public void Reset() {
-			_memStream.SetLength(0);
-			_prefixBytes = 0;
-			_packageLength = 0;
-		}
-
-		public void UnFrameData(IEnumerable<ArraySegment<byte>> data) {
-			Ensure.NotNull(data, nameof(data));
-
-			foreach (ArraySegment<byte> buffer in data) {
-				Parse(buffer);
-			}
-		}
-
-		public void RegisterMessageArrivedCallback(Action<BinaryReader> packageHandler) {
-			Ensure.NotNull(packageHandler, nameof(packageHandler));
-			_packageHandler = packageHandler;
-		}
-
-		public void UnFrameData(ArraySegment<byte> data) {
-			Parse(data);
-		}
-
-		/// <summary>
-		/// Parses a stream chunking based on length-prefixed-suffixed framing. Calls are re-entrant and hold state internally.
-		/// </summary>
-		/// <param name="bytes">A byte array of data to append.</param>
-		private void Parse(ArraySegment<byte> bytes) {
-			byte[] data = bytes.Array;
-			for (int i = bytes.Offset; i < bytes.Offset + bytes.Count;) {
-				if (_prefixBytes < PrefixLength) {
-					_packageLength |= (data[i] << (_prefixBytes * 8)); // little-endian order
-					_prefixBytes += 1;
-					i += 1;
-					if (_prefixBytes == PrefixLength) {
-						if (_packageLength <= 0 || _packageLength > _maxPackageSize) {
-							Log.Error("FRAMING ERROR! Data:\n{data}", Helper.FormatBinaryDump(bytes));
-							throw new PackageFramingException(string.Format(
-								"Package size is out of bounds: {0} (max: {1}).",
-								_packageLength, _maxPackageSize));
-						}
-
-						_packageLength += PrefixLength; // we need to read suffix as well
-					}
-				} else {
-					int copyCnt = Math.Min(bytes.Count + bytes.Offset - i, _packageLength - (int)_memStream.Length);
-					_memStream.Write(bytes.Array, i, copyCnt);
-					i += copyCnt;
-
-					if (_memStream.Length == _packageLength) {
-#if DEBUG
-						var buf = _memStream.GetBuffer();
-						int suffixLength = (buf[_packageLength - 4] << 0)
-						                   | (buf[_packageLength - 3] << 8)
-						                   | (buf[_packageLength - 2] << 16)
-						                   | (buf[_packageLength - 1] << 24);
-						if (_packageLength - PrefixLength != suffixLength) {
-							throw new Exception(string.Format("Prefix length: {0} is not equal to suffix length: {1}.",
-								_packageLength - PrefixLength, suffixLength));
-						}
-#endif
-						_memStream.SetLength(_packageLength - PrefixLength); // remove suffix length
-						_memStream.Position = 0;
-
-						_packageHandler(_binaryReader);
-
-						_memStream.SetLength(0);
-						_prefixBytes = 0;
-						_packageLength = 0;
-					}
-				}
-			}
-		}
-
-		public IEnumerable<ArraySegment<byte>> FrameData(ArraySegment<byte> data) {
-			var length = data.Count;
-
-			var lengthArray = new ArraySegment<byte>(
-				new[] {(byte)length, (byte)(length >> 8), (byte)(length >> 16), (byte)(length >> 24)});
-			yield return lengthArray;
-			yield return data;
-			yield return lengthArray;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Helpers/NoOpAction.cs b/src/EventStore.Core/Helpers/NoOpAction.cs
deleted file mode 100644
index b5360c30569..00000000000
--- a/src/EventStore.Core/Helpers/NoOpAction.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-
-namespace EventStore.Core.Helpers {
-	public class NoOpAction {
-		public static Action Instance { get; } = () => { };
-	}
-
-	public class NoOpAction<T> {
-		public static Action<T> Instance { get; } = _ => { };
-	}
-
-	public static class ActionExtensions {
-		public static Action OrNoOp(this Action self) => self ?? NoOpAction.Instance;
-		public static Action<T> OrNoOp<T>(this Action<T> self) => self ?? NoOpAction<T>.Instance;
-	}
-}
diff --git a/src/EventStore.Core/Helpers/ReadStreamEventsBackwardHandlers.cs b/src/EventStore.Core/Helpers/ReadStreamEventsBackwardHandlers.cs
deleted file mode 100644
index d59936abe37..00000000000
--- a/src/EventStore.Core/Helpers/ReadStreamEventsBackwardHandlers.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Common.Utils;
-using static EventStore.Core.Helpers.IODispatcher;
-
-namespace EventStore.Core.Helpers {
-	public interface IReadStreamEventsBackwardHandler :
-		IHandle<ClientMessage.ReadStreamEventsBackwardCompleted>,
-		IHandleAlt<ClientMessage.NotHandled>,
-		IHandleTimeout {
-	}
-
-	public static class ReadStreamEventsBackwardHandlers {
-		// Adds and removes from a tracker so it knows what is outstanding
-		public class Tracking : IReadStreamEventsBackwardHandler {
-			private readonly Guid _correlationId;
-			private readonly RequestTracking _requestTracker;
-			private readonly IReadStreamEventsBackwardHandler _wrapped;
-
-			public Tracking(
-				Guid correlationId,
-				RequestTracking requestTracker,
-				IReadStreamEventsBackwardHandler wrapped) {
-
-				Ensure.NotNull(requestTracker, nameof(requestTracker));
-				Ensure.NotNull(wrapped, nameof(wrapped));
-
-				_correlationId = correlationId;
-				_requestTracker = requestTracker;
-				_wrapped = wrapped;
-
-				_requestTracker.AddPendingRead(correlationId);
-			}
-
-			public bool HandlesAlt => _wrapped.HandlesAlt;
-			public bool HandlesTimeout => _wrapped.HandlesTimeout;
-
-			public void Handle(ClientMessage.ReadStreamEventsBackwardCompleted message) {
-				if (_requestTracker.RemovePendingRead(message.CorrelationId)) {
-					_wrapped.Handle(message);
-				}
-			}
-
-			public void Handle(ClientMessage.NotHandled message) {
-				if (_requestTracker.RemovePendingRead(message.CorrelationId)) {
-					_wrapped.Handle(message);
-				}
-			}
-
-			public void Timeout() {
-				if (_requestTracker.RemovePendingRead(_correlationId)) {
-					_wrapped.Timeout();
-				}
-			}
-		}
-
-		// todo: move away from this and towards bespoke implementations (like AuthReadResponseHandler) to avoid having to
-		// allocate all these delegates
-		public class AdHoc : IReadStreamEventsBackwardHandler {
-			private readonly Action<ClientMessage.ReadStreamEventsBackwardCompleted> _handled;
-			private readonly Action<ClientMessage.NotHandled> _notHandled;
-			private readonly Action _timedout;
-
-			public AdHoc(
-				Action<ClientMessage.ReadStreamEventsBackwardCompleted> handled,
-				Action<ClientMessage.NotHandled> notHandled,
-				Action timedout) {
-
-				Ensure.NotNull(handled, nameof(handled));
-
-				HandlesAlt = notHandled is not null;
-				HandlesTimeout = timedout is not null;
-				_handled = handled;
-				_notHandled = notHandled.OrNoOp();
-				_timedout = timedout.OrNoOp();
-			}
-
-			public bool HandlesAlt { get; }
-			public bool HandlesTimeout { get; }
-
-			public void Handle(ClientMessage.ReadStreamEventsBackwardCompleted message) {
-				_handled(message);
-			}
-
-			public void Handle(ClientMessage.NotHandled message) {
-				_notHandled(message);
-			}
-
-			public void Timeout() {
-				_timedout();
-			}
-		}
-
-		// Assumes the request will eventually receive a reponse of the expected type
-		// And not be dropped due to timeout or responded to with a different message
-		public class Optimistic : AdHoc {
-			public Optimistic(
-				Action<ClientMessage.ReadStreamEventsBackwardCompleted> handle) : base(
-					handle, null, null) {
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Helpers/ReusableBuffer.cs b/src/EventStore.Core/Helpers/ReusableBuffer.cs
deleted file mode 100644
index 2ec4674c154..00000000000
--- a/src/EventStore.Core/Helpers/ReusableBuffer.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System;
-using System.Runtime.CompilerServices;
-using System.Threading;
-
-namespace EventStore.Core.Helpers {
-	// Thread-safe reusable buffer: similar concept as an ArrayPool<byte> but has only one buffer and one user at a time.
-	// If used correctly, there should not be any contention since there can be only one user of the buffer at a time.
-	// However, some synchronization is done since the AcquireAs*() and Release() methods are allowed to be called from
-	// different threads.
-	public class ReusableBuffer {
-		private byte[] _buffer;
-		private int _state;
-
-		private enum State {
-			Free = 0,
-			LockedToAcquire = 1,
-			Acquired = 2,
-		}
-
-		public ReusableBuffer(int defaultSize) {
-			if (defaultSize <= 0)
-				throw new ArgumentOutOfRangeException(nameof(defaultSize), "default size must be positive");
-
-			_buffer = new byte[ClosestPowerOf2(defaultSize)];
-			_state = (int)State.Free;
-		}
-
-		private static int ClosestPowerOf2(int x) {
-			int y = 0;
-			while (x > 0) {
-				x >>= 1;
-				y++;
-			}
-
-			if (y >= 31)
-				throw new ArgumentOutOfRangeException();
-
-			return 1 << y;
-		}
-
-		// Note: The acquired buffer size can be larger than the requested size
-		// It is better to use AcquireAsSpan() or AcquireAsMemory() where possible.
-		public byte[] AcquireAsByteArray(int size) {
-			if (size <= 0)
-				throw new ArgumentOutOfRangeException(nameof(size), "size must be positive");
-
-			TrySwitchState(State.Free, State.LockedToAcquire);
-
-			if (_buffer.Length < size)
-				_buffer = new byte[ClosestPowerOf2(size)];
-
-			TrySwitchState(State.LockedToAcquire, State.Acquired);
-			return _buffer;
-		}
-
-		public Span<byte> AcquireAsSpan(int size) => AcquireAsByteArray(size).AsSpan(0, size);
-
-		public Memory<byte> AcquireAsMemory(int size) => AcquireAsByteArray(size).AsMemory(0, size);
-
-		public void Release() {
-			TrySwitchState(State.Acquired, State.Free);
-		}
-
-		[MethodImpl(MethodImplOptions.AggressiveInlining)]
-		private void TrySwitchState(State from, State to) {
-			var was = (State)Interlocked.CompareExchange(ref _state, (int)to, (int)from);
-			if (was != from)
-				throw new InvalidOperationException($"Failed to transition buffer from state: {from} to {to}. Was {was}.");
-		}
-	}
-}
diff --git a/src/EventStore.Core/Helpers/StreamVersionConverter.cs b/src/EventStore.Core/Helpers/StreamVersionConverter.cs
deleted file mode 100644
index f395cc8e2b4..00000000000
--- a/src/EventStore.Core/Helpers/StreamVersionConverter.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-
-namespace EventStore.Core.Helpers {
-	public static class StreamVersionConverter {
-		public static int Downgrade(long expectedVersion) {
-			if (expectedVersion == long.MaxValue) {
-				return int.MaxValue;
-			}
-
-			return (int)expectedVersion;
-		}
-
-		public static long Upgrade(long expectedVersion) {
-			return expectedVersion == int.MaxValue ? long.MaxValue : expectedVersion;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Index/AddResult.cs b/src/EventStore.Core/Index/AddResult.cs
deleted file mode 100644
index 0d02e554ee7..00000000000
--- a/src/EventStore.Core/Index/AddResult.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Collections.Generic;
-
-namespace EventStore.Core.Index {
-	public class AddResult {
-		public readonly IndexMap NewMap;
-		public readonly bool CanMergeAny;
-
-		public AddResult(IndexMap newMap, bool canMergeAny) {
-			NewMap = newMap;
-			CanMergeAny = canMergeAny;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Index/FileType.cs b/src/EventStore.Core/Index/FileType.cs
deleted file mode 100644
index 79fbf4daa3d..00000000000
--- a/src/EventStore.Core/Index/FileType.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EventStore.Core.Index
-{
-	public enum FileType : byte {
-		PTableFile = 1,
-		ChunkFile = 2
-	}
-}
diff --git a/src/EventStore.Core/Index/GuidFilenameProvider.cs b/src/EventStore.Core/Index/GuidFilenameProvider.cs
deleted file mode 100644
index 06b7784fb46..00000000000
--- a/src/EventStore.Core/Index/GuidFilenameProvider.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.IO;
-
-namespace EventStore.Core.Index {
-	public class GuidFilenameProvider : IIndexFilenameProvider {
-		private readonly string _directory;
-
-		public GuidFilenameProvider(string directory) {
-			_directory = directory;
-		}
-
-		public string GetFilenameNewTable() {
-			return Path.Combine(_directory, Guid.NewGuid().ToString());
-		}
-	}
-}
diff --git a/src/EventStore.Core/Index/HashListMemTable.cs b/src/EventStore.Core/Index/HashListMemTable.cs
deleted file mode 100644
index 53b68470df9..00000000000
--- a/src/EventStore.Core/Index/HashListMemTable.cs
+++ /dev/null
@@ -1,345 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Exceptions;
-
-namespace EventStore.Core.Index {
-	public class HashListMemTable : IMemTable, ISearchTable {
-		private static readonly IComparer<Entry> MemTableComparer = new EventNumberComparer();
-		private static readonly IComparer<Entry> LogPosComparer = new LogPositionComparer();
-
-		public long Count {
-			get { return _count; }
-		}
-
-		public Guid Id {
-			get { return _id; }
-		}
-
-		public byte Version {
-			get { return _version; }
-		}
-
-		private readonly ConcurrentDictionary<ulong, SortedList<Entry, byte>> _hash;
-		private readonly Guid _id = Guid.NewGuid();
-		private readonly byte _version;
-		private int _count;
-
-		private int _isConverting;
-
-		public HashListMemTable(byte version, int maxSize) {
-			_version = version;
-			_hash = new ConcurrentDictionary<ulong, SortedList<Entry, byte>>();
-		}
-
-		public bool MarkForConversion() {
-			return Interlocked.CompareExchange(ref _isConverting, 1, 0) == 0;
-		}
-
-		public void Add(ulong stream, long version, long position) {
-			AddEntries(new[] {new IndexEntry(stream, version, position)});
-		}
-
-		public void AddEntries(IList<IndexEntry> entries) {
-			Ensure.NotNull(entries, "entries");
-			Ensure.Positive(entries.Count, "entries.Count");
-
-			var collection = entries.Select(x => new IndexEntry(GetHash(x.Stream), x.Version, x.Position)).ToList();
-
-			// only one thread at a time can write
-			Interlocked.Add(ref _count, collection.Count);
-
-			var stream = collection[0].Stream; // NOTE: all entries should have the same stream
-			SortedList<Entry, byte> list = null;
-			try {
-
-			if (!_hash.TryGetValue(stream, out list)) {
-				list = new SortedList<Entry, byte>(MemTableComparer);
-				if (!Monitor.TryEnter(list, 10000))
-					throw new UnableToAcquireLockInReasonableTimeException();
-				_hash.AddOrUpdate(stream, list,
-					(x, y) => {
-						throw new Exception("This should never happen as MemTable updates are single-threaded.");
-					});
-			} else{
-				if (!Monitor.TryEnter(list, 10000))
-					throw new UnableToAcquireLockInReasonableTimeException();
-			}
-
-				for (int i = 0, n = collection.Count; i < n; ++i) {
-					var entry = collection[i];
-					if (entry.Stream != stream)
-						throw new Exception("Not all index entries in a bulk have the same stream hash.");
-					Ensure.Nonnegative(entry.Version, "entry.Version");
-					Ensure.Nonnegative(entry.Position, "entry.Position");
-					list.Add(new Entry(entry.Version, entry.Position), 0);
-				}
-			} finally {
-				if(list != null)
-					Monitor.Exit(list);
-			}
-		}
-
-		public bool TryGetOneValue(ulong stream, long number, out long position) {
-			if (number < 0)
-				throw new ArgumentOutOfRangeException("number");
-			ulong hash = GetHash(stream);
-
-			position = 0;
-
-			SortedList<Entry, byte> list;
-			if (_hash.TryGetValue(hash, out list)) {
-				if (!Monitor.TryEnter(list, 10000)) throw new UnableToAcquireLockInReasonableTimeException();
-				try {
-					int endIdx = list.UpperBound(new Entry(number, long.MaxValue));
-					if (endIdx == -1)
-						return false;
-
-					var key = list.Keys[endIdx];
-					if (key.EvNum == number) {
-						position = key.LogPos;
-						return true;
-					}
-				} finally {
-					Monitor.Exit(list);
-				}
-			}
-
-			return false;
-		}
-
-		public bool TryGetLatestEntry(ulong stream, out IndexEntry entry) {
-			ulong hash = GetHash(stream);
-			entry = TableIndex.InvalidIndexEntry;
-
-			SortedList<Entry, byte> list;
-			if (_hash.TryGetValue(hash, out list)) {
-				if (!Monitor.TryEnter(list, 10000))
-					throw new UnableToAcquireLockInReasonableTimeException();
-				try {
-					var latest = list.Keys[list.Count - 1];
-					entry = new IndexEntry(hash, latest.EvNum, latest.LogPos);
-					return true;
-				} finally {
-					Monitor.Exit(list);
-				}
-			}
-
-			return false;
-		}
-
-		public bool TryGetLatestEntry(ulong stream, long beforePosition, Func<IndexEntry, bool> isForThisStream, out IndexEntry entry) {
-			if (beforePosition < 0)
-				throw new ArgumentOutOfRangeException(nameof(beforePosition));
-
-			ulong hash = GetHash(stream);
-			entry = TableIndex.InvalidIndexEntry;
-
-			if (!_hash.TryGetValue(hash, out var list))
-				return false;
-
-			if (!Monitor.TryEnter(list, 10000))
-				throw new UnableToAcquireLockInReasonableTimeException();
-
-			try {
-				// we use LogPosComparer here so that it only compares the position part of the key we
-				// are passing in and not the evNum (maxvalue) which is meaningless
-				int endIdx = list.UpperBound(
-					key: new Entry(long.MaxValue, beforePosition - 1),
-					comparer: LogPosComparer,
-					continueSearch: e => isForThisStream(new IndexEntry(hash, e.EvNum, e.LogPos)));
-
-				if (endIdx == -1)
-					return false;
-
-				var latestBeforePosition = list.Keys[endIdx];
-				entry = new IndexEntry(hash, latestBeforePosition.EvNum, latestBeforePosition.LogPos);
-				return true;
-			} catch (SearchStoppedException) {
-				// fall back to linear search if there was a hash collision
-				int maxIdx = list.FindMax(e =>
-					e.LogPos < beforePosition &&
-					isForThisStream(new IndexEntry(hash, e.EvNum, e.LogPos)));
-
-				if (maxIdx == -1)
-					return false;
-
-				var latestBeforePosition = list.Keys[maxIdx];
-				entry = new IndexEntry(hash, latestBeforePosition.EvNum, latestBeforePosition.LogPos);
-				return true;
-			} finally {
-				Monitor.Exit(list);
-			}
-		}
-
-		public bool TryGetOldestEntry(ulong stream, out IndexEntry entry) {
-			ulong hash = GetHash(stream);
-			entry = TableIndex.InvalidIndexEntry;
-
-			SortedList<Entry, byte> list;
-			if (_hash.TryGetValue(hash, out list)) {
-				if (!Monitor.TryEnter(list, 10000))
-					throw new UnableToAcquireLockInReasonableTimeException();
-				try {
-					var oldest = list.Keys[0];
-					entry = new IndexEntry(hash, oldest.EvNum, oldest.LogPos);
-					return true;
-				} finally {
-					Monitor.Exit(list);
-				}
-			}
-
-			return false;
-		}
-
-		public bool TryGetNextEntry(ulong stream, long afterNumber, out IndexEntry entry) {
-			if (afterNumber < 0)
-				throw new ArgumentOutOfRangeException(nameof(afterNumber));
-
-			ulong hash = GetHash(stream);
-			entry = TableIndex.InvalidIndexEntry;
-
-			if (afterNumber >= long.MaxValue)
-				return false;
-
-			SortedList<Entry, byte> list;
-			if (_hash.TryGetValue(hash, out list)) {
-				if (!Monitor.TryEnter(list, 10000))
-					throw new UnableToAcquireLockInReasonableTimeException();
-				try {
-					int endIdx = list.LowerBound(new Entry(afterNumber + 1, 0));
-					if (endIdx == -1)
-						return false;
-
-					var e = list.Keys[endIdx];
-					entry = new IndexEntry(hash, e.EvNum, e.LogPos);
-					return true;
-				} finally {
-					Monitor.Exit(list);
-				}
-			}
-
-			return false;
-		}
-
-		public bool TryGetPreviousEntry(ulong stream, long beforeNumber, out IndexEntry entry) {
-			if (beforeNumber < 0)
-				throw new ArgumentOutOfRangeException(nameof(beforeNumber));
-
-			ulong hash = GetHash(stream);
-			entry = TableIndex.InvalidIndexEntry;
-
-			if (beforeNumber <= 0)
-				return false;
-
-			SortedList<Entry, byte> list;
-			if (_hash.TryGetValue(hash, out list)) {
-				if (!Monitor.TryEnter(list, 10000))
-					throw new UnableToAcquireLockInReasonableTimeException();
-				try {
-					int endIdx = list.UpperBound(new Entry(beforeNumber - 1, long.MaxValue));
-					if (endIdx == -1)
-						return false;
-
-					var e = list.Keys[endIdx];
-					entry = new IndexEntry(hash, e.EvNum, e.LogPos);
-					return true;
-				} finally {
-					Monitor.Exit(list);
-				}
-			}
-
-			return false;
-		}
-
-		public IEnumerable<IndexEntry> IterateAllInOrder() {
-			//Log.Trace("Sorting array in HashListMemTable.IterateAllInOrder...");
-
-			var keys = _hash.Keys.ToArray();
-			Array.Sort(keys, new ReverseComparer<ulong>());
-
-			foreach (var key in keys) {
-				var list = _hash[key];
-				for (int i = list.Count - 1; i >= 0; --i) {
-					var x = list.Keys[i];
-					yield return new IndexEntry(key, x.EvNum, x.LogPos);
-				}
-			}
-
-			//Log.Trace("Sorting array in HashListMemTable.IterateAllInOrder... DONE!");
-		}
-
-		public void Clear() {
-			_hash.Clear();
-		}
-
-		public IList<IndexEntry> GetRange(ulong stream, long startNumber, long endNumber, int? limit = null) {
-			if (startNumber < 0)
-				throw new ArgumentOutOfRangeException("startNumber");
-			if (endNumber < 0)
-				throw new ArgumentOutOfRangeException("endNumber");
-
-			ulong hash = GetHash(stream);
-			var ret = new List<IndexEntry>();
-
-			SortedList<Entry, byte> list;
-			if (_hash.TryGetValue(hash, out list)) {
-				if (!Monitor.TryEnter(list, 10000)) throw new UnableToAcquireLockInReasonableTimeException();
-				try {
-					var endIdx = list.UpperBound(new Entry(endNumber, long.MaxValue));
-					for (int i = endIdx; i >= 0; i--) {
-						var key = list.Keys[i];
-						if (key.EvNum < startNumber || ret.Count == limit)
-							break;
-						ret.Add(new IndexEntry(hash, version: key.EvNum, position: key.LogPos));
-					}
-				} finally {
-					Monitor.Exit(list);
-				}
-			}
-
-			return ret;
-		}
-
-		private ulong GetHash(ulong hash) {
-			return _version == PTableVersions.IndexV1 ? hash >> 32 : hash;
-		}
-
-		private struct Entry {
-			public readonly long EvNum;
-			public readonly long LogPos;
-
-			public Entry(long evNum, long logPos) {
-				EvNum = evNum;
-				LogPos = logPos;
-			}
-		}
-
-		private class EventNumberComparer : IComparer<Entry> {
-			public int Compare(Entry x, Entry y) {
-				if (x.EvNum < y.EvNum) return -1;
-				if (x.EvNum > y.EvNum) return 1;
-				if (x.LogPos < y.LogPos) return -1;
-				if (x.LogPos > y.LogPos) return 1;
-				return 0;
-			}
-		}
-
-		private class LogPositionComparer : IComparer<Entry> {
-			public int Compare(Entry x, Entry y) {
-				if (x.LogPos < y.LogPos) return -1;
-				if (x.LogPos > y.LogPos) return 1;
-				return 0;
-			}
-		}
-	}
-
-	public class ReverseComparer<T> : IComparer<T> where T : IComparable {
-		public int Compare(T x, T y) {
-			return -x.CompareTo(y);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Index/Hashes/CompositeHasher.cs b/src/EventStore.Core/Index/Hashes/CompositeHasher.cs
deleted file mode 100644
index bcd89f6f780..00000000000
--- a/src/EventStore.Core/Index/Hashes/CompositeHasher.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace EventStore.Core.Index.Hashes {
-	public class CompositeHasher<T> : ILongHasher<T> {
-		private readonly IHasher<T> _lowHasher;
-		private readonly IHasher<T> _highHasher;
-
-		public CompositeHasher(IHasher<T> lowHasher, IHasher<T> highHasher) {
-			_lowHasher = lowHasher;
-			_highHasher = highHasher;
-		}
-
-		public ulong Hash(T x) {
-			// same way around as Tableindex for consistency.
-			return (ulong)_lowHasher.Hash(x) << 32 | _highHasher.Hash(x);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Index/Hashes/IHasher.cs b/src/EventStore.Core/Index/Hashes/IHasher.cs
deleted file mode 100644
index 56a2cb39309..00000000000
--- a/src/EventStore.Core/Index/Hashes/IHasher.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-
-namespace EventStore.Core.Index.Hashes {
-	public interface IHasher {
-		uint Hash(byte[] data);
-		uint Hash(byte[] data, int offset, uint len, uint seed);
-		uint Hash(ReadOnlySpan<byte> data);
-	}
-
-	public interface IHasher<TStreamId> {
-		uint Hash(TStreamId s);
-	}
-
-	public interface ILongHasher<T> {
-		ulong Hash(T x);
-	}
-}
diff --git a/src/EventStore.Core/Index/Hashes/Murmur2Unsafe.cs b/src/EventStore.Core/Index/Hashes/Murmur2Unsafe.cs
deleted file mode 100644
index 5968c70f373..00000000000
--- a/src/EventStore.Core/Index/Hashes/Murmur2Unsafe.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using System;
-
-namespace EventStore.Core.Index.Hashes {
-	public class Murmur2Unsafe : IHasher, IHasher<string> {
-		private const uint Seed = 0xc58f1a7b;
-
-		private const UInt32 m = 0x5bd1e995;
-		private const Int32 r = 24;
-
-		public unsafe UInt32 Hash(string s) {
-			fixed (char* input = s) {
-				return Hash((byte*)input, (uint)s.Length * sizeof(char), Seed);
-			}
-		}
-
-		public unsafe uint Hash(byte[] data) {
-			fixed (byte* input = &data[0]) {
-				return Hash(input, (uint)data.Length, Seed);
-			}
-		}
-
-		public unsafe uint Hash(byte[] data, int offset, uint len, uint seed) {
-			fixed (byte* input = &data[offset]) {
-				return Hash(input, len, seed);
-			}
-		}
-
-		public unsafe uint Hash(ReadOnlySpan<byte> data) {
-			fixed (byte* input = data) {
-				return Hash(input, (uint)data.Length, Seed);
-			}
-		}
-
-		private unsafe static uint Hash(byte* data, uint len, uint seed) {
-			UInt32 h = seed ^ len;
-			UInt32 numberOfLoops = len >> 2; // div 4
-
-			UInt32* realData = (UInt32*)data;
-			while (numberOfLoops > 0) {
-				UInt32 k = *realData;
-
-				k *= m;
-				k ^= k >> r;
-				k *= m;
-
-				h *= m;
-				h ^= k;
-
-				realData++;
-				numberOfLoops--;
-			}
-
-			var tail = (byte*)realData;
-			switch (len & 3) // mod 4
-			{
-				case 3:
-					h ^= (uint)(tail[2] << 16);
-					h ^= (uint)(tail[1] << 8);
-					h ^= tail[0];
-					h *= m;
-					break;
-				case 2:
-					h ^= (uint)(tail[1] << 8);
-					h ^= tail[0];
-					h *= m;
-					break;
-				case 1:
-					h ^= tail[0];
-					h *= m;
-					break;
-			}
-
-			// Do a few final mixes of the hash to ensure the last few
-			// bytes are well-incorporated.
-
-			h ^= h >> 13;
-			h *= m;
-			h ^= h >> 15;
-
-			return h;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Index/Hashes/Murmur3AUnsafe.cs b/src/EventStore.Core/Index/Hashes/Murmur3AUnsafe.cs
deleted file mode 100644
index 051273e4b96..00000000000
--- a/src/EventStore.Core/Index/Hashes/Murmur3AUnsafe.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System;
-
-namespace EventStore.Core.Index.Hashes {
-	public class Murmur3AUnsafe : IHasher, IHasher<string> {
-		private readonly uint _seed;
-
-		private const UInt32 c1 = 0xcc9e2d51;
-		private const UInt32 c2 = 0x1b873593;
-
-		public Murmur3AUnsafe(uint seed = 0xc58f1a7b) {
-			_seed = seed;
-		}
-
-		public unsafe UInt32 Hash(string s) {
-			fixed (char* input = s) {
-				return Hash((byte*)input, (uint)s.Length * sizeof(char), _seed);
-			}
-		}
-
-		public unsafe uint Hash(byte[] data) {
-			fixed (byte* input = &data[0]) {
-				return Hash(input, (uint)data.Length, _seed);
-			}
-		}
-
-		public unsafe uint Hash(byte[] data, int offset, uint len, uint seed) {
-			fixed (byte* input = &data[offset]) {
-				return Hash(input, len, seed);
-			}
-		}
-
-		public unsafe uint Hash(ReadOnlySpan<byte> data) {
-			fixed (byte* input = data) {
-				return Hash(input, (uint)data.Length, _seed);
-			}
-		}
-
-		private unsafe static uint Hash(byte* data, uint len, uint seed) {
-			UInt32 nblocks = len / 4;
-			UInt32 h1 = seed;
-
-			//----------
-			// body
-
-			UInt32 k1;
-			UInt32* block = (UInt32*)data;
-			for (UInt32 i = nblocks; i > 0; --i, ++block) {
-				k1 = *block;
-
-				k1 *= c1;
-				k1 = Rotl32(k1, 15);
-				k1 *= c2;
-
-				h1 ^= k1;
-				h1 = Rotl32(h1, 13);
-				h1 = h1 * 5 + 0xe6546b64;
-			}
-
-			//----------
-			// tail
-
-
-			k1 = 0;
-			uint rem = len & 3;
-			byte* tail = (byte*)block;
-			if (rem >= 3)
-				k1 ^= (uint)(tail[2] << 16);
-			if (rem >= 2)
-				k1 ^= (uint)(tail[1] << 8);
-			if (rem > 0) {
-				k1 ^= tail[0];
-				k1 *= c1;
-				k1 = Rotl32(k1, 15);
-				k1 *= c2;
-				h1 ^= k1;
-			}
-
-			//----------
-			// finalization
-
-			h1 ^= len;
-
-			h1 ^= h1 >> 16;
-			h1 *= 0x85ebca6b;
-			h1 ^= h1 >> 13;
-			h1 *= 0xc2b2ae35;
-			h1 ^= h1 >> 16;
-
-			return h1;
-		}
-
-		private static UInt32 Rotl32(UInt32 x, int r) {
-			return (x << r) | (x >> (32 - r));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Index/Hashes/XXHashUnsafe.cs b/src/EventStore.Core/Index/Hashes/XXHashUnsafe.cs
deleted file mode 100644
index c547bcaf886..00000000000
--- a/src/EventStore.Core/Index/Hashes/XXHashUnsafe.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-using System;
-
-namespace EventStore.Core.Index.Hashes {
-	public class XXHashUnsafe : IHasher, IHasher<string> {
-		private readonly uint _seed;
-
-		private const uint PRIME1 = 2654435761U;
-		private const uint PRIME2 = 2246822519U;
-		private const uint PRIME3 = 3266489917U;
-		private const uint PRIME4 = 668265263U;
-		private const int PRIME5 = 0x165667b1;
-
-		public XXHashUnsafe(uint seed = 0xc58f1a7b) {
-			_seed = seed;
-		}
-
-		public unsafe UInt32 Hash(string s) {
-			fixed (char* input = s) {
-				return Hash((byte*)input, (uint)s.Length * sizeof(char), _seed);
-			}
-		}
-
-		public unsafe uint Hash(byte[] data) {
-			fixed (byte* input = &data[0]) {
-				return Hash(input, (uint)data.Length, _seed);
-			}
-		}
-
-		public unsafe uint Hash(byte[] data, int offset, uint len, uint seed) {
-			fixed (byte* input = &data[offset]) {
-				return Hash(input, len, seed);
-			}
-		}
-
-		public unsafe uint Hash(ReadOnlySpan<byte> data) {
-			fixed (byte* input = data) {
-				return Hash(input, (uint)data.Length, _seed);
-			}
-		}
-
-		private unsafe static uint Hash(byte* data, uint len, uint seed) {
-			if (len < 16)
-				return HashSmall(data, len, seed);
-
-			uint v1 = seed + PRIME1;
-			uint v2 = v1 * PRIME2 + len;
-			uint v3 = v2 * PRIME3;
-			uint v4 = v3 * PRIME4;
-
-			uint* p = (uint*)data;
-			uint* limit = (uint*)(data + len - 16);
-
-			while (p < limit) {
-				v1 += Rotl32(v1, 13);
-				v1 *= PRIME1;
-				v1 += *p;
-				p++;
-				v2 += Rotl32(v2, 11);
-				v2 *= PRIME1;
-				v2 += *p;
-				p++;
-				v3 += Rotl32(v3, 17);
-				v3 *= PRIME1;
-				v3 += *p;
-				p++;
-				v4 += Rotl32(v4, 19);
-				v4 *= PRIME1;
-				v4 += *p;
-				p++;
-			}
-
-			p = limit;
-			v1 += Rotl32(v1, 17);
-			v2 += Rotl32(v2, 19);
-			v3 += Rotl32(v3, 13);
-			v4 += Rotl32(v4, 11);
-			v1 *= PRIME1;
-			v2 *= PRIME1;
-			v3 *= PRIME1;
-			v4 *= PRIME1;
-			v1 += *p;
-			p++;
-			v2 += *p;
-			p++;
-			v3 += *p;
-			p++;
-			v4 += *p;
-			v1 *= PRIME2;
-			v2 *= PRIME2;
-			v3 *= PRIME2;
-			v4 *= PRIME2;
-			v1 += Rotl32(v1, 11);
-			v2 += Rotl32(v2, 17);
-			v3 += Rotl32(v3, 19);
-			v4 += Rotl32(v4, 13);
-			v1 *= PRIME3;
-			v2 *= PRIME3;
-			v3 *= PRIME3;
-			v4 *= PRIME3;
-
-			uint crc = v1 + Rotl32(v2, 3) + Rotl32(v3, 6) + Rotl32(v4, 9);
-			crc ^= crc >> 11;
-			crc += (PRIME4 + len) * PRIME1;
-			crc ^= crc >> 15;
-			crc *= PRIME2;
-			crc ^= crc >> 13;
-			return crc;
-		}
-
-		private unsafe static uint HashSmall(byte* data, uint len, uint seed) {
-			byte* p = data;
-			byte* bEnd = data + len;
-			byte* limit = bEnd - 4;
-
-			uint idx = seed + PRIME1;
-			uint crc = PRIME5;
-
-			while (p < limit) {
-				crc += (*(uint*)p) + idx;
-				idx++;
-				crc += Rotl32(crc, 17) * PRIME4;
-				crc *= PRIME1;
-				p += 4;
-			}
-
-			while (p < bEnd) {
-				crc += (*p) + idx;
-				idx++;
-				crc *= PRIME1;
-				p++;
-			}
-
-			crc += len;
-
-			crc ^= crc >> 15;
-			crc *= PRIME2;
-			crc ^= crc >> 13;
-			crc *= PRIME3;
-			crc ^= crc >> 16;
-
-			return crc;
-		}
-
-		private static UInt32 Rotl32(UInt32 x, int r) {
-			return (x << r) | (x >> (32 - r));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Index/IIndexFilenameProvider.cs b/src/EventStore.Core/Index/IIndexFilenameProvider.cs
deleted file mode 100644
index 9dd53e159e1..00000000000
--- a/src/EventStore.Core/Index/IIndexFilenameProvider.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace EventStore.Core.Index {
-	public interface IIndexFilenameProvider {
-		string GetFilenameNewTable();
-	}
-}
diff --git a/src/EventStore.Core/Index/IIndexScavengerLog.cs b/src/EventStore.Core/Index/IIndexScavengerLog.cs
deleted file mode 100644
index 0e84c10fb1c..00000000000
--- a/src/EventStore.Core/Index/IIndexScavengerLog.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-
-namespace EventStore.Core.Index {
-	public interface IIndexScavengerLog {
-		void IndexTableScavenged(int level, int index, TimeSpan elapsed, long entriesDeleted, long entriesKept,
-			long spaceSaved);
-
-		void IndexTableNotScavenged(int level, int index, TimeSpan elapsed, long entriesKept, string errorMessage);
-	}
-}
diff --git a/src/EventStore.Core/Index/IMemTable.cs b/src/EventStore.Core/Index/IMemTable.cs
deleted file mode 100644
index 7da4089dce5..00000000000
--- a/src/EventStore.Core/Index/IMemTable.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Collections.Generic;
-
-namespace EventStore.Core.Index {
-	public interface IMemTable : ISearchTable {
-		bool MarkForConversion();
-		void Add(ulong stream, long version, long position);
-		void AddEntries(IList<IndexEntry> entries);
-	}
-}
diff --git a/src/EventStore.Core/Index/ISearchTable.cs b/src/EventStore.Core/Index/ISearchTable.cs
deleted file mode 100644
index 8dfc65e37b9..00000000000
--- a/src/EventStore.Core/Index/ISearchTable.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace EventStore.Core.Index {
-	public interface ISearchTable {
-		Guid Id { get; }
-		long Count { get; }
-		byte Version { get; }
-
-		bool TryGetOneValue(ulong stream, long number, out long position);
-		bool TryGetLatestEntry(ulong stream, out IndexEntry entry);
-		bool TryGetLatestEntry(ulong stream, long beforePosition, Func<IndexEntry,bool> isForThisStream, out IndexEntry entry);
-		bool TryGetOldestEntry(ulong stream, out IndexEntry entry);
-		bool TryGetNextEntry(ulong stream, long afterVersion, out IndexEntry entry);
-		bool TryGetPreviousEntry(ulong stream, long beforeVersion, out IndexEntry entry);
-		IList<IndexEntry> GetRange(ulong stream, long startNumber, long endNumber, int? limit = null);
-		IEnumerable<IndexEntry> IterateAllInOrder();
-	}
-}
diff --git a/src/EventStore.Core/Index/ITableIndex.cs b/src/EventStore.Core/Index/ITableIndex.cs
deleted file mode 100644
index ecf723c20f9..00000000000
--- a/src/EventStore.Core/Index/ITableIndex.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.Index {
-	public interface ITableIndex {
-		long CommitCheckpoint { get; }
-		long PrepareCheckpoint { get; }
-
-		void Initialize(long chaserCheckpoint);
-		void Close(bool removeFiles = true);
-
-		// this overload keeps IndexEntries that exist in the log
-		void Scavenge(IIndexScavengerLog log, CancellationToken ct);
-		// this overload keeps IndexEntries that pass the keep predicate
-		void Scavenge(Func<IndexEntry, bool> shouldKeep, IIndexScavengerLog log, CancellationToken ct);
-		Task MergeIndexes();
-		IEnumerable<ISearchTable> IterateAllInOrder();
-		bool IsBackgroundTaskRunning { get; }
-	}
-
-	public interface ITableIndex<TStreamId> : ITableIndex {
-		void Add(long commitPos, TStreamId streamId, long version, long position);
-		void AddEntries(long commitPos, IList<IndexKey<TStreamId>> entries);
-
-		bool TryGetOneValue(TStreamId streamId, long version, out long position);
-		bool TryGetLatestEntry(TStreamId streamId, out IndexEntry entry);
-		bool TryGetLatestEntry(ulong stream, long beforePosition, Func<IndexEntry, bool> isForThisStream, out IndexEntry entry);
-		bool TryGetLatestEntry(TStreamId streamId, long beforePosition, Func<IndexEntry, bool> isForThisStream, out IndexEntry entry);
-		bool TryGetOldestEntry(TStreamId streamId, out IndexEntry entry);
-		bool TryGetNextEntry(TStreamId streamId, long afterVersion, out IndexEntry entry);
-		bool TryGetNextEntry(ulong stream, long afterVersion, out IndexEntry entry);
-		bool TryGetPreviousEntry(TStreamId streamId, long beforeVersion, out IndexEntry entry);
-		bool TryGetPreviousEntry(ulong stream, long beforeVersion, out IndexEntry entry);
-
-		IReadOnlyList<IndexEntry> GetRange(TStreamId streamId, long startVersion, long endVersion, int? limit = null);
-		IReadOnlyList<IndexEntry> GetRange(ulong stream, long startVersion, long endVersion, int? limit = null);
-
-		void WaitForBackgroundTasks(int millisecondsTimeout);
-	}
-}
diff --git a/src/EventStore.Core/Index/IndexEntry.cs b/src/EventStore.Core/Index/IndexEntry.cs
deleted file mode 100644
index 0fe8c34aeaa..00000000000
--- a/src/EventStore.Core/Index/IndexEntry.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace EventStore.Core.Index {
-	[StructLayout(LayoutKind.Explicit)]
-	public unsafe struct IndexEntry : IComparable<IndexEntry>, IEquatable<IndexEntry> {
-		[FieldOffset(0)] public fixed byte Bytes [24];
-		[FieldOffset(0)] public Int64 Version;
-		[FieldOffset(8)] public UInt64 Stream;
-		[FieldOffset(16)] public Int64 Position;
-
-		public IndexEntry(ulong stream, long version, long position) : this() {
-			Stream = stream;
-			Version = version;
-			Position = position;
-		}
-
-		public int CompareTo(IndexEntry other) {
-			var keyCmp = Stream.CompareTo(other.Stream);
-			if (keyCmp != 0)
-				return keyCmp;
-
-			keyCmp = Version.CompareTo(other.Version);
-			if (keyCmp != 0)
-				return keyCmp;
-
-			return Position.CompareTo(other.Position);
-		}
-
-		public bool Equals(IndexEntry other) {
-			return (Stream == other.Stream && Version == other.Version) && Position == other.Position;
-		}
-
-		public override string ToString() {
-			return string.Format("Stream: {0}, Version: {1}, Position: {2}", Stream, Version, Position);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Index/IndexEntryV1.cs b/src/EventStore.Core/Index/IndexEntryV1.cs
deleted file mode 100644
index c6d81babb74..00000000000
--- a/src/EventStore.Core/Index/IndexEntryV1.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace EventStore.Core.Index {
-	[StructLayout(LayoutKind.Explicit)]
-	public unsafe struct IndexEntryV1 : IComparable<IndexEntryV1>, IEquatable<IndexEntryV1> {
-		[FieldOffset(0)] public UInt64 Key;
-		[FieldOffset(0)] public fixed byte Bytes [16];
-		[FieldOffset(0)] public Int32 Version;
-		[FieldOffset(4)] public UInt32 Stream;
-		[FieldOffset(8)] public Int64 Position;
-
-		public IndexEntryV1(ulong key, long position) : this() {
-			Key = key;
-			Position = position;
-		}
-
-		public IndexEntryV1(uint stream, int version, long position) : this() {
-			Stream = stream;
-			Version = version;
-			Position = position;
-		}
-
-		public int CompareTo(IndexEntryV1 other) {
-			var keyCmp = Key.CompareTo(other.Key);
-			if (keyCmp != 0)
-				return keyCmp;
-			return Position.CompareTo(other.Position);
-		}
-
-		public bool Equals(IndexEntryV1 other) {
-			return Key == other.Key && Position == other.Position;
-		}
-
-		public override string ToString() {
-			return string.Format("Key: {0}, Stream: {1}, Version: {2}, Position: {3}", Key, Stream, Version, Position);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Index/IndexEntryV2.cs b/src/EventStore.Core/Index/IndexEntryV2.cs
deleted file mode 100644
index b04874f7876..00000000000
--- a/src/EventStore.Core/Index/IndexEntryV2.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace EventStore.Core {
-	[StructLayout(LayoutKind.Explicit)]
-	public unsafe struct IndexEntryV2 : IComparable<IndexEntryV2>, IEquatable<IndexEntryV2> {
-		[FieldOffset(0)] public fixed byte Bytes[20];
-		[FieldOffset(0)] public Int32 Version;
-		[FieldOffset(4)] public UInt64 Stream;
-		[FieldOffset(12)] public Int64 Position;
-
-		public IndexEntryV2(ulong stream, int version, long position) : this() {
-			Stream = stream;
-			Version = version;
-			Position = position;
-		}
-
-		public int CompareTo(IndexEntryV2 other) {
-			var keyCmp = Stream.CompareTo(other.Stream);
-			if (keyCmp == 0) {
-				keyCmp = Version.CompareTo(other.Version);
-				if (keyCmp != 0)
-					return keyCmp;
-			}
-
-			if (keyCmp != 0)
-				return keyCmp;
-			return Position.CompareTo(other.Position);
-		}
-
-		public bool Equals(IndexEntryV2 other) {
-			return (Stream == other.Stream && Version == other.Version) && Position == other.Position;
-		}
-
-		public override string ToString() {
-			return string.Format("Stream: {0}, Version: {1}, Position: {2}", Stream, Version, Position);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Index/IndexKey.cs b/src/EventStore.Core/Index/IndexKey.cs
deleted file mode 100644
index 084fadf8b22..00000000000
--- a/src/EventStore.Core/Index/IndexKey.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace EventStore.Core.Index {
-	public struct IndexKey<TStreamId> {
-		public TStreamId StreamId;
-		public long Version;
-		public long Position;
-		public ulong Hash;
-
-		public IndexKey(TStreamId streamId, long version, long position) : this(streamId, version, position, 0) {
-		}
-
-		public IndexKey(TStreamId streamId, long version, long position, ulong hash) {
-			StreamId = streamId;
-			Version = version;
-			Position = position;
-
-			Hash = hash;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Index/IndexMap.cs b/src/EventStore.Core/Index/IndexMap.cs
deleted file mode 100644
index 931a70404ee..00000000000
--- a/src/EventStore.Core/Index/IndexMap.cs
+++ /dev/null
@@ -1,550 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Exceptions;
-using EventStore.Core.Settings;
-using EventStore.Core.Util;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Index {
-	public class IndexMap {
-		private static readonly ILogger Log = Serilog.Log.ForContext<IndexMap>();
-
-		public const int IndexMapVersion = 2;
-
-		public readonly int Version;
-
-		public readonly long PrepareCheckpoint;
-		public readonly long CommitCheckpoint;
-
-		private readonly List<List<PTable>> _map;
-		private readonly int _maxTablesPerLevel;
-		private readonly int _maxTableLevelsForAutomaticMerge;
-		private readonly int _pTableMaxReaderCount;
-
-		private IndexMap(int version, List<List<PTable>> tables, long prepareCheckpoint, long commitCheckpoint,
-			int maxTablesPerLevel, int maxTableLevelsForAutomaticMerge, int pTableMaxReaderCount) {
-			Ensure.Nonnegative(version, "version");
-			if (prepareCheckpoint < -1) throw new ArgumentOutOfRangeException("prepareCheckpoint");
-			if (commitCheckpoint < -1) throw new ArgumentOutOfRangeException("commitCheckpoint");
-			if (maxTablesPerLevel <= 1) throw new ArgumentOutOfRangeException("maxTablesPerLevel");
-
-			Version = version;
-
-			PrepareCheckpoint = prepareCheckpoint;
-			CommitCheckpoint = commitCheckpoint;
-
-			_map = CopyFrom(tables);
-			_maxTablesPerLevel = maxTablesPerLevel;
-			_maxTableLevelsForAutomaticMerge = maxTableLevelsForAutomaticMerge;
-			_pTableMaxReaderCount = pTableMaxReaderCount;
-			VerifyStructure();
-		}
-
-		private static List<List<PTable>> CopyFrom(List<List<PTable>> tables) {
-			var tmp = new List<List<PTable>>();
-			for (int i = 0; i < tables.Count; i++) {
-				tmp.Add(new List<PTable>(tables[i]));
-			}
-
-			return tmp;
-		}
-
-		private void VerifyStructure() {
-			if (_map.SelectMany(level => level).Any(item => item == null))
-				throw new CorruptIndexException("Internal indexmap structure corruption.");
-		}
-
-		private static void AddTableToTables(List<List<PTable>> tables, int level, PTable table) {
-			while (level >= tables.Count) {
-				tables.Add(new List<PTable>());
-			}
-
-			var innerTables = tables[level] ?? (tables[level] = new List<PTable>());
-
-			innerTables.Add(table);
-		}
-
-		private static void InsertTableToTables(List<List<PTable>> tables, int level, int position, PTable table) {
-			while (level >= tables.Count)
-				tables.Add(new List<PTable>());
-
-			var innerTables = tables[level] ?? (tables[level] = new List<PTable>());
-
-			while (position >= innerTables.Count)
-				innerTables.Add(null);
-
-			innerTables[position] = table;
-		}
-
-		public IEnumerable<PTable> InOrder() {
-			var map = _map;
-			// level 0 (newest tables) -> N (oldest tables)
-			for (int i = 0; i < map.Count; ++i) {
-				// last in the level's list (newest on level) -> to first (oldest on level)
-				for (int j = map[i].Count - 1; j >= 0; --j) {
-					yield return map[i][j];
-				}
-			}
-		}
-
-		public IEnumerable<PTable> InReverseOrder() {
-			var map = _map;
-			// N (oldest tables) -> level 0 (newest tables)
-			for (int i = map.Count - 1; i >= 0; --i) {
-				// from first (oldest on level) in the level's list -> last in the level's list (newest on level)
-				for (int j = 0, n = map[i].Count; j < n; ++j) {
-					yield return map[i][j];
-				}
-			}
-		}
-
-		public IEnumerable<string> GetAllFilenames() {
-			return from level in _map
-				from table in level
-				select table.Filename;
-		}
-
-		public static IndexMap CreateEmpty(int maxTablesPerLevel, int maxTableLevelsForAutomaticMerge, int pTableMaxReaderCount) {
-			return new IndexMap(IndexMapVersion, new List<List<PTable>>(), -1, -1, maxTablesPerLevel,
-				maxTableLevelsForAutomaticMerge, pTableMaxReaderCount);
-		}
-
-		public static IndexMap FromFile(
-			string filename,
-			int maxTablesPerLevel,
-			bool loadPTables,
-			int cacheDepth,
-			bool skipIndexVerify,
-			bool useBloomFilter,
-			int lruCacheSize,
-			int threads,
-			int maxAutoMergeLevel,
-			int pTableMaxReaderCount) {
-			if (!File.Exists(filename))
-				return CreateEmpty(maxTablesPerLevel, maxAutoMergeLevel, pTableMaxReaderCount);
-
-			using (var f = File.OpenRead(filename)) {
-				// calculate real MD5 hash except first 32 bytes which are string representation of stored hash
-				f.Position = 32;
-				var realHash = MD5Hash.GetHashFor(f);
-				f.Position = 0;
-
-				using (var reader = new StreamReader(f)) {
-					ReadAndCheckHash(reader, realHash);
-
-					// at this point we can assume the format is ok, so actually no need to check errors.
-					var version = ReadVersion(reader);
-
-					var checkpoints = ReadCheckpoints(reader);
-					var prepareCheckpoint = checkpoints.PreparePosition;
-					var commitCheckpoint = checkpoints.CommitPosition;
-					if (version > 1) {
-						var tmpMaxAutoMergeLevel = ReadMaxAutoMergeLevel(reader);
-						if (tmpMaxAutoMergeLevel < maxAutoMergeLevel)
-							throw new CorruptIndexException(
-								$"Index map has lower maximum auto merge level ({tmpMaxAutoMergeLevel}) than is currently configured ({maxAutoMergeLevel}) and the index will need to be rebuilt");
-
-						maxAutoMergeLevel = Math.Min(maxAutoMergeLevel, tmpMaxAutoMergeLevel);
-					}
-
-					//we are doing a logical upgrade of the version to have the new data, so we will change the version to match so that new files are saved with the right version
-					version = IndexMapVersion;
-					var tables = loadPTables
-						? LoadPTables(reader, filename, checkpoints, cacheDepth, skipIndexVerify, useBloomFilter, lruCacheSize, threads, pTableMaxReaderCount)
-						: new List<List<PTable>>();
-
-					if (!loadPTables && reader.ReadLine() != null)
-						throw new CorruptIndexException(
-							string.Format("Negative prepare/commit checkpoint in non-empty IndexMap: {0}.",
-								checkpoints));
-
-					return new IndexMap(version, tables, prepareCheckpoint, commitCheckpoint, maxTablesPerLevel,
-						maxAutoMergeLevel, pTableMaxReaderCount);
-				}
-			}
-		}
-
-		private static void ReadAndCheckHash(TextReader reader, byte[] realHash) {
-			// read stored MD5 hash and convert it from string to byte array
-			string text;
-			if ((text = reader.ReadLine()) == null)
-				throw new CorruptIndexException("IndexMap file is empty.");
-			if (text.Length != 32 || !text.All(x => char.IsDigit(x) || (x >= 'A' && x <= 'F')))
-				throw new CorruptIndexException(string.Format("Corrupted IndexMap MD5 hash. Hash ({0}): {1}.",
-					text.Length, text));
-
-			// check expected and real hashes are the same
-			var expectedHash = new byte[16];
-			for (int i = 0; i < 16; ++i) {
-				expectedHash[i] = Convert.ToByte(text.Substring(i * 2, 2), 16);
-			}
-
-			if (expectedHash.Length != realHash.Length) {
-				throw new CorruptIndexException(
-					string.Format("Hash validation error (different hash sizes).\n"
-					              + "Expected hash ({0}): {1}, real hash ({2}): {3}.",
-						expectedHash.Length, BitConverter.ToString(expectedHash),
-						realHash.Length, BitConverter.ToString(realHash)));
-			}
-
-			for (int i = 0; i < realHash.Length; ++i) {
-				if (expectedHash[i] != realHash[i]) {
-					throw new CorruptIndexException(
-						string.Format("Hash validation error (different hashes).\n"
-						              + "Expected hash ({0}): {1}, real hash ({2}): {3}.",
-							expectedHash.Length, BitConverter.ToString(expectedHash),
-							realHash.Length, BitConverter.ToString(realHash)));
-				}
-			}
-		}
-
-		private static int ReadVersion(TextReader reader) {
-			string text;
-			if ((text = reader.ReadLine()) == null)
-				throw new CorruptIndexException("Corrupted version.");
-			return int.Parse(text);
-		}
-
-		private static TFPos ReadCheckpoints(TextReader reader) {
-			// read and check prepare/commit checkpoint
-			string text;
-			if ((text = reader.ReadLine()) == null)
-				throw new CorruptIndexException("Corrupted commit checkpoint.");
-			try {
-				long prepareCheckpoint;
-				long commitCheckpoint;
-				var checkpoints = text.Split('/');
-				if (!long.TryParse(checkpoints[0], out prepareCheckpoint) || prepareCheckpoint < -1)
-					throw new CorruptIndexException(string.Format("Invalid prepare checkpoint: {0}.", checkpoints[0]));
-				if (!long.TryParse(checkpoints[1], out commitCheckpoint) || commitCheckpoint < -1)
-					throw new CorruptIndexException(string.Format("Invalid commit checkpoint: {0}.", checkpoints[1]));
-				return new TFPos(commitCheckpoint, prepareCheckpoint);
-			} catch (Exception exc) {
-				throw new CorruptIndexException("Corrupted prepare/commit checkpoints pair.", exc);
-			}
-		}
-
-		private static int ReadMaxAutoMergeLevel(TextReader reader) {
-			if (!(reader.ReadLine() is string text && int.TryParse(text, out var maxAutoMergeLevel)))
-				throw new CorruptIndexException("Corrupted auto merge level.");
-			return maxAutoMergeLevel;
-		}
-
-		private static IEnumerable<string> GetAllLines(StreamReader reader) {
-			// all next lines are PTables sorted by levels
-			string text;
-			while ((text = reader.ReadLine()) != null) {
-				yield return text;
-			}
-		}
-
-		private static List<List<PTable>> LoadPTables(StreamReader reader, string indexmapFilename, TFPos checkpoints,
-			int cacheDepth, bool skipIndexVerify,
-			bool useBloomFilter, int lruCacheSize,
-			int threads,
-			int pTableMaxReaderCount) {
-			var tables = new List<List<PTable>>();
-			try {
-				try {
-					Parallel.ForEach(
-						GetAllLines(reader)
-							.Reverse(), // Reverse so we load the highest levels (biggest files) first - ensures we use concurrency in the most efficient way. 
-						new ParallelOptions {MaxDegreeOfParallelism = threads},
-						indexMapEntry => {
-							if (checkpoints.PreparePosition < 0 || checkpoints.CommitPosition < 0)
-								throw new CorruptIndexException(
-									string.Format("Negative prepare/commit checkpoint in non-empty IndexMap: {0}.",
-										checkpoints));
-
-							PTable ptable = null;
-							var pieces = indexMapEntry.Split(',');
-							try {
-								var level = int.Parse(pieces[0]);
-								var position = int.Parse(pieces[1]);
-								var file = pieces[2];
-								var path = Path.GetDirectoryName(indexmapFilename);
-								var ptablePath = Path.Combine(path, file);
-
-								ptable = PTable.FromFile(ptablePath, ESConsts.PTableInitialReaderCount, pTableMaxReaderCount, cacheDepth, skipIndexVerify, useBloomFilter, lruCacheSize);
-
-								lock (tables) {
-									InsertTableToTables(tables, level, position, ptable);
-								}
-							} catch (Exception) {
-								// if PTable file path was correct, but data is corrupted, we still need to dispose opened streams
-								if (ptable != null)
-									ptable.Dispose();
-
-								throw;
-							}
-						});
-
-					// Verify map is correct
-					for (int i = 0; i < tables.Count; ++i) {
-						for (int j = 0; j < tables[i].Count; ++j) {
-							if (tables[i][j] == null) {
-								throw new CorruptIndexException(
-									$"indexmap is missing contiguous level,position {i},{j}");
-							}
-						}
-					}
-				} catch (AggregateException aggEx) {
-					// We only care that *something* has gone wrong, throw the first exception
-					throw aggEx.InnerException;
-				}
-			} catch (Exception exc) {
-				// also dispose all previously loaded correct PTables
-				for (int i = 0; i < tables.Count; ++i) {
-					for (int j = 0; j < tables[i].Count; ++j) {
-						if (tables[i][j] != null)
-							tables[i][j].Dispose();
-					}
-				}
-
-				throw new CorruptIndexException("Error while loading IndexMap.", exc);
-			}
-
-			return tables;
-		}
-
-		public void SaveToFile(string filename) {
-			var tmpIndexMap = string.Format("{0}.{1}.indexmap.tmp", filename, Guid.NewGuid());
-
-			using (var memStream = new MemoryStream())
-			using (var memWriter = new StreamWriter(memStream)) {
-				memWriter.WriteLine(new string('0', 32)); // pre-allocate space for MD5 hash
-				memWriter.WriteLine(Version);
-				memWriter.WriteLine("{0}/{1}", PrepareCheckpoint, CommitCheckpoint);
-				memWriter.WriteLine(_maxTableLevelsForAutomaticMerge);
-				for (int i = 0; i < _map.Count; i++) {
-					for (int j = 0; j < _map[i].Count; j++) {
-						memWriter.WriteLine("{0},{1},{2}", i, j, new FileInfo(_map[i][j].Filename).Name);
-					}
-				}
-
-				memWriter.Flush();
-
-				memStream.Position = 32;
-				var hash = MD5Hash.GetHashFor(memStream);
-
-				memStream.Position = 0;
-				foreach (var t in hash) {
-					memWriter.Write(t.ToString("X2"));
-				}
-
-				memWriter.Flush();
-
-				memStream.Position = 0;
-				using (var f = File.OpenWrite(tmpIndexMap)) {
-					f.Write(memStream.GetBuffer(), 0, (int)memStream.Length);
-					f.FlushToDisk();
-				}
-			}
-
-			int trial = 0;
-			int maxTrials = 5;
-			while (trial < maxTrials) {
-				Action<Exception> errorHandler = ex => {
-					Log.Error("Failed trial to replace indexmap {indexMap} with {tmpIndexMap}.", filename, tmpIndexMap);
-					Log.Error("Exception: {e}", ex);
-					trial += 1;
-				};
-				try {
-					if (File.Exists(filename)) {
-						File.SetAttributes(filename, FileAttributes.Normal);
-						File.Delete(filename);
-					}
-
-					File.Move(tmpIndexMap, filename);
-					break;
-				} catch (IOException exc) {
-					errorHandler(exc);
-					if (trial >= maxTrials) {
-						WindowsProcessUtil.PrintWhoIsLocking(tmpIndexMap, Log);
-						WindowsProcessUtil.PrintWhoIsLocking(filename, Log);
-					}
-				} catch (UnauthorizedAccessException exc) {
-					errorHandler(exc);
-				}
-			}
-		}
-
-		public AddResult AddPTable(PTable tableToAdd,
-			long prepareCheckpoint,
-			long commitCheckpoint) {
-			Ensure.NotNull(tableToAdd, "tableToAdd");
-			Ensure.Nonnegative(prepareCheckpoint, "prepareCheckpoint");
-			Ensure.Nonnegative(commitCheckpoint, "commitCheckpoint");
-
-			var tables = CopyFrom(_map);
-			AddTableToTables(tables, 0, tableToAdd);
-
-			var indexMap = new IndexMap(Version, tables, prepareCheckpoint, commitCheckpoint, _maxTablesPerLevel,
-				_maxTableLevelsForAutomaticMerge, _pTableMaxReaderCount);
-
-			var canMergeAny = false;
-			var maxTableLevelsToMerge = Math.Min(tables.Count, _maxTableLevelsForAutomaticMerge);
-			for (int level = 0; level < maxTableLevelsToMerge; level++) {
-				if (tables[level].Count >= _maxTablesPerLevel) {
-					canMergeAny = true;
-					break;
-				}
-			}
-
-			return new AddResult(indexMap, canMergeAny);
-		}
-
-		public MergeResult TryMergeOneLevel(
-			IIndexFilenameProvider filenameProvider,
-			byte version,
-			int indexCacheDepth = 16,
-			bool skipIndexVerify = false,
-			bool useBloomFilter = true,
-			int lruCacheSize = 1_000_000) {
-
-			var tables = CopyFrom(_map);
-
-			var hasMergedAny = false;
-			var canMergeAny = false;
-			var toDelete = new List<PTable>();
-			var maxTableLevelsToMerge = Math.Min(tables.Count, _maxTableLevelsForAutomaticMerge);
-			for (int level = 0; level < maxTableLevelsToMerge; level++) {
-				if (tables[level].Count >= _maxTablesPerLevel) {
-					if (hasMergedAny) {
-						canMergeAny = true;
-						break;
-					}
-					var filename = filenameProvider.GetFilenameNewTable();
-					PTable mergedTable = PTable.MergeTo(
-						tables[level],
-						filename,
-						version,
-						ESConsts.PTableInitialReaderCount,
-						_pTableMaxReaderCount,
-						indexCacheDepth,
-						skipIndexVerify,
-						useBloomFilter,
-						lruCacheSize);
-					hasMergedAny = true;
-
-					AddTableToTables(tables, level + 1, mergedTable);
-					toDelete.AddRange(tables[level]);
-					tables[level].Clear();
-				}
-			}
-
-			var indexMap = new IndexMap(Version, tables, PrepareCheckpoint, CommitCheckpoint, _maxTablesPerLevel,
-				_maxTableLevelsForAutomaticMerge, _pTableMaxReaderCount);
-			return new MergeResult(indexMap, toDelete, hasMergedAny, canMergeAny);
-		}
-
-		public MergeResult TryManualMerge(
-			IIndexFilenameProvider filenameProvider,
-			byte version,
-			int indexCacheDepth = 16,
-			bool skipIndexVerify = false,
-			bool useBloomFilter = true,
-			int lruCacheSize = 1_000_000) {
-
-			var tables = CopyFrom(_map);
-
-			if (tables.Count <= _maxTableLevelsForAutomaticMerge) {
-				return new MergeResult(this, new List<PTable>(), false, false);
-			}
-
-			var toDelete = new List<PTable>();
-			var tablesToMerge = tables.Skip(_maxTableLevelsForAutomaticMerge).SelectMany(a => a).ToList();
-			if (tablesToMerge.Count == 1)
-				return new MergeResult(this, new List<PTable>(), false, false);
-
-			var filename = filenameProvider.GetFilenameNewTable();
-			PTable mergedTable = PTable.MergeTo(
-				tablesToMerge,
-				filename,
-				version,
-				ESConsts.PTableInitialReaderCount,
-				_pTableMaxReaderCount,
-				indexCacheDepth,
-				skipIndexVerify,
-				useBloomFilter,
-				lruCacheSize);
-
-			for (int i = tables.Count - 1; i > _maxTableLevelsForAutomaticMerge; i--) {
-				tables.RemoveAt(i);
-			}
-
-			tables[_maxTableLevelsForAutomaticMerge].Clear();
-			AddTableToTables(tables, _maxTableLevelsForAutomaticMerge + 1, mergedTable);
-			toDelete.AddRange(tablesToMerge);
-
-			var indexMap = new IndexMap(Version, tables, PrepareCheckpoint, CommitCheckpoint, _maxTablesPerLevel,
-				_maxTableLevelsForAutomaticMerge, _pTableMaxReaderCount);
-			return new MergeResult(indexMap, toDelete, true, false);
-		}
-
-		public ScavengeResult Scavenge(Guid toScavenge, CancellationToken ct,
-			Func<IndexEntry, bool> shouldKeep,
-			IIndexFilenameProvider filenameProvider,
-			byte version,
-			int indexCacheDepth = 16,
-			bool skipIndexVerify = false,
-			bool useBloomFilter = true,
-			int lruCacheSize = 1_000_000) {
-
-			var scavengedMap = CopyFrom(_map);
-			for (int level = 0; level < scavengedMap.Count; level++) {
-				for (int i = 0; i < scavengedMap[level].Count; i++) {
-					if (scavengedMap[level][i].Id == toScavenge) {
-						long spaceSaved;
-						var filename = filenameProvider.GetFilenameNewTable();
-						var oldTable = scavengedMap[level][i];
-
-						PTable scavenged = PTable.Scavenged(
-							oldTable,
-							filename,
-							version,
-							shouldKeep,
-							out spaceSaved,
-							ESConsts.PTableInitialReaderCount,
-							_pTableMaxReaderCount,
-							indexCacheDepth,
-							skipIndexVerify,
-							useBloomFilter,
-							lruCacheSize,
-							ct);
-
-						if (scavenged == null) {
-							return ScavengeResult.Failed(oldTable, level, i);
-						}
-
-						scavengedMap[level][i] = scavenged;
-
-						var indexMap = new IndexMap(Version, scavengedMap, PrepareCheckpoint, CommitCheckpoint,
-							_maxTablesPerLevel, _maxTableLevelsForAutomaticMerge, _pTableMaxReaderCount);
-
-						return ScavengeResult.Success(indexMap, oldTable, scavenged, spaceSaved, level, i);
-					}
-				}
-			}
-
-			throw new ArgumentException("Unable to find table in map.", nameof(toScavenge));
-		}
-
-		public void Dispose(TimeSpan timeout) {
-			foreach (var ptable in InOrder()) {
-				ptable.Dispose();
-			}
-
-			foreach (var ptable in InOrder()) {
-				ptable.WaitForDisposal(timeout);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Index/IndexStatusTracker.cs b/src/EventStore.Core/Index/IndexStatusTracker.cs
deleted file mode 100644
index ff940231e8f..00000000000
--- a/src/EventStore.Core/Index/IndexStatusTracker.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using EventStore.Core.Metrics;
-
-namespace EventStore.Core.Index {
-	public interface IIndexStatusTracker {
-		IDisposable StartOpening();
-		IDisposable StartRebuilding();
-		IDisposable StartInitializing();
-		IDisposable StartMerging();
-		IDisposable StartScavenging();
-	}
-
-	public class IndexStatusTracker : IIndexStatusTracker {
-		private readonly ActivityStatusSubMetric _metric;
-
-		public IndexStatusTracker(StatusMetric metric) {
-			_metric = new("Index", metric);
-		}
-
-		public IDisposable StartOpening() => _metric.StartActivity("Opening");
-		public IDisposable StartRebuilding() => _metric.StartActivity("Rebuilding");
-		public IDisposable StartInitializing() => _metric.StartActivity("Initializing");
-		public IDisposable StartMerging() => _metric.StartActivity("Merging");
-		public IDisposable StartScavenging() => _metric.StartActivity("Scavenging");
-
-		public class NoOp : IIndexStatusTracker {
-			public IDisposable StartOpening() => null;
-			public IDisposable StartRebuilding() => null;
-			public IDisposable StartInitializing() => null;
-			public IDisposable StartMerging() => null;
-			public IDisposable StartScavenging() => null;
-		}
-	}
-
-}
diff --git a/src/EventStore.Core/Index/IndexTracker.cs b/src/EventStore.Core/Index/IndexTracker.cs
deleted file mode 100644
index 6da532e4490..00000000000
--- a/src/EventStore.Core/Index/IndexTracker.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-#nullable enable
-using System.Collections.Generic;
-using EventStore.Core.Metrics;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.Index {
-	public interface IIndexTracker {
-		void OnIndexed<TStreamId>(List<IPrepareLogRecord<TStreamId>> prepares);
-	}
-
-	public class IndexTracker : IIndexTracker {
-		private readonly CounterSubMetric _indexedEvents;
-
-		public IndexTracker(CounterSubMetric indexedEvents) {
-			_indexedEvents = indexedEvents;
-		}
-
-		public void OnIndexed<TStreamId>(List<IPrepareLogRecord<TStreamId>> prepares) {
-			_indexedEvents.Add(prepares.Count);
-		}
-
-		public class NoOp : IIndexTracker {
-			public void OnIndexed<TStreamId>(List<IPrepareLogRecord<TStreamId>> record) {
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Index/MergeResult.cs b/src/EventStore.Core/Index/MergeResult.cs
deleted file mode 100644
index c67fecc5b7e..00000000000
--- a/src/EventStore.Core/Index/MergeResult.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Collections.Generic;
-
-namespace EventStore.Core.Index {
-	public class MergeResult {
-		public readonly IndexMap MergedMap;
-		public readonly List<PTable> ToDelete;
-		public readonly bool HasMergedAny;
-		public readonly bool CanMergeAny;
-
-		public MergeResult(IndexMap mergedMap, List<PTable> toDelete, bool hasMergedAny, bool canMergeAny) {
-			MergedMap = mergedMap;
-			ToDelete = toDelete;
-			HasMergedAny = hasMergedAny;
-			CanMergeAny = canMergeAny;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Index/PTable.cs b/src/EventStore.Core/Index/PTable.cs
deleted file mode 100644
index b4dfeaf95b2..00000000000
--- a/src/EventStore.Core/Index/PTable.cs
+++ /dev/null
@@ -1,1366 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.DataStructures;
-using EventStore.Core.Exceptions;
-using EventStore.Core.TransactionLog.Unbuffered;
-using ILogger = Serilog.ILogger;
-using Range = EventStore.Core.Data.Range;
-using EventStore.Core.DataStructures.ProbabilisticFilter;
-using System.Runtime.InteropServices;
-using System.Security.Cryptography;
-using MD5 = EventStore.Core.Hashing.MD5;
-using RuntimeInformation = System.Runtime.RuntimeInformation;
-
-namespace EventStore.Core.Index {
-	public class PTableVersions {
-		// original
-		public const byte IndexV1 = 1;
-
-		// 64bit hashes
-		public const byte IndexV2 = 2;
-
-		// 64bit versions
-		public const byte IndexV3 = 3;
-
-		// cached midpoints
-		public const byte IndexV4 = 4;
-	}
-
-	public partial class PTable : ISearchTable, IDisposable {
-		public const int IndexEntryV1Size = sizeof(int) + sizeof(int) + sizeof(long);
-		public const int IndexEntryV2Size = sizeof(int) + sizeof(long) + sizeof(long);
-		public const int IndexEntryV3Size = sizeof(long) + sizeof(long) + sizeof(long);
-		public const int IndexEntryV4Size = IndexEntryV3Size;
-
-		public const int IndexKeyV1Size = sizeof(int) + sizeof(int);
-		public const int IndexKeyV2Size = sizeof(int) + sizeof(long);
-		public const int IndexKeyV3Size = sizeof(long) + sizeof(long);
-		public const int IndexKeyV4Size = IndexKeyV3Size;
-		public const int MD5Size = 16;
-		public const int DefaultBufferSize = 8192;
-		public const int DefaultSequentialBufferSize = 65536;
-		private static readonly ILogger Log = Serilog.Log.ForContext<PTable>();
-
-		public Guid Id {
-			get { return _id; }
-		}
-
-		public long Count {
-			get { return _count; }
-		}
-
-		public string Filename {
-			get { return _filename; }
-		}
-
-		public byte Version {
-			get { return _version; }
-		}
-
-		public string BloomFilterFilename => GenBloomFilterFilename(_filename);
-
-		public bool HasBloomFilter => _bloomFilter is not null;
-
-		public static string GenBloomFilterFilename(string filename) => $"{filename}.bloomfilter";
-
-		private static long GenBloomFilterSizeBytes(long entryCount) {
-			// Fewer events per stream will require a larger bloom filter (or incur more false positives)
-			// We could count them to be precise, but a reasonable estimate will be faster.
-			const int averageEventsPerStreamPerFile = 4;
-			long size = entryCount / averageEventsPerStreamPerFile;
-			size = Math.Clamp(
-				value: size,
-				min: BloomFilterAccessor.MinSizeKB * 1000,
-				max: BloomFilterAccessor.MaxSizeKB * 1000);
-			return size;
-		}
-
-		private readonly Guid _id;
-		private readonly string _filename;
-		private readonly long _count;
-		private readonly long _size;
-		private readonly UnmanagedMemoryAppendOnlyList<Midpoint> _midpoints = null;
-		private readonly uint _midpointsCached = 0;
-		private readonly long _midpointsCacheSize = 0;
-
-		private readonly PersistentBloomFilter _bloomFilter;
-		private readonly LRUCache<StreamHash, CacheEntry> _lruCache;
-		private readonly LRUCache<StreamHash, bool> _lruConfirmedNotPresent;
-
-		private readonly IndexEntryKey _minEntry, _maxEntry;
-		private readonly ObjectPool<WorkItem> _workItems;
-		private readonly byte _version;
-		private readonly int _indexEntrySize;
-		private readonly int _indexKeySize;
-
-		private readonly ManualResetEventSlim _destroyEvent = new ManualResetEventSlim(false);
-		private volatile bool _deleteFile;
-		private bool _disposed;
-
-		public ReadOnlySpan<Midpoint> GetMidPoints() {
-			if(_midpoints == null)
-				return ReadOnlySpan<Midpoint>.Empty;
-
-			return _midpoints.AsSpan();
-		}
-
-		private PTable(string filename,
-			Guid id,
-			int initialReaders,
-			int maxReaders,
-			int depth = 16,
-			bool skipIndexVerify = false,
-			bool useBloomFilter = true,
-			int lruCacheSize = 1_000_000) {
-
-			Ensure.NotNullOrEmpty(filename, "filename");
-			Ensure.NotEmptyGuid(id, "id");
-			Ensure.Positive(maxReaders, "maxReaders");
-			Ensure.Nonnegative(depth, "depth");
-
-			if (!File.Exists(filename))
-				throw new CorruptIndexException(new PTableNotFoundException(filename));
-
-			_id = id;
-			_filename = filename;
-
-			Log.Debug("Loading " + (skipIndexVerify ? "" : "and Verification ") + "of PTable '{pTable}' started...",
-				Path.GetFileName(Filename));
-			var sw = Stopwatch.StartNew();
-			_size = new FileInfo(_filename).Length;
-
-			Helper.EatException(() => {
-				// this action will fail if the file is created on a Unix system that does not have permissions to make files read-only
-				File.SetAttributes(_filename, FileAttributes.ReadOnly | FileAttributes.NotContentIndexed);
-			});
-
-			_workItems = new ObjectPool<WorkItem>(string.Format("PTable {0} work items", _id),
-				initialReaders,
-				maxReaders,
-				() => new WorkItem(filename, DefaultBufferSize),
-				workItem => workItem.Dispose(),
-				pool => OnAllWorkItemsDisposed());
-
-			var readerWorkItem = GetWorkItem();
-			try {
-				readerWorkItem.Stream.Seek(0, SeekOrigin.Begin);
-				var header = PTableHeader.FromStream(readerWorkItem.Stream);
-
-				if (header.Version == PTableVersions.IndexV1) {
-					throw new CorruptIndexException(new UnsupportedFileVersionException(
-						_filename, header.Version, Version,
-						"Detected a V1 index file, which is no longer supported. " +
-						"The index will be backed up and rebuilt in a supported format. " +
-						"This may take a long time for large databases. " +
-						"You can also use a version of ESDB (>= 3.9.0 and < 24.10.0) to upgrade the " +
-						"indexes to a supported format by performing an index merge."));
-				}
-
-				if ((header.Version != PTableVersions.IndexV2) &&
-					(header.Version != PTableVersions.IndexV3) &&
-					(header.Version != PTableVersions.IndexV4))
-					throw new CorruptIndexException(new UnsupportedFileVersionException(_filename, header.Version, Version));
-				_version = header.Version;
-
-				if (_version == PTableVersions.IndexV1) {
-					_indexEntrySize = IndexEntryV1Size;
-					_indexKeySize = IndexKeyV1Size;
-				}
-
-				if (_version == PTableVersions.IndexV2) {
-					_indexEntrySize = IndexEntryV2Size;
-					_indexKeySize = IndexKeyV2Size;
-				}
-
-				if (_version == PTableVersions.IndexV3) {
-					_indexEntrySize = IndexEntryV3Size;
-					_indexKeySize = IndexKeyV3Size;
-				}
-
-				if (_version >= PTableVersions.IndexV4) {
-					//read the PTable footer
-					var previousPosition = readerWorkItem.Stream.Position;
-					readerWorkItem.Stream.Seek(readerWorkItem.Stream.Length - MD5Size - PTableFooter.GetSize(_version),
-						SeekOrigin.Begin);
-					var footer = PTableFooter.FromStream(readerWorkItem.Stream);
-					if (footer.Version != header.Version)
-						throw new CorruptIndexException(
-							String.Format("PTable header/footer version mismatch: {0}/{1}", header.Version,
-								footer.Version), new InvalidFileException("Invalid PTable file."));
-
-					if (_version == PTableVersions.IndexV4) {
-						_indexEntrySize = IndexEntryV4Size;
-						_indexKeySize = IndexKeyV4Size;
-					} else
-						throw new InvalidOperationException("Unknown PTable version: " + _version);
-
-					_midpointsCached = footer.NumMidpointsCached;
-					_midpointsCacheSize = _midpointsCached * _indexEntrySize;
-					readerWorkItem.Stream.Seek(previousPosition, SeekOrigin.Begin);
-				}
-
-				long indexEntriesTotalSize = (_size - PTableHeader.Size - _midpointsCacheSize -
-											  PTableFooter.GetSize(_version) - MD5Size);
-
-				if (indexEntriesTotalSize < 0) {
-					throw new CorruptIndexException(String.Format(
-						"Total size of index entries < 0: {0}. _size: {1}, header size: {2}, _midpointsCacheSize: {3}, footer size: {4}, md5 size: {5}",
-						indexEntriesTotalSize, _size, PTableHeader.Size, _midpointsCacheSize,
-						PTableFooter.GetSize(_version), MD5Size));
-				} else if (indexEntriesTotalSize % _indexEntrySize != 0) {
-					throw new CorruptIndexException(String.Format(
-						"Total size of index entries: {0} is not divisible by index entry size: {1}",
-						indexEntriesTotalSize, _indexEntrySize));
-				}
-
-				_count = indexEntriesTotalSize / _indexEntrySize;
-
-				if (_version >= PTableVersions.IndexV4 && _count > 0 && _midpointsCached > 0 && _midpointsCached < 2) {
-					//if there is at least 1 index entry with version>=4 and there are cached midpoints, there should always be at least 2 midpoints cached
-					throw new CorruptIndexException(String.Format(
-						"Less than 2 midpoints cached in PTable. Index entries: {0}, Midpoints cached: {1}", _count,
-						_midpointsCached));
-				} else if (_count >= 2 && _midpointsCached > _count) {
-					//if there are at least 2 index entries, midpoints count should be at most the number of index entries
-					throw new CorruptIndexException(String.Format(
-						"More midpoints cached in PTable than index entries. Midpoints: {0} , Index entries: {1}",
-						_midpointsCached, _count));
-				}
-
-				if (Count == 0) {
-					_minEntry = new IndexEntryKey(ulong.MaxValue, long.MaxValue);
-					_maxEntry = new IndexEntryKey(ulong.MinValue, long.MinValue);
-				} else {
-					var minEntry = ReadEntry(_indexEntrySize, Count - 1, readerWorkItem, _version);
-					_minEntry = new IndexEntryKey(minEntry.Stream, minEntry.Version);
-					var maxEntry = ReadEntry(_indexEntrySize, 0, readerWorkItem, _version);
-					_maxEntry = new IndexEntryKey(maxEntry.Stream, maxEntry.Version);
-				}
-			} catch (Exception) {
-				Dispose();
-				throw;
-			} finally {
-				ReturnWorkItem(readerWorkItem);
-			}
-
-			int calcdepth = 0;
-			try {
-				calcdepth = GetDepth(_count * _indexEntrySize, depth);
-				_midpoints = CacheMidpointsAndVerifyHash(calcdepth, skipIndexVerify);
-
-				// the bloom filter is important to the efficient functioning of the cache because without it
-				// any cache miss request for data not contained in this file will cause two fruitless searches
-				// to populate the _lruConfirmedNotPresent cache, which itself will become heavily used.
-				if (lruCacheSize > 0 && !useBloomFilter) {
-					Log.Warning("Index cache is enabled (--index-cache-size > 0) but will not be used because --use-index-bloom-filters is false");
-				}
-
-				if (useBloomFilter)
-					_bloomFilter = TryOpenBloomFilter();
-
-				if (lruCacheSize > 0) {
-					if (_bloomFilter is not null) {
-						_lruCache = new("ConfirmedPresent", lruCacheSize);
-						_lruConfirmedNotPresent = new("ConfirmedNotPresent", lruCacheSize);
-					} else {
-						Log.Information("Not enabling LRU cache for index {file} because it has no bloom filter", _filename);
-					}
-				}
-			} catch (PossibleToHandleOutOfMemoryException) {
-				Log.Error(
-					"Unable to create midpoints for PTable '{pTable}' ({count} entries, depth {depth} requested). "
-					+ "Performance hit will occur. OOM Exception.", Path.GetFileName(Filename), Count, depth);
-			}
-
-			Log.Debug(
-				"Loading PTable (Version: {version}) '{pTable}' ({count} entries, cache depth {depth}) done in {elapsed}.",
-				_version, Path.GetFileName(Filename), Count, calcdepth, sw.Elapsed);
-		}
-
-		~PTable() => Dispose(false);
-
-		internal UnmanagedMemoryAppendOnlyList<Midpoint> CacheMidpointsAndVerifyHash(int depth, bool skipIndexVerify) {
-			var buffer = new byte[4096];
-			if (depth < 0 || depth > 30)
-				throw new ArgumentOutOfRangeException("depth");
-			var count = Count;
-			if (count == 0 || depth == 0)
-				return null;
-
-			if (skipIndexVerify) {
-				Log.Debug("Disabling Verification of PTable");
-			}
-
-			Stream stream = null;
-			WorkItem workItem = null;
-			if (RuntimeInformation.IsUnix) {
-				workItem = GetWorkItem();
-				stream = workItem.Stream;
-			} else {
-				stream = UnbufferedFileStream.Create(_filename, FileMode.Open, FileAccess.Read, FileShare.Read,
-					4096, 4096, false, 4096);
-			}
-
-			UnmanagedMemoryAppendOnlyList<Midpoint> midpoints = null;
-
-			try {
-				using (var md5 = MD5.Create()) {
-					int midpointsCount;
-					try {
-						midpointsCount = (int)Math.Max(2L, Math.Min((long)1 << depth, count));
-						midpoints = new UnmanagedMemoryAppendOnlyList<Midpoint>(midpointsCount);
-					} catch (OutOfMemoryException exc) {
-						throw new PossibleToHandleOutOfMemoryException("Failed to allocate memory for Midpoint cache.",
-							exc);
-					}
-
-					if (skipIndexVerify && (_version >= PTableVersions.IndexV4)) {
-						if (_midpointsCached == midpointsCount) {
-							//index verification is disabled and cached midpoints with the same depth requested are available
-							//so, we can load them directly from the PTable file
-							Log.Debug("Loading {midpointsCached} cached midpoints from PTable", _midpointsCached);
-							long startOffset = stream.Length - MD5Size - PTableFooter.GetSize(_version) -
-											   _midpointsCacheSize;
-							stream.Seek(startOffset, SeekOrigin.Begin);
-							for (int k = 0; k < (int)_midpointsCached; k++) {
-								stream.Read(buffer, 0, _indexEntrySize);
-								IndexEntryKey key;
-								long index;
-								if (_version == PTableVersions.IndexV4) {
-									key = new IndexEntryKey(BitConverter.ToUInt64(buffer, 8),
-										BitConverter.ToInt64(buffer, 0));
-									index = BitConverter.ToInt64(buffer, 8 + 8);
-								} else
-									throw new InvalidOperationException("Unknown PTable version: " + _version);
-
-								midpoints.Add(new Midpoint(key, index));
-
-								if (k > 0) {
-									if (midpoints[k].Key.GreaterThan(midpoints[k - 1].Key)) {
-										throw new CorruptIndexException(String.Format(
-											"Index entry key for midpoint {0} (stream: {1}, version: {2}) < index entry key for midpoint {3} (stream: {4}, version: {5})",
-											k - 1, midpoints[k - 1].Key.Stream, midpoints[k - 1].Key.Version, k,
-											midpoints[k].Key.Stream, midpoints[k].Key.Version));
-									} else if (midpoints[k - 1].ItemIndex > midpoints[k].ItemIndex) {
-										throw new CorruptIndexException(String.Format(
-											"Item index for midpoint {0} ({1}) > Item index for midpoint {2} ({3})",
-											k - 1, midpoints[k - 1].ItemIndex, k, midpoints[k].ItemIndex));
-									}
-								}
-							}
-
-							return midpoints;
-						} else
-							Log.Debug(
-								"Skipping loading of cached midpoints from PTable due to count mismatch, cached midpoints: {midpointsCached} / required midpoints: {midpointsCount}",
-								_midpointsCached, midpointsCount);
-					}
-
-					if (!skipIndexVerify) {
-						stream.Seek(0, SeekOrigin.Begin);
-						stream.Read(buffer, 0, PTableHeader.Size);
-						md5.TransformBlock(buffer, 0, PTableHeader.Size, null, 0);
-					}
-
-					long previousNextIndex = long.MinValue;
-					var previousKey = new IndexEntryKey(long.MaxValue, long.MaxValue);
-					for (int k = 0; k < midpointsCount; ++k) {
-						long nextIndex = GetMidpointIndex(k, count, midpointsCount);
-						if (previousNextIndex != nextIndex) {
-							if (!skipIndexVerify) {
-								ReadUntilWithMd5(PTableHeader.Size + _indexEntrySize * nextIndex, stream, md5);
-								stream.Read(buffer, 0, _indexKeySize);
-								md5.TransformBlock(buffer, 0, _indexKeySize, null, 0);
-							} else {
-								stream.Seek(PTableHeader.Size + _indexEntrySize * nextIndex, SeekOrigin.Begin);
-								stream.Read(buffer, 0, _indexKeySize);
-							}
-
-							IndexEntryKey key;
-							if (_version == PTableVersions.IndexV1) {
-								key = new IndexEntryKey(BitConverter.ToUInt32(buffer, 4),
-									BitConverter.ToInt32(buffer, 0));
-							} else if (_version == PTableVersions.IndexV2) {
-								key = new IndexEntryKey(BitConverter.ToUInt64(buffer, 4),
-									BitConverter.ToInt32(buffer, 0));
-							} else {
-								key = new IndexEntryKey(BitConverter.ToUInt64(buffer, 8),
-									BitConverter.ToInt64(buffer, 0));
-							}
-
-							midpoints.Add(new Midpoint(key, nextIndex));
-							previousNextIndex = nextIndex;
-							previousKey = key;
-						} else {
-							midpoints.Add(new Midpoint(previousKey, previousNextIndex));
-						}
-
-						if (k > 0) {
-							if (midpoints[k].Key.GreaterThan(midpoints[k - 1].Key)) {
-								throw new CorruptIndexException(String.Format(
-									"Index entry key for midpoint {0} (stream: {1}, version: {2}) < index entry key for midpoint {3} (stream: {4}, version: {5})",
-									k - 1, midpoints[k - 1].Key.Stream, midpoints[k - 1].Key.Version, k,
-									midpoints[k].Key.Stream, midpoints[k].Key.Version));
-							} else if (midpoints[k - 1].ItemIndex > midpoints[k].ItemIndex) {
-								throw new CorruptIndexException(String.Format(
-									"Item index for midpoint {0} ({1}) > Item index for midpoint {2} ({3})", k - 1,
-									midpoints[k - 1].ItemIndex, k, midpoints[k].ItemIndex));
-							}
-						}
-					}
-
-					if (!skipIndexVerify) {
-						ReadUntilWithMd5(stream.Length - MD5Size, stream, md5);
-						//verify hash (should be at stream.length - MD5Size)
-						md5.TransformFinalBlock(Empty.ByteArray, 0, 0);
-						var fileHash = new byte[MD5Size];
-						stream.Read(fileHash, 0, MD5Size);
-						ValidateHash(md5.Hash, fileHash);
-					}
-
-					return midpoints;
-				}
-			} catch (PossibleToHandleOutOfMemoryException) {
-				midpoints?.Dispose();
-				throw;
-			} catch {
-				midpoints?.Dispose();
-				Dispose();
-				throw;
-			} finally {
-				if (RuntimeInformation.IsUnix) {
-					if (workItem != null)
-						ReturnWorkItem(workItem);
-				} else {
-					stream?.Dispose();
-				}
-			}
-		}
-
-		private PersistentBloomFilter TryOpenBloomFilter() {
-			try {
-				// use existing filter without specifying what size it needs to be
-				// for scavenged ptables in particular we do not know exactly what size the bloom filter
-				// is because it is based on the pre-scavenge size
-				var bloomFilter = new PersistentBloomFilter(
-					FileStreamPersistence.FromFile(BloomFilterFilename));
-
-				return bloomFilter;
-			} catch (FileNotFoundException) {
-				Log.Information("Bloom filter for index file {file} does not exist", _filename);
-				return null;
-			} catch (CorruptedFileException ex) {
-				Log.Error(ex, "Bloom filter for index file {file} is corrupt. Performance will be degraded", _filename);
-				return null;
-			} catch (CorruptedHashException ex) {
-				Log.Error(ex, "Bloom filter contents for index file {file} are corrupt. Performance will be degraded", _filename);
-				return null;
-			} catch (OutOfMemoryException ex) {
-				Log.Warning(ex, "Could not allocate enough memory for Bloom filter for index file {file}. Performance will be degraded", _filename);
-				return null;
-			} catch (Exception ex) {
-				Log.Error(ex, "Unexpected error opening bloom filter for index file {file}. Performance will be degraded", _filename);
-				return null;
-			}
-		}
-
-		private readonly byte[] TmpReadBuf = new byte[DefaultBufferSize];
-
-		private void ReadUntilWithMd5(long nextPos, Stream fileStream, HashAlgorithm md5) {
-			long toRead = nextPos - fileStream.Position;
-			if (toRead < 0)
-				throw new Exception("should not do negative reads.");
-			while (toRead > 0) {
-				var localReadCount = Math.Min(toRead, TmpReadBuf.Length);
-				int read = fileStream.Read(TmpReadBuf, 0, (int)localReadCount);
-				md5.TransformBlock(TmpReadBuf, 0, read, null, 0);
-				toRead -= read;
-			}
-		}
-
-		void ValidateHash(byte[] fromFile, byte[] computed) {
-			if (computed == null)
-				throw new CorruptIndexException(new HashValidationException("Calculated MD5 hash is null!"));
-			if (fromFile == null)
-				throw new CorruptIndexException(new HashValidationException("Read from file MD5 hash is null!"));
-
-			if (computed.Length != fromFile.Length)
-				throw new CorruptIndexException(
-					new HashValidationException(
-						string.Format(
-							"Hash sizes differ! FileHash({0}): {1}, hash({2}): {3}.",
-							computed.Length,
-							BitConverter.ToString(computed),
-							fromFile.Length,
-							BitConverter.ToString(fromFile))));
-
-			for (int i = 0; i < fromFile.Length; i++) {
-				if (fromFile[i] != computed[i])
-					throw new CorruptIndexException(
-						new HashValidationException(
-							string.Format(
-								"Hashes are different! computed: {0}, hash: {1}.",
-								BitConverter.ToString(computed),
-								BitConverter.ToString(fromFile))));
-			}
-		}
-
-		public IEnumerable<IndexEntry> IterateAllInOrder() {
-			var workItem = GetWorkItem();
-			try {
-				workItem.Stream.Position = PTableHeader.Size;
-				for (long i = 0, n = Count; i < n; i++) {
-					yield return ReadNextNoSeek(workItem, _version);
-				}
-			} finally {
-				ReturnWorkItem(workItem);
-			}
-		}
-
-		public bool TryGetOneValue(ulong stream, long number, out long position) {
-			if (TryGetLatestEntryNoCache(GetHash(stream), number, number, out var entry)) {
-				position = entry.Position;
-				return true;
-			}
-
-			position = -1;
-			return false;
-		}
-
-		public bool TryGetLatestEntry(ulong stream, out IndexEntry entry) =>
-			_lruCache == null
-				? TryGetLatestEntryNoCache(GetHash(stream), 0, long.MaxValue, out entry)
-				: TryGetLatestEntryWithCache(GetHash(stream), out entry);
-
-		private bool TryGetLatestEntryWithCache(StreamHash stream, out IndexEntry entry) {
-			if (!TryLookThroughLru(stream, out var value)) {
-				// stream not present
-				entry = TableIndex.InvalidIndexEntry;
-				return false;
-			}
-
-			entry = ReadEntry(_indexEntrySize, value.LatestOffset, _version);
-			return true;
-		}
-
-		public bool TryGetLatestEntry(
-			ulong stream,
-			long beforePosition,
-			Func<IndexEntry, bool> isForThisStream,
-			out IndexEntry entry) {
-
-			Ensure.Nonnegative(beforePosition, nameof(beforePosition));
-			var streamHash = GetHash(stream);
-
-			entry = TableIndex.InvalidIndexEntry;
-
-			var startKey = BuildKey(streamHash, 0);
-			var endKey = BuildKey(streamHash, long.MaxValue);
-
-			if (startKey.GreaterThan(_maxEntry) || endKey.SmallerThan(_minEntry))
-				return false;
-
-			if (!MightContainStream(streamHash))
-				return false;
-
-			var workItem = GetWorkItem();
-			try {
-				var recordRange = LocateRecordRange(endKey, startKey, out var lowBoundsCheck, out var highBoundsCheck);
-
-				try {
-					if (!TryGetLatestEntryFast(
-							streamHash,
-							beforePosition,
-							isForThisStream,
-							recordRange,
-							lowBoundsCheck,
-							highBoundsCheck,
-							workItem,
-							out entry))
-						return false;
-				} catch (HashCollisionException) {
-					// fall back to linear search if there's a hash collision
-					if (!TryGetLatestEntrySlow(
-							streamHash,
-							beforePosition,
-							isForThisStream,
-							recordRange,
-							lowBoundsCheck,
-							highBoundsCheck,
-							workItem,
-							out entry))
-						return false;
-				}
-
-				return true;
-			} finally {
-				ReturnWorkItem(workItem);
-			}
-		}
-
-		// linearly search the whole range for the entry with the greatest position that
-		// is for this stream and before the beforePosition.
-		private bool TryGetLatestEntrySlow(
-			StreamHash stream,
-			long beforePosition,
-			Func<IndexEntry, bool> isForThisStream,
-			Range recordRange,
-			IndexEntryKey lowBoundsCheck,
-			IndexEntryKey highBoundsCheck,
-			WorkItem workItem,
-			out IndexEntry entry) {
-
-			long maxBeforePosition = long.MinValue;
-			IndexEntry maxEntry = default;
-
-			for (var idx = recordRange.Lower; idx <= recordRange.Upper; idx++) {
-				var candidateEntry = ReadEntry(_indexEntrySize, idx, workItem, _version);
-				var candidateEntryKey = new IndexEntryKey(candidateEntry.Stream, candidateEntry.Version);
-
-				if (candidateEntryKey.GreaterThan(lowBoundsCheck)) {
-					throw new MaybeCorruptIndexException(
-						$"Candidate entry key (stream: {candidateEntryKey.Stream}, version: {candidateEntryKey.Version}) > "
-						+ $"low bounds check key (stream: {lowBoundsCheck.Stream}, version: {lowBoundsCheck.Version})");
-				}
-
-				if (candidateEntryKey.SmallerThan(highBoundsCheck)) {
-					throw new MaybeCorruptIndexException(
-						$"Candidate entry key (stream: {candidateEntryKey.Stream}, version: {candidateEntryKey.Version}) < "
-						+ $"high bounds check key (stream: {highBoundsCheck.Stream}, version: {highBoundsCheck.Version})");
-				}
-
-				if (candidateEntry.Stream == stream.Hash &&
-					candidateEntry.Position < beforePosition &&
-					candidateEntry.Position > maxBeforePosition &&
-					isForThisStream(candidateEntry)) {
-
-					maxBeforePosition = candidateEntry.Position;
-					maxEntry = candidateEntry;
-				}
-			}
-
-			if (maxBeforePosition != long.MinValue) {
-				entry = maxEntry;
-				return true;
-			}
-
-			entry = TableIndex.InvalidIndexEntry;
-			return false;
-		}
-
-		private bool TryGetLatestEntryFast(
-			StreamHash stream,
-			long beforePosition,
-			Func<IndexEntry,bool> isForThisStream,
-			Range recordRange,
-			IndexEntryKey lowBoundsCheck,
-			IndexEntryKey highBoundsCheck,
-			WorkItem workItem,
-			out IndexEntry entry) {
-
-			var startKey = BuildKey(stream, 0);
-			var endKey = BuildKey(stream, long.MaxValue);
-
-			var low = recordRange.Lower;
-			var high = recordRange.Upper;
-
-			while (low < high) {
-				var mid = low + (high - low) / 2;
-				IndexEntry midpoint = ReadEntry(_indexEntrySize, mid, workItem, _version);
-
-				var midpointKey = new IndexEntryKey(midpoint.Stream, midpoint.Version);
-				if (midpointKey.GreaterThan(lowBoundsCheck)) {
-					throw new MaybeCorruptIndexException(
-						$"Midpoint key (stream: {midpointKey.Stream}, version: {midpointKey.Version}) > "
-					+ $"low bounds check key (stream: {lowBoundsCheck.Stream}, version: {lowBoundsCheck.Version})");
-				}
-
-				if (midpointKey.SmallerThan(highBoundsCheck)) {
-					throw new MaybeCorruptIndexException(
-						$"Midpoint key (stream: {midpointKey.Stream}, version: {midpointKey.Version}) < "
-					+ $"high bounds check key (stream: {highBoundsCheck.Stream}, version: {highBoundsCheck.Version})");
-				}
-
-				if (midpointKey.Stream != stream.Hash) {
-					if (midpointKey.GreaterThan(endKey)) {
-						low = mid + 1;
-						lowBoundsCheck = midpointKey;
-					} else if (midpointKey.SmallerThan(startKey)){
-						high = mid - 1;
-						highBoundsCheck = midpointKey;
-					} else 	throw new MaybeCorruptIndexException(
-						$"Midpoint key (stream: {midpointKey.Stream}, version: {midpointKey.Version}) >= "
-						+ $"start key (stream: {startKey.Stream}, version: {startKey.Version}) and <= "
-						+ $"end key (stream: {endKey.Stream}, version: {endKey.Version}) "
-						+ "but the stream hashes do not match.");
-					continue;
-				}
-
-				if (!isForThisStream(midpoint))
-					throw new HashCollisionException();
-
-				if (midpoint.Position >= beforePosition) {
-					low = mid + 1;
-					lowBoundsCheck = midpointKey;
-				} else {
-					high = mid;
-					highBoundsCheck = midpointKey;
-				}
-			}
-
-			var candidateEntry = ReadEntry(_indexEntrySize, high, workItem, _version);
-
-			// index entry is for a different hash
-			if (candidateEntry.Stream != stream.Hash) {
-				entry = TableIndex.InvalidIndexEntry;
-				return false;
-			}
-
-			// index entry is for the correct hash but for a colliding stream
-			if (!isForThisStream(candidateEntry))
-				throw new HashCollisionException();
-
-			// index entry is for the correct stream but does not respect the position limit
-			if (candidateEntry.Position >= beforePosition) {
-				entry = TableIndex.InvalidIndexEntry;
-				return false;
-			}
-
-			// index entry is for the correct stream and respects the position limit
-			entry = candidateEntry;
-			return true;
-		}
-
-		private bool TryGetLatestEntryNoCache(StreamHash stream, long startNumber, long endNumber, out IndexEntry entry) {
-			Ensure.Nonnegative(startNumber, "startNumber");
-			Ensure.Nonnegative(endNumber, "endNumber");
-
-			if (!MightContainStream(stream)) {
-				entry = TableIndex.InvalidIndexEntry;
-				return false;
-			}
-
-			return TrySearchForLatestEntry(stream, startNumber, endNumber, out entry, out _);
-		}
-
-		private bool TrySearchForLatestEntry(StreamHash stream, long startNumber, long endNumber,
-			out IndexEntry entry, out long offset) {
-
-			entry = TableIndex.InvalidIndexEntry;
-
-			var startKey = BuildKey(stream, startNumber);
-			var endKey = BuildKey(stream, endNumber);
-
-			if (startKey.GreaterThan(_maxEntry) || endKey.SmallerThan(_minEntry)) {
-				offset = default;
-				return false;
-			}
-
-			var workItem = GetWorkItem();
-			try {
-				var high = ChopForLatest(workItem, endKey);
-				var candEntry = ReadEntry(_indexEntrySize, high, workItem, _version);
-				var candKey = new IndexEntryKey(candEntry.Stream, candEntry.Version);
-
-				if (candKey.GreaterThan(endKey))
-					throw new MaybeCorruptIndexException(string.Format(
-						"candEntry ({0}@{1}) > startKey {2}, stream {3}, startNum {4}, endNum {5}, PTable: {6}.",
-						candEntry.Stream, candEntry.Version, startKey, stream, startNumber, endNumber, Filename));
-				if (candKey.SmallerThan(startKey)) {
-					offset = default;
-					return false;
-				}
-
-				entry = candEntry;
-				offset = high;
-				return true;
-			} finally {
-				ReturnWorkItem(workItem);
-			}
-		}
-
-		public bool TryGetOldestEntry(ulong stream, out IndexEntry entry) =>
-			_lruCache == null
-				? TryGetOldestEntryNoCache(GetHash(stream), out entry)
-				: TryGetOldestEntryWithCache(GetHash(stream), out entry);
-
-		private bool TryGetOldestEntryWithCache(StreamHash stream, out IndexEntry entry) {
-			if (!TryLookThroughLru(stream, out var value)) {
-				// stream not present
-				entry = TableIndex.InvalidIndexEntry;
-				return false;
-			}
-
-			entry = ReadEntry(_indexEntrySize, value.OldestOffset, _version);
-			return true;
-		}
-
-		private bool TryGetOldestEntryNoCache(StreamHash stream, out IndexEntry entry) {
-			if (!MightContainStream(stream)) {
-				entry = TableIndex.InvalidIndexEntry;
-				return false;
-			}
-
-			return TrySearchForOldestEntry(stream, 0, long.MaxValue, out entry, out _);
-		}
-
-		public bool TryGetNextEntry(ulong stream, long afterVersion, out IndexEntry entry) {
-			var hash = GetHash(stream);
-			if (afterVersion >= long.MaxValue || !MightContainStream(hash)) {
-				entry = TableIndex.InvalidIndexEntry;
-				return false;
-			}
-			return TrySearchForOldestEntry(hash, afterVersion + 1, long.MaxValue, out entry, out _);
-		}
-
-		public bool TryGetPreviousEntry(ulong stream, long beforeVersion, out IndexEntry entry) {
-			var hash = GetHash(stream);
-			if (beforeVersion <= 0 || !MightContainStream(hash)) {
-				entry = TableIndex.InvalidIndexEntry;
-				return false;
-			}
-			return TrySearchForLatestEntry(hash, 0, beforeVersion - 1, out entry, out _);
-		}
-
-		private bool TrySearchForOldestEntry(StreamHash stream, long startNumber, long endNumber,
-			out IndexEntry entry, out long offset) {
-			Ensure.Nonnegative(startNumber, "startNumber");
-			Ensure.Nonnegative(endNumber, "endNumber");
-
-			entry = TableIndex.InvalidIndexEntry;
-
-			var startKey = BuildKey(stream, startNumber);
-			var endKey = BuildKey(stream, endNumber);
-
-			if (startKey.GreaterThan(_maxEntry) || endKey.SmallerThan(_minEntry)) {
-				offset = default;
-				return false;
-			}
-
-			var workItem = GetWorkItem();
-			try {
-				var high = ChopForOldest(workItem, startKey);
-				var candEntry = ReadEntry(_indexEntrySize, high, workItem, _version);
-				var candidateKey = new IndexEntryKey(candEntry.Stream, candEntry.Version);
-				if (candidateKey.SmallerThan(startKey))
-					throw new MaybeCorruptIndexException(string.Format(
-						"candEntry ({0}@{1}) < startKey {2}, stream {3}, startNum {4}, endNum {5}, PTable: {6}.",
-						candEntry.Stream, candEntry.Version, startKey, stream, startNumber, endNumber, Filename));
-				if (candidateKey.GreaterThan(endKey)) {
-					offset = default;
-					return false;
-				}
-
-				entry = candEntry;
-				offset = high;
-				return true;
-			} finally {
-				ReturnWorkItem(workItem);
-			}
-		}
-
-		public IList<IndexEntry> GetRange(ulong stream, long startNumber, long endNumber, int? limit = null) {
-			Ensure.Nonnegative(startNumber, "startNumber");
-			Ensure.Nonnegative(endNumber, "endNumber");
-
-			return _lruCache == null
-				? GetRangeNoCache(GetHash(stream), startNumber, endNumber, limit)
-				: GetRangeWithCache(GetHash(stream), startNumber, endNumber, limit);
-		}
-
-		private StreamHash GetHash(ulong hash) {
-			return new(_version, hash);
-		}
-
-		private static IndexEntryKey BuildKey(StreamHash stream, long version) {
-			return new IndexEntryKey(stream.Hash, version);
-		}
-
-		// use the midpoints (if they exist) to narrow the search range.
-		// returns a range of indexes to search and corresponding IndexEntryKeys
-		private Range LocateRecordRange(IndexEntryKey key, out IndexEntryKey lowKey, out IndexEntryKey highKey) =>
-			LocateRecordRange(key, key, out lowKey, out highKey);
-
-		private Range LocateRecordRange(IndexEntryKey lowKey, IndexEntryKey highKey, out IndexEntryKey lowKeyOut, out IndexEntryKey highKeyOut) {
-			lowKeyOut = new IndexEntryKey(ulong.MaxValue, long.MaxValue);
-			highKeyOut = new IndexEntryKey(ulong.MinValue, long.MinValue);
-
-			ReadOnlySpan<Midpoint> midpoints = null;
-			if (_midpoints != null) {
-				midpoints = _midpoints.AsSpan();
-			}
-
-			if (midpoints == null)
-				return new Range(0, Count - 1);
-
-			long lowerMidpoint = LowerMidpointBound(midpoints, lowKey);
-			long upperMidpoint = UpperMidpointBound(midpoints, highKey);
-
-			lowKeyOut = midpoints[(int)lowerMidpoint].Key;
-			highKeyOut = midpoints[(int)upperMidpoint].Key;
-
-			return new Range(midpoints[(int)lowerMidpoint].ItemIndex, midpoints[(int)upperMidpoint].ItemIndex);
-		}
-
-		private long LowerMidpointBound(ReadOnlySpan<Midpoint> midpoints, IndexEntryKey key) {
-			long l = 0;
-			long r = midpoints.Length - 1;
-			while (l < r) {
-				long m = l + (r - l + 1) / 2;
-				if (midpoints[(int)m].Key.GreaterThan(key))
-					l = m;
-				else
-					r = m - 1;
-			}
-
-			return l;
-		}
-
-		private long UpperMidpointBound(ReadOnlySpan<Midpoint> midpoints, IndexEntryKey key) {
-			long l = 0;
-			long r = midpoints.Length - 1;
-			while (l < r) {
-				long m = l + (r - l) / 2;
-				if (midpoints[(int)m].Key.SmallerThan(key))
-					r = m;
-				else
-					l = m + 1;
-			}
-
-			return r;
-		}
-
-		private static void PositionAtEntry(int indexEntrySize, long indexNum, WorkItem workItem) {
-			workItem.Stream.Seek(indexEntrySize * indexNum + PTableHeader.Size, SeekOrigin.Begin);
-		}
-
-		private static IndexEntry ReadEntry(int indexEntrySize, long indexNum, WorkItem workItem, int ptableVersion) {
-			long seekTo = indexEntrySize * indexNum + PTableHeader.Size;
-			workItem.Stream.Seek(seekTo, SeekOrigin.Begin);
-			return ReadNextNoSeek(workItem, ptableVersion);
-		}
-
-		private IndexEntry ReadEntry(int indexEntrySize, long indexNum, int ptableVersion) {
-			var workItem = GetWorkItem();
-			try {
-				return ReadEntry(_indexEntrySize, indexNum, workItem, ptableVersion);
-			} finally {
-				ReturnWorkItem(workItem);
-			}
-		}
-
-		private static IndexEntry ReadNextNoSeek(WorkItem workItem, int ptableVersion) {
-			long version = (ptableVersion >= PTableVersions.IndexV3)
-				? workItem.Reader.ReadInt64()
-				: workItem.Reader.ReadInt32();
-			ulong stream = ptableVersion == PTableVersions.IndexV1
-				? workItem.Reader.ReadUInt32()
-				: workItem.Reader.ReadUInt64();
-			long position = workItem.Reader.ReadInt64();
-			return new IndexEntry(stream, version, position);
-		}
-
-		private WorkItem GetWorkItem() {
-			try {
-				return _workItems.Get();
-			} catch (ObjectPoolDisposingException) {
-				throw new FileBeingDeletedException();
-			} catch (ObjectPoolMaxLimitReachedException) {
-				throw new Exception("Unable to acquire work item.");
-			}
-		}
-
-		private void ReturnWorkItem(WorkItem workItem) {
-			_workItems.Return(workItem);
-		}
-
-		public void MarkForDestruction() {
-			_deleteFile = true;
-			_workItems.MarkForDisposal();
-		}
-
-		public void Dispose() {
-			_deleteFile = false;
-			_workItems.MarkForDisposal();
-		}
-
-		protected virtual void Dispose(bool disposing) {
-			if (_disposed) {
-				return;
-			}
-
-			if (disposing) {
-				//dispose any managed objects here
-				_midpoints?.Dispose();
-				_bloomFilter?.Dispose();
-			}
-
-			_disposed = true;
-		}
-
-		private void OnAllWorkItemsDisposed() {
-			File.SetAttributes(_filename, FileAttributes.Normal);
-			if (_deleteFile) {
-				_bloomFilter?.Dispose();
-				File.Delete(_filename);
-				File.Delete(BloomFilterFilename);
-			}
-			_destroyEvent.Set();
-			Dispose(true);
-			GC.SuppressFinalize(this);
-		}
-
-		public void WaitForDisposal(int timeout) {
-			if (!_destroyEvent.Wait(timeout))
-				throw new TimeoutException();
-		}
-
-		public void WaitForDisposal(TimeSpan timeout) {
-			if (!_destroyEvent.Wait(timeout))
-				throw new TimeoutException();
-		}
-
-		public List<IndexEntry> GetRangeWithCache(StreamHash stream, long startNumber, long endNumber, int? limit = null) {
-			if (!OverlapsRange(stream, startNumber, endNumber, out var tableLatestNumber, out var tableLatestOffset))
-				return new List<IndexEntry>();
-
-			// it does overlap.
-			// if the requested end version is greater than or equal to what we have in this ptable
-			// then we can jump to tableLatestOffset and read the file forwards from there without binary chopping.
-			if (endNumber >= tableLatestNumber) {
-				return PositionAndReadForward(stream, startNumber, endNumber, limit, tableLatestOffset: tableLatestOffset);
-			}
-			// todo: else if the requested start version is less than or equal to what we have in this ptable
-			// then we could jump to tableStartOffset and read the file backwards.
-
-			// otherwise the request is contained strictly within what we have in this ptable
-			// and we must chop for it
-			return ChopAndReadForward(stream, startNumber, endNumber, limit);
-		}
-
-		public List<IndexEntry> GetRangeNoCache(StreamHash stream, long startNumber, long endNumber, int? limit = null) {
-			if (!MightContainStream(stream))
-				return new List<IndexEntry>();
-
-			return ChopAndReadForward(stream, startNumber, endNumber, limit);
-		}
-
-		private List<IndexEntry> ChopAndReadForward(StreamHash stream, long startNumber, long endNumber, int? limit) {
-			return PositionAndReadForward(stream, startNumber, endNumber, limit: limit, tableLatestOffset: null);
-		}
-
-		private List<IndexEntry> PositionAndReadForward(StreamHash stream, long startNumber, long endNumber, int? limit, long? tableLatestOffset) {
-			var result = new List<IndexEntry>();
-
-			var startKey = BuildKey(stream, startNumber);
-			var endKey = BuildKey(stream, endNumber);
-
-			if (startKey.GreaterThan(_maxEntry) || endKey.SmallerThan(_minEntry))
-				return result;
-
-			var workItem = GetWorkItem();
-			try {
-				var high = tableLatestOffset ?? ChopForLatest(workItem, endKey);
-				PositionAtEntry(_indexEntrySize, high, workItem);
-				result = ReadForward(workItem, high, startKey, endKey, limit);
-				return result;
-			} catch (MaybeCorruptIndexException ex) {
-				throw new MaybeCorruptIndexException(
-					$"{ex.Message}. stream {stream}, startNum {startNumber}, endNum {endNumber}, PTable: {Filename}.");
-			} finally {
-				ReturnWorkItem(workItem);
-			}
-		}
-
-		// forward here meaning forward in the file. towards the older records.
-		private List<IndexEntry> ReadForward(WorkItem workItem, long high, IndexEntryKey startKey, IndexEntryKey endKey, int? limit) {
-
-			var result = new List<IndexEntry>();
-
-			for (long i = high, n = Count; i < n; ++i) {
-				var entry = ReadNextNoSeek(workItem, _version);
-
-				var candidateKey = new IndexEntryKey(entry.Stream, entry.Version);
-
-				if (candidateKey.GreaterThan(endKey))
-					throw new MaybeCorruptIndexException($"candidateKey ({candidateKey}) > endKey ({endKey})");
-
-				if (candidateKey.SmallerThan(startKey))
-					return result;
-
-				result.Add(entry);
-
-				if (result.Count == limit)
-					break;
-			}
-
-			return result;
-		}
-
-		private long ChopForLatest(WorkItem workItem, IndexEntryKey endKey) {
-			var recordRange = LocateRecordRange(endKey, out var lowBoundsCheck, out var highBoundsCheck);
-			long low = recordRange.Lower;
-			long high = recordRange.Upper;
-			while (low < high) {
-				var mid = low + (high - low) / 2;
-				var midpoint = ReadEntry(_indexEntrySize, mid, workItem, _version);
-				var midpointKey = new IndexEntryKey(midpoint.Stream, midpoint.Version);
-
-				if (midpointKey.GreaterThan(lowBoundsCheck)) {
-					throw new MaybeCorruptIndexException(String.Format(
-						"Midpoint key (stream: {0}, version: {1}) > low bounds check key (stream: {2}, version: {3})",
-						midpointKey.Stream, midpointKey.Version, lowBoundsCheck.Stream, lowBoundsCheck.Version));
-				} else if (!midpointKey.GreaterEqualsThan(highBoundsCheck)) {
-					throw new MaybeCorruptIndexException(String.Format(
-						"Midpoint key (stream: {0}, version: {1}) < high bounds check key (stream: {2}, version: {3})",
-						midpointKey.Stream, midpointKey.Version, highBoundsCheck.Stream, highBoundsCheck.Version));
-				}
-
-				if (midpointKey.GreaterThan(endKey)) {
-					low = mid + 1;
-					lowBoundsCheck = midpointKey;
-				} else {
-					high = mid;
-					highBoundsCheck = midpointKey;
-				}
-			}
-
-			return high;
-		}
-
-		private long ChopForOldest(WorkItem workItem, IndexEntryKey startKey) {
-			var recordRange = LocateRecordRange(startKey, out var lowBoundsCheck, out var highBoundsCheck);
-			long low = recordRange.Lower;
-			long high = recordRange.Upper;
-			while (low < high) {
-				var mid = low + (high - low + 1) / 2;
-				var midpoint = ReadEntry(_indexEntrySize, mid, workItem, _version);
-				var midpointKey = new IndexEntryKey(midpoint.Stream, midpoint.Version);
-
-				if (midpointKey.GreaterThan(lowBoundsCheck)) {
-					throw new MaybeCorruptIndexException(String.Format(
-						"Midpoint key (stream: {0}, version: {1}) > low bounds check key (stream: {2}, version: {3})",
-						midpointKey.Stream, midpointKey.Version, lowBoundsCheck.Stream, lowBoundsCheck.Version));
-				} else if (!midpointKey.GreaterEqualsThan(highBoundsCheck)) {
-					throw new MaybeCorruptIndexException(String.Format(
-						"Midpoint key (stream: {0}, version: {1}) < high bounds check key (stream: {2}, version: {3})",
-						midpointKey.Stream, midpointKey.Version, highBoundsCheck.Stream, highBoundsCheck.Version));
-				}
-
-				if (midpointKey.SmallerThan(startKey)) {
-					high = mid - 1;
-					highBoundsCheck = midpointKey;
-				} else {
-					low = mid;
-					lowBoundsCheck = midpointKey;
-				}
-			}
-
-			return high;
-		}
-
-		// Checks if this file might contain any of the range from start to end inclusive.
-		private bool OverlapsRange(
-			StreamHash stream,
-			long startNumber,
-			long endNumber,
-			out long tableLatestNumber,
-			out long tableLatestOffset) {
-
-			if (!TryLookThroughLru(stream, out var cacheEntry)) {
-				// no range present
-				tableLatestNumber = default;
-				tableLatestOffset = default;
-				return false;
-			}
-
-			tableLatestNumber = cacheEntry.LatestNumber;
-			tableLatestOffset = cacheEntry.LatestOffset;
-
-			// there is a range for this stream, does it overlap?
-			return startNumber <= cacheEntry.LatestNumber && cacheEntry.OldestNumber <= endNumber;
-		}
-
-		// Gets the value from the lru cache. Populate the cache if necessary
-		// returns true iff we managed to get a CacheEntry. i.e. if any events are
-		// present for this stream in this file.
-		private bool TryLookThroughLru(StreamHash stream, out CacheEntry value) {
-			Ensure.NotNull(_lruCache, nameof(_lruCache));
-
-			if (_lruCache.TryGet(stream, out value)) {
-				return true;
-			}
-
-			if (!MightContainStream(stream)) {
-				value = default;
-				return false;
-			}
-
-			if (_lruConfirmedNotPresent.TryGet(stream, out _)) {
-				value = default;
-				return false;
-			}
-
-			// its not in either of the LRU caches. add it to one or the other
-			// so that subsequent calls do not require searching.
-			if (TrySearchForLatestEntry(stream, 0, long.MaxValue, out var latestEntry, out var latestOffset) &&
-				TrySearchForOldestEntry(stream, 0, long.MaxValue, out var oldestEntry, out var oldestOffset)) {
-
-				value = new(
-					oldestNumber: oldestEntry.Version,
-					latestNumber: latestEntry.Version,
-					oldestOffset: oldestOffset,
-					latestOffset: latestOffset);
-
-				_lruCache.Put(stream, value);
-				return true;
-			} else {
-				// in case of false positive in the bloom filter
-				_lruConfirmedNotPresent.Put(stream, true);
-				value = default;
-				return false;
-			}
-		}
-
-		private bool MightContainStream(StreamHash stream) {
-			if (_bloomFilter == null)
-				return true;
-
-			// with a workitem checked out the ptable (and bloom filter specifically)
-			// wont get disposed
-			var workItem = GetWorkItem();
-			try {
-				var streamHash = stream.Hash;
-				return _bloomFilter.MightContain(GetSpan(ref streamHash));
-			} finally {
-				ReturnWorkItem(workItem);
-			}
-		}
-
-		private static ReadOnlySpan<byte> GetSpan(ref ulong streamHash) =>
-			MemoryMarshal.AsBytes(MemoryMarshal.CreateReadOnlySpan(ref streamHash, 1));
-
-		// construct this struct with a 64 bit hash and it will convert it to a hash
-		// for the specified table version
-		public readonly struct StreamHash : IEquatable<StreamHash> {
-			public StreamHash(byte version, ulong hash) {
-				Hash = version == PTableVersions.IndexV1 ? hash >> 32 : hash;
-			}
-
-			public ulong Hash { get; init; }
-
-			public override int GetHashCode() =>
-				Hash.GetHashCode();
-
-			public bool Equals(StreamHash other) =>
-				Hash == other.Hash;
-
-			public override bool Equals(object obj) =>
-				obj is StreamHash streamHash && Equals(streamHash);
-		}
-
-		public struct CacheEntry {
-			public readonly long OldestNumber;
-			public readonly long LatestNumber;
-			public readonly long OldestOffset;
-			public readonly long LatestOffset;
-
-			public CacheEntry(long oldestNumber, long latestNumber, long oldestOffset, long latestOffset) {
-				OldestNumber = oldestNumber;
-				LatestNumber = latestNumber;
-				OldestOffset = oldestOffset;
-				LatestOffset = latestOffset;
-			}
-		}
-
-		public struct Midpoint {
-			public readonly IndexEntryKey Key;
-			public readonly long ItemIndex;
-
-			public Midpoint(IndexEntryKey key, long itemIndex) {
-				Key = key;
-				ItemIndex = itemIndex;
-			}
-		}
-
-		public readonly struct IndexEntryKey {
-			public readonly ulong Stream;
-			public readonly long Version;
-
-			public IndexEntryKey(ulong stream, long version) {
-				Stream = stream;
-				Version = version;
-			}
-
-			public bool GreaterThan(IndexEntryKey other) {
-				if (Stream == other.Stream) {
-					return Version > other.Version;
-				}
-
-				return Stream > other.Stream;
-			}
-
-			public bool SmallerThan(IndexEntryKey other) {
-				if (Stream == other.Stream) {
-					return Version < other.Version;
-				}
-
-				return Stream < other.Stream;
-			}
-
-			public bool GreaterEqualsThan(IndexEntryKey other) {
-				if (Stream == other.Stream) {
-					return Version >= other.Version;
-				}
-
-				return Stream >= other.Stream;
-			}
-
-			public bool SmallerEqualsThan(IndexEntryKey other) {
-				if (Stream == other.Stream) {
-					return Version <= other.Version;
-				}
-
-				return Stream <= other.Stream;
-			}
-
-			public override string ToString() {
-				return string.Format("Stream: {0}, Version: {1}", Stream, Version);
-			}
-		}
-
-		private class WorkItem : IDisposable {
-			public readonly FileStream Stream;
-			public readonly BinaryReader Reader;
-
-			public WorkItem(string filename, int bufferSize) {
-				Stream = new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.Read, bufferSize,
-					FileOptions.RandomAccess);
-				Reader = new BinaryReader(Stream);
-			}
-
-			~WorkItem() {
-				Dispose(false);
-			}
-
-			public void Dispose() {
-				Dispose(true);
-				GC.SuppressFinalize(this);
-			}
-
-			private void Dispose(bool disposing) {
-				if (disposing) {
-					Stream.Dispose();
-					Reader.Dispose();
-				}
-			}
-		}
-	}
-
-	internal class HashCollisionException : Exception {
-	}
-}
diff --git a/src/EventStore.Core/Index/PTableConstruction.cs b/src/EventStore.Core/Index/PTableConstruction.cs
deleted file mode 100644
index fcfb1f63f56..00000000000
--- a/src/EventStore.Core/Index/PTableConstruction.cs
+++ /dev/null
@@ -1,789 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Security.Cryptography;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.DataStructures;
-using EventStore.Core.DataStructures.ProbabilisticFilter;
-using MD5 = EventStore.Core.Hashing.MD5;
-
-namespace EventStore.Core.Index {
-	public unsafe partial class PTable {
-		public static PTable FromFile(string filename, int initialReaders, int maxReaders,
-			int cacheDepth, bool skipIndexVerify,
-			bool useBloomFilter = true,
-			int lruCacheSize = 1_000_000) {
-
-			return new PTable(filename, Guid.NewGuid(), initialReaders, maxReaders,
-				cacheDepth, skipIndexVerify, useBloomFilter, lruCacheSize);
-		}
-
-		private const int MidpointsOverflowSafetyNet = 20;
-
-		public static PersistentBloomFilter ConstructBloomFilter(
-			bool useBloomFilter,
-			string filename,
-			long indexEntryCount,
-			Func<long, long> genBloomFilterSizeBytes = null) {
-
-			if (!useBloomFilter)
-				return null;
-
-			try {
-				genBloomFilterSizeBytes ??= GenBloomFilterSizeBytes;
-				return new PersistentBloomFilter(
-					new FileStreamPersistence(
-						path: GenBloomFilterFilename(filename),
-						create: true,
-						size: genBloomFilterSizeBytes(indexEntryCount)));
-			} catch (OutOfMemoryException ex) {
-				Log.Warning(ex, "Could not allocate enough memory for Bloom filter for index file {file}. Performance will be degraded", filename);
-				return null;
-			} catch (Exception ex) {
-				Log.Error(ex, "Could not create Bloom filter for index file {file}. Performance will be degraded", filename);
-				return null;
-			}
-		}
-
-		public static PTable FromMemtable(IMemTable table, string filename, int initialReaders, int maxReaders,
-			int cacheDepth = 16,
-			bool skipIndexVerify = false,
-			bool useBloomFilter = true,
-			int lruCacheSize = 1_000_000) {
-
-			Ensure.NotNull(table, "table");
-			Ensure.NotNullOrEmpty(filename, "filename");
-			Ensure.Nonnegative(cacheDepth, "cacheDepth");
-
-			int indexEntrySize = GetIndexEntrySize(table.Version);
-			long dumpedEntryCount = 0;
-
-			var sw = Stopwatch.StartNew();
-			using (var fs = new FileStream(filename, FileMode.Create, FileAccess.ReadWrite, FileShare.None,
-				DefaultSequentialBufferSize, FileOptions.SequentialScan)) {
-
-				var fileSize = GetFileSizeUpToIndexEntries(table.Count, table.Version);
-				fs.SetLength(fileSize);
-				fs.Seek(0, SeekOrigin.Begin);
-
-				using (var bloomFilter = ConstructBloomFilter(useBloomFilter, filename, table.Count))
-				using (var md5 = MD5.Create())
-				using (var cs = new CryptoStream(fs, md5, CryptoStreamMode.Write))
-				using (var bs = new BufferedStream(cs, DefaultSequentialBufferSize)) {
-					// WRITE HEADER
-					var headerBytes = new PTableHeader(table.Version).AsByteArray();
-					cs.Write(headerBytes, 0, headerBytes.Length);
-
-					// WRITE INDEX ENTRIES
-					var buffer = new byte[indexEntrySize];
-					var records = table.IterateAllInOrder();
-					var requiredMidpointCount = GetRequiredMidpointCountCached(table.Count, table.Version, cacheDepth);
-					using var midpoints = new UnmanagedMemoryAppendOnlyList<Midpoint>((int)requiredMidpointCount + MidpointsOverflowSafetyNet);
-
-					var midpointCalculator = new MidpointIndexCalculator(table.Count, requiredMidpointCount);
-					long indexEntry = 0L;
-
-					ulong? previousHash = null;
-					foreach (var rec in records) {
-						AppendRecordTo(bs, buffer, table.Version, rec, indexEntrySize);
-						dumpedEntryCount += 1;
-						if (table.Version >= PTableVersions.IndexV4 &&
-							indexEntry == midpointCalculator.NextMidpointIndex) {
-							midpoints.Add(new Midpoint(new IndexEntryKey(rec.Stream, rec.Version), indexEntry));
-							midpointCalculator.Advance();
-						}
-
-						// WRITE BLOOM FILTER ENTRY
-						if (bloomFilter != null && rec.Stream != previousHash) {
-							// we are creating a PTable of the same version as the Memtable. therefore the hash is the right format
-							var streamHash = rec.Stream;
-							bloomFilter.Add(GetSpan(ref streamHash));
-							previousHash = rec.Stream;
-						}
-
-						indexEntry++;
-					}
-
-					//WRITE MIDPOINTS
-					if (table.Version >= PTableVersions.IndexV4) {
-						var numIndexEntries = table.Count;
-						if (dumpedEntryCount != numIndexEntries) {
-							//if index entries have been removed, compute the midpoints again
-							numIndexEntries = dumpedEntryCount;
-							requiredMidpointCount =
-								GetRequiredMidpointCount(numIndexEntries, table.Version, cacheDepth);
-							ComputeMidpoints(bs, fs, table.Version, indexEntrySize, numIndexEntries,
-								requiredMidpointCount, midpoints);
-						}
-
-						if (midpoints.Count > 0) {
-							if (midpoints[0].ItemIndex != 0)
-								throw new Exception("First midpoint was not the first index entry");
-							if (midpoints[^1].ItemIndex != numIndexEntries - 1)
-								throw new Exception("Last midpoint was not the last index entry");
-						}
-
-						WriteMidpointsTo(bs, fs, table.Version, indexEntrySize, buffer, dumpedEntryCount,
-							numIndexEntries, requiredMidpointCount, midpoints);
-					}
-
-					bloomFilter?.Flush();
-					bs.Flush();
-					cs.FlushFinalBlock();
-
-					// WRITE MD5
-					var hash = md5.Hash;
-					fs.SetLength(fs.Position + MD5Size);
-					fs.Write(hash, 0, hash.Length);
-					fs.FlushToDisk();
-				}
-			}
-
-			Log.Debug("Dumped MemTable [{id}, {table} entries] in {elapsed}.", table.Id, table.Count, sw.Elapsed);
-			return new PTable(filename, table.Id, initialReaders, maxReaders, cacheDepth, skipIndexVerify, useBloomFilter, lruCacheSize);
-		}
-
-		public static PTable MergeTo(
-			IList<PTable> tables,
-			string outputFile,
-			byte version,
-			int initialReaders,
-			int maxReaders,
-			int cacheDepth = 16,
-			bool skipIndexVerify = false,
-			bool useBloomFilter = true,
-			int lruCacheSize = 1_000_000) {
-
-			Ensure.NotNull(tables, "tables");
-			Ensure.NotNullOrEmpty(outputFile, "outputFile");
-			Ensure.Nonnegative(cacheDepth, "cacheDepth");
-
-			var indexEntrySize = GetIndexEntrySize(version);
-
-			long numIndexEntries = 0;
-			for (var i = 0; i < tables.Count; i++)
-				numIndexEntries += tables[i].Count;
-
-			var fileSizeUpToIndexEntries = GetFileSizeUpToIndexEntries(numIndexEntries, version);
-			if (tables.Count == 2)
-				return MergeTo2(tables, numIndexEntries, indexEntrySize, outputFile,
-					version, initialReaders, maxReaders, cacheDepth, skipIndexVerify, useBloomFilter, lruCacheSize); // special case
-
-			Log.Debug("PTables merge started.");
-			var watch = Stopwatch.StartNew();
-
-			var enumerators = tables.Select(Get64bitEnumerator).ToList();
-			try {
-				for (int i = 0; i < enumerators.Count; i++) {
-					if (!enumerators[i].MoveNext()) {
-						enumerators[i].Dispose();
-						enumerators.RemoveAt(i);
-						i--;
-					}
-				}
-
-				long dumpedEntryCount = 0;
-				using (var f = new FileStream(outputFile, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.None,
-					DefaultSequentialBufferSize, FileOptions.SequentialScan)) {
-					f.SetLength(fileSizeUpToIndexEntries);
-					f.Seek(0, SeekOrigin.Begin);
-
-					using (var bloomFilter = ConstructBloomFilter(useBloomFilter, outputFile, tables.Sum(table => table.Count)))
-					using (var md5 = MD5.Create())
-					using (var cs = new CryptoStream(f, md5, CryptoStreamMode.Write))
-					using (var bs = new BufferedStream(cs, DefaultSequentialBufferSize)) {
-						// WRITE HEADER
-						var headerBytes = new PTableHeader(version).AsByteArray();
-						cs.Write(headerBytes, 0, headerBytes.Length);
-
-						var buffer = new byte[indexEntrySize];
-
-						var requiredMidpointCount = GetRequiredMidpointCountCached(numIndexEntries, version, cacheDepth);
-						using var midpoints = new UnmanagedMemoryAppendOnlyList<Midpoint>((int)requiredMidpointCount + MidpointsOverflowSafetyNet);
-
-						var midpointCalculator = new MidpointIndexCalculator(numIndexEntries, requiredMidpointCount);
-						long indexEntry = 0L;
-
-						// WRITE INDEX ENTRIES
-						ulong? previousHash = null;
-						while (enumerators.Count > 0) {
-							var idx = GetMaxOf(enumerators);
-							var current = enumerators[idx].Current;
-							AppendRecordTo(bs, buffer, version, current, indexEntrySize);
-							if (version >= PTableVersions.IndexV4 &&
-								indexEntry == midpointCalculator.NextMidpointIndex) {
-								midpoints.Add(new Midpoint(new IndexEntryKey(current.Stream, current.Version), indexEntry));
-								midpointCalculator.Advance();
-							}
-
-							// WRITE BLOOM FILTER ENTRY
-							if (bloomFilter != null && current.Stream != previousHash) {
-								var streamHash = current.Stream;
-								bloomFilter.Add(GetSpan(ref streamHash));
-								previousHash = current.Stream;
-							}
-
-							indexEntry++;
-							dumpedEntryCount++;
-
-							if (!enumerators[idx].MoveNext()) {
-								enumerators[idx].Dispose();
-								enumerators.RemoveAt(idx);
-							}
-						}
-
-						//WRITE MIDPOINTS
-						if (version >= PTableVersions.IndexV4) {
-							if (dumpedEntryCount != numIndexEntries) {
-								//if index entries have been removed, compute the midpoints again
-								numIndexEntries = dumpedEntryCount;
-								requiredMidpointCount = GetRequiredMidpointCount(numIndexEntries, version, cacheDepth);
-								ComputeMidpoints(bs, f, version, indexEntrySize, numIndexEntries,
-									requiredMidpointCount, midpoints);
-							}
-
-							if (midpoints.Count > 0) {
-								if (midpoints[0].ItemIndex != 0)
-									throw new Exception("First midpoint was not the first index entry");
-								if (midpoints[^1].ItemIndex != numIndexEntries - 1)
-									throw new Exception("Last midpoint was not the last index entry");
-							}
-
-							WriteMidpointsTo(bs, f, version, indexEntrySize, buffer, dumpedEntryCount, numIndexEntries,
-								requiredMidpointCount, midpoints);
-						}
-
-						bloomFilter?.Flush();
-						bs.Flush();
-						cs.FlushFinalBlock();
-
-						f.FlushToDisk();
-						f.SetLength(f.Position + MD5Size);
-
-						// WRITE MD5
-						var hash = md5.Hash;
-						f.Write(hash, 0, hash.Length);
-						f.FlushToDisk();
-					}
-				}
-
-				Log.Debug(
-					"PTables merge finished in {elapsed} ([{entryCount}] entries merged into {dumpedEntryCount}).",
-					watch.Elapsed, string.Join(", ", tables.Select(x => x.Count)), dumpedEntryCount);
-				return new PTable(outputFile, Guid.NewGuid(), initialReaders, maxReaders, cacheDepth, skipIndexVerify, useBloomFilter, lruCacheSize);
-			} finally {
-				foreach (var enumerableTable in enumerators) {
-					enumerableTable.Dispose();
-				}
-			}
-		}
-
-		public static int GetIndexEntrySize(byte version) {
-			if (version == PTableVersions.IndexV1) {
-				return PTable.IndexEntryV1Size;
-			}
-
-			if (version == PTableVersions.IndexV2) {
-				return PTable.IndexEntryV2Size;
-			}
-
-			if (version == PTableVersions.IndexV3) {
-				return PTable.IndexEntryV3Size;
-			}
-
-			return PTable.IndexEntryV4Size;
-		}
-
-		private static PTable MergeTo2(IList<PTable> tables, long numIndexEntries, int indexEntrySize,
-			string outputFile,
-			byte version, int initialReaders, int maxReaders,
-			int cacheDepth, bool skipIndexVerify,
-			bool useBloomFilter, int lruCacheSize) {
-
-			Log.Debug("PTables merge started (specialized for <= 2 tables).");
-			var watch = Stopwatch.StartNew();
-
-			var fileSizeUpToIndexEntries = GetFileSizeUpToIndexEntries(numIndexEntries, version);
-			var enumerators = tables.Select(Get64bitEnumerator).ToList();
-			try {
-				long dumpedEntryCount = 0;
-				using (var f = new FileStream(outputFile, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.None,
-					DefaultSequentialBufferSize, FileOptions.SequentialScan)) {
-					f.SetLength(fileSizeUpToIndexEntries);
-					f.Seek(0, SeekOrigin.Begin);
-
-					using (var bloomFilter = ConstructBloomFilter(useBloomFilter, outputFile, tables.Sum(table => table.Count)))
-					using (var md5 = MD5.Create())
-					using (var cs = new CryptoStream(f, md5, CryptoStreamMode.Write))
-					using (var bs = new BufferedStream(cs, DefaultSequentialBufferSize)) {
-						// WRITE HEADER
-						var headerBytes = new PTableHeader(version).AsByteArray();
-						cs.Write(headerBytes, 0, headerBytes.Length);
-
-						// WRITE INDEX ENTRIES
-						var buffer = new byte[indexEntrySize];
-						var requiredMidpointCount =
-							GetRequiredMidpointCountCached(numIndexEntries, version, cacheDepth);
-						using var midpoints = new UnmanagedMemoryAppendOnlyList<Midpoint>((int)requiredMidpointCount + MidpointsOverflowSafetyNet);
-
-						var midpointCalculator = new MidpointIndexCalculator(numIndexEntries, requiredMidpointCount);
-						long indexEntry = 0L;
-
-						var enum1 = enumerators[0];
-						var enum2 = enumerators[1];
-						bool available1 = enum1.MoveNext();
-						bool available2 = enum2.MoveNext();
-						IndexEntry current;
-						ulong? previousHash = null;
-						while (available1 || available2) {
-							var entry1 = new IndexEntry(enum1.Current.Stream, enum1.Current.Version,
-								enum1.Current.Position);
-							var entry2 = new IndexEntry(enum2.Current.Stream, enum2.Current.Version,
-								enum2.Current.Position);
-
-							if (available1 && (!available2 || entry1.CompareTo(entry2) > 0)) {
-								current = entry1;
-								available1 = enum1.MoveNext();
-							} else {
-								current = entry2;
-								available2 = enum2.MoveNext();
-							}
-
-							AppendRecordTo(bs, buffer, version, current, indexEntrySize);
-							if (version >= PTableVersions.IndexV4 &&
-								indexEntry == midpointCalculator.NextMidpointIndex) {
-								midpoints.Add(new Midpoint(new IndexEntryKey(current.Stream, current.Version),
-									indexEntry));
-								midpointCalculator.Advance();
-							}
-
-							// WRITE BLOOM FILTER ENTRY
-							if (bloomFilter != null && current.Stream != previousHash) {
-								// upgradeHash has already ensured the hash is in the right format for the target
-								var streamHash = current.Stream;
-								bloomFilter.Add(GetSpan(ref streamHash));
-								previousHash = current.Stream;
-							}
-
-							indexEntry++;
-							dumpedEntryCount++;
-						}
-
-						//WRITE MIDPOINTS
-						if (version >= PTableVersions.IndexV4) {
-							if (dumpedEntryCount != numIndexEntries) {
-								//if index entries have been removed, compute the midpoints again
-								numIndexEntries = dumpedEntryCount;
-								requiredMidpointCount = GetRequiredMidpointCount(numIndexEntries, version, cacheDepth);
-								ComputeMidpoints(bs, f, version, indexEntrySize, numIndexEntries,
-									requiredMidpointCount, midpoints);
-							}
-
-							if (midpoints.Count > 0) {
-								if (midpoints[0].ItemIndex != 0)
-									throw new Exception("First midpoint was not the first index entry");
-								if (midpoints[^1].ItemIndex != numIndexEntries - 1)
-									throw new Exception("Last midpoint was not the last index entry");
-							}
-
-							WriteMidpointsTo(bs, f, version, indexEntrySize, buffer, dumpedEntryCount, numIndexEntries,
-								requiredMidpointCount, midpoints);
-						}
-
-						bloomFilter?.Flush();
-						bs.Flush();
-						cs.FlushFinalBlock();
-
-						f.SetLength(f.Position + MD5Size);
-
-						// WRITE MD5
-						var hash = md5.Hash;
-						f.Write(hash, 0, hash.Length);
-						f.FlushToDisk();
-					}
-				}
-
-				Log.Debug(
-					"PTables merge finished in {elapsed} ([{entryCount}] entries merged into {dumpedEntryCount}).",
-					watch.Elapsed, string.Join(", ", tables.Select(x => x.Count)), dumpedEntryCount);
-				return new PTable(outputFile, Guid.NewGuid(), initialReaders, maxReaders, cacheDepth, skipIndexVerify, useBloomFilter, lruCacheSize);
-			} finally {
-				foreach (var enumerator in enumerators) {
-					enumerator.Dispose();
-				}
-			}
-		}
-
-		public static PTable Scavenged(
-			PTable table,
-			string outputFile,
-			byte version,
-			Func<IndexEntry, bool> shouldKeep,
-			out long spaceSaved,
-			int initialReaders,
-			int maxReaders,
-			int cacheDepth = 16,
-			bool skipIndexVerify = false,
-			bool useBloomFilter = true,
-			int lruCacheSize = 1_000_000,
-			CancellationToken ct = default) {
-
-			Ensure.NotNull(table, "table");
-			Ensure.NotNullOrEmpty(outputFile, "outputFile");
-			Ensure.Nonnegative(cacheDepth, "cacheDepth");
-
-			var indexEntrySize = GetIndexEntrySize(version);
-			var numIndexEntries = table.Count;
-
-			var fileSizeUpToIndexEntries = GetFileSizeUpToIndexEntries(numIndexEntries, version);
-
-			Log.Debug("PTables scavenge started with {numIndexEntries} entries.", numIndexEntries);
-			var watch = Stopwatch.StartNew();
-			long keptCount = 0L;
-			long droppedCount;
-
-			try {
-				using (var f = new FileStream(outputFile, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.None,
-					DefaultSequentialBufferSize, FileOptions.SequentialScan)) {
-					f.SetLength(fileSizeUpToIndexEntries);
-					f.Seek(0, SeekOrigin.Begin);
-
-					using (var bloomFilter = ConstructBloomFilter(useBloomFilter, outputFile, table.Count))
-					using (var md5 = MD5.Create())
-					using (var cs = new CryptoStream(f, md5, CryptoStreamMode.Write))
-					using (var bs = new BufferedStream(cs, DefaultSequentialBufferSize)) {
-						// WRITE HEADER
-						var headerBytes = new PTableHeader(version).AsByteArray();
-						cs.Write(headerBytes, 0, headerBytes.Length);
-
-						// WRITE SCAVENGED INDEX ENTRIES
-						var buffer = new byte[indexEntrySize];
-						using (var enumerator = Get64bitEnumerator(table)) {
-
-							ulong? previousHash = null;
-							while (enumerator.MoveNext()) {
-								ct.ThrowIfCancellationRequested();
-								if (shouldKeep(enumerator.Current)) {
-									var current = enumerator.Current;
-									AppendRecordTo(bs, buffer, version, enumerator.Current, indexEntrySize);
-									// WRITE BLOOM FILTER ENTRY
-									if (bloomFilter != null && current.Stream != previousHash) {
-										var streamHash = current.Stream;
-										bloomFilter.Add(GetSpan(ref streamHash));
-										previousHash = current.Stream;
-									}
-									keptCount++;
-								}
-							}
-						}
-
-						droppedCount = numIndexEntries - keptCount;
-
-						var forceKeep = version > table.Version;
-
-						if (droppedCount == 0 && !forceKeep) {
-							Log.Debug(
-								"PTable scavenge finished in {elapsed}. No entries removed so not keeping scavenged table.",
-								watch.Elapsed);
-
-							try {
-								bs.Close();
-								File.Delete(outputFile);
-							} catch (Exception ex) {
-								Log.Error(ex, "Unable to delete unwanted scavenged PTable: {outputFile}",
-									outputFile);
-							}
-
-							var bloomFilterFile = GenBloomFilterFilename(outputFile);
-							try {
-								File.Delete(bloomFilterFile);
-							} catch (Exception ex) {
-								Log.Error(ex, "Unable to delete unwanted bloom filter: {bloomFilterFile}",
-									bloomFilterFile);
-							}
-
-							spaceSaved = 0;
-							return null;
-						}
-
-						if (droppedCount == 0 && forceKeep) {
-							Log.Debug("Keeping scavenged index even though it isn't smaller; version upgraded.");
-						}
-
-						//CALCULATE AND WRITE MIDPOINTS
-						if (version >= PTableVersions.IndexV4) {
-							var requiredMidpointCount = GetRequiredMidpointCount(keptCount, version, cacheDepth);
-							using var midpoints =
-								new UnmanagedMemoryAppendOnlyList<Midpoint>(
-									(int)requiredMidpointCount + MidpointsOverflowSafetyNet);
-							ComputeMidpoints(bs, f, version, indexEntrySize, keptCount,
-								requiredMidpointCount, midpoints, ct);
-							WriteMidpointsTo(bs, f, version, indexEntrySize, buffer, keptCount, keptCount,
-								requiredMidpointCount, midpoints);
-						}
-
-						bloomFilter?.Flush();
-						bs.Flush();
-						cs.FlushFinalBlock();
-
-						f.FlushToDisk();
-						f.SetLength(f.Position + MD5Size);
-
-						// WRITE MD5
-						var hash = md5.Hash;
-						f.Write(hash, 0, hash.Length);
-						f.FlushToDisk();
-					}
-				}
-
-				Log.Debug(
-					"PTable scavenge finished in {elapsed} ({droppedCount} entries removed, {keptCount} remaining).",
-					watch.Elapsed,
-					droppedCount, keptCount);
-				var scavengedTable = new PTable(outputFile, Guid.NewGuid(), initialReaders, maxReaders, cacheDepth, skipIndexVerify, useBloomFilter, lruCacheSize);
-				spaceSaved = table._size - scavengedTable._size;
-				return scavengedTable;
-			} catch (Exception) {
-				try {
-					File.Delete(outputFile);
-				} catch (Exception ex) {
-					Log.Error(ex, "Unable to delete unwanted scavenged PTable: {outputFile}", outputFile);
-				}
-
-				var bloomFilterFile = GenBloomFilterFilename(outputFile);
-				try {
-					File.Delete(bloomFilterFile);
-				} catch (Exception ex) {
-					Log.Error(ex, "Unable to delete unwanted bloom filter: {bloomFilterFile}", bloomFilterFile);
-				}
-				throw;
-			}
-		}
-
-		private static int GetMaxOf(List<IEnumerator<IndexEntry>> enumerators) {
-			var max = new IndexEntry(ulong.MinValue, 0, long.MinValue);
-			int idx = 0;
-			for (int i = 0; i < enumerators.Count; i++) {
-				var cur = enumerators[i].Current;
-				if (cur.CompareTo(max) > 0) {
-					max = cur;
-					idx = i;
-				}
-			}
-
-			return idx;
-		}
-
-		private static void AppendRecordTo(Stream stream, byte[] buffer, byte version, IndexEntry entry,
-			int indexEntrySize) {
-			var bytes = entry.Bytes;
-			if (version == PTableVersions.IndexV1) {
-				var entryV1 = new IndexEntryV1((uint)entry.Stream, (int)entry.Version, entry.Position);
-				bytes = entryV1.Bytes;
-			} else if (version == PTableVersions.IndexV2) {
-				var entryV2 = new IndexEntryV2(entry.Stream, (int)entry.Version, entry.Position);
-				bytes = entryV2.Bytes;
-			}
-
-			Marshal.Copy((IntPtr)bytes, buffer, 0, indexEntrySize);
-			stream.Write(buffer, 0, indexEntrySize);
-		}
-
-		private static void ComputeMidpoints(BufferedStream bs, FileStream fs, byte version,
-			int indexEntrySize, long numIndexEntries, int requiredMidpointCount, UnmanagedMemoryAppendOnlyList<Midpoint> midpoints,
-			CancellationToken ct = default(CancellationToken)) {
-			int indexKeySize;
-			if (version == PTableVersions.IndexV4)
-				indexKeySize = IndexKeyV4Size;
-			else
-				throw new InvalidOperationException("Unknown PTable version: " + version);
-
-			midpoints.Clear();
-			bs.Flush();
-			byte[] buffer = new byte[indexKeySize];
-
-			var previousFileStreamPosition = fs.Position;
-
-			long previousIndex = -1;
-			IndexEntryKey previousKey = new IndexEntryKey(0, 0);
-
-			for (int k = 0; k < requiredMidpointCount; k++) {
-				ct.ThrowIfCancellationRequested();
-
-				long index = GetMidpointIndex(k, numIndexEntries, requiredMidpointCount);
-				if (index == previousIndex) {
-					midpoints.Add(new Midpoint(previousKey, previousIndex));
-				} else {
-					fs.Seek(PTableHeader.Size + index * indexEntrySize, SeekOrigin.Begin);
-					fs.Read(buffer, 0, indexKeySize);
-					IndexEntryKey key = new IndexEntryKey(BitConverter.ToUInt64(buffer, 8),
-						BitConverter.ToInt64(buffer, 0));
-					midpoints.Add(new Midpoint(key, index));
-					previousIndex = index;
-					previousKey = key;
-				}
-			}
-
-			fs.Seek(previousFileStreamPosition, SeekOrigin.Begin);
-		}
-
-		private static void WriteMidpointsTo(BufferedStream bs, FileStream fs, byte version, int indexEntrySize,
-			byte[] buffer, long dumpedEntryCount, long numIndexEntries, long requiredMidpointCount,
-			UnmanagedMemoryAppendOnlyList<Midpoint> midpoints) {
-			//WRITE MIDPOINT ENTRIES
-
-			//special case, when there is a single index entry, we need two midpoints
-			if (numIndexEntries == 1 && midpoints.Count == 1) {
-				midpoints.Add(new Midpoint(midpoints[0].Key, midpoints[0].ItemIndex));
-			}
-
-			var midpointsWritten = 0;
-			if (dumpedEntryCount == numIndexEntries && requiredMidpointCount == midpoints.Count) {
-				//if these values don't match, something is wrong
-				bs.Flush();
-				long fileSizeUpToMidpointEntries = GetFileSizeUpToMidpointEntries(fs.Position, midpoints.Count, version);
-				fs.SetLength(fileSizeUpToMidpointEntries);
-				for (var i = 0; i < midpoints.Count; i++) {
-					AppendMidpointRecordTo(bs, buffer, version, midpoints[i], indexEntrySize);
-				}
-
-				midpointsWritten = midpoints.Count;
-				Log.Debug("Cached {midpointsWritten} index midpoints to PTable", midpointsWritten);
-			} else
-				Log.Debug(
-					"Not caching index midpoints to PTable due to count mismatch. Table entries: {numIndexEntries} / Dumped entries: {dumpedEntryCount}, Required midpoint count: {requiredMidpointCount} /  Actual midpoint count: {midpoints}",
-					numIndexEntries, dumpedEntryCount, requiredMidpointCount, midpoints.Count);
-
-			bs.Flush();
-			fs.SetLength(fs.Position + PTableFooter.GetSize(version));
-			var footerBytes = new PTableFooter(version, (uint)midpointsWritten).AsByteArray();
-			bs.Write(footerBytes, 0, footerBytes.Length);
-			bs.Flush();
-		}
-
-		private static void AppendMidpointRecordTo(Stream stream, byte[] buffer, byte version, Midpoint midpointEntry,
-			int midpointEntrySize) {
-			if (version >= PTableVersions.IndexV4) {
-				ulong eventStream = midpointEntry.Key.Stream;
-				long eventVersion = midpointEntry.Key.Version;
-				long itemIndex = midpointEntry.ItemIndex;
-
-				for (int i = 0; i < 8; i++) {
-					buffer[i] = (byte)(eventVersion & 0xFF);
-					eventVersion >>= 8;
-				}
-
-				for (int i = 0; i < 8; i++) {
-					buffer[i + 8] = (byte)(eventStream & 0xFF);
-					eventStream >>= 8;
-				}
-
-				for (int i = 0; i < 8; i++) {
-					buffer[i + 16] = (byte)(itemIndex & 0xFF);
-					itemIndex >>= 8;
-				}
-
-				stream.Write(buffer, 0, midpointEntrySize);
-			}
-		}
-
-		static IEnumerator<IndexEntry> Get64bitEnumerator(ISearchTable table) {
-			if (table.Version == PTableVersions.IndexV1)
-				throw new InvalidOperationException("Attempted to merge or scavenge a V1 PTable");
-
-			return table.IterateAllInOrder().GetEnumerator();
-		}
-
-		public static long GetFileSizeUpToIndexEntries(long numIndexEntries, byte version) {
-			int indexEntrySize = GetIndexEntrySize(version);
-			return (long)PTableHeader.Size + numIndexEntries * indexEntrySize;
-		}
-
-		public static long GetFileSizeUpToMidpointEntries(long currentPosition, long numMidpointEntries, byte version) {
-			int indexEntrySize = GetIndexEntrySize(version);
-			return currentPosition + numMidpointEntries * indexEntrySize;
-		}
-
-		private static int GetDepth(long indexEntriesFileSize, int minDepth) {
-			minDepth = Math.Max(0, Math.Min(minDepth, 28));
-			if ((2L << 28) * 4096L < indexEntriesFileSize) return 28;
-			for (int i = 27; i >= minDepth; i--) {
-				if ((2L << i) * 4096L < indexEntriesFileSize) {
-					return i + 1;
-				}
-			}
-
-			return minDepth;
-		}
-
-		private static int GetRequiredMidpointCount(long numIndexEntries, byte version, int minDepth) {
-			if (numIndexEntries == 0) return 0;
-			if (numIndexEntries == 1) return 2;
-
-			int indexEntrySize = GetIndexEntrySize(version);
-			var depth = GetDepth(numIndexEntries * indexEntrySize, minDepth);
-			return (int)Math.Max(2L, Math.Min((long)1 << depth, numIndexEntries));
-		}
-
-
-		public static int GetRequiredMidpointCountCached(long numIndexEntries, byte version, int minDepth = 16) {
-			if (version >= PTableVersions.IndexV4)
-				return GetRequiredMidpointCount(numIndexEntries, version, minDepth);
-			return 0;
-		}
-
-		public static long GetMidpointIndex(int k, long numIndexEntries, int numMidpoints) {
-			ArgumentOutOfRangeException.ThrowIfNegativeOrZero(numIndexEntries);
-			ArgumentOutOfRangeException.ThrowIfNegative(k);
-			ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual(k, numMidpoints);
-
-			if (k == 0)
-				return 0;
-
-			if (k == numMidpoints - 1)
-				return numIndexEntries - 1;
-
-			// k * (numIndexEntries - 1) / (numMidpoints - 1), avoiding 64-bit integer overflows
-			var (q, r) = long.DivRem(numIndexEntries - 1, numMidpoints - 1);
-			return k * q + k * r / (numMidpoints - 1);
-		}
-
-		public class MidpointIndexCalculator {
-			private readonly long _numIndexEntries;
-			private readonly int _numMidpoints;
-			private int _midpointNumber;
-
-			public MidpointIndexCalculator(long numIndexEntries, int numMidpoints, int initialMidpointNumber = 0) {
-				ArgumentOutOfRangeException.ThrowIfNegative(numIndexEntries);
-				ArgumentOutOfRangeException.ThrowIfNegative(numMidpoints);
-
-				_numIndexEntries = numIndexEntries;
-				_numMidpoints = numMidpoints;
-				_midpointNumber = initialMidpointNumber;
-				Advance();
-			}
-
-			public long? NextMidpointIndex { get; private set; }
-
-			public void Advance() {
-				if (_numIndexEntries == 0) {
-					NextMidpointIndex = null;
-					return;
-				}
-
-				if (_midpointNumber >= _numMidpoints) {
-					// no more midpoints
-					NextMidpointIndex = null;
-					return;
-				}
-
-				NextMidpointIndex = GetMidpointIndex(_midpointNumber++, _numIndexEntries, _numMidpoints);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Index/PTableFooter.cs b/src/EventStore.Core/Index/PTableFooter.cs
deleted file mode 100644
index 5d22a665dcf..00000000000
--- a/src/EventStore.Core/Index/PTableFooter.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Core.Exceptions;
-
-namespace EventStore.Core.Index {
-	public class PTableFooter {
-		private const int Size = 128;
-		public readonly FileType FileType;
-		public readonly byte Version;
-		public readonly uint NumMidpointsCached;
-
-		public static int GetSize(byte version) {
-			if (version >= PTableVersions.IndexV4)
-				return Size;
-			return 0;
-		}
-
-		public PTableFooter(byte version, uint numMidpointsCached) {
-			FileType = FileType.PTableFile;
-			Version = version;
-			NumMidpointsCached = numMidpointsCached;
-		}
-
-		public byte[] AsByteArray() {
-			var array = new byte[Size];
-			array[0] = (byte)FileType.PTableFile;
-			array[1] = Version;
-			uint numMidpoints = NumMidpointsCached;
-			for (int i = 0; i < 4; i++) {
-				array[i + 2] = (byte)(numMidpoints & 0xFF);
-				numMidpoints >>= 8;
-			}
-
-			return array;
-		}
-
-		public static PTableFooter FromStream(Stream stream) {
-			var type = stream.ReadByte();
-			if (type != (int)FileType.PTableFile)
-				throw new CorruptIndexException("Corrupted PTable.", new InvalidFileException("Wrong type of PTable."));
-			var version = stream.ReadByte();
-			if (version == -1)
-				throw new CorruptIndexException("Couldn't read version of PTable from footer.",
-					new InvalidFileException("Invalid PTable file."));
-			if (!(version >= PTableVersions.IndexV4))
-				throw new CorruptIndexException(
-					"PTable footer with version < 4 found. PTable footers are supported as from version 4.",
-					new InvalidFileException("Invalid PTable file."));
-
-			byte[] buffer = new byte[4];
-			stream.Read(buffer, 0, 4);
-			uint numMidpointsCached = BitConverter.ToUInt32(buffer, 0);
-
-			return new PTableFooter((byte)version, numMidpointsCached);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Index/PTableHeader.cs b/src/EventStore.Core/Index/PTableHeader.cs
deleted file mode 100644
index 5443092a4fa..00000000000
--- a/src/EventStore.Core/Index/PTableHeader.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.IO;
-using EventStore.Core.Exceptions;
-
-namespace EventStore.Core.Index {
-	public class PTableHeader {
-		public const int Size = 128;
-
-		public readonly FileType FileType;
-		public readonly byte Version;
-
-		public PTableHeader(byte version) {
-			FileType = FileType.PTableFile;
-			Version = version;
-		}
-
-		public byte[] AsByteArray() {
-			var array = new byte[Size];
-			array[0] = (byte)FileType.PTableFile;
-			array[1] = Version;
-			return array;
-		}
-
-		public static PTableHeader FromStream(Stream stream) {
-			var type = stream.ReadByte();
-			if (type != (int)FileType.PTableFile)
-				throw new CorruptIndexException("Corrupted PTable.", new InvalidFileException("Wrong type of PTable."));
-			var version = stream.ReadByte();
-			if (version == -1)
-				throw new CorruptIndexException("Couldn't read version of PTable from header.",
-					new InvalidFileException("Invalid PTable file."));
-			return new PTableHeader((byte)version);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Index/ScavengeResult.cs b/src/EventStore.Core/Index/ScavengeResult.cs
deleted file mode 100644
index 727a16f57df..00000000000
--- a/src/EventStore.Core/Index/ScavengeResult.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-namespace EventStore.Core.Index {
-	public class ScavengeResult {
-		public readonly IndexMap ScavengedMap;
-		public readonly bool IsSuccess;
-		public readonly PTable OldTable;
-		public readonly PTable NewTable;
-		public readonly long SpaceSaved;
-		public readonly int Level;
-		public readonly int Index;
-
-		private ScavengeResult(IndexMap scavengedMap, bool isSuccess, PTable oldTable, PTable newTable, long spaceSaved,
-			int level, int index) {
-			ScavengedMap = scavengedMap;
-			IsSuccess = isSuccess;
-			OldTable = oldTable;
-			NewTable = newTable;
-			SpaceSaved = spaceSaved;
-			Level = level;
-			Index = index;
-		}
-
-		public static ScavengeResult Success(IndexMap scavengedMap, PTable oldTable, PTable newTable, long spaceSaved,
-			int level, int index) {
-			return new ScavengeResult(scavengedMap, true, oldTable, newTable, spaceSaved, level, index);
-		}
-
-		public static ScavengeResult Failed(PTable oldTable, int level, int index) {
-			return new ScavengeResult(null, false, oldTable, null, 0, level, index);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Index/SortedListExtensions.cs b/src/EventStore.Core/Index/SortedListExtensions.cs
deleted file mode 100644
index 1a97ab5f5f2..00000000000
--- a/src/EventStore.Core/Index/SortedListExtensions.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace EventStore.Core.Index {
-	public static class SortedListExtensions {
-		/// <summary>
-		/// Returns the index of smallest (according to comparer) element greater than or equal to provided key.
-		/// Returns -1 if all keys are smaller than provided key.
-		/// </summary>
-		public static int LowerBound<TKey, TValue>(this SortedList<TKey, TValue> list, TKey key) {
-			if (list.Count == 0)
-				return -1;
-
-			var comparer = list.Comparer;
-			if (comparer.Compare(list.Keys[list.Keys.Count - 1], key) < 0)
-				return -1; // if all elements are smaller, then no lower bound
-
-			int l = 0;
-			int r = list.Count - 1;
-			while (l < r) {
-				int m = l + (r - l) / 2;
-				if (comparer.Compare(list.Keys[m], key) >= 0)
-					r = m;
-				else
-					l = m + 1;
-			}
-
-			return r;
-		}
-
-		/// <summary>
-		/// Returns the index of largest (according to comparer) element less than or equal to provided key.
-		/// Returns -1 if all keys are greater than provided key.
-		/// </summary>
-		public static int UpperBound<TKey, TValue>(
-			this SortedList<TKey, TValue> list,
-			TKey key,
-			IComparer<TKey> comparer = null,
-			Func<TKey, bool> continueSearch = null) {
-
-			if (continueSearch == null)
-				continueSearch = _ => true;
-
-			if (comparer == null)
-				comparer = list.Comparer;
-
-			if (list.Count == 0)
-				return -1;
-
-			if (!continueSearch(list.Keys[0]))
-				throw new SearchStoppedException();
-
-			if (comparer.Compare(key, list.Keys[0]) < 0)
-				return -1; // if all elements are greater, then no upper bound
-
-			int l = 0;
-			int r = list.Count - 1;
-			while (l < r) {
-				int m = l + (r - l + 1) / 2;
-				if (!continueSearch(list.Keys[m]))
-					throw new SearchStoppedException();
-
-				if (comparer.Compare(list.Keys[m], key) <= 0)
-					l = m;
-				else
-					r = m - 1;
-			}
-
-			if (!continueSearch(list.Keys[l]))
-				throw new SearchStoppedException();
-
-			return l;
-		}
-
-		/// <summary>
-		/// Returns the index of largest (according to comparer) element that matches the predicate.
-		/// Returns -1 if none of the keys match the predicate.
-		/// </summary>
-		public static int FindMax<TKey, TValue>(
-			this SortedList<TKey, TValue> list,
-			Func<TKey, bool> predicate,
-			IComparer<TKey> comparer = null) {
-
-			if (comparer == null)
-				comparer = list.Comparer;
-
-			if (list.Count == 0)
-				return -1;
-
-			int maxIdx = -1;
-
-			for (int i = 0; i < list.Keys.Count; i++) {
-				if (!predicate(list.Keys[i]))
-					continue;
-
-				if (maxIdx == -1 || comparer.Compare(list.Keys[i], list.Keys[maxIdx]) > 0)
-					maxIdx = i;
-			}
-
-			return maxIdx;
-		}
-	}
-
-	public class SearchStoppedException : Exception { }
-}
diff --git a/src/EventStore.Core/Index/TableIndex.cs b/src/EventStore.Core/Index/TableIndex.cs
deleted file mode 100644
index fa2ff3c2969..00000000000
--- a/src/EventStore.Core/Index/TableIndex.cs
+++ /dev/null
@@ -1,1011 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Exceptions;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.Util;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.Settings;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using ILogger = Serilog.ILogger;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-
-namespace EventStore.Core.Index {
-	public abstract class TableIndex {
-		internal static readonly IndexEntry InvalidIndexEntry = new IndexEntry(0, -1, -1);
-		public const string IndexMapFilename = "indexmap";
-		public const string ForceIndexVerifyFilename = ".forceverify";
-		protected static readonly ILogger Log = Serilog.Log.ForContext<TableIndex>();
-	}
-
-	public class TableIndex<TStreamId> : TableIndex, ITableIndex<TStreamId> {
-		private const int MaxMemoryTables = 1;
-
-		public long CommitCheckpoint {
-			get { return Interlocked.Read(ref _commitCheckpoint); }
-		}
-
-		public long PrepareCheckpoint {
-			get { return Interlocked.Read(ref _prepareCheckpoint); }
-		}
-
-		private readonly int _maxSizeForMemory;
-		private readonly int _maxTablesPerLevel;
-		private readonly bool _additionalReclaim;
-		private readonly bool _inMem;
-		private readonly bool _skipIndexVerify;
-		private readonly int _indexCacheDepth;
-		private readonly bool _useBloomFilter;
-		private readonly int _lruCacheSize;
-		private readonly int _initializationThreads;
-		private readonly byte _ptableVersion;
-		private readonly string _directory;
-		private readonly Func<IMemTable> _memTableFactory;
-		private readonly Func<TFReaderLease> _tfReaderFactory;
-		private readonly IIndexFilenameProvider _fileNameProvider;
-		private readonly IIndexStatusTracker _statusTracker;
-
-		private readonly object _awaitingTablesLock = new object();
-
-		private IndexMap _indexMap;
-		private List<TableItem> _awaitingMemTables;
-		private volatile bool _isManualMergePending;
-
-		private long _commitCheckpoint = -1;
-		private long _prepareCheckpoint = -1;
-
-		// there are two background processes, scavenge and writing/merging ptables.
-		private volatile bool _backgroundRunning;
-		private readonly ManualResetEventSlim _backgroundRunningEvent = new ManualResetEventSlim(true);
-
-		private IHasher<TStreamId> _lowHasher;
-		private IHasher<TStreamId> _highHasher;
-		private readonly TStreamId _emptyStreamId;
-
-		private bool _initialized;
-		private readonly int _maxAutoMergeIndexLevel;
-		private readonly int _pTableMaxReaderCount;
-
-		public TableIndex(string directory,
-			IHasher<TStreamId> lowHasher,
-			IHasher<TStreamId> highHasher,
-			TStreamId emptyStreamId,
-			Func<IMemTable> memTableFactory,
-			Func<TFReaderLease> tfReaderFactory,
-			byte ptableVersion,
-			int maxAutoMergeIndexLevel,
-			int pTableMaxReaderCount,
-			int maxSizeForMemory = 1000000,
-			int maxTablesPerLevel = 4,
-			bool additionalReclaim = false,
-			bool inMem = false,
-			bool skipIndexVerify = false,
-			int indexCacheDepth = 16,
-			int initializationThreads = 1,
-			bool useBloomFilter = true,
-			int lruCacheSize = 1_000_000,
-			IIndexStatusTracker statusTracker = null) {
-
-			Ensure.NotNullOrEmpty(directory, "directory");
-			Ensure.NotNull(memTableFactory, "memTableFactory");
-			Ensure.NotNull(lowHasher, "lowHasher");
-			Ensure.NotNull(highHasher, "highHasher");
-			Ensure.NotNull(tfReaderFactory, "tfReaderFactory");
-			Ensure.Positive(initializationThreads, "initializationThreads");
-			Ensure.Positive(pTableMaxReaderCount, "pTableMaxReaderCount");
-
-			if (maxTablesPerLevel <= 1)
-				throw new ArgumentOutOfRangeException("maxTablesPerLevel");
-
-			if (indexCacheDepth > 28 || indexCacheDepth < 8) throw new ArgumentOutOfRangeException("indexCacheDepth");
-
-			_directory = directory;
-			_memTableFactory = memTableFactory;
-			_tfReaderFactory = tfReaderFactory;
-			_fileNameProvider = new GuidFilenameProvider(directory);
-			_statusTracker = statusTracker ?? new IndexStatusTracker.NoOp();
-			_maxSizeForMemory = maxSizeForMemory;
-			_maxTablesPerLevel = maxTablesPerLevel;
-			_additionalReclaim = additionalReclaim;
-			_inMem = inMem;
-			_skipIndexVerify = ShouldForceIndexVerify() ? false : skipIndexVerify;
-			_indexCacheDepth = indexCacheDepth;
-			_initializationThreads = initializationThreads;
-			_useBloomFilter = useBloomFilter;
-			_lruCacheSize = lruCacheSize;
-			_ptableVersion = ptableVersion;
-			_awaitingMemTables = new List<TableItem> {new TableItem(_memTableFactory(), -1, -1, 0)};
-
-			_lowHasher = lowHasher;
-			_highHasher = highHasher;
-			_emptyStreamId = emptyStreamId;
-
-			_maxAutoMergeIndexLevel = maxAutoMergeIndexLevel;
-			_pTableMaxReaderCount = pTableMaxReaderCount;
-		}
-
-		public void Initialize(long chaserCheckpoint) {
-			Ensure.Nonnegative(chaserCheckpoint, "chaserCheckpoint");
-
-			//NOT THREAD SAFE (assumes one thread)
-			if (_initialized)
-				throw new IOException("TableIndex is already initialized.");
-			_initialized = true;
-
-			if (_inMem) {
-				_indexMap = IndexMap.CreateEmpty(_maxTablesPerLevel, int.MaxValue, _pTableMaxReaderCount);
-				_prepareCheckpoint = _indexMap.PrepareCheckpoint;
-				_commitCheckpoint = _indexMap.CommitCheckpoint;
-				return;
-			}
-
-			if (ShouldForceIndexVerify()) {
-				Log.Debug("Forcing verification of index files...");
-			}
-
-			CreateIfDoesNotExist(_directory);
-			var indexmapFile = Path.Combine(_directory, IndexMapFilename);
-
-			// if TableIndex's CommitCheckpoint is >= amount of written TFChunk data,
-			// we'll have to remove some of PTables as they point to non-existent data
-			// this can happen (very unlikely, though) on leader crash
-			try {
-				_indexMap = IndexMap.FromFile(indexmapFile, _maxTablesPerLevel, true, _indexCacheDepth,
-					_skipIndexVerify,
-					useBloomFilter: _useBloomFilter,
-					lruCacheSize: _lruCacheSize,
-					threads: _initializationThreads,
-					maxAutoMergeLevel: _maxAutoMergeIndexLevel,
-					pTableMaxReaderCount: _pTableMaxReaderCount);
-				if (_indexMap.CommitCheckpoint >= chaserCheckpoint) {
-					_indexMap.Dispose(TimeSpan.FromMilliseconds(5000));
-					throw new CorruptIndexException(String.Format(
-						"IndexMap's CommitCheckpoint ({0}) is greater than ChaserCheckpoint ({1}).",
-						_indexMap.CommitCheckpoint, chaserCheckpoint));
-				}
-
-				//verification should be completed by now
-				DeleteForceIndexVerifyFile();
-			} catch (CorruptIndexException exc) {
-				Log.Error(exc, "ReadIndex is corrupted...");
-				LogIndexMapContent(indexmapFile);
-				DumpAndCopyIndex();
-				File.SetAttributes(indexmapFile, FileAttributes.Normal);
-				File.Delete(indexmapFile);
-				DeleteForceIndexVerifyFile();
-				_indexMap = IndexMap.FromFile(indexmapFile, _maxTablesPerLevel, true, _indexCacheDepth,
-					_skipIndexVerify,
-					useBloomFilter: _useBloomFilter,
-					lruCacheSize: _lruCacheSize,
-					threads: _initializationThreads,
-					maxAutoMergeLevel: _maxAutoMergeIndexLevel,
-					pTableMaxReaderCount: _pTableMaxReaderCount);
-			}
-
-			_prepareCheckpoint = _indexMap.PrepareCheckpoint;
-			_commitCheckpoint = _indexMap.CommitCheckpoint;
-
-			// clean up all other remaining files
-			var indexFiles = _indexMap.InOrder().SelectMany(x => new[] {
-					Path.GetFileName(x.Filename),
- 					Path.GetFileName(x.BloomFilterFilename) })
-				.Union(new[] {IndexMapFilename});
-			var toDeleteFiles = Directory.EnumerateFiles(_directory).Select(Path.GetFileName)
-				.Except(indexFiles, StringComparer.OrdinalIgnoreCase);
-			foreach (var filePath in toDeleteFiles) {
-				var file = Path.Combine(_directory, filePath);
-				File.SetAttributes(file, FileAttributes.Normal);
-				File.Delete(file);
-			}
-		}
-
-		private static void LogIndexMapContent(string indexmapFile) {
-			try {
-				Log.Error("IndexMap '{indexMap}' content:\n {content}", indexmapFile,
-					Helper.FormatBinaryDump(File.ReadAllBytes(indexmapFile)));
-			} catch (Exception exc) {
-				Log.Error(exc, "Unexpected error while dumping IndexMap '{indexMap}'.", indexmapFile);
-			}
-		}
-
-		private void DumpAndCopyIndex() {
-			string dumpPath = null;
-			try {
-				dumpPath = Path.Combine(Path.GetDirectoryName(_directory),
-					string.Format("index-backup-{0:yyyy-MM-dd_HH-mm-ss.fff}", DateTime.UtcNow));
-				Log.Error("Making backup of index folder for inspection to {dumpPath}...", dumpPath);
-				FileUtils.DirectoryCopy(_directory, dumpPath, copySubDirs: true);
-			} catch (Exception exc) {
-				Log.Error(exc, "Unexpected error while copying index to backup dir '{dumpPath}'", dumpPath);
-			}
-		}
-
-		private static void CreateIfDoesNotExist(string directory) {
-			if (!Directory.Exists(directory))
-				Directory.CreateDirectory(directory);
-		}
-
-		public void Add(long commitPos, TStreamId streamId, long version, long position) {
-			Ensure.Nonnegative(commitPos, "commitPos");
-			Ensure.Nonnegative(version, "version");
-			Ensure.Nonnegative(position, "position");
-
-			AddEntries(commitPos, new[] {CreateIndexKey(streamId, version, position)});
-		}
-
-		public void AddEntries(long commitPos, IList<IndexKey<TStreamId>> entries) {
-			//should only be called on a single thread.
-			var table = (IMemTable)_awaitingMemTables[0].Table; // always a memtable
-
-			var collection = entries.Select(x => CreateIndexEntry(x)).ToList();
-			table.AddEntries(collection);
-
-			if (table.Count >= _maxSizeForMemory) {
-				long prepareCheckpoint = collection[0].Position;
-				for (int i = 1, n = collection.Count; i < n; ++i) {
-					prepareCheckpoint = Math.Max(prepareCheckpoint, collection[i].Position);
-				}
-
-				TryProcessAwaitingTables(commitPos, prepareCheckpoint);
-			}
-		}
-
-		public Task MergeIndexes() {
-			TryManualMerge();
-			return Task.CompletedTask;
-		}
-
-		public bool IsBackgroundTaskRunning {
-			get { return _backgroundRunning; }
-		}
-
-		//Automerge only
-		private void TryProcessAwaitingTables(long commitPos, long prepareCheckpoint) {
-			lock (_awaitingTablesLock) {
-				var newTables = new List<TableItem> {new TableItem(_memTableFactory(), -1, -1, 0)};
-				newTables.AddRange(_awaitingMemTables.Select(
-					(x, i) => i == 0 ? new TableItem(x.Table, prepareCheckpoint, commitPos, x.Level) : x));
-
-				Log.Debug("Switching MemTable, currently: {awaitingMemTables} awaiting tables.", newTables.Count);
-
-				_awaitingMemTables = newTables;
-				if (_inMem) return;
-				TryProcessAwaitingTables();
-
-				if (_additionalReclaim)
-					ThreadPool.QueueUserWorkItem(x => ReclaimMemoryIfNeeded(_awaitingMemTables));
-			}
-		}
-
-		public void TryManualMerge() {
-			_isManualMergePending = true;
-			TryProcessAwaitingTables();
-		}
-
-		private void TryProcessAwaitingTables() {
-			lock (_awaitingTablesLock) {
-				if (!_backgroundRunning) {
-					_backgroundRunningEvent.Reset();
-					_backgroundRunning = true;
-					ThreadPool.QueueUserWorkItem(x => ReadOffQueue());
-				}
-			}
-		}
-
-		private void ReadOffQueue() {
-			try {
-				using var _ = _statusTracker.StartMerging();
-				while (true) {
-					var indexmapFile = Path.Combine(_directory, IndexMapFilename);
-
-					if (_isManualMergePending) {
-						Log.Debug("Performing manual index merge.");
-
-						_isManualMergePending = false;
-						var manualMergeResult = _indexMap.TryManualMerge(
-							_fileNameProvider,
-							_ptableVersion,
-							_indexCacheDepth,
-							_skipIndexVerify,
-							useBloomFilter: _useBloomFilter,
-							lruCacheSize: _lruCacheSize);
-
-						if (manualMergeResult.HasMergedAny) {
-							_indexMap = manualMergeResult.MergedMap;
-							_indexMap.SaveToFile(indexmapFile);
-							manualMergeResult.ToDelete.ForEach(x => x.MarkForDestruction());
-						}
-						Log.Debug("Manual index merge completed: {numMergedPTables} PTable(s) merged.", manualMergeResult.ToDelete.Count);
-					}
-
-					TableItem tableItem;
-					//ISearchTable table;
-					lock (_awaitingTablesLock) {
-						Log.Debug("Awaiting tables queue size is: {awaitingMemTables}.", _awaitingMemTables.Count);
-						if (_awaitingMemTables.Count == 1) {
-							return;
-						}
-
-						tableItem = _awaitingMemTables[_awaitingMemTables.Count - 1];
-					}
-
-					PTable ptable;
-					var memtable = tableItem.Table as IMemTable;
-					if (memtable != null) {
-						memtable.MarkForConversion();
-						ptable = PTable.FromMemtable(memtable, _fileNameProvider.GetFilenameNewTable(),
-							ESConsts.PTableInitialReaderCount,
-							_pTableMaxReaderCount,
-							_indexCacheDepth,
-							_skipIndexVerify,
-							useBloomFilter: _useBloomFilter,
-							lruCacheSize: _lruCacheSize);
-					} else
-						ptable = (PTable)tableItem.Table;
-
-					var addResult = _indexMap.AddPTable(ptable, tableItem.PrepareCheckpoint, tableItem.CommitCheckpoint);
-					_indexMap = addResult.NewMap;
-					_indexMap.SaveToFile(indexmapFile);
-
-					if (addResult.CanMergeAny) {
-						MergeResult mergeResult;
-						do {
-							mergeResult = _indexMap.TryMergeOneLevel(
-								_fileNameProvider,
-								_ptableVersion,
-								_indexCacheDepth,
-								_skipIndexVerify,
-								useBloomFilter: _useBloomFilter,
-								lruCacheSize: _lruCacheSize);
-
-							if (mergeResult.HasMergedAny) {
-								_indexMap = mergeResult.MergedMap;
-								_indexMap.SaveToFile(indexmapFile);
-								mergeResult.ToDelete.ForEach(x => x.MarkForDestruction());
-							}
-						} while (mergeResult.CanMergeAny);
-					}
-
-					lock (_awaitingTablesLock) {
-						var memTables = _awaitingMemTables.ToList();
-
-						var corrTable = memTables.First(x => x.Table.Id == ptable.Id);
-						memTables.Remove(corrTable);
-
-						// parallel thread could already switch table,
-						// so if we have another PTable instance with same ID,
-						// we need to kill that instance as we added ours already
-						if (!ReferenceEquals(corrTable.Table, ptable) && corrTable.Table is PTable)
-							((PTable)corrTable.Table).MarkForDestruction();
-
-						Log.Debug("There are now {awaitingMemTables} awaiting tables.", memTables.Count);
-						_awaitingMemTables = memTables;
-					}
-				}
-			} catch (FileBeingDeletedException exc) {
-				Log.Error(exc,
-					"Could not acquire chunk in TableIndex.ReadOffQueue. It is OK if node is shutting down.");
-			} catch (Exception exc) {
-				Log.Error(exc, "Error in TableIndex.ReadOffQueue");
-				throw;
-			} finally {
-				lock (_awaitingTablesLock) {
-					_backgroundRunning = false;
-					_backgroundRunningEvent.Set();
-				}
-			}
-		}
-
-		public void WaitForBackgroundTasks(int millisecondsTimeout = 7_000) {
-			if (!_backgroundRunningEvent.Wait(millisecondsTimeout)) {
-				throw new TimeoutException(
-					$"Waiting for TableIndex background tasks took longer than {millisecondsTimeout:N0} ms.");
-			}
-		}
-
-		public void Scavenge(IIndexScavengerLog log, CancellationToken ct) =>
-			Scavenge(shouldKeep: null, log: log, ct: ct);
-
-		public void Scavenge(
-			Func<IndexEntry, bool> shouldKeep,
-			IIndexScavengerLog log,
-			CancellationToken ct) {
-
-			GetExclusiveBackgroundTask(ct);
-			var sw = Stopwatch.StartNew();
-
-			try {
-				using var _ = _statusTracker.StartScavenging();
-				Log.Information("Starting scavenge of TableIndex.");
-				ScavengeInternal(shouldKeep, log, ct);
-			} finally {
-				// Since scavenging indexes is the only place the ExistsAt optimization makes sense (and takes up a lot of memory), we can clear it after an index scavenge has completed. 
-				TFChunkReaderExistsAtOptimizer.Instance.DeOptimizeAll();
-
-				lock (_awaitingTablesLock) {
-					_backgroundRunning = false;
-					_backgroundRunningEvent.Set();
-
-					TryProcessAwaitingTables();
-				}
-
-				Log.Information("Completed scavenge of TableIndex.  Elapsed: {elapsed}", sw.Elapsed);
-			}
-		}
-
-		private void ScavengeInternal(
-			Func<IndexEntry, bool> shouldKeep,
-			IIndexScavengerLog log,
-			CancellationToken ct) {
-
-			var toScavenge = _indexMap.InOrder().ToList();
-
-			foreach (var pTable in toScavenge) {
-				var startNew = Stopwatch.StartNew();
-
-				try {
-					ct.ThrowIfCancellationRequested();
-
-					using (var reader = _tfReaderFactory()) {
-						var indexmapFile = Path.Combine(_directory, IndexMapFilename);
-
-						Func<IndexEntry, bool> existsAt = entry => reader.ExistsAt(entry.Position);
-						var scavengeResult = _indexMap.Scavenge(
-							pTable.Id,
-							ct,
-							shouldKeep ?? existsAt,
-							_fileNameProvider,
-							_ptableVersion,
-							_indexCacheDepth,
-							_skipIndexVerify,
-							useBloomFilter: _useBloomFilter,
-							lruCacheSize: _lruCacheSize);
-
-						if (scavengeResult.IsSuccess) {
-							_indexMap = scavengeResult.ScavengedMap;
-							_indexMap.SaveToFile(indexmapFile);
-
-							scavengeResult.OldTable.MarkForDestruction();
-
-							var entriesDeleted = scavengeResult.OldTable.Count - scavengeResult.NewTable.Count;
-							log.IndexTableScavenged(scavengeResult.Level, scavengeResult.Index, startNew.Elapsed,
-								entriesDeleted, scavengeResult.NewTable.Count, scavengeResult.SpaceSaved);
-						} else {
-							log.IndexTableNotScavenged(scavengeResult.Level, scavengeResult.Index, startNew.Elapsed,
-								pTable.Count, "");
-						}
-					}
-				} catch (OperationCanceledException) {
-					log.IndexTableNotScavenged(-1, -1, startNew.Elapsed, pTable.Count, "Scavenge cancelled");
-					throw;
-				} catch (Exception ex) {
-					log.IndexTableNotScavenged(-1, -1, startNew.Elapsed, pTable.Count, ex.Message);
-					throw;
-				}
-			}
-		}
-
-		private void GetExclusiveBackgroundTask(CancellationToken ct) {
-			while (true) {
-				lock (_awaitingTablesLock) {
-					if (!_backgroundRunning) {
-						_backgroundRunningEvent.Reset();
-						_backgroundRunning = true;
-						return;
-					}
-				}
-
-				Log.Information("Waiting for TableIndex background task to complete before starting scavenge.");
-				_backgroundRunningEvent.Wait(ct);
-			}
-		}
-
-		private void ReclaimMemoryIfNeeded(List<TableItem> awaitingMemTables) {
-			var toPutOnDisk = awaitingMemTables.OfType<IMemTable>().Count() - MaxMemoryTables;
-			for (var i = awaitingMemTables.Count - 1; i >= 1 && toPutOnDisk > 0; i--) {
-				var memtable = awaitingMemTables[i].Table as IMemTable;
-				if (memtable == null || !memtable.MarkForConversion())
-					continue;
-
-				Log.Debug("Putting awaiting file as PTable instead of MemTable [{id}].", memtable.Id);
-
-				var ptable = PTable.FromMemtable(memtable, _fileNameProvider.GetFilenameNewTable(),
-					ESConsts.PTableInitialReaderCount,
-					_pTableMaxReaderCount,
-					_indexCacheDepth,
-					_skipIndexVerify,
-					useBloomFilter: _useBloomFilter,
-					lruCacheSize: _lruCacheSize);
-				var swapped = false;
-				lock (_awaitingTablesLock) {
-					for (var j = _awaitingMemTables.Count - 1; j >= 1; j--) {
-						var tableItem = _awaitingMemTables[j];
-						if (!(tableItem.Table is IMemTable) || tableItem.Table.Id != ptable.Id) continue;
-						swapped = true;
-						_awaitingMemTables[j] = new TableItem(ptable,
-							tableItem.PrepareCheckpoint,
-							tableItem.CommitCheckpoint,
-							tableItem.Level);
-						break;
-					}
-				}
-
-				if (!swapped)
-					ptable.MarkForDestruction();
-				toPutOnDisk--;
-			}
-		}
-
-		public void Visit(Action<PTable> f) {
-			int counter = 0;
-			while (counter < 5) {
-				counter++;
-				try {
-					VisitInternal(f);
-					return;
-				} catch (FileBeingDeletedException) {
-					Log.Debug("File being deleted.");
-				} catch (MaybeCorruptIndexException) {
-					ForceIndexVerifyOnNextStartup();
-					throw;
-				}
-			}
-
-			throw new InvalidOperationException("Files are locked.");
-		}
-
-		private void VisitInternal(Action<PTable> f) {
-			var map = _indexMap;
-			foreach (var table in map.InOrder()) {
-				f(table);
-			}
-		}
-
-		public bool TryGetOneValue(TStreamId streamId, long version, out long position) {
-			ulong stream = CreateHash(streamId);
-			int counter = 0;
-			while (counter < 5) {
-				counter++;
-				try {
-					return TryGetOneValueInternal(stream, version, out position);
-				} catch (FileBeingDeletedException) {
-					Log.Debug("File being deleted.");
-				} catch (MaybeCorruptIndexException) {
-					ForceIndexVerifyOnNextStartup();
-					throw;
-				}
-			}
-
-			throw new InvalidOperationException("Files are locked.");
-		}
-
-		private bool TryGetOneValueInternal(ulong stream, long version, out long position) {
-			if (version < 0)
-				throw new ArgumentOutOfRangeException("version");
-
-			var awaiting = _awaitingMemTables;
-			foreach (var tableItem in awaiting) {
-				if (tableItem.Table.TryGetOneValue(stream, version, out position))
-					return true;
-			}
-
-			var map = _indexMap;
-			foreach (var table in map.InOrder()) {
-				if (table.TryGetOneValue(stream, version, out position))
-					return true;
-			}
-
-			position = 0;
-			return false;
-		}
-
-		public bool TryGetLatestEntry(TStreamId streamId, out IndexEntry entry) {
-			ulong stream = CreateHash(streamId);
-			var counter = 0;
-			while (counter < 5) {
-				counter++;
-				try {
-					return TryGetLatestEntryInternal(stream, out entry);
-				} catch (FileBeingDeletedException) {
-					Log.Debug("File being deleted.");
-				} catch (MaybeCorruptIndexException) {
-					ForceIndexVerifyOnNextStartup();
-					throw;
-				}
-			}
-
-			throw new InvalidOperationException("Files are locked.");
-		}
-
-		private bool TryGetLatestEntryInternal(ulong stream, out IndexEntry entry) {
-			var awaiting = _awaitingMemTables;
-			foreach (var t in awaiting) {
-				if (t.Table.TryGetLatestEntry(stream, out entry))
-					return true;
-			}
-
-			var map = _indexMap;
-			foreach (var table in map.InOrder()) {
-				if (table.TryGetLatestEntry(stream, out entry))
-					return true;
-			}
-
-			entry = InvalidIndexEntry;
-			return false;
-		}
-
-		public bool TryGetLatestEntry(ulong stream, long beforePosition, Func<IndexEntry, bool> isForThisStream, out IndexEntry entry) {
-			var counter = 0;
-			while (counter < 5) {
-				counter++;
-				try {
-					return TryGetLatestEntryInternal(stream, beforePosition, isForThisStream, out entry);
-				} catch (FileBeingDeletedException) {
-					Log.Debug("File being deleted.");
-				} catch (MaybeCorruptIndexException) {
-					ForceIndexVerifyOnNextStartup();
-					throw;
-				}
-			}
-
-			throw new InvalidOperationException("Files are locked.");
-		}
-
-		public bool TryGetLatestEntry(TStreamId streamId, long beforePosition, Func<IndexEntry, bool> isForThisStream, out IndexEntry entry) {
-			ulong stream = CreateHash(streamId);
-			return TryGetLatestEntry(stream, beforePosition, isForThisStream, out entry);
-		}
-
-		private bool TryGetLatestEntryInternal(ulong stream, long beforePosition, Func<IndexEntry, bool> isForThisStream, out IndexEntry entry) {
-			var awaiting = _awaitingMemTables;
-
-			foreach (var t in awaiting) {
-				if (t.Table.TryGetLatestEntry(stream, beforePosition, isForThisStream, out entry))
-					return true;
-			}
-
-			var map = _indexMap;
-			foreach (var table in map.InOrder()) {
-				if (table.TryGetLatestEntry(stream, beforePosition, isForThisStream, out entry))
-					return true;
-			}
-
-			entry = InvalidIndexEntry;
-			return false;
-		}
-
-		public bool TryGetOldestEntry(TStreamId streamId, out IndexEntry entry) {
-			ulong stream = CreateHash(streamId);
-			var counter = 0;
-			while (counter < 5) {
-				counter++;
-				try {
-					return TryGetOldestEntryInternal(stream, out entry);
-				} catch (FileBeingDeletedException) {
-					Log.Debug("File being deleted.");
-				} catch (MaybeCorruptIndexException) {
-					ForceIndexVerifyOnNextStartup();
-					throw;
-				}
-			}
-
-			throw new InvalidOperationException("Files are locked.");
-		}
-
-		private bool TryGetOldestEntryInternal(ulong stream, out IndexEntry entry) {
-			var map = _indexMap;
-			foreach (var table in map.InReverseOrder()) {
-				if (table.TryGetOldestEntry(stream, out entry))
-					return true;
-			}
-
-			var awaiting = _awaitingMemTables;
-			for (var index = awaiting.Count - 1; index >= 0; index--) {
-				if (awaiting[index].Table.TryGetOldestEntry(stream, out entry))
-					return true;
-			}
-
-			entry = InvalidIndexEntry;
-			return false;
-		}
-
-		public bool TryGetNextEntry(TStreamId streamId, long afterVersion, out IndexEntry entry) {
-			ulong stream = CreateHash(streamId);
-			return TryGetNextEntry(stream, afterVersion, out entry);
-		}
-
-		public bool TryGetNextEntry(ulong stream, long afterVersion, out IndexEntry entry) {
-			var counter = 0;
-			while (counter < 5) {
-				counter++;
-				try {
-					return TryGetNextEntryInternal(stream, afterVersion, out entry);
-				} catch (FileBeingDeletedException) {
-					Log.Debug("File being deleted.");
-				} catch (MaybeCorruptIndexException) {
-					ForceIndexVerifyOnNextStartup();
-					throw;
-				}
-			}
-
-			throw new InvalidOperationException("Files are locked.");
-		}
-
-		private bool TryGetNextEntryInternal(ulong stream, long afterVersion, out IndexEntry entry) {
-			var map = _indexMap;
-			foreach (var table in map.InReverseOrder()) {
-				if (table.TryGetNextEntry(stream, afterVersion, out entry))
-					return true;
-			}
-
-			var awaiting = _awaitingMemTables;
-			for (var index = awaiting.Count - 1; index >= 0; index--) {
-				if (awaiting[index].Table.TryGetNextEntry(stream, afterVersion, out entry))
-					return true;
-			}
-
-			entry = InvalidIndexEntry;
-			return false;
-		}
-
-		public bool TryGetPreviousEntry(TStreamId streamId, long beforeVersion, out IndexEntry entry) {
-			ulong stream = CreateHash(streamId);
-			return TryGetPreviousEntry(stream, beforeVersion, out entry);
-		}
-
-		public bool TryGetPreviousEntry(ulong stream, long beforeVersion, out IndexEntry entry) {
-			var counter = 0;
-			while (counter < 5) {
-				counter++;
-				try {
-					return TryGetPreviousEntryInternal(stream, beforeVersion, out entry);
-				} catch (FileBeingDeletedException) {
-					Log.Debug("File being deleted.");
-				} catch (MaybeCorruptIndexException) {
-					ForceIndexVerifyOnNextStartup();
-					throw;
-				}
-			}
-
-			throw new InvalidOperationException("Files are locked.");
-		}
-
-		private bool TryGetPreviousEntryInternal(ulong stream, long beforeVersion, out IndexEntry entry) {
-			var awaiting = _awaitingMemTables;
-
-			foreach (var t in awaiting) {
-				if (t.Table.TryGetPreviousEntry(stream, beforeVersion, out entry))
-					return true;
-			}
-
-			var map = _indexMap;
-			foreach (var table in map.InOrder()) {
-				if (table.TryGetPreviousEntry(stream, beforeVersion, out entry))
-					return true;
-			}
-
-			entry = InvalidIndexEntry;
-			return false;
-		}
-
-		public IReadOnlyList<IndexEntry> GetRange(TStreamId streamId, long startVersion, long endVersion,
-			int? limit = null) => GetRange(CreateHash(streamId), startVersion, endVersion, limit);
-
-		public IReadOnlyList<IndexEntry> GetRange(ulong stream, long startVersion, long endVersion, int? limit = null) {
-			var counter = 0;
-			while (counter < 5) {
-				counter++;
-				try {
-					return GetRangeInternal(stream, startVersion, endVersion, limit);
-				} catch (FileBeingDeletedException) {
-					Log.Debug("File being deleted.");
-				} catch (MaybeCorruptIndexException) {
-					ForceIndexVerifyOnNextStartup();
-					throw;
-				}
-			}
-
-			throw new InvalidOperationException("Files are locked.");
-		}
-
-		private IReadOnlyList<IndexEntry> GetRangeInternal(ulong hash, long startVersion, long endVersion,
-			int? limit = null) {
-			if (startVersion < 0)
-				throw new ArgumentOutOfRangeException("startVersion");
-			if (endVersion < 0)
-				throw new ArgumentOutOfRangeException("endVersion");
-
-			// 1. assemble results per table for memtables and ptables
-			// discard any results with 0 entries.
-			var resultsPerTable = new List<IList<IndexEntry>>(16);
-
-			var awaiting = _awaitingMemTables;
-			for (int index = 0; index < awaiting.Count; index++) {
-				var range = awaiting[index].Table.GetRange(hash, startVersion, endVersion, limit);
-				if (range.Count > 0)
-					resultsPerTable.Add(range);
-			}
-
-			var map = _indexMap;
-			foreach (var table in map.InOrder()) {
-				var range = table.GetRange(hash, startVersion, endVersion, limit);
-				if (range.Count > 0)
-					resultsPerTable.Add(range);
-			}
-
-			// 2. iterate through the per table results producing candidate enumerators
-			// if the results per table dont overlap then we can merge them much more quickly
-			// because they're already in order. this will be so in the common case of
-			// having no hash collisions.
-			var maybeInOrder = true;
-			var prevOldestVersion = long.MaxValue;
-			var totalEntryCount = 0;
-			var candidates = new List<IEnumerator<IndexEntry>>(resultsPerTable.Count);
-			foreach (var entries in resultsPerTable) {
-				var entriesEnumerator = entries.GetEnumerator();
-				entriesEnumerator.MoveNext();
-				candidates.Add(entriesEnumerator);
-
-				totalEntryCount += entries.Count;
-
-				if (maybeInOrder) {
-					var latestVersion = entriesEnumerator.Current.Version;
-
-					if (latestVersion >= prevOldestVersion) {
-						maybeInOrder = false;
-					}
-
-					var oldestVersion = entries[^1].Version;
-					prevOldestVersion = oldestVersion;
-				}
-			}
-			var areInOrder = maybeInOrder;
-
-			// 3. sort the entries by consuming the enumerators
-			//    removes duplicates
-			var last = new IndexEntry(0, 0, 0);
-			var first = true;
-
-			var sortedCandidates = new List<IndexEntry>(totalEntryCount);
-
-			// reverse so that typically the largest candidate is at the back, making the RemoveAt cheap
-			candidates.Reverse();
-
-			while (candidates.Count > 0) {
-				var maxIdx = areInOrder ? (candidates.Count - 1) : GetMaxOf(candidates);
-				var winner = candidates[maxIdx];
-
-				var best = winner.Current;
-				if (first ||
-					((last.Stream != best.Stream) && (last.Version != best.Version)) ||
-					last.Position != best.Position) {
-					last = best;
-					sortedCandidates.Add(best);
-					first = false;
-				}
-
-				if (!winner.MoveNext())
-					candidates.RemoveAt(maxIdx);
-			}
-
-			return sortedCandidates;
-		}
-
-		private static int GetMaxOf(List<IEnumerator<IndexEntry>> enumerators) {
-			var max = new IndexEntry(
-				stream: ulong.MinValue,
-				version: 0,
-				position: long.MinValue);
-
-			int idx = 0;
-			for (int i = 0; i < enumerators.Count; i++) {
-				var cur = enumerators[i].Current;
-				if (cur.CompareTo(max) > 0) {
-					max = cur;
-					idx = i;
-				}
-			}
-
-			return idx;
-		}
-
-		public void Close(bool removeFiles = true) {
-			if (!_backgroundRunningEvent.Wait(7000))
-				throw new TimeoutException("Could not finish background thread in reasonable time.");
-			if (_inMem)
-				return;
-			if (_indexMap == null) return;
-			if (removeFiles) {
-				_indexMap.InOrder().ToList().ForEach(x => x.MarkForDestruction());
-				var fileName = Path.Combine(_directory, IndexMapFilename);
-				if (File.Exists(fileName)) {
-					File.SetAttributes(fileName, FileAttributes.Normal);
-					File.Delete(fileName);
-				}
-			} else {
-				_indexMap.InOrder().ToList().ForEach(x => x.Dispose());
-			}
-
-			_indexMap.InOrder().ToList().ForEach(x => x.WaitForDisposal(TimeSpan.FromMilliseconds(5000)));
-		}
-
-		private IndexEntry CreateIndexEntry(IndexKey<TStreamId> key) {
-			key = CreateIndexKey(key.StreamId, key.Version, key.Position);
-			return new IndexEntry(key.Hash, key.Version, key.Position);
-		}
-
-		private ulong CreateHash(TStreamId streamId) {
-			return (ulong)_lowHasher.Hash(streamId) << 32 | _highHasher.Hash(streamId);
-		}
-
-		/// newest to oldest
-		public IEnumerable<ISearchTable> IterateAllInOrder() {
-			var awaiting = _awaitingMemTables;
-			var map = _indexMap;
-
-			foreach (var tableItem in awaiting)
-				yield return tableItem.Table;
-
-			foreach (var table in map.InOrder())
-				yield return table;
-		}
-
-		private IndexKey<TStreamId> CreateIndexKey(TStreamId streamId, long version, long position) {
-			return new IndexKey<TStreamId>(streamId, version, position, CreateHash(streamId));
-		}
-
-		private class TableItem {
-			public readonly ISearchTable Table;
-			public readonly long PrepareCheckpoint;
-			public readonly long CommitCheckpoint;
-			public readonly int Level;
-
-			public TableItem(ISearchTable table, long prepareCheckpoint, long commitCheckpoint, int level) {
-				Table = table;
-				PrepareCheckpoint = prepareCheckpoint;
-				CommitCheckpoint = commitCheckpoint;
-				Level = level;
-			}
-		}
-
-		private void ForceIndexVerifyOnNextStartup() {
-			Log.Debug("Forcing index verification on next startup");
-			string path = Path.Combine(_directory, ForceIndexVerifyFilename);
-			try {
-				using (FileStream fs = new FileStream(path, FileMode.OpenOrCreate)) {
-				}
-
-				;
-			} catch {
-				Log.Error("Could not create force index verification file at: {path}", path);
-			}
-
-			return;
-		}
-
-		private bool ShouldForceIndexVerify() {
-			string path = Path.Combine(_directory, ForceIndexVerifyFilename);
-			return File.Exists(path);
-		}
-
-		private void DeleteForceIndexVerifyFile() {
-			string path = Path.Combine(_directory, ForceIndexVerifyFilename);
-			try {
-				if (File.Exists(path)) {
-					File.SetAttributes(path, FileAttributes.Normal);
-					File.Delete(path);
-				}
-			} catch {
-				Log.Error("Could not delete force index verification file at: {path}", path);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Log/EventStoreLoggerConfiguration.cs b/src/EventStore.Core/Log/EventStoreLoggerConfiguration.cs
deleted file mode 100644
index 7adcb1e9091..00000000000
--- a/src/EventStore.Core/Log/EventStoreLoggerConfiguration.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using EventStore.Common.Exceptions;
-using EventStore.Common.Options;
-using EventStore.Core.Configuration;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Primitives;
-using Serilog;
-using Serilog.Configuration;
-using Serilog.Core;
-using Serilog.Events;
-using Serilog.Filters;
-using Serilog.Templates;
-using Serilog.Templates.Themes;
-
-namespace EventStore.Common.Log {
-	public class EventStoreLoggerConfiguration {
-		static readonly ExpressionTemplate ConsoleOutputExpressionTemplate = new(
-			"[{ProcessId,5},{ThreadId,2},{@t:HH:mm:ss.fff},{@l:u3}] {Substring(SourceContext, LastIndexOf(SourceContext, '.') + 1), -30} {@m}\n{@x}",
-			theme: TemplateTheme.Literate
-		);
-
-		private const string CompactJsonTemplate = "{ {@t, @mt, @r, @l, @i, @x, ..@p} }\n";
-
-		public static readonly Logger ConsoleLog = StandardLoggerConfiguration
-			.WriteTo.Console(ConsoleOutputExpressionTemplate)
-			.CreateLogger();
-
-		private static readonly Func<LogEvent, bool> RegularStats = Matching.FromSource("REGULAR-STATS-LOGGER");
-
-		private static readonly SerilogEventListener EventListener;
-
-		private static int Initialized;
-		private static LoggingLevelSwitch _defaultLogLevelSwitch;
-		private static object _defaultLogLevelSwitchLock = new object();
-
-		private readonly string _logsDirectory;
-		private readonly string _componentName;
-		private readonly LoggerConfiguration _loggerConfiguration;
-
-		static EventStoreLoggerConfiguration() {
-			Serilog.Log.Logger = ConsoleLog;
-			AppDomain.CurrentDomain.UnhandledException += (s, e) => {
-				if (e.ExceptionObject is Exception exc)
-					Serilog.Log.Fatal(exc, "Global Unhandled Exception occurred.");
-				else
-					Serilog.Log.Fatal("Global Unhandled Exception object: {e}.", e.ExceptionObject);
-			};
-			EventListener = new SerilogEventListener();
-		}
-
-		public static void Initialize(string logsDirectory, string componentName, LogConsoleFormat logConsoleFormat,
-			int logFileSize, RollingInterval logFileInterval, int logFileRetentionCount, bool disableLogFile,
-			string logConfig = "logconfig.json") {
-			if (Interlocked.Exchange(ref Initialized, 1) == 1) {
-				throw new InvalidOperationException($"{nameof(Initialize)} may not be called more than once.");
-			}
-
-			if (logsDirectory.StartsWith("~")) {
-				throw new ApplicationInitializationException(
-					"The given log path starts with a '~'. Event Store does not expand '~'.");
-			}
-
-			var configurationRoot = new ConfigurationBuilder()
-				.AddEsdbConfigFile(logConfig, reloadOnChange: true)
-				.Build();
-
-			Serilog.Debugging.SelfLog.Enable(ConsoleLog.Information);
-
-			Serilog.Log.Logger = (configurationRoot.GetSection("Serilog").Exists()
-					? new LoggerConfiguration()
-						.Enrich.WithProperty(Constants.SourceContextPropertyName, "EventStore")
-						.ReadFrom.Configuration(configurationRoot)
-					: Default(logsDirectory, componentName, configurationRoot, logConsoleFormat, logFileInterval,
-						logFileSize, logFileRetentionCount, disableLogFile))
-				.CreateLogger();
-
-			Serilog.Debugging.SelfLog.Disable();
-		}
-
-		public static bool AdjustMinimumLogLevel(LogLevel logLevel) {
-			lock (_defaultLogLevelSwitchLock) {
-				#if !DEBUG
-				if (_defaultLogLevelSwitch == null) {
-					throw new InvalidOperationException("The logger configuration has not yet been initialized.");
-				}
-				#endif
-				if (!Enum.TryParse<LogEventLevel>(logLevel.ToString(), out var serilogLogLevel)) {
-					throw new ArgumentException($"'{logLevel}' is not a valid log level.");
-				}
-
-				if (serilogLogLevel == _defaultLogLevelSwitch.MinimumLevel) return false;
-				_defaultLogLevelSwitch.MinimumLevel = serilogLogLevel;
-				return true;
-			}
-		}
-
-		private static LoggerConfiguration Default(string logsDirectory, string componentName,
-			IConfigurationRoot logLevelConfigurationRoot, LogConsoleFormat logConsoleFormat,
-			RollingInterval logFileInterval, int logFileSize, int logFileRetentionCount, bool disableLogFile) =>
-			new EventStoreLoggerConfiguration(logsDirectory, componentName, logLevelConfigurationRoot, logConsoleFormat,
-				logFileInterval, logFileSize, logFileRetentionCount, disableLogFile);
-
-		private EventStoreLoggerConfiguration(string logsDirectory, string componentName,
-			IConfigurationRoot logLevelConfigurationRoot, LogConsoleFormat logConsoleFormat,
-			RollingInterval logFileInterval, int logFileSize, int logFileRetentionCount, bool disableLogFile) {
-			if (logsDirectory == null) {
-				throw new ArgumentNullException(nameof(logsDirectory));
-			}
-
-			if (componentName == null) {
-				throw new ArgumentNullException(nameof(componentName));
-			}
-
-			if (logLevelConfigurationRoot == null) {
-				throw new ArgumentNullException(nameof(logLevelConfigurationRoot));
-			}
-
-			_logsDirectory = logsDirectory;
-			_componentName = componentName;
-
-			var loglevelSection = logLevelConfigurationRoot.GetSection("Logging").GetSection("LogLevel");
-			var defaultLogLevelSection = loglevelSection.GetSection("Default");
-			lock (_defaultLogLevelSwitchLock) {
-				_defaultLogLevelSwitch = new LoggingLevelSwitch {
-					MinimumLevel = LogEventLevel.Verbose
-				};
-				ApplyLogLevel(defaultLogLevelSection, _defaultLogLevelSwitch);
-			}
-
-			var loggerConfiguration = StandardLoggerConfiguration
-				.MinimumLevel.ControlledBy(_defaultLogLevelSwitch)
-				.WriteTo.Async(AsyncSink);
-
-			foreach (var namedLogLevelSection in loglevelSection.GetChildren().Where(x => x.Key != "Default")) {
-				var levelSwitch = new LoggingLevelSwitch();
-				ApplyLogLevel(namedLogLevelSection, levelSwitch);
-				loggerConfiguration = loggerConfiguration.MinimumLevel.Override(namedLogLevelSection.Key, levelSwitch);
-			}
-
-			_loggerConfiguration = loggerConfiguration;
-
-			void AsyncSink(LoggerSinkConfiguration configuration) {
-				configuration.Logger(c => c
-					.Filter.ByIncludingOnly(RegularStats)
-					.WriteTo.Logger(Stats));
-				configuration.Logger(c => c
-					.Filter.ByExcluding(RegularStats)
-					.WriteTo.Logger(Default));
-			}
-
-			void Default(LoggerConfiguration configuration) {
-				configuration.WriteTo.Console(
-					logConsoleFormat == LogConsoleFormat.Plain
-						? ConsoleOutputExpressionTemplate
-						: new(CompactJsonTemplate));
-
-				if (!disableLogFile) {
-					configuration.WriteTo
-						.RollingFile(GetLogFileName(), new ExpressionTemplate(CompactJsonTemplate),
-							logFileRetentionCount, logFileInterval, logFileSize)
-						.WriteTo.Logger(Error);
-				}
-			}
-
-			void Error(LoggerConfiguration configuration) {
-				if (!disableLogFile) {
-					configuration
-						.Filter.ByIncludingOnly(Errors)
-						.WriteTo
-						.RollingFile(GetLogFileName("err"), new ExpressionTemplate(CompactJsonTemplate),
-							logFileRetentionCount, logFileInterval, logFileSize);
-				}
-			}
-
-			void Stats(LoggerConfiguration configuration) {
-				if (!disableLogFile) {
-					configuration.WriteTo.RollingFile(GetLogFileName("stats"),
-						new ExpressionTemplate(CompactJsonTemplate), logFileRetentionCount, logFileInterval,
-						logFileSize);
-				}
-			}
-
-			void ApplyLogLevel(IConfigurationSection namedLogLevelSection, LoggingLevelSwitch levelSwitch) {
-				TrySetLogLevel(namedLogLevelSection, levelSwitch);
-				ChangeToken.OnChange(namedLogLevelSection.GetReloadToken,
-					() => TrySetLogLevel(namedLogLevelSection, levelSwitch));
-			}
-
-			static void TrySetLogLevel(IConfigurationSection logLevel, LoggingLevelSwitch levelSwitch) {
-				if (!Enum.TryParse<LogEventLevel>(logLevel.Value, out var level)) {
-					return;
-				}
-
-				levelSwitch.MinimumLevel = level;
-			}
-		}
-
-		private static LoggerConfiguration StandardLoggerConfiguration =>
-			new LoggerConfiguration()
-				.Enrich.WithProperty(Constants.SourceContextPropertyName, "EventStore")
-				.Enrich.WithProcessId()
-				.Enrich.WithThreadId()
-				.Enrich.FromLogContext();
-
-
-		private string GetLogFileName(string log = null) =>
-			Path.Combine(_logsDirectory, $"{_componentName}/log{(log == null ? string.Empty : $"-{log}")}.json");
-
-		private static bool Errors(LogEvent e) => e.Exception != null || e.Level >= LogEventLevel.Error;
-
-		public static implicit operator LoggerConfiguration(EventStoreLoggerConfiguration configuration) =>
-			configuration._loggerConfiguration;
-	}
-}
diff --git a/src/EventStore.Core/Log/LoggerSinkConfigurationExtensions.cs b/src/EventStore.Core/Log/LoggerSinkConfigurationExtensions.cs
deleted file mode 100644
index eb721c93970..00000000000
--- a/src/EventStore.Core/Log/LoggerSinkConfigurationExtensions.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using Serilog;
-using Serilog.Configuration;
-using Serilog.Formatting;
-
-namespace EventStore.Common.Log {
-	internal static class LoggerSinkConfigurationExtensions {
-		public static LoggerConfiguration RollingFile(this LoggerSinkConfiguration configuration, string logFileName,
-			ITextFormatter expressionTemplate, int retainedFileCountLimit = 31,
-			RollingInterval rollingInterval = RollingInterval.Day, int fileSizeLimitBytes = 1024 * 1024 * 1024) {
-			if (configuration == null) throw new ArgumentNullException(nameof(configuration));
-
-			return configuration.File(
-				expressionTemplate,
-				logFileName,
-				buffered: false,
-				rollOnFileSizeLimit: true,
-				rollingInterval: rollingInterval,
-				retainedFileCountLimit: retainedFileCountLimit,
-				fileSizeLimitBytes: fileSizeLimitBytes);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Log/SerilogEventListener.cs b/src/EventStore.Core/Log/SerilogEventListener.cs
deleted file mode 100644
index dfc1c0e3ba2..00000000000
--- a/src/EventStore.Core/Log/SerilogEventListener.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.Tracing;
-using System.Linq;
-using Serilog.Events;
-
-namespace EventStore.Common.Log {
-	public class SerilogEventListener : EventListener {
-		private readonly Dictionary<string, LogEventLevel> _eventSources = new() {
-			{ "eventstore-dev-certs", LogEventLevel.Verbose }
-		};
-
-		protected override void OnEventSourceCreated(EventSource eventSource) {
-			if (_eventSources.TryGetValue(eventSource.Name, out var level)) {
-				EnableEvents(eventSource, ConvertToEventSourceLevel(level));
-			}
-		}
-
-		protected override void OnEventWritten(EventWrittenEventArgs eventData) {
-			if (eventData.Message is null) return;
-			Serilog.Log.Logger.Write(ConvertToSerilogLevel(eventData.Level), eventData.Message, eventData.Payload?.ToArray());
-		}
-
-		private static LogEventLevel ConvertToSerilogLevel(EventLevel level) {
-			switch (level) {
-				case EventLevel.Critical:
-					return LogEventLevel.Fatal;
-				case EventLevel.Error:
-					return LogEventLevel.Error;
-				case EventLevel.Informational:
-					return LogEventLevel.Information;
-				case EventLevel.Verbose:
-					return LogEventLevel.Verbose;
-				case EventLevel.Warning:
-					return LogEventLevel.Warning;
-				case EventLevel.LogAlways:
-					return LogEventLevel.Information;
-			}
-
-			return LogEventLevel.Information;
-		}
-		private static EventLevel ConvertToEventSourceLevel(LogEventLevel level) {
-			switch (level) {
-				case LogEventLevel.Fatal:
-					return EventLevel.Critical;
-				case LogEventLevel.Error:
-					return EventLevel.Error;
-				case LogEventLevel.Information:
-					return EventLevel.Informational;
-				case LogEventLevel.Verbose:
-					return EventLevel.Verbose;
-				case LogEventLevel.Warning:
-					return EventLevel.Warning;
-			}
-
-			return EventLevel.Informational;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Log/ThrottledLog.cs b/src/EventStore.Core/Log/ThrottledLog.cs
deleted file mode 100644
index 501aa087795..00000000000
--- a/src/EventStore.Core/Log/ThrottledLog.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.Threading;
-using Serilog;
-using Serilog.Events;
-
-namespace EventStore.Common.Log; 
-
-public class ThrottledLog<T> {
-
-	private readonly ILogger _log;
-	private readonly long _duration;
-	private long _lastLogged;
-	public ThrottledLog(TimeSpan duration) {
-		_log = Serilog.Log.ForContext<T>();
-		_duration = duration.Ticks;
-		_lastLogged = DateTime.UnixEpoch.Ticks;
-	}
-
-	public bool Warning(string message) {
-		bool canLog = CanLog();
-		if (canLog) _log.Warning(message);
-		return canLog;
-	}
-	
-	public bool Fatal(string message) {
-		bool canLog = CanLog();
-		if (canLog) _log.Fatal(message);
-		return canLog;
-	}
-	
-	public bool Information(string message) {
-		bool canLog = CanLog();
-		if (canLog) _log.Information(message);
-		return canLog;
-	}
-	
-	public bool Error(string message) {
-		bool canLog = CanLog();
-		if (canLog) _log.Error(message);
-		return canLog;
-	}
-
-	private bool CanLog() {
-		var currentTime = DateTime.Now.Ticks;
-		bool canLog = false;
-
-		// double-checked locking
-		if (currentTime - _lastLogged >= _duration) {
-			lock (_log) {
-				if (currentTime - _lastLogged >= _duration) {
-					_lastLogged = currentTime;
-					canLog = true;
-				}
-			}
-		}
-		
-		// perform actual logging outside synchronization so that subsequent calls to this method which are not going to log can be returned quickly
-		// logging outside synchronization is safe since Serilog itself is thread-safe
-		return canLog;
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/AdHocNamesProvider.cs b/src/EventStore.Core/LogAbstraction/AdHocNamesProvider.cs
deleted file mode 100644
index 9c64b4ded63..00000000000
--- a/src/EventStore.Core/LogAbstraction/AdHocNamesProvider.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using EventStore.Core.Index;
-using EventStore.Core.Services.Storage.ReaderIndex;
-
-namespace EventStore.Core.LogAbstraction {
-	// mechanism to delay construction of StreamNames and SystemStreams until the IndexReader is available
-	public class AdHocStreamNamesProvider<TStreamId> : IStreamNamesProvider<TStreamId> {
-		private readonly Action<AdHocStreamNamesProvider<TStreamId>, IIndexReader<TStreamId>> _setReader;
-		private readonly Action<AdHocStreamNamesProvider<TStreamId>, ITableIndex> _setTableIndex;
-
-		private ISystemStreamLookup<TStreamId> _systemStreams;
-		private INameLookup<TStreamId> _streamNames;
-		private INameLookup<TStreamId> _eventTypes;
-		private INameExistenceFilterInitializer _streamExistenceFilterInitializer;
-
-		public AdHocStreamNamesProvider(
-			Action<AdHocStreamNamesProvider<TStreamId>, IIndexReader<TStreamId>> setReader = null,
-			Action<AdHocStreamNamesProvider<TStreamId>, ITableIndex> setTableIndex = null) {
-
-			_setReader = setReader;
-			_setTableIndex = setTableIndex;
-		}
-
-		public INameLookup<TStreamId> StreamNames {
-			get => _streamNames ?? throw new InvalidOperationException("Call SetReader or SetTableIndex first");
-			set => _streamNames = value;
-		}
-
-		public INameLookup<TStreamId> EventTypes {
-			get => _eventTypes ?? throw new InvalidOperationException("Call SetReader or SetTableIndex first");
-			set => _eventTypes = value;
-		}
-
-		public ISystemStreamLookup<TStreamId> SystemStreams {
-			get => _systemStreams ?? throw new InvalidOperationException("Call SetReader or SetTableIndex first");
-			set => _systemStreams = value;
-		}
-
-		public INameExistenceFilterInitializer StreamExistenceFilterInitializer {
-			get => _streamExistenceFilterInitializer ?? throw new InvalidOperationException("Call SetReader or SetTableIndex first");
-			set => _streamExistenceFilterInitializer = value;
-		}
-
-		public void SetReader(IIndexReader<TStreamId> reader) =>
-			_setReader?.Invoke(this, reader);
-
-		public void SetTableIndex(ITableIndex tableIndex) =>
-			_setTableIndex?.Invoke(this, tableIndex);
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/Common/Debouncer.cs b/src/EventStore.Core/LogAbstraction/Common/Debouncer.cs
deleted file mode 100644
index 9976646cc67..00000000000
--- a/src/EventStore.Core/LogAbstraction/Common/Debouncer.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.LogAbstraction.Common {
-	/// Executes the func after each interval, but only if it has been triggered during the interval.
-	/// The func should handle its own exceptions.
-	public class Debouncer {
-		private readonly TimeSpan _interval;
-		private readonly Func<CancellationToken, Task> _func;
-		private readonly CancellationToken _token;
-		private readonly Task _task;
-		private readonly ManualResetEventSlim _mres = new();
-
-		public Debouncer(
-			TimeSpan interval,
-			Func<CancellationToken, Task> func,
-			CancellationToken token) {
-
-			_interval = interval;
-			_func = func;
-			_token = token;
-			_task = RunAsync();
-		}
-
-		public void Trigger() {
-			_mres.Set();
-		}
-
-		async Task RunAsync() {
-			while (true) {
-				await Task.Delay(_interval, _token);
-				if (_mres.IsSet) {
-					_mres.Reset();
-					await _func(_token);
-				}
-			}
-		}
-	}
-}
-
diff --git a/src/EventStore.Core/LogAbstraction/Common/NameExistenceFilterValueLookupDecorator.cs b/src/EventStore.Core/LogAbstraction/Common/NameExistenceFilterValueLookupDecorator.cs
deleted file mode 100644
index 272a1a7162f..00000000000
--- a/src/EventStore.Core/LogAbstraction/Common/NameExistenceFilterValueLookupDecorator.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace EventStore.Core.LogAbstraction.Common {
-	public class NameExistenceFilterValueLookupDecorator<TValue> : IValueLookup<TValue> {
-		private readonly IValueLookup<TValue> _wrapped;
-		private readonly INameExistenceFilter _existenceFilter;
-
-		public NameExistenceFilterValueLookupDecorator(
-			IValueLookup<TValue> wrapped,
-			INameExistenceFilter existenceFilter) {
-
-			_wrapped = wrapped;
-			_existenceFilter = existenceFilter;
-		}
-
-		public TValue LookupValue(string name) {
-			if (_existenceFilter.MightContain(name))
-				return _wrapped.LookupValue(name);
-
-			return default;
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/Common/NoExistenceFilterReader.cs b/src/EventStore.Core/LogAbstraction/Common/NoExistenceFilterReader.cs
deleted file mode 100644
index 90700004d99..00000000000
--- a/src/EventStore.Core/LogAbstraction/Common/NoExistenceFilterReader.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace EventStore.Core.LogAbstraction.Common {
-	public class NoExistenceFilterReader : IExistenceFilterReader<uint> {
-		public bool MightContain(uint item) => true;
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/Common/NoNameExistenceFilter.cs b/src/EventStore.Core/LogAbstraction/Common/NoNameExistenceFilter.cs
deleted file mode 100644
index cafc04e9579..00000000000
--- a/src/EventStore.Core/LogAbstraction/Common/NoNameExistenceFilter.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace EventStore.Core.LogAbstraction.Common {
-	public class NoNameExistenceFilter : INameExistenceFilter {
-		public void Initialize(INameExistenceFilterInitializer source, long truncateToPosition) { }
-		public void TruncateTo(long checkpoint) { }
-		public void Verify(double corruptionThreshold) { }
-		public long CurrentCheckpoint { get; set; } = -1;
-
-		public void Add(string name) { }
-		public void Add(ulong hash) { }
-		public bool MightContain(string name) => true;
-		public void Dispose() { }
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/Common/StreamExistenceFilter.cs b/src/EventStore.Core/LogAbstraction/Common/StreamExistenceFilter.cs
deleted file mode 100644
index 11f0a7931a0..00000000000
--- a/src/EventStore.Core/LogAbstraction/Common/StreamExistenceFilter.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.DataStructures.ProbabilisticFilter;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.TransactionLog.Checkpoint;
-using Serilog;
-
-namespace EventStore.Core.LogAbstraction.Common {
-	// This connects a bloom filter datastructure to the rest of the system by
-	// adding catchup and checkpointing.
-	public class StreamExistenceFilter :
-		INameExistenceFilter {
-		private readonly string _filterName;
-		private readonly TimeSpan _checkpointDelay;
-		private readonly PersistentStreamBloomFilter _persistentBloomFilter;
-		private readonly ICheckpoint _checkpoint;
-		private readonly Debouncer _checkpointer;
-		private long _lastNonFlushedCheckpoint;
-		private readonly CancellationTokenSource _cancellationTokenSource;
-
-		private int _initialized;
-		private long _addedSinceLoad;
-
-		protected static readonly ILogger Log = Serilog.Log.ForContext<StreamExistenceFilter>();
-
-		public long CurrentCheckpoint {
-			get => Interlocked.Read(ref _lastNonFlushedCheckpoint);
-			set {
-				Interlocked.Exchange(ref _lastNonFlushedCheckpoint, value);
-				_checkpointer.Trigger();
-			}
-		}
-
-		public long CurrentCheckpointFlushed => _checkpoint.Read();
-
-		public string DataFilePath { get; }
-
-		public StreamExistenceFilter(
-			string directory,
-			ICheckpoint checkpoint,
-			string filterName,
-			long size,
-			TimeSpan checkpointInterval,
-			TimeSpan checkpointDelay,
-			ILongHasher<string> hasher) {
-			_filterName = filterName;
-			_checkpointDelay = checkpointDelay;
-			_checkpoint = checkpoint;
-			_lastNonFlushedCheckpoint = _checkpoint.Read();
-
-			if (!Directory.Exists(directory)) {
-				Directory.CreateDirectory(directory);
-			}
-
-			DataFilePath = $"{directory}/{_filterName}.dat";
-			var create = _lastNonFlushedCheckpoint == -1;
-
-			Log.Information("{filterName}: {creatingOrOpening} {dataFilePath}",
-				_filterName, create ? "Creating" : "Opening", DataFilePath);
-
-			try {
-				_persistentBloomFilter = new PersistentStreamBloomFilter(
-					persistenceStrategy: new FileStreamPersistence(
-						size: size,
-						path: DataFilePath,
-						create: create),
-					hasher: hasher,
-					corruptionRebuildCount: 0);
-			} catch (Exception exc) when (
-					exc is CorruptedFileException ||
-					exc is CorruptedHashException ||
-					exc is SizeMismatchException ||
-					exc is FileNotFoundException) {
-
-				var corruptionRebuildCount = 0;
-
-				if (exc is CorruptedFileException) {
-					Log.Error(exc, "{filterName} is corrupted. Rebuilding...", _filterName);
-				} else if (exc is CorruptedHashException corruptedHashException) {
-					corruptionRebuildCount = corruptedHashException.RebuildCount + 1;
-					Log.Error(exc, "{filterName} has too many corrupted hashes. Rebuilding...", _filterName);
-				} else if (exc is SizeMismatchException) {
-					Log.Error(exc, "{filterName} does not have the expected size. Rebuilding...", _filterName);
-				} else if (exc is FileNotFoundException) {
-					Log.Error(exc, "{filterName} does not exist even though the checkpoint does. Rebuilding...", _filterName);
-				}
-
-				File.Delete(DataFilePath);
-				_lastNonFlushedCheckpoint = -1L;
-				_checkpoint.Write(-1L);
-				_checkpoint.Flush();
-				_persistentBloomFilter = new PersistentStreamBloomFilter(
-					persistenceStrategy: new FileStreamPersistence(
-						size: size,
-						path: DataFilePath,
-						create: true),
-					hasher: hasher,
-					corruptionRebuildCount: corruptionRebuildCount);
-			}
-
-			if (_persistentBloomFilter.CorruptionRebuildCount == 0)
-				Log.Information("{filterName} has successfully loaded.", _filterName);
-			else
-				Log.Information("{filterName} has successfully loaded. Filter has been rebuilt due to hash corruption {count} times.",
-					_filterName, _persistentBloomFilter.CorruptionRebuildCount);
-
-			const double p = PersistentBloomFilter.RecommendedFalsePositiveProbability;
-			Log.Debug("Optimal number of items for a {filterName} with a configured size of " +
-			                "{size:N0} MB is approximately equal to: {n:N0} with false positive probability: {p:N2}",
-				_filterName,
-				size / 1000 / 1000,
-				_persistentBloomFilter.CalculateOptimalNumItems(p),
-				p);
-
-			_cancellationTokenSource = new();
-			_checkpointer = new Debouncer(
-				checkpointInterval,
-				async _ => {
-					await TakeCheckpointAsync();
-				},
-				_cancellationTokenSource.Token);
-		}
-
-		public void Verify(double corruptionThreshold) => _persistentBloomFilter.Verify(corruptionThreshold);
-
-		private async Task TakeCheckpointAsync() {
-			var checkpoint = Interlocked.Read(ref _lastNonFlushedCheckpoint);
-			try {
-				var prevCheckpoint = _checkpoint.Read();
-				var diff = checkpoint - prevCheckpoint;
-
-				var startTime = DateTime.UtcNow;
-				Log.Verbose("{filterName} is flushing at {checkpoint:N0}. Diff {diff:N0} ...", _filterName, checkpoint, diff);
-				_persistentBloomFilter.Flush();
-				var endTime = DateTime.UtcNow;
-				Log.Verbose("{filterName} has flushed at {checkpoint:N0}. Diff {diff:N0}. Took {flushLength}",
-					       _filterName, checkpoint, diff, endTime - startTime);
-
-				// safety precaution against anything in the stack lying about the data
-				// truly being on disk.
-				await Task.Delay(_checkpointDelay);
-
-				_checkpoint.Write(checkpoint);
-				_checkpoint.Flush();
-				Log.Verbose("{filterName} took checkpoint at position: {position:N0}.",
-					_filterName,
-					_checkpoint.Read());
-			} catch (Exception ex) {
-				Log.Error(ex, "{filterName} could not take checkpoint at position: {position:N0}", _filterName, checkpoint);
-			}
-		}
-
-		public void Initialize(INameExistenceFilterInitializer source, long truncateToPosition) {
-			Log.Debug("{filterName} rebuilding started from checkpoint: {checkpoint:N0} (0x{checkpoint:X}).",
-				_filterName, CurrentCheckpoint, CurrentCheckpoint);
-			var startTime = DateTime.UtcNow;
-			source.Initialize(this, truncateToPosition);
-			Log.Debug("{filterName} rebuilding done: total processed {processed} records, time elapsed: {elapsed}.",
-				_filterName, _addedSinceLoad, DateTime.UtcNow - startTime);
-			Interlocked.Exchange(ref _initialized, 1);
-		}
-
-		// any truncation must be done prior to calling Add or setting CurrentCheckpoint
-		public void TruncateTo(long checkpoint) {
-			if (CurrentCheckpoint <= checkpoint) {
-				// this was already guarded elsewhere but we want to guard it in this class so that we
-				// can guarantee that a checkpoint is only set at all if the filter was successfully
-				// flushed. otherwise here we might set the checkpoint even though we hadn't flushed
-				// that far.
-				Log.Information(
-					"{filterName} is NOT truncating from {current:N0} to {truncateTo:N0} " +
-					"since it already satisfies the truncation point.",
-					_filterName,
-					CurrentCheckpoint,
-					checkpoint);
-				return;
-			}
-
-			Log.Information("{filterName} is truncating from {current:N0} to {truncateTo:N0}.",
-				_filterName,
-				CurrentCheckpoint,
-				checkpoint);
-
-			// we dont need to remove data from the bloom filter since false positives
-			// are allowed, and we can't anyway, since we wouldn't know what to remove.
-			// but we DO need to move the checkpoint back and flush it. otherwise if
-			// (1) the writer/chaser move forward and (2) the node exits before
-			// the filter has flushed those records, then we will no longer know that
-			// we need to go back and add them.
-			Interlocked.Exchange(ref _lastNonFlushedCheckpoint, checkpoint);
-			_checkpoint.Write(checkpoint);
-			_checkpoint.Flush();
-		}
-
-		public void Add(string name) {
-			_persistentBloomFilter.Add(name);
-			_addedSinceLoad++;
-		}
-
-		public void Add(ulong hash) {
-			_persistentBloomFilter.Add(hash);
-			_addedSinceLoad++;
-		}
-
-		public bool MightContain(string name) {
-			if (Interlocked.CompareExchange(ref _initialized, 0, 0) == 0)
-				throw new InvalidOperationException("Initialize the filter before querying");
-			return _persistentBloomFilter.MightContain(name);
-		}
-
-		public void Dispose() {
-			_cancellationTokenSource?.Cancel();
-			_persistentBloomFilter?.Dispose();
-			GC.SuppressFinalize(this);
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/IMetastreamLookup.cs b/src/EventStore.Core/LogAbstraction/IMetastreamLookup.cs
deleted file mode 100644
index c312b57ec2b..00000000000
--- a/src/EventStore.Core/LogAbstraction/IMetastreamLookup.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EventStore.Core.LogAbstraction {
-	public interface IMetastreamLookup<TStreamId> {
-		bool IsMetaStream(TStreamId streamId);
-		TStreamId MetaStreamOf(TStreamId streamId);
-		TStreamId OriginalStreamOf(TStreamId streamId);
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/INameExistenceFilter.cs b/src/EventStore.Core/LogAbstraction/INameExistenceFilter.cs
deleted file mode 100644
index 4e2b0f29b3c..00000000000
--- a/src/EventStore.Core/LogAbstraction/INameExistenceFilter.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-
-namespace EventStore.Core.LogAbstraction {
-	public interface INameExistenceFilter : IExistenceFilterReader<string>, IDisposable {
-		void Initialize(INameExistenceFilterInitializer source, long truncateToPosition);
-		void TruncateTo(long checkpoint);
-		void Verify(double corruptionThreshold);
-		void Add(string name);
-		void Add(ulong hash);
-		long CurrentCheckpoint { get; set; }
-	}
-
-	public interface IExistenceFilterReader<T> {
-		bool MightContain(T item);
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/INameExistenceFilterInitializer.cs b/src/EventStore.Core/LogAbstraction/INameExistenceFilterInitializer.cs
deleted file mode 100644
index 38eeed083e3..00000000000
--- a/src/EventStore.Core/LogAbstraction/INameExistenceFilterInitializer.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace EventStore.Core.LogAbstraction {
-	public interface INameExistenceFilterInitializer {
-		void Initialize(INameExistenceFilter filter, long truncateToPosition);
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/INameIndex.cs b/src/EventStore.Core/LogAbstraction/INameIndex.cs
deleted file mode 100644
index 255c96bfcd1..00000000000
--- a/src/EventStore.Core/LogAbstraction/INameIndex.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace EventStore.Core.LogAbstraction {
-	/// Maps names (strings) to TValues
-	public interface INameIndex<TValue> {
-		void CancelReservations();
-
-		// return true => stream already existed.
-		// return false => stream was created. addedValue and addedName are the details of the created stream.
-		// these can be different to streamName/streamId e.g. if streamName is a metastream.
-		bool GetOrReserve(string name, out TValue value, out TValue addedValue, out string addedName);
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/INameIndexConfirmer.cs b/src/EventStore.Core/LogAbstraction/INameIndexConfirmer.cs
deleted file mode 100644
index 8347f0cf9ed..00000000000
--- a/src/EventStore.Core/LogAbstraction/INameIndexConfirmer.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.LogAbstraction {
-	public interface INameIndexConfirmer<TValue> : IDisposable {
-		void InitializeWithConfirmed(INameLookup<TValue> source);
-
-		/// Entries are confirmed once they are replicated.
-		/// Once confirmed, the entry can be persisted.
-		// trying quite hard not to use the word 'commit' since it has other uses.
-		void Confirm(
-			IList<IPrepareLogRecord<TValue>> replicatedPrepares,
-			bool catchingUp,
-			IIndexBackend<TValue> backend);
-
-		void Confirm(
-			IList<IPrepareLogRecord<TValue>> replicatedPrepares,
-			CommitLogRecord commit,
-			bool catchingUp,
-			IIndexBackend<TValue> backend);
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/INameIndexExtensions.cs b/src/EventStore.Core/LogAbstraction/INameIndexExtensions.cs
deleted file mode 100644
index 222619a375b..00000000000
--- a/src/EventStore.Core/LogAbstraction/INameIndexExtensions.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.LogAbstraction {
-	public static class INameIndexExtensions {
-		// todo: rename to GetOrReserveStream when we generalise to EventTypes too.
-		/// Generates a StreamRecord if necessary
-		public static bool GetOrReserve<TStreamId>(
-			this INameIndex<TStreamId> streamNameIndex,
-			IRecordFactory<TStreamId> recordFactory,
-			string streamName,
-			long logPosition,
-			out TStreamId streamId,
-			out IPrepareLogRecord<TStreamId> streamRecord) {
-
-			var preExisting = streamNameIndex.GetOrReserve(streamName, out streamId, out var addedId, out var addedName);
-
-			var appendNewStream = recordFactory.ExplicitStreamCreation && !preExisting;
-			if (!appendNewStream) {
-				streamRecord = null;
-				return preExisting;
-			}
-
-			streamRecord = recordFactory.CreateStreamRecord(
-				streamId: Guid.NewGuid(),
-				logPosition: logPosition,
-				timeStamp: DateTime.UtcNow,
-				streamNumber: addedId,
-				streamName: addedName);
-
-			return preExisting;
-		}
-		
-		public static bool GetOrReserveEventType<TStreamId>(
-			this INameIndex<TStreamId> eventTypeIndex,
-			IRecordFactory<TStreamId> recordFactory,
-			string eventType,
-			long logPosition,
-			out TStreamId eventTypeId,
-			out IPrepareLogRecord<TStreamId> eventTypeRecord) {
-
-			var preExisting = eventTypeIndex.GetOrReserve(eventType, out eventTypeId, out var addedNumber, out var addedName);
-
-			var appendNewEventType = recordFactory.ExplicitEventTypeCreation && !preExisting;
-			if (!appendNewEventType) {
-				eventTypeRecord = null;
-				return preExisting;
-			}
-
-			eventTypeRecord = recordFactory.CreateEventTypeRecord(
-				eventTypeId: Guid.NewGuid(),
-				parentEventTypeId: Guid.Empty,
-				eventType: addedName,
-				eventTypeNumber: addedNumber,
-				eventTypeVersion: 0,
-				logPosition: logPosition,
-				timeStamp: DateTime.UtcNow);
-
-			return preExisting;
-		}
-
-		public static TStreamId GetExisting<TStreamId>(
-			this INameIndex<TStreamId> nameIndex,
-			string name) {
-
-			if (!nameIndex.GetOrReserve(name, out var value, out _, out _))
-				throw new Exception($"{name} was expected to already exist but it didn not");
-
-			return value;
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/INameIndexPersistence.cs b/src/EventStore.Core/LogAbstraction/INameIndexPersistence.cs
deleted file mode 100644
index e0c15203699..00000000000
--- a/src/EventStore.Core/LogAbstraction/INameIndexPersistence.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-
-namespace EventStore.Core.LogAbstraction {
-	public interface INameIndexPersistence<TValue> : IValueLookup<TValue>, IDisposable {
-		TValue LastValueAdded { get; }
-		void Init(INameLookup<TValue> source);
-		bool TryGetValue(string name, out TValue value);
-		void Add(string name, TValue value);
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/INameLookup.cs b/src/EventStore.Core/LogAbstraction/INameLookup.cs
deleted file mode 100644
index 27bd684e112..00000000000
--- a/src/EventStore.Core/LogAbstraction/INameLookup.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace EventStore.Core.LogAbstraction {
-	/// Looks up a name given a value
-	public interface INameLookup<TValue> {
-		/// returns false if there is no max (i.e. the source is empty)
-		bool TryGetLastValue(out TValue last);
-
-		bool TryGetName(TValue value, out string name);
-
-		string LookupName(TValue value) {
-			TryGetName(value, out var name);
-			return name;
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/IPartitionManager.cs b/src/EventStore.Core/LogAbstraction/IPartitionManager.cs
deleted file mode 100644
index ec9cd1c056e..00000000000
--- a/src/EventStore.Core/LogAbstraction/IPartitionManager.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-
-namespace EventStore.Core.LogAbstraction {
-	public interface IPartitionManager {
-		
-		Guid? RootId { get; }
-		Guid? RootTypeId { get; }
-		
-		void Initialize();
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/IRecordFactory.cs b/src/EventStore.Core/LogAbstraction/IRecordFactory.cs
deleted file mode 100644
index fc78481e86f..00000000000
--- a/src/EventStore.Core/LogAbstraction/IRecordFactory.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.LogAbstraction {
-	public interface IRecordFactory {
-		ISystemLogRecord CreateEpoch(EpochRecord epoch);
-	}
-
-	public interface IRecordFactory<TStreamId> : IRecordFactory {
-		bool ExplicitStreamCreation { get; }
-		bool ExplicitEventTypeCreation { get; }
-
-		IPrepareLogRecord<TStreamId> CreateStreamRecord(
-			Guid streamId,
-			long logPosition,
-			DateTime timeStamp,
-			TStreamId streamNumber,
-			string streamName);
-
-		IPrepareLogRecord<TStreamId> CreateEventTypeRecord(
-			Guid eventTypeId,
-			Guid parentEventTypeId,
-			string eventType,
-			TStreamId eventTypeNumber,
-			ushort eventTypeVersion,
-			long logPosition,
-			DateTime timeStamp);
-
-		IPrepareLogRecord<TStreamId> CreatePrepare(
-			long logPosition,
-			Guid correlationId,
-			Guid eventId,
-			long transactionPosition,
-			int transactionOffset,
-			TStreamId eventStreamId,
-			long expectedVersion,
-			DateTime timeStamp,
-			PrepareFlags flags,
-			TStreamId eventType,
-			ReadOnlyMemory<byte> data,
-			ReadOnlyMemory<byte> metadata);
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/ISizer.cs b/src/EventStore.Core/LogAbstraction/ISizer.cs
deleted file mode 100644
index aa0fb4b2173..00000000000
--- a/src/EventStore.Core/LogAbstraction/ISizer.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace EventStore.Core.LogAbstraction {
-	public interface ISizer<T> {
-		int GetSizeInBytes(T t);
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/IStreamIdConverter.cs b/src/EventStore.Core/LogAbstraction/IStreamIdConverter.cs
deleted file mode 100644
index 77027a4c7d8..00000000000
--- a/src/EventStore.Core/LogAbstraction/IStreamIdConverter.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace EventStore.Core.LogAbstraction {
-	public interface IStreamIdConverter<TStreamId> {
-		TStreamId ToStreamId(ReadOnlySpan<byte> bytes);
-		TStreamId ToStreamId(ReadOnlyMemory<byte> bytes);
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/IStreamNamesProvider.cs b/src/EventStore.Core/LogAbstraction/IStreamNamesProvider.cs
deleted file mode 100644
index d06b0a161d6..00000000000
--- a/src/EventStore.Core/LogAbstraction/IStreamNamesProvider.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using EventStore.Core.Index;
-using EventStore.Core.Services.Storage.ReaderIndex;
-
-namespace EventStore.Core.LogAbstraction {
-	// certain abstraction points cant be provided until we have access to the index reader.
-	// hopefully when some other pieces have fallen into place we can replace this with a nicer mechanism.
-	public interface IStreamNamesProvider<TStreamId> {
-		void SetReader(IIndexReader<TStreamId> reader);
-		void SetTableIndex(ITableIndex reader);
-		ISystemStreamLookup<TStreamId> SystemStreams { get; }
-		INameLookup<TStreamId> StreamNames { get; }
-		INameLookup<TStreamId> EventTypes { get; }
-		INameExistenceFilterInitializer StreamExistenceFilterInitializer { get; }
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/ISystemStreamLookup.cs b/src/EventStore.Core/LogAbstraction/ISystemStreamLookup.cs
deleted file mode 100644
index 6b82fdbf693..00000000000
--- a/src/EventStore.Core/LogAbstraction/ISystemStreamLookup.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EventStore.Core.LogAbstraction {
-	public interface ISystemStreamLookup<TStreamId> : IMetastreamLookup<TStreamId> {
-		TStreamId AllStream { get; }
-		TStreamId SettingsStream { get; }
-		bool IsSystemStream(TStreamId streamId);
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/IValueLookup.cs b/src/EventStore.Core/LogAbstraction/IValueLookup.cs
deleted file mode 100644
index 50e60cceedf..00000000000
--- a/src/EventStore.Core/LogAbstraction/IValueLookup.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.Core.LogAbstraction {
-	/// Looks up a Value given a Name
-	public interface IValueLookup<TValue> {
-		TValue LookupValue(string name);
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/IdentityHighHasher.cs b/src/EventStore.Core/LogAbstraction/IdentityHighHasher.cs
deleted file mode 100644
index 0ca1b3749d8..00000000000
--- a/src/EventStore.Core/LogAbstraction/IdentityHighHasher.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using EventStore.Core.Index.Hashes;
-
-namespace EventStore.Core.LogAbstraction {
-	// if the streams are only 32 bit, neednt have 64 bits in the index
-	public class IdentityHighHasher : IHasher<uint> {
-		public uint Hash(uint s) => 0;
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/IdentityLowHasher.cs b/src/EventStore.Core/LogAbstraction/IdentityLowHasher.cs
deleted file mode 100644
index 284e3fa8d45..00000000000
--- a/src/EventStore.Core/LogAbstraction/IdentityLowHasher.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using EventStore.Core.Index.Hashes;
-using StreamId = System.UInt32;
-
-namespace EventStore.Core.LogAbstraction {
-	public class IdentityLowHasher : IHasher<StreamId> {
-		public uint Hash(StreamId s) => s;
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/LogFormatAbstractor.cs b/src/EventStore.Core/LogAbstraction/LogFormatAbstractor.cs
deleted file mode 100644
index ac8f252cb87..00000000000
--- a/src/EventStore.Core/LogAbstraction/LogFormatAbstractor.cs
+++ /dev/null
@@ -1,312 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.LogAbstraction.Common;
-using EventStore.Core.LogV2;
-using EventStore.Core.LogV3;
-using EventStore.Core.LogV3.FASTER;
-using EventStore.Core.Settings;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.LogRecords;
-using LogV3StreamId = System.UInt32;
-
-namespace EventStore.Core.LogAbstraction {
-	public record LogFormatAbstractorOptions {
-		public string IndexDirectory { get; init; }
-		public bool InMemory { get; init; }
-		public int InitialReaderCount { get; init; } = ESConsts.PTableInitialReaderCount;
-		public int MaxReaderCount { get; init; } = 100;
-		public long StreamExistenceFilterSize { get; init; }
-		public ICheckpoint StreamExistenceFilterCheckpoint { get; init; }
-		public TimeSpan StreamExistenceFilterCheckpointInterval { get; init; } = TimeSpan.FromSeconds(30);
-		public TimeSpan StreamExistenceFilterCheckpointDelay { get; init; } = TimeSpan.FromSeconds(5);
-		public Func<TFReaderLease> TFReaderLeaseFactory { get; init; }
-		public IHasher<string> LowHasher { get; init; } = new XXHashUnsafe();
-		public IHasher<string> HighHasher { get; init; } = new Murmur3AUnsafe();
-	}
-
-	public interface ILogFormatAbstractorFactory<TStreamId> {
-		LogFormatAbstractor<TStreamId> Create(LogFormatAbstractorOptions options);
-	}
-
-	public class LogV2FormatAbstractorFactory : ILogFormatAbstractorFactory<string> {
-		public LogV2FormatAbstractorFactory() {
-		}
-
-		public LogFormatAbstractor<string> Create(LogFormatAbstractorOptions options) {
-			var streamExistenceFilter = GenStreamExistenceFilter(options);
-			var streamNameIndex = new LogV2StreamNameIndex(streamExistenceFilter);
-			var eventTypeIndex = new LogV2EventTypeIndex();
-
-			return new LogFormatAbstractor<string>(
-				lowHasher: options.LowHasher,
-				highHasher: options.HighHasher,
-				streamNameIndex: streamNameIndex,
-				streamNameIndexConfirmer: streamNameIndex,
-				eventTypeIndex: eventTypeIndex,
-				eventTypeIndexConfirmer: eventTypeIndex,
-				streamIds: streamNameIndex,
-				metastreams: new LogV2SystemStreams(),
-				streamNamesProvider: GenStreamNamesProvider(options, streamNameIndex, eventTypeIndex),
-				streamIdValidator: new LogV2StreamIdValidator(),
-				streamIdConverter: new LogV2StreamIdConverter(),
-				emptyStreamId: string.Empty,
-				emptyEventTypeId: string.Empty,
-				streamIdSizer: new LogV2Sizer(),
-				streamExistenceFilter: streamExistenceFilter,
-				streamExistenceFilterReader: streamExistenceFilter,
-				recordFactory: new LogV2RecordFactory(),
-				supportsExplicitTransactions: true,
-				partitionManagerFactory: (r, w) => new LogV2PartitionManager());
-		}
-
-		private static INameExistenceFilter GenStreamExistenceFilter(
-			LogFormatAbstractorOptions options) {
-
-			if (options.InMemory || options.StreamExistenceFilterSize == 0) {
-				return new NoNameExistenceFilter();
-			}
-
-			var nameExistenceFilter = new StreamExistenceFilter(
-				directory: $"{options.IndexDirectory}/{ESConsts.StreamExistenceFilterDirectoryName}",
-				filterName: "streamExistenceFilter",
-				size: options.StreamExistenceFilterSize,
-				checkpoint: options.StreamExistenceFilterCheckpoint,
-				checkpointInterval: options.StreamExistenceFilterCheckpointInterval,
-				checkpointDelay: options.StreamExistenceFilterCheckpointDelay,
-				hasher: new CompositeHasher<string>(
-					options.LowHasher,
-					options.HighHasher));
-
-			return nameExistenceFilter;
-		}
-
-		static IStreamNamesProvider<string> GenStreamNamesProvider(
-			LogFormatAbstractorOptions options,
-			LogV2StreamNameIndex streamNameIndex,
-			LogV2EventTypeIndex eventTypeIndex) =>
-
-			new AdHocStreamNamesProvider<string>(setTableIndex: (self, tableIndex) => {
-				self.SystemStreams = new LogV2SystemStreams();
-				self.StreamNames = streamNameIndex;
-				self.EventTypes = eventTypeIndex;
-				self.StreamExistenceFilterInitializer = new LogV2StreamExistenceFilterInitializer(
-					options.TFReaderLeaseFactory,
-					tableIndex);
-			});
-	}
-
-	public class LogV3FormatAbstractorFactory : ILogFormatAbstractorFactory<LogV3StreamId> {
-		public LogV3FormatAbstractorFactory() {
-		}
-
-		public LogFormatAbstractor<LogV3StreamId> Create(LogFormatAbstractorOptions options) {
-			var metastreams = new LogV3Metastreams();
-			var recordFactory = new LogV3RecordFactory();
-			
-			var streamNameIndexPersistence = GenStreamNameIndexPersistence(options);
-			var streamExistenceFilter = GenStreamExistenceFilter(options);
-			var streamNameIndex = GenStreamNameIndex(streamExistenceFilter, streamNameIndexPersistence, metastreams);
-
-			var streamIds = streamNameIndexPersistence
-				.Wrap(x => new NameExistenceFilterValueLookupDecorator<LogV3StreamId>(x, streamExistenceFilter))
-				.Wrap(x => new StreamIdLookupMetastreamDecorator(x, metastreams));
-
-			var eventTypeIndexPersistence = GenEventTypeIndexPersistence(options);
-			var eventTypeIndex = GenEventTypeIndex(eventTypeIndexPersistence);
-			
-			var abstractor = new LogFormatAbstractor<LogV3StreamId>(
-				lowHasher: new IdentityLowHasher(),
-				highHasher: new IdentityHighHasher(),
-				streamNameIndex: new StreamNameIndexMetastreamDecorator(streamNameIndex, metastreams),
-				streamNameIndexConfirmer: streamNameIndex,
-				eventTypeIndex: new EventTypeIndexSystemTypesDecorator(eventTypeIndex),
-				eventTypeIndexConfirmer: eventTypeIndex,
-				streamIds: streamIds,
-				metastreams: metastreams,
-				streamNamesProvider: GenStreamNamesProvider(metastreams),
-				streamIdValidator: new LogV3StreamIdValidator(),
-				streamIdConverter: new LogV3StreamIdConverter(),
-				emptyStreamId: 0,
-				emptyEventTypeId: 0,
-				streamIdSizer: new LogV3Sizer(),
-				streamExistenceFilter: streamExistenceFilter,
-				// this is for the indexreader to check the existence of the stream using a streamId
-				// its important for LogV2 (because it has no stream name index)
-				// but not applicable to LogV3 (because you need a streamName not id to check the filter)
-				streamExistenceFilterReader: new NoExistenceFilterReader(),
-				recordFactory: recordFactory,
-				supportsExplicitTransactions: false,
-				partitionManagerFactory: (r, w) => new PartitionManager(r, w, recordFactory));
-			return abstractor;
-		}
-
-		static IStreamNamesProvider<LogV3StreamId> GenStreamNamesProvider(IMetastreamLookup<LogV3StreamId> metastreams) {
-			return new AdHocStreamNamesProvider<LogV3StreamId>((self, indexReader) => {
-				INameLookup<LogV3StreamId> streamNames = new StreamIdToNameFromStandardIndex(indexReader);
-				INameLookup<LogV3StreamId> eventTypes = new EventTypeIdToNameFromStandardIndex(indexReader);
-				self.SystemStreams = new LogV3SystemStreams(metastreams, streamNames);
-				self.StreamNames = new StreamNameLookupMetastreamDecorator(streamNames, metastreams);
-				self.EventTypes = new EventTypeLookupSystemTypesDecorator(eventTypes);
-				self.StreamExistenceFilterInitializer = new LogV3StreamExistenceFilterInitializer(streamNames);
-			});
-		}
-
-		static NameIndex GenStreamNameIndex(
-			INameExistenceFilter existenceFilter,
-			INameIndexPersistence<LogV3StreamId> persistence,
-			IMetastreamLookup<LogV3StreamId> metastreams) =>
-			new NameIndex(
-				indexName: "StreamNameIndex",
-				firstValue: LogV3SystemStreams.FirstRealStream,
-				valueInterval: LogV3SystemStreams.StreamInterval,
-				existenceFilter: existenceFilter,
-				persistence: persistence,
-				metastreams: metastreams,
-				recordTypeToHandle: typeof(LogV3StreamRecord));
-
-		static INameIndexPersistence<LogV3StreamId> GenStreamNameIndexPersistence(LogFormatAbstractorOptions options) {
-			if (options.InMemory) {
-				return new NameIndexInMemoryPersistence();
-			}
-
-			var persistence = new FASTERNameIndexPersistence(
-				indexName: "StreamNameIndexPersistence",
-				logDir: $"{options.IndexDirectory}/stream-name-index",
-				firstValue: LogV3SystemStreams.FirstRealStream,
-				valueInterval: LogV3SystemStreams.StreamInterval,
-				initialReaderCount: options.InitialReaderCount,
-				maxReaderCount: options.MaxReaderCount,
-				enableReadCache: true,
-				checkpointInterval: TimeSpan.FromSeconds(60));
-			return persistence;
-		}
-
-		public static INameExistenceFilter GenStreamExistenceFilter(LogFormatAbstractorOptions options) {
-			if (options.InMemory || options.StreamExistenceFilterSize == 0) {
-				return new NoNameExistenceFilter();
-			}
-
-			var nameExistenceFilter = new StreamExistenceFilter(
-				directory: $"{options.IndexDirectory}/{ESConsts.StreamExistenceFilterDirectoryName}",
-				filterName: "streamExistenceFilter",
-				size: options.StreamExistenceFilterSize,
-				checkpoint: options.StreamExistenceFilterCheckpoint,
-				checkpointInterval: options.StreamExistenceFilterCheckpointInterval,
-				checkpointDelay: options.StreamExistenceFilterCheckpointDelay,
-				hasher: null)
-			.Wrap(x => new StreamExistenceFilterValidator(x));
-
-			return nameExistenceFilter;
-		}
-
-		static INameIndexPersistence<LogV3StreamId> GenEventTypeIndexPersistence(LogFormatAbstractorOptions options) {
-			if (options.InMemory) {
-				return new NameIndexInMemoryPersistence();
-			}
-
-			var persistence = new FASTERNameIndexPersistence(
-				indexName: "EventTypeIndexPersistence",
-				logDir: $"{options.IndexDirectory}/event-type-index",
-				firstValue: LogV3SystemEventTypes.FirstRealEventTypeNumber,
-				valueInterval: LogV3SystemEventTypes.EventTypeInterval,
-				initialReaderCount: options.InitialReaderCount,
-				maxReaderCount: options.MaxReaderCount,
-				enableReadCache: true,
-				checkpointInterval: TimeSpan.FromSeconds(60));
-			return persistence;
-		}
-
-		static NameIndex GenEventTypeIndex(INameIndexPersistence<LogV3StreamId> persistence) =>
-			new NameIndex(
-				indexName: "EventTypeIndex",
-				firstValue: LogV3SystemEventTypes.FirstRealEventTypeNumber,
-				valueInterval: LogV3SystemEventTypes.EventTypeInterval,
-				existenceFilter: new NoNameExistenceFilter(),
-				persistence: persistence,
-				metastreams: null,
-				recordTypeToHandle: typeof(LogV3EventTypeRecord));
-	}
-
-	public class LogFormatAbstractor<TStreamId> : IDisposable {
-		private readonly Func<ITransactionFileReader,ITransactionFileWriter,IPartitionManager> _partitionManagerFactory;
-
-		public LogFormatAbstractor(
-			IHasher<TStreamId> lowHasher,
-			IHasher<TStreamId> highHasher,
-			INameIndex<TStreamId> streamNameIndex,
-			INameIndexConfirmer<TStreamId> streamNameIndexConfirmer,
-			INameIndex<TStreamId> eventTypeIndex,
-			INameIndexConfirmer<TStreamId> eventTypeIndexConfirmer,
-			IValueLookup<TStreamId> streamIds,
-			IMetastreamLookup<TStreamId> metastreams,
-			IStreamNamesProvider<TStreamId> streamNamesProvider,
-			IValidator<TStreamId> streamIdValidator,
-			IStreamIdConverter<TStreamId> streamIdConverter,
-			TStreamId emptyStreamId,
-			TStreamId emptyEventTypeId,
-			ISizer<TStreamId> streamIdSizer,
-			INameExistenceFilter streamExistenceFilter,
-			IExistenceFilterReader<TStreamId> streamExistenceFilterReader,
-			IRecordFactory<TStreamId> recordFactory,
-			bool supportsExplicitTransactions,
-			Func<ITransactionFileReader,ITransactionFileWriter,IPartitionManager> partitionManagerFactory) {
-			
-			_partitionManagerFactory = partitionManagerFactory;
-
-			LowHasher = lowHasher;
-			HighHasher = highHasher;
-			StreamNameIndex = streamNameIndex;
-			StreamNameIndexConfirmer = streamNameIndexConfirmer;
-			EventTypeIndex = eventTypeIndex;
-			EventTypeIndexConfirmer = eventTypeIndexConfirmer;
-			StreamIds = streamIds;
-			Metastreams = metastreams;
-			StreamNamesProvider = streamNamesProvider;
-			StreamIdValidator = streamIdValidator;
-			StreamIdConverter = streamIdConverter;
-			EmptyStreamId = emptyStreamId;
-			EmptyEventTypeId = emptyEventTypeId;
-			StreamIdSizer = streamIdSizer;
-			StreamExistenceFilter = streamExistenceFilter;
-			StreamExistenceFilterReader = streamExistenceFilterReader;
-			RecordFactory = recordFactory;
-			SupportsExplicitTransactions = supportsExplicitTransactions;
-		}
-
-		public void Dispose() {
-			StreamNameIndexConfirmer?.Dispose();
-			EventTypeIndexConfirmer?.Dispose();
-			StreamExistenceFilter?.Dispose();
-		}
-
-		public IHasher<TStreamId> LowHasher { get; }
-		public IHasher<TStreamId> HighHasher { get; }
-		public INameIndex<TStreamId> StreamNameIndex { get; }
-		public INameIndexConfirmer<TStreamId> StreamNameIndexConfirmer { get; }
-		public INameIndex<TStreamId> EventTypeIndex { get; }
-		public INameIndexConfirmer<TStreamId> EventTypeIndexConfirmer { get; }
-		public IValueLookup<TStreamId> StreamIds { get; }
-		public IMetastreamLookup<TStreamId> Metastreams { get; }
-		public IStreamNamesProvider<TStreamId> StreamNamesProvider { get; }
-		public IValidator<TStreamId> StreamIdValidator { get; }
-		public IStreamIdConverter<TStreamId> StreamIdConverter { get; }
-		public TStreamId EmptyStreamId { get; }
-		public TStreamId EmptyEventTypeId { get; }
-		public ISizer<TStreamId> StreamIdSizer { get; }
-		public INameExistenceFilter StreamExistenceFilter { get; }
-		public IExistenceFilterReader<TStreamId> StreamExistenceFilterReader { get; }
-		public IRecordFactory<TStreamId> RecordFactory { get; }
-
-		public INameLookup<TStreamId> StreamNames => StreamNamesProvider.StreamNames;
-		public INameLookup<TStreamId> EventTypes => StreamNamesProvider.EventTypes;
-		public ISystemStreamLookup<TStreamId> SystemStreams => StreamNamesProvider.SystemStreams;
-		public INameExistenceFilterInitializer StreamExistenceFilterInitializer => StreamNamesProvider.StreamExistenceFilterInitializer;
-		public bool SupportsExplicitTransactions { get; }
-		
-		public IPartitionManager CreatePartitionManager(ITransactionFileReader reader, ITransactionFileWriter writer) {
-			return _partitionManagerFactory(reader, writer);
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogAbstraction/WrapExtensions.cs b/src/EventStore.Core/LogAbstraction/WrapExtensions.cs
deleted file mode 100644
index f0d4975f6f6..00000000000
--- a/src/EventStore.Core/LogAbstraction/WrapExtensions.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System;
-
-namespace EventStore.Core.LogAbstraction {
-	public static class WrapExtensions {
-		public static U Wrap<T, U>(this T t, Func<T, U> wrap) => wrap(t);
-	}
-}
diff --git a/src/EventStore.Core/LogV2/LogV2EventTypeIndex.cs b/src/EventStore.Core/LogV2/LogV2EventTypeIndex.cs
deleted file mode 100644
index 0ee3a9658aa..00000000000
--- a/src/EventStore.Core/LogV2/LogV2EventTypeIndex.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.LogV2 {
-	public class LogV2EventTypeIndex :
-		INameIndex<string>,
-		INameIndexConfirmer<string>,
-		IValueLookup<string>,
-		INameLookup<string> {
-			
-		public void Dispose() {
-		}
-
-		public void InitializeWithConfirmed(INameLookup<string> source) {
-		}
-
-		public void CancelReservations() {
-		}
-
-		public void Confirm(IList<IPrepareLogRecord<string>> prepares, bool catchingUp, IIndexBackend<string> backend) {
-		}
-		
-		public void Confirm(
-			IList<IPrepareLogRecord<string>> prepares,
-			CommitLogRecord commit,
-			bool catchingUp,
-			IIndexBackend<string> backend) {
-		}
-
-		public bool GetOrReserve(string eventType, out string eventTypeId, out string createdId, out string createdName) {
-			Ensure.NotNull(eventType, "eventType");
-			eventTypeId = eventType;
-			createdId = default;
-			createdName = default;
-
-			return true;
-		}
-
-		public string LookupValue(string eventTypeName) => eventTypeName;
-
-		public bool TryGetName(string eventTypeId, out string name) {
-			name = eventTypeId;
-			return true;
-		}
-
-		public bool TryGetLastValue(out string last) {
-			throw new System.NotImplementedException();
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogV2/LogV2PartitionManager.cs b/src/EventStore.Core/LogV2/LogV2PartitionManager.cs
deleted file mode 100644
index 1496fa3a3c9..00000000000
--- a/src/EventStore.Core/LogV2/LogV2PartitionManager.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using EventStore.Core.LogAbstraction;
-
-namespace EventStore.Core.LogV2 {
-	public class LogV2PartitionManager : IPartitionManager {
-
-		public Guid? RootId => Guid.Empty;
-		public Guid? RootTypeId => Guid.Empty;
-
-		public void Initialize(){}
-	}
-}
diff --git a/src/EventStore.Core/LogV2/LogV2RecordFactory.cs b/src/EventStore.Core/LogV2/LogV2RecordFactory.cs
deleted file mode 100644
index 3a51400ff72..00000000000
--- a/src/EventStore.Core/LogV2/LogV2RecordFactory.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.LogV2 {
-	public class LogV2RecordFactory : IRecordFactory<string> {
-		public LogV2RecordFactory() {
-		}
-
-		public bool ExplicitStreamCreation => false;
-		public bool ExplicitEventTypeCreation => false;
-
-		public IPrepareLogRecord<string> CreateStreamRecord(
-			Guid streamId,
-			long logPosition,
-			DateTime timeStamp,
-			string streamNumber,
-			string streamName) =>
-			throw new NotSupportedException();
-
-		public IPrepareLogRecord<string> CreateEventTypeRecord(
-			Guid eventTypeId,
-			Guid parentEventTypeId,
-			string eventType,
-			string referenceNumber,
-			ushort version,
-			long logPosition,
-			DateTime timeStamp) =>
-			throw new NotSupportedException();
-
-		public ISystemLogRecord CreateEpoch(EpochRecord epoch) {
-			var result = new SystemLogRecord(
-				logPosition: epoch.EpochPosition,
-				timeStamp: epoch.TimeStamp,
-				systemRecordType: SystemRecordType.Epoch,
-				systemRecordSerialization: SystemRecordSerialization.Json,
-				data: epoch.AsSerialized());
-			return result;
-		}
-
-		public IPrepareLogRecord<string> CreatePrepare(
-			long logPosition,
-			Guid correlationId,
-			Guid eventId,
-			long transactionPosition,
-			int transactionOffset,
-			string eventStreamId,
-			long expectedVersion,
-			DateTime timeStamp,
-			PrepareFlags flags,
-			string eventType,
-			ReadOnlyMemory<byte> data,
-			ReadOnlyMemory<byte> metadata) {
-
-			var result = new PrepareLogRecord(
-				logPosition: logPosition,
-				correlationId: correlationId,
-				eventId: eventId,
-				transactionPosition: transactionPosition,
-				transactionOffset: transactionOffset,
-				eventStreamId: eventStreamId,
-				eventStreamIdSize: null,
-				expectedVersion: expectedVersion,
-				timeStamp: timeStamp,
-				flags: flags,
-				eventType: eventType,
-				eventTypeSize: null,
-				data: data,
-				metadata: metadata);
-			return result;
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogV2/LogV2Sizer.cs b/src/EventStore.Core/LogV2/LogV2Sizer.cs
deleted file mode 100644
index daf308a75e2..00000000000
--- a/src/EventStore.Core/LogV2/LogV2Sizer.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using EventStore.Core.Caching;
-using EventStore.Core.LogAbstraction;
-
-namespace EventStore.Core.LogV2 {
-	public class LogV2Sizer : ISizer<string> {
-		public int GetSizeInBytes(string t) => MemSizer.SizeOf(t);
-	}
-}
diff --git a/src/EventStore.Core/LogV2/LogV2StreamExistenceFilterInitializer.cs b/src/EventStore.Core/LogV2/LogV2StreamExistenceFilterInitializer.cs
deleted file mode 100644
index 4c724f77e9e..00000000000
--- a/src/EventStore.Core/LogV2/LogV2StreamExistenceFilterInitializer.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Exceptions;
-using EventStore.Core.Index;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-using Serilog;
-
-namespace EventStore.Core.LogV2 {
-	/// <summary>
-	/// Stream existence filter initializer for Log V2
-	/// Reads the index and transaction log to populate the stream existence filter from the last checkpoint.
-	/// May add a stream hash more than once.
-	/// </summary>
-	/// In V2 the the bloom filter checkpoint is the post-position of the last processed
-	/// log record. Sometimes we only have the pre-position, but this is also the post-position
-	/// of the previous record, which is fine. the net effect is an extra record is initialized
-	/// on startup next time.
-	public class LogV2StreamExistenceFilterInitializer : INameExistenceFilterInitializer {
-		private readonly Func<TFReaderLease> _tfReaderFactory;
-		private readonly ITableIndex _tableIndex;
-
-		protected static readonly ILogger Log = Serilog.Log.ForContext<LogV2StreamExistenceFilterInitializer>();
-
-		public LogV2StreamExistenceFilterInitializer(
-			Func<TFReaderLease> tfReaderFactory,
-			ITableIndex tableIndex) {
-
-			Ensure.NotNull(tableIndex, nameof(tableIndex));
-
-			_tfReaderFactory = tfReaderFactory;
-			_tableIndex = tableIndex;
-		}
-
-		public void Initialize(INameExistenceFilter filter, long truncateToPosition) {
-			if (truncateToPosition < filter.CurrentCheckpoint) {
-				filter.TruncateTo(checkpoint: truncateToPosition);
-			}
-
-			InitializeFromIndex(filter);
-			InitializeFromLog(filter);
-		}
-
-		private void InitializeFromIndex(INameExistenceFilter filter) {
-			if (filter.CurrentCheckpoint != -1L) {
-				// can only use the index to build from scratch. if we have a checkpoint
-				// we need to build from the log in order to make use of it.
-				return;
-			}
-
-			Log.Information("Initializing from index");
-
-			// we have no checkpoint, build from the index. unfortunately there isn't
-			// a simple way to checkpoint in the middle of the index.
-			// keep track of the max position we see and use that as the checkpoint
-			// but only if we complete.
-			var checkpoint = -1L;
-			var enumerators = GetEnumerators();
-			var recordsTotal = enumerators.Sum(pair => pair.Count);
-			var recordsProcessed = 0L;
-			ulong? previousHash = null;
-			for (var t = 0; t < enumerators.Count; t++) {
-				var pair = enumerators[t];
-				var enumerator = pair.Enumerator;
-				do {
-					// enumerators are already advanced to first item
-					var entry = enumerator.Current;
-					checkpoint = Math.Max(checkpoint, entry.Position);
-					if (entry.Stream == previousHash)
-						continue;
-
-					// add regardless of version because event 0 may be scavenged
-					filter.Add(entry.Stream);
-					previousHash = entry.Stream;
-				} while (enumerator.MoveNext());
-				enumerator.Dispose();
-
-				recordsProcessed += pair.Count;
-				var percent = (double)recordsProcessed / recordsTotal * 100;
-				Log.Information("Stream Existence Filter initialization processed {tablesProcessed}/{tablesTotal} tables. {recordsProcessed:N0}/{recordsTotal:N0} log records ({percent:N2}%)",
-					t + 1, enumerators.Count, recordsProcessed, recordsTotal, percent);
-			}
-
-			// checkpoint at the end of the index.
-			filter.CurrentCheckpoint = checkpoint;
-		}
-
-		private List<(IEnumerator<IndexEntry> Enumerator, long Count)> GetEnumerators() {
-			var attempt = 0;
-			while (attempt < 5) {
-				attempt++;
-				var enumerators = new List<(IEnumerator<IndexEntry> Enumerator, long Count)>();
-				try {
-					var tables = _tableIndex.IterateAllInOrder();
-					foreach (var table in tables) {
-						Log.Information("Found table {id}. Type: {type}. Count: {count:N0}. Version: {version}",
-							table.Id, table.GetType(), table.Count, table.Version);
-
-						if (table.Version == PTableVersions.IndexV1)
-							throw new NotSupportedException("The Stream Existence Filter is not supported with V1 index files. Please disable the filter by setting StreamExistenceFilterSize to 0, or rebuild the indexes.");
-
-						var enumerator = table.IterateAllInOrder().GetEnumerator();
-
-						// advance into the enumerator so that we obtain a workitem in each table
-						// so that the ptables will definitely not be deleted until we are done.
-						if (enumerator.MoveNext()) {
-							// got workitem!
-							enumerators.Add((enumerator, table.Count));
-						} else {
-							enumerator.Dispose();
-						}
-					}
-					return enumerators;
-				} catch (NotSupportedException) {
-					foreach (var pair in enumerators)
-						pair.Enumerator.Dispose();
-					throw;
-				} catch (FileBeingDeletedException) {
-					foreach (var pair in enumerators)
-						pair.Enumerator.Dispose();
-					Log.Debug("PTable is being deleted.");
-				}
-			}
-
-			throw new InvalidOperationException("Failed to get enumerators for the index.");
-		}
-
-		private void InitializeFromLog(INameExistenceFilter filter) {
-			// if we have a checkpoint, start from that position in the log. this will work
-			// whether the checkpoint is the pre or post position of the last processed record.
-			var startPosition = filter.CurrentCheckpoint == -1 ? 0 : filter.CurrentCheckpoint;
-			Log.Information("Initializing from log starting at {startPosition:N0}", startPosition);
-			using var reader = _tfReaderFactory();
-			reader.Reposition(startPosition);
-
-			while (TryReadNextLogRecord(reader, out var result)) {
-				switch (result.LogRecord.RecordType) {
-					case LogRecordType.Prepare:
-						// add regardless of expectedVersion because event 0 may be scavenged
-						// add regardless of committed or not because waiting for the commit is expensive
-						var prepare = (IPrepareLogRecord<string>)result.LogRecord;
-						filter.Add(prepare.EventStreamId);
-						filter.CurrentCheckpoint = result.RecordPostPosition;
-						break;
-					// no need to handle commits here, see comments in the prepare handling.
-				}
-			}
-		}
-
-		private static bool TryReadNextLogRecord(TFReaderLease reader, out SeqReadResult result) {
-			result = reader.TryReadNext();
-			return result.Success;
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogV2/LogV2StreamIdConverter.cs b/src/EventStore.Core/LogV2/LogV2StreamIdConverter.cs
deleted file mode 100644
index 7fe393bf456..00000000000
--- a/src/EventStore.Core/LogV2/LogV2StreamIdConverter.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Text;
-using EventStore.Core.LogAbstraction;
-
-namespace EventStore.Core.LogV2 {
-	public class LogV2StreamIdConverter : IStreamIdConverter<string> {
-		public string ToStreamId(ReadOnlySpan<byte> bytes) {
-			unsafe {
-				fixed (byte* b = bytes) {
-					return Encoding.UTF8.GetString(b, bytes.Length);
-				}
-			}
-		}
-
-		public string ToStreamId(ReadOnlyMemory<byte> bytes) =>
-			ToStreamId(bytes.Span);
-	}
-}
diff --git a/src/EventStore.Core/LogV2/LogV2StreamIdValidator.cs b/src/EventStore.Core/LogV2/LogV2StreamIdValidator.cs
deleted file mode 100644
index 05bc48a2ba8..00000000000
--- a/src/EventStore.Core/LogV2/LogV2StreamIdValidator.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.LogV2 {
-	public class LogV2StreamIdValidator : IValidator<string> {
-		public LogV2StreamIdValidator() {
-		}
-
-		public void Validate(string streamId) {
-			Ensure.NotNullOrEmpty(streamId, "streamId");
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogV2/LogV2StreamNameIndex.cs b/src/EventStore.Core/LogV2/LogV2StreamNameIndex.cs
deleted file mode 100644
index aa0fbe4fbc7..00000000000
--- a/src/EventStore.Core/LogV2/LogV2StreamNameIndex.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.LogV2 {
-	public class LogV2StreamNameIndex :
-		INameIndex<string>,
-		INameIndexConfirmer<string>,
-		IValueLookup<string>,
-		INameLookup<string> {
-
-		private readonly INameExistenceFilter _existenceFilter;
-
-		public LogV2StreamNameIndex(INameExistenceFilter existenceFilter) {
-			_existenceFilter = existenceFilter;
-		}
-
-		public void Dispose() {
-		}
-
-		public void InitializeWithConfirmed(INameLookup<string> source) {
-		}
-
-		public void CancelReservations() {
-		}
-
-		public void Confirm(IList<IPrepareLogRecord<string>> prepares, bool catchingUp, IIndexBackend<string> backend) {
-			if (catchingUp) {
-				// after the main index is caught up we will initialize the stream existence filter
-				return;
-			}
-
-			if (prepares.Count == 0)
-				return;
-
-			var lastPrepare = prepares[prepares.Count - 1];
-
-			if (prepares[0].ExpectedVersion == ExpectedVersion.NoStream) {
-				_existenceFilter.Add(lastPrepare.EventStreamId);
-			}
-
-			_existenceFilter.CurrentCheckpoint = lastPrepare.LogPosition;
-		}
-
-		// must use the commit to see if these are the first events in the stream
-		// and for checkpointing.
-		public void Confirm(
-			IList<IPrepareLogRecord<string>> prepares,
-			CommitLogRecord commit,
-			bool catchingUp,
-			IIndexBackend<string> backend) {
-
-			if (catchingUp) {
-				// after the main index is caught up we will initialize the stream existence filter
-				return;
-			}
-
-			if (prepares.Count != 0 && commit.FirstEventNumber == 0) {
-				var lastPrepare = prepares[prepares.Count - 1];
-				_existenceFilter.Add(lastPrepare.EventStreamId);
-			}
-
-			_existenceFilter.CurrentCheckpoint = commit.LogPosition;
-		}
-
-		public bool GetOrReserve(string streamName, out string streamId, out string createdId, out string createdName) {
-			Ensure.NotNullOrEmpty(streamName, "streamName");
-			streamId = streamName;
-			createdId = default;
-			createdName = default;
-
-			// not adding the stream to the filter here, but this is safe because returning
-			// true indicates that the stream might exist and no shortcut may be taken.
-			return true;
-		}
-
-		public string LookupValue(string streamName) => streamName;
-
-		public bool TryGetName(string value, out string name) {
-			name = value;
-			return true;
-		}
-
-		public bool TryGetLastValue(out string last) {
-			throw new System.NotImplementedException();
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogV2/LogV2SystemStreams.cs b/src/EventStore.Core/LogV2/LogV2SystemStreams.cs
deleted file mode 100644
index 84f537e4956..00000000000
--- a/src/EventStore.Core/LogV2/LogV2SystemStreams.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Services;
-
-namespace EventStore.Core.LogV2 {
-	public class LogV2SystemStreams : ISystemStreamLookup<string> {
-		public LogV2SystemStreams() {
-		}
-
-		public string AllStream { get; } = SystemStreams.AllStream;
-		public string SettingsStream { get; } = SystemStreams.SettingsStream;
-
-		public bool IsMetaStream(string streamId) => SystemStreams.IsMetastream(streamId);
-		public bool IsSystemStream(string streamId) => SystemStreams.IsSystemStream(streamId);
-		public string MetaStreamOf(string streamId) => SystemStreams.MetastreamOf(streamId);
-		public string OriginalStreamOf(string streamId) => SystemStreams.OriginalStreamOf(streamId);
-	}
-}
diff --git a/src/EventStore.Core/LogV3/EventTypeIdConverter.cs b/src/EventStore.Core/LogV3/EventTypeIdConverter.cs
deleted file mode 100644
index 16fe620c7ab..00000000000
--- a/src/EventStore.Core/LogV3/EventTypeIdConverter.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace EventStore.Core.LogV3 {
-	/// Converts between EventTypeIds and their event number in the event types stream.
-	public static class EventTypeIdConverter {
-		static readonly uint _offset = LogV3SystemEventTypes.FirstRealEventTypeNumber;
-
-		public static uint ToEventTypeId(long index) {
-			return (uint)index + _offset;
-		}
-
-		public static long ToEventNumber(uint eventTypeId) {
-			return eventTypeId - _offset;
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogV3/EventTypeIdToNameFromStandardIndex.cs b/src/EventStore.Core/LogV3/EventTypeIdToNameFromStandardIndex.cs
deleted file mode 100644
index 7aa509e043d..00000000000
--- a/src/EventStore.Core/LogV3/EventTypeIdToNameFromStandardIndex.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.LogV3 {
-	public class EventTypeIdToNameFromStandardIndex : INameLookup<uint> {
-		private readonly IIndexReader<uint> _indexReader;
-
-		public EventTypeIdToNameFromStandardIndex(IIndexReader<uint> indexReader) {
-			_indexReader = indexReader;
-		}
-
-		public bool TryGetName(uint eventTypeId, out string name) {
-			var record = _indexReader.ReadPrepare(
-				streamId: LogV3SystemStreams.EventTypesStreamNumber,
-				eventNumber: EventTypeIdConverter.ToEventNumber(eventTypeId));
-
-			if (record is null) {
-				name = null;
-				return false;
-			}
-
-			if (record is not LogV3EventTypeRecord eventTypeRecord)
-				throw new Exception($"Unexpected log record type: {record}.");
-
-			name = eventTypeRecord.EventTypeName;
-			return true;
-		}
-
-		public bool TryGetLastValue(out uint lastValue) {
-			var lastEventNumber = _indexReader.GetStreamLastEventNumber(LogV3SystemStreams.EventTypesStreamNumber);
-			var success = ExpectedVersion.NoStream < lastEventNumber && lastEventNumber != EventNumber.DeletedStream;
-			lastValue = EventTypeIdConverter.ToEventTypeId(lastEventNumber);
-			return success;
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogV3/EventTypeIndexSystemTypesDecorator.cs b/src/EventStore.Core/LogV3/EventTypeIndexSystemTypesDecorator.cs
deleted file mode 100644
index 45b85eafe3a..00000000000
--- a/src/EventStore.Core/LogV3/EventTypeIndexSystemTypesDecorator.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using EventStore.Common.Utils;
-using EventStore.Core.LogAbstraction;
-
-namespace EventStore.Core.LogV3 {
-	public class EventTypeIndexSystemTypesDecorator : INameIndex<uint> {
-		private readonly INameIndex<uint> _wrapped;
-
-		public EventTypeIndexSystemTypesDecorator(INameIndex<uint> wrapped) {
-			_wrapped = wrapped;
-		}
-
-		public void CancelReservations() {
-			_wrapped.CancelReservations();
-		}
-
-		public bool GetOrReserve(string eventType, out uint eventTypeId, out uint createdId, out string createdName) {
-			Ensure.NotNull(eventType, "eventType");
-
-			if (LogV3SystemEventTypes.TryGetSystemEventTypeId(eventType, out eventTypeId)) {
-				createdId = default;
-				createdName = default;
-				return true;
-			}
-
-			return _wrapped.GetOrReserve(eventType, out eventTypeId, out createdId, out createdName);
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogV3/EventTypeLookupSystemTypesDecorator.cs b/src/EventStore.Core/LogV3/EventTypeLookupSystemTypesDecorator.cs
deleted file mode 100644
index 7d308acb957..00000000000
--- a/src/EventStore.Core/LogV3/EventTypeLookupSystemTypesDecorator.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using EventStore.Core.LogAbstraction;
-
-namespace EventStore.Core.LogV3
-{
-	public class EventTypeLookupSystemTypesDecorator : INameLookup<uint> {
-		private readonly INameLookup<uint> _wrapped;
-
-		public EventTypeLookupSystemTypesDecorator(INameLookup<uint> wrapped) {
-			_wrapped = wrapped;
-		}
-
-		public bool TryGetName(uint eventTypeId, out string name) {
-			if (LogV3SystemEventTypes.TryGetVirtualEventType(eventTypeId, out name))
-				return true;
-
-			return _wrapped.TryGetName(eventTypeId, out name);
-		}
-
-		public bool TryGetLastValue(out uint last) {
-			return _wrapped.TryGetLastValue(out last);
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogV3/FASTER/Context.cs b/src/EventStore.Core/LogV3/FASTER/Context.cs
deleted file mode 100644
index bce117ba23a..00000000000
--- a/src/EventStore.Core/LogV3/FASTER/Context.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using FASTER.core;
-
-namespace EventStore.Core.LogV3.FASTER {
-	public class Context<TValue> {
-		public Status Status { get; set; }
-		public TValue Value { get; set; }
-	}
-}
-
diff --git a/src/EventStore.Core/LogV3/FASTER/FASTERNameIndexPersistence.cs b/src/EventStore.Core/LogV3/FASTER/FASTERNameIndexPersistence.cs
deleted file mode 100644
index de54badfb52..00000000000
--- a/src/EventStore.Core/LogV3/FASTER/FASTERNameIndexPersistence.cs
+++ /dev/null
@@ -1,475 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.Unicode;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.DataStructures;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.LogAbstraction.Common;
-using FASTER.core;
-using Serilog;
-using Value = System.UInt32;
-
-namespace EventStore.Core.LogV3.FASTER {
-	public class NameIndexPersistence {
-		protected static readonly ILogger Log = Serilog.Log.ForContext<NameIndexPersistence>();
-	}
-
-	public class FASTERNameIndexPersistence :
-		NameIndexPersistence,
-		INameIndexPersistence<Value> {
-
-		private static readonly Encoding _utf8NoBom = new UTF8Encoding(false, true);
-		private readonly IDevice _log;
-		private readonly FasterKV<SpanByte, Value> _store;
-		private readonly LogSettings _logSettings;
-		private readonly Debouncer _logCheckpointer;
-		private readonly CancellationTokenSource _cancellationTokenSource;
-
-		// used during initialization
-		private readonly ClientSession<SpanByte, Value, Value, Value, Empty, MaintenanceFunctions<Value>> _maintenanceSession;
-
-		// used during initialization and then by the confirmer
-		private readonly ClientSession<SpanByte, Value, Value, Value, Empty, WriterFunctions<Value>> _writerSession;
-
-		// used during initialization and then by various readers (including the storage writer)
-		private readonly ObjectPool<ReaderSession<Value>> _readerSessionPool;
-		private readonly string _indexName;
-		private readonly Value _firstValue;
-		private readonly Value _valueInterval;
-
-		// not expecting any contention for _lastValueAdded but do need the memory barrriers
-		private readonly object _lastValueLock = new();
-		private Value _lastValueAdded;
-
-		private bool _disposed = false;
-
-		public Value LastValueAdded => _lastValueAdded;
-
-		public FASTERNameIndexPersistence(
-			string indexName,
-			string logDir,
-			Value firstValue,
-			Value valueInterval,
-			int initialReaderCount,
-			int maxReaderCount,
-			bool enableReadCache,
-			TimeSpan checkpointInterval) {
-
-			_indexName = indexName;
-			_firstValue = firstValue;
-			_valueInterval = valueInterval;
-
-			_log = Devices.CreateLogDevice(
-				logPath: $"{logDir}/{_indexName}.log",
-				deleteOnClose: false);
-
-			var checkpointSettings = new CheckpointSettings {
-				CheckpointDir = $"{logDir}",
-				RemoveOutdated = true,
-			};
-
-			var readCacheSettings = enableReadCache
-				? new ReadCacheSettings {
-					// todo: dynamic settings according to available memory
-					MemorySizeBits = 15,
-					PageSizeBits = 12,
-					SecondChanceFraction = 0.1
-				}
-				: null;
-
-			_logSettings = new LogSettings {
-				LogDevice = _log,
-				// todo: dynamic settings according to available memory
-				MemorySizeBits = 15,
-				PageSizeBits = 12,
-				//PreallocateLog = true,
-
-				ReadCacheSettings = readCacheSettings,
-			};
-
-			_store = new FasterKV<SpanByte, Value>(
-				// todo: dynamic settings according to available memory
-				// but bear in mind if we have taken an index checkpoint there is a 
-				// procedure to resize it.
-				size: 1L << 20,
-				checkpointSettings: checkpointSettings,
-				logSettings: _logSettings);
-
-			_writerSession = _store
-				.For(new WriterFunctions<Value>())
-				.NewSession<WriterFunctions<Value>>();
-
-			_maintenanceSession = _store
-				.For(new MaintenanceFunctions<Value>())
-				.NewSession<MaintenanceFunctions<Value>>();
-
-			_readerSessionPool = new ObjectPool<ReaderSession<Value>>(
-				objectPoolName: $"{_indexName} readers pool",
-				initialCount: initialReaderCount,
-				maxCount: maxReaderCount,
-				factory: () => new ReaderSession<Value>(
-					_store.For(new ReaderFunctions<Value>()).NewSession<ReaderFunctions<Value>>(),
-					new Context<Value>()),
-				dispose: session => session.Dispose());
-
-			_cancellationTokenSource = new();
-			_logCheckpointer = new Debouncer(
-				checkpointInterval,
-				async token => {
-					try {
-						var success = await CheckpointLogAsync();
-						if (!success)
-							throw new Exception($"not successful");
-
-						Log.Debug("{_indexName} took checkpoint", _indexName);
-					} catch (Exception ex) {
-						Log.Error(ex, "{_indexName} could not take checkpoint", _indexName);
-					}
-				},
-				_cancellationTokenSource.Token);
-
-			Log.Information("{indexName} total memory before recovery {totalMemoryMib:N0} MiB.", _indexName, CalcTotalMemoryMib());
-			Recover();
-			Log.Information("{indexName} total memory after recovery {totalMemoryMib:N0} MiB.", _indexName, CalcTotalMemoryMib());
-		}
-
-		public void Dispose() {
-			if (_disposed)
-				return;
-			_disposed = true;
-			_cancellationTokenSource.Cancel();
-			_maintenanceSession?.Dispose();
-			_writerSession?.Dispose();
-			_readerSessionPool?.Dispose();
-			_store?.Dispose();
-			_log?.Dispose();
-		}
-
-		void Recover() {
-			try {
-				_store.Recover();
-				var (name, value) = ScanBackwards().FirstOrDefault();
-				lock (_lastValueLock) {
-					_lastValueAdded = name == null ? default : value;
-				}
-				Log.Information(
-					"{indexName} has been recovered. " +
-					"Last entry was {name}:{value}",
-					_indexName, name, value);
-			} catch (FasterException ex) {
-				Log.Information($"{_indexName} is starting from scratch: {ex.Message}");
-			}
-		}
-
-		// the source has been initialised. it now contains exactly the data that we want to have in the name index.
-		// there are three cases
-		// 1. we are exactly in sync with the source (do nothing)
-		// 2. we are behind the source (could be by a lot, say we are rebuilding) -> catch up
-		// 3. we are ahead of the source (should only be by a little) -> truncate
-		// after we make it that the indexes only contain replicated records then there
-		// will be no need for the truncation case and we will remove it with the associated
-		// scanning code.
-		public void Init(INameLookup<Value> source) {
-			Log.Information("{indexName} initializing...", _indexName);
-			var iter = ScanBackwards().GetEnumerator();
-
-			if (!iter.MoveNext()) {
-				Log.Information("{indexName} is empty. Catching up from beginning of source.", _indexName);
-				CatchUp(source, previousValue: 0);
-
-			} else if (source.TryGetName(iter.Current.Value, out var sourceName)) {
-				if (sourceName != iter.Current.Name)
-					ThrowNameMismatch(iter.Current.Value, iter.Current.Name, sourceName);
-
-				Log.Information("{indexName} has entry {value}. Catching up from there", _indexName, iter.Current.Value);
-				CatchUp(source, previousValue: iter.Current.Value);
-
-			} else {
-				// we have a most recent entry but it is not in the source.
-				// scan backwards until we find something in common with the source and
-				// truncate everything in between.
-				var keysToTruncate = new List<string>();
-				var keysToTruncateSet = new HashSet<string>();
-				void PopEntry() {
-					var name = iter.Current.Name;
-					var value = iter.Current.Value;
-					if (keysToTruncateSet.Add(name)) {
-						keysToTruncate.Add(iter.Current.Name);
-
-						lock (_lastValueLock) {
-							if (_lastValueAdded != value)
-								throw new Exception($"Trying to remove the last entry added \"{name}\":{value} but the last entry was really {_lastValueAdded}");
-
-							_lastValueAdded = _lastValueAdded > _firstValue
-								? _lastValueAdded - _valueInterval
-								: default;
-						}
-
-						Log.Verbose("{indexName} is going to delete {name}:{value}", _indexName, name, value);
-					}
-				}
-
-				PopEntry();
-
-				bool found = false;
-				lock (_lastValueLock) {
-					while (!found && iter.MoveNext()) {
-						found = source.TryGetName(iter.Current.Value, out sourceName);
-						if (!found) {
-							PopEntry();
-						}
-					}
-				}
-
-				if (found) {
-					source.TryGetLastValue(out var last);
-					if (iter.Current.Value != last)
-						throw new Exception($"{_indexName} this should never happen. expecting source to have values up to {iter.Current.Value} but was {last}");
-					if (iter.Current.Name != sourceName)
-						ThrowNameMismatch(iter.Current.Value, iter.Current.Name, sourceName);
-				} else {
-					if (source.TryGetLastValue(out var last))
-						throw new Exception($"{_indexName} this should never happen. expecting source to have been empty but it wasn't. has values up to {last}");
-				}
-
-				Log.Information("{indexName} is truncating {count} entries", _indexName, keysToTruncate.Count);
-				Truncate(keysToTruncate);
-			}
-
-			CheckpointLogSynchronously();
-
-			lock (_lastValueLock) {
-				Log.Information("{indexName} initialized. Last value is {value}", _indexName, _lastValueAdded);
-			}
-			Log.Information("{indexName} total memory after initialization {totalMemoryMib:N0} MiB.", _indexName, CalcTotalMemoryMib());
-		}
-
-		void ThrowNameMismatch(Value value, string ourName, string sourceName) {
-			throw new Exception(
-				$"{_indexName} this should never happen. name mismatch. " +
-				$"value: {value} name: \"{ourName}\"/\"{sourceName}\"");
-		}
-
-		void ThrowValueMismatch(string name, Value ourValue, Value sourceValue) {
-			throw new Exception(
-				$"{_indexName} this should never happen. value mismatch. " +
-				$"name: \"{name}\" value: {ourValue}/{sourceValue}");
-		}
-
-		void CatchUp(INameLookup<Value> source, Value previousValue) {
-			if (!source.TryGetLastValue(out var sourceLastValue)) {
-				Log.Information("{indexName} source is empty, nothing to catch up", _indexName);
-				return;
-			}
-
-			Log.Information("{indexName} source last value is {sourceLastValue}", _indexName, sourceLastValue);
-
-			var startValue = previousValue == 0
-				? _firstValue
-				: previousValue + _valueInterval;
-
-			var count = 0;
-			for (var sourceValue = startValue; sourceValue <= sourceLastValue; sourceValue += _valueInterval) {
-				count++;
-				if (!source.TryGetName(sourceValue, out var name))
-					throw new Exception($"{_indexName} this should never happen. could not find {sourceValue} in source");
-
-				Add(name, sourceValue);
-			}
-
-			Log.Information("{indexName} caught up {count} entries", _indexName, count);
-		}
-
-		void Truncate(IList<string> names) {
-			for (int i = 0; i < names.Count; i++) {
-				TruncateTail(names[i]);
-			}
-		}
-
-		void TruncateTail(string name) {
-			if (string.IsNullOrEmpty(name))
-				throw new ArgumentNullException(nameof(name));
-
-			// convert the name into a UTF8 span which we can use as a key.
-			Span<byte> keySpan = stackalloc byte[Measure(name)];
-			PopulateKey(name, keySpan);
-
-			var status = _maintenanceSession.Delete(key: SpanByte.FromFixedSpan(keySpan));
-
-			switch (status) {
-				case Status.OK:
-				case Status.NOTFOUND:
-					break;
-
-				case Status.PENDING:
-					_maintenanceSession.CompletePending(wait: true);
-					break;
-
-				case Status.ERROR:
-				default:
-					throw new Exception($"{_indexName} Unexpected status {status} deleting {name}");
-			}
-		}
-
-		/// this will include the same name more than once if it was truncated and then
-		/// subsequently re-added with the same value. de-dup when consuming if necessary.
-		public IEnumerable<(string Name, Value Value)> Scan() => Scan(0, _store.Log.TailAddress);
-
-		public IEnumerable<(string Name, Value Value)> Scan(long beginAddress, long endAddress) {
-			using var iter = _store.Log.Scan(beginAddress, endAddress);
-			while (iter.GetNext(out var recordInfo)) {
-				if (recordInfo.Invalid || recordInfo.Tombstone)
-					continue;
-
-				var name = _utf8NoBom.GetString(iter.GetKey().AsReadOnlySpan());
-				var value = iter.GetValue();
-
-				if (!TryGetValue(name, out var currentValue) || currentValue != value) {
-					// deleted (from a previous truncation), and maybe readded with a different value
-					continue;
-				}
-
-				yield return (name, value);
-			}
-		}
-
-		public IEnumerable<(string Name, Value Value)> ScanBackwards() {
-			// in faster you can begin log scans from records address, but also from
-			// page boundaries. use this to iterate backwards by jumping back
-			// one page at a time.
-			var pageSize = 1 << _logSettings.PageSizeBits;
-			var endAddress = _store.Log.TailAddress;
-			var beginAddress = endAddress / pageSize * pageSize;
-
-			if (beginAddress < 0)
-				beginAddress = 0;
-
-			var detailCount = 0;
-			while (endAddress > 0) {
-				var entries = Scan(beginAddress, endAddress).ToList();
-				for (int i = entries.Count - 1; i >= 0; i--) {
-					yield return entries[i];
-					detailCount++;
-				}
-				endAddress = beginAddress;
-				beginAddress -= pageSize;
-			}
-		}
-
-		public Value LookupValue(string name) {
-			if (string.IsNullOrEmpty(name))
-				throw new ArgumentNullException(nameof(name));
-
-			return TryGetValue(name, out var value) ? value : default;
-		}
-
-		public bool TryGetValue(string name, out Value value) {
-			using var lease = _readerSessionPool.Rent();
-			var session = lease.Reader.ClientSession;
-			var context = lease.Reader.Context;
-
-			// convert the name into a UTF8 span which we can use as a key.
-			Span<byte> key = stackalloc byte[Measure(name)];
-			PopulateKey(name, key);
-
-			var status = session.Read(
-				key: SpanByte.FromFixedSpan(key),
-				output: out value,
-				userContext: context);
-
-			switch (status) {
-				case Status.OK: return true;
-				case Status.NOTFOUND: return false;
-				case Status.PENDING:
-					session.CompletePending(wait: true);
-					switch (context.Status) {
-						case Status.OK:
-							value = context.Value;
-							return true;
-						case Status.NOTFOUND: return false;
-						default: throw new Exception($"{_indexName} Unexpected status {context.Status} completing read for \"{name}\"");
-					}
-				case Status.ERROR:
-				default:
-					throw new Exception($"{_indexName} Unexpected status {status} reading \"{name}\"");
-			}
-		}
-
-		public void Add(string name, Value value) {
-			if (string.IsNullOrEmpty(name))
-				throw new ArgumentNullException(nameof(name));
-
-			lock (_lastValueLock) {
-				var validFirst = _lastValueAdded == default && value == _firstValue;
-				var validNext = value == _lastValueAdded + _valueInterval;
-				if (!validFirst && !validNext)
-					throw new Exception($"{_indexName} attempting to add entry out of order: \"{name}\":{value} when last value added was {_lastValueAdded}");
-			}
-
-			// convert the name into a UTF8 span which we can use as a key in FASTER.
-			Span<byte> key = stackalloc byte[Measure(name)];
-			PopulateKey(name, key);
-
-			var status = _writerSession.Upsert(
-				key: SpanByte.FromFixedSpan(key),
-				desiredValue: value);
-
-			switch (status) {
-				// pending fine too, they will complete later in order, any that dont
-				// complete will catch up on startup
-				case Status.OK:
-				case Status.NOTFOUND:
-				case Status.PENDING:
-					break;
-				case Status.ERROR:
-				default:
-					throw new Exception($"{_indexName} Unexpected status {status} upserting \"{name}\":{value}");
-			}
-
-			lock (_lastValueLock) {
-				_lastValueAdded = value;
-			}
-			_logCheckpointer.Trigger();
-
-			Log.Verbose("{indexName} added new entry: {name}:{value}", _indexName, name, value);
-		}
-
-		void CheckpointLogSynchronously() {
-			// unideal
-			CheckpointLogAsync().GetAwaiter().GetResult();
-		}
-
-		public async Task<bool> CheckpointLogAsync() {
-			LogStats();
-			Log.Debug("{indexName} is checkpointing", _indexName);
-			var (success, _) = await _store.TakeHybridLogCheckpointAsync(CheckpointType.FoldOver);
-			return success;
-		}
-
-		void LogStats() {
-			Log.Debug("{indexName} total memory {totalMemoryMib:N0} MiB.", _indexName, CalcTotalMemoryMib());
-		}
-
-		long CalcTotalMemoryMib() {
-			var indexSizeBytes = _store.IndexSize * 64;
-			var indexOverflowBytes = _store.OverflowBucketCount * 64;
-			var logMemorySizeBytes = _store.Log.MemorySizeBytes;
-			var readCacheMemorySizeBytes = _store.ReadCache?.MemorySizeBytes ?? 0;
-			var totalMemoryBytes = indexSizeBytes + indexOverflowBytes + logMemorySizeBytes + readCacheMemorySizeBytes;
-			var totalMemoryMib = totalMemoryBytes / 1024 / 1024;
-			return totalMemoryMib;
-		}
-
-		static int Measure(string source) {
-			var length = _utf8NoBom.GetByteCount(source);
-			return length;
-		}
-
-		static void PopulateKey(string source, Span<byte> destination) {
-			Utf8.FromUtf16(source, destination, out _, out _, true, true);
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogV3/FASTER/Lease.cs b/src/EventStore.Core/LogV3/FASTER/Lease.cs
deleted file mode 100644
index 031f9add22e..00000000000
--- a/src/EventStore.Core/LogV3/FASTER/Lease.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using EventStore.Core.DataStructures;
-
-namespace EventStore.Core.LogV3.FASTER {
-	public struct Lease<T> : IDisposable {
-		private readonly ObjectPool<T> _pool;
-		public T Reader { get; }
-
-		public Lease(ObjectPool<T> pool) {
-			_pool = pool;
-			Reader = _pool.Get();
-		}
-		public void Dispose() {
-			_pool.Return(Reader);
-		}
-	}
-}
-
diff --git a/src/EventStore.Core/LogV3/FASTER/MaintenanceFunctions.cs b/src/EventStore.Core/LogV3/FASTER/MaintenanceFunctions.cs
deleted file mode 100644
index 0c52cc4c8cd..00000000000
--- a/src/EventStore.Core/LogV3/FASTER/MaintenanceFunctions.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using FASTER.core;
-
-namespace EventStore.Core.LogV3.FASTER {
-	// for deleting and checkpointing
-	public struct MaintenanceFunctions<TValue> : IFunctions<SpanByte, TValue> {
-		public bool SupportsLocking => false;
-
-		public void DeleteCompletionCallback(ref SpanByte key, Empty ctx) {
-		}
-
-		public void CheckpointCompletionCallback(string sessionId, CommitPoint commitPoint) {
-		}
-
-		#region not needed
-		public void ConcurrentReader(ref SpanByte key, ref TValue input, ref TValue value, ref TValue dst) =>
-			throw new NotImplementedException();
-
-		public bool ConcurrentWriter(ref SpanByte key, ref TValue src, ref TValue dst) =>
-			throw new NotImplementedException();
-
-		public void CopyUpdater(ref SpanByte key, ref TValue input, ref TValue oldValue, ref TValue newValue, ref TValue output) =>
-			throw new NotImplementedException();
-
-		public void InitialUpdater(ref SpanByte key, ref TValue input, ref TValue value, ref TValue output) =>
-			throw new NotImplementedException();
-
-		public bool InPlaceUpdater(ref SpanByte key, ref TValue input, ref TValue value, ref TValue output) =>
-			throw new NotImplementedException();
-
-		public void Lock(ref RecordInfo recordInfo, ref SpanByte key, ref TValue value, LockType lockType, ref long lockContext) =>
-			throw new NotImplementedException();
-
-		public void ReadCompletionCallback(ref SpanByte key, ref TValue input, ref TValue output, Empty ctx, Status status) =>
-			throw new NotImplementedException();
-
-		public void RMWCompletionCallback(ref SpanByte key, ref TValue input, ref TValue output, Empty ctx, Status status) =>
-			throw new NotImplementedException();
-
-		public void SingleReader(ref SpanByte key, ref TValue input, ref TValue value, ref TValue dst) =>
-			throw new NotImplementedException();
-
-		public void SingleWriter(ref SpanByte key, ref TValue src, ref TValue dst) =>
-			throw new NotImplementedException();
-
-		public bool Unlock(ref RecordInfo recordInfo, ref SpanByte key, ref TValue value, LockType lockType, long lockContext) =>
-			throw new NotImplementedException();
-
-		public void UpsertCompletionCallback(ref SpanByte key, ref TValue value, Empty ctx) =>
-			throw new NotImplementedException();
-		#endregion
-	}
-}
-
diff --git a/src/EventStore.Core/LogV3/FASTER/ObjectPoolExtensions.cs b/src/EventStore.Core/LogV3/FASTER/ObjectPoolExtensions.cs
deleted file mode 100644
index dbf3c2bf464..00000000000
--- a/src/EventStore.Core/LogV3/FASTER/ObjectPoolExtensions.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using EventStore.Core.DataStructures;
-
-namespace EventStore.Core.LogV3.FASTER {
-	public static class ObjectPoolExtensions {
-		public static Lease<T> Rent<T>(this ObjectPool<T> pool) => new(pool);
-	}
-}
-
diff --git a/src/EventStore.Core/LogV3/FASTER/ReaderFunctions.cs b/src/EventStore.Core/LogV3/FASTER/ReaderFunctions.cs
deleted file mode 100644
index 2794afcbfad..00000000000
--- a/src/EventStore.Core/LogV3/FASTER/ReaderFunctions.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using FASTER.core;
-
-namespace EventStore.Core.LogV3.FASTER {
-	public struct ReaderFunctions<TValue> : IFunctions<SpanByte, TValue, Context<TValue>> {
-
-		public bool SupportsLocking => false;
-
-		public void ConcurrentReader(ref SpanByte key, ref TValue input, ref TValue value, ref TValue dst) {
-			dst = value;
-		}
-
-		public void SingleReader(ref SpanByte key, ref TValue input, ref TValue value, ref TValue dst) {
-			dst = value;
-		}
-
-		public void ReadCompletionCallback(ref SpanByte key, ref TValue input, ref TValue output, Context<TValue> context, Status status) {
-			context.Status = status;
-			context.Value = output;
-		}
-
-		public void CheckpointCompletionCallback(string sessionId, CommitPoint commitPoint) {
-		}
-
-		// the reader writes to the read-cache
-		public void SingleWriter(ref SpanByte key, ref TValue src, ref TValue dst) {
-			dst = src;
-		}
-
-		// the reader writes to the read-cache
-		public bool ConcurrentWriter(ref SpanByte key, ref TValue src, ref TValue dst) {
-			dst = src;
-			return true;
-		}
-
-		#region not needed
-		public void CopyUpdater(ref SpanByte key, ref TValue input, ref TValue oldValue, ref TValue newValue, ref TValue output) =>
-			throw new NotImplementedException();
-
-		public void InitialUpdater(ref SpanByte key, ref TValue input, ref TValue value, ref TValue output) =>
-			throw new NotImplementedException();
-
-		public bool InPlaceUpdater(ref SpanByte key, ref TValue input, ref TValue value, ref TValue output) =>
-			throw new NotImplementedException();
-
-		public void RMWCompletionCallback(ref SpanByte key, ref TValue input, ref TValue output, Context<TValue> ctx, Status status) =>
-			throw new NotImplementedException();
-
-		public void DeleteCompletionCallback(ref SpanByte key, Context<TValue> context) =>
-			throw new NotImplementedException();
-
-		public void UpsertCompletionCallback(ref SpanByte key, ref TValue value, Context<TValue> context) =>
-			throw new NotImplementedException();
-
-		public void Lock(ref RecordInfo recordInfo, ref SpanByte key, ref TValue value, LockType lockType, ref long lockContext) =>
-			throw new NotImplementedException();
-
-		public bool Unlock(ref RecordInfo recordInfo, ref SpanByte key, ref TValue value, LockType lockType, long lockContext) =>
-			throw new NotImplementedException();
-		#endregion
-	}
-}
-
diff --git a/src/EventStore.Core/LogV3/FASTER/ReaderSession.cs b/src/EventStore.Core/LogV3/FASTER/ReaderSession.cs
deleted file mode 100644
index aea29dcf037..00000000000
--- a/src/EventStore.Core/LogV3/FASTER/ReaderSession.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using FASTER.core;
-
-namespace EventStore.Core.LogV3.FASTER {
-	internal class ReaderSession<TValue> : IDisposable {
-		public ReaderSession(
-			ClientSession<SpanByte, TValue, TValue, TValue, Context<TValue>, ReaderFunctions<TValue>> clientSession,
-			Context<TValue> context) {
-			ClientSession = clientSession;
-			Context = context;
-		}
-
-		public ClientSession<SpanByte, TValue, TValue, TValue, Context<TValue>, ReaderFunctions<TValue>> ClientSession { get; }
-		public Context<TValue> Context { get; }
-
-		public void Dispose() {
-			ClientSession?.Dispose();
-		}
-	}
-}
-
diff --git a/src/EventStore.Core/LogV3/FASTER/WriterFunctions.cs b/src/EventStore.Core/LogV3/FASTER/WriterFunctions.cs
deleted file mode 100644
index 0ffcbf18eb9..00000000000
--- a/src/EventStore.Core/LogV3/FASTER/WriterFunctions.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System;
-using FASTER.core;
-
-namespace EventStore.Core.LogV3.FASTER {
-	public struct WriterFunctions<TValue> : IFunctions<SpanByte, TValue> {
-		public bool SupportsLocking => false;
-
-		public void SingleWriter(ref SpanByte key, ref TValue src, ref TValue dst) {
-			dst = src;
-		}
-
-		public bool ConcurrentWriter(ref SpanByte key, ref TValue src, ref TValue dst) {
-			dst = src;
-			return true;
-		}
-
-		public void UpsertCompletionCallback(ref SpanByte key, ref TValue value, Empty context) {
-		}
-
-		public void CheckpointCompletionCallback(string sessionId, CommitPoint commitPoint) {
-			if (commitPoint.ExcludedSerialNos.Count != 0)
-				throw new Exception($"{commitPoint.ExcludedSerialNos.Count} writes unexpectedly excluded from checkpoint");
-		}
-
-		#region not needed
-		public void SingleReader(ref SpanByte key, ref TValue input, ref TValue value, ref TValue dst) =>
-			throw new NotImplementedException();
-
-		public void ConcurrentReader(ref SpanByte key, ref TValue input, ref TValue value, ref TValue dst) =>
-			throw new NotImplementedException();
-
-		public void ReadCompletionCallback(ref SpanByte key, ref TValue input, ref TValue output, Empty context, Status status) =>
-			throw new NotImplementedException();
-
-		public void CopyUpdater(ref SpanByte key, ref TValue input, ref TValue oldValue, ref TValue newValue, ref TValue output) =>
-			throw new NotImplementedException();
-
-		public void InitialUpdater(ref SpanByte key, ref TValue input, ref TValue value, ref TValue output) =>
-			throw new NotImplementedException();
-
-		public bool InPlaceUpdater(ref SpanByte key, ref TValue input, ref TValue value, ref TValue output) =>
-			throw new NotImplementedException();
-
-		public void RMWCompletionCallback(ref SpanByte key, ref TValue input, ref TValue output, Empty ctx, Status status) =>
-			throw new NotImplementedException();
-
-		public void DeleteCompletionCallback(ref SpanByte key, Empty context) =>
-			throw new NotImplementedException();
-
-		public void Lock(ref RecordInfo recordInfo, ref SpanByte key, ref TValue value, LockType lockType, ref long lockContext) =>
-			throw new NotImplementedException();
-
-		public bool Unlock(ref RecordInfo recordInfo, ref SpanByte key, ref TValue value, LockType lockType, long lockContext) =>
-			throw new NotImplementedException();
-		#endregion
-	}
-}
-
diff --git a/src/EventStore.Core/LogV3/LogV3Metastreams.cs b/src/EventStore.Core/LogV3/LogV3Metastreams.cs
deleted file mode 100644
index 17b6c46e47a..00000000000
--- a/src/EventStore.Core/LogV3/LogV3Metastreams.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using EventStore.Core.LogAbstraction;
-using StreamId = System.UInt32;
-
-namespace EventStore.Core.LogV3 {
-	public class LogV3Metastreams : IMetastreamLookup<StreamId> {
-		public bool IsMetaStream(StreamId streamId) =>
-			streamId % 2 == 1;
-
-		// in v2 this prepends "$$"
-		public StreamId MetaStreamOf(StreamId streamId) {
-			if (IsMetaStream(streamId))
-				throw new ArgumentException($"{streamId} is already a metastream", nameof(streamId));
-			return streamId + 1;
-		}
-
-		// in v2 this drops the first two characters, 
-		public StreamId OriginalStreamOf(StreamId streamId) {
-			if (!IsMetaStream(streamId))
-				throw new ArgumentException($"{streamId} is not a metastream", nameof(streamId));
-			return streamId - 1;
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogV3/LogV3RecordFactory.cs b/src/EventStore.Core/LogV3/LogV3RecordFactory.cs
deleted file mode 100644
index 4808e3bb7f1..00000000000
--- a/src/EventStore.Core/LogV3/LogV3RecordFactory.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-using System;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogV3;
-using StreamId = System.UInt32;
-
-namespace EventStore.Core.LogV3 {
-	public class LogV3RecordFactory : IRecordFactory<StreamId> {
-		private Guid _rootPartitionId;
-
-		public LogV3RecordFactory() {
-			if (!BitConverter.IsLittleEndian) {
-				// to support big endian we would need to adjust some of the bit
-				// operations in the raw v3 structs, and adjust the way that the
-				// v3 records are written/read from disk (currently blitted)
-				throw new NotSupportedException();
-			}
-		}
-
-		public bool ExplicitStreamCreation => true;
-		public bool ExplicitEventTypeCreation => true;
-
-		public IPrepareLogRecord<StreamId> CreateStreamRecord(
-			Guid streamId,
-			long logPosition,
-			DateTime timeStamp,
-			StreamId streamNumber,
-			string streamName) {
-
-			var result = new LogV3StreamRecord(
-				streamId: streamId,
-				logPosition: logPosition,
-				timeStamp: timeStamp,
-				streamNumber: streamNumber,
-				streamName: streamName,
-				partitionId: _rootPartitionId);
-
-			return result;
-		}
-
-		public IPrepareLogRecord<StreamId> CreateEventTypeRecord(
-			Guid eventTypeId,
-			Guid parentEventTypeId,
-			string eventType,
-			uint eventTypeNumber,
-			ushort eventTypeVersion,
-			long logPosition,
-			DateTime timeStamp) {
-
-			var result = new LogV3EventTypeRecord(
-				eventTypeId: eventTypeId,
-				parentEventTypeId: parentEventTypeId,
-				eventType: eventType,
-				eventTypeNumber: eventTypeNumber,
-				eventTypeVersion: eventTypeVersion,
-				logPosition: logPosition,
-				timeStamp: timeStamp,
-				partitionId: _rootPartitionId);
-
-			return result;
-		}
-
-		public ISystemLogRecord CreateEpoch(EpochRecord epoch) {
-			var result = new LogV3EpochLogRecord(
-				logPosition: epoch.EpochPosition,
-				timeStamp: epoch.TimeStamp,
-				epochNumber: epoch.EpochNumber,
-				epochId: epoch.EpochId,
-				prevEpochPosition: epoch.PrevEpochPosition,
-				leaderInstanceId: epoch.LeaderInstanceId);
-			return result;
-		}
-
-		public IPrepareLogRecord<StreamId> CreatePrepare(
-			long logPosition,
-			Guid correlationId,
-			Guid eventId,
-			long transactionPosition,
-			int transactionOffset,
-			StreamId eventStreamId,
-			long expectedVersion,
-			DateTime timeStamp,
-			PrepareFlags flags,
-			StreamId eventType,
-			ReadOnlyMemory<byte> data,
-			ReadOnlyMemory<byte> metadata) {
-
-			var result = new LogV3StreamWriteRecord(
-				logPosition: logPosition,
-				transactionPosition: transactionPosition,
-				transactionOffset: transactionOffset,
-				correlationId: correlationId,
-				eventId: eventId,
-				eventStreamId: eventStreamId,
-				expectedVersion: expectedVersion,
-				timeStamp: timeStamp,
-				flags: flags,
-				eventType: eventType,
-				data: data.Span,
-				metadata: metadata.Span);
-			return result;
-		}
-
-		public ILogRecord CreatePartitionTypeRecord(
-			DateTime timeStamp,
-			long logPosition,
-			Guid partitionTypeId,
-			Guid partitionId,
-			string name) {
-			
-			return new PartitionTypeLogRecord(
-				timeStamp: timeStamp,
-				logPosition: logPosition,
-				partitionTypeId: partitionTypeId,
-				partitionId: partitionId,
-				name: name
-			);
-		}
-
-		public ILogRecord CreatePartitionRecord(
-			DateTime timeStamp,
-			long logPosition,
-			Guid partitionId,
-			Guid partitionTypeId,
-			Guid parentPartitionId,
-			Raw.PartitionFlags flags,
-			ushort referenceNumber,
-			string name) {
-			
-			return new PartitionLogRecord(
-				timeStamp: timeStamp,
-				logPosition: logPosition,
-				partitionId: partitionId,
-				partitionTypeId: partitionTypeId,
-				parentPartitionId: parentPartitionId,
-				flags: flags,
-				referenceNumber: referenceNumber,
-				name: name
-			);
-		}
-
-		public void SetRootPartitionId(Guid id) {
-			_rootPartitionId = id;
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogV3/LogV3Sizer.cs b/src/EventStore.Core/LogV3/LogV3Sizer.cs
deleted file mode 100644
index 43887d2fc2a..00000000000
--- a/src/EventStore.Core/LogV3/LogV3Sizer.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using EventStore.Core.LogAbstraction;
-using StreamId = System.UInt32;
-
-namespace EventStore.Core.LogV3 {
-	public class LogV3Sizer : ISizer<StreamId> {
-		public int GetSizeInBytes(StreamId t) => sizeof(StreamId);
-	}
-}
diff --git a/src/EventStore.Core/LogV3/LogV3StreamExistenceFilterInitializer.cs b/src/EventStore.Core/LogV3/LogV3StreamExistenceFilterInitializer.cs
deleted file mode 100644
index fa86edf2af2..00000000000
--- a/src/EventStore.Core/LogV3/LogV3StreamExistenceFilterInitializer.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using EventStore.Core.LogAbstraction;
-using StreamId = System.UInt32;
-
-namespace EventStore.Core.LogV3 {
-	/// Populates a stream existence filter by iterating through the names
-	/// In V3 the the bloom filter checkpoint is the last processed stream number.
-	public class LogV3StreamExistenceFilterInitializer : INameExistenceFilterInitializer {
-		private readonly INameLookup<StreamId> _streamNames;
-
-		public LogV3StreamExistenceFilterInitializer(INameLookup<StreamId> streamNames) {
-			_streamNames = streamNames;
-		}
-
-		public void Initialize(INameExistenceFilter filter, long truncateToPosition) {
-			// todo: truncate if necessary. implementation will likely depend on how the indexes come out
-
-			if (!_streamNames.TryGetLastValue(out var sourceLastStreamId))
-				return;
-
-			var startStreamId = (uint)Math.Max(LogV3SystemStreams.FirstRealStream, filter.CurrentCheckpoint);
-			for (var streamId = startStreamId; streamId <= sourceLastStreamId; streamId += LogV3SystemStreams.StreamInterval) {
-				if (!_streamNames.TryGetName(streamId, out var name))
-					throw new Exception($"NameExistenceFilter: this should never happen. could not find {streamId} in source");
-
-				filter.Add(name);
-				filter.CurrentCheckpoint = streamId;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogV3/LogV3StreamIdConverter.cs b/src/EventStore.Core/LogV3/LogV3StreamIdConverter.cs
deleted file mode 100644
index af84b5643b6..00000000000
--- a/src/EventStore.Core/LogV3/LogV3StreamIdConverter.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using EventStore.Core.LogAbstraction;
-using StreamId = System.UInt32;
-
-namespace EventStore.Core.LogV3 {
-	public class LogV3StreamIdConverter : IStreamIdConverter<StreamId> {
-		public uint ToStreamId(System.ReadOnlySpan<byte> bytes) {
-			throw new System.NotImplementedException();
-		}
-
-		public uint ToStreamId(System.ReadOnlyMemory<byte> bytes) {
-			throw new System.NotImplementedException();
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogV3/LogV3StreamIdValidator.cs b/src/EventStore.Core/LogV3/LogV3StreamIdValidator.cs
deleted file mode 100644
index 3c62d6b4406..00000000000
--- a/src/EventStore.Core/LogV3/LogV3StreamIdValidator.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using EventStore.Common.Utils;
-using StreamId = System.UInt32;
-
-namespace EventStore.Core.LogV3 {
-	public class LogV3StreamIdValidator : IValidator<StreamId> {
-		public LogV3StreamIdValidator() {
-		}
-
-		// Corresponding to LogV2StreamIdValidator we just check here that the steamId is
-		// in the right space. The stream does not have to exist.
-		public void Validate(StreamId streamId) {
-			Ensure.Nonnegative(streamId, "streamId");
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogV3/LogV3SystemEventTypes.cs b/src/EventStore.Core/LogV3/LogV3SystemEventTypes.cs
deleted file mode 100644
index e711e5dce15..00000000000
--- a/src/EventStore.Core/LogV3/LogV3SystemEventTypes.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using EventStore.Core.Services;
-using EventTypeId = System.UInt32;
-
-namespace EventStore.Core.LogV3 {
-	public class LogV3SystemEventTypes {
-
-		public const EventTypeId FirstRealEventTypeNumber = 1024;
-		public const EventTypeId EventTypeInterval = 1;
-
-		public const EventTypeId EmptyEventTypeNumber = 0;
-		public const EventTypeId EventTypeDefinedNumber = 1;
-		public const EventTypeId StreamCreatedNumber = 2;
-		public const EventTypeId StreamMetadataNumber = 3;
-		public const EventTypeId StreamDeletedNumber = 4;
-		public const EventTypeId EpochInformationNumber = 5;
-		public const EventTypeId ScavengePointNumber = 6;
-
-		public static bool TryGetSystemEventTypeId(string type, out EventTypeId eventTypeId) {
-			switch (type) {
-				case SystemEventTypes.EmptyEventType:
-					eventTypeId = EmptyEventTypeNumber;
-					return true;
-				case SystemEventTypes.EpochInformation:
-					eventTypeId = EpochInformationNumber;
-					return true;
-				case SystemEventTypes.EventTypeDefined:
-					eventTypeId = EventTypeDefinedNumber;
-					return true;
-				case SystemEventTypes.ScavengePoint:
-					eventTypeId = ScavengePointNumber;
-					return true;
-				case SystemEventTypes.StreamCreated:
-					eventTypeId = StreamCreatedNumber;
-					return true;
-				case SystemEventTypes.StreamMetadata:
-					eventTypeId = StreamMetadataNumber;
-					return true;
-				case SystemEventTypes.StreamDeleted:
-					eventTypeId = StreamDeletedNumber;
-					return true;
-				default:
-					eventTypeId = EmptyEventTypeNumber;
-					return false;
-			}
-		}
-
-		public static bool TryGetVirtualEventType(EventTypeId eventTypeId, out string name) {
-			if (!IsVirtualEventType(eventTypeId)) {
-				name = null;
-				return false;
-			}
-
-			name = eventTypeId switch {
-				EmptyEventTypeNumber => SystemEventTypes.EmptyEventType,
-				EpochInformationNumber => SystemEventTypes.EpochInformation,
-				EventTypeDefinedNumber => SystemEventTypes.EventTypeDefined,
-				ScavengePointNumber => SystemEventTypes.ScavengePoint,
-				StreamCreatedNumber => SystemEventTypes.StreamCreated,
-				StreamMetadataNumber => SystemEventTypes.StreamMetadata,
-				StreamDeletedNumber => SystemEventTypes.StreamDeleted,
-				_ => null,
-			};
-
-			return name != null;
-		}
-
-		private static bool IsVirtualEventType(EventTypeId eventTypeId) => eventTypeId < FirstRealEventTypeNumber;
-	}
-}
diff --git a/src/EventStore.Core/LogV3/LogV3SystemStreams.cs b/src/EventStore.Core/LogV3/LogV3SystemStreams.cs
deleted file mode 100644
index 095159f89ff..00000000000
--- a/src/EventStore.Core/LogV3/LogV3SystemStreams.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Services;
-using StreamId = System.UInt32;
-
-
-namespace EventStore.Core.LogV3 {
-
-	public class LogV3SystemStreams : ISystemStreamLookup<StreamId> {
-		// Virtual streams are streams that exist without requiring a stream record.
-		// Essentially, they are hard coded.
-		// Reserving a thousand. Doubtful we will need many, but just in case.
-		// As an alternative to reserving virtual streams, we could add their stream records as part
-		// of the database bootstrapping. This would be odd for the AllStream
-		// but more appealing for the settings stream.
-		// Reservations are 2 apart to make room for their metastreams.
-		public static StreamId FirstRealStream { get; } = 1024;
-		// difference between each stream record (2 because of metastreams)
-		public static StreamId StreamInterval { get; } = 2;
-
-		// Even streams that dont exist can be normal/meta and user/system
-		// e.g. for default ACLs.
-		public const StreamId NoUserStream = 0;
-		public const StreamId NoUserMetastream = 1;
-		public const StreamId NoSystemStream = 2;
-		public const StreamId NoSystemMetastream = 3;
-
-		public const StreamId FirstVirtualStream = 4;
-
-		// virtual stream so that we can write metadata to $$$all
-		private const StreamId AllStreamNumber = 4;
-
-		// virtual stream so that we can index StreamRecords for looking up stream names
-		public const StreamId StreamsCreatedStreamNumber = 6;
-
-		// virtual stream for storing system settings
-		private const StreamId SettingsStreamNumber = 8;
-		
-		// virtual stream so that we can index EventTypeRecords for looking up event type names
-		public const StreamId EventTypesStreamNumber = 10;
-
-		public const StreamId EpochInformationStreamNumber = 12;
-
-		public const StreamId ScavengePointsStreamNumber = 14;
-
-		public StreamId AllStream => AllStreamNumber;
-		public StreamId SettingsStream => SettingsStreamNumber;
-
-		private readonly IMetastreamLookup<StreamId> _metastreams;
-		private readonly INameLookup<StreamId> _streamNames;
-
-		public LogV3SystemStreams(
-			IMetastreamLookup<StreamId> metastreams,
-			INameLookup<StreamId> streamNames) {
-
-			_metastreams = metastreams;
-			_streamNames = streamNames;
-		}
-
-		public static bool TryGetVirtualStreamName(StreamId streamId, out string name) {
-			if (!IsVirtualStream(streamId)) {
-				name = null;
-				return false;
-			}
-
-			name = streamId switch {
-				AllStreamNumber => SystemStreams.AllStream,
-				EpochInformationStreamNumber => SystemStreams.EpochInformationStream,
-				EventTypesStreamNumber => SystemStreams.EventTypesStream,
-				ScavengePointsStreamNumber => SystemStreams.ScavengePointsStream,
-				SettingsStreamNumber => SystemStreams.SettingsStream,
-				StreamsCreatedStreamNumber => SystemStreams.StreamsCreatedStream,
-				_ => null,
-			};
-
-			return name != null;
-		}
-
-		public static bool TryGetVirtualStreamId(string name, out StreamId streamId) {
-			switch (name) {
-				case SystemStreams.AllStream:
-					streamId = AllStreamNumber;
-					return true;
-				case SystemStreams.EpochInformationStream:
-					streamId = EpochInformationStreamNumber;
-					return true;
-				case SystemStreams.EventTypesStream:
-					streamId = EventTypesStreamNumber;
-					return true;
-				case SystemStreams.ScavengePointsStream:
-					streamId = ScavengePointsStreamNumber;
-					return true;
-				case SystemStreams.StreamsCreatedStream:
-					streamId = StreamsCreatedStreamNumber;
-					return true;
-				case SystemStreams.SettingsStream:
-					streamId = SettingsStreamNumber;
-					return true;
-				default:
-					streamId = 0;
-					return false;
-			}
-		}
-
-		// in v2 this checks if the first character is '$'
-		// system streams can be created dynamically at runtime
-		// e.g. "$persistentsubscription-" + _eventStreamId + "::" + _groupName + "-parked"
-		// so we can either allocate a range of numbers (how many?) for them, or look up the name and see if it begins with $.
-		// for now do the latter because (1) allocating a range of numbers will probably get fiddly
-		// and (2) i expect we will find that at the point we are trying to determine if a stream is a system stream then
-		// we will have already looked up its info in the stream index, so this call will become trivial or unnecessary.
-		public bool IsSystemStream(StreamId streamId) {
-			if (IsVirtualStream(streamId) ||
-				_metastreams.IsMetaStream(streamId) ||
-				streamId == NoSystemStream)
-				return true;
-
-			if (streamId == NoUserStream)
-				return false;
-
-			var streamName = _streamNames.LookupName(streamId);
-			return SystemStreams.IsSystemStream(streamName);
-		}
-
-		private static bool IsVirtualStream(StreamId streamId) =>
-			FirstVirtualStream <= streamId && streamId < FirstRealStream;
-
-		public bool IsMetaStream(StreamId streamId) => _metastreams.IsMetaStream(streamId);
-
-		public StreamId MetaStreamOf(StreamId streamId) => _metastreams.MetaStreamOf(streamId);
-
-		public StreamId OriginalStreamOf(StreamId streamId) => _metastreams.OriginalStreamOf(streamId);
-	}
-}
diff --git a/src/EventStore.Core/LogV3/NameIndex.cs b/src/EventStore.Core/LogV3/NameIndex.cs
deleted file mode 100644
index be526270825..00000000000
--- a/src/EventStore.Core/LogV3/NameIndex.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-using Serilog;
-using Value = System.UInt32;
-
-namespace EventStore.Core.LogV3 {
-	// There are two components injected NameIndex. The existenceFilter and the persistence.
-	//
-	// The NameIndex itself allows for reservation of entries, which generates the numbering and holds them
-	// in memory. This is similar to the purpose of the 'IndexWriter' class.
-	//
-	// To do this it makes use of the existence filter which can quickly tell if a name
-	// might exist or definitely does not exist.
-	//
-	// The entries can then be confirmed, which transfers them to the INameIndexPersistence
-	// object which is allowed to persist them to disk. This is similar to the IndexCommitter class.
-	//
-	// Components wanting only entries that have been confirmed will read from the INameIndexPersistence.
-	public class NameIndex :
-		INameIndex<Value>,
-		INameIndexConfirmer<Value> {
-
-		private static readonly ILogger Log = Serilog.Log.ForContext<NameIndex>();
-		private readonly ConcurrentDictionary<string, Value> _reservations = new();
-		private readonly INameExistenceFilter _existenceFilter;
-		private readonly INameIndexPersistence<Value> _persistence;
-		private readonly IMetastreamLookup<uint> _metastreams;
-		private readonly string _indexName;
-		private readonly Value _firstValue;
-		private readonly Value _valueInterval;
-		private readonly object _nextValueLock = new();
-		private Value _nextValue;
-		private Type _recordTypeToHandle;
-
-		public NameIndex(
-			string indexName,
-			Value firstValue,
-			Value valueInterval,
-			INameExistenceFilter existenceFilter,
-			INameIndexPersistence<Value> persistence,
-			IMetastreamLookup<Value> metastreams,
-			Type recordTypeToHandle) {
-
-			_indexName = indexName;
-			_firstValue = firstValue;
-			_valueInterval = valueInterval;
-			_nextValue = firstValue;
-			_existenceFilter = existenceFilter;
-			_persistence = persistence;
-			_metastreams = metastreams;
-			_recordTypeToHandle = recordTypeToHandle;
-		}
-
-		public void Dispose() {
-			_persistence?.Dispose();
-		}
-
-		public void CancelReservations() {
-			var count = _reservations.Count;
-			_reservations.Clear();
-			var nextValue = CalcNextValue();
-			Log.Information("{indexName} {count} reservations cancelled. Next value is {value}",
-				_indexName, count, nextValue);
-		}
-
-		public void InitializeWithConfirmed(INameLookup<Value> source) {
-			_reservations.Clear();
-			_persistence.Init(source);
-			var nextValue = CalcNextValue();
-			Log.Information("{indexName} initialized. Next value is {value}", _indexName, nextValue);
-		}
-
-		Value CalcNextValue() {
-			lock (_nextValueLock) {
-				_nextValue = _persistence.LastValueAdded == default
-					? _firstValue
-					: _persistence.LastValueAdded + _valueInterval;
-				return _nextValue;
-			}
-		}
-
-		public void Confirm(string name, Value value) {
-			_existenceFilter.Add(name);
-			_existenceFilter.CurrentCheckpoint = value;
-			_persistence.Add(name, value);
-			if (_reservations.TryRemove(name, out var reservedValue)) {
-				if (reservedValue != value) {
-					throw new Exception($"This should never happen. Confirmed value for \"{name}\" was {value} but reserved as {reservedValue}");
-				}
-			} else {
-				// an entry got confirmed that we didn't reserve. this is normal in the follower
-				// and there is nothing to do. however it is currently possible in the leader too
-				// because it only waits for the chaser to catch up and not the index.
-				// in this case we need to maintain _nextValue
-				lock (_nextValueLock) {
-					_nextValue = value + _valueInterval;
-				}
-			}
-		}
-
-		// todo: TC: could be sensible to take this code out of here altogether. that will save this
-		// class from having to know which _recordTypeToHandle, and save the indexcommitter from
-		// having to commit to two indexes (which will both look for what they need). instead the index commiter
-		// (perhaps using another class) can commit the right stuff to the right indexes itself.
-		//
-		// this is stream specific and will need to be generalised for eventtypes
-		// not terribly happy with the 'catchingUp' mechanism here because it couples
-		// the IndexCommitter behaviour to this method. but the intention is to remove
-		// the use of the old indexes for logv3
-		public void Confirm(IList<IPrepareLogRecord<Value>> prepares, bool catchingUp, IIndexBackend<Value> backend) {
-			for (int i = 0; i < prepares.Count; i++) {
-				var prepare = prepares[i];
-				if (prepare.RecordType == LogRecordType.Stream &&
-					prepare is LogV3StreamRecord streamRecord && prepare.GetType() == _recordTypeToHandle) {
-					Confirm(
-						name: streamRecord.StreamName,
-						value: streamRecord.StreamNumber);
-
-					// update the streams stream
-					// initialisation of the stream name index caused an entry to be populated in
-					// the last event number cache, because it read the last event number of the streams stream.
-					// now we need to keep it up to date even on initialisation or it will be wrong
-					backend.SetStreamLastEventNumber(prepare.EventStreamId, prepare.ExpectedVersion + 1);
-
-					if (catchingUp) {
-						// we are catching up, do not set the last event numbers of the stream we just
-						// created because they will not be
-						// updated during the catchup if we do write some events to those streams.
-						// therefore leave the entry blank so it will be (cheaply because in mem) be
-						// populated on miss.
-					}
-					else {
-						// we just created the stream so we know that no events exist in either
-						// the stream itself or its metastream.
-						var createdStreamNumber = streamRecord.StreamNumber;
-						var createdMetaStreamNumber = _metastreams.MetaStreamOf(streamRecord.StreamNumber);
-						backend.SetStreamLastEventNumber(createdStreamNumber, ExpectedVersion.NoStream);
-						backend.SetStreamLastEventNumber(createdMetaStreamNumber, ExpectedVersion.NoStream);
-					}
-				}
-				else if (prepare.RecordType == LogRecordType.EventType &&
-				         prepare is LogV3EventTypeRecord eventTypeRecord && prepare.GetType() == _recordTypeToHandle) {
-					Confirm(
-						name: eventTypeRecord.EventTypeName,
-						value: eventTypeRecord.EventTypeNumber);
-
-					// update the event types stream
-					// initialisation of the event types index caused an entry to be populated in
-					// the last event number cache, because it read the last event number of the event types stream.
-					// now we need to keep it up to date even on initialisation or it will be wrong
-					backend.SetStreamLastEventNumber(prepare.EventStreamId, prepare.ExpectedVersion + 1);
-				}
-			}
-		}
-
-		public void Confirm(
-			IList<IPrepareLogRecord<Value>> prepares,
-			CommitLogRecord commit,
-			bool catchingUp,
-			IIndexBackend<Value> backend) {
-		}
-
-		public bool GetOrReserve(string name, out Value value, out Value addedValue, out string addedName) {
-			if (string.IsNullOrEmpty(name))
-				throw new ArgumentNullException(nameof(name));
-
-			if (_reservations.TryGetValue(name, out value)) {
-				addedValue = default;
-				addedName = default;
-				return true;
-			}
-
-			if (!_existenceFilter.MightContain(name)) {
-				// stream definitely does not exist, we can jump straight to reserving it.
-				Reserve(name, out value, out addedValue, out addedName);
-				return false;
-			}
-
-			if (!_persistence.TryGetValue(name, out value)) {
-				Reserve(name, out value, out addedValue, out addedName);
-				return false;
-			}
-
-			addedValue = default;
-			addedName = default;
-			return true;
-		}
-
-		private void Reserve(string name, out Value value, out Value addedValue, out string addedName) {
-			lock (_nextValueLock) {
-				value = _nextValue;
-				_nextValue += _valueInterval;
-				addedValue = value;
-				addedName = name;
-				_reservations[name] = value;
-				Log.Verbose("{indexName} reserved new entry: {key}:{value}", _indexName, name, value);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogV3/NameIndexInMemoryPersistence.cs b/src/EventStore.Core/LogV3/NameIndexInMemoryPersistence.cs
deleted file mode 100644
index 56d4d711da3..00000000000
--- a/src/EventStore.Core/LogV3/NameIndexInMemoryPersistence.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using EventStore.Core.LogAbstraction;
-using StreamId = System.UInt32;
-
-namespace EventStore.Core.LogV3 {
-	public class NameIndexInMemoryPersistence :
-		INameIndexPersistence<StreamId> {
-
-		readonly ConcurrentDictionary<string, StreamId> _dict = new();
-
-		public StreamId LastValueAdded { get; private set; }
-
-		public NameIndexInMemoryPersistence() {
-		}
-
-		public void Dispose() {
-		}
-
-		public void Init(INameLookup<StreamId> source) {
-		}
-
-		public void Add(string name, StreamId value) {
-			_dict[name] = value;
-			LastValueAdded = value;
-		}
-
-		public bool TryGetValue(string name, out StreamId value) =>
-			_dict.TryGetValue(name, out value);
-
-		public StreamId LookupValue(string name) {
-			if (string.IsNullOrEmpty(name))
-				throw new ArgumentNullException(nameof(name));
-
-			if (!_dict.TryGetValue(name, out var value))
-				return 0;
-
-			return value;
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogV3/PartitionManager.cs b/src/EventStore.Core/LogV3/PartitionManager.cs
deleted file mode 100644
index 19dc7c4488f..00000000000
--- a/src/EventStore.Core/LogV3/PartitionManager.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.LogV3 {
-	public class PartitionManager : IPartitionManager {
-		private static readonly ILogger _log = Serilog.Log.ForContext<PartitionManager>();
-		private readonly ITransactionFileReader _reader;
-		private readonly ITransactionFileWriter _writer;
-		private readonly LogV3RecordFactory _recordFactory;
-
-		private const string RootPartitionName = "Root";
-		private const string RootPartitionTypeName = "Root";
-		
-		public Guid? RootId { get; private set; }
-		public Guid? RootTypeId  { get; private set; }
-
-		public PartitionManager(
-			ITransactionFileReader reader, ITransactionFileWriter writer, LogV3RecordFactory recordFactory) {
-			_reader = reader;
-			_writer = writer;
-			_recordFactory = recordFactory;
-		}
-
-		public void Initialize() {
-			if(RootId.HasValue)
-				return;
-			
-			ReadRootPartition();
-			
-			EnsureRootPartitionIsWritten();
-		}
-
-		private void EnsureRootPartitionIsWritten() {
-			// below code only takes into account offline truncation
-			if (!RootTypeId.HasValue) {
-				RootTypeId = Guid.NewGuid();
-				long pos = _writer.Position;
-				var rootPartitionType = _recordFactory.CreatePartitionTypeRecord(
-					timeStamp: DateTime.UtcNow,
-					logPosition: pos,
-					partitionTypeId: RootTypeId.Value,
-					partitionId: Guid.Empty, 
-					name: RootPartitionTypeName);
-			
-				if (!_writer.Write(rootPartitionType, out pos))
-					throw new Exception($"Failed to write root partition type!");
-
-				_writer.Flush();
-				
-				_log.Debug("Root partition type created, id: {id}", RootTypeId);
-			}
-
-			if (!RootId.HasValue) {
-				RootId = Guid.NewGuid();
-				long pos = _writer.Position;
-				var rootPartition = _recordFactory.CreatePartitionRecord(
-					timeStamp: DateTime.UtcNow,
-					logPosition: pos, 
-					partitionId: RootId.Value, 
-					partitionTypeId: RootTypeId.Value, 
-					parentPartitionId: Guid.Empty, 
-					flags: 0, 
-					referenceNumber: 0, 
-					name: RootPartitionName);
-
-				if (!_writer.Write(rootPartition, out pos))
-					throw new Exception($"Failed to write root partition!");
-
-				_writer.Flush();
-
-				_recordFactory.SetRootPartitionId(RootId.Value);
-			
-				_log.Debug("Root partition created, id: {id}", RootId);
-			}
-		}
-
-		private void ReadRootPartition() {
-			SeqReadResult result;
-			_reader.Reposition(0);
-			while ((result = _reader.TryReadNext()).Success) {
-				var rec = result.LogRecord;
-				switch (rec.RecordType) {
-					case LogRecordType.PartitionType:
-						var r = ((PartitionTypeLogRecord) rec).Record;
-						if (r.StringPayload == RootPartitionTypeName && r.SubHeader.PartitionId == Guid.Empty) {
-							RootTypeId = r.Header.RecordId;
-						
-							_log.Debug("Root partition type read, id: {id}", RootTypeId);
-
-							break;
-						}
-
-						throw new InvalidDataException(
-							"Unexpected partition type encountered while trying to read the root partition type.");
-					
-					case LogRecordType.Partition:
-						var p = ((PartitionLogRecord) rec).Record;
-						if (p.StringPayload == RootPartitionName && p.SubHeader.PartitionTypeId == RootTypeId
-						                                         && p.SubHeader.ParentPartitionId == Guid.Empty) {
-							RootId = p.Header.RecordId;
-							_recordFactory.SetRootPartitionId(RootId.Value);
-						
-							_log.Debug("Root partition read, id: {id}", RootId);
-							
-							return;
-						}
-						
-						throw new InvalidDataException(
-							"Unexpected partition encountered while trying to read the root partition.");
-					
-					case LogRecordType.System:
-						var systemLogRecord = (ISystemLogRecord)result.LogRecord;
-						if (systemLogRecord.SystemRecordType == SystemRecordType.Epoch) {
-							continue;
-						}
-
-						throw new ArgumentOutOfRangeException("SystemRecordType",
-							"Unexpected system record while trying to read the root partition");
-					
-					default:
-						throw new ArgumentOutOfRangeException("RecordType",
-							"Unexpected record while trying to read the root partition");
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogV3/StreamExistenceFilterValidator.cs b/src/EventStore.Core/LogV3/StreamExistenceFilterValidator.cs
deleted file mode 100644
index 4c857093368..00000000000
--- a/src/EventStore.Core/LogV3/StreamExistenceFilterValidator.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Services;
-
-namespace EventStore.Core.LogV3 {
-	public class StreamExistenceFilterValidator : INameExistenceFilter {
-		private readonly INameExistenceFilter _wrapped;
-
-		public StreamExistenceFilterValidator(INameExistenceFilter wrapped) {
-			_wrapped = wrapped;
-		}
-
-		public long CurrentCheckpoint {
-			get => _wrapped.CurrentCheckpoint;
-			set => _wrapped.CurrentCheckpoint = value;
-		}
-
-		public void Initialize(INameExistenceFilterInitializer source, long truncateToPosition) =>
-			_wrapped.Initialize(source, truncateToPosition);
-
-		public void TruncateTo(long checkpoint) =>
-			_wrapped.TruncateTo(checkpoint);
-
-		public void Verify(double corruptionThreshold) => _wrapped.Verify(corruptionThreshold);
-
-		public void Add(string streamName) {
-			ValidateStreamName(streamName);
-			_wrapped.Add(streamName);
-		}
-
-		public void Add(ulong hash) => throw new NotSupportedException();
-
-		public bool MightContain(string streamName) {
-			ValidateStreamName(streamName);
-			return _wrapped.MightContain(streamName);
-		}
-
-		private static void ValidateStreamName(string streamName) {
-			if (string.IsNullOrEmpty(streamName))
-				throw new ArgumentException($"{nameof(streamName)} must not be null or empty", nameof(streamName));
-
-			if (SystemStreams.IsMetastream(streamName))
-				throw new ArgumentException($"{nameof(streamName)} must not be a metastream", nameof(streamName));
-
-			if (LogV3SystemStreams.TryGetVirtualStreamId(streamName, out _))
-				throw new ArgumentException($"{nameof(streamName)} must not be a virtual stream", nameof(streamName));
-		}
-
-		public void Dispose() => _wrapped?.Dispose();
-	}
-}
diff --git a/src/EventStore.Core/LogV3/StreamIdConverter.cs b/src/EventStore.Core/LogV3/StreamIdConverter.cs
deleted file mode 100644
index 218dc5e6356..00000000000
--- a/src/EventStore.Core/LogV3/StreamIdConverter.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using StreamId = System.UInt32;
-
-namespace EventStore.Core.LogV3 {
-	/// Converts between StreamIds and their event number in the streams stream.
-	public static class StreamIdConverter {
-		static readonly StreamId _offset = LogV3SystemStreams.FirstRealStream / LogV3SystemStreams.StreamInterval;
-
-		public static StreamId ToStreamId(long index) {
-			return ((StreamId)index + _offset) * LogV3SystemStreams.StreamInterval;
-		}
-
-		public static long ToEventNumber(StreamId streamId) {
-			if (streamId % LogV3SystemStreams.StreamInterval != 0)
-				throw new ArgumentOutOfRangeException(nameof(streamId), "streamId must be even");
-
-			return streamId / LogV3SystemStreams.StreamInterval - _offset;
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogV3/StreamIdLookupMetastreamDecorator.cs b/src/EventStore.Core/LogV3/StreamIdLookupMetastreamDecorator.cs
deleted file mode 100644
index dea375e6fcd..00000000000
--- a/src/EventStore.Core/LogV3/StreamIdLookupMetastreamDecorator.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Services;
-using StreamId = System.UInt32;
-
-namespace EventStore.Core.LogV3 {
-	// Decorates a StreamIdLookup, intercepting Metastream (and VirtualStream) calls
-	public class StreamIdLookupMetastreamDecorator : IValueLookup<StreamId> {
-		private readonly IValueLookup<StreamId> _wrapped;
-		private readonly IMetastreamLookup<StreamId> _metastreams;
-
-		public StreamIdLookupMetastreamDecorator(
-			IValueLookup<StreamId> wrapped,
-			IMetastreamLookup<StreamId> metastreams) {
-
-			_wrapped = wrapped;
-			_metastreams = metastreams;
-		}
-
-		public StreamId LookupValue(string streamName) {
-			if (string.IsNullOrEmpty(streamName))
-				throw new ArgumentNullException(nameof(streamName));
-
-			StreamId streamId;
-			if (SystemStreams.IsMetastream(streamName)) {
-				streamName = SystemStreams.OriginalStreamOf(streamName);
-				streamId = LookupValue(streamName);
-				return _metastreams.MetaStreamOf(streamId);
-			}
-
-			if (LogV3SystemStreams.TryGetVirtualStreamId(streamName, out streamId))
-				return streamId;
-
-			var result = _wrapped.LookupValue(streamName);
-
-			return result == default
-				? SystemStreams.IsSystemStream(streamName)
-					? LogV3SystemStreams.NoSystemStream
-					: LogV3SystemStreams.NoUserStream
-				: result;
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogV3/StreamIdToNameFromStandardIndex.cs b/src/EventStore.Core/LogV3/StreamIdToNameFromStandardIndex.cs
deleted file mode 100644
index 81ecc525ab6..00000000000
--- a/src/EventStore.Core/LogV3/StreamIdToNameFromStandardIndex.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-using StreamId = System.UInt32;
-
-namespace EventStore.Core.LogV3 {
-	public class StreamIdToNameFromStandardIndex : INameLookup<StreamId> {
-		private readonly IIndexReader<StreamId> _indexReader;
-
-		public StreamIdToNameFromStandardIndex(IIndexReader<StreamId> indexReader) {
-			_indexReader = indexReader;
-		}
-
-		public bool TryGetName(StreamId streamId, out string name) {
-			if (streamId % 2 == 1)
-				throw new ArgumentOutOfRangeException(nameof(streamId), "streamId must be even");
-
-			// we divided by two when calculating the position in the stream, since we dont
-			// explicitly create metastreams.
-			var record = _indexReader.ReadPrepare(
-				streamId: LogV3SystemStreams.StreamsCreatedStreamNumber,
-				eventNumber: StreamIdConverter.ToEventNumber(streamId));
-
-			if (record is null) {
-				name = null;
-				return false;
-			}
-
-			if (record is not LogV3StreamRecord streamRecord)
-				throw new Exception($"Unexpected log record type: {record}.");
-
-			name = streamRecord.StreamName;
-			return true;
-		}
-
-		public bool TryGetLastValue(out StreamId lastValue) {
-			var lastEventNumber = _indexReader.GetStreamLastEventNumber(LogV3SystemStreams.StreamsCreatedStreamNumber);
-			var success = ExpectedVersion.NoStream < lastEventNumber && lastEventNumber != EventNumber.DeletedStream;
-			lastValue = StreamIdConverter.ToStreamId(lastEventNumber);
-			return success;
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogV3/StreamNameIndexMetastreamDecorator.cs b/src/EventStore.Core/LogV3/StreamNameIndexMetastreamDecorator.cs
deleted file mode 100644
index bad5f759886..00000000000
--- a/src/EventStore.Core/LogV3/StreamNameIndexMetastreamDecorator.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using EventStore.Common.Utils;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Services;
-using StreamId = System.UInt32;
-
-namespace EventStore.Core.LogV3 {
-	// Decorates a StreamNameIndex, intercepting Metastream (and VirtualStream) calls
-	public class StreamNameIndexMetastreamDecorator : INameIndex<StreamId> {
-		private readonly INameIndex<StreamId> _wrapped;
-		private readonly IMetastreamLookup<StreamId> _metastreams;
-
-		public StreamNameIndexMetastreamDecorator(
-			INameIndex<StreamId> wrapped,
-			IMetastreamLookup<StreamId> metastreams) {
-
-			_wrapped = wrapped;
-			_metastreams = metastreams;
-		}
-
-		public void CancelReservations() {
-			_wrapped.CancelReservations();
-		}
-
-		public bool GetOrReserve(string streamName, out StreamId streamId, out StreamId createdId, out string createdName) {
-			Ensure.NotNullOrEmpty(streamName, "streamName");
-			if (SystemStreams.IsMetastream(streamName)) {
-				streamName = SystemStreams.OriginalStreamOf(streamName);
-				var ret = GetOrReserve(streamName, out streamId, out createdId, out createdName);
-				streamId = _metastreams.MetaStreamOf(streamId);
-				return ret;
-			}
-
-			if (LogV3SystemStreams.TryGetVirtualStreamId(streamName, out streamId)) {
-				createdId = default;
-				createdName = default;
-				return true;
-			}
-
-			return _wrapped.GetOrReserve(streamName, out streamId, out createdId, out createdName);
-		}
-	}
-}
diff --git a/src/EventStore.Core/LogV3/StreamNameLookupMetastreamDecorator.cs b/src/EventStore.Core/LogV3/StreamNameLookupMetastreamDecorator.cs
deleted file mode 100644
index 60be84b2b35..00000000000
--- a/src/EventStore.Core/LogV3/StreamNameLookupMetastreamDecorator.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Services;
-using StreamId = System.UInt32;
-
-namespace EventStore.Core.LogV3 {
-	// Decorates a StreamNameLookup, intercepting Metastream (and VirtualStream) calls
-	public class StreamNameLookupMetastreamDecorator : INameLookup<StreamId> {
-		private readonly INameLookup<StreamId> _wrapped;
-		private readonly IMetastreamLookup<StreamId> _metastreams;
-
-		public StreamNameLookupMetastreamDecorator(
-			INameLookup<StreamId> wrapped,
-			IMetastreamLookup<StreamId> metastreams) {
-
-			_wrapped = wrapped;
-			_metastreams = metastreams;
-		}
-
-		public bool TryGetName(StreamId streamId, out string name) {
-			if (_metastreams.IsMetaStream(streamId)) {
-				streamId = _metastreams.OriginalStreamOf(streamId);
-				if (!TryGetName(streamId, out name))
-					return false;
-				name = SystemStreams.MetastreamOf(name);
-				return true;
-			}
-
-			if (LogV3SystemStreams.TryGetVirtualStreamName(streamId, out name))
-				return true;
-
-			return _wrapped.TryGetName(streamId, out name);
-		}
-
-		public bool TryGetLastValue(out StreamId last) {
-			return _wrapped.TryGetLastValue(out last);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/AuthenticationMessage.cs b/src/EventStore.Core/Messages/AuthenticationMessage.cs
deleted file mode 100644
index c8f6a6e97cd..00000000000
--- a/src/EventStore.Core/Messages/AuthenticationMessage.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Messages {
-	public static partial class AuthenticationMessage {
-		[DerivedMessage(CoreMessage.Authentication)]
-		public partial class AuthenticationProviderInitialized : Message {
-		}
-
-		[DerivedMessage(CoreMessage.Authentication)]
-		public partial class AuthenticationProviderInitializationFailed : Message {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/ClientMessage.cs b/src/EventStore.Core/Messages/ClientMessage.cs
deleted file mode 100644
index b7356dee52d..00000000000
--- a/src/EventStore.Core/Messages/ClientMessage.cs
+++ /dev/null
@@ -1,1966 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Security.Claims;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Settings;
-
-using FilteredReadAllResult = EventStore.Core.Data.FilteredReadAllResult;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-
-namespace EventStore.Core.Messages {
-	public enum OperationResult {
-		Success = 0,
-		PrepareTimeout = 1,
-		CommitTimeout = 2,
-		ForwardTimeout = 3,
-		WrongExpectedVersion = 4,
-		StreamDeleted = 5,
-		InvalidTransaction = 6,
-		AccessDenied = 7
-	}
-
-	public static partial class ClientMessage {
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class RequestShutdown : Message {
-			public readonly bool ExitProcess;
-
-			public readonly bool ShutdownHttp;
-
-			public RequestShutdown(bool exitProcess, bool shutdownHttp) {
-				ExitProcess = exitProcess;
-				ShutdownHttp = shutdownHttp;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ReloadConfig : Message {
-		}
-
-		[DerivedMessage]
-		public abstract partial class WriteRequestMessage : Message {
-			public readonly Guid InternalCorrId;
-			public readonly Guid CorrelationId;
-			public readonly IEnvelope Envelope;
-			public readonly bool RequireLeader;
-
-			public readonly ClaimsPrincipal User;
-			public string Login => Tokens?.GetValueOrDefault("uid");
-			public string Password => Tokens?.GetValueOrDefault("pwd");
-			public readonly IReadOnlyDictionary<string, string> Tokens;
-
-			protected WriteRequestMessage(Guid internalCorrId,
-				Guid correlationId, IEnvelope envelope, bool requireLeader,
-				ClaimsPrincipal user, IReadOnlyDictionary<string, string> tokens) {
-				Ensure.NotEmptyGuid(internalCorrId, "internalCorrId");
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				Ensure.NotNull(envelope, "envelope");
-
-				InternalCorrId = internalCorrId;
-				CorrelationId = correlationId;
-				Envelope = envelope;
-				RequireLeader = requireLeader;
-
-				User = user;
-				Tokens = tokens;
-			}
-		}
-
-		[DerivedMessage]
-		public abstract partial class ReadRequestMessage : Message {
-			public readonly Guid InternalCorrId;
-			public readonly Guid CorrelationId;
-			public readonly IEnvelope Envelope;
-
-			public readonly ClaimsPrincipal User;
-
-			public readonly DateTime Expires;
-			public readonly CancellationToken CancellationToken;
-
-			protected ReadRequestMessage(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
-				ClaimsPrincipal user, DateTime? expires,
-				CancellationToken cancellationToken = default) {
-				Ensure.NotEmptyGuid(internalCorrId, "internalCorrId");
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				Ensure.NotNull(envelope, "envelope");
-
-				InternalCorrId = internalCorrId;
-				CorrelationId = correlationId;
-				Envelope = envelope;
-
-				User = user;
-				Expires = expires ?? DateTime.UtcNow.AddMilliseconds(ESConsts.ReadRequestTimeout);
-				CancellationToken = cancellationToken;
-			}
-
-			public override string ToString() =>
-				$"{GetType().Name} " +
-				$"InternalCorrId: {InternalCorrId}, " +
-				$"CorrelationId: {CorrelationId}, " +
-				$"User: {User?.FindFirst(ClaimTypes.Name)?.Value ?? "(anonymous)"}, " +
-				$"Envelope: {{ {Envelope} }}, " +
-				$"Expires: {Expires}";
-		}
-
-		[DerivedMessage]
-		public abstract partial class ReadResponseMessage : Message {
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class TcpForwardMessage : Message {
-			public readonly Message Message;
-
-			public TcpForwardMessage(Message message) {
-				Ensure.NotNull(message, "message");
-
-				Message = message;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class NotHandled : Message {
-			public readonly Guid CorrelationId;
-			public readonly Types.NotHandledReason Reason;
-			public readonly Types.LeaderInfo LeaderInfo;
-			public readonly string Description;
-			public NotHandled(Guid correlationId,
-				Types.NotHandledReason reason,
-				Types.LeaderInfo leaderInfo) {
-				CorrelationId = correlationId;
-				Reason = reason;
-				LeaderInfo = leaderInfo;
-			}
-
-			public NotHandled(Guid correlationId,
-				Types.NotHandledReason reason,
-				string description) {
-				CorrelationId = correlationId;
-				Reason = reason;
-				Description = description;
-			}
-
-
-			public static class Types {
-
-				public enum NotHandledReason {
-					NotReady,
-					TooBusy,
-					NotLeader,
-					IsReadOnly
-				}
-				public class LeaderInfo {
-					public LeaderInfo(EndPoint externalTcp, bool isSecure, EndPoint http) {
-						ExternalTcp = externalTcp;
-						IsSecure = isSecure;
-						Http = http;
-					}
-
-					public bool IsSecure { get; }
-					public EndPoint ExternalTcp { get; }
-					public EndPoint Http { get; }
-				}
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class WriteEvents : WriteRequestMessage {
-			public readonly string EventStreamId;
-			public readonly long ExpectedVersion;
-			public readonly Event[] Events;
-			public readonly CancellationToken CancellationToken;
-
-			public WriteEvents(Guid internalCorrId, Guid correlationId, IEnvelope envelope, bool requireLeader,
-				string eventStreamId, long expectedVersion, Event[] events, ClaimsPrincipal user,
-				IReadOnlyDictionary<string, string> tokens = null, CancellationToken cancellationToken = default)
-				: base(internalCorrId, correlationId, envelope, requireLeader, user, tokens) {
-				Ensure.NotNullOrEmpty(eventStreamId, "eventStreamId");
-				if (expectedVersion < Data.ExpectedVersion.StreamExists ||
-				    expectedVersion == Data.ExpectedVersion.Invalid)
-					throw new ArgumentOutOfRangeException(nameof(expectedVersion));
-				Ensure.NotNull(events, "events");
-
-				EventStreamId = eventStreamId;
-				ExpectedVersion = expectedVersion;
-				Events = events;
-				CancellationToken = cancellationToken;
-			}
-
-			public WriteEvents(Guid internalCorrId, Guid correlationId, IEnvelope envelope, bool requireLeader,
-				string eventStreamId, long expectedVersion, Event @event, ClaimsPrincipal user,
-				IReadOnlyDictionary<string, string> tokens = null)
-				: this(internalCorrId, correlationId, envelope, requireLeader, eventStreamId, expectedVersion,
-					@event == null ? null : new[] {@event}, user, tokens) {
-			}
-
-			public override string ToString() {
-				return String.Format(
-					"WRITE: InternalCorrId: {0}, CorrelationId: {1}, EventStreamId: {2}, ExpectedVersion: {3}, Events: {4}",
-					InternalCorrId, CorrelationId, EventStreamId, ExpectedVersion, Events.Length);
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class WriteEventsCompleted : Message {
-			public readonly Guid CorrelationId;
-			public readonly OperationResult Result;
-			public readonly string Message;
-			public readonly long FirstEventNumber;
-			public readonly long LastEventNumber;
-			public readonly long PreparePosition;
-			public readonly long CommitPosition;
-			public readonly long CurrentVersion;
-
-			public WriteEventsCompleted(Guid correlationId, long firstEventNumber, long lastEventNumber,
-				long preparePosition, long commitPosition) {
-				if (firstEventNumber < -1)
-					throw new ArgumentOutOfRangeException(nameof(firstEventNumber),
-						$"FirstEventNumber: {firstEventNumber}");
-				if (lastEventNumber - firstEventNumber + 1 < 0)
-					throw new ArgumentOutOfRangeException(nameof(lastEventNumber),
-						$"LastEventNumber {lastEventNumber}, FirstEventNumber {firstEventNumber}.");
-
-				CorrelationId = correlationId;
-				Result = OperationResult.Success;
-				Message = null;
-				FirstEventNumber = firstEventNumber;
-				LastEventNumber = lastEventNumber;
-				PreparePosition = preparePosition;
-				CommitPosition = commitPosition;
-			}
-
-			public WriteEventsCompleted(Guid correlationId, OperationResult result, string message,
-				long currentVersion = -1) {
-				if (result == OperationResult.Success)
-					throw new ArgumentException("Invalid constructor used for successful write.", nameof(result));
-
-				CorrelationId = correlationId;
-				Result = result;
-				Message = message;
-				FirstEventNumber = EventNumber.Invalid;
-				LastEventNumber = EventNumber.Invalid;
-				PreparePosition = EventNumber.Invalid;
-				CurrentVersion = currentVersion;
-			}
-
-			private WriteEventsCompleted(Guid correlationId, OperationResult result, string message,
-				long firstEventNumber, long lastEventNumber, long preparePosition, long commitPosition,
-				long currentVersion) {
-				CorrelationId = correlationId;
-				Result = result;
-				Message = message;
-				FirstEventNumber = firstEventNumber;
-				LastEventNumber = lastEventNumber;
-				PreparePosition = preparePosition;
-				CommitPosition = commitPosition;
-				CurrentVersion = currentVersion;
-			}
-
-			public WriteEventsCompleted WithCorrelationId(Guid newCorrId) {
-				return new WriteEventsCompleted(newCorrId, Result, Message, FirstEventNumber, LastEventNumber,
-					PreparePosition, CommitPosition, CurrentVersion);
-			}
-
-			public override string ToString() {
-				return
-					$"WRITE COMPLETED: CorrelationId: {CorrelationId}, Result: {Result}, Message: {Message}, FirstEventNumber: {FirstEventNumber}, LastEventNumber: {LastEventNumber}, CurrentVersion: {CurrentVersion}";
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class TransactionStart : WriteRequestMessage {
-			public readonly string EventStreamId;
-			public readonly long ExpectedVersion;
-
-			public TransactionStart(Guid internalCorrId, Guid correlationId, IEnvelope envelope, bool requireLeader,
-				string eventStreamId, long expectedVersion, ClaimsPrincipal user,
-				IReadOnlyDictionary<string, string> tokens = null)
-				: base(internalCorrId, correlationId, envelope, requireLeader, user, tokens) {
-				Ensure.NotNullOrEmpty(eventStreamId, "eventStreamId");
-				if (expectedVersion < Data.ExpectedVersion.Any)
-					throw new ArgumentOutOfRangeException(nameof(expectedVersion));
-
-				EventStreamId = eventStreamId;
-				ExpectedVersion = expectedVersion;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class TransactionStartCompleted : Message {
-			public readonly Guid CorrelationId;
-			public readonly long TransactionId;
-			public readonly OperationResult Result;
-			public readonly string Message;
-
-			public TransactionStartCompleted(Guid correlationId, long transactionId, OperationResult result,
-				string message) {
-				CorrelationId = correlationId;
-				TransactionId = transactionId;
-				Result = result;
-				Message = message;
-			}
-
-			public TransactionStartCompleted WithCorrelationId(Guid newCorrId) {
-				return new TransactionStartCompleted(newCorrId, TransactionId, Result, Message);
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class TransactionWrite : WriteRequestMessage {
-			public readonly long TransactionId;
-			public readonly Event[] Events;
-
-			public TransactionWrite(Guid internalCorrId, Guid correlationId, IEnvelope envelope, bool requireLeader,
-				long transactionId, Event[] events, ClaimsPrincipal user, IReadOnlyDictionary<string, string> tokens = null)
-				: base(internalCorrId, correlationId, envelope, requireLeader, user, tokens) {
-				Ensure.Nonnegative(transactionId, "transactionId");
-				Ensure.NotNull(events, "events");
-
-				TransactionId = transactionId;
-				Events = events;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class TransactionWriteCompleted : Message {
-			public readonly Guid CorrelationId;
-			public readonly long TransactionId;
-			public readonly OperationResult Result;
-			public readonly string Message;
-
-			public TransactionWriteCompleted(Guid correlationId, long transactionId, OperationResult result,
-				string message) {
-				CorrelationId = correlationId;
-				TransactionId = transactionId;
-				Result = result;
-				Message = message;
-			}
-
-			public TransactionWriteCompleted WithCorrelationId(Guid newCorrId) {
-				return new TransactionWriteCompleted(newCorrId, TransactionId, Result, Message);
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class TransactionCommit : WriteRequestMessage {
-			public readonly long TransactionId;
-
-			public TransactionCommit(Guid internalCorrId, Guid correlationId, IEnvelope envelope, bool requireLeader,
-				long transactionId, ClaimsPrincipal user, IReadOnlyDictionary<string, string> tokens = null)
-				: base(internalCorrId, correlationId, envelope, requireLeader, user, tokens) {
-				Ensure.Nonnegative(transactionId, "transactionId");
-				TransactionId = transactionId;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class TransactionCommitCompleted : Message {
-			public readonly Guid CorrelationId;
-			public readonly long TransactionId;
-			public readonly OperationResult Result;
-			public readonly string Message;
-			public readonly long FirstEventNumber;
-			public readonly long LastEventNumber;
-			public readonly long PreparePosition;
-			public readonly long CommitPosition;
-
-			public TransactionCommitCompleted(Guid correlationId, long transactionId, long firstEventNumber,
-				long lastEventNumber, long preparePosition, long commitPosition) {
-				if (firstEventNumber < -1)
-					throw new ArgumentOutOfRangeException("firstEventNumber",
-						String.Format("FirstEventNumber: {0}", firstEventNumber));
-				if (lastEventNumber - firstEventNumber + 1 < 0)
-					throw new ArgumentOutOfRangeException("lastEventNumber",
-						String.Format("LastEventNumber {0}, FirstEventNumber {1}.", lastEventNumber, firstEventNumber));
-				CorrelationId = correlationId;
-				TransactionId = transactionId;
-				Result = OperationResult.Success;
-				Message = String.Empty;
-				FirstEventNumber = firstEventNumber;
-				LastEventNumber = lastEventNumber;
-				PreparePosition = preparePosition;
-				CommitPosition = commitPosition;
-			}
-
-			public TransactionCommitCompleted(Guid correlationId, long transactionId, OperationResult result,
-				string message) {
-				if (result == OperationResult.Success)
-					throw new ArgumentException("Invalid constructor used for successful write.", "result");
-
-				CorrelationId = correlationId;
-				TransactionId = transactionId;
-				Result = result;
-				Message = message;
-				FirstEventNumber = EventNumber.Invalid;
-				LastEventNumber = EventNumber.Invalid;
-			}
-
-			private TransactionCommitCompleted(Guid correlationId, long transactionId, OperationResult result,
-				string message,
-				long firstEventNumber, long lastEventNumber) {
-				CorrelationId = correlationId;
-				TransactionId = transactionId;
-				Result = result;
-				Message = message;
-				FirstEventNumber = firstEventNumber;
-				LastEventNumber = lastEventNumber;
-			}
-
-			public TransactionCommitCompleted WithCorrelationId(Guid newCorrId) {
-				return new TransactionCommitCompleted(newCorrId, TransactionId, Result, Message, FirstEventNumber,
-					LastEventNumber);
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class DeleteStream : WriteRequestMessage {
-			public readonly string EventStreamId;
-			public readonly long ExpectedVersion;
-			public readonly bool HardDelete;
-			public readonly CancellationToken CancellationToken;
-
-			public DeleteStream(Guid internalCorrId, Guid correlationId, IEnvelope envelope, bool requireLeader,
-				string eventStreamId, long expectedVersion, bool hardDelete, ClaimsPrincipal user,
-				IReadOnlyDictionary<string, string> tokens = null, CancellationToken cancellationToken = default)
-				: base(internalCorrId, correlationId, envelope, requireLeader, user, tokens) {
-				Ensure.NotNullOrEmpty(eventStreamId, "eventStreamId");
-				EventStreamId = eventStreamId;
-				ExpectedVersion = expectedVersion switch {
-					Data.ExpectedVersion.Invalid => throw new ArgumentOutOfRangeException(nameof(expectedVersion)),
-					< Data.ExpectedVersion.StreamExists => throw new ArgumentOutOfRangeException(nameof(expectedVersion)),
-					_ => expectedVersion
-				};
-				HardDelete = hardDelete;
-				CancellationToken = cancellationToken;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class DeleteStreamCompleted : Message {
-			public readonly Guid CorrelationId;
-			public readonly OperationResult Result;
-			public readonly string Message;
-			public readonly long PreparePosition;
-			public readonly long CommitPosition;
-			public readonly long CurrentVersion;
-
-			public DeleteStreamCompleted(Guid correlationId, OperationResult result, string message,
-				long currentVersion, long preparePosition, long commitPosition) {
-				CorrelationId = correlationId;
-				Result = result;
-				Message = message;
-				CurrentVersion = currentVersion;
-				PreparePosition = preparePosition;
-				CommitPosition = commitPosition;
-			}
-
-			public DeleteStreamCompleted(Guid correlationId, OperationResult result, string message,
-				long currentVersion = -1L) : this(correlationId, result, message, currentVersion, -1, -1) {
-			}
-
-			public DeleteStreamCompleted WithCorrelationId(Guid newCorrId) {
-				return new DeleteStreamCompleted(newCorrId, Result, Message, CurrentVersion, PreparePosition,
-					CommitPosition);
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ReadEvent : ReadRequestMessage {
-			public readonly string EventStreamId;
-			public readonly long EventNumber;
-			public readonly bool ResolveLinkTos;
-			public readonly bool RequireLeader;
-
-			public ReadEvent(Guid internalCorrId, Guid correlationId, IEnvelope envelope, string eventStreamId,
-				long eventNumber,
-				bool resolveLinkTos, bool requireLeader, ClaimsPrincipal user, DateTime? expires = null,
-				CancellationToken cancellationToken = default)
-				: base(internalCorrId, correlationId, envelope, user, expires, cancellationToken) {
-				Ensure.NotNullOrEmpty(eventStreamId, "eventStreamId");
-				if (eventNumber < -1) throw new ArgumentOutOfRangeException(nameof(eventNumber));
-
-				EventStreamId = eventStreamId;
-				EventNumber = eventNumber;
-				ResolveLinkTos = resolveLinkTos;
-				RequireLeader = requireLeader;
-			}
-
-			public override string ToString() =>
-				$"{base.ToString()}, " +
-				$"EventStreamId: {EventStreamId}, " +
-				$"EventNumber: {EventNumber}, " +
-				$"ResolveLinkTos: {ResolveLinkTos}, " +
-				$"RequireLeader: {RequireLeader}";
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ReadEventCompleted : ReadResponseMessage {
-			public readonly Guid CorrelationId;
-			public readonly string EventStreamId;
-			public readonly ReadEventResult Result;
-			public readonly ResolvedEvent Record;
-			public readonly StreamMetadata StreamMetadata;
-			public readonly bool IsCachePublic;
-			public readonly string Error;
-
-			public ReadEventCompleted(Guid correlationId, string eventStreamId, ReadEventResult result,
-				ResolvedEvent record, StreamMetadata streamMetadata, bool isCachePublic, string error) {
-				Ensure.NotNullOrEmpty(eventStreamId, "eventStreamId");
-				//if (result == ReadEventResult.Success)
-				//    Ensure.NotNull(record.Event, "record.Event");
-
-				CorrelationId = correlationId;
-				EventStreamId = eventStreamId;
-				Result = result;
-				Record = record;
-				StreamMetadata = streamMetadata;
-				IsCachePublic = isCachePublic;
-				Error = error;
-			}
-		}
-
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ReadStreamEventsForward : ReadRequestMessage {
-			public readonly string EventStreamId;
-			public readonly long FromEventNumber;
-			public readonly int MaxCount;
-			public readonly bool ResolveLinkTos;
-			public readonly bool RequireLeader;
-
-			public readonly long? ValidationStreamVersion;
-			public readonly TimeSpan? LongPollTimeout;
-			public readonly bool ReplyOnExpired;
-
-			public ReadStreamEventsForward(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
-				string eventStreamId, long fromEventNumber, int maxCount, bool resolveLinkTos,
-				bool requireLeader, long? validationStreamVersion, ClaimsPrincipal user,
-				bool replyOnExpired,
-				TimeSpan? longPollTimeout = null, DateTime? expires = null,
-				CancellationToken cancellationToken = default)
-				: base(internalCorrId, correlationId, envelope, user, expires, cancellationToken) {
-				Ensure.NotNullOrEmpty(eventStreamId, "eventStreamId");
-				if (fromEventNumber < -1) throw new ArgumentOutOfRangeException(nameof(fromEventNumber));
-
-				EventStreamId = eventStreamId;
-				FromEventNumber = fromEventNumber;
-				MaxCount = maxCount;
-				ResolveLinkTos = resolveLinkTos;
-				RequireLeader = requireLeader;
-				ValidationStreamVersion = validationStreamVersion;
-				LongPollTimeout = longPollTimeout;
-				ReplyOnExpired = replyOnExpired;
-			}
-
-			public override string ToString() =>
-				$"{base.ToString()}, " +
-				$"EventStreamId: {EventStreamId}, " +
-				$"FromEventNumber: {FromEventNumber}, " +
-				$"MaxCount: {MaxCount}, " +
-				$"ResolveLinkTos: {ResolveLinkTos}, " +
-				$"RequireLeader: {RequireLeader}, " +
-				$"ValidationStreamVersion: {ValidationStreamVersion}, " +
-				$"LongPollTimeout: {LongPollTimeout}, " +
-				$"ReplyOnExpired: {ReplyOnExpired}";
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ReadStreamEventsForwardCompleted : ReadResponseMessage {
-			public readonly Guid CorrelationId;
-			public readonly string EventStreamId;
-			public readonly long FromEventNumber;
-			public readonly int MaxCount;
-
-			public readonly ReadStreamResult Result;
-			public readonly ResolvedEvent[] Events;
-			public readonly StreamMetadata StreamMetadata;
-			public readonly bool IsCachePublic;
-			public readonly string Error;
-			public readonly long NextEventNumber;
-			public readonly long LastEventNumber;
-			public readonly bool IsEndOfStream;
-			public readonly long TfLastCommitPosition;
-
-			public ReadStreamEventsForwardCompleted(Guid correlationId, string eventStreamId, long fromEventNumber,
-				int maxCount,
-				ReadStreamResult result, ResolvedEvent[] events,
-				StreamMetadata streamMetadata, bool isCachePublic,
-				string error, long nextEventNumber, long lastEventNumber, bool isEndOfStream,
-				long tfLastCommitPosition) {
-				Ensure.NotNull(events, "events");
-
-				if (result != ReadStreamResult.Success && result != ReadStreamResult.Expired) {
-					Ensure.Equal(nextEventNumber, -1, "nextEventNumber");
-					Ensure.Equal(isEndOfStream, true, "isEndOfStream");
-				}
-
-				CorrelationId = correlationId;
-				EventStreamId = eventStreamId;
-				FromEventNumber = fromEventNumber;
-				MaxCount = maxCount;
-
-				Result = result;
-				Events = events;
-				StreamMetadata = streamMetadata;
-				IsCachePublic = isCachePublic;
-				Error = error;
-				NextEventNumber = nextEventNumber;
-				LastEventNumber = lastEventNumber;
-				IsEndOfStream = isEndOfStream;
-				TfLastCommitPosition = tfLastCommitPosition;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ReadStreamEventsBackward : ReadRequestMessage {
-			public readonly string EventStreamId;
-			public readonly long FromEventNumber;
-			public readonly int MaxCount;
-			public readonly bool ResolveLinkTos;
-			public readonly bool RequireLeader;
-
-			public readonly long? ValidationStreamVersion;
-
-			public ReadStreamEventsBackward(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
-				string eventStreamId, long fromEventNumber, int maxCount, bool resolveLinkTos,
-				bool requireLeader, long? validationStreamVersion, ClaimsPrincipal user, DateTime? expires = null,
-				CancellationToken cancellationToken = default)
-				: base(internalCorrId, correlationId, envelope, user, expires, cancellationToken) {
-				Ensure.NotNullOrEmpty(eventStreamId, "eventStreamId");
-				if (fromEventNumber < -1) throw new ArgumentOutOfRangeException(nameof(fromEventNumber));
-
-				EventStreamId = eventStreamId;
-				FromEventNumber = fromEventNumber;
-				MaxCount = maxCount;
-				ResolveLinkTos = resolveLinkTos;
-				RequireLeader = requireLeader;
-				ValidationStreamVersion = validationStreamVersion;
-			}
-
-			public override string ToString() =>
-				$"{base.ToString()}, " +
-				$"EventStreamId: {EventStreamId}, " +
-				$"FromEventNumber: {FromEventNumber}, " +
-				$"MaxCount: {MaxCount}, " +
-				$"ResolveLinkTos: {ResolveLinkTos}, " +
-				$"RequireLeader: {RequireLeader}, " +
-				$"ValidationStreamVersion: {ValidationStreamVersion}";
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ReadStreamEventsBackwardCompleted : ReadResponseMessage {
-			public readonly Guid CorrelationId;
-			public readonly string EventStreamId;
-			public readonly long FromEventNumber;
-			public readonly int MaxCount;
-
-			public readonly ReadStreamResult Result;
-			public readonly ResolvedEvent[] Events;
-			public readonly StreamMetadata StreamMetadata;
-			public readonly bool IsCachePublic;
-			public readonly string Error;
-			public readonly long NextEventNumber;
-			public readonly long LastEventNumber;
-			public readonly bool IsEndOfStream;
-			public readonly long TfLastCommitPosition;
-
-			public ReadStreamEventsBackwardCompleted(Guid correlationId,
-				string eventStreamId,
-				long fromEventNumber,
-				int maxCount,
-				ReadStreamResult result,
-				ResolvedEvent[] events,
-				StreamMetadata streamMetadata,
-				bool isCachePublic,
-				string error,
-				long nextEventNumber,
-				long lastEventNumber,
-				bool isEndOfStream,
-				long tfLastCommitPosition) {
-				Ensure.NotNull(events, "events");
-
-				if (result != ReadStreamResult.Success) {
-					Ensure.Equal(nextEventNumber, -1, "nextEventNumber");
-					Ensure.Equal(isEndOfStream, true, "isEndOfStream");
-				}
-
-				CorrelationId = correlationId;
-				EventStreamId = eventStreamId;
-				FromEventNumber = fromEventNumber;
-				MaxCount = maxCount;
-
-				Result = result;
-				Events = events;
-				StreamMetadata = streamMetadata;
-				IsCachePublic = isCachePublic;
-				Error = error;
-				NextEventNumber = nextEventNumber;
-				LastEventNumber = lastEventNumber;
-				IsEndOfStream = isEndOfStream;
-				TfLastCommitPosition = tfLastCommitPosition;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ReadAllEventsForward : ReadRequestMessage {
-			public readonly long CommitPosition;
-			public readonly long PreparePosition;
-			public readonly int MaxCount;
-			public readonly bool ResolveLinkTos;
-			public readonly bool RequireLeader;
-
-			public readonly long? ValidationTfLastCommitPosition;
-			public readonly TimeSpan? LongPollTimeout;
-			public readonly bool ReplyOnExpired;
-
-			public ReadAllEventsForward(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
-				long commitPosition, long preparePosition, int maxCount, bool resolveLinkTos,
-				bool requireLeader, long? validationTfLastCommitPosition, ClaimsPrincipal user,
-				bool replyOnExpired,
-				TimeSpan? longPollTimeout = null, DateTime? expires = null,
-				CancellationToken cancellationToken = default)
-				: base(internalCorrId, correlationId, envelope, user, expires, cancellationToken) {
-				CommitPosition = commitPosition;
-				PreparePosition = preparePosition;
-				MaxCount = maxCount;
-				ResolveLinkTos = resolveLinkTos;
-				RequireLeader = requireLeader;
-				ValidationTfLastCommitPosition = validationTfLastCommitPosition;
-				LongPollTimeout = longPollTimeout;
-				ReplyOnExpired = replyOnExpired;
-			}
-
-			public override string ToString() =>
-				$"{base.ToString()}, " +
-				$"PreparePosition: {PreparePosition}, " +
-				$"CommitPosition: {CommitPosition}, " +
-				$"MaxCount: {MaxCount}, " +
-				$"ResolveLinkTos: {ResolveLinkTos}, " +
-				$"RequireLeader: {RequireLeader}, " +
-				$"ValidationTfLastCommitPosition: {ValidationTfLastCommitPosition}, " +
-				$"LongPollTimeout: {LongPollTimeout}, " +
-				$"ReplyOnExpired: {ReplyOnExpired}";
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ReadAllEventsForwardCompleted : ReadResponseMessage {
-			public readonly Guid CorrelationId;
-
-			public readonly ReadAllResult Result;
-			public readonly string Error;
-
-			public readonly ResolvedEvent[] Events;
-			public readonly StreamMetadata StreamMetadata;
-			public readonly bool IsCachePublic;
-			public readonly int MaxCount;
-			public readonly TFPos CurrentPos;
-			public readonly TFPos NextPos;
-			public readonly TFPos PrevPos;
-			public readonly long TfLastCommitPosition;
-
-			public bool IsEndOfStream {
-				get { return Events == null || Events.Length < MaxCount; }
-			}
-
-			public ReadAllEventsForwardCompleted(Guid correlationId, ReadAllResult result, string error,
-				ResolvedEvent[] events,
-				StreamMetadata streamMetadata, bool isCachePublic, int maxCount,
-				TFPos currentPos, TFPos nextPos, TFPos prevPos, long tfLastCommitPosition) {
-				Ensure.NotNull(events, "events");
-
-				CorrelationId = correlationId;
-				Result = result;
-				Error = error;
-				Events = events;
-				StreamMetadata = streamMetadata;
-				IsCachePublic = isCachePublic;
-				MaxCount = maxCount;
-				CurrentPos = currentPos;
-				NextPos = nextPos;
-				PrevPos = prevPos;
-				TfLastCommitPosition = tfLastCommitPosition;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ReadAllEventsBackward : ReadRequestMessage {
-			public readonly long CommitPosition;
-			public readonly long PreparePosition;
-			public readonly int MaxCount;
-			public readonly bool ResolveLinkTos;
-			public readonly bool RequireLeader;
-
-			public readonly long? ValidationTfLastCommitPosition;
-
-			public ReadAllEventsBackward(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
-				long commitPosition, long preparePosition, int maxCount, bool resolveLinkTos,
-				bool requireLeader, long? validationTfLastCommitPosition, ClaimsPrincipal user,
-				DateTime? expires = null,
-				CancellationToken cancellationToken = default)
-				: base(internalCorrId, correlationId, envelope, user, expires, cancellationToken) {
-				CommitPosition = commitPosition;
-				PreparePosition = preparePosition;
-				MaxCount = maxCount;
-				ResolveLinkTos = resolveLinkTos;
-				RequireLeader = requireLeader;
-				ValidationTfLastCommitPosition = validationTfLastCommitPosition;
-			}
-
-			public override string ToString() =>
-				$"{base.ToString()}, " +
-				$"PreparePosition: {PreparePosition}, " +
-				$"CommitPosition: {CommitPosition}, " +
-				$"MaxCount: {MaxCount}, " +
-				$"ResolveLinkTos: {ResolveLinkTos}, " +
-				$"RequireLeader: {RequireLeader}, " +
-				$"ValidationTfLastCommitPosition: {ValidationTfLastCommitPosition}";
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ReadAllEventsBackwardCompleted : ReadResponseMessage {
-			public readonly Guid CorrelationId;
-
-			public readonly ReadAllResult Result;
-			public readonly string Error;
-
-			public readonly ResolvedEvent[] Events;
-			public readonly StreamMetadata StreamMetadata;
-			public readonly bool IsCachePublic;
-			public readonly int MaxCount;
-			public readonly TFPos CurrentPos;
-			public readonly TFPos NextPos;
-			public readonly TFPos PrevPos;
-			public readonly long TfLastCommitPosition;
-
-			public bool IsEndOfStream {
-				get { return Events == null || Events.Length < MaxCount; }
-			}
-
-			public ReadAllEventsBackwardCompleted(Guid correlationId, ReadAllResult result, string error,
-				ResolvedEvent[] events,
-				StreamMetadata streamMetadata, bool isCachePublic, int maxCount,
-				TFPos currentPos, TFPos nextPos, TFPos prevPos, long tfLastCommitPosition) {
-				Ensure.NotNull(events, "events");
-
-				CorrelationId = correlationId;
-				Result = result;
-				Error = error;
-				Events = events;
-				StreamMetadata = streamMetadata;
-				IsCachePublic = isCachePublic;
-				MaxCount = maxCount;
-				CurrentPos = currentPos;
-				NextPos = nextPos;
-				PrevPos = prevPos;
-				TfLastCommitPosition = tfLastCommitPosition;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class FilteredReadAllEventsForward : ReadRequestMessage {
-			public readonly long CommitPosition;
-			public readonly long PreparePosition;
-			public readonly int MaxCount;
-			public readonly bool ResolveLinkTos;
-			public readonly bool RequireLeader;
-			public readonly int MaxSearchWindow;
-			public readonly IEventFilter EventFilter;
-			public readonly bool ReplyOnExpired;
-
-			public readonly long? ValidationTfLastCommitPosition;
-			public readonly TimeSpan? LongPollTimeout;
-
-			public FilteredReadAllEventsForward(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
-				long commitPosition, long preparePosition, int maxCount, bool resolveLinkTos, bool requireLeader,
-				int maxSearchWindow, long? validationTfLastCommitPosition, IEventFilter eventFilter, ClaimsPrincipal user,
-				bool replyOnExpired,
-				TimeSpan? longPollTimeout = null, DateTime? expires = null,
-				CancellationToken cancellationToken = default)
-				: base(internalCorrId, correlationId, envelope, user, expires, cancellationToken) {
-				CommitPosition = commitPosition;
-				PreparePosition = preparePosition;
-				MaxCount = maxCount;
-				ResolveLinkTos = resolveLinkTos;
-				RequireLeader = requireLeader;
-				ValidationTfLastCommitPosition = validationTfLastCommitPosition;
-				LongPollTimeout = longPollTimeout;
-				MaxSearchWindow = maxSearchWindow;
-				EventFilter = eventFilter;
-				ReplyOnExpired = replyOnExpired;
-			}
-
-			public override string ToString() =>
-				$"{base.ToString()}, " +
-				$"PreparePosition: {PreparePosition}, " +
-				$"CommitPosition: {CommitPosition}, " +
-				$"MaxCount: {MaxCount}, " +
-				$"ResolveLinkTos: {ResolveLinkTos}, " +
-				$"RequireLeader: {RequireLeader}, " +
-				$"ValidationTfLastCommitPosition: {ValidationTfLastCommitPosition}, " +
-				$"LongPollTimeout: {LongPollTimeout}, " +
-				$"MaxSearchWindow: {MaxSearchWindow}, " +
-				$"EventFilter: {{ {EventFilter} }}, " +
-				$"ReplyOnExpired: {ReplyOnExpired}";
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class FilteredReadAllEventsForwardCompleted : ReadResponseMessage {
-		public readonly Guid CorrelationId;
-
-			public readonly FilteredReadAllResult Result;
-			public readonly string Error;
-
-			public readonly ResolvedEvent[] Events;
-			public readonly StreamMetadata StreamMetadata;
-			public readonly bool IsCachePublic;
-			public readonly int MaxCount;
-			public readonly TFPos CurrentPos;
-			public readonly TFPos NextPos;
-			public readonly TFPos PrevPos;
-			public readonly long TfLastCommitPosition;
-			public readonly bool IsEndOfStream;
-			public readonly long ConsideredEventsCount;
-
-			public FilteredReadAllEventsForwardCompleted(Guid correlationId, FilteredReadAllResult result, string error,
-				ResolvedEvent[] events,
-				StreamMetadata streamMetadata, bool isCachePublic, int maxCount,
-				TFPos currentPos, TFPos nextPos, TFPos prevPos, long tfLastCommitPosition,
-				bool isEndOfStream, long consideredEventsCount) {
-				Ensure.NotNull(events, "events");
-
-				CorrelationId = correlationId;
-				Result = result;
-				Error = error;
-				Events = events;
-				StreamMetadata = streamMetadata;
-				IsCachePublic = isCachePublic;
-				MaxCount = maxCount;
-				CurrentPos = currentPos;
-				NextPos = nextPos;
-				PrevPos = prevPos;
-				TfLastCommitPosition = tfLastCommitPosition;
-				IsEndOfStream = isEndOfStream;
-				ConsideredEventsCount = consideredEventsCount;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class FilteredReadAllEventsBackward : ReadRequestMessage {
-			public readonly long CommitPosition;
-			public readonly long PreparePosition;
-			public readonly int MaxCount;
-			public readonly bool ResolveLinkTos;
-			public readonly bool RequireLeader;
-			public readonly int MaxSearchWindow;
-			public readonly IEventFilter EventFilter;
-
-			public readonly long? ValidationTfLastCommitPosition;
-			public readonly TimeSpan? LongPollTimeout;
-
-			public FilteredReadAllEventsBackward(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
-				long commitPosition, long preparePosition, int maxCount, bool resolveLinkTos, bool requireLeader,
-				int maxSearchWindow, long? validationTfLastCommitPosition, IEventFilter eventFilter, ClaimsPrincipal user,
-				TimeSpan? longPollTimeout = null, DateTime? expires = null,
-				CancellationToken cancellationToken = default)
-				: base(internalCorrId, correlationId, envelope, user, expires, cancellationToken) {
-				CommitPosition = commitPosition;
-				PreparePosition = preparePosition;
-				MaxCount = maxCount;
-				ResolveLinkTos = resolveLinkTos;
-				RequireLeader = requireLeader;
-				ValidationTfLastCommitPosition = validationTfLastCommitPosition;
-				LongPollTimeout = longPollTimeout;
-				MaxSearchWindow = maxSearchWindow;
-				EventFilter = eventFilter;
-			}
-
-			public override string ToString() =>
-				$"{base.ToString()}, " +
-				$"PreparePosition: {PreparePosition}, " +
-				$"CommitPosition: {CommitPosition}, " +
-				$"MaxCount: {MaxCount}, " +
-				$"ResolveLinkTos: {ResolveLinkTos}, " +
-				$"RequireLeader: {RequireLeader}, " +
-				$"MaxSearchWindow: {MaxSearchWindow}, " +
-				$"EventFilter: {{ {EventFilter} }}, " +
-				$"LongPollTimeout: {LongPollTimeout}, " +
-				$"ValidationTfLastCommitPosition: {ValidationTfLastCommitPosition}";
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class FilteredReadAllEventsBackwardCompleted : ReadResponseMessage {
-			public readonly Guid CorrelationId;
-
-			public readonly FilteredReadAllResult Result;
-			public readonly string Error;
-
-			public readonly ResolvedEvent[] Events;
-			public readonly StreamMetadata StreamMetadata;
-			public readonly bool IsCachePublic;
-			public readonly int MaxCount;
-			public readonly TFPos CurrentPos;
-			public readonly TFPos NextPos;
-			public readonly TFPos PrevPos;
-			public readonly long TfLastCommitPosition;
-			public readonly bool IsEndOfStream;
-
-			public FilteredReadAllEventsBackwardCompleted(Guid correlationId, FilteredReadAllResult result, string error,
-				ResolvedEvent[] events,
-				StreamMetadata streamMetadata, bool isCachePublic, int maxCount,
-				TFPos currentPos, TFPos nextPos, TFPos prevPos, long tfLastCommitPosition,
-				bool isEndOfStream) {
-				Ensure.NotNull(events, "events");
-
-				CorrelationId = correlationId;
-				Result = result;
-				Error = error;
-				Events = events;
-				StreamMetadata = streamMetadata;
-				IsCachePublic = isCachePublic;
-				MaxCount = maxCount;
-				CurrentPos = currentPos;
-				NextPos = nextPos;
-				PrevPos = prevPos;
-				TfLastCommitPosition = tfLastCommitPosition;
-				IsEndOfStream = isEndOfStream;
-			}
-		}
-
-		//Persistent subscriptions
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ConnectToPersistentSubscriptionToStream : ReadRequestMessage {
-			public readonly Guid ConnectionId;
-			public readonly string ConnectionName;
-			public readonly string GroupName;
-			public readonly string EventStreamId;
-			public readonly int AllowedInFlightMessages;
-			public readonly string From;
-
-			public ConnectToPersistentSubscriptionToStream(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
-				Guid connectionId, string connectionName, string groupName, string eventStreamId,
-				int allowedInFlightMessages, string from, ClaimsPrincipal user, DateTime? expires = null)
-				: base(internalCorrId, correlationId, envelope, user, expires) {
-				Ensure.NotEmptyGuid(connectionId, "connectionId");
-				Ensure.NotNullOrEmpty(groupName, "subscriptionId");
-				Ensure.Nonnegative(allowedInFlightMessages, "AllowedInFlightMessages");
-				GroupName = groupName;
-				ConnectionId = connectionId;
-				ConnectionName = connectionName;
-				AllowedInFlightMessages = allowedInFlightMessages;
-				EventStreamId = eventStreamId;
-				From = from;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ConnectToPersistentSubscriptionToAll : ReadRequestMessage {
-			public readonly Guid ConnectionId;
-			public readonly string ConnectionName;
-			public readonly string GroupName;
-			public readonly int AllowedInFlightMessages;
-			public readonly string From;
-
-			public ConnectToPersistentSubscriptionToAll(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
-				Guid connectionId, string connectionName, string groupName,
-				int allowedInFlightMessages, string from, ClaimsPrincipal user, DateTime? expires = null)
-				: base(internalCorrId, correlationId, envelope, user, expires) {
-				Ensure.NotEmptyGuid(connectionId, "connectionId");
-				Ensure.NotNullOrEmpty(groupName, "groupName");
-				Ensure.Nonnegative(allowedInFlightMessages, "AllowedInFlightMessages");
-				GroupName = groupName;
-				ConnectionId = connectionId;
-				ConnectionName = connectionName;
-				AllowedInFlightMessages = allowedInFlightMessages;
-				From = from;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class CreatePersistentSubscriptionToStream : ReadRequestMessage {
-			public readonly long StartFrom;
-			public readonly int MessageTimeoutMilliseconds;
-			public readonly bool RecordStatistics;
-
-			public readonly bool ResolveLinkTos;
-			public readonly int MaxRetryCount;
-			public readonly int BufferSize;
-			public readonly int LiveBufferSize;
-			public readonly int ReadBatchSize;
-
-			public readonly string GroupName;
-			public readonly string EventStreamId;
-			public readonly int MaxSubscriberCount;
-			public readonly string NamedConsumerStrategy;
-			public readonly int MaxCheckPointCount;
-			public readonly int MinCheckPointCount;
-			public readonly int CheckPointAfterMilliseconds;
-
-			public CreatePersistentSubscriptionToStream(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
-				string eventStreamId, string groupName, bool resolveLinkTos, long startFrom,
-				int messageTimeoutMilliseconds, bool recordStatistics, int maxRetryCount, int bufferSize,
-				int liveBufferSize, int readbatchSize,
-				int checkPointAfterMilliseconds, int minCheckPointCount, int maxCheckPointCount,
-				int maxSubscriberCount, string namedConsumerStrategy, ClaimsPrincipal user, DateTime? expires = null)
-				: base(internalCorrId, correlationId, envelope, user, expires) {
-				ResolveLinkTos = resolveLinkTos;
-				EventStreamId = eventStreamId;
-				GroupName = groupName;
-				StartFrom = startFrom;
-				MessageTimeoutMilliseconds = messageTimeoutMilliseconds;
-				RecordStatistics = recordStatistics;
-				MaxRetryCount = maxRetryCount;
-				BufferSize = bufferSize;
-				LiveBufferSize = liveBufferSize;
-				ReadBatchSize = readbatchSize;
-				MaxCheckPointCount = maxCheckPointCount;
-				MinCheckPointCount = minCheckPointCount;
-				CheckPointAfterMilliseconds = checkPointAfterMilliseconds;
-				MaxSubscriberCount = maxSubscriberCount;
-				NamedConsumerStrategy = namedConsumerStrategy;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class CreatePersistentSubscriptionToStreamCompleted : ReadResponseMessage {
-			public readonly Guid CorrelationId;
-			public readonly string Reason;
-			public readonly CreatePersistentSubscriptionToStreamResult Result;
-
-			public CreatePersistentSubscriptionToStreamCompleted(Guid correlationId, CreatePersistentSubscriptionToStreamResult result,
-				string reason) {
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				CorrelationId = correlationId;
-				Result = result;
-				Reason = reason;
-			}
-
-			public enum CreatePersistentSubscriptionToStreamResult {
-				Success = 0,
-				AlreadyExists = 1,
-				Fail = 2,
-				AccessDenied = 3
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class CreatePersistentSubscriptionToAll : ReadRequestMessage {
-			public readonly IEventFilter EventFilter;
-
-			public readonly TFPos StartFrom;
-			public readonly int MessageTimeoutMilliseconds;
-			public readonly bool RecordStatistics;
-
-			public readonly bool ResolveLinkTos;
-			public readonly int MaxRetryCount;
-			public readonly int BufferSize;
-			public readonly int LiveBufferSize;
-			public readonly int ReadBatchSize;
-
-			public readonly string GroupName;
-			public readonly int MaxSubscriberCount;
-			public readonly string NamedConsumerStrategy;
-			public readonly int MaxCheckPointCount;
-			public readonly int MinCheckPointCount;
-			public readonly int CheckPointAfterMilliseconds;
-
-			public CreatePersistentSubscriptionToAll(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
-				string groupName, IEventFilter eventFilter, bool resolveLinkTos, TFPos startFrom,
-				int messageTimeoutMilliseconds, bool recordStatistics, int maxRetryCount, int bufferSize,
-				int liveBufferSize, int readbatchSize,
-				int checkPointAfterMilliseconds, int minCheckPointCount, int maxCheckPointCount,
-				int maxSubscriberCount, string namedConsumerStrategy, ClaimsPrincipal user, DateTime? expires = null)
-				: base(internalCorrId, correlationId, envelope, user, expires) {
-				ResolveLinkTos = resolveLinkTos;
-				GroupName = groupName;
-				EventFilter = eventFilter;
-				StartFrom = startFrom;
-				MessageTimeoutMilliseconds = messageTimeoutMilliseconds;
-				RecordStatistics = recordStatistics;
-				MaxRetryCount = maxRetryCount;
-				BufferSize = bufferSize;
-				LiveBufferSize = liveBufferSize;
-				ReadBatchSize = readbatchSize;
-				MaxCheckPointCount = maxCheckPointCount;
-				MinCheckPointCount = minCheckPointCount;
-				CheckPointAfterMilliseconds = checkPointAfterMilliseconds;
-				MaxSubscriberCount = maxSubscriberCount;
-				NamedConsumerStrategy = namedConsumerStrategy;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class CreatePersistentSubscriptionToAllCompleted : ReadResponseMessage {
-			public readonly Guid CorrelationId;
-			public readonly string Reason;
-			public readonly CreatePersistentSubscriptionToAllResult Result;
-
-			public CreatePersistentSubscriptionToAllCompleted(Guid correlationId, CreatePersistentSubscriptionToAllResult result,
-				string reason) {
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				CorrelationId = correlationId;
-				Result = result;
-				Reason = reason;
-			}
-
-			public enum CreatePersistentSubscriptionToAllResult {
-				Success = 0,
-				AlreadyExists = 1,
-				Fail = 2,
-				AccessDenied = 3
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class UpdatePersistentSubscriptionToStream : ReadRequestMessage {
-			public readonly long StartFrom;
-			public readonly int MessageTimeoutMilliseconds;
-			public readonly bool RecordStatistics;
-
-			public readonly bool ResolveLinkTos;
-			public readonly int MaxRetryCount;
-			public readonly int BufferSize;
-			public readonly int LiveBufferSize;
-			public readonly int ReadBatchSize;
-
-			public readonly string GroupName;
-			public readonly string EventStreamId;
-			public readonly int MaxSubscriberCount;
-
-			public readonly int MaxCheckPointCount;
-			public readonly int MinCheckPointCount;
-			public readonly int CheckPointAfterMilliseconds;
-			public readonly string NamedConsumerStrategy;
-
-			public UpdatePersistentSubscriptionToStream(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
-				string eventStreamId, string groupName, bool resolveLinkTos, long startFrom,
-				int messageTimeoutMilliseconds, bool recordStatistics, int maxRetryCount, int bufferSize,
-				int liveBufferSize, int readbatchSize, int checkPointAfterMilliseconds, int minCheckPointCount,
-				int maxCheckPointCount, int maxSubscriberCount, string namedConsumerStrategy, ClaimsPrincipal user,
-				DateTime? expires = null)
-				: base(internalCorrId, correlationId, envelope, user, expires) {
-				ResolveLinkTos = resolveLinkTos;
-				EventStreamId = eventStreamId;
-				GroupName = groupName;
-				StartFrom = startFrom;
-				MessageTimeoutMilliseconds = messageTimeoutMilliseconds;
-				RecordStatistics = recordStatistics;
-				MaxRetryCount = maxRetryCount;
-				BufferSize = bufferSize;
-				LiveBufferSize = liveBufferSize;
-				ReadBatchSize = readbatchSize;
-				MaxCheckPointCount = maxCheckPointCount;
-				MinCheckPointCount = minCheckPointCount;
-				CheckPointAfterMilliseconds = checkPointAfterMilliseconds;
-				MaxSubscriberCount = maxSubscriberCount;
-				NamedConsumerStrategy = namedConsumerStrategy;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class UpdatePersistentSubscriptionToStreamCompleted : ReadResponseMessage {
-			public readonly Guid CorrelationId;
-			public readonly string Reason;
-			public readonly UpdatePersistentSubscriptionToStreamResult Result;
-
-			public UpdatePersistentSubscriptionToStreamCompleted(Guid correlationId, UpdatePersistentSubscriptionToStreamResult result,
-				string reason) {
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				CorrelationId = correlationId;
-				Result = result;
-				Reason = reason;
-			}
-
-			public enum UpdatePersistentSubscriptionToStreamResult {
-				Success = 0,
-				DoesNotExist = 1,
-				Fail = 2,
-				AccessDenied = 3
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class UpdatePersistentSubscriptionToAll : ReadRequestMessage {
-			public readonly TFPos StartFrom;
-			public readonly int MessageTimeoutMilliseconds;
-			public readonly bool RecordStatistics;
-
-			public readonly bool ResolveLinkTos;
-			public readonly int MaxRetryCount;
-			public readonly int BufferSize;
-			public readonly int LiveBufferSize;
-			public readonly int ReadBatchSize;
-
-			public readonly string GroupName;
-			public readonly int MaxSubscriberCount;
-
-			public readonly int MaxCheckPointCount;
-			public readonly int MinCheckPointCount;
-			public readonly int CheckPointAfterMilliseconds;
-			public readonly string NamedConsumerStrategy;
-
-			public UpdatePersistentSubscriptionToAll(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
-				string groupName, bool resolveLinkTos, TFPos startFrom,
-				int messageTimeoutMilliseconds, bool recordStatistics, int maxRetryCount, int bufferSize,
-				int liveBufferSize, int readbatchSize, int checkPointAfterMilliseconds, int minCheckPointCount,
-				int maxCheckPointCount, int maxSubscriberCount, string namedConsumerStrategy, ClaimsPrincipal user,
-				DateTime? expires = null)
-				: base(internalCorrId, correlationId, envelope, user, expires) {
-				ResolveLinkTos = resolveLinkTos;
-				GroupName = groupName;
-				StartFrom = startFrom;
-				MessageTimeoutMilliseconds = messageTimeoutMilliseconds;
-				RecordStatistics = recordStatistics;
-				MaxRetryCount = maxRetryCount;
-				BufferSize = bufferSize;
-				LiveBufferSize = liveBufferSize;
-				ReadBatchSize = readbatchSize;
-				MaxCheckPointCount = maxCheckPointCount;
-				MinCheckPointCount = minCheckPointCount;
-				CheckPointAfterMilliseconds = checkPointAfterMilliseconds;
-				MaxSubscriberCount = maxSubscriberCount;
-				NamedConsumerStrategy = namedConsumerStrategy;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class UpdatePersistentSubscriptionToAllCompleted : ReadResponseMessage {
-			public readonly Guid CorrelationId;
-			public readonly string Reason;
-			public readonly UpdatePersistentSubscriptionToAllResult Result;
-
-			public UpdatePersistentSubscriptionToAllCompleted(Guid correlationId, UpdatePersistentSubscriptionToAllResult result,
-				string reason) {
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				CorrelationId = correlationId;
-				Result = result;
-				Reason = reason;
-			}
-
-			public enum UpdatePersistentSubscriptionToAllResult {
-				Success = 0,
-				DoesNotExist = 1,
-				Fail = 2,
-				AccessDenied = 3
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ReadNextNPersistentMessages : ReadRequestMessage {
-			public readonly string GroupName;
-			public readonly string EventStreamId;
-			public readonly int Count;
-
-			public ReadNextNPersistentMessages(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
-				string eventStreamId, string groupName, int count, ClaimsPrincipal user, DateTime? expires = null)
-				: base(internalCorrId, correlationId, envelope, user, expires) {
-				GroupName = groupName;
-				EventStreamId = eventStreamId;
-				Count = count;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ReadNextNPersistentMessagesCompleted : ReadResponseMessage {
-			public readonly Guid CorrelationId;
-			public readonly string Reason;
-			public readonly ReadNextNPersistentMessagesResult Result;
-			public readonly (ResolvedEvent ResolvedEvent, int RetryCount)[] Events;
-
-			public ReadNextNPersistentMessagesCompleted(Guid correlationId, ReadNextNPersistentMessagesResult result,
-				string reason, (ResolvedEvent ResolvedEvent, int RetryCount)[] events) {
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				CorrelationId = correlationId;
-				Result = result;
-				Reason = reason;
-				Events = events;
-			}
-
-			public enum ReadNextNPersistentMessagesResult {
-				Success = 0,
-				DoesNotExist = 1,
-				Fail = 2,
-				AccessDenied = 3
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class DeletePersistentSubscriptionToStream : ReadRequestMessage {
-			public readonly string GroupName;
-			public readonly string EventStreamId;
-
-			public DeletePersistentSubscriptionToStream(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
-				string eventStreamId, string groupName, ClaimsPrincipal user, DateTime? expires = null)
-				: base(internalCorrId, correlationId, envelope, user, expires) {
-				GroupName = groupName;
-				EventStreamId = eventStreamId;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class DeletePersistentSubscriptionToStreamCompleted : ReadResponseMessage {
-			public readonly Guid CorrelationId;
-			public readonly string Reason;
-			public readonly DeletePersistentSubscriptionToStreamResult Result;
-
-			public DeletePersistentSubscriptionToStreamCompleted(Guid correlationId, DeletePersistentSubscriptionToStreamResult result,
-				string reason) {
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				CorrelationId = correlationId;
-				Result = result;
-				Reason = reason;
-			}
-
-			public enum DeletePersistentSubscriptionToStreamResult {
-				Success = 0,
-				DoesNotExist = 1,
-				Fail = 2,
-				AccessDenied = 3
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class DeletePersistentSubscriptionToAll : ReadRequestMessage {
-			public readonly string GroupName;
-
-			public DeletePersistentSubscriptionToAll(Guid internalCorrId, Guid correlationId, IEnvelope envelope
-				, string groupName, ClaimsPrincipal user, DateTime? expires = null)
-				: base(internalCorrId, correlationId, envelope, user, expires) {
-				GroupName = groupName;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class DeletePersistentSubscriptionToAllCompleted : ReadResponseMessage {
-			public readonly Guid CorrelationId;
-			public readonly string Reason;
-			public readonly DeletePersistentSubscriptionToAllResult Result;
-
-			public DeletePersistentSubscriptionToAllCompleted(Guid correlationId, DeletePersistentSubscriptionToAllResult result,
-				string reason) {
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				CorrelationId = correlationId;
-				Result = result;
-				Reason = reason;
-			}
-
-			public enum DeletePersistentSubscriptionToAllResult {
-				Success = 0,
-				DoesNotExist = 1,
-				Fail = 2,
-				AccessDenied = 3
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class PersistentSubscriptionAckEvents : ReadRequestMessage {
-			public readonly string SubscriptionId;
-			public readonly Guid[] ProcessedEventIds;
-
-			public PersistentSubscriptionAckEvents(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
-				string subscriptionId, Guid[] processedEventIds, ClaimsPrincipal user, DateTime? expires = null)
-				: base(internalCorrId, correlationId, envelope, user, expires) {
-				Ensure.NotNullOrEmpty(subscriptionId, "subscriptionId");
-				Ensure.NotNull(processedEventIds, "processedEventIds");
-
-				SubscriptionId = subscriptionId;
-				ProcessedEventIds = processedEventIds;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class PersistentSubscriptionNackEvents : ReadRequestMessage {
-			public readonly string SubscriptionId;
-			public readonly Guid[] ProcessedEventIds;
-			public readonly string Message;
-			public readonly NakAction Action;
-
-			public PersistentSubscriptionNackEvents(Guid internalCorrId,
-				Guid correlationId,
-				IEnvelope envelope,
-				string subscriptionId,
-				string message,
-				NakAction action,
-				Guid[] processedEventIds,
-				ClaimsPrincipal user,
-				DateTime? expires = null)
-				: base(internalCorrId, correlationId, envelope, user, expires) {
-				SubscriptionId = subscriptionId;
-				ProcessedEventIds = processedEventIds;
-				Message = message;
-				Action = action;
-			}
-
-			public enum NakAction {
-				Unknown = 0,
-				Park = 1,
-				Retry = 2,
-				Skip = 3,
-				Stop = 4
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class PersistentSubscriptionNakEvents : ReadRequestMessage {
-			public readonly string SubscriptionId;
-			public readonly Guid[] ProcessedEventIds;
-
-			public PersistentSubscriptionNakEvents(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
-				string subscriptionId, Guid[] processedEventIds, ClaimsPrincipal user, DateTime? expires = null)
-				: base(internalCorrId, correlationId, envelope, user, expires) {
-				Ensure.NotNullOrEmpty(subscriptionId, "subscriptionId");
-				Ensure.NotNull(processedEventIds, "processedEventIds");
-
-				SubscriptionId = subscriptionId;
-				ProcessedEventIds = processedEventIds;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class PersistentSubscriptionConfirmation : Message {
-			public readonly Guid CorrelationId;
-			public readonly long LastIndexedPosition;
-			public readonly long? LastEventNumber;
-			public readonly string SubscriptionId;
-
-			public PersistentSubscriptionConfirmation(string subscriptionId, Guid correlationId,
-				long lastIndexedPosition, long? lastEventNumber) {
-				CorrelationId = correlationId;
-				LastIndexedPosition = lastIndexedPosition;
-				LastEventNumber = lastEventNumber;
-				SubscriptionId = subscriptionId;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ReplayParkedMessages : ReadRequestMessage {
-			public readonly string EventStreamId;
-			public readonly string GroupName;
-			public readonly long? StopAt;
-
-			public ReplayParkedMessages(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
-				string eventStreamId, string groupName, long? stopAt, ClaimsPrincipal user, DateTime? expires = null)
-				: base(internalCorrId, correlationId, envelope, user, expires) {
-				EventStreamId = eventStreamId;
-				GroupName = groupName;
-				StopAt = stopAt;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ReplayParkedMessage : ReadRequestMessage {
-			public readonly string EventStreamId;
-			public readonly string GroupName;
-			public readonly ResolvedEvent Event;
-
-			public ReplayParkedMessage(Guid internalCorrId, Guid correlationId, IEnvelope envelope, string streamId,
-				string groupName, ResolvedEvent @event, ClaimsPrincipal user, DateTime? expires = null)
-				: base(internalCorrId, correlationId, envelope, user, expires) {
-				EventStreamId = streamId;
-				GroupName = groupName;
-				Event = @event;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ReplayMessagesReceived : ReadResponseMessage {
-			public readonly Guid CorrelationId;
-			public readonly string Reason;
-			public readonly ReplayMessagesReceivedResult Result;
-
-			public ReplayMessagesReceived(Guid correlationId, ReplayMessagesReceivedResult result, string reason) {
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				CorrelationId = correlationId;
-				Result = result;
-				Reason = reason;
-			}
-
-			public enum ReplayMessagesReceivedResult {
-				Success = 0,
-				DoesNotExist = 1,
-				Fail = 2,
-				AccessDenied = 3
-			}
-		}
-
-		//End of persistence subscriptions
-
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class SubscribeToStream : ReadRequestMessage {
-			public readonly Guid ConnectionId;
-			public readonly string EventStreamId; // should be empty to subscribe to all
-			public readonly bool ResolveLinkTos;
-
-			public SubscribeToStream(Guid internalCorrId, Guid correlationId, IEnvelope envelope, Guid connectionId,
-				string eventStreamId, bool resolveLinkTos, ClaimsPrincipal user, DateTime? expires = null)
-				: base(internalCorrId, correlationId, envelope, user, expires) {
-				Ensure.NotEmptyGuid(connectionId, "connectionId");
-				ConnectionId = connectionId;
-				EventStreamId = eventStreamId;
-				ResolveLinkTos = resolveLinkTos;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class FilteredSubscribeToStream : ReadRequestMessage {
-			public readonly Guid ConnectionId;
-			public readonly string EventStreamId; // should be empty to subscribe to all
-			public readonly bool ResolveLinkTos;
-			public readonly IEventFilter EventFilter;
-			public readonly int CheckpointInterval;
-			public readonly int CheckpointIntervalCurrent;
-
-			public FilteredSubscribeToStream(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
-				Guid connectionId, string eventStreamId, bool resolveLinkTos, ClaimsPrincipal user,
-				IEventFilter eventFilter, int checkpointInterval, int checkpointIntervalCurrent, DateTime? expires = null)
-				: base(internalCorrId, correlationId, envelope, user, expires) {
-				Ensure.NotEmptyGuid(connectionId, "connectionId");
-				ConnectionId = connectionId;
-				EventStreamId = eventStreamId;
-				ResolveLinkTos = resolveLinkTos;
-				EventFilter = eventFilter;
-				CheckpointInterval = checkpointInterval;
-				CheckpointIntervalCurrent = checkpointIntervalCurrent;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class CheckpointReached : Message {
-			public readonly Guid CorrelationId;
-			public readonly TFPos? Position;
-
-			public CheckpointReached(Guid correlationId, TFPos? position) {
-				CorrelationId = correlationId;
-				Position = position;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class UnsubscribeFromStream : ReadRequestMessage {
-			public UnsubscribeFromStream(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
-				ClaimsPrincipal user, DateTime? expires = null)
-				: base(internalCorrId, correlationId, envelope, user, expires) {
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class SubscriptionConfirmation : Message {
-			public readonly Guid CorrelationId;
-			public readonly long LastIndexedPosition;
-			public readonly long? LastEventNumber;
-
-			public SubscriptionConfirmation(Guid correlationId, long lastIndexedPosition, long? lastEventNumber) {
-				CorrelationId = correlationId;
-				LastIndexedPosition = lastIndexedPosition;
-				LastEventNumber = lastEventNumber;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class StreamEventAppeared : Message {
-			public readonly Guid CorrelationId;
-			public readonly ResolvedEvent Event;
-
-			public StreamEventAppeared(Guid correlationId, ResolvedEvent @event) {
-				CorrelationId = correlationId;
-				Event = @event;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class PersistentSubscriptionStreamEventAppeared : Message {
-			public readonly Guid CorrelationId;
-			public readonly ResolvedEvent Event;
-			public readonly int RetryCount;
-
-			public PersistentSubscriptionStreamEventAppeared(Guid correlationId, ResolvedEvent @event, int retryCount) {
-				CorrelationId = correlationId;
-				Event = @event;
-				RetryCount = retryCount;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class SubscriptionDropped : Message {
-			public readonly Guid CorrelationId;
-			public readonly SubscriptionDropReason Reason;
-
-			public SubscriptionDropped(Guid correlationId, SubscriptionDropReason reason) {
-				CorrelationId = correlationId;
-				Reason = reason;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class MergeIndexes : Message {
-			public readonly IEnvelope Envelope;
-			public readonly Guid CorrelationId;
-			public readonly ClaimsPrincipal User;
-
-			public MergeIndexes(IEnvelope envelope, Guid correlationId, ClaimsPrincipal user) {
-				Ensure.NotNull(envelope, "envelope");
-				Envelope = envelope;
-				CorrelationId = correlationId;
-				User = user;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class MergeIndexesResponse : Message {
-			public readonly Guid CorrelationId;
-			public readonly MergeIndexesResult Result;
-
-			public MergeIndexesResponse(Guid correlationId, MergeIndexesResult result) {
-				CorrelationId = correlationId;
-				Result = result;
-			}
-
-			public override string ToString() {
-				return String.Format("Result: {0}", Result);
-			}
-
-			public enum MergeIndexesResult {
-				Started
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class SetNodePriority : Message	{
-			public readonly int NodePriority;
-
-			public SetNodePriority(int nodePriority) {
-				NodePriority = nodePriority;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ResignNode : Message {
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ScavengeDatabase : Message {
-			public readonly IEnvelope Envelope;
-			public readonly Guid CorrelationId;
-			public readonly ClaimsPrincipal User;
-			public readonly int StartFromChunk;
-			public readonly int Threads;
-			public readonly int? Threshold;
-			public readonly int? ThrottlePercent;
-			public readonly bool SyncOnly;
-
-			public ScavengeDatabase(
-				IEnvelope envelope,
-				Guid correlationId,
-				ClaimsPrincipal user,
-				int startFromChunk,
-				int threads,
-				int? threshold,
-				int? throttlePercent,
-				bool syncOnly) {
-
-				Ensure.NotNull(envelope, "envelope");
-				Envelope = envelope;
-				CorrelationId = correlationId;
-				User = user;
-				StartFromChunk = startFromChunk;
-				Threads = threads;
-				Threshold = threshold;
-				ThrottlePercent = throttlePercent;
-				SyncOnly = syncOnly;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class StopDatabaseScavenge : Message {
-			public readonly IEnvelope Envelope;
-			public readonly Guid CorrelationId;
-			public readonly ClaimsPrincipal User;
-			public readonly string ScavengeId;
-
-			public StopDatabaseScavenge(IEnvelope envelope, Guid correlationId, ClaimsPrincipal user, string scavengeId) {
-				Ensure.NotNull(envelope, "envelope");
-				Envelope = envelope;
-				CorrelationId = correlationId;
-				User = user;
-				ScavengeId = scavengeId;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class GetCurrentDatabaseScavenge : Message {
-			public readonly IEnvelope Envelope;
-			public readonly Guid CorrelationId;
-			public readonly ClaimsPrincipal User;
-
-			public GetCurrentDatabaseScavenge(IEnvelope envelope, Guid correlationId, ClaimsPrincipal user) {
-				Ensure.NotNull(envelope, "envelope");
-				Envelope = envelope;
-				CorrelationId = correlationId;
-				User = user;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ScavengeDatabaseGetCurrentResponse : Message {
-			public readonly Guid CorrelationId;
-			public readonly ScavengeResult Result;
-			public readonly string ScavengeId;
-
-			public ScavengeDatabaseGetCurrentResponse(Guid correlationId,
-				ScavengeResult result, string scavengeId) {
-				CorrelationId = correlationId;
-				Result = result;
-				ScavengeId = scavengeId;
-			}
-
-			public override string ToString() => $"Result: {Result}, ScavengeId: {ScavengeId}";
-			public enum ScavengeResult {
-				InProgress,
-				Stopped
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class GetLastDatabaseScavenge : Message {
-			public readonly IEnvelope Envelope;
-			public readonly Guid CorrelationId;
-			public readonly ClaimsPrincipal User;
-
-			public GetLastDatabaseScavenge(IEnvelope envelope, Guid correlationId, ClaimsPrincipal user) {
-				Ensure.NotNull(envelope, nameof(envelope));
-				Envelope = envelope;
-				CorrelationId = correlationId;
-				User = user;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ScavengeDatabaseGetLastResponse : Message {
-			public readonly Guid CorrelationId;
-			public readonly ScavengeResult Result;
-			public readonly string ScavengeId;
-
-			public ScavengeDatabaseGetLastResponse(
-				Guid correlationId,
-				ScavengeResult result,
-				string scavengeId) {
-				CorrelationId = correlationId;
-				Result = result;
-				ScavengeId = scavengeId;
-			}
-
-			public override string ToString() => $"Result: {Result}, ScavengeId: {ScavengeId}";
-
-			public enum ScavengeResult {
-				Unknown,
-				InProgress,
-				Success,
-				Stopped,
-				Errored,
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ScavengeDatabaseStartedResponse : Message {
-			public readonly Guid CorrelationId;
-			public readonly string ScavengeId;
-
-			public ScavengeDatabaseStartedResponse(Guid correlationId, string scavengeId) {
-				CorrelationId = correlationId;
-				ScavengeId = scavengeId;
-			}
-			public override string ToString() => $"ScavengeId: {ScavengeId}";
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ScavengeDatabaseInProgressResponse : Message {
-			public readonly Guid CorrelationId;
-			public readonly string ScavengeId;
-			public readonly string Reason;
-
-			public ScavengeDatabaseInProgressResponse(Guid correlationId, string scavengeId, string reason) {
-				CorrelationId = correlationId;
-				ScavengeId = scavengeId;
-				Reason = reason;
-			}
-
-			public override string ToString() => $"ScavengeId: {ScavengeId}, Reason: {Reason}";
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ScavengeDatabaseStoppedResponse : Message {
-			public readonly Guid CorrelationId;
-			public readonly string ScavengeId;
-
-			public ScavengeDatabaseStoppedResponse(Guid correlationId, string scavengeId) {
-				CorrelationId = correlationId;
-				ScavengeId = scavengeId;
-			}
-
-			public override string ToString() => $"ScavengeId: {ScavengeId}";
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ScavengeDatabaseNotFoundResponse : Message {
-			public readonly Guid CorrelationId;
-			public readonly string ScavengeId;
-			public readonly string Reason;
-
-			public ScavengeDatabaseNotFoundResponse(Guid correlationId, string scavengeId, string reason) {
-				CorrelationId = correlationId;
-				ScavengeId = scavengeId;
-				Reason = reason;
-			}
-
-			public override string ToString() => $"ScavengeId: {ScavengeId}, Reason: {Reason}";
-
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ScavengeDatabaseUnauthorizedResponse : Message {
-			public readonly Guid CorrelationId;
-			public readonly string ScavengeId;
-			public readonly string Reason;
-
-			public ScavengeDatabaseUnauthorizedResponse(Guid correlationId, string scavengeId, string reason) {
-				CorrelationId = correlationId;
-				ScavengeId = scavengeId;
-				Reason = reason;
-			}
-			public override string ToString() => $"ScavengeId: {ScavengeId}, Reason: {Reason}";
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class IdentifyClient : Message {
-			public readonly Guid CorrelationId;
-			public readonly int Version;
-			public readonly string ConnectionName;
-
-			public IdentifyClient(Guid correlationId,
-				int version,
-				string connectionName) {
-				CorrelationId = correlationId;
-				Version = version;
-				ConnectionName = connectionName;
-			}
-
-			public override string ToString() {
-				return String.Format("Version: {0}, Connection Name: {1}", Version, ConnectionName);
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Client)]
-		public partial class ClientIdentified : Message {
-			public readonly Guid CorrelationId;
-
-			public ClientIdentified(Guid correlationId) {
-				CorrelationId = correlationId;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/ClusterClientMessage.cs b/src/EventStore.Core/Messages/ClusterClientMessage.cs
deleted file mode 100644
index 6f2b2869ff1..00000000000
--- a/src/EventStore.Core/Messages/ClusterClientMessage.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Messages {
-	public static partial class ClusterClientMessage {
-		[DerivedMessage(CoreMessage.ClusterClient)]
-		public partial class CleanCache : Message {
-			public CleanCache() { }
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/ClusterInfoDto.cs b/src/EventStore.Core/Messages/ClusterInfoDto.cs
deleted file mode 100644
index 4ac19bb3d54..00000000000
--- a/src/EventStore.Core/Messages/ClusterInfoDto.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Linq;
-using System.Net;
-using EventStore.Common.Utils;
-using EventStore.Core.Cluster;
-
-namespace EventStore.Core.Messages {
-	public class ClusterInfoDto {
-		public MemberInfoDto[] Members { get; set; }
-		public string ServerIp { get; set; }
-		public int ServerPort { get; set; }
-
-		public ClusterInfoDto() {
-		}
-
-		public ClusterInfoDto(ClusterInfo clusterInfo, EndPoint serverEndPoint) {
-			Members = clusterInfo.Members.Select(x => new MemberInfoDto(x)).ToArray();
-			ServerIp = serverEndPoint.GetHost();
-			ServerPort = serverEndPoint.GetPort();
-		}
-
-		public override string ToString() {
-			return string.Format("Server: {0}:{1}, Members: [{2}]",
-				ServerIp, ServerPort,
-				Members != null ? string.Join(",", Members.Select(m => m.ToString())) : "null");
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/ElectionMessage.cs b/src/EventStore.Core/Messages/ElectionMessage.cs
deleted file mode 100644
index 0c6c77c3163..00000000000
--- a/src/EventStore.Core/Messages/ElectionMessage.cs
+++ /dev/null
@@ -1,347 +0,0 @@
-using System;
-using System.Net;
-using EventStore.Common.Utils;
-using EventStore.Core.Cluster;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Messages {
-	public static partial class ElectionMessage {
-		[DerivedMessage(CoreMessage.Election)]
-		public partial class StartElections : Message {
-			public override string ToString() {
-				return "---- StartElections";
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Election)]
-		public partial class ViewChange : Message {
-			public readonly Guid ServerId;
-			public readonly EndPoint ServerHttpEndPoint;
-
-			public readonly int AttemptedView;
-
-			public ViewChange(Guid serverId,
-				EndPoint serverHttpEndPoint,
-				int attemptedView) {
-				ServerId = serverId;
-				ServerHttpEndPoint = serverHttpEndPoint;
-
-				AttemptedView = attemptedView;
-			}
-
-			public ViewChange(ElectionMessageDto.ViewChangeDto dto) {
-				AttemptedView = dto.AttemptedView;
-				ServerId = dto.ServerId;
-				ServerHttpEndPoint = new IPEndPoint(IPAddress.Parse(dto.ServerHttpAddress),
-					dto.ServerHttpPort);
-			}
-
-			public override string ToString() {
-				return string.Format("---- ViewChange: attemptedView {0}, serverId {1}, serverHttp {2}",
-					AttemptedView, ServerId, ServerHttpEndPoint);
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Election)]
-		public partial class ViewChangeProof : Message {
-			public readonly Guid ServerId;
-			public readonly EndPoint ServerHttpEndPoint;
-			public readonly int InstalledView;
-
-			public ViewChangeProof(Guid serverId, EndPoint serverHttpEndPoint, int installedView) {
-				ServerId = serverId;
-				ServerHttpEndPoint = serverHttpEndPoint;
-				InstalledView = installedView;
-			}
-
-			public ViewChangeProof(ElectionMessageDto.ViewChangeProofDto dto) {
-				ServerId = dto.ServerId;
-				ServerHttpEndPoint = new IPEndPoint(IPAddress.Parse(dto.ServerHttpAddress),
-					dto.ServerHttpPort);
-				InstalledView = dto.InstalledView;
-			}
-
-			public override string ToString() {
-				return string.Format("---- ViewChangeProof: serverId {0}, serverHttp {1}, installedView {2}",
-					ServerId, ServerHttpEndPoint, InstalledView);
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Election)]
-		public partial class SendViewChangeProof : Message {
-			public override string ToString() {
-				return string.Format("---- SendViewChangeProof");
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Election)]
-		public partial class ElectionsTimedOut : Message {
-			public readonly int View;
-
-			public ElectionsTimedOut(int view) {
-				View = view;
-			}
-
-			public override string ToString() {
-				return string.Format("---- ElectionsTimedOut: view {0}", View);
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Election)]
-		public partial class Prepare : Message {
-			public readonly Guid ServerId;
-			public readonly EndPoint ServerHttpEndPoint;
-			public readonly int View;
-
-			public Prepare(Guid serverId, EndPoint serverHttpEndPoint, int view) {
-				ServerId = serverId;
-				ServerHttpEndPoint = serverHttpEndPoint;
-				View = view;
-			}
-
-			public Prepare(ElectionMessageDto.PrepareDto dto) {
-				ServerId = dto.ServerId;
-				ServerHttpEndPoint = new IPEndPoint(IPAddress.Parse(dto.ServerHttpAddress),
-					dto.ServerHttpPort);
-				View = dto.View;
-			}
-
-			public override string ToString() {
-				return string.Format("---- Prepare: serverId {0}, serverHttp {1}, view {2}", ServerId,
-					ServerHttpEndPoint, View);
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Election)]
-		public partial class PrepareOk : Message {
-			public readonly int View;
-			public readonly Guid ServerId;
-			public readonly EndPoint ServerHttpEndPoint;
-			public readonly int EpochNumber;
-			public readonly long EpochPosition;
-			public readonly Guid EpochId;
-			public readonly Guid EpochLeaderInstanceId;
-			public readonly long LastCommitPosition;
-			public readonly long WriterCheckpoint;
-			public readonly long ChaserCheckpoint;
-			public readonly int NodePriority;
-			public readonly ClusterInfo ClusterInfo;
-
-			public PrepareOk(int view,
-				Guid serverId,
-				EndPoint serverHttpEndPoint,
-				int epochNumber,
-				long epochPosition,
-				Guid epochId,
-				Guid epochLeaderInstanceId,
-				long lastCommitPosition,
-				long writerCheckpoint,
-				long chaserCheckpoint,
-				int nodePriority,
-				ClusterInfo clusterInfo) {
-				View = view;
-				ServerId = serverId;
-				ServerHttpEndPoint = serverHttpEndPoint;
-				EpochNumber = epochNumber;
-				EpochPosition = epochPosition;
-				EpochId = epochId;
-				EpochLeaderInstanceId = epochLeaderInstanceId;
-				LastCommitPosition = lastCommitPosition;
-				WriterCheckpoint = writerCheckpoint;
-				ChaserCheckpoint = chaserCheckpoint;
-				NodePriority = nodePriority;
-				ClusterInfo = clusterInfo;
-			}
-
-			public PrepareOk(ElectionMessageDto.PrepareOkDto dto) {
-				View = dto.View;
-				ServerId = dto.ServerId;
-				ServerHttpEndPoint = new IPEndPoint(IPAddress.Parse(dto.ServerHttpAddress),
-					dto.ServerHttpPort);
-				EpochNumber = dto.EpochNumber;
-				EpochPosition = dto.EpochPosition;
-				EpochId = dto.EpochId;
-				EpochLeaderInstanceId = dto.EpochLeaderInstanceId;
-				LastCommitPosition = dto.LastCommitPosition;
-				WriterCheckpoint = dto.WriterCheckpoint;
-				ChaserCheckpoint = dto.ChaserCheckpoint;
-				NodePriority = dto.NodePriority;
-				ClusterInfo = dto.ClusterInfo;
-			}
-
-			public override string ToString() {
-				return string.Format(
-					"---- PrepareOk: view {0}, serverId {1}, serverHttp {2}, epochNumber {3}, " +
-					"epochPosition {4}, epochId {5}, epochLeaderInstanceId {6:B}, lastCommitPosition {7}, writerCheckpoint {8}, chaserCheckpoint {9}, nodePriority: {10}, clusterInfo: {11}",
-					View, ServerId, ServerHttpEndPoint, EpochNumber,
-					EpochPosition, EpochId, EpochLeaderInstanceId, LastCommitPosition, WriterCheckpoint, ChaserCheckpoint, NodePriority, ClusterInfo);
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Election)]
-		public partial class Proposal : Message {
-			public readonly Guid ServerId;
-			public readonly EndPoint ServerHttpEndPoint;
-			public readonly Guid LeaderId;
-			public readonly EndPoint LeaderHttpEndPoint;
-
-			public readonly int View;
-			public readonly int EpochNumber;
-			public readonly long EpochPosition;
-			public readonly Guid EpochId;
-			public readonly Guid EpochLeaderInstanceId;
-			public readonly long LastCommitPosition;
-			public readonly long WriterCheckpoint;
-			public readonly long ChaserCheckpoint;
-			public readonly int NodePriority;
-
-			public Proposal(Guid serverId, EndPoint serverHttpEndPoint, Guid leaderId, EndPoint leaderHttpEndPoint,
-				int view, int epochNumber, long epochPosition, Guid epochId, Guid epochLeaderInstanceId,
-				long lastCommitPosition, long writerCheckpoint, long chaserCheckpoint, int nodePriority) {
-				ServerId = serverId;
-				ServerHttpEndPoint = serverHttpEndPoint;
-				LeaderId = leaderId;
-				LeaderHttpEndPoint = leaderHttpEndPoint;
-				View = view;
-				EpochNumber = epochNumber;
-				EpochPosition = epochPosition;
-				EpochId = epochId;
-				EpochLeaderInstanceId = epochLeaderInstanceId;
-				LastCommitPosition = lastCommitPosition;
-				WriterCheckpoint = writerCheckpoint;
-				ChaserCheckpoint = chaserCheckpoint;
-				NodePriority = nodePriority;
-			}
-
-			public Proposal(ElectionMessageDto.ProposalDto dto) {
-				ServerId = dto.ServerId;
-				ServerHttpEndPoint = new IPEndPoint(IPAddress.Parse(dto.ServerHttpAddress),
-					dto.ServerHttpPort);
-				LeaderId = dto.LeaderId;
-				LeaderHttpEndPoint = new IPEndPoint(IPAddress.Parse(dto.LeaderHttpAddress),
-					dto.LeaderHttpPort);
-				View = dto.View;
-				EpochNumber = dto.EpochNumber;
-				EpochPosition = dto.EpochPosition;
-				EpochId = dto.EpochId;
-				EpochLeaderInstanceId = dto.EpochLeaderInstanceId;
-				LastCommitPosition = dto.LastCommitPosition;
-				WriterCheckpoint = dto.WriterCheckpoint;
-				ChaserCheckpoint = dto.ChaserCheckpoint;
-				NodePriority = dto.NodePriority;
-			}
-
-			public override string ToString() {
-				return string.Format(
-					"---- Proposal: serverId {0}, serverHttp {1}, leaderId {2}, leaderHttp {3}, "
-					+ "view {4}, lastCommitCheckpoint {5}, writerCheckpoint {6}, chaserCheckpoint {7}, epoch {8}@{9}:{10:B} (L={11:B}), NodePriority {12}",
-					ServerId, ServerHttpEndPoint, LeaderId, LeaderHttpEndPoint,
-					View, LastCommitPosition, WriterCheckpoint, ChaserCheckpoint,
-					EpochNumber, EpochPosition, EpochId, EpochLeaderInstanceId, NodePriority);
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Election)]
-		public partial class Accept : Message {
-			public readonly Guid ServerId;
-			public readonly EndPoint ServerHttpEndPoint;
-			public readonly Guid LeaderId;
-			public readonly EndPoint LeaderHttpEndPoint;
-			public readonly int View;
-
-			public Accept(Guid serverId, EndPoint serverHttpEndPoint, Guid leaderId, EndPoint leaderHttpEndPoint,
-				int view) {
-				ServerId = serverId;
-				ServerHttpEndPoint = serverHttpEndPoint;
-				LeaderId = leaderId;
-				LeaderHttpEndPoint = leaderHttpEndPoint;
-
-				View = view;
-			}
-
-			public Accept(ElectionMessageDto.AcceptDto dto) {
-				ServerId = dto.ServerId;
-				ServerHttpEndPoint = new IPEndPoint(IPAddress.Parse(dto.ServerHttpAddress),
-					dto.ServerHttpPort);
-				LeaderId = dto.LeaderId;
-				LeaderHttpEndPoint = new IPEndPoint(IPAddress.Parse(dto.LeaderHttpAddress),
-					dto.LeaderHttpPort);
-				View = dto.View;
-			}
-
-			public override string ToString() {
-				return string.Format(
-					"---- Accept: serverId {0}, serverHttp {1}, leaderId {2}, leaderHttp {3}, view {4}",
-					ServerId, ServerHttpEndPoint, LeaderId, LeaderHttpEndPoint, View);
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Election)]
-		public partial class LeaderIsResigning : Message {
-			public readonly Guid LeaderId;
-			public readonly EndPoint LeaderHttpEndPoint;
-
-			public LeaderIsResigning(Guid leaderId, EndPoint leaderHttpEndPoint) {
-				LeaderId = leaderId;
-				LeaderHttpEndPoint = leaderHttpEndPoint;
-			}
-
-			public LeaderIsResigning(ElectionMessageDto.LeaderIsResigningDto dto) {
-				LeaderId = dto.LeaderId;
-				LeaderHttpEndPoint = new IPEndPoint(IPAddress.Parse(dto.LeaderHttpAddress),
-					dto.LeaderHttpPort);
-			}
-
-			public override string ToString() {
-				return $"---- LeaderIsResigning: serverId {LeaderId}";
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Election)]
-		public partial class LeaderIsResigningOk : Message {
-			public readonly Guid LeaderId;
-			public readonly EndPoint LeaderHttpEndPoint;
-			public readonly Guid ServerId;
-			public readonly EndPoint ServerHttpEndPoint;
-
-			public LeaderIsResigningOk(ElectionMessageDto.LeaderIsResigningOkDto dto) {
-				LeaderId = dto.LeaderId;
-				LeaderHttpEndPoint = new IPEndPoint(IPAddress.Parse(dto.LeaderHttpAddress),
-					dto.LeaderHttpPort);
-				ServerId = dto.ServerId;
-				ServerHttpEndPoint = new IPEndPoint(IPAddress.Parse(dto.ServerHttpAddress),
-					dto.ServerHttpPort);
-			}
-
-			public LeaderIsResigningOk(Guid leaderId, EndPoint leaderHttpEndPoint, Guid serverId, EndPoint serverHttpEndPoint) {
-				LeaderId = leaderId;
-				LeaderHttpEndPoint = leaderHttpEndPoint;
-				ServerId = serverId;
-				ServerHttpEndPoint = serverHttpEndPoint;
-			}
-
-			public override string ToString() {
-				return $"---- LeaderIsResigningOk: serverId {ServerId}";
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Election)]
-		public partial class ElectionsDone : Message {
-			public readonly int InstalledView;
-			public readonly int ProposalNumber;
-			public readonly MemberInfo Leader;
-
-			public ElectionsDone(int installedView, int proposalNumber, MemberInfo leader) {
-				Ensure.Nonnegative(installedView, "installedView");
-				Ensure.NotNull(leader, "leader");
-				InstalledView = installedView;
-				Leader = leader;
-				ProposalNumber = proposalNumber;
-			}
-
-			public override string ToString() {
-				return $"---- ElectionsDone: installedView {InstalledView}, proposal number {ProposalNumber}, leader {Leader}";
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/ElectionMessageDtos.cs b/src/EventStore.Core/Messages/ElectionMessageDtos.cs
deleted file mode 100644
index 56b20784cff..00000000000
--- a/src/EventStore.Core/Messages/ElectionMessageDtos.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Cluster;
-
-namespace EventStore.Core.Messages {
-	public static class ElectionMessageDto {
-		public class ViewChangeDto {
-			public Guid ServerId { get; set; }
-			public string ServerHttpAddress { get; set; }
-			public int ServerHttpPort { get; set; }
-
-			public int AttemptedView { get; set; }
-
-			public ViewChangeDto() {
-			}
-
-			public ViewChangeDto(ElectionMessage.ViewChange message) {
-				ServerId = message.ServerId;
-				ServerHttpAddress = message.ServerHttpEndPoint.GetHost();
-				ServerHttpPort = message.ServerHttpEndPoint.GetPort();
-
-				AttemptedView = message.AttemptedView;
-			}
-		}
-
-		public class ViewChangeProofDto {
-			public Guid ServerId { get; set; }
-			public string ServerHttpAddress { get; set; }
-			public int ServerHttpPort { get; set; }
-
-			public int InstalledView { get; set; }
-
-			public ViewChangeProofDto() {
-			}
-
-			public ViewChangeProofDto(ElectionMessage.ViewChangeProof message) {
-				ServerId = message.ServerId;
-				ServerHttpAddress = message.ServerHttpEndPoint.GetHost();
-				ServerHttpPort = message.ServerHttpEndPoint.GetPort();
-
-				InstalledView = message.InstalledView;
-			}
-		}
-
-		public class PrepareDto {
-			public Guid ServerId { get; set; }
-			public string ServerHttpAddress { get; set; }
-			public int ServerHttpPort { get; set; }
-
-			public int View { get; set; }
-
-			public PrepareDto() {
-			}
-
-			public PrepareDto(ElectionMessage.Prepare message) {
-				ServerId = message.ServerId;
-				ServerHttpAddress = message.ServerHttpEndPoint.GetHost();
-				ServerHttpPort = message.ServerHttpEndPoint.GetPort();
-
-				View = message.View;
-			}
-		}
-
-		public class PrepareOkDto {
-			public Guid ServerId { get; set; }
-			public string ServerHttpAddress { get; set; }
-			public int ServerHttpPort { get; set; }
-
-			public int View { get; set; }
-
-			public int EpochNumber { get; set; }
-			public long EpochPosition { get; set; }
-			public Guid EpochId { get; set; }
-			public Guid EpochLeaderInstanceId { get; set; }
-			public long LastCommitPosition { get; set; }
-			public long WriterCheckpoint { get; set; }
-			public long ChaserCheckpoint { get; set; }
-
-			public int NodePriority { get; set; }
-			public ClusterInfo ClusterInfo { get; set; }
-
-			public PrepareOkDto() {
-			}
-
-			public PrepareOkDto(ElectionMessage.PrepareOk message) {
-				ServerId = message.ServerId;
-				ServerHttpAddress = message.ServerHttpEndPoint.GetHost();
-				ServerHttpPort = message.ServerHttpEndPoint.GetPort();
-
-				View = message.View;
-
-				EpochNumber = message.EpochNumber;
-				EpochPosition = message.EpochPosition;
-				EpochId = message.EpochId;
-				EpochLeaderInstanceId = message.EpochLeaderInstanceId;
-				LastCommitPosition = message.LastCommitPosition;
-				WriterCheckpoint = message.WriterCheckpoint;
-				ChaserCheckpoint = message.ChaserCheckpoint;
-
-				NodePriority = message.NodePriority;
-				ClusterInfo = message.ClusterInfo;
-			}
-		}
-
-
-		public class ProposalDto {
-			public Guid ServerId { get; set; }
-			public Guid LeaderId { get; set; }
-
-			public string ServerHttpAddress { get; set; }
-			public int ServerHttpPort { get; set; }
-			public string LeaderHttpAddress { get; set; }
-			public int LeaderHttpPort { get; set; }
-
-			public int View { get; set; }
-
-			public long LastCommitPosition { get; set; }
-			public long WriterCheckpoint { get; set; }
-			public long ChaserCheckpoint { get; set; }
-			public int EpochNumber { get; set; }
-			public long EpochPosition { get; set; }
-			public Guid EpochId { get; set; }
-			public Guid EpochLeaderInstanceId { get; set; }
-			public int NodePriority { get; set; }
-
-			public ProposalDto() {
-			}
-
-			public ProposalDto(ElectionMessage.Proposal message) {
-				ServerId = message.ServerId;
-				LeaderId = message.LeaderId;
-
-				ServerHttpAddress = message.ServerHttpEndPoint.GetHost();
-				ServerHttpPort = message.ServerHttpEndPoint.GetPort();
-				LeaderHttpAddress = message.LeaderHttpEndPoint.GetHost();
-				LeaderHttpPort = message.LeaderHttpEndPoint.GetPort();
-
-				View = message.View;
-				EpochNumber = message.EpochNumber;
-				EpochPosition = message.EpochPosition;
-				EpochId = message.EpochId;
-				EpochLeaderInstanceId = message.EpochLeaderInstanceId;
-				LastCommitPosition = message.LastCommitPosition;
-				WriterCheckpoint = message.WriterCheckpoint;
-				ChaserCheckpoint = message.ChaserCheckpoint;
-				NodePriority = message.NodePriority;
-			}
-		}
-
-
-		public class AcceptDto {
-			public Guid ServerId { get; set; }
-			public Guid LeaderId { get; set; }
-
-			public string ServerHttpAddress { get; set; }
-			public int ServerHttpPort { get; set; }
-			public string LeaderHttpAddress { get; set; }
-			public int LeaderHttpPort { get; set; }
-
-			public int View { get; set; }
-
-			public AcceptDto() {
-			}
-
-			public AcceptDto(ElectionMessage.Accept message) {
-				ServerId = message.ServerId;
-				LeaderId = message.LeaderId;
-
-				ServerHttpAddress = message.ServerHttpEndPoint.GetHost();
-				ServerHttpPort = message.ServerHttpEndPoint.GetPort();
-				LeaderHttpAddress = message.LeaderHttpEndPoint.GetHost();
-				LeaderHttpPort = message.LeaderHttpEndPoint.GetPort();
-
-				View = message.View;
-			}
-		}
-		
-		public class LeaderIsResigningDto {
-			public Guid LeaderId { get; set; }
-			public string LeaderHttpAddress { get; set; }
-			public int LeaderHttpPort { get; set; }
-			public LeaderIsResigningDto() {
-			}
-
-			public LeaderIsResigningDto(ElectionMessage.LeaderIsResigning message) {
-				LeaderId = message.LeaderId;
-				LeaderHttpAddress = message.LeaderHttpEndPoint.GetHost();
-				LeaderHttpPort = message.LeaderHttpEndPoint.GetPort();
-			}
-		}
-		
-		public class LeaderIsResigningOkDto {
-			public Guid LeaderId { get; set; }
-			public string LeaderHttpAddress { get; set; }
-			public int LeaderHttpPort { get; set; }
-			public Guid ServerId { get; set; }
-			public string ServerHttpAddress { get; set; }
-			public int ServerHttpPort { get; set; }
-			public LeaderIsResigningOkDto() {
-			}
-
-			public LeaderIsResigningOkDto(ElectionMessage.LeaderIsResigningOk message) {
-				ServerId = message.ServerId;
-				ServerHttpAddress = message.ServerHttpEndPoint.GetHost();
-				ServerHttpPort = message.ServerHttpEndPoint.GetPort();
-				LeaderId = message.LeaderId;
-				LeaderHttpAddress = message.LeaderHttpEndPoint.GetHost();
-				LeaderHttpPort = message.LeaderHttpEndPoint.GetPort();
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/GossipMessage.cs b/src/EventStore.Core/Messages/GossipMessage.cs
deleted file mode 100644
index 9e2e64e2266..00000000000
--- a/src/EventStore.Core/Messages/GossipMessage.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-using System;
-using System.Net;
-using EventStore.Core.Cluster;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Messages {
-	public static partial class GossipMessage {
-		[DerivedMessage(CoreMessage.Gossip)]
-		public partial class RetrieveGossipSeedSources : Message {
-		}
-
-		[DerivedMessage(CoreMessage.Gossip)]
-		public partial class GotGossipSeedSources : Message {
-			public readonly EndPoint[] GossipSeeds;
-
-			public GotGossipSeedSources(EndPoint[] gossipSeeds) {
-				GossipSeeds = gossipSeeds;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Gossip)]
-		public partial class Gossip : Message {
-			public readonly int GossipRound;
-
-			public Gossip(int gossipRound) {
-				GossipRound = gossipRound;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Gossip)]
-		public partial class GossipReceived : Message {
-			public readonly IEnvelope Envelope;
-			public readonly ClusterInfo ClusterInfo;
-			public readonly EndPoint Server;
-
-			public GossipReceived(IEnvelope envelope, ClusterInfo clusterInfo, EndPoint server) {
-				Envelope = envelope;
-				ClusterInfo = clusterInfo;
-				Server = server;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Gossip)]
-		public partial class ReadGossip : Message {
-			public readonly IEnvelope Envelope;
-
-			public ReadGossip(IEnvelope envelope) {
-				Envelope = envelope;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Gossip)]
-		public partial class SendGossip : Message {
-			public readonly ClusterInfo ClusterInfo;
-			public readonly EndPoint ServerEndPoint;
-
-			public SendGossip(ClusterInfo clusterInfo, EndPoint serverEndPoint) {
-				ClusterInfo = clusterInfo;
-				ServerEndPoint = serverEndPoint;
-			}
-		}
-		
-		[DerivedMessage(CoreMessage.Gossip)]
-		public partial class ClientGossip : Message {
-			public readonly IEnvelope Envelope;
-
-			public ClientGossip(IEnvelope envelope) {
-				Envelope = envelope;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Gossip)]
-		public partial class SendClientGossip : Message {
-			public readonly ClientClusterInfo ClusterInfo;
-
-			public SendClientGossip(ClientClusterInfo clusterInfo) {
-				ClusterInfo = clusterInfo;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Gossip)]
-		public partial class GossipUpdated : Message {
-			public readonly ClusterInfo ClusterInfo;
-
-			public GossipUpdated(ClusterInfo clusterInfo) {
-				ClusterInfo = clusterInfo;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Gossip)]
-		public partial class GossipSendFailed : Message {
-			public readonly string Reason;
-			public readonly EndPoint Recipient;
-
-			public GossipSendFailed(string reason, EndPoint recipient) {
-				Reason = reason;
-				Recipient = recipient;
-			}
-
-			public override string ToString() {
-				return String.Format("Reason: {0}, Recipient: {1}", Reason, Recipient);
-			}
-		}
-		
-		[DerivedMessage(CoreMessage.Gossip)]
-		public partial class GetGossip : Message {
-			public GetGossip() { }
-		}
-		
-		[DerivedMessage(CoreMessage.Gossip)]
-		public partial class GetGossipFailed : Message {
-			public readonly string Reason;
-			public readonly EndPoint Recipient;
-
-			public GetGossipFailed(string reason, EndPoint recipient) {
-				Reason = reason;
-				Recipient = recipient;
-			}
-
-			public override string ToString() {
-				return String.Format("Reason: {0}, Recipient: {1}", Reason, Recipient);
-			}
-		}
-		
-		[DerivedMessage(CoreMessage.Gossip)]
-		public partial class GetGossipReceived : Message {
-			public readonly ClusterInfo ClusterInfo;
-			public readonly EndPoint Server;
-
-			public GetGossipReceived(ClusterInfo clusterInfo, EndPoint server) {
-				ClusterInfo = clusterInfo;
-				Server = server;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Gossip)]
-		public partial class UpdateNodePriority : Message {
-			public readonly int NodePriority;
-
-			public UpdateNodePriority(int priority) {
-				NodePriority = priority;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/GrpcMessage.cs b/src/EventStore.Core/Messages/GrpcMessage.cs
deleted file mode 100644
index e6ea29032a8..00000000000
--- a/src/EventStore.Core/Messages/GrpcMessage.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Net;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Messages {
-	public static partial class GrpcMessage {
-		[DerivedMessage(CoreMessage.Grpc)]
-		public partial class SendOverGrpc : Message {
-
-			public readonly EndPoint DestinationEndpoint;
-			public readonly Message Message;
-			public readonly DateTime LiveUntil;
-
-			public SendOverGrpc(EndPoint destinationEndpoint, Message message, DateTime liveUntil) {
-				DestinationEndpoint = destinationEndpoint;
-				Message = message;
-				LiveUntil = liveUntil;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/HttpClientMessageDto.cs b/src/EventStore.Core/Messages/HttpClientMessageDto.cs
deleted file mode 100644
index be4172433c8..00000000000
--- a/src/EventStore.Core/Messages/HttpClientMessageDto.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using System;
-using System.Text;
-using System.Xml.Serialization;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.Messages {
-	public static class HttpClientMessageDto {
-		public class ClientEventDynamic {
-			public Guid eventId { get; set; }
-			public string eventType { get; set; }
-
-			public object data { get; set; }
-			public object metadata { get; set; }
-		}
-
-		public class WriteEventsDynamic {
-			public ClientEventDynamic[] events { get; set; }
-
-			public WriteEventsDynamic() {
-			}
-
-			public WriteEventsDynamic(ClientEventDynamic[] events) {
-				this.events = events;
-			}
-		}
-
-		[XmlType(TypeName = "event")]
-		public class ClientEventText {
-			public Guid eventId { get; set; }
-			public string eventType { get; set; }
-
-			public string data { get; set; }
-			public string metadata { get; set; }
-
-			public ClientEventText() {
-			}
-
-			public ClientEventText(Guid eventId, string eventType, string data, string metadata) {
-				Ensure.NotEmptyGuid(eventId, "eventId");
-				Ensure.NotNull(data, "data");
-
-				this.eventId = eventId;
-				this.eventType = eventType;
-
-				this.data = data;
-				this.metadata = metadata;
-			}
-
-			public ClientEventText(Guid eventId, string eventType, ReadOnlyMemory<byte> data, ReadOnlyMemory<byte> metadata) {
-				Ensure.NotEmptyGuid(eventId, "eventId");
-
-				this.eventId = eventId;
-				this.eventType = eventType;
-
-				this.data = Helper.UTF8NoBom.GetString(data.Span);
-				this.metadata = Helper.UTF8NoBom.GetString(metadata.Span);
-			}
-		}
-
-		[XmlRoot(ElementName = "event")]
-		public class ReadEventCompletedText {
-			public string eventStreamId { get; set; }
-			public long eventNumber { get; set; }
-			public string eventType { get; set; }
-			public string eventId { get; set; }
-			public object data { get; set; }
-			public object metadata { get; set; }
-
-			public ReadEventCompletedText() {
-			}
-
-			public ReadEventCompletedText(ResolvedEvent evnt) {
-				if (evnt.Event != null) {
-					eventStreamId = evnt.Event.EventStreamId;
-					eventNumber = evnt.Event.EventNumber;
-					eventType = evnt.Event.EventType;
-					eventId = evnt.Event.EventId.ToString();
-					data = Helper.UTF8NoBom.GetString(evnt.Event.Data.Span);
-					metadata = Helper.UTF8NoBom.GetString(evnt.Event.Metadata.Span);
-				} else {
-					eventStreamId = null;
-					eventNumber = EventNumber.Invalid;
-					eventType = null;
-					data = null;
-					metadata = null;
-				}
-			}
-
-			public override string ToString() {
-				return string.Format(
-					"id: {5} eventStreamId: {0}, eventNumber: {1}, eventType: {2}, data: {3}, metadata: {4}",
-					eventStreamId,
-					eventNumber,
-					eventType,
-					data,
-					metadata,
-					eventId);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/HttpMessage.cs b/src/EventStore.Core/Messages/HttpMessage.cs
deleted file mode 100644
index db3061a8abd..00000000000
--- a/src/EventStore.Core/Messages/HttpMessage.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Transport.Http;
-using EventStore.Transport.Http.EntityManagement;
-
-namespace EventStore.Core.Messages {
-	public enum DenialReason {
-		ServerTooBusy
-	}
-
-	public static partial class HttpMessage {
-		[DerivedMessage]
-		public abstract partial class HttpSendMessage : Message, IQueueAffineMessage {
-			public int QueueId {
-				get { return HttpEntityManager.GetHashCode(); }
-			}
-
-			public readonly IEnvelope Envelope;
-			public readonly Guid CorrelationId;
-			public readonly HttpEntityManager HttpEntityManager;
-
-			/// <param name="correlationId"></param>
-			/// <param name="envelope">non-null envelope requests HttpCompleted messages in response</param>
-			/// <param name="httpEntityManager"></param>
-			protected HttpSendMessage(Guid correlationId, IEnvelope envelope, HttpEntityManager httpEntityManager) {
-				CorrelationId = correlationId;
-				Envelope = envelope;
-				HttpEntityManager = httpEntityManager;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Http)]
-		public partial class HttpSend : HttpSendMessage {
-			public readonly object Data;
-			public readonly ResponseConfiguration Configuration;
-			public readonly Message Message;
-
-			public HttpSend(
-				HttpEntityManager httpEntityManager, ResponseConfiguration configuration, object data, Message message)
-				: base(Guid.Empty, null, httpEntityManager) {
-				Data = data;
-				Configuration = configuration;
-				Message = message;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Http)]
-		public partial class DeniedToHandle : Message {
-			public readonly DenialReason Reason;
-			public readonly string Details;
-
-			public DeniedToHandle(DenialReason reason, string details) {
-				Reason = reason;
-				Details = details;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Http)]
-		public partial class PurgeTimedOutRequests : Message {
-		}
-
-		[DerivedMessage(CoreMessage.Http)]
-		public partial class TextMessage : Message {
-			public string Text { get; set; }
-
-			public TextMessage() {
-			}
-
-			public TextMessage(string text) {
-				Text = text;
-			}
-
-			public override string ToString() {
-				return string.Format("Text: {0}", Text);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/IQueueAffineMessage.cs b/src/EventStore.Core/Messages/IQueueAffineMessage.cs
deleted file mode 100644
index d15fc19cee6..00000000000
--- a/src/EventStore.Core/Messages/IQueueAffineMessage.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace EventStore.Core.Messages {
-	public interface IQueueAffineMessage {
-		int QueueId { get; }
-	}
-}
diff --git a/src/EventStore.Core/Messages/InternalAuthenticationProviderMessages.cs b/src/EventStore.Core/Messages/InternalAuthenticationProviderMessages.cs
deleted file mode 100644
index 7b1ff2cbcb3..00000000000
--- a/src/EventStore.Core/Messages/InternalAuthenticationProviderMessages.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Messages {
-	public static partial class InternalAuthenticationProviderMessages {
-		[DerivedMessage(CoreMessage.Authentication)]
-		public sealed partial class ResetPasswordCache : Message {
-			public readonly string LoginName;
-
-			public ResetPasswordCache(string loginName) {
-				LoginName = loginName;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/LeaderDiscoveryMessage.cs b/src/EventStore.Core/Messages/LeaderDiscoveryMessage.cs
deleted file mode 100644
index 1b6293f4609..00000000000
--- a/src/EventStore.Core/Messages/LeaderDiscoveryMessage.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using EventStore.Common.Utils;
-using EventStore.Core.Cluster;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Messages {
-	public static partial class LeaderDiscoveryMessage {
-		[DerivedMessage(CoreMessage.LeaderDiscovery)]
-		public partial class LeaderFound : Message {
-			public readonly MemberInfo Leader;
-
-			public LeaderFound(MemberInfo leader) {
-				Ensure.NotNull(leader, "leader");
-				Leader = leader;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.LeaderDiscovery)]
-		public partial class DiscoveryTimeout : Message {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/MemberInfoDto.cs b/src/EventStore.Core/Messages/MemberInfoDto.cs
deleted file mode 100644
index 3e2097f61aa..00000000000
--- a/src/EventStore.Core/Messages/MemberInfoDto.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Cluster;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.Messages {
-	public class MemberInfoDto {
-		public Guid InstanceId { get; set; }
-
-		public DateTime TimeStamp { get; set; }
-		public VNodeState State { get; set; }
-		public bool IsAlive { get; set; }
-
-		public string InternalTcpIp { get; set; }
-		public int InternalTcpPort { get; set; }
-		public int InternalSecureTcpPort { get; set; }
-
-		public string ExternalTcpIp { get; set; }
-		public int ExternalTcpPort { get; set; }
-		public int ExternalSecureTcpPort { get; set; }
-
-		public string HttpEndPointIp { get; set; }
-		public int HttpEndPointPort { get; set; }
-		public string AdvertiseHostToClientAs { get; set; }
-		public int AdvertiseHttpPortToClientAs { get; set; }
-		public int AdvertiseTcpPortToClientAs { get; set; }
-
-		public long LastCommitPosition { get; set; }
-		public long WriterCheckpoint { get; set; }
-		public long ChaserCheckpoint { get; set; }
-
-		public long EpochPosition { get; set; }
-		public int EpochNumber { get; set; }
-		public Guid EpochId { get; set; }
-
-		public int NodePriority { get; set; }
-		public bool IsReadOnlyReplica { get; set; }
-
-		public MemberInfoDto() {
-		}
-
-		public MemberInfoDto(MemberInfo member) {
-			InstanceId = member.InstanceId;
-
-			TimeStamp = member.TimeStamp;
-			State = member.State;
-			IsAlive = member.IsAlive;
-
-			InternalTcpIp = member.InternalTcpEndPoint?.GetHost() ?? member.InternalSecureTcpEndPoint?.GetHost();
-			InternalTcpPort = member.InternalTcpEndPoint == null ? 0 : member.InternalTcpEndPoint.GetPort();
-			InternalSecureTcpPort =
-				member.InternalSecureTcpEndPoint == null ? 0 : member.InternalSecureTcpEndPoint.GetPort();
-
-			ExternalTcpIp = member.ExternalTcpEndPoint?.GetHost() ?? member.ExternalSecureTcpEndPoint?.GetHost();
-			ExternalTcpPort = member.ExternalTcpEndPoint == null ? 0 : member.ExternalTcpEndPoint.GetPort();
-			ExternalSecureTcpPort =
-				member.ExternalSecureTcpEndPoint == null ? 0 : member.ExternalSecureTcpEndPoint.GetPort();
-
-			HttpEndPointIp = member.HttpEndPoint.GetHost();
-			HttpEndPointPort = member.HttpEndPoint.GetPort();
-			AdvertiseHostToClientAs = member.AdvertiseHostToClientAs;
-			AdvertiseHttpPortToClientAs = member.AdvertiseHttpPortToClientAs;
-			AdvertiseTcpPortToClientAs = member.AdvertiseTcpPortToClientAs;
-
-			LastCommitPosition = member.LastCommitPosition;
-			WriterCheckpoint = member.WriterCheckpoint;
-			ChaserCheckpoint = member.ChaserCheckpoint;
-
-			EpochPosition = member.EpochPosition;
-			EpochNumber = member.EpochNumber;
-			EpochId = member.EpochId;
-
-			NodePriority = member.NodePriority;
-			IsReadOnlyReplica = member.IsReadOnlyReplica;
-		}
-
-		public override string ToString() {
-			return
-				$"InstanceId: {InstanceId:B}, TimeStamp: {TimeStamp:yyyy-MM-dd HH:mm:ss.fff}, State: {State}, IsAlive: {IsAlive}, " +
-				$"InternalTcpIp: {InternalTcpIp}, InternalTcpPort: {InternalTcpPort}, InternalSecureTcpPort: {InternalSecureTcpPort}, " +
-				$"ExternalTcpIp: {ExternalTcpIp}, ExternalTcpPort: {ExternalTcpPort}, ExternalSecureTcpPort: {ExternalSecureTcpPort}, " +
-				$"HttpEndPointIp: {HttpEndPointIp}, HttpEndPointPort: {HttpEndPointPort}, " +
-				$"{nameof(AdvertiseHostToClientAs)}: {AdvertiseHostToClientAs}, {nameof(AdvertiseHttpPortToClientAs)}: {AdvertiseHttpPortToClientAs}, " +
-				$"{nameof(AdvertiseTcpPortToClientAs)}: {AdvertiseTcpPortToClientAs}, " +
-				$"LastCommitPosition: {LastCommitPosition}, WriterCheckpoint: {WriterCheckpoint}, ChaserCheckpoint: {ChaserCheckpoint}, " +
-				$"EpochPosition: {EpochPosition}, EpochNumber: {EpochNumber}, EpochId: {EpochId:B}, NodePriority: {NodePriority}, " +
-				$"IsReadOnlyReplica: {IsReadOnlyReplica}";
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/MergeIndexesResultDto.cs b/src/EventStore.Core/Messages/MergeIndexesResultDto.cs
deleted file mode 100644
index 8a8be862868..00000000000
--- a/src/EventStore.Core/Messages/MergeIndexesResultDto.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace EventStore.Core.Messages {
-	public class MergeIndexesResultDto {
-		public string MergeIndexesId { get; set; }
-
-		public MergeIndexesResultDto() {
-		}
-
-		public MergeIndexesResultDto(string mergeIndexesId) {
-			MergeIndexesId = mergeIndexesId;
-		}
-		public override string ToString() => $"MergeIndexesId: {MergeIndexesId}";
-	}
-}
diff --git a/src/EventStore.Core/Messages/MonitoringMessage.cs b/src/EventStore.Core/Messages/MonitoringMessage.cs
deleted file mode 100644
index ca12b0f2337..00000000000
--- a/src/EventStore.Core/Messages/MonitoringMessage.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.PersistentSubscription;
-
-namespace EventStore.Core.Messages {
-	public static partial class MonitoringMessage {
-		[DerivedMessage(CoreMessage.Monitoring)]
-		public partial class GetAllPersistentSubscriptionStats : Message {
-			public readonly IEnvelope Envelope;
-
-			public GetAllPersistentSubscriptionStats(IEnvelope envelope) {
-				Ensure.NotNull(envelope, "envelope");
-				Envelope = envelope;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Monitoring)]
-		public partial class GetPersistentSubscriptionStats : Message {
-			public string EventStreamId {
-				get { return _eventStreamId; }
-			}
-
-			public string GroupName {
-				get { return _groupName; }
-			}
-
-			public readonly IEnvelope Envelope;
-			private readonly string _eventStreamId;
-			private readonly string _groupName;
-
-			public GetPersistentSubscriptionStats(IEnvelope envelope, string eventStreamId, string groupName) {
-				Ensure.NotNull(envelope, "envelope");
-				Envelope = envelope;
-				_eventStreamId = eventStreamId;
-				_groupName = groupName;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Monitoring)]
-		public partial class GetStreamPersistentSubscriptionStats : Message {
-			public string EventStreamId {
-				get { return _eventStreamId; }
-			}
-
-			public readonly IEnvelope Envelope;
-			private readonly string _eventStreamId;
-
-			public GetStreamPersistentSubscriptionStats(IEnvelope envelope, string eventStreamId) {
-				Ensure.NotNull(envelope, "envelope");
-				Envelope = envelope;
-				_eventStreamId = eventStreamId;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Monitoring)]
-		public partial class GetPersistentSubscriptionStatsCompleted : Message {
-			public readonly OperationStatus Result;
-			public readonly List<PersistentSubscriptionInfo> SubscriptionStats;
-			public string ErrorString;
-
-			public GetPersistentSubscriptionStatsCompleted(OperationStatus result,
-				List<PersistentSubscriptionInfo> subscriptionStats, string errorString = "") {
-				Result = result;
-				SubscriptionStats = subscriptionStats;
-				ErrorString = errorString;
-			}
-
-			public enum OperationStatus {
-				Success = 0,
-				NotFound = 1,
-				Fail = 2,
-				NotReady = 3
-			}
-		}
-
-		public class PersistentSubscriptionInfo {
-			public string EventSource { get; set; }
-			public string GroupName { get; set; }
-			public string Status { get; set; }
-			public List<ConnectionInfo> Connections { get; set; }
-			public int AveragePerSecond { get; set; }
-			public long TotalItems { get; set; }
-			public long CountSinceLastMeasurement { get; set; }
-			public string LastCheckpointedEventPosition { get; set; }
-			public string LastKnownEventPosition { get; set; }
-			public bool ResolveLinktos { get; set; }
-			public string StartFrom { get; set; }
-			public int MessageTimeoutMilliseconds { get; set; }
-			public bool ExtraStatistics { get; set; }
-			public int MaxRetryCount { get; set; }
-			public int LiveBufferSize { get; set; }
-			public int BufferSize { get; set; }
-			public int ReadBatchSize { get; set; }
-			public int CheckPointAfterMilliseconds { get; set; }
-			public int MinCheckPointCount { get; set; }
-			public int MaxCheckPointCount { get; set; }
-			public int ReadBufferCount { get; set; }
-			public long LiveBufferCount { get; set; }
-			public int RetryBufferCount { get; set; }
-			public int TotalInFlightMessages { get; set; }
-			public int OutstandingMessagesCount { get; set; }
-			public string NamedConsumerStrategy { get; set; }
-			public int MaxSubscriberCount { get; set; }
-			public long ParkedMessageCount { get; set; }
-			public long OldestParkedMessage { get; set; }
-		}
-
-		public class ConnectionInfo {
-			public string From { get; set; }
-			public string Username { get; set; }
-			public int AverageItemsPerSecond { get; set; }
-			public long TotalItems { get; set; }
-			public long CountSinceLastMeasurement { get; set; }
-			public List<Measurement> ObservedMeasurements { get; set; }
-			public int AvailableSlots { get; set; }
-			public int InFlightMessages { get; set; }
-			public string ConnectionName { get; set; }
-		}
-
-		[DerivedMessage(CoreMessage.Monitoring)]
-		public partial class GetFreshStats : Message {
-			public readonly IEnvelope Envelope;
-			public readonly Func<Dictionary<string, object>, Dictionary<string, object>> StatsSelector;
-			public readonly bool UseMetadata;
-			public readonly bool UseGrouping;
-
-			public GetFreshStats(IEnvelope envelope,
-				Func<Dictionary<string, object>, Dictionary<string, object>> statsSelector,
-				bool useMetadata,
-				bool useGrouping) {
-				Ensure.NotNull(envelope, "envelope");
-				Ensure.NotNull(statsSelector, "statsSelector");
-
-				Envelope = envelope;
-				StatsSelector = statsSelector;
-				UseMetadata = useMetadata;
-				UseGrouping = useGrouping;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Monitoring)]
-		public partial class GetFreshStatsCompleted : Message {
-			public readonly bool Success;
-			public readonly Dictionary<string, object> Stats;
-
-			public GetFreshStatsCompleted(bool success, Dictionary<string, object> stats) {
-				Success = success;
-				Stats = stats;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Monitoring)]
-		public partial class GetFreshTcpConnectionStats : Message {
-			public readonly IEnvelope Envelope;
-
-			public GetFreshTcpConnectionStats(IEnvelope envelope) {
-				Ensure.NotNull(envelope, "envelope");
-
-				Envelope = envelope;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Monitoring)]
-		public partial class GetFreshTcpConnectionStatsCompleted : Message {
-			public readonly List<TcpConnectionStats> ConnectionStats;
-
-			public GetFreshTcpConnectionStatsCompleted(List<TcpConnectionStats> connectionStats) {
-				ConnectionStats = connectionStats;
-			}
-		}
-
-		public class TcpConnectionStats {
-			public string RemoteEndPoint { get; set; }
-			public string LocalEndPoint { get; set; }
-			public string ClientConnectionName { get; set; }
-			public Guid ConnectionId { get; set; }
-			public long TotalBytesSent { get; set; }
-			public long TotalBytesReceived { get; set; }
-			public int PendingSendBytes { get; set; }
-			public int PendingReceivedBytes { get; set; }
-			public bool IsExternalConnection { get; set; }
-			public bool IsSslConnection { get; set; }
-		}
-
-		[DerivedMessage(CoreMessage.Monitoring)]
-		public partial class InternalStatsRequest : Message {
-			public readonly IEnvelope Envelope;
-
-			public InternalStatsRequest(IEnvelope envelope) {
-				Ensure.NotNull(envelope, "envelope");
-
-				Envelope = envelope;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Monitoring)]
-		public partial class InternalStatsRequestResponse : Message {
-			public readonly Dictionary<string, object> Stats;
-
-			public InternalStatsRequestResponse(Dictionary<string, object> stats) {
-				Ensure.NotNull(stats, "stats");
-
-				Stats = stats;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Misc)]
-		public partial class DynamicCacheManagerTick : Message {
-		}
-
-		[DerivedMessage(CoreMessage.Misc)]
-		public partial class CheckCertificateExpiry : Message {
-		}
-
-		[DerivedMessage(CoreMessage.Misc)]
-		public partial class CheckEsVersion : Message {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/RedactionMessage.cs b/src/EventStore.Core/Messages/RedactionMessage.cs
deleted file mode 100644
index 61d5cf24d9b..00000000000
--- a/src/EventStore.Core/Messages/RedactionMessage.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Data.Redaction;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Messages {
-	public static partial class RedactionMessage {
-		[DerivedMessage(CoreMessage.Redaction)]
-		public partial class GetEventPosition : Message {
-			public IEnvelope Envelope { get; }
-			public string EventStreamId { get; }
-			public long EventNumber { get; }
-
-			public GetEventPosition(IEnvelope envelope, string eventStreamId, long eventNumber) {
-				Ensure.NotNull(envelope, nameof(envelope));
-				Ensure.NotNullOrEmpty(eventStreamId, nameof(eventStreamId));
-				Ensure.Nonnegative(eventNumber, nameof(eventNumber));
-
-				Envelope = envelope;
-				EventStreamId = eventStreamId;
-				EventNumber = eventNumber;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Redaction)]
-		public partial class GetEventPositionCompleted : Message {
-			public GetEventPositionResult Result { get; }
-			public EventPosition[] EventPositions { get; }
-
-			public GetEventPositionCompleted(GetEventPositionResult result, EventPosition[] eventPositions) {
-				Ensure.NotNull(eventPositions, nameof(eventPositions));
-
-				Result = result;
-				EventPositions = eventPositions;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Redaction)]
-		public partial class AcquireChunksLock : Message {
-			public IEnvelope Envelope { get; }
-
-			public AcquireChunksLock(IEnvelope envelope) {
-				Envelope = envelope;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Redaction)]
-		public partial class AcquireChunksLockCompleted : Message {
-			public AcquireChunksLockResult Result { get; }
-			public Guid AcquisitionId { get; }
-
-			public AcquireChunksLockCompleted(AcquireChunksLockResult result, Guid acquisitionId) {
-				Result = result;
-				AcquisitionId = acquisitionId;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Redaction)]
-		public partial class SwitchChunk : Message {
-			public IEnvelope Envelope { get; }
-			public Guid AcquisitionId { get; }
-			public string TargetChunkFile { get; }
-			public string NewChunkFile { get; }
-
-			public SwitchChunk(IEnvelope envelope, Guid acquisitionId, string targetChunkFile, string newChunkFile) {
-				Ensure.NotNull(envelope, nameof(envelope));
-				Ensure.NotEmptyGuid(acquisitionId, nameof(acquisitionId));
-				Ensure.NotNullOrEmpty(targetChunkFile, nameof(targetChunkFile));
-				Ensure.NotNullOrEmpty(newChunkFile, nameof(newChunkFile));
-
-				Envelope = envelope;
-				AcquisitionId = acquisitionId;
-				TargetChunkFile = targetChunkFile;
-				NewChunkFile = newChunkFile;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Redaction)]
-		public partial class SwitchChunkCompleted : Message {
-			public SwitchChunkResult Result { get; }
-
-			public SwitchChunkCompleted(SwitchChunkResult result) {
-				Result = result;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Redaction)]
-		public partial class ReleaseChunksLock : Message {
-			public IEnvelope Envelope { get; }
-			public Guid AcquisitionId { get; }
-
-			public ReleaseChunksLock(IEnvelope envelope, Guid acquisitionId) {
-				Ensure.NotNull(envelope, nameof(envelope));
-				Ensure.NotEmptyGuid(acquisitionId, nameof(acquisitionId));
-				Envelope = envelope;
-				AcquisitionId = acquisitionId;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Redaction)]
-		public partial class ReleaseChunksLockCompleted : Message {
-			public ReleaseChunksLockResult Result { get; }
-
-			public ReleaseChunksLockCompleted(ReleaseChunksLockResult result) {
-				Result = result;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/ReplicationMessage.cs b/src/EventStore.Core/Messages/ReplicationMessage.cs
deleted file mode 100644
index caee024241a..00000000000
--- a/src/EventStore.Core/Messages/ReplicationMessage.cs
+++ /dev/null
@@ -1,500 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-using EventStore.Core.Cluster;
-using EventStore.Core.Data;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.LogRecords;
-using EndPoint = System.Net.EndPoint;
-
-namespace EventStore.Core.Messages {
-	public static partial class ReplicationMessage {
-		[DerivedMessage(CoreMessage.Replication)]
-		public partial class SubscribeReplica : Message {
-			public readonly int Version;
-			public readonly long LogPosition;
-			public readonly Guid ChunkId;
-			public readonly EpochRecord[] LastEpochs;
-			public readonly EndPoint ReplicaEndPoint;
-			public readonly Guid LeaderId;
-			public readonly Guid SubscriptionId;
-			public readonly bool IsPromotable;
-
-			public SubscribeReplica(
-				int version,
-				long logPosition, Guid chunkId, EpochRecord[] lastEpochs,
-				EndPoint replicaEndPoint,
-				Guid leaderId, Guid subscriptionId, bool isPromotable) {
-
-				Ensure.Nonnegative(version, "version");
-				Ensure.Nonnegative(logPosition, "logPosition");
-				Ensure.NotNull(lastEpochs, "lastEpochs");
-				Ensure.NotEmptyGuid(leaderId, "leaderId");
-				Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
-				Ensure.NotNull(replicaEndPoint, "replicaEndPoint");
-
-				Version = version;
-				LogPosition = logPosition;
-				ChunkId = chunkId;
-				LastEpochs = lastEpochs;
-				ReplicaEndPoint = replicaEndPoint;
-				LeaderId = leaderId;
-				SubscriptionId = subscriptionId;
-				IsPromotable = isPromotable;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Replication)]
-		public partial class AckLogPosition : Message {
-			public readonly Guid SubscriptionId;
-
-			// where the replication subscription is up to.
-			// used for managing the subscription
-			public readonly long ReplicationLogPosition;
-
-			// where we are up to writing data to the log.
-			// can be behind ReplicationLogPosition.
-			// used for determining what has been replicated
-			public readonly long WriterLogPosition;
-
-			public AckLogPosition(
-				Guid subscriptionId,
-				long replicationLogPosition,
-				long writerLogPosition) {
-
-				Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
-				SubscriptionId = subscriptionId;
-				ReplicationLogPosition = replicationLogPosition;
-				WriterLogPosition = writerLogPosition;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Replication)]
-		public partial class ReplicaLogPositionAck : Message {
-			public readonly Guid SubscriptionId;
-			public readonly long ReplicationLogPosition;
-			public readonly long WriterLogPosition;
-
-			public ReplicaLogPositionAck(
-				Guid subscriptionId,
-				long replicationLogPosition,
-				long writerLogPosition) {
-
-				Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
-
-				SubscriptionId = subscriptionId;
-				ReplicationLogPosition = replicationLogPosition;
-				WriterLogPosition = writerLogPosition;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Replication)]
-		public partial class ReplicaSubscriptionRequest : Message {
-			public readonly Guid CorrelationId;
-			public readonly IEnvelope Envelope;
-			public readonly TcpConnectionManager Connection;
-
-			public readonly int Version;
-			public readonly long LogPosition;
-			public readonly Guid ChunkId;
-			public readonly Epoch[] LastEpochs;
-			public readonly EndPoint ReplicaEndPoint;
-			public readonly Guid LeaderId;
-			public readonly Guid SubscriptionId;
-			public readonly bool IsPromotable;
-
-			public ReplicaSubscriptionRequest(Guid correlationId,
-				IEnvelope envelope,
-				TcpConnectionManager connection,
-				int version,
-				long logPosition,
-				Guid chunkId,
-				Epoch[] lastEpochs,
-				EndPoint replicaEndPoint,
-				Guid leaderId,
-				Guid subscriptionId,
-				bool isPromotable) {
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				Ensure.NotNull(envelope, "envelope");
-				Ensure.NotNull(connection, "connection");
-				Ensure.Nonnegative(version, "version");
-				Ensure.Nonnegative(logPosition, "logPosition");
-				Ensure.NotNull(lastEpochs, "lastEpochs");
-				Ensure.NotNull(replicaEndPoint, "ReplicaEndPoint");
-				Ensure.NotEmptyGuid(leaderId, "leaderId");
-				Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
-
-				Version = version;
-				CorrelationId = correlationId;
-				Envelope = envelope;
-				Connection = connection;
-				LogPosition = logPosition;
-				ChunkId = chunkId;
-				LastEpochs = lastEpochs;
-				ReplicaEndPoint = replicaEndPoint;
-				LeaderId = leaderId;
-				SubscriptionId = subscriptionId;
-				IsPromotable = isPromotable;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Replication)]
-		public partial class ReconnectToLeader : Message {
-			public readonly MemberInfo Leader;
-			public readonly Guid ConnectionCorrelationId;
-
-			public ReconnectToLeader(Guid connectionCorrelationId, MemberInfo leader) {
-				Ensure.NotEmptyGuid(connectionCorrelationId, nameof(connectionCorrelationId));
-				Ensure.NotNull(leader, nameof(leader));
-				ConnectionCorrelationId = connectionCorrelationId;
-				Leader = leader;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Replication)]
-		public partial class LeaderConnectionFailed : Message {
-			public readonly MemberInfo Leader;
-			public readonly Guid LeaderConnectionCorrelationId;
-
-			public LeaderConnectionFailed(Guid leaderConnectionCorrelationId, MemberInfo leader) {
-				Ensure.NotEmptyGuid(leaderConnectionCorrelationId, nameof(leaderConnectionCorrelationId));
-				Ensure.NotNull(leader, nameof(leader));
-				LeaderConnectionCorrelationId = leaderConnectionCorrelationId;
-				Leader = leader;
-			}
-		}
-
-		public interface IReplicationMessage {
-			Guid LeaderId { get; }
-			Guid SubscriptionId { get; }
-		}
-
-		[DerivedMessage(CoreMessage.Replication)]
-		public partial class SubscribeToLeader : Message, IReplicationMessage {
-			Guid IReplicationMessage.LeaderId {
-				get { return LeaderId; }
-			}
-
-			Guid IReplicationMessage.SubscriptionId {
-				get { return SubscriptionId; }
-			}
-
-			public readonly Guid StateCorrelationId;
-			public readonly Guid LeaderId;
-			public readonly Guid SubscriptionId;
-
-			public SubscribeToLeader(Guid stateCorrelationId, Guid leaderId, Guid subscriptionId) {
-				Ensure.NotEmptyGuid(stateCorrelationId, "stateCorrelationId");
-				Ensure.NotEmptyGuid(leaderId, "leaderId");
-				Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
-
-				StateCorrelationId = stateCorrelationId;
-				LeaderId = leaderId;
-				SubscriptionId = subscriptionId;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Replication)]
-		public partial class ReplicaSubscriptionRetry : Message, IReplicationMessage {
-			Guid IReplicationMessage.LeaderId {
-				get { return LeaderId; }
-			}
-
-			Guid IReplicationMessage.SubscriptionId {
-				get { return SubscriptionId; }
-			}
-
-			public readonly Guid LeaderId;
-			public readonly Guid SubscriptionId;
-
-			public ReplicaSubscriptionRetry(Guid leaderId, Guid subscriptionId) {
-				Ensure.NotEmptyGuid(leaderId, "leaderId");
-				Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
-				LeaderId = leaderId;
-				SubscriptionId = subscriptionId;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Replication)]
-		public partial class ReplicaSubscribed : Message, IReplicationMessage {
-			Guid IReplicationMessage.LeaderId {
-				get { return LeaderId; }
-			}
-
-			Guid IReplicationMessage.SubscriptionId {
-				get { return SubscriptionId; }
-			}
-
-			public readonly Guid LeaderId;
-			public readonly Guid SubscriptionId;
-			public readonly long SubscriptionPosition;
-
-			public readonly EndPoint LeaderEndPoint;
-
-			public ReplicaSubscribed(Guid leaderId, Guid subscriptionId, long subscriptionPosition) {
-				Ensure.NotEmptyGuid(leaderId, "leaderId");
-				Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
-				Ensure.Nonnegative(subscriptionPosition, "subscriptionPosition");
-
-				LeaderId = leaderId;
-				SubscriptionId = subscriptionId;
-				SubscriptionPosition = subscriptionPosition;
-			}
-
-			public ReplicaSubscribed(Guid leaderId, Guid subscriptionId, long subscriptionPosition,
-				EndPoint leaderEndPoint) {
-				Ensure.NotEmptyGuid(leaderId, "leaderId");
-				Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
-				Ensure.Nonnegative(subscriptionPosition, "subscriptionPosition");
-				Ensure.NotNull(leaderEndPoint, "leaderEndPoint");
-
-				LeaderId = leaderId;
-				SubscriptionId = subscriptionId;
-				SubscriptionPosition = subscriptionPosition;
-				LeaderEndPoint = leaderEndPoint;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Replication)]
-		public partial class FollowerAssignment : Message, IReplicationMessage {
-			Guid IReplicationMessage.LeaderId {
-				get { return LeaderId; }
-			}
-
-			Guid IReplicationMessage.SubscriptionId {
-				get { return SubscriptionId; }
-			}
-
-			public readonly Guid LeaderId;
-			public readonly Guid SubscriptionId;
-
-			public FollowerAssignment(Guid leaderId, Guid subscriptionId) {
-				Ensure.NotEmptyGuid(leaderId, "leaderId");
-				Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
-				LeaderId = leaderId;
-				SubscriptionId = subscriptionId;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Replication)]
-		public partial class CloneAssignment : Message, IReplicationMessage {
-			Guid IReplicationMessage.LeaderId {
-				get { return LeaderId; }
-			}
-
-			Guid IReplicationMessage.SubscriptionId {
-				get { return SubscriptionId; }
-			}
-
-			public readonly Guid LeaderId;
-			public readonly Guid SubscriptionId;
-
-			public CloneAssignment(Guid leaderId, Guid subscriptionId) {
-				Ensure.NotEmptyGuid(leaderId, "leaderId");
-				Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
-				LeaderId = leaderId;
-				SubscriptionId = subscriptionId;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Replication)]
-		public partial class CreateChunk : Message, IReplicationMessage {
-			Guid IReplicationMessage.LeaderId {
-				get { return LeaderId; }
-			}
-
-			Guid IReplicationMessage.SubscriptionId {
-				get { return SubscriptionId; }
-			}
-
-			public readonly Guid LeaderId;
-			public readonly Guid SubscriptionId;
-
-			public readonly ChunkHeader ChunkHeader;
-			public readonly int FileSize;
-			public bool IsScavengedChunk;
-
-			public ReadOnlyMemory<byte> TransformHeader;
-
-			public CreateChunk(Guid leaderId, Guid subscriptionId, ChunkHeader chunkHeader, int fileSize,
-				bool isScavengedChunk, ReadOnlyMemory<byte> transformHeader) {
-				Ensure.NotEmptyGuid(leaderId, "leaderId");
-				Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
-				Ensure.NotNull(chunkHeader, "chunkHeader");
-
-				LeaderId = leaderId;
-				SubscriptionId = subscriptionId;
-				ChunkHeader = chunkHeader;
-				FileSize = fileSize;
-				IsScavengedChunk = isScavengedChunk;
-				TransformHeader = transformHeader;
-			}
-
-			public override string ToString() {
-				return string.Format(
-					"CreateChunk message: LeaderId: {0}, SubscriptionId: {1}, ChunkHeader: {2}, FileSize: {3}, IsScavengedChunk: {4}, TransformHeader size: {5}",
-					LeaderId, SubscriptionId, ChunkHeader, FileSize, IsScavengedChunk, TransformHeader.Length);
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Replication)]
-		public partial class RawChunkBulk : Message, IReplicationMessage {
-			Guid IReplicationMessage.LeaderId {
-				get { return LeaderId; }
-			}
-
-			Guid IReplicationMessage.SubscriptionId {
-				get { return SubscriptionId; }
-			}
-
-			public readonly Guid LeaderId;
-			public readonly Guid SubscriptionId;
-
-			public readonly int ChunkStartNumber;
-			public readonly int ChunkEndNumber;
-			public readonly int RawPosition;
-			public readonly byte[] RawBytes;
-			public readonly bool CompleteChunk;
-
-			public RawChunkBulk(Guid leaderId,
-				Guid subscriptionId,
-				int chunkStartNumber, int chunkEndNumber,
-				int rawPosition, byte[] rawBytes,
-				bool completeChunk) {
-				Ensure.NotEmptyGuid(leaderId, "leaderId");
-				Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
-				Ensure.NotNull(rawBytes, "rawBytes");
-				Ensure.Positive(rawBytes.Length, "rawBytes.Length"); // we should never send empty array, NEVER
-
-				LeaderId = leaderId;
-				SubscriptionId = subscriptionId;
-				ChunkStartNumber = chunkStartNumber;
-				ChunkEndNumber = chunkEndNumber;
-				RawPosition = rawPosition;
-				RawBytes = rawBytes;
-				CompleteChunk = completeChunk;
-			}
-
-			public override string ToString() {
-				return string.Format(
-					"RawChunkBulk message: LeaderId: {0}, SubscriptionId: {1}, ChunkStartNumber: {2}, ChunkEndNumber: {3}, RawPosition: {4}, RawBytes length: {5}, CompleteChunk: {6}",
-					LeaderId, SubscriptionId,
-					ChunkStartNumber, ChunkEndNumber, RawPosition, RawBytes.Length, CompleteChunk);
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Replication)]
-		public partial class DataChunkBulk : Message, IReplicationMessage, StorageMessage.IFlushableMessage {
-			Guid IReplicationMessage.LeaderId {
-				get { return LeaderId; }
-			}
-
-			Guid IReplicationMessage.SubscriptionId {
-				get { return SubscriptionId; }
-			}
-
-			public readonly Guid LeaderId;
-			public readonly Guid SubscriptionId;
-
-			public readonly int ChunkStartNumber;
-			public readonly int ChunkEndNumber;
-			public readonly long SubscriptionPosition;
-			public readonly byte[] DataBytes;
-			public readonly bool CompleteChunk;
-
-			public DataChunkBulk(Guid leaderId,
-				Guid subscriptionId,
-				int chunkStartNumber,
-				int chunkEndNumber,
-				long subscriptionPosition,
-				byte[] dataBytes,
-				bool completeChunk) {
-				Ensure.NotEmptyGuid(leaderId, "leaderId");
-				Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
-				Ensure.NotNull(dataBytes, "rawBytes");
-				Ensure.Nonnegative(dataBytes.Length,
-					"dataBytes.Length"); // we CAN send empty dataBytes array here, unlike as with completed chunks
-
-				LeaderId = leaderId;
-				SubscriptionId = subscriptionId;
-				ChunkStartNumber = chunkStartNumber;
-				ChunkEndNumber = chunkEndNumber;
-				SubscriptionPosition = subscriptionPosition;
-				DataBytes = dataBytes;
-				CompleteChunk = completeChunk;
-			}
-
-			public override string ToString() {
-				return string.Format(
-					"DataChunkBulk message: LeaderId: {0}, SubscriptionId: {1}, ChunkStartNumber: {2}, ChunkEndNumber: {3}, SubscriptionPosition: {4}, DataBytes length: {5}, CompleteChunk: {6}",
-					LeaderId, SubscriptionId, ChunkStartNumber, ChunkEndNumber,
-					SubscriptionPosition, DataBytes.Length, CompleteChunk);
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Replication)]
-		public partial class DropSubscription : Message, IReplicationMessage {
-			Guid IReplicationMessage.LeaderId {
-				get { return LeaderId; }
-			}
-
-			Guid IReplicationMessage.SubscriptionId {
-				get { return SubscriptionId; }
-			}
-
-			public readonly Guid LeaderId;
-			public readonly Guid SubscriptionId;
-
-			public DropSubscription(Guid leaderId, Guid subscriptionId) {
-				Ensure.NotEmptyGuid(leaderId, "leaderId");
-				Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
-				LeaderId = leaderId;
-				SubscriptionId = subscriptionId;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Replication)]
-		public partial class GetReplicationStats : Message {
-			public IEnvelope Envelope;
-
-			public GetReplicationStats(IEnvelope envelope) {
-				Envelope = envelope;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Replication)]
-		public partial class GetReplicationStatsCompleted : Message {
-			public List<ReplicationMessage.ReplicationStats> ReplicationStats;
-
-			public GetReplicationStatsCompleted(List<ReplicationMessage.ReplicationStats> replicationStats) {
-				ReplicationStats = replicationStats;
-			}
-		}
-
-		public class ReplicationStats {
-			public Guid SubscriptionId { get; private set; }
-			public Guid ConnectionId { get; private set; }
-			public string SubscriptionEndpoint { get; private set; }
-			public long TotalBytesSent { get; private set; }
-			public long TotalBytesReceived { get; private set; }
-			public int PendingSendBytes { get; private set; }
-			public int PendingReceivedBytes { get; private set; }
-			public int SendQueueSize { get; private set; }
-
-			public ReplicationStats(Guid subscriptionId, Guid connectionId, string subscriptionEndpoint,
-				int sendQueueSize,
-				long totalBytesSent, long totalBytesReceived, int pendingSendBytes, int pendingReceivedBytes) {
-				SubscriptionId = subscriptionId;
-				ConnectionId = connectionId;
-				SubscriptionEndpoint = subscriptionEndpoint;
-				SendQueueSize = sendQueueSize;
-				TotalBytesSent = totalBytesSent;
-				TotalBytesReceived = totalBytesReceived;
-				PendingSendBytes = pendingSendBytes;
-				PendingReceivedBytes = pendingReceivedBytes;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/ReplicationTrackingMessage.cs b/src/EventStore.Core/Messages/ReplicationTrackingMessage.cs
deleted file mode 100644
index a189cc2a793..00000000000
--- a/src/EventStore.Core/Messages/ReplicationTrackingMessage.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Messages {
-	public static partial class ReplicationTrackingMessage {
-		[DerivedMessage(CoreMessage.ReplicationTracking)]
-		public partial class WriterCheckpointFlushed : Message {
-		}
-
-		[DerivedMessage(CoreMessage.ReplicationTracking)]
-		public partial class IndexedTo : Message {
-			public readonly long LogPosition;
-			
-			public IndexedTo(long logPosition ) {
-				Ensure.Nonnegative(logPosition + 1, "logPosition");
-				LogPosition = logPosition;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.ReplicationTracking)]
-		public partial class ReplicatedTo : Message {
-			public readonly long LogPosition;
-			
-			public ReplicatedTo(long logPosition ) {
-				Ensure.Nonnegative(logPosition + 1, "logPosition");
-				LogPosition = logPosition;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.ReplicationTracking)]
-		public partial class LeaderReplicatedTo : Message {
-			public readonly long LogPosition;
-			
-			public LeaderReplicatedTo(long logPosition ) {
-				Ensure.Nonnegative(logPosition + 1, "logPosition");
-				LogPosition = logPosition;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.ReplicationTracking)]
-		public partial class ReplicaWriteAck : Message {
-			public readonly Guid SubscriptionId;
-			public readonly long ReplicationLogPosition;
-
-			public ReplicaWriteAck(Guid subscriptionId, long replicationLogPosition) {
-				Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
-				SubscriptionId = subscriptionId;
-				ReplicationLogPosition = replicationLogPosition;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/ScavengeGetCurrentResultDto.cs b/src/EventStore.Core/Messages/ScavengeGetCurrentResultDto.cs
deleted file mode 100644
index 53674a7a520..00000000000
--- a/src/EventStore.Core/Messages/ScavengeGetCurrentResultDto.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace EventStore.Core.Messages {
-	public class ScavengeGetCurrentResultDto {
-		public string ScavengeId { get; set; } = "";
-		public string ScavengeLink { get; set; } = "";
-
-		public override string ToString() =>
-			$"ScavengeId: {ScavengeId}, " +
-			$"ScavengeLink: {ScavengeLink}";
-	}
-}
diff --git a/src/EventStore.Core/Messages/ScavengeGetLastResultDto.cs b/src/EventStore.Core/Messages/ScavengeGetLastResultDto.cs
deleted file mode 100644
index 57e7829e3b2..00000000000
--- a/src/EventStore.Core/Messages/ScavengeGetLastResultDto.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-
-namespace EventStore.Core.Messages {
-	public class ScavengeGetLastResultDto {
-		public string ScavengeId { get; set; } = Guid.Empty.ToString();
-		public string ScavengeLink { get; set; } = "";
-		public string ScavengeResult { get; set; } = "";
-
-		public override string ToString() =>
-			$"ScavengeId: {ScavengeId}, " +
-			$"ScavengeLink: {ScavengeLink}, " +
-			$"ScavengeResult: {ScavengeResult}";
-	}
-}
diff --git a/src/EventStore.Core/Messages/ScavengeResultDto.cs b/src/EventStore.Core/Messages/ScavengeResultDto.cs
deleted file mode 100644
index e64f71abe1b..00000000000
--- a/src/EventStore.Core/Messages/ScavengeResultDto.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-
-namespace EventStore.Core.Messages {
-	public class ScavengeResultDto {
-		public string ScavengeId { get; set; }
-
-		public ScavengeResultDto() {
-		}
-
-		public ScavengeResultDto(string scavengeId) {
-			ScavengeId = scavengeId;
-		}
-
-		public override string ToString() => $"ScavengeId: {ScavengeId}";
-	}
-}
diff --git a/src/EventStore.Core/Messages/StorageMessage.cs b/src/EventStore.Core/Messages/StorageMessage.cs
deleted file mode 100644
index 2483bb83d57..00000000000
--- a/src/EventStore.Core/Messages/StorageMessage.cs
+++ /dev/null
@@ -1,450 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messaging;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.Messages {
-	public static partial class StorageMessage {
-		public interface IPreconditionedWriteMessage {
-			Guid CorrelationId { get; }
-			IEnvelope Envelope { get; }
-			string EventStreamId { get; }
-			long ExpectedVersion { get; }
-		}
-
-		public interface IFlushableMessage {
-		}
-
-		public interface ILeaderWriteMessage {
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class WritePrepares : Message, IPreconditionedWriteMessage, IFlushableMessage, ILeaderWriteMessage {
-			public Guid CorrelationId { get; private set; }
-			public IEnvelope Envelope { get; private set; }
-
-			public string EventStreamId { get; private set; }
-			public long ExpectedVersion { get; private set; }
-			public CancellationToken CancellationToken { get; }
-			public readonly Event[] Events;
-
-			public WritePrepares(Guid correlationId, IEnvelope envelope, string eventStreamId, long expectedVersion,
-				Event[] events, CancellationToken cancellationToken) {
-				CorrelationId = correlationId;
-				Envelope = envelope;
-				EventStreamId = eventStreamId;
-				ExpectedVersion = expectedVersion;
-				CancellationToken = cancellationToken;
-				Events = events;
-			}
-
-			public override string ToString() =>
-				$"{GetType().Name} " +
-				$"CorrelationId: {CorrelationId}, " +
-				$"EventStreamId: {EventStreamId}, " +
-				$"ExpectedVersion: {ExpectedVersion}, " +
-				$"Envelope: {{ {Envelope} }}, " +
-				$"NumEvents: {Events?.Length}, " +
-				$"DataBytes: {Events?.Sum(static e => e.Data.Length)}, " +
-				$"MetadataBytes: {Events?.Sum(static e => e.Metadata.Length)}";
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class WriteDelete : Message, IPreconditionedWriteMessage, IFlushableMessage, ILeaderWriteMessage {
-			public Guid CorrelationId { get; private set; }
-			public IEnvelope Envelope { get; private set; }
-			public string EventStreamId { get; private set; }
-			public long ExpectedVersion { get; private set; }
-			public CancellationToken CancellationToken { get; }
-			public readonly bool HardDelete;
-
-			public WriteDelete(Guid correlationId, IEnvelope envelope, string eventStreamId, long expectedVersion,
-				bool hardDelete, CancellationToken cancellationToken = default) {
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				Ensure.NotNull(envelope, "envelope");
-				Ensure.NotNull(eventStreamId, "eventStreamId");
-
-				CorrelationId = correlationId;
-				Envelope = envelope;
-				EventStreamId = eventStreamId;
-				ExpectedVersion = expectedVersion;
-				CancellationToken = cancellationToken;
-				HardDelete = hardDelete;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class WriteCommit : Message, IFlushableMessage, ILeaderWriteMessage {
-			public readonly Guid CorrelationId;
-			public readonly IEnvelope Envelope;
-			public readonly long TransactionPosition;
-
-			public WriteCommit(Guid correlationId, IEnvelope envelope, long transactionPosition) {
-				CorrelationId = correlationId;
-				Envelope = envelope;
-				TransactionPosition = transactionPosition;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class WriteTransactionStart : Message, IPreconditionedWriteMessage, IFlushableMessage,
-			ILeaderWriteMessage {
-
-			public Guid CorrelationId { get; private set; }
-			public IEnvelope Envelope { get; private set; }
-			public string EventStreamId { get; private set; }
-			public long ExpectedVersion { get; private set; }
-
-			public readonly DateTime LiveUntil;
-
-			public WriteTransactionStart(Guid correlationId, IEnvelope envelope, string eventStreamId,
-				long expectedVersion, DateTime liveUntil) {
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				Ensure.NotNull(envelope, "envelope");
-				Ensure.NotNull(eventStreamId, "eventStreamId");
-
-				CorrelationId = correlationId;
-				Envelope = envelope;
-				EventStreamId = eventStreamId;
-				ExpectedVersion = expectedVersion;
-
-				LiveUntil = liveUntil;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class WriteTransactionData : Message, IFlushableMessage, ILeaderWriteMessage {
-			public readonly Guid CorrelationId;
-			public readonly IEnvelope Envelope;
-			public readonly long TransactionId;
-			public readonly Event[] Events;
-
-			public WriteTransactionData(Guid correlationId, IEnvelope envelope, long transactionId, Event[] events) {
-				CorrelationId = correlationId;
-				Envelope = envelope;
-				TransactionId = transactionId;
-				Events = events;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class WriteTransactionEnd : Message, IFlushableMessage, ILeaderWriteMessage {
-			public readonly Guid CorrelationId;
-			public readonly IEnvelope Envelope;
-			public readonly long TransactionId;
-
-			public readonly DateTime LiveUntil;
-
-			public WriteTransactionEnd(Guid correlationId, IEnvelope envelope, long transactionId,
-				DateTime liveUntil) {
-				CorrelationId = correlationId;
-				Envelope = envelope;
-				TransactionId = transactionId;
-
-				LiveUntil = liveUntil;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class PrepareAck : Message {
-			public readonly Guid CorrelationId;
-			public readonly long LogPosition;
-			public readonly PrepareFlags Flags;
-
-			public PrepareAck(Guid correlationId, long logPosition, PrepareFlags flags) {
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				Ensure.Nonnegative(logPosition, "logPosition");
-
-				CorrelationId = correlationId;
-				LogPosition = logPosition;
-				Flags = flags;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class CommitAck : Message {
-			public readonly Guid CorrelationId;
-			public readonly long LogPosition;
-			public readonly long TransactionPosition;
-			public readonly long FirstEventNumber;
-			public readonly long LastEventNumber;
-
-			public CommitAck(Guid correlationId, long logPosition, long transactionPosition, long firstEventNumber,
-				long lastEventNumber) {
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				Ensure.Nonnegative(logPosition, "logPosition");
-				Ensure.Nonnegative(transactionPosition, "transactionPosition");
-				if (firstEventNumber < -1)
-					throw new ArgumentOutOfRangeException("firstEventNumber",
-						string.Format("FirstEventNumber: {0}", firstEventNumber));
-				if (lastEventNumber - firstEventNumber + 1 < 0)
-					throw new ArgumentOutOfRangeException("lastEventNumber",
-						string.Format("LastEventNumber {0}, FirstEventNumber {1}.", lastEventNumber, firstEventNumber));
-
-				CorrelationId = correlationId;
-				LogPosition = logPosition;
-				TransactionPosition = transactionPosition;
-				FirstEventNumber = firstEventNumber;
-				LastEventNumber = lastEventNumber;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class CommitIndexed : Message {
-			public readonly Guid CorrelationId;
-			public readonly long LogPosition;
-			public readonly long TransactionPosition;
-			public readonly long FirstEventNumber;
-			public readonly long LastEventNumber;
-
-			public CommitIndexed(Guid correlationId, long logPosition, long transactionPosition,
-				long firstEventNumber, long lastEventNumber) {
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				Ensure.Nonnegative(logPosition, "logPosition");
-				Ensure.Nonnegative(transactionPosition, "transactionPosition");
-				if (firstEventNumber < -1)
-					throw new ArgumentOutOfRangeException("firstEventNumber",
-						string.Format("FirstEventNumber: {0}", firstEventNumber));
-				if (lastEventNumber - firstEventNumber + 1 < 0)
-					throw new ArgumentOutOfRangeException("lastEventNumber",
-						string.Format("LastEventNumber {0}, FirstEventNumber {1}.", lastEventNumber, firstEventNumber));
-				CorrelationId = correlationId;
-				LogPosition = logPosition;
-				TransactionPosition = transactionPosition;
-				FirstEventNumber = firstEventNumber;
-				LastEventNumber = lastEventNumber;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class EventCommitted : Message {
-			public readonly long CommitPosition;
-			public readonly EventRecord Event;
-			public readonly bool TfEof;
-
-			public EventCommitted(long commitPosition, EventRecord @event, bool isTfEof) {
-				CommitPosition = commitPosition;
-				Event = @event;
-				TfEof = isTfEof;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class InMemoryEventCommitted : Message {
-			public readonly long CommitPosition;
-			public readonly EventRecord Event;
-
-			public InMemoryEventCommitted(long commitPosition, EventRecord @event) {
-				CommitPosition = commitPosition;
-				Event = @event;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class TfEofAtNonCommitRecord : Message {
-			public TfEofAtNonCommitRecord() {
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class AlreadyCommitted : Message {
-			public readonly Guid CorrelationId;
-
-			public readonly string EventStreamId;
-			public readonly long FirstEventNumber;
-			public readonly long LastEventNumber;
-			public readonly long LogPosition;
-
-			public AlreadyCommitted(Guid correlationId, string eventStreamId, long firstEventNumber,
-				long lastEventNumber, long logPosition) {
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				Ensure.NotNullOrEmpty(eventStreamId, "eventStreamId");
-				Ensure.Nonnegative(firstEventNumber, "FirstEventNumber");
-
-				CorrelationId = correlationId;
-				EventStreamId = eventStreamId;
-				FirstEventNumber = firstEventNumber;
-				LastEventNumber = lastEventNumber;
-				LogPosition = logPosition;
-			}
-
-			public override string ToString() {
-				return string.Format(
-					"EventStreamId: {0}, CorrelationId: {1}, FirstEventNumber: {2}, LastEventNumber: {3}",
-					EventStreamId, CorrelationId, FirstEventNumber, LastEventNumber);
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class InvalidTransaction : Message {
-			public readonly Guid CorrelationId;
-
-			public InvalidTransaction(Guid correlationId) {
-				CorrelationId = correlationId;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class WrongExpectedVersion : Message {
-			public readonly Guid CorrelationId;
-			public readonly long CurrentVersion;
-
-			public WrongExpectedVersion(Guid correlationId, long currentVersion) {
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				CorrelationId = correlationId;
-				CurrentVersion = currentVersion;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class StreamDeleted : Message {
-			public readonly Guid CorrelationId;
-
-			public StreamDeleted(Guid correlationId) {
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				CorrelationId = correlationId;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class RequestCompleted : Message {
-			public readonly Guid CorrelationId;
-			public readonly bool Success;
-			public readonly long CurrentVersion;
-
-			public RequestCompleted(Guid correlationId, bool success, long currentVersion = -1) {
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				CorrelationId = correlationId;
-				Success = success;
-				CurrentVersion = currentVersion;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class RequestManagerTimerTick : Message {
-			public DateTime UtcNow {
-				get { return _now ?? DateTime.UtcNow; }
-			}
-
-			private readonly DateTime? _now;
-
-			public RequestManagerTimerTick() {
-			}
-
-			public RequestManagerTimerTick(DateTime now) {
-				_now = now;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class BatchLogExpiredMessages : Message, IQueueAffineMessage {
-			public readonly Guid CorrelationId;
-			public int QueueId { get; }
-
-			public BatchLogExpiredMessages(Guid correlationId, int queueId) {
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				Ensure.Nonnegative(queueId, "queueId");
-				CorrelationId = correlationId;
-				QueueId = queueId;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class EffectiveStreamAclRequest : Message {
-			public readonly string StreamId;
-			public readonly IEnvelope Envelope;
-			public readonly CancellationToken CancellationToken;
-
-			public EffectiveStreamAclRequest(string streamId, IEnvelope envelope, CancellationToken cancellationToken) {
-				StreamId = streamId;
-				Envelope = envelope;
-				CancellationToken = cancellationToken;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class EffectiveStreamAclResponse : Message {
-			public readonly EffectiveAcl Acl;
-
-			public EffectiveStreamAclResponse(EffectiveAcl acl) {
-				Acl = acl;
-			}
-		}
-
-		public class EffectiveAcl {
-			public readonly StreamAcl Stream;
-			public readonly StreamAcl System;
-			public readonly StreamAcl Default;
-
-			public EffectiveAcl(StreamAcl stream, StreamAcl system, StreamAcl @default) {
-				Stream = stream;
-				System = system;
-				Default = @default;
-			}
-
-			public static Task<EffectiveAcl> LoadAsync(IPublisher publisher, string streamId, CancellationToken cancellationToken) {
-				var envelope = new RequestEffectiveAclEnvelope();
-				publisher.Publish(new EffectiveStreamAclRequest(streamId, envelope, cancellationToken));
-				return envelope.Task;
-			}
-
-			class RequestEffectiveAclEnvelope : IEnvelope {
-				private readonly TaskCompletionSource<EffectiveAcl> _tcs;
-
-				public RequestEffectiveAclEnvelope() {
-					_tcs = new TaskCompletionSource<EffectiveAcl>(TaskCreationOptions.RunContinuationsAsynchronously);
-				}
-				public void ReplyWith<T>(T message) where T : Message {
-					if (message == null) throw new ArgumentNullException(nameof(message));
-					if (message is EffectiveStreamAclResponse response) {
-						_tcs.TrySetResult(response.Acl);
-						return;
-					} else {
-						if (message is OperationCancelledMessage cancelled) {
-							_tcs.TrySetCanceled(cancelled.CancellationToken);
-						}
-					}
-					throw new ArgumentException($"Unexpected message type {typeof(T)}");
-				}
-
-				public Task<EffectiveAcl> Task => _tcs.Task;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class OperationCancelledMessage : Message {
-			public CancellationToken CancellationToken { get; }
-
-			public OperationCancelledMessage(CancellationToken cancellationToken) {
-				CancellationToken = cancellationToken;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class StreamIdFromTransactionIdRequest : Message {
-			public readonly long TransactionId;
-			public readonly IEnvelope Envelope;
-			public readonly CancellationToken CancellationToken;
-
-			public StreamIdFromTransactionIdRequest(in long transactionId, IEnvelope envelope, CancellationToken cancellationToken) {
-				CancellationToken = cancellationToken;
-				TransactionId = transactionId;
-				Envelope = envelope;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Storage)]
-		public partial class StreamIdFromTransactionIdResponse : Message {
-			public readonly string StreamId;
-
-			public StreamIdFromTransactionIdResponse(string streamId){
-				StreamId = streamId;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/SubscriptionMessage.cs b/src/EventStore.Core/Messages/SubscriptionMessage.cs
deleted file mode 100644
index 350643adc6c..00000000000
--- a/src/EventStore.Core/Messages/SubscriptionMessage.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-
-namespace EventStore.Core.Messages {
-	public static partial class SubscriptionMessage {
-		[DerivedMessage(CoreMessage.Subscription)]
-		public partial class PollStream : Message {
-			public readonly string StreamId;
-			public readonly long LastIndexedPosition;
-			public readonly long? LastEventNumber;
-			public readonly DateTime ExpireAt;
-
-			public readonly Message OriginalRequest;
-
-			public PollStream(string streamId, long lastIndexedPosition, long? lastEventNumber, DateTime expireAt,
-				Message originalRequest) {
-				StreamId = streamId;
-				LastIndexedPosition = lastIndexedPosition;
-				LastEventNumber = lastEventNumber;
-				ExpireAt = expireAt;
-				OriginalRequest = originalRequest;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Subscription)]
-		public partial class CheckPollTimeout : Message {
-		}
-
-		[DerivedMessage(CoreMessage.Subscription)]
-		public partial class DropSubscription : Message {
-			public readonly Guid SubscriptionId;
-			public readonly SubscriptionDropReason DropReason;
-
-			public DropSubscription(Guid subscriptionId, SubscriptionDropReason dropReason) {
-				SubscriptionId = subscriptionId;
-				DropReason = dropReason;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Subscription)]
-		public partial class PersistentSubscriptionTimerTick : Message {
-			public Guid CorrelationId { get; }
-
-			public PersistentSubscriptionTimerTick(Guid correlationId) {
-				CorrelationId = correlationId;
-			}
-		}
-		
-		[DerivedMessage(CoreMessage.Subscription)]
-		public partial class PersistentSubscriptionsRestart : Message {
-			public IEnvelope ReplyEnvelope { get; }
-			
-			public PersistentSubscriptionsRestart(IEnvelope replyEnvelope) {
-				ReplyEnvelope = replyEnvelope;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Subscription)]
-		public partial class PersistentSubscriptionsRestarting : Message {
-		}
-
-		[DerivedMessage(CoreMessage.Subscription)]
-		public partial class InvalidPersistentSubscriptionsRestart : Message {
-			public readonly string Reason;
-
-			public InvalidPersistentSubscriptionsRestart(string reason) {
-				Reason = reason;
-			}
-		}
-	
-		[DerivedMessage(CoreMessage.Subscription)]
-		public partial class PersistentSubscriptionsStarted : Message {
-		}
-		
-		[DerivedMessage(CoreMessage.Subscription)]
-		public partial class PersistentSubscriptionsStopped : Message {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/SystemMessage.cs b/src/EventStore.Core/Messages/SystemMessage.cs
deleted file mode 100644
index f47a4ae38ce..00000000000
--- a/src/EventStore.Core/Messages/SystemMessage.cs
+++ /dev/null
@@ -1,291 +0,0 @@
-using System;
-using EventStore.Core.Cluster;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Messaging;
-using EventStore.Core.TransactionLog.LogRecords;
-using EndPoint = System.Net.EndPoint;
-
-namespace EventStore.Core.Messages {
-	public static partial class SystemMessage {
-		[DerivedMessage(CoreMessage.System)]
-		public partial class SystemInit : Message {
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class SystemStart : Message {
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class SystemCoreReady : Message {
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class SystemReady : Message {
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class ServiceInitialized : Message {
-			public readonly string ServiceName;
-
-			public ServiceInitialized(string serviceName) {
-				Ensure.NotNullOrEmpty(serviceName, "serviceName");
-				ServiceName = serviceName;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class SubSystemInitialized : Message {
-			public readonly string SubSystemName;
-
-			public SubSystemInitialized(string subSystemName) {
-				Ensure.NotNullOrEmpty(subSystemName, "subSystemName");
-				SubSystemName = subSystemName;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class WriteEpoch : Message {
-			public readonly int EpochNumber;
-			public WriteEpoch(int epochNumber) {
-				EpochNumber = epochNumber;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class InitiateLeaderResignation : Message {
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class RequestQueueDrained : Message {
-		}
-
-		[DerivedMessage]
-		public abstract partial class StateChangeMessage : Message {
-			public readonly Guid CorrelationId;
-			public readonly VNodeState State;
-
-			protected StateChangeMessage(Guid correlationId, VNodeState state) {
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				CorrelationId = correlationId;
-				State = state;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class BecomePreLeader : StateChangeMessage {
-			public BecomePreLeader(Guid correlationId) : base(correlationId, VNodeState.PreLeader) {
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class BecomeLeader : StateChangeMessage {
-			public BecomeLeader(Guid correlationId) : base(correlationId, VNodeState.Leader) {
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class BecomeShuttingDown : StateChangeMessage {
-			public readonly bool ShutdownHttp;
-			public readonly bool ExitProcess;
-
-			public BecomeShuttingDown(Guid correlationId, bool exitProcess, bool shutdownHttp) : base(correlationId,
-				VNodeState.ShuttingDown) {
-				ShutdownHttp = shutdownHttp;
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				ExitProcess = exitProcess;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class BecomeShutdown : StateChangeMessage {
-			public BecomeShutdown(Guid correlationId) : base(correlationId, VNodeState.Shutdown) {
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class BecomeUnknown : StateChangeMessage {
-			public BecomeUnknown(Guid correlationId)
-				: base(correlationId, VNodeState.Unknown) {
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class BecomeDiscoverLeader : StateChangeMessage {
-			public BecomeDiscoverLeader(Guid correlationId)
-				: base(correlationId, VNodeState.DiscoverLeader) {
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class BecomeResigningLeader : StateChangeMessage {
-			public BecomeResigningLeader(Guid correlationId)
-				: base(correlationId, VNodeState.ResigningLeader) {
-			}
-		}
-
-		[DerivedMessage]
-		public abstract partial class ReplicaStateMessage : StateChangeMessage {
-			public readonly MemberInfo Leader;
-
-			protected ReplicaStateMessage(Guid correlationId, VNodeState state, MemberInfo leader)
-				: base(correlationId, state) {
-				Ensure.NotNull(leader, "leader");
-				Leader = leader;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class BecomePreReplica : ReplicaStateMessage {
-			public readonly Guid LeaderConnectionCorrelationId;
-
-			public BecomePreReplica(Guid correlationId, Guid leaderConnectionCorrelationId, MemberInfo leader)
-				: base(correlationId, VNodeState.PreReplica, leader) {
-				LeaderConnectionCorrelationId = leaderConnectionCorrelationId;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class BecomeCatchingUp : ReplicaStateMessage {
-			public BecomeCatchingUp(Guid correlationId, MemberInfo leader) : base(correlationId, VNodeState.CatchingUp,
-				leader) {
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class BecomeClone : ReplicaStateMessage {
-			public BecomeClone(Guid correlationId, MemberInfo leader) : base(correlationId, VNodeState.Clone, leader) {
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class BecomeFollower : ReplicaStateMessage {
-			public BecomeFollower(Guid correlationId, MemberInfo leader) : base(correlationId, VNodeState.Follower,
-				leader) {
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class BecomeReadOnlyLeaderless : StateChangeMessage {
-			public BecomeReadOnlyLeaderless(Guid correlationId)
-				: base(correlationId, VNodeState.ReadOnlyLeaderless) {
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class BecomePreReadOnlyReplica : ReplicaStateMessage {
-			public readonly Guid LeaderConnectionCorrelationId;
-
-			public BecomePreReadOnlyReplica(Guid correlationId, Guid leaderConnectionCorrelationId, MemberInfo leader)
-				: base(correlationId, VNodeState.PreReadOnlyReplica, leader) {
-				LeaderConnectionCorrelationId = leaderConnectionCorrelationId;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class BecomeReadOnlyReplica : ReplicaStateMessage {
-			public BecomeReadOnlyReplica(Guid correlationId, MemberInfo leader)
-				: base(correlationId, VNodeState.ReadOnlyReplica, leader) {
-			}
-		}
-
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class ServiceShutdown : Message {
-			public readonly string ServiceName;
-
-			public ServiceShutdown(string serviceName) {
-				if (String.IsNullOrEmpty(serviceName))
-					throw new ArgumentNullException("serviceName");
-				ServiceName = serviceName;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class ShutdownTimeout : Message {
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class VNodeConnectionLost : Message {
-			public readonly EndPoint VNodeEndPoint;
-			public readonly Guid ConnectionId;
-			public readonly Guid? SubscriptionId;
-
-			public VNodeConnectionLost(EndPoint vNodeEndPoint, Guid connectionId, Guid? subscriptionId = null) {
-				Ensure.NotNull(vNodeEndPoint, "vNodeEndPoint");
-				Ensure.NotEmptyGuid(connectionId, "connectionId");
-
-				VNodeEndPoint = vNodeEndPoint;
-				ConnectionId = connectionId;
-				SubscriptionId = subscriptionId;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class VNodeConnectionEstablished : Message {
-			public readonly EndPoint VNodeEndPoint;
-			public readonly Guid ConnectionId;
-
-			public VNodeConnectionEstablished(EndPoint vNodeEndPoint, Guid connectionId) {
-				Ensure.NotNull(vNodeEndPoint, "vNodeEndPoint");
-				Ensure.NotEmptyGuid(connectionId, "connectionId");
-
-				VNodeEndPoint = vNodeEndPoint;
-				ConnectionId = connectionId;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class WaitForChaserToCatchUp : Message {
-			public readonly Guid CorrelationId;
-			public readonly TimeSpan TotalTimeWasted;
-
-			public WaitForChaserToCatchUp(Guid correlationId, TimeSpan totalTimeWasted) {
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-
-				CorrelationId = correlationId;
-				TotalTimeWasted = totalTimeWasted;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class ChaserCaughtUp : Message {
-			public readonly Guid CorrelationId;
-
-			public ChaserCaughtUp(Guid correlationId) {
-				Ensure.NotEmptyGuid(correlationId, "correlationId");
-				CorrelationId = correlationId;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class EnablePreLeaderReplication : Message {
-			public EnablePreLeaderReplication() {
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class CheckInaugurationConditions : Message {
-			public CheckInaugurationConditions() {
-			}
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class RequestForwardingTimerTick : Message {
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class NoQuorumMessage : Message {
-		}
-
-		[DerivedMessage(CoreMessage.System)]
-		public partial class EpochWritten : Message {
-			public readonly EpochRecord Epoch;
-
-			public EpochWritten(EpochRecord epoch) {
-				Ensure.NotNull(epoch, "epoch");
-				Epoch = epoch;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/TcpClientMessageDto.cs b/src/EventStore.Core/Messages/TcpClientMessageDto.cs
deleted file mode 100755
index 4fb7668ee96..00000000000
--- a/src/EventStore.Core/Messages/TcpClientMessageDto.cs
+++ /dev/null
@@ -1,532 +0,0 @@
-using System;
-using System.Net;
-using EventStore.Common.Utils;
-using EventStore.Core.Messages;
-using Google.Protobuf;
-
-// ReSharper disable once CheckNamespace
-namespace EventStore.Client.Messages {
-	partial class NewEvent {
-		public NewEvent(byte[] eventId, string eventType, int dataContentType, int metadataContentType, byte[] data, byte[] metadata)
-		{
-		
-			EventId = ByteString.CopyFrom(eventId);
-			EventType = eventType;
-			DataContentType = dataContentType;
-			MetadataContentType = metadataContentType;
-			Data = ByteString.CopyFrom(data);
-			Metadata = ByteString.CopyFrom(metadata);
-		}
-	}
-
-	partial class EventRecord {
-		public EventRecord(string eventStreamId, long eventNumber, byte[] eventId, string eventType, int dataContentType, int metadataContentType, byte[] data, byte[] metadata, long created, long createdEpoch) {
-			AssignValues(eventStreamId, eventNumber, eventId, eventType, dataContentType, metadataContentType, data, metadata, created, createdEpoch);
-		}
-
-		private void AssignValues(string eventStreamId, long eventNumber, byte[] eventId, string eventType, int dataContentType,
-			int metadataContentType, byte[] data, byte[] metadata, long created, long createdEpoch)
-		{
-			EventStreamId = eventStreamId;
-			EventNumber = eventNumber;
-			EventId = ByteString.CopyFrom(eventId);
-			EventType = eventType;
-			DataContentType = dataContentType;
-			MetadataContentType = metadataContentType;
-			Data = ByteString.CopyFrom(data);
-			Metadata = ByteString.CopyFrom(metadata);
-			Created = created;
-			CreatedEpoch = createdEpoch;
-		}
-
-		public EventRecord(Core.Data.EventRecord eventRecord) {
-			if (eventRecord == null) return;
-			AssignValues(
-				eventRecord.EventStreamId,
-				eventRecord.EventNumber,
-				eventRecord.EventId.ToByteArray(),
-				eventRecord.EventType,
-				eventRecord.IsJson ? 1 : 0,
-				eventRecord.IsJson ? 1 : 0,
-				eventRecord.Data.ToArray(),
-				eventRecord.Metadata.ToArray(),
-				eventRecord.TimeStamp.ToBinary(),
-				(long)(eventRecord.TimeStamp - new DateTime(1970, 1, 1)).TotalMilliseconds
-				);
-		}
-
-		public EventRecord(Core.Data.EventRecord eventRecord, long eventNumber) {
-			if (eventRecord == null) return;
-			AssignValues(
-				eventRecord.EventStreamId,
-				eventNumber,
-				eventRecord.EventId.ToByteArray(),
-				eventRecord.EventType,
-				eventRecord.IsJson ? 1 : 0,
-				eventRecord.IsJson ? 1 : 0,
-				eventRecord.Data.ToArray(),
-				eventRecord.Metadata.ToArray(),
-				eventRecord.TimeStamp.ToBinary(),
-				(long)(eventRecord.TimeStamp - new DateTime(1970, 1, 1)).TotalMilliseconds
-			);
-		}
-	}
-
-	partial class ResolvedIndexedEvent {
-		public ResolvedIndexedEvent(EventRecord @event, EventRecord link)
-		{
-			Event = @event;
-			Link = link;
-		}
-
-		public ResolvedIndexedEvent(Core.Data.EventRecord @event, Core.Data.EventRecord link) {
-			if (@event != null) Event = new EventRecord(@event);
-			if (link != null) Link = new EventRecord(link);
-		}
-	}
-
-	partial class ResolvedEvent {
-		public ResolvedEvent(EventRecord @event, EventRecord link, long commitPosition, long preparePosition)
-		{
-			if (@event != null) Event = @event;
-			if (link != null) Link = link;
-			CommitPosition = commitPosition;
-			PreparePosition = preparePosition;
-		}
-
-		public ResolvedEvent(Core.Data.ResolvedEvent pair)
-			: this(pair.Event != null ? new EventRecord(pair.Event) : null,
-				pair.Link != null ? new EventRecord(pair.Link) : null,
-				pair.OriginalPosition?.CommitPosition ?? -1,
-				pair.OriginalPosition?.PreparePosition ?? -1) {
-		}
-	}
-
-	partial class WriteEvents {
-		public WriteEvents(string eventStreamId, long expectedVersion, NewEvent[] events, bool requireLeader)
-		{
-			EventStreamId = eventStreamId;
-			ExpectedVersion = expectedVersion;
-			Events.AddRange(events);
-			RequireLeader = requireLeader;
-		}
-	}
-
-	partial class WriteEventsCompleted {
-		public WriteEventsCompleted(OperationResult result, string message, long firstEventNumber, long lastEventNumber, long preparePosition, long commitPosition, long currentVersion)
-		{
-			Result = result;
-			if(message != null) Message = message;
-			FirstEventNumber = firstEventNumber;
-			LastEventNumber = lastEventNumber;
-			PreparePosition = preparePosition;
-			CommitPosition = commitPosition;
-			CurrentVersion = currentVersion;
-		}
-	}
-
-	partial class DeleteStream {
-		public DeleteStream(string eventStreamId, long expectedVersion, bool requireLeader, bool hardDelete)
-		{
-			EventStreamId = eventStreamId;
-			ExpectedVersion = expectedVersion;
-			RequireLeader = requireLeader;
-			HardDelete = hardDelete;
-		}
-	}
-
-	partial class DeleteStreamCompleted {
-		public DeleteStreamCompleted(OperationResult result, string message, long currentVersion, long preparePosition,
-			long commitPosition) {
-			Result = result;
-			if(!string.IsNullOrEmpty(message)) Message = message;
-			CurrentVersion = currentVersion;
-			PreparePosition = preparePosition;
-			CommitPosition = commitPosition;
-		}
-	}
-
-	partial class TransactionStart {
-		public TransactionStart(string eventStreamId, long expectedVersion, bool requireLeader)
-		{
-			EventStreamId = eventStreamId;
-			ExpectedVersion = expectedVersion;
-			RequireLeader = requireLeader;
-		}
-	}
-
-	partial class TransactionStartCompleted {
-		public TransactionStartCompleted(long transactionId, OperationResult result, string message)
-		{
-			TransactionId = transactionId;
-			Result = result;
-			if(message != null) Message = message;
-		}
-	}
-
-	partial class TransactionWrite {
-		public TransactionWrite(long transactionId, NewEvent[] events, bool requireLeader)
-		{
-			TransactionId = transactionId;
-			Events.AddRange(events);
-			RequireLeader = requireLeader;
-		}
-	}
-
-	partial class TransactionWriteCompleted {
-		public TransactionWriteCompleted(long transactionId, OperationResult result, string message)
-		{
-			TransactionId = transactionId;
-			Result = result;
-			if(message != null) Message = message;
-		}
-	}
-
-	partial class TransactionCommit {
-		public TransactionCommit(long transactionId, bool requireLeader)
-		{
-			TransactionId = transactionId;
-			RequireLeader = requireLeader;
-		}
-	}
-
-	partial class TransactionCommitCompleted {
-		public TransactionCommitCompleted(long transactionId, OperationResult result, string message, long firstEventNumber, long lastEventNumber, long preparePosition, long commitPosition)
-		{
-			TransactionId = transactionId;
-			Result = result;
-			if(message != null) Message = message;
-			FirstEventNumber = firstEventNumber;
-			LastEventNumber = lastEventNumber;
-			PreparePosition = preparePosition;
-			CommitPosition = commitPosition;
-		}
-	}
-
-	partial class ReadEvent {
-		public ReadEvent(string eventStreamId, long eventNumber, bool resolveLinkTos, bool requireLeader)
-		{
-			EventStreamId = eventStreamId;
-			EventNumber = eventNumber;
-			ResolveLinkTos = resolveLinkTos;
-			RequireLeader = requireLeader;
-		}
-	}
-
-	partial class ReadEventCompleted {
-		public ReadEventCompleted(ReadEventCompleted.Types.ReadEventResult result, ResolvedIndexedEvent @event, string error)
-		{
-			Result = result;
-			if (@event != null) Event = @event;
-			if (error != null) Error = error;
-		}
-	}
-
-	partial class ReadStreamEvents {
-		public ReadStreamEvents(string eventStreamId, long fromEventNumber, int maxCount, bool resolveLinkTos, bool requireLeader)
-		{
-			EventStreamId = eventStreamId;
-			FromEventNumber = fromEventNumber;
-			MaxCount = maxCount;
-			ResolveLinkTos = resolveLinkTos;
-			RequireLeader = requireLeader;
-		}
-	}
-
-	partial class ReadStreamEventsCompleted {
-		public ReadStreamEventsCompleted(ResolvedIndexedEvent[] events, ReadStreamEventsCompleted.Types.ReadStreamResult result, long nextEventNumber, long lastEventNumber, bool isEndOfStream, long lastCommitPosition, string error)
-		{
-			Events.AddRange(events);
-			Result = result;
-			NextEventNumber = nextEventNumber;
-			LastEventNumber = lastEventNumber;
-			IsEndOfStream = isEndOfStream;
-			LastCommitPosition = lastCommitPosition;
-			if(error != null) Error = error;
-		}
-	}
-
-	partial class ReadAllEvents {
-		public ReadAllEvents(long commitPosition, long preparePosition, int maxCount, bool resolveLinkTos, bool requireLeader)
-		{
-			CommitPosition = commitPosition;
-			PreparePosition = preparePosition;
-			MaxCount = maxCount;
-			ResolveLinkTos = resolveLinkTos;
-			RequireLeader = requireLeader;
-		}
-	}
-
-	partial class ReadAllEventsCompleted {
-		public ReadAllEventsCompleted(long commitPosition, long preparePosition, ResolvedEvent[] events, long nextCommitPosition, long nextPreparePosition, ReadAllEventsCompleted.Types.ReadAllResult result, string error)
-		{
-			CommitPosition = commitPosition;
-			PreparePosition = preparePosition;
-			Events.AddRange(events);
-			NextCommitPosition = nextCommitPosition;
-			NextPreparePosition = nextPreparePosition;
-			Result = result;
-			if(error != null) Error = error;
-		}
-	}
-
-	partial class Filter {
-		public Filter(Filter.Types.FilterContext context, Filter.Types.FilterType type, string[] data)
-		{
-			Context = context;
-			Type = type;
-			Data.AddRange(data);
-		}
-	}
-
-	partial class FilteredReadAllEvents {
-		public FilteredReadAllEvents(long commitPosition, long preparePosition, int maxCount, int maxSearchWindow, bool resolveLinkTos, bool requireLeader, Filter filter)
-		{
-			CommitPosition = commitPosition;
-			PreparePosition = preparePosition;
-			MaxCount = maxCount;
-			MaxSearchWindow = maxSearchWindow;
-			ResolveLinkTos = resolveLinkTos;
-			RequireLeader = requireLeader;
-			Filter = filter;
-		}
-	}
-
-	partial class FilteredReadAllEventsCompleted {
-		public FilteredReadAllEventsCompleted(long commitPosition, long preparePosition, ResolvedEvent[] events, long nextCommitPosition, long nextPreparePosition, bool isEndOfStream, FilteredReadAllEventsCompleted.Types.FilteredReadAllResult result, string error)
-		{
-			CommitPosition = commitPosition;
-			PreparePosition = preparePosition;
-			Events.AddRange(events);
-			NextCommitPosition = nextCommitPosition;
-			NextPreparePosition = nextPreparePosition;
-			IsEndOfStream = isEndOfStream;
-			Result = result;
-			if(error != null) Error = error;
-		}
-	}
-
-	partial class CreatePersistentSubscription {
-		public CreatePersistentSubscription(string subscriptionGroupName, string eventStreamId, bool resolveLinkTos, long startFrom, int messageTimeoutMilliseconds, bool recordStatistics, int liveBufferSize, int readBatchSize, int bufferSize, int maxRetryCount, bool preferRoundRobin, int checkpointAfterTime, int checkpointMaxCount, int checkpointMinCount, int subscriberMaxCount, string namedConsumerStrategy)
-		{
-			SubscriptionGroupName = subscriptionGroupName;
-			EventStreamId = eventStreamId;
-			ResolveLinkTos = resolveLinkTos;
-			StartFrom = startFrom;
-			MessageTimeoutMilliseconds = messageTimeoutMilliseconds;
-			RecordStatistics = recordStatistics;
-			LiveBufferSize = liveBufferSize;
-			ReadBatchSize = readBatchSize;
-			BufferSize = bufferSize;
-			MaxRetryCount = maxRetryCount;
-			PreferRoundRobin = preferRoundRobin;
-			CheckpointAfterTime = checkpointAfterTime;
-			CheckpointMaxCount = checkpointMaxCount;
-			CheckpointMinCount = checkpointMinCount;
-			SubscriberMaxCount = subscriberMaxCount;
-			NamedConsumerStrategy = namedConsumerStrategy;
-		}
-	}
-
-	partial class CreatePersistentSubscriptionCompleted {
-		public CreatePersistentSubscriptionCompleted(CreatePersistentSubscriptionCompleted.Types.CreatePersistentSubscriptionResult result, string reason) {
-			Result = result;
-			if (reason != null) Reason = reason;
-		}
-	}
-
-	partial class DeletePersistentSubscription {
-		public DeletePersistentSubscription(string subscriptionGroupName, string eventStreamId)
-		{
-			SubscriptionGroupName = subscriptionGroupName;
-			EventStreamId = eventStreamId;
-		}
-	}
-
-	partial class DeletePersistentSubscriptionCompleted {
-		public DeletePersistentSubscriptionCompleted(Types.DeletePersistentSubscriptionResult result, string reason) {
-			Result = result;
-			Reason = reason;
-		}
-	}
-
-	partial class UpdatePersistentSubscription {
-		public UpdatePersistentSubscription(string subscriptionGroupName, string eventStreamId, bool resolveLinkTos, long startFrom, int messageTimeoutMilliseconds, bool recordStatistics, int liveBufferSize, int readBatchSize, int bufferSize, int maxRetryCount, bool preferRoundRobin, int checkpointAfterTime, int checkpointMaxCount, int checkpointMinCount, int subscriberMaxCount, string namedConsumerStrategy)
-		{
-			SubscriptionGroupName = subscriptionGroupName;
-			EventStreamId = eventStreamId;
-			ResolveLinkTos = resolveLinkTos;
-			StartFrom = startFrom;
-			MessageTimeoutMilliseconds = messageTimeoutMilliseconds;
-			RecordStatistics = recordStatistics;
-			LiveBufferSize = liveBufferSize;
-			ReadBatchSize = readBatchSize;
-			BufferSize = bufferSize;
-			MaxRetryCount = maxRetryCount;
-			PreferRoundRobin = preferRoundRobin;
-			CheckpointAfterTime = checkpointAfterTime;
-			CheckpointMaxCount = checkpointMaxCount;
-			CheckpointMinCount = checkpointMinCount;
-			SubscriberMaxCount = subscriberMaxCount;
-			NamedConsumerStrategy = namedConsumerStrategy;
-		}
-	}
-
-	partial class UpdatePersistentSubscriptionCompleted {
-		public UpdatePersistentSubscriptionCompleted(UpdatePersistentSubscriptionCompleted.Types.UpdatePersistentSubscriptionResult result, string reason) {
-			Result = result;
-			if (reason != null) Reason = reason;
-		}
-	}
-
-	partial class ConnectToPersistentSubscription {
-		public ConnectToPersistentSubscription(string subscriptionId, string eventStreamId, int allowedInFlightMessages)
-		{
-			SubscriptionId = subscriptionId;
-			EventStreamId = eventStreamId;
-			AllowedInFlightMessages = allowedInFlightMessages;
-		}
-	}
-
-	partial class PersistentSubscriptionConfirmation {
-		public PersistentSubscriptionConfirmation(long lastCommitPosition, string subscriptionId, long lastEventNumber)
-		{
-			LastCommitPosition = lastCommitPosition;
-			SubscriptionId = subscriptionId;
-			LastEventNumber = lastEventNumber;
-		}
-	}
-
-	partial class PersistentSubscriptionAckEvents {
-		public PersistentSubscriptionAckEvents(string subscriptionId, byte[][] processedEventIds)
-		{
-			SubscriptionId = subscriptionId;
-			for (int i = 0; i < processedEventIds.Length; i++) {
-				ProcessedEventIds.Add(ByteString.CopyFrom(processedEventIds[i]));
-			}
-		}
-	}
-
-	partial class PersistentSubscriptionNakEvents {
-		public PersistentSubscriptionNakEvents(string subscriptionId, byte[][] processedEventIds, string message, PersistentSubscriptionNakEvents.Types.NakAction action)
-		{
-			SubscriptionId = subscriptionId;
-			for (int i = 0; i < processedEventIds.Length; i++) {
-				ProcessedEventIds.Add(ByteString.CopyFrom(processedEventIds[i]));
-			}
-
-			if (message != null) Message = message;
-			Action = action;
-		}
-	}
-
-	partial class PersistentSubscriptionStreamEventAppeared {
-		public PersistentSubscriptionStreamEventAppeared(ResolvedIndexedEvent @event, int retryCount)
-		{
-			Event = @event;
-			RetryCount = retryCount;
-		}
-	}
-
-	partial class SubscribeToStream {
-		public SubscribeToStream(string eventStreamId, bool resolveLinkTos)
-		{
-			EventStreamId = eventStreamId;
-			ResolveLinkTos = resolveLinkTos;
-		}
-	}
-
-	partial class FilteredSubscribeToStream {
-		public FilteredSubscribeToStream(string eventStreamId, bool resolveLinkTos, Filter filter, int checkpointInterval)
-		{
-			EventStreamId = eventStreamId;
-			ResolveLinkTos = resolveLinkTos;
-			Filter = filter;
-			CheckpointInterval = checkpointInterval;
-		}
-	}
-
-	partial class CheckpointReached {
-		public CheckpointReached(long commitPosition, long preparePosition)
-		{
-			CommitPosition = commitPosition;
-			PreparePosition = preparePosition;
-		}
-	}
-
-	partial class SubscriptionConfirmation {
-		public SubscriptionConfirmation(long lastCommitPosition, long lastEventNumber)
-		{
-			LastCommitPosition = lastCommitPosition;
-			LastEventNumber = lastEventNumber;
-		}
-	}
-
-	partial class StreamEventAppeared {
-		public StreamEventAppeared(ResolvedEvent @event) {
-			Event = @event;
-		}
-	}
-
-	partial class SubscriptionDropped {
-		public SubscriptionDropped(SubscriptionDropped.Types.SubscriptionDropReason reason)
-		{
-			Reason = reason;
-		}
-	}
-
-	partial class NotHandled {
-		public NotHandled(ClientMessage.NotHandled source) {
-			Reason = source.Reason switch {
-				ClientMessage.NotHandled.Types.NotHandledReason.NotReady => Types.NotHandledReason.NotReady,
-				ClientMessage.NotHandled.Types.NotHandledReason.TooBusy => Types.NotHandledReason.TooBusy,
-				ClientMessage.NotHandled.Types.NotHandledReason.NotLeader => Types.NotHandledReason.NotLeader,
-				ClientMessage.NotHandled.Types.NotHandledReason.IsReadOnly => Types.NotHandledReason.IsReadOnly,
-				_ => throw new ArgumentOutOfRangeException()
-			};
-			//this is horrible and only for transport compatibility purposes
-			if(source.LeaderInfo != null) AdditionalInfo = new Types.LeaderInfo(source.LeaderInfo.ExternalTcp, source.LeaderInfo.IsSecure, source.LeaderInfo.Http).ToByteString();
-		}
-		partial class Types {
-			partial class LeaderInfo {
-				public LeaderInfo(string externalTcpAddress, int externalTcpPort, string httpAddress, int httpPort, string externalSecureTcpAddress, int externalSecureTcpPort)
-				{
-					ExternalTcpAddress = externalTcpAddress;
-					ExternalTcpPort = externalTcpPort;
-					HttpAddress = httpAddress;
-					HttpPort = httpPort;
-					ExternalSecureTcpAddress = externalSecureTcpAddress;
-					ExternalSecureTcpPort = externalSecureTcpPort;
-				}
-
-				public LeaderInfo(EndPoint tcpEndPoint, bool isTcpEndPointSecure, EndPoint httpEndPoint) {
-					if (isTcpEndPointSecure) {
-						ExternalSecureTcpAddress = tcpEndPoint?.GetHost();
-						ExternalSecureTcpPort = tcpEndPoint?.GetPort() ?? 0;
-					} else {
-						ExternalTcpAddress = tcpEndPoint?.GetHost();
-						ExternalTcpPort = tcpEndPoint?.GetPort() ?? 0;
-					}
-
-					HttpAddress = httpEndPoint.GetHost();
-					HttpPort = httpEndPoint.GetPort();
-				}
-			}
-		}
-	}
-
-	partial class ScavengeDatabaseResponse {
-		public ScavengeDatabaseResponse(ScavengeDatabaseResponse.Types.ScavengeResult result, string scavengeId)
-		{
-			Result = result;
-			ScavengeId = scavengeId;
-		}
-	}
-
-	partial class IdentifyClient {
-		public IdentifyClient(int version, string connectionName) {
-			Version = version;
-			if (connectionName != null) ConnectionName = connectionName;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/TcpMessage.cs b/src/EventStore.Core/Messages/TcpMessage.cs
deleted file mode 100644
index 8b5f324866c..00000000000
--- a/src/EventStore.Core/Messages/TcpMessage.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using System;
-using System.Net.Sockets;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Transport.Tcp;
-
-namespace EventStore.Core.Messages {
-	public static partial class TcpMessage {
-		[DerivedMessage(CoreMessage.Tcp)]
-		public partial class TcpSend : Message, IQueueAffineMessage {
-			public int QueueId {
-				get { return ConnectionManager.GetHashCode(); }
-			}
-
-			public readonly TcpConnectionManager ConnectionManager;
-			public readonly Message Message;
-
-			public TcpSend(TcpConnectionManager connectionManager, Message message) {
-				ConnectionManager = connectionManager;
-				Message = message;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Tcp)]
-		public partial class Heartbeat : Message {
-			public readonly long ReceiveProgressIndicator;
-			public readonly long SendProgressIndicator;
-
-			public Heartbeat(long receiveProgressIndicator, long sendProgressIndicator) {
-				ReceiveProgressIndicator = receiveProgressIndicator;
-				SendProgressIndicator = sendProgressIndicator;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Tcp)]
-		public partial class HeartbeatTimeout : Message {
-			public readonly long ReceiveProgressIndicator;
-
-			public HeartbeatTimeout(long receiveProgressIndicator) {
-				ReceiveProgressIndicator = receiveProgressIndicator;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Tcp)]
-		public partial class PongMessage : Message {
-			public readonly Guid CorrelationId;
-			public readonly byte[] Payload;
-
-			public PongMessage(Guid correlationId, byte[] payload) {
-				CorrelationId = correlationId;
-				Payload = payload;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Tcp)]
-		public partial class ConnectionEstablished : Message {
-			public readonly TcpConnectionManager Connection;
-
-			public ConnectionEstablished(TcpConnectionManager connection) {
-				Connection = connection;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Tcp)]
-		public partial class ConnectionClosed : Message {
-			public readonly TcpConnectionManager Connection;
-			public readonly SocketError SocketError;
-
-			public ConnectionClosed(TcpConnectionManager connection, SocketError socketError) {
-				Connection = connection;
-				SocketError = socketError;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Tcp)]
-		public partial class NotReady : Message {
-			public readonly Guid CorrelationId;
-			public readonly string Reason;
-
-			public NotReady(Guid correlationId, string reason) {
-				CorrelationId = correlationId;
-				Reason = reason;
-			}
-		}
-
-
-		[DerivedMessage(CoreMessage.Tcp)]
-		public partial class NotAuthenticated : Message {
-			public readonly Guid CorrelationId;
-			public readonly string Reason;
-
-			public NotAuthenticated(Guid correlationId, string reason) {
-				CorrelationId = correlationId;
-				Reason = reason;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Tcp)]
-		public partial class Authenticated : Message {
-			public readonly Guid CorrelationId;
-
-			public Authenticated(Guid correlationId) {
-				CorrelationId = correlationId;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messages/UserManagementMessage.cs b/src/EventStore.Core/Messages/UserManagementMessage.cs
deleted file mode 100644
index 018530d42a4..00000000000
--- a/src/EventStore.Core/Messages/UserManagementMessage.cs
+++ /dev/null
@@ -1,256 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Transport.Http.Controllers;
-
-namespace EventStore.Core.Messages {
-	public static partial class UserManagementMessage {
-		[DerivedMessage(CoreMessage.UserManagement)]
-		public partial class RequestMessage : Message {
-			public readonly IEnvelope Envelope;
-			public readonly ClaimsPrincipal Principal;
-
-			public RequestMessage(IEnvelope envelope, ClaimsPrincipal principal) {
-				Envelope = envelope;
-				Principal = principal;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.UserManagement)]
-		public partial class ResponseMessage : Message {
-			public readonly bool Success;
-			public readonly Error Error;
-
-			public ResponseMessage(bool success, Error error) {
-				Success = success;
-				Error = error;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.UserManagement)]
-		public partial class UserManagementRequestMessage : RequestMessage {
-			public readonly string LoginName;
-
-			protected UserManagementRequestMessage(IEnvelope envelope, ClaimsPrincipal principal, string loginName)
-				: base(envelope, principal) {
-				LoginName = loginName;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.UserManagement)]
-		public sealed partial class Create : UserManagementRequestMessage {
-			public readonly string FullName;
-			public readonly string[] Groups;
-			public readonly string Password;
-
-			public Create(
-				IEnvelope envelope, ClaimsPrincipal principal, string loginName, string fullName, string[] groups,
-				string password)
-				: base(envelope, principal, loginName) {
-				FullName = fullName;
-				Groups = groups;
-				Password = password;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.UserManagement)]
-		public sealed partial class Update : UserManagementRequestMessage {
-			public readonly string FullName;
-			public readonly string[] Groups;
-
-			public Update(IEnvelope envelope, ClaimsPrincipal principal, string loginName, string fullName, string[] groups)
-				: base(envelope, principal, loginName) {
-				FullName = fullName;
-				Groups = groups;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.UserManagement)]
-		public sealed partial class Disable : UserManagementRequestMessage {
-			public Disable(IEnvelope envelope, ClaimsPrincipal principal, string loginName)
-				: base(envelope, principal, loginName) {
-			}
-		}
-
-		[DerivedMessage(CoreMessage.UserManagement)]
-		public sealed partial class Enable : UserManagementRequestMessage {
-			public Enable(IEnvelope envelope, ClaimsPrincipal principal, string loginName)
-				: base(envelope, principal, loginName) {
-			}
-		}
-
-		[DerivedMessage(CoreMessage.UserManagement)]
-		public sealed partial class Delete : UserManagementRequestMessage {
-			public Delete(IEnvelope envelope, ClaimsPrincipal principal, string loginName)
-				: base(envelope, principal, loginName) {
-			}
-		}
-
-		[DerivedMessage(CoreMessage.UserManagement)]
-		public sealed partial class ResetPassword : UserManagementRequestMessage {
-			public readonly string NewPassword;
-
-			public ResetPassword(IEnvelope envelope, ClaimsPrincipal principal, string loginName, string newPassword)
-				: base(envelope, principal, loginName) {
-				NewPassword = newPassword;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.UserManagement)]
-		public sealed partial class ChangePassword : UserManagementRequestMessage {
-			public readonly string CurrentPassword;
-			public readonly string NewPassword;
-
-			public ChangePassword(
-				IEnvelope envelope, ClaimsPrincipal principal, string loginName, string currentPassword, string newPassword)
-				: base(envelope, principal, loginName) {
-				CurrentPassword = currentPassword;
-				NewPassword = newPassword;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.UserManagement)]
-		public sealed partial class GetAll : RequestMessage {
-			public GetAll(IEnvelope envelope, ClaimsPrincipal principal)
-				: base(envelope, principal) {
-			}
-		}
-
-		[DerivedMessage(CoreMessage.UserManagement)]
-		public sealed partial class Get : UserManagementRequestMessage {
-			public Get(IEnvelope envelope, ClaimsPrincipal principal, string loginName)
-				: base(envelope, principal, loginName) {
-			}
-		}
-
-		public enum Error {
-			Success,
-			NotFound,
-			Conflict,
-			Error,
-			TryAgain,
-			Unauthorized
-		}
-
-		public sealed class UserData {
-			public readonly string LoginName;
-			public readonly string FullName;
-			public readonly string[] Groups;
-			public readonly DateTimeOffset? DateLastUpdated;
-			public readonly bool Disabled;
-
-			public UserData(
-				string loginName, string fullName, string[] groups, bool disabled, DateTimeOffset? dateLastUpdated) {
-				LoginName = loginName;
-				FullName = fullName;
-				Groups = groups;
-				Disabled = disabled;
-				DateLastUpdated = dateLastUpdated;
-			}
-
-			internal UserData() {
-			}
-		}
-
-		[DerivedMessage(CoreMessage.UserManagement)]
-		public sealed partial class UpdateResult : ResponseMessage {
-			public readonly string LoginName;
-
-			public UpdateResult(string loginName)
-				: base(true, Error.Success) {
-				LoginName = loginName;
-			}
-
-			public UpdateResult(string loginName, Error error)
-				: base(false, error) {
-				LoginName = loginName;
-			}
-		}
-
-		public class UserDataHttpFormated {
-			public readonly string LoginName;
-			public readonly string FullName;
-			public readonly string[] Groups;
-			public readonly DateTimeOffset? DateLastUpdated;
-			public readonly bool Disabled;
-			public readonly List<RelLink> Links;
-
-			public UserDataHttpFormated(UserData userData, Func<string, string> makeAbsoluteUrl) {
-				LoginName = userData.LoginName;
-				FullName = userData.FullName;
-				Groups = userData.Groups;
-				Disabled = userData.Disabled;
-
-				Links = new List<RelLink>();
-				var userLocalUrl = "/users/" + userData.LoginName;
-				Links.Add(new RelLink(makeAbsoluteUrl(userLocalUrl + "/command/reset-password"), "reset-password"));
-				Links.Add(new RelLink(makeAbsoluteUrl(userLocalUrl + "/command/change-password"), "change-password"));
-				Links.Add(new RelLink(makeAbsoluteUrl(userLocalUrl), "edit"));
-				Links.Add(new RelLink(makeAbsoluteUrl(userLocalUrl), "delete"));
-
-				Links.Add(userData.Disabled
-					? new RelLink(makeAbsoluteUrl(userLocalUrl + "/command/enable"), "enable")
-					: new RelLink(makeAbsoluteUrl(userLocalUrl + "/command/disable"), "disable"));
-			}
-		}
-
-
-		[DerivedMessage(CoreMessage.UserManagement)]
-		public partial class UserDetailsResultHttpFormatted : ResponseMessage {
-			public readonly UserDataHttpFormated Data;
-
-			public UserDetailsResultHttpFormatted(UserDetailsResult msg, Func<string, string> makeAbsoluteUrl) :
-				base(msg.Success, msg.Error) {
-				if (msg.Data != null)
-					Data = new UserDataHttpFormated(msg.Data, makeAbsoluteUrl);
-			}
-		}
-
-		[DerivedMessage(CoreMessage.UserManagement)]
-		public partial class AllUserDetailsResultHttpFormatted : ResponseMessage {
-			public readonly UserDataHttpFormated[] Data;
-
-			public AllUserDetailsResultHttpFormatted(AllUserDetailsResult msg, Func<string, string> makeAbsoluteUrl) :
-				base(msg.Success, msg.Error) {
-				Data = msg.Data.Select(user => new UserDataHttpFormated(user, makeAbsoluteUrl)).ToArray();
-			}
-		}
-
-
-		[DerivedMessage(CoreMessage.UserManagement)]
-		public sealed partial class UserDetailsResult : ResponseMessage {
-			public readonly UserData Data;
-
-			public UserDetailsResult(UserData data)
-				: base(true, Error.Success) {
-				Data = data;
-			}
-
-			public UserDetailsResult(Error error)
-				: base(false, error) {
-				Data = null;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.UserManagement)]
-		public sealed partial class AllUserDetailsResult : ResponseMessage {
-			public readonly UserData[] Data;
-
-			internal AllUserDetailsResult()
-				: base(true, Error.Success) {
-			}
-
-			public AllUserDetailsResult(UserData[] data)
-				: base(true, Error.Success) {
-				Data = data;
-			}
-
-			public AllUserDetailsResult(Error error)
-				: base(false, error) {
-				Data = null;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messaging/AdHocCorrelatedTimeout.cs b/src/EventStore.Core/Messaging/AdHocCorrelatedTimeout.cs
deleted file mode 100644
index 2be3232b790..00000000000
--- a/src/EventStore.Core/Messaging/AdHocCorrelatedTimeout.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-
-namespace EventStore.Core.Messaging {
-	public struct AdHocCorrelatedTimeout : ICorrelatedTimeout {
-		private readonly Action<Guid> _timeout;
-
-		public AdHocCorrelatedTimeout(Action<Guid> timeout) {
-			_timeout = timeout;
-		}
-
-		public void Timeout(Guid correlationId) {
-			_timeout(correlationId);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messaging/CallbackEnvelope.cs b/src/EventStore.Core/Messaging/CallbackEnvelope.cs
deleted file mode 100644
index 508797e8b95..00000000000
--- a/src/EventStore.Core/Messaging/CallbackEnvelope.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.Messaging {
-	public class CallbackEnvelope : IEnvelope {
-		private readonly Action<Message> _callback;
-
-		public CallbackEnvelope(Action<Message> callback) {
-			_callback = callback;
-			Ensure.NotNull(callback, "callback");
-		}
-
-		public void ReplyWith<T>(T message) where T : Message {
-			_callback(message);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messaging/ContinuationEnvelope.cs b/src/EventStore.Core/Messaging/ContinuationEnvelope.cs
deleted file mode 100644
index 398cb89ae0e..00000000000
--- a/src/EventStore.Core/Messaging/ContinuationEnvelope.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.Messaging {
-	public class ChannelEnvelope : IEnvelope {
-		private readonly Channel<Message> _channel;
-
-		public ChannelEnvelope(Channel<Message> channel) {
-			_channel = channel;
-		}
-
-		public void ReplyWith<T>(T message) where T : Message {
-			_channel.Writer.TryWrite(message);
-		}
-	}
-	public class ContinuationEnvelope : IEnvelope {
-		private readonly Func<Message, CancellationToken, Task> _onMessage;
-		private readonly SemaphoreSlim _semaphore;
-		private readonly CancellationToken _cancellationToken;
-
-		public ContinuationEnvelope(Func<Message, CancellationToken, Task> onMessage, SemaphoreSlim semaphore,
-			CancellationToken cancellationToken) {
-			_onMessage = onMessage;
-			_semaphore = semaphore;
-			_cancellationToken = cancellationToken;
-		}
-
-		public void ReplyWith<T>(T message) where T : Message {
-			try {
-				_semaphore.Wait(_cancellationToken);
-				_onMessage(message, _cancellationToken).ContinueWith(_ => _semaphore.Release(), _cancellationToken);
-			}
-			catch (ObjectDisposedException) {}
-			catch (OperationCanceledException) {}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messaging/CoreMessage.cs b/src/EventStore.Core/Messaging/CoreMessage.cs
deleted file mode 100644
index 1274ffd2e88..00000000000
--- a/src/EventStore.Core/Messaging/CoreMessage.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace EventStore.Core.Messaging {
-	// The name of this enum and its members are used for metrics
-	public enum CoreMessage {
-		None,
-		Authentication,
-		Awake,
-		Client,
-		ClusterClient,
-		Election,
-		Gossip,
-		Grpc,
-		Http,
-		IODispatcher,
-		LeaderDiscovery,
-		Monitoring,
-		Misc,
-		Redaction,
-		Replication,
-		ReplicationTracking,
-		Storage,
-		Subscription,
-		System,
-		Tcp,
-		Telemetry,
-		Timer,
-		UserManagement
-	}
-}
diff --git a/src/EventStore.Core/Messaging/Forwarder.cs b/src/EventStore.Core/Messaging/Forwarder.cs
deleted file mode 100644
index 494af41d3ff..00000000000
--- a/src/EventStore.Core/Messaging/Forwarder.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Bus;
-
-namespace EventStore.Core.Messaging {
-	public static class Forwarder {
-		/// <summary>
-		/// Creates a message handler publishing all incoming messages on destination.  
-		/// </summary>
-		public static IHandle<T> Create<T>(IPublisher to) where T : Message {
-			return new F<T>(to);
-		}
-
-		public static IHandle<T> CreateTracing<T>(IPublisher to, string prefix) where T : Message {
-			return new FTracing<T>(to, prefix);
-		}
-
-		/// <summary>
-		/// Creates a message handler publishing all incoming messages onto one of the destinations.  
-		/// </summary>
-		public static IHandle<T> CreateBalancing<T>(IReadOnlyList<IPublisher> to) where T : Message {
-			return new Balancing<T>(to);
-		}
-
-		class F<T> : IHandle<T> where T : Message {
-			private readonly IPublisher _to;
-
-			public F(IPublisher to) {
-				_to = to;
-			}
-
-			public void Handle(T message) {
-				_to.Publish(message);
-			}
-		}
-
-		class FTracing<T> : IHandle<T> where T : Message {
-			private readonly IPublisher _to;
-			private readonly string _prefix;
-
-			public FTracing(IPublisher to, string prefix) {
-				_to = to;
-				_prefix = prefix;
-			}
-
-			public void Handle(T message) {
-				Console.WriteLine(_prefix + message.GetType().Name);
-				_to.Publish(message);
-			}
-		}
-
-		class Balancing<T> : IHandle<T> where T : Message {
-			private readonly IReadOnlyList<IPublisher> _to;
-			private int _last;
-
-			public Balancing(IReadOnlyList<IPublisher> to) {
-				_to = to;
-			}
-
-			public void Handle(T message) {
-				var last = _last;
-				if (last == _to.Count - 1)
-					_last = 0;
-				else
-					_last = last + 1;
-				_to[_last].Publish(message);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messaging/ICorrelatedTimeout.cs b/src/EventStore.Core/Messaging/ICorrelatedTimeout.cs
deleted file mode 100644
index c76ef0bfc67..00000000000
--- a/src/EventStore.Core/Messaging/ICorrelatedTimeout.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System;
-
-namespace EventStore.Core.Messaging {
-	public interface ICorrelatedTimeout {
-		void Timeout(Guid correlationId);
-	}
-}
diff --git a/src/EventStore.Core/Messaging/IEnvelope.cs b/src/EventStore.Core/Messaging/IEnvelope.cs
deleted file mode 100644
index 7ab44044a81..00000000000
--- a/src/EventStore.Core/Messaging/IEnvelope.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace EventStore.Core.Messaging {
-	public interface IEnvelope<in T> {
-		void ReplyWith<U>(U message) where U : T;
-	}
-
-	public interface IEnvelope : IEnvelope<Message> {
-	}
-}
diff --git a/src/EventStore.Core/Messaging/Message.cs b/src/EventStore.Core/Messaging/Message.cs
deleted file mode 100644
index c3f9228ce9a..00000000000
--- a/src/EventStore.Core/Messaging/Message.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-
-namespace EventStore.Core.Messaging;
-
-[AttributeUsage(AttributeTargets.Class)]
-public class BaseMessageAttribute : Attribute {
-	public BaseMessageAttribute() {
-	}
-}
-
-[AttributeUsage(AttributeTargets.Class)]
-public class DerivedMessageAttribute : Attribute {
-	public DerivedMessageAttribute() {
-	}
-
-	public DerivedMessageAttribute(object messageGroup) {
-	}
-}
-
-[BaseMessage]
-public abstract partial class Message;
diff --git a/src/EventStore.Core/Messaging/NoopEnvelope.cs b/src/EventStore.Core/Messaging/NoopEnvelope.cs
deleted file mode 100644
index d09149133a0..00000000000
--- a/src/EventStore.Core/Messaging/NoopEnvelope.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.Core.Messaging {
-	public class NoopEnvelope : IEnvelope {
-		public void ReplyWith<T>(T message) where T : Message {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messaging/RequestResponseAltDispatcher.cs b/src/EventStore.Core/Messaging/RequestResponseAltDispatcher.cs
deleted file mode 100644
index f092fb3ade5..00000000000
--- a/src/EventStore.Core/Messaging/RequestResponseAltDispatcher.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-
-namespace EventStore.Core.Messaging {
-	// Just a typedef
-	public class ReadDispatcher :
-		RequestResponseAltDispatcher<
-			ClientMessage.ReadStreamEventsBackward,
-			ClientMessage.ReadStreamEventsBackwardCompleted,
-			ClientMessage.NotHandled,
-			IReadStreamEventsBackwardHandler> {
-		public ReadDispatcher(
-			IPublisher publisher,
-			Func<ClientMessage.ReadStreamEventsBackward, Guid> getRequestCorrelationId,
-			Func<ClientMessage.ReadStreamEventsBackwardCompleted, Guid> getResponseCorrelationId,
-			Func<ClientMessage.NotHandled, Guid> getResponseAltCorrelationId,
-			IEnvelope defaultReplyEnvelope,
-			Func<Guid, Message> cancelMessageFactory = null) :
-				base(publisher, getRequestCorrelationId, getResponseCorrelationId,
-					getResponseAltCorrelationId, defaultReplyEnvelope, cancelMessageFactory) {
-		}
-	}
-
-	// This derivation of RequestResponseDispatcher handles two different response messages
-	// Useful if the system might respond to the request with a message like NotHandled and we want to know about it.
-	public class RequestResponseAltDispatcher<TRequest, TResponse, TResponseAlt, THandler> :
-		RequestResponseDispatcher<TRequest, TResponse, THandler>,
-		IHandle<TResponseAlt>
-		where TRequest : Message
-		where TResponse : Message
-		where TResponseAlt : Message
-		where THandler : IHandle<TResponse>, IHandleAlt<TResponseAlt>, IHandleTimeout {
-
-		private readonly Func<TResponseAlt, Guid> _getResponseAltCorrelationId;
-
-		public RequestResponseAltDispatcher(
-			IPublisher publisher,
-			Func<TRequest, Guid> getRequestCorrelationId,
-			Func<TResponse, Guid> getResponseCorrelationId,
-			Func<TResponseAlt, Guid> getResponseAltCorrelationId,
-			IEnvelope defaultReplyEnvelope,
-			Func<Guid, Message> cancelMessageFactory = null) : base(
-				publisher,
-				getRequestCorrelationId,
-				getResponseCorrelationId,
-				defaultReplyEnvelope,
-				cancelMessageFactory) {
-			_getResponseAltCorrelationId = getResponseAltCorrelationId;
-		}
-
-		void IHandle<TResponseAlt>.Handle(TResponseAlt message) {
-			var correlationId = _getResponseAltCorrelationId(message);
-
-			// if we don't handle the alternative message, then don't remove the handler
-			// so that it can be called on timeout
-			var handlerExists = TryRemoveHandler(correlationId, static h => h.HandlesAlt, out var handler);
-
-			if (handlerExists) {
-				handler.Handle(message);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messaging/RequestResponseDispatcher.cs b/src/EventStore.Core/Messaging/RequestResponseDispatcher.cs
deleted file mode 100644
index c96d4732a7c..00000000000
--- a/src/EventStore.Core/Messaging/RequestResponseDispatcher.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Bus;
-
-namespace EventStore.Core.Messaging {
-	// This derivation of RequestResponseDispatcher provides a simple THandler that handles the expected TResponse message.
-	// Alternate responses (such as NotHandled) are not processed. Timeouts, if any, are implemented elsewhere
-	// (i.e. in the IODispatcher).
-	// Allows IODispatcher to use RequestResponseDispatcher in the traditional way.
-	public sealed class RequestResponseDispatcher<TRequest, TResponse> :
-		RequestResponseDispatcher<TRequest, TResponse, AdHocHandlerStruct<TResponse>>
-		where TRequest : Message
-		where TResponse : Message {
-
-		public RequestResponseDispatcher(
-			IPublisher publisher,
-			Func<TRequest, Guid> getRequestCorrelationId,
-			Func<TResponse, Guid> getResponseCorrelationId,
-			IEnvelope defaultReplyEnvelope,
-			Func<Guid, Message> cancelMessageFactory = null) : base(
-				publisher,
-				getRequestCorrelationId,
-				getResponseCorrelationId,
-				defaultReplyEnvelope,
-				cancelMessageFactory) {
-		}
-
-		public Guid Publish(TRequest request, Action<TResponse> response, Action timeout = null) =>
-			Publish(request, new AdHocHandlerStruct<TResponse>(response, timeout));
-	}
-
-	// Sends requests on the _publisher, keeping hold of a THandler in the _map to handle the response.
-	// Handles responses via IHandle, correlating them to the THandler in the _map.
-	public class RequestResponseDispatcher<TRequest, TResponse, THandler> :
-		IHandle<TResponse>,
-		ICorrelatedTimeout
-		where TRequest : Message
-		where TResponse : Message
-		where THandler : IHandle<TResponse>, IHandleTimeout {
-
-		private readonly Dictionary<Guid, THandler> _map = new Dictionary<Guid, THandler>();
-		private readonly IPublisher _publisher;
-		private readonly Func<TRequest, Guid> _getRequestCorrelationId;
-		private readonly Func<TResponse, Guid> _getResponseCorrelationId;
-		private readonly IEnvelope _defaultReplyEnvelope;
-		private readonly Func<Guid, Message> _cancelMessageFactory;
-
-		protected RequestResponseDispatcher(
-			IPublisher publisher,
-			Func<TRequest, Guid> getRequestCorrelationId,
-			Func<TResponse, Guid> getResponseCorrelationId,
-			IEnvelope defaultReplyEnvelope,
-			Func<Guid, Message> cancelMessageFactory = null) {
-			_publisher = publisher;
-			_getRequestCorrelationId = getRequestCorrelationId;
-			_getResponseCorrelationId = getResponseCorrelationId;
-			_defaultReplyEnvelope = defaultReplyEnvelope;
-			_cancelMessageFactory = cancelMessageFactory;
-		}
-
-		public Guid Publish(TRequest request, THandler handler) {
-			//TODO: expiration?
-			Guid requestCorrelationId;
-			lock (_map) {
-				requestCorrelationId = _getRequestCorrelationId(request);
-				_map.Add(requestCorrelationId, handler);
-			}
-
-			_publisher.Publish(request);
-			//NOTE: the following condition is required as publishing the message could also process the message 
-			// and the correlationId is already invalid here
-			lock (_map)
-				return _map.ContainsKey(requestCorrelationId) ? requestCorrelationId : Guid.Empty;
-		}
-
-		void IHandle<TResponse>.Handle(TResponse message) {
-			Handle(message);
-		}
-
-		public bool Handle(TResponse message) {
-			var correlationId = _getResponseCorrelationId(message);
-			var handlerExists = TryRemoveHandler(correlationId, static _ => true, out var handler);
-
-			// We mustn't call the handler inside the lock as we have no
-			// knowledge of it's behaviour, which might result in dead locks.
-			if (handlerExists) {
-				handler.Handle(message);
-				return true;
-			}
-
-			return false;
-		}
-
-		public void Timeout(Guid correlationId) {
-			// if we don't handle timeouts then don't remove the handler
-			// so that the regular handler can still be called if it comes through.
-			// long term i doubt any of the handlers should not deal with timeouts.
-			if (TryRemoveHandler(correlationId, static h => h.HandlesTimeout, out var handler)) {
-				handler.Timeout();
-			}
-		}
-
-		protected bool TryRemoveHandler(Guid correlationId, Func<THandler, bool> condition, out THandler handler) {
-			lock (_map) {
-				var handlerExists = _map.TryGetValue(correlationId, out handler);
-				if (handlerExists && condition(handler)) {
-					_map.Remove(correlationId);
-					return true;
-				}
-				return false;
-			}
-		}
-
-		public IEnvelope Envelope {
-			get { return _defaultReplyEnvelope; }
-		}
-
-		public void Cancel(Guid requestId) {
-			if (_cancelMessageFactory != null)
-				_publisher.Publish(_cancelMessageFactory(requestId));
-			lock (_map)
-				_map.Remove(requestId);
-		}
-
-		public void CancelAll() {
-			Guid[] ids = null;
-			lock (_map) {
-				_map.Clear();
-				if (_cancelMessageFactory != null)
-					ids = _map.Keys.ToArray();
-			}
-
-			if (ids != null)
-				foreach (var id in ids)
-					_publisher.Publish(_cancelMessageFactory(id));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messaging/SendToThisEnvelope.cs b/src/EventStore.Core/Messaging/SendToThisEnvelope.cs
deleted file mode 100644
index 9aea02b7598..00000000000
--- a/src/EventStore.Core/Messaging/SendToThisEnvelope.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-
-namespace EventStore.Core.Messaging {
-	// USE ONLY WHEN YOU KNOW WHAT YOU ARE DOING
-	// - no support for async handlers
-	// - calls the handler directly on the replying thread
-	// - limited type safety
-	public class SendToThisEnvelope : IEnvelope {
-		private readonly object _receiver;
-
-		public SendToThisEnvelope(object receiver) {
-			_receiver = receiver;
-		}
-
-		public void ReplyWith<T>(T message) where T : Message {
-			if (_receiver is IHandle<T> handle) {
-				handle.Handle(message);
-			} else if (_receiver is IAsyncHandle<T>) {
-				throw new Exception($"SendToThisEnvelope does not support asynchronous receivers. Receiver: {_receiver}");
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Messaging/TcsEnvelope.cs b/src/EventStore.Core/Messaging/TcsEnvelope.cs
deleted file mode 100644
index 23fc976503c..00000000000
--- a/src/EventStore.Core/Messaging/TcsEnvelope.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.Messaging {
-	public class TcsEnvelope<TResult> : IEnvelope where TResult : class {
-		private readonly TaskCompletionSource<TResult> _tcs;
-		public Task<TResult> Task => _tcs.Task;
-
-		public TcsEnvelope() {
-			_tcs = new TaskCompletionSource<TResult>(TaskCreationOptions.RunContinuationsAsynchronously);
-		}
-
-		public void ReplyWith<T>(T message) where T : Message {
-			if (message is not TResult result) {
-				_tcs.TrySetException(new ArgumentException("Unexpected message type.", nameof(message)));
-				return;
-			}
-
-			_tcs.TrySetResult(result);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Metrics/ActivityStatusSubMetric.cs b/src/EventStore.Core/Metrics/ActivityStatusSubMetric.cs
deleted file mode 100644
index 6bb38a83c12..00000000000
--- a/src/EventStore.Core/Metrics/ActivityStatusSubMetric.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-
-namespace EventStore.Core.Metrics {
-	// When there is one activity at a time and it is disposed before starting the next.
-	// It would be possible to drive a version of this from ActivitySource/ActivityListener
-	// for cases where we are already incurring the cost of allocating the Activities
-	public class ActivityStatusSubMetric : StatusSubMetric, IDisposable {
-		private const string Idle = "Idle";
-
-		public ActivityStatusSubMetric(string componentName, StatusMetric metric)
-			: base(componentName, Idle, metric) {
-		}
-
-		public IDisposable StartActivity(string name) {
-			SetStatus(name);
-			return this;
-		}
-
-		public void Dispose() {
-			SetStatus(Idle);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Metrics/AverageMetric.cs b/src/EventStore.Core/Metrics/AverageMetric.cs
deleted file mode 100644
index 2f4895eb0b6..00000000000
--- a/src/EventStore.Core/Metrics/AverageMetric.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Metrics;
-using Tag = System.Collections.Generic.KeyValuePair<string, object>;
-
-namespace EventStore.Core.Metrics {
-	// When observed, this calculates the average for each group
-	public class AverageMetric {
-		private readonly object _lock = new();
-		private readonly Func<string, Tag> _genTag;
-		private readonly Dictionary<string, (List<Func<double>>, Tag[])> _subMetricGroups = new();
-
-		public AverageMetric(Meter meter, string name, string unit, Func<string, Tag> genTag) {
-			_genTag = genTag;
-			meter.CreateObservableCounter(name + "-" + unit, Observe);
-		}
-
-		public void Register(string group, Func<double> subMetric) {
-			lock (_lock) {
-				if (_subMetricGroups.TryGetValue(group, out var pair)) {
-					pair.Item1.Add(subMetric);
-				} else {
-					var tags = new[] { _genTag(group) };
-					_subMetricGroups[group] = (new() { subMetric }, tags);
-				}
-			}
-		}
-
-		private IEnumerable<Measurement<double>> Observe() {
-			lock (_lock) {
-				foreach (var (groupFuncs, groupTags) in _subMetricGroups.Values) {
-					var total = 0d;
-					foreach (var observe in groupFuncs) {
-						total += observe();
-					}
-					var average = total / groupFuncs.Count;
-					yield return new(average, groupTags);
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Metrics/CacheHitsMissesTracker.cs b/src/EventStore.Core/Metrics/CacheHitsMissesTracker.cs
deleted file mode 100644
index a05e43342f7..00000000000
--- a/src/EventStore.Core/Metrics/CacheHitsMissesTracker.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using static EventStore.Common.Configuration.MetricsConfiguration;
-
-namespace EventStore.Core.Metrics;
-
-public interface ICacheHitsMissesTracker {
-	void Register(Cache cache, Func<long> getHits, Func<long> getMisses);
-}
-
-public class CacheHitsMissesTracker : ICacheHitsMissesTracker {
-	private readonly CacheHitsMissesMetric _metric;
-
-	public CacheHitsMissesTracker(CacheHitsMissesMetric metric) {
-		_metric = metric;
-	}
-
-	public void Register(Cache cache, Func<long> getHits, Func<long> getMisses) =>
-		_metric.Register(cache, getHits, getMisses);
-
-	public class NoOp : ICacheHitsMissesTracker {
-		public void Register(Cache cache, Func<long> getHits, Func<long> getMisses) {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Metrics/CacheResourcesMetrics.cs b/src/EventStore.Core/Metrics/CacheResourcesMetrics.cs
deleted file mode 100644
index be6f53dbebc..00000000000
--- a/src/EventStore.Core/Metrics/CacheResourcesMetrics.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Metrics;
-using EventStore.Core.Caching;
-
-namespace EventStore.Core.Metrics;
-
-public class CacheResourcesMetrics {
-	private readonly ObservableUpDownMetric<long> _bytesMetric;
-	private readonly ObservableUpDownMetric<long> _entriesMetric;
-
-	public CacheResourcesMetrics(Meter meter, string name) {
-		_bytesMetric = new ObservableUpDownMetric<long>(meter, name + "-bytes");
-		_entriesMetric = new ObservableUpDownMetric<long>(meter, name + "-entries");
-	}
-
-	public void Register(string cache, ResizerUnit unit, Func<CacheStats> getStats) {
-		var sizeAndCapacityMetric = unit == ResizerUnit.Entries
-			? _entriesMetric
-			: _bytesMetric;
-
-		Register(sizeAndCapacityMetric, cache, "capacity", () => getStats().Capacity);
-		Register(sizeAndCapacityMetric, cache, "size", () => getStats().Size);
-		Register(_entriesMetric, cache, "count", () => getStats().Count);
-	}
-
-	private static void Register(
-		ObservableUpDownMetric<long> metric,
-		string cache,
-		string metricName,
-		Func<long> measurementProvider) {
-
-		var tags = new KeyValuePair<string, object>[] {
-			new("cache", cache),
-			new("kind", metricName)
-		};
-		metric.Register(() => new(measurementProvider(), tags));
-	}
-}
diff --git a/src/EventStore.Core/Metrics/CacheResourcesTracker.cs b/src/EventStore.Core/Metrics/CacheResourcesTracker.cs
deleted file mode 100644
index 497ebe8755c..00000000000
--- a/src/EventStore.Core/Metrics/CacheResourcesTracker.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using EventStore.Core.Caching;
-
-namespace EventStore.Core.Metrics;
-
-public interface ICacheResourcesTracker {
-	public void Register(string cacheKey, ResizerUnit unit, Func<CacheStats> getStats);
-}
-
-public class CacheResourcesTracker : ICacheResourcesTracker {
-	private readonly CacheResourcesMetrics _metrics;
-
-	public CacheResourcesTracker(CacheResourcesMetrics metrics) {
-		_metrics = metrics;
-	}
-
-	public void Register(string cache, ResizerUnit unit, Func<CacheStats> getStats) {
-		_metrics.Register(cache, unit, getStats);
-	}
-
-	public class NoOp : ICacheResourcesTracker {
-		public void Register(string cacheKey, ResizerUnit unit, Func<CacheStats> getStats) {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Metrics/CounterMetric.cs b/src/EventStore.Core/Metrics/CounterMetric.cs
deleted file mode 100644
index 164f81a41bc..00000000000
--- a/src/EventStore.Core/Metrics/CounterMetric.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.Metrics;
-
-namespace EventStore.Core.Metrics {
-	public class CounterMetric {
-		private readonly List<CounterSubMetric> _subMetrics = new();
-		private readonly object _lock = new();
-
-		public CounterMetric(Meter meter, string name, string unit) {
-			if (!string.IsNullOrWhiteSpace(unit)) {
-				name = name + "-" + unit;
-			}
-
-			meter.CreateObservableCounter(name, Observe);
-		}
-
-		public void Add(CounterSubMetric subMetric) {
-			lock (_lock) {
-				_subMetrics.Add(subMetric);
-			}
-		}
-
-		private IEnumerable<Measurement<long>> Observe() {
-			lock (_lock) {
-				foreach (CounterSubMetric subMetric in _subMetrics) {
-					yield return subMetric.Observe();
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Metrics/CounterSubMetric.cs b/src/EventStore.Core/Metrics/CounterSubMetric.cs
deleted file mode 100644
index e505ebff81a..00000000000
--- a/src/EventStore.Core/Metrics/CounterSubMetric.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.Metrics;
-using System.Threading;
-
-namespace EventStore.Core.Metrics;
-
-public class CounterSubMetric {
-	private readonly KeyValuePair<string, object>[] _tags;
-	private long _counter;
-
-	public CounterSubMetric(CounterMetric metric, KeyValuePair<string, object>[] tags) {
-		_tags = tags;
-		metric.Add(this);
-	}
-	
-	public void Add(long delta) {
-		Interlocked.Add(ref _counter, delta);
-	}
-
-	public Measurement<long> Observe() {
-		return new Measurement<long>(Interlocked.Read(ref _counter), _tags);
-	}
-}
diff --git a/src/EventStore.Core/Metrics/Duration.cs b/src/EventStore.Core/Metrics/Duration.cs
deleted file mode 100644
index ab2dc91d349..00000000000
--- a/src/EventStore.Core/Metrics/Duration.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Time;
-
-namespace EventStore.Core.Metrics {
-	// This represents an activity that can fail
-	public struct Duration : IDisposable {
-		private readonly DurationMetric _metric;
-		private readonly string _name;
-		private readonly Instant _start;
-		private bool _failed;
-
-		public static Duration Nil { get; } = new();
-
-		public Duration(DurationMetric metric, string name, Instant start) {
-			_metric = metric;
-			_name = name;
-			_start = start;
-			_failed = false;
-		}
-
-		public void SetException(Exception ex) {
-			_failed = true;
-		}
-
-		public void Dispose() {
-			_metric?.Record(
-				_start,
-				new KeyValuePair<string, object>("activity", _name),
-				new KeyValuePair<string, object>("status", _failed ? "failed" : "successful"));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Metrics/DurationMaxMetric.cs b/src/EventStore.Core/Metrics/DurationMaxMetric.cs
deleted file mode 100644
index 39c8b0ff4c1..00000000000
--- a/src/EventStore.Core/Metrics/DurationMaxMetric.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.Metrics;
-
-namespace EventStore.Core.Metrics;
-
-public class DurationMaxMetric {
-	private readonly List<DurationMaxTracker> _trackers = new();
-
-	public DurationMaxMetric(Meter meter, string name) {
-		// gauge rather than updowncounter because the dimensions wont make sense to sum,
-		// because they are maxes and not necessarily from the same moment
-		meter.CreateObservableGauge(name + "-seconds", Observe);
-	}
-
-	public void Add(DurationMaxTracker tracker) {
-		lock (_trackers) {
-			_trackers.Add(tracker);
-		}
-	}
-
-	private IEnumerable<Measurement<double>> Observe() {
-		lock (_trackers) {
-			foreach (var tracker in _trackers) {
-				yield return tracker.Observe();
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Metrics/DurationMetric.cs b/src/EventStore.Core/Metrics/DurationMetric.cs
deleted file mode 100644
index 21b5dfe8d1c..00000000000
--- a/src/EventStore.Core/Metrics/DurationMetric.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.Metrics;
-using EventStore.Core.Time;
-
-namespace EventStore.Core.Metrics {
-	public class DurationMetric {
-		private readonly Histogram<double> _histogram;
-		private readonly IClock _clock;
-
-		public DurationMetric(Meter meter, string name, IClock clock = null) {
-			_clock = clock ?? Clock.Instance;
-			_histogram = meter.CreateHistogram<double>(name + "-seconds");
-		}
-
-		public Duration Start(string durationName) =>
-			new(this, durationName, _clock.Now);
-
-		public Instant Record(
-			Instant start,
-			KeyValuePair<string, object> tag1,
-			KeyValuePair<string, object> tag2) {
-
-			var now = _clock.Now;
-			var elapsedSeconds = now.ElapsedSecondsSince(start);
-			_histogram.Record(elapsedSeconds, tag1, tag2);
-			return now;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Metrics/DurationTracker.cs b/src/EventStore.Core/Metrics/DurationTracker.cs
deleted file mode 100644
index 1cc97f1c36f..00000000000
--- a/src/EventStore.Core/Metrics/DurationTracker.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace EventStore.Core.Metrics {
-
-	public interface IDurationTracker {
-		Duration Start();
-	}
-
-	public class DurationTracker : IDurationTracker {
-		private readonly DurationMetric _metric;
-		private readonly string _durationName;
-
-		public DurationTracker(DurationMetric metric, string durationName) {
-			_metric = metric;
-			_durationName = durationName;
-		}
-
-		public Duration Start() => _metric.Start(_durationName);
-
-		public class NoOp : IDurationTracker {
-			public Duration Start() => Duration.Nil;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Metrics/ElectionsCounterTracker.cs b/src/EventStore.Core/Metrics/ElectionsCounterTracker.cs
deleted file mode 100644
index 0494e55c3bb..00000000000
--- a/src/EventStore.Core/Metrics/ElectionsCounterTracker.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-
-
-namespace EventStore.Core.Metrics;
-
-public interface IElectionCounterTracker : IHandle<ElectionMessage.ElectionsDone> {
-}
-
-public class ElectionsCounterTracker : IElectionCounterTracker {
-	private readonly CounterSubMetric _electionsCounter;
-
-	public ElectionsCounterTracker(CounterSubMetric electionsCounter) {
-		_electionsCounter = electionsCounter;
-	}
-
-	public void Handle(ElectionMessage.ElectionsDone message) {
-		_electionsCounter.Add(1);
-	}
-
-	public class NoOp : IElectionCounterTracker {
-		public void Handle(ElectionMessage.ElectionsDone message) {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Metrics/IPersistentSubscriptionTracker.cs b/src/EventStore.Core/Metrics/IPersistentSubscriptionTracker.cs
deleted file mode 100644
index 3ad04cb6918..00000000000
--- a/src/EventStore.Core/Metrics/IPersistentSubscriptionTracker.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Messages;
-
-namespace EventStore.Core.Metrics;
-
-public interface IPersistentSubscriptionTracker {
-	public static IPersistentSubscriptionTracker NoOp => NoOpTracker.Instance;
-
-	void OnNewStats(IReadOnlyList<MonitoringMessage.PersistentSubscriptionInfo> newStats);
-}
-
-file class NoOpTracker : IPersistentSubscriptionTracker {
-	public static NoOpTracker Instance { get; } = new();
-	public void OnNewStats(IReadOnlyList<MonitoringMessage.PersistentSubscriptionInfo> newStats) { }
-}
diff --git a/src/EventStore.Core/Metrics/LogicalChunkReadDistributionMetric.cs b/src/EventStore.Core/Metrics/LogicalChunkReadDistributionMetric.cs
deleted file mode 100644
index fca68f16d96..00000000000
--- a/src/EventStore.Core/Metrics/LogicalChunkReadDistributionMetric.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Diagnostics.Metrics;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.Metrics;
-
-public class LogicalChunkReadDistributionMetric {
-	private readonly Histogram<long> _histogram;
-	private readonly IReadOnlyCheckpoint _writer;
-	private readonly int _chunkSize;
-
-	public LogicalChunkReadDistributionMetric(Meter meter, string name, IReadOnlyCheckpoint writer, int chunkSize) {
-		_histogram = meter.CreateHistogram<long>(name);
-		_writer = writer;
-		_chunkSize = chunkSize;
-	}
-
-	public void Record(ILogRecord record) {
-		// todo: consider sampling if this turns out to have a performance implication.
-		// in the mean time event read metrics can be turned off in metricsconfig.json
-		var recordLogicalChunk = record.LogPosition / _chunkSize;
-		var currentLogicalChunk = _writer.ReadNonFlushed() / _chunkSize;
-		_histogram.Record(currentLogicalChunk - recordLogicalChunk);
-	}
-}
diff --git a/src/EventStore.Core/Metrics/ProcessMetrics.cs b/src/EventStore.Core/Metrics/ProcessMetrics.cs
deleted file mode 100644
index 4a81a3f017a..00000000000
--- a/src/EventStore.Core/Metrics/ProcessMetrics.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-#nullable enable
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.Metrics;
-using System.Linq;
-using System.Reflection;
-using System.Threading;
-using EventStore.Core.Util;
-
-using static EventStore.Common.Configuration.MetricsConfiguration;
-
-namespace EventStore.Core.Metrics;
-
-public class ProcessMetrics (Meter meter, TimeSpan timeout, int scrapingPeriodInSeconds, Dictionary<ProcessTracker, bool> config) {
-    private readonly Func<DiskIoData> _getDiskIo      = Functions.Debounce(ProcessStats.GetDiskIo, timeout);
-    private readonly Func<Process>    _getCurrentProc = Functions.Debounce(Process.GetCurrentProcess, timeout);
-
-    public void CreateObservableMetrics(Dictionary<ProcessTracker, string> metricNames) {
-		var enabledNames = metricNames
-			.Where(kvp => config.TryGetValue(kvp.Key, out var enabled) && enabled)
-			.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-
-        if (enabledNames.TryGetValue(ProcessTracker.UpTime, out var upTimeName))
-			meter.CreateObservableCounter(upTimeName, () => {
-				var process = _getCurrentProc();
-				var upTime = (DateTime.Now - process.StartTime).TotalSeconds;
-				return new Measurement<double>(upTime, new KeyValuePair<string, object?>("pid", process.Id));
-			});
-
-		if (enabledNames.TryGetValue(ProcessTracker.GcPauseDuration, out var gcMaxPauseName)) {
-			var maxGcPauseDurationMetric = new DurationMaxMetric(meter, gcMaxPauseName);
-			var maxGcPauseDurationTracker = new DurationMaxTracker(maxGcPauseDurationMetric, null, scrapingPeriodInSeconds);
-			_ = new GcSuspensionMetric(maxGcPauseDurationTracker);
-		}
-
-		CreateObservableCounter(ProcessTracker.LockContentionCount, () => Monitor.LockContentionCount);
-		CreateObservableCounter(ProcessTracker.ExceptionCount, RuntimeStats.GetExceptionCount);
-		CreateObservableCounter(ProcessTracker.TotalAllocatedBytes, () => GC.GetTotalAllocatedBytes(), "bytes");
-
-		CreateObservableUpDownCounter(ProcessTracker.Cpu, RuntimeStats.GetCpuUsage);
-		CreateObservableUpDownCounter(ProcessTracker.ThreadCount, () => ThreadPool.ThreadCount);
-		CreateObservableUpDownCounter(ProcessTracker.ThreadPoolPendingWorkItemCount, () => ThreadPool.PendingWorkItemCount);
-		CreateObservableUpDownCounter(ProcessTracker.TimeInGc, RuntimeStats.GetLastGCPercentTimeInGC);
-		CreateObservableUpDownCounter(ProcessTracker.HeapSize, () => GC.GetGCMemoryInfo().HeapSizeBytes, "bytes");
-		CreateObservableUpDownCounter(ProcessTracker.HeapFragmentation, () => {
-			var info = GC.GetGCMemoryInfo();
-			return info.HeapSizeBytes != 0 ? info.FragmentedBytes * 100d / info.HeapSizeBytes : 0;
-		});
-        
-        return;
-
-        void CreateObservableCounter<T>(ProcessTracker tracker, Func<T> observe, string? unit = null) where T : struct {
-            if (enabledNames.TryGetValue(tracker, out var name))
-                meter.CreateObservableCounter(name, observe);
-        }
-
-        void CreateObservableUpDownCounter<T>(ProcessTracker tracker, Func<T> observe, string? unit = null) where T : struct {
-            if (enabledNames.TryGetValue(tracker, out var name))
-                meter.CreateObservableUpDownCounter(unit is null ? name : $"{name}-{unit}", observe);
-        }
-    }
-
-	public void CreateMemoryMetric(string metricName, Dictionary<ProcessTracker, string> dimNames) {
-		var dims = new Dimensions<ProcessTracker, long>(config, dimNames, tag => new("kind", tag));
-
-		dims.Register(ProcessTracker.MemWorkingSet, () => _getCurrentProc().WorkingSet64);
-		dims.Register(ProcessTracker.MemPagedBytes, () => _getCurrentProc().PagedMemorySize64);
-		dims.Register(ProcessTracker.MemVirtualBytes, () => _getCurrentProc().VirtualMemorySize64);
-
-		if (dims.AnyRegistered())
-			meter.CreateObservableGauge($"{metricName}-bytes", dims.GenObserve());
-	}
-
-	public void CreateGcGenerationSizeMetric(string metricName, Dictionary<ProcessTracker, string> dimNames) {
-		var dims = new Dimensions<ProcessTracker, long>(config, dimNames, tag => new("generation", tag));
-
-		var getGcGenerationSize = typeof(GC)
-			.GetMethod("GetGenerationSize", BindingFlags.Static | BindingFlags.NonPublic)!
-			.CreateDelegate<Func<int, ulong>>();
-
-		dims.Register(ProcessTracker.Gen0Size, () => (long)getGcGenerationSize(0));
-		dims.Register(ProcessTracker.Gen1Size, () => (long)getGcGenerationSize(1));
-		dims.Register(ProcessTracker.Gen2Size, () => (long)getGcGenerationSize(2));
-		dims.Register(ProcessTracker.LohSize, () => (long)getGcGenerationSize(3));
-
-		if (dims.AnyRegistered())
-			meter.CreateObservableUpDownCounter($"{metricName}-bytes", dims.GenObserve());
-	}
-
-	public void CreateGcCollectionCountMetric(string metricName, Dictionary<ProcessTracker, string> dimNames) {
-		var dims = new Dimensions<ProcessTracker, int>(config, dimNames, tag => new("generation", tag));
-
-		dims.Register(ProcessTracker.Gen0CollectionCount, () => GC.CollectionCount(0));
-		dims.Register(ProcessTracker.Gen1CollectionCount, () => GC.CollectionCount(1));
-		dims.Register(ProcessTracker.Gen2CollectionCount, () => GC.CollectionCount(2));
-
-		if (dims.AnyRegistered())
-			meter.CreateObservableCounter(metricName, dims.GenObserve());
-	}
-
-	public void CreateDiskBytesMetric(string metricName, Dictionary<ProcessTracker, string> dimNames) {
-		var dims = new Dimensions<ProcessTracker, long>(config, dimNames, tag => new("activity", tag));
-
-		dims.Register(ProcessTracker.DiskReadBytes, () => (long)_getDiskIo().ReadBytes);
-		dims.Register(ProcessTracker.DiskWrittenBytes, () => (long)_getDiskIo().WrittenBytes);
-
-		if (dims.AnyRegistered())
-			meter.CreateObservableCounter($"{metricName}-bytes", dims.GenObserve());
-	}
-
-	public void CreateDiskOpsMetric(string name, Dictionary<ProcessTracker, string> dimNames) {
-		var dims = new Dimensions<ProcessTracker, long>(config, dimNames, tag => new("activity", tag));
-
-		dims.Register(ProcessTracker.DiskReadOps, () => (long)_getDiskIo().ReadOps);
-		dims.Register(ProcessTracker.DiskWrittenOps, () => (long)_getDiskIo().WriteOps);
-
-		if (dims.AnyRegistered())
-			meter.CreateObservableCounter($"{name}-operations", dims.GenObserve());
-	}
-}
diff --git a/src/EventStore.Core/Metrics/QueueBusyTracker.cs b/src/EventStore.Core/Metrics/QueueBusyTracker.cs
deleted file mode 100644
index 6347f9263be..00000000000
--- a/src/EventStore.Core/Metrics/QueueBusyTracker.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Diagnostics;
-
-namespace EventStore.Core.Metrics;
-
-public interface IQueueBusyTracker {
-	void EnterBusy();
-	void EnterIdle();
-}
-
-public class QueueBusyTracker : IQueueBusyTracker {
-	private readonly Stopwatch _stopwatch = new();
-
-	public QueueBusyTracker(AverageMetric metric, string label) {
-		metric.Register(label, () => _stopwatch.Elapsed.TotalSeconds);
-	}
-
-	public void EnterBusy() => _stopwatch.Start();
-
-	public void EnterIdle() => _stopwatch.Stop();
-
-	public class NoOp : IQueueBusyTracker {
-		public void EnterBusy() {
-		}
-
-		public void EnterIdle() {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Metrics/QueueProcessingTracker.cs b/src/EventStore.Core/Metrics/QueueProcessingTracker.cs
deleted file mode 100644
index ea284a72639..00000000000
--- a/src/EventStore.Core/Metrics/QueueProcessingTracker.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Time;
-
-namespace EventStore.Core.Metrics {
-	public interface IQueueProcessingTracker {
-		Instant RecordNow(Instant start, string messageType);
-	}
-
-	public class QueueProcessingTracker : IQueueProcessingTracker {
-		private readonly DurationMetric _metric;
-		private readonly string _queueName;
-
-		public QueueProcessingTracker(DurationMetric metric, string queueName) {
-			_metric = metric;
-			_queueName = queueName;
-		}
-
-		public Instant RecordNow(Instant start, string messageType) {
-			return _metric.Record(
-				start: start,
-				new KeyValuePair<string, object>("queue", _queueName),
-				new KeyValuePair<string, object>("message-type", messageType));
-		}
-
-		public class NoOp : IQueueProcessingTracker {
-			public Instant RecordNow(Instant start, string messageType) => start;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Metrics/QueueTracker.cs b/src/EventStore.Core/Metrics/QueueTracker.cs
deleted file mode 100644
index 3f1c606153d..00000000000
--- a/src/EventStore.Core/Metrics/QueueTracker.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using EventStore.Core.Time;
-
-namespace EventStore.Core.Metrics {
-	// Composite tracker for tracking the various things that queues want to track.
-	// i.e.
-	//   - queue being busy/idle
-	//   - Duration items spent in the queue
-	//   - Processing time of items at the end of the queue
-	public class QueueTracker {
-		private readonly string _name;
-		private readonly IQueueBusyTracker _busyTracker;
-		private readonly IDurationMaxTracker _queueingDurationTracker;
-		private readonly IQueueProcessingTracker _queueProcessingTracker;
-		private readonly IClock _clock;
-
-		public QueueTracker(
-			string name,
-			IQueueBusyTracker busyTracker,
-			IDurationMaxTracker queueingDurationTracker,
-			IQueueProcessingTracker processingDurationTracker,
-			IClock clock = null) {
-
-			_name = name;
-			_queueingDurationTracker = queueingDurationTracker;
-			_queueProcessingTracker = processingDurationTracker;
-			_busyTracker = busyTracker;
-			_clock = clock ?? Clock.Instance;
-		}
-
-		public string Name => _name;
-
-		public Instant Now => _clock.Now;
-
-		public void EnterBusy() => _busyTracker.EnterBusy();
-
-		public void EnterIdle() => _busyTracker.EnterIdle();
-
-		public Instant RecordMessageDequeued(Instant enqueuedAt) {
-			return _queueingDurationTracker.RecordNow(enqueuedAt);
-		}
-
-		public Instant RecordMessageProcessed(Instant processingStartedAt, string messageType) {
-			return _queueProcessingTracker.RecordNow(processingStartedAt, messageType);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Metrics/StatusMetric.cs b/src/EventStore.Core/Metrics/StatusMetric.cs
deleted file mode 100644
index 92d722fde80..00000000000
--- a/src/EventStore.Core/Metrics/StatusMetric.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.Metrics;
-using EventStore.Core.Time;
-
-namespace EventStore.Core.Metrics {
-	// A metric that tracks the statuses of multiple components.
-	// We are only expecting to have a handful of components.
-	public class StatusMetric {
-		private readonly List<StatusSubMetric> _subMetrics = new();
-		private readonly IClock _clock;
-
-		public StatusMetric(Meter meter, string name, IClock clock = null) {
-			_clock = clock ?? Clock.Instance;
-
-			// The submetrics only go up, so we use a counter
-			// Observable because the value is the current time in seconds
-			meter.CreateObservableCounter(name, Observe);
-		}
-
-		public void Add(StatusSubMetric subMetric) {
-			lock (_subMetrics) {
-				_subMetrics.Add(subMetric);
-			}
-		}
-
-		private IEnumerable<Measurement<long>> Observe() {
-			var secondsSinceEpoch = _clock.SecondsSinceEpoch;
-			lock (_subMetrics) {
-				foreach (var instance in _subMetrics) {
-					yield return instance.Observe(secondsSinceEpoch);
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Metrics/StatusSubMetric.cs b/src/EventStore.Core/Metrics/StatusSubMetric.cs
deleted file mode 100644
index 236ef782538..00000000000
--- a/src/EventStore.Core/Metrics/StatusSubMetric.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Metrics;
-using System.Threading;
-
-namespace EventStore.Core.Metrics {
-	// Use this class if the status can transition from one to another, as in a state machine
-	// Use ActivityStatusMetric if the status represents an activity that starts and stops
-	//
-	// This does create a time series for each name * status that gets instantiated.
-	// However, prometheus does efficiently store series whose values are not changing.
-	//
-	// The component name and status are stored in tags
-	// The value contains time in seconds since epoch so we can tell which status is active
-	//
-	// Multiple threads can SetStatus and Observe concurrently
-	public class StatusSubMetric {
-		private readonly KeyValuePair<string, object>[] _tags;
-		private string _status;
-
-		public StatusSubMetric(string componentName, object initialStatus, StatusMetric metric) {
-			_status = initialStatus?.ToString();
-			_tags = new[] {
-				new KeyValuePair<string, object>("name", componentName),
-				new KeyValuePair<string, object>("status", _status),
-			};
-
-			metric.Add(this);
-		}
-
-		public void SetStatus(string status) {
-			Interlocked.Exchange(ref _status, status);
-		}
-
-		public Measurement<long> Observe(long secondsSinceEpoch) {
-			_tags[1] = new KeyValuePair<string, object>("status", _status);
-			return new Measurement<long>(secondsSinceEpoch, _tags.AsSpan());
-		}
-	}
-}
diff --git a/src/EventStore.Core/Metrics/SystemMetrics.cs b/src/EventStore.Core/Metrics/SystemMetrics.cs
deleted file mode 100644
index c6538d745c5..00000000000
--- a/src/EventStore.Core/Metrics/SystemMetrics.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-#nullable enable
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.Metrics;
-using System.Runtime;
-using EventStore.Core.Util;
-using static EventStore.Common.Configuration.MetricsConfiguration;
-
-namespace EventStore.Core.Metrics;
-
-public class SystemMetrics(Meter meter, TimeSpan timeout, Dictionary<SystemTracker, bool> config) {
-    public void CreateLoadAverageMetric(string metricName, Dictionary<SystemTracker, string> dimNames) {
-		if (RuntimeInformation.IsWindows)
-			return;
-
-		var dims = new Dimensions<SystemTracker, double>(config, dimNames, tag => new("period", tag));
-
-		var getLoadAverages = Functions.Debounce(RuntimeStats.GetCpuLoadAverages, timeout);
-		dims.Register(SystemTracker.LoadAverage1m, () => getLoadAverages().OneMinute);
-		dims.Register(SystemTracker.LoadAverage5m, () => getLoadAverages().FiveMinutes);
-		dims.Register(SystemTracker.LoadAverage15m, () => getLoadAverages().FifteenMinutes);
-
-		if (dims.AnyRegistered())
-			meter.CreateObservableGauge(metricName, dims.GenObserve());
-	}
-
-	public void CreateCpuMetric(string name) {
-        if (!config.TryGetValue(SystemTracker.Cpu, out var enabled) || !enabled)
-            return;
-
-		meter.CreateObservableUpDownCounter(name, RuntimeStats.GetCpuUsage);
-	}
-
-	public void CreateMemoryMetric(string metricName, Dictionary<SystemTracker, string> dimNames) {
-		var dims = new Dimensions<SystemTracker, long>(config, dimNames, tag => new("kind", tag));
-
-        dims.Register(SystemTracker.FreeMem, RuntimeStats.GetFreeMemory);
-        dims.Register(SystemTracker.TotalMem, RuntimeStats.GetTotalMemory);
-
-		if (dims.AnyRegistered())
-			meter.CreateObservableGauge($"{metricName}-bytes", dims.GenObserve());
-	}
-
-	public void CreateDiskMetric(string metricName, string dbPath, Dictionary<SystemTracker, string> dimNames) {
-		var dims = new Dimensions<SystemTracker, long>(config, dimNames, tag => new());
-
-        var getDriveInfo = Functions.Debounce(() => DriveStats.GetDriveInfo(dbPath), timeout);
-
-        dims.Register(SystemTracker.DriveUsedBytes, GenMeasure(info => info.UsedBytes));
-		dims.Register(SystemTracker.DriveTotalBytes, GenMeasure(info => info.TotalBytes));
-
-		if (dims.AnyRegistered())
-			meter.CreateObservableGauge($"{metricName}-bytes", dims.GenObserve());
-        
-        return;
-
-        Func<string, Measurement<long>> GenMeasure(Func<DriveData, long> func) => tag => {
-            var info = getDriveInfo();
-
-            return new(
-                func(info),
-                new("kind", tag),
-                new("disk", info.DiskName)
-            );
-        };
-    }
-}
diff --git a/src/EventStore.Core/MetricsBootstrapper.cs b/src/EventStore.Core/MetricsBootstrapper.cs
deleted file mode 100644
index f9f08ead836..00000000000
--- a/src/EventStore.Core/MetricsBootstrapper.cs
+++ /dev/null
@@ -1,345 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Metrics;
-using System.Linq;
-using EventStore.Core.Bus;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.Index;
-using EventStore.Core.Metrics;
-using EventStore.Core.Services.VNode;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Scavenging;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Serilog;
-using Conf = EventStore.Common.Configuration.MetricsConfiguration;
-
-namespace EventStore.Core;
-
-public class Trackers {
-	public IInaugurationStatusTracker InaugurationStatusTracker { get; set; } = new NodeStatusTracker.NoOp();
-	public IIndexStatusTracker IndexStatusTracker { get; set; } = new IndexStatusTracker.NoOp();
-	public INodeStatusTracker NodeStatusTracker { get; set; } = new NodeStatusTracker.NoOp();
-	public IScavengeStatusTracker ScavengeStatusTracker { get; set; } = new ScavengeStatusTracker.NoOp();
-	public GrpcTrackers GrpcTrackers { get; } = new();
-	public QueueTrackers QueueTrackers { get; set; } = new();
-	public GossipTrackers GossipTrackers { get; set; } = new ();
-	public ITransactionFileTracker TransactionFileTracker { get; set; } = new TFChunkTracker.NoOp();
-	public IIndexTracker IndexTracker { get; set; } = new IndexTracker.NoOp();
-	public IMaxTracker<long> WriterFlushSizeTracker { get; set; } = new MaxTracker<long>.NoOp();
-	public IDurationMaxTracker WriterFlushDurationTracker { get; set; } = new DurationMaxTracker.NoOp();
-	public ICacheHitsMissesTracker CacheHitsMissesTracker { get; set; } = new CacheHitsMissesTracker.NoOp();
-	public ICacheResourcesTracker CacheResourcesTracker { get; set; } = new CacheResourcesTracker.NoOp();
-	public IElectionCounterTracker ElectionCounterTracker { get; set; } = new ElectionsCounterTracker.NoOp();
-	public IPersistentSubscriptionTracker PersistentSubscriptionTracker { get; set; } =
-		IPersistentSubscriptionTracker.NoOp;
-}
-
-public class GrpcTrackers {
-	private readonly IDurationTracker[] _trackers;
-
-	public GrpcTrackers() {
-		_trackers = new IDurationTracker[Enum.GetValues<Conf.GrpcMethod>().Cast<int>().Max() + 1];
-		var noOp = new DurationTracker.NoOp();
-		for (var i = 0; i < _trackers.Length; i++)
-			_trackers[i] = noOp;
-	}
-
-	public IDurationTracker this[Conf.GrpcMethod index] {
-		get => _trackers[(int)index];
-		set => _trackers[(int)index] = value;
-	}
-}
-
-public class GossipTrackers {
-	public IDurationTracker PullFromPeer { get; set; } = new DurationTracker.NoOp();
-	public IDurationTracker PushToPeer { get; set; } = new DurationTracker.NoOp();
-	public IDurationTracker ProcessingPushFromPeer { get; set; } = new DurationTracker.NoOp();
-	public IDurationTracker ProcessingRequestFromPeer { get; set; } = new DurationTracker.NoOp();
-	public IDurationTracker ProcessingRequestFromHttpClient { get; set; } = new DurationTracker.NoOp();
-	public IDurationTracker ProcessingRequestFromGrpcClient { get; set; } = new DurationTracker.NoOp();
-}
-
-public static class MetricsBootstrapper {
-	public const string LogicalChunkReadDistributionName = "eventstore-logical-chunk-read-distribution";
-	private static readonly ILogger Log = Serilog.Log.ForContext(typeof(MetricsBootstrapper));
-
-	public static void Bootstrap(
-		Conf conf,
-		TFChunkDbConfig dbConfig,
-		Trackers trackers) {
-
-		LogConfig(conf);
-
-		MessageLabelConfigurator.ConfigureMessageLabels(
-			conf.MessageTypes, InMemoryBus.KnownMessageTypes);
-
-		if (conf.ExpectedScrapeIntervalSeconds <= 0)
-			return;
-
-		var coreMeter = new Meter("EventStore.Core", version: "1.0.0");
-		var statusMetric = new StatusMetric(coreMeter, "eventstore-statuses");
-		var grpcMethodMetric = new DurationMetric(coreMeter, "eventstore-grpc-method-duration");
-		var gossipLatencyMetric = new DurationMetric(coreMeter, "eventstore-gossip-latency");
-		var gossipProcessingMetric = new DurationMetric(coreMeter, "eventstore-gossip-processing-duration");
-		var queueQueueingDurationMaxMetric = new DurationMaxMetric(coreMeter, "eventstore-queue-queueing-duration-max");
-		var queueProcessingDurationMetric = new DurationMetric(coreMeter, "eventstore-queue-processing-duration");
-		var queueBusyMetric = new AverageMetric(coreMeter, "eventstore-queue-busy", "seconds", label => new("queue", label));
-		var byteMetric = new CounterMetric(coreMeter, "eventstore-io", unit: "bytes");
-		var eventMetric = new CounterMetric(coreMeter, "eventstore-io", unit: "events");
-		var electionsCounterMetric = new CounterMetric(coreMeter, "eventstore-elections-count", unit: "");
-
-		// incoming grpc calls
-		var enabledCalls = conf.IncomingGrpcCalls.Where(kvp => kvp.Value).Select(kvp => kvp.Key).ToArray();
-		if (enabledCalls.Length > 0) {
-			_ = new IncomingGrpcCallsMetric(
-				coreMeter,
-				"eventstore-current-incoming-grpc-calls",
-				"eventstore-incoming-grpc-calls",
-				enabledCalls);
-		}
-
-		// cache hits/misses
-		var enabledCacheHitsMisses = conf.CacheHitsMisses.Where(kvp => kvp.Value).Select(kvp => kvp.Key).ToArray();
-		if (enabledCacheHitsMisses.Length > 0) {
-			var metric = new CacheHitsMissesMetric(coreMeter, enabledCacheHitsMisses, "eventstore-cache-hits-misses", new() {
-				{ Conf.Cache.StreamInfo, "stream-info" },
-				{ Conf.Cache.Chunk, "chunk" },
-			});
-			trackers.CacheHitsMissesTracker = new CacheHitsMissesTracker(metric);
-		}
-
-		// dynamic cache resources
-		if (conf.CacheResources) {
-			var metrics = new CacheResourcesMetrics(coreMeter, "eventstore-cache-resources");
-			trackers.CacheResourcesTracker = new CacheResourcesTracker(metrics);
-		}
-
-		// elections count
-		if (conf.ElectionsCount) {
-			trackers.ElectionCounterTracker = new ElectionsCounterTracker(new CounterSubMetric(electionsCounterMetric, []));
-		}
-
-		// events
-		if (conf.Events.TryGetValue(Conf.EventTracker.Read, out var readEnabled) && readEnabled) {
-			var readTag = new KeyValuePair<string, object>("activity", "read");
-			trackers.TransactionFileTracker = new TFChunkTracker(
-				readDistribution: new LogicalChunkReadDistributionMetric(
-					meter: coreMeter,
-					name: LogicalChunkReadDistributionName,
-					writer: dbConfig.WriterCheckpoint,
-					chunkSize: dbConfig.ChunkSize),
-				readBytes: new CounterSubMetric(byteMetric, [readTag]),
-				readEvents: new CounterSubMetric(eventMetric, [readTag]));
-		}
-
-		// from a users perspective an event is written when it is indexed: thats when it can be read.
-		if (conf.Events.TryGetValue(Conf.EventTracker.Written, out var writtenEnabled) && writtenEnabled) {
-			trackers.IndexTracker = new IndexTracker(new CounterSubMetric(
-				eventMetric,
-				new[] {new KeyValuePair<string, object>("activity", "written")}));
-		}
-
-		// gossip
-		if (conf.Gossip.Count != 0) {
-			if (conf.Gossip.TryGetValue(Conf.GossipTracker.PullFromPeer, out var pullFromPeer) && pullFromPeer)
-				trackers.GossipTrackers.PullFromPeer = new DurationTracker(gossipLatencyMetric, "pull-from-peer");
-
-			if (conf.Gossip.TryGetValue(Conf.GossipTracker.PushToPeer, out var pushToPeer) && pushToPeer)
-				trackers.GossipTrackers.PushToPeer = new DurationTracker(gossipLatencyMetric, "push-to-peer");
-
-			if (conf.Gossip.TryGetValue(Conf.GossipTracker.ProcessingPushFromPeer, out var processingPushFromPeer) && processingPushFromPeer)
-				trackers.GossipTrackers.ProcessingPushFromPeer = new DurationTracker(gossipProcessingMetric, "push-from-peer");
-
-			if (conf.Gossip.TryGetValue(Conf.GossipTracker.ProcessingRequestFromPeer, out var processingRequestFromPeer) && processingRequestFromPeer)
-				trackers.GossipTrackers.ProcessingRequestFromPeer = new DurationTracker(gossipProcessingMetric, "request-from-peer");
-
-			if (conf.Gossip.TryGetValue(Conf.GossipTracker.ProcessingRequestFromGrpcClient, out var processingRequestFromGrpcClient) && processingRequestFromGrpcClient)
-				trackers.GossipTrackers.ProcessingRequestFromGrpcClient = new DurationTracker(gossipProcessingMetric, "request-from-grpc-client");
-
-			if (conf.Gossip.TryGetValue(Conf.GossipTracker.ProcessingRequestFromHttpClient, out var processingRequestFromHttpClient) && processingRequestFromHttpClient)
-				trackers.GossipTrackers.ProcessingRequestFromHttpClient = new DurationTracker(gossipProcessingMetric, "request-from-http-client");
-		}
-
-		// persistent subscriptions
-		if (conf.PersistentSubscriptionStats) {
-			var tracker = new PersistentSubscriptionTracker();
-			trackers.PersistentSubscriptionTracker = tracker;
-
-			coreMeter.CreateObservableUpDownCounter("eventstore-persistent-sub-connections", tracker.ObserveConnectionsCount);
-			coreMeter.CreateObservableUpDownCounter("eventstore-persistent-sub-parked-messages", tracker.ObserveParkedMessages);
-			coreMeter.CreateObservableUpDownCounter("eventstore-persistent-sub-in-flight-messages", tracker.ObserveInFlightMessages);
-			coreMeter.CreateObservableUpDownCounter("eventstore-persistent-sub-oldest-parked-message-seconds", tracker.ObserveOldestParkedMessage);
-
-			coreMeter.CreateObservableCounter("eventstore-persistent-sub-items-processed", tracker.ObserveItemsProcessed);
-			coreMeter.CreateObservableCounter("eventstore-persistent-sub-last-known-event-number", tracker.ObserveLastKnownEvent);
-			coreMeter.CreateObservableCounter("eventstore-persistent-sub-last-known-event-commit-position", tracker.ObserveLastKnownEventCommitPosition);
-			coreMeter.CreateObservableCounter("eventstore-persistent-sub-checkpointed-event-number", tracker.ObserveLastCheckpointedEvent);
-			coreMeter.CreateObservableCounter("eventstore-persistent-sub-checkpointed-event-commit-position", tracker.ObserveLastCheckpointedEventCommitPosition);
-		}
-
-		// checkpoints
-		_ = new CheckpointMetric(
-			coreMeter,
-			"eventstore-checkpoints",
-			conf.Checkpoints.Where(x => x.Value).Select(x => x.Key switch {
-				Conf.Checkpoint.Chaser => dbConfig.ChaserCheckpoint,
-				Conf.Checkpoint.Epoch => dbConfig.EpochCheckpoint,
-				Conf.Checkpoint.Index => dbConfig.IndexCheckpoint,
-				Conf.Checkpoint.Proposal => dbConfig.ProposalCheckpoint,
-				Conf.Checkpoint.Replication => dbConfig.ReplicationCheckpoint,
-				Conf.Checkpoint.StreamExistenceFilter => dbConfig.StreamExistenceFilterCheckpoint,
-				Conf.Checkpoint.Truncate => dbConfig.TruncateCheckpoint,
-				Conf.Checkpoint.Writer => dbConfig.WriterCheckpoint,
-				_ => throw new Exception(
-					$"Unknown checkpoint in MetricsConfiguration. Valid values are " +
-					$"{string.Join(", ", Enum.GetValues<Conf.Checkpoint>())}"),
-			}).ToArray());
-
-		// status metrics
-		if (conf.Statuses.Count > 0) {
-			if (conf.Statuses.TryGetValue(Conf.StatusTracker.Node, out var nodeStatus) && nodeStatus) {
-				var tracker = new NodeStatusTracker(statusMetric);
-				trackers.NodeStatusTracker = tracker;
-				trackers.InaugurationStatusTracker = tracker;
-			}
-
-			if (conf.Statuses.TryGetValue(Conf.StatusTracker.Index, out var indexStatus) && indexStatus)
-				trackers.IndexStatusTracker = new IndexStatusTracker(statusMetric);
-
-			if (conf.Statuses.TryGetValue(Conf.StatusTracker.Scavenge, out var scavengeStatus) && scavengeStatus)
-				trackers.ScavengeStatusTracker = new ScavengeStatusTracker(statusMetric);
-		}
-
-		// grpc historgrams
-		foreach (var method in Enum.GetValues<Conf.GrpcMethod>()) {
-			if (conf.GrpcMethods.TryGetValue(method, out var label) && !string.IsNullOrWhiteSpace(label))
-				trackers.GrpcTrackers[method] = new DurationTracker(grpcMethodMetric, label);
-		}
-
-		// storage writer
-		if (conf.Writer.Count > 0) {
-			if (conf.Writer.TryGetValue(Conf.WriterTracker.FlushSize, out var flushSizeEnabled) && flushSizeEnabled) {
-				var maxMetric = new MaxMetric<long>(coreMeter, "eventstore-writer-flush-size-max");
-				trackers.WriterFlushSizeTracker = new MaxTracker<long>(
-					metric: maxMetric,
-					name: null,
-					expectedScrapeIntervalSeconds: conf.ExpectedScrapeIntervalSeconds);
-			}
-
-			if (conf.Writer.TryGetValue(Conf.WriterTracker.FlushDuration, out var flushDurationEnabled) && flushDurationEnabled) {
-				var maxDurationmetric = new DurationMaxMetric(coreMeter, "eventstore-writer-flush-duration-max");
-				trackers.WriterFlushDurationTracker = new DurationMaxTracker(
-					maxDurationmetric,
-					name: null,
-					expectedScrapeIntervalSeconds: conf.ExpectedScrapeIntervalSeconds);
-			}
-		}
-
-		// queue trackers
-		Func<string, IQueueBusyTracker> busyTrackerFactory = name => new QueueBusyTracker.NoOp();
-		Func<string, IDurationMaxTracker> lengthFactory = name => new DurationMaxTracker.NoOp();
-		Func<string, IQueueProcessingTracker> processingFactory = name => new QueueProcessingTracker.NoOp();
-
-		if (conf.Queues.TryGetValue(Conf.QueueTracker.Busy, out var busyEnabled) && busyEnabled)
-			busyTrackerFactory = name => new QueueBusyTracker(queueBusyMetric, name);
-
-		if (conf.Queues.TryGetValue(Conf.QueueTracker.Length, out var lengthEnabled) && lengthEnabled)
-			lengthFactory = name => new DurationMaxTracker(
-				name: name,
-				metric: queueQueueingDurationMaxMetric,
-				expectedScrapeIntervalSeconds: conf.ExpectedScrapeIntervalSeconds);
-
-		if (conf.Queues.TryGetValue(Conf.QueueTracker.Processing, out var processingEnabled) && processingEnabled)
-			processingFactory = name => new QueueProcessingTracker(queueProcessingDurationMetric, name);
-
-		trackers.QueueTrackers = new QueueTrackers(conf.QueueLabels, busyTrackerFactory, lengthFactory, processingFactory);
-
-		// kestrel
-		if (conf.Kestrel.TryGetValue(Conf.KestrelTracker.ConnectionCount, out var kestrelConnections) && kestrelConnections) {
-			_ = new ConnectionMetric(coreMeter, "eventstore-kestrel-connections");
-		}
-
-		var timeout = TimeSpan.FromSeconds(1);
-
-		// system
-		var systemMetrics = new SystemMetrics(coreMeter, timeout, conf.System);
-		systemMetrics.CreateLoadAverageMetric("eventstore-sys-load-avg", new() {
-			{ Conf.SystemTracker.LoadAverage1m, "1m" },
-			{ Conf.SystemTracker.LoadAverage5m, "5m" },
-			{ Conf.SystemTracker.LoadAverage15m, "15m" },
-		});
-
-		systemMetrics.CreateCpuMetric("eventstore-sys-cpu");
-
-		systemMetrics.CreateMemoryMetric("eventstore-sys-mem", new() {
-			{ Conf.SystemTracker.FreeMem, "free" },
-			{ Conf.SystemTracker.TotalMem, "total" },
-		});
-
-		systemMetrics.CreateDiskMetric("eventstore-sys-disk", dbConfig.Path, new() {
-			{ Conf.SystemTracker.DriveTotalBytes, "total" },
-			{ Conf.SystemTracker.DriveUsedBytes, "used" },
-		});
-
-		// process
-		var processMetrics = new ProcessMetrics(coreMeter, timeout, conf.ExpectedScrapeIntervalSeconds, conf.Process);
-		processMetrics.CreateObservableMetrics(new() {
-			{ Conf.ProcessTracker.UpTime, "eventstore-proc-up-time" },
-			{ Conf.ProcessTracker.Cpu, "eventstore-proc-cpu" },
-			{ Conf.ProcessTracker.ThreadCount, "eventstore-proc-thread-count" },
-			{ Conf.ProcessTracker.ThreadPoolPendingWorkItemCount, "eventstore-proc-thread-pool-pending-work-item-count" },
-			{ Conf.ProcessTracker.LockContentionCount, "eventstore-proc-contention-count" },
-			{ Conf.ProcessTracker.ExceptionCount, "eventstore-proc-exception-count" },
-			{ Conf.ProcessTracker.TimeInGc, "eventstore-gc-time-in-gc" },
-			{ Conf.ProcessTracker.HeapSize, "eventstore-gc-heap-size" },
-			{ Conf.ProcessTracker.HeapFragmentation, "eventstore-gc-heap-fragmentation" },
-			{ Conf.ProcessTracker.TotalAllocatedBytes, "eventstore-gc-total-allocated" },
-			{ Conf.ProcessTracker.GcPauseDuration, "eventstore-gc-pause-duration-max" },
-		});
-
-		processMetrics.CreateMemoryMetric("eventstore-proc-mem", new() {
-			{ Conf.ProcessTracker.MemWorkingSet, "working-set" },
-			{ Conf.ProcessTracker.MemPagedBytes, "paged-bytes" },
-			{ Conf.ProcessTracker.MemVirtualBytes, "virtual-bytes" },
-		});
-
-		processMetrics.CreateGcGenerationSizeMetric("eventstore-gc-generation-size", new() {
-			{ Conf.ProcessTracker.Gen0Size, "gen0" },
-			{ Conf.ProcessTracker.Gen1Size, "gen1" },
-			{ Conf.ProcessTracker.Gen2Size, "gen2" },
-			{ Conf.ProcessTracker.LohSize, "loh" },
-		});
-
-		processMetrics.CreateGcCollectionCountMetric("eventstore-gc-collection-count", new() {
-			{ Conf.ProcessTracker.Gen0CollectionCount, "gen0" },
-			{ Conf.ProcessTracker.Gen1CollectionCount, "gen1" },
-			{ Conf.ProcessTracker.Gen2CollectionCount, "gen2" },
-		});
-
-		processMetrics.CreateDiskBytesMetric("eventstore-disk-io", new() {
-			{ Conf.ProcessTracker.DiskReadBytes, "read" },
-			{ Conf.ProcessTracker.DiskWrittenBytes, "written" },
-		});
-
-		processMetrics.CreateDiskOpsMetric("eventstore-disk-io", new() {
-			{ Conf.ProcessTracker.DiskReadOps, "read" },
-			{ Conf.ProcessTracker.DiskWrittenOps, "written" },
-		});
-	}
-
-	private static void LogConfig(Conf conf) {
-		var jsonSerializerSettings = new JsonSerializerSettings {
-			NullValueHandling = NullValueHandling.Ignore,
-		};
-		jsonSerializerSettings.Converters.Add(new StringEnumConverter());
-
-		var confJson = JsonConvert.SerializeObject(
-			conf,
-			Formatting.Indented,
-			jsonSerializerSettings);
-
-		Log.Information("Metrics Configuration: " + confJson);
-	}
-}
diff --git a/src/EventStore.Core/NodeSubsystems.cs b/src/EventStore.Core/NodeSubsystems.cs
deleted file mode 100644
index c3d4b0d3814..00000000000
--- a/src/EventStore.Core/NodeSubsystems.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace EventStore.Core {
-	public enum NodeSubsystems {
-		Projections
-	}
-}
diff --git a/src/EventStore.Core/NodeTcpOptions.cs b/src/EventStore.Core/NodeTcpOptions.cs
deleted file mode 100644
index 558a13ec7d8..00000000000
--- a/src/EventStore.Core/NodeTcpOptions.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace EventStore.Core;
-
-// Still needed for gossip and stats.
-public class NodeTcpOptions {
-	public int NodeTcpPort { get; init; } = 1113;
-	public bool EnableExternalTcp { get; init; }
-	public int? NodeTcpPortAdvertiseAs { get; init; }
-}
diff --git a/src/EventStore.Core/PluginModel/IPersistentSubscriptionConsumerStrategyPlugin.cs b/src/EventStore.Core/PluginModel/IPersistentSubscriptionConsumerStrategyPlugin.cs
deleted file mode 100644
index d129002ebd7..00000000000
--- a/src/EventStore.Core/PluginModel/IPersistentSubscriptionConsumerStrategyPlugin.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using EventStore.Core.Services.PersistentSubscription;
-using EventStore.Core.Services.PersistentSubscription.ConsumerStrategy;
-
-namespace EventStore.Core.PluginModel {
-	public interface IPersistentSubscriptionConsumerStrategyPlugin {
-		string Name { get; }
-
-		string Version { get; }
-
-		IPersistentSubscriptionConsumerStrategyFactory GetConsumerStrategyFactory();
-	}
-}
diff --git a/src/EventStore.Core/Services/Archiver/ArchiverService.cs b/src/EventStore.Core/Services/Archiver/ArchiverService.cs
deleted file mode 100644
index be8a328c133..00000000000
--- a/src/EventStore.Core/Services/Archiver/ArchiverService.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Plugins;
-using EventStore.Plugins.Licensing;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Archiver;
-
-public class ArchiverService : IPlugableComponent {
-	protected static readonly ILogger Log = Serilog.Log.ForContext<ArchiverService>();
-
-	public string Name => "Archiver";
-
-	public string DiagnosticsName => Name;
-
-	public KeyValuePair<string, object>[] DiagnosticsTags => [];
-
-	public string Version => "0.0.1";
-
-	public bool Enabled => true;
-
-	public string LicensePublicKey => LicenseConstants.LicensePublicKey;
-
-	public void ConfigureApplication(IApplicationBuilder builder, IConfiguration configuration) {
-		_ = LicenseMonitor.MonitorAsync(
-			featureName: Name,
-			requiredEntitlements: [],
-			licenseService: builder.ApplicationServices.GetRequiredService<ILicenseService>(),
-			logger: builder.ApplicationServices.GetRequiredService<ILoggerFactory>().CreateLogger(GetType()));
-	}
-
-	public void ConfigureServices(IServiceCollection services, IConfiguration configuration) {
-	}
-}
diff --git a/src/EventStore.Core/Services/AuthorizationGateway.cs b/src/EventStore.Core/Services/AuthorizationGateway.cs
deleted file mode 100644
index b260a74c868..00000000000
--- a/src/EventStore.Core/Services/AuthorizationGateway.cs
+++ /dev/null
@@ -1,368 +0,0 @@
-using System;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Services {
-	public sealed class AuthorizationGateway {
-		private readonly IAuthorizationProvider _authorizationProvider;
-		private const string AccessDenied = "Access Denied";
-
-		private static readonly Func<ClientMessage.ReadEvent, Message> ReadEventDenied = msg =>
-			new ClientMessage.ReadEventCompleted(msg.CorrelationId, msg.EventStreamId, ReadEventResult.AccessDenied,
-				ResolvedEvent.EmptyEvent, StreamMetadata.Empty, false, AccessDenied);
-
-		private static readonly Func<ClientMessage.ReadAllEventsForward, Message> ReadAllEventsForwardDenied = msg =>
-			new ClientMessage.ReadAllEventsForwardCompleted(msg.CorrelationId, ReadAllResult.AccessDenied, AccessDenied,
-				Array.Empty<ResolvedEvent>(), StreamMetadata.Empty, false, 0, TFPos.Invalid, TFPos.Invalid,
-				TFPos.Invalid, default);
-
-		private static readonly Func<ClientMessage.ReadStreamEventsForward, Message> ReadStreamEventsForwardDenied =
-			msg => new ClientMessage.ReadStreamEventsForwardCompleted(msg.CorrelationId, msg.EventStreamId, msg.FromEventNumber, msg.MaxCount,ReadStreamResult.AccessDenied, Array.Empty<ResolvedEvent>(), StreamMetadata.Empty, false, AccessDenied, -1, default, true, default);
-
-		private static readonly Func<ClientMessage.ReadStreamEventsBackward, Message> ReadStreamEventsBackwardDenied =
-			msg => new ClientMessage.ReadStreamEventsBackwardCompleted(msg.CorrelationId, msg.EventStreamId, msg.FromEventNumber, msg.MaxCount,
-				ReadStreamResult.AccessDenied,Array.Empty<ResolvedEvent>(), StreamMetadata.Empty, default, AccessDenied, -1, default, true, default);
-
-		private static readonly Func<ClientMessage.WriteEvents, Message> WriteEventsDenied = msg =>
-			new ClientMessage.WriteEventsCompleted(msg.CorrelationId, OperationResult.AccessDenied, AccessDenied);
-
-		private static readonly Func<ClientMessage.DeleteStream, Message> DeleteStreamDenied = msg =>
-			new ClientMessage.DeleteStreamCompleted(msg.CorrelationId, OperationResult.AccessDenied, AccessDenied);
-
-		private static readonly Func<ClientMessage.SubscribeToStream, Message> SubscribeToStreamDenied = msg =>
-			new ClientMessage.SubscriptionDropped(msg.CorrelationId, SubscriptionDropReason.AccessDenied);
-		private static readonly Func<ClientMessage.FilteredSubscribeToStream, Message> FilteredSubscribeToStreamDenied =
-			msg =>
-				new ClientMessage.SubscriptionDropped(msg.CorrelationId, SubscriptionDropReason.AccessDenied);
-
-		private static readonly Func<ClientMessage.ReadAllEventsBackward, Message> ReadAllEventsBackwardDenied = msg =>
-			new ClientMessage.ReadAllEventsBackwardCompleted(msg.CorrelationId, ReadAllResult.AccessDenied,
-				AccessDenied,
-				Array.Empty<ResolvedEvent>(), StreamMetadata.Empty, false, 0, TFPos.Invalid, TFPos.Invalid,
-				TFPos.Invalid, default);
-
-		private static readonly Func<ClientMessage.FilteredReadAllEventsForward, Message>
-			FilteredReadAllEventsForwardDenied = msg =>
-				new ClientMessage.ReadAllEventsForwardCompleted(msg.CorrelationId, ReadAllResult.AccessDenied,
-					AccessDenied,
-					Array.Empty<ResolvedEvent>(), StreamMetadata.Empty, false, 0, TFPos.Invalid, TFPos.Invalid,
-					TFPos.Invalid, default);
-
-		private static readonly Func<ClientMessage.FilteredReadAllEventsBackward, Message>
-			FilteredReadAllEventsBackwardDenied = msg =>
-				new ClientMessage.ReadAllEventsBackwardCompleted(msg.CorrelationId, ReadAllResult.AccessDenied,
-					AccessDenied,
-					Array.Empty<ResolvedEvent>(), StreamMetadata.Empty, false, 0, TFPos.Invalid, TFPos.Invalid,
-					TFPos.Invalid, default);
-
-		private static readonly Func<ClientMessage.ConnectToPersistentSubscriptionToStream, Message>
-			ConnectToPersistentSubscriptionDenied = msg =>
-				new ClientMessage.SubscriptionDropped(msg.CorrelationId, SubscriptionDropReason.AccessDenied);
-
-		private static readonly Func<ClientMessage.ReadNextNPersistentMessages, Message>
-			ReadNextNPersistedMessagesDenied = msg =>
-				new ClientMessage.ReadNextNPersistentMessagesCompleted(msg.CorrelationId,
-					ClientMessage.ReadNextNPersistentMessagesCompleted.ReadNextNPersistentMessagesResult.AccessDenied,
-					AccessDenied, Array.Empty<(ResolvedEvent, int)>());
-
-		private static readonly Func<ClientMessage.CreatePersistentSubscriptionToStream, Message>
-			CreatePersistentSubscriptionDenied = msg =>
-				new ClientMessage.CreatePersistentSubscriptionToStreamCompleted(msg.CorrelationId,
-					ClientMessage.CreatePersistentSubscriptionToStreamCompleted.CreatePersistentSubscriptionToStreamResult.AccessDenied,
-					AccessDenied);
-
-		private static readonly Func<ClientMessage.UpdatePersistentSubscriptionToStream, Message>
-			UpdatePersistentSubscriptionDenied = msg =>
-				new ClientMessage.UpdatePersistentSubscriptionToStreamCompleted(msg.CorrelationId,
-					ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult.AccessDenied,
-					AccessDenied);
-
-		private static readonly Func<ClientMessage.ReplayParkedMessages, Message> ReplayAllParkedMessagesDenied =
-			msg => new ClientMessage.ReplayMessagesReceived(msg.CorrelationId,
-				ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.AccessDenied, AccessDenied);
-
-		private static readonly Func<ClientMessage.DeletePersistentSubscriptionToStream, Message>
-			DeletePersistentSubscriptionDenied =
-				msg => new ClientMessage.DeletePersistentSubscriptionToStreamCompleted(msg.CorrelationId,
-					ClientMessage.DeletePersistentSubscriptionToStreamCompleted.DeletePersistentSubscriptionToStreamResult.AccessDenied,
-					AccessDenied);
-
-		private static readonly Func<ClientMessage.TransactionStart, Message> TransactionStartDenied = msg =>
-			new ClientMessage.TransactionStartCompleted(msg.CorrelationId, -1, OperationResult.AccessDenied,
-				AccessDenied);
-
-		private static readonly Func<ClientMessage.TransactionWrite, Message> TransactionWriteDenied = msg =>
-			new ClientMessage.TransactionWriteCompleted(msg.CorrelationId, msg.TransactionId,
-				OperationResult.AccessDenied, AccessDenied);
-
-		private static readonly Func<ClientMessage.TransactionCommit, Message> TransactionCommitDenied = msg =>
-			new ClientMessage.TransactionCommitCompleted(msg.CorrelationId, msg.TransactionId,
-				OperationResult.AccessDenied, AccessDenied);
-
-
-		private static readonly Operation ReadStream = new Operation(Operations.Streams.Read);
-		private static readonly Operation WriteStream = new Operation(Operations.Streams.Write);
-		private static readonly Operation DeleteStream = new Operation(Operations.Streams.Delete);
-		private static readonly Operation ReadEvent = ReadStream;
-		private static readonly Operation FilteredSubscribeToStream = ReadStream;
-
-		private static readonly Operation ReadAllStream =
-			new Operation(Operations.Streams.Read).WithParameter(
-				Operations.Streams.Parameters.StreamId(SystemStreams.AllStream));
-
-		private static readonly Operation CreatePersistentSubscription = new Operation(Operations.Subscriptions.Create);
-		private static readonly Operation UpdatePersistentSubscription = new Operation(Operations.Subscriptions.Update);
-		private static readonly Operation DeletePersistentSubscription = new Operation(Operations.Subscriptions.Delete);
-
-		private static readonly Operation
-			ReplayAllParkedMessages = new Operation(Operations.Subscriptions.ReplayParked);
-
-		private static readonly Operation ConnectToPersistentSubscription =
-			new Operation(Operations.Subscriptions.ProcessMessages);
-
-		public AuthorizationGateway(IAuthorizationProvider authorizationProvider) {
-			_authorizationProvider = authorizationProvider;
-		}
-
-		public void Authorize(Message toValidate, IPublisher destination) {
-			Ensure.NotNull(toValidate, nameof(toValidate));
-			Ensure.NotNull(destination, nameof(destination));
-			switch (toValidate) {
-				case ClientMessage.ReadNextNPersistentMessages msg:
-					Authorize(msg, destination);
-					break;
-				case ClientMessage.ReadStreamEventsBackward msg:
-					Authorize(msg, destination);
-					break;
-				case ClientMessage.ReadStreamEventsForward msg:
-					Authorize(msg, destination);
-					break;
-				case ClientMessage.UpdatePersistentSubscriptionToStream msg:
-					Authorize(msg, destination);
-					break;
-				case ClientMessage.SubscribeToStream msg: 
-					Authorize(msg, destination);
-					break;
-				case ClientMessage.ConnectToPersistentSubscriptionToStream msg:
-					Authorize(msg, destination);
-					break;
-				case ClientMessage.CreatePersistentSubscriptionToStream msg:
-					Authorize(msg, destination);
-					break;
-				case ClientMessage.DeletePersistentSubscriptionToStream msg:
-					Authorize(msg, destination);
-					break;
-				case ClientMessage.DeleteStream msg:
-					Authorize(msg, destination);
-					break;
-				case ClientMessage.FilteredReadAllEventsBackward msg:
-					Authorize(msg, destination);
-					break;
-				case ClientMessage.FilteredReadAllEventsForward msg:
-					Authorize(msg, destination);
-					break;
-				case ClientMessage.FilteredSubscribeToStream msg:
-					Authorize(msg, destination);
-					break;
-				case ClientMessage.ReadAllEventsBackward msg:
-					Authorize(msg, destination);
-					break;
-				case ClientMessage.ReadAllEventsForward msg:
-					Authorize(msg, destination);
-					break;
-				case ClientMessage.ReplayParkedMessages msg:
-					Authorize(msg, destination);
-					break;
-				case ClientMessage.ReadEvent msg:
-					Authorize(msg, destination);
-					break;
-				case ClientMessage.WriteEvents msg:
-					Authorize(msg, destination);
-					break;
-				case ClientMessage.TransactionStart msg:
-					Authorize(msg, destination);
-					break;
-				case ClientMessage.TransactionWrite msg:
-					Authorize(msg, destination);
-					break;
-				case ClientMessage.TransactionCommit msg:
-					Authorize(msg, destination);
-					break;
-				case ClientMessage.PersistentSubscriptionAckEvents _:
-				case ClientMessage.PersistentSubscriptionNackEvents _:
-				case ClientMessage.UnsubscribeFromStream _:
-				case ClientMessage.NotHandled _:
-				case ClientMessage.WriteEventsCompleted _:
-				case ClientMessage.TransactionStartCompleted _:
-				case ClientMessage.TransactionWriteCompleted _:
-				case ClientMessage.TransactionCommitCompleted _:
-				case ClientMessage.DeleteStreamCompleted _:
-					destination.Publish(toValidate);
-					break;
-				case ReplicationMessage.AckLogPosition _:
-				case ReplicationMessage.CloneAssignment _:
-				case ReplicationMessage.CreateChunk _:
-				case ReplicationMessage.DataChunkBulk _:
-				case ReplicationMessage.DropSubscription _:
-				case ReplicationMessage.FollowerAssignment _:
-				case ReplicationMessage.GetReplicationStats _:
-				case ReplicationMessage.GetReplicationStatsCompleted _:
-				case ReplicationMessage.RawChunkBulk _:
-				case ReplicationMessage.ReconnectToLeader _:
-				case ReplicationMessage.ReplicaLogPositionAck _:
-				case ReplicationMessage.ReplicaSubscribed _:
-				case ReplicationMessage.ReplicaSubscriptionRetry _:
-				case ReplicationMessage.ReplicaSubscriptionRequest _:
-				case ReplicationMessage.SubscribeReplica _:
-				case ReplicationMessage.SubscribeToLeader _:
-				case ReplicationTrackingMessage.IndexedTo _:
-				case ReplicationTrackingMessage.LeaderReplicatedTo _:
-				case ReplicationTrackingMessage.ReplicaWriteAck _:
-				case ReplicationTrackingMessage.ReplicatedTo _:
-				case ReplicationTrackingMessage.WriterCheckpointFlushed _:
-					destination.Publish(toValidate);
-					break;
-				default:
-#if DEBUG
-					//This sucks, because if new tcp messages are added there is no way to be sure they have to be authorized...
-					//They should be caught by debug builds though
-					throw new ArgumentOutOfRangeException(nameof(toValidate), toValidate.GetType().FullName,
-						"Unhandled client message");
-#else
-						destination.Publish(toValidate);
-						break;
-#endif
-			}
-		}
-
-		private void Authorize(ClientMessage.SubscribeToStream msg, IPublisher destination) {
-			Authorize(msg.User, ReadStream.WithParameter(Operations.Streams.Parameters.StreamId(msg.EventStreamId)),
-				msg.Envelope, destination, msg, SubscribeToStreamDenied);
-		}
-
-		private void Authorize(ClientMessage.ReadEvent msg, IPublisher destination) {
-			Authorize(msg.User, ReadEvent.WithParameter(Operations.Streams.Parameters.StreamId(msg.EventStreamId)),
-				msg.Envelope, destination, msg, ReadEventDenied);
-		}
-
-		private void Authorize(ClientMessage.WriteEvents msg, IPublisher destination) {
-			Authorize(msg.User, WriteStream.WithParameter(Operations.Streams.Parameters.StreamId(msg.EventStreamId)),
-				msg.Envelope, destination, msg, WriteEventsDenied);
-		}
-
-		private void Authorize(ClientMessage.ReplayParkedMessages msg, IPublisher destination) {
-			Authorize(msg.User, ReplayAllParkedMessages, msg.Envelope, destination, msg, ReplayAllParkedMessagesDenied);
-		}
-
-		private void Authorize(ClientMessage.ReadAllEventsForward msg, IPublisher destination) {
-			Authorize(msg.User, ReadAllStream, msg.Envelope, destination, msg, ReadAllEventsForwardDenied);
-		}
-
-		private void Authorize(ClientMessage.ReadAllEventsBackward msg, IPublisher destination) {
-			Authorize(msg.User, ReadAllStream, msg.Envelope, destination, msg, ReadAllEventsBackwardDenied);
-		}
-
-		private void Authorize(ClientMessage.FilteredSubscribeToStream msg, IPublisher destination) {
-			Authorize(msg.User,
-				FilteredSubscribeToStream.WithParameter(Operations.Streams.Parameters.StreamId(msg.EventStreamId)),
-				msg.Envelope, destination, msg, FilteredSubscribeToStreamDenied);
-		}
-
-		private void Authorize(ClientMessage.FilteredReadAllEventsForward msg, IPublisher destination) {
-			Authorize(msg.User, ReadAllStream, msg.Envelope, destination, msg, FilteredReadAllEventsForwardDenied);
-		}
-
-		private void Authorize(ClientMessage.FilteredReadAllEventsBackward msg, IPublisher destination) {
-			Authorize(msg.User, ReadAllStream, msg.Envelope, destination, msg, FilteredReadAllEventsBackwardDenied);
-		}
-
-		private void Authorize(ClientMessage.DeleteStream msg, IPublisher destination) {
-			Authorize(msg.User, DeleteStream.WithParameter(Operations.Streams.Parameters.StreamId(msg.EventStreamId)),
-				msg.Envelope, destination, msg, DeleteStreamDenied);
-		}
-
-		private void Authorize(ClientMessage.DeletePersistentSubscriptionToStream msg, IPublisher destination) {
-			Authorize(msg.User, DeletePersistentSubscription, msg.Envelope, destination, msg,
-				DeletePersistentSubscriptionDenied);
-		}
-
-		private void Authorize(ClientMessage.CreatePersistentSubscriptionToStream msg, IPublisher destination) {
-			Authorize(msg.User, CreatePersistentSubscription, msg.Envelope, destination, msg,
-				CreatePersistentSubscriptionDenied);
-		}
-
-		private void Authorize(ClientMessage.ConnectToPersistentSubscriptionToStream msg, IPublisher destination) {
-			Authorize(msg.User,
-				ConnectToPersistentSubscription.WithParameter(
-					Operations.Subscriptions.Parameters.StreamId(msg.EventStreamId)), msg.Envelope, destination, msg,
-				ConnectToPersistentSubscriptionDenied);
-		}
-
-		private void Authorize(ClientMessage.UpdatePersistentSubscriptionToStream msg, IPublisher destination) {
-			Authorize(msg.User, UpdatePersistentSubscription, msg.Envelope, destination, msg,
-				UpdatePersistentSubscriptionDenied);
-		}
-
-		private void Authorize(ClientMessage.ReadStreamEventsForward msg, IPublisher destination) {
-			Authorize(msg.User, ReadStream.WithParameter(Operations.Streams.Parameters.StreamId(msg.EventStreamId)),
-				msg.Envelope, destination, msg, ReadStreamEventsForwardDenied);
-		}
-
-		private void Authorize(ClientMessage.ReadStreamEventsBackward msg, IPublisher destination) {
-			Authorize(msg.User, ReadStream.WithParameter(Operations.Streams.Parameters.StreamId(msg.EventStreamId)),
-				msg.Envelope, destination, msg, ReadStreamEventsBackwardDenied);
-		}
-
-		private void Authorize(ClientMessage.ReadNextNPersistentMessages msg, IPublisher destination) {
-			Authorize(msg.User, ReadStream.WithParameter(Operations.Streams.Parameters.StreamId(msg.EventStreamId)),
-				msg.Envelope, destination, msg, ReadNextNPersistedMessagesDenied);
-		}
-
-		private void Authorize(ClientMessage.TransactionStart msg, IPublisher destination) {
-			Authorize(msg.User, WriteStream.WithParameter(Operations.Streams.Parameters.StreamId(msg.EventStreamId)),
-				msg.Envelope, destination, msg, TransactionStartDenied);
-		}
-
-		private void Authorize(ClientMessage.TransactionWrite msg, IPublisher destination) {
-			Authorize(msg.User, WriteStream.WithParameter(Operations.Streams.Parameters.TransactionId(msg.TransactionId)),
-				msg.Envelope, destination, msg, TransactionWriteDenied);
-		}
-
-		private void Authorize(ClientMessage.TransactionCommit msg, IPublisher destination) {
-			Authorize(msg.User, WriteStream.WithParameter(Operations.Streams.Parameters.TransactionId(msg.TransactionId)),
-				msg.Envelope, destination, msg, TransactionCommitDenied);
-		}
-	
-
-	void Authorize<TRequest>(ClaimsPrincipal user, Operation operation, IEnvelope replyTo,
-			IPublisher destination, TRequest request, Func<TRequest, Message> createAccessDenied)
-			where TRequest : Message {
-			var accessCheck = _authorizationProvider.CheckAccessAsync(user, operation, CancellationToken.None);
-			if (!accessCheck.IsCompleted)
-				AuthorizeAsync(accessCheck, replyTo, destination, request, createAccessDenied);
-			else {
-				if(accessCheck.Result)
-					destination.Publish(request);
-				else {
-					replyTo.ReplyWith(createAccessDenied(request));
-				}
-			}
-		}
-
-		async void AuthorizeAsync<TRequest>(ValueTask<bool> accessCheck, IEnvelope replyTo, IPublisher destination, TRequest request,
-			Func<TRequest, Message> createAccessDenied) where TRequest : Message {
-			if (await accessCheck) {
-				destination.Publish(request);
-			} else {
-				replyTo.ReplyWith(createAccessDenied(request));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/AwakeReaderService/AwakeService.cs b/src/EventStore.Core/Services/AwakeReaderService/AwakeService.cs
deleted file mode 100644
index f267fc9d34d..00000000000
--- a/src/EventStore.Core/Services/AwakeReaderService/AwakeService.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Storage.ReaderIndex;
-
-namespace EventStore.Core.Services.AwakeReaderService {
-	public class AwakeService : IHandle<AwakeServiceMessage.SubscribeAwake>,
-		IHandle<AwakeServiceMessage.UnsubscribeAwake>,
-		IHandle<StorageMessage.EventCommitted>,
-		IHandle<StorageMessage.TfEofAtNonCommitRecord> {
-		private readonly Dictionary<string, HashSet<AwakeServiceMessage.SubscribeAwake>> _subscribers =
-			new Dictionary<string, HashSet<AwakeServiceMessage.SubscribeAwake>>();
-
-		private readonly Dictionary<Guid, AwakeServiceMessage.SubscribeAwake> _map =
-			new Dictionary<Guid, AwakeServiceMessage.SubscribeAwake>();
-
-		private TFPos _lastPosition;
-
-		private readonly List<AwakeServiceMessage.SubscribeAwake> _batchedReplies =
-			new List<AwakeServiceMessage.SubscribeAwake>();
-
-		private int _processedEvents;
-		private int _processedEventsAwakeThreshold = 1000;
-
-		private void BeginReplyBatch() {
-			if (_batchedReplies.Count > 0)
-				throw new Exception();
-			_processedEvents = 0;
-		}
-
-		private void EndReplyBatch() {
-			foreach (var subscriber in _batchedReplies) {
-				subscriber.Envelope.ReplyWith(subscriber.ReplyWithMessage);
-			}
-
-			_batchedReplies.Clear();
-		}
-
-		private void CheckProcessedEventThreshold() {
-			if (_processedEvents > _processedEventsAwakeThreshold) {
-				EndReplyBatch();
-				BeginReplyBatch();
-			}
-		}
-
-		public void Handle(AwakeServiceMessage.SubscribeAwake message) {
-			//TODO: consider buffering last 10 events to avoid race condition
-			// when someone writes before we subscribe forcing us to resubscribe
-			if (message.From < _lastPosition) {
-				message.Envelope.ReplyWith(message.ReplyWithMessage);
-				return;
-			}
-
-			_map.Add(message.CorrelationId, message);
-			HashSet<AwakeServiceMessage.SubscribeAwake> list;
-			string streamId = message.StreamId ?? "$all";
-			if (!_subscribers.TryGetValue(streamId, out list)) {
-				list = new HashSet<AwakeServiceMessage.SubscribeAwake>();
-				_subscribers.Add(streamId, list);
-			}
-
-			list.Add(message);
-		}
-
-		public void Handle(StorageMessage.EventCommitted message) {
-			_processedEvents++;
-			_lastPosition = new TFPos(message.CommitPosition, message.Event.LogPosition);
-
-			if (EventFilter.DefaultAllFilter.IsEventAllowed(message.Event)) {
-				NotifyEventInStream("$all", message);
-			}
-
-			if (EventFilter.DefaultStreamFilter.IsEventAllowed(message.Event)) {
-				NotifyEventInStream(message.Event.EventStreamId, message);
-			}
-
-			if (message.TfEof) {
-				EndReplyBatch();
-				BeginReplyBatch();
-			}
-
-			CheckProcessedEventThreshold();
-		}
-
-		private void NotifyEventInStream(string streamId, StorageMessage.EventCommitted message) {
-			HashSet<AwakeServiceMessage.SubscribeAwake> list;
-			List<AwakeServiceMessage.SubscribeAwake> toRemove = null;
-			if (_subscribers.TryGetValue(streamId, out list)) {
-				foreach (var subscriber in list) {
-					if (subscriber.From < new TFPos(message.CommitPosition, message.Event.LogPosition)) {
-						_batchedReplies.Add(subscriber);
-						_map.Remove(subscriber.CorrelationId);
-						if (toRemove == null)
-							toRemove = new List<AwakeServiceMessage.SubscribeAwake>();
-						toRemove.Add(subscriber);
-					}
-				}
-
-				if (toRemove != null) {
-					foreach (var item in toRemove)
-						list.Remove(item);
-					if (list.Count == 0) {
-						_subscribers.Remove(streamId);
-					}
-				}
-			}
-		}
-
-		public void Handle(AwakeServiceMessage.UnsubscribeAwake message) {
-			AwakeServiceMessage.SubscribeAwake subscriber;
-			if (_map.TryGetValue(message.CorrelationId, out subscriber)) {
-				_map.Remove(message.CorrelationId);
-				var list = _subscribers[subscriber.StreamId ?? "$all"];
-				list.Remove(subscriber);
-			}
-		}
-
-		public void Handle(StorageMessage.TfEofAtNonCommitRecord message) {
-			EndReplyBatch();
-			BeginReplyBatch();
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/AwakeReaderService/AwakeServiceMessage.cs b/src/EventStore.Core/Services/AwakeReaderService/AwakeServiceMessage.cs
deleted file mode 100644
index f97ecd56e55..00000000000
--- a/src/EventStore.Core/Services/AwakeReaderService/AwakeServiceMessage.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Services.AwakeReaderService {
-	public partial class AwakeServiceMessage {
-		[DerivedMessage(CoreMessage.Awake)]
-		public sealed partial class SubscribeAwake : Message {
-			public readonly IEnvelope Envelope;
-			public readonly Guid CorrelationId;
-			public readonly string StreamId;
-			public readonly TFPos From;
-			public readonly Message ReplyWithMessage;
-
-			public SubscribeAwake(
-				IEnvelope envelope, Guid correlationId, string streamId, TFPos @from, Message replyWithMessage) {
-				StreamId = streamId;
-				From = @from;
-				ReplyWithMessage = replyWithMessage;
-				Envelope = envelope;
-				CorrelationId = correlationId;
-			}
-		}
-
-		[DerivedMessage(CoreMessage.Awake)]
-		public sealed partial class UnsubscribeAwake : Message {
-			public readonly Guid CorrelationId;
-
-			public UnsubscribeAwake(Guid correlationId) {
-				CorrelationId = correlationId;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/ClusterStorageWriterService.cs b/src/EventStore.Core/Services/ClusterStorageWriterService.cs
deleted file mode 100644
index 22e25418ae9..00000000000
--- a/src/EventStore.Core/Services/ClusterStorageWriterService.cs
+++ /dev/null
@@ -1,389 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.LogV3;
-using EventStore.Core.Messages;
-using EventStore.Core.Metrics;
-using EventStore.Core.Services.Replication;
-using EventStore.Core.Services.Storage;
-using EventStore.Core.Services.Storage.EpochManager;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services {
-	public class ClusterStorageWriterService {
-	}
-
-	public class ClusterStorageWriterService<TStreamId> : StorageWriterService<TStreamId>,
-		IHandle<ReplicationMessage.ReplicaSubscribed>,
-		IHandle<ReplicationMessage.CreateChunk>,
-		IAsyncHandle<ReplicationMessage.RawChunkBulk>,
-		IHandle<ReplicationMessage.DataChunkBulk> {
-		private static readonly ILogger Log = Serilog.Log.ForContext<ClusterStorageWriterService>();
-
-		private readonly Func<long> _getLastIndexedPosition;
-		private readonly TransactionFramer _framer;
-
-		private Guid _subscriptionId;
-		private TFChunk _activeChunk;
-		private long _subscriptionPos;
-		private long _ackedSubscriptionPos;
-
-		public ClusterStorageWriterService(IPublisher bus,
-			ISubscriber subscribeToBus,
-			TimeSpan minFlushDelay,
-			TFChunkDb db,
-			TFChunkWriter writer,
-			IIndexWriter<TStreamId> indexWriter,
-			IRecordFactory<TStreamId> recordFactory,
-			INameIndex<TStreamId> streamNameIndex,
-			INameIndex<TStreamId> eventTypeIndex,
-			TStreamId emptyEventTypeId,
-			ISystemStreamLookup<TStreamId> systemStreams,
-			IEpochManager epochManager,
-			QueueStatsManager queueStatsManager,
-			QueueTrackers trackers,
-			IMaxTracker<long> flushSizeTracker,
-			IDurationMaxTracker flushDurationTracker,
-			Func<long> getLastIndexedPosition)
-			: base(bus, subscribeToBus, minFlushDelay, db, writer, indexWriter, recordFactory, streamNameIndex,
-				eventTypeIndex, emptyEventTypeId, systemStreams, epochManager, queueStatsManager, trackers,
-				flushSizeTracker, flushDurationTracker) {
-			Ensure.NotNull(getLastIndexedPosition, "getLastCommitPosition");
-
-			_getLastIndexedPosition = getLastIndexedPosition;
-
-			var lengthPrefixSuffixFramer = new LengthPrefixSuffixFramer(maxPackageSize: TFConsts.MaxLogRecordSize);
-			var logRecordFramer = new LogRecordFramer(inner: lengthPrefixSuffixFramer);
-			_framer = new TransactionFramer(inner: logRecordFramer);
-			_framer.RegisterMessageArrivedCallback(OnTransactionUnframed);
-
-			SubscribeToMessage<ReplicationMessage.ReplicaSubscribed>();
-			SubscribeToMessage<ReplicationMessage.CreateChunk>();
-			SubscribeToMessage<ReplicationMessage.RawChunkBulk>();
-			SubscribeToMessage<ReplicationMessage.DataChunkBulk>();
-		}
-
-		public override void Handle(SystemMessage.StateChangeMessage message) {
-			if (message.State == VNodeState.PreLeader) {
-				if (_activeChunk != null) {
-					_activeChunk.MarkForDeletion();
-					_activeChunk = null;
-				}
-
-				_subscriptionId = Guid.Empty;
-				_subscriptionPos = -1;
-				_ackedSubscriptionPos = -1;
-			}
-
-			base.Handle(message);
-		}
-
-		public void Handle(ReplicationMessage.ReplicaSubscribed message) {
-			if (_activeChunk != null) {
-				_activeChunk.MarkForDeletion();
-				_activeChunk = null;
-			}
-
-			_framer.Reset();
-
-			_subscriptionId = message.SubscriptionId;
-			_ackedSubscriptionPos = _subscriptionPos = message.SubscriptionPosition;
-
-			Log.Information(
-				"=== SUBSCRIBED to [{leaderEndPoint},{leaderId:B}] at {subscriptionPosition} (0x{subscriptionPosition:X}). SubscriptionId: {subscriptionId:B}.",
-				message.LeaderEndPoint, message.LeaderId, message.SubscriptionPosition, message.SubscriptionPosition,
-				message.SubscriptionId);
-
-			var writerCheck = Db.Config.WriterCheckpoint.ReadNonFlushed();
-			if (message.SubscriptionPosition > writerCheck) {
-				ReplicationFail(
-					"Leader [{0},{1:B}] subscribed us at {2} (0x{3:X}), which is greater than our writer checkpoint {4} (0x{5:X}). REPLICATION BUG.",
-					"Leader [{leaderEndpoint},{leaderId:B}] subscribed us at {subscriptionPosition} (0x{subscriptionPosition:X}), which is greater than our writer checkpoint {writerCheckpoint} (0x{writerCheckpoint:X}). REPLICATION BUG.",
-					message.LeaderEndPoint, message.LeaderId, message.SubscriptionPosition,
-					message.SubscriptionPosition, writerCheck, writerCheck);
-			}
-
-			if (message.SubscriptionPosition < writerCheck) {
-				Log.Information(
-					"Leader [{leaderEndPoint},{leaderId:B}] subscribed us at {subscriptionPosition} (0x{subscriptionPosition:X}), which is less than our writer checkpoint {writerCheckpoint} (0x{writerCheckpoint:X}). TRUNCATION IS NEEDED.",
-					message.LeaderEndPoint, message.LeaderId, message.SubscriptionPosition,
-					message.SubscriptionPosition, writerCheck, writerCheck);
-
-				var lastIndexedPosition = _getLastIndexedPosition();
-				if (message.SubscriptionPosition > lastIndexedPosition)
-					Log.Information(
-						"ONLINE TRUNCATION IS NEEDED. NOT IMPLEMENTED. OFFLINE TRUNCATION WILL BE PERFORMED. SHUTTING DOWN NODE.");
-				else
-					Log.Information(
-						"OFFLINE TRUNCATION IS NEEDED (SubscribedAt {subscriptionPosition} (0x{subscriptionPosition:X}) <= LastCommitPosition {lastCommitPosition} (0x{lastCommitPosition:X})). SHUTTING DOWN NODE.",
-						message.SubscriptionPosition, message.SubscriptionPosition, lastIndexedPosition,
-						lastIndexedPosition);
-
-				EpochRecord lastEpoch = EpochManager.GetLastEpoch();
-				if (AreAnyCommittedRecordsTruncatedWithLastEpoch(message.SubscriptionPosition, lastEpoch,
-					lastIndexedPosition)) {
-					Log.Error(
-						"Leader [{leaderEndPoint},{leaderId:B}] subscribed us at {subscriptionPosition} (0x{subscriptionPosition:X}), which is less than our last epoch and LastCommitPosition {lastCommitPosition} (0x{lastCommitPosition:X}) >= lastEpoch.EpochPosition {lastEpochPosition} (0x{lastEpochPosition:X}). That might be bad, especially if the LastCommitPosition is way beyond EpochPosition.",
-						message.LeaderEndPoint, message.LeaderId, message.SubscriptionPosition,
-						message.SubscriptionPosition, lastIndexedPosition, lastIndexedPosition, lastEpoch.EpochPosition,
-						lastEpoch.EpochPosition);
-					Log.Error(
-						"ATTEMPT TO TRUNCATE EPOCH WITH COMMITTED RECORDS. THIS MAY BE BAD, BUT IT IS OK IF A NEWLY-ELECTED LEADER FAILS IMMEDIATELY AFTER ELECTION.");
-				}
-
-				Log.Information("Setting the truncate checkpoint to: {truncatePosition} (0x{truncatePosition:X})",
-					message.SubscriptionPosition, message.SubscriptionPosition);
-				Db.Config.TruncateCheckpoint.Write(message.SubscriptionPosition);
-				Db.Config.TruncateCheckpoint.Flush();
-
-				// try to write the new epoch position prior to shutting down to
-				// avoid scanning the transaction log to find a valid epoch
-				// when starting up for truncation
-				var oldEpoch = EpochManager.GetLastEpoch();
-				if (EpochManager.TryTruncateBefore(message.SubscriptionPosition, out var newEpoch)) {
-					if (newEpoch.EpochId != oldEpoch.EpochId) {
-						Log.Information("Truncated epoch from "
-						                + "E{oldEpochNumber}@{oldEpochPosition}:{oldEpochId:B} to "
-						                + "E{newEpochNumber}@{newEpochPosition}:{newEpochId:B}",
-							oldEpoch.EpochNumber, oldEpoch.EpochPosition, oldEpoch.EpochId,
-							newEpoch.EpochNumber, newEpoch.EpochPosition, newEpoch.EpochId);
-					} else {
-						Log.Information("Truncation of epoch not required.");
-					}
-				} else {
-					Log.Information("Could not find a valid epoch to truncate to before position: {truncatePosition} (0x{truncatePosition:X})",
-						message.SubscriptionPosition, message.SubscriptionPosition);
-					var epochs = EpochManager.GetLastEpochs(int.MaxValue);
-					if (epochs.Length > 0) {
-						Log.Debug("Displaying cached epochs:");
-						foreach (var epoch in epochs) {
-							Log.Debug(
-								"=== E{epochNumber}@{epochPosition}:{epochId:B}",
-								epoch.EpochNumber, epoch.EpochPosition, epoch.EpochId);
-						}
-					} else {
-						Log.Debug("No cached epochs were found");
-					}
-				}
-
-				BlockWriter = true;
-				Bus.Publish(new ClientMessage.RequestShutdown(exitProcess: true, shutdownHttp: true));
-				return;
-			}
-
-			// subscription position == writer checkpoint
-			// everything is ok
-			Bus.Publish(new ReplicationMessage.AckLogPosition(
-				subscriptionId: _subscriptionId,
-				replicationLogPosition: _ackedSubscriptionPos,
-				writerLogPosition: writerCheck));
-		}
-
-		private bool AreAnyCommittedRecordsTruncatedWithLastEpoch(long subscriptionPosition, EpochRecord lastEpoch,
-			long lastCommitPosition) {
-			return lastEpoch != null && subscriptionPosition <= lastEpoch.EpochPosition &&
-			       lastCommitPosition >= lastEpoch.EpochPosition;
-		}
-
-		public void Handle(ReplicationMessage.CreateChunk message) {
-			if (_subscriptionId != message.SubscriptionId) return;
-
-			if (_activeChunk != null) {
-				_activeChunk.MarkForDeletion();
-				_activeChunk = null;
-			}
-
-			_framer.Reset();
-
-			if (!Db.TransformManager.SupportsTransform(message.ChunkHeader.TransformType)) {
-				ReplicationFail(
-					"Unsupported chunk transform: {0}",
-					"Unsupported chunk transform: {transformType}.",
-					message.ChunkHeader.TransformType);
-			}
-
-			if (message.IsScavengedChunk) {
-				_activeChunk = Db.Manager.CreateTempChunk(message.ChunkHeader, message.FileSize);
-			} else {
-				if (message.ChunkHeader.ChunkStartNumber == Db.Manager.ChunksCount) {
-					Writer.AddNewChunk(message.ChunkHeader, message.TransformHeader, message.FileSize);
-				} else if (message.ChunkHeader.ChunkStartNumber + 1 == Db.Manager.ChunksCount) {
-					// the requested chunk was already created. this is fine, it can happen if the follower created the
-					// chunk in a previous run, was killed and re-subscribed to the leader at the beginning of the chunk.
-					// i.e. this is the idempotent case
-				} else {
-					ReplicationFail(
-						"Received request to create a new ongoing chunk #{0}-{1}, but current chunks count is {2}.",
-						"Received request to create a new ongoing chunk #{chunkStartNumber}-{chunkEndNumber}, but current chunks count is {chunksCount}.",
-						message.ChunkHeader.ChunkStartNumber, message.ChunkHeader.ChunkEndNumber,
-						Db.Manager.ChunksCount);
-				}
-			}
-
-			_subscriptionPos = message.ChunkHeader.ChunkStartPosition;
-			_ackedSubscriptionPos = _subscriptionPos;
-			Bus.Publish(new ReplicationMessage.AckLogPosition(
-				subscriptionId: _subscriptionId,
-				replicationLogPosition: _ackedSubscriptionPos,
-				writerLogPosition: Writer.Position));
-		}
-
-		async ValueTask IAsyncHandle<ReplicationMessage.RawChunkBulk>.HandleAsync(ReplicationMessage.RawChunkBulk message, CancellationToken token) {
-			if (_subscriptionId != message.SubscriptionId) return;
-			if (_activeChunk is null)
-				ReplicationFail(
-					"Physical chunk bulk received, but we do not have active chunk.",
-					"Physical chunk bulk received, but we do not have active chunk.");
-
-			if (_activeChunk.ChunkHeader.ChunkStartNumber != message.ChunkStartNumber ||
-			    _activeChunk.ChunkHeader.ChunkEndNumber != message.ChunkEndNumber) {
-				Log.Error(
-					"Received RawChunkBulk for TFChunk {chunkStartNumber}-{chunkEndNumber}, but active chunk is {activeChunk}.",
-					message.ChunkStartNumber, message.ChunkEndNumber, _activeChunk);
-				return;
-			}
-
-			if (_activeChunk.RawWriterPosition != message.RawPosition) {
-				Log.Error(
-					"Received RawChunkBulk at raw pos {rawPosition} (0x{rawPosition:X}) while current writer raw pos is {rawWriterPosition} (0x{rawWriterPosition:X}).",
-					message.RawPosition, message.RawPosition, _activeChunk.RawWriterPosition,
-					_activeChunk.RawWriterPosition);
-				return;
-			}
-
-			if (!_activeChunk.TryAppendRawData(message.RawBytes)) {
-				ReplicationFail(
-					"Could not append raw bytes to chunk {0}-{1}, raw pos: {2} (0x{3:X}), bytes length: {4} (0x{5:X}). Chunk file size: {6} (0x{7:X}).",
-					"Could not append raw bytes to chunk {chunkStartNumber}-{chunkEndNumber}, raw pos: {rawPosition} (0x{rawPosition:X}), bytes length: {rawBytesLength} (0x{rawBytesLength:X}). Chunk file size: {chunkFileSize} (0x{chunkFileSize:X}).",
-					message.ChunkStartNumber, message.ChunkEndNumber, message.RawPosition, message.RawPosition,
-					message.RawBytes.Length, message.RawBytes.Length, _activeChunk.FileSize, _activeChunk.FileSize);
-			}
-
-			_subscriptionPos += message.RawBytes.Length;
-
-			if (message.CompleteChunk) {
-				Log.Debug("Completing raw chunk {chunkStartNumber}-{chunkEndNumber}...", message.ChunkStartNumber,
-					message.ChunkEndNumber);
-				await Writer.CompleteReplicatedRawChunk(_activeChunk, token);
-				Flush();
-
-				_subscriptionPos = _activeChunk.ChunkHeader.ChunkEndPosition;
-				_framer.Reset();
-				_activeChunk = null;
-			}
-
-			if (message.CompleteChunk || _subscriptionPos > _ackedSubscriptionPos) {
-				_ackedSubscriptionPos = _subscriptionPos;
-				Bus.Publish(new ReplicationMessage.AckLogPosition(
-					subscriptionId: _subscriptionId,
-					replicationLogPosition: _ackedSubscriptionPos,
-					writerLogPosition: Writer.Position));
-			}
-		}
-
-		public void Handle(ReplicationMessage.DataChunkBulk message) {
-			Interlocked.Decrement(ref FlushMessagesInQueue);
-			try {
-				if (_subscriptionId != message.SubscriptionId) return;
-				if (_activeChunk != null)
-					ReplicationFail(
-						"Data chunk bulk received, but we have active chunk for receiving raw chunk bulks.",
-						"Data chunk bulk received, but we have active chunk for receiving raw chunk bulks.");
-
-				if (Writer.NeedsNewChunk) {
-					// for backwards compatibility with leaders running an old version (in case it doesn't send the CreateChunk message)
-					Writer.AddNewChunk();
-				}
-
-				var chunk = Writer.CurrentChunk;
-
-				if (chunk.ChunkHeader.ChunkStartNumber != message.ChunkStartNumber ||
-				    chunk.ChunkHeader.ChunkEndNumber != message.ChunkEndNumber) {
-					Log.Error(
-						"Received DataChunkBulk for TFChunk {chunkStartNumber}-{chunkEndNumber}, but active chunk is {activeChunkStartNumber}-{activeChunkEndNumber}.",
-						message.ChunkStartNumber, message.ChunkEndNumber, chunk.ChunkHeader.ChunkStartNumber,
-						chunk.ChunkHeader.ChunkEndNumber);
-					return;
-				}
-
-				if (_subscriptionPos != message.SubscriptionPosition) {
-					Log.Error(
-						"Received DataChunkBulk at SubscriptionPosition {subscriptionPosition} (0x{subscriptionPosition:X}) while current SubscriptionPosition is {subscriptionPos} (0x{subscriptionPos:X}).",
-						message.SubscriptionPosition, message.SubscriptionPosition, _subscriptionPos, _subscriptionPos);
-					return;
-				}
-
-				_framer.UnFrameData(new ArraySegment<byte>(message.DataBytes));
-				_subscriptionPos += message.DataBytes.Length;
-
-				if (message.CompleteChunk) {
-					// for backwards compatibility with logs having incomplete transactions at the end of a chunk
-					if (_framer.UnFramePendingLogRecords(out var numRecordsUnframed))
-						Log.Warning("Incomplete transaction consisting of {numRecords} log records was found at the end of chunk: {chunkStartNumber}-{chunkEndNumber}.",
-							numRecordsUnframed, message.ChunkStartNumber, message.ChunkEndNumber);
-
-					Log.Debug("Completing data chunk {chunkStartNumber}-{chunkEndNumber}...", message.ChunkStartNumber,
-						message.ChunkEndNumber);
-					Writer.CompleteChunk();
-
-					if (_framer.HasData)
-						ReplicationFail(
-							"There is some data left in framer when completing chunk.",
-							"There is some data left in framer when completing chunk.");
-
-					_subscriptionPos = chunk.ChunkHeader.ChunkEndPosition;
-					_framer.Reset();
-				}
-			} catch (Exception exc) {
-				Log.Error(exc, "Exception in writer.");
-				throw;
-			} finally {
-				Flush();
-			}
-
-			if (message.CompleteChunk || _subscriptionPos > _ackedSubscriptionPos) {
-				_ackedSubscriptionPos = _subscriptionPos;
-				Bus.Publish(new ReplicationMessage.AckLogPosition(
-					subscriptionId: _subscriptionId,
-					replicationLogPosition: _ackedSubscriptionPos,
-					// we leave it up to the Flush call above whether to truly flush or not
-					writerLogPosition: Writer.Position));
-			}
-		}
-
-		private void OnTransactionUnframed(IEnumerable<ILogRecord> records) {
-			Writer.OpenTransaction();
-			foreach (var record in records)
-				if (!Writer.TryWriteToTransaction(record, out _))
-					ReplicationFail(
-						"Failed to write replicated log record at position: {0}. Writer's position: {1}.",
-						"Failed to write replicated log record at position: {recordPos}. Writer's position: {writerPos}.",
-						record.LogPosition, Writer.Position);
-			Writer.CommitTransaction();
-		}
-
-		private void ReplicationFail(string message, string messageStructured, params object[] args) {
-			if (args.Length == 0) {
-				Log.Fatal(messageStructured);
-			} else {
-				Log.Fatal(messageStructured, args);
-			}
-
-			var msg = args.Length == 0 ? message : string.Format(message, args);
-			BlockWriter = true;
-			Application.Exit(ExitCode.Error, msg);
-			throw new Exception(msg);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/CorrelationIdPropertyContext.cs b/src/EventStore.Core/Services/CorrelationIdPropertyContext.cs
deleted file mode 100644
index 3aee8940bea..00000000000
--- a/src/EventStore.Core/Services/CorrelationIdPropertyContext.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.Core.Services
-{
-	public static class CorrelationIdPropertyContext {
-		public static string CorrelationIdProperty { get; set; } = "$correlationId";
-	}
-}
diff --git a/src/EventStore.Core/Services/ElectionsService.cs b/src/EventStore.Core/Services/ElectionsService.cs
deleted file mode 100644
index f7663bebb48..00000000000
--- a/src/EventStore.Core/Services/ElectionsService.cs
+++ /dev/null
@@ -1,757 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Cluster;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Storage.EpochManager;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.TransactionLog.Checkpoint;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services {
-	public enum ElectionsState {
-		Idle,
-		ElectingLeader,
-		Leader,
-		Acceptor,
-		Shutdown
-	}
-
-	public class ElectionsService : IHandle<SystemMessage.BecomeShuttingDown>,
-		IHandle<SystemMessage.SystemInit>,
-		IHandle<LeaderDiscoveryMessage.LeaderFound>,
-		IHandle<GossipMessage.GossipUpdated>,
-		IHandle<ElectionMessage.StartElections>,
-		IHandle<ElectionMessage.ElectionsTimedOut>,
-		IHandle<ElectionMessage.ViewChange>,
-		IHandle<ElectionMessage.ViewChangeProof>,
-		IHandle<ElectionMessage.SendViewChangeProof>,
-		IHandle<ElectionMessage.Prepare>,
-		IHandle<ElectionMessage.PrepareOk>,
-		IHandle<ElectionMessage.Proposal>,
-		IHandle<ElectionMessage.Accept>,
-		IHandle<ClientMessage.SetNodePriority>,
-		IHandle<ClientMessage.ResignNode>,
-		IHandle<ElectionMessage.LeaderIsResigning>,
-		IHandle<ElectionMessage.LeaderIsResigningOk> {
-		public static readonly TimeSpan SendViewChangeProofInterval = TimeSpan.FromMilliseconds(5000);
-		private readonly TimeSpan _leaderElectionProgressTimeout;
-
-		private static readonly ILogger Log = Serilog.Log.ForContext<ElectionsService>();
-		private static readonly EndPointComparer IPComparer = new EndPointComparer();
-
-		private readonly IPublisher _publisher;
-		private readonly IEnvelope _publisherEnvelope;
-		private readonly MemberInfo _memberInfo;
-		private readonly int _clusterSize;
-		private readonly IReadOnlyCheckpoint _writerCheckpoint;
-		private readonly IReadOnlyCheckpoint _chaserCheckpoint;
-		private readonly ICheckpoint _proposalCheckpoint;
-		private readonly IEpochManager _epochManager;
-		private readonly Func<long> _getLastCommitPosition;
-		private int _nodePriority;
-		private readonly ITimeProvider _timeProvider;
-
-		private int _lastAttemptedView = -1;
-		private int _lastInstalledView = -1;
-		private ElectionsState _state = ElectionsState.Idle;
-
-		private readonly HashSet<Guid> _vcReceived = new HashSet<Guid>();
-
-		private readonly Dictionary<Guid, ElectionMessage.PrepareOk> _prepareOkReceived =
-			new Dictionary<Guid, ElectionMessage.PrepareOk>();
-
-		private readonly HashSet<Guid> _leaderIsResigningOkReceived = new HashSet<Guid>();
-		private readonly HashSet<Guid> _acceptsReceived = new HashSet<Guid>();
-
-		private LeaderCandidate _leaderProposal;
-		public Guid LeaderProposalId => _leaderProposal?.InstanceId ?? Guid.Empty;
-		private Guid? _leader;
-		private Guid? _lastElectedLeader;
-
-		private MemberInfo[] _servers;
-		private Guid? _resigningLeaderInstanceId;
-
-		public ElectionsService(IPublisher publisher,
-			MemberInfo memberInfo,
-			int clusterSize,
-			IReadOnlyCheckpoint writerCheckpoint,
-			IReadOnlyCheckpoint chaserCheckpoint,
-			ICheckpoint proposalCheckpoint,
-			IEpochManager epochManager,
-			Func<long> getLastCommitPosition,
-			int nodePriority,
-			ITimeProvider timeProvider,
-			TimeSpan leaderElectionTimeout) {
-			Ensure.NotNull(publisher, nameof(publisher));
-			Ensure.NotNull(memberInfo, nameof(memberInfo));
-			Ensure.Positive(clusterSize, nameof(clusterSize));
-			Ensure.NotNull(writerCheckpoint, nameof(writerCheckpoint));
-			Ensure.NotNull(chaserCheckpoint, nameof(chaserCheckpoint));
-			Ensure.NotNull(proposalCheckpoint, nameof(proposalCheckpoint));
-			Ensure.NotNull(epochManager, nameof(epochManager));
-			Ensure.NotNull(getLastCommitPosition, nameof(getLastCommitPosition));
-			Ensure.NotNull(timeProvider, nameof(timeProvider));
-			if (leaderElectionTimeout.Seconds < 1) {
-				throw new ArgumentOutOfRangeException(nameof(leaderElectionTimeout),
-					$"{nameof(leaderElectionTimeout)} should be greater than 1 second.");
-			}
-			if (memberInfo.IsReadOnlyReplica) {
-				throw new ArgumentException("Read-only replicas are not allowed to run the Elections service.");
-			}
-
-			_publisher = publisher;
-			_memberInfo = memberInfo;
-			_publisherEnvelope = _publisher;
-			_clusterSize = clusterSize;
-			_writerCheckpoint = writerCheckpoint;
-			_chaserCheckpoint = chaserCheckpoint;
-			_proposalCheckpoint = proposalCheckpoint;
-			_epochManager = epochManager;
-			_getLastCommitPosition = getLastCommitPosition;
-			_nodePriority = nodePriority;
-			_timeProvider = timeProvider;
-			_leaderElectionProgressTimeout = leaderElectionTimeout;
-
-			var lastEpoch = _epochManager.LastEpochNumber;
-			if (_proposalCheckpoint.Read() < lastEpoch) {
-				_proposalCheckpoint.Write(lastEpoch);
-				_proposalCheckpoint.Flush();
-			}
-
-			var ownInfo = GetOwnInfo();
-			_servers = new[] {
-				MemberInfo.ForVNode(memberInfo.InstanceId,
-					_timeProvider.UtcNow,
-					VNodeState.Initializing,
-					true,
-					memberInfo.InternalTcpEndPoint, memberInfo.InternalSecureTcpEndPoint,
-					memberInfo.ExternalTcpEndPoint, memberInfo.ExternalSecureTcpEndPoint,
-					memberInfo.HttpEndPoint,
-					memberInfo.AdvertiseHostToClientAs, memberInfo.AdvertiseHttpPortToClientAs, memberInfo.AdvertiseTcpPortToClientAs,
-					ownInfo.LastCommitPosition, ownInfo.WriterCheckpoint, ownInfo.ChaserCheckpoint,
-					ownInfo.EpochPosition, ownInfo.EpochNumber, ownInfo.EpochId, ownInfo.NodePriority,
-					memberInfo.IsReadOnlyReplica, VersionInfo.Version)
-			};
-		}
-
-		public void SubscribeMessages(ISubscriber subscriber) {
-			subscriber.Subscribe<SystemMessage.BecomeShuttingDown>(this);
-			subscriber.Subscribe<SystemMessage.SystemInit>(this);
-			subscriber.Subscribe<LeaderDiscoveryMessage.LeaderFound>(this);
-			subscriber.Subscribe<GossipMessage.GossipUpdated>(this);
-			subscriber.Subscribe<ElectionMessage.StartElections>(this);
-			subscriber.Subscribe<ElectionMessage.ElectionsTimedOut>(this);
-			subscriber.Subscribe<ElectionMessage.ViewChange>(this);
-			subscriber.Subscribe<ElectionMessage.ViewChangeProof>(this);
-			subscriber.Subscribe<ElectionMessage.SendViewChangeProof>(this);
-			subscriber.Subscribe<ElectionMessage.Prepare>(this);
-			subscriber.Subscribe<ElectionMessage.PrepareOk>(this);
-			subscriber.Subscribe<ElectionMessage.Proposal>(this);
-			subscriber.Subscribe<ElectionMessage.Accept>(this);
-			subscriber.Subscribe<ElectionMessage.LeaderIsResigning>(this);
-			subscriber.Subscribe<ElectionMessage.LeaderIsResigningOk>(this);
-			subscriber.Subscribe<ClientMessage.SetNodePriority>(this);
-			subscriber.Subscribe<ClientMessage.ResignNode>(this);
-		}
-
-		public void Handle(SystemMessage.SystemInit _) {
-			_publisher.Publish(TimerMessage.Schedule.Create(SendViewChangeProofInterval,
-				_publisherEnvelope,
-				new ElectionMessage.SendViewChangeProof()));
-		}
-
-		public void Handle(ClientMessage.SetNodePriority message) {
-			Log.Information("Setting Node Priority to {nodePriority}.", message.NodePriority);
-			_nodePriority = message.NodePriority;
-			_publisher.Publish(new GossipMessage.UpdateNodePriority(_nodePriority));
-		}
-
-		public void Handle(ClientMessage.ResignNode message) {
-			if (_leader != null && _memberInfo.InstanceId == _leader) {
-				_resigningLeaderInstanceId = _leader;
-				var leaderIsResigningMessageOk = new ElectionMessage.LeaderIsResigningOk(
-					_memberInfo.InstanceId,
-					_memberInfo.HttpEndPoint,
-					_memberInfo.InstanceId,
-					_memberInfo.HttpEndPoint);
-				_leaderIsResigningOkReceived.Clear();
-				Handle(leaderIsResigningMessageOk);
-				SendToAllExceptMe(new ElectionMessage.LeaderIsResigning(
-					_memberInfo.InstanceId, _memberInfo.HttpEndPoint));
-			} else {
-				Log.Information("ELECTIONS: ONLY LEADER RESIGNATION IS SUPPORTED AT THE MOMENT. IGNORING RESIGNATION.");
-			}
-		}
-
-		public void Handle(ElectionMessage.LeaderIsResigning message) {
-			Log.Information("ELECTIONS: LEADER IS RESIGNING [{leaderHttpEndPoint}, {leaderId:B}].",
-				message.LeaderHttpEndPoint, message.LeaderId);
-			var leaderIsResigningMessageOk = new ElectionMessage.LeaderIsResigningOk(
-				message.LeaderId,
-				message.LeaderHttpEndPoint,
-				_memberInfo.InstanceId,
-				_memberInfo.HttpEndPoint);
-
-			_resigningLeaderInstanceId = message.LeaderId;
-			_publisher.Publish(new GrpcMessage.SendOverGrpc(message.LeaderHttpEndPoint, leaderIsResigningMessageOk,
-				_timeProvider.LocalTime.Add(_leaderElectionProgressTimeout)));
-		}
-
-		public void Handle(ElectionMessage.LeaderIsResigningOk message) {
-			Log.Information(
-				"ELECTIONS: LEADER IS RESIGNING OK FROM [{serverHttpEndPoint},{serverId:B}] M=[{leaderHttpEndPoint},{leaderId:B}]).",
-				message.ServerHttpEndPoint,
-				message.ServerId,
-				message.LeaderHttpEndPoint,
-				message.LeaderId);
-			if (_leaderIsResigningOkReceived.Add(message.ServerId) &&
-					_leaderIsResigningOkReceived.Count == _clusterSize / 2 + 1) {
-				Log.Information(
-					"ELECTIONS: MAJORITY OF ACCEPTANCE OF RESIGNATION OF LEADER [{leaderHttpEndPoint},{leaderId:B}]. NOW INITIATING LEADER RESIGNATION.",
-					message.LeaderHttpEndPoint, message.LeaderId);
-				_publisher.Publish(new SystemMessage.InitiateLeaderResignation());
-			}
-		}
-
-		public void Handle(SystemMessage.BecomeShuttingDown message) {
-			_state = ElectionsState.Shutdown;
-		}
-
-		public void Handle(GossipMessage.GossipUpdated message) {
-			_servers = message.ClusterInfo.Members.Where(x => x.State != VNodeState.Manager)
-				.Where(x => x.IsAlive)
-				.OrderByDescending(x => x.HttpEndPoint, IPComparer)
-				.ToArray();
-		}
-
-		public void Handle(ElectionMessage.StartElections message) {
-			if (_state == ElectionsState.Shutdown)
-				return;
-			if (_state == ElectionsState.ElectingLeader)
-				return;
-
-			Log.Information("ELECTIONS: STARTING ELECTIONS.");
-			ShiftToLeaderElection(_lastAttemptedView + 1);
-		}
-
-		public void Handle(ElectionMessage.ElectionsTimedOut message) {
-			if (_state == ElectionsState.Shutdown)
-				return;
-			if (message.View != _lastAttemptedView)
-				return;
-			// we are still on the same view, but we selected leader
-			if (_state != ElectionsState.ElectingLeader && _leader != null)
-				return;
-
-			Log.Information("ELECTIONS: (V={view}) TIMED OUT! (S={state}, M={leader}).", message.View, _state, _leader);
-			ShiftToLeaderElection(_lastAttemptedView + 1);
-		}
-
-		private void ShiftToLeaderElection(int view) {
-			Log.Information("ELECTIONS: (V={view}) SHIFT TO LEADER ELECTION.", view);
-
-			_state = ElectionsState.ElectingLeader;
-			_vcReceived.Clear();
-			_prepareOkReceived.Clear();
-			_lastAttemptedView = view;
-
-			_leaderProposal = null;
-			_leader = null;
-			_acceptsReceived.Clear();
-
-			var viewChangeMsg = new ElectionMessage.ViewChange(_memberInfo.InstanceId, _memberInfo.HttpEndPoint, view);
-			Handle(viewChangeMsg);
-			SendToAllExceptMe(viewChangeMsg);
-			_publisher.Publish(TimerMessage.Schedule.Create(_leaderElectionProgressTimeout,
-				_publisherEnvelope,
-				new ElectionMessage.ElectionsTimedOut(view)));
-		}
-
-		private void SendToAllExceptMe(Message message) {
-			foreach (var server in _servers.Where(x => x.InstanceId != _memberInfo.InstanceId)) {
-				_publisher.Publish(new GrpcMessage.SendOverGrpc(server.HttpEndPoint, message,
-					_timeProvider.LocalTime.Add(_leaderElectionProgressTimeout)));
-			}
-		}
-
-		public void Handle(ElectionMessage.ViewChange message) {
-			if (_state == ElectionsState.Shutdown)
-				return;
-			if (_state == ElectionsState.Idle)
-				return;
-
-			if (message.AttemptedView <= _lastInstalledView)
-				return;
-
-			Log.Information("ELECTIONS: (V={view}) VIEWCHANGE FROM [{serverHttpEndPoint}, {serverId:B}].",
-				message.AttemptedView, message.ServerHttpEndPoint, message.ServerId);
-
-			if (message.AttemptedView > _lastAttemptedView)
-				ShiftToLeaderElection(message.AttemptedView);
-
-			if (_vcReceived.Add(message.ServerId) && _vcReceived.Count == _clusterSize / 2 + 1) {
-				Log.Information("ELECTIONS: (V={view}) MAJORITY OF VIEWCHANGE.", message.AttemptedView);
-				if (AmILeaderOf(_lastAttemptedView))
-					ShiftToPreparePhase();
-			}
-		}
-
-		public void Handle(ElectionMessage.SendViewChangeProof message) {
-			if (_state == ElectionsState.Shutdown)
-				return;
-
-			if (_lastInstalledView >= 0)
-				SendToAllExceptMe(new ElectionMessage.ViewChangeProof(_memberInfo.InstanceId, _memberInfo.HttpEndPoint,
-					_lastInstalledView));
-
-			_publisher.Publish(TimerMessage.Schedule.Create(SendViewChangeProofInterval,
-				_publisherEnvelope,
-				new ElectionMessage.SendViewChangeProof()));
-		}
-
-		public void Handle(ElectionMessage.ViewChangeProof message) {
-			if (_state == ElectionsState.Shutdown)
-				return;
-			if (_state == ElectionsState.Idle)
-				return;
-			if (message.InstalledView <= _lastInstalledView)
-				return;
-
-			_lastAttemptedView = message.InstalledView;
-
-			_publisher.Publish(TimerMessage.Schedule.Create(_leaderElectionProgressTimeout,
-				_publisherEnvelope,
-				new ElectionMessage.ElectionsTimedOut(_lastAttemptedView)));
-
-			if (AmILeaderOf(_lastAttemptedView)) {
-				Log.Information(
-					"ELECTIONS: (IV={installedView}) VIEWCHANGEPROOF FROM [{serverHttpEndPoint}, {serverId:B}]. JUMPING TO LEADER STATE.",
-					message.InstalledView, message.ServerHttpEndPoint, message.ServerId);
-
-				ShiftToPreparePhase();
-			} else {
-				Log.Information(
-					"ELECTIONS: (IV={installedView}) VIEWCHANGEPROOF FROM [{serverHttpEndPoint}, {serverId:B}]. JUMPING TO NON-LEADER STATE.",
-					message.InstalledView, message.ServerHttpEndPoint, message.ServerId);
-
-				ShiftToAcceptor();
-			}
-		}
-
-		private bool AmILeaderOf(int lastAttemptedView) {
-			var serversExcludingNonPotentialLeaders = _servers.Where(x => !x.IsReadOnlyReplica).ToArray();
-			var leader =
-				serversExcludingNonPotentialLeaders[lastAttemptedView % serversExcludingNonPotentialLeaders.Length];
-			return leader.InstanceId == _memberInfo.InstanceId;
-		}
-
-		private void ShiftToPreparePhase() {
-			Log.Information("ELECTIONS: (V={lastAttemptedView}) SHIFT TO PREPARE PHASE.", _lastAttemptedView);
-
-			_lastInstalledView = _lastAttemptedView;
-			_prepareOkReceived.Clear();
-
-			Handle(CreatePrepareOk(_lastInstalledView));
-			SendToAllExceptMe(new ElectionMessage.Prepare(_memberInfo.InstanceId, _memberInfo.HttpEndPoint,
-				_lastInstalledView));
-		}
-
-		public void Handle(ElectionMessage.Prepare message) {
-			if (_state == ElectionsState.Shutdown)
-				return;
-			if (message.ServerId == _memberInfo.InstanceId)
-				return;
-			if (message.View != _lastAttemptedView)
-				return;
-			if (_servers.All(x => x.InstanceId != message.ServerId))
-				return; // unknown instance
-
-			Log.Information("ELECTIONS: (V={lastAttemptedView}) PREPARE FROM [{serverHttpEndPoint}, {serverId:B}].",
-				_lastAttemptedView, message.ServerHttpEndPoint, message.ServerId);
-
-			if (_state == ElectionsState.ElectingLeader) // install the view
-				ShiftToAcceptor();
-
-			var prepareOk = CreatePrepareOk(message.View);
-			_publisher.Publish(new GrpcMessage.SendOverGrpc(message.ServerHttpEndPoint, prepareOk,
-				_timeProvider.LocalTime.Add(_leaderElectionProgressTimeout)));
-		}
-
-		private ElectionMessage.PrepareOk CreatePrepareOk(int view) {
-			var ownInfo = GetOwnInfo();
-			var clusterInfo = new ClusterInfo(_servers);
-			return new ElectionMessage.PrepareOk(view, ownInfo.InstanceId, ownInfo.HttpEndPoint,
-				ownInfo.EpochNumber, ownInfo.EpochPosition, ownInfo.EpochId, ownInfo.EpochLeaderInstanceId,
-				ownInfo.LastCommitPosition, ownInfo.WriterCheckpoint, ownInfo.ChaserCheckpoint,
-				ownInfo.NodePriority, clusterInfo);
-		}
-
-		private void ShiftToAcceptor() {
-			Log.Information("ELECTIONS: (V={lastAttemptedView}) SHIFT TO REG_ACCEPTOR.", _lastAttemptedView);
-
-			_state = ElectionsState.Acceptor;
-			_lastInstalledView = _lastAttemptedView;
-		}
-
-		public void Handle(ElectionMessage.PrepareOk msg) {
-			if (_state == ElectionsState.Shutdown)
-				return;
-			if (_state != ElectionsState.ElectingLeader)
-				return;
-			if (msg.View != _lastAttemptedView)
-				return;
-
-			Log.Information("ELECTIONS: (V={view}) PREPARE_OK FROM {nodeInfo}.", msg.View,
-				FormatNodeInfo(msg.ServerHttpEndPoint, msg.ServerId,
-					msg.LastCommitPosition, msg.WriterCheckpoint, msg.ChaserCheckpoint,
-					msg.EpochNumber, msg.EpochPosition, msg.EpochId, msg.EpochLeaderInstanceId, msg.NodePriority));
-
-			if (!_prepareOkReceived.ContainsKey(msg.ServerId)) {
-				_prepareOkReceived.Add(msg.ServerId, msg);
-				if (_prepareOkReceived.Count == _clusterSize / 2 + 1)
-					ShiftToLeader();
-			}
-		}
-
-		private void ShiftToLeader() {
-			Log.Information("ELECTIONS: (V={lastAttemptedView}) SHIFT TO REG_LEADER.", _lastAttemptedView);
-
-			_state = ElectionsState.Leader;
-			SendProposal();
-		}
-
-		private void SendProposal() {
-			_acceptsReceived.Clear();
-			_leaderProposal = null;
-
-			var leader = GetBestLeaderCandidate(_prepareOkReceived, _servers, _resigningLeaderInstanceId, _lastAttemptedView);
-			if (leader == null) {
-				Log.Information("ELECTIONS: (V={lastAttemptedView}) NO LEADER CANDIDATE WHEN TRYING TO SEND PROPOSAL.",
-					_lastAttemptedView);
-				return;
-			}
-
-			var proposalNumber = Math.Max(_epochManager.LastEpochNumber, _proposalCheckpoint.Read()) + 1;
-			_proposalCheckpoint.Write(proposalNumber);
-			_proposalCheckpoint.Flush();
-			leader.ProposalNumber = (int)proposalNumber;
-			_leaderProposal = leader;
-
-			Log.Information("ELECTIONS: (V={lastAttemptedView}) SENDING PROPOSAL CANDIDATE: {formatNodeInfo}, PROPOSAL NUMBER {proposal}, ME: {ownInfo}.",
-				_lastAttemptedView, FormatNodeInfo(leader), proposalNumber, FormatNodeInfo(GetOwnInfo()));
-
-			var proposal = new ElectionMessage.Proposal(_memberInfo.InstanceId, _memberInfo.HttpEndPoint,
-				leader.InstanceId, leader.HttpEndPoint,
-				_lastInstalledView,
-				(int)proposalNumber, leader.EpochPosition, leader.EpochId, leader.EpochLeaderInstanceId,
-				leader.LastCommitPosition, leader.WriterCheckpoint, leader.ChaserCheckpoint, leader.NodePriority);
-			Handle(new ElectionMessage.Accept(_memberInfo.InstanceId, _memberInfo.HttpEndPoint,
-				leader.InstanceId, leader.HttpEndPoint, _lastInstalledView));
-			SendToAllExceptMe(proposal);
-		}
-
-		public static LeaderCandidate GetBestLeaderCandidate(Dictionary<Guid, ElectionMessage.PrepareOk> received,
-			MemberInfo[] servers, Guid? resigningLeaderInstanceId, int lastAttemptedView) {
-
-			var best = received.Values
-				.OrderByDescending(x => x.EpochNumber) // latest election
-				.ThenByDescending(x => x.WriterCheckpoint) // log length (if not re-electing leader pick the most complete replica)
-				.ThenByDescending(x => x.ChaserCheckpoint) // in memory index position
-				.ThenBy(x => x.ServerId == resigningLeaderInstanceId) // pick other nodes over a resigning leader
-				.ThenByDescending(x => x.NodePriority) // indicated node priority from settings
-				.ThenByDescending(x => x.ServerId) // tie breaker
-				.FirstOrDefault();
-
-			if (best == null)
-				return null;
-
-			var bestCandidate = new LeaderCandidate(best.ServerId, best.ServerHttpEndPoint,
-				best.EpochNumber, best.EpochPosition, best.EpochId, best.EpochLeaderInstanceId,
-				best.LastCommitPosition, best.WriterCheckpoint, best.ChaserCheckpoint, best.NodePriority);
-
-			if (best.EpochLeaderInstanceId != Guid.Empty) {
-				//best.EpochLeaderInstanceId = id of the last leader/master which has been able to write an epoch record to the transaction log and get it replicated
-				//to the "best" node which has the latest data, i.e data that has been replicated to at least a quorum number of nodes for sure.
-				//We know that the data from the "best" node originates from this leader/master itself from this epoch record onwards, thus it implies that
-				//the leader/master in this epoch record must have the latest replicated data as well and is thus definitely a valid candidate for leader/master if it's still alive.
-				//NOTE 1: It does not matter if the "best" node's latest epoch record has been replicated to a quorum number of nodes or not, the
-				//leader/master in the epoch record must still have the latest replicated data
-				//NOTE 2: it is not necessary that this leader/master is the last elected leader/master in the cluster e.g a leader/master might be elected but
-				//has no time to replicate the epoch. In this case, it will need to truncate when joining the new leader.
-
-				var previousLeaderId = best.EpochLeaderInstanceId;
-				LeaderCandidate previousLeaderCandidate = null;
-
-				//we have received a PrepareOk message from the previous leader, so we definitely know it's alive.
-				if (received.TryGetValue(previousLeaderId, out var leaderMsg) &&
-					leaderMsg.EpochNumber == best.EpochNumber &&
-					leaderMsg.EpochId == best.EpochId) {
-					Log.Debug("ELECTIONS: (V={lastAttemptedView}) Previous Leader (L={previousLeaderId:B}) from last epoch record is still alive.", lastAttemptedView, previousLeaderId);
-					previousLeaderCandidate = new LeaderCandidate(leaderMsg.ServerId, leaderMsg.ServerHttpEndPoint,
-						leaderMsg.EpochNumber, leaderMsg.EpochPosition, leaderMsg.EpochId, leaderMsg.EpochLeaderInstanceId,
-						leaderMsg.LastCommitPosition, leaderMsg.WriterCheckpoint, leaderMsg.ChaserCheckpoint,
-						leaderMsg.NodePriority);
-				}
-
-				//we try to find at least one node from the quorum no. of PrepareOk messages which says that the previous leader is alive
-				//if none of them say it's alive, a quorum can very probably not be formed with the previous leader
-				//otherwise we know that the leader was alive during the last gossip time interval and we try our luck
-				if (previousLeaderCandidate == null) {
-					foreach (var (id, prepareOk) in received) {
-						var member = prepareOk.ClusterInfo.Members.FirstOrDefault(x => x.InstanceId == previousLeaderId && x.IsAlive);
-
-						if (member != null) {
-							//these checks are not really necessary but we do them to ensure that everything is normal.
-							if (best.EpochNumber == member.EpochNumber && best.EpochId != member.EpochId) {
-								//something is definitely not right if the epoch numbers match but not the epoch ids
-								Log.Warning("ELECTIONS: (V={lastAttemptedView}) Epoch ID mismatch in gossip information from node {nodeId:B}. Best node's Epoch Id: {bestEpochId:B}, Leader node's Epoch Id: {leaderEpochId:B}", lastAttemptedView, id, best.EpochId, member.EpochId);
-								continue;
-							}
-
-							if (best.EpochNumber - member.EpochNumber > 2) {
-								//gossip information may be slightly out of date. We log a warning if the epoch number is off by more than 2
-								Log.Warning("ELECTIONS: (V={lastAttemptedView}) Epoch number is off by more than two in gossip information from node {nodeId:B}. Best node's Epoch number: {bestEpochNumber}, Leader node's Epoch number: {leaderEpochNumber}.", lastAttemptedView, id, best.EpochNumber, member.EpochNumber);
-							}
-
-							Log.Debug("ELECTIONS: (V={lastAttemptedView}) Previous Leader (L={previousLeaderId:B}) from last epoch record is still alive according to gossip from node {nodeId:B}.", lastAttemptedView, previousLeaderId, id);
-							previousLeaderCandidate = new LeaderCandidate(member.InstanceId,
-								member.HttpEndPoint,
-								member.EpochNumber, member.EpochPosition, member.EpochId, best.EpochLeaderInstanceId,
-								member.LastCommitPosition, member.WriterCheckpoint, member.ChaserCheckpoint,
-								member.NodePriority);
-							break;
-						}
-					}
-				}
-
-				if (previousLeaderCandidate == null) {
-					Log.Debug("ELECTIONS: (V={lastAttemptedView}) Previous Leader (L={previousLeaderId:B}) from last epoch record is dead, defaulting to the best candidate (B={bestCandidateId:B}).", lastAttemptedView, previousLeaderId, bestCandidate.InstanceId);
-				} else if (previousLeaderCandidate.InstanceId == resigningLeaderInstanceId) {
-					Log.Debug("ELECTIONS: (V={lastAttemptedView}) Previous Leader (L={previousLeaderId:B}) from last epoch record is alive but it is resigning, defaulting to the best candidate (B={bestCandidateId:B}).", lastAttemptedView, previousLeaderId, bestCandidate.InstanceId);
-				} else {
-					bestCandidate = previousLeaderCandidate;
-				}
-			}
-
-			Log.Debug("ELECTIONS: (V={lastAttemptedView}) Proposing node: {leaderCandidateId:B} as best leader candidate", lastAttemptedView, bestCandidate.InstanceId);
-			return bestCandidate;
-		}
-
-		public static bool IsLegitimateLeader(int view, EndPoint proposingServerEndPoint, Guid proposingServerId,
-			LeaderCandidate candidate, MemberInfo[] servers, Guid? lastElectedLeader, Guid instanceId,
-			LeaderCandidate ownInfo,
-			Guid? resigningLeader) {
-			var leader = servers.FirstOrDefault(x =>
-				x.IsAlive && x.InstanceId == lastElectedLeader && x.State == VNodeState.Leader);
-
-			if (leader != null && leader.InstanceId != resigningLeader) {
-				if (candidate.InstanceId == leader.InstanceId
-					|| candidate.EpochNumber > leader.EpochNumber
-					|| (candidate.EpochNumber == leader.EpochNumber && candidate.EpochId != leader.EpochId))
-					return true;
-
-				Log.Information(
-					"ELECTIONS: (V={view}) NOT LEGITIMATE LEADER PROPOSAL FROM [{proposingServerEndPoint},{proposingServerId:B}] M={candidateInfo}. "
-					+ "PREVIOUS LEADER IS ALIVE: [{leaderHttpEndPoint},{leaderId:B}].",
-					view, proposingServerEndPoint, proposingServerId, FormatNodeInfo(candidate),
-					leader.HttpEndPoint, leader.InstanceId);
-				return false;
-			}
-
-			if (candidate.InstanceId == instanceId)
-				return true;
-
-			if (!IsCandidateGoodEnough(candidate, ownInfo)) {
-				Log.Information(
-					"ELECTIONS: (V={view}) NOT LEGITIMATE LEADER PROPOSAL FROM [{proposingServerEndPoint},{proposingServerId:B}] M={candidateInfo}. ME={ownInfo}.",
-					view, proposingServerEndPoint, proposingServerId, FormatNodeInfo(candidate),
-					FormatNodeInfo(ownInfo));
-				return false;
-			}
-
-			return true;
-		}
-
-		private static bool IsCandidateGoodEnough(LeaderCandidate candidate, LeaderCandidate ownInfo) {
-			if (candidate.EpochNumber != ownInfo.EpochNumber)
-				return candidate.EpochNumber > ownInfo.EpochNumber;
-			if (candidate.LastCommitPosition != ownInfo.LastCommitPosition)
-				return candidate.LastCommitPosition > ownInfo.LastCommitPosition;
-			if (candidate.WriterCheckpoint != ownInfo.WriterCheckpoint)
-				return candidate.WriterCheckpoint > ownInfo.WriterCheckpoint;
-			if (candidate.ChaserCheckpoint != ownInfo.ChaserCheckpoint)
-				return candidate.ChaserCheckpoint > ownInfo.ChaserCheckpoint;
-			return true;
-		}
-
-		public void Handle(ElectionMessage.Proposal message) {
-			if (_state == ElectionsState.Shutdown)
-				return;
-			if (message.ServerId == _memberInfo.InstanceId)
-				return;
-			if (_state != ElectionsState.Acceptor)
-				return;
-			if (message.View != _lastInstalledView)
-				return;
-			if (_servers.All(x => x.InstanceId != message.ServerId))
-				return;
-			if (_servers.All(x => x.InstanceId != message.LeaderId))
-				return;
-
-			var candidate = new LeaderCandidate(message.LeaderId, message.LeaderHttpEndPoint,
-				message.EpochNumber, message.EpochPosition, message.EpochId, message.EpochLeaderInstanceId,
-				message.LastCommitPosition, message.WriterCheckpoint, message.ChaserCheckpoint, message.NodePriority);
-
-			if (message.EpochNumber > _proposalCheckpoint.Read()) {
-				_proposalCheckpoint.Write(message.EpochNumber);
-				_proposalCheckpoint.Flush();
-			} else {
-				Log.Information(
-					"ELECTIONS: (V={lastAttemptedView}, P={lastKnownProposal}) OUTDATED PROPOSAL P={proposedEpoch} FROM [{serverHttpEndPoint},{serverId:B}] M={candidateInfo}. ME={ownInfo}, NodePriority={priority}",
-					_lastAttemptedView,
-					_proposalCheckpoint.Read(),
-					message.EpochNumber,
-					message.ServerHttpEndPoint, message.ServerId, FormatNodeInfo(candidate), FormatNodeInfo(GetOwnInfo()),
-					message.NodePriority);
-				return;
-			}
-
-			var ownInfo = GetOwnInfo();
-			if (!IsLegitimateLeader(message.View, message.ServerHttpEndPoint, message.ServerId,
-				candidate, _servers, _lastElectedLeader, _memberInfo.InstanceId, ownInfo,
-				_resigningLeaderInstanceId))
-				return;
-
-			Log.Information(
-				"ELECTIONS: (V={lastAttemptedView}, P={lastKnownProposal}) PROPOSAL P={proposedEpoch} FROM [{serverHttpEndPoint},{serverId:B}] M={candidateInfo}. ME={ownInfo}, NodePriority={priority}",
-				_lastAttemptedView,
-				_proposalCheckpoint.Read(),
-				message.EpochNumber,
-				message.ServerHttpEndPoint, message.ServerId, FormatNodeInfo(candidate), FormatNodeInfo(GetOwnInfo()),
-				message.NodePriority);
-
-			if (_leaderProposal == null) {
-				_leaderProposal = candidate;
-				_leaderProposal.ProposalNumber = message.EpochNumber;
-				_acceptsReceived.Clear();
-			}
-
-			if (_leaderProposal.InstanceId == message.LeaderId) {
-				// NOTE: proposal from other server is also implicit Accept from that server
-				Handle(new ElectionMessage.Accept(message.ServerId, message.ServerHttpEndPoint,
-					message.LeaderId, message.LeaderHttpEndPoint, message.View));
-				var accept = new ElectionMessage.Accept(_memberInfo.InstanceId, _memberInfo.HttpEndPoint,
-					message.LeaderId, message.LeaderHttpEndPoint, message.View);
-				Handle(accept); // implicitly sent accept to ourselves
-				SendToAllExceptMe(accept);
-			}
-		}
-
-		public void Handle(ElectionMessage.Accept message) {
-			if (_state == ElectionsState.Shutdown)
-				return;
-			if (message.View != _lastInstalledView)
-				return;
-			if (_leaderProposal == null)
-				return;
-			if (_leaderProposal.InstanceId != message.LeaderId)
-				return;
-
-			Log.Information(
-				"ELECTIONS: (V={view}) ACCEPT FROM [{serverHttpEndPoint},{serverId:B}] M=[{leaderHttpEndPoint},{leaderId:B}]).",
-				message.View,
-				message.ServerHttpEndPoint, message.ServerId, message.LeaderHttpEndPoint, message.LeaderId);
-
-			if (_acceptsReceived.Add(message.ServerId) && _acceptsReceived.Count == _clusterSize / 2 + 1) {
-				var leader = _servers.FirstOrDefault(x => x.InstanceId == _leaderProposal.InstanceId);
-				if (leader != null) {
-					_leader = _leaderProposal.InstanceId;
-					Log.Information("ELECTIONS: (V={view}) DONE. ELECTED LEADER = {leaderInfo}. ME={ownInfo}.", message.View,
-						FormatNodeInfo(_leaderProposal), FormatNodeInfo(GetOwnInfo()));
-					_lastElectedLeader = _leader;
-					_resigningLeaderInstanceId = null;
-					_publisher.Publish(new ElectionMessage.ElectionsDone(message.View, _leaderProposal.ProposalNumber, leader));
-				}
-			}
-		}
-
-		public void Handle(LeaderDiscoveryMessage.LeaderFound message) {
-			if (_leader != null || _lastElectedLeader != null || _state != ElectionsState.Idle)
-				return;
-
-			Log.Information("ELECTIONS: Existing LEADER was discovered, updating information. M=[{leaderHttpEndPoint},{leaderId:B}])", message.Leader.HttpEndPoint, message.Leader.InstanceId);
-			_leader = message.Leader.InstanceId;
-			_lastElectedLeader = message.Leader.InstanceId;
-			_lastAttemptedView = 0;
-			_lastInstalledView = 0;
-			_state = ElectionsState.Acceptor;
-		}
-
-		private LeaderCandidate GetOwnInfo() {
-			var lastEpoch = _epochManager.GetLastEpoch();
-			var writerCheckpoint = _writerCheckpoint.Read();
-			var chaserCheckpoint = _chaserCheckpoint.Read();
-			var lastCommitPosition = _getLastCommitPosition();
-			return new LeaderCandidate(_memberInfo.InstanceId, _memberInfo.HttpEndPoint,
-				lastEpoch == null ? -1 : lastEpoch.EpochNumber,
-				lastEpoch == null ? -1 : lastEpoch.EpochPosition,
-				lastEpoch == null ? Guid.Empty : lastEpoch.EpochId,
-				lastEpoch == null ? Guid.Empty : lastEpoch.LeaderInstanceId,
-				lastCommitPosition, writerCheckpoint, chaserCheckpoint, _nodePriority);
-		}
-
-		private static string FormatNodeInfo(LeaderCandidate candidate) {
-			return FormatNodeInfo(candidate.HttpEndPoint, candidate.InstanceId,
-				candidate.LastCommitPosition, candidate.WriterCheckpoint, candidate.ChaserCheckpoint,
-				candidate.EpochNumber, candidate.EpochPosition, candidate.EpochId, candidate.EpochLeaderInstanceId, candidate.NodePriority);
-		}
-
-		private static string FormatNodeInfo(EndPoint serverEndPoint, Guid serverId,
-			long lastCommitPosition, long writerCheckpoint, long chaserCheckpoint,
-			int epochNumber, long epochPosition, Guid epochId, Guid epochLeaderInstanceId, int priority) {
-			return string.Format("[{0},{1:B}](L={2},W={3},C={4},E{5}@{6}:{7:B} (L={8:B}),Priority={9})",
-				serverEndPoint, serverId,
-				lastCommitPosition, writerCheckpoint, chaserCheckpoint,
-				epochNumber, epochPosition, epochId, epochLeaderInstanceId, priority);
-		}
-
-		public class LeaderCandidate {
-			public readonly Guid InstanceId;
-			public readonly EndPoint HttpEndPoint;
-
-			public int ProposalNumber;
-			public readonly int EpochNumber;
-			public readonly long EpochPosition;
-			public readonly Guid EpochId;
-			public readonly Guid EpochLeaderInstanceId;
-
-			public readonly long LastCommitPosition;
-			public readonly long WriterCheckpoint;
-			public readonly long ChaserCheckpoint;
-
-			public readonly int NodePriority;
-
-			public LeaderCandidate(Guid instanceId, EndPoint httpEndPoint,
-				int epochNumber, long epochPosition, Guid epochId, Guid epochLeaderInstanceId,
-				long lastCommitPosition, long writerCheckpoint, long chaserCheckpoint,
-				int nodePriority) {
-				InstanceId = instanceId;
-				HttpEndPoint = httpEndPoint;
-				EpochNumber = epochNumber;
-				EpochPosition = epochPosition;
-				EpochId = epochId;
-				EpochLeaderInstanceId = epochLeaderInstanceId;
-				LastCommitPosition = lastCommitPosition;
-				WriterCheckpoint = writerCheckpoint;
-				ChaserCheckpoint = chaserCheckpoint;
-				NodePriority = nodePriority;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Gossip/ClusterMultipleVersionsLogger.cs b/src/EventStore.Core/Services/Gossip/ClusterMultipleVersionsLogger.cs
deleted file mode 100644
index f13cdb5bd79..00000000000
--- a/src/EventStore.Core/Services/Gossip/ClusterMultipleVersionsLogger.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using EventStore.Common.Log;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Cluster;
-using EventStore.Core.Messages;
-
-namespace EventStore.Core.Services.Gossip;
-
-public class ClusterMultipleVersionsLogger : IHandle<GossipMessage.GossipUpdated> {
-	private static readonly ThrottledLog<ClusterMultipleVersionsLogger> Log = new(TimeSpan.FromMinutes(1));
-
-	public void Handle(GossipMessage.GossipUpdated message) {
-		ClusterInfo updatedCluster = message.ClusterInfo;
-		if (updatedCluster == null) {
-			return;
-		}
-		Dictionary<EndPoint, string> ipAddressVsVersion = GetIPAddressVsVersion(updatedCluster, out int numDistinctKnownVersions);
-		if (numDistinctKnownVersions > 1) {
-			IEnumerable<string> ipAndVersion = ipAddressVsVersion.Select(keyvalue => $"({keyvalue.Key},{keyvalue.Value})");
-			Log.Warning($"MULTIPLE ES VERSIONS ON CLUSTER NODES FOUND [ {string.Join(", ", ipAndVersion)} ]");
-		}
-	}
-
-	public static Dictionary<EndPoint, string> GetIPAddressVsVersion(ClusterInfo cluster, out int numDistinctKnownVersions) {
-		List<MemberInfo> aliveMembers = cluster.Members.Where(memberInfo => memberInfo.IsAlive).ToList();
-		numDistinctKnownVersions = aliveMembers.Select(memberInfo => memberInfo.ESVersion)
-			.Where(esVersion => !VersionInfo.UnknownVersion.Equals(esVersion)).Distinct().Count();
-
-		return aliveMembers.ToDictionary(memberInfo => memberInfo.HttpEndPoint, memberInfo => memberInfo.ESVersion);
-	}
-}
diff --git a/src/EventStore.Core/Services/Gossip/DnsGossipSeedSource.cs b/src/EventStore.Core/Services/Gossip/DnsGossipSeedSource.cs
deleted file mode 100644
index 81b9215e35b..00000000000
--- a/src/EventStore.Core/Services/Gossip/DnsGossipSeedSource.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Linq;
-using System.Net;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.Services.Gossip {
-	public class DnsGossipSeedSource : IGossipSeedSource {
-		private readonly string _hostname;
-		private readonly int _managerHttpPort;
-
-		public DnsGossipSeedSource(string hostname, int managerHttpPort) {
-			_hostname = hostname;
-			_managerHttpPort = managerHttpPort;
-		}
-
-		public IAsyncResult BeginGetHostEndpoints(AsyncCallback requestCallback, object state) {
-			return Dns.BeginGetHostAddresses(_hostname, requestCallback, state);
-		}
-
-		public EndPoint[] EndGetHostEndpoints(IAsyncResult asyncResult) {
-			var addresses = Dns.EndGetHostAddresses(asyncResult);
-
-			return addresses.Select(address => new IPEndPoint(address, _managerHttpPort).WithClusterDns(_hostname)).ToArray();
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Gossip/GossipServiceBase.cs b/src/EventStore.Core/Services/Gossip/GossipServiceBase.cs
deleted file mode 100644
index 666fa969eaf..00000000000
--- a/src/EventStore.Core/Services/Gossip/GossipServiceBase.cs
+++ /dev/null
@@ -1,415 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Cluster;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Gossip {
-	public abstract class GossipServiceBase : IHandle<SystemMessage.SystemInit>,
-		IHandle<GossipMessage.RetrieveGossipSeedSources>,
-		IHandle<GossipMessage.GotGossipSeedSources>,
-		IHandle<GossipMessage.Gossip>,
-		IHandle<GossipMessage.GossipReceived>,
-		IHandle<GossipMessage.ReadGossip>,
-		IHandle<GossipMessage.ClientGossip>,
-		IHandle<SystemMessage.StateChangeMessage>,
-		IHandle<GossipMessage.GossipSendFailed>,
-		IHandle<SystemMessage.VNodeConnectionLost>,
-		IHandle<SystemMessage.VNodeConnectionEstablished>,
-		IHandle<GossipMessage.GetGossipReceived>,
-		IHandle<GossipMessage.GetGossipFailed>,
-		IHandle<ElectionMessage.ElectionsDone> {
-		public const int GossipRoundStartupThreshold = 20;
-		public static readonly TimeSpan DnsRetryTimeout = TimeSpan.FromMilliseconds(1000);
-		public static readonly TimeSpan GossipStartupInterval = TimeSpan.FromMilliseconds(100);
-		private readonly TimeSpan DeadMemberRemovalPeriod;
-		private static readonly ILogger Log = Serilog.Log.ForContext<GossipServiceBase>();
-
-		protected readonly MemberInfo _memberInfo;
-		protected VNodeState CurrentRole = VNodeState.Initializing;
-		private MemberInfo CurrentLeader;
-		private readonly TimeSpan GossipInterval;
-		private readonly TimeSpan AllowedTimeDifference;
-		private readonly TimeSpan GossipTimeout;
-
-		private readonly IPublisher _bus;
-		private readonly int _clusterSize;
-		private readonly IEnvelope _publishEnvelope;
-		private readonly IGossipSeedSource _gossipSeedSource;
-
-		private GossipState _state;
-		private ClusterInfo _cluster;
-		private readonly Random _rnd = new Random(Math.Abs(Environment.TickCount));
-		private readonly ITimeProvider _timeProvider;
-		private readonly Func<MemberInfo[], MemberInfo> _getNodeToGossipTo;
-
-		protected GossipServiceBase(IPublisher bus,
-			int clusterSize,
-			IGossipSeedSource gossipSeedSource,
-			MemberInfo memberInfo,
-			TimeSpan gossipInterval,
-			TimeSpan allowedTimeDifference,
-			TimeSpan gossipTimeout,
-			TimeSpan deadMemberRemovalPeriod,
-			ITimeProvider timeProvider,
-			Func<MemberInfo[], MemberInfo> getNodeToGossipTo = null) {
-			Ensure.NotNull(bus, "bus");
-			Ensure.NotNull(gossipSeedSource, "gossipSeedSource");
-			Ensure.NotNull(memberInfo, "nodeInfo");
-			Ensure.NotNull(timeProvider, nameof(timeProvider));
-
-			_bus = bus;
-			_clusterSize = clusterSize;
-			_publishEnvelope = bus;
-			_gossipSeedSource = gossipSeedSource;
-			_memberInfo = memberInfo;
-			GossipInterval = gossipInterval;
-			AllowedTimeDifference = allowedTimeDifference;
-			GossipTimeout = gossipTimeout;
-			DeadMemberRemovalPeriod = deadMemberRemovalPeriod;
-			_state = GossipState.Startup;
-			_timeProvider = timeProvider;
-			_getNodeToGossipTo = getNodeToGossipTo ?? GetNodeToGossipTo;
-		}
-
-		protected abstract MemberInfo GetInitialMe();
-		protected abstract MemberInfo GetUpdatedMe(MemberInfo me);
-
-		public void Handle(SystemMessage.SystemInit message) {
-			if (_state != GossipState.Startup)
-				return;
-			_cluster = new ClusterInfo(GetInitialMe());
-			Handle(new GossipMessage.RetrieveGossipSeedSources());
-		}
-
-		public void Handle(GossipMessage.RetrieveGossipSeedSources message) {
-			_state = GossipState.RetrievingGossipSeeds;
-			try {
-				_gossipSeedSource.BeginGetHostEndpoints(OnGotGossipSeedSources, null);
-			} catch (Exception ex) {
-				Log.Error(ex, "Error while retrieving cluster members through DNS.");
-				_bus.Publish(TimerMessage.Schedule.Create(DnsRetryTimeout, _publishEnvelope,
-					new GossipMessage.RetrieveGossipSeedSources()));
-			}
-		}
-
-		private void OnGotGossipSeedSources(IAsyncResult ar) {
-			try {
-				var entries = _gossipSeedSource.EndGetHostEndpoints(ar);
-				_bus.Publish(new GossipMessage.GotGossipSeedSources(entries));
-			} catch (Exception ex) {
-				Log.Error(ex, "Error while retrieving cluster members through DNS.");
-				_bus.Publish(TimerMessage.Schedule.Create(DnsRetryTimeout, _publishEnvelope,
-					new GossipMessage.RetrieveGossipSeedSources()));
-			}
-		}
-
-		public void Handle(GossipMessage.GotGossipSeedSources message) {
-			var now = _timeProvider.UtcNow;
-			var dnsCluster = new ClusterInfo(
-				message.GossipSeeds.Select(x => MemberInfo.ForManager(Guid.Empty, now, true, x)).ToArray());
-
-			var oldCluster = _cluster;
-			_cluster = MergeClusters(_cluster, dnsCluster, null, x => x, _timeProvider.UtcNow, _memberInfo,
-				CurrentLeader?.InstanceId, AllowedTimeDifference, DeadMemberRemovalPeriod);
-
-			LogClusterChange(oldCluster, _cluster, null);
-
-			_state = GossipState.Working;
-			Handle(new GossipMessage.Gossip(0));
-		}
-
-		public void Handle(GossipMessage.Gossip message) {
-			if (_state != GossipState.Working)
-				return;
-
-			TimeSpan interval;
-			int gossipRound;
-
-			if (_clusterSize == 1) {
-				_cluster = UpdateCluster(_cluster, x => x.InstanceId == _memberInfo.InstanceId ? GetUpdatedMe(x) : x,
-					_timeProvider, DeadMemberRemovalPeriod, CurrentRole);
-				interval = GossipInterval;
-				gossipRound = Math.Min(int.MaxValue - 1, message.GossipRound + 1);
-			} else {
-				var node = _getNodeToGossipTo(_cluster.Members);
-				if (node != null) {
-					_cluster = UpdateCluster(_cluster, x => x.InstanceId == _memberInfo.InstanceId ? GetUpdatedMe(x) : x,
-						_timeProvider, DeadMemberRemovalPeriod, CurrentRole);
-					_bus.Publish(new GrpcMessage.SendOverGrpc(node.HttpEndPoint,
-						new GossipMessage.SendGossip(_cluster, _memberInfo.HttpEndPoint),
-						_timeProvider.LocalTime.Add(GossipTimeout)));
-				}
-
-				interval = message.GossipRound < GossipRoundStartupThreshold ? GossipStartupInterval : GossipInterval;
-				gossipRound = Math.Min(int.MaxValue - 1, node == null ? message.GossipRound : message.GossipRound + 1);
-			}
-
-			_bus.Publish(
-				TimerMessage.Schedule.Create(interval, _publishEnvelope, new GossipMessage.Gossip(gossipRound)));
-		}
-
-		private MemberInfo GetNodeToGossipTo(MemberInfo[] members) {
-			if (members.Length == 0)
-				return null;
-			for (int i = 0; i < 5; ++i) {
-				var node = members[_rnd.Next(members.Length)];
-				if (node.InstanceId != _memberInfo.InstanceId)
-					return node;
-			}
-
-			return null;
-		}
-
-		public void Handle(GossipMessage.GossipReceived message) {
-			if (_state != GossipState.Working)
-				return;
-
-			var oldCluster = _cluster;
-			_cluster = MergeClusters(_cluster,
-				message.ClusterInfo,
-				message.Server,
-				x => x.InstanceId == _memberInfo.InstanceId ? GetUpdatedMe(x) : x,
-				_timeProvider.UtcNow, _memberInfo, CurrentLeader?.InstanceId, AllowedTimeDifference,
-				DeadMemberRemovalPeriod);
-
-			message.Envelope.ReplyWith(new GossipMessage.SendGossip(_cluster, _memberInfo.HttpEndPoint));
-
-			if (_cluster.HasChangedSince(oldCluster))
-				LogClusterChange(oldCluster, _cluster, $"gossip received from [{message.Server}]");
-			_bus.Publish(new GossipMessage.GossipUpdated(_cluster));
-		}
-
-		public void Handle(GossipMessage.ReadGossip message) {
-			if (_cluster != null) {
-				message.Envelope.ReplyWith(new GossipMessage.SendGossip(_cluster, _memberInfo.HttpEndPoint));
-			}
-		}
-
-		public void Handle(GossipMessage.ClientGossip message) {
-			if (_cluster != null) {
-				var advertisedAddress = string.IsNullOrEmpty(_memberInfo.AdvertiseHostToClientAs)
-					? _memberInfo.HttpEndPoint.GetHost()
-					: _memberInfo.AdvertiseHostToClientAs;
-				var advertisedPort = _memberInfo.AdvertiseHttpPortToClientAs == 0
-					? _memberInfo.HttpEndPoint.GetPort()
-					: _memberInfo.AdvertiseHttpPortToClientAs;
-				message.Envelope.ReplyWith(new GossipMessage.SendClientGossip(
-					new ClientClusterInfo(_cluster, advertisedAddress, advertisedPort)));
-			}
-		}
-
-		public void Handle(SystemMessage.StateChangeMessage message) {
-			CurrentRole = message.State;
-			var replicaState = message as SystemMessage.ReplicaStateMessage;
-			CurrentLeader = replicaState == null ? null : replicaState.Leader;
-
-			if (_cluster is null)
-				return;
-
-			_cluster = UpdateCluster(_cluster, x => x.InstanceId == _memberInfo.InstanceId ? GetUpdatedMe(x) : x,
-				_timeProvider, DeadMemberRemovalPeriod, CurrentRole);
-
-			_bus.Publish(new GossipMessage.GossipUpdated(_cluster));
-		}
-
-		public void Handle(GossipMessage.GossipSendFailed message) {
-			var node = _cluster.Members.FirstOrDefault(x => x.Is(message.Recipient));
-			if (node == null || !node.IsAlive)
-				return;
-
-			if (node.InstanceId == CurrentLeader?.InstanceId) {
-				Log.Information(
-					"Leader [{leaderEndPoint}, {instanceId:B}] appears to be DEAD (Gossip send failed); wait for TCP to decide.",
-					message.Recipient, node.InstanceId);
-				return;
-			}
-
-			Log.Information("Looks like node [{nodeEndPoint}] is DEAD (Gossip send failed).", message.Recipient);
-
-			var oldCluster = _cluster;
-			_cluster = UpdateCluster(_cluster, x => x.Is(message.Recipient)
-					? x.Updated(_timeProvider.UtcNow, isAlive: false)
-					: x,
-				_timeProvider, DeadMemberRemovalPeriod, CurrentRole);
-			if (_cluster.HasChangedSince(oldCluster))
-				LogClusterChange(oldCluster, _cluster, $"gossip send failed to [{message.Recipient}]");
-			_bus.Publish(new GossipMessage.GossipUpdated(_cluster));
-		}
-
-		public void Handle(SystemMessage.VNodeConnectionLost message) {
-			var node = _cluster.Members.FirstOrDefault(x => x.Is(message.VNodeEndPoint));
-			if (node == null || !node.IsAlive)
-				return;
-
-			Log.Information("Looks like node [{nodeEndPoint}] is DEAD (TCP connection lost). Issuing a gossip to confirm.",
-				message.VNodeEndPoint);
-			_bus.Publish(new GrpcMessage.SendOverGrpc(node.HttpEndPoint,
-				new GossipMessage.GetGossip(),
-				_timeProvider.LocalTime.Add(GossipTimeout)));
-		}
-
-		public void Handle(GossipMessage.GetGossipReceived message) {
-			if (_state != GossipState.Working)
-				return;
-
-			Log.Information("Gossip Received, The node [{nodeEndpoint}] is not DEAD.", message.Server);
-
-			var oldCluster = _cluster;
-			_cluster = MergeClusters(_cluster,
-				message.ClusterInfo,
-				message.Server,
-				x => x.InstanceId == _memberInfo.InstanceId ? GetUpdatedMe(x) : x,
-				_timeProvider.UtcNow, _memberInfo, CurrentLeader?.InstanceId, AllowedTimeDifference,
-				DeadMemberRemovalPeriod);
-
-			if (_cluster.HasChangedSince(oldCluster))
-				LogClusterChange(oldCluster, _cluster, string.Format("gossip received from [{0}]", message.Server));
-
-			_bus.Publish(new GossipMessage.GossipUpdated(_cluster));
-		}
-
-		public void Handle(GossipMessage.GetGossipFailed message) {
-			if (_state != GossipState.Working)
-				return;
-
-			Log.Information("Gossip Failed, The node [{nodeEndpoint}] is being marked as DEAD. Reason: {reason}",
-				message.Recipient,
-				message.Reason);
-
-			var oldCluster = _cluster;
-			_cluster = UpdateCluster(_cluster, x => x.Is(message.Recipient)
-					? x.Updated(
-						_timeProvider.UtcNow, isAlive: false)
-					: x,
-				_timeProvider, DeadMemberRemovalPeriod, CurrentRole);
-			if (_cluster.HasChangedSince(oldCluster))
-				LogClusterChange(oldCluster, _cluster,
-					string.Format("TCP connection lost to [{0}]", message.Recipient));
-			_bus.Publish(new GossipMessage.GossipUpdated(_cluster));
-		}
-
-		public void Handle(SystemMessage.VNodeConnectionEstablished message) {
-			var oldCluster = _cluster;
-			_cluster = UpdateCluster(_cluster, x => x.Is(message.VNodeEndPoint)
-					? x.Updated(
-						_timeProvider.UtcNow, isAlive: true)
-					: x,
-				_timeProvider, DeadMemberRemovalPeriod, CurrentRole);
-			if (_cluster.HasChangedSince(oldCluster))
-				LogClusterChange(oldCluster, _cluster,
-					string.Format("TCP connection established to [{0}]", message.VNodeEndPoint));
-			_bus.Publish(new GossipMessage.GossipUpdated(_cluster));
-		}
-
-		public void Handle(ElectionMessage.ElectionsDone message) {
-			var oldCluster = _cluster;
-			_cluster = UpdateCluster(_cluster,
-				x => x.InstanceId == message.Leader.InstanceId
-					? x.Updated(_timeProvider.UtcNow, VNodeState.Leader)
-					: x.Updated(_timeProvider.UtcNow, VNodeState.Unknown),
-				_timeProvider, DeadMemberRemovalPeriod, CurrentRole);
-			if (_cluster.HasChangedSince(oldCluster))
-				LogClusterChange(oldCluster, _cluster, "Elections Done");
-			_bus.Publish(new GossipMessage.GossipUpdated(_cluster));
-		}
-
-		public static ClusterInfo MergeClusters(ClusterInfo myCluster, ClusterInfo othersCluster,
-			EndPoint peerEndPoint, Func<MemberInfo, MemberInfo> update, DateTime utcNow,
-			MemberInfo me, Guid? currentLeaderInstanceId, TimeSpan allowedTimeDifference,
-			TimeSpan deadMemberRemovalTimeout) {
-			var members = myCluster.Members.ToDictionary(member => member.HttpEndPoint,
-				new EndPointEqualityComparer());
-			MemberInfo peerNode = peerEndPoint != null
-				? othersCluster.Members.SingleOrDefault(member => member.Is(peerEndPoint), null) : null;
-			bool isPeerOld = peerNode?.ESVersion == null;
-			foreach (var member in othersCluster.Members) {
-				if (member.InstanceId == me.InstanceId || member.Is(me.HttpEndPoint)
-				) // we know about ourselves better
-					continue;
-				if (member.Equals(peerNode)) // peer knows about itself better
-				{
-					if ((utcNow - member.TimeStamp).Duration() > allowedTimeDifference) {
-						Log.Error("Time difference between us and [{peerEndPoint}] is too great! "
-						          + "UTC now: {dateTime:yyyy-MM-dd HH:mm:ss.fff}, peer's time stamp: {peerTimestamp:yyyy-MM-dd HH:mm:ss.fff}.",
-							peerEndPoint, utcNow, member.TimeStamp);
-					}
-					members[member.HttpEndPoint] = member.Updated(utcNow: member.TimeStamp, esVersion: isPeerOld ? VersionInfo.OldVersion : member.ESVersion);
-				} else {
-					MemberInfo existingMem;
-					// if there is no data about this member or data is stale -- update
-					if (!members.TryGetValue(member.HttpEndPoint, out existingMem) ||
-					    IsMoreUpToDate(member, existingMem)) {
-						// we do not trust leader's alive status and state to come from outside
-						if (currentLeaderInstanceId != null && existingMem != null &&
-						    member.InstanceId == currentLeaderInstanceId)
-							members[member.HttpEndPoint] =
-								member.Updated(utcNow: utcNow, isAlive: existingMem.IsAlive,
-									state: existingMem.State);
-						else
-							members[member.HttpEndPoint] = member;
-					}
-
-					if (peerNode != null && isPeerOld) {
-						MemberInfo newInfo = members[member.HttpEndPoint];
-						// if we don't have past information about es version of the node, es version is unknown because old peer won't be sending version info in gossip
-						members[member.HttpEndPoint] = newInfo.Updated(newInfo.TimeStamp,
-							esVersion: existingMem?.ESVersion ?? VersionInfo.UnknownVersion);
-					}
-				}
-			}
-
-			var newMembers = members.Values.Select(update)
-				.Where(x => KeepNodeInGossip(x, utcNow, deadMemberRemovalTimeout, me.State));
-			return new ClusterInfo(newMembers);
-		}
-
-		private static bool IsMoreUpToDate(MemberInfo member, MemberInfo existingMem) {
-			if (member.EpochNumber != existingMem.EpochNumber)
-				return member.EpochNumber > existingMem.EpochNumber;
-			if (member.WriterCheckpoint != existingMem.WriterCheckpoint)
-				return member.WriterCheckpoint > existingMem.WriterCheckpoint;
-			return member.TimeStamp > existingMem.TimeStamp;
-		}
-
-		public static ClusterInfo UpdateCluster(ClusterInfo cluster, Func<MemberInfo, MemberInfo> update,
-			ITimeProvider timeProvider, TimeSpan deadMemberRemovalTimeout, VNodeState currentRole) {
-
-			var newMembers = cluster.Members.Select(update)
-				.Where(x => KeepNodeInGossip(x, timeProvider.UtcNow, deadMemberRemovalTimeout, currentRole));
-			return new ClusterInfo(newMembers);
-		}
-
-		private static bool KeepNodeInGossip(MemberInfo m, DateTime utcNow, TimeSpan deadMemberRemovalTimeout, VNodeState currentRole) {
-			// remove dead timed-out members, if there are any, and if we are not in an unknown/initializing/leaderless state
-			return m.IsAlive || utcNow - m.TimeStamp < deadMemberRemovalTimeout
-				|| currentRole <= VNodeState.Unknown || currentRole == VNodeState.ReadOnlyLeaderless;
-		}
-
-		private static void LogClusterChange(ClusterInfo oldCluster, ClusterInfo newCluster, string source) {
-			var endPointComparer = new EndPointComparer();
-
-			List<MemberInfo> oldMembers = oldCluster.Members
-				.OrderByDescending(x => x.HttpEndPoint, endPointComparer).ToList();
-			List<MemberInfo> newMembers = newCluster.Members
-				.OrderByDescending(x => x.HttpEndPoint, endPointComparer).ToList();
-			Log.Information(
-				"CLUSTER HAS CHANGED {source}"
-				+ "\nOld:"
-				+ "\n{oldMembers}"
-				+ "\nNew:"
-				+ "\n{newMembers}"
-				, source.IsNotEmptyString() ? source : string.Empty
-				, oldMembers
-				, newMembers
-			);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Gossip/GossipState.cs b/src/EventStore.Core/Services/Gossip/GossipState.cs
deleted file mode 100644
index eada02d8d58..00000000000
--- a/src/EventStore.Core/Services/Gossip/GossipState.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EventStore.Core.Services.Gossip {
-	public enum GossipState {
-		Startup,
-		RetrievingGossipSeeds,
-		Working
-	}
-}
diff --git a/src/EventStore.Core/Services/Gossip/IGossipSeedSource.cs b/src/EventStore.Core/Services/Gossip/IGossipSeedSource.cs
deleted file mode 100644
index 54f7bd20ffc..00000000000
--- a/src/EventStore.Core/Services/Gossip/IGossipSeedSource.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-using System.Net;
-
-namespace EventStore.Core.Services.Gossip {
-	public interface IGossipSeedSource {
-		IAsyncResult BeginGetHostEndpoints(AsyncCallback requestCallback, object state);
-		EndPoint[] EndGetHostEndpoints(IAsyncResult asyncResult);
-	}
-}
diff --git a/src/EventStore.Core/Services/Gossip/LoopbackDns.cs b/src/EventStore.Core/Services/Gossip/LoopbackDns.cs
deleted file mode 100644
index 582c9f95bdd..00000000000
--- a/src/EventStore.Core/Services/Gossip/LoopbackDns.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Net;
-
-namespace EventStore.Core.Services.Gossip {
-	public class KnownEndpointGossipSeedSource : IGossipSeedSource {
-		private readonly EndPoint[] _ipEndPoints;
-
-		public KnownEndpointGossipSeedSource(EndPoint[] ipEndPoints) {
-			if (ipEndPoints == null)
-				throw new ArgumentNullException("ipEndPoints");
-			_ipEndPoints = ipEndPoints;
-		}
-
-		public IAsyncResult BeginGetHostEndpoints(AsyncCallback requestCallback, object state) {
-			requestCallback(null);
-			return null;
-		}
-
-		public EndPoint[] EndGetHostEndpoints(IAsyncResult asyncResult) {
-			return _ipEndPoints;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Gossip/NodeGossipService.cs b/src/EventStore.Core/Services/Gossip/NodeGossipService.cs
deleted file mode 100644
index 0c4c8ab1752..00000000000
--- a/src/EventStore.Core/Services/Gossip/NodeGossipService.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Cluster;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Storage.EpochManager;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.Services.TimerService;
-
-namespace EventStore.Core.Services.Gossip {
-	public class NodeGossipService : GossipServiceBase, IHandle<GossipMessage.UpdateNodePriority> {
-		private readonly IReadOnlyCheckpoint _writerCheckpoint;
-		private readonly IReadOnlyCheckpoint _chaserCheckpoint;
-		private readonly IEpochManager _epochManager;
-		private readonly Func<long> _getLastCommitPosition;
-		private int _nodePriority;
-		private readonly ITimeProvider _timeProvider;
-
-		public NodeGossipService(IPublisher bus,
-			int clusterSize,
-			IGossipSeedSource gossipSeedSource,
-			MemberInfo memberInfo,
-			IReadOnlyCheckpoint writerCheckpoint,
-			IReadOnlyCheckpoint chaserCheckpoint,
-			IEpochManager epochManager,
-			Func<long> getLastCommitPosition,
-			int nodePriority,
-			TimeSpan gossipInterval,
-			TimeSpan allowedTimeDifference,
-			TimeSpan gossipTimeout,
-			TimeSpan deadMemberRemovalPeriod,
-			ITimeProvider timeProvider,
-			Func<MemberInfo[], MemberInfo> getNodeToGossipTo = null)
-			: base(bus, clusterSize, gossipSeedSource, memberInfo, gossipInterval, allowedTimeDifference, gossipTimeout, deadMemberRemovalPeriod, timeProvider, getNodeToGossipTo) {
-			Ensure.NotNull(writerCheckpoint, nameof(writerCheckpoint));
-			Ensure.NotNull(chaserCheckpoint, nameof(chaserCheckpoint));
-			Ensure.NotNull(epochManager, nameof(epochManager));
-			Ensure.NotNull(getLastCommitPosition, nameof(getLastCommitPosition));
-
-			_writerCheckpoint = writerCheckpoint;
-			_chaserCheckpoint = chaserCheckpoint;
-			_epochManager = epochManager;
-			_getLastCommitPosition = getLastCommitPosition;
-			_nodePriority = nodePriority;
-			_timeProvider = timeProvider;
-		}
-
-		protected override MemberInfo GetInitialMe() {
-			var lastEpoch = _epochManager.GetLastEpoch();
-			var initialState = _memberInfo.IsReadOnlyReplica ? VNodeState.ReadOnlyLeaderless : VNodeState.Unknown;
-			return MemberInfo.ForVNode(_memberInfo.InstanceId,
-				_timeProvider.UtcNow,
-				initialState,
-				true,
-				_memberInfo.InternalTcpEndPoint,
-				_memberInfo.InternalSecureTcpEndPoint,
-				_memberInfo.ExternalTcpEndPoint,
-				_memberInfo.ExternalSecureTcpEndPoint,
-				_memberInfo.HttpEndPoint,
-				_memberInfo.AdvertiseHostToClientAs,
-				_memberInfo.AdvertiseHttpPortToClientAs,
-				_memberInfo.AdvertiseTcpPortToClientAs,
-				_getLastCommitPosition(),
-				_writerCheckpoint.Read(),
-				_chaserCheckpoint.Read(),
-				lastEpoch == null ? -1 : lastEpoch.EpochPosition,
-				lastEpoch == null ? -1 : lastEpoch.EpochNumber,
-				lastEpoch == null ? Guid.Empty : lastEpoch.EpochId,
-				_nodePriority,
-				_memberInfo.IsReadOnlyReplica, _memberInfo.ESVersion);
-		}
-
-		protected override MemberInfo GetUpdatedMe(MemberInfo me) {
-			return me.Updated(isAlive: true,
-				state: CurrentRole,
-				lastCommitPosition: _getLastCommitPosition(),
-				writerCheckpoint: _writerCheckpoint.ReadNonFlushed(),
-				chaserCheckpoint: _chaserCheckpoint.ReadNonFlushed(),
-				epoch: _epochManager.GetLastEpoch(),
-				nodePriority: _nodePriority,
-				utcNow: _timeProvider.UtcNow);
-		}
-
-		public void Handle(GossipMessage.UpdateNodePriority message) {
-			_nodePriority = message.NodePriority;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/GrpcSendService.cs b/src/EventStore.Core/Services/GrpcSendService.cs
deleted file mode 100644
index d0a521a4c6e..00000000000
--- a/src/EventStore.Core/Services/GrpcSendService.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Cluster;
-using EventStore.Core.Messages;
-using Serilog;
-
-namespace EventStore.Core.Services {
-	public class GrpcSendService :
-		IHandle<GrpcMessage.SendOverGrpc> {
-
-		private readonly EventStoreClusterClientCache _eventStoreClientCache;
-		private static readonly ILogger Log = Serilog.Log.ForContext<GrpcSendService>();
-
-		public GrpcSendService(EventStoreClusterClientCache eventStoreClientCache) {
-			_eventStoreClientCache =
-				eventStoreClientCache ?? throw new ArgumentNullException(nameof(eventStoreClientCache));
-		}
-
-		public void Handle(GrpcMessage.SendOverGrpc message) {
-			if (message.LiveUntil < DateTime.Now) {
-				Log.Verbose("Dropping gRPC send message due to TTL being over. {messageType} To : {endPoint}",
-					message.Message.GetType().Name, message.DestinationEndpoint);
-				return;
-			}
-
-			switch (message.Message) {
-				case GossipMessage.SendGossip sendGossip:
-					_eventStoreClientCache.Get(message.DestinationEndpoint)
-						.SendGossip(sendGossip, message.DestinationEndpoint, message.LiveUntil);
-					break;
-				case GossipMessage.GetGossip _:
-					_eventStoreClientCache.Get(message.DestinationEndpoint)
-						.GetGossip(message.DestinationEndpoint, message.LiveUntil);
-					break;
-				case ElectionMessage.ViewChange viewChange:
-					_eventStoreClientCache.Get(message.DestinationEndpoint)
-						.SendViewChange(viewChange, message.DestinationEndpoint, message.LiveUntil);
-					break;
-				case ElectionMessage.ViewChangeProof proof:
-					_eventStoreClientCache.Get(message.DestinationEndpoint)
-						.SendViewChangeProof(proof, message.DestinationEndpoint, message.LiveUntil);
-					break;
-				case ElectionMessage.Prepare prepare:
-					_eventStoreClientCache.Get(message.DestinationEndpoint)
-						.SendPrepare(prepare, message.DestinationEndpoint, message.LiveUntil);
-					break;
-				case ElectionMessage.PrepareOk prepareOk:
-					_eventStoreClientCache.Get(message.DestinationEndpoint)
-						.SendPrepareOk(prepareOk, message.DestinationEndpoint, message.LiveUntil);
-					break;
-				case ElectionMessage.Proposal proposal:
-					_eventStoreClientCache.Get(message.DestinationEndpoint)
-						.SendProposal(proposal, message.DestinationEndpoint, message.LiveUntil);
-					break;
-				case ElectionMessage.Accept accept:
-					_eventStoreClientCache.Get(message.DestinationEndpoint)
-						.SendAccept(accept, message.DestinationEndpoint, message.LiveUntil);
-					break;
-				case ElectionMessage.LeaderIsResigning resigning:
-					_eventStoreClientCache.Get(message.DestinationEndpoint)
-						.SendLeaderIsResigning(resigning, message.DestinationEndpoint, message.LiveUntil);
-					break;
-				case ElectionMessage.LeaderIsResigningOk resigningOk:
-					_eventStoreClientCache.Get(message.DestinationEndpoint)
-						.SendLeaderIsResigningOk(resigningOk, message.DestinationEndpoint, message.LiveUntil);
-					break;
-				default:
-					throw new NotImplementedException($"Message of type {message.Message.GetType().Name} cannot be handled.");
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/HttpSendService.cs b/src/EventStore.Core/Services/HttpSendService.cs
deleted file mode 100644
index 6d950b8f306..00000000000
--- a/src/EventStore.Core/Services/HttpSendService.cs
+++ /dev/null
@@ -1,238 +0,0 @@
-using System;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Net.Security;
-using System.Security.Cryptography.X509Certificates;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Cluster;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Transport.Http;
-using EventStore.Core.Settings;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.EntityManagement;
-using HttpStatusCode = EventStore.Transport.Http.HttpStatusCode;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services {
-	public class HttpSendService : IHttpForwarder,
-		IHandle<SystemMessage.StateChangeMessage>,
-		IHandle<HttpMessage.HttpSend> {
-		private static readonly ILogger Log = Serilog.Log.ForContext<HttpSendService>();
-
-		private readonly HttpMessagePipe _httpPipe;
-		private readonly bool _forwardRequests;
-		private readonly HttpClient _forwardClient;
-		private MemberInfo _leaderInfo;
-
-		public HttpSendService(HttpMessagePipe httpPipe, bool forwardRequests, CertificateDelegates.ServerCertificateValidator externServerCertValidator) {
-			Ensure.NotNull(httpPipe, "httpPipe");
-			_httpPipe = httpPipe;
-			_forwardRequests = forwardRequests;
-
-			var socketsHttpHandler = new SocketsHttpHandler {
-				SslOptions = {
-					CertificateRevocationCheckMode = X509RevocationMode.NoCheck,
-					RemoteCertificateValidationCallback = (sender, certificate, chain, errors) => {
-						var (isValid, error) = externServerCertValidator(certificate, chain, errors, _leaderInfo?.HttpEndPoint.GetOtherNames());
-						if (!isValid && error != null) {
-							Log.Error("Server certificate validation error: {e}", error);
-						}
-						return isValid;
-					}
-				},
-				PooledConnectionLifetime = ESConsts.HttpClientConnectionLifeTime
-			};
-			_forwardClient = new HttpClient(socketsHttpHandler);
-		}
-
-		public void Handle(SystemMessage.StateChangeMessage message) {
-			switch (message.State) {
-				case VNodeState.PreReplica:
-				case VNodeState.CatchingUp:
-				case VNodeState.Clone:
-				case VNodeState.Follower:
-				case VNodeState.PreReadOnlyReplica:
-				case VNodeState.ReadOnlyReplica:
-					_leaderInfo = ((SystemMessage.ReplicaStateMessage)message).Leader;
-					break;
-				case VNodeState.Initializing:
-				case VNodeState.DiscoverLeader:
-				case VNodeState.Unknown:
-				case VNodeState.PreLeader:
-				case VNodeState.Leader:
-				case VNodeState.ResigningLeader:
-				case VNodeState.Manager:
-				case VNodeState.ShuttingDown:
-				case VNodeState.Shutdown:
-				case VNodeState.ReadOnlyLeaderless:
-					_leaderInfo = null;
-					break;
-				default:
-					throw new Exception(string.Format("Unknown node state: {0}.", message.State));
-			}
-		}
-
-		public void Handle(HttpMessage.HttpSend message) {
-			var deniedToHandle = message.Message as HttpMessage.DeniedToHandle;
-			if (deniedToHandle != null) {
-				int code;
-				switch (deniedToHandle.Reason) {
-					case DenialReason.ServerTooBusy:
-						code = HttpStatusCode.ServiceUnavailable;
-						break;
-					default:
-						throw new ArgumentOutOfRangeException();
-				}
-
-				// todo: histogram metric?
-				message.HttpEntityManager.ReplyStatus(
-					code,
-					deniedToHandle.Details,
-					exc => Log.Debug("Error occurred while replying to HTTP with message {message}: {e}.",
-						message.Message, exc.Message));
-			} else {
-				var response = message.Data;
-				var config = message.Configuration;
-
-				// todo: histogram metric?
-				if (response is byte[]) {
-					message.HttpEntityManager.ReplyContent(
-						response as byte[],
-						config.Code,
-						config.Description,
-						config.ContentType,
-						config.Headers,
-						exc => Log.Debug("Error occurred while replying to HTTP with message {message}: {e}.",
-							message.Message, exc.Message));
-				} else {
-					message.HttpEntityManager.ReplyTextContent(
-						response as string,
-						config.Code,
-						config.Description,
-						config.ContentType,
-						config.Headers,
-						exc => Log.Debug("Error occurred while replying to HTTP with message {message}: {e}.",
-							message.Message, exc.Message));
-				}
-			}
-		}
-
-		bool IHttpForwarder.ForwardRequest(HttpEntityManager manager) {
-			var leaderInfo = _leaderInfo;
-			if (_forwardRequests && leaderInfo != null) {
-				var srcUrl = manager.RequestedUrl;
-				var srcBase = new Uri($"{srcUrl.Scheme}://{srcUrl.Host}:{srcUrl.Port}/",
-					UriKind.Absolute);
-				var baseUri = new Uri(leaderInfo.HttpEndPoint.ToHttpUrl(srcUrl.Scheme));
-				var forwardUri = new Uri(baseUri, srcBase.MakeRelativeUri(srcUrl));
-				ForwardRequest(manager, forwardUri);
-				return true;
-			}
-
-			return false;
-		}
-
-		private void ForwardRequest(HttpEntityManager manager, Uri forwardUri) {
-			var srcReq = manager.HttpEntity.Request;
-			var request = new HttpRequestMessage();
-			request.RequestUri = forwardUri;
-			request.Method = new System.Net.Http.HttpMethod(srcReq.HttpMethod);
-
-			var hasContentLength = false;
-			// Copy unrestricted headers (including cookies, if any)
-			foreach (var headerKey in srcReq.GetHeaderKeys()) {
-				try {
-					switch (headerKey.ToLower()) {
-						case "accept":
-							request.Headers.Accept.ParseAdd(srcReq.GetHeaderValues(headerKey).ToString());
-							break;
-						case "connection":
-							break;
-						case "content-type":
-							break;
-						case "content-length":
-							hasContentLength = true;
-							break;
-						case "date":
-							request.Headers.Date = DateTime.Parse(srcReq.GetHeaderValues(headerKey).ToString());
-							break;
-						case "expect":
-							break;
-						case "host":
-							request.Headers.Host = $"{forwardUri.Host}:{forwardUri.Port}";
-							break;
-						case "if-modified-since":
-							request.Headers.IfModifiedSince =
-								DateTime.Parse(srcReq.GetHeaderValues(headerKey).ToString());
-							break;
-						case "proxy-connection":
-							break;
-						case "range":
-							break;
-						case "referer":
-							request.Headers.Referrer = new Uri(srcReq.GetHeaderValues(headerKey).ToString());
-							break;
-						case "transfer-encoding":
-							request.Headers.TransferEncoding.ParseAdd(srcReq.GetHeaderValues(headerKey).ToString());
-							break;
-						case "user-agent":
-							request.Headers.UserAgent.ParseAdd(srcReq.GetHeaderValues(headerKey).ToString());
-							break;
-
-						default:
-							request.Headers.Add(headerKey, srcReq.GetHeaderValues(headerKey).ToString());
-							break;
-					}
-				} catch (FormatException) {
-					request.Headers.TryAddWithoutValidation(headerKey, srcReq.GetHeaderValues(headerKey).ToString());
-				}
-			}
-
-			if (!request.Headers.Contains(ProxyHeaders.XForwardedHost)) {
-				request.Headers.Add(ProxyHeaders.XForwardedHost, string.Format("{0}:{1}",
-					manager.RequestedUrl.Host, manager.RequestedUrl.Port));
-			}
-
-			// Copy content (if content body is allowed)
-			if (!string.Equals(srcReq.HttpMethod, "GET", StringComparison.OrdinalIgnoreCase)
-			    && !string.Equals(srcReq.HttpMethod, "HEAD", StringComparison.OrdinalIgnoreCase)
-			    && hasContentLength) {
-				var streamContent = new StreamContent(srcReq.InputStream);
-				streamContent.Headers.ContentLength = srcReq.ContentLength64;
-				request.Content = streamContent;
-
-				MediaTypeHeaderValue contentType;
-				if (MediaTypeHeaderValue.TryParse(srcReq.ContentType, out contentType)) {
-					streamContent.Headers.ContentType = contentType;
-				}
-			}
-
-			ForwardResponse(manager, request);
-		}
-
-		private void ForwardReplyFailed(HttpEntityManager manager) {
-			manager.ReplyStatus(HttpStatusCode.InternalServerError, "Error while forwarding request", _ => { });
-		}
-
-		private void ForwardResponse(HttpEntityManager manager, HttpRequestMessage request) {
-			_forwardClient.SendAsync(request)
-				.ContinueWith(t => {
-					HttpResponseMessage response;
-					try {
-						response = t.Result;
-					} catch (Exception ex) {
-						Log.Debug("Error in SendAsync for forwarded request for '{requestedUrl}': {e}.",
-							manager.RequestedUrl, ex.InnerException.Message);
-						ForwardReplyFailed(manager);
-						return;
-					}
-
-					manager.ForwardReply(response,
-						exc => Log.Debug("Error forwarding response for '{requestedUrl}': {e}.", manager.RequestedUrl,
-							exc.Message));
-				});
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Monitoring/MonitoringService.cs b/src/EventStore.Core/Services/Monitoring/MonitoringService.cs
deleted file mode 100644
index a2873d3881e..00000000000
--- a/src/EventStore.Core/Services/Monitoring/MonitoringService.cs
+++ /dev/null
@@ -1,361 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-using DotNext.Runtime.CompilerServices;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Monitoring.Stats;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Transport.Tcp;
-using ILogger = Serilog.ILogger;
-using Timeout = System.Threading.Timeout;
-
-namespace EventStore.Core.Services.Monitoring {
-	[Flags]
-	public enum StatsStorage {
-		None = 0x0, // only for tests
-		Stream = 0x1,
-		File = 0x2,
-		StreamAndFile = Stream | File
-	}
-
-	public class MonitoringService : IHandle<SystemMessage.SystemInit>,
-		IHandle<SystemMessage.StateChangeMessage>,
-		IAsyncHandle<SystemMessage.BecomeShuttingDown>,
-		IHandle<SystemMessage.BecomeShutdown>,
-		IHandle<ClientMessage.WriteEventsCompleted>,
-		IAsyncHandle<MonitoringMessage.GetFreshStats>,
-		IHandle<MonitoringMessage.GetFreshTcpConnectionStats> {
-		private static readonly ILogger RegularLog =
-			Serilog.Log.ForContext(Serilog.Core.Constants.SourceContextPropertyName, "REGULAR-STATS-LOGGER");
-		private static readonly ILogger Log = Serilog.Log.ForContext<MonitoringService>();
-
-		private static readonly string StreamMetadata =
-			string.Format("{{\"$maxAge\":{0}}}", (int)TimeSpan.FromDays(10).TotalSeconds);
-
-		public static readonly TimeSpan MemoizePeriod = TimeSpan.FromSeconds(1);
-		private static readonly IEnvelope NoopEnvelope = new NoopEnvelope();
-
-		private readonly IQueuedHandler _monitoringQueue;
-		private readonly IAsyncHandle<Message> _statsCollectionDispatcher;
-		private readonly IPublisher _mainQueue;
-		private readonly StatsStorage _statsStorage;
-		private readonly TimeSpan _statsCollectionPeriod;
-		private SystemStatsHelper _systemStats;
-
-		private DateTime _lastStatsRequestTime = DateTime.UtcNow;
-		private StatsContainer _memoizedStats;
-		private Task _timer;
-		private CancellationTokenSource _timerTokenSource;
-		private readonly CancellationToken _timerToken;
-
-		private readonly string _nodeStatsStream;
-		private bool _statsStreamCreated;
-		private Guid _streamMetadataWriteCorrId;
-		private IMonitoredTcpConnection[] _memoizedTcpConnections;
-		private DateTime _lastTcpConnectionsRequestTime;
-		private IPEndPoint _tcpEndpoint;
-		private IPEndPoint _tcpSecureEndpoint;
-
-		public MonitoringService(IQueuedHandler monitoringQueue,
-			IAsyncHandle<Message> statsCollectionDispatcher,
-			IPublisher mainQueue,
-			TimeSpan statsCollectionPeriod,
-			EndPoint nodeEndpoint,
-			StatsStorage statsStorage,
-			IPEndPoint tcpEndpoint,
-			IPEndPoint tcpSecureEndpoint,
-			SystemStatsHelper systemStatsHelper) {
-			Ensure.NotNull(monitoringQueue, "monitoringQueue");
-			Ensure.NotNull(statsCollectionDispatcher, nameof(statsCollectionDispatcher));
-			Ensure.NotNull(mainQueue, nameof(mainQueue));
-			Ensure.NotNull(nodeEndpoint, "nodeEndpoint");
-
-			_monitoringQueue = monitoringQueue;
-			_statsCollectionDispatcher = statsCollectionDispatcher;
-			_mainQueue = mainQueue;
-			_statsStorage = statsStorage;
-
-			_statsCollectionPeriod = statsCollectionPeriod;
-
-			if (statsCollectionPeriod > TimeSpan.Zero) {
-				_timerTokenSource = new();
-				_timerToken = _timerTokenSource.Token;
-			} else {
-				_timerToken = new(canceled: true);
-			}
-
-			_nodeStatsStream = $"{SystemStreams.StatsStreamPrefix}-{nodeEndpoint}";
-			_tcpEndpoint = tcpEndpoint;
-			_tcpSecureEndpoint = tcpSecureEndpoint;
-
-			_timer = Task.CompletedTask;
-			_systemStats = systemStatsHelper;
-		}
-
-		public void Handle(SystemMessage.SystemInit message) {
-			if (_timerToken.IsCancellationRequested)
-				return;
-
-			_timer = CollectRegularStatsJob();
-		}
-
-		[AsyncMethodBuilder(typeof(SpawningAsyncTaskMethodBuilder))]
-		private async Task CollectRegularStatsJob() {
-			_systemStats.Start();
-
-			while (true) {
-				await Task.Delay(_statsCollectionPeriod, _timerToken)
-					.ConfigureAwait(
-						ConfigureAwaitOptions.SuppressThrowing |
-						// to be consistent with all the other awaits
-						ConfigureAwaitOptions.ContinueOnCapturedContext);
-
-				if (_timerToken.IsCancellationRequested)
-					break;
-
-				await CollectRegularStats(_timerToken);
-			}
-		}
-
-		private async ValueTask CollectRegularStats(CancellationToken token) {
-			try {
-				if (await CollectStats(token) is { } stats) {
-					var rawStats = stats.GetStats(useGrouping: false, useMetadata: false);
-
-					if ((_statsStorage & StatsStorage.File) != 0)
-						SaveStatsToFile(StatsContainer.Group(rawStats));
-
-					if ((_statsStorage & StatsStorage.Stream) != 0) {
-						if (_statsStreamCreated)
-							SaveStatsToStream(rawStats);
-					}
-				}
-			} catch (Exception ex) {
-				Log.Error(ex, "Error on regular stats collection.");
-			}
-		}
-
-		private async ValueTask<StatsContainer> CollectStats(CancellationToken token) {
-			var statsContainer = new StatsContainer();
-			try {
-				statsContainer.Add(_systemStats.GetSystemStats());
-				await _statsCollectionDispatcher.HandleAsync(
-					new MonitoringMessage.InternalStatsRequest(new StatsCollectorEnvelope(statsContainer)),
-					token);
-			} catch (OperationCanceledException e) when (e.CancellationToken == token) {
-				statsContainer = null;
-			} catch (Exception ex) {
-				Log.Error(ex, "Error while collecting stats");
-				statsContainer = null;
-			}
-
-			return statsContainer;
-		}
-
-		private static void SaveStatsToFile(Dictionary<string, object> rawStats) {
-			rawStats.Add("timestamp", DateTime.UtcNow.ToString("O", CultureInfo.InvariantCulture));
-			RegularLog.Information("{@stats}", rawStats);
-		}
-
-        private void SaveStatsToStream(Dictionary<string, object> rawStats) {
-			var data = rawStats.ToJsonBytes();
-			var evnt = new Event(Guid.NewGuid(), SystemEventTypes.StatsCollection, true, data, null);
-			var corrId = Guid.NewGuid();
-			var msg = new ClientMessage.WriteEvents(corrId, corrId, NoopEnvelope, false, _nodeStatsStream,
-				ExpectedVersion.Any, new[] {evnt}, SystemAccounts.System);
-			_mainQueue.Publish(msg);
-		}
-
-		public void Handle(SystemMessage.StateChangeMessage message) {
-			if ((_statsStorage & StatsStorage.Stream) == 0)
-				return;
-
-			if (_statsStreamCreated)
-				return;
-
-			switch (message.State) {
-				case VNodeState.CatchingUp:
-				case VNodeState.Clone:
-				case VNodeState.Follower:
-				case VNodeState.ReadOnlyReplica:
-				case VNodeState.Leader: {
-					SetStatsStreamMetadata();
-					break;
-				}
-			}
-		}
-
-		public async ValueTask HandleAsync(SystemMessage.BecomeShuttingDown message, CancellationToken token) {
-			if (Interlocked.Exchange(ref _timerTokenSource, null) is { } cts) {
-				try {
-					cts.Cancel();
-					await _timer.WaitAsync(token);
-				} finally {
-					cts.Dispose();
-					_systemStats.Dispose();
-				}
-			}
-		}
-
-		public void Handle(SystemMessage.BecomeShutdown message) {
-			_monitoringQueue.RequestStop();
-		}
-
-		private void SetStatsStreamMetadata() {
-			var metadata = Helper.UTF8NoBom.GetBytes(StreamMetadata);
-			_streamMetadataWriteCorrId = Guid.NewGuid();
-			_mainQueue.Publish(
-				new ClientMessage.WriteEvents(
-					_streamMetadataWriteCorrId, _streamMetadataWriteCorrId, _monitoringQueue,
-					false, SystemStreams.MetastreamOf(_nodeStatsStream), ExpectedVersion.NoStream,
-					new[] {new Event(Guid.NewGuid(), SystemEventTypes.StreamMetadata, true, metadata, null)},
-					SystemAccounts.System));
-		}
-
-		public void Handle(ClientMessage.WriteEventsCompleted message) {
-			if (message.CorrelationId != _streamMetadataWriteCorrId)
-				return;
-			switch (message.Result) {
-				case OperationResult.Success:
-				case OperationResult.WrongExpectedVersion: // already created
-				{
-					Log.Debug("Created stats stream '{stream}', code = {result}", _nodeStatsStream, message.Result);
-					_statsStreamCreated = true;
-					break;
-				}
-				case OperationResult.PrepareTimeout:
-				case OperationResult.CommitTimeout:
-				case OperationResult.ForwardTimeout: {
-					Log.Debug("Failed to create stats stream '{stream}'. Reason : {e}({message}). Retrying...",
-						_nodeStatsStream, message.Result, message.Message);
-					SetStatsStreamMetadata();
-					break;
-				}
-				case OperationResult.AccessDenied: {
-					// can't do anything about that right now
-					break;
-				}
-				case OperationResult.StreamDeleted:
-				case OperationResult.InvalidTransaction: // should not happen at all
-				{
-					Log.Error(
-						"Monitoring service got unexpected response code when trying to create stats stream ({e}).",
-						message.Result);
-					break;
-				}
-				default:
-					throw new ArgumentOutOfRangeException();
-			}
-		}
-
-		public async ValueTask HandleAsync(MonitoringMessage.GetFreshStats message, CancellationToken token) {
-			try {
-				StatsContainer stats;
-				if (!TryGetMemoizedStats(out stats)) {
-					stats = await CollectStats(token);
-					if (stats != null) {
-						_memoizedStats = stats;
-						_lastStatsRequestTime = DateTime.UtcNow;
-					}
-				}
-
-				Dictionary<string, object> selectedStats = null;
-				if (stats != null) {
-					selectedStats = stats.GetStats(message.UseGrouping, message.UseMetadata);
-					if (message.UseGrouping)
-						selectedStats = message.StatsSelector(selectedStats);
-				}
-
-				message.Envelope.ReplyWith(
-					new MonitoringMessage.GetFreshStatsCompleted(success: selectedStats != null, stats: selectedStats));
-			} catch (Exception ex) {
-				Log.Error(ex, "Error on getting fresh stats");
-			}
-		}
-
-		public void Handle(MonitoringMessage.GetFreshTcpConnectionStats message) {
-			try {
-				IMonitoredTcpConnection[] connections = null;
-				if (!TryGetMemoizedTcpConnections(out connections)) {
-					connections = TcpConnectionMonitor.Default.GetTcpConnectionStats();
-					if (connections != null) {
-						_memoizedTcpConnections = connections;
-						_lastTcpConnectionsRequestTime = DateTime.UtcNow;
-					}
-				}
-
-				List<MonitoringMessage.TcpConnectionStats> connStats = new List<MonitoringMessage.TcpConnectionStats>();
-				foreach (var conn in connections) {
-					var tcpConn = conn as TcpConnection;
-					if (tcpConn != null) {
-						var isExternalConnection = _tcpEndpoint != null && _tcpEndpoint.Port == tcpConn.LocalEndPoint.GetPort();
-						connStats.Add(new MonitoringMessage.TcpConnectionStats {
-							IsExternalConnection = isExternalConnection,
-							RemoteEndPoint = tcpConn.RemoteEndPoint.ToString(),
-							LocalEndPoint = tcpConn.LocalEndPoint.ToString(),
-							ConnectionId = tcpConn.ConnectionId,
-							ClientConnectionName = tcpConn.ClientConnectionName,
-							TotalBytesSent = tcpConn.TotalBytesSent,
-							TotalBytesReceived = tcpConn.TotalBytesReceived,
-							PendingSendBytes = tcpConn.PendingSendBytes,
-							PendingReceivedBytes = tcpConn.PendingReceivedBytes,
-							IsSslConnection = false
-						});
-					}
-
-					var tcpConnSsl = conn as TcpConnectionSsl;
-					if (tcpConnSsl != null) {
-						var isExternalConnection = _tcpSecureEndpoint != null &&
-						                           _tcpSecureEndpoint.Port == tcpConnSsl.LocalEndPoint.GetPort();
-						connStats.Add(new MonitoringMessage.TcpConnectionStats {
-							IsExternalConnection = isExternalConnection,
-							RemoteEndPoint = tcpConnSsl.RemoteEndPoint.ToString(),
-							LocalEndPoint = tcpConnSsl.LocalEndPoint.ToString(),
-							ConnectionId = tcpConnSsl.ConnectionId,
-							ClientConnectionName = tcpConnSsl.ClientConnectionName,
-							TotalBytesSent = tcpConnSsl.TotalBytesSent,
-							TotalBytesReceived = tcpConnSsl.TotalBytesReceived,
-							PendingSendBytes = tcpConnSsl.PendingSendBytes,
-							PendingReceivedBytes = tcpConnSsl.PendingReceivedBytes,
-							IsSslConnection = true
-						});
-					}
-				}
-
-				message.Envelope.ReplyWith(
-					new MonitoringMessage.GetFreshTcpConnectionStatsCompleted(connStats)
-				);
-			} catch (Exception ex) {
-				Log.Error(ex, "Error on getting fresh tcp connection stats");
-			}
-		}
-
-		private bool TryGetMemoizedStats(out StatsContainer stats) {
-			if (_memoizedStats == null || DateTime.UtcNow - _lastStatsRequestTime > MemoizePeriod) {
-				stats = null;
-				return false;
-			}
-
-			stats = _memoizedStats;
-			return true;
-		}
-
-		private bool TryGetMemoizedTcpConnections(out IMonitoredTcpConnection[] connections) {
-			if (_memoizedTcpConnections == null || DateTime.UtcNow - _lastTcpConnectionsRequestTime > MemoizePeriod) {
-				connections = null;
-				return false;
-			}
-
-			connections = _memoizedTcpConnections;
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Monitoring/Stats/GcStats.cs b/src/EventStore.Core/Services/Monitoring/Stats/GcStats.cs
deleted file mode 100644
index 3a3bff3a34a..00000000000
--- a/src/EventStore.Core/Services/Monitoring/Stats/GcStats.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-namespace EventStore.Core.Services.Monitoring.Stats {
-	public class GcStats {
-		/// <summary>
-		/// Number of Gen 0 Collections.
-		/// </summary>
-		public readonly long Gen0ItemsCount;
-		/// <summary>
-		/// Number of Gen 1 Collections.
-		/// </summary>
-		public readonly long Gen1ItemsCount;
-		/// <summary>
-		/// Number of Gen 2 Collections.
-		/// </summary>
-		public readonly long Gen2ItemsCount;
-		/// <summary>
-		/// Gen 0 heap size.
-		/// </summary>
-		public readonly long Gen0Size;
-		/// <summary>
-		/// Gen 1 heap size.
-		/// </summary>
-		public readonly long Gen1Size;
-		/// <summary>
-		/// Gen 2 heap size.
-		/// </summary>
-		public readonly long Gen2Size;
-		/// <summary>
-		/// Large Object Heap size.
-		/// </summary>
-		public readonly long LargeHeapSize;
-		/// <summary>
-		/// Memory allocation speed.
-		/// </summary>
-		public readonly float AllocationSpeed;
-		/// <summary>
-		/// </summary>
-		public readonly float Fragmentation;
-		/// <summary>
-		/// % of Time in GC.
-		/// </summary>
-		public readonly float TimeInGc;
-		/// <summary>
-		/// Total Bytes in all Heaps.
-		/// </summary>
-		public readonly long TotalBytesInHeaps;
-
-		public GcStats(long gcGen0Items,
-			long gcGen1Items,
-			long gcGen2Items,
-			long gcGen0Size,
-			long gcGen1Size,
-			long gcGen2Size,
-			long gcLargeHeapSize,
-			float gcAllocationSpeed,
-			float gcFragmentation,
-			float gcTimeInGc,
-			long gcTotalBytesInHeaps) {
-			Gen0ItemsCount = gcGen0Items;
-			Gen1ItemsCount = gcGen1Items;
-			Gen2ItemsCount = gcGen2Items;
-			Gen0Size = gcGen0Size;
-			Gen1Size = gcGen1Size;
-			Gen2Size = gcGen2Size;
-			LargeHeapSize = gcLargeHeapSize;
-			AllocationSpeed = gcAllocationSpeed;
-			Fragmentation = gcFragmentation;
-			TimeInGc = gcTimeInGc;
-			TotalBytesInHeaps = gcTotalBytesInHeaps;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Monitoring/Stats/QueueStats.cs b/src/EventStore.Core/Services/Monitoring/Stats/QueueStats.cs
deleted file mode 100644
index 5089d192b37..00000000000
--- a/src/EventStore.Core/Services/Monitoring/Stats/QueueStats.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.Services.Monitoring.Stats {
-	public class QueueStats {
-		///<summary>
-		///Queue name
-		///</summary>
-		public readonly string Name;
-
-		///<summary>
-		///Group queue is a member of
-		///</summary>
-		public readonly string GroupName;
-
-		///<summary>
-		///Number of items in the queue
-		///</summary>
-		public readonly int Length;
-
-		///<summary>
-		///The highest number of items in the queue
-		///</summary>
-		public readonly long LengthLifetimePeak;
-
-		///<summary>
-		///The highest number of items in the queue within the past 100ms
-		///</summary>
-		public readonly long LengthCurrentTryPeak;
-
-		///<summary>
-		///Time elapsed processing the current item
-		///</summary>
-		public readonly TimeSpan? CurrentItemProcessingTime;
-
-		///<summary>
-		///Time elapsed since queue went idle
-		///</summary>
-		public readonly TimeSpan? CurrentIdleTime;
-
-		///<summary>
-		///The total number of items processed by the queue.
-		///</summary>
-		public readonly long TotalItemsProcessed;
-
-		///<summary>
-		///The average number of items processed per second by the queue.
-		///</summary>
-		public readonly int AvgItemsPerSecond;
-
-		///<summary>
-		///Average number of items processed per second
-		///</summary>
-		public readonly double AvgProcessingTime;
-
-		///<summary>
-		///Percentage of time queue spent idle
-		///</summary>
-		public readonly double IdleTimePercent;
-
-		///<summary>
-		///Last message type processed
-		///</summary>
-		public readonly Type LastProcessedMessageType;
-
-		///<summary>
-		///Current message type queue is processing
-		///</summary>
-		public readonly Type InProgressMessageType;
-
-		public QueueStats(string name,
-			string groupName,
-			int length,
-			int avgItemsPerSecond,
-			double avgProcessingTime,
-			double idleTimePercent,
-			TimeSpan? currentItemProcessingTime,
-			TimeSpan? currentIdleTime,
-			long totalItemsProcessed,
-			long lengthCurrentTryPeak,
-			long lengthLifetimePeak,
-			Type lastProcessedMessageType,
-			Type inProgressMessageType) {
-			Name = name;
-			GroupName = groupName;
-			Length = length;
-			AvgItemsPerSecond = avgItemsPerSecond;
-			AvgProcessingTime = avgProcessingTime;
-			IdleTimePercent = idleTimePercent;
-			CurrentItemProcessingTime = currentItemProcessingTime;
-			CurrentIdleTime = currentIdleTime;
-			TotalItemsProcessed = totalItemsProcessed;
-			LengthCurrentTryPeak = lengthCurrentTryPeak;
-
-			LengthLifetimePeak = lengthLifetimePeak;
-
-			LastProcessedMessageType = lastProcessedMessageType;
-			InProgressMessageType = inProgressMessageType;
-		}
-
-		public override string ToString() {
-			var str = string.Format("{0,-22} L: {1,-5}      Avg: {5,-5}i/s    AvgProcTime: {6:0.0}ms\n"
-			                        + "      Idle %:{7,-5:00.0}  Peak: {2,-5}  MaxPeak: {3,-7}  TotalProcessed: {4,-7}\n"
-			                        + "      Processing: {8}, Last: {9}",
-				Name,
-				Length,
-				LengthCurrentTryPeak,
-				LengthLifetimePeak,
-				TotalItemsProcessed,
-				AvgItemsPerSecond,
-				AvgProcessingTime,
-				IdleTimePercent,
-				InProgressMessageType == null ? "<none>" : InProgressMessageType.Name,
-				LastProcessedMessageType == null ? "<none>" : LastProcessedMessageType.Name);
-			return str;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Monitoring/Stats/StatMetadata.cs b/src/EventStore.Core/Services/Monitoring/Stats/StatMetadata.cs
deleted file mode 100644
index c199ce98280..00000000000
--- a/src/EventStore.Core/Services/Monitoring/Stats/StatMetadata.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace EventStore.Core.Services.Monitoring.Stats {
-	public class StatMetadata {
-		public object Value { get; set; }
-		public string Category { get; set; }
-		public string Title { get; set; }
-		public bool DrawChart { get; set; }
-
-		public StatMetadata() {
-		}
-
-		private StatMetadata(object value, string category, string title, bool drawChart) {
-			Value = value;
-			Category = category;
-			Title = title;
-			DrawChart = drawChart;
-		}
-
-		public StatMetadata(object value, string category, string title)
-			: this(value, category, title, true) {
-		}
-
-		public StatMetadata(object value, string title)
-			: this(value, null, title, true) {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Monitoring/Stats/StatsContainer.cs b/src/EventStore.Core/Services/Monitoring/Stats/StatsContainer.cs
deleted file mode 100644
index 92e53cebcfa..00000000000
--- a/src/EventStore.Core/Services/Monitoring/Stats/StatsContainer.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.Services.Monitoring.Stats {
-	public class StatsContainer {
-		private readonly Dictionary<string, object> _stats = new Dictionary<string, object>();
-
-		private const string Separator = "-";
-		private static readonly string[] SplitSeparator = new[] {Separator};
-
-		public void Add(IDictionary<string, object> statGroup) {
-			Ensure.NotNull(statGroup, "statGroup");
-
-			foreach (var stat in statGroup)
-				_stats.Add(stat.Key, stat.Value);
-		}
-
-		public Dictionary<string, object> GetStats(bool useGrouping, bool useMetadata) {
-			if (useGrouping && useMetadata)
-				return GetGroupedStatsWithMetadata();
-
-			if (useGrouping && !useMetadata)
-				return GetGroupedStats();
-
-			if (!useGrouping && useMetadata)
-				return GetRawStatsWithMetadata();
-
-			//if (!useGrouping && !useMetadata)
-			return GetRawStats();
-		}
-
-		private Dictionary<string, object> GetGroupedStatsWithMetadata() {
-			var grouped = Group(_stats);
-			return grouped;
-		}
-
-		private Dictionary<string, object> GetGroupedStats() {
-			var values = GetStatsValues(_stats);
-			var grouped = Group(values);
-			return grouped;
-		}
-
-		private Dictionary<string, object> GetRawStatsWithMetadata() {
-			return new Dictionary<string, object>(_stats);
-		}
-
-		private Dictionary<string, object> GetRawStats() {
-			var values = GetStatsValues(_stats);
-			return values;
-		}
-
-		private static Dictionary<string, object> GetStatsValues(Dictionary<string, object> dictionary) {
-			return dictionary.ToDictionary(
-				kvp => kvp.Key,
-				kvp => {
-					var statInfo = kvp.Value as StatMetadata;
-					return statInfo == null ? kvp.Value : statInfo.Value;
-				});
-		}
-
-		public static Dictionary<string, object> Group(Dictionary<string, object> input) {
-			Ensure.NotNull(input, "input");
-
-			if (input.IsEmpty())
-				return input;
-
-			var groupContainer = NewDictionary();
-			var hasSubGroups = false;
-
-			foreach (var entry in input) {
-				var groups = entry.Key.Split(SplitSeparator, StringSplitOptions.RemoveEmptyEntries);
-				if (groups.Length < 2) {
-					groupContainer.Add(entry.Key, entry.Value);
-					continue;
-				}
-
-				hasSubGroups = true;
-
-				string prefix = groups[0];
-				string remaining = string.Join(Separator, groups.Skip(1).ToArray());
-
-				if (!groupContainer.ContainsKey(prefix))
-					groupContainer.Add(prefix, NewDictionary());
-
-				((Dictionary<string, object>)groupContainer[prefix]).Add(remaining, entry.Value);
-			}
-
-			if (!hasSubGroups)
-				return groupContainer;
-
-			// we must first iterate through all dictionary and then aggregate it again
-			var result = NewDictionary();
-
-			foreach (var entry in groupContainer) {
-				var subgroup = entry.Value as Dictionary<string, object>;
-				if (subgroup != null)
-					result[entry.Key] = Group(subgroup);
-				else
-					result[entry.Key] = entry.Value;
-			}
-
-			return result;
-		}
-
-		private static Dictionary<string, object> NewDictionary() {
-			return new Dictionary<string, object>(new CaseInsensitiveStringComparer());
-		}
-
-		private class CaseInsensitiveStringComparer : IEqualityComparer<string> {
-			public bool Equals(string x, string y) {
-				return string.Equals(x, y, StringComparison.InvariantCultureIgnoreCase);
-			}
-
-			public int GetHashCode(string obj) {
-				return obj != null ? obj.ToUpperInvariant().GetHashCode() : -1;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Monitoring/StatsCollectorEnvelope.cs b/src/EventStore.Core/Services/Monitoring/StatsCollectorEnvelope.cs
deleted file mode 100644
index 4907833bc66..00000000000
--- a/src/EventStore.Core/Services/Monitoring/StatsCollectorEnvelope.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using EventStore.Common.Utils;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Monitoring.Stats;
-
-namespace EventStore.Core.Services.Monitoring {
-	public class StatsCollectorEnvelope : IEnvelope {
-		private readonly StatsContainer _statsContainer;
-
-		public StatsCollectorEnvelope(StatsContainer statsContainer) {
-			_statsContainer = statsContainer;
-			Ensure.NotNull(statsContainer, "statsContainer");
-		}
-
-		public void ReplyWith<T>(T message) where T : Message {
-			var msg = message as MonitoringMessage.InternalStatsRequestResponse;
-			if (msg != null)
-				_statsContainer.Add(msg.Stats);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Monitoring/SystemStatsHelper.cs b/src/EventStore.Core/Services/Monitoring/SystemStatsHelper.cs
deleted file mode 100644
index 8ad1aee4b00..00000000000
--- a/src/EventStore.Core/Services/Monitoring/SystemStatsHelper.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Runtime;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Services.Monitoring.Stats;
-using EventStore.Core.Services.Monitoring.Utils;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Transport.Tcp;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Monitoring {
-	public class SystemStatsHelper : IDisposable {
-		private readonly ILogger _log;
-		private readonly IReadOnlyCheckpoint _writerCheckpoint;
-		private readonly string _dbPath;
-		private readonly EventCountersHelper _eventCountersHelper;
-		private readonly long _totalMem;
-		private bool _giveup;
-
-		public SystemStatsHelper(ILogger log, IReadOnlyCheckpoint writerCheckpoint, string dbPath, long collectIntervalMs) {
-			Ensure.NotNull(log, "log");
-			Ensure.NotNull(writerCheckpoint, "writerCheckpoint");
-
-			_log = log;
-			_writerCheckpoint = writerCheckpoint;
-			_eventCountersHelper = new EventCountersHelper(collectIntervalMs);
-			_dbPath = dbPath;
-			_totalMem = RuntimeStats.GetTotalMemory();
-		}
-
-		public void Start() => _eventCountersHelper.Start();
-
-        public IDictionary<string, object> GetSystemStats() {
-			var stats = new Dictionary<string, object>();
-			GetPerfCounterInformation(stats, 0);
-			
-			var diskIo = ProcessStats.GetDiskIo();
-		
-			stats["proc-diskIo-readBytes"] = diskIo.ReadBytes;
-			stats["proc-diskIo-writtenBytes"] = diskIo.WrittenBytes;
-			stats["proc-diskIo-readOps"] = diskIo.ReadOps;
-			stats["proc-diskIo-writeOps"] = diskIo.WriteOps;
-            
-			var tcp = TcpConnectionMonitor.Default.GetTcpStats();
-			stats["proc-tcp-connections"] = tcp.Connections;
-			stats["proc-tcp-receivingSpeed"] = tcp.ReceivingSpeed;
-			stats["proc-tcp-sendingSpeed"] = tcp.SendingSpeed;
-			stats["proc-tcp-inSend"] = tcp.InSend;
-			stats["proc-tcp-measureTime"] = tcp.MeasureTime;
-			stats["proc-tcp-pendingReceived"] = tcp.PendingReceived;
-			stats["proc-tcp-pendingSend"] = tcp.PendingSend;
-			stats["proc-tcp-receivedBytesSinceLastRun"] = tcp.ReceivedBytesSinceLastRun;
-			stats["proc-tcp-receivedBytesTotal"] = tcp.ReceivedBytesTotal;
-			stats["proc-tcp-sentBytesSinceLastRun"] = tcp.SentBytesSinceLastRun;
-			stats["proc-tcp-sentBytesTotal"] = tcp.SentBytesTotal;
-
-			stats["es-checksum"] = _writerCheckpoint.Read();
-			stats["es-checksumNonFlushed"] = _writerCheckpoint.ReadNonFlushed();
-
-            var drive = DriveStats.GetDriveInfo(_dbPath);
-            
-            Func<string, string, string> driveStat = (diskName, stat) => $"sys-drive-{diskName.Replace("\\", "").Replace(":", "")}-{stat}";
-            stats[driveStat(drive.DiskName, "availableBytes")] = drive.AvailableBytes;
-            stats[driveStat(drive.DiskName, "totalBytes")]     = drive.TotalBytes;
-            stats[driveStat(drive.DiskName, "usage")]          = drive.Usage;
-            stats[driveStat(drive.DiskName, "usedBytes")]      = drive.UsedBytes;
-
-			Func<string, string, string> queueStat = (queueName, stat) =>
-				string.Format("es-queue-{0}-{1}", queueName, stat);
-			var queues = QueueMonitor.Default.GetStats();
-			foreach (var queue in queues) {
-				stats[queueStat(queue.Name, "queueName")] = queue.Name;
-				stats[queueStat(queue.Name, "groupName")] = queue.GroupName ?? string.Empty;
-				stats[queueStat(queue.Name, "avgItemsPerSecond")] = queue.AvgItemsPerSecond;
-				stats[queueStat(queue.Name, "avgProcessingTime")] = queue.AvgProcessingTime;
-				stats[queueStat(queue.Name, "currentIdleTime")] = queue.CurrentIdleTime.HasValue
-					? queue.CurrentIdleTime.Value.ToString("G", CultureInfo.InvariantCulture)
-					: null;
-				stats[queueStat(queue.Name, "currentItemProcessingTime")] = queue.CurrentItemProcessingTime.HasValue
-					? queue.CurrentItemProcessingTime.Value.ToString("G", CultureInfo.InvariantCulture)
-					: null;
-				stats[queueStat(queue.Name, "idleTimePercent")] = queue.IdleTimePercent;
-				stats[queueStat(queue.Name, "length")] = queue.Length;
-				stats[queueStat(queue.Name, "lengthCurrentTryPeak")] = queue.LengthCurrentTryPeak;
-				stats[queueStat(queue.Name, "lengthLifetimePeak")] = queue.LengthLifetimePeak;
-				stats[queueStat(queue.Name, "totalItemsProcessed")] = queue.TotalItemsProcessed;
-				stats[queueStat(queue.Name, "inProgressMessage")] = queue.InProgressMessageType != null
-					? queue.InProgressMessageType.Name
-					: "<none>";
-				stats[queueStat(queue.Name, "lastProcessedMessage")] = queue.LastProcessedMessageType != null
-					? queue.LastProcessedMessageType.Name
-					: "<none>";
-			}
-
-			return stats;
-		}
-
-		private void GetPerfCounterInformation(Dictionary<string, object> stats, int count) {
-			if (_giveup)
-				return;
-			var process = Process.GetCurrentProcess();
-			try {
-				stats["proc-startTime"] = process.StartTime.ToUniversalTime().ToString("O");
-				stats["proc-id"] = process.Id;
-				stats["proc-mem"] = new StatMetadata(process.WorkingSet64, "Process", "Process Virtual Memory");
-				stats["proc-cpu"] = new StatMetadata(_eventCountersHelper.GetProcCpuUsage(), "Process", "Process Cpu Usage");
-				stats["proc-threadsCount"] = _eventCountersHelper.GetProcThreadsCount();
-				stats["proc-contentionsRate"] = _eventCountersHelper.GetContentionsRateCount();
-				stats["proc-thrownExceptionsRate"] = _eventCountersHelper.GetThrownExceptionsRate();
-
-                stats["sys-cpu"] = RuntimeStats.GetCpuUsage();
-
-                if (RuntimeInformation.IsUnix) {
-                    var loadAverages = RuntimeStats.GetCpuLoadAverages();
-                    stats["sys-loadavg-1m"]  = loadAverages.OneMinute;
-                    stats["sys-loadavg-5m"]  = loadAverages.FiveMinutes;
-                    stats["sys-loadavg-15m"] = loadAverages.FifteenMinutes;
-                }
-
-				stats["sys-freeMem"]  = RuntimeStats.GetFreeMemory();
-				stats["sys-totalMem"] = _totalMem;
-
-				var gcStats = _eventCountersHelper.GetGcStats();
-				stats["proc-gc-allocationSpeed"] = gcStats.AllocationSpeed;
-				stats["proc-gc-fragmentation"] = gcStats.Fragmentation;
-				stats["proc-gc-gen0ItemsCount"] = gcStats.Gen0ItemsCount;
-				stats["proc-gc-gen0Size"] = gcStats.Gen0Size;
-				stats["proc-gc-gen1ItemsCount"] = gcStats.Gen1ItemsCount;
-				stats["proc-gc-gen1Size"] = gcStats.Gen1Size;
-				stats["proc-gc-gen2ItemsCount"] = gcStats.Gen2ItemsCount;
-				stats["proc-gc-gen2Size"] = gcStats.Gen2Size;
-				stats["proc-gc-largeHeapSize"] = gcStats.LargeHeapSize;
-				stats["proc-gc-timeInGc"] = gcStats.TimeInGc;
-				stats["proc-gc-totalBytesInHeaps"] = gcStats.TotalBytesInHeaps;
-			} catch (InvalidOperationException) {
-				_log.Information("Received error reading counters. Attempting to rebuild.");
-				_giveup = count > 10;
-				if (_giveup)
-					_log.Error("Maximum rebuild attempts reached. Giving up on rebuilds.");
-				else
-					GetPerfCounterInformation(stats, count + 1);
-			}
-		}
-
-		public void Dispose() {
-			_eventCountersHelper.Dispose();
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Monitoring/Utils/EventCountersHelper.cs b/src/EventStore.Core/Services/Monitoring/Utils/EventCountersHelper.cs
deleted file mode 100644
index 1e076ea6870..00000000000
--- a/src/EventStore.Core/Services/Monitoring/Utils/EventCountersHelper.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.Tracing;
-using System.Threading.Tasks;
-using EventStore.Core.Services.Monitoring.Stats;
-using Microsoft.Diagnostics.NETCore.Client;
-using Microsoft.Diagnostics.Tracing;
-using Microsoft.Diagnostics.Tracing.Parsers;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Monitoring.Utils {
-	internal class EventCountersHelper : IDisposable {
-		private static readonly ILogger Log = Serilog.Log.ForContext<EventCountersHelper>();
-		private const int InvalidCounterResult = -1;
-
-		private EventPipeSession _session;
-		private readonly List<EventPipeProvider> _providers;
-		private readonly IDictionary<string, double> _collectedStats = new Dictionary<string, double>();
-		private readonly HashSet<string> _gcCollectionNames = new HashSet<string>() {
-			"gen-0-gc-count",
-			"gen-1-gc-count",
-			"gen-2-gc-count"
-		};
-
-		private readonly int _pid;
-
-		public EventCountersHelper(long collectIntervalInMs) {
-			var currentProcess = Process.GetCurrentProcess();
-			_pid = currentProcess.Id;
-
-			_providers = new List<EventPipeProvider> {
-				new EventPipeProvider("System.Runtime", EventLevel.Informational,
-					(long)(ClrTraceEventParser.Keywords.GC | ClrTraceEventParser.Keywords.Threading |
-						   ClrTraceEventParser.Keywords.Exception | ClrTraceEventParser.Keywords.Contention),
-					new Dictionary<string, string> {
-						{"EventCounterIntervalSec", $"{collectIntervalInMs / 1000}"}
-					}),
-				new EventPipeProvider("Microsoft-Windows-DotNETRuntime", EventLevel.Informational,
-					(long)ClrTraceEventParser.Keywords.GC, new Dictionary<string, string>())
-			};
-		}
-
-		public void Start() {
-			Task.Run(() => {
-				try {
-					var client = new DiagnosticsClient(_pid);
-					_session = client.StartEventPipeSession(_providers, false);
-					using var source = new EventPipeEventSource(_session.EventStream);
-
-
-					source.Dynamic.All += obj => {
-						if (obj.EventName.Equals("EventCounters")) {
-							var payload = (IDictionary<string, object>)obj.PayloadValue(0);
-							var pairs = (IDictionary<string, object>)(payload["Payload"]);
-
-							var name = string.Intern(pairs["Name"].ToString());
-
-							if (_gcCollectionNames.Contains(name)) {
-								var gcCounterType = pairs["CounterType"];
-								if (gcCounterType.Equals("Sum")) {
-									var gcCollectionsInTimeInterval = double.Parse(pairs["Increment"].ToString());
-									_collectedStats.TryGetValue(name, out var previousGcCollectionCount);
-									_collectedStats[name] = previousGcCollectionCount + gcCollectionsInTimeInterval;
-								}
-								return;
-							}
-
-							var counterType = pairs["CounterType"];
-							if (counterType.Equals("Sum")) {
-								_collectedStats[name] = double.Parse(pairs["Increment"].ToString());
-							}
-
-							if (counterType.Equals("Mean")) {
-								_collectedStats[name] = double.Parse(pairs["Mean"].ToString());
-							}
-						}
-					};
-
-					source.Process();
-				} catch (ObjectDisposedException) {
-					// ignore exception on shutdown
-				} catch (Exception exception) {
-					Log.Warning(exception, "Error encountered while processing events");
-				}
-			});
-		}
-
-		///<summary>
-		///Total process CPU usage
-		///</summary>
-		public float GetProcCpuUsage() {
-			return (float)GetCounterValue("cpu-usage");
-		}
-
-		///<summary>
-		///Current thread count
-		///</summary>
-		public int GetProcThreadsCount() {
-			return (int)GetCounterValue("threadpool-thread-count");
-		}
-
-		///<summary>
-		///Number of exceptions thrown per second
-		///</summary>
-		public float GetThrownExceptionsRate() {
-			return (float)GetCounterValue("exception-count");
-		}
-
-		///<summary>
-		///The rate at which threads in the runtime attempt to acquire a managed lock unsuccessfully
-		///</summary>
-		public float GetContentionsRateCount() {
-			return (float)GetCounterValue("monitor-lock-contention-count");
-		}
-
-		private double GetCounterValue(string name) {
-			if (!_collectedStats.TryGetValue(name, out var value)) return InvalidCounterResult;
-			return value;
-		}
-
-		public GcStats GetGcStats() {
-			return new GcStats(
-				gcAllocationSpeed: (float)GetCounterValue("alloc-rate"),
-				gcFragmentation: (float)GetCounterValue("gc-fragmentation"),
-				gcGen0Items: (long)GetCounterValue("gen-0-gc-count"),
-				gcGen0Size: (long)GetCounterValue("gen-0-size"),
-				gcGen1Items: (long)GetCounterValue("gen-1-gc-count"),
-				gcGen1Size: (long)GetCounterValue("gen-1-size"),
-				gcGen2Items: (long)GetCounterValue("gen-2-gc-count"),
-				gcGen2Size: (long)GetCounterValue("gen-2-size"),
-				gcLargeHeapSize: (long)GetCounterValue("loh-size"),
-				gcTimeInGc: (long)GetCounterValue("time-in-gc"),
-				gcTotalBytesInHeaps: (long)GetCounterValue("gc-heap-size") * 1_000_000);
-		}
-
-		public void Dispose() {
-			try {
-				_session?.Stop();
-			} catch (ServerNotAvailableException) {
-			}
-
-			_session?.Dispose();
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PeriodicLogs/PeriodicallyLoggingService.cs b/src/EventStore.Core/Services/PeriodicLogs/PeriodicallyLoggingService.cs
deleted file mode 100644
index bd87cf23bf4..00000000000
--- a/src/EventStore.Core/Services/PeriodicLogs/PeriodicallyLoggingService.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using Serilog;
-
-namespace EventStore.Core.Services.PeriodicLogs;
-
-public class PeriodicallyLoggingService : 
-	IHandle<SystemMessage.SystemStart>,
-	IHandle<MonitoringMessage.CheckEsVersion> {
-
-	private static readonly TimeSpan _interval = TimeSpan.FromHours(12);
-	
-	private readonly IPublisher _publisher;
-	private readonly string _esVersion;
-	private readonly ILogger _logger;
-	private readonly TimerMessage.Schedule _esVersionScheduleLog;
-
-	public PeriodicallyLoggingService(IPublisher publisher, string esVersion, ILogger logger) {
-		Ensure.NotNull(publisher, nameof(publisher));
-		Ensure.NotNull(logger, nameof(logger));
-
-		_publisher = publisher;
-		_esVersion = esVersion;
-		_logger = logger;
-		_esVersionScheduleLog = TimerMessage.Schedule.Create(_interval, publisher,
-			new MonitoringMessage.CheckEsVersion());
-	}
-
-	public void Handle(SystemMessage.SystemStart message) {
-		_publisher.Publish(new MonitoringMessage.CheckEsVersion());
-	}
-
-	public void Handle(MonitoringMessage.CheckEsVersion message) {
-		_logger.Information("Current version of Event Store is : {esVersion} ", _esVersion);
-		_publisher.Publish(_esVersionScheduleLog);
-	}
-	
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/ConsumerPushResult.cs b/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/ConsumerPushResult.cs
deleted file mode 100644
index 2cf46284d6a..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/ConsumerPushResult.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EventStore.Core.Services.PersistentSubscription.ConsumerStrategy {
-	public enum ConsumerPushResult {
-		Sent,
-		Skipped,
-		NoMoreCapacity
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/DelegatePersistentSubscriptionConsumerStrategyFactory.cs b/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/DelegatePersistentSubscriptionConsumerStrategyFactory.cs
deleted file mode 100644
index ad08e3bd345..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/DelegatePersistentSubscriptionConsumerStrategyFactory.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-
-namespace EventStore.Core.Services.PersistentSubscription.ConsumerStrategy {
-	class DelegatePersistentSubscriptionConsumerStrategyFactory : IPersistentSubscriptionConsumerStrategyFactory {
-		public string StrategyName { get; private set; }
-
-		private readonly Func<string, IPublisher, ISubscriber, IPersistentSubscriptionConsumerStrategy> _factory;
-
-		public DelegatePersistentSubscriptionConsumerStrategyFactory(string strategyName,
-			Func<string, IPublisher, ISubscriber, IPersistentSubscriptionConsumerStrategy> factory) {
-			_factory = factory;
-			StrategyName = strategyName;
-		}
-
-		public IPersistentSubscriptionConsumerStrategy Create(string subscriptionId, IPublisher mainQueue,
-			ISubscriber mainBus) {
-			return _factory(subscriptionId, mainQueue, mainBus);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/DispatchToSinglePersistentSubscriptionConsumerStrategy.cs b/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/DispatchToSinglePersistentSubscriptionConsumerStrategy.cs
deleted file mode 100644
index c6e5f010796..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/DispatchToSinglePersistentSubscriptionConsumerStrategy.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using EventStore.Core.Data;
-
-namespace EventStore.Core.Services.PersistentSubscription.ConsumerStrategy {
-	class DispatchToSinglePersistentSubscriptionConsumerStrategy : RoundRobinPersistentSubscriptionConsumerStrategy {
-		public override string Name {
-			get { return SystemConsumerStrategies.DispatchToSingle; }
-		}
-
-		public override ConsumerPushResult PushMessageToClient(OutstandingMessage message) {
-			for (int i = 0; i < Clients.Count; i++) {
-				if (Clients.Peek().Push(message)) {
-					return ConsumerPushResult.Sent;
-				}
-
-				var c = Clients.Dequeue();
-				Clients.Enqueue(c);
-			}
-
-			return ConsumerPushResult.NoMoreCapacity;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/IPersistentSubscriptionConsumerStrategy.cs b/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/IPersistentSubscriptionConsumerStrategy.cs
deleted file mode 100644
index e391eba8472..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/IPersistentSubscriptionConsumerStrategy.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using EventStore.Core.Data;
-
-namespace EventStore.Core.Services.PersistentSubscription.ConsumerStrategy {
-	public interface IPersistentSubscriptionConsumerStrategy {
-		string Name { get; }
-
-		void ClientAdded(PersistentSubscriptionClient client);
-
-		void ClientRemoved(PersistentSubscriptionClient client);
-
-		ConsumerPushResult PushMessageToClient(OutstandingMessage message);
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/IPersistentSubscriptionConsumerStrategyFactory.cs b/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/IPersistentSubscriptionConsumerStrategyFactory.cs
deleted file mode 100644
index b78017eb49b..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/IPersistentSubscriptionConsumerStrategyFactory.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using EventStore.Core.Bus;
-
-namespace EventStore.Core.Services.PersistentSubscription.ConsumerStrategy {
-	public interface IPersistentSubscriptionConsumerStrategyFactory {
-		string StrategyName { get; }
-
-		IPersistentSubscriptionConsumerStrategy
-			Create(string subscriptionId, IPublisher mainQueue, ISubscriber mainBus);
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/PersistentSubscriptionConsumerStrategyRegistry.cs b/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/PersistentSubscriptionConsumerStrategyRegistry.cs
deleted file mode 100644
index f8d3e40138e..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/PersistentSubscriptionConsumerStrategyRegistry.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Bus;
-using EventStore.Core.Index.Hashes;
-
-namespace EventStore.Core.Services.PersistentSubscription.ConsumerStrategy {
-	public class PersistentSubscriptionConsumerStrategyRegistry {
-		private readonly IPublisher _mainQueue;
-		private readonly ISubscriber _mainBus;
-
-		private readonly IDictionary<string, IPersistentSubscriptionConsumerStrategyFactory> _factoryLookup =
-			new Dictionary<string, IPersistentSubscriptionConsumerStrategyFactory>();
-
-		public PersistentSubscriptionConsumerStrategyRegistry(IPublisher mainQueue, ISubscriber mainBus,
-			IReadOnlyList<IPersistentSubscriptionConsumerStrategyFactory> additionalConsumerStrategies) {
-			_mainQueue = mainQueue;
-			_mainBus = mainBus;
-			Register(new DelegatePersistentSubscriptionConsumerStrategyFactory(SystemConsumerStrategies.RoundRobin,
-				(subId, queue, bus) => new RoundRobinPersistentSubscriptionConsumerStrategy()));
-			Register(new DelegatePersistentSubscriptionConsumerStrategyFactory(
-				SystemConsumerStrategies.DispatchToSingle,
-				(subId, queue, bus) => new DispatchToSinglePersistentSubscriptionConsumerStrategy()));
-			Register(new DelegatePersistentSubscriptionConsumerStrategyFactory(SystemConsumerStrategies.Pinned,
-				(subId, queue, bus) => new PinnedPersistentSubscriptionConsumerStrategy(new XXHashUnsafe())));
-			Register(new DelegatePersistentSubscriptionConsumerStrategyFactory(SystemConsumerStrategies.PinnedByCorrelation,
-				(subId, queue, bus) => new PinnedByCorrelationPersistentSubscriptionConsumerStrategy(new XXHashUnsafe())));
-
-			foreach (var consumerStrategyFactory in additionalConsumerStrategies) {
-				Register(consumerStrategyFactory);
-			}
-		}
-
-		private void Register(IPersistentSubscriptionConsumerStrategyFactory factory) {
-			// Note this is designed to replace strategies of the same name to allow overriding.
-			_factoryLookup[factory.StrategyName] = factory;
-		}
-
-		public IPersistentSubscriptionConsumerStrategy
-			GetInstance(string namedConsumerStrategy, string subscriptionId) {
-			if (!ValidateStrategy(namedConsumerStrategy)) {
-				throw new ArgumentException(
-					string.Format("The named consumer strategy '{0}' is unknown.", namedConsumerStrategy),
-					"namedConsumerStrategy");
-			}
-
-			return _factoryLookup[namedConsumerStrategy].Create(subscriptionId, _mainQueue, _mainBus);
-		}
-
-		public bool ValidateStrategy(string name) {
-			return _factoryLookup.ContainsKey(name);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/PinnablePersistentSubscriptionConsumerStrategy.cs b/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/PinnablePersistentSubscriptionConsumerStrategy.cs
deleted file mode 100644
index 6d86c8830fd..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/PinnablePersistentSubscriptionConsumerStrategy.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-namespace EventStore.Core.Services.PersistentSubscription.ConsumerStrategy
-{
-	using Common.Utils;
-	using Data;
-	using Index.Hashes;
-	using PinnedState;
-
-	public abstract class PinnablePersistentSubscriptionConsumerStrategy : IPersistentSubscriptionConsumerStrategy {
-		private IHasher<string> _hash;
-		protected static readonly char LinkToSeparator = '@';
-		private readonly PinnedConsumerState _state = new PinnedConsumerState();
-		private readonly object _stateLock = new object();
-
-		public PinnablePersistentSubscriptionConsumerStrategy(IHasher<string> streamHasher) {
-			_hash = streamHasher;
-		}
-
-		public abstract string Name { get; }
-
-		public int AvailableCapacity {
-			get {
-				if (_state == null)
-					return 0;
-
-				return _state.AvailableCapacity;
-			}
-		}
-
-		public void ClientAdded(PersistentSubscriptionClient client) {
-			lock (_stateLock) {
-				var newNode = new Node(client);
-
-				_state.AddNode(newNode);
-
-				client.EventConfirmed += OnEventRemoved;
-			}
-		}
-
-		public void ClientRemoved(PersistentSubscriptionClient client) {
-			var nodeId = client.CorrelationId;
-
-			client.EventConfirmed -= OnEventRemoved;
-
-			_state.DisconnectNode(nodeId);
-		}
-
-		public ConsumerPushResult PushMessageToClient(OutstandingMessage message) {
-			if (_state == null) {
-				return ConsumerPushResult.NoMoreCapacity;
-			}
-
-			if (_state.AvailableCapacity == 0) {
-				return ConsumerPushResult.NoMoreCapacity;
-			}
-
-
-			uint bucket = GetAssignmentId(message.ResolvedEvent);
-
-			if (_state.Assignments[bucket].State != BucketAssignment.BucketState.Assigned) {
-				_state.AssignBucket(bucket);
-			}
-
-			if (!_state.Assignments[bucket].Node.Client.Push(message)) {
-				return ConsumerPushResult.Skipped;
-			}
-
-			_state.RecordEventSent(bucket);
-			return ConsumerPushResult.Sent;
-		}
-
-		private void OnEventRemoved(PersistentSubscriptionClient client, ResolvedEvent ev) {
-			var assignmentId = GetAssignmentId(ev);
-			_state.EventRemoved(client.CorrelationId, assignmentId);
-		}
-
-		private uint GetAssignmentId(ResolvedEvent ev) {
-			string sourceStreamId = GetAssignmentSourceId(ev);
-
-			return _hash.Hash(sourceStreamId) % (uint)_state.Assignments.Length;
-		}
-
-		protected abstract string GetAssignmentSourceId(ResolvedEvent ev);
-
-		protected string GetSourceStreamId(ResolvedEvent ev)
-		{
-			var eventRecord = ev.Event ?? ev.Link; // Unresolved link just use the link
-
-			string sourceStreamId = eventRecord.EventStreamId;
-
-			if (eventRecord.EventType == SystemEventTypes.LinkTo) // Unresolved link.
-			{
-				sourceStreamId = Helper.UTF8NoBom.GetString(eventRecord.Data.Span);
-				int separatorIndex = sourceStreamId.IndexOf(LinkToSeparator);
-				if (separatorIndex != -1)
-				{
-					sourceStreamId = sourceStreamId.Substring(separatorIndex + 1);
-				}
-			}
-
-			return sourceStreamId;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedByCorrelationPersistentSubscriptionConsumerStrategy.cs b/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedByCorrelationPersistentSubscriptionConsumerStrategy.cs
deleted file mode 100644
index b015b9fc449..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedByCorrelationPersistentSubscriptionConsumerStrategy.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-namespace EventStore.Core.Services.PersistentSubscription.ConsumerStrategy
-{
-	using System;
-	using System.IO;
-	using Data;
-	using Index.Hashes;
-	using Newtonsoft.Json;
-
-	public class PinnedByCorrelationPersistentSubscriptionConsumerStrategy : PinnedPersistentSubscriptionConsumerStrategy {
-		
-		public PinnedByCorrelationPersistentSubscriptionConsumerStrategy(IHasher<string> streamHasher) : base(streamHasher) {
-		}
-
-		public override string Name {
-			get { return SystemConsumerStrategies.PinnedByCorrelation; }
-		}
-
-
-		protected override string GetAssignmentSourceId(ResolvedEvent ev) {
-			var eventRecord = ev.Event ?? ev.Link;
-
-			string correlation = CorrelationFromJsonBytes(eventRecord.Metadata);
-
-			if (correlation == null) {
-				return GetSourceStreamId(ev);
-			}
-
-			return correlation;
-		}
-
-		private string CorrelationFromJsonBytes(ReadOnlyMemory<byte> toConvert) {
-			using (var reader = new JsonTextReader(new StreamReader(new MemoryStream(toConvert.ToArray())))) {
-				if (!reader.Read()) {
-					return null;
-				}
-
-				while (true) {
-					if (!reader.Read()) {
-						return null;
-					}
-
-					if (reader.TokenType == JsonToken.EndObject) {
-						break;
-					}
-
-					if (reader.TokenType == JsonToken.PropertyName) {
-						if ((string) reader.Value == CorrelationIdPropertyContext.CorrelationIdProperty) {
-							reader.Read();
-
-							if (reader.TokenType == JsonToken.String) {
-								return (string)reader.Value;
-							}
-						}
-					}
-				}
-			}
-
-			return null;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedPersistentSubscriptionConsumerStrategy.cs b/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedPersistentSubscriptionConsumerStrategy.cs
deleted file mode 100644
index 281c6fb6cfe..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedPersistentSubscriptionConsumerStrategy.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Core.Index.Hashes;
-
-namespace EventStore.Core.Services.PersistentSubscription.ConsumerStrategy {
-	public class PinnedPersistentSubscriptionConsumerStrategy : PinnablePersistentSubscriptionConsumerStrategy {
-		public PinnedPersistentSubscriptionConsumerStrategy(IHasher<string> streamHasher) : base(streamHasher) {
-		}
-
-		public override string Name {
-			get { return SystemConsumerStrategies.Pinned; }
-		}
-
-		protected override string GetAssignmentSourceId(ResolvedEvent ev) {
-			return GetSourceStreamId(ev);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedState/BucketAssignment.cs b/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedState/BucketAssignment.cs
deleted file mode 100644
index 530994c44c9..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedState/BucketAssignment.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-
-namespace EventStore.Core.Services.PersistentSubscription.ConsumerStrategy.PinnedState {
-	internal struct BucketAssignment {
-		internal enum BucketState {
-			Unassigned,
-			Assigned,
-			Disconnected
-		}
-
-		public Guid NodeId { get; set; }
-
-		public BucketState State { get; set; }
-
-		public int InFlightCount { get; set; }
-
-		public Node Node { get; set; }
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedState/Node.cs b/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedState/Node.cs
deleted file mode 100644
index 91cd68df2b8..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedState/Node.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System;
-
-namespace EventStore.Core.Services.PersistentSubscription.ConsumerStrategy.PinnedState {
-	internal class Node {
-		internal enum NodeState {
-			Connected,
-			Disconnected
-		}
-
-		public Node() {
-		}
-
-		public Node(Guid connectionId, Guid nodeId, string host, int port, NodeState state,
-			PersistentSubscriptionClient client, int maximumInFlightMessages, int assignmentCount) {
-			ConnectionId = connectionId;
-			NodeId = nodeId;
-			Host = host;
-			Port = port;
-			State = state;
-			Client = client;
-			MaximumInFlightMessages = maximumInFlightMessages;
-			AssignmentCount = assignmentCount;
-		}
-
-		public Node(PersistentSubscriptionClient client) {
-			Client = client;
-			ConnectionId = client.ConnectionId;
-			NodeId = client.CorrelationId;
-
-			var portSplit = client.From.IndexOf(':');
-			if (portSplit == -1) {
-				Host = client.From;
-			} else {
-				Host = client.From.Substring(0, portSplit);
-				Port = Int32.Parse(client.From.Substring(portSplit + 1));
-			}
-
-			State = NodeState.Connected;
-			MaximumInFlightMessages = client.MaximumInFlightMessages;
-		}
-
-		public Guid ConnectionId { get; set; }
-
-		public Guid NodeId { get; set; }
-
-		public string Host { get; set; }
-
-		public int Port { get; set; }
-
-		public NodeState State { get; set; }
-
-		public PersistentSubscriptionClient Client { get; set; }
-
-		public int MaximumInFlightMessages { get; set; }
-
-		public int AssignmentCount { get; set; }
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedState/PinnedConsumerState.cs b/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedState/PinnedConsumerState.cs
deleted file mode 100644
index 2e92a6bcb91..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedState/PinnedConsumerState.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace EventStore.Core.Services.PersistentSubscription.ConsumerStrategy.PinnedState {
-	class PinnedConsumerState {
-		private const int MaxBucketCount = 1024;
-
-		public PinnedConsumerState() {
-			Version = -1;
-			Assignments = new BucketAssignment[MaxBucketCount];
-			Nodes = new List<Node>();
-		}
-
-		public int Version { get; set; }
-
-		public BucketAssignment[] Assignments { get; set; }
-
-		public IList<Node> Nodes { get; set; }
-
-		public int AssignmentCount { get; set; }
-
-		public int TotalCapacity { get; set; }
-
-		public int AvailableCapacity {
-			get {
-				var cap = 0;
-				for (int index = 0; index < Nodes.Count; index++) {
-					var node = Nodes[index];
-					if (node.State == Node.NodeState.Connected) {
-						cap += node.MaximumInFlightMessages - node.Client.InflightMessages;
-					}
-				}
-
-				return cap;
-			}
-		}
-
-		public void DisconnectNode(Guid nodeId) {
-			var node = Nodes.FirstOrDefault(_ => _.NodeId == nodeId);
-
-			if (node == null) {
-				throw new ApplicationException(
-					"ClientRemoved was called for a client the consumer strategy didn't have.");
-			}
-
-			if (node.State == Node.NodeState.Disconnected)
-				throw new InvalidOperationException();
-
-			node.State = Node.NodeState.Disconnected;
-
-			AssignmentCount -= node.AssignmentCount;
-			if (AssignmentCount < 0)
-				throw new InvalidOperationException();
-
-			TotalCapacity -= node.MaximumInFlightMessages;
-			if (TotalCapacity < 0)
-				throw new InvalidOperationException();
-
-			for (int i = 0; i < Assignments.Length; i++) {
-				if (Assignments[i].NodeId == nodeId) {
-					Assignments[i].State = BucketAssignment.BucketState.Disconnected;
-					Assignments[i].InFlightCount = 0;
-				}
-			}
-		}
-
-		public void AddNode(Node newNode) {
-			Nodes.Add(newNode);
-			TotalCapacity += newNode.MaximumInFlightMessages;
-
-			var clientCount = Nodes.Count(_ => _.State == Node.NodeState.Connected);
-
-			var maxBalancedClientAssignmentCount = (int)Math.Ceiling(AssignmentCount / (decimal)clientCount);
-
-			var reassignments = new List<uint>();
-
-			foreach (var existingClient in Nodes) {
-				if (existingClient == newNode || existingClient.State == Node.NodeState.Disconnected) {
-					continue;
-				}
-
-				if (existingClient.AssignmentCount > maxBalancedClientAssignmentCount) {
-					var assignmentsToMove = Assignments
-						.Select((node, bucket) => Tuple.Create(node, bucket))
-						.Where(_ => _.Item1.NodeId == existingClient.NodeId &&
-						            _.Item1.State == BucketAssignment.BucketState.Assigned)
-						.OrderBy(_ => _.Item1.InFlightCount) // Take buckets without inflight messages first.
-						.Take(existingClient.AssignmentCount - maxBalancedClientAssignmentCount);
-
-					foreach (var assignment in assignmentsToMove) {
-						reassignments.Add((uint)assignment.Item2);
-					}
-				}
-			}
-
-			foreach (var reassignment in reassignments) {
-				ApplyBucketAssigned(reassignment, newNode.NodeId);
-			}
-
-			Clean();
-		}
-
-		public void EventRemoved(Guid nodeId, uint assignmentId) {
-			if (Assignments[assignmentId].NodeId == nodeId) {
-				Assignments[assignmentId].InFlightCount--;
-			}
-		}
-
-		public void RecordEventSent(uint bucket) {
-			Assignments[bucket].InFlightCount++;
-		}
-
-		public void AssignBucket(uint bucket) {
-			var node = ChooseClient();
-			ApplyBucketAssigned(bucket, node.NodeId);
-		}
-
-		private void Clean() {
-			var oldNodes = Nodes.Where(_ => _.AssignmentCount == 0 && _.State == Node.NodeState.Disconnected).ToList();
-			foreach (var oldNode in oldNodes) {
-				Nodes.Remove(oldNode);
-			}
-		}
-
-		private void ApplyBucketAssigned(uint bucketId, Guid newNodeId) {
-			if (Assignments[bucketId].State != BucketAssignment.BucketState.Assigned) {
-				AssignmentCount++;
-			}
-
-			if (Assignments[bucketId].State != BucketAssignment.BucketState.Unassigned) {
-				Assignments[bucketId].Node.AssignmentCount--;
-			}
-
-			Assignments[bucketId].State = BucketAssignment.BucketState.Assigned;
-			Assignments[bucketId].NodeId = newNodeId;
-			Assignments[bucketId].Node = Nodes.First(_ => _.NodeId == newNodeId);
-			Assignments[bucketId].Node.AssignmentCount++;
-		}
-
-		private Node ChooseClient() {
-			Node minAssignedNode = null;
-			foreach (var node in Nodes.Where(_ => _.State == Node.NodeState.Connected)) {
-				if (minAssignedNode == null || node.AssignmentCount < minAssignedNode.AssignmentCount) {
-					minAssignedNode = node;
-				}
-			}
-
-			return minAssignedNode;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/RoundRobinPersistentSubscriptionConsumerStrategy.cs b/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/RoundRobinPersistentSubscriptionConsumerStrategy.cs
deleted file mode 100644
index 4715420242f..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/ConsumerStrategy/RoundRobinPersistentSubscriptionConsumerStrategy.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.Services.PersistentSubscription.ConsumerStrategy {
-	class RoundRobinPersistentSubscriptionConsumerStrategy : IPersistentSubscriptionConsumerStrategy {
-		protected readonly Queue<PersistentSubscriptionClient> Clients = new Queue<PersistentSubscriptionClient>();
-
-		public virtual string Name {
-			get { return SystemConsumerStrategies.RoundRobin; }
-		}
-
-		public void ClientAdded(PersistentSubscriptionClient client) {
-			Clients.Enqueue(client);
-		}
-
-		public void ClientRemoved(PersistentSubscriptionClient client) {
-			if (!Clients.Contains(client)) {
-				throw new InvalidOperationException("Only added clients can be removed.");
-			}
-
-			var temp = Clients.ToList();
-			var indexOf = temp.IndexOf(client);
-			temp.RemoveAt(indexOf);
-			Clients.Clear();
-			foreach (var persistentSubscriptionClient in temp) {
-				Clients.Enqueue(persistentSubscriptionClient);
-			}
-		}
-
-		public virtual ConsumerPushResult PushMessageToClient(OutstandingMessage message) {
-			for (int i = 0; i < Clients.Count; i++) {
-				var c = Clients.Dequeue();
-				var pushed = c.Push(message);
-				Clients.Enqueue(c);
-				if (pushed) {
-					return ConsumerPushResult.Sent;
-				}
-			}
-
-			return ConsumerPushResult.NoMoreCapacity;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/IPersistentSubscriptionCheckpointReader.cs b/src/EventStore.Core/Services/PersistentSubscription/IPersistentSubscriptionCheckpointReader.cs
deleted file mode 100644
index 6e239359b38..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/IPersistentSubscriptionCheckpointReader.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-#nullable enable
-using System;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public interface IPersistentSubscriptionCheckpointReader {
-		void BeginLoadState(string subscriptionId, Action<string?> onStateLoaded);
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/IPersistentSubscriptionCheckpointWriter.cs b/src/EventStore.Core/Services/PersistentSubscription/IPersistentSubscriptionCheckpointWriter.cs
deleted file mode 100644
index 5398aea8a79..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/IPersistentSubscriptionCheckpointWriter.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public interface IPersistentSubscriptionCheckpointWriter {
-		void BeginWriteState(IPersistentSubscriptionStreamPosition state);
-		void BeginDelete(Action<IPersistentSubscriptionCheckpointWriter> completed);
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/IPersistentSubscriptionEventSource.cs b/src/EventStore.Core/Services/PersistentSubscription/IPersistentSubscriptionEventSource.cs
deleted file mode 100644
index 768e6a5d486..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/IPersistentSubscriptionEventSource.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public interface IPersistentSubscriptionEventSource {
-		bool FromStream { get; }
-		string EventStreamId { get; }
-		bool FromAll { get; }
-		string ToString();
-		IPersistentSubscriptionStreamPosition StreamStartPosition { get; }
-		IPersistentSubscriptionStreamPosition GetStreamPositionFor(ResolvedEvent @event);
-		IPersistentSubscriptionStreamPosition GetStreamPositionFor(string checkpoint);
-		IEventFilter EventFilter { get; }
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/IPersistentSubscriptionMessageParker.cs b/src/EventStore.Core/Services/PersistentSubscription/IPersistentSubscriptionMessageParker.cs
deleted file mode 100644
index b1a89e0e8d1..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/IPersistentSubscriptionMessageParker.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public interface IPersistentSubscriptionMessageParker {
-		void BeginParkMessage(ResolvedEvent ev, string reason, Action<ResolvedEvent, OperationResult> completed);
-		void BeginReadEndSequence(Action<long?> completed);
-		void BeginMarkParkedMessagesReprocessed(long sequence, DateTime? oldestParkedMessageTimestamp, bool updateOldestParkedMessage);
-		void BeginDelete(Action<IPersistentSubscriptionMessageParker> completed);
-		long ParkedMessageCount { get; }
-		public void BeginLoadStats(Action completed);
-		DateTime? GetOldestParkedMessage { get; }
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/IPersistentSubscriptionStreamPosition.cs b/src/EventStore.Core/Services/PersistentSubscription/IPersistentSubscriptionStreamPosition.cs
deleted file mode 100644
index 1bbb9d47d72..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/IPersistentSubscriptionStreamPosition.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public interface IPersistentSubscriptionStreamPosition : IEquatable<IPersistentSubscriptionStreamPosition>, IComparable<IPersistentSubscriptionStreamPosition> {
-		bool IsSingleStreamPosition { get; }
-		long StreamEventNumber { get; }
-		bool IsAllStreamPosition { get; }
-		(long Commit, long Prepare) TFPosition { get; }
-		bool IsLivePosition { get; }
-		string ToString();
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/IPersistentSubscriptionStreamReader.cs b/src/EventStore.Core/Services/PersistentSubscription/IPersistentSubscriptionStreamReader.cs
deleted file mode 100644
index ce336bc29f8..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/IPersistentSubscriptionStreamReader.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public interface IPersistentSubscriptionStreamReader {
-		void BeginReadEvents(IPersistentSubscriptionEventSource eventSource,
-			IPersistentSubscriptionStreamPosition startPosition, int countToLoad, int batchSize, int maxWindowSize,
-			bool resolveLinkTos, bool skipFirstEvent,
-			Action<ResolvedEvent[], IPersistentSubscriptionStreamPosition, bool> onEventsFound,
-			Action<IPersistentSubscriptionStreamPosition, long> onEventsSkipped,
-			Action<string> onError);
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/NakAction.cs b/src/EventStore.Core/Services/PersistentSubscription/NakAction.cs
deleted file mode 100644
index 9b50dacfc0b..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/NakAction.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace EventStore.Core.Services.PersistentSubscription {
-	public enum NakAction {
-		Unknown = 0,
-		Park = 1,
-		Retry = 2,
-		Skip = 3,
-		Stop = 4
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/OutstandingMessage.cs b/src/EventStore.Core/Services/PersistentSubscription/OutstandingMessage.cs
deleted file mode 100644
index b9cd097dc33..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/OutstandingMessage.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public struct OutstandingMessage {
-		public readonly ResolvedEvent ResolvedEvent;
-		public readonly int RetryCount;
-		public readonly Guid EventId;
-		public readonly bool IsReplayedEvent;
-		public readonly long? EventSequenceNumber;
-		public readonly IPersistentSubscriptionStreamPosition EventPosition;
-		public readonly IPersistentSubscriptionStreamPosition PreviousEventPosition;
-
-		private OutstandingMessage(Guid eventId, ResolvedEvent resolvedEvent, int retryCount, bool isReplayedEvent, long? eventSequenceNumber, IPersistentSubscriptionStreamPosition eventPosition, IPersistentSubscriptionStreamPosition previousEventPosition) : this() {
-			EventId = eventId;
-			ResolvedEvent = resolvedEvent;
-			RetryCount = retryCount;
-			IsReplayedEvent = isReplayedEvent;
-			EventSequenceNumber = eventSequenceNumber;
-			EventPosition = eventPosition;
-			PreviousEventPosition = previousEventPosition;
-		}
-
-		public static OutstandingMessage ForNewEvent(ResolvedEvent resolvedEvent, IPersistentSubscriptionStreamPosition eventPosition) {
-			Ensure.NotNull(eventPosition, "eventPosition");
-			return new OutstandingMessage(resolvedEvent.OriginalEvent.EventId, resolvedEvent, 0, false, null, eventPosition, null);
-		}
-
-		public static OutstandingMessage ForParkedEvent(ResolvedEvent resolvedEvent) {
-			return new OutstandingMessage(resolvedEvent.OriginalEvent.EventId, resolvedEvent, 0, true, null, null, null);
-		}
-
-		public static (OutstandingMessage message, bool newSequenceNumberAssigned) ForPushedEvent(OutstandingMessage message, long nextSequenceNumber, IPersistentSubscriptionStreamPosition previousEventPosition) {
-			if (nextSequenceNumber > 0) {
-				//only the first event may have a null previous event position
-				Ensure.NotNull(previousEventPosition, nameof(previousEventPosition));
-			}
-
-			if (message.IsReplayedEvent) { //replayed parked message
-				return (message, false);
-			}
-
-			if (message.EventSequenceNumber.HasValue) { //retried message
-				return (message, false);
-			}
-
-			return (new OutstandingMessage( //new event
-				message.EventId,
-				message.ResolvedEvent,
-				message.RetryCount,
-				message.IsReplayedEvent,
-				nextSequenceNumber,
-				message.EventPosition,
-				previousEventPosition), true);
-		}
-
-		public static OutstandingMessage ForRetriedEvent(OutstandingMessage message) {
-			return new OutstandingMessage(
-				message.EventId,
-				message.ResolvedEvent,
-				message.RetryCount + 1,
-				message.IsReplayedEvent,
-				message.EventSequenceNumber,
-				message.EventPosition,
-				message.PreviousEventPosition);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/OutstandingMessageCache.cs b/src/EventStore.Core/Services/PersistentSubscription/OutstandingMessageCache.cs
deleted file mode 100644
index 14c02a35cbc..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/OutstandingMessageCache.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.Diagnostics;
-using EventStore.Core.Data;
-using EventStore.Core.DataStructures;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public enum StartMessageResult {
-		Success,
-		SkippedDuplicate
-	}
-
-	public class OutstandingMessageCache {
-		private readonly Dictionary<Guid, Tuple<DateTime, OutstandingMessage>> _outstandingRequests;
-		private readonly SortedDictionary<Tuple<DateTime, RetryableMessage>, bool> _byTime;
-		private readonly SortedList<long, OutstandingMessage> _bySequences;
-
-		public class ByTypeComparer : IComparer<Tuple<DateTime, RetryableMessage>> {
-			public int Compare(Tuple<DateTime, RetryableMessage> x, Tuple<DateTime, RetryableMessage> y) {
-				if (x.Item1 != y.Item1) {
-					return x.Item1 < y.Item1 ? -1 : 1;
-				}
-
-				var q = y.Item2.MessageId.CompareTo(x.Item2.MessageId);
-				return q;
-			}
-		}
-
-		public OutstandingMessageCache() {
-			_outstandingRequests = new Dictionary<Guid, Tuple<DateTime, OutstandingMessage>>();
-			_byTime = new SortedDictionary<Tuple<DateTime, RetryableMessage>, bool>(new ByTypeComparer());
-			_bySequences = new SortedList<long, OutstandingMessage>();
-		}
-
-		public int Count {
-			get { return _outstandingRequests.Count; }
-		}
-
-		public void Remove(Guid messageId) {
-			Tuple<DateTime, OutstandingMessage> m;
-			if (_outstandingRequests.TryGetValue(messageId, out m)) {
-				_byTime.Remove(new Tuple<DateTime, RetryableMessage>(m.Item1,
-					new RetryableMessage(m.Item2.EventId, m.Item1)));
-				_outstandingRequests.Remove(messageId);
-				if (m.Item2.EventSequenceNumber.HasValue) {
-					_bySequences.Remove(m.Item2.EventSequenceNumber.Value);
-				}
-			}
-		}
-
-		public void Remove(IEnumerable<Guid> messageIds) {
-			foreach (var m in messageIds) Remove(m);
-		}
-
-		public StartMessageResult StartMessage(OutstandingMessage message, DateTime expires) {
-			if (_outstandingRequests.ContainsKey(message.EventId))
-				return StartMessageResult.SkippedDuplicate;
-			_outstandingRequests[message.EventId] = new Tuple<DateTime, OutstandingMessage>(expires, message);
-			Debug.Assert(message.IsReplayedEvent || message.EventSequenceNumber.HasValue);
-			if (message.EventSequenceNumber.HasValue) {
-				_bySequences.Add(message.EventSequenceNumber.Value, message);
-			}
-			_byTime.Add(new Tuple<DateTime, RetryableMessage>(expires, new RetryableMessage(message.EventId, expires)),
-				false);
-
-			return StartMessageResult.Success;
-		}
-
-		public IEnumerable<OutstandingMessage> GetMessagesExpiringBefore(DateTime time) {
-			while (_byTime.Count > 0) {
-				var item = _byTime.Keys.First();
-				if (item.Item1 > time) {
-					yield break;
-				}
-
-				_byTime.Remove(item);
-				Tuple<DateTime, OutstandingMessage> m;
-				if (_outstandingRequests.TryGetValue(item.Item2.MessageId, out m)) {
-					yield return _outstandingRequests[item.Item2.MessageId].Item2;
-					_outstandingRequests.Remove(item.Item2.MessageId);
-					if (m.Item2.EventSequenceNumber.HasValue) {
-						_bySequences.Remove(m.Item2.EventSequenceNumber.Value);
-					}
-				}
-			}
-		}
-
-		public IEnumerable<Tuple<DateTime, RetryableMessage>> WaitingTimeMessages() {
-			return _byTime.Keys;
-		}
-
-		public (OutstandingMessage? message, long sequenceNumber) GetLowestPosition() {
-			foreach(var x in _bySequences) {
-				if (!x.Value.IsReplayedEvent)
-					return (x.Value, x.Key);
-			}
-			return (null, long.MaxValue);
-		}
-
-		public bool GetMessageById(Guid id, out OutstandingMessage outstandingMessage) {
-			outstandingMessage = new OutstandingMessage();
-			Tuple<DateTime, OutstandingMessage> m;
-			if (_outstandingRequests.TryGetValue(id, out m)) {
-				outstandingMessage = m.Item2;
-				return true;
-			}
-
-			return false;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscription.cs b/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscription.cs
deleted file mode 100644
index 2f4f8ecee25..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscription.cs
+++ /dev/null
@@ -1,710 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.PersistentSubscription.ConsumerStrategy;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	//TODO GFY REFACTOR TO USE ACTUAL STATE MACHINE
-	public class PersistentSubscription {
-		private static readonly ILogger Log = Serilog.Log.ForContext<PersistentSubscription>();
-
-		public string SubscriptionId {
-			get { return _settings.SubscriptionId; }
-		}
-
-		public IPersistentSubscriptionEventSource EventSource {
-			get { return _settings.EventSource; }
-		}
-
-		public string GroupName {
-			get { return _settings.GroupName; }
-		}
-
-		public bool ResolveLinkTos {
-			get { return _settings.ResolveLinkTos; }
-		}
-
-		internal PersistentSubscriptionClientCollection _pushClients;
-		private readonly PersistentSubscriptionStats _statistics;
-		private readonly Stopwatch _totalTimeWatch;
-		private readonly OutstandingMessageCache _outstandingMessages;
-		private readonly TaskCompletionSource<StreamBuffer> _streamBufferSource;
-		private PersistentSubscriptionState _state = PersistentSubscriptionState.NotReady;
-		private IPersistentSubscriptionStreamPosition _nextEventToPullFrom;
-		private bool _skipFirstEvent;
-		private DateTime _lastCheckPointTime = DateTime.MinValue;
-		private readonly PersistentSubscriptionParams _settings;
-		private long _nextSequenceNumber;
-		private long _lastCheckpointedSequenceNumber;
-		private long _lastKnownSequenceNumber;
-		private IPersistentSubscriptionStreamPosition _lastKnownMessage;
-		private readonly object _lock = new object();
-		private bool _faulted;
-
-		public bool HasClients {
-			get { return _pushClients.Count > 0; }
-		}
-
-		public int ClientCount {
-			get { return _pushClients.Count; }
-		}
-
-		public bool HasReachedMaxClientCount {
-			get { return _settings.MaxSubscriberCount != 0 && _pushClients.Count >= _settings.MaxSubscriberCount; }
-		}
-
-		public PersistentSubscriptionState State {
-			get { return _state; }
-		}
-
-		public int OutstandingMessageCount {
-			get { return _outstandingMessages.Count; } //use outstanding not connections as http shows up here too
-		}
-
-		public PersistentSubscription(PersistentSubscriptionParams persistentSubscriptionParams) {
-			Ensure.NotNull(persistentSubscriptionParams.StreamReader, "eventLoader");
-			Ensure.NotNull(persistentSubscriptionParams.CheckpointReader, "checkpointReader");
-			Ensure.NotNull(persistentSubscriptionParams.CheckpointWriter, "checkpointWriter");
-			Ensure.NotNull(persistentSubscriptionParams.MessageParker, "messageParker");
-			Ensure.NotNull(persistentSubscriptionParams.SubscriptionId, "subscriptionId");
-			Ensure.NotNull(persistentSubscriptionParams.EventSource, "eventSource");
-			Ensure.NotNull(persistentSubscriptionParams.GroupName, "groupName");
-			if (persistentSubscriptionParams.ReadBatchSize >= persistentSubscriptionParams.BufferSize) {
-				throw new ArgumentOutOfRangeException($"{nameof(persistentSubscriptionParams.ReadBatchSize)} may not be greater than or equal to {nameof(persistentSubscriptionParams.BufferSize)}");
-			}
-
-			_totalTimeWatch = new Stopwatch();
-			_settings = persistentSubscriptionParams;
-			_nextEventToPullFrom = _settings.EventSource.StreamStartPosition;
-			_totalTimeWatch.Start();
-			_statistics = new PersistentSubscriptionStats(this, _settings, _totalTimeWatch);
-			_outstandingMessages = new OutstandingMessageCache();
-			_streamBufferSource = new TaskCompletionSource<StreamBuffer>(TaskCreationOptions.RunContinuationsAsynchronously);
-			InitAsNew();
-		}
-
-		public void InitAsNew() {
-			_state = PersistentSubscriptionState.NotReady;
-			_nextSequenceNumber = 0L;
-			_lastCheckpointedSequenceNumber = -1L;
-			_lastKnownSequenceNumber = -1L;
-			_lastKnownMessage = null;
-			_statistics.SetLastKnownEventPosition(null);
-			_settings.CheckpointReader.BeginLoadState(SubscriptionId, OnCheckpointLoaded);
-
-			_pushClients = new PersistentSubscriptionClientCollection(_settings.ConsumerStrategy);
-		}
-
-		public bool TryGetStreamBuffer(out StreamBuffer streamBuffer) {
-			if (_state == PersistentSubscriptionState.NotReady ||
-				!_streamBufferSource.Task.IsCompletedSuccessfully) {
-				streamBuffer = default;
-				return false;
-			}
-
-			streamBuffer = _streamBufferSource.Task.Result;
-			return true;
-		}
-
-		private void OnCheckpointLoaded(string checkpoint) {
-			lock (_lock) {
-				_state = PersistentSubscriptionState.Behind;
-				if (checkpoint == null) {
-					Log.Debug("Subscription {subscriptionId}: no checkpoint found", _settings.SubscriptionId);
-
-					Log.Debug("Start from = " + _settings.StartFrom);
-
-					_nextEventToPullFrom = _settings.StartFrom.IsLivePosition ? _settings.EventSource.StreamStartPosition : _settings.StartFrom;
-					_streamBufferSource.SetResult(new StreamBuffer(_settings.BufferSize, _settings.LiveBufferSize, null,
-					!_settings.StartFrom.IsLivePosition));
-					TryReadingNewBatch();
-				} else {
-					_nextEventToPullFrom = _settings.EventSource.GetStreamPositionFor(checkpoint);
-					_skipFirstEvent = true; //skip the checkpointed event
-
-					//initialize values based on the loaded checkpoint
-					_nextSequenceNumber = 1L;
-					_lastCheckpointedSequenceNumber = 0L;
-					_lastKnownSequenceNumber = 0L;
-					_lastKnownMessage = _settings.EventSource.GetStreamPositionFor(checkpoint);
-					_statistics.SetLastCheckPoint(_lastKnownMessage);
-
-					Log.Debug("Subscription {subscriptionId}: read checkpoint {checkpoint}", _settings.SubscriptionId,
-						checkpoint);
-					_streamBufferSource.SetResult(new StreamBuffer(_settings.BufferSize, _settings.LiveBufferSize, _nextEventToPullFrom, true));
-					_settings.MessageParker.BeginLoadStats(TryReadingNewBatch);
-				}
-			}
-		}
-
-		public void TryReadingNewBatch() {
-			lock (_lock) {
-				if (!TryGetStreamBuffer(out var streamBuffer))
-					return;
-				if ((_state & PersistentSubscriptionState.OutstandingPageRequest) > 0)
-					return;
-				if (streamBuffer.Live) {
-					SetLive();
-					return;
-				}
-
-				if (!streamBuffer.CanAccept(_settings.ReadBatchSize))
-					return;
-				_state |= PersistentSubscriptionState.OutstandingPageRequest;
-				_settings.StreamReader.BeginReadEvents(_settings.EventSource, _nextEventToPullFrom,
-					Math.Max(_settings.ReadBatchSize, 10), _settings.ReadBatchSize, _settings.MaxCheckPointCount,
-					_settings.ResolveLinkTos, _skipFirstEvent, HandleReadCompleted, HandleSkippedEvents, HandleReadError);
-				_skipFirstEvent = false;
-			}
-		}
-
-		private void HandleReadError(string error) {
-			lock (_lock) {
-				_faulted = true;
-				Log.Error("A non-recoverable error has occurred in persistent subscription {subscriptionId} : {error}. Dropping all connected clients.",
-					_settings.SubscriptionId, error);
-				var clients = _pushClients.GetAll().ToArray();
-				foreach (var client in clients) {
-					_pushClients.RemoveClientByCorrelationId(client.CorrelationId, true);
-				}
-			}
-		}
-
-		private void SetLive() {
-			//TODO GFY this is hacky and just trying to keep the state at this level when it
-			//lives in the streambuffer its for reporting reasons and likely should be revisited
-			//at some point.
-			_state &= ~PersistentSubscriptionState.Behind;
-			_state |= PersistentSubscriptionState.Live;
-		}
-
-		private void SetBehind() {
-			_state |= PersistentSubscriptionState.Behind;
-			_state &= ~PersistentSubscriptionState.Live;
-		}
-
-		public void HandleReadCompleted(ResolvedEvent[] events, IPersistentSubscriptionStreamPosition newPosition, bool isEndOfStream) {
-			lock (_lock) {
-				if (!TryGetStreamBuffer(out var streamBuffer))
-					return;
-				if ((_state & PersistentSubscriptionState.OutstandingPageRequest) == 0)
-					return;
-
-				_state &= ~PersistentSubscriptionState.OutstandingPageRequest;
-
-				if (streamBuffer.Live)
-					return;
-				foreach (var ev in events) {
-					streamBuffer.AddReadMessage(OutstandingMessage.ForNewEvent(ev, _settings.EventSource.GetStreamPositionFor(ev)));
-				}
-
-				if (events.Length > 0) {
-					_statistics.SetLastKnownEventPosition(_settings.EventSource.GetStreamPositionFor(events[^1]));
-				}
-
-				if (streamBuffer.Live) {
-					SetLive();
-				}
-
-				if (isEndOfStream) {
-					if (streamBuffer.TryMoveToLive()) {
-						SetLive();
-						return;
-					}
-				}
-
-				_nextEventToPullFrom = newPosition;
-				TryReadingNewBatch();
-				TryPushingMessagesToClients();
-			}
-		}
-
-		private void TryPushingMessagesToClients() {
-			lock (_lock) {
-				if (!TryGetStreamBuffer(out var streamBuffer))
-					return;
-
-				foreach (StreamBuffer.OutstandingMessagePointer messagePointer in streamBuffer.Scan()) {
-					//optimistically assume that the message will be pushed
-					//if it is, then we will increment the next sequence number if a new one was assigned
-					//if it is not, then we will not increment the next sequence number
-					(OutstandingMessage message, bool newSequenceNumberAssigned) =
-						OutstandingMessage.ForPushedEvent(messagePointer.Message, _nextSequenceNumber, _lastKnownMessage);
-					ConsumerPushResult result =
-						_pushClients.PushMessageToClient(message);
-					if (result == ConsumerPushResult.Sent) {
-						messagePointer.MarkSent();
-
-						if (newSequenceNumberAssigned) {
-							//the message was pushed and a new sequence number was assigned
-							//so we increment the next sequence number
-							_nextSequenceNumber++;
-						}
-
-						MarkBeginProcessing(message);
-					} else if (result == ConsumerPushResult.Skipped) {
-						// The consumer strategy skipped the message so leave it in the buffer and continue.
-					} else if (result == ConsumerPushResult.NoMoreCapacity) {
-						return;
-					}
-				}
-			}
-		}
-
-		public void NotifyLiveSubscriptionMessage(ResolvedEvent resolvedEvent) {
-			lock (_lock) {
-				if (!TryGetStreamBuffer(out var streamBuffer))
-					return;
-				if (_settings.EventSource.GetStreamPositionFor(resolvedEvent).CompareTo(_settings.StartFrom) < 0) {
-					return;
-				}
-
-				if (_settings.EventSource.EventFilter != null && !_settings.EventSource.EventFilter.IsEventAllowed(resolvedEvent.Event)) {
-					IPersistentSubscriptionStreamPosition position = new PersistentSubscriptionAllStreamPosition(-1, -1);
-					if (resolvedEvent.OriginalPosition.HasValue) {
-						position = new PersistentSubscriptionAllStreamPosition(
-							resolvedEvent.OriginalPosition.Value.CommitPosition,
-							resolvedEvent.OriginalPosition.Value.PreparePosition);
-					}
-					HandleSkippedEvents(position, 1);
-					return;
-				}
-
-				_statistics.SetLastKnownEventPosition(_settings.EventSource.GetStreamPositionFor(resolvedEvent));
-				var waslive = streamBuffer.Live; //hacky
-				streamBuffer.AddLiveMessage(OutstandingMessage.ForNewEvent(resolvedEvent, _settings.EventSource.GetStreamPositionFor(resolvedEvent)));
-				if (!streamBuffer.Live) {
-					SetBehind();
-					if (waslive)
-						_nextEventToPullFrom = _settings.EventSource.GetStreamPositionFor(resolvedEvent);
-				}
-
-				TryPushingMessagesToClients();
-			}
-		}
-
-		public IEnumerable<(ResolvedEvent ResolvedEvent, int RetryCount)> GetNextNOrLessMessages(int count) {
-			lock (_lock) {
-				if (!TryGetStreamBuffer(out var streamBuffer))
-					yield break;
-
-				foreach (var messagePointer in streamBuffer.Scan().Take(count)) {
-					messagePointer.MarkSent();
-					(OutstandingMessage message, bool newSequenceNumberAssigned) =
-						OutstandingMessage.ForPushedEvent(messagePointer.Message, _nextSequenceNumber, _lastKnownMessage);
-					if (newSequenceNumberAssigned) {
-						_nextSequenceNumber++;
-					}
-					MarkBeginProcessing(message); //sequence number will be incremented in this call if a new one has been assigned
-					yield return (messagePointer.Message.ResolvedEvent, messagePointer.Message.RetryCount);
-				}
-			}
-		}
-
-		private void MarkBeginProcessing(OutstandingMessage message) {
-			_statistics.IncrementProcessed();
-			if (message.EventSequenceNumber > _lastKnownSequenceNumber) {
-				_lastKnownSequenceNumber = message.EventSequenceNumber.Value;
-				_lastKnownMessage = _settings.EventSource.GetStreamPositionFor(message.ResolvedEvent);
-			}
-
-			StartMessage(message,
-				_settings.MessageTimeout == TimeSpan.MaxValue
-					? DateTime.MaxValue
-					: DateTime.UtcNow + _settings.MessageTimeout);
-		}
-
-		public void AddClient(Guid correlationId, Guid connectionId, string connectionName, IEnvelope envelope, int maxInFlight, string user,
-			string @from) {
-			lock (_lock) {
-				var client = new PersistentSubscriptionClient(correlationId, connectionId, connectionName, envelope, maxInFlight, user,
-					@from, _totalTimeWatch, _settings.ExtraStatistics);
-				_pushClients.AddClient(client);
-
-				if (_faulted) {
-					Log.Error("Dropping client: {clientId} from persistent subscription {subscriptionId} since the subscription has faulted.",
-						client.CorrelationId, _settings.SubscriptionId);
-					_pushClients.RemoveClientByCorrelationId(client.CorrelationId, true);
-					return;
-				}
-
-				TryPushingMessagesToClients();
-			}
-		}
-
-		public void Shutdown() {
-			lock (_lock) {
-				_pushClients.ShutdownAll();
-			}
-		}
-
-		public void HandleSkippedEvents(IPersistentSubscriptionStreamPosition position, long skippedCount) {
-			_lastKnownMessage = position;
-			_nextSequenceNumber += skippedCount;
-			_lastKnownSequenceNumber = _nextSequenceNumber - 1;
-			TryMarkCheckpoint(false);
-		}
-
-		public bool RemoveClientByConnectionId(Guid connectionId) {
-			lock (_lock) {
-				if (!_pushClients.RemoveClientByConnectionId(connectionId,
-					    out var unconfirmedEvents))
-					return false;
-
-				var lostMessages = unconfirmedEvents.OrderBy(v => v.ResolvedEvent.OriginalEventNumber);
-				foreach (var m in lostMessages) {
-					if (ActionTakenForRetriedMessage(m))
-						return true;
-					RetryMessage(m);
-				}
-
-				TryPushingMessagesToClients();
-				return true;
-			}
-		}
-
-		public void RemoveClientByCorrelationId(Guid correlationId, bool sendDropNotification) {
-			lock (_lock) {
-				var lostMessages = _pushClients.RemoveClientByCorrelationId(correlationId, sendDropNotification)
-					.OrderBy(v => v.ResolvedEvent.OriginalEventNumber);
-				foreach (var m in lostMessages) {
-					RetryMessage(m);
-				}
-
-				TryPushingMessagesToClients();
-			}
-		}
-
-		public void TryMarkCheckpoint(bool isTimeCheck) {
-			lock (_lock) {
-				if (!TryGetStreamBuffer(out var streamBuffer))
-					return;
-
-				OutstandingMessage? lowestMessage;
-				long lowestSequenceNumber;
-
-				(lowestMessage, lowestSequenceNumber)  = _outstandingMessages.GetLowestPosition();
-				var (lowestRetryMessage, lowestRetrySequenceNumber) = streamBuffer.GetLowestRetry();
-
-				if (lowestRetrySequenceNumber < lowestSequenceNumber) {
-					lowestSequenceNumber = lowestRetrySequenceNumber;
-					lowestMessage = lowestRetryMessage;
-				}
-
-				IPersistentSubscriptionStreamPosition lowestPosition;
-
-				if (lowestSequenceNumber != long.MaxValue) {
-					Debug.Assert(lowestMessage.HasValue);
-					// Subtract one from retry and outstanding as those messages have not been acknowledged yet.
-					lowestSequenceNumber--;
-					lowestPosition = lowestMessage.Value.PreviousEventPosition;
-
-					if (lowestPosition == null) {
-						Debug.Assert(lowestSequenceNumber == -1L);
-						//first message has been pushed but not yet acknowledged and we didn't have any previous checkpoint
-						//so we have nothing to checkpoint yet
-						return;
-					}
-					Debug.Assert(lowestPosition != null && lowestSequenceNumber >= 0L);
-				} else {
-					//no outstanding/retry messages. in this case we can say that the last known
-					//event would be our checkpoint place (we have already completed it)
-					lowestSequenceNumber = _lastKnownSequenceNumber;
-					lowestPosition = _lastKnownMessage;
-					Debug.Assert((lowestPosition != null && lowestSequenceNumber >= 0L) ||
-					             (lowestPosition == null && lowestSequenceNumber == -1L));
-				}
-
-				if (lowestSequenceNumber == -1) //we have not even pushed any messages yet
-					return;
-
-				Debug.Assert(lowestPosition != null);
-
-				var difference = lowestSequenceNumber - _lastCheckpointedSequenceNumber;
-				var now = DateTime.UtcNow;
-				var timedifference = now - _lastCheckPointTime;
-				if (timedifference < _settings.CheckPointAfter && difference < _settings.MaxCheckPointCount)
-					return;
-				if ((difference >= _settings.MinCheckPointCount && isTimeCheck) ||
-					difference >= _settings.MaxCheckPointCount) {
-					_lastCheckPointTime = now;
-					_lastCheckpointedSequenceNumber = lowestSequenceNumber;
-					_settings.CheckpointWriter.BeginWriteState(lowestPosition);
-					_statistics.SetLastCheckPoint(lowestPosition);
-				}
-			}
-		}
-
-		public void AcknowledgeMessagesProcessed(Guid correlationId, Guid[] processedEventIds) {
-			lock (_lock) {
-				RemoveProcessingMessages(processedEventIds);
-				TryMarkCheckpoint(false);
-				TryReadingNewBatch();
-				TryPushingMessagesToClients();
-			}
-		}
-
-		public void NotAcknowledgeMessagesProcessed(Guid correlationId, Guid[] processedEventIds, NakAction action,
-			string reason) {
-			lock (_lock) {
-				foreach (var id in processedEventIds) {
-					Log.Verbose("Message NAK'ed id {id} action to take {action} reason '{reason}'", id, action,
-						reason ?? "");
-					HandleNackedMessage(action, id, reason);
-				}
-
-				RemoveProcessingMessages(processedEventIds);
-				TryMarkCheckpoint(false);
-				TryReadingNewBatch();
-				TryPushingMessagesToClients();
-			}
-		}
-
-		private void HandleNackedMessage(NakAction action, Guid id, string reason) {
-			OutstandingMessage m;
-			switch (action) {
-				case NakAction.Retry:
-				case NakAction.Unknown:
-					if (_outstandingMessages.GetMessageById(id, out m)) {
-						if (!ActionTakenForRetriedMessage(m)) {
-							RetryMessage(m);
-						}
-					}
-
-					break;
-				case NakAction.Park:
-					if (_outstandingMessages.GetMessageById(id, out m)) {
-						ParkMessage(m.ResolvedEvent, "Client explicitly NAK'ed message.\n" + reason, 0);
-					}
-
-					break;
-				case NakAction.Stop:
-					StopSubscription();
-					break;
-				case NakAction.Skip:
-					SkipMessage(id);
-					break;
-				default:
-					SkipMessage(id);
-					break;
-			}
-		}
-
-		private void ParkMessage(ResolvedEvent resolvedEvent, string reason, int count) {
-			_settings.MessageParker.BeginParkMessage(resolvedEvent, reason, (e, result) => {
-				if (result != OperationResult.Success) {
-					if (count < 5) {
-						Log.Information("Unable to park message {stream}/{eventNumber} operation failed {e} retrying",
-							e.OriginalStreamId,
-							e.OriginalEventNumber, result);
-						ParkMessage(e, reason, count + 1);
-						return;
-					}
-
-					Log.Error(
-						"Unable to park message {stream}/{eventNumber} operation failed {e} after retries. Possible message loss",
-						e.OriginalStreamId,
-						e.OriginalEventNumber, result);
-				}
-
-				lock (_lock) {
-					_outstandingMessages.Remove(e.OriginalEvent.EventId);
-					_pushClients.RemoveProcessingMessages(e.OriginalEvent.EventId);
-					TryPushingMessagesToClients();
-				}
-			});
-		}
-
-
-		public void RetryParkedMessages(long? stopAt) {
-			lock (_lock) {
-				if (_state == PersistentSubscriptionState.NotReady)
-					return;
-				if ((_state & PersistentSubscriptionState.ReplayingParkedMessages) > 0)
-					return; //already replaying
-				_state |= PersistentSubscriptionState.ReplayingParkedMessages;
-				_settings.MessageParker.BeginReadEndSequence(end => {
-					if (!end.HasValue) {
-						_state ^= PersistentSubscriptionState.ReplayingParkedMessages;
-						return; //nothing to do.
-					}
-
-					var stopRead = stopAt.HasValue ? Math.Min(stopAt.Value, end.Value + 1) : end.Value + 1;
-					TryReadingParkedMessagesFrom(0,stopRead);
-				});
-			}
-		}
-
-		private void TryReadingParkedMessagesFrom(long position, long stopAt) {
-			if ((_state & PersistentSubscriptionState.ReplayingParkedMessages) == 0)
-				return; //not replaying
-
-			Ensure.Positive(stopAt - position, "count");
-
-			var count = (int)Math.Min((stopAt + 1) - position, _settings.ReadBatchSize); // Reading an extra event to get the Timestamp for the stopAt EventNumber
-			_settings.StreamReader.BeginReadEvents(
-				new PersistentSubscriptionSingleStreamEventSource(_settings.ParkedMessageStream),
-				new PersistentSubscriptionSingleStreamPosition(position),
-				count,
-				_settings.ReadBatchSize, _settings.MaxCheckPointCount, true, false,
-				(events, newposition, isstop) => HandleParkedReadCompleted(events, newposition, isstop, stopAt),
-				(_, _) => { }, HandleParkedReadError);
-		}
-
-		private void HandleParkedReadError(string error) {
-			Log.Error("Error reading parked messages from: {parkedStream} for persistent subscription {subscriptionId} : {error}",
-			_settings.ParkedMessageStream, _settings.SubscriptionId, error);
-		}
-
-		public void HandleParkedReadCompleted(ResolvedEvent[] events, IPersistentSubscriptionStreamPosition newPosition, bool isEndofStream, long stopAt) {
-			lock (_lock) {
-				if (!TryGetStreamBuffer(out var streamBuffer))
-					return;
-				if ((_state & PersistentSubscriptionState.ReplayingParkedMessages) == 0)
-					return;
-
-				foreach (var ev in events) {
-					if (ev.OriginalEventNumber == stopAt) {
-						break;
-					}
-
-					if (ev.Event == null) {
-						continue;
-					}
-
-					Log.Debug("Replaying parked message: {eventId} {stream}/{eventNumber} on subscription {subscriptionId}",
-						ev.OriginalEvent.EventId, ev.OriginalStreamId, ev.OriginalEventNumber,
-						_settings.SubscriptionId);
-					streamBuffer.AddRetry(OutstandingMessage.ForParkedEvent(ev));
-				}
-
-				TryPushingMessagesToClients();
-
-				var newStreamPosition = newPosition as PersistentSubscriptionSingleStreamPosition;
-				Ensure.NotNull(newStreamPosition, "newStreamPosition");
-
-				if (isEndofStream || stopAt <= newStreamPosition.StreamEventNumber) {
-					var replayedEnd = newStreamPosition.StreamEventNumber == -1 ? stopAt : Math.Min(stopAt, newStreamPosition.StreamEventNumber);
-
-					if (isEndofStream) {
-						_settings.MessageParker.BeginMarkParkedMessagesReprocessed(replayedEnd, null, true);
-					} else {
-						var (replayedEndTimeStamp, updateOldestParkedMessageTimeStamp) = GetOldestParkedMessageTimeStamp(events, replayedEnd);
-						_settings.MessageParker.BeginMarkParkedMessagesReprocessed(replayedEnd, replayedEndTimeStamp, updateOldestParkedMessageTimeStamp);
-					}
-
-					_state ^= PersistentSubscriptionState.ReplayingParkedMessages;
-				}else {
-					TryReadingParkedMessagesFrom(newStreamPosition.StreamEventNumber, stopAt);
-				}
-			}
-		}
-
-		private static (DateTime?, bool) GetOldestParkedMessageTimeStamp(ResolvedEvent[] events, long replayedEnd) {
-			foreach (var resolvedEvent in events) {
-				if (resolvedEvent.OriginalEvent.EventNumber != replayedEnd) continue;
-					return (resolvedEvent.OriginalEvent.TimeStamp, true);
-			}
-
-			return (null, false);
-		}
-
-		private void StartMessage(OutstandingMessage message, DateTime expires) {
-			var result = _outstandingMessages.StartMessage(message, expires);
-
-			if (result == StartMessageResult.SkippedDuplicate) {
-				Log.Warning("Skipping message {stream}/{eventNumber} (stream position={streamPosition}) with duplicate eventId {eventId}",
-					message.ResolvedEvent.OriginalStreamId,
-					message.ResolvedEvent.OriginalEventNumber,
-					_settings.EventSource.GetStreamPositionFor(message.ResolvedEvent).ToString(),
-					message.EventId);
-			}
-		}
-
-		private void SkipMessage(Guid id) {
-			_outstandingMessages.Remove(id);
-		}
-
-		private void StopSubscription() {
-			//TODO CC Stop subscription?
-		}
-
-		private void RemoveProcessingMessages(Guid[] processedEventIds) {
-			_pushClients.RemoveProcessingMessages(processedEventIds);
-			foreach (var id in processedEventIds) {
-				_outstandingMessages.Remove(id);
-			}
-		}
-
-		public void NotifyClockTick(DateTime time) {
-			lock (_lock) {
-				if (_state == PersistentSubscriptionState.NotReady)
-					return;
-
-				foreach (var message in _outstandingMessages.GetMessagesExpiringBefore(time)) {
-					if (!ActionTakenForRetriedMessage(message)) {
-						RetryMessage(message);
-					}
-				}
-
-				TryPushingMessagesToClients();
-				TryMarkCheckpoint(true);
-				if ((_state & PersistentSubscriptionState.Behind |
-					 PersistentSubscriptionState.OutstandingPageRequest) ==
-					PersistentSubscriptionState.Behind)
-					TryReadingNewBatch();
-			}
-		}
-
-		private bool ActionTakenForRetriedMessage(OutstandingMessage message) {
-			if (message.RetryCount < _settings.MaxRetryCount)
-				return false;
-			ParkMessage(message.ResolvedEvent, string.Format("Reached retry count of {0}", _settings.MaxRetryCount), 0);
-			return true;
-		}
-
-		private void RetryMessage(OutstandingMessage message) {
-			if (!TryGetStreamBuffer(out var streamBuffer))
-				return;
-
-			var @event = message.ResolvedEvent;
-			if (!message.IsReplayedEvent) {
-				Log.Debug("Retrying message {subscriptionId} {stream}/{eventNumber} (stream position={streamPosition})",
-					SubscriptionId,
-					@event.OriginalStreamId, @event.OriginalEventNumber,
-					_settings.EventSource.GetStreamPositionFor(message.ResolvedEvent).ToString());
-			} else {
-				Log.Debug("Retrying parked message: {eventId} {stream}/{eventNumber} on subscription {subscriptionId}",
-					@event.OriginalEvent.EventId, @event.OriginalStreamId, @event.OriginalEventNumber,
-					_settings.SubscriptionId);
-			}
-
-			_outstandingMessages.Remove(@event.OriginalEvent.EventId);
-			_pushClients.RemoveProcessingMessages(@event.OriginalEvent.EventId);
-			streamBuffer.AddRetry(OutstandingMessage.ForRetriedEvent(message));
-		}
-
-		public MonitoringMessage.PersistentSubscriptionInfo GetStatistics() {
-			return _statistics.GetStatistics();
-		}
-
-		public void RetrySingleParkedMessage(ResolvedEvent @event) {
-			if (!TryGetStreamBuffer(out var streamBuffer))
-				return;
-
-			streamBuffer.AddRetry(OutstandingMessage.ForParkedEvent(@event));
-		}
-
-		public void Delete() {
-			_settings.CheckpointWriter.BeginDelete(x => { });
-			_settings.MessageParker.BeginDelete(x => { });
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionAllStreamEventSource.cs b/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionAllStreamEventSource.cs
deleted file mode 100644
index 927176e1798..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionAllStreamEventSource.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Diagnostics;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public class PersistentSubscriptionAllStreamEventSource : IPersistentSubscriptionEventSource {
-		public bool FromStream => false;
-		public string EventStreamId => throw new InvalidOperationException();
-		public bool FromAll => true;
-		public override string ToString() => SystemStreams.AllStream;
-		public IEventFilter EventFilter { get; }
-
-		public PersistentSubscriptionAllStreamEventSource(IEventFilter eventFilter) {
-			EventFilter = eventFilter;
-		}
-
-		public PersistentSubscriptionAllStreamEventSource() {
-			EventFilter = null;
-		}
-
-		public IPersistentSubscriptionStreamPosition StreamStartPosition  => new PersistentSubscriptionAllStreamPosition(0L, 0L);
-		public IPersistentSubscriptionStreamPosition GetStreamPositionFor(ResolvedEvent @event) {
-			if (@event.OriginalPosition.HasValue) {
-				return new PersistentSubscriptionAllStreamPosition(@event.OriginalPosition.Value.CommitPosition, @event.OriginalPosition.Value.PreparePosition);
-			}
-			throw new InvalidOperationException();
-		}
-		public IPersistentSubscriptionStreamPosition GetStreamPositionFor(string checkpoint) {
-			const string C = "C:";
-			const string P = "P:";
-			string[] tokens = checkpoint.Split("/");
-			Debug.Assert(tokens.Length == 2);
-			Debug.Assert(tokens[0].StartsWith(C));
-			Debug.Assert(tokens[1].StartsWith(P));
-			long commitPosition = long.Parse(tokens[0].Substring(C.Length));
-			long preparePosition = long.Parse(tokens[1].Substring(P.Length));
-			return new PersistentSubscriptionAllStreamPosition(commitPosition, preparePosition);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionAllStreamPosition.cs b/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionAllStreamPosition.cs
deleted file mode 100644
index ae811775238..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionAllStreamPosition.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-#nullable enable
-using System;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public class PersistentSubscriptionAllStreamPosition : IPersistentSubscriptionStreamPosition {
-		public bool IsSingleStreamPosition => false;
-		public long StreamEventNumber => throw new InvalidOperationException();
-		public bool IsAllStreamPosition => true;
-		public bool IsLivePosition => _commitPosition == -1L && _preparePosition == -1L;
-		public (long Commit, long Prepare) TFPosition => (_commitPosition, _preparePosition);
-		private readonly long _commitPosition;
-		private readonly long _preparePosition;
-
-		public PersistentSubscriptionAllStreamPosition(long commitPosition, long preparePosition) {
-			_commitPosition = commitPosition;
-			_preparePosition = preparePosition;
-		}
-
-		public bool Equals(IPersistentSubscriptionStreamPosition? other) {
-			if (other == null) throw new InvalidOperationException();
-			if (!(other is PersistentSubscriptionAllStreamPosition)) throw new InvalidOperationException();
-			return TFPosition.Commit == other.TFPosition.Commit &&
-			       TFPosition.Prepare == other.TFPosition.Prepare;
-		}
-
-		public int CompareTo(IPersistentSubscriptionStreamPosition? other) {
-			if (other == null) throw new InvalidOperationException();
-			if (!(other is PersistentSubscriptionAllStreamPosition)) throw new InvalidOperationException();
-			if (Equals(other)) return 0;
-			if (TFPosition.Commit < other.TFPosition.Commit ||
-			    TFPosition.Commit == other.TFPosition.Commit &&
-			    TFPosition.Prepare < other.TFPosition.Prepare) return -1;
-			return 1;
-		}
-
-		public override string ToString() => $"C:{_commitPosition}/P:{_preparePosition}";
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionCheckpointReader.cs b/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionCheckpointReader.cs
deleted file mode 100644
index 771610c8d6b..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionCheckpointReader.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-#nullable enable
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.UserManagement;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public class PersistentSubscriptionCheckpointReader : IPersistentSubscriptionCheckpointReader {
-		private readonly IODispatcher _ioDispatcher;
-
-		public PersistentSubscriptionCheckpointReader(IODispatcher ioDispatcher) {
-			_ioDispatcher = ioDispatcher;
-		}
-
-		public void BeginLoadState(string subscriptionId, Action<string?> onStateLoaded) {
-			var subscriptionStateStream = "$persistentsubscription-" + subscriptionId + "-checkpoint";
-			_ioDispatcher.ReadBackward(subscriptionStateStream, -1, 1, false, SystemAccounts.System,
-				new ResponseHandler(onStateLoaded).LoadStateCompleted,
-				() => BeginLoadState(subscriptionId, onStateLoaded), Guid.NewGuid());
-		}
-
-		private class ResponseHandler {
-			private readonly Action<string?> _onStateLoaded;
-
-			public ResponseHandler(Action<string?> onStateLoaded) {
-				_onStateLoaded = onStateLoaded;
-			}
-
-			public void LoadStateCompleted(ClientMessage.ReadStreamEventsBackwardCompleted msg) {
-				if (msg.Events.Length > 0) {
-					var checkpoint = msg.Events[0].Event;
-
-					if (checkpoint.EventType == "SubscriptionCheckpoint" ||
-						checkpoint.EventType == "$SubscriptionCheckpoint") {
-				
-						var checkpointJson = checkpoint.Data.ParseJson<string>();
-						_onStateLoaded(checkpointJson);
-						return;
-					}
-				}
-
-				_onStateLoaded(null);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionCheckpointWriter.cs b/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionCheckpointWriter.cs
deleted file mode 100644
index 00fd996d3ab..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionCheckpointWriter.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.UserManagement;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public class PersistentSubscriptionCheckpointWriter : IPersistentSubscriptionCheckpointWriter {
-		private readonly IODispatcher _ioDispatcher;
-		private long _version = ExpectedVersion.Any;
-		private bool _outstandingWrite;
-		private readonly string _subscriptionStateStream;
-		private static readonly ILogger Log = Serilog.Log.ForContext<PersistentSubscriptionCheckpointWriter>();
-
-		public PersistentSubscriptionCheckpointWriter(string subscriptionId, IODispatcher ioDispatcher) {
-			_subscriptionStateStream = "$persistentsubscription-" + subscriptionId + "-checkpoint";
-			_ioDispatcher = ioDispatcher;
-		}
-
-		public void StartFrom(long version) {
-			_version = version;
-		}
-
-		public void BeginWriteState(IPersistentSubscriptionStreamPosition state) {
-			if (_outstandingWrite) {
-				return;
-			}
-
-			if (_version == ExpectedVersion.NoStream) {
-				PublishMetadata(state);
-			} else {
-				PublishCheckpoint(state);
-			}
-		}
-
-		public void BeginDelete(Action<IPersistentSubscriptionCheckpointWriter> completed) {
-			_ioDispatcher.DeleteStream(_subscriptionStateStream, ExpectedVersion.Any, false, SystemAccounts.System,
-				x => completed(this));
-		}
-
-		private void PublishCheckpoint(IPersistentSubscriptionStreamPosition state) {
-			_outstandingWrite = true;
-			var evnt = new Event(Guid.NewGuid(), "$SubscriptionCheckpoint", true, state.ToString().ToJson(), null);
-			_ioDispatcher.WriteEvent(_subscriptionStateStream, _version, evnt, SystemAccounts.System,
-				WriteStateCompleted);
-		}
-
-		private void PublishMetadata(IPersistentSubscriptionStreamPosition state) {
-			_outstandingWrite = true;
-			var metaStreamId = SystemStreams.MetastreamOf(_subscriptionStateStream);
-			_ioDispatcher.WriteEvent(
-				metaStreamId, ExpectedVersion.Any, CreateStreamMetadataEvent(), SystemAccounts.System, msg => {
-					_outstandingWrite = false;
-					switch (msg.Result) {
-						case OperationResult.Success:
-							PublishCheckpoint(state);
-							break;
-					}
-				});
-		}
-
-		private Event CreateStreamMetadataEvent() {
-			var eventId = Guid.NewGuid();
-			var acl = new StreamAcl(
-				readRole: SystemRoles.Admins, writeRole: SystemRoles.Admins,
-				deleteRole: SystemRoles.Admins, metaReadRole: SystemRoles.All,
-				metaWriteRole: SystemRoles.Admins);
-			var metadata = new StreamMetadata(maxCount: 2, maxAge: null, cacheControl: null, acl: acl);
-			var dataBytes = metadata.ToJsonBytes();
-			return new Event(eventId, SystemEventTypes.StreamMetadata, isJson: true, data: dataBytes, metadata: null);
-		}
-
-		private void WriteStateCompleted(ClientMessage.WriteEventsCompleted msg) {
-			_outstandingWrite = false;
-			if (msg.Result == OperationResult.Success) {
-				_version = msg.LastEventNumber;
-			} else {
-				Log.Debug("Error writing checkpoint for {stream}: {e}", _subscriptionStateStream, msg.Result);
-				_version = ExpectedVersion.Any;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionClient.cs b/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionClient.cs
deleted file mode 100644
index eeeecfe8a7f..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionClient.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public class PersistentSubscriptionClient {
-		public readonly int MaximumInFlightMessages;
-
-		private readonly Guid _correlationId;
-		private readonly Guid _connectionId;
-		private readonly string _connectionName;
-		private readonly IEnvelope _envelope;
-		private int _allowedMessages;
-		public readonly string Username;
-		public readonly string From;
-		private long _totalItems;
-		private readonly RequestStatistics _extraStatistics;
-		private readonly Dictionary<Guid, OutstandingMessage> _unconfirmedEvents = new Dictionary<Guid, OutstandingMessage>();
-
-		public PersistentSubscriptionClient(Guid correlationId,
-			Guid connectionId,
-			string connectionName,
-			IEnvelope envelope,
-			int inFlightMessages,
-			string username,
-			string from,
-			Stopwatch watch,
-			bool extraStatistics) {
-			_correlationId = correlationId;
-			_connectionId = connectionId;
-			_connectionName = connectionName;
-			_envelope = envelope;
-			_allowedMessages = inFlightMessages;
-			Username = username;
-			From = @from;
-			MaximumInFlightMessages = inFlightMessages;
-			if (extraStatistics) {
-				_extraStatistics = new RequestStatistics(watch, 1000);
-			}
-		}
-
-		/// <summary>
-		/// Raised whenever an in-flight event has been confirmed. This could be because of ack, nak, timeout or disconnection.
-		/// </summary>
-		public event Action<PersistentSubscriptionClient, ResolvedEvent> EventConfirmed;
-
-		public int InflightMessages {
-			get { return _unconfirmedEvents.Count; }
-		}
-
-		public int AvailableSlots {
-			get { return _allowedMessages; }
-		}
-
-		public Guid ConnectionId {
-			get { return _connectionId; }
-		}
-
-		public string ConnectionName {
-			get { return _connectionName; }
-		}
-
-		public long TotalItems {
-			get { return _totalItems; }
-		}
-
-		public long LastTotalItems { get; set; }
-
-		public Guid CorrelationId {
-			get { return _correlationId; }
-		}
-
-		internal bool RemoveFromProcessing(Guid[] processedEventIds) {
-			bool removedAny = false;
-			foreach (var processedEventId in processedEventIds) {
-				if (_extraStatistics != null)
-					_extraStatistics.EndOperation(processedEventId);
-				OutstandingMessage ev;
-				if (!_unconfirmedEvents.TryGetValue(processedEventId, out ev)) continue;
-				_unconfirmedEvents.Remove(processedEventId);
-				removedAny = true;
-				_allowedMessages++;
-				OnEventConfirmed(ev);
-			}
-
-			return removedAny;
-		}
-
-		public bool Push(OutstandingMessage message) {
-			if (!CanSend()) {
-				return false;
-			}
-
-			var evnt = message.ResolvedEvent;
-			_allowedMessages--;
-			Interlocked.Increment(ref _totalItems);
-			if (_extraStatistics != null)
-				_extraStatistics.StartOperation(evnt.OriginalEvent.EventId);
-
-			_envelope.ReplyWith(
-				new ClientMessage.PersistentSubscriptionStreamEventAppeared(CorrelationId, evnt, message.RetryCount));
-			if (!_unconfirmedEvents.ContainsKey(evnt.OriginalEvent.EventId)) {
-				_unconfirmedEvents.Add(evnt.OriginalEvent.EventId, message);
-			}
-
-			return true;
-		}
-
-		public IEnumerable<OutstandingMessage> GetUnconfirmedEvents() {
-			return _unconfirmedEvents.Values;
-		}
-
-		internal void SendDropNotification() {
-			_envelope.ReplyWith(
-				new ClientMessage.SubscriptionDropped(CorrelationId, SubscriptionDropReason.Unsubscribed));
-		}
-
-		internal ObservedTimingMeasurement GetExtraStats() {
-			return _extraStatistics == null ? null : _extraStatistics.GetMeasurementDetails();
-		}
-
-		private bool CanSend() {
-			return AvailableSlots > 0;
-		}
-
-		private void OnEventConfirmed(OutstandingMessage ev) {
-			var handler = EventConfirmed;
-			if (handler != null) handler(this, ev.ResolvedEvent);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionClientCollection.cs b/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionClientCollection.cs
deleted file mode 100644
index 2e9559614b1..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionClientCollection.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services.PersistentSubscription.ConsumerStrategy;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	internal class PersistentSubscriptionClientCollection {
-		private readonly IPersistentSubscriptionConsumerStrategy _consumerStrategy;
-
-		private readonly Dictionary<Guid, PersistentSubscriptionClient> _hash =
-			new Dictionary<Guid, PersistentSubscriptionClient>();
-
-		public int Count {
-			get { return _hash.Count; }
-		}
-
-		public PersistentSubscriptionClientCollection(IPersistentSubscriptionConsumerStrategy consumerStrategy) {
-			_consumerStrategy = consumerStrategy;
-		}
-
-		public void AddClient(PersistentSubscriptionClient client) {
-			_hash.Add(client.CorrelationId, client);
-			_consumerStrategy.ClientAdded(client);
-		}
-
-		public ConsumerPushResult PushMessageToClient(OutstandingMessage message) {
-			return _consumerStrategy.PushMessageToClient(message);
-		}
-
-		public bool RemoveClientByConnectionId(Guid connectionId,
-			out IEnumerable<OutstandingMessage> unconfirmedEvents) {
-			var clients = _hash.Values.Where(x => x.ConnectionId == connectionId).ToList();
-			if (clients.Count == 0) {
-				unconfirmedEvents = Array.Empty<OutstandingMessage>();
-				return false;
-			}
-
-			unconfirmedEvents = clients.SelectMany(client => RemoveClientByCorrelationId(client.CorrelationId, false));
-			return true;
-		}
-
-		public void ShutdownAll() {
-			foreach (var client in _hash.Values.ToArray()) {
-				RemoveClientByCorrelationId(client.CorrelationId, true);
-			}
-		}
-
-		public IEnumerable<OutstandingMessage> RemoveClientByCorrelationId(Guid correlationId,
-			bool sendDropNotification) {
-			PersistentSubscriptionClient client;
-			if (!_hash.TryGetValue(correlationId, out client)) return new OutstandingMessage[0];
-			_hash.Remove(client.CorrelationId);
-			_consumerStrategy.ClientRemoved(client);
-			if (sendDropNotification) {
-				client.SendDropNotification();
-			}
-
-			return client.GetUnconfirmedEvents();
-		}
-
-		public IEnumerable<PersistentSubscriptionClient> GetAll() {
-			return _hash.Values;
-		}
-
-		public void RemoveProcessingMessages(params Guid[] processedEventIds) {
-			foreach (var client in _hash.Values) {
-				client.RemoveFromProcessing(processedEventIds);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionConfig.cs b/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionConfig.cs
deleted file mode 100644
index 664ffca896c..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionConfig.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-using EventStore.Core.Services.Storage.ReaderIndex;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public class PersistentSubscriptionConfig {
-		public string Version;
-		public DateTime Updated;
-		public string UpdatedBy;
-		public List<PersistentSubscriptionEntry> Entries = new List<PersistentSubscriptionEntry>();
-
-		public byte[] GetSerializedForm() {
-			return this.ToJsonBytes();
-		}
-
-		public static PersistentSubscriptionConfig FromSerializedForm(ReadOnlyMemory<byte> data) {
-			try {
-				var ret = data.ParseJson<PersistentSubscriptionConfig>();
-				if (ret.Version == null)
-					throw new BadConfigDataException("Deserialized but no version present, invalid configuration data.",
-						null);
-
-				UpdateIfRequired(ret);
-
-				return ret;
-			} catch (Exception ex) {
-				throw new BadConfigDataException("The config data appears to be invalid", ex);
-			}
-		}
-
-		private static void UpdateIfRequired(PersistentSubscriptionConfig ret) {
-			if (ret.Version == "1") {
-				if (ret.Entries != null) {
-					foreach (var persistentSubscriptionEntry in ret.Entries) {
-						if (string.IsNullOrEmpty(persistentSubscriptionEntry.NamedConsumerStrategy)) {
-							persistentSubscriptionEntry.NamedConsumerStrategy =
-								persistentSubscriptionEntry.PreferRoundRobin
-									? SystemConsumerStrategies.RoundRobin
-									: SystemConsumerStrategies.DispatchToSingle;
-						}
-					}
-				}
-
-				ret.Version = "2";
-			}
-		}
-	}
-
-	public class BadConfigDataException : Exception {
-		public BadConfigDataException(string message, Exception inner) : base(message, inner) {
-		}
-	}
-
-	public class PersistentSubscriptionEntry {
-		public string Stream;
-		public string Group;
-		public EventFilter.EventFilterDto Filter;
-		public bool ResolveLinkTos;
-		public bool ExtraStatistics;
-		public int MessageTimeout;
-		[Obsolete] public long StartFrom;
-		public string StartPosition;
-		public int LiveBufferSize;
-		public int HistoryBufferSize;
-		public int MaxRetryCount;
-		public int ReadBatchSize;
-		public bool PreferRoundRobin;
-		public int CheckPointAfter { get; set; }
-		public int MinCheckPointCount { get; set; }
-		public int MaxCheckPointCount { get; set; }
-		public int MaxSubscriberCount { get; set; }
-		public string NamedConsumerStrategy { get; set; }
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionMessageParker.cs b/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionMessageParker.cs
deleted file mode 100644
index 2827c96e222..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionMessageParker.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.UserManagement;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public class PersistentSubscriptionMessageParker : IPersistentSubscriptionMessageParker {
-		private readonly IODispatcher _ioDispatcher;
-		public readonly string ParkedStreamId;
-		private long _lastTruncateBefore = -1;
-		private long _lastParkedEventNumber = -1;
-		private DateTime? _oldestParkedMessage;
-		public long ParkedMessageCount {
-			get {
-				return _lastParkedEventNumber == -1 ? 0 :
-					_lastTruncateBefore == -1 ? _lastParkedEventNumber + 1 :
-					_lastParkedEventNumber - _lastTruncateBefore + 1;
-			}
-		}
-
-		private static readonly ILogger Log = Serilog.Log.ForContext<PersistentSubscriptionMessageParker>();
-
-		public PersistentSubscriptionMessageParker(string subscriptionId, IODispatcher ioDispatcher) {
-			ParkedStreamId = "$persistentsubscription-" + subscriptionId + "-parked";
-			_ioDispatcher = ioDispatcher;
-		}
-
-		public DateTime? GetOldestParkedMessage {
-			get {
-				return _oldestParkedMessage;
-			}
-		}
-
-		public void BeginLoadStats(Action completed) {
-			BeginReadParkedMessageStats(completed);
-		}
-
-		private Event CreateStreamMetadataEvent(long? tb) {
-			var eventId = Guid.NewGuid();
-			var acl = new StreamAcl(
-				readRole: SystemRoles.Admins, writeRole: SystemRoles.Admins,
-				deleteRole: SystemRoles.Admins, metaReadRole: SystemRoles.Admins,
-				metaWriteRole: SystemRoles.Admins);
-			var metadata = new StreamMetadata(cacheControl: null,
-				truncateBefore: tb,
-				acl: acl);
-			var dataBytes = metadata.ToJsonBytes();
-			return new Event(eventId, SystemEventTypes.StreamMetadata, isJson: true, data: dataBytes, metadata: null);
-		}
-
-		private void WriteStateCompleted(Action<ResolvedEvent, OperationResult> completed, ResolvedEvent ev,
-			ClientMessage.WriteEventsCompleted msg, DateTime parkedMessageAdded) {
-			_lastParkedEventNumber = msg.LastEventNumber;
-			if (_oldestParkedMessage == null) _oldestParkedMessage = parkedMessageAdded.ToUniversalTime();
-			completed?.Invoke(ev, msg.Result);
-		}
-
-		public void BeginParkMessage(ResolvedEvent ev, string reason,
-			Action<ResolvedEvent, OperationResult> completed) {
-			var metadata = new ParkedMessageMetadata
-				{ Added = DateTime.Now, Reason = reason, SubscriptionEventNumber = ev.OriginalEventNumber };
-
-			string data = GetLinkToFor(ev);
-
-			var parkedEvent = new Event(Guid.NewGuid(), SystemEventTypes.LinkTo, false, data, metadata.ToJson());
-
-			_ioDispatcher.WriteEvent(ParkedStreamId, ExpectedVersion.Any, parkedEvent, SystemAccounts.System,
-				x => WriteStateCompleted(completed, ev, x,
-					metadata.Added));
-		}
-
-		private string GetLinkToFor(ResolvedEvent ev) {
-			if (ev.Event == null) // Unresolved link so just use the bad/deleted link data.
-			{
-				return Encoding.UTF8.GetString(ev.Link.Data.Span);
-			}
-
-			return string.Format("{0}@{1}", ev.Event.EventNumber, ev.Event.EventStreamId);
-		}
-
-		public void BeginDelete(Action<IPersistentSubscriptionMessageParker> completed) {
-			_ioDispatcher.DeleteStream(ParkedStreamId, ExpectedVersion.Any, false, SystemAccounts.System,
-				x => completed?.Invoke(this));
-		}
-
-		private void BeginReadParkedMessageStats(Action completed) {
-			BeginReadLastEvent(lastEventNumber => {
-				if (lastEventNumber is null) completed();
-				BeginReadFirstEvent(0, (firstEventNumber, oldestParkedMessageTimeStamp) => {
-					_lastTruncateBefore = firstEventNumber ?? -1;
-					_lastParkedEventNumber = lastEventNumber ?? -1;
-					_oldestParkedMessage = oldestParkedMessageTimeStamp;
-					completed?.Invoke();
-				});
-			});
-		}
-
-		public void BeginReadEndSequence(Action<long?> completed) {
-			_ioDispatcher.ReadBackward(ParkedStreamId,
-				long.MaxValue,
-				1,
-				false,
-				SystemAccounts.System, comp => {
-					switch (comp.Result) {
-						case ReadStreamResult.Success:
-							completed?.Invoke(comp.LastEventNumber);
-							break;
-						case ReadStreamResult.NoStream:
-							completed?.Invoke(null);
-							break;
-						default:
-							Log.Error(
-								"An error occured reading the last event in the parked message stream {stream} due to {e}.",
-								ParkedStreamId, comp.Result);
-							Log.Error("Messages were not removed on retry");
-							break;
-					}
-				});
-		}
-
-		private void BeginReadFirstEvent(long fromEventNumber, Action<long?, DateTime?> completed) {
-			_ioDispatcher.ReadForward(
-				ParkedStreamId,
-				fromEventNumber,
-				1, false, SystemAccounts.System,
-				comp => {
-					switch (comp.Result) {
-						case ReadStreamResult.Success:
-							if (comp.Events.Any()) {
-								completed?.Invoke(comp.Events.First().OriginalEventNumber, comp.Events.First().OriginalEvent.TimeStamp);
-							} else if (!comp.IsEndOfStream) {
-								BeginReadFirstEvent(comp.NextEventNumber, completed);
-							} else {
-								completed?.Invoke(null, null);
-							}
-
-							break;
-						case ReadStreamResult.NoStream:
-						case ReadStreamResult.StreamDeleted:
-							completed?.Invoke(null, null);
-							break;
-						default:
-							Log.Error(
-								$"An error occured reading the first event in the parked message stream {ParkedStreamId} due to {comp.Result}.");
-							completed?.Invoke(null, null);
-							break;
-					}
-				}, () => {
-					Log.Error(
-						$"Timed out reading the first event in the parked message stream {ParkedStreamId}. Parked message stats may be incorrect.");
-					completed?.Invoke(null, null);
-				}, Guid.NewGuid());
-		}
-
-		private void BeginReadLastEvent(Action<long?> completed) {
-			_ioDispatcher.ReadBackward(
-				ParkedStreamId,
-				-1,
-				1,
-				false,
-				SystemAccounts.System,
-				comp => {
-					switch (comp.Result) {
-						case ReadStreamResult.Success:
-							if (comp.Events.Any()) {
-								completed?.Invoke(comp.Events.Last().OriginalEventNumber);
-							} else {
-								completed?.Invoke(null);
-							}
-
-							break;
-						case ReadStreamResult.NoStream:
-						case ReadStreamResult.StreamDeleted:
-							completed?.Invoke(null);
-							break;
-						default:
-							Log.Error(
-								$"An error occured reading the last event in the parked message stream {ParkedStreamId} due to {comp.Result}.");
-							completed?.Invoke(null);
-							break;
-					}
-				}, () => {
-					Log.Error(
-						$"Timed out reading the last event in the parked message stream {ParkedStreamId}. Parked message stats may be incorrect.");
-					completed?.Invoke(null);
-				}, Guid.NewGuid());
-		}
-
-		public void BeginMarkParkedMessagesReprocessed(long sequence, DateTime? timestamp, bool updateOldestParkedMessage) {
-			BeginMarkParkedMessagesReprocessed(sequence, timestamp, updateOldestParkedMessage, null);
-		}
-
-		public void BeginMarkParkedMessagesReprocessed(long sequence, DateTime? timestamp, bool updateOldestParkedMessage, Action completed) {
-			var metaStreamId = SystemStreams.MetastreamOf(ParkedStreamId);
-			_ioDispatcher.WriteEvent(
-				metaStreamId, ExpectedVersion.Any, CreateStreamMetadataEvent(sequence), SystemAccounts.System,
-				msg => {
-					switch (msg.Result) {
-						case OperationResult.Success:
-							_lastTruncateBefore = sequence;
-							if (updateOldestParkedMessage) _oldestParkedMessage = timestamp;
-							completed?.Invoke();
-							break;
-						default:
-							Log.Error("An error occured truncating the parked message stream {stream} due to {e}.",
-								ParkedStreamId, msg.Result);
-							Log.Error("Messages were not removed on retry");
-							completed?.Invoke();
-							break;
-					}
-				});
-		}
-
-		class ParkedMessageMetadata {
-			public DateTime Added { get; set; }
-			public string Reason { get; set; }
-			public long SubscriptionEventNumber { get; set; }
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionParams.cs b/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionParams.cs
deleted file mode 100644
index 189717397d3..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionParams.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-using System;
-using EventStore.Core.Services.PersistentSubscription.ConsumerStrategy;
-using EventStore.Core.Services.Storage.ReaderIndex;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public class PersistentSubscriptionParams {
-		private readonly bool _resolveLinkTos;
-		private readonly string _subscriptionId;
-		private readonly IPersistentSubscriptionEventSource _eventSource;
-		private readonly string _groupName;
-		private readonly IPersistentSubscriptionStreamPosition _startFrom;
-		private readonly bool _extraStatistics;
-		private readonly TimeSpan _messageTimeout;
-		private readonly TimeSpan _checkPointAfter;
-		private readonly int _minCheckPointCount;
-		private readonly int _maxCheckPointCount;
-		private readonly int _maxSubscriberCount;
-		private readonly IPersistentSubscriptionConsumerStrategy _consumerStrategy;
-
-		private readonly int _maxRetryCount;
-		private readonly int _liveBufferSize;
-		private readonly int _bufferSize;
-		private readonly int _readBatchSize;
-		private readonly IPersistentSubscriptionStreamReader _streamReader;
-		private readonly IPersistentSubscriptionCheckpointReader _checkpointReader;
-		private readonly IPersistentSubscriptionCheckpointWriter _checkpointWriter;
-		private IPersistentSubscriptionMessageParker _messageParker;
-
-		public PersistentSubscriptionParams(bool resolveLinkTos, string subscriptionId,
-			IPersistentSubscriptionEventSource eventSource,
-			string groupName,
-			IPersistentSubscriptionStreamPosition startFrom,
-			bool extraStatistics, TimeSpan messageTimeout,
-			int maxRetryCount, int liveBufferSize, int bufferSize, int readBatchSize,
-			TimeSpan checkPointAfter, int minCheckPointCount,
-			int maxCheckPointCount, int maxSubscriberCount,
-			IPersistentSubscriptionConsumerStrategy consumerStrategy,
-			IPersistentSubscriptionStreamReader streamReader,
-			IPersistentSubscriptionCheckpointReader checkpointReader,
-			IPersistentSubscriptionCheckpointWriter checkpointWriter,
-			IPersistentSubscriptionMessageParker messageParker) {
-			_resolveLinkTos = resolveLinkTos;
-			_subscriptionId = subscriptionId;
-			_eventSource = eventSource;
-			_groupName = groupName;
-			_startFrom = startFrom;
-			_extraStatistics = extraStatistics;
-			_messageTimeout = messageTimeout;
-			_maxRetryCount = maxRetryCount;
-			_liveBufferSize = liveBufferSize;
-			_bufferSize = bufferSize;
-			_checkPointAfter = checkPointAfter;
-			_minCheckPointCount = minCheckPointCount;
-			_maxCheckPointCount = maxCheckPointCount;
-			_maxSubscriberCount = maxSubscriberCount;
-			_consumerStrategy = consumerStrategy;
-			_readBatchSize = readBatchSize;
-			_streamReader = streamReader;
-			_checkpointReader = checkpointReader;
-			_checkpointWriter = checkpointWriter;
-			_messageParker = messageParker;
-		}
-
-		public bool ResolveLinkTos {
-			get { return _resolveLinkTos; }
-		}
-
-		public string SubscriptionId {
-			get { return _subscriptionId; }
-		}
-
-		public IPersistentSubscriptionEventSource EventSource {
-			get { return _eventSource; }
-		}
-
-		public string GroupName {
-			get { return _groupName; }
-		}
-
-		public IPersistentSubscriptionStreamPosition StartFrom {
-			get { return _startFrom; }
-		}
-
-		public bool ExtraStatistics {
-			get { return _extraStatistics; }
-		}
-
-		public TimeSpan MessageTimeout {
-			get { return _messageTimeout; }
-		}
-
-		public IPersistentSubscriptionStreamReader StreamReader {
-			get { return _streamReader; }
-		}
-
-		public IPersistentSubscriptionCheckpointReader CheckpointReader {
-			get { return _checkpointReader; }
-		}
-
-		public IPersistentSubscriptionCheckpointWriter CheckpointWriter {
-			get { return _checkpointWriter; }
-		}
-
-		public IPersistentSubscriptionMessageParker MessageParker {
-			get { return _messageParker; }
-		}
-
-		public int MaxRetryCount {
-			get { return _maxRetryCount; }
-		}
-
-		public int LiveBufferSize {
-			get { return _liveBufferSize; }
-		}
-
-		public int BufferSize {
-			get { return _bufferSize; }
-		}
-
-		public int ReadBatchSize {
-			get { return _readBatchSize; }
-		}
-
-		public TimeSpan CheckPointAfter {
-			get { return _checkPointAfter; }
-		}
-
-		public int MinCheckPointCount {
-			get { return _minCheckPointCount; }
-		}
-
-		public int MaxCheckPointCount {
-			get { return _maxCheckPointCount; }
-		}
-
-		public int MaxSubscriberCount {
-			get { return _maxSubscriberCount; }
-		}
-
-		public IPersistentSubscriptionConsumerStrategy ConsumerStrategy {
-			get { return _consumerStrategy; }
-		}
-
-		public string ParkedMessageStream {
-			get { return "$persistentsubscription-" + _eventSource + "::" + _groupName + "-parked"; }
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionParamsBuilder.cs b/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionParamsBuilder.cs
deleted file mode 100644
index 32b66b522f6..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionParamsBuilder.cs
+++ /dev/null
@@ -1,316 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Services.PersistentSubscription.ConsumerStrategy;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	/// <summary>
-	/// Builds a <see cref="PersistentSubscriptionParams"/> object.
-	/// </summary>
-	public abstract class PersistentSubscriptionParamsBuilder {
-		private bool _resolveLinkTos;
-		private IPersistentSubscriptionStreamPosition _startFrom;
-		private bool _recordStatistics;
-		private TimeSpan _timeout;
-		private int _readBatchSize;
-		private int _maxRetryCount;
-		private int _liveBufferSize;
-		private int _historyBufferSize;
-		private string _subscriptionId;
-		private IPersistentSubscriptionEventSource _eventSource;
-		private string _groupName;
-		private IPersistentSubscriptionStreamReader _streamReader;
-		private IPersistentSubscriptionCheckpointReader _checkpointReader;
-		private IPersistentSubscriptionCheckpointWriter _checkpointWriter;
-		private IPersistentSubscriptionMessageParker _messageParker;
-		private TimeSpan _checkPointAfter;
-		private int _minCheckPointCount;
-		private int _maxCheckPointCount;
-		private int _maxSubscriberCount;
-		private IPersistentSubscriptionConsumerStrategy _consumerStrategy;
-
-		/// <summary>
-		/// Sets the checkpoint reader for the instance
-		/// </summary>
-		/// <param name="reader"></param>
-		/// <returns></returns>
-		public PersistentSubscriptionParamsBuilder
-			WithCheckpointReader(IPersistentSubscriptionCheckpointReader reader) {
-			_checkpointReader = reader;
-			return this;
-		}
-
-		/// <summary>
-		/// Sets the group that the subscription belongs to
-		/// </summary>
-		/// <param name="groupName"></param>
-		/// <returns></returns>
-		public PersistentSubscriptionParamsBuilder SetGroup(string groupName) {
-			_groupName = groupName;
-			return this;
-		}
-
-		/// <summary>
-		/// Sets the unique subscription id of the subscription
-		/// </summary>
-		/// <param name="subscriptionId"></param>
-		/// <returns></returns>
-		public PersistentSubscriptionParamsBuilder SetSubscriptionId(string subscriptionId) {
-			_subscriptionId = subscriptionId;
-			return this;
-		}
-
-		/// <summary>
-		/// Sets the event source of the subscription
-		/// </summary>
-		/// <param name="eventSource"></param>
-		/// <returns></returns>
-		public PersistentSubscriptionParamsBuilder WithEventSource(IPersistentSubscriptionEventSource eventSource) {
-			_eventSource = eventSource;
-			return this;
-		}
-
-		/// <summary>
-		/// Sets the message parker for the instance
-		/// </summary>
-		/// <param name="parker"></param>
-		/// <returns></returns>
-		public PersistentSubscriptionParamsBuilder WithMessageParker(IPersistentSubscriptionMessageParker parker) {
-			_messageParker = parker;
-			return this;
-		}
-
-		/// <summary>
-		/// Sets the check point reader for the subscription
-		/// </summary>
-		/// <param name="writer"></param>
-		/// <returns></returns>
-		public PersistentSubscriptionParamsBuilder
-			WithCheckpointWriter(IPersistentSubscriptionCheckpointWriter writer) {
-			_checkpointWriter = writer;
-			return this;
-		}
-
-		/// <summary>
-		/// Sets the event loader for the subscription
-		/// </summary>
-		/// <param name="loader"></param>
-		/// <returns></returns>
-		public PersistentSubscriptionParamsBuilder WithEventLoader(IPersistentSubscriptionStreamReader loader) {
-			_streamReader = loader;
-			return this;
-		}
-
-		/// <summary>
-		/// Sets the option to include further latency statistics. These statistics have a cost and should not be used
-		/// in high performance situations.
-		/// </summary>
-		/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
-		public PersistentSubscriptionParamsBuilder WithExtraStatistics() {
-			_recordStatistics = true;
-			return this;
-		}
-
-		/// <summary>
-		/// Sets the option to resolve linktos on events that are found for this subscription.
-		/// </summary>
-		/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
-		public PersistentSubscriptionParamsBuilder ResolveLinkTos() {
-			_resolveLinkTos = true;
-			return this;
-		}
-
-		/// <summary>
-		/// Sets the option to not resolve linktos on events that are found for this subscription.
-		/// </summary>
-		/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
-		public PersistentSubscriptionParamsBuilder DoNotResolveLinkTos() {
-			_resolveLinkTos = false;
-			return this;
-		}
-
-		/// <summary>
-		/// If set the subscription will prefer if possible to round robin between the clients that
-		/// are connected.
-		/// </summary>
-		/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
-		public PersistentSubscriptionParamsBuilder PreferRoundRobin() {
-			_consumerStrategy = new RoundRobinPersistentSubscriptionConsumerStrategy();
-			return this;
-		}
-
-		/// <summary>
-		/// If set the subscription will prefer if possible to dispatch only to a single of the connected
-		/// clients. If however the buffer limits are reached on that client it will begin sending to other 
-		/// clients.
-		/// </summary>
-		/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
-		public PersistentSubscriptionParamsBuilder PreferDispatchToSingle() {
-			_consumerStrategy = new DispatchToSinglePersistentSubscriptionConsumerStrategy();
-			return this;
-		}
-
-		/// <summary>
-		/// Sets the consumer strategy to the one provided.
-		/// </summary>
-		/// <param name="consumerStrategy"></param>
-		/// <returns></returns>
-		public PersistentSubscriptionParamsBuilder CustomConsumerStrategy(
-			IPersistentSubscriptionConsumerStrategy consumerStrategy) {
-			_consumerStrategy = consumerStrategy;
-			return this;
-		}
-
-		/// <summary>
-		/// Sets that the subscription should start from a specified location.
-		/// </summary>
-		/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
-		public PersistentSubscriptionParamsBuilder StartFrom(IPersistentSubscriptionStreamPosition startFrom) {
-			_startFrom = startFrom;
-			return this;
-		}
-
-		public abstract PersistentSubscriptionParamsBuilder StartFromBeginning();
-
-		public abstract PersistentSubscriptionParamsBuilder StartFromCurrent();
-
-		/// <summary>
-		/// Sets the timeout timespan to about 30k years.
-		/// </summary>
-		/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
-		public PersistentSubscriptionParamsBuilder DontTimeoutMessages() {
-			_timeout = TimeSpan.MaxValue;
-			return this;
-		}
-
-		/// <summary>
-		/// Sets the time after which the subscription should be checkpointed
-		/// </summary>
-		/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
-		public PersistentSubscriptionParamsBuilder CheckPointAfter(TimeSpan time) {
-			_checkPointAfter = time;
-			return this;
-		}
-
-		/// <summary>
-		/// Sets the minimum number of items to checkpoint
-		/// </summary>
-		/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
-		public PersistentSubscriptionParamsBuilder MinimumToCheckPoint(int count) {
-			_minCheckPointCount = count;
-			return this;
-		}
-
-		/// <summary>
-		/// Sets the maximum number of items to checkpoint
-		/// </summary>
-		/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
-		public PersistentSubscriptionParamsBuilder MaximumToCheckPoint(int count) {
-			_maxCheckPointCount = count;
-			return this;
-		}
-
-		/// <summary>
-		/// Sets the maximum number of subscribers
-		/// </summary>
-		/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
-		public PersistentSubscriptionParamsBuilder MaximumSubscribers(int count) {
-			_maxSubscriberCount = count;
-			return this;
-		}
-
-		/// <summary>
-		/// Sets the timeout for a message (will be retried if an ack is not received within this timespan)
-		/// </summary>
-		/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
-		public PersistentSubscriptionParamsBuilder WithMessageTimeoutOf(TimeSpan timeout) {
-			_timeout = timeout;
-			return this;
-		}
-
-		/// <summary>
-		/// Sets the number of times a message should be retried before being considered a bad message
-		/// </summary>
-		/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
-		public PersistentSubscriptionParamsBuilder WithMaxRetriesOf(int count) {
-			Ensure.Nonnegative(count, "count");
-			_maxRetryCount = count;
-			return this;
-		}
-
-		/// <summary>
-		/// Sets the size of the live buffer for the subscription. This is the buffer used 
-		/// to cache messages while sending messages as they happen. The count is
-		/// in terms of the number of messages to cache.
-		/// </summary>
-		/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
-		public PersistentSubscriptionParamsBuilder WithLiveBufferSizeOf(int count) {
-			Ensure.Nonnegative(count, "count");
-			_liveBufferSize = count;
-			return this;
-		}
-
-
-		/// <summary>
-		/// Sets the size of the read batch used when paging in history for the subscription
-		/// sizes should not be too big ...
-		/// </summary>
-		/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
-		public PersistentSubscriptionParamsBuilder WithReadBatchOf(int count) {
-			Ensure.Nonnegative(count, "count");
-			_readBatchSize = count;
-			return this;
-		}
-
-
-		/// <summary>
-		/// Sets the size of the read batch used when paging in history for the subscription
-		/// sizes should not be too big ...
-		/// </summary>
-		/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
-		public PersistentSubscriptionParamsBuilder WithHistoryBufferSizeOf(int count) {
-			Ensure.Nonnegative(count, "count");
-			_historyBufferSize = count;
-			return this;
-		}
-
-		/// <summary>
-		/// Sets the size of the read batch used when paging in history for the subscription
-		/// sizes should not be too big ...
-		/// </summary>
-		/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
-		public PersistentSubscriptionParamsBuilder WithNamedConsumerStrategy(
-			IPersistentSubscriptionConsumerStrategy consumerStrategy) {
-			Ensure.NotNull(consumerStrategy, "consumerStrategy");
-			_consumerStrategy = consumerStrategy;
-			return this;
-		}
-
-		/// <summary>
-		/// Builds a <see cref="PersistentSubscriptionParams"/> object from a <see cref="PersistentSubscriptionParamsBuilder"/>.
-		/// </summary>
-		/// <param name="builder"><see cref="PersistentSubscriptionParamsBuilder"/> from which to build a <see cref="PersistentSubscriptionParamsBuilder"/></param>
-		/// <returns></returns>
-		public static implicit operator PersistentSubscriptionParams(PersistentSubscriptionParamsBuilder builder) {
-			return new PersistentSubscriptionParams(builder._resolveLinkTos,
-				builder._subscriptionId,
-				builder._eventSource,
-				builder._groupName,
-				builder._startFrom,
-				builder._recordStatistics,
-				builder._timeout,
-				builder._maxRetryCount,
-				builder._liveBufferSize,
-				builder._historyBufferSize,
-				builder._readBatchSize,
-				builder._checkPointAfter,
-				builder._minCheckPointCount,
-				builder._maxCheckPointCount,
-				builder._maxSubscriberCount,
-				builder._consumerStrategy,
-				builder._streamReader,
-				builder._checkpointReader,
-				builder._checkpointWriter,
-				builder._messageParker);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionService.cs b/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionService.cs
deleted file mode 100644
index ea5a0c9ec83..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionService.cs
+++ /dev/null
@@ -1,1377 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json.Nodes;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Metrics;
-using EventStore.Core.Services.PersistentSubscription.ConsumerStrategy;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.Telemetry;
-using ILogger = Serilog.ILogger;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public abstract class PersistentSubscriptionService {
-		protected static readonly ILogger Log = Serilog.Log.ForContext<PersistentSubscriptionService>();
-	}
-
-	public class PersistentSubscriptionService<TStreamId> :
-		PersistentSubscriptionService,
-		IHandle<SystemMessage.BecomeShuttingDown>,
-		IHandle<TcpMessage.ConnectionClosed>,
-		IHandle<SystemMessage.BecomeLeader>,
-		IHandle<SubscriptionMessage.PersistentSubscriptionsRestart>,
-		IHandle<SubscriptionMessage.PersistentSubscriptionTimerTick>,
-		IHandle<ClientMessage.ReplayParkedMessages>,
-		IHandle<ClientMessage.ReplayParkedMessage>,
-		IHandle<SystemMessage.StateChangeMessage>,
-		IHandle<ClientMessage.ConnectToPersistentSubscriptionToStream>,
-		IHandle<ClientMessage.ConnectToPersistentSubscriptionToAll>,
-		IHandle<StorageMessage.EventCommitted>,
-		IHandle<ClientMessage.UnsubscribeFromStream>,
-		IHandle<ClientMessage.PersistentSubscriptionAckEvents>,
-		IHandle<ClientMessage.PersistentSubscriptionNackEvents>,
-		IHandle<ClientMessage.CreatePersistentSubscriptionToStream>,
-		IHandle<ClientMessage.UpdatePersistentSubscriptionToStream>,
-		IHandle<ClientMessage.DeletePersistentSubscriptionToStream>,
-		IHandle<ClientMessage.CreatePersistentSubscriptionToAll>,
-		IHandle<ClientMessage.UpdatePersistentSubscriptionToAll>,
-		IHandle<ClientMessage.DeletePersistentSubscriptionToAll>,
-		IHandle<ClientMessage.ReadNextNPersistentMessages>,
-		IHandle<TelemetryMessage.Request>,
-		IHandle<MonitoringMessage.GetAllPersistentSubscriptionStats>,
-		IHandle<MonitoringMessage.GetPersistentSubscriptionStats>,
-		IHandle<MonitoringMessage.GetStreamPersistentSubscriptionStats> {
-
-		private Dictionary<string, List<PersistentSubscription>> _subscriptionTopics;
-		private Dictionary<string, PersistentSubscription> _subscriptionsById;
-
-		private readonly IQueuedHandler _queuedHandler;
-		private readonly IReadIndex<TStreamId> _readIndex;
-		private readonly IODispatcher _ioDispatcher;
-		private readonly IPublisher _bus;
-		private readonly PersistentSubscriptionConsumerStrategyRegistry _consumerStrategyRegistry;
-		private readonly IPersistentSubscriptionCheckpointReader _checkpointReader;
-		private readonly IPersistentSubscriptionStreamReader _streamReader;
-		private PersistentSubscriptionConfig _config = new PersistentSubscriptionConfig();
-		private bool _started = false;
-		private VNodeState _state;
-		private Guid _timerTickCorrelationId;
-		private bool _handleTick;
-		private readonly IPersistentSubscriptionTracker _persistentSubscriptionTracker;
-		private static List<MonitoringMessage.PersistentSubscriptionInfo> SubscriptionStats = [];
-		private readonly TimeSpan _interval = TimeSpan.FromSeconds(1);
-		private readonly TimerMessage.Schedule _getStats;
-
-		public PersistentSubscriptionService(IQueuedHandler queuedHandler, IReadIndex<TStreamId> readIndex,
-			IODispatcher ioDispatcher, IPublisher bus,
-			PersistentSubscriptionConsumerStrategyRegistry consumerStrategyRegistry,
-			IPersistentSubscriptionTracker persistentSubscriptionTracker) {
-			Ensure.NotNull(queuedHandler, "queuedHandler");
-			Ensure.NotNull(readIndex, "readIndex");
-			Ensure.NotNull(ioDispatcher, "ioDispatcher");
-
-			_queuedHandler = queuedHandler;
-			_readIndex = readIndex;
-			_ioDispatcher = ioDispatcher;
-			_bus = bus;
-			_consumerStrategyRegistry = consumerStrategyRegistry;
-			_checkpointReader = new PersistentSubscriptionCheckpointReader(_ioDispatcher);
-			_streamReader = new PersistentSubscriptionStreamReader(_ioDispatcher, 100);
-			_timerTickCorrelationId = Guid.NewGuid();
-			_persistentSubscriptionTracker = persistentSubscriptionTracker;
-			_getStats = TimerMessage.Schedule.Create(_interval, _bus,
-				new MonitoringMessage.GetAllPersistentSubscriptionStats(
-					new CallbackEnvelope(PushStatsToPersistentSubscriptionTracker)));
-		}
-
-		private void PushStatsToPersistentSubscriptionTracker(Message message) {
-			if (message is MonitoringMessage.GetPersistentSubscriptionStatsCompleted stats) {
-				SubscriptionStats = stats.SubscriptionStats;
-				if (SubscriptionStats != null) {
-					_persistentSubscriptionTracker.OnNewStats(SubscriptionStats);
-				}
-			}
-			_bus.Publish(_getStats);
-		}
-
-		public List<MonitoringMessage.PersistentSubscriptionInfo> GetPersistentSubscriptionStats() {
-			return SubscriptionStats;
-		}
-
-		public void InitToEmpty() {
-			_handleTick = false;
-			_subscriptionTopics = new Dictionary<string, List<PersistentSubscription>>();
-			_subscriptionsById = new Dictionary<string, PersistentSubscription>();
-		}
-
-		public void Handle(SystemMessage.StateChangeMessage message) {
-			_state = message.State;
-
-			if (message.State == VNodeState.Leader) return;
-			Log.Debug("Persistent subscriptions received state change to {state}. Stopping listening", _state);
-			ShutdownSubscriptions();
-			Stop();
-		}
-
-		public void Handle(SystemMessage.BecomeLeader message) {
-			Log.Debug("Persistent subscriptions Became Leader so now handling subscriptions");
-			StartSubscriptions();
-		}
-
-		public void Handle(SubscriptionMessage.PersistentSubscriptionsRestart message) {
-			if (!_started) {
-				message.ReplyEnvelope.ReplyWith(new SubscriptionMessage.InvalidPersistentSubscriptionsRestart("The Persistent Subscriptions subsystem cannot be restarted because it is not started."));
-				return;
-			}
-
-			Log.Debug("Persistent Subscriptions are being restarted");
-			message.ReplyEnvelope.ReplyWith(new SubscriptionMessage.PersistentSubscriptionsRestarting());
-
-			Stop();
-			ShutdownSubscriptions();
-			StartSubscriptions();
-		}
-
-		private void StartSubscriptions() {
-			InitToEmpty();
-			_handleTick = true;
-			_timerTickCorrelationId = Guid.NewGuid();
-			_bus.Publish(TimerMessage.Schedule.Create(TimeSpan.FromMilliseconds(1000),
-				_bus,
-				new SubscriptionMessage.PersistentSubscriptionTimerTick(_timerTickCorrelationId)));
-			LoadConfiguration(Start);
-		}
-
-		public void Handle(SystemMessage.BecomeShuttingDown message) {
-			ShutdownSubscriptions();
-			Stop();
-			_queuedHandler.RequestStop();
-		}
-
-		private void ShutdownSubscriptions() {
-			if (_subscriptionsById == null) return;
-			foreach (var subscription in _subscriptionsById.Values) {
-				subscription.Shutdown();
-			}
-		}
-
-		public void Start() {
-			_started = true;
-			_bus.Publish(new SubscriptionMessage.PersistentSubscriptionsStarted());
-			_bus.Publish(_getStats);
-			Log.Debug("Persistent Subscriptions have been started.");
-		}
-
-		public void Stop() {
-			_started = false;
-			_bus.Publish(new SubscriptionMessage.PersistentSubscriptionsStopped());
-			Log.Debug("Persistent Subscriptions have been stopped.");
-		}
-
-		public void Handle(ClientMessage.UnsubscribeFromStream message) {
-			if (!_started) return;
-			UnsubscribeFromStream(message.CorrelationId, true);
-		}
-
-		private bool ValidateStartFrom(IPersistentSubscriptionStreamPosition startFromPosition, out string error) {
-			switch (startFromPosition)
-			{
-				case PersistentSubscriptionSingleStreamPosition startFromStream:
-				{
-					if (startFromStream.StreamEventNumber < -1) {
-						error = "Invalid Start From position: event number must be greater than or equal to -1.";
-						return false;
-					}
-
-					error = null;
-					return true;
-				}
-				case PersistentSubscriptionAllStreamPosition startFromAll:
-				{
-					var (commit, prepare) = startFromAll.TFPosition;
-
-					if (prepare > commit) {
-						error = "Invalid Start From position: prepare position must be less than or equal to the commit position.";
-						return false;
-					}
-
-					if (commit > _readIndex.LastIndexedPosition) {
-						error =
-							"Invalid Start From position: commit position must be less than or equal to the last commit position in the transaction file.";
-						return false;
-					}
-
-					if ((prepare <= -1 || commit <= -1) && !(prepare == -1 && commit == -1)) {
-						error =
-							"Invalid Start From position: prepare and commit positions must be greater than or equal to 0 or both equal to -1.";
-						return false;
-					}
-
-					error = null;
-					return true;
-				}
-				default:
-					throw new InvalidOperationException();
-			}
-		}
-
-		private void CreatePersistentSubscription(
-				IPersistentSubscriptionEventSource eventSource,
-				string groupName,
-				IPersistentSubscriptionStreamPosition startFrom,
-				int messageTimeoutMilliseconds,
-				bool resolveLinkTos,
-				int maxRetryCount,
-				int bufferSize,
-				int liveBufferSize,
-				int readBatchSize,
-				int maxSubscriberCount,
-				string namedConsumerStrategy,
-				int maxCheckPointCount,
-				int minCheckPointCount,
-				int checkPointAfterMilliseconds,
-				bool recordStatistics,
-				Action<string> onSuccess,
-				Action<string> onFail,
-				Action<string> onExists,
-				Action<string> onAccessDenied,
-				string user
-		) {
-			if (!_started) return;
-			var stream = eventSource.ToString();
-			var key = BuildSubscriptionGroupKey(stream, groupName);
-			Log.Debug("Creating persistent subscription {subscriptionKey}", key);
-
-			if (!_consumerStrategyRegistry.ValidateStrategy(namedConsumerStrategy)) {
-				onFail($"Consumer strategy {namedConsumerStrategy} does not exist.");
-				return;
-			}
-
-			if (!ValidateStartFrom(startFrom, out var startFromValidationError)) {
-				onFail(startFromValidationError);
-				return;
-			}
-
-			var result = TryCreateSubscriptionGroup(eventSource,
-				groupName,
-				resolveLinkTos,
-				startFrom,
-				recordStatistics,
-				maxRetryCount,
-				liveBufferSize,
-				bufferSize,
-				readBatchSize,
-				ToCheckPointAfterTimeout(checkPointAfterMilliseconds),
-				minCheckPointCount,
-				maxCheckPointCount,
-				maxSubscriberCount,
-				namedConsumerStrategy,
-				ToMessageTimeout(messageTimeoutMilliseconds)
-			);
-
-			if (!result) {
-				onExists($"Group '{groupName}' already exists.");
-				return;
-			}
-
-			Log.Debug("New persistent subscription {subscriptionKey}", key);
-			var createEntry = new PersistentSubscriptionEntry {
-				Stream = stream, //'Stream' name kept for backward compatibility
-				Filter = EventFilter.ParseToDto(eventSource.EventFilter),
-				Group = groupName,
-				ResolveLinkTos = resolveLinkTos,
-				CheckPointAfter = checkPointAfterMilliseconds,
-				ExtraStatistics = recordStatistics,
-				HistoryBufferSize = bufferSize,
-				LiveBufferSize = liveBufferSize,
-				MaxCheckPointCount = maxCheckPointCount,
-				MinCheckPointCount = minCheckPointCount,
-				MaxRetryCount = maxRetryCount,
-				ReadBatchSize = readBatchSize,
-				MaxSubscriberCount = maxSubscriberCount,
-				MessageTimeout = messageTimeoutMilliseconds,
-				NamedConsumerStrategy = namedConsumerStrategy,
-				#pragma warning disable 612
-				StartFrom = startFrom is PersistentSubscriptionSingleStreamPosition x ? x.StreamEventNumber : long.MinValue,
-				#pragma warning restore 612
-				StartPosition = startFrom.ToString()
-			};
-			UpdateSubscriptionConfig(user, stream, groupName, createEntry);
-			SaveConfiguration(() => onSuccess(""));
-		}
-
-		public void Handle(ClientMessage.CreatePersistentSubscriptionToStream message) {
-			if (string.IsNullOrEmpty(message.EventStreamId)) {
-				message.Envelope.ReplyWith(new ClientMessage.CreatePersistentSubscriptionToStreamCompleted(
-					message.CorrelationId,
-					ClientMessage.CreatePersistentSubscriptionToStreamCompleted
-						.CreatePersistentSubscriptionToStreamResult.Fail,
-					"Bad stream name."));
-				return;
-			}
-
-			if (message.EventStreamId == SystemStreams.AllStream) {
-				message.Envelope.ReplyWith(new ClientMessage.CreatePersistentSubscriptionToStreamCompleted(
-					message.CorrelationId,
-					ClientMessage.CreatePersistentSubscriptionToStreamCompleted
-						.CreatePersistentSubscriptionToStreamResult.Fail,
-					"Persistent subscriptions to $all are only supported over gRPC through gRPC clients"));
-				return;
-			}
-
-			try {
-				CreatePersistentSubscription(
-					new PersistentSubscriptionSingleStreamEventSource(message.EventStreamId),
-					message.GroupName,
-					new PersistentSubscriptionSingleStreamPosition(message.StartFrom),
-					message.MessageTimeoutMilliseconds,
-					message.ResolveLinkTos,
-					message.MaxRetryCount,
-					message.BufferSize,
-					message.LiveBufferSize,
-					message.ReadBatchSize,
-					message.MaxSubscriberCount,
-					message.NamedConsumerStrategy,
-					message.MaxCheckPointCount,
-					message.MinCheckPointCount,
-					message.CheckPointAfterMilliseconds,
-					message.RecordStatistics,
-					(msg) => {
-						message.Envelope.ReplyWith(
-							new ClientMessage.CreatePersistentSubscriptionToStreamCompleted(
-								message.CorrelationId,
-								ClientMessage.CreatePersistentSubscriptionToStreamCompleted
-									.CreatePersistentSubscriptionToStreamResult.Success,
-								msg));
-					},
-					(error) => {
-						message.Envelope.ReplyWith(new ClientMessage.CreatePersistentSubscriptionToStreamCompleted(
-							message.CorrelationId,
-							ClientMessage.CreatePersistentSubscriptionToStreamCompleted
-								.CreatePersistentSubscriptionToStreamResult.Fail,
-							error));
-					},
-					(error) => {
-						message.Envelope.ReplyWith(new ClientMessage.CreatePersistentSubscriptionToStreamCompleted(
-							message.CorrelationId,
-							ClientMessage.CreatePersistentSubscriptionToStreamCompleted
-								.CreatePersistentSubscriptionToStreamResult.AlreadyExists,
-							error));
-					},
-					(error) => {
-						message.Envelope.ReplyWith(new ClientMessage.CreatePersistentSubscriptionToStreamCompleted(
-							message.CorrelationId,
-							ClientMessage.CreatePersistentSubscriptionToStreamCompleted
-								.CreatePersistentSubscriptionToStreamResult.AccessDenied,
-							error));
-					},
-					message.User?.Identity?.Name
-				);
-			} catch (Exception ex) {
-				message.Envelope.ReplyWith(new ClientMessage.CreatePersistentSubscriptionToStreamCompleted(
-					message.CorrelationId,
-					ClientMessage.CreatePersistentSubscriptionToStreamCompleted
-						.CreatePersistentSubscriptionToStreamResult.Fail,
-					ex.Message));
-			}
-		}
-
-		public void Handle(ClientMessage.CreatePersistentSubscriptionToAll message) {
-			try {
-				CreatePersistentSubscription(
-					new PersistentSubscriptionAllStreamEventSource(message.EventFilter),
-					message.GroupName,
-					new PersistentSubscriptionAllStreamPosition(message.StartFrom.CommitPosition,
-						message.StartFrom.PreparePosition),
-					message.MessageTimeoutMilliseconds,
-					message.ResolveLinkTos,
-					message.MaxRetryCount,
-					message.BufferSize,
-					message.LiveBufferSize,
-					message.ReadBatchSize,
-					message.MaxSubscriberCount,
-					message.NamedConsumerStrategy,
-					message.MaxCheckPointCount,
-					message.MinCheckPointCount,
-					message.CheckPointAfterMilliseconds,
-					message.RecordStatistics,
-					(msg) => {
-						message.Envelope.ReplyWith(
-							new ClientMessage.CreatePersistentSubscriptionToAllCompleted(
-								message.CorrelationId,
-								ClientMessage.CreatePersistentSubscriptionToAllCompleted
-									.CreatePersistentSubscriptionToAllResult.Success,
-								msg));
-					},
-					(error) => {
-						message.Envelope.ReplyWith(new ClientMessage.CreatePersistentSubscriptionToAllCompleted(
-							message.CorrelationId,
-							ClientMessage.CreatePersistentSubscriptionToAllCompleted
-								.CreatePersistentSubscriptionToAllResult.Fail,
-							error));
-					},
-					(error) => {
-						message.Envelope.ReplyWith(new ClientMessage.CreatePersistentSubscriptionToAllCompleted(
-							message.CorrelationId,
-							ClientMessage.CreatePersistentSubscriptionToAllCompleted
-								.CreatePersistentSubscriptionToAllResult.AlreadyExists,
-							error));
-					},
-					(error) => {
-						message.Envelope.ReplyWith(new ClientMessage.CreatePersistentSubscriptionToAllCompleted(
-							message.CorrelationId,
-							ClientMessage.CreatePersistentSubscriptionToAllCompleted
-								.CreatePersistentSubscriptionToAllResult.AccessDenied,
-							error));
-					},
-					message.User?.Identity?.Name
-				);
-			} catch (Exception ex) {
-				message.Envelope.ReplyWith(new ClientMessage.CreatePersistentSubscriptionToAllCompleted(
-					message.CorrelationId,
-					ClientMessage.CreatePersistentSubscriptionToAllCompleted.CreatePersistentSubscriptionToAllResult.Fail,
-					ex.Message));
-			}
-
-		}
-
-		private void UpdatePersistentSubscription(
-				string stream,
-				Func<PersistentSubscription, IPersistentSubscriptionEventSource> genEventSource,
-				string groupName,
-				IPersistentSubscriptionStreamPosition startFrom,
-				int messageTimeoutMilliseconds,
-				bool resolveLinkTos,
-				int maxRetryCount,
-				int bufferSize,
-				int liveBufferSize,
-				int readBatchSize,
-				int maxSubscriberCount,
-				string namedConsumerStrategy,
-				int maxCheckPointCount,
-				int minCheckPointCount,
-				int checkPointAfterMilliseconds,
-				bool recordStatistics,
-				Action<string> onSuccess,
-				Action<string> onFail,
-				Action<string> onNotExist,
-				Action<string> onAccessDenied,
-				string user
-		) {
-			if (!_started) return;
-
-			var key = BuildSubscriptionGroupKey(stream, groupName);
-			Log.Debug("Updating persistent subscription {subscriptionKey}", key);
-
-			if (!_subscriptionsById.TryGetValue(key, out var oldSubscription)) {
-				onNotExist($"Group '{groupName}' does not exist.");
-				return;
-			}
-
-			if (!_consumerStrategyRegistry.ValidateStrategy(namedConsumerStrategy)) {
-				onFail($"Consumer strategy {namedConsumerStrategy} does not exist.");
-				return;
-			}
-
-			if (!ValidateStartFrom(startFrom, out var startFromValidationError)) {
-				onFail(startFromValidationError);
-				return;
-			}
-
-			var eventSource = genEventSource(oldSubscription);
-			var subscription = new PersistentSubscription(
-				new PersistentSubscriptionParams(
-					resolveLinkTos,
-					key,
-					eventSource,
-					groupName,
-					startFrom,
-					recordStatistics,
-					ToMessageTimeout(messageTimeoutMilliseconds),
-					maxRetryCount,
-					liveBufferSize,
-					bufferSize,
-					readBatchSize,
-					ToCheckPointAfterTimeout(checkPointAfterMilliseconds),
-					minCheckPointCount,
-					maxCheckPointCount,
-					maxSubscriberCount,
-					_consumerStrategyRegistry.GetInstance(namedConsumerStrategy, key),
-					_streamReader,
-					_checkpointReader,
-					new PersistentSubscriptionCheckpointWriter(key, _ioDispatcher),
-					new PersistentSubscriptionMessageParker(key, _ioDispatcher)));
-
-			var updateEntry = new PersistentSubscriptionEntry {
-				Stream = stream, //'Stream' name kept for backward compatibility
-				Group = groupName,
-				Filter = EventFilter.ParseToDto(eventSource.EventFilter),
-				ResolveLinkTos = resolveLinkTos,
-				CheckPointAfter = checkPointAfterMilliseconds,
-				ExtraStatistics = recordStatistics,
-				HistoryBufferSize = bufferSize,
-				LiveBufferSize = liveBufferSize,
-				MaxCheckPointCount = maxCheckPointCount,
-				MinCheckPointCount = minCheckPointCount,
-				MaxRetryCount = maxRetryCount,
-				ReadBatchSize = readBatchSize,
-				MaxSubscriberCount = maxSubscriberCount,
-				MessageTimeout = messageTimeoutMilliseconds,
-				NamedConsumerStrategy = namedConsumerStrategy,
-				#pragma warning disable 612
-				StartFrom = startFrom is PersistentSubscriptionSingleStreamPosition x
-					? x.StreamEventNumber
-					: long.MinValue,
-				#pragma warning restore 612
-				StartPosition = startFrom.ToString()
-			};
-
-			UpdateSubscription(stream, groupName, subscription);
-			UpdateSubscriptionConfig(user, stream, groupName, updateEntry);
-			SaveConfiguration(() => onSuccess(""));
-		}
-
-		public void Handle(ClientMessage.UpdatePersistentSubscriptionToStream message) {
-			if (string.IsNullOrEmpty(message.EventStreamId)) {
-				message.Envelope.ReplyWith(new ClientMessage.UpdatePersistentSubscriptionToStreamCompleted(
-					message.CorrelationId,
-					ClientMessage.UpdatePersistentSubscriptionToStreamCompleted
-						.UpdatePersistentSubscriptionToStreamResult.Fail,
-					"Bad stream name."));
-				return;
-			}
-
-			if (message.EventStreamId == SystemStreams.AllStream) {
-				message.Envelope.ReplyWith(new ClientMessage.UpdatePersistentSubscriptionToStreamCompleted(
-					message.CorrelationId,
-					ClientMessage.UpdatePersistentSubscriptionToStreamCompleted
-						.UpdatePersistentSubscriptionToStreamResult.Fail,
-					"Persistent subscriptions to $all are only supported over gRPC through gRPC clients"));
-				return;
-			}
-
-			try {
-				UpdatePersistentSubscription(
-					message.EventStreamId,
-					_ => new PersistentSubscriptionSingleStreamEventSource(message.EventStreamId),
-					message.GroupName,
-					new PersistentSubscriptionSingleStreamPosition(message.StartFrom),
-					message.MessageTimeoutMilliseconds,
-					message.ResolveLinkTos,
-					message.MaxRetryCount,
-					message.BufferSize,
-					message.LiveBufferSize,
-					message.ReadBatchSize,
-					message.MaxSubscriberCount,
-					message.NamedConsumerStrategy,
-					message.MaxCheckPointCount,
-					message.MinCheckPointCount,
-					message.CheckPointAfterMilliseconds,
-					message.RecordStatistics,
-					(msg) => {
-						message.Envelope.ReplyWith(
-							new ClientMessage.UpdatePersistentSubscriptionToStreamCompleted(
-								message.CorrelationId,
-								ClientMessage.UpdatePersistentSubscriptionToStreamCompleted
-									.UpdatePersistentSubscriptionToStreamResult.Success,
-								msg));
-					},
-					(error) => {
-						message.Envelope.ReplyWith(new ClientMessage.UpdatePersistentSubscriptionToStreamCompleted(
-							message.CorrelationId,
-							ClientMessage.UpdatePersistentSubscriptionToStreamCompleted
-								.UpdatePersistentSubscriptionToStreamResult.Fail,
-							error));
-					},
-					(error) => {
-						message.Envelope.ReplyWith(new ClientMessage.UpdatePersistentSubscriptionToStreamCompleted(
-							message.CorrelationId,
-							ClientMessage.UpdatePersistentSubscriptionToStreamCompleted
-								.UpdatePersistentSubscriptionToStreamResult.DoesNotExist,
-							error));
-					},
-					(error) => {
-						message.Envelope.ReplyWith(new ClientMessage.UpdatePersistentSubscriptionToStreamCompleted(
-							message.CorrelationId,
-							ClientMessage.UpdatePersistentSubscriptionToStreamCompleted
-								.UpdatePersistentSubscriptionToStreamResult.AccessDenied,
-							error));
-					},
-					message.User?.Identity?.Name
-				);
-			} catch (Exception ex) {
-				message.Envelope.ReplyWith(new ClientMessage.UpdatePersistentSubscriptionToStreamCompleted(
-					message.CorrelationId,
-					ClientMessage.UpdatePersistentSubscriptionToStreamCompleted
-						.UpdatePersistentSubscriptionToStreamResult.Fail,
-					ex.Message));
-			}
-		}
-
-		public void Handle(ClientMessage.UpdatePersistentSubscriptionToAll message) {
-			try {
-				UpdatePersistentSubscription(
-					SystemStreams.AllStream,
-					sub => new PersistentSubscriptionAllStreamEventSource(sub.EventSource?.EventFilter),
-					message.GroupName,
-					new PersistentSubscriptionAllStreamPosition(message.StartFrom.CommitPosition,
-						message.StartFrom.PreparePosition),
-					message.MessageTimeoutMilliseconds,
-					message.ResolveLinkTos,
-					message.MaxRetryCount,
-					message.BufferSize,
-					message.LiveBufferSize,
-					message.ReadBatchSize,
-					message.MaxSubscriberCount,
-					message.NamedConsumerStrategy,
-					message.MaxCheckPointCount,
-					message.MinCheckPointCount,
-					message.CheckPointAfterMilliseconds,
-					message.RecordStatistics,
-					(msg) => {
-						message.Envelope.ReplyWith(
-							new ClientMessage.UpdatePersistentSubscriptionToAllCompleted(
-								message.CorrelationId,
-								ClientMessage.UpdatePersistentSubscriptionToAllCompleted
-									.UpdatePersistentSubscriptionToAllResult.Success,
-								msg));
-					},
-					(error) => {
-						message.Envelope.ReplyWith(new ClientMessage.UpdatePersistentSubscriptionToAllCompleted(
-							message.CorrelationId,
-							ClientMessage.UpdatePersistentSubscriptionToAllCompleted
-								.UpdatePersistentSubscriptionToAllResult.Fail,
-							error));
-					},
-					(error) => {
-						message.Envelope.ReplyWith(new ClientMessage.UpdatePersistentSubscriptionToAllCompleted(
-							message.CorrelationId,
-							ClientMessage.UpdatePersistentSubscriptionToAllCompleted
-								.UpdatePersistentSubscriptionToAllResult.DoesNotExist,
-							error));
-					},
-					(error) => {
-						message.Envelope.ReplyWith(new ClientMessage.UpdatePersistentSubscriptionToAllCompleted(
-							message.CorrelationId,
-							ClientMessage.UpdatePersistentSubscriptionToAllCompleted
-								.UpdatePersistentSubscriptionToAllResult.AccessDenied,
-							error));
-					},
-					message.User?.Identity?.Name
-				);
-			} catch (Exception ex) {
-				message.Envelope.ReplyWith(new ClientMessage.UpdatePersistentSubscriptionToAllCompleted(
-					message.CorrelationId,
-					ClientMessage.UpdatePersistentSubscriptionToAllCompleted.UpdatePersistentSubscriptionToAllResult
-						.Fail,
-					ex.Message));
-			}
-		}
-
-		private bool TryCreateSubscriptionGroup(IPersistentSubscriptionEventSource eventSource,
-			string groupName,
-			bool resolveLinkTos,
-			IPersistentSubscriptionStreamPosition startFrom,
-			bool extraStatistics,
-			int maxRetryCount,
-			int liveBufferSize,
-			int historyBufferSize,
-			int readBatchSize,
-			TimeSpan checkPointAfter,
-			int minCheckPointCount,
-			int maxCheckPointCount,
-			int maxSubscriberCount,
-			string namedConsumerStrategy,
-			TimeSpan messageTimeout) {
-			var stream = eventSource.ToString();
-			var key = BuildSubscriptionGroupKey(stream, groupName);
-
-			if (_subscriptionsById.ContainsKey(key))
-				return false;
-
-			var subscription = new PersistentSubscription(
-				new PersistentSubscriptionParams(
-					resolveLinkTos,
-					key,
-					eventSource,
-					groupName,
-					startFrom,
-					extraStatistics,
-					messageTimeout,
-					maxRetryCount,
-					liveBufferSize,
-					historyBufferSize,
-					readBatchSize,
-					checkPointAfter,
-					minCheckPointCount,
-					maxCheckPointCount,
-					maxSubscriberCount,
-					_consumerStrategyRegistry.GetInstance(namedConsumerStrategy, key),
-					_streamReader,
-					_checkpointReader,
-					new PersistentSubscriptionCheckpointWriter(key, _ioDispatcher),
-					new PersistentSubscriptionMessageParker(key, _ioDispatcher)));
-
-			UpdateSubscription(stream, groupName, subscription);
-			return true;
-
-		}
-
-		private void DeletePersistentSubscription(
-				IPersistentSubscriptionEventSource eventSource,
-				string groupName,
-				Action<string> onSuccess,
-				Action<string> onFail,
-				Action<string> onNotExist,
-				Action<string> onAccessDenied,
-				string user
-		) {
-			if (!_started) return;
-			var stream = eventSource.ToString();
-			var key = BuildSubscriptionGroupKey(stream, groupName);
-			Log.Debug("Deleting persistent subscription {subscriptionKey}", key);
-
-			PersistentSubscription subscription;
-			if (!_subscriptionsById.TryGetValue(key, out subscription)) {
-				onNotExist($"Group '{groupName}' does not exist.");
-				return;
-			}
-
-			if (!_subscriptionTopics.ContainsKey(stream)) {
-				onFail($"Group '{groupName}' does not exist.");
-				return;
-			}
-
-			UpdateSubscription(stream, groupName, null);
-			UpdateSubscriptionConfig(user, stream, groupName, null);
-			subscription.Delete();
-			SaveConfiguration(() => onSuccess(""));
-		}
-
-
-		public void Handle(ClientMessage.DeletePersistentSubscriptionToStream message) {
-			if (string.IsNullOrEmpty(message.EventStreamId)) {
-				message.Envelope.ReplyWith(new ClientMessage.DeletePersistentSubscriptionToStreamCompleted(
-					message.CorrelationId,
-					ClientMessage.DeletePersistentSubscriptionToStreamCompleted
-						.DeletePersistentSubscriptionToStreamResult.Fail,
-					"Bad stream name."));
-				return;
-			}
-
-			if (message.EventStreamId == SystemStreams.AllStream) {
-				message.Envelope.ReplyWith(new ClientMessage.DeletePersistentSubscriptionToStreamCompleted(
-					message.CorrelationId,
-					ClientMessage.DeletePersistentSubscriptionToStreamCompleted
-						.DeletePersistentSubscriptionToStreamResult.Fail,
-					"Persistent subscriptions to $all are only supported over gRPC through gRPC clients"));
-				return;
-			}
-
-			DeletePersistentSubscription(
-				new PersistentSubscriptionSingleStreamEventSource(message.EventStreamId),
-				message.GroupName,
-				(msg) => {
-					message.Envelope.ReplyWith(new ClientMessage.DeletePersistentSubscriptionToStreamCompleted(
-						message.CorrelationId,
-						ClientMessage.DeletePersistentSubscriptionToStreamCompleted
-							.DeletePersistentSubscriptionToStreamResult.Success, msg));
-				},
-				(error) => {
-					message.Envelope.ReplyWith(new ClientMessage.DeletePersistentSubscriptionToStreamCompleted(
-						message.CorrelationId,
-						ClientMessage.DeletePersistentSubscriptionToStreamCompleted
-							.DeletePersistentSubscriptionToStreamResult.Fail,
-						error));
-				},
-				(error) => {
-					message.Envelope.ReplyWith(new ClientMessage.DeletePersistentSubscriptionToStreamCompleted(
-						message.CorrelationId,
-						ClientMessage.DeletePersistentSubscriptionToStreamCompleted
-							.DeletePersistentSubscriptionToStreamResult.DoesNotExist,
-						error));
-				},
-				(error) => {
-					message.Envelope.ReplyWith(new ClientMessage.DeletePersistentSubscriptionToStreamCompleted(
-						message.CorrelationId,
-						ClientMessage.DeletePersistentSubscriptionToStreamCompleted
-							.DeletePersistentSubscriptionToStreamResult.AccessDenied,
-						error));
-				},
-				message.User?.Identity?.Name
-			);
-		}
-
-		public void Handle(ClientMessage.DeletePersistentSubscriptionToAll message) {
-			DeletePersistentSubscription(
-				new PersistentSubscriptionAllStreamEventSource(),
-				message.GroupName,
-				(msg) => {
-					message.Envelope.ReplyWith(new ClientMessage.DeletePersistentSubscriptionToAllCompleted(
-						message.CorrelationId,
-						ClientMessage.DeletePersistentSubscriptionToAllCompleted
-							.DeletePersistentSubscriptionToAllResult.Success, msg));
-				},
-				(error) => {
-					message.Envelope.ReplyWith(new ClientMessage.DeletePersistentSubscriptionToAllCompleted(
-						message.CorrelationId,
-						ClientMessage.DeletePersistentSubscriptionToAllCompleted.DeletePersistentSubscriptionToAllResult.Fail,
-						error));
-				},
-				(error) => {
-					message.Envelope.ReplyWith(new ClientMessage.DeletePersistentSubscriptionToAllCompleted(
-						message.CorrelationId,
-						ClientMessage.DeletePersistentSubscriptionToAllCompleted.DeletePersistentSubscriptionToAllResult.DoesNotExist,
-						error));
-				},
-				(error) => {
-					message.Envelope.ReplyWith(new ClientMessage.DeletePersistentSubscriptionToAllCompleted(
-						message.CorrelationId,
-						ClientMessage.DeletePersistentSubscriptionToAllCompleted.DeletePersistentSubscriptionToAllResult.AccessDenied,
-						error));
-				},
-				message.User?.Identity?.Name
-			);
-		}
-
-		private void UpdateSubscriptionConfig(string username, string eventSource, string groupName, PersistentSubscriptionEntry replaceBy) {
-			_config.Updated = DateTime.Now;
-			_config.UpdatedBy = username;
-			var index = _config.Entries.FindLastIndex(x => x.Stream == eventSource && x.Group == groupName);
-
-			if (index < 0) {
-				if (replaceBy == null) {
-					var key = BuildSubscriptionGroupKey(eventSource, groupName);
-					throw new ArgumentException($"Config for subscription: '{key}' does not exist");
-				}
-				// create
-				_config.Entries.Add(replaceBy);
-			} else {
-				if (replaceBy != null) // update
-					_config.Entries[index] = replaceBy;
-				else // delete
-					_config.Entries.RemoveAt(index);
-			}
-		}
-
-		private void UpdateSubscription(string eventSource, string groupName, PersistentSubscription replaceBy) {
-			var key = BuildSubscriptionGroupKey(eventSource, groupName);
-
-			if (!_subscriptionTopics.TryGetValue(eventSource, out var subscribers)) {
-				subscribers = new List<PersistentSubscription>();
-				_subscriptionTopics.Add(eventSource, subscribers);
-			}
-
-			// shut down any existing subscription
-			var subscriptionIndex = -1;
-			for (int i = 0; i < subscribers.Count; i++) {
-				if (subscribers[i].SubscriptionId != key) continue;
-
-				subscriptionIndex = i;
-				var sub = subscribers[i];
-				try {
-					sub.Shutdown();
-				} catch (Exception ex) {
-					Log.Error(ex, "Failed to shut down subscription with id: {subscriptionId}",
-						sub.SubscriptionId);
-				}
-				break;
-			}
-
-			if (_subscriptionsById.ContainsKey(key)) {
-				if (subscriptionIndex == -1)
-					throw new ArgumentException($"Subscription: '{key}' exists but it's not present in the list of subscribers");
-
-				if (replaceBy != null) { // update
-					_subscriptionsById[key] = replaceBy;
-					subscribers[subscriptionIndex] = replaceBy;
-				} else { // delete
-					_subscriptionsById.Remove(key);
-					subscribers.RemoveAt(subscriptionIndex);
-				}
-			} else {
-				if (subscriptionIndex != -1)
-					throw new ArgumentException($"Subscription: '{key}' does not exist but it's present in the list of subscribers");
-
-				// create
-				_subscriptionsById.Add(key, replaceBy);
-				subscribers.Add(replaceBy);
-			}
-		}
-
-		private void UnsubscribeFromStream(Guid correlationId, bool sendDropNotification) {
-			foreach (var subscription in _subscriptionsById.Values) {
-				subscription.RemoveClientByCorrelationId(correlationId, sendDropNotification);
-			}
-		}
-
-		public void Handle(TcpMessage.ConnectionClosed message) {
-			if (_subscriptionsById == null) return; //haven't built yet.
-
-			foreach (var subscription in _subscriptionsById.Values) {
-				if (subscription.RemoveClientByConnectionId(message.Connection.ConnectionId))
-					Log.Debug("Persistent subscription {subscription} lost connection from {remoteEndPoint}",
-						subscription.SubscriptionId,
-						message.Connection.RemoteEndPoint);
-			}
-		}
-
-		public void ConnectToPersistentSubscription(
-			IPersistentSubscriptionEventSource eventSource,
-			string groupName,
-			int allowedInFlightMessages,
-			Guid connectionId,
-			string connectionName,
-			string from,
-			Guid correlationId,
-			IEnvelope envelope,
-			string user) {
-			if (!_started) return;
-
-			var stream = eventSource.ToString();
-			List<PersistentSubscription> subscribers;
-			if (!_subscriptionTopics.TryGetValue(stream, out subscribers)) {
-				envelope.ReplyWith(new ClientMessage.SubscriptionDropped(correlationId,
-					SubscriptionDropReason.NotFound));
-				return;
-			}
-
-			var key = BuildSubscriptionGroupKey(stream, groupName);
-			PersistentSubscription subscription;
-			if (!_subscriptionsById.TryGetValue(key, out subscription)) {
-				envelope.ReplyWith(new ClientMessage.SubscriptionDropped(correlationId, SubscriptionDropReason.NotFound));
-				return;
-			}
-
-			if (subscription.HasReachedMaxClientCount) {
-				envelope.ReplyWith(new ClientMessage.SubscriptionDropped(correlationId,
-					SubscriptionDropReason.SubscriberMaxCountReached));
-				return;
-			}
-
-			Log.Debug("New connection to persistent subscription {subscriptionKey} by {connectionId}", key, connectionId);
-			long? lastEventNumber = null;
-			if (eventSource.FromStream) {
-				var streamId = _readIndex.GetStreamId(eventSource.EventStreamId);
-				lastEventNumber = _readIndex.GetStreamLastEventNumber(streamId);
-			}
-			var lastCommitPos = _readIndex.LastIndexedPosition;
-			var subscribedMessage =
-				new ClientMessage.PersistentSubscriptionConfirmation(key, correlationId, lastCommitPos, lastEventNumber);
-			envelope.ReplyWith(subscribedMessage);
-			var name = user ?? "anonymous";
-			subscription.AddClient(correlationId, connectionId, connectionName, envelope,
-				allowedInFlightMessages, name, from);
-
-		}
-
-		public void Handle(ClientMessage.ConnectToPersistentSubscriptionToStream message) {
-			ConnectToPersistentSubscription(
-				new PersistentSubscriptionSingleStreamEventSource(message.EventStreamId),
-				message.GroupName,
-				message.AllowedInFlightMessages,
-				message.ConnectionId,
-				message.ConnectionName,
-				message.From,
-				message.CorrelationId,
-				message.Envelope,
-				message.User?.Identity?.Name);
-		}
-
-		public void Handle(ClientMessage.ConnectToPersistentSubscriptionToAll message) {
-			ConnectToPersistentSubscription(
-				new PersistentSubscriptionAllStreamEventSource(),
-				message.GroupName,
-				message.AllowedInFlightMessages,
-				message.ConnectionId,
-				message.ConnectionName,
-				message.From,
-				message.CorrelationId,
-				message.Envelope,
-				message.User?.Identity?.Name);
-		}
-
-		private static string BuildSubscriptionGroupKey(string stream, string groupName) {
-			return stream + "::" + groupName;
-		}
-
-		public void Handle(StorageMessage.EventCommitted message) {
-			if (!_started) return;
-			ProcessEventCommited(message.Event.EventStreamId, message.CommitPosition, message.Event);
-		}
-
-		private void ProcessEventCommited(string eventStreamId, long commitPosition, EventRecord evnt) {
-			var subscriptions = new List<PersistentSubscription>();
-			if (EventFilter.DefaultStreamFilter.IsEventAllowed(evnt)
-				&& _subscriptionTopics.TryGetValue(eventStreamId, out var subscriptionsToStream)) {
-				subscriptions.AddRange(subscriptionsToStream);
-			}
-
-			if (EventFilter.DefaultAllFilter.IsEventAllowed(evnt)
-			    && _subscriptionTopics.TryGetValue(SystemStreams.AllStream, out var subscriptionsToAll)) {
-				subscriptions.AddRange(subscriptionsToAll);
-			}
-
-			for (int i = 0, n = subscriptions.Count; i < n; i++) {
-				var subscr = subscriptions[i];
-				var pair = ResolvedEvent.ForUnresolvedEvent(evnt, commitPosition);
-				if (subscr.ResolveLinkTos)
-					pair = ResolveLinkToEvent(evnt, commitPosition); //TODO this can be cached
-				subscr.NotifyLiveSubscriptionMessage(pair);
-			}
-		}
-
-		private ResolvedEvent ResolveLinkToEvent(EventRecord eventRecord, long commitPosition) {
-			if (eventRecord.EventType == SystemEventTypes.LinkTo) {
-				try {
-					string[] parts = Helper.UTF8NoBom.GetString(eventRecord.Data.Span).Split('@', 2);
-					long eventNumber = long.Parse(parts[0]);
-					string streamName = parts[1];
-					var streamId = _readIndex.GetStreamId(streamName);
-					var res = _readIndex.ReadEvent(streamName, streamId, eventNumber);
-					if (res.Result == ReadEventResult.Success)
-						return ResolvedEvent.ForResolvedLink(res.Record, eventRecord, commitPosition);
-
-					return ResolvedEvent.ForFailedResolvedLink(eventRecord, res.Result, commitPosition);
-				} catch (Exception exc) {
-					Log.Error(exc, "Error while resolving link for event record: {eventRecord}",
-						eventRecord.ToString());
-				}
-
-				return ResolvedEvent.ForFailedResolvedLink(eventRecord, ReadEventResult.Error, commitPosition);
-			}
-
-			return ResolvedEvent.ForUnresolvedEvent(eventRecord, commitPosition);
-		}
-
-		public void Handle(ClientMessage.PersistentSubscriptionAckEvents message) {
-			if (!_started) return;
-			PersistentSubscription subscription;
-			if (_subscriptionsById.TryGetValue(message.SubscriptionId, out subscription)) {
-				subscription.AcknowledgeMessagesProcessed(message.CorrelationId, message.ProcessedEventIds);
-			}
-		}
-
-		public void Handle(ClientMessage.PersistentSubscriptionNackEvents message) {
-			if (!_started) return;
-			PersistentSubscription subscription;
-			if (_subscriptionsById.TryGetValue(message.SubscriptionId, out subscription)) {
-				subscription.NotAcknowledgeMessagesProcessed(message.CorrelationId, message.ProcessedEventIds,
-					(NakAction)message.Action, message.Message);
-			}
-		}
-
-		public void Handle(ClientMessage.ReadNextNPersistentMessages message) {
-			if (!_started) return;
-
-			if (string.IsNullOrEmpty(message.EventStreamId)) {
-				message.Envelope.ReplyWith(new ClientMessage.ReadNextNPersistentMessagesCompleted(
-					message.CorrelationId,
-					ClientMessage.ReadNextNPersistentMessagesCompleted.ReadNextNPersistentMessagesResult.Fail,
-					"Bad stream name.", null));
-				return;
-			}
-
-			if (message.EventStreamId == SystemStreams.AllStream) {
-				message.Envelope.ReplyWith(new ClientMessage.ReadNextNPersistentMessagesCompleted(
-					message.CorrelationId,
-					ClientMessage.ReadNextNPersistentMessagesCompleted.ReadNextNPersistentMessagesResult.Fail,
-					"Persistent subscriptions to $all are only supported over gRPC through gRPC clients", null));
-				return;
-			}
-
-			List<PersistentSubscription> subscribers;
-			if (!_subscriptionTopics.TryGetValue(message.EventStreamId, out subscribers)) {
-				message.Envelope.ReplyWith(
-					new ClientMessage.ReadNextNPersistentMessagesCompleted(message.CorrelationId,
-						ClientMessage.ReadNextNPersistentMessagesCompleted.ReadNextNPersistentMessagesResult
-							.DoesNotExist,
-						"Not found.",
-						null));
-				return;
-			}
-
-			var key = BuildSubscriptionGroupKey(message.EventStreamId, message.GroupName);
-			PersistentSubscription subscription;
-			if (!_subscriptionsById.TryGetValue(key, out subscription)) {
-				message.Envelope.ReplyWith(
-					new ClientMessage.ReadNextNPersistentMessagesCompleted(message.CorrelationId,
-						ClientMessage.ReadNextNPersistentMessagesCompleted.ReadNextNPersistentMessagesResult
-							.DoesNotExist,
-						"Not found.",
-						null));
-				return;
-			}
-
-			var messages = subscription.GetNextNOrLessMessages(message.Count).ToArray();
-			message.Envelope.ReplyWith(
-				new ClientMessage.ReadNextNPersistentMessagesCompleted(message.CorrelationId,
-					ClientMessage.ReadNextNPersistentMessagesCompleted.ReadNextNPersistentMessagesResult.Success,
-					string.Format("{0} read.", messages.Length),
-					messages));
-		}
-
-		public void Handle(ClientMessage.ReplayParkedMessages message) {
-			PersistentSubscription subscription;
-			var key = BuildSubscriptionGroupKey(message.EventStreamId, message.GroupName);
-			Log.Debug("Replaying parked messages for persistent subscription {subscriptionKey} {to}",
-				key,
-				message.StopAt.HasValue ? $" (To: '{message.StopAt.ToString()}')" : " (All)");
-
-			if (message.StopAt.HasValue && message.StopAt.Value < 0) {
-				message.Envelope.ReplyWith(new ClientMessage.ReplayMessagesReceived(message.CorrelationId,
-					ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.Fail,
-					"Cannot stop replaying parked message at a negative version."));
-				return;
-			}
-
-			if (!_subscriptionsById.TryGetValue(key, out subscription)) {
-				message.Envelope.ReplyWith(new ClientMessage.ReplayMessagesReceived(message.CorrelationId,
-					ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.DoesNotExist,
-					"Unable to locate '" + key + "'"));
-				return;
-			}
-
-			subscription.RetryParkedMessages(message.StopAt);
-			message.Envelope.ReplyWith(new ClientMessage.ReplayMessagesReceived(message.CorrelationId,
-				ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.Success, ""));
-		}
-
-		public void Handle(ClientMessage.ReplayParkedMessage message) {
-			var key = BuildSubscriptionGroupKey(message.EventStreamId, message.GroupName);
-			PersistentSubscription subscription;
-
-			if (!_subscriptionsById.TryGetValue(key, out subscription)) {
-				message.Envelope.ReplyWith(new ClientMessage.ReplayMessagesReceived(message.CorrelationId,
-					ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.DoesNotExist,
-					"Unable to locate '" + key + "'"));
-				return;
-			}
-
-			subscription.RetrySingleParkedMessage(message.Event);
-			message.Envelope.ReplyWith(new ClientMessage.ReplayMessagesReceived(message.CorrelationId,
-				ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.Success, ""));
-		}
-
-		private void LoadConfiguration(Action continueWith) {
-			_ioDispatcher.ReadBackward(SystemStreams.PersistentSubscriptionConfig, -1, 1, false,
-				SystemAccounts.System, x => HandleLoadCompleted(continueWith, x));
-		}
-
-		private void HandleLoadCompleted(Action continueWith,
-			ClientMessage.ReadStreamEventsBackwardCompleted readStreamEventsBackwardCompleted) {
-			switch (readStreamEventsBackwardCompleted.Result) {
-				case ReadStreamResult.Success:
-					try {
-						_config =
-							PersistentSubscriptionConfig.FromSerializedForm(
-								readStreamEventsBackwardCompleted.Events[0].Event.Data);
-						foreach (var entry in _config.Entries) {
-							if (!_consumerStrategyRegistry.ValidateStrategy(entry.NamedConsumerStrategy)) {
-								Log.Error(
-									"A persistent subscription exists with an invalid consumer strategy '{strategy}'. Ignoring it.",
-									entry.NamedConsumerStrategy);
-								continue;
-							}
-
-							IPersistentSubscriptionEventSource eventSource;
-							if (entry.Stream == SystemStreams.AllStream) {
-								IEventFilter filter = null;
-								if (entry.Filter != null) {
-									var (success, reason) = EventFilter.TryParse(entry.Filter, out filter);
-									if (!success) {
-										Log.Error(
-											"Could not load filtered persistent subscription to $all for group {group}. The filter could not be parsed: '{reason}",
-											entry.Group, reason);
-										continue;
-									}
-								}
-
-								eventSource = new PersistentSubscriptionAllStreamEventSource(filter);
-							} else {
-								eventSource = new PersistentSubscriptionSingleStreamEventSource(entry.Stream);
-							}
-
-							var result = TryCreateSubscriptionGroup(eventSource,
-								entry.Group,
-								entry.ResolveLinkTos,
-								#pragma warning disable 612
-								eventSource.GetStreamPositionFor(entry.StartPosition ?? entry.StartFrom.ToString()),
-								#pragma warning restore 612
-								entry.ExtraStatistics,
-								entry.MaxRetryCount,
-								entry.LiveBufferSize,
-								entry.HistoryBufferSize,
-								entry.ReadBatchSize,
-								ToCheckPointAfterTimeout(entry.CheckPointAfter),
-								entry.MinCheckPointCount,
-								entry.MaxCheckPointCount,
-								entry.MaxSubscriberCount,
-								entry.NamedConsumerStrategy,
-								ToMessageTimeout(entry.MessageTimeout));
-
-							if (!result) {
-								var key = BuildSubscriptionGroupKey(eventSource.ToString(), entry.Group);
-								Log.Warning("A duplicate persistent subscription: {subscriptionKey} was found in the configuration. Ignoring it.", key);
-							}
-
-						}
-
-						continueWith();
-					} catch (Exception ex) {
-						Log.Error(ex, "There was an error loading configuration from storage.");
-					}
-
-					break;
-				case ReadStreamResult.NoStream:
-					_config = new PersistentSubscriptionConfig {Version = "2"};
-					continueWith();
-					break;
-				default:
-					throw new Exception(readStreamEventsBackwardCompleted.Result +
-					                    " is an unexpected result writing subscription configuration.");
-			}
-		}
-
-		private void SaveConfiguration(Action continueWith) {
-			Log.Debug("Saving persistent subscription configuration");
-			var data = _config.GetSerializedForm();
-			var ev = new Event(Guid.NewGuid(), "$PersistentConfig", true, data, new byte[0]);
-			var metadata = new StreamMetadata(maxCount: 2);
-			Lazy<StreamMetadata> streamMetadata = new Lazy<StreamMetadata>(() => metadata);
-			Event[] events = new Event[] {ev};
-			_ioDispatcher.ConfigureStreamAndWriteEvents(SystemStreams.PersistentSubscriptionConfig,
-				ExpectedVersion.Any, streamMetadata, events, SystemAccounts.System,
-				x => HandleSaveConfigurationCompleted(continueWith, x));
-		}
-
-		private void HandleSaveConfigurationCompleted(Action continueWith, ClientMessage.WriteEventsCompleted obj) {
-			switch (obj.Result) {
-				case OperationResult.Success:
-					continueWith();
-					break;
-				case OperationResult.CommitTimeout:
-				case OperationResult.PrepareTimeout:
-					Log.Information("Timeout while trying to save persistent subscription configuration. Retrying");
-					SaveConfiguration(continueWith);
-					break;
-				default:
-					throw new Exception(obj.Result +
-					                    " is an unexpected result writing persistent subscription configuration.");
-			}
-		}
-
-		public void Handle(TelemetryMessage.Request message) {
-			message.Envelope.ReplyWith(new TelemetryMessage.Response("persistentSubscriptions", new JsonObject {
-				["count"] = _subscriptionsById?.Count ?? 0
-			}));
-		}
-
-		public void Handle(MonitoringMessage.GetPersistentSubscriptionStats message) {
-			if (!_started) {
-				message.Envelope.ReplyWith(new MonitoringMessage.GetPersistentSubscriptionStatsCompleted(
-					MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotReady, null)
-				);
-				return;
-			}
-
-			List<PersistentSubscription> subscribers;
-			if (!_subscriptionTopics.TryGetValue(message.EventStreamId, out subscribers) || subscribers == null) {
-				message.Envelope.ReplyWith(new MonitoringMessage.GetPersistentSubscriptionStatsCompleted(
-					MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotFound, null)
-				);
-				return;
-			}
-
-			var subscription = subscribers.FirstOrDefault(x => x.GroupName == message.GroupName);
-			if (subscription == null) {
-				message.Envelope.ReplyWith(new MonitoringMessage.GetPersistentSubscriptionStatsCompleted(
-					MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotFound, null)
-				);
-				return;
-			}
-
-			var stats = new List<MonitoringMessage.PersistentSubscriptionInfo>() {
-				subscription.GetStatistics()
-			};
-			message.Envelope.ReplyWith(new MonitoringMessage.GetPersistentSubscriptionStatsCompleted(
-				MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.Success, stats)
-			);
-		}
-
-		public void Handle(MonitoringMessage.GetStreamPersistentSubscriptionStats message) {
-			if (!_started) {
-				message.Envelope.ReplyWith(new MonitoringMessage.GetPersistentSubscriptionStatsCompleted(
-					MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotReady, null)
-				);
-				return;
-			}
-
-			List<PersistentSubscription> subscribers;
-			if (!_subscriptionTopics.TryGetValue(message.EventStreamId, out subscribers)) {
-				message.Envelope.ReplyWith(new MonitoringMessage.GetPersistentSubscriptionStatsCompleted(
-					MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotFound, null)
-				);
-				return;
-			}
-
-			var stats = subscribers.Select(sub => sub.GetStatistics()).ToList();
-			message.Envelope.ReplyWith(new MonitoringMessage.GetPersistentSubscriptionStatsCompleted(
-				MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.Success, stats)
-			);
-		}
-
-		public void Handle(MonitoringMessage.GetAllPersistentSubscriptionStats message) {
-			if (!_started) {
-				message.Envelope.ReplyWith(new MonitoringMessage.GetPersistentSubscriptionStatsCompleted(
-					MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotReady, null)
-				);
-				return;
-			}
-
-			var stats = (from subscription in _subscriptionTopics.Values
-				from sub in subscription
-				select sub.GetStatistics()).ToList();
-			message.Envelope.ReplyWith(new MonitoringMessage.GetPersistentSubscriptionStatsCompleted(
-				MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.Success, stats)
-			);
-		}
-
-		public void Handle(SubscriptionMessage.PersistentSubscriptionTimerTick message) {
-			if (!_handleTick || _timerTickCorrelationId != message.CorrelationId) return;
-			try {
-				WakeSubscriptions();
-			} finally {
-				_timerTickCorrelationId = Guid.NewGuid();
-				_bus.Publish(TimerMessage.Schedule.Create(TimeSpan.FromMilliseconds(1000),
-					_bus,
-					new SubscriptionMessage.PersistentSubscriptionTimerTick(_timerTickCorrelationId)));
-			}
-		}
-
-		private void WakeSubscriptions() {
-			var now = DateTime.UtcNow;
-
-			foreach (var subscription in _subscriptionsById.Values) {
-				subscription.NotifyClockTick(now);
-			}
-		}
-
-
-		private TimeSpan ToCheckPointAfterTimeout(int milliseconds) {
-			return milliseconds == 0 ? TimeSpan.MaxValue : TimeSpan.FromMilliseconds(milliseconds);
-		}
-
-		private TimeSpan ToMessageTimeout(int milliseconds) {
-			return milliseconds == 0 ? TimeSpan.Zero : TimeSpan.FromMilliseconds(milliseconds);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionSingleStreamEventSource.cs b/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionSingleStreamEventSource.cs
deleted file mode 100644
index 0f191643756..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionSingleStreamEventSource.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public class PersistentSubscriptionSingleStreamEventSource : IPersistentSubscriptionEventSource {
-		public bool FromStream => true;
-		public string EventStreamId { get; }
-		public bool FromAll => false;
-		public IEventFilter EventFilter => null;
-
-		public PersistentSubscriptionSingleStreamEventSource(string eventStreamId) {
-			EventStreamId = eventStreamId ?? throw new ArgumentNullException(nameof(eventStreamId));
-		}
-		public override string ToString() => EventStreamId;
-		public IPersistentSubscriptionStreamPosition StreamStartPosition => new PersistentSubscriptionSingleStreamPosition(0L);
-		public IPersistentSubscriptionStreamPosition GetStreamPositionFor(ResolvedEvent @event) => new PersistentSubscriptionSingleStreamPosition(@event.OriginalEventNumber);
-		public IPersistentSubscriptionStreamPosition GetStreamPositionFor(string checkpoint) => new PersistentSubscriptionSingleStreamPosition(long.Parse(checkpoint));
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionSingleStreamPosition.cs b/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionSingleStreamPosition.cs
deleted file mode 100644
index d2cbf66eb8a..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionSingleStreamPosition.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-#nullable enable
-using System;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public class PersistentSubscriptionSingleStreamPosition : IPersistentSubscriptionStreamPosition {
-		public bool IsSingleStreamPosition => true;
-		public long StreamEventNumber { get; }
-		public bool IsAllStreamPosition => false;
-		public bool IsLivePosition => StreamEventNumber == -1L;
-		public (long Commit, long Prepare) TFPosition => throw new InvalidOperationException();
-		public PersistentSubscriptionSingleStreamPosition(long eventNumber) {
-			StreamEventNumber = eventNumber;
-		}
-		public bool Equals(IPersistentSubscriptionStreamPosition? other) {
-			if (other == null) throw new InvalidOperationException();
-			if (!(other is PersistentSubscriptionSingleStreamPosition)) throw new InvalidOperationException();
-			return StreamEventNumber.Equals(other.StreamEventNumber);
-		}
-
-		public int CompareTo(IPersistentSubscriptionStreamPosition? other) {
-			if (other == null) throw new InvalidOperationException();
-			if (!(other is PersistentSubscriptionSingleStreamPosition)) throw new InvalidOperationException();
-			return StreamEventNumber.CompareTo(other.StreamEventNumber);
-		}
-
-		public override string ToString() => StreamEventNumber.ToString();
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionState.cs b/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionState.cs
deleted file mode 100644
index f5c6c91388f..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionState.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	[Flags]
-	public enum PersistentSubscriptionState {
-		NotReady = 0x00,
-		Behind = 0x01,
-		OutstandingPageRequest = 0x02,
-		ReplayingParkedMessages = 0x04,
-		Live = 0x08,
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionStats.cs b/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionStats.cs
deleted file mode 100644
index 454f713313c..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionStats.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading;
-using EventStore.Core.Messages;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public class PersistentSubscriptionStats {
-		private long _totalItems;
-		private TimeSpan _lastTotalTime;
-		private long _lastTotalItems;
-		private IPersistentSubscriptionStreamPosition _lastCheckpointedEventPosition;
-		private IPersistentSubscriptionStreamPosition _lastKnownEventPosition;
-		private readonly PersistentSubscription _parent;
-		private readonly Stopwatch _totalTimeWatch;
-		private readonly PersistentSubscriptionParams _settings;
-
-		public PersistentSubscriptionStats(PersistentSubscription parent, PersistentSubscriptionParams settings,
-			Stopwatch totalTimeWatch) {
-			_settings = settings;
-			_parent = parent;
-			_totalTimeWatch = totalTimeWatch;
-		}
-
-		public void IncrementProcessed() {
-			Interlocked.Increment(ref _totalItems);
-		}
-
-		public void SetLastCheckPoint(IPersistentSubscriptionStreamPosition lastCheckpointedEventPosition) {
-			_lastCheckpointedEventPosition = lastCheckpointedEventPosition;
-		}
-
-		public void SetLastKnownEventPosition(IPersistentSubscriptionStreamPosition knownEventPosition) {
-			if (knownEventPosition == null)
-				return;
-			if (_lastKnownEventPosition == null || _lastKnownEventPosition.CompareTo(knownEventPosition) < 0)
-				_lastKnownEventPosition = knownEventPosition;
-		}
-
-		public MonitoringMessage.PersistentSubscriptionInfo GetStatistics() {
-			long oldestParkedMessage = 0;
-			var totalTime = _totalTimeWatch.Elapsed;
-			var totalItems = Interlocked.Read(ref _totalItems);
-
-			var lastRunMs = totalTime - _lastTotalTime;
-			var lastItems = totalItems - _lastTotalItems;
-
-			var avgItemsPerSecond =
-				lastRunMs.Ticks != 0 ? (int)(TimeSpan.TicksPerSecond * lastItems / lastRunMs.Ticks) : 0;
-			_lastTotalTime = totalTime;
-			_lastTotalItems = totalItems;
-			var connections = new List<MonitoringMessage.ConnectionInfo>();
-			var totalInflight = 0;
-			foreach (var conn in _parent._pushClients.GetAll()) {
-				var connItems = conn.TotalItems;
-				var connLastItems = connItems - conn.LastTotalItems;
-				conn.LastTotalItems = connItems;
-				var connAvgItemsPerSecond = lastRunMs.Ticks != 0
-					? (int)(TimeSpan.TicksPerSecond * connLastItems / lastRunMs.Ticks)
-					: 0;
-				var extraStats = conn.GetExtraStats();
-				var stats = extraStats == null ? new List<Measurement>() : extraStats.Measurements;
-				totalInflight += conn.InflightMessages;
-				connections.Add(new MonitoringMessage.ConnectionInfo {
-					From = conn.From,
-					Username = conn.Username,
-					AverageItemsPerSecond = connAvgItemsPerSecond,
-					TotalItems = conn.TotalItems,
-					InFlightMessages = conn.InflightMessages,
-					AvailableSlots = conn.AvailableSlots,
-					CountSinceLastMeasurement = connLastItems,
-					ObservedMeasurements = stats,
-					ConnectionName = conn.ConnectionName,
-				});
-			}
-
-			long parkedMessageCount = _settings.MessageParker.ParkedMessageCount;
-
-			var timeStamp = _settings.MessageParker.GetOldestParkedMessage;
-
-			if (timeStamp.HasValue) {
-				oldestParkedMessage = (long)(DateTime.UtcNow - timeStamp.Value).TotalSeconds;
-			}
-
-			var gotBuffer = _parent.TryGetStreamBuffer(out var streamBuffer);
-
-			return new MonitoringMessage.PersistentSubscriptionInfo() {
-				EventSource = _parent.EventSource.ToString(),
-				GroupName = _parent.GroupName,
-				Status = _parent.State.ToString(),
-				Connections = connections,
-				AveragePerSecond = avgItemsPerSecond,
-				LastCheckpointedEventPosition = _lastCheckpointedEventPosition?.ToString(),
-				LastKnownEventPosition = _lastKnownEventPosition?.ToString(),
-				TotalItems = totalItems,
-				CountSinceLastMeasurement = lastItems,
-				CheckPointAfterMilliseconds = (int)_settings.CheckPointAfter.TotalMilliseconds,
-				BufferSize = _settings.BufferSize,
-				LiveBufferSize = _settings.LiveBufferSize,
-				MaxCheckPointCount = _settings.MaxCheckPointCount,
-				MaxRetryCount = _settings.MaxRetryCount,
-				MessageTimeoutMilliseconds = (int)_settings.MessageTimeout.TotalMilliseconds,
-				MinCheckPointCount = _settings.MinCheckPointCount,
-				ReadBatchSize = _settings.ReadBatchSize,
-				ResolveLinktos = _settings.ResolveLinkTos,
-				StartFrom = _settings.StartFrom?.ToString(),
-				ReadBufferCount = gotBuffer ? streamBuffer.ReadBufferCount : 0,
-				RetryBufferCount = gotBuffer ? streamBuffer.RetryBufferCount : 0,
-				LiveBufferCount = gotBuffer ? streamBuffer.LiveBufferCount : 0,
-				ExtraStatistics = _settings.ExtraStatistics,
-				TotalInFlightMessages = totalInflight,
-				OutstandingMessagesCount = _parent.OutstandingMessageCount,
-				NamedConsumerStrategy = _settings.ConsumerStrategy.Name,
-				MaxSubscriberCount = _settings.MaxSubscriberCount,
-				ParkedMessageCount = parkedMessageCount,
-				OldestParkedMessage = oldestParkedMessage
-			};
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionStreamReader.cs b/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionStreamReader.cs
deleted file mode 100644
index 1fd2c5120d4..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionStreamReader.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.UserManagement;
-using Serilog;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public class PersistentSubscriptionStreamReader : IPersistentSubscriptionStreamReader {
-		private static readonly ILogger Log = Serilog.Log.ForContext<PersistentSubscriptionStreamReader>();
-
-		public const int MaxPullBatchSize = 500;
-		private const int MaxRetryTimeSecs = 60;
-		private const int MaxExponentialBackoffPower = 10; /*to prevent integer overflow*/
-
-		private readonly IODispatcher _ioDispatcher;
-		private readonly int _maxPullBatchSize;
-		private readonly Random _random = new Random();
-
-		public PersistentSubscriptionStreamReader(IODispatcher ioDispatcher, int maxPullBatchSize) {
-			_ioDispatcher = ioDispatcher;
-			_maxPullBatchSize = maxPullBatchSize;
-		}
-
-		public void BeginReadEvents(IPersistentSubscriptionEventSource eventSource,
-			IPersistentSubscriptionStreamPosition startPosition, int countToLoad, int batchSize,
-			int maxWindowSize, bool resolveLinkTos, bool skipFirstEvent,
-			Action<ResolvedEvent[], IPersistentSubscriptionStreamPosition, bool> onEventsFound,
-			Action<IPersistentSubscriptionStreamPosition, long> onEventsSkipped,
-			Action<string> onError) {
-			BeginReadEventsInternal(eventSource, startPosition, countToLoad, batchSize, maxWindowSize, resolveLinkTos,
-				skipFirstEvent, onEventsFound, onEventsSkipped, onError, 0);
-		}
-
-		private int GetBackOffDelay(int retryCount) {
-			//exponential backoff + jitter
-			return 1 + _random.Next(0, 1 + Math.Min(MaxRetryTimeSecs, (1 << Math.Min(retryCount, MaxExponentialBackoffPower))));
-		}
-
-		private void BeginReadEventsInternal(IPersistentSubscriptionEventSource eventSource,
-			IPersistentSubscriptionStreamPosition startPosition, int countToLoad, int batchSize, int maxWindowSize, bool resolveLinkTos, bool skipFirstEvent,
-			Action<ResolvedEvent[], IPersistentSubscriptionStreamPosition, bool> onEventsFound,
-			Action<IPersistentSubscriptionStreamPosition, long> onEventsSkipped,
-			Action<string> onError, int retryCount) {
-			var actualBatchSize = GetBatchSize(batchSize);
-
-			if (eventSource.FromStream) {
-				_ioDispatcher.ReadForward(
-					eventSource.EventStreamId, startPosition.StreamEventNumber, Math.Min(countToLoad, actualBatchSize),
-					resolveLinkTos, SystemAccounts.System, new ResponseHandler(onEventsFound, onEventsSkipped, onError, skipFirstEvent).FetchCompleted,
-					async () => await HandleTimeout(eventSource.EventStreamId),
-					Guid.NewGuid());
-			} else if (eventSource.FromAll) {
-				if (eventSource.EventFilter is null) {
-					_ioDispatcher.ReadAllForward(
-						startPosition.TFPosition.Commit,
-						startPosition.TFPosition.Prepare,
-						Math.Min(countToLoad, actualBatchSize),
-						resolveLinkTos,
-						true,
-						null,
-						SystemAccounts.System,
-						null,
-						new ResponseHandler(onEventsFound, onEventsSkipped, onError, skipFirstEvent).FetchAllCompleted,
-						async () => await HandleTimeout(SystemStreams.AllStream),
-						Guid.NewGuid());
-				} else {
-					var maxSearchWindow = Math.Max(actualBatchSize, maxWindowSize);
-					_ioDispatcher.ReadAllForwardFiltered(
-						startPosition.TFPosition.Commit,
-						startPosition.TFPosition.Prepare,
-						Math.Min(countToLoad, actualBatchSize),
-						resolveLinkTos,
-						true,
-						maxSearchWindow,
-						null,
-						eventSource.EventFilter,
-						SystemAccounts.System,
-						null,
-						new ResponseHandler(onEventsFound, onEventsSkipped, onError, skipFirstEvent).FetchAllFilteredCompleted,
-						async () => await HandleTimeout($"{SystemStreams.AllStream} with filter {eventSource.EventFilter}"),
-						Guid.NewGuid());
-				}
-			} else {
-				throw new InvalidOperationException();
-			}
-
-			async Task HandleTimeout(string streamName) {
-				var backOff = GetBackOffDelay(retryCount);
-				Log.Warning(
-					"Timed out reading from stream: {stream}. Retrying in {retryInterval} seconds.",
-					streamName, backOff);
-				await Task.Delay(TimeSpan.FromSeconds(backOff));
-				BeginReadEventsInternal(eventSource, startPosition, countToLoad, batchSize, maxWindowSize, resolveLinkTos,
-					skipFirstEvent, onEventsFound, onEventsSkipped, onError, retryCount + 1);
-			}
-		}
-
-		private int GetBatchSize(int batchSize) {
-			return Math.Min(Math.Min(batchSize == 0 ? 20 : batchSize, MaxPullBatchSize), _maxPullBatchSize);
-		}
-
-		private class ResponseHandler {
-			private readonly Action<ResolvedEvent[], IPersistentSubscriptionStreamPosition, bool> _onFetchCompleted;
-			private readonly Action<IPersistentSubscriptionStreamPosition, long> _onEventsSkipped;
-			private readonly Action<string> _onError;
-			private readonly bool _skipFirstEvent;
-
-			public ResponseHandler(Action<ResolvedEvent[], IPersistentSubscriptionStreamPosition, bool> onFetchCompleted,
-				Action<IPersistentSubscriptionStreamPosition, long> onEventsSkipped, Action<string> onError, bool skipFirstEvent) {
-				_onFetchCompleted = onFetchCompleted;
-				_onEventsSkipped = onEventsSkipped;
-				_skipFirstEvent = skipFirstEvent;
-				_onError = onError;
-			}
-
-			public void FetchCompleted(ClientMessage.ReadStreamEventsForwardCompleted msg) {
-				switch (msg.Result) {
-					case ReadStreamResult.Success:
-						_onFetchCompleted(_skipFirstEvent ? msg.Events.Skip(1).ToArray() : msg.Events,
-							new PersistentSubscriptionSingleStreamPosition(msg.NextEventNumber), msg.IsEndOfStream);
-						break;
-					case ReadStreamResult.NoStream:
-						_onFetchCompleted(
-							Array.Empty<ResolvedEvent>(),
-							new PersistentSubscriptionSingleStreamPosition(0),
-							msg.IsEndOfStream);
-						break;
-					case ReadStreamResult.AccessDenied:
-						_onError($"Read access denied for stream: {msg.EventStreamId}");
-						break;
-					default:
-						_onError(msg.Error ?? $"Error reading stream: {msg.EventStreamId} at event number: {msg.FromEventNumber}");
-						break;
-				}
-			}
-
-			public void FetchAllCompleted(ClientMessage.ReadAllEventsForwardCompleted msg) {
-				switch (msg.Result) {
-					case ReadAllResult.Success:
-						_onFetchCompleted(_skipFirstEvent ? msg.Events.Skip(1).ToArray() : msg.Events,
-							new PersistentSubscriptionAllStreamPosition(msg.NextPos.CommitPosition, msg.NextPos.PreparePosition), msg.IsEndOfStream);
-						break;
-					case ReadAllResult.AccessDenied:
-						_onError($"Read access denied for stream: {SystemStreams.AllStream}");
-						break;
-					default:
-						_onError(msg.Error ?? $"Error reading stream: {SystemStreams.AllStream} at position: {msg.CurrentPos}");
-						break;
-				}
-			}
-			public void FetchAllFilteredCompleted(ClientMessage.FilteredReadAllEventsForwardCompleted msg) {
-				switch (msg.Result) {
-					case FilteredReadAllResult.Success:
-						if (msg.Events.Length == 0 && msg.ConsideredEventsCount > 0) {
-							// Checkpoint on the position we read from rather than the next position
-							// to prevent skipping the next event when loading from the checkpoint
-							_onEventsSkipped(
-								new PersistentSubscriptionAllStreamPosition(msg.CurrentPos.CommitPosition, msg.CurrentPos.PreparePosition),
-								msg.ConsideredEventsCount);
-						}
-						_onFetchCompleted(_skipFirstEvent ? msg.Events.Skip(1).ToArray() : msg.Events,
-							new PersistentSubscriptionAllStreamPosition(msg.NextPos.CommitPosition, msg.NextPos.PreparePosition), msg.IsEndOfStream);
-
-						break;
-					case FilteredReadAllResult.AccessDenied:
-						_onError($"Read access denied for stream: {SystemStreams.AllStream}");
-						break;
-					default:
-						_onError(msg.Error ?? $"Error reading stream: {SystemStreams.AllStream} at position: {msg.CurrentPos}");
-						break;
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionToAllParamsBuilder.cs b/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionToAllParamsBuilder.cs
deleted file mode 100644
index cc6ba119f7a..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionToAllParamsBuilder.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-using EventStore.Core.Services.PersistentSubscription.ConsumerStrategy;
-using EventStore.Core.Services.Storage.ReaderIndex;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	/// <summary>
-	/// Builds a <see cref="PersistentSubscriptionParams"/> object.
-	/// </summary>
-	public class PersistentSubscriptionToAllParamsBuilder : PersistentSubscriptionParamsBuilder {
-		/// <summary>
-		/// Creates a new <see cref="PersistentSubscriptionParamsBuilder"></see> object
-		/// </summary>
-		/// <param name="groupName">The name of the group of the subscription</param>
-		/// <param name="filter">The optional filter for the subscription</param>
-		/// <returns>a new <see cref="PersistentSubscriptionParamsBuilder"></see> object</returns>
-		public static PersistentSubscriptionParamsBuilder CreateFor(string groupName, IEventFilter filter = null) {
-			return new PersistentSubscriptionToAllParamsBuilder()
-				.FromAll(filter)
-				.StartFrom(0L, 0L)
-				.SetGroup(groupName)
-				.SetSubscriptionId("$all" + ":" + groupName)
-				.DoNotResolveLinkTos()
-				.WithMessageTimeoutOf(TimeSpan.FromSeconds(30))
-				.WithHistoryBufferSizeOf(500)
-				.WithLiveBufferSizeOf(500)
-				.WithMaxRetriesOf(10)
-				.WithReadBatchOf(20)
-				.CheckPointAfter(TimeSpan.FromSeconds(1))
-				.MinimumToCheckPoint(5)
-				.MaximumToCheckPoint(1000)
-				.MaximumSubscribers(0)
-				.WithNamedConsumerStrategy(new RoundRobinPersistentSubscriptionConsumerStrategy());
-		}
-
-		public PersistentSubscriptionToAllParamsBuilder FromAll(IEventFilter filter = null) {
-			WithEventSource(new PersistentSubscriptionAllStreamEventSource(filter));
-			return this;
-		}
-
-		public PersistentSubscriptionToAllParamsBuilder StartFrom(long commitPosition, long preparePosition) {
-			StartFrom(new PersistentSubscriptionAllStreamPosition(commitPosition, preparePosition));
-			return this;
-		}
-
-		public override PersistentSubscriptionParamsBuilder StartFromBeginning() {
-			StartFrom(new PersistentSubscriptionAllStreamPosition(0, 0));
-			return this;
-		}
-
-		public override PersistentSubscriptionParamsBuilder StartFromCurrent() {
-			StartFrom(new PersistentSubscriptionAllStreamPosition(-1, -1));
-			return this;
-		}
-
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionToStreamParamsBuilder.cs b/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionToStreamParamsBuilder.cs
deleted file mode 100644
index 86452172374..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/PersistentSubscriptionToStreamParamsBuilder.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Services.PersistentSubscription.ConsumerStrategy;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	/// <summary>
-	/// Builds a <see cref="PersistentSubscriptionParams"/> object.
-	/// </summary>
-	public class PersistentSubscriptionToStreamParamsBuilder : PersistentSubscriptionParamsBuilder {
-		/// <summary>
-		/// Creates a new <see cref="PersistentSubscriptionParamsBuilder"></see> object
-		/// </summary>
-		/// <param name="streamName">The name of the stream for the subscription</param>
-		/// <param name="groupName">The name of the group of the subscription</param>
-		/// <returns>a new <see cref="PersistentSubscriptionParamsBuilder"></see> object</returns>
-		public static PersistentSubscriptionParamsBuilder CreateFor(string streamName, string groupName) {
-			return new PersistentSubscriptionToStreamParamsBuilder()
-				.FromStream(streamName)
-				.StartFrom(0)
-				.SetGroup(groupName)
-				.SetSubscriptionId(streamName + ":" + groupName)
-				.DoNotResolveLinkTos()
-				.WithMessageTimeoutOf(TimeSpan.FromSeconds(30))
-				.WithHistoryBufferSizeOf(500)
-				.WithLiveBufferSizeOf(500)
-				.WithMaxRetriesOf(10)
-				.WithReadBatchOf(20)
-				.CheckPointAfter(TimeSpan.FromSeconds(1))
-				.MinimumToCheckPoint(5)
-				.MaximumToCheckPoint(1000)
-				.MaximumSubscribers(0)
-				.WithNamedConsumerStrategy(new RoundRobinPersistentSubscriptionConsumerStrategy());
-		}
-
-		public PersistentSubscriptionToStreamParamsBuilder FromStream(string stream) {
-			WithEventSource(new PersistentSubscriptionSingleStreamEventSource(stream));
-			return this;
-		}
-
-		public PersistentSubscriptionToStreamParamsBuilder StartFrom(long startFrom) {
-			StartFrom(new PersistentSubscriptionSingleStreamPosition(startFrom));
-			return this;
-		}
-
-		public override PersistentSubscriptionParamsBuilder StartFromBeginning() {
-			StartFrom(new PersistentSubscriptionSingleStreamPosition(0));
-			return this;
-		}
-
-		public override PersistentSubscriptionParamsBuilder StartFromCurrent() {
-			StartFrom(new PersistentSubscriptionSingleStreamPosition(-1));
-			return this;
-		}
-
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/RequestStatistics.cs b/src/EventStore.Core/Services/PersistentSubscription/RequestStatistics.cs
deleted file mode 100644
index 4a206d1c4d2..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/RequestStatistics.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public class RequestStatistics {
-		private readonly Func<long> _getElapsedTicks;
-
-		//TODO CC this can likely be done in a smarter way (though a few thousand ints is still pretty cheap memory wise)
-		private readonly Queue<long> _measurements;
-		private readonly ConcurrentDictionary<Guid, Operation> _operations = new();
-		private readonly int _windowSize;
-
-		public RequestStatistics(Func<long> getElapsedTicks, int windowSize) {
-			_getElapsedTicks = getElapsedTicks;
-			_windowSize = windowSize;
-			_measurements = new Queue<long>(windowSize);
-		}
-
-		public RequestStatistics(Stopwatch watch, int windowSize) : this(() => watch.ElapsedTicks, windowSize) {
-		}
-
-		public void StartOperation(Guid id) {
-			var record = new Operation {Start = _getElapsedTicks()};
-			_operations.AddOrUpdate(id, record, (_, _) => record);
-		}
-
-		public void EndOperation(Guid id) {
-			if (!_operations.TryRemove(id, out var record)) return;
-			var current = _getElapsedTicks();
-			var time = current - record.Start;
-			var ms = time / TimeSpan.TicksPerMillisecond;
-			if (_measurements.Count >= _windowSize) {
-				_measurements.Dequeue();
-			}
-
-			_measurements.Enqueue(ms);
-		}
-
-		public ObservedTimingMeasurement GetMeasurementDetails() {
-			var ret = new ObservedTimingMeasurement();
-			if (_measurements == null || _measurements.Count == 0) return ret;
-			var items = _measurements.ToArray();
-			Array.Sort(items);
-			ret.Measurements.Add(Measurement.From("Mean", items.Sum() / items.Length));
-			ret.Measurements.Add(Measurement.From("Median", items[items.Length / 2]));
-			ret.Measurements.Add(Measurement.From("Fastest", items[0]));
-			for (var i = 0; i < 5; i++) {
-				ret.Measurements.Add(
-					Measurement.From("Quintile " + (i + 1), items[GetPercentile(i * 20, items.Length)]));
-			}
-
-			ret.Measurements.Add(Measurement.From("90%", items[GetPercentile(90m, items.Length)]));
-			ret.Measurements.Add(Measurement.From("95%", items[GetPercentile(95m, items.Length)]));
-			ret.Measurements.Add(Measurement.From("99%", items[GetPercentile(99m, items.Length)]));
-			ret.Measurements.Add(Measurement.From("99.5%", items[GetPercentile(99.5m, items.Length)]));
-			ret.Measurements.Add(Measurement.From("99.9%", items[GetPercentile(99.9m, items.Length)]));
-			ret.Measurements.Add(Measurement.From("Highest", items[^1]));
-			return ret;
-		}
-
-		public void ClearMeasurements() {
-			_measurements.Clear();
-		}
-
-		private int GetPercentile(decimal percentile, int size) {
-			decimal percent = 0;
-			percent = percentile / 100m;
-			var ret = (int)(percent * size);
-			if (ret == size) ret -= 1;
-			return ret;
-		}
-
-		struct Operation {
-			public long Start;
-		}
-	}
-
-	public class ObservedTimingMeasurement {
-		public readonly List<Measurement> Measurements = new List<Measurement>();
-	}
-
-	public struct Measurement {
-		public readonly string Key;
-		public readonly long Value;
-
-		public Measurement(string key, long value) {
-			Key = key;
-			Value = value;
-		}
-
-		public static Measurement From(string key, long value) => new(key, value);
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/RetryableMessage.cs b/src/EventStore.Core/Services/PersistentSubscription/RetryableMessage.cs
deleted file mode 100644
index 88056ba090f..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/RetryableMessage.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public struct RetryableMessage {
-		public readonly Guid MessageId;
-		public readonly DateTime DueTime;
-
-		public RetryableMessage(Guid messageId, DateTime dueTime) {
-			MessageId = messageId;
-			DueTime = dueTime;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/SequencedEvent.cs b/src/EventStore.Core/Services/PersistentSubscription/SequencedEvent.cs
deleted file mode 100644
index 07c3f68f4b5..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/SequencedEvent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using EventStore.Core.Data;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public struct SequencedEvent {
-		public readonly long Sequence;
-		public readonly ResolvedEvent Event;
-
-		public SequencedEvent(long sequence, ResolvedEvent @event) {
-			this.Sequence = sequence;
-			this.Event = @event;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/PersistentSubscription/StreamBuffer.cs b/src/EventStore.Core/Services/PersistentSubscription/StreamBuffer.cs
deleted file mode 100644
index e4948ec6493..00000000000
--- a/src/EventStore.Core/Services/PersistentSubscription/StreamBuffer.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.DataStructures;
-
-namespace EventStore.Core.Services.PersistentSubscription {
-	public class StreamBuffer {
-		private readonly int _maxBufferSize;
-		private readonly IPersistentSubscriptionStreamPosition _initialSequence;
-		private readonly LinkedList<OutstandingMessage> _retry = new LinkedList<OutstandingMessage>();
-		private readonly LinkedList<OutstandingMessage> _buffer = new LinkedList<OutstandingMessage>();
-
-		private readonly BoundedQueue<OutstandingMessage> _liveBuffer;
-
-		public long LiveBufferCount {
-			get { return _liveBuffer.Count; }
-		}
-
-		public int BufferCount {
-			get { return _retry.Count + _buffer.Count; }
-		}
-
-		public int RetryBufferCount {
-			get { return _retry.Count; }
-		}
-
-		public int ReadBufferCount {
-			get { return _buffer.Count; }
-		}
-
-		public bool Live { get; private set; }
-
-		public bool CanAccept(int count) {
-			return _maxBufferSize - BufferCount > count;
-		}
-
-		public StreamBuffer(int maxBufferSize, int maxLiveBufferSize, IPersistentSubscriptionStreamPosition initialSequence, bool startInHistory) {
-			Live = !startInHistory;
-			_initialSequence = initialSequence;
-			_maxBufferSize = maxBufferSize;
-			_liveBuffer = new BoundedQueue<OutstandingMessage>(maxLiveBufferSize);
-		}
-
-		private void SwitchToLive() {
-			while (_liveBuffer.Count > 0) {
-				_buffer.AddLast(_liveBuffer.Dequeue());
-			}
-
-			Live = true;
-		}
-
-		private void DrainLiveTo(IPersistentSubscriptionStreamPosition eventPosition) {
-			while (_liveBuffer.Count > 0 && _liveBuffer.Peek().EventPosition.CompareTo(eventPosition) < 0) {
-				_liveBuffer.Dequeue();
-			}
-		}
-
-		public void AddRetry(OutstandingMessage ev) {
-			//add parked messages at the end of the list
-			if (ev.IsReplayedEvent) {
-				_retry.AddLast(ev);
-				return;
-			}
-
-			//if it's not a parked message, it should have an event position
-			Debug.Assert(ev.EventPosition != null);
-
-			// Insert the retried event before any events with higher version number.
-			var retryEventPosition = ev.EventPosition;
-
-			var currentNode = _retry.First;
-
-			while (currentNode != null) {
-				var currentEventPosition = currentNode.Value.EventPosition;
-				if (retryEventPosition.CompareTo(currentEventPosition) < 0) {
-					_retry.AddBefore(currentNode, ev);
-					return;
-				}
-
-				currentNode = currentNode.Next;
-			}
-
-			_retry.AddLast(ev);
-		}
-
-		public void AddLiveMessage(OutstandingMessage ev) {
-			if (Live) {
-				if (_buffer.Count < _maxBufferSize)
-					_buffer.AddLast(ev);
-				else
-					Live = false;
-			}
-
-			_liveBuffer.Enqueue(ev);
-		}
-
-		public void AddReadMessage(OutstandingMessage ev) {
-			if (Live) return;
-			if (_initialSequence != null &&
-			    ev.EventPosition.CompareTo(_initialSequence) <= 0)
-				return;
-
-			var livePosition = TryPeekLive();
-			if (livePosition == null || ev.EventPosition.CompareTo(livePosition) < 0) {
-				_buffer.AddLast(ev);
-			} else if (livePosition.CompareTo(ev.EventPosition) < 0) {
-				DrainLiveTo(ev.EventPosition);
-				SwitchToLive();
-			} else {
-				SwitchToLive();
-			}
-		}
-
-		private IPersistentSubscriptionStreamPosition TryPeekLive() {
-			return _liveBuffer.Count == 0 ? null : _liveBuffer.Peek().EventPosition;
-		}
-
-		public IEnumerable<OutstandingMessagePointer> Scan() {
-			// This enumerator assumes that nothing is added to the buffers during enumeration.
-
-			foreach (var list in new[] {_retry, _buffer}) // save on code duplication
-			{
-				var current = list.First;
-				if (current != null) {
-					do {
-						// We have to copy next before yielding as the expectation is
-						// that current is removed from the list setting next to null.
-						var next = current.Next;
-
-						yield return new OutstandingMessagePointer(current);
-
-						current = next;
-					} while (current != null);
-				}
-			}
-		}
-
-		public bool TryMoveToLive() {
-			if (_liveBuffer.Count == 0) {
-				Live = true;
-				return true;
-			}
-
-			return false;
-		}
-
-		public (OutstandingMessage? message, long sequenceNumber) GetLowestRetry() {
-			(OutstandingMessage? message, long sequenceNumber) result = (null, long.MaxValue);
-			foreach(var x in _retry) {
-				if (x.IsReplayedEvent || !x.EventSequenceNumber.HasValue) continue;
-				if (x.EventSequenceNumber.Value < result.sequenceNumber) {
-					result = (x, x.EventSequenceNumber.Value);
-				}
-			}
-			return result;
-		}
-
-		public struct OutstandingMessagePointer {
-			private readonly LinkedListNode<OutstandingMessage> _entry;
-
-			internal OutstandingMessagePointer(LinkedListNode<OutstandingMessage> entry)
-				: this() {
-				_entry = entry;
-			}
-
-			public OutstandingMessage Message {
-				get { return _entry.Value; }
-			}
-
-			public void MarkSent() {
-				if (_entry.List == null) {
-					throw new InvalidOperationException("The message can only be accepted once.");
-				}
-
-				_entry.List.Remove(_entry);
-			}
-		}
-	}
-
-	public enum BufferedStreamReaderState {
-		Unknown,
-		CatchingUp,
-		Live
-	}
-}
diff --git a/src/EventStore.Core/Services/RedactionService.cs b/src/EventStore.Core/Services/RedactionService.cs
deleted file mode 100644
index c94667efa6d..00000000000
--- a/src/EventStore.Core/Services/RedactionService.cs
+++ /dev/null
@@ -1,277 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data.Redaction;
-using EventStore.Core.Exceptions;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Synchronization;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Plugins.Transforms;
-using Serilog;
-
-namespace EventStore.Core.Services {
-	public abstract class RedactionService {
-		protected static readonly ILogger Log = Serilog.Log.ForContext<RedactionService>();
-	}
-
-	public class RedactionService<TStreamId> :
-		RedactionService,
-		IHandle<RedactionMessage.GetEventPosition>,
-		IHandle<RedactionMessage.AcquireChunksLock>,
-		IHandle<RedactionMessage.SwitchChunk>,
-		IHandle<RedactionMessage.ReleaseChunksLock>,
-		IHandle<SystemMessage.BecomeShuttingDown> {
-
-		private readonly IQueuedHandler _queuedHandler;
-		private readonly TFChunkDb _db;
-		private readonly IReadIndex<TStreamId> _readIndex;
-		private readonly SemaphoreSlimLock _switchChunksLock;
-
-		private const string NewChunkFileExtension = ".tmp";
-
-		public RedactionService(
-			IQueuedHandler queuedHandler,
-			TFChunkDb db,
-			IReadIndex<TStreamId> readIndex,
-			SemaphoreSlimLock switchChunksLock) {
-			Ensure.NotNull(queuedHandler, nameof(queuedHandler));
-			Ensure.NotNull(db, nameof(db));
-			Ensure.NotNull(readIndex, nameof(readIndex));
-			Ensure.NotNull(switchChunksLock, nameof(switchChunksLock));
-
-			_queuedHandler = queuedHandler;
-			_db = db;
-			_readIndex = readIndex;
-			_switchChunksLock = switchChunksLock;
-		}
-
-		public void Handle(RedactionMessage.GetEventPosition message) {
-			try {
-				GetEventPosition(message.EventStreamId, message.EventNumber, message.Envelope);
-			} catch (Exception ex) {
-				Log.Error(ex, "REDACTION: An error has occurred when getting position for stream: {stream}, event number: {eventNumber}.",
-					message.EventStreamId, message.EventNumber);
-				message.Envelope.ReplyWith(
-					new RedactionMessage.GetEventPositionCompleted(GetEventPositionResult.UnexpectedError, Array.Empty<EventPosition>()));
-			}
-		}
-
-		private void GetEventPosition(string streamName, long eventNumber, IEnvelope envelope) {
-			var streamId = _readIndex.GetStreamId(streamName);
-			var result = _readIndex.ReadEventInfo_KeepDuplicates(streamId, eventNumber);
-
-			var eventPositions = new EventPosition[result.EventInfos.Length];
-
-			for (int i = 0; i < result.EventInfos.Length; i++) {
-				var eventInfo = result.EventInfos[i];
-				var logPos = eventInfo.LogPosition;
-				var chunk = _db.Manager.GetChunkFor(logPos);
-				var localPosition = chunk.ChunkHeader.GetLocalLogPosition(logPos);
-				var chunkEventOffset = chunk.GetActualRawPosition(localPosition);
-
-				// all the events returned by ReadEventInfo_KeepDuplicates() must exist in the log
-				// since the log record was read from the chunk to check for hash collisions.
-				if (chunkEventOffset < 0)
-					throw new Exception($"Failed to fetch actual raw position for event at log position: {logPos}");
-
-				if (chunkEventOffset > uint.MaxValue)
-					throw new Exception($"Actual raw position for event at log position: {logPos} is larger than uint.MaxValue: {chunkEventOffset}");
-
-				eventPositions[i] = new EventPosition(
-					logPosition: logPos,
-					chunkFile: Path.GetFileName(chunk.FileName),
-					chunkVersion: chunk.ChunkHeader.MinCompatibleVersion,
-					chunkComplete: chunk.ChunkFooter is { IsCompleted: true },
-					chunkEventOffset: (uint) chunkEventOffset);
-			}
-
-			envelope.ReplyWith(
-				new RedactionMessage.GetEventPositionCompleted(GetEventPositionResult.Success, eventPositions));
-		}
-
-		public void Handle(RedactionMessage.AcquireChunksLock message) {
-			if (_switchChunksLock.TryAcquire(out var acquisitionId)) {
-				Log.Information("REDACTION: Acquired the chunks lock");
-				message.Envelope.ReplyWith(
-					new RedactionMessage.AcquireChunksLockCompleted(AcquireChunksLockResult.Success, acquisitionId));
-			} else {
-				Log.Information("REDACTION: Failed to acquire the chunks lock");
-				message.Envelope.ReplyWith(
-					new RedactionMessage.AcquireChunksLockCompleted(AcquireChunksLockResult.Failed, Guid.Empty));
-			}
-		}
-
-		public void Handle(RedactionMessage.ReleaseChunksLock message) {
-			if (_switchChunksLock.TryRelease(message.AcquisitionId)) {
-				Log.Information("REDACTION: Released the chunks lock");
-				message.Envelope.ReplyWith(
-					new RedactionMessage.ReleaseChunksLockCompleted(ReleaseChunksLockResult.Success));
-			} else {
-				Log.Information("REDACTION: Failed to release the chunks lock");
-				message.Envelope.ReplyWith(
-					new RedactionMessage.ReleaseChunksLockCompleted(ReleaseChunksLockResult.Failed));
-			}
-		}
-
-		public void Handle(RedactionMessage.SwitchChunk message) {
-			var currentAcquisitionId = _switchChunksLock.CurrentAcquisitionId;
-			if (currentAcquisitionId != message.AcquisitionId) {
-				Log.Error("REDACTION: Skipping switching of chunk: {targetChunk} with chunk: {newChunk} " +
-				          "as the lock is not currently held by the requester. " +
-				          "(Requester\'s lock ID: {requestLockId:B}. Current lock ID: {currentLockId:B})",
-					message.TargetChunkFile, message.NewChunkFile, message.AcquisitionId, currentAcquisitionId);
-				message.Envelope.ReplyWith(
-					new RedactionMessage.SwitchChunkCompleted(SwitchChunkResult.UnexpectedError));
-				return;
-			}
-
-			try {
-				Log.Information("REDACTION: Replacing chunk {targetChunk} with {newChunk}", message.TargetChunkFile, message.NewChunkFile);
-				SwitchChunk(message.TargetChunkFile, message.NewChunkFile, message.Envelope);
-			} catch (Exception ex) {
-				Log.Error(ex, "REDACTION: An error has occurred when trying to switch chunk: {targetChunk} with chunk: {newChunk}.",
-					message.TargetChunkFile, message.NewChunkFile);
-				message.Envelope.ReplyWith(
-					new RedactionMessage.SwitchChunkCompleted(SwitchChunkResult.UnexpectedError));
-			}
-		}
-
-		private void SwitchChunk(string targetChunkFile, string newChunkFile, IEnvelope envelope) {
-			if (!IsValidSwitchChunkRequest(targetChunkFile, newChunkFile, out var newChunk, out var failReason)) {
-				envelope.ReplyWith(new RedactionMessage.SwitchChunkCompleted(failReason));
-				return;
-			}
-
-			_db.Manager.SwitchChunk(
-				chunk: newChunk,
-				verifyHash: false,
-				removeChunksWithGreaterNumbers: false);
-
-			envelope.ReplyWith(new RedactionMessage.SwitchChunkCompleted(SwitchChunkResult.Success));
-		}
-
-		private static bool IsUnsafeFileName(string fileName) {
-			// protect against directory traversal attacks
-			return fileName.Contains('/') || fileName.Contains('\\') || fileName.Contains("..");
-		}
-
-		private bool IsValidSwitchChunkRequest(string targetChunkFile, string newChunkFile, out TFChunk newChunk, out SwitchChunkResult failReason) {
-			newChunk = null;
-
-			if (IsUnsafeFileName(targetChunkFile)) {
-				failReason = SwitchChunkResult.TargetChunkFileNameInvalid;
-				return false;
-			}
-
-			if (IsUnsafeFileName(newChunkFile)) {
-				failReason = SwitchChunkResult.NewChunkFileNameInvalid;
-				return false;
-			}
-
-			int targetChunkNumber;
-			try {
-				targetChunkNumber = _db.Config.FileNamingStrategy.GetIndexFor(targetChunkFile);
-			} catch {
-				failReason = SwitchChunkResult.TargetChunkFileNameInvalid;
-				return false;
-			}
-
-			if (Path.GetExtension(newChunkFile) != NewChunkFileExtension) {
-				failReason = SwitchChunkResult.NewChunkFileNameInvalid;
-				return false;
-			}
-
-			if (!File.Exists(Path.Combine(_db.Config.Path, targetChunkFile))) {
-				failReason = SwitchChunkResult.TargetChunkFileNotFound;
-				return false;
-			}
-
-			var newChunkPath = Path.Combine(_db.Config.Path, newChunkFile);
-			if (!File.Exists(newChunkPath)) {
-				failReason = SwitchChunkResult.NewChunkFileNotFound;
-				return false;
-			}
-
-			TFChunk targetChunk;
-			try {
-				targetChunk = _db.Manager.GetChunk(targetChunkNumber);
-			} catch(ArgumentOutOfRangeException) {
-				failReason = SwitchChunkResult.TargetChunkExcessive;
-				return false;
-			}
-
-			if (Path.GetFileName(targetChunk.FileName) != targetChunkFile) {
-				failReason = SwitchChunkResult.TargetChunkInactive;
-				return false;
-			}
-
-			if (targetChunk.ChunkFooter is not { IsCompleted: true }) {
-				failReason = SwitchChunkResult.TargetChunkNotCompleted;
-				return false;
-			}
-
-			if (targetChunk.ChunkHeader.TransformType != TransformType.Identity) {
-				failReason = SwitchChunkResult.TargetChunkFormatNotSupported;
-				return false;
-			}
-
-			ChunkHeader newChunkHeader;
-			ChunkFooter newChunkFooter;
-			try {
-				using var fs = new FileStream(newChunkPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-				try {
-					newChunkHeader = ChunkHeader.FromStream(fs);
-					fs.Seek(-ChunkFooter.Size, SeekOrigin.End);
-					newChunkFooter = ChunkFooter.FromStream(fs);
-				} catch {
-					failReason = SwitchChunkResult.NewChunkHeaderOrFooterInvalid;
-					return false;
-				}
-			} catch {
-				failReason = SwitchChunkResult.NewChunkOpenFailed;
-				return false;
-			}
-
-			if (newChunkHeader.ChunkStartNumber != targetChunk.ChunkHeader.ChunkStartNumber ||
-			    newChunkHeader.ChunkEndNumber != targetChunk.ChunkHeader.ChunkEndNumber) {
-				failReason = SwitchChunkResult.ChunkRangeDoesNotMatch;
-				return false;
-			}
-
-			if (!newChunkFooter.IsCompleted) {
-				failReason = SwitchChunkResult.NewChunkNotCompleted;
-				return false;
-			}
-
-			try {
-				// temporarily open the chunk to verify its integrity
-				newChunk = TFChunk.FromCompletedFile(
-					filename: newChunkPath,
-					verifyHash: true,
-					unbufferedRead: _db.Config.Unbuffered,
-					optimizeReadSideCache: false,
-					reduceFileCachePressure: true,
-					tracker: new TFChunkTracker.NoOp(),
-					getTransformFactory: type => _db.TransformManager.GetFactoryForExistingChunk(type));
-			} catch (HashValidationException) {
-				failReason = SwitchChunkResult.NewChunkHashInvalid;
-				return false;
-			} catch {
-				failReason = SwitchChunkResult.NewChunkOpenFailed;
-				return false;
-			}
-
-			failReason = SwitchChunkResult.None;
-			return true;
-		}
-
-		public void Handle(SystemMessage.BecomeShuttingDown message) {
-			// _switchChunksLock is not disposed here since it's shared between multiple services
-			_queuedHandler?.RequestStop();
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Replication/LeaderReplicationService.cs b/src/EventStore.Core/Services/Replication/LeaderReplicationService.cs
deleted file mode 100644
index 1f93f9118a5..00000000000
--- a/src/EventStore.Core/Services/Replication/LeaderReplicationService.cs
+++ /dev/null
@@ -1,814 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Exceptions;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Monitoring.Stats;
-using EventStore.Core.Services.Storage.EpochManager;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Transport.Tcp;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Replication {
-	public static class ReplicationSubscriptionVersions {
-		// original
-		public const int V0 = 0;
-
-		// explicit writer checkpoint in acks
-		public const int V1 = 1;
-
-		// always replicate chunk headers
-		// (send CreateChunk message for DataChunkBulk not just RawChunkBulk)
-		public const int V2 = 2;
-
-		public const int V_CURRENT = V2;
-	}
-
-	public class LeaderReplicationService : IMonitoredQueue,
-		IHandle<SystemMessage.SystemStart>,
-		IHandle<SystemMessage.StateChangeMessage>,
-		IHandle<SystemMessage.EnablePreLeaderReplication>,
-		IHandle<ReplicationMessage.ReplicaSubscriptionRequest>,
-		IHandle<ReplicationMessage.ReplicaLogPositionAck>,
-		IHandle<ReplicationMessage.GetReplicationStats>,
-		IHandle<ReplicationTrackingMessage.ReplicatedTo> {
-		public const int MaxQueueSize = 100;
-		public const int CloneThreshold = 1024;
-		public const int FollowerLagThreshold = 256 * 1024;
-		public const int LagOccurencesThreshold = 2;
-		public const int BulkSize = 8192;
-		public const int ReplicaSendWindow = 16 * 1024 * 1024;
-		public const int ReplicaAckWindow = 512 * 1024;
-		public static readonly TimeSpan RoleAssignmentsInterval = TimeSpan.FromMilliseconds(1000);
-		public static readonly TimeSpan NoQuorumTimeout = TimeSpan.FromMilliseconds(3000);
-
-		private static readonly ILogger Log = Serilog.Log.ForContext<LeaderReplicationService>();
-
-		public string Name {
-			get { return _queueStats.Name; }
-		}
-
-		private readonly IPublisher _publisher;
-		private readonly Guid _instanceId;
-		private readonly TFChunkDb _db;
-		private readonly IPublisher _tcpSendPublisher;
-		private readonly IEpochManager _epochManager;
-		private readonly int _clusterSize;
-		private readonly bool _unsafeAllowSurplusNodes;
-
-		private readonly Thread _mainLoopThread;
-		private volatile bool _stop;
-		private readonly QueueStatsCollector _queueStats;
-
-		private readonly ConcurrentDictionary<Guid, ReplicaSubscription> _subscriptions =
-			new ConcurrentDictionary<Guid, ReplicaSubscription>();
-
-		private volatile VNodeState _state = VNodeState.Initializing;
-
-		private readonly Stopwatch _stopwatch = Stopwatch.StartNew();
-		private TimeSpan _lastRolesAssignmentTimestamp;
-		private volatile bool _newSubscriptions;
-		private TimeSpan _noQuorumTimestamp = TimeSpan.Zero;
-		private bool _noQuorumNotified;
-		private bool _preLeaderReplicationEnabled;
-		private ManualResetEventSlim _flushSignal = new ManualResetEventSlim(false, 1);
-		private readonly TaskCompletionSource<object> _tcs = new TaskCompletionSource<object>();
-
-		public Task Task {
-			get { return _tcs.Task; }
-		}
-
-		public LeaderReplicationService(
-			IPublisher publisher,
-			Guid instanceId,
-			TFChunkDb db,
-			IPublisher tcpSendPublisher,
-			IEpochManager epochManager,
-			int clusterSize,
-			bool unsafeAllowSurplusNodes,
-			QueueStatsManager queueStatsManager) {
-			Ensure.NotNull(publisher, "publisher");
-			Ensure.NotEmptyGuid(instanceId, "instanceId");
-			Ensure.NotNull(db, "db");
-			Ensure.NotNull(tcpSendPublisher, "tcpSendPublisher");
-			Ensure.NotNull(epochManager, "epochManager");
-			Ensure.Positive(clusterSize, "clusterSize");
-
-			_publisher = publisher;
-			_instanceId = instanceId;
-			_db = db;
-			_tcpSendPublisher = tcpSendPublisher;
-			_epochManager = epochManager;
-			_clusterSize = clusterSize;
-			_unsafeAllowSurplusNodes = unsafeAllowSurplusNodes;
-			_queueStats = queueStatsManager.CreateQueueStatsCollector("Leader Replication Service");
-
-			_lastRolesAssignmentTimestamp = _stopwatch.Elapsed;
-			_mainLoopThread = new Thread(MainLoop) {Name = _queueStats.Name, IsBackground = true};
-		}
-
-		public void Handle(SystemMessage.SystemStart message) {
-			_mainLoopThread.Start();
-		}
-
-		public void Handle(SystemMessage.StateChangeMessage message) {
-			_state = message.State;
-
-			if (message.State == VNodeState.PreLeader) {
-				_preLeaderReplicationEnabled = false;
-				_noQuorumTimestamp = TimeSpan.Zero;
-			}
-
-			if (message.State == VNodeState.Leader)
-				_noQuorumTimestamp = TimeSpan.Zero;
-
-			if (message.State == VNodeState.ShuttingDown)
-				_stop = true;
-		}
-
-		public void Handle(SystemMessage.EnablePreLeaderReplication message) {
-			_preLeaderReplicationEnabled = true;
-		}
-
-		private bool CanAcceptSubscription(ReplicationMessage.ReplicaSubscriptionRequest message) {
-			return CanAcceptSubscriptions() && message.LeaderId == _instanceId;
-		}
-
-		private bool CanAcceptSubscriptions() {
-			if (_state == VNodeState.Leader)
-				return true;
-
-			if (_state == VNodeState.PreLeader && _preLeaderReplicationEnabled)
-				return true;
-
-			return false;
-		}
-
-		public void Handle(ReplicationMessage.ReplicaSubscriptionRequest message) {
-			_publisher.Publish(new SystemMessage.VNodeConnectionEstablished(message.ReplicaEndPoint,
-				message.Connection.ConnectionId));
-
-			if (!CanAcceptSubscription(message)) {
-				message.Envelope.ReplyWith(
-					new ReplicationMessage.ReplicaSubscriptionRetry(_instanceId, message.SubscriptionId));
-				return;
-			}
-
-			var subscription = new ReplicaSubscription(_tcpSendPublisher,
-				message.Version,
-				message.Connection,
-				message.SubscriptionId,
-				message.ReplicaEndPoint,
-				message.IsPromotable);
-
-			foreach (var subscr in _subscriptions.Values) {
-				if (subscr != subscription && subscr.ConnectionId == subscription.ConnectionId)
-					subscr.ShouldDispose = true;
-			}
-
-			if (SubscribeReplica(subscription, message.LastEpochs, message.CorrelationId, message.LogPosition,
-				message.ChunkId)) {
-				_newSubscriptions = true;
-				if (!_subscriptions.TryAdd(subscription.SubscriptionId, subscription)) {
-					ReplicaSubscription existingSubscr;
-					_subscriptions.TryGetValue(subscription.SubscriptionId, out existingSubscr);
-					Log.Error(
-						"There is already a subscription with SubscriptionID {subscriptionId:B}: {existingSubscription}.",
-						subscription.SubscriptionId, existingSubscr);
-					Log.Error("Subscription we tried to add: {existingSubscription}.", existingSubscr);
-					subscription.SendBadRequestAndClose(message.CorrelationId, string.Format(
-						"There is already a subscription with SubscriptionID {0:B}: {1}.\nSubscription we tried to add: {2}",
-						subscription.SubscriptionId, existingSubscr, subscription));
-					subscription.Dispose();
-				} else {
-					var replicationCheckpoint = _db.Config.ReplicationCheckpoint.Read();
-					subscription.SendMessage(new ReplicationTrackingMessage.ReplicatedTo(replicationCheckpoint));
-					_flushSignal.Set();
-				}
-			}
-		}
-
-		public void Handle(ReplicationMessage.ReplicaLogPositionAck message) {
-			if (_subscriptions.TryGetValue(message.SubscriptionId, out var subscription)) {
-				Interlocked.Exchange(ref subscription.AckedLogPosition, message.ReplicationLogPosition);
-				if (subscription.IsPromotable) {
-					var replicatedToLogPosition = subscription.Version == ReplicationSubscriptionVersions.V0
-						? message.ReplicationLogPosition
-						: message.WriterLogPosition;
-					_publisher.Publish(new ReplicationTrackingMessage.ReplicaWriteAck(message.SubscriptionId, replicatedToLogPosition));
-				}
-			}
-		}
-
-		public void Handle(ReplicationMessage.GetReplicationStats message) {
-			var connections = TcpConnectionMonitor.Default.GetTcpConnectionStats();
-			var replicaStats = new List<ReplicationMessage.ReplicationStats>();
-			foreach (var conn in connections) {
-				var tcpConn = conn as ITcpConnection;
-				if (tcpConn != null) {
-					var subscription = _subscriptions.FirstOrDefault(x => x.Value.ConnectionId == tcpConn.ConnectionId);
-					if (subscription.Value != null) {
-						var stats = new ReplicationMessage.ReplicationStats(subscription.Key, tcpConn.ConnectionId,
-							subscription.Value.ReplicaEndPoint.ToString(), tcpConn.SendQueueSize,
-							conn.TotalBytesSent, conn.TotalBytesReceived, conn.PendingSendBytes,
-							conn.PendingReceivedBytes);
-						replicaStats.Add(stats);
-					}
-				}
-			}
-
-			message.Envelope.ReplyWith(new ReplicationMessage.GetReplicationStatsCompleted(replicaStats));
-		}
-
-		private bool SubscribeReplica(ReplicaSubscription replica, Epoch[] lastEpochs, Guid correlationId,
-			long logPosition, Guid chunkId) {
-			try {
-				var epochs = lastEpochs ?? new Epoch[0];
-				Log.Information(
-					"SUBSCRIBE REQUEST from [{replicaEndPoint},V:{version},C:{connectionId:B},S:{subscriptionId:B},{logPosition}(0x{logPosition:X}),{epochs}]...",
-					replica.ReplicaEndPoint, replica.Version, replica.ConnectionId, replica.SubscriptionId, logPosition, logPosition,
-					string.Join(", ", epochs.Select(x => EpochRecordExtensions.AsString((Epoch)x))));
-
-				var epochCorrectedLogPos =
-					GetValidLogPosition(logPosition, epochs, replica.ReplicaEndPoint, replica.SubscriptionId);
-				var subscriptionPos = SetSubscriptionPosition(replica, epochCorrectedLogPos, chunkId,
-					replicationStart: true, verbose: true, trial: 0);
-				Interlocked.Exchange(ref replica.AckedLogPosition, subscriptionPos);
-
-				if (subscriptionPos != logPosition) {
-					Log.Information("Replica is truncating. Sending it no more messages.");
-					replica.IsTruncating = true;
-				}
-
-				return true;
-			} catch (Exception exc) {
-				Log.Error(exc, "Exception while subscribing replica. Connection will be dropped.");
-				replica.SendBadRequestAndClose(correlationId,
-					string.Format("Exception while subscribing replica. Connection will be dropped. Error: {0}",
-						exc.Message));
-				return false;
-			}
-		}
-
-		private long GetValidLogPosition(long logPosition, Epoch[] epochs, EndPoint replicaEndPoint,
-			Guid subscriptionId) {
-			if (epochs.Length == 0) {
-				if (logPosition > 0) {
-					// follower has some data, but doesn't have any epoch
-					// for now we'll just report error and close connection
-					var msg = string.Format(
-						"Replica [{0},S:{1},{2}] has positive LogPosition {3} (0x{3:X}), but does not have epochs.",
-						replicaEndPoint, subscriptionId,
-						string.Join(", ", epochs.Select(x => x.AsString())), logPosition);
-					Log.Information(
-						"Replica [{replicaEndPoint},S:{subscriptionId},{epochs}] has positive LogPosition {logPosition} (0x{logPosition:X}), but does not have epochs.",
-						replicaEndPoint, subscriptionId,
-						string.Join(", ", epochs.Select(x => x.AsString())), logPosition, logPosition);
-					throw new Exception(msg);
-				}
-
-				return 0;
-			}
-
-			var leaderCheckpoint = _db.Config.WriterCheckpoint.Read();
-			Epoch nextEpochAfterCommonEpoch = null;
-			Epoch commonEpoch = null;
-			for (int i = 0; i < epochs.Length; ++i) {
-				var epoch = epochs[i];
-				if (_epochManager.IsCorrectEpochAt(epoch.EpochPosition, epoch.EpochNumber, epoch.EpochId)) {
-					commonEpoch = epoch;
-					nextEpochAfterCommonEpoch = i > 0 ? epochs[i - 1] : null;
-					break;
-				}
-			}
-
-			if (commonEpoch == null) {
-				Log.Error(
-					"No common epoch found for replica [{replicaEndPoint},S{subscriptionId},{logPosition}(0x{logPosition:X}),{epochs}]. Subscribing at 0. Leader LogPosition: {leaderCheckpoint} (0x{leaderCheckpoint:X}), known epochs: {knownEpochs}.",
-					replicaEndPoint, subscriptionId,
-					logPosition, logPosition,
-					string.Join(", ", epochs.Select(x => x.AsString())),
-					leaderCheckpoint, leaderCheckpoint,
-					string.Join(", ", _epochManager.GetLastEpochs(int.MaxValue).Select(x => x.AsString())));
-				return 0;
-			}
-
-			// if nextEpochAfterCommonEpoch is present, replica logPosition > nextEpochAfterCommonEpoch.EpochPosition,
-			// so safe position is definitely the start of nextEpochAfterCommonEpoch
-			var replicaPosition = nextEpochAfterCommonEpoch?.EpochPosition ?? logPosition;
-
-			if (commonEpoch.EpochNumber == _epochManager.LastEpochNumber)
-				return Math.Min(replicaPosition, leaderCheckpoint);
-
-			// common epoch number is older than the last epoch
-			var nextEpoch = _epochManager.GetEpochAfter(commonEpoch.EpochNumber , false);
-
-			if (nextEpoch == null) {
-				var msg = string.Format(
-					"Replica [{0},S:{1},{2}(0x{3:X}),epochs:\n{4}]\n provided epochs which are not in "
-					+ "EpochManager (possibly too old, known epochs:\n{5}).\nLeader LogPosition: {6} (0x{7:X}). "
-					+ "We do not support this case as of now.\n"
-					+ "CommonEpoch: {8}, NextEpochAfterCommonEpoch: {9}",
-					replicaEndPoint, subscriptionId, logPosition, logPosition,
-					string.Join("\n", epochs.Select(x => x.AsString())),
-					string.Join("\n", _epochManager.GetLastEpochs(int.MaxValue).Select(x => x.AsString())),
-					leaderCheckpoint, leaderCheckpoint,
-					commonEpoch.AsString(), nextEpochAfterCommonEpoch == null ? "<none>" : nextEpochAfterCommonEpoch.AsString());
-				Log.Error(
-					"Replica [{replicaEndPoint},S:{subscriptionId},{logPosition}(0x{logPosition:X}),epochs:\n{epochs}]\n provided epochs which are not in "
-					+ "EpochManager (possibly too old, known epochs:\n{lastEpochs}).\nLeader LogPosition: {leaderCheckpoint} (0x{leaderCheckpoint:X}). "
-					+ "We do not support this case as of now.\n"
-					+ "CommonEpoch: {commonEpoch}, NextEpochAfterCommonEpoch: {nextEpochAfterCommonEpoch}",
-					replicaEndPoint,
-					subscriptionId,
-					logPosition,
-					logPosition,
-					string.Join("\n", epochs.Select(x => x.AsString())),
-					string.Join("\n", _epochManager.GetLastEpochs(int.MaxValue).Select(x => x.AsString())),
-					leaderCheckpoint,
-					leaderCheckpoint,
-					commonEpoch.AsString(),
-					nextEpochAfterCommonEpoch == null ? "<none>" : nextEpochAfterCommonEpoch.AsString()
-				);
-				throw new Exception(msg);
-			}
-
-			return Math.Min(replicaPosition, nextEpoch.EpochPosition);
-		}
-
-		private long SetSubscriptionPosition(ReplicaSubscription sub,
-			long logPosition,
-			Guid chunkId,
-			bool replicationStart,
-			bool verbose,
-			int trial) {
-			if (trial >= 10)
-				throw new Exception("Too many retrials to acquire reader for subscriber.");
-
-			try {
-				var chunk = _db.Manager.GetChunkFor(logPosition);
-				Debug.Assert(chunk != null, string.Format(
-					"Chunk for LogPosition {0} (0x{0:X}) is null in LeaderReplicationService! Replica: [{1},C:{2},S:{3}]",
-					logPosition, sub.ReplicaEndPoint, sub.ConnectionId, sub.SubscriptionId));
-				var rawSend = chunk.ChunkHeader.IsScavenged;
-				var bulkReader = rawSend ? chunk.AcquireRawReader() : chunk.AcquireDataReader();
-				if (rawSend) {
-					var chunkStartPos = chunk.ChunkHeader.ChunkStartPosition;
-					if (verbose) {
-						Log.Information(
-							"Subscribed replica [{replicaEndPoint}, S:{subscriptionId}] for raw send at {chunkStartPosition} (0x{chunkStartPosition:X}) (requested {logPosition} (0x{logPosition:X})).",
-							sub.ReplicaEndPoint, sub.SubscriptionId, chunkStartPos, chunkStartPos, logPosition,
-							logPosition);
-						if (chunkStartPos != logPosition) {
-							Log.Information(
-								"Forcing replica [{replicaEndPoint}, S:{subscriptionId}] to recreate chunk from position {chunkStartPosition} (0x{chunkStartPosition:X})...",
-								sub.ReplicaEndPoint, sub.SubscriptionId, chunkStartPos, chunkStartPos);
-						}
-					}
-
-					sub.LogPosition = chunkStartPos;
-					sub.RawSend = true;
-					bulkReader.SetPosition(ChunkHeader.Size);
-					if (replicationStart)
-						sub.SendMessage(new ReplicationMessage.ReplicaSubscribed(_instanceId, sub.SubscriptionId,
-							sub.LogPosition));
-					sub.SendMessage(new ReplicationMessage.CreateChunk(_instanceId,
-						sub.SubscriptionId,
-						chunk.ChunkHeader,
-						chunk.FileSize,
-						isScavengedChunk: true,
-						chunk.TransformHeader));
-				} else {
-					if (verbose)
-						Log.Information(
-							"Subscribed replica [{replicaEndPoint},S:{subscriptionId}] for data send at {logPosition} (0x{logPosition:X}).",
-							sub.ReplicaEndPoint, sub.SubscriptionId, logPosition, logPosition);
-
-					sub.LogPosition = logPosition;
-					sub.RawSend = false;
-					bulkReader.SetPosition(chunk.ChunkHeader.GetLocalLogPosition(logPosition));
-					if (replicationStart)
-						sub.SendMessage(new ReplicationMessage.ReplicaSubscribed(_instanceId, sub.SubscriptionId,
-							sub.LogPosition));
-
-					if (logPosition == chunk.ChunkHeader.ChunkStartPosition &&
-						sub.Version >= ReplicationSubscriptionVersions.V2) {
-
-						sub.SendMessage(new ReplicationMessage.CreateChunk(_instanceId,
-							sub.SubscriptionId,
-							chunk.ChunkHeader,
-							chunk.FileSize,
-							isScavengedChunk: false,
-							chunk.TransformHeader));
-					}
-				}
-
-				sub.EOFSent = false;
-				var oldBulkReader = Interlocked.Exchange(ref sub.BulkReader, bulkReader);
-				if (oldBulkReader != null)
-					oldBulkReader.Release();
-				return sub.LogPosition;
-			} catch (FileBeingDeletedException) {
-				return SetSubscriptionPosition(sub, logPosition, chunkId, replicationStart, verbose, trial + 1);
-			}
-		}
-
-		private void MainLoop() {
-			try {
-				_queueStats.Start();
-				QueueMonitor.Default.Register(this);
-
-				_db.Config.WriterCheckpoint.Flushed += OnWriterFlushed;
-
-				while (!_stop) {
-					try {
-						_queueStats.EnterBusy();
-
-						_queueStats.ProcessingStarted(typeof(SendReplicationData), _subscriptions.Count);
-
-						_flushSignal
-							.Reset(); // Reset the flush signal as we're about to read anyway. This could be closer to the actual read but no harm from too many checks.
-
-						var dataFound = ManageSubscriptions();
-						ManageNoQuorumDetection();
-						var newSubscriptions = _newSubscriptions;
-						_newSubscriptions = false;
-						ManageRoleAssignments(force: newSubscriptions);
-
-						_queueStats.ProcessingEnded(_subscriptions.Count);
-
-						if (!dataFound) {
-							_queueStats.EnterIdle();
-
-							_flushSignal.Wait(TimeSpan.FromMilliseconds(500));
-						}
-					} catch (Exception exc) {
-						Log.Information(exc, "Error during leader replication iteration.");
-#if DEBUG
-						throw;
-#endif
-					}
-				}
-
-				foreach (var subscription in _subscriptions.Values) {
-					subscription.Dispose();
-				}
-
-				_db.Config.WriterCheckpoint.Flushed -= OnWriterFlushed;
-
-				_publisher.Publish(new SystemMessage.ServiceShutdown(Name));
-			} catch (Exception ex) {
-				_tcs.TrySetException(ex);
-				throw;
-			} finally {
-				_queueStats.Stop();
-				QueueMonitor.Default.Unregister(this);
-			}
-		}
-
-		private void OnWriterFlushed(long obj) {
-			_flushSignal.Set();
-		}
-
-		private bool ManageSubscriptions() {
-			var dataFound = false;
-			foreach (var subscription in _subscriptions.Values) {
-				bool lost = false;
-				if (subscription.IsConnectionClosed) {
-					subscription.ShouldDispose = true;
-					lost = true;
-				}
-
-				if (subscription.ShouldDispose) {
-					_subscriptions.TryRemove(subscription.SubscriptionId, out _);
-					if (lost) {
-						_publisher.Publish(new SystemMessage.VNodeConnectionLost(subscription.ReplicaEndPoint,
-							subscription.ConnectionId, subscription.SubscriptionId));
-					}
-
-					subscription.Dispose();
-					continue;
-				}
-
-				if (subscription.SendQueueSize >= MaxQueueSize
-					|| subscription.LogPosition - Interlocked.Read(ref subscription.AckedLogPosition) >=
-					ReplicaSendWindow)
-					continue;
-
-				if (subscription.BulkReader == null) throw new Exception("BulkReader is null for subscription.");
-
-				try {
-					var leaderCheckpoint = _db.Config.WriterCheckpoint.Read();
-
-					if (TrySendLogBulk(subscription, leaderCheckpoint))
-						dataFound = true;
-
-					if (subscription.State == ReplicaState.CatchingUp &&
-						leaderCheckpoint - subscription.LogPosition <= CloneThreshold) {
-						subscription.State = ReplicaState.Clone;
-						subscription.SendMessage(
-							new ReplicationMessage.CloneAssignment(_instanceId, subscription.SubscriptionId));
-					}
-				} catch (Exception exc) {
-					Log.Information(exc, "Error during replication send to replica: {subscription}.", subscription);
-				}
-			}
-
-			return dataFound;
-		}
-
-		private bool TrySendLogBulk(ReplicaSubscription subscription, long leaderCheckpoint) {
-			/*
-			if (subscription == null) throw new Exception("subscription == null");
-			if (subscription.BulkReader == null) throw new Exception("subscription.BulkReader == null");
-			if (subscription.BulkReader.Chunk == null) throw new Exception("subscription.BulkReader.Chunk == null");
-			if (subscription.DataBuffer == null) throw new Exception("subscription.DataBuffer == null");
-			*/
-
-			var bulkReader = subscription.BulkReader;
-			var chunkHeader = bulkReader.Chunk.ChunkHeader;
-
-			BulkReadResult bulkResult;
-			if (subscription.RawSend) {
-				bulkResult = bulkReader.ReadNextBytes(subscription.DataBuffer.Length, subscription.DataBuffer);
-			} else {
-				var bytesToRead = (int)Math.Min(subscription.DataBuffer.Length,
-					leaderCheckpoint - subscription.LogPosition);
-				bulkResult = bulkReader.ReadNextBytes(bytesToRead, subscription.DataBuffer);
-			}
-
-			bool dataFound = false;
-			// for logical send we can get 0 at the end multiple time, but we need to get EOF exactly once
-			if (bulkResult.BytesRead > 0 || (bulkResult.IsEOF && !subscription.RawSend && !subscription.EOFSent)) {
-				var data = new byte[bulkResult.BytesRead];
-				Buffer.BlockCopy(subscription.DataBuffer, 0, data, 0, bulkResult.BytesRead);
-
-				dataFound = true;
-				subscription.EOFSent = bulkResult.IsEOF;
-
-				if (subscription.RawSend) {
-					var msg = new ReplicationMessage.RawChunkBulk(
-						_instanceId, subscription.SubscriptionId, chunkHeader.ChunkStartNumber,
-						chunkHeader.ChunkEndNumber,
-						bulkResult.OldPosition, data, bulkResult.IsEOF);
-					subscription.SendMessage(msg);
-				} else {
-					if (chunkHeader.GetLocalLogPosition(subscription.LogPosition) != bulkResult.OldPosition) {
-						throw new Exception(string.Format(
-							"Replication invariant failure. SubscriptionPosition {0}, bulkResult.OldPosition {1}",
-							subscription.LogPosition, bulkResult.OldPosition));
-					}
-
-					var msg = new ReplicationMessage.DataChunkBulk(
-						_instanceId, subscription.SubscriptionId, chunkHeader.ChunkStartNumber,
-						chunkHeader.ChunkEndNumber,
-						subscription.LogPosition, data, bulkResult.IsEOF);
-					subscription.LogPosition += bulkResult.BytesRead;
-					subscription.SendMessage(msg);
-				}
-			}
-
-			if (bulkResult.IsEOF) {
-				var newLogPosition = chunkHeader.ChunkEndPosition;
-				if (newLogPosition < leaderCheckpoint) {
-					dataFound = true;
-					SetSubscriptionPosition(subscription, newLogPosition, Guid.Empty, replicationStart: false,
-						verbose: true, trial: 0);
-				}
-			}
-
-			return dataFound;
-		}
-
-		private void ManageNoQuorumDetection() {
-			if (CanAcceptSubscriptions()) {
-				var now = _stopwatch.Elapsed;
-				if (_subscriptions.Count(x => x.Value.IsPromotable) >= _clusterSize / 2) // everything is ok
-					_noQuorumTimestamp = TimeSpan.Zero;
-				else {
-					if (_noQuorumTimestamp == TimeSpan.Zero) {
-						_noQuorumTimestamp = now;
-						_noQuorumNotified = false;
-					}
-
-					if (!_noQuorumNotified && now - _noQuorumTimestamp > NoQuorumTimeout) {
-						_publisher.Publish(new SystemMessage.NoQuorumMessage());
-						_noQuorumNotified = true;
-					}
-				}
-			}
-		}
-
-		private void ManageRoleAssignments(bool force = false) {
-			if (force || _stopwatch.Elapsed - _lastRolesAssignmentTimestamp >= RoleAssignmentsInterval) {
-				ManageRoleAssignments(_subscriptions.Values);
-				_lastRolesAssignmentTimestamp = _stopwatch.Elapsed;
-			}
-		}
-
-		private void ManageRoleAssignments(IEnumerable<ReplicaSubscription> subscribers) {
-			var candidates = subscribers.Where(x => x.IsPromotable && x.State != ReplicaState.CatchingUp)
-				.OrderByDescending(x => x.LogPosition)
-				.ToArray();
-			var leaderCheckpoint = _db.Config.WriterCheckpoint.Read();
-
-			int followerCount = 0;
-			int laggedFollowers = 0;
-			var desiredFollowerCount = _clusterSize - 1;
-
-			for (int i = 0; i < candidates.Length; ++i) {
-				var candidate = candidates[i];
-				if (candidate.State == ReplicaState.Follower) {
-					followerCount++;
-					candidate.LagOccurences = i < desiredFollowerCount ? 0 : candidate.LagOccurences + 1;
-
-					if (candidate.LagOccurences >= LagOccurencesThreshold
-						&& leaderCheckpoint - candidate.LogPosition >= FollowerLagThreshold) {
-						++laggedFollowers;
-					}
-				}
-			}
-
-			int cloneIndex = 0;
-			int followerIndex = candidates.Length - 1;
-			for (int k = followerCount; k < desiredFollowerCount; ++k) {
-				// find next best clone
-				while (cloneIndex < candidates.Length && candidates[cloneIndex].State != ReplicaState.Clone)
-					cloneIndex++;
-
-				// out of suitable clones - get out of here
-				if (cloneIndex >= candidates.Length)
-					break;
-
-				// we need more followers, even if there are lagging followers
-				var newFollower = candidates[cloneIndex];
-				newFollower.State = ReplicaState.Follower;
-				newFollower.LagOccurences = 0;
-				newFollower.SendMessage(new ReplicationMessage.FollowerAssignment(_instanceId, newFollower.SubscriptionId));
-				cloneIndex++;
-			}
-
-			for (int k = 0; k < laggedFollowers; ++k) {
-				// find next best clone
-				while (cloneIndex < candidates.Length && candidates[cloneIndex].State != ReplicaState.Clone)
-					cloneIndex++;
-
-				// find next worst follower
-				while (followerIndex >= 0 && candidates[followerIndex].State != ReplicaState.Follower)
-					followerIndex--;
-
-				// no more suitable clones - get out of here
-				if (cloneIndex > followerIndex)
-					break;
-
-				// we have enough follower, but some of them are probably lagging behind
-				Debug.Assert(followerIndex >= 0);
-
-				var oldFollower = candidates[followerIndex];
-				oldFollower.State = ReplicaState.Clone;
-				oldFollower.LagOccurences = 0;
-				oldFollower.SendMessage(new ReplicationMessage.CloneAssignment(_instanceId, oldFollower.SubscriptionId));
-				followerIndex--;
-
-				var newFollower = candidates[cloneIndex];
-				newFollower.State = ReplicaState.Follower;
-				newFollower.LagOccurences = 0;
-				newFollower.SendMessage(new ReplicationMessage.FollowerAssignment(_instanceId, newFollower.SubscriptionId));
-				cloneIndex++;
-			}
-
-			//drop surplus of clones unless the unsafe option is enabled
-			if (!_unsafeAllowSurplusNodes) {
-				while (cloneIndex < candidates.Length && candidates[cloneIndex].State != ReplicaState.Clone) {
-					cloneIndex++;
-				}
-
-				while (cloneIndex < candidates.Length && candidates[cloneIndex].State == ReplicaState.Clone) {
-					var cloneToDrop = candidates[cloneIndex];
-					cloneToDrop.SendMessage(
-						new ReplicationMessage.DropSubscription(_instanceId, cloneToDrop.SubscriptionId));
-					Log.Debug(
-						"There is a surplus of nodes in the cluster. Dropped clone: C:{connectionId:B}, S:{subscriptionId:B}.",
-						cloneToDrop.ConnectionId, cloneToDrop.SubscriptionId);
-
-					cloneIndex++;
-				}
-			}
-		}
-		public void Handle(ReplicationTrackingMessage.ReplicatedTo message) {
-			//TODO(clc): if the node is busy and misses an update it might be a long time till the next update do we need check if they get too stale?
-			foreach (var subscription in _subscriptions.Values) {
-				if (subscription.IsConnectionClosed ||subscription.SendQueueSize >= MaxQueueSize) { continue;}
-				subscription.SendMessage(message);
-			}
-		}
-		public QueueStats GetStatistics() {
-			return _queueStats.GetStatistics(_subscriptions.Count);
-		}
-
-		private enum ReplicaState {
-			CatchingUp,
-			Clone,
-			Follower
-		}
-
-		private class SendReplicationData {
-		}
-
-		private class ReplicaSubscription : IDisposable {
-			public readonly byte[] DataBuffer = new byte[BulkSize];
-
-			public Guid ConnectionId {
-				get { return _connection.ConnectionId; }
-			}
-
-			public int SendQueueSize {
-				get { return _connection.SendQueueSize; }
-			}
-
-			public bool IsConnectionClosed {
-				get { return _connection.IsClosed; }
-			}
-
-			public readonly int Version;
-			public readonly bool IsPromotable;
-			public readonly EndPoint ReplicaEndPoint;
-			public readonly Guid SubscriptionId;
-
-			public TFChunkBulkReader BulkReader;
-			public bool RawSend;
-
-			public bool EOFSent;
-			public long LogPosition;
-			public long AckedLogPosition;
-
-			public bool ShouldDispose;
-			public bool IsTruncating;
-			public ReplicaState State = ReplicaState.CatchingUp;
-			public int LagOccurences;
-
-			private readonly IPublisher _tcpSendPublisher;
-			private readonly TcpConnectionManager _connection;
-
-			public ReplicaSubscription(IPublisher tcpSendPublisher,
-				int version,
-				TcpConnectionManager connection,
-				Guid subscriptionId, EndPoint replicaEndPoint, bool isPromotable) {
-				_tcpSendPublisher = tcpSendPublisher;
-				Version = version;
-				_connection = connection;
-				SubscriptionId = subscriptionId;
-				ReplicaEndPoint = replicaEndPoint;
-				IsPromotable = isPromotable;
-			}
-
-			public void SendMessage(Message msg) {
-				if (IsTruncating)
-					return;
-
-				_tcpSendPublisher.Publish(new TcpMessage.TcpSend(_connection, msg));
-			}
-
-			public void SendBadRequestAndClose(Guid correlationId, string message) {
-				_connection.SendBadRequestAndClose(correlationId, message);
-			}
-
-			public override string ToString() {
-				return string.Format(
-					"Connection: {0:B}, ReplicaEndPoint: {1}, IsPromotable: {2}, RawSend: {3}, EOFSent: {4}, "
-					+ "LogPosition: {5} (0x{5:X}), AckedLogPosition: {6} (0x{6:X}), State: {7}, LagOccurences: {8}, "
-					+ "SubscriptionId: {9}, ShouldDispose: {10}",
-					_connection.ConnectionId,
-					ReplicaEndPoint,
-					IsPromotable,
-					RawSend,
-					EOFSent,
-					LogPosition,
-					AckedLogPosition,
-					State,
-					LagOccurences,
-					SubscriptionId,
-					ShouldDispose);
-			}
-
-			public void Dispose() {
-				_connection?.Stop("Closing replication subscription connection.");
-				var bulkReader = Interlocked.Exchange(ref BulkReader, null);
-				if (bulkReader != null)
-					bulkReader.Release();
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Replication/LogRecordFramer.cs b/src/EventStore.Core/Services/Replication/LogRecordFramer.cs
deleted file mode 100644
index 90e5d4f04d3..00000000000
--- a/src/EventStore.Core/Services/Replication/LogRecordFramer.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using EventStore.Common.Utils;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Transport.Tcp.Framing;
-
-namespace EventStore.Core.Services.Replication; 
-
-public class LogRecordFramer : IMessageFramer<ILogRecord> {
-	private readonly IMessageFramer<BinaryReader> _inner;
-	private Action<ILogRecord> _handler = _ => { };
-
-	public LogRecordFramer(IMessageFramer<BinaryReader> inner) {
-		_inner = inner;
-		_inner.RegisterMessageArrivedCallback(OnMessageArrived);
-	}
-
-	public bool HasData => _inner.HasData;
-	public IEnumerable<ArraySegment<byte>> FrameData(ArraySegment<byte> data) => _inner.FrameData(data);
-	public void UnFrameData(IEnumerable<ArraySegment<byte>> data) => _inner.UnFrameData(data);
-	public void UnFrameData(ArraySegment<byte> data) => _inner.UnFrameData(data);
-	public void Reset() => _inner.Reset();
-
-	private void OnMessageArrived(BinaryReader reader) {
-		var rawLength = reader.BaseStream.Length;
-
-		if (rawLength >= int.MaxValue)
-			throw new ArgumentOutOfRangeException(
-				nameof(reader),
-				$"Length of stream was {rawLength}");
-
-		var length = (int)rawLength;
-
-		var record = LogRecord.ReadFrom(reader, length: length);
-		_handler(record);
-	}
-
-	public void RegisterMessageArrivedCallback(Action<ILogRecord> handler) {
-		Ensure.NotNull(handler, nameof(handler));
-		_handler = handler;
-	}
-}
diff --git a/src/EventStore.Core/Services/Replication/ReplicaService.cs b/src/EventStore.Core/Services/Replication/ReplicaService.cs
deleted file mode 100644
index 742f0175b27..00000000000
--- a/src/EventStore.Core/Services/Replication/ReplicaService.cs
+++ /dev/null
@@ -1,275 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
-using System.Net;
-using System.Net.Security;
-using System.Net.Sockets;
-using System.Security.Cryptography.X509Certificates;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Cluster;
-using EventStore.Core.Cluster.Settings;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Storage.EpochManager;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Plugins.Authentication;
-using EventStore.Transport.Tcp;
-using EndPoint = System.Net.EndPoint;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Replication {
-	public class ReplicaService : IHandle<SystemMessage.StateChangeMessage>,
-		IHandle<ReplicationMessage.ReconnectToLeader>,
-		IHandle<ReplicationMessage.SubscribeToLeader>,
-		IHandle<ReplicationMessage.AckLogPosition>,
-		IHandle<ClientMessage.TcpForwardMessage> {
-		private static readonly ILogger Log = Serilog.Log.ForContext<ReplicaService>();
-
-		private readonly TcpClientConnector _connector;
-		private readonly IPublisher _publisher;
-		private readonly TFChunkDb _db;
-		private readonly IEpochManager _epochManager;
-		private readonly IPublisher _networkSendQueue;
-		private readonly IAuthenticationProvider _authProvider;
-		private readonly AuthorizationGateway _authorizationGateway;
-		private readonly EndPoint _internalTcp;
-		private readonly bool _isReadOnlyReplica;
-		private readonly bool _useSsl;
-		private readonly CertificateDelegates.ServerCertificateValidator _sslServerCertValidator;
-		private readonly Func<X509Certificate> _sslClientCertificateSelector;
-		private readonly TimeSpan _heartbeatTimeout;
-		private readonly TimeSpan _heartbeatInterval;
-
-		private readonly InternalTcpDispatcher _tcpDispatcher;
-
-		private VNodeState _state = VNodeState.Initializing;
-		private TcpConnectionManager _connection;
-
-		public ReplicaService(IPublisher publisher,
-			TFChunkDb db,
-			IEpochManager epochManager,
-			IPublisher networkSendQueue,
-			IAuthenticationProvider authProvider,
-			AuthorizationGateway authorizationGateway,
-			EndPoint internalTcp,
-			bool isReadOnlyReplica,
-			bool useSsl,
-			CertificateDelegates.ServerCertificateValidator sslServerCertValidator,
-			Func<X509Certificate> sslClientCertificateSelector,
-			TimeSpan heartbeatTimeout,
-			TimeSpan heartbeatInterval,
-			TimeSpan writeTimeout) {
-			Ensure.NotNull(publisher, "publisher");
-			Ensure.NotNull(db, "db");
-			Ensure.NotNull(epochManager, "epochManager");
-			Ensure.NotNull(networkSendQueue, "networkSendQueue");
-			Ensure.NotNull(authProvider, "authProvider");
-			Ensure.NotNull(authorizationGateway, "authorizationGateway");
-			Ensure.NotNull(internalTcp, nameof(internalTcp));
-
-			_publisher = publisher;
-			_db = db;
-			_epochManager = epochManager;
-			_networkSendQueue = networkSendQueue;
-			_authProvider = authProvider;
-			_authorizationGateway = authorizationGateway;
-
-			_internalTcp = internalTcp;
-			_isReadOnlyReplica = isReadOnlyReplica;
-			_useSsl = useSsl;
-			_sslServerCertValidator = sslServerCertValidator;
-			_sslClientCertificateSelector = sslClientCertificateSelector;
-			_heartbeatTimeout = heartbeatTimeout;
-			_heartbeatInterval = heartbeatInterval;
-
-			_connector = new TcpClientConnector();
-			_tcpDispatcher = new InternalTcpDispatcher(writeTimeout);
-		}
-
-		public void Handle(SystemMessage.StateChangeMessage message) {
-			_state = message.State;
-
-			switch (message.State) {
-				case VNodeState.Initializing:
-				case VNodeState.DiscoverLeader:
-				case VNodeState.Unknown:
-				case VNodeState.ReadOnlyLeaderless:
-				case VNodeState.PreLeader:
-				case VNodeState.Leader:
-				case VNodeState.ResigningLeader:
-				case VNodeState.ShuttingDown:
-				case VNodeState.Shutdown: {
-					Disconnect();
-					break;
-				}
-				case VNodeState.PreReplica: {
-					var m = (SystemMessage.BecomePreReplica)message;
-					ConnectToLeader(m.LeaderConnectionCorrelationId, m.Leader);
-					break;
-				}
-				case VNodeState.PreReadOnlyReplica: {
-					var m = (SystemMessage.BecomePreReadOnlyReplica)message;
-					ConnectToLeader(m.LeaderConnectionCorrelationId, m.Leader);
-					break;
-				}
-				case VNodeState.CatchingUp:
-				case VNodeState.Clone:
-				case VNodeState.Follower:
-				case VNodeState.ReadOnlyReplica:  {
-					// nothing changed, essentially
-					break;
-				}
-				default:
-					throw new ArgumentOutOfRangeException();
-			}
-		}
-
-		private void Disconnect() {
-			if (_connection != null) {
-				_connection.Stop(string.Format("Node state changed to {0}. Closing replication connection.", _state));
-				_connection = null;
-			}
-		}
-
-		private void OnConnectionEstablished(TcpConnectionManager manager) {
-			_publisher.Publish(
-				new SystemMessage.VNodeConnectionEstablished(manager.RemoteEndPoint, manager.ConnectionId));
-		}
-
-		private void OnConnectionClosed(TcpConnectionManager manager, SocketError socketError) {
-			_publisher.Publish(new SystemMessage.VNodeConnectionLost(manager.RemoteEndPoint, manager.ConnectionId));
-		}
-
-		public void Handle(ReplicationMessage.ReconnectToLeader message) {
-			ConnectToLeader(message.ConnectionCorrelationId, message.Leader);
-		}
-
-		private void ConnectToLeader(Guid leaderConnectionCorrelationId, MemberInfo leader) {
-			Debug.Assert(_state == VNodeState.PreReplica || _state == VNodeState.PreReadOnlyReplica);
-
-			var leaderEndPoint = GetLeaderEndPoint(leader, _useSsl);
-			if (leaderEndPoint == null) {
-				Log.Error("No valid endpoint found to connect to the Leader. Aborting connection operation to Leader.");
-				return;
-			}
-
-			if (_connection != null)
-				_connection.Stop(string.Format("Reconnecting from old leader [{0}] to new leader: [{1}].",
-					_connection.RemoteEndPoint, leaderEndPoint));
-
-			try {
-				_connection = new TcpConnectionManager(_useSsl ? "leader-secure" : "leader-normal",
-					Guid.NewGuid(),
-					_tcpDispatcher,
-					_publisher,
-					leaderEndPoint.GetHost(),
-					leaderEndPoint.GetOtherNames(),
-					leaderEndPoint,
-					_connector,
-					_useSsl,
-					_sslServerCertValidator,
-					() => {
-						var cert = _sslClientCertificateSelector();
-						return new X509CertificateCollection{cert};
-					},
-					_networkSendQueue,
-					_authProvider,
-					_authorizationGateway,
-					_heartbeatInterval,
-					_heartbeatTimeout,
-					OnConnectionEstablished,
-					OnConnectionClosed);
-				_connection.StartReceiving();
-			} catch (Exception ex) {
-				Log.Error(ex, "Failed to connect to leader [{leader}]. This will be retried.", leader);
-				_publisher.Publish(new ReplicationMessage.LeaderConnectionFailed(leaderConnectionCorrelationId, leader));
-			}
-		}
-
-		private static EndPoint GetLeaderEndPoint(MemberInfo leader, bool useSsl) {
-			Ensure.NotNull(leader, "leader");
-			if (useSsl && leader.InternalSecureTcpEndPoint == null)
-				Log.Error(
-					"Internal secure connections are required, but no internal secure TCP end point is specified for leader [{leader}]!",
-					leader);
-			if (!useSsl && leader.InternalTcpEndPoint == null)
-				Log.Error(
-					"Internal connections are required, but no internal TCP end point is specified for leader [{leader}]!",
-					leader);
-			return useSsl ? leader.InternalSecureTcpEndPoint : leader.InternalTcpEndPoint;
-		}
-
-		public void Handle(ReplicationMessage.SubscribeToLeader message) {
-			if (_state != VNodeState.PreReplica && _state != VNodeState.PreReadOnlyReplica)
-				throw new Exception(string.Format("_state is {0}, but is expected to be {1} or {2}", _state,
-					VNodeState.PreReplica, VNodeState.PreReadOnlyReplica));
-			if (_connection is null) {
-				Log.Warning(
-					"Attempted to subscribe to LEADER [{leaderId:B}], but no connection has been established. This will be retried.", message.LeaderId);
-				return;
-			}
-
-			var logPosition = _db.Config.WriterCheckpoint.ReadNonFlushed();
-			var epochs = _epochManager.GetLastEpochs(ClusterConsts.SubscriptionLastEpochCount).ToArray();
-
-			Log.Information(
-				"Subscribing at LogPosition: {logPosition} (0x{logPosition:X}) to LEADER [{remoteEndPoint}, {leaderId:B}] as replica with SubscriptionId: {subscriptionId:B}, "
-				+ "ConnectionId: {connectionId:B}, LocalEndPoint: [{localEndPoint}], Epochs:\n{epochs}...\n.",
-				logPosition, logPosition, _connection.RemoteEndPoint, message.LeaderId, message.SubscriptionId,
-				_connection.ConnectionId, _connection.LocalEndPoint,
-				string.Join("\n", epochs.Select(x => x.AsString())));
-
-			var chunkId = Guid.Empty;
-
-			// the chunk may not exist if it's a new database or if we're at a chunk boundary
-			if (_db.Manager.TryGetChunkFor(logPosition, out var chunk))
-				chunkId = chunk.ChunkHeader.ChunkId;
-
-			SendTcpMessage(_connection,
-				new ReplicationMessage.SubscribeReplica(
-					version: ReplicationSubscriptionVersions.V_CURRENT,
-					logPosition, chunkId, epochs, _internalTcp,
-					message.LeaderId, message.SubscriptionId, isPromotable: !_isReadOnlyReplica));
-		}
-
-		public void Handle(ReplicationMessage.AckLogPosition message) {
-			if (!_state.IsReplica()) throw new Exception("!_state.IsReplica()");
-			if (_connection == null) throw new Exception("_connection == null");
-			SendTcpMessage(_connection, message);
-		}
-
-		public void Handle(ClientMessage.TcpForwardMessage message) {
-			switch (_state) {
-				case VNodeState.PreReplica: {
-					if (_connection != null)
-						SendTcpMessage(_connection, message.Message);
-					break;
-				}
-				case VNodeState.PreReadOnlyReplica: {
-					if (_connection != null)
-						SendTcpMessage(_connection, message.Message);
-					break;
-				}
-				case VNodeState.CatchingUp:
-				case VNodeState.Clone:
-				case VNodeState.Follower:
-				case VNodeState.ReadOnlyReplica:  {
-					Debug.Assert(_connection != null, "Connection manager is null in follower/clone/catching up state");
-					SendTcpMessage(_connection, message.Message);
-					break;
-				}
-
-				default:
-					throw new Exception(string.Format("Unexpected state: {0}", _state));
-			}
-		}
-
-		private void SendTcpMessage(TcpConnectionManager manager, Message msg) {
-			_networkSendQueue.Publish(new TcpMessage.TcpSend(manager, msg));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Replication/ReplicationTrackingService.cs b/src/EventStore.Core/Services/Replication/ReplicationTrackingService.cs
deleted file mode 100644
index b260697fb1c..00000000000
--- a/src/EventStore.Core/Services/Replication/ReplicationTrackingService.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.TransactionLog.Checkpoint;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Replication {
-
-	public class ReplicationTrackingService :
-		IHandle<SystemMessage.StateChangeMessage>,
-		IHandle<SystemMessage.BecomeShuttingDown>,
-		IHandle<SystemMessage.SystemInit>,
-		IHandle<ReplicationTrackingMessage.ReplicaWriteAck>,
-		IHandle<ReplicationTrackingMessage.WriterCheckpointFlushed>,
-		IHandle<ReplicationTrackingMessage.LeaderReplicatedTo>,
-		IHandle<SystemMessage.VNodeConnectionLost>,
-		IHandle<ReplicationMessage.ReplicaSubscribed> {
-		private readonly ILogger _log = Serilog.Log.ForContext<ReplicationTrackingService>();
-		private readonly IPublisher _publisher;
-		private readonly ICheckpoint _replicationCheckpoint;
-		private readonly IReadOnlyCheckpoint _writerCheckpoint;
-		private readonly int _quorumSize;
-		private Thread _thread;
-		private bool _stop;
-		private VNodeState _state;
-		private long _publishedPosition;
-		private readonly ConcurrentDictionary<Guid, long> _replicaLogPositions = new ConcurrentDictionary<Guid, long>();
-
-		private readonly ManualResetEventSlim _replicationChange = new ManualResetEventSlim(false, 1);
-		private readonly TaskCompletionSource<object> _tcs = new TaskCompletionSource<object>();
-
-		public Task Task {
-			get { return _tcs.Task; }
-		}
-
-		public ReplicationTrackingService(
-			IPublisher publisher,
-			int clusterNodeCount,
-			ICheckpoint replicationCheckpoint,
-			IReadOnlyCheckpoint writerCheckpoint) {
-			Ensure.NotNull(publisher, nameof(publisher));
-			Ensure.NotNull(replicationCheckpoint, nameof(replicationCheckpoint));
-			Ensure.NotNull(writerCheckpoint, nameof(writerCheckpoint));
-			Ensure.Positive(clusterNodeCount, nameof(clusterNodeCount));
-			_publisher = publisher;
-			_replicationCheckpoint = replicationCheckpoint;
-			_writerCheckpoint = writerCheckpoint;
-			_quorumSize = clusterNodeCount / 2 + 1;
-		}
-
-		public void Start() {
-			_thread = new Thread(TrackReplication) { IsBackground = true, Name = nameof(ReplicationTrackingService) };
-			_thread.Start();
-		}
-
-		public void Stop() {
-			_stop = true;
-		}
-
-		public bool IsCurrent() {
-			Debug.Assert(_state == VNodeState.Leader || _state == VNodeState.PreLeader);
-			return Interlocked.Read(ref _publishedPosition) == _replicationCheckpoint.Read();
-		}
-
-		private void TrackReplication() {
-
-			try {
-				while (!_stop) {
-					_replicationChange.Reset();
-					if (_state == VNodeState.Leader || _state == VNodeState.PreLeader) {
-						//Publish Log Commit Position
-						var newPos = _replicationCheckpoint.Read();
-						if (newPos > Interlocked.Read(ref _publishedPosition)) {
-							_publisher.Publish(new ReplicationTrackingMessage.ReplicatedTo(newPos));
-							Interlocked.Exchange(ref _publishedPosition, newPos);
-						}
-					}
-					_replicationChange.Wait(100);
-				}
-			} catch (Exception exc) {
-				_log.Fatal(exc, $"Error in {nameof(ReplicationTrackingService)}. Terminating...");
-				_tcs.TrySetException(exc);
-				Application.Exit(ExitCode.Error,
-					$"Error in {nameof(ReplicationTrackingService)}. Terminating...\nError: " + exc.Message);
-			}
-			_publisher.Publish(new SystemMessage.ServiceShutdown(nameof(ReplicationTrackingService)));
-		}
-
-		public void Handle(ReplicationTrackingMessage.LeaderReplicatedTo message) {
-			if (_stop) return;
-			if (_state != VNodeState.Leader && _state != VNodeState.PreLeader && message.LogPosition > _replicationCheckpoint.Read()) {
-				_replicationCheckpoint.Write(message.LogPosition);
-				_replicationCheckpoint.Flush();
-				_publisher.Publish(new ReplicationTrackingMessage.ReplicatedTo(message.LogPosition));
-			}
-		}
-
-
-		private void UpdateReplicationPosition() {
-
-			var replicationCp = _replicationCheckpoint.Read();
-			var writerCp = _writerCheckpoint.Read();
-			if (writerCp <= replicationCp) { return; }
-
-			var minReplicas = _quorumSize - 1; //total - leader = min replicas
-			if (minReplicas == 0) {
-				_replicationCheckpoint.Write(writerCp);
-				_replicationCheckpoint.Flush();
-				_replicationChange.Set();
-				return;
-			}
-			long[] positions;
-			lock (_replicaLogPositions) {
-				positions = _replicaLogPositions.Values.ToArray();
-			}
-
-			if (positions.Length < minReplicas) { return; }
-
-			Array.Sort(positions);
-			var furthestReplicatedPosition = positions[^minReplicas];
-			if (furthestReplicatedPosition <= replicationCp) { return; }
-
-			var newReplicationPoint = Math.Min(writerCp, furthestReplicatedPosition);
-			_replicationCheckpoint.Write(newReplicationPoint);
-			_replicationCheckpoint.Flush();
-			_replicationChange.Set();
-		}
-
-
-		public void Handle(ReplicationTrackingMessage.ReplicaWriteAck message) {
-			if (_state != VNodeState.Leader && _state != VNodeState.PreLeader) { return; }
-			if (_replicaLogPositions.TryGetValue(message.SubscriptionId, out var position) &&
-				message.ReplicationLogPosition <= position) { return; }
-			_replicaLogPositions.AddOrUpdate(message.SubscriptionId, message.ReplicationLogPosition, (k, v) => message.ReplicationLogPosition);
-			UpdateReplicationPosition();
-		}
-
-		public void Handle(ReplicationTrackingMessage.WriterCheckpointFlushed message) {
-			if (_state != VNodeState.Leader && _state != VNodeState.PreLeader) { return; }
-			UpdateReplicationPosition();
-		}
-
-		public void Handle(SystemMessage.StateChangeMessage msg) {
-			//switching to leader from non-leader
-			if (_state != msg.State) {
-				_replicaLogPositions.Clear();
-			}
-			_state = msg.State;
-		}
-
-		public void Handle(SystemMessage.VNodeConnectionLost msg) {
-			if ((_state != VNodeState.Leader && _state != VNodeState.PreLeader) || !msg.SubscriptionId.HasValue) return;
-			_replicaLogPositions.TryRemove(msg.SubscriptionId.Value, out _);
-		}
-
-		public void Handle(SystemMessage.BecomeShuttingDown message) {
-			Stop();
-		}
-
-		public void Handle(SystemMessage.SystemInit message) {
-			Start();
-		}
-
-
-		public void Handle(ReplicationMessage.ReplicaSubscribed message) {
-			if (message.SubscriptionPosition < _writerCheckpoint.ReadNonFlushed()) {
-				//Going offline for truncation
-				_log.Information("Offline truncation will happen, shutting down {service}",nameof(ReplicationTrackingService));
-				Stop();
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Replication/TransactionFramer.cs b/src/EventStore.Core/Services/Replication/TransactionFramer.cs
deleted file mode 100644
index ba8cd3ace2f..00000000000
--- a/src/EventStore.Core/Services/Replication/TransactionFramer.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Transport.Tcp.Framing;
-
-namespace EventStore.Core.Services.Replication; 
-
-public class TransactionFramer : IMessageFramer<IEnumerable<ILogRecord>> {
-	private readonly List<ILogRecord> _records;
-	private readonly IMessageFramer<ILogRecord> _inner;
-	private Action<IEnumerable<ILogRecord>> _handler = _ => { };
-
-	public TransactionFramer(IMessageFramer<ILogRecord> inner) {
-		_records = new List<ILogRecord>(capacity: 1024);
-		_inner = inner;
-		_inner.RegisterMessageArrivedCallback(OnLogRecordUnframed);
-	}
-
-	public bool HasData => _records.Count > 0 || _inner.HasData;
-	public IEnumerable<ArraySegment<byte>> FrameData(ArraySegment<byte> data) => _inner.FrameData(data);
-	public void UnFrameData(IEnumerable<ArraySegment<byte>> data) => _inner.UnFrameData(data);
-	public void UnFrameData(ArraySegment<byte> data) => _inner.UnFrameData(data);
-
-	public void Reset() {
-		_records.Clear();
-		_inner.Reset();
-	}
-
-	private void OnLogRecordUnframed(ILogRecord record) {
-		_records.Add(record);
-		if (record.IsTransactionBoundary()) {
-			_handler(_records);
-			_records.Clear();
-		}
-	}
-
-	public void RegisterMessageArrivedCallback(Action<IEnumerable<ILogRecord>> handler) {
-		Ensure.NotNull(handler, nameof(handler));
-		_handler = handler;
-	}
-
-	public bool UnFramePendingLogRecords(out int numLogRecordsUnframed) {
-		if (_records.Count == 0) {
-			numLogRecordsUnframed = 0;
-			return false;
-		}
-
-		numLogRecordsUnframed = _records.Count;
-		_handler(_records);
-		_records.Clear();
-		return true;
-	}
-}
diff --git a/src/EventStore.Core/Services/RequestForwardingService.cs b/src/EventStore.Core/Services/RequestForwardingService.cs
deleted file mode 100644
index d44309a3819..00000000000
--- a/src/EventStore.Core/Services/RequestForwardingService.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Services.VNode;
-
-namespace EventStore.Core.Services {
-	public class RequestForwardingService : IHandle<SystemMessage.SystemStart>,
-		IHandle<SystemMessage.RequestForwardingTimerTick>,
-		IHandle<ClientMessage.NotHandled>,
-		IHandle<ClientMessage.WriteEventsCompleted>,
-		IHandle<ClientMessage.TransactionStartCompleted>,
-		IHandle<ClientMessage.TransactionWriteCompleted>,
-		IHandle<ClientMessage.TransactionCommitCompleted>,
-		IHandle<ClientMessage.DeleteStreamCompleted> {
-		private readonly IPublisher _bus;
-		private readonly MessageForwardingProxy _forwardingProxy;
-
-		private readonly TimerMessage.Schedule _tickScheduleMessage;
-
-		public RequestForwardingService(IPublisher bus, MessageForwardingProxy forwardingProxy, TimeSpan tickInterval) {
-			Ensure.NotNull(bus, "bus");
-			Ensure.NotNull(forwardingProxy, "forwardingProxy");
-			Ensure.Nonnegative(tickInterval.Milliseconds, "tickInterval");
-
-			_bus = bus;
-			_forwardingProxy = forwardingProxy;
-
-			_tickScheduleMessage = TimerMessage.Schedule.Create(tickInterval,
-				bus,
-				new SystemMessage.RequestForwardingTimerTick());
-		}
-
-		public void Handle(SystemMessage.SystemStart message) {
-			_bus.Publish(_tickScheduleMessage);
-		}
-
-		public void Handle(SystemMessage.RequestForwardingTimerTick message) {
-			_forwardingProxy.TimeoutForwardings();
-			_bus.Publish(_tickScheduleMessage);
-		}
-
-		public void Handle(ClientMessage.NotHandled message) {
-			_forwardingProxy.TryForwardReply(
-				message.CorrelationId, message,
-				(clientCorrId, m) => new ClientMessage.NotHandled(clientCorrId, m.Reason, m.LeaderInfo));
-		}
-
-		public void Handle(ClientMessage.WriteEventsCompleted message) {
-			_forwardingProxy.TryForwardReply(message.CorrelationId, message,
-				(clientCorrId, m) => m.WithCorrelationId(clientCorrId));
-		}
-
-		public void Handle(ClientMessage.TransactionStartCompleted message) {
-			_forwardingProxy.TryForwardReply(message.CorrelationId, message,
-				(clientCorrId, m) => m.WithCorrelationId(clientCorrId));
-		}
-
-		public void Handle(ClientMessage.TransactionWriteCompleted message) {
-			_forwardingProxy.TryForwardReply(message.CorrelationId, message,
-				(clientCorrId, m) => m.WithCorrelationId(clientCorrId));
-		}
-
-		public void Handle(ClientMessage.TransactionCommitCompleted message) {
-			_forwardingProxy.TryForwardReply(message.CorrelationId, message,
-				(clientCorrId, m) => m.WithCorrelationId(clientCorrId));
-		}
-
-		public void Handle(ClientMessage.DeleteStreamCompleted message) {
-			_forwardingProxy.TryForwardReply(message.CorrelationId, message,
-				(clientCorrId, m) => m.WithCorrelationId(clientCorrId));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/RequestManager/CommitLevels.cs b/src/EventStore.Core/Services/RequestManager/CommitLevels.cs
deleted file mode 100644
index f18f4978cc8..00000000000
--- a/src/EventStore.Core/Services/RequestManager/CommitLevels.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.Core.Services.RequestManager {
-	public enum CommitLevel {
-		Replicated, //Write on Cluster Quorum
-		Indexed //Indexed on Leader
-	}
-}
diff --git a/src/EventStore.Core/Services/RequestManager/CommitSource.cs b/src/EventStore.Core/Services/RequestManager/CommitSource.cs
deleted file mode 100644
index 7be5dc82e88..00000000000
--- a/src/EventStore.Core/Services/RequestManager/CommitSource.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-
-namespace EventStore.Core.Services.RequestManager {
-	public class CommitSource :
-	IHandle<ReplicationTrackingMessage.IndexedTo>,
-	IHandle<ReplicationTrackingMessage.ReplicatedTo> {
-		private readonly ConcurrentDictionary<long, List<Action>> _notifyReplicated = new ConcurrentDictionary<long, List<Action>>();
-		private readonly ConcurrentDictionary<long, List<Action>> _notifyIndexed = new ConcurrentDictionary<long, List<Action>>();
-		private long _replicatedPosition;
-		private long _indexedPosition;
-
-		public long ReplicationPosition => _replicatedPosition;
-		public long IndexedPosition => _indexedPosition;
-
-		public void Handle(ReplicationTrackingMessage.ReplicatedTo message) {
-			Interlocked.Exchange(ref _replicatedPosition, message.LogPosition);
-			Notify(_notifyReplicated, message.LogPosition);
-		}
-
-		public void Handle(ReplicationTrackingMessage.IndexedTo message) {
-			Interlocked.Exchange(ref _indexedPosition, message.LogPosition);
-			Notify(_notifyIndexed, message.LogPosition);
-		}
-
-		public void NotifyFor(long position, Action target, CommitLevel level = CommitLevel.Indexed) {
-			long currentPosition;
-			ConcurrentDictionary<long, List<Action>> notificationDictionary;
-			switch (level) {
-				case CommitLevel.Replicated:
-					currentPosition = Interlocked.Read(ref _replicatedPosition);
-					notificationDictionary = _notifyReplicated;
-					break;
-				case CommitLevel.Indexed:
-					currentPosition = Interlocked.Read(ref _indexedPosition);
-					notificationDictionary = _notifyIndexed;
-					break;
-				default:
-					throw new ArgumentOutOfRangeException(nameof(level), level, null);
-			}
-			if (currentPosition >= position) { target(); }
-			if (!notificationDictionary.TryGetValue(position, out var actionList)) {
-				actionList = new List<Action> { target };
-				notificationDictionary.TryAdd(position, actionList);
-			} else {
-				lock (actionList) {
-					actionList.Add(target);
-				}
-			}
-		}
-		private void Notify(ConcurrentDictionary<long, List<Action>> dictionary, long logPosition) {
-			if (dictionary.IsEmpty) { return; }
-			long[] positions;
-			lock (dictionary) {
-				positions = dictionary.Keys.ToArray();
-			}
-			Array.Sort(positions);
-			var actionList = new List<Action>();
-			for (int i = 0; i < positions.Length && positions[i] <= logPosition; i++) {
-				if (dictionary.TryRemove(positions[i], out var actions) && actions != null) {
-					actionList.AddRange(actions);
-				}
-			}
-			actionList?.ForEach(a => { try { a?.Invoke(); } catch { /*ignore*/ } });
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/RequestManager/Managers/DeleteStream.cs b/src/EventStore.Core/Services/RequestManager/Managers/DeleteStream.cs
deleted file mode 100644
index aa73e484c06..00000000000
--- a/src/EventStore.Core/Services/RequestManager/Managers/DeleteStream.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Services.RequestManager.Managers {
-	public class DeleteStream : RequestManagerBase {
-		private readonly bool _hardDelete;
-		private readonly CancellationToken _cancellationToken;
-		private readonly string _streamId;
-
-		public DeleteStream(
-					IPublisher publisher,
-					TimeSpan timeout,
-					IEnvelope clientResponseEnvelope,
-					Guid internalCorrId,
-					Guid clientCorrId,
-					string streamId,
-					long expectedVersion,
-					bool hardDelete,
-					CommitSource commitSource,
-					CancellationToken cancellationToken = default)
-			: base(
-					 publisher,
-					 timeout,
-					 clientResponseEnvelope,
-					 internalCorrId,
-					 clientCorrId,
-					 expectedVersion,
-					 commitSource,
-					 prepareCount: 0,
-					 waitForCommit: true) {
-			_hardDelete = hardDelete;
-			_cancellationToken = cancellationToken;
-			_streamId = streamId;
-		}
-
-		protected override Message WriteRequestMsg =>
-			new StorageMessage.WriteDelete(
-					InternalCorrId,
-					WriteReplyEnvelope,
-					_streamId,
-					ExpectedVersion,
-					_hardDelete,
-					_cancellationToken);
-
-		protected override Message ClientSuccessMsg =>
-			 new ClientMessage.DeleteStreamCompleted(
-				 ClientCorrId,
-				 OperationResult.Success,
-				 null,
-				 LastEventNumber,
-				 CommitPosition,  //not technically correct, but matches current behavior correctly
-				 CommitPosition);
-
-		protected override Message ClientFailMsg =>
-			new ClientMessage.DeleteStreamCompleted(ClientCorrId, Result, FailureMessage, FailureCurrentVersion);
-	}
-}
diff --git a/src/EventStore.Core/Services/RequestManager/Managers/RequestManagerBase.cs b/src/EventStore.Core/Services/RequestManager/Managers/RequestManagerBase.cs
deleted file mode 100644
index 7485d6f8a09..00000000000
--- a/src/EventStore.Core/Services/RequestManager/Managers/RequestManagerBase.cs
+++ /dev/null
@@ -1,220 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.TransactionLog.LogRecords;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.RequestManager.Managers {
-	public abstract class RequestManagerBase :
-		IHandle<StorageMessage.PrepareAck>,
-		IHandle<StorageMessage.CommitIndexed>,
-		IHandle<StorageMessage.InvalidTransaction>,
-		IHandle<StorageMessage.StreamDeleted>,
-		IHandle<StorageMessage.WrongExpectedVersion>,
-		IHandle<StorageMessage.AlreadyCommitted>,
-		IHandle<StorageMessage.RequestManagerTimerTick>,
-		IDisposable {
-
-		private static readonly ILogger Log = Serilog.Log.ForContext<RequestManagerBase>();
-
-		protected readonly IPublisher Publisher;
-		protected TimeSpan Timeout;
-		protected readonly IEnvelope WriteReplyEnvelope;
-
-		private readonly IEnvelope _clientResponseEnvelope;
-		protected readonly Guid InternalCorrId;
-		protected readonly Guid ClientCorrId;
-		protected readonly long ExpectedVersion;
-
-		protected OperationResult Result;
-		protected long FirstEventNumber = -1;
-		protected long LastEventNumber = -1;
-		protected string FailureMessage = string.Empty;
-		protected long FailureCurrentVersion = -1;
-		protected long TransactionId;
-
-		protected readonly CommitSource CommitSource;
-		protected long LastEventPosition;
-		protected bool Registered;
-		protected long CommitPosition = -1;
-		
-		private readonly HashSet<long> _prepareLogPositions = new HashSet<long>();
-
-		private bool _allEventsWritten;
-		private bool _allPreparesWritten;
-		private long _complete;
-
-		private bool _commitReceived;
-		private readonly int _prepareCount;
-
-		protected DateTime NextTimeoutTime;
-		private readonly TimeSpan _timeoutOffset = TimeSpan.FromMilliseconds(30);
-
-
-		protected RequestManagerBase(
-				IPublisher publisher,
-				TimeSpan timeout,
-				IEnvelope clientResponseEnvelope,
-				Guid internalCorrId,
-				Guid clientCorrId,
-				long expectedVersion,
-				CommitSource commitSource,
-				int prepareCount = 0,
-				long transactionId = -1,
-				bool waitForCommit = false) {
-			Ensure.NotEmptyGuid(internalCorrId, nameof(internalCorrId));
-			Ensure.NotEmptyGuid(clientCorrId, nameof(clientCorrId));
-			Ensure.NotNull(publisher, nameof(publisher));
-			Ensure.NotNull(clientResponseEnvelope, nameof(clientResponseEnvelope));
-			Ensure.NotNull(commitSource, nameof(commitSource));
-
-			Publisher = publisher;
-			Timeout = timeout;
-			_clientResponseEnvelope = clientResponseEnvelope;
-			InternalCorrId = internalCorrId;
-			ClientCorrId = clientCorrId;
-			WriteReplyEnvelope = Publisher;
-			ExpectedVersion = expectedVersion;
-			CommitSource = commitSource;
-			_prepareCount = prepareCount;
-			TransactionId = transactionId;
-			_commitReceived = !waitForCommit; //if not waiting for commit flag as true
-			_allPreparesWritten = _prepareCount == 0; //if not waiting for prepares flag as true
-			if (prepareCount == 0 && waitForCommit == false) {
-				//empty operation just return success
-				var position = Math.Max(transactionId, 0);
-				ReturnCommitAt(position, 0, 0);
-			}
-		}
-		protected DateTime LiveUntil => NextTimeoutTime - _timeoutOffset;
-		
-		protected abstract Message WriteRequestMsg { get; }
-		protected abstract Message ClientSuccessMsg { get; }
-		protected abstract Message ClientFailMsg { get; }
-		public void Start() {
-			NextTimeoutTime = DateTime.UtcNow + Timeout;
-			Publisher.Publish(WriteRequestMsg);
-		}
-
-		public void Handle(StorageMessage.PrepareAck message) {
-			if (Interlocked.Read(ref _complete) == 1 || _allPreparesWritten) { return; }
-			NextTimeoutTime = DateTime.UtcNow + Timeout;
-			if (message.Flags.HasAnyOf(PrepareFlags.TransactionBegin)) {
-				TransactionId = message.LogPosition;
-			}
-			if (message.LogPosition > LastEventPosition) {
-				LastEventPosition = message.LogPosition;
-			}
-
-			lock (_prepareLogPositions) {
-				_prepareLogPositions.Add(message.LogPosition);
-				_allPreparesWritten = _prepareLogPositions.Count == _prepareCount;
-			}
-			if (_allPreparesWritten) { AllPreparesWritten(); }
-			_allEventsWritten = _commitReceived && _allPreparesWritten;
-			if (_allEventsWritten) { AllEventsWritten(); }
-		}
-		public virtual void Handle(StorageMessage.CommitIndexed message) {
-			if (Interlocked.Read(ref _complete) == 1 || _commitReceived) { return; }
-			NextTimeoutTime = DateTime.UtcNow + Timeout;
-			_commitReceived = true;
-			_allEventsWritten = _commitReceived && _allPreparesWritten;
-			if (message.LogPosition > LastEventPosition) {
-				LastEventPosition = message.LogPosition;
-			}
-			FirstEventNumber = message.FirstEventNumber;
-			LastEventNumber = message.LastEventNumber;
-			CommitPosition = message.LogPosition;
-			if (_allEventsWritten) { AllEventsWritten(); }
-		}
-		protected virtual void AllPreparesWritten() { }
-		
-		protected virtual void AllEventsWritten() {
-			if (CommitSource.IndexedPosition >= LastEventPosition) {
-				Committed();
-			} else if (!Registered) {
-				CommitSource.NotifyFor(LastEventPosition, Committed);
-				Registered = true;
-			}
-		}
-		protected virtual void Committed() {
-			if (Interlocked.CompareExchange(ref _complete, 1, 0) == 1) { return; }
-			Result = OperationResult.Success;
-			_clientResponseEnvelope.ReplyWith(ClientSuccessMsg);
-			Publisher.Publish(new StorageMessage.RequestCompleted(InternalCorrId, true));
-		}
-		public void Handle(StorageMessage.RequestManagerTimerTick message) {
-			if (_allEventsWritten) { AllEventsWritten(); }
-			if (Interlocked.Read(ref _complete) == 1 || message.UtcNow < NextTimeoutTime)
-				return;
-			var result = !_allPreparesWritten ? OperationResult.PrepareTimeout : OperationResult.CommitTimeout;
-			var msg = !_allPreparesWritten ? "Prepare phase timeout." : "Commit phase timeout.";
-			CompleteFailedRequest(result, msg);
-		}
-		public void Handle(StorageMessage.InvalidTransaction message) {
-			CompleteFailedRequest(OperationResult.InvalidTransaction, "Invalid transaction.");
-		}
-		public void Handle(StorageMessage.WrongExpectedVersion message) {
-			FailureCurrentVersion = message.CurrentVersion;
-			CompleteFailedRequest(OperationResult.WrongExpectedVersion, "Wrong expected version.", message.CurrentVersion);
-		}
-		public void Handle(StorageMessage.StreamDeleted message) {
-			CompleteFailedRequest(OperationResult.StreamDeleted, "Stream is deleted.");
-		}
-		public void Handle(StorageMessage.AlreadyCommitted message) {
-			if (Interlocked.Read(ref _complete) == 1 || _allEventsWritten) { return; }
-			Log.Debug("IDEMPOTENT WRITE TO STREAM ClientCorrelationID {clientCorrelationId}, {message}.", ClientCorrId,
-				message);
-			ReturnCommitAt(message.LogPosition, message.FirstEventNumber, message.LastEventNumber);
-		}
-		protected virtual void ReturnCommitAt(long logPosition, long firstEvent, long lastEvent) {
-			lock (_prepareLogPositions) {
-				_prepareLogPositions.Clear();
-				_prepareLogPositions.Add(logPosition);
-
-				FirstEventNumber = firstEvent;
-				LastEventNumber = lastEvent;
-				CommitPosition = logPosition;
-				Committed();
-			}
-		}
-
-		private void CompleteFailedRequest(OperationResult result, string error, long currentVersion = -1) {
-			Debug.Assert(result != OperationResult.Success);
-			if (Interlocked.CompareExchange(ref _complete, 1, 0) == 1) { return; }
-			Result = result;
-			FailureMessage = error;
-			Publisher.Publish(new StorageMessage.RequestCompleted(InternalCorrId, false, currentVersion));
-			_clientResponseEnvelope.ReplyWith(ClientFailMsg);
-		}
-
-		#region IDisposable Support
-		private bool _disposed; // To detect redundant calls
-
-		protected virtual void Dispose(bool disposing) {
-			if (!_disposed) {
-				if (disposing) {
-					try {
-						if (Interlocked.Read(ref _complete) != 1) {
-							//todo (clc) need a better Result here, but need to see if this will impact the client API
-							var result = !_allPreparesWritten ? OperationResult.PrepareTimeout : OperationResult.CommitTimeout;
-							var msg = "Request canceled by server";
-							CompleteFailedRequest(result, msg);
-						}
-					} catch { /*don't throw in disposed*/}
-
-					_disposed = true;
-				}
-			}
-		}
-		public void Dispose() {
-			Dispose(true);
-		}
-		#endregion
-	}
-}
diff --git a/src/EventStore.Core/Services/RequestManager/Managers/TransactionCommit.cs b/src/EventStore.Core/Services/RequestManager/Managers/TransactionCommit.cs
deleted file mode 100644
index 0c5f4742d0f..00000000000
--- a/src/EventStore.Core/Services/RequestManager/Managers/TransactionCommit.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Services.RequestManager.Managers {
-	public class TransactionCommit : RequestManagerBase,
-		IHandle<StorageMessage.CommitIndexed> {
-		private readonly TimeSpan _commitTimeout;
-		private bool _transactionWritten;
-		public TransactionCommit(
-					IPublisher publisher,
-					TimeSpan prepareTimeout,
-					TimeSpan commitTimeout,
-					IEnvelope clientResponseEnvelope,
-					Guid internalCorrId,
-					Guid clientCorrId,
-					long transactionId,
-					CommitSource commitSource)
-			: base(
-					 publisher,
-					 prepareTimeout,
-					 clientResponseEnvelope,
-					 internalCorrId,
-					 clientCorrId,
-					 expectedVersion: -1,
-					 commitSource,
-					 transactionId: transactionId,
-					 prepareCount: 1,
-					 waitForCommit: true) {
-			_commitTimeout = commitTimeout;
-		}
-
-		protected override Message WriteRequestMsg =>
-			new StorageMessage.WriteTransactionEnd(
-					InternalCorrId,
-					WriteReplyEnvelope,
-					TransactionId,
-					LiveUntil);
-
-		protected override void AllPreparesWritten() {
-			base.AllPreparesWritten();
-			NextTimeoutTime = DateTime.UtcNow + _commitTimeout;
-			Publisher.Publish(
-				new StorageMessage.WriteCommit(
-						InternalCorrId,
-						WriteReplyEnvelope,
-						TransactionId));
-		}
-
-		protected override Message ClientSuccessMsg =>
-			 new ClientMessage.TransactionCommitCompleted(
-					ClientCorrId,
-					TransactionId,
-					FirstEventNumber,
-					LastEventNumber,
-					CommitPosition,   //not technically correct, but matches current behavior correctly
-					CommitPosition);
-
-		protected override Message ClientFailMsg =>
-			 new ClientMessage.TransactionCommitCompleted(
-					ClientCorrId,
-					TransactionId,
-					Result,
-					FailureMessage);
-
-		public override void Handle(StorageMessage.CommitIndexed message) {
-			base.Handle(message);
-			_transactionWritten = true;
-			Committed();
-		}
-		protected override void Committed() {
-			if (!_transactionWritten)
-				return;
-			base.Committed();
-		}
-		protected override void ReturnCommitAt(long logPosition, long firstEvent, long lastEvent) {
-			_transactionWritten = true;
-			base.ReturnCommitAt(logPosition, firstEvent, lastEvent);
-		}
-
-
-	}
-}
diff --git a/src/EventStore.Core/Services/RequestManager/Managers/TransactionStart.cs b/src/EventStore.Core/Services/RequestManager/Managers/TransactionStart.cs
deleted file mode 100644
index a4ccf40a078..00000000000
--- a/src/EventStore.Core/Services/RequestManager/Managers/TransactionStart.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Services.RequestManager.Managers {
-	public class TransactionStart : RequestManagerBase {
-		private readonly string _streamId;
-
-		public TransactionStart(
-					IPublisher publisher,
-					TimeSpan timeout,
-					IEnvelope clientResponseEnvelope,
-					Guid internalCorrId,
-					Guid clientCorrId,
-					string streamId,
-					long expectedVersion,
-					CommitSource commitSource)
-			: base(
-					 publisher,
-					 timeout,
-					 clientResponseEnvelope,
-					 internalCorrId,
-					 clientCorrId,
-					 expectedVersion,
-					 commitSource,
-					 prepareCount: 1) {
-			_streamId = streamId;
-		}
-		
-		protected override Message WriteRequestMsg =>
-			new StorageMessage.WriteTransactionStart(
-					InternalCorrId,
-					WriteReplyEnvelope,
-					_streamId,
-					ExpectedVersion,
-					LiveUntil);
-
-		protected override void AllEventsWritten() {
-			if (CommitSource.ReplicationPosition >= LastEventPosition) {
-				Committed();
-			} else if (!Registered) {
-				CommitSource.NotifyFor(LastEventPosition, Committed, CommitLevel.Replicated);
-				Registered = true;
-			}
-		}
-
-		protected override Message ClientSuccessMsg =>
-			 new ClientMessage.TransactionStartCompleted(
-						ClientCorrId,
-						TransactionId,
-						OperationResult.Success,
-						null);
-
-		protected override Message ClientFailMsg =>
-			 new ClientMessage.TransactionStartCompleted(
-						ClientCorrId,
-						TransactionId,
-						Result,
-						FailureMessage);
-
-	}
-}
diff --git a/src/EventStore.Core/Services/RequestManager/Managers/TransactionWrite.cs b/src/EventStore.Core/Services/RequestManager/Managers/TransactionWrite.cs
deleted file mode 100644
index 475ff53abbe..00000000000
--- a/src/EventStore.Core/Services/RequestManager/Managers/TransactionWrite.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Services.RequestManager.Managers {
-	public class TransactionWrite : RequestManagerBase {
-		private static readonly Operation Operation = new Operation(Operations.Streams.Write);
-		private readonly Event[] _events;
-		private long _transactionId;
-
-		public TransactionWrite(
-					IPublisher publisher,
-					TimeSpan timeout,
-					IEnvelope clientResponseEnvelope,
-					Guid internalCorrId,
-					Guid clientCorrId,
-					Event[] events,
-					long transactionId,
-					CommitSource commitSource)
-			: base(
-					 publisher,
-					 timeout,
-					 clientResponseEnvelope,
-					 internalCorrId,
-					 clientCorrId,
-					 expectedVersion: -1,
-					 commitSource,
-					 prepareCount: events.Length,
-					 transactionId) {
-			_events = events;
-			_transactionId = transactionId;
-		}
-		
-		protected override Message WriteRequestMsg =>
-			new StorageMessage.WriteTransactionData(
-					InternalCorrId,
-					WriteReplyEnvelope,
-					TransactionId,
-					_events);
-
-		protected override void AllEventsWritten() {
-			if (CommitSource.ReplicationPosition >= LastEventPosition) {
-				Committed();
-			} else if (!Registered) {
-				CommitSource.NotifyFor(LastEventPosition, Committed, CommitLevel.Replicated);
-				Registered = true;
-			}
-		}
-
-		protected override Message ClientSuccessMsg =>
-			 new ClientMessage.TransactionWriteCompleted(
-						ClientCorrId,
-						TransactionId,
-						OperationResult.Success,
-						null);
-		protected override Message ClientFailMsg =>
-			 new ClientMessage.TransactionWriteCompleted(
-						ClientCorrId,
-						TransactionId,
-						Result,
-						FailureMessage);
-	}
-}
diff --git a/src/EventStore.Core/Services/RequestManager/Managers/WriteEvents.cs b/src/EventStore.Core/Services/RequestManager/Managers/WriteEvents.cs
deleted file mode 100644
index a640aa49335..00000000000
--- a/src/EventStore.Core/Services/RequestManager/Managers/WriteEvents.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Services.RequestManager.Managers {
-	public class WriteEvents : RequestManagerBase {
-		private readonly string _streamId;
-		private readonly Event[] _events;
-		private readonly CancellationToken _cancellationToken;
-		public WriteEvents(IPublisher publisher,
-			TimeSpan timeout,
-			IEnvelope clientResponseEnvelope,
-			Guid internalCorrId,
-			Guid clientCorrId,
-			string streamId,
-			long expectedVersion,
-			Event[] events,
-			CommitSource commitSource,
-			CancellationToken cancellationToken = default)
-			: base(
-					 publisher,
-					 timeout,
-					 clientResponseEnvelope,
-					 internalCorrId,
-					 clientCorrId,
-					 expectedVersion,
-					 commitSource,
-					 prepareCount: 0,
-					 waitForCommit: true) {
-			_streamId = streamId;
-			_events = events;
-			_cancellationToken = cancellationToken;
-		}
-
-		protected override Message WriteRequestMsg =>
-			new StorageMessage.WritePrepares(
-					InternalCorrId,
-					WriteReplyEnvelope,
-					_streamId,
-					ExpectedVersion,
-					_events,
-					_cancellationToken);
-
-
-		protected override Message ClientSuccessMsg =>
-			 new ClientMessage.WriteEventsCompleted(
-				 ClientCorrId,
-				 FirstEventNumber,
-				 LastEventNumber,
-				 CommitPosition,  //not technically correct, but matches current behavior correctly
-				 CommitPosition);
-
-		protected override Message ClientFailMsg =>
-			 new ClientMessage.WriteEventsCompleted(
-				 ClientCorrId,
-				 Result,
-				 FailureMessage,
-				 FailureCurrentVersion);
-	}
-}
diff --git a/src/EventStore.Core/Services/RequestManager/RequestManagementService.cs b/src/EventStore.Core/Services/RequestManager/RequestManagementService.cs
deleted file mode 100644
index e2119fdd59c..00000000000
--- a/src/EventStore.Core/Services/RequestManager/RequestManagementService.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.RequestManager.Managers;
-using EventStore.Core.Services.TimerService;
-using System.Diagnostics;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.Services.RequestManager {
-	public class RequestManagementService :
-		IHandle<SystemMessage.SystemInit>,
-		IHandle<ClientMessage.WriteEvents>,
-		IHandle<ClientMessage.DeleteStream>,
-		IHandle<ClientMessage.TransactionStart>,
-		IHandle<ClientMessage.TransactionWrite>,
-		IHandle<ClientMessage.TransactionCommit>,
-		IHandle<StorageMessage.RequestCompleted>,
-		IHandle<StorageMessage.AlreadyCommitted>,
-		IHandle<StorageMessage.PrepareAck>,
-		IHandle<ReplicationTrackingMessage.ReplicatedTo>,
-		IHandle<ReplicationTrackingMessage.IndexedTo>,
-		IHandle<StorageMessage.CommitIndexed>,
-		IHandle<StorageMessage.WrongExpectedVersion>,
-		IHandle<StorageMessage.InvalidTransaction>,
-		IHandle<StorageMessage.StreamDeleted>,
-		IHandle<StorageMessage.RequestManagerTimerTick>,
-		IHandle<SystemMessage.StateChangeMessage> {
-		private readonly IPublisher _bus;
-		private readonly TimerMessage.Schedule _tickRequestMessage;
-		private readonly Dictionary<Guid, RequestManagerBase> _currentRequests = new Dictionary<Guid, RequestManagerBase>();
-		private readonly Dictionary<Guid, Stopwatch> _currentTimedRequests = new Dictionary<Guid, Stopwatch>();
-		private readonly TimeSpan _prepareTimeout;
-		private readonly TimeSpan _commitTimeout;
-		private readonly CommitSource _commitSource;
-		private readonly bool _explicitTransactionsSupported;
-		private VNodeState _nodeState;		
-
-		public RequestManagementService(IPublisher bus,
-			TimeSpan prepareTimeout,
-			TimeSpan commitTimeout,
-			bool explicitTransactionsSupported) {
-			Ensure.NotNull(bus, "bus");
-			_bus = bus;
-			_tickRequestMessage = TimerMessage.Schedule.Create(TimeSpan.FromMilliseconds(1000),
-				bus,
-				new StorageMessage.RequestManagerTimerTick());
-
-			_prepareTimeout = prepareTimeout;
-			_commitTimeout = commitTimeout;
-			_commitSource = new CommitSource();
-			_explicitTransactionsSupported = explicitTransactionsSupported;
-		}
-		
-		public void Handle(ClientMessage.WriteEvents message) {
-			var manager = new WriteEvents(
-								_bus,
-								_commitTimeout,
-								message.Envelope,
-								message.InternalCorrId,
-								message.CorrelationId,
-								message.EventStreamId,
-								message.ExpectedVersion,
-								message.Events,
-								_commitSource,
-								message.CancellationToken);
-			_currentRequests.Add(message.InternalCorrId, manager);
-			_currentTimedRequests.Add(message.InternalCorrId, Stopwatch.StartNew());
-			manager.Start();
-		}
-
-		public void Handle(ClientMessage.DeleteStream message) {
-			var manager = new DeleteStream(
-								_bus,
-								_commitTimeout,
-								message.Envelope,
-								message.InternalCorrId,
-								message.CorrelationId,
-								message.EventStreamId,
-								message.ExpectedVersion,
-								message.HardDelete,
-								_commitSource,
-								message.CancellationToken);
-			_currentRequests.Add(message.InternalCorrId, manager);
-			_currentTimedRequests.Add(message.InternalCorrId, Stopwatch.StartNew());
-			manager.Start();
-		}
-
-		public void Handle(ClientMessage.TransactionStart message) {
-			if (!_explicitTransactionsSupported) {
-				var reply = new ClientMessage.TransactionStartCompleted(
-					message.CorrelationId,
-					default,
-					OperationResult.InvalidTransaction,
-					"Explicit transactions are not supported");
-				message.Envelope.ReplyWith(reply);
-				return;
-			}
-
-			var manager = new TransactionStart(
-								_bus,
-								_prepareTimeout,
-								message.Envelope,
-								message.InternalCorrId,
-								message.CorrelationId,
-								message.EventStreamId,
-								message.ExpectedVersion,
-								_commitSource);
-			_currentRequests.Add(message.InternalCorrId, manager);
-			_currentTimedRequests.Add(message.InternalCorrId, Stopwatch.StartNew());
-			manager.Start();
-		}
-
-		public void Handle(ClientMessage.TransactionWrite message) {
-			if (!_explicitTransactionsSupported) {
-				var reply = new ClientMessage.TransactionWriteCompleted(
-					message.CorrelationId,
-					default,
-					OperationResult.InvalidTransaction,
-					"Explicit transactions are not supported");
-				message.Envelope.ReplyWith(reply);
-				return;
-			}
-
-			var manager = new TransactionWrite(
-								_bus,
-								_prepareTimeout,
-								message.Envelope,
-								message.InternalCorrId,
-								message.CorrelationId,
-								message.Events,
-								message.TransactionId,
-								_commitSource);
-			_currentRequests.Add(message.InternalCorrId, manager);
-			_currentTimedRequests.Add(message.InternalCorrId, Stopwatch.StartNew());
-			manager.Start();
-		}
-
-		public void Handle(ClientMessage.TransactionCommit message) {
-			if (!_explicitTransactionsSupported) {
-				var reply = new ClientMessage.TransactionCommitCompleted(
-					message.CorrelationId,
-					default,
-					OperationResult.InvalidTransaction,
-					"Explicit transactions are not supported");
-				message.Envelope.ReplyWith(reply);
-				return;
-			}
-
-			var manager = new TransactionCommit(
-								_bus,
-								_prepareTimeout,
-								_commitTimeout,
-								message.Envelope,
-								message.InternalCorrId,
-								message.CorrelationId,
-								message.TransactionId,
-								_commitSource);
-			_currentRequests.Add(message.InternalCorrId, manager);
-			_currentTimedRequests.Add(message.InternalCorrId, Stopwatch.StartNew());
-			manager.Start();
-		}
-		
-		
-		public void Handle(SystemMessage.StateChangeMessage message) {
-			
-			if (_nodeState == VNodeState.Leader && message.State is not VNodeState.Leader or VNodeState.ResigningLeader) {
-				var keys = _currentRequests.Keys;
-				foreach (var key in keys) {
-					if (_currentRequests.Remove(key, out var manager)) {
-						manager.Dispose();
-					}
-				}
-			}
-			_nodeState = message.State;
-		}
-
-		public void Handle(SystemMessage.SystemInit message) {
-			_bus.Publish(_tickRequestMessage);
-		}
-
-		public void Handle(StorageMessage.RequestManagerTimerTick message) {
-			foreach (var currentRequest in _currentRequests) {
-				currentRequest.Value.Handle(message);
-			}
-			//TODO(clc): if we have become resigning leader should all requests be actively disposed?
-			if (_nodeState == VNodeState.ResigningLeader && _currentRequests.Count == 0) {
-				_bus.Publish(new SystemMessage.RequestQueueDrained());
-			}
-
-			_bus.Publish(_tickRequestMessage);
-		}
-
-		public void Handle(StorageMessage.RequestCompleted message) {
-			if (_currentTimedRequests.TryGetValue(message.CorrelationId, out _)) {
-				// todo: histogram metric?
-				_currentTimedRequests.Remove(message.CorrelationId);
-			}
-
-			if (!_currentRequests.Remove(message.CorrelationId)) {
-				// noop. RequestManager guarantees not complete twice now.
-				// and we will legitimately get in here when StateChangeMessage removes
-				// entries from _currentRequests
-			}
-		}
-		
-		public void Handle(ReplicationTrackingMessage.ReplicatedTo message) => _commitSource.Handle(message);
-		public void Handle(ReplicationTrackingMessage.IndexedTo message) => _commitSource.Handle(message);
-
-		public void Handle(StorageMessage.AlreadyCommitted message) => DispatchInternal(message.CorrelationId, message, static (manager, m) => manager.Handle(m));
-		public void Handle(StorageMessage.PrepareAck message) => DispatchInternal(message.CorrelationId, message, static (manager, m) => manager.Handle(m));
-		public void Handle(StorageMessage.CommitIndexed message) => DispatchInternal(message.CorrelationId, message, static (manager, m) => manager.Handle(m));
-		public void Handle(StorageMessage.WrongExpectedVersion message) => DispatchInternal(message.CorrelationId, message, static (manager, m) => manager.Handle(m));
-		public void Handle(StorageMessage.InvalidTransaction message) => DispatchInternal(message.CorrelationId, message, static (manager, m) => manager.Handle(m));
-		public void Handle(StorageMessage.StreamDeleted message) => DispatchInternal(message.CorrelationId, message, static (manager, m) => manager.Handle(m));
-		
-		private void DispatchInternal<T>(Guid correlationId, T message, Action<RequestManagerBase, T> handle) where T : Message {
-			if (_currentRequests.TryGetValue(correlationId, out var manager)) {
-				handle(manager, message);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/EpochManager/EpochManager.cs b/src/EventStore.Core/Services/Storage/EpochManager/EpochManager.cs
deleted file mode 100644
index f4d204604f5..00000000000
--- a/src/EventStore.Core/Services/Storage/EpochManager/EpochManager.cs
+++ /dev/null
@@ -1,537 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Data;
-using EventStore.Core.DataStructures;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Exceptions;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using ILogger = Serilog.ILogger;
-using EventStore.LogCommon;
-
-namespace EventStore.Core.Services.Storage.EpochManager {
-	public abstract class Epochmanager {
-	}
-
-	public class EpochManager<TStreamId> : IEpochManager {
-		private static readonly ILogger Log = Serilog.Log.ForContext<EpochManager.Epochmanager>();
-		private readonly IPublisher _bus;
-
-		private readonly ICheckpoint _checkpoint;
-		private readonly ObjectPool<ITransactionFileReader> _readers;
-		private readonly ITransactionFileWriter _writer;
-		private readonly IRecordFactory<TStreamId> _recordFactory;
-		private readonly INameIndex<TStreamId> _streamNameIndex;
-		private readonly INameIndex<TStreamId> _eventTypeIndex;
-		private readonly IPartitionManager _partitionManager;
-		private readonly Guid _instanceId;
-
-		private readonly object _locker = new object();
-		private readonly int _cacheSize;
-		private readonly LinkedList<EpochRecord> _epochs = new LinkedList<EpochRecord>();
-
-		private LinkedListNode<EpochRecord> _firstCachedEpoch;
-		private LinkedListNode<EpochRecord> _lastCachedEpoch;
-		public EpochRecord GetLastEpoch() => _lastCachedEpoch?.Value;
-		public int LastEpochNumber => _lastCachedEpoch?.Value.EpochNumber ?? -1;
-		private bool _truncated;
-		private readonly object _truncateLock = new();
-
-		// IMPORTANT
-		// Lock ordering to prevent deadlocks:
-		// 1)  _locker
-		// 2) _truncateLock
-
-		private long Checkpoint {
-			get {
-				lock (_truncateLock) {
-					if (_truncated)
-						throw new InvalidOperationException("Cannot read checkpoint since it has been truncated.");
-					return _checkpoint.Read();
-				}
-			}
-			set {
-				lock (_truncateLock) {
-					if (_truncated)
-						throw new InvalidOperationException("Cannot write checkpoint since it has been truncated.");
-					_checkpoint.Write(value);
-					_checkpoint.Flush();
-				}
-			}
-		}
-
-		public EpochManager(IPublisher bus,
-			int cachedEpochCount,
-			ICheckpoint checkpoint,
-			ITransactionFileWriter writer,
-			int initialReaderCount,
-			int maxReaderCount,
-			Func<ITransactionFileReader> readerFactory,
-			IRecordFactory<TStreamId> recordFactory,
-			INameIndex<TStreamId> streamNameIndex,
-			INameIndex<TStreamId> eventTypeIndex,
-			IPartitionManager partitionManager,
-			Guid instanceId) {
-			Ensure.NotNull(bus, "bus");
-			Ensure.Nonnegative(cachedEpochCount, "cachedEpochCount");
-			Ensure.NotNull(checkpoint, "checkpoint");
-			Ensure.NotNull(writer, "chunkWriter");
-			Ensure.Nonnegative(initialReaderCount, "initialReaderCount");
-			Ensure.Positive(maxReaderCount, "maxReaderCount");
-			if (initialReaderCount > maxReaderCount)
-				throw new ArgumentOutOfRangeException(nameof(initialReaderCount),
-					"initialReaderCount is greater than maxReaderCount.");
-			Ensure.NotNull(readerFactory, "readerFactory");
-
-			_bus = bus;
-			_cacheSize = cachedEpochCount;
-			_checkpoint = checkpoint;
-			_readers = new ObjectPool<ITransactionFileReader>("EpochManager readers pool", initialReaderCount,
-				maxReaderCount, readerFactory);
-			_writer = writer;
-			_recordFactory = recordFactory;
-			_streamNameIndex = streamNameIndex;
-			_eventTypeIndex = eventTypeIndex;
-			_partitionManager = partitionManager;
-			_instanceId = instanceId;
-		}
-
-		public void Init() {
-			ReadEpochs(_cacheSize);
-		}
-
-		private void ReadEpochs(int maxEpochCount) {
-			lock (_locker) {
-				var reader = _readers.Get();
-				try {
-					long epochPos = Checkpoint;
-					if (epochPos < 0) {
-						// we probably have lost/uninitialized epoch checkpoint scan back to find the most recent epoch in the log
-						Log.Information("No epoch checkpoint. Scanning log backwards for most recent epoch...");
-						reader.Reposition(_writer.FlushedPosition);
-
-						SeqReadResult result;
-						while ((result = reader.TryReadPrev()).Success) {
-							var rec = result.LogRecord;
-							if (rec.RecordType != LogRecordType.System ||
-								((ISystemLogRecord)rec).SystemRecordType != SystemRecordType.Epoch)
-								continue;
-							epochPos = rec.LogPosition;
-							break;
-						}
-
-						Log.Information("Done scanning log backwards for most recent epoch.");
-					}
-
-					//read back down the chain of epochs in the log until the cache is full
-					int cnt = 0;
-					while (epochPos >= 0 && cnt < maxEpochCount) {
-						var epoch = ReadEpochAt(reader, epochPos);
-						_epochs.AddFirst(epoch);
-						if(epoch.EpochPosition == 0){ break;}
-						epochPos = epoch.PrevEpochPosition;
-						cnt += 1;
-					}
-
-					_lastCachedEpoch = _epochs.Last;
-					_firstCachedEpoch = _epochs.First;
-				} finally {
-					_readers.Return(reader);
-				}
-			}
-		}
-		private EpochRecord ReadEpochAt(ITransactionFileReader reader, long epochPos) {
-			var result = reader.TryReadAt(epochPos, couldBeScavenged: false);
-			if (!result.Success)
-				throw new Exception($"Could not find Epoch record at LogPosition {epochPos}.");
-			if (result.LogRecord.RecordType != LogRecordType.System)
-				throw new Exception($"LogRecord is not SystemLogRecord: {result.LogRecord}.");
-
-			var sysRec = (ISystemLogRecord)result.LogRecord;
-			if (sysRec.SystemRecordType != SystemRecordType.Epoch)
-				throw new Exception($"SystemLogRecord is not of Epoch sub-type: {result.LogRecord}.");
-
-			return sysRec.GetEpochRecord();
-		}
-		public EpochRecord[] GetLastEpochs(int maxCount) {
-			lock (_locker) {
-				var res = new List<EpochRecord>();
-				var node = _epochs.Last;
-				while (node != null && res.Count < maxCount) {
-					res.Add(node.Value);
-					node = node.Previous;
-				}
-
-				return res.ToArray();
-			}
-		}
-
-		public EpochRecord GetEpochAfter(int epochNumber, bool throwIfNotFound) {
-			if (epochNumber >= LastEpochNumber) {
-				if (!throwIfNotFound)
-					return null;
-				throw new ArgumentOutOfRangeException(
-					nameof(epochNumber),
-					$"EpochNumber no epochs exist after Last Epoch {epochNumber}.");
-			}
-
-			EpochRecord epoch;
-			lock (_locker) {
-				var epochNode = _epochs.Last;
-				while (epochNode != null && epochNode.Value.EpochNumber != epochNumber) {
-					epochNode = epochNode.Previous;
-				}
-
-				epoch = epochNode?.Next?.Value;
-			}
-
-			if (epoch != null) {
-				return epoch; //got it
-			}
-
-			var firstEpoch = _firstCachedEpoch?.Value;
-			if (firstEpoch != null && firstEpoch.PrevEpochPosition != -1) {
-				var reader = _readers.Get();
-				try {
-					epoch = firstEpoch;
-					do {
-						var result = reader.TryReadAt(epoch.PrevEpochPosition, couldBeScavenged: false);
-						if (!result.Success)
-							throw new Exception(
-								$"Could not find Epoch record at LogPosition {epoch.PrevEpochPosition}.");
-						if (result.LogRecord.RecordType != LogRecordType.System)
-							throw new Exception($"LogRecord is not SystemLogRecord: {result.LogRecord}.");
-
-						var sysRec = (ISystemLogRecord)result.LogRecord;
-						if (sysRec.SystemRecordType != SystemRecordType.Epoch)
-							throw new Exception($"SystemLogRecord is not of Epoch sub-type: {result.LogRecord}.");
-
-						var nextEpoch = sysRec.GetEpochRecord();
-						if (nextEpoch.EpochNumber == epochNumber) {
-							return epoch; //got it
-						}
-
-						epoch = nextEpoch;
-					} while (epoch.PrevEpochPosition != -1 && epoch.EpochNumber > epochNumber);
-
-				} finally {
-					_readers.Return(reader);
-				}
-			}
-			
-			if (epoch == null && throwIfNotFound) {
-				throw new Exception($"Concurrency failure, epoch #{epochNumber} should not be null.");
-			}
-
-			return epoch;
-		}
-
-		public bool IsCorrectEpochAt(long epochPosition, int epochNumber, Guid epochId) {
-			Ensure.Nonnegative(epochPosition, "logPosition");
-			Ensure.Nonnegative(epochNumber, "epochNumber");
-			Ensure.NotEmptyGuid(epochId, "epochId");
-
-			if (epochNumber > LastEpochNumber)
-				return false;
-
-			EpochRecord epoch;
-			lock (_locker) {
-				epoch = _epochs.FirstOrDefault(e => e.EpochNumber == epochNumber);
-				if (epoch != null) {
-					return epoch.EpochId == epochId && epoch.EpochPosition == epochPosition;
-				}
-
-				if (_firstCachedEpoch.Value != null && epochNumber > _firstCachedEpoch.Value.EpochNumber)
-					// This isn't a cache miss, we don't have that epoch on this node
-					return false;
-			}
-
-			// epochNumber < _minCachedEpochNumber
-			var reader = _readers.Get();
-			try {
-				var res = reader.TryReadAt(epochPosition, couldBeScavenged: false);
-				if (!res.Success || res.LogRecord.RecordType != LogRecordType.System)
-					return false;
-				var sysRec = (ISystemLogRecord)res.LogRecord;
-				if (sysRec.SystemRecordType != SystemRecordType.Epoch)
-					return false;
-
-				epoch = sysRec.GetEpochRecord();
-				return epoch.EpochNumber == epochNumber && epoch.EpochId == epochId;
-			} catch(Exception ex) when (ex is InvalidReadException || ex is UnableToReadPastEndOfStreamException) {
-				Log.Information(ex, "Failed to read epoch {epochNumber} at {epochPosition}.", epochNumber, epochPosition);
-				return false;
-			} finally {
-				_readers.Return(reader);
-			}
-		}
-
-		// This method should be called from single thread.
-		public void WriteNewEpoch(int epochNumber) {
-			// Now we write epoch record (with possible retry, if we are at the end of chunk) 
-			// and update EpochManager's state, by adjusting cache of records, epoch count and un-caching 
-			// excessive record, if present.
-			// If we are writing the very first epoch, last position will be -1.
-			if (epochNumber < 0) {
-				throw new ArgumentException($"Cannot write an Epoch with a negative Epoch Number {epochNumber}.",
-					nameof(epochNumber));
-			}
-
-			if (epochNumber <= LastEpochNumber) {
-				throw new ArgumentException(
-					$"Cannot add Epoch {epochNumber}, new Epoch numbers must be greater than the Last Epoch  {LastEpochNumber}.",
-					nameof(epochNumber));
-			}
-
-			var epoch = WriteEpochRecordWithRetry(epochNumber, Guid.NewGuid(),
-				_lastCachedEpoch?.Value.EpochPosition ?? -1, _instanceId);
-			AddEpochToCache(epoch);
-		}
-
-		private EpochRecord WriteEpochRecordWithRetry(int epochNumber, Guid epochId, long lastEpochPosition,
-			Guid instanceId) {
-			long pos = _writer.Position;
-			var epoch = new EpochRecord(pos, epochNumber, epochId, lastEpochPosition, DateTime.UtcNow, instanceId);
-			var rec = _recordFactory.CreateEpoch(epoch);
-
-			Log.Debug(
-							"=== Writing E{epochNumber}@{epochPosition}:{epochId:B} (previous epoch at {lastEpochPosition}). L={leaderId:B}.",
-							epochNumber, epoch.EpochPosition, epochId, lastEpochPosition, epoch.LeaderInstanceId);
-			if (!_writer.Write(rec, out pos)) {
-				epoch = new EpochRecord(pos, epochNumber, epochId, lastEpochPosition, DateTime.UtcNow, instanceId);
-				rec = _recordFactory.CreateEpoch(epoch);
-
-				if (!_writer.Write(rec, out pos))
-					throw new Exception($"Second write try failed at {epoch.EpochPosition}.");
-			}
-			_partitionManager.Initialize();
-			WriteEpochInformationWithRetry(epoch);
-			_writer.Flush();
-			_bus.Publish(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			_bus.Publish(new SystemMessage.EpochWritten(epoch));
-			return epoch;
-		}
-
-		private TStreamId GetEpochInformationStream() {
-			if (!_streamNameIndex.GetOrReserve(SystemStreams.EpochInformationStream, out var streamId, out _, out _))
-				throw new Exception($"{SystemStreams.EpochInformationStream} stream does not exist");
-			return streamId;
-		}
-
-		private TStreamId GetEpochInformationEventType() {
-			if (!_eventTypeIndex.GetOrReserve(SystemEventTypes.EpochInformation, out var eventTypeId, out _, out _))
-				throw new Exception($"{SystemEventTypes.EpochInformation} event type does not exist");
-			return eventTypeId;
-		}
-
-		void WriteEpochInformationWithRetry(EpochRecord epoch) {
-			if (!TryGetExpectedVersionForEpochInformation(epoch, out var expectedVersion))
-				expectedVersion = ExpectedVersion.NoStream;
-
-			var originalLogPosition = _writer.Position;
-
-			var epochInformation = LogRecord.Prepare(
-					factory: _recordFactory,
-					logPosition: originalLogPosition,
-					correlationId: Guid.NewGuid(),
-					eventId: Guid.NewGuid(),
-					transactionPos: originalLogPosition,
-					transactionOffset: 0,
-					eventStreamId: GetEpochInformationStream(),
-					expectedVersion: expectedVersion,
-					flags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted | PrepareFlags.IsJson,
-					eventType: GetEpochInformationEventType(),
-					data: epoch.AsSerialized(),
-					metadata: Empty.ByteArray);
-
-			if (_writer.Write(epochInformation, out var retryLogPosition))
-				return;
-
-			epochInformation = epochInformation.CopyForRetry(retryLogPosition, retryLogPosition);
-
-			if (_writer.Write(epochInformation, out _))
-				return;
-
-			throw new Exception(
-				string.Format("Second write try failed when first writing $epoch-information at {0}, then at {1}.",
-					originalLogPosition,
-					retryLogPosition));
-		}
-
-		// we have just written epoch. about to write the $epoch-information for it.
-		// this decides what expected version the $epoch-information should have.
-		// it looks up the previous epoch, finds that epoch's previous information
-		// (which immediately follows it) and gets its event number.
-		// except the first epoch in logv3, which is followed by the root partition
-		// initialization before the epochinfo.
-		bool TryGetExpectedVersionForEpochInformation(EpochRecord epoch, out long expectedVersion) {
-			expectedVersion = default;
-
-			if (epoch.PrevEpochPosition < 0)
-				return false;
-
-			var reader = _readers.Get();
-			try {
-				reader.Reposition(epoch.PrevEpochPosition);
-
-				// read the epoch
-				var result = reader.TryReadNext();
-				if (!result.Success)
-					return false;
-
-				// read the epoch-information (if there is one)
-				while (true) {
-					result = reader.TryReadNext();
-					if (!result.Success)
-						return false;
-
-					if (result.LogRecord is IPrepareLogRecord<TStreamId> prepare &&
-						EqualityComparer<TStreamId>.Default.Equals(prepare.EventStreamId, GetEpochInformationStream())) {
-						// found the epoch information
-						expectedVersion = prepare.ExpectedVersion + 1;
-						return true;
-					}
-
-					if (result.LogRecord.RecordType == LogRecordType.Prepare ||
-						result.LogRecord.RecordType == LogRecordType.Commit ||
-						result.LogRecord.RecordType == LogRecordType.System ||
-						result.LogRecord.RecordType == LogRecordType.StreamWrite) {
-						// definitely not reading the root partition initialization;
-						// there is no epochinfo for this epoch (probably the epoch is older
-						// than the epochinfo mechanism.
-						return false;
-					}
-
-					// could be reading the root partition initialization; skip over it.
-				}
-
-			} catch (Exception) {
-				return false;
-			} finally {
-				_readers.Return(reader);
-			}
-		}
-
-		public void CacheEpoch(EpochRecord epoch) {
-			var added = AddEpochToCache(epoch);
-			// Check each epoch as it is added to the cache for the first time from the chaser.
-			// n.b.: added will be false for idempotent CacheRequests
-			// If this check fails, then there is something very wrong with epochs, data corruption is possible.
-			if (added && !IsCorrectEpochAt(epoch.EpochPosition, epoch.EpochNumber, epoch.EpochId)) {
-				throw new Exception(
-					$"Not found epoch at {epoch.EpochPosition} with epoch number: {epoch.EpochNumber} and epoch ID: {epoch.EpochId}. " +
-					"SetLastEpoch FAILED! Data corruption risk!");
-			}
-		}
-		/// <summary>
-		/// Idempotently adds epochs to the cache
-		/// </summary>
-		/// <param name="epoch">the epoch to add</param>
-		/// <returns>if the submitted epoch was added to the cache, false if already present</returns>
-		public bool AddEpochToCache(EpochRecord epoch) {
-			Ensure.NotNull(epoch, "epoch");
-
-			lock (_locker) {
-
-				// if it's already cached, just return false to indicate idempotent add 
-				if (_epochs.Contains(ep => ep.EpochNumber == epoch.EpochNumber)) { return false; }
-
-				//new last epoch written or received, this is the normal case
-				//if the list is empty Last will be null
-				if (_epochs.Last == null || _epochs.Last.Value.EpochNumber < epoch.EpochNumber) {
-					_epochs.AddLast(epoch);
-					_lastCachedEpoch = _epochs.Last;
-					// in some race conditions we might have a gap in the epoch list
-					//read the epochs from the TFLog to fill in the gaps
-					if (epoch.EpochPosition > 0 &&
-						epoch.PrevEpochPosition >= 0 && 						
-						epoch.PrevEpochPosition > (_epochs.Last?.Previous?.Value?.EpochPosition ?? -1)) {
-						var reader = _readers.Get();
-						var previous = _epochs.Last;
-						var count = 1; //include last
-						try {
-							do {
-								epoch = ReadEpochAt(reader, epoch.PrevEpochPosition);
-								previous = _epochs.AddBefore(previous, epoch);
-								count++;
-							} while (
-								epoch.EpochPosition > 0 &&
-								epoch.PrevEpochPosition >= 0 &&
-								count <= _cacheSize &&
-								epoch.PrevEpochPosition > (previous?.Previous?.Value?.EpochPosition ?? -1));
-						} finally {
-							_readers.Return(reader);
-						}
-					}
-					while (_epochs.Count > _cacheSize) { _epochs.RemoveFirst(); }
-					_firstCachedEpoch = _epochs.First;
-					// Now update epoch checkpoint, so on restart we don't scan sequentially TF.
-					Checkpoint = _epochs.Last.Value.EpochPosition;
-					Log.Debug(
-						"=== Cached new Last Epoch E{epochNumber}@{epochPosition}:{epochId:B} (previous epoch at {lastEpochPosition}) L={leaderId:B}.",
-						epoch.EpochNumber, epoch.EpochPosition, epoch.EpochId, epoch.PrevEpochPosition, epoch.LeaderInstanceId);
-					return true;
-				}				
-				if (epoch.EpochNumber < _epochs.First.Value.EpochNumber) {					
-					return false;
-				}				
-				//this should never happen
-				Log.Error("=== Unable to cache Epoch E{epochNumber}@{epochPosition}:{epochId:B} (previous epoch at {lastEpochPosition}) L={leaderId:B}.",
-					epoch.EpochNumber, epoch.EpochPosition, epoch.EpochId, epoch.PrevEpochPosition, epoch.LeaderInstanceId);
-				foreach (var epochRecord in _epochs) {
-					Log.Error(
-						"====== Epoch E{epochNumber}@{epochPosition}:{epochId:B} (previous epoch at {lastEpochPosition}) L={leaderId:B}.",
-						epochRecord.EpochNumber, epochRecord.EpochPosition, epochRecord.EpochId, epochRecord.PrevEpochPosition, epochRecord.LeaderInstanceId);
-				}
-
-				Log.Error(
-					"====== Last Epoch E{epochNumber}@{epochPosition}:{epochId:B} (previous epoch at {lastEpochPosition}) L={leaderId:B}.",
-					_lastCachedEpoch.Value.EpochNumber, _lastCachedEpoch.Value.EpochPosition, _lastCachedEpoch.Value.EpochId, _lastCachedEpoch.Value.PrevEpochPosition, _lastCachedEpoch.Value.LeaderInstanceId);
-				Log.Error(
-					"====== First Epoch E{epochNumber}@{epochPosition}:{epochId:B} (previous epoch at {lastEpochPosition}) L={leaderId:B}.",
-					_firstCachedEpoch.Value.EpochNumber, _firstCachedEpoch.Value.EpochPosition, _firstCachedEpoch.Value.EpochId, _firstCachedEpoch.Value.PrevEpochPosition, _firstCachedEpoch.Value.LeaderInstanceId);
-
-				throw new Exception($"This should never happen: Unable to find correct position to cache Epoch E{epoch.EpochNumber}@{epoch.EpochPosition}:{epoch.EpochId:B} (previous epoch at {epoch.PrevEpochPosition}) L={epoch.LeaderInstanceId:B}");
-			}
-		}
-
-		private bool TryGetEpochBefore(long position, out EpochRecord epoch) {
-			lock (_locker) {
-				var node = _epochs.Last;
-				while (node != null && node.Value.EpochPosition >= position) {
-					node = node.Previous;
-				}
-
-				if (node != null) {
-					epoch = node.Value;
-					return true;
-				}
-
-				epoch = null;
-				return false;
-			}
-		}
-
-		public bool TryTruncateBefore(long position, out EpochRecord epoch) {
-			lock (_truncateLock) {
-				if (_truncated)
-					throw new InvalidOperationException("Checkpoint has already been truncated.");
-				_truncated = true;
-			}
-
-			if (!TryGetEpochBefore(position, out epoch))
-				return false;
-
-			_checkpoint.Write(epoch.EpochPosition);
-			_checkpoint.Flush();
-
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/EpochManager/IEpochManager.cs b/src/EventStore.Core/Services/Storage/EpochManager/IEpochManager.cs
deleted file mode 100644
index eb6524c2d37..00000000000
--- a/src/EventStore.Core/Services/Storage/EpochManager/IEpochManager.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.Services.Storage.EpochManager {
-	public interface IEpochManager {
-		int LastEpochNumber { get; }
-
-		void Init();
-
-		EpochRecord GetLastEpoch();
-		EpochRecord[] GetLastEpochs(int maxCount);
-		EpochRecord GetEpochAfter(int epochNumber, bool throwIfNotFound);
-		bool IsCorrectEpochAt(long epochPosition, int epochNumber, Guid epochId);
-		void WriteNewEpoch(int epochNumber);
-		void CacheEpoch(EpochRecord epoch);
-		bool TryTruncateBefore(long position, out EpochRecord epoch);
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/InMemory/IInMemoryStreamReader.cs b/src/EventStore.Core/Services/Storage/InMemory/IInMemoryStreamReader.cs
deleted file mode 100644
index f86b6ebdac2..00000000000
--- a/src/EventStore.Core/Services/Storage/InMemory/IInMemoryStreamReader.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using EventStore.Core.Messages;
-
-namespace EventStore.Core.Services.Storage.InMemory;
-
-public interface IInMemoryStreamReader {
-	ClientMessage.ReadStreamEventsForwardCompleted ReadForwards(ClientMessage.ReadStreamEventsForward msg);
-	ClientMessage.ReadStreamEventsBackwardCompleted ReadBackwards(ClientMessage.ReadStreamEventsBackward msg);
-}
diff --git a/src/EventStore.Core/Services/Storage/InMemory/InMemoryLog.cs b/src/EventStore.Core/Services/Storage/InMemory/InMemoryLog.cs
deleted file mode 100644
index 38d0e6d582e..00000000000
--- a/src/EventStore.Core/Services/Storage/InMemory/InMemoryLog.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Threading;
-
-namespace EventStore.Core.Services.Storage.InMemory;
-
-// does not support $all style reads, but tracks the LastCommitPosition so that
-// the long poll mechanism works in the SubscriptionsService.
-// note that the SubscriptionsService currently only supports one physical log
-// and one inmemory log so we can't have separate inmemory logs per inmemory stream.
-public class InMemoryLog {
-	long _lastCommitPosition = 0L;
-
-	public long GetLastCommitPosition() => Interlocked.Read(ref _lastCommitPosition);
-	public long GetNextCommitPosition() => Interlocked.Increment(ref _lastCommitPosition);
-}
diff --git a/src/EventStore.Core/Services/Storage/IndexCommitterService.cs b/src/EventStore.Core/Services/Storage/IndexCommitterService.cs
deleted file mode 100644
index 0140f7743c1..00000000000
--- a/src/EventStore.Core/Services/Storage/IndexCommitterService.cs
+++ /dev/null
@@ -1,298 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Concurrent;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Monitoring.Stats;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.LogRecords;
-using System.Threading.Tasks;
-using EventStore.Core.Index;
-using ILogger = Serilog.ILogger;
-
-
-namespace EventStore.Core.Services.Storage {
-	public interface IIndexCommitterService<TStreamId> {
-		void Init(long checkpointPosition);
-		void Stop();
-		long GetCommitLastEventNumber(CommitLogRecord record);
-		void AddPendingPrepare(IPrepareLogRecord<TStreamId>[] prepares, long postPosition);
-		void AddPendingCommit(CommitLogRecord commit, long postPosition);
-	}
-
-	public abstract class IndexCommitterService {
-		protected readonly ILogger Log = Serilog.Log.ForContext<IndexCommitterService>();
-	}
-
-	public class IndexCommitterService<TStreamId> : IndexCommitterService, IIndexCommitterService<TStreamId>,
-		IMonitoredQueue,
-		IHandle<SystemMessage.BecomeShuttingDown>,
-		IHandle<ReplicationTrackingMessage.ReplicatedTo>,
-		IHandle<StorageMessage.CommitAck>,
-		IHandle<ClientMessage.MergeIndexes> {
-		private readonly IIndexCommitter<TStreamId> _indexCommitter;
-		private readonly IPublisher _publisher;
-		private readonly IReadOnlyCheckpoint _replicationCheckpoint;
-		private readonly IReadOnlyCheckpoint _writerCheckpoint;
-		private readonly ITableIndex _tableIndex;
-		private Thread _thread;
-		private bool _stop;
-
-		public string Name {
-			get { return _queueStats.Name; }
-		}
-
-		private readonly QueueStatsCollector _queueStats;
-
-		private readonly ConcurrentQueueWrapper<StorageMessage.CommitAck> _replicatedQueue =
-			new ConcurrentQueueWrapper<StorageMessage.CommitAck>();
-
-		private readonly ConcurrentDictionary<long, PendingTransaction> _pendingTransactions =
-			new ConcurrentDictionary<long, PendingTransaction>();
-
-		private readonly SortedList<long, StorageMessage.CommitAck> _commitAcks = new SortedList<long, StorageMessage.CommitAck>();
-		private readonly ManualResetEventSlim _addMsgSignal = new ManualResetEventSlim(false, 1);
-		private TimeSpan _waitTimeoutMs = TimeSpan.FromMilliseconds(100);
-		private readonly TaskCompletionSource<object> _tcs = new TaskCompletionSource<object>();
-
-		public Task Task {
-			get { return _tcs.Task; }
-		}
-
-		public IndexCommitterService(
-			IIndexCommitter<TStreamId> indexCommitter,
-			IPublisher publisher,
-			IReadOnlyCheckpoint writerCheckpoint,
-			IReadOnlyCheckpoint replicationCheckpoint,
-			ITableIndex tableIndex,
-			QueueStatsManager queueStatsManager) {
-			Ensure.NotNull(indexCommitter, nameof(indexCommitter));
-			Ensure.NotNull(publisher, nameof(publisher));
-			Ensure.NotNull(writerCheckpoint, nameof(writerCheckpoint));
-			Ensure.NotNull(replicationCheckpoint, nameof(replicationCheckpoint));
-			
-
-			_indexCommitter = indexCommitter;
-			_publisher = publisher;
-			_writerCheckpoint = writerCheckpoint;
-			_replicationCheckpoint = replicationCheckpoint;
-			_tableIndex = tableIndex;
-			_queueStats = queueStatsManager.CreateQueueStatsCollector("Index Committer");
-		}
-
-		public void Init(long chaserCheckpoint) {
-			_indexCommitter.Init(chaserCheckpoint);
-			_publisher.Publish(new ReplicationTrackingMessage.IndexedTo(_indexCommitter.LastIndexedPosition));
-			_thread = new Thread(HandleReplicatedQueue);
-			_thread.IsBackground = true;
-			_thread.Name = Name;
-			_thread.Start();
-		}
-
-		public void Stop() {
-			_stop = true;
-		}
-
-		public void HandleReplicatedQueue() {
-			try {
-				_queueStats.Start();
-				QueueMonitor.Default.Register(this);
-
-				StorageMessage.CommitAck replicatedMessage;
-				var msgType = typeof(StorageMessage.CommitAck);
-				while (!_stop) {
-					_addMsgSignal.Reset();
-					if (_replicatedQueue.TryDequeue(out replicatedMessage)) {
-						_queueStats.EnterBusy();
-#if DEBUG
-						_queueStats.Dequeued(replicatedMessage);
-#endif
-						_queueStats.ProcessingStarted(msgType, _replicatedQueue.Count);
-						ProcessCommitReplicated(replicatedMessage);
-						_queueStats.ProcessingEnded(1);
-					} else {
-						_queueStats.EnterIdle();
-						_addMsgSignal.Wait(_waitTimeoutMs);
-					}
-				}
-			} catch (Exception exc) {
-				_queueStats.EnterIdle();
-				_queueStats.ProcessingStarted<FaultedIndexCommitterServiceState>(0);
-				Log.Fatal(exc, "Error in IndexCommitterService. Terminating...");
-				_tcs.TrySetException(exc);
-				Application.Exit(ExitCode.Error,
-					"Error in IndexCommitterService. Terminating...\nError: " + exc.Message);
-				while (!_stop) {
-					Thread.Sleep(100);
-				}
-
-				_queueStats.ProcessingEnded(0);
-			} finally {
-				_queueStats.Stop();
-				QueueMonitor.Default.Unregister(this);
-			}
-
-			_publisher.Publish(new SystemMessage.ServiceShutdown(Name));
-		}
-
-		private void ProcessCommitReplicated(StorageMessage.CommitAck message) {
-			PendingTransaction transaction;
-			long lastEventNumber = message.LastEventNumber;
-			if (_pendingTransactions.TryRemove(message.TransactionPosition, out transaction)) {
-				var isTfEof = IsTfEof(transaction.PostPosition);
-				if (transaction.Prepares.Count > 0) {
-					_indexCommitter.Commit(transaction.Prepares, isTfEof, true);
-				}
-
-				if (transaction.Commit != null) {
-					lastEventNumber = _indexCommitter.Commit(transaction.Commit, isTfEof, true);
-				}
-			}
-
-			lastEventNumber = lastEventNumber == EventNumber.Invalid ? message.LastEventNumber : lastEventNumber;
-
-			_publisher.Publish(new ReplicationTrackingMessage.IndexedTo(message.LogPosition));
-
-			_publisher.Publish(new StorageMessage.CommitIndexed(message.CorrelationId, message.LogPosition,
-				message.TransactionPosition, message.FirstEventNumber, lastEventNumber));
-		}
-
-		private bool IsTfEof(long postPosition) {
-			return postPosition == _writerCheckpoint.Read();
-		}
-
-		public long GetCommitLastEventNumber(CommitLogRecord commit) {
-			return _indexCommitter.GetCommitLastEventNumber(commit);
-		}
-
-		public void AddPendingPrepare(IPrepareLogRecord<TStreamId>[] prepares, long postPosition) {
-			var transactionPosition = prepares[0].TransactionPosition;
-			PendingTransaction transaction;
-			if (_pendingTransactions.TryGetValue(transactionPosition, out transaction)) {
-				var newTransaction = new PendingTransaction(transactionPosition, postPosition, transaction.Prepares,
-					transaction.Commit);
-				newTransaction.AddPendingPrepares(prepares);
-				if (!_pendingTransactions.TryUpdate(transactionPosition, newTransaction, transaction)) {
-					throw new InvalidOperationException("Failed to update pending prepare");
-				}
-			} else {
-				var pendingTransaction = new PendingTransaction(transactionPosition, postPosition, prepares);
-				if (!_pendingTransactions.TryAdd(transactionPosition, pendingTransaction)) {
-					throw new InvalidOperationException("Failed to add pending prepare");
-				}
-			}
-		}
-
-		public void AddPendingCommit(CommitLogRecord commit, long postPosition) {
-			PendingTransaction transaction;
-			if (_pendingTransactions.TryGetValue(commit.TransactionPosition, out transaction)) {
-				var newTransaction = new PendingTransaction(commit.TransactionPosition, postPosition,
-					transaction.Prepares, commit);
-				if (!_pendingTransactions.TryUpdate(commit.TransactionPosition, newTransaction, transaction)) {
-					throw new InvalidOperationException("Failed to update pending commit");
-				}
-			} else {
-				var pendingTransaction = new PendingTransaction(commit.TransactionPosition, postPosition, commit);
-				if (!_pendingTransactions.TryAdd(commit.TransactionPosition, pendingTransaction)) {
-					throw new InvalidOperationException("Failed to add pending commit");
-				}
-			}
-		}
-
-		public void Handle(SystemMessage.BecomeShuttingDown message) {
-			_stop = true;
-		}
-		public void Handle(StorageMessage.CommitAck message) {
-			lock (_commitAcks) {
-				_commitAcks.TryAdd(message.LogPosition, message);
-			}
-			EnqueueReplicatedCommits();
-		}
-
-		public void Handle(ReplicationTrackingMessage.ReplicatedTo message) {
-			EnqueueReplicatedCommits();
-		}
-
-		private void EnqueueReplicatedCommits() {
-			var replicated = new List<StorageMessage.CommitAck>();
-			lock (_commitAcks) {
-				if (_commitAcks.Count > 0) {
-					do {
-						var ack = _commitAcks.Values[0];
-						if (ack.LogPosition >= _replicationCheckpoint.Read()) { break; }
-						replicated.Add(ack);
-						_commitAcks.RemoveAt(0);
-					} while (_commitAcks.Count > 0);
-				}
-			}
-			foreach (var ack in replicated) {
-#if DEBUG
-				_queueStats.Enqueued();
-#endif
-				_replicatedQueue.Enqueue(ack);
-				_addMsgSignal.Set();
-			}
-		}
-
-		public QueueStats GetStatistics() {
-			return _queueStats.GetStatistics(0);
-		}
-
-		private class FaultedIndexCommitterServiceState {
-		}
-
-		internal class PendingTransaction {
-			public readonly List<IPrepareLogRecord<TStreamId>> Prepares = new List<IPrepareLogRecord<TStreamId>>();
-			private CommitLogRecord _commit;
-
-			public CommitLogRecord Commit {
-				get { return _commit; }
-			}
-
-			public readonly long TransactionPosition;
-			public readonly long PostPosition;
-
-			public PendingTransaction(long transactionPosition, long postPosition,
-				IEnumerable<IPrepareLogRecord<TStreamId>> prepares, CommitLogRecord commit = null) {
-				TransactionPosition = transactionPosition;
-				PostPosition = postPosition;
-				Prepares.AddRange(prepares);
-				_commit = commit;
-			}
-
-			public PendingTransaction(long transactionPosition, long postPosition, CommitLogRecord commit) {
-				TransactionPosition = transactionPosition;
-				PostPosition = postPosition;
-				_commit = commit;
-			}
-
-			public void AddPendingPrepares(IEnumerable<IPrepareLogRecord<TStreamId>> prepares) {
-				Prepares.AddRange(prepares);
-			}
-
-			public void SetPendingCommit(CommitLogRecord commit) {
-				_commit = commit;
-			}
-		}
-
-		public void Handle(ClientMessage.MergeIndexes message) {
-			if (_tableIndex.IsBackgroundTaskRunning) {
-				Log.Information("A background operation is already running...");
-				MakeReplyForMergeIndexes(message);
-				return;
-			}
-
-			_tableIndex.MergeIndexes();
-			MakeReplyForMergeIndexes(message);
-		}
-
-		private static void MakeReplyForMergeIndexes(ClientMessage.MergeIndexes message) {
-			message.Envelope.ReplyWith(new ClientMessage.MergeIndexesResponse(message.CorrelationId,
-				ClientMessage.MergeIndexesResponse.MergeIndexesResult.Started));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/AllReader.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/AllReader.cs
deleted file mode 100644
index 665a5896854..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/AllReader.cs
+++ /dev/null
@@ -1,329 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public interface IAllReader {
-		/// <summary>
-		/// Returns event records in the sequence they were committed into TF.
-		/// Positions is specified as pre-positions (pointer at the beginning of the record).
-		/// </summary>
-		IndexReadAllResult ReadAllEventsForward(TFPos pos, int maxCount);
-
-		/// <summary>
-		/// Returns event records whose eventType matches the given <see cref="EventFilter"/> in the sequence they were committed into TF.
-		/// Positions is specified as pre-positions (pointer at the beginning of the record).
-		/// </summary>
-		IndexReadAllResult FilteredReadAllEventsForward(TFPos pos, int maxCount, int maxSearchWindow,
-			IEventFilter eventFilter);
-
-		/// <summary>
-		/// Returns event records in the reverse sequence they were committed into TF.
-		/// Positions is specified as post-positions (pointer after the end of record).
-		/// </summary>
-		IndexReadAllResult ReadAllEventsBackward(TFPos pos, int maxCount);
-
-		/// <summary>
-		/// Returns event records whose eventType matches the given <see cref="EventFilter"/> in the sequence they were committed into TF.
-		/// Positions is specified as pre-positions (pointer at the beginning of the record).
-		/// </summary>
-		IndexReadAllResult FilteredReadAllEventsBackward(TFPos pos, int maxCount, int maxSearchWindow,
-			IEventFilter eventFilter);
-	}
-
-	public class AllReader<TStreamId> : IAllReader {
-		private readonly IIndexBackend _backend;
-		private readonly IIndexCommitter _indexCommitter;
-		private readonly INameLookup<TStreamId> _streamNames;
-		private readonly INameLookup<TStreamId> _eventTypes;
-
-		public AllReader(IIndexBackend backend, IIndexCommitter indexCommitter, INameLookup<TStreamId> streamNames, INameLookup<TStreamId> eventTypes) {
-			Ensure.NotNull(backend, "backend");
-			Ensure.NotNull(indexCommitter, "indexCommitter");
-			Ensure.NotNull(streamNames, nameof(streamNames));
-			Ensure.NotNull(eventTypes, nameof(eventTypes));
-			_backend = backend;
-			_indexCommitter = indexCommitter;
-			_streamNames = streamNames;
-			_eventTypes = eventTypes;
-		}
-
-		public IndexReadAllResult ReadAllEventsForward(TFPos pos, int maxCount) {
-			return ReadAllEventsForwardInternal(pos, maxCount, int.MaxValue, EventFilter.DefaultAllFilter);
-		}
-
-		public IndexReadAllResult FilteredReadAllEventsForward(TFPos pos, int maxCount, int maxSearchWindow,
-			IEventFilter eventFilter) {
-			return ReadAllEventsForwardInternal(pos, maxCount, maxSearchWindow, eventFilter);
-		}
-
-
-		private IndexReadAllResult ReadAllEventsForwardInternal(TFPos pos, int maxCount, int maxSearchWindow,
-			IEventFilter eventFilter) {
-			var records = new List<CommitEventRecord>();
-			var nextPos = pos;
-			// in case we are at position after which there is no commit at all, in that case we have to force 
-			// PreparePosition to long.MaxValue, so if you decide to read backwards from PrevPos, 
-			// you will receive all prepares.
-			var prevPos = new TFPos(pos.CommitPosition, long.MaxValue);
-			var consideredEventsCount = 0L;
-			var firstCommit = true;
-			var reachedEndOfStream = false;
-			using (var reader = _backend.BorrowReader()) {
-				long nextCommitPos = pos.CommitPosition;
-				while (records.Count < maxCount && consideredEventsCount < maxSearchWindow) {
-					if (nextCommitPos > _indexCommitter.LastIndexedPosition) {
-						reachedEndOfStream = true;
-						break;
-					}
-
-					reader.Reposition(nextCommitPos);
-
-					SeqReadResult result;
-					while ((result = reader.TryReadNext()).Success && !IsCommitAlike(result.LogRecord)) {
-						// skip until commit
-					}
-
-					if (!result.Success) // no more records in TF
-						break;
-
-					nextCommitPos = result.RecordPostPosition;
-
-					switch (result.LogRecord.RecordType) {
-						case LogRecordType.Prepare:
-						case LogRecordType.Stream:
-						case LogRecordType.EventType: {
-							var prepare = (IPrepareLogRecord<TStreamId>)result.LogRecord;
-							if (firstCommit) {
-								firstCommit = false;
-								prevPos = new TFPos(result.RecordPrePosition, result.RecordPrePosition);
-							}
-
-							if (prepare.Flags.HasAnyOf(PrepareFlags.Data | PrepareFlags.StreamDelete)
-							    && new TFPos(prepare.LogPosition, prepare.LogPosition) >= pos) {
-								var streamName = _streamNames.LookupName(prepare.EventStreamId);
-								var eventType = _eventTypes.LookupName(prepare.EventType);
-								var eventRecord = new EventRecord(eventNumber: prepare.ExpectedVersion + 1,
-									prepare, streamName, eventType);
-								consideredEventsCount++;
-								if (eventFilter.IsEventAllowed(eventRecord)) {
-									records.Add(new CommitEventRecord(eventRecord, prepare.LogPosition));
-								}
-
-								nextPos = new TFPos(result.RecordPostPosition, 0);
-							}
-
-							break;
-						}
-
-						case LogRecordType.Commit: {
-							var commit = (CommitLogRecord)result.LogRecord;
-							if (firstCommit) {
-								firstCommit = false;
-								// for backward pass we want to allow read the same commit and skip read prepares, 
-								// so we put post-position of commit and post-position of prepare as TFPos for backward pass
-								prevPos = new TFPos(result.RecordPostPosition, pos.PreparePosition);
-							}
-
-							reader.Reposition(commit.TransactionPosition);
-							while (records.Count < maxCount && consideredEventsCount < maxSearchWindow) {
-								result = reader.TryReadNext();
-								if (!result.Success) // no more records in TF
-									break;
-								// prepare with TransactionEnd could be scavenged already
-								// so we could reach the same commit record. In that case have to stop
-								if (result.LogRecord.LogPosition >= commit.LogPosition)
-									break;
-								if (result.LogRecord.RecordType != LogRecordType.Prepare)
-									continue;
-
-								var prepare = (IPrepareLogRecord<TStreamId>)result.LogRecord;
-								if (prepare.TransactionPosition != commit.TransactionPosition) // wrong prepare
-									continue;
-
-								// prepare with useful data or delete tombstone
-								if (prepare.Flags.HasAnyOf(PrepareFlags.Data | PrepareFlags.StreamDelete)
-								    && new TFPos(commit.LogPosition, prepare.LogPosition) >= pos) {
-									var streamName = _streamNames.LookupName(prepare.EventStreamId);
-									var eventType = _eventTypes.LookupName(prepare.EventType);
-									var eventRecord =
-										new EventRecord(commit.FirstEventNumber + prepare.TransactionOffset,
-											prepare, streamName, eventType);
-									consideredEventsCount++;
-									if (eventFilter.IsEventAllowed(eventRecord)) {
-										records.Add(new CommitEventRecord(eventRecord, commit.LogPosition));
-									}
-
-									// for forward pass position is inclusive, 
-									// so we put pre-position of commit and post-position of prepare
-									nextPos = new TFPos(commit.LogPosition, result.RecordPostPosition);
-								}
-
-								if (prepare.Flags.HasAnyOf(PrepareFlags.TransactionEnd))
-									break;
-							}
-
-							break;
-						}
-
-						default:
-							throw new Exception(string.Format("Unexpected log record type: {0}.",
-								result.LogRecord.RecordType));
-					}
-				}
-
-				return new IndexReadAllResult(records, pos, nextPos, prevPos, reachedEndOfStream, consideredEventsCount);
-			}
-		}
-		
-		public IndexReadAllResult ReadAllEventsBackward(TFPos pos, int maxCount) {
-			return ReadAllEventsBackwardInternal(pos, maxCount, int.MaxValue, EventFilter.DefaultAllFilter);
-		}
-
-		public IndexReadAllResult FilteredReadAllEventsBackward(TFPos pos, int maxCount, int maxSearchWindow,
-			IEventFilter eventFilter) {
-			return ReadAllEventsBackwardInternal(pos, maxCount, maxSearchWindow, eventFilter);
-		}
-
-		private IndexReadAllResult ReadAllEventsBackwardInternal(TFPos pos, int maxCount, int maxSearchWindow,
-			IEventFilter eventFilter) {
-			var records = new List<CommitEventRecord>();
-			var nextPos = pos;
-			// in case we are at position after which there is no commit at all, in that case we have to force 
-			// PreparePosition to 0, so if you decide to read backwards from PrevPos, 
-			// you will receive all prepares.
-			var prevPos = new TFPos(pos.CommitPosition, 0);
-			var consideredEventsCount = 0L;
-			bool firstCommit = true;
-			var reachedEndOfStream = false;
-			using (var reader = _backend.BorrowReader()) {
-				long nextCommitPostPos = pos.CommitPosition;
-				while (records.Count < maxCount && consideredEventsCount < maxSearchWindow) {
-					reader.Reposition(nextCommitPostPos);
-
-					SeqReadResult result;
-					while ((result = reader.TryReadPrev()).Success && !IsCommitAlike(result.LogRecord)) {
-						// skip until commit
-					}
-
-					if (!result.Success) {
-						// no more records in TF
-						reachedEndOfStream = true;
-						break;
-					}
-
-					nextCommitPostPos = result.RecordPrePosition;
-
-					if (nextCommitPostPos > _indexCommitter.LastIndexedPosition) {
-						continue;
-					}
-
-					switch (result.LogRecord.RecordType) {
-						case LogRecordType.Prepare:
-						case LogRecordType.Stream:
-						case LogRecordType.EventType: {
-							var prepare = (IPrepareLogRecord<TStreamId>)result.LogRecord;
-							if (firstCommit) {
-								firstCommit = false;
-								prevPos = new TFPos(result.RecordPostPosition, result.RecordPostPosition);
-							}
-
-							if (prepare.Flags.HasAnyOf(PrepareFlags.Data | PrepareFlags.StreamDelete)
-							    && new TFPos(result.RecordPostPosition, result.RecordPostPosition) <= pos) {
-								var streamName = _streamNames.LookupName(prepare.EventStreamId);
-								var eventType = _eventTypes.LookupName(prepare.EventType);
-								var eventRecord = new EventRecord(eventNumber: prepare.ExpectedVersion + 1,
-									prepare, streamName, eventType);
-								consideredEventsCount++;
-
-								if (eventFilter.IsEventAllowed(eventRecord)) {
-									records.Add(new CommitEventRecord(eventRecord, prepare.LogPosition));
-								}
-
-								// for backward pass we allow read the same commit, but force to skip last read prepare
-								// so we put post-position of commit and pre-position of prepare
-								nextPos = new TFPos(result.RecordPrePosition, result.RecordPrePosition);
-							}
-
-							break;
-						}
-
-						case LogRecordType.Commit: {
-							var commit = (CommitLogRecord)result.LogRecord;
-							if (firstCommit) {
-								firstCommit = false;
-								// for forward pass we allow read the same commit and as we have post-positions here
-								// we can put just prepare post-position as prepare pre-position for forward read
-								// so we put pre-position of commit and post-position of prepare
-								prevPos = new TFPos(commit.LogPosition, pos.PreparePosition);
-							}
-
-							var commitPostPos = result.RecordPostPosition;
-							// as we don't know exact position of the last record of transaction,
-							// we have to sequentially scan backwards, so no need to reposition
-							while (records.Count < maxCount && consideredEventsCount < maxSearchWindow) {
-								result = reader.TryReadPrev();
-								if (!result.Success) // no more records in TF
-									break;
-
-								// prepare with TransactionBegin could be scavenged already
-								// so we could reach beyond the start of transaction. In that case we have to stop.
-								if (result.LogRecord.LogPosition < commit.TransactionPosition)
-									break;
-								if (result.LogRecord.RecordType != LogRecordType.Prepare)
-									continue;
-
-								var prepare = (IPrepareLogRecord<TStreamId>)result.LogRecord;
-								if (prepare.TransactionPosition != commit.TransactionPosition) // wrong prepare
-									continue;
-
-								// prepare with useful data or delete tombstone
-								if (prepare.Flags.HasAnyOf(PrepareFlags.Data | PrepareFlags.StreamDelete)
-								    && new TFPos(commitPostPos, result.RecordPostPosition) <= pos) {
-									var streamName = _streamNames.LookupName(prepare.EventStreamId);
-									var eventType = _eventTypes.LookupName(prepare.EventType);
-									var eventRecord =
-										new EventRecord(commit.FirstEventNumber + prepare.TransactionOffset,
-											prepare, streamName, eventType);
-									consideredEventsCount++;
-
-									if (eventFilter.IsEventAllowed(eventRecord)) {
-										records.Add(new CommitEventRecord(eventRecord, commit.LogPosition));
-									}
-
-									// for backward pass we allow read the same commit, but force to skip last read prepare
-									// so we put post-position of commit and pre-position of prepare
-									nextPos = new TFPos(commitPostPos, prepare.LogPosition);
-								}
-
-								if (prepare.Flags.HasAnyOf(PrepareFlags.TransactionBegin))
-									break;
-							}
-
-							break;
-						}
-
-						default:
-							throw new Exception(string.Format("Unexpected log record type: {0}.",
-								result.LogRecord.RecordType));
-					}
-				}
-
-				return new IndexReadAllResult(records, pos, nextPos, prevPos, reachedEndOfStream, consideredEventsCount);
-			}
-		}
-
-		private static bool IsCommitAlike(ILogRecord rec) {
-			return rec.RecordType == LogRecordType.Commit
-			       || ((rec.RecordType == LogRecordType.Prepare
-			            || rec.RecordType == LogRecordType.EventType
-			            || rec.RecordType == LogRecordType.Stream) &&
-			           ((IPrepareLogRecord)rec).Flags.HasAnyOf(PrepareFlags.IsCommitted));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/BoundedCache.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/BoundedCache.cs
deleted file mode 100644
index cdd78cb69cf..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/BoundedCache.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public class BoundedCache<TKey, TValue> {
-		public int Count {
-			get { return _cache.Count; }
-		}
-
-		private readonly int _maxCachedEntries;
-		private readonly long _maxDataSize;
-		private readonly Func<TValue, long> _valueSize;
-
-		private readonly Dictionary<TKey, TValue> _cache = new Dictionary<TKey, TValue>();
-		private readonly Queue<TKey> _queue = new Queue<TKey>();
-
-		private long _currentSize;
-		private long _missCount;
-		private long _hitCount;
-
-		public BoundedCache(int maxCachedEntries, long maxDataSize, Func<TValue, long> valueSize) {
-			Ensure.NotNull(valueSize, "valueSize");
-			if (maxCachedEntries <= 0)
-				throw new ArgumentOutOfRangeException("maxCachedEntries");
-			if (maxDataSize <= 0)
-				throw new ArgumentOutOfRangeException("maxDataSize");
-
-			_maxCachedEntries = maxCachedEntries;
-			_maxDataSize = maxDataSize;
-			_valueSize = valueSize;
-		}
-
-		public bool TryGetRecord(TKey key, out TValue value) {
-			var found = _cache.TryGetValue(key, out value);
-			if (found)
-				_hitCount++;
-			else
-				_missCount++;
-			return found;
-		}
-
-		public void PutRecord(TKey key, TValue value) {
-			PutRecord(key, value, true);
-		}
-
-		public void PutRecord(TKey key, TValue value, bool throwOnDuplicate) {
-			while (IsFull()) {
-				var oldKey = _queue.Dequeue();
-				RemoveRecord(oldKey);
-			}
-
-			_currentSize += _valueSize(value);
-			_queue.Enqueue(key);
-			if (!throwOnDuplicate && _cache.ContainsKey(key))
-				return;
-			_cache.Add(key, value);
-		}
-
-		public bool TryPutRecord(TKey key, TValue value) {
-			if (IsFull())
-				return false;
-
-			_currentSize += _valueSize(value);
-			_queue.Enqueue(key);
-			_cache.Add(key, value); // add to throw exception if duplicate
-			return true;
-		}
-
-		public void Clear() {
-			_currentSize = 0;
-			_queue.Clear();
-			_cache.Clear();
-		}
-
-		private bool IsFull() {
-			return _queue.Count >= _maxCachedEntries
-			       || (_currentSize > _maxDataSize && _queue.Count > 0);
-		}
-
-		public void RemoveRecord(TKey key) {
-			TValue old;
-			if (_cache.TryGetValue(key, out old)) {
-				_currentSize -= _valueSize(old);
-				_cache.Remove(key);
-			}
-		}
-
-		public ReadCacheStats GetStatistics() {
-			return new ReadCacheStats(Interlocked.Read(ref _currentSize),
-				_cache.Count,
-				Interlocked.Read(ref _hitCount),
-				Interlocked.Read(ref _missCount));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/CommitCheckResult.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/CommitCheckResult.cs
deleted file mode 100644
index a23a80fd45f..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/CommitCheckResult.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public struct CommitCheckResult<TStreamId> {
-		public readonly CommitDecision Decision;
-		public readonly TStreamId EventStreamId;
-		public readonly long CurrentVersion;
-		public readonly long StartEventNumber;
-		public readonly long EndEventNumber;
-		public readonly bool IsSoftDeleted;
-		public readonly long IdempotentLogPosition;
-
-		public CommitCheckResult(CommitDecision decision,
-			TStreamId eventStreamId,
-			long currentVersion,
-			long startEventNumber,
-			long endEventNumber,
-			bool isSoftDeleted,
-			long idempotentLogPosition = -1) {
-			Decision = decision;
-			EventStreamId = eventStreamId;
-			CurrentVersion = currentVersion;
-			StartEventNumber = startEventNumber;
-			EndEventNumber = endEventNumber;
-			IsSoftDeleted = isSoftDeleted;
-			IdempotentLogPosition = idempotentLogPosition;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/CommitDecision.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/CommitDecision.cs
deleted file mode 100644
index 7a18c71dadd..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/CommitDecision.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public enum CommitDecision {
-		Ok,
-		WrongExpectedVersion,
-		Deleted,
-		Idempotent,
-		CorruptedIdempotency,
-		InvalidTransaction,
-		IdempotentNotReady
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/EventFilter.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/EventFilter.cs
deleted file mode 100644
index 47ffd0d1a55..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/EventFilter.cs
+++ /dev/null
@@ -1,293 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text.RegularExpressions;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public static class EventFilter {
-		public const string StreamIdContext = "streamid";
-		public const string EventTypeContext = "eventtype";
-		public const string RegexType = "regex";
-		public const string PrefixType = "prefix";
-
-		public static IEventFilter DefaultAllFilter { get; } = new DefaultAllFilterStrategy();
-		public static IEventFilter DefaultStreamFilter { get; } = new DefaultStreamFilterStrategy();
-
-		public static class StreamName {
-			public static IEventFilter Prefixes(bool isAllStream, params string[] prefixes)
-				=> new StreamIdPrefixStrategy(isAllStream, prefixes);
-
-			public static IEventFilter Regex(bool isAllStream, string regex)
-				=> new StreamIdRegexStrategy(isAllStream, regex);
-		}
-
-		public static class EventType {
-			public static IEventFilter Prefixes(bool isAllStream, params string[] prefixes)
-				=> new EventTypePrefixStrategy(isAllStream, prefixes);
-
-			public static IEventFilter Regex(bool isAllStream, string regex)
-				=> new EventTypeRegexStrategy(isAllStream, regex);
-		}
-
-		public static IEventFilter Get(bool isAllStream, Client.Messages.Filter filter) {
-			if (filter == null || filter.Data.Count == 0) {
-				return isAllStream ? (IEventFilter) new DefaultAllFilterStrategy() : new DefaultStreamFilterStrategy();
-			}
-
-			return filter.Context switch {
-				Client.Messages.Filter.Types.FilterContext.EventType when filter.Type ==
-				                                                          Client.Messages.Filter.Types.FilterType.Prefix =>
-				EventType.Prefixes(isAllStream, filter.Data.ToArray()),
-				Client.Messages.Filter.Types.FilterContext.EventType when filter.Type ==
-				                                                          Client.Messages.Filter.Types.FilterType.Regex =>
-				EventType.Regex(isAllStream, filter.Data[0]),
-				Client.Messages.Filter.Types.FilterContext.StreamId when filter.Type ==
-				                                                         Client.Messages.Filter.Types.FilterType.Prefix =>
-				StreamName.Prefixes(isAllStream, filter.Data.ToArray()),
-				Client.Messages.Filter.Types.FilterContext.StreamId when filter.Type ==
-				                                                         Client.Messages.Filter.Types.FilterType.Regex =>
-				StreamName.Regex(isAllStream, filter.Data[0]),
-				_ => throw new Exception() // Invalid filter
-			};
-		}
-
-		private sealed class DefaultStreamFilterStrategy : IEventFilter {
-			[MethodImpl(MethodImplOptions.AggressiveInlining|MethodImplOptions.AggressiveOptimization)]
-			public bool IsEventAllowed(EventRecord eventRecord) => true;
-		}
-
-		private sealed class DefaultAllFilterStrategy : IEventFilter {
-			//first rule that matches from the top is applied
-			private (IEventFilter filter, bool allow)[] _allFilters = {
-				//immediately allow all non-system events
-				(new NonSystemStreamStrategy(), true),
-				//disallow $epoch-information
-				(new OrdinalStreamIdEqualityStrategy(SystemStreams.EpochInformationStream), false),
-				//disallow persistent subscription to $all checkpoints
-				(new OrdinalStreamIdPrefixAndSuffixStrategy("$persistentsubscription-$all::","-checkpoint"), false),
-				//disallow persistent subscription to $all parked messages
-				(new OrdinalStreamIdPrefixAndSuffixStrategy("$persistentsubscription-$all::","-parked"), false)
-			};
-
-			[MethodImpl(MethodImplOptions.AggressiveInlining|MethodImplOptions.AggressiveOptimization)]
-			public bool IsEventAllowed(EventRecord eventRecord) {
-				var filters = _allFilters.AsSpan();
-				Debug.Assert(filters.Length > 0);
-				do {
-					var (filter, allow) = filters[0];
-					if (filter.IsEventAllowed(eventRecord)) {
-						return allow;
-					}
-					filters = filters[1..];
-				} while (!filters.IsEmpty);
-				return true;
-			}
-
-			public override string ToString() => nameof(DefaultAllFilterStrategy);
-
-			private class NonSystemStreamStrategy : IEventFilter {
-				[MethodImpl(MethodImplOptions.AggressiveInlining|MethodImplOptions.AggressiveOptimization)]
-				public bool IsEventAllowed(EventRecord eventRecord) =>
-					eventRecord.EventStreamId[0] != '$';
-
-				public override string ToString() => nameof(NonSystemStreamStrategy);
-			}
-
-			private sealed class OrdinalStreamIdEqualityStrategy : IEventFilter {
-				private readonly string _stream;
-
-				public OrdinalStreamIdEqualityStrategy(string stream) {
-					_stream = stream;
-				}
-
-				[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-				public bool IsEventAllowed(EventRecord eventRecord) =>
-					eventRecord.EventStreamId == _stream;
-
-				public override string ToString() => nameof(OrdinalStreamIdEqualityStrategy);
-			}
-
-			private class OrdinalStreamIdPrefixAndSuffixStrategy : IEventFilter {
-				private readonly string _prefix;
-				private readonly string _suffix;
-				private readonly int _minLength;
-
-				public OrdinalStreamIdPrefixAndSuffixStrategy(string prefix, string suffix) {
-					_prefix = prefix;
-					_suffix = suffix;
-					_minLength = _prefix.Length + _suffix.Length;
-				}
-
-				[MethodImpl(MethodImplOptions.AggressiveInlining|MethodImplOptions.AggressiveOptimization)]
-				public bool IsEventAllowed(EventRecord eventRecord) =>
-					eventRecord.EventStreamId.Length >= _minLength
-					&& eventRecord.EventStreamId.StartsWith(_prefix, StringComparison.Ordinal)
-					&& eventRecord.EventStreamId.EndsWith(_suffix, StringComparison.Ordinal);
-				public override string ToString() =>
-					$"{nameof(OrdinalStreamIdPrefixAndSuffixStrategy)}: (prefix: {_prefix}, suffix: {_suffix})";
-			}
-		}
-
-		private sealed class StreamIdPrefixStrategy : IEventFilter {
-			internal readonly bool _isAllStream;
-			internal readonly string[] _expectedPrefixes;
-
-			public StreamIdPrefixStrategy(bool isAllStream, string[] expectedPrefixes) {
-				_isAllStream = isAllStream;
-				_expectedPrefixes = expectedPrefixes;
-			}
-
-			public bool IsEventAllowed(EventRecord eventRecord) =>
-				(!_isAllStream || DefaultAllFilter.IsEventAllowed(eventRecord)) &&
-				_expectedPrefixes.Any(expectedPrefix => eventRecord.EventStreamId.StartsWith(expectedPrefix));
-
-			public override string ToString() =>
-				$"{nameof(StreamIdPrefixStrategy)}: ({string.Join(", ", _expectedPrefixes)})";
-		}
-
-		private sealed class EventTypePrefixStrategy : IEventFilter {
-			internal readonly bool _isAllStream;
-			internal readonly string[] _expectedPrefixes;
-
-			public EventTypePrefixStrategy(bool isAllStream, string[] expectedPrefixes) {
-				_isAllStream = isAllStream;
-				_expectedPrefixes = expectedPrefixes;
-			}
-
-			public bool IsEventAllowed(EventRecord eventRecord) =>
-				(!_isAllStream || DefaultAllFilter.IsEventAllowed(eventRecord)) &&
-				_expectedPrefixes.Any(expectedPrefix => eventRecord.EventType.StartsWith(expectedPrefix));
-
-			public override string ToString() =>
-				$"{nameof(EventTypePrefixStrategy)}: ({string.Join(", ", _expectedPrefixes)})";
-		}
-
-		private sealed class EventTypeRegexStrategy : IEventFilter {
-			internal readonly bool _isAllStream;
-			internal readonly Regex _expectedRegex;
-
-			public EventTypeRegexStrategy(bool isAllStream, string expectedRegex) {
-				_isAllStream = isAllStream;
-				_expectedRegex = new Regex(expectedRegex, RegexOptions.Compiled);
-			}
-
-			public bool IsEventAllowed(EventRecord eventRecord) =>
-				(!_isAllStream || DefaultAllFilter.IsEventAllowed(eventRecord)) &&
-				_expectedRegex.Match(eventRecord.EventType).Success;
-
-			public override string ToString() =>
-				$"{nameof(EventTypeRegexStrategy)}: ({string.Join(", ", _expectedRegex)})";
-		}
-
-		private sealed class StreamIdRegexStrategy : IEventFilter {
-			internal readonly bool _isAllStream;
-			internal readonly Regex _expectedRegex;
-
-			public StreamIdRegexStrategy(bool isAllStream, string expectedRegex) {
-				_isAllStream = isAllStream;
-				_expectedRegex = new Regex(expectedRegex, RegexOptions.Compiled);
-			}
-
-			public bool IsEventAllowed(EventRecord eventRecord) =>
-				(!_isAllStream || DefaultAllFilter.IsEventAllowed(eventRecord)) &&
-				_expectedRegex.Match(eventRecord.EventStreamId).Success;
-
-			public override string ToString() =>
-				$"{nameof(StreamIdRegexStrategy)}: ({string.Join(", ", _expectedRegex)})";
-		}
-
-		public class EventFilterDto {
-			public string Context;
-			public string Type;
-			public string Data;
-			public bool IsAllStream;
-		}
-
-		public static EventFilterDto ParseToDto(IEventFilter filter) {
-			switch (filter) {
-				case StreamIdPrefixStrategy sips:
-					return new EventFilterDto {
-						Context = StreamIdContext,
-						Type = PrefixType,
-						Data = string.Join(",", sips._expectedPrefixes.Select(x => $"{x}")),
-						IsAllStream = sips._isAllStream
-					};
-				case StreamIdRegexStrategy sirs:
-					return new EventFilterDto {
-						Context = StreamIdContext,
-						Type = RegexType,
-						Data = sirs._expectedRegex.ToString(),
-						IsAllStream = sirs._isAllStream
-					};
-				case EventTypePrefixStrategy etps:
-					return new EventFilterDto {
-						Context = EventTypeContext,
-						Type = PrefixType,
-						Data = string.Join(",", etps._expectedPrefixes.Select(x => $"{x}")),
-						IsAllStream = etps._isAllStream
-					};
-				case EventTypeRegexStrategy etrs:
-					return new EventFilterDto {
-						Context = EventTypeContext,
-						Type = RegexType,
-						Data = etrs._expectedRegex.ToString(),
-						IsAllStream = etrs._isAllStream
-					};
-			}
-
-			return null;
-		}
-
-		public static (bool success, string reason) TryParse(EventFilterDto dto, out IEventFilter filter) {
-			return TryParse(dto.Context, dto.IsAllStream, dto.Type, dto.Data, out filter);
-		}
-
-		public static (bool Success, string Reason) TryParse(string context, bool isAllStream, string type, string data,
-			out IEventFilter filter) {
-			Client.Messages.Filter.Types.FilterContext parsedContext;
-			switch (context) {
-				case EventTypeContext:
-					parsedContext = Client.Messages.Filter.Types.FilterContext.EventType;
-					break;
-				case StreamIdContext:
-					parsedContext = Client.Messages.Filter.Types.FilterContext.StreamId;
-					break;
-				default:
-					filter = null;
-					var names = string.Join(", ", Enum.GetNames(typeof(Client.Messages.Filter.Types.FilterContext)));
-					return (false, $"Invalid context please provide one of the following: {names}.");
-			}
-
-			Client.Messages.Filter.Types.FilterType parsedType;
-			switch (type) {
-				case RegexType:
-					parsedType = Client.Messages.Filter.Types.FilterType.Regex;
-					break;
-				case PrefixType:
-					parsedType = Client.Messages.Filter.Types.FilterType.Prefix;
-					break;
-				default:
-					filter = null;
-					var names = string.Join(", ", Enum.GetNames(typeof(Client.Messages.Filter.Types.FilterType)));
-					return (false, $"Invalid type please provide one of the following: {names}.");
-			}
-
-			if (string.IsNullOrEmpty(data)) {
-				filter = null;
-				return (false, "Please provide a comma delimited list of data with at least one item.");
-			}
-
-			if (parsedType == Client.Messages.Filter.Types.FilterType.Regex) {
-				filter = Get(isAllStream, new Client.Messages.Filter(parsedContext, parsedType, new[] {data}));
-				return (true, null);
-			}
-
-			filter = Get(isAllStream, new Client.Messages.Filter(parsedContext, parsedType,
-				data.Split(new[] {","}, StringSplitOptions.RemoveEmptyEntries)));
-			return (true, null);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/ExpiryStrategies.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/ExpiryStrategies.cs
deleted file mode 100644
index 854f88566e2..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/ExpiryStrategies.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public interface IExpiryStrategy {
-		public DateTime? GetExpiry();
-	}
-
-	// Generates null expiry. Default expiry of now + ESConsts.ReadRequestTimeout will be in effect.
-	public class DefaultExpiryStrategy : IExpiryStrategy {
-		public DateTime? GetExpiry() => null;
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/IEventFilter.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/IEventFilter.cs
deleted file mode 100644
index 302910aa94f..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/IEventFilter.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using EventStore.Core.Data;
-
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public interface IEventFilter {
-		bool IsEventAllowed(EventRecord eventRecord);
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/IReadIndex.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/IReadIndex.cs
deleted file mode 100644
index 3738285f3df..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/IReadIndex.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System;
-using System.Security.Claims;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Util;
-
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public interface IReadIndex {
-		long LastIndexedPosition { get; }
-
-		ReadIndexStats GetStatistics();
-
-		/// <summary>
-		/// Returns event records in the sequence they were committed into TF.
-		/// Positions is specified as pre-positions (pointer at the beginning of the record).
-		/// </summary>
-		IndexReadAllResult ReadAllEventsForward(TFPos pos, int maxCount);
-
-		/// <summary>
-		/// Returns event records in the reverse sequence they were committed into TF.
-		/// Positions is specified as post-positions (pointer after the end of record).
-		/// </summary>
-		IndexReadAllResult ReadAllEventsBackward(TFPos pos, int maxCount);
-
-		/// <summary>
-		/// Returns event records whose eventType matches the given EventFilter in the sequence they were committed into TF.
-		/// Positions is specified as pre-positions (pointer at the beginning of the record).
-		/// </summary>
-		IndexReadAllResult ReadAllEventsForwardFiltered(TFPos pos, int maxCount, int maxSearchWindow,
-			IEventFilter eventFilter);
-
-		/// <summary>
-		/// Returns event records whose eventType matches the given EventFilter in the sequence they were committed into TF.
-		/// Positions is specified as pre-positions (pointer at the beginning of the record).
-		/// </summary>
-		IndexReadAllResult ReadAllEventsBackwardFiltered(TFPos pos, int maxCount, int maxSearchWindow,
-			IEventFilter eventFilter);
-
-		void Close();
-		void Dispose();
-	}
-
-	public interface IReadIndex<TStreamId> : IReadIndex {
-		IIndexWriter<TStreamId> IndexWriter { get; }
-
-		// ReadEvent() / ReadStreamEvents*() :
-		// - deleted events are filtered out
-		// - duplicates are removed, keeping only the earliest event in the log
-		// - streamId drives the read, streamName is only for populating on the result.
-		//   this was less messy than safely adding the streamName to the EventRecord at some point after construction.
-		IndexReadEventResult ReadEvent(string streamName, TStreamId streamId, long eventNumber);
-		IndexReadStreamResult ReadStreamEventsBackward(string streamName, TStreamId streamId, long fromEventNumber, int maxCount);
-		IndexReadStreamResult ReadStreamEventsForward(string streamName, TStreamId streamId, long fromEventNumber, int maxCount);
-
-		// ReadEventInfo_KeepDuplicates() :
-		// - deleted events are not filtered out
-		// - duplicates are kept, in ascending order of log position
-		// - next event number is always -1
-		IndexReadEventInfoResult ReadEventInfo_KeepDuplicates(TStreamId streamId, long eventNumber);
-
-		// ReadEventInfo*Collisions() :
-		// - deleted events are not filtered out
-		// - duplicates are removed, keeping only the earliest event in the log
-		// - only events that are before "beforePosition" in the transaction log are returned
-		IndexReadEventInfoResult ReadEventInfoForward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount, long beforePosition);
-		IndexReadEventInfoResult ReadEventInfoForward_NoCollisions(ulong stream, long fromEventNumber, int maxCount, long beforePosition);
-		IndexReadEventInfoResult ReadEventInfoBackward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount, long beforePosition);
-		IndexReadEventInfoResult ReadEventInfoBackward_NoCollisions(ulong stream, Func<ulong, TStreamId> getStreamId, long fromEventNumber, int maxCount, long beforePosition);
-
-		bool IsStreamDeleted(TStreamId streamId);
-		long GetStreamLastEventNumber(TStreamId streamId);
-		long GetStreamLastEventNumber_KnownCollisions(TStreamId streamId, long beforePosition);
-		long GetStreamLastEventNumber_NoCollisions(ulong stream, Func<ulong, TStreamId> getStreamId, long beforePosition);
-		StreamMetadata GetStreamMetadata(TStreamId streamId);
-		StorageMessage.EffectiveAcl GetEffectiveAcl(TStreamId streamId);
-		TStreamId GetEventStreamIdByTransactionId(long transactionId);
-
-		TStreamId GetStreamId(string streamName);
-		string GetStreamName(TStreamId streamId);
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/IndexBackend.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/IndexBackend.cs
deleted file mode 100644
index b771566b19c..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/IndexBackend.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
-using EventStore.Common.Utils;
-using EventStore.Core.Caching;
-using EventStore.Core.Data;
-using EventStore.Core.DataStructures;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.TransactionLog;
-using Serilog;
-using Serilog.Events;
-
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public interface IIndexBackend {
-		TFReaderLease BorrowReader();
-		void SetSystemSettings(SystemSettings systemSettings);
-		SystemSettings GetSystemSettings();
-	}
-
-	public interface IIndexBackend<TStreamId> : IIndexBackend {
-		IndexBackend<TStreamId>.EventNumberCached TryGetStreamLastEventNumber(TStreamId streamId);
-		IndexBackend<TStreamId>.MetadataCached TryGetStreamMetadata(TStreamId streamId);
-
-		long? UpdateStreamLastEventNumber(int cacheVersion, TStreamId streamId, long? lastEventNumber);
-		StreamMetadata UpdateStreamMetadata(int cacheVersion, TStreamId streamId, StreamMetadata metadata);
-
-		long? SetStreamLastEventNumber(TStreamId streamId, long lastEventNumber);
-		StreamMetadata SetStreamMetadata(TStreamId streamId, StreamMetadata metadata);
-	}
-
-	public class IndexBackend<TStreamId> : IIndexBackend<TStreamId> {
-		private readonly ObjectPool<ITransactionFileReader> _readers;
-		private readonly ILRUCache<TStreamId, EventNumberCached> _streamLastEventNumberCache;
-		private readonly ILRUCache<TStreamId, MetadataCached> _streamMetadataCache;
-		private SystemSettings _systemSettings;
-
-		public IndexBackend(
-			ObjectPool<ITransactionFileReader> readers,
-			ILRUCache<TStreamId, EventNumberCached> streamLastEventNumberCache,
-			ILRUCache<TStreamId, MetadataCached> streamMetadataCache) {
-
-			Ensure.NotNull(readers, nameof(readers));
-			Ensure.NotNull(streamLastEventNumberCache, nameof(streamLastEventNumberCache));
-			Ensure.NotNull(streamMetadataCache, nameof(streamMetadataCache));
-
-			_readers = readers;
-			_streamLastEventNumberCache = streamLastEventNumberCache;
-			_streamMetadataCache = streamMetadataCache;
-		}
-
-		public TFReaderLease BorrowReader() {
-			return new TFReaderLease(_readers);
-		}
-
-		public EventNumberCached TryGetStreamLastEventNumber(TStreamId streamId) {
-			EventNumberCached cacheInfo;
-			_streamLastEventNumberCache.TryGet(streamId, out cacheInfo);
-			return cacheInfo;
-		}
-
-		public MetadataCached TryGetStreamMetadata(TStreamId streamId) {
-			MetadataCached cacheInfo;
-			_streamMetadataCache.TryGet(streamId, out cacheInfo);
-			return cacheInfo;
-		}
-
-		public long? UpdateStreamLastEventNumber(int cacheVersion, TStreamId streamId, long? lastEventNumber) {
-			var res = _streamLastEventNumberCache.Put(
-				streamId,
-				new KeyValuePair<int, long?>(cacheVersion, lastEventNumber),
-				(key, d) => d.Key == 0 ? new EventNumberCached(1, d.Value) : new EventNumberCached(1, null),
-				(key, old, d) => old.Version == d.Key
-					? new EventNumberCached(d.Key + 1, d.Value ?? old.LastEventNumber)
-					: old);
-			return res.LastEventNumber;
-		}
-
-		public StreamMetadata UpdateStreamMetadata(int cacheVersion, TStreamId streamId, StreamMetadata metadata) {
-			var res = _streamMetadataCache.Put(
-				streamId,
-				new KeyValuePair<int, StreamMetadata>(cacheVersion, metadata),
-				(key, d) => d.Key == 0 ? new MetadataCached(1, d.Value) : new MetadataCached(1, null),
-				(key, old, d) => old.Version == d.Key ? new MetadataCached(d.Key + 1, d.Value ?? old.Metadata) : old);
-			return res.Metadata;
-		}
-
-		long? IIndexBackend<TStreamId>.SetStreamLastEventNumber(TStreamId streamId, long lastEventNumber) {
-			var res = _streamLastEventNumberCache.Put(streamId,
-				lastEventNumber,
-				(key, lastEvNum) => new EventNumberCached(1, lastEvNum),
-				(key, old, lastEvNum) => new EventNumberCached(old.Version + 1, lastEvNum));
-			return res.LastEventNumber;
-		}
-
-		StreamMetadata IIndexBackend<TStreamId>.SetStreamMetadata(TStreamId streamId, StreamMetadata metadata) {
-			var res = _streamMetadataCache.Put(streamId,
-				metadata,
-				(key, meta) => new MetadataCached(1, meta),
-				(key, old, meta) => new MetadataCached(old.Version + 1, meta));
-			return res.Metadata;
-		}
-
-		public void SetSystemSettings(SystemSettings systemSettings) {
-			_systemSettings = systemSettings;
-		}
-
-		public SystemSettings GetSystemSettings() {
-			return _systemSettings;
-		}
-
-		public struct EventNumberCached {
-			public readonly int Version;
-			public readonly long? LastEventNumber;
-
-			public EventNumberCached(int version, long? lastEventNumber) {
-				Version = version;
-				LastEventNumber = lastEventNumber;
-			}
-
-			public static int ApproximateSize => Unsafe.SizeOf<EventNumberCached>();
-		}
-
-		public struct MetadataCached {
-			public readonly int Version;
-			public readonly StreamMetadata Metadata;
-
-			public MetadataCached(int version, StreamMetadata metadata) {
-				Version = version;
-				Metadata = metadata;
-			}
-
-			public int ApproximateSize => Unsafe.SizeOf<MetadataCached>() + (Metadata?.ApproximateSize ?? 0);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/IndexCommitter.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/IndexCommitter.cs
deleted file mode 100644
index 77cd4c48e8c..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/IndexCommitter.cs
+++ /dev/null
@@ -1,535 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading;
-using System.Text;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Index;
-using EventStore.Core.Messages;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.LogRecords;
-using ILogger = Serilog.ILogger;
-using EventStore.LogCommon;
-
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public interface IIndexCommitter {
-		long LastIndexedPosition { get; }
-		void Init(long buildToPosition);
-		void Dispose();
-		long Commit(CommitLogRecord commit, bool isTfEof, bool cacheLastEventNumber);
-		long GetCommitLastEventNumber(CommitLogRecord commit);
-	}
-
-	public interface IIndexCommitter<TStreamId> : IIndexCommitter {
-		long Commit(IList<IPrepareLogRecord<TStreamId>> commitedPrepares, bool isTfEof, bool cacheLastEventNumber);
-	}
-
-	public abstract class IndexCommitter {
-		public static readonly ILogger Log = Serilog.Log.ForContext<IndexCommitter>();
-	}
-
-	public class IndexCommitter<TStreamId> : IndexCommitter, IIndexCommitter<TStreamId> {
-		private static EqualityComparer<TStreamId> StreamIdComparer { get; } = EqualityComparer<TStreamId>.Default;
-
-		public long LastIndexedPosition => _indexChk.Read();
-
-		private readonly IPublisher _bus;
-		private readonly IIndexBackend<TStreamId> _backend;
-		private readonly IIndexReader<TStreamId> _indexReader;
-		private readonly ITableIndex<TStreamId> _tableIndex;
-		private readonly INameIndexConfirmer<TStreamId> _streamNameIndex;
-		private readonly INameLookup<TStreamId> _streamNames;
-		private readonly INameIndexConfirmer<TStreamId> _eventTypeIndex;
-		private readonly INameLookup<TStreamId> _eventTypes;
-		private readonly ISystemStreamLookup<TStreamId> _systemStreams;
-		private readonly INameExistenceFilter _streamExistenceFilter;
-		private readonly IIndexStatusTracker _statusTracker;
-		private readonly IIndexTracker _tracker;
-		private INameExistenceFilterInitializer _streamExistenceFilterInitializer;
-		private readonly bool _additionalCommitChecks;
-		private long _persistedPreparePos = -1;
-		private long _persistedCommitPos = -1;
-		private bool _indexRebuild = true;
-		private readonly ICheckpoint _indexChk;
-
-		public IndexCommitter(
-			IPublisher bus,
-			IIndexBackend<TStreamId> backend,
-			IIndexReader<TStreamId> indexReader,
-			ITableIndex<TStreamId> tableIndex,
-			INameIndexConfirmer<TStreamId> streamNameIndex,
-			INameLookup<TStreamId> streamNames,
-			INameIndexConfirmer<TStreamId> eventTypeIndex,
-			INameLookup<TStreamId> eventTypes,
-			ISystemStreamLookup<TStreamId> systemStreams,
-			INameExistenceFilter streamExistenceFilter,
-			INameExistenceFilterInitializer streamExistenceFilterInitializer,
-			ICheckpoint indexChk,
-			IIndexStatusTracker statusTracker,
-			IIndexTracker tracker,
-			bool additionalCommitChecks) {
-			_bus = bus;
-			_backend = backend;
-			_indexReader = indexReader;
-			_tableIndex = tableIndex;
-			_streamNameIndex = streamNameIndex;
-			_streamNames = streamNames;
-			_eventTypeIndex = eventTypeIndex;
-			_eventTypes = eventTypes;
-			_systemStreams = systemStreams;
-			_streamExistenceFilter = streamExistenceFilter;
-			_streamExistenceFilterInitializer = streamExistenceFilterInitializer;
-			_indexChk = indexChk;
-			_additionalCommitChecks = additionalCommitChecks;
-			_statusTracker = statusTracker;
-			_tracker = tracker;
-		}
-
-		public void Init(long buildToPosition) {
-			Log.Information("TableIndex initialization...");
-
-			using (_statusTracker.StartOpening()) {
-			    _tableIndex.Initialize(buildToPosition);
-			}
-
-			_persistedPreparePos = _tableIndex.PrepareCheckpoint;
-			_persistedCommitPos = _tableIndex.CommitCheckpoint;
-			//todo(clc) determin if this needs to move into the TableIndex re:project-io
-			_indexChk.Write(_tableIndex.CommitCheckpoint);
-			_indexChk.Flush();
-
-			if (_indexChk.Read() >= buildToPosition)
-				throw new Exception(string.Format("_lastCommitPosition {0} >= buildToPosition {1}", _indexChk.Read(),
-					buildToPosition));
-
-			var startTime = DateTime.UtcNow;
-			var lastTime = DateTime.UtcNow;
-			var reportPeriod = TimeSpan.FromSeconds(5);
-
-			Log.Information("ReadIndex building...");
-
-			// V2 index:
-			// right now its possible for entries to get into the main index before being replicated
-			// (because we catch up to the chaser position)
-			// when we join the cluster it may turn out that some of what we indexed needs truncating.
-			// this is dealt with by adjusting the checkpoints and restarting. usually
-			// the unwanted index entries were only in memory so restarting will discard them.
-			// if they do happen to have been persisted, the above will delete the whole index.
-			//
-			// V3 index:
-			// the upshot for the stream name index is that here we must initialise the stream
-			// name index with the main index before we catch it up, even though it will likely
-			// mean entries need to be removed only to be readded.
-			// 
-			// after we only allow replicated entries into the index we can be sure that
-			// neither index will need truncating and this will become more elegant.
-			_streamNameIndex.InitializeWithConfirmed(_streamNames);
-			_eventTypeIndex.InitializeWithConfirmed(_eventTypes);
-
-			_indexRebuild = true;
-			using (_statusTracker.StartRebuilding())
-			using (var reader = _backend.BorrowReader()) {
-				var startPosition = Math.Max(0, _persistedCommitPos);
-				var fullRebuild = startPosition == 0;
-				reader.Reposition(startPosition);
-
-				var commitedPrepares = new List<IPrepareLogRecord<TStreamId>>();
-
-				long processed = 0;
-				SeqReadResult result;
-				while ((result = reader.TryReadNext()).Success && result.LogRecord.LogPosition < buildToPosition) {
-					switch (result.LogRecord.RecordType) {
-						case LogRecordType.Stream:
-						case LogRecordType.EventType:
-						case LogRecordType.Prepare: {
-								var prepare = (IPrepareLogRecord<TStreamId>)result.LogRecord;
-								if (prepare.Flags.HasAnyOf(PrepareFlags.IsCommitted)) {
-									if (prepare.Flags.HasAnyOf(PrepareFlags.SingleWrite)) {
-										Commit(commitedPrepares, false, false);
-										commitedPrepares.Clear();
-										Commit(new[] { prepare }, result.Eof, false);
-									} else {
-										if (prepare.Flags.HasAnyOf(PrepareFlags.Data | PrepareFlags.StreamDelete))
-											commitedPrepares.Add(prepare);
-										if (prepare.Flags.HasAnyOf(PrepareFlags.TransactionEnd)) {
-											Commit(commitedPrepares, result.Eof, false);
-											commitedPrepares.Clear();
-										}
-									}
-								}
-
-								break;
-							}
-						case LogRecordType.Commit:
-							Commit((CommitLogRecord)result.LogRecord, result.Eof, false);
-							break;
-						case LogRecordType.System:
-						case LogRecordType.Partition:
-						case LogRecordType.PartitionType:
-							break;
-						default:
-							throw new Exception(string.Format("Unknown RecordType: {0}", result.LogRecord.RecordType));
-					}
-
-					processed += 1;
-					if (DateTime.UtcNow - lastTime > reportPeriod || processed % 100000 == 0) {
-						Log.Debug("ReadIndex Rebuilding: processed {processed} records ({resultPosition:0.0}%).",
-							processed,
-							(result.RecordPostPosition - startPosition) * 100.0 / (buildToPosition - startPosition));
-						lastTime = DateTime.UtcNow;
-					}
-
-					if (fullRebuild && processed % 1000000 == 0) {
-						if (_tableIndex.IsBackgroundTaskRunning) {
-							Log.Debug("Pausing ReadIndex Rebuild due to ongoing index merges.");
-							while (_tableIndex.IsBackgroundTaskRunning) {
-								Thread.Sleep(1000);
-							}
-							Log.Debug("Resuming ReadIndex Rebuild.");
-						}
-					}
-				}
-
-				Log.Debug("ReadIndex rebuilding done: total processed {processed} records, time elapsed: {elapsed}.",
-					processed, DateTime.UtcNow - startTime);
-				startTime = DateTime.UtcNow;
-
-				// now that the main index has caught up, we initialize the stream existence filter to add any missing entries.
-				// while the index above is concerned with building exactly to the buildToPosition and not beyond, that isn't
-				// important for the streamexistencefiler since false positives are allowed. it only cares about truncating back
-				// to the buildToPosition (if necessary).
-				// V2:
-				// reads the index and transaction file forward from the last checkpoint (a log position) and adds stream names to the filter, possibly multiple times
-				// but it's not an issue since it's idempotent
-				//
-				// V3:
-				// reads the stream created stream forward from the last checkpoint (a stream number) and adds stream names to the filter
-				//
-				// V2/V3 note: it's possible that we add extra uncommitted entries to the filter if the index or log later gets truncated when joining
-				// the cluster but false positives are not a problem since it's a probabilistic filter
-				Log.Debug("Initializing the StreamExistenceFilter. The filter can be disabled by setting the configuration option \"StreamExistenceFilterSize\" to 0");
-				_statusTracker.StartInitializing();
-				_streamExistenceFilter.Initialize(_streamExistenceFilterInitializer, truncateToPosition: buildToPosition);
-				Log.Debug("StreamExistenceFilter initialized. Time elapsed: {elapsed}.",
-					DateTime.UtcNow - startTime);
-
-				_bus.Publish(new StorageMessage.TfEofAtNonCommitRecord());
-				_backend.SetSystemSettings(GetSystemSettings());
-			}
-			_indexRebuild = false;
-		}
-
-		public void Dispose() {
-			_streamNameIndex?.Dispose();
-			_eventTypeIndex?.Dispose();
-			_streamExistenceFilter?.Dispose();
-			try {
-				_tableIndex.Close(removeFiles: false);
-			} catch (TimeoutException exc) {
-				Log.Error(exc, "Timeout exception when trying to close TableIndex.");
-				throw;
-			}
-		}
-
-		public long GetCommitLastEventNumber(CommitLogRecord commit) {
-			long eventNumber = EventNumber.Invalid;
-
-			var lastIndexedPosition = _indexChk.Read();
-			if (commit.LogPosition < lastIndexedPosition || (commit.LogPosition == lastIndexedPosition && !_indexRebuild))
-				return eventNumber;
-
-			foreach (var prepare in GetTransactionPrepares(commit.TransactionPosition, commit.LogPosition)) {
-				if (prepare.Flags.HasNoneOf(PrepareFlags.StreamDelete | PrepareFlags.Data))
-					continue;
-				eventNumber = prepare.Flags.HasAllOf(PrepareFlags.StreamDelete)
-					? EventNumber.DeletedStream
-					: commit.FirstEventNumber + prepare.TransactionOffset;
-			}
-
-			return eventNumber;
-		}
-
-		public long Commit(CommitLogRecord commit, bool isTfEof, bool cacheLastEventNumber) {
-			long eventNumber = EventNumber.Invalid;
-
-			var lastIndexedPosition = _indexChk.Read();
-			if (commit.LogPosition < lastIndexedPosition || (commit.LogPosition == lastIndexedPosition && !_indexRebuild))
-				return eventNumber; // already committed
-
-			TStreamId streamId = default;
-			var indexEntries = new List<IndexKey<TStreamId>>();
-			var prepares = new List<IPrepareLogRecord<TStreamId>>();
-
-			foreach (var prepare in GetTransactionPrepares(commit.TransactionPosition, commit.LogPosition)) {
-				if (prepare.Flags.HasNoneOf(PrepareFlags.StreamDelete | PrepareFlags.Data))
-					continue;
-
-				if (StreamIdComparer.Equals(streamId, default)) {
-					streamId = prepare.EventStreamId;
-				} else {
-					if (!StreamIdComparer.Equals(prepare.EventStreamId, streamId))
-						throw new Exception(string.Format("Expected stream: {0}, actual: {1}. LogPosition: {2}",
-							streamId, prepare.EventStreamId, commit.LogPosition));
-				}
-
-				eventNumber = prepare.Flags.HasAllOf(PrepareFlags.StreamDelete)
-					? EventNumber.DeletedStream
-					: commit.FirstEventNumber + prepare.TransactionOffset;
-
-				if (new TFPos(commit.LogPosition, prepare.LogPosition) >
-					new TFPos(_persistedCommitPos, _persistedPreparePos)) {
-					indexEntries.Add(new IndexKey<TStreamId>(streamId, eventNumber, prepare.LogPosition));
-					prepares.Add(prepare);
-				}
-			}
-
-			if (indexEntries.Count > 0) {
-				if (_additionalCommitChecks && cacheLastEventNumber) {
-					CheckStreamVersion(streamId, indexEntries[0].Version, commit);
-					CheckDuplicateEvents(streamId, commit, indexEntries, prepares);
-				}
-
-				_tableIndex.AddEntries(commit.LogPosition, indexEntries); // atomically add a whole bulk of entries
-			}
-
-			if (eventNumber != EventNumber.Invalid) {
-				if (eventNumber < 0)
-					throw new Exception(string.Format("EventNumber {0} is incorrect.", eventNumber));
-
-				if (cacheLastEventNumber) {
-					_backend.SetStreamLastEventNumber(streamId, eventNumber);
-				}
-
-				if (_systemStreams.IsMetaStream(streamId))
-					_backend.SetStreamMetadata(_systemStreams.OriginalStreamOf(streamId),
-						null); // invalidate cached metadata
-
-				if (StreamIdComparer.Equals(streamId, _systemStreams.SettingsStream))
-					_backend.SetSystemSettings(DeserializeSystemSettings(prepares[prepares.Count - 1].Data));
-			}
-
-			// todo: refactor into one call
-			_streamNameIndex.Confirm(prepares, commit, _indexRebuild, _backend);
-			_eventTypeIndex.Confirm(prepares, commit, _indexRebuild, _backend);
-
-			var newLastIndexedPosition = Math.Max(commit.LogPosition, lastIndexedPosition);
-			if (_indexChk.Read() != lastIndexedPosition) {
-				throw new Exception(
-					"Concurrency error in ReadIndex.Commit: _lastCommitPosition was modified during Commit execution!");
-			}
-			_indexChk.Write(newLastIndexedPosition);
-			_indexChk.Flush();
-
-			if (!_indexRebuild) {
-				var streamName = _streamNames.LookupName(streamId);
-				for (int i = 0, n = indexEntries.Count; i < n; ++i) {
-					var eventType = _eventTypes.LookupName(prepares[i].EventType);
-					_bus.Publish(
-						new StorageMessage.EventCommitted(
-							commit.LogPosition,
-							new EventRecord(indexEntries[i].Version, prepares[i], streamName, eventType),
-							isTfEof && i == n - 1));
-				}
-			}
-
-			return eventNumber;
-		}
-
-		public long Commit(IList<IPrepareLogRecord<TStreamId>> commitedPrepares, bool isTfEof, bool cacheLastEventNumber) {
-			long eventNumber = EventNumber.Invalid;
-
-			if (commitedPrepares.Count == 0)
-				return eventNumber;
-
-			var lastIndexedPosition = _indexChk.Read();
-			var lastPrepare = commitedPrepares[commitedPrepares.Count - 1];
-
-			var streamId = lastPrepare.EventStreamId;
-			var indexEntries = new List<IndexKey<TStreamId>>();
-			var prepares = new List<IPrepareLogRecord<TStreamId>>();
-
-			foreach (var prepare in commitedPrepares) {
-				if (prepare.Flags.HasNoneOf(PrepareFlags.StreamDelete | PrepareFlags.Data))
-					continue;
-
-				if (!StreamIdComparer.Equals(prepare.EventStreamId, streamId)) {
-					var sb = new StringBuilder();
-					sb.Append(string.Format("ERROR: Expected stream: {0}, actual: {1}.", streamId,
-						prepare.EventStreamId));
-					sb.Append(Environment.NewLine);
-					sb.Append(Environment.NewLine);
-					sb.Append("Prepares: (" + commitedPrepares.Count + ")");
-					sb.Append(Environment.NewLine);
-					for (int i = 0; i < commitedPrepares.Count; i++) {
-						var p = commitedPrepares[i];
-						sb.Append("Stream ID: " + p.EventStreamId);
-						sb.Append(Environment.NewLine);
-						sb.Append("LogPosition: " + p.LogPosition);
-						sb.Append(Environment.NewLine);
-						sb.Append("Flags: " + p.Flags);
-						sb.Append(Environment.NewLine);
-						sb.Append("Type: " + p.EventType);
-						sb.Append(Environment.NewLine);
-						sb.Append("MetaData: " + Encoding.UTF8.GetString(p.Metadata.Span));
-						sb.Append(Environment.NewLine);
-						sb.Append("Data: " + Encoding.UTF8.GetString(p.Data.Span));
-						sb.Append(Environment.NewLine);
-					}
-
-					throw new Exception(sb.ToString());
-				}
-
-				if (prepare.LogPosition < lastIndexedPosition ||
-					(prepare.LogPosition == lastIndexedPosition && !_indexRebuild))
-					continue; // already committed
-
-				eventNumber =
-					prepare.ExpectedVersion + 1; /* for committed prepare expected version is always explicit */
-
-				if (new TFPos(prepare.LogPosition, prepare.LogPosition) >
-					new TFPos(_persistedCommitPos, _persistedPreparePos)) {
-					indexEntries.Add(new IndexKey<TStreamId>(streamId, eventNumber, prepare.LogPosition));
-					prepares.Add(prepare);
-				}
-			}
-
-			if (indexEntries.Count > 0) {
-				if (_additionalCommitChecks && cacheLastEventNumber) {
-					CheckStreamVersion(streamId, indexEntries[0].Version, null); // TODO AN: bad passing null commit
-					CheckDuplicateEvents(streamId, null, indexEntries, prepares); // TODO AN: bad passing null commit
-				}
-
-				_tableIndex.AddEntries(lastPrepare.LogPosition, indexEntries); // atomically add a whole bulk of entries
-			}
-
-			if (eventNumber != EventNumber.Invalid) {
-				if (eventNumber < 0)
-					throw new Exception(string.Format("EventNumber {0} is incorrect.", eventNumber));
-
-				if (cacheLastEventNumber) {
-					_backend.SetStreamLastEventNumber(streamId, eventNumber);
-				}
-
-				if (_systemStreams.IsMetaStream(streamId))
-					_backend.SetStreamMetadata(_systemStreams.OriginalStreamOf(streamId),
-						null); // invalidate cached metadata
-
-				if (StreamIdComparer.Equals(streamId, _systemStreams.SettingsStream))
-					_backend.SetSystemSettings(DeserializeSystemSettings(prepares[prepares.Count - 1].Data));
-			}
-
-			_streamNameIndex.Confirm(prepares, _indexRebuild, _backend);
-			_eventTypeIndex.Confirm(prepares, _indexRebuild, _backend);
-
-			var newLastIndexedPosition = Math.Max(lastPrepare.LogPosition, lastIndexedPosition);
-			if (_indexChk.Read() != lastIndexedPosition) {
-				throw new Exception(
-					"Concurrency error in ReadIndex.Commit: _lastCommitPosition was modified during Commit execution!");
-			}
-			_indexChk.Write(newLastIndexedPosition);
-			_indexChk.Flush();
-
-			if (!_indexRebuild) {
-				var streamName = _streamNames.LookupName(streamId);
-				for (int i = 0, n = indexEntries.Count; i < n; ++i) {
-					var eventType = _eventTypes.LookupName(prepares[i].EventType);
-					_bus.Publish(
-						new StorageMessage.EventCommitted(
-							prepares[i].LogPosition,
-							new EventRecord(indexEntries[i].Version, prepares[i], streamName, eventType),
-							isTfEof && i == n - 1));
-				}
-
-				_tracker.OnIndexed(prepares);
-			}
-
-			return eventNumber;
-		}
-
-		private IEnumerable<IPrepareLogRecord<TStreamId>> GetTransactionPrepares(long transactionPos, long commitPos) {
-			using (var reader = _backend.BorrowReader()) {
-				reader.Reposition(transactionPos);
-
-				// in case all prepares were scavenged, we should not read past Commit LogPosition
-				SeqReadResult result;
-				while ((result = reader.TryReadNext()).Success && result.RecordPrePosition <= commitPos) {
-					if (result.LogRecord.RecordType != LogRecordType.Prepare)
-						continue;
-
-					var prepare = (IPrepareLogRecord<TStreamId>)result.LogRecord;
-					if (prepare.TransactionPosition == transactionPos) {
-						yield return prepare;
-						if (prepare.Flags.HasAnyOf(PrepareFlags.TransactionEnd))
-							yield break;
-					}
-				}
-			}
-		}
-
-		private void CheckStreamVersion(TStreamId streamId, long newEventNumber, CommitLogRecord commit) {
-			if (newEventNumber == EventNumber.DeletedStream)
-				return;
-
-			long lastEventNumber = _indexReader.GetStreamLastEventNumber(streamId);
-			if (newEventNumber != lastEventNumber + 1) {
-				if (Debugger.IsAttached)
-					Debugger.Break();
-				else
-					throw new Exception(
-						string.Format(
-							"Commit invariant violation: new event number {0} does not correspond to current stream version {1}.\n"
-							+ "Stream ID: {2}.\nCommit: {3}.", newEventNumber, lastEventNumber, streamId, commit));
-			}
-		}
-
-		private void CheckDuplicateEvents(TStreamId streamId, CommitLogRecord commit, IList<IndexKey<TStreamId>> indexEntries,
-			IList<IPrepareLogRecord<TStreamId>> prepares) {
-			using (var reader = _backend.BorrowReader()) {
-				var entries = _tableIndex.GetRange(streamId, indexEntries[0].Version,
-					indexEntries[indexEntries.Count - 1].Version);
-				foreach (var indexEntry in entries) {
-					int prepareIndex = (int)(indexEntry.Version - indexEntries[0].Version);
-					var prepare = prepares[prepareIndex];
-					IPrepareLogRecord<TStreamId> indexedPrepare = GetPrepare(reader, indexEntry.Position);
-					if (indexedPrepare != null && StreamIdComparer.Equals(indexedPrepare.EventStreamId, prepare.EventStreamId)) {
-						if (Debugger.IsAttached)
-							Debugger.Break();
-						else
-							throw new Exception(
-								string.Format("Trying to add duplicate event #{0} to stream {1} \nCommit: {2}\n"
-											  + "Prepare: {3}\nIndexed prepare: {4}.",
-									indexEntry.Version, prepare.EventStreamId, commit, prepare, indexedPrepare));
-					}
-				}
-			}
-		}
-
-		private SystemSettings GetSystemSettings() {
-			var res = _indexReader.ReadEvent(IndexReader.UnspecifiedStreamName, _systemStreams.SettingsStream, -1);
-			return res.Result == ReadEventResult.Success ? DeserializeSystemSettings(res.Record.Data) : null;
-		}
-
-		private static SystemSettings DeserializeSystemSettings(ReadOnlyMemory<byte> settingsData) {
-			try {
-				return SystemSettings.FromJsonBytes(settingsData);
-			} catch (Exception exc) {
-				Log.Error(exc, "Error deserializing SystemSettings record.");
-			}
-
-			return null;
-		}
-
-		private static IPrepareLogRecord<TStreamId> GetPrepare(TFReaderLease reader, long logPosition) {
-			RecordReadResult result = reader.TryReadAt(logPosition, couldBeScavenged: true);
-			if (!result.Success)
-				return null;
-			if (result.LogRecord.RecordType != LogRecordType.Prepare)
-				throw new Exception(string.Format("Incorrect type of log record {0}, expected Prepare record.",
-					result.LogRecord.RecordType));
-			return (IPrepareLogRecord<TStreamId>)result.LogRecord;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/IndexReadAllResult.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/IndexReadAllResult.cs
deleted file mode 100644
index 9416079c684..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/IndexReadAllResult.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public struct IndexReadAllResult {
-		public readonly List<CommitEventRecord> Records;
-		public readonly TFPos CurrentPos;
-		public readonly TFPos NextPos;
-		public readonly TFPos PrevPos;
-		public readonly bool IsEndOfStream;
-		public readonly long ConsideredEventsCount;
-
-		public IndexReadAllResult(List<CommitEventRecord> records, TFPos currentPos, TFPos nextPos, TFPos prevPos,
-			bool isEndOfStream, long consideredEventsCount) {
-			Ensure.NotNull(records, "records");
-
-			Records = records;
-			CurrentPos = currentPos;
-			NextPos = nextPos;
-			PrevPos = prevPos;
-			IsEndOfStream = isEndOfStream;
-			ConsideredEventsCount = consideredEventsCount;
-		}
-
-		public override string ToString() {
-			return string.Format("CurrentPos: {0}, NextPos: {1}, PrevPos: {2}, IsEndOfStream: {3}, Records: {4}",
-				CurrentPos, NextPos, PrevPos, string.Join("\n", IsEndOfStream, Records.Select(x => x.ToString())));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/IndexReadEventInfoResult.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/IndexReadEventInfoResult.cs
deleted file mode 100644
index b47e0879e5f..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/IndexReadEventInfoResult.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using EventStore.Core.Data;
-
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public struct IndexReadEventInfoResult {
-		public EventInfo[] EventInfos { get; }
-		public long NextEventNumber { get; }
-		public bool IsEndOfStream => NextEventNumber < 0;
-
-		public IndexReadEventInfoResult(EventInfo[] eventInfos, long nextEventNumber) {
-			EventInfos = eventInfos;
-			NextEventNumber = nextEventNumber;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/IndexReadEventResult.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/IndexReadEventResult.cs
deleted file mode 100644
index 94a39a3fd0d..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/IndexReadEventResult.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public struct IndexReadEventResult {
-		public readonly ReadEventResult Result;
-		public readonly EventRecord Record;
-		public readonly StreamMetadata Metadata;
-		public readonly long LastEventNumber;
-		public readonly bool? OriginalStreamExists;
-
-		public IndexReadEventResult(ReadEventResult result, StreamMetadata metadata, long lastEventNumber,
-			bool? originalStreamExists) {
-			if (result == ReadEventResult.Success)
-				throw new ArgumentException(
-					string.Format("Wrong ReadEventResult provided for failure constructor: {0}.", result), "result");
-
-			Result = result;
-			Record = null;
-			Metadata = metadata;
-			LastEventNumber = lastEventNumber;
-			OriginalStreamExists = originalStreamExists;
-		}
-
-		public IndexReadEventResult(ReadEventResult result, EventRecord record, StreamMetadata metadata,
-			long lastEventNumber, bool? originalStreamExists) {
-			Result = result;
-			Record = record;
-			Metadata = metadata;
-			LastEventNumber = lastEventNumber;
-			OriginalStreamExists = originalStreamExists;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/IndexReadStreamResult.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/IndexReadStreamResult.cs
deleted file mode 100644
index 6331b64550b..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/IndexReadStreamResult.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public struct IndexReadStreamResult {
-		internal static readonly EventRecord[] EmptyRecords = new EventRecord[0];
-
-		public readonly long FromEventNumber;
-		public readonly int MaxCount;
-
-		public readonly ReadStreamResult Result;
-		public readonly long NextEventNumber;
-		public readonly long LastEventNumber;
-		public readonly bool IsEndOfStream;
-
-		public readonly EventRecord[] Records;
-		public readonly StreamMetadata Metadata;
-
-		/// <summary>
-		/// Failure Constructor
-		/// </summary>
-		public IndexReadStreamResult(long fromEventNumber, int maxCount, ReadStreamResult result,
-			StreamMetadata metadata, long lastEventNumber) {
-			if (result == ReadStreamResult.Success)
-				throw new ArgumentException(
-					String.Format("Wrong ReadStreamResult provided for failure constructor: {0}.", result), "result");
-
-			FromEventNumber = fromEventNumber;
-			MaxCount = maxCount;
-
-			Result = result;
-			NextEventNumber = -1;
-			LastEventNumber = lastEventNumber;
-			IsEndOfStream = true;
-			Records = EmptyRecords;
-			Metadata = metadata;
-		}
-
-		/// <summary>
-		/// Success Constructor
-		/// </summary>
-		/// <param name="fromEventNumber">
-		///     EventNumber that the read starts from. Usually as specified in the request.
-		///     Sometimes resolved (e.g. from EndOfStream to the actual lastEventNumber)
-		///     This is not returned to the client when reading forwards, only backwards.
-		/// </param>
-		/// <param name="maxCount">The maximum number of events requested</param>
-		/// <param name="records"></param>
-		/// <param name="metadata"></param>
-		/// <param name="nextEventNumber">The event number to start the next _request_</param>
-		/// <param name="lastEventNumber">The last event number of the _stream_</param>
-		/// <param name="isEndOfStream"></param>
-		public IndexReadStreamResult(
-			long fromEventNumber,
-			int maxCount,
-			EventRecord[] records,
-			StreamMetadata metadata,
-			long nextEventNumber,
-			long lastEventNumber,
-			bool isEndOfStream) {
-
-			Ensure.NotNull(records, "records");
-
-			FromEventNumber = fromEventNumber;
-			MaxCount = maxCount;
-
-			Result = ReadStreamResult.Success;
-			Records = records;
-			Metadata = metadata;
-			NextEventNumber = nextEventNumber;
-			LastEventNumber = lastEventNumber;
-			IsEndOfStream = isEndOfStream;
-		}
-
-		public override string ToString() {
-			return String.Format("FromEventNumber: {0}, Maxcount: {1}, Result: {2}, Record count: {3}, Metadata: {4}, "
-			                     + "NextEventNumber: {5}, LastEventNumber: {6}, IsEndOfStream: {7}",
-				FromEventNumber,
-				MaxCount,
-				Result,
-				Records.Length,
-				Metadata,
-				NextEventNumber,
-				LastEventNumber,
-				IsEndOfStream);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/IndexReader.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/IndexReader.cs
deleted file mode 100644
index 271434fe48c..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/IndexReader.cs
+++ /dev/null
@@ -1,1109 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Index;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Messages;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public interface IIndexReader<TStreamId> {
-		long CachedStreamInfo { get; }
-		long NotCachedStreamInfo { get; }
-		long HashCollisions { get; }
-
-		// streamId drives the read, streamName is only for populating on the result.
-		// this was less messy than safely adding the streamName to the EventRecord at some point after construction
-		IndexReadEventResult ReadEvent(string streamName, TStreamId streamId, long eventNumber);
-		IndexReadStreamResult ReadStreamEventsForward(string streamName, TStreamId streamId, long fromEventNumber, int maxCount);
-		IndexReadStreamResult ReadStreamEventsBackward(string streamName, TStreamId streamId, long fromEventNumber, int maxCount);
-		StorageMessage.EffectiveAcl GetEffectiveAcl(TStreamId streamId);
-		IndexReadEventInfoResult ReadEventInfo_KeepDuplicates(TStreamId streamId, long eventNumber);
-		IndexReadEventInfoResult ReadEventInfoForward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount, long beforePosition);
-		IndexReadEventInfoResult ReadEventInfoForward_NoCollisions(ulong stream, long fromEventNumber, int maxCount, long beforePosition);
-		IndexReadEventInfoResult ReadEventInfoBackward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount, long beforePosition);
-		IndexReadEventInfoResult ReadEventInfoBackward_NoCollisions(ulong stream, Func<ulong, TStreamId> getStreamId, long fromEventNumber, int maxCount, long beforePosition);
-
-		/// <summary>
-		/// Doesn't filter $maxAge, $maxCount, $tb(truncate before), doesn't check stream deletion, etc.
-		/// </summary>
-		IPrepareLogRecord<TStreamId> ReadPrepare(TStreamId streamId, long eventNumber);
-
-		TStreamId GetEventStreamIdByTransactionId(long transactionId);
-
-		StreamMetadata GetStreamMetadata(TStreamId streamId);
-		long GetStreamLastEventNumber(TStreamId streamId);
-		long GetStreamLastEventNumber_KnownCollisions(TStreamId streamId, long beforePosition);
-		long GetStreamLastEventNumber_NoCollisions(ulong stream, Func<ulong, TStreamId> getStreamId, long beforePosition);
-	}
-
-	public abstract class IndexReader {
-		public static string UnspecifiedStreamName { get; } = "Unspecified stream name";
-		protected static readonly ILogger Log = Serilog.Log.ForContext<IndexReader>();
-	}
-
-	public class IndexReader<TStreamId> : IndexReader, IIndexReader<TStreamId> {
-		private static EqualityComparer<TStreamId> StreamIdComparer { get; } = EqualityComparer<TStreamId>.Default;
-
-		public long CachedStreamInfo {
-			get { return Interlocked.Read(ref _cachedStreamInfo); }
-		}
-
-		public long NotCachedStreamInfo {
-			get { return Interlocked.Read(ref _notCachedStreamInfo); }
-		}
-
-		public long HashCollisions {
-			get { return Interlocked.Read(ref _hashCollisions); }
-		}
-
-		private readonly IIndexBackend<TStreamId> _backend;
-		private readonly ITableIndex<TStreamId> _tableIndex;
-		private readonly INameLookup<TStreamId> _eventTypes;
-		private readonly ISystemStreamLookup<TStreamId> _systemStreams;
-		private readonly IValidator<TStreamId> _validator;
-		private readonly IExistenceFilterReader<TStreamId> _streamExistenceFilter;
-		private readonly bool _skipIndexScanOnRead;
-		private readonly StreamMetadata _metastreamMetadata;
-
-		private long _hashCollisions;
-		private long _cachedStreamInfo;
-		private long _notCachedStreamInfo;
-		private int _hashCollisionReadLimit;
-
-		public IndexReader(
-			IIndexBackend<TStreamId> backend,
-			ITableIndex<TStreamId> tableIndex,
-			IStreamNamesProvider<TStreamId> streamNamesProvider,
-			IValidator<TStreamId> validator,
-			IExistenceFilterReader<TStreamId> streamExistenceFilter,
-			StreamMetadata metastreamMetadata,
-			int hashCollisionReadLimit, bool skipIndexScanOnRead) {
-			Ensure.NotNull(backend, "backend");
-			Ensure.NotNull(tableIndex, "tableIndex");
-			Ensure.NotNull(streamNamesProvider, nameof(streamNamesProvider));
-			Ensure.NotNull(validator, nameof(validator));
-			Ensure.NotNull(metastreamMetadata, "metastreamMetadata");
-
-			streamNamesProvider.SetReader(this);
-
-			_backend = backend;
-			_tableIndex = tableIndex;
-			_systemStreams = streamNamesProvider.SystemStreams;
-			_eventTypes = streamNamesProvider.EventTypes;
-			_validator = validator;
-			_streamExistenceFilter = streamExistenceFilter;
-			_metastreamMetadata = metastreamMetadata;
-			_hashCollisionReadLimit = hashCollisionReadLimit;
-			_skipIndexScanOnRead = skipIndexScanOnRead;
-		}
-
-		IndexReadEventResult IIndexReader<TStreamId>.ReadEvent(string streamName, TStreamId streamId, long eventNumber) {
-			Ensure.Valid(streamId, _validator);
-			if (eventNumber < -1)
-				throw new ArgumentOutOfRangeException("eventNumber");
-			using (var reader = _backend.BorrowReader()) {
-				return ReadEventInternal(reader, streamName, streamId, eventNumber);
-			}
-		}
-
-		private IndexReadEventResult ReadEventInternal(TFReaderLease reader, string streamName, TStreamId streamId, long eventNumber) {
-			var lastEventNumber = GetStreamLastEventNumberCached(reader, streamId);
-			var metadata = GetStreamMetadataCached(reader, streamId);
-			var originalStreamExists = OriginalStreamExists(reader, streamId);
-			if (lastEventNumber == EventNumber.DeletedStream)
-				return new IndexReadEventResult(ReadEventResult.StreamDeleted, metadata, lastEventNumber,
-					originalStreamExists);
-			if (lastEventNumber == ExpectedVersion.NoStream || metadata.TruncateBefore == EventNumber.DeletedStream)
-				return new IndexReadEventResult(ReadEventResult.NoStream, metadata, lastEventNumber,
-					originalStreamExists);
-			if (lastEventNumber == EventNumber.Invalid)
-				return new IndexReadEventResult(ReadEventResult.NoStream, metadata, lastEventNumber,
-					originalStreamExists);
-
-			if (eventNumber == -1)
-				eventNumber = lastEventNumber;
-
-			long minEventNumber = 0;
-			if (metadata.MaxCount.HasValue)
-				minEventNumber = Math.Max(minEventNumber, lastEventNumber - metadata.MaxCount.Value + 1);
-			if (metadata.TruncateBefore.HasValue)
-				minEventNumber = Math.Max(minEventNumber, metadata.TruncateBefore.Value);
-			//TODO(clc): confirm this logic, it seems that reads less than min should be invaild rather than found
-			if (eventNumber < minEventNumber || eventNumber > lastEventNumber)
-				return new IndexReadEventResult(ReadEventResult.NotFound, metadata, lastEventNumber,
-					originalStreamExists);
-
-			var prepare = ReadPrepareInternal(reader, streamId, eventNumber);
-			if (prepare != null) {
-				if (metadata.MaxAge.HasValue && prepare.TimeStamp < DateTime.UtcNow - metadata.MaxAge.Value)
-					return new IndexReadEventResult(ReadEventResult.NotFound, metadata, lastEventNumber,
-						originalStreamExists);
-				return new IndexReadEventResult(ReadEventResult.Success, CreateEventRecord(eventNumber, prepare, streamName),
-					metadata, lastEventNumber, originalStreamExists);
-			}
-
-			return new IndexReadEventResult(ReadEventResult.NotFound, metadata, lastEventNumber,
-				originalStreamExists: originalStreamExists);
-		}
-
-		IPrepareLogRecord<TStreamId> IIndexReader<TStreamId>.ReadPrepare(TStreamId streamId, long eventNumber) {
-			using (var reader = _backend.BorrowReader()) {
-				return ReadPrepareInternal(reader, streamId, eventNumber);
-			}
-		}
-
-		private IPrepareLogRecord<TStreamId> ReadPrepareInternal(TFReaderLease reader, TStreamId streamId, long eventNumber) {
-			// we assume that you already did check for stream deletion
-			Ensure.Valid(streamId, _validator);
-			Ensure.Nonnegative(eventNumber, "eventNumber");
-
-			return _skipIndexScanOnRead
-				? ReadPrepareSkipScan(reader, streamId, eventNumber)
-				: ReadPrepare(reader, streamId, eventNumber);
-		}
-
-		private IPrepareLogRecord<TStreamId> ReadPrepare(TFReaderLease reader, TStreamId streamId, long eventNumber) {
-			var recordsQuery = _tableIndex.GetRange(streamId, eventNumber, eventNumber)
-				.Select(x => new { x.Version, Prepare = ReadPrepareInternal(reader, x.Position) })
-				.Where(x => x.Prepare != null && StreamIdComparer.Equals(x.Prepare.EventStreamId, streamId))
-				.GroupBy(x => x.Version).Select(x => x.Last()).ToList();
-			if (recordsQuery.Count() == 1) {
-				return recordsQuery.First().Prepare;
-			}
-
-			return null;
-		}
-
-		private IPrepareLogRecord<TStreamId> ReadPrepareSkipScan(TFReaderLease reader, TStreamId streamId, long eventNumber) {
-			long position;
-			if (_tableIndex.TryGetOneValue(streamId, eventNumber, out position)) {
-				var rec = ReadPrepareInternal(reader, position);
-				if (rec != null && StreamIdComparer.Equals(rec.EventStreamId, streamId))
-					return rec;
-
-				foreach (var indexEntry in _tableIndex.GetRange(streamId, eventNumber, eventNumber)) {
-					Interlocked.Increment(ref _hashCollisions);
-					if (indexEntry.Position == position)
-						continue;
-					rec = ReadPrepareInternal(reader, indexEntry.Position);
-					if (rec != null && StreamIdComparer.Equals(rec.EventStreamId, streamId))
-						return rec;
-				}
-			}
-
-			return null;
-		}
-
-		protected static IPrepareLogRecord<TStreamId> ReadPrepareInternal(TFReaderLease reader, long logPosition) {
-			RecordReadResult result = reader.TryReadAt(logPosition, couldBeScavenged: true);
-			if (!result.Success)
-				return null;
-
-			if (result.LogRecord.RecordType != LogRecordType.Prepare &&
-				result.LogRecord.RecordType != LogRecordType.Stream &&
-				result.LogRecord.RecordType != LogRecordType.EventType)
-				throw new Exception(string.Format("Incorrect type of log record {0}, expected Prepare record.",
-					result.LogRecord.RecordType));
-			return (IPrepareLogRecord<TStreamId>)result.LogRecord;
-		}
-
-		IndexReadStreamResult IIndexReader<TStreamId>.
-			ReadStreamEventsForward(string streamName, TStreamId streamId, long fromEventNumber, int maxCount) {
-			return ReadStreamEventsForwardInternal(streamName, streamId, fromEventNumber, maxCount, _skipIndexScanOnRead);
-		}
-
-		private IndexReadStreamResult ReadStreamEventsForwardInternal(string streamName, TStreamId streamId, long fromEventNumber,
-			int maxCount, bool skipIndexScanOnRead) {
-			Ensure.Valid(streamId, _validator);
-			Ensure.Nonnegative(fromEventNumber, "fromEventNumber");
-			Ensure.Positive(maxCount, "maxCount");
-
-			using (var reader = _backend.BorrowReader()) {
-				var lastEventNumber = GetStreamLastEventNumberCached(reader, streamId);
-				var metadata = GetStreamMetadataCached(reader, streamId);
-				if (lastEventNumber == EventNumber.DeletedStream)
-					return new IndexReadStreamResult(fromEventNumber, maxCount, ReadStreamResult.StreamDeleted,
-						StreamMetadata.Empty, lastEventNumber);
-				if (lastEventNumber == ExpectedVersion.NoStream || metadata.TruncateBefore == EventNumber.DeletedStream)
-					return new IndexReadStreamResult(fromEventNumber, maxCount, ReadStreamResult.NoStream, metadata,
-						lastEventNumber);
-				if (lastEventNumber == EventNumber.Invalid)
-					return new IndexReadStreamResult(fromEventNumber, maxCount, ReadStreamResult.NoStream, metadata,
-						lastEventNumber);
-
-				long startEventNumber = fromEventNumber;
-				long endEventNumber = fromEventNumber < long.MaxValue - maxCount + 1 ?
-					fromEventNumber + maxCount - 1 : long.MaxValue;
-
-				// calculate minEventNumber, which is the lower bound that we are allowed to read
-				// according to the MaxCount and TruncateBefore
-				long minEventNumber = 0;
-				if (metadata.MaxCount.HasValue)
-					minEventNumber = Math.Max(minEventNumber, lastEventNumber - metadata.MaxCount.Value + 1);
-				if (metadata.TruncateBefore.HasValue)
-					minEventNumber = Math.Max(minEventNumber, metadata.TruncateBefore.Value);
-
-				// early return if we are trying to read events that are all below the lower bound
-				if (endEventNumber < minEventNumber)
-					return new IndexReadStreamResult(fromEventNumber, maxCount, IndexReadStreamResult.EmptyRecords,
-						metadata, minEventNumber, lastEventNumber, isEndOfStream: false);
-
-				// start our read at the lower bound if we were going to start it before hand.
-				startEventNumber = Math.Max(startEventNumber, minEventNumber);
-
-				// early return if we are trying to read events that are all above the upper bound
-				if (startEventNumber > lastEventNumber)
-					return new IndexReadStreamResult(
-						fromEventNumber: fromEventNumber,
-						maxCount: maxCount,
-						records: IndexReadStreamResult.EmptyRecords,
-						metadata: metadata,
-						nextEventNumber: lastEventNumber + 1,
-						lastEventNumber: lastEventNumber,
-						isEndOfStream: true);
-
-				if (metadata.MaxAge.HasValue) {
-					return ForStreamWithMaxAge(streamId, streamName,
-						fromEventNumber, maxCount,
-						startEventNumber, endEventNumber, lastEventNumber,
-						metadata.MaxAge.Value, metadata, _tableIndex, reader, _eventTypes,
-						skipIndexScanOnRead);
-				}
-				var recordsQuery = _tableIndex.GetRange(streamId, startEventNumber, endEventNumber)
-					.Select(x => new { x.Version, Prepare = ReadPrepareInternal(reader, x.Position) })
-					.Where(x => x.Prepare != null && StreamIdComparer.Equals(x.Prepare.EventStreamId, streamId));
-				if (!skipIndexScanOnRead) {
-					recordsQuery = recordsQuery.OrderByDescending(x => x.Version)
-						.GroupBy(x => x.Version).Select(x => x.Last());
-				}
-				
-				var records = recordsQuery.Reverse().Select(x => CreateEventRecord(x.Version, x.Prepare, streamName)).ToArray();
-
-				long nextEventNumber = Math.Min(endEventNumber + 1, lastEventNumber + 1);
-				if (records.Length > 0)
-					nextEventNumber = records[records.Length - 1].EventNumber + 1;
-				var isEndOfStream = endEventNumber >= lastEventNumber;
-				return new IndexReadStreamResult(fromEventNumber, maxCount, records, metadata,
-					nextEventNumber, lastEventNumber, isEndOfStream);
-			}
-
-			IndexReadStreamResult ForStreamWithMaxAge(TStreamId streamId,
-				string streamName,
-				long fromEventNumber, int maxCount, long startEventNumber,
-				long endEventNumber, long lastEventNumber, TimeSpan maxAge, StreamMetadata metadata,
-				ITableIndex<TStreamId> tableIndex, TFReaderLease reader, INameLookup< TStreamId> eventTypes,
-				bool skipIndexScanOnRead) {
-
-				if (startEventNumber > lastEventNumber) {
-					return new IndexReadStreamResult(fromEventNumber, maxCount, IndexReadStreamResult.EmptyRecords,
-						metadata, lastEventNumber + 1, lastEventNumber, isEndOfStream: true);
-				}
-
-				var ageThreshold = DateTime.UtcNow - maxAge;
-				var nextEventNumber = lastEventNumber;
-				var indexEntries = tableIndex.GetRange(streamId, startEventNumber, endEventNumber);
-
-				//Move to the first valid entries. At this point we could instead return an empty result set with the minimum set, but that would 
-				//involve an additional set of reads for no good reason
-				while (indexEntries.Count == 0) {
-					// we didn't find any indexEntries, and we already early returned in the case that startEventNumber > lastEventNumber
-					// so we want to find the oldest entry that is after startEventNumber.
-					// startEventNumber may be before the start of the stream, or it may be in a gap caused by scavenging.
-					// this will generally only iterate once, unless a scavenge completes exactly now, in which case it might iterate twice
-					if (tableIndex.TryGetNextEntry(streamId, startEventNumber, out var next)) {
-						startEventNumber = next.Version;
-						endEventNumber = startEventNumber + maxCount - 1;
-						indexEntries = tableIndex.GetRange(streamId, startEventNumber, endEventNumber);
-					} else {
-						//scavenge completed and deleted our stream? return empty set and get the client to try again?
-						return new IndexReadStreamResult(fromEventNumber, maxCount, IndexReadStreamResult.EmptyRecords,
-							metadata, lastEventNumber + 1, lastEventNumber, isEndOfStream: false);
-					}
-				}
-
-				var results = new ResultsDeduplicator(maxCount, skipIndexScanOnRead);
-
-				for (int i = 0; i < indexEntries.Count; i++) {
-					var prepare = ReadPrepareInternal(reader, indexEntries[i].Position);
-
-					if (prepare == null || !StreamIdComparer.Equals(prepare.EventStreamId, streamId)) {
-						continue;
-					}
-
-					if (prepare?.TimeStamp >= ageThreshold) {
-						results.Add(CreateEventRecord(indexEntries[i].Version, prepare, streamName, eventTypes));
-					} else {
-						break;
-					}
-				}
-
-				if (results.Count > 0) {
-					//We got at least one event in the correct age range, so we will return whatever was valid and indicate where to read from next
-					var resultsArray = results.ProduceArray();
-					nextEventNumber = resultsArray[0].EventNumber + 1;
-					Array.Reverse(resultsArray);
-
-					var isEndOfStream = endEventNumber >= lastEventNumber;
-					return new IndexReadStreamResult(fromEventNumber, maxCount, resultsArray, metadata,
-						nextEventNumber, lastEventNumber, isEndOfStream);
-				}
-
-				//we didn't find anything valid yet, now we need to search
-				//the entries we found were all either scavenged, or expired, or for another stream.
-
-				//check high value will be valid, otherwise early return.
-				// this resolves hash collisions itself
-				var lastEvent = ReadPrepareInternal(reader, streamId, eventNumber: lastEventNumber);
-				if (lastEvent == null || lastEvent.TimeStamp < ageThreshold || lastEventNumber < fromEventNumber) {
-					//No events in the stream are < max age, so return an empty set
-					return new IndexReadStreamResult(fromEventNumber, maxCount, IndexReadStreamResult.EmptyRecords,
-						metadata, lastEventNumber + 1, lastEventNumber, isEndOfStream: true);
-				}
-
-				// intuition for loop termination here is that the explicit continue cases are
-				// the only way to continue the iteration. apart from those it return;s or break;s.
-				// the continue cases always narrow the gap between low and high
-				//
-				// low, mid, and high are event numbers (versions)
-				// attempt to initialize low to the latest (highest) entry that we found but in the unlikely event that
-				// they're out of version order thats still ok, low will just be lower than it could have been.
-				var low = indexEntries[0].Version;
-				var high = lastEventNumber;
-				while (low <= high) {
-					var mid = low + ((high - low) / 2);
-					indexEntries = tableIndex.GetRange(streamId, mid, mid + maxCount - 1);
-					if (indexEntries.Count > 0) {
-						nextEventNumber = indexEntries[0].Version + 1;
-					} else {
-						// midpoint is in a gap. everything before any gap is no longer part of the stream
-						// though the entries may not have been removed yet. skip to higher event numbers
-						if (!tableIndex.TryGetNextEntry(streamId, mid, out var next)) {
-							// there is nothing in this stream (maybe a scavenge just completed)
-							nextEventNumber = lastEventNumber;
-							break;
-						}
-						low = next.Version;
-						continue;
-					}
-
-					// be really careful if adjusting these, to make sure that the loop still terminates
-					var (lowPrepareVersion, lowPrepare) = LowPrepare(reader, indexEntries, streamId);
-					if (lowPrepare?.TimeStamp >= ageThreshold) {
-						// found a lowPrepare for this stream. it has not expired. chop lower in case there are more
-						high = mid - 1;
-						nextEventNumber = lowPrepareVersion;
-						continue;
-					}
-
-					var (highPrepareVersion, highPrepare) = HighPrepare(reader, indexEntries, streamId);
-					if (highPrepare?.TimeStamp < ageThreshold) {
-						// found a highPrepare for this stream. it has expired. chop higher
-						low = highPrepareVersion + 1;
-						continue;
-					}
-
-					//ok, some entries must match, if not (due to time moving forwards) we can just reissue based on the current mid
-					// also might have no matches because the getrange call returned addresses that
-					// were all scavenged or for other streams, in which case we won't add anything to results here
-					for (int i = 0; i < indexEntries.Count; i++) {
-						var prepare = ReadPrepareInternal(reader, indexEntries[i].Position);
-
-						if (prepare == null || !StreamIdComparer.Equals(prepare.EventStreamId, streamId))
-							continue;
-
-						if (prepare?.TimeStamp >= ageThreshold) {
-							results.Add(CreateEventRecord(indexEntries[i].Version, prepare, streamName, eventTypes));
-						} else {
-							break;
-						}
-					}
-
-					if (results.Count > 0) {
-						//We got at least one event in the correct age range, so we will return whatever was valid and indicate where to read from next
-						var resultsList = results.ProduceList();
-						endEventNumber = resultsList[0].EventNumber;
-						nextEventNumber = endEventNumber + 1;
-						resultsList.Reverse();
-						var isEndOfStream = endEventNumber >= lastEventNumber;
-
-						var maxEventNumberToReturn = fromEventNumber + maxCount - 1;
-						while (resultsList.Count > 0 && resultsList[^1].EventNumber > maxEventNumberToReturn) {
-							nextEventNumber = resultsList[^1].EventNumber;
-							resultsList.RemoveAt(resultsList.Count - 1);
-							isEndOfStream = false;
-						}
-
-						return new IndexReadStreamResult(fromEventNumber, maxCount, resultsList.ToArray(), metadata,
-							nextEventNumber, lastEventNumber, isEndOfStream);
-					}
-
-					break;
-				}
-
-				//We didn't find anything, send back to the client with the latest position to retry
-				return new IndexReadStreamResult(fromEventNumber, maxCount, IndexReadStreamResult.EmptyRecords,
-					metadata, nextEventNumber, lastEventNumber, isEndOfStream: false);
-
-				[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-				static (long, IPrepareLogRecord<TStreamId>) LowPrepare(
-					TFReaderLease tfReaderLease,
-					IReadOnlyList<IndexEntry> entries,
-					TStreamId streamId) {
-
-					for (int i = entries.Count - 1; i >= 0; i--) {
-						var prepare = ReadPrepareInternal(tfReaderLease, entries[i].Position);
-						if (prepare != null && StreamIdComparer.Equals(prepare.EventStreamId, streamId))
-							return (entries[i].Version, prepare);
-					}
-
-					return (default, null);
-				}
-
-				[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-				static (long, IPrepareLogRecord<TStreamId>) HighPrepare(
-					TFReaderLease tfReaderLease,
-					IReadOnlyList<IndexEntry> entries,
-					TStreamId streamId) {
-
-					for (int i = 0; i < entries.Count; i++) {
-						var prepare = ReadPrepareInternal(tfReaderLease, entries[i].Position);
-						if (prepare != null && StreamIdComparer.Equals(prepare.EventStreamId, streamId))
-							return (entries[i].Version, prepare);
-					}
-
-					return (default, null);
-				}
-			}
-		}
-
-		delegate IEnumerable<IndexEntry> ReadIndexEntries<TStreamHandle>(
-			IndexReader<TStreamId> indexReader,
-			TStreamHandle streamHandle,
-			TFReaderLease reader,
-			long startEventNumber,
-			long endEventNumber);
-
-		private static ReadIndexEntries<TStreamId> ReadIndexEntries_RemoveCollisions =
-			(indexReader, streamHandle, reader, startEventNumber, endEventNumber) => 
-				indexReader._tableIndex.GetRange(streamHandle, startEventNumber, endEventNumber)
-					.Select(x => new { IndexEntry = x, Prepare = ReadPrepareInternal(reader, x.Position) })
-					.Where(x => x.Prepare != null && StreamIdComparer.Equals(x.Prepare.EventStreamId, streamHandle))
-					.Select(x => x.IndexEntry);
-
-		private static ReadIndexEntries<ulong> ReadIndexEntries_NoCollisions =
-			(indexReader, streamHandle, reader, startEventNumber, endEventNumber) => 
-				indexReader._tableIndex.GetRange(streamHandle, startEventNumber, endEventNumber);
-
-		public IndexReadEventInfoResult ReadEventInfo_KeepDuplicates(TStreamId streamId, long eventNumber) {
-			using (var reader = _backend.BorrowReader()) {
-				var result = ReadEventInfoForwardInternal(
-					streamId,
-					reader,
-					ReadIndexEntries_RemoveCollisions,
-					// the next event number doesn't matter in this context since we're reading a single event without a specific direction
-					getNextEventNumber: static (_, _, _) => -1,
-					fromEventNumber: eventNumber,
-					maxCount: 1,
-					beforePosition: long.MaxValue,
-					deduplicate: false);
-
-				// ensure that the next event number is set to -1
-				return new IndexReadEventInfoResult(result.EventInfos, nextEventNumber: -1);
-			}
-		}
-
-		// note for simplicity skipIndexScanOnRead is always treated as false. see ReadEventInfoInternal
-		public IndexReadEventInfoResult ReadEventInfoForward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount, long beforePosition) {
-			using (var reader = _backend.BorrowReader()) {
-				return ReadEventInfoForwardInternal(
-					streamId,
-					reader,
-					ReadIndexEntries_RemoveCollisions,
-					static (self, streamHandle, afterEventNumber) => {
-						if (!self._tableIndex.TryGetNextEntry(streamHandle, afterEventNumber, out var entry))
-							return -1;
-
-						// Note that this event number may be for a colliding stream. It is not a major issue since these
-						// colliding events will be filtered out during the next read. However, it may cause some extra empty reads.
-						return entry.Version;
-					},
-					fromEventNumber,
-					maxCount,
-					beforePosition,
-					deduplicate: true);
-			}
-		}
-
-		// note for simplicity skipIndexScanOnRead is always treated as false. see ReadEventInfoInternal
-		public IndexReadEventInfoResult ReadEventInfoForward_NoCollisions(ulong stream, long fromEventNumber, int maxCount, long beforePosition) {
-			return ReadEventInfoForwardInternal(
-				stream,
-				default,
-				ReadIndexEntries_NoCollisions,
-				static (self, streamHandle, afterEventNumber) => {
-					if (!self._tableIndex.TryGetNextEntry(streamHandle, afterEventNumber, out var entry))
-						return -1;
-
-					return entry.Version;
-				},
-				fromEventNumber,
-				maxCount,
-				beforePosition,
-				deduplicate: true);
-		}
-
-		private IndexReadEventInfoResult ReadEventInfoForwardInternal<TStreamHandle>(
-			TStreamHandle streamHandle,
-			TFReaderLease reader,
-			ReadIndexEntries<TStreamHandle> readIndexEntries,
-			Func<IndexReader<TStreamId>, TStreamHandle, long, long> getNextEventNumber,
-			long fromEventNumber,
-			int maxCount,
-			long beforePosition,
-			bool deduplicate) {
-
-			Ensure.Nonnegative(fromEventNumber, nameof(fromEventNumber));
-			Ensure.Positive(maxCount, nameof(maxCount));
-
-			var startEventNumber = fromEventNumber;
-			var endEventNumber = fromEventNumber > long.MaxValue - maxCount + 1 ?
-				long.MaxValue : fromEventNumber + maxCount - 1;
-
-			var eventInfos = ReadEventInfoInternal(streamHandle, reader, readIndexEntries, startEventNumber,
-				endEventNumber, beforePosition, deduplicate);
-			Array.Reverse(eventInfos);
-
-			long nextEventNumber;
-			if (endEventNumber >= long.MaxValue)
-				nextEventNumber = -1;
-			else if (eventInfos.Length == 0)
-				nextEventNumber = getNextEventNumber(this, streamHandle, endEventNumber);
-			else
-				nextEventNumber = endEventNumber + 1;
-
-			return new IndexReadEventInfoResult(eventInfos, nextEventNumber);
-		}
-
-		IndexReadStreamResult IIndexReader<TStreamId>.
-			ReadStreamEventsBackward(string streamName, TStreamId streamId, long fromEventNumber, int maxCount) {
-			return ReadStreamEventsBackwardInternal(streamName, streamId, fromEventNumber, maxCount, _skipIndexScanOnRead);
-		}
-
-		private IndexReadStreamResult ReadStreamEventsBackwardInternal(string streamName, TStreamId streamId, long fromEventNumber,
-			int maxCount, bool skipIndexScanOnRead) {
-			Ensure.Valid(streamId, _validator);
-			Ensure.Positive(maxCount, "maxCount");
-
-			using (var reader = _backend.BorrowReader()) {
-				var lastEventNumber = GetStreamLastEventNumberCached(reader, streamId);
-				var metadata = GetStreamMetadataCached(reader, streamId);
-				if (lastEventNumber == EventNumber.DeletedStream)
-					return new IndexReadStreamResult(fromEventNumber, maxCount, ReadStreamResult.StreamDeleted,
-						StreamMetadata.Empty, lastEventNumber);
-				if (lastEventNumber == ExpectedVersion.NoStream || metadata.TruncateBefore == EventNumber.DeletedStream)
-					return new IndexReadStreamResult(fromEventNumber, maxCount, ReadStreamResult.NoStream, metadata,
-						lastEventNumber);
-				if (lastEventNumber == EventNumber.Invalid)
-					return new IndexReadStreamResult(fromEventNumber, maxCount, ReadStreamResult.NoStream, metadata,
-						lastEventNumber);
-
-				long endEventNumber = fromEventNumber < 0 ? lastEventNumber : fromEventNumber;
-				long startEventNumber = Math.Max(0L, endEventNumber - maxCount + 1);
-				bool isEndOfStream = false;
-
-				long minEventNumber = 0;
-				if (metadata.MaxCount.HasValue)
-					minEventNumber = Math.Max(minEventNumber, lastEventNumber - metadata.MaxCount.Value + 1);
-				if (metadata.TruncateBefore.HasValue)
-					minEventNumber = Math.Max(minEventNumber, metadata.TruncateBefore.Value);
-				if (endEventNumber < minEventNumber)
-					return new IndexReadStreamResult(fromEventNumber, maxCount, IndexReadStreamResult.EmptyRecords,
-						metadata, -1, lastEventNumber, isEndOfStream: true);
-
-				if (startEventNumber <= minEventNumber) {
-					isEndOfStream = true;
-					startEventNumber = minEventNumber;
-				}
-
-				var recordsQuery = _tableIndex.GetRange(streamId, startEventNumber, endEventNumber)
-					.Select(x => new { x.Version, Prepare = ReadPrepareInternal(reader, x.Position) })
-					.Where(x => x.Prepare != null && StreamIdComparer.Equals(x.Prepare.EventStreamId, streamId));
-				if (!skipIndexScanOnRead) {
-					recordsQuery = recordsQuery.OrderByDescending(x => x.Version)
-						.GroupBy(x => x.Version).Select(x => x.Last());
-					;
-				}
-
-				if (metadata.MaxAge.HasValue) {
-					var ageThreshold = DateTime.UtcNow - metadata.MaxAge.Value;
-					recordsQuery = recordsQuery.Where(x => x.Prepare.TimeStamp >= ageThreshold);
-				}
-
-				var records = recordsQuery.Select(x => CreateEventRecord(x.Version, x.Prepare, streamName)).ToArray();
-
-				isEndOfStream = isEndOfStream
-								|| startEventNumber == 0
-								|| (startEventNumber <= lastEventNumber
-									&& (records.Length == 0 ||
-										records[records.Length - 1].EventNumber != startEventNumber));
-				long nextEventNumber = isEndOfStream ? -1 : Math.Min(startEventNumber - 1, lastEventNumber);
-				return new IndexReadStreamResult(endEventNumber, maxCount, records, metadata,
-					nextEventNumber, lastEventNumber, isEndOfStream);
-			}
-		}
-
-		public IndexReadEventInfoResult ReadEventInfoBackward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount,
-			long beforePosition) {
-			if (fromEventNumber < 0)
-				fromEventNumber = GetStreamLastEventNumber_KnownCollisions(streamId, beforePosition);
-
-			if (fromEventNumber == ExpectedVersion.NoStream)
-				return new IndexReadEventInfoResult(new EventInfo[] { }, -1);
-
-			using (var reader = _backend.BorrowReader()) {
-				return ReadEventInfoBackwardInternal(
-					streamId,
-					reader,
-					ReadIndexEntries_RemoveCollisions,
-					static (self, streamHandle, beforeEventNumber) => {
-						if (!self._tableIndex.TryGetPreviousEntry(streamHandle, beforeEventNumber, out var entry))
-							return -1;
-
-						// Note that this event number may be for a colliding stream. It is not a major issue since these
-						// colliding events will be filtered out during the next read. However, it may cause some extra empty reads.
-						return entry.Version;
-					},
-					fromEventNumber,
-					maxCount,
-					beforePosition,
-					deduplicate: true);
-			}
-		}
-
-		public IndexReadEventInfoResult ReadEventInfoBackward_NoCollisions(
-			ulong stream,
-			Func<ulong, TStreamId> getStreamId,
-			long fromEventNumber,
-			int maxCount,
-			long beforePosition) {
-
-			if (fromEventNumber < 0)
-				fromEventNumber = GetStreamLastEventNumber_NoCollisions(stream, getStreamId, beforePosition);
-
-			if (fromEventNumber == ExpectedVersion.NoStream)
-				return new IndexReadEventInfoResult(new EventInfo[] { }, -1);
-
-			return ReadEventInfoBackwardInternal(
-				stream,
-				default,
-				ReadIndexEntries_NoCollisions,
-				static (self, streamHandle, beforeEventNumber) => {
-					if (!self._tableIndex.TryGetPreviousEntry(streamHandle, beforeEventNumber, out var entry))
-						return -1;
-					return entry.Version;
-				},
-				fromEventNumber,
-				maxCount,
-				beforePosition,
-				deduplicate: true);
-		}
-
-		private IndexReadEventInfoResult ReadEventInfoBackwardInternal<TStreamHandle>(
-			TStreamHandle streamHandle,
-			TFReaderLease reader,
-			ReadIndexEntries<TStreamHandle> readIndexEntries,
-			Func<IndexReader<TStreamId>, TStreamHandle, long, long> getNextEventNumber,
-			long fromEventNumber,
-			int maxCount,
-			long beforePosition,
-			bool deduplicate) {
-
-			Ensure.Nonnegative(fromEventNumber, nameof(fromEventNumber));
-			Ensure.Positive(maxCount, nameof(maxCount));
-
-			var startEventNumber = Math.Max(0L, fromEventNumber - maxCount + 1);
-			var endEventNumber = fromEventNumber;
-
-			var eventInfos = ReadEventInfoInternal(streamHandle, reader, readIndexEntries, startEventNumber,
-				endEventNumber, beforePosition, deduplicate);
-
-			long nextEventNumber;
-			if (startEventNumber <= 0)
-				nextEventNumber = -1;
-			else if (eventInfos.Length == 0)
-				nextEventNumber = getNextEventNumber(this, streamHandle, startEventNumber);
-			else
-				nextEventNumber = startEventNumber - 1;
-
-			return new IndexReadEventInfoResult(eventInfos, nextEventNumber);
-		}
-
-		// used forward and backward
-		// resulting array is in descending order
-		private EventInfo[] ReadEventInfoInternal<TStreamHandle>(
-			TStreamHandle streamHandle,
-			TFReaderLease reader,
-			ReadIndexEntries<TStreamHandle> readIndexEntries,
-			long startEventNumber,
-			long endEventNumber,
-			long beforePosition,
-			bool deduplicate) {
-
-			var entries = readIndexEntries(this, streamHandle, reader, startEventNumber, endEventNumber);
-			var eventInfos = new List<EventInfo>();
-
-			var prevEntry = new IndexEntry(long.MaxValue, long.MaxValue, long.MaxValue);
-
-			// entries are from TableIndex.GetRange. They are in IndexEntry order descending.
-			// we need to return EventInfos in EventNumber order descending. As we go we check if this
-			// criteria is already met, and avoid the sorting and deduplicating linq query if it is.
-			var sortAndDeduplicate = false;
-			foreach (var entry in entries) {
-				if (entry.Position >= beforePosition)
-					continue;
-
-				if (prevEntry.Version <= entry.Version)
-					sortAndDeduplicate = true;
-
-				eventInfos.Add(new EventInfo(entry.Position, entry.Version));
-				prevEntry = entry;
-			}
-
-			EventInfo[] result;
-			if (sortAndDeduplicate) {
-				if (deduplicate) {
-					// note that even if _skipIndexScanOnRead = True, we're still reordering and filtering out duplicates here.
-					result = eventInfos
-						.OrderByDescending(x => x.EventNumber)
-						.GroupBy(x => x.EventNumber)
-						// keep the earliest event in the log (the index entries that were read are in descending order)
-						.Select(x => x.Last())
-						.ToArray();
-				} else {
-					result = eventInfos
-						.OrderByDescending(x => x.EventNumber)
-						.ToArray();
-				}
-
-			} else {
-				result = eventInfos.ToArray();
-			}
-
-			return result;
-		}
-
-		public TStreamId GetEventStreamIdByTransactionId(long transactionId) {
-			Ensure.Nonnegative(transactionId, "transactionId");
-			using (var reader = _backend.BorrowReader()) {
-				var res = ReadPrepareInternal(reader, transactionId);
-				return res == null ? default : res.EventStreamId;
-			}
-		}
-
-		public StorageMessage.EffectiveAcl GetEffectiveAcl(TStreamId streamId) {
-			using (var reader = _backend.BorrowReader()) {
-				var sysSettings = _backend.GetSystemSettings() ?? SystemSettings.Default;
-				StreamAcl acl;
-				StreamAcl sysAcl;
-				StreamAcl defAcl;
-				var meta = GetStreamMetadataCached(reader, streamId);
-				if (_systemStreams.IsSystemStream(streamId)) {
-					defAcl = SystemSettings.Default.SystemStreamAcl;
-					sysAcl = sysSettings.SystemStreamAcl ?? defAcl;
-					acl = meta.Acl ?? sysAcl;
-				} else {
-					defAcl = SystemSettings.Default.UserStreamAcl;
-					sysAcl = sysSettings.UserStreamAcl ?? defAcl;
-					acl = meta.Acl ?? sysAcl;
-				}
-				return new StorageMessage.EffectiveAcl(acl, sysAcl, defAcl);
-			}
-		}
-
-		long IIndexReader<TStreamId>.GetStreamLastEventNumber(TStreamId streamId) {
-			Ensure.Valid(streamId, _validator);
-			using (var reader = _backend.BorrowReader()) {
-				return GetStreamLastEventNumberCached(reader, streamId);
-			}
-		}
-
-		public long GetStreamLastEventNumber_KnownCollisions(TStreamId streamId, long beforePosition) {
-			Ensure.Valid(streamId, _validator);
-			using (var reader = _backend.BorrowReader()) {
-				return GetStreamLastEventNumber_KnownCollisions(streamId, beforePosition, reader);
-			}
-		}
-
-		private long GetStreamLastEventNumber_KnownCollisions(TStreamId streamId, long beforePosition, TFReaderLease reader) {
-			bool IsForThisStream(IndexEntry indexEntry) {
-				// we know that collisions have occurred for this stream's hash prior to "beforePosition" in the log
-				// we just fetch the stream name from the log to make sure this index entry is for the correct stream
-				var prepare = ReadPrepareInternal(reader, indexEntry.Position);
-				return StreamIdComparer.Equals(prepare.EventStreamId, streamId);
-			}
-
-			if (!_tableIndex.TryGetLatestEntry(streamId, beforePosition, IsForThisStream, out var entry))
-				return ExpectedVersion.NoStream;
-
-			return entry.Version;
-		}
-
-		// gets the last event number before beforePosition for the given stream hash. can assume that
-		// the hash does not collide with anything before beforePosition.
-		public long GetStreamLastEventNumber_NoCollisions(ulong stream, Func<ulong, TStreamId> getStreamId, long beforePosition) {
-			using (var reader = _backend.BorrowReader()) {
-				return GetStreamLastEventNumber_NoCollisions(stream, getStreamId, beforePosition, reader);
-			}
-		}
-
-		private long GetStreamLastEventNumber_NoCollisions(
-			ulong stream,
-			Func<ulong, TStreamId> getStreamId,
-			long beforePosition,
-			TFReaderLease reader) {
-
-			TStreamId streamId = default;
-
-			bool IsForThisStream(IndexEntry indexEntry) {
-				// we know that there are no collisions for this hash prior to "beforePosition" in the log
-				if (indexEntry.Position < beforePosition)
-					return true;
-
-				// fetch the correct stream name from the log if we haven't yet
-				if (StreamIdComparer.Equals(streamId, default))
-					streamId = getStreamId(stream);
-
-				// compare the correct stream name against this index entry's stream name fetched from the log
-				var prepare = ReadPrepareInternal(reader, indexEntry.Position);
-				return StreamIdComparer.Equals(prepare.EventStreamId, streamId);
-			}
-
-			if (!_tableIndex.TryGetLatestEntry(stream, beforePosition, IsForThisStream, out var entry))
-				return ExpectedVersion.NoStream;
-
-			return entry.Version;
-		}
-
-		StreamMetadata IIndexReader<TStreamId>.GetStreamMetadata(TStreamId streamId) {
-			Ensure.Valid(streamId, _validator);
-			using (var reader = _backend.BorrowReader()) {
-				return GetStreamMetadataCached(reader, streamId);
-			}
-		}
-
-		private long GetStreamLastEventNumberCached(TFReaderLease reader, TStreamId streamId) {
-			// if this is metastream -- check if original stream was deleted, if yes -- metastream is deleted as well
-			if (_systemStreams.IsMetaStream(streamId)
-				&& GetStreamLastEventNumberCached(reader, _systemStreams.OriginalStreamOf(streamId)) ==
-				EventNumber.DeletedStream)
-				return EventNumber.DeletedStream;
-
-			var cache = _backend.TryGetStreamLastEventNumber(streamId);
-			if (cache.LastEventNumber != null) {
-				Interlocked.Increment(ref _cachedStreamInfo);
-				return cache.LastEventNumber.GetValueOrDefault();
-			}
-
-			Interlocked.Increment(ref _notCachedStreamInfo);
-			var lastEventNumber = GetStreamLastEventNumberUncached(reader, streamId);
-
-			// Conditional update depending on previously returned cache info version.
-			// If version is not correct -- nothing is changed in cache.
-			// This update is conditioned to not interfere with updating stream cache info by commit procedure
-			// (which is the source of truth).
-			var res = _backend.UpdateStreamLastEventNumber(cache.Version, streamId, lastEventNumber);
-			return res ?? lastEventNumber;
-		}
-
-		private long GetStreamLastEventNumberUncached(TFReaderLease reader, TStreamId streamId) {
-			if (!_streamExistenceFilter.MightContain(streamId))
-				return ExpectedVersion.NoStream;
-
-			IndexEntry latestEntry;
-			if (!_tableIndex.TryGetLatestEntry(streamId, out latestEntry))
-				return ExpectedVersion.NoStream;
-
-			var rec = ReadPrepareInternal(reader, latestEntry.Position);
-			if (rec == null)
-				throw new Exception(
-					$"Could not read latest stream's prepare for stream '{streamId}' at position {latestEntry.Position}");
-
-			int count = 0;
-			long startVersion = 0;
-			long latestVersion = long.MinValue;
-			if (StreamIdComparer.Equals(rec.EventStreamId, streamId)) {
-				startVersion = Math.Max(latestEntry.Version, latestEntry.Version + 1);
-				latestVersion = latestEntry.Version;
-			}
-
-			foreach (var indexEntry in _tableIndex.GetRange(streamId, startVersion, long.MaxValue,
-				limit: _hashCollisionReadLimit + 1)) {
-				var r = ReadPrepareInternal(reader, indexEntry.Position);
-				if (r != null && StreamIdComparer.Equals(r.EventStreamId, streamId)) {
-					if (latestVersion == long.MinValue) {
-						latestVersion = indexEntry.Version;
-						continue;
-					}
-
-					return latestVersion < indexEntry.Version ? indexEntry.Version : latestVersion;
-				}
-
-				count++;
-				Interlocked.Increment(ref _hashCollisions);
-				if (count > _hashCollisionReadLimit) {
-					Log.Error("A hash collision resulted in not finding the last event number for the stream {stream}.",
-						streamId);
-					return EventNumber.Invalid;
-				}
-			}
-
-			return latestVersion == long.MinValue ? ExpectedVersion.NoStream : latestVersion;
-		}
-
-		private bool? OriginalStreamExists(TFReaderLease reader, TStreamId metaStreamId) {
-			if (_systemStreams.IsMetaStream(metaStreamId)) {
-				var originalStreamId = _systemStreams.OriginalStreamOf(metaStreamId);
-				var lastEventNumber = GetStreamLastEventNumberCached(reader, originalStreamId);
-				if (lastEventNumber == ExpectedVersion.NoStream || lastEventNumber == EventNumber.DeletedStream)
-					return false;
-				return true;
-			}
-
-			return null;
-		}
-
-		private StreamMetadata GetStreamMetadataCached(TFReaderLease reader, TStreamId streamId) {
-			// if this is metastream -- check if original stream was deleted, if yes -- metastream is deleted as well
-			if (_systemStreams.IsMetaStream(streamId))
-				return _metastreamMetadata;
-
-			var cache = _backend.TryGetStreamMetadata(streamId);
-			if (cache.Metadata != null) {
-				Interlocked.Increment(ref _cachedStreamInfo);
-				return cache.Metadata;
-			}
-
-			Interlocked.Increment(ref _notCachedStreamInfo);
-			var streamMetadata = GetStreamMetadataUncached(reader, streamId);
-
-			// Conditional update depending on previously returned cache info version.
-			// If version is not correct -- nothing is changed in cache.
-			// This update is conditioned to not interfere with updating stream cache info by commit procedure
-			// (which is the source of truth).
-			var res = _backend.UpdateStreamMetadata(cache.Version, streamId, streamMetadata);
-			return res ?? streamMetadata;
-		}
-
-		private StreamMetadata GetStreamMetadataUncached(TFReaderLease reader, TStreamId streamId) {
-			var metastreamId = _systemStreams.MetaStreamOf(streamId);
-			var metaEventNumber = GetStreamLastEventNumberCached(reader, metastreamId);
-			if (metaEventNumber == ExpectedVersion.NoStream || metaEventNumber == EventNumber.DeletedStream)
-				return StreamMetadata.Empty;
-
-			IPrepareLogRecord prepare = ReadPrepareInternal(reader, metastreamId, metaEventNumber);
-			if (prepare == null)
-				throw new Exception(string.Format(
-					"ReadPrepareInternal could not find metaevent #{0} on metastream '{1}'. "
-					+ "That should never happen.", metaEventNumber, metastreamId));
-
-			if (prepare.Data.Length == 0 || prepare.Flags.HasNoneOf(PrepareFlags.IsJson))
-				return StreamMetadata.Empty;
-
-			var metadata = StreamMetadata.TryFromJsonBytes(prepare.Version, prepare.Data);
-			return metadata;
-		}
-
-		private EventRecord CreateEventRecord(long version, IPrepareLogRecord<TStreamId> prepare, string streamName) {
-			return CreateEventRecord(version, prepare, streamName, _eventTypes);
-		}
-
-		private static EventRecord CreateEventRecord(long version, IPrepareLogRecord<TStreamId> prepare,
-			string streamName, INameLookup<TStreamId> eventTypeLookup) {
-
-			var eventTypeName = eventTypeLookup.LookupName(prepare.EventType);
-
-			return new EventRecord(version, prepare, streamName, eventTypeName);
-		}
-
-		// This struct implements the IndexScanOnRead logic.
-		//
-		// The IndexScanOnRead logic deals with the case that there are duplicate
-		// EventNumbers for a single stream (note: not talking about hash collisions), which
-		// may also be out of order (possible when there are a mix of index table bitnesses)
-		//
-		// It deals with them by removing duplicates as they are added (preferring the record
-		// with the lower LogPosition) and then sorting by EventNumber (descending) on output.
-		//
-		// If SkipIndexScanOnRead is true, then it is assumed that the EventRecords are added
-		// (1) in EventNumber order descending and (2) without duplicate EventNumbers.
-		public readonly struct ResultsDeduplicator {
-			// when deduplicating, maps event number to index in _results
-			private readonly Dictionary<long, int> _dict;
-			private readonly List<EventRecord> _results;
-			private readonly bool _skipIndexScanOnRead;
-			private static readonly Comparison<EventRecord> _byEventNumberDesc = CompareByEventNumberDesc;
-
-			public ResultsDeduplicator(int maxCount, bool skipIndexScanOnRead) {
-				var capacity = Math.Min(maxCount, 256);
-				_dict = skipIndexScanOnRead
-					? null
-					: new Dictionary<long, int>(capacity);
-				_results = new List<EventRecord>(capacity);
-				_skipIndexScanOnRead = skipIndexScanOnRead;
-			}
-
-			public int Count => _results.Count;
-
-			public EventRecord[] ProduceArray() {
-				var array = _results.ToArray();
-
-				if (!_skipIndexScanOnRead) {
-					// we already deduplicated on the way in, just sort here
-					Array.Sort(array, _byEventNumberDesc);
-				}
-
-				return array;
-			}
-
-			public List<EventRecord> ProduceList() {
-				var list = _results.ToList();
-
-				if (!_skipIndexScanOnRead) {
-					list.Sort(_byEventNumberDesc);
-				}
-
-				return list;
-			}
-
-			public void Add(EventRecord evt) {
-				if (_skipIndexScanOnRead) {
-					_results.Add(evt);
-					return;
-				}
-
-				if (_dict.TryGetValue(evt.EventNumber, out var i)) {
-					if (_results[i].LogPosition > evt.LogPosition) {
-						_results[i] = evt;
-					} else {
-						// ignore
-					}
-				} else {
-					_results.Add(evt);
-					_dict[evt.EventNumber] = _results.Count - 1;
-				}
-			}
-
-			private static int CompareByEventNumberDesc(EventRecord x, EventRecord y) {
-				return y.EventNumber.CompareTo(x.EventNumber);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/IndexWriter.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/IndexWriter.cs
deleted file mode 100644
index b52ef7dd05f..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/IndexWriter.cs
+++ /dev/null
@@ -1,529 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.DataStructures;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Settings;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public interface IIndexWriter<TStreamId> {
-		long CachedTransInfo { get; }
-		long NotCachedTransInfo { get; }
-
-		void Reset();
-		CommitCheckResult<TStreamId> CheckCommitStartingAt(long transactionPosition, long commitPosition);
-		CommitCheckResult<TStreamId> CheckCommit(TStreamId streamId, long expectedVersion, IEnumerable<Guid> eventIds, bool streamMightExist);
-		void PreCommit(CommitLogRecord commit);
-		void PreCommit(ReadOnlySpan<IPrepareLogRecord<TStreamId>> commitedPrepares);
-		void UpdateTransactionInfo(long transactionId, long logPosition, TransactionInfo<TStreamId> transactionInfo);
-		TransactionInfo<TStreamId> GetTransactionInfo(long writerCheckpoint, long transactionId);
-		void PurgeNotProcessedCommitsTill(long checkpoint);
-		void PurgeNotProcessedTransactions(long checkpoint);
-
-		bool IsSoftDeleted(TStreamId streamId);
-		long GetStreamLastEventNumber(TStreamId streamId);
-		StreamMetadata GetStreamMetadata(TStreamId streamId);
-		RawMetaInfo GetStreamRawMeta(TStreamId streamId);
-
-		TStreamId GetStreamId(string streamName);
-		string GetStreamName(TStreamId streamId);
-	}
-
-	public struct RawMetaInfo {
-		public readonly long MetaLastEventNumber;
-		public readonly ReadOnlyMemory<byte> RawMeta;
-
-		public RawMetaInfo(long metaLastEventNumber, ReadOnlyMemory<byte> rawMeta) {
-			MetaLastEventNumber = metaLastEventNumber;
-			RawMeta = rawMeta;
-		}
-	}
-
-	public abstract class IndexWriter {
-		protected static readonly ILogger Log = Serilog.Log.ForContext<IndexWriter>();
-	}
-
-	public class IndexWriter<TStreamId> : IndexWriter, IIndexWriter<TStreamId> {
-		private static EqualityComparer<TStreamId> StreamIdComparer { get; } = EqualityComparer<TStreamId>.Default;
-
-		public long CachedTransInfo {
-			get { return Interlocked.Read(ref _cachedTransInfo); }
-		}
-
-		public long NotCachedTransInfo {
-			get { return Interlocked.Read(ref _notCachedTransInfo); }
-		}
-
-		private readonly IIndexBackend _indexBackend;
-		private readonly IIndexReader<TStreamId> _indexReader;
-		private readonly IValueLookup<TStreamId> _streamIds;
-		private readonly INameLookup<TStreamId> _streamNames;
-		private readonly ISystemStreamLookup<TStreamId> _systemStreams;
-		private readonly TStreamId _emptyStreamId;
-		private readonly IStickyLRUCache<long, TransactionInfo<TStreamId>> _transactionInfoCache =
-			new StickyLRUCache<long, TransactionInfo<TStreamId>>(ESConsts.TransactionMetadataCacheCapacity);
-
-		private readonly Queue<TransInfo> _notProcessedTrans = new Queue<TransInfo>();
-
-		private readonly BoundedCache<Guid, EventInfo> _committedEvents;
-
-		private readonly IStickyLRUCache<TStreamId, long> _streamVersions =
-			new StickyLRUCache<TStreamId, long>(ESConsts.IndexWriterCacheCapacity);
-
-		private readonly IStickyLRUCache<TStreamId, StreamMeta>
-			_streamRawMetas =
-				new StickyLRUCache<TStreamId, StreamMeta>(0); // store nothing flushed, only sticky non-flushed stuff
-
-		private readonly Queue<CommitInfo> _notProcessedCommits = new Queue<CommitInfo>();
-
-		private long _cachedTransInfo;
-		private long _notCachedTransInfo;
-
-		public IndexWriter(
-			IIndexBackend indexBackend,
-			IIndexReader<TStreamId> indexReader,
-			IValueLookup<TStreamId> streamIds,
-			INameLookup<TStreamId> streamNames,
-			ISystemStreamLookup<TStreamId> systemStreams,
-			TStreamId emptyStreamId,
-			ISizer<TStreamId> inMemorySizer) {
-			Ensure.NotNull(indexBackend, "indexBackend");
-			Ensure.NotNull(indexReader, "indexReader");
-			Ensure.NotNull(streamIds, nameof(streamIds));
-			Ensure.NotNull(streamNames, nameof(streamNames));
-			Ensure.NotNull(systemStreams, nameof(systemStreams));
-			Ensure.NotNull(inMemorySizer, nameof(inMemorySizer));
-
-			_committedEvents = new BoundedCache<Guid, EventInfo>(int.MaxValue, ESConsts.CommitedEventsMemCacheLimit,
-				x => 16 + 4 + IntPtr.Size + inMemorySizer.GetSizeInBytes(x.StreamId));
-			_indexBackend = indexBackend;
-			_indexReader = indexReader;
-			_streamIds = streamIds;
-			_streamNames = streamNames;
-			_systemStreams = systemStreams;
-			_emptyStreamId = emptyStreamId;
-		}
-
-		public void Reset() {
-			_notProcessedCommits.Clear();
-			_streamVersions.Clear();
-			_streamRawMetas.Clear();
-			_notProcessedTrans.Clear();
-			_transactionInfoCache.Clear();
-		}
-
-		public CommitCheckResult<TStreamId> CheckCommitStartingAt(long transactionPosition, long commitPosition) {
-			TStreamId streamId;
-			long expectedVersion;
-			using (var reader = _indexBackend.BorrowReader()) {
-				try {
-					var prepare = GetPrepare(reader, transactionPosition);
-					if (prepare == null) {
-						Log.Error("Could not read first prepare of to-be-committed transaction. "
-						          + "Transaction pos: {transactionPosition}, commit pos: {commitPosition}.",
-							transactionPosition, commitPosition);
-						var message = String.Format("Could not read first prepare of to-be-committed transaction. "
-						                            + "Transaction pos: {0}, commit pos: {1}.",
-							transactionPosition, commitPosition);
-						throw new InvalidOperationException(message);
-					}
-
-					streamId = prepare.EventStreamId;
-					expectedVersion = prepare.ExpectedVersion;
-				} catch (InvalidOperationException) {
-					return new CommitCheckResult<TStreamId>(CommitDecision.InvalidTransaction, _emptyStreamId, -1, -1, -1, false);
-				}
-			}
-
-			// we should skip prepares without data, as they don't mean anything for idempotency
-			// though we have to check deletes, otherwise they always will be considered idempotent :)
-			var eventIds = from prepare in GetTransactionPrepares(transactionPosition, commitPosition)
-				where prepare.Flags.HasAnyOf(PrepareFlags.Data | PrepareFlags.StreamDelete)
-				select prepare.EventId;
-			return CheckCommit(streamId, expectedVersion, eventIds, streamMightExist: true);
-		}
-
-		private static IPrepareLogRecord<TStreamId> GetPrepare(TFReaderLease reader, long logPosition) {
-			RecordReadResult result = reader.TryReadAt(logPosition, couldBeScavenged: true);
-			if (!result.Success)
-				return null;
-			if (result.LogRecord.RecordType != LogRecordType.Prepare)
-				throw new Exception(string.Format("Incorrect type of log record {0}, expected Prepare record.",
-					result.LogRecord.RecordType));
-			return (IPrepareLogRecord<TStreamId>)result.LogRecord;
-		}
-
-		private CommitCheckResult<TStreamId> CheckCommitForNewStream(TStreamId streamId, long expectedVersion) {
-			var commitDecision = expectedVersion switch {
-				ExpectedVersion.Any or ExpectedVersion.NoStream => CommitDecision.Ok,
-				_ => CommitDecision.WrongExpectedVersion
-			};
-
-			return new CommitCheckResult<TStreamId>(commitDecision, streamId, ExpectedVersion.NoStream, -1, -1, false);
-		}
-
-		public CommitCheckResult<TStreamId> CheckCommit(TStreamId streamId, long expectedVersion, IEnumerable<Guid> eventIds, bool streamMightExist) {
-			if (!streamMightExist) {
-				// fast path for completely new streams
-				return CheckCommitForNewStream(streamId, expectedVersion);
-			}
-
-			var curVersion = GetStreamLastEventNumber(streamId);
-			if (curVersion == EventNumber.DeletedStream)
-				return new CommitCheckResult<TStreamId>(CommitDecision.Deleted, streamId, curVersion, -1, -1, false);
-			if (curVersion == EventNumber.Invalid)
-				return new CommitCheckResult<TStreamId>(CommitDecision.WrongExpectedVersion, streamId, curVersion, -1, -1, false);
-
-			if (expectedVersion == ExpectedVersion.StreamExists) {
-				if (IsSoftDeleted(streamId))
-					return new CommitCheckResult<TStreamId>(CommitDecision.Deleted, streamId, curVersion, -1, -1, true);
-
-				if (curVersion < 0) {
-					var metadataVersion = GetStreamLastEventNumber(_systemStreams.MetaStreamOf(streamId));
-					if (metadataVersion < 0)
-						return new CommitCheckResult<TStreamId>(CommitDecision.WrongExpectedVersion, streamId, curVersion, -1, -1,
-							false);
-				}
-			}
-
-			// idempotency checks
-			if (expectedVersion == ExpectedVersion.Any || expectedVersion == ExpectedVersion.StreamExists) {
-				var first = true;
-				long startEventNumber = -1;
-				long endEventNumber = -1;
-				foreach (var eventId in eventIds) {
-					EventInfo prepInfo;
-					if (!_committedEvents.TryGetRecord(eventId, out prepInfo) || !StreamIdComparer.Equals(prepInfo.StreamId, streamId))
-						return new CommitCheckResult<TStreamId>(first ? CommitDecision.Ok : CommitDecision.CorruptedIdempotency,
-							streamId, curVersion, -1, -1, first && IsSoftDeleted(streamId));
-					if (first)
-						startEventNumber = prepInfo.EventNumber;
-					endEventNumber = prepInfo.EventNumber;
-					first = false;
-				}
-
-				if(first) /*no data in transaction*/
-					return new CommitCheckResult<TStreamId>(CommitDecision.Ok, streamId, curVersion, -1, -1, IsSoftDeleted(streamId));
-				else{
-					var isReplicated = _indexReader.GetStreamLastEventNumber(streamId) >= endEventNumber;
-					//TODO(clc): the new index should hold the log positions removing this read
-					//n.b. the index will never have the event in the case of NotReady as it only committed records are indexed
-					//in that case the position will need to come from the pre-index
-					var idempotentEvent = _indexReader.ReadEvent(IndexReader.UnspecifiedStreamName, streamId, endEventNumber);
-					var logPos = idempotentEvent.Result == ReadEventResult.Success
-						? idempotentEvent.Record.LogPosition : -1; 					
-					if(isReplicated)
-						return new CommitCheckResult<TStreamId>(CommitDecision.Idempotent, streamId, curVersion, startEventNumber, endEventNumber, false, logPos);
-					else
-						return new CommitCheckResult<TStreamId>(CommitDecision.IdempotentNotReady, streamId, curVersion, startEventNumber, endEventNumber, false, logPos);
-				}
-			}
-
-			if (expectedVersion < curVersion) {
-				var eventNumber = expectedVersion;
-				foreach (var eventId in eventIds) {
-					eventNumber += 1;
-
-					EventInfo prepInfo;
-					if (_committedEvents.TryGetRecord(eventId, out prepInfo)
-					    && StreamIdComparer.Equals(prepInfo.StreamId, streamId)
-					    && prepInfo.EventNumber == eventNumber)
-						continue;
-
-					var res = _indexReader.ReadPrepare(streamId, eventNumber);
-					if (res != null && res.EventId == eventId)
-						continue;
-
-					var first = eventNumber == expectedVersion + 1;
-					if (!first)
-						return new CommitCheckResult<TStreamId>(CommitDecision.CorruptedIdempotency, streamId, curVersion, -1, -1,
-							false);
-
-					if (expectedVersion == ExpectedVersion.NoStream && IsSoftDeleted(streamId))
-						return new CommitCheckResult<TStreamId>(CommitDecision.Ok, streamId, curVersion, -1, -1, true);
-
-					return new CommitCheckResult<TStreamId>(CommitDecision.WrongExpectedVersion, streamId, curVersion, -1, -1,
-						false);
-				}
-
-				if(eventNumber == expectedVersion) /* no data in transaction */
-					return new CommitCheckResult<TStreamId>(CommitDecision.WrongExpectedVersion, streamId, curVersion, -1, -1, false);
-				else{
-					var isReplicated = _indexReader.GetStreamLastEventNumber(streamId) >= eventNumber;
-					//TODO(clc): the new index should hold the log positions removing this read
-					//n.b. the index will never have the event in the case of NotReady as it only committed records are indexed
-					//in that case the position will need to come from the pre-index
-					var idempotentEvent = _indexReader.ReadEvent(IndexReader.UnspecifiedStreamName, streamId, eventNumber);
-					var logPos = idempotentEvent.Result == ReadEventResult.Success
-						? idempotentEvent.Record.LogPosition : -1; 
-					if(isReplicated)
-						return new CommitCheckResult<TStreamId>(CommitDecision.Idempotent, streamId, curVersion, expectedVersion + 1, eventNumber, false,logPos);
-					else
-						return new CommitCheckResult<TStreamId>(CommitDecision.IdempotentNotReady, streamId, curVersion, expectedVersion + 1, eventNumber, false, logPos);
-				}
-			}
-
-			if (expectedVersion > curVersion)
-				return new CommitCheckResult<TStreamId>(CommitDecision.WrongExpectedVersion, streamId, curVersion, -1, -1, false);
-
-			// expectedVersion == currentVersion
-			return new CommitCheckResult<TStreamId>(CommitDecision.Ok, streamId, curVersion, -1, -1, IsSoftDeleted(streamId));
-		}
-
-		public void PreCommit(CommitLogRecord commit) {
-			TStreamId streamId = default;
-			long eventNumber = EventNumber.Invalid;
-			IPrepareLogRecord<TStreamId> lastPrepare = null;
-
-			foreach (var prepare in GetTransactionPrepares(commit.TransactionPosition, commit.LogPosition)) {
-				if (prepare.Flags.HasNoneOf(PrepareFlags.StreamDelete | PrepareFlags.Data))
-					continue;
-
-				if (StreamIdComparer.Equals(streamId, default))
-					streamId = prepare.EventStreamId;
-
-				if (!StreamIdComparer.Equals(prepare.EventStreamId, streamId))
-					throw new Exception(string.Format("Expected stream: {0}, actual: {1}.", streamId,
-						prepare.EventStreamId));
-
-				eventNumber = prepare.Flags.HasAnyOf(PrepareFlags.StreamDelete)
-					? EventNumber.DeletedStream
-					: commit.FirstEventNumber + prepare.TransactionOffset;
-				lastPrepare = prepare;
-				_committedEvents.PutRecord(prepare.EventId, new EventInfo(streamId, eventNumber),
-					throwOnDuplicate: false);
-			}
-
-			if (eventNumber != EventNumber.Invalid)
-				_streamVersions.Put(streamId, eventNumber, +1);
-
-			if (lastPrepare != null && _systemStreams.IsMetaStream(streamId)) {
-				var rawMeta = lastPrepare.Data;
-				_streamRawMetas.Put(_systemStreams.OriginalStreamOf(streamId), new StreamMeta(rawMeta, null), +1);
-			}
-		}
-
-		public void PreCommit(ReadOnlySpan<IPrepareLogRecord<TStreamId>> commitedPrepares) {
-			if (commitedPrepares.Length == 0)
-				return;
-
-			var lastPrepare = commitedPrepares[^1];
-			var streamId = lastPrepare.EventStreamId;
-			long eventNumber = EventNumber.Invalid;
-			foreach (var prepare in commitedPrepares) {
-				if (prepare.Flags.HasNoneOf(PrepareFlags.StreamDelete | PrepareFlags.Data))
-					continue;
-
-				if (!StreamIdComparer.Equals(prepare.EventStreamId, streamId))
-					throw new Exception(string.Format("Expected stream: {0}, actual: {1}.", streamId,
-						prepare.EventStreamId));
-
-				eventNumber =
-					prepare.ExpectedVersion + 1; /* for committed prepare expected version is always explicit */
-				_committedEvents.PutRecord(prepare.EventId, new EventInfo(streamId, eventNumber),
-					throwOnDuplicate: false);
-			}
-
-			_notProcessedCommits.Enqueue(new CommitInfo(streamId, lastPrepare.LogPosition));
-			_streamVersions.Put(streamId, eventNumber, 1);
-			if (_systemStreams.IsMetaStream(streamId)) {
-				var rawMeta = lastPrepare.Data;
-				_streamRawMetas.Put(_systemStreams.OriginalStreamOf(streamId), new StreamMeta(rawMeta, null), +1);
-			}
-		}
-
-		public void UpdateTransactionInfo(long transactionId, long logPosition, TransactionInfo<TStreamId> transactionInfo) {
-			_notProcessedTrans.Enqueue(new TransInfo(transactionId, logPosition));
-			_transactionInfoCache.Put(transactionId, transactionInfo, +1);
-		}
-
-		public TransactionInfo<TStreamId> GetTransactionInfo(long writerCheckpoint, long transactionId) {
-			TransactionInfo<TStreamId> transactionInfo;
-			if (!_transactionInfoCache.TryGet(transactionId, out transactionInfo)) {
-				if (GetTransactionInfoUncached(writerCheckpoint, transactionId, out transactionInfo))
-					_transactionInfoCache.Put(transactionId, transactionInfo, 0);
-				else
-					transactionInfo = new TransactionInfo<TStreamId>(int.MinValue, default);
-				Interlocked.Increment(ref _notCachedTransInfo);
-			} else {
-				Interlocked.Increment(ref _cachedTransInfo);
-			}
-
-			return transactionInfo;
-		}
-
-		private bool GetTransactionInfoUncached(long writerCheckpoint, long transactionId,
-			out TransactionInfo<TStreamId> transactionInfo) {
-			using (var reader = _indexBackend.BorrowReader()) {
-				reader.Reposition(writerCheckpoint);
-				SeqReadResult result;
-				while ((result = reader.TryReadPrev()).Success) {
-					if (result.LogRecord.LogPosition < transactionId)
-						break;
-					if (result.LogRecord.RecordType != LogRecordType.Prepare)
-						continue;
-					var prepare = (IPrepareLogRecord<TStreamId>)result.LogRecord;
-					if (prepare.TransactionPosition == transactionId) {
-						transactionInfo = new TransactionInfo<TStreamId>(prepare.TransactionOffset, prepare.EventStreamId);
-						return true;
-					}
-				}
-			}
-
-			transactionInfo = new TransactionInfo<TStreamId>(int.MinValue, default);
-			return false;
-		}
-
-		public void PurgeNotProcessedCommitsTill(long checkpoint) {
-			while (_notProcessedCommits.Count > 0 && _notProcessedCommits.Peek().LogPosition < checkpoint) {
-				var commitInfo = _notProcessedCommits.Dequeue();
-				// decrease stickiness
-				_streamVersions.Put(
-					commitInfo.StreamId,
-					x => {
-						if (!Debugger.IsAttached) Debugger.Launch();
-						else Debugger.Break();
-						throw new Exception(string.Format("CommitInfo for stream '{0}' is not present!", x));
-					},
-					(streamId, oldVersion) => oldVersion,
-					stickiness: -1);
-				if (_systemStreams.IsMetaStream(commitInfo.StreamId)) {
-					_streamRawMetas.Put(
-						_systemStreams.OriginalStreamOf(commitInfo.StreamId),
-						x => {
-							if (!Debugger.IsAttached) Debugger.Launch();
-							else Debugger.Break();
-							throw new Exception(string.Format(
-								"Original stream CommitInfo for meta-stream '{0}' is not present!",
-								_systemStreams.MetaStreamOf(x)));
-						},
-						(streamId, oldVersion) => oldVersion,
-						stickiness: -1);
-				}
-			}
-		}
-
-		public void PurgeNotProcessedTransactions(long checkpoint) {
-			while (_notProcessedTrans.Count > 0 && _notProcessedTrans.Peek().LogPosition < checkpoint) {
-				var transInfo = _notProcessedTrans.Dequeue();
-				// decrease stickiness
-				_transactionInfoCache.Put(
-					transInfo.TransactionId,
-					x => { throw new Exception(string.Format("TransInfo for transaction ID {0} is not present!", x)); },
-					(streamId, oldTransInfo) => oldTransInfo,
-					stickiness: -1);
-			}
-		}
-
-		private IEnumerable<IPrepareLogRecord<TStreamId>> GetTransactionPrepares(long transactionPos, long commitPos) {
-			using (var reader = _indexBackend.BorrowReader()) {
-				reader.Reposition(transactionPos);
-
-				// in case all prepares were scavenged, we should not read past Commit LogPosition
-				SeqReadResult result;
-				while ((result = reader.TryReadNext()).Success && result.RecordPrePosition <= commitPos) {
-					if (result.LogRecord.RecordType != LogRecordType.Prepare)
-						continue;
-
-					var prepare = (IPrepareLogRecord<TStreamId>)result.LogRecord;
-					if (prepare.TransactionPosition == transactionPos) {
-						yield return prepare;
-						if (prepare.Flags.HasAnyOf(PrepareFlags.TransactionEnd))
-							yield break;
-					}
-				}
-			}
-		}
-
-		public TStreamId GetStreamId(string streamName) {
-			return _streamIds.LookupValue(streamName);
-		}
-
-		public string GetStreamName(TStreamId streamId) {
-			return _streamNames.LookupName(streamId);
-		}
-
-		public bool IsSoftDeleted(TStreamId streamId) {
-			return GetStreamMetadata(streamId).TruncateBefore == EventNumber.DeletedStream;
-		}
-
-		public long GetStreamLastEventNumber(TStreamId streamId) {
-			long lastEventNumber;
-			if (_streamVersions.TryGet(streamId, out lastEventNumber))
-				return lastEventNumber;
-			return _indexReader.GetStreamLastEventNumber(streamId);
-		}
-
-		public StreamMetadata GetStreamMetadata(TStreamId streamId) {
-			StreamMeta meta;
-			if (_streamRawMetas.TryGet(streamId, out meta)) {
-				if (meta.Meta != null)
-					return meta.Meta;
-				var m = Helper.EatException(() => StreamMetadata.FromJsonBytes(meta.RawMeta), StreamMetadata.Empty);
-				_streamRawMetas.Put(streamId, new StreamMeta(meta.RawMeta, m), 0);
-				return m;
-			}
-
-			return _indexReader.GetStreamMetadata(streamId);
-		}
-
-		public RawMetaInfo GetStreamRawMeta(TStreamId streamId) {
-			var metastreamId = _systemStreams.MetaStreamOf(streamId);
-			var metaLastEventNumber = GetStreamLastEventNumber(metastreamId);
-
-			StreamMeta meta;
-			if (!_streamRawMetas.TryGet(streamId, out meta))
-				meta = new StreamMeta(_indexReader.ReadPrepare(metastreamId, metaLastEventNumber).Data, null);
-
-			return new RawMetaInfo(metaLastEventNumber, meta.RawMeta);
-		}
-
-		private struct StreamMeta {
-			public readonly ReadOnlyMemory<byte> RawMeta;
-			public readonly StreamMetadata Meta;
-
-			public StreamMeta(ReadOnlyMemory<byte> rawMeta, StreamMetadata meta) {
-				RawMeta = rawMeta;
-				Meta = meta;
-			}
-		}
-
-		private struct EventInfo {
-			public readonly TStreamId StreamId;
-			public readonly long EventNumber;
-
-			public EventInfo(TStreamId streamId, long eventNumber) {
-				StreamId = streamId;
-				EventNumber = eventNumber;
-			}
-		}
-
-		private struct TransInfo {
-			public readonly long TransactionId;
-			public readonly long LogPosition;
-
-			public TransInfo(long transactionId, long logPosition) {
-				TransactionId = transactionId;
-				LogPosition = logPosition;
-			}
-		}
-
-		private struct CommitInfo {
-			public readonly TStreamId StreamId;
-			public readonly long LogPosition;
-
-			public CommitInfo(TStreamId streamId, long logPosition) {
-				StreamId = streamId;
-				LogPosition = logPosition;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/ReadCacheStats.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/ReadCacheStats.cs
deleted file mode 100644
index cd5e1bab43c..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/ReadCacheStats.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public class ReadCacheStats {
-		public readonly long Size;
-		public readonly int Count;
-		public readonly long HitCount;
-		public readonly long MissCount;
-
-		public ReadCacheStats(long size, int count, long hitCount, long missCount) {
-			Size = size;
-			Count = count;
-			HitCount = hitCount;
-			MissCount = missCount;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/ReadIndex.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/ReadIndex.cs
deleted file mode 100644
index 46b1e427e03..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/ReadIndex.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-using System;
-using System.Security.Claims;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Caching;
-using EventStore.Core.Data;
-using EventStore.Core.DataStructures;
-using EventStore.Core.Index;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Messages;
-using EventStore.Core.Metrics;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.Util;
-using static EventStore.Common.Configuration.MetricsConfiguration;
-
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public sealed class ReadIndex<TStreamId> : IDisposable, IReadIndex<TStreamId> {
-		public long LastIndexedPosition {
-			get { return _indexCommitter.LastIndexedPosition; }
-		}
-
-		public IIndexWriter<TStreamId> IndexWriter {
-			get { return _indexWriter; }
-		}
-
-		public IIndexCommitter<TStreamId> IndexCommitter {
-			get { return _indexCommitter; }
-		}
-
-		private readonly IIndexReader<TStreamId> _indexReader;
-		private readonly IIndexWriter<TStreamId> _indexWriter;
-		private readonly IIndexCommitter<TStreamId> _indexCommitter;
-		private readonly IAllReader _allReader;
-		private readonly IValueLookup<TStreamId> _streamIds;
-		private readonly INameLookup<TStreamId> _streamNames;
-
-		public ReadIndex(IPublisher bus,
-			ObjectPool<ITransactionFileReader> readerPool,
-			ITableIndex<TStreamId> tableIndex,
-			INameIndexConfirmer<TStreamId> streamNameIndex,
-			IValueLookup<TStreamId> streamIds,
-			IStreamNamesProvider<TStreamId> streamNamesProvider,
-			TStreamId emptyStreamName,
-			IValidator<TStreamId> streamIdValidator,
-			ISizer<TStreamId> sizer,
-			INameExistenceFilter streamExistenceFilter,
-			IExistenceFilterReader<TStreamId> streamExistenceFilterReader,
-			INameIndexConfirmer<TStreamId> eventTypeIndex,
-			ILRUCache<TStreamId, IndexBackend<TStreamId>.EventNumberCached> streamLastEventNumberCache,
-			ILRUCache<TStreamId, IndexBackend<TStreamId>.MetadataCached> streamMetadataCache,
-			bool additionalCommitChecks,
-			long metastreamMaxCount,
-			int hashCollisionReadLimit,
-			bool skipIndexScanOnReads,
-			IReadOnlyCheckpoint replicationCheckpoint,
-			ICheckpoint indexCheckpoint,
-			IIndexStatusTracker indexStatusTracker,
-			IIndexTracker indexTracker,
-			ICacheHitsMissesTracker cacheTracker) {
-
-			Ensure.NotNull(bus, "bus");
-			Ensure.NotNull(readerPool, "readerPool");
-			Ensure.NotNull(tableIndex, "tableIndex");
-			Ensure.NotNull(streamIds, nameof(streamIds));
-			Ensure.NotNull(streamNamesProvider, nameof(streamNamesProvider));
-			Ensure.NotNull(streamIdValidator, nameof(streamIdValidator));
-			Ensure.NotNull(sizer, nameof(sizer));
-			Ensure.NotNull(streamExistenceFilter, nameof(streamExistenceFilter));
-			Ensure.NotNull(streamExistenceFilterReader, nameof(streamExistenceFilterReader));
-			Ensure.NotNull(streamLastEventNumberCache, nameof(streamLastEventNumberCache));
-			Ensure.NotNull(streamMetadataCache, nameof(streamMetadataCache));
-			Ensure.Positive(metastreamMaxCount, "metastreamMaxCount");
-			Ensure.NotNull(replicationCheckpoint, "replicationCheckpoint");
-			Ensure.NotNull(indexCheckpoint, "indexCheckpoint");
-
-			var metastreamMetadata = new StreamMetadata(maxCount: metastreamMaxCount);
-
-			var indexBackend = new IndexBackend<TStreamId>(readerPool, streamLastEventNumberCache, streamMetadataCache);
-
-			_indexReader = new IndexReader<TStreamId>(indexBackend, tableIndex, streamNamesProvider, streamIdValidator,
-				streamExistenceFilterReader, metastreamMetadata, hashCollisionReadLimit, skipIndexScanOnReads);
-
-			_streamIds = streamIds;
-			_streamNames = streamNamesProvider.StreamNames;
-			var systemStreams = streamNamesProvider.SystemStreams;
-			var eventTypeNames = streamNamesProvider.EventTypes;
-			var streamExistenceFilterInitializer = streamNamesProvider.StreamExistenceFilterInitializer;
-
-			_indexWriter = new IndexWriter<TStreamId>(indexBackend, _indexReader, _streamIds, _streamNames, systemStreams, emptyStreamName, sizer);
-			_indexCommitter = new IndexCommitter<TStreamId>(bus, indexBackend, _indexReader, tableIndex, streamNameIndex,
-				_streamNames, eventTypeIndex, eventTypeNames, systemStreams, streamExistenceFilter,
-				streamExistenceFilterInitializer, indexCheckpoint, indexStatusTracker, indexTracker, additionalCommitChecks);
-			_allReader = new AllReader<TStreamId>(indexBackend, _indexCommitter, _streamNames, eventTypeNames);
-
-			RegisterHitsMisses(cacheTracker);
-		}
-
-		IndexReadEventResult IReadIndex<TStreamId>.ReadEvent(string streamName, TStreamId streamId, long eventNumber) {
-			return _indexReader.ReadEvent(streamName, streamId, eventNumber);
-		}
-
-		IndexReadStreamResult IReadIndex<TStreamId>.ReadStreamEventsForward(string streamName, TStreamId streamId, long fromEventNumber, int maxCount) {
-			return _indexReader.ReadStreamEventsForward(streamName, streamId, fromEventNumber, maxCount);
-		}
-
-		IndexReadStreamResult IReadIndex<TStreamId>.ReadStreamEventsBackward(string streamName, TStreamId streamId, long fromEventNumber, int maxCount) {
-			return _indexReader.ReadStreamEventsBackward(streamName, streamId, fromEventNumber, maxCount);
-		}
-
-		TStreamId IReadIndex<TStreamId>.GetStreamId(string streamName) {
-			return _streamIds.LookupValue(streamName);
-		}
-
-		public IndexReadEventInfoResult ReadEventInfo_KeepDuplicates(TStreamId streamId, long eventNumber) {
-			return _indexReader.ReadEventInfo_KeepDuplicates(streamId, eventNumber);
-		}
-
-		public IndexReadEventInfoResult ReadEventInfoForward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount, long beforePosition) {
-			return _indexReader.ReadEventInfoForward_KnownCollisions(streamId, fromEventNumber, maxCount, beforePosition);
-		}
-
-		public IndexReadEventInfoResult ReadEventInfoForward_NoCollisions(ulong stream, long fromEventNumber, int maxCount, long beforePosition) {
-			return _indexReader.ReadEventInfoForward_NoCollisions(stream, fromEventNumber, maxCount, beforePosition);
-		}
-
-		public IndexReadEventInfoResult ReadEventInfoBackward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount,
-			long beforePosition) {
-			return _indexReader.ReadEventInfoBackward_KnownCollisions(streamId, fromEventNumber, maxCount, beforePosition);
-		}
-
-		public IndexReadEventInfoResult ReadEventInfoBackward_NoCollisions(ulong stream, Func<ulong, TStreamId> getStreamId,
-			long fromEventNumber, int maxCount, long beforePosition) {
-			return _indexReader.ReadEventInfoBackward_NoCollisions(stream, getStreamId, fromEventNumber, maxCount, beforePosition);
-		}
-
-		string IReadIndex<TStreamId>.GetStreamName(TStreamId streamId) {
-			return _streamNames.LookupName(streamId);
-		}
-
-		bool IReadIndex<TStreamId>.IsStreamDeleted(TStreamId streamId) {
-			return _indexReader.GetStreamLastEventNumber(streamId) == EventNumber.DeletedStream;
-		}
-
-		long IReadIndex<TStreamId>.GetStreamLastEventNumber(TStreamId streamId) {
-			return _indexReader.GetStreamLastEventNumber(streamId);
-		}
-
-		public long GetStreamLastEventNumber_KnownCollisions(TStreamId streamId, long beforePosition) {
-			return _indexReader.GetStreamLastEventNumber_KnownCollisions(streamId, beforePosition);
-		}
-
-		public long GetStreamLastEventNumber_NoCollisions(ulong stream, Func<ulong, TStreamId> getStreamId, long beforePosition) {
-			return _indexReader.GetStreamLastEventNumber_NoCollisions(stream, getStreamId, beforePosition);
-		}
-
-		StreamMetadata IReadIndex<TStreamId>.GetStreamMetadata(TStreamId streamId) {
-			return _indexReader.GetStreamMetadata(streamId);
-		}
-
-		public TStreamId GetEventStreamIdByTransactionId(long transactionId) {
-			return _indexReader.GetEventStreamIdByTransactionId(transactionId);
-		}
-
-		IndexReadAllResult IReadIndex.ReadAllEventsForward(TFPos pos, int maxCount) {
-			return _allReader.ReadAllEventsForward(pos, maxCount);
-		}
-
-		IndexReadAllResult IReadIndex.ReadAllEventsForwardFiltered(TFPos pos, int maxCount, int maxSearchWindow,
-			IEventFilter eventFilter) {
-			return _allReader.FilteredReadAllEventsForward(pos, maxCount, maxSearchWindow, eventFilter);
-		}
-
-		IndexReadAllResult IReadIndex.ReadAllEventsBackwardFiltered(TFPos pos, int maxCount, int maxSearchWindow,
-			IEventFilter eventFilter) {
-			return _allReader.FilteredReadAllEventsBackward(pos, maxCount, maxSearchWindow, eventFilter);
-		}
-
-		IndexReadAllResult IReadIndex.ReadAllEventsBackward(TFPos pos, int maxCount) {
-			return _allReader.ReadAllEventsBackward(pos, maxCount);
-		}
-
-		public StorageMessage.EffectiveAcl GetEffectiveAcl(TStreamId streamId) {
-			return _indexReader.GetEffectiveAcl(streamId);
-		}
-
-		void RegisterHitsMisses(ICacheHitsMissesTracker tracker) {
-			tracker.Register(
-				Cache.Chunk,
-				() => Interlocked.Read(ref TFChunkReader.CachedReads),
-				() => Interlocked.Read(ref TFChunkReader.NotCachedReads));
-
-			tracker.Register(
-				Cache.StreamInfo,
-				() => _indexReader.CachedStreamInfo,
-				() => _indexReader.NotCachedStreamInfo);
-		}
-
-		ReadIndexStats IReadIndex.GetStatistics() {
-			return new ReadIndexStats(Interlocked.Read(ref TFChunkReader.CachedReads),
-				Interlocked.Read(ref TFChunkReader.NotCachedReads),
-				_indexReader.CachedStreamInfo,
-				_indexReader.NotCachedStreamInfo,
-				_indexReader.HashCollisions,
-				_indexWriter.CachedTransInfo,
-				_indexWriter.NotCachedTransInfo);
-		}
-
-		public void Close() {
-			Dispose();
-		}
-
-		public void Dispose() {
-			_indexCommitter.Dispose();
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/ReadIndexStats.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/ReadIndexStats.cs
deleted file mode 100644
index fefc0ccad35..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/ReadIndexStats.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public class ReadIndexStats {
-		public readonly long CachedRecordReads;
-		public readonly long NotCachedRecordReads;
-		public readonly long CachedStreamInfoReads;
-		public readonly long NotCachedStreamInfoReads;
-		public readonly long HashCollisions;
-		public readonly long CachedTransInfoReads;
-		public readonly long NotCachedTransInfoReads;
-
-		public ReadIndexStats(long cachedRecordReads, long notCachedRecordReads,
-			long cachedStreamInfoReads, long notCachedStreamInfoReads,
-			long hashCollisions,
-			long cachedTransInfoReads, long notCachedTransInfoReads) {
-			CachedRecordReads = cachedRecordReads;
-			NotCachedRecordReads = notCachedRecordReads;
-			CachedStreamInfoReads = cachedStreamInfoReads;
-			NotCachedStreamInfoReads = notCachedStreamInfoReads;
-			HashCollisions = hashCollisions;
-			CachedTransInfoReads = cachedTransInfoReads;
-			NotCachedTransInfoReads = notCachedTransInfoReads;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/ReadStreamResult.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/ReadStreamResult.cs
deleted file mode 100644
index afe4ccf84ba..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/ReadStreamResult.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public enum ReadStreamResult {
-		Success,
-		NoStream,
-		StreamDeleted
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/StreamAccess.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/StreamAccess.cs
deleted file mode 100644
index e6a3cc1f40c..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/StreamAccess.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public struct StreamAccess {
-		public readonly bool Granted;
-		public readonly bool Public;
-
-		public StreamAccess(bool granted) {
-			Granted = granted;
-			Public = false;
-		}
-
-		public StreamAccess(bool granted, bool @public) {
-			Granted = granted;
-			Public = @public;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/StreamAccessType.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/StreamAccessType.cs
deleted file mode 100644
index a017fcb7df8..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/StreamAccessType.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public enum StreamAccessType {
-		Read,
-		Write,
-		Delete,
-		MetaRead,
-		MetaWrite
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ReaderIndex/TransactionInfo.cs b/src/EventStore.Core/Services/Storage/ReaderIndex/TransactionInfo.cs
deleted file mode 100644
index f6642421e08..00000000000
--- a/src/EventStore.Core/Services/Storage/ReaderIndex/TransactionInfo.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace EventStore.Core.Services.Storage.ReaderIndex {
-	public struct TransactionInfo<TStreamId> {
-		public readonly int TransactionOffset;
-		public readonly TStreamId EventStreamId;
-
-		public TransactionInfo(int transactionOffset, TStreamId eventStreamId) {
-			TransactionOffset = transactionOffset;
-			EventStreamId = eventStreamId;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/ScavengerFactory.cs b/src/EventStore.Core/Services/Storage/ScavengerFactory.cs
deleted file mode 100644
index 3622adab5d4..00000000000
--- a/src/EventStore.Core/Services/Storage/ScavengerFactory.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Messages;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Scavenging;
-using Serilog;
-
-namespace EventStore.Core.Services.Storage {
-	// The resulting scavenger is used for one continuous run. If it is cancelled or
-	// completed then starting scavenge again will instantiate another scavenger
-	// with a different id.
-	public class ScavengerFactory {
-		private readonly Func<ClientMessage.ScavengeDatabase, ITFChunkScavengerLog, ILogger, IScavenger> _create;
-
-		public ScavengerFactory(Func<ClientMessage.ScavengeDatabase, ITFChunkScavengerLog, ILogger, IScavenger> create) {
-			_create = create;
-		}
-
-		public IScavenger Create(ClientMessage.ScavengeDatabase message, ITFChunkScavengerLog scavengerLogger, ILogger logger) =>
-			_create(message, scavengerLogger, logger);
-	}
-
-	public class OldScavenger<TStreamId> : IScavenger {
-		private readonly bool _alwaysKeepScavenged;
-		private readonly bool _mergeChunks;
-		private readonly int _startFromChunk;
-		private readonly TFChunkScavenger<TStreamId> _tfChunkScavenger;
-
-		public string ScavengeId => _tfChunkScavenger.ScavengeId;
-
-		public OldScavenger(
-			bool alwaysKeepScaveged,
-			bool mergeChunks,
-			int startFromChunk,
-			TFChunkScavenger<TStreamId> tfChunkScavenger) {
-
-			_alwaysKeepScavenged = alwaysKeepScaveged;
-			_mergeChunks = mergeChunks;
-			_startFromChunk = startFromChunk;
-			_tfChunkScavenger = tfChunkScavenger;
-		}
-
-		public void Dispose() {
-		}
-
-		public Task<ScavengeResult> ScavengeAsync(CancellationToken cancellationToken) {
-			return _tfChunkScavenger.Scavenge(
-				alwaysKeepScavenged: _alwaysKeepScavenged,
-				mergeChunks: _mergeChunks,
-				startFromChunk: _startFromChunk,
-				ct: cancellationToken);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/StorageChaser.cs b/src/EventStore.Core/Services/Storage/StorageChaser.cs
deleted file mode 100644
index 73e9664268a..00000000000
--- a/src/EventStore.Core/Services/Storage/StorageChaser.cs
+++ /dev/null
@@ -1,284 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Monitoring.Stats;
-using EventStore.Core.Services.Storage.EpochManager;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.LogRecords;
-using System.Threading.Tasks;
-using ILogger = Serilog.ILogger;
-using EventStore.LogCommon;
-
-namespace EventStore.Core.Services.Storage {
-	public abstract class StorageChaser {
-		protected static readonly ILogger Log = Serilog.Log.ForContext<StorageChaser>();
-	}
-
-	public class StorageChaser<TStreamId> : StorageChaser, IMonitoredQueue,
-		IHandle<SystemMessage.SystemInit>,
-		IHandle<SystemMessage.SystemStart>,
-		IHandle<SystemMessage.BecomeShuttingDown> {
-
-		private static readonly int TicksPerMs = (int)(Stopwatch.Frequency / 1000);
-		private static readonly int MinFlushDelay = 2 * TicksPerMs;
-		private static readonly ManualResetEventSlim FlushSignal = new ManualResetEventSlim(false, 1);
-		private static readonly TimeSpan FlushWaitTimeout = TimeSpan.FromMilliseconds(10);
-
-		public string Name => _queueStats.Name;
-
-		private readonly IPublisher _leaderBus;
-		private readonly IReadOnlyCheckpoint _writerCheckpoint;
-		private readonly ITransactionFileChaser _chaser;
-		private readonly IIndexCommitterService<TStreamId> _indexCommitterService;
-		private readonly IEpochManager _epochManager;
-		private Thread _thread;
-		private volatile bool _stop;
-		private volatile bool _systemStarted;
-
-		private readonly QueueStatsCollector _queueStats;
-
-		private readonly Stopwatch _watch = Stopwatch.StartNew();
-		private long _flushDelay;
-		private long _lastFlush;
-
-		private readonly List<IPrepareLogRecord<TStreamId>> _transaction = new List<IPrepareLogRecord<TStreamId>>();
-		private bool _commitsAfterEof;
-
-		private readonly TaskCompletionSource<object> _tcs = new TaskCompletionSource<object>();
-
-		public Task Task {
-			get { return _tcs.Task; }
-		}
-
-		public StorageChaser(IPublisher leaderBus,
-			IReadOnlyCheckpoint writerCheckpoint,
-			ITransactionFileChaser chaser,
-			IIndexCommitterService<TStreamId> indexCommitterService,
-			IEpochManager epochManager,
-			QueueStatsManager queueStatsManager) {
-			Ensure.NotNull(leaderBus, "leaderBus");
-			Ensure.NotNull(writerCheckpoint, "writerCheckpoint");
-			Ensure.NotNull(chaser, "chaser");
-			Ensure.NotNull(indexCommitterService, "indexCommitterService");
-			Ensure.NotNull(epochManager, "epochManager");
-
-			_leaderBus = leaderBus;
-			_writerCheckpoint = writerCheckpoint;
-			_chaser = chaser;
-			_indexCommitterService = indexCommitterService;
-			_epochManager = epochManager;
-			_queueStats = queueStatsManager.CreateQueueStatsCollector("Storage Chaser");
-
-			_flushDelay = 0;
-			_lastFlush = _watch.ElapsedTicks;
-		}
-
-		public void Handle(SystemMessage.SystemInit message) {
-			_thread = new Thread(ChaseTransactionLog);
-			_thread.IsBackground = true;
-			_thread.Name = Name;
-			_thread.Start();
-		}
-
-		public void Handle(SystemMessage.SystemStart message) {
-			_systemStarted = true;
-		}
-
-		private void ChaseTransactionLog() {
-			try {
-				_queueStats.Start();
-				QueueMonitor.Default.Register(this);
-
-				_writerCheckpoint.Flushed += OnWriterFlushed;
-
-				_chaser.Open();
-
-				// We rebuild index till the chaser position, because
-				// everything else will be done by chaser as during replication
-				// with no concurrency issues with writer, as writer before jumping
-				// into leader mode and accepting writes will wait till chaser caught up.
-				_indexCommitterService.Init(_chaser.Checkpoint.Read());
-				_leaderBus.Publish(new SystemMessage.ServiceInitialized("StorageChaser"));
-
-				while (!_stop) {
-					if (_systemStarted)
-						ChaserIteration();
-					else
-						Thread.Sleep(1);
-				}
-			} catch (Exception exc) {
-				Log.Fatal(exc, "Error in StorageChaser. Terminating...");
-				_queueStats.EnterIdle();
-				_queueStats.ProcessingStarted<FaultedChaserState>(0);
-				_tcs.TrySetException(exc);
-				Application.Exit(ExitCode.Error, "Error in StorageChaser. Terminating...\nError: " + exc.Message);
-				while (!_stop) {
-					Thread.Sleep(100);
-				}
-
-				_queueStats.ProcessingEnded(0);
-			} finally {
-				_queueStats.Stop();
-				QueueMonitor.Default.Unregister(this);
-			}
-
-			_writerCheckpoint.Flushed -= OnWriterFlushed;
-			_chaser.Close();
-			_leaderBus.Publish(new SystemMessage.ServiceShutdown(Name));
-		}
-
-		private void OnWriterFlushed(long obj) {
-			FlushSignal.Set();
-		}
-
-		private void ChaserIteration() {
-			_queueStats.EnterBusy();
-
-			FlushSignal.Reset(); // Reset the flush signal just before a read to reduce pointless reads from [flush flush read] patterns.
-
-			var result = _chaser.TryReadNext();
-
-			if (result.Success) {
-				_queueStats.ProcessingStarted(result.LogRecord.GetType(), 0);
-				ProcessLogRecord(result);
-				_queueStats.ProcessingEnded(1);
-			}
-
-			var start = _watch.ElapsedTicks;
-			if (!result.Success || start - _lastFlush >= _flushDelay + MinFlushDelay) {
-				_queueStats.ProcessingStarted<ChaserCheckpointFlush>(0);
-				// todo: histogram metric?
-				_chaser.Flush();
-				_queueStats.ProcessingEnded(1);
-
-				var end = _watch.ElapsedTicks;
-				_flushDelay = end - start;
-				_lastFlush = end;
-			}
-
-			if (!result.Success) {
-				_queueStats.EnterIdle();
-				// todo: histogram metric?
-				FlushSignal.Wait(FlushWaitTimeout);
-			}
-		}
-
-		private void ProcessLogRecord(SeqReadResult result) {
-			switch (result.LogRecord.RecordType) {
-				case LogRecordType.Stream:
-				case LogRecordType.EventType:
-				case LogRecordType.Prepare: {
-					var record = (IPrepareLogRecord<TStreamId>)result.LogRecord;
-					ProcessPrepareRecord(record, result.RecordPostPosition);
-					break;
-				}
-				case LogRecordType.Commit: {
-					_commitsAfterEof = !result.Eof;
-					var record = (CommitLogRecord)result.LogRecord;
-					ProcessCommitRecord(record, result.RecordPostPosition);
-					break;
-				}
-				case LogRecordType.System: {
-					var record = (ISystemLogRecord)result.LogRecord;
-					ProcessSystemRecord(record);
-					break;
-				}
-				case LogRecordType.Partition:
-				case LogRecordType.PartitionType:
-					break;
-				default:
-					throw new ArgumentOutOfRangeException();
-			}
-
-			if (result.Eof && result.LogRecord.RecordType != LogRecordType.Commit && _commitsAfterEof) {
-				_commitsAfterEof = false;
-				_leaderBus.Publish(new StorageMessage.TfEofAtNonCommitRecord());
-			}
-		}
-
-		private void ProcessPrepareRecord(IPrepareLogRecord<TStreamId> record, long postPosition) {
-			if (_transaction.Count > 0 && _transaction[0].TransactionPosition != record.TransactionPosition)
-				CommitPendingTransaction(_transaction, postPosition);
-
-			if (record.Flags.HasAnyOf(PrepareFlags.IsCommitted)) {
-				if (record.Flags.HasAnyOf(PrepareFlags.Data | PrepareFlags.StreamDelete))
-					_transaction.Add(record);
-
-				if (record.Flags.HasAnyOf(PrepareFlags.TransactionEnd)) {
-					CommitPendingTransaction(_transaction, postPosition);
-
-					long firstEventNumber;
-					long lastEventNumber;
-					if (record.Flags.HasAnyOf(PrepareFlags.Data)) {
-						firstEventNumber = record.ExpectedVersion + 1 - record.TransactionOffset;
-						lastEventNumber = record.ExpectedVersion + 1;
-					} else {
-						firstEventNumber = record.ExpectedVersion + 1;
-						lastEventNumber = record.ExpectedVersion;
-					}
-
-					_leaderBus.Publish(new StorageMessage.CommitAck(record.CorrelationId,
-						record.LogPosition,
-						record.TransactionPosition,
-						firstEventNumber,
-						lastEventNumber));
-				}
-			} else if (record.Flags.HasAnyOf(PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd | PrepareFlags.Data)) {
-				_leaderBus.Publish(
-					new StorageMessage.PrepareAck(record.CorrelationId, record.LogPosition, record.Flags));
-			}
-		}
-
-		private void ProcessCommitRecord(CommitLogRecord record, long postPosition) {
-			CommitPendingTransaction(_transaction, postPosition);
-
-			var firstEventNumber = record.FirstEventNumber;
-			var lastEventNumber = _indexCommitterService.GetCommitLastEventNumber(record);
-			_indexCommitterService.AddPendingCommit(record, postPosition);
-			if (lastEventNumber == EventNumber.Invalid)
-				lastEventNumber = record.FirstEventNumber - 1;
-			_leaderBus.Publish(new StorageMessage.CommitAck(record.CorrelationId, record.LogPosition,
-				record.TransactionPosition, firstEventNumber, lastEventNumber));
-		}
-
-		private void ProcessSystemRecord(ISystemLogRecord record) {
-			CommitPendingTransaction(_transaction, record.LogPosition);
-
-			if (record.SystemRecordType == SystemRecordType.Epoch) {
-				// Epoch record is written to TF, but possibly is not added to EpochManager
-				// as we could be in Follower/Clone mode. We try to add epoch to EpochManager
-				// every time we encounter EpochRecord while chasing. CacheEpoch call is idempotent,
-				// but does integrity checks.
-				var epoch = record.GetEpochRecord();
-				_epochManager.CacheEpoch(epoch);
-			}
-		}
-
-		private void CommitPendingTransaction(List<IPrepareLogRecord<TStreamId>> transaction, long postPosition) {
-			if (transaction.Count > 0) {
-				_indexCommitterService.AddPendingPrepare(transaction.ToArray(), postPosition);
-				_transaction.Clear();
-			}
-		}
-
-		public void Handle(SystemMessage.BecomeShuttingDown message) {
-			_stop = true;
-		}
-
-		public QueueStats GetStatistics() {
-			return _queueStats.GetStatistics(0);
-		}
-
-		private class ChaserCheckpointFlush {
-		}
-
-		private class FaultedChaserState {
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/StorageReaderService.cs b/src/EventStore.Core/Services/Storage/StorageReaderService.cs
deleted file mode 100644
index b8da93781a0..00000000000
--- a/src/EventStore.Core/Services/Storage/StorageReaderService.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Messages;
-using EventStore.Core.Metrics;
-using EventStore.Core.Services.Storage.InMemory;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.Checkpoint;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Storage {
-	public abstract class StorageReaderService {
-		protected static readonly ILogger Log = Serilog.Log.ForContext<StorageReaderService>();
-	}
-
-	public class StorageReaderService<TStreamId> : StorageReaderService, IHandle<SystemMessage.SystemInit>,
-		IHandle<SystemMessage.BecomeShuttingDown>,
-		IHandle<SystemMessage.BecomeShutdown>,
-		IHandle<MonitoringMessage.InternalStatsRequest> {
-
-		private readonly IPublisher _bus;
-		private readonly IReadIndex _readIndex;
-		private readonly int _threadCount;
-		private readonly MultiQueuedHandler _workersMultiHandler;
-
-		public StorageReaderService(
-			IPublisher bus,
-			ISubscriber subscriber,
-			IReadIndex<TStreamId> readIndex,
-			ISystemStreamLookup<TStreamId> systemStreams,
-			int threadCount,
-			IReadOnlyCheckpoint writerCheckpoint,
-			IInMemoryStreamReader inMemReader,
-			QueueStatsManager queueStatsManager,
-			QueueTrackers trackers) {
-
-			Ensure.NotNull(bus, "bus");
-			Ensure.NotNull(subscriber, "subscriber");
-			Ensure.NotNull(readIndex, "readIndex");
-			Ensure.NotNull(systemStreams, nameof(systemStreams));
-			Ensure.Positive(threadCount, "threadCount");
-			Ensure.NotNull(writerCheckpoint, "writerCheckpoint");
-
-			_bus = bus;
-			_readIndex = readIndex;
-			_threadCount = threadCount;
-			StorageReaderWorker<TStreamId>[] readerWorkers = new StorageReaderWorker<TStreamId>[threadCount];
-			InMemoryBus[] storageReaderBuses = new InMemoryBus[threadCount];
-			for (var i = 0; i < threadCount; i++) {
-				readerWorkers[i] = new StorageReaderWorker<TStreamId>(bus, readIndex, systemStreams, writerCheckpoint, inMemReader, i);
-				storageReaderBuses[i] = new InMemoryBus("StorageReaderBus", watchSlowMsg: false);
-				storageReaderBuses[i].Subscribe<ClientMessage.ReadEvent>(readerWorkers[i]);
-				storageReaderBuses[i].Subscribe<ClientMessage.ReadStreamEventsBackward>(readerWorkers[i]);
-				storageReaderBuses[i].Subscribe<ClientMessage.ReadStreamEventsForward>(readerWorkers[i]);
-				storageReaderBuses[i].Subscribe<ClientMessage.ReadAllEventsForward>(readerWorkers[i]);
-				storageReaderBuses[i].Subscribe<ClientMessage.ReadAllEventsBackward>(readerWorkers[i]);
-				storageReaderBuses[i].Subscribe<ClientMessage.FilteredReadAllEventsForward>(readerWorkers[i]);
-				storageReaderBuses[i].Subscribe<ClientMessage.FilteredReadAllEventsBackward>(readerWorkers[i]);
-				storageReaderBuses[i].Subscribe<StorageMessage.BatchLogExpiredMessages>(readerWorkers[i]);
-				storageReaderBuses[i].Subscribe<StorageMessage.EffectiveStreamAclRequest>(readerWorkers[i]);
-				storageReaderBuses[i].Subscribe<StorageMessage.StreamIdFromTransactionIdRequest>(readerWorkers[i]);
-			}
-
-			_workersMultiHandler = new MultiQueuedHandler(
-				_threadCount,
-				queueNum => new QueuedHandlerThreadPool(storageReaderBuses[queueNum],
-					string.Format("StorageReaderQueue #{0}", queueNum + 1),
-					queueStatsManager,
-					trackers,
-					groupName: "StorageReaderQueue",
-					watchSlowMsg: true,
-					slowMsgThreshold: TimeSpan.FromMilliseconds(200)));
-			_workersMultiHandler.Start();
-
-			subscriber.Subscribe<ClientMessage.ReadEvent>(_workersMultiHandler);
-			subscriber.Subscribe<ClientMessage.ReadStreamEventsBackward>(_workersMultiHandler);
-			subscriber.Subscribe<ClientMessage.ReadStreamEventsForward>(_workersMultiHandler);
-			subscriber.Subscribe<ClientMessage.ReadAllEventsForward>(_workersMultiHandler);
-			subscriber.Subscribe<ClientMessage.ReadAllEventsBackward>(_workersMultiHandler);
-			subscriber.Subscribe<ClientMessage.FilteredReadAllEventsForward>(_workersMultiHandler);
-			subscriber.Subscribe<ClientMessage.FilteredReadAllEventsBackward>(_workersMultiHandler);
-			subscriber.Subscribe<StorageMessage.BatchLogExpiredMessages>(_workersMultiHandler);
-			subscriber.Subscribe<StorageMessage.EffectiveStreamAclRequest>(_workersMultiHandler);
-			subscriber.Subscribe<StorageMessage.StreamIdFromTransactionIdRequest>(_workersMultiHandler);
-		}
-
-		void IHandle<SystemMessage.SystemInit>.Handle(SystemMessage.SystemInit message) {
-			_bus.Publish(new SystemMessage.ServiceInitialized("StorageReader"));
-		}
-
-		void IHandle<SystemMessage.BecomeShuttingDown>.Handle(SystemMessage.BecomeShuttingDown message) {
-			try {
-				_workersMultiHandler.Stop();
-			} catch (Exception exc) {
-				Log.Error(exc, "Error while stopping readers multi handler.");
-			}
-
-			_bus.Publish(new SystemMessage.ServiceShutdown("StorageReader"));
-		}
-
-		void IHandle<SystemMessage.BecomeShutdown>.Handle(SystemMessage.BecomeShutdown message) {
-			// by now (in case of successful shutdown process), all readers and writers should not be using ReadIndex
-			_readIndex.Close();
-		}
-
-		void IHandle<MonitoringMessage.InternalStatsRequest>.Handle(MonitoringMessage.InternalStatsRequest message) {
-			var s = _readIndex.GetStatistics();
-			var stats = new Dictionary<string, object> {
-				{"es-readIndex-cachedRecord", s.CachedRecordReads},
-				{"es-readIndex-notCachedRecord", s.NotCachedRecordReads},
-				{"es-readIndex-cachedStreamInfo", s.CachedStreamInfoReads},
-				{"es-readIndex-notCachedStreamInfo", s.NotCachedStreamInfoReads},
-				{"es-readIndex-cachedTransInfo", s.CachedTransInfoReads},
-				{"es-readIndex-notCachedTransInfo", s.NotCachedTransInfoReads},
-			};
-
-			message.Envelope.ReplyWith(new MonitoringMessage.InternalStatsRequestResponse(stats));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/StorageReaderWorker.cs b/src/EventStore.Core/Services/Storage/StorageReaderWorker.cs
deleted file mode 100644
index cc3fbc13ee9..00000000000
--- a/src/EventStore.Core/Services/Storage/StorageReaderWorker.cs
+++ /dev/null
@@ -1,776 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Exceptions;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Storage.InMemory;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.Checkpoint;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Messaging;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Storage {
-	public abstract class StorageReaderWorker {
-		protected static readonly ILogger Log = Serilog.Log.ForContext<StorageReaderWorker>();
-	}
-
-	public class StorageReaderWorker<TStreamId> :
-		StorageReaderWorker,
-		IHandle<ClientMessage.ReadEvent>,
-		IHandle<ClientMessage.ReadStreamEventsBackward>,
-		IHandle<ClientMessage.ReadStreamEventsForward>,
-		IHandle<ClientMessage.ReadAllEventsForward>,
-		IHandle<ClientMessage.ReadAllEventsBackward>,
-		IHandle<ClientMessage.FilteredReadAllEventsForward>,
-		IHandle<ClientMessage.FilteredReadAllEventsBackward>,
-		IHandle<StorageMessage.EffectiveStreamAclRequest>,
-		IHandle<StorageMessage.StreamIdFromTransactionIdRequest>,
-		IHandle<StorageMessage.BatchLogExpiredMessages> {
-		private static readonly ResolvedEvent[] EmptyRecords = new ResolvedEvent[0];
-
-		private readonly IPublisher _publisher;
-		private readonly IReadIndex<TStreamId> _readIndex;
-		private readonly ISystemStreamLookup<TStreamId> _systemStreams;
-		private readonly IReadOnlyCheckpoint _writerCheckpoint;
-		private readonly IInMemoryStreamReader _inMemReader;
-		private readonly int _queueId;
-		private static readonly char[] LinkToSeparator = { '@' };
-		private const int MaxPageSize = 4096;
-		private DateTime? _lastExpireTime;
-		private long _expiredBatchCount;
-		private bool _batchLoggingEnabled;
-
-		public StorageReaderWorker(
-			IPublisher publisher,
-			IReadIndex<TStreamId> readIndex,
-			ISystemStreamLookup<TStreamId> systemStreams,
-			IReadOnlyCheckpoint writerCheckpoint,
-			IInMemoryStreamReader inMemReader,
-			int queueId) {
-			Ensure.NotNull(publisher, "publisher");
-			Ensure.NotNull(readIndex, "readIndex");
-			Ensure.NotNull(systemStreams, nameof(systemStreams));
-			Ensure.NotNull(writerCheckpoint, "writerCheckpoint");
-
-			_publisher = publisher;
-			_readIndex = readIndex;
-			_systemStreams = systemStreams;
-			_writerCheckpoint = writerCheckpoint;
-			_queueId = queueId;
-			_inMemReader = inMemReader;
-		}
-
-		void IHandle<ClientMessage.ReadEvent>.Handle(ClientMessage.ReadEvent msg) {
-			if (msg.CancellationToken.IsCancellationRequested)
-				return;
-
-			if (msg.Expires < DateTime.UtcNow) {
-				if (LogExpiredMessage(msg.Expires))
-					Log.Debug(
-						"Read Event operation has expired for Stream: {stream}, Event Number: {eventNumber}. Operation Expired at {expiryDateTime}",
-						msg.EventStreamId, msg.EventNumber, msg.Expires);
-				return;
-			}
-
-			msg.Envelope.ReplyWith(ReadEvent(msg));
-		}
-
-		void IHandle<ClientMessage.ReadStreamEventsForward>.Handle(ClientMessage.ReadStreamEventsForward msg) {
-			if (msg.CancellationToken.IsCancellationRequested)
-				return;
-
-			if (msg.Expires < DateTime.UtcNow) {
-				if (msg.ReplyOnExpired) {
-					msg.Envelope.ReplyWith(new ClientMessage.ReadStreamEventsForwardCompleted(
-						msg.CorrelationId, msg.EventStreamId, msg.FromEventNumber, msg.MaxCount,
-						ReadStreamResult.Expired,
-						ResolvedEvent.EmptyArray, default, default, default, default, default, default, default));
-				}
-				if (LogExpiredMessage(msg.Expires))
-					Log.Debug(
-						"Read Stream Events Forward operation has expired for Stream: {stream}, From Event Number: {fromEventNumber}, Max Count: {maxCount}. Operation Expired at {expiryDateTime}",
-						msg.EventStreamId, msg.FromEventNumber, msg.MaxCount, msg.Expires);
-				return;
-			}
-
-			var res = SystemStreams.IsInMemoryStream(msg.EventStreamId)
-				? _inMemReader.ReadForwards(msg)
-				: ReadStreamEventsForward(msg);
-
-			switch (res.Result) {
-				case ReadStreamResult.Success:
-				case ReadStreamResult.NoStream:
-				case ReadStreamResult.NotModified:
-					if (msg.LongPollTimeout.HasValue && res.FromEventNumber > res.LastEventNumber) {
-						_publisher.Publish(new SubscriptionMessage.PollStream(
-							msg.EventStreamId, res.TfLastCommitPosition, res.LastEventNumber,
-							DateTime.UtcNow + msg.LongPollTimeout.Value, msg));
-					} else {
-						msg.Envelope.ReplyWith(res);
-					}
-
-					break;
-				case ReadStreamResult.StreamDeleted:
-				case ReadStreamResult.Error:
-				case ReadStreamResult.AccessDenied:
-					msg.Envelope.ReplyWith(res);
-					break;
-				default:
-					throw new ArgumentOutOfRangeException(
-						$"Unknown ReadStreamResult: {res.Result}");
-			}
-		}
-
-		void IHandle<ClientMessage.ReadStreamEventsBackward>.Handle(ClientMessage.ReadStreamEventsBackward msg) {
-			if (msg.CancellationToken.IsCancellationRequested)
-				return;
-
-			if (msg.Expires < DateTime.UtcNow) {
-				if (LogExpiredMessage(msg.Expires))
-					Log.Debug(
-						"Read Stream Events Backward operation has expired for Stream: {stream}, From Event Number: {fromEventNumber}, Max Count: {maxCount}. Operation Expired at {expiryDateTime}",
-						msg.EventStreamId, msg.FromEventNumber, msg.MaxCount, msg.Expires);
-				return;
-			}
-
-			var res = SystemStreams.IsInMemoryStream(msg.EventStreamId)
-				? _inMemReader.ReadBackwards(msg)
-				: ReadStreamEventsBackward(msg);
-
-			msg.Envelope.ReplyWith(res);
-		}
-
-		void IHandle<ClientMessage.ReadAllEventsForward>.Handle(ClientMessage.ReadAllEventsForward msg) {
-			if (msg.CancellationToken.IsCancellationRequested)
-				return;
-
-			if (msg.Expires < DateTime.UtcNow) {
-				if (msg.ReplyOnExpired) {
-					msg.Envelope.ReplyWith(new ClientMessage.ReadAllEventsForwardCompleted(
-						msg.CorrelationId, ReadAllResult.Expired,
-						default, ResolvedEvent.EmptyArray, default, default, default,
-						currentPos: new TFPos(msg.CommitPosition, msg.PreparePosition),
-						TFPos.Invalid, TFPos.Invalid, default));
-				}
-				if (LogExpiredMessage(msg.Expires))
-					Log.Debug(
-						"Read All Stream Events Forward operation has expired for C:{commitPosition}/P:{preparePosition}. Operation Expired at {expiryDateTime}",
-						msg.CommitPosition, msg.PreparePosition, msg.Expires);
-				return;
-			}
-
-			var res = ReadAllEventsForward(msg);
-			switch (res.Result) {
-				case ReadAllResult.Success:
-					if (msg.LongPollTimeout.HasValue && res.IsEndOfStream && res.Events.Length == 0) {
-						_publisher.Publish(new SubscriptionMessage.PollStream(
-							SubscriptionsService.AllStreamsSubscriptionId, res.TfLastCommitPosition, null,
-							DateTime.UtcNow + msg.LongPollTimeout.Value, msg));
-					} else
-						msg.Envelope.ReplyWith(res);
-
-					break;
-				case ReadAllResult.NotModified:
-					if (msg.LongPollTimeout.HasValue && res.IsEndOfStream &&
-						res.CurrentPos.CommitPosition > res.TfLastCommitPosition) {
-						_publisher.Publish(new SubscriptionMessage.PollStream(
-							SubscriptionsService.AllStreamsSubscriptionId, res.TfLastCommitPosition, null,
-							DateTime.UtcNow + msg.LongPollTimeout.Value, msg));
-					} else
-						msg.Envelope.ReplyWith(res);
-
-					break;
-				case ReadAllResult.Error:
-				case ReadAllResult.AccessDenied:
-				case ReadAllResult.InvalidPosition:
-					msg.Envelope.ReplyWith(res);
-					break;
-				default:
-					throw new ArgumentOutOfRangeException($"Unknown ReadAllResult: {res.Result}");
-			}
-		}
-
-		void IHandle<ClientMessage.ReadAllEventsBackward>.Handle(ClientMessage.ReadAllEventsBackward msg) {
-			if (msg.CancellationToken.IsCancellationRequested)
-				return;
-
-			if (msg.Expires < DateTime.UtcNow) {
-				if (LogExpiredMessage(msg.Expires))
-					Log.Debug(
-						"Read All Stream Events Backward operation has expired for C:{commitPosition}/P:{preparePosition}. Operation Expired at {expiryDateTime}",
-						msg.CommitPosition, msg.PreparePosition, msg.Expires);
-				return;
-			}
-
-			msg.Envelope.ReplyWith(ReadAllEventsBackward(msg));
-		}
-
-		void IHandle<ClientMessage.FilteredReadAllEventsForward>.Handle(ClientMessage.FilteredReadAllEventsForward msg) {
-			if (msg.CancellationToken.IsCancellationRequested)
-				return;
-
-			if (msg.Expires < DateTime.UtcNow) {
-				if (msg.ReplyOnExpired) {
-					msg.Envelope.ReplyWith(new ClientMessage.FilteredReadAllEventsForwardCompleted(
-						msg.CorrelationId, FilteredReadAllResult.Expired,
-						default, ResolvedEvent.EmptyArray, default, default, default,
-						currentPos: new TFPos(msg.CommitPosition, msg.PreparePosition),
-						TFPos.Invalid, TFPos.Invalid, default, default, default));
-				}
-				Log.Debug(
-					"Read All Stream Events Forward Filtered operation has expired for C:{0}/P:{1}. Operation Expired at {2}",
-					msg.CommitPosition, msg.PreparePosition, msg.Expires);
-				return;
-			}
-
-			var res = FilteredReadAllEventsForward(msg);
-			switch (res.Result) {
-				case FilteredReadAllResult.Success:
-					if (msg.LongPollTimeout.HasValue && res.IsEndOfStream && res.Events.Length == 0) {
-						_publisher.Publish(new SubscriptionMessage.PollStream(
-							SubscriptionsService.AllStreamsSubscriptionId, res.TfLastCommitPosition, null,
-							DateTime.UtcNow + msg.LongPollTimeout.Value, msg));
-					} else
-						msg.Envelope.ReplyWith(res);
-
-					break;
-				case FilteredReadAllResult.NotModified:
-					if (msg.LongPollTimeout.HasValue && res.IsEndOfStream &&
-						res.CurrentPos.CommitPosition > res.TfLastCommitPosition) {
-						_publisher.Publish(new SubscriptionMessage.PollStream(
-							SubscriptionsService.AllStreamsSubscriptionId, res.TfLastCommitPosition, null,
-							DateTime.UtcNow + msg.LongPollTimeout.Value, msg));
-					} else
-						msg.Envelope.ReplyWith(res);
-
-					break;
-				case FilteredReadAllResult.Error:
-				case FilteredReadAllResult.AccessDenied:
-				case FilteredReadAllResult.InvalidPosition:
-					msg.Envelope.ReplyWith(res);
-					break;
-				default:
-					throw new ArgumentOutOfRangeException($"Unknown ReadAllResult: {res.Result}");
-			}
-		}
-
-		void IHandle<ClientMessage.FilteredReadAllEventsBackward>.Handle(ClientMessage.FilteredReadAllEventsBackward msg) {
-			if (msg.CancellationToken.IsCancellationRequested)
-				return;
-
-			if (msg.Expires < DateTime.UtcNow) {
-				Log.Debug(
-					"Read All Stream Events Backward Filtered operation has expired for C:{0}/P:{1}. Operation Expired at {2}",
-					msg.CommitPosition, msg.PreparePosition, msg.Expires);
-				return;
-			}
-
-			var res = FilteredReadAllEventsBackward(msg);
-			switch (res.Result) {
-				case FilteredReadAllResult.Success:
-					if (msg.LongPollTimeout.HasValue && res.IsEndOfStream && res.Events.Length == 0) {
-						_publisher.Publish(new SubscriptionMessage.PollStream(
-							SubscriptionsService.AllStreamsSubscriptionId, res.TfLastCommitPosition, null,
-							DateTime.UtcNow + msg.LongPollTimeout.Value, msg));
-					} else
-						msg.Envelope.ReplyWith(res);
-
-					break;
-				case FilteredReadAllResult.NotModified:
-					if (msg.LongPollTimeout.HasValue && res.IsEndOfStream &&
-						res.CurrentPos.CommitPosition > res.TfLastCommitPosition) {
-						_publisher.Publish(new SubscriptionMessage.PollStream(
-							SubscriptionsService.AllStreamsSubscriptionId, res.TfLastCommitPosition, null,
-							DateTime.UtcNow + msg.LongPollTimeout.Value, msg));
-					} else
-						msg.Envelope.ReplyWith(res);
-
-					break;
-				case FilteredReadAllResult.Error:
-				case FilteredReadAllResult.AccessDenied:
-				case FilteredReadAllResult.InvalidPosition:
-					msg.Envelope.ReplyWith(res);
-					break;
-				default:
-					throw new ArgumentOutOfRangeException($"Unknown ReadAllResult: {res.Result}");
-			}
-		}
-
-		void IHandle<StorageMessage.EffectiveStreamAclRequest>.Handle(StorageMessage.EffectiveStreamAclRequest msg) {
-			if (msg.CancellationToken.IsCancellationRequested) {
-				msg.Envelope.ReplyWith(new StorageMessage.OperationCancelledMessage(msg.CancellationToken));
-				return;
-			}
-			var acl = _readIndex.GetEffectiveAcl(_readIndex.GetStreamId(msg.StreamId));
-			msg.Envelope.ReplyWith(new StorageMessage.EffectiveStreamAclResponse(acl));
-		}
-
-		private ClientMessage.ReadEventCompleted ReadEvent(ClientMessage.ReadEvent msg) {
-			try {
-				var streamName = msg.EventStreamId;
-				var streamId = _readIndex.GetStreamId(streamName);
-				var result = _readIndex.ReadEvent(streamName, streamId, msg.EventNumber);
-				var record = result.Result == ReadEventResult.Success && msg.ResolveLinkTos
-					? ResolveLinkToEvent(result.Record, msg.User, null)
-					: ResolvedEvent.ForUnresolvedEvent(result.Record);
-				if (record == null)
-					return NoData(msg, ReadEventResult.AccessDenied);
-				if ((result.Result == ReadEventResult.NoStream ||
-						result.Result == ReadEventResult.NotFound) &&
-					_systemStreams.IsMetaStream(streamId) &&
-					result.OriginalStreamExists.HasValue &&
-					result.OriginalStreamExists.Value) {
-					return NoData(msg, ReadEventResult.Success);
-				}
-
-				return new ClientMessage.ReadEventCompleted(msg.CorrelationId, msg.EventStreamId, result.Result,
-					record.Value, result.Metadata, false, null);
-			} catch (Exception exc) {
-				Log.Error(exc, "Error during processing ReadEvent request.");
-				return NoData(msg, ReadEventResult.Error, exc.Message);
-			}
-		}
-
-		private ClientMessage.ReadStreamEventsForwardCompleted ReadStreamEventsForward(
-			ClientMessage.ReadStreamEventsForward msg) {
-
-			var lastIndexPosition = _readIndex.LastIndexedPosition;
-			try {
-				if (msg.MaxCount > MaxPageSize) {
-					throw new ArgumentException($"Read size too big, should be less than {MaxPageSize} items");
-				}
-
-				var streamName = msg.EventStreamId;
-				var streamId = _readIndex.GetStreamId(msg.EventStreamId);
-				if (msg.ValidationStreamVersion.HasValue &&
-					_readIndex.GetStreamLastEventNumber(streamId) == msg.ValidationStreamVersion)
-					return NoData(msg, ReadStreamResult.NotModified, lastIndexPosition,
-						msg.ValidationStreamVersion.Value);
-
-				var result =
-					_readIndex.ReadStreamEventsForward(streamName, streamId, msg.FromEventNumber, msg.MaxCount);
-				CheckEventsOrder(msg, result);
-				var resolvedPairs = ResolveLinkToEvents(result.Records, msg.ResolveLinkTos, msg.User);
-				if (resolvedPairs == null)
-					return NoData(msg, ReadStreamResult.AccessDenied, lastIndexPosition);
-
-				return new ClientMessage.ReadStreamEventsForwardCompleted(
-					msg.CorrelationId, msg.EventStreamId, msg.FromEventNumber, msg.MaxCount,
-					(ReadStreamResult)result.Result, resolvedPairs, result.Metadata, false, string.Empty,
-					result.NextEventNumber, result.LastEventNumber, result.IsEndOfStream, lastIndexPosition);
-			} catch (Exception exc) {
-				Log.Error(exc, "Error during processing ReadStreamEventsForward request.");
-				return NoData(msg, ReadStreamResult.Error, lastIndexPosition, error: exc.Message);
-			}
-		}
-
-		private ClientMessage.ReadStreamEventsBackwardCompleted ReadStreamEventsBackward(
-			ClientMessage.ReadStreamEventsBackward msg) {
-
-			var lastIndexedPosition = _readIndex.LastIndexedPosition;
-			try {
-				if (msg.MaxCount > MaxPageSize) {
-					throw new ArgumentException($"Read size too big, should be less than {MaxPageSize} items");
-				}
-
-				var streamName = msg.EventStreamId;
-				var streamId = _readIndex.GetStreamId(msg.EventStreamId);
-				if (msg.ValidationStreamVersion.HasValue &&
-					_readIndex.GetStreamLastEventNumber(streamId) == msg.ValidationStreamVersion)
-					return NoData(msg, ReadStreamResult.NotModified, lastIndexedPosition,
-						msg.ValidationStreamVersion.Value);
-
-
-				var result = _readIndex.ReadStreamEventsBackward(streamName, streamId, msg.FromEventNumber,
-					msg.MaxCount);
-				CheckEventsOrder(msg, result);
-				var resolvedPairs = ResolveLinkToEvents(result.Records, msg.ResolveLinkTos, msg.User);
-				if (resolvedPairs == null)
-					return NoData(msg, ReadStreamResult.AccessDenied, lastIndexedPosition);
-
-				return new ClientMessage.ReadStreamEventsBackwardCompleted(
-					msg.CorrelationId, msg.EventStreamId, result.FromEventNumber, result.MaxCount,
-					(ReadStreamResult)result.Result, resolvedPairs, result.Metadata, false, string.Empty,
-					result.NextEventNumber, result.LastEventNumber, result.IsEndOfStream, lastIndexedPosition);
-			} catch (Exception exc) {
-				Log.Error(exc, "Error during processing ReadStreamEventsBackward request.");
-				return NoData(msg, ReadStreamResult.Error, lastIndexedPosition, error: exc.Message);
-			}
-		}
-
-		private ClientMessage.ReadAllEventsForwardCompleted
-			ReadAllEventsForward(ClientMessage.ReadAllEventsForward msg) {
-
-			var pos = new TFPos(msg.CommitPosition, msg.PreparePosition);
-			var lastIndexedPosition = _readIndex.LastIndexedPosition;
-			try {
-				if (msg.MaxCount > MaxPageSize) {
-					throw new ArgumentException($"Read size too big, should be less than {MaxPageSize} items");
-				}
-
-				if (pos == TFPos.HeadOfTf) {
-					var checkpoint = _writerCheckpoint.Read();
-					pos = new TFPos(checkpoint, checkpoint);
-				}
-
-				if (pos.CommitPosition < 0 || pos.PreparePosition < 0)
-					return NoData(msg, ReadAllResult.InvalidPosition, pos, lastIndexedPosition, "Invalid position.");
-				if (msg.ValidationTfLastCommitPosition == lastIndexedPosition)
-					return NoData(msg, ReadAllResult.NotModified, pos, lastIndexedPosition);
-
-				var res = _readIndex.ReadAllEventsForward(pos, msg.MaxCount);
-				var resolved = ResolveReadAllResult(res.Records, msg.ResolveLinkTos, msg.User);
-				if (resolved == null)
-					return NoData(msg, ReadAllResult.AccessDenied, pos, lastIndexedPosition);
-
-				var metadata = _readIndex.GetStreamMetadata(_systemStreams.AllStream);
-				return new ClientMessage.ReadAllEventsForwardCompleted(
-					msg.CorrelationId, ReadAllResult.Success, null, resolved, metadata, false, msg.MaxCount,
-					res.CurrentPos, res.NextPos, res.PrevPos, lastIndexedPosition);
-			} catch (Exception exc) when (exc is InvalidReadException or UnableToReadPastEndOfStreamException) {
-				Log.Warning(exc, "Error during processing ReadAllEventsBackward request. The read appears to be at an invalid position.");
-				return NoData(msg, ReadAllResult.InvalidPosition, pos, lastIndexedPosition, exc.Message);
-			} catch (Exception exc) {
-				Log.Error(exc, "Error during processing ReadAllEventsForward request.");
-				return NoData(msg, ReadAllResult.Error, pos, lastIndexedPosition, exc.Message);
-			}
-		}
-
-		private ClientMessage.ReadAllEventsBackwardCompleted ReadAllEventsBackward(
-			ClientMessage.ReadAllEventsBackward msg) {
-
-			var pos = new TFPos(msg.CommitPosition, msg.PreparePosition);
-			var lastIndexedPosition = _readIndex.LastIndexedPosition;
-			try {
-				if (msg.MaxCount > MaxPageSize) {
-					throw new ArgumentException($"Read size too big, should be less than {MaxPageSize} items");
-				}
-
-				if (pos == TFPos.HeadOfTf) {
-					var checkpoint = _writerCheckpoint.Read();
-					pos = new TFPos(checkpoint, checkpoint);
-				}
-
-				if (pos.CommitPosition < 0 || pos.PreparePosition < 0)
-					return NoData(msg, ReadAllResult.InvalidPosition, pos, lastIndexedPosition, "Invalid position.");
-				if (msg.ValidationTfLastCommitPosition == lastIndexedPosition)
-					return NoData(msg, ReadAllResult.NotModified, pos, lastIndexedPosition);
-
-				var res = _readIndex.ReadAllEventsBackward(pos, msg.MaxCount);
-				var resolved = ResolveReadAllResult(res.Records, msg.ResolveLinkTos, msg.User);
-				if (resolved == null)
-					return NoData(msg, ReadAllResult.AccessDenied, pos, lastIndexedPosition);
-
-				var metadata = _readIndex.GetStreamMetadata(_systemStreams.AllStream);
-				return new ClientMessage.ReadAllEventsBackwardCompleted(
-					msg.CorrelationId, ReadAllResult.Success, null, resolved, metadata, false, msg.MaxCount,
-					res.CurrentPos, res.NextPos, res.PrevPos, lastIndexedPosition);
-			} catch (Exception exc) when (exc is InvalidReadException or UnableToReadPastEndOfStreamException) {
-				Log.Warning(exc, "Error during processing ReadAllEventsBackward request. The read appears to be at an invalid position.");
-				return NoData(msg, ReadAllResult.InvalidPosition, pos, lastIndexedPosition, exc.Message);
-			} catch (Exception exc) {
-				Log.Error(exc, "Error during processing ReadAllEventsBackward request.");
-				return NoData(msg, ReadAllResult.Error, pos, lastIndexedPosition, exc.Message);
-			}
-		}
-
-		private ClientMessage.FilteredReadAllEventsForwardCompleted FilteredReadAllEventsForward(
-			ClientMessage.FilteredReadAllEventsForward msg) {
-
-			var pos = new TFPos(msg.CommitPosition, msg.PreparePosition);
-			var lastIndexedPosition = _readIndex.LastIndexedPosition;
-			try {
-				if (msg.MaxCount > MaxPageSize) {
-					throw new ArgumentException($"Read size too big, should be less than {MaxPageSize} items");
-				}
-
-				if (pos == TFPos.HeadOfTf) {
-					var checkpoint = _writerCheckpoint.Read();
-					pos = new TFPos(checkpoint, checkpoint);
-				}
-
-				if (pos.CommitPosition < 0 || pos.PreparePosition < 0)
-					return NoDataForFilteredCommand(msg, FilteredReadAllResult.InvalidPosition, pos, lastIndexedPosition,
-						"Invalid position.");
-				if (msg.ValidationTfLastCommitPosition == lastIndexedPosition)
-					return NoDataForFilteredCommand(msg, FilteredReadAllResult.NotModified, pos,
-						lastIndexedPosition);
-
-				var res = _readIndex.ReadAllEventsForwardFiltered(pos, msg.MaxCount, msg.MaxSearchWindow,
-					msg.EventFilter);
-				var resolved = ResolveReadAllResult(res.Records, msg.ResolveLinkTos, msg.User);
-				if (resolved == null)
-					return NoDataForFilteredCommand(msg, FilteredReadAllResult.AccessDenied, pos,
-						lastIndexedPosition);
-
-				var metadata = _readIndex.GetStreamMetadata(_systemStreams.AllStream);
-				return new ClientMessage.FilteredReadAllEventsForwardCompleted(
-					msg.CorrelationId, FilteredReadAllResult.Success, null, resolved, metadata, false,
-					msg.MaxCount,
-					res.CurrentPos, res.NextPos, res.PrevPos, lastIndexedPosition, res.IsEndOfStream,
-					res.ConsideredEventsCount);
-			} catch (Exception exc) when (exc is InvalidReadException or UnableToReadPastEndOfStreamException) {
-				Log.Warning(exc, "Error during processing ReadAllEventsForwardFiltered request. The read appears to be at an invalid position.");
-				return NoDataForFilteredCommand(msg, FilteredReadAllResult.InvalidPosition, pos, lastIndexedPosition, exc.Message);
-			} catch (Exception exc) {
-				Log.Error(exc, "Error during processing ReadAllEventsForwardFiltered request.");
-				return NoDataForFilteredCommand(msg, FilteredReadAllResult.Error, pos, lastIndexedPosition,
-					exc.Message);
-			}
-		}
-
-		private ClientMessage.FilteredReadAllEventsBackwardCompleted FilteredReadAllEventsBackward(
-			ClientMessage.FilteredReadAllEventsBackward msg) {
-
-			var pos = new TFPos(msg.CommitPosition, msg.PreparePosition);
-			var lastIndexedPosition = _readIndex.LastIndexedPosition;
-			try {
-				if (msg.MaxCount > MaxPageSize) {
-					throw new ArgumentException($"Read size too big, should be less than {MaxPageSize} items");
-				}
-
-				if (pos == TFPos.HeadOfTf) {
-					var checkpoint = _writerCheckpoint.Read();
-					pos = new TFPos(checkpoint, checkpoint);
-				}
-
-				if (pos.CommitPosition < 0 || pos.PreparePosition < 0)
-					return NoDataForFilteredCommand(msg, FilteredReadAllResult.InvalidPosition, pos, lastIndexedPosition,
-						"Invalid position.");
-				if (msg.ValidationTfLastCommitPosition == lastIndexedPosition)
-					return NoDataForFilteredCommand(msg, FilteredReadAllResult.NotModified, pos,
-						lastIndexedPosition);
-
-				var res = _readIndex.ReadAllEventsBackwardFiltered(pos, msg.MaxCount, msg.MaxSearchWindow,
-					msg.EventFilter);
-				var resolved = ResolveReadAllResult(res.Records, msg.ResolveLinkTos, msg.User);
-				if (resolved == null)
-					return NoDataForFilteredCommand(msg, FilteredReadAllResult.AccessDenied, pos,
-						lastIndexedPosition);
-
-				var metadata = _readIndex.GetStreamMetadata(_systemStreams.AllStream);
-				return new ClientMessage.FilteredReadAllEventsBackwardCompleted(
-					msg.CorrelationId, FilteredReadAllResult.Success, null, resolved, metadata, false,
-					msg.MaxCount,
-					res.CurrentPos, res.NextPos, res.PrevPos, lastIndexedPosition, res.IsEndOfStream);
-			} catch (Exception exc) when (exc is InvalidReadException or UnableToReadPastEndOfStreamException) {
-				Log.Warning(exc, "Error during processing ReadAllEventsBackwardFiltered request. The read appears to be at an invalid position.");
-				return NoDataForFilteredCommand(msg, FilteredReadAllResult.InvalidPosition, pos, lastIndexedPosition, exc.Message);
-			} catch (Exception exc) {
-				Log.Error(exc, "Error during processing ReadAllEventsBackwardFiltered request.");
-				return NoDataForFilteredCommand(msg, FilteredReadAllResult.Error, pos, lastIndexedPosition,
-					exc.Message);
-			}
-		}
-
-		private static ClientMessage.ReadEventCompleted NoData(ClientMessage.ReadEvent msg, ReadEventResult result,
-			string error = null) {
-			return new ClientMessage.ReadEventCompleted(msg.CorrelationId, msg.EventStreamId, result,
-				ResolvedEvent.EmptyEvent, null, false, error);
-		}
-
-		private static ClientMessage.ReadStreamEventsForwardCompleted NoData(ClientMessage.ReadStreamEventsForward msg,
-			ReadStreamResult result, long lastIndexedPosition, long lastEventNumber = -1, string error = null) {
-			return new ClientMessage.ReadStreamEventsForwardCompleted(
-				msg.CorrelationId, msg.EventStreamId, msg.FromEventNumber, msg.MaxCount, result,
-				EmptyRecords, null, false, error ?? string.Empty, -1, lastEventNumber, true, lastIndexedPosition);
-		}
-
-		private static ClientMessage.ReadStreamEventsBackwardCompleted NoData(
-			ClientMessage.ReadStreamEventsBackward msg, ReadStreamResult result, long lastIndexedPosition,
-			long lastEventNumber = -1, string error = null) {
-			return new ClientMessage.ReadStreamEventsBackwardCompleted(
-				msg.CorrelationId, msg.EventStreamId, msg.FromEventNumber, msg.MaxCount, result,
-				EmptyRecords, null, false, error ?? string.Empty, -1, lastEventNumber, true, lastIndexedPosition);
-		}
-
-		private ClientMessage.ReadAllEventsForwardCompleted NoData(ClientMessage.ReadAllEventsForward msg,
-			ReadAllResult result, TFPos pos, long lastIndexedPosition, string error = null) {
-			return new ClientMessage.ReadAllEventsForwardCompleted(
-				msg.CorrelationId, result, error, ResolvedEvent.EmptyArray, null, false,
-				msg.MaxCount, pos, TFPos.Invalid, TFPos.Invalid, lastIndexedPosition);
-		}
-
-		private ClientMessage.FilteredReadAllEventsForwardCompleted NoDataForFilteredCommand(
-			ClientMessage.FilteredReadAllEventsForward msg, FilteredReadAllResult result, TFPos pos,
-			long lastIndexedPosition, string error = null) {
-			return new ClientMessage.FilteredReadAllEventsForwardCompleted(
-				msg.CorrelationId, result, error, ResolvedEvent.EmptyArray, null, false,
-				msg.MaxCount, pos, TFPos.Invalid, TFPos.Invalid, lastIndexedPosition, false, 0L);
-		}
-
-		private ClientMessage.FilteredReadAllEventsBackwardCompleted NoDataForFilteredCommand(
-			ClientMessage.FilteredReadAllEventsBackward msg, FilteredReadAllResult result, TFPos pos,
-			long lastIndexedPosition, string error = null) {
-			return new ClientMessage.FilteredReadAllEventsBackwardCompleted(
-				msg.CorrelationId, result, error, ResolvedEvent.EmptyArray, null, false,
-				msg.MaxCount, pos, TFPos.Invalid, TFPos.Invalid, lastIndexedPosition, false);
-		}
-
-		private ClientMessage.ReadAllEventsBackwardCompleted NoData(ClientMessage.ReadAllEventsBackward msg,
-			ReadAllResult result, TFPos pos, long lastIndexedPosition, string error = null) {
-			return new ClientMessage.ReadAllEventsBackwardCompleted(
-				msg.CorrelationId, result, error, ResolvedEvent.EmptyArray, null, false,
-				msg.MaxCount, pos, TFPos.Invalid, TFPos.Invalid, lastIndexedPosition);
-		}
-
-		private static void CheckEventsOrder(ClientMessage.ReadStreamEventsForward msg, IndexReadStreamResult result) {
-			for (var index = 1; index < result.Records.Length; index++) {
-				if (result.Records[index].EventNumber != result.Records[index - 1].EventNumber + 1) {
-					throw new Exception(
-						$"Invalid order of events has been detected in read index for the event stream '{msg.EventStreamId}'. " +
-						$"The event {result.Records[index].EventNumber} at position {result.Records[index].LogPosition} goes after the event {result.Records[index - 1].EventNumber} at position {result.Records[index - 1].LogPosition}");
-				}
-			}
-		}
-
-		private static void CheckEventsOrder(ClientMessage.ReadStreamEventsBackward msg, IndexReadStreamResult result) {
-			for (var index = 1; index < result.Records.Length; index++) {
-				if (result.Records[index].EventNumber != result.Records[index - 1].EventNumber - 1) {
-					throw new Exception(
-						$"Invalid order of events has been detected in read index for the event stream '{msg.EventStreamId}'. " +
-						$"The event {result.Records[index].EventNumber} at position {result.Records[index].LogPosition} goes after the event {result.Records[index - 1].EventNumber} at position {result.Records[index - 1].LogPosition}");
-				}
-			}
-		}
-
-		private ResolvedEvent[] ResolveLinkToEvents(EventRecord[] records, bool resolveLinks, ClaimsPrincipal user) {
-			var resolved = new ResolvedEvent[records.Length];
-			if (resolveLinks) {
-				for (var i = 0; i < records.Length; i++) {
-					var rec = ResolveLinkToEvent(records[i], user, null);
-					if (rec == null)
-						return null;
-					resolved[i] = rec.Value;
-				}
-			} else {
-				for (int i = 0; i < records.Length; ++i) {
-					resolved[i] = ResolvedEvent.ForUnresolvedEvent(records[i]);
-				}
-			}
-
-			return resolved;
-		}
-
-		private ResolvedEvent? ResolveLinkToEvent(EventRecord eventRecord, ClaimsPrincipal user, long? commitPosition) {
-			if (eventRecord.EventType == SystemEventTypes.LinkTo) {
-				try {
-					var linkPayload = Helper.UTF8NoBom.GetString(eventRecord.Data.Span);
-					var parts = linkPayload.Split(LinkToSeparator, 2);
-					if (long.TryParse(parts[0], out long eventNumber)) {
-						var streamName = parts[1];
-						var streamId = _readIndex.GetStreamId(streamName);
-						var res = _readIndex.ReadEvent(streamName, streamId, eventNumber);
-						if (res.Result == ReadEventResult.Success)
-							return ResolvedEvent.ForResolvedLink(res.Record, eventRecord, commitPosition);
-
-						return ResolvedEvent.ForFailedResolvedLink(eventRecord, res.Result, commitPosition);
-					}
-					
-					Log.Warning($"Invalid link event payload [{linkPayload}]: {eventRecord}");
-					return ResolvedEvent.ForUnresolvedEvent(eventRecord, commitPosition);
-				} catch (Exception exc) {
-					Log.Error(exc, "Error while resolving link for event record: {eventRecord}",
-						eventRecord.ToString());
-				}
-
-				// return unresolved link
-				return ResolvedEvent.ForFailedResolvedLink(eventRecord, ReadEventResult.Error, commitPosition);
-			}
-
-			return ResolvedEvent.ForUnresolvedEvent(eventRecord, commitPosition);
-		}
-
-		private ResolvedEvent[] ResolveReadAllResult(IList<CommitEventRecord> records, bool resolveLinks,
-			ClaimsPrincipal user) {
-			var result = new ResolvedEvent[records.Count];
-			if (resolveLinks) {
-				for (var i = 0; i < result.Length; ++i) {
-					var record = records[i];
-					var resolvedPair = ResolveLinkToEvent(record.Event, user, record.CommitPosition);
-					if (resolvedPair == null)
-						return null;
-					result[i] = resolvedPair.Value;
-				}
-			} else {
-				for (var i = 0; i < result.Length; ++i) {
-					result[i] = ResolvedEvent.ForUnresolvedEvent(records[i].Event, records[i].CommitPosition);
-				}
-			}
-
-			return result;
-		}
-
-		public void Handle(StorageMessage.BatchLogExpiredMessages message) {
-			if (!_batchLoggingEnabled)
-				return;
-			if (_expiredBatchCount == 0) {
-				_batchLoggingEnabled = false;
-				Log.Warning("StorageReaderWorker #{0}: Batch logging disabled, read load is back to normal", _queueId);
-				return;
-			}
-
-			Log.Warning("StorageReaderWorker #{0}: {1} read operations have expired", _queueId, _expiredBatchCount);
-			_expiredBatchCount = 0;
-			_publisher.Publish(
-				TimerMessage.Schedule.Create(TimeSpan.FromSeconds(2),
-					_publisher,
-					new StorageMessage.BatchLogExpiredMessages(Guid.NewGuid(), _queueId))
-			);
-		}
-
-		private bool LogExpiredMessage(DateTime expire) {
-			if (!_lastExpireTime.HasValue) {
-				_expiredBatchCount = 1;
-				_lastExpireTime = expire;
-				return true;
-			}
-
-			if (!_batchLoggingEnabled) {
-				_expiredBatchCount++;
-				if (_expiredBatchCount >= 50) {
-					if (expire - _lastExpireTime.Value <= TimeSpan.FromSeconds(1)) {
-						//heuristic to match approximately >= 50 expired messages / second
-						_batchLoggingEnabled = true;
-						Log.Warning(
-							"StorageReaderWorker #{0}: Batch logging enabled, high rate of expired read messages detected",
-							_queueId);
-						_publisher.Publish(
-							TimerMessage.Schedule.Create(TimeSpan.FromSeconds(2),
-								_publisher,
-								new StorageMessage.BatchLogExpiredMessages(Guid.NewGuid(), _queueId))
-						);
-						_expiredBatchCount = 1;
-						_lastExpireTime = expire;
-						return false;
-					} else {
-						_expiredBatchCount = 1;
-						_lastExpireTime = expire;
-					}
-				}
-
-				return true;
-			} else {
-				_expiredBatchCount++;
-				_lastExpireTime = expire;
-				return false;
-			}
-		}
-
-		public void Handle(StorageMessage.StreamIdFromTransactionIdRequest message) {
-			if (message.CancellationToken.IsCancellationRequested) {
-				message.Envelope.ReplyWith(new StorageMessage.OperationCancelledMessage(message.CancellationToken));
-			}
-			var streamId = _readIndex.GetEventStreamIdByTransactionId(message.TransactionId);
-			var streamName = _readIndex.GetStreamName(streamId);
-			message.Envelope.ReplyWith(new StorageMessage.StreamIdFromTransactionIdResponse(streamName));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/StorageScavenger.cs b/src/EventStore.Core/Services/Storage/StorageScavenger.cs
deleted file mode 100644
index f1e80a1beb6..00000000000
--- a/src/EventStore.Core/Services/Storage/StorageScavenger.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-using System;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Synchronization;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Scavenging;
-using Serilog;
-
-namespace EventStore.Core.Services.Storage {
-	// This tracks the current scavenge and starts/stops/creates it according to the client instructions
-	public class StorageScavenger :
-		IHandle<ClientMessage.ScavengeDatabase>,
-		IHandle<ClientMessage.StopDatabaseScavenge>,
-		IHandle<ClientMessage.GetCurrentDatabaseScavenge>,
-		IHandle<ClientMessage.GetLastDatabaseScavenge>,
-		IHandle<SystemMessage.StateChangeMessage> {
-
-		protected static ILogger Log { get; } = Serilog.Log.ForContext<StorageScavenger>();
-		private readonly ITFChunkScavengerLogManager _logManager;
-		private readonly ScavengerFactory _scavengerFactory;
-		private readonly SemaphoreSlimLock _switchChunksLock;
-		private Guid _switchChunksLockId = Guid.Empty;
-		private readonly object _lock = new object();
-
-		private IScavenger _currentScavenge;
-		// invariant: _currentScavenge is not null => _currentScavengeTask is the task of the current scavenge
-		private Task<ScavengeResult> _currentScavengeTask;
-		private CancellationTokenSource _cancellationTokenSource;
-
-		private string _lastScavengeId;
-		private LastScavengeResult _lastScavengeResult = LastScavengeResult.Unknown;
-
-		public StorageScavenger(
-			ITFChunkScavengerLogManager logManager,
-			ScavengerFactory scavengerFactory,
-			SemaphoreSlimLock switchChunksLock) {
-
-			Ensure.NotNull(logManager, nameof(logManager));
-			Ensure.NotNull(scavengerFactory, nameof(scavengerFactory));
-			Ensure.NotNull(switchChunksLock, nameof(switchChunksLock));
-
-			_logManager = logManager;
-			_scavengerFactory = scavengerFactory;
-			_switchChunksLock = switchChunksLock;
-		}
-
-		public void Handle(SystemMessage.StateChangeMessage message) {
-			if (message.State == VNodeState.Leader || message.State == VNodeState.Follower) {
-				_logManager.Initialise();
-			}
-		}
-
-		public void Handle(ClientMessage.ScavengeDatabase message) {
-			if (IsAllowed(message.User, message.CorrelationId, message.Envelope)) {
-				lock (_lock) {
-					if (_currentScavenge != null) {
-						message.Envelope.ReplyWith(new ClientMessage.ScavengeDatabaseInProgressResponse(
-							message.CorrelationId,
-							_currentScavenge.ScavengeId,
-							"Scavenge is already running"));
-					} else if (!_switchChunksLock.TryAcquire(out _switchChunksLockId)) {
-						Log.Information("SCAVENGING: Failed to acquire the chunks lock");
-						message.Envelope.ReplyWith(new ClientMessage.ScavengeDatabaseInProgressResponse(
-							message.CorrelationId,
-							Guid.Empty.ToString(),
-							"Failed to acquire the chunk switch lock"));
-					} else {
-						Log.Information("SCAVENGING: Acquired the chunks lock");
-						var tfChunkScavengerLog = _logManager.CreateLog();
-						var logger = Log.ForContext("ScavengeId", tfChunkScavengerLog.ScavengeId);
-
-						_cancellationTokenSource = new CancellationTokenSource();
-
-						_currentScavenge = _scavengerFactory.Create(message, tfChunkScavengerLog, logger);
-						_currentScavengeTask = _currentScavenge.ScavengeAsync(_cancellationTokenSource.Token);
-						_lastScavengeId = _currentScavenge.ScavengeId;
-						_lastScavengeResult = LastScavengeResult.InProgress;
-
-						HandleCleanupWhenFinished(_currentScavengeTask, _currentScavenge, logger);
-
-						message.Envelope.ReplyWith(new ClientMessage.ScavengeDatabaseStartedResponse(message.CorrelationId,
-							tfChunkScavengerLog.ScavengeId));
-					}
-				}
-			}
-		}
-
-		public void Handle(ClientMessage.StopDatabaseScavenge message) {
-			if (IsAllowed(message.User, message.CorrelationId, message.Envelope)) {
-				lock (_lock) {
-					if (_currentScavenge != null &&
-						(_currentScavenge.ScavengeId == message.ScavengeId || message.ScavengeId == "current")) {
-						_cancellationTokenSource.Cancel();
-
-						_currentScavengeTask.ContinueWith(_ => {
-							message.Envelope.ReplyWith(new ClientMessage.ScavengeDatabaseStoppedResponse(message.CorrelationId,
-								_currentScavenge.ScavengeId));
-						});
-					} else {
-						message.Envelope.ReplyWith(new ClientMessage.ScavengeDatabaseNotFoundResponse(message.CorrelationId,
-							_currentScavenge?.ScavengeId, "Scavenge Id does not exist"));
-					}
-				}
-			}
-		}
-
-		public void Handle(ClientMessage.GetCurrentDatabaseScavenge message) {
-			if (IsAllowed(message.User, message.CorrelationId, message.Envelope)) {
-				lock (_lock) {
-					if (_currentScavenge != null) {
-						message.Envelope.ReplyWith(new ClientMessage.ScavengeDatabaseGetCurrentResponse(
-							message.CorrelationId,
-							ClientMessage.ScavengeDatabaseGetCurrentResponse.ScavengeResult.InProgress,
-							_currentScavenge.ScavengeId));
-					} else {
-						message.Envelope.ReplyWith(new ClientMessage.ScavengeDatabaseGetCurrentResponse(
-							message.CorrelationId, ClientMessage.ScavengeDatabaseGetCurrentResponse.ScavengeResult.Stopped, scavengeId: null));
-					}
-				}
-			}
-		}
-
-		public void Handle(ClientMessage.GetLastDatabaseScavenge message) {
-			if (!IsAllowed(message.User, message.CorrelationId, message.Envelope))
-				return;
-
-			lock (_lock) {
-				var response = new ClientMessage.ScavengeDatabaseGetLastResponse(
-					message.CorrelationId,
-					_lastScavengeResult switch {
-						LastScavengeResult.Unknown => ClientMessage.ScavengeDatabaseGetLastResponse.ScavengeResult.Unknown,
-						LastScavengeResult.Success => ClientMessage.ScavengeDatabaseGetLastResponse.ScavengeResult.Success,
-						LastScavengeResult.Errored => ClientMessage.ScavengeDatabaseGetLastResponse.ScavengeResult.Errored,
-						LastScavengeResult.Stopped => ClientMessage.ScavengeDatabaseGetLastResponse.ScavengeResult.Stopped,
-						LastScavengeResult.InProgress => ClientMessage.ScavengeDatabaseGetLastResponse.ScavengeResult.InProgress,
-						_ => throw new ArgumentOutOfRangeException(nameof(_lastScavengeResult))
-					},
-					_lastScavengeId);
-
-				message.Envelope.ReplyWith(response);
-			}
-		}
-
-		private async void HandleCleanupWhenFinished(Task<ScavengeResult> newScavengeTask, IScavenger newScavenge, ILogger logger) {
-			// Clean up the reference to the TfChunkScavenger once it's finished.
-			try {
-				var result = await newScavengeTask;
-
-				lock (_lock) {
-					_lastScavengeResult = result switch {
-						ScavengeResult.Success => LastScavengeResult.Success,
-						ScavengeResult.Errored => LastScavengeResult.Errored,
-						ScavengeResult.Stopped => LastScavengeResult.Stopped,
-						_ => throw new ArgumentOutOfRangeException(nameof(result))
-					};
-				}
-			} catch (Exception ex) {
-				logger.Error(ex, "SCAVENGING: Unexpected error when scavenging");
-
-				lock (_lock) {
-					_lastScavengeResult = LastScavengeResult.Errored;
-				}
-			} finally {
-				try {
-					newScavenge.Dispose();
-				} catch (Exception ex) {
-					logger.Error(ex, "SCAVENGING: Unexpected error when disposing the scavenger");
-				}
-			}
-
-			Guid switchChunksLockId;
-			lock (_lock) {
-				switchChunksLockId = _switchChunksLockId;
-			}
-
-			try {
-				if (_switchChunksLock.TryRelease(switchChunksLockId)) {
-					logger.Information("SCAVENGING: Released the chunks lock");
-				} else {
-					logger.Information("SCAVENGING: Failed to release the chunks lock");
-				}
-			} catch (Exception ex) {
-				logger.Error(ex, "SCAVENGING: Unexpected error when releasing the chunks lock");
-			}
-
-			lock (_lock) {
-				if (newScavenge == _currentScavenge) {
-					_currentScavenge = null;
-				}
-			}
-		}
-
-		private bool IsAllowed(ClaimsPrincipal user, Guid correlationId, IEnvelope envelope) {
-			if (user == null || (!user.LegacyRoleCheck(SystemRoles.Admins) && !user.LegacyRoleCheck(SystemRoles.Operations))) {
-				envelope.ReplyWith(new ClientMessage.ScavengeDatabaseUnauthorizedResponse(correlationId, null, "User not authorized"));
-				return false;
-			}
-
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Storage/StorageWriterService.cs b/src/EventStore.Core/Services/Storage/StorageWriterService.cs
deleted file mode 100644
index e898f4c0530..00000000000
--- a/src/EventStore.Core/Services/Storage/StorageWriterService.cs
+++ /dev/null
@@ -1,882 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Metrics;
-using EventStore.Core.Services.Monitoring.Stats;
-using EventStore.Core.Services.Storage.EpochManager;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Time;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.LogRecords;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Storage {
-	public abstract class StorageWriterService {
-	}
-
-	public class StorageWriterService<TStreamId> : IHandle<SystemMessage.SystemInit>,
-		IHandle<SystemMessage.StateChangeMessage>,
-		IHandle<SystemMessage.WriteEpoch>,
-		IHandle<SystemMessage.WaitForChaserToCatchUp>,
-		IHandle<StorageMessage.WritePrepares>,
-		IHandle<StorageMessage.WriteDelete>,
-		IHandle<StorageMessage.WriteTransactionStart>,
-		IHandle<StorageMessage.WriteTransactionData>,
-		IHandle<StorageMessage.WriteTransactionEnd>,
-		IHandle<StorageMessage.WriteCommit>,
-		IHandle<MonitoringMessage.InternalStatsRequest> {
-		private static readonly ILogger Log = Serilog.Log.ForContext<StorageWriterService>();
-		private static EqualityComparer<TStreamId> StreamIdComparer { get; } = EqualityComparer<TStreamId>.Default;
-
-		protected static readonly int TicksPerMs = (int)(Stopwatch.Frequency / 1000);
-		private static readonly TimeSpan WaitForChaserSingleIterationTimeout = TimeSpan.FromMilliseconds(200);
-
-		protected readonly TFChunkDb Db;
-		protected readonly TFChunkWriter Writer;
-		private readonly IIndexWriter<TStreamId> _indexWriter;
-		private readonly IRecordFactory<TStreamId> _recordFactory;
-		private readonly INameIndex<TStreamId> _streamNameIndex;
-		private readonly INameIndex<TStreamId> _eventTypeIndex;
-		private readonly ISystemStreamLookup<TStreamId> _systemStreams;
-		private readonly IMaxTracker<long> _flushSizeTracker;
-		private readonly IDurationMaxTracker _flushDurationTracker;
-
-		protected readonly IEpochManager EpochManager;
-		protected readonly IPublisher Bus;
-		private readonly ISubscriber _subscribeToBus;
-		protected readonly IQueuedHandler StorageWriterQueue;
-		private readonly InMemoryBus _writerBus;
-
-		private readonly Clock _clock = Clock.Instance;
-		private readonly double _minFlushDelay;
-		private long _lastFlushDelay;
-		private Instant _lastFlushTimestamp;
-
-		protected int FlushMessagesInQueue;
-		private VNodeState _vnodeState = VNodeState.Initializing;
-		protected bool BlockWriter = false;
-
-		private const int LastStatsCount = 1024;
-		private readonly long[] _lastFlushDelays = new long[LastStatsCount];
-		private readonly long[] _lastFlushSizes = new long[LastStatsCount];
-		private int _statIndex;
-		private int _statCount;
-		private long _sumFlushDelay;
-		private long _sumFlushSize;
-		private long _lastFlushSize;
-		private long _maxFlushSize;
-		private long _maxFlushDelay;
-		private readonly List<Task> _tasks = new List<Task>();
-		private readonly TStreamId _emptyEventTypeId;
-		private readonly TStreamId _scavengePointsStreamId;
-		private readonly TStreamId _scavengePointEventTypeId;
-		public IEnumerable<Task> Tasks {
-			get { return _tasks; }
-		}
-
-		public StorageWriterService(IPublisher bus,
-			ISubscriber subscribeToBus,
-			TimeSpan minFlushDelay,
-			TFChunkDb db,
-			TFChunkWriter writer,
-			IIndexWriter<TStreamId> indexWriter,
-			IRecordFactory<TStreamId> recordFactory,
-			INameIndex<TStreamId> streamNameIndex,
-			INameIndex<TStreamId> eventTypeIndex,
-			TStreamId emptyEventTypeId,
-			ISystemStreamLookup<TStreamId> systemStreams,
-			IEpochManager epochManager,
-			QueueStatsManager queueStatsManager,
-			QueueTrackers queueTrackers,
-			IMaxTracker<long> flushSizeTracker,
-			IDurationMaxTracker flushDurationTracker) {
-
-			Ensure.NotNull(bus, "bus");
-			Ensure.NotNull(subscribeToBus, "subscribeToBus");
-			Ensure.NotNull(db, "db");
-			Ensure.NotNull(writer, "writer");
-			Ensure.NotNull(indexWriter, "indexWriter");
-			Ensure.NotNull(recordFactory, nameof(recordFactory));
-			Ensure.NotNull(streamNameIndex, nameof(streamNameIndex));
-			Ensure.NotNull(eventTypeIndex, nameof(eventTypeIndex));
-			Ensure.NotNull(systemStreams, nameof(systemStreams));
-			Ensure.NotNull(epochManager, "epochManager");
-
-			Bus = bus;
-			_subscribeToBus = subscribeToBus;
-			Db = db;
-			_indexWriter = indexWriter;
-			_recordFactory = recordFactory;
-			_streamNameIndex = streamNameIndex;
-			_eventTypeIndex = eventTypeIndex;
-			_systemStreams = systemStreams;
-			_emptyEventTypeId = emptyEventTypeId;
-			EpochManager = epochManager;
-			_flushDurationTracker = flushDurationTracker;
-			_flushSizeTracker = flushSizeTracker;
-			_scavengePointsStreamId = _streamNameIndex.GetExisting(SystemStreams.ScavengePointsStream);
-			_scavengePointEventTypeId = _eventTypeIndex.GetExisting(SystemEventTypes.ScavengePoint);
-
-			_minFlushDelay = minFlushDelay.TotalMilliseconds * TicksPerMs;
-			_lastFlushDelay = 0;
-			_lastFlushTimestamp = _clock.Now;
-
-			Writer = writer;
-
-			_writerBus = new InMemoryBus("StorageWriterBus", watchSlowMsg: false);
-			StorageWriterQueue = new QueuedHandlerThreadPool(new AdHocHandler<Message>(CommonHandle),
-				"StorageWriterQueue",
-				queueStatsManager,
-				queueTrackers,
-				true,
-				TimeSpan.FromMilliseconds(500));
-
-			SubscribeToMessage<SystemMessage.SystemInit>();
-			SubscribeToMessage<SystemMessage.StateChangeMessage>();
-			SubscribeToMessage<SystemMessage.WriteEpoch>();
-			SubscribeToMessage<SystemMessage.WaitForChaserToCatchUp>();
-			SubscribeToMessage<StorageMessage.WritePrepares>();
-			SubscribeToMessage<StorageMessage.WriteDelete>();
-			SubscribeToMessage<StorageMessage.WriteTransactionStart>();
-			SubscribeToMessage<StorageMessage.WriteTransactionData>();
-			SubscribeToMessage<StorageMessage.WriteTransactionEnd>();
-			SubscribeToMessage<StorageMessage.WriteCommit>();
-		}
-
-		public void Start() {
-			Writer.Open();
-			_tasks.Add(StorageWriterQueue.Start());
-		}
-
-		protected void SubscribeToMessage<T>() where T : Message {
-			_writerBus.Subscribe((IAsyncHandle<T>)this);
-			_subscribeToBus.Subscribe<T>(new AdHocHandler<Message>(EnqueueMessage));
-		}
-
-		private void EnqueueMessage(Message message) {
-			if (message is StorageMessage.IFlushableMessage)
-				Interlocked.Increment(ref FlushMessagesInQueue);
-
-			StorageWriterQueue.Publish(message);
-
-			if (message is SystemMessage.BecomeShuttingDown)
-			// we need to handle this message on main thread to stop StorageWriterQueue
-			{
-				StorageWriterQueue.Stop();
-				BlockWriter = true;
-				Bus.Publish(new SystemMessage.ServiceShutdown("StorageWriter"));
-			}
-		}
-
-		private async ValueTask CommonHandle(Message message, CancellationToken token) {
-			if (BlockWriter && !(message is SystemMessage.StateChangeMessage)) {
-				Log.Verbose("Blocking message {message} in StorageWriterService. Message:", message.GetType().Name);
-				Log.Verbose("{message}", message);
-				return;
-			}
-
-			if (_vnodeState != VNodeState.Leader && _vnodeState != VNodeState.ResigningLeader && message is StorageMessage.ILeaderWriteMessage) {
-				Log.Fatal("{message} appeared in StorageWriter during state {vnodeStrate}.", message.GetType().Name,
-					_vnodeState);
-				var msg = String.Format("{0} appeared in StorageWriter during state {1}.", message.GetType().Name,
-					_vnodeState);
-				Application.Exit(ExitCode.Error, msg);
-				return;
-			}
-
-			try {
-				await _writerBus.DispatchAsync(message, token);
-			} catch (Exception exc) {
-				BlockWriter = true;
-				Log.Fatal(exc, "Unexpected error in StorageWriterService. Terminating the process...");
-				Application.Exit(ExitCode.Error,
-					string.Format("Unexpected error in StorageWriterService: {0}", exc.Message));
-			}
-		}
-
-		void IHandle<SystemMessage.SystemInit>.Handle(SystemMessage.SystemInit message) {
-			Bus.Publish(new SystemMessage.ServiceInitialized("StorageWriter"));
-		}
-
-		public virtual void Handle(SystemMessage.StateChangeMessage message) {
-			_vnodeState = message.State;
-
-			switch (message.State) {
-				case VNodeState.Leader: {
-						_indexWriter.Reset();
-						_streamNameIndex.CancelReservations();
-						_eventTypeIndex.CancelReservations();
-						break;
-					}
-				case VNodeState.ShuttingDown: {
-						Writer.Close();
-						break;
-					}
-			}
-		}
-
-		void IHandle<SystemMessage.WriteEpoch>.Handle(SystemMessage.WriteEpoch message) {
-			if (_vnodeState != VNodeState.Leader && _vnodeState != VNodeState.PreLeader)
-				throw new Exception(string.Format("New Epoch request not in leader or preleader state. State: {0}.", _vnodeState));
-
-			if (Writer.NeedsNewChunk)
-				Writer.AddNewChunk();
-
-			EpochManager.WriteNewEpoch(message.EpochNumber);
-			PurgeNotProcessedInfo();
-		}
-
-		void IHandle<SystemMessage.WaitForChaserToCatchUp>.Handle(SystemMessage.WaitForChaserToCatchUp message) {
-			// if we are in states, that doesn't need to wait for chaser, ignore
-			if (_vnodeState != VNodeState.PreLeader &&
-				_vnodeState != VNodeState.PreReplica &&
-				_vnodeState != VNodeState.PreReadOnlyReplica)
-				throw new Exception(string.Format("{0} appeared in {1} state.", message.GetType().Name, _vnodeState));
-
-			if (Writer.HasOpenTransaction())
-				throw new InvalidOperationException("Writer has an open transaction.");
-
-			if (Writer.FlushedPosition != Writer.Position) {
-				Writer.Flush();
-				Bus.Publish(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-			}
-
-			var sw = Stopwatch.StartNew();
-			while (Db.Config.ChaserCheckpoint.Read() < Db.Config.WriterCheckpoint.Read() &&
-				   sw.Elapsed < WaitForChaserSingleIterationTimeout) {
-				Thread.Sleep(1);
-			}
-
-			if (Db.Config.ChaserCheckpoint.Read() == Db.Config.WriterCheckpoint.Read()) {
-				Bus.Publish(new SystemMessage.ChaserCaughtUp(message.CorrelationId));
-				return;
-			}
-
-			var totalTime = message.TotalTimeWasted + sw.Elapsed;
-			if (totalTime < TimeSpan.FromSeconds(5) || (int)totalTime.TotalSeconds % 30 == 0) // too verbose otherwise
-				Log.Debug("Still waiting for chaser to catch up already for {totalTime}...", totalTime);
-			Bus.Publish(new SystemMessage.WaitForChaserToCatchUp(message.CorrelationId, totalTime));
-		}
-
-		void IHandle<StorageMessage.WritePrepares>.Handle(StorageMessage.WritePrepares msg) {
-			Interlocked.Decrement(ref FlushMessagesInQueue);
-
-			try {
-				if (msg.CancellationToken.IsCancellationRequested)
-					return;
-
-				var logPosition = Writer.Position;
-				var prepares = new List<IPrepareLogRecord<TStreamId>>();
-
-				var preExisting = _streamNameIndex.GetOrReserve(
-					recordFactory: _recordFactory,
-					streamName: msg.EventStreamId,
-					logPosition: logPosition,
-					streamId: out var streamId,
-					streamRecord: out var streamRecord);
-
-				if (streamRecord != null) {
-					prepares.Add(streamRecord);
-					logPosition += streamRecord.SizeOnDisk;
-				}
-
-				var commitCheck = _indexWriter.CheckCommit(streamId, msg.ExpectedVersion,
-					msg.Events.Select(x => x.EventId), streamMightExist: preExisting);
-				if (commitCheck.Decision != CommitDecision.Ok) {
-					ActOnCommitCheckFailure(msg.Envelope, msg.CorrelationId, commitCheck);
-					return;
-				}
-
-				if (msg.Events.Length > 0) {
-					var eventTypes = new TStreamId[msg.Events.Length]; // todo: pool
-					for (int i = 0; i < msg.Events.Length; ++i) {
-						var evnt = msg.Events[i];
-						GetOrReserveEventType(evnt.EventType, logPosition, out eventTypes[i], out var eventTypeRecord);
-						if (eventTypeRecord != null) {
-							prepares.Add(eventTypeRecord);
-							logPosition += eventTypeRecord.SizeOnDisk;
-						}
-					}
-
-					var transactionPosition = logPosition;
-					for (int i = 0; i < msg.Events.Length; ++i) {
-						var evnt = msg.Events[i];
-						var flags = PrepareFlags.Data | PrepareFlags.IsCommitted;
-						if (i == 0)
-							flags |= PrepareFlags.TransactionBegin;
-						if (i == msg.Events.Length - 1)
-							flags |= PrepareFlags.TransactionEnd;
-						if (evnt.IsJson)
-							flags |= PrepareFlags.IsJson;
-
-						// when IsCommitted ExpectedVersion is always explicit
-						var expectedVersion = commitCheck.CurrentVersion + i;
-						var prepare = LogRecord.Prepare(_recordFactory, logPosition, msg.CorrelationId, evnt.EventId,
-							transactionPosition, i, streamId,
-							expectedVersion, flags, eventTypes[i], evnt.Data, evnt.Metadata);
-						prepares.Add(prepare);
-
-						logPosition += prepare.SizeOnDisk;
-					}
-				} else {
-					prepares.Add(
-						LogRecord.Prepare(_recordFactory, logPosition, msg.CorrelationId, Guid.NewGuid(), logPosition, -1,
-							streamId, commitCheck.CurrentVersion,
-							PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd | PrepareFlags.IsCommitted,
-							_emptyEventTypeId, Empty.ByteArray, Empty.ByteArray));
-				}
-
-				var preparesSpan = CollectionsMarshal.AsSpan(prepares);
-				if (!TryWritePreparesWithRetry(preparesSpan)) {
-					ActOnCommitCheckFailure(
-						envelope: msg.Envelope,
-						correlationId: msg.CorrelationId,
-						result: new CommitCheckResult<TStreamId>(
-							decision: CommitDecision.InvalidTransaction,
-							eventStreamId: streamId,
-							currentVersion: commitCheck.CurrentVersion,
-							startEventNumber: -1,
-							endEventNumber: -1,
-							isSoftDeleted: false));
-				}
-
-				bool softUndeleteMetastream = _systemStreams.IsMetaStream(streamId)
-											  && _indexWriter.IsSoftDeleted(_systemStreams.OriginalStreamOf(streamId));
-
-				// note: the stream & event type records are indexed separately and must not be pre-committed to the main index
-				_indexWriter.PreCommit(preparesSpan[^msg.Events.Length..]);
-
-				if (commitCheck.IsSoftDeleted)
-					SoftUndeleteStream(streamId, commitCheck.CurrentVersion + 1);
-				if (softUndeleteMetastream)
-					SoftUndeleteMetastream(streamId);
-			} catch (Exception exc) {
-				Log.Error(exc, "Exception in writer.");
-				throw;
-			} finally {
-				Flush();
-			}
-		}
-
-		private bool GetOrReserveEventType(string eventType, long logPosition,
-			out TStreamId eventTypeId, out IPrepareLogRecord<TStreamId> eventTypeRecord) {
-			return _eventTypeIndex.GetOrReserveEventType(
-				recordFactory: _recordFactory,
-				eventType: eventType,
-				logPosition: logPosition,
-				eventTypeId: out eventTypeId,
-				eventTypeRecord: out eventTypeRecord);
-		}
-
-		private TStreamId GetOrWriteEventType(string eventType, ref long logPosition) {
-			GetOrReserveEventType(eventType, logPosition, out var eventTypeId, out var eventTypeRecord);
-
-			if (eventTypeRecord != null)
-			{
-				var result = WritePrepareWithRetry(eventTypeRecord);
-				logPosition = result.NewPos;
-			}
-
-			return eventTypeId;
-		}
-
-		private void SoftUndeleteMetastream(TStreamId metastreamId) {
-			var origStreamId = _systemStreams.OriginalStreamOf(metastreamId);
-			var rawMetaInfo = _indexWriter.GetStreamRawMeta(origStreamId);
-			SoftUndeleteStream(origStreamId, rawMetaInfo.MetaLastEventNumber, rawMetaInfo.RawMeta,
-				recreateFrom: _indexWriter.GetStreamLastEventNumber(origStreamId) + 1);
-		}
-
-		private void SoftUndeleteStream(TStreamId streamId, long recreateFromEventNumber) {
-			var rawInfo = _indexWriter.GetStreamRawMeta(streamId);
-			SoftUndeleteStream(streamId, rawInfo.MetaLastEventNumber, rawInfo.RawMeta, recreateFromEventNumber);
-		}
-
-		private void SoftUndeleteStream(TStreamId streamId, long metaLastEventNumber, ReadOnlyMemory<byte> rawMeta, long recreateFrom) {
-			byte[] modifiedMeta;
-			if (!SoftUndeleteRawMeta(rawMeta, recreateFrom, out modifiedMeta))
-				return;
-
-			var logPosition = Writer.Position;
-			var streamMetadataEventTypeId = GetOrWriteEventType(SystemEventTypes.StreamMetadata, ref logPosition);
-
-			var res = WritePrepareWithRetry(
-				LogRecord.Prepare(_recordFactory, logPosition, Guid.NewGuid(), Guid.NewGuid(), logPosition, 0,
-					_systemStreams.MetaStreamOf(streamId), metaLastEventNumber,
-					PrepareFlags.SingleWrite | PrepareFlags.IsCommitted | PrepareFlags.IsJson,
-					streamMetadataEventTypeId, modifiedMeta, Empty.ByteArray));
-
-			_indexWriter.PreCommit(new[] { res.Prepare });
-		}
-
-		public bool SoftUndeleteRawMeta(ReadOnlyMemory<byte> rawMeta, long recreateFromEventNumber, out byte[] modifiedMeta) {
-			try {
-				var jobj = JObject.Parse(Encoding.UTF8.GetString(rawMeta.Span));
-				jobj[SystemMetadata.TruncateBefore] = recreateFromEventNumber;
-				using (var memoryStream = new MemoryStream()) {
-					using (var jsonWriter = new JsonTextWriter(new StreamWriter(memoryStream))) {
-						jobj.WriteTo(jsonWriter);
-					}
-
-					modifiedMeta = memoryStream.ToArray();
-					return true;
-				}
-			} catch (Exception) {
-				modifiedMeta = null;
-				return false;
-			}
-		}
-
-		void IHandle<StorageMessage.WriteDelete>.Handle(StorageMessage.WriteDelete message) {
-			Interlocked.Decrement(ref FlushMessagesInQueue);
-			try {
-				if (message.CancellationToken.IsCancellationRequested)
-					return;
-
-				var eventId = Guid.NewGuid();
-
-				var logPosition = Writer.Position;
-
-				var preExisting = _streamNameIndex.GetOrReserve(
-					recordFactory: _recordFactory,
-					streamName: message.EventStreamId,
-					logPosition: logPosition,
-					streamId: out var streamId,
-					streamRecord: out var streamRecord);
-
-				if (streamRecord != null) {
-					var res = WritePrepareWithRetry(streamRecord);
-					logPosition = res.NewPos;
-				}
-
-				var commitCheck = _indexWriter.CheckCommit(streamId, message.ExpectedVersion,
-					new[] { eventId }, streamMightExist: preExisting);
-				if (commitCheck.Decision != CommitDecision.Ok) {
-					ActOnCommitCheckFailure(message.Envelope, message.CorrelationId, commitCheck);
-					return;
-				}
-
-				if (message.HardDelete) {
-					// HARD DELETE
-					const long expectedVersion = EventNumber.DeletedStream - 1;
-					var streamDeletedEventType = GetOrWriteEventType(SystemEventTypes.StreamDeleted, ref logPosition);
-					var record = LogRecord.DeleteTombstone(_recordFactory, logPosition, message.CorrelationId,
-						eventId, streamId, streamDeletedEventType,
-						expectedVersion, PrepareFlags.IsCommitted);
-					var res = WritePrepareWithRetry(record);
-					_indexWriter.PreCommit(new[] { res.Prepare });
-				} else {
-					// SOFT DELETE
-					var metastreamId = _systemStreams.MetaStreamOf(streamId);
-					var expectedVersion = _indexWriter.GetStreamLastEventNumber(metastreamId);
-
-					if (_indexWriter.GetStreamLastEventNumber(streamId) < 0 && expectedVersion < 0) {
-						var result = new CommitCheckResult<TStreamId>(CommitDecision.WrongExpectedVersion, streamId,
-							-1, -1, -1, false);
-						ActOnCommitCheckFailure(message.Envelope, message.CorrelationId, result);
-						return;
-					}
-
-
-					const PrepareFlags flags = PrepareFlags.SingleWrite | PrepareFlags.IsCommitted |
-											   PrepareFlags.IsJson;
-					var data = new StreamMetadata(truncateBefore: EventNumber.DeletedStream).ToJsonBytes();
-
-					var streamMetadataEventTypeId = GetOrWriteEventType(SystemEventTypes.StreamMetadata, ref logPosition);
-
-					var res = WritePrepareWithRetry(
-						LogRecord.Prepare(_recordFactory, logPosition, message.CorrelationId, eventId, logPosition, 0,
-							metastreamId, expectedVersion, flags, streamMetadataEventTypeId,
-							data, null));
-					_indexWriter.PreCommit(new[] { res.Prepare });
-				}
-			} catch (Exception exc) {
-				Log.Error(exc, "Exception in writer.");
-				throw;
-			} finally {
-				Flush();
-			}
-		}
-
-		void IHandle<StorageMessage.WriteTransactionStart>.Handle(StorageMessage.WriteTransactionStart message) {
-			Interlocked.Decrement(ref FlushMessagesInQueue);
-			try {
-				if (message.LiveUntil < DateTime.UtcNow)
-					return;
-
-				var streamId = _indexWriter.GetStreamId(message.EventStreamId);
-				var record = LogRecord.TransactionBegin(_recordFactory, Writer.Position,
-					message.CorrelationId,
-					streamId,
-					message.ExpectedVersion);
-				var res = WritePrepareWithRetry(record);
-
-				// we update cache to avoid non-cached look-up on next TransactionWrite
-				_indexWriter.UpdateTransactionInfo(res.WrittenPos, res.WrittenPos,
-					new TransactionInfo<TStreamId>(-1, streamId));
-			} catch (Exception exc) {
-				Log.Error(exc, "Exception in writer.");
-				throw;
-			} finally {
-				Flush();
-			}
-		}
-
-		void IHandle<StorageMessage.WriteTransactionData>.Handle(StorageMessage.WriteTransactionData message) {
-			Interlocked.Decrement(ref FlushMessagesInQueue);
-			try {
-				var logPosition = Writer.Position;
-				var transactionInfo = _indexWriter.GetTransactionInfo(Writer.FlushedPosition, message.TransactionId);
-				if (!CheckTransactionInfo(message.TransactionId, transactionInfo))
-					return;
-
-				if (message.Events.Length > 0) {
-					long lastLogPosition = -1;
-					for (int i = 0; i < message.Events.Length; ++i) {
-						var evnt = message.Events[i];
-						// safe, only v2 supports transactions and it doesnt write eventtype records.
-						var eventType = GetOrWriteEventType(evnt.EventType, ref logPosition);
-						var record = LogRecord.TransactionWrite(
-							_recordFactory,
-							logPosition,
-							message.CorrelationId,
-							evnt.EventId,
-							message.TransactionId,
-							transactionInfo.TransactionOffset + i + 1,
-							transactionInfo.EventStreamId,
-							eventType,
-							evnt.Data,
-							evnt.Metadata,
-							evnt.IsJson);
-						var res = WritePrepareWithRetry(record);
-						logPosition = res.NewPos;
-						lastLogPosition = res.WrittenPos;
-					}
-
-					var info = new TransactionInfo<TStreamId>(transactionInfo.TransactionOffset + message.Events.Length,
-						transactionInfo.EventStreamId);
-					_indexWriter.UpdateTransactionInfo(message.TransactionId, lastLogPosition, info);
-				}
-			} catch (Exception exc) {
-				Log.Error(exc, "Exception in writer.");
-				throw;
-			} finally {
-				Flush();
-			}
-		}
-
-		void IHandle<StorageMessage.WriteTransactionEnd>.Handle(StorageMessage.WriteTransactionEnd message) {
-			Interlocked.Decrement(ref FlushMessagesInQueue);
-			try {
-				if (message.LiveUntil < DateTime.UtcNow)
-					return;
-
-				var transactionInfo = _indexWriter.GetTransactionInfo(Writer.FlushedPosition, message.TransactionId);
-				if (!CheckTransactionInfo(message.TransactionId, transactionInfo))
-					return;
-
-				var record = LogRecord.TransactionEnd(_recordFactory, Writer.Position,
-					message.CorrelationId,
-					Guid.NewGuid(),
-					message.TransactionId,
-					transactionInfo.EventStreamId);
-				WritePrepareWithRetry(record);
-			} catch (Exception exc) {
-				Log.Error(exc, "Exception in writer.");
-				throw;
-			} finally {
-				Flush();
-			}
-		}
-
-		private static bool CheckTransactionInfo(long transactionId, TransactionInfo<TStreamId> transactionInfo) {
-			var noStreamId = StreamIdComparer.Equals(transactionInfo.EventStreamId, default);
-			if (transactionInfo.TransactionOffset < -1 || noStreamId) {
-				Log.Error(
-					"Invalid transaction info found for transaction ID {transactionId}. "
-					+ "Possibly wrong transactionId provided. TransactionOffset: {transactionOffset}, EventStreamId: {stream}",
-					transactionId,
-					transactionInfo.TransactionOffset,
-					noStreamId ? "<null>" : $"{transactionInfo.EventStreamId}");
-				return false;
-			}
-
-			return true;
-		}
-
-		void IHandle<StorageMessage.WriteCommit>.Handle(StorageMessage.WriteCommit message) {
-			Interlocked.Decrement(ref FlushMessagesInQueue);
-			try {
-				var commitPos = Writer.Position;
-				var commitCheck = _indexWriter.CheckCommitStartingAt(message.TransactionPosition, commitPos);
-				if (commitCheck.Decision != CommitDecision.Ok) {
-					ActOnCommitCheckFailure(message.Envelope, message.CorrelationId, commitCheck);
-					return;
-				}
-
-
-				var commit = WriteCommitWithRetry(LogRecord.Commit(commitPos,
-					message.CorrelationId,
-					message.TransactionPosition,
-					commitCheck.CurrentVersion + 1));
-
-				bool softUndeleteMetastream = _systemStreams.IsMetaStream(commitCheck.EventStreamId)
-											  &&
-											  _indexWriter.IsSoftDeleted(
-												  _systemStreams.OriginalStreamOf(commitCheck.EventStreamId));
-
-				_indexWriter.PreCommit(commit);
-
-				if (commitCheck.IsSoftDeleted)
-					SoftUndeleteStream(commitCheck.EventStreamId, commitCheck.CurrentVersion + 1);
-				if (softUndeleteMetastream)
-					SoftUndeleteMetastream(commitCheck.EventStreamId);
-			} catch (Exception exc) {
-				Log.Error(exc, "Exception in writer.");
-				throw;
-			} finally {
-				Flush();
-			}
-		}
-
-		private void ActOnCommitCheckFailure(IEnvelope envelope, Guid correlationId, CommitCheckResult<TStreamId> result) {
-			switch (result.Decision) {
-				case CommitDecision.WrongExpectedVersion:
-					envelope.ReplyWith(new StorageMessage.WrongExpectedVersion(correlationId, result.CurrentVersion));
-					break;
-				case CommitDecision.Deleted:
-					envelope.ReplyWith(new StorageMessage.StreamDeleted(correlationId));
-					break;
-				case CommitDecision.Idempotent:
-					var eventStreamName = _indexWriter.GetStreamName(result.EventStreamId);
-					envelope.ReplyWith(new StorageMessage.AlreadyCommitted(correlationId,
-						eventStreamName,
-						result.StartEventNumber,
-						result.EndEventNumber,
-						result.IdempotentLogPosition));
-					break;
-				case CommitDecision.CorruptedIdempotency:
-					// in case of corrupted idempotency (part of transaction is ok, other is different)
-					// then we can say that the transaction is not idempotent, so WrongExpectedVersion is ok answer
-					envelope.ReplyWith(new StorageMessage.WrongExpectedVersion(correlationId, result.CurrentVersion));
-					break;
-				case CommitDecision.InvalidTransaction:
-					envelope.ReplyWith(new StorageMessage.InvalidTransaction(correlationId));
-					break;
-				case CommitDecision.IdempotentNotReady:
-					//TODO(clc): when we have the pre-index we should be able to get the logPosition from the pre-index and allow the transaction to wait for the cluster commit
-					//just drop the write and wait for the client to retry
-					Log.Debug("Dropping idempotent write to stream {@stream}, startEventNumber: {@startEventNumber}, endEventNumber: {@endEventNumber} since the original write has not yet been replicated.", result.EventStreamId, result.StartEventNumber, result.EndEventNumber);
-					break;
-				default:
-					throw new ArgumentOutOfRangeException();
-			}
-		}
-
-		private bool TryWritePreparesWithRetry(Span<IPrepareLogRecord<TStreamId>> prepares) {
-			Ensure.Positive(prepares.Length, nameof(prepares.Length));
-
-			if (prepares.Length == 1) {
-				WritePrepareWithRetry(prepares[0]);
-				return true;
-			}
-
-			var prepareSizes = 0;
-			foreach (var prepare in prepares)
-				prepareSizes += prepare.SizeOnDisk;
-
-			if (prepareSizes > Db.Config.ChunkSize) {
-				Log.Error("Transaction size ({prepareSizes:N0}) exceeds chunk size ({chunkSize:N0})",
-					prepareSizes, Db.Config.ChunkSize);
-				return false;
-			}
-
-			if (!Writer.CanWrite(prepareSizes)) {
-				Writer.CompleteChunk();
-				Writer.AddNewChunk();
-				if (!Writer.CanWrite(prepareSizes)) {
-					throw new Exception($"Transaction of size {prepareSizes:N0} cannot be written even after completing a chunk");
-				}
-
-				long logPos = Writer.Position;
-				long transactionPos = default;
-
-				for (int i = 0; i < prepares.Length; i++) {
-					// the prepares may be from different streams due to the stream & event type records
-					// we thus adjust the transaction position to the correct value on each stream id change
-					if (i == 0 || !StreamIdComparer.Equals(prepares[i].EventStreamId, prepares[i - 1].EventStreamId))
-						transactionPos = logPos;
-
-					prepares[i] = prepares[i].CopyForRetry(logPos, transactionPos);
-					logPos += prepares[i].SizeOnDisk;
-				}
-			}
-
-			Writer.OpenTransaction();
-			var writerPos = Writer.Position;
-			foreach (var prepare in prepares)
-			{
-				Writer.WriteToTransaction(prepare, out var newWriterPos);
-				if (newWriterPos - writerPos != prepare.SizeOnDisk)
-					throw new Exception($"Expected writer position to be at: {writerPos + prepare.SizeOnDisk} but it was at {newWriterPos}");
-
-				writerPos = newWriterPos;
-			}
-			Writer.CommitTransaction();
-
-			return true;
-		}
-
-		private WriteResult WritePrepareWithRetry(IPrepareLogRecord<TStreamId> prepare) {
-			long writtenPos = prepare.LogPosition;
-			long newPos;
-			var record = prepare;
-
-			if (!Writer.Write(prepare, out newPos)) {
-				var transactionPos = prepare.TransactionPosition == prepare.LogPosition
-					? newPos
-					: prepare.TransactionPosition;
-
-				record = prepare.CopyForRetry(
-					logPosition: newPos,
-					transactionPosition: transactionPos);
-
-				writtenPos = newPos;
-				if (!Writer.Write(record, out newPos)) {
-					throw new Exception(
-						string.Format("Second write try failed when first writing prepare at {0}, then at {1}.",
-							prepare.LogPosition,
-							writtenPos));
-				}
-			}
-
-			if (StreamIdComparer.Equals(prepare.EventType, _scavengePointEventTypeId) &&
-				StreamIdComparer.Equals(prepare.EventStreamId, _scavengePointsStreamId)) {
-				Writer.CompleteChunk();
-				Writer.AddNewChunk();
-			}
-
-			return new WriteResult(writtenPos, newPos, record);
-		}
-
-		private CommitLogRecord WriteCommitWithRetry(CommitLogRecord commit) {
-			long newPos;
-			if (!Writer.Write(commit, out newPos)) {
-				var transactionPos = commit.TransactionPosition == commit.LogPosition
-					? newPos
-					: commit.TransactionPosition;
-				var record = new CommitLogRecord(newPos,
-					commit.CorrelationId,
-					transactionPos,
-					commit.TimeStamp,
-					commit.FirstEventNumber);
-				long writtenPos = newPos;
-				if (!Writer.Write(record, out newPos)) {
-					throw new Exception(
-						string.Format("Second write try failed when first writing commit at {0}, then at {1}.",
-							commit.LogPosition,
-							writtenPos));
-				}
-
-				return record;
-			}
-
-			return commit;
-		}
-
-		protected bool Flush(bool force = false) {
-			var start = _clock.Now;
-			if (force || FlushMessagesInQueue == 0 || start.ElapsedTicksSince(_lastFlushTimestamp) >= _lastFlushDelay + _minFlushDelay) {
-				var flushSize = Writer.Position - Writer.FlushedPosition;
-
-				Writer.Flush();
-
-				_flushSizeTracker.Record(flushSize);
-				var end = _flushDurationTracker.RecordNow(start);
-
-				var flushDelay = end.ElapsedTicksSince(start);
-
-				Interlocked.Exchange(ref _lastFlushDelay, flushDelay);
-				Interlocked.Exchange(ref _lastFlushSize, flushSize);
-				_lastFlushTimestamp = end;
-
-				if (_statCount >= LastStatsCount) {
-					Interlocked.Add(ref _sumFlushSize, -_lastFlushSizes[_statIndex]);
-					Interlocked.Add(ref _sumFlushDelay, -_lastFlushDelays[_statIndex]);
-				} else {
-					_statCount += 1;
-				}
-
-				_lastFlushSizes[_statIndex] = flushSize;
-				_lastFlushDelays[_statIndex] = flushDelay;
-				Interlocked.Add(ref _sumFlushSize, flushSize);
-				Interlocked.Add(ref _sumFlushDelay, flushDelay);
-				Interlocked.Exchange(ref _maxFlushSize, Math.Max(Interlocked.Read(ref _maxFlushSize), flushSize));
-				Interlocked.Exchange(ref _maxFlushDelay, Math.Max(Interlocked.Read(ref _maxFlushDelay), flushDelay));
-				_statIndex = (_statIndex + 1) & (LastStatsCount - 1);
-
-				PurgeNotProcessedInfo();
-				Bus.Publish(new ReplicationTrackingMessage.WriterCheckpointFlushed());
-				return true;
-			}
-
-			return false;
-		}
-
-		private void PurgeNotProcessedInfo() {
-			_indexWriter.PurgeNotProcessedCommitsTill(Db.Config.ChaserCheckpoint.Read());
-			_indexWriter.PurgeNotProcessedTransactions(Db.Config.WriterCheckpoint.Read());
-		}
-
-		private struct WriteResult {
-			public readonly long WrittenPos;
-			public readonly long NewPos;
-			public readonly IPrepareLogRecord<TStreamId> Prepare;
-
-			public WriteResult(long writtenPos, long newPos, IPrepareLogRecord<TStreamId> prepare) {
-				WrittenPos = writtenPos;
-				NewPos = newPos;
-				Prepare = prepare;
-			}
-		}
-
-		public void Handle(MonitoringMessage.InternalStatsRequest message) {
-			var lastFlushSize = Interlocked.Read(ref _lastFlushSize);
-			var lastFlushDelayMs = Interlocked.Read(ref _lastFlushDelay) / (double)TicksPerMs;
-			var statCount = _statCount;
-			var meanFlushSize = statCount == 0 ? 0 : Interlocked.Read(ref _sumFlushSize) / statCount;
-			var meanFlushDelayMs = statCount == 0
-				? 0
-				: Interlocked.Read(ref _sumFlushDelay) / (double)TicksPerMs / statCount;
-			var maxFlushSize = Interlocked.Read(ref _maxFlushSize);
-			var maxFlushDelayMs = Interlocked.Read(ref _maxFlushDelay) / (double)TicksPerMs;
-			var queuedFlushMessages = FlushMessagesInQueue;
-
-			var stats = new Dictionary<string, object> {
-				{"es-writer-lastFlushSize", new StatMetadata(lastFlushSize, "Writer Last Flush Size")},
-				{"es-writer-lastFlushDelayMs", new StatMetadata(lastFlushDelayMs, "Writer Last Flush Delay, ms")},
-				{"es-writer-meanFlushSize", new StatMetadata(meanFlushSize, "Writer Mean Flush Size")},
-				{"es-writer-meanFlushDelayMs", new StatMetadata(meanFlushDelayMs, "Writer Mean Flush Delay, ms")},
-				{"es-writer-maxFlushSize", new StatMetadata(maxFlushSize, "Writer Max Flush Size")},
-				{"es-writer-maxFlushDelayMs", new StatMetadata(maxFlushDelayMs, "Writer Max Flush Delay, ms")},
-				{"es-writer-queuedFlushMessages", new StatMetadata(queuedFlushMessages, "Writer Queued Flush Message")}
-			};
-
-			message.Envelope.ReplyWith(new MonitoringMessage.InternalStatsRequestResponse(stats));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/SubscriptionsService.cs b/src/EventStore.Core/Services/SubscriptionsService.cs
deleted file mode 100644
index eb0d1a56812..00000000000
--- a/src/EventStore.Core/Services/SubscriptionsService.cs
+++ /dev/null
@@ -1,558 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Storage.InMemory;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Plugins.Authorization;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services {
-	public enum SubscriptionDropReason {
-		Unsubscribed = 0,
-		AccessDenied = 1,
-		NotFound = 2,
-		PersistentSubscriptionDeleted = 3,
-		SubscriberMaxCountReached = 4,
-		StreamDeleted = 5
-	}
-
-	public abstract class SubscriptionsService {
-		public const string AllStreamsSubscriptionId = ""; // empty stream id means subscription to all streams
-		protected static readonly ILogger Log = Serilog.Log.ForContext<SubscriptionsService>();
-	}
-
-	public class SubscriptionsService<TStreamId> :
-		SubscriptionsService,
-		IHandle<SystemMessage.SystemStart>,
-		IHandle<SystemMessage.BecomeShuttingDown>,
-		IHandle<TcpMessage.ConnectionClosed>,
-		IHandle<ClientMessage.SubscribeToStream>,
-		IHandle<ClientMessage.FilteredSubscribeToStream>,
-		IHandle<ClientMessage.UnsubscribeFromStream>,
-		IHandle<SubscriptionMessage.DropSubscription>,
-		IHandle<SubscriptionMessage.PollStream>,
-		IHandle<SubscriptionMessage.CheckPollTimeout>,
-		IHandle<StorageMessage.InMemoryEventCommitted>,
-		IHandle<StorageMessage.EventCommitted> {
-		private const int DontReportCheckpointReached = -1;
-
-		private static readonly TimeSpan TimeoutPeriod = TimeSpan.FromSeconds(1);
-
-		private readonly Dictionary<string, List<Subscription>> _subscriptionTopics =
-			new Dictionary<string, List<Subscription>>();
-
-		private readonly Dictionary<Guid, Subscription> _subscriptionsById = new Dictionary<Guid, Subscription>();
-
-		private readonly Dictionary<string, List<PollSubscription>> _pollTopics =
-			new Dictionary<string, List<PollSubscription>>();
-
-		private long _lastSeenCommitPosition = -1;
-		private long _lastSeenInMemoryCommitPosition = -1;
-
-		private readonly IPublisher _bus;
-		private readonly IEnvelope _busEnvelope;
-		private readonly IQueuedHandler _queuedHandler;
-		private readonly IReadIndex<TStreamId> _readIndex;
-		private readonly IInMemoryStreamReader _inMemReader;
-		private readonly IAuthorizationProvider _authorizationProvider;
-		private static readonly char[] _linkToSeparator = new[] { '@' };
-
-		public SubscriptionsService(
-			IPublisher bus,
-			IQueuedHandler queuedHandler,
-			IAuthorizationProvider authorizationProvider,
-			IReadIndex<TStreamId> readIndex,
-			IInMemoryStreamReader inMemReader) {
-
-			Ensure.NotNull(bus, nameof(bus));
-			Ensure.NotNull(queuedHandler, nameof(queuedHandler));
-			Ensure.NotNull(authorizationProvider, nameof(authorizationProvider));
-			Ensure.NotNull(readIndex, nameof(readIndex));
-			Ensure.NotNull(inMemReader, nameof(inMemReader));
-
-			_bus = bus;
-			_busEnvelope = bus;
-			_queuedHandler = queuedHandler;
-			_authorizationProvider = authorizationProvider;
-			_readIndex = readIndex;
-			_inMemReader = inMemReader;
-		}
-
-		public void Handle(SystemMessage.SystemStart message) {
-			_bus.Publish(TimerMessage.Schedule.Create(TimeoutPeriod, _busEnvelope,
-				new SubscriptionMessage.CheckPollTimeout()));
-		}
-
-		/* SUBSCRIPTION SECTION */
-		public void Handle(SystemMessage.BecomeShuttingDown message) {
-			List<Subscription> subscriptions = _subscriptionsById.Values.ToList();
-			foreach (var subscription in subscriptions) {
-				DropSubscription(subscription, SubscriptionDropReason.Unsubscribed, sendDropNotification: true);
-			}
-
-			_queuedHandler.RequestStop();
-		}
-
-		public void Handle(TcpMessage.ConnectionClosed message) {
-			List<string> subscriptionGroupsToRemove = null;
-			foreach (var subscriptionGroup in _subscriptionTopics) {
-				var subscriptions = subscriptionGroup.Value;
-				for (int i = 0, n = subscriptions.Count; i < n; ++i) {
-					if (subscriptions[i].ConnectionId == message.Connection.ConnectionId)
-						_subscriptionsById.Remove(subscriptions[i].CorrelationId);
-				}
-
-				subscriptions.RemoveAll(x => x.ConnectionId == message.Connection.ConnectionId);
-				if (subscriptions.Count == 0) // schedule removal of list instance
-				{
-					if (subscriptionGroupsToRemove == null)
-						subscriptionGroupsToRemove = new List<string>();
-					subscriptionGroupsToRemove.Add(subscriptionGroup.Key);
-				}
-			}
-
-			if (subscriptionGroupsToRemove != null) {
-				for (int i = 0, n = subscriptionGroupsToRemove.Count; i < n; ++i) {
-					_subscriptionTopics.Remove(subscriptionGroupsToRemove[i]);
-				}
-			}
-		}
-
-		public void Handle(ClientMessage.SubscribeToStream msg) {
-			var isInMemoryStream = SystemStreams.IsInMemoryStream(msg.EventStreamId);
-
-			long? lastEventNumber = null;
-			if (isInMemoryStream) {
-				var readMsg = new ClientMessage.ReadStreamEventsBackward(
-					internalCorrId: Guid.NewGuid(),
-					correlationId: msg.CorrelationId,
-					envelope: new NoopEnvelope(),
-					eventStreamId: msg.EventStreamId,
-					fromEventNumber: -1,
-					maxCount: 1,
-					resolveLinkTos: false,
-					requireLeader: false,
-					validationStreamVersion: null,
-					user: SystemAccounts.System);
-
-				var readResult = _inMemReader.ReadBackwards(readMsg);
-				lastEventNumber = readResult.LastEventNumber;
-			} else if (!msg.EventStreamId.IsEmptyString()) {
-				lastEventNumber = _readIndex.GetStreamLastEventNumber(_readIndex.GetStreamId(msg.EventStreamId));
-			}
-
-			if (lastEventNumber == EventNumber.DeletedStream) {
-				msg.Envelope.ReplyWith(
-					new ClientMessage.SubscriptionDropped(Guid.Empty, SubscriptionDropReason.StreamDeleted));
-				return;
-			}
-
-			var lastIndexedPos = isInMemoryStream ? -1 : _readIndex.LastIndexedPosition;
-
-			SubscribeToStream(msg.CorrelationId, msg.Envelope, msg.ConnectionId, msg.EventStreamId,
-				msg.ResolveLinkTos, lastIndexedPos, lastEventNumber,
-				msg.User,
-				msg.EventStreamId.IsEmptyString() ? EventFilter.DefaultAllFilter : EventFilter.DefaultStreamFilter);
-
-			var subscribedMessage =
-				new ClientMessage.SubscriptionConfirmation(msg.CorrelationId, lastIndexedPos, lastEventNumber);
-			msg.Envelope.ReplyWith(subscribedMessage);
-		}
-
-		public void Handle(ClientMessage.FilteredSubscribeToStream msg) {
-			var isInMemoryStream = SystemStreams.IsInMemoryStream(msg.EventStreamId);
-
-			long? lastEventNumber = null;
-			if (isInMemoryStream) {
-				lastEventNumber = -1;
-			} else if (!msg.EventStreamId.IsEmptyString()) {
-				lastEventNumber = _readIndex.GetStreamLastEventNumber(_readIndex.GetStreamId(msg.EventStreamId));
-			}
-
-			var lastIndexedPos = isInMemoryStream ? -1 : _readIndex.LastIndexedPosition;
-
-			SubscribeToStream(msg.CorrelationId, msg.Envelope, msg.ConnectionId, msg.EventStreamId,
-				msg.ResolveLinkTos, lastIndexedPos, lastEventNumber, msg.User, msg.EventFilter,
-				msg.CheckpointInterval, msg.CheckpointIntervalCurrent);
-			var subscribedMessage =
-				new ClientMessage.SubscriptionConfirmation(msg.CorrelationId, lastIndexedPos, lastEventNumber);
-			msg.Envelope.ReplyWith(subscribedMessage);
-
-		}
-
-		public void Handle(ClientMessage.UnsubscribeFromStream message) {
-			DropSubscription(message.CorrelationId, SubscriptionDropReason.Unsubscribed);
-		}
-
-		public void Handle(SubscriptionMessage.DropSubscription message) {
-			DropSubscription(message.SubscriptionId, message.DropReason);
-		}
-
-		private void SubscribeToStream(Guid correlationId, IEnvelope envelope, Guid connectionId,
-			string eventStreamId, bool resolveLinkTos, long lastIndexedPosition, long? lastEventNumber,
-			ClaimsPrincipal user,
-			IEventFilter eventFilter, int? checkpointInterval = null, int checkpointIntervalCurrent = 0) {
-			List<Subscription> subscribers;
-			if (!_subscriptionTopics.TryGetValue(eventStreamId, out subscribers)) {
-				subscribers = new List<Subscription>();
-				_subscriptionTopics.Add(eventStreamId, subscribers);
-			}
-
-			// if eventStreamId is null or empty -- subscription is to all streams
-			var subscription = new Subscription(correlationId,
-				envelope,
-				connectionId,
-				eventStreamId.IsEmptyString() ? AllStreamsSubscriptionId : eventStreamId,
-				resolveLinkTos,
-				lastIndexedPosition,
-				lastEventNumber ?? -1,
-				user,
-				eventFilter,
-				checkpointInterval,
-				checkpointIntervalCurrent);
-			subscribers.Add(subscription);
-			_subscriptionsById[correlationId] = subscription;
-		}
-
-		private void DropSubscription(Guid subscriptionId, SubscriptionDropReason dropReason) {
-			Subscription subscription;
-			if (_subscriptionsById.TryGetValue(subscriptionId, out subscription))
-				DropSubscription(subscription, dropReason, sendDropNotification: true);
-		}
-
-		private void DropSubscription(Subscription subscription, SubscriptionDropReason dropReason, bool sendDropNotification) {
-			if (sendDropNotification)
-				subscription.Envelope.ReplyWith(
-					new ClientMessage.SubscriptionDropped(subscription.CorrelationId, dropReason));
-
-			List<Subscription> subscriptions;
-			if (_subscriptionTopics.TryGetValue(subscription.EventStreamId, out subscriptions)) {
-				subscriptions.Remove(subscription);
-				if (subscriptions.Count == 0)
-					_subscriptionTopics.Remove(subscription.EventStreamId);
-			}
-
-			_subscriptionsById.Remove(subscription.CorrelationId);
-		}
-
-		/* LONG POLL SECTION */
-		public void Handle(SubscriptionMessage.PollStream message) {
-			if (MissedEvents(message.StreamId, message.LastIndexedPosition, message.LastEventNumber)) {
-				_bus.Publish(CloneReadRequestWithNoPollFlag(message.OriginalRequest));
-				return;
-			}
-
-			SubscribePoller(message.StreamId, message.ExpireAt, message.LastIndexedPosition, message.LastEventNumber,
-				message.OriginalRequest);
-		}
-
-		private bool MissedEvents(string streamId, long lastIndexedPosition, long? lastEventNumber) {
-			return SystemStreams.IsInMemoryStream(streamId)
-				? _lastSeenInMemoryCommitPosition > lastIndexedPosition
-				: _lastSeenCommitPosition > lastIndexedPosition;
-		}
-
-		private void SubscribePoller(string streamId, DateTime expireAt, long lastIndexedPosition, long? lastEventNumber,
-			Message originalRequest) {
-			List<PollSubscription> pollTopic;
-			if (!_pollTopics.TryGetValue(streamId, out pollTopic)) {
-				pollTopic = new List<PollSubscription>();
-				_pollTopics.Add(streamId, pollTopic);
-			}
-
-			pollTopic.Add(new PollSubscription(expireAt, lastIndexedPosition, lastEventNumber ?? -1, originalRequest));
-		}
-
-		public void Handle(SubscriptionMessage.CheckPollTimeout message) {
-			List<string> pollTopicsToRemove = null;
-			var now = DateTime.UtcNow;
-			foreach (var pollTopicKeyVal in _pollTopics) {
-				var pollTopic = pollTopicKeyVal.Value;
-				for (int i = pollTopic.Count - 1; i >= 0; --i) {
-					var poller = pollTopic[i];
-					if (poller.ExpireAt <= now) {
-						_bus.Publish(CloneReadRequestWithNoPollFlag(poller.OriginalRequest));
-						pollTopic.RemoveAt(i);
-
-						if (pollTopic.Count == 0) // schedule removal of list instance
-						{
-							if (pollTopicsToRemove == null)
-								pollTopicsToRemove = new List<string>();
-							pollTopicsToRemove.Add(pollTopicKeyVal.Key);
-						}
-					}
-				}
-			}
-
-			if (pollTopicsToRemove != null) {
-				for (int i = 0, n = pollTopicsToRemove.Count; i < n; ++i) {
-					_pollTopics.Remove(pollTopicsToRemove[i]);
-				}
-			}
-
-			_bus.Publish(TimerMessage.Schedule.Create(TimeSpan.FromSeconds(1), _busEnvelope, message));
-		}
-
-		private Message CloneReadRequestWithNoPollFlag(Message originalRequest) {
-			var streamReq = originalRequest as ClientMessage.ReadStreamEventsForward;
-			if (streamReq != null)
-				return new ClientMessage.ReadStreamEventsForward(
-					streamReq.InternalCorrId, streamReq.CorrelationId, streamReq.Envelope,
-					streamReq.EventStreamId, streamReq.FromEventNumber, streamReq.MaxCount, streamReq.ResolveLinkTos,
-					streamReq.RequireLeader, streamReq.ValidationStreamVersion, streamReq.User,
-					replyOnExpired: streamReq.ReplyOnExpired);
-
-			var allReq = originalRequest as ClientMessage.ReadAllEventsForward;
-			if (allReq != null)
-				return new ClientMessage.ReadAllEventsForward(
-					allReq.InternalCorrId, allReq.CorrelationId, allReq.Envelope,
-					allReq.CommitPosition, allReq.PreparePosition, allReq.MaxCount, allReq.ResolveLinkTos,
-					allReq.RequireLeader, allReq.ValidationTfLastCommitPosition, allReq.User,
-					replyOnExpired: allReq.ReplyOnExpired);
-
-			throw new Exception(string.Format("Unexpected read request of type {0} for long polling: {1}.",
-				originalRequest.GetType(), originalRequest));
-		}
-
-		public void Handle(StorageMessage.EventCommitted message) {
-			_lastSeenCommitPosition = message.CommitPosition;
-
-			var resolvedEvent =
-				ProcessEventCommited(AllStreamsSubscriptionId, message.CommitPosition, message.Event, null);
-			ProcessEventCommited(message.Event.EventStreamId, message.CommitPosition, message.Event, resolvedEvent);
-
-			ProcessStreamMetadataChanges(message.Event.EventStreamId);
-			ProcessSettingsStreamChanges(message.Event.EventStreamId);
-
-			ReissueReadsFor(AllStreamsSubscriptionId, message.CommitPosition, message.Event.EventNumber);
-			ReissueReadsFor(message.Event.EventStreamId, message.CommitPosition, message.Event.EventNumber);
-		}
-
-		public void Handle(StorageMessage.InMemoryEventCommitted message) {
-			_lastSeenInMemoryCommitPosition = message.CommitPosition;
-			ProcessEventCommited(message.Event.EventStreamId, message.CommitPosition, message.Event, null);
-			ProcessStreamMetadataChanges(message.Event.EventStreamId);
-			ProcessSettingsStreamChanges(message.Event.EventStreamId);
-			ReissueReadsFor(message.Event.EventStreamId, message.CommitPosition, message.Event.EventNumber);
-		}
-
-		private ResolvedEvent? ProcessEventCommited(
-			string eventStreamId, long commitPosition, EventRecord evnt, ResolvedEvent? resolvedEvent) {
-			List<Subscription> subscriptions;
-			if (!_subscriptionTopics.TryGetValue(eventStreamId, out subscriptions))
-				return resolvedEvent;
-			for (int i = 0, n = subscriptions.Count; i < n; i++) {
-				var subscr = subscriptions[i];
-				if (commitPosition <= subscr.LastIndexedPosition || evnt.EventNumber <= subscr.LastEventNumber)
-					continue;
-
-				var pair = ResolvedEvent.ForUnresolvedEvent(evnt, commitPosition);
-				if (subscr.ResolveLinkTos)
-					// resolve event if has not been previously resolved
-					resolvedEvent = pair = resolvedEvent ?? ResolveLinkToEvent(evnt, commitPosition);
-
-				if (subscr.EventFilter.IsEventAllowed(evnt)) {
-					subscr.Envelope.ReplyWith(new ClientMessage.StreamEventAppeared(subscr.CorrelationId, pair));
-				}
-
-				if (subscr.CheckpointInterval == DontReportCheckpointReached)
-					continue;
-
-				subscr.CheckpointIntervalCurrent++;
-
-				if (subscr.CheckpointInterval != null &&
-					subscr.CheckpointIntervalCurrent >= subscr.CheckpointInterval) {
-					subscr.Envelope.ReplyWith(new ClientMessage.CheckpointReached(subscr.CorrelationId,
-						pair.OriginalPosition));
-					subscr.CheckpointIntervalCurrent = 0;
-				}
-			}
-
-			return resolvedEvent;
-		}
-
-		private void ProcessStreamMetadataChanges(string eventStreamId) {
-			if (!SystemStreams.IsMetastream(eventStreamId))
-				return;
-
-			eventStreamId = SystemStreams.OriginalStreamOf(eventStreamId);
-
-			if (eventStreamId == SystemStreams.AllStream)
-				eventStreamId = string.Empty;
-
-			if (!_subscriptionTopics.TryGetValue(eventStreamId, out var subscriptions))
-				return;
-
-			foreach (var subscription in subscriptions.ToArray())
-				Authorize(subscription);
-		}
-
-		private void ProcessSettingsStreamChanges(string eventStreamId) {
-			if (eventStreamId != SystemStreams.SettingsStream)
-				return;
-
-			foreach (var subscriptions in _subscriptionTopics.Values) {
-				foreach (var subscription in subscriptions.ToArray())
-					Authorize(subscription);
-			}
-		}
-
-		private void Authorize(Subscription subscription) {
-			try {
-				var streamId = Operations.Streams.Parameters.StreamId(subscription.EventStreamId);
-				var op = new Operation(Operations.Streams.Read).WithParameter(streamId);
-
-				var accessChk = _authorizationProvider.CheckAccessAsync(subscription.User, op, CancellationToken.None);
-
-				if (accessChk.IsCompleted)
-					AuthorizeSync();
-				else
-					_ = AuthorizeAsync();
-
-				void AuthorizeSync() {
-					if (accessChk.Result)
-						return;
-
-					LogSubscriptionDrop();
-					DropSubscription(subscription, SubscriptionDropReason.AccessDenied, sendDropNotification: true);
-				}
-
-				async Task AuthorizeAsync() {
-					// note: when authorizing asynchronously, a few live events may go through before the "Access Denied" message is sent to the subscription
-					if (await accessChk)
-						return;
-
-					LogSubscriptionDrop();
-					// we go through the queue to avoid the need for any lock
-					_bus.Publish(new SubscriptionMessage.DropSubscription(subscription.CorrelationId, SubscriptionDropReason.AccessDenied));
-				}
-			} catch (Exception ex) {
-				LogException(ex);
-			}
-
-			void LogSubscriptionDrop() {
-				Log.Debug(
-					"Dropping live subscription to stream: {streamId} (Connection ID: {connectionId}) following new stream metadata.",
-					subscription.EventStreamId, subscription.ConnectionId);
-			}
-
-			void LogException(Exception ex) {
-				Log.Error(ex, "Failed to check access for live subscription to stream: {streamId} (Connection ID: {connectionId}) following new stream metadata. Live subscription will continue to run.",
-					subscription.EventStreamId, subscription.ConnectionId);
-			}
-		}
-
-		private ResolvedEvent ResolveLinkToEvent(EventRecord eventRecord, long commitPosition) {
-			if (eventRecord.EventType == SystemEventTypes.LinkTo) {
-				try {
-					string[] parts = Helper.UTF8NoBom.GetString(eventRecord.Data.Span).Split(_linkToSeparator, 2);
-					long eventNumber = long.Parse(parts[0]);
-					string streamName = parts[1];
-					var streamId = _readIndex.GetStreamId(streamName);
-					var res = _readIndex.ReadEvent(streamName, streamId, eventNumber);
-
-					if (res.Result == ReadEventResult.Success)
-						return ResolvedEvent.ForResolvedLink(res.Record, eventRecord, commitPosition);
-
-					return ResolvedEvent.ForFailedResolvedLink(eventRecord, res.Result, commitPosition);
-				} catch (Exception exc) {
-					Log.Error(exc, "Error while resolving link for event record: {eventRecord}",
-						eventRecord.ToString());
-				}
-
-				// return unresolved link
-				return ResolvedEvent.ForFailedResolvedLink(eventRecord, ReadEventResult.Error, commitPosition);
-			}
-
-			return ResolvedEvent.ForUnresolvedEvent(eventRecord, commitPosition);
-		}
-
-		private void ReissueReadsFor(string streamId, long commitPosition, long eventNumber) {
-			List<PollSubscription> pollTopic;
-			if (_pollTopics.TryGetValue(streamId, out pollTopic)) {
-				List<PollSubscription> survivors = null;
-				foreach (var poller in pollTopic) {
-					if (commitPosition <= poller.LastIndexedPosition || eventNumber <= poller.LastEventNumber) {
-						if (survivors == null)
-							survivors = new List<PollSubscription>();
-						survivors.Add(poller);
-					} else {
-						_bus.Publish(CloneReadRequestWithNoPollFlag(poller.OriginalRequest));
-					}
-				}
-
-				_pollTopics.Remove(streamId);
-				if (survivors != null)
-					_pollTopics.Add(streamId, survivors);
-			}
-		}
-
-		private class Subscription {
-			public readonly Guid CorrelationId;
-			public readonly IEnvelope Envelope;
-			public readonly Guid ConnectionId;
-
-			public readonly string EventStreamId;
-			public readonly bool ResolveLinkTos;
-			public readonly long LastIndexedPosition;
-			public readonly long LastEventNumber;
-			public readonly ClaimsPrincipal User;
-			public readonly IEventFilter EventFilter;
-			public readonly int? CheckpointInterval;
-
-			public int CheckpointIntervalCurrent = 0;
-
-			public Subscription(Guid correlationId,
-				IEnvelope envelope,
-				Guid connectionId,
-				string eventStreamId,
-				bool resolveLinkTos,
-				long lastIndexedPosition,
-				long lastEventNumber,
-				ClaimsPrincipal user,
-				IEventFilter eventFilter,
-				int? checkpointInterval,
-				int checkpointIntervalCurrent) {
-				CorrelationId = correlationId;
-				Envelope = envelope;
-				ConnectionId = connectionId;
-
-				EventStreamId = eventStreamId;
-				ResolveLinkTos = resolveLinkTos;
-				LastIndexedPosition = lastIndexedPosition;
-				LastEventNumber = lastEventNumber;
-				User = user;
-
-				EventFilter = eventFilter;
-				CheckpointInterval = checkpointInterval;
-				CheckpointIntervalCurrent = checkpointInterval == null ? 0 : checkpointIntervalCurrent;
-			}
-		}
-
-		private class PollSubscription {
-			public readonly DateTime ExpireAt;
-			public readonly long LastIndexedPosition;
-			public readonly long LastEventNumber;
-
-			public readonly Message OriginalRequest;
-
-			public PollSubscription(DateTime expireAt, long lastIndexedPosition, long lastEventNumber,
-				Message originalRequest) {
-				ExpireAt = expireAt;
-				LastIndexedPosition = lastIndexedPosition;
-				LastEventNumber = lastEventNumber;
-				OriginalRequest = originalRequest;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/SystemNames.cs b/src/EventStore.Core/Services/SystemNames.cs
deleted file mode 100644
index 6b3f396aa0a..00000000000
--- a/src/EventStore.Core/Services/SystemNames.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.Services {
-	public static class SystemHeaders {
-		public const string ExpectedVersion = "ES-ExpectedVersion";
-		public const string RequireLeader = "ES-RequireLeader";
-		public const string RequireMaster = "ES-RequireMaster"; // For backwards compatibility
-		public const string ResolveLinkTos = "ES-ResolveLinkTos";
-		public const string LongPoll = "ES-LongPoll";
-		public const string TrustedAuth = "ES-TrustedAuth";
-		public const string ProjectionPosition = "ES-Position";
-		public const string HardDelete = "ES-HardDelete";
-		public const string EventId = "ES-EventId";
-		public const string EventType = "ES-EventType";
-		public const string CurrentVersion = "ES-CurrentVersion";
-	}
-
-	public static class SystemStreams {
-		public const string PersistentSubscriptionConfig = "$persistentSubscriptionConfig";
-		public const string AllStream = "$all";
-		public const string EventTypesStream = "$event-types";
-		public const string StreamsStream = "$streams";
-		public const string StreamsCreatedStream = "$streams-created";
-		public const string SettingsStream = "$settings";
-		public const string StatsStreamPrefix = "$stats";
-		public const string ScavengesStream = "$scavenges";
-		public const string EpochInformationStream = "$epoch-information";
-		public const string ScavengePointsStream = "$scavengePoints";
-
-		// mem streams
-		public const string NodeStateStream = "$mem-node-state";
-		public const string GossipStream = "$mem-gossip";
-
-		public static bool IsSystemStream(string streamId) {
-			return streamId.Length != 0 && streamId[0] == '$';
-		}
-
-		public static string MetastreamOf(string streamId) {
-			return "$$" + streamId;
-		}
-
-		public static bool IsMetastream(string streamId) {
-			return streamId.Length >= 2 && streamId[0] == '$' && streamId[1] == '$';
-		}
-
-		public static string OriginalStreamOf(string metastreamId) {
-			return metastreamId.Substring(2);
-		}
-
-		public static bool IsInMemoryStream(string streamId) {
-			return streamId.StartsWith("$mem-");
-		}
-	}
-
-	public static class SystemMetadata {
-		public const string MaxAge = "$maxAge";
-		public const string MaxCount = "$maxCount";
-		public const string TruncateBefore = "$tb";
-		public const string TempStream = "$tmp";
-		public const string CacheControl = "$cacheControl";
-
-		public const string Acl = "$acl";
-		public const string AclRead = "$r";
-		public const string AclWrite = "$w";
-		public const string AclDelete = "$d";
-		public const string AclMetaRead = "$mr";
-		public const string AclMetaWrite = "$mw";
-
-		public const string UserStreamAcl = "$userStreamAcl";
-		public const string SystemStreamAcl = "$systemStreamAcl";
-	}
-
-	public static class SystemEventTypes {
-		private static readonly char[] _linkToSeparator = new[] {'@'};
-		public const string StreamDeleted = "$streamDeleted";
-		public const string StatsCollection = "$statsCollected";
-		public const string LinkTo = "$>";
-		public const string StreamReference = "$@";
-		public const string StreamMetadata = "$metadata";
-		public const string Settings = "$settings";
-		public const string StreamCreated = "$stream";
-		public const string EpochInformation = "$epoch-information";
-
-		public const string V2__StreamCreated_InIndex = "StreamCreated";
-		public const string V1__StreamCreated__ = "$stream-created";
-		public const string V1__StreamCreatedImplicit__ = "$stream-created-implicit";
-
-		public const string ScavengeStarted = "$scavengeStarted";
-		public const string ScavengeCompleted = "$scavengeCompleted";
-		public const string ScavengeChunksCompleted = "$scavengeChunksCompleted";
-		public const string ScavengeMergeCompleted = "$scavengeMergeCompleted";
-		public const string ScavengeIndexCompleted = "$scavengeIndexCompleted";
-		public const string EmptyEventType = "";
-		public const string EventTypeDefined = "$event-type";
-		public const string ScavengePoint = "$scavengePoint";
-
-		public static string StreamReferenceEventToStreamId(string eventType, ReadOnlyMemory<byte> data) {
-			string streamId = null;
-			switch (eventType) {
-				case LinkTo: {
-					string[] parts = Helper.UTF8NoBom.GetString(data.Span).Split(_linkToSeparator, 2);
-					streamId = parts[1];
-					break;
-				}
-				case StreamReference:
-				case V1__StreamCreated__:
-				case V2__StreamCreated_InIndex: {
-					streamId = Helper.UTF8NoBom.GetString(data.Span);
-					break;
-				}
-				default:
-					throw new NotSupportedException("Unknown event type: " + eventType);
-			}
-
-			return streamId;
-		}
-
-		public static string StreamReferenceEventToStreamId(string eventType, string data) {
-			string streamId = null;
-			switch (eventType) {
-				case LinkTo: {
-					string[] parts = data.Split(_linkToSeparator, 2);
-					streamId = parts[1];
-					break;
-				}
-				case StreamReference:
-				case V1__StreamCreated__:
-				case V2__StreamCreated_InIndex: {
-					streamId = data;
-					break;
-				}
-				default:
-					throw new NotSupportedException("Unknown event type: " + eventType);
-			}
-
-			return streamId;
-		}
-
-		public static long EventLinkToEventNumber(string link) {
-			string[] parts = link.Split(_linkToSeparator, 2);
-			return long.Parse(parts[0]);
-		}
-	}
-
-	public static class SystemRoles {
-		public const string Admins = "$admins";
-		public const string Operations = "$ops";
-		public const string All = "$all";
-	}
-
-	/// <summary>
-	/// System supported consumer strategies for use with persistent subscriptions.
-	/// </summary>
-	public static class SystemConsumerStrategies {
-		/// <summary>
-		/// Distributes events to a single client until it is full. Then round robin to the next client.
-		/// </summary>
-		public const string DispatchToSingle = "DispatchToSingle";
-
-		/// <summary>
-		/// Distribute events to each client in a round robin fashion.
-		/// </summary>
-		public const string RoundRobin = "RoundRobin";
-
-		/// <summary>
-		/// Distribute events of the same streamId to the same client until it disconnects on a best efforts basis. 
-		/// Designed to be used with indexes such as the category projection.
-		/// </summary>
-		public const string Pinned = "Pinned";
-
-		/// <summary>
-		/// Distribute events of the same correlationId to the same client until it disconnects on a best efforts basis. 
-		/// </summary>
-		public const string PinnedByCorrelation = "PinnedByCorrelation";
-	}
-}
diff --git a/src/EventStore.Core/Services/SystemUsers.cs b/src/EventStore.Core/Services/SystemUsers.cs
deleted file mode 100644
index f1445df015d..00000000000
--- a/src/EventStore.Core/Services/SystemUsers.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace EventStore.Core.Services
-{
-	public static class SystemUsers {
-		public const string Admin = "admin";
-		public const string Operations = "ops";
-		public const string DefaultAdminPassword = "changeit";
-		public const string DefaultOpsPassword = "changeit";
-	}
-}
diff --git a/src/EventStore.Core/Services/TcpSendService.cs b/src/EventStore.Core/Services/TcpSendService.cs
deleted file mode 100644
index 72c97e1e6b4..00000000000
--- a/src/EventStore.Core/Services/TcpSendService.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-
-namespace EventStore.Core.Services {
-	public class TcpSendService : IHandle<TcpMessage.TcpSend> {
-		public void Handle(TcpMessage.TcpSend message) {
-			// todo: histogram metric?
-			message.ConnectionManager.SendMessage(message.Message);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/TimerService/IScheduler.cs b/src/EventStore.Core/Services/TimerService/IScheduler.cs
deleted file mode 100644
index 42bc0e1393c..00000000000
--- a/src/EventStore.Core/Services/TimerService/IScheduler.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace EventStore.Core.Services.TimerService {
-	public interface IScheduler : IDisposable {
-		void Stop();
-		void Schedule(TimeSpan after, Action<IScheduler, object> callback, object state);
-	}
-}
diff --git a/src/EventStore.Core/Services/TimerService/ITimeProvider.cs b/src/EventStore.Core/Services/TimerService/ITimeProvider.cs
deleted file mode 100644
index e91543224dc..00000000000
--- a/src/EventStore.Core/Services/TimerService/ITimeProvider.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace EventStore.Core.Services.TimerService {
-	public interface ITimeProvider {
-		DateTime UtcNow { get; }
-		DateTime LocalTime { get; }
-	}
-}
diff --git a/src/EventStore.Core/Services/TimerService/ITimer.cs b/src/EventStore.Core/Services/TimerService/ITimer.cs
deleted file mode 100644
index 66c1e61d463..00000000000
--- a/src/EventStore.Core/Services/TimerService/ITimer.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System;
-
-namespace EventStore.Core.Services.TimerService {
-	public interface ITimer : IDisposable {
-		void FireIn(int milliseconds, Action callback);
-	}
-}
diff --git a/src/EventStore.Core/Services/TimerService/RealTimeProvider.cs b/src/EventStore.Core/Services/TimerService/RealTimeProvider.cs
deleted file mode 100644
index 3f15cd73d8c..00000000000
--- a/src/EventStore.Core/Services/TimerService/RealTimeProvider.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-
-namespace EventStore.Core.Services.TimerService {
-	public class RealTimeProvider : ITimeProvider {
-		public DateTime UtcNow {
-			get { return DateTime.UtcNow; }
-		}
-		
-		public DateTime LocalTime {
-			get { return DateTime.Now; }
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/TimerService/RealTimer.cs b/src/EventStore.Core/Services/TimerService/RealTimer.cs
deleted file mode 100644
index 30d91a3bf30..00000000000
--- a/src/EventStore.Core/Services/TimerService/RealTimer.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Threading;
-
-namespace EventStore.Core.Services.TimerService {
-	public class RealTimer : ITimer {
-		private Action _callback;
-		private readonly Timer _timer;
-
-		public RealTimer() {
-			_timer = new Timer(InvokeCallback, null, Timeout.Infinite, Timeout.Infinite);
-		}
-
-		private void InvokeCallback(object state) {
-			if (_callback != null)
-				_callback();
-		}
-
-		public void FireIn(int milliseconds, Action callback) {
-			_callback = callback;
-			var dueTime = milliseconds == Timeout.Infinite ? Timeout.Infinite : Math.Max(0, milliseconds);
-			_timer.Change(dueTime, Timeout.Infinite);
-		}
-
-		public void Dispose() {
-			_timer.Dispose();
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/TimerService/ThreadBasedScheduler.cs b/src/EventStore.Core/Services/TimerService/ThreadBasedScheduler.cs
deleted file mode 100644
index 0ce1777a94c..00000000000
--- a/src/EventStore.Core/Services/TimerService/ThreadBasedScheduler.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.DataStructures;
-using EventStore.Core.Time;
-using EventStore.Core.Services.Monitoring.Stats;
-using System.Threading.Tasks;
-using EventStore.Core.Metrics;
-using Serilog;
-
-namespace EventStore.Core.Services.TimerService {
-	public sealed class ThreadBasedScheduler : IMonitoredQueue, IScheduler {
-		private static readonly ILogger Log = Serilog.Log.ForContext<ThreadBasedScheduler>();
-		public string Name {
-			get { return _queueStats.Name; }
-		}
-
-		private readonly ConcurrentQueueWrapper<ScheduledTask> _pending = new ConcurrentQueueWrapper<ScheduledTask>();
-		private readonly ManualResetEventSlim _pendingEvent = new ManualResetEventSlim(false);
-
-		private readonly PairingHeap<ScheduledTask> _tasks =
-			new PairingHeap<ScheduledTask>((x, y) => x.DueTime < y.DueTime);
-
-		private readonly IClock _timeProvider;
-
-		private volatile bool _stop;
-
-		private readonly QueueStatsCollector _queueStats;
-		private readonly QueueTracker _tracker;
-		private readonly TaskCompletionSource<object> _tcs = new TaskCompletionSource<object>();
-
-		private long _nextWakeupTimeTicks = long.MinValue;
-
-		public Task Task {
-			get { return _tcs.Task; }
-		}
-
-		public ThreadBasedScheduler(
-			QueueStatsManager queueStatsManager,
-			QueueTrackers trackers,
-			IClock timeProvider = null) {
-			_timeProvider = timeProvider ?? Clock.Instance;
-			_queueStats = queueStatsManager.CreateQueueStatsCollector("Timer");
-			_tracker = trackers.GetTrackerForQueue("Timer");
-
-			new Thread(DoTiming) {
-				IsBackground = true,
-				Name = Name
-			}.Start();
-		}
-
-		public void Stop() {
-			Dispose();
-		}
-
-		public void Schedule(TimeSpan after, Action<IScheduler, object> callback, object state) {
-			var nextWakeup = Interlocked.Read(ref _nextWakeupTimeTicks);
-			var now = _timeProvider.Now;
-
-			var dueTime = now.Add(after);
-			_pending.Enqueue(new ScheduledTask(dueTime, callback, state));
-
-			// don't unnecessarily wake up the timer thread if it's going to wake up before this task's due time anyway
-			if (nextWakeup < now.Ticks || nextWakeup > dueTime.Ticks)
-				_pendingEvent.Set();
-		}
-
-		private void DoTiming() {
-			_queueStats.Start();
-			QueueMonitor.Default.Register(this);
-
-			var minTimeout = TimeSpan.FromMilliseconds(1);
-			var maxTimeout = TimeSpan.FromSeconds(5);
-
-			while (!_stop) {
-				try {
-					_queueStats.EnterBusy();
-					_queueStats.ProcessingStarted<SchedulePendingTasks>(_pending.Count);
-
-					_pendingEvent.Reset();
-
-					int pending = 0;
-					while (_pending.TryDequeue(out var task)) {
-						_tasks.Add(task);
-						pending += 1;
-					}
-
-					_queueStats.ProcessingEnded(pending);
-
-					_queueStats.ProcessingStarted<ExecuteScheduledTasks>(_tasks.Count);
-					int processed = 0;
-
-					Instant? nextTaskDueTime;
-					while (true) {
-						if (_tasks.Count == 0) {
-							nextTaskDueTime = null;
-							break;
-						}
-
-						nextTaskDueTime = _tasks.FindMin().DueTime;
-						if (nextTaskDueTime > _timeProvider.Now)
-							break;
-
-						processed += 1;
-						var scheduledTask = _tasks.DeleteMin();
-						var now = _tracker.RecordMessageDequeued(enqueuedAt: scheduledTask.DueTime);
-						scheduledTask.Action(this, scheduledTask.State);
-						var label = (scheduledTask.State as TimerMessage.Schedule)?.ReplyMessage.Label;
-						_tracker.RecordMessageProcessed(now, label ?? "");
-					}
-
-					_queueStats.ProcessingEnded(processed);
-
-					if (processed == 0 && !_pendingEvent.IsSet) {
-						_queueStats.EnterIdle();
-
-						// give some processor time to other threads since we're free right now
-						Thread.Yield();
-
-						var timeout = nextTaskDueTime?.ElapsedTimeSince(_timeProvider.Now) ?? maxTimeout;
-
-						if (timeout <= TimeSpan.Zero)
-							// we have already reached the due time of the next task, so we process it immediately
-							continue;
-
-						timeout = new TimeSpan(Math.Clamp(timeout.Ticks, minTimeout.Ticks, maxTimeout.Ticks));
-						Interlocked.Exchange(ref _nextWakeupTimeTicks, _timeProvider.Now.Add(timeout).Ticks);
-						_pendingEvent.Wait(timeout);
-					}
-
-				} catch (Exception ex) {
-					Log.Error(ex, "Error executing scheduled task");
-					_tcs.TrySetException(ex);
-				}
-			}
-
-			_queueStats.Stop();
-			QueueMonitor.Default.Unregister(this);
-			_pendingEvent.Dispose();
-		}
-
-		public void Dispose() {
-			_stop = true;
-		}
-
-		public QueueStats GetStatistics() {
-			return _queueStats.GetStatistics(_tasks.Count);
-		}
-
-		private struct ScheduledTask {
-			public readonly Instant DueTime;
-			public readonly Action<IScheduler, object> Action;
-			public readonly object State;
-
-			public ScheduledTask(Instant dueTime, Action<IScheduler, object> action, object state) {
-				DueTime = dueTime;
-				Action = action;
-				State = state;
-			}
-		}
-
-		private class SchedulePendingTasks;
-
-		private class ExecuteScheduledTasks;
-	}
-}
diff --git a/src/EventStore.Core/Services/TimerService/TimerBasedScheduler.cs b/src/EventStore.Core/Services/TimerService/TimerBasedScheduler.cs
deleted file mode 100644
index 3dc7c388263..00000000000
--- a/src/EventStore.Core/Services/TimerService/TimerBasedScheduler.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.DataStructures;
-
-namespace EventStore.Core.Services.TimerService {
-	public class TimerBasedScheduler : IDisposable, IScheduler {
-		private readonly PairingHeap<ScheduledTask> _tasks =
-			new PairingHeap<ScheduledTask>((x, y) => x.DueTime < y.DueTime);
-
-		private readonly ITimeProvider _timeProvider;
-		private readonly ITimer _timer;
-
-		private readonly object _queueLock = new object();
-
-		public TimerBasedScheduler(ITimer timer, ITimeProvider timeProvider) {
-			Ensure.NotNull(timer, "timer");
-			Ensure.NotNull(timeProvider, "timeProvider");
-
-			_timer = timer;
-			_timeProvider = timeProvider;
-		}
-
-		public void Stop() {
-			Dispose();
-		}
-
-		public void Schedule(TimeSpan after, Action<IScheduler, object> callback, object state) {
-			lock (_queueLock) {
-				_tasks.Add(new ScheduledTask(_timeProvider.UtcNow.Add(after), callback, state));
-				ResetTimer();
-			}
-		}
-
-		protected void ProcessOperations() {
-			while (_tasks.Count > 0 && _tasks.FindMin().DueTime <= _timeProvider.UtcNow) {
-				var scheduledTask = _tasks.DeleteMin();
-				scheduledTask.Action(this, scheduledTask.State);
-			}
-		}
-
-		private void OnTimerFired() {
-			lock (_queueLock) {
-				ProcessOperations();
-				ResetTimer();
-			}
-		}
-
-		private void ResetTimer() {
-			if (_tasks.Count > 0) {
-				var tuple = _tasks.FindMin();
-				_timer.FireIn((int)(tuple.DueTime - _timeProvider.UtcNow).TotalMilliseconds, OnTimerFired);
-			} else {
-				_timer.FireIn(Timeout.Infinite, OnTimerFired);
-			}
-		}
-
-		public void Dispose() {
-			_timer.Dispose();
-		}
-
-		private struct ScheduledTask {
-			public readonly DateTime DueTime;
-			public readonly Action<IScheduler, object> Action;
-			public readonly object State;
-
-			public ScheduledTask(DateTime dueTime, Action<IScheduler, object> action, object state) {
-				DueTime = dueTime;
-				Action = action;
-				State = state;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/TimerService/TimerMessage.cs b/src/EventStore.Core/Services/TimerService/TimerMessage.cs
deleted file mode 100644
index 4c46edc56e3..00000000000
--- a/src/EventStore.Core/Services/TimerService/TimerMessage.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Services.TimerService {
-	public static partial class TimerMessage {
-		[DerivedMessage(CoreMessage.Timer)]
-		public partial class Schedule : Message {
-			public readonly TimeSpan TriggerAfter;
-
-			public readonly IEnvelope Envelope;
-			public readonly Message ReplyMessage;
-
-			private readonly Action _replyAction;
-
-			public static Schedule Create<T>(TimeSpan triggerAfter, IEnvelope envelope, T replyMessage)
-				where T : Message {
-				return new Schedule(triggerAfter, envelope, replyMessage, () => envelope.ReplyWith(replyMessage));
-			}
-
-			private Schedule(TimeSpan triggerAfter, IEnvelope envelope, Message replyMessage, Action replyAction) {
-				if (envelope == null)
-					throw new ArgumentNullException("envelope");
-				if (replyMessage == null)
-					throw new ArgumentNullException("replyMessage");
-				if (replyAction == null)
-					throw new ArgumentNullException("replyAction");
-
-				TriggerAfter = triggerAfter;
-				Envelope = envelope;
-				ReplyMessage = replyMessage;
-				_replyAction = replyAction;
-			}
-
-			public void Reply() {
-				_replyAction();
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/TimerService/TimerService.cs b/src/EventStore.Core/Services/TimerService/TimerService.cs
deleted file mode 100644
index 8d8e3c6d845..00000000000
--- a/src/EventStore.Core/Services/TimerService/TimerService.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-
-namespace EventStore.Core.Services.TimerService {
-	/// <summary>
-	/// Timer service uses scheduler that is expected to be already running 
-	/// when it is passed to constructor and stopped on the disposal. This is done to
-	/// make sure that we can handle timeouts and callbacks any time
-	/// (even during system shutdowns and initialization)
-	/// </summary>
-	public class TimerService : IDisposable,
-		IHandle<SystemMessage.BecomeShutdown>,
-		IHandle<TimerMessage.Schedule> {
-		private readonly IScheduler _scheduler;
-
-		public TimerService(IScheduler scheduler) {
-			_scheduler = scheduler;
-		}
-
-		public void Handle(SystemMessage.BecomeShutdown message) {
-			_scheduler.Stop();
-		}
-
-		public void Handle(TimerMessage.Schedule message) {
-			_scheduler.Schedule(
-				message.TriggerAfter,
-				static (scheduler, state) => OnTimerCallback(scheduler, state),
-				message);
-		}
-
-		private static void OnTimerCallback(IScheduler scheduler, object state) {
-			var msg = (TimerMessage.Schedule)state;
-			msg.Reply();
-		}
-
-		public void Dispose() {
-			_scheduler.Dispose();
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Common/HashCode.cs b/src/EventStore.Core/Services/Transport/Common/HashCode.cs
deleted file mode 100644
index f48bad28786..00000000000
--- a/src/EventStore.Core/Services/Transport/Common/HashCode.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace EventStore.Core.Services.Transport.Common {
-	public struct HashCode {
-		private readonly int _value;
-
-		private HashCode(int value) {
-			_value = value;
-		}
-
-		public static readonly HashCode Hash = default;
-
-		public readonly HashCode Combine<T>(T? value) where T : struct => Combine(value ?? default);
-		
-		public readonly HashCode Combine<T>(T value) where T: struct {
-			unchecked {
-				return new HashCode((_value * 397) ^ value.GetHashCode());
-			}
-		}
-		
-		public readonly HashCode Combine(string value){
-			unchecked {
-				return new HashCode((_value * 397) ^ (value?.GetHashCode() ?? 0));
-			}
-		}
-
-		public readonly HashCode Combine<T>(IEnumerable<T> values) where T: struct => 
-			values.Aggregate(Hash, (previous, value) => previous.Combine(value));
-
-		public readonly HashCode Combine(IEnumerable<string> values) => 
-			values.Aggregate(Hash, (previous, value) => previous.Combine(value));
-
-		public static implicit operator int(HashCode value) => value._value;
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Common/Position.cs b/src/EventStore.Core/Services/Transport/Common/Position.cs
deleted file mode 100644
index ccf12314767..00000000000
--- a/src/EventStore.Core/Services/Transport/Common/Position.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-using System;
-
-namespace EventStore.Core.Services.Transport.Common {
-	/// <summary>
-	/// A structure referring to a potential logical record position
-	/// in the Event Store transaction file.
-	/// </summary>
-	public struct Position : IEquatable<Position>, IComparable<Position> {
-		/// <summary>
-		/// Position representing the start of the transaction file
-		/// </summary>
-		public static readonly Position Start = new Position(0, 0);
-
-		/// <summary>
-		/// Position representing the end of the transaction file
-		/// </summary>
-		public static readonly Position End = new Position(ulong.MaxValue, ulong.MaxValue);
-
-		public static Position FromInt64(long commitPosition, long preparePosition)
-			=> new Position(
-				commitPosition == -1 ? ulong.MaxValue : (ulong)commitPosition,
-				preparePosition == -1 ? ulong.MaxValue : (ulong)preparePosition);
-
-		/// <summary>
-		/// The commit position of the record
-		/// </summary>
-		public readonly ulong CommitPosition;
-
-		/// <summary>
-		/// The prepare position of the record.
-		/// </summary>
-		public readonly ulong PreparePosition;
-
-		/// <summary>
-		/// Constructs a position with the given commit and prepare positions.
-		/// It is not guaranteed that the position is actually the start of a
-		/// record in the transaction file.
-		/// 
-		/// The commit position cannot be less than the prepare position.
-		/// </summary>
-		/// <param name="commitPosition">The commit position of the record.</param>
-		/// <param name="preparePosition">The prepare position of the record.</param>
-		public Position(ulong commitPosition, ulong preparePosition) {
-			if (commitPosition < preparePosition)
-				throw new ArgumentOutOfRangeException(
-					nameof(commitPosition),
-					"The commit position cannot be less than the prepare position");
-
-			if (commitPosition > long.MaxValue && commitPosition != ulong.MaxValue) {
-				throw new ArgumentOutOfRangeException(nameof(commitPosition));
-			}
-
-
-			if (preparePosition > long.MaxValue && preparePosition != ulong.MaxValue) {
-				throw new ArgumentOutOfRangeException(nameof(preparePosition));
-			}
-
-			CommitPosition = commitPosition;
-			PreparePosition = preparePosition;
-		}
-
-		/// <summary>
-		/// Compares whether p1 &lt; p2.
-		/// </summary>
-		/// <param name="p1">A <see cref="Position" />.</param>
-		/// <param name="p2">A <see cref="Position" />.</param>
-		/// <returns>True if p1 &lt; p2.</returns>
-		public static bool operator <(Position p1, Position p2) =>
-			p1.CommitPosition < p2.CommitPosition ||
-			p1.CommitPosition == p2.CommitPosition && p1.PreparePosition < p2.PreparePosition;
-
-
-		/// <summary>
-		/// Compares whether p1 &gt; p2.
-		/// </summary>
-		/// <param name="p1">A <see cref="Position" />.</param>
-		/// <param name="p2">A <see cref="Position" />.</param>
-		/// <returns>True if p1 &gt; p2.</returns>
-		public static bool operator >(Position p1, Position p2) =>
-			p1.CommitPosition > p2.CommitPosition ||
-			p1.CommitPosition == p2.CommitPosition && p1.PreparePosition > p2.PreparePosition;
-
-		/// <summary>
-		/// Compares whether p1 &gt;= p2.
-		/// </summary>
-		/// <param name="p1">A <see cref="Position" />.</param>
-		/// <param name="p2">A <see cref="Position" />.</param>
-		/// <returns>True if p1 &gt;= p2.</returns>
-		public static bool operator >=(Position p1, Position p2) => p1 > p2 || p1 == p2;
-
-		/// <summary>
-		/// Compares whether p1 &lt;= p2.
-		/// </summary>
-		/// <param name="p1">A <see cref="Position" />.</param>
-		/// <param name="p2">A <see cref="Position" />.</param>
-		/// <returns>True if p1 &lt;= p2.</returns>
-		public static bool operator <=(Position p1, Position p2) => p1 < p2 || p1 == p2;
-
-		/// <summary>
-		/// Compares p1 and p2 for equality.
-		/// </summary>
-		/// <param name="p1">A <see cref="Position" />.</param>
-		/// <param name="p2">A <see cref="Position" />.</param>
-		/// <returns>True if p1 is equal to p2.</returns>
-		public static bool operator ==(Position p1, Position p2) =>
-			Equals(p1, p2);
-
-		/// <summary>
-		/// Compares p1 and p2 for equality.
-		/// </summary>
-		/// <param name="p1">A <see cref="Position" />.</param>
-		/// <param name="p2">A <see cref="Position" />.</param>
-		/// <returns>True if p1 is not equal to p2.</returns>
-		public static bool operator !=(Position p1, Position p2) => !(p1 == p2);
-
-		///<inheritdoc cref="IComparable{T}.CompareTo"/>
-		public int CompareTo(Position other) => this == other ? 0 : this > other ? 1 : -1;
-
-		/// <summary>
-		/// Indicates whether this instance and a specified object are equal.
-		/// </summary>
-		/// <returns>
-		/// true if <paramref name="obj"/> and this instance are the same type and represent the same value; otherwise, false.
-		/// </returns>
-		/// <param name="obj">Another object to compare to. </param><filterpriority>2</filterpriority>
-		public override bool Equals(object obj) => obj is Position position && Equals(position);
-
-		/// <summary>
-		/// Compares this instance of <see cref="Position" /> for equality
-		/// with another instance.
-		/// </summary>
-		/// <param name="other">A <see cref="Position" /></param>
-		/// <returns>True if this instance is equal to the other instance.</returns>
-		public readonly bool Equals(Position other) =>
-			CommitPosition == other.CommitPosition && PreparePosition == other.PreparePosition;
-
-		/// <summary>
-		/// Returns the hash code for this instance.
-		/// </summary>
-		/// <returns>
-		/// A 32-bit signed integer that is the hash code for this instance.
-		/// </returns>
-		/// <filterpriority>2</filterpriority>
-		public override int GetHashCode() => HashCode.Hash.Combine(CommitPosition).Combine(PreparePosition);
-
-		/// <summary>
-		/// Returns the fully qualified type name of this instance.
-		/// </summary>
-		/// <returns>
-		/// A <see cref="T:System.String"/> containing a fully qualified type name.
-		/// </returns>
-		/// <filterpriority>2</filterpriority>
-		public override string ToString() => this == End ? "End" : $"C:{CommitPosition}/P:{PreparePosition}";
-
-		public readonly (long commitPosition, long preparePosition) ToInt64() => Equals(End)
-			? (-1, -1)
-			: ((long)CommitPosition, (long)PreparePosition);
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Common/StreamRevision.cs b/src/EventStore.Core/Services/Transport/Common/StreamRevision.cs
deleted file mode 100644
index e246561c303..00000000000
--- a/src/EventStore.Core/Services/Transport/Common/StreamRevision.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-
-namespace EventStore.Core.Services.Transport.Common {
-	public struct StreamRevision : IEquatable<StreamRevision>, IComparable<StreamRevision> {
-		private readonly ulong _value;
-
-		public static readonly StreamRevision Start = new StreamRevision(0);
-		public static readonly StreamRevision End = new StreamRevision(ulong.MaxValue);
-
-		public static StreamRevision FromInt64(long value) =>
-			value == -1 ? End : new StreamRevision(Convert.ToUInt64(value));
-
-		public StreamRevision(ulong value) {
-			if (value > long.MaxValue && value != ulong.MaxValue) {
-				throw new ArgumentOutOfRangeException(nameof(value));
-			}
-
-			_value = value;
-		}
-
-		public readonly int CompareTo(StreamRevision other) => _value.CompareTo(other._value);
-		public readonly bool Equals(StreamRevision other) => _value == other._value;
-		public override readonly bool Equals(object obj) => obj is StreamRevision other && Equals(other);
-		public override readonly int GetHashCode() => _value.GetHashCode();
-		public static bool operator ==(StreamRevision left, StreamRevision right) => left.Equals(right);
-		public static bool operator !=(StreamRevision left, StreamRevision right) => !left.Equals(right);
-
-		public static StreamRevision operator +(StreamRevision left, ulong right) {
-			checked {
-				return new StreamRevision(left._value + right);
-			}
-		}
-
-		public static StreamRevision operator +(ulong left, StreamRevision right) {
-			checked {
-				return new StreamRevision(left + right._value);
-			}
-		}
-
-		public static StreamRevision operator -(StreamRevision left, ulong right) {
-			checked {
-				return new StreamRevision(left._value - right);
-			}
-		}
-
-		public static StreamRevision operator -(ulong left, StreamRevision right) {
-			checked {
-				return new StreamRevision(left - right._value);
-			}
-		}
-
-		public static bool operator >(StreamRevision left, StreamRevision right) => left._value > right._value;
-		public static bool operator <(StreamRevision left, StreamRevision right) => left._value < right._value;
-		public static bool operator >=(StreamRevision left, StreamRevision right) => left._value >= right._value;
-		public static bool operator <=(StreamRevision left, StreamRevision right) => left._value <= right._value;
-		public readonly long ToInt64() => Equals(End) ? -1 : Convert.ToInt64(_value);
-		public static implicit operator ulong(StreamRevision streamRevision) => streamRevision._value;
-		public override readonly string ToString() => this == End ? "End" : _value.ToString();
-		public readonly ulong ToUInt64() => _value;
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.AllSubscription.cs b/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.AllSubscription.cs
deleted file mode 100644
index 536735f040e..00000000000
--- a/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.AllSubscription.cs
+++ /dev/null
@@ -1,363 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.Transport.Common;
-using Serilog;
-
-namespace EventStore.Core.Services.Transport.Enumerators {
-	static partial class Enumerator {
-		public class AllSubscription : IAsyncEnumerator<ReadResponse> {
-			private static readonly ILogger Log = Serilog.Log.ForContext<AllSubscription>();
-
-			private readonly IExpiryStrategy _expiryStrategy;
-			private readonly Guid _subscriptionId;
-			private readonly IPublisher _bus;
-			private readonly bool _resolveLinks;
-			private readonly ClaimsPrincipal _user;
-			private readonly bool _requiresLeader;
-			private readonly CancellationTokenSource _cts;
-			private readonly Channel<ReadResponse> _channel;
-			private readonly Channel<(ulong SequenceNumber, ResolvedEvent ResolvedEvent)> _liveEvents;
-
-			private ReadResponse _current;
-			private bool _disposed;
-			private Position? _currentPosition;
-
-			public ReadResponse Current => _current;
-			public string SubscriptionId { get; }
-
-			public AllSubscription(
-				IPublisher bus,
-				IExpiryStrategy expiryStrategy,
-				Position? checkpoint,
-				bool resolveLinks,
-				ClaimsPrincipal user,
-				bool requiresLeader,
-				CancellationToken cancellationToken) {
-				ArgumentNullException.ThrowIfNull(bus);
-
-				_expiryStrategy = expiryStrategy;
-				_subscriptionId = Guid.NewGuid();
-				_bus = bus;
-				_resolveLinks = resolveLinks;
-				_user = user;
-				_requiresLeader = requiresLeader;
-				_cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
-				_channel = Channel.CreateBounded<ReadResponse>(BoundedChannelOptions);
-				_liveEvents = Channel.CreateBounded<(ulong, ResolvedEvent)>(LiveChannelOptions);
-
-				SubscriptionId = _subscriptionId.ToString();
-
-				Subscribe(checkpoint, _cts.Token);
-			}
-
-			public ValueTask DisposeAsync() {
-				if (_disposed) {
-					return ValueTask.CompletedTask;
-				}
-
-				Log.Debug("Subscription {subscriptionId} to $all disposed.", _subscriptionId);
-
-				_disposed = true;
-				Unsubscribe();
-
-				_cts.Cancel();
-				_cts.Dispose();
-
-				return ValueTask.CompletedTask;
-			}
-
-			public async ValueTask<bool> MoveNextAsync() {
-				ReadLoop:
-
-				if (!await _channel.Reader.WaitToReadAsync(_cts.Token)) {
-					return false;
-				}
-
-				var readResponse = await _channel.Reader.ReadAsync(_cts.Token);
-
-				if (readResponse is ReadResponse.EventReceived eventReceived) {
-					var eventPos = eventReceived.Event.OriginalPosition!.Value;
-					var position = Position.FromInt64(eventPos.CommitPosition, eventPos.PreparePosition);
-
-					if (_currentPosition.HasValue && position <= _currentPosition.Value) {
-						// this should no longer happen
-						Log.Warning("Subscription {subscriptionId} to $all skipping event {position} as it is less than {currentPosition}.",
-							_subscriptionId, position, _currentPosition);
-						goto ReadLoop;
-					}
-
-					Log.Verbose(
-						"Subscription {subscriptionId} to $all seen event {position}.", _subscriptionId, position);
-
-					_currentPosition = position;
-				}
-
-				_current = readResponse;
-
-				return true;
-			}
-
-			private void Subscribe(Position? checkpoint, CancellationToken ct) {
-				Task.Factory.StartNew(() => MainLoop(checkpoint, ct), ct);
-			}
-
-			private static TFPos ConvertCheckpoint(Position? checkpoint, TFPos lastLivePos) {
-				if (!checkpoint.HasValue)
-					return new TFPos(-1, -1);
-
-				if (checkpoint == Position.End)
-					return lastLivePos;
-
-				var (commitPos, preparePos) = checkpoint.Value.ToInt64();
-				return new TFPos(commitPos, preparePos);
-			}
-
-			private async Task MainLoop(Position? checkpointPosition, CancellationToken ct) {
-				try {
-					Log.Information("Subscription {subscriptionId} to $all has started at checkpoint {position}",
-						_subscriptionId, checkpointPosition?.ToString() ?? "Start");
-
-					var confirmationLastPos = await SubscribeToLive();
-					await ConfirmSubscription(ct);
-
-					// the event number we most recently sent on towards the client.
-					// (we should send on events _after_ this)
-					var checkpoint = ConvertCheckpoint(checkpointPosition, confirmationLastPos);
-
-					// the most recently read sequence number from the live channel. 0 when we haven't read any.
-					var sequenceNumber = 0UL;
-
-					if (checkpoint >= confirmationLastPos)
-						(checkpoint, sequenceNumber) = await GoLive(checkpoint, sequenceNumber, ct);
-
-					while (true) {
-						ct.ThrowIfCancellationRequested();
-						checkpoint = await CatchUp(checkpoint, ct);
-						(checkpoint, sequenceNumber) = await GoLive(checkpoint, sequenceNumber, ct);
-					}
-				} catch (Exception ex) {
-					if (ex is not (OperationCanceledException or ReadResponseException.InvalidPosition))
-						Log.Error(ex, "Subscription {subscriptionId} to $all experienced an error.", _subscriptionId);
-					_channel.Writer.TryComplete(ex);
-				} finally {
-					Log.Information("Subscription {subscriptionId} to $all has ended.", _subscriptionId);
-				}
-			}
-
-			private async Task NotifyCaughtUp(TFPos checkpoint, CancellationToken ct) {
-				Log.Debug(
-					"Subscription {subscriptionId} to $all caught up at checkpoint {position}.",
-					_subscriptionId, checkpoint);
-
-				await _channel.Writer.WriteAsync(new ReadResponse.SubscriptionCaughtUp(), ct);
-			}
-
-			private async Task NotifyFellBehind(TFPos checkpoint, CancellationToken ct) {
-				Log.Debug(
-					"Subscription {subscriptionId} to $all fell behind at checkpoint {position}.",
-					_subscriptionId, checkpoint);
-
-				await _channel.Writer.WriteAsync(new ReadResponse.SubscriptionFellBehind(), ct);
-			}
-
-			private async ValueTask<(TFPos, ulong)> GoLive(TFPos checkpoint, ulong sequenceNumber, CancellationToken ct) {
-				await NotifyCaughtUp(checkpoint, ct);
-
-				await foreach (var liveEvent in _liveEvents.Reader.ReadAllAsync(ct)) {
-					var sequenceCorrect = liveEvent.SequenceNumber == sequenceNumber + 1;
-					sequenceNumber = liveEvent.SequenceNumber;
-
-					if (liveEvent.ResolvedEvent.OriginalPosition <= checkpoint) {
-						// skip because this event has already been sent towards the client
-						// (or the client specified a checkpoint for events that don't exist yet and so
-						// is not interested in them)
-						// nb: we can skip this event even if it had the wrong sequence number, it means
-						// we would have skipped the events that got discarded anyway.
-						continue;
-					}
-
-					if (!sequenceCorrect) {
-						// there's a gap in the sequence numbers, at least one live event was discarded
-						// due to the live channel becoming full.
-						// switch back to catchup to make sure we didn't miss anything we wanted to send.
-						await NotifyFellBehind(checkpoint, ct);
-						return (checkpoint, sequenceNumber);
-					}
-
-					// this is the next event to send towards the client. send it and update the checkpoint
-					await SendEventToSubscription(liveEvent.ResolvedEvent, ct);
-					checkpoint = liveEvent.ResolvedEvent.OriginalPosition!.Value;
-				}
-
-				throw new Exception($"Unexpected error: live events channel for subscription {_subscriptionId} to $all completed without exception");
-			}
-
-			private Task<TFPos> CatchUp(TFPos checkpoint, CancellationToken ct) {
-				Log.Verbose(
-					"Subscription {subscriptionId} to $all is catching up from checkpoint {position}",
-					_subscriptionId, checkpoint);
-
-				var catchupCompletionTcs = new TaskCompletionSource<TFPos>();
-
-				// this is a safe use of AsyncTaskEnvelope. Only one call to OnMessage will be running
-				// at any given time because we only expect one reply and that reply kicks off the next read.
-				AsyncTaskEnvelope envelope = null;
-				envelope = new AsyncTaskEnvelope(OnMessage, ct);
-
-				ReadPage(checkpoint, envelope, ct);
-
-				return catchupCompletionTcs.Task;
-
-				async Task OnMessage(Message message, CancellationToken ct) {
-					try {
-						if (message is ClientMessage.NotHandled notHandled &&
-						    TryHandleNotHandled(notHandled, out var ex))
-							throw ex;
-
-						if (message is not ClientMessage.ReadAllEventsForwardCompleted completed)
-							throw ReadResponseException.UnknownMessage
-								.Create<ClientMessage.ReadAllEventsForwardCompleted>(message);
-
-						switch (completed.Result) {
-							case ReadAllResult.Success:
-								foreach (var @event in completed.Events) {
-									var eventPosition = @event.OriginalPosition!.Value;
-
-									// this will only be true for the first event of the first page
-									// as we start page reads from the checkpoint's position
-									if (eventPosition <= checkpoint)
-										continue;
-
-									Log.Verbose(
-										"Subscription {subscriptionId} to $all received catch-up event {position}.",
-										_subscriptionId, eventPosition);
-
-									await SendEventToSubscription(@event, ct);
-									checkpoint = eventPosition;
-								}
-
-								if (completed.IsEndOfStream) {
-									catchupCompletionTcs.TrySetResult(checkpoint);
-									return;
-								}
-
-								ReadPage(completed.NextPos, envelope, ct);
-								return;
-							case ReadAllResult.Expired:
-								ReadPage(completed.CurrentPos, envelope, ct);
-								return;
-							case ReadAllResult.AccessDenied:
-								throw new ReadResponseException.AccessDenied();
-							case ReadAllResult.InvalidPosition:
-								throw new ReadResponseException.InvalidPosition();
-							default:
-								throw ReadResponseException.UnknownError.Create(completed.Result);
-						}
-					} catch (Exception exception) {
-						catchupCompletionTcs.TrySetException(exception);
-					}
-				}
-			}
-
-			private async Task SendEventToSubscription(ResolvedEvent @event, CancellationToken ct) {
-				await _channel.Writer.WriteAsync(new ReadResponse.EventReceived(@event), ct);
-			}
-
-			private Task<TFPos> SubscribeToLive() {
-				var nextLiveSequenceNumber = 0UL;
-				var confirmationPositionTcs = new TaskCompletionSource<TFPos>();
-
-				_bus.Publish(new ClientMessage.SubscribeToStream(Guid.NewGuid(), _subscriptionId,
-					new CallbackEnvelope(OnSubscriptionMessage), _subscriptionId,
-					string.Empty, _resolveLinks, _user));
-
-				return confirmationPositionTcs.Task;
-
-				void OnSubscriptionMessage(Message message) {
-					try {
-						if (message is ClientMessage.NotHandled notHandled &&
-						    TryHandleNotHandled(notHandled, out var ex))
-							throw ex;
-
-						switch (message) {
-							case ClientMessage.SubscriptionConfirmation confirmed:
-								long caughtUp = confirmed.LastIndexedPosition;
-
-								Log.Debug(
-									"Subscription {subscriptionId} to $all confirmed. LastIndexedPosition is {position:N0}.",
-									_subscriptionId, caughtUp);
-
-								confirmationPositionTcs.TrySetResult(new TFPos(caughtUp, caughtUp));
-								return;
-							case ClientMessage.SubscriptionDropped dropped:
-								Log.Debug(
-									"Subscription {subscriptionId} to $all dropped by subscription service: {droppedReason}",
-									_subscriptionId, dropped.Reason);
-								switch (dropped.Reason) {
-									case SubscriptionDropReason.AccessDenied:
-										throw new ReadResponseException.AccessDenied();
-									case SubscriptionDropReason.Unsubscribed:
-										return;
-									case SubscriptionDropReason.StreamDeleted: // applies only to regular streams
-									case SubscriptionDropReason.NotFound: // applies only to persistent subscriptions
-									default:
-										throw ReadResponseException.UnknownError.Create(dropped.Reason);
-								}
-							case ClientMessage.StreamEventAppeared appeared: {
-								Log.Verbose(
-									"Subscription {subscriptionId} to $all received live event {position}.",
-									_subscriptionId, appeared.Event.OriginalPosition!.Value);
-
-								if (!_liveEvents.Writer.TryWrite((++nextLiveSequenceNumber, appeared.Event))) {
-									// this cannot happen because _liveEvents does not have full mode 'wait'.
-									throw new Exception($"Unexpected error: could not write to live events channel for subscription {_subscriptionId} to $all");
-								}
-
-								return;
-							}
-							default:
-								throw ReadResponseException.UnknownMessage
-									.Create<ClientMessage.SubscriptionConfirmation>(message);
-						}
-					} catch (Exception exception) {
-						_liveEvents.Writer.TryComplete(exception);
-						confirmationPositionTcs.TrySetException(exception);
-					}
-				}
-			}
-
-			private ValueTask ConfirmSubscription(CancellationToken ct) {
-				return _channel.Writer.WriteAsync(new ReadResponse.SubscriptionConfirmed(SubscriptionId), ct);
-			}
-
-			private void ReadPage(TFPos startPos, IEnvelope envelope, CancellationToken ct) {
-				Guid correlationId = Guid.NewGuid();
-				Log.Verbose(
-					"Subscription {subscriptionId} to $all reading next page starting from {position}.",
-					_subscriptionId, startPos);
-
-				if (startPos is { CommitPosition: < 0, PreparePosition: < 0 })
-					startPos = new TFPos(0, 0);
-
-				_bus.Publish(new ClientMessage.ReadAllEventsForward(
-					correlationId, correlationId, envelope,
-					startPos.CommitPosition, startPos.PreparePosition, ReadBatchSize, _resolveLinks, _requiresLeader, null, _user,
-					replyOnExpired: true,
-					expires: _expiryStrategy.GetExpiry(),
-					cancellationToken: ct));
-			}
-
-			private void Unsubscribe() => _bus.Publish(new ClientMessage.UnsubscribeFromStream(Guid.NewGuid(),
-				_subscriptionId, new NoopEnvelope(), _user));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.AllSubscriptionFiltered.cs b/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.AllSubscriptionFiltered.cs
deleted file mode 100644
index 622dd7e35ad..00000000000
--- a/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.AllSubscriptionFiltered.cs
+++ /dev/null
@@ -1,454 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.Transport.Common;
-using Serilog;
-
-namespace EventStore.Core.Services.Transport.Enumerators {
-	partial class Enumerator {
-		public class AllSubscriptionFiltered : IAsyncEnumerator<ReadResponse> {
-			private static readonly ILogger Log = Serilog.Log.ForContext<AllSubscriptionFiltered>();
-
-			private readonly IExpiryStrategy _expiryStrategy;
-			private readonly Guid _subscriptionId;
-			private readonly IPublisher _bus;
-			private readonly bool _resolveLinks;
-			private readonly IEventFilter _eventFilter;
-			private readonly ClaimsPrincipal _user;
-			private readonly bool _requiresLeader;
-			private readonly uint _maxSearchWindow;
-			private readonly uint _checkpointInterval;
-			private readonly CancellationTokenSource _cts;
-			private readonly Channel<ReadResponse> _channel;
-			private readonly Channel<(ulong SequenceNumber, ResolvedEvent? ResolvedEvent, TFPos? Checkpoint)> _liveEvents;
-
-			private ReadResponse _current;
-			private bool _disposed;
-			private Position? _currentPosition;
-			private Position? _currentCheckpoint;
-
-			public ReadResponse Current => _current;
-			public string SubscriptionId { get; }
-
-			public AllSubscriptionFiltered(IPublisher bus,
-				IExpiryStrategy expiryStrategy,
-				Position? checkpoint,
-				bool resolveLinks,
-				IEventFilter eventFilter,
-				ClaimsPrincipal user,
-				bool requiresLeader,
-				uint? maxSearchWindow,
-				uint checkpointIntervalMultiplier,
-				CancellationToken cancellationToken) {
-				ArgumentNullException.ThrowIfNull(bus);
-				ArgumentNullException.ThrowIfNull(eventFilter);
-				ArgumentOutOfRangeException.ThrowIfZero(checkpointIntervalMultiplier);
-
-				_expiryStrategy = expiryStrategy;
-				_subscriptionId = Guid.NewGuid();
-				_bus = bus;
-				_resolveLinks = resolveLinks;
-				_eventFilter = eventFilter;
-				_user = user;
-				_requiresLeader = requiresLeader;
-				_maxSearchWindow = maxSearchWindow ?? ReadBatchSize;
-				_checkpointInterval = checkpointIntervalMultiplier * _maxSearchWindow;
-				_cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
-				_channel = Channel.CreateBounded<ReadResponse>(BoundedChannelOptions);
-				_liveEvents = Channel.CreateBounded<(ulong, ResolvedEvent?, TFPos?)>(LiveChannelOptions);
-
-				SubscriptionId = _subscriptionId.ToString();
-
-				Subscribe(checkpoint, _cts.Token);
-			}
-
-			public ValueTask DisposeAsync() {
-				if (_disposed) {
-					return ValueTask.CompletedTask;
-				}
-
-				Log.Debug("Subscription {subscriptionId} to $all:{eventFilter} disposed.", _subscriptionId, _eventFilter);
-
-				_disposed = true;
-				Unsubscribe();
-
-				_cts.Cancel();
-				_cts.Dispose();
-
-				return ValueTask.CompletedTask;
-			}
-
-			public async ValueTask<bool> MoveNextAsync() {
-				ReadLoop:
-
-				if (!await _channel.Reader.WaitToReadAsync(_cts.Token)) {
-					return false;
-				}
-
-				var readResponse = await _channel.Reader.ReadAsync(_cts.Token);
-
-				if (readResponse is ReadResponse.EventReceived eventReceived) {
-					var eventPos = eventReceived.Event.OriginalPosition!.Value;
-					var position = Position.FromInt64(eventPos.CommitPosition, eventPos.PreparePosition);
-
-					if (_currentPosition.HasValue && position <= _currentPosition.Value) {
-						// this should no longer happen
-						Log.Warning("Subscription {subscriptionId} to $all:{eventFilter} skipping event {position} as it is less than {currentPosition}.",
-							_subscriptionId, _eventFilter, position, _currentPosition);
-						goto ReadLoop;
-					}
-
-					Log.Verbose(
-						"Subscription {subscriptionId} to $all:{eventFilter} seen event {position}.",
-						_subscriptionId, _eventFilter, position);
-					
-					_currentPosition = position;
-				} else if (readResponse is ReadResponse.CheckpointReceived checkpointReceived) {
-					var checkpointPos = new Position(checkpointReceived.CommitPosition, checkpointReceived.PreparePosition);
-
-					if (_currentCheckpoint.HasValue && checkpointPos <= _currentCheckpoint.Value) {
-						// in some cases, it's possible to receive the same checkpoint twice for example:
-						// i) when the subscription goes live and it turns out that the next thing on the live channel is a checkpoint
-						// ii) when catching-up, reaching the checkpoint interval and the next page read reaches the end of the stream
-
-						goto ReadLoop;
-					}
-
-					Log.Verbose(
-						"Subscription {subscriptionId} to $all:{eventFilter} received checkpoint {position}.",
-						_subscriptionId, _eventFilter, checkpointPos);
-
-					_currentCheckpoint = checkpointPos;
-				}
-
-				_current = readResponse;
-
-				return true;
-			}
-
-			private void Subscribe(Position? checkpoint, CancellationToken ct) {
-				Task.Factory.StartNew(() => MainLoop(checkpoint, ct), ct);
-			}
-
-			private static TFPos ConvertCheckpoint(Position? checkpoint, TFPos lastLivePos) {
-				if (!checkpoint.HasValue)
-					return new TFPos(-1, -1);
-
-				if (checkpoint == Position.End)
-					return lastLivePos;
-
-				var (commitPos, preparePos) = checkpoint.Value.ToInt64();
-				return new TFPos(commitPos, preparePos);
-			}
-
-			private async Task MainLoop(Position? checkpointPosition, CancellationToken ct) {
-				try {
-					Log.Information("Subscription {subscriptionId} to $all:{eventFilter} has started at checkpoint {position}",
-						_subscriptionId, _eventFilter, checkpointPosition?.ToString() ?? "Start");
-
-					var confirmationLastPos = await SubscribeToLive();
-					await ConfirmSubscription(ct);
-
-					// the event or checkpoint position we most recently sent on towards the client.
-					// (we should send on events _after_ this and checkpoints _equal to or after_ this)
-					var checkpoint = ConvertCheckpoint(checkpointPosition, confirmationLastPos);
-
-					// the most recently read sequence number from the live channel. 0 when we haven't read any.
-					var sequenceNumber = 0UL;
-
-					if (checkpoint >= confirmationLastPos)
-						(checkpoint, sequenceNumber) = await GoLive(checkpoint, sequenceNumber, ct);
-
-					while (true) {
-						ct.ThrowIfCancellationRequested();
-						checkpoint = await CatchUp(checkpoint, ct);
-						(checkpoint, sequenceNumber) = await GoLive(checkpoint, sequenceNumber, ct);
-					}
-				} catch (Exception ex) {
-					if (ex is not (OperationCanceledException or ReadResponseException.InvalidPosition))
-						Log.Error(ex, "Subscription {subscriptionId} to $all:{eventFilter} experienced an error.",
-							_subscriptionId, _eventFilter);
-					_channel.Writer.TryComplete(ex);
-				} finally {
-					Log.Information("Subscription {subscriptionId} to $all:{eventFilter} has ended.",
-						_subscriptionId, _eventFilter);
-				}
-			}
-
-			private async Task NotifyCaughtUp(TFPos checkpoint, CancellationToken ct) {
-				Log.Debug(
-					"Subscription {subscriptionId} to $all:{eventFilter} caught up at checkpoint {position}.",
-					_subscriptionId, _eventFilter, checkpoint);
-
-				await _channel.Writer.WriteAsync(new ReadResponse.SubscriptionCaughtUp(), ct);
-			}
-
-			private async Task NotifyFellBehind(TFPos checkpoint, CancellationToken ct) {
-				Log.Debug(
-					"Subscription {subscriptionId} to $all:{eventFilter} fell behind at checkpoint {position}.",
-					_subscriptionId, _eventFilter, checkpoint);
-
-				await _channel.Writer.WriteAsync(new ReadResponse.SubscriptionFellBehind(), ct);
-			}
-
-			private async ValueTask<(TFPos, ulong)> GoLive(TFPos checkpoint, ulong sequenceNumber, CancellationToken ct) {
-				await NotifyCaughtUp(checkpoint, ct);
-
-				await foreach (var liveEvent in _liveEvents.Reader.ReadAllAsync(ct)) {
-					var sequenceCorrect = liveEvent.SequenceNumber == sequenceNumber + 1;
-					sequenceNumber = liveEvent.SequenceNumber;
-
-					if (liveEvent.ResolvedEvent.HasValue && liveEvent.ResolvedEvent.Value.OriginalPosition <= checkpoint) {
-						// skip because this event has already been sent towards the client
-						// (or the client specified a checkpoint for events that don't exist yet and so
-						// is not interested in them)
-						// nb: we can skip this event even if it had the wrong sequence number, it means
-						// we would have skipped the events that got discarded anyway.
-						continue;
-					}
-
-					if (liveEvent.Checkpoint.HasValue && liveEvent.Checkpoint.Value < checkpoint) {
-						// skip because the checkpoint received is earlier than the last event or checkpoint sent towards the client
-						continue;
-					}
-
-					if (!sequenceCorrect) {
-						// there's a gap in the sequence numbers, at least one live event was discarded
-						// due to the live channel becoming full.
-						// switch back to catchup to make sure we didn't miss anything we wanted to send.
-						await NotifyFellBehind(checkpoint, ct);
-
-						// issue a checkpoint before falling behind to catch-up to make sure that
-						// at least one checkpoint is issued within the checkpoint interval
-						await SendCheckpointToSubscription(checkpoint, ct);
-
-						return (checkpoint, sequenceNumber);
-					}
-
-					if (liveEvent.ResolvedEvent.HasValue) {
-						// this is the next event to send towards the client. send it and update `checkpoint`
-						await SendEventToSubscription(liveEvent.ResolvedEvent.Value, ct);
-						checkpoint = liveEvent.ResolvedEvent.Value.OriginalPosition!.Value;
-					} else if (liveEvent.Checkpoint.HasValue) {
-						// this is a valid checkpoint that we can send towards the client. send it and update `checkpoint`
-						await SendCheckpointToSubscription(liveEvent.Checkpoint.Value, ct);
-						checkpoint = liveEvent.Checkpoint.Value;
-					}
-				}
-
-				throw new Exception($"Unexpected error: live events channel for subscription {_subscriptionId} to $all:{_eventFilter} completed without exception");
-			}
-
-			private Task<TFPos> CatchUp(TFPos checkpoint, CancellationToken ct) {
-				Log.Verbose(
-					"Subscription {subscriptionId} to $all:{eventFilter} is catching up from checkpoint {position}",
-					_subscriptionId, _eventFilter, checkpoint);
-
-				var checkpointIntervalCounter = 0L;
-				var catchupCompletionTcs = new TaskCompletionSource<TFPos>();
-
-				// this is a safe use of AsyncTaskEnvelope. Only one call to OnMessage will be running
-				// at any given time because we only expect one reply and that reply kicks off the next read.
-				AsyncTaskEnvelope envelope = null;
-				envelope = new AsyncTaskEnvelope(OnMessage, ct);
-
-				ReadPage(checkpoint, envelope, ct);
-
-				return catchupCompletionTcs.Task;
-
-				async Task OnMessage(Message message, CancellationToken ct) {
-					try {
-						if (message is ClientMessage.NotHandled notHandled &&
-						    TryHandleNotHandled(notHandled, out var ex))
-							throw ex;
-
-						if (message is not ClientMessage.FilteredReadAllEventsForwardCompleted completed)
-							throw ReadResponseException.UnknownMessage
-								.Create<ClientMessage.FilteredReadAllEventsForwardCompleted>(message);
-
-						switch (completed.Result) {
-							case FilteredReadAllResult.Success:
-								foreach (var @event in completed.Events) {
-									var eventPosition = @event.OriginalPosition!.Value;
-
-									// this can only be true for the first event of the first page
-									// as we start page reads from the checkpoint's position
-									if (eventPosition <= checkpoint)
-										continue;
-
-									Log.Verbose(
-										"Subscription {subscriptionId} to $all:{eventFilter} received catch-up event {position}.",
-										_subscriptionId, _eventFilter, eventPosition);
-
-									await SendEventToSubscription(@event, ct);
-									checkpoint = eventPosition;
-								}
-
-								checkpointIntervalCounter += completed.ConsideredEventsCount;
-								Log.Verbose(
-									"Subscription {subscriptionId} to $all:{eventFilter} considered {consideredEventsCount} catch-up events (interval: {checkpointInterval}, counter: {checkpointIntervalCounter})",
-									_subscriptionId, _eventFilter, completed.ConsideredEventsCount, _checkpointInterval, checkpointIntervalCounter);
-
-								if (completed.IsEndOfStream) {
-									// issue a checkpoint when going live to make sure that at least
-									// one checkpoint is issued within the checkpoint interval
-									await SendCheckpointToSubscription(checkpoint, ct);
-
-									catchupCompletionTcs.TrySetResult(checkpoint);
-									return;
-								}
-
-								if (checkpointIntervalCounter >= _checkpointInterval) {
-									checkpointIntervalCounter %= _checkpointInterval;
-
-									if (checkpoint < completed.CurrentPos)
-										checkpoint = completed.CurrentPos;
-
-									Log.Verbose(
-										"Subscription {subscriptionId} to $all:{eventFilter} reached checkpoint at {position} during catch-up (interval: {checkpointInterval}, counter: {checkpointIntervalCounter})",
-										_subscriptionId, _eventFilter, checkpoint, _checkpointInterval, checkpointIntervalCounter);
-
-									await SendCheckpointToSubscription(checkpoint, ct);
-								}
-
-								ReadPage(completed.NextPos, envelope, ct);
-								return;
-							case FilteredReadAllResult.Expired:
-								ReadPage(completed.CurrentPos, envelope, ct);
-								return;
-							case FilteredReadAllResult.AccessDenied:
-								throw new ReadResponseException.AccessDenied();
-							case FilteredReadAllResult.InvalidPosition:
-								throw new ReadResponseException.InvalidPosition();
-							default:
-								throw ReadResponseException.UnknownError.Create(completed.Result);
-						}
-					} catch (Exception exception) {
-						catchupCompletionTcs.TrySetException(exception);
-					}
-				}
-			}
-
-			private async Task SendEventToSubscription(ResolvedEvent @event, CancellationToken ct) {
-				await _channel.Writer.WriteAsync(new ReadResponse.EventReceived(@event), ct);
-			}
-
-			private async Task SendCheckpointToSubscription(TFPos checkpoint, CancellationToken ct) {
-				var checkpointPos = Position.FromInt64(checkpoint.CommitPosition, checkpoint.PreparePosition);
-				await _channel.Writer.WriteAsync(new ReadResponse.CheckpointReceived(
-					commitPosition: checkpointPos.CommitPosition,
-					preparePosition: checkpointPos.PreparePosition), ct);
-			}
-
-			private Task<TFPos> SubscribeToLive() {
-				var nextLiveSequenceNumber = 0UL;
-				var confirmationPositionTcs = new TaskCompletionSource<TFPos>();
-
-				_bus.Publish(new ClientMessage.FilteredSubscribeToStream(Guid.NewGuid(), _subscriptionId,
-					new CallbackEnvelope(OnSubscriptionMessage), _subscriptionId,
-					string.Empty, _resolveLinks, _user,
-					_eventFilter, (int)_checkpointInterval, checkpointIntervalCurrent: 0));
-
-				return confirmationPositionTcs.Task;
-
-				void OnSubscriptionMessage(Message message) {
-					try {
-						if (message is ClientMessage.NotHandled notHandled &&
-						    TryHandleNotHandled(notHandled, out var ex))
-							throw ex;
-
-						switch (message) {
-							case ClientMessage.SubscriptionConfirmation confirmed:
-								long caughtUp = confirmed.LastIndexedPosition;
-
-								Log.Debug(
-									"Subscription {subscriptionId} to $all:{eventFilter} confirmed. LastIndexedPosition is {position:N0}.",
-									_subscriptionId, _eventFilter, caughtUp);
-
-								confirmationPositionTcs.TrySetResult(new TFPos(caughtUp, caughtUp));
-								return;
-							case ClientMessage.SubscriptionDropped dropped:
-								Log.Debug(
-									"Subscription {subscriptionId} to $all:{eventFilter} dropped by subscription service: {droppedReason}",
-									_subscriptionId, _eventFilter, dropped.Reason);
-								switch (dropped.Reason) {
-									case SubscriptionDropReason.AccessDenied:
-										throw new ReadResponseException.AccessDenied();
-									case SubscriptionDropReason.Unsubscribed:
-										return;
-									case SubscriptionDropReason.StreamDeleted: // applies only to regular streams
-									case SubscriptionDropReason.NotFound: // applies only to persistent subscriptions
-									default:
-										throw ReadResponseException.UnknownError.Create(dropped.Reason);
-								}
-							case ClientMessage.StreamEventAppeared appeared: {
-								Log.Verbose(
-									"Subscription {subscriptionId} to $all:{eventFilter} received live event {position}.",
-									_subscriptionId, _eventFilter, appeared.Event.OriginalPosition!.Value);
-
-								if (!_liveEvents.Writer.TryWrite((++nextLiveSequenceNumber, appeared.Event, null))) {
-									// this cannot happen because _liveEvents does not have full mode 'wait'.
-									throw new Exception($"Unexpected error: could not write to live events channel for subscription {_subscriptionId} to $all:{_eventFilter}");
-								}
-
-								return;
-							}
-							case ClientMessage.CheckpointReached checkpointReached: {
-								Log.Verbose(
-									"Subscription {subscriptionId} to $all:{eventFilter} received live checkpoint {position}.",
-									_subscriptionId, _eventFilter, checkpointReached.Position);
-
-								if (!_liveEvents.Writer.TryWrite((++nextLiveSequenceNumber, null, checkpointReached.Position!.Value))) {
-									// this cannot happen because _liveEvents does not have full mode 'wait'.
-									throw new Exception(
-										$"Unexpected error: could not write to live events channel for subscription {_subscriptionId} to $all:{_eventFilter}");
-								}
-
-								return;
-							}
-							default:
-								throw ReadResponseException.UnknownMessage
-									.Create<ClientMessage.SubscriptionConfirmation>(message);
-						}
-					} catch (Exception exception) {
-						_liveEvents.Writer.TryComplete(exception);
-						confirmationPositionTcs.TrySetException(exception);
-					}
-				}
-			}
-
-			private ValueTask ConfirmSubscription(CancellationToken ct) {
-				return _channel.Writer.WriteAsync(new ReadResponse.SubscriptionConfirmed(SubscriptionId), ct);
-			}
-
-			private void ReadPage(TFPos startPos, IEnvelope envelope, CancellationToken ct) {
-				Guid correlationId = Guid.NewGuid();
-				Log.Verbose(
-					"Subscription {subscriptionId} to $all:{eventFilter} reading next page starting from {position}.",
-					_subscriptionId, _eventFilter, startPos);
-
-				if (startPos is { CommitPosition: < 0, PreparePosition: < 0 })
-					startPos = new TFPos(0, 0);
-
-				_bus.Publish(new ClientMessage.FilteredReadAllEventsForward(
-					correlationId, correlationId, envelope,
-					startPos.CommitPosition, startPos.PreparePosition, ReadBatchSize, _resolveLinks, _requiresLeader,
-					(int)_maxSearchWindow, null, _eventFilter, _user,
-					replyOnExpired: true,
-					expires: _expiryStrategy.GetExpiry(),
-					cancellationToken: ct));
-			}
-
-			private void Unsubscribe() => _bus.Publish(new ClientMessage.UnsubscribeFromStream(Guid.NewGuid(),
-				_subscriptionId, new NoopEnvelope(), _user));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.ReadAllBackwards.cs b/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.ReadAllBackwards.cs
deleted file mode 100644
index 714b02268c1..00000000000
--- a/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.ReadAllBackwards.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Transport.Common;
-
-namespace EventStore.Core.Services.Transport.Enumerators {
-	partial class Enumerator {
-		public class ReadAllBackwards : IAsyncEnumerator<ReadResponse> {
-
-			private readonly IPublisher _bus;
-			private readonly ulong _maxCount;
-			private readonly bool _resolveLinks;
-			private readonly ClaimsPrincipal _user;
-			private readonly bool _requiresLeader;
-			private readonly DateTime _deadline;
-			private readonly CancellationToken _cancellationToken;
-			private readonly SemaphoreSlim _semaphore;
-			private readonly Channel<ReadResponse> _channel;
-
-			private ReadResponse _current;
-
-			public ReadResponse Current => _current;
-
-			public ReadAllBackwards(IPublisher bus,
-				Position position,
-				ulong maxCount,
-				bool resolveLinks,
-				ClaimsPrincipal user,
-				bool requiresLeader,
-				DateTime deadline,
-				CancellationToken cancellationToken) {
-				if (bus == null) {
-					throw new ArgumentNullException(nameof(bus));
-				}
-
-				_bus = bus;
-				_maxCount = maxCount;
-				_resolveLinks = resolveLinks;
-				_user = user;
-				_requiresLeader = requiresLeader;
-				_deadline = deadline;
-				_cancellationToken = cancellationToken;
-				_semaphore = new SemaphoreSlim(1, 1);
-				_channel = Channel.CreateBounded<ReadResponse>(BoundedChannelOptions);
-
-				ReadPage(position);
-			}
-
-			public ValueTask DisposeAsync() {
-				_channel.Writer.TryComplete();
-				return new ValueTask(Task.CompletedTask);
-			}
-
-			public async ValueTask<bool> MoveNextAsync() {
-				if (!await _channel.Reader.WaitToReadAsync(_cancellationToken)) {
-					return false;
-				}
-
-				_current = await _channel.Reader.ReadAsync(_cancellationToken);
-
-				return true;
-			}
-
-			private void ReadPage(Position startPosition, ulong readCount = 0) {
-				var correlationId = Guid.NewGuid();
-
-				var (commitPosition, preparePosition) = startPosition.ToInt64();
-
-				_bus.Publish(new ClientMessage.ReadAllEventsBackward(
-					correlationId, correlationId, new ContinuationEnvelope(OnMessage, _semaphore, _cancellationToken),
-					commitPosition, preparePosition, (int)Math.Min(ReadBatchSize, _maxCount), _resolveLinks,
-					_requiresLeader, default, _user, _deadline,
-					cancellationToken: _cancellationToken));
-
-				async Task OnMessage(Message message, CancellationToken ct) {
-					if (message is ClientMessage.NotHandled notHandled &&
-					    TryHandleNotHandled(notHandled, out var ex)) {
-						_channel.Writer.TryComplete(ex);
-						return;
-					}
-
-					if (message is not ClientMessage.ReadAllEventsBackwardCompleted completed) {
-						_channel.Writer.TryComplete(
-							ReadResponseException.UnknownMessage.Create<ClientMessage.ReadAllEventsBackwardCompleted>(message));
-						return;
-					}
-
-					switch (completed.Result) {
-						case ReadAllResult.Success:
-							var nextPosition = completed.NextPos;
-
-							foreach (var @event in completed.Events) {
-								if (readCount >= _maxCount) {
-									_channel.Writer.TryComplete();
-									return;
-								}
-
-								await _channel.Writer.WriteAsync(new ReadResponse.EventReceived(@event), ct);
-								nextPosition = @event.OriginalPosition ?? TFPos.Invalid;
-								readCount++;
-							}
-
-							if (completed.IsEndOfStream) {
-								_channel.Writer.TryComplete();
-								return;
-							}
-
-							ReadPage(Position.FromInt64(
-								completed.NextPos.CommitPosition,
-								completed.NextPos.PreparePosition), readCount);
-							return;
-						case ReadAllResult.AccessDenied:
-							_channel.Writer.TryComplete(new ReadResponseException.AccessDenied());
-							return;
-						default:
-							_channel.Writer.TryComplete(ReadResponseException.UnknownError.Create(completed.Result));
-							return;
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.ReadAllBackwardsFiltered.cs b/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.ReadAllBackwardsFiltered.cs
deleted file mode 100644
index e9814fcc864..00000000000
--- a/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.ReadAllBackwardsFiltered.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.Transport.Common;
-using Serilog;
-using IReadIndex = EventStore.Core.Services.Storage.ReaderIndex.IReadIndex;
-
-namespace EventStore.Core.Services.Transport.Enumerators {
-	partial class Enumerator {
-		public class ReadAllBackwardsFiltered : IAsyncEnumerator<ReadResponse> {
-			private static readonly ILogger Log = Serilog.Log.ForContext<ReadAllBackwardsFiltered>();
-
-			private readonly IPublisher _bus;
-			private readonly ulong _maxCount;
-			private readonly bool _resolveLinks;
-			private readonly IEventFilter _eventFilter;
-			private readonly ClaimsPrincipal _user;
-			private readonly bool _requiresLeader;
-			private readonly DateTime _deadline;
-			private readonly uint _maxSearchWindow;
-			private readonly CancellationToken _cancellationToken;
-			private readonly SemaphoreSlim _semaphore;
-			private readonly Channel<ReadResponse> _channel;
-
-			private ReadResponse _current;
-
-			public ReadResponse Current => _current;
-
-			public ReadAllBackwardsFiltered(IPublisher bus,
-				Position position,
-				ulong maxCount,
-				bool resolveLinks,
-				IEventFilter eventFilter,
-				ClaimsPrincipal user,
-				bool requiresLeader,
-				uint? maxSearchWindow,
-				DateTime deadline,
-				CancellationToken cancellationToken) {
-				if (bus == null) {
-					throw new ArgumentNullException(nameof(bus));
-				}
-
-				if (eventFilter == null) {
-					throw new ArgumentNullException(nameof(eventFilter));
-				}
-
-				_bus = bus;
-				_maxCount = maxCount;
-				_resolveLinks = resolveLinks;
-				_eventFilter = eventFilter;
-				_user = user;
-				_requiresLeader = requiresLeader;
-				_maxSearchWindow = maxSearchWindow ?? ReadBatchSize;
-				_deadline = deadline;
-				_cancellationToken = cancellationToken;
-				_semaphore = new SemaphoreSlim(1, 1);
-				_channel = Channel.CreateBounded<ReadResponse>(BoundedChannelOptions);
-
-				ReadPage(position);
-			}
-
-			public ValueTask DisposeAsync() {
-				_channel.Writer.TryComplete();
-				return new ValueTask(Task.CompletedTask);
-			}
-
-			public async ValueTask<bool> MoveNextAsync() {
-				if (!await _channel.Reader.WaitToReadAsync(_cancellationToken)) {
-					return false;
-				}
-
-				_current = await _channel.Reader.ReadAsync(_cancellationToken);
-
-				return true;
-			}
-
-			private void ReadPage(Position startPosition, ulong readCount = 0) {
-				var correlationId = Guid.NewGuid();
-
-				var (commitPosition, preparePosition) = startPosition.ToInt64();
-
-				_bus.Publish(new ClientMessage.FilteredReadAllEventsBackward(
-					correlationId, correlationId, new ContinuationEnvelope(OnMessage, _semaphore, _cancellationToken),
-					commitPosition, preparePosition, (int)Math.Min(ReadBatchSize, _maxCount), _resolveLinks,
-					_requiresLeader, (int)_maxSearchWindow, null, _eventFilter, _user, expires: _deadline,
-					cancellationToken: _cancellationToken));
-
-				async Task OnMessage(Message message, CancellationToken ct) {
-					if (message is ClientMessage.NotHandled notHandled &&
-					    TryHandleNotHandled(notHandled, out var ex)) {
-						_channel.Writer.TryComplete(ex);
-						return;
-					}
-
-					if (message is not ClientMessage.FilteredReadAllEventsBackwardCompleted completed) {
-						_channel.Writer.TryComplete(
-							ReadResponseException.UnknownMessage.Create<ClientMessage.FilteredReadAllEventsBackwardCompleted>(message));
-						return;
-					}
-
-					switch (completed.Result) {
-						case FilteredReadAllResult.Success:
-							foreach (var @event in completed.Events) {
-								if (readCount >= _maxCount) {
-									_channel.Writer.TryComplete();
-									return;
-								}
-								await _channel.Writer.WriteAsync(new ReadResponse.EventReceived(@event), ct);
-								readCount++;
-							}
-
-							if (completed.IsEndOfStream) {
-								_channel.Writer.TryComplete();
-								return;
-							}
-
-							ReadPage(Position.FromInt64(
-								completed.NextPos.CommitPosition,
-								completed.NextPos.PreparePosition), readCount);
-							return;
-						case FilteredReadAllResult.AccessDenied:
-							_channel.Writer.TryComplete(new ReadResponseException.AccessDenied());
-							return;
-						default:
-							_channel.Writer.TryComplete(ReadResponseException.UnknownError.Create(completed.Result));
-							return;
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.ReadAllForwards.cs b/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.ReadAllForwards.cs
deleted file mode 100644
index 34a4ae8aa3c..00000000000
--- a/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.ReadAllForwards.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Transport.Common;
-
-namespace EventStore.Core.Services.Transport.Enumerators {
-	partial class Enumerator {
-		public class ReadAllForwards : IAsyncEnumerator<ReadResponse> {
-			private readonly IPublisher _bus;
-			private readonly ulong _maxCount;
-			private readonly bool _resolveLinks;
-			private readonly ClaimsPrincipal _user;
-			private readonly bool _requiresLeader;
-			private readonly DateTime _deadline;
-			private readonly CancellationToken _cancellationToken;
-			private readonly SemaphoreSlim _semaphore;
-			private readonly Channel<ReadResponse> _channel;
-
-			private ReadResponse _current;
-
-			public ReadResponse Current => _current;
-
-			public ReadAllForwards(IPublisher bus,
-				Position position,
-				ulong maxCount,
-				bool resolveLinks,
-				ClaimsPrincipal user,
-				bool requiresLeader,
-				DateTime deadline,
-				CancellationToken cancellationToken) {
-				if (bus == null) {
-					throw new ArgumentNullException(nameof(bus));
-				}
-
-				_bus = bus;
-				_maxCount = maxCount;
-				_resolveLinks = resolveLinks;
-				_user = user;
-				_requiresLeader = requiresLeader;
-				_deadline = deadline;
-				_cancellationToken = cancellationToken;
-				_semaphore = new SemaphoreSlim(1, 1);
-				_channel = Channel.CreateBounded<ReadResponse>(BoundedChannelOptions);
-
-				ReadPage(position);
-			}
-
-			public ValueTask DisposeAsync() {
-				_channel.Writer.TryComplete();
-				return new ValueTask(Task.CompletedTask);
-			}
-
-			public async ValueTask<bool> MoveNextAsync() {
-				if (!await _channel.Reader.WaitToReadAsync(_cancellationToken)) {
-					return false;
-				}
-
-				_current = await _channel.Reader.ReadAsync(_cancellationToken);
-
-				return true;
-			}
-
-			private void ReadPage(Position startPosition, ulong readCount = 0) {
-				var correlationId = Guid.NewGuid();
-
-				var (commitPosition, preparePosition) = startPosition.ToInt64();
-
-				_bus.Publish(new ClientMessage.ReadAllEventsForward(
-					correlationId, correlationId, new ContinuationEnvelope(OnMessage, _semaphore, _cancellationToken),
-					commitPosition, preparePosition, (int)Math.Min(ReadBatchSize, _maxCount), _resolveLinks,
-					_requiresLeader, default, _user, replyOnExpired: false, expires: _deadline,
-					cancellationToken: _cancellationToken));
-
-				async Task OnMessage(Message message, CancellationToken ct) {
-					if (message is ClientMessage.NotHandled notHandled &&
-					    TryHandleNotHandled(notHandled, out var ex)) {
-						_channel.Writer.TryComplete(ex);
-						return;
-					}
-
-					if (message is not ClientMessage.ReadAllEventsForwardCompleted completed) {
-						_channel.Writer.TryComplete(
-							ReadResponseException.UnknownMessage.Create<ClientMessage.ReadAllEventsForwardCompleted>(message));
-						return;
-					}
-
-					switch (completed.Result) {
-						case ReadAllResult.Success:
-							foreach (var @event in completed.Events) {
-								if (readCount >= _maxCount) {
-									_channel.Writer.TryComplete();
-									return;
-								}
-
-								await _channel.Writer.WriteAsync(new ReadResponse.EventReceived(@event), ct);
-								readCount++;
-							}
-
-							if (completed.IsEndOfStream) {
-								_channel.Writer.TryComplete();
-								return;
-							}
-
-							ReadPage(Position.FromInt64(
-								completed.NextPos.CommitPosition,
-								completed.NextPos.PreparePosition), readCount);
-							return;
-						case ReadAllResult.AccessDenied:
-							_channel.Writer.TryComplete(new ReadResponseException.AccessDenied());
-							return;
-						default:
-							_channel.Writer.TryComplete(ReadResponseException.UnknownError.Create(completed.Result));
-							return;
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.ReadAllForwardsFiltered.cs b/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.ReadAllForwardsFiltered.cs
deleted file mode 100644
index 209a355c79b..00000000000
--- a/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.ReadAllForwardsFiltered.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.Transport.Common;
-using Serilog;
-using IReadIndex = EventStore.Core.Services.Storage.ReaderIndex.IReadIndex;
-
-namespace EventStore.Core.Services.Transport.Enumerators {
-	partial class Enumerator {
-		public class ReadAllForwardsFiltered : IAsyncEnumerator<ReadResponse> {
-			private static readonly ILogger Log = Serilog.Log.ForContext<ReadAllForwardsFiltered>();
-
-			private readonly IPublisher _bus;
-			private readonly ulong _maxCount;
-			private readonly bool _resolveLinks;
-			private readonly IEventFilter _eventFilter;
-			private readonly ClaimsPrincipal _user;
-			private readonly bool _requiresLeader;
-			private readonly DateTime _deadline;
-			private readonly uint _maxSearchWindow;
-			private readonly CancellationToken _cancellationToken;
-			private readonly SemaphoreSlim _semaphore;
-			private readonly Channel<ReadResponse> _channel;
-
-			private ReadResponse _current;
-
-			public ReadResponse Current => _current;
-
-			public ReadAllForwardsFiltered(IPublisher bus,
-				Position position,
-				ulong maxCount,
-				bool resolveLinks,
-				IEventFilter eventFilter,
-				ClaimsPrincipal user,
-				bool requiresLeader,
-				uint? maxSearchWindow,
-				DateTime deadline,
-				CancellationToken cancellationToken) {
-				if (bus == null) {
-					throw new ArgumentNullException(nameof(bus));
-				}
-
-				if (eventFilter == null) {
-					throw new ArgumentNullException(nameof(eventFilter));
-				}
-
-				_bus = bus;
-				_maxCount = maxCount;
-				_resolveLinks = resolveLinks;
-				_eventFilter = eventFilter;
-				_user = user;
-				_requiresLeader = requiresLeader;
-				_maxSearchWindow = maxSearchWindow ?? ReadBatchSize;
-				_deadline = deadline;
-				_cancellationToken = cancellationToken;
-				_semaphore = new SemaphoreSlim(1, 1);
-				_channel = Channel.CreateBounded<ReadResponse>(BoundedChannelOptions);
-
-				ReadPage(position);
-			}
-
-			public ValueTask DisposeAsync() {
-				_channel.Writer.TryComplete();
-				return new ValueTask(Task.CompletedTask);
-			}
-
-			public async ValueTask<bool> MoveNextAsync() {
-				if (!await _channel.Reader.WaitToReadAsync(_cancellationToken)) {
-					return false;
-				}
-
-				_current = await _channel.Reader.ReadAsync(_cancellationToken);
-
-				return true;
-			}
-
-			private void ReadPage(Position startPosition, ulong readCount = 0) {
-				var correlationId = Guid.NewGuid();
-
-				var (commitPosition, preparePosition) = startPosition.ToInt64();
-
-				_bus.Publish(new ClientMessage.FilteredReadAllEventsForward(
-					correlationId, correlationId, new ContinuationEnvelope(OnMessage, _semaphore, _cancellationToken),
-					commitPosition, preparePosition, (int)Math.Min(ReadBatchSize, _maxCount), _resolveLinks,
-					_requiresLeader, (int)_maxSearchWindow, null, _eventFilter, _user,
-					replyOnExpired: false,
-					expires: _deadline,
-					cancellationToken: _cancellationToken));
-
-				async Task OnMessage(Message message, CancellationToken ct) {
-					if (message is ClientMessage.NotHandled notHandled &&
-					    TryHandleNotHandled(notHandled, out var ex)) {
-						_channel.Writer.TryComplete(ex);
-						return;
-					}
-
-					if (message is not ClientMessage.FilteredReadAllEventsForwardCompleted completed) {
-						_channel.Writer.TryComplete(
-							ReadResponseException.UnknownMessage.Create<ClientMessage.FilteredReadAllEventsForwardCompleted>(message));
-						return;
-					}
-
-					switch (completed.Result) {
-						case FilteredReadAllResult.Success:
-							foreach (var @event in completed.Events) {
-								if (readCount >= _maxCount) {
-									_channel.Writer.TryComplete();
-									return;
-								}
-
-								await _channel.Writer.WriteAsync(new ReadResponse.EventReceived(@event), ct);
-								readCount++;
-							}
-
-							if (completed.IsEndOfStream) {
-								_channel.Writer.TryComplete();
-								return;
-							}
-
-							ReadPage(Position.FromInt64(
-								completed.NextPos.CommitPosition,
-								completed.NextPos.PreparePosition), readCount);
-							return;
-						case FilteredReadAllResult.AccessDenied:
-							_channel.Writer.TryComplete(new ReadResponseException.AccessDenied());
-							return;
-						default:
-							_channel.Writer.TryComplete(ReadResponseException.UnknownError.Create(completed.Result));
-							return;
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.ReadStreamBackwards.cs b/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.ReadStreamBackwards.cs
deleted file mode 100644
index 8084dc51dd5..00000000000
--- a/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.ReadStreamBackwards.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Transport.Common;
-
-namespace EventStore.Core.Services.Transport.Enumerators {
-	partial class Enumerator {
-		public class ReadStreamBackwards : IAsyncEnumerator<ReadResponse> {
-			private readonly IPublisher _bus;
-			private readonly string _streamName;
-			private readonly ulong _maxCount;
-			private readonly bool _resolveLinks;
-			private readonly ClaimsPrincipal _user;
-			private readonly bool _requiresLeader;
-			private readonly DateTime _deadline;
-			private readonly uint _compatibility;
-			private readonly CancellationToken _cancellationToken;
-			private readonly SemaphoreSlim _semaphore;
-			private readonly Channel<ReadResponse> _channel;
-
-			private ReadResponse _current;
-
-			public ReadResponse Current => _current;
-
-			public ReadStreamBackwards(IPublisher bus,
-				string streamName,
-				StreamRevision startRevision,
-				ulong maxCount,
-				bool resolveLinks,
-				ClaimsPrincipal user,
-				bool requiresLeader,
-				DateTime deadline,
-				uint compatibility,
-				CancellationToken cancellationToken) {
-				_bus = bus ?? throw new ArgumentNullException(nameof(bus));
-				_streamName = streamName ?? throw new ArgumentNullException(nameof(streamName));
-				_maxCount = maxCount;
-				_resolveLinks = resolveLinks;
-				_user = user;
-				_requiresLeader = requiresLeader;
-				_deadline = deadline;
-				_compatibility = compatibility;
-				_cancellationToken = cancellationToken;
-				_semaphore = new SemaphoreSlim(1, 1);
-				_channel = Channel.CreateBounded<ReadResponse>(BoundedChannelOptions);
-
-				ReadPage(startRevision);
-			}
-
-			public ValueTask DisposeAsync() {
-				_channel.Writer.TryComplete();
-				return new ValueTask(Task.CompletedTask);
-			}
-
-			public async ValueTask<bool> MoveNextAsync() {
-				if (!await _channel.Reader.WaitToReadAsync(_cancellationToken)) {
-					return false;
-				}
-
-				_current = await _channel.Reader.ReadAsync(_cancellationToken);
-
-				return true;
-			}
-
-			private void ReadPage(StreamRevision startRevision, ulong readCount = 0) {
-				Guid correlationId = Guid.NewGuid();
-
-				_bus.Publish(new ClientMessage.ReadStreamEventsBackward(
-					correlationId, correlationId, new ContinuationEnvelope(OnMessage, _semaphore, _cancellationToken),
-					_streamName, startRevision.ToInt64(), (int)Math.Min(ReadBatchSize, _maxCount), _resolveLinks,
-					_requiresLeader, null, _user, _deadline,
-					cancellationToken: _cancellationToken));
-
-				async Task OnMessage(Message message, CancellationToken ct) {
-					if (message is ClientMessage.NotHandled notHandled &&
-					    TryHandleNotHandled(notHandled, out var ex)) {
-						_channel.Writer.TryComplete(ex);
-						return;
-					}
-
-					if (message is not ClientMessage.ReadStreamEventsBackwardCompleted completed) {
-						_channel.Writer.TryComplete(
-							ReadResponseException.UnknownMessage.Create<ClientMessage.ReadStreamEventsBackwardCompleted>(message));
-						return;
-					}
-
-					switch (completed.Result) {
-						case ReadStreamResult.Success:
-							foreach (var @event in completed.Events) {
-								if (readCount >= _maxCount) {
-									break;
-								}
-								await _channel.Writer.WriteAsync(new ReadResponse.EventReceived(@event), ct);
-								readCount++;
-							}
-
-							if (!completed.IsEndOfStream && readCount < _maxCount) {
-								ReadPage(StreamRevision.FromInt64(completed.NextEventNumber), readCount);
-								return;
-							}
-
-							if (_compatibility >= 1) {
-								await _channel.Writer
-									.WriteAsync(
-										new ReadResponse.LastStreamPositionReceived(
-											StreamRevision.FromInt64(completed.LastEventNumber)), ct);
-							}
-
-							_channel.Writer.TryComplete();
-							return;
-						case ReadStreamResult.NoStream:
-							await _channel.Writer.WriteAsync(new ReadResponse.StreamNotFound(_streamName), ct);
-							_channel.Writer.TryComplete();
-							return;
-						case ReadStreamResult.StreamDeleted:
-							_channel.Writer.TryComplete(new ReadResponseException.StreamDeleted(_streamName));
-							return;
-						case ReadStreamResult.AccessDenied:
-							_channel.Writer.TryComplete(new ReadResponseException.AccessDenied());
-							return;
-						default:
-							_channel.Writer.TryComplete(ReadResponseException.UnknownError.Create(completed.Result));
-							return;
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.ReadStreamForwards.cs b/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.ReadStreamForwards.cs
deleted file mode 100644
index 97c0e9ae80a..00000000000
--- a/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.ReadStreamForwards.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Transport.Common;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-
-namespace EventStore.Core.Services.Transport.Enumerators {
-	partial class Enumerator {
-		public class ReadStreamForwards : IAsyncEnumerator<ReadResponse> {
-			private readonly IPublisher _bus;
-			private readonly string _streamName;
-			private readonly ulong _maxCount;
-			private readonly bool _resolveLinks;
-			private readonly ClaimsPrincipal _user;
-			private readonly bool _requiresLeader;
-			private readonly DateTime _deadline;
-			private readonly uint _compatibility;
-			private readonly CancellationToken _cancellationToken;
-			private readonly SemaphoreSlim _semaphore;
-			private readonly Channel<ReadResponse> _channel;
-
-			private ReadResponse _current;
-
-			public ReadResponse Current => _current;
-
-			public ReadStreamForwards(IPublisher bus,
-				string streamName,
-				StreamRevision startRevision,
-				ulong maxCount,
-				bool resolveLinks,
-				ClaimsPrincipal user,
-				bool requiresLeader,
-				DateTime deadline,
-				uint compatibility,
-				CancellationToken cancellationToken) {
-				_bus = bus ?? throw new ArgumentNullException(nameof(bus));
-				_streamName = streamName ?? throw new ArgumentNullException(nameof(streamName));
-				_maxCount = maxCount;
-				_resolveLinks = resolveLinks;
-				_user = user;
-				_requiresLeader = requiresLeader;
-				_deadline = deadline;
-				_compatibility = compatibility;
-				_cancellationToken = cancellationToken;
-				_semaphore = new SemaphoreSlim(1, 1);
-				_channel = Channel.CreateBounded<ReadResponse>(BoundedChannelOptions);
-
-				ReadPage(startRevision);
-			}
-
-			public ValueTask DisposeAsync() {
-				_channel.Writer.TryComplete();
-				return new ValueTask(Task.CompletedTask);
-			}
-
-			public async ValueTask<bool> MoveNextAsync() {
-				if (!await _channel.Reader.WaitToReadAsync(_cancellationToken)) {
-					return false;
-				}
-
-				_current = await _channel.Reader.ReadAsync(_cancellationToken);
-
-				return true;
-			}
-
-			private void ReadPage(StreamRevision startRevision, ulong readCount = 0) {
-				Guid correlationId = Guid.NewGuid();
-
-				_bus.Publish(new ClientMessage.ReadStreamEventsForward(
-					correlationId, correlationId, new ContinuationEnvelope(OnMessage, _semaphore, _cancellationToken),
-					_streamName, startRevision.ToInt64(), (int)Math.Min(ReadBatchSize, _maxCount), _resolveLinks,
-					_requiresLeader, null, _user, replyOnExpired: false, expires: _deadline,
-					cancellationToken: _cancellationToken));
-
-				async Task OnMessage(Message message, CancellationToken ct) {
-					if (message is ClientMessage.NotHandled notHandled &&
-					    TryHandleNotHandled(notHandled, out var ex)) {
-						_channel.Writer.TryComplete(ex);
-						return;
-					}
-
-					if (message is not ClientMessage.ReadStreamEventsForwardCompleted completed) {
-						_channel.Writer.TryComplete(
-							ReadResponseException.UnknownMessage.Create<ClientMessage.ReadStreamEventsForwardCompleted>(message));
-						return;
-					}
-
-					switch (completed.Result) {
-						case ReadStreamResult.Success:
-							if (readCount == 0 && _compatibility >= 1) {
-								if (completed.Events.Length == 0) {
-									var firstStreamPosition = StreamRevision.FromInt64(completed.NextEventNumber);
-									if (startRevision != firstStreamPosition) {
-										await _channel.Writer
-											.WriteAsync(new ReadResponse.FirstStreamPositionReceived(firstStreamPosition), ct);
-									}
-								}
-							}
-
-							foreach (var @event in completed.Events) {
-								if (readCount >= _maxCount) {
-									break;
-								}
-								await _channel.Writer.WriteAsync(new ReadResponse.EventReceived(@event), ct);
-								readCount++;
-							}
-
-							if (!completed.IsEndOfStream && readCount < _maxCount) {
-								ReadPage(StreamRevision.FromInt64(completed.NextEventNumber), readCount);
-								return;
-							}
-
-							if (_compatibility >= 1) {
-								await _channel.Writer
-									.WriteAsync(
-										new ReadResponse.LastStreamPositionReceived(
-											StreamRevision.FromInt64(completed.LastEventNumber)), ct);
-							}
-
-							_channel.Writer.TryComplete();
-							return;
-
-						case ReadStreamResult.NoStream:
-							await _channel.Writer.WriteAsync(new ReadResponse.StreamNotFound(_streamName), ct);
-							_channel.Writer.TryComplete();
-							return;
-						case ReadStreamResult.StreamDeleted:
-							_channel.Writer.TryComplete(new ReadResponseException.StreamDeleted(_streamName));
-							return;
-						case ReadStreamResult.AccessDenied:
-							_channel.Writer.TryComplete(new ReadResponseException.AccessDenied());
-							return;
-						default:
-							_channel.Writer.TryComplete(ReadResponseException.UnknownError.Create(completed.Result));
-							return;
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.StreamSubscription.cs b/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.StreamSubscription.cs
deleted file mode 100644
index df44ba9b50e..00000000000
--- a/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.StreamSubscription.cs
+++ /dev/null
@@ -1,384 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.Transport.Common;
-using Serilog;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-
-namespace EventStore.Core.Services.Transport.Enumerators {
-	static partial class Enumerator {
-		public abstract class StreamSubscription : IAsyncEnumerator<ReadResponse> {
-			protected static readonly ILogger Log = Serilog.Log.ForContext<StreamSubscription>();
-			public abstract ValueTask DisposeAsync();
-			public abstract ValueTask<bool> MoveNextAsync();
-			public abstract ReadResponse Current { get; }
-		}
-
-		public class StreamSubscription<TStreamId> : StreamSubscription {
-			private readonly IExpiryStrategy _expiryStrategy;
-			private readonly Guid _subscriptionId;
-			private readonly IPublisher _bus;
-			private readonly string _streamName;
-			private readonly bool _resolveLinks;
-			private readonly ClaimsPrincipal _user;
-			private readonly bool _requiresLeader;
-			private readonly CancellationTokenSource _cts;
-			private readonly Channel<ReadResponse> _channel;
-			private readonly Channel<(ulong SequenceNumber, ResolvedEvent ResolvedEvent)> _liveEvents;
-
-			private ReadResponse _current;
-			private bool _disposed;
-			private StreamRevision? _currentRevision;
-
-			public override ReadResponse Current => _current;
-			public string SubscriptionId { get; }
-
-			public StreamSubscription(
-				IPublisher bus,
-				IExpiryStrategy expiryStrategy,
-				string streamName,
-				StreamRevision? checkpoint,
-				bool resolveLinks,
-				ClaimsPrincipal user,
-				bool requiresLeader,
-				CancellationToken cancellationToken) {
-				ArgumentNullException.ThrowIfNull(bus);
-				ArgumentNullException.ThrowIfNull(streamName);
-
-				_expiryStrategy = expiryStrategy;
-				_subscriptionId = Guid.NewGuid();
-				_bus = bus;
-				_streamName = streamName;
-				_resolveLinks = resolveLinks;
-				_user = user;
-				_requiresLeader = requiresLeader;
-				_cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
-				_channel = Channel.CreateBounded<ReadResponse>(BoundedChannelOptions);
-				_liveEvents = Channel.CreateBounded<(ulong, ResolvedEvent)>(LiveChannelOptions);
-				_currentRevision = null;
-
-				SubscriptionId = _subscriptionId.ToString();
-
-				Subscribe(checkpoint, _cts.Token);
-			}
-
-			public override ValueTask DisposeAsync() {
-				if (_disposed) {
-					return ValueTask.CompletedTask;
-				}
-
-				Log.Debug("Subscription {subscriptionId} to {streamName} disposed.", _subscriptionId,
-					_streamName);
-				_disposed = true;
-
-				Unsubscribe();
-
-				_cts.Cancel();
-				_cts.Dispose();
-
-				return ValueTask.CompletedTask;
-			}
-
-			public override async ValueTask<bool> MoveNextAsync() {
-				ReadLoop:
-
-				if (!await _channel.Reader.WaitToReadAsync(_cts.Token)) {
-					return false;
-				}
-
-				var readResponse = await _channel.Reader.ReadAsync(_cts.Token);
-
-				if (readResponse is ReadResponse.EventReceived eventReceived) {
-					var @event = eventReceived.Event;
-					var streamRevision = StreamRevision.FromInt64(@event.OriginalEventNumber);
-
-					if (_currentRevision.HasValue && streamRevision <= _currentRevision.Value) {
-						// this should no longer happen
-						Log.Warning(
-							"Subscription {subscriptionId} to {streamName} skipping event {streamRevision} as it is less than {currentRevision}.",
-							_subscriptionId, _streamName, streamRevision, _currentRevision);
-
-						goto ReadLoop;
-					}
-
-					_currentRevision = streamRevision;
-
-					Log.Verbose(
-						"Subscription {subscriptionId} to {streamName} seen event {streamRevision}.",
-						_subscriptionId, _streamName, streamRevision);
-				}
-
-				_current = readResponse;
-
-				return true;
-			}
-
-			private void Subscribe(StreamRevision? checkpoint, CancellationToken ct) {
-				Task.Factory.StartNew(() => MainLoop(checkpoint, ct), ct);
-			}
-
-			private static long ConvertCheckpoint(StreamRevision? checkpoint, long lastLiveEventNumber) {
-				if (!checkpoint.HasValue)
-					return -1;
-
-				if (checkpoint == StreamRevision.End)
-					return lastLiveEventNumber;
-
-				return checkpoint.Value.ToInt64();
-			}
-
-			private async Task MainLoop(StreamRevision? checkpointRevision, CancellationToken ct) {
-				try {
-					Log.Information("Subscription {subscriptionId} to {streamName} has started at checkpoint {streamRevision:N0}",
-						_subscriptionId, _streamName, checkpointRevision?.ToString() ?? "Start");
-
-					var confirmationLastEventNumber = await SubscribeToLive();
-					await ConfirmSubscription(ct);
-
-					// the event number we most recently sent on towards the client.
-					// (we should send on events _after_ this)
-					var checkpoint = ConvertCheckpoint(checkpointRevision, confirmationLastEventNumber);
-
-					// the most recently read sequence number from the live channel. 0 when we haven't read any.
-					var sequenceNumber = 0UL;
-
-					if (checkpoint >= confirmationLastEventNumber)
-						(checkpoint, sequenceNumber) = await GoLive(checkpoint, sequenceNumber, ct);
-
-					while (true) {
-						ct.ThrowIfCancellationRequested();
-						checkpoint = await CatchUp(checkpoint, ct);
-						(checkpoint, sequenceNumber) = await GoLive(checkpoint, sequenceNumber, ct);
-					}
-				} catch (Exception ex) {
-					if (ex is not (OperationCanceledException or ReadResponseException.StreamDeleted))
-						Log.Error(ex, "Subscription {subscriptionId} to {streamName} experienced an error.", _subscriptionId, _streamName);
-					_channel.Writer.TryComplete(ex);
-				} finally {
-					Log.Information("Subscription {subscriptionId} to {streamName} has ended.", _subscriptionId, _streamName);
-				}
-			}
-
-			private async Task NotifyCaughtUp(long checkpoint, CancellationToken ct) {
-				Log.Debug(
-					"Subscription {subscriptionId} to {streamName} caught up at checkpoint {streamRevision:N0}.",
-					_subscriptionId, _streamName, checkpoint);
-
-				await _channel.Writer.WriteAsync(new ReadResponse.SubscriptionCaughtUp(), ct);
-			}
-
-			private async Task NotifyFellBehind(long checkpoint, CancellationToken ct) {
-				Log.Debug(
-					"Subscription {subscriptionId} to {streamName} fell behind at checkpoint {streamRevision:N0}.",
-					_subscriptionId, _streamName, checkpoint);
-
-				await _channel.Writer.WriteAsync(new ReadResponse.SubscriptionFellBehind(), ct);
-			}
-
-			private async ValueTask<(long, ulong)> GoLive(long checkpoint, ulong sequenceNumber, CancellationToken ct) {
-				await NotifyCaughtUp(checkpoint, ct);
-
-				await foreach (var liveEvent in _liveEvents.Reader.ReadAllAsync(ct)) {
-					var sequenceCorrect = liveEvent.SequenceNumber == sequenceNumber + 1;
-					sequenceNumber = liveEvent.SequenceNumber;
-
-					if (liveEvent.ResolvedEvent.OriginalEventNumber <= checkpoint) {
-						// skip because this event has already been sent towards the client
-						// (or the client specified a checkpoint for events that don't exist yet and so
-						// is not interested in them)
-						// nb: we can skip this event even if it had the wrong sequence number, it means
-						// we would have skipped the events that got discarded anyway.
-						continue;
-					}
-
-					if (!sequenceCorrect) {
-						// there's a gap in the sequence numbers, at least one live event was discarded
-						// due to the live channel becoming full.
-						// switch back to catchup to make sure we didn't miss anything we wanted to send.
-						await NotifyFellBehind(checkpoint, ct);
-						return (checkpoint, sequenceNumber);
-					}
-
-					// this is the next event to send towards the client. send it and update the checkpoint
-					await SendEventToSubscription(liveEvent.ResolvedEvent, ct);
-					checkpoint = liveEvent.ResolvedEvent.OriginalEventNumber;
-				}
-
-				throw new Exception($"Unexpected error: live events channel for subscription {_subscriptionId} to {_streamName} completed without exception");
-			}
-
-			private Task<long> CatchUp(long checkpoint, CancellationToken ct) {
-				var startEventNumber = checkpoint + 1;
-				Log.Verbose(
-					"Subscription {subscriptionId} to {streamName} is catching up from checkpoint {checkpoint:N0}",
-					_subscriptionId, _streamName, checkpoint);
-
-				var catchupCompletionTcs = new TaskCompletionSource<long>();
-
-				// this is a safe use of AsyncTaskEnvelope. Only one call to OnMessage will be running
-				// at any given time because we only expect one reply and that reply kicks off the next read.
-				AsyncTaskEnvelope envelope = null;
-				envelope = new AsyncTaskEnvelope(OnMessage, ct);
-
-				ReadPage(startEventNumber, envelope, ct);
-
-				return catchupCompletionTcs.Task;
-
-				async Task OnMessage(Message message, CancellationToken ct) {
-					try {
-						if (message is ClientMessage.NotHandled notHandled &&
-						    TryHandleNotHandled(notHandled, out var ex))
-							throw ex;
-
-						if (message is not ClientMessage.ReadStreamEventsForwardCompleted completed)
-							throw ReadResponseException.UnknownMessage
-								.Create<ClientMessage.ReadStreamEventsForwardCompleted>(message);
-
-						switch (completed.Result) {
-							case ReadStreamResult.Success:
-								foreach (var @event in completed.Events) {
-									var streamRevision = StreamRevision.FromInt64(@event.OriginalEvent.EventNumber);
-
-									Log.Verbose(
-										"Subscription {subscriptionId} to {streamName} received catch-up event {streamRevision}.",
-										_subscriptionId, _streamName, streamRevision);
-
-									await SendEventToSubscription(@event, ct);
-									checkpoint = @event.OriginalEventNumber;
-								}
-
-								if (completed.IsEndOfStream) {
-									catchupCompletionTcs.TrySetResult(checkpoint);
-									return;
-								}
-
-								ReadPage(completed.NextEventNumber, envelope, ct);
-								return;
-							case ReadStreamResult.Expired:
-								ReadPage(completed.FromEventNumber, envelope, ct);
-								return;
-							case ReadStreamResult.NoStream:
-								catchupCompletionTcs.TrySetResult(checkpoint);
-								return;
-							case ReadStreamResult.StreamDeleted:
-								Log.Debug(
-									"Subscription {subscriptionId} to {streamName} stream deleted.",
-									_subscriptionId, _streamName);
-								throw new ReadResponseException.StreamDeleted(_streamName);
-							case ReadStreamResult.AccessDenied:
-								throw new ReadResponseException.AccessDenied();
-							default:
-								throw ReadResponseException.UnknownError.Create(completed.Result);
-						}
-					} catch (Exception exception) {
-						catchupCompletionTcs.TrySetException(exception);
-					}
-				}
-			}
-
-			private async Task SendEventToSubscription(ResolvedEvent @event, CancellationToken ct) {
-				await _channel.Writer.WriteAsync(new ReadResponse.EventReceived(@event), ct);
-
-				if (@event.OriginalEvent.EventType == SystemEventTypes.StreamDeleted)
-					throw new ReadResponseException.StreamDeleted(_streamName);
-			}
-
-			private Task<long> SubscribeToLive() {
-				var nextLiveSequenceNumber = 0UL;
-				var confirmationEventNumberTcs = new TaskCompletionSource<long>();
-
-				_bus.Publish(new ClientMessage.SubscribeToStream(Guid.NewGuid(), _subscriptionId,
-					new CallbackEnvelope(OnSubscriptionMessage), _subscriptionId,
-					_streamName, _resolveLinks, _user));
-
-				return confirmationEventNumberTcs.Task;
-
-				void OnSubscriptionMessage(Message message) {
-					try {
-						if (message is ClientMessage.NotHandled notHandled &&
-						    TryHandleNotHandled(notHandled, out var ex))
-							throw ex;
-
-						switch (message) {
-							case ClientMessage.SubscriptionConfirmation confirmed:
-								long caughtUp = confirmed.LastEventNumber ??
-								                throw ReadResponseException.UnknownError.Create(
-									                $"Live subscription {_subscriptionId} to {_streamName} failed to retrieve the last event number.");
-
-								Log.Debug(
-									"Subscription {subscriptionId} to {streamName} confirmed. LastEventNumber is {streamRevision:N0}.",
-									_subscriptionId, _streamName, caughtUp);
-
-								confirmationEventNumberTcs.TrySetResult(caughtUp);
-								return;
-							case ClientMessage.SubscriptionDropped dropped:
-								Log.Debug(
-									"Subscription {subscriptionId} to {streamName} dropped by subscription service: {droppedReason}",
-									_subscriptionId, _streamName, dropped.Reason);
-								switch (dropped.Reason) {
-									case SubscriptionDropReason.AccessDenied:
-										throw new ReadResponseException.AccessDenied();
-									case SubscriptionDropReason.StreamDeleted:
-										throw new ReadResponseException.StreamDeleted(_streamName);
-									case SubscriptionDropReason.Unsubscribed:
-										return;
-									case SubscriptionDropReason.NotFound: // applies only to persistent subscriptions
-									default:
-										throw ReadResponseException.UnknownError.Create(dropped.Reason);
-								}
-							case ClientMessage.StreamEventAppeared appeared: {
-								Log.Verbose(
-									"Subscription {subscriptionId} to {streamName} received live event {streamRevision}.",
-									_subscriptionId, _streamName, appeared.Event.OriginalEventNumber);
-
-								if (!_liveEvents.Writer.TryWrite((++nextLiveSequenceNumber, appeared.Event))) {
-									// this cannot happen because _liveEvents does not have full mode 'wait'.
-									throw new Exception($"Unexpected error: could not write to live events channel for subscription {_subscriptionId} to {_streamName}");
-								}
-
-								return;
-							}
-							default:
-								throw ReadResponseException.UnknownMessage
-									.Create<ClientMessage.SubscriptionConfirmation>(message);
-						}
-					} catch (Exception exception) {
-						_liveEvents.Writer.TryComplete(exception);
-						confirmationEventNumberTcs.TrySetException(exception);
-					}
-				}
-			}
-
-			private ValueTask ConfirmSubscription(CancellationToken ct) {
-				return _channel.Writer.WriteAsync(new ReadResponse.SubscriptionConfirmed(SubscriptionId), ct);
-			}
-
-			private void ReadPage(long startEventNumber, IEnvelope envelope, CancellationToken ct) {
-				Guid correlationId = Guid.NewGuid();
-				Log.Verbose(
-					"Subscription {subscriptionId} to {streamName} reading next page starting from {streamRevision}.",
-					_subscriptionId, _streamName, startEventNumber);
-
-				_bus.Publish(new ClientMessage.ReadStreamEventsForward(
-					correlationId, correlationId, envelope,
-					_streamName, startEventNumber, ReadBatchSize, _resolveLinks, _requiresLeader, null,
-					_user,
-					replyOnExpired: true,
-					expires: _expiryStrategy.GetExpiry(),
-					cancellationToken: ct));
-			}
-
-			private void Unsubscribe() => _bus.Publish(new ClientMessage.UnsubscribeFromStream(Guid.NewGuid(),
-				_subscriptionId, new NoopEnvelope(), _user));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.cs b/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.cs
deleted file mode 100644
index b3193432ac2..00000000000
--- a/src/EventStore.Core/Services/Transport/Enumerators/Enumerator.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System.Threading.Channels;
-using EventStore.Common.Utils;
-using EventStore.Core.Messages;
-
-namespace EventStore.Core.Services.Transport.Enumerators {
-	public static partial class Enumerator {
-		private const int MaxLiveEventBufferCount = 32;
-		private const int ReadBatchSize = 32; // TODO  JPB make this configurable
-
-		private static readonly BoundedChannelOptions BoundedChannelOptions =
-			new(MaxLiveEventBufferCount) {
-				FullMode = BoundedChannelFullMode.Wait,
-				SingleReader = true,
-				SingleWriter = true
-			};
-
-		private static readonly BoundedChannelOptions LiveChannelOptions =
-			new(MaxLiveEventBufferCount) {
-				FullMode = BoundedChannelFullMode.DropOldest,
-				SingleReader = true,
-				SingleWriter = true
-			};
-
-		private static bool TryHandleNotHandled(ClientMessage.NotHandled notHandled, out ReadResponseException exception) {
-			exception = null;
-			switch (notHandled.Reason) {
-				case ClientMessage.NotHandled.Types.NotHandledReason.NotReady:
-					exception = new ReadResponseException.NotHandled.ServerNotReady();
-					return true;
-				case ClientMessage.NotHandled.Types.NotHandledReason.TooBusy:
-					exception = new ReadResponseException.NotHandled.ServerBusy();
-					return true;
-				case ClientMessage.NotHandled.Types.NotHandledReason.NotLeader:
-				case ClientMessage.NotHandled.Types.NotHandledReason.IsReadOnly:
-					switch (notHandled.LeaderInfo) {
-						case { } leaderInfo:
-							exception = new ReadResponseException.NotHandled.LeaderInfo(leaderInfo.Http.GetHost(), leaderInfo.Http.GetPort());
-							return true;
-						default:
-							exception = new ReadResponseException.NotHandled.NoLeaderInfo();
-							return true;
-					}
-
-				default:
-					return false;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Enumerators/ReadResponse.cs b/src/EventStore.Core/Services/Transport/Enumerators/ReadResponse.cs
deleted file mode 100644
index ec1655408da..00000000000
--- a/src/EventStore.Core/Services/Transport/Enumerators/ReadResponse.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Core.Services.Transport.Common;
-
-namespace EventStore.Core.Services.Transport.Enumerators;
-
-public abstract class ReadResponse {
-	public class EventReceived: ReadResponse {
-		public ResolvedEvent Event;
-
-		public EventReceived(ResolvedEvent @event) {
-			Event = @event;
-		}
-	}
-
-	public class SubscriptionCaughtUp: ReadResponse { }
-
-	public class SubscriptionFellBehind: ReadResponse { }
-
-	public class CheckpointReceived: ReadResponse {
-		public readonly ulong CommitPosition;
-		public readonly ulong PreparePosition;
-
-		public CheckpointReceived(ulong commitPosition, ulong preparePosition) {
-			CommitPosition = commitPosition;
-			PreparePosition = preparePosition;
-		}
-	}
-
-	public class StreamNotFound: ReadResponse {
-		public readonly string StreamName;
-
-		public StreamNotFound(string streamName) {
-			StreamName = streamName;
-		}
-	}
-
-	public class SubscriptionConfirmed: ReadResponse {
-		public readonly string SubscriptionId;
-
-		public SubscriptionConfirmed(string subscriptionId) {
-			SubscriptionId = subscriptionId;
-		}
-	}
-
-	public class LastStreamPositionReceived : ReadResponse {
-		public readonly StreamRevision LastStreamPosition;
-
-		public LastStreamPositionReceived(StreamRevision lastStreamPosition) {
-			LastStreamPosition = lastStreamPosition;
-		}
-	}
-
-	public class FirstStreamPositionReceived : ReadResponse {
-		public readonly StreamRevision FirstStreamPosition;
-
-		public FirstStreamPositionReceived(StreamRevision firstStreamPosition) {
-			FirstStreamPosition = firstStreamPosition;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Enumerators/ReadResponseException.cs b/src/EventStore.Core/Services/Transport/Enumerators/ReadResponseException.cs
deleted file mode 100644
index 92a29c3b797..00000000000
--- a/src/EventStore.Core/Services/Transport/Enumerators/ReadResponseException.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Transport.Common;
-
-namespace EventStore.Core.Services.Transport.Enumerators;
-
-public abstract class ReadResponseException : Exception {
-	public class StreamNotFound(string streamName) : ReadResponseException {
-		public string StreamName { get; } = streamName;
-	}
-
-	public class WrongExpectedRevision(string stream, long expectedRevision, long actualRevision) : ReadResponseException {
-		public string Stream { get; } = stream;
-
-		public StreamRevision ExpectedStreamRevision { get; } = StreamRevision.FromInt64(expectedRevision);
-
-		public StreamRevision ActualStreamRevision { get; } = StreamRevision.FromInt64(actualRevision);
-	}
-
-	public class StreamDeleted : ReadResponseException {
-		public readonly string StreamName;
-
-		public StreamDeleted(string streamName) {
-			StreamName = streamName;
-		}
-	}
-
-	public class AccessDenied : ReadResponseException { }
-
-	public class InvalidPosition : ReadResponseException { }
-
-	public class Timeout : ReadResponseException {
-		public readonly string ErrorMessage;
-
-		public Timeout(string errorMessage) {
-			ErrorMessage = errorMessage;
-		}
-	}
-
-	public class UnknownMessage : ReadResponseException {
-		public readonly Type UnknownMessageType;
-		public readonly Type ExpectedMessageType;
-
-		public UnknownMessage(Type unknownMessageType, Type expectedMessageType) {
-			UnknownMessageType = unknownMessageType;
-			ExpectedMessageType = expectedMessageType;
-		}
-
-		public static UnknownMessage Create<T>(Message message) where T : Message => new(message.GetType(), typeof(T));
-	}
-
-	public class UnknownError : ReadResponseException {
-		public readonly Type ResultType;
-		public readonly object Result;
-
-		public UnknownError(Type resultType, object result) {
-			ResultType = resultType;
-			Result = result;
-		}
-
-		public static UnknownError Create<T>(T result) => new(typeof(T), result);
-	}
-
-	public abstract class NotHandled {
-		public class ServerNotReady : ReadResponseException { }
-
-		public class ServerBusy : ReadResponseException { }
-
-		public class LeaderInfo : ReadResponseException {
-			public string Host { get; }
-			public int Port { get; }
-
-			public LeaderInfo(string host, int port) {
-				Host = host;
-				Port = port;
-			}
-		}
-
-		public class NoLeaderInfo : ReadResponseException { }
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/AnyStreamRevision.cs b/src/EventStore.Core/Services/Transport/Grpc/AnyStreamRevision.cs
deleted file mode 100644
index 13aa5789eda..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/AnyStreamRevision.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using HashCode = EventStore.Core.Services.Transport.Common.HashCode;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	public struct AnyStreamRevision : IEquatable<AnyStreamRevision> {
-		public static readonly AnyStreamRevision NoStream = new AnyStreamRevision(Constants.NoStream);
-		public static readonly AnyStreamRevision Any = new AnyStreamRevision(Constants.Any);
-		public static readonly AnyStreamRevision StreamExists = new AnyStreamRevision(Constants.StreamExists);
-		private readonly int _value;
-
-		private static class Constants {
-			public const int NoStream = 1;
-			public const int Any = 2;
-			public const int StreamExists = 4;
-		}
-
-		public static AnyStreamRevision FromInt64(long value) => new AnyStreamRevision(-Convert.ToInt32(value));
-
-		public AnyStreamRevision(int value) {
-			switch (value) {
-				case Constants.NoStream:
-				case Constants.Any:
-				case Constants.StreamExists:
-					_value = value;
-					return;
-				default:
-					throw new ArgumentOutOfRangeException(nameof(value));
-			}
-		}
-
-		public readonly bool Equals(AnyStreamRevision other) => _value == other._value;
-		public override readonly bool Equals(object obj) => obj is AnyStreamRevision other && Equals(other);
-		public override readonly int GetHashCode() => HashCode.Hash.Combine(_value);
-		public static bool operator ==(AnyStreamRevision left, AnyStreamRevision right) => left.Equals(right);
-		public static bool operator !=(AnyStreamRevision left, AnyStreamRevision right) => !left.Equals(right);
-		public readonly long ToInt64() => -Convert.ToInt64(_value);
-		public static implicit operator int(AnyStreamRevision streamRevision) => streamRevision._value;
-
-		public override string ToString() => _value switch {
-			Constants.NoStream => nameof(NoStream),
-			Constants.Any => nameof(Any),
-			Constants.StreamExists => nameof(StreamExists),
-			_ => _value.ToString()
-		};
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/AsyncStreamExtensions.cs b/src/EventStore.Core/Services/Transport/Grpc/AsyncStreamExtensions.cs
deleted file mode 100644
index e89800292c2..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/AsyncStreamExtensions.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-#region Copyright notice and license
-
-// Copyright 2015 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#endregion
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Grpc.Core;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	/// <summary>
-	/// Extension methods that simplify work with gRPC streaming calls.
-	/// </summary>
-	public static class AsyncStreamExtensions {
-		/// <summary>
-		/// Reads the entire stream and executes an async action for each element.
-		/// </summary>
-		public static async ValueTask ForEachAsync<T>(this IAsyncStreamReader<T> streamReader,
-			Func<T, ValueTask> asyncAction,
-			CancellationToken token)
-			where T : class {
-			while (await streamReader.MoveNext(token)) {
-				await asyncAction(streamReader.Current);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/BatchAppendResp.cs b/src/EventStore.Core/Services/Transport/Grpc/BatchAppendResp.cs
deleted file mode 100644
index 419b00a9717..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/BatchAppendResp.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// ReSharper disable once CheckNamespace
-
-namespace EventStore.Client.Streams {
-	partial class BatchAppendResp {
-		internal bool IsClosing { get; set; }
-		partial class Types {
-			partial class Success {
-				public static Success Completed(long commitPosition, long preparePosition, long currentVersion) => new() {
-					positionOptionCase_ = (commitPosition, preparePosition) switch {
-						(>=0, >=0) => PositionOptionOneofCase.Position,
-						_ => PositionOptionOneofCase.NoPosition
-					},
-					positionOption_ = (commitPosition, preparePosition) switch {
-						(>=0, >=0) => new AllStreamPosition {
-							CommitPosition = (ulong)commitPosition,
-							PreparePosition = (ulong)preparePosition
-						},
-						_ => new Google.Protobuf.WellKnownTypes.Empty()
-					},
-					currentRevisionOptionCase_ = currentVersion switch {
-						>= 0 => CurrentRevisionOptionOneofCase.CurrentRevision,
-						_ => CurrentRevisionOptionOneofCase.NoStream
-					},
-					currentRevisionOption_ = currentVersion switch {
-						>= 0 => (ulong)currentVersion,
-						_ => new Google.Protobuf.WellKnownTypes.Empty()
-					}
-				};
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Cluster.Elections.cs b/src/EventStore.Core/Services/Transport/Grpc/Cluster.Elections.cs
deleted file mode 100644
index 8fbd2116082..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Cluster.Elections.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-using System;
-using System.Net;
-using System.Threading.Tasks;
-using EventStore.Cluster;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Plugins.Authorization;
-using Grpc.Core;
-using ClusterInfo = EventStore.Core.Cluster.ClusterInfo;
-using Empty = EventStore.Client.Empty;
-
-namespace EventStore.Core.Services.Transport.Grpc.Cluster {
-	partial class Elections {
-		private static readonly Empty EmptyResult = new Empty();
-		private readonly IPublisher _bus;
-		private readonly IAuthorizationProvider _authorizationProvider;
-		private readonly string _clusterDns;
-		private static readonly Operation ViewChangeOperation = new Operation(Plugins.Authorization.Operations.Node.Elections.ViewChange);
-		private static readonly Operation ViewChangeProofOperation = new Operation(Plugins.Authorization.Operations.Node.Elections.ViewChangeProof);
-		private static readonly Operation PrepareOperation = new Operation(Plugins.Authorization.Operations.Node.Elections.Prepare);
-		private static readonly Operation PrepareOkOperation = new Operation(Plugins.Authorization.Operations.Node.Elections.PrepareOk);
-		private static readonly Operation ProposalOperation = new Operation(Plugins.Authorization.Operations.Node.Elections.Proposal);
-		private static readonly Operation AcceptOperation = new Operation(Plugins.Authorization.Operations.Node.Elections.Accept);
-		private static readonly Operation MasterIsResigningOperation = new Operation(Plugins.Authorization.Operations.Node.Elections.LeaderIsResigning);
-		private static readonly Operation MasterIsResigningOkOperation = new Operation(Plugins.Authorization.Operations.Node.Elections.LeaderIsResigningOk);
-
-
-		public Elections(IPublisher bus, IAuthorizationProvider authorizationProvider, string clusterDns) {
-			_bus = bus;
-			_authorizationProvider = authorizationProvider ?? throw new ArgumentNullException(nameof(authorizationProvider));
-			_clusterDns = clusterDns;
-		}
-		
-		public override async Task<Empty> ViewChange(ViewChangeRequest request, ServerCallContext context) {
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, ViewChangeOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			_bus.Publish(new ElectionMessage.ViewChange(
-				Uuid.FromDto(request.ServerId).ToGuid(),
-				new DnsEndPoint(request.ServerHttp.Address, (int)request.ServerHttp.Port).WithClusterDns(_clusterDns),
-				request.AttemptedView));
-			return EmptyResult;
-		}
-		
-		public override async Task<Empty> ViewChangeProof(ViewChangeProofRequest request, ServerCallContext context) {
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, ViewChangeProofOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			_bus.Publish(new ElectionMessage.ViewChangeProof(
-				Uuid.FromDto(request.ServerId).ToGuid(),
-				new DnsEndPoint(request.ServerHttp.Address, (int)request.ServerHttp.Port).WithClusterDns(_clusterDns),
-				request.InstalledView));
-			return EmptyResult;
-		}
-		
-		public override async Task<Empty> Prepare(PrepareRequest request, ServerCallContext context) {
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, PrepareOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			_bus.Publish(new ElectionMessage.Prepare(
-				Uuid.FromDto(request.ServerId).ToGuid(),
-				new DnsEndPoint(request.ServerHttp.Address, (int)request.ServerHttp.Port).WithClusterDns(_clusterDns),
-				request.View));
-			return EmptyResult;
-		}
-	
-		public override async Task<Empty> PrepareOk(PrepareOkRequest request, ServerCallContext context) {
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, PrepareOkOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			_bus.Publish(new ElectionMessage.PrepareOk(
-				request.View,
-				Uuid.FromDto(request.ServerId).ToGuid(),
-				new DnsEndPoint(request.ServerHttp.Address, (int)request.ServerHttp.Port).WithClusterDns(_clusterDns),
-				request.EpochNumber,
-				request.EpochPosition,
-				Uuid.FromDto(request.EpochId).ToGuid(),
-				Uuid.FromDto(request.EpochLeaderInstanceId).ToGuid(),
-				request.LastCommitPosition,
-				request.WriterCheckpoint,
-				request.ChaserCheckpoint,
-				request.NodePriority,
-				ClusterInfo.FromGrpcClusterInfo(request.ClusterInfo, _clusterDns)));
-			return EmptyResult;
-		}
-				
-		public override async Task<Empty> Proposal(ProposalRequest request, ServerCallContext context) {
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, ProposalOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			_bus.Publish(new ElectionMessage.Proposal(
-				Uuid.FromDto(request.ServerId).ToGuid(),
-				new DnsEndPoint(request.ServerHttp.Address, (int)request.ServerHttp.Port).WithClusterDns(_clusterDns),
-				Uuid.FromDto(request.LeaderId).ToGuid(),
-				new DnsEndPoint(request.LeaderHttp.Address, (int)request.LeaderHttp.Port).WithClusterDns(_clusterDns),
-				request.View,
-				request.EpochNumber,
-				request.EpochPosition,
-				Uuid.FromDto(request.EpochId).ToGuid(),
-				Uuid.FromDto(request.EpochLeaderInstanceId).ToGuid(),
-				request.LastCommitPosition,
-				request.WriterCheckpoint,
-				request.ChaserCheckpoint,
-				request.NodePriority));
-			return EmptyResult;
-		}
-
-		public override async Task<Empty> Accept(AcceptRequest request, ServerCallContext context) {
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, AcceptOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			_bus.Publish(new ElectionMessage.Accept(
-				Uuid.FromDto(request.ServerId).ToGuid(),
-				new DnsEndPoint(request.ServerHttp.Address,
-					(int)request.ServerHttp.Port).WithClusterDns(_clusterDns),
-				Uuid.FromDto(request.LeaderId).ToGuid(),
-				new DnsEndPoint(request.LeaderHttp.Address,
-					(int)request.LeaderHttp.Port).WithClusterDns(_clusterDns),
-				request.View));
-			return EmptyResult;
-		}
-
-		public override async Task<Empty> LeaderIsResigning(LeaderIsResigningRequest request, ServerCallContext context) {
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, MasterIsResigningOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			_bus.Publish(new ElectionMessage.LeaderIsResigning(
-				Uuid.FromDto(request.LeaderId).ToGuid(),
-				new DnsEndPoint(request.LeaderHttp.Address,
-					(int)request.LeaderHttp.Port).WithClusterDns(_clusterDns)));
-			return EmptyResult;
-		}
-		
-		public override async Task<Empty> LeaderIsResigningOk(LeaderIsResigningOkRequest request, ServerCallContext context) {
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, MasterIsResigningOkOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			_bus.Publish(new ElectionMessage.LeaderIsResigningOk(
-				Uuid.FromDto(request.LeaderId).ToGuid(),
-				new DnsEndPoint(request.LeaderHttp.Address,
-					(int)request.LeaderHttp.Port).WithClusterDns(_clusterDns),
-				Uuid.FromDto(request.ServerId).ToGuid(),
-				new DnsEndPoint(request.ServerHttp.Address,
-					(int)request.ServerHttp.Port).WithClusterDns(_clusterDns)));
-			return EmptyResult;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Cluster.Gossip.cs b/src/EventStore.Core/Services/Transport/Grpc/Cluster.Gossip.cs
deleted file mode 100644
index 5fbea3a063b..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Cluster.Gossip.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Net;
-using System.Threading.Tasks;
-using EventStore.Cluster;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Metrics;
-using EventStore.Plugins.Authorization;
-using Grpc.Core;
-using Empty = EventStore.Client.Empty;
-
-namespace EventStore.Core.Services.Transport.Grpc.Cluster {
-	partial class Gossip {
-		private readonly IPublisher _bus;
-		private readonly IAuthorizationProvider _authorizationProvider;
-		private readonly string _clusterDns;
-		private readonly IDurationTracker _updateTracker;
-		private readonly IDurationTracker _readTracker;
-		private static readonly Operation ReadOperation = new Operation(Plugins.Authorization.Operations.Node.Gossip.Read);
-		private static readonly Operation UpdateOperation = new Operation(Plugins.Authorization.Operations.Node.Gossip.Update);
-
-		public Gossip(IPublisher bus, IAuthorizationProvider authorizationProvider, string clusterDns,
-			IDurationTracker updateTracker,
-			IDurationTracker readTracker) {
-
-			_bus = bus;
-			_authorizationProvider = authorizationProvider ?? throw new ArgumentNullException(nameof(authorizationProvider));
-			_clusterDns = clusterDns;
-			_updateTracker = updateTracker;
-			_readTracker = readTracker;
-		}
-
-		public override async Task<ClusterInfo> Update(GossipRequest request, ServerCallContext context) {
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, UpdateOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			var clusterInfo = EventStore.Core.Cluster.ClusterInfo.FromGrpcClusterInfo(request.Info, _clusterDns);
-			var tcs = new TaskCompletionSource<ClusterInfo>();
-			var duration = _updateTracker.Start();
-			_bus.Publish(new GossipMessage.GossipReceived(new CallbackEnvelope(msg => GossipResponse(msg, tcs, duration)),
-				clusterInfo, new DnsEndPoint(request.Server.Address, (int)request.Server.Port).WithClusterDns(_clusterDns)));
-			return await tcs.Task;
-		}
-
-		public override async Task<ClusterInfo> Read(Empty request, ServerCallContext context) {
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, ReadOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			var tcs = new TaskCompletionSource<ClusterInfo>();
-			var duration = _readTracker.Start();
-			_bus.Publish(new GossipMessage.ReadGossip(new CallbackEnvelope(msg => GossipResponse(msg, tcs, duration))));
-			return await tcs.Task;
-		}
-
-		private void GossipResponse(Message msg, TaskCompletionSource<ClusterInfo> tcs, Duration duration) {
-			if (msg is GossipMessage.SendGossip received) {
-				tcs.TrySetResult(EventStore.Core.Cluster.ClusterInfo.ToGrpcClusterInfo(received.ClusterInfo));
-				duration.Dispose();
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Cluster.cs b/src/EventStore.Core/Services/Transport/Grpc/Cluster.cs
deleted file mode 100644
index 7e49372c86e..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Cluster.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EventStore.Core.Services.Transport.Grpc.Cluster {
-	internal partial class Gossip : EventStore.Cluster.Gossip.GossipBase {
-	}
-	
-	internal partial class Elections : EventStore.Cluster.Elections.ElectionsBase {
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Constants.cs b/src/EventStore.Core/Services/Transport/Grpc/Constants.cs
deleted file mode 100644
index c8b0774f821..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Constants.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-namespace EventStore.Core.Services.Transport.Grpc {
-	public static class Constants {
-		public static class Exceptions {
-			public const string ExceptionKey = "exception";
-
-			public const string AccessDenied = "access-denied";
-			public const string InvalidTransaction = "invalid-transaction";
-			public const string StreamDeleted = "stream-deleted";
-			public const string WrongExpectedVersion = "wrong-expected-version";
-			public const string StreamNotFound = "stream-not-found";
-			public const string MaximumAppendSizeExceeded = "maximum-append-size-exceeded";
-			public const string MissingRequiredMetadataProperty = "missing-required-metadata-property";
-			public const string NotLeader = "not-leader";
-
-			public const string PersistentSubscriptionFailed = "persistent-subscription-failed";
-			public const string PersistentSubscriptionDoesNotExist = "persistent-subscription-does-not-exist";
-			public const string PersistentSubscriptionExists = "persistent-subscription-exists";
-			public const string MaximumSubscribersReached = "maximum-subscribers-reached";
-			public const string PersistentSubscriptionDropped = "persistent-subscription-dropped";
-
-			public const string UserNotFound = "user-not-found";
-			public const string UserConflict = "user-conflict";
-
-			public const string ScavengeNotFound = "scavenge-not-found";
-
-			public const string RedactionLockFailed = "redaction-lock-failed";
-			public const string RedactionGetEventPositionFailed = "redaction-get-event-position-failed";
-			public const string RedactionSwitchChunkFailed = "redaction-switch-chunk-failed";
-
-			public const string ExpectedVersion = "expected-version";
-			public const string ActualVersion = "actual-version";
-			public const string StreamName = "stream-name";
-			public const string GroupName = "group-name";
-			public const string Reason = "reason";
-			public const string MaximumAppendSize = "maximum-append-size";
-			public const string RequiredMetadataProperties = "required-metadata-properties";
-			public const string ScavengeId = "scavenge-id";
-			public const string LeaderEndpointHost = "leader-endpoint-host";
-			public const string LeaderEndpointPort = "leader-endpoint-port";
-
-			public const string LoginName = "login-name";
-		}
-
-		public static class Metadata {
-			public const string Type = "type";
-			public const string Created = "created";
-			public const string ContentType = "content-type";
-			public static readonly string[] RequiredMetadata = {Type, ContentType};
-
-			public static class ContentTypes {
-				public const string ApplicationJson = "application/json";
-				public const string ApplicationOctetStream = "application/octet-stream";
-			}
-		}
-
-		public static class Headers {
-			public const string Authorization = "authorization";
-			public const string BasicScheme = "Basic";
-
-			public const string ConnectionName = "connection-name";
-			public const string RequiresLeader = "requires-leader";
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Gossip.Read.cs b/src/EventStore.Core/Services/Transport/Grpc/Gossip.Read.cs
deleted file mode 100644
index 21e58370c85..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Gossip.Read.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Client.Gossip;
-using EventStore.Client;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Metrics;
-using EventStore.Plugins.Authorization;
-using Grpc.Core;
-using ClusterInfo = EventStore.Client.Gossip.ClusterInfo;
-using MemberInfo = EventStore.Client.Gossip.MemberInfo;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	partial class Gossip {
-		private static readonly Operation ReadOperation = new Operation(Plugins.Authorization.Operations.Node.Gossip.ClientRead);
-		public override async Task<ClusterInfo> Read(Empty request, ServerCallContext context) {
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, ReadOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			var tcs = new TaskCompletionSource<ClusterInfo>();
-			var duration = _tracker.Start();
-			_bus.Publish(new GossipMessage.ClientGossip(new CallbackEnvelope(msg => GossipResponse(msg, tcs, duration))));;
-			return await tcs.Task;
-		}
-
-		private void GossipResponse(Message msg, TaskCompletionSource<ClusterInfo> tcs, Duration duration) {
-			if (msg is GossipMessage.SendClientGossip received) {
-				tcs.TrySetResult(ToGrpcClusterInfo(received.ClusterInfo));
-				duration.Dispose();
-			}
-		}
-
-		private ClusterInfo ToGrpcClusterInfo(Core.Cluster.ClientClusterInfo cluster) {
-			var members = Array.ConvertAll(cluster.Members, x => new MemberInfo {
-				InstanceId = Uuid.FromGuid(x.InstanceId).ToDto(),
-				TimeStamp = x.TimeStamp.ToTicksSinceEpoch(),
-				State = (MemberInfo.Types.VNodeState)x.State,
-				IsAlive = x.IsAlive,
-				HttpEndPoint = new EndPoint{
-					Address = x.HttpEndPointIp,
-					Port = (uint)x.HttpEndPointPort
-				}
-			}).ToArray();
-			var info = new ClusterInfo();
-			info.Members.AddRange(members);
-			return info;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Gossip.cs b/src/EventStore.Core/Services/Transport/Grpc/Gossip.cs
deleted file mode 100644
index 6a385a887bd..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Gossip.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Metrics;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	partial class Gossip : EventStore.Client.Gossip.Gossip.GossipBase  {
-		private readonly IPublisher _bus;
-		private readonly IAuthorizationProvider _authorizationProvider;
-		private readonly IDurationTracker _tracker;
-
-		public Gossip(IPublisher bus, IAuthorizationProvider authorizationProvider, IDurationTracker tracker) {
-			_bus = bus;
-			_authorizationProvider =
-				authorizationProvider ?? throw new ArgumentNullException(nameof(authorizationProvider));
-			_tracker = tracker;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Monitoring.cs b/src/EventStore.Core/Services/Transport/Grpc/Monitoring.cs
deleted file mode 100644
index 3e1cceadfa2..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Monitoring.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-using EventStore.Client.Monitoring;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using Grpc.Core;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class Monitoring : EventStore.Client.Monitoring.Monitoring.MonitoringBase {
-		private readonly IPublisher _publisher;
-		
-		public override Task Stats(StatsReq request, IServerStreamWriter<StatsResp> responseStream, ServerCallContext context) {
-			var channel = Channel.CreateBounded<StatsResp>(new BoundedChannelOptions(1) {
-				SingleReader = true,
-				SingleWriter = true
-			});
-
-			_ = Receive();
-
-			return channel.Reader.ReadAllAsync(context.CancellationToken)
-				.ForEachAwaitAsync(responseStream.WriteAsync, context.CancellationToken);
-			
-			async Task Receive() {
-				var delay = TimeSpan.FromMilliseconds(request.RefreshTimePeriodInMs);
-				var envelope = new CallbackEnvelope(message => {
-					if (message is not MonitoringMessage.GetFreshStatsCompleted completed) {
-						channel.Writer.TryComplete(UnknownMessage<MonitoringMessage.GetFreshStatsCompleted>(message));
-						return;
-					}
-
-					var response = new StatsResp();
-
-					foreach (var (key, value) in completed.Stats.Where(stat => stat.Value is not null)) {
-						response.Stats.Add(key, value.ToString());
-					}
-
-					channel.Writer.TryWrite(response);
-
-				});
-				while (!context.CancellationToken.IsCancellationRequested) {
-					_publisher.Publish(
-						new MonitoringMessage.GetFreshStats(envelope, x => x, request.UseMetadata, false));
-
-					await Task.Delay(delay, context.CancellationToken);
-				}
-			}
-		}
-
-		public Monitoring(IPublisher publisher) {
-			_publisher = publisher;
-		}
-
-		private static Exception UnknownMessage<T>(Message message) where T : Message =>
-			new RpcException(
-				new Status(StatusCode.Unknown,
-					$"Envelope callback expected {typeof(T).Name}, received {message.GetType().Name} instead"));
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Operations.Admin.cs b/src/EventStore.Core/Services/Transport/Grpc/Operations.Admin.cs
deleted file mode 100644
index b3387f4bd43..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Operations.Admin.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Client.Operations;
-using EventStore.Client;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Plugins.Authorization;
-using Grpc.Core;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class Operations {
-		private static readonly Operation ShutdownOperation =
-			new Operation(Plugins.Authorization.Operations.Node.Shutdown);
-
-		private static readonly Operation MergeIndexesOperation =
-			new Operation(Plugins.Authorization.Operations.Node.MergeIndexes);
-
-		private static readonly Operation ResignOperation = new Operation(Plugins.Authorization.Operations.Node.Resign);
-
-		private static readonly Operation SetNodePriorityOperation =
-			new Operation(Plugins.Authorization.Operations.Node.SetPriority);
-
-		private static readonly Operation RestartPersistentSubscriptionsOperation =
-			new Operation(Plugins.Authorization.Operations.Subscriptions.Restart);
-
-		private static readonly Empty EmptyResult = new Empty();
-
-		public override async Task<Empty> Shutdown(Empty request, ServerCallContext context) {
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, ShutdownOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-
-			_publisher.Publish(new ClientMessage.RequestShutdown(exitProcess: true, shutdownHttp: true));
-			return EmptyResult;
-		}
-
-		public override async Task<Empty> MergeIndexes(Empty request, ServerCallContext context) {
-			var mergeResultSource = new TaskCompletionSource<string>();
-
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, MergeIndexesOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-
-			var correlationId = Guid.NewGuid();
-			_publisher.Publish(new ClientMessage.MergeIndexes(new CallbackEnvelope(OnMessage), correlationId, user));
-
-			await mergeResultSource.Task;
-			return EmptyResult;
-
-			void OnMessage(Message message) {
-				var completed = message as ClientMessage.MergeIndexesResponse;
-				if (completed is null) {
-					mergeResultSource.TrySetException(
-						RpcExceptions.UnknownMessage<ClientMessage.MergeIndexesResponse>(message));
-				} else {
-					mergeResultSource.SetResult(completed.CorrelationId.ToString());
-				}
-			}
-		}
-
-		public override async Task<Empty> ResignNode(Empty request, ServerCallContext context) {
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, ResignOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-
-			_publisher.Publish(new ClientMessage.ResignNode());
-			return EmptyResult;
-		}
-
-		public override async Task<Empty> SetNodePriority(SetNodePriorityReq request, ServerCallContext context) {
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider
-				.CheckAccessAsync(user, SetNodePriorityOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-
-			_publisher.Publish(new ClientMessage.SetNodePriority(request.Priority));
-			return EmptyResult;
-		}
-
-		public override async Task<Empty> RestartPersistentSubscriptions(Empty request, ServerCallContext context) {
-			var restart = new TaskCompletionSource<bool>();
-			var envelope = new CallbackEnvelope(OnMessage);
-
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, RestartPersistentSubscriptionsOperation,
-					context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-
-			_publisher.Publish(new SubscriptionMessage.PersistentSubscriptionsRestart(envelope));
-
-			await restart.Task;
-			return new Empty();
-
-			void OnMessage(Message message) {
-				switch (message) {
-					case SubscriptionMessage.PersistentSubscriptionsRestarting _:
-						restart.TrySetResult(true);
-						break;
-					case SubscriptionMessage.InvalidPersistentSubscriptionsRestart _:
-						restart.TrySetResult(true);
-						break;
-					default:
-						restart.TrySetException(
-							RpcExceptions
-								.UnknownMessage<SubscriptionMessage.PersistentSubscriptionsRestarting>(message));
-						break;
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Operations.Scavenge.cs b/src/EventStore.Core/Services/Transport/Grpc/Operations.Scavenge.cs
deleted file mode 100644
index b81fd51a728..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Operations.Scavenge.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Client.Operations;
-using EventStore.Plugins.Authorization;
-using Grpc.Core;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	partial class Operations {
-		private static readonly Operation StartOperation = new Operation(Plugins.Authorization.Operations.Node.Scavenge.Start);
-		private static readonly Operation StopOperation = new Operation(Plugins.Authorization.Operations.Node.Scavenge.Stop);
-		public override async Task<ScavengeResp> StartScavenge(StartScavengeReq request, ServerCallContext context) {
-			var scavengeResultSource = new TaskCompletionSource<(string, ScavengeResp.Types.ScavengeResult)>();
-
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, StartOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			_publisher.Publish(new ClientMessage.ScavengeDatabase(new CallbackEnvelope(OnMessage), Guid.NewGuid(), user,
-				request.Options.StartFromChunk, request.Options.ThreadCount, null, null, false));
-
-			var (scavengeId, scavengeResult) = await scavengeResultSource.Task;
-
-			return new ScavengeResp {
-				ScavengeId = scavengeId,
-				ScavengeResult = scavengeResult
-			};
-
-			void OnMessage(Message message) => HandleScavengeDatabaseResponse(message, scavengeResultSource);
-		}
-
-		public override async Task<ScavengeResp> StopScavenge(StopScavengeReq request, ServerCallContext context) {
-			var scavengeResultSource = new TaskCompletionSource<(string, ScavengeResp.Types.ScavengeResult)>();
-
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, StopOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			_publisher.Publish(new ClientMessage.StopDatabaseScavenge(new CallbackEnvelope(OnMessage), Guid.NewGuid(), user,
-				request.Options.ScavengeId));
-
-			var (scavengeId, scavengeResult) = await scavengeResultSource.Task;
-
-			return new ScavengeResp {
-				ScavengeId = scavengeId,
-				ScavengeResult = scavengeResult
-			};
-			
-			void OnMessage(Message message) => HandleScavengeDatabaseResponse(message, scavengeResultSource);
-		}
-
-		private static void HandleScavengeDatabaseResponse(
-			Message message,
-			TaskCompletionSource<(string, ScavengeResp.Types.ScavengeResult)> scavengeResultSource) {
-			
-			switch (message) {
-				case ClientMessage.ScavengeDatabaseUnauthorizedResponse:
-					scavengeResultSource.TrySetException(RpcExceptions.AccessDenied());
-					return;
-				case ClientMessage.ScavengeDatabaseNotFoundResponse notFoundResponse:
-					scavengeResultSource.TrySetException(RpcExceptions.ScavengeNotFound(notFoundResponse.ScavengeId));
-					return;
-				case ClientMessage.ScavengeDatabaseStartedResponse startedResponse:
-					scavengeResultSource.TrySetResult((startedResponse.ScavengeId,
-						ScavengeResp.Types.ScavengeResult.Started));
-					return;
-				case ClientMessage.ScavengeDatabaseStoppedResponse stoppedResponse:
-					scavengeResultSource.TrySetResult((stoppedResponse.ScavengeId,
-						ScavengeResp.Types.ScavengeResult.Stopped));
-					return;
-				case ClientMessage.ScavengeDatabaseInProgressResponse inProgressResponse:
-					scavengeResultSource.TrySetResult((inProgressResponse.ScavengeId,
-						ScavengeResp.Types.ScavengeResult.InProgress));
-					return;
-				default:
-					scavengeResultSource.TrySetException(RpcExceptions.UnknownMessage<Message>(message));
-					return;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Operations.cs b/src/EventStore.Core/Services/Transport/Grpc/Operations.cs
deleted file mode 100644
index 27ad1ad27d7..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Operations.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class Operations
-		: EventStore.Client.Operations.Operations.OperationsBase {
-		private readonly IPublisher _publisher;
-		private readonly IAuthorizationProvider _authorizationProvider;
-
-		public Operations(IPublisher publisher, IAuthorizationProvider authorizationProvider) {
-			if (publisher == null) throw new ArgumentNullException(nameof(publisher));
-			if (authorizationProvider == null) throw new ArgumentNullException(nameof(authorizationProvider));
-			_publisher = publisher;
-			_authorizationProvider = authorizationProvider;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.Create.cs b/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.Create.cs
deleted file mode 100644
index 485a6b30363..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.Create.cs
+++ /dev/null
@@ -1,241 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Client.PersistentSubscriptions;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Plugins.Authorization;
-using Grpc.Core;
-using static EventStore.Core.Messages.ClientMessage.CreatePersistentSubscriptionToStreamCompleted;
-using static EventStore.Core.Messages.ClientMessage.CreatePersistentSubscriptionToAllCompleted;
-using StreamOptionOneofCase = EventStore.Client.PersistentSubscriptions.CreateReq.Types.Options.StreamOptionOneofCase;
-using RevisionOptionOneofCase = EventStore.Client.PersistentSubscriptions.CreateReq.Types.StreamOptions.RevisionOptionOneofCase;
-using AllOptionOneofCase = EventStore.Client.PersistentSubscriptions.CreateReq.Types.AllOptions.AllOptionOneofCase;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class PersistentSubscriptions {
-		private static readonly Operation CreateOperation = new Operation(Plugins.Authorization.Operations.Subscriptions.Create);
-
-		public override async Task<CreateResp> Create(CreateReq request, ServerCallContext context) {
-			var createPersistentSubscriptionSource = new TaskCompletionSource<CreateResp>();
-			var settings = request.Options.Settings;
-			var correlationId = Guid.NewGuid();
-
-			var user = context.GetHttpContext().User;
-			
-			if (!await _authorizationProvider.CheckAccessAsync(user,
-				CreateOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-
-			string streamId = null;
-			string consumerStrategy = null;
-			if (string.IsNullOrEmpty(settings.ConsumerStrategy)) { /*for backwards compatibility*/
-			#pragma warning disable 612
-				consumerStrategy = settings.NamedConsumerStrategy.ToString();
-			#pragma warning restore 612
-
-			} else {
-				consumerStrategy = settings.ConsumerStrategy;
-			}
-
-			switch (request.Options.StreamOptionCase)
-			{
-				case StreamOptionOneofCase.Stream:
-				case StreamOptionOneofCase.None: /*for backwards compatibility*/
-				{
-					StreamRevision startRevision;
-
-					if (request.Options.StreamOptionCase == StreamOptionOneofCase.Stream) {
-						streamId = request.Options.Stream.StreamIdentifier;
-						startRevision = request.Options.Stream.RevisionOptionCase switch {
-							RevisionOptionOneofCase.Revision => new StreamRevision(request.Options.Stream.Revision),
-							RevisionOptionOneofCase.Start => StreamRevision.Start,
-							RevisionOptionOneofCase.End => StreamRevision.End,
-							_ => throw RpcExceptions.InvalidArgument(request.Options.Stream.RevisionOptionCase)
-						};
-					} else { /*for backwards compatibility*/
-						#pragma warning disable 612
-						streamId = request.Options.StreamIdentifier;
-						startRevision = new StreamRevision(request.Options.Settings.Revision);
-						#pragma warning restore 612
-					}
-
-					_publisher.Publish(
-						new ClientMessage.CreatePersistentSubscriptionToStream(
-							correlationId,
-							correlationId,
-							new CallbackEnvelope(HandleCreatePersistentSubscriptionCompleted),
-							streamId,
-							request.Options.GroupName,
-							settings.ResolveLinks,
-							startRevision.ToInt64(),
-							settings.MessageTimeoutCase switch {
-								CreateReq.Types.Settings.MessageTimeoutOneofCase.MessageTimeoutMs => settings
-									.MessageTimeoutMs,
-								CreateReq.Types.Settings.MessageTimeoutOneofCase.MessageTimeoutTicks => (int)TimeSpan
-									.FromTicks(settings.MessageTimeoutTicks).TotalMilliseconds,
-								_ => 0
-							},
-							settings.ExtraStatistics,
-							settings.MaxRetryCount,
-							settings.HistoryBufferSize,
-							settings.LiveBufferSize,
-							settings.ReadBatchSize,
-							settings.CheckpointAfterCase switch {
-								CreateReq.Types.Settings.CheckpointAfterOneofCase.CheckpointAfterMs => settings
-									.CheckpointAfterMs,
-								CreateReq.Types.Settings.CheckpointAfterOneofCase.CheckpointAfterTicks => (int)TimeSpan
-									.FromTicks(settings.CheckpointAfterTicks).TotalMilliseconds,
-								_ => 0
-							},
-							settings.MinCheckpointCount,
-							settings.MaxCheckpointCount,
-							settings.MaxSubscriberCount,
-							consumerStrategy,
-							user));
-					break;
-				}
-				case StreamOptionOneofCase.All:
-					var startPosition = request.Options.All.AllOptionCase switch {
-						AllOptionOneofCase.Position => new Position(
-							request.Options.All.Position.CommitPosition,
-							request.Options.All.Position.PreparePosition),
-						AllOptionOneofCase.Start => Position.Start,
-						AllOptionOneofCase.End => Position.End,
-						_ => throw RpcExceptions.InvalidArgument(request.Options.All.AllOptionCase)
-					};
-					var filter = request.Options.All.FilterOptionCase switch {
-						CreateReq.Types.AllOptions.FilterOptionOneofCase.NoFilter => null,
-						CreateReq.Types.AllOptions.FilterOptionOneofCase.Filter => ConvertToEventFilter(true,
-							request.Options.All.Filter),
-						CreateReq.Types.AllOptions.FilterOptionOneofCase.None => null,
-						_ => throw RpcExceptions.InvalidArgument(request.Options.All.FilterOptionCase)
-					};
-
-					streamId = SystemStreams.AllStream;
-					_publisher.Publish(
-						new ClientMessage.CreatePersistentSubscriptionToAll(
-							correlationId,
-							correlationId,
-							new CallbackEnvelope(HandleCreatePersistentSubscriptionCompleted),
-							request.Options.GroupName,
-							filter,
-							settings.ResolveLinks,
-							new TFPos(
-								startPosition.ToInt64().commitPosition,
-								startPosition.ToInt64().preparePosition
-							),
-							settings.MessageTimeoutCase switch {
-								CreateReq.Types.Settings.MessageTimeoutOneofCase.MessageTimeoutMs => settings
-									.MessageTimeoutMs,
-								CreateReq.Types.Settings.MessageTimeoutOneofCase.MessageTimeoutTicks => (int)TimeSpan
-									.FromTicks(settings.MessageTimeoutTicks).TotalMilliseconds,
-								_ => 0
-							},
-							settings.ExtraStatistics,
-							settings.MaxRetryCount,
-							settings.HistoryBufferSize,
-							settings.LiveBufferSize,
-							settings.ReadBatchSize,
-							settings.CheckpointAfterCase switch {
-								CreateReq.Types.Settings.CheckpointAfterOneofCase.CheckpointAfterMs => settings
-									.CheckpointAfterMs,
-								CreateReq.Types.Settings.CheckpointAfterOneofCase.CheckpointAfterTicks => (int)TimeSpan
-									.FromTicks(settings.CheckpointAfterTicks).TotalMilliseconds,
-								_ => 0
-							},
-							settings.MinCheckpointCount,
-							settings.MaxCheckpointCount,
-							settings.MaxSubscriberCount,
-							consumerStrategy,
-							user));
-					break;
-				default:
-					throw new InvalidOperationException();
-			}
-			IEventFilter ConvertToEventFilter(bool isAllStream, CreateReq.Types.AllOptions.Types.FilterOptions filter) =>
-				filter.FilterCase switch {
-					CreateReq.Types.AllOptions.Types.FilterOptions.FilterOneofCase.EventType => (
-						string.IsNullOrEmpty(filter.EventType.Regex)
-							? EventFilter.EventType.Prefixes(isAllStream, filter.EventType.Prefix.ToArray())
-							: EventFilter.EventType.Regex(isAllStream, filter.EventType.Regex)),
-					CreateReq.Types.AllOptions.Types.FilterOptions.FilterOneofCase.StreamIdentifier => (
-						string.IsNullOrEmpty(filter.StreamIdentifier.Regex)
-							? EventFilter.StreamName.Prefixes(isAllStream, filter.StreamIdentifier.Prefix.ToArray())
-							: EventFilter.StreamName.Regex(isAllStream, filter.StreamIdentifier.Regex)),
-					_ => throw RpcExceptions.InvalidArgument(filter.FilterCase)
-				};
-
-			return await createPersistentSubscriptionSource.Task;
-
-			void HandleCreatePersistentSubscriptionCompleted(Message message) {
-				if (message is ClientMessage.NotHandled notHandled && RpcExceptions.TryHandleNotHandled(notHandled, out var ex)) {
-					createPersistentSubscriptionSource.TrySetException(ex);
-					return;
-				}
-
-				if (streamId != SystemStreams.AllStream) {
-					if (message is ClientMessage.CreatePersistentSubscriptionToStreamCompleted completed) {
-						switch (completed.Result) {
-							case CreatePersistentSubscriptionToStreamResult.Success:
-								createPersistentSubscriptionSource.TrySetResult(new CreateResp());
-								return;
-							case CreatePersistentSubscriptionToStreamResult.Fail:
-								createPersistentSubscriptionSource.TrySetException(
-									RpcExceptions.PersistentSubscriptionFailed(streamId, request.Options.GroupName,
-										completed.Reason));
-								return;
-							case CreatePersistentSubscriptionToStreamResult.AlreadyExists:
-								createPersistentSubscriptionSource.TrySetException(
-									RpcExceptions.PersistentSubscriptionExists(streamId, request.Options.GroupName));
-								return;
-							case CreatePersistentSubscriptionToStreamResult.AccessDenied:
-								createPersistentSubscriptionSource.TrySetException(RpcExceptions.AccessDenied());
-								return;
-							default:
-								createPersistentSubscriptionSource.TrySetException(
-									RpcExceptions.UnknownError(completed.Result));
-								return;
-						}
-					}
-
-					createPersistentSubscriptionSource.TrySetException(
-						RpcExceptions.UnknownMessage<ClientMessage.CreatePersistentSubscriptionToStreamCompleted>(
-							message));
-				} else {
-					if (message is ClientMessage.CreatePersistentSubscriptionToAllCompleted completedAll) {
-						switch (completedAll.Result) {
-							case CreatePersistentSubscriptionToAllResult.Success:
-								createPersistentSubscriptionSource.TrySetResult(new CreateResp());
-								return;
-							case CreatePersistentSubscriptionToAllResult.Fail:
-								createPersistentSubscriptionSource.TrySetException(
-									RpcExceptions.PersistentSubscriptionFailed(streamId, request.Options.GroupName,
-										completedAll.Reason));
-								return;
-							case CreatePersistentSubscriptionToAllResult.AlreadyExists:
-								createPersistentSubscriptionSource.TrySetException(
-									RpcExceptions.PersistentSubscriptionExists(streamId, request.Options.GroupName));
-								return;
-							case CreatePersistentSubscriptionToAllResult.AccessDenied:
-								createPersistentSubscriptionSource.TrySetException(RpcExceptions.AccessDenied());
-								return;
-							default:
-								createPersistentSubscriptionSource.TrySetException(
-									RpcExceptions.UnknownError(completedAll.Result));
-								return;
-						}
-					}
-
-					createPersistentSubscriptionSource.TrySetException(
-						RpcExceptions.UnknownMessage<ClientMessage.CreatePersistentSubscriptionToAllCompleted>(
-							message));
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.Delete.cs b/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.Delete.cs
deleted file mode 100644
index 16e9434bd57..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.Delete.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Client.PersistentSubscriptions;
-using EventStore.Plugins.Authorization;
-using Grpc.Core;
-using static EventStore.Core.Messages.ClientMessage.DeletePersistentSubscriptionToStreamCompleted;
-using static EventStore.Core.Messages.ClientMessage.DeletePersistentSubscriptionToAllCompleted;
-using StreamOptionOneofCase = EventStore.Client.PersistentSubscriptions.DeleteReq.Types.Options.StreamOptionOneofCase;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class PersistentSubscriptions {
-		private static readonly Operation DeleteOperation = new Operation(Plugins.Authorization.Operations.Subscriptions.Delete);
-		public override async Task<DeleteResp> Delete(DeleteReq request, ServerCallContext context) {
-			
-			var createPersistentSubscriptionSource = new TaskCompletionSource<DeleteResp>();
-			var correlationId = Guid.NewGuid();
-
-			var user = context.GetHttpContext().User;
-
-			if (!await _authorizationProvider.CheckAccessAsync(user,
-				DeleteOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-
-			string streamId = null;
-
-			switch (request.Options.StreamOptionCase)
-			{
-				case StreamOptionOneofCase.StreamIdentifier:
-				{
-					streamId = request.Options.StreamIdentifier;
-					_publisher.Publish(new ClientMessage.DeletePersistentSubscriptionToStream(
-						correlationId,
-						correlationId,
-						new CallbackEnvelope(HandleDeletePersistentSubscriptionCompleted),
-						streamId,
-						request.Options.GroupName,
-						user));
-					break;
-				}
-				case StreamOptionOneofCase.All:
-					streamId = SystemStreams.AllStream;
-					_publisher.Publish(new ClientMessage.DeletePersistentSubscriptionToAll(
-						correlationId,
-						correlationId,
-						new CallbackEnvelope(HandleDeletePersistentSubscriptionCompleted),
-						request.Options.GroupName,
-						user));
-					break;
-				default:
-					throw new InvalidOperationException();
-			}
-
-			return await createPersistentSubscriptionSource.Task;
-
-			void HandleDeletePersistentSubscriptionCompleted(Message message) {
-				if (message is ClientMessage.NotHandled notHandled && RpcExceptions.TryHandleNotHandled(notHandled, out var ex)) {
-					createPersistentSubscriptionSource.TrySetException(ex);
-					return;
-				}
-
-				if (streamId != SystemStreams.AllStream) {
-					if (message is ClientMessage.DeletePersistentSubscriptionToStreamCompleted completed) {
-						switch (completed.Result) {
-							case DeletePersistentSubscriptionToStreamResult.Success:
-								createPersistentSubscriptionSource.TrySetResult(new DeleteResp());
-								return;
-							case DeletePersistentSubscriptionToStreamResult.Fail:
-								createPersistentSubscriptionSource.TrySetException(
-									RpcExceptions.PersistentSubscriptionFailed(streamId, request.Options.GroupName,
-										completed.Reason));
-								return;
-							case DeletePersistentSubscriptionToStreamResult.DoesNotExist:
-								createPersistentSubscriptionSource.TrySetException(
-									RpcExceptions.PersistentSubscriptionDoesNotExist(streamId,
-										request.Options.GroupName));
-								return;
-							case DeletePersistentSubscriptionToStreamResult.AccessDenied:
-								createPersistentSubscriptionSource.TrySetException(RpcExceptions.AccessDenied());
-								return;
-							default:
-								createPersistentSubscriptionSource.TrySetException(
-									RpcExceptions.UnknownError(completed.Result));
-								return;
-						}
-					}
-					createPersistentSubscriptionSource.TrySetException(
-						RpcExceptions.UnknownMessage<ClientMessage.DeletePersistentSubscriptionToStreamCompleted>(message));
-				} else {
-					if (message is ClientMessage.DeletePersistentSubscriptionToAllCompleted completedAll) {
-						switch (completedAll.Result) {
-							case DeletePersistentSubscriptionToAllResult.Success:
-								createPersistentSubscriptionSource.TrySetResult(new DeleteResp());
-								return;
-							case DeletePersistentSubscriptionToAllResult.Fail:
-								createPersistentSubscriptionSource.TrySetException(
-									RpcExceptions.PersistentSubscriptionFailed(streamId, request.Options.GroupName,
-										completedAll.Reason));
-								return;
-							case DeletePersistentSubscriptionToAllResult.DoesNotExist:
-								createPersistentSubscriptionSource.TrySetException(
-									RpcExceptions.PersistentSubscriptionDoesNotExist(streamId,
-										request.Options.GroupName));
-								return;
-							case DeletePersistentSubscriptionToAllResult.AccessDenied:
-								createPersistentSubscriptionSource.TrySetException(RpcExceptions.AccessDenied());
-								return;
-							default:
-								createPersistentSubscriptionSource.TrySetException(
-									RpcExceptions.UnknownError(completedAll.Result));
-								return;
-						}
-					}
-					createPersistentSubscriptionSource.TrySetException(
-						RpcExceptions.UnknownMessage<ClientMessage.DeletePersistentSubscriptionToAllCompleted>(message));
-				}
-
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.Info.cs b/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.Info.cs
deleted file mode 100644
index fb0efa64e96..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.Info.cs
+++ /dev/null
@@ -1,202 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Client.PersistentSubscriptions;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Plugins.Authorization;
-using Grpc.Core;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class PersistentSubscriptions {
-		private static readonly Operation GetInfoOperation = new Operation(Plugins.Authorization.Operations.Subscriptions.Statistics);
-		public override async Task<GetInfoResp> GetInfo(GetInfoReq request, ServerCallContext context) {
-			var getPersistentSubscriptionInfoSource = new TaskCompletionSource<GetInfoResp>();
-
-			var user = context.GetHttpContext().User;
-
-			if (!await _authorizationProvider.CheckAccessAsync(user,
-				GetInfoOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-
-			string streamId = request.Options.StreamOptionCase switch {
-				GetInfoReq.Types.Options.StreamOptionOneofCase.All => "$all",
-				GetInfoReq.Types.Options.StreamOptionOneofCase.StreamIdentifier => request.Options.StreamIdentifier,
-				_ => throw new InvalidOperationException()
-			};
-
-			_publisher.Publish(new MonitoringMessage.GetPersistentSubscriptionStats(
-				new CallbackEnvelope(HandleGetPersistentSubscriptionStatsCompleted),
-				streamId,
-				request.Options.GroupName));
-			return await getPersistentSubscriptionInfoSource.Task;
-
-			void HandleGetPersistentSubscriptionStatsCompleted(Message message) {
-				if (message is ClientMessage.NotHandled notHandled && RpcExceptions.TryHandleNotHandled(notHandled, out var ex)) {
-					getPersistentSubscriptionInfoSource.TrySetException(ex);
-					return;
-				}
-
-				if (message is MonitoringMessage.GetPersistentSubscriptionStatsCompleted completed) {
-					switch (completed.Result) {
-						case MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.Success:
-							var getInfoResp = new GetInfoResp {
-								SubscriptionInfo = ParseSubscriptionInfo(completed.SubscriptionStats.First())
-							};
-							getPersistentSubscriptionInfoSource.TrySetResult(getInfoResp);
-							return;
-						case MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotFound:
-							getPersistentSubscriptionInfoSource.TrySetException(
-								RpcExceptions.PersistentSubscriptionDoesNotExist(streamId,
-									request.Options.GroupName));
-							return;
-						case MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotReady:
-							getPersistentSubscriptionInfoSource.TrySetException(
-								RpcExceptions.ServerNotReady());
-							return;
-						case MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.Fail:
-							getPersistentSubscriptionInfoSource.TrySetException(
-								RpcExceptions.PersistentSubscriptionFailed(streamId, request.Options.GroupName,
-									completed.ErrorString));
-							return;
-						default:
-							getPersistentSubscriptionInfoSource.TrySetException(
-								RpcExceptions.UnknownError(completed.Result));
-							return;
-					}
-				}
-				getPersistentSubscriptionInfoSource.TrySetException(
-					RpcExceptions.UnknownMessage<MonitoringMessage.GetPersistentSubscriptionStatsCompleted>(
-						message));
-			}
-		}
-
-		public override async Task<ListResp> List(ListReq request, ServerCallContext context) {
-			var listPersistentSubscriptionsSource = new TaskCompletionSource<ListResp>();
-			var correlationId = Guid.NewGuid();
-
-			var user = context.GetHttpContext().User;
-
-			if (!await _authorizationProvider.CheckAccessAsync(user,
-				GetInfoOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-
-			var streamId = string.Empty;
-			switch (request.Options.ListOptionCase)
-			{
-				case ListReq.Types.Options.ListOptionOneofCase.ListAllSubscriptions:
-					_publisher.Publish(new MonitoringMessage.GetAllPersistentSubscriptionStats(
-						new CallbackEnvelope(HandleListSubscriptionsCompleted)));
-					break;
-				case ListReq.Types.Options.ListOptionOneofCase.ListForStream:
-					streamId = request.Options.ListForStream.StreamOptionCase switch {
-						ListReq.Types.StreamOption.StreamOptionOneofCase.All => "$all",
-						ListReq.Types.StreamOption.StreamOptionOneofCase.Stream => request.Options.ListForStream.Stream,
-						_ => throw new InvalidOperationException()
-					};
-					_publisher.Publish(new MonitoringMessage.GetStreamPersistentSubscriptionStats(
-						new CallbackEnvelope(HandleListSubscriptionsCompleted),
-						streamId
-					));
-					break;
-				default:
-					throw new InvalidOperationException();
-			}
-
-			return await listPersistentSubscriptionsSource.Task;
-
-			void HandleListSubscriptionsCompleted(Message message) {
-				if (message is ClientMessage.NotHandled notHandled && RpcExceptions.TryHandleNotHandled(notHandled, out var ex)) {
-					listPersistentSubscriptionsSource.TrySetException(ex);
-					return;
-				}
-
-				if (message is MonitoringMessage.GetPersistentSubscriptionStatsCompleted completed) {
-					switch (completed.Result) {
-						case MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.Success:
-							var listResp = new ListResp();
-							listResp.Subscriptions.AddRange(
-								completed.SubscriptionStats.Select(ParseSubscriptionInfo)
-							);
-							listPersistentSubscriptionsSource.TrySetResult(listResp);
-							return;
-						case MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotFound:
-							listPersistentSubscriptionsSource.TrySetException(
-								RpcExceptions.PersistentSubscriptionDoesNotExist(streamId, ""));
-							return;
-						case MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotReady:
-							listPersistentSubscriptionsSource.TrySetException(
-								RpcExceptions.ServerNotReady());
-							return;
-						case MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.Fail:
-							listPersistentSubscriptionsSource.TrySetException(
-								RpcExceptions.PersistentSubscriptionFailed(streamId, "", completed.ErrorString));
-							return;
-						default:
-							listPersistentSubscriptionsSource.TrySetException(
-								RpcExceptions.UnknownError(completed.Result));
-							return;
-					}
-				}
-				listPersistentSubscriptionsSource.TrySetException(
-					RpcExceptions.UnknownMessage<MonitoringMessage.GetPersistentSubscriptionStatsCompleted>(
-						message));
-			}
-		}
-
-		private SubscriptionInfo ParseSubscriptionInfo(MonitoringMessage.PersistentSubscriptionInfo input) {
-			var connectionInfo = new List<SubscriptionInfo.Types.ConnectionInfo>();
-			foreach (var conn in input.Connections) {
-				var connInfo = new SubscriptionInfo.Types.ConnectionInfo {
-					From = conn.From,
-					Username = conn.Username,
-					AverageItemsPerSecond = conn.AverageItemsPerSecond,
-					TotalItems = conn.TotalItems,
-					CountSinceLastMeasurement = conn.CountSinceLastMeasurement,
-					AvailableSlots = conn.AvailableSlots,
-					InFlightMessages = conn.InFlightMessages,
-					ConnectionName = conn.ConnectionName
-				};
-				connInfo.ObservedMeasurements.AddRange(
-					conn.ObservedMeasurements.Select(x => new SubscriptionInfo.Types.Measurement
-						{Key = x.Key, Value = x.Value}));
-				connectionInfo.Add(connInfo);
-			}
-
-			var subscriptionInfo = new SubscriptionInfo {
-				EventSource = input.EventSource,
-				GroupName = input.GroupName,
-				Status = input.Status,
-				AveragePerSecond = input.AveragePerSecond,
-				TotalItems = input.TotalItems,
-				CountSinceLastMeasurement = input.CountSinceLastMeasurement,
-				LastCheckpointedEventPosition = input.LastCheckpointedEventPosition ?? string.Empty,
-				LastKnownEventPosition = input.LastKnownEventPosition ?? string.Empty,
-				ResolveLinkTos = input.ResolveLinktos,
-				StartFrom = input.StartFrom,
-				MessageTimeoutMilliseconds = input.MessageTimeoutMilliseconds,
-				ExtraStatistics = input.ExtraStatistics,
-				MaxRetryCount = input.MaxRetryCount,
-				LiveBufferSize = input.LiveBufferSize,
-				BufferSize = input.BufferSize,
-				ReadBatchSize = input.ReadBatchSize,
-				CheckPointAfterMilliseconds = input.CheckPointAfterMilliseconds,
-				MinCheckPointCount = input.MinCheckPointCount,
-				MaxCheckPointCount = input.MaxCheckPointCount,
-				ReadBufferCount = input.ReadBufferCount,
-				LiveBufferCount = input.LiveBufferCount,
-				RetryBufferCount = input.RetryBufferCount,
-				TotalInFlightMessages = input.TotalInFlightMessages,
-				OutstandingMessagesCount = input.OutstandingMessagesCount,
-				NamedConsumerStrategy = input.NamedConsumerStrategy,
-				MaxSubscriberCount = input.MaxSubscriberCount,
-				ParkedMessageCount = input.ParkedMessageCount,
-			};
-			subscriptionInfo.Connections.AddRange(connectionInfo);
-			return subscriptionInfo;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.Read.cs b/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.Read.cs
deleted file mode 100644
index 78401eaa1ad..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.Read.cs
+++ /dev/null
@@ -1,306 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-using EventStore.Client;
-using EventStore.Client.PersistentSubscriptions;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Plugins.Authorization;
-using Google.Protobuf;
-using Grpc.Core;
-using Serilog;
-using static EventStore.Core.Messages.ClientMessage.PersistentSubscriptionNackEvents;
-using UUID = EventStore.Client.UUID;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class PersistentSubscriptions {
-		private static readonly Operation ProcessMessagesOperation = new Operation(Plugins.Authorization.Operations.Subscriptions.ProcessMessages);
-		public override async Task Read(IAsyncStreamReader<ReadReq> requestStream,
-			IServerStreamWriter<ReadResp> responseStream, ServerCallContext context) {
-			if (!await requestStream.MoveNext()) {
-				return;
-			}
-
-			if (requestStream.Current.ContentCase != ReadReq.ContentOneofCase.Options) {
-				throw new InvalidOperationException();
-			}
-
-			var options = requestStream.Current.Options;
-			var user = context.GetHttpContext().User;
-
-			string streamId = null;
-			switch (options.StreamOptionCase) {
-				case ReadReq.Types.Options.StreamOptionOneofCase.StreamIdentifier:
-					streamId = options.StreamIdentifier;
-					break;
-				case ReadReq.Types.Options.StreamOptionOneofCase.All:
-					streamId = SystemStreams.AllStream;
-					break;
-				default:
-					throw new InvalidOperationException();
-			}
-
-			if (!await _authorizationProvider.CheckAccessAsync(user,
-				ProcessMessagesOperation.WithParameter(Plugins.Authorization.Operations.Subscriptions.Parameters.StreamId(streamId)), context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			var connectionName =
-				context.RequestHeaders.FirstOrDefault(x => x.Key == Constants.Headers.ConnectionName)?.Value ??
-				"<unknown>";
-			var correlationId = Guid.NewGuid();
-			var uuidOptionsCase = options.UuidOption.ContentCase;
-
-			var enumerator = new PersistentStreamSubscriptionEnumerator(correlationId, connectionName,
-				_publisher, streamId, options.GroupName, options.BufferSize, user, context.CancellationToken);
-			await using var _ = enumerator;
-
-			var subscriptionId = await enumerator.Started;
-
-			var read = ValueTask.CompletedTask;
-			var cts = new CancellationTokenSource();
-			try {
-				read = PumpRequestStream(cts.Token);
-
-				await responseStream.WriteAsync(new ReadResp {
-					SubscriptionConfirmation = new ReadResp.Types.SubscriptionConfirmation {
-						SubscriptionId = subscriptionId
-					}
-				});
-
-				while (await enumerator.MoveNextAsync()) {
-					await responseStream.WriteAsync(new ReadResp {
-						Event = ConvertToReadEvent(enumerator.Current)
-					});
-				}
-			} catch (IOException) {
-				Log.Information("Subscription {correlationId} to {subscriptionId} disposed. The request stream was closed.", correlationId, subscriptionId);
-			} finally {
-				// make sure we stop reading the request stream before leaving this method
-				cts.Cancel();
-				await read;
-			}
-
-			async ValueTask PumpRequestStream(CancellationToken token) {
-				try {
-					await requestStream.ForEachAsync(HandleAckNack, token);
-				} catch {
-				}
-			}
-
-			ValueTask HandleAckNack(ReadReq request) {
-				_publisher.Publish(request.ContentCase switch {
-					ReadReq.ContentOneofCase.Ack => new ClientMessage.PersistentSubscriptionAckEvents(
-						correlationId, correlationId, new NoopEnvelope(), subscriptionId,
-						request.Ack.Ids.Select(id => Uuid.FromDto(id).ToGuid()).ToArray(), user),
-					ReadReq.ContentOneofCase.Nack =>
-					new ClientMessage.PersistentSubscriptionNackEvents(
-						correlationId, correlationId, new NoopEnvelope(), subscriptionId,
-						request.Nack.Reason, request.Nack.Action switch {
-							ReadReq.Types.Nack.Types.Action.Unknown => NakAction.Unknown,
-							ReadReq.Types.Nack.Types.Action.Park => NakAction.Park,
-							ReadReq.Types.Nack.Types.Action.Retry => NakAction.Retry,
-							ReadReq.Types.Nack.Types.Action.Skip => NakAction.Skip,
-							ReadReq.Types.Nack.Types.Action.Stop => NakAction.Stop,
-							_ => throw RpcExceptions.InvalidArgument(request.Nack.Action)
-						},
-						request.Nack.Ids.Select(id => Uuid.FromDto(id).ToGuid()).ToArray(), user),
-					_ => throw RpcExceptions.InvalidArgument(request.ContentCase)
-				});
-
-				return new ValueTask(Task.CompletedTask);
-			}
-
-			ReadResp.Types.ReadEvent.Types.RecordedEvent ConvertToRecordedEvent(EventRecord e, long? commitPosition,
-				long? preparePosition) {
-				if (e == null) return null;
-				var position = Position.FromInt64(commitPosition ?? -1, preparePosition ?? -1);
-				return new ReadResp.Types.ReadEvent.Types.RecordedEvent {
-					Id = uuidOptionsCase switch {
-						ReadReq.Types.Options.Types.UUIDOption.ContentOneofCase.String => new UUID {
-							String = e.EventId.ToString()
-						},
-						_ => Uuid.FromGuid(e.EventId).ToDto()
-					},
-					StreamIdentifier = e.EventStreamId,
-					StreamRevision = StreamRevision.FromInt64(e.EventNumber),
-					CommitPosition = position.CommitPosition,
-					PreparePosition = position.PreparePosition,
-					Metadata = {
-						[Constants.Metadata.Type] = e.EventType,
-						[Constants.Metadata.Created] = e.TimeStamp.ToTicksSinceEpoch().ToString(),
-						[Constants.Metadata.ContentType] = e.IsJson
-							? Constants.Metadata.ContentTypes.ApplicationJson
-							: Constants.Metadata.ContentTypes.ApplicationOctetStream
-					},
-					Data = ByteString.CopyFrom(e.Data.Span),
-					CustomMetadata = ByteString.CopyFrom(e.Metadata.Span)
-				};
-			}
-
-			ReadResp.Types.ReadEvent ConvertToReadEvent((ResolvedEvent, int) _) {
-				var (e, retryCount) = _;
-				var readEvent = new ReadResp.Types.ReadEvent {
-					Link = ConvertToRecordedEvent(e.Link,
-						e.OriginalPosition?.CommitPosition,
-						e.OriginalPosition?.PreparePosition),
-					Event = ConvertToRecordedEvent(e.Event,
-						e.OriginalPosition?.CommitPosition,
-						e.OriginalPosition?.PreparePosition),
-					RetryCount = retryCount
-				};
-				if (e.OriginalPosition.HasValue) {
-					var position = Position.FromInt64(
-						e.OriginalPosition.Value.CommitPosition,
-						e.OriginalPosition.Value.PreparePosition);
-					readEvent.CommitPosition = position.CommitPosition;
-				} else {
-					readEvent.NoPosition = new Empty();
-				}
-
-				return readEvent;
-			}
-		}
-
-		private class PersistentStreamSubscriptionEnumerator
-			: IAsyncEnumerator<(ResolvedEvent resolvedEvent, int retryCount)> {
-			private readonly TaskCompletionSource<string> _subscriptionIdSource;
-			private readonly IPublisher _publisher;
-			private readonly Guid _correlationId;
-			private readonly ClaimsPrincipal _user;
-			private readonly CancellationToken _cancellationToken;
-			private readonly Channel<(ResolvedEvent, int)> _channel;
-
-			private (ResolvedEvent, int) _current;
-
-			public (ResolvedEvent resolvedEvent, int retryCount) Current => _current;
-			public Task<string> Started => _subscriptionIdSource.Task;
-
-			public PersistentStreamSubscriptionEnumerator(Guid correlationId,
-				string connectionName,
-				IPublisher publisher,
-				string streamName,
-				string groupName,
-				int bufferSize,
-				ClaimsPrincipal user,
-				CancellationToken cancellationToken) {
-				if (connectionName == null) {
-					throw new ArgumentNullException(nameof(connectionName));
-				}
-				if (publisher == null) {
-					throw new ArgumentNullException(nameof(publisher));
-				}
-
-				if (streamName == null) {
-					throw new ArgumentNullException(nameof(streamName));
-				}
-
-				if (groupName == null) {
-					throw new ArgumentNullException(nameof(groupName));
-				}
-
-				if (correlationId == Guid.Empty) {
-					throw new ArgumentException($"{nameof(correlationId)} should be non empty.", nameof(correlationId));
-				}
-
-				_correlationId = correlationId;
-				_publisher = publisher;
-				_subscriptionIdSource = new TaskCompletionSource<string>();
-				_user = user;
-				_cancellationToken = cancellationToken;
-				_channel = Channel.CreateBounded<(ResolvedEvent, int)>(new BoundedChannelOptions(bufferSize) {
-					SingleReader = true,
-					SingleWriter = false,
-					FullMode = BoundedChannelFullMode.DropWrite
-				});
-
-				var semaphore = new SemaphoreSlim(1, 1);
-
-				switch(streamName) {
-					case SystemStreams.AllStream:
-						publisher.Publish(new ClientMessage.ConnectToPersistentSubscriptionToAll(correlationId,
-							correlationId,
-							new ContinuationEnvelope(OnMessage, semaphore, _cancellationToken), correlationId,
-							connectionName,
-							groupName, bufferSize, string.Empty, user));
-						break;
-					default:
-						publisher.Publish(new ClientMessage.ConnectToPersistentSubscriptionToStream(correlationId,
-							correlationId,
-							new ContinuationEnvelope(OnMessage, semaphore, _cancellationToken), correlationId,
-							connectionName,
-							groupName, streamName, bufferSize, string.Empty, user));
-						break;
-				}
-
-				async Task OnMessage(Message message, CancellationToken ct) {
-					if (message is ClientMessage.NotHandled notHandled && RpcExceptions.TryHandleNotHandled(notHandled, out var ex)) {
-						_subscriptionIdSource.TrySetException(ex);
-						return;
-					}
-					
-					switch (message) {
-						case ClientMessage.SubscriptionDropped dropped:
-							switch (dropped.Reason) {
-								case SubscriptionDropReason.AccessDenied:
-									Fail(RpcExceptions.AccessDenied());
-									return;
-								case SubscriptionDropReason.NotFound:
-								case SubscriptionDropReason.PersistentSubscriptionDeleted:
-									Fail(RpcExceptions.PersistentSubscriptionDoesNotExist(streamName, groupName));
-									return;
-								case SubscriptionDropReason.SubscriberMaxCountReached:
-									Fail(RpcExceptions.PersistentSubscriptionMaximumSubscribersReached(streamName,
-										groupName));
-									return;
-								case SubscriptionDropReason.Unsubscribed:
-									Fail(RpcExceptions.PersistentSubscriptionDropped(streamName, groupName));
-									return;
-								default:
-									Fail(RpcExceptions.UnknownError(dropped.Reason));
-									return;
-							}
-						case ClientMessage.PersistentSubscriptionConfirmation confirmation:
-							_subscriptionIdSource.TrySetResult(confirmation.SubscriptionId);
-							return;
-						case ClientMessage.PersistentSubscriptionStreamEventAppeared appeared:
-							await _channel.Writer.WriteAsync((appeared.Event, appeared.RetryCount), ct);
-							return;
-						default:
-							Fail(RpcExceptions
-								.UnknownMessage<ClientMessage.PersistentSubscriptionConfirmation>(message));
-							return;
-					}
-				}
-
-				void Fail(Exception ex) {
-					_channel.Writer.TryComplete(ex);
-					_subscriptionIdSource.TrySetException(ex);
-				}
-			}
-
-			public ValueTask DisposeAsync() {
-				_publisher.Publish(new ClientMessage.UnsubscribeFromStream(Guid.NewGuid(), _correlationId,
-					new NoopEnvelope(), _user));
-				_channel.Writer.TryComplete();
-				return new ValueTask(Task.CompletedTask);
-			}
-
-			public async ValueTask<bool> MoveNextAsync() {
-				if (!await _channel.Reader.WaitToReadAsync(_cancellationToken)) {
-					return false;
-				}
-
-				_current = await _channel.Reader.ReadAsync(_cancellationToken);
-				return true;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.ReplayParked.cs b/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.ReplayParked.cs
deleted file mode 100644
index fcf5d0c501e..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.ReplayParked.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Client.PersistentSubscriptions;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Plugins.Authorization;
-using Grpc.Core;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class PersistentSubscriptions {
-		private static readonly Operation ReplayParkedOperation = new Operation(Plugins.Authorization.Operations.Subscriptions.ReplayParked);
-		public override async Task<ReplayParkedResp> ReplayParked(ReplayParkedReq request, ServerCallContext context) {
-			var replayParkedMessagesSource = new TaskCompletionSource<ReplayParkedResp>();
-			var correlationId = Guid.NewGuid();
-
-			var user = context.GetHttpContext().User;
-
-			if (!await _authorizationProvider.CheckAccessAsync(user,
-				ReplayParkedOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-
-			string streamId = request.Options.StreamOptionCase switch {
-				ReplayParkedReq.Types.Options.StreamOptionOneofCase.All => "$all",
-				ReplayParkedReq.Types.Options.StreamOptionOneofCase.StreamIdentifier => request.Options.StreamIdentifier,
-				_ => throw new InvalidOperationException()
-			};
-
-			long? stopAt = request.Options.StopAtOptionCase switch {
-				ReplayParkedReq.Types.Options.StopAtOptionOneofCase.StopAt => request.Options.StopAt,
-				ReplayParkedReq.Types.Options.StopAtOptionOneofCase.NoLimit => null,
-				_ => throw new InvalidOperationException()
-			};
-
-			_publisher.Publish(new ClientMessage.ReplayParkedMessages(
-				correlationId,
-				correlationId,
-				new CallbackEnvelope(HandleReplayParkedMessagesCompleted),
-				streamId,
-				request.Options.GroupName,
-				stopAt,
-				user));
-			return await replayParkedMessagesSource.Task;
-
-			void HandleReplayParkedMessagesCompleted(Message message) {
-				if (message is ClientMessage.NotHandled notHandled && RpcExceptions.TryHandleNotHandled(notHandled, out var ex)) {
-					replayParkedMessagesSource.TrySetException(ex);
-					return;
-				}
-
-				if (message is ClientMessage.ReplayMessagesReceived completed) {
-					switch (completed.Result) {
-						case ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.Success:
-							replayParkedMessagesSource.TrySetResult(new ReplayParkedResp());
-							return;
-						case ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.DoesNotExist:
-							replayParkedMessagesSource.TrySetException(
-								RpcExceptions.PersistentSubscriptionDoesNotExist(streamId,
-									request.Options.GroupName));
-							return;
-						case ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.AccessDenied:
-							replayParkedMessagesSource.TrySetException(
-								RpcExceptions.AccessDenied());
-							return;
-						case ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.Fail:
-							replayParkedMessagesSource.TrySetException(
-								RpcExceptions.PersistentSubscriptionFailed(streamId, request.Options.GroupName,
-									completed.Reason));
-							return;
-
-						default:
-							replayParkedMessagesSource.TrySetException(
-								RpcExceptions.UnknownError(completed.Result));
-							return;
-					}
-				}
-				replayParkedMessagesSource.TrySetException(
-					RpcExceptions.UnknownMessage<ClientMessage.ReplayMessagesReceived>(
-						message));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.RestartSubsystem.cs b/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.RestartSubsystem.cs
deleted file mode 100644
index 23283a1ae75..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.RestartSubsystem.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Client;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Plugins.Authorization;
-using Grpc.Core;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class PersistentSubscriptions {
-		private static readonly Operation RestartOperation = new Operation(Plugins.Authorization.Operations.Subscriptions.Restart);
-
-		public override async Task<Empty> RestartSubsystem(Empty request, ServerCallContext context) {
-			var restartSubsystemSource = new TaskCompletionSource<Empty>();
-
-			var user = context.GetHttpContext().User;
-
-			if (!await _authorizationProvider.CheckAccessAsync(user,
-				RestartOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-
-			_publisher.Publish(new SubscriptionMessage.PersistentSubscriptionsRestart(
-				new CallbackEnvelope(HandleRestartSubsystemCompleted)));
-			return await restartSubsystemSource.Task;
-
-			void HandleRestartSubsystemCompleted(Message message) {
-				if (message is ClientMessage.NotHandled notHandled &&
-				    RpcExceptions.TryHandleNotHandled(notHandled, out var ex)) {
-					restartSubsystemSource.TrySetException(ex);
-					return;
-				}
-
-				switch (message) {
-					case SubscriptionMessage.PersistentSubscriptionsRestarting _:
-						restartSubsystemSource.TrySetResult(new Empty());
-						return;
-					case SubscriptionMessage.InvalidPersistentSubscriptionsRestart fail:
-						restartSubsystemSource.TrySetException(
-							RpcExceptions.PersistentSubscriptionFailed("", "",
-								$"Persistent Subscriptions cannot be restarted as it is in the wrong state."));
-						return;
-					default:
-						restartSubsystemSource.TrySetException(
-							RpcExceptions.UnknownMessage<SubscriptionMessage.PersistentSubscriptionsRestarting>(message));
-						return;
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.Update.cs b/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.Update.cs
deleted file mode 100644
index 958ad3065cb..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.Update.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Client.PersistentSubscriptions;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Plugins.Authorization;
-using Grpc.Core;
-using StreamOptionOneofCase = EventStore.Client.PersistentSubscriptions.UpdateReq.Types.Options.StreamOptionOneofCase;
-using RevisionOptionOneofCase = EventStore.Client.PersistentSubscriptions.UpdateReq.Types.StreamOptions.RevisionOptionOneofCase;
-using AllOptionOneofCase = EventStore.Client.PersistentSubscriptions.UpdateReq.Types.AllOptions.AllOptionOneofCase;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class PersistentSubscriptions {
-		private static readonly Operation UpdateOperation = new Operation(Plugins.Authorization.Operations.Subscriptions.Update);
-		public override async Task<UpdateResp> Update(UpdateReq request, ServerCallContext context) {
-			var updatePersistentSubscriptionSource = new TaskCompletionSource<UpdateResp>();
-			var settings = request.Options.Settings;
-			var correlationId = Guid.NewGuid();
-
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user,
-				UpdateOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-
-			string streamId = null;
-
-			switch (request.Options.StreamOptionCase)
-			{
-				case StreamOptionOneofCase.Stream:
-				case StreamOptionOneofCase.None: /*for backwards compatibility*/
-				{
-					StreamRevision startRevision;
-
-					if (request.Options.StreamOptionCase == StreamOptionOneofCase.Stream) {
-						streamId = request.Options.Stream.StreamIdentifier;
-						startRevision = request.Options.Stream.RevisionOptionCase switch {
-							RevisionOptionOneofCase.Revision => new StreamRevision(request.Options.Stream.Revision),
-							RevisionOptionOneofCase.Start => StreamRevision.Start,
-							RevisionOptionOneofCase.End => StreamRevision.End,
-							_ => throw RpcExceptions.InvalidArgument(request.Options.Stream.RevisionOptionCase)
-						};
-					} else { /*for backwards compatibility*/
-						#pragma warning disable 612
-						streamId = request.Options.StreamIdentifier;
-						startRevision = new StreamRevision(request.Options.Settings.Revision);
-						#pragma warning restore 612
-					}
-
-					_publisher.Publish(new ClientMessage.UpdatePersistentSubscriptionToStream(
-						correlationId,
-						correlationId,
-						new CallbackEnvelope(HandleUpdatePersistentSubscriptionCompleted),
-						streamId,
-						request.Options.GroupName,
-						settings.ResolveLinks,
-						startRevision.ToInt64(),
-						settings.MessageTimeoutCase switch {
-							UpdateReq.Types.Settings.MessageTimeoutOneofCase.MessageTimeoutMs => settings.MessageTimeoutMs,
-							UpdateReq.Types.Settings.MessageTimeoutOneofCase.MessageTimeoutTicks => (int)TimeSpan
-								.FromTicks(settings.MessageTimeoutTicks).TotalMilliseconds,
-							_ => 0
-						},
-						settings.ExtraStatistics,
-						settings.MaxRetryCount,
-						settings.HistoryBufferSize,
-						settings.LiveBufferSize,
-						settings.ReadBatchSize,
-						settings.CheckpointAfterCase switch {
-							UpdateReq.Types.Settings.CheckpointAfterOneofCase.CheckpointAfterMs => settings.CheckpointAfterMs,
-							UpdateReq.Types.Settings.CheckpointAfterOneofCase.CheckpointAfterTicks => (int)TimeSpan
-								.FromTicks(settings.CheckpointAfterTicks).TotalMilliseconds,
-							_ => 0
-						},
-						settings.MinCheckpointCount,
-						settings.MaxCheckpointCount,
-						settings.MaxSubscriberCount,
-						settings.NamedConsumerStrategy.ToString(),
-						user));
-					break;
-				}
-				case StreamOptionOneofCase.All:
-					var startPosition = request.Options.All.AllOptionCase switch {
-						AllOptionOneofCase.Position => new Position(
-							request.Options.All.Position.CommitPosition,
-							request.Options.All.Position.PreparePosition),
-						AllOptionOneofCase.Start => Position.Start,
-						AllOptionOneofCase.End => Position.End,
-						_ => throw new InvalidOperationException()
-					};
-
-					streamId = SystemStreams.AllStream;
-
-					_publisher.Publish(new ClientMessage.UpdatePersistentSubscriptionToAll(
-						correlationId,
-						correlationId,
-						new CallbackEnvelope(HandleUpdatePersistentSubscriptionCompleted),
-						request.Options.GroupName,
-						settings.ResolveLinks,
-						new TFPos(
-							startPosition.ToInt64().commitPosition,
-							startPosition.ToInt64().preparePosition
-						),
-						settings.MessageTimeoutCase switch {
-							UpdateReq.Types.Settings.MessageTimeoutOneofCase.MessageTimeoutMs => settings.MessageTimeoutMs,
-							UpdateReq.Types.Settings.MessageTimeoutOneofCase.MessageTimeoutTicks => (int)TimeSpan
-								.FromTicks(settings.MessageTimeoutTicks).TotalMilliseconds,
-							_ => 0
-						},
-						settings.ExtraStatistics,
-						settings.MaxRetryCount,
-						settings.HistoryBufferSize,
-						settings.LiveBufferSize,
-						settings.ReadBatchSize,
-						settings.CheckpointAfterCase switch {
-							UpdateReq.Types.Settings.CheckpointAfterOneofCase.CheckpointAfterMs => settings.CheckpointAfterMs,
-							UpdateReq.Types.Settings.CheckpointAfterOneofCase.CheckpointAfterTicks => (int)TimeSpan
-								.FromTicks(settings.CheckpointAfterTicks).TotalMilliseconds,
-							_ => 0
-						},
-						settings.MinCheckpointCount,
-						settings.MaxCheckpointCount,
-						settings.MaxSubscriberCount,
-						settings.NamedConsumerStrategy.ToString(),
-						user));
-					break;
-				default:
-					throw new InvalidOperationException();
-			}
-
-			return await updatePersistentSubscriptionSource.Task;
-
-			void HandleUpdatePersistentSubscriptionCompleted(Message message) {
-				if (message is ClientMessage.NotHandled notHandled && RpcExceptions.TryHandleNotHandled(notHandled, out var ex)) {
-					updatePersistentSubscriptionSource.TrySetException(ex);
-					return;
-				}
-
-				if (streamId != SystemStreams.AllStream) {
-					if (message is ClientMessage.UpdatePersistentSubscriptionToStreamCompleted completed) {
-						switch (completed.Result) {
-							case ClientMessage.UpdatePersistentSubscriptionToStreamCompleted
-								.UpdatePersistentSubscriptionToStreamResult.Success:
-								updatePersistentSubscriptionSource.TrySetResult(new UpdateResp());
-								return;
-							case ClientMessage.UpdatePersistentSubscriptionToStreamCompleted
-								.UpdatePersistentSubscriptionToStreamResult.Fail:
-								updatePersistentSubscriptionSource.TrySetException(
-									RpcExceptions.PersistentSubscriptionFailed(streamId, request.Options.GroupName,
-										completed.Reason));
-								return;
-							case ClientMessage.UpdatePersistentSubscriptionToStreamCompleted
-								.UpdatePersistentSubscriptionToStreamResult
-								.AccessDenied:
-								updatePersistentSubscriptionSource.TrySetException(RpcExceptions.AccessDenied());
-								return;
-							case ClientMessage.UpdatePersistentSubscriptionToStreamCompleted
-								.UpdatePersistentSubscriptionToStreamResult.DoesNotExist:
-								updatePersistentSubscriptionSource.TrySetException(
-									RpcExceptions.PersistentSubscriptionDoesNotExist(streamId, request.Options.GroupName));
-								return;
-							default:
-								updatePersistentSubscriptionSource.TrySetException(
-									RpcExceptions.UnknownError(completed.Result));
-								return;
-						}
-					}
-					updatePersistentSubscriptionSource.TrySetException(
-						RpcExceptions.UnknownMessage<ClientMessage.UpdatePersistentSubscriptionToStreamCompleted>(message));
-				} else {
-					if (message is ClientMessage.UpdatePersistentSubscriptionToAllCompleted completedAll) {
-						switch (completedAll.Result) {
-							case ClientMessage.UpdatePersistentSubscriptionToAllCompleted
-								.UpdatePersistentSubscriptionToAllResult.Success:
-								updatePersistentSubscriptionSource.TrySetResult(new UpdateResp());
-								return;
-							case ClientMessage.UpdatePersistentSubscriptionToAllCompleted
-								.UpdatePersistentSubscriptionToAllResult.Fail:
-								updatePersistentSubscriptionSource.TrySetException(
-									RpcExceptions.PersistentSubscriptionFailed(streamId, request.Options.GroupName,
-										completedAll.Reason));
-								return;
-							case ClientMessage.UpdatePersistentSubscriptionToAllCompleted
-								.UpdatePersistentSubscriptionToAllResult
-								.AccessDenied:
-								updatePersistentSubscriptionSource.TrySetException(RpcExceptions.AccessDenied());
-								return;
-							case ClientMessage.UpdatePersistentSubscriptionToAllCompleted
-								.UpdatePersistentSubscriptionToAllResult.DoesNotExist:
-								updatePersistentSubscriptionSource.TrySetException(
-									RpcExceptions.PersistentSubscriptionDoesNotExist(streamId, request.Options.GroupName));
-								return;
-							default:
-								updatePersistentSubscriptionSource.TrySetException(
-									RpcExceptions.UnknownError(completedAll.Result));
-								return;
-						}
-					}
-					updatePersistentSubscriptionSource.TrySetException(
-						RpcExceptions.UnknownMessage<ClientMessage.UpdatePersistentSubscriptionToAllCompleted>(message));
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.cs b/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.cs
deleted file mode 100644
index 59d89a5c733..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/PersistentSubscriptions.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Plugins.Authorization;
-using Grpc.Core;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class PersistentSubscriptions
-		: EventStore.Client.PersistentSubscriptions.PersistentSubscriptions.PersistentSubscriptionsBase {
-		private readonly IPublisher _publisher;
-		private readonly IAuthorizationProvider _authorizationProvider;
-
-		public PersistentSubscriptions(IPublisher publisher, IAuthorizationProvider authorizationProvider) {
-			if (publisher == null) throw new ArgumentNullException(nameof(publisher));
-			if (authorizationProvider == null) throw new ArgumentNullException(nameof(authorizationProvider));
-			_publisher = publisher;
-			_authorizationProvider = authorizationProvider;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/ReadReq.cs b/src/EventStore.Core/Services/Transport/Grpc/ReadReq.cs
deleted file mode 100644
index 3e811bad4ef..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/ReadReq.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using EventStore.Core.Services.Transport.Common;
-
-// ReSharper disable CheckNamespace
-namespace EventStore.Client.Streams {
-// ReSharper restore CheckNamespace
-	partial class ReadReq {
-		partial class Types {
-			partial class Options {
-				partial class Types {
-					partial class StreamOptions {
-						internal StreamRevision ToStreamRevision() => RevisionOptionCase switch {
-							RevisionOptionOneofCase.End => StreamRevision.End,
-							RevisionOptionOneofCase.Start => StreamRevision.Start,
-							RevisionOptionOneofCase.Revision => new StreamRevision(Revision),
-							_ => throw new InvalidOperationException()
-						};
-
-						internal StreamRevision? ToSubscriptionStreamRevision() => RevisionOptionCase switch {
-							RevisionOptionOneofCase.End => StreamRevision.End,
-							RevisionOptionOneofCase.Start => null,
-							RevisionOptionOneofCase.Revision => new StreamRevision(Revision),
-							_ => throw new InvalidOperationException()
-						};
-					}
-
-					partial class AllOptions {
-						internal Core.Services.Transport.Common.Position ToPosition() => AllOptionCase switch {
-							AllOptionOneofCase.End => Core.Services.Transport.Common.Position.End,
-							AllOptionOneofCase.Start => Core.Services.Transport.Common.Position.Start,
-							AllOptionOneofCase.Position => new Core.Services.Transport.Common.Position(Position.CommitPosition,
-								Position.PreparePosition),
-							_ => throw new InvalidOperationException()
-						};
-
-						internal Core.Services.Transport.Common.Position? ToSubscriptionPosition() => AllOptionCase switch {
-							AllOptionOneofCase.End => Core.Services.Transport.Common.Position.End,
-							AllOptionOneofCase.Start => null,
-							AllOptionOneofCase.Position => new Core.Services.Transport.Common.Position(Position.CommitPosition,
-								Position.PreparePosition),
-							_ => throw new InvalidOperationException()
-						};
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/ReadResp.cs b/src/EventStore.Core/Services/Transport/Grpc/ReadResp.cs
deleted file mode 100644
index ca31a21c350..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/ReadResp.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// ReSharper disable CheckNamespace
-namespace EventStore.Client.Streams {
-// ReSharper restore CheckNamespace
-	partial class ReadResp {
-		partial class Types {
-			partial class ReadEvent {
-				public Types.RecordedEvent OriginalEvent => Link ?? Event;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Redaction.GetEventPositions.cs b/src/EventStore.Core/Services/Transport/Grpc/Redaction.GetEventPositions.cs
deleted file mode 100644
index 4d78f4cee9a..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Redaction.GetEventPositions.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Client.Redaction;
-using EventStore.Core.Data.Redaction;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Plugins.Authorization;
-using Grpc.Core;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class Redaction {
-		private static readonly Operation ReadOperation = new(Plugins.Authorization.Operations.Streams.Read);
-
-		public override async Task GetEventPositions(
-			IAsyncStreamReader<GetEventPositionReq> requestStream,
-			IServerStreamWriter<GetEventPositionResp> responseStream,
-			ServerCallContext context) {
-
-			var user = context.GetHttpContext().User;
-
-			await foreach (var request in requestStream.ReadAllAsync()) {
-				var streamId = request.StreamIdentifier.StreamName.ToStringUtf8();
-				var streamRevision = new StreamRevision(request.StreamRevision);
-
-				var op = ReadOperation.WithParameter(
-					Plugins.Authorization.Operations.Streams.Parameters.StreamId(streamId));
-
-				if (!await _authorizationProvider.CheckAccessAsync(user, op, context.CancellationToken))
-					throw RpcExceptions.AccessDenied();
-
-				var tcsEnvelope = new TcsEnvelope<RedactionMessage.GetEventPositionCompleted>();
-				_bus.Publish(new RedactionMessage.GetEventPosition(tcsEnvelope, streamId, streamRevision.ToInt64()));
-
-				var completionMsg = await tcsEnvelope.Task;
-				var result = completionMsg.Result;
-				if (result != GetEventPositionResult.Success)
-					throw RpcExceptions.RedactionGetEventPositionFailed(result.GetErrorMessage());
-
-				var eventPositions = completionMsg.EventPositions;
-
-				var response = new GetEventPositionResp();
-				foreach (var eventPosition in eventPositions) {
-					var pos = Position.FromInt64(eventPosition.LogPosition, eventPosition.LogPosition);
-					response.EventPositions.Add(new EventStore.Client.Redaction.EventPosition {
-						LogPosition = pos.PreparePosition,
-						ChunkInfo = new EventStore.Client.Redaction.ChunkInfo {
-							FileName = eventPosition.ChunkInfo.FileName,
-							Version = eventPosition.ChunkInfo.Version,
-							IsComplete = eventPosition.ChunkInfo.IsComplete,
-							EventOffset = eventPosition.ChunkInfo.EventOffset
-						}
-					});
-				}
-
-				await responseStream.WriteAsync(response);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Redaction.SwitchChunks.cs b/src/EventStore.Core/Services/Transport/Grpc/Redaction.SwitchChunks.cs
deleted file mode 100644
index 95951b9f891..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Redaction.SwitchChunks.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Client.Redaction;
-using EventStore.Core.Data.Redaction;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Plugins.Authorization;
-using Grpc.Core;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class Redaction {
-		private static readonly Operation SwitchChunkOperation = new(EventStore.Plugins.Authorization.Operations.Node.Redaction.SwitchChunk);
-
-		public override async Task SwitchChunks(
-			IAsyncStreamReader<SwitchChunkReq> requestStream,
-			IServerStreamWriter<SwitchChunkResp> responseStream,
-			ServerCallContext context) {
-
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, SwitchChunkOperation, context.CancellationToken))
-				throw RpcExceptions.AccessDenied();
-
-			var acquisitionId = Guid.Empty;
-			try {
-				acquisitionId = await AcquireChunksLock(context);
-				await SwitchChunks(requestStream, responseStream, acquisitionId);
-			} finally {
-				await ReleaseChunksLock(acquisitionId);
-			}
-		}
-
-		private async Task<Guid> AcquireChunksLock(ServerCallContext context) {
-			var tcsEnvelope = new TcsEnvelope<RedactionMessage.AcquireChunksLockCompleted>();
-			_bus.Publish(new RedactionMessage.AcquireChunksLock(tcsEnvelope));
-
-			var completionMsg = await tcsEnvelope.Task;
-			if (completionMsg.Result != AcquireChunksLockResult.Success)
-				throw RpcExceptions.RedactionLockFailed();
-
-			// we've managed to acquire the lock. we need to write the headers here since the client's waiting for them.
-			// (they're written automatically when throwing an RpcException e.g. when acquiring the lock failed above)
-			await context.WriteResponseHeadersAsync(new Metadata());
-
-			return completionMsg.AcquisitionId;
-		}
-
-		private async Task SwitchChunks(
-			IAsyncStreamReader<SwitchChunkReq> requestStream,
-			IServerStreamWriter<SwitchChunkResp> responseStream,
-			Guid acquisitionId) {
-
-			await foreach(var request in requestStream.ReadAllAsync()) {
-				var tcsEnvelope = new TcsEnvelope<RedactionMessage.SwitchChunkCompleted>();
-				_bus.Publish(new RedactionMessage.SwitchChunk(tcsEnvelope, acquisitionId, request.TargetChunkFile, request.NewChunkFile));
-
-				var completionMsg = await tcsEnvelope.Task;
-				var result = completionMsg.Result;
-				if (result != SwitchChunkResult.Success)
-					throw RpcExceptions.RedactionSwitchChunkFailed(result.GetErrorMessage());
-
-				await responseStream.WriteAsync(new SwitchChunkResp());
-			}
-		}
-
-		private async Task ReleaseChunksLock(Guid acquisitionId) {
-			if (acquisitionId == Guid.Empty)
-				return;
-
-			var tcsEnvelope = new TcsEnvelope<RedactionMessage.ReleaseChunksLockCompleted>();
-			_bus.Publish(new RedactionMessage.ReleaseChunksLock(tcsEnvelope, acquisitionId));
-
-			var completionMsg = await tcsEnvelope.Task;
-			var result = completionMsg.Result;
-			if (result != ReleaseChunksLockResult.Success)
-				throw RpcExceptions.RedactionSwitchChunkFailed(result.GetErrorMessage());
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Redaction.cs b/src/EventStore.Core/Services/Transport/Grpc/Redaction.cs
deleted file mode 100644
index 71cb935092c..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Redaction.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using EventStore.Core.Bus;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class Redaction : EventStore.Client.Redaction.Redaction.RedactionBase {
-		private readonly IPublisher _bus;
-		private readonly IAuthorizationProvider _authorizationProvider;
-
-		public Redaction(IPublisher bus, IAuthorizationProvider authorizationProvider) {
-			_bus = bus;
-			_authorizationProvider = authorizationProvider;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/RetryInterceptor.cs b/src/EventStore.Core/Services/Transport/Grpc/RetryInterceptor.cs
deleted file mode 100644
index b666524ede5..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/RetryInterceptor.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System.Threading.Tasks;
-using Grpc.Core;
-using Grpc.Core.Interceptors;
-using Serilog;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	// Detect calls that have been automatically retried per https://github.com/grpc/proposal/blob/master/A6-client-retries.md
-	// such calls may not have been intended by the user and as such may disguise a network interruption as a slow server response
-	class RetryInterceptor : Interceptor {
-		public static readonly ILogger Log = Serilog.Log.ForContext<RetryInterceptor>();
-
-		public override Task<TResponse> ClientStreamingServerHandler<TRequest, TResponse>(
-			IAsyncStreamReader<TRequest> requestStream,
-			ServerCallContext context,
-			ClientStreamingServerMethod<TRequest, TResponse> continuation) {
-
-			LogRetries(context);
-			return base.ClientStreamingServerHandler(requestStream, context, continuation);
-		}
-
-		public override Task DuplexStreamingServerHandler<TRequest, TResponse>(
-			IAsyncStreamReader<TRequest> requestStream,
-			IServerStreamWriter<TResponse> responseStream,
-			ServerCallContext context,
-			DuplexStreamingServerMethod<TRequest, TResponse> continuation) {
-
-			LogRetries(context);
-			return base.DuplexStreamingServerHandler(requestStream, responseStream, context, continuation);
-		}
-
-		public override Task ServerStreamingServerHandler<TRequest, TResponse>(
-			TRequest request,
-			IServerStreamWriter<TResponse> responseStream,
-			ServerCallContext context,
-			ServerStreamingServerMethod<TRequest, TResponse> continuation) {
-
-			LogRetries(context);
-			return base.ServerStreamingServerHandler(request, responseStream, context, continuation);
-		}
-
-		public override Task<TResponse> UnaryServerHandler<TRequest, TResponse>(
-			TRequest request,
-			ServerCallContext context,
-			UnaryServerMethod<TRequest, TResponse> continuation) {
-
-			LogRetries(context);
-			return base.UnaryServerHandler(request, context, continuation);
-
-		}
-
-		private void LogRetries(ServerCallContext context) {
-			var entry = context.RequestHeaders.Get("grpc-previous-rpc-attempts");
-			if (entry is null)
-				return;
-
-			Log.Information("gRPC call to {method} received after {retries} retries", context.Method, entry.Value);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/RpcExceptions.cs b/src/EventStore.Core/Services/Transport/Grpc/RpcExceptions.cs
deleted file mode 100644
index e2023e2fa91..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/RpcExceptions.cs
+++ /dev/null
@@ -1,249 +0,0 @@
-using System;
-using System.Runtime.CompilerServices;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using Grpc.Core;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	public static class RpcExceptions {
-		public static Exception Timeout(string message) => new RpcException(new Status(StatusCode.Aborted, $"Operation timed out: {message}"));
-
-		public static RpcException ServerNotReady() =>
-			new(new Status(StatusCode.Unavailable, "Server Is Not Ready"));
-
-		public static RpcException ServerBusy() =>
-			new (new Status(StatusCode.Unavailable, "Server Is Too Busy"));
-
-		public static Exception NoLeaderInfo() =>
-			new RpcException(new Status(StatusCode.Unknown, "No leader info available in response"));
-
-		public static RpcException LeaderInfo(string host, int port) =>
-			new (new Status(StatusCode.NotFound, $"Leader info available"), new Metadata {
-				{Constants.Exceptions.ExceptionKey, Constants.Exceptions.NotLeader},
-				{Constants.Exceptions.LeaderEndpointHost, host},
-				{Constants.Exceptions.LeaderEndpointPort, port.ToString()},
-			});
-
-		public static RpcException StreamNotFound(string streamName) =>
-			new (new Status(StatusCode.NotFound, $"Event stream '{streamName}' is not found."), new Metadata {
-				{Constants.Exceptions.ExceptionKey, Constants.Exceptions.StreamNotFound},
-				{Constants.Exceptions.StreamName, streamName}
-			});
-
-		public static RpcException NoStream(string streamName) =>
-			new (new Status(StatusCode.NotFound, $"Event stream '{streamName}' was not created."));
-
-		public static RpcException UnknownMessage<T>(Message message) where T : Message =>
-			UnknownMessage(message.GetType(), typeof(T));
-
-		public static RpcException UnknownMessage(Type unknownMessageType, Type expectedMsgType) =>
-			new(new Status(StatusCode.Unknown,
-				$"Envelope callback expected either {expectedMsgType.Name} or {nameof(ClientMessage.NotHandled)}, received {unknownMessageType.Name} instead"));
-
-		public static RpcException UnknownError<T>(T result) where T : unmanaged =>
-			UnknownError(typeof(T), result);
-
-		public static RpcException UnknownError(Type resultType, object result) =>
-			new(new Status(StatusCode.Unknown, $"Unexpected {resultType.Name}: {result}"));
-
-		public static RpcException UnknownError(string message) =>
-			new(new Status(StatusCode.Unknown, message));
-
-		public static RpcException AccessDenied() =>
-			new(new Status(StatusCode.PermissionDenied, "Access Denied"), new Metadata {
-				{Constants.Exceptions.ExceptionKey, Constants.Exceptions.AccessDenied}
-			});
-
-		public static RpcException InvalidTransaction() =>
-			new(new Status(StatusCode.InvalidArgument, "Invalid Transaction"), new Metadata {
-				{Constants.Exceptions.ExceptionKey, Constants.Exceptions.InvalidTransaction}
-			});
-
-		public static RpcException StreamDeleted(string streamName) =>
-			new(new Status(StatusCode.FailedPrecondition, $"Event stream '{streamName}' is deleted."),
-				new Metadata {
-					{Constants.Exceptions.ExceptionKey, Constants.Exceptions.StreamDeleted},
-					{Constants.Exceptions.StreamName, streamName}
-				});
-
-		public static RpcException ScavengeNotFound(string scavengeId) =>
-			new(new Status(StatusCode.NotFound, "Scavenge id was invalid."),
-				new Metadata {
-					{Constants.Exceptions.ExceptionKey, Constants.Exceptions.ScavengeNotFound},
-					{Constants.Exceptions.ScavengeId, scavengeId ?? string.Empty}
-				});
-
-		public static RpcException RedactionLockFailed() =>
-			new(
-				new Status(
-					StatusCode.FailedPrecondition,
-					$"Failed to acquire lock for redaction."
-				),
-				new Metadata {
-					{Constants.Exceptions.ExceptionKey, Constants.Exceptions.RedactionLockFailed}
-				});
-
-		public static RpcException RedactionGetEventPositionFailed(string reason) =>
-			new(
-				new Status(
-					StatusCode.Unknown,
-					$"Failed to get event position: '{reason}'"
-				),
-				new Metadata {
-					{Constants.Exceptions.ExceptionKey, Constants.Exceptions.RedactionGetEventPositionFailed},
-					{Constants.Exceptions.Reason, reason}
-				});
-
-		public static RpcException RedactionSwitchChunkFailed(string reason) =>
-			new(
-				new Status(
-					StatusCode.FailedPrecondition,
-					$"Failed to switch chunk during redaction: '{reason}'"
-				),
-				new Metadata {
-					{Constants.Exceptions.ExceptionKey, Constants.Exceptions.RedactionSwitchChunkFailed},
-					{Constants.Exceptions.Reason, reason}
-				});
-
-		public static RpcException WrongExpectedVersion(
-			string operation,
-			string streamName,
-			long expectedVersion,
-			long? actualVersion = default) =>
-			new(
-				new Status(
-					StatusCode.FailedPrecondition,
-					$"{operation} failed due to WrongExpectedVersion. Stream: {streamName}, Expected version: {expectedVersion}, Actual version: {actualVersion}"),
-				new Metadata {
-					{Constants.Exceptions.ExceptionKey, Constants.Exceptions.WrongExpectedVersion},
-					{Constants.Exceptions.StreamName, streamName},
-					{Constants.Exceptions.ExpectedVersion, expectedVersion.ToString()},
-					{Constants.Exceptions.ActualVersion, actualVersion?.ToString() ?? string.Empty}
-				});
-
-		public static RpcException MaxAppendSizeExceeded(int maxAppendSize) =>
-			new(
-				new Status(StatusCode.InvalidArgument, $"Maximum Append Size of {maxAppendSize} Exceeded."),
-				new Metadata {
-					{Constants.Exceptions.ExceptionKey, Constants.Exceptions.MaximumAppendSizeExceeded},
-					{Constants.Exceptions.MaximumAppendSize, maxAppendSize.ToString()}
-				});
-
-		public static RpcException RequiredMetadataPropertyMissing(string missingMetadataProperty) =>
-			new(
-				new Status(StatusCode.InvalidArgument, $"Required Metadata Property '{missingMetadataProperty}' is missing"),
-				new Metadata {
-					{Constants.Exceptions.ExceptionKey, Constants.Exceptions.MissingRequiredMetadataProperty},
-					{Constants.Exceptions.RequiredMetadataProperties, string.Join(",", Constants.Metadata.RequiredMetadata)}
-				});
-
-		public static bool TryHandleNotHandled(ClientMessage.NotHandled notHandled, out Exception exception) {
-			exception = null;
-			switch (notHandled.Reason) {
-				case ClientMessage.NotHandled.Types.NotHandledReason.NotReady:
-					exception = ServerNotReady();
-					return true;
-				case ClientMessage.NotHandled.Types.NotHandledReason.TooBusy:
-					exception = ServerBusy();
-					return true;
-				case ClientMessage.NotHandled.Types.NotHandledReason.NotLeader:
-				case ClientMessage.NotHandled.Types.NotHandledReason.IsReadOnly:
-					switch (notHandled.LeaderInfo) {
-						case { } leaderInfo:
-							exception = LeaderInfo(leaderInfo.Http.GetHost(), leaderInfo.Http.GetPort());
-							return true;
-						default:
-							exception = NoLeaderInfo();
-							return true;
-					}
-
-				default:
-					return false;
-			}
-		}
-
-		public static Exception PersistentSubscriptionFailed(string streamName, string groupName, string reason)
-			=> new RpcException(
-				new Status(
-					StatusCode.Internal,
-					$"Subscription group {groupName} on stream {streamName} failed: '{reason}'"), new Metadata {
-					{Constants.Exceptions.ExceptionKey, Constants.Exceptions.PersistentSubscriptionFailed},
-					{Constants.Exceptions.StreamName, streamName},
-					{Constants.Exceptions.GroupName, groupName},
-					{Constants.Exceptions.Reason, reason}
-				});
-
-		public static Exception PersistentSubscriptionDoesNotExist(string streamName, string groupName)
-			=> new RpcException(
-				new Status(
-					StatusCode.NotFound,
-					$"Subscription group {groupName} on stream {streamName} does not exist."), new Metadata {
-					{Constants.Exceptions.ExceptionKey, Constants.Exceptions.PersistentSubscriptionDoesNotExist},
-					{Constants.Exceptions.StreamName, streamName},
-					{Constants.Exceptions.GroupName, groupName}
-				});
-
-		public static Exception PersistentSubscriptionExists(string streamName, string groupName)
-			=> new RpcException(
-				new Status(
-					StatusCode.AlreadyExists,
-					$"Subscription group {groupName} on stream {streamName} exists."), new Metadata {
-					{Constants.Exceptions.ExceptionKey, Constants.Exceptions.PersistentSubscriptionExists},
-					{Constants.Exceptions.StreamName, streamName},
-					{Constants.Exceptions.GroupName, groupName}
-				});
-
-		public static Exception PersistentSubscriptionMaximumSubscribersReached(string streamName, string groupName)
-			=> new RpcException(
-				new Status(
-					StatusCode.FailedPrecondition,
-					$"Maximum subscriptions reached for subscription group {groupName} on stream {streamName}."),
-				new Metadata {
-					{Constants.Exceptions.ExceptionKey, Constants.Exceptions.MaximumSubscribersReached},
-					{Constants.Exceptions.StreamName, streamName},
-					{Constants.Exceptions.GroupName, groupName}
-				});
-
-		public static Exception PersistentSubscriptionDropped(string streamName, string groupName)
-			=> new RpcException(
-				new Status(
-					StatusCode.Cancelled,
-					$"Subscription group {groupName} on stream {streamName} was dropped."), new Metadata {
-					{Constants.Exceptions.ExceptionKey, Constants.Exceptions.PersistentSubscriptionDropped},
-					{Constants.Exceptions.StreamName, streamName},
-					{Constants.Exceptions.GroupName, groupName}
-				});
-
-		public static Exception LoginNotFound(string loginName) =>
-			new RpcException(new Status(StatusCode.NotFound, $"User '{loginName}' is not found."), new Metadata {
-				{Constants.Exceptions.ExceptionKey, Constants.Exceptions.UserNotFound},
-				{Constants.Exceptions.LoginName, loginName}
-			});
-
-		public static Exception LoginConflict(string loginName) =>
-			new RpcException(new Status(StatusCode.FailedPrecondition, "Conflict."), new Metadata {
-				{Constants.Exceptions.ExceptionKey, Constants.Exceptions.UserConflict},
-				{Constants.Exceptions.LoginName, loginName}
-			});
-
-		public static Exception LoginTryAgain(string loginName) =>
-			new RpcException(new Status(StatusCode.DeadlineExceeded, "Try again."), new Metadata {
-				{Constants.Exceptions.ExceptionKey, Constants.Exceptions.UserConflict},
-				{Constants.Exceptions.LoginName, loginName}
-			});
-
-		public static RpcException InvalidArgument<T>(T argument) =>
-			new(new Status(StatusCode.InvalidArgument, $"'{argument}' is not a valid {typeof(T)}"));
-
-		public static RpcException RequiredArgument<T>(string name, T argument) =>
-			new(new Status(StatusCode.InvalidArgument, $" `{name}` is a required argument of type {typeof(T)}"));
-
-		public static RpcException InvalidCombination<T>(T combination) where T : ITuple
-			=> new(new Status(StatusCode.InvalidArgument, $"The combination of {combination} is invalid."));
-
-		public static RpcException InvalidPositionException() =>
-			new(new Status(StatusCode.InvalidArgument, $"Trying to read from an invalid position."));
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/ServerFeatures.cs b/src/EventStore.Core/Services/Transport/Grpc/ServerFeatures.cs
deleted file mode 100644
index 59ed2a699fe..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/ServerFeatures.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Client;
-using EventStore.Client.ServerFeatures;
-using Grpc.AspNetCore.Server;
-using Grpc.Core;
-using Microsoft.AspNetCore.Routing;
-using VersionInfo = EventStore.Common.Utils.VersionInfo;
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class ServerFeatures
-		: EventStore.Client.ServerFeatures.ServerFeatures.ServerFeaturesBase {
-		public const int ApiVersion = 1;
-		private readonly Task<SupportedMethods> _supportedMethods;
-
-		public ServerFeatures(EndpointDataSource endpointDataSource) {
-			_supportedMethods = GetSupportedMethods(endpointDataSource);
-		}
-
-		public override Task<SupportedMethods> GetSupportedMethods(Empty request, ServerCallContext context) =>
-			_supportedMethods;
-
-		private static Task<SupportedMethods> GetSupportedMethods(EndpointDataSource endpointDataSource) {
-			var supportedEndpoints = endpointDataSource.Endpoints
-				.Select(x => x.Metadata.FirstOrDefault(m => m is GrpcMethodMetadata))
-				.OfType<GrpcMethodMetadata>()
-				.Where(x => x.Method.ServiceName.Contains("client"))
-				.Select(x => {
-					var method = new SupportedMethod {
-						MethodName = x.Method.Name.ToLower(),
-						ServiceName = x.Method.ServiceName.ToLower(),
-					};
-
-					if (x.Method.ServiceName.Contains("PersistentSubscriptions")) {
-						method.Features.AddRange(new[] {"stream", "all"});
-					} else if (x.Method.ServiceName.Contains("Streams") && x.Method.Name.Contains("Read")) {
-						method.Features.AddRange(new[] {"position", "events"});
-					} else if (x.Method.ServiceName.Contains("Streams") && x.Method.Name.Contains("BatchAppend")) {
-						method.Features.Add("deadline_duration");
-					} else if (x.Method.ServiceName.Contains("Projections") && x.Method.Name.Contains("Create")) {
-						method.Features.Add("track_emitted_streams");
-					}
-
-					return method;
-				});
-
-			var result = new SupportedMethods {
-				EventStoreServerVersion = string.Join('.', VersionInfo.Version.Split('.')[..3]),
-				Methods = { supportedEndpoints.Distinct() }
-			};
-			return Task.FromResult(result);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/ServiceBase.cs b/src/EventStore.Core/Services/Transport/Grpc/ServiceBase.cs
deleted file mode 100644
index d59c8ab88a8..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/ServiceBase.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Transport.Grpc;
-using EventStore.Client;
-using Grpc.Core;
-
-namespace EventStore.Cluster {
-	partial class Gossip {
-		partial class GossipBase : ServiceBase {
-			
-		}
-	}
-
-	partial class Elections {
-		partial class ElectionsBase : ServiceBase {
-
-		}
-	}
-}
-
-namespace EventStore.Client.PersistentSubscriptions {
-	partial class PersistentSubscriptions {
-		partial class PersistentSubscriptionsBase : ServiceBase {
-		}
-	}
-}
-
-namespace EventStore.Client.FeatureDiscovery {
-	partial class FeatureDiscovery {
-		partial class FeatureDiscoveryBase : ServiceBase {
-		}
-	}
-}
-
-namespace EventStore.Client.Streams {
-	partial class Streams {
-		partial class StreamsBase : ServiceBase {
-		}
-	}
-}
-
-namespace EventStore.Client.Users {
-	partial class Users {
-		partial class UsersBase : ServiceBase {
-		}
-	}
-}
-
-namespace EventStore.Client.Operations {
-	partial class Operations {
-		partial class OperationsBase : ServiceBase {
-		}
-	}
-}
-
-namespace EventStore.Client.Gossip {
-	partial class Gossip {
-		partial class GossipBase : ServiceBase {
-		}
-	}
-}
-
-namespace EventStore.Client.Monitoring {
-	partial class Monitoring {
-		partial class MonitoringBase : ServiceBase {
-		}
-	}
-}
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	public class ServiceBase {
-		protected static bool GetRequiresLeader(Metadata requestHeaders) {
-			var requiresLeaderHeaderValue =
-				requestHeaders.FirstOrDefault(x => x.Key == Constants.Headers.RequiresLeader)?.Value;
-			if (string.IsNullOrEmpty(requiresLeaderHeaderValue)) return false;
-			bool.TryParse(requiresLeaderHeaderValue, out var requiresLeader);
-			return requiresLeader;
-		}
-
-		public static Exception AccessDenied() =>
-			new RpcException(new Status(StatusCode.PermissionDenied, "Access Denied"), new Metadata {
-				{ Constants.Exceptions.ExceptionKey, Constants.Exceptions.AccessDenied }
-			});
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Status.cs b/src/EventStore.Core/Services/Transport/Grpc/Status.cs
deleted file mode 100644
index d35ded46fd9..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Status.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using EventStore.Client;
-using EventStore.Core.Services.Transport.Common;
-using Google.Protobuf.WellKnownTypes;
-using Empty = Google.Protobuf.WellKnownTypes.Empty;
-
-// ReSharper disable once CheckNamespace
-namespace Google.Rpc {
-	partial class Status {
-		public static Status WrongExpectedVersion(StreamRevision currentStreamRevision,
-			long expectedVersion) => new() {
-			Message = nameof(WrongExpectedVersion),
-			Details = Any.Pack(EventStore.Client.WrongExpectedVersion.Create(currentStreamRevision, expectedVersion)),
-			Code = Code.AlreadyExists
-		};
-
-		public static Status StreamDeleted(StreamIdentifier streamIdentifier) => new() {
-			Details = Any.Pack(new StreamDeleted {
-				StreamIdentifier = streamIdentifier
-			}),
-			Message = nameof(StreamDeleted),
-			Code = Code.NotFound
-		};
-
-		public static Status AccessDenied { get; } = new() {
-			Details = Any.Pack(new AccessDenied()),
-			Message = nameof(AccessDenied),
-			Code = Code.PermissionDenied
-		};
-
-		public static Status Timeout { get; } = new() {
-			Details = Any.Pack(new Timeout()),
-			Message = nameof(Timeout),
-			Code = Code.DeadlineExceeded
-		};
-
-		public static Status InvalidTransaction { get; } = new() {
-			Details = Any.Pack(new InvalidTransaction()),
-			Message = nameof(InvalidTransaction),
-			Code = Code.FailedPrecondition
-		};
-
-		public static Status Unknown { get; } = new() {
-			Details = Any.Pack(new Unknown()),
-			Message = nameof(Unknown),
-			Code = Code.Unknown
-		};
-
-		public static Status MaximumAppendSizeExceeded(uint maxAppendSize) =>
-			new() {
-				Details = Any.Pack(new MaximumAppendSizeExceeded {
-					MaxAppendSize = maxAppendSize
-				}),
-				Message = nameof(MaximumAppendSizeExceeded),
-				Code = Code.InvalidArgument
-			};
-
-		public static Status BadRequest(string message) => new() {
-			Details = Any.Pack(new BadRequest {Message = message}),
-			Message = nameof(BadRequest),
-			Code = Code.InvalidArgument
-		};
-
-		public static Status InternalError(string message) => new() {
-			Details = Any.Pack(new Empty()),
-			Message = message,
-			Code = Code.Internal
-		};
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/StreamIdentifier.cs b/src/EventStore.Core/Services/Transport/Grpc/StreamIdentifier.cs
deleted file mode 100644
index 85dfdf2b2ac..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/StreamIdentifier.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Text;
-using Google.Protobuf;
-
-// ReSharper disable once CheckNamespace
-namespace EventStore.Client  {
-	partial class StreamIdentifier {
-		private string _cached;
-		public static implicit operator string(StreamIdentifier source) {
-			if (source._cached != null || source.StreamName.IsEmpty) return source._cached;
-			var tmp = Encoding.UTF8.GetString(source.StreamName.Span);
-			//this doesn't have to be thread safe, its just a cache in case the identifier is turned into a string several times
-			source._cached = tmp;
-			return source._cached;
-		}
-
-		public static implicit operator StreamIdentifier(string source) =>
-			new() {StreamName = ByteString.CopyFromUtf8(source)};
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Streams.Append.cs b/src/EventStore.Core/Services/Transport/Grpc/Streams.Append.cs
deleted file mode 100644
index 23c957a0adb..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Streams.Append.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Client.Streams;
-using EventStore.Core.Services.Transport.Common;
-using Grpc.Core;
-using Empty = EventStore.Client.Empty;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class Streams<TStreamId> {
-		public override async Task<AppendResp> Append(
-			IAsyncStreamReader<AppendReq> requestStream,
-			ServerCallContext context) {
-
-			using var duration = _appendTracker.Start();
-			try {
-				if (!await requestStream.MoveNext())
-					throw new InvalidOperationException();
-
-				if (requestStream.Current.ContentCase != AppendReq.ContentOneofCase.Options)
-					throw new InvalidOperationException();
-
-				var options = requestStream.Current.Options;
-				var streamName = options.StreamIdentifier;
-
-				var expectedVersion = options.ExpectedStreamRevisionCase switch {
-					AppendReq.Types.Options.ExpectedStreamRevisionOneofCase.Revision => new StreamRevision(
-						options.Revision).ToInt64(),
-					AppendReq.Types.Options.ExpectedStreamRevisionOneofCase.Any => AnyStreamRevision.Any.ToInt64(),
-					AppendReq.Types.Options.ExpectedStreamRevisionOneofCase.StreamExists => AnyStreamRevision.StreamExists
-						.ToInt64(),
-					AppendReq.Types.Options.ExpectedStreamRevisionOneofCase.NoStream =>
-						AnyStreamRevision.NoStream.ToInt64(),
-					_ => throw RpcExceptions.InvalidArgument(options.ExpectedStreamRevisionCase)
-				};
-
-				var requiresLeader = GetRequiresLeader(context.RequestHeaders);
-
-				var user = context.GetHttpContext().User;
-				var op = WriteOperation.WithParameter(
-					Plugins.Authorization.Operations.Streams.Parameters.StreamId(streamName));
-				if (!await _provider.CheckAccessAsync(user, op, context.CancellationToken)) {
-					throw RpcExceptions.AccessDenied();
-				}
-
-				var correlationId = Guid.NewGuid(); // TODO: JPB use request id?
-
-				var events = new List<Event>();
-
-				var size = 0;
-				while (await requestStream.MoveNext()) {
-					if (requestStream.Current.ContentCase != AppendReq.ContentOneofCase.ProposedMessage)
-						throw new InvalidOperationException();
-
-					var proposedMessage = requestStream.Current.ProposedMessage;
-					var data = proposedMessage.Data.ToByteArray();
-					var metadata = proposedMessage.CustomMetadata.ToByteArray();
-
-					if (!proposedMessage.Metadata.TryGetValue(Constants.Metadata.Type, out var eventType)) {
-						throw RpcExceptions.RequiredMetadataPropertyMissing(Constants.Metadata.Type);
-					}
-
-					if (!proposedMessage.Metadata.TryGetValue(Constants.Metadata.ContentType, out var contentType)) {
-						throw RpcExceptions.RequiredMetadataPropertyMissing(Constants.Metadata.ContentType);
-					}
-
-					size += Event.SizeOnDisk(eventType, data, metadata);
-
-					if (size > _maxAppendSize) {
-						throw RpcExceptions.MaxAppendSizeExceeded(_maxAppendSize);
-					}
-
-					events.Add(new Event(
-						Uuid.FromDto(proposedMessage.Id).ToGuid(),
-						eventType,
-						contentType == Constants.Metadata.ContentTypes.ApplicationJson,
-						data,
-						metadata));
-				}
-
-				var appendResponseSource = new TaskCompletionSource<AppendResp>(TaskCreationOptions.RunContinuationsAsynchronously);
-
-				var envelope = new CallbackEnvelope(HandleWriteEventsCompleted);
-
-				_publisher.Publish(new ClientMessage.WriteEvents(
-					correlationId,
-					correlationId,
-					envelope,
-					requiresLeader,
-					streamName,
-					expectedVersion,
-					events.ToArray(),
-					user,
-					cancellationToken: context.CancellationToken));
-
-				return await appendResponseSource.Task;
-
-				void HandleWriteEventsCompleted(Message message) {
-					if (message is ClientMessage.NotHandled notHandled &&
-						RpcExceptions.TryHandleNotHandled(notHandled, out var ex)) {
-						appendResponseSource.TrySetException(ex);
-						return;
-					}
-
-					if (!(message is ClientMessage.WriteEventsCompleted completed)) {
-						appendResponseSource.TrySetException(
-							RpcExceptions.UnknownMessage<ClientMessage.WriteEventsCompleted>(message));
-						return;
-					}
-
-					var response = new AppendResp();
-					switch (completed.Result) {
-						case OperationResult.Success:
-							response.Success = new AppendResp.Types.Success();
-							if (completed.LastEventNumber == -1) {
-								response.Success.NoStream = new Empty();
-							} else {
-								response.Success.CurrentRevision = StreamRevision.FromInt64(completed.LastEventNumber);
-							}
-
-							if (completed.CommitPosition == -1) {
-								response.Success.NoPosition = new Empty();
-							} else {
-								var position = Position.FromInt64(completed.CommitPosition, completed.PreparePosition);
-								response.Success.Position = new AppendResp.Types.Position {
-									CommitPosition = position.CommitPosition,
-									PreparePosition = position.PreparePosition
-								};
-							}
-
-							appendResponseSource.TrySetResult(response);
-							return;
-						case OperationResult.PrepareTimeout:
-						case OperationResult.CommitTimeout:
-						case OperationResult.ForwardTimeout:
-							appendResponseSource.TrySetException(RpcExceptions.Timeout(completed.Message));
-							return;
-						case OperationResult.WrongExpectedVersion:
-							response.WrongExpectedVersion = new AppendResp.Types.WrongExpectedVersion();
-
-							switch (options.ExpectedStreamRevisionCase) {
-								case AppendReq.Types.Options.ExpectedStreamRevisionOneofCase.Any:
-									response.WrongExpectedVersion.ExpectedAny = new Empty();
-									response.WrongExpectedVersion.Any2060 = new Empty();
-									break;
-								case AppendReq.Types.Options.ExpectedStreamRevisionOneofCase.StreamExists:
-									response.WrongExpectedVersion.ExpectedStreamExists = new Empty();
-									response.WrongExpectedVersion.StreamExists2060 = new Empty();
-									break;
-								case AppendReq.Types.Options.ExpectedStreamRevisionOneofCase.NoStream:
-									response.WrongExpectedVersion.ExpectedNoStream = new Empty();
-									response.WrongExpectedVersion.ExpectedRevision2060 = ulong.MaxValue;
-									break;
-								case AppendReq.Types.Options.ExpectedStreamRevisionOneofCase.Revision:
-									response.WrongExpectedVersion.ExpectedRevision =
-										StreamRevision.FromInt64(expectedVersion);
-									response.WrongExpectedVersion.ExpectedRevision2060 =
-										StreamRevision.FromInt64(expectedVersion);
-									break;
-							}
-
-							if (completed.CurrentVersion == -1) {
-								response.WrongExpectedVersion.CurrentNoStream = new Empty();
-								response.WrongExpectedVersion.NoStream2060 = new Empty();
-							} else {
-								response.WrongExpectedVersion.CurrentRevision =
-									StreamRevision.FromInt64(completed.CurrentVersion);
-								response.WrongExpectedVersion.CurrentRevision2060 =
-									StreamRevision.FromInt64(completed.CurrentVersion);
-							}
-
-							appendResponseSource.TrySetResult(response);
-							return;
-						case OperationResult.StreamDeleted:
-							appendResponseSource.TrySetException(RpcExceptions.StreamDeleted(streamName));
-							return;
-						case OperationResult.InvalidTransaction:
-							appendResponseSource.TrySetException(RpcExceptions.InvalidTransaction());
-							return;
-						case OperationResult.AccessDenied:
-							appendResponseSource.TrySetException(RpcExceptions.AccessDenied());
-							return;
-						default:
-							appendResponseSource.TrySetException(RpcExceptions.UnknownError(completed.Result));
-							return;
-					}
-				}
-			} catch (Exception ex) {
-				duration.SetException(ex);
-				throw;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Streams.BatchAppend.cs b/src/EventStore.Core/Services/Transport/Grpc/Streams.BatchAppend.cs
deleted file mode 100644
index 72b67e69cfd..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Streams.BatchAppend.cs
+++ /dev/null
@@ -1,356 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-using EventStore.Client;
-using EventStore.Client.Streams;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Metrics;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Plugins.Authorization;
-using Google.Protobuf;
-using Google.Protobuf.WellKnownTypes;
-using Grpc.Core;
-using Serilog;
-using Empty = Google.Protobuf.WellKnownTypes.Empty;
-using Status = Google.Rpc.Status;
-using static EventStore.Client.Streams.BatchAppendReq.Types;
-using static EventStore.Client.Streams.BatchAppendReq.Types.Options;
-using OperationResult = EventStore.Core.Messages.OperationResult;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	partial class Streams<TStreamId> {
-		public override async Task BatchAppend(IAsyncStreamReader<BatchAppendReq> requestStream,
-			IServerStreamWriter<BatchAppendResp> responseStream, ServerCallContext context) {
-			var worker = new BatchAppendWorker(_publisher, _provider,
-				_batchAppendTracker,
-				requestStream, responseStream,
-				context.GetHttpContext().User, _maxAppendSize, _writeTimeout,
-				GetRequiresLeader(context.RequestHeaders));
-			try {
-				await worker.Work(context.CancellationToken);
-			} catch (IOException) {
-				// ignored
-			} catch (TaskCanceledException) {
-				//ignored
-			} catch (InvalidOperationException) {
-				//ignored
-			} catch (OperationCanceledException) {
-				//ignored
-			}
-		}
-
-		private class BatchAppendWorker {
-			private readonly IPublisher _publisher;
-			private readonly IAuthorizationProvider _authorizationProvider;
-			private readonly IDurationTracker _tracker;
-			private readonly IAsyncStreamReader<BatchAppendReq> _requestStream;
-			private readonly IServerStreamWriter<BatchAppendResp> _responseStream;
-			private readonly ClaimsPrincipal _user;
-			private readonly int _maxAppendSize;
-			private readonly TimeSpan _writeTimeout;
-			private readonly bool _requiresLeader;
-			private readonly Channel<BatchAppendResp> _channel;
-
-			private long _pending;
-
-			public BatchAppendWorker(IPublisher publisher, IAuthorizationProvider authorizationProvider,
-				IDurationTracker tracker,
-				IAsyncStreamReader<BatchAppendReq> requestStream, IServerStreamWriter<BatchAppendResp> responseStream,
-				ClaimsPrincipal user, int maxAppendSize, TimeSpan writeTimeout, bool requiresLeader) {
-				_publisher = publisher;
-				_authorizationProvider = authorizationProvider;
-				_tracker = tracker;
-				_requestStream = requestStream;
-				_responseStream = responseStream;
-				_user = user;
-				_maxAppendSize = maxAppendSize;
-				_writeTimeout = writeTimeout;
-				_requiresLeader = requiresLeader;
-				_channel = Channel.CreateUnbounded<BatchAppendResp>(new() {
-					AllowSynchronousContinuations = false,
-					SingleReader = false,
-					SingleWriter = false
-				});
-			}
-
-			public Task Work(CancellationToken cancellationToken) {
-				var remaining = 2;
-				var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
-
-#if DEBUG
-		var sendTask =
-#endif
-				Send(_channel.Reader, cancellationToken)
-					.ContinueWith(HandleCompletion, CancellationToken.None);
-#if DEBUG
-		var receiveTask =
-#endif
-				Receive(_channel.Writer, _user, _requiresLeader, cancellationToken)
-					.ContinueWith(HandleCompletion, CancellationToken.None);
-
-				return tcs.Task;
-
-				async void HandleCompletion(Task task) {
-					try {
-						await task;
-						if (Interlocked.Decrement(ref remaining) == 0) {
-							tcs.TrySetResult();
-						}
-					} catch (OperationCanceledException) {
-						tcs.TrySetCanceled(cancellationToken);
-					} catch (IOException ex) {
-						Log.Information("Closing gRPC client connection: {message}", ex.GetBaseException().Message);
-						tcs.TrySetException(ex);
-					}
-					catch (Exception ex) {
-						tcs.TrySetException(ex);
-					}
-				}
-			}
-
-			private async Task Send(ChannelReader<BatchAppendResp> reader, CancellationToken cancellationToken) {
-				var isClosing = false;
-				await foreach (var response in reader.ReadAllAsync(cancellationToken)) {
-					if (!response.IsClosing) {
-						await _responseStream.WriteAsync(response);
-						if (Interlocked.Decrement(ref _pending) >= 0 && isClosing) {
-							break;
-						}
-					} else {
-						isClosing = true;
-					}
-				}
-			}
-
-			private async Task Receive(ChannelWriter<BatchAppendResp> writer, ClaimsPrincipal user, bool requiresLeader,
-				CancellationToken cancellationToken) {
-				var pendingWrites = new ConcurrentDictionary<Guid, ClientWriteRequest>();
-
-				try {
-					await foreach (var request in _requestStream.ReadAllAsync(cancellationToken)) {
-						using var duration = _tracker.Start();
-						try {
-							var correlationId = Uuid.FromDto(request.CorrelationId).ToGuid();
-
-							if (request.Options != null) {
-								var timeout = Min(GetRequestedTimeout(request.Options), _writeTimeout);
-
-								if (!await _authorizationProvider.CheckAccessAsync(user, WriteOperation.WithParameter(
-									Plugins.Authorization.Operations.Streams.Parameters.StreamId(
-										request.Options.StreamIdentifier)), cancellationToken)) {
-									await writer.WriteAsync(new BatchAppendResp {
-										CorrelationId = request.CorrelationId,
-										StreamIdentifier = request.Options.StreamIdentifier,
-										Error = Status.AccessDenied
-									}, cancellationToken);
-									continue;
-								}
-
-								if (request.Options.StreamIdentifier == null) {
-									await writer.WriteAsync(new BatchAppendResp {
-										CorrelationId = request.CorrelationId,
-										StreamIdentifier = request.Options.StreamIdentifier,
-										Error = Status.BadRequest(
-											$"Required field {nameof(request.Options.StreamIdentifier)} not set.")
-									}, cancellationToken);
-									continue;
-								}
-
-								if (Max(timeout, TimeSpan.Zero) == TimeSpan.Zero) {
-									await writer.WriteAsync(new BatchAppendResp {
-										CorrelationId = request.CorrelationId,
-										StreamIdentifier = request.Options.StreamIdentifier,
-										Error = Status.Timeout
-									}, cancellationToken);
-									continue;
-								}
-
-								pendingWrites.AddOrUpdate(correlationId,
-									c => FromOptions(c, request.Options, timeout, cancellationToken),
-									(_, writeRequest) => writeRequest);
-							}
-
-							if (!pendingWrites.TryGetValue(correlationId, out var clientWriteRequest)) {
-								continue;
-							}
-
-							clientWriteRequest.AddEvents(request.ProposedMessages.Select(FromProposedMessage));
-
-							if (clientWriteRequest.Size > _maxAppendSize) {
-								pendingWrites.TryRemove(correlationId, out _);
-								await writer.WriteAsync(new BatchAppendResp {
-									CorrelationId = request.CorrelationId,
-									StreamIdentifier = clientWriteRequest.StreamId,
-									Error = Status.MaximumAppendSizeExceeded((uint)_maxAppendSize)
-								}, cancellationToken);
-							}
-
-							if (!request.IsFinal) {
-								continue;
-							}
-
-							if (!pendingWrites.TryRemove(correlationId, out _)) {
-								continue;
-							}
-
-							Interlocked.Increment(ref _pending);
-
-							_publisher.Publish(ToInternalMessage(clientWriteRequest, new CallbackEnvelope(message => {
-								try {
-									writer.TryWrite(ConvertMessage(message));
-								} catch (Exception ex) {
-									writer.TryComplete(ex);
-								}
-							}), requiresLeader, user, cancellationToken));
-
-							BatchAppendResp ConvertMessage(Message message) {
-								var batchAppendResp = message switch {
-									ClientMessage.NotHandled notHandled => new BatchAppendResp {
-										Error = new Status {
-											Details = Any.Pack(new Empty()),
-											Message = (notHandled.Reason, AdditionalInfo: notHandled.LeaderInfo) switch {
-												(ClientMessage.NotHandled.Types.NotHandledReason.NotReady, _) => "Server Is Not Ready",
-												(ClientMessage.NotHandled.Types.NotHandledReason.TooBusy, _) => "Server Is Busy",
-												(ClientMessage.NotHandled.Types.NotHandledReason.NotLeader or ClientMessage.NotHandled.Types.NotHandledReason.IsReadOnly,
-													ClientMessage.NotHandled.Types.LeaderInfo leaderInfo) =>
-													throw RpcExceptions.LeaderInfo(leaderInfo.Http.GetHost(),
-														leaderInfo.Http.GetPort()),
-												(ClientMessage.NotHandled.Types.NotHandledReason.NotLeader or ClientMessage.NotHandled.Types.NotHandledReason.IsReadOnly, _) =>
-													"No leader info available in response",
-												_ => $"Unknown {nameof(ClientMessage.NotHandled.Types.NotHandledReason)} ({(int)notHandled.Reason})"
-											}
-										}
-									},
-									ClientMessage.WriteEventsCompleted completed => completed.Result switch {
-										OperationResult.Success => new BatchAppendResp {
-											Success = BatchAppendResp.Types.Success.Completed(completed.CommitPosition,
-												completed.PreparePosition, completed.LastEventNumber),
-										},
-										OperationResult.WrongExpectedVersion => new BatchAppendResp {
-											Error = Status.WrongExpectedVersion(
-												StreamRevision.FromInt64(completed.CurrentVersion),
-												clientWriteRequest.ExpectedVersion)
-										},
-										OperationResult.AccessDenied => new BatchAppendResp
-											{ Error = Status.AccessDenied },
-										OperationResult.StreamDeleted => new BatchAppendResp {
-											Error = Status.StreamDeleted(clientWriteRequest.StreamId)
-										},
-										OperationResult.CommitTimeout or
-											OperationResult.ForwardTimeout or
-											OperationResult.PrepareTimeout => new BatchAppendResp
-												{ Error = Status.Timeout },
-										_ => new BatchAppendResp { Error = Status.Unknown }
-									},
-									_ => new BatchAppendResp {
-										Error = Status.InternalError(
-											$"Envelope callback expected either {nameof(ClientMessage.WriteEventsCompleted)} or {nameof(ClientMessage.NotHandled)}, received {message.GetType().Name} instead.")
-									}
-								};
-								batchAppendResp.CorrelationId = request.CorrelationId;
-								batchAppendResp.StreamIdentifier = new StreamIdentifier {
-									StreamName = ByteString.CopyFromUtf8(clientWriteRequest.StreamId)
-								};
-								return batchAppendResp;
-							}
-						} catch (Exception ex) {
-							duration.SetException(ex);
-							await writer.WriteAsync(new BatchAppendResp {
-								CorrelationId = request.CorrelationId,
-								StreamIdentifier = request.Options.StreamIdentifier,
-								Error = Status.BadRequest(ex.Message)
-							}, cancellationToken);
-						}
-					}
-
-					await writer.WriteAsync(new BatchAppendResp {
-						IsClosing = true
-					}, cancellationToken);
-				} catch (Exception ex) {
-					writer.TryComplete(ex);
-					throw;
-				}
-
-				ClientWriteRequest FromOptions(Guid correlationId, Options options, TimeSpan timeout,
-					CancellationToken cancellationToken) =>
-					new(correlationId, options.StreamIdentifier, options.ExpectedStreamPositionCase switch {
-						ExpectedStreamPositionOneofCase.StreamPosition => new StreamRevision(options.StreamPosition)
-							.ToInt64(),
-						ExpectedStreamPositionOneofCase.Any => AnyStreamRevision.Any.ToInt64(),
-						ExpectedStreamPositionOneofCase.StreamExists => AnyStreamRevision.StreamExists.ToInt64(),
-						ExpectedStreamPositionOneofCase.NoStream => AnyStreamRevision.NoStream.ToInt64(),
-						_ => throw RpcExceptions.InvalidArgument(options.ExpectedStreamPositionCase)
-					}, timeout, () =>
-						pendingWrites.TryRemove(correlationId, out var pendingWrite)
-							? writer.WriteAsync(new BatchAppendResp {
-								CorrelationId = Uuid.FromGuid(correlationId).ToDto(),
-								StreamIdentifier = new StreamIdentifier {
-									StreamName = ByteString.CopyFromUtf8(pendingWrite.StreamId)
-								},
-								Error = Status.Timeout
-							}, cancellationToken)
-							: new ValueTask(Task.CompletedTask), cancellationToken);
-
-				static Event FromProposedMessage(ProposedMessage proposedMessage) =>
-					new(Uuid.FromDto(proposedMessage.Id).ToGuid(),
-						proposedMessage.Metadata[Constants.Metadata.Type],
-						proposedMessage.Metadata[Constants.Metadata.ContentType] ==
-						Constants.Metadata.ContentTypes.ApplicationJson, proposedMessage.Data.ToByteArray(),
-						proposedMessage.CustomMetadata.ToByteArray());
-
-				static ClientMessage.WriteEvents ToInternalMessage(ClientWriteRequest request, IEnvelope envelope,
-					bool requiresLeader, ClaimsPrincipal user, CancellationToken token) =>
-					new(Guid.NewGuid(), request.CorrelationId, envelope, requiresLeader, request.StreamId,
-						request.ExpectedVersion, request.Events.ToArray(), user, cancellationToken: token);
-
-				static TimeSpan GetRequestedTimeout(Options options) => options.DeadlineOptionCase switch {
-					DeadlineOptionOneofCase.Deadline => options.Deadline.ToTimeSpan(),
-					_ => (options.Deadline21100?.ToDateTime() ?? DateTime.MaxValue) - DateTime.UtcNow,
-				};
-
-				static TimeSpan Min(TimeSpan a, TimeSpan b) => a > b ? b : a;
-				static TimeSpan Max(TimeSpan a, TimeSpan b) => a > b ? a : b;
-			}
-		}
-
-		private record ClientWriteRequest {
-			public Guid CorrelationId { get; }
-			public string StreamId { get; }
-			public long ExpectedVersion { get; }
-			private readonly List<Event> _events;
-			public IEnumerable<Event> Events => _events.AsEnumerable();
-			private int _size;
-			public int Size => _size;
-
-			public ClientWriteRequest(Guid correlationId, string streamId, long expectedVersion, TimeSpan timeout,
-				Func<ValueTask> onTimeout, CancellationToken cancellationToken) {
-				CorrelationId = correlationId;
-				StreamId = streamId;
-				_events = new List<Event>();
-				_size = 0;
-				ExpectedVersion = expectedVersion;
-
-				Task.Delay(timeout, cancellationToken).ContinueWith(_ => onTimeout(), cancellationToken);
-			}
-
-			public ClientWriteRequest AddEvents(IEnumerable<Event> events) {
-				foreach (var e in events) {
-					_size += Event.SizeOnDisk(e.EventType, e.Data, e.Metadata);
-					_events.Add(e);
-				}
-
-				return this;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Streams.Delete.cs b/src/EventStore.Core/Services/Transport/Grpc/Streams.Delete.cs
deleted file mode 100644
index b11cbec6089..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Streams.Delete.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-using System;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Client;
-using EventStore.Client.Streams;
-using EventStore.Core.Services.Transport.Common;
-using Grpc.Core;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class Streams<TStreamId> {
-		public override async Task<DeleteResp> Delete(DeleteReq request, ServerCallContext context) {
-			using var duration = _deleteTracker.Start();
-			try {
-				var options = request.Options;
-				var streamName = options.StreamIdentifier;
-				var expectedVersion = options.ExpectedStreamRevisionCase switch {
-					DeleteReq.Types.Options.ExpectedStreamRevisionOneofCase.Revision =>
-					new StreamRevision(options.Revision).ToInt64(),
-					DeleteReq.Types.Options.ExpectedStreamRevisionOneofCase.Any =>
-					AnyStreamRevision.Any.ToInt64(),
-					DeleteReq.Types.Options.ExpectedStreamRevisionOneofCase.NoStream =>
-					AnyStreamRevision.NoStream.ToInt64(),
-					DeleteReq.Types.Options.ExpectedStreamRevisionOneofCase.StreamExists =>
-					AnyStreamRevision.StreamExists.ToInt64(),
-					_ => throw RpcExceptions.InvalidArgument(options.ExpectedStreamRevisionCase)
-				};
-
-				var user = context.GetHttpContext().User;
-				var op = DeleteOperation.WithParameter(Plugins.Authorization.Operations.Streams.Parameters.StreamId(streamName));
-				if (!await _provider.CheckAccessAsync(user, op, context.CancellationToken)) {
-					throw RpcExceptions.AccessDenied();
-				}
-				var requiresLeader = GetRequiresLeader(context.RequestHeaders);
-
-				var position = await DeleteInternal(streamName, expectedVersion, user, false, requiresLeader,
-					context.CancellationToken);
-
-				return position.HasValue
-					? new DeleteResp {
-						Position = new DeleteResp.Types.Position {
-							CommitPosition = position.Value.CommitPosition,
-							PreparePosition = position.Value.PreparePosition
-						}
-					}
-					: new DeleteResp {
-						NoPosition = new Empty()
-					};
-			} catch (Exception ex) {
-				duration.SetException(ex);
-				throw;
-			}
-		}
-
-		public override async Task<TombstoneResp> Tombstone(TombstoneReq request, ServerCallContext context) {
-			using var duration = _tombstoneTracker.Start();
-			try {
-				var options = request.Options;
-				var streamName = options.StreamIdentifier;
-
-				var expectedVersion = options.ExpectedStreamRevisionCase switch {
-					TombstoneReq.Types.Options.ExpectedStreamRevisionOneofCase.Revision =>
-					new StreamRevision(options.Revision).ToInt64(),
-					TombstoneReq.Types.Options.ExpectedStreamRevisionOneofCase.Any =>
-					AnyStreamRevision.Any.ToInt64(),
-					TombstoneReq.Types.Options.ExpectedStreamRevisionOneofCase.NoStream =>
-					AnyStreamRevision.NoStream.ToInt64(),
-					TombstoneReq.Types.Options.ExpectedStreamRevisionOneofCase.StreamExists =>
-					AnyStreamRevision.StreamExists.ToInt64(),
-					_ => throw RpcExceptions.InvalidArgument(options.ExpectedStreamRevisionCase)
-				};
-
-				var requiresLeader = GetRequiresLeader(context.RequestHeaders);
-			
-				var user = context.GetHttpContext().User;
-				var op = DeleteOperation.WithParameter(Plugins.Authorization.Operations.Streams.Parameters.StreamId(streamName));
-				if (!await _provider.CheckAccessAsync(user, op, context.CancellationToken)) {
-					throw RpcExceptions.AccessDenied();
-				}
-
-				var position = await DeleteInternal(streamName, expectedVersion, user, true, requiresLeader,
-					context.CancellationToken);
-
-				return position.HasValue
-					? new TombstoneResp {
-						Position = new TombstoneResp.Types.Position {
-							CommitPosition = position.Value.CommitPosition,
-							PreparePosition = position.Value.PreparePosition
-						}
-					}
-					: new TombstoneResp {
-						NoPosition = new Empty()
-					};
-			} catch (Exception ex) {
-				duration.SetException(ex);
-				throw;
-			}
-		}
-
-		private async Task<Position?> DeleteInternal(string streamName, long expectedVersion,
-			ClaimsPrincipal user, bool hardDelete, bool requiresLeader, CancellationToken cancellationToken) {
-			var correlationId = Guid.NewGuid(); // TODO: JPB use request id?
-			var deleteResponseSource = new TaskCompletionSource<Position?>();
-
-			var envelope = new CallbackEnvelope(HandleStreamDeletedCompleted);
-
-			_publisher.Publish(new ClientMessage.DeleteStream(
-				correlationId,
-				correlationId,
-				envelope,
-				requiresLeader,
-				streamName,
-				expectedVersion,
-				hardDelete,
-				user,
-				cancellationToken: cancellationToken));
-
-			return await deleteResponseSource.Task;
-
-			void HandleStreamDeletedCompleted(Message message) {
-				if (message is ClientMessage.NotHandled notHandled &&
-				    RpcExceptions.TryHandleNotHandled(notHandled, out var ex)) {
-					deleteResponseSource.TrySetException(ex);
-					return;
-				}
-
-				if (message is not ClientMessage.DeleteStreamCompleted completed) {
-					deleteResponseSource.TrySetException(
-						RpcExceptions.UnknownMessage<ClientMessage.DeleteStreamCompleted>(message));
-					return;
-				}
-
-				switch (completed.Result) {
-					case OperationResult.Success:
-						deleteResponseSource.TrySetResult(completed.CommitPosition == -1
-							? default
-							: Position.FromInt64(completed.CommitPosition, completed.PreparePosition));
-
-						return;
-					case OperationResult.PrepareTimeout:
-					case OperationResult.CommitTimeout:
-					case OperationResult.ForwardTimeout:
-						deleteResponseSource.TrySetException(RpcExceptions.Timeout(completed.Message));
-						return;
-					case OperationResult.WrongExpectedVersion:
-						deleteResponseSource.TrySetException(RpcExceptions.WrongExpectedVersion("Delete",
-							streamName, expectedVersion, completed.CurrentVersion));
-						return;
-					case OperationResult.StreamDeleted:
-						deleteResponseSource.TrySetException(RpcExceptions.StreamDeleted(streamName));
-						return;
-					case OperationResult.InvalidTransaction:
-						deleteResponseSource.TrySetException(RpcExceptions.InvalidTransaction());
-						return;
-					case OperationResult.AccessDenied:
-						deleteResponseSource.TrySetException(RpcExceptions.AccessDenied());
-						return;
-					default:
-						deleteResponseSource.TrySetException(RpcExceptions.UnknownError(completed.Result));
-						return;
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Streams.Read.cs b/src/EventStore.Core/Services/Transport/Grpc/Streams.Read.cs
deleted file mode 100644
index 00f1e96ee9f..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Streams.Read.cs
+++ /dev/null
@@ -1,374 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Client;
-using EventStore.Client.Streams;
-using EventStore.Core.Data;
-using EventStore.Core.Metrics;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Core.Services.Transport.Enumerators;
-using Google.Protobuf;
-using Grpc.Core;
-using CountOptionOneofCase = EventStore.Client.Streams.ReadReq.Types.Options.CountOptionOneofCase;
-using FilterOptionOneofCase = EventStore.Client.Streams.ReadReq.Types.Options.FilterOptionOneofCase;
-using ReadDirection = EventStore.Client.Streams.ReadReq.Types.Options.Types.ReadDirection;
-using StreamOptionOneofCase = EventStore.Client.Streams.ReadReq.Types.Options.StreamOptionOneofCase;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class Streams<TStreamId> {
-		public override async Task Read(
-			ReadReq request,
-			IServerStreamWriter<ReadResp> responseStream,
-			ServerCallContext context) {
-
-			var trackDuration = request.Options.CountOptionCase != CountOptionOneofCase.Subscription;
-			using var duration = trackDuration ? _readTracker.Start() : Duration.Nil;
-			try {
-				var options = request.Options;
-				var countOptionsCase = options.CountOptionCase;
-				var streamOptionsCase = options.StreamOptionCase;
-				var readDirection = options.ReadDirection;
-				var filterOptionsCase = options.FilterOptionCase;
-				var compatibility = options.ControlOption?.Compatibility ?? 0;
-
-				var user = context.GetHttpContext().User;
-				var requiresLeader = GetRequiresLeader(context.RequestHeaders);
-
-				var uuidOption = options.UuidOption;
-				if (uuidOption == null) {
-					throw RpcExceptions.RequiredArgument(nameof(uuidOption), uuidOption);
-				}
-
-				var op = streamOptionsCase switch {
-					StreamOptionOneofCase.Stream => ReadOperation.WithParameter(
-						Plugins.Authorization.Operations.Streams.Parameters.StreamId(
-							request.Options.Stream.StreamIdentifier)),
-					StreamOptionOneofCase.All => ReadOperation.WithParameter(
-						Plugins.Authorization.Operations.Streams.Parameters.StreamId(SystemStreams.AllStream)),
-					_ => throw RpcExceptions.InvalidArgument(streamOptionsCase)
-				};
-
-				if (!await _provider.CheckAccessAsync(user, op, context.CancellationToken)) {
-					throw RpcExceptions.AccessDenied();
-				}
-
-				try {
-					var enumerator = CreateEnumerator(
-						request,
-						user,
-						requiresLeader,
-						compatibility,
-						streamOptionsCase,
-						countOptionsCase,
-						readDirection,
-						filterOptionsCase,
-						context.Deadline,
-						context.CancellationToken);
-
-					async void DisposeEnumerator() => await enumerator.DisposeAsync();
-
-					await using (enumerator) {
-						await using (context.CancellationToken.Register(DisposeEnumerator)) {
-							while (await enumerator.MoveNextAsync()) {
-								if (TryConvertReadResponse(enumerator.Current, uuidOption, out var readResponse))
-									await responseStream.WriteAsync(readResponse);
-							}
-						}
-					}
-				} catch (ReadResponseException ex) {
-					ConvertReadResponseException(ex);
-				} catch (IOException) {
-					// ignored
-				} catch (TaskCanceledException) {
-					//ignored
-				} catch (InvalidOperationException) {
-					//ignored
-				} catch (OperationCanceledException) {
-					//ignored
-				}
-			} catch (Exception ex) {
-				duration.SetException(ex);
-				throw;
-			}
-		}
-
-		private IAsyncEnumerator<ReadResponse> CreateEnumerator(
-			ReadReq request,
-			ClaimsPrincipal user,
-			bool requiresLeader,
-			uint compatibility,
-			StreamOptionOneofCase streamOptionsCase,
-			CountOptionOneofCase countOptionsCase,
-			ReadDirection readDirection,
-			FilterOptionOneofCase filterOptionsCase,
-			DateTime deadline,
-			CancellationToken cancellationToken) {
-			return (streamOptionsCase, countOptionsCase, readDirection, filterOptionsCase) switch {
-				(StreamOptionOneofCase.Stream,
-					CountOptionOneofCase.Count,
-					ReadDirection.Forwards,
-					FilterOptionOneofCase.NoFilter) => new Enumerator.ReadStreamForwards(
-						_publisher,
-						request.Options.Stream.StreamIdentifier,
-						request.Options.Stream.ToStreamRevision(),
-						request.Options.Count,
-						request.Options.ResolveLinks,
-						user,
-						requiresLeader,
-						deadline,
-						compatibility,
-						cancellationToken),
-				(StreamOptionOneofCase.Stream,
-					CountOptionOneofCase.Count,
-					ReadDirection.Backwards,
-					FilterOptionOneofCase.NoFilter) => new Enumerator.ReadStreamBackwards(
-						_publisher,
-						request.Options.Stream.StreamIdentifier,
-						request.Options.Stream.ToStreamRevision(),
-						request.Options.Count,
-						request.Options.ResolveLinks,
-						user,
-						requiresLeader,
-						deadline,
-						compatibility,
-						cancellationToken),
-				(StreamOptionOneofCase.All,
-					CountOptionOneofCase.Count,
-					ReadDirection.Forwards,
-					FilterOptionOneofCase.NoFilter) => new Enumerator.ReadAllForwards(
-						_publisher,
-						request.Options.All.ToPosition(),
-						request.Options.Count,
-						request.Options.ResolveLinks,
-						user,
-						requiresLeader,
-						deadline,
-						cancellationToken),
-				(StreamOptionOneofCase.All,
-					CountOptionOneofCase.Count,
-					ReadDirection.Forwards,
-					FilterOptionOneofCase.Filter) => new Enumerator.ReadAllForwardsFiltered(
-						_publisher,
-						request.Options.All.ToPosition(),
-						request.Options.Count,
-						request.Options.ResolveLinks,
-						ConvertToEventFilter(true, request.Options.Filter),
-						user,
-						requiresLeader,
-						request.Options.Filter.WindowCase switch {
-							ReadReq.Types.Options.Types.FilterOptions.WindowOneofCase.Count => null,
-							ReadReq.Types.Options.Types.FilterOptions.WindowOneofCase.Max => request.Options.Filter
-								.Max,
-							_ => throw RpcExceptions.InvalidArgument(request.Options.Filter.WindowCase)
-						},
-						deadline,
-						cancellationToken),
-				(StreamOptionOneofCase.All,
-					CountOptionOneofCase.Count,
-					ReadDirection.Backwards,
-					FilterOptionOneofCase.NoFilter) => new Enumerator.ReadAllBackwards(
-						_publisher,
-						request.Options.All.ToPosition(),
-						request.Options.Count,
-						request.Options.ResolveLinks,
-						user,
-						requiresLeader,
-						deadline,
-						cancellationToken),
-				(StreamOptionOneofCase.All,
-					CountOptionOneofCase.Count,
-					ReadDirection.Backwards,
-					FilterOptionOneofCase.Filter) => new Enumerator.ReadAllBackwardsFiltered(
-						_publisher,
-						request.Options.All.ToPosition(),
-						request.Options.Count,
-						request.Options.ResolveLinks,
-						ConvertToEventFilter(true, request.Options.Filter),
-						user,
-						requiresLeader,
-						request.Options.Filter.WindowCase switch {
-							ReadReq.Types.Options.Types.FilterOptions.WindowOneofCase.Count => null,
-							ReadReq.Types.Options.Types.FilterOptions.WindowOneofCase.Max => request.Options.Filter
-								.Max,
-							_ => throw RpcExceptions.InvalidArgument(request.Options.Filter.WindowCase)
-						},
-						deadline,
-						cancellationToken),
-				(StreamOptionOneofCase.Stream,
-					CountOptionOneofCase.Subscription,
-					ReadDirection.Forwards,
-					FilterOptionOneofCase.NoFilter) => new Enumerator.StreamSubscription<TStreamId>(
-						_publisher,
-						_expiryStrategy,
-						request.Options.Stream.StreamIdentifier,
-						request.Options.Stream.ToSubscriptionStreamRevision(),
-						request.Options.ResolveLinks,
-						user,
-						requiresLeader,
-						cancellationToken),
-				(StreamOptionOneofCase.All,
-					CountOptionOneofCase.Subscription,
-					ReadDirection.Forwards,
-					FilterOptionOneofCase.NoFilter) => new Enumerator.AllSubscription(
-						_publisher,
-						_expiryStrategy,
-						request.Options.All.ToSubscriptionPosition(),
-						request.Options.ResolveLinks,
-						user,
-						requiresLeader,
-						cancellationToken),
-				(StreamOptionOneofCase.All,
-					CountOptionOneofCase.Subscription,
-					ReadDirection.Forwards,
-					FilterOptionOneofCase.Filter) => new Enumerator.AllSubscriptionFiltered(
-						_publisher,
-						_expiryStrategy,
-						request.Options.All.ToSubscriptionPosition(),
-						request.Options.ResolveLinks,
-						ConvertToEventFilter(true, request.Options.Filter),
-						user,
-						requiresLeader,
-						request.Options.Filter.WindowCase switch {
-							ReadReq.Types.Options.Types.FilterOptions.WindowOneofCase.Count => null,
-							ReadReq.Types.Options.Types.FilterOptions.WindowOneofCase.Max => request.Options.Filter
-								.Max,
-							_ => throw RpcExceptions.InvalidArgument(request.Options.Filter.WindowCase)
-						},
-						request.Options.Filter.CheckpointIntervalMultiplier,
-						cancellationToken),
-				_ => throw RpcExceptions.InvalidCombination((streamOptionsCase, countOptionsCase, readDirection,
-					filterOptionsCase))
-			};
-		}
-
-		private static IEventFilter ConvertToEventFilter(bool isAllStream, ReadReq.Types.Options.Types.FilterOptions filter) =>
-			filter.FilterCase switch {
-				ReadReq.Types.Options.Types.FilterOptions.FilterOneofCase.EventType => (
-					string.IsNullOrEmpty(filter.EventType.Regex)
-						? EventFilter.EventType.Prefixes(isAllStream, filter.EventType.Prefix.ToArray())
-						: EventFilter.EventType.Regex(isAllStream, filter.EventType.Regex)),
-				ReadReq.Types.Options.Types.FilterOptions.FilterOneofCase.StreamIdentifier => (
-					string.IsNullOrEmpty(filter.StreamIdentifier.Regex)
-						? EventFilter.StreamName.Prefixes(isAllStream, filter.StreamIdentifier.Prefix.ToArray())
-						: EventFilter.StreamName.Regex(isAllStream, filter.StreamIdentifier.Regex)),
-				_ => throw RpcExceptions.InvalidArgument(filter)
-			};
-
-		private static bool TryConvertReadResponse(ReadResponse readResponse, ReadReq.Types.Options.Types.UUIDOption uuidOption, out ReadResp readResp) {
-			readResp = readResponse switch {
-				ReadResponse.EventReceived eventReceived => new ReadResp {
-					Event = ConvertToReadEvent(uuidOption, eventReceived.Event)
-				},
-				ReadResponse.SubscriptionConfirmed subscriptionConfirmed => new ReadResp {
-					Confirmation = new ReadResp.Types.SubscriptionConfirmation {
-						SubscriptionId = subscriptionConfirmed.SubscriptionId
-					}
-				},
-				ReadResponse.CheckpointReceived checkpointReceived => new ReadResp {
-					Checkpoint = new ReadResp.Types.Checkpoint {
-						CommitPosition = checkpointReceived.CommitPosition,
-						PreparePosition = checkpointReceived.PreparePosition
-					}
-				},
-				ReadResponse.StreamNotFound streamNotFound => new ReadResp {
-					StreamNotFound = new ReadResp.Types.StreamNotFound {
-						StreamIdentifier = streamNotFound.StreamName
-					}
-				},
-				ReadResponse.SubscriptionCaughtUp => new ReadResp {
-					CaughtUp = new ReadResp.Types.CaughtUp()
-				},
-				ReadResponse.SubscriptionFellBehind => null, // currently not sent to clients
-				ReadResponse.LastStreamPositionReceived lastStreamPositionReceived => new ReadResp {
-					LastStreamPosition = lastStreamPositionReceived.LastStreamPosition
-				},
-				ReadResponse.FirstStreamPositionReceived firstStreamPositionReceived => new ReadResp {
-					FirstStreamPosition = firstStreamPositionReceived.FirstStreamPosition
-				},
-				_ => throw new ArgumentException($"Unknown read response type: {readResponse.GetType().Name}", nameof(readResponse))
-			};
-
-			return readResp != null;
-		}
-
-		private static void ConvertReadResponseException(ReadResponseException readResponseEx) {
-			switch (readResponseEx) {
-				case ReadResponseException.NotHandled.ServerNotReady:
-					throw RpcExceptions.ServerNotReady();
-				case ReadResponseException.NotHandled.ServerBusy:
-					throw RpcExceptions.ServerBusy();
-				case ReadResponseException.NotHandled.LeaderInfo leaderInfo:
-					throw RpcExceptions.LeaderInfo(leaderInfo.Host, leaderInfo.Port);
-				case ReadResponseException.NotHandled.NoLeaderInfo:
-					throw RpcExceptions.NoLeaderInfo();
-				case ReadResponseException.StreamDeleted streamDeleted:
-					throw RpcExceptions.StreamDeleted(streamDeleted.StreamName);
-				case ReadResponseException.AccessDenied:
-					throw RpcExceptions.AccessDenied();
-				case ReadResponseException.Timeout timeout:
-					throw RpcExceptions.Timeout(timeout.ErrorMessage);
-				case ReadResponseException.InvalidPosition:
-					throw RpcExceptions.InvalidPositionException();
-				case ReadResponseException.UnknownMessage unknownMessage:
-					throw RpcExceptions.UnknownMessage(unknownMessage.UnknownMessageType, unknownMessage.ExpectedMessageType);
-				case ReadResponseException.UnknownError unknown:
-					throw RpcExceptions.UnknownError(unknown.ResultType, unknown.Result);
-				default:
-					throw new ArgumentException($"Unknown read response exception type: {readResponseEx.GetType().Name}", nameof(readResponseEx));
-			}
-		}
-
-		private static ReadResp.Types.ReadEvent.Types.RecordedEvent ConvertToRecordedEvent(
-			ReadReq.Types.Options.Types.UUIDOption uuidOption, EventRecord e, long? commitPosition,
-			long? preparePosition) {
-			if (e == null) return null;
-			var position = Position.FromInt64(commitPosition ?? -1, preparePosition ?? -1);
-			return new ReadResp.Types.ReadEvent.Types.RecordedEvent {
-				Id = uuidOption.ContentCase switch {
-					ReadReq.Types.Options.Types.UUIDOption.ContentOneofCase.String => new UUID {
-						String = e.EventId.ToString()
-					},
-					_ => Uuid.FromGuid(e.EventId).ToDto()
-				},
-				StreamIdentifier = e.EventStreamId,
-				StreamRevision = StreamRevision.FromInt64(e.EventNumber),
-				CommitPosition = position.CommitPosition,
-				PreparePosition = position.PreparePosition,
-				Metadata = {
-					[Constants.Metadata.Type] = e.EventType,
-					[Constants.Metadata.Created] = e.TimeStamp.ToTicksSinceEpoch().ToString(),
-					[Constants.Metadata.ContentType] = e.IsJson
-						? Constants.Metadata.ContentTypes.ApplicationJson
-						: Constants.Metadata.ContentTypes.ApplicationOctetStream
-				},
-				Data = ByteString.CopyFrom(e.Data.Span),
-				CustomMetadata = ByteString.CopyFrom(e.Metadata.Span)
-			};
-		}
-
-		private static ReadResp.Types.ReadEvent ConvertToReadEvent(ReadReq.Types.Options.Types.UUIDOption uuidOption,
-			ResolvedEvent e) {
-			var readEvent = new ReadResp.Types.ReadEvent {
-				Link = ConvertToRecordedEvent(uuidOption, e.Link, e.LinkPosition?.CommitPosition,
-					e.LinkPosition?.PreparePosition),
-				Event = ConvertToRecordedEvent(uuidOption, e.Event, e.EventPosition?.CommitPosition,
-					e.EventPosition?.PreparePosition),
-			};
-			if (e.OriginalPosition.HasValue) {
-				var position = Position.FromInt64(
-					e.OriginalPosition.Value.CommitPosition,
-					e.OriginalPosition.Value.PreparePosition);
-				readEvent.CommitPosition = position.CommitPosition;
-			} else {
-				readEvent.NoPosition = new Empty();
-			}
-
-			return readEvent;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Streams.cs b/src/EventStore.Core/Services/Transport/Grpc/Streams.cs
deleted file mode 100644
index de57d26eadd..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Streams.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using EventStore.Common.Configuration;
-using EventStore.Core.Bus;
-using EventStore.Core.Metrics;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Plugins.Authorization;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class Streams<TStreamId> : EventStore.Client.Streams.Streams.StreamsBase {
-		private readonly IPublisher _publisher;
-		private readonly int _maxAppendSize;
-		private readonly TimeSpan _writeTimeout;
-		private readonly IExpiryStrategy _expiryStrategy;
-		private readonly IDurationTracker _readTracker;
-		private readonly IDurationTracker _appendTracker;
-		private readonly IDurationTracker _batchAppendTracker;
-		private readonly IDurationTracker _deleteTracker;
-		private readonly IDurationTracker _tombstoneTracker;
-		private readonly IAuthorizationProvider _provider;
-		private static readonly Operation ReadOperation = new Operation(Plugins.Authorization.Operations.Streams.Read);
-		private static readonly Operation WriteOperation = new Operation(Plugins.Authorization.Operations.Streams.Write);
-		private static readonly Operation DeleteOperation = new Operation(Plugins.Authorization.Operations.Streams.Delete);
-
-		public Streams(IPublisher publisher, int maxAppendSize, TimeSpan writeTimeout,
-			IExpiryStrategy expiryStrategy,
-			GrpcTrackers trackers,
-			IAuthorizationProvider provider) {
-	
-			if (publisher == null) throw new ArgumentNullException(nameof(publisher));
-			_publisher = publisher;
-			_maxAppendSize = maxAppendSize;
-			_writeTimeout = writeTimeout;
-			_expiryStrategy = expiryStrategy;
-			_readTracker = trackers[MetricsConfiguration.GrpcMethod.StreamRead];
-			_appendTracker = trackers[MetricsConfiguration.GrpcMethod.StreamAppend];
-			_batchAppendTracker = trackers[MetricsConfiguration.GrpcMethod.StreamBatchAppend];
-			_deleteTracker = trackers[MetricsConfiguration.GrpcMethod.StreamDelete];
-			_tombstoneTracker = trackers[MetricsConfiguration.GrpcMethod.StreamTombstone];
-			_provider = provider;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Users.ChangePassword.cs b/src/EventStore.Core/Services/Transport/Grpc/Users.ChangePassword.cs
deleted file mode 100644
index f4ba1459bb0..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Users.ChangePassword.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Client.Users;
-using EventStore.Plugins.Authorization;
-using Grpc.Core;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class Users {
-		private static readonly Operation ChangePasswordOperation = new Operation(Plugins.Authorization.Operations.Users.ChangePassword);
-		public override async Task<ChangePasswordResp> ChangePassword(ChangePasswordReq request,
-			ServerCallContext context) {
-			var options = request.Options;
-
-			var user = context.GetHttpContext().User;
-			var changePasswordOperation = ChangePasswordOperation;
-			if (user?.Identity?.Name != null) {
-				changePasswordOperation =
-					changePasswordOperation.WithParameter(
-						Plugins.Authorization.Operations.Users.Parameters.User(user.Identity.Name));
-			}
-			if (!await _authorizationProvider.CheckAccessAsync(user, changePasswordOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			var changePasswordSource = new TaskCompletionSource<bool>();
-
-			var envelope = new CallbackEnvelope(OnMessage);
-
-			_publisher.Publish(new UserManagementMessage.ChangePassword(envelope, user, options.LoginName,
-				options.CurrentPassword,
-				options.NewPassword));
-
-			await changePasswordSource.Task;
-
-			return new ChangePasswordResp();
-
-			void OnMessage(Message message) {
-				if (HandleErrors(options.LoginName, message, changePasswordSource)) return;
-
-				changePasswordSource.TrySetResult(true);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Users.Create.cs b/src/EventStore.Core/Services/Transport/Grpc/Users.Create.cs
deleted file mode 100644
index d103f84cab4..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Users.Create.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Client.Users;
-using EventStore.Plugins.Authorization;
-using Grpc.Core;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class Users {
-		private static readonly Operation CreateOperation = new Operation(Plugins.Authorization.Operations.Users.Create);
-		public override async Task<CreateResp> Create(CreateReq request, ServerCallContext context) {
-			var options = request.Options;
-
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, CreateOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			var createSource = new TaskCompletionSource<bool>();
-
-			var envelope = new CallbackEnvelope(OnMessage);
-
-			_publisher.Publish(new UserManagementMessage.Create(envelope, user, options.LoginName, options.FullName,
-				options.Groups.ToArray(),
-				options.Password));
-
-			await createSource.Task;
-
-			return new CreateResp();
-
-			void OnMessage(Message message) {
-				if (HandleErrors(options.LoginName, message, createSource)) return;
-
-				createSource.TrySetResult(true);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Users.Delete.cs b/src/EventStore.Core/Services/Transport/Grpc/Users.Delete.cs
deleted file mode 100644
index 997b709248d..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Users.Delete.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Client.Users;
-using EventStore.Plugins.Authorization;
-using Grpc.Core;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class Users {
-		private static readonly Operation DeleteOperation = new Operation(Plugins.Authorization.Operations.Users.Delete);
-		public override async Task<DeleteResp> Delete(DeleteReq request, ServerCallContext context) {
-			var options = request.Options;
-
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, DeleteOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			var deleteSource = new TaskCompletionSource<bool>();
-
-			var envelope = new CallbackEnvelope(OnMessage);
-
-			_publisher.Publish(new UserManagementMessage.Delete(envelope, user, options.LoginName));
-
-			await deleteSource.Task;
-
-			return new DeleteResp();
-
-			void OnMessage(Message message) {
-				if (HandleErrors(options.LoginName, message, deleteSource)) return;
-
-				deleteSource.TrySetResult(true);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Users.Details.cs b/src/EventStore.Core/Services/Transport/Grpc/Users.Details.cs
deleted file mode 100644
index d4dc7a883d0..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Users.Details.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Client;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Client.Users;
-using EventStore.Plugins.Authorization;
-using Grpc.Core;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class Users {
-		private static readonly Operation ReadOperation = new Operation(Plugins.Authorization.Operations.Users.Read);
-		public override async Task Details(DetailsReq request, IServerStreamWriter<DetailsResp> responseStream,
-			ServerCallContext context) {
-			var options = request.Options;
-
-			var user = context.GetHttpContext().User;
-			var readOperation = ReadOperation;
-			if (user?.Identity?.Name != null) {
-				readOperation =
-					readOperation.WithParameter(
-						Plugins.Authorization.Operations.Users.Parameters.User(user.Identity.Name));
-			}
-			if (!await _authorizationProvider.CheckAccessAsync(user, readOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			var detailsSource = new TaskCompletionSource<UserManagementMessage.UserData[]>();
-
-			var envelope = new CallbackEnvelope(OnMessage);
-
-			_publisher.Publish(string.IsNullOrWhiteSpace(options?.LoginName)
-				? (Message)new UserManagementMessage.GetAll(envelope, user)
-				: new UserManagementMessage.Get(envelope, user, options.LoginName));
-
-			var details = await detailsSource.Task;
-
-			foreach (var detail in details) {
-				await responseStream.WriteAsync(new DetailsResp {
-					UserDetails = new DetailsResp.Types.UserDetails {
-						Disabled = detail.Disabled,
-						Groups = {detail.Groups},
-						FullName = detail.FullName,
-						LoginName = detail.LoginName,
-						LastUpdated = detail.DateLastUpdated.HasValue
-							? new DetailsResp.Types.UserDetails.Types.DateTime
-								{TicksSinceEpoch = detail.DateLastUpdated.Value.UtcDateTime.ToTicksSinceEpoch()}
-							: null
-					}
-				});
-			}
-
-			void OnMessage(Message message) {
-				if (HandleErrors(options?.LoginName, message, detailsSource)) return;
-
-				switch (message) {
-					case UserManagementMessage.UserDetailsResult userDetails:
-						detailsSource.TrySetResult(new[] {userDetails.Data});
-						break;
-					case UserManagementMessage.AllUserDetailsResult allUserDetails:
-						detailsSource.TrySetResult(allUserDetails.Data);
-						break;
-					default:
-						detailsSource.TrySetException(RpcExceptions.UnknownError(1));
-						break;
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Users.Disable.cs b/src/EventStore.Core/Services/Transport/Grpc/Users.Disable.cs
deleted file mode 100644
index 3969cf254fc..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Users.Disable.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Client.Users;
-using EventStore.Plugins.Authorization;
-using Grpc.Core;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class Users {
-		private static readonly Operation DisableOperation = new Operation(Plugins.Authorization.Operations.Users.Disable);
-		public override async Task<DisableResp> Disable(DisableReq request, ServerCallContext context) {
-			var options = request.Options;
-
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, DisableOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			var disableSource = new TaskCompletionSource<bool>();
-
-			var envelope = new CallbackEnvelope(OnMessage);
-
-			_publisher.Publish(new UserManagementMessage.Disable(envelope, user, options.LoginName));
-
-			await disableSource.Task;
-
-			return new DisableResp();
-
-			void OnMessage(Message message) {
-				if (HandleErrors(options.LoginName, message, disableSource)) return;
-
-				disableSource.TrySetResult(true);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Users.Enable.cs b/src/EventStore.Core/Services/Transport/Grpc/Users.Enable.cs
deleted file mode 100644
index e16212d5906..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Users.Enable.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Client.Users;
-using EventStore.Plugins.Authorization;
-using Grpc.Core;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class Users {
-		private static readonly Operation EnableOperation = new Operation(Plugins.Authorization.Operations.Users.Enable);
-		public override async Task<EnableResp> Enable(EnableReq request, ServerCallContext context) {
-			var options = request.Options;
-
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, EnableOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			var enableSource = new TaskCompletionSource<bool>();
-
-			var envelope = new CallbackEnvelope(OnMessage);
-
-			_publisher.Publish(new UserManagementMessage.Enable(envelope, user, options.LoginName));
-
-			await enableSource.Task;
-
-			return new EnableResp();
-
-			void OnMessage(Message message) {
-				if (HandleErrors(options.LoginName, message, enableSource)) return;
-
-				enableSource.TrySetResult(true);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Users.ResetPassword.cs b/src/EventStore.Core/Services/Transport/Grpc/Users.ResetPassword.cs
deleted file mode 100644
index bb0bb756ce2..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Users.ResetPassword.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Client.Users;
-using EventStore.Plugins.Authorization;
-using Grpc.Core;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class Users {
-		private static readonly Operation ResetOperation = new Operation(Plugins.Authorization.Operations.Users.ResetPassword);
-		public override async Task<ResetPasswordResp> ResetPassword(ResetPasswordReq request,
-			ServerCallContext context) {
-			var options = request.Options;
-
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, ResetOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			var resetPasswordSource = new TaskCompletionSource<bool>();
-
-			var envelope = new CallbackEnvelope(OnMessage);
-
-			_publisher.Publish(
-				new UserManagementMessage.ResetPassword(envelope, user, options.LoginName, options.NewPassword));
-
-			await resetPasswordSource.Task;
-
-			return new ResetPasswordResp();
-
-			void OnMessage(Message message) {
-				if (HandleErrors(options.LoginName, message, resetPasswordSource)) return;
-
-				resetPasswordSource.TrySetResult(true);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Users.Update.cs b/src/EventStore.Core/Services/Transport/Grpc/Users.Update.cs
deleted file mode 100644
index 66bb612cdef..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Users.Update.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Client.Users;
-using EventStore.Plugins.Authorization;
-using Grpc.Core;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class Users {
-		private static readonly Operation UpdateOperation = new Operation(Plugins.Authorization.Operations.Users.Update);
-		
-		public override async Task<UpdateResp> Update(UpdateReq request, ServerCallContext context) {
-			var options = request.Options;
-
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, UpdateOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			var updateSource = new TaskCompletionSource<bool>();
-
-			var envelope = new CallbackEnvelope(OnMessage);
-
-			_publisher.Publish(new UserManagementMessage.Update(envelope, user, options.LoginName, options.FullName,
-				options.Groups.ToArray()));
-
-			await updateSource.Task;
-
-			return new UpdateResp();
-
-			void OnMessage(Message message) {
-				if (HandleErrors(options.LoginName, message, updateSource)) return;
-
-				updateSource.TrySetResult(true);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Users.cs b/src/EventStore.Core/Services/Transport/Grpc/Users.cs
deleted file mode 100644
index ee0372b722e..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Users.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Plugins.Authorization;
-using static EventStore.Core.Messages.UserManagementMessage;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	internal partial class Users : EventStore.Client.Users.Users.UsersBase {
-		private readonly IPublisher _publisher;
-		private IAuthorizationProvider _authorizationProvider;
-
-		public Users(IPublisher publisher, IAuthorizationProvider authorizationProvider) {
-			if (publisher == null) throw new ArgumentNullException(nameof(publisher));
-			if (authorizationProvider == null) throw new ArgumentNullException(nameof(authorizationProvider));
-			_publisher = publisher;
-			_authorizationProvider = authorizationProvider;
-		}
-
-		private static bool HandleErrors<T>(string loginName, Message message, TaskCompletionSource<T> source) {
-			if (!(message is ResponseMessage response)) {
-				source.TrySetException(
-					RpcExceptions.UnknownMessage<ResponseMessage>(message));
-				return true;
-			}
-
-			if (response.Success) return false;
-			source.TrySetException(response.Error switch {
-				Error.Unauthorized => RpcExceptions.AccessDenied(),
-				Error.NotFound => RpcExceptions.LoginNotFound(loginName),
-				Error.Conflict => RpcExceptions.LoginConflict(loginName),
-				Error.TryAgain => RpcExceptions.LoginTryAgain(loginName),
-				_ => RpcExceptions.UnknownError(response.Error)
-			});
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/Uuid.cs b/src/EventStore.Core/Services/Transport/Grpc/Uuid.cs
deleted file mode 100644
index 06d24cdd0a7..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/Uuid.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-using HashCode = EventStore.Core.Services.Transport.Common.HashCode;
-
-namespace EventStore.Core.Services.Transport.Grpc {
-	public struct Uuid : IEquatable<Uuid> {
-		public static readonly Uuid Empty = new Uuid(Guid.Empty);
-
-		private readonly long _lsb;
-		private readonly long _msb;
-
-		public static Uuid NewUuid() => new Uuid(Guid.NewGuid());
-		public static Uuid FromGuid(Guid value) => new Uuid(value);
-		public static Uuid Parse(string value) => new Uuid(value);
-		public static Uuid FromInt64(long msb, long lsb) => new Uuid(msb, lsb);
-
-		public static Uuid FromDto(Client.UUID dto) {
-			if (dto == null) throw new ArgumentNullException(nameof(dto));
-			return dto.ValueCase switch {
-				Client.UUID.ValueOneofCase.String => new Uuid(dto.String),
-				Client.UUID.ValueOneofCase.Structured => new Uuid(dto.Structured.MostSignificantBits,
-					dto.Structured.LeastSignificantBits),
-				_ => throw new ArgumentException($"Invalid argument: {dto.ValueCase}", nameof(dto))
-			};
-		}
-		private Uuid(Guid value) {
-			if (!BitConverter.IsLittleEndian) {
-				throw new NotSupportedException();
-			}
-
-			Span<byte> data = stackalloc byte[16];
-
-			if (!value.TryWriteBytes(data)) {
-				throw new InvalidOperationException();
-			}
-
-			data.Slice(0, 8).Reverse();
-			data.Slice(0, 2).Reverse();
-			data.Slice(2, 2).Reverse();
-			data.Slice(4, 4).Reverse();
-			data.Slice(8).Reverse();
-
-			_msb = BitConverter.ToInt64(data);
-			_lsb = BitConverter.ToInt64(data.Slice(8));
-		}
-
-		private Uuid(string value) : this(value != null
-			? Guid.Parse(value)
-			: throw new ArgumentNullException(nameof(value))) {
-		}
-
-		private Uuid(long msb, long lsb) {
-			_msb = msb;
-			_lsb = lsb;
-		}
-
-		public readonly Client.UUID ToDto() => new() {
-			Structured = new () {
-				LeastSignificantBits = _lsb,
-				MostSignificantBits = _msb
-			}
-		};
-
-		public bool Equals(Uuid other) => _lsb == other._lsb && _msb == other._msb;
-		public override bool Equals(object obj) => obj is Uuid other && Equals(other);
-		public override int GetHashCode() => HashCode.Hash.Combine(_lsb).Combine(_msb);
-		public static bool operator ==(Uuid left, Uuid right) => left.Equals(right);
-		public static bool operator !=(Uuid left, Uuid right) => !left.Equals(right);
-		public override string ToString() => ToGuid().ToString();
-		public string ToString(string format) => ToGuid().ToString(format);
-
-		public readonly Guid ToGuid() {
-			if (!BitConverter.IsLittleEndian) {
-				throw new NotSupportedException();
-			}
-
-			Span<byte> data = stackalloc byte[16];
-			if (!BitConverter.TryWriteBytes(data, _msb) ||
-			    !BitConverter.TryWriteBytes(data.Slice(8), _lsb)) {
-				throw new InvalidOperationException();
-			}
-
-			data.Slice(0, 8).Reverse();
-			data.Slice(0, 4).Reverse();
-			data.Slice(4, 2).Reverse();
-			data.Slice(6, 2).Reverse();
-			data.Slice(8).Reverse();
-
-			return new Guid(data);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Grpc/WrongExpectedVersion.cs b/src/EventStore.Core/Services/Transport/Grpc/WrongExpectedVersion.cs
deleted file mode 100644
index 744fd75acdb..00000000000
--- a/src/EventStore.Core/Services/Transport/Grpc/WrongExpectedVersion.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Core.Services.Transport.Grpc;
-using static EventStore.Core.Data.ExpectedVersion;
-
-// ReSharper disable once CheckNamespace
-namespace EventStore.Client {
-	partial class WrongExpectedVersion {
-		public static WrongExpectedVersion Create(StreamRevision currentStreamRevision,
-			long expectedStreamPosition) => new() {
-			currentStreamRevisionOption_ = currentStreamRevision == StreamRevision.End
-				? new Google.Protobuf.WellKnownTypes.Empty()
-				: currentStreamRevision.ToUInt64(),
-			currentStreamRevisionOptionCase_ = currentStreamRevision == StreamRevision.End
-				? CurrentStreamRevisionOptionOneofCase.CurrentNoStream
-				: CurrentStreamRevisionOptionOneofCase.CurrentStreamRevision,
-			expectedStreamPositionOption_ = expectedStreamPosition switch {
-				Any or NoStream or StreamExists =>
-					new Google.Protobuf.WellKnownTypes.Empty(),
-				_ => StreamRevision.FromInt64(expectedStreamPosition).ToUInt64()
-			},
-			expectedStreamPositionOptionCase_ = expectedStreamPosition switch {
-				Any => ExpectedStreamPositionOptionOneofCase.ExpectedAny,
-				NoStream => ExpectedStreamPositionOptionOneofCase.ExpectedNoStream,
-				StreamExists => ExpectedStreamPositionOptionOneofCase.ExpectedStreamExists,
-				_ => ExpectedStreamPositionOptionOneofCase.ExpectedStreamPosition
-			}
-		};
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/AuthenticatedHttpRequestProcessor.cs b/src/EventStore.Core/Services/Transport/Http/AuthenticatedHttpRequestProcessor.cs
deleted file mode 100644
index fd6afbfd845..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/AuthenticatedHttpRequestProcessor.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.DataStructures;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Transport.Http.Messages;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Codecs;
-using EventStore.Transport.Http.EntityManagement;
-using HttpStatusCode = EventStore.Transport.Http.HttpStatusCode;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Transport.Http {
-	internal class AuthenticatedHttpRequestProcessor : IHandle<HttpMessage.PurgeTimedOutRequests>,
-		IHandle<AuthenticatedHttpRequestMessage> {
-		private static readonly ILogger Log = Serilog.Log.ForContext<AuthenticatedHttpRequestProcessor>();
-
-		private readonly PairingHeap<Tuple<DateTime, HttpEntityManager>> _pending =
-			new PairingHeap<Tuple<DateTime, HttpEntityManager>>((x, y) => x.Item1 < y.Item1);
-
-		public void Handle(HttpMessage.PurgeTimedOutRequests message) {
-			PurgeTimedOutRequests();
-		}
-
-		private void PurgeTimedOutRequests() {
-			try {
-				while (_pending.Count > 0) {
-					var req = _pending.FindMin();
-					if (req.Item1 <= DateTime.UtcNow || req.Item2.IsProcessing) {
-						req = _pending.DeleteMin();
-						req.Item2.ReplyStatus(HttpStatusCode.RequestTimeout,
-							"Server was unable to handle request in time",
-							e => Log.Debug(
-								"Error occurred while closing timed out connection (HTTP service core): {e}.",
-								e.Message));
-					} else
-						break;
-				}
-			} catch (Exception exc) {
-				Log.Error(exc, "Error purging timed out requests in HTTP request processor.");
-			}
-		}
-
-		public void Handle(AuthenticatedHttpRequestMessage message) {
-			var manager = message.Manager;
-			var match = message.Match;
-			try {
-				var reqParams = match.RequestHandler(manager, match.TemplateMatch);
-				if (!reqParams.IsDone)
-					_pending.Add(Tuple.Create(DateTime.UtcNow + reqParams.Timeout, manager));
-			} catch (Exception exc) {
-				Log.Error(exc, "Error while handling HTTP request '{url}'.", manager.HttpEntity.Request.Url);
-				InternalServerError(manager);
-			}
-
-			PurgeTimedOutRequests();
-		}
-	
-		private void InternalServerError(HttpEntityManager entity) {
-			entity.ReplyStatus(HttpStatusCode.InternalServerError, "Internal Server Error",
-				e => Log.Debug("Error while closing HTTP connection (HTTP service core): {e}.", e.Message));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Authentication/AnonymousHttpAuthenticationProvider.cs b/src/EventStore.Core/Services/Transport/Http/Authentication/AnonymousHttpAuthenticationProvider.cs
deleted file mode 100644
index 55765b38ff8..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Authentication/AnonymousHttpAuthenticationProvider.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using EventStore.Core.Services.UserManagement;
-using EventStore.Plugins.Authentication;
-using Microsoft.AspNetCore.Http;
-
-namespace EventStore.Core.Services.Transport.Http.Authentication {
-	public class AnonymousHttpAuthenticationProvider : IHttpAuthenticationProvider {
-		public string Name => "anonymous";
-
-		public bool Authenticate(HttpContext context, out HttpAuthenticationRequest request) {
-			request = new HttpAuthenticationRequest(context, null, null);
-			request.Authenticated(SystemAccounts.Anonymous);
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Authentication/BasicHttpAuthenticationProvider.cs b/src/EventStore.Core/Services/Transport/Http/Authentication/BasicHttpAuthenticationProvider.cs
deleted file mode 100644
index b26e1160c0f..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Authentication/BasicHttpAuthenticationProvider.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.Net.Http.Headers;
-using System.Text;
-using EventStore.Plugins.Authentication;
-using Microsoft.AspNetCore.Http;
-
-namespace EventStore.Core.Services.Transport.Http.Authentication {
-	public class BasicHttpAuthenticationProvider : IHttpAuthenticationProvider {
-		private readonly IAuthenticationProvider _internalAuthenticationProvider;
-
-		public string Name => "basic";
-
-		public BasicHttpAuthenticationProvider(IAuthenticationProvider internalAuthenticationProvider) {
-			_internalAuthenticationProvider = internalAuthenticationProvider;
-		}
-
-		public bool Authenticate(HttpContext context, out HttpAuthenticationRequest request) {
-			if (context.Request.Headers.TryGetValue("authorization", out var values) && values.Count == 1 && 
-			    AuthenticationHeaderValue.TryParse(values[0], out var authenticationHeader) && authenticationHeader.Scheme == "Basic" && 
-			    TryDecodeCredential(authenticationHeader.Parameter, out var username, out var password)) {
-				request = new HttpAuthenticationRequest(context, username, password);
-				_internalAuthenticationProvider.Authenticate(request);
-				return true;
-			}
-
-			request = null;
-			return false;
-		}
-
-		private static bool TryDecodeCredential(string value, out string username, out string password) {
-			username = password = default;
-
-			var parts = Encoding.UTF8.GetString(System.Convert.FromBase64String(value)).Split(':', 2);
-			if (parts.Length < 2) {
-				return false;
-			}
-
-			username = parts[0];
-			password = parts[1];
-
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Authentication/BearerHttpAuthenticationProvider.cs b/src/EventStore.Core/Services/Transport/Http/Authentication/BearerHttpAuthenticationProvider.cs
deleted file mode 100644
index b9ee87699cc..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Authentication/BearerHttpAuthenticationProvider.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Net.Http.Headers;
-using EventStore.Plugins.Authentication;
-using Microsoft.AspNetCore.Http;
-
-namespace EventStore.Core.Services.Transport.Http.Authentication {
-	public class BearerHttpAuthenticationProvider : IHttpAuthenticationProvider {
-		private readonly IAuthenticationProvider _internalAuthenticationProvider;
-
-		public string Name => "bearer";
-
-		public BearerHttpAuthenticationProvider(IAuthenticationProvider internalAuthenticationProvider) {
-			_internalAuthenticationProvider = internalAuthenticationProvider;
-		}
-
-		public bool Authenticate(HttpContext context, out HttpAuthenticationRequest request) {
-			if (!context.Request.Headers.TryGetValue("authorization", out var values) || values.Count != 1 ||
-			    !AuthenticationHeaderValue.TryParse(
-				    values[0], out var authenticationHeader) || authenticationHeader.Scheme != "Bearer") {
-				request = null;
-				return false;
-			}
-
-			request = new HttpAuthenticationRequest(context, authenticationHeader.Parameter);
-			_internalAuthenticationProvider.Authenticate(request);
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Authentication/NodeCertificateAuthenticationProvider.cs b/src/EventStore.Core/Services/Transport/Http/Authentication/NodeCertificateAuthenticationProvider.cs
deleted file mode 100644
index 1aa4fe57e52..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Authentication/NodeCertificateAuthenticationProvider.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
-using EventStore.Common.Utils;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Plugins.Authentication;
-using Microsoft.AspNetCore.Connections.Features;
-using Microsoft.AspNetCore.Http;
-using Serilog;
-
-namespace EventStore.Core.Services.Transport.Http.Authentication {
-	public class NodeCertificateAuthenticationProvider : IHttpAuthenticationProvider {
-		private readonly Func<string> _getCertificateReservedNodeCommonName;
-
-		public string Name => "node-certificate";
-
-		public NodeCertificateAuthenticationProvider(Func<string> getCertificateReservedNodeCommonName) {
-			_getCertificateReservedNodeCommonName = getCertificateReservedNodeCommonName;
-		}
-
-		public bool Authenticate(HttpContext context, out HttpAuthenticationRequest request) {
-			return AuthenticateCached(context, out request);
-		}
-
-		private bool AuthenticateCached(HttpContext context, out HttpAuthenticationRequest request) {
-			// we cache the authentication result as the same TLS connection may be used for multiple HTTP requests.
-			// performance aside, the cache also ensures that authentication requests that were successful in the past
-			// will succeed in the future for the same TLS connection even if certificates are rotated.
-
-			request = null;
-
-			// if the connection doesn't have a client certificate, take a shortcut
-			var clientCertificate = context.Connection.ClientCertificate;
-			if (clientCertificate is null)
-				return false;
-
-			bool authenticated;
-
-			var connectionItems = context.Features.Get<IConnectionItemsFeature>()?.Items;
-			const string connectionItemsKey = "NodeCertificateAuthenticationStatus";
-			if (TryGetDictionaryValue(connectionItems, connectionItemsKey, out var wasAuthenticated)) {
-				authenticated = (bool) wasAuthenticated;
-			} else {
-				authenticated = AuthenticateUncached(context, clientCertificate);
-				TrySetDictionaryValue(connectionItems, connectionItemsKey, authenticated);
-			}
-
-			if (!authenticated)
-				return false;
-
-			request = new HttpAuthenticationRequest(context, "system", "");
-			request.Authenticated(SystemAccounts.System);
-
-			return true;
-		}
-
-		private static bool TryGetDictionaryValue(IDictionary<object, object> dictionary, string key, out object value) {
-			if (dictionary == null) {
-				value = null;
-				return false;
-			}
-
-			lock (dictionary) {
-				return dictionary.TryGetValue(key, out value);
-			}
-		}
-
-		private static bool TrySetDictionaryValue(IDictionary<object, object> dictionary, string key, object value) {
-			if (dictionary == null)
-				return false;
-
-			lock (dictionary) {
-				return dictionary.TryAdd(key, value);
-			}
-		}
-
-		private bool AuthenticateUncached(HttpContext context, X509Certificate2 clientCertificate) {
-			var ip = context.Connection.RemoteIpAddress?.ToString() ?? "<unknown>";
-			var isServerCertificate = clientCertificate.IsServerCertificate(out var serverCertReason);
-
-			var reservedNodeCN = _getCertificateReservedNodeCommonName();
-			bool hasReservedNodeCN;
-			try {
-				hasReservedNodeCN = clientCertificate.ClientCertificateMatchesName(reservedNodeCN);
-			} catch (CryptographicException) {
-				return false;
-			} catch (NullReferenceException) {
-				return false;
-			}
-
-			bool hasIpOrDnsSan = clientCertificate.GetSubjectAlternativeNames()
-				.Where(x => x.type is CertificateNameType.DnsName or CertificateNameType.IpAddress)
-				.IsNotEmpty();
-
-			if (!isServerCertificate && !hasReservedNodeCN && !hasIpOrDnsSan) {
-				// We are sure that this is not a misconfigured node certificate with incorrect EKUs, missing SANs, etc. It could be a user certificate.
-				return false;
-			}
-			if (!hasReservedNodeCN) {
-				var clientCertificateCN = clientCertificate.GetCommonName();
-				Log.Error(
-					"Connection from node: {ip} was denied because its CN: {clientCertificateCN} does not match with the reserved node CN: {reservedNodeCN}",
-					ip, clientCertificateCN, reservedNodeCN);
-			}
-			if (!hasIpOrDnsSan) {
-				Log.Error("Connection from node: {ip} was denied because its certificate does not have any IP or DNS Subject Alternative Names (SAN).", ip);
-			}
-			if (!isServerCertificate) {
-				Log.Error(
-					"Connection from node: {ip} was denied because it is not configured as a server certificate: {failReason}",
-					ip, serverCertReason);
-			}
-
-			return hasReservedNodeCN && hasIpOrDnsSan && isServerCertificate;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Authentication/PassthroughHttpAuthenticationProvider.cs b/src/EventStore.Core/Services/Transport/Http/Authentication/PassthroughHttpAuthenticationProvider.cs
deleted file mode 100644
index 4af6ea3ea0f..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Authentication/PassthroughHttpAuthenticationProvider.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using EventStore.Core.Authentication.DelegatedAuthentication;
-using EventStore.Core.Authentication.PassthroughAuthentication;
-using EventStore.Plugins.Authentication;
-using Microsoft.AspNetCore.Http;
-
-namespace EventStore.Core.Services.Transport.Http.Authentication {
-	public class PassthroughHttpAuthenticationProvider : IHttpAuthenticationProvider {
-		private readonly IAuthenticationProvider _passthroughAuthenticationProvider;
-
-		public string Name => "insecure";
-
-		public PassthroughHttpAuthenticationProvider(IAuthenticationProvider internalAuthenticationProvider) {
-			_passthroughAuthenticationProvider = GetProvider(internalAuthenticationProvider);
-		}
-
-		private static PassthroughAuthenticationProvider GetProvider(IAuthenticationProvider provider) =>
-			provider switch {
-				PassthroughAuthenticationProvider p => p,
-				DelegatedAuthenticationProvider d => GetProvider(d.Inner),
-				_ => throw new ArgumentException(
-					"PassthroughHttpAuthenticationProvider can be initialized only with a PassthroughAuthenticationProvider.")
-			};
-
-		public bool Authenticate(HttpContext context, out HttpAuthenticationRequest request) {
-			request = new HttpAuthenticationRequest(context, null, null);
-			_passthroughAuthenticationProvider.Authenticate(request);
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Authentication/PasswordChangeNotificationReader.cs b/src/EventStore.Core/Services/Transport/Http/Authentication/PasswordChangeNotificationReader.cs
deleted file mode 100644
index 98d09a05f40..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Authentication/PasswordChangeNotificationReader.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.UserManagement;
-using Newtonsoft.Json;
-using EventStore.Common.Utils;
-using EventStore.Core.Authentication.InternalAuthentication;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Transport.Http.Authentication {
-	public class PasswordChangeNotificationReader : IHandle<SystemMessage.SystemStart>,
-		IHandle<SystemMessage.BecomeShutdown> {
-		private readonly IPublisher _publisher;
-		private readonly IODispatcher _ioDispatcher;
-		private readonly ILogger _log;
-		private bool _stopped;
-
-		public PasswordChangeNotificationReader(IPublisher publisher, IODispatcher ioDispatcher) {
-			_publisher = publisher;
-			_ioDispatcher = ioDispatcher;
-			_log = Serilog.Log.ForContext<UserManagementService>();
-		}
-
-		private void Start() {
-			_stopped = false;
-			_ioDispatcher.ReadBackward(
-				UserManagementService.UserPasswordNotificationsStreamId, -1, 1, false, SystemAccounts.System,
-				completed => {
-					switch (completed.Result) {
-						case ReadStreamResult.NoStream:
-							ReadNotificationsFrom(0);
-							break;
-						case ReadStreamResult.Success:
-							if (completed.Events.Length == 0)
-								ReadNotificationsFrom(0);
-							else
-								ReadNotificationsFrom(completed.Events[0].Event.EventNumber + 1);
-							break;
-						default:
-							throw new Exception(
-								"Failed to initialize password change notification reader. Cannot read "
-								+ UserManagementService.UserPasswordNotificationsStreamId + " Error: "
-								+ completed.Result);
-					}
-				});
-		}
-
-		private void ReadNotificationsFrom(long fromEventNumber) {
-			if (_stopped) return;
-			_ioDispatcher.ReadForward(
-				UserManagementService.UserPasswordNotificationsStreamId, fromEventNumber, 100, false,
-				SystemAccounts.System, completed => {
-					if (_stopped) return;
-					switch (completed.Result) {
-						case ReadStreamResult.AccessDenied:
-						case ReadStreamResult.Error:
-						case ReadStreamResult.NotModified:
-							_log.Error("Failed to read: {stream} completed.Result={e}",
-								UserManagementService.UserPasswordNotificationsStreamId, completed.Result.ToString());
-							_ioDispatcher.Delay(
-								TimeSpan.FromSeconds(10), _ => ReadNotificationsFrom(fromEventNumber));
-							break;
-						case ReadStreamResult.NoStream:
-						case ReadStreamResult.StreamDeleted:
-							_ioDispatcher.Delay(
-								TimeSpan.FromSeconds(1), _ => ReadNotificationsFrom(0));
-							break;
-						case ReadStreamResult.Success:
-							foreach (var @event in completed.Events)
-								PublishPasswordChangeNotificationFrom(@event);
-							if (completed.IsEndOfStream)
-								_ioDispatcher.Delay(
-									TimeSpan.FromSeconds(1), _ => ReadNotificationsFrom(completed.NextEventNumber));
-							else
-								ReadNotificationsFrom(completed.NextEventNumber);
-							break;
-						default:
-							throw new NotSupportedException();
-					}
-				},
-				() => {
-					_log.Warning("Timeout reading stream: {stream}. Trying again in 10 seconds.", UserManagementService.UserPasswordNotificationsStreamId);
-					_ioDispatcher.Delay(TimeSpan.FromSeconds(10), _ => ReadNotificationsFrom(fromEventNumber));
-				},
-				Guid.NewGuid());
-		}
-
-
-		private class Notification {
-#pragma warning disable 649
-			public string LoginName;
-#pragma warning restore 649
-		}
-
-		private void PublishPasswordChangeNotificationFrom(ResolvedEvent @event) {
-			var data = @event.Event.Data;
-			try {
-				var notification = data.ParseJson<Notification>();
-				_publisher.Publish(
-					new InternalAuthenticationProviderMessages.ResetPasswordCache(notification.LoginName));
-			} catch (JsonException ex) {
-				_log.Error("Failed to de-serialize event #{eventNumber}. Error: '{e}'", @event.OriginalEventNumber,
-					ex.Message);
-			}
-		}
-
-		public void Handle(SystemMessage.SystemStart message) {
-			Start();
-		}
-
-		public void Handle(SystemMessage.BecomeShutdown message) {
-			_stopped = true;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Authentication/Rfc2898PasswordHashAlgorithm.cs b/src/EventStore.Core/Services/Transport/Http/Authentication/Rfc2898PasswordHashAlgorithm.cs
deleted file mode 100644
index dd78868f46a..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Authentication/Rfc2898PasswordHashAlgorithm.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Security.Cryptography;
-using EventStore.Core.Authentication.InternalAuthentication;
-
-namespace EventStore.Core.Services.Transport.Http.Authentication {
-	public class Rfc2898PasswordHashAlgorithm : PasswordHashAlgorithm {
-		private const int HashSize = 20;
-		private const int SaltSize = 16;
-		private const int Iterations = 1000;
-		
-		public override void Hash(string password, out string hash, out string salt) {
-			var saltData = new byte[SaltSize];
-			RandomNumberGenerator.Fill(saltData);
-			
-			using var rfcBytes = new Rfc2898DeriveBytes(password, saltData, Iterations, HashAlgorithmName.SHA1);
-			var hashData = rfcBytes.GetBytes(HashSize);
-			hash = System.Convert.ToBase64String(hashData);
-			salt = System.Convert.ToBase64String(saltData);
-		}
-
-		public override bool Verify(string password, string hash, string salt) {
-			var saltData = System.Convert.FromBase64String(salt);
-
-			using var rfcBytes = new Rfc2898DeriveBytes(password, saltData, Iterations, HashAlgorithmName.SHA1);
-			var newHash = System.Convert.ToBase64String(rfcBytes.GetBytes(HashSize));
-
-			return hash == newHash;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Authentication/TrustedHttpAuthenticationProvider.cs b/src/EventStore.Core/Services/Transport/Http/Authentication/TrustedHttpAuthenticationProvider.cs
deleted file mode 100644
index 0e2e8363efd..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Authentication/TrustedHttpAuthenticationProvider.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System.Collections.Generic;
-using System.Security.Claims;
-using EventStore.Plugins.Authentication;
-using Microsoft.AspNetCore.Http;
-
-namespace EventStore.Core.Services.Transport.Http.Authentication {
-	public class TrustedHttpAuthenticationProvider : IHttpAuthenticationProvider {
-		public string Name => "trusted";
-
-		public bool Authenticate(HttpContext context, out HttpAuthenticationRequest request) {
-			request = null;
-			if (!context.Request.Headers.TryGetValue(SystemHeaders.TrustedAuth, out var values)) {
-				return false;
-			}
-			request = new HttpAuthenticationRequest(context, null, null);
-			var principal = CreatePrincipal(values[0]);
-			if (principal != null)
-				request.Authenticated(principal);
-			else
-				request.Unauthorized();
-			return true;
-		}
-
-		private ClaimsPrincipal CreatePrincipal(string header) {
-			var loginAndGroups = header.Split(';');
-			if (loginAndGroups.Length == 0 || loginAndGroups.Length > 2)
-				return null;
-			var login = loginAndGroups[0];
-			var claims = new List<Claim>() {
-				new Claim(ClaimTypes.Name, login)
-			};
-			if (loginAndGroups.Length == 2) {
-				var groups = loginAndGroups[1];
-				var roles = groups.Split(',');
-				for (var i = 0; i < roles.Length; i++)
-					claims.Add(new Claim(ClaimTypes.Role, roles[i].Trim()));
-
-			}
-			return new ClaimsPrincipal(new ClaimsIdentity(claims, SystemHeaders.TrustedAuth));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Authentication/UnixSocketAuthenticationProvider.cs b/src/EventStore.Core/Services/Transport/Http/Authentication/UnixSocketAuthenticationProvider.cs
deleted file mode 100644
index ac80cc39d96..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Authentication/UnixSocketAuthenticationProvider.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using EventStore.Core.Services.UserManagement;
-using EventStore.Plugins.Authentication;
-using Microsoft.AspNetCore.Http;
-
-namespace EventStore.Core.Services.Transport.Http.Authentication {
-	public class UnixSocketAuthenticationProvider : IHttpAuthenticationProvider {
-		public string Name => "unix-socket";
-
-		public bool Authenticate(HttpContext context, out HttpAuthenticationRequest request) {
-			if (context.IsUnixSocketConnection()) {
-				request = new HttpAuthenticationRequest(context, "system", "");
-				request.Authenticated(SystemAccounts.System);
-				return true;
-			}
-
-			request = null;
-			return false;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/AuthenticationMiddleware.cs b/src/EventStore.Core/Services/Transport/Http/AuthenticationMiddleware.cs
deleted file mode 100644
index 32ed54e2939..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/AuthenticationMiddleware.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Plugins.Authentication;
-using EventStore.Transport.Http;
-using Grpc.Core;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Features;
-using Newtonsoft.Json;
-
-namespace EventStore.Core.Services.Transport.Http {
-	public class AuthenticationMiddleware : IMiddleware {
-		private readonly IAuthenticationProvider _authenticationProvider;
-		private readonly IReadOnlyList<IHttpAuthenticationProvider> _httpAuthenticationProviders;
-
-		public AuthenticationMiddleware(IReadOnlyList<IHttpAuthenticationProvider> httpAuthenticationProviders, IAuthenticationProvider authenticationProvider) {
-			_httpAuthenticationProviders = httpAuthenticationProviders;
-			_authenticationProvider = authenticationProvider;
-		}
-
-		public async Task InvokeAsync(HttpContext context, RequestDelegate next) {
-			try {
-				if (context.IsGrpc()) {
-					await HandleAsGrpcAsync(context, next);
-				} else {
-					await HandleAsHttpAsync(context, next);
-				}
-			} catch (Exception ex) when (ex is OperationCanceledException or TaskCanceledException) {
-				// ignore request aborted
-			}
-		}
-
-		private async Task HandleAsHttpAsync(HttpContext context, RequestDelegate next) {
-			if (!TrySelectProvider(context, out var authenticationRequest)) {
-				await AddHttp1ChallengeHeaders(context);
-				return;
-			}
-
-			var (status, principal) = await authenticationRequest.AuthenticateAsync();
-
-			switch (status) {
-				case HttpAuthenticationRequestStatus.Authenticated:
-					context.User = principal;
-					await next(context);
-					break;
-				case HttpAuthenticationRequestStatus.Error:
-					context.Response.StatusCode = HttpStatusCode.InternalServerError;
-					break;
-				case HttpAuthenticationRequestStatus.NotReady:
-					context.Response.StatusCode = HttpStatusCode.ServiceUnavailable;
-					context.Response.Headers.Append("Retry-After", "5");
-					break;
-				case HttpAuthenticationRequestStatus.Unauthenticated:
-				default:
-					await AddHttp1ChallengeHeaders(context);
-					break;
-			}
-		}
-
-		private async Task HandleAsGrpcAsync(HttpContext context, RequestDelegate next) {
-			var (status, principal) = TrySelectProvider(context, out var authenticationRequest)
-				? await authenticationRequest.AuthenticateAsync()
-				: (HttpAuthenticationRequestStatus.Unauthenticated, default);
-
-			GrpcProtocolHelpers.AddProtocolHeaders(context.Response);
-			var trailersDestination = GrpcProtocolHelpers.GetTrailersDestination(context.Response);
-
-			Status grpcStatus;
-			switch (status) {
-				case HttpAuthenticationRequestStatus.Authenticated:
-					context.User = principal;
-					await next(context);
-					return;
-				case HttpAuthenticationRequestStatus.Error:
-					grpcStatus = new Status(StatusCode.Unknown, "Internal server error");
-					break;
-				case HttpAuthenticationRequestStatus.NotReady:
-					// negative RetryPushbackHeader asks the grpc client not to retry the request.
-					// the user is then explicit about what retries they want and aware of the delays incurred
-					trailersDestination.Append(GrpcProtocolHelpers.RetryPushbackHeader, "-1");
-					grpcStatus = new Status(StatusCode.Unavailable, "Server not ready");
-					break;
-				case HttpAuthenticationRequestStatus.Unauthenticated:
-				default:
-					grpcStatus = new Status(StatusCode.Unauthenticated, "Unauthenticated");
-					break;
-			}
-
-			GrpcProtocolHelpers.SetStatus(trailersDestination, grpcStatus);
-
-			// Immediately send remaining response content and trailers
-			// If feature is null then reset/abort will still end request, but response won't have trailers
-			var completionFeature = context.Features.Get<IHttpResponseBodyFeature>();
-			if (completionFeature != null) {
-				await completionFeature.CompleteAsync();
-			}
-		}
-
-		private bool TrySelectProvider(HttpContext context, out HttpAuthenticationRequest authenticationRequest) {
-			for (int i = 0; i < _httpAuthenticationProviders.Count; i++) {
-				if (_httpAuthenticationProviders[i].Authenticate(context, out authenticationRequest)) {
-					return true;
-				}
-			}
-
-			authenticationRequest = default;
-			return false;
-		}
-
-		private async Task AddHttp1ChallengeHeaders(HttpContext context) {
-			context.Response.StatusCode = HttpStatusCode.Unauthorized;
-			var authSchemes = _authenticationProvider.GetSupportedAuthenticationSchemes();
-			if (authSchemes != null && authSchemes.Any()) {
-				//add "X-" in front to prevent any default browser behaviour e.g Basic Auth popups
-				context.Response.Headers.Append("WWW-Authenticate", $"X-{authSchemes.First()} realm=\"ESDB\"");
-				var properties = _authenticationProvider.GetPublicProperties();
-				if (properties != null && properties.Any()) {
-					await context.Response.WriteAsync(JsonConvert.SerializeObject(properties));
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/AuthorizationLevel.cs b/src/EventStore.Core/Services/Transport/Http/AuthorizationLevel.cs
deleted file mode 100644
index 60942961501..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/AuthorizationLevel.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace EventStore.Core.Services.Transport.Http {
-	public enum AuthorizationLevel {
-		None,
-		User,
-		Ops,
-		Admin
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/AuthorizationMiddleware.cs b/src/EventStore.Core/Services/Transport/Http/AuthorizationMiddleware.cs
deleted file mode 100644
index 7931fb8eb47..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/AuthorizationMiddleware.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Plugins.Authorization;
-using EventStore.Transport.Http;
-using Microsoft.AspNetCore.Http;
-using Serilog;
-
-namespace EventStore.Core.Services.Transport.Http
-{
-	public class AuthorizationMiddleware : IMiddleware {
-		private static readonly ILogger Log = Serilog.Log.ForContext<AuthorizationMiddleware>();
-		private readonly IAuthorizationProvider _authorization;
-
-		public AuthorizationMiddleware(IAuthorizationProvider authorization) {
-			_authorization = authorization;
-		}
-		public async Task InvokeAsync(HttpContext context, RequestDelegate next) {
-			if (InternalHttpHelper.TryGetInternalContext(context, out var manager, out var match, out _)) {
-				if (await _authorization.CheckAccessAsync(manager.User, match.ControllerAction.Operation(match.TemplateMatch), context.RequestAborted)) {
-					await next(context);
-					return;
-				}
-
-				context.Response.StatusCode = HttpStatusCode.Unauthorized;
-				return;
-			}
-			//LOG
-			Log.Error("Failed to get internal http components for request {requestId}", context.TraceIdentifier);
-			context.Response.StatusCode = HttpStatusCode.InternalServerError;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/AutoEventConverter.cs b/src/EventStore.Core/Services/Transport/Http/AutoEventConverter.cs
deleted file mode 100644
index f87b15bef4b..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/AutoEventConverter.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-using System;
-using System.Xml.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Codecs;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Formatting = Newtonsoft.Json.Formatting;
-using System.Linq;
-using EventStore.Common.Utils;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Transport.Http {
-	public static class AutoEventConverter {
-		private static readonly ILogger Log =
-			Serilog.Log.ForContext(Serilog.Core.Constants.SourceContextPropertyName, "AutoEventConverter");
-
-		public static object SmartFormat(ResolvedEvent evnt, ICodec targetCodec) {
-			var dto = CreateDataDto(evnt);
-
-			switch (targetCodec.ContentType) {
-				case ContentType.Raw:
-					return evnt.Event.Data.ToArray();
-				case ContentType.Xml:
-				case ContentType.ApplicationXml: {
-					if (evnt.Event.Data.IsEmpty)
-						return "<data />";
-
-					var serializeObject = JsonConvert.SerializeObject(dto.data);
-					var deserializeXmlNode = JsonConvert.DeserializeXmlNode(serializeObject, "data");
-					return deserializeXmlNode.InnerXml;
-				}
-				case ContentType.Json:
-					return targetCodec.To(dto.data);
-
-
-				case ContentType.Atom:
-				case ContentType.EventXml: {
-					var serializeObject = JsonConvert.SerializeObject(dto);
-					var deserializeXmlNode = JsonConvert.DeserializeXmlNode(serializeObject, "event");
-					return deserializeXmlNode.InnerXml;
-				}
-
-				case ContentType.EventJson:
-					return targetCodec.To(dto);
-
-
-				default:
-					throw new NotSupportedException();
-			}
-		}
-
-		public static HttpClientMessageDto.ReadEventCompletedText CreateDataDto(ResolvedEvent evnt) {
-			var dto = new HttpClientMessageDto.ReadEventCompletedText(evnt);
-			if (evnt.Event.Flags.HasFlag(PrepareFlags.IsJson)) {
-				var deserializedData = Codec.Json.From<object>((string)dto.data);
-				var deserializedMetadata = Codec.Json.From<object>((string)dto.metadata);
-
-				if (deserializedData != null)
-					dto.data = deserializedData;
-				if (deserializedMetadata != null)
-					dto.metadata = deserializedMetadata;
-			}
-
-			return dto;
-		}
-
-		//TODO GFY THERE IS WAY TOO MUCH COPYING/SERIALIZING/DESERIALIZING HERE!
-		public static Event[] SmartParse(byte[] request, ICodec sourceCodec, Guid includedId,
-			string includedType = null) {
-			switch (sourceCodec.ContentType) {
-				case ContentType.Raw:
-					return LoadRaw(request, includedId, includedType);
-				case ContentType.Json:
-					return LoadRaw(sourceCodec.Encoding.GetString(request), true, includedId, includedType);
-				case ContentType.EventJson:
-				case ContentType.EventsJson:
-				case ContentType.AtomJson:
-					var writeEvents = LoadFromJson(sourceCodec.Encoding.GetString(request));
-					if (writeEvents.IsEmpty())
-						return null;
-					return Parse(writeEvents);
-
-				case ContentType.ApplicationXml:
-				case ContentType.Xml:
-					return LoadRaw(sourceCodec.Encoding.GetString(request), false, includedId, includedType);
-				case ContentType.EventXml:
-				case ContentType.EventsXml:
-				case ContentType.Atom:
-					var writeEvents2 = LoadFromXml(sourceCodec.Encoding.GetString(request));
-					if (writeEvents2.IsEmpty())
-						return null;
-					return Parse(writeEvents2);
-				default:
-					return null;
-			}
-		}
-
-		private static Event[] LoadRaw(byte[] data, Guid includedId, string includedType) {
-			var ret = new Event[1];
-			ret[0] = new Event(includedId, includedType, false, data, null);
-			return ret;
-		}
-
-		private static Event[] LoadRaw(string data, bool isJson, Guid includedId, string includedType) {
-			var ret = new Event[1];
-			ret[0] = new Event(includedId, includedType, isJson, data, null);
-			return ret;
-		}
-
-		private static HttpClientMessageDto.ClientEventDynamic[] LoadFromJson(string json) {
-			return Codec.Json.From<HttpClientMessageDto.ClientEventDynamic[]>(json);
-		}
-
-		private static HttpClientMessageDto.ClientEventDynamic[] LoadFromXml(string xml) {
-			try {
-				XDocument doc = XDocument.Parse(xml);
-
-				XNamespace jsonNsValue = "http://james.newtonking.com/projects/json";
-				XName jsonNsName = XNamespace.Xmlns + "json";
-
-				doc.Root.SetAttributeValue(jsonNsName, jsonNsValue);
-
-				var events = doc.Root.Elements() /*.ToArray()*/;
-				foreach (var @event in events) {
-					@event.Name = "events";
-					@event.SetAttributeValue(jsonNsValue + "Array", "true");
-				}
-				//doc.Root.ReplaceNodes(events);
-//                foreach (var element in doc.Root.Descendants("data").Concat(doc.Root.Descendants("metadata")))
-//                {
-//                    element.RemoveAttributes();
-//                }
-
-				var json = JsonConvert.SerializeXNode(doc.Root, Formatting.None, true);
-				var root = JsonConvert.DeserializeObject<HttpClientMessageDto.WriteEventsDynamic>(json);
-				return root.events;
-//                var root = JsonConvert.DeserializeObject<JObject>(json);
-//                var dynamicEvents = root.ToObject<HttpClientMessageDto.WriteEventsDynamic>();
-//                return dynamicEvents.events;
-			} catch (Exception e) {
-				Log.Information(e, "Failed to load xml. Invalid format");
-				return null;
-			}
-		}
-
-		private static Event[] Parse(HttpClientMessageDto.ClientEventDynamic[] dynamicEvents) {
-			var events = new Event[dynamicEvents.Length];
-			for (int i = 0, n = dynamicEvents.Length; i < n; ++i) {
-				var textEvent = dynamicEvents[i];
-				bool dataIsJson;
-				bool metadataIsJson;
-				var data = AsBytes(textEvent.data, out dataIsJson);
-				var metadata = AsBytes(textEvent.metadata, out metadataIsJson);
-
-				events[i] = new Event(textEvent.eventId, textEvent.eventType, dataIsJson || metadataIsJson, data,
-					metadata);
-			}
-
-			return events.ToArray();
-		}
-
-		private static byte[] AsBytes(object obj, out bool isJson) {
-			if (obj is JObject || obj is JArray) {
-				isJson = true;
-				return Helper.UTF8NoBom.GetBytes(Codec.Json.To(obj));
-			} else if(obj is string){
-				try{
-					var jsonObject = JsonConvert.DeserializeObject((string)obj);
-					if(jsonObject is JObject || jsonObject is JArray){
-						isJson = true;
-						return Helper.UTF8NoBom.GetBytes(Codec.Json.To(jsonObject));
-					}
-					else
-						throw new JsonException();
-				}
-				catch(JsonException){
-					isJson = false;
-					return Helper.UTF8NoBom.GetBytes((obj as string));
-				}
-			}
-			isJson = false;
-			return Helper.UTF8NoBom.GetBytes(string.Empty);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/ClearTextHttpMultiplexingMiddleware.cs b/src/EventStore.Core/Services/Transport/Http/ClearTextHttpMultiplexingMiddleware.cs
deleted file mode 100644
index a8a39244ddd..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/ClearTextHttpMultiplexingMiddleware.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Buffers;
-using System.IO.Pipelines;
-using System.Reflection;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Connections;
-using Microsoft.AspNetCore.Server.Kestrel.Core;
-using Microsoft.CSharp.RuntimeBinder;
-
-namespace EventStore.Core.Services.Transport.Http
-{
-    public class ClearTextHttpMultiplexingMiddleware {
-	    private ConnectionDelegate _next;
-	    //HTTP/2 prior knowledge-mode connection preface
-	    private static readonly byte[] _http2Preface = {0x50,0x52,0x49,0x20,0x2a,0x20,0x48,0x54,0x54,0x50,0x2f,0x32,0x2e,0x30,0x0d,0x0a,0x0d,0x0a,0x53,0x4d,0x0d,0x0a,0x0d,0x0a}; //PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n
-
-	    public ClearTextHttpMultiplexingMiddleware(ConnectionDelegate next) {
-		    _next = next;
-	    }
-
-	    private static async Task<bool> HasHttp2Preface(PipeReader input) {
-		    while (true) {
-			    var result = await input.ReadAsync();
-			    try {
-				    int pos = 0;
-				    foreach (var x in result.Buffer) {
-					    for (var i = 0; i < x.Span.Length && pos < _http2Preface.Length; i++) {
-						    if (_http2Preface[pos] != x.Span[i]) {
-							    return false;
-						    }
-
-						    pos++;
-					    }
-
-					    if (pos >= _http2Preface.Length) {
-						    return true;
-					    }
-				    }
-
-				    if (result.IsCompleted) return false;
-			    } finally {
-				    input.AdvanceTo(result.Buffer.Start);
-			    }
-		    }
-	    }
-
-	    private static void SetProtocols(object target, HttpProtocols protocols) {
-	        var field = target.GetType().GetField("_endpointDefaultProtocols", BindingFlags.Instance | BindingFlags.NonPublic);
-	        if (field == null) throw new RuntimeBinderException("Couldn't bind to Kestrel's _endpointDefaultProtocols field");
-	        field.SetValue(target, protocols);
-        }
-
-        public async Task OnConnectAsync(ConnectionContext context) {
-	        var hasHttp2Preface = await HasHttp2Preface(context.Transport.Input);
-	        SetProtocols(_next.Target, hasHttp2Preface ? HttpProtocols.Http2 : HttpProtocols.Http1);
-	        await _next(context);
-        }
-    }
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Configure.cs b/src/EventStore.Core/Services/Transport/Http/Configure.cs
deleted file mode 100644
index 6f5e38a3e36..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Configure.cs
+++ /dev/null
@@ -1,493 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Monitoring;
-using EventStore.Core.Services.Transport.Http.Controllers;
-using HttpStatusCode = EventStore.Transport.Http.HttpStatusCode;
-using OperationResult = EventStore.Core.Messages.OperationResult;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-
-namespace EventStore.Core.Services.Transport.Http {
-	public static class Configure {
-		private const int MaxPossibleAge = 31536000;
-		public static bool DisableHTTPCaching = false;
-
-		public static ResponseConfiguration Ok(string contentType) {
-			return new ResponseConfiguration(HttpStatusCode.OK, "OK", contentType, Helper.UTF8NoBom);
-		}
-
-		public static ResponseConfiguration Ok(string contentType,
-			Encoding encoding,
-			string etag,
-			int? cacheSeconds,
-			bool isCachePublic,
-			params KeyValuePair<string, string>[] headers) {
-			var headrs = new List<KeyValuePair<string, string>>(headers);
-			if (DisableHTTPCaching) {
-				headrs.Add(new KeyValuePair<string, string>(
-					"Cache-Control",
-					"max-age=0, no-cache, must-revalidate"));
-			} else {
-				headrs.Add(new KeyValuePair<string, string>(
-					"Cache-Control",
-					cacheSeconds.HasValue
-						? string.Format("max-age={0}, {1}", cacheSeconds, isCachePublic ? "public" : "private")
-						: "max-age=0, no-cache, must-revalidate"));
-			}
-
-			headrs.Add(new KeyValuePair<string, string>("Vary", "Accept"));
-			if (etag.IsNotEmptyString())
-				headrs.Add(new KeyValuePair<string, string>("ETag", string.Format("\"{0}\"", etag)));
-			return new ResponseConfiguration(HttpStatusCode.OK, "OK", contentType, encoding, headrs);
-		}
-
-		public static ResponseConfiguration TemporaryRedirect(Uri originalUrl, string targetHost, int targetPort) {
-			var srcBase =
-				new Uri(string.Format("{0}://{1}:{2}/", originalUrl.Scheme, originalUrl.Host, originalUrl.Port),
-					UriKind.Absolute);
-			var targetBase = new Uri(string.Format("{0}://{1}:{2}/", originalUrl.Scheme, targetHost, targetPort),
-				UriKind.Absolute);
-			var forwardUri = new Uri(targetBase, srcBase.MakeRelativeUri(originalUrl));
-			return new ResponseConfiguration(HttpStatusCode.TemporaryRedirect, "Temporary Redirect", "text/plain",
-				Helper.UTF8NoBom,
-				new KeyValuePair<string, string>("Location", forwardUri.ToString()));
-		}
-
-		public static ResponseConfiguration DenyRequestBecauseReadOnly(Uri originalUrl, string targetHost, int targetPort) {
-			var srcBase =
-				new Uri(string.Format("{0}://{1}:{2}/", originalUrl.Scheme, originalUrl.Host, originalUrl.Port),
-					UriKind.Absolute);
-			var targetBase = new Uri(string.Format("{0}://{1}:{2}/", originalUrl.Scheme, targetHost, targetPort),
-				UriKind.Absolute);
-			var forwardUri = new Uri(targetBase, srcBase.MakeRelativeUri(originalUrl));
-			return new ResponseConfiguration(HttpStatusCode.InternalServerError,
-				"Operation Not Supported on Read Only Replica", "text/plain",
-				Helper.UTF8NoBom,
-				new KeyValuePair<string, string>("Location", forwardUri.ToString()));
-		}
-
-		public static ResponseConfiguration NotFound() {
-			return new ResponseConfiguration(HttpStatusCode.NotFound, "Not Found", "text/plain", Helper.UTF8NoBom);
-		}
-
-		public static ResponseConfiguration NotFound(string etag, int? cacheSeconds, bool isCachePublic,
-			string contentType) {
-			var headrs = new List<KeyValuePair<string, string>>();
-			headrs.Add(new KeyValuePair<string, string>(
-				"Cache-Control",
-				cacheSeconds.HasValue
-					? string.Format("max-age={0}, {1}", cacheSeconds, isCachePublic ? "public" : "private")
-					: "max-age=0, no-cache, must-revalidate"));
-			headrs.Add(new KeyValuePair<string, string>("Vary", "Accept"));
-			if (etag.IsNotEmptyString())
-				headrs.Add(new KeyValuePair<string, string>("ETag", string.Format("\"{0}\"", etag)));
-			return new ResponseConfiguration(HttpStatusCode.NotFound, "Not Found", contentType, Helper.UTF8NoBom,
-				headrs);
-		}
-
-		public static ResponseConfiguration Gone(string description = null) {
-			return new ResponseConfiguration(HttpStatusCode.Gone, description ?? "Deleted", "text/plain",
-				Helper.UTF8NoBom);
-		}
-
-		public static ResponseConfiguration NotModified() {
-			return new ResponseConfiguration(HttpStatusCode.NotModified, "Not Modified", "text/plain",
-				Helper.UTF8NoBom);
-		}
-
-		public static ResponseConfiguration BadRequest(string description = null) {
-			return new ResponseConfiguration(HttpStatusCode.BadRequest, description ?? "Bad Request", "text/plain",
-				Helper.UTF8NoBom);
-		}
-
-		public static ResponseConfiguration InternalServerError(string description = null) {
-			return new ResponseConfiguration(HttpStatusCode.InternalServerError, description ?? "Internal Server Error",
-				"text/plain", Helper.UTF8NoBom);
-		}
-
-		public static ResponseConfiguration ServiceUnavailable(string description = null) {
-			return new ResponseConfiguration(HttpStatusCode.ServiceUnavailable, description ?? "Service Unavailable",
-				"text/plain", Helper.UTF8NoBom);
-		}
-
-		public static ResponseConfiguration NotImplemented(string description = null) {
-			return new ResponseConfiguration(HttpStatusCode.NotImplemented, description ?? "Not Implemented",
-				"text/plain", Helper.UTF8NoBom);
-		}
-
-		public static ResponseConfiguration Unauthorized(string description = null) {
-			return new ResponseConfiguration(HttpStatusCode.Unauthorized, description ?? "Unauthorized", "text/plain",
-				Helper.UTF8NoBom);
-		}
-
-		public static ResponseConfiguration EventEntry(HttpResponseConfiguratorArgs entity, Message message,
-			bool headEvent) {
-			var msg = message as ClientMessage.ReadEventCompleted;
-			if (msg != null) {
-				switch (msg.Result) {
-					case ReadEventResult.Success:
-						var codec = entity.ResponseCodec;
-						if (msg.Record.Event == null && msg.Record.Link != null) {
-							return NotFound();
-						}
-
-						if (headEvent) {
-							var etag = msg.Record.OriginalEvent != null
-								? GetPositionETag(msg.Record.OriginalEventNumber, codec.ContentType)
-								: String.Empty;
-							var cacheSeconds = GetCacheSeconds(msg.StreamMetadata);
-							return Ok(codec.ContentType, codec.Encoding, etag, cacheSeconds, msg.IsCachePublic);
-						}
-
-						return Ok(codec.ContentType, codec.Encoding, null, MaxPossibleAge, msg.IsCachePublic);
-					case ReadEventResult.NotFound:
-					case ReadEventResult.NoStream:
-						return NotFound();
-					case ReadEventResult.StreamDeleted:
-						return Gone();
-					case ReadEventResult.Error:
-						return InternalServerError(msg.Error);
-					case ReadEventResult.AccessDenied:
-						return Unauthorized();
-					default:
-						throw new ArgumentOutOfRangeException();
-				}
-			}
-
-			var notHandled = message as ClientMessage.NotHandled;
-			if (notHandled != null)
-				return HandleNotHandled(entity.RequestedUrl, notHandled);
-			return InternalServerError();
-		}
-
-		public static ResponseConfiguration EventMetadata(HttpResponseConfiguratorArgs entity) {
-			return NotImplemented();
-		}
-
-		public static ResponseConfiguration GetStreamEventsBackward(HttpResponseConfiguratorArgs entity,
-			Message message, bool headOfStream) {
-			var msg = message as ClientMessage.ReadStreamEventsBackwardCompleted;
-			if (msg != null) {
-				switch (msg.Result) {
-					case ReadStreamResult.Success:
-						var codec = entity.ResponseCodec;
-						if (msg.LastEventNumber >= msg.FromEventNumber && !headOfStream)
-							return Ok(codec.ContentType, codec.Encoding, null, MaxPossibleAge, msg.IsCachePublic);
-						var etag = GetPositionETag(msg.LastEventNumber, codec.ContentType);
-						var cacheSeconds = GetCacheSeconds(msg.StreamMetadata);
-						return Ok(codec.ContentType, codec.Encoding, etag, cacheSeconds, msg.IsCachePublic);
-					case ReadStreamResult.NoStream:
-						return NotFound();
-					case ReadStreamResult.StreamDeleted:
-						return Gone();
-					case ReadStreamResult.NotModified:
-						return NotModified();
-					case ReadStreamResult.Error:
-						return InternalServerError(msg.Error);
-					case ReadStreamResult.AccessDenied:
-						return Unauthorized();
-					default:
-						throw new ArgumentOutOfRangeException();
-				}
-			}
-
-			var notHandled = message as ClientMessage.NotHandled;
-			if (notHandled != null)
-				return HandleNotHandled(entity.RequestedUrl, notHandled);
-			return InternalServerError();
-		}
-
-		public static ResponseConfiguration
-			GetStreamEventsForward(HttpResponseConfiguratorArgs entity, Message message) {
-			var msg = message as ClientMessage.ReadStreamEventsForwardCompleted;
-			if (msg != null) {
-				switch (msg.Result) {
-					case ReadStreamResult.Success:
-						var codec = entity.ResponseCodec;
-						var etag = GetPositionETag(msg.LastEventNumber, codec.ContentType);
-						var cacheSeconds = GetCacheSeconds(msg.StreamMetadata);
-						if (msg.LastEventNumber + 1 >= msg.FromEventNumber + msg.MaxCount)
-							return Ok(codec.ContentType, codec.Encoding, null, MaxPossibleAge, msg.IsCachePublic);
-						return Ok(codec.ContentType, codec.Encoding, etag, cacheSeconds, msg.IsCachePublic);
-					case ReadStreamResult.NoStream:
-						return NotFound();
-					case ReadStreamResult.StreamDeleted:
-						return Gone();
-					case ReadStreamResult.NotModified:
-						return NotModified();
-					case ReadStreamResult.Error:
-						return InternalServerError(msg.Error);
-					case ReadStreamResult.AccessDenied:
-						return Unauthorized();
-					default:
-						throw new ArgumentOutOfRangeException();
-				}
-			}
-
-			var notHandled = message as ClientMessage.NotHandled;
-			if (notHandled != null)
-				return HandleNotHandled(entity.RequestedUrl, notHandled);
-			return InternalServerError();
-		}
-
-		public static ResponseConfiguration ReadAllEventsBackwardCompleted(HttpResponseConfiguratorArgs entity,
-			Message message, bool headOfTf) {
-			var msg = message as ClientMessage.ReadAllEventsBackwardCompleted;
-			if (msg != null) {
-				switch (msg.Result) {
-					case ReadAllResult.Success:
-						var codec = entity.ResponseCodec;
-						if (!headOfTf && msg.CurrentPos.CommitPosition <= msg.TfLastCommitPosition)
-							return Ok(codec.ContentType, codec.Encoding, null, MaxPossibleAge, msg.IsCachePublic);
-						var etag = GetPositionETag(msg.TfLastCommitPosition, codec.ContentType);
-						var cacheSeconds = GetCacheSeconds(msg.StreamMetadata);
-						return Ok(codec.ContentType, codec.Encoding, etag, cacheSeconds, msg.IsCachePublic);
-					case ReadAllResult.NotModified:
-						return NotModified();
-					case ReadAllResult.Error:
-					case ReadAllResult.InvalidPosition:
-						return InternalServerError(msg.Error);
-					case ReadAllResult.AccessDenied:
-						return Unauthorized();
-					default:
-						throw new ArgumentOutOfRangeException();
-				}
-			}
-
-			var notHandled = message as ClientMessage.NotHandled;
-			if (notHandled != null)
-				return HandleNotHandled(entity.RequestedUrl, notHandled);
-			return InternalServerError();
-		}
-		
-		public static ResponseConfiguration ReadAllEventsBackwardFilteredCompleted(HttpResponseConfiguratorArgs entity,
-			Message message, bool headOfTf) {
-			var msg = message as ClientMessage.FilteredReadAllEventsBackwardCompleted;
-			if (msg != null) {
-				switch (msg.Result) {
-					case FilteredReadAllResult.Success:
-						var codec = entity.ResponseCodec;
-						if (!headOfTf && msg.CurrentPos.CommitPosition <= msg.TfLastCommitPosition)
-							return Ok(codec.ContentType, codec.Encoding, null, MaxPossibleAge, msg.IsCachePublic);
-						var etag = GetPositionETag(msg.TfLastCommitPosition, codec.ContentType);
-						var cacheSeconds = GetCacheSeconds(msg.StreamMetadata);
-						return Ok(codec.ContentType, codec.Encoding, etag, cacheSeconds, msg.IsCachePublic);
-					case FilteredReadAllResult.NotModified:
-						return NotModified();
-					case FilteredReadAllResult.Error:
-					case FilteredReadAllResult.InvalidPosition:
-						return InternalServerError(msg.Error);
-					case FilteredReadAllResult.AccessDenied:
-						return Unauthorized();
-					default:
-						throw new ArgumentOutOfRangeException();
-				}
-			}
-
-			var notHandled = message as ClientMessage.NotHandled;
-			if (notHandled != null)
-				return HandleNotHandled(entity.RequestedUrl, notHandled);
-			return InternalServerError();
-		}
-
-		public static ResponseConfiguration ReadAllEventsForwardCompleted(HttpResponseConfiguratorArgs entity,
-			Message message, bool headOfTf) {
-			var msg = message as ClientMessage.ReadAllEventsForwardCompleted;
-			if (msg != null) {
-				switch (msg.Result) {
-					case ReadAllResult.Success:
-						var codec = entity.ResponseCodec;
-						if (!headOfTf && msg.Events.Length == msg.MaxCount)
-							return Ok(codec.ContentType, codec.Encoding, null, MaxPossibleAge, msg.IsCachePublic);
-						var etag = GetPositionETag(msg.TfLastCommitPosition, codec.ContentType);
-						var cacheSeconds = GetCacheSeconds(msg.StreamMetadata);
-						return Ok(codec.ContentType, codec.Encoding, etag, cacheSeconds, msg.IsCachePublic);
-					case ReadAllResult.NotModified:
-						return NotModified();
-					case ReadAllResult.Error:
-					case ReadAllResult.InvalidPosition:
-						return InternalServerError(msg.Error);
-					case ReadAllResult.AccessDenied:
-						return Unauthorized();
-					default:
-						throw new ArgumentOutOfRangeException();
-				}
-			}
-
-			var notHandled = message as ClientMessage.NotHandled;
-			if (notHandled != null)
-				return HandleNotHandled(entity.RequestedUrl, notHandled);
-			return InternalServerError();
-		}
-		
-		public static ResponseConfiguration ReadAllEventsForwardFilteredCompleted(HttpResponseConfiguratorArgs entity,
-			Message message, bool headOfTf) {
-			var msg = message as ClientMessage.FilteredReadAllEventsForwardCompleted;
-			if (msg != null) {
-				switch (msg.Result) {
-					case FilteredReadAllResult.Success:
-						var codec = entity.ResponseCodec;
-						if (!headOfTf && msg.Events.Length == msg.MaxCount)
-							return Ok(codec.ContentType, codec.Encoding, null, MaxPossibleAge, msg.IsCachePublic);
-						var etag = GetPositionETag(msg.TfLastCommitPosition, codec.ContentType);
-						var cacheSeconds = GetCacheSeconds(msg.StreamMetadata);
-						return Ok(codec.ContentType, codec.Encoding, etag, cacheSeconds, msg.IsCachePublic);
-					case FilteredReadAllResult.NotModified:
-						return NotModified();
-					case FilteredReadAllResult.Error:
-					case FilteredReadAllResult.InvalidPosition:
-						return InternalServerError(msg.Error);
-					case FilteredReadAllResult.AccessDenied:
-						return Unauthorized();
-					default:
-						throw new ArgumentOutOfRangeException();
-				}
-			}
-
-			var notHandled = message as ClientMessage.NotHandled;
-			if (notHandled != null)
-				return HandleNotHandled(entity.RequestedUrl, notHandled);
-			return InternalServerError();
-		}
-
-		public static string GetPositionETag(long position, string contentType) {
-			return string.Format("{0}{1}{2}", position, AtomController.ETagSeparator, contentType.GetHashCode());
-		}
-
-		private static int? GetCacheSeconds(StreamMetadata metadata) {
-			return metadata != null && metadata.CacheControl.HasValue
-				? (int)metadata.CacheControl.Value.TotalSeconds
-				: (int?)null;
-		}
-
-		public static ResponseConfiguration WriteEventsCompleted(HttpResponseConfiguratorArgs entity, Message message,
-			string eventStreamId) {
-			var msg = message as ClientMessage.WriteEventsCompleted;
-			if (msg != null) {
-				switch (msg.Result) {
-					case OperationResult.Success:
-						var location = HostName.Combine(entity.ResponseUrl, "/streams/{0}/{1}",
-							Uri.EscapeDataString(eventStreamId), msg.FirstEventNumber);
-						return new ResponseConfiguration(HttpStatusCode.Created, "Created", "text/plain",
-							Helper.UTF8NoBom,
-							new KeyValuePair<string, string>("Location", location));
-					case OperationResult.PrepareTimeout:
-					case OperationResult.CommitTimeout:
-					case OperationResult.ForwardTimeout:
-						return InternalServerError("Write timeout");
-					case OperationResult.WrongExpectedVersion:
-						return new ResponseConfiguration(HttpStatusCode.BadRequest, "Wrong expected EventNumber",
-							"text/plain", Helper.UTF8NoBom,
-							new KeyValuePair<string, string>(SystemHeaders.CurrentVersion,
-								msg.CurrentVersion.ToString()));
-					case OperationResult.StreamDeleted:
-						return Gone("Stream deleted");
-					case OperationResult.InvalidTransaction:
-						return InternalServerError("Invalid transaction");
-					case OperationResult.AccessDenied:
-						return Unauthorized();
-					default:
-						throw new ArgumentOutOfRangeException();
-				}
-			}
-
-			var notHandled = message as ClientMessage.NotHandled;
-			if (notHandled != null)
-				return HandleNotHandled(entity.RequestedUrl, notHandled);
-			return InternalServerError();
-		}
-
-		public static ResponseConfiguration
-			DeleteStreamCompleted(HttpResponseConfiguratorArgs entity, Message message) {
-			var msg = message as ClientMessage.DeleteStreamCompleted;
-			if (msg != null) {
-				switch (msg.Result) {
-					case OperationResult.Success:
-						return new ResponseConfiguration(HttpStatusCode.NoContent, "Stream deleted", "text/plain",
-							Helper.UTF8NoBom);
-					case OperationResult.PrepareTimeout:
-					case OperationResult.CommitTimeout:
-					case OperationResult.ForwardTimeout:
-						return InternalServerError("Delete timeout");
-					case OperationResult.WrongExpectedVersion:
-						return new ResponseConfiguration(HttpStatusCode.BadRequest, "Wrong expected EventNumber",
-							"text/plain", Helper.UTF8NoBom,
-							new KeyValuePair<string, string>(SystemHeaders.CurrentVersion,
-								msg.CurrentVersion.ToString()));
-					case OperationResult.StreamDeleted:
-						return Gone("Stream deleted");
-					case OperationResult.InvalidTransaction:
-						return InternalServerError("Invalid transaction");
-					case OperationResult.AccessDenied:
-						return Unauthorized();
-					default:
-						throw new ArgumentOutOfRangeException();
-				}
-			}
-
-			var notHandled = message as ClientMessage.NotHandled;
-			if (notHandled != null)
-				return HandleNotHandled(entity.RequestedUrl, notHandled);
-			return InternalServerError();
-		}
-
-		private static ResponseConfiguration HandleNotHandled(Uri requestedUri, ClientMessage.NotHandled notHandled) {
-			switch (notHandled.Reason) {
-				case ClientMessage.NotHandled.Types.NotHandledReason.NotReady:
-					return ServiceUnavailable("Server Is Not Ready");
-				case ClientMessage.NotHandled.Types.NotHandledReason.TooBusy:
-					return ServiceUnavailable("Server Is Too Busy");
-				case ClientMessage.NotHandled.Types.NotHandledReason.NotLeader: {
-					var leaderInfo = notHandled.LeaderInfo;
-					if (leaderInfo == null)
-						return InternalServerError("No leader info available in response");
-					return TemporaryRedirect(requestedUri, leaderInfo.Http.GetHost(), leaderInfo.Http.GetPort());
-				}
-				case ClientMessage.NotHandled.Types.NotHandledReason.IsReadOnly: {
-					var leaderInfo = notHandled.LeaderInfo;
-					if (leaderInfo == null)
-						return InternalServerError("No leader info available in response");
-					return DenyRequestBecauseReadOnly(requestedUri, leaderInfo.Http.GetHost(), leaderInfo.Http.GetPort());
-				}
-				default:
-					return InternalServerError(string.Format("Unknown not handled reason: {0}", notHandled.Reason));
-			}
-		}
-
-		public static ResponseConfiguration
-			GetFreshStatsCompleted(HttpResponseConfiguratorArgs entity, Message message) {
-			var completed = message as MonitoringMessage.GetFreshStatsCompleted;
-			if (completed == null)
-				return InternalServerError();
-
-			var cacheSeconds = (int)MonitoringService.MemoizePeriod.TotalSeconds;
-			return completed.Success
-				? Ok(entity.ResponseCodec.ContentType, Helper.UTF8NoBom, null, cacheSeconds, isCachePublic: true)
-				: NotFound();
-		}
-
-		public static ResponseConfiguration GetReplicationStatsCompleted(HttpResponseConfiguratorArgs entity,
-			Message message) {
-			var completed = message as ReplicationMessage.GetReplicationStatsCompleted;
-			if (completed == null)
-				return InternalServerError();
-
-			var cacheSeconds = (int)MonitoringService.MemoizePeriod.TotalSeconds;
-			return Ok(entity.ResponseCodec.ContentType, Helper.UTF8NoBom, null, cacheSeconds, isCachePublic: true);
-		}
-
-		public static ResponseConfiguration GetFreshTcpConnectionStatsCompleted(HttpResponseConfiguratorArgs entity,
-			Message message) {
-			var completed = message as MonitoringMessage.GetFreshTcpConnectionStatsCompleted;
-			if (completed == null)
-				return InternalServerError();
-
-			var cacheSeconds = (int)MonitoringService.MemoizePeriod.TotalSeconds;
-			return Ok(entity.ResponseCodec.ContentType, Helper.UTF8NoBom, null, cacheSeconds, isCachePublic: true);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/ControllerAction.cs b/src/EventStore.Core/Services/Transport/Http/ControllerAction.cs
deleted file mode 100644
index 56f65b509b9..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/ControllerAction.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Plugins.Authorization;
-using EventStore.Transport.Http;
-
-namespace EventStore.Core.Services.Transport.Http {
-	public class ControllerAction {
-		public readonly string UriTemplate;
-		public readonly string HttpMethod;
-		public readonly Func<UriTemplateMatch, Operation> Operation;
-		public readonly ICodec[] SupportedRequestCodecs;
-		public readonly ICodec[] SupportedResponseCodecs;
-		public readonly ICodec DefaultResponseCodec;
-
-		public ControllerAction(string uriTemplate,
-			string httpMethod,
-			ICodec[] requestCodecs,
-			ICodec[] responseCodecs,
-			Operation operation) :this(uriTemplate,httpMethod, requestCodecs, responseCodecs, _=>operation){
-
-		}
-
-		public ControllerAction(string uriTemplate,
-			string httpMethod,
-			ICodec[] requestCodecs,
-			ICodec[] responseCodecs,
-			Func<UriTemplateMatch, Operation> operation) {
-			Ensure.NotNull(uriTemplate, "uriTemplate");
-			Ensure.NotNull(httpMethod, "httpMethod");
-			Ensure.NotNull(requestCodecs, "requestCodecs");
-			Ensure.NotNull(responseCodecs, "responseCodecs");
-
-			UriTemplate = uriTemplate;
-			HttpMethod = httpMethod;
-
-			SupportedRequestCodecs = requestCodecs;
-			SupportedResponseCodecs = responseCodecs;
-			DefaultResponseCodec = responseCodecs.Length > 0 ? responseCodecs[0] : null;
-			Operation = operation;
-		}
-
-		public bool Equals(ControllerAction other) {
-			if (ReferenceEquals(null, other)) return false;
-			if (ReferenceEquals(this, other)) return true;
-			return Equals(other.UriTemplate, UriTemplate) && Equals(other.HttpMethod, HttpMethod);
-		}
-
-		public override bool Equals(object obj) {
-			if (ReferenceEquals(null, obj)) return false;
-			if (ReferenceEquals(this, obj)) return true;
-			if (obj.GetType() != typeof(ControllerAction)) return false;
-			return Equals((ControllerAction)obj);
-		}
-
-		public override int GetHashCode() {
-			unchecked {
-				return (UriTemplate.GetHashCode() * 397) ^ HttpMethod.GetHashCode();
-			}
-		}
-
-		public override string ToString() {
-			return string.Format("UriTemplate: {0}, HttpMethod: {1}, SupportedCodecs: {2}, DefaultCodec: {3}",
-				UriTemplate,
-				HttpMethod,
-				SupportedResponseCodecs,
-				DefaultResponseCodec);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Controllers/AdminController.cs b/src/EventStore.Core/Services/Transport/Http/Controllers/AdminController.cs
deleted file mode 100644
index 012816419d5..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Controllers/AdminController.cs
+++ /dev/null
@@ -1,565 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Globalization;
-using System.Linq;
-using System.Security.Claims;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Plugins.Authorization;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Atom;
-using EventStore.Transport.Http.Codecs;
-using EventStore.Transport.Http.EntityManagement;
-using Microsoft.Extensions.Primitives;
-using Serilog;
-
-namespace EventStore.Core.Services.Transport.Http.Controllers {
-	public class AdminController : CommunicationController {
-		private readonly IPublisher _networkSendQueue;
-		private static readonly ILogger Log = Serilog.Log.ForContext<AdminController>();
-
-		private static readonly ICodec[] SupportedCodecs = new ICodec[]
-			{Codec.Text, Codec.Json, Codec.Xml, Codec.ApplicationXml};
-
-		public static readonly char[] ETagSeparatorArray = { ';' };
-
-		private static readonly Func<UriTemplateMatch, Operation> ReadStreamOperationForScavengeStream =
-			ForScavengeStream(Operations.Streams.Read);
-		public AdminController(IPublisher publisher, IPublisher networkSendQueue) : base(publisher) {
-			_networkSendQueue = networkSendQueue;
-		}
-
-		protected override void SubscribeCore(IHttpService service) {
-			service.RegisterAction(
-				new ControllerAction("/admin/shutdown", HttpMethod.Post, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Shutdown)),
-				OnPostShutdown);
-			service.RegisterAction(
-				new ControllerAction("/admin/reloadconfig", HttpMethod.Post, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.ReloadConfiguration)),
-				OnPostReloadConfig);
-			service.RegisterAction(
-				new ControllerAction("/admin/scavenge?startFromChunk={startFromChunk}&threads={threads}&threshold={threshold}&throttlePercent={throttlePercent}&syncOnly={syncOnly}",
-					HttpMethod.Post, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Scavenge.Start)), OnPostScavenge);
-			service.RegisterAction(
-				new ControllerAction("/admin/scavenge/{scavengeId}", HttpMethod.Delete, Codec.NoCodecs,
-					SupportedCodecs, new Operation(Operations.Node.Scavenge.Stop)), OnStopScavenge);
-			service.RegisterAction(
-				new ControllerAction("/admin/scavenge/current", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Scavenge.Read)),
-				OnGetCurrentScavenge);
-			service.RegisterAction(
-				new ControllerAction("/admin/scavenge/last", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Scavenge.Read)),
-				OnGetLastScavenge);
-			service.RegisterAction(
-				new ControllerAction("/admin/mergeindexes", HttpMethod.Post, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.MergeIndexes)),
-				OnPostMergeIndexes);
-			service.RegisterAction(
-				new ControllerAction("/admin/node/priority/{nodePriority}", HttpMethod.Post, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.SetPriority)),
-				OnSetNodePriority);
-			service.RegisterAction(
-				new ControllerAction("/admin/node/resign", HttpMethod.Post, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Resign)),
-				OnResignNode);
-			service.RegisterAction(
-				new ControllerAction("/admin/login", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Login)),
-				OnGetLogin);
-			Register(service, "/streams/$scavenges/{scavengeId}/{event}/{count}?embed={embed}", HttpMethod.Get, GetStreamEventsBackwardScavenges, Codec.NoCodecs,
-				SupportedCodecs, ReadStreamOperationForScavengeStream);
-			Register(service, "/streams/$scavenges?embed={embed}", HttpMethod.Get, GetStreamEventsBackwardScavenges, Codec.NoCodecs,
-				SupportedCodecs, ReadStreamOperationForScavengeStream);
-		}
-
-		private static Func<UriTemplateMatch, Operation> ForScavengeStream(OperationDefinition definition) {
-			return match => {
-				var operation = new Operation(definition);
-				var stream = "$scavenges";
-				var scavengeId = match.BoundVariables["scavengeId"];
-				if (scavengeId != null)
-					stream = stream + "-" + scavengeId;
-
-				if (!string.IsNullOrEmpty(stream)) {
-					return operation.WithParameter(Operations.Streams.Parameters.StreamId(stream));
-				}
-
-				return operation;
-			};
-		}
-
-		private void OnPostShutdown(HttpEntityManager entity, UriTemplateMatch match) {
-			if (entity.User != null &&
-			    (entity.User.LegacyRoleCheck(SystemRoles.Admins) || entity.User.LegacyRoleCheck(SystemRoles.Operations))) {
-				Log.Information("Request shut down of node because shutdown command has been received.");
-				Publish(new ClientMessage.RequestShutdown(exitProcess: true, shutdownHttp: true));
-				entity.ReplyStatus(HttpStatusCode.OK, "OK", LogReplyError);
-			} else {
-				entity.ReplyStatus(HttpStatusCode.Unauthorized, "Unauthorized", LogReplyError);
-			}
-		}
-
-		private void OnPostReloadConfig(HttpEntityManager entity, UriTemplateMatch match) {
-			if (entity.User != null &&
-			    (entity.User.LegacyRoleCheck(SystemRoles.Admins) || entity.User.LegacyRoleCheck(SystemRoles.Operations))) {
-				Log.Information("Reloading the node's configuration since a request has been received on /admin/reloadconfig.");
-				Publish(new ClientMessage.ReloadConfig());
-				entity.ReplyStatus(HttpStatusCode.OK, "OK", LogReplyError);
-			} else {
-				entity.ReplyStatus(HttpStatusCode.Unauthorized, "Unauthorized", LogReplyError);
-			}
-		}
-
-		private void OnPostMergeIndexes(HttpEntityManager entity, UriTemplateMatch match) {
-			Log.Information("Request merge indexes because /admin/mergeindexes request has been received.");
-
-			var correlationId = Guid.NewGuid();
-			var envelope = new SendToHttpEnvelope(_networkSendQueue, entity,
-				(e, message) => { return e.ResponseCodec.To(new MergeIndexesResultDto(correlationId.ToString())); },
-				(e, message) => {
-					var completed = message as ClientMessage.MergeIndexesResponse;
-					switch (completed?.Result) {
-						case ClientMessage.MergeIndexesResponse.MergeIndexesResult.Started:
-							return Configure.Ok(e.ResponseCodec.ContentType);
-						default:
-							return Configure.InternalServerError();
-					}
-				}
-			);
-
-			Publish(new ClientMessage.MergeIndexes(envelope, correlationId, entity.User));
-		}
-
-		private void OnPostScavenge(HttpEntityManager entity, UriTemplateMatch match) {
-			int startFromChunk = 0;
-			var startFromChunkVariable = match.BoundVariables["startFromChunk"];
-			if (startFromChunkVariable != null) {
-				if (!int.TryParse(startFromChunkVariable, out startFromChunk) || startFromChunk < 0) {
-					SendBadRequest(entity, "startFromChunk must be a positive integer");
-					return;
-				}
-			}
-
-			int threads = 1;
-			var threadsVariable = match.BoundVariables["threads"];
-			if (threadsVariable != null) {
-				if (!int.TryParse(threadsVariable, out threads) || threads < 1) {
-					SendBadRequest(entity, "threads must be a 1 or above");
-					return;
-				}
-			}
-
-			int? threshold = null;
-			var thresholdVariable = match.BoundVariables["threshold"];
-			if (thresholdVariable != null) {
-				if (!int.TryParse(thresholdVariable, out var x)) {
-					SendBadRequest(entity, "threshold must be an integer");
-					return;
-				}
-
-				threshold = x;
-			}
-
-			int? throttlePercent = null;
-			var throttlePercentVariable = match.BoundVariables["throttlePercent"];
-			if (throttlePercentVariable != null) {
-				if (!int.TryParse(throttlePercentVariable, out var x) || x <= 0 || x > 100) {
-					SendBadRequest(entity, "throttlePercent must be between 1 and 100 inclusive");
-					return;
-				}
-
-				if (x != 100 && threads > 1) {
-					SendBadRequest(entity, "throttlePercent must be 100 for a multi-threaded scavenge");
-					return;
-				}
-
-				throttlePercent = x;
-			}
-
-			var syncOnly = false;
-			var syncOnlyVariable = match.BoundVariables["syncOnly"];
-			if (syncOnlyVariable != null) {
-				if (!bool.TryParse(syncOnlyVariable, out var x)) {
-					SendBadRequest(entity, "syncOnly must be a boolean");
-					return;
-				}
-
-				syncOnly = x;
-			}
-
-			var sb = new StringBuilder();
-			var args = new List<object>();
-
-			sb.Append("Request scavenging because /admin/scavenge");
-			sb.Append("?startFromChunk={chunkStartNumber}");
-			args.Add(startFromChunk);
-			sb.Append("&threads={numThreads}");
-			args.Add(threads);
-
-			if (threshold != null) {
-				sb.Append("&threshold={threshold}");
-				args.Add(threshold);
-			}
-
-			if (throttlePercent != null) {
-				sb.Append("&throttlePercent={throttlePercent}");
-				args.Add(throttlePercent);
-			}
-
-			sb.Append("&syncOnly={syncOnly}");
-			args.Add(syncOnly);
-
-			sb.Append(" request has been received.");
-			Log.Information(sb.ToString(), args.ToArray());
-
-			var envelope = new SendToHttpEnvelope<ClientMessage.ScavengeDatabaseStartedResponse>(_networkSendQueue, entity,(e, message) => {
-					return e.To(new ScavengeResultDto(message?.ScavengeId));
-				},
-				(e, message) => {
-					return Configure.Ok(e.ContentType);
-				}, CreateErrorEnvelope(entity)
-			);
-
-			Publish(new ClientMessage.ScavengeDatabase(
-				envelope: envelope,
-				correlationId: Guid.Empty,
-				user: entity.User,
-				startFromChunk: startFromChunk,
-				threads: threads,
-				threshold: threshold,
-				throttlePercent: throttlePercent,
-				syncOnly: syncOnly));
-		}
-
-		private void OnStopScavenge(HttpEntityManager entity, UriTemplateMatch match) {
-			var scavengeId = match.BoundVariables["scavengeId"];
-
-			Log.Information("Stopping scavenge because /admin/scavenge/{scavengeId} DELETE request has been received.",
-				scavengeId);
-
-			var envelope = new SendToHttpEnvelope<ClientMessage.ScavengeDatabaseStoppedResponse>(_networkSendQueue, entity, (e, message) => {
-					return e.To(message?.ScavengeId);
-				},
-				(e, message) => {
-					return Configure.Ok(e.ContentType);
-				}, CreateErrorEnvelope(entity)
-			);
-
-			Publish(new ClientMessage.StopDatabaseScavenge(envelope, Guid.Empty, entity.User, scavengeId));
-		}
-
-		private void OnGetCurrentScavenge(HttpEntityManager entity, UriTemplateMatch match) {
-			Log.Information("/admin/scavenge/current GET request has been received.");
-
-			var envelope = new SendToHttpEnvelope<ClientMessage.ScavengeDatabaseGetCurrentResponse>(
-				_networkSendQueue,
-				entity,
-				(e, message) => {
-					var result = new ScavengeGetCurrentResultDto();
-
-					if (message is not null &&
-					    message.Result == ClientMessage.ScavengeDatabaseGetCurrentResponse.ScavengeResult.InProgress &&
-					    message.ScavengeId is not null) {
-
-						result.ScavengeId = message.ScavengeId;
-						result.ScavengeLink = $"/admin/scavenge/{message.ScavengeId}";
-					}
-
-					return e.To(result);
-				},
-				(e, message) => {
-					return Configure.Ok(e.ContentType);
-				}, CreateErrorEnvelope(entity)
-			);
-
-			Publish(new ClientMessage.GetCurrentDatabaseScavenge(envelope, Guid.Empty, entity.User));
-		}
-
-		private void OnGetLastScavenge(HttpEntityManager entity, UriTemplateMatch match) {
-			Log.Information("/admin/scavenge/last GET request has been received.");
-
-			var envelope = new SendToHttpEnvelope<ClientMessage.ScavengeDatabaseGetLastResponse>(
-				_networkSendQueue,
-				entity,
-				(e, message) => {
-					var result = new ScavengeGetLastResultDto();
-					if (message.ScavengeId is not null) {
-						result.ScavengeId = message.ScavengeId;
-						result.ScavengeLink = $"/admin/scavenge/{message.ScavengeId}";
-					}
-					result.ScavengeResult = message.Result.ToString();
-
-					return e.To(result);
-				},
-				(e, message) => {
-					return Configure.Ok(e.ContentType);
-				}, CreateErrorEnvelope(entity)
-			);
-
-			Publish(new ClientMessage.GetLastDatabaseScavenge(envelope, Guid.Empty, entity.User));
-		}
-
-		private void OnSetNodePriority(HttpEntityManager entity, UriTemplateMatch match) {
-			if (entity.User != null &&
-			    (entity.User.LegacyRoleCheck(SystemRoles.Admins) || entity.User.LegacyRoleCheck(SystemRoles.Operations))) {
-				Log.Information("Request to set node priority.");
-
-				int nodePriority;
-				var nodePriorityVariable = match.BoundVariables["nodePriority"];
-				if (nodePriorityVariable == null) {
-					SendBadRequest(entity, "Could not find expected `nodePriority` in the request body.");
-					return;
-				}
-
-				if (!int.TryParse(nodePriorityVariable, out nodePriority)) {
-					SendBadRequest(entity, "nodePriority must be an integer.");
-					return;
-				}
-
-				Publish(new ClientMessage.SetNodePriority(nodePriority));
-				entity.ReplyStatus(HttpStatusCode.OK, "OK", LogReplyError);
-			} else {
-				entity.ReplyStatus(HttpStatusCode.Unauthorized, "Unauthorized", LogReplyError);
-			}
-		}
-
-		private void OnResignNode(HttpEntityManager entity, UriTemplateMatch match) {
-			if (entity.User != null &&
-			    (entity.User.LegacyRoleCheck(SystemRoles.Admins) || entity.User.LegacyRoleCheck(SystemRoles.Operations))) {
-				Log.Information("Request to resign node.");
-				Publish(new ClientMessage.ResignNode());
-				entity.ReplyStatus(HttpStatusCode.OK, "OK", LogReplyError);
-			} else {
-				entity.ReplyStatus(HttpStatusCode.Unauthorized, "Unauthorized", LogReplyError);
-			}
-		}
-
-		private void OnGetLogin(HttpEntityManager entity, UriTemplateMatch match) {
-			var message = new UserManagementMessage.UserDetailsResult(
-				new UserManagementMessage.UserData(
-					entity.User.Identity.Name,
-					entity.User.Identity.Name,
-					entity.User.Claims.Where(x => x.Type == ClaimTypes.Role).Select(x => x.Value).ToArray(),
-					false,
-					new DateTimeOffset(DateTime.UtcNow)));
-
-			entity.ReplyTextContent(
-				message.ToJson(),
-				HttpStatusCode.OK,
-				"",
-				ContentType.Json,
-				new List<KeyValuePair<string, string>>(),
-				e => Log.Error(e, "Error while writing HTTP response"));
-		}
-
-		private IEnvelope CreateErrorEnvelope(HttpEntityManager http) {
-			return new SendToHttpEnvelope<ClientMessage.ScavengeDatabaseInProgressResponse>(
-				_networkSendQueue,
-				http,
-				ScavengeInProgressFormatter,
-				ScavengeInProgressConfigurator,
-				new SendToHttpEnvelope<ClientMessage.ScavengeDatabaseNotFoundResponse>(
-						_networkSendQueue,
-						http,
-						ScavengeNotFoundFormatter,
-						ScavengeNotFoundConfigurator,
-						new SendToHttpEnvelope<ClientMessage.ScavengeDatabaseUnauthorizedResponse>(
-							_networkSendQueue,
-							http,
-							ScavengeUnauthorizedFormatter,
-							ScavengeUnauthorizedConfigurator,
-							null)));
-		}
-
-		private ResponseConfiguration ScavengeInProgressConfigurator(ICodec codec, ClientMessage.ScavengeDatabaseInProgressResponse message) {
-			return new ResponseConfiguration(HttpStatusCode.BadRequest, "Bad Request", "text/plain", Helper.UTF8NoBom);
-		}
-
-		private string ScavengeInProgressFormatter(ICodec codec, ClientMessage.ScavengeDatabaseInProgressResponse message) {
-			return message.Reason;
-		}
-
-		private ResponseConfiguration ScavengeNotFoundConfigurator(ICodec codec, ClientMessage.ScavengeDatabaseNotFoundResponse message) {
-			return new ResponseConfiguration(HttpStatusCode.NotFound, "Not Found", "text/plain", Helper.UTF8NoBom);
-		}
-
-		private string ScavengeNotFoundFormatter(ICodec codec, ClientMessage.ScavengeDatabaseNotFoundResponse message) {
-			return message.Reason;
-		}
-
-		private ResponseConfiguration ScavengeUnauthorizedConfigurator(ICodec codec, ClientMessage.ScavengeDatabaseUnauthorizedResponse message) {
-			return new ResponseConfiguration(HttpStatusCode.Unauthorized, "Unauthorized", "text/plain", Helper.UTF8NoBom);
-		}
-
-		private string ScavengeUnauthorizedFormatter(ICodec codec, ClientMessage.ScavengeDatabaseUnauthorizedResponse message) {
-			return message.Reason;
-		}
-
-		private void LogReplyError(Exception exc) {
-			Log.Debug("Error while closing HTTP connection (admin controller): {e}.", exc.Message);
-		}
-			private bool GetDescriptionDocument(HttpEntityManager manager, UriTemplateMatch match) {
-			if (manager.ResponseCodec.ContentType == ContentType.DescriptionDocJson) {
-				var stream = match.BoundVariables["stream"];
-				var accepts = (manager.HttpEntity.Request.AcceptTypes?.Length ?? 0) == 0 ||
-				              manager.HttpEntity.Request.AcceptTypes.Contains(ContentType.Any);
-				var responseStatusCode = accepts ? HttpStatusCode.NotAcceptable : HttpStatusCode.OK;
-				var responseMessage = manager.HttpEntity.Request.AcceptTypes == null
-					? "We are unable to represent the stream in the format requested."
-					: "Description Document";
-				var envelope = new SendToHttpEnvelope(
-					_networkSendQueue, manager,
-					(args, message) => {
-						var m = message as MonitoringMessage.GetPersistentSubscriptionStatsCompleted;
-						if (m == null)
-							throw new Exception("Could not get subscriptions for stream " + stream);
-
-						string[] persistentSubscriptionGroups = null;
-						if (m.Result == MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus
-							    .Success) {
-							persistentSubscriptionGroups = m.SubscriptionStats.Select(x => x.GroupName).ToArray();
-						}
-
-						manager.ReplyTextContent(
-							Format.GetDescriptionDocument(manager, stream, persistentSubscriptionGroups),
-							responseStatusCode, responseMessage,
-							manager.ResponseCodec.ContentType,
-							null,
-							e => Log.Error(e, "Error while writing HTTP response"));
-						return String.Empty;
-					},
-					(args, message) => new ResponseConfiguration(HttpStatusCode.OK, manager.ResponseCodec.ContentType,
-						manager.ResponseCodec.Encoding));
-				var cmd = new MonitoringMessage.GetStreamPersistentSubscriptionStats(envelope, stream);
-				Publish(cmd);
-				return true;
-			}
-
-			return false;
-		}
-		private void GetStreamEventsBackwardScavenges(HttpEntityManager manager, UriTemplateMatch match) {
-			if (GetDescriptionDocument(manager, match))
-				return;
-			var stream = "$scavenges";
-			var evNum = match.BoundVariables["event"];
-			var cnt = match.BoundVariables["count"];
-			var scavengeId = match.BoundVariables["scavengeId"];
-
-			long eventNumber = -1;
-			int count = AtomSpecs.FeedPageSize;
-			var embed = GetEmbedLevel(manager, match);
-
-			if (scavengeId != null)
-				stream = stream + "-" + scavengeId;
-
-			if (stream.IsEmptyString()) {
-				SendBadRequest(manager, string.Format("Invalid stream name '{0}'", stream));
-				return;
-			}
-
-			if (evNum != null && evNum != "head" && (!long.TryParse(evNum, out eventNumber) || eventNumber < 0)) {
-				SendBadRequest(manager, string.Format("'{0}' is not valid event number", evNum));
-				return;
-			}
-
-			if (cnt.IsNotEmptyString() && (!int.TryParse(cnt, out count) || count <= 0)) {
-				SendBadRequest(manager, string.Format("'{0}' is not valid count. Should be positive integer", cnt));
-				return;
-			}
-
-			bool resolveLinkTos;
-			if (!GetResolveLinkTos(manager, out resolveLinkTos, true)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.ResolveLinkTos));
-				return;
-			}
-
-			if (!GetRequireLeader(manager, out var requireLeader)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
-				return;
-			}
-
-			bool headOfStream = eventNumber == -1;
-			GetStreamEventsBackward(manager, stream, eventNumber, count, resolveLinkTos, requireLeader, headOfStream,
-				embed);
-		}
-		private void GetStreamEventsBackward(HttpEntityManager manager, string stream, long eventNumber, int count,
-			bool resolveLinkTos, bool requireLeader, bool headOfStream, EmbedLevel embed) {
-			var envelope = new SendToHttpEnvelope(_networkSendQueue,
-				manager,
-				(ent, msg) =>
-					Format.GetStreamEventsBackward(ent, msg, embed, headOfStream),
-				(args, msg) => Configure.GetStreamEventsBackward(args, msg, headOfStream));
-			var corrId = Guid.NewGuid();
-			Publish(new ClientMessage.ReadStreamEventsBackward(corrId, corrId, envelope, stream, eventNumber, count,
-				resolveLinkTos, requireLeader, GetETagStreamVersion(manager), manager.User));
-		}
-		private static EmbedLevel GetEmbedLevel(HttpEntityManager manager, UriTemplateMatch match,
-			EmbedLevel htmlLevel = EmbedLevel.PrettyBody) {
-			if (manager.ResponseCodec is IRichAtomCodec)
-				return htmlLevel;
-			var rawValue = match.BoundVariables["embed"] ?? string.Empty;
-			switch (rawValue.ToLowerInvariant()) {
-				case "content":
-					return EmbedLevel.Content;
-				case "rich":
-					return EmbedLevel.Rich;
-				case "body":
-					return EmbedLevel.Body;
-				case "pretty":
-					return EmbedLevel.PrettyBody;
-				case "tryharder":
-					return EmbedLevel.TryHarder;
-				default:
-					return EmbedLevel.None;
-			}
-		}
-		private bool GetResolveLinkTos(HttpEntityManager manager, out bool resolveLinkTos, bool defaultOption = false) {
-			resolveLinkTos = defaultOption;
-			var linkToHeader = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.ResolveLinkTos);
-			if (StringValues.IsNullOrEmpty(linkToHeader))
-				return true;
-			if (string.Equals(linkToHeader, "False", StringComparison.OrdinalIgnoreCase)) {
-				return true;
-			}
-
-			if (string.Equals(linkToHeader, "True", StringComparison.OrdinalIgnoreCase)) {
-				resolveLinkTos = true;
-				return true;
-			}
-
-			return false;
-		}
-		private bool GetRequireLeader(HttpEntityManager manager, out bool requireLeader) {
-			requireLeader = false;
-
-			var onlyLeader = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.RequireLeader);
-			var onlyMaster = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.RequireMaster);
-
-			if (StringValues.IsNullOrEmpty(onlyLeader) && StringValues.IsNullOrEmpty(onlyMaster))
-				return true;
-
-			if (string.Equals(onlyLeader, "True", StringComparison.OrdinalIgnoreCase) ||
-			    string.Equals(onlyMaster, "True", StringComparison.OrdinalIgnoreCase)) {
-				requireLeader = true;
-				return true;
-			}
-
-			return string.Equals(onlyLeader, "False", StringComparison.OrdinalIgnoreCase) ||
-			       string.Equals(onlyMaster, "False", StringComparison.OrdinalIgnoreCase);
-		}
-		private long? GetETagStreamVersion(HttpEntityManager manager) {
-			var etag = manager.HttpEntity.Request.GetHeaderValues("If-None-Match");
-			if (!StringValues.IsNullOrEmpty(etag)) {
-				// etag format is version;contenttypehash
-				var splitted = etag.ToString().Trim('\"').Split(ETagSeparatorArray);
-				if (splitted.Length == 2) {
-					var typeHash = manager.ResponseCodec.ContentType.GetHashCode()
-						.ToString(CultureInfo.InvariantCulture);
-					var res = splitted[1] == typeHash && long.TryParse(splitted[0], out var streamVersion)
-						? (long?)streamVersion
-						: null;
-					return res;
-				}
-			}
-
-			return null;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Controllers/AtomController.cs b/src/EventStore.Core/Services/Transport/Http/Controllers/AtomController.cs
deleted file mode 100644
index 649e93e2b7e..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Controllers/AtomController.cs
+++ /dev/null
@@ -1,1131 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Settings;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Atom;
-using EventStore.Transport.Http.Codecs;
-using EventStore.Transport.Http.EntityManagement;
-using Newtonsoft.Json;
-using System.Linq;
-using System.Threading;
-using EventStore.Client.Messages;
-using EventStore.Common.Utils;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Util;
-using EventStore.Plugins.Authorization;
-using Microsoft.Extensions.Primitives;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Transport.Http.Controllers {
-	public enum EmbedLevel {
-		None,
-		Content,
-		Rich,
-		Body,
-		PrettyBody,
-		TryHarder
-	}
-
-	public class AtomController : CommunicationController {
-		public const char ETagSeparator = ';';
-		public static readonly char[] ETagSeparatorArray = { ';' };
-
-		private static readonly ILogger Log = Serilog.Log.ForContext<AtomController>();
-
-		private static readonly HtmlFeedCodec HtmlFeedCodec = new HtmlFeedCodec(); // initialization order matters
-
-		private static readonly Func<UriTemplateMatch, Operation> ReadStreamOperation =
-			ForStream(Operations.Streams.Read);
-
-		private static readonly Operation RedirectOperation = new Operation(Operations.Node.Redirect);
-		private static readonly Operation ReadForAllOperation = new Operation(Operations.Streams.Read).WithParameter(Operations.Streams.Parameters.StreamId(SystemStreams.AllStream));
-
-		private static readonly ICodec[] AtomCodecsWithoutBatches = {
-			Codec.EventStoreXmlCodec,
-			Codec.EventStoreJsonCodec,
-			Codec.Xml,
-			Codec.ApplicationXml,
-			Codec.Json
-		};
-
-		private static readonly ICodec[] AtomCodecs = {
-			Codec.DescriptionJson,
-			Codec.EventStoreXmlCodec,
-			Codec.EventStoreJsonCodec,
-			Codec.Xml,
-			Codec.ApplicationXml,
-			Codec.Json,
-			Codec.EventXml,
-			Codec.EventJson,
-			Codec.EventsXml,
-			Codec.EventsJson,
-			Codec.Raw,
-		};
-
-		private static readonly ICodec[] AtomWithHtmlCodecs = {
-			Codec.DescriptionJson,
-			Codec.EventStoreXmlCodec,
-			Codec.EventStoreJsonCodec,
-			Codec.Xml,
-			Codec.ApplicationXml,
-			Codec.Json,
-			Codec.EventXml,
-			Codec.EventJson,
-			Codec.EventsXml,
-			Codec.EventsJson,
-			HtmlFeedCodec // initialization order matters
-		};
-
-		private static readonly ICodec[] DefaultCodecs = {
-			Codec.EventStoreXmlCodec,
-			Codec.EventStoreJsonCodec,
-			Codec.Xml,
-			Codec.ApplicationXml,
-			Codec.Json,
-			Codec.EventXml,
-			Codec.EventJson,
-			Codec.Raw,
-			HtmlFeedCodec // initialization order matters
-		};
-
-		private readonly IPublisher _networkSendQueue;
-		private readonly TimeSpan _writeTimeout;
-
-		public AtomController(IPublisher publisher, IPublisher networkSendQueue,
-			bool disableHTTPCaching, TimeSpan writeTimeout) : base(publisher) {
-			_networkSendQueue = networkSendQueue;
-			_writeTimeout = writeTimeout;
-
-			if (disableHTTPCaching) {
-				// ReSharper disable once RedundantNameQualifier
-				Transport.Http.Configure.DisableHTTPCaching = true;
-			}
-		}
-
-		protected override void SubscribeCore(IHttpService http) {
-			// STREAMS
-			Register(http, "/streams/{stream}", HttpMethod.Post, PostEvents, AtomCodecs, AtomCodecs,
-				ForStream(Operations.Streams.Write));
-			Register(http, "/streams/{stream}", HttpMethod.Delete, DeleteStream, Codec.NoCodecs, AtomCodecs,
-				ForStream(Operations.Streams.Delete));
-
-			Register(http, "/streams/{stream}/incoming/{guid}", HttpMethod.Post, PostEventsIdempotent,
-				AtomCodecsWithoutBatches, AtomCodecsWithoutBatches, ForStream(Operations.Streams.Write));
-
-			Register(http, "/streams/{stream}/", HttpMethod.Post, RedirectKeepVerb, AtomCodecs, AtomCodecs,
-				RedirectOperation);
-			Register(http, "/streams/{stream}/", HttpMethod.Delete, RedirectKeepVerb, Codec.NoCodecs, AtomCodecs,
-				RedirectOperation);
-			Register(http, "/streams/{stream}/", HttpMethod.Get, RedirectKeepVerb, Codec.NoCodecs, AtomCodecs,
-				RedirectOperation);
-
-			Register(http, "/streams/{stream}?embed={embed}", HttpMethod.Get, GetStreamEventsBackward, Codec.NoCodecs,
-				AtomWithHtmlCodecs, ReadStreamOperation);
-
-			Register(http, "/streams/{stream}/{event}?embed={embed}", HttpMethod.Get, GetStreamEvent, Codec.NoCodecs,
-				DefaultCodecs, ReadStreamOperation);
-			Register(http, "/streams/{stream}/{event}/{count}?embed={embed}", HttpMethod.Get, GetStreamEventsBackward,
-				Codec.NoCodecs, AtomWithHtmlCodecs, ReadStreamOperation);
-			Register(http, "/streams/{stream}/{event}/backward/{count}?embed={embed}", HttpMethod.Get,
-				GetStreamEventsBackward, Codec.NoCodecs, AtomWithHtmlCodecs, ReadStreamOperation);
-			RegisterCustom(http, "/streams/{stream}/{event}/forward/{count}?embed={embed}", HttpMethod.Get,
-				GetStreamEventsForward, Codec.NoCodecs, AtomWithHtmlCodecs, ReadStreamOperation);
-
-			// METASTREAMS
-			Register(http, "/streams/{stream}/metadata", HttpMethod.Post, PostMetastreamEvent, AtomCodecs, AtomCodecs,
-				ForStream(Operations.Streams.MetadataWrite));
-			Register(http, "/streams/{stream}/metadata/", HttpMethod.Post, RedirectKeepVerb, AtomCodecs, AtomCodecs,
-				RedirectOperation);
-
-			Register(http, "/streams/{stream}/metadata?embed={embed}", HttpMethod.Get, GetMetastreamEvent,
-				Codec.NoCodecs, DefaultCodecs, ForStream(Operations.Streams.MetadataRead));
-			Register(http, "/streams/{stream}/metadata/?embed={embed}", HttpMethod.Get, RedirectKeepVerb,
-				Codec.NoCodecs, DefaultCodecs, RedirectOperation);
-			Register(http, "/streams/{stream}/metadata/{event}?embed={embed}", HttpMethod.Get, GetMetastreamEvent,
-				Codec.NoCodecs, DefaultCodecs, ForStream(Operations.Streams.MetadataRead));
-
-			Register(http, "/streams/{stream}/metadata/{event}/{count}?embed={embed}", HttpMethod.Get,
-				GetMetastreamEventsBackward, Codec.NoCodecs, AtomWithHtmlCodecs, ForStream(Operations.Streams.MetadataRead));
-			Register(http, "/streams/{stream}/metadata/{event}/backward/{count}?embed={embed}", HttpMethod.Get,
-				GetMetastreamEventsBackward, Codec.NoCodecs, AtomWithHtmlCodecs, ForStream(Operations.Streams.MetadataRead));
-			RegisterCustom(http, "/streams/{stream}/metadata/{event}/forward/{count}?embed={embed}", HttpMethod.Get,
-				GetMetastreamEventsForward, Codec.NoCodecs, AtomWithHtmlCodecs, ForStream(Operations.Streams.MetadataRead));
-
-			// $ALL Filtered
-			const string querystring =
-				"?embed={embed}&context={context}&type={type}&data={data}&exclude-system-events={exclude-system-events}";
-
-			Register(http,
-				"/streams/$all/filtered" + querystring,
-				HttpMethod.Get, GetAllEventsBackwardFiltered, Codec.NoCodecs,
-				AtomWithHtmlCodecs, ReadForAllOperation);
-			Register(http,
-				"/streams/$all/filtered/{position}/{count}" + querystring,
-				HttpMethod.Get, GetAllEventsBackwardFiltered,
-				Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
-			Register(http,
-				"/streams/$all/filtered/{position}/backward/{count}" + querystring,
-				HttpMethod.Get,
-				GetAllEventsBackwardFiltered, Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
-			RegisterCustom(http,
-				"/streams/$all/filtered/{position}/forward/{count}" + querystring,
-				HttpMethod.Get,
-				GetAllEventsForwardFiltered, Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
-			Register(http,
-				"/streams/%24all/filtered" + querystring,
-				HttpMethod.Get, GetAllEventsBackwardFiltered, Codec.NoCodecs,
-				AtomWithHtmlCodecs, ReadForAllOperation);
-			Register(http,
-				"/streams/%24all/filtered/{position}/{count}" + querystring,
-				HttpMethod.Get, GetAllEventsBackwardFiltered,
-				Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
-			Register(http,
-				"/streams/%24all/filtered/{position}/backward/{count}" + querystring,
-				HttpMethod.Get,
-				GetAllEventsBackwardFiltered, Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
-			RegisterCustom(http,
-				"/streams/%24all/filtered/{position}/forward/{count}" + querystring,
-				HttpMethod.Get,
-				GetAllEventsForwardFiltered, Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
-
-			// $ALL
-			Register(http, "/streams/$all/", HttpMethod.Get, RedirectKeepVerb, Codec.NoCodecs, AtomWithHtmlCodecs,
-				RedirectOperation);
-			Register(http, "/streams/%24all/", HttpMethod.Get, RedirectKeepVerb, Codec.NoCodecs, AtomWithHtmlCodecs,
-				RedirectOperation);
-			Register(http, "/streams/$all?embed={embed}", HttpMethod.Get, GetAllEventsBackward, Codec.NoCodecs,
-				AtomWithHtmlCodecs, ReadForAllOperation);
-			Register(http, "/streams/$all/{position}/{count}?embed={embed}", HttpMethod.Get, GetAllEventsBackward,
-				Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
-			Register(http, "/streams/$all/{position}/backward/{count}?embed={embed}", HttpMethod.Get,
-				GetAllEventsBackward, Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
-			RegisterCustom(http, "/streams/$all/{position}/forward/{count}?embed={embed}", HttpMethod.Get,
-				GetAllEventsForward, Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
-			Register(http, "/streams/%24all?embed={embed}", HttpMethod.Get, GetAllEventsBackward, Codec.NoCodecs,
-				AtomWithHtmlCodecs, ReadForAllOperation);
-			Register(http, "/streams/%24all/{position}/{count}?embed={embed}", HttpMethod.Get, GetAllEventsBackward,
-				Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
-			Register(http, "/streams/%24all/{position}/backward/{count}?embed={embed}", HttpMethod.Get,
-				GetAllEventsBackward, Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
-			RegisterCustom(http, "/streams/%24all/{position}/forward/{count}?embed={embed}", HttpMethod.Get,
-				GetAllEventsForward, Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
-		}
-
-		private static Func<UriTemplateMatch, Operation> ForStream(OperationDefinition definition) {
-			return match => {
-				var operation = new Operation(definition);
-				var stream = match.BoundVariables["stream"];
-				if (!string.IsNullOrEmpty(stream)) {
-					return operation.WithParameter(Operations.Streams.Parameters.StreamId(stream));
-				}
-
-				return operation;
-			};
-		}
-
-		private bool GetDescriptionDocument(HttpEntityManager manager, UriTemplateMatch match) {
-			if (manager.ResponseCodec.ContentType == ContentType.DescriptionDocJson) {
-				var stream = match.BoundVariables["stream"];
-				var accepts = (manager.HttpEntity.Request.AcceptTypes?.Length ?? 0) == 0 ||
-							  manager.HttpEntity.Request.AcceptTypes.Contains(ContentType.Any);
-				var responseStatusCode = accepts ? HttpStatusCode.NotAcceptable : HttpStatusCode.OK;
-				var responseMessage = manager.HttpEntity.Request.AcceptTypes == null
-					? "We are unable to represent the stream in the format requested."
-					: "Description Document";
-				var envelope = new SendToHttpEnvelope(
-					_networkSendQueue, manager,
-					(args, message) => {
-						var m = message as MonitoringMessage.GetPersistentSubscriptionStatsCompleted;
-						if (m == null)
-							throw new Exception("Could not get subscriptions for stream " + stream);
-
-						string[] persistentSubscriptionGroups = null;
-						if (m.Result == MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus
-								.Success) {
-							persistentSubscriptionGroups = m.SubscriptionStats.Select(x => x.GroupName).ToArray();
-						}
-
-						manager.ReplyTextContent(
-							Format.GetDescriptionDocument(manager, stream, persistentSubscriptionGroups),
-							responseStatusCode, responseMessage,
-							manager.ResponseCodec.ContentType,
-							null,
-							e => Log.Error(e, "Error while writing HTTP response"));
-						return String.Empty;
-					},
-					(args, message) => new ResponseConfiguration(HttpStatusCode.OK, manager.ResponseCodec.ContentType,
-						manager.ResponseCodec.Encoding));
-				var cmd = new MonitoringMessage.GetStreamPersistentSubscriptionStats(envelope, stream);
-				Publish(cmd);
-				return true;
-			}
-
-			return false;
-		}
-
-		private void RedirectKeepVerb(HttpEntityManager httpEntity, UriTemplateMatch uriTemplateMatch) {
-			var original = uriTemplateMatch.RequestUri.ToString();
-			var header = new[] {
-				new KeyValuePair<string, string>("Location", original.Substring(0, original.Length - 1)),
-				new KeyValuePair<string, string>("Cache-Control", "max-age=31536000, public"),
-			};
-			httpEntity.ReplyTextContent("Moved Permanently", HttpStatusCode.RedirectKeepVerb, "", "", header, e => { });
-		}
-
-		// STREAMS
-		private void PostEvents(HttpEntityManager manager, UriTemplateMatch match) {
-			var stream = match.BoundVariables["stream"];
-			if (stream.IsEmptyString()) {
-				SendBadRequest(manager, string.Format("Invalid request. Stream must be non-empty string"));
-				return;
-			}
-
-			string includedType;
-			if (!GetIncludedType(manager, out includedType)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.EventType));
-				return;
-			}
-
-			if (!manager.RequestCodec.HasEventTypes && includedType == null) {
-				SendBadRequest(manager,
-					"Must include an event type with the request either in body or as ES-EventType header.");
-				return;
-			}
-
-			Guid includedId;
-			if (!GetIncludedId(manager, out includedId)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.EventId));
-				return;
-			}
-
-			if (!manager.RequestCodec.HasEventIds && includedId == Guid.Empty) {
-				var uri = new Uri(new Uri(match.RequestUri + "/"), "incoming/" + Guid.NewGuid()).ToString();
-				var header = new[]
-					{new KeyValuePair<string, string>("Location", uri)};
-				manager.ReplyTextContent("Forwarding to idempotent URI", HttpStatusCode.RedirectKeepVerb,
-					"Temporary Redirect", "text/plain", header, e => { });
-				return;
-			}
-
-			long expectedVersion;
-			if (!GetExpectedVersion(manager, out expectedVersion)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.ExpectedVersion));
-				return;
-			}
-
-			if (!GetRequireLeader(manager, out var requireLeader)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
-				return;
-			}
-
-			PostEntry(manager, expectedVersion, requireLeader, stream, includedId, includedType);
-		}
-
-		private void PostEventsIdempotent(HttpEntityManager manager, UriTemplateMatch match) {
-			var stream = match.BoundVariables["stream"];
-			var guid = match.BoundVariables["guid"];
-			Guid id;
-			if (!Guid.TryParse(guid, out id)) {
-				SendBadRequest(manager, string.Format("Invalid request. Unable to parse guid"));
-				return;
-			}
-
-			if (stream.IsEmptyString()) {
-				SendBadRequest(manager, string.Format("Invalid request. Stream must be non-empty string"));
-				return;
-			}
-
-			string includedType;
-			if (!GetIncludedType(manager, out includedType)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.EventType));
-				return;
-			}
-
-			long expectedVersion;
-			if (!GetExpectedVersion(manager, out expectedVersion)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.ExpectedVersion));
-				return;
-			}
-
-			if (!GetRequireLeader(manager, out var requireLeader)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
-				return;
-			}
-
-			PostEntry(manager, expectedVersion, requireLeader, stream, id, includedType);
-		}
-
-		private void DeleteStream(HttpEntityManager manager, UriTemplateMatch match) {
-			var stream = match.BoundVariables["stream"];
-			if (stream.IsEmptyString()) {
-				SendBadRequest(manager, string.Format("Invalid stream name '{0}'", stream));
-				return;
-			}
-
-			long expectedVersion;
-			if (!GetExpectedVersion(manager, out expectedVersion)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.ExpectedVersion));
-				return;
-			}
-
-			if (!GetRequireLeader(manager, out var requireLeader)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
-				return;
-			}
-
-			bool hardDelete;
-			if (!GetHardDelete(manager, out hardDelete)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.HardDelete));
-				return;
-			}
-
-			var cts = CancellationTokenSource.CreateLinkedTokenSource(manager.HttpEntity.Context.RequestAborted);
-			var envelope = new SendToHttpEnvelope(_networkSendQueue, manager, Format.DeleteStreamCompleted,
-				ConfigureResponse);
-			var corrId = Guid.NewGuid();
-			cts.CancelAfter(_writeTimeout);
-			Publish(new ClientMessage.DeleteStream(corrId, corrId, envelope, requireLeader, stream, expectedVersion,
-				hardDelete, manager.User, cancellationToken: manager.HttpEntity.Context.RequestAborted));
-
-			ResponseConfiguration ConfigureResponse(HttpResponseConfiguratorArgs args, Message message) {
-				cts.Dispose();
-				return Configure.DeleteStreamCompleted(args, message);
-			}
-		}
-
-		private void GetStreamEvent(HttpEntityManager manager, UriTemplateMatch match) {
-			var stream = match.BoundVariables["stream"];
-			var evNum = match.BoundVariables["event"];
-
-			long eventNumber = -1;
-			var embed = GetEmbedLevel(manager, match, EmbedLevel.TryHarder);
-
-			if (stream.IsEmptyString()) {
-				SendBadRequest(manager, string.Format("Invalid stream name '{0}'", stream));
-				return;
-			}
-
-			if (evNum != "head" && (!long.TryParse(evNum, out eventNumber) || eventNumber < 0)) {
-				SendBadRequest(manager, string.Format("'{0}' is not valid event number", evNum));
-				return;
-			}
-
-			bool resolveLinkTos;
-			if (!GetResolveLinkTos(manager, out resolveLinkTos, true)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.ResolveLinkTos));
-				return;
-			}
-
-			if (!GetRequireLeader(manager, out var requireLeader)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
-				return;
-			}
-
-			GetStreamEvent(manager, stream, eventNumber, resolveLinkTos, requireLeader, embed);
-		}
-
-		private void GetStreamEventsBackward(HttpEntityManager manager, UriTemplateMatch match) {
-			if (GetDescriptionDocument(manager, match))
-				return;
-
-			var stream = match.BoundVariables["stream"];
-			var evNum = match.BoundVariables["event"];
-			var cnt = match.BoundVariables["count"];
-
-			long eventNumber = -1;
-			int count = AtomSpecs.FeedPageSize;
-			var embed = GetEmbedLevel(manager, match);
-
-			if (stream.IsEmptyString()) {
-				SendBadRequest(manager, string.Format("Invalid stream name '{0}'", stream));
-				return;
-			}
-
-			if (evNum != null && evNum != "head" && (!long.TryParse(evNum, out eventNumber) || eventNumber < 0)) {
-				SendBadRequest(manager, string.Format("'{0}' is not valid event number", evNum));
-				return;
-			}
-
-			if (cnt.IsNotEmptyString() && (!int.TryParse(cnt, out count) || count <= 0)) {
-				SendBadRequest(manager, string.Format("'{0}' is not valid count. Should be positive integer", cnt));
-				return;
-			}
-
-			bool resolveLinkTos;
-			if (!GetResolveLinkTos(manager, out resolveLinkTos, true)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.ResolveLinkTos));
-				return;
-			}
-
-			if (!GetRequireLeader(manager, out var requireLeader)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
-				return;
-			}
-
-			bool headOfStream = eventNumber == -1;
-			GetStreamEventsBackward(manager, stream, eventNumber, count, resolveLinkTos, requireLeader, headOfStream,
-				embed);
-		}
-
-		private RequestParams GetStreamEventsForward(HttpEntityManager manager, UriTemplateMatch match) {
-			var stream = match.BoundVariables["stream"];
-			var evNum = match.BoundVariables["event"];
-			var cnt = match.BoundVariables["count"];
-
-			long eventNumber;
-			int count;
-			var embed = GetEmbedLevel(manager, match);
-
-			if (stream.IsEmptyString())
-				return SendBadRequest(manager, string.Format("Invalid stream name '{0}'", stream));
-			if (evNum.IsEmptyString() || !long.TryParse(evNum, out eventNumber) || eventNumber < 0)
-				return SendBadRequest(manager, string.Format("'{0}' is not valid event number", evNum));
-			if (cnt.IsEmptyString() || !int.TryParse(cnt, out count) || count <= 0)
-				return SendBadRequest(manager,
-					string.Format("'{0}' is not valid count. Should be positive integer", cnt));
-			bool resolveLinkTos;
-			if (!GetResolveLinkTos(manager, out resolveLinkTos, true))
-				return SendBadRequest(manager,
-					string.Format("{0} header in wrong format.", SystemHeaders.ResolveLinkTos));
-			if (!GetRequireLeader(manager, out var requireLeader))
-				return SendBadRequest(manager,
-					string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
-			TimeSpan? longPollTimeout;
-			if (!GetLongPoll(manager, out longPollTimeout))
-				return SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.LongPoll));
-			var etag = GetETagStreamVersion(manager);
-
-			GetStreamEventsForward(manager, stream, eventNumber, count, resolveLinkTos, requireLeader, etag,
-				longPollTimeout, embed);
-			return new RequestParams((longPollTimeout ?? TimeSpan.Zero) + ESConsts.HttpTimeout);
-		}
-
-		// METASTREAMS
-		private void PostMetastreamEvent(HttpEntityManager manager, UriTemplateMatch match) {
-			var stream = match.BoundVariables["stream"];
-			if (stream.IsEmptyString() || SystemStreams.IsMetastream(stream)) {
-				SendBadRequest(manager,
-					string.Format("Invalid request. Stream must be non-empty string and should not be metastream"));
-				return;
-			}
-
-			Guid includedId;
-			if (!GetIncludedId(manager, out includedId)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.EventId));
-				return;
-			}
-
-			string foo;
-			GetIncludedType(manager, out foo);
-			if (!(foo == null || foo == SystemEventTypes.StreamMetadata)) {
-				SendBadRequest(manager, "Bad Request. You should not include an event type for metadata.");
-				return;
-			}
-
-			const string includedType = SystemEventTypes.StreamMetadata;
-			long expectedVersion;
-			if (!GetExpectedVersion(manager, out expectedVersion)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.ExpectedVersion));
-				return;
-			}
-
-			if (!GetRequireLeader(manager, out var requireLeader)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
-				return;
-			}
-
-			PostEntry(manager, expectedVersion, requireLeader, SystemStreams.MetastreamOf(stream), includedId,
-				includedType);
-		}
-
-		private void GetMetastreamEvent(HttpEntityManager manager, UriTemplateMatch match) {
-			var stream = match.BoundVariables["stream"];
-			var evNum = match.BoundVariables["event"];
-
-			long eventNumber = -1;
-			var embed = GetEmbedLevel(manager, match, EmbedLevel.TryHarder);
-
-			if (stream.IsEmptyString() || SystemStreams.IsMetastream(stream)) {
-				SendBadRequest(manager, "Stream must be non-empty string and should not be metastream");
-				return;
-			}
-
-			if (evNum != null && evNum != "head" && (!long.TryParse(evNum, out eventNumber) || eventNumber < 0)) {
-				SendBadRequest(manager, string.Format("'{0}' is not valid event number", evNum));
-				return;
-			}
-
-			bool resolveLinkTos;
-			if (!GetResolveLinkTos(manager, out resolveLinkTos)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.ResolveLinkTos));
-				return;
-			}
-
-			if (!GetRequireLeader(manager, out var requireLeader)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
-				return;
-			}
-
-			GetStreamEvent(manager, SystemStreams.MetastreamOf(stream), eventNumber, resolveLinkTos, requireLeader,
-				embed);
-		}
-
-		private void GetMetastreamEventsBackward(HttpEntityManager manager, UriTemplateMatch match) {
-			var stream = match.BoundVariables["stream"];
-			var evNum = match.BoundVariables["event"];
-			var cnt = match.BoundVariables["count"];
-
-			long eventNumber = -1;
-			int count = AtomSpecs.FeedPageSize;
-			var embed = GetEmbedLevel(manager, match);
-
-			if (stream.IsEmptyString() || SystemStreams.IsMetastream(stream)) {
-				SendBadRequest(manager, string.Format("Invalid stream name '{0}'", stream));
-				return;
-			}
-
-			if (evNum != null && evNum != "head" && (!long.TryParse(evNum, out eventNumber) || eventNumber < 0)) {
-				SendBadRequest(manager, string.Format("'{0}' is not valid event number", evNum));
-				return;
-			}
-
-			if (cnt.IsNotEmptyString() && (!int.TryParse(cnt, out count) || count <= 0)) {
-				SendBadRequest(manager, string.Format("'{0}' is not valid count. Should be positive integer", cnt));
-				return;
-			}
-
-			bool resolveLinkTos;
-			if (!GetResolveLinkTos(manager, out resolveLinkTos)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.ResolveLinkTos));
-				return;
-			}
-
-			if (!GetRequireLeader(manager, out var requireLeader)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
-				return;
-			}
-
-			bool headOfStream = eventNumber == -1;
-			GetStreamEventsBackward(manager, SystemStreams.MetastreamOf(stream), eventNumber, count,
-				resolveLinkTos, requireLeader, headOfStream, embed);
-		}
-
-		private RequestParams GetMetastreamEventsForward(HttpEntityManager manager, UriTemplateMatch match) {
-			var stream = match.BoundVariables["stream"];
-			var evNum = match.BoundVariables["event"];
-			var cnt = match.BoundVariables["count"];
-
-			long eventNumber;
-			int count;
-			var embed = GetEmbedLevel(manager, match);
-
-			if (stream.IsEmptyString() || SystemStreams.IsMetastream(stream))
-				return SendBadRequest(manager, string.Format("Invalid stream name '{0}'", stream));
-			if (evNum.IsEmptyString() || !long.TryParse(evNum, out eventNumber) || eventNumber < 0)
-				return SendBadRequest(manager, string.Format("'{0}' is not valid event number", evNum));
-			if (cnt.IsEmptyString() || !int.TryParse(cnt, out count) || count <= 0)
-				return SendBadRequest(manager,
-					string.Format("'{0}' is not valid count. Should be positive integer", cnt));
-			bool resolveLinkTos;
-			if (!GetResolveLinkTos(manager, out resolveLinkTos))
-				return SendBadRequest(manager,
-					string.Format("{0} header in wrong format.", SystemHeaders.ResolveLinkTos));
-			if (!GetRequireLeader(manager, out var requireLeader))
-				return SendBadRequest(manager,
-					string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
-			TimeSpan? longPollTimeout;
-			if (!GetLongPoll(manager, out longPollTimeout))
-				return SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.LongPoll));
-			var etag = GetETagStreamVersion(manager);
-
-			GetStreamEventsForward(manager, SystemStreams.MetastreamOf(stream), eventNumber, count, resolveLinkTos,
-				requireLeader, etag, longPollTimeout, embed);
-			return new RequestParams((longPollTimeout ?? TimeSpan.Zero) + ESConsts.HttpTimeout);
-		}
-
-		// $ALL
-		private void GetAllEventsBackward(HttpEntityManager manager, UriTemplateMatch match) {
-			var pos = match.BoundVariables["position"];
-			var cnt = match.BoundVariables["count"];
-
-			TFPos position = TFPos.HeadOfTf;
-			int count = AtomSpecs.FeedPageSize;
-			var embed = GetEmbedLevel(manager, match);
-
-			if (pos != null && pos != "head"
-							&& (!TFPos.TryParse(pos, out position) || position.PreparePosition < 0 ||
-								position.CommitPosition < 0)) {
-				SendBadRequest(manager, string.Format("Invalid position argument: {0}", pos));
-				return;
-			}
-
-			if (cnt.IsNotEmptyString() && (!int.TryParse(cnt, out count) || count <= 0)) {
-				SendBadRequest(manager, string.Format("Invalid count argument: {0}", cnt));
-				return;
-			}
-
-			if (!GetResolveLinkTos(manager, out var resolveLinkTos)) {
-				SendBadRequest(manager, $"{SystemHeaders.ResolveLinkTos} header in wrong format.");
-			}
-			if (!GetRequireLeader(manager, out var requireLeader)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
-				return;
-			}
-
-			var envelope = new SendToHttpEnvelope(_networkSendQueue,
-				manager,
-				(args, msg) => Format.ReadAllEventsBackwardCompleted(args, msg, embed),
-				(args, msg) => Configure.ReadAllEventsBackwardCompleted(args, msg, position == TFPos.HeadOfTf));
-			var corrId = Guid.NewGuid();
-			Publish(new ClientMessage.ReadAllEventsBackward(corrId, corrId, envelope,
-				position.CommitPosition, position.PreparePosition, count, resolveLinkTos,
-				requireLeader, GetETagTFPosition(manager), manager.User));
-		}
-
-		private void GetAllEventsBackwardFiltered(HttpEntityManager manager, UriTemplateMatch match) {
-			var pos = match.BoundVariables["position"];
-			var cnt = match.BoundVariables["count"];
-
-			var (success, errorMessage) = GetFilterFromQueryString(match, true, out var filter);
-			if (!success) {
-				SendBadRequest(manager, errorMessage);
-				return;
-			}
-
-			TFPos position = TFPos.HeadOfTf;
-			int count = AtomSpecs.FeedPageSize;
-			var embed = GetEmbedLevel(manager, match);
-
-			if (pos != null && pos != "head"
-							&& (!TFPos.TryParse(pos, out position) || position.PreparePosition < 0 ||
-								position.CommitPosition < 0)) {
-				SendBadRequest(manager, string.Format("Invalid position argument: {0}", pos));
-				return;
-			}
-
-			if (cnt.IsNotEmptyString() && (!int.TryParse(cnt, out count) || count <= 0)) {
-				SendBadRequest(manager, string.Format("Invalid count argument: {0}", cnt));
-				return;
-			}
-
-			if (!GetRequireLeader(manager, out var requireLeader)) {
-				SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
-				return;
-			}
-
-			var envelope = new SendToHttpEnvelope(_networkSendQueue,
-				manager,
-				(args, msg) => Format.ReadAllEventsBackwardFilteredCompleted(args, msg, embed),
-				(args, msg) => Configure.ReadAllEventsBackwardFilteredCompleted(args, msg, position == TFPos.HeadOfTf));
-			var corrId = Guid.NewGuid();
-			Publish(new ClientMessage.FilteredReadAllEventsBackward(corrId, corrId, envelope,
-				position.CommitPosition, position.PreparePosition, count,
-				requireLeader, true, count, GetETagTFPosition(manager), filter, manager.User));
-		}
-
-
-
-		private RequestParams GetAllEventsForward(HttpEntityManager manager, UriTemplateMatch match) {
-			var pos = match.BoundVariables["position"];
-			var cnt = match.BoundVariables["count"];
-
-			TFPos position;
-			int count;
-			var embed = GetEmbedLevel(manager, match);
-
-			if (!TFPos.TryParse(pos, out position) || position.PreparePosition < 0 || position.CommitPosition < 0)
-				return SendBadRequest(manager, string.Format("Invalid position argument: {0}", pos));
-			if (!int.TryParse(cnt, out count) || count <= 0)
-				return SendBadRequest(manager, string.Format("Invalid count argument: {0}", cnt));
-			if (!GetResolveLinkTos(manager, out var resolveLinkTos))
-				return SendBadRequest(manager, $"{SystemHeaders.ResolveLinkTos} header in wrong format.");
-			if (!GetRequireLeader(manager, out var requireLeader))
-				return SendBadRequest(manager,
-					string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
-			TimeSpan? longPollTimeout;
-			if (!GetLongPoll(manager, out longPollTimeout))
-				return SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.LongPoll));
-
-			var envelope = new SendToHttpEnvelope(_networkSendQueue,
-				manager,
-				(args, msg) => Format.ReadAllEventsForwardCompleted(args, msg, embed),
-				(args, msg) => Configure.ReadAllEventsForwardCompleted(args, msg, headOfTf: false));
-			var corrId = Guid.NewGuid();
-			Publish(new ClientMessage.ReadAllEventsForward(corrId, corrId, envelope,
-				position.CommitPosition, position.PreparePosition, count, resolveLinkTos,
-				requireLeader, GetETagTFPosition(manager), manager.User,
-				replyOnExpired: false,
-				longPollTimeout: longPollTimeout));
-			return new RequestParams((longPollTimeout ?? TimeSpan.Zero) + ESConsts.HttpTimeout);
-		}
-
-		private RequestParams GetAllEventsForwardFiltered(HttpEntityManager manager, UriTemplateMatch match) {
-			var pos = match.BoundVariables["position"];
-			var cnt = match.BoundVariables["count"];
-
-			var (success, errorMessage) = GetFilterFromQueryString(match, true, out var filter);
-			if (!success) {
-				return SendBadRequest(manager, errorMessage);
-			}
-
-			TFPos position;
-			int count;
-			var embed = GetEmbedLevel(manager, match);
-
-			if (!TFPos.TryParse(pos, out position) || position.PreparePosition < 0 || position.CommitPosition < 0)
-				return SendBadRequest(manager, string.Format("Invalid position argument: {0}", pos));
-			if (!int.TryParse(cnt, out count) || count <= 0)
-				return SendBadRequest(manager, string.Format("Invalid count argument: {0}", cnt));
-			if (!GetRequireLeader(manager, out var requireLeader))
-				return SendBadRequest(manager,
-					string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
-			TimeSpan? longPollTimeout;
-			if (!GetLongPoll(manager, out longPollTimeout))
-				return SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.LongPoll));
-
-			var envelope = new SendToHttpEnvelope(_networkSendQueue,
-				manager,
-				(args, msg) => Format.ReadAllEventsForwardFilteredCompleted(args, msg, embed),
-				(args, msg) => Configure.ReadAllEventsForwardFilteredCompleted(args, msg, headOfTf: false));
-			var corrId = Guid.NewGuid();
-			Publish(new ClientMessage.FilteredReadAllEventsForward(corrId, corrId, envelope,
-				position.CommitPosition, position.PreparePosition, count, true,
-				requireLeader, 1000, GetETagTFPosition(manager), filter, manager.User,
-				replyOnExpired: false,
-				longPollTimeout: longPollTimeout));
-			return new RequestParams((longPollTimeout ?? TimeSpan.Zero) + ESConsts.HttpTimeout);
-		}
-
-		// HELPERS
-		private (bool Success, string ErrorMessage) GetFilterFromQueryString(UriTemplateMatch match, bool isAllStream, out IEventFilter filter) {
-			var context = match.BoundVariables["context"];
-			var type = match.BoundVariables["type"];
-			var data = match.BoundVariables["data"];
-			var excludeSystemEvents = match.BoundVariables["exclude-system-events"];
-
-			if (excludeSystemEvents != null) {
-				if (!bool.TryParse(excludeSystemEvents, out var parsedExcludeSystemEvents)) {
-					filter = null;
-					return (false, "exclude-sytem-events should have a value of true.");
-				}
-
-				if (parsedExcludeSystemEvents == false) {
-					filter = null;
-					return (false, "exclude-sytem-events should have a value of true.");
-				}
-
-				filter = EventFilter.Get(isAllStream, new Filter(
-					Filter.Types.FilterContext.EventType,
-					Filter.Types.FilterType.Regex,
-					new[] { @"^[^\$].*" }
-				));
-
-				return (true, null);
-			}
-
-			var parsedFilterResult = EventFilter.TryParse(context, isAllStream, type, data, out filter);
-			if (!parsedFilterResult.Success) {
-				return (false, parsedFilterResult.Reason);
-			}
-
-			return (true, null);
-		}
-
-		private bool GetExpectedVersion(HttpEntityManager manager, out long expectedVersion) {
-			var expVer = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.ExpectedVersion);
-			if (StringValues.IsNullOrEmpty(expVer)) {
-				expectedVersion = ExpectedVersion.Any;
-				return true;
-			}
-
-			return long.TryParse(expVer, out expectedVersion) && expectedVersion >= ExpectedVersion.StreamExists;
-		}
-
-		private bool GetIncludedId(HttpEntityManager manager, out Guid includedId) {
-			var id = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.EventId);
-			if (StringValues.IsNullOrEmpty(id)) {
-				includedId = Guid.Empty;
-				return true;
-			}
-
-			return Guid.TryParse(id, out includedId) && includedId != Guid.Empty;
-		}
-
-		private bool GetIncludedType(HttpEntityManager manager, out string includedType) {
-			var type = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.EventType);
-			if (StringValues.IsNullOrEmpty(type)) {
-				includedType = null;
-				return true;
-			}
-
-			includedType = type;
-			return true;
-		}
-
-
-		private bool GetRequireLeader(HttpEntityManager manager, out bool requireLeader) {
-			requireLeader = false;
-			
-			var onlyLeader = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.RequireLeader);
-			var onlyMaster = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.RequireMaster);
-			
-			if (StringValues.IsNullOrEmpty(onlyLeader) && StringValues.IsNullOrEmpty(onlyMaster))
-				return true;
-		
-			if (string.Equals(onlyLeader, "True", StringComparison.OrdinalIgnoreCase) ||
-			    string.Equals(onlyMaster, "True", StringComparison.OrdinalIgnoreCase)) {
-				requireLeader = true;
-				return true;
-			}
-
-			return string.Equals(onlyLeader, "False", StringComparison.OrdinalIgnoreCase) ||
-			       string.Equals(onlyMaster, "False", StringComparison.OrdinalIgnoreCase);
-		}
-
-		private bool GetLongPoll(HttpEntityManager manager, out TimeSpan? longPollTimeout) {
-			longPollTimeout = null;
-			var longPollHeader = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.LongPoll);
-			if (StringValues.IsNullOrEmpty(longPollHeader))
-				return true;
-			int longPollSec;
-			if (int.TryParse(longPollHeader, out longPollSec) && longPollSec > 0) {
-				longPollTimeout = TimeSpan.FromSeconds(longPollSec);
-				return true;
-			}
-
-			return false;
-		}
-
-		private bool GetResolveLinkTos(HttpEntityManager manager, out bool resolveLinkTos, bool defaultOption = false) {
-			resolveLinkTos = defaultOption;
-			var linkToHeader = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.ResolveLinkTos);
-			if (StringValues.IsNullOrEmpty(linkToHeader))
-				return true;
-			if (string.Equals(linkToHeader, "False", StringComparison.OrdinalIgnoreCase)) {
-				return true;
-			}
-
-			if (string.Equals(linkToHeader, "True", StringComparison.OrdinalIgnoreCase)) {
-				resolveLinkTos = true;
-				return true;
-			}
-
-			return false;
-		}
-
-		private bool GetHardDelete(HttpEntityManager manager, out bool hardDelete) {
-			hardDelete = false;
-			var hardDel = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.HardDelete);
-			if (StringValues.IsNullOrEmpty(hardDel))
-				return true;
-			if (string.Equals(hardDel, "True", StringComparison.OrdinalIgnoreCase)) {
-				hardDelete = true;
-				return true;
-			}
-
-			if (string.Equals(hardDel, "False", StringComparison.OrdinalIgnoreCase))
-				return true;
-			return false;
-		}
-
-		public void PostEntry(HttpEntityManager manager, long expectedVersion, bool requireLeader, string stream,
-			Guid idIncluded, string typeIncluded) {
-			//TODO GFY SHOULD WE MAKE THIS READ BYTE[] FOR RAW THEN CONVERT? AS OF NOW ITS ALL NO BOM UTF8
-			manager.ReadRequestAsync(
-				(man, body) => {
-					var events = new Event[0];
-					try {
-						events = AutoEventConverter.SmartParse(body, manager.RequestCodec, idIncluded, typeIncluded);
-					} catch (Exception ex) {
-						SendBadRequest(manager, ex.Message);
-						return;
-					}
-
-					if (events.IsEmpty()) {
-						SendBadRequest(manager, "Write request body invalid.");
-						return;
-					}
-
-					foreach (var e in events) {
-						if (e.Data.Length + e.Metadata.Length > 4 * 1024 * 1024) {
-							SendTooBig(manager);
-						}
-					}
-
-					var cts = CancellationTokenSource.CreateLinkedTokenSource(manager.HttpEntity.Context.RequestAborted);
-					var envelope = new SendToHttpEnvelope(_networkSendQueue,
-						manager,
-						Format.WriteEventsCompleted,
-						ConfigureResponse);
-					var corrId = Guid.NewGuid();
-					var msg = new ClientMessage.WriteEvents(corrId, corrId, envelope, requireLeader, stream,
-						expectedVersion, events, manager.User,
-						cancellationToken: manager.HttpEntity.Context.RequestAborted);
-					cts.CancelAfter(_writeTimeout);
-					Publish(msg);
-
-					ResponseConfiguration ConfigureResponse(HttpResponseConfiguratorArgs a, Message m) {
-						cts.Dispose();
-						return Configure.WriteEventsCompleted(a, m, stream);
-					}
-
-				},
-				e => Log.Debug("Error while reading request (POST entry): {e}.", e.Message));
-
-		}
-
-		private void GetStreamEvent(HttpEntityManager manager, string stream, long eventNumber,
-			bool resolveLinkTos, bool requireLeader, EmbedLevel embed) {
-			var envelope = new SendToHttpEnvelope(_networkSendQueue,
-				manager,
-				(args, message) => Format.EventEntry(args, message, embed),
-				(args, message) => Configure.EventEntry(args, message, headEvent: eventNumber == -1));
-			var corrId = Guid.NewGuid();
-			Publish(new ClientMessage.ReadEvent(corrId, corrId, envelope, stream, eventNumber, resolveLinkTos,
-				requireLeader, manager.User));
-		}
-
-		private void GetStreamEventsBackward(HttpEntityManager manager, string stream, long eventNumber, int count,
-			bool resolveLinkTos, bool requireLeader, bool headOfStream, EmbedLevel embed) {
-			var envelope = new SendToHttpEnvelope(_networkSendQueue,
-				manager,
-				(ent, msg) =>
-					Format.GetStreamEventsBackward(ent, msg, embed, headOfStream),
-				(args, msg) => Configure.GetStreamEventsBackward(args, msg, headOfStream));
-			var corrId = Guid.NewGuid();
-			Publish(new ClientMessage.ReadStreamEventsBackward(corrId, corrId, envelope, stream, eventNumber, count,
-				resolveLinkTos, requireLeader, GetETagStreamVersion(manager), manager.User));
-		}
-
-		private void GetStreamEventsForward(HttpEntityManager manager, string stream, long eventNumber, int count,
-			bool resolveLinkTos, bool requireLeader, long? etag, TimeSpan? longPollTimeout, EmbedLevel embed) {
-			var envelope = new SendToHttpEnvelope(_networkSendQueue,
-				manager,
-				(ent, msg) => Format.GetStreamEventsForward(ent, msg, embed),
-				Configure.GetStreamEventsForward);
-			var corrId = Guid.NewGuid();
-			Publish(new ClientMessage.ReadStreamEventsForward(corrId, corrId, envelope, stream, eventNumber, count,
-				resolveLinkTos, requireLeader, etag, manager.User,
-				replyOnExpired: false,
-				longPollTimeout: longPollTimeout));
-		}
-
-		private long? GetETagStreamVersion(HttpEntityManager manager) {
-			var etag = manager.HttpEntity.Request.GetHeaderValues("If-None-Match");
-			if (!StringValues.IsNullOrEmpty(etag)) {
-				// etag format is version;contenttypehash
-				var splitted = etag.ToString().Trim('\"').Split(ETagSeparatorArray);
-				if (splitted.Length == 2) {
-					var typeHash = manager.ResponseCodec.ContentType.GetHashCode()
-						.ToString(CultureInfo.InvariantCulture);
-					var res = splitted[1] == typeHash && long.TryParse(splitted[0], out var streamVersion)
-						? (long?)streamVersion
-						: null;
-					return res;
-				}
-			}
-
-			return null;
-		}
-
-		private static long? GetETagTFPosition(HttpEntityManager manager) {
-			var etag = manager.HttpEntity.Request.GetHeaderValues("If-None-Match");
-			if (!StringValues.IsNullOrEmpty(etag)) {
-				// etag format is version;contenttypehash
-				var splitted = etag.ToString().Trim('\"').Split(ETagSeparatorArray);
-				if (splitted.Length == 2) {
-					var typeHash = manager.ResponseCodec.ContentType.GetHashCode()
-						.ToString(CultureInfo.InvariantCulture);
-					return splitted[1] == typeHash && long.TryParse(splitted[0], out var tfEofPosition)
-						? (long?)tfEofPosition
-						: null;
-				}
-			}
-
-			return null;
-		}
-
-		private static EmbedLevel GetEmbedLevel(HttpEntityManager manager, UriTemplateMatch match,
-			EmbedLevel htmlLevel = EmbedLevel.PrettyBody) {
-			if (manager.ResponseCodec is IRichAtomCodec)
-				return htmlLevel;
-			var rawValue = match.BoundVariables["embed"] ?? string.Empty;
-			switch (rawValue.ToLowerInvariant()) {
-				case "content":
-					return EmbedLevel.Content;
-				case "rich":
-					return EmbedLevel.Rich;
-				case "body":
-					return EmbedLevel.Body;
-				case "pretty":
-					return EmbedLevel.PrettyBody;
-				case "tryharder":
-					return EmbedLevel.TryHarder;
-				default:
-					return EmbedLevel.None;
-			}
-		}
-	}
-
-	internal class HtmlFeedCodec : ICodec, IRichAtomCodec {
-		public string ContentType {
-			get { return "text/html"; }
-		}
-
-		public Encoding Encoding {
-			get { return Helper.UTF8NoBom; }
-		}
-
-		public bool HasEventIds {
-			get { return false; }
-		}
-
-		public bool HasEventTypes {
-			get { return false; }
-		}
-
-		public bool CanParse(MediaType format) {
-			throw new NotImplementedException();
-		}
-
-		public bool SuitableForResponse(MediaType component) {
-			return component.Type == "*"
-				   || (string.Equals(component.Type, "text", StringComparison.OrdinalIgnoreCase)
-					   && (component.Subtype == "*" ||
-						   string.Equals(component.Subtype, "html", StringComparison.OrdinalIgnoreCase)));
-		}
-
-		public T From<T>(string text) {
-			throw new NotImplementedException();
-		}
-
-		public string To<T>(T value) {
-			return @"
-            <!DOCTYPE html>
-            <html>
-            <head>
-            </head>
-            <body>
-            <script>
-                var data = " + JsonConvert.SerializeObject(value, Formatting.Indented, JsonCodec.ToSettings) + @";
-                var newLocation = '/web/index.html#/streams/' + data.streamId" + @"
-                if('positionEventNumber' in data){
-                    newLocation = newLocation + '/' + data.positionEventNumber;
-                }
-                window.location.replace(newLocation);
-            </script>
-            </body>
-            </html>
-            ";
-		}
-	}
-
-	interface IRichAtomCodec {
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Controllers/ClusterWebUIController.cs b/src/EventStore.Core/Services/Transport/Http/Controllers/ClusterWebUIController.cs
deleted file mode 100644
index eb3ab61617e..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Controllers/ClusterWebUIController.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Bus;
-using EventStore.Core.Util;
-using EventStore.Plugins.Authorization;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Codecs;
-using EventStore.Transport.Http.EntityManagement;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Transport.Http.Controllers {
-	public class ClusterWebUiController : CommunicationController {
-		private static readonly ILogger Log = Serilog.Log.ForContext<ClusterWebUiController>();
-
-		private readonly NodeSubsystems[] _enabledNodeSubsystems;
-
-		//private readonly MiniWeb _commonWeb;
-		private readonly MiniWeb _clusterNodeWeb;
-
-		public ClusterWebUiController(IPublisher publisher, NodeSubsystems[] enabledNodeSubsystems)
-			: base(publisher) {
-			_enabledNodeSubsystems = enabledNodeSubsystems;
-			_clusterNodeWeb = new MiniWeb("/web");
-		}
-
-		protected override void SubscribeCore(IHttpService service) {
-			_clusterNodeWeb.RegisterControllerActions(service);
-			RegisterRedirectAction(service, "", "/web/index.html");
-			RegisterRedirectAction(service, "/web", "/web/index.html");
-
-			service.RegisterAction(
-				new ControllerAction("/sys/subsystems", HttpMethod.Get, Codec.NoCodecs, new ICodec[] {Codec.Json}, new Operation(Operations.Node.Information.Subsystems)),
-				OnListNodeSubsystems);
-		}
-
-		private void OnListNodeSubsystems(HttpEntityManager http, UriTemplateMatch match) {
-			http.ReplyTextContent(
-				Codec.Json.To(_enabledNodeSubsystems),
-				200,
-				"OK",
-				"application/json",
-				null,
-				ex => Log.Information(ex, "Failed to prepare main menu")
-			);
-		}
-
-		private static void RegisterRedirectAction(IHttpService service, string fromUrl, string toUrl) {
-			service.RegisterAction(
-				new ControllerAction(
-					fromUrl,
-					HttpMethod.Get,
-					Codec.NoCodecs,
-					new ICodec[] {Codec.ManualEncoding},
-					new Operation(Operations.Node.Redirect)),
-				(http, match) => http.ReplyTextContent(
-					"Moved", 302, "Found", "text/plain",
-					new[] {
-						new KeyValuePair<string, string>(
-							"Location", new Uri(http.HttpEntity.RequestedUrl, toUrl).AbsoluteUri)
-					}, Console.WriteLine));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Controllers/CommunicationController.cs b/src/EventStore.Core/Services/Transport/Http/Controllers/CommunicationController.cs
deleted file mode 100644
index 58fc32f2583..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Controllers/CommunicationController.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Plugins.Authorization;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Codecs;
-using EventStore.Transport.Http.EntityManagement;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Transport.Http.Controllers {
-	public abstract class CommunicationController : IHttpController {
-		private static readonly ILogger Log = Serilog.Log.ForContext<CommunicationController>();
-		private static readonly ICodec[] DefaultCodecs = new ICodec[] {Codec.Json, Codec.Xml};
-
-		private readonly IPublisher _publisher;
-
-		protected CommunicationController(IPublisher publisher) {
-			Ensure.NotNull(publisher, "publisher");
-
-			_publisher = publisher;
-		}
-
-		public void Publish(Message message) {
-			Ensure.NotNull(message, "message");
-			_publisher.Publish(message);
-		}
-
-		public void Subscribe(IHttpService service) {
-			Ensure.NotNull(service, "service");
-			SubscribeCore(service);
-		}
-
-		protected abstract void SubscribeCore(IHttpService service);
-
-		protected RequestParams SendBadRequest(HttpEntityManager httpEntityManager, string reason) {
-			httpEntityManager.ReplyContent(Encoding.ASCII.GetBytes(reason), HttpStatusCode.BadRequest,
-				"Bad Request",type: "text/plain", headers:null,
-				e => Log.Debug("Error while closing HTTP connection (bad request): {e}.", e.Message));
- 
-			return new RequestParams(done: true);
-		}
-
-		protected RequestParams SendTooBig(HttpEntityManager httpEntityManager) {
-			httpEntityManager.ReplyStatus(HttpStatusCode.RequestEntityTooLarge,
-				"Too large events received. Limit is 4mb",
-				e => Log.Debug("Too large events received over HTTP"));
-			return new RequestParams(done: true);
-		}
-
-		protected RequestParams SendOk(HttpEntityManager httpEntityManager) {
-			httpEntityManager.ReplyStatus(HttpStatusCode.OK,
-				"OK",
-				e => Log.Debug("Error while closing HTTP connection (ok): {e}.", e.Message));
-			return new RequestParams(done: true);
-		}
-
-		protected void Register(IHttpService service, string uriTemplate, string httpMethod,
-			Action<HttpEntityManager, UriTemplateMatch> handler, ICodec[] requestCodecs, ICodec[] responseCodecs, Operation operation) {
-			service.RegisterAction(new ControllerAction(uriTemplate, httpMethod, requestCodecs, responseCodecs, operation),
-				handler);
-		}
-
-		protected void Register(IHttpService service, string uriTemplate, string httpMethod,
-			Action<HttpEntityManager, UriTemplateMatch> handler, ICodec[] requestCodecs, ICodec[] responseCodecs, Func<UriTemplateMatch,Operation> operation) {
-			service.RegisterAction(new ControllerAction(uriTemplate, httpMethod, requestCodecs, responseCodecs, operation),
-				handler);
-		}
-
-		protected void RegisterCustom(IHttpService service, string uriTemplate, string httpMethod,
-			Func<HttpEntityManager, UriTemplateMatch, RequestParams> handler,
-			ICodec[] requestCodecs, ICodec[] responseCodecs, Operation operation) {
-			service.RegisterCustomAction(new ControllerAction(uriTemplate, httpMethod, requestCodecs, responseCodecs, operation),
-				handler);
-		}
-
-		protected void RegisterCustom(IHttpService service, string uriTemplate, string httpMethod,
-			Func<HttpEntityManager, UriTemplateMatch, RequestParams> handler,
-			ICodec[] requestCodecs, ICodec[] responseCodecs, Func<UriTemplateMatch,Operation> operation) {
-			service.RegisterCustomAction(new ControllerAction(uriTemplate, httpMethod, requestCodecs, responseCodecs, operation),
-				handler);
-		}
-
-		protected void RegisterUrlBased(IHttpService service, string uriTemplate, string httpMethod, Operation operation,
-			Action<HttpEntityManager, UriTemplateMatch> action) {
-			Register(service, uriTemplate, httpMethod, action, Codec.NoCodecs, DefaultCodecs, operation);
-		}
-
-		protected void RegisterUrlBased(IHttpService service, string uriTemplate, string httpMethod, Func<UriTemplateMatch,Operation> operation,
-			Action<HttpEntityManager, UriTemplateMatch> action) {
-			Register(service, uriTemplate, httpMethod, action, Codec.NoCodecs, DefaultCodecs, operation);
-		}
-
-		protected static string MakeUrl(HttpEntityManager http, string path) {
-			if (path.Length > 0 && path[0] == '/') path = path.Substring(1);
-			var hostUri = http.ResponseUrl;
-			var builder = new UriBuilder(hostUri.Scheme, hostUri.Host, hostUri.Port, hostUri.LocalPath + path);
-			return builder.Uri.AbsoluteUri;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Controllers/GossipController.cs b/src/EventStore.Core/Services/Transport/Http/Controllers/GossipController.cs
deleted file mode 100644
index e854197288c..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Controllers/GossipController.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using System.Net;
-using System.Net.Http;
-using System.Net.Security;
-using System.Security.Cryptography.X509Certificates;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Cluster;
-using EventStore.Core.Messages;
-using EventStore.Core.Metrics;
-using EventStore.Plugins.Authorization;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Client;
-using EventStore.Transport.Http.Codecs;
-using EventStore.Transport.Http.EntityManagement;
-using HttpMethod = EventStore.Transport.Http.HttpMethod;
-using HttpStatusCode = EventStore.Transport.Http.HttpStatusCode;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Transport.Http.Controllers {
-	public class GossipController : CommunicationController {
-		private static readonly ILogger Log = Serilog.Log.ForContext<GossipController>();
-
-		private static readonly ICodec[] SupportedCodecs = new ICodec[]
-			{Codec.Json, Codec.ApplicationXml, Codec.Xml, Codec.Text};
-
-		private readonly IPublisher _networkSendQueue;
-		private readonly IDurationTracker _tracker;
-
-		public GossipController(IPublisher publisher, IPublisher networkSendQueue, IDurationTracker tracker)
-			: base(publisher) {
-			_networkSendQueue = networkSendQueue;
-			_tracker = tracker;
-		}
-
-		protected override void SubscribeCore(IHttpService service) {
-			service.RegisterAction(new ControllerAction("/gossip", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Gossip.ClientRead)),
-				OnGetGossip);
-		}
-
-		private void OnGetGossip(HttpEntityManager entity, UriTemplateMatch match) {
-			var duration = _tracker.Start();
-			var sendToHttpEnvelope = new SendToHttpEnvelope(
-				_networkSendQueue, entity, Format.SendPublicGossip,
-				(e, m) => {
-					duration.Dispose();
-					return Configure.Ok(e.ResponseCodec.ContentType, Helper.UTF8NoBom, null, null, false);
-				});
-			Publish(new GossipMessage.ClientGossip(sendToHttpEnvelope));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Controllers/HttpHelpers.cs b/src/EventStore.Core/Services/Transport/Http/Controllers/HttpHelpers.cs
deleted file mode 100644
index 3bb74cdf78b..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Controllers/HttpHelpers.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-using EventStore.Plugins.Authorization;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Codecs;
-using EventStore.Transport.Http.EntityManagement;
-
-namespace EventStore.Core.Services.Transport.Http.Controllers {
-	public static class HttpHelpers {
-		public static void RegisterRedirectAction(IHttpService service, string fromUrl, string toUrl) {
-			service.RegisterAction(
-				new ControllerAction(
-					fromUrl,
-					HttpMethod.Get,
-					Codec.NoCodecs,
-					new ICodec[] {Codec.ManualEncoding},
-					new Operation(Operations.Node.Redirect)),
-				(http, match) => http.ReplyTextContent(
-					"Moved", 302, "Found", "text/plain",
-					new[] {
-						new KeyValuePair<string, string>(
-							"Location", new Uri(match.BaseUri, toUrl).AbsoluteUri)
-					}, Console.WriteLine));
-		}
-
-		public static void Reply(
-			this HttpEntityManager http, string response, int code, string description, string contentType,
-			IEnumerable<KeyValuePair<string, string>> headers = null) {
-			http.Reply(Helper.UTF8NoBom.GetBytes(response), code, description, contentType, Helper.UTF8NoBom, headers,
-				exception => { });
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Controllers/InfoController.cs b/src/EventStore.Core/Services/Transport/Http/Controllers/InfoController.cs
deleted file mode 100644
index 670d39c4897..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Controllers/InfoController.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Codecs;
-using EventStore.Transport.Http.EntityManagement;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Plugins.Authentication;
-using EventStore.Plugins.Authorization;
-using Newtonsoft.Json.Linq;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Transport.Http.Controllers {
-	public class InfoController : IHttpController, IHandle<SystemMessage.StateChangeMessage> {
-		private static readonly ILogger Log = Serilog.Log.ForContext<InfoController>();
-		private static readonly ICodec[] SupportedCodecs = { Codec.Json, Codec.Xml, Codec.ApplicationXml, Codec.Text };
-
-		private readonly ClusterVNodeOptions _options;
-		private readonly IDictionary<string, bool> _features;
-		private readonly IAuthenticationProvider _authenticationProvider;
-		private VNodeState _currentState;
-
-		public InfoController(ClusterVNodeOptions options, IDictionary<string, bool> features,
-			IAuthenticationProvider authenticationProvider) {
-			_options = options;
-			_features = features;
-			_authenticationProvider = authenticationProvider;
-		}
-
-		public void Subscribe(IHttpService service) {
-			Ensure.NotNull(service, "service");
-
-			service.RegisterAction(
-				new("/info", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs,
-					new Operation(Operations.Node.Information.Read)),
-				OnGetInfo);
-			service.RegisterAction(
-				new("/info/options", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs,
-					new Operation(Operations.Node.Information.Options)),
-				OnGetOptions);
-		}
-
-		public void Handle(SystemMessage.StateChangeMessage message) =>
-			_currentState = message.State;
-
-		private void OnGetInfo(HttpEntityManager entity, UriTemplateMatch match) {
-			entity.ReplyTextContent(
-				Codec.Json.To(
-					new {
-						ESVersion = VersionInfo.Version,
-						State = _currentState.ToString().ToLower(),
-						Features = _features,
-						Authentication = GetAuthenticationInfo()
-					}
-				),
-				HttpStatusCode.OK,
-				"OK",
-				entity.ResponseCodec.ContentType,
-				null,
-				e => Log.Error(e, "Error while writing HTTP response (info)"));
-		}
-
-		private Dictionary<string, object> GetAuthenticationInfo() {
-			if (_authenticationProvider == null)
-				return null;
-
-			return new() {
-				{ "type", _authenticationProvider.Name },
-				{ "properties", _authenticationProvider.GetPublicProperties() }
-			};
-		}
-
-		private void OnGetOptions(HttpEntityManager entity, UriTemplateMatch match) {
-			if (entity.User != null && (entity.User.LegacyRoleCheck(SystemRoles.Operations) ||
-			                            entity.User.LegacyRoleCheck(SystemRoles.Admins))) {
-				var options = _options.LoadedOptions.Values.Select(
-					x => new OptionStructure {
-						Name = x.Metadata.Name,
-						Description = x.Metadata.Description,
-						Group = x.Metadata.SectionMetadata.SectionType.Name,
-						Value = x.DisplayValue,
-						ConfigurationSource = x.SourceDisplayName,
-						DeprecationMessage = x.Metadata.DeprecationMessage,
-						Schema = x.Metadata.OptionSchema
-					}
-				);
-
-				entity.ReplyTextContent(
-					Codec.Json.To(options),
-					HttpStatusCode.OK,
-					"OK",
-					entity.ResponseCodec.ContentType,
-					null,
-					e => Log.Error(e, "error while writing HTTP response (options)")
-				);
-			} else {
-				entity.ReplyStatus(HttpStatusCode.Unauthorized, "Unauthorized", LogReplyError);
-			}
-		}
-
-		private void LogReplyError(Exception exc) =>
-			Log.Debug("Error while replying (info controller): {e}.", exc.Message);
-
-		public class OptionStructure {
-			public string Name { get; set; }
-			public string Description { get; set; }
-			public string Group { get; set; }
-			public string Value { get; set; }
-			public string ConfigurationSource { get; set; }
-			public string DeprecationMessage { get; set; }
-			public JObject Schema { get; set; }
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Controllers/InfoControllerBuilder.cs b/src/EventStore.Core/Services/Transport/Http/Controllers/InfoControllerBuilder.cs
deleted file mode 100644
index 9479475ccbb..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Controllers/InfoControllerBuilder.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Common.Options;
-using EventStore.Plugins.Authentication;
-
-namespace EventStore.Core.Services.Transport.Http.Controllers {
-	public class InfoControllerBuilder {
-		private ClusterVNodeOptions _options;
-		private IDictionary<string, bool> _features;
-		private IAuthenticationProvider _authenticationProvider;
-
-		public InfoControllerBuilder WithOptions(ClusterVNodeOptions options) {
-			_options = options;
-			return this;
-
-		}
-
-		public InfoControllerBuilder WithFeatures(IDictionary<string, bool> features) {
-			_features = features;
-			return this;
-		}
-
-		public InfoControllerBuilder WithAuthenticationProvider(IAuthenticationProvider authenticationProvider) {
-			_authenticationProvider = authenticationProvider;
-			return this;
-		}
-
-		public InfoController Build() {
-			return new InfoController(_options, _features, _authenticationProvider);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Controllers/MetricsController.cs b/src/EventStore.Core/Services/Transport/Http/Controllers/MetricsController.cs
deleted file mode 100644
index 1b4c1b55451..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Controllers/MetricsController.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Plugins.Authorization;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Codecs;
-
-namespace EventStore.Core.Services.Transport.Http.Controllers {
-	public class MetricsController : CommunicationController {
-		private static readonly ICodec[] SupportedCodecs = new ICodec[] {
-			Codec.CreateCustom(Codec.Text, "text/plain", Helper.UTF8NoBom, false, false),
-			Codec.CreateCustom(Codec.Text, "application/openmetrics-text", Helper.UTF8NoBom, false, false),
-		};
-
-		public MetricsController() : base(new NoOpPublisher()) {
-		}
-
-		protected override void SubscribeCore(IHttpService service) {
-			Ensure.NotNull(service, "service");
-
-			// this exists only to specify the permissions required for the /metrics endpoint
-			service.RegisterAction(new ControllerAction("/metrics", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs,
-				new Operation(Operations.Node.Statistics.Read)),
-				(x, y) => {
-					// the PrometheusExporterMiddleware handles the request itself, this will not be called
-					throw new InvalidOperationException();
-				});
-		}
-
-		class NoOpPublisher : IPublisher {
-			public void Publish(Message message) {
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Controllers/PersistentSubscriptionController.cs b/src/EventStore.Core/Services/Transport/Http/Controllers/PersistentSubscriptionController.cs
deleted file mode 100644
index b7ecca5f534..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Controllers/PersistentSubscriptionController.cs
+++ /dev/null
@@ -1,1108 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Codecs;
-using EventStore.Transport.Http.EntityManagement;
-using ClientMessages = EventStore.Core.Messages.ClientMessage.PersistentSubscriptionNackEvents;
-using EventStore.Core.Services.PersistentSubscription;
-using EventStore.Common.Utils;
-using EventStore.Plugins.Authorization;
-using EventStore.Core.Settings;
-using EventStore.Transport.Http.Atom;
-using Microsoft.Extensions.Primitives;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Transport.Http.Controllers {
-	public class PersistentSubscriptionController : CommunicationController {
-		private readonly IHttpForwarder _httpForwarder;
-		private readonly IPublisher _networkSendQueue;
-		private const int DefaultNumberOfMessagesToGet = 1;
-		private static readonly ICodec[] DefaultCodecs = {Codec.Json, Codec.Xml};
-		public static readonly char[] ETagSeparatorArray = { ';' };
-		private static readonly ICodec[] AtomCodecs = {
-			Codec.CompetingXml,
-			Codec.CompetingJson,
-		};
-
-		private static readonly ILogger Log = Serilog.Log.ForContext<PersistentSubscriptionController>();
-
-		public PersistentSubscriptionController(IHttpForwarder httpForwarder, IPublisher publisher,
-			IPublisher networkSendQueue)
-			: base(publisher) {
-			_httpForwarder = httpForwarder;
-			_networkSendQueue = networkSendQueue;
-		}
-
-		protected override void SubscribeCore(IHttpService service) {
-			Register(service, "/subscriptions", HttpMethod.Get, GetAllSubscriptionInfo, Codec.NoCodecs, DefaultCodecs, new Operation(Operations.Subscriptions.Statistics));
-			Register(service, "/subscriptions/restart", HttpMethod.Post, RestartPersistentSubscriptions, Codec.NoCodecs, DefaultCodecs, new Operation(Operations.Subscriptions.Restart));
-			Register(service, "/subscriptions/{stream}", HttpMethod.Get, GetSubscriptionInfoForStream, Codec.NoCodecs,
-				DefaultCodecs, new Operation(Operations.Subscriptions.Statistics));
-			Register(service, "/subscriptions/{stream}/{subscription}", HttpMethod.Put, PutSubscription, DefaultCodecs,
-				DefaultCodecs, new Operation(Operations.Subscriptions.Create));
-			Register(service, "/subscriptions/{stream}/{subscription}", HttpMethod.Post, PostSubscription,
-				DefaultCodecs, DefaultCodecs, new Operation(Operations.Subscriptions.Update));
-			RegisterUrlBased(service, "/subscriptions/{stream}/{subscription}", HttpMethod.Delete, new Operation(Operations.Subscriptions.Delete), DeleteSubscription);
-			Register(service, "/subscriptions/{stream}/{subscription}", HttpMethod.Get, GetNextNMessages,
-				Codec.NoCodecs, AtomCodecs, WithParameters(Operations.Subscriptions.ProcessMessages));
-			Register(service, "/subscriptions/{stream}/{subscription}?embed={embed}", HttpMethod.Get, GetNextNMessages,
-				Codec.NoCodecs, AtomCodecs, WithParameters(Operations.Subscriptions.ProcessMessages));
-			Register(service, "/subscriptions/{stream}/{subscription}/{count}?embed={embed}", HttpMethod.Get,
-				GetNextNMessages, Codec.NoCodecs, AtomCodecs, WithParameters(Operations.Subscriptions.ProcessMessages));
-			Register(service, "/subscriptions/{stream}/{subscription}/info", HttpMethod.Get, GetSubscriptionInfo,
-				Codec.NoCodecs, DefaultCodecs, new Operation(Operations.Subscriptions.Statistics));
-			RegisterUrlBased(service, "/subscriptions/{stream}/{subscription}/replayParked?stopAt={stopAt}", HttpMethod.Post,
-				WithParameters(Operations.Subscriptions.ReplayParked), ReplayParkedMessages);
-			RegisterUrlBased(service, "/subscriptions/{stream}/{subscription}/ack/{messageid}", HttpMethod.Post, 
-				WithParameters(Operations.Subscriptions.ProcessMessages), AckMessage);
-			RegisterUrlBased(service, "/subscriptions/{stream}/{subscription}/nack/{messageid}?action={action}",
-				HttpMethod.Post, WithParameters(Operations.Subscriptions.ProcessMessages), NackMessage);
-			RegisterUrlBased(service, "/subscriptions/{stream}/{subscription}/ack?ids={messageids}", HttpMethod.Post, 
-				WithParameters(Operations.Subscriptions.ProcessMessages), AckMessages);
-			RegisterUrlBased(service, "/subscriptions/{stream}/{subscription}/nack?ids={messageids}&action={action}",
-				HttpMethod.Post, WithParameters(Operations.Subscriptions.ProcessMessages), NackMessages);
-			//map view parked messages
-			Register(service,
-				"/subscriptions/viewparkedmessages/{stream}/{group}/{event}/backward/{count}?embed={embed}",
-				HttpMethod.Get,
-				ViewParkedMessagesBackward, Codec.NoCodecs, AtomCodecs,
-				WithParameters(Operations.Subscriptions.Statistics));
-			RegisterCustom(service, "/subscriptions/viewparkedmessages/{stream}/{group}/{event}/forward/{count}?embed={embed}", HttpMethod.Get,
-				ViewParkedMessagesForward, Codec.NoCodecs, AtomCodecs,  WithParameters(Operations.Subscriptions.Statistics));
-		}
-		private RequestParams ViewParkedMessagesForward(HttpEntityManager manager, UriTemplateMatch match) {
-			var stream = match.BoundVariables["stream"];
-			var groupName = match.BoundVariables["group"];
-			var evNum = match.BoundVariables["event"];
-			var cnt = match.BoundVariables["count"];
-
-			stream = BuildSubscriptionParkedStreamName(stream, groupName);
-
-			long eventNumber;
-			int count;
-			var embed = GetEmbedLevel(manager, match);
-
-			if (stream.IsEmptyString())
-				return SendBadRequest(manager, string.Format("Invalid stream name '{0}'", stream));
-			if (evNum.IsEmptyString() || !long.TryParse(evNum, out eventNumber) || eventNumber < 0)
-				return SendBadRequest(manager, string.Format("'{0}' is not valid event number", evNum));
-			if (cnt.IsEmptyString() || !int.TryParse(cnt, out count) || count <= 0)
-				return SendBadRequest(manager,
-					string.Format("'{0}' is not valid count. Should be positive integer", cnt));
-			bool resolveLinkTos;
-			if (!GetResolveLinkTos(manager, out resolveLinkTos, true))
-				return SendBadRequest(manager,
-					string.Format("{0} header in wrong format.", SystemHeaders.ResolveLinkTos));
-			if (!GetRequireLeader(manager, out var requireLeader))
-				return SendBadRequest(manager,
-					string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
-			TimeSpan? longPollTimeout;
-			if (!GetLongPoll(manager, out longPollTimeout))
-				return SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.LongPoll));
-			var etag = GetETagStreamVersion(manager);
-
-			GetStreamEventsForward(manager, stream, eventNumber, count, resolveLinkTos, requireLeader, etag,
-				longPollTimeout, embed);
-			return new RequestParams((longPollTimeout ?? TimeSpan.Zero) + ESConsts.HttpTimeout);
-		}
-		private bool GetLongPoll(HttpEntityManager manager, out TimeSpan? longPollTimeout) {
-			longPollTimeout = null;
-			var longPollHeader = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.LongPoll);
-			if (StringValues.IsNullOrEmpty(longPollHeader))
-				return true;
-			int longPollSec;
-			if (int.TryParse(longPollHeader, out longPollSec) && longPollSec > 0) {
-				longPollTimeout = TimeSpan.FromSeconds(longPollSec);
-				return true;
-			}
-
-			return false;
-		}
-		private void GetStreamEventsForward(HttpEntityManager manager, string stream, long eventNumber, int count,
-			bool resolveLinkTos, bool requireLeader, long? etag, TimeSpan? longPollTimeout, EmbedLevel embed) {
-			var envelope = new SendToHttpEnvelope(_networkSendQueue,
-				manager,
-				(ent, msg) => Format.GetStreamEventsForward(ent, msg, embed),
-				Configure.GetStreamEventsForward);
-			var corrId = Guid.NewGuid();
-			Publish(new ClientMessage.ReadStreamEventsForward(corrId, corrId, envelope, stream, eventNumber, count,
-				resolveLinkTos, requireLeader, etag, manager.User,
-				replyOnExpired: false,
-				longPollTimeout: longPollTimeout));
-		}
-		private void ViewParkedMessagesBackward(HttpEntityManager http, UriTemplateMatch match) {
-			var stream = match.BoundVariables["stream"];
-			var groupName = match.BoundVariables["group"];
-			var evNum = match.BoundVariables["event"];
-			var cnt = match.BoundVariables["count"];
-
-			stream = BuildSubscriptionParkedStreamName(stream, groupName);
-
-			long eventNumber = -1;
-			int count = AtomSpecs.FeedPageSize;
-			var embed = GetEmbedLevel(http, match);
-
-			if (stream.IsEmptyString()) {
-				SendBadRequest(http, string.Format("Invalid stream name '{0}'", stream));
-				return;
-			}
-
-			if (evNum != null && evNum != "head" && (!long.TryParse(evNum, out eventNumber) || eventNumber < 0)) {
-				SendBadRequest(http, string.Format("'{0}' is not valid event number", evNum));
-				return;
-			}
-
-			if (cnt.IsNotEmptyString() && (!int.TryParse(cnt, out count) || count <= 0)) {
-				SendBadRequest(http, string.Format("'{0}' is not valid count. Should be positive integer", cnt));
-				return;
-			}
-
-			bool resolveLinkTos;
-			if (!GetResolveLinkTos(http, out resolveLinkTos, true)) {
-				SendBadRequest(http, string.Format("{0} header in wrong format.", SystemHeaders.ResolveLinkTos));
-				return;
-			}
-
-			if (!GetRequireLeader(http, out var requireLeader)) {
-				SendBadRequest(http, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
-				return;
-			}
-
-			bool headOfStream = eventNumber == -1;
-			GetStreamEventsBackward(http, stream, eventNumber, count, resolveLinkTos, requireLeader, headOfStream,
-				embed);
-		}
-		private void GetStreamEventsBackward(HttpEntityManager manager, string stream, long eventNumber, int count,
-			bool resolveLinkTos, bool requireLeader, bool headOfStream, EmbedLevel embed) {
-			var envelope = new SendToHttpEnvelope(_networkSendQueue,
-				manager,
-				(ent, msg) =>
-					Format.GetStreamEventsBackward(ent, msg, embed, headOfStream),
-				(args, msg) => Configure.GetStreamEventsBackward(args, msg, headOfStream));
-			var corrId = Guid.NewGuid();
-			Publish(new ClientMessage.ReadStreamEventsBackward(corrId, corrId, envelope, stream, eventNumber, count,
-				resolveLinkTos, requireLeader, GetETagStreamVersion(manager), manager.User));
-		}
-		private bool GetRequireLeader(HttpEntityManager manager, out bool requireLeader) {
-			requireLeader = false;
-			
-			var onlyLeader = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.RequireLeader);
-			var onlyMaster = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.RequireMaster);
-			
-			if (StringValues.IsNullOrEmpty(onlyLeader) && StringValues.IsNullOrEmpty(onlyMaster))
-				return true;
-		
-			if (string.Equals(onlyLeader, "True", StringComparison.OrdinalIgnoreCase) ||
-			    string.Equals(onlyMaster, "True", StringComparison.OrdinalIgnoreCase)) {
-				requireLeader = true;
-				return true;
-			}
-
-			return string.Equals(onlyLeader, "False", StringComparison.OrdinalIgnoreCase) ||
-			       string.Equals(onlyMaster, "False", StringComparison.OrdinalIgnoreCase);
-		}
-		private bool GetResolveLinkTos(HttpEntityManager manager, out bool resolveLinkTos, bool defaultOption = false) {
-			resolveLinkTos = defaultOption;
-			var linkToHeader = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.ResolveLinkTos);
-			if (StringValues.IsNullOrEmpty(linkToHeader))
-				return true;
-			if (string.Equals(linkToHeader, "False", StringComparison.OrdinalIgnoreCase)) {
-				return true;
-			}
-
-			if (string.Equals(linkToHeader, "True", StringComparison.OrdinalIgnoreCase)) {
-				resolveLinkTos = true;
-				return true;
-			}
-
-			return false;
-		}
-		private long? GetETagStreamVersion(HttpEntityManager manager) {
-			var etag = manager.HttpEntity.Request.GetHeaderValues("If-None-Match");
-			if (!StringValues.IsNullOrEmpty(etag)) {
-				// etag format is version;contenttypehash
-				var splitted = etag.ToString().Trim('\"').Split(ETagSeparatorArray);
-				if (splitted.Length == 2) {
-					var typeHash = manager.ResponseCodec.ContentType.GetHashCode()
-						.ToString(CultureInfo.InvariantCulture);
-					var res = splitted[1] == typeHash && long.TryParse(splitted[0], out var streamVersion)
-						? (long?)streamVersion
-						: null;
-					return res;
-				}
-			}
-
-			return null;
-		}
-
-		static Func<UriTemplateMatch, Operation> WithParameters(OperationDefinition definition) {
-			return match => {
-				var operation = new Operation(definition);
-				var stream = match.BoundVariables["stream"];
-				if(!string.IsNullOrEmpty(stream))
-					operation = operation.WithParameter(Operations.Subscriptions.Parameters.StreamId(stream));
-				var subscription = match.BoundVariables["subscription"];
-				if (!string.IsNullOrEmpty(subscription))
-					operation = operation.WithParameter(
-						Operations.Subscriptions.Parameters.SubscriptionId(subscription));
-				return operation;
-			};
-		}
-
-		private static ClientMessages.NakAction GetNackAction(HttpEntityManager manager, UriTemplateMatch match,
-			NakAction nakAction = NakAction.Unknown) {
-			var rawValue = match.BoundVariables["action"] ?? string.Empty;
-			switch (rawValue.ToLowerInvariant()) {
-				case "park": return ClientMessages.NakAction.Park;
-				case "retry": return ClientMessages.NakAction.Retry;
-				case "skip": return ClientMessages.NakAction.Skip;
-				case "stop": return ClientMessages.NakAction.Stop;
-				default: return ClientMessages.NakAction.Unknown;
-			}
-		}
-
-		private void AckMessages(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-			var envelope = new NoopEnvelope();
-			var groupname = match.BoundVariables["subscription"];
-			var stream = match.BoundVariables["stream"];
-			var messageIds = match.BoundVariables["messageIds"];
-			var ids = new List<Guid>();
-			foreach (var messageId in messageIds.Split(new[] {','})) {
-				Guid id;
-				if (!Guid.TryParse(messageId, out id)) {
-					http.ReplyStatus(HttpStatusCode.BadRequest, "messageid should be a properly formed guid",
-						exception => { });
-					return;
-				}
-
-				ids.Add(id);
-			}
-
-			var cmd = new ClientMessage.PersistentSubscriptionAckEvents(
-				Guid.NewGuid(),
-				Guid.NewGuid(),
-				envelope,
-				BuildSubscriptionGroupKey(stream, groupname),
-				ids.ToArray(),
-				http.User);
-			Publish(cmd);
-			http.ReplyStatus(HttpStatusCode.Accepted, "", exception => { });
-		}
-
-		private void NackMessages(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-			var envelope = new NoopEnvelope();
-			var groupname = match.BoundVariables["subscription"];
-			var stream = match.BoundVariables["stream"];
-			var messageIds = match.BoundVariables["messageIds"];
-			var nakAction = GetNackAction(http, match);
-			var ids = new List<Guid>();
-			foreach (var messageId in messageIds.Split(new[] {','})) {
-				Guid id;
-				if (!Guid.TryParse(messageId, out id)) {
-					http.ReplyStatus(HttpStatusCode.BadRequest, "messageid should be a properly formed guid",
-						exception => { });
-					return;
-				}
-
-				ids.Add(id);
-			}
-
-			var cmd = new ClientMessage.PersistentSubscriptionNackEvents(
-				Guid.NewGuid(),
-				Guid.NewGuid(),
-				envelope,
-				BuildSubscriptionGroupKey(stream, groupname),
-				"Nacked from HTTP",
-				nakAction,
-				ids.ToArray(),
-				http.User);
-			Publish(cmd);
-			http.ReplyStatus(HttpStatusCode.Accepted, "", exception => { });
-		}
-
-		private static string BuildSubscriptionGroupKey(string stream, string groupName) {
-			return stream + "::" + groupName;
-		}
-
-		private static string BuildSubscriptionParkedStreamName(string stream, string groupName) {
-			return "$persistentsubscription-" + BuildSubscriptionGroupKey(stream, groupName) + "-parked";
-		}
-
-		private void AckMessage(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-			var envelope = new NoopEnvelope();
-			var groupname = match.BoundVariables["subscription"];
-			var stream = match.BoundVariables["stream"];
-			var messageId = match.BoundVariables["messageId"];
-			var id = Guid.NewGuid();
-			if (!Guid.TryParse(messageId, out id)) {
-				http.ReplyStatus(HttpStatusCode.BadRequest, "messageid should be a properly formed guid",
-					exception => { });
-				return;
-			}
-
-			var cmd = new ClientMessage.PersistentSubscriptionAckEvents(
-				Guid.NewGuid(),
-				Guid.NewGuid(),
-				envelope,
-				BuildSubscriptionGroupKey(stream, groupname),
-				new[] {id},
-				http.User);
-			Publish(cmd);
-			http.ReplyStatus(HttpStatusCode.Accepted, "", exception => { });
-		}
-
-		private void NackMessage(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-			var envelope = new NoopEnvelope();
-			var groupname = match.BoundVariables["subscription"];
-			var stream = match.BoundVariables["stream"];
-			var messageId = match.BoundVariables["messageId"];
-			var nakAction = GetNackAction(http, match);
-			var id = Guid.NewGuid();
-			if (!Guid.TryParse(messageId, out id)) {
-				http.ReplyStatus(HttpStatusCode.BadRequest, "messageid should be a properly formed guid",
-					exception => { });
-				return;
-			}
-
-			var cmd = new ClientMessage.PersistentSubscriptionNackEvents(
-				Guid.NewGuid(),
-				Guid.NewGuid(),
-				envelope,
-				BuildSubscriptionGroupKey(stream, groupname),
-				"Nacked from HTTP",
-				nakAction,
-				new[] {id},
-				http.User);
-			Publish(cmd);
-			http.ReplyStatus(HttpStatusCode.Accepted, "", exception => { });
-		}
-		
-		private void ReplayParkedMessages(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-			var envelope = new SendToHttpEnvelope(
-				_networkSendQueue, http,
-				(args, message) => http.ResponseCodec.To(message),
-				(args, message) => {
-					int code;
-					var m = message as ClientMessage.ReplayMessagesReceived;
-					if (m == null) throw new Exception("unexpected message " + message);
-					switch (m.Result) {
-						case ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.Success:
-							code = HttpStatusCode.OK;
-							break;
-						case ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.DoesNotExist:
-							code = HttpStatusCode.NotFound;
-							break;
-						case ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.AccessDenied:
-							code = HttpStatusCode.Unauthorized;
-							break;
-						default:
-							code = HttpStatusCode.InternalServerError;
-							break;
-					}
-
-					return new ResponseConfiguration(code, http.ResponseCodec.ContentType,
-						http.ResponseCodec.Encoding);
-				});
-			var groupname = match.BoundVariables["subscription"];
-			var stream = match.BoundVariables["stream"];
-			var stopAtStr = match.BoundVariables["stopAt"];
-			
-			long? stopAt;
-			// if stopAt is declared...
-			if (stopAtStr != null) {
-				// check it is valid
-				if (!long.TryParse(stopAtStr, out var stopAtLong) || stopAtLong < 0) {
-					http.ReplyStatus(HttpStatusCode.BadRequest, "stopAt should be a properly formed positive long",
-						exception => { });
-					return;
-				}
-
-				stopAt = stopAtLong;
-			} else {
-				// else it's null
-				stopAt = null;
-			}
-
-			var cmd = new ClientMessage.ReplayParkedMessages(Guid.NewGuid(), Guid.NewGuid(), envelope, stream,
-				groupname, stopAt, http.User);
-			Publish(cmd);
-		}
-
-		private void PutSubscription(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-			var groupname = match.BoundVariables["subscription"];
-			var stream = match.BoundVariables["stream"];
-			var envelope = new SendToHttpEnvelope(
-				_networkSendQueue, http,
-				(args, message) => http.ResponseCodec.To(message),
-				(args, message) => {
-					int code;
-					var m = message as ClientMessage.CreatePersistentSubscriptionToStreamCompleted;
-					if (m == null) throw new Exception("unexpected message " + message);
-					switch (m.Result) {
-						case ClientMessage.CreatePersistentSubscriptionToStreamCompleted
-							.CreatePersistentSubscriptionToStreamResult
-							.Success:
-							code = HttpStatusCode.Created;
-							break;
-						case ClientMessage.CreatePersistentSubscriptionToStreamCompleted
-							.CreatePersistentSubscriptionToStreamResult
-							.AlreadyExists:
-							code = HttpStatusCode.Conflict;
-							break;
-						case ClientMessage.CreatePersistentSubscriptionToStreamCompleted
-							.CreatePersistentSubscriptionToStreamResult
-							.AccessDenied:
-							code = HttpStatusCode.Unauthorized;
-							break;
-						case ClientMessage.CreatePersistentSubscriptionToStreamCompleted
-							.CreatePersistentSubscriptionToStreamResult.Fail:
-							code = HttpStatusCode.BadRequest;
-							break;
-						default:
-							code = HttpStatusCode.InternalServerError;
-							break;
-					}
-
-					return new ResponseConfiguration(code, http.ResponseCodec.ContentType,
-						http.ResponseCodec.Encoding,
-						new KeyValuePair<string, string>("location",
-							MakeUrl(http, "/subscriptions/" + stream + "/" + groupname)));
-				});
-			http.ReadTextRequestAsync(
-				(o, s) => {
-					var data = http.RequestCodec.From<SubscriptionConfigData>(s);
-					var config = ParseConfig(data);
-					if (!ValidateConfig(config, http)) return;
-					var message = new ClientMessage.CreatePersistentSubscriptionToStream(Guid.NewGuid(),
-						Guid.NewGuid(),
-						envelope,
-						stream,
-						groupname,
-						config.ResolveLinktos,
-						#pragma warning disable 612
-						config.StartPosition != null ? long.Parse(config.StartPosition) : config.StartFrom,
-						#pragma warning restore 612
-						config.MessageTimeoutMilliseconds,
-						config.ExtraStatistics,
-						config.MaxRetryCount,
-						config.BufferSize,
-						config.LiveBufferSize,
-						config.ReadBatchSize,
-						config.CheckPointAfterMilliseconds,
-						config.MinCheckPointCount,
-						config.MaxCheckPointCount,
-						config.MaxSubscriberCount,
-						CalculateNamedConsumerStrategyForOldClients(data),
-						http.User);
-					Publish(message);
-				}, x => Log.Debug(x, "Reply Text Content Failed."));
-		}
-
-		private void PostSubscription(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-			var groupname = match.BoundVariables["subscription"];
-			var stream = match.BoundVariables["stream"];
-			var envelope = new SendToHttpEnvelope(
-				_networkSendQueue, http,
-				(args, message) => http.ResponseCodec.To(message),
-				(args, message) => {
-					int code;
-					var m = message as ClientMessage.UpdatePersistentSubscriptionToStreamCompleted;
-					if (m == null) throw new Exception("unexpected message " + message);
-					switch (m.Result) {
-						case ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult
-							.Success:
-							code = HttpStatusCode.OK;
-							//TODO competing return uri to subscription
-							break;
-						case ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult
-							.DoesNotExist:
-							code = HttpStatusCode.NotFound;
-							break;
-						case ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult
-							.AccessDenied:
-							code = HttpStatusCode.Unauthorized;
-							break;
-						case ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult
-							.Fail:
-							code = HttpStatusCode.BadRequest;
-							break;
-						default:
-							code = HttpStatusCode.InternalServerError;
-							break;
-					}
-
-					return new ResponseConfiguration(code, http.ResponseCodec.ContentType,
-						http.ResponseCodec.Encoding,
-						new KeyValuePair<string, string>("location",
-							MakeUrl(http, "/subscriptions/" + stream + "/" + groupname)));
-				});
-			http.ReadTextRequestAsync(
-				(o, s) => {
-					var data = http.RequestCodec.From<SubscriptionConfigData>(s);
-					var config = ParseConfig(data);
-					if (!ValidateConfig(config, http)) return;
-					var message = new ClientMessage.UpdatePersistentSubscriptionToStream(Guid.NewGuid(),
-						Guid.NewGuid(),
-						envelope,
-						stream,
-						groupname,
-						config.ResolveLinktos,
-						#pragma warning disable 612
-						config.StartPosition != null ? long.Parse(config.StartPosition) : config.StartFrom,
-						#pragma warning restore 612
-						config.MessageTimeoutMilliseconds,
-						config.ExtraStatistics,
-						config.MaxRetryCount,
-						config.BufferSize,
-						config.LiveBufferSize,
-						config.ReadBatchSize,
-						config.CheckPointAfterMilliseconds,
-						config.MinCheckPointCount,
-						config.MaxCheckPointCount,
-						config.MaxSubscriberCount,
-						CalculateNamedConsumerStrategyForOldClients(data),
-						http.User);
-					Publish(message);
-				}, x => Log.Debug(x, "Reply Text Content Failed."));
-		}
-
-		private SubscriptionConfigData ParseConfig(SubscriptionConfigData config) {
-			if (config == null) {
-				return new SubscriptionConfigData();
-			}
-
-			return new SubscriptionConfigData {
-				ResolveLinktos = config.ResolveLinktos,
-				#pragma warning disable 612
-				StartFrom = config.StartFrom,
-				#pragma warning restore 612
-				StartPosition = config.StartPosition,
-				MessageTimeoutMilliseconds = config.MessageTimeoutMilliseconds,
-				ExtraStatistics = config.ExtraStatistics,
-				MaxRetryCount = config.MaxRetryCount,
-				BufferSize = config.BufferSize,
-				LiveBufferSize = config.LiveBufferSize,
-				ReadBatchSize = config.ReadBatchSize,
-				CheckPointAfterMilliseconds = config.CheckPointAfterMilliseconds,
-				MinCheckPointCount = config.MinCheckPointCount,
-				MaxCheckPointCount = config.MaxCheckPointCount,
-				MaxSubscriberCount = config.MaxSubscriberCount
-			};
-		}
-
-		private bool ValidateConfig(SubscriptionConfigData config, HttpEntityManager http) {
-			if (config.BufferSize <= 0) {
-				SendBadRequest(
-					http,
-					string.Format(
-						"Buffer Size ({0}) must be positive",
-						config.BufferSize));
-				return false;
-			}
-
-			if (config.LiveBufferSize <= 0) {
-				SendBadRequest(
-					http,
-					string.Format(
-						"Live Buffer Size ({0}) must be positive",
-						config.LiveBufferSize));
-				return false;
-			}
-
-			if (config.ReadBatchSize <= 0) {
-				SendBadRequest(
-					http,
-					string.Format(
-						"Read Batch Size ({0}) must be positive",
-						config.ReadBatchSize));
-				return false;
-			}
-
-			if (!(config.BufferSize > config.ReadBatchSize)) {
-				SendBadRequest(
-					http,
-					string.Format(
-						"BufferSize ({0}) must be larger than ReadBatchSize ({1})",
-						config.BufferSize, config.ReadBatchSize));
-				return false;
-			}
-
-			return true;
-		}
-
-		private static string CalculateNamedConsumerStrategyForOldClients(SubscriptionConfigData data) {
-			var namedConsumerStrategy = data == null ? null : data.NamedConsumerStrategy;
-			if (string.IsNullOrEmpty(namedConsumerStrategy)) {
-				var preferRoundRobin = data == null || data.PreferRoundRobin;
-				namedConsumerStrategy = preferRoundRobin
-					? SystemConsumerStrategies.RoundRobin
-					: SystemConsumerStrategies.DispatchToSingle;
-			}
-
-			return namedConsumerStrategy;
-		}
-
-		private void DeleteSubscription(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-			var envelope = new SendToHttpEnvelope(
-				_networkSendQueue, http,
-				(args, message) => http.ResponseCodec.To(message),
-				(args, message) => {
-					int code;
-					var m = message as ClientMessage.DeletePersistentSubscriptionToStreamCompleted;
-					if (m == null) throw new Exception("unexpected message " + message);
-					switch (m.Result) {
-						case ClientMessage.DeletePersistentSubscriptionToStreamCompleted.DeletePersistentSubscriptionToStreamResult
-							.Success:
-							code = HttpStatusCode.OK;
-							break;
-						case ClientMessage.DeletePersistentSubscriptionToStreamCompleted.DeletePersistentSubscriptionToStreamResult
-							.DoesNotExist:
-							code = HttpStatusCode.NotFound;
-							break;
-						case ClientMessage.DeletePersistentSubscriptionToStreamCompleted.DeletePersistentSubscriptionToStreamResult
-							.AccessDenied:
-							code = HttpStatusCode.Unauthorized;
-							break;
-						case ClientMessage.DeletePersistentSubscriptionToStreamCompleted.DeletePersistentSubscriptionToStreamResult
-							.Fail:
-							code = HttpStatusCode.BadRequest;
-							break;
-						default:
-							code = HttpStatusCode.InternalServerError;
-							break;
-					}
-
-					return new ResponseConfiguration(code, http.ResponseCodec.ContentType,
-						http.ResponseCodec.Encoding);
-				});
-			var groupname = match.BoundVariables["subscription"];
-			var stream = match.BoundVariables["stream"];
-			var cmd = new ClientMessage.DeletePersistentSubscriptionToStream(Guid.NewGuid(), Guid.NewGuid(), envelope, stream,
-				groupname, http.User);
-			Publish(cmd);
-		}
-		
-		private void RestartPersistentSubscriptions(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-
-			var envelope = new SendToHttpEnvelope<SubscriptionMessage.PersistentSubscriptionsRestarting>(_networkSendQueue, http,
-				(e, message) => e.To("Restarting"),
-				(e, message) => {
-					switch (message) {
-						case SubscriptionMessage.PersistentSubscriptionsRestarting _:
-							return Configure.Ok(e.ContentType);
-						default:
-							return Configure.InternalServerError();
-					}
-				}, CreateErrorEnvelope(http)
-			);
-
-			Publish(new SubscriptionMessage.PersistentSubscriptionsRestart(envelope));
-		}
-
-		private void GetAllSubscriptionInfo(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-			var envelope = new SendToHttpEnvelope(
-				_networkSendQueue, http,
-				(args, message) =>
-					http.ResponseCodec.To(ToSummaryDto(http,
-						message as MonitoringMessage.GetPersistentSubscriptionStatsCompleted).ToArray()),
-				(args, message) => StatsConfiguration(http, message));
-			var cmd = new MonitoringMessage.GetAllPersistentSubscriptionStats(envelope);
-			Publish(cmd);
-		}
-
-		private void GetSubscriptionInfoForStream(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-			var stream = match.BoundVariables["stream"];
-			var envelope = new SendToHttpEnvelope(
-				_networkSendQueue, http,
-				(args, message) =>
-					http.ResponseCodec.To(ToSummaryDto(http,
-						message as MonitoringMessage.GetPersistentSubscriptionStatsCompleted).ToArray()),
-				(args, message) => StatsConfiguration(http, message));
-			var cmd = new MonitoringMessage.GetStreamPersistentSubscriptionStats(envelope, stream);
-			Publish(cmd);
-		}
-
-		private void GetSubscriptionInfo(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-			var stream = match.BoundVariables["stream"];
-			var groupName = match.BoundVariables["subscription"];
-			var envelope = new SendToHttpEnvelope(
-				_networkSendQueue, http,
-				(args, message) =>
-					http.ResponseCodec.To(
-						ToDto(http, message as MonitoringMessage.GetPersistentSubscriptionStatsCompleted)
-							.FirstOrDefault()),
-				(args, message) => StatsConfiguration(http, message));
-			var cmd = new MonitoringMessage.GetPersistentSubscriptionStats(envelope, stream, groupName);
-			Publish(cmd);
-		}
-		
-		private IEnvelope CreateErrorEnvelope(HttpEntityManager http) {
-			return new SendToHttpEnvelope<SubscriptionMessage.InvalidPersistentSubscriptionsRestart>(
-				_networkSendQueue,
-				http,
-				ErrorFormatter,
-				ErrorConfigurator,
-				null);
-		}
-
-		private ResponseConfiguration ErrorConfigurator(ICodec codec, SubscriptionMessage.InvalidPersistentSubscriptionsRestart message) {
-			return new ResponseConfiguration(HttpStatusCode.BadRequest, "Bad Request", "text/plain",
-				Helper.UTF8NoBom);
-		}
-
-		private string ErrorFormatter(ICodec codec, SubscriptionMessage.InvalidPersistentSubscriptionsRestart message) {
-			return message.Reason;
-		}
-
-
-		private static ResponseConfiguration StatsConfiguration(HttpEntityManager http, Message message) {
-			int code;
-			var m = message as MonitoringMessage.GetPersistentSubscriptionStatsCompleted;
-			if (m == null) throw new Exception("unexpected message " + message);
-			switch (m.Result) {
-				case MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.Success:
-					code = HttpStatusCode.OK;
-					break;
-				case MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotFound:
-					code = HttpStatusCode.NotFound;
-					break;
-				case MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotReady:
-					code = HttpStatusCode.ServiceUnavailable;
-					break;
-				default:
-					code = HttpStatusCode.InternalServerError;
-					break;
-			}
-
-			return new ResponseConfiguration(code, http.ResponseCodec.ContentType,
-				http.ResponseCodec.Encoding);
-		}
-
-		private void GetNextNMessages(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-			var groupname = match.BoundVariables["subscription"];
-			var stream = match.BoundVariables["stream"];
-			var cnt = match.BoundVariables["count"];
-			var embed = GetEmbedLevel(http, match);
-			int count = DefaultNumberOfMessagesToGet;
-			if (!cnt.IsEmptyString() && (!int.TryParse(cnt, out count) || count > 100 || count < 1)) {
-				SendBadRequest(http,
-					string.Format("Message count must be an integer between 1 and 100 'count' ='{0}'", count));
-				return;
-			}
-
-			var envelope = new SendToHttpEnvelope(
-				_networkSendQueue, http,
-				(args, message) => Format.ReadNextNPersistentMessagesCompleted(http,
-					message as ClientMessage.ReadNextNPersistentMessagesCompleted, stream, groupname, count, embed),
-				(args, message) => {
-					int code;
-					var m = message as ClientMessage.ReadNextNPersistentMessagesCompleted;
-					if (m == null) throw new Exception("unexpected message " + message);
-					switch (m.Result) {
-						case
-							ClientMessage.ReadNextNPersistentMessagesCompleted.ReadNextNPersistentMessagesResult
-								.Success:
-							code = HttpStatusCode.OK;
-							break;
-						case
-							ClientMessage.ReadNextNPersistentMessagesCompleted.ReadNextNPersistentMessagesResult
-								.DoesNotExist:
-							code = HttpStatusCode.NotFound;
-							break;
-						case
-							ClientMessage.ReadNextNPersistentMessagesCompleted.ReadNextNPersistentMessagesResult
-								.AccessDenied:
-							code = HttpStatusCode.Unauthorized;
-							break;
-						case
-							ClientMessage.ReadNextNPersistentMessagesCompleted.ReadNextNPersistentMessagesResult
-								.Fail:
-							code = HttpStatusCode.BadRequest;
-							break;
-						default:
-							code = HttpStatusCode.InternalServerError;
-							break;
-					}
-
-					return new ResponseConfiguration(code, http.ResponseCodec.ContentType,
-						http.ResponseCodec.Encoding);
-				});
-
-			var cmd = new ClientMessage.ReadNextNPersistentMessages(
-				Guid.NewGuid(),
-				Guid.NewGuid(),
-				envelope,
-				stream,
-				groupname,
-				count,
-				http.User);
-			Publish(cmd);
-		}
-
-		private static EmbedLevel GetEmbedLevel(HttpEntityManager manager, UriTemplateMatch match,
-			EmbedLevel htmlLevel = EmbedLevel.PrettyBody) {
-			if (manager.ResponseCodec is IRichAtomCodec)
-				return htmlLevel;
-			var rawValue = match.BoundVariables["embed"] ?? string.Empty;
-			switch (rawValue.ToLowerInvariant()) {
-				case "content": return EmbedLevel.Content;
-				case "rich": return EmbedLevel.Rich;
-				case "body": return EmbedLevel.Body;
-				case "pretty": return EmbedLevel.PrettyBody;
-				case "tryharder": return EmbedLevel.TryHarder;
-				default: return EmbedLevel.None;
-			}
-		}
-
-		string parkedMessageUriTemplate =
-			"/streams/" + Uri.EscapeDataString("$persistentsubscription") + "-{0}::{1}-parked";
-
-		private IEnumerable<SubscriptionInfo> ToDto(HttpEntityManager manager,
-			MonitoringMessage.GetPersistentSubscriptionStatsCompleted message) {
-			if (message == null) yield break;
-			if (message.SubscriptionStats == null) yield break;
-
-			foreach (var stat in message.SubscriptionStats) {
-				string escapedStreamId = Uri.EscapeDataString(stat.EventSource);
-				string escapedGroupName = Uri.EscapeDataString(stat.GroupName);
-				var info = new SubscriptionInfo {
-					Links = new List<RelLink>() {
-						new RelLink(
-							MakeUrl(manager,
-								string.Format("/subscriptions/{0}/{1}/info", escapedStreamId, escapedGroupName)),
-							"detail"),
-						new RelLink(
-							MakeUrl(manager,
-								string.Format("/subscriptions/{0}/{1}/replayParked", escapedStreamId,
-									escapedGroupName)), "replayParked")
-					},
-					EventStreamId = stat.EventSource,
-					GroupName = stat.GroupName,
-					Status = stat.Status,
-					AverageItemsPerSecond = stat.AveragePerSecond,
-					TotalItemsProcessed = stat.TotalItems,
-					CountSinceLastMeasurement = stat.CountSinceLastMeasurement,
-					#pragma warning disable 612
-					LastKnownEventNumber = long.TryParse(stat.LastKnownEventPosition, out var lastKnownMsg) ? lastKnownMsg : 0,
-					#pragma warning restore 612
-					LastKnownEventPosition = stat.LastKnownEventPosition,
-					#pragma warning disable 612
-					LastProcessedEventNumber = long.TryParse(stat.LastCheckpointedEventPosition, out var lastProcessedPos) ? lastProcessedPos : 0,
-					#pragma warning restore 612
-					LastCheckpointedEventPosition = stat.LastCheckpointedEventPosition,
-					ReadBufferCount = stat.ReadBufferCount,
-					LiveBufferCount = stat.LiveBufferCount,
-					RetryBufferCount = stat.RetryBufferCount,
-					TotalInFlightMessages = stat.TotalInFlightMessages,
-					OutstandingMessagesCount = stat.OutstandingMessagesCount,
-					ParkedMessageUri = MakeUrl(manager,
-						string.Format(parkedMessageUriTemplate, escapedStreamId, escapedGroupName)),
-					GetMessagesUri = MakeUrl(manager,
-						string.Format("/subscriptions/{0}/{1}/{2}", escapedStreamId, escapedGroupName,
-							DefaultNumberOfMessagesToGet)),
-					Config = new SubscriptionConfigData {
-						CheckPointAfterMilliseconds = stat.CheckPointAfterMilliseconds,
-						BufferSize = stat.BufferSize,
-						LiveBufferSize = stat.LiveBufferSize,
-						MaxCheckPointCount = stat.MaxCheckPointCount,
-						MaxRetryCount = stat.MaxRetryCount,
-						MessageTimeoutMilliseconds = stat.MessageTimeoutMilliseconds,
-						MinCheckPointCount = stat.MinCheckPointCount,
-						NamedConsumerStrategy = stat.NamedConsumerStrategy,
-						PreferRoundRobin = stat.NamedConsumerStrategy == SystemConsumerStrategies.RoundRobin,
-						ReadBatchSize = stat.ReadBatchSize,
-						ResolveLinktos = stat.ResolveLinktos,
-						#pragma warning disable 612
-						StartFrom = long.TryParse(stat.StartFrom, out var startFrom) ? startFrom : 0,
-						#pragma warning restore 612
-						StartPosition = stat.StartFrom,
-						ExtraStatistics = stat.ExtraStatistics,
-						MaxSubscriberCount = stat.MaxSubscriberCount,
-					},
-					Connections = new List<ConnectionInfo>(),
-					ParkedMessageCount = stat.ParkedMessageCount
-				};
-				if (stat.Connections != null) {
-					foreach (var connection in stat.Connections) {
-						info.Connections.Add(new ConnectionInfo {
-							Username = connection.Username,
-							From = connection.From,
-							AverageItemsPerSecond = connection.AverageItemsPerSecond,
-							CountSinceLastMeasurement = connection.CountSinceLastMeasurement,
-							TotalItemsProcessed = connection.TotalItems,
-							AvailableSlots = connection.AvailableSlots,
-							InFlightMessages = connection.InFlightMessages,
-							ExtraStatistics = connection.ObservedMeasurements ?? new List<Measurement>(),
-							ConnectionName = connection.ConnectionName,
-						});
-					}
-				}
-
-				yield return info;
-			}
-		}
-
-		private IEnumerable<SubscriptionSummary> ToSummaryDto(HttpEntityManager manager,
-			MonitoringMessage.GetPersistentSubscriptionStatsCompleted message) {
-			if (message == null) yield break;
-			if (message.SubscriptionStats == null) yield break;
-
-			foreach (var stat in message.SubscriptionStats) {
-				string escapedStreamId = Uri.EscapeDataString(stat.EventSource);
-				string escapedGroupName = Uri.EscapeDataString(stat.GroupName);
-				var info = new SubscriptionSummary {
-					Links = new List<RelLink>() {
-						new RelLink(
-							MakeUrl(manager,
-								string.Format("/subscriptions/{0}/{1}/info", escapedStreamId, escapedGroupName)),
-							"detail"),
-					},
-					EventStreamId = stat.EventSource,
-					GroupName = stat.GroupName,
-					Status = stat.Status,
-					AverageItemsPerSecond = stat.AveragePerSecond,
-					TotalItemsProcessed = stat.TotalItems,
-					#pragma warning disable 612
-					LastKnownEventNumber = long.TryParse(stat.LastKnownEventPosition, out var lastKnownMsg) ? lastKnownMsg : 0,
-					#pragma warning restore 612
-					LastKnownEventPosition = stat.LastKnownEventPosition,
-					#pragma warning disable 612
-					LastProcessedEventNumber = long.TryParse(stat.LastCheckpointedEventPosition, out var lastEventPos) ? lastEventPos : 0,
-					#pragma warning restore 612
-					LastCheckpointedEventPosition = stat.LastCheckpointedEventPosition,
-					ParkedMessageUri = MakeUrl(manager,
-						string.Format(parkedMessageUriTemplate, escapedStreamId, escapedGroupName)),
-					GetMessagesUri = MakeUrl(manager,
-						string.Format("/subscriptions/{0}/{1}/{2}", escapedStreamId, escapedGroupName,
-							DefaultNumberOfMessagesToGet)),
-					TotalInFlightMessages = stat.TotalInFlightMessages,
-				};
-				if (stat.Connections != null) {
-					info.ConnectionCount = stat.Connections.Count;
-				}
-
-				yield return info;
-			}
-		}
-
-		public class SubscriptionConfigData {
-			public bool ResolveLinktos { get; set; }
-			[Obsolete] public long StartFrom { get; set; }
-			public string StartPosition { get; set; }
-			public int MessageTimeoutMilliseconds { get; set; }
-			public bool ExtraStatistics { get; set; }
-			public int MaxRetryCount { get; set; }
-			public int LiveBufferSize { get; set; }
-			public int BufferSize { get; set; }
-			public int ReadBatchSize { get; set; }
-			public bool PreferRoundRobin { get; set; }
-			public int CheckPointAfterMilliseconds { get; set; }
-			public int MinCheckPointCount { get; set; }
-			public int MaxCheckPointCount { get; set; }
-			public int MaxSubscriberCount { get; set; }
-			public string NamedConsumerStrategy { get; set; }
-
-			public SubscriptionConfigData() {
-				#pragma warning disable 612
-				StartFrom = 0;
-				#pragma warning restore 612
-				StartPosition = null;
-				MessageTimeoutMilliseconds = 10000;
-				MaxRetryCount = 10;
-				CheckPointAfterMilliseconds = 1000;
-				MinCheckPointCount = 10;
-				MaxCheckPointCount = 500;
-				MaxSubscriberCount = 10;
-				NamedConsumerStrategy = "RoundRobin";
-
-				BufferSize = 500;
-				LiveBufferSize = 500;
-				ReadBatchSize = 20;
-			}
-		}
-
-		public class SubscriptionSummary {
-			public List<RelLink> Links { get; set; }
-			public string EventStreamId { get; set; }
-			public string GroupName { get; set; }
-			public string ParkedMessageUri { get; set; }
-			public string GetMessagesUri { get; set; }
-			public string Status { get; set; }
-			public decimal AverageItemsPerSecond { get; set; }
-			public long TotalItemsProcessed { get; set; }
-			[Obsolete] public long LastProcessedEventNumber { get; set; }
-			public string LastCheckpointedEventPosition { get; set; }
-			[Obsolete] public long LastKnownEventNumber { get; set; }
-			public string LastKnownEventPosition { get; set; }
-			public int ConnectionCount { get; set; }
-			public int TotalInFlightMessages { get; set; }
-		}
-
-		public class SubscriptionInfo {
-			public List<RelLink> Links { get; set; }
-			public SubscriptionConfigData Config { get; set; }
-			public string EventStreamId { get; set; }
-			public string GroupName { get; set; }
-			public string Status { get; set; }
-			public decimal AverageItemsPerSecond { get; set; }
-			public string ParkedMessageUri { get; set; }
-			public string GetMessagesUri { get; set; }
-			public long TotalItemsProcessed { get; set; }
-			public long CountSinceLastMeasurement { get; set; }
-			[Obsolete] public long LastProcessedEventNumber { get; set; }
-			public string LastCheckpointedEventPosition { get; set; }
-			[Obsolete] public long LastKnownEventNumber { get; set; }
-			public string LastKnownEventPosition { get; set; }
-			public int ReadBufferCount { get; set; }
-			public long LiveBufferCount { get; set; }
-			public int RetryBufferCount { get; set; }
-			public int TotalInFlightMessages { get; set; }
-			public int OutstandingMessagesCount { get; set; }
-			public List<ConnectionInfo> Connections { get; set; }
-			public long ParkedMessageCount { get; set; }
-		}
-
-		public class ConnectionInfo {
-			public string From { get; set; }
-			public string Username { get; set; }
-			public decimal AverageItemsPerSecond { get; set; }
-			public long TotalItemsProcessed { get; set; }
-			public long CountSinceLastMeasurement { get; set; }
-			public List<Measurement> ExtraStatistics { get; set; }
-			public int AvailableSlots { get; set; }
-			public int InFlightMessages { get; set; }
-			public string ConnectionName { get; set; }
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Controllers/PingController.cs b/src/EventStore.Core/Services/Transport/Http/Controllers/PingController.cs
deleted file mode 100644
index 1e8d1f18a51..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Controllers/PingController.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Messages;
-using EventStore.Plugins.Authorization;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Codecs;
-using EventStore.Transport.Http.EntityManagement;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Transport.Http.Controllers {
-	public class PingController : IHttpController {
-		private static readonly ILogger Log = Serilog.Log.ForContext<PingController>();
-
-		private static readonly ICodec[] SupportedCodecs = new ICodec[]
-			{Codec.Json, Codec.Xml, Codec.ApplicationXml, Codec.Text};
-
-		public void Subscribe(IHttpService service) {
-			Ensure.NotNull(service, "service");
-			service.RegisterAction(new ControllerAction("/ping", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Ping)),
-				OnGetPing);
-		}
-
-		private void OnGetPing(HttpEntityManager entity, UriTemplateMatch match) {
-			var response = new HttpMessage.TextMessage("Ping request successfully handled");
-			entity.ReplyTextContent(Format.TextMessage(entity, response),
-				HttpStatusCode.OK,
-				"OK",
-				entity.ResponseCodec.ContentType,
-				null,
-				e => Log.Error(e, "Error while writing HTTP response (ping)"));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Controllers/RelLink.cs b/src/EventStore.Core/Services/Transport/Http/Controllers/RelLink.cs
deleted file mode 100644
index da1854a27a8..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Controllers/RelLink.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Xml;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-
-namespace EventStore.Core.Services.Transport.Http.Controllers {
-	public class RelLink : IXmlSerializable {
-		public readonly string href;
-		public readonly string rel;
-
-		private RelLink() {
-		}
-
-		public RelLink(string href, string rel) {
-			this.href = href;
-			this.rel = rel;
-		}
-
-		public XmlSchema GetSchema() {
-			return null;
-		}
-
-		public void ReadXml(XmlReader reader) {
-			throw new NotImplementedException("Rel links not deserialized.");
-		}
-
-		public void WriteXml(XmlWriter writer) {
-			if (string.IsNullOrEmpty(href))
-				throw new Exception("null href when serializing a rel link");
-
-			writer.WriteStartElement("link");
-			writer.WriteAttributeString("href", href);
-
-			if (rel != null)
-				writer.WriteAttributeString("rel", rel);
-			writer.WriteEndElement();
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Controllers/StatController.cs b/src/EventStore.Core/Services/Transport/Http/Controllers/StatController.cs
deleted file mode 100644
index d121e3edb47..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Controllers/StatController.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Plugins.Authorization;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Codecs;
-using EventStore.Transport.Http.EntityManagement;
-
-namespace EventStore.Core.Services.Transport.Http.Controllers {
-	public class StatController : CommunicationController {
-		private static readonly ICodec[] SupportedCodecs = new ICodec[] {Codec.Json, Codec.Xml, Codec.ApplicationXml};
-
-		private readonly IPublisher _networkSendQueue;
-
-		public StatController(IPublisher publisher, IPublisher networkSendQueue)
-			: base(publisher) {
-			_networkSendQueue = networkSendQueue;
-		}
-
-		protected override void SubscribeCore(IHttpService service) {
-			Ensure.NotNull(service, "service");
-
-			service.RegisterAction(new ControllerAction("/stats", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Statistics.Read)),
-				OnGetFreshStats);
-			service.RegisterAction(
-				new ControllerAction("/stats/replication", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Statistics.Replication)),
-				OnGetReplicationStats);
-			service.RegisterAction(new ControllerAction("/stats/tcp", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Statistics.Tcp)),
-				OnGetTcpConnectionStats);
-			service.RegisterAction(
-				new ControllerAction("/stats/{*statPath}", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Statistics.Custom)),
-				OnGetFreshStats);
-		}
-
-		private void OnGetTcpConnectionStats(HttpEntityManager entity, UriTemplateMatch match) {
-			var envelope = new SendToHttpEnvelope(_networkSendQueue,
-				entity,
-				Format.GetFreshTcpConnectionStatsCompleted,
-				Configure.GetFreshTcpConnectionStatsCompleted);
-			Publish(new MonitoringMessage.GetFreshTcpConnectionStats(envelope));
-		}
-
-		private void OnGetFreshStats(HttpEntityManager entity, UriTemplateMatch match) {
-			var envelope = new SendToHttpEnvelope(_networkSendQueue,
-				entity,
-				Format.GetFreshStatsCompleted,
-				Configure.GetFreshStatsCompleted);
-
-			var statPath = match.BoundVariables["statPath"];
-			var statSelector = GetStatSelector(statPath);
-
-			bool useMetadata;
-			if (!bool.TryParse(match.QueryParameters["metadata"], out useMetadata))
-				useMetadata = false;
-
-			bool useGrouping;
-			if (!bool.TryParse(match.QueryParameters["group"], out useGrouping))
-				useGrouping = true;
-
-			if (!useGrouping && !string.IsNullOrEmpty(statPath)) {
-				SendBadRequest(entity, "Dynamic stats selection works only with grouping enabled");
-				return;
-			}
-
-			Publish(new MonitoringMessage.GetFreshStats(envelope, statSelector, useMetadata, useGrouping));
-		}
-
-		private static Func<Dictionary<string, object>, Dictionary<string, object>> GetStatSelector(string statPath) {
-			if (string.IsNullOrEmpty(statPath))
-				return dict => dict;
-
-			//NOTE: this is fix for Mono incompatibility in UriTemplate behavior for /a/b{*C}
-			//todo: use IsMono here?
-			if (statPath.StartsWith("stats/")) {
-				statPath = statPath.Substring(6);
-				if (string.IsNullOrEmpty(statPath))
-					return dict => dict;
-			}
-
-			var groups = statPath.Split('/');
-
-			return dict => {
-				Ensure.NotNull(dict, "dictionary");
-
-				foreach (string groupName in groups) {
-					object item;
-					if (!dict.TryGetValue(groupName, out item))
-						return null;
-
-					dict = item as Dictionary<string, object>;
-
-					if (dict == null)
-						return null;
-				}
-
-				return dict;
-			};
-		}
-
-		private void OnGetReplicationStats(HttpEntityManager entity, UriTemplateMatch match) {
-			var envelope = new SendToHttpEnvelope(_networkSendQueue,
-				entity,
-				Format.GetReplicationStatsCompleted,
-				Configure.GetReplicationStatsCompleted);
-			Publish(new ReplicationMessage.GetReplicationStats(envelope));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Controllers/UsersController.cs b/src/EventStore.Core/Services/Transport/Http/Controllers/UsersController.cs
deleted file mode 100644
index 7032db923fe..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Controllers/UsersController.cs
+++ /dev/null
@@ -1,246 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Plugins.Authorization;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Codecs;
-using EventStore.Transport.Http.EntityManagement;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Transport.Http.Controllers {
-	public class UsersController : CommunicationController {
-		private readonly IHttpForwarder _httpForwarder;
-		private readonly IPublisher _networkSendQueue;
-		private static readonly ICodec[] DefaultCodecs = new ICodec[] {Codec.Json, Codec.Xml};
-		private static readonly ILogger Log = Serilog.Log.ForContext<UsersController>();
-
-		public UsersController(IHttpForwarder httpForwarder, IPublisher publisher, IPublisher networkSendQueue)
-			: base(publisher) {
-			_httpForwarder = httpForwarder;
-			_networkSendQueue = networkSendQueue;
-		}
-
-		protected override void SubscribeCore(IHttpService service) {
-			RegisterUrlBased(service, "/users", HttpMethod.Get, new Operation(Operations.Users.List), GetUsers);
-			RegisterUrlBased(service, "/users/", HttpMethod.Get, new Operation(Operations.Users.List), GetUsers);
-			RegisterUrlBased(service, "/users/{login}", HttpMethod.Get, new Operation(Operations.Users.Read), GetUser);
-			RegisterUrlBased(service, "/users/$current", HttpMethod.Get, new Operation(Operations.Users.CurrentUser), GetCurrentUser);
-			Register(service, "/users", HttpMethod.Post, PostUser, DefaultCodecs, DefaultCodecs, new Operation(Operations.Users.Create));
-			Register(service, "/users/", HttpMethod.Post, PostUser, DefaultCodecs, DefaultCodecs, new Operation(Operations.Users.Create));
-			Register(service, "/users/{login}", HttpMethod.Put, PutUser, DefaultCodecs, DefaultCodecs, new Operation(Operations.Users.Update));
-			RegisterUrlBased(service, "/users/{login}", HttpMethod.Delete, new Operation(Operations.Users.Delete), DeleteUser);
-			RegisterUrlBased(service, "/users/{login}/command/enable", HttpMethod.Post, new Operation(Operations.Users.Enable), PostCommandEnable);
-			RegisterUrlBased(service, "/users/{login}/command/disable", HttpMethod.Post, new Operation(Operations.Users.Disable), PostCommandDisable);
-			Register(service, "/users/{login}/command/reset-password", HttpMethod.Post, PostCommandResetPassword,
-				DefaultCodecs, DefaultCodecs, new Operation(Operations.Users.ResetPassword));
-			Register(service, "/users/{login}/command/change-password", HttpMethod.Post, PostCommandChangePassword,
-				DefaultCodecs, DefaultCodecs, ForUser(Operations.Users.ChangePassword));
-		}
-
-		private static Func<UriTemplateMatch, Operation> ForUser(OperationDefinition definition) {
-			return match => new Operation(definition).WithParameter(Operations.Users.Parameters.User(match.BoundVariables["login"]));
-		}
-
-		private void GetUsers(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-
-			var envelope = CreateSendToHttpWithConversionEnvelope(http,
-				(UserManagementMessage.AllUserDetailsResult msg) =>
-					new UserManagementMessage.AllUserDetailsResultHttpFormatted(msg, s => MakeUrl(http, s)));
-
-			var message = new UserManagementMessage.GetAll(envelope, http.User);
-			Publish(message);
-		}
-
-		private void GetUser(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-
-			var envelope = CreateSendToHttpWithConversionEnvelope(http,
-				(UserManagementMessage.UserDetailsResult msg) =>
-					new UserManagementMessage.UserDetailsResultHttpFormatted(msg, s => MakeUrl(http, s)));
-
-			var login = match.BoundVariables["login"];
-			var message = new UserManagementMessage.Get(envelope, http.User, login);
-			Publish(message);
-		}
-
-		private void GetCurrentUser(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-			var envelope = CreateReplyEnvelope<UserManagementMessage.UserDetailsResult>(http);
-			if (http.User == null) {
-				envelope.ReplyWith(
-					new UserManagementMessage.UserDetailsResult(UserManagementMessage.Error.Unauthorized));
-				return;
-			}
-
-			var message = new UserManagementMessage.Get(envelope, http.User, http.User.Identity.Name);
-			Publish(message);
-		}
-
-		private void PostUser(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-			var envelope = CreateReplyEnvelope<UserManagementMessage.UpdateResult>(
-				http, configurator: (codec, result) => {
-					var configuration = AutoConfigurator(codec, result);
-					return configuration.Code == HttpStatusCode.OK
-						? configuration.SetCreated(
-							MakeUrl(http, "/users/" + Uri.EscapeDataString(result.LoginName)))
-						: configuration;
-				});
-			http.ReadTextRequestAsync(
-				(o, s) => {
-					var data = http.RequestCodec.From<PostUserData>(s);
-					var message = new UserManagementMessage.Create(
-						envelope, http.User, data.LoginName, data.FullName, data.Groups, data.Password);
-					Publish(message);
-				}, x => Log.Debug(x, "Reply Text Content Failed."));
-		}
-
-		private void PutUser(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-			var envelope = CreateReplyEnvelope<UserManagementMessage.UpdateResult>(http);
-			http.ReadTextRequestAsync(
-				(o, s) => {
-					var login = match.BoundVariables["login"];
-					var data = http.RequestCodec.From<PutUserData>(s);
-					var message =
-						new UserManagementMessage.Update(envelope, http.User, login, data.FullName, data.Groups);
-					Publish(message);
-				}, x => Log.Debug(x, "Reply Text Content Failed."));
-		}
-
-		private void DeleteUser(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-			var envelope = CreateReplyEnvelope<UserManagementMessage.UpdateResult>(http);
-			var login = match.BoundVariables["login"];
-			var message = new UserManagementMessage.Delete(envelope, http.User, login);
-			Publish(message);
-		}
-
-		private void PostCommandEnable(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-			var envelope = CreateReplyEnvelope<UserManagementMessage.UpdateResult>(http);
-			var login = match.BoundVariables["login"];
-			var message = new UserManagementMessage.Enable(envelope, http.User, login);
-			Publish(message);
-		}
-
-		private void PostCommandDisable(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-			var envelope = CreateReplyEnvelope<UserManagementMessage.UpdateResult>(http);
-			var login = match.BoundVariables["login"];
-			var message = new UserManagementMessage.Disable(envelope, http.User, login);
-			Publish(message);
-		}
-
-		private void PostCommandResetPassword(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-			var envelope = CreateReplyEnvelope<UserManagementMessage.UpdateResult>(http);
-			http.ReadTextRequestAsync(
-				(o, s) => {
-					var login = match.BoundVariables["login"];
-					var data = http.RequestCodec.From<ResetPasswordData>(s);
-					var message = new UserManagementMessage.ResetPassword(envelope, http.User, login, data.NewPassword);
-					Publish(message);
-				}, x => Log.Debug(x, "Reply Text Content Failed."));
-		}
-
-		private void PostCommandChangePassword(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-			var envelope = CreateReplyEnvelope<UserManagementMessage.UpdateResult>(http);
-			http.ReadTextRequestAsync(
-				(o, s) => {
-					var login = match.BoundVariables["login"];
-					var data = http.RequestCodec.From<ChangePasswordData>(s);
-					var message = new UserManagementMessage.ChangePassword(
-						envelope, http.User, login, data.CurrentPassword, data.NewPassword);
-					Publish(message);
-				},
-				x => Log.Debug(x, "Reply Text Content Failed."));
-		}
-
-		private SendToHttpEnvelope<T> CreateReplyEnvelope<T>(
-			HttpEntityManager http, Func<ICodec, T, string> formatter = null,
-			Func<ICodec, T, ResponseConfiguration> configurator = null)
-			where T : UserManagementMessage.ResponseMessage {
-			return new SendToHttpEnvelope<T>(
-				_networkSendQueue, http, formatter ?? AutoFormatter, configurator ?? AutoConfigurator, null);
-		}
-
-		private SendToHttpWithConversionEnvelope<T, R> CreateSendToHttpWithConversionEnvelope<T, R>(
-			HttpEntityManager http, Func<T, R> formatter)
-			where T : UserManagementMessage.ResponseMessage
-			where R : UserManagementMessage.ResponseMessage {
-			return new SendToHttpWithConversionEnvelope<T, R>(_networkSendQueue,
-				http,
-				(codec, msg) => codec.To(msg),
-				(codec, transformed) => transformed.Success
-					? new ResponseConfiguration(HttpStatusCode.OK, codec.ContentType, codec.Encoding)
-					: new ResponseConfiguration(
-						ErrorToHttpStatusCode(transformed.Error), codec.ContentType, codec.Encoding),
-				formatter);
-		}
-
-		private ResponseConfiguration AutoConfigurator<T>(ICodec codec, T result)
-			where T : UserManagementMessage.ResponseMessage {
-			return result.Success
-				? new ResponseConfiguration(HttpStatusCode.OK, codec.ContentType, codec.Encoding)
-				: new ResponseConfiguration(
-					ErrorToHttpStatusCode(result.Error), codec.ContentType, codec.Encoding);
-		}
-
-		private string AutoFormatter<T>(ICodec codec, T result) {
-			return codec.To(result);
-		}
-
-		private int ErrorToHttpStatusCode(UserManagementMessage.Error error) {
-			switch (error) {
-				case UserManagementMessage.Error.Success:
-					return HttpStatusCode.OK;
-				case UserManagementMessage.Error.Conflict:
-					return HttpStatusCode.Conflict;
-				case UserManagementMessage.Error.NotFound:
-					return HttpStatusCode.NotFound;
-				case UserManagementMessage.Error.Error:
-					return HttpStatusCode.InternalServerError;
-				case UserManagementMessage.Error.TryAgain:
-					return HttpStatusCode.RequestTimeout;
-				case UserManagementMessage.Error.Unauthorized:
-					return HttpStatusCode.Unauthorized;
-				default:
-					return HttpStatusCode.InternalServerError;
-			}
-		}
-
-		private class PostUserData {
-			public string LoginName { get; set; }
-			public string FullName { get; set; }
-			public string[] Groups { get; set; }
-			public string Password { get; set; }
-		}
-
-		private class PutUserData {
-			public string FullName { get; set; }
-			public string[] Groups { get; set; }
-		}
-
-		private class ResetPasswordData {
-			public string NewPassword { get; set; }
-		}
-
-		private class ChangePasswordData {
-			public string CurrentPassword { get; set; }
-			public string NewPassword { get; set; }
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Convert.cs b/src/EventStore.Core/Services/Transport/Http/Convert.cs
deleted file mode 100644
index d3f9d52544b..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Convert.cs
+++ /dev/null
@@ -1,503 +0,0 @@
-using System;
-using System.Globalization;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Transport.Http.Controllers;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Atom;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System.Linq;
-using System.Collections.Generic;
-using EventStore.Transport.Http.Codecs;
-using System.Xml.Serialization;
-
-namespace EventStore.Core.Services.Transport.Http {
-	public static class Convert {
-		private static readonly string AllEscaped = Uri.EscapeDataString("$all");
-		private static readonly string AllFilteredEscaped = "%24all/filtered";
-
-		public static FeedElement ToStreamEventForwardFeed(ClientMessage.ReadStreamEventsForwardCompleted msg,
-			Uri requestedUrl, EmbedLevel embedContent) {
-			Ensure.NotNull(msg, "msg");
-
-			string escapedStreamId = Uri.EscapeDataString(msg.EventStreamId);
-			var self = HostName.Combine(requestedUrl, "/streams/{0}", escapedStreamId);
-			var feed = new FeedElement();
-			feed.SetTitle(string.Format("Event stream '{0}'", msg.EventStreamId));
-			feed.StreamId = msg.EventStreamId;
-			feed.SetId(self);
-			feed.SetUpdated(msg.Events.Length > 0 && msg.Events[0].Event != null
-				? msg.Events[0].Event.TimeStamp
-				: DateTime.MinValue.ToUniversalTime());
-			feed.SetAuthor(AtomSpecs.Author);
-			feed.SetHeadOfStream(msg.IsEndOfStream);
-
-			var prevEventNumber = Math.Min(msg.FromEventNumber + msg.MaxCount - 1, msg.LastEventNumber) + 1;
-			var nextEventNumber = msg.FromEventNumber - 1;
-
-			feed.AddLink("self", self);
-			feed.AddLink("first",
-				HostName.Combine(requestedUrl, "/streams/{0}/head/backward/{1}", escapedStreamId, msg.MaxCount));
-			if (nextEventNumber >= 0) {
-				feed.AddLink("last",
-					HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", escapedStreamId, 0, msg.MaxCount));
-				feed.AddLink("next",
-					HostName.Combine(requestedUrl, "/streams/{0}/{1}/backward/{2}", escapedStreamId, nextEventNumber,
-						msg.MaxCount));
-			}
-
-			if (!msg.IsEndOfStream || msg.Events.Length > 0)
-				feed.AddLink("previous",
-					HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", escapedStreamId, prevEventNumber,
-						msg.MaxCount));
-			if (!escapedStreamId.StartsWith("$$"))
-				feed.AddLink("metadata", HostName.Combine(requestedUrl, "/streams/{0}/metadata", escapedStreamId));
-			for (int i = msg.Events.Length - 1; i >= 0; --i) {
-				feed.AddEntry(ToEntry(msg.Events[i], requestedUrl, embedContent));
-			}
-
-			return feed;
-		}
-
-		public static FeedElement ToStreamEventBackwardFeed(ClientMessage.ReadStreamEventsBackwardCompleted msg,
-			Uri requestedUrl, EmbedLevel embedContent, bool headOfStream) {
-			Ensure.NotNull(msg, "msg");
-
-			string escapedStreamId = Uri.EscapeDataString(msg.EventStreamId);
-			var self = HostName.Combine(requestedUrl, "/streams/{0}", escapedStreamId);
-			var feed = new FeedElement();
-			feed.SetTitle(string.Format("Event stream '{0}'", msg.EventStreamId));
-			feed.StreamId = msg.EventStreamId;
-			feed.SetId(self);
-			feed.SetUpdated(msg.Events.Length > 0 && msg.Events[0].Event != null
-				? msg.Events[0].Event.TimeStamp
-				: DateTime.MinValue.ToUniversalTime());
-			feed.SetAuthor(AtomSpecs.Author);
-			feed.SetHeadOfStream(headOfStream); //TODO AN: remove this ?
-			feed.SetSelfUrl(self);
-			//TODO AN: remove this ?
-			if (headOfStream) //NOTE: etag workaround - to be fixed with better http handling model
-				feed.SetETag(Configure.GetPositionETag(msg.LastEventNumber, ContentType.AtomJson));
-
-			var prevEventNumber = Math.Min(msg.FromEventNumber, msg.LastEventNumber) + 1;
-			var nextEventNumber = msg.FromEventNumber - msg.MaxCount;
-
-			feed.AddLink("self", self);
-			feed.AddLink("first",
-				HostName.Combine(requestedUrl, "/streams/{0}/head/backward/{1}", escapedStreamId, msg.MaxCount));
-			if (!msg.IsEndOfStream) {
-				if (nextEventNumber < 0)
-					throw new Exception(string.Format("nextEventNumber is negative: {0} while IsEndOfStream",
-						nextEventNumber));
-				feed.AddLink("last",
-					HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", escapedStreamId, 0, msg.MaxCount));
-				feed.AddLink("next",
-					HostName.Combine(requestedUrl, "/streams/{0}/{1}/backward/{2}", escapedStreamId, nextEventNumber,
-						msg.MaxCount));
-			}
-
-			feed.AddLink("previous",
-				HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", escapedStreamId, prevEventNumber,
-					msg.MaxCount));
-			feed.AddLink("metadata", HostName.Combine(requestedUrl, "/streams/{0}/metadata", escapedStreamId));
-			for (int i = 0; i < msg.Events.Length; ++i) {
-				feed.AddEntry(ToEntry(msg.Events[i], requestedUrl, embedContent));
-			}
-
-			return feed;
-		}
-
-		public static FeedElement ToAllEventsForwardFeed(ClientMessage.ReadAllEventsForwardCompleted msg,
-			Uri requestedUrl, EmbedLevel embedContent) {
-			var self = HostName.Combine(requestedUrl, "/streams/{0}", AllEscaped);
-			var feed = new FeedElement();
-			feed.SetTitle("All events");
-			feed.SetId(self);
-			feed.SetUpdated(msg.Events.Length > 0 && msg.Events[0].Event != null
-				? msg.Events[msg.Events.Length - 1].Event.TimeStamp
-				: DateTime.MinValue.ToUniversalTime());
-			feed.SetAuthor(AtomSpecs.Author);
-
-			feed.AddLink("self", self);
-			feed.AddLink("first",
-				HostName.Combine(requestedUrl, "/streams/{0}/head/backward/{1}", AllEscaped, msg.MaxCount));
-			if (msg.CurrentPos.CommitPosition != 0) {
-				feed.AddLink("last",
-					HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", AllEscaped,
-						new TFPos(0, 0).AsString(), msg.MaxCount));
-				feed.AddLink("next",
-					HostName.Combine(requestedUrl, "/streams/{0}/{1}/backward/{2}", AllEscaped, msg.PrevPos.AsString(),
-						msg.MaxCount));
-			}
-
-			if (!msg.IsEndOfStream || msg.Events.Length > 0)
-				feed.AddLink("previous",
-					HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", AllEscaped, msg.NextPos.AsString(),
-						msg.MaxCount));
-			feed.AddLink("metadata", HostName.Combine(requestedUrl, "/streams/{0}/metadata", AllEscaped));
-			for (int i = msg.Events.Length - 1; i >= 0; --i) {
-				feed.AddEntry(ToEntry(msg.Events[i].WithoutPosition(), requestedUrl, embedContent));
-			}
-
-			return feed;
-		}
-		
-		public static FeedElement ToAllEventsForwardFilteredFeed(ClientMessage.FilteredReadAllEventsForwardCompleted msg,
-			Uri requestedUrl, EmbedLevel embedContent) {
-			var self = HostName.Combine(requestedUrl, "/streams/{0}", AllFilteredEscaped);
-			var feed = new FeedElement();
-			feed.SetTitle("All events");
-			feed.SetId(self);
-			feed.SetUpdated(msg.Events.Length > 0 && msg.Events[0].Event != null
-				? msg.Events[msg.Events.Length - 1].Event.TimeStamp
-				: DateTime.MinValue.ToUniversalTime());
-			feed.SetAuthor(AtomSpecs.Author);
-
-			feed.AddLink("self", self);
-			feed.AddLink("first",
-				HostName.Combine(requestedUrl, "/streams/{0}/head/backward/{1}", AllFilteredEscaped, msg.MaxCount));
-			if (msg.CurrentPos.CommitPosition != 0) {
-				feed.AddLink("last",
-					HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", AllFilteredEscaped,
-						new TFPos(0, 0).AsString(), msg.MaxCount));
-				feed.AddLink("next",
-					HostName.Combine(requestedUrl, "/streams/{0}/{1}/backward/{2}", AllFilteredEscaped, msg.PrevPos.AsString(),
-						msg.MaxCount));
-			}
-
-			if (!msg.IsEndOfStream || msg.Events.Length > 0)
-				feed.AddLink("previous",
-					HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", AllFilteredEscaped, msg.NextPos.AsString(),
-						msg.MaxCount));
-			for (int i = msg.Events.Length - 1; i >= 0; --i) {
-				feed.AddEntry(ToEntry(msg.Events[i].WithoutPosition(), requestedUrl, embedContent));
-			}
-
-			return feed;
-		}
-
-		public static FeedElement ToAllEventsBackwardFeed(ClientMessage.ReadAllEventsBackwardCompleted msg,
-			Uri requestedUrl, EmbedLevel embedContent) {
-			var self = HostName.Combine(requestedUrl, "/streams/{0}", AllEscaped);
-			var feed = new FeedElement();
-			feed.SetTitle(string.Format("All events"));
-			feed.SetId(self);
-			feed.SetUpdated(msg.Events.Length > 0 && msg.Events[0].Event != null
-				? msg.Events[0].Event.TimeStamp
-				: DateTime.MinValue.ToUniversalTime());
-			feed.SetAuthor(AtomSpecs.Author);
-
-			feed.AddLink("self", self);
-			feed.AddLink("first",
-				HostName.Combine(requestedUrl, "/streams/{0}/head/backward/{1}", AllEscaped, msg.MaxCount));
-			if (!msg.IsEndOfStream) {
-				feed.AddLink("last",
-					HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", AllEscaped,
-						new TFPos(0, 0).AsString(), msg.MaxCount));
-				feed.AddLink("next",
-					HostName.Combine(requestedUrl, "/streams/{0}/{1}/backward/{2}", AllEscaped, msg.NextPos.AsString(),
-						msg.MaxCount));
-			}
-
-			feed.AddLink("previous",
-				HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", AllEscaped, msg.PrevPos.AsString(),
-					msg.MaxCount));
-			feed.AddLink("metadata", HostName.Combine(requestedUrl, "/streams/{0}/metadata", AllEscaped));
-			for (int i = 0; i < msg.Events.Length; ++i) {
-				feed.AddEntry(ToEntry(msg.Events[i].WithoutPosition(), requestedUrl, embedContent));
-			}
-
-			return feed;
-		}
-		
-		public static FeedElement ToFilteredAllEventsBackwardFeed(ClientMessage.FilteredReadAllEventsBackwardCompleted msg,
-			Uri requestedUrl, EmbedLevel embedContent) {
-			var self = HostName.Combine(requestedUrl, "/streams/{0}", AllFilteredEscaped);
-			var feed = new FeedElement();
-			feed.SetTitle(string.Format("All events"));
-			feed.SetId(self);
-			feed.SetUpdated(msg.Events.Length > 0 && msg.Events[0].Event != null
-				? msg.Events[0].Event.TimeStamp
-				: DateTime.MinValue.ToUniversalTime());
-			feed.SetAuthor(AtomSpecs.Author);
-
-			feed.AddLink("self", self);
-			feed.AddLink("first",
-				HostName.Combine(requestedUrl, "/streams/{0}/head/backward/{1}", AllFilteredEscaped, msg.MaxCount));
-			if (!msg.IsEndOfStream) {
-				feed.AddLink("last",
-					HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", AllFilteredEscaped,
-						new TFPos(0, 0).AsString(), msg.MaxCount));
-				feed.AddLink("next",
-					HostName.Combine(requestedUrl, "/streams/{0}/{1}/backward/{2}", AllFilteredEscaped, msg.NextPos.AsString(),
-						msg.MaxCount));
-			}
-
-			feed.AddLink("previous",
-				HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", AllFilteredEscaped, msg.PrevPos.AsString(),
-					msg.MaxCount));
-			for (int i = 0; i < msg.Events.Length; ++i) {
-				feed.AddEntry(ToEntry(msg.Events[i].WithoutPosition(), requestedUrl, embedContent));
-			}
-
-			return feed;
-		}
-
-		public static FeedElement ToNextNPersistentMessagesFeed(ClientMessage.ReadNextNPersistentMessagesCompleted msg,
-			Uri requestedUrl, string streamId, string groupName, int count, EmbedLevel embedContent) {
-			string escapedStreamId = Uri.EscapeDataString(streamId);
-			string escapedGroupName = Uri.EscapeDataString(groupName);
-			var self = HostName.Combine(requestedUrl, "/subscriptions/{0}/{1}", escapedStreamId, escapedGroupName);
-			var feed = new FeedElement();
-			feed.SetTitle(string.Format("Messages for '{0}/{1}'", streamId, groupName));
-			feed.SetId(self);
-			feed.SetUpdated(msg.Events.Length > 0 && msg.Events[0].ResolvedEvent.Event != null
-				? msg.Events[msg.Events.Length - 1].ResolvedEvent.Event.TimeStamp
-				: DateTime.MinValue.ToUniversalTime());
-			feed.SetAuthor(AtomSpecs.Author);
-
-			if (msg.Events != null && msg.Events.Length > 0) {
-				var ackAllQueryString = String.Format("?ids={0}",
-					String.Join(",", msg.Events.Select(x => x.ResolvedEvent.OriginalEvent.EventId)));
-				var ackAll =
-					HostName.Combine(requestedUrl, "/subscriptions/{0}/{1}/ack", escapedStreamId, escapedGroupName) +
-					ackAllQueryString;
-				feed.AddLink("ackAll", ackAll);
-
-				var nackAllQueryString = String.Format("?ids={0}",
-					String.Join(",", msg.Events.Select(x => x.ResolvedEvent.OriginalEvent.EventId)));
-				var nackAll =
-					HostName.Combine(requestedUrl, "/subscriptions/{0}/{1}/nack", escapedStreamId, escapedGroupName) +
-					nackAllQueryString;
-				feed.AddLink("nackAll", nackAll);
-			}
-
-			var prev = HostName.Combine(requestedUrl, "/subscriptions/{0}/{1}/{2}", escapedStreamId, escapedGroupName,
-				count);
-			feed.AddLink("previous", prev);
-
-			feed.AddLink("self", self);
-			for (int i = msg.Events.Length - 1; i >= 0; --i) {
-				var entry = ToEntry(msg.Events[i].ResolvedEvent.WithoutPosition(), requestedUrl, embedContent);
-				var ack = HostName.Combine(requestedUrl, "/subscriptions/{0}/{1}/ack/{2}", escapedStreamId,
-					escapedGroupName, msg.Events[i].ResolvedEvent.OriginalEvent.EventId);
-				var nack = HostName.Combine(requestedUrl, "/subscriptions/{0}/{1}/nack/{2}", escapedStreamId,
-					escapedGroupName, msg.Events[i].ResolvedEvent.OriginalEvent.EventId);
-				entry.AddLink("ack", ack);
-				entry.AddLink("nack", nack);
-				entry.AddRetryCount(msg.Events[i].RetryCount);
-				feed.AddEntry(entry);
-			}
-
-			return feed;
-		}
-
-		public static DescriptionDocument ToDescriptionDocument(Uri requestedUrl, string streamId,
-			string[] subscriptions) {
-			string escapedStreamId = Uri.EscapeDataString(streamId);
-			var descriptionDocument = new DescriptionDocument();
-			descriptionDocument.SetTitle(string.Format("Description document for '{0}'", streamId));
-			descriptionDocument.SetDescription(
-				@"The description document will be presented when no accept header is present or it was requested");
-
-			descriptionDocument.SetSelf("/streams/" + escapedStreamId,
-				Codec.DescriptionJson.ContentType);
-
-			descriptionDocument.SetStream("/streams/" + escapedStreamId,
-				Codec.EventStoreXmlCodec.ContentType,
-				Codec.EventStoreJsonCodec.ContentType);
-
-			if (subscriptions != null) {
-				foreach (var group in subscriptions) {
-					descriptionDocument.AddStreamSubscription(
-						String.Format("/subscriptions/{0}/{1}", escapedStreamId, group),
-						Codec.CompetingXml.ContentType,
-						Codec.CompetingJson.ContentType);
-				}
-			}
-
-			return descriptionDocument;
-		}
-
-		public static EntryElement ToEntry(ResolvedEvent eventLinkPair, Uri requestedUrl, EmbedLevel embedContent,
-			bool singleEntry = false) {
-			if (requestedUrl == null)
-				return null;
-
-			var evnt = eventLinkPair.Event;
-			var link = eventLinkPair.Link;
-			EntryElement entry;
-			if (embedContent > EmbedLevel.Content && evnt != null) {
-				var richEntry = new RichEntryElement();
-				entry = richEntry;
-
-				richEntry.EventId = evnt.EventId;
-				richEntry.EventType = evnt.EventType;
-				richEntry.EventNumber = evnt.EventNumber;
-				richEntry.StreamId = evnt.EventStreamId;
-				richEntry.PositionEventNumber = eventLinkPair.OriginalEvent.EventNumber;
-				richEntry.PositionStreamId = eventLinkPair.OriginalEvent.EventStreamId;
-				richEntry.IsJson = (evnt.Flags & PrepareFlags.IsJson) != 0;
-				richEntry.IsRedacted = (evnt.Flags & PrepareFlags.IsRedacted) != 0;
-
-				var data = evnt.Data.Span;
-
-				if (embedContent >= EmbedLevel.Body && eventLinkPair.Event != null) {
-					if (richEntry.IsJson) {
-						if (embedContent >= EmbedLevel.PrettyBody) {
-							try {
-								richEntry.Data = Helper.UTF8NoBom.GetString(data);
-								// next step may fail, so we have already assigned body
-								richEntry.Data = FormatJson(Helper.UTF8NoBom.GetString(data));
-							} catch {
-								// ignore - we tried
-							}
-						} else
-							richEntry.Data = Helper.UTF8NoBom.GetString(data);
-					} else if (embedContent >= EmbedLevel.TryHarder) {
-						try {
-							richEntry.Data = Helper.UTF8NoBom.GetString(data);
-							// next step may fail, so we have already assigned body
-							richEntry.Data = FormatJson(richEntry.Data);
-							// it is json if successed
-							richEntry.IsJson = true;
-						} catch {
-							// ignore - we tried
-						}
-					}
-
-					// metadata
-					if (embedContent >= EmbedLevel.Body) {
-
-						try {
-							richEntry.MetaData = Helper.UTF8NoBom.GetString(evnt.Metadata.Span);
-							richEntry.IsMetaData = richEntry.MetaData.IsNotEmptyString();
-							// next step may fail, so we have already assigned body
-							if (embedContent >= EmbedLevel.PrettyBody) {
-								richEntry.MetaData = FormatJson(richEntry.MetaData);
-							}
-
-							if (string.IsNullOrEmpty(richEntry.MetaData)) {
-								richEntry.MetaData = null;
-							}
-						} catch {
-							// ignore - we tried
-						}
-
-						var lnk = eventLinkPair.Link;
-						if (lnk != null) {
-							try {
-								richEntry.LinkMetaData = Helper.UTF8NoBom.GetString(lnk.Metadata.Span);
-								richEntry.IsLinkMetaData = richEntry.LinkMetaData.IsNotEmptyString();
-								// next step may fail, so we have already assigned body
-								if (embedContent >= EmbedLevel.PrettyBody) {
-									richEntry.LinkMetaData = FormatJson(richEntry.LinkMetaData);
-								}
-							} catch {
-								// ignore - we tried
-							}
-						}
-					}
-				}
-			} else {
-				entry = new EntryElement();
-			}
-
-			if (evnt != null && link == null) {
-				SetEntryProperties(evnt.EventStreamId, evnt.EventNumber, evnt.TimeStamp, requestedUrl, entry);
-				entry.SetSummary(evnt.EventType);
-				if ((singleEntry || embedContent == EmbedLevel.Content) && ((evnt.Flags & PrepareFlags.IsJson) != 0))
-					entry.SetContent(AutoEventConverter.CreateDataDto(eventLinkPair));
-			} else if (link != null) {
-				var eventLoc = GetLinkData(Encoding.UTF8.GetString(link.Data.Span));
-				SetEntryProperties(eventLoc.Item1, eventLoc.Item2, link.TimeStamp, requestedUrl, entry);
-				entry.SetSummary("$>");
-			}
-
-			return entry;
-		}
-
-		private static Tuple<string, long> GetLinkData(string link) {
-			Ensure.NotNull(link, "link data cannot be null");
-			var loc = link.IndexOf("@", StringComparison.Ordinal);
-			if (loc == -1) throw new Exception(String.Format("Unable to parse link {0}", link));
-			var position = long.Parse(link.Substring(0, loc));
-			var stream = link.Substring(loc + 1, link.Length - loc - 1);
-			return new Tuple<string, long>(stream, position);
-		}
-
-		private static void SetEntryProperties(string stream, long eventNumber, DateTime timestamp, Uri requestedUrl,
-			EntryElement entry) {
-			var escapedStreamId = Uri.EscapeDataString(stream);
-			entry.SetTitle(eventNumber + "@" + stream);
-			entry.SetId(HostName.Combine(requestedUrl, "/streams/{0}/{1}", escapedStreamId, eventNumber));
-			entry.SetUpdated(timestamp);
-			entry.SetAuthor(AtomSpecs.Author);
-			entry.AddLink("edit",
-				HostName.Combine(requestedUrl, "/streams/{0}/{1}", escapedStreamId, eventNumber));
-			entry.AddLink("alternate",
-				HostName.Combine(requestedUrl, "/streams/{0}/{1}", escapedStreamId, eventNumber));
-		}
-
-		private static string FormatJson(string unformattedjson) {
-			if (string.IsNullOrEmpty(unformattedjson))
-				return unformattedjson;
-			JsonReader reader = new JsonTextReader(new System.IO.StringReader(unformattedjson));
-			reader.DateParseHandling = DateParseHandling.None;
-			var jo = JObject.Load(reader);
-			var json = JsonConvert.SerializeObject(jo, Formatting.Indented);
-			return json;
-		}
-	}
-
-	public class Links {
-		public Link Self;
-		public Link Stream;
-		public List<Link> StreamSubscription;
-	}
-
-	public class Link {
-		public string Href;
-		public string[] SupportedContentTypes;
-
-		public Link() {
-		}
-
-		public Link(string href, string[] supportedContentTypes) {
-			Href = href;
-			SupportedContentTypes = supportedContentTypes;
-		}
-	}
-
-	public class DescriptionDocument {
-		public string Title;
-		public string Description;
-		[JsonProperty("_links")] public Links Links = new Links();
-
-		public void SetTitle(string title) {
-			Title = title;
-		}
-
-		public void SetDescription(string description) {
-			Description = description;
-		}
-
-		public void SetSelf(string href, params string[] supportedContentTypes) {
-			Links.Self = new Link(href, supportedContentTypes);
-		}
-
-		public void AddStreamSubscription(string href, params string[] supportedContentTypes) {
-			if (Links.StreamSubscription == null) Links.StreamSubscription = new List<Link>();
-
-			Links.StreamSubscription.Add(new Link(href, supportedContentTypes));
-		}
-
-		public void SetStream(string href, params string[] supportedContentTypes) {
-			Links.Stream = new Link(href, supportedContentTypes);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/EventStoreAuthenticationHandler.cs b/src/EventStore.Core/Services/Transport/Http/EventStoreAuthenticationHandler.cs
deleted file mode 100644
index f0135c98097..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/EventStoreAuthenticationHandler.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Text.Encodings.Web;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.Extensions.Logging.Abstractions;
-using Microsoft.Extensions.Options;
-
-namespace EventStore.Core.Services.Transport.Http;
-
-// This runs after Services.Transport.Http.AuthenticationMiddleware runs and makes use of the
-// ClaimsPrinciple that it has left in the context.
-// todo: figure out why AuthenticationMiddleware is as complicated as it is and whether it
-// should be replaced with an AuthenticationHandler (or several)
-public class EventStoreAuthenticationHandler : AuthenticationHandler<AuthenticationSchemeOptions> {
-	public EventStoreAuthenticationHandler(
-		IOptionsMonitor<AuthenticationSchemeOptions> options,
-		// we could pass the logger through instead of NullLoggerFactory but we have debug logging
-		// on by default and it will log successes unless we change the level in the config:
-		// "EventStore.Core.Services.Transport.Http.EventStoreAuthenticationHandler": "Information"
-		// instead we should rationalize the log levels, turn off debug logging, and then pass this through.
-		// ILoggerFactory logger,
-		UrlEncoder encoder)
-		: base(options, NullLoggerFactory.Instance, encoder) {
-	}
-
-	protected override Task<AuthenticateResult> HandleAuthenticateAsync() {
-		if (!Context.User.Identity.IsAuthenticated)
-			return Task.FromResult(AuthenticateResult.Fail("Not authenticated"));
-
-		var ticket = new AuthenticationTicket(
-			principal: Context.User,
-			authenticationScheme: "es auth");
-
-		return Task.FromResult(AuthenticateResult.Success(ticket));
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Format.cs b/src/EventStore.Core/Services/Transport/Http/Format.cs
deleted file mode 100644
index 161359d75d5..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Format.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Transport.Http.Controllers;
-using EventStore.Transport.Http;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-using EventStore.Common.Utils;
-using EventStore.Core.Cluster;
-
-namespace EventStore.Core.Services.Transport.Http {
-	public static class Format {
-		public static string TextMessage(HttpResponseFormatterArgs entity, Message message) {
-			var textMessage = message as HttpMessage.TextMessage;
-			return textMessage != null ? entity.ResponseCodec.To(textMessage) : String.Empty;
-		}
-
-		public static object EventEntry(HttpResponseFormatterArgs entity, Message message, EmbedLevel embed) {
-			var msg = message as ClientMessage.ReadEventCompleted;
-			if (msg == null || msg.Result != ReadEventResult.Success || msg.Record.Event == null)
-				return entity.ResponseCodec.To(Empty.Result);
-
-			switch (entity.ResponseCodec.ContentType) {
-				case ContentType.Atom:
-				case ContentType.AtomJson:
-				case ContentType.Html:
-					return entity.ResponseCodec.To(Convert.ToEntry(msg.Record, entity.ResponseUrl, embed,
-						singleEntry: true));
-				default:
-					return AutoEventConverter.SmartFormat(msg.Record, entity.ResponseCodec);
-			}
-		}
-
-		public static string GetStreamEventsBackward(HttpResponseFormatterArgs entity, Message message,
-			EmbedLevel embed, bool headOfStream) {
-			var msg = message as ClientMessage.ReadStreamEventsBackwardCompleted;
-			if (msg == null || msg.Result != ReadStreamResult.Success)
-				return String.Empty;
-
-			return entity.ResponseCodec.To(
-				Convert.ToStreamEventBackwardFeed(msg, entity.ResponseUrl, embed, headOfStream));
-		}
-
-		public static string GetStreamEventsForward(HttpResponseFormatterArgs entity, Message message,
-			EmbedLevel embed) {
-			var msg = message as ClientMessage.ReadStreamEventsForwardCompleted;
-			if (msg == null || msg.Result != ReadStreamResult.Success)
-				return String.Empty;
-
-			return entity.ResponseCodec.To(Convert.ToStreamEventForwardFeed(msg, entity.ResponseUrl, embed));
-		}
-
-		public static string ReadAllEventsBackwardCompleted(HttpResponseFormatterArgs entity, Message message,
-			EmbedLevel embed) {
-			var msg = message as ClientMessage.ReadAllEventsBackwardCompleted;
-			if (msg == null || msg.Result != ReadAllResult.Success)
-				return String.Empty;
-
-			return entity.ResponseCodec.To(Convert.ToAllEventsBackwardFeed(msg, entity.ResponseUrl, embed));
-		}
-		
-		public static string ReadAllEventsBackwardFilteredCompleted(HttpResponseFormatterArgs entity, Message message,
-			EmbedLevel embed) {
-			var msg = message as ClientMessage.FilteredReadAllEventsBackwardCompleted;
-			if (msg == null || msg.Result != FilteredReadAllResult.Success)
-				return String.Empty;
-
-			return entity.ResponseCodec.To(Convert.ToFilteredAllEventsBackwardFeed(msg, entity.ResponseUrl, embed));
-		}
-
-		public static string ReadAllEventsForwardCompleted(HttpResponseFormatterArgs entity, Message message,
-			EmbedLevel embed) {
-			var msg = message as ClientMessage.ReadAllEventsForwardCompleted;
-			if (msg == null || msg.Result != ReadAllResult.Success)
-				return String.Empty;
-
-			return entity.ResponseCodec.To(Convert.ToAllEventsForwardFeed(msg, entity.ResponseUrl, embed));
-		}
-		
-		public static string ReadAllEventsForwardFilteredCompleted(HttpResponseFormatterArgs entity, Message message,
-			EmbedLevel embed) {
-			var msg = message as ClientMessage.FilteredReadAllEventsForwardCompleted;
-			if (msg == null || msg.Result != FilteredReadAllResult.Success)
-				return String.Empty;
-
-			return entity.ResponseCodec.To(Convert.ToAllEventsForwardFilteredFeed(msg, entity.ResponseUrl, embed));
-		}
-
-		public static string WriteEventsCompleted(HttpResponseFormatterArgs entity, Message message) {
-			return String.Empty;
-		}
-
-		public static string DeleteStreamCompleted(HttpResponseFormatterArgs entity, Message message) {
-			return String.Empty;
-		}
-
-		public static string GetFreshStatsCompleted(HttpResponseFormatterArgs entity, Message message) {
-			var completed = message as MonitoringMessage.GetFreshStatsCompleted;
-			if (completed == null || !completed.Success)
-				return String.Empty;
-
-			return entity.ResponseCodec.To(completed.Stats);
-		}
-
-		public static string GetReplicationStatsCompleted(HttpResponseFormatterArgs entity, Message message) {
-			if (message.GetType() != typeof(ReplicationMessage.GetReplicationStatsCompleted))
-				throw new Exception(string.Format("Unexpected type of Response message: {0}, expected: {1}",
-					message.GetType().Name,
-					typeof(ReplicationMessage.GetReplicationStatsCompleted).Name));
-			var completed = message as ReplicationMessage.GetReplicationStatsCompleted;
-			return entity.ResponseCodec.To(completed.ReplicationStats);
-		}
-
-		public static string GetFreshTcpConnectionStatsCompleted(HttpResponseFormatterArgs entity, Message message) {
-			var completed = message as MonitoringMessage.GetFreshTcpConnectionStatsCompleted;
-			if (completed == null)
-				return String.Empty;
-
-			return entity.ResponseCodec.To(completed.ConnectionStats);
-		}
-
-		public static string SendPublicGossip(HttpResponseFormatterArgs entity, Message message) {
-			if (message.GetType() != typeof(GossipMessage.SendClientGossip))
-				throw new Exception(string.Format("Unexpected type of response message: {0}, expected: {1}",
-					message.GetType().Name,
-					typeof(GossipMessage.SendClientGossip).Name));
-
-			var sendPublicGossip = message as GossipMessage.SendClientGossip;
-			return sendPublicGossip != null
-				? entity.ResponseCodec.To(sendPublicGossip.ClusterInfo)
-				: string.Empty;
-		}
-
-		public static string ReadNextNPersistentMessagesCompleted(HttpResponseFormatterArgs entity, Message message,
-			string streamId, string groupName, int count, EmbedLevel embed) {
-			var msg = message as ClientMessage.ReadNextNPersistentMessagesCompleted;
-			if (msg == null || msg.Result != ClientMessage.ReadNextNPersistentMessagesCompleted
-				    .ReadNextNPersistentMessagesResult.Success) {
-				return msg != null ? entity.ResponseCodec.To(msg.Reason) : string.Empty;
-			}
-			
-			return entity.ResponseCodec.To(Convert.ToNextNPersistentMessagesFeed(msg, entity.ResponseUrl, streamId,
-				groupName, count, embed));
-		}
-
-		public static string GetDescriptionDocument(HttpResponseFormatterArgs entity, string streamId,
-			string[] persistentSubscriptionStats) {
-			return entity.ResponseCodec.To(Convert.ToDescriptionDocument(entity.RequestedUrl, streamId,
-				persistentSubscriptionStats));
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/GrpcProtocolHelpers.cs b/src/EventStore.Core/Services/Transport/Http/GrpcProtocolHelpers.cs
deleted file mode 100644
index adfda817b83..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/GrpcProtocolHelpers.cs
+++ /dev/null
@@ -1,209 +0,0 @@
-// From https://github.com/grpc/grpc-dotnet
-
-using System;
-using System.Runtime.CompilerServices;
-using System.Text;
-using Grpc.Core;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Features;
-using Microsoft.Net.Http.Headers;
-using HttpResponse = Microsoft.AspNetCore.Http.HttpResponse;
-
-namespace EventStore.Core.Services.Transport.Http {
-	public static class GrpcProtocolHelpers {
-		internal const string GrpcContentType = "application/grpc";
-		internal const string GrpcWebContentType = "application/grpc-web";
-		internal const string GrpcWebTextContentType = "application/grpc-web-text";
-		internal const string RetryPushbackHeader = "grpc-retry-pushback-ms";
-
-		internal static readonly string StatusTrailer = HeaderNames.GrpcStatus;
-		internal static readonly string MessageTrailer = HeaderNames.GrpcMessage;
-
-		public static IHeaderDictionary GetTrailersDestination(HttpResponse response) {
-			if (response.HasStarted) {
-				// The response has content so write trailers to a trailing HEADERS frame
-				var feature = response.HttpContext.Features.Get<IHttpResponseTrailersFeature>();
-				if (feature?.Trailers == null || feature.Trailers.IsReadOnly) {
-					throw new InvalidOperationException("Trailers are not supported for this response. The server may not support gRPC.");
-				}
-
-				return feature.Trailers;
-			} else {
-				// The response is "Trailers-Only". There are no gRPC messages in the response so the status
-				// and other trailers can be placed in the header HEADERS frame
-				return response.Headers;
-			}
-		}
-
-		public static void AddProtocolHeaders(HttpResponse response) {
-			response.ContentType = GrpcContentType;
-		}
-
-		public static bool IsGrpc(this HttpContext context) =>
-			context.Request.ContentType
-				is GrpcContentType
-				or GrpcWebContentType
-				or GrpcWebTextContentType;
-
-		public static void SetStatus(IHeaderDictionary destination, Status status) {
-			// Overwrite any previously set status
-			destination[StatusTrailer] = status.StatusCode.ToTrailerString();
-
-			string escapedDetail;
-			if (!string.IsNullOrEmpty(status.Detail)) {
-				// https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md#responses
-				// The value portion of Status-Message is conceptually a Unicode string description of the error,
-				// physically encoded as UTF-8 followed by percent-encoding.
-				escapedDetail = PercentEncode(status.Detail);
-			} else {
-				escapedDetail = null;
-			}
-
-			destination[MessageTrailer] = escapedDetail;
-		}
-
-		private static readonly char[] HexChars = new[]
-		{
-			'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
-		};
-		internal const int MaxUnicodeCharsReallocate = 40; // Maximum batch size when working with unicode characters
-		private const int MaxUtf8BytesPerUnicodeChar = 4;
-		private const int AsciiMaxValue = 127;
-
-		// From https://github.com/grpc/grpc/blob/324189c9dc540f0693d79f02dcb8c5f9261b535e/src/core/lib/slice/percent_encoding.cc#L31
-		private static readonly byte[] PercentEncodingUnreservedBitField =
-		{
-			0x00, 0x00, 0x00, 0x00, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-			0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-		};
-
-		public static string PercentEncode(string value) {
-			// Count the number of bytes needed to output this string
-			var encodedLength = 0L;
-			for (var i = 0; i < value.Length; i++) {
-				var c = value[i];
-				if (c > AsciiMaxValue) {
-					// Get additional unicode characters
-					var unicodeCharCount = GetCountOfNonAsciiUtf16CodeUnits(value, i, maxCount: int.MaxValue);
-
-					var utf8ByteCount = Encoding.UTF8.GetByteCount(value.AsSpan(i, unicodeCharCount));
-					encodedLength += (long)utf8ByteCount * 3;
-					i += unicodeCharCount - 1;
-				} else {
-					encodedLength += IsUnreservedCharacter(c) ? 1 : 3;
-				}
-			}
-
-			if (encodedLength > int.MaxValue) {
-				throw new InvalidOperationException("Value is too large to encode.");
-			}
-
-			// Return the original string if no encoding is required
-			if (value.Length == encodedLength) {
-				return value;
-			}
-
-			// Encode
-			return string.Create((int)encodedLength, value, Encode);
-
-			static void Encode(Span<char> span, string s) {
-				Span<byte> unicodeBytesBuffer = stackalloc byte[MaxUnicodeCharsReallocate * MaxUtf8BytesPerUnicodeChar];
-
-				var writePosition = 0;
-				for (var i = 0; i < s.Length; i++) {
-					var current = s[i];
-					if (current > AsciiMaxValue) {
-						// Leave a character for possible low surrogate
-						const int MaxCount = MaxUnicodeCharsReallocate - 1;
-
-						// Get additional unicode characters
-						var unicodeCharCount = GetCountOfNonAsciiUtf16CodeUnits(s, i, MaxCount);
-
-						// Note that invalid UTF-16 data, e.g. unpaired surrogates, will be converted to EF BF BD (unicode replacement character)
-						var numberOfBytes = Encoding.UTF8.GetBytes(s.AsSpan(i, unicodeCharCount), unicodeBytesBuffer);
-
-						for (var count = 0; count < numberOfBytes; count++) {
-							EscapeAsciiChar(span, ref writePosition, (char)unicodeBytesBuffer[count]);
-						}
-						i += unicodeCharCount - 1;
-					} else if (IsUnreservedCharacter(current)) {
-						span[writePosition++] = current;
-					} else {
-						EscapeAsciiChar(span, ref writePosition, current);
-					}
-				}
-			}
-		}
-
-		private static void EscapeAsciiChar(Span<char> span, ref int writePosition, char current) {
-			span[writePosition++] = '%';
-			span[writePosition++] = HexChars[current >> 4];
-			span[writePosition++] = HexChars[current & 15];
-		}
-
-		private static int GetCountOfNonAsciiUtf16CodeUnits(string value, int currentIndex, int maxCount) {
-			// We know we have started with a UTF-16 character
-			var unicodeCharCount = 1;
-
-			var maxSize = Math.Min(value.Length - currentIndex, maxCount);
-			for (; unicodeCharCount < maxSize && value[currentIndex + unicodeCharCount] > AsciiMaxValue; unicodeCharCount++) {
-			}
-
-			if (char.IsHighSurrogate(value[currentIndex + unicodeCharCount - 1])) {
-				if (unicodeCharCount < value.Length - currentIndex && char.IsLowSurrogate(value[currentIndex + unicodeCharCount])) {
-					// Last character is a high surrogate so check ahead to see if it is followed by a low surrogate and include
-					unicodeCharCount++;
-				}
-			}
-
-			return unicodeCharCount;
-		}
-
-		[MethodImpl(MethodImplOptions.AggressiveInlining)]
-		private static bool IsUnreservedCharacter(char c) {
-			return ((PercentEncodingUnreservedBitField[c / 8] >> (c % 8)) & 1) != 0;
-		}
-
-		public static string ToTrailerString(this StatusCode status) {
-			switch (status) {
-				case StatusCode.OK:
-					return "0";
-				case StatusCode.Cancelled:
-					return "1";
-				case StatusCode.Unknown:
-					return "2";
-				case StatusCode.InvalidArgument:
-					return "3";
-				case StatusCode.DeadlineExceeded:
-					return "4";
-				case StatusCode.NotFound:
-					return "5";
-				case StatusCode.AlreadyExists:
-					return "6";
-				case StatusCode.PermissionDenied:
-					return "7";
-				case StatusCode.ResourceExhausted:
-					return "8";
-				case StatusCode.FailedPrecondition:
-					return "9";
-				case StatusCode.Aborted:
-					return "10";
-				case StatusCode.OutOfRange:
-					return "11";
-				case StatusCode.Unimplemented:
-					return "12";
-				case StatusCode.Internal:
-					return "13";
-				case StatusCode.Unavailable:
-					return "14";
-				case StatusCode.DataLoss:
-					return "15";
-				case StatusCode.Unauthenticated:
-					return "16";
-				default:
-					return status.ToString("D");
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/HttpContextExtensions.cs b/src/EventStore.Core/Services/Transport/Http/HttpContextExtensions.cs
deleted file mode 100644
index b0a4c671c53..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/HttpContextExtensions.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Microsoft.AspNetCore.Connections.Features;
-using Microsoft.AspNetCore.Http;
-
-namespace EventStore.Core.Services.Transport.Http;
-
-public static class HttpContextExtensions {
-	public static bool IsUnixSocketConnection(this HttpContext ctx) {
-		var connectionItemsFeature = ctx.Features.Get<IConnectionItemsFeature>();
-		if (connectionItemsFeature is null)
-			return false;
-
-		return connectionItemsFeature.Items.ContainsKey(UnixSocketConnectionMiddleware.UnixSocketConnectionKey);
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/HttpMessagePipe.cs b/src/EventStore.Core/Services/Transport/Http/HttpMessagePipe.cs
deleted file mode 100644
index cd2a2ff652c..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/HttpMessagePipe.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Net;
-using EventStore.Common.Utils;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Services.Transport.Http {
-	public class HttpMessagePipe {
-		private readonly ConcurrentDictionary<Type, IMessageSender> _senders =
-			new ConcurrentDictionary<Type, IMessageSender>();
-
-		public void RegisterSender<T>(ISender<T> sender) where T : Message {
-			Ensure.NotNull(sender, "sender");
-			_senders.TryAdd(typeof(T), new MessageSender<T>(sender));
-		}
-
-		public void Push(Message message, IPEndPoint endPoint) {
-			Ensure.NotNull(message, "message");
-			Ensure.NotNull(endPoint, "endPoint");
-
-			var type = message.GetType();
-			IMessageSender sender;
-
-			if (_senders.TryGetValue(type, out sender))
-				sender.Send(message, endPoint);
-		}
-	}
-
-	public interface ISender<in T> where T : Message {
-		void Send(T message, IPEndPoint endPoint);
-	}
-
-	public interface IMessageSender {
-		void Send(Message message, IPEndPoint endPoint);
-	}
-
-	public class MessageSender<T> : IMessageSender
-		where T : Message {
-		private readonly ISender<T> _sender;
-
-		public MessageSender(ISender<T> sender) {
-			Ensure.NotNull(sender, "sender");
-			_sender = sender;
-		}
-
-		public void Send(Message message, IPEndPoint endPoint) {
-			Ensure.NotNull(message, "message");
-			Ensure.NotNull(endPoint, "endPoint");
-
-			_sender.Send((T)message, endPoint);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/IHttpService.cs b/src/EventStore.Core/Services/Transport/Http/IHttpService.cs
deleted file mode 100644
index 51ecf0df6e9..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/IHttpService.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Http;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Transport.Http.EntityManagement;
-using Microsoft.AspNetCore.Http;
-
-namespace EventStore.Core.Services.Transport.Http {
-	public interface IHttpController {
-		void Subscribe(IHttpService service);
-	}
-
-	public interface IHttpSender {
-		void SubscribeSenders(HttpMessagePipe pipe);
-	}
-
-	public interface IHttpForwarder {
-		bool ForwardRequest(HttpEntityManager manager);
-	}
-
-	public interface IHttpService {
-		ServiceAccessibility Accessibility { get; }
-		bool IsListening { get; }
-		IEnumerable<EndPoint> EndPoints { get; }
-		IEnumerable<ControllerAction> Actions { get; }
-
-		List<UriToActionMatch> GetAllUriMatches(Uri uri);
-		void SetupController(IHttpController controller);
-
-		void RegisterCustomAction(ControllerAction action,
-			Func<HttpEntityManager, UriTemplateMatch, RequestParams> handler);
-
-		void RegisterAction(ControllerAction action, Action<HttpEntityManager, UriTemplateMatch> handler);
-
-		void Shutdown();
-
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/InternalDispatcherEndpoint.cs b/src/EventStore.Core/Services/Transport/Http/InternalDispatcherEndpoint.cs
deleted file mode 100644
index 6700305fae3..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/InternalDispatcherEndpoint.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Services.Transport.Http.Messages;
-using EventStore.Transport.Http;
-using Microsoft.AspNetCore.Http;
-using Serilog;
-
-namespace EventStore.Core.Services.Transport.Http
-{
-	public class InternalDispatcherEndpoint : IHandle<HttpMessage.PurgeTimedOutRequests> {
-		private static readonly ILogger Log = Serilog.Log.ForContext<AuthorizationMiddleware>();
-		private readonly IPublisher _inputBus;
-		private readonly MultiQueuedHandler _requestsMultiHandler;
-		private static readonly TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
-		private readonly IEnvelope _publishEnvelope;
-		public InternalDispatcherEndpoint(IPublisher inputBus, MultiQueuedHandler requestsMultiHandler) {
-
-			_inputBus = inputBus;
-			_requestsMultiHandler = requestsMultiHandler;
-			_publishEnvelope = inputBus;
-		}
-		public void Handle(HttpMessage.PurgeTimedOutRequests message) {
-			
-			_requestsMultiHandler.PublishToAll(message);
-
-			_inputBus.Publish(
-				TimerMessage.Schedule.Create(
-					UpdateInterval, _publishEnvelope, message));
-		}
-
-		public Task InvokeAsync(HttpContext context) {
-			
-			if (InternalHttpHelper.TryGetInternalContext(context, out var manager, out var match, out var tcs)) {
-				_requestsMultiHandler.Publish(new AuthenticatedHttpRequestMessage(manager, match));
-				return tcs.Task;
-			}
-			Log.Error("Failed to get internal http components for request {requestId}", context.TraceIdentifier);
-			context.Response.StatusCode = HttpStatusCode.InternalServerError;
-			return Task.CompletedTask;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/InternalHttpHelper.cs b/src/EventStore.Core/Services/Transport/Http/InternalHttpHelper.cs
deleted file mode 100644
index 7d4444b25a4..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/InternalHttpHelper.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Transport.Http.EntityManagement;
-using Microsoft.AspNetCore.Http;
-
-namespace EventStore.Core.Services.Transport.Http
-{
-	public static class InternalHttpHelper {
-		public static bool TryGetInternalContext(HttpContext context, out HttpEntityManager manager, out UriToActionMatch match, out TaskCompletionSource<bool> tcs) {
-			manager = null;
-			match = null;
-			tcs = null;
-			return context.Items.TryGetValue(typeof(HttpEntityManager), out var untypedManager) &&
-			       context.Items.TryGetValue(typeof(UriToActionMatch), out var untypedMatch) &&
-			       context.Items.TryGetValue(typeof(TaskCompletionSource<bool>), out var untypedTcs) &&
-			       (manager = untypedManager as HttpEntityManager) != null &&
-			       (match = untypedMatch as UriToActionMatch) != null &&
-			       (tcs = untypedTcs as TaskCompletionSource<bool>) != null;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/KestrelHttpService.cs b/src/EventStore.Core/Services/Transport/Http/KestrelHttpService.cs
deleted file mode 100644
index becd40fb5e3..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/KestrelHttpService.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Services.Transport.Http.Messages;
-using EventStore.Core.Settings;
-using EventStore.Transport.Http.EntityManagement;
-using ILogger = Serilog.ILogger;
-using MidFunc = System.Func<
-	Microsoft.AspNetCore.Http.HttpContext,
-	System.Func<System.Threading.Tasks.Task>,
-	System.Threading.Tasks.Task
->;
-
-namespace EventStore.Core.Services.Transport.Http {
-	public class KestrelHttpService : IHttpService,
-		IHandle<SystemMessage.SystemInit>,
-		IHandle<SystemMessage.BecomeShuttingDown> {
-		private static readonly TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
-		private static readonly ILogger Log = Serilog.Log.ForContext<KestrelHttpService>();
-
-		public ServiceAccessibility Accessibility => _accessibility;
-		public bool IsListening => _isListening;
-		public IEnumerable<EndPoint> EndPoints { get; }
-
-		public IEnumerable<ControllerAction> Actions => UriRouter.Actions;
-
-		private readonly ServiceAccessibility _accessibility;
-		private readonly IPublisher _inputBus;
-		public IUriRouter UriRouter { get; }
-		public bool LogHttpRequests { get; }
-
-		public string AdvertiseAsHost { get; }
-		public int AdvertiseAsPort { get; }
-
-		private bool _isListening;
-
-		public KestrelHttpService(ServiceAccessibility accessibility, IPublisher inputBus, IUriRouter uriRouter,
-			MultiQueuedHandler multiQueuedHandler, bool logHttpRequests, string advertiseAsHost,
-			int advertiseAsPort, bool disableAuthorization, params EndPoint[] endPoints) {
-			Ensure.NotNull(inputBus, nameof(inputBus));
-			Ensure.NotNull(uriRouter, nameof(uriRouter));
-			Ensure.NotNull(endPoints, nameof(endPoints));
-
-			_accessibility = accessibility;
-			_inputBus = inputBus;
-			UriRouter = uriRouter;
-			LogHttpRequests = logHttpRequests;
-
-			AdvertiseAsHost = advertiseAsHost;
-			AdvertiseAsPort = advertiseAsPort;
-
-
-			EndPoints = endPoints;
-		}
-
-		public void Handle(SystemMessage.SystemInit message) {
-
-			_isListening = true;
-		}
-
-		public void Handle(SystemMessage.BecomeShuttingDown message) {
-			if (message.ShutdownHttp)
-				Shutdown();
-			_inputBus.Publish(
-				new SystemMessage.ServiceShutdown(
-					$"HttpServer [{String.Join(", ", EndPoints)}]"));
-		}
-
-		public void Shutdown() {
-			_isListening = false;
-		}
-
-		public void SetupController(IHttpController controller) {
-			Ensure.NotNull(controller, "controller");
-			controller.Subscribe(this);
-		}
-
-		public void RegisterCustomAction(ControllerAction action,
-			Func<HttpEntityManager, UriTemplateMatch, RequestParams> handler) {
-			Ensure.NotNull(action, "action");
-			Ensure.NotNull(handler, "handler");
-
-			UriRouter.RegisterAction(action, handler);
-		}
-
-		public void RegisterAction(ControllerAction action, Action<HttpEntityManager, UriTemplateMatch> handler) {
-			Ensure.NotNull(action, "action");
-			Ensure.NotNull(handler, "handler");
-
-			UriRouter.RegisterAction(action, (man, match) => {
-				handler(man, match);
-				return new RequestParams(ESConsts.HttpTimeout);
-			});
-		}
-		public List<UriToActionMatch> GetAllUriMatches(Uri uri) => UriRouter.GetAllUriMatches(uri);
-		public static void CreateAndSubscribePipeline(ISubscriber bus) {
-			var requestProcessor = new AuthenticatedHttpRequestProcessor();
-			bus.Subscribe<AuthenticatedHttpRequestMessage>(requestProcessor);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/KestrelToInternalBridgeMiddleware.cs b/src/EventStore.Core/Services/Transport/Http/KestrelToInternalBridgeMiddleware.cs
deleted file mode 100644
index e6f2dbb3f57..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/KestrelToInternalBridgeMiddleware.cs
+++ /dev/null
@@ -1,202 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Codecs;
-using EventStore.Transport.Http.EntityManagement;
-using Microsoft.AspNetCore.Http;
-using Serilog;
-using HttpStatusCode = EventStore.Transport.Http.HttpStatusCode;
-
-namespace EventStore.Core.Services.Transport.Http {
-	public class KestrelToInternalBridgeMiddleware : IMiddleware {
-		private static readonly ILogger Log = Serilog.Log.ForContext<KestrelToInternalBridgeMiddleware>();
-		private readonly IUriRouter _uriRouter;
-		private readonly bool _logHttpRequests;
-		private readonly string _advertiseAsAddress;
-		private readonly int _advertiseAsPort;
-
-		public KestrelToInternalBridgeMiddleware(IUriRouter uriRouter, bool logHttpRequests, string advertiseAsAddress, int advertiseAsPort) {
-			_uriRouter = uriRouter;
-			_logHttpRequests = logHttpRequests;
-			_advertiseAsAddress = advertiseAsAddress;
-			_advertiseAsPort = advertiseAsPort;
-		}
-		private static bool TryMatch(HttpContext context, IUriRouter uriRouter, bool logHttpRequests, string advertiseAsAddress, int advertiseAsPort) {
-			var tcs = new TaskCompletionSource<bool>();
-			var httpEntity = new HttpEntity(context, logHttpRequests, advertiseAsAddress, advertiseAsPort,
-				() => tcs.TrySetResult(true));
-
-			var request = httpEntity.Request;
-			try {
-				var allMatches = uriRouter.GetAllUriMatches(request.Url);
-				if (allMatches.Count == 0) {
-					NotFound(httpEntity);
-					return false;
-				}
-
-				var allowedMethods = GetAllowedMethods(allMatches);
-
-				if (request.HttpMethod.Equals(HttpMethod.Options, StringComparison.OrdinalIgnoreCase)) {
-					RespondWithOptions(httpEntity, allowedMethods);
-					return false;
-				}
-
-				var match = allMatches.LastOrDefault(
-					m => m.ControllerAction.HttpMethod.Equals(request.HttpMethod, StringComparison.OrdinalIgnoreCase));
-				if (match == null) {
-					MethodNotAllowed(httpEntity, allowedMethods);
-					return false;
-				}
-
-				ICodec requestCodec = null;
-				var supportedRequestCodecs = match.ControllerAction.SupportedRequestCodecs;
-				if (supportedRequestCodecs != null && supportedRequestCodecs.Length > 0) {
-					requestCodec = SelectRequestCodec(request.HttpMethod, request.ContentType, supportedRequestCodecs);
-					if (requestCodec == null) {
-						BadContentType(httpEntity, "Invalid or missing Content-Type");
-						return false;
-					}
-				}
-
-				ICodec responseCodec = SelectResponseCodec(request,
-					request.AcceptTypes,
-					match.ControllerAction.SupportedResponseCodecs,
-					match.ControllerAction.DefaultResponseCodec);
-				if (responseCodec == null) {
-					BadCodec(httpEntity, "Requested URI is not available in requested format");
-					return false;
-				}
-				try {
-					var manager =
-						httpEntity.CreateManager(requestCodec, responseCodec, allowedMethods, satisfied => { });
-					context.Items.Add(manager.GetType(), manager);
-					context.Items.Add(match.GetType(), match);
-					context.Items.Add(tcs.GetType(), tcs);
-					return true;
-				} catch (Exception exc) {
-					Log.Error(exc, "Error while handling HTTP request '{url}'.", request.Url);
-					InternalServerError(httpEntity);
-					
-				}
-			} catch (Exception exc) {
-				Log.Error(exc, "Unhandled exception while processing HTTP request at {url}.",
-					httpEntity.RequestedUrl);
-				InternalServerError(httpEntity);
-			}
-			return false;
-		}
-
-		private static string[] GetAllowedMethods(List<UriToActionMatch> allMatches) {
-			var allowedMethods = new string[allMatches.Count + 1];
-			for (int i = 0; i < allMatches.Count; ++i) {
-				allowedMethods[i] = allMatches[i].ControllerAction.HttpMethod;
-			}
-
-			//add options to the list of allowed request methods
-			allowedMethods[allMatches.Count] = HttpMethod.Options;
-			return allowedMethods;
-		}
-
-		private static void RespondWithOptions(HttpEntity httpEntity, string[] allowed) {
-			var entity = httpEntity.CreateManager(Codec.NoCodec, Codec.NoCodec, allowed, _ => { });
-			entity.ReplyStatus(HttpStatusCode.OK, "OK",
-				e => Log.Debug("Error while closing HTTP connection (http service core): {e}.", e.Message));
-		}
-
-		private static void MethodNotAllowed(HttpEntity httpEntity, string[] allowed) {
-			var entity = httpEntity.CreateManager(Codec.NoCodec, Codec.NoCodec, allowed, _ => { });
-			entity.ReplyStatus(HttpStatusCode.MethodNotAllowed, "Method Not Allowed",
-				e => Log.Debug("Error while closing HTTP connection (HTTP service core): {e}.", e.Message));
-		}
-
-		private static void NotFound(HttpEntity httpEntity) {
-			var entity = httpEntity.CreateManager();
-			entity.ReplyStatus(HttpStatusCode.NotFound, "Not Found",
-				e => Log.Debug("Error while closing HTTP connection (HTTP service core): {e}.", e.Message));
-		}
-
-		private static void InternalServerError(HttpEntity httpEntity) {
-			var entity = httpEntity.CreateManager();
-			entity.ReplyStatus(HttpStatusCode.InternalServerError, "Internal Server Error",
-				e => Log.Debug("Error while closing HTTP connection (HTTP service core): {e}.", e.Message));
-		}
-
-		private static void BadCodec(HttpEntity httpEntity, string reason) {
-			var entity = httpEntity.CreateManager();
-			entity.ReplyStatus(HttpStatusCode.NotAcceptable, reason,
-				e => Log.Debug("Error while closing HTTP connection (HTTP service core): {e}.", e.Message));
-		}
-
-		private static void BadContentType(HttpEntity httpEntity, string reason) {
-			var entity = httpEntity.CreateManager();
-			entity.ReplyStatus(HttpStatusCode.UnsupportedMediaType, reason,
-				e => Log.Debug("Error while closing HTTP connection (HTTP service core): {e}.", e.Message));
-		}
-
-		private static ICodec SelectRequestCodec(string method, string contentType, ICodec[] supportedCodecs) {
-			if (string.IsNullOrEmpty(contentType))
-				return supportedCodecs != null && supportedCodecs.Length > 0 ? null : Codec.NoCodec;
-			switch (method.ToUpper()) {
-				case HttpMethod.Post:
-				case HttpMethod.Put:
-				case HttpMethod.Delete:
-					return supportedCodecs.SingleOrDefault(c => c.CanParse(MediaType.Parse(contentType)));
-
-				default:
-					return Codec.NoCodec;
-			}
-		}
-
-		private static ICodec SelectResponseCodec(IHttpRequest query, string[] acceptTypes, ICodec[] supported,
-			ICodec @default) {
-			var requestedFormat = GetFormatOrDefault(query);
-			if (requestedFormat == null && acceptTypes.IsEmpty())
-				return @default;
-
-			if (requestedFormat != null)
-				return supported.FirstOrDefault(c => c.SuitableForResponse(MediaType.Parse(requestedFormat)));
-
-			return acceptTypes.Select(MediaType.TryParse)
-				.Where(x => x != null)
-				.OrderByDescending(v => v.Priority)
-				.Select(type => supported.FirstOrDefault(codec => codec.SuitableForResponse(type)))
-				.FirstOrDefault(corresponding => corresponding != null);
-		}
-
-		private static string GetFormatOrDefault(IHttpRequest request) {
-			var format = request.GetQueryStringValues("format").FirstOrDefault()?.ToLower();
-
-			switch (format) {
-				case null:
-				case "":
-					return null;
-				case "json":
-					return ContentType.Json;
-				case "text":
-					return ContentType.PlainText;
-				case "xml":
-					return ContentType.Xml;
-				case "atom":
-					return ContentType.Atom;
-				case "atomxj":
-					return ContentType.AtomJson;
-				case "atomsvc":
-					return ContentType.AtomServiceDoc;
-				case "atomsvcxj":
-					return ContentType.AtomServiceDocJson;
-				default:
-					throw new NotSupportedException("Unknown format requested");
-			}
-		}
-
-		public Task InvokeAsync(HttpContext context, RequestDelegate next) {
-			if(TryMatch(context, _uriRouter, _logHttpRequests, _advertiseAsAddress, _advertiseAsPort))
-				return next(context);
-			return Task.CompletedTask;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Messages/AuthenticatedHttpRequestMessage.cs b/src/EventStore.Core/Services/Transport/Http/Messages/AuthenticatedHttpRequestMessage.cs
deleted file mode 100644
index 1f1a9eb2c4e..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Messages/AuthenticatedHttpRequestMessage.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using EventStore.Core.Messaging;
-using EventStore.Transport.Http.EntityManagement;
-
-namespace EventStore.Core.Services.Transport.Http.Messages {
-	[DerivedMessage(CoreMessage.Http)]
-	partial class AuthenticatedHttpRequestMessage : Message {
-		public readonly HttpEntityManager Manager;
-		public readonly UriToActionMatch Match;
-
-		public AuthenticatedHttpRequestMessage(HttpEntityManager manager,  UriToActionMatch match) {
-			Manager = manager;
-			Match = match;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/Messages/IncomingHttpRequestMessage.cs b/src/EventStore.Core/Services/Transport/Http/Messages/IncomingHttpRequestMessage.cs
deleted file mode 100644
index b0bc71afa0a..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/Messages/IncomingHttpRequestMessage.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Transport.Http.EntityManagement;
-
-namespace EventStore.Core.Services.Transport.Http.Messages {
-	[DerivedMessage(CoreMessage.Http)]
-	public partial class IncomingHttpRequestMessage : Message {
-		public readonly IPublisher NextStagePublisher;
-		public readonly IHttpService HttpService;
-		public readonly HttpEntity Entity;
-
-		public IncomingHttpRequestMessage(IHttpService httpService, HttpEntity entity, IPublisher nextStagePublisher) {
-			HttpService = httpService;
-			Entity = entity;
-			NextStagePublisher = nextStagePublisher;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/NodeHttpClientFactory/INodeHttpClientFactory.cs b/src/EventStore.Core/Services/Transport/Http/NodeHttpClientFactory/INodeHttpClientFactory.cs
deleted file mode 100644
index e7b985d0b1d..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/NodeHttpClientFactory/INodeHttpClientFactory.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System.Net.Http;
-
-namespace EventStore.Core.Services.Transport.Http.NodeHttpClientFactory;
-
-public interface INodeHttpClientFactory {
-	HttpClient CreateHttpClient(string[] additionalCertificateNames);
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/OptionalAuthorizationLevel.cs b/src/EventStore.Core/Services/Transport/Http/OptionalAuthorizationLevel.cs
deleted file mode 100644
index bfe8e44cb60..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/OptionalAuthorizationLevel.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace EventStore.Core.Services.Transport.Http {
-	internal class OptionalAuthorizationLevel {
-		private readonly AuthorizationLevel _authorizationLevel;
-
-		public OptionalAuthorizationLevel(AuthorizationLevel authorizationLevel) {
-			_authorizationLevel = authorizationLevel;
-		}
-
-		public static implicit operator AuthorizationLevel(OptionalAuthorizationLevel level) =>
-			level._authorizationLevel;
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/RequestParams.cs b/src/EventStore.Core/Services/Transport/Http/RequestParams.cs
deleted file mode 100644
index 988549a2d5d..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/RequestParams.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-
-namespace EventStore.Core.Services.Transport.Http {
-	public struct RequestParams {
-		public readonly bool IsDone;
-		public readonly TimeSpan Timeout;
-
-		public RequestParams(bool done) {
-			IsDone = done;
-			Timeout = TimeSpan.Zero;
-		}
-
-		public RequestParams(TimeSpan timeout) {
-			IsDone = false;
-			Timeout = timeout;
-		}
-
-		public RequestParams(bool done, TimeSpan timeout) {
-			IsDone = done;
-			Timeout = timeout;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/ResponseConfiguration.cs b/src/EventStore.Core/Services/Transport/Http/ResponseConfiguration.cs
deleted file mode 100644
index d8ff4c5ae2c..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/ResponseConfiguration.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using EventStore.Transport.Http;
-using HttpStatusCode = System.Net.HttpStatusCode;
-using System.Linq;
-
-namespace EventStore.Core.Services.Transport.Http {
-	public class ResponseConfiguration {
-		public readonly int Code;
-		public readonly string Description;
-		public readonly string ContentType;
-		public readonly Encoding Encoding;
-		public readonly IEnumerable<KeyValuePair<string, string>> Headers;
-
-		public ResponseConfiguration(int code, string contentType, Encoding encoding,
-			params KeyValuePair<string, string>[] headers)
-			: this(code, GetHttpStatusDescription(code), contentType, encoding,
-				headers as IEnumerable<KeyValuePair<string, string>>) {
-		}
-
-		public ResponseConfiguration SetCreated(string location) {
-			var headers = Headers.ToDictionary(v => v.Key, v => v.Value);
-			headers["Location"] = location;
-			return new ResponseConfiguration(EventStore.Transport.Http.HttpStatusCode.Created, ContentType, Encoding,
-				headers.ToArray());
-		}
-
-		private static string GetHttpStatusDescription(int code) {
-			if (code == 200)
-				return "OK";
-			var status = (HttpStatusCode)code;
-			var name = Enum.GetName(typeof(HttpStatusCode), status);
-			var result = new StringBuilder(name.Length + 5);
-			for (var i = 0; i < name.Length; i++) {
-				if (i > 0 && char.IsUpper(name[i]))
-					result.Append(' ');
-				result.Append(name[i]);
-			}
-
-			return result.ToString();
-		}
-
-		public ResponseConfiguration(int code, string description, string contentType, Encoding encoding,
-			params KeyValuePair<string, string>[] headers)
-			: this(code, description, contentType, encoding, headers as IEnumerable<KeyValuePair<string, string>>) {
-		}
-
-		public ResponseConfiguration(int code, string description, string contentType, Encoding encoding,
-			IEnumerable<KeyValuePair<string, string>> headers) {
-			Code = code;
-			Description = description;
-			ContentType = contentType;
-			Encoding = encoding;
-			Headers = headers;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/SendToHttpEnvelope.cs b/src/EventStore.Core/Services/Transport/Http/SendToHttpEnvelope.cs
deleted file mode 100644
index d77418502b8..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/SendToHttpEnvelope.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.EntityManagement;
-
-namespace EventStore.Core.Services.Transport.Http {
-	public class HttpResponseConfiguratorArgs {
-		public readonly Uri ResponseUrl;
-		public readonly Uri RequestedUrl;
-		public readonly ICodec ResponseCodec;
-
-		public HttpResponseConfiguratorArgs(Uri responseUrl, Uri requestedUrl, ICodec responseCodec) {
-			ResponseUrl = responseUrl;
-			RequestedUrl = requestedUrl;
-			ResponseCodec = responseCodec;
-		}
-
-		public static implicit operator HttpResponseConfiguratorArgs(HttpEntityManager entity) {
-			return new HttpResponseConfiguratorArgs(entity.ResponseUrl, entity.RequestedUrl, entity.ResponseCodec);
-		}
-	}
-
-	public class HttpResponseFormatterArgs {
-		public readonly Uri ResponseUrl;
-		public readonly Uri RequestedUrl;
-		public readonly ICodec ResponseCodec;
-
-		public HttpResponseFormatterArgs(Uri responseUrl, Uri requestedUrl, ICodec responseCodec) {
-			ResponseUrl = responseUrl;
-			RequestedUrl = requestedUrl;
-			ResponseCodec = responseCodec;
-		}
-
-		public static implicit operator HttpResponseFormatterArgs(HttpEntityManager entity) {
-			return new HttpResponseFormatterArgs(entity.ResponseUrl, entity.RequestedUrl, entity.ResponseCodec);
-		}
-	}
-
-	public class SendToHttpEnvelope : IEnvelope {
-		private readonly IPublisher _networkSendQueue;
-		private readonly HttpEntityManager _entity;
-		private readonly Func<HttpResponseFormatterArgs, Message, object> _formatter;
-		private readonly Func<HttpResponseConfiguratorArgs, Message, ResponseConfiguration> _configurator;
-
-		public SendToHttpEnvelope(IPublisher networkSendQueue,
-			HttpEntityManager entity,
-			Func<HttpResponseFormatterArgs, Message, object> formatter,
-			Func<HttpResponseConfiguratorArgs, Message, ResponseConfiguration> configurator) {
-			Ensure.NotNull(networkSendQueue, "networkSendQueue");
-			Ensure.NotNull(entity, "entity");
-			Ensure.NotNull(formatter, "formatter");
-			Ensure.NotNull(configurator, "configurator");
-
-			_networkSendQueue = networkSendQueue;
-			_entity = entity;
-			_formatter = formatter;
-			_configurator = configurator;
-		}
-
-		public void ReplyWith<T>(T message) where T : Message {
-			Ensure.NotNull(message, "message");
-			var responseConfiguration = _configurator(_entity, message);
-			var data = _formatter(_entity, message);
-			_networkSendQueue.Publish(new HttpMessage.HttpSend(_entity, responseConfiguration, data, message));
-		}
-	}
-
-	public class SendToHttpEnvelope<TExpectedResponseMessage> : IEnvelope where TExpectedResponseMessage : Message {
-		private readonly Func<ICodec, TExpectedResponseMessage, string> _formatter;
-		private readonly Func<ICodec, TExpectedResponseMessage, ResponseConfiguration> _configurator;
-		private readonly IEnvelope _notMatchingEnvelope;
-
-		private readonly IEnvelope _httpEnvelope;
-
-		public SendToHttpEnvelope(IPublisher networkSendQueue,
-			HttpEntityManager entity,
-			Func<ICodec, TExpectedResponseMessage, string> formatter,
-			Func<ICodec, TExpectedResponseMessage, ResponseConfiguration> configurator,
-			IEnvelope notMatchingEnvelope) {
-			_formatter = formatter;
-			_configurator = configurator;
-			_notMatchingEnvelope = notMatchingEnvelope;
-			_httpEnvelope = new SendToHttpEnvelope(networkSendQueue, entity, Formatter, Configurator);
-		}
-
-		private ResponseConfiguration Configurator(HttpResponseConfiguratorArgs http, Message message) {
-			try {
-				return _configurator(http.ResponseCodec, (TExpectedResponseMessage)message);
-			} catch (InvalidCastException) {
-				//NOTE: using exceptions to allow handling errors in debugger
-				return new ResponseConfiguration(500, "Internal server error", "text/plain", Helper.UTF8NoBom);
-			}
-		}
-
-		private string Formatter(HttpResponseFormatterArgs http, Message message) {
-			try {
-				return _formatter(http.ResponseCodec, (TExpectedResponseMessage)message);
-			} catch (InvalidCastException) {
-				//NOTE: using exceptions to allow handling errors in debugger
-				return "";
-			}
-		}
-
-		public void ReplyWith<T>(T message) where T : Message {
-			if (message is TExpectedResponseMessage || _notMatchingEnvelope == null)
-				_httpEnvelope.ReplyWith(message);
-			else
-				_notMatchingEnvelope.ReplyWith(message);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/SendToHttpWithConversionEnvelope.cs b/src/EventStore.Core/Services/Transport/Http/SendToHttpWithConversionEnvelope.cs
deleted file mode 100644
index 4978a25de79..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/SendToHttpWithConversionEnvelope.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.EntityManagement;
-
-namespace EventStore.Core.Services.Transport.Http {
-	public class SendToHttpWithConversionEnvelope<TExpectedResponseMessage, TExpectedHttpFormattedResponseMessage> :
-		IEnvelope
-		where TExpectedResponseMessage : Message {
-		private readonly Func<ICodec, TExpectedHttpFormattedResponseMessage, string> _formatter;
-		private readonly Func<ICodec, TExpectedHttpFormattedResponseMessage, ResponseConfiguration> _configurator;
-		private readonly Func<TExpectedResponseMessage, TExpectedHttpFormattedResponseMessage> _convertor;
-
-		private readonly IEnvelope _httpEnvelope;
-
-		public SendToHttpWithConversionEnvelope(IPublisher networkSendQueue,
-			HttpEntityManager entity,
-			Func<ICodec, TExpectedHttpFormattedResponseMessage, string> formatter,
-			Func<ICodec, TExpectedHttpFormattedResponseMessage, ResponseConfiguration> configurator,
-			Func<TExpectedResponseMessage, TExpectedHttpFormattedResponseMessage> convertor,
-			IEnvelope nonMatchingEnvelope = null) {
-			_formatter = formatter;
-			_configurator = configurator;
-			_convertor = convertor;
-			_httpEnvelope = new SendToHttpEnvelope<TExpectedResponseMessage>(networkSendQueue, entity, Formatter,
-				Configurator, nonMatchingEnvelope);
-		}
-
-		private ResponseConfiguration Configurator(ICodec codec, TExpectedResponseMessage message) {
-			var convertedMessage = _convertor(message);
-			return _configurator(codec, convertedMessage);
-		}
-
-		private string Formatter(ICodec codec, TExpectedResponseMessage message) {
-			var convertedMessage = _convertor(message);
-			return _formatter(codec, convertedMessage);
-		}
-
-		public void ReplyWith<T>(T message) where T : Message {
-			_httpEnvelope.ReplyWith(message);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/ServiceAccessibility.cs b/src/EventStore.Core/Services/Transport/Http/ServiceAccessibility.cs
deleted file mode 100644
index 323ba3d608a..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/ServiceAccessibility.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.Core.Services.Transport.Http {
-	public enum ServiceAccessibility {
-		Private,
-		Public
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/UnixSocketConnectionMiddleware.cs b/src/EventStore.Core/Services/Transport/Http/UnixSocketConnectionMiddleware.cs
deleted file mode 100644
index f8a02c8919b..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/UnixSocketConnectionMiddleware.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Connections;
-
-namespace EventStore.Core.Services.Transport.Http;
-public class UnixSocketConnectionMiddleware {
-	private readonly ConnectionDelegate _next;
-	public const string UnixSocketConnectionKey = "UnixSocketConnection";
-
-	public UnixSocketConnectionMiddleware(ConnectionDelegate next) {
-		_next = next;
-	}
-
-	public async Task OnConnectAsync(ConnectionContext context) {
-		context.Items.Add(UnixSocketConnectionKey, true);
-		await _next(context);
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/UriRouters.cs b/src/EventStore.Core/Services/Transport/Http/UriRouters.cs
deleted file mode 100644
index 04ffca6fe77..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/UriRouters.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using EventStore.Common.Utils;
-using EventStore.Transport.Http.EntityManagement;
-
-namespace EventStore.Core.Services.Transport.Http {
-	public interface IUriRouter {
-		void RegisterAction(ControllerAction action, Func<HttpEntityManager, UriTemplateMatch, RequestParams> handler);
-		List<UriToActionMatch> GetAllUriMatches(Uri uri);
-		IEnumerable<ControllerAction> Actions { get; }
-	}
-
-	public class TrieUriRouter : IUriRouter {
-		private const string Placeholder = "{}";
-		private const string GreedyPlaceholder = "{*}";
-
-		private readonly RouterNode _root = new RouterNode();
-		private readonly List<ControllerAction> _registeredRoutes;
-
-		public TrieUriRouter() {
-			_registeredRoutes = new List<ControllerAction>();
-		}
-
-		public void RegisterAction(ControllerAction action,
-			Func<HttpEntityManager, UriTemplateMatch, RequestParams> handler) {
-			Ensure.NotNull(action, "action");
-			Ensure.NotNull(handler, "handler");
-
-			var segments = new Uri("http://fake" + action.UriTemplate, UriKind.Absolute).Segments;
-			RouterNode node = _root;
-			foreach (var segm in segments) {
-				var segment = Uri.UnescapeDataString(segm);
-				string path = segment.StartsWith("{*") ? GreedyPlaceholder
-					: segment.StartsWith("{") ? Placeholder
-					: segment;
-
-				RouterNode child;
-				if (!node.Children.TryGetValue(path, out child)) {
-					child = new RouterNode();
-					node.Children.Add(path, child);
-				}
-
-				node = child;
-			}
-
-			if (node.LeafRoutes.Contains(x => x.Action.Equals(action)))
-				throw new ArgumentException("Duplicate route.");
-			node.LeafRoutes.Add(new HttpRoute(action, handler));
-
-			_registeredRoutes.Add(action);
-		}
-
-		public List<UriToActionMatch> GetAllUriMatches(Uri uri) {
-			var matches = new List<UriToActionMatch>();
-			var baseAddress = new UriBuilder(uri.Scheme, uri.Host, uri.Port).Uri;
-
-
-			var segments = new string[uri.Segments.Length];
-			for (int i = 0; i < uri.Segments.Length; i++) {
-				segments[i] = Uri.UnescapeDataString(uri.Segments[i]);
-			}
-
-			GetAllUriMatches(_root, baseAddress, uri, segments, 0, matches);
-
-			return matches;
-		}
-
-		public IEnumerable<ControllerAction> Actions => _registeredRoutes;
-
-		private void GetAllUriMatches(RouterNode node, Uri baseAddress, Uri uri, string[] segments, int index,
-			List<UriToActionMatch> matches) {
-			RouterNode child;
-
-			if (index == segments.Length) {
-				// /stats/ should match /stats/{*greedyStatsPath}
-				if (uri.OriginalString.EndsWith("/") && node.Children.TryGetValue(GreedyPlaceholder, out child))
-					AddMatchingRoutes(child.LeafRoutes, baseAddress, uri, matches);
-
-				AddMatchingRoutes(node.LeafRoutes, baseAddress, uri, matches);
-				return;
-			}
-
-			if (node.Children.TryGetValue(GreedyPlaceholder, out child))
-				GetAllUriMatches(child, baseAddress, uri, segments, segments.Length, matches);
-			if (node.Children.TryGetValue(Placeholder, out child))
-				GetAllUriMatches(child, baseAddress, uri, segments, index + 1, matches);
-			if (node.Children.TryGetValue(segments[index], out child))
-				GetAllUriMatches(child, baseAddress, uri, segments, index + 1, matches);
-		}
-
-		private static void AddMatchingRoutes(IList<HttpRoute> routes, Uri baseAddress, Uri uri,
-			List<UriToActionMatch> matches) {
-			for (int i = 0; i < routes.Count; ++i) {
-				var route = routes[i];
-				var match = route.UriTemplate.Match(baseAddress, uri);
-				if (match != null)
-					matches.Add(new UriToActionMatch(match, route.Action, route.Handler));
-			}
-		}
-
-		private class RouterNode {
-			public readonly Dictionary<string, RouterNode> Children = new Dictionary<string, RouterNode>();
-			public readonly List<HttpRoute> LeafRoutes = new List<HttpRoute>();
-		}
-	}
-
-	public class NaiveUriRouter : IUriRouter {
-		private readonly List<HttpRoute> _actions = new List<HttpRoute>();
-
-		public IEnumerable<ControllerAction> Actions => _actions.Select(x => x.Action);
-
-		public void RegisterAction(ControllerAction action,
-			Func<HttpEntityManager, UriTemplateMatch, RequestParams> handler) {
-			if (_actions.Contains(x => x.Action.Equals(action)))
-				throw new ArgumentException("Duplicate route.");
-			_actions.Add(new HttpRoute(action, handler));
-		}
-
-		public List<UriToActionMatch> GetAllUriMatches(Uri uri) {
-			var matches = new List<UriToActionMatch>();
-			var baseAddress = new UriBuilder(uri.Scheme, uri.Host, uri.Port).Uri;
-			for (int i = 0; i < _actions.Count; ++i) {
-				var route = _actions[i];
-				var match = route.UriTemplate.Match(baseAddress, uri);
-				if (match != null)
-					matches.Add(new UriToActionMatch(match, route.Action, route.Handler));
-			}
-
-			return matches;
-		}
-	}
-
-	internal class HttpRoute {
-		public readonly ControllerAction Action;
-		public readonly Func<HttpEntityManager, UriTemplateMatch, RequestParams> Handler;
-		public readonly UriTemplate UriTemplate;
-
-		public HttpRoute(ControllerAction action, Func<HttpEntityManager, UriTemplateMatch, RequestParams> handler) {
-			Action = action;
-			Handler = handler;
-			UriTemplate = new UriTemplate(action.UriTemplate);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/UriToActionMatch.cs b/src/EventStore.Core/Services/Transport/Http/UriToActionMatch.cs
deleted file mode 100644
index d4b3ee9ad71..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/UriToActionMatch.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using EventStore.Transport.Http.EntityManagement;
-
-namespace EventStore.Core.Services.Transport.Http {
-	public class UriToActionMatch {
-		public readonly UriTemplateMatch TemplateMatch;
-		public readonly ControllerAction ControllerAction;
-		public readonly Func<HttpEntityManager, UriTemplateMatch, RequestParams> RequestHandler;
-
-		public UriToActionMatch(UriTemplateMatch templateMatch,
-			ControllerAction controllerAction,
-			Func<HttpEntityManager, UriTemplateMatch, RequestParams> requestHandler) {
-			TemplateMatch = templateMatch;
-			ControllerAction = controllerAction;
-			RequestHandler = requestHandler;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Http/WebHostBuilderExtensions.cs b/src/EventStore.Core/Services/Transport/Http/WebHostBuilderExtensions.cs
deleted file mode 100644
index 6633e84db66..00000000000
--- a/src/EventStore.Core/Services/Transport/Http/WebHostBuilderExtensions.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace EventStore.Core.Services.Transport.Http {
-	internal static class WebHostBuilderExtensions {
-		public static IWebHostBuilder UseStartup(this IWebHostBuilder builder, IStartup startup)
-			=> builder
-				.ConfigureServices(services => services.AddSingleton(startup));
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Tcp/ClientTcpDispatcher.cs b/src/EventStore.Core/Services/Transport/Tcp/ClientTcpDispatcher.cs
deleted file mode 100644
index 6ab7112a39c..00000000000
--- a/src/EventStore.Core/Services/Transport/Tcp/ClientTcpDispatcher.cs
+++ /dev/null
@@ -1,524 +0,0 @@
-using System;
-using System.Linq;
-using System.Net;
-using System.Security.Claims;
-using EventStore.Client.Messages;
-using EventStore.Common.Utils;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Util;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Core.Services.Transport.Tcp {
-	public class ClientTcpDispatcher : ClientWriteTcpDispatcher {
-		public ClientTcpDispatcher(int writeTimeoutMs)
-			: this(TimeSpan.FromMilliseconds(writeTimeoutMs)) {
-		}
-
-		public ClientTcpDispatcher(TimeSpan writeTimeout) : base(writeTimeout) {
-			AddUnwrapper(TcpCommand.Ping, UnwrapPing, ClientVersion.V2);
-			AddWrapper<TcpMessage.PongMessage>(WrapPong, ClientVersion.V2);
-
-			AddUnwrapper(TcpCommand.IdentifyClient, UnwrapIdentifyClient, ClientVersion.V2);
-
-			AddUnwrapper(TcpCommand.ReadEvent, UnwrapReadEvent, ClientVersion.V2);
-			AddWrapper<ClientMessage.ReadEventCompleted>(WrapReadEventCompleted, ClientVersion.V2);
-
-			AddUnwrapper(TcpCommand.ReadStreamEventsForward, UnwrapReadStreamEventsForward, ClientVersion.V2);
-			AddWrapper<ClientMessage.ReadStreamEventsForwardCompleted>(WrapReadStreamEventsForwardCompleted,
-				ClientVersion.V2);
-			AddUnwrapper(TcpCommand.ReadStreamEventsBackward, UnwrapReadStreamEventsBackward, ClientVersion.V2);
-			AddWrapper<ClientMessage.ReadStreamEventsBackwardCompleted>(WrapReadStreamEventsBackwardCompleted,
-				ClientVersion.V2);
-
-			AddUnwrapper(TcpCommand.ReadAllEventsForward, UnwrapReadAllEventsForward, ClientVersion.V2);
-			AddWrapper<ClientMessage.ReadAllEventsForwardCompleted>(WrapReadAllEventsForwardCompleted,
-				ClientVersion.V2);
-			AddUnwrapper(TcpCommand.ReadAllEventsBackward, UnwrapReadAllEventsBackward, ClientVersion.V2);
-			AddWrapper<ClientMessage.ReadAllEventsBackwardCompleted>(WrapReadAllEventsBackwardCompleted,
-				ClientVersion.V2);
-
-			AddUnwrapper(TcpCommand.FilteredReadAllEventsForward, UnwrapFilteredReadAllEventsForward, ClientVersion.V2);
-			AddWrapper<ClientMessage.FilteredReadAllEventsForwardCompleted>(WrapFilteredReadAllEventsForwardCompleted,
-				ClientVersion.V2);
-
-			AddUnwrapper(TcpCommand.FilteredReadAllEventsBackward, UnwrapFilteredReadAllEventsBackward,
-				ClientVersion.V2);
-			AddWrapper<ClientMessage.FilteredReadAllEventsBackwardCompleted>(WrapFilteredReadAllEventsBackwardCompleted,
-				ClientVersion.V2);
-
-			AddUnwrapper(TcpCommand.SubscribeToStream, UnwrapSubscribeToStream, ClientVersion.V2);
-			AddUnwrapper(TcpCommand.FilteredSubscribeToStream, UnwrapFilteredSubscribeToStream, ClientVersion.V2);
-			AddUnwrapper(TcpCommand.UnsubscribeFromStream, UnwrapUnsubscribeFromStream, ClientVersion.V2);
-
-			AddWrapper<ClientMessage.CheckpointReached>(WrapCheckpointReached, ClientVersion.V2);
-
-			AddWrapper<ClientMessage.SubscriptionConfirmation>(WrapSubscribedToStream, ClientVersion.V2);
-			AddWrapper<ClientMessage.StreamEventAppeared>(WrapStreamEventAppeared, ClientVersion.V2);
-			AddWrapper<ClientMessage.SubscriptionDropped>(WrapSubscriptionDropped, ClientVersion.V2);
-			AddUnwrapper(TcpCommand.CreatePersistentSubscription, UnwrapCreatePersistentSubscription, ClientVersion.V2);
-			AddUnwrapper(TcpCommand.DeletePersistentSubscription, UnwrapDeletePersistentSubscription, ClientVersion.V2);
-			AddWrapper<ClientMessage.CreatePersistentSubscriptionToStreamCompleted>(WrapCreatePersistentSubscriptionCompleted,
-				ClientVersion.V2);
-			AddWrapper<ClientMessage.DeletePersistentSubscriptionToStreamCompleted>(WrapDeletePersistentSubscriptionCompleted,
-				ClientVersion.V2);
-			AddUnwrapper(TcpCommand.UpdatePersistentSubscription, UnwrapUpdatePersistentSubscription, ClientVersion.V2);
-			AddWrapper<ClientMessage.UpdatePersistentSubscriptionToStreamCompleted>(WrapUpdatePersistentSubscriptionCompleted,
-				ClientVersion.V2);
-
-
-			AddUnwrapper(TcpCommand.ConnectToPersistentSubscription, UnwrapConnectToPersistentSubscription,
-				ClientVersion.V2);
-			AddUnwrapper(TcpCommand.PersistentSubscriptionAckEvents, UnwrapPersistentSubscriptionAckEvents,
-				ClientVersion.V2);
-			AddUnwrapper(TcpCommand.PersistentSubscriptionNakEvents, UnwrapPersistentSubscriptionNackEvents,
-				ClientVersion.V2);
-			AddWrapper<ClientMessage.PersistentSubscriptionConfirmation>(WrapPersistentSubscriptionConfirmation,
-				ClientVersion.V2);
-			AddWrapper<ClientMessage.PersistentSubscriptionStreamEventAppeared>(
-				WrapPersistentSubscriptionStreamEventAppeared, ClientVersion.V2);
-
-			AddUnwrapper(TcpCommand.ScavengeDatabase, UnwrapScavengeDatabase, ClientVersion.V2);
-			AddWrapper<ClientMessage.ScavengeDatabaseInProgressResponse>(WrapScavengeDatabaseResponse, ClientVersion.V2);
-			AddWrapper<ClientMessage.ScavengeDatabaseStartedResponse>(WrapScavengeDatabaseResponse, ClientVersion.V2);
-			AddWrapper<ClientMessage.ScavengeDatabaseUnauthorizedResponse>(WrapScavengeDatabaseResponse, ClientVersion.V2);
-
-			AddWrapper<ClientMessage.NotHandled>(WrapNotHandled, ClientVersion.V2);
-			AddUnwrapper(TcpCommand.NotHandled, UnwrapNotHandled, ClientVersion.V2);
-
-			AddWrapper<TcpMessage.NotAuthenticated>(WrapNotAuthenticated, ClientVersion.V2);
-			AddWrapper<TcpMessage.Authenticated>(WrapAuthenticated, ClientVersion.V2);
-		}
-
-
-		private TcpPackage WrapCheckpointReached(ClientMessage.CheckpointReached msg) {
-			var dto = new CheckpointReached(msg.Position.Value.CommitPosition,
-				msg.Position.Value.PreparePosition);
-			return new TcpPackage(TcpCommand.CheckpointReached, msg.CorrelationId, dto.Serialize());
-		}
-
-		private static Message UnwrapPing(TcpPackage package, IEnvelope envelope) {
-			var data = new byte[package.Data.Count];
-			Buffer.BlockCopy(package.Data.Array, package.Data.Offset, data, 0, package.Data.Count);
-			var pongMessage = new TcpMessage.PongMessage(package.CorrelationId, data);
-			envelope.ReplyWith(pongMessage);
-			return pongMessage;
-		}
-
-		private static Message UnwrapIdentifyClient(TcpPackage package, IEnvelope envelope) {
-			var dto = package.Data.Deserialize<IdentifyClient>();
-			if (dto == null) return null;
-
-			return new ClientMessage.IdentifyClient(package.CorrelationId, dto.Version, dto.ConnectionName);
-		}
-
-		private static TcpPackage WrapPong(TcpMessage.PongMessage message) {
-			return new TcpPackage(TcpCommand.Pong, message.CorrelationId, message.Payload);
-		}
-
-		private static ClientMessage.ReadEvent
-			UnwrapReadEvent(TcpPackage package, IEnvelope envelope, ClaimsPrincipal user) {
-			var dto = package.Data.Deserialize<ReadEvent>();
-			if (dto == null) return null;
-			return new ClientMessage.ReadEvent(Guid.NewGuid(), package.CorrelationId, envelope, dto.EventStreamId,
-				dto.EventNumber, dto.ResolveLinkTos, dto.RequireLeader, user);
-		}
-
-		private static TcpPackage WrapReadEventCompleted(ClientMessage.ReadEventCompleted msg) {
-			var dto = new ReadEventCompleted(
-				(ReadEventCompleted.Types.ReadEventResult)msg.Result,
-				new ResolvedIndexedEvent(msg.Record.Event, msg.Record.Link), msg.Error);
-			return new TcpPackage(TcpCommand.ReadEventCompleted, msg.CorrelationId, dto.Serialize());
-		}
-
-		private static ClientMessage.ReadStreamEventsForward UnwrapReadStreamEventsForward(TcpPackage package,
-			IEnvelope envelope, ClaimsPrincipal user) {
-			var dto = package.Data.Deserialize<ReadStreamEvents>();
-			if (dto == null) return null;
-			return new ClientMessage.ReadStreamEventsForward(Guid.NewGuid(), package.CorrelationId, envelope,
-				dto.EventStreamId, dto.FromEventNumber, dto.MaxCount,
-				dto.ResolveLinkTos, dto.RequireLeader, null, user,
-				replyOnExpired: false);
-		}
-
-		private static TcpPackage WrapReadStreamEventsForwardCompleted(
-			ClientMessage.ReadStreamEventsForwardCompleted msg) {
-			var dto = new ReadStreamEventsCompleted(
-				ConvertToResolvedIndexedEvents(msg.Events),
-				(ReadStreamEventsCompleted.Types.ReadStreamResult)msg.Result,
-				msg.NextEventNumber, msg.LastEventNumber, msg.IsEndOfStream, msg.TfLastCommitPosition, msg.Error);
-			return new TcpPackage(TcpCommand.ReadStreamEventsForwardCompleted, msg.CorrelationId, dto.Serialize());
-		}
-
-		private static ClientMessage.ReadStreamEventsBackward UnwrapReadStreamEventsBackward(TcpPackage package,
-			IEnvelope envelope, ClaimsPrincipal user) {
-			var dto = package.Data.Deserialize<ReadStreamEvents>();
-			if (dto == null) return null;
-			return new ClientMessage.ReadStreamEventsBackward(Guid.NewGuid(), package.CorrelationId, envelope,
-				dto.EventStreamId, dto.FromEventNumber, dto.MaxCount,
-				dto.ResolveLinkTos, dto.RequireLeader, null, user);
-		}
-
-		private static TcpPackage WrapReadStreamEventsBackwardCompleted(
-			ClientMessage.ReadStreamEventsBackwardCompleted msg) {
-			var dto = new ReadStreamEventsCompleted(
-				ConvertToResolvedIndexedEvents(msg.Events),
-				(ReadStreamEventsCompleted.Types.ReadStreamResult)msg.Result,
-				msg.NextEventNumber, msg.LastEventNumber, msg.IsEndOfStream, msg.TfLastCommitPosition, msg.Error);
-			return new TcpPackage(TcpCommand.ReadStreamEventsBackwardCompleted, msg.CorrelationId, dto.Serialize());
-		}
-
-		private static ResolvedIndexedEvent[]
-			ConvertToResolvedIndexedEvents(ResolvedEvent[] events) {
-			var result = new ResolvedIndexedEvent[events.Length];
-			for (int i = 0; i < events.Length; ++i) {
-				result[i] = new ResolvedIndexedEvent(events[i].Event, events[i].Link);
-			}
-
-			return result;
-		}
-
-		private static ClientMessage.ReadAllEventsForward UnwrapReadAllEventsForward(TcpPackage package,
-			IEnvelope envelope, ClaimsPrincipal user) {
-			var dto = package.Data.Deserialize<ReadAllEvents>();
-			if (dto == null) return null;
-
-			return new ClientMessage.ReadAllEventsForward(Guid.NewGuid(), package.CorrelationId, envelope,
-				dto.CommitPosition, dto.PreparePosition, dto.MaxCount,
-				dto.ResolveLinkTos, dto.RequireLeader, null, user,
-				replyOnExpired: false,
-				longPollTimeout: null);
-		}
-
-
-		private static TcpPackage WrapReadAllEventsForwardCompleted(ClientMessage.ReadAllEventsForwardCompleted msg) {
-			var dto = new ReadAllEventsCompleted(
-				msg.CurrentPos.CommitPosition, msg.CurrentPos.PreparePosition, ConvertToResolvedEvents(msg.Events),
-				msg.NextPos.CommitPosition, msg.NextPos.PreparePosition,
-				(ReadAllEventsCompleted.Types.ReadAllResult)msg.Result, msg.Error);
-			return new TcpPackage(TcpCommand.ReadAllEventsForwardCompleted, msg.CorrelationId, dto.Serialize());
-		}
-
-		private static ClientMessage.ReadAllEventsBackward UnwrapReadAllEventsBackward(TcpPackage package,
-			IEnvelope envelope, ClaimsPrincipal user) {
-			var dto = package.Data.Deserialize<ReadAllEvents>();
-			if (dto == null) return null;
-			return new ClientMessage.ReadAllEventsBackward(Guid.NewGuid(), package.CorrelationId, envelope,
-				dto.CommitPosition, dto.PreparePosition, dto.MaxCount,
-				dto.ResolveLinkTos, dto.RequireLeader, null, user);
-		}
-
-		private static TcpPackage WrapReadAllEventsBackwardCompleted(ClientMessage.ReadAllEventsBackwardCompleted msg) {
-			var dto = new ReadAllEventsCompleted(
-				msg.CurrentPos.CommitPosition, msg.CurrentPos.PreparePosition, ConvertToResolvedEvents(msg.Events),
-				msg.NextPos.CommitPosition, msg.NextPos.PreparePosition,
-				(ReadAllEventsCompleted.Types.ReadAllResult)msg.Result, msg.Error);
-			return new TcpPackage(TcpCommand.ReadAllEventsBackwardCompleted, msg.CorrelationId, dto.Serialize());
-		}
-
-		private static ClientMessage.FilteredReadAllEventsForward UnwrapFilteredReadAllEventsForward(TcpPackage package,
-			IEnvelope envelope, ClaimsPrincipal user) {
-			var dto = package.Data.Deserialize<FilteredReadAllEvents>();
-			if (dto == null) return null;
-
-			IEventFilter eventFilter = EventFilter.Get(true, dto.Filter);
-
-			int maxSearchWindow = dto.MaxCount;
-			if (dto.MaxSearchWindow > 0) {
-				maxSearchWindow = dto.MaxSearchWindow;
-			}
-
-			return new ClientMessage.FilteredReadAllEventsForward(Guid.NewGuid(), package.CorrelationId, envelope,
-				dto.CommitPosition, dto.PreparePosition, dto.MaxCount,
-				dto.ResolveLinkTos, dto.RequireLeader, maxSearchWindow, null, eventFilter, user,
-				replyOnExpired: false,
-				longPollTimeout: null);
-		}
-
-		private static TcpPackage WrapFilteredReadAllEventsForwardCompleted(
-			ClientMessage.FilteredReadAllEventsForwardCompleted msg) {
-			var dto = new FilteredReadAllEventsCompleted(
-				msg.CurrentPos.CommitPosition, msg.CurrentPos.PreparePosition, ConvertToResolvedEvents(msg.Events),
-				msg.NextPos.CommitPosition, msg.NextPos.PreparePosition, msg.IsEndOfStream,
-				(FilteredReadAllEventsCompleted.Types.FilteredReadAllResult)msg.Result, msg.Error);
-			return new TcpPackage(TcpCommand.FilteredReadAllEventsForwardCompleted, msg.CorrelationId, dto.Serialize());
-		}
-
-		private static Client.Messages.ResolvedEvent[] ConvertToResolvedEvents(ResolvedEvent[] events) {
-			var result = new Client.Messages.ResolvedEvent[events.Length];
-			for (int i = 0; i < events.Length; ++i) {
-				result[i] = new Client.Messages.ResolvedEvent(events[i]);
-			}
-
-			return result;
-		}
-
-		private static ClientMessage.FilteredReadAllEventsBackward UnwrapFilteredReadAllEventsBackward(
-			TcpPackage package,
-			IEnvelope envelope, ClaimsPrincipal user) {
-			var dto = package.Data.Deserialize<FilteredReadAllEvents>();
-			if (dto == null) return null;
-
-			IEventFilter eventFilter = EventFilter.Get(true, dto.Filter);
-
-			int maxSearchWindow = dto.MaxCount;
-			if (dto.MaxSearchWindow > 0) {
-				maxSearchWindow = dto.MaxSearchWindow;
-			}
-
-			return new ClientMessage.FilteredReadAllEventsBackward(Guid.NewGuid(), package.CorrelationId, envelope,
-				dto.CommitPosition, dto.PreparePosition, dto.MaxCount,
-				dto.ResolveLinkTos, dto.RequireLeader, maxSearchWindow, null, eventFilter, user, null);
-		}
-
-		private static TcpPackage WrapFilteredReadAllEventsBackwardCompleted(
-			ClientMessage.FilteredReadAllEventsBackwardCompleted msg) {
-			var dto = new FilteredReadAllEventsCompleted(
-				msg.CurrentPos.CommitPosition, msg.CurrentPos.PreparePosition, ConvertToResolvedEvents(msg.Events),
-				msg.NextPos.CommitPosition, msg.NextPos.PreparePosition, msg.IsEndOfStream,
-				(FilteredReadAllEventsCompleted.Types.FilteredReadAllResult)msg.Result, msg.Error);
-			return new TcpPackage(TcpCommand.FilteredReadAllEventsBackwardCompleted, msg.CorrelationId,
-				dto.Serialize());
-		}
-
-		private ClientMessage.SubscribeToStream UnwrapSubscribeToStream(TcpPackage package,
-			IEnvelope envelope,
-			ClaimsPrincipal user,
-			TcpConnectionManager connection) {
-			var dto = package.Data.Deserialize<SubscribeToStream>();
-			if (dto == null) return null;
-			return new ClientMessage.SubscribeToStream(Guid.NewGuid(), package.CorrelationId, envelope,
-				connection.ConnectionId, dto.EventStreamId, dto.ResolveLinkTos, user);
-		}
-
-		private ClientMessage.FilteredSubscribeToStream UnwrapFilteredSubscribeToStream(TcpPackage package,
-			IEnvelope envelope,
-			ClaimsPrincipal user,
-			TcpConnectionManager connection) {
-			var dto = package.Data.Deserialize<FilteredSubscribeToStream>();
-			if (dto == null) return null;
-
-			IEventFilter eventFilter = EventFilter.Get(dto.EventStreamId.IsEmptyString(), dto.Filter);
-
-			return new ClientMessage.FilteredSubscribeToStream(Guid.NewGuid(), package.CorrelationId, envelope,
-				connection.ConnectionId, dto.EventStreamId, dto.ResolveLinkTos, user, eventFilter,
-				dto.CheckpointInterval, checkpointIntervalCurrent: 0);
-		}
-
-		private ClientMessage.UnsubscribeFromStream UnwrapUnsubscribeFromStream(TcpPackage package, IEnvelope envelope,
-			ClaimsPrincipal user) {
-			var dto = package.Data.Deserialize<UnsubscribeFromStream>();
-			if (dto == null) return null;
-			return new ClientMessage.UnsubscribeFromStream(Guid.NewGuid(), package.CorrelationId, envelope, user);
-		}
-
-		private TcpPackage WrapSubscribedToStream(ClientMessage.SubscriptionConfirmation msg) {
-			var dto = new SubscriptionConfirmation(msg.LastIndexedPosition, msg.LastEventNumber ?? 0);
-			return new TcpPackage(TcpCommand.SubscriptionConfirmation, msg.CorrelationId, dto.Serialize());
-		}
-
-		private ClientMessage.CreatePersistentSubscriptionToStream UnwrapCreatePersistentSubscription(
-			TcpPackage package, IEnvelope envelope, ClaimsPrincipal user, TcpConnectionManager connection) {
-			var dto = package.Data.Deserialize<CreatePersistentSubscription>();
-			if (dto == null) return null;
-
-			var namedConsumerStrategy = dto.NamedConsumerStrategy;
-			if (string.IsNullOrEmpty(namedConsumerStrategy)) {
-				namedConsumerStrategy = dto.PreferRoundRobin
-					? SystemConsumerStrategies.RoundRobin
-					: SystemConsumerStrategies.DispatchToSingle;
-			}
-
-			return new ClientMessage.CreatePersistentSubscriptionToStream(Guid.NewGuid(), package.CorrelationId, envelope,
-				dto.EventStreamId, dto.SubscriptionGroupName, dto.ResolveLinkTos, dto.StartFrom,
-				dto.MessageTimeoutMilliseconds,
-				dto.RecordStatistics, dto.MaxRetryCount, dto.BufferSize, dto.LiveBufferSize,
-				dto.ReadBatchSize, dto.CheckpointAfterTime, dto.CheckpointMinCount,
-				dto.CheckpointMaxCount, dto.SubscriberMaxCount, namedConsumerStrategy,
-				user);
-		}
-
-		private ClientMessage.UpdatePersistentSubscriptionToStream UnwrapUpdatePersistentSubscription(
-			TcpPackage package, IEnvelope envelope, ClaimsPrincipal user, TcpConnectionManager connection) {
-			var dto = package.Data.Deserialize<UpdatePersistentSubscription>();
-			if (dto == null) return null;
-
-			var namedConsumerStrategy = dto.NamedConsumerStrategy;
-			if (string.IsNullOrEmpty(namedConsumerStrategy)) {
-				namedConsumerStrategy = dto.PreferRoundRobin
-					? SystemConsumerStrategies.RoundRobin
-					: SystemConsumerStrategies.DispatchToSingle;
-			}
-
-			return new ClientMessage.UpdatePersistentSubscriptionToStream(Guid.NewGuid(), package.CorrelationId, envelope,
-				dto.EventStreamId, dto.SubscriptionGroupName, dto.ResolveLinkTos, dto.StartFrom,
-				dto.MessageTimeoutMilliseconds,
-				dto.RecordStatistics, dto.MaxRetryCount, dto.BufferSize, dto.LiveBufferSize,
-				dto.ReadBatchSize, dto.CheckpointAfterTime, dto.CheckpointMinCount,
-				dto.CheckpointMaxCount, dto.SubscriberMaxCount, namedConsumerStrategy,
-				user);
-		}
-
-		private ClientMessage.DeletePersistentSubscriptionToStream UnwrapDeletePersistentSubscription(
-			TcpPackage package, IEnvelope envelope, ClaimsPrincipal user, TcpConnectionManager connection) {
-			var dto = package.Data.Deserialize<CreatePersistentSubscription>();
-			if (dto == null) return null;
-			return new ClientMessage.DeletePersistentSubscriptionToStream(Guid.NewGuid(), package.CorrelationId, envelope,
-				dto.EventStreamId, dto.SubscriptionGroupName, user);
-		}
-
-		private TcpPackage WrapDeletePersistentSubscriptionCompleted(
-			ClientMessage.DeletePersistentSubscriptionToStreamCompleted msg) {
-			var dto = new DeletePersistentSubscriptionCompleted(
-				(DeletePersistentSubscriptionCompleted.Types.DeletePersistentSubscriptionResult)msg
-					.Result, msg.Reason);
-			return new TcpPackage(TcpCommand.DeletePersistentSubscriptionCompleted, msg.CorrelationId, dto.Serialize());
-		}
-
-		private TcpPackage WrapCreatePersistentSubscriptionCompleted(
-			ClientMessage.CreatePersistentSubscriptionToStreamCompleted msg) {
-			var dto = new CreatePersistentSubscriptionCompleted(
-				(CreatePersistentSubscriptionCompleted.Types.CreatePersistentSubscriptionResult)msg
-					.Result, msg.Reason);
-			return new TcpPackage(TcpCommand.CreatePersistentSubscriptionCompleted, msg.CorrelationId, dto.Serialize());
-		}
-
-		private TcpPackage WrapUpdatePersistentSubscriptionCompleted(
-			ClientMessage.UpdatePersistentSubscriptionToStreamCompleted msg) {
-			var dto = new UpdatePersistentSubscriptionCompleted(
-				(UpdatePersistentSubscriptionCompleted.Types.UpdatePersistentSubscriptionResult)msg
-					.Result, msg.Reason);
-			return new TcpPackage(TcpCommand.UpdatePersistentSubscriptionCompleted, msg.CorrelationId, dto.Serialize());
-		}
-
-
-		private ClientMessage.ConnectToPersistentSubscriptionToStream UnwrapConnectToPersistentSubscription(
-			TcpPackage package, IEnvelope envelope, ClaimsPrincipal user, TcpConnectionManager connection) {
-			var dto = package.Data.Deserialize<ConnectToPersistentSubscription>();
-			if (dto == null) return null;
-			return new ClientMessage.ConnectToPersistentSubscriptionToStream(Guid.NewGuid(), package.CorrelationId, envelope,
-				connection.ConnectionId, connection.ClientConnectionName, dto.SubscriptionId, dto.EventStreamId, dto.AllowedInFlightMessages,
-				connection.RemoteEndPoint.ToString(), user);
-		}
-
-		private ClientMessage.PersistentSubscriptionAckEvents UnwrapPersistentSubscriptionAckEvents(
-			TcpPackage package, IEnvelope envelope, ClaimsPrincipal user, TcpConnectionManager connection) {
-			var dto = package.Data.Deserialize<PersistentSubscriptionAckEvents>();
-			if (dto == null) return null;
-			return new ClientMessage.PersistentSubscriptionAckEvents(
-				Guid.NewGuid(), package.CorrelationId, envelope, dto.SubscriptionId,
-				dto.ProcessedEventIds.Select(x => new Guid(x.ToByteArray())).ToArray(), user);
-		}
-
-		private ClientMessage.PersistentSubscriptionNackEvents UnwrapPersistentSubscriptionNackEvents(
-			TcpPackage package, IEnvelope envelope, ClaimsPrincipal user, TcpConnectionManager connection) {
-			var dto = package.Data.Deserialize<PersistentSubscriptionNakEvents>();
-			if (dto == null) return null;
-			return new ClientMessage.PersistentSubscriptionNackEvents(
-				Guid.NewGuid(), package.CorrelationId, envelope, dto.SubscriptionId,
-				dto.Message, (ClientMessage.PersistentSubscriptionNackEvents.NakAction)dto.Action,
-				dto.ProcessedEventIds.Select(x => new Guid(x.ToByteArray())).ToArray(), user);
-		}
-
-		private TcpPackage
-			WrapPersistentSubscriptionConfirmation(ClientMessage.PersistentSubscriptionConfirmation msg) {
-			var dto = new PersistentSubscriptionConfirmation(msg.LastIndexedPosition,
-				msg.SubscriptionId, msg.LastEventNumber ?? 0);
-			return new TcpPackage(TcpCommand.PersistentSubscriptionConfirmation, msg.CorrelationId, dto.Serialize());
-		}
-
-		private TcpPackage WrapPersistentSubscriptionStreamEventAppeared(
-			ClientMessage.PersistentSubscriptionStreamEventAppeared msg) {
-			var dto = new PersistentSubscriptionStreamEventAppeared(
-				new ResolvedIndexedEvent(msg.Event.Event, msg.Event.Link), msg.RetryCount);
-			return new TcpPackage(TcpCommand.PersistentSubscriptionStreamEventAppeared, msg.CorrelationId,
-				dto.Serialize());
-		}
-
-		private TcpPackage WrapStreamEventAppeared(ClientMessage.StreamEventAppeared msg) {
-			var dto = new StreamEventAppeared(new Client.Messages.ResolvedEvent(msg.Event));
-			return new TcpPackage(TcpCommand.StreamEventAppeared, msg.CorrelationId, dto.Serialize());
-		}
-
-		private TcpPackage WrapSubscriptionDropped(ClientMessage.SubscriptionDropped msg) {
-			var dto = new SubscriptionDropped(
-				(SubscriptionDropped.Types.SubscriptionDropReason)msg.Reason);
-			return new TcpPackage(TcpCommand.SubscriptionDropped, msg.CorrelationId, dto.Serialize());
-		}
-
-		private ClientMessage.ScavengeDatabase UnwrapScavengeDatabase(TcpPackage package, IEnvelope envelope,
-			ClaimsPrincipal user) {
-			return new ClientMessage.ScavengeDatabase(envelope, package.CorrelationId, user, 0, 1, null, null, false);
-		}
-		
-		private TcpPackage WrapScavengeDatabaseResponse(Message msg) {
-			ScavengeDatabaseResponse.Types.ScavengeResult result;
-			string scavengeId;
-			Guid correlationId;
-			
-			switch (msg) {
-				case ClientMessage.ScavengeDatabaseStartedResponse startedResponse:
-					result = ScavengeDatabaseResponse.Types.ScavengeResult.Started;
-					scavengeId = startedResponse.ScavengeId;
-					correlationId = startedResponse.CorrelationId;
-					break;
-				case ClientMessage.ScavengeDatabaseInProgressResponse inProgressResponse:
-					result = ScavengeDatabaseResponse.Types.ScavengeResult.InProgress;
-					scavengeId = inProgressResponse.ScavengeId;
-					correlationId = inProgressResponse.CorrelationId;
-					break;
-				case ClientMessage.ScavengeDatabaseUnauthorizedResponse unauthorizedResponse:
-					result = ScavengeDatabaseResponse.Types.ScavengeResult.Unauthorized;
-					scavengeId = unauthorizedResponse.ScavengeId;
-					correlationId = unauthorizedResponse.CorrelationId;
-					break;
-				default:
-					throw new ArgumentOutOfRangeException();
-			}
-
-			var dto = new ScavengeDatabaseResponse(result, scavengeId);
-			return new TcpPackage(TcpCommand.ScavengeDatabaseResponse, correlationId, dto.Serialize());
-		}
-
-		private ClientMessage.NotHandled UnwrapNotHandled(TcpPackage package, IEnvelope envelope) {
-			var dto = package.Data.Deserialize<NotHandled>();
-			if (dto == null) return null;
-			var reason = dto.Reason switch {
-				NotHandled.Types.NotHandledReason.NotReady => ClientMessage.NotHandled.Types.NotHandledReason.NotReady,
-				NotHandled.Types.NotHandledReason.TooBusy => ClientMessage.NotHandled.Types.NotHandledReason.TooBusy,
-				NotHandled.Types.NotHandledReason.NotLeader => ClientMessage.NotHandled.Types.NotHandledReason.NotLeader,
-				NotHandled.Types.NotHandledReason.IsReadOnly => ClientMessage.NotHandled.Types.NotHandledReason.IsReadOnly,
-				_ => throw new ArgumentOutOfRangeException()
-			};
-			var leaderInfoDto = dto.AdditionalInfo switch {
-				{} ai => ai.ToByteArray().Deserialize<NotHandled.Types.LeaderInfo>(),
-				_ => null
-			};
-
-			var leaderInfo = leaderInfoDto switch {
-				{ ExternalTcpAddress: { } } => new ClientMessage.NotHandled.Types.LeaderInfo(
-					new DnsEndPoint(leaderInfoDto.ExternalTcpAddress, leaderInfoDto.ExternalTcpPort), false, new DnsEndPoint(leaderInfoDto.HttpAddress, leaderInfoDto.HttpPort)),
-				{ ExternalSecureTcpAddress: { } } => new ClientMessage.NotHandled.Types.LeaderInfo(
-					new DnsEndPoint(leaderInfoDto.ExternalSecureTcpAddress, leaderInfoDto.ExternalSecureTcpPort), true, new DnsEndPoint(leaderInfoDto.HttpAddress, leaderInfoDto.HttpPort)),
-				_ => null
-			};
-			return new ClientMessage.NotHandled(package.CorrelationId, reason, leaderInfo);
-		}
-
-		private TcpPackage WrapNotHandled(ClientMessage.NotHandled msg) {
-			var dto = new Client.Messages.NotHandled(msg);
-			return new TcpPackage(TcpCommand.NotHandled, msg.CorrelationId, dto.Serialize());
-		}
-
-		private TcpPackage WrapNotAuthenticated(TcpMessage.NotAuthenticated msg) {
-			return new TcpPackage(TcpCommand.NotAuthenticated, msg.CorrelationId,
-				Helper.UTF8NoBom.GetBytes(msg.Reason ?? string.Empty));
-		}
-
-		private TcpPackage WrapAuthenticated(TcpMessage.Authenticated msg) {
-			return new TcpPackage(TcpCommand.Authenticated, msg.CorrelationId, Empty.ByteArray);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Tcp/ClientWriteTcpDispatcher.cs b/src/EventStore.Core/Services/Transport/Tcp/ClientWriteTcpDispatcher.cs
deleted file mode 100644
index cb20335f6a4..00000000000
--- a/src/EventStore.Core/Services/Transport/Tcp/ClientWriteTcpDispatcher.cs
+++ /dev/null
@@ -1,305 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Security.Principal;
-using System.Threading;
-using EventStore.Client.Messages;
-using EventStore.Common.Utils;
-using EventStore.Core.Authentication.DelegatedAuthentication;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Util;
-using Google.Protobuf;
-using Microsoft.Diagnostics.Tracing.Parsers.IIS_Trace;
-using OperationResult = EventStore.Core.Messages.OperationResult;
-
-namespace EventStore.Core.Services.Transport.Tcp {
-	public enum ClientVersion : byte {
-		V1 = 0,
-		V2 = 1
-	}
-
-	public class ClientWriteTcpDispatcher : TcpDispatcher {
-		private readonly TimeSpan _writeTimeout;
-
-		protected ClientWriteTcpDispatcher(TimeSpan writeTimeout) {
-			_writeTimeout = writeTimeout;
-			AddUnwrapper(TcpCommand.WriteEvents, UnwrapWriteEvents, ClientVersion.V2);
-			AddWrapper<ClientMessage.WriteEvents>(WrapWriteEvents, ClientVersion.V2);
-			AddUnwrapper(TcpCommand.WriteEventsCompleted, UnwrapWriteEventsCompleted, ClientVersion.V2);
-			AddWrapper<ClientMessage.WriteEventsCompleted>(WrapWriteEventsCompleted, ClientVersion.V2);
-
-			AddUnwrapper(TcpCommand.TransactionStart, UnwrapTransactionStart, ClientVersion.V2);
-			AddWrapper<ClientMessage.TransactionStart>(WrapTransactionStart, ClientVersion.V2);
-			AddUnwrapper(TcpCommand.TransactionStartCompleted, UnwrapTransactionStartCompleted, ClientVersion.V2);
-			AddWrapper<ClientMessage.TransactionStartCompleted>(WrapTransactionStartCompleted, ClientVersion.V2);
-
-			AddUnwrapper(TcpCommand.TransactionWrite, UnwrapTransactionWrite, ClientVersion.V2);
-			AddWrapper<ClientMessage.TransactionWrite>(WrapTransactionWrite, ClientVersion.V2);
-			AddUnwrapper(TcpCommand.TransactionWriteCompleted, UnwrapTransactionWriteCompleted, ClientVersion.V2);
-			AddWrapper<ClientMessage.TransactionWriteCompleted>(WrapTransactionWriteCompleted, ClientVersion.V2);
-
-			AddUnwrapper(TcpCommand.TransactionCommit, UnwrapTransactionCommit, ClientVersion.V2);
-			AddWrapper<ClientMessage.TransactionCommit>(WrapTransactionCommit, ClientVersion.V2);
-			AddUnwrapper(TcpCommand.TransactionCommitCompleted, UnwrapTransactionCommitCompleted, ClientVersion.V2);
-			AddWrapper<ClientMessage.TransactionCommitCompleted>(WrapTransactionCommitCompleted, ClientVersion.V2);
-
-			AddUnwrapper(TcpCommand.DeleteStream, UnwrapDeleteStream, ClientVersion.V2);
-			AddWrapper<ClientMessage.DeleteStream>(WrapDeleteStream, ClientVersion.V2);
-			AddUnwrapper(TcpCommand.DeleteStreamCompleted, UnwrapDeleteStreamCompleted, ClientVersion.V2);
-			AddWrapper<ClientMessage.DeleteStreamCompleted>(WrapDeleteStreamCompleted, ClientVersion.V2);
-		}
-		private ClientMessage.WriteEvents UnwrapWriteEvents(TcpPackage package, IEnvelope envelope,
-			ClaimsPrincipal user) {
-			var dto = package.Data.Deserialize<WriteEvents>();
-			if (dto == null) return null;
-
-			var events = new Event[dto.Events.Count];
-			for (int i = 0; i < events.Length; ++i) {
-				// ReSharper disable PossibleNullReferenceException
-				var e = dto.Events[i];
-				// ReSharper restore PossibleNullReferenceException
-				events[i] = new Event(new Guid(e.EventId.ToByteArray()), e.EventType, e.DataContentType == 1, e.Data.ToByteArray(), e.Metadata.ToByteArray());
-			}
-
-			var cts = new CancellationTokenSource();
-			var envelopeWrapper = new CallbackEnvelope(OnMessage);
-			cts.CancelAfter(_writeTimeout);
-
-			return new ClientMessage.WriteEvents(Guid.NewGuid(), package.CorrelationId, envelopeWrapper, dto.RequireLeader,
-				dto.EventStreamId, dto.ExpectedVersion, events, user, package.Tokens, cts.Token);
-
-			void OnMessage(Message m) {
-				cts.Dispose();
-				envelope.ReplyWith(m);
-			}
-		}
-
-		private static TcpPackage WrapWriteEvents(ClientMessage.WriteEvents msg) {
-			var events = new NewEvent[msg.Events.Length];
-			for (int i = 0; i < events.Length; ++i) {
-				var e = msg.Events[i];
-				events[i] = new NewEvent(e.EventId.ToByteArray(),
-					e.EventType,
-					e.IsJson ? 1 : 0,
-					0, e.Data,
-					e.Metadata);
-			}
-
-			var dto = new WriteEvents(msg.EventStreamId, msg.ExpectedVersion, events,
-				msg.RequireLeader);
-			return CreateWriteRequestPackage(TcpCommand.WriteEvents, msg, dto);
-		}
-
-		private static TcpPackage CreateWriteRequestPackage<T>(TcpCommand command, ClientMessage.WriteRequestMessage msg,
-			T dto) where T: IMessage<T>{
-			// we forwarding with InternalCorrId, not client's CorrelationId!!!
-			if (msg.User == UserManagement.SystemAccounts.System) {
-				return new TcpPackage(command, TcpFlags.TrustedWrite, msg.InternalCorrId, null, null, dto.Serialize());
-			}
-
-			foreach (var identity in msg.User.Identities) {
-				if (!(identity is DelegatedClaimsIdentity dci)) {
-					continue;
-				}
-
-				var jwtClaim = dci.FindFirst("jwt");
-				if (jwtClaim != null) {
-					return new TcpPackage(command, TcpFlags.Authenticated, msg.InternalCorrId, jwtClaim.Value,
-						dto.Serialize());
-				}
-
-				var uidClaim = dci.FindFirst("uid");
-				var pwdClaim = dci.FindFirst("pwd");
-
-				if (uidClaim != null && pwdClaim != null) {
-					return new TcpPackage(command, TcpFlags.Authenticated, msg.InternalCorrId, uidClaim.Value,
-						pwdClaim.Value, dto.Serialize());
-				}
-			}
-
-			return msg.Login != null && msg.Password != null
-				? new TcpPackage(command, TcpFlags.Authenticated, msg.InternalCorrId, msg.Login, msg.Password,
-					dto.Serialize())
-				: new TcpPackage(command, TcpFlags.None, msg.InternalCorrId, null, null, dto.Serialize());
-		}
-
-		private static ClientMessage.WriteEventsCompleted UnwrapWriteEventsCompleted(TcpPackage package,
-			IEnvelope envelope) {
-			var dto = package.Data.Deserialize<WriteEventsCompleted>();
-			if (dto == null) return null;
-			if (dto.Result == Client.Messages.OperationResult.Success)
-				return new ClientMessage.WriteEventsCompleted(package.CorrelationId,
-					dto.FirstEventNumber,
-					dto.LastEventNumber,
-					dto.PreparePosition,
-					dto.CommitPosition);
-			return new ClientMessage.WriteEventsCompleted(package.CorrelationId,
-				(OperationResult)dto.Result,
-				dto.Message,
-				dto.CurrentVersion);
-		}
-
-		private static TcpPackage WrapWriteEventsCompleted(ClientMessage.WriteEventsCompleted msg) {
-			var dto = new WriteEventsCompleted((Client.Messages.OperationResult)msg.Result,
-				msg.Message,
-				msg.FirstEventNumber,
-				msg.LastEventNumber,
-				msg.PreparePosition,
-				msg.CommitPosition,
-				msg.CurrentVersion);
-			return new TcpPackage(TcpCommand.WriteEventsCompleted, msg.CorrelationId, dto.Serialize());
-		}
-
-		private static ClientMessage.TransactionStart UnwrapTransactionStart(TcpPackage package, IEnvelope envelope,
-			ClaimsPrincipal user) {
-			var dto = package.Data.Deserialize<TransactionStart>();
-			if (dto == null) return null;
-			return new ClientMessage.TransactionStart(Guid.NewGuid(), package.CorrelationId, envelope,
-				dto.RequireLeader,
-				dto.EventStreamId, dto.ExpectedVersion, user, package.Tokens);
-		}
-
-		private static TcpPackage WrapTransactionStart(ClientMessage.TransactionStart msg) {
-			var dto = new TransactionStart(msg.EventStreamId, msg.ExpectedVersion,
-				msg.RequireLeader);
-			return CreateWriteRequestPackage(TcpCommand.TransactionStart, msg, dto);
-		}
-
-		private static ClientMessage.TransactionStartCompleted UnwrapTransactionStartCompleted(TcpPackage package,
-			IEnvelope envelope) {
-			var dto = package.Data.Deserialize<TransactionStartCompleted>();
-			if (dto == null) return null;
-			return new ClientMessage.TransactionStartCompleted(package.CorrelationId, dto.TransactionId,
-				(OperationResult)dto.Result, dto.Message);
-		}
-
-		private static TcpPackage WrapTransactionStartCompleted(ClientMessage.TransactionStartCompleted msg) {
-			var dto = new TransactionStartCompleted(msg.TransactionId,
-				(Client.Messages.OperationResult)msg.Result, msg.Message);
-			return new TcpPackage(TcpCommand.TransactionStartCompleted, msg.CorrelationId, dto.Serialize());
-		}
-
-		private static ClientMessage.TransactionWrite UnwrapTransactionWrite(TcpPackage package, IEnvelope envelope,
-			ClaimsPrincipal user) {
-			var dto = package.Data.Deserialize<TransactionWrite>();
-			if (dto == null) return null;
-
-			var events = new Event[dto.Events.Count];
-			for (int i = 0; i < events.Length; ++i) {
-				// ReSharper disable PossibleNullReferenceException
-				var e = dto.Events[i];
-				// ReSharper restore PossibleNullReferenceException
-				events[i] = new Event(new Guid(e.EventId.ToByteArray()), e.EventType, e.DataContentType == 1, e.Data.ToByteArray(), e.Metadata.ToByteArray());
-			}
-
-			return new ClientMessage.TransactionWrite(Guid.NewGuid(), package.CorrelationId, envelope,
-				dto.RequireLeader,
-				dto.TransactionId, events, user, package.Tokens);
-		}
-
-		private static TcpPackage WrapTransactionWrite(ClientMessage.TransactionWrite msg) {
-			var events = new NewEvent[msg.Events.Length];
-			for (int i = 0; i < events.Length; ++i) {
-				var e = msg.Events[i];
-				events[i] = new NewEvent(e.EventId.ToByteArray(), e.EventType, e.IsJson ? 1 : 0, 0,
-					e.Data, e.Metadata);
-			}
-
-			var dto = new TransactionWrite(msg.TransactionId, events, msg.RequireLeader);
-			return CreateWriteRequestPackage(TcpCommand.TransactionWrite, msg, dto);
-		}
-
-		private static ClientMessage.TransactionWriteCompleted UnwrapTransactionWriteCompleted(TcpPackage package,
-			IEnvelope envelope) {
-			var dto = package.Data.Deserialize<TransactionWriteCompleted>();
-			if (dto == null) return null;
-			return new ClientMessage.TransactionWriteCompleted(package.CorrelationId, dto.TransactionId,
-				(OperationResult)dto.Result, dto.Message);
-		}
-
-		private static TcpPackage WrapTransactionWriteCompleted(ClientMessage.TransactionWriteCompleted msg) {
-			var dto = new TransactionWriteCompleted(msg.TransactionId,
-				(Client.Messages.OperationResult)msg.Result, msg.Message);
-			return new TcpPackage(TcpCommand.TransactionWriteCompleted, msg.CorrelationId, dto.Serialize());
-		}
-
-		private static ClientMessage.TransactionCommit UnwrapTransactionCommit(TcpPackage package, IEnvelope envelope,
-			ClaimsPrincipal user) {
-			var dto = package.Data.Deserialize<TransactionCommit>();
-			if (dto == null) return null;
-			return new ClientMessage.TransactionCommit(Guid.NewGuid(), package.CorrelationId, envelope,
-				dto.RequireLeader, dto.TransactionId, user, package.Tokens);
-		}
-
-		private static TcpPackage WrapTransactionCommit(ClientMessage.TransactionCommit msg) {
-			var dto = new TransactionCommit(msg.TransactionId, msg.RequireLeader);
-			return CreateWriteRequestPackage(TcpCommand.TransactionCommit, msg, dto);
-		}
-
-		private static ClientMessage.TransactionCommitCompleted UnwrapTransactionCommitCompleted(TcpPackage package,
-			IEnvelope envelope) {
-			var dto = package.Data.Deserialize<TransactionCommitCompleted>();
-			if (dto == null) return null;
-			if (dto.Result == Client.Messages.OperationResult.Success)
-				return new ClientMessage.TransactionCommitCompleted(package.CorrelationId, dto.TransactionId,
-					dto.FirstEventNumber, dto.LastEventNumber, dto.PreparePosition, dto.CommitPosition);
-			return new ClientMessage.TransactionCommitCompleted(package.CorrelationId, dto.TransactionId,
-				(OperationResult)dto.Result, dto.Message);
-		}
-
-		private static TcpPackage WrapTransactionCommitCompleted(ClientMessage.TransactionCommitCompleted msg) {
-			var dto = new TransactionCommitCompleted(msg.TransactionId,
-				(Client.Messages.OperationResult)msg.Result,
-				msg.Message, msg.FirstEventNumber, msg.LastEventNumber, msg.PreparePosition, msg.CommitPosition);
-			return new TcpPackage(TcpCommand.TransactionCommitCompleted, msg.CorrelationId, dto.Serialize());
-		}
-
-		private ClientMessage.DeleteStream UnwrapDeleteStream(TcpPackage package, IEnvelope envelope,
-			ClaimsPrincipal user) {
-			var dto = package.Data.Deserialize<DeleteStream>();
-			if (dto == null) return null;
-
-			var cts = new CancellationTokenSource();
-			var envelopeWrapper = new CallbackEnvelope(OnMessage);
-			cts.CancelAfter(_writeTimeout);
-
-			return new ClientMessage.DeleteStream(Guid.NewGuid(), package.CorrelationId, envelopeWrapper, dto.RequireLeader,
-				dto.EventStreamId, dto.ExpectedVersion, dto.HardDelete, user, package.Tokens, cts.Token);
-
-			void OnMessage(Message m) {
-				cts.Dispose();
-				envelope.ReplyWith(m);
-			}
-		}
-
-		private static TcpPackage WrapDeleteStream(ClientMessage.DeleteStream msg) {
-			var dto = new DeleteStream(msg.EventStreamId, msg.ExpectedVersion, msg.RequireLeader,
-				msg.HardDelete);
-			return CreateWriteRequestPackage(TcpCommand.DeleteStream, msg, dto);
-		}
-
-		private static ClientMessage.DeleteStreamCompleted UnwrapDeleteStreamCompleted(TcpPackage package,
-			IEnvelope envelope) {
-			var dto = package.Data.Deserialize<DeleteStreamCompleted>();
-			if (dto == null) return null;
-			return new ClientMessage.DeleteStreamCompleted(package.CorrelationId, (OperationResult)dto.Result,
-				dto.Message,
-				dto.CurrentVersion,
-				dto.PreparePosition,
-				dto.CommitPosition);
-		}
-
-		private static TcpPackage WrapDeleteStreamCompleted(ClientMessage.DeleteStreamCompleted msg) {
-			var dto = new DeleteStreamCompleted((Client.Messages.OperationResult)msg.Result,
-				msg.Message,
-				msg.CurrentVersion,
-				msg.PreparePosition,
-				msg.CommitPosition);
-			return new TcpPackage(TcpCommand.DeleteStreamCompleted, msg.CorrelationId, dto.Serialize());
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Tcp/ITcpDispatcher.cs b/src/EventStore.Core/Services/Transport/Tcp/ITcpDispatcher.cs
deleted file mode 100644
index c4e9dfcdffc..00000000000
--- a/src/EventStore.Core/Services/Transport/Tcp/ITcpDispatcher.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Collections.Generic;
-using System.Security.Claims;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Services.Transport.Tcp {
-	public interface ITcpDispatcher {
-		TcpPackage? WrapMessage(Message message, byte version);
-
-		Message UnwrapPackage(TcpPackage package, IEnvelope envelope, ClaimsPrincipal user,
-			IReadOnlyDictionary<string, string> tokens, TcpConnectionManager connection, byte version);
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Tcp/InternalTcpDispatcher.cs b/src/EventStore.Core/Services/Transport/Tcp/InternalTcpDispatcher.cs
deleted file mode 100644
index d8bd74e5268..00000000000
--- a/src/EventStore.Core/Services/Transport/Tcp/InternalTcpDispatcher.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Net;
-using EventStore.Cluster;
-using EventStore.Common.Utils;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.TransactionLog.Chunks;
-
-namespace EventStore.Core.Services.Transport.Tcp {
-	public class InternalTcpDispatcher : ClientWriteTcpDispatcher {
-		public InternalTcpDispatcher(TimeSpan writeTimeout) : base(writeTimeout) {
-			AddUnwrapper(TcpCommand.LeaderReplicatedTo, UnwrapReplicatedTo, ClientVersion.V2);
-			AddWrapper<ReplicationTrackingMessage.ReplicatedTo>(WrapReplicatedTo, ClientVersion.V2);
-
-			AddUnwrapper(TcpCommand.SubscribeReplica, UnwrapReplicaSubscriptionRequest, ClientVersion.V2);
-			AddWrapper<ReplicationMessage.SubscribeReplica>(WrapSubscribeReplica, ClientVersion.V2);
-			AddUnwrapper(TcpCommand.ReplicaLogPositionAck, UnwrapReplicaLogPositionAck, ClientVersion.V2);
-			AddWrapper<ReplicationMessage.AckLogPosition>(WrapAckLogPosition, ClientVersion.V2);
-			AddUnwrapper(TcpCommand.CreateChunk, UnwrapCreateChunk, ClientVersion.V2);
-			AddWrapper<ReplicationMessage.CreateChunk>(WrapCreateChunk, ClientVersion.V2);
-			AddUnwrapper(TcpCommand.RawChunkBulk, UnwrapRawChunkBulk, ClientVersion.V2);
-			AddWrapper<ReplicationMessage.RawChunkBulk>(WrapRawChunkBulk, ClientVersion.V2);
-			AddUnwrapper(TcpCommand.DataChunkBulk, UnwrapDataChunkBulk, ClientVersion.V2);
-			AddWrapper<ReplicationMessage.DataChunkBulk>(WrapDataChunkBulk, ClientVersion.V2);
-			AddUnwrapper(TcpCommand.ReplicaSubscriptionRetry, UnwrapReplicaSubscriptionRetry, ClientVersion.V2);
-			AddWrapper<ReplicationMessage.ReplicaSubscriptionRetry>(WrapReplicaSubscriptionRetry, ClientVersion.V2);
-			AddUnwrapper(TcpCommand.ReplicaSubscribed, UnwrapReplicaSubscribed, ClientVersion.V2);
-			AddWrapper<ReplicationMessage.ReplicaSubscribed>(WrapReplicaSubscribed, ClientVersion.V2);
-
-			AddUnwrapper(TcpCommand.FollowerAssignment, UnwrapFollowerAssignment, ClientVersion.V2);
-			AddWrapper<ReplicationMessage.FollowerAssignment>(WrapFollowerAssignment, ClientVersion.V2);
-			AddUnwrapper(TcpCommand.CloneAssignment, UnwrapCloneAssignment, ClientVersion.V2);
-			AddWrapper<ReplicationMessage.CloneAssignment>(WrapCloneAssignment, ClientVersion.V2);
-			AddUnwrapper(TcpCommand.DropSubscription, UnwrapDropSubscription, ClientVersion.V2);
-			AddWrapper<ReplicationMessage.DropSubscription>(WrapDropSubscription, ClientVersion.V2);
-		}
-
-
-		private TcpPackage WrapReplicatedTo(ReplicationTrackingMessage.ReplicatedTo msg) {
-			var dto = new ReplicatedTo(msg.LogPosition);
-			return new TcpPackage(TcpCommand.LeaderReplicatedTo, Guid.NewGuid(), dto.Serialize());
-		}
-
-		private static ReplicationTrackingMessage.LeaderReplicatedTo UnwrapReplicatedTo(TcpPackage package, IEnvelope envelope) {
-			var dto = package.Data.Deserialize<ReplicatedTo>();
-			return new ReplicationTrackingMessage.LeaderReplicatedTo(dto.LogPosition);
-		}
-
-		private ReplicationMessage.ReplicaSubscriptionRequest UnwrapReplicaSubscriptionRequest(TcpPackage package,
-			IEnvelope envelope, TcpConnectionManager connection) {
-			var dto = package.Data.Deserialize<SubscribeReplica>();
-			var vnodeTcpEndPoint = new DnsEndPoint(Helper.UTF8NoBom.GetString(dto.Ip.Span), dto.Port);
-			var lastEpochs = dto.LastEpochs.Safe()
-				.Select(x => new Core.Data.Epoch(x.EpochPosition, x.EpochNumber, new Guid(x.EpochId.Span))).ToArray();
-			return new ReplicationMessage.ReplicaSubscriptionRequest(package.CorrelationId,
-				envelope,
-				connection,
-				dto.Version,
-				dto.LogPosition,
-				new Guid(dto.ChunkId.Span),
-				lastEpochs,
-				vnodeTcpEndPoint,
-				new Guid(dto.LeaderId.Span),
-				new Guid(dto.SubscriptionId.Span),
-				dto.IsPromotable);
-		}
-
-		private TcpPackage WrapSubscribeReplica(ReplicationMessage.SubscribeReplica msg) {
-			var epochs = msg.LastEpochs.Select(x =>
-				new Epoch(x.EpochPosition, x.EpochNumber, x.EpochId.ToByteArray())).ToArray();
-			var dto = new SubscribeReplica(msg.LogPosition,
-				msg.ChunkId.ToByteArray(),
-				epochs,
-				Helper.UTF8NoBom.GetBytes(msg.ReplicaEndPoint.GetHost()),
-				msg.ReplicaEndPoint.GetPort(),
-				msg.LeaderId.ToByteArray(),
-				msg.SubscriptionId.ToByteArray(),
-				msg.IsPromotable,
-				msg.Version);
-			return new TcpPackage(TcpCommand.SubscribeReplica, Guid.NewGuid(), dto.Serialize());
-		}
-
-		private ReplicationMessage.ReplicaLogPositionAck UnwrapReplicaLogPositionAck(TcpPackage package,
-			IEnvelope envelope, TcpConnectionManager connection) {
-			var dto = package.Data.Deserialize<ReplicaLogPositionAck>();
-			return new ReplicationMessage.ReplicaLogPositionAck(new Guid(dto.SubscriptionId.Span),
-				dto.ReplicationLogPosition,
-				dto.WriterLogPosition);
-		}
-
-		private TcpPackage WrapAckLogPosition(ReplicationMessage.AckLogPosition msg) {
-			var dto = new ReplicaLogPositionAck(msg.SubscriptionId.ToByteArray(),
-				msg.ReplicationLogPosition,
-				msg.WriterLogPosition);
-			return new TcpPackage(TcpCommand.ReplicaLogPositionAck, Guid.NewGuid(), dto.Serialize());
-		}
-
-		private ReplicationMessage.CreateChunk UnwrapCreateChunk(TcpPackage package, IEnvelope envelope) {
-			var dto = package.Data.Deserialize<CreateChunk>();
-			ChunkHeader chunkHeader;
-			using (var memStream = new MemoryStream(dto.ChunkHeaderBytes.ToByteArray())) {
-				chunkHeader = ChunkHeader.FromStream(memStream);
-			}
-
-			return new ReplicationMessage.CreateChunk(new Guid(dto.LeaderId.Span), new Guid(dto.SubscriptionId.Span), chunkHeader,
-				dto.FileSize, dto.IsScavengedChunk, dto.TransformHeaderBytes.Memory);
-		}
-
-		private TcpPackage WrapCreateChunk(ReplicationMessage.CreateChunk msg) {
-			var dto = new CreateChunk(msg.LeaderId.ToByteArray(),
-				msg.SubscriptionId.ToByteArray(),
-				msg.ChunkHeader.AsByteArray(),
-				msg.FileSize,
-				msg.IsScavengedChunk,
-				msg.TransformHeader.Span);
-			return new TcpPackage(TcpCommand.CreateChunk, Guid.NewGuid(), dto.Serialize());
-		}
-
-		private ReplicationMessage.RawChunkBulk UnwrapRawChunkBulk(TcpPackage package, IEnvelope envelope) {
-			var dto = package.Data.Deserialize<RawChunkBulk>();
-			return new ReplicationMessage.RawChunkBulk(new Guid(dto.LeaderId.Span),
-				new Guid(dto.SubscriptionId.Span),
-				dto.ChunkStartNumber,
-				dto.ChunkEndNumber,
-				dto.RawPosition,
-				dto.RawBytes.ToByteArray(),
-				dto.CompleteChunk);
-		}
-
-		private TcpPackage WrapRawChunkBulk(ReplicationMessage.RawChunkBulk msg) {
-			var dto = new RawChunkBulk(msg.LeaderId.ToByteArray(),
-				msg.SubscriptionId.ToByteArray(),
-				msg.ChunkStartNumber,
-				msg.ChunkEndNumber,
-				msg.RawPosition,
-				msg.RawBytes,
-				msg.CompleteChunk);
-			return new TcpPackage(TcpCommand.RawChunkBulk, Guid.NewGuid(), dto.Serialize());
-		}
-
-		private ReplicationMessage.DataChunkBulk UnwrapDataChunkBulk(TcpPackage package, IEnvelope envelope) {
-			var dto = package.Data.Deserialize<DataChunkBulk>();
-			return new ReplicationMessage.DataChunkBulk(new Guid(dto.LeaderId.Span),
-				new Guid(dto.SubscriptionId.Span),
-				dto.ChunkStartNumber,
-				dto.ChunkEndNumber,
-				dto.SubscriptionPosition,
-				dto.DataBytes.ToByteArray(),
-				dto.CompleteChunk);
-		}
-
-		private TcpPackage WrapDataChunkBulk(ReplicationMessage.DataChunkBulk msg) {
-			var dto = new DataChunkBulk(msg.LeaderId.ToByteArray(),
-				msg.SubscriptionId.ToByteArray(),
-				msg.ChunkStartNumber,
-				msg.ChunkEndNumber,
-				msg.SubscriptionPosition,
-				msg.DataBytes,
-				msg.CompleteChunk);
-			return new TcpPackage(TcpCommand.DataChunkBulk, Guid.NewGuid(), dto.Serialize());
-		}
-
-		private ReplicationMessage.ReplicaSubscriptionRetry UnwrapReplicaSubscriptionRetry(TcpPackage package,
-			IEnvelope envelope) {
-			var dto = package.Data.Deserialize<ReplicaSubscriptionRetry>();
-			return new ReplicationMessage.ReplicaSubscriptionRetry(new Guid(dto.LeaderId.Span),
-				new Guid(dto.SubscriptionId.Span));
-		}
-
-		private TcpPackage WrapReplicaSubscriptionRetry(ReplicationMessage.ReplicaSubscriptionRetry msg) {
-			var dto = new ReplicaSubscriptionRetry(msg.LeaderId.ToByteArray(),
-				msg.SubscriptionId.ToByteArray());
-			return new TcpPackage(TcpCommand.ReplicaSubscriptionRetry, Guid.NewGuid(), dto.Serialize());
-		}
-
-		private ReplicationMessage.ReplicaSubscribed UnwrapReplicaSubscribed(TcpPackage package, IEnvelope envelope,
-			TcpConnectionManager connection) {
-			var dto = package.Data.Deserialize<ReplicaSubscribed>();
-			return new ReplicationMessage.ReplicaSubscribed(new Guid(dto.LeaderId.Span),
-				new Guid(dto.SubscriptionId.Span),
-				dto.SubscriptionPosition,
-				connection.RemoteEndPoint);
-		}
-
-		private TcpPackage WrapReplicaSubscribed(ReplicationMessage.ReplicaSubscribed msg) {
-			var dto = new ReplicaSubscribed(msg.LeaderId.ToByteArray(),
-				msg.SubscriptionId.ToByteArray(),
-				msg.SubscriptionPosition);
-			return new TcpPackage(TcpCommand.ReplicaSubscribed, Guid.NewGuid(), dto.Serialize());
-		}
-
-		private ReplicationMessage.FollowerAssignment UnwrapFollowerAssignment(TcpPackage package, IEnvelope envelope) {
-			var dto = package.Data.Deserialize<FollowerAssignment>();
-			return new ReplicationMessage.FollowerAssignment(new Guid(dto.LeaderId.Span), new Guid(dto.SubscriptionId.Span));
-		}
-
-		private TcpPackage WrapFollowerAssignment(ReplicationMessage.FollowerAssignment msg) {
-			var dto = new FollowerAssignment(msg.LeaderId.ToByteArray(),
-				msg.SubscriptionId.ToByteArray());
-			return new TcpPackage(TcpCommand.FollowerAssignment, Guid.NewGuid(), dto.Serialize());
-		}
-
-		private ReplicationMessage.CloneAssignment UnwrapCloneAssignment(TcpPackage package, IEnvelope envelope) {
-			var dto = package.Data.Deserialize<CloneAssignment>();
-			return new ReplicationMessage.CloneAssignment(new Guid(dto.LeaderId.Span), new Guid(dto.SubscriptionId.Span));
-		}
-
-		private TcpPackage WrapCloneAssignment(ReplicationMessage.CloneAssignment msg) {
-			var dto = new CloneAssignment(msg.LeaderId.ToByteArray(),
-				msg.SubscriptionId.ToByteArray());
-			return new TcpPackage(TcpCommand.CloneAssignment, Guid.NewGuid(), dto.Serialize());
-		}
-
-		private ReplicationMessage.DropSubscription UnwrapDropSubscription(TcpPackage package, IEnvelope envelope) {
-			var dto = package.Data.Deserialize<CloneAssignment>();
-			return new ReplicationMessage.DropSubscription(new Guid(dto.LeaderId.Span), new Guid(dto.SubscriptionId.Span));
-		}
-
-		private TcpPackage WrapDropSubscription(ReplicationMessage.DropSubscription msg) {
-			var dto = new DropSubscription(msg.LeaderId.ToByteArray(),
-				msg.SubscriptionId.ToByteArray());
-			return new TcpPackage(TcpCommand.DropSubscription, Guid.NewGuid(), dto.Serialize());
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Tcp/ProtobufExtensions.cs b/src/EventStore.Core/Services/Transport/Tcp/ProtobufExtensions.cs
deleted file mode 100644
index 905c4885aac..00000000000
--- a/src/EventStore.Core/Services/Transport/Tcp/ProtobufExtensions.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System;
-using System.IO;
-using System.Threading;
-using System.Collections.Concurrent;
-using Google.Protobuf;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Transport.Tcp {
-	public static class ProtobufExtensions {
-		private static readonly ConcurrentStack<MemoryStream> _streams;
-
-		static ProtobufExtensions() {
-			_streams = new ConcurrentStack<MemoryStream>();
-			for (var i = 0; i < 300; i++) {
-				_streams.Push(new MemoryStream(2048));
-			}
-		}
-
-		private static readonly ILogger Log =
-			Serilog.Log.ForContext(Serilog.Core.Constants.SourceContextPropertyName, "ProtobufExtensions");
-
-		static MemoryStream AcquireStream() {
-			for (var i = 0; i < 1000; i++) {
-				MemoryStream ret;
-				if (_streams.TryPop(out ret)) {
-					ret.SetLength(0);
-					return ret;
-				}
-
-				if ((i + 1) % 5 == 0)
-					Thread.Sleep(1); //need to do better than this
-			}
-
-			throw new UnableToAcquireStreamException();
-		}
-
-		static void ReleaseStream(MemoryStream stream) {
-			_streams.Push(stream);
-		}
-
-		public static T Deserialize<T>(this byte[] data) where T: IMessage<T>, new() {
-			return Deserialize<T>(new ArraySegment<byte>(data));
-		}
-
-		public static T Deserialize<T>(this ArraySegment<byte> data) where T: IMessage<T>, new() {
-			try {
-				using (var memory = new MemoryStream(data.Array, data.Offset, data.Count)
-				) //uses original buffer as memory
-				{
-					var res = new T();
-					res.MergeFrom(memory);
-					return res;
-				}
-			} catch (Exception e) {
-				Log.Information(e, "Deserialization to {type} failed", typeof(T).FullName);
-				return default(T);
-			}
-		}
-
-		public static ArraySegment<byte> Serialize<T>(this T protoContract) where T: IMessage<T> {
-			MemoryStream stream = null;
-			try {
-				stream = AcquireStream();
-				protoContract.WriteTo(stream);
-				var res = new ArraySegment<byte>(stream.ToArray(), 0, (int)stream.Length);
-				return res;
-			} finally {
-				if (stream != null) {
-					ReleaseStream(stream);
-				}
-			}
-		}
-
-		public static byte[] SerializeToArray<T>(this T protoContract) where T: IMessage<T>{
-			MemoryStream stream = null;
-			try {
-				stream = AcquireStream();
-				protoContract.WriteTo(stream);
-				return stream.ToArray();
-			} finally {
-				if (stream != null) {
-					ReleaseStream(stream);
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Tcp/SendOverTcpEnvelope.cs b/src/EventStore.Core/Services/Transport/Tcp/SendOverTcpEnvelope.cs
deleted file mode 100644
index 1074ae4bb6c..00000000000
--- a/src/EventStore.Core/Services/Transport/Tcp/SendOverTcpEnvelope.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Services.Transport.Tcp {
-	public class SendOverTcpEnvelope : IEnvelope {
-		private readonly IPublisher _networkSendQueue;
-		private readonly TcpConnectionManager _manager;
-
-		public SendOverTcpEnvelope(TcpConnectionManager manager, IPublisher networkSendQueue) {
-			Ensure.NotNull(manager, "manager");
-			Ensure.NotNull(networkSendQueue, "networkSendQueue");
-			_networkSendQueue = networkSendQueue;
-			_manager = manager;
-		}
-
-		public void ReplyWith<T>(T message) where T : Message {
-			if (_manager != null && !_manager.IsClosed) {
-				_networkSendQueue.Publish(new TcpMessage.TcpSend(_manager, message));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Tcp/TcpCommand.cs b/src/EventStore.Core/Services/Transport/Tcp/TcpCommand.cs
deleted file mode 100644
index c23ced37e42..00000000000
--- a/src/EventStore.Core/Services/Transport/Tcp/TcpCommand.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-namespace EventStore.Core.Services.Transport.Tcp {
-	public enum TcpCommand : byte {
-		HeartbeatRequestCommand = 0x01,
-		HeartbeatResponseCommand = 0x02,
-
-		Ping = 0x03,
-		Pong = 0x04,
-				
-		FollowerAssignment = 0x07,
-		CloneAssignment = 0x08,
-		DropSubscription = 0x09,
-
-		SubscribeReplica = 0x10,
-		ReplicaLogPositionAck = 0x11,
-		CreateChunk = 0x12,
-		RawChunkBulk = 0x13,
-		DataChunkBulk = 0x14,
-		ReplicaSubscriptionRetry = 0x15,
-		ReplicaSubscribed = 0x16,
-		LeaderReplicatedTo = 0x17,
-
-		// CLIENT COMMANDS
-//        CreateStream = 0x80,
-//        CreateStreamCompleted = 0x81,
-
-		WriteEvents = 0x82,
-		WriteEventsCompleted = 0x83,
-
-		TransactionStart = 0x84,
-		TransactionStartCompleted = 0x85,
-		TransactionWrite = 0x86,
-		TransactionWriteCompleted = 0x87,
-		TransactionCommit = 0x88,
-		TransactionCommitCompleted = 0x89,
-
-		DeleteStream = 0x8A,
-		DeleteStreamCompleted = 0x8B,
-
-		ReadEvent = 0xB0,
-		ReadEventCompleted = 0xB1,
-		ReadStreamEventsForward = 0xB2,
-		ReadStreamEventsForwardCompleted = 0xB3,
-		ReadStreamEventsBackward = 0xB4,
-		ReadStreamEventsBackwardCompleted = 0xB5,
-		ReadAllEventsForward = 0xB6,
-		ReadAllEventsForwardCompleted = 0xB7,
-		ReadAllEventsBackward = 0xB8,
-		ReadAllEventsBackwardCompleted = 0xB9,
-		FilteredReadAllEventsForward = 0xBA,
-		FilteredReadAllEventsForwardCompleted = 0xBB,
-		FilteredReadAllEventsBackward = 0xBC,
-		FilteredReadAllEventsBackwardCompleted = 0xBE,
-
-		SubscribeToStream = 0xC0,
-		SubscriptionConfirmation = 0xC1,
-		StreamEventAppeared = 0xC2,
-		UnsubscribeFromStream = 0xC3,
-		SubscriptionDropped = 0xC4,
-		ConnectToPersistentSubscription = 0xC5,
-		PersistentSubscriptionConfirmation = 0xC6,
-		PersistentSubscriptionStreamEventAppeared = 0xC7,
-		CreatePersistentSubscription = 0xC8,
-		CreatePersistentSubscriptionCompleted = 0xC9,
-		DeletePersistentSubscription = 0xCA,
-		DeletePersistentSubscriptionCompleted = 0xCB,
-		PersistentSubscriptionAckEvents = 0xCC,
-		PersistentSubscriptionNakEvents = 0xCD,
-		UpdatePersistentSubscription = 0xCE,
-		UpdatePersistentSubscriptionCompleted = 0xCF,
-		FilteredSubscribeToStream = 0xD2,
-		CheckpointReached = 0xD3,
-
-		ScavengeDatabase = 0xD0,
-		ScavengeDatabaseResponse = 0xD1,
-
-		BadRequest = 0xF0,
-		NotHandled = 0xF1,
-		Authenticate = 0xF2,
-		Authenticated = 0xF3,
-		NotAuthenticated = 0xF4,
-		IdentifyClient = 0xF5,
-		ClientIdentified = 0xF6,
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Tcp/TcpConnectionManager.cs b/src/EventStore.Core/Services/Transport/Tcp/TcpConnectionManager.cs
deleted file mode 100644
index a9d9463169c..00000000000
--- a/src/EventStore.Core/Services/Transport/Tcp/TcpConnectionManager.cs
+++ /dev/null
@@ -1,561 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Security;
-using System.Net.Sockets;
-using System.Security.Claims;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading;
-using EventStore.Client.Messages;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Transport.Tcp;
-using EventStore.Transport.Tcp.Framing;
-using EventStore.Core.Settings;
-using EventStore.Plugins.Authentication;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Transport.Tcp {
-	/// <summary>
-	/// Manager for individual TCP connection. It handles connection lifecycle,
-	/// heartbeats, message framing and dispatch to the memory bus.
-	/// </summary>
-	public class TcpConnectionManager : IHandle<TcpMessage.Heartbeat>, IHandle<TcpMessage.HeartbeatTimeout> {
-		public static readonly TimeSpan ConnectionTimeout = TimeSpan.FromMilliseconds(1000);
-
-		private static readonly ILogger Log = Serilog.Log.ForContext<TcpConnectionManager>();
-		private static readonly ClaimsPrincipal Anonymous = new ClaimsPrincipal(new ClaimsIdentity(new[]{new Claim(ClaimTypes.Anonymous, ""), }));
-		public readonly Guid ConnectionId;
-		public readonly string ConnectionName;
-		public readonly EndPoint RemoteEndPoint;
-
-		public EndPoint LocalEndPoint {
-			get { return _connection.LocalEndPoint; }
-		}
-
-		public bool IsClosed {
-			get { return _isClosed != 0; }
-		}
-
-		public int SendQueueSize {
-			get { return _connection.SendQueueSize; }
-		}
-
-		public string ClientConnectionName {
-			get { return _clientConnectionName; }
-		}
-
-		private readonly ITcpConnection _connection;
-		private readonly IEnvelope _tcpEnvelope;
-		private readonly IPublisher _publisher;
-		private readonly ITcpDispatcher _dispatcher;
-		private readonly IMessageFramer<ArraySegment<byte>> _framer;
-		private long _receiveProgressIndicator => _connection?.TotalBytesReceived ?? 0L;
-		private long _sendProgressIndicator => _connection?.TotalBytesSent ?? 0L;
-		private int _isClosed;
-		private string _clientConnectionName;
-
-		private byte _version;
-
-		private readonly Action<TcpConnectionManager, SocketError> _connectionClosed;
-		private readonly Action<TcpConnectionManager> _connectionEstablished;
-
-		private readonly SendToWeakThisEnvelope _weakThisEnvelope;
-		private readonly TimeSpan _heartbeatInterval;
-		private readonly TimeSpan _heartbeatTimeout;
-		private bool _awaitingHeartbeatTimeoutCheck;
-		private readonly int _connectionPendingSendBytesThreshold;
-		private readonly int _connectionQueueSizeThreshold;
-
-		private readonly IAuthenticationProvider _authProvider;
-		private readonly AuthorizationGateway _authorization;
-		private UserCredentials _defaultUser;
-		private TcpServiceType _serviceType;
-
-		public TcpConnectionManager(string connectionName,
-			TcpServiceType serviceType,
-			ITcpDispatcher dispatcher,
-			IPublisher publisher,
-			ITcpConnection openedConnection,
-			IPublisher networkSendQueue,
-			IAuthenticationProvider authProvider,
-			AuthorizationGateway authorization,
-			TimeSpan heartbeatInterval,
-			TimeSpan heartbeatTimeout,
-			Action<TcpConnectionManager, SocketError> onConnectionClosed,
-			int connectionPendingSendBytesThreshold,
-			int connectionQueueSizeThreshold) {
-			Ensure.NotNull(dispatcher, "dispatcher");
-			Ensure.NotNull(publisher, "publisher");
-			Ensure.NotNull(openedConnection, "openedConnnection");
-			Ensure.NotNull(networkSendQueue, "networkSendQueue");
-			Ensure.NotNull(authProvider, "authProvider");
-			Ensure.NotNull(authorization, "authorization");
-			ConnectionId = openedConnection.ConnectionId;
-			ConnectionName = connectionName;
-
-			_serviceType = serviceType;
-			_tcpEnvelope = new SendOverTcpEnvelope(this, networkSendQueue);
-			_publisher = publisher;
-			_dispatcher = dispatcher;
-			_authProvider = authProvider;
-			_authorization = authorization;
-
-			_framer = new LengthPrefixMessageFramer();
-			_framer.RegisterMessageArrivedCallback(OnMessageArrived);
-
-			_weakThisEnvelope = new SendToWeakThisEnvelope(this);
-			_heartbeatInterval = heartbeatInterval;
-			_heartbeatTimeout = heartbeatTimeout;
-			_connectionPendingSendBytesThreshold = connectionPendingSendBytesThreshold;
-			_connectionQueueSizeThreshold = connectionQueueSizeThreshold;
-
-			_connectionClosed = onConnectionClosed;
-
-			RemoteEndPoint = openedConnection.RemoteEndPoint;
-			_connection = openedConnection;
-			_connection.ConnectionClosed += OnConnectionClosed;
-			if (_connection.IsClosed) {
-				OnConnectionClosed(_connection, SocketError.Success);
-				return;
-			}
-
-			ScheduleHeartbeat(0L, 0L);
-		}
-
-		public TcpConnectionManager(string connectionName,
-			Guid connectionId,
-			ITcpDispatcher dispatcher,
-			IPublisher publisher,
-			string targetHost,
-			string[] otherNames,
-			EndPoint remoteEndPoint,
-			TcpClientConnector connector,
-			bool useSsl,
-			CertificateDelegates.ServerCertificateValidator sslServerCertValidator,
-			Func<X509CertificateCollection> sslClientCertificatesSelector,
-			IPublisher networkSendQueue,
-			IAuthenticationProvider authProvider,
-			AuthorizationGateway authorization,
-			TimeSpan heartbeatInterval,
-			TimeSpan heartbeatTimeout,
-			Action<TcpConnectionManager> onConnectionEstablished,
-			Action<TcpConnectionManager, SocketError> onConnectionClosed) {
-			Ensure.NotEmptyGuid(connectionId, "connectionId");
-			Ensure.NotNull(dispatcher, "dispatcher");
-			Ensure.NotNull(publisher, "publisher");
-			Ensure.NotNull(authProvider, "authProvider");
-			Ensure.NotNull(authorization, "authorization");
-			Ensure.NotNull(remoteEndPoint, "remoteEndPoint");
-			Ensure.NotNull(connector, "connector");
-
-			ConnectionId = connectionId;
-			ConnectionName = connectionName;
-
-			_tcpEnvelope = new SendOverTcpEnvelope(this, networkSendQueue);
-			_publisher = publisher;
-			_dispatcher = dispatcher;
-			_authProvider = authProvider;
-			_authorization = authorization;
-
-			_framer = new LengthPrefixMessageFramer();
-			_framer.RegisterMessageArrivedCallback(OnMessageArrived);
-
-			_weakThisEnvelope = new SendToWeakThisEnvelope(this);
-			_heartbeatInterval = heartbeatInterval;
-			_heartbeatTimeout = heartbeatTimeout;
-			_connectionPendingSendBytesThreshold = ESConsts.UnrestrictedPendingSendBytes;
-			_connectionQueueSizeThreshold = ESConsts.MaxConnectionQueueSize;
-
-			_connectionEstablished = onConnectionEstablished;
-			_connectionClosed = onConnectionClosed;
-
-			RemoteEndPoint = remoteEndPoint;
-			_connection = useSsl
-				? connector.ConnectSslTo(ConnectionId, targetHost, otherNames, remoteEndPoint.ResolveDnsToIPAddress(), ConnectionTimeout,
-					sslServerCertValidator, sslClientCertificatesSelector, OnConnectionEstablished, OnConnectionFailed)
-				: connector.ConnectTo(ConnectionId, remoteEndPoint.ResolveDnsToIPAddress(), ConnectionTimeout, OnConnectionEstablished,
-					OnConnectionFailed);
-			_connection.ConnectionClosed += OnConnectionClosed;
-			if (_connection.IsClosed)
-				OnConnectionClosed(_connection, SocketError.Success);
-		}
-
-		private void OnConnectionEstablished(ITcpConnection connection) {
-			Log.Information("Connection '{connectionName}' ({connectionId:B}) to [{remoteEndPoint}] established.",
-				ConnectionName, ConnectionId, connection.RemoteEndPoint);
-
-			ScheduleHeartbeat(0L, 0L);
-
-			var handler = _connectionEstablished;
-			if (handler != null)
-				handler(this);
-		}
-
-		private void OnConnectionFailed(ITcpConnection connection, SocketError socketError) {
-			if (Interlocked.CompareExchange(ref _isClosed, 1, 0) != 0) return;
-			Log.Information("Connection '{connectionName}' ({connectionId:B}) to [{remoteEndPoint}] failed: {e}.",
-				ConnectionName, ConnectionId, connection.RemoteEndPoint, socketError);
-			if (_connectionClosed != null)
-				_connectionClosed(this, socketError);
-		}
-
-		private void OnConnectionClosed(ITcpConnection connection, SocketError socketError) {
-			if (Interlocked.CompareExchange(ref _isClosed, 1, 0) != 0) return;
-			Log.Information(
-				"Connection '{connectionName}{clientConnectionName}' [{remoteEndPoint}, {connectionId:B}] closed: {e}.",
-				ConnectionName, ClientConnectionName.IsEmptyString() ? string.Empty : ":" + ClientConnectionName,
-				connection.RemoteEndPoint, ConnectionId, socketError);
-
-			if (_serviceType == TcpServiceType.Internal && _connection.TotalBytesSent == 0) {
-				Log.Warning(
-					"Unable to connect to Remote EndPoint : {remoteEndPoint}. Connection is potentially blocked. Total bytes sent: {TotalBytesSent}, Total bytes received: {TotalBytesReceived}",
-					RemoteEndPoint, _connection.TotalBytesSent, _connection.TotalBytesReceived);
-			}
-
-			if (_connectionClosed != null)
-				_connectionClosed(this, socketError);
-		}
-
-		public void StartReceiving() {
-			_connection.ReceiveAsync(OnRawDataReceived);
-		}
-
-		private void OnRawDataReceived(ITcpConnection connection, IEnumerable<ArraySegment<byte>> data) {
-			try {
-				_framer.UnFrameData(data);
-			} catch (PackageFramingException exc) {
-				SendBadRequestAndClose(Guid.Empty,
-					string.Format("Invalid TCP frame received. Error: {0}.", exc.Message));
-				return;
-			}
-
-			_connection.ReceiveAsync(OnRawDataReceived);
-		}
-
-		private void OnMessageArrived(ArraySegment<byte> data) {
-			TcpPackage package;
-			try {
-				package = TcpPackage.FromArraySegment(data);
-			} catch (Exception e) {
-				SendBadRequestAndClose(Guid.Empty, string.Format("Received bad network package. Error: {0}", e));
-				return;
-			}
-
-			OnPackageReceived(package);
-		}
-
-		private void OnPackageReceived(TcpPackage package) {
-			try {
-				ProcessPackage(package);
-			} catch (Exception e) {
-				SendBadRequestAndClose(package.CorrelationId,
-					string.Format("Error while processing package. Error: {0}", e));
-			}
-		}
-
-		public void ProcessPackage(TcpPackage package) {
-			if (_serviceType == TcpServiceType.External && (package.Flags & TcpFlags.TrustedWrite) != 0) {
-				SendBadRequestAndClose(package.CorrelationId,
-					"Trusted writes aren't accepted over the external TCP interface");
-				return;
-			}
-
-			switch (package.Command) {
-				case TcpCommand.HeartbeatResponseCommand:
-					break;
-				case TcpCommand.HeartbeatRequestCommand:
-					SendPackage(new TcpPackage(TcpCommand.HeartbeatResponseCommand, package.CorrelationId, null));
-					break;
-				case TcpCommand.IdentifyClient: {
-					try {
-						var message =
-							(ClientMessage.IdentifyClient)_dispatcher.UnwrapPackage(package, _tcpEnvelope, null, null,
-								this, _version);
-						Log.Information(
-							"Connection '{connectionName}' ({connectionId:B}) identified by client. Client connection name: '{clientConnectionName}', Client version: {clientVersion}.",
-							ConnectionName, ConnectionId, message.ConnectionName, (ClientVersion)message.Version);
-						_version = (byte)message.Version;
-						_clientConnectionName = message.ConnectionName;
-						_connection.SetClientConnectionName(_clientConnectionName);
-						SendPackage(new TcpPackage(TcpCommand.ClientIdentified, package.CorrelationId, null));
-					} catch (Exception ex) {
-						Log.Error("Error identifying client: {e}", ex);
-					}
-
-					break;
-				}
-				case TcpCommand.BadRequest: {
-					var reason = string.Empty;
-					Helper.EatException(() =>
-						reason = Helper.UTF8NoBom.GetString(package.Data.Array, package.Data.Offset,
-							package.Data.Count));
-					Log.Error(
-						"Bad request received from '{connectionName}{clientConnectionName}' [{remoteEndPoint}, L{localEndPoint}, {connectionId:B}]. CorrelationId: {correlationId:B}, Error: {e}.",
-						ConnectionName,
-						ClientConnectionName.IsEmptyString() ? string.Empty : ":" + ClientConnectionName,
-						RemoteEndPoint,
-						LocalEndPoint, ConnectionId, package.CorrelationId,
-						reason.IsEmptyString() ? "<reason missing>" : reason);
-					break;
-				}
-				case TcpCommand.Authenticate: {
-					if ((package.Flags & TcpFlags.Authenticated) == 0)
-						ReplyNotAuthenticated(package.CorrelationId, "No user credentials provided.");
-					else {
-						var defaultUser = new UserCredentials(package.Tokens, null);
-						Interlocked.Exchange(ref _defaultUser, defaultUser);
-						_authProvider.Authenticate(new TcpDefaultAuthRequest(this, package.CorrelationId, defaultUser));
-					}
-
-					break;
-				}
-				default: {
-					var defaultUser = _defaultUser;
-					if ((package.Flags & TcpFlags.TrustedWrite) != 0) {
-						UnwrapAndPublishPackage(package, UserManagement.SystemAccounts.System, null);
-					} else if ((package.Flags & TcpFlags.Authenticated) != 0) {
-						_authProvider.Authenticate(new TcpAuthRequest(this, package));
-					} else if (defaultUser != null) {
-						if (defaultUser.User != null) {
-							UnwrapAndPublishPackage(package, defaultUser.User, defaultUser.Tokens);
-						} else {
-							// The default credentials aren't authenticated
-							ReplyNotAuthenticated(package.CorrelationId, "Not Authenticated");
-						}
-					} else {
-						UnwrapAndPublishPackage(package, Anonymous, null);
-					}
-
-					break;
-				}
-			}
-		}
-
-		private void UnwrapAndPublishPackage(TcpPackage package, ClaimsPrincipal user, IReadOnlyDictionary<string, string> tokens) {
-			Message message = null;
-			string error = "";
-			try {
-				message = _dispatcher.UnwrapPackage(package, _tcpEnvelope, user, tokens, this, _version);
-			} catch (Exception ex) {
-				error = ex.Message;
-			}
-
-			if (message != null)
-				_authorization.Authorize(message, _publisher);
-			else
-				SendBadRequest(package.CorrelationId,
-					string.Format("Could not unwrap network package for command {0}.\n{1}", package.Command, error));
-		}
-
-		private void ReplyNotAuthenticated(Guid correlationId, string description) {
-			_tcpEnvelope.ReplyWith(new TcpMessage.NotAuthenticated(correlationId, description));
-		}
-
-		private void ReplyNotReady(Guid correlationId, string description) {
-			_tcpEnvelope.ReplyWith(new ClientMessage.NotHandled(correlationId,
-				ClientMessage.NotHandled.Types.NotHandledReason.NotReady, description));
-		}
-
-		private void ReplyAuthenticated(Guid correlationId, UserCredentials userCredentials, ClaimsPrincipal user) {
-			var authCredentials = new UserCredentials(userCredentials.Tokens, user);
-			Interlocked.CompareExchange(ref _defaultUser, authCredentials, userCredentials);
-			_tcpEnvelope.ReplyWith(new TcpMessage.Authenticated(correlationId));
-		}
-
-		public void SendBadRequestAndClose(Guid correlationId, string message) {
-			Ensure.NotNull(message, "message");
-
-			SendPackage(new TcpPackage(TcpCommand.BadRequest, correlationId, Helper.UTF8NoBom.GetBytes(message)),
-				checkQueueSize: false);
-			Log.Error(
-				"Closing connection '{connectionName}{clientConnectionName}' [{remoteEndPoint}, L{localEndPoint}, {connectionId:B}] due to error. Reason: {e}",
-				ConnectionName, ClientConnectionName.IsEmptyString() ? string.Empty : ":" + ClientConnectionName,
-				RemoteEndPoint, LocalEndPoint, ConnectionId, message);
-			_connection.Close(message);
-		}
-
-		public void SendBadRequest(Guid correlationId, string message) {
-			Ensure.NotNull(message, "message");
-
-			SendPackage(new TcpPackage(TcpCommand.BadRequest, correlationId, Helper.UTF8NoBom.GetBytes(message)),
-				checkQueueSize: false);
-		}
-
-		public void Stop(string reason = null) {
-			Log.Debug(
-				"Closing connection '{connectionName}{clientConnectionName}' [{remoteEndPoint}, L{localEndPoint}, {connectionId:B}] cleanly.{reason}",
-				ConnectionName, ClientConnectionName.IsEmptyString() ? string.Empty : ":" + ClientConnectionName,
-				RemoteEndPoint, LocalEndPoint, ConnectionId,
-				reason.IsEmpty() ? string.Empty : " Reason: " + reason);
-			_connection.Close(reason);
-		}
-
-		public void SendMessage(Message message) {
-			var package = _dispatcher.WrapMessage(message, _version);
-			if (package != null)
-				SendPackage(package.Value);
-		}
-
-		private void SendPackage(TcpPackage package, bool checkQueueSize = true) {
-			if (IsClosed)
-				return;
-
-			int queueSize;
-			int queueSendBytes;
-			if (checkQueueSize) {
-				if ((queueSize = _connection.SendQueueSize) > _connectionQueueSizeThreshold) {
-					SendBadRequestAndClose(Guid.Empty,
-						string.Format("Connection queue size is too large: {0}.", queueSize));
-					return;
-				}
-
-				if (_connectionPendingSendBytesThreshold > ESConsts.UnrestrictedPendingSendBytes &&
-				    (queueSendBytes = _connection.PendingSendBytes) > _connectionPendingSendBytesThreshold) {
-					SendBadRequestAndClose(Guid.Empty,
-						string.Format("Connection pending send bytes is too large: {0}.", queueSendBytes));
-					return;
-				}
-			}
-
-			var data = package.AsArraySegment();
-			var framed = _framer.FrameData(data);
-			_connection.EnqueueSend(framed);
-		}
-
-		public void Handle(TcpMessage.Heartbeat message) {
-			if (IsClosed) return;
-
-			var receiveProgressIndicator = _receiveProgressIndicator;
-			var sendProgressIndicator = _sendProgressIndicator;
-
-			/*
-			 * If we have not received any data within the heartbeat interval and we are not waiting for a heartbeat timeout check, then we send a heartbeat request.
-			 */
-			if (message.ReceiveProgressIndicator == receiveProgressIndicator && !_awaitingHeartbeatTimeoutCheck) {
-				SendPackage(new TcpPackage(TcpCommand.HeartbeatRequestCommand, Guid.NewGuid(), null));
-				_awaitingHeartbeatTimeoutCheck = true;
-				_publisher.Publish(TimerMessage.Schedule.Create(_heartbeatTimeout, _weakThisEnvelope,
-					new TcpMessage.HeartbeatTimeout(receiveProgressIndicator)));
-			}
-			/*
-			 * As a proactive measure, if we have not sent any data to the remote party within the heartbeat interval,
-			 * we also send a heartbeat request just to generate some data for the remote party so that it can clear its heartbeat timeouts.
-			 * This is particularly useful when the remote party's heartbeat request is stuck behind a large (multi-megabyte) TCP message.
-			 */
-			else if (message.SendProgressIndicator == sendProgressIndicator) {
-				SendPackage(new TcpPackage(TcpCommand.HeartbeatRequestCommand, Guid.NewGuid(), null));
-				Log.Verbose(
-					"Connection '{connectionName}{clientConnectionName}' [{remoteEndPoint}, {connectionId:B}] Proactive heartbeat request sent to the remote party since no data was sent during the last heartbeat interval.",
-					ConnectionName, ClientConnectionName.IsEmptyString() ? string.Empty : ":" + ClientConnectionName,
-					_connection.RemoteEndPoint, ConnectionId);
-			}
-
-			//schedule the next heartbeat regardless of whether or not there's an active heartbeat request
-			ScheduleHeartbeat(receiveProgressIndicator, sendProgressIndicator);
-		}
-
-		public void Handle(TcpMessage.HeartbeatTimeout message) {
-			_awaitingHeartbeatTimeoutCheck = false;
-			if (IsClosed) return;
-
-			var receiveProgressIndicator = _receiveProgressIndicator;
-			var sendProgressIndicator = _sendProgressIndicator;
-			if (message.ReceiveProgressIndicator == receiveProgressIndicator)
-				Stop(string.Format($"HEARTBEAT TIMEOUT at receiveProgressIndicator={receiveProgressIndicator}, sendProgressIndicator={sendProgressIndicator}"));
-		}
-
-		private void ScheduleHeartbeat(long receiveProgressIndicator, long sendProgressIndicator) {
-			_publisher.Publish(TimerMessage.Schedule.Create(_heartbeatInterval, _weakThisEnvelope,
-				new TcpMessage.Heartbeat(receiveProgressIndicator, sendProgressIndicator)));
-		}
-
-		// Same health warnings as SendToThisEnvelope
-		private class SendToWeakThisEnvelope : IEnvelope {
-			private readonly WeakReference _receiver;
-
-			public SendToWeakThisEnvelope(object receiver) {
-				_receiver = new WeakReference(receiver);
-			}
-
-			public void ReplyWith<T>(T message) where T : Message {
-				if (_receiver.Target is IHandle<T> handle) {
-					handle.Handle(message);
-				} else if (_receiver is IAsyncHandle<T>) {
-					throw new Exception($"SendToWeakThisEnvelope does not support asynchronous receivers. Receiver: {_receiver}");
-				}
-			}
-		}
-
-		private class TcpAuthRequest : AuthenticationRequest {
-			private readonly TcpConnectionManager _manager;
-			private readonly TcpPackage _package;
-
-			public TcpAuthRequest(TcpConnectionManager manager, TcpPackage package)
-				: base($"(TCP) {manager.RemoteEndPoint}", package.Tokens) {
-				_manager = manager;
-				_package = package;
-			}
-
-			public override void Unauthorized() {
-				_manager.ReplyNotAuthenticated(_package.CorrelationId, "Not Authenticated");
-			}
-
-			public override void Authenticated(ClaimsPrincipal principal) {
-				_manager.UnwrapAndPublishPackage(_package, principal, _package.Tokens);
-			}
-
-			public override void Error() {
-				_manager.ReplyNotAuthenticated(_package.CorrelationId, "Internal Server Error");
-			}
-
-			public override void NotReady() {
-				_manager.ReplyNotReady(_package.CorrelationId, "Server not ready");
-			}
-		}
-
-
-		private class TcpDefaultAuthRequest : AuthenticationRequest {
-			private readonly TcpConnectionManager _manager;
-			private readonly Guid _correlationId;
-			private readonly UserCredentials _userCredentials;
-
-			public TcpDefaultAuthRequest(TcpConnectionManager manager, Guid correlationId,
-				UserCredentials userCredentials)
-				: base($"(TCP) {manager.RemoteEndPoint}", userCredentials.Tokens) {
-				_manager = manager;
-				_correlationId = correlationId;
-				_userCredentials = userCredentials;
-			}
-
-			public override void Unauthorized() {
-				_manager.ReplyNotAuthenticated(_correlationId, "Unauthorized");
-			}
-
-			public override void Authenticated(ClaimsPrincipal principal) {
-				_manager.ReplyAuthenticated(_correlationId, _userCredentials, principal);
-			}
-
-			public override void Error() {
-				_manager.ReplyNotAuthenticated(_correlationId, "Internal Server Error");
-			}
-
-			public override void NotReady() {
-				_manager.ReplyNotReady(_correlationId, "Server not yet ready");
-			}
-		}
-
-		private class UserCredentials {
-			public readonly ClaimsPrincipal User;
-			public readonly IReadOnlyDictionary<string, string> Tokens;
-
-			public UserCredentials(IReadOnlyDictionary<string, string> tokens, ClaimsPrincipal user) {
-				Tokens = tokens;
-				User = user;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Tcp/TcpDispatcher.cs b/src/EventStore.Core/Services/Transport/Tcp/TcpDispatcher.cs
deleted file mode 100644
index 41f285bc93e..00000000000
--- a/src/EventStore.Core/Services/Transport/Tcp/TcpDispatcher.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using EventStore.Core.Messaging;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Transport.Tcp {
-	public abstract class TcpDispatcher : ITcpDispatcher {
-		private static readonly ILogger Log = Serilog.Log.ForContext<TcpDispatcher>();
-
-		private readonly Func<TcpPackage, IEnvelope, ClaimsPrincipal, IReadOnlyDictionary<string, string>, TcpConnectionManager, Message>[][]
-			_unwrappers;
-
-		private readonly IDictionary<Type, Func<Message, TcpPackage>>[] _wrappers;
-
-		protected TcpDispatcher() {
-			_unwrappers =
-				new Func<TcpPackage, IEnvelope, ClaimsPrincipal, IReadOnlyDictionary<string, string>, TcpConnectionManager, Message>[2][];
-			_unwrappers[0] =
-				new Func<TcpPackage, IEnvelope, ClaimsPrincipal, IReadOnlyDictionary<string, string>, TcpConnectionManager, Message>[255];
-			_unwrappers[1] =
-				new Func<TcpPackage, IEnvelope, ClaimsPrincipal, IReadOnlyDictionary<string, string>, TcpConnectionManager, Message>[255];
-
-			_wrappers = new IDictionary<Type, Func<Message, TcpPackage>>[2];
-			_wrappers[0] = new Dictionary<Type, Func<Message, TcpPackage>>();
-			_wrappers[1] = new Dictionary<Type, Func<Message, TcpPackage>>();
-		}
-
-		protected void AddWrapper<T>(Func<T, TcpPackage> wrapper, ClientVersion version) where T : Message {
-			_wrappers[(byte)version][typeof(T)] = x => wrapper((T)x);
-		}
-
-		protected void AddUnwrapper<T>(TcpCommand command, Func<TcpPackage, IEnvelope, T> unwrapper,
-			ClientVersion version) where T : Message {
-			_unwrappers[(byte)version][(byte)command] = (pkg, env, user, tokens, conn) => unwrapper(pkg, env);
-		}
-
-		protected void AddUnwrapper<T>(TcpCommand command,
-			Func<TcpPackage, IEnvelope, TcpConnectionManager, T> unwrapper, ClientVersion version) where T : Message {
-			_unwrappers[(byte)version][(byte)command] =
-				(pkg, env, user, tokens, conn) => unwrapper(pkg, env, conn);
-		}
-
-		protected void AddUnwrapper<T>(TcpCommand command, Func<TcpPackage, IEnvelope, ClaimsPrincipal, TcpConnectionManager, T> unwrapper,
-			ClientVersion version) where T : Message {
-			_unwrappers[(byte)version][(byte)command] =
-				(pkg, env, user, tokens, conn) => unwrapper(pkg, env, user, conn);
-		}
-
-		protected void AddUnwrapper<T>(TcpCommand command, Func<TcpPackage, IEnvelope, ClaimsPrincipal, T> unwrapper,
-			ClientVersion version) where T : Message {
-			_unwrappers[(byte)version][(byte)command] =
-				(pkg, env, user, tokens, conn) => unwrapper(pkg, env, user);
-		}
-
-		protected void AddUnwrapper<T>(TcpCommand command,
-			Func<TcpPackage, IEnvelope, ClaimsPrincipal, IReadOnlyDictionary<string, string>, T> unwrapper, ClientVersion version)
-			where T : Message {
-			_unwrappers[(byte)version][(byte)command] = (pkg, env, user, tokens, conn) =>
-				unwrapper(pkg, env, user, tokens);
-		}
-
-		protected void AddUnwrapper<T>(TcpCommand command,
-			Func<TcpPackage, IEnvelope, ClaimsPrincipal, IReadOnlyDictionary<string, string>, TcpConnectionManager, T> unwrapper,
-			ClientVersion version)
-			where T : Message {
-// ReSharper disable RedundantCast
-			_unwrappers[(byte)version][(byte)command] =
-				(Func<TcpPackage, IEnvelope, ClaimsPrincipal, IReadOnlyDictionary<string, string>, TcpConnectionManager, Message>)unwrapper;
-// ReSharper restore RedundantCast
-		}
-
-		public TcpPackage? WrapMessage(Message message, byte version) {
-			if (message == null)
-				throw new ArgumentNullException(nameof(message));
-
-			try {
-				if (_wrappers[version].TryGetValue(message.GetType(), out var wrapper))
-					return wrapper(message);
-				if (_wrappers[^1].TryGetValue(message.GetType(), out wrapper))
-					return wrapper(message);
-			} catch (Exception exc) {
-				Log.Error(exc, "Error while wrapping message {message}.", message);
-			}
-
-			return null;
-		}
-
-		public Message UnwrapPackage(TcpPackage package, IEnvelope envelope, ClaimsPrincipal user,
-			IReadOnlyDictionary<string, string> tokens, TcpConnectionManager connection, byte version) {
-			if (envelope == null)
-				throw new ArgumentNullException(nameof(envelope));
-
-			var unwrapper = _unwrappers[version][(byte)package.Command] ??
-			                _unwrappers[^1][(byte)package.Command];
-
-			try {
-				return unwrapper?.Invoke(package, envelope, user, tokens, connection);
-			} catch (Exception exc) {
-				Log.Error(exc, "Error while unwrapping TcpPackage with command {command}.",
-					package.Command);
-			}
-
-			return null;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Tcp/TcpPackage.cs b/src/EventStore.Core/Services/Transport/Tcp/TcpPackage.cs
deleted file mode 100644
index b0512c92afa..00000000000
--- a/src/EventStore.Core/Services/Transport/Tcp/TcpPackage.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.Services.Transport.Tcp {
-	[Flags]
-	public enum TcpFlags : byte {
-		None = 0x00,
-		Authenticated = 0x01,
-		TrustedWrite = 0x02
-	}
-
-	public struct TcpPackage {
-		private static readonly IReadOnlyDictionary<string, string> NotAuthenticated = new Dictionary<string, string>();
-		public const int CommandOffset = 0;
-		public const int FlagsOffset = CommandOffset + 1;
-		public const int CorrelationOffset = FlagsOffset + 1;
-		public const int AuthOffset = CorrelationOffset + 16;
-
-		public const int MandatorySize = AuthOffset;
-
-		public const int MaxLoginLength = 127;
-		public const int MaxPasswordLength = 127;
-		public const int MaxTokenLength = short.MaxValue - 2;
-
-		public readonly TcpCommand Command;
-		public readonly TcpFlags Flags;
-		public readonly Guid CorrelationId;
-		public readonly ArraySegment<byte> Data;
-
-		private readonly string _login;
-		private readonly string _password;
-		private readonly string _authToken;
-
-		public IReadOnlyDictionary<string, string> Tokens => (_login, _authToken) switch {
-			(null, null) => NotAuthenticated,
-			(null, _) => new Dictionary<string, string> {["jwt"] = _authToken},
-			_ => new Dictionary<string, string> {["uid"] = _login, ["pwd"] = _password}
-		};
-
-		public static TcpPackage FromArraySegment(ArraySegment<byte> data) {
-			if (data.Count < MandatorySize)
-				throw new ArgumentException($"ArraySegment too short, length: {data.Count}", nameof(data));
-
-			var command = (TcpCommand)data.Array[data.Offset + CommandOffset];
-			var flags = (TcpFlags)data.Array[data.Offset + FlagsOffset];
-
-			var guidBytes = new byte[16];
-			Buffer.BlockCopy(data.Array, data.Offset + CorrelationOffset, guidBytes, 0, 16);
-			var correlationId = new Guid(guidBytes);
-
-			var headerSize = MandatorySize;
-			string login = null;
-			string pass = null;
-			if ((flags & TcpFlags.Authenticated) != 0) {
-				var firstByte = data.Array[data.Offset + AuthOffset];
-				var tokenLength = BitConverter.ToInt16(data.Array, AuthOffset);
-				if (Math.Sign(tokenLength) == -1) {
-					var token = Helper.UTF8NoBom.GetString(data.Array, AuthOffset + 2, -tokenLength);
-
-					headerSize += token.Length + 2;
-
-					return new TcpPackage(command, flags, correlationId, token,
-						new ArraySegment<byte>(data.Array, data.Offset + headerSize, data.Count - headerSize));
-				}
-
-				var loginLen = firstByte;
-				login = Helper.UTF8NoBom.GetString(data.Array, data.Offset + AuthOffset + 1, loginLen);
-
-				var passLen = data.Array[data.Offset + AuthOffset + 1 + loginLen];
-				pass = Helper.UTF8NoBom.GetString(data.Array, data.Offset + AuthOffset + 1 + loginLen + 1, passLen);
-
-				headerSize += 1 + loginLen + 1 + passLen;
-			}
-
-			return new TcpPackage(command,
-				flags,
-				correlationId,
-				login,
-				pass,
-				new ArraySegment<byte>(data.Array, data.Offset + headerSize, data.Count - headerSize));
-		}
-
-		public TcpPackage(TcpCommand command, Guid correlationId, byte[] data)
-			: this(command, TcpFlags.None, correlationId, null, new ArraySegment<byte>(data ?? Empty.ByteArray)) {
-		}
-
-		public TcpPackage(TcpCommand command, Guid correlationId, ArraySegment<byte> data)
-			: this(command, TcpFlags.None, correlationId, null, data) {
-		}
-
-		public TcpPackage(TcpCommand command, TcpFlags flags, Guid correlationId, string login, string password,
-			byte[] data)
-			: this(command, flags, correlationId, login, password, new ArraySegment<byte>(data ?? Empty.ByteArray)) {
-		}
-
-		public TcpPackage(TcpCommand command, TcpFlags flags, Guid correlationId, string login, string password,
-			ArraySegment<byte> data) : this(command, flags, correlationId, data) {
-			if ((flags & TcpFlags.Authenticated) != 0) {
-				Ensure.NotNull(login, nameof(login));
-				Ensure.NotNull(password, nameof(password));
-				if (Helper.UTF8NoBom.GetByteCount(login) > MaxLoginLength) {
-					throw new ArgumentException($"Login length must be less than {MaxLoginLength} bytes.",
-						nameof(login));
-				}
-
-				if (Helper.UTF8NoBom.GetByteCount(password) > MaxPasswordLength) {
-					throw new ArgumentException($"Password length must be less than {MaxPasswordLength} bytes.",
-						nameof(password));
-				}
-			} else {
-				if (login != null) {
-					throw new ArgumentException("Login provided for non-authorized TcpPackage", nameof(login));
-				}
-
-				if (password != null) {
-					throw new ArgumentException("Password provided for non-authorized TcpPackage", nameof(password));
-				}
-			}
-
-			_login = login;
-			_password = password;
-		}
-
-		public TcpPackage(TcpCommand command, TcpFlags flags, Guid correlationId, string authToken,
-			ArraySegment<byte> data) : this(command, flags, correlationId, data) {
-			if ((flags & TcpFlags.Authenticated) != 0) {
-				Ensure.NotNull(authToken, nameof(authToken));
-
-				if (Helper.UTF8NoBom.GetByteCount(authToken) > MaxTokenLength) {
-					throw new ArgumentException($"Token length must be smaller than {MaxTokenLength} bytes",
-						nameof(authToken));
-				}
-			}
-
-			if ((flags & TcpFlags.Authenticated) == 0 && authToken != null) {
-				throw new ArgumentException("Token provided for non-authorized TcpPackage", nameof(authToken));
-			}
-
-			_authToken = authToken;
-		}
-
-
-		private TcpPackage(TcpCommand command, TcpFlags flags, Guid correlationId, ArraySegment<byte> data) {
-			Command = command;
-			Flags = flags;
-			CorrelationId = correlationId;
-			Data = data;
-			_login = null;
-			_password = null;
-			_authToken = null;
-		}
-
-		public byte[] AsByteArray() {
-			if ((Flags & TcpFlags.Authenticated) != 0) {
-				if (_authToken == null) {
-					var loginLen = Helper.UTF8NoBom.GetByteCount(_login);
-					var passLen = Helper.UTF8NoBom.GetByteCount(_password);
-					var res = new byte[MandatorySize + 2 + loginLen + passLen + Data.Count];
-					res[CommandOffset] = (byte)Command;
-					res[FlagsOffset] = (byte)Flags;
-					Buffer.BlockCopy(CorrelationId.ToByteArray(), 0, res, CorrelationOffset, 16);
-
-					res[AuthOffset] = (byte)loginLen;
-					Helper.UTF8NoBom.GetBytes(_login, 0, _login.Length, res, AuthOffset + 1);
-					res[AuthOffset + 1 + loginLen] = (byte)passLen;
-					Helper.UTF8NoBom.GetBytes(_password, 0, _password.Length, res, AuthOffset + 1 + loginLen + 1);
-
-					Buffer.BlockCopy(Data.Array, Data.Offset, res, res.Length - Data.Count, Data.Count);
-					return res;
-				} else {
-					var authTokenLength = Helper.UTF8NoBom.GetByteCount(_authToken);
-					var res = new byte[MandatorySize + 2 + authTokenLength + Data.Count];
-					res[CommandOffset] = (byte)Command;
-					res[FlagsOffset] = (byte)Flags;
-					Buffer.BlockCopy(CorrelationId.ToByteArray(), 0, res, CorrelationOffset, 16);
-
-					Buffer.BlockCopy(BitConverter.GetBytes(-Convert.ToInt16(authTokenLength)), 0, res, AuthOffset, 2);
-					Helper.UTF8NoBom.GetBytes(_authToken, 0, _authToken.Length, res, AuthOffset + 2);
-
-					Buffer.BlockCopy(Data.Array, Data.Offset, res, res.Length - Data.Count, Data.Count);
-					return res;
-				}
-			} else {
-				var res = new byte[MandatorySize + Data.Count];
-				res[CommandOffset] = (byte)Command;
-				res[FlagsOffset] = (byte)Flags;
-				Buffer.BlockCopy(CorrelationId.ToByteArray(), 0, res, CorrelationOffset, 16);
-				Buffer.BlockCopy(Data.Array, Data.Offset, res, res.Length - Data.Count, Data.Count);
-				return res;
-			}
-		}
-
-		public ArraySegment<byte> AsArraySegment() {
-			return new ArraySegment<byte>(AsByteArray());
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Tcp/TcpService.cs b/src/EventStore.Core/Services/Transport/Tcp/TcpService.cs
deleted file mode 100644
index 488cdeaae0a..00000000000
--- a/src/EventStore.Core/Services/Transport/Tcp/TcpService.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-using System;
-using System.Net;
-using System.Net.Security;
-using System.Net.Sockets;
-using System.Security.Cryptography.X509Certificates;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Plugins.Authentication;
-using EventStore.Transport.Tcp;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.Transport.Tcp {
-	public enum TcpServiceType {
-		Internal,
-		External
-	}
-
-	public enum TcpSecurityType {
-		Normal,
-		Secure
-	}
-
-	public class TcpService : IHandle<SystemMessage.SystemInit>,
-		IHandle<SystemMessage.SystemStart>,
-		IHandle<SystemMessage.BecomeShuttingDown> {
-		private static readonly ILogger Log = Serilog.Log.ForContext<TcpService>();
-
-		private readonly IPublisher _publisher;
-		private readonly IPEndPoint _serverEndPoint;
-		private readonly TcpServerListener _serverListener;
-		private readonly IPublisher _networkSendQueue;
-		private readonly TcpServiceType _serviceType;
-		private readonly TcpSecurityType _securityType;
-		private readonly Func<Guid, IPEndPoint, ITcpDispatcher> _dispatcherFactory;
-		private readonly TimeSpan _heartbeatInterval;
-		private readonly TimeSpan _heartbeatTimeout;
-		private readonly IAuthenticationProvider _authProvider;
-		private readonly Func<X509Certificate2> _certificateSelector;
-		private readonly Func<X509Certificate2Collection> _intermediatesSelector;
-		private readonly CertificateDelegates.ClientCertificateValidator _sslClientCertValidator;
-		private readonly int _connectionPendingSendBytesThreshold;
-		private readonly int _connectionQueueSizeThreshold;
-		private readonly AuthorizationGateway _authorizationGateway;
-
-		public TcpService(IPublisher publisher,
-			IPEndPoint serverEndPoint,
-			IPublisher networkSendQueue,
-			TcpServiceType serviceType,
-			TcpSecurityType securityType,
-			ITcpDispatcher dispatcher,
-			TimeSpan heartbeatInterval,
-			TimeSpan heartbeatTimeout,
-			IAuthenticationProvider authProvider,
-			AuthorizationGateway authorizationGateway,
-			Func<X509Certificate2> certificateSelector,
-			Func<X509Certificate2Collection> intermediatesSelector,
-			CertificateDelegates.ClientCertificateValidator sslClientCertValidator,
-			int connectionPendingSendBytesThreshold,
-			int connectionQueueSizeThreshold)
-			: this(publisher, serverEndPoint, networkSendQueue, serviceType, securityType, (_, __) => dispatcher,
-				heartbeatInterval, heartbeatTimeout, authProvider, authorizationGateway, certificateSelector, intermediatesSelector, sslClientCertValidator, connectionPendingSendBytesThreshold, connectionQueueSizeThreshold) {
-		}
-
-		public TcpService(IPublisher publisher,
-			IPEndPoint serverEndPoint,
-			IPublisher networkSendQueue,
-			TcpServiceType serviceType,
-			TcpSecurityType securityType,
-			Func<Guid, IPEndPoint, ITcpDispatcher> dispatcherFactory,
-			TimeSpan heartbeatInterval,
-			TimeSpan heartbeatTimeout,
-			IAuthenticationProvider authProvider,
-			AuthorizationGateway authorizationGateway,
-			Func<X509Certificate2> certificateSelector,
-			Func<X509Certificate2Collection> intermediatesSelector,
-			CertificateDelegates.ClientCertificateValidator sslClientCertValidator,
-			int connectionPendingSendBytesThreshold,
-			int connectionQueueSizeThreshold) {
-			Ensure.NotNull(publisher, "publisher");
-			Ensure.NotNull(serverEndPoint, "serverEndPoint");
-			Ensure.NotNull(networkSendQueue, "networkSendQueue");
-			Ensure.NotNull(dispatcherFactory, "dispatcherFactory");
-			Ensure.NotNull(authProvider, "authProvider");
-			Ensure.NotNull(authorizationGateway, "authorizationGateway");
-
-			_publisher = publisher;
-			_serverEndPoint = serverEndPoint;
-			_serverListener = new TcpServerListener(_serverEndPoint);
-			_networkSendQueue = networkSendQueue;
-			_serviceType = serviceType;
-			_securityType = securityType;
-			_dispatcherFactory = dispatcherFactory;
-			_heartbeatInterval = heartbeatInterval;
-			_heartbeatTimeout = heartbeatTimeout;
-			_connectionPendingSendBytesThreshold = connectionPendingSendBytesThreshold;
-			_connectionQueueSizeThreshold = connectionQueueSizeThreshold;
-			_authProvider = authProvider;
-			_authorizationGateway = authorizationGateway;
-			_certificateSelector = certificateSelector;
-			_intermediatesSelector = intermediatesSelector;
-			_sslClientCertValidator = sslClientCertValidator;
-		}
-
-		public void Handle(SystemMessage.SystemInit message) {
-			try {
-				_serverListener.StartListening(OnConnectionAccepted, _securityType.ToString());
-			} catch (Exception e) {
-				Application.Exit(ExitCode.Error, e.Message);
-			}
-		}
-
-		public void Handle(SystemMessage.SystemStart message) {
-		}
-
-		public void Handle(SystemMessage.BecomeShuttingDown message) {
-			_serverListener.Stop();
-		}
-
-		private void OnConnectionAccepted(IPEndPoint endPoint, Socket socket) {
-			var conn = _securityType == TcpSecurityType.Secure
-				? TcpConnectionSsl.CreateServerFromSocket(Guid.NewGuid(), endPoint, socket, _certificateSelector, _intermediatesSelector, _sslClientCertValidator, verbose: true)
-				: TcpConnection.CreateAcceptedTcpConnection(Guid.NewGuid(), endPoint, socket, verbose: true);
-			Log.Information(
-				"{serviceType} TCP connection accepted: [{securityType}, {remoteEndPoint}, L{localEndPoint}, {connectionId:B}].",
-				_serviceType, _securityType, conn.RemoteEndPoint, conn.LocalEndPoint, conn.ConnectionId);
-
-			var dispatcher = _dispatcherFactory(conn.ConnectionId, _serverEndPoint);
-			var manager = new TcpConnectionManager(
-				$"{_serviceType.ToString().ToLower()}-{_securityType.ToString().ToLower()}",
-				_serviceType,
-				dispatcher,
-				_publisher,
-				conn,
-				_networkSendQueue,
-				_authProvider,
-				_authorizationGateway,
-				_heartbeatInterval,
-				_heartbeatTimeout,
-				(m, e) => _publisher.Publish(new TcpMessage.ConnectionClosed(m, e)),
-				_connectionPendingSendBytesThreshold,
-				_connectionQueueSizeThreshold); // TODO AN: race condition
-			_publisher.Publish(new TcpMessage.ConnectionEstablished(manager));
-			manager.StartReceiving();
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/Transport/Tcp/UnableToAcquireStreamException.cs b/src/EventStore.Core/Services/Transport/Tcp/UnableToAcquireStreamException.cs
deleted file mode 100644
index 0dc94d66135..00000000000
--- a/src/EventStore.Core/Services/Transport/Tcp/UnableToAcquireStreamException.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using System;
-
-namespace EventStore.Core.Services.Transport.Tcp {
-	class UnableToAcquireStreamException : Exception {
-	}
-}
diff --git a/src/EventStore.Core/Services/UserManagement/SystemAccounts.cs b/src/EventStore.Core/Services/UserManagement/SystemAccounts.cs
deleted file mode 100644
index f3f2d5149df..00000000000
--- a/src/EventStore.Core/Services/UserManagement/SystemAccounts.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-using System.Security.Claims;
-
-namespace EventStore.Core.Services.UserManagement {
-	public class SystemAccounts {
-		private static readonly IReadOnlyList<Claim> Claims = new[] {
-			new Claim(ClaimTypes.Name, "system"), 
-			new Claim(ClaimTypes.Role, "system"), 
-			new Claim(ClaimTypes.Role, SystemRoles.Admins), 
-		};
-		public static readonly ClaimsPrincipal System = new ClaimsPrincipal(new ClaimsIdentity(Claims, "system"));
-		public static readonly ClaimsPrincipal Anonymous = new ClaimsPrincipal(new ClaimsIdentity(new Claim[]{new Claim(ClaimTypes.Anonymous, ""), }));
-	}
-}
diff --git a/src/EventStore.Core/Services/VNode/InaugurationManager.cs b/src/EventStore.Core/Services/VNode/InaugurationManager.cs
deleted file mode 100644
index a25da8e98d9..00000000000
--- a/src/EventStore.Core/Services/VNode/InaugurationManager.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.TransactionLog.Checkpoint;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Services.VNode {
-	public class InaugurationManager :
-		IHandle<SystemMessage.StateChangeMessage>,
-		IHandle<SystemMessage.ChaserCaughtUp>,
-		IHandle<SystemMessage.EpochWritten>,
-		IHandle<SystemMessage.CheckInaugurationConditions>,
-		IHandle<ElectionMessage.ElectionsDone>,
-		IHandle<ReplicationTrackingMessage.ReplicatedTo>,
-		IHandle<ReplicationTrackingMessage.IndexedTo> {
-
-		private readonly ILogger _log = Serilog.Log.ForContext<InaugurationManager>();
-		private readonly IPublisher _publisher;
-		private readonly IReadOnlyCheckpoint _replicationCheckpoint;
-		private readonly IReadOnlyCheckpoint _indexCheckpoint;
-		private readonly Message _scheduleCheckInaugurationConditions;
-		private readonly IInaugurationStatusTracker _statusTracker;
-
-		private VNodeState _nodeState;
-		private ManagerState _managerState;
-		private Guid _stateCorrelationId;
-		private int _currentEpochNumber;
-		private long _replicationCheckpointTarget;
-		private long _indexCheckpointTarget;
-
-		private ManagerState State {
-			get => _managerState;
-			set {
-				_managerState = value;
-				_statusTracker.OnStateChange(value);
-			}
-		}
-
-		public enum ManagerState {
-			Idle,
-			WaitingForChaser,
-			WritingEpoch,
-			WaitingForConditions,
-			BecomingLeader,
-		}
-
-		public InaugurationManager(
-			IPublisher publisher,
-			IReadOnlyCheckpoint replicationCheckpoint,
-			IReadOnlyCheckpoint indexCheckpoint,
-			IInaugurationStatusTracker statusTracker) {
-
-			_log.Information("Using {name}", nameof(InaugurationManager));
-			_publisher = publisher;
-			_replicationCheckpoint = replicationCheckpoint;
-			_indexCheckpoint = indexCheckpoint;
-			_statusTracker = statusTracker;
-
-			_scheduleCheckInaugurationConditions = TimerMessage.Schedule.Create(
-				triggerAfter: TimeSpan.FromSeconds(1),
-				envelope: _publisher,
-				replyMessage: new SystemMessage.CheckInaugurationConditions());
-		}
-
-		public void Handle(ElectionMessage.ElectionsDone received) {
-			_currentEpochNumber = received.ProposalNumber;
-			Received(received, "currentEpochNumber {currentEpochNumber}.", _currentEpochNumber);
-		}
-
-		public void Handle(SystemMessage.StateChangeMessage received) {
-			if (received is SystemMessage.BecomePreLeader becomePreLeader) {
-				HandleBecomePreLeader(becomePreLeader);
-			} else {
-				HandleBecomeOtherNodeState(received);
-			}
-		}
-
-		private void HandleBecomePreLeader(SystemMessage.BecomePreLeader received) {
-			Received(
-				received,
-				"Starting inauguration process with correlation id {currentCorrelationId}. Waiting for chaser.",
-				received.CorrelationId);
-			_nodeState = received.State;
-			State = ManagerState.WaitingForChaser;
-			_stateCorrelationId = received.CorrelationId;
-		}
-
-		private void HandleBecomeOtherNodeState(SystemMessage.StateChangeMessage received) {
-			if (State != ManagerState.Idle) {
-				Received(received, "Inauguration process is now stopped.");
-				State = ManagerState.Idle;
-			}
-
-			_nodeState = received.State;
-		}
-
-		public void Handle(SystemMessage.ChaserCaughtUp received) {
-			if (State != ManagerState.WaitingForChaser) {
-				// will get this in prereplica and prereadonly replica
-				Ignore(received, "Not waiting for chaser.");
-			} else if (received.CorrelationId != _stateCorrelationId) {
-				Ignore(
-					received,
-					"Current correlation id is {currentCorrelationId} but received {receivedCorrelationId}.",
-					_stateCorrelationId,
-					received.CorrelationId);
-			} else {
-				Respond(
-					received,
-					new SystemMessage.WriteEpoch(_currentEpochNumber),
-					"currentEpochNumber {currentEpochNumber}.",
-					_currentEpochNumber);
-				State = ManagerState.WritingEpoch;
-			}
-		}
-
-		public void Handle(SystemMessage.EpochWritten received) {
-			if (State != ManagerState.WritingEpoch) {
-				Ignore(received, "Not writing epoch.");
-			} else if (received.Epoch.EpochNumber != _currentEpochNumber) {
-				Ignore(
-					received,
-					"Current epoch number is {currentEpochNumber} but received {receivedEpochNumber}.",
-					_currentEpochNumber,
-					received.Epoch.EpochNumber);
-			} else {
-				Respond(received, new SystemMessage.EnablePreLeaderReplication());
-				State = ManagerState.WaitingForConditions;
-
-				// want to replicate past the start of the epoch we just wrote.
-				_replicationCheckpointTarget = received.Epoch.EpochPosition + 1;
-
-				// and index past it too, to the $epoch-information event that immediately follows it
-				_indexCheckpointTarget = received.Epoch.EpochPosition + 1;
-
-				ConsiderBecomingLeader(received, log: true);
-				_publisher.Publish(_scheduleCheckInaugurationConditions);
-			}
-		}
-
-		public void Handle(ReplicationTrackingMessage.ReplicatedTo received) {
-			if (State != ManagerState.WaitingForConditions) {
-				// silently ignore. we'll get these all the time
-			} else {
-				ConsiderBecomingLeader(received, log: false);
-			}
-		}
-
-		public void Handle(ReplicationTrackingMessage.IndexedTo received) {
-			if (State != ManagerState.WaitingForConditions) {
-				// silently ignore. we'll get these all the time
-			} else {
-				ConsiderBecomingLeader(received, log: false);
-			}
-		}
-
-		public void Handle(SystemMessage.CheckInaugurationConditions received) {
-			if (State != ManagerState.WaitingForConditions) {
-				Ignore(received, "Not waiting for conditions.");
-			} else {
-				Respond(received, _scheduleCheckInaugurationConditions);
-				ConsiderBecomingLeader(received, log: true);
-			}
-		}
-
-		private void ConsiderBecomingLeader(Message received, bool log) {
-			var replicationCurrent = _replicationCheckpoint.Read();
-			var indexCurrent = _indexCheckpoint.Read();
-			var replicationDone = replicationCurrent >= _replicationCheckpointTarget;
-			var indexDone = indexCurrent >= _indexCheckpointTarget;
-
-			if (log || (replicationDone && indexDone)) {
-				LogExtraInformation(
-					"Replication {progress}: {current:N0}/{target:N0}. Remaining: {remaining:N0}.",
-					replicationDone ? "DONE" : "IN PROGRESS",
-					replicationCurrent,
-					_replicationCheckpointTarget,
-					Math.Max(0, _replicationCheckpointTarget - replicationCurrent));
-
-				LogExtraInformation(
-					"Index {progress}: {current:N0}/{target:N0}. Remaining: {remaining:N0}.",
-					indexDone ? "DONE" : "IN PROGRESS",
-					indexCurrent,
-					_indexCheckpointTarget,
-					Math.Max(0, _indexCheckpointTarget - indexCurrent));
-			}
-
-			if (replicationDone && indexDone) {
-				// transition to leader!
-				Respond(
-					received,
-					new SystemMessage.BecomeLeader(_stateCorrelationId),
-					"Correlation id {currentCorrelationId}",
-					_stateCorrelationId);
-				State = ManagerState.Idle;
-			}
-		}
-
-		private void Received(Message received, string template = null, params object[] templateArgs) {
-			LogExtraInformation(
-				Combine(template, "RECEIVED {received}."),
-				Combine(templateArgs, received.GetType().Name));
-		}
-
-		private void Respond(Message received, Message send, string template = null, params object[] templateArgs) {
-			LogExtraInformation(
-				Combine(template, "RECEIVED {received}. RESPONDING with {send}."),
-				Combine(templateArgs, received.GetType().Name, send.GetType().Name));
-			_publisher.Publish(send);
-		}
-
-		private void Ignore(Message received, string template = null, params object[] templateArgs) {
-			LogExtraInformation(
-				Combine(template, "IGNORING {received}."),
-				Combine(templateArgs, received.GetType().Name));
-		}
-
-		private void LogExtraInformation(string template = null, params object[] templateArgs) {
-			_log.Information(
-				Combine(template, "{name} in state ({nodeState}, {managerState}):"),
-				Combine(templateArgs, nameof(InaugurationManager), _nodeState, State));
-		}
-
-		private static string Combine(string template2, string template1) {
-			if (template1 is null)
-				return template2;
-
-			if (template2 is null)
-				return template1;
-
-			return $"{template1} {template2}";
-		}
-
-		private static object[] Combine(object[] args2, params object[] args1) {
-			if (args1 is null)
-				return args2;
-
-			if (args2 is null)
-				return args1;
-
-			return args1.Concat(args2).ToArray();
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/VNode/LeaderInfoProvider.cs b/src/EventStore.Core/Services/VNode/LeaderInfoProvider.cs
deleted file mode 100644
index 696a2b7535f..00000000000
--- a/src/EventStore.Core/Services/VNode/LeaderInfoProvider.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System.Net;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EndPoint = System.Net.EndPoint;
-
-
-namespace EventStore.Core.Services.VNode {
-
-	public class LeaderInfoProvider {
-		private readonly GossipAdvertiseInfo _gossipInfo;
-		private readonly Cluster.MemberInfo _leaderInfo;
-
-		public LeaderInfoProvider(GossipAdvertiseInfo gossipInfo, Cluster.MemberInfo leaderInfo) {
-			Ensure.NotNull(gossipInfo, "gossipInfo");
-			
-			_gossipInfo = gossipInfo;
-			_leaderInfo = leaderInfo;
-		}
-
-		public (EndPoint AdvertisedTcpEndPoint, bool IsTcpEndPointSecure, EndPoint AdvertisedHttpEndPoint)
-			GetLeaderInfoEndPoints(){
-
-			var endpoints = _leaderInfo != null 
-				? (TcpEndPoint: _leaderInfo.ExternalTcpEndPoint ?? _leaderInfo.ExternalSecureTcpEndPoint,
-					IsTcpEndPointSecure: _leaderInfo.ExternalSecureTcpEndPoint != null,
-					HttpEndPoint: _leaderInfo.HttpEndPoint,
-					AdvertiseHost: _leaderInfo.AdvertiseHostToClientAs,
-					AdvertiseHttpPort: _leaderInfo.AdvertiseHttpPortToClientAs,
-					AdvertiseTcpPort: _leaderInfo.AdvertiseTcpPortToClientAs)
-				: (TcpEndPoint: _gossipInfo.ExternalTcp ?? _gossipInfo.ExternalSecureTcp,
-					IsTcpEndPointSecure: _gossipInfo.ExternalSecureTcp != null,
-					HttpEndPoint: _gossipInfo.HttpEndPoint,
-					AdvertiseHost: _gossipInfo.AdvertiseHostToClientAs,
-					AdvertiseHttpPort: _gossipInfo.AdvertiseHttpPortToClientAs,
-					AdvertiseTcpPort: _gossipInfo.AdvertiseTcpPortToClientAs);
-
-			var advertisedTcpEndPoint = endpoints.TcpEndPoint == null
-				? null
-				: new DnsEndPoint(
-					string.IsNullOrEmpty(endpoints.AdvertiseHost)
-						? endpoints.TcpEndPoint.GetHost()
-						: endpoints.AdvertiseHost,
-					endpoints.AdvertiseTcpPort == 0 ? endpoints.TcpEndPoint.GetPort() : endpoints.AdvertiseTcpPort);
-			var advertisedHttpEndPoint = new DnsEndPoint(
-				string.IsNullOrEmpty(endpoints.AdvertiseHost)
-					? endpoints.HttpEndPoint.GetHost()
-					: endpoints.AdvertiseHost,
-				endpoints.AdvertiseHttpPort == 0 ? endpoints.HttpEndPoint.GetPort() : endpoints.AdvertiseHttpPort);
-
-			return (advertisedTcpEndPoint, endpoints.IsTcpEndPointSecure, advertisedHttpEndPoint);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/VNode/MessageForwardingProxy.cs b/src/EventStore.Core/Services/VNode/MessageForwardingProxy.cs
deleted file mode 100644
index a22acd34146..00000000000
--- a/src/EventStore.Core/Services/VNode/MessageForwardingProxy.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Diagnostics;
-using EventStore.Common.Utils;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Services.VNode {
-	public class MessageForwardingProxy {
-		private readonly Stopwatch _stopwatch = Stopwatch.StartNew();
-
-		private readonly ConcurrentDictionary<Guid, Forwarding> _forwardings =
-			new ConcurrentDictionary<Guid, Forwarding>();
-
-		public void Register(Guid internalCorrId, Guid clientCorrId, IEnvelope envelope, TimeSpan timeout,
-			Message timeoutMessage) {
-			_forwardings.AddOrUpdate(
-				internalCorrId,
-				new Forwarding(clientCorrId, envelope, _stopwatch.Elapsed + timeout, timeoutMessage),
-				(x, y) => {
-					throw new Exception(
-						string.Format("Forwarding for InternalCorrId {0:B} (ClientCorrId {1:B}) already exists.",
-							internalCorrId, clientCorrId));
-				});
-		}
-
-		public bool TryForwardReply<TMessage>(Guid correlationId, TMessage originalMessage,
-			Func<Guid, TMessage, TMessage> getForwardMessage)
-			where TMessage : Message {
-			Forwarding forwarding;
-			if (_forwardings.TryRemove(correlationId, out forwarding)) {
-				forwarding.Envelope.ReplyWith(getForwardMessage(forwarding.ClientCorrId, originalMessage));
-				return true;
-			}
-
-			return false;
-		}
-
-		public void TimeoutForwardings() {
-			var now = _stopwatch.Elapsed;
-
-			foreach (var forwPair in _forwardings) {
-				Forwarding forwarding;
-				if (forwPair.Value.TimeoutTimestamp <= now && _forwardings.TryRemove(forwPair.Key, out forwarding))
-					forwarding.Envelope.ReplyWith(forwarding.TimeoutMessage);
-			}
-		}
-
-		private class Forwarding {
-			public readonly Guid ClientCorrId;
-			public readonly IEnvelope Envelope;
-			public readonly TimeSpan TimeoutTimestamp;
-			public readonly Message TimeoutMessage;
-
-			public Forwarding(Guid clientCorrId, IEnvelope envelope, TimeSpan timeoutTimestamp,
-				Message timeoutMessage) {
-				Ensure.NotNull(envelope, "envelope");
-				Ensure.NotNull(timeoutMessage, "timeoutMessage");
-
-				ClientCorrId = clientCorrId;
-				Envelope = envelope;
-				TimeoutTimestamp = timeoutTimestamp;
-				TimeoutMessage = timeoutMessage;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Services/VNode/NodeStatusTracker.cs b/src/EventStore.Core/Services/VNode/NodeStatusTracker.cs
deleted file mode 100644
index 1d1ee0f4209..00000000000
--- a/src/EventStore.Core/Services/VNode/NodeStatusTracker.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Core.Metrics;
-
-namespace EventStore.Core.Services.VNode {
-	public interface IInaugurationStatusTracker {
-		void OnStateChange(InaugurationManager.ManagerState newState);
-	}
-
-	public interface INodeStatusTracker : IInaugurationStatusTracker {
-		void OnStateChange(VNodeState newState);
-	}
-
-	public class NodeStatusTracker : INodeStatusTracker {
-		private readonly StatusSubMetric _subMetric;
-		private readonly object _lock = new();
-
-		private VNodeState _nodeState;
-		private InaugurationManager.ManagerState _inaugurationState;
-
-		public NodeStatusTracker(StatusMetric metric) {
-			_nodeState = VNodeState.Initializing;
-			_inaugurationState = InaugurationManager.ManagerState.Idle;
-			_subMetric = new StatusSubMetric("Node", _nodeState, metric);
-		}
-
-		public void OnStateChange(VNodeState newState) {
-			lock (_lock) {
-				_nodeState = newState;
-				UpdateStatus();
-			}
-		}
-
-		public void OnStateChange(InaugurationManager.ManagerState newState) {
-			lock (_lock) {
-				_inaugurationState = newState;
-				UpdateStatus();
-			}
-		}
-
-		private void UpdateStatus() {
-			_subMetric.SetStatus(_inaugurationState == InaugurationManager.ManagerState.Idle
-				? $"{_nodeState}"
-				: $"{_nodeState} - {_inaugurationState}");
-		}
-
-		public class NoOp : INodeStatusTracker {
-			public void OnStateChange(VNodeState newState) {
-			}
-
-			public void OnStateChange(InaugurationManager.ManagerState newState) {
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Settings/ESConsts.cs b/src/EventStore.Core/Settings/ESConsts.cs
deleted file mode 100644
index b4898b7bbf0..00000000000
--- a/src/EventStore.Core/Settings/ESConsts.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.Chunks;
-
-namespace EventStore.Core.Settings {
-	public static class ESConsts {
-		public const int PTableInitialReaderCount = 5;
-		public const int MemTableEntryCount = 1000000;
-		public const int IndexWriterCacheCapacity = 100_000;
-		public const int TransactionMetadataCacheCapacity = 50000;
-		public const int CommitedEventsMemCacheLimit = 8 * 1024 * 1024;
-		public const int CachedEpochCount = 1000;
-		public const int ReadRequestTimeout = 10000;
-		public const bool PerformAdditionlCommitChecks = false;
-		public const int MetaStreamMaxCount = 1;
-			
-		public const int CachedPrincipalCount = 1000;
-
-		public static readonly TimeSpan HttpTimeout = TimeSpan.FromSeconds(10);
-		public static readonly TimeSpan HttpClientConnectionLifeTime = TimeSpan.FromMinutes(10);
-
-		public const int UnrestrictedPendingSendBytes = 0;
-		public const int MaxConnectionQueueSize = 50000;
-
-		public const string DefaultIndexDirectoryName = "index";
-		public const string StreamExistenceFilterDirectoryName = "stream-existence";
-	}
-}
diff --git a/src/EventStore.Core/Settings/ThreadCountCalculator.cs b/src/EventStore.Core/Settings/ThreadCountCalculator.cs
deleted file mode 100644
index f74242bb16f..00000000000
--- a/src/EventStore.Core/Settings/ThreadCountCalculator.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using Serilog;
-
-namespace EventStore.Core.Settings {
-
-	public static class ThreadCountCalculator {
-		private const int ReaderThreadCountFloor = 4;
-
-		public static int CalculateReaderThreadCount(int configuredCount, int processorCount,
-			bool isRunningInContainer) {
-			if (configuredCount > 0) {
-				Log.Information(
-					"ReaderThreadsCount set to {readerThreadsCount:N0}. " +
-					"Calculated based on processor count of {processorCount:N0} and configured value of {configuredCount:N0}",
-					configuredCount,
-					processorCount, configuredCount);
-				return configuredCount;
-			}
-
-			if (isRunningInContainer) {
-				Log.Information(
-					"ReaderThreadsCount set to {readerThreadsCount:N0}. " +
-					"Calculated based on containerized environment and configured value of {configuredCount:N0}",
-					ContainerizedEnvironment.ReaderThreadCount,
-					configuredCount);
-				return ContainerizedEnvironment.ReaderThreadCount;
-			}
-
-			var readerCount = Math.Clamp(processorCount * 2, ReaderThreadCountFloor, 16);
-			Log.Information(
-				"ReaderThreadsCount set to {readerThreadsCount:N0}. " +
-				"Calculated based on processor count of {processorCount:N0} and configured value of {configuredCount:N0}",
-				readerCount,
-				processorCount, configuredCount);
-			return readerCount;
-		}
-
-		public static int CalculateWorkerThreadCount(int configuredCount, int readerCount, bool isRunningInContainer) {
-			if (configuredCount > 0) {
-				Log.Information(
-					"WorkerThreads set to {workerThreadsCount:N0}. " +
-					"Calculated based on a reader thread count of {readerThreadsCount:N0} and a configured value of {configuredCount:N0}",
-					configuredCount,
-					readerCount, configuredCount);
-				return configuredCount;
-			}
-
-
-			if (isRunningInContainer) {
-				Log.Information(
-					"WorkerThreads set to {workerThreadsCount:N0}. " +
-					"Calculated based on containerized environment and a configured value of {configuredCount:N0}",
-					ContainerizedEnvironment.WorkerThreadCount,
-					configuredCount);
-				return ContainerizedEnvironment.WorkerThreadCount;
-			}
-
-			var workerThreadsCount = readerCount > ReaderThreadCountFloor ? 10 : 5;
-			Log.Information(
-				"WorkerThreads set to {workerThreadsCount:N0}. " +
-				"Calculated based on a reader thread count of {readerThreadsCount:N0} and a configured value of {configuredCount:N0}",
-				workerThreadsCount,
-				readerCount, configuredCount);
-			return workerThreadsCount;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Settings/VNodeSettings.cs b/src/EventStore.Core/Settings/VNodeSettings.cs
deleted file mode 100644
index 8a4b5b244b1..00000000000
--- a/src/EventStore.Core/Settings/VNodeSettings.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using System;
-using System.Net;
-using System.Security.Cryptography.X509Certificates;
-using EventStore.Common.Utils;
-using EventStore.Core.Services.Monitoring;
-
-namespace EventStore.Core.Settings {
-	public class SingleVNodeSettings {
-		public readonly IPEndPoint ExternalTcpEndPoint;
-		public readonly IPEndPoint ExternalSecureTcpEndPoint;
-		public readonly IPEndPoint HttpEndPoint;
-		public readonly string[] HttpPrefixes;
-		public readonly bool EnableTrustedAuth;
-		public readonly X509Certificate2 Certificate;
-		public readonly int WorkerThreads;
-
-		public readonly TimeSpan MinFlushDelay;
-		public readonly TimeSpan PrepareTimeout;
-		public readonly TimeSpan CommitTimeout;
-
-		public readonly bool DisableScavengeMerging;
-
-		public readonly TimeSpan StatsPeriod;
-		public readonly StatsStorage StatsStorage;
-
-		public readonly bool SkipInitializeStandardUsersCheck;
-
-		public readonly TimeSpan TcpTimeout;
-
-		public SingleVNodeSettings(IPEndPoint externalTcpEndPoint,
-			IPEndPoint externalSecureTcpEndPoint,
-			IPEndPoint httpEndPoint,
-			string[] httpPrefixes,
-			bool enableTrustedAuth,
-			X509Certificate2 certificate,
-			int workerThreads,
-			TimeSpan minFlushDelay,
-			TimeSpan prepareTimeout,
-			TimeSpan commitTimeout,
-			TimeSpan statsPeriod,
-			TimeSpan tcpTimeout,
-			StatsStorage statsStorage = StatsStorage.StreamAndFile,
-			bool skipInitializeStandardUsersCheck = false,
-			bool disableScavengeMerging = false) {
-			Ensure.NotNull(httpEndPoint, nameof(httpEndPoint));
-			Ensure.NotNull(httpPrefixes, "httpPrefixes");
-			if (externalSecureTcpEndPoint != null)
-				Ensure.NotNull(certificate, "certificate");
-			Ensure.Positive(workerThreads, "workerThreads");
-
-			ExternalTcpEndPoint = externalTcpEndPoint;
-			ExternalSecureTcpEndPoint = externalSecureTcpEndPoint;
-			HttpEndPoint = httpEndPoint;
-			HttpPrefixes = httpPrefixes;
-			EnableTrustedAuth = enableTrustedAuth;
-			Certificate = certificate;
-			WorkerThreads = workerThreads;
-
-			MinFlushDelay = minFlushDelay;
-			PrepareTimeout = prepareTimeout;
-			CommitTimeout = commitTimeout;
-
-			StatsPeriod = statsPeriod;
-			StatsStorage = statsStorage;
-
-			SkipInitializeStandardUsersCheck = skipInitializeStandardUsersCheck;
-			DisableScavengeMerging = disableScavengeMerging;
-			TcpTimeout = tcpTimeout;
-		}
-
-		public override string ToString() {
-			return string.Format("ExternalTcpEndPoint: {0},\n"
-			                     + "ExternalSecureTcpEndPoint: {1},\n"
-			                     + "HttpEndPoint: {2},\n"
-			                     + "HttpPrefixes: {3},\n"
-			                     + "EnableTrustedAuth: {4},\n"
-			                     + "Certificate: {5},\n"
-			                     + "WorkerThreads: {6}\n"
-			                     + "MinFlushDelay: {7}\n"
-			                     + "PrepareTimeout: {8}\n"
-			                     + "CommitTimeout: {9}\n"
-			                     + "StatsPeriod: {10}\n"
-			                     + "StatsStorage: {11}",
-				ExternalTcpEndPoint == null ? "n/a" : ExternalTcpEndPoint.ToString(),
-				ExternalSecureTcpEndPoint == null ? "n/a" : ExternalSecureTcpEndPoint.ToString(),
-				HttpEndPoint,
-				string.Join(", ", HttpPrefixes),
-				EnableTrustedAuth,
-				Certificate == null ? "n/a" : Certificate.ToString(verbose: true),
-				WorkerThreads,
-				MinFlushDelay,
-				PrepareTimeout,
-				CommitTimeout,
-				StatsPeriod,
-				StatsStorage);
-		}
-	}
-}
diff --git a/src/EventStore.Core/StandardComponents.cs b/src/EventStore.Core/StandardComponents.cs
deleted file mode 100644
index 6dac08a9091..00000000000
--- a/src/EventStore.Core/StandardComponents.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using EventStore.Common.Configuration;
-using EventStore.Core.Bus;
-using EventStore.Core.Metrics;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Services.Transport.Http;
-using EventStore.Core.TransactionLog.Chunks;
-
-namespace EventStore.Core {
-	public class StandardComponents {
-		private readonly TFChunkDbConfig _dbConfig;
-		private readonly IPublisher _mainQueue;
-		private readonly ISubscriber _mainBus;
-		private readonly TimerService _timerService;
-		private readonly ITimeProvider _timeProvider;
-		private readonly IHttpForwarder _httpForwarder;
-		private readonly IHttpService[] _httpServices;
-		private readonly IPublisher _networkSendService;
-		private readonly QueueStatsManager _queueStatsManager;
-
-		public StandardComponents(
-			TFChunkDbConfig dbConfig,
-			IPublisher mainQueue,
-			ISubscriber mainBus,
-			TimerService timerService,
-			ITimeProvider timeProvider,
-			IHttpForwarder httpForwarder,
-			IHttpService[] httpServices,
-			IPublisher networkSendService,
-			QueueStatsManager queueStatsManager,
-			QueueTrackers trackers,
-			bool projectionStats) {
-			_dbConfig = dbConfig;
-			_mainQueue = mainQueue;
-			_mainBus = mainBus;
-			_timerService = timerService;
-			_timeProvider = timeProvider;
-			_httpForwarder = httpForwarder;
-			_httpServices = httpServices;
-			_networkSendService = networkSendService;
-			_queueStatsManager = queueStatsManager;
-			QueueTrackers = trackers;
-			ProjectionStats = projectionStats;
-		}
-
-		public TFChunkDbConfig DbConfig {
-			get { return _dbConfig; }
-		}
-
-		public IPublisher MainQueue {
-			get { return _mainQueue; }
-		}
-
-		public ISubscriber MainBus {
-			get { return _mainBus; }
-		}
-
-		public TimerService TimerService {
-			get { return _timerService; }
-		}
-
-		public ITimeProvider TimeProvider {
-			get { return _timeProvider; }
-		}
-
-		public IHttpForwarder HttpForwarder {
-			get { return _httpForwarder; }
-		}
-
-		public IHttpService[] HttpServices {
-			get { return _httpServices; }
-		}
-
-		public IPublisher NetworkSendService {
-			get { return _networkSendService; }
-		}
-
-		public QueueStatsManager QueueStatsManager {
-			get { return _queueStatsManager; }
-		}
-
-		public bool ProjectionStats { get; }
-
-		public QueueTrackers QueueTrackers { get; private set; }
-	}
-}
diff --git a/src/EventStore.Core/Telemetry/ContainerInfo.cs b/src/EventStore.Core/Telemetry/ContainerInfo.cs
deleted file mode 100644
index d3672163f8a..00000000000
--- a/src/EventStore.Core/Telemetry/ContainerInfo.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Runtime;
-
-namespace EventStore.Core.Telemetry;
-
-public readonly record struct ContainerInfo(bool IsContainer, bool IsKubernetes) {
-    public static ContainerInfo Collect() => new(
-        RuntimeInformation.IsRunningInContainer,
-        RuntimeInformation.IsRunningInKubernetes
-    );
-}
diff --git a/src/EventStore.Core/Telemetry/EnvironmentTelemetry.cs b/src/EventStore.Core/Telemetry/EnvironmentTelemetry.cs
deleted file mode 100644
index e9acf50b960..00000000000
--- a/src/EventStore.Core/Telemetry/EnvironmentTelemetry.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Runtime;
-
-namespace EventStore.Core.Telemetry;
-
-public readonly record struct EnvironmentTelemetry {
-    public string        Arch      { get; init; }
-    public ContainerInfo Container { get; init; }
-    public MachineInfo   Machine   { get; init; }
-
-    public static EnvironmentTelemetry Collect(ClusterVNodeOptions options) =>
-        new() {
-            Arch      = RuntimeInformation.Host.Architecture.ToString(),
-            Container =  ContainerInfo.Collect(),
-            Machine   =  MachineInfo.Collect(options)
-        };
-}
diff --git a/src/EventStore.Core/Telemetry/ITelemetrySink.cs b/src/EventStore.Core/Telemetry/ITelemetrySink.cs
deleted file mode 100644
index 403326fe6bc..00000000000
--- a/src/EventStore.Core/Telemetry/ITelemetrySink.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Text.Json.Nodes;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.Telemetry; 
-
-public interface ITelemetrySink {
-	Task Flush(JsonObject data, CancellationToken token);
-}
diff --git a/src/EventStore.Core/Telemetry/InMemoryTelemetrySink.cs b/src/EventStore.Core/Telemetry/InMemoryTelemetrySink.cs
deleted file mode 100644
index 015dbe5000a..00000000000
--- a/src/EventStore.Core/Telemetry/InMemoryTelemetrySink.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Text.Json.Nodes;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.Telemetry; 
-
-public class InMemoryTelemetrySink : ITelemetrySink {
-	public JsonObject Data { get; private set; }
-	
-	public Task Flush(JsonObject data, CancellationToken token) {
-		Data = (JsonObject)JsonNode.Parse(data.ToJsonString());
-		return Task.CompletedTask;
-	}
-}
diff --git a/src/EventStore.Core/Telemetry/MachineInfo.cs b/src/EventStore.Core/Telemetry/MachineInfo.cs
deleted file mode 100644
index 9dfc6149fc8..00000000000
--- a/src/EventStore.Core/Telemetry/MachineInfo.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-
-namespace EventStore.Core.Telemetry;
-
-public readonly record struct MachineInfo(
-	string OS,
-	int ProcessorCount,
-	long TotalMemory,
-	long TotalDiskSpace) {
-
-	public static MachineInfo Collect(ClusterVNodeOptions options) => new(
-		RuntimeInformation.OSDescription,
-		Environment.ProcessorCount,
-		RuntimeStats.GetTotalMemory(),
-		DriveStats.GetDriveInfo(options.Database.Db).TotalBytes
-	);
-}
diff --git a/src/EventStore.Core/Telemetry/TelemetryService.cs b/src/EventStore.Core/Telemetry/TelemetryService.cs
deleted file mode 100644
index b0c2e52b451..00000000000
--- a/src/EventStore.Core/Telemetry/TelemetryService.cs
+++ /dev/null
@@ -1,245 +0,0 @@
-using System;
-using System.Linq;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using System.Threading;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-using DotNext.Collections.Generic;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Plugins.Diagnostics;
-using Serilog;
-using static EventStore.Plugins.Diagnostics.PluginDiagnosticsDataCollectionMode;
-
-namespace EventStore.Core.Telemetry;
-
-public sealed class TelemetryService :
-	IHandle<SystemMessage.StateChangeMessage>,
-	IHandle<ElectionMessage.ElectionsDone>,
-	IHandle<SystemMessage.ReplicaStateMessage>,
-	IHandle<LeaderDiscoveryMessage.LeaderFound>,
-	IDisposable
-{
-	private static readonly ILogger Logger = Log.ForContext<TelemetryService>();
-
-	private static readonly TimeSpan InitialInterval = TimeSpan.FromHours(1);
-	private static readonly TimeSpan Interval = TimeSpan.FromHours(24);
-	private static readonly TimeSpan FlushDelay = TimeSpan.FromSeconds(10);
-
-	private readonly ClusterVNodeOptions _nodeOptions;
-	private readonly CancellationTokenSource _cts = new();
-	private readonly IPublisher _publisher;
-	private readonly IReadOnlyCheckpoint _writerCheckpoint;
-	private readonly long _startTime = TimeProvider.System.GetTimestamp();
-	private readonly Guid _nodeId;
-	private readonly TFChunkManager _manager;
-	private readonly PluginDiagnosticsDataCollector _pluginDiagnosticsDataCollector;
-
-	private VNodeState _nodeState;
-	private int _epochNumber;
-	private Guid _leaderId = Guid.Empty;
-	private Guid _firstEpochId = Guid.Empty;
-
-	public TelemetryService(
-		TFChunkManager manager,
-		ClusterVNodeOptions nodeOptions,
-		IPublisher publisher,
-		ITelemetrySink sink,
-		IReadOnlyCheckpoint writerCheckpoint,
-		Guid nodeId
-	) {
-		_manager = manager;
-		_nodeOptions = nodeOptions;
-		_publisher = publisher;
-		_writerCheckpoint = writerCheckpoint;
-		_nodeId = nodeId;
-
-		_pluginDiagnosticsDataCollector = PluginDiagnosticsDataCollector.Start(
-			_nodeOptions.PlugableComponents.Select(x => x.DiagnosticsName).ToArray()
-		);
-
-		_ = Task.Run(async () => {
-			try {
-				await ProcessAsync(publisher, sink);
-			} catch (Exception ex) when (ex is not OperationCanceledException) {
-				Logger.Error(ex, "Telemetry loop stopped");
-			}
-		});
-	}
-
-	public void Dispose() {
-		_cts.Cancel();
-		_cts.Dispose();
-	}
-
-	// we send messages on the publisher, and receive responses directly to the channel
-	// using the channel reduces chatter on the main queue.
-	private async Task ProcessAsync(IPublisher publisher, ITelemetrySink sink) {
-		var channel = Channel.CreateBounded<Message>(new BoundedChannelOptions(500) {
-			SingleReader = true,
-			FullMode = BoundedChannelFullMode.DropOldest,
-		});
-
-		var envelope = new ChannelEnvelope(channel);
-		var scheduleInitialCollect = TimerMessage.Schedule.Create(InitialInterval, envelope, new TelemetryMessage.Collect());
-		var scheduleCollect = TimerMessage.Schedule.Create(Interval - FlushDelay, envelope, new TelemetryMessage.Collect());
-		var scheduleFlush = TimerMessage.Schedule.Create(FlushDelay, envelope, new TelemetryMessage.Flush());
-		var usageRequest = new TelemetryMessage.Request(envelope);
-
-		publisher.Publish(scheduleInitialCollect);
-
-		var data = new JsonObject();
-		await foreach (var message in channel.Reader.ReadAllAsync(_cts.Token)) {
-			switch (message) {
-				case TelemetryMessage.Collect:
-					Handle(usageRequest);
-					publisher.Publish(usageRequest);
-					publisher.Publish(scheduleFlush);
-					break;
-
-				case TelemetryMessage.Response response:
-					if (string.IsNullOrWhiteSpace(response.Root)) {
-						data[response.Key] = response.Value;
-						break;
-					}
-
-					if (data.TryGetPropertyValue(response.Root, out var existing) &&
-						existing is JsonObject existingObject) {
-
-						existingObject[response.Key] = response.Value;
-						break;
-					}
-
-					data[response.Root] = new JsonObject {
-						[response.Key] = response.Value
-					};
-					break;
-
-				case TelemetryMessage.Flush:
-					await sink.Flush(data, _cts.Token);
-					data.Clear();
-					publisher.Publish(scheduleCollect);
-					break;
-			}
-		}
-	}
-
-	public void Handle(SystemMessage.StateChangeMessage message) {
-		_nodeState = message.State;
-	}
-
-	public void Handle(ElectionMessage.ElectionsDone message) {
-		_epochNumber = message.ProposalNumber;
-		_leaderId = message.Leader.InstanceId;
-	}
-	public void Handle(SystemMessage.ReplicaStateMessage message) {
-		_epochNumber = message.Leader.EpochNumber;
-		_leaderId = message.Leader.InstanceId;
-	}
-	public void Handle(LeaderDiscoveryMessage.LeaderFound message) {
-		_epochNumber = message.Leader.EpochNumber;
-		_leaderId = message.Leader.InstanceId;
-	}
-
-	private void Handle(TelemetryMessage.Request message) {
-		if (_firstEpochId == Guid.Empty)
-			ReadFirstEpoch();
-
-		message.Envelope.ReplyWith(new TelemetryMessage.Response(
-			"version", JsonValue.Create(VersionInfo.Version)));
-
-		message.Envelope.ReplyWith(new TelemetryMessage.Response(
-			"edition", JsonValue.Create(VersionInfo.Edition)));
-
-		message.Envelope.ReplyWith(new TelemetryMessage.Response(
-			"uptime", JsonValue.Create(TimeProvider.System.GetElapsedTime(_startTime))));
-
-		message.Envelope.ReplyWith(new TelemetryMessage.Response(
-			"cluster", new JsonObject {
-				["leaderId"] = JsonValue.Create(_leaderId),
-				["nodeId"] = JsonValue.Create(_nodeId),
-				["nodeState"] = _nodeState.ToString(),
-			}));
-
-		message.Envelope.ReplyWith(new TelemetryMessage.Response(
-			"configuration", new JsonObject {
-				["clusterSize"] = _nodeOptions.Cluster.ClusterSize,
-				["enableAtomPubOverHttp"] = _nodeOptions.Interface.EnableAtomPubOverHttp,
-				["insecure"] = _nodeOptions.Application.Insecure,
-				["runProjections"] = _nodeOptions.Projection.RunProjections.ToString(),
-				["authorizationType"] = _nodeOptions.Auth.AuthorizationType,
-				["authenticationType"] = _nodeOptions.Auth.AuthenticationType
-			}));
-
-		message.Envelope.ReplyWith(new TelemetryMessage.Response(
-			"database", new JsonObject {
-				["epochNumber"] = _epochNumber,
-				["firstEpochId"] = _firstEpochId,
-				["activeChunkNumber"] = _writerCheckpoint.Read() / _nodeOptions.Database.ChunkSize,
-			}));
-
-		var env = EnvironmentTelemetry.Collect(_nodeOptions);
-		message.Envelope.ReplyWith(new TelemetryMessage.Response(
-			"environment", new JsonObject {
-				["os"] = env.Machine.OS,
-				["coreCount"] = env.Machine.ProcessorCount,
-				["isContainer"] = env.Container.IsContainer,
-				["isKubernetes"] = env.Container.IsKubernetes,
-				["processorArchitecture"] = env.Arch,
-				["totalDiskSpace"] = env.Machine.TotalDiskSpace,
-				["totalMemory"] = env.Machine.TotalMemory,
-			}));
-
-		_nodeOptions.PlugableComponents
-			.SelectMany(plugin => _pluginDiagnosticsDataCollector
-				.CollectedEvents(plugin.DiagnosticsName)
-				.Where(evt => evt.CollectionMode == Snapshot))
-			.ForEach(evt => {
-				try {
-					var payload = JsonSerializer.SerializeToNode(evt.Data);
-					message.Envelope.ReplyWith(new TelemetryMessage.Response("plugins", evt.Source, payload));
-				}
-				catch (Exception ex) {
-					Logger.Warning(ex, "Failed to collect telemetry from pluggable component {Source}", evt.Source);
-				}
-			});
-
-		_publisher.Publish(new GossipMessage.ReadGossip(new CallbackEnvelope(resp => OnGossipReceived(message.Envelope, resp))));
-	}
-
-	private static void OnGossipReceived(IEnvelope<TelemetryMessage.Response> envelope, Message message) {
-		if (message is not GossipMessage.SendGossip gossip)
-			return;
-
-		var seeds = new JsonObject();
-
-		foreach (var member in gossip.ClusterInfo.Members) {
-			seeds[member.InstanceId.ToString()] = member.State.ToString();
-		}
-
-		envelope.ReplyWith(new TelemetryMessage.Response("gossip", seeds));
-	}
-
-	private void ReadFirstEpoch() {
-		try {
-			var chunk = _manager.GetChunkFor(0);
-			var result = chunk.TryReadAt(0, false);
-
-			if (!result.Success)
-				return;
-
-			var epoch = ((SystemLogRecord)result.LogRecord).GetEpochRecord();
-			_firstEpochId = epoch.EpochId;
-		} catch {
-			// noop
-		}
-	}
-}
diff --git a/src/EventStore.Core/Telemetry/TelemetrySink.cs b/src/EventStore.Core/Telemetry/TelemetrySink.cs
deleted file mode 100644
index 8fd837326f2..00000000000
--- a/src/EventStore.Core/Telemetry/TelemetrySink.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Net.Http;
-using System.Net.Http.Json;
-using System.Text;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using System.Threading;
-using System.Threading.Tasks;
-using Serilog;
-
-namespace EventStore.Core.Telemetry; 
-
-public class TelemetrySink : ITelemetrySink {
-	private static readonly ILogger _log = Log.ForContext<TelemetrySink>();
-	private const string ApiHost = "https://eventstore.com/telemetry";
-	private readonly bool _optout;
-	private readonly HttpClient _httpClient;
-	private readonly JsonSerializerOptions _serializerOptions = new() {
-		WriteIndented = true,
-		PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-	};
-
-	public TelemetrySink(bool optout) {
-		_optout = optout;
-
-		LogTelemetryMessage();
-
-		if (!optout) {
-			_httpClient = new HttpClient();
-		}
-	}
-
-	public async Task Flush(JsonObject data, CancellationToken token) {
-		var json = JsonSerializer.Serialize(data, _serializerOptions);
-
-		if (_optout) {
-			_log.Information("Telemetry not sent; opted out: " + Environment.NewLine + json);
-		} else {
-			_log.Information("Sending telemetry data to {url} (visit for more information): " + Environment.NewLine + json, ApiHost);
-			try {
-				await _httpClient.PostAsync(ApiHost, JsonContent.Create(data), token);
-			} catch (Exception ex) when (ex is not TaskCanceledException) {
-				_log.Error("Error when sending telemetry payload: {exception}", ex);
-			}
-		}
-	}
-
-	private void LogTelemetryMessage() {
-		var sb = new StringBuilder();
-
-		sb.AppendLine("");
-		sb.AppendLine("Telemetry");
-		sb.AppendLine("---------");
-
-		if (_optout) {
-			sb.AppendLine("You have opted out of sending telemetry by setting the EVENTSTORE_TELEMETRY_OPTOUT environment variable to true.");
-		} else {
-			sb.Append("EventStoreDB collects usage data in order to improve your experience. ");
-			sb.AppendLine("The data is anonymous and collected by Event Store Ltd.");
-			sb.AppendLine("You can opt out of sending telemetry by setting the EVENTSTORE_TELEMETRY_OPTOUT environment variable to true.");
-		}
-
-		sb.AppendLine("For more information visit https://eventstore.com/telemetry");
-		_log.Information(sb.ToString());
-	}
-}
diff --git a/src/EventStore.Core/Time/Clock.cs b/src/EventStore.Core/Time/Clock.cs
deleted file mode 100644
index 58dcc14062b..00000000000
--- a/src/EventStore.Core/Time/Clock.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-
-namespace EventStore.Core.Time {
-	public interface IClock {
-		Instant Now { get; }
-		long SecondsSinceEpoch { get; }
-	}
-
-	public class Clock : IClock {
-		public static Clock Instance { get; } = new();
-		private Clock() { }
-		public Instant Now => Instant.Now;
-		public long SecondsSinceEpoch => DateTimeOffset.UtcNow.ToUnixTimeSeconds();
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Checkpoint/Checkpoint.cs b/src/EventStore.Core/TransactionLog/Checkpoint/Checkpoint.cs
deleted file mode 100644
index 6ce144ee0e6..00000000000
--- a/src/EventStore.Core/TransactionLog/Checkpoint/Checkpoint.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace EventStore.Core.TransactionLog.Checkpoint {
-	public static class Checkpoint {
-		public const string Writer = "writer";
-		public const string Chaser = "chaser";
-		public const string Epoch = "epoch";
-		public const string Proposal = "proposal";
-		public const string Truncate = "truncate";
-		public const string Replication = "replication";
-		public const string Index = "index";
-		public const string StreamExistenceFilter = "streamExistenceFilter";
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Checkpoint/CheckpointMetric.cs b/src/EventStore.Core/TransactionLog/Checkpoint/CheckpointMetric.cs
deleted file mode 100644
index cfdef2cf436..00000000000
--- a/src/EventStore.Core/TransactionLog/Checkpoint/CheckpointMetric.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Metrics;
-
-namespace EventStore.Core.TransactionLog.Checkpoint {
-	// For now reading 'nonflushed' because the flushed values may give the impression
-	// of the checkpoints being further behind than they really are.
-	public class CheckpointMetric {
-		private readonly IReadOnlyCheckpoint[] _checkpoints;
-		private readonly Measurement<long>[] _measurements;
-		private readonly KeyValuePair<string, object>[][] _tagss;
-
-		public CheckpointMetric(Meter meter, string name, params IReadOnlyCheckpoint[] checkpoints) {
-			_checkpoints = checkpoints;
-			_measurements = new Measurement<long>[checkpoints.Length];
-			_tagss = new KeyValuePair<string, object>[checkpoints.Length][];
-
-			for (var i = 0; i < checkpoints.Length; i++) {
-				_tagss[i] = new KeyValuePair<string, object>[] {
-					new("name", checkpoints[i].Name),
-					new("read", "non-flushed"),
-				};
-			}
-
-			// we could consider using ObservableCounter, but ICheckpoint does allow the values to
-			// go down as well as up, so we are currently supporting that here.
-			meter.CreateObservableUpDownCounter(name, Observe);
-		}
-
-		private IEnumerable<Measurement<long>> Observe() {
-			for (var i = 0; i < _checkpoints.Length; i++) {
-				// looks like the Measurement constructor will allocate an array for the tags but the
-				// other constructor overloads appear to allocate two
-				_measurements[i] = new Measurement<long>(
-					value: _checkpoints[i].ReadNonFlushed(),
-					tags: _tagss[i].AsSpan());
-			}
-
-			return _measurements;
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Checkpoint/FileCheckpoint.cs b/src/EventStore.Core/TransactionLog/Checkpoint/FileCheckpoint.cs
deleted file mode 100644
index 5597833376a..00000000000
--- a/src/EventStore.Core/TransactionLog/Checkpoint/FileCheckpoint.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System;
-using System.IO;
-using System.Threading;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.TransactionLog.Checkpoint {
-	public class FileCheckpoint : ICheckpoint {
-		private readonly string _name;
-		private readonly string _filename;
-		private readonly FileStream _fileStream;
-
-		private long _last;
-		private long _lastFlushed;
-
-		private readonly BinaryWriter _writer;
-		private readonly BinaryReader _reader;
-
-		public FileCheckpoint(string filename)
-			: this(filename, Guid.NewGuid().ToString()) {
-		}
-
-		public FileCheckpoint(string filename, string name, bool mustExist = false, long initValue = 0) {
-			_filename = filename;
-			_name = name;
-			var old = File.Exists(filename);
-			_fileStream = new FileStream(_filename,
-				mustExist ? FileMode.Open : FileMode.OpenOrCreate,
-				FileAccess.ReadWrite,
-				FileShare.ReadWrite);
-			if (_fileStream.Length != 8)
-				_fileStream.SetLength(8);
-			_reader = new BinaryReader(_fileStream);
-			_writer = new BinaryWriter(_fileStream);
-			if (old)
-				_last = _lastFlushed = ReadCurrent();
-			else {
-				_last = initValue;
-				Flush();
-			}
-		}
-
-		private long ReadCurrent() {
-			_fileStream.Seek(0, SeekOrigin.Begin);
-			return _reader.ReadInt64();
-		}
-
-		public void Close(bool flush) {
-			if (flush)
-				Flush();
-
-			_reader.Close();
-			_writer.Close();
-			_fileStream.Close();
-		}
-
-		public string Name {
-			get { return _name; }
-		}
-
-		public void Write(long checkpoint) {
-			Interlocked.Exchange(ref _last, checkpoint);
-		}
-
-		public void Flush() {
-			var last = Interlocked.Read(ref _last);
-			if (last == _lastFlushed)
-				return;
-
-			_fileStream.Seek(0, SeekOrigin.Begin);
-			_writer.Write(last);
-
-			_fileStream.FlushToDisk();
-			Interlocked.Exchange(ref _lastFlushed, last);
-
-			OnFlushed(last);
-		}
-
-		public long Read() {
-			return Interlocked.Read(ref _lastFlushed);
-		}
-
-		public long ReadNonFlushed() {
-			return Interlocked.Read(ref _last);
-		}
-
-		public event Action<long> Flushed;
-
-		private void OnFlushed(long obj) {
-			var onFlushed = Flushed;
-			if (onFlushed != null)
-				onFlushed.Invoke(obj);
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Checkpoint/ICheckpoint.cs b/src/EventStore.Core/TransactionLog/Checkpoint/ICheckpoint.cs
deleted file mode 100644
index 6b7efce3d15..00000000000
--- a/src/EventStore.Core/TransactionLog/Checkpoint/ICheckpoint.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-
-namespace EventStore.Core.TransactionLog.Checkpoint {
-	public interface ICheckpoint : IReadOnlyCheckpoint {
-		void Write(long checkpoint);
-		void Flush();
-		void Close(bool flush);
-		IReadOnlyCheckpoint AsReadOnly() => this;
-	}
-
-	public interface IReadOnlyCheckpoint {
-		string Name { get; }
-		long Read();
-		long ReadNonFlushed();
-
-		event Action<long> Flushed;
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Checkpoint/InMemoryCheckpoint.cs b/src/EventStore.Core/TransactionLog/Checkpoint/InMemoryCheckpoint.cs
deleted file mode 100644
index 95ffa6cb8ee..00000000000
--- a/src/EventStore.Core/TransactionLog/Checkpoint/InMemoryCheckpoint.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.Threading;
-
-namespace EventStore.Core.TransactionLog.Checkpoint {
-	public class InMemoryCheckpoint : ICheckpoint {
-		public string Name {
-			get { return _name; }
-		}
-
-		private long _last;
-		private long _lastFlushed;
-		private readonly string _name;
-
-		public InMemoryCheckpoint(long initialValue) : this(Guid.NewGuid().ToString(), initialValue) {
-		}
-
-		public InMemoryCheckpoint() : this(Guid.NewGuid().ToString(), 0) {
-		}
-
-		public InMemoryCheckpoint(string name, long initValue = 0) {
-			_last = initValue;
-			_lastFlushed = initValue;
-			_name = name;
-		}
-
-		public void Write(long checkpoint) {
-			Interlocked.Exchange(ref _last, checkpoint);
-		}
-
-		public long Read() {
-			return Interlocked.Read(ref _lastFlushed);
-		}
-
-		public long ReadNonFlushed() {
-			return Interlocked.Read(ref _last);
-		}
-
-		public void Flush() {
-			var last = Interlocked.Read(ref _last);
-			if (last == _lastFlushed)
-				return;
-
-			Interlocked.Exchange(ref _lastFlushed, last);
-
-			OnFlushed(last);
-		}
-
-		public event Action<long> Flushed;
-
-		private void OnFlushed(long obj) {
-			var onFlushed = Flushed;
-			if (onFlushed != null)
-				onFlushed.Invoke(obj);
-		}
-
-		public void Close(bool flush) {
-			if (flush)
-				Flush();
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Checkpoint/MemoryMappedFileCheckpoint.cs b/src/EventStore.Core/TransactionLog/Checkpoint/MemoryMappedFileCheckpoint.cs
deleted file mode 100644
index 3929e22c123..00000000000
--- a/src/EventStore.Core/TransactionLog/Checkpoint/MemoryMappedFileCheckpoint.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-using System.IO;
-using System.IO.MemoryMappedFiles;
-using System.Threading;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.TransactionLog.Checkpoint {
-	public class MemoryMappedFileCheckpoint : ICheckpoint {
-		public string Name {
-			get { return _name; }
-		}
-
-		private readonly string _filename;
-		private readonly string _name;
-		private readonly FileStream _fileStream;
-		private readonly MemoryMappedFile _file;
-		private long _last;
-		private long _lastFlushed;
-		private readonly MemoryMappedViewAccessor _accessor;
-
-		public MemoryMappedFileCheckpoint(string filename) : this(filename, Guid.NewGuid().ToString()) {
-		}
-
-		public MemoryMappedFileCheckpoint(string filename, string name, bool mustExist = false,
-			long initValue = 0) {
-			_filename = filename;
-			_name = name;
-			var old = File.Exists(_filename);
-			_fileStream = new FileStream(_filename,
-				mustExist ? FileMode.Open : FileMode.OpenOrCreate,
-				FileAccess.ReadWrite,
-				FileShare.ReadWrite);
-			_fileStream.SetLength(sizeof(long));
-			_file = MemoryMappedFile.CreateFromFile(_fileStream,
-				null,
-				sizeof(long),
-				MemoryMappedFileAccess.ReadWrite,
-				HandleInheritability.None,
-				false);
-			_accessor = _file.CreateViewAccessor(0, sizeof(long));
-
-			if (old)
-				_last = _lastFlushed = _accessor.ReadInt64(0);
-			else {
-				_last = initValue;
-				Flush();
-			}
-		}
-
-		public void Close(bool flush) {
-			if (flush)
-				Flush();
-			_accessor.Dispose();
-			_file.Dispose();
-		}
-
-		public void Write(long checkpoint) {
-			Interlocked.Exchange(ref _last, checkpoint);
-		}
-
-		public void Flush() {
-			var last = Interlocked.Read(ref _last);
-			if (last == _lastFlushed)
-				return;
-
-			_accessor.Write(0, last);
-			_accessor.Flush();
-
-			_fileStream.FlushToDisk();
-
-			Interlocked.Exchange(ref _lastFlushed, last);
-
-			OnFlushed(last);
-		}
-
-		public long Read() {
-			return Interlocked.Read(ref _lastFlushed);
-		}
-
-		public long ReadNonFlushed() {
-			return Interlocked.Read(ref _last);
-		}
-
-		public event Action<long> Flushed;
-
-		private void OnFlushed(long obj) {
-			var onFlushed = Flushed;
-			if (onFlushed != null)
-				onFlushed.Invoke(obj);
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/ChunkFooter.cs b/src/EventStore.Core/TransactionLog/Chunks/ChunkFooter.cs
deleted file mode 100644
index 49deba9e2f0..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/ChunkFooter.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Common.Utils;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using DotNext.Buffers;
-using DotNext.Buffers.Binary;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
-
-namespace EventStore.Core.TransactionLog.Chunks {
-
-	// TODO: Consider struct instead of class
-	public sealed class ChunkFooter : IBinaryFormattable<ChunkFooter> {
-		public const int Size = TFConsts.ChunkFooterSize;
-		public const int ChecksumSize = 16;
-
-		// flags within single byte
-		public readonly bool IsCompleted;
-		public readonly bool IsMap12Bytes;
-
-		public readonly int PhysicalDataSize; // the size of a section of data in chunk
-
-		public readonly long
-			LogicalDataSize; // the size of a logical data size (after scavenge LogicalDataSize can be > physicalDataSize)
-
-		public readonly int MapSize;
-		public readonly byte[] MD5Hash; // TODO: Allocation can be removed with InlineArray
-
-		public readonly int MapCount; // calculated, not stored
-
-		public ChunkFooter(bool isCompleted, bool isMap12Bytes, int physicalDataSize, long logicalDataSize, int mapSize,
-			byte[] md5Hash) {
-			Ensure.Nonnegative(physicalDataSize, "physicalDataSize");
-			Ensure.Nonnegative(logicalDataSize, "logicalDataSize");
-			if (logicalDataSize < physicalDataSize)
-				throw new ArgumentOutOfRangeException("logicalDataSize",
-					string.Format("LogicalDataSize {0} is less than PhysicalDataSize {1}", logicalDataSize,
-						physicalDataSize));
-			Ensure.Nonnegative(mapSize, "mapSize");
-			Ensure.NotNull(md5Hash, "md5Hash");
-			if (md5Hash.Length != ChecksumSize)
-				throw new ArgumentException("MD5Hash is of wrong length.", "md5Hash");
-
-			IsCompleted = isCompleted;
-			IsMap12Bytes = isMap12Bytes;
-
-			PhysicalDataSize = physicalDataSize;
-			LogicalDataSize = logicalDataSize;
-			MapSize = mapSize;
-			MD5Hash = md5Hash;
-
-			var posMapSize = isMap12Bytes ? PosMap.FullSize : PosMap.DeprecatedSize;
-			if (MapSize % posMapSize != 0)
-				throw new Exception(string.Format("Wrong MapSize {0} -- not divisible by PosMap.Size {1}.", MapSize,
-					posMapSize));
-			MapCount = mapSize / posMapSize;
-		}
-
-		public ChunkFooter(ReadOnlySpan<byte> source) {
-			Debug.Assert(source.Length >= Size);
-
-			SpanReader<byte> reader = new(source);
-			byte flags = reader.Read();
-
-			IsCompleted = (flags & 1) is not 0;
-			IsMap12Bytes = (flags & 2) is not 0;
-			PhysicalDataSize = reader.ReadLittleEndian<int>();
-			LogicalDataSize = IsMap12Bytes
-				? reader.ReadLittleEndian<long>()
-				: reader.ReadLittleEndian<int>();
-
-			MapSize = reader.ReadLittleEndian<int>();
-			reader.ConsumedCount = Size - ChecksumSize;
-			MD5Hash = reader.ReadToEnd().ToArray();
-
-			var posMapSize = IsMap12Bytes ? PosMap.FullSize : PosMap.DeprecatedSize;
-			if (MapSize % posMapSize is not 0) {
-				throw new Exception(string.Format("Wrong MapSize {0} -- not divisible by PosMap.Size {1}.", MapSize,
-					posMapSize));
-			}
-
-			MapCount = MapSize / posMapSize;
-		}
-
-		static int IBinaryFormattable<ChunkFooter>.Size => Size;
-
-		public void Format(Span<byte> destination) {
-			Debug.Assert(destination.Length >= Size);
-
-			SpanWriter<byte> writer = new(destination);
-			int flags = Unsafe.BitCast<bool, byte>(IsCompleted)
-				| Unsafe.BitCast<bool, byte>(IsMap12Bytes) << 1;
-
-			writer.Add((byte)flags);
-			writer.WriteLittleEndian(PhysicalDataSize);
-			if (IsMap12Bytes)
-				writer.WriteLittleEndian(LogicalDataSize);
-			else
-				writer.WriteLittleEndian((int)LogicalDataSize);
-
-			writer.WriteLittleEndian(MapSize);
-			writer.WrittenCount = Size - ChecksumSize;
-			writer.Write(MD5Hash);
-		}
-
-		static ChunkFooter IBinaryFormattable<ChunkFooter>.Parse(ReadOnlySpan<byte> source)
-			=> new(source);
-
-		public byte[] AsByteArray() {
-			var array = new byte[Size];
-			Format(array);
-			return array;
-		}
-
-		[SkipLocalsInit]
-		public static ChunkFooter FromStream(Stream stream) {
-			Span<byte> buffer = stackalloc byte[Size];
-			stream.ReadExactly(buffer);
-			return new(buffer);
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/ChunkHeader.cs b/src/EventStore.Core/TransactionLog/Chunks/ChunkHeader.cs
deleted file mode 100644
index d4fda892569..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/ChunkHeader.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.CompilerServices;
-using EventStore.Common.Utils;
-using EventStore.Core.Exceptions;
-using EventStore.Core.Index;
-using DotNext.Buffers;
-using DotNext.Buffers.Binary;
-using EventStore.Plugins.Transforms;
-using ChunkVersions = EventStore.Core.TransactionLog.Chunks.TFChunk.TFChunk.ChunkVersions;
-
-namespace EventStore.Core.TransactionLog.Chunks {
-
-	// TODO: Consider struct instead of class
-	public sealed class ChunkHeader : IBinaryFormattable<ChunkHeader> {
-		public const int Size = TFConsts.ChunkHeaderSize;
-
-		public readonly long ChunkStartPosition; // return ChunkStartNumber * (long)ChunkSize;
-		public readonly long ChunkEndPosition; // return (ChunkEndNumber + 1) * (long)ChunkSize;
-
-		public readonly byte Version;
-		public readonly byte MinCompatibleVersion; // the minimum version of the chunk format that the db needs to "understand" to be able to read/write to this chunk
-		public readonly int ChunkSize;
-		public readonly int ChunkStartNumber;
-		public readonly int ChunkEndNumber;
-		public readonly bool IsScavenged; // uses 4 bytes (legacy)
-		public readonly Guid ChunkId;
-		public readonly TransformType TransformType;
-
-		public ChunkHeader(byte version, byte minCompatibleVersion, int chunkSize, int chunkStartNumber, int chunkEndNumber, bool isScavenged,
-			Guid chunkId, TransformType transformType) {
-			Ensure.Nonnegative(version, "version");
-			Ensure.Nonnegative(minCompatibleVersion, "minCompatibleVersion");
-			Ensure.Positive(chunkSize, "chunkSize");
-			Ensure.Nonnegative(chunkStartNumber, "chunkStartNumber");
-			Ensure.Nonnegative(chunkEndNumber, "chunkEndNumber");
-			if (chunkStartNumber > chunkEndNumber)
-				throw new ArgumentOutOfRangeException("chunkStartNumber",
-					"chunkStartNumber is greater than ChunkEndNumber.");
-
-			Version = version;
-			MinCompatibleVersion = minCompatibleVersion;
-			ChunkSize = chunkSize;
-			ChunkStartNumber = chunkStartNumber;
-			ChunkEndNumber = chunkEndNumber;
-			IsScavenged = isScavenged;
-			ChunkId = chunkId;
-			TransformType = transformType;
-
-			ChunkStartPosition = ChunkStartNumber * (long)ChunkSize;
-			ChunkEndPosition = (ChunkEndNumber + 1) * (long)ChunkSize;
-		}
-
-		public ChunkHeader(ReadOnlySpan<byte> source) {
-			Debug.Assert(source.Length >= Size);
-
-			SpanReader<byte> reader = new(source);
-
-			if ((FileType)reader.Read() is not FileType.ChunkFile)
-				throw new CorruptDatabaseException(new InvalidFileException());
-
-			MinCompatibleVersion = reader.Read();
-			Debug.Assert(MinCompatibleVersion >= 0);
-
-			ChunkSize = reader.ReadLittleEndian<int>();
-			Debug.Assert(ChunkSize >= 0);
-
-			ChunkStartNumber = reader.ReadLittleEndian<int>();
-			Debug.Assert(ChunkStartNumber >= 0);
-
-			ChunkEndNumber = reader.ReadLittleEndian<int>();
-			Debug.Assert(ChunkEndNumber >= 0);
-
-			IsScavenged = reader.ReadLittleEndian<int>() > 0;
-			ChunkId = new(reader.Read(16));
-
-			Version = reader.Read();
-			Debug.Assert(Version >= 0);
-
-			if (Version == 0)
-				Version = MinCompatibleVersion;
-			Debug.Assert(Version >= MinCompatibleVersion);
-
-			if (Version >= (byte)ChunkVersions.Transformed)
-				TransformType = (TransformType) reader.Read();
-			else
-				TransformType = TransformType.Identity;
-
-			ChunkStartPosition = ChunkStartNumber * (long)ChunkSize;
-			ChunkEndPosition = (ChunkEndNumber + 1) * (long)ChunkSize;
-		}
-
-		static int IBinaryFormattable<ChunkHeader>.Size => Size;
-
-		public void Format(Span<byte> destination) {
-			Debug.Assert(destination.Length >= Size);
-
-			SpanWriter<byte> writer = new(destination);
-			writer.Add((byte)FileType.ChunkFile);
-			writer.Add(MinCompatibleVersion);
-			writer.WriteLittleEndian(ChunkSize);
-			writer.WriteLittleEndian(ChunkStartNumber);
-			writer.WriteLittleEndian(ChunkEndNumber);
-			writer.WriteLittleEndian<int>(Unsafe.BitCast<bool, byte>(IsScavenged));
-
-			Span<byte> guidBuffer = stackalloc byte[16];
-			ChunkId.TryWriteBytes(guidBuffer);
-			writer.Write(guidBuffer);
-
-			if (Version >= (byte)ChunkVersions.Transformed)
-				// we started to use this byte of the chunk header to store `Version` as from `ChunkVersions.Transformed`
-				// so, we don't write it for older versions to keep the previous formats the same.
-				writer.Add(Version);
-
-			if (Version >= (byte)ChunkVersions.Transformed)
-				writer.Add((byte)TransformType);
-		}
-
-		static ChunkHeader IBinaryFormattable<ChunkHeader>.Parse(ReadOnlySpan<byte> source)
-			=> new(source);
-
-		public byte[] AsByteArray() {
-			var array = new byte[Size];
-			Format(array);
-
-			return array;
-		}
-
-		[SkipLocalsInit]
-		public static ChunkHeader FromStream(Stream stream) {
-			Span<byte> buffer = stackalloc byte[Size];
-			stream.ReadExactly(buffer);
-			return new(buffer);
-		}
-
-		public long GetLocalLogPosition(long globalLogicalPosition) {
-			if (globalLogicalPosition < ChunkStartPosition || globalLogicalPosition > ChunkEndPosition) {
-				throw new Exception(
-					$"globalLogicalPosition {globalLogicalPosition} is out of chunk logical positions [{ChunkStartPosition}, {ChunkEndPosition}].");
-			}
-
-			return globalLogicalPosition - ChunkStartPosition;
-		}
-
-		public long GetGlobalLogPosition(long localLogicalPosition) {
-			if (ChunkStartPosition + localLogicalPosition > ChunkEndPosition) {
-				throw new Exception(
-					$"localLogicalPosition {localLogicalPosition} is out of chunk logical positions [{ChunkStartPosition}, {ChunkEndPosition}].");
-			}
-
-			return ChunkStartPosition + localLogicalPosition;
-		}
-
-		public override string ToString() {
-			return string.Format(
-				"Version: {0}, ChunkSize: {1}, ChunkStartNumber: {2}, ChunkEndNumber: {3}, IsScavenged: {4}, ChunkId: {5}\n" +
-				"TransformType: {6}, ChunkStartPosition: {7}, ChunkEndPosition: {8}, ChunkFullSize: {9}",
-				Version,
-				ChunkSize,
-				ChunkStartNumber,
-				ChunkEndNumber,
-				IsScavenged,
-				ChunkId,
-				TransformType,
-				ChunkStartPosition,
-				ChunkEndPosition,
-				ChunkEndPosition - ChunkStartPosition);
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/ITFChunkScavengerLog.cs b/src/EventStore.Core/TransactionLog/Chunks/ITFChunkScavengerLog.cs
deleted file mode 100644
index ffc2315bd30..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/ITFChunkScavengerLog.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using EventStore.Core.Index;
-
-namespace EventStore.Core.TransactionLog.Chunks {
-	public interface ITFChunkScavengerLog : IIndexScavengerLog {
-		string ScavengeId { get; }
-
-		long SpaceSaved { get; }
-
-		void ScavengeStarted();
-
-		void ScavengeStarted(bool alwaysKeepScavenged, bool mergeChunks, int startFromChunk, int threads);
-
-		void ChunksScavenged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, long spaceSaved);
-
-		void ChunksNotScavenged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, string errorMessage);
-
-		void ChunksMerged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, long spaceSaved);
-
-		void ChunksNotMerged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, string errorMessage);
-
-		void ScavengeCompleted(ScavengeResult result, string error, TimeSpan elapsed);
-	}
-
-	public enum ScavengeResult {
-		Success,
-		Stopped,
-		Errored,
-		Interrupted,
-	}
-
-	public enum LastScavengeResult {
-		Unknown,
-		InProgress,
-		Success,
-		Stopped,
-		Errored,
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/ITFChunkScavengerLogManager.cs b/src/EventStore.Core/TransactionLog/Chunks/ITFChunkScavengerLogManager.cs
deleted file mode 100644
index e0b7c84efa9..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/ITFChunkScavengerLogManager.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EventStore.Core.TransactionLog.Chunks {
-	public interface ITFChunkScavengerLogManager {
-		void Initialise();
-
-		ITFChunkScavengerLog CreateLog();
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunk/BulkReadResult.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunk/BulkReadResult.cs
deleted file mode 100644
index cc9651aeca0..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFChunk/BulkReadResult.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace EventStore.Core.TransactionLog.Chunks.TFChunk {
-	public struct BulkReadResult {
-		public readonly int OldPosition;
-		public readonly int BytesRead;
-		public readonly bool IsEOF;
-
-		public BulkReadResult(int oldPosition, int bytesRead, bool isEof) {
-			OldPosition = oldPosition;
-			BytesRead = bytesRead;
-			IsEOF = isEof;
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunk/PosMap.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunk/PosMap.cs
deleted file mode 100644
index 30ff724158f..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFChunk/PosMap.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using DotNext.Buffers;
-using DotNext.Buffers.Binary;
-
-namespace EventStore.Core.TransactionLog.Chunks.TFChunk {
-	public struct PosMap : IBinaryFormattable<PosMap> {
-		public const int FullSize = sizeof(long) + sizeof(int);
-		public const int DeprecatedSize = sizeof(int) + sizeof(int);
-
-		public readonly long LogPos;
-		public readonly int ActualPos;
-
-		public PosMap(long logPos, int actualPos) {
-			LogPos = logPos;
-			ActualPos = actualPos;
-		}
-
-		// for new format only
-		public PosMap(ReadOnlySpan<byte> source){
-			Debug.Assert(source.Length >= FullSize);
-
-			SpanReader<byte> reader = new(source);
-			ActualPos = reader.ReadLittleEndian<int>();
-			LogPos = reader.ReadLittleEndian<long>();
-		}
-
-		static int IBinaryFormattable<PosMap>.Size => FullSize;
-
-		static PosMap IBinaryFormattable<PosMap>.Parse(ReadOnlySpan<byte> source)
-			=> FromNewFormat(source);
-
-		public static PosMap FromNewFormat(ReadOnlySpan<byte> source)
-			=> new(source);
-
-		public static PosMap FromNewFormat(BinaryReader reader) {
-			var actualPos = reader.ReadInt32();
-			var logPos = reader.ReadInt64();
-			return new PosMap(logPos, actualPos);
-		}
-
-		public static PosMap FromOldFormat(ReadOnlySpan<byte> source) {
-			SpanReader<byte> reader = new(source);
-			var posmap = reader.ReadLittleEndian<ulong>();
-			var logPos = (int)(posmap >>> 32);
-			var actualPos = (int)(posmap & 0xFFFFFFFF);
-			return new(logPos, actualPos);
-		}
-
-		public static PosMap FromOldFormat(BinaryReader reader) {
-			Span<byte> buffer = stackalloc byte[DeprecatedSize];
-			var bytesRead = reader.Read(buffer);
-			return FromOldFormat(buffer.Slice(0, bytesRead));
-		}
-
-		public readonly void Write(BinaryWriter writer) {
-			Span<byte> buffer = stackalloc byte[FullSize];
-			Format(buffer);
-			writer.Write(buffer);
-		}
-
-		public readonly void Format(Span<byte> destination){
-			SpanWriter<byte> writer = new(destination);
-			writer.WriteLittleEndian(ActualPos);
-			writer.WriteLittleEndian(LogPos);
-		}
-
-		public readonly override string ToString() {
-			return string.Format("LogPos: {0}, ActualPos: {1}", LogPos, ActualPos);
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunk/ReaderWorkItem.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunk/ReaderWorkItem.cs
deleted file mode 100644
index f6b07573e57..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFChunk/ReaderWorkItem.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System.Diagnostics;
-using System.IO;
-using System.Text;
-using DotNext.IO;
-using EventStore.Plugins.Transforms;
-using Microsoft.Win32.SafeHandles;
-
-namespace EventStore.Core.TransactionLog.Chunks.TFChunk {
-	internal sealed class ReaderWorkItem : BinaryReader {
-		public const int BufferSize = 8192;
-
-		// if item was taken from the pool, the field contains position within the array (>= 0)
-		private readonly int _positionInPool = -1;
-
-		public unsafe ReaderWorkItem(Stream sharedStream, IChunkReadTransform chunkReadTransform)
-			: base(CreateTransformedMemoryStream(sharedStream, chunkReadTransform), Encoding.UTF8, leaveOpen: true) {
-			IsMemory = true;
-		}
-
-		public ReaderWorkItem(SafeFileHandle handle, IChunkReadTransform chunkReadTransform)
-			: base(CreateTransformedFileStream(handle, chunkReadTransform), Encoding.UTF8, leaveOpen: false) {
-			IsMemory = false;
-		}
-
-		private static Stream CreateTransformedMemoryStream(Stream memStream, IChunkReadTransform chunkReadTransform) {
-			return chunkReadTransform.TransformData(new ChunkDataReadStream(memStream));
-		}
-
-		private static ChunkDataReadStream CreateTransformedFileStream(SafeFileHandle handle, IChunkReadTransform chunkReadTransform) {
-			var fileStream = new BufferedStream(handle.AsUnbufferedStream(FileAccess.Read), BufferSize);
-			return chunkReadTransform.TransformData(new ChunkDataReadStream(fileStream));
-		}
-
-		public bool IsMemory { get; }
-
-		public int PositionInPool {
-			get => _positionInPool;
-			init {
-				Debug.Assert(value >= 0);
-
-				_positionInPool = value;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunk/TFChunk.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunk/TFChunk.cs
deleted file mode 100644
index 9fda86451d0..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFChunk/TFChunk.cs
+++ /dev/null
@@ -1,1394 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Security.Cryptography;
-using System.Threading;
-using System.Threading.Tasks;
-using DotNext.Buffers;
-using DotNext.Collections.Concurrent;
-using DotNext.Diagnostics;
-using DotNext.IO;
-using DotNext.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Exceptions;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.Transforms.Identity;
-using EventStore.Core.Util;
-using EventStore.Plugins.Transforms;
-using Microsoft.Win32.SafeHandles;
-using ILogger = Serilog.ILogger;
-using MD5 = EventStore.Core.Hashing.MD5;
-
-namespace EventStore.Core.TransactionLog.Chunks.TFChunk {
-	public unsafe partial class TFChunk : IDisposable {
-		public enum ChunkVersions : byte {
-			OriginalNotUsed = 1,
-			Unaligned = 2,
-			Aligned = 3,
-			Transformed = 4,
-		}
-
-		public const byte CurrentChunkVersion = (byte) ChunkVersions.Transformed;
-		private const int AlignmentSize = 4096;
-
-		private static readonly ILogger Log = Serilog.Log.ForContext<TFChunk>();
-
-		public bool IsReadOnly {
-			get { return Interlocked.CompareExchange(ref _isReadOnly, 0, 0) == 1; }
-			set { Interlocked.Exchange(ref _isReadOnly, value ? 1 : 0); }
-		}
-
-		public bool IsCached {
-			get { return _cacheStatus == CacheStatus.Cached; }
-		}
-
-		// the logical size of (untransformed) data (could be > PhysicalDataSize if scavenged chunk)
-		public long LogicalDataSize {
-			get { return Interlocked.Read(ref _logicalDataSize); }
-		}
-
-		// the physical size of (untransformed) data
-		public int PhysicalDataSize {
-			get { return _physicalDataSize; }
-		}
-
-		public string FileName {
-			get { return _filename; }
-		}
-
-		public int FileSize {
-			get { return _fileSize; }
-		}
-
-		public ChunkHeader ChunkHeader {
-			get { return _chunkHeader; }
-		}
-
-		public ChunkFooter ChunkFooter {
-			get { return _chunkFooter; }
-		}
-
-		public ReadOnlyMemory<byte> TransformHeader {
-			get { return _transformHeader; }
-		}
-
-		public readonly int MidpointsDepth;
-
-		public int RawWriterPosition {
-			get {
-				return (int)(_writerWorkItem?.WorkingStream.Position
-					?? throw new InvalidOperationException(string.Format("TFChunk {0} is not in write mode.", _filename)));
-			}
-		}
-
-		private readonly bool _inMem;
-		private readonly string _filename;
-		private SafeFileHandle _handle;
-		private int _fileSize;
-
-		// This field establishes happens-before relationship with _fileStreams as follows:
-		// if _isReadOnly is not 0, then _fileStreams fully initialized
-		private int _isReadOnly;
-		private ChunkHeader _chunkHeader;
-		private ChunkFooter _chunkFooter;
-
-		private ReaderWorkItemPool _fileStreams;
-		private ReaderWorkItemPool _memStreams;
-
-		// This field established happens-before relationship with _memStreams as follows:
-		// if _memStreams has at least one available item in the pool then _sharedMemStream != null
-		private Stream _sharedMemStream;
-		private int _fileStreamCount;
-		private int _memStreamCount;
-		private int _cleanedUpFileStreams;
-
-		private WriterWorkItem _writerWorkItem;
-		private long _logicalDataSize;
-		private volatile int _physicalDataSize;
-
-		// the lock protects all three parts of the caching process:
-		// CacheInMemory, UnCacheFromMemory and TryDestructMemStreams
-		// so that the variables _cacheStatus, _cachedData, and _cachedLength are synchronized by the lock,
-		// and so is the creation and removal of the mem readers.
-		// previously TryDestructMemStreams could run concurrently with CacheInMemory,
-		// potentially causing problems.
-		private readonly object _cachedDataLock = new();
-		private volatile nint _cachedData;
-		// When the chunk is Cached/Uncaching, _cachedDataTransformed indicates whether _cachedData has had the transformation applied
-		private bool _cachedDataTransformed;
-		private int _cachedLength;
-		private volatile CacheStatus _cacheStatus;
-
-		private enum CacheStatus {
-			// The default state.
-			// CacheInMemory can transition us to Cached
-			// invariants: _cachedData == IntPtr.Zero, _memStreamCount == 0
-			Uncached = 0,
-
-			// UnCacheFromMemory can transition us to Uncaching
-			// invariants: _cachedData != IntPtr.Zero, _memStreamCount > 0
-			Cached,
-
-			// TryDestructMemStreams can transition us to Uncached
-			// The chunk is still cached but the process of uncaching has been started by
-			// UnCacheFromMemory. We are waiting for readers to be returned.
-			// invariants: _cachedData != IntPtr.Zero, _memStreamCount > 0
-			Uncaching,
-		}
-
-		private readonly ManualResetEventSlim _destroyEvent = new ManualResetEventSlim(false);
-		private volatile bool _selfdestructin54321;
-		private volatile bool _deleteFile;
-		private readonly bool _unbuffered;
-		private readonly bool _writeThrough;
-
-		// https://learn.microsoft.com/en-US/troubleshoot/windows-server/application-management/operating-system-performance-degrades
-		private readonly bool _reduceFileCachePressure;
-
-		private IChunkReadSide _readSide;
-
-		private IChunkTransform _transform;
-		private ReadOnlyMemory<byte> _transformHeader;
-
-		private TFChunk(string filename,
-			int midpointsDepth,
-			bool inMem,
-			bool unbuffered,
-			bool writethrough,
-			bool reduceFileCachePressure) {
-			Ensure.NotNullOrEmpty(filename, "filename");
-			Ensure.Nonnegative(midpointsDepth, "midpointsDepth");
-
-			_filename = filename;
-			MidpointsDepth = midpointsDepth;
-			_inMem = inMem;
-			_unbuffered = unbuffered;
-			_writeThrough = writethrough;
-			_reduceFileCachePressure = reduceFileCachePressure;
-			_memStreams = new();
-			_fileStreams = new();
-		}
-
-		~TFChunk() {
-			FreeCachedData();
-		}
-
-		public static TFChunk FromCompletedFile(string filename, bool verifyHash, bool unbufferedRead,
-			ITransactionFileTracker tracker, Func<TransformType, IChunkTransformFactory> getTransformFactory,
-			bool optimizeReadSideCache = false, bool reduceFileCachePressure = false) {
-			var chunk = new TFChunk(filename,
-				TFConsts.MidpointsDepth, false, unbufferedRead, false, reduceFileCachePressure);
-			try {
-				chunk.InitCompleted(verifyHash, optimizeReadSideCache, tracker, getTransformFactory);
-			} catch {
-				chunk.Dispose();
-				throw;
-			}
-
-			return chunk;
-		}
-
-		public static TFChunk FromOngoingFile(string filename, int writePosition, bool unbuffered,
-			bool writethrough, bool reduceFileCachePressure, ITransactionFileTracker tracker,
-			Func<TransformType, IChunkTransformFactory> getTransformFactory) {
-			var chunk = new TFChunk(filename,
-				TFConsts.MidpointsDepth,
-				false,
-				unbuffered,
-				writethrough,
-				reduceFileCachePressure);
-			try {
-				chunk.InitOngoing(writePosition, tracker, getTransformFactory);
-			} catch {
-				chunk.Dispose();
-				throw;
-			}
-
-			return chunk;
-		}
-
-		public static TFChunk CreateNew(string filename,
-			int chunkDataSize,
-			int chunkStartNumber,
-			int chunkEndNumber,
-			bool isScavenged,
-			bool inMem,
-			bool unbuffered,
-			bool writethrough,
-			bool reduceFileCachePressure,
-			ITransactionFileTracker tracker,
-			IChunkTransformFactory transformFactory) {
-			var version = CurrentChunkVersion;
-			var minCompatibleVersion = transformFactory.Type == TransformType.Identity
-				? (byte) ChunkVersions.Aligned
-				: version;
-
-			var chunkHeader = new ChunkHeader(version, minCompatibleVersion, chunkDataSize, chunkStartNumber, chunkEndNumber,
-				isScavenged, Guid.NewGuid(), transformFactory.Type);
-			var fileSize = GetAlignedSize(transformFactory.TransformDataPosition(chunkDataSize) + ChunkHeader.Size + ChunkFooter.Size);
-
-			return CreateWithHeader(filename, chunkHeader, fileSize, inMem, unbuffered, writethrough,
-				reduceFileCachePressure, tracker, transformFactory, transformFactory.CreateTransformHeader());
-		}
-
-		public static TFChunk CreateWithHeader(string filename,
-			ChunkHeader header,
-			int fileSize,
-			bool inMem,
-			bool unbuffered,
-			bool writethrough,
-			bool reduceFileCachePressure,
-			ITransactionFileTracker tracker,
-			IChunkTransformFactory transformFactory,
-			ReadOnlyMemory<byte> transformHeader) {
-			var chunk = new TFChunk(filename,
-				TFConsts.MidpointsDepth,
-				inMem,
-				unbuffered,
-				writethrough,
-				reduceFileCachePressure);
-			try {
-				chunk.InitNew(header, fileSize, tracker, transformFactory, transformHeader);
-			} catch {
-				chunk.Dispose();
-				throw;
-			}
-
-			return chunk;
-		}
-
-		private void InitCompleted(bool verifyHash, bool optimizeReadSideCache, ITransactionFileTracker tracker,
-			Func<TransformType, IChunkTransformFactory> getTransformFactory) {
-			var fileInfo = new FileInfo(_filename);
-			if (!fileInfo.Exists)
-				throw new CorruptDatabaseException(new ChunkNotFoundException(_filename));
-
-			_fileSize = (int)fileInfo.Length;
-
-			_handle = File.OpenHandle(
-				_filename,
-				FileMode.Open,
-				FileAccess.Read,
-				FileShare.ReadWrite,
-				_reduceFileCachePressure ? FileOptions.None : FileOptions.RandomAccess);
-
-			IsReadOnly = true;
-			SetAttributes(_filename, true);
-
-			using (var stream = _handle.AsUnbufferedStream(FileAccess.Read)) {
-				_chunkHeader = ReadHeader(stream);
-				Log.Debug("Opened completed {chunk} as version {version} (min. compatible version: {minCompatibleVersion})", _filename, _chunkHeader.Version, _chunkHeader.MinCompatibleVersion);
-
-				if (_chunkHeader.MinCompatibleVersion > CurrentChunkVersion)
-					throw new CorruptDatabaseException(new UnsupportedFileVersionException(_filename, _chunkHeader.MinCompatibleVersion,
-						CurrentChunkVersion));
-
-				var transformFactory = getTransformFactory(_chunkHeader.TransformType);
-				_transformHeader = transformFactory.ReadTransformHeader(stream);
-				_transform = transformFactory.CreateTransform(_transformHeader);
-
-				_chunkFooter = ReadFooter(stream);
-				if (!_chunkFooter.IsCompleted) {
-					throw new CorruptDatabaseException(new BadChunkInDatabaseException(
-						string.Format("Chunk file '{0}' should be completed, but is not.", _filename)));
-				}
-
-				_logicalDataSize = _chunkFooter.LogicalDataSize;
-				_physicalDataSize = _chunkFooter.PhysicalDataSize;
-			}
-
-			CreateReaderStreams();
-
-			_readSide = _chunkHeader.IsScavenged
-				? new TFChunkReadSideScavenged(this, optimizeReadSideCache, tracker)
-				: new TFChunkReadSideUnscavenged(this, tracker);
-
-			// do not actually cache now because it is too slow when opening the database
-			_readSide.RequestCaching();
-
-			if (verifyHash)
-				VerifyFileHash();
-		}
-
-		private void InitNew(ChunkHeader chunkHeader, int fileSize, ITransactionFileTracker tracker,
-			IChunkTransformFactory transformFactory, ReadOnlyMemory<byte> transformHeader) {
-			Ensure.NotNull(chunkHeader, "chunkHeader");
-			Ensure.Positive(fileSize, "fileSize");
-
-			_fileSize = fileSize;
-			IsReadOnly = false;
-			_chunkHeader = chunkHeader;
-			_physicalDataSize = 0;
-			_logicalDataSize = 0;
-			_transformHeader = transformHeader;
-			_transform = transformFactory.CreateTransform(_transformHeader);
-
-			if (_inMem)
-				CreateInMemChunk(chunkHeader, fileSize, transformHeader);
-			else {
-				CreateWriterWorkItemForNewChunk(chunkHeader, fileSize, transformHeader);
-				SetAttributes(_filename, false);
-			}
-
-			_readSide = chunkHeader.IsScavenged
-				? new TFChunkReadSideScavenged(this, false, tracker)
-				: new TFChunkReadSideUnscavenged(this, tracker);
-
-			// Always cache the active chunk
-			// If the chunk is scavenged we will definitely mark it readonly before we are done writing to it.
-			if (!chunkHeader.IsScavenged) {
-				CacheInMemory();
-			}
-		}
-
-		private void InitOngoing(int writePosition, ITransactionFileTracker tracker,
-			Func<TransformType, IChunkTransformFactory> getTransformFactory) {
-			Ensure.Nonnegative(writePosition, "writePosition");
-			var fileInfo = new FileInfo(_filename);
-			if (!fileInfo.Exists)
-				throw new CorruptDatabaseException(new ChunkNotFoundException(_filename));
-
-			_fileSize = (int)fileInfo.Length;
-			IsReadOnly = false;
-			_physicalDataSize = writePosition;
-			_logicalDataSize = writePosition;
-
-			SetAttributes(_filename, false);
-			CreateWriterWorkItemForExistingChunk(writePosition, getTransformFactory, out _chunkHeader);
-			Log.Debug("Opened ongoing {chunk} as version {version} (min. compatible version: {minCompatibleVersion})", _filename, _chunkHeader.Version, _chunkHeader.MinCompatibleVersion);
-
-			if (_chunkHeader.MinCompatibleVersion > CurrentChunkVersion)
-				throw new CorruptDatabaseException(new UnsupportedFileVersionException(_filename, _chunkHeader.MinCompatibleVersion,
-					CurrentChunkVersion));
-
-			_readSide = new TFChunkReadSideUnscavenged(this, tracker);
-
-			// Always cache the active chunk
-			CacheInMemory();
-		}
-
-		// If one file stream writes to a file, and another file stream happens to have that part of
-		// the same file already in its buffer, the buffer is not (any longer) invalidated and a read from
-		// the second file stream will not contain the write.
-		// We therefore only read from memory while the chunk is still being written to, and only create
-		// the file streams when the chunk is being completed.
-		private void CreateReaderStreams() {
-			_fileStreams.Reuse();
-			Interlocked.Add(ref _fileStreamCount, IndexPool.Capacity);
-		}
-
-		private void CreateInMemChunk(ChunkHeader chunkHeader, int fileSize, ReadOnlyMemory<byte> transformHeader) {
-			var md5 = MD5.Create();
-
-			// ALLOCATE MEM
-			_cacheStatus = CacheStatus.Cached;
-			_cachedLength = fileSize;
-			_cachedData = Marshal.AllocHGlobal(_cachedLength);
-			_cachedDataTransformed = true;
-			GC.AddMemoryPressure(_cachedLength);
-
-
-			// WRITE HEADERS
-			using (var headerStream = new UnmanagedMemoryStream((byte*)_cachedData, _cachedLength, _cachedLength, FileAccess.ReadWrite)) {
-				WriteHeader(md5, headerStream, chunkHeader);
-				WriteTransformHeader(md5, headerStream, transformHeader);
-			}
-
-			// WRITER STREAM
-			var writerWorkItem = new WriterWorkItem(_cachedData, _cachedLength, md5, _transform.Write, ChunkHeader.Size + transformHeader.Length);
-
-			// READER STREAMS
-			_sharedMemStream = CreateSharedMemoryStream();
-			Interlocked.Add(ref _memStreamCount, IndexPool.Capacity);
-			_memStreams.Reuse();
-
-			// should never happen in practice because this function is called from the static TFChunk constructors
-			Debug.Assert(!_selfdestructin54321);
-
-			_writerWorkItem = writerWorkItem;
-		}
-
-		private Stream CreateSharedMemoryStream() {
-			Debug.Assert(_cachedData is not 0);
-			Debug.Assert(_cachedLength > 0);
-
-			ReadOnlyMemory<byte> memoryView = UnmanagedMemory.AsMemory((byte*)_cachedData, _cachedLength);
-			return StreamSource.AsSharedStream(new(memoryView), compatWithAsync: false);
-		}
-
-		private FileOptions WritableHandleOptions {
-			get {
-				var options = _reduceFileCachePressure ? FileOptions.None : FileOptions.RandomAccess;
-				if (_writeThrough)
-					options |= FileOptions.WriteThrough;
-
-				return options;
-			}
-		}
-
-		private void CreateWriterWorkItemForNewChunk(ChunkHeader chunkHeader, int fileSize, ReadOnlyMemory<byte> transformHeader) {
-			var md5 = MD5.Create();
-
-			// create temp file first and set desired length
-			// if there is not enough disk space or something else prevents file to be resized as desired
-			// we'll end up with empty temp file, which won't trigger false error on next DB verification
-			var tempFilename = string.Format("{0}.{1}.tmp", _filename, Guid.NewGuid());
-			var options = new FileStreamOptions {
-				Mode = FileMode.CreateNew,
-				Access = FileAccess.ReadWrite,
-				Share = FileShare.Read,
-				Options = FileOptions.SequentialScan,
-				PreallocationSize = fileSize, // avoid fragmentation of file
-				BufferSize = WriterWorkItem.BufferSize,
-			};
-
-			var tempFile = new FileStream(tempFilename, options);
-			tempFile.SetLength(fileSize);
-
-			// we need to write header into temp file before moving it into correct chunk place, so in case of crash
-			// we don't end up with seemingly valid chunk file with no header at all...
-			WriteHeader(md5, tempFile, chunkHeader);
-			WriteTransformHeader(md5, tempFile, transformHeader);
-
-			tempFile.FlushToDisk();
-			tempFile.Close();
-			File.Move(tempFilename, _filename);
-
-			_handle = File.OpenHandle(_filename, FileMode.Open, FileAccess.ReadWrite, FileShare.Read, WritableHandleOptions);
-			_writerWorkItem = new(_handle, md5, _unbuffered, _transform.Write, ChunkHeader.Size + transformHeader.Length);
-			Flush(); // persist file move result
-		}
-
-		private void CreateWriterWorkItemForExistingChunk(int writePosition,
-			Func<TransformType, IChunkTransformFactory> getTransformFactory, out ChunkHeader chunkHeader) {
-			_handle = File.OpenHandle(_filename, FileMode.Open, FileAccess.ReadWrite, FileShare.Read, WritableHandleOptions);
-
-			try {
-				using var stream = _handle.AsUnbufferedStream(FileAccess.ReadWrite);
-				chunkHeader = ReadHeader(stream);
-				if (chunkHeader.Version == (byte)ChunkVersions.Unaligned) {
-					Log.Debug("Upgrading ongoing file {chunk} to version 3", _filename);
-					var newHeader = new ChunkHeader((byte)ChunkVersions.Aligned,
-						(byte)ChunkVersions.Aligned,
-						chunkHeader.ChunkSize,
-						chunkHeader.ChunkStartNumber,
-						chunkHeader.ChunkEndNumber,
-						false,
-						chunkHeader.ChunkId,
-						chunkHeader.TransformType);
-					stream.Seek(0, SeekOrigin.Begin);
-					chunkHeader = newHeader;
-					var head = newHeader.AsByteArray();
-					stream.Write(head, 0, head.Length);
-					stream.Flush();
-				}
-
-				var transformFactory = getTransformFactory(chunkHeader.TransformType);
-				_transformHeader = transformFactory.ReadTransformHeader(stream);
-				_transform = transformFactory.CreateTransform(_transformHeader);
-			} catch {
-				_handle.Dispose();
-				throw;
-			}
-
-			var workItem = new WriterWorkItem(_handle, MD5.Create(), _unbuffered, _transform.Write, 0);
-			var realPosition = GetRawPosition(writePosition);
-			// the writer work item's stream is responsible for computing the current checksum when the position is set
-			workItem.WorkingStream.Position = realPosition;
-			_writerWorkItem = workItem;
-		}
-
-		private void WriteHeader(HashAlgorithm md5, Stream stream, ChunkHeader chunkHeader) {
-			var chunkHeaderBytes = chunkHeader.AsByteArray();
-			md5.TransformBlock(chunkHeaderBytes, 0, ChunkHeader.Size, null, 0);
-			stream.Write(chunkHeaderBytes, 0, ChunkHeader.Size);
-		}
-
-		private void WriteTransformHeader(HashAlgorithm md5, Stream stream, ReadOnlyMemory<byte> transformHeader) {
-			if (transformHeader.IsEmpty)
-				return;
-
-			var transformHeaderBytes = transformHeader.ToArray();
-			md5.TransformBlock(transformHeaderBytes, 0, transformHeaderBytes.Length, null, 0);
-			stream.Write(transformHeaderBytes);
-		}
-
-		private void SetAttributes(string filename, bool isReadOnly) {
-			if (_inMem)
-				return;
-			// in mono SetAttributes on non-existing file throws exception, in windows it just works silently.
-			Helper.EatException(() => {
-				if (isReadOnly)
-					File.SetAttributes(filename, FileAttributes.ReadOnly | FileAttributes.NotContentIndexed);
-				else
-					File.SetAttributes(filename, FileAttributes.NotContentIndexed);
-			});
-		}
-
-		public void VerifyFileHash() {
-			if (!IsReadOnly)
-				throw new InvalidOperationException("You can't verify hash of not-completed TFChunk.");
-
-			Log.Debug("Verifying hash for TFChunk '{chunk}'...", _filename);
-			using (var reader = AcquireRawReader()) {
-				reader.Stream.Seek(0, SeekOrigin.Begin);
-				var stream = reader.Stream;
-				var footer = _chunkFooter;
-
-				byte[] hash;
-				using (var md5 = MD5.Create()) {
-					// hash whole chunk except MD5 hash sum which should always be last
-					MD5Hash.ContinuousHashFor(md5, stream, 0, _fileSize - ChunkFooter.ChecksumSize);
-					md5.TransformFinalBlock(Empty.ByteArray, 0, 0);
-					hash = md5.Hash;
-				}
-
-				if (footer.MD5Hash == null || footer.MD5Hash.Length != hash.Length)
-					throw new HashValidationException();
-
-				for (int i = 0; i < hash.Length; ++i) {
-					if (footer.MD5Hash[i] != hash[i])
-						throw new HashValidationException();
-				}
-			}
-		}
-
-		private ChunkHeader ReadHeader(Stream stream) {
-			if (stream.Length < ChunkHeader.Size) {
-				throw new CorruptDatabaseException(new BadChunkInDatabaseException(
-					string.Format("Chunk file '{0}' is too short to even read ChunkHeader, its size is {1} bytes.",
-						_filename,
-						stream.Length)));
-			}
-
-			stream.Seek(0, SeekOrigin.Begin);
-			var chunkHeader = ChunkHeader.FromStream(stream);
-			return chunkHeader;
-		}
-
-		private ChunkFooter ReadFooter(Stream stream) {
-			if (stream.Length < ChunkFooter.Size) {
-				throw new CorruptDatabaseException(new BadChunkInDatabaseException(
-					string.Format("Chunk file '{0}' is too short to even read ChunkFooter, its size is {1} bytes.",
-						_filename,
-						stream.Length)));
-			}
-
-			try {
-				stream.Seek(-ChunkFooter.Size, SeekOrigin.End);
-				var footer = ChunkFooter.FromStream(stream);
-				return footer;
-			} catch (Exception ex) {
-				throw new Exception("error in chunk file " + _filename, ex);
-			}
-		}
-
-		private static long GetRawPosition(long logicalPosition) {
-			return ChunkHeader.Size + logicalPosition;
-		}
-
-		private static long GetDataPosition(WriterWorkItem workItem) {
-			return workItem.WorkingStream.Position - ChunkHeader.Size;
-		}
-
-		// There are four kinds of event position
-		// (a) global logical (logical position in the log)
-		// (b) local logical (logical position in the chunk, which is global logical - chunk logical start)
-		// (c) actual (local logical but with posmap taken into account)
-		// (d) raw (byte offset in file, which is actual - header size)
-		//
-		// this method takes (b) and returns (d)
-		public long GetActualRawPosition(long logicalPosition) {
-			ArgumentOutOfRangeException.ThrowIfNegative(logicalPosition);
-
-			var actualPosition = _readSide.GetActualPosition(logicalPosition);
-
-			if (actualPosition < 0)
-				return -1;
-
-			return GetRawPosition(actualPosition);
-		}
-
-		public void CacheInMemory() {
-			if (_inMem)
-				return;
-
-			lock (_cachedDataLock) {
-				if (_cacheStatus != CacheStatus.Uncached) {
-					// expected to be very rare
-					if (_cacheStatus == CacheStatus.Uncaching)
-						Log.Debug("CACHING TFChunk {chunk} SKIPPED because it is uncaching.", this);
-
-					return;
-				}
-
-				// we won the right to cache
-				var sw = new Timestamp();
-				try {
-					// note: we do not want to cache transformed data for the active chunk as we would be incurring the cost of
-					// transformation twice - once when writing to the filestream and once when writing to the memory stream.
-					// however, we want to cache (already) transformed data for completed/read-only chunks as we would otherwise
-					// incur the cost of transforming the whole chunk when loading data from the file into memory.
-
-					if (!IsReadOnly)
-						// we do not cache the header for the active chunk -
-						// it's not necessary as the cache is used only for reading data.
-						BuildCacheArray(
-							size: GetAlignedSize(ChunkHeader.Size + _chunkHeader.ChunkSize + ChunkFooter.Size),
-							reader: AcquireFileReader(raw: false),
-							offset: ChunkHeader.Size,
-							count: _physicalDataSize,
-							transformed: false);
-					else
-						BuildCacheArray(
-							size: _fileSize,
-							reader: AcquireFileReader(raw: true),
-							offset: 0,
-							count: _fileSize,
-							transformed: true);
-				} catch (OutOfMemoryException) {
-					Log.Error("CACHING FAILED due to OutOfMemory exception in TFChunk {chunk}.", this);
-					return;
-				} catch (FileBeingDeletedException) {
-					Log.Debug(
-						"CACHING FAILED due to FileBeingDeleted exception (TFChunk is being disposed) in TFChunk {chunk}.",
-						this);
-					return;
-				}
-
-				_sharedMemStream = CreateSharedMemoryStream();
-				Interlocked.Add(ref _memStreamCount, IndexPool.Capacity);
-				_memStreams.Reuse();
-
-				if (_selfdestructin54321) {
-					if (Interlocked.Add(ref _memStreamCount, -IndexPool.Capacity) == 0)
-						FreeCachedData();
-					Log.Debug("CACHING ABORTED for TFChunk {chunk} as TFChunk was probably marked for deletion.", this);
-					return;
-				}
-
-				if (_writerWorkItem is { } writerWorkItem) {
-					UnmanagedMemoryStream memStream = new((byte*)_cachedData, _cachedLength, _cachedLength, FileAccess.ReadWrite) {
-						Position = writerWorkItem.WorkingStream.Position,
-					};
-					writerWorkItem.SetMemStream(memStream);
-				}
-
-				_readSide.Uncache();
-
-				Log.Debug("CACHED TFChunk {chunk} in {elapsed}.", this, sw.Elapsed);
-
-				if (_selfdestructin54321)
-					TryDestructMemStreams();
-
-				_cacheStatus = CacheStatus.Cached;
-			}
-		}
-
-		private void BuildCacheArray(int size, TFChunkBulkReader reader, int offset, int count, bool transformed) {
-			try {
-				if (reader.IsMemory)
-					throw new InvalidOperationException(
-						"When trying to build cache, reader worker is already in-memory reader.");
-
-				_cachedLength = size;
-				var cachedData = Marshal.AllocHGlobal(_cachedLength);
-				GC.AddMemoryPressure(_cachedLength);
-
-				try {
-					Span<byte> memoryView = new(IntPtr.Add(cachedData, offset).ToPointer(), count);
-					reader.Stream.Seek(offset, SeekOrigin.Begin);
-					reader.Stream.ReadExactly(memoryView);
-				} catch {
-					Marshal.FreeHGlobal(cachedData);
-					GC.RemoveMemoryPressure(_cachedLength);
-					throw;
-				}
-
-				_cachedData = cachedData;
-				_cachedDataTransformed = transformed;
-			} finally {
-				reader.Dispose();
-			}
-		}
-
-		public void UnCacheFromMemory() {
-			lock (_cachedDataLock) {
-				if (_inMem)
-					return;
-				if (_cacheStatus == CacheStatus.Cached) {
-					// we won the right to un-cache and chunk was cached
-					// possibly we could use a mem reader work item and do the actual midpoint caching now
-					_readSide.RequestCaching();
-
-					_writerWorkItem?.DisposeMemStream();
-
-					Log.Debug("UNCACHING TFChunk {chunk}.", this);
-					_cacheStatus = CacheStatus.Uncaching;
-					// this memory barrier corresponds to the barrier in ReturnReaderWorkItem
-					Thread.MemoryBarrier();
-					TryDestructMemStreams();
-				}
-			}
-		}
-
-		public bool ExistsAt(long logicalPosition) {
-			return _readSide.ExistsAt(logicalPosition);
-		}
-
-		public void OptimizeExistsAt() {
-			if (!ChunkHeader.IsScavenged) return;
-			((TFChunkReadSideScavenged)_readSide).OptimizeExistsAt();
-		}
-
-		public void DeOptimizeExistsAt() {
-			if (!ChunkHeader.IsScavenged) return;
-			((TFChunkReadSideScavenged)_readSide).DeOptimizeExistsAt();
-		}
-
-		public RecordReadResult TryReadAt(long logicalPosition, bool couldBeScavenged) {
-			return _readSide.TryReadAt(logicalPosition, couldBeScavenged);
-		}
-
-		public async ValueTask<RecordReadResult> TryReadFirst(CancellationToken token) {
-			token.ThrowIfCancellationRequested();
-			return _readSide.TryReadFirst();
-		}
-
-		public RecordReadResult TryReadClosestForward(long logicalPosition) {
-			return _readSide.TryReadClosestForward(logicalPosition);
-		}
-
-		public RawReadResult TryReadClosestForwardRaw(long logicalPosition, Func<int, byte[]> getBuffer) {
-			return _readSide.TryReadClosestForwardRaw(logicalPosition, getBuffer);
-		}
-
-		public RecordReadResult TryReadLast() {
-			return _readSide.TryReadLast();
-		}
-
-		public RecordReadResult TryReadClosestBackward(long logicalPosition) {
-			return _readSide.TryReadClosestBackward(logicalPosition);
-		}
-
-		public RecordWriteResult TryAppend(ILogRecord record) {
-			if (IsReadOnly)
-				throw new InvalidOperationException("Cannot write to a read-only block.");
-
-			var workItem = _writerWorkItem;
-			var buffer = workItem.Buffer;
-			var bufferWriter = workItem.BufferWriter;
-
-			buffer.SetLength(4);
-			buffer.Position = 4;
-			record.WriteTo(bufferWriter);
-			var length = (int)buffer.Length - 4;
-			bufferWriter.Write(length); // length suffix
-			buffer.Position = 0;
-			bufferWriter.Write(length); // length prefix
-
-			if (workItem.WorkingStream.Position + length + 2 * sizeof(int) > ChunkHeader.Size + _chunkHeader.ChunkSize)
-				return RecordWriteResult.Failed(GetDataPosition(workItem));
-
-			var oldPosition = WriteRawData(workItem, buffer);
-			_physicalDataSize = (int)GetDataPosition(workItem); // should fit 32 bits
-			_logicalDataSize = ChunkHeader.GetLocalLogPosition(record.LogPosition + length + 2 * sizeof(int));
-
-			// for non-scavenged chunk _physicalDataSize should be the same as _logicalDataSize
-			// for scavenged chunk _logicalDataSize should be at least the same as _physicalDataSize
-			if ((!ChunkHeader.IsScavenged && _logicalDataSize != _physicalDataSize)
-			    || (ChunkHeader.IsScavenged && _logicalDataSize < _physicalDataSize)) {
-				throw new Exception(string.Format(
-					"Data sizes violation. Chunk: {0}, IsScavenged: {1}, LogicalDataSize: {2}, PhysicalDataSize: {3}.",
-					FileName, ChunkHeader.IsScavenged, _logicalDataSize, _physicalDataSize));
-			}
-
-			return RecordWriteResult.Successful(oldPosition, _physicalDataSize);
-		}
-
-		public bool TryAppendRawData(ReadOnlyMemory<byte> buffer) {
-			var workItem = _writerWorkItem;
-			if (workItem.WorkingStream.Position + buffer.Length > workItem.WorkingStream.Length)
-				return false;
-			WriteRawData(workItem, buffer);
-			return true;
-		}
-
-		private static long WriteRawData(WriterWorkItem workItem, MemoryStream buffer) {
-			var len = (int)buffer.Length;
-			var buf = buffer.GetBuffer();
-			return WriteRawData(workItem, buf.AsMemory(0, len));
-		}
-
-		private static long WriteRawData(WriterWorkItem workItem, ReadOnlyMemory<byte> buf) {
-			var curPos = GetDataPosition(workItem);
-			// the writer work item's stream is responsible for updating the checksum
-			workItem.AppendData(buf);
-			return curPos;
-		}
-
-		public void Flush() {
-			if (IsReadOnly)
-				return;
-			_writerWorkItem.FlushToDisk();
-		}
-
-		public void Complete() {
-			if (ChunkHeader.IsScavenged)
-				throw new InvalidOperationException("CompleteScavenged should be used for scavenged chunks.");
-			CompleteNonRaw(null);
-		}
-
-		public async ValueTask CompleteScavenge(ICollection<PosMap> mapping, CancellationToken token) {
-			if (!ChunkHeader.IsScavenged)
-				throw new InvalidOperationException("CompleteScavenged should not be used for non-scavenged chunks.");
-
-			token.ThrowIfCancellationRequested();
-			CompleteNonRaw(mapping);
-		}
-
-		private void CompleteNonRaw(ICollection<PosMap> mapping) {
-			if (IsReadOnly)
-				throw new InvalidOperationException("Cannot complete a read-only TFChunk.");
-
-			_chunkFooter = WriteFooter(mapping);
-			Flush();
-
-			if (!_inMem)
-				CreateReaderStreams();
-
-			IsReadOnly = true;
-
-			_writerWorkItem?.Dispose();
-			_writerWorkItem = null;
-
-			SetAttributes(_filename, true);
-		}
-
-		public async ValueTask CompleteRaw(CancellationToken token) {
-			if (IsReadOnly)
-				throw new InvalidOperationException("Cannot complete a read-only TFChunk.");
-			if (_writerWorkItem.WorkingStream.Position != _writerWorkItem.WorkingStream.Length)
-				throw new InvalidOperationException("The raw chunk is not completely written.");
-
-			token.ThrowIfCancellationRequested();
-			Flush();
-
-			if (!_inMem)
-				CreateReaderStreams();
-
-			IsReadOnly = true;
-
-			_writerWorkItem?.Dispose();
-			_writerWorkItem = null;
-
-			SetAttributes(_filename, true);
-
-			if (!_inMem) {
-				using var stream = _handle.AsUnbufferedStream(FileAccess.Read);
-				_chunkFooter = ReadFooter(stream);
-			} else {
-				_chunkFooter = ReadFooter(_sharedMemStream);
-			}
-		}
-
-		private ChunkFooter WriteFooter(ICollection<PosMap> mapping) {
-			var workItem = _writerWorkItem;
-			workItem.ResizeStream((int)workItem.WorkingStream.Position);
-
-			int mapSize = 0;
-			if (mapping != null) {
-				if (_inMem)
-					throw new InvalidOperationException(
-						"Cannot write an in-memory chunk with a PosMap. " +
-						"Scavenge is not supported on in-memory databases");
-
-				if (_cacheStatus != CacheStatus.Uncached) {
-					throw new InvalidOperationException("Trying to write mapping while chunk is cached. "
-					                                    + "You probably are writing scavenged chunk as cached. "
-					                                    + "Do not do this.");
-				}
-
-				mapSize = mapping.Count * PosMap.FullSize;
-				workItem.Buffer.SetLength(mapSize);
-				workItem.Buffer.Position = 0;
-				foreach (var map in mapping) {
-					map.Write(workItem.BufferWriter);
-				}
-
-				WriteRawData(workItem, workItem.Buffer);
-			}
-
-			workItem.FlushToDisk();
-
-			_transform.Write.CompleteData(
-				footerSize: ChunkFooter.Size,
-				alignmentSize: _chunkHeader.Version >= (byte)ChunkVersions.Aligned ? AlignmentSize : 1);
-
-			Flush();
-
-			var footerNoHash = new ChunkFooter(true, true, _physicalDataSize, LogicalDataSize, mapSize,
-				new byte[ChunkFooter.ChecksumSize]);
-			//MD5
-			workItem.MD5.TransformFinalBlock(footerNoHash.AsByteArray(), 0,
-				ChunkFooter.Size - ChunkFooter.ChecksumSize);
-			//FILE
-			var footerWithHash =
-				new ChunkFooter(true, true, _physicalDataSize, LogicalDataSize, mapSize, workItem.MD5.Hash);
-			_transform.Write.WriteFooter(footerWithHash.AsByteArray(), out var fileSize);
-
-			Flush();
-
-			_fileSize = fileSize;
-			return footerWithHash;
-		}
-
-		public void Dispose() => TryClose();
-
-		public bool TryClose() {
-			_selfdestructin54321 = true;
-
-			Thread.MemoryBarrier();
-
-			bool closed = true;
-			closed &= TryDestructFileStreams();
-			closed &= TryDestructMemStreams();
-
-			return closed;
-		}
-
-		public void MarkForDeletion() {
-			_selfdestructin54321 = true;
-			_deleteFile = true;
-
-			Thread.MemoryBarrier();
-
-			TryDestructFileStreams();
-			TryDestructMemStreams();
-		}
-
-		private bool TryDestructFileStreams() {
-			switch (_fileStreams.Drain(ref _fileStreamCount)) {
-				case < 0:
-					throw new Exception("Count of file streams reduced below zero.");
-				case 0:
-					CleanUpFileStreamDestruction();
-					return true;
-				default:
-					return false;
-			}
-		}
-
-		// Called when the filestreams have all been returned and disposed.
-		// This used to be a 'last one out turns off the light' mechanism, but now it is idempotent
-		// so it is more like 'make sure the light is off if no one is using it'.
-		// The idempotency means that
-		//  1. we don't have to worry if we just disposed the last filestream or if someone else did before.
-		//  2. this mechanism will work if we decide not to create any pooled filestreams at all
-		//        (previously if we didnt create any filestreams then no one would call this method)
-		private void CleanUpFileStreamDestruction() {
-			if (Interlocked.CompareExchange(ref _cleanedUpFileStreams, 1, 0) != 0)
-				return;
-
-			if (_writerWorkItem is not null) {
-				_writerWorkItem.FlushToDisk();
-				_writerWorkItem.Dispose();
-			}
-
-			if (!_inMem) {
-				_handle?.Dispose();
-				Helper.EatException(() => File.SetAttributes(_filename, FileAttributes.Normal));
-
-				if (_deleteFile) {
-					Log.Information("File {chunk} has been marked for delete and will be deleted in TryDestructFileStreams.",
-						Path.GetFileName(_filename));
-					Helper.EatException(() => File.Delete(_filename));
-				}
-			}
-
-			_destroyEvent.Set();
-		}
-
-		public static int GetAlignedSize(int size) {
-			if (size % AlignmentSize == 0) return size;
-			return (size / AlignmentSize + 1) * AlignmentSize;
-		}
-
-		private bool TryDestructMemStreams() {
-			lock (_cachedDataLock) {
-				if (_cacheStatus != CacheStatus.Uncaching && !_selfdestructin54321)
-					return false;
-
-				_writerWorkItem?.DisposeMemStream();
-
-				switch (_memStreams.Drain(ref _memStreamCount)) {
-					case < 0:
-						throw new Exception("Count of memory streams reduced below zero.");
-					case 0:
-						// make sure "the light is off" for memory streams
-						FreeCachedData();
-						return true;
-					default:
-						return false;
-				}
-			}
-		}
-
-		private void FreeCachedData() {
-			lock (_cachedDataLock) {
-				var cachedData = _cachedData;
-				if (cachedData is not 0) {
-					Marshal.FreeHGlobal(cachedData);
-					GC.RemoveMemoryPressure(_cachedLength);
-					_cachedData = 0;
-					_cachedLength = 0;
-					_cacheStatus = CacheStatus.Uncached;
-					Interlocked.Exchange(ref _sharedMemStream, null)?.Dispose();
-					Log.Debug("UNCACHED TFChunk {chunk}.", this);
-				}
-			}
-		}
-
-		public void WaitForDestroy(int timeoutMs) {
-			if (!_destroyEvent.Wait(timeoutMs))
-				throw new TimeoutException();
-		}
-
-		private ReaderWorkItem GetReaderWorkItem() {
-			if (_selfdestructin54321)
-				throw new FileBeingDeletedException();
-
-			// try get memory stream reader first
-			if (_memStreams.TryTake(out var slot)) {
-				// When caching, _cachedDataTransformed and _sharedMemStream are both set before
-				// _memStreams.Reuse() (which repopulates the pool that was definitely empty)
-				// The Interlocked.Add(_memStreamCount) barrier guarantees the order.
-				// So since we have got a slot from the pool, we are guaranteed that _sharedMemStream and
-				// _cachedDataTransformed are populated with the correct values and further more their
-				// values will not change because we have the slot, preventing any uncaching.
-				Debug.Assert(_sharedMemStream is not null);
-
-				if (slot.ValueRef is not { } memoryWorkItem) {
-					memoryWorkItem = slot.ValueRef = new(
-						_sharedMemStream,
-						_cachedDataTransformed ? _transform.Read : IdentityChunkReadTransform.Instance) { PositionInPool = slot.Index };
-				}
-
-				return memoryWorkItem;
-			} else if (_selfdestructin54321) {
-				throw new FileBeingDeletedException();
-			} else if (Atomic.UpdateAndGet(ref _memStreamCount, IncrementIfGreaterThanZero) > 0) {
-				// We did not get a slot from the pool, but we incremented _memStreamCount from an
-				// already positive number. This means there are other mem readers in existence so we can
-				// create a new one separate to the pool because their existence guarantees that
-				// _sharedMemStream and _cachedDataTransformed are populated and will not change until
-				// _memStreamCount returns to 0.
-				//
-				// If the number of mem readers in existence had dropped to 0 then the uncaching
-				// procedure may be in progress and _sharedMemStream and _cachedDataTransformed may
-				// change or become invalid, so we don't use them. Instead fallback to filestream.
-				Debug.Assert(_sharedMemStream is not null);
-
-				return new(_sharedMemStream, _cachedDataTransformed ? _transform.Read : IdentityChunkReadTransform.Instance);
-			}
-
-			if (!IsReadOnly) {
-				// chunks cannot be read using filestreams while they can still be written to
-				throw new Exception(_cacheStatus is not CacheStatus.Cached
-					? "Active chunk must be cached but was not."
-					: "Not enough memory streams for active chunk.");
-			}
-
-			// get a filestream from the pool, or create one if the pool is empty.
-			if (_fileStreams.TryTake(out slot)) {
-				if (slot.ValueRef is not { } fileStreamWorkItem)
-					slot.ValueRef = fileStreamWorkItem = new(_handle, _transform.Read) { PositionInPool = slot.Index };
-
-				return fileStreamWorkItem;
-			}
-
-			Interlocked.Increment(ref _fileStreamCount);
-
-			if (_selfdestructin54321) {
-				if (Interlocked.Decrement(ref _fileStreamCount) == 0)
-					CleanUpFileStreamDestruction();
-				throw new FileBeingDeletedException();
-			}
-
-			return new(_handle, _transform.Read);
-
-			static int IncrementIfGreaterThanZero(int value)
-				=> value + Unsafe.BitCast<bool, byte>(value > 0);
-		}
-
-		private void ReturnReaderWorkItem(ReaderWorkItem item) {
-			if (item.IsMemory) {
-				// we avoid taking the _cachedDataLock here every time because we would be
-				// contending with other reader threads also returning readerworkitems.
-				//
-				// instead we check _cacheStatus to give us a hint about whether we need to lock.
-				// but this read of _cacheStatus is not inside the lock, so it can be wrong
-				// because we read a stale value, or it changed immediately after
-				// we read it.
-				//
-				// if the check is wrong it can result in one of two outcomes:
-				// 1. we call TryDestructMemStreams when we shouldn't.
-				//    we protect against this by checking the condition again inside the lock
-				// 2. we don't call TryDestructMemStreams when we should.
-				//    the memory barrier, corresponding to the barrier in UnCacheFromMemory, protects
-				//    against this by guaranteeing ordering as emphasied in _italics_ below.
-				//    the case protected against is that another thread might call UnCacheFromMemory just as
-				//    we are returning an item here and neither thread tidys up the item we are returning.
-				//    but consider: UnCacheFromMemory sets the state to Uncaching _and then_ tidys up the
-				//    items in the pool. if it does not tidy up our item, it is because our item wasn't
-				//    in the pool. which means we hadn't enqueued it yet, which means that we will
-				//    enqueue it and then _after that_ read _cacheStatus and find it is Uncaching,
-				//    which means we will tidy it up here.
-				//    this works in the same way as the barriers in ObjectPool.cs
-				//
-				// if we do end up needing to take the lock the risk of having to wait a long time is
-				// low (or possibly none), because Caching is the only slow operation while holding
-				// the lock and it only occurs when there are no outstanding memory readers, but we know
-				// there is one currently because we are in the process of returning it.
-				if (!_memStreams.Return(item)) {
-					// item was not taken from the pool, destroy immediately
-					item.Dispose();
-					Interlocked.Decrement(ref _memStreamCount);
-				}
-
-				Thread.MemoryBarrier();
-				if (_cacheStatus == CacheStatus.Uncaching || _selfdestructin54321)
-					TryDestructMemStreams();
-			} else {
-				if (!_fileStreams.Return(item)) {
-					// item was not taken from the pool, destroy immediately
-					item.Dispose();
-					Interlocked.Decrement(ref _fileStreamCount);
-				}
-
-				if (_selfdestructin54321)
-					TryDestructFileStreams();
-			}
-		}
-
-		public TFChunkBulkReader AcquireDataReader() {
-			if (TryAcquireBulkMemReader(raw: false, out var reader))
-				return reader;
-
-			return AcquireFileReader(raw: false);
-		}
-
-		public TFChunkBulkReader AcquireRawReader() {
-			if (TryAcquireBulkMemReader(raw: true, out var reader))
-				return reader;
-
-			return AcquireFileReader(raw: true);
-		}
-
-		private TFChunkBulkReader AcquireFileReader(bool raw) {
-			Interlocked.Increment(ref _fileStreamCount);
-			if (_selfdestructin54321) {
-				if (Interlocked.Decrement(ref _fileStreamCount) == 0) {
-					CleanUpFileStreamDestruction();
-				}
-
-				throw new FileBeingDeletedException();
-			}
-
-			// if we get here, then we reserved TFChunk for sure so no one should dispose of chunk file
-			// until client returns dedicated reader
-			var stream = CreateFileStreamForBulkReader();
-
-			if (raw) {
-				return new TFChunkBulkRawReader(this, stream, isMemory: false);
-			}
-
-			var streamToUse = _transform.Read.TransformData(new ChunkDataReadStream(stream));
-			return new TFChunkBulkDataReader(this, streamToUse, isMemory: false);
-		}
-
-		private Stream CreateFileStreamForBulkReader() => _inMem
-				? new UnmanagedMemoryStream((byte*)_cachedData, _fileSize)
-				: new FileStream(_filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, 65536,
-					FileOptions.SequentialScan);
-
-		// tries to acquire a bulk reader over a memstream but
-		// (a) doesn't block if a file reader would be acceptable instead
-		//     (we might be in the middle of caching which could take a while)
-		// (b) _does_ throw if we can't get a memstream and a filestream is not acceptable
-		private bool TryAcquireBulkMemReader(bool raw, out TFChunkBulkReader reader) {
-			reader = null;
-
-			if (IsReadOnly) {
-				// chunk is definitely readonly and will remain so, so a filestream would be acceptable.
-				// we might be able to get a memstream but we don't want to wait for the lock in case we
-				// are currently performing a slow operation with it such as caching.
-				if (!Monitor.TryEnter(_cachedDataLock))
-					return false;
-
-				try {
-					return TryCreateBulkMemReader(raw, out reader);
-				} finally {
-					Monitor.Exit(_cachedDataLock);
-				}
-			}
-
-			// chunk is not readonly so it should be cached and let us create a mem reader
-			// (but might become readonly at any moment!)
-			if (TryCreateBulkMemReader(raw, out reader))
-				return true;
-
-			// we couldn't get a memreader, maybe we just became readonly and got uncached.
-			if (IsReadOnly) {
-				// we did become readonly, it is acceptable to fall back to filestream.
-				return false;
-			} else {
-				// we are not yet readonly, we shouldn't have failed to get a memstream and we
-				// cannot fall back to file stream.
-				throw new Exception("Failed to get a MemStream bulk reader for a non-readonly chunk.");
-			}
-		}
-
-		// creates a bulk reader over a memstream as long as we are cached
-		private bool TryCreateBulkMemReader(bool raw, out TFChunkBulkReader reader) {
-			lock (_cachedDataLock) {
-				if (_cacheStatus != CacheStatus.Cached) {
-					reader = null;
-					return false;
-				}
-
-				if (_cachedData == IntPtr.Zero)
-					throw new Exception("Unexpected error: a cached chunk had no cached data");
-
-				Interlocked.Increment(ref _memStreamCount);
-				var stream = new UnmanagedMemoryStream((byte*)_cachedData, _cachedLength);
-
-				if (raw) {
-					reader = new TFChunkBulkRawReader(chunk: this, streamToUse: stream, isMemory: true);
-					return true;
-				}
-
-				var streamToUse = new ChunkDataReadStream(stream);
-				streamToUse = (_cachedDataTransformed
-					? _transform.Read
-					: IdentityChunkReadTransform.Instance).TransformData(streamToUse);
-
-				reader = new TFChunkBulkDataReader(chunk: this, streamToUse: streamToUse, isMemory: true);
-
-				return true;
-			}
-		}
-
-		public void ReleaseReader(TFChunkBulkReader reader) {
-			if (reader.IsMemory) {
-				var memStreamCount = Interlocked.Decrement(ref _memStreamCount);
-				if (memStreamCount < 0)
-					throw new Exception("Count of mem streams reduced below zero.");
-				if (memStreamCount == 0)
-					TryDestructMemStreams();
-				return;
-			}
-
-			var fileStreamCount = Interlocked.Decrement(ref _fileStreamCount);
-			if (fileStreamCount < 0)
-				throw new Exception("Count of file streams reduced below zero.");
-			if (_selfdestructin54321 && fileStreamCount == 0)
-				CleanUpFileStreamDestruction();
-		}
-
-		public override string ToString() {
-			return string.Format("#{0}-{1} ({2})", _chunkHeader.ChunkStartNumber, _chunkHeader.ChunkEndNumber,
-				Path.GetFileName(_filename));
-		}
-
-		private struct Midpoint {
-			public readonly int ItemIndex;
-			public readonly long LogPos;
-
-			public Midpoint(int itemIndex, PosMap posmap) {
-				ItemIndex = itemIndex;
-				LogPos = posmap.LogPos;
-			}
-
-			public override string ToString() {
-				return string.Format("ItemIndex: {0}, LogPos: {1}", ItemIndex, LogPos);
-			}
-		}
-
-		[StructLayout(LayoutKind.Auto)]
-		private struct ReaderWorkItemPool() {
-			private volatile ReaderWorkItem[] _array;
-
-			// IndexPool supports up to 64 elements with O(1) take/return time complexity.
-			// It's a thread-safe data structure with no allocations that provide predictability about
-			// the indices: smallest available index is always preferred.
-			private IndexPool _indices = new() { IsEmpty = true };
-
-			public void Reuse() {
-				if (_array is null) {
-					Interlocked.CompareExchange(ref _array, new ReaderWorkItem[IndexPool.Capacity], null);
-				}
-
-				_indices.Reset();
-			}
-
-			// Skip index and type variance checks which is inserted by runtime typically because
-			// the array element is of reference type.
-			private static ref ReaderWorkItem UnsafeGetElement(ReaderWorkItem[] array, int index)
-			{
-				Debug.Assert((uint)index < (uint)array.Length);
-
-				return ref Unsafe.Add(ref MemoryMarshal.GetArrayDataReference(array), index);
-			}
-
-			// releases all available slots in the pool
-			internal int Drain(ref int referenceCount) {
-				int localReferenceCount = Interlocked.CompareExchange(ref referenceCount, 0, 0);
-
-				if (_array is { } array && localReferenceCount > 0) {
-					Span<int> indices = stackalloc int[IndexPool.Capacity];
-					int count = _indices.Take(indices);
-
-					foreach (var index in indices.Slice(0, count)) {
-						ref ReaderWorkItem slot = ref UnsafeGetElement(array, index);
-						slot?.Dispose();
-						slot = null;
-
-						localReferenceCount = Interlocked.Decrement(ref referenceCount);
-					}
-				}
-
-				return localReferenceCount;
-			}
-
-			internal bool TryTake(out Slot slot) {
-				if (_array is { } array && _indices.TryTake(out int index)) {
-					slot = new(array, index);
-					return true;
-				}
-
-				slot = default;
-				return false;
-			}
-
-			internal bool Return(ReaderWorkItem item) {
-				int index = item.PositionInPool;
-				if (index < 0)
-					return false;
-
-				_indices.Return(index);
-				return true;
-			}
-
-			[StructLayout(LayoutKind.Auto)]
-			internal readonly ref struct Slot(ReaderWorkItem[] array, int index) {
-				public int Index => index;
-
-				public ref ReaderWorkItem ValueRef => ref UnsafeGetElement(array, index);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunk/TFChunkReadSide.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunk/TFChunkReadSide.cs
deleted file mode 100644
index 21a9b072d0b..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFChunk/TFChunkReadSide.cs
+++ /dev/null
@@ -1,725 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using EventStore.Common.Utils;
-using EventStore.Core.DataStructures.ProbabilisticFilter;
-using EventStore.Core.Exceptions;
-using EventStore.Core.TransactionLog.LogRecords;
-using Serilog;
-using Range = EventStore.Core.Data.Range;
-
-namespace EventStore.Core.TransactionLog.Chunks.TFChunk {
-	public partial class TFChunk {
-		public interface IChunkReadSide {
-			void RequestCaching();
-			void Uncache();
-
-			bool ExistsAt(long logicalPosition);
-			long GetActualPosition(long logicalPosition);
-			RecordReadResult TryReadAt(long logicalPosition, bool couldBeScavenged);
-			RecordReadResult TryReadFirst();
-			RecordReadResult TryReadClosestForward(long logicalPosition);
-			RawReadResult TryReadClosestForwardRaw(long logicalPosition, Func<int, byte[]> getBuffer);
-			RecordReadResult TryReadLast();
-			RecordReadResult TryReadClosestBackward(long logicalPosition);
-		}
-
-		private class TFChunkReadSideUnscavenged : TFChunkReadSide, IChunkReadSide {
-			public TFChunkReadSideUnscavenged(TFChunk chunk, ITransactionFileTracker tracker) : base(chunk, tracker) {
-				if (chunk.ChunkHeader.IsScavenged)
-					throw new ArgumentException("Scavenged TFChunk passed into unscavenged chunk read side.");
-			}
-
-			public void RequestCaching() {
-				// do nothing
-			}
-
-			public void Uncache() {
-				// do nothing
-			}
-
-			public bool ExistsAt(long logicalPosition) {
-				return logicalPosition >= 0 && logicalPosition < Chunk.LogicalDataSize;
-			}
-
-			public long GetActualPosition(long logicalPosition) {
-				Ensure.Nonnegative(logicalPosition, nameof(logicalPosition));
-
-				if (logicalPosition >= Chunk.LogicalDataSize)
-					return -1;
-
-				return logicalPosition;
-			}
-
-			public RecordReadResult TryReadAt(long logicalPosition, bool couldBeScavenged) {
-				var workItem = Chunk.GetReaderWorkItem();
-				try {
-					if (logicalPosition >= Chunk.LogicalDataSize) {
-						_log.Warning(
-							"Tried to read logical position {logicalPosition} which is greater than the chunk's logical size of {chunkLogicalSize}",
-							logicalPosition, Chunk.LogicalDataSize);
-						return RecordReadResult.Failure;
-					}
-
-					ILogRecord record;
-					int length;
-					var result = TryReadForwardInternal(workItem, logicalPosition, out length, out record);
-					return new RecordReadResult(result, -1, record, length);
-				} finally {
-					Chunk.ReturnReaderWorkItem(workItem);
-				}
-			}
-
-			public RecordReadResult TryReadFirst() {
-				return TryReadClosestForward(0);
-			}
-
-			public RecordReadResult TryReadClosestForward(long logicalPosition) {
-				var workItem = Chunk.GetReaderWorkItem();
-				try {
-					if (logicalPosition >= Chunk.LogicalDataSize)
-						return RecordReadResult.Failure;
-
-					if (!TryReadForwardInternal(workItem, logicalPosition, out var length, out var record))
-						return RecordReadResult.Failure;
-
-					long nextLogicalPos = record.GetNextLogPosition(logicalPosition, length);
-					return new RecordReadResult(true, nextLogicalPos, record, length);
-				} finally {
-					Chunk.ReturnReaderWorkItem(workItem);
-				}
-			}
-
-			public RawReadResult TryReadClosestForwardRaw(long logicalPosition, Func<int, byte[]> getBuffer) {
-				var workItem = Chunk.GetReaderWorkItem();
-				try {
-					if (logicalPosition >= Chunk.LogicalDataSize)
-						return RawReadResult.Failure;
-
-					if (!TryReadForwardRawInternal(workItem, logicalPosition, getBuffer, out var length, out var record))
-						return RawReadResult.Failure;
-
-					var nextLogicalPos = logicalPosition + length + 2 * sizeof(int);
-					return new RawReadResult(true, nextLogicalPos, record, length);
-				} finally {
-					Chunk.ReturnReaderWorkItem(workItem);
-				}
-			}
-
-			public RecordReadResult TryReadLast() {
-				return TryReadClosestBackward(Chunk.LogicalDataSize);
-			}
-
-			public RecordReadResult TryReadClosestBackward(long logicalPosition) {
-				var workItem = Chunk.GetReaderWorkItem();
-				try {
-					// here we allow actualPosition == _logicalDataSize as we can read backward the very last record that way
-					if (logicalPosition > Chunk.LogicalDataSize)
-						return RecordReadResult.Failure;
-
-					int length;
-					ILogRecord record;
-					if (!TryReadBackwardInternal(workItem, logicalPosition, out length, out record))
-						return RecordReadResult.Failure;
-
-					long nextLogicalPos = record.GetPrevLogPosition(logicalPosition, length);
-					return new RecordReadResult(true, nextLogicalPos, record, length);
-				} finally {
-					Chunk.ReturnReaderWorkItem(workItem);
-				}
-			}
-		}
-
-		private class TFChunkReadSideScavenged : TFChunkReadSide, IChunkReadSide {
-			// must hold _lock to assign to _wantMidpoints and _midpoints
-			private readonly object _lock = new();
-			private bool _wantMidpoints;
-			private Midpoint[] _midpoints;
-			private bool _optimizeCache;
-			private InMemoryBloomFilter _logPositionsBloomFilter;
-
-			private bool CacheIsOptimized {
-				get { return _optimizeCache && _logPositionsBloomFilter != null; }
-			}
-
-			public TFChunkReadSideScavenged(TFChunk chunk, bool optimizeCache, ITransactionFileTracker tracker)
-				: base(chunk, tracker) {
-				_optimizeCache = optimizeCache;
-				if (!chunk.ChunkHeader.IsScavenged)
-					throw new ArgumentException(string.Format("Chunk provided is not scavenged: {0}", chunk));
-			}
-
-			public void Uncache() {
-				lock (_lock) {
-					_wantMidpoints = false;
-					_midpoints = null;
-				}
-			}
-
-			public void RequestCaching() {
-				lock (_lock) {
-					_wantMidpoints = true;
-				}
-			}
-
-			private Midpoint[] GetOrCreateMidPoints(ReaderWorkItem workItem) {
-				// don't use mipoints when reading from memory
-				if (workItem.IsMemory)
-					return null;
-
-				// if we have midpoints we are happy. no synchronization required.
-				// this value may be stale but the midpoints are still valid
-				var midpoints = _midpoints;
-				if (midpoints != null)
-					return midpoints;
-
-				// if we don't want midpoints we are happy. no synchronization required.
-				// this value may be stale but this is rare and worst case we will perform the read
-				// without the midpoints which will still work.
-				if (!_wantMidpoints)
-					return null;
-
-				lock (_lock) {
-					// guaranteed up to date. we don't want to assign to _midpoints if we aren't supposed to
-					// because the midpoints will take up memory unnecessarily.
-					if (!_wantMidpoints)
-						return null;
-
-					// want midpoints but don't have them, get them. synchronization is ok here because rare
-					_midpoints = PopulateMidpoints(Chunk.MidpointsDepth, workItem);
-					return _midpoints;
-				}
-			}
-
-			public void OptimizeExistsAt() {
-				if (_optimizeCache && _logPositionsBloomFilter == null)
-					_logPositionsBloomFilter = PopulateBloomFilter();
-			}
-
-			public void DeOptimizeExistsAt() {
-				if (_logPositionsBloomFilter != null)
-					_logPositionsBloomFilter = null;
-			}
-
-			private InMemoryBloomFilter PopulateBloomFilter() {
-				var mapCount = Chunk.ChunkFooter.MapCount;
-				if (mapCount <= 0)
-					return null;
-
-				InMemoryBloomFilter bf = null;
-				double p = 1e-4; //false positive probability
-
-				while (p < 1.0) {
-					try {
-						bf = new InMemoryBloomFilter(mapCount, p);
-						//Log.Debug("Created bloom filter with {numBits} bits and {numHashFunctions} hash functions for chunk {chunk} with map count: {mapCount}", bf.NumBits, bf.NumHashFunctions, Chunk.FileName, mapCount);
-						break;
-					} catch (ArgumentOutOfRangeException) {
-						p *= 10.0;
-					}
-				}
-
-				if (bf == null) {
-					Log.Warning("Could not create bloom filter for chunk: {chunk}, map count: {mapCount}", Chunk.FileName,
-						mapCount);
-					return null;
-				}
-
-				ReaderWorkItem workItem = null;
-				try {
-					workItem = Chunk.GetReaderWorkItem();
-
-					foreach (var posMap in ReadPosMap(workItem, 0, mapCount)) {
-						bf.Add(posMap.LogPos);
-					}
-
-					//Log.Debug("{mapCount} items added to bloom filter for chunk {chunk}", mapCount, Chunk.FileName);
-					return bf;
-				} catch (FileBeingDeletedException) {
-					return null;
-				} catch (OutOfMemoryException) {
-					return null;
-				} finally {
-					if (workItem != null)
-						Chunk.ReturnReaderWorkItem(workItem);
-				}
-			}
-
-			private Midpoint[] PopulateMidpoints(int depth, ReaderWorkItem workItem) {
-				if (depth > 31)
-					throw new ArgumentOutOfRangeException("depth", "Depth too for midpoints.");
-
-				if (Chunk.ChunkFooter.MapCount == 0) // empty chunk
-					return null;
-
-				try {
-					int midPointsCnt = 1 << depth;
-					int segmentSize;
-					Midpoint[] midpoints;
-					var mapCount = Chunk.ChunkFooter.MapCount;
-					if (mapCount < midPointsCnt) {
-						segmentSize = 1; // we cache all items
-						midpoints = new Midpoint[mapCount];
-					} else {
-						segmentSize = mapCount / midPointsCnt;
-						midpoints = new Midpoint[1 + (mapCount + segmentSize - 1) / segmentSize];
-					}
-
-					for (int x = 0, i = 0, xN = mapCount - 1; x < xN; x += segmentSize, i += 1) {
-						midpoints[i] = new Midpoint(x, ReadPosMap(workItem, x));
-					}
-
-					// add the very last item as the last midpoint (possibly it is done twice)
-					midpoints[midpoints.Length - 1] = new Midpoint(mapCount - 1, ReadPosMap(workItem, mapCount - 1));
-					return midpoints;
-				} catch (FileBeingDeletedException) {
-					return null;
-				} catch (OutOfMemoryException) {
-					return null;
-				}
-			}
-
-			private PosMap ReadPosMap(ReaderWorkItem workItem, long index) {
-				if (Chunk.ChunkFooter.IsMap12Bytes) {
-					var pos = ChunkHeader.Size + Chunk.ChunkFooter.PhysicalDataSize + index * PosMap.FullSize;
-					workItem.BaseStream.Seek(pos, SeekOrigin.Begin);
-					return PosMap.FromNewFormat(workItem);
-				} else {
-					var pos = ChunkHeader.Size + Chunk.ChunkFooter.PhysicalDataSize + index * PosMap.DeprecatedSize;
-					workItem.BaseStream.Seek(pos, SeekOrigin.Begin);
-					return PosMap.FromOldFormat(workItem);
-				}
-			}
-
-			private IEnumerable<PosMap> ReadPosMap(ReaderWorkItem workItem, long index, int count) {
-				if (Chunk.ChunkFooter.IsMap12Bytes) {
-					var pos = ChunkHeader.Size + Chunk.ChunkFooter.PhysicalDataSize + index * PosMap.FullSize;
-					workItem.BaseStream.Seek(pos, SeekOrigin.Begin);
-					for (int i = 0; i < count; i++)
-						yield return PosMap.FromNewFormat(workItem);
-				} else {
-					var pos = ChunkHeader.Size + Chunk.ChunkFooter.PhysicalDataSize + index * PosMap.DeprecatedSize;
-					workItem.BaseStream.Seek(pos, SeekOrigin.Begin);
-					for (int i = 0; i < count; i++)
-						yield return PosMap.FromOldFormat(workItem);
-				}
-			}
-
-			public bool ExistsAt(long logicalPosition) {
-				if (CacheIsOptimized)
-					return MayExistAt(logicalPosition);
-
-				var workItem = Chunk.GetReaderWorkItem();
-				try {
-					var actualPosition = TranslateExactPosition(workItem, logicalPosition);
-					return actualPosition >= 0 && actualPosition < Chunk.PhysicalDataSize;
-				} finally {
-					Chunk.ReturnReaderWorkItem(workItem);
-				}
-			}
-
-			public bool MayExistAt(long logicalPosition) {
-				/* This function is much faster than ExistsAt. However, it may return false positives (with a very low probability) but never false negatives */
-				return _logPositionsBloomFilter.MightContain(logicalPosition);
-			}
-
-			public long GetActualPosition(long logicalPosition) {
-				Ensure.Nonnegative(logicalPosition, nameof(logicalPosition));
-
-				var workItem = Chunk.GetReaderWorkItem();
-				try {
-					return TranslateExactPosition(workItem, logicalPosition);
-				} finally {
-					Chunk.ReturnReaderWorkItem(workItem);
-				}
-			}
-
-			public RecordReadResult TryReadAt(long logicalPosition, bool couldBeScavenged) {
-				var workItem = Chunk.GetReaderWorkItem();
-				try {
-					var actualPosition = TranslateExactPosition(workItem, logicalPosition);
-					if (actualPosition == -1 || actualPosition >= Chunk.PhysicalDataSize) {
-						if (!couldBeScavenged) {
-							_log.Warning(
-								"Tried to read actual position {actualPosition}, translated from logPosition {logicalPosition}, " +
-								"which is greater than the chunk's physical size of {chunkPhysicalSize}",
-								actualPosition, logicalPosition, Chunk.PhysicalDataSize);
-						}
-						return RecordReadResult.Failure;
-					}
-
-					ILogRecord record;
-					int length;
-					var result = TryReadForwardInternal(workItem, actualPosition, out length, out record);
-					return new RecordReadResult(result, -1, record, length);
-				} finally {
-					Chunk.ReturnReaderWorkItem(workItem);
-				}
-			}
-
-			private int TranslateExactPosition(ReaderWorkItem workItem, long pos) {
-				var midpoints = GetOrCreateMidPoints(workItem);
-				if (midpoints == null)
-					return TranslateExactWithoutMidpoints(workItem, pos, 0, Chunk.ChunkFooter.MapCount - 1);
-				return TranslateExactWithMidpoints(workItem, midpoints, pos);
-			}
-
-			private int TranslateExactWithoutMidpoints(ReaderWorkItem workItem, long pos, long startIndex,
-				long endIndex) {
-				long low = startIndex;
-				long high = endIndex;
-				while (low <= high) {
-					var mid = low + (high - low) / 2;
-					var v = ReadPosMap(workItem, mid);
-
-					if (v.LogPos == pos)
-						return v.ActualPos;
-					if (v.LogPos < pos)
-						low = mid + 1;
-					else
-						high = mid - 1;
-				}
-
-				return -1;
-			}
-
-			private int TranslateExactWithMidpoints(ReaderWorkItem workItem, Midpoint[] midpoints, long pos) {
-				if (pos < midpoints[0].LogPos || pos > midpoints[midpoints.Length - 1].LogPos)
-					return -1;
-
-				var recordRange = LocatePosRange(midpoints, pos);
-				return TranslateExactWithoutMidpoints(workItem, pos, recordRange.Lower, recordRange.Upper);
-			}
-
-			public RecordReadResult TryReadFirst() {
-				return TryReadClosestForward(0);
-			}
-
-			public RecordReadResult TryReadClosestForward(long logicalPosition) {
-				if (Chunk.ChunkFooter.MapCount == 0)
-					return RecordReadResult.Failure;
-
-				var workItem = Chunk.GetReaderWorkItem();
-				try {
-					var actualPosition = TranslateClosestForwardPosition(workItem, logicalPosition);
-					if (actualPosition == -1 || actualPosition >= Chunk.PhysicalDataSize)
-						return RecordReadResult.Failure;
-
-					if (!TryReadForwardInternal(workItem, actualPosition, out var length, out var record))
-						return RecordReadResult.Failure;
-
-					long nextLogicalPos =
-						Chunk.ChunkHeader.GetLocalLogPosition(record.GetNextLogPosition(record.LogPosition, length));
-					return new RecordReadResult(true, nextLogicalPos, record, length);
-				} finally {
-					Chunk.ReturnReaderWorkItem(workItem);
-				}
-			}
-
-			public RawReadResult TryReadClosestForwardRaw(long logicalPosition, Func<int, byte[]> getBuffer) {
-				if (Chunk.ChunkFooter.MapCount == 0)
-					return RawReadResult.Failure;
-
-				var workItem = Chunk.GetReaderWorkItem();
-				try {
-					var actualPosition = TranslateClosestForwardPosition(workItem, logicalPosition);
-					if (actualPosition == -1 || actualPosition >= Chunk.PhysicalDataSize)
-						return RawReadResult.Failure;
-
-					if (!TryReadForwardRawInternal(workItem, actualPosition, getBuffer, out var length, out var record))
-						return RawReadResult.Failure;
-
-					// We need to read the record's log position from the buffer so that we can correctly compute
-					// the next position. Simply adding the record's length, suffix & prefix to "logicalPosition" won't
-					// work properly with scavenged chunks since the computed position may still be before the current
-					// record's position, which would cause us to read it again.
-					if (!BitConverter.IsLittleEndian)
-						throw new NotSupportedException();
-
-					const int logPositionOffset = 2;
-					var recordLogPos = BitConverter.ToInt64(record, logPositionOffset);
-					long nextLogicalPos =
-						Chunk.ChunkHeader.GetLocalLogPosition(recordLogPos + length + 2 * sizeof(int));
-
-					return new RawReadResult(true, nextLogicalPos, record, length);
-				} finally {
-					Chunk.ReturnReaderWorkItem(workItem);
-				}
-			}
-
-			public RecordReadResult TryReadLast() {
-				return TryReadClosestBackward(Chunk.LogicalDataSize);
-			}
-
-			public RecordReadResult TryReadClosestBackward(long logicalPosition) {
-				if (Chunk.ChunkFooter.MapCount == 0)
-					return RecordReadResult.Failure;
-
-				var workItem = Chunk.GetReaderWorkItem();
-				try {
-					var actualPosition = TranslateClosestForwardPosition(workItem, logicalPosition);
-					// here we allow actualPosition == _physicalDataSize as we can read backward the very last record that way
-					if (actualPosition == -1 || actualPosition > Chunk.PhysicalDataSize)
-						return RecordReadResult.Failure;
-
-					int length;
-					ILogRecord record;
-					if (!TryReadBackwardInternal(workItem, actualPosition, out length, out record))
-						return RecordReadResult.Failure;
-
-					long nextLogicalPos = Chunk.ChunkHeader.GetLocalLogPosition(record.LogPosition);
-					return new RecordReadResult(true, nextLogicalPos, record, length);
-				} finally {
-					Chunk.ReturnReaderWorkItem(workItem);
-				}
-			}
-
-			private int TranslateClosestForwardPosition(ReaderWorkItem workItem, long logicalPosition) {
-				var midpoints = GetOrCreateMidPoints(workItem);
-				if (midpoints == null)
-					return TranslateClosestForwardWithoutMidpoints(workItem, logicalPosition, 0,
-						Chunk.ChunkFooter.MapCount - 1);
-				return TranslateClosestForwardWithMidpoints(workItem, midpoints, logicalPosition);
-			}
-
-			private int TranslateClosestForwardWithMidpoints(ReaderWorkItem workItem, Midpoint[] midpoints, long pos) {
-				// to allow backward reading of the last record, forward read will decline anyway
-				if (pos > midpoints[midpoints.Length - 1].LogPos)
-					return Chunk.PhysicalDataSize;
-
-				var recordRange = LocatePosRange(midpoints, pos);
-				return TranslateClosestForwardWithoutMidpoints(workItem, pos, recordRange.Lower, recordRange.Upper);
-			}
-
-			private int TranslateClosestForwardWithoutMidpoints(ReaderWorkItem workItem, long pos, long startIndex,
-				long endIndex) {
-				PosMap res = ReadPosMap(workItem, endIndex);
-
-				// to allow backward reading of the last record, forward read will decline anyway
-				if (pos > res.LogPos)
-					return Chunk.PhysicalDataSize;
-
-				long low = startIndex;
-				long high = endIndex;
-				while (low < high) {
-					var mid = low + (high - low) / 2;
-					var v = ReadPosMap(workItem, mid);
-
-					if (v.LogPos < pos)
-						low = mid + 1;
-					else {
-						high = mid;
-						res = v;
-					}
-				}
-
-				return res.ActualPos;
-			}
-
-			private static Range LocatePosRange(Midpoint[] midpoints, long pos) {
-				int lowerMidpoint = LowerMidpointBound(midpoints, pos);
-				int upperMidpoint = UpperMidpointBound(midpoints, pos);
-				return new Range(midpoints[lowerMidpoint].ItemIndex, midpoints[upperMidpoint].ItemIndex);
-			}
-
-			/// <summary>
-			/// Returns the index of lower midpoint for given logical position.
-			/// Assumes it always exist.
-			/// </summary>
-			private static int LowerMidpointBound(Midpoint[] midpoints, long pos) {
-				int l = 0;
-				int r = midpoints.Length - 1;
-				while (l < r) {
-					int m = l + (r - l + 1) / 2;
-					if (midpoints[m].LogPos <= pos)
-						l = m;
-					else
-						r = m - 1;
-				}
-
-				return l;
-			}
-
-			/// <summary>
-			/// Returns the index of upper midpoint for given logical position.
-			/// Assumes it always exist.
-			/// </summary>
-			private static int UpperMidpointBound(Midpoint[] midpoints, long pos) {
-				int l = 0;
-				int r = midpoints.Length - 1;
-				while (l < r) {
-					int m = l + (r - l) / 2;
-					if (midpoints[m].LogPos >= pos)
-						r = m;
-					else
-						l = m + 1;
-				}
-
-				return l;
-			}
-		}
-
-		private abstract class TFChunkReadSide {
-			protected readonly TFChunk Chunk;
-			protected readonly ILogger _log = Log.ForContext<TFChunkReader>();
-			protected readonly ITransactionFileTracker _tracker;
-
-			protected TFChunkReadSide(TFChunk chunk, ITransactionFileTracker tracker) {
-				Ensure.NotNull(chunk, "chunk");
-				Chunk = chunk;
-				_tracker = tracker;
-			}
-
-			private bool ValidateRecordPosition(long actualPosition) {
-				// no space even for length prefix and suffix
-				if (actualPosition + 2 * sizeof(int) > Chunk.PhysicalDataSize) {
-					_log.Warning(
-						"Tried to read actual position {actualPosition}, but there isn't enough space for a record left in the chunk. Chunk's data size: {chunkPhysicalDataSize}",
-						actualPosition, Chunk.PhysicalDataSize);
-					return false;
-				}
-
-				return true;
-			}
-
-			private void ValidateRecordLength(int length, long actualPosition) {
-				if (length <= 0) {
-					throw new InvalidReadException(
-						$"Log record at actual pos {actualPosition} has non-positive length: {length}. " +
-						$" in chunk {Chunk}.");
-				}
-
-				if (length > TFConsts.MaxLogRecordSize) {
-					throw new InvalidReadException(
-						$"Log record at actual pos {actualPosition} has too large length: {length} bytes, " +
-						$"while limit is {TFConsts.MaxLogRecordSize} bytes. In chunk {Chunk}.");
-				}
-
-				if (actualPosition + length + 2 * sizeof(int) > Chunk.PhysicalDataSize) {
-					throw new UnableToReadPastEndOfStreamException(
-						$"There is not enough space to read full record (length prefix: {length}). " +
-						$"Actual pre-position: {actualPosition}. Something is seriously wrong in chunk {Chunk}.");
-				}
-			}
-
-			private void ValidatePrefixSuffixLength(int prefixLength, int suffixLength, long actualPosition, string actualPositionType) {
-				// verify suffix length == prefix length
-				if (suffixLength != prefixLength) {
-					throw new InvalidReadException(
-						$"Prefix/suffix length inconsistency: prefix length ({prefixLength}) != suffix length ({suffixLength}).\n" +
-						$"Actual {actualPositionType}: {actualPosition}. Something is seriously wrong in chunk {Chunk}.");
-				}
-			}
-
-			protected bool TryReadForwardInternal(ReaderWorkItem workItem, long actualPosition, out int length,
-				out ILogRecord record) {
-
-				length = -1;
-				record = null;
-
-				workItem.BaseStream.Position = GetRawPosition(actualPosition);
-				if (!ValidateRecordPosition(actualPosition))
-					return false;
-
-				length = workItem.ReadInt32();
-				ValidateRecordLength(length, actualPosition);
-
-				try {
-					record = LogRecord.ReadFrom(workItem, length);
-				} catch (Exception exc) {
-					throw new InvalidReadException($"Error while reading log record forwards at actual position {actualPosition}. {exc.Message}");
-				}
-
-				_tracker.OnRead(record);
-
-				int suffixLength = workItem.ReadInt32();
-				ValidatePrefixSuffixLength(length, suffixLength, actualPosition, "pre-position");
-
-				return true;
-			}
-
-			protected bool TryReadForwardRawInternal(ReaderWorkItem workItem, long actualPosition, Func<int, byte[]> getBuffer,
-				out int length, out byte[] record) {
-				length = -1;
-				record = null;
-
-				workItem.BaseStream.Position = GetRawPosition(actualPosition);
-				if (!ValidateRecordPosition(actualPosition))
-					return false;
-
-				length = workItem.ReadInt32();
-				ValidateRecordLength(length, actualPosition);
-
-				record = getBuffer(length);
-
-				workItem.Read(record, 0, length);
-
-				int suffixLength = workItem.ReadInt32();
-				ValidatePrefixSuffixLength(length, suffixLength, actualPosition, "pre-position");
-
-				return true;
-			}
-
-			protected bool TryReadBackwardInternal(ReaderWorkItem workItem, long actualPosition, out int length,
-				out ILogRecord record) {
-				length = -1;
-				record = null;
-
-				// no space even for length prefix and suffix
-				if (actualPosition < 2 * sizeof(int)) {
-					_log.Warning(
-						"Tried to read actual position {actualPosition}, but the position isn't large enough to contain a record",
-						actualPosition);
-					return false;
-				}
-
-				var realPos = GetRawPosition(actualPosition);
-				workItem.BaseStream.Position = realPos - sizeof(int);
-
-				length = workItem.ReadInt32();
-				if (length <= 0) {
-					throw new InvalidReadException(
-						string.Format("Log record that ends at actual pos {0} has non-positive length: {1}. "
-									  + "In chunk {2}.",
-							actualPosition, length, Chunk));
-				}
-
-				if (length > TFConsts.MaxLogRecordSize) {
-					throw new InvalidReadException(
-						string.Format("Log record that ends at actual pos {0} has too large length: {1} bytes, "
-									  + "while limit is {2} bytes. In chunk {3}.",
-							actualPosition, length, TFConsts.MaxLogRecordSize, Chunk));
-				}
-
-				if (actualPosition < length + 2 * sizeof(int)) // no space for record + length prefix and suffix
-				{
-					throw new UnableToReadPastEndOfStreamException(
-						string.Format("There is not enough space to read full record (length suffix: {0}). "
-									  + "Actual post-position: {1}. Something is seriously wrong in chunk {2}.",
-							length, actualPosition, Chunk));
-				}
-
-				workItem.BaseStream.Position = realPos - length - 2 * sizeof(int);
-
-				// verify suffix length == prefix length
-				int prefixLength = workItem.ReadInt32();
-				ValidatePrefixSuffixLength(prefixLength, length, actualPosition, "post-position");
-
-				try {
-					record = LogRecord.ReadFrom(workItem, length);
-				} catch (Exception exc) {
-					throw new InvalidReadException($"Error while reading log record backwards at actual position {actualPosition}. {exc.Message}");
-				}
-
-				_tracker.OnRead(record);
-
-				return true;
-			}
-		}
-	}
-
-	public class InvalidReadException : Exception {
-		public InvalidReadException(string message) : base(message) {
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunk/WriterWorkItem.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunk/WriterWorkItem.cs
deleted file mode 100644
index 80bd69d913c..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFChunk/WriterWorkItem.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using System.IO;
-using System.Security.Cryptography;
-using DotNext;
-using DotNext.IO;
-using EventStore.Plugins.Transforms;
-using Microsoft.Win32.SafeHandles;
-
-namespace EventStore.Core.TransactionLog.Chunks.TFChunk {
-	internal sealed class WriterWorkItem : Disposable {
-		public const int BufferSize = 8192;
-
-		public Stream WorkingStream { get; private set; }
-
-		private readonly Stream _fileStream;
-		private Stream _memStream;
-
-		public readonly MemoryStream Buffer;
-		public readonly BinaryWriter BufferWriter;
-		public readonly HashAlgorithm MD5;
-
-		public unsafe WriterWorkItem(nint memoryPtr, int length, HashAlgorithm md5,
-			IChunkWriteTransform chunkWriteTransform, int initialStreamPosition) {
-			var memStream = new UnmanagedMemoryStream((byte*)memoryPtr, length, length, FileAccess.ReadWrite);
-			memStream.Position = initialStreamPosition;
-			var chunkDataWriteStream = new ChunkDataWriteStream(memStream, md5);
-
-			WorkingStream = _memStream = chunkWriteTransform.TransformData(chunkDataWriteStream);
-			Buffer = new(BufferSize);
-			BufferWriter = new(Buffer);
-			MD5 = md5;
-		}
-
-		public WriterWorkItem(SafeFileHandle handle, HashAlgorithm md5, bool unbuffered,
-			IChunkWriteTransform chunkWriteTransform, int initialStreamPosition) {
-			var fileStream = unbuffered
-				? handle.AsUnbufferedStream(FileAccess.ReadWrite)
-				: new BufferedStream(handle.AsUnbufferedStream(FileAccess.ReadWrite), BufferSize);
-			fileStream.Position = initialStreamPosition;
-			var chunkDataWriteStream = new ChunkDataWriteStream(fileStream, md5);
-
-			WorkingStream = _fileStream = chunkWriteTransform.TransformData(chunkDataWriteStream);
-			Buffer = new(BufferSize);
-			BufferWriter = new(Buffer);
-			MD5 = md5;
-		}
-
-		public void SetMemStream(UnmanagedMemoryStream memStream) {
-			_memStream = memStream;
-			if (_fileStream is null)
-				WorkingStream = memStream;
-		}
-
-		public void AppendData(ReadOnlyMemory<byte> buf) {
-			// as we are always append-only, stream's position should be right here
-			_fileStream?.Write(buf.Span);
-
-			//MEMORY
-			_memStream?.Write(buf.Span);
-		}
-
-		public void ResizeStream(int fileSize) {
-			_fileStream?.SetLength(fileSize);
-			_memStream?.SetLength(fileSize);
-		}
-
-		protected override void Dispose(bool disposing) {
-			if (disposing) {
-				_fileStream?.Dispose();
-				DisposeMemStream();
-				Buffer.Dispose();
-				BufferWriter.Dispose();
-				MD5.Dispose();
-			}
-
-			base.Dispose(disposing);
-		}
-
-		public void FlushToDisk() {
-			_fileStream?.Flush();
-			_memStream?.Flush();
-		}
-
-		public void DisposeMemStream() {
-			_memStream?.Dispose();
-			_memStream = null;
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunkBulkDataReader.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunkBulkDataReader.cs
deleted file mode 100644
index fee4e379d6a..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFChunkBulkDataReader.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using EventStore.Common.Utils;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-
-namespace EventStore.Core.TransactionLog.Chunks;
-
-public sealed class TFChunkBulkDataReader(TFChunk.TFChunk chunk, Stream streamToUse, bool isMemory)
-	: TFChunkBulkReader(chunk, streamToUse, isMemory) {
-
-	public override void SetPosition(long dataPosition) {
-		var rawPos = dataPosition + ChunkHeader.Size;
-		Stream.Position = rawPos;
-	}
-
-	public override BulkReadResult ReadNextBytes(int count, byte[] buffer) {
-		Ensure.NotNull(buffer, "buffer");
-		Ensure.Nonnegative(count, "count");
-
-		if (Stream.Position == 0)
-			Stream.Position = ChunkHeader.Size;
-
-		if (count > buffer.Length)
-			count = buffer.Length;
-
-		var oldPos = (int)Stream.Position - ChunkHeader.Size;
-		var toRead = Math.Min(Chunk.PhysicalDataSize - oldPos, count);
-		Debug.Assert(toRead >= 0);
-		Stream.Position = Stream.Position; // flush read buffer
-		int bytesRead = Stream.Read(buffer, 0, toRead);
-		return new BulkReadResult(oldPos,
-			bytesRead,
-			isEof: Chunk.IsReadOnly && oldPos + bytesRead == Chunk.PhysicalDataSize);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunkBulkRawReader.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunkBulkRawReader.cs
deleted file mode 100644
index e7130125c8c..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFChunkBulkRawReader.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Common.Utils;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-
-namespace EventStore.Core.TransactionLog.Chunks;
-
-public sealed class TFChunkBulkRawReader(TFChunk.TFChunk chunk, Stream streamToUse, bool isMemory)
-	: TFChunkBulkReader(chunk, streamToUse, isMemory) {
-
-	public override void SetPosition(long rawPosition) {
-		if (rawPosition >= Stream.Length)
-			throw new ArgumentOutOfRangeException("rawPosition",
-				string.Format("Raw position {0} is out of bounds.", rawPosition));
-		Stream.Position = rawPosition;
-
-	}
-
-	public override BulkReadResult ReadNextBytes(int count, byte[] buffer) {
-		Ensure.NotNull(buffer, "buffer");
-		Ensure.Nonnegative(count, "count");
-
-		if (count > buffer.Length)
-			count = buffer.Length;
-
-		var oldPos = (int)Stream.Position;
-		int bytesRead = Stream.Read(buffer, 0, count);
-		return new BulkReadResult(oldPos, bytesRead, isEof: Stream.Length == Stream.Position);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunkBulkReader.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunkBulkReader.cs
deleted file mode 100644
index ce9ff328eed..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFChunkBulkReader.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Common.Utils;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-
-namespace EventStore.Core.TransactionLog.Chunks {
-	public abstract class TFChunkBulkReader : IDisposable {
-		public TFChunk.TFChunk Chunk {
-			get { return _chunk; }
-		}
-
-		internal Stream Stream {
-			get { return _stream; }
-		}
-
-		private readonly TFChunk.TFChunk _chunk;
-		private readonly Stream _stream;
-		private bool _disposed;
-		public bool IsMemory { get; init; }
-
-		internal TFChunkBulkReader(TFChunk.TFChunk chunk, Stream streamToUse, bool isMemory) {
-			Ensure.NotNull(chunk, "chunk");
-			Ensure.NotNull(streamToUse, "stream");
-			_chunk = chunk;
-			_stream = streamToUse;
-			IsMemory = isMemory;
-		}
-
-		public abstract void SetPosition(long position);
-		public abstract BulkReadResult ReadNextBytes(int count, byte[] buffer);
-
-		~TFChunkBulkReader() {
-			Dispose();
-		}
-
-		public void Release() {
-			_stream.Close();
-			_stream.Dispose();
-			_disposed = true;
-			_chunk.ReleaseReader(this);
-		}
-
-		public void Dispose() {
-			if (_disposed)
-				return;
-			Release();
-			GC.SuppressFinalize(this);
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunkChaser.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunkChaser.cs
deleted file mode 100644
index fcff4c9eff8..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFChunkChaser.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using EventStore.Common.Utils;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.TransactionLog.Chunks {
-	public class TFChunkChaser : ITransactionFileChaser {
-		public ICheckpoint Checkpoint {
-			get { return _chaserCheckpoint; }
-		}
-
-		private readonly ICheckpoint _chaserCheckpoint;
-		private readonly TFChunkReader _reader;
-
-		public TFChunkChaser(TFChunkDb db, IReadOnlyCheckpoint writerCheckpoint, ICheckpoint chaserCheckpoint,
-			bool optimizeReadSideCache) {
-			Ensure.NotNull(db, "dbConfig");
-			Ensure.NotNull(writerCheckpoint, "writerCheckpoint");
-			Ensure.NotNull(chaserCheckpoint, "chaserCheckpoint");
-
-			_chaserCheckpoint = chaserCheckpoint;
-			_reader = new TFChunkReader(db, writerCheckpoint, _chaserCheckpoint.Read(), optimizeReadSideCache);
-		}
-
-		public void Open() {
-			// NOOP
-		}
-
-		public bool TryReadNext(out ILogRecord record) {
-			var res = TryReadNext();
-			record = res.LogRecord;
-			return res.Success;
-		}
-
-		public SeqReadResult TryReadNext() {
-			var res = _reader.TryReadNext();
-			if (res.Success)
-				_chaserCheckpoint.Write(res.RecordPostPosition);
-			else
-				_chaserCheckpoint.Write(_reader.CurrentPosition);
-			return res;
-		}
-
-		public void Dispose() {
-			Close();
-		}
-
-		public void Close() {
-			Flush();
-		}
-
-		public void Flush() {
-			_chaserCheckpoint.Flush();
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunkDb.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunkDb.cs
deleted file mode 100644
index 033482b1450..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFChunkDb.cs
+++ /dev/null
@@ -1,351 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Exceptions;
-using EventStore.Core.Transforms;
-using EventStore.Core.Transforms.Identity;
-using EventStore.Plugins.Transforms;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.TransactionLog.Chunks {
-	public class TFChunkDb : IDisposable {
-		public readonly TFChunkDbConfig Config;
-		public readonly TFChunkManager Manager;
-		public readonly DbTransformManager TransformManager;
-
-		private readonly ILogger _log;
-		private readonly ITransactionFileTracker _tracker;
-		private int _closed;
-
-		public TFChunkDb(TFChunkDbConfig config, ITransactionFileTracker tracker = null, ILogger log = null, DbTransformManager transformManager = null) {
-			Ensure.NotNull(config, "config");
-
-			Config = config;
-			TransformManager = transformManager ?? DbTransformManager.Default;
-			_tracker = tracker ?? new TFChunkTracker.NoOp();
-			Manager = new TFChunkManager(Config, _tracker, TransformManager);
-			_log = log ?? Serilog.Log.ForContext<TFChunkDb>();
-		}
-
-		struct ChunkInfo {
-			public int ChunkStartNumber;
-			public string ChunkFileName;
-		}
-
-		IEnumerable<ChunkInfo> GetAllLatestChunksExceptLast(TFChunkEnumerator chunkEnumerator, int lastChunkNum) {
-			foreach (var chunkInfo in chunkEnumerator.EnumerateChunks(lastChunkNum)) {
-				switch (chunkInfo) {
-					case LatestVersion(var fileName, var start, _):
-						if (start <= lastChunkNum - 1)
-							yield return new ChunkInfo { ChunkFileName = fileName, ChunkStartNumber = start };
-						break;
-					case MissingVersion(var fileName, var start):
-						if (start <= lastChunkNum - 1)
-							throw new CorruptDatabaseException(new ChunkNotFoundException(fileName));
-						break;
-				}
-			}
-		}
-
-		public void Open(bool verifyHash = true, bool readOnly = false, int threads = 1, bool createNewChunks = true) {
-			Ensure.Positive(threads, "threads");
-
-			ValidateReaderChecksumsMustBeLess(Config);
-			var checkpoint = Config.WriterCheckpoint.Read();
-
-			if (Config.InMemDb) {
-				if (createNewChunks)
-					Manager.AddNewChunk();
-				return;
-			}
-
-			var lastChunkNum = (int)(checkpoint / Config.ChunkSize);
-			var lastChunkVersions = Config.FileNamingStrategy.GetAllVersionsFor(lastChunkNum);
-			var chunkEnumerator = new TFChunkEnumerator(Config.FileNamingStrategy);
-
-			try {
-				Parallel.ForEach(GetAllLatestChunksExceptLast(chunkEnumerator, lastChunkNum), // the last chunk is dealt with separately
-					new ParallelOptions {MaxDegreeOfParallelism = threads},
-					chunkInfo => {
-						TFChunk.TFChunk chunk;
-						if (lastChunkVersions.Length == 0 &&
-						    (chunkInfo.ChunkStartNumber + 1) * (long)Config.ChunkSize == checkpoint) {
-							// The situation where the logical data size is exactly divisible by ChunkSize,
-							// so it might happen that we have checkpoint indicating one more chunk should exist,
-							// but the actual last chunk is (lastChunkNum-1) one and it could be not completed yet -- perfectly valid situation.
-							var footer = ReadChunkFooter(chunkInfo.ChunkFileName);
-							if (footer.IsCompleted)
-								chunk = TFChunk.TFChunk.FromCompletedFile(chunkInfo.ChunkFileName, verifyHash: false,
-									unbufferedRead: Config.Unbuffered,
-									tracker: _tracker,
-									optimizeReadSideCache: Config.OptimizeReadSideCache,
-									reduceFileCachePressure: Config.ReduceFileCachePressure,
-									getTransformFactory: type => TransformManager.GetFactoryForExistingChunk(type));
-							else {
-								chunk = TFChunk.TFChunk.FromOngoingFile(chunkInfo.ChunkFileName, Config.ChunkSize,
-									unbuffered: Config.Unbuffered,
-									writethrough: Config.WriteThrough,
-									reduceFileCachePressure: Config.ReduceFileCachePressure,
-									tracker: _tracker,
-									getTransformFactory: type => TransformManager.GetFactoryForExistingChunk(type));
-								// chunk is full with data, we should complete it right here
-								if (!readOnly)
-									chunk.Complete();
-							}
-						} else {
-							chunk = TFChunk.TFChunk.FromCompletedFile(chunkInfo.ChunkFileName, verifyHash: false,
-								unbufferedRead: Config.Unbuffered,
-								optimizeReadSideCache: Config.OptimizeReadSideCache,
-								reduceFileCachePressure: Config.ReduceFileCachePressure,
-								tracker: _tracker,
-								getTransformFactory: type => TransformManager.GetFactoryForExistingChunk(type));
-						}
-
-						// This call is theadsafe.
-						Manager.AddChunk(chunk);
-					});
-			} catch (AggregateException aggEx) {
-				// We only really care that *something* is wrong - throw the first inner exception.
-				throw aggEx.InnerException;
-			}
-
-			if (lastChunkVersions.Length == 0) {
-				var onBoundary = checkpoint == (Config.ChunkSize * (long)lastChunkNum);
-				if (!onBoundary)
-					throw new CorruptDatabaseException(
-						new ChunkNotFoundException(Config.FileNamingStrategy.GetFilenameFor(lastChunkNum, 0)));
-
-				if (!readOnly && createNewChunks)
-					Manager.AddNewChunk();
-			} else {
-				var chunkFileName = lastChunkVersions[0];
-				var chunkHeader = ReadChunkHeader(chunkFileName);
-				var chunkLocalPos = chunkHeader.GetLocalLogPosition(checkpoint);
-				if (chunkHeader.IsScavenged) {
-					// scavenged chunks are first replicated to a temporary file before being atomically switched in.
-					// thus, the writer checkpoint can point to either the beginning or the end of a scavenged chunk.
-					//
-					// if it was pointing to the end of the scavenged chunk, it would be "inside" the next chunk, and we
-					// wouldn't be here (as the next chunk wouldn't exist yet or would not be scavenged)
-					//
-					// thus, the current case is possible only when a scavenged chunk was switched in but
-					// the writer checkpoint wasn't yet updated & flushed. therefore, we expect the writer checkpoint to
-					// point exactly to the beginning of the scavenged chunk. (i.e chunkLocalPos = 0)
-
-					if (chunkLocalPos != 0) {
-						throw new CorruptDatabaseException(new BadChunkInDatabaseException(
-							$"Chunk {chunkFileName} is corrupted. Expected local chunk position: 0 but was {chunkLocalPos}. " +
-							$"Writer checkpoint: {checkpoint}."));
-					}
-
-					var lastChunk = TFChunk.TFChunk.FromCompletedFile(chunkFileName, verifyHash: false,
-						unbufferedRead: Config.Unbuffered,
-						optimizeReadSideCache: Config.OptimizeReadSideCache,
-						reduceFileCachePressure: Config.ReduceFileCachePressure,
-						tracker: _tracker,
-						getTransformFactory: type => TransformManager.GetFactoryForExistingChunk(type));
-
-					lastChunkNum = lastChunk.ChunkHeader.ChunkEndNumber + 1;
-
-					Manager.AddChunk(lastChunk);
-					if (!readOnly) {
-						_log.Information(
-							"Moving the writer checkpoint from {checkpoint} to {chunkEndPosition}, as it points to a scavenged chunk.",
-							checkpoint, lastChunk.ChunkHeader.ChunkEndPosition);
-						Config.WriterCheckpoint.Write(lastChunk.ChunkHeader.ChunkEndPosition);
-						Config.WriterCheckpoint.Flush();
-
-						// as of recent versions, it's possible that a new chunk was already created as the writer checkpoint
-						// is updated & flushed _after_ the new chunk is created. if that's the case, we remove it.
-						var newChunk = Config.FileNamingStrategy.GetFilenameFor(lastChunkNum, 0);
-						if (File.Exists(newChunk))
-							RemoveFile("Removing excessive chunk: {chunk}", newChunk);
-
-						if (createNewChunks)
-							Manager.AddNewChunk();
-					}
-				} else {
-					var lastChunk = TFChunk.TFChunk.FromOngoingFile(chunkFileName, (int)chunkLocalPos,
-						unbuffered: Config.Unbuffered,
-						writethrough: Config.WriteThrough,
-						reduceFileCachePressure: Config.ReduceFileCachePressure,
-						tracker: _tracker,
-						getTransformFactory: type => TransformManager.GetFactoryForExistingChunk(type));
-					Manager.AddChunk(lastChunk);
-				}
-			}
-
-			_log.Information("Ensuring no excessive chunks...");
-			EnsureNoExcessiveChunks(chunkEnumerator, lastChunkNum);
-			_log.Information("Done ensuring no excessive chunks.");
-
-			if (!readOnly) {
-				_log.Information("Removing old chunk versions...");
-				RemoveOldChunksVersions(chunkEnumerator, lastChunkNum);
-				_log.Information("Done removing old chunk versions.");
-
-				_log.Information("Cleaning up temp files...");
-				CleanUpTempFiles();
-				_log.Information("Done cleaning up temp files.");
-			}
-
-			if (verifyHash && lastChunkNum > 0) {
-				var preLastChunk = Manager.GetChunk(lastChunkNum - 1);
-				var lastBgChunkNum = preLastChunk.ChunkHeader.ChunkStartNumber;
-				ThreadPool.QueueUserWorkItem(_ => {
-					for (int chunkNum = lastBgChunkNum; chunkNum >= 0;) {
-						var chunk = Manager.GetChunk(chunkNum);
-						try {
-							chunk.VerifyFileHash();
-						} catch (FileBeingDeletedException exc) {
-							_log.Debug(
-								"{exceptionType} exception was thrown while doing background validation of chunk {chunk}.",
-								exc.GetType().Name, chunk);
-							_log.Debug(
-								"That's probably OK, especially if truncation was request at the same time: {e}.",
-								exc.Message);
-						} catch (Exception exc) {
-							_log.Fatal(exc, "Verification of chunk {chunk} failed, terminating server...",
-								chunk);
-							var msg = string.Format("Verification of chunk {0} failed, terminating server...", chunk);
-							Application.Exit(ExitCode.Error, msg);
-							return;
-						}
-
-						chunkNum = chunk.ChunkHeader.ChunkStartNumber - 1;
-					}
-				});
-			}
-
-			Manager.EnableCaching();
-		}
-
-		private void ValidateReaderChecksumsMustBeLess(TFChunkDbConfig config) {
-			var current = config.WriterCheckpoint.Read();
-			foreach (var checkpoint in new[] {config.ChaserCheckpoint, config.EpochCheckpoint}) {
-				if (checkpoint.Read() > current)
-					throw new CorruptDatabaseException(new ReaderCheckpointHigherThanWriterException(checkpoint.Name));
-			}
-		}
-
-		private static ChunkHeader ReadChunkHeader(string chunkFileName) {
-			ChunkHeader chunkHeader;
-			using (var fs = new FileStream(chunkFileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) {
-				if (fs.Length < ChunkFooter.Size + ChunkHeader.Size) {
-					throw new CorruptDatabaseException(new BadChunkInDatabaseException(
-						string.Format(
-							"Chunk file '{0}' is bad. It does not have enough size for header and footer. File size is {1} bytes.",
-							chunkFileName, fs.Length)));
-				}
-
-				chunkHeader = ChunkHeader.FromStream(fs);
-			}
-
-			return chunkHeader;
-		}
-
-		private static ChunkFooter ReadChunkFooter(string chunkFileName) {
-			ChunkFooter chunkFooter;
-			using (var fs = new FileStream(chunkFileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) {
-				if (fs.Length < ChunkFooter.Size + ChunkHeader.Size) {
-					throw new CorruptDatabaseException(new BadChunkInDatabaseException(
-						string.Format(
-							"Chunk file '{0}' is bad. It does not have enough size for header and footer. File size is {1} bytes.",
-							chunkFileName, fs.Length)));
-				}
-
-				fs.Seek(-ChunkFooter.Size, SeekOrigin.End);
-				chunkFooter = ChunkFooter.FromStream(fs);
-			}
-
-			return chunkFooter;
-		}
-
-		private void EnsureNoExcessiveChunks(TFChunkEnumerator chunkEnumerator, int lastChunkNum) {
-			var extraneousFiles = new List<string>();
-
-			foreach (var chunkInfo in chunkEnumerator.EnumerateChunks(lastChunkNum)) {
-				switch (chunkInfo) {
-					case LatestVersion(var fileName, var start, var end):
-						// there can be at most one excessive chunk at startup:
-						// when a new chunk was created but the writer checkpoint was not yet committed and flushed
-						if (start == lastChunkNum + 1 &&
-						    start == end &&
-						    Config.FileNamingStrategy.GetVersionFor(Path.GetFileName(fileName)) == 0)
-							RemoveFile("Removing excessive chunk: {chunk}", fileName);
-						else if (start > lastChunkNum)
-							extraneousFiles.Add(fileName);
-						break;
-					case OldVersion(var fileName, var start):
-						if (start > lastChunkNum)
-							extraneousFiles.Add(fileName);
-						break;
-				}
-			}
-
-			if (!extraneousFiles.IsEmpty()) {
-				throw new CorruptDatabaseException(new ExtraneousFileFoundException(
-					$"Unexpected files: {string.Join(", ", extraneousFiles)}."));
-			}
-		}
-
-		private void RemoveOldChunksVersions(TFChunkEnumerator chunkEnumerator, int lastChunkNum) {
-			foreach (var chunkInfo in chunkEnumerator.EnumerateChunks(lastChunkNum)) {
-				switch (chunkInfo) {
-					case OldVersion(var fileName, var start):
-						if (start <= lastChunkNum)
-							RemoveFile("Removing old chunk version: {chunk}...", fileName);
-						break;
-				}
-			}
-		}
-
-		private void CleanUpTempFiles() {
-			var tempFiles = Config.FileNamingStrategy.GetAllTempFiles();
-			foreach (string tempFile in tempFiles) {
-				try {
-					RemoveFile("Deleting temporary file {file}...", tempFile);
-				} catch (Exception exc) {
-					_log.Error(exc, "Error while trying to delete remaining temp file: '{tempFile}'.",
-						tempFile);
-				}
-			}
-		}
-
-		private void RemoveFile(string reason, string file) {
-			_log.Debug(reason, file);
-			File.SetAttributes(file, FileAttributes.Normal);
-			File.Delete(file);
-		}
-
-		public void Dispose() {
-			Close();
-		}
-
-		public void Close() {
-			if (Interlocked.CompareExchange(ref _closed, 1, 0) != 0)
-				return;
-
-			bool chunksClosed = false;
-
-			try {
-				chunksClosed = Manager.TryClose();
-			} catch (Exception ex) {
-				_log.Error(ex, "An error has occurred while closing the chunks.");
-			}
-
-			if (!chunksClosed)
-				_log.Debug("One or more chunks are still open; skipping checkpoint flush.");
-
-			Config.WriterCheckpoint.Close(flush: chunksClosed);
-			Config.ChaserCheckpoint.Close(flush: chunksClosed);
-			Config.EpochCheckpoint.Close(flush: chunksClosed);
-			Config.TruncateCheckpoint.Close(flush: chunksClosed);
-			Config.ProposalCheckpoint.Close(flush: chunksClosed);
-			Config.StreamExistenceFilterCheckpoint.Close(flush: chunksClosed);
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunkDbConfig.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunkDbConfig.cs
deleted file mode 100644
index f5fc16d62ff..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFChunkDbConfig.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using EventStore.Common.Utils;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-
-namespace EventStore.Core.TransactionLog.Chunks {
-	public class TFChunkDbConfig {
-		public readonly string Path;
-		public readonly int ChunkSize;
-		public readonly long MaxChunksCacheSize;
-		public readonly ICheckpoint WriterCheckpoint;
-		public readonly ICheckpoint ChaserCheckpoint;
-		public readonly ICheckpoint EpochCheckpoint;
-		public readonly ICheckpoint ProposalCheckpoint;
-		public readonly ICheckpoint TruncateCheckpoint;
-		public readonly ICheckpoint ReplicationCheckpoint;
-		public readonly ICheckpoint IndexCheckpoint;
-		public readonly ICheckpoint StreamExistenceFilterCheckpoint;
-		public readonly IVersionedFileNamingStrategy FileNamingStrategy;
-		public readonly bool InMemDb;
-		public readonly bool Unbuffered;
-		public readonly bool WriteThrough;
-		public readonly bool OptimizeReadSideCache;
-		public readonly bool ReduceFileCachePressure;
-		public readonly long MaxTruncation;
-
-		public TFChunkDbConfig(string path,
-			IVersionedFileNamingStrategy fileNamingStrategy,
-			int chunkSize,
-			long maxChunksCacheSize,
-			ICheckpoint writerCheckpoint,
-			ICheckpoint chaserCheckpoint,
-			ICheckpoint epochCheckpoint,
-			ICheckpoint proposalCheckpoint,
-			ICheckpoint truncateCheckpoint,
-			ICheckpoint replicationCheckpoint,
-			ICheckpoint indexCheckpoint,
-			ICheckpoint streamExistenceFilterCheckpoint,
-			bool inMemDb = false,
-			bool unbuffered = false,
-			bool writethrough = false,
-			bool optimizeReadSideCache = false,
-			bool reduceFileCachePressure = false,
-			long maxTruncation = 256 * 1024 * 1024) {
-			Ensure.NotNullOrEmpty(path, "path");
-			Ensure.NotNull(fileNamingStrategy, "fileNamingStrategy");
-			Ensure.Positive(chunkSize, "chunkSize");
-			Ensure.Nonnegative(maxChunksCacheSize, "maxChunksCacheSize");
-			Ensure.NotNull(writerCheckpoint, "writerCheckpoint");
-			Ensure.NotNull(chaserCheckpoint, "chaserCheckpoint");
-			Ensure.NotNull(epochCheckpoint, "epochCheckpoint");
-			Ensure.NotNull(proposalCheckpoint, "proposalCheckpoint");
-			Ensure.NotNull(truncateCheckpoint, "truncateCheckpoint");
-			Ensure.NotNull(replicationCheckpoint, "replicationCheckpoint");
-			Ensure.NotNull(indexCheckpoint, "indexCheckpoint");
-			Ensure.NotNull(streamExistenceFilterCheckpoint, "streamExistenceFilterCheckpoint");
-
-			Path = path;
-			ChunkSize = chunkSize;
-			MaxChunksCacheSize = maxChunksCacheSize;
-			WriterCheckpoint = writerCheckpoint;
-			ChaserCheckpoint = chaserCheckpoint;
-			EpochCheckpoint = epochCheckpoint;
-			ProposalCheckpoint = proposalCheckpoint;
-			TruncateCheckpoint = truncateCheckpoint;
-			ReplicationCheckpoint = replicationCheckpoint;
-			IndexCheckpoint = indexCheckpoint;
-			StreamExistenceFilterCheckpoint = streamExistenceFilterCheckpoint;
-			FileNamingStrategy = fileNamingStrategy;
-			InMemDb = inMemDb;
-			Unbuffered = unbuffered;
-			WriteThrough = writethrough;
-			OptimizeReadSideCache = optimizeReadSideCache;
-			ReduceFileCachePressure = reduceFileCachePressure;
-			MaxTruncation = maxTruncation;
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunkDbTruncator.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunkDbTruncator.cs
deleted file mode 100644
index 5edeee3b6ad..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFChunkDbTruncator.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using EventStore.Common.Utils;
-using EventStore.Plugins.Transforms;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.TransactionLog.Chunks {
-	public class TFChunkDbTruncator {
-		private static readonly ILogger Log = Serilog.Log.ForContext<TFChunkDbTruncator>();
-
-		private readonly TFChunkDbConfig _config;
-		private readonly Func<TransformType, IChunkTransformFactory> _getTransformFactory;
-
-		public TFChunkDbTruncator(TFChunkDbConfig config, Func<TransformType, IChunkTransformFactory> getTransformFactory) {
-			Ensure.NotNull(config, "config");
-			Ensure.NotNull(getTransformFactory, "getTransformFactory");
-			_config = config;
-			_getTransformFactory = getTransformFactory;
-		}
-
-		public void TruncateDb(long truncateChk) {
-			var writerChk = _config.WriterCheckpoint.Read();
-			var requestedTruncation = writerChk - truncateChk;
-			if (_config.MaxTruncation >= 0 && requestedTruncation > _config.MaxTruncation) {
-				Log.Error(
-					"MaxTruncation is set and truncate checkpoint is out of bounds. MaxTruncation {maxTruncation} vs requested truncation {requestedTruncation} [{writerChk} => {truncateChk}].  To proceed, set MaxTruncation to -1 (no max) or greater than {requestedTruncationHint}.",
-					_config.MaxTruncation, requestedTruncation, writerChk, truncateChk, requestedTruncation);
-				throw new Exception(
-					string.Format("MaxTruncation is set ({0}) and truncate checkpoint is out of bounds (requested truncation is {1} [{2} => {3}]).", _config.MaxTruncation, requestedTruncation, writerChk, truncateChk));
-			}
-
-			var oldLastChunkNum = (int)(writerChk / _config.ChunkSize);
-			var newLastChunkNum = (int)(truncateChk / _config.ChunkSize);
-			var chunkEnumerator = new TFChunkEnumerator(_config.FileNamingStrategy);
-			var truncatingToBoundary = truncateChk % _config.ChunkSize == 0;
-
-			var excessiveChunks = _config.FileNamingStrategy.GetAllVersionsFor(oldLastChunkNum + 1);
-			if (excessiveChunks.Length > 0)
-				throw new Exception(string.Format("During truncation of DB excessive TFChunks were found:\n{0}.",
-					string.Join("\n", excessiveChunks)));
-
-			ChunkHeader newLastChunkHeader = null;
-			string newLastChunkFilename = null;
-
-			// find the chunk to truncate to
-			foreach (var chunkInfo in chunkEnumerator.EnumerateChunks(oldLastChunkNum)) {
-				switch (chunkInfo) {
-					case LatestVersion(var fileName, var _, var end):
-						if (newLastChunkFilename != null || end < newLastChunkNum) break;
-						newLastChunkHeader = ReadChunkHeader(fileName);
-						newLastChunkFilename = fileName;
-						break;
-					case MissingVersion(var fileName, var chunkNum):
-						if (chunkNum < newLastChunkNum)
-							throw new Exception($"Could not find any chunk #{fileName}.");
-						break;
-				}
-			}
-
-			// it's not bad if there is no file, it could have been deleted on previous run
-			if (newLastChunkHeader != null) {
-				var chunksToDelete = new List<string>();
-				var chunkNumToDeleteFrom = newLastChunkNum + 1;
-				if (newLastChunkHeader.IsScavenged) {
-					Log.Information(
-						"Deleting ALL chunks from #{chunkStartNumber} inclusively "
-						+ "as truncation position is in the middle of scavenged chunk.",
-						newLastChunkHeader.ChunkStartNumber);
-					chunkNumToDeleteFrom = newLastChunkHeader.ChunkStartNumber;
-				} else if (truncatingToBoundary) {
-					// we're truncating to a chunk boundary:
-					// delete the chunk after the boundary so that we can re-replicate the chunk header from the leader
-					chunkNumToDeleteFrom--;
-				}
-
-				foreach (var chunkInfo in chunkEnumerator.EnumerateChunks(oldLastChunkNum)) {
-					switch (chunkInfo) {
-						case LatestVersion(var fileName, var start, _):
-							if (start >= chunkNumToDeleteFrom)
-								chunksToDelete.Add(fileName);
-							break;
-						case OldVersion(var fileName, var start):
-							if (start >= chunkNumToDeleteFrom)
-								chunksToDelete.Add(fileName);
-							break;
-					}
-				}
-
-				// we need to remove excessive chunks from largest number to lowest one, so in case of crash
-				// mid-process, we don't end up with broken non-sequential chunks sequence.
-				chunksToDelete.Reverse();
-				foreach (var chunkFile in chunksToDelete) {
-					Log.Information("File {chunk} will be deleted during TruncateDb procedure.", chunkFile);
-					File.SetAttributes(chunkFile, FileAttributes.Normal);
-					File.Delete(chunkFile);
-				}
-
-				if (!newLastChunkHeader.IsScavenged && !truncatingToBoundary) {
-					TruncateChunkAndFillWithZeros(newLastChunkHeader, newLastChunkFilename, truncateChk);
-				} else {
-					truncateChk = newLastChunkHeader.ChunkStartPosition;
-					Log.Information(
-						"Setting TruncateCheckpoint to {truncateCheckpoint} "
-						+ "as truncation position is in the middle of scavenged chunk.",
-						truncateChk);
-				}
-			}
-
-			// Note: Prior to going offline for truncation, we attempt to set the epoch checkpoint to an epoch record
-			// located before the truncate position (if such a record is present in the epoch cache).
-			// This saves us from resetting it to -1 here and also saves us from scanning the transaction log for
-			// a proper epoch record during startup.
-			if (_config.EpochCheckpoint.Read() >= truncateChk) {
-				var epochChk = _config.EpochCheckpoint.Read();
-				Log.Information("Truncating epoch from {epochFrom} (0x{epochFrom:X}) to {epochTo} (0x{epochTo:X}).", epochChk,
-					epochChk, -1, -1);
-				_config.EpochCheckpoint.Write(-1);
-				_config.EpochCheckpoint.Flush();
-			}
-
-			if (_config.ChaserCheckpoint.Read() > truncateChk) {
-				var chaserChk = _config.ChaserCheckpoint.Read();
-				Log.Information(
-					"Truncating chaser from {chaserCheckpoint} (0x{chaserCheckpoint:X}) to {truncateCheckpoint} (0x{truncateCheckpoint:X}).",
-					chaserChk, chaserChk, truncateChk, truncateChk);
-				_config.ChaserCheckpoint.Write(truncateChk);
-				_config.ChaserCheckpoint.Flush();
-			}
-
-			if (_config.WriterCheckpoint.Read() > truncateChk) {
-				var writerCheckpoint = _config.WriterCheckpoint.Read();
-				Log.Information(
-					"Truncating writer from {writerCheckpoint} (0x{writerCheckpoint:X}) to {truncateCheckpoint} (0x{truncateCheckpoint:X}).",
-					writerCheckpoint, writerCheckpoint, truncateChk, truncateChk);
-				_config.WriterCheckpoint.Write(truncateChk);
-				_config.WriterCheckpoint.Flush();
-			}
-
-			Log.Information("Resetting TruncateCheckpoint to {truncateCheckpoint} (0x{truncateCheckpoint:X}).", -1, -1);
-			_config.TruncateCheckpoint.Write(-1);
-			_config.TruncateCheckpoint.Flush();
-		}
-
-		private void TruncateChunkAndFillWithZeros(ChunkHeader chunkHeader, string chunkFilename, long truncateChk) {
-			if (chunkHeader.IsScavenged
-			    || chunkHeader.ChunkStartNumber != chunkHeader.ChunkEndNumber
-			    || truncateChk < chunkHeader.ChunkStartPosition
-			    || truncateChk >= chunkHeader.ChunkEndPosition) {
-				throw new Exception(
-					string.Format(
-						"Chunk #{0}-{1} ({2}) is not correct unscavenged chunk. TruncatePosition: {3}, ChunkHeader: {4}.",
-						chunkHeader.ChunkStartNumber, chunkHeader.ChunkEndNumber, chunkFilename, truncateChk,
-						chunkHeader));
-			}
-
-			var transformFactory = _getTransformFactory(chunkHeader.TransformType);
-			var newDataSize = transformFactory.TransformDataPosition(chunkHeader.ChunkSize);
-			var newFileSize = TFChunk.TFChunk.GetAlignedSize(ChunkHeader.Size + newDataSize + ChunkFooter.Size);
-			var dataTruncatePos = transformFactory.TransformDataPosition((int) chunkHeader.GetLocalLogPosition(truncateChk));
-
-			File.SetAttributes(chunkFilename, FileAttributes.Normal);
-			using (var fs = new FileStream(chunkFilename, FileMode.Open, FileAccess.ReadWrite, FileShare.Read)) {
-				fs.SetLength(newFileSize);
-				fs.Position = ChunkHeader.Size + dataTruncatePos;
-				var zeros = new byte[65536];
-				var leftToWrite = fs.Length - fs.Position;
-				while (leftToWrite > 0) {
-					var toWrite = (int)Math.Min(leftToWrite, zeros.Length);
-					fs.Write(zeros, 0, toWrite);
-					leftToWrite -= toWrite;
-				}
-
-				fs.FlushToDisk();
-			}
-		}
-
-		private static ChunkHeader ReadChunkHeader(string chunkFileName) {
-			ChunkHeader chunkHeader;
-			using (var fs = new FileStream(chunkFileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) {
-				chunkHeader = ChunkHeader.FromStream(fs);
-			}
-
-			return chunkHeader;
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunkEnumerator.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunkEnumerator.cs
deleted file mode 100644
index b5eb610ce91..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFChunkEnumerator.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using EventStore.Core.Exceptions;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-
-namespace EventStore.Core.TransactionLog.Chunks {
-	public class TFChunkEnumerator {
-		private readonly IVersionedFileNamingStrategy _chunkFileNamingStrategy;
-		private string[] _allFiles;
-		private readonly Dictionary<string, int> _nextChunkNumber;
-
-		public TFChunkEnumerator(IVersionedFileNamingStrategy chunkFileNamingStrategy) {
-			_chunkFileNamingStrategy = chunkFileNamingStrategy;
-			_allFiles = null;
-			_nextChunkNumber = new Dictionary<string, int>();
-		}
-
-		public IEnumerable<TFChunkInfo> EnumerateChunks(int lastChunkNumber,
-			Func<(string fileName, int fileStartNumber, int fileVersion), int> getNextChunkNumber = null) {
-			getNextChunkNumber ??= GetNextChunkNumber;
-
-			if (_allFiles == null) {
-				var allFiles = _chunkFileNamingStrategy.GetAllPresentFiles();
-				Array.Sort(allFiles, StringComparer.CurrentCultureIgnoreCase);
-				_allFiles = allFiles;
-			}
-
-			int expectedChunkNumber = 0;
-			for (int i = 0; i < _allFiles.Length; i++) {
-				var chunkFileName = _allFiles[i];
-				var chunkNumber = _chunkFileNamingStrategy.GetIndexFor(Path.GetFileName(_allFiles[i]));
-				var nextChunkNumber = -1;
-				if (i + 1 < _allFiles.Length)
-					nextChunkNumber = _chunkFileNamingStrategy.GetIndexFor(Path.GetFileName(_allFiles[i+1]));
-
-				if (chunkNumber < expectedChunkNumber) { // present in an earlier, merged, chunk
-					yield return new OldVersion(chunkFileName, chunkNumber);
-					continue;
-				}
-
-				if (chunkNumber > expectedChunkNumber) { // one or more chunks are missing
-					for (int j = expectedChunkNumber; j < chunkNumber; j++) {
-						yield return new MissingVersion(_chunkFileNamingStrategy.GetFilenameFor(j, 0), j);
-					}
-					// set the expected chunk number to prevent calling onFileMissing() again for the same chunk numbers
-					expectedChunkNumber = chunkNumber;
-				}
-
-				if (chunkNumber == nextChunkNumber) { // there is a newer version of this chunk
-					yield return new OldVersion(chunkFileName, chunkNumber);
-				} else { // latest version of chunk with the expected chunk number
-					expectedChunkNumber = getNextChunkNumber((chunkFileName, chunkNumber, _chunkFileNamingStrategy.GetVersionFor(Path.GetFileName(chunkFileName))));
-					yield return new LatestVersion(chunkFileName, chunkNumber, expectedChunkNumber - 1);
-				}
-			}
-
-			for (int i = expectedChunkNumber; i <= lastChunkNumber; i++) {
-				yield return new MissingVersion(_chunkFileNamingStrategy.GetFilenameFor(i, 0), i);
-			}
-		}
-
-		private int GetNextChunkNumber((string chunkFileName, int chunkNumber, int chunkVersion) t) {
-			if (t.chunkVersion == 0)
-				return t.chunkNumber + 1;
-
-			// we only cache next chunk numbers for chunks having a non-zero version
-			if (_nextChunkNumber.TryGetValue(t.chunkFileName, out var nextChunkNumber))
-				return nextChunkNumber;
-
-			var header = ReadChunkHeader(t.chunkFileName);
-			_nextChunkNumber[t.chunkFileName] = header.ChunkEndNumber + 1;
-			return header.ChunkEndNumber + 1;
-		}
-
-		private static ChunkHeader ReadChunkHeader(string chunkFileName) {
-			ChunkHeader chunkHeader;
-			using (var fs = new FileStream(chunkFileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) {
-				if (fs.Length < ChunkFooter.Size + ChunkHeader.Size) {
-					throw new CorruptDatabaseException(new BadChunkInDatabaseException(
-						$"Chunk file '{chunkFileName}' is bad. It does not have enough size for header and footer. File size is {fs.Length} bytes."));
-				}
-				chunkHeader = ChunkHeader.FromStream(fs);
-			}
-
-			return chunkHeader;
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunkInfo.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunkInfo.cs
deleted file mode 100644
index c52edac987a..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFChunkInfo.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.Core.TransactionLog.Chunks {
-	public record TFChunkInfo(string fileName);
-	public record LatestVersion(string fileName, int start, int end) : TFChunkInfo(fileName);
-	public record OldVersion(string fileName, int start) : TFChunkInfo(fileName);
-	public record MissingVersion(string fileName, int start) : TFChunkInfo(fileName);
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunkManager.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunkManager.cs
deleted file mode 100644
index b1652c999a7..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFChunkManager.cs
+++ /dev/null
@@ -1,353 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Threading;
-using EventStore.Common.Utils;
-using System.Linq;
-using EventStore.Core.Transforms;
-using EventStore.Core.Transforms.Identity;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.TransactionLog.Chunks {
-	public class TFChunkManager {
-		private static readonly ILogger Log = Serilog.Log.ForContext<TFChunkManager>();
-
-		// MaxChunksCount is currently capped at 400,000 since:
-		// - the chunk file naming strategy supports only up to 6 digits for the chunk number.
-		// - this class uses a fixed size array to keep the chunk list
-		public const int MaxChunksCount = 400_000;
-
-		public int ChunksCount {
-			get { return _chunksCount; }
-		}
-
-		private readonly TFChunkDbConfig _config;
-		private readonly TFChunk.TFChunk[] _chunks = new TFChunk.TFChunk[MaxChunksCount];
-		private readonly ITransactionFileTracker _tracker;
-		private readonly DbTransformManager _transformManager;
-
-		private volatile int _chunksCount;
-		private volatile bool _cachingEnabled;
-
-		private readonly object _chunksLocker = new object();
-		private int _backgroundPassesRemaining;
-		private int _backgroundRunning;
-
-		public TFChunkManager(TFChunkDbConfig config, ITransactionFileTracker tracker, DbTransformManager transformManager) {
-			Ensure.NotNull(config, "config");
-			_config = config;
-			_tracker = tracker;
-			_transformManager = transformManager;
-		}
-
-		public void EnableCaching() {
-			lock (_chunksLocker) {
-				_cachingEnabled = true;
-				TriggerBackgroundCaching();
-			}
-		}
-
-		private void BackgroundCachingProcess(object state) {
-			do {
-				do {
-					CacheUncacheReadOnlyChunks();
-				} while (Interlocked.Decrement(ref _backgroundPassesRemaining) > 0);
-
-				Interlocked.Exchange(ref _backgroundRunning, 0);
-			} while (Interlocked.CompareExchange(ref _backgroundPassesRemaining, 0, 0) > 0
-			         && Interlocked.CompareExchange(ref _backgroundRunning, 1, 0) == 0);
-		}
-
-		private void CacheUncacheReadOnlyChunks() {
-			int lastChunkToCache;
-			lock (_chunksLocker) {
-				long totalSize = 0;
-				lastChunkToCache = _chunksCount;
-
-				for (int chunkNum = _chunksCount - 1; chunkNum >= 0;) {
-					var chunk = _chunks[chunkNum];
-					var chunkSize = chunk.IsReadOnly
-						? chunk.ChunkFooter.PhysicalDataSize + chunk.ChunkFooter.MapSize + ChunkHeader.Size +
-						  ChunkFooter.Size
-						: chunk.ChunkHeader.ChunkSize + ChunkHeader.Size + ChunkFooter.Size;
-
-					if (totalSize + chunkSize > _config.MaxChunksCacheSize)
-						break;
-
-					totalSize += chunkSize;
-					lastChunkToCache = chunk.ChunkHeader.ChunkStartNumber;
-
-					chunkNum = chunk.ChunkHeader.ChunkStartNumber - 1;
-				}
-			}
-
-			for (int chunkNum = lastChunkToCache - 1; chunkNum >= 0;) {
-				var chunk = _chunks[chunkNum];
-				if (chunk.IsReadOnly)
-					chunk.UnCacheFromMemory();
-				chunkNum = chunk.ChunkHeader.ChunkStartNumber - 1;
-			}
-
-			for (int chunkNum = lastChunkToCache; chunkNum < _chunksCount;) {
-				var chunk = _chunks[chunkNum];
-				if (chunk.IsReadOnly)
-					chunk.CacheInMemory();
-				chunkNum = chunk.ChunkHeader.ChunkEndNumber + 1;
-			}
-		}
-
-		public TFChunk.TFChunk CreateTempChunk(ChunkHeader chunkHeader, int fileSize) {
-			var chunkFileName = _config.FileNamingStrategy.GetTempFilename();
-			return TFChunk.TFChunk.CreateWithHeader(chunkFileName,
-				chunkHeader,
-				fileSize,
-				_config.InMemDb,
-				_config.Unbuffered,
-				_config.WriteThrough,
-				_config.ReduceFileCachePressure,
-				_tracker,
-				// temporary chunks are used for replicating raw (scavenged) chunks.
-				// since the raw data being replicated is already transformed, we use
-				// the identity transform as we don't want to transform the data again
-				// when appending raw data to the chunk.
-				new IdentityChunkTransformFactory(),
-				ReadOnlyMemory<byte>.Empty);
-		}
-
-		public TFChunk.TFChunk AddNewChunk() {
-			lock (_chunksLocker) {
-				var chunkNumber = _chunksCount;
-				var chunkName = _config.FileNamingStrategy.GetFilenameFor(chunkNumber, 0);
-				var chunk = TFChunk.TFChunk.CreateNew(chunkName,
-					_config.ChunkSize,
-					chunkNumber,
-					chunkNumber,
-					isScavenged: false,
-					inMem: _config.InMemDb,
-					unbuffered: _config.Unbuffered,
-					writethrough: _config.WriteThrough,
-					reduceFileCachePressure: _config.ReduceFileCachePressure,
-					tracker: _tracker,
-					transformFactory: _transformManager.GetFactoryForNewChunk());
-				AddChunk(chunk);
-				return chunk;
-			}
-		}
-
-		public TFChunk.TFChunk AddNewChunk(ChunkHeader chunkHeader, ReadOnlyMemory<byte> transformHeader, int fileSize) {
-			Ensure.NotNull(chunkHeader, "chunkHeader");
-			Ensure.Positive(fileSize, "fileSize");
-
-			lock (_chunksLocker) {
-				if (chunkHeader.ChunkStartNumber != _chunksCount)
-					throw new Exception(string.Format(
-						"Received request to create a new ongoing chunk #{0}-{1}, but current chunks count is {2}.",
-						chunkHeader.ChunkStartNumber, chunkHeader.ChunkEndNumber, _chunksCount));
-
-				var chunkName = _config.FileNamingStrategy.GetFilenameFor(chunkHeader.ChunkStartNumber, 0);
-				var chunk = TFChunk.TFChunk.CreateWithHeader(chunkName,
-					chunkHeader,
-					fileSize,
-					_config.InMemDb,
-					unbuffered: _config.Unbuffered,
-					writethrough: _config.WriteThrough,
-					reduceFileCachePressure: _config.ReduceFileCachePressure,
-					tracker: _tracker,
-					transformFactory: _transformManager.GetFactoryForExistingChunk(chunkHeader.TransformType),
-					transformHeader: transformHeader);
-				AddChunk(chunk);
-				return chunk;
-			}
-		}
-
-		public void AddChunk(TFChunk.TFChunk chunk) {
-			Ensure.NotNull(chunk, "chunk");
-
-			lock (_chunksLocker) {
-				for (int i = chunk.ChunkHeader.ChunkStartNumber; i <= chunk.ChunkHeader.ChunkEndNumber; ++i) {
-					_chunks[i] = chunk;
-				}
-
-				_chunksCount = Math.Max(chunk.ChunkHeader.ChunkEndNumber + 1, _chunksCount);
-
-				TriggerBackgroundCaching();
-			}
-		}
-
-		public TFChunk.TFChunk SwitchChunk(TFChunk.TFChunk chunk, bool verifyHash,
-			bool removeChunksWithGreaterNumbers) {
-			Ensure.NotNull(chunk, "chunk");
-			if (!chunk.IsReadOnly)
-				throw new ArgumentException(string.Format("Passed TFChunk is not completed: {0}.", chunk.FileName));
-
-			var chunkHeader = chunk.ChunkHeader;
-			var oldFileName = chunk.FileName;
-
-			Log.Information("Switching chunk #{chunkStartNumber}-{chunkEndNumber} ({oldFileName})...",
-				chunkHeader.ChunkStartNumber, chunkHeader.ChunkEndNumber, Path.GetFileName(oldFileName));
-			TFChunk.TFChunk newChunk;
-
-			if (_config.InMemDb)
-				newChunk = chunk;
-			else {
-				chunk.Dispose();
-				try {
-					chunk.WaitForDestroy(0); // should happen immediately
-				} catch (TimeoutException exc) {
-					throw new Exception(
-						string.Format("The chunk that is being switched {0} is used by someone else.", chunk), exc);
-				}
-
-				var newFileName =
-					_config.FileNamingStrategy.DetermineBestVersionFilenameFor(chunkHeader.ChunkStartNumber, initialVersion: 1);
-				Log.Information("File {oldFileName} will be moved to file {newFileName}", Path.GetFileName(oldFileName),
-					Path.GetFileName(newFileName));
-				try {
-					File.Move(oldFileName, newFileName);
-				} catch (IOException) {
-					WindowsProcessUtil.PrintWhoIsLocking(oldFileName, Log);
-					WindowsProcessUtil.PrintWhoIsLocking(newFileName, Log);
-					throw;
-				}
-
-				newChunk = TFChunk.TFChunk.FromCompletedFile(newFileName, verifyHash, _config.Unbuffered,
-					_tracker, type => _transformManager.GetFactoryForExistingChunk(type),
-					_config.OptimizeReadSideCache, _config.ReduceFileCachePressure);
-			}
-
-			lock (_chunksLocker) {
-				if (!ReplaceChunksWith(newChunk, "Old")) {
-					Log.Information("Chunk {chunk} will be not switched, marking for remove...", newChunk);
-					newChunk.MarkForDeletion();
-				}
-
-				if (removeChunksWithGreaterNumbers) {
-					var oldChunksCount = _chunksCount;
-					_chunksCount = newChunk.ChunkHeader.ChunkEndNumber + 1;
-					RemoveChunks(chunkHeader.ChunkEndNumber + 1, oldChunksCount - 1, "Excessive");
-					if (_chunks[_chunksCount] != null)
-						throw new Exception(string.Format("Excessive chunk #{0} found after raw replication switch.",
-							_chunksCount));
-				}
-
-				TriggerBackgroundCaching();
-				return newChunk;
-			}
-		}
-
-		private bool ReplaceChunksWith(TFChunk.TFChunk newChunk, string chunkExplanation) {
-			var chunkStartNumber = newChunk.ChunkHeader.ChunkStartNumber;
-			var chunkEndNumber = newChunk.ChunkHeader.ChunkEndNumber;
-			for (int i = chunkStartNumber; i <= chunkEndNumber;) {
-				var chunk = _chunks[i];
-				if (chunk != null) {
-					var chunkHeader = chunk.ChunkHeader;
-					if (chunkHeader.ChunkStartNumber < chunkStartNumber || chunkHeader.ChunkEndNumber > chunkEndNumber)
-						return false;
-					i = chunkHeader.ChunkEndNumber + 1;
-				} else {
-					//Cover the case of initial replication of merged chunks where they were never set
-					// in the map in the first place.
-					i = i + 1;
-				}
-			}
-
-			TFChunk.TFChunk previousRemovedChunk = null;
-			for (int i = chunkStartNumber; i <= chunkEndNumber; i += 1) {
-				var oldChunk = Interlocked.Exchange(ref _chunks[i], newChunk);
-				if (!ReferenceEquals(previousRemovedChunk, oldChunk)) {
-					// Once we've swapped all entries for the previousRemovedChunk we can safely delete it.
-					if (previousRemovedChunk != null) {
-						previousRemovedChunk.MarkForDeletion();
-						Log.Information("{chunkExplanation} chunk #{oldChunk} is marked for deletion.", chunkExplanation,
-							previousRemovedChunk);
-					}
-
-					previousRemovedChunk = oldChunk;
-				}
-			}
-
-			if (previousRemovedChunk != null) {
-				// Delete the last chunk swapped out now it's fully replaced.
-				previousRemovedChunk.MarkForDeletion();
-				Log.Information("{chunkExplanation} chunk #{oldChunk} is marked for deletion.", chunkExplanation,
-					previousRemovedChunk);
-			}
-
-			return true;
-		}
-
-		private void RemoveChunks(int chunkStartNumber, int chunkEndNumber, string chunkExplanation) {
-			TFChunk.TFChunk lastRemovedChunk = null;
-			for (int i = chunkStartNumber; i <= chunkEndNumber; i += 1) {
-				var oldChunk = Interlocked.Exchange(ref _chunks[i], null);
-				if (oldChunk != null && !ReferenceEquals(lastRemovedChunk, oldChunk)) {
-					oldChunk.MarkForDeletion();
-					Log.Information("{chunkExplanation} chunk {oldChunk} is marked for deletion.", chunkExplanation, oldChunk);
-				}
-
-				lastRemovedChunk = oldChunk;
-			}
-		}
-
-		private void TriggerBackgroundCaching() {
-			if (!_cachingEnabled)
-				return;
-
-			Interlocked.Increment(ref _backgroundPassesRemaining);
-			if (Interlocked.CompareExchange(ref _backgroundRunning, 1, 0) == 0)
-				ThreadPool.QueueUserWorkItem(BackgroundCachingProcess);
-		}
-
-		public bool TryGetChunkFor(long logPosition, out TFChunk.TFChunk chunk) {
-			try {
-				chunk = GetChunkFor(logPosition);
-				return true;
-			} catch {
-				chunk = null;
-				return false;
-			}
-		}
-
-		public TFChunk.TFChunk GetChunkFor(long logPosition) {
-			var chunkNum = (int)(logPosition / _config.ChunkSize);
-			if (chunkNum < 0 || chunkNum >= _chunksCount)
-				throw new ArgumentOutOfRangeException("logPosition",
-					string.Format("LogPosition {0} does not have corresponding chunk in DB.", logPosition));
-
-			var chunk = _chunks[chunkNum];
-			if (chunk == null)
-				throw new Exception(string.Format(
-					"Requested chunk for LogPosition {0}, which is not present in TFChunkManager.", logPosition));
-			return chunk;
-		}
-
-		public TFChunk.TFChunk GetChunk(int chunkNum) {
-			if (chunkNum < 0 || chunkNum >= _chunksCount)
-				throw new ArgumentOutOfRangeException("chunkNum",
-					string.Format("Chunk #{0} is not present in DB.", chunkNum));
-
-			var chunk = _chunks[chunkNum];
-			if (chunk == null)
-				throw new Exception(string.Format("Requested chunk #{0}, which is not present in TFChunkManager.",
-					chunkNum));
-			return chunk;
-		}
-
-		public TFChunk.TFChunk GetChunkForOrDefault(string path) {
-			return _chunks != null ? _chunks.FirstOrDefault(c => c != null && c.FileName == path) : null;
-		}
-
-		public bool TryClose() {
-			var allChunksClosed = true;
-			lock (_chunksLocker) {
-				for (int i = 0; i < _chunksCount; ++i) {
-					if (_chunks[i] != null)
-						allChunksClosed &= _chunks[i].TryClose();
-				}
-			}
-
-			return allChunksClosed;
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunkReader.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunkReader.cs
deleted file mode 100644
index 062bbc0c707..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFChunkReader.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Exceptions;
-using EventStore.Core.TransactionLog.Checkpoint;
-using Serilog;
-
-namespace EventStore.Core.TransactionLog.Chunks {
-	public class TFChunkReader : ITransactionFileReader {
-		internal static long CachedReads;
-		internal static long NotCachedReads;
-
-		public const int MaxRetries = 20;
-
-		public long CurrentPosition {
-			get { return _curPos; }
-		}
-
-		private readonly TFChunkDb _db;
-		private readonly IReadOnlyCheckpoint _writerCheckpoint;
-		private long _curPos;
-		private bool _optimizeReadSideCache;
-		private readonly TFChunkReaderExistsAtOptimizer _existsAtOptimizer;
-		private readonly ILogger _log = Log.ForContext<TFChunkReader>();
-
-		public TFChunkReader(TFChunkDb db, IReadOnlyCheckpoint writerCheckpoint, long initialPosition = 0,
-			bool optimizeReadSideCache = false) {
-			Ensure.NotNull(db, "dbConfig");
-			Ensure.NotNull(writerCheckpoint, "writerCheckpoint");
-			Ensure.Nonnegative(initialPosition, "initialPosition");
-
-			_db = db;
-			_writerCheckpoint = writerCheckpoint;
-			_curPos = initialPosition;
-
-			_optimizeReadSideCache = optimizeReadSideCache;
-			if (_optimizeReadSideCache)
-				_existsAtOptimizer = TFChunkReaderExistsAtOptimizer.Instance;
-		}
-
-		public void Reposition(long position) {
-			_curPos = position;
-		}
-
-		public SeqReadResult TryReadNext() {
-			return TryReadNextInternal(0);
-		}
-
-		private SeqReadResult TryReadNextInternal(int retries) {
-			while (true) {
-				var pos = _curPos;
-				var writerChk = _writerCheckpoint.Read();
-				if (pos >= writerChk)
-					return SeqReadResult.Failure;
-
-				var chunk = _db.Manager.GetChunkFor(pos);
-				RecordReadResult result;
-				try {
-					result = chunk.TryReadClosestForward(chunk.ChunkHeader.GetLocalLogPosition(pos));
-					CountRead(chunk.IsCached);
-				} catch (FileBeingDeletedException) {
-					if (retries > MaxRetries)
-						throw new Exception(
-							string.Format(
-								"Got a file that was being deleted {0} times from TFChunkDb, likely a bug there.",
-								MaxRetries));
-					return TryReadNextInternal(retries + 1);
-				}
-
-				if (result.Success) {
-					_curPos = chunk.ChunkHeader.ChunkStartPosition + result.NextPosition;
-					var postPos =
-						result.LogRecord.GetNextLogPosition(result.LogRecord.LogPosition, result.RecordLength);
-					var eof = postPos == writerChk;
-					return new SeqReadResult(
-						true, eof, result.LogRecord, result.RecordLength, result.LogRecord.LogPosition, postPos);
-				}
-
-				// we are the end of chunk
-				_curPos = chunk.ChunkHeader.ChunkEndPosition; // the start of next physical chunk
-			}
-		}
-
-		public SeqReadResult TryReadPrev() {
-			return TryReadPrevInternal(0);
-		}
-
-		private SeqReadResult TryReadPrevInternal(int retries) {
-			while (true) {
-				var pos = _curPos;
-				var writerChk = _writerCheckpoint.Read();
-				// we allow == writerChk, that means read the very last record
-				if (pos > writerChk)
-					throw new Exception(string.Format(
-						"Requested position {0} is greater than writer checkpoint {1} when requesting to read previous record from TF.",
-						pos, writerChk));
-				if (pos <= 0)
-					return SeqReadResult.Failure;
-
-				var chunk = _db.Manager.GetChunkFor(pos);
-				bool readLast = false;
-				if (pos == chunk.ChunkHeader.ChunkStartPosition) {
-					// we are exactly at the boundary of physical chunks
-					// so we switch to previous chunk and request TryReadLast
-					readLast = true;
-					chunk = _db.Manager.GetChunkFor(pos - 1);
-				}
-
-				RecordReadResult result;
-				try {
-					result = readLast
-						? chunk.TryReadLast()
-						: chunk.TryReadClosestBackward(chunk.ChunkHeader.GetLocalLogPosition(pos));
-					CountRead(chunk.IsCached);
-				} catch (FileBeingDeletedException) {
-					if (retries > MaxRetries)
-						throw new Exception(string.Format(
-							"Got a file that was being deleted {0} times from TFChunkDb, likely a bug there.",
-							MaxRetries));
-					return TryReadPrevInternal(retries + 1);
-				}
-
-				if (result.Success) {
-					_curPos = chunk.ChunkHeader.ChunkStartPosition + result.NextPosition;
-					var postPos =
-						result.LogRecord.GetNextLogPosition(result.LogRecord.LogPosition, result.RecordLength);
-					var eof = postPos == writerChk;
-					var res = new SeqReadResult(true, eof, result.LogRecord, result.RecordLength,
-						result.LogRecord.LogPosition, postPos);
-					return res;
-				}
-
-				// we are the beginning of chunk, so need to switch to previous one
-				// to do that we set cur position to the exact boundary position between current and previous chunk,
-				// this will be handled correctly on next iteration
-				_curPos = chunk.ChunkHeader.ChunkStartPosition;
-			}
-		}
-
-		public RecordReadResult TryReadAt(long position, bool couldBeScavenged) {
-			return TryReadAtInternal(position, couldBeScavenged, 0);
-		}
-
-		private RecordReadResult TryReadAtInternal(long position, bool couldBeScavenged, int retries) {
-			var writerChk = _writerCheckpoint.Read();
-			if (position >= writerChk) {
-				_log.Warning(
-					"Attempted to read at position {position}, which is further than writer checkpoint {writerChk}",
-					position, writerChk);
-				return RecordReadResult.Failure;
-			}
-
-			var chunk = _db.Manager.GetChunkFor(position);
-			try {
-				CountRead(chunk.IsCached);
-				return chunk.TryReadAt(chunk.ChunkHeader.GetLocalLogPosition(position), couldBeScavenged);
-			} catch (FileBeingDeletedException) {
-				if (retries > MaxRetries)
-					throw new FileBeingDeletedException(
-						"Been told the file was deleted > MaxRetries times. Probably a problem in db.");
-				return TryReadAtInternal(position, couldBeScavenged, retries + 1);
-			}
-		}
-
-		public bool ExistsAt(long position) {
-			return ExistsAtInternal(position, 0);
-		}
-
-		private bool ExistsAtInternal(long position, int retries) {
-			var writerChk = _writerCheckpoint.Read();
-			if (position >= writerChk)
-				return false;
-
-			var chunk = _db.Manager.GetChunkFor(position);
-			try {
-				CountRead(chunk.IsCached);
-				if (_optimizeReadSideCache)
-					_existsAtOptimizer.Optimize(chunk);
-				return chunk.ExistsAt(chunk.ChunkHeader.GetLocalLogPosition(position));
-			} catch (FileBeingDeletedException) {
-				if (retries > MaxRetries)
-					throw new FileBeingDeletedException(
-						"Been told the file was deleted > MaxRetries times. Probably a problem in db.");
-				return ExistsAtInternal(position, retries + 1);
-			}
-		}
-
-		private static void CountRead(bool isCached) {
-			if (isCached)
-				Interlocked.Increment(ref CachedReads);
-			else
-				Interlocked.Increment(ref NotCachedReads);
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunkReaderExistsAtOptimizer.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunkReaderExistsAtOptimizer.cs
deleted file mode 100644
index 52ac822570b..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFChunkReaderExistsAtOptimizer.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using EventStore.Core.DataStructures;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.TransactionLog.Chunks {
-	public class TFChunkReaderExistsAtOptimizer {
-		private static TFChunkReaderExistsAtOptimizer _instance;
-
-		public static TFChunkReaderExistsAtOptimizer Instance {
-			get {
-				// we don't want two of these things so lock to make sure...
-				if (_instance == null)
-					lock (typeof(TFChunkReaderExistsAtOptimizer))
-						if (_instance == null)
-							_instance = new TFChunkReaderExistsAtOptimizer(MaxBloomFiltersCached);
-
-				return _instance;
-			}
-		}
-
-		//Least-Recently-Used cache to keep track of scavenged TFChunks that have cached bloom filters
-		private readonly ILRUCache<string, TFChunk.TFChunk> _cache;
-
-		private const int
-			MaxBloomFiltersCached =
-				10000; //around 5GB RAM max if we consider 200,000 log positions/chunk and 20 bits/log position
-
-		private static readonly ILogger Log = Serilog.Log.ForContext<TFChunkReaderExistsAtOptimizer>();
-
-
-		public TFChunkReaderExistsAtOptimizer(int maxCached) {
-			Func<object, bool> onPut = (o) => {
-				var chunk = (TFChunk.TFChunk)o;
-				if (chunk == null)
-					return false;
-				Log.Debug("Optimizing chunk {chunk} for fast merge...", chunk.FileName);
-				chunk.OptimizeExistsAt();
-				return true;
-			};
-
-			Func<object, bool> onRemove = (o) => {
-				var chunk = (TFChunk.TFChunk)o;
-				if (chunk == null)
-					return false;
-				Log.Debug("Clearing fast merge optimizations from chunk {chunk}...", chunk.FileName);
-				chunk.DeOptimizeExistsAt();
-				return true;
-			};
-
-			_cache = new LRUCache<string, TFChunk.TFChunk>("ExistsAtOptimizedChunks", maxCached, onPut, onRemove);
-		}
-
-		public void Optimize(TFChunk.TFChunk chunk) {
-			if (!chunk.ChunkHeader.IsScavenged) return;
-			_cache.Put(chunk.FileName, chunk);
-		}
-
-		public bool IsOptimized(TFChunk.TFChunk chunk) {
-			TFChunk.TFChunk value;
-			return _cache.TryGet(chunk.FileName, out value);
-		}
-
-		public void DeOptimizeAll() {
-			_cache.Clear();
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunkScavenger.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunkScavenger.cs
deleted file mode 100644
index d4fc3e4abd9..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFChunkScavenger.cs
+++ /dev/null
@@ -1,835 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-using DotNext.Diagnostics;
-using DotNext.Runtime.CompilerServices;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.DataStructures;
-using EventStore.Core.Exceptions;
-using EventStore.Core.Index;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.TransactionLog.Scavenging;
-using EventStore.LogCommon;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.TransactionLog.Chunks {
-	public abstract class TFChunkScavenger {
-		public const int MaxThreadCount = 4;
-		public const int MaxRetryCount = 5;
-		public const int FlushPageInterval = 32; // max 65536 pages to write resulting in 2048 flushes per chunk
-	}
-
-	public class TFChunkScavenger<TStreamId> : TFChunkScavenger {
-		private readonly ILogger _logger;
-		private readonly TFChunkDb _db;
-		private readonly ITFChunkScavengerLog _scavengerLog;
-		private readonly ITableIndex<TStreamId> _tableIndex;
-		private readonly IReadIndex<TStreamId> _readIndex;
-		private readonly IMetastreamLookup<TStreamId> _metastreams;
-		private readonly long _maxChunkDataSize;
-		private readonly bool _unsafeIgnoreHardDeletes;
-		private readonly int _threads;
-
-		public TFChunkScavenger(ILogger logger, TFChunkDb db, ITFChunkScavengerLog scavengerLog, ITableIndex<TStreamId> tableIndex,
-			IReadIndex<TStreamId> readIndex, IMetastreamLookup<TStreamId> metastreams, long? maxChunkDataSize = null,
-			bool unsafeIgnoreHardDeletes = false, int threads = 1) {
-			Ensure.NotNull(logger, nameof(logger));
-			Ensure.NotNull(db, "db");
-			Ensure.NotNull(scavengerLog, "scavengerLog");
-			Ensure.NotNull(tableIndex, "tableIndex");
-			Ensure.NotNull(readIndex, "readIndex");
-			Ensure.NotNull(metastreams, nameof(metastreams));
-			Ensure.Positive(threads, "threads");
-
-			_logger = logger;
-
-			if (threads > MaxThreadCount) {
-				_logger.Warning(
-					"{numThreads} scavenging threads not allowed.  Max threads allowed for scavenging is {maxThreadCount}. Capping.",
-					threads, MaxThreadCount);
-				threads = MaxThreadCount;
-			}
-
-			_db = db;
-			_scavengerLog = scavengerLog;
-			_tableIndex = tableIndex;
-			_readIndex = readIndex;
-			_metastreams = metastreams;
-			_maxChunkDataSize = maxChunkDataSize ?? db.Config.ChunkSize;
-			_unsafeIgnoreHardDeletes = unsafeIgnoreHardDeletes;
-			_threads = threads;
-		}
-
-		public string ScavengeId => _scavengerLog.ScavengeId;
-
-		private static IEnumerable<TFChunk.TFChunk> GetAllChunks(TFChunkDb db, int startFromChunk) {
-			long scavengePos = db.Config.ChunkSize * (long)startFromChunk;
-			while (scavengePos < db.Config.ChaserCheckpoint.Read()) {
-				var chunk = db.Manager.GetChunkFor(scavengePos);
-				if (!chunk.IsReadOnly) {
-					yield break;
-				}
-
-				yield return chunk;
-
-				scavengePos = chunk.ChunkHeader.ChunkEndPosition;
-			}
-		}
-
-		[AsyncMethodBuilder(typeof(SpawningAsyncTaskMethodBuilder<>))] // get off the main queue
-		public async Task<ScavengeResult> Scavenge(bool alwaysKeepScavenged, bool mergeChunks, int startFromChunk = 0,
-			bool scavengeIndex = true,
-			CancellationToken ct = default) {
-			Ensure.Nonnegative(startFromChunk, nameof(startFromChunk));
-
-			// Awaiters don't have to handle Exceptions and can wait for the actual completion of the task.
-			var sw = new Timestamp();
-
-			ScavengeResult result = ScavengeResult.Success;
-			string error = null;
-			try {
-				_scavengerLog.ScavengeStarted(alwaysKeepScavenged, mergeChunks, startFromChunk, _threads);
-
-				await ScavengeInternal(alwaysKeepScavenged, mergeChunks, startFromChunk, ct);
-
-				if (scavengeIndex) {
-					_tableIndex.Scavenge(_scavengerLog, ct);
-				}
-			} catch (OperationCanceledException) {
-				_logger.Information("SCAVENGING: Scavenge cancelled.");
-				result = ScavengeResult.Stopped;
-			} catch (Exception exc) {
-				result = ScavengeResult.Errored;
-				_logger.Error(exc, "SCAVENGING: Error while scavenging DB.");
-				error = string.Format("Error while scavenging DB: {0}.", exc.Message);
-			} finally {
-				try {
-					_scavengerLog.ScavengeCompleted(result, error, sw.Elapsed);
-				} catch (Exception ex) {
-					_logger.Error(ex,
-						"Error whilst recording scavenge completed. Scavenge result: {result}, Elapsed: {elapsed}, Original error: {e}",
-						result, sw.Elapsed, error);
-				}
-			}
-
-			return result;
-		}
-
-		private async ValueTask ScavengeInternal(bool alwaysKeepScavenged, bool mergeChunks, int startFromChunk,
-			CancellationToken ct) {
-			var totalSw = new Timestamp();
-			var sw = totalSw;
-
-			_logger.Debug(
-				"SCAVENGING: Started scavenging of DB. Chunks count at start: {chunksCount}. Options: alwaysKeepScavenged = {alwaysKeepScavenged}, mergeChunks = {mergeChunks}",
-				_db.Manager.ChunksCount, alwaysKeepScavenged, mergeChunks);
-
-			// Initial scavenge pass
-			var chunksToScavenge = GetAllChunks(_db, startFromChunk);
-
-			using (var scavengeCacheObjectPool = CreateThreadLocalScavengeCachePool(_threads)) {
-				await Parallel.ForEachAsync(chunksToScavenge,
-					new ParallelOptions {MaxDegreeOfParallelism = _threads, CancellationToken = ct},
-					async (chunk, ct) => {
-						var cache = scavengeCacheObjectPool.Get();
-						try {
-							await ScavengeChunk(alwaysKeepScavenged, chunk, cache, ct);
-						} finally {
-							cache.Reset(); // reset thread local cache before next iteration.
-							scavengeCacheObjectPool.Return(cache);
-						}
-					});
-			}
-
-			_logger.Debug("SCAVENGING: Initial pass completed in {elapsed}.", sw.Elapsed);
-
-			// Merge scavenge pass
-			if (mergeChunks) {
-				await MergePhase(
-					logger: _logger,
-					db: _db,
-					maxChunkDataSize: _maxChunkDataSize,
-					scavengerLog: _scavengerLog,
-					throttle: new Throttle(_logger, TimeSpan.Zero, TimeSpan.Zero, 100),
-					ct: ct);
-			}
-
-			_logger.Debug("SCAVENGING: Total time taken: {elapsed}, total space saved: {spaceSaved}.", totalSw.Elapsed,
-				_scavengerLog.SpaceSaved);
-		}
-
-		private async ValueTask ScavengeChunk(bool alwaysKeepScavenged, TFChunk.TFChunk oldChunk,
-			ThreadLocalScavengeCache threadLocalCache, CancellationToken ct) {
-			if (oldChunk == null) throw new ArgumentNullException("oldChunk");
-
-			var sw = new Timestamp();
-
-			int chunkStartNumber = oldChunk.ChunkHeader.ChunkStartNumber;
-			long chunkStartPos = oldChunk.ChunkHeader.ChunkStartPosition;
-			int chunkEndNumber = oldChunk.ChunkHeader.ChunkEndNumber;
-			long chunkEndPos = oldChunk.ChunkHeader.ChunkEndPosition;
-
-			var tmpChunkPath = Path.Combine(_db.Config.Path, Guid.NewGuid() + ".scavenge.tmp");
-			var oldChunkName = oldChunk.ToString();
-			_logger.Debug(
-				"SCAVENGING: Started to scavenge chunks: {oldChunkName} {chunkStartNumber} => {chunkEndNumber} ({chunkStartPosition} => {chunkEndPosition})",
-				oldChunkName, chunkStartNumber, chunkEndNumber,
-				chunkStartPos, chunkEndPos);
-			_logger.Debug("Resulting temp chunk file: {tmpChunkPath}.", Path.GetFileName(tmpChunkPath));
-
-			TFChunk.TFChunk newChunk;
-			try {
-				newChunk = TFChunk.TFChunk.CreateNew(tmpChunkPath,
-					_db.Config.ChunkSize,
-					chunkStartNumber,
-					chunkEndNumber,
-					isScavenged: true,
-					inMem: _db.Config.InMemDb,
-					unbuffered: _db.Config.Unbuffered,
-					writethrough: _db.Config.WriteThrough,
-					reduceFileCachePressure: _db.Config.ReduceFileCachePressure,
-					tracker: new TFChunkTracker.NoOp(),
-					transformFactory: _db.TransformManager.GetFactoryForNewChunk());
-			} catch (IOException exc) {
-				_logger.Error(exc,
-					"IOException during creating new chunk for scavenging purposes. Stopping scavenging process...");
-				throw;
-			}
-
-			try {
-				await TraverseChunkBasic(oldChunk, ct,
-					result => {
-						threadLocalCache.Records.Add(result);
-
-						if (result.LogRecord.RecordType == LogRecordType.Commit) {
-							var commit = (CommitLogRecord)result.LogRecord;
-							if (commit.TransactionPosition >= chunkStartPos)
-								threadLocalCache.Commits.Add(commit.TransactionPosition, new CommitInfo(commit));
-						}
-					});
-
-				long newSize = 0;
-				int filteredCount = 0;
-
-				for (int i = 0; i < threadLocalCache.Records.Count; i++) {
-					ct.ThrowIfCancellationRequested();
-
-					var recordReadResult = threadLocalCache.Records[i];
-					if (ShouldKeep(recordReadResult, threadLocalCache.Commits, chunkStartPos, chunkEndPos)) {
-						newSize += recordReadResult.RecordLength + 2 * sizeof(int);
-						filteredCount++;
-					} else {
-						// We don't need this record any more.
-						threadLocalCache.Records[i] = default(CandidateRecord);
-					}
-				}
-
-				_logger.Debug("Scavenging {oldChunkName} traversed {recordsCount} including {filteredCount}.", oldChunkName,
-					threadLocalCache.Records.Count, filteredCount);
-
-				newSize += filteredCount * PosMap.FullSize + ChunkHeader.Size + ChunkFooter.Size;
-				if (newChunk.ChunkHeader.Version >= (byte)TFChunk.TFChunk.ChunkVersions.Aligned)
-					newSize = TFChunk.TFChunk.GetAlignedSize((int)newSize);
-
-				bool oldVersion = oldChunk.ChunkHeader.Version < (byte) TFChunk.TFChunk.ChunkVersions.Aligned;
-				long oldSize = oldChunk.FileSize;
-
-				if (oldSize <= newSize && !alwaysKeepScavenged && !_unsafeIgnoreHardDeletes && !oldVersion) {
-					_logger.Debug(
-						"Scavenging of chunks:"
-						+ "\n{oldChunkName}"
-						+ "\ncompleted in {elapsed}."
-						+ "\nOld chunks' versions are kept as they are smaller."
-						+ "\nOld chunk total size: {oldSize}, scavenged chunk size: {newSize}."
-						+ "\nScavenged chunk removed.", oldChunkName, sw.Elapsed, oldSize, newSize);
-
-					newChunk.MarkForDeletion();
-					_scavengerLog.ChunksNotScavenged(chunkStartNumber, chunkEndNumber, sw.Elapsed, "");
-				} else {
-					var positionMapping = new List<PosMap>(filteredCount);
-
-					var lastFlushedPage = -1;
-					for (int i = 0; i < threadLocalCache.Records.Count; i++) {
-						ct.ThrowIfCancellationRequested();
-
-						// Since we replaced the ones we don't want with `default`, the success flag will only be true on the ones we want to keep.
-						var recordReadResult = threadLocalCache.Records[i];
-
-						// Check log record, if not present then assume we can skip.
-						if (recordReadResult.LogRecord != null)
-							positionMapping.Add(WriteRecord(newChunk, recordReadResult.LogRecord));
-
-						var currentPage = newChunk.RawWriterPosition / 4096;
-						if (currentPage - lastFlushedPage > FlushPageInterval) {
-							newChunk.Flush();
-							lastFlushedPage = currentPage;
-						}
-					}
-
-					await newChunk.CompleteScavenge(positionMapping, ct);
-
-					if (_unsafeIgnoreHardDeletes) {
-						_logger.Debug("Forcing scavenge chunk to be kept even if bigger.");
-					}
-
-					if (oldVersion) {
-						_logger.Debug("Forcing scavenged chunk to be kept as old chunk is a previous version.");
-					}
-
-					var chunk = _db.Manager.SwitchChunk(newChunk, verifyHash: false,
-						removeChunksWithGreaterNumbers: false);
-					if (chunk != null) {
-						_logger.Debug("Scavenging of chunks:"
-						          + "\n{oldChunkName}"
-						          + "\ncompleted in {elapsed}."
-						          + "\nNew chunk: {tmpChunkPath} --> #{chunkStartNumber}-{chunkEndNumber} ({newChunk})."
-						          + "\nOld chunk total size: {oldSize}, scavenged chunk size: {newSize}.",
-							oldChunkName, sw.Elapsed, Path.GetFileName(tmpChunkPath), chunkStartNumber, chunkEndNumber,
-							Path.GetFileName(chunk.FileName), oldSize, newSize);
-						var spaceSaved = oldSize - newSize;
-						_scavengerLog.ChunksScavenged(chunkStartNumber, chunkEndNumber, sw.Elapsed, spaceSaved);
-					} else {
-						_logger.Debug("Scavenging of chunks:"
-						          + "\n{oldChunkName}"
-						          + "\ncompleted in {elapsed}."
-						          + "\nBut switching was prevented for new chunk: #{chunkStartNumber}-{chunkEndNumber} ({tmpChunkPath})."
-						          + "\nOld chunks total size: {oldSize}, scavenged chunk size: {newSize}.",
-							oldChunkName, sw.Elapsed, chunkStartNumber, chunkEndNumber, Path.GetFileName(tmpChunkPath),
-							oldSize, newSize);
-						_scavengerLog.ChunksNotScavenged(chunkStartNumber, chunkEndNumber, sw.Elapsed,
-							"Chunk switch prevented.");
-					}
-				}
-			} catch (FileBeingDeletedException exc) {
-				_logger.Information(
-					"Got FileBeingDeletedException exception during scavenging, that probably means some chunks were re-replicated."
-					+ "\nScavenging of following chunks will be skipped: {oldChunkName}"
-					+ "\nStopping scavenging and removing temp chunk '{tmpChunkPath}'..."
-					+ "\nException message: {e}.",
-					oldChunkName, tmpChunkPath, exc.Message);
-				newChunk.Dispose();
-				DeleteTempChunk(_logger, tmpChunkPath, MaxRetryCount);
-				_scavengerLog.ChunksNotScavenged(chunkStartNumber, chunkEndNumber, sw.Elapsed, exc.Message);
-			} catch (OperationCanceledException) {
-				_logger.Information("Scavenging cancelled at: {oldChunkName}", oldChunkName);
-				newChunk.MarkForDeletion();
-				_scavengerLog.ChunksNotScavenged(chunkStartNumber, chunkEndNumber, sw.Elapsed, "Scavenge cancelled");
-			} catch (Exception ex) {
-				_logger.Information(
-					"Got exception while scavenging chunk: #{chunkStartNumber}-{chunkEndNumber}. This chunk will be skipped\n"
-					+ "Exception: {e}.", chunkStartNumber, chunkEndNumber, ex.ToString());
-				newChunk.Dispose();
-				DeleteTempChunk(_logger, tmpChunkPath, MaxRetryCount);
-				_scavengerLog.ChunksNotScavenged(chunkStartNumber, chunkEndNumber, sw.Elapsed, ex.Message);
-			}
-		}
-
-		public static async ValueTask MergePhase(
-			ILogger logger,
-			TFChunkDb db,
-			long maxChunkDataSize,
-			ITFChunkScavengerLog scavengerLog,
-			Throttle throttle,
-			CancellationToken ct) {
-
-			bool mergedSomething;
-			int passNum = 0;
-			do {
-				mergedSomething = false;
-				passNum += 1;
-				var sw = new Timestamp();
-
-				var chunksToMerge = new List<TFChunk.TFChunk>();
-				long totalDataSize = 0;
-				foreach (var chunk in GetAllChunks(db, 0)) {
-					ct.ThrowIfCancellationRequested();
-
-					if (totalDataSize + chunk.PhysicalDataSize > maxChunkDataSize) {
-						if (chunksToMerge.Count == 0)
-							throw new Exception("SCAVENGING: No chunks to merge, unexpectedly...");
-
-						if (chunksToMerge.Count > 1 &&
-							await MergeChunks(
-								logger: logger,
-								db: db,
-								scavengerLog: scavengerLog,
-								oldChunks: chunksToMerge,
-								ct: ct)) {
-
-							mergedSomething = true;
-						}
-
-						chunksToMerge.Clear();
-						totalDataSize = 0;
-					}
-
-					chunksToMerge.Add(chunk);
-					totalDataSize += chunk.PhysicalDataSize;
-					throttle.Rest(ct);
-				}
-
-				if (chunksToMerge.Count > 1) {
-					if (await MergeChunks(
-						logger: logger,
-						db: db,
-						scavengerLog: scavengerLog,
-						oldChunks: chunksToMerge,
-						ct: ct)) {
-
-						mergedSomething = true;
-					}
-				}
-
-				logger.Debug("SCAVENGING: Merge pass #{pass} completed in {elapsed}. {merged} merged.",
-					passNum, sw.Elapsed, mergedSomething ? "Some chunks" : "Nothing");
-			} while (mergedSomething);
-		}
-
-		private static async ValueTask<bool> MergeChunks(
-			ILogger logger,
-			TFChunkDb db,
-			ITFChunkScavengerLog scavengerLog,
-			IList<TFChunk.TFChunk> oldChunks,
-			CancellationToken ct) {
-
-			if (oldChunks.IsEmpty()) throw new ArgumentException("Provided list of chunks to merge is empty.");
-
-			var oldChunksList = string.Join("\n", oldChunks);
-
-			if (oldChunks.Count < 2) {
-				logger.Debug("SCAVENGING: Tried to merge less than 2 chunks, aborting: {oldChunksList}", oldChunksList);
-				return false;
-			}
-
-			var sw = new Timestamp();
-
-			int chunkStartNumber = oldChunks.First().ChunkHeader.ChunkStartNumber;
-			int chunkEndNumber = oldChunks.Last().ChunkHeader.ChunkEndNumber;
-
-			var tmpChunkPath = Path.Combine(db.Config.Path, Guid.NewGuid() + ".merge.scavenge.tmp");
-			logger.Debug("SCAVENGING: Started to merge chunks: {oldChunksList}"
-			          + "\nResulting temp chunk file: {tmpChunkPath}.",
-				oldChunksList, Path.GetFileName(tmpChunkPath));
-
-			TFChunk.TFChunk newChunk;
-			try {
-				newChunk = TFChunk.TFChunk.CreateNew(tmpChunkPath,
-					db.Config.ChunkSize,
-					chunkStartNumber,
-					chunkEndNumber,
-					isScavenged: true,
-					inMem: db.Config.InMemDb,
-					unbuffered: db.Config.Unbuffered,
-					writethrough: db.Config.WriteThrough,
-					reduceFileCachePressure: db.Config.ReduceFileCachePressure,
-					tracker: new TFChunkTracker.NoOp(),
-					transformFactory: db.TransformManager.GetFactoryForNewChunk());
-			} catch (IOException exc) {
-				logger.Error(exc,
-					"IOException during creating new chunk for scavenging merge purposes. Stopping scavenging merge process...");
-				return false;
-			}
-
-			try {
-				var oldVersion = oldChunks.Any(x => x.ChunkHeader.Version < (byte) TFChunk.TFChunk.ChunkVersions.Aligned);
-
-				var positionMapping = new List<PosMap>();
-				foreach (var oldChunk in oldChunks) {
-					var lastFlushedPage = -1;
-					await TraverseChunkBasic(oldChunk, ct,
-						result => {
-
-							positionMapping.Add(WriteRecord(newChunk, result.LogRecord));
-
-							var currentPage = newChunk.RawWriterPosition / 4096;
-							if (currentPage - lastFlushedPage > FlushPageInterval) {
-								newChunk.Flush();
-								lastFlushedPage = currentPage;
-							}
-						});
-				}
-
-				await newChunk.CompleteScavenge(positionMapping, ct);
-
-				if (oldVersion) {
-					logger.Debug("Forcing merged chunk to be kept as old chunk is a previous version.");
-				}
-
-				var chunk = db.Manager.SwitchChunk(newChunk, verifyHash: false, removeChunksWithGreaterNumbers: false);
-				if (chunk != null) {
-					logger.Debug(
-						"Merging of chunks:"
-						+ "\n{oldChunksList}"
-						+ "\ncompleted in {elapsed}."
-						+ "\nNew chunk: {tmpChunkPath} --> #{chunkStartNumber}-{chunkEndNumber} ({newChunk}).",
-						oldChunksList, sw.Elapsed, Path.GetFileName(tmpChunkPath), chunkStartNumber, chunkEndNumber,
-						Path.GetFileName(chunk.FileName));
-					var spaceSaved = oldChunks.Sum(_ => _.FileSize) - newChunk.FileSize;
-					scavengerLog.ChunksMerged(chunkStartNumber, chunkEndNumber, sw.Elapsed, spaceSaved);
-					return true;
-				} else {
-					logger.Debug(
-						"Merging of chunks:"
-						+ "\n{oldChunksList}"
-						+ "\ncompleted in {elapsed}."
-						+ "\nBut switching was prevented for new chunk: #{chunkStartNumber}-{chunkEndNumber} ({tmpChunkPath}).",
-						oldChunksList, sw.Elapsed, chunkStartNumber, chunkEndNumber, Path.GetFileName(tmpChunkPath));
-					scavengerLog.ChunksNotMerged(chunkStartNumber, chunkEndNumber, sw.Elapsed,
-						"Chunk switch prevented.");
-					return false;
-				}
-			} catch (FileBeingDeletedException exc) {
-				logger.Information(
-					"Got FileBeingDeletedException exception during scavenge merging, that probably means some chunks were re-replicated."
-					+ "\nMerging of following chunks will be skipped:"
-					+ "\n{oldChunksList}"
-					+ "\nStopping merging and removing temp chunk '{tmpChunkPath}'..."
-					+ "\nException message: {e}.",
-					oldChunksList, tmpChunkPath, exc.Message);
-				newChunk.Dispose();
-				DeleteTempChunk(logger, tmpChunkPath, MaxRetryCount);
-				scavengerLog.ChunksNotMerged(chunkStartNumber, chunkEndNumber, sw.Elapsed, exc.Message);
-				return false;
-			} catch (OperationCanceledException) {
-				logger.Information("Scavenging cancelled at:"
-				         + "\n{oldChunksList}",
-					oldChunksList);
-				newChunk.MarkForDeletion();
-				scavengerLog.ChunksNotMerged(chunkStartNumber, chunkEndNumber, sw.Elapsed, "Scavenge cancelled");
-				return false;
-			} catch (Exception ex) {
-				logger.Information("Got exception while merging chunk:"
-				         + "\n{oldChunks}"
-				         + "\nException: {e}",
-					oldChunks, ex.ToString()
-				);
-				newChunk.Dispose();
-				DeleteTempChunk(logger, tmpChunkPath, MaxRetryCount);
-				scavengerLog.ChunksNotMerged(chunkStartNumber, chunkEndNumber, sw.Elapsed, ex.Message);
-				return false;
-			}
-		}
-
-		public static void DeleteTempChunk(ILogger logger, string tmpChunkPath, int retries) {
-			try {
-				File.SetAttributes(tmpChunkPath, FileAttributes.Normal);
-				File.Delete(tmpChunkPath);
-			} catch (Exception ex) {
-				if (retries > 0) {
-					logger.Error("Failed to delete the temp chunk. Retrying {retry}/{maxRetryCount}. Reason: {e}",
-						MaxRetryCount - retries, MaxRetryCount, ex);
-					Thread.Sleep(5000);
-					DeleteTempChunk(logger, tmpChunkPath, retries - 1);
-				} else {
-					logger.Error("Failed to delete the temp chunk. Retry limit of {maxRetryCount} reached. Reason: {e}",
-						MaxRetryCount, ex);
-					if (ex is System.IO.IOException)
-						WindowsProcessUtil.PrintWhoIsLocking(tmpChunkPath, logger);
-					throw;
-				}
-			}
-		}
-
-		private bool ShouldKeep(CandidateRecord result, Dictionary<long, CommitInfo> commits, long chunkStartPos,
-			long chunkEndPos) {
-			switch (result.LogRecord.RecordType) {
-				case LogRecordType.Prepare:
-					var prepare = (IPrepareLogRecord<TStreamId>)result.LogRecord;
-					if (ShouldKeepPrepare(prepare, commits, chunkStartPos, chunkEndPos))
-						return true;
-					break;
-				case LogRecordType.Commit:
-					var commit = (CommitLogRecord)result.LogRecord;
-					if (ShouldKeepCommit(commit, commits))
-						return true;
-					break;
-				case LogRecordType.ContentType:
-				case LogRecordType.EventType:
-				case LogRecordType.Partition:
-				case LogRecordType.PartitionType:
-				case LogRecordType.Stream:
-				case LogRecordType.StreamType:
-				case LogRecordType.StreamWrite:
-				case LogRecordType.System:
-				case LogRecordType.TransactionEnd:
-				case LogRecordType.TransactionStart:
-					return true;
-			}
-
-			return false;
-		}
-
-		private bool ShouldKeepCommit(CommitLogRecord commit, Dictionary<long, CommitInfo> commits) {
-			CommitInfo commitInfo;
-			if (!commits.TryGetValue(commit.TransactionPosition, out commitInfo)) {
-				// This should never happen given that we populate `commits` from the commit records.
-				// (not sure about this. the `commits` are only commit records for transactions that opened in this chunk)
-				return true;
-			}
-
-			return commitInfo.KeepCommit != false;
-		}
-
-		private bool ShouldKeepPrepare(
-			IPrepareLogRecord<TStreamId> prepare,
-			Dictionary<long, CommitInfo> commits,
-			long chunkStart,
-			long chunkEnd) {
-
-			CommitInfo commitInfo;
-			bool hasSeenCommit = commits.TryGetValue(prepare.TransactionPosition, out commitInfo);
-			bool isCommitted = hasSeenCommit || prepare.Flags.HasAnyOf(PrepareFlags.IsCommitted);
-
-			if (prepare.Flags.HasAnyOf(PrepareFlags.StreamDelete)) {
-				// this is the tombstone of a hard deleted stream.
-				if (_unsafeIgnoreHardDeletes) {
-					_logger.Information(
-						"Removing hard deleted stream tombstone for stream {stream} at position {transactionPosition}",
-						prepare.EventStreamId, prepare.TransactionPosition);
-					commitInfo.TryNotToKeep();
-					return false;
-				} else {
-					commitInfo.ForciblyKeep();
-					return true;
-				}
-			}
-
-			if (!isCommitted && prepare.Flags.HasAnyOf(PrepareFlags.TransactionBegin)) {
-				// So here we have prepare which commit is in the following chunks or prepare is not committed at all.
-				// Now, whatever heuristic on prepare scavenge we use, we should never delete the very first prepare
-				// in transaction, as in some circumstances we need it.
-				// For instance, this prepare could be part of ongoing transaction and though we sometimes can determine
-				// that prepare wouldn't ever be needed (e.g., stream was deleted, $maxAge or $maxCount rule it out)
-				// we still need the first prepare to find out StreamId for possible commit in StorageWriterService.WriteCommit method.
-				// There could be other reasons where it is needed, so we just safely filter it out to not bother further.
-				return true;
-			}
-
-			var lastEventNumber = _readIndex.GetStreamLastEventNumber(prepare.EventStreamId);
-			if (lastEventNumber == EventNumber.DeletedStream) {
-				// The stream is hard deleted but this is not the tombstone.
-				// When all prepares and commit of transaction belong to single chunk and the stream is deleted,
-				// we can safely delete both prepares and commit.
-				// Even if this prepare is not committed, but its stream is deleted, then as long as it is
-				// not TransactionBegin prepare we can remove it, because any transaction should fail either way on commit stage.
-				// (see comments in previous section for TransactionBegin)
-				commitInfo.TryNotToKeep();
-				return false;
-			}
-
-			if (!isCommitted) {
-				// If we could somehow figure out (from read index) the event number of this prepare
-				// (if it is actually committed, but commit is in another chunk) then we can apply same scavenging logic.
-				// Unfortunately, if it is not committed prepare we can say nothing for now, so should conservatively keep it.
-				return true;
-			}
-
-			if (prepare.Flags.HasNoneOf(PrepareFlags.Data)) {
-				// We encountered system prepare with no data. As of now it can appear only in explicit
-				// transactions so we can safely remove it. The performance shouldn't hurt, because
-				// TransactionBegin prepare is never needed either way and TransactionEnd should be in most
-				// circumstances close to commit, so shouldn't hurt performance too much.
-				// The advantage of getting rid of system prepares is ability to completely eliminate transaction
-				// prepares and commit, if transaction events are completely ruled out by $maxAge/$maxCount.
-				// Otherwise we'd have to either keep prepare not requiring to keep commit, which could leave
-				// this prepare as never discoverable garbage, or we could insist on keeping commit forever
-				// even if all events in transaction are scavenged.
-				commitInfo.TryNotToKeep();
-				return false;
-			}
-
-			if (IsSoftDeletedTempStreamWithinSameChunk(prepare.EventStreamId, chunkStart, chunkEnd)) {
-				commitInfo.TryNotToKeep();
-				return false;
-			}
-
-			var eventNumber = prepare.Flags.HasAnyOf(PrepareFlags.IsCommitted)
-				? prepare.ExpectedVersion + 1 // IsCommitted prepares always have explicit expected version
-				// we always have commitInfo.EventNumber here because we early returned if isCommitted is false
-				: commitInfo.EventNumber + prepare.TransactionOffset;
-
-			if (DiscardBecauseDuplicate(prepare, eventNumber)) {
-				commitInfo.TryNotToKeep();
-				return false;
-			}
-
-			// We should always physically keep the very last prepare in the stream.
-			// Otherwise we get into trouble when trying to resolve LastStreamEventNumber, for instance.
-			// That is because our TableIndex doesn't keep EventStreamId, only hash of it, so on doing some operations
-			// that needs TableIndex, we have to make sure we have prepare records in TFChunks when we need them.
-			if (eventNumber >= lastEventNumber) {
-				// Definitely keep commit, otherwise current prepare wouldn't be discoverable.
-				commitInfo.ForciblyKeep();
-				return true;
-			}
-
-			var meta = _readIndex.GetStreamMetadata(prepare.EventStreamId);
-			bool canRemove = (meta.MaxCount.HasValue && eventNumber < lastEventNumber - meta.MaxCount.Value + 1)
-			                 || (meta.TruncateBefore.HasValue && eventNumber < meta.TruncateBefore.Value)
-			                 || (meta.MaxAge.HasValue && prepare.TimeStamp < DateTime.UtcNow - meta.MaxAge.Value);
-
-			if (canRemove) {
-				commitInfo.TryNotToKeep();
-				return false;
-			} else {
-				commitInfo.ForciblyKeep();
-				return true;
-			}
-		}
-
-		private bool DiscardBecauseDuplicate(IPrepareLogRecord<TStreamId> prepare, long eventNumber) {
-			var result = _readIndex.ReadEvent(IndexReader.UnspecifiedStreamName, prepare.EventStreamId, eventNumber);
-			if (result.Result == ReadEventResult.Success && result.Record.LogPosition != prepare.LogPosition) {
-				// prepare isn't the record we get for an index read at its own stream/version.
-				// therefore it is a duplicate that cannot be read from the index, discard it.
-				return true;
-			}
-
-			return false;
-		}
-
-		private bool IsSoftDeletedTempStreamWithinSameChunk(TStreamId eventStreamId, long chunkStart, long chunkEnd) {
-			TStreamId sh;
-			TStreamId msh;
-			if (_metastreams.IsMetaStream(eventStreamId)) {
-				var originalStreamId = _metastreams.OriginalStreamOf(eventStreamId);
-				var meta = _readIndex.GetStreamMetadata(originalStreamId);
-				if (meta.TruncateBefore != EventNumber.DeletedStream || meta.TempStream != true)
-					return false;
-				sh = originalStreamId;
-				msh = eventStreamId;
-			} else {
-				var meta = _readIndex.GetStreamMetadata(eventStreamId);
-				if (meta.TruncateBefore != EventNumber.DeletedStream || meta.TempStream != true)
-					return false;
-				sh = eventStreamId;
-				msh = _metastreams.MetaStreamOf(eventStreamId);
-			}
-
-			IndexEntry e;
-			var allInChunk = _tableIndex.TryGetOldestEntry(sh, out e) && e.Position >= chunkStart &&
-			                 e.Position < chunkEnd
-			                 && _tableIndex.TryGetLatestEntry(sh, out e) && e.Position >= chunkStart &&
-			                 e.Position < chunkEnd
-			                 && _tableIndex.TryGetOldestEntry(msh, out e) && e.Position >= chunkStart &&
-			                 e.Position < chunkEnd
-			                 && _tableIndex.TryGetLatestEntry(msh, out e) && e.Position >= chunkStart &&
-			                 e.Position < chunkEnd;
-			return allInChunk;
-		}
-
-		private static async ValueTask TraverseChunkBasic(TFChunk.TFChunk chunk, CancellationToken ct,
-			Action<CandidateRecord> process) {
-			var result = await chunk.TryReadFirst(ct);
-			while (result.Success) {
-				process(new CandidateRecord(result.LogRecord, result.RecordLength));
-
-				ct.ThrowIfCancellationRequested();
-
-				result = chunk.TryReadClosestForward(result.NextPosition);
-			}
-		}
-
-		public static PosMap WriteRecord(TFChunk.TFChunk newChunk, ILogRecord record) {
-			var writeResult = newChunk.TryAppend(record);
-			if (!writeResult.Success) {
-				throw new Exception(string.Format(
-					"Unable to append record during scavenging. Scavenge position: {0}, Record: {1}.",
-					writeResult.OldPosition,
-					record));
-			}
-
-			long logPos = newChunk.ChunkHeader.GetLocalLogPosition(record.LogPosition);
-			int actualPos = (int)writeResult.OldPosition;
-			return new PosMap(logPos, actualPos);
-		}
-
-		internal class CommitInfo {
-			public readonly long EventNumber;
-
-			public bool? KeepCommit;
-
-			public CommitInfo(CommitLogRecord commitRecord) {
-				EventNumber = commitRecord.FirstEventNumber;
-			}
-
-			public override string ToString() {
-				return string.Format("EventNumber: {0}, KeepCommit: {1}", EventNumber, KeepCommit);
-			}
-		}
-
-		struct CandidateRecord {
-			public readonly ILogRecord LogRecord;
-			public readonly int RecordLength;
-
-			public CandidateRecord(ILogRecord logRecord, int recordLength) {
-				LogRecord = logRecord;
-				RecordLength = recordLength;
-			}
-		}
-
-		private ObjectPool<ThreadLocalScavengeCache> CreateThreadLocalScavengeCachePool(int threads) {
-			const int initialSizeOfThreadLocalCache = 1024 * 64; // 64k records
-
-			return new ObjectPool<ThreadLocalScavengeCache>(
-				ScavengeId,
-				0,
-				threads,
-				() => {
-					_logger.Debug("SCAVENGING: Allocating {size} spaces in thread local cache {threadId}.",
-						initialSizeOfThreadLocalCache,
-						Thread.CurrentThread.ManagedThreadId);
-					return new ThreadLocalScavengeCache(initialSizeOfThreadLocalCache);
-				},
-				cache => { },
-				pool => { });
-		}
-
-		class ThreadLocalScavengeCache {
-			private readonly Dictionary<long, CommitInfo> _commits;
-			private readonly List<CandidateRecord> _records;
-
-			public Dictionary<long, CommitInfo> Commits {
-				get { return _commits; }
-			}
-
-			public List<CandidateRecord> Records {
-				get { return _records; }
-			}
-
-			public ThreadLocalScavengeCache(int records) {
-				// assume max quarter records are commits.
-				_commits = new Dictionary<long, CommitInfo>(records / 4);
-				_records = new List<CandidateRecord>(records);
-			}
-
-			public void Reset() {
-				Commits.Clear();
-				Records.Clear();
-			}
-		}
-	}
-
-	internal static class CommitInfoExtensions {
-		public static void ForciblyKeep<TStreamId>(this TFChunkScavenger<TStreamId>.CommitInfo commitInfo) {
-			if (commitInfo != null)
-				commitInfo.KeepCommit = true;
-		}
-
-		public static void TryNotToKeep<TStreamId>(this TFChunkScavenger<TStreamId>.CommitInfo commitInfo) {
-			// If someone decided definitely to keep corresponding commit then we shouldn't interfere.
-			// Otherwise we should point that yes, you can remove commit for this prepare.
-			if (commitInfo != null)
-				commitInfo.KeepCommit = commitInfo.KeepCommit ?? false;
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunkScavengerLog.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunkScavengerLog.cs
deleted file mode 100644
index ab68071c3c7..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFChunkScavengerLog.cs
+++ /dev/null
@@ -1,284 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services;
-using EventStore.Core.Services.Storage;
-using EventStore.Core.Services.UserManagement;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.TransactionLog.Chunks {
-	class TFChunkScavengerLog : ITFChunkScavengerLog {
-		private readonly object _updateLock = new object();
-
-		private readonly string _streamName;
-		private readonly IODispatcher _ioDispatcher;
-		private readonly string _scavengeId;
-		private readonly string _nodeId;
-		private readonly int _retryAttempts;
-		private readonly TimeSpan _scavengeHistoryMaxAge;
-		private static readonly ILogger Log = Serilog.Log.ForContext<StorageScavenger>();
-		private long _spaceSaved;
-
-		/// <summary>
-		/// When we're scavenging, we want to keep track of the chunk high watermark (this won't be perfect in multi-threaded scavenges)
-		/// as it will give us a good approximate place to resume the scavenge if it gets interrupted.
-		/// </summary>
-		private int _maxChunkScavenged;
-
-		public TFChunkScavengerLog(IODispatcher ioDispatcher, string scavengeId, string nodeId, int retryAttempts,
-			TimeSpan scavengeHistoryMaxAge) {
-			_ioDispatcher = ioDispatcher;
-			_scavengeId = scavengeId;
-			_nodeId = nodeId;
-			_retryAttempts = retryAttempts;
-			_scavengeHistoryMaxAge = scavengeHistoryMaxAge;
-
-			_streamName = string.Format("{0}-{1}", SystemStreams.ScavengesStream, scavengeId);
-		}
-
-		public string ScavengeId => _scavengeId;
-
-		public long SpaceSaved => Interlocked.Read(ref _spaceSaved);
-
-		public void ScavengeStarted() {
-			ScavengeStartedInternal(new Dictionary<string, object> {
-				{"scavengeId", _scavengeId},
-				{"nodeEndpoint", _nodeId},
-			});
-		}
-
-		public void ScavengeStarted(bool alwaysKeepScavenged, bool mergeChunks, int startFromChunk, int threads) {
-			ScavengeStartedInternal(new Dictionary<string, object> {
-				{"scavengeId", _scavengeId},
-				{"nodeEndpoint", _nodeId},
-				{"alwaysKeepScavenged", alwaysKeepScavenged},
-				{"mergeChunks", mergeChunks},
-				{"startFromChunk", startFromChunk},
-				{"threads", threads},
-			});
-		}
-
-		private void ScavengeStartedInternal(Dictionary<string, object> payload) {
-			var metadataEventId = Guid.NewGuid();
-			var metaStreamId = SystemStreams.MetastreamOf(_streamName);
-			var acl = new StreamAcl(
-				new string[] { "$ops" },
-				new string[] { },
-				new string[] { },
-				new string[] { },
-				new string[] { }
-			);
-			var metadata = new StreamMetadata(maxAge: _scavengeHistoryMaxAge, acl: acl);
-			var metaStreamEvent = new Event(metadataEventId, SystemEventTypes.StreamMetadata, isJson: true,
-				data: metadata.ToJsonBytes(), metadata: null);
-			_ioDispatcher.WriteEvent(metaStreamId, ExpectedVersion.Any, metaStreamEvent, SystemAccounts.System, m => {
-				if (m.Result != OperationResult.Success) {
-					Log.Error(
-						"Failed to write the $maxAge of {days} days metadata for the {stream} stream. Reason: {reason}",
-						_scavengeHistoryMaxAge.TotalDays, _streamName, m.Result);
-				}
-			});
-
-			var scavengeStartedEvent = new Event(Guid.NewGuid(), SystemEventTypes.ScavengeStarted, true,
-				payload.ToJsonBytes(), null);
-			WriteScavengeDetailEvent(_streamName, scavengeStartedEvent, _retryAttempts);
-		}
-
-		public void ScavengeCompleted(ScavengeResult result, string error, TimeSpan elapsed)
-			=> ScavengeCompleted(result, error, elapsed, _spaceSaved, _maxChunkScavenged);
-
-		internal void ScavengeCompleted(ScavengeResult result, string error, TimeSpan elapsed, long spaceSaved, int maxChunkScavenged) {
-			var scavengeCompletedEvent = new Event(Guid.NewGuid(), SystemEventTypes.ScavengeCompleted, true,
-				new Dictionary<string, object> {
-					{"scavengeId", _scavengeId},
-					{"nodeEndpoint", _nodeId},
-					{"result", result},
-					{"error", error},
-					{"timeTaken", elapsed},
-					{"spaceSaved", spaceSaved},
-					{"maxChunkScavenged", maxChunkScavenged}
-				}.ToJsonBytes(), null);
-			WriteScavengeDetailEvent(_streamName, scavengeCompletedEvent, _retryAttempts);
-		}
-
-		public void ChunksScavenged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, long spaceSaved) {
-			Interlocked.Add(ref _spaceSaved, spaceSaved);
-			lock (_updateLock)
-				_maxChunkScavenged = Math.Max(_maxChunkScavenged, chunkEndNumber);
-			var evnt = new Event(Guid.NewGuid(), SystemEventTypes.ScavengeChunksCompleted, true,
-				new Dictionary<string, object> {
-					{"scavengeId", _scavengeId},
-					{"chunkStartNumber", chunkStartNumber},
-					{"chunkEndNumber", chunkEndNumber},
-					{"timeTaken", elapsed},
-					{"wasScavenged", true},
-					{"spaceSaved", spaceSaved},
-					{"nodeEndpoint", _nodeId},
-					{"errorMessage", ""}
-				}.ToJsonBytes(), null);
-
-			WriteScavengeChunkCompletedEvent(_streamName, evnt, _retryAttempts);
-		}
-
-		public void ChunksNotScavenged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed,
-			string errorMessage) {
-			// We still update the _maxChunkScavenged as we've processed it during our scavenge stage.
-			lock (_updateLock)
-				_maxChunkScavenged = Math.Max(_maxChunkScavenged, chunkEndNumber);
-			var evnt = new Event(Guid.NewGuid(), SystemEventTypes.ScavengeChunksCompleted, true,
-				new Dictionary<string, object> {
-					{"scavengeId", _scavengeId},
-					{"chunkStartNumber", chunkStartNumber},
-					{"chunkEndNumber", chunkEndNumber},
-					{"timeTaken", elapsed},
-					{"wasScavenged", false},
-					{"spaceSaved", 0},
-					{"nodeEndpoint", _nodeId},
-					{"errorMessage", errorMessage}
-				}.ToJsonBytes(), null);
-
-			WriteScavengeChunkCompletedEvent(_streamName, evnt, _retryAttempts);
-		}
-
-		public void ChunksMerged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, long spaceSaved) {
-			Interlocked.Add(ref _spaceSaved, spaceSaved);
-			var evnt = new Event(Guid.NewGuid(), SystemEventTypes.ScavengeMergeCompleted, true,
-				new Dictionary<string, object> {
-					{"scavengeId", _scavengeId},
-					{"chunkStartNumber", chunkStartNumber},
-					{"chunkEndNumber", chunkEndNumber},
-					{"timeTaken", elapsed},
-					{"spaceSaved", spaceSaved},
-					{"wasMerged", true},
-					{"nodeEndpoint", _nodeId},
-					{"errorMessage", ""}
-				}.ToJsonBytes(), null);
-
-			WriteScavengeChunkCompletedEvent(_streamName, evnt, _retryAttempts);
-		}
-
-		public void ChunksNotMerged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, string errorMessage) {
-			var evnt = new Event(Guid.NewGuid(), SystemEventTypes.ScavengeMergeCompleted, true,
-				new Dictionary<string, object> {
-					{"scavengeId", _scavengeId},
-					{"chunkStartNumber", chunkStartNumber},
-					{"chunkEndNumber", chunkEndNumber},
-					{"timeTaken", elapsed},
-					{"spaceSaved", 0},
-					{"wasMerged", false},
-					{"nodeEndpoint", _nodeId},
-					{"errorMessage", errorMessage}
-				}.ToJsonBytes(), null);
-
-			WriteScavengeChunkCompletedEvent(_streamName, evnt, _retryAttempts);
-		}
-
-
-		public void IndexTableScavenged(int level, int index, TimeSpan elapsed, long entriesDeleted, long entriesKept,
-			long spaceSaved) {
-			Interlocked.Add(ref _spaceSaved, spaceSaved);
-			var evnt = new Event(Guid.NewGuid(), SystemEventTypes.ScavengeIndexCompleted, true,
-				new Dictionary<string, object> {
-					{"scavengeId", _scavengeId},
-					{"level", level},
-					{"index", index},
-					{"timeTaken", elapsed},
-					{"entriesDeleted", entriesDeleted},
-					{"entriesKept", entriesKept},
-					{"spaceSaved", spaceSaved},
-					{"wasScavenged", true},
-					{"nodeEndpoint", _nodeId},
-					{"errorMessage", ""}
-				}.ToJsonBytes(), null);
-
-			WriteScavengeChunkCompletedEvent(_streamName, evnt, _retryAttempts);
-		}
-
-		public void IndexTableNotScavenged(int level, int index, TimeSpan elapsed, long entriesKept,
-			string errorMessage) {
-			var evnt = new Event(Guid.NewGuid(), SystemEventTypes.ScavengeIndexCompleted, true,
-				new Dictionary<string, object> {
-					{"scavengeId", _scavengeId},
-					{"level", level},
-					{"index", index},
-					{"timeTaken", elapsed},
-					{"entriesDeleted", 0},
-					{"entriesKept", entriesKept},
-					{"spaceSaved", 0},
-					{"wasScavenged", false},
-					{"nodeEndpoint", _nodeId},
-					{"errorMessage", errorMessage}
-				}.ToJsonBytes(), null);
-
-			WriteScavengeChunkCompletedEvent(_streamName, evnt, _retryAttempts);
-		}
-
-		private void WriteScavengeChunkCompletedEvent(string streamId, Event eventToWrite, int retryCount) {
-			_ioDispatcher.WriteEvent(streamId, ExpectedVersion.Any, eventToWrite, SystemAccounts.System,
-				m => WriteScavengeChunkCompletedEventCompleted(m, streamId, eventToWrite, retryCount));
-		}
-
-		private void WriteScavengeChunkCompletedEventCompleted(ClientMessage.WriteEventsCompleted msg, string streamId,
-			Event eventToWrite, int retryCount) {
-			if (msg.Result != OperationResult.Success) {
-				if (retryCount > 0) {
-					WriteScavengeChunkCompletedEvent(streamId, eventToWrite, --retryCount);
-				} else {
-					Log.Error(
-						"Failed to write an event to the {stream} stream. Retry limit of {retryCount} reached. Reason: {reason}",
-						streamId, _retryAttempts, msg.Result);
-				}
-			}
-		}
-
-		private void WriteScavengeDetailEvent(string streamId, Event eventToWrite, int retryCount) {
-			_ioDispatcher.WriteEvent(streamId, ExpectedVersion.Any, eventToWrite, SystemAccounts.System,
-				x => WriteScavengeDetailEventCompleted(x, eventToWrite, streamId, retryCount));
-		}
-
-		private void WriteScavengeIndexEvent(Event linkToEvent, int retryCount) {
-			_ioDispatcher.WriteEvent(SystemStreams.ScavengesStream, ExpectedVersion.Any, linkToEvent,
-				SystemAccounts.System, m => WriteScavengeIndexEventCompleted(m, linkToEvent, retryCount));
-		}
-
-		private void WriteScavengeIndexEventCompleted(ClientMessage.WriteEventsCompleted msg, Event linkToEvent,
-			int retryCount) {
-			if (msg.Result != OperationResult.Success) {
-				if (retryCount > 0) {
-					Log.Error(
-						"Failed to write an event to the {stream} stream. Retrying {retry}/{retryCount}. Reason: {reason}",
-						SystemStreams.ScavengesStream, (_retryAttempts - retryCount) + 1, _retryAttempts, msg.Result);
-					WriteScavengeIndexEvent(linkToEvent, --retryCount);
-				} else {
-					Log.Error(
-						"Failed to write an event to the {stream} stream. Retry limit of {retryCount} reached. Reason: {reason}",
-						SystemStreams.ScavengesStream, _retryAttempts, msg.Result);
-				}
-			}
-		}
-
-		private void WriteScavengeDetailEventCompleted(ClientMessage.WriteEventsCompleted msg, Event eventToWrite,
-			string streamId, int retryCount) {
-			if (msg.Result != OperationResult.Success) {
-				if (retryCount > 0) {
-					Log.Error(
-						"Failed to write an event to the {stream} stream. Retrying {retry}/{retryCount}. Reason: {reason}",
-						streamId, (_retryAttempts - retryCount) + 1, _retryAttempts, msg.Result);
-					WriteScavengeDetailEvent(streamId, eventToWrite, --retryCount);
-				} else {
-					Log.Error(
-						"Failed to write an event to the {stream} stream. Retry limit of {retryCount} reached. Reason: {reason}",
-						streamId, _retryAttempts, msg.Result);
-				}
-			} else {
-				string eventLinkTo = string.Format("{0}@{1}", msg.FirstEventNumber, streamId);
-				var linkToIndexEvent = new Event(Guid.NewGuid(), SystemEventTypes.LinkTo, false, eventLinkTo, null);
-				WriteScavengeIndexEvent(linkToIndexEvent, _retryAttempts);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunkScavengerLogManager.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunkScavengerLogManager.cs
deleted file mode 100644
index 42e788e5a9b..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFChunkScavengerLogManager.cs
+++ /dev/null
@@ -1,265 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services;
-using EventStore.Core.Services.Storage;
-using EventStore.Core.Services.UserManagement;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.TransactionLog.Chunks {
-	public class TFChunkScavengerLogManager : ITFChunkScavengerLogManager {
-		private readonly string _nodeEndpoint;
-		private readonly TimeSpan _scavengeHistoryMaxAge;
-		private readonly IODispatcher _ioDispatcher;
-		private const int MaxRetryCount = 5;
-		private static readonly ILogger Log = Serilog.Log.ForContext<StorageScavenger>();
-		private int _isInitialised;
-
-		public TFChunkScavengerLogManager(string nodeEndpoint, TimeSpan scavengeHistoryMaxAge,
-			IODispatcher ioDispatcher) {
-			_nodeEndpoint = nodeEndpoint;
-			_scavengeHistoryMaxAge = scavengeHistoryMaxAge;
-			_ioDispatcher = ioDispatcher;
-		}
-
-		public void Initialise() {
-			// We only initialise on first election so we don't incorrectly mark running scavenges as interrupted.
-			if (Interlocked.Exchange(ref _isInitialised, 1) != 0)
-				return;
-
-			SetScavengeStreamMetadata();
-
-			Log.Debug("Searching for incomplete scavenges on node {nodeEndPoint}.", _nodeEndpoint);
-			GatherIncompleteScavenges(-1, new HashSet<string>(), new List<string>(), new List<string>());
-		}
-
-		public ITFChunkScavengerLog CreateLog() {
-			return CreateLogInternal(Guid.NewGuid().ToString());
-		}
-
-		private TFChunkScavengerLog CreateLogInternal(string scavengeId) {
-			return new TFChunkScavengerLog(_ioDispatcher, scavengeId, _nodeEndpoint, MaxRetryCount,
-				_scavengeHistoryMaxAge);
-		}
-
-		private void SetScavengeStreamMetadata() {
-			var metaStreamId = SystemStreams.MetastreamOf(SystemStreams.ScavengesStream);
-
-			_ioDispatcher.ReadBackward(metaStreamId, -1, 1, false, SystemAccounts.System, readResult => {
-				if (readResult.Result == ReadStreamResult.Success || readResult.Result == ReadStreamResult.NoStream) {
-					if (readResult.Events.Length == 1) {
-						var currentMetadata = StreamMetadata.FromJsonBytes(readResult.Events[0].Event.Data);
-						var hasProperACL = currentMetadata.Acl != null
-										&& currentMetadata.Acl.ReadRoles != null
-										&& currentMetadata.Acl.ReadRoles.Contains(x => x.Equals("$ops"));
-
-						if (currentMetadata.MaxAge == _scavengeHistoryMaxAge && hasProperACL) {
-							Log.Debug("Max age and $ops read permission already set for the {stream} stream.", SystemStreams.ScavengesStream);
-							return;
-						}
-					}
-
-					Log.Debug("Setting max age for the {stream} stream to {maxAge}.", SystemStreams.ScavengesStream,
-						_scavengeHistoryMaxAge);
-
-					Log.Debug("Setting $ops read permission for the {stream} stream", SystemStreams.ScavengesStream);
-
-					var acl = new StreamAcl(
-						new string[] { "$ops" },
-						new string[] { },
-						new string[] { },
-						new string[] { },
-						new string[] { }
-					);
-
-					var metadata = new StreamMetadata(maxAge: _scavengeHistoryMaxAge, acl: acl);
-					var metaStreamEvent = new Event(Guid.NewGuid(), SystemEventTypes.StreamMetadata, isJson: true,
-						data: metadata.ToJsonBytes(), metadata: null);
-					_ioDispatcher.WriteEvent(metaStreamId, ExpectedVersion.Any, metaStreamEvent,
-						SystemAccounts.System, m => {
-							if (m.Result != OperationResult.Success) {
-								Log.Error(
-									"Failed to write the $maxAge of {days} days and set $ops permission for the {stream} stream. Reason: {reason}",
-									_scavengeHistoryMaxAge.TotalDays, SystemStreams.ScavengesStream, m.Result);
-							}
-						});
-				}
-			});
-		}
-
-		private void GatherIncompleteScavenges(long from, ISet<string> completedScavenges,
-			IList<string> incompleteScavenges, IList<string> recentScavenges) {
-			_ioDispatcher.ReadBackward(SystemStreams.ScavengesStream, from, 20, true, SystemAccounts.System,
-				readResult => {
-					if (readResult.Result != ReadStreamResult.Success &&
-						readResult.Result != ReadStreamResult.NoStream) {
-						Log.Debug("Unable to read {stream} for scavenge log clean up. Result: {result}",
-							SystemStreams.ScavengesStream, readResult.Result);
-						return;
-					}
-
-					foreach (var ev in readResult.Events) {
-						if (ev.ResolveResult == ReadEventResult.Success) {
-							var dictionary = ev.Event.Data.ParseJson<Dictionary<string, object>>();
-
-							object entryNode;
-							if (!dictionary.TryGetValue("nodeEndpoint", out entryNode) ||
-								entryNode.ToString() != _nodeEndpoint) {
-								continue;
-							}
-
-							object scavengeIdEntry;
-							if (!dictionary.TryGetValue("scavengeId", out scavengeIdEntry)) {
-								Log.Warning("An entry in the scavenge log has no scavengeId");
-								continue;
-							}
-
-							var scavengeId = scavengeIdEntry.ToString();
-							if (recentScavenges.Count <= 1000) //bound size
-								recentScavenges.Add(scavengeId);
-
-							if (ev.Event.EventType == SystemEventTypes.ScavengeCompleted) {
-								completedScavenges.Add(scavengeId);
-							} else if (ev.Event.EventType == SystemEventTypes.ScavengeStarted) {
-								if (!completedScavenges.Contains(scavengeId)) {
-									incompleteScavenges.Add(scavengeId);
-								}
-							}
-						}
-					}
-
-					if (readResult.IsEndOfStream || readResult.Events.Length == 0) {
-						SetOpsPermissions(recentScavenges);
-						CompleteInterruptedScavenges(incompleteScavenges);
-					} else {
-						GatherIncompleteScavenges(readResult.NextEventNumber, completedScavenges, incompleteScavenges, recentScavenges);
-					}
-				});
-		}
-
-		private void SetOpsPermissions(IList<string> recentScavengeIds) {
-			//sets $ops permissions on last 30 $scavenges-<scavenge id> stream
-			//added for backward compatibility to make UI scavenge history work properly with $ops users
-
-			var last30ScavengeIds = new HashSet<string>();
-			foreach (var scavengeId in recentScavengeIds) {
-				if (last30ScavengeIds.Count >= 30)
-					break;
-				last30ScavengeIds.Add(scavengeId);
-			}
-
-			if (last30ScavengeIds.Count > 0)
-				Log.Debug("Setting $ops read permission on last {count} $scavenges-<scavenge id> streams.", last30ScavengeIds.Count);
-
-			foreach (var scavengeId in last30ScavengeIds) {
-				var acl = new StreamAcl(
-					new string[] { "$ops" },
-					new string[] { },
-					new string[] { },
-					new string[] { },
-					new string[] { }
-				);
-
-				var scavengeIdStream = SystemStreams.ScavengesStream + "-" + scavengeId;
-				var metaStreamId = SystemStreams.MetastreamOf(scavengeIdStream);
-				var metadata = new StreamMetadata(maxAge: _scavengeHistoryMaxAge, acl: acl);
-				var metaStreamEvent = new Event(Guid.NewGuid(), SystemEventTypes.StreamMetadata, isJson: true,
-					data: metadata.ToJsonBytes(), metadata: null);
-				_ioDispatcher.WriteEvent(metaStreamId, ExpectedVersion.Any, metaStreamEvent,
-					SystemAccounts.System, m => {
-						if (m.Result != OperationResult.Success) {
-							Log.Error(
-								"Failed to write the $maxAge of {days} and set $ops read permission for the {stream} stream. Reason: {reason}",
-								_scavengeHistoryMaxAge.TotalDays, scavengeIdStream, m.Result);
-						}
-					});
-			}
-		}
-
-		private void CompleteInterruptedScavenges(IList<string> incompletedScavenges) {
-			if (incompletedScavenges.Count == 0) {
-				Log.Debug("No incomplete scavenges found on node {nodeEndPoint}.", _nodeEndpoint);
-			} else {
-				Log.Information(
-					"Found {incomplete} incomplete scavenge{s} on node {nodeEndPoint}. Marking as failed:{newLine}{incompleteScavenges}",
-					incompletedScavenges.Count, incompletedScavenges.Count == 1 ? "" : "s", _nodeEndpoint,
-					Environment.NewLine, string.Join(Environment.NewLine, incompletedScavenges));
-			}
-
-			foreach (var incompletedScavenge in incompletedScavenges) {
-				GatherIncompleteScavengeStats(-1, new IncompleteScavengeStats(incompletedScavenge));
-			}
-		}
-
-		private void GatherIncompleteScavengeStats(long from, IncompleteScavengeStats incompleteScavengeStats) {
-			_ioDispatcher.ReadBackward(incompleteScavengeStats.ScavengeStream, from, 50, true, SystemAccounts.System,
-				readResult => {
-					if (readResult.Result != ReadStreamResult.Success &&
-						readResult.Result != ReadStreamResult.NoStream) {
-						Log.Debug("Unable to read {stream} for scavenge log clean up. Result: {result}",
-							incompleteScavengeStats.ScavengeStream, readResult.Result);
-						return;
-					}
-
-					foreach (var ev in readResult.Events) {
-						if (ev.ResolveResult == ReadEventResult.Success) {
-							var dictionary = ev.Event.Data.ParseJson<Dictionary<string, object>>();
-
-							if (ev.Event.EventType == SystemEventTypes.ScavengeChunksCompleted
-							 || ev.Event.EventType == SystemEventTypes.ScavengeMergeCompleted
-							 || ev.Event.EventType == SystemEventTypes.ScavengeIndexCompleted) {
-								if (dictionary.TryGetValue("spaceSaved", out var spaceSavedEntry)) {
-									incompleteScavengeStats.SpaceSaved += (long)spaceSavedEntry;
-								}
-								if (dictionary.TryGetValue("timeTaken", out var timeTakenEntry)) {
-									incompleteScavengeStats.TimeTaken += TimeSpan.Parse(timeTakenEntry.ToString());
-								}
-
-								if (ev.Event.EventType == SystemEventTypes.ScavengeChunksCompleted) {
-									if (dictionary.TryGetValue("chunkEndNumber", out var chunkEndNumberEntry)) {
-										incompleteScavengeStats.MaxChunkScavenged = Math.Max(incompleteScavengeStats.MaxChunkScavenged, (int)(long)chunkEndNumberEntry);
-									}
-								}
-							}
-						}
-					}
-
-					if (readResult.IsEndOfStream || readResult.Events.Length == 0) {
-						CompleteScavengeWithStats(incompleteScavengeStats);
-					} else {
-						GatherIncompleteScavengeStats(readResult.NextEventNumber, incompleteScavengeStats);
-					}
-				});
-		}
-
-		private void CompleteScavengeWithStats(IncompleteScavengeStats incompleteScavengeStats) {
-
-			var log = CreateLogInternal(incompleteScavengeStats.ScavengeId);
-
-			log.ScavengeCompleted(ScavengeResult.Interrupted,
-				"The node was restarted.",
-				incompleteScavengeStats.TimeTaken,
-				incompleteScavengeStats.SpaceSaved,
-				incompleteScavengeStats.MaxChunkScavenged);
-		}
-
-		class IncompleteScavengeStats {
-			public string ScavengeId { get; private set; }
-			public string ScavengeStream => string.Format("{0}-{1}", SystemStreams.ScavengesStream, ScavengeId);
-
-			public IncompleteScavengeStats(string scavengeId) {
-				ScavengeId = scavengeId;
-			}
-
-
-			public long SpaceSaved { get; set; }
-			public int MaxChunkScavenged { get; set; }
-			public TimeSpan TimeTaken { get; set; } = TimeSpan.Zero;
-
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFChunkWriter.cs b/src/EventStore.Core/TransactionLog/Chunks/TFChunkWriter.cs
deleted file mode 100644
index 9ab6a4cb2df..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFChunkWriter.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.LogRecords;
-using Serilog;
-using Serilog.Events;
-
-namespace EventStore.Core.TransactionLog.Chunks {
-	public class TFChunkWriter : ITransactionFileWriter {
-		public long Position => _writerCheckpoint.ReadNonFlushed();
-		public long FlushedPosition => _writerCheckpoint.Read();
-
-		public TFChunk.TFChunk CurrentChunk {
-			get { return _currentChunk; }
-		}
-
-		public bool NeedsNewChunk =>
-			CurrentChunk == null || // new database
-			CurrentChunk.IsReadOnly; // database is at a chunk boundary
-
-		private readonly TFChunkDb _db;
-		private readonly ICheckpoint _writerCheckpoint;
-		private long _nextRecordPosition;
-		private bool _inTransaction;
-
-		private TFChunk.TFChunk _currentChunk;
-
-		private const int MaxChunkNumber = TFChunkManager.MaxChunksCount;
-		private const int MaxChunkNumberError = MaxChunkNumber - 25_000;
-		private const int MaxChunkNumberWarning = MaxChunkNumber - 50_000;
-
-		private static readonly ILogger Log = Serilog.Log.ForContext<TFChunkWriter>();
-
-		public TFChunkWriter(TFChunkDb db) {
-			Ensure.NotNull(db, "db");
-
-			_db = db;
-			_writerCheckpoint = db.Config.WriterCheckpoint;
-			_nextRecordPosition = _writerCheckpoint.Read();
-		}
-
-		public void Open() {
-			if (_db.Manager.ChunksCount == 0) {
-				// new database
-				_currentChunk = null;
-			} else if (!_db.Manager.TryGetChunkFor(_nextRecordPosition, out _currentChunk)) {
-				// we may have been at a chunk boundary and the new chunk wasn't yet created
-				if (!_db.Manager.TryGetChunkFor(_nextRecordPosition - 1, out _currentChunk))
-					throw new Exception($"Failed to get chunk for log position: {_nextRecordPosition}");
-			}
-		}
-
-		public bool CanWrite(int numBytes) {
-			return _currentChunk.ChunkHeader.ChunkEndPosition - _nextRecordPosition >= numBytes;
-		}
-
-		public bool Write(ILogRecord record, out long newPos) {
-			OpenTransaction();
-
-			if (!TryWriteToTransaction(record, out newPos)) {
-				CompleteChunkInTransaction();
-				AddNewChunk();
-				CommitTransaction();
-				Flush();
-				newPos = _nextRecordPosition;
-				return false;
-			}
-
-			CommitTransaction();
-			return true;
-		}
-
-		public void OpenTransaction() {
-			if (_inTransaction)
-				throw new InvalidOperationException("Attempted to open a new transaction while there was an ongoing transaction.");
-
-			_inTransaction = true;
-		}
-
-		public void WriteToTransaction(ILogRecord record, out long newPos) {
-			if (!TryWriteToTransaction(record, out newPos))
-				throw new InvalidOperationException("The transaction does not fit in the current chunk.");
-		}
-
-		public bool TryWriteToTransaction(ILogRecord record, out long newPos) {
-			var result = _currentChunk.TryAppend(record);
-			if (!result.Success) {
-				newPos = default;
-				return false;
-			}
-
-			_nextRecordPosition = result.NewPosition + _currentChunk.ChunkHeader.ChunkStartPosition;
-			newPos = _nextRecordPosition;
-			return true;
-		}
-
-		public void CommitTransaction() {
-			if (!_inTransaction)
-				throw new InvalidOperationException("Attempted to commit a transaction while there was no ongoing transaction.");
-
-			_inTransaction = false;
-			_writerCheckpoint.Write(_nextRecordPosition);
-		}
-
-		public bool HasOpenTransaction() => _inTransaction;
-
-		public void AddNewChunk(ChunkHeader chunkHeader = null, ReadOnlyMemory<byte> transformHeader = default, int? chunkSize = null) {
-			var nextChunkNumber = _currentChunk?.ChunkHeader.ChunkEndNumber + 1 ?? 0;
-			VerifyChunkNumberLimits(nextChunkNumber);
-
-			if (chunkHeader == null)
-				_currentChunk = _db.Manager.AddNewChunk();
-			else
-				_currentChunk = _db.Manager.AddNewChunk(chunkHeader, transformHeader, chunkSize!.Value);
-		}
-
-		private void CompleteChunkInTransaction() {
-			_currentChunk.Complete();
-			_nextRecordPosition = _currentChunk.ChunkHeader.ChunkEndPosition;
-		}
-
-		public void CompleteChunk() {
-			OpenTransaction();
-			CompleteChunkInTransaction();
-			CommitTransaction();
-			Flush();
-		}
-
-		private async ValueTask CompleteReplicatedRawChunkInTransaction(TFChunk.TFChunk rawChunk, CancellationToken token) {
-			await rawChunk.CompleteRaw(token);
-			_currentChunk = _db.Manager.SwitchChunk(rawChunk, verifyHash: true, removeChunksWithGreaterNumbers: true);
-
-			_nextRecordPosition = rawChunk.ChunkHeader.ChunkEndPosition;
-		}
-
-		public async ValueTask CompleteReplicatedRawChunk(TFChunk.TFChunk rawChunk, CancellationToken token) {
-			OpenTransaction();
-			await CompleteReplicatedRawChunkInTransaction(rawChunk, token);
-			CommitTransaction();
-			Flush();
-		}
-
-		private static void VerifyChunkNumberLimits(int chunkNumber) {
-			switch (chunkNumber)
-			{
-				case >= MaxChunkNumber:
-					throw new Exception($"Max chunk number limit reached: {MaxChunkNumber:N0}. Shutting down.");
-				case < MaxChunkNumberWarning:
-					break;
-				default:
-				{
-					var level = chunkNumber >= MaxChunkNumberError ? LogEventLevel.Error : LogEventLevel.Warning;
-					Log.Write(level, "You are approaching the max chunk number limit: {chunkNumber:N0} / {maxChunkNumber:N0}. " +
-					                 "The server will shut down when the limit is reached!", chunkNumber, MaxChunkNumber);
-					break;
-				}
-			}
-		}
-
-		public void Dispose() {
-			Close();
-		}
-
-		public void Close() {
-			Flush();
-		}
-
-		public void Flush() {
-			if (_currentChunk == null) // the last chunk allocation failed
-				return;
-			_currentChunk.Flush();
-			_writerCheckpoint.Flush();
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TFConsts.cs b/src/EventStore.Core/TransactionLog/Chunks/TFConsts.cs
deleted file mode 100644
index 6704fdb41bc..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TFConsts.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-
-namespace EventStore.Core.TransactionLog.Chunks {
-	public static class TFConsts {
-		public const int MaxLogRecordSize = 16 * 1024 * 1024; // 16Mb ought to be enough for everything?.. ;)
-		public const int LogRecordOverheadSize = 10000;
-		public const int EffectiveMaxLogRecordSize = MaxLogRecordSize - LogRecordOverheadSize;
-		public const int MidpointsDepth = 10;
-
-		public const int ChunkSize = 256 * 1024 * 1024;
-		public const int ChunkHeaderSize = 128;
-		public const int ChunkFooterSize = 128;
-		public const int ChunksCacheSize = 2 * (ChunkSize + ChunkHeaderSize + ChunkFooterSize);
-		
-
-		public static TimeSpan MinFlushDelayMs = TimeSpan.FromMilliseconds(2);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Chunks/TransactionFileTracker.cs b/src/EventStore.Core/TransactionLog/Chunks/TransactionFileTracker.cs
deleted file mode 100644
index 96d2818aa35..00000000000
--- a/src/EventStore.Core/TransactionLog/Chunks/TransactionFileTracker.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-#nullable enable
-using EventStore.Core.Metrics;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.TransactionLog.Chunks;
-
-public class TFChunkTracker : ITransactionFileTracker {
-	private readonly LogicalChunkReadDistributionMetric _readDistribution;
-	private readonly CounterSubMetric _readBytes;
-	private readonly CounterSubMetric _readEvents;
-
-	public TFChunkTracker(
-		LogicalChunkReadDistributionMetric readDistribution,
-		CounterSubMetric readBytes,
-		CounterSubMetric readEvents) {
-
-		_readBytes = readBytes;
-		_readEvents = readEvents;
-		_readDistribution = readDistribution;
-	}
-
-	public void OnRead(ILogRecord record) {
-		_readDistribution.Record(record);
-
-		if (record is not PrepareLogRecord prepare)
-			return;
-
-		_readBytes.Add(prepare.Data.Length + prepare.Metadata.Length);
-		_readEvents.Add(1);
-	}
-
-	public class NoOp : ITransactionFileTracker {
-		public void OnRead(ILogRecord record) {
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/FileNamingStrategy/IVersionedFileNamingStrategy.cs b/src/EventStore.Core/TransactionLog/FileNamingStrategy/IVersionedFileNamingStrategy.cs
deleted file mode 100644
index 443483b6641..00000000000
--- a/src/EventStore.Core/TransactionLog/FileNamingStrategy/IVersionedFileNamingStrategy.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace EventStore.Core.TransactionLog.FileNamingStrategy {
-	public interface IVersionedFileNamingStrategy {
-		string GetFilenameFor(int index, int version);
-		string DetermineBestVersionFilenameFor(int index, int initialVersion);
-		string[] GetAllVersionsFor(int index);
-		string[] GetAllPresentFiles();
-		string GetTempFilename();
-		string[] GetAllTempFiles();
-		int GetIndexFor(string fileName);
-		int GetVersionFor(string fileName);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/FileNamingStrategy/VersionedPatternFileNamingStrategy.cs b/src/EventStore.Core/TransactionLog/FileNamingStrategy/VersionedPatternFileNamingStrategy.cs
deleted file mode 100644
index e5b4eab4689..00000000000
--- a/src/EventStore.Core/TransactionLog/FileNamingStrategy/VersionedPatternFileNamingStrategy.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Text.RegularExpressions;
-using EventStore.Common.Utils;
-using System.Linq;
-
-namespace EventStore.Core.TransactionLog.FileNamingStrategy {
-	public class VersionedPatternFileNamingStrategy : IVersionedFileNamingStrategy {
-		private readonly string _path;
-		private readonly string _prefix;
-		private readonly Regex _pattern;
-
-		public VersionedPatternFileNamingStrategy(string path, string prefix) {
-			Ensure.NotNull(path, "path");
-			Ensure.NotNull(prefix, "prefix");
-			_path = path;
-			_prefix = prefix;
-
-			_pattern = new Regex("^" + _prefix + @"\d{6}\.\d{6}$");
-		}
-
-		public string GetFilenameFor(int index, int version) {
-			Ensure.Nonnegative(index, "index");
-			Ensure.Nonnegative(version, "version");
-
-			return Path.Combine(_path, string.Format("{0}{1:000000}.{2:000000}", _prefix, index, version));
-		}
-
-		public string DetermineBestVersionFilenameFor(int index, int initialVersion) {
-			var allVersions = GetAllVersionsFor(index);
-			if (allVersions.Length == 0)
-				return GetFilenameFor(index, initialVersion);
-			int lastVersion;
-			if (!int.TryParse(allVersions[0].Substring(allVersions[0].LastIndexOf('.') + 1), out lastVersion))
-				throw new Exception(string.Format("Could not determine version from filename '{0}'.", allVersions[0]));
-			return GetFilenameFor(index, lastVersion + 1);
-		}
-
-		public string[] GetAllVersionsFor(int index) {
-			var versions = Directory.EnumerateFiles(_path, string.Format("{0}{1:000000}.*", _prefix, index))
-				.Where(x => _pattern.IsMatch(Path.GetFileName(x)))
-				.OrderByDescending(x => x, StringComparer.CurrentCultureIgnoreCase)
-				.ToArray();
-			return versions;
-		}
-
-		public int GetIndexFor(string fileName) {
-			if (!_pattern.IsMatch(fileName))
-				throw new ArgumentException($"Invalid file name: {fileName}");
-
-			var start = _prefix.Length;
-			var end = fileName.IndexOf('.', _prefix.Length);
-			Debug.Assert(end != -1);
-
-			if (!int.TryParse(fileName[start..end], out var fileIndex))
-				throw new ArgumentException($"Invalid file name: {fileName}");
-
-			return fileIndex;
-		}
-
-		public int GetVersionFor(string fileName) {
-			if (!_pattern.IsMatch(fileName))
-				throw new ArgumentException($"Invalid file name: {fileName}");
-
-			var dot = fileName.IndexOf('.', _prefix.Length);
-			Debug.Assert(dot != -1);
-
-			if (!int.TryParse(fileName[(dot+1)..], out var version))
-				throw new ArgumentException($"Invalid file name: {fileName}");
-
-			return version;
-		}
-
-		public string[] GetAllPresentFiles() {
-			var versions = Directory.EnumerateFiles(_path, string.Format("{0}*.*", _prefix))
-				.Where(x => _pattern.IsMatch(Path.GetFileName(x)))
-				.ToArray();
-			return versions;
-		}
-
-		public string GetTempFilename() {
-			return Path.Combine(_path, string.Format("{0}.tmp", Guid.NewGuid()));
-		}
-
-		public string[] GetAllTempFiles() {
-			return Directory.GetFiles(_path, "*.tmp");
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/ITransactionFileChaser.cs b/src/EventStore.Core/TransactionLog/ITransactionFileChaser.cs
deleted file mode 100644
index e75e5514a0a..00000000000
--- a/src/EventStore.Core/TransactionLog/ITransactionFileChaser.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.TransactionLog {
-	public interface ITransactionFileChaser : IDisposable {
-		ICheckpoint Checkpoint { get; }
-
-		void Open();
-
-		SeqReadResult TryReadNext();
-		bool TryReadNext(out ILogRecord record);
-
-		void Close();
-		void Flush();
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/ITransactionFileReader.cs b/src/EventStore.Core/TransactionLog/ITransactionFileReader.cs
deleted file mode 100644
index f431f9c39a8..00000000000
--- a/src/EventStore.Core/TransactionLog/ITransactionFileReader.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using EventStore.Core.DataStructures;
-
-namespace EventStore.Core.TransactionLog {
-	public interface ITransactionFileReader {
-		void Reposition(long position);
-
-		SeqReadResult TryReadNext();
-		SeqReadResult TryReadPrev();
-
-		RecordReadResult TryReadAt(long position, bool couldBeScavenged);
-		bool ExistsAt(long position);
-	}
-
-	public struct TFReaderLease : IDisposable {
-		public readonly ITransactionFileReader Reader;
-		private readonly ObjectPool<ITransactionFileReader> _pool;
-
-		public TFReaderLease(ObjectPool<ITransactionFileReader> pool) {
-			_pool = pool;
-			Reader = pool.Get();
-		}
-
-		public TFReaderLease(ITransactionFileReader reader) {
-			_pool = null;
-			Reader = reader;
-		}
-
-		void IDisposable.Dispose() {
-			if (_pool != null)
-				_pool.Return(Reader);
-		}
-
-		public void Reposition(long position) {
-			Reader.Reposition(position);
-		}
-
-		public SeqReadResult TryReadNext() {
-			return Reader.TryReadNext();
-		}
-
-		public SeqReadResult TryReadPrev() {
-			return Reader.TryReadPrev();
-		}
-
-		public bool ExistsAt(long position) {
-			return Reader.ExistsAt(position);
-		}
-
-		public RecordReadResult TryReadAt(long position, bool couldBeScavenged) {
-			return Reader.TryReadAt(position, couldBeScavenged);
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/ITransactionFileTracker.cs b/src/EventStore.Core/TransactionLog/ITransactionFileTracker.cs
deleted file mode 100644
index 861f712fb21..00000000000
--- a/src/EventStore.Core/TransactionLog/ITransactionFileTracker.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.TransactionLog;
-
-public interface ITransactionFileTracker {
-	void OnRead(ILogRecord record);
-}
diff --git a/src/EventStore.Core/TransactionLog/ITransactionFileWriter.cs b/src/EventStore.Core/TransactionLog/ITransactionFileWriter.cs
deleted file mode 100644
index a1c0f317966..00000000000
--- a/src/EventStore.Core/TransactionLog/ITransactionFileWriter.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.TransactionLog {
-	public interface ITransactionFileWriter : IDisposable {
-		void Open();
-		bool CanWrite(int numBytes);
-		bool Write(ILogRecord record, out long newPos);
-		void OpenTransaction();
-		void WriteToTransaction(ILogRecord record, out long newPos);
-		bool TryWriteToTransaction(ILogRecord record, out long newPos);
-		void CommitTransaction();
-		bool HasOpenTransaction();
-		void Flush();
-		void Close();
-
-		long Position { get; }
-		long FlushedPosition { get; }
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/LogRecords/CommitLogRecord.cs b/src/EventStore.Core/TransactionLog/LogRecords/CommitLogRecord.cs
deleted file mode 100644
index c4ad4d25ac5..00000000000
--- a/src/EventStore.Core/TransactionLog/LogRecords/CommitLogRecord.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Common.Utils;
-using EventStore.Core.Helpers;
-using EventStore.LogCommon;
-
-namespace EventStore.Core.TransactionLog.LogRecords {
-	public class CommitLogRecord : LogRecord, IEquatable<CommitLogRecord> {
-		public const byte CommitRecordVersion = 1;
-
-		public readonly long TransactionPosition;
-		public readonly long FirstEventNumber;
-		public readonly long SortKey;
-		public readonly Guid CorrelationId;
-		public readonly DateTime TimeStamp;
-
-		public CommitLogRecord(long logPosition,
-			Guid correlationId,
-			long transactionPosition,
-			DateTime timeStamp,
-			long firstEventNumber,
-			byte commitRecordVersion = CommitRecordVersion)
-			: base(LogRecordType.Commit, commitRecordVersion, logPosition) {
-			Ensure.NotEmptyGuid(correlationId, "correlationId");
-			Ensure.Nonnegative(transactionPosition, "TransactionPosition");
-			Ensure.Nonnegative(firstEventNumber, "eventNumber");
-
-			TransactionPosition = transactionPosition;
-			FirstEventNumber = firstEventNumber;
-			SortKey = logPosition;
-			CorrelationId = correlationId;
-			TimeStamp = timeStamp;
-		}
-
-		internal CommitLogRecord(BinaryReader reader, byte version, long logPosition) : base(LogRecordType.Commit,
-			version, logPosition) {
-			if (version != LogRecordVersion.LogRecordV0 && version != LogRecordVersion.LogRecordV1)
-				throw new ArgumentException(
-					string.Format("CommitRecord version {0} is incorrect. Supported version: {1}.", version,
-						CommitRecordVersion));
-
-			TransactionPosition = reader.ReadInt64();
-			FirstEventNumber = version == LogRecordVersion.LogRecordV0 ? reader.ReadInt32() : reader.ReadInt64();
-
-			if (version == LogRecordVersion.LogRecordV0) {
-				FirstEventNumber = FirstEventNumber == int.MaxValue ? long.MaxValue : FirstEventNumber;
-			}
-
-			SortKey = reader.ReadInt64();
-			CorrelationId = new Guid(reader.ReadBytes(16));
-			TimeStamp = new DateTime(reader.ReadInt64());
-		}
-
-		public override void WriteTo(BinaryWriter writer) {
-			base.WriteTo(writer);
-
-			writer.Write(TransactionPosition);
-			if (Version == LogRecordVersion.LogRecordV0) {
-				int firstEventNumber = FirstEventNumber == long.MaxValue ? int.MaxValue : (int)FirstEventNumber;
-				writer.Write(firstEventNumber);
-			} else {
-				writer.Write(FirstEventNumber);
-			}
-
-			writer.Write(SortKey);
-			writer.Write(CorrelationId.ToByteArray());
-			writer.Write(TimeStamp.Ticks);
-		}
-
-		public bool Equals(CommitLogRecord other) {
-			if (ReferenceEquals(null, other)) return false;
-			if (ReferenceEquals(this, other)) return true;
-			return other.LogPosition == LogPosition
-			       && other.TransactionPosition == TransactionPosition
-			       && other.FirstEventNumber == FirstEventNumber
-			       && other.SortKey == SortKey
-			       && other.CorrelationId == CorrelationId
-			       && other.TimeStamp.Equals(TimeStamp);
-		}
-
-		public override bool Equals(object obj) {
-			if (ReferenceEquals(null, obj)) return false;
-			if (ReferenceEquals(this, obj)) return true;
-			if (obj.GetType() != typeof(CommitLogRecord)) return false;
-			return Equals((CommitLogRecord)obj);
-		}
-
-		public override int GetHashCode() {
-			unchecked {
-				int result = LogPosition.GetHashCode();
-				result = (result * 397) ^ TransactionPosition.GetHashCode();
-				result = (result * 397) ^ FirstEventNumber.GetHashCode();
-				result = (result * 397) ^ SortKey.GetHashCode();
-				result = (result * 397) ^ CorrelationId.GetHashCode();
-				result = (result * 397) ^ TimeStamp.GetHashCode();
-				return result;
-			}
-		}
-
-		public static bool operator ==(CommitLogRecord left, CommitLogRecord right) {
-			return Equals(left, right);
-		}
-
-		public static bool operator !=(CommitLogRecord left, CommitLogRecord right) {
-			return !Equals(left, right);
-		}
-
-		public override string ToString() {
-			return string.Format("LogPosition: {0}, "
-			                     + "TransactionPosition: {1}, "
-			                     + "FirstEventNumber: {2}, "
-			                     + "SortKey: {3}, "
-			                     + "CorrelationId: {4}, "
-			                     + "TimeStamp: {5}",
-				LogPosition,
-				TransactionPosition,
-				FirstEventNumber,
-				SortKey,
-				CorrelationId,
-				TimeStamp);
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/LogRecords/EpochRecord.cs b/src/EventStore.Core/TransactionLog/LogRecords/EpochRecord.cs
deleted file mode 100644
index f86264ec4ed..00000000000
--- a/src/EventStore.Core/TransactionLog/LogRecords/EpochRecord.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Util;
-
-namespace EventStore.Core.TransactionLog.LogRecords {
-	public static class EpochRecordExtensions {
-		public static string AsString(this EpochRecord epoch) {
-			return string.Format("E{0}@{1}:{2:B}",
-				epoch == null ? -1 : epoch.EpochNumber,
-				epoch == null ? -1 : epoch.EpochPosition,
-				epoch == null ? Guid.Empty : epoch.EpochId);
-		}
-
-		public static string AsString(this Epoch epoch) {
-			return string.Format("E{0}@{1}:{2:B}",
-				epoch == null ? -1 : epoch.EpochNumber,
-				epoch == null ? -1 : epoch.EpochPosition,
-				epoch == null ? Guid.Empty : epoch.EpochId);
-		}
-	}
-
-	public class EpochRecord: IComparable {
-		public readonly long EpochPosition;
-		public readonly int EpochNumber;
-		public readonly Guid EpochId;
-
-		public readonly long PrevEpochPosition;
-		public readonly DateTime TimeStamp;
-		public readonly Guid LeaderInstanceId;
-
-		public EpochRecord(long epochPosition, int epochNumber, Guid epochId, long prevEpochPosition,
-			DateTime timeStamp, Guid leaderInstanceId) {
-			EpochPosition = epochPosition;
-			EpochNumber = epochNumber;
-			EpochId = epochId;
-			PrevEpochPosition = prevEpochPosition;
-			TimeStamp = timeStamp;
-			LeaderInstanceId = leaderInstanceId;
-		}
-
-		internal EpochRecord(EpochRecordDto dto)
-			: this(dto.EpochPosition, dto.EpochNumber, dto.EpochId, dto.PrevEpochPosition, dto.TimeStamp, dto.LeaderInstanceId) {
-		}
-
-		public byte[] AsSerialized() {
-			return new EpochRecordDto(this).ToJsonBytes();
-		}
-
-		public override string ToString() {
-			return string.Format(
-				"EpochPosition: {0}, EpochNumber: {1}, EpochId: {2}, PrevEpochPosition: {3}, TimeStamp: {4}, LeaderInstanceId: {5}",
-				EpochPosition,
-				EpochNumber,
-				EpochId,
-				PrevEpochPosition,
-				TimeStamp,
-				LeaderInstanceId);
-		}
-
-		public int CompareTo(object obj) {
-			if (obj == null) return 1;
-			EpochRecord other = obj as EpochRecord;
-			if(other == null) throw new ArgumentException("Object is not a Epoch Record");
-			return EpochNumber.CompareTo(other.EpochNumber);
-		}
-
-		internal class EpochRecordDto {
-			public long EpochPosition { get; set; }
-			public int EpochNumber { get; set; }
-			public Guid EpochId { get; set; }
-
-			public long PrevEpochPosition { get; set; }
-			public DateTime TimeStamp { get; set; }
-			public Guid LeaderInstanceId { get; set; }
-
-			public EpochRecordDto() {
-			}
-
-			public EpochRecordDto(EpochRecord rec) {
-				EpochPosition = rec.EpochPosition;
-				EpochNumber = rec.EpochNumber;
-				EpochId = rec.EpochId;
-
-				PrevEpochPosition = rec.PrevEpochPosition;
-				TimeStamp = rec.TimeStamp;
-				LeaderInstanceId = rec.LeaderInstanceId;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/LogRecords/ILogRecord.cs b/src/EventStore.Core/TransactionLog/LogRecords/ILogRecord.cs
deleted file mode 100644
index 3515525936e..00000000000
--- a/src/EventStore.Core/TransactionLog/LogRecords/ILogRecord.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.IO;
-using EventStore.LogCommon;
-
-namespace EventStore.Core.TransactionLog.LogRecords {
-	public interface ILogRecord {
-		LogRecordType RecordType { get; }
-		byte Version { get; }
-		public long LogPosition { get; }
-		void WriteTo(BinaryWriter writer);
-		long GetNextLogPosition(long logicalPosition, int length);
-		long GetPrevLogPosition(long logicalPosition, int length);
-		int GetSizeWithLengthPrefixAndSuffix();
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/LogRecords/IPrepareLogRecord.cs b/src/EventStore.Core/TransactionLog/LogRecords/IPrepareLogRecord.cs
deleted file mode 100644
index 172f053b12a..00000000000
--- a/src/EventStore.Core/TransactionLog/LogRecords/IPrepareLogRecord.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-
-namespace EventStore.Core.TransactionLog.LogRecords {
-	// This interface specifies what the Storage, TF and Index machinery requires
-	// in order to handle a prepare (i.e. data) record.
-	// The V2 prepare implements it trivially
-	public interface IPrepareLogRecord : ILogRecord {
-		int SizeOnDisk { get; }
-		PrepareFlags Flags { get; }
-		long TransactionPosition { get; }
-		int TransactionOffset { get; }
-		long ExpectedVersion { get; }
-		Guid EventId { get; }
-		Guid CorrelationId { get; }
-		DateTime TimeStamp { get; }
-		ReadOnlyMemory<byte> Data { get; }
-		ReadOnlyMemory<byte> Metadata { get; }
-	}
-
-	public interface IPrepareLogRecord<TStreamId> : IPrepareLogRecord {
-		TStreamId EventStreamId { get; }
-		TStreamId EventType { get; }
-		
-		IPrepareLogRecord<TStreamId> CopyForRetry(long logPosition, long transactionPosition);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/LogRecords/ISystemLogRecord.cs b/src/EventStore.Core/TransactionLog/LogRecords/ISystemLogRecord.cs
deleted file mode 100644
index e64b088cce5..00000000000
--- a/src/EventStore.Core/TransactionLog/LogRecords/ISystemLogRecord.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.Core.TransactionLog.LogRecords {
-	public interface ISystemLogRecord : ILogRecord {
-		SystemRecordType SystemRecordType { get; }
-		EpochRecord GetEpochRecord();
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/LogRecords/LogRecord.cs b/src/EventStore.Core/TransactionLog/LogRecords/LogRecord.cs
deleted file mode 100644
index 1fd251c515b..00000000000
--- a/src/EventStore.Core/TransactionLog/LogRecords/LogRecord.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Services;
-using EventStore.LogCommon;
-
-namespace EventStore.Core.TransactionLog.LogRecords {
-	public abstract class LogRecord : ILogRecord {
-		public static readonly ReadOnlyMemory<byte> NoData = Empty.ByteArray;
-
-		public LogRecordType RecordType { get; }
-		public byte Version { get; }
-		public long LogPosition { get; }
-
-		public long GetNextLogPosition(long logicalPosition, int length) {
-			return logicalPosition + length + 2 * sizeof(int);
-		}
-
-		public long GetPrevLogPosition(long logicalPosition, int length) {
-			return logicalPosition - length - 2 * sizeof(int);
-		}
-
-		public static ILogRecord ReadFrom(BinaryReader reader, int length) {
-			var recordType = (LogRecordType)reader.ReadByte();
-			var version = reader.ReadByte();
-
-			static long ReadPosition(BinaryReader reader) {
-				var logPosition = reader.ReadInt64();
-				Ensure.Nonnegative(logPosition, "logPosition");
-				return logPosition;
-			}
-
-			switch (recordType) {
-				case LogRecordType.Prepare:
-					return new PrepareLogRecord(reader, version, ReadPosition(reader));
-				case LogRecordType.Commit:
-					return new CommitLogRecord(reader, version, ReadPosition(reader));
-				case LogRecordType.System:
-					if (version > SystemLogRecord.SystemRecordVersion)
-						return new LogV3EpochLogRecord(LogV3Reader.ReadBytes(recordType, version, reader, length));
-
-					return new SystemLogRecord(reader, version, ReadPosition(reader));
-
-				case LogRecordType.StreamWrite:
-					return new LogV3StreamWriteRecord(LogV3Reader.ReadBytes(recordType, version, reader, length));
-
-				case LogRecordType.Stream:
-					return new LogV3StreamRecord(LogV3Reader.ReadBytes(recordType, version, reader, length));
-
-				case LogRecordType.EventType:
-					return new LogV3EventTypeRecord(LogV3Reader.ReadBytes(recordType, version, reader, length));
-
-				case LogRecordType.PartitionType:
-					return new PartitionTypeLogRecord(LogV3Reader.ReadBytes(recordType, version, reader, length));
-				
-				case LogRecordType.Partition:
-					return new PartitionLogRecord(LogV3Reader.ReadBytes(recordType, version, reader, length));
-				
-				default:
-					throw new ArgumentOutOfRangeException("recordType");
-			}
-		}
-
-		public static IPrepareLogRecord<TStreamId> Prepare<TStreamId>(IRecordFactory<TStreamId> factory, long logPosition, Guid correlationId, Guid eventId, long transactionPos,
-			int transactionOffset,
-			TStreamId eventStreamId, long expectedVersion, PrepareFlags flags, TStreamId eventType,
-			ReadOnlyMemory<byte> data, ReadOnlyMemory<byte> metadata, DateTime? timeStamp = null) {
-			return factory.CreatePrepare(logPosition, correlationId, eventId, transactionPos, transactionOffset,
-				eventStreamId, expectedVersion, timeStamp ?? DateTime.UtcNow, flags, eventType,
-				data, metadata);
-		}
-
-		public static CommitLogRecord Commit(long logPosition, Guid correlationId, long startPosition,
-			long eventNumber) {
-			return new CommitLogRecord(logPosition, correlationId, startPosition, DateTime.UtcNow, eventNumber);
-		}
-
-		public static IPrepareLogRecord<TStreamId> SingleWrite<TStreamId>(IRecordFactory<TStreamId> factory, long logPosition, Guid correlationId, Guid eventId,
-			TStreamId eventStreamId,
-			long expectedVersion, TStreamId eventType, ReadOnlyMemory<byte> data, ReadOnlyMemory<byte> metadata,
-			DateTime? timestamp = null, PrepareFlags? additionalFlags = null) {
-			return factory.CreatePrepare(logPosition, correlationId, eventId, logPosition, 0, eventStreamId,
-				expectedVersion,
-				timestamp ?? DateTime.UtcNow,
-				PrepareFlags.Data | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
-				(additionalFlags ?? PrepareFlags.None),
-				eventType, data, metadata);
-		}
-
-		public static IPrepareLogRecord<TStreamId> TransactionBegin<TStreamId>(IRecordFactory<TStreamId> factory, long logPos, Guid correlationId, TStreamId eventStreamId,
-			long expectedVersion) {
-			return factory.CreatePrepare(logPos, correlationId, Guid.NewGuid(), logPos, -1, eventStreamId,
-				expectedVersion,
-				DateTime.UtcNow, PrepareFlags.TransactionBegin, default, NoData, NoData);
-		}
-
-		public static IPrepareLogRecord<TStreamId> TransactionWrite<TStreamId>(IRecordFactory<TStreamId> factory, long logPosition, Guid correlationId, Guid eventId,
-			long transactionPos, int transactionOffset, TStreamId eventStreamId, TStreamId eventType, byte[] data,
-			byte[] metadata, bool isJson) {
-			return factory.CreatePrepare(logPosition, correlationId, eventId, transactionPos, transactionOffset,
-				eventStreamId, ExpectedVersion.Any, DateTime.UtcNow,
-				PrepareFlags.Data | (isJson ? PrepareFlags.IsJson : PrepareFlags.None),
-				eventType, data, metadata);
-		}
-
-		public static IPrepareLogRecord<TStreamId> TransactionEnd<TStreamId>(IRecordFactory<TStreamId> factory, long logPos, Guid correlationId, Guid eventId,
-			long transactionPos, TStreamId eventStreamId) {
-			return factory.CreatePrepare(logPos, correlationId, eventId, transactionPos, -1, eventStreamId,
-				ExpectedVersion.Any,
-				DateTime.UtcNow, PrepareFlags.TransactionEnd, default, NoData, NoData);
-		}
-
-		public static IPrepareLogRecord<TStreamId> DeleteTombstone<TStreamId>(IRecordFactory<TStreamId> factory, long logPosition, Guid correlationId, Guid eventId,
-			TStreamId eventStreamId, TStreamId eventType, long expectedVersion, PrepareFlags additionalFlags = PrepareFlags.None) {
-			return factory.CreatePrepare(logPosition, correlationId, eventId, logPosition, 0, eventStreamId,
-				expectedVersion, DateTime.UtcNow,
-				PrepareFlags.StreamDelete | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
-				additionalFlags,
-				eventType, NoData, NoData);
-		}
-
-		protected LogRecord(LogRecordType recordType, byte version, long logPosition) {
-			Ensure.Nonnegative(logPosition, "logPosition");
-			RecordType = recordType;
-			Version = version;
-			LogPosition = logPosition;
-		}
-
-		public virtual void WriteTo(BinaryWriter writer) {
-			writer.Write((byte)RecordType);
-			writer.Write(Version);
-			writer.Write(LogPosition);
-		}
-
-		public int GetSizeWithLengthPrefixAndSuffix() {
-			using (var memoryStream = new MemoryStream()) {
-				WriteTo(new BinaryWriter(memoryStream));
-				return 8 + (int)memoryStream.Length;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/LogRecords/LogRecordExtensions.cs b/src/EventStore.Core/TransactionLog/LogRecords/LogRecordExtensions.cs
deleted file mode 100644
index 52a628a6551..00000000000
--- a/src/EventStore.Core/TransactionLog/LogRecords/LogRecordExtensions.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using EventStore.LogCommon;
-
-namespace EventStore.Core.TransactionLog.LogRecords;
-
-public static class LogRecordExtensions {
-	public static bool IsTransactionBoundary(this ILogRecord rec) {
-		return rec.RecordType switch {
-			LogRecordType.Stream => false, // log v3 stream record
-			LogRecordType.EventType => false, // log v3 event type record
-			LogRecordType.Prepare => rec is IPrepareLogRecord prepare &&
-			                         (!prepare.Flags.HasFlag(PrepareFlags.IsCommitted) || // explicit transaction
-			                         prepare.Flags.HasFlag(PrepareFlags.TransactionEnd)), // last prepare in implicit transaction
-			_ => true
-		};
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/LogRecords/LogV3EpochLogRecord.cs b/src/EventStore.Core/TransactionLog/LogRecords/LogV3EpochLogRecord.cs
deleted file mode 100644
index fb60b2eb8c6..00000000000
--- a/src/EventStore.Core/TransactionLog/LogRecords/LogV3EpochLogRecord.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using EventStore.LogV3;
-
-namespace EventStore.Core.TransactionLog.LogRecords {
-	public class LogV3EpochLogRecord : LogV3Record<RecordView<Raw.EpochHeader>>, ISystemLogRecord {
-		public SystemRecordType SystemRecordType => SystemRecordType.Epoch;
-
-		public LogV3EpochLogRecord(
-			long logPosition,
-			DateTime timeStamp,
-			int epochNumber,
-			Guid epochId,
-			long prevEpochPosition,
-			Guid leaderInstanceId) : base() {
-
-			Record = RecordCreator.CreateEpochRecord(
-				timeStamp: timeStamp,
-				logPosition: logPosition,
-				epochNumber: epochNumber,
-				epochId: epochId,
-				prevEpochPosition: prevEpochPosition,
-				leaderInstanceId: leaderInstanceId);
-		}
-
-		public LogV3EpochLogRecord(ReadOnlyMemory<byte> bytes) : base() {
-			Record = new RecordView<Raw.EpochHeader>(bytes);
-		}
-
-		public EpochRecord GetEpochRecord() => new EpochRecord(
-			epochPosition: Record.Header.LogPosition,
-			epochNumber: Record.SubHeader.EpochNumber,
-			epochId: Record.Header.RecordId,
-			prevEpochPosition: Record.SubHeader.PrevEpochPosition,
-			timeStamp: Record.Header.TimeStamp,
-			leaderInstanceId: Record.SubHeader.LeaderInstanceId);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/LogRecords/LogV3EventTypeRecord.cs b/src/EventStore.Core/TransactionLog/LogRecords/LogV3EventTypeRecord.cs
deleted file mode 100644
index 97ecf1058a8..00000000000
--- a/src/EventStore.Core/TransactionLog/LogRecords/LogV3EventTypeRecord.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System;
-using EventStore.Core.LogV3;
-using EventStore.LogV3;
-
-namespace EventStore.Core.TransactionLog.LogRecords {
-	public class LogV3EventTypeRecord : LogV3Record<StringPayloadRecord<Raw.EventTypeHeader>>, IEquatable<LogV3EventTypeRecord>, IPrepareLogRecord<uint> {
-
-		public uint EventStreamId => LogV3SystemStreams.EventTypesStreamNumber;
-		public PrepareFlags Flags => PrepareFlags.SingleWrite | PrepareFlags.IsCommitted | PrepareFlags.IsJson;
-		public long TransactionPosition => LogPosition;
-		public int TransactionOffset => 0;
-		public long ExpectedVersion => EventTypeIdConverter.ToEventNumber(Record.SubHeader.ReferenceNumber) - 1;
-		public Guid EventId => Record.Header.RecordId;
-		public Guid ParentEventId => Record.SubHeader.ParentEventTypeId;
-		public Guid CorrelationId { get; } = Guid.NewGuid();
-		public uint EventType => LogV3SystemEventTypes.EventTypeDefinedNumber;
-		// so we can see the event type in the webui if we want
-		public ReadOnlyMemory<byte> Data => Record.Payload;
-		public ReadOnlyMemory<byte> Metadata => ReadOnlyMemory<byte>.Empty;
-
-		public string EventTypeName => Record.StringPayload;
-		public uint EventTypeNumber => Record.SubHeader.ReferenceNumber;
-		public ushort EventTypeVersion => Record.SubHeader.Version;
-
-		public LogV3EventTypeRecord(
-			Guid eventTypeId,
-			Guid parentEventTypeId,
-			long logPosition,
-			DateTime timeStamp,
-			string eventType,
-			uint eventTypeNumber,
-			ushort eventTypeVersion,
-			Guid partitionId) : base() {
-
-			Record = RecordCreator.CreateEventTypeRecord(
-				eventTypeId: eventTypeId,
-				parentEventTypeId: parentEventTypeId,
-				timeStamp: timeStamp,
-				logPosition: logPosition,
-				name: eventType,
-				eventTypeNumber: eventTypeNumber,
-				eventTypeVersion: eventTypeVersion,
-				partitionId: partitionId);
-		}
-
-		public LogV3EventTypeRecord(ReadOnlyMemory<byte> bytes) : base() {
-			Record = StringPayloadRecord.Create(new RecordView<Raw.EventTypeHeader>(bytes));
-		}
-
-		public IPrepareLogRecord<uint> CopyForRetry(long logPosition, long transactionPosition) {
-			return new LogV3EventTypeRecord(
-				eventTypeId: Record.Header.RecordId,
-				timeStamp: Record.Header.TimeStamp,
-				logPosition: logPosition,
-				eventTypeNumber: Record.SubHeader.ReferenceNumber,
-				eventType: Record.StringPayload,
-				parentEventTypeId: Record.SubHeader.ParentEventTypeId,
-				eventTypeVersion: Record.SubHeader.Version,
-				partitionId: Record.SubHeader.PartitionId);
-		}
-		
-		public bool Equals(LogV3EventTypeRecord other) {
-			if (other is null)
-				return false;
-			if (ReferenceEquals(this, other))
-				return true;
-			return
-				other.EventTypeName == EventTypeName &&
-				other.EventTypeNumber == EventTypeNumber &&
-				other.Record.Bytes.Span.SequenceEqual(Record.Bytes.Span);
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/LogRecords/LogV3Reader.cs b/src/EventStore.Core/TransactionLog/LogRecords/LogV3Reader.cs
deleted file mode 100644
index 346d3d19797..00000000000
--- a/src/EventStore.Core/TransactionLog/LogRecords/LogV3Reader.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.IO;
-using EventStore.LogCommon;
-
-namespace EventStore.Core.TransactionLog.LogRecords {
-	public static class LogV3Reader {
-		public static byte[] ReadBytes(LogRecordType type, byte version, BinaryReader reader, int recordLength) {
-			// todo: if we could get some confidence that we would return to the pool
-			// (e.g. with reference counting) then we could use arraypool here. or just maybe a ring buffer
-			// var bytes = ArrayPool<byte>.Shared.Rent(length);
-			var bytes = new byte[recordLength];
-			bytes[0] = (byte)type;
-			bytes[1] = version;
-			reader.Read(bytes.AsSpan(2..recordLength));
-			return bytes;
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/LogRecords/LogV3Record.cs b/src/EventStore.Core/TransactionLog/LogRecords/LogV3Record.cs
deleted file mode 100644
index 54411dfdd76..00000000000
--- a/src/EventStore.Core/TransactionLog/LogRecords/LogV3Record.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.IO;
-using EventStore.LogCommon;
-using EventStore.LogV3;
-
-namespace EventStore.Core.TransactionLog.LogRecords {
-	// This is the adapter to plug V3 records into the standard machinery.
-	public class LogV3Record<TRecordView> : ILogRecord where TRecordView : IRecordView {
-		public TRecordView Record { get; init; }
-
-		public long GetNextLogPosition(long logicalPosition, int length) {
-			return logicalPosition + length + 2 * sizeof(int);
-		}
-
-		public long GetPrevLogPosition(long logicalPosition, int length) {
-			return logicalPosition - length - 2 * sizeof(int);
-		}
-
-		// probably only needs to be virtual temporarily
-		public virtual LogRecordType RecordType => Record.Header.Type;
-
-		public byte Version => Record.Header.Version;
-
-		public long LogPosition => Record.Header.LogPosition;
-		public int SizeOnDisk => 2 * sizeof(int) + Record.Bytes.Length;
-
-		public DateTime TimeStamp => Record.Header.TimeStamp;
-
-		public LogV3Record() {
-		}
-
-		public void WriteTo(BinaryWriter writer) {
-			writer.Write(Record.Bytes.Span);
-		}
-
-		public int GetSizeWithLengthPrefixAndSuffix() {
-			return 2 * sizeof(int) + Record.Bytes.Length;
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/LogRecords/LogV3StreamRecord.cs b/src/EventStore.Core/TransactionLog/LogRecords/LogV3StreamRecord.cs
deleted file mode 100644
index b2f85671501..00000000000
--- a/src/EventStore.Core/TransactionLog/LogRecords/LogV3StreamRecord.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using EventStore.Core.LogV3;
-using EventStore.LogV3;
-using StreamId = System.UInt32;
-
-namespace EventStore.Core.TransactionLog.LogRecords {
-	// todo: when we have partition records etc there might be a baseclass to refactor
-	// the string payload to.
-	public class LogV3StreamRecord : LogV3Record<StringPayloadRecord<Raw.StreamHeader>>, IEquatable<LogV3StreamRecord>, IPrepareLogRecord<StreamId> {
-		public StreamId EventStreamId => LogV3SystemStreams.StreamsCreatedStreamNumber;
-		// so we can see the stream name in the webui if we want
-		public PrepareFlags Flags => PrepareFlags.SingleWrite | PrepareFlags.IsCommitted | PrepareFlags.IsJson;
-		public long TransactionPosition => LogPosition;
-		public int TransactionOffset => 0;
-		public long ExpectedVersion => StreamIdConverter.ToEventNumber(Record.SubHeader.ReferenceNumber) - 1;
-		public Guid EventId => Record.Header.RecordId;
-		public Guid CorrelationId { get; } = Guid.NewGuid();
-		public uint EventType => LogV3SystemEventTypes.StreamCreatedNumber;
-		// so we can see the stream name in the webui if we want
-		public ReadOnlyMemory<byte> Data => Record.Payload;
-		public ReadOnlyMemory<byte> Metadata => ReadOnlyMemory<byte>.Empty;
-
-		public string StreamName => Record.StringPayload;
-		public StreamId StreamNumber => Record.SubHeader.ReferenceNumber;
-
-		public LogV3StreamRecord(
-			Guid streamId,
-			long logPosition,
-			DateTime timeStamp,
-			uint streamNumber,
-			string streamName,
-			Guid partitionId) : base() {
-
-			Record = RecordCreator.CreateStreamRecord(
-				streamId: streamId,
-				timeStamp: timeStamp,
-				logPosition: logPosition,
-				streamNumber: streamNumber,
-				streamName: streamName,
-				partitionId: partitionId,
-				streamTypeId: Guid.Empty);
-		}
-
-		public LogV3StreamRecord(ReadOnlyMemory<byte> bytes) : base() {
-			Record = StringPayloadRecord.Create(new RecordView<Raw.StreamHeader>(bytes));
-		}
-
-		public IPrepareLogRecord<StreamId> CopyForRetry(long logPosition, long transactionPosition) {
-			return new LogV3StreamRecord(
-				streamId: Record.Header.RecordId,
-				timeStamp: Record.Header.TimeStamp,
-				logPosition: logPosition,
-				streamNumber: Record.SubHeader.ReferenceNumber,
-				streamName: Record.StringPayload,
-				partitionId: Record.SubHeader.PartitionId);
-		}
-
-		public bool Equals(LogV3StreamRecord other) {
-			if (other is null)
-				return false;
-			if (ReferenceEquals(this, other))
-				return true;
-			return
-				other.StreamName == StreamName &&
-				other.StreamNumber == StreamNumber &&
-				other.Record.Bytes.Span.SequenceEqual(Record.Bytes.Span);
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/LogRecords/LogV3StreamWriteRecord.cs b/src/EventStore.Core/TransactionLog/LogRecords/LogV3StreamWriteRecord.cs
deleted file mode 100644
index a27cfe58245..00000000000
--- a/src/EventStore.Core/TransactionLog/LogRecords/LogV3StreamWriteRecord.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.LogV3;
-using EventStore.LogCommon;
-using EventStore.LogV3;
-using StreamId = System.UInt32;
-
-namespace EventStore.Core.TransactionLog.LogRecords {
-	// implements iprepare because currently the strem write contains exactly one event
-	// but when we generalise it to contain muliple events i exect we will be able to remove
-	// implementing iprepare here.
-	public class LogV3StreamWriteRecord : LogV3Record<StreamWriteRecord>, IEquatable<LogV3StreamWriteRecord>, IPrepareLogRecord<StreamId> {
-		public LogV3StreamWriteRecord(ReadOnlyMemory<byte> bytes) : base() {
-			Record = new StreamWriteRecord(new RecordView<Raw.StreamWriteHeader>(bytes));
-		}
-
-		public LogV3StreamWriteRecord(
-			long logPosition,
-			long transactionPosition,
-			int transactionOffset,
-			Guid correlationId,
-			Guid eventId,
-			StreamId eventStreamId,
-			long expectedVersion,
-			DateTime timeStamp,
-			PrepareFlags flags,
-			uint eventType,
-			ReadOnlySpan<byte> data,
-			ReadOnlySpan<byte> metadata) {
-
-			Ensure.Nonnegative(logPosition, "logPosition");
-			Ensure.NotEmptyGuid(correlationId, "correlationId");
-			Ensure.NotEmptyGuid(eventId, "eventId");
-			Ensure.Nonnegative(transactionPosition, "transactionPosition");
-			if (transactionOffset < -1)
-				throw new ArgumentOutOfRangeException("transactionOffset");
-			if (eventStreamId < LogV3SystemStreams.FirstVirtualStream)
-				throw new ArgumentOutOfRangeException("eventStreamId", eventStreamId, null);
-			if (expectedVersion < Core.Data.ExpectedVersion.Any)
-				throw new ArgumentOutOfRangeException("expectedVersion");
-
-			Record = RecordCreator.CreateStreamWriteRecordForSingleEvent(
-				timeStamp: timeStamp,
-				correlationId: correlationId,
-				logPosition: logPosition,
-				transactionPosition: transactionPosition,
-				transactionOffset: transactionOffset,
-				streamNumber: eventStreamId,
-				startingEventNumber: expectedVersion + 1,
-				eventId: eventId,
-				eventTypeNumber: eventType,
-				eventData: data,
-				eventMetadata: metadata,
-				// todo: translate
-				eventFlags: (Raw.EventFlags)flags);
-		}
-
-		public override LogRecordType RecordType => LogRecordType.Prepare;
-
-		// todo: translate
-		public PrepareFlags Flags => (PrepareFlags)Record.Event.Header.Flags;
-		public long TransactionPosition => Record.SystemMetadata.TransactionPosition;
-		public int TransactionOffset => Record.SystemMetadata.TransactionOffset;
-		public long ExpectedVersion => Record.WriteId.StartingEventNumber - 1;
-		public StreamId EventStreamId => Record.WriteId.StreamNumber;
-		public Guid EventId => Record.Event.SystemMetadata.EventId;
-		public Guid CorrelationId => Record.SystemMetadata.CorrelationId;
-		public uint EventType => Record.Event.Header.EventTypeNumber;
-		public ReadOnlyMemory<byte> Data => Record.Event.Data;
-		public ReadOnlyMemory<byte> Metadata => Record.Event.Metadata;
-
-		public IPrepareLogRecord<StreamId> CopyForRetry(long logPosition, long transactionPosition) {
-			return new LogV3StreamWriteRecord(
-				logPosition: logPosition,
-				transactionPosition: transactionPosition,
-				transactionOffset: TransactionOffset,
-				correlationId: CorrelationId,
-				eventId: EventId,
-				eventStreamId: EventStreamId,
-				expectedVersion: ExpectedVersion,
-				timeStamp: TimeStamp,
-				flags: Flags,
-				eventType: EventType,
-				data: Data.Span,
-				metadata: Metadata.Span);
-		}
-
-		public bool Equals(LogV3StreamWriteRecord other) {
-			if (ReferenceEquals(null, other)) return false;
-			if (ReferenceEquals(this, other)) return true;
-			return 	other.Version == Version
-			        && other.LogPosition == LogPosition
-			        && other.TimeStamp.Equals(TimeStamp)
-			        && other.RecordType == RecordType
-			        && other.Flags == Flags
-			        && other.TransactionPosition == TransactionPosition
-			        && other.TransactionOffset == TransactionOffset
-			        && other.ExpectedVersion == ExpectedVersion
-			        && other.EventStreamId.Equals(EventStreamId)
-			        && other.EventId == EventId
-			        && other.CorrelationId == CorrelationId
-			        && other.EventType.Equals(EventType)
-			        && other.Data.Span.SequenceEqual(Data.Span)
-			        && other.Metadata.Span.SequenceEqual(Metadata.Span);
-		}
-
-		public override bool Equals(object obj) {
-			if (ReferenceEquals(null, obj)) return false;
-			if (ReferenceEquals(this, obj)) return true;
-			if (obj.GetType() != this.GetType()) return false;
-			return Equals((LogV3StreamWriteRecord) obj);
-		}
-
-		public override int GetHashCode() {
-			unchecked {
-				var result = Version.GetHashCode();
-				result = (result * 397) ^ LogPosition.GetHashCode();
-				result = (result * 397) ^ TimeStamp.GetHashCode();
-				result = (result * 397) ^ RecordType.GetHashCode();
-				result = (result * 397) ^ Flags.GetHashCode();
-				result = (result * 397) ^ TransactionPosition.GetHashCode();
-				result = (result * 397) ^ TransactionOffset;
-				result = (result * 397) ^ ExpectedVersion.GetHashCode();
-				result = (result * 397) ^ EventStreamId.GetHashCode();
-				result = (result * 397) ^ EventId.GetHashCode();
-				result = (result * 397) ^ CorrelationId.GetHashCode();
-				result = (result * 397) ^ EventType.GetHashCode();
-				result = (result * 397) ^ Data.GetHashCode();
-				result = (result * 397) ^ Metadata.GetHashCode();
-				return result;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/LogRecords/PartitionLogRecord.cs b/src/EventStore.Core/TransactionLog/LogRecords/PartitionLogRecord.cs
deleted file mode 100644
index b073e3665b3..00000000000
--- a/src/EventStore.Core/TransactionLog/LogRecords/PartitionLogRecord.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using EventStore.LogV3;
-
-namespace EventStore.Core.TransactionLog.LogRecords {
-	public class PartitionLogRecord : LogV3Record<StringPayloadRecord<Raw.PartitionHeader>> {
-		public PartitionLogRecord(DateTime timeStamp, long logPosition, Guid partitionId, Guid partitionTypeId,
-			Guid parentPartitionId, Raw.PartitionFlags flags, ushort referenceNumber, string name) {
-			
-			Record = RecordCreator.CreatePartitionRecord(
-				timeStamp,
-				logPosition,
-				partitionId,
-				partitionTypeId,
-				parentPartitionId,
-				flags,
-				referenceNumber, 
-				name);
-		}
-		
-		public PartitionLogRecord(ReadOnlyMemory<byte> bytes) : base() {
-			Record = StringPayloadRecord.Create(new RecordView<Raw.PartitionHeader>(bytes));
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/LogRecords/PartitionTypeLogRecord.cs b/src/EventStore.Core/TransactionLog/LogRecords/PartitionTypeLogRecord.cs
deleted file mode 100644
index b9bf7c00c36..00000000000
--- a/src/EventStore.Core/TransactionLog/LogRecords/PartitionTypeLogRecord.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using EventStore.LogV3;
-
-namespace EventStore.Core.TransactionLog.LogRecords {
-	public class PartitionTypeLogRecord : LogV3Record<StringPayloadRecord<Raw.PartitionTypeHeader>> {
-		public PartitionTypeLogRecord(DateTime timeStamp, long logPosition, Guid partitionTypeId, Guid partitionId,
-			string name) {
-			
-			Record = RecordCreator.CreatePartitionTypeRecord(
-				timeStamp,
-				logPosition,
-				partitionTypeId,
-				partitionId,
-				name);
-		}
-		
-		public PartitionTypeLogRecord(ReadOnlyMemory<byte> bytes) : base() {
-			Record = StringPayloadRecord.Create(new RecordView<Raw.PartitionTypeHeader>(bytes));
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/LogRecords/PrepareLogRecord.cs b/src/EventStore.Core/TransactionLog/LogRecords/PrepareLogRecord.cs
deleted file mode 100644
index 4a0396878a0..00000000000
--- a/src/EventStore.Core/TransactionLog/LogRecords/PrepareLogRecord.cs
+++ /dev/null
@@ -1,318 +0,0 @@
-using System;
-using System.IO;
-using System.Numerics;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.LogCommon;
-
-namespace EventStore.Core.TransactionLog.LogRecords {
-	[Flags]
-	public enum PrepareFlags : ushort {
-		None = 0x00,
-		Data = 0x01, // prepare contains data
-		TransactionBegin = 0x02, // prepare starts transaction
-		TransactionEnd = 0x04, // prepare ends transaction
-		StreamDelete = 0x08, // prepare deletes stream
-
-		IsCommitted = 0x20, // prepare should be considered committed immediately, no commit will follow in TF
-		//Update = 0x30,                  // prepare updates previous instance of the same event, DANGEROUS!
-
-		IsJson = 0x100, // indicates data & metadata are valid json
-		IsRedacted = 0x200,
-
-		// aggregate flag set
-		// unused and easily confused with StreamDelete:  DeleteTombstone = TransactionBegin | TransactionEnd | StreamDelete,
-		SingleWrite = Data | TransactionBegin | TransactionEnd
-	}
-
-	public static class PrepareFlagsExtensions {
-		public static bool HasAllOf(this PrepareFlags flags, PrepareFlags flagSet) {
-			return (flags & flagSet) == flagSet;
-		}
-
-		public static bool HasAnyOf(this PrepareFlags flags, PrepareFlags flagSet) {
-			return (flags & flagSet) != 0;
-		}
-
-		public static bool HasNoneOf(this PrepareFlags flags, PrepareFlags flagSet) {
-			return (flags & flagSet) == 0;
-		}
-	}
-
-	public class PrepareLogRecord : LogRecord, IEquatable<PrepareLogRecord>, IPrepareLogRecord<string> {
-		public const byte PrepareRecordVersion = 1;
-
-		public PrepareFlags Flags { get; }
-		public long TransactionPosition { get; }
-		public int TransactionOffset { get; }
-		public long ExpectedVersion { get; } // if IsCommitted is set, this is final EventNumber
-		public string EventStreamId { get; }
-		private int? _eventStreamIdSize;
-		public Guid EventId { get; }
-		public Guid CorrelationId { get; }
-		public DateTime TimeStamp { get; }
-		public string EventType { get; }
-		private int? _eventTypeSize;
-		public ReadOnlyMemory<byte> Data { get; }
-		private readonly ReadOnlyMemory<byte> _dataOnDisk;
-		public ReadOnlyMemory<byte> Metadata { get; }
-
-		private int? _sizeOnDisk;
-
-		public long InMemorySize {
-			get {
-				return sizeof(LogRecordType)
-				       + 1
-				       + 8
-				       + sizeof(PrepareFlags)
-				       + 8
-				       + 4
-				       + 4
-				       + IntPtr.Size + EventStreamId.Length * 2
-				       + 16
-				       + 16
-				       + 8
-				       + IntPtr.Size + EventType.Length * 2
-				       + IntPtr.Size + _dataOnDisk.Length
-				       + IntPtr.Size + Metadata.Length;
-			}
-		}
-
-		// including length and suffix
-		public int SizeOnDisk {
-			get {
-				if (_sizeOnDisk.HasValue)
-					return _sizeOnDisk.Value;
-
-				_eventStreamIdSize ??= Encoding.UTF8.GetByteCount(EventStreamId);
-				_eventTypeSize ??= Encoding.UTF8.GetByteCount(EventType);
-
-				_sizeOnDisk =
-					2 * sizeof(int) /* Length prefix & suffix */
-					+ sizeof(byte) /* Record Type */
-					+ sizeof(byte) /* Version */
-					+ sizeof(long) /* Log Position */
-					+ sizeof(ushort) /* Flags */
-					+ sizeof(long) /* TransactionPosition */
-					+ sizeof(int) /* TransactionOffset */
-					+ (Version == LogRecordVersion.LogRecordV0 ? sizeof(int) : sizeof(long)) /* ExpectedVersion */
-					+ StringSizeWithLengthPrefix(_eventStreamIdSize.Value) /* EventStreamId */
-					+ 16 /* EventId */
-					+ 16 /* CorrelationId */
-					+ sizeof(long) /* TimeStamp */
-					+ StringSizeWithLengthPrefix(_eventTypeSize.Value) /* EventType */
-					+ sizeof(int) /* Data length */
-					+ _dataOnDisk.Length /* Data */
-					+ sizeof(int) /* Metadata length */
-					+ Metadata.Length; /* Metadata */
-
-				return _sizeOnDisk.Value;
-			}
-		}
-
-		private static int StringSizeWithLengthPrefix(int stringSize) {
-			// when written to disk by the BinaryWriter, a string is prefixed with its length which is written as a 7-bit encoded integer
-			Ensure.Nonnegative(stringSize, nameof(stringSize));
-
-			if (stringSize == 0)
-				return 1;
-
-			var msb = 31 - BitOperations.LeadingZeroCount((uint)stringSize);
-			return stringSize + msb / 7 + 1;
-		}
-
-		public PrepareLogRecord(long logPosition,
-			Guid correlationId,
-			Guid eventId,
-			long transactionPosition,
-			int transactionOffset,
-			string eventStreamId,
-			int? eventStreamIdSize,
-			long expectedVersion,
-			DateTime timeStamp,
-			PrepareFlags flags,
-			string eventType,
-			int? eventTypeSize,
-			ReadOnlyMemory<byte> data,
-			ReadOnlyMemory<byte> metadata,
-			byte prepareRecordVersion = PrepareRecordVersion)
-			: base(LogRecordType.Prepare, prepareRecordVersion, logPosition) {
-			Ensure.NotEmptyGuid(correlationId, "correlationId");
-			Ensure.NotEmptyGuid(eventId, "eventId");
-			Ensure.Nonnegative(transactionPosition, "transactionPosition");
-			if (transactionOffset < -1)
-				throw new ArgumentOutOfRangeException("transactionOffset");
-			Ensure.NotNullOrEmpty(eventStreamId, "eventStreamId");
-			if (expectedVersion < Core.Data.ExpectedVersion.Any)
-				throw new ArgumentOutOfRangeException("expectedVersion");
-
-			Flags = flags;
-			TransactionPosition = transactionPosition;
-			TransactionOffset = transactionOffset;
-			ExpectedVersion = expectedVersion;
-			EventStreamId = eventStreamId;
-			_eventStreamIdSize = eventStreamIdSize;
-
-			EventId = eventId;
-			CorrelationId = correlationId;
-			TimeStamp = timeStamp;
-			EventType = eventType ?? string.Empty;
-			_eventTypeSize = eventTypeSize;
-			_dataOnDisk = data;
-			Data = Flags.HasFlag(PrepareFlags.IsRedacted) ? NoData : _dataOnDisk;
-			Metadata = metadata;
-			if (InMemorySize > TFConsts.MaxLogRecordSize) throw new Exception("Record too large.");
-		}
-
-		internal PrepareLogRecord(BinaryReader reader, byte version, long logPosition) : base(LogRecordType.Prepare,
-			version, logPosition) {
-			if (version != LogRecordVersion.LogRecordV0 && version != LogRecordVersion.LogRecordV1)
-				throw new ArgumentException(string.Format(
-					"PrepareRecord version {0} is incorrect. Supported version: {1}.", version, PrepareRecordVersion));
-
-			Flags = (PrepareFlags)reader.ReadUInt16();
-			TransactionPosition = reader.ReadInt64();
-			TransactionOffset = reader.ReadInt32();
-			ExpectedVersion = version == LogRecordVersion.LogRecordV0 ? reader.ReadInt32() : reader.ReadInt64();
-
-			if (version == LogRecordVersion.LogRecordV0) {
-				ExpectedVersion = ExpectedVersion == int.MaxValue - 1 ? long.MaxValue - 1 : ExpectedVersion;
-			}
-
-			EventStreamId = reader.ReadString();
-			EventId = new Guid(reader.ReadBytes(16));
-			CorrelationId = new Guid(reader.ReadBytes(16));
-			TimeStamp = new DateTime(reader.ReadInt64());
-			EventType = reader.ReadString();
-
-			var dataCount = reader.ReadInt32();
-			_dataOnDisk = dataCount == 0 ? NoData : reader.ReadBytes(dataCount);
-			Data = Flags.HasFlag(PrepareFlags.IsRedacted) ? NoData : _dataOnDisk;
-
-			var metadataCount = reader.ReadInt32();
-			Metadata = metadataCount == 0 ? NoData : reader.ReadBytes(metadataCount);
-			if (InMemorySize > TFConsts.MaxLogRecordSize) throw new Exception("Record too large.");
-		}
-
-		public IPrepareLogRecord<string> CopyForRetry(long logPosition, long transactionPosition) {
-			return new PrepareLogRecord(
-				logPosition: logPosition,
-				correlationId: CorrelationId,
-				eventId: EventId,
-				transactionPosition: transactionPosition,
-				transactionOffset: TransactionOffset,
-				eventStreamId: EventStreamId,
-				eventStreamIdSize: _eventStreamIdSize,
-				expectedVersion: ExpectedVersion,
-				timeStamp: TimeStamp,
-				flags: Flags,
-				eventType: EventType,
-				eventTypeSize: _eventTypeSize,
-				data: _dataOnDisk,
-				metadata: Metadata);
-		}
-
-		public override void WriteTo(BinaryWriter writer) {
-			base.WriteTo(writer);
-
-			writer.Write((ushort)Flags);
-			writer.Write(TransactionPosition);
-			writer.Write(TransactionOffset);
-			if (Version == LogRecordVersion.LogRecordV0) {
-				int expectedVersion = ExpectedVersion == long.MaxValue - 1 ? int.MaxValue - 1 : (int)ExpectedVersion;
-				writer.Write(expectedVersion);
-			} else {
-				writer.Write(ExpectedVersion);
-			}
-
-			writer.Write(EventStreamId);
-
-			writer.Write(EventId.ToByteArray());
-			writer.Write(CorrelationId.ToByteArray());
-			writer.Write(TimeStamp.Ticks);
-			writer.Write(EventType);
-			writer.Write(_dataOnDisk.Length);
-			writer.Write(_dataOnDisk.Span);
-			writer.Write(Metadata.Length);
-			writer.Write(Metadata.Span);
-		}
-
-		public bool Equals(PrepareLogRecord other) {
-			if (ReferenceEquals(null, other)) return false;
-			if (ReferenceEquals(this, other)) return true;
-			return other.LogPosition == LogPosition
-			       && other.Flags == Flags
-			       && other.TransactionPosition == TransactionPosition
-			       && other.TransactionOffset == TransactionOffset
-			       && other.ExpectedVersion == ExpectedVersion
-			       && other.EventStreamId.Equals(EventStreamId)
-			       && other.EventId == EventId
-			       && other.CorrelationId == CorrelationId
-			       && other.TimeStamp.Equals(TimeStamp)
-			       && other.EventType.Equals(EventType)
-			       && other.Data.Span.SequenceEqual(Data.Span)
-			       && other._dataOnDisk.Span.SequenceEqual(_dataOnDisk.Span)
-			       && other.Metadata.Span.SequenceEqual(Metadata.Span);
-		}
-
-		public override bool Equals(object obj) {
-			if (ReferenceEquals(null, obj)) return false;
-			if (ReferenceEquals(this, obj)) return true;
-			if (obj.GetType() != typeof(PrepareLogRecord)) return false;
-			return Equals((PrepareLogRecord)obj);
-		}
-
-		public override int GetHashCode() {
-			unchecked {
-				int result = LogPosition.GetHashCode();
-				result = (result * 397) ^ Flags.GetHashCode();
-				result = (result * 397) ^ TransactionPosition.GetHashCode();
-				result = (result * 397) ^ TransactionOffset;
-				result = (result * 397) ^ ExpectedVersion.GetHashCode();
-				result = (result * 397) ^ EventStreamId.GetHashCode();
-
-				result = (result * 397) ^ EventId.GetHashCode();
-				result = (result * 397) ^ CorrelationId.GetHashCode();
-				result = (result * 397) ^ TimeStamp.GetHashCode();
-				result = (result * 397) ^ EventType.GetHashCode();
-				result = (result * 397) ^ _dataOnDisk.GetHashCode();
-				result = (result * 397) ^ Metadata.GetHashCode();
-				return result;
-			}
-		}
-
-		public static bool operator ==(PrepareLogRecord left, PrepareLogRecord right) {
-			return Equals(left, right);
-		}
-
-		public static bool operator !=(PrepareLogRecord left, PrepareLogRecord right) {
-			return !Equals(left, right);
-		}
-
-		public override string ToString() {
-			return string.Format("LogPosition: {0}, "
-			                     + "Flags: {1}, "
-			                     + "TransactionPosition: {2}, "
-			                     + "TransactionOffset: {3}, "
-			                     + "ExpectedVersion: {4}, "
-			                     + "EventStreamId: {5}, "
-			                     + "EventId: {6}, "
-			                     + "CorrelationId: {7}, "
-			                     + "TimeStamp: {8}, "
-			                     + "EventType: {9}, "
-			                     + "InMemorySize: {10}",
-				LogPosition,
-				Flags,
-				TransactionPosition,
-				TransactionOffset,
-				ExpectedVersion,
-				EventStreamId,
-				EventId,
-				CorrelationId,
-				TimeStamp,
-				EventType,
-				InMemorySize);
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/LogRecords/PrepareLogRecordView.cs b/src/EventStore.Core/TransactionLog/LogRecords/PrepareLogRecordView.cs
deleted file mode 100644
index 640ced1589e..00000000000
--- a/src/EventStore.Core/TransactionLog/LogRecords/PrepareLogRecordView.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using System;
-using System.Text;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.LogCommon;
-
-namespace EventStore.Core.TransactionLog.LogRecords {
-	// Use when parsing of a full prepare log record isn't required and only some bits need to be inspected.
-	// Note that the data structure is not aligned, so performance may degrade if heavily accessing properties.
-	// Designed to be reusable to avoid GC pressure when making a pass through the database.
-	public struct PrepareLogRecordView {
-		public byte Version { get; }
-		public long LogPosition => BitConverter.ToInt64(_record, 2);
-		public PrepareFlags Flags => (PrepareFlags)BitConverter.ToUInt16(_record, 10);
-		public long TransactionPosition => BitConverter.ToInt64(_record, 12);
-		public int TransactionOffset => BitConverter.ToInt32(_record, 20);
-		public long ExpectedVersion => _expectedVersion;
-		public ReadOnlySpan<byte> EventStreamId => _record.AsSpan(_streamIdOffset, _streamIdSize);
-		public Guid EventId => new Guid(_record.AsSpan(_eventIdOffset, 16).ToArray()); // allocates
-		public Guid CorrelationId => new Guid(_record.AsSpan(_correlationIdOffset, 16).ToArray()); // allocates
-		public DateTime TimeStamp => new DateTime(BitConverter.ToInt64(_record, _timestampOffset));
-		public ReadOnlySpan<byte> EventType => _record.AsSpan(_eventTypeOffset, _eventTypeSize);
-		public ReadOnlySpan<byte> Data => _record.AsSpan(_dataOffset, _dataSize);
-		public ReadOnlySpan<byte> Metadata => _record.AsSpan(_metadataOffset, _metadataSize);
-
-		private readonly byte[] _record;
-		private readonly int _length;
-		private readonly long _expectedVersion;
-		private readonly int _streamIdSize;
-		private readonly int _streamIdOffset;
-		private readonly int _eventIdOffset;
-		private readonly int _correlationIdOffset;
-		private readonly int _timestampOffset;
-		private readonly int _eventTypeSize;
-		private readonly int _eventTypeOffset;
-		private readonly int _dataSize;
-		private readonly int _dataOffset;
-		private readonly int _metadataSize;
-		private readonly int _metadataOffset;
-
-		public PrepareLogRecordView(byte[] record, int length) {
-			if (!BitConverter.IsLittleEndian)
-				throw new NotSupportedException();
-
-			_record = record;
-			_length = length;
-
-			Version = _record[1];
-			if (Version != LogRecordVersion.LogRecordV0 && Version != LogRecordVersion.LogRecordV1)
-				throw new ArgumentException(
-					$"PrepareRecord version {Version} is incorrect. Supported version: {PrepareLogRecord.PrepareRecordVersion}.");
-
-			var currentOffset = 24;
-
-			if (Version == LogRecordVersion.LogRecordV0) {
-				int expectedVersion = BitConverter.ToInt32(_record, currentOffset);
-				_expectedVersion = expectedVersion == int.MaxValue - 1 ? long.MaxValue - 1 : expectedVersion;
-				currentOffset += 4;
-			} else {
-				_expectedVersion = BitConverter.ToInt64(_record, 24);
-				currentOffset += 8;
-			}
-
-			_streamIdSize = Read7BitEncodedInt(_record.AsSpan(0, _length), ref currentOffset);
-			_streamIdOffset = currentOffset;
-			currentOffset += _streamIdSize;
-
-			_eventIdOffset = currentOffset;
-			currentOffset += 16;
-
-			_correlationIdOffset = currentOffset;
-			currentOffset += 16;
-
-			_timestampOffset = currentOffset;
-			currentOffset += 8;
-
-			_eventTypeSize = Read7BitEncodedInt(_record.AsSpan(0, _length), ref currentOffset);
-			_eventTypeOffset = currentOffset;
-			currentOffset += _eventTypeSize;
-
-			_dataSize = BitConverter.ToInt32(_record, currentOffset);
-			currentOffset += 4;
-			_dataOffset = currentOffset;
-			currentOffset += _dataSize;
-
-			_metadataSize = BitConverter.ToInt32(_record, currentOffset);
-			currentOffset += 4;
-			_metadataOffset = currentOffset;
-			currentOffset += _metadataSize;
-
-			if (currentOffset != _length) {
-				throw new ArgumentException($"Unexpected record length: {currentOffset}, expected: {_length}");
-			}
-
-			// this is smaller than the actual record size but should be good enough to detect potential corruption
-			// or reading at a wrong position
-			if (_streamIdSize + _dataSize + _metadataSize > TFConsts.MaxLogRecordSize)
-				throw new Exception("Record too large.");
-		}
-
-		public override string ToString() {
-			return $"Version: {Version}, " +
-			       $"LogPosition: {LogPosition}, " +
-			       $"Flags: {Flags}, " +
-			       $"TransactionPosition: {TransactionPosition}, " +
-			       $"TransactionOffset: {TransactionOffset}, " +
-			       $"ExpectedVersion: {ExpectedVersion}, " +
-			       $"EventStreamId: {Encoding.UTF8.GetString(EventStreamId.ToArray())}, " +
-			       $"EventId: {EventId}, " +
-			       $"CorrelationId: {CorrelationId}, " +
-			       $"TimeStamp: {TimeStamp}, " +
-			       $"EventType: {Encoding.UTF8.GetString(EventType.ToArray())}, " +
-			       $"Data size: {Data.Length}, " +
-			       $"Metadata size: {Metadata.Length}";
-		}
-
-		// copied and adapted from https://github.com/microsoft/referencesource/blob/master/mscorlib/system/io/binaryreader.cs
-		private static int Read7BitEncodedInt(ReadOnlySpan<byte> bytes, ref int offset) {
-			// Read out an Int32 7 bits at a time.  The high bit
-			// of the byte when on means to continue reading more bytes.
-			int count = 0;
-			int shift = 0;
-			byte b;
-			do {
-				// Check for a corrupted stream.  Read a max of 5 bytes.
-				// In a future version, add a DataFormatException.
-				if (shift == 5 * 7)  // 5 bytes max per Int32, shift += 7
-					throw new FormatException();
-
-				b = bytes[offset++];
-				count |= (b & 0x7F) << shift;
-				shift += 7;
-			} while ((b & 0x80) != 0);
-			return count;
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/LogRecords/SystemLogRecord.cs b/src/EventStore.Core/TransactionLog/LogRecords/SystemLogRecord.cs
deleted file mode 100644
index c7b6b10c779..00000000000
--- a/src/EventStore.Core/TransactionLog/LogRecords/SystemLogRecord.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Common.Utils;
-using EventStore.LogCommon;
-
-namespace EventStore.Core.TransactionLog.LogRecords {
-	public enum SystemRecordType : byte {
-		Invalid = 0,
-		Epoch = 1
-	}
-
-	public enum SystemRecordSerialization : byte {
-		Invalid = 0,
-		Binary = 1,
-		Json = 2,
-		Bson = 3
-	}
-
-	public class SystemLogRecord : LogRecord, IEquatable<SystemLogRecord>, ISystemLogRecord {
-		public const byte SystemRecordVersion = 0;
-
-		public readonly DateTime TimeStamp;
-		public SystemRecordType SystemRecordType { get; }
-		public readonly SystemRecordSerialization SystemRecordSerialization;
-		public readonly long Reserved;
-		public readonly ReadOnlyMemory<byte> Data;
-
-		public SystemLogRecord(long logPosition,
-			DateTime timeStamp,
-			SystemRecordType systemRecordType,
-			SystemRecordSerialization systemRecordSerialization,
-			byte[] data)
-			: base(LogRecordType.System, SystemRecordVersion, logPosition) {
-			TimeStamp = timeStamp;
-			SystemRecordType = systemRecordType;
-			SystemRecordSerialization = systemRecordSerialization;
-			Reserved = 0;
-			Data = data ?? NoData;
-		}
-
-		internal SystemLogRecord(BinaryReader reader, byte version, long logPosition) : base(LogRecordType.System,
-			version, logPosition) {
-			if (version != SystemRecordVersion)
-				throw new ArgumentException(string.Format(
-					"SystemRecord version {0} is incorrect. Supported version: {1}.", version, SystemRecordVersion));
-
-			TimeStamp = new DateTime(reader.ReadInt64());
-			SystemRecordType = (SystemRecordType)reader.ReadByte();
-			if (SystemRecordType == SystemRecordType.Invalid)
-				throw new ArgumentException(string.Format("Invalid SystemRecordType {0} at LogPosition {1}.",
-					SystemRecordType, LogPosition));
-			SystemRecordSerialization = (SystemRecordSerialization)reader.ReadByte();
-			if (SystemRecordSerialization == SystemRecordSerialization.Invalid)
-				throw new ArgumentException(string.Format("Invalid SystemRecordSerialization {0} at LogPosition {1}.",
-					SystemRecordSerialization, LogPosition));
-			Reserved = reader.ReadInt64();
-
-			var dataCount = reader.ReadInt32();
-			Data = dataCount == 0 ? NoData : reader.ReadBytes(dataCount);
-		}
-
-		public EpochRecord GetEpochRecord() {
-			if (SystemRecordType != SystemRecordType.Epoch)
-				throw new ArgumentException(
-					string.Format("Unexpected type of system record. Requested: {0}, actual: {1}.",
-						SystemRecordType.Epoch, SystemRecordType));
-
-			switch (SystemRecordSerialization) {
-				case SystemRecordSerialization.Json: {
-					var dto = Data.ParseJson<EpochRecord.EpochRecordDto>();
-					return new EpochRecord(dto);
-				}
-				default:
-					throw new ArgumentOutOfRangeException(
-						string.Format("Unexpected SystemRecordSerialization type: {0}", SystemRecordSerialization),
-						"SystemRecordSerialization");
-			}
-		}
-
-		public override void WriteTo(BinaryWriter writer) {
-			base.WriteTo(writer);
-
-			writer.Write(TimeStamp.Ticks);
-			writer.Write((byte)SystemRecordType);
-			writer.Write((byte)SystemRecordSerialization);
-			writer.Write(Reserved);
-			writer.Write(Data.Length);
-			writer.Write(Data.Span);
-		}
-
-		public bool Equals(SystemLogRecord other) {
-			if (ReferenceEquals(null, other)) return false;
-			if (ReferenceEquals(this, other)) return true;
-			return other.LogPosition == LogPosition
-			       && other.TimeStamp.Equals(TimeStamp)
-			       && other.SystemRecordType == SystemRecordType
-			       && other.SystemRecordSerialization == SystemRecordSerialization
-			       && other.Reserved == Reserved;
-		}
-
-		public override bool Equals(object obj) {
-			if (ReferenceEquals(null, obj)) return false;
-			if (ReferenceEquals(this, obj)) return true;
-			if (obj.GetType() != typeof(SystemRecordType)) return false;
-			return Equals((SystemLogRecord)obj);
-		}
-
-		public override int GetHashCode() {
-			unchecked {
-				int result = LogPosition.GetHashCode();
-				result = (result * 397) ^ TimeStamp.GetHashCode();
-				result = (result * 397) ^ SystemRecordType.GetHashCode();
-				result = (result * 397) ^ SystemRecordSerialization.GetHashCode();
-				result = (result * 397) ^ Reserved.GetHashCode();
-				return result;
-			}
-		}
-
-		public static bool operator ==(SystemLogRecord left, SystemLogRecord right) {
-			return Equals(left, right);
-		}
-
-		public static bool operator !=(SystemLogRecord left, SystemLogRecord right) {
-			return !Equals(left, right);
-		}
-
-		public override string ToString() {
-			return string.Format("LogPosition: {0}, "
-			                     + "TimeStamp: {1}, "
-			                     + "SystemRecordType: {2}, "
-			                     + "SystemRecordSerialization: {3}, "
-			                     + "Reserved: {4}",
-				LogPosition,
-				TimeStamp,
-				SystemRecordType,
-				SystemRecordSerialization,
-				Reserved);
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/ReadResults.cs b/src/EventStore.Core/TransactionLog/ReadResults.cs
deleted file mode 100644
index 5f2e7272786..00000000000
--- a/src/EventStore.Core/TransactionLog/ReadResults.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-
-namespace EventStore.Core.TransactionLog {
-	public struct RecordReadResult {
-		public static readonly RecordReadResult Failure = new RecordReadResult(false, -1, null, 0);
-
-		public readonly bool Success;
-		public readonly long NextPosition;
-		public readonly ILogRecord LogRecord;
-		public readonly int RecordLength;
-
-		public RecordReadResult(bool success, long nextPosition, ILogRecord logRecord, int recordLength) {
-			Success = success;
-			LogRecord = logRecord;
-			NextPosition = nextPosition;
-			RecordLength = recordLength;
-		}
-
-		public override string ToString() {
-			return string.Format("Success: {0}, NextPosition: {1}, RecordLength: {2}, LogRecord: {3}",
-				Success,
-				NextPosition,
-				RecordLength,
-				LogRecord);
-		}
-	}
-
-	public struct RawReadResult {
-		public static readonly RawReadResult Failure = new RawReadResult(false, -1, null, 0);
-
-		public readonly bool Success;
-		public readonly long NextPosition;
-		public readonly byte[] RecordBuffer; // can be longer than the record
-		public readonly int RecordLength;
-
-		public LogRecordType RecordType => (LogRecordType)RecordBuffer[0];
-
-		public RawReadResult(bool success, long nextPosition, byte[] record, int recordLength) {
-			Success = success;
-			RecordBuffer = record;
-			NextPosition = nextPosition;
-			RecordLength = recordLength;
-		}
-
-		public override string ToString() {
-			return $"Success: {Success}, NextPosition: {NextPosition}, Record Length: {RecordLength}";
-		}
-	}
-
-	public struct SeqReadResult {
-		public static readonly SeqReadResult Failure = new SeqReadResult(false, true, null, 0, -1, -1);
-
-		public readonly bool Success;
-		public readonly bool Eof;
-		public readonly ILogRecord LogRecord;
-		public readonly int RecordLength;
-		public readonly long RecordPrePosition;
-		public readonly long RecordPostPosition;
-
-		public SeqReadResult(bool success,
-			bool eof,
-			ILogRecord logRecord,
-			int recordLength,
-			long recordPrePosition,
-			long recordPostPosition) {
-			Success = success;
-			Eof = eof;
-			LogRecord = logRecord;
-			RecordLength = recordLength;
-			RecordPrePosition = recordPrePosition;
-			RecordPostPosition = recordPostPosition;
-		}
-
-		public override string ToString() {
-			return string.Format(
-				"Success: {0}, RecordLength: {1}, RecordPrePosition: {2}, RecordPostPosition: {3}, LogRecord: {4}",
-				Success,
-				RecordLength,
-				RecordPrePosition,
-				RecordPostPosition,
-				LogRecord);
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/RecordWriteResult.cs b/src/EventStore.Core/TransactionLog/RecordWriteResult.cs
deleted file mode 100644
index 356665c6c8f..00000000000
--- a/src/EventStore.Core/TransactionLog/RecordWriteResult.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-
-namespace EventStore.Core.TransactionLog {
-	public struct RecordWriteResult {
-		public bool Success;
-		public readonly long OldPosition;
-		public readonly long NewPosition;
-
-		public RecordWriteResult(bool success, long oldPosition, long newPosition) {
-			if (newPosition < oldPosition)
-				throw new ArgumentException("New position is less than old position.");
-
-			Success = success;
-			OldPosition = oldPosition;
-			NewPosition = newPosition;
-		}
-
-		public static RecordWriteResult Failed(long position) {
-			return new RecordWriteResult(false, position, position);
-		}
-
-		public static RecordWriteResult Successful(long oldPosition, long newPosition) {
-			return new RecordWriteResult(true, oldPosition, newPosition);
-		}
-
-		public override string ToString() {
-			return string.Format("Success: {0}, OldPosition: {1}, NewPosition: {2}", Success, OldPosition, NewPosition);
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/CollisionManagement/CollisionDetector.cs b/src/EventStore.Core/TransactionLog/Scavenging/CollisionManagement/CollisionDetector.cs
deleted file mode 100644
index a98d4a48ca1..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/CollisionManagement/CollisionDetector.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Index.Hashes;
-using Serilog;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	// add things to the collision detector and it keeps a list of things that collided.
-	public class CollisionDetector<T> {
-		private static EqualityComparer<T> TComparer { get; } = EqualityComparer<T>.Default;
-
-		private readonly ILogger _logger;
-
-		// maps from hash to (any) user of that hash
-		private readonly IScavengeMap<ulong, T> _hashUsers;
-		private readonly ILongHasher<T> _hasher;
-
-		// store the values. could possibly store just the hashes instead but that would
-		// lose us information and it should be so rare that there are any collisions at all.
-		private readonly IScavengeMap<T, Unit> _collisions;
-
-		// the entire set of collisions, or null if invalidated
-		private Dictionary<T, Unit> _collisionsCache;
-		private Dictionary<ulong, Unit> _collisionsHashCache;
-
-		private long _newStreams;
-		private long _newCollisions;
-		private long _oldCollisions;
-
-		public CollisionDetector(
-			ILogger logger,
-			IScavengeMap<ulong, T> hashUsers,
-			IScavengeMap<T, Unit> collisionStorage,
-			ILongHasher<T> hasher) {
-			_logger = logger;
-			_hashUsers = hashUsers;
-			_collisions = collisionStorage;
-			_hasher = hasher;
-		}
-
-		public void LogStats() {
-			long hits = 0;
-			long misses = 0;
-
-			if (_hashUsers is LruCachingScavengeMap<ulong, T> lru)
-				lru.GetStats(out hits, out misses);
-
-			_logger.Debug(
-				"SCAVENGING: CollisionDetector stats: " +
-				"{newStreams:N0} new streams. {newCollisions:N0} new collisions. {oldCollisions:N0} old collisions. " +
-				"{hits:N0} hits. {misses:N0} misses.",
-				_newStreams, _newCollisions, _oldCollisions,
-				hits, misses);
-
-			_newStreams = 0;
-			_newCollisions = 0;
-			_oldCollisions = 0;
-		}
-
-		public void ClearCaches() {
-			_collisionsCache = null;
-			_collisionsHashCache = null;
-		}
-
-		public bool IsCollision(T item) {
-			EnsureCollisionsCache();
-			return _collisionsCache.TryGetValue(item, out _);
-		}
-
-		public bool IsCollisionHash(ulong hash) {
-			if (_collisionsHashCache == null) {
-				_collisionsHashCache = new Dictionary<ulong, Unit>();
-				foreach (var kvp in _collisions.AllRecords()) {
-					_collisionsHashCache[_hasher.Hash(kvp.Key)] = kvp.Value;
-				}
-			}
-			return _collisionsHashCache.TryGetValue(hash, out _);
-		}
-
-		public IEnumerable<T> AllCollisions() {
-			EnsureCollisionsCache();
-			return _collisionsCache.Keys;
-		}
-
-		private void EnsureCollisionsCache() {
-			if (_collisionsCache == null)
-				_collisionsCache = _collisions.AllRecords().ToDictionary(
-					x => x.Key,
-					x => x.Value);
-		}
-
-		// Proof by induction that DetectCollisions works
-		// either:
-		//   1. we have seen this stream before.
-		//       then either:
-		//       a. it was a collision the first time we saw it
-		//           - by induction (2a) we concluded it was a collision at that time and added it to the
-		//             collision list so we conclude it is a collision now
-		//             TICK
-		//       b. it was not a collision but has since been collided with by a newer stream.
-		//           - when it was collided (2a) with we noticed and added it to the collision list so
-		//             we conclude it is still a collision now
-		//             TICK
-		//       c. it was not a collision and still isn't
-		//           - so we look in the backing data to see if this hash is in use
-		//             it is, because we have seen this stream before, but since this is not a collision
-		//             the user of the stream turns out to be us.
-		//             conclude no collision
-		//             TICK
-		//
-		//   2. this is the first time we are seeing this stream.
-		//       then either:
-		//       a. it collides with any stream we have seen before
-		//           - so we look in the backing data to see if this hash is in use.
-		//             it is, because this is the colliding case.
-		//             we look up the record that uses this hash
-		//             the record MUST be for a different stream because this is the the first time
-		//                we are seeing this stream
-		//             collision detected.
-		//             add both streams to the collision list. we have their names and the hash.
-		//             NB it is possible that we are colliding with multiple streams,
-		//                    but they are already in the backing data
-		//                    because they are colliding with each other.
-		//             TICK
-		//       b. it does not collide with any stream we have seen before
-		//           - so we look in the backing data to see if there are any entries for this hash
-		//             there are not because this is the first time we are seeing this stream and it does
-		//                not collde.
-		//             conclude no collision, register this stream as the user.
-		//             TICK
-
-		// Adds an item and detects if it collides with other items that were already added.
-		// `collision` is only defined when returning NewCollision.
-		// in this way we can tell when anything that was not colliding becomes colliding.
-		public CollisionResult DetectCollisions(T item, out T collision) {
-			if (IsCollision(item)) {
-				collision = default;
-				_oldCollisions++;
-				return CollisionResult.OldCollision; // previously known collision. 1a or 1b.
-				// _hashes must already have this hash, otherwise it wouldn't be a collision.
-				// so no need to add it it.
-			}
-
-			// collision not previously known, but might be a new one now.
-			var itemHash = _hasher.Hash(item);
-			if (!_hashUsers.TryGetValue(itemHash, out collision)) {
-				// hash wasn't even in use. it is now.
-				_hashUsers[itemHash] = item;
-				_newStreams++;
-				return CollisionResult.NoCollision; // hash not in use, can be no collision. 2b
-			}
-
-			// hash in use, but maybe by the item itself.
-			if (TComparer.Equals(collision, item)) {
-				return CollisionResult.NoCollision; // no collision with oneself. 1c
-			}
-
-			// hash in use by a different item! found new collision. 2a
-			_collisions[item] = Unit.Instance;
-			_collisions[collision] = Unit.Instance;
-			ClearCaches();
-
-			_newCollisions++;
-			return CollisionResult.NewCollision;
-		}
-
-		public T LookupUniqueHashUser(ulong streamHash) {
-			if (!_hashUsers.TryGetValue(streamHash, out var stream))
-				throw new Exception($"Tried to get unique user for stream hash: {streamHash} but it is unused");
-
-			if (IsCollisionHash(streamHash)) {
-				var collisions = AllCollisions().Where(x => _hasher.Hash(x) == streamHash);
-				throw new Exception($"Tried to get unique user for stream hash: {streamHash} but there are multiple: {string.Join(",", collisions)}");
-			}
-
-			return stream;
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/CollisionManagement/CollisionMap.cs b/src/EventStore.Core/TransactionLog/Scavenging/CollisionManagement/CollisionMap.cs
deleted file mode 100644
index 52ab02770bf..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/CollisionManagement/CollisionMap.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using EventStore.Core.Index.Hashes;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	// this class efficiently stores/retrieves data against keys that very rarely but sometimes have a
-	// hash collision.
-	// when there is a hash collision the key is stored explicitly with the value
-	// otherwise it only stores the hashes and the values.
-	//
-	// in practice this allows us to
-	//   1. store data for lots of streams with much reduced size and complexity
-	//      because we rarely if ever need to store the stream name, and the hashes are fixed size
-	//   2. when being read, inform the caller whether the key hash collides or not
-	//
-	// for retrieval, if you have the key (and it has been checked for collision) then this
-	// will look in the right submap. if you have a handle then this will look into the submap
-	// according to the kind of handle.
-	public class CollisionMap<TKey, TValue> {
-		private readonly IScavengeMap<ulong, TValue> _nonCollisions;
-		private readonly IScavengeMap<TKey, TValue> _collisions;
-		private readonly ILongHasher<TKey> _hasher;
-		private readonly Func<TKey, bool> _isCollision;
-
-		public CollisionMap(
-			ILongHasher<TKey> hasher,
-			Func<TKey, bool> isCollision,
-			IScavengeMap<ulong, TValue> nonCollisions,
-			IScavengeMap<TKey, TValue> collisions) {
-
-			_hasher = hasher;
-			_isCollision = isCollision;
-			_nonCollisions = nonCollisions;
-			_collisions = collisions;
-		}
-
-		// the key must already be checked for collisions so that we know if it _isCollision
-		// (especially, be careful when converting a stream to its metastream or vice versa)
-		public bool TryGetValue(TKey key, out TValue value) =>
-			_isCollision(key)
-				? _collisions.TryGetValue(key, out value)
-				: _nonCollisions.TryGetValue(_hasher.Hash(key), out value);
-
-		public bool TryGetValue(StreamHandle<TKey> handle, out TValue value) {
-			switch (handle.Kind) {
-				case StreamHandle.Kind.Hash:
-					return _nonCollisions.TryGetValue(handle.StreamHash, out value);
-				case StreamHandle.Kind.Id:
-					return _collisions.TryGetValue(handle.StreamId, out value);
-				default:
-					throw new ArgumentOutOfRangeException(nameof(handle), handle, null);
-			}
-		}
-
-		public TValue this[TKey key] {
-			set {
-				if (_isCollision(key)) {
-					_collisions[key] = value;
-				} else {
-					_nonCollisions[_hasher.Hash(key)] = value;
-				}
-			}
-		}
-
-		// when a key that didn't used to be a collision, becomes a collision.
-		// the remove and the add must be performed atomically.
-		// but the overall operation is idempotent
-		public void NotifyCollision(TKey key) {
-			var hash = _hasher.Hash(key);
-			if (_nonCollisions.TryRemove(hash, out var value)) {
-				_collisions[key] = value;
-			} else {
-				// we are notified that the key is a collision, but we dont have any entry for it
-				// so nothing to do
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/CollisionManagement/MetastreamCollisionMap.cs b/src/EventStore.Core/TransactionLog/Scavenging/CollisionManagement/MetastreamCollisionMap.cs
deleted file mode 100644
index f13d564f958..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/CollisionManagement/MetastreamCollisionMap.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using EventStore.Core.Index.Hashes;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class MetastreamCollisionMap<TStreamId> : CollisionMap<TStreamId, MetastreamData> {
-
-		private readonly ILongHasher<TStreamId> _hasher;
-		private readonly Func<TStreamId, bool> _isCollision;
-		private readonly IMetastreamScavengeMap<ulong> _nonCollisions;
-		private readonly IMetastreamScavengeMap<TStreamId> _collisions;
-
-		public MetastreamCollisionMap(
-			ILongHasher<TStreamId> hasher,
-			Func<TStreamId, bool> isCollision,
-			IMetastreamScavengeMap<ulong> nonCollisions,
-			IMetastreamScavengeMap<TStreamId> collisions) :
-			base(
-				hasher, isCollision, nonCollisions, collisions) {
-
-			_hasher = hasher;
-			_isCollision = isCollision;
-			_nonCollisions = nonCollisions;
-			_collisions = collisions;
-		}
-
-		public void SetTombstone(TStreamId streamId) {
-			if (_isCollision(streamId))
-				_collisions.SetTombstone(streamId);
-			else
-				_nonCollisions.SetTombstone(_hasher.Hash(streamId));
-		}
-
-		public void SetDiscardPoint(TStreamId streamId, DiscardPoint discardPoint) {
-			if (_isCollision(streamId))
-				_collisions.SetDiscardPoint(streamId, discardPoint);
-			else
-				_nonCollisions.SetDiscardPoint(_hasher.Hash(streamId), discardPoint);
-		}
-
-		public void DeleteAll() {
-			_collisions.DeleteAll();
-			_nonCollisions.DeleteAll();
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/CollisionManagement/OriginalStreamCollisionMap.cs b/src/EventStore.Core/TransactionLog/Scavenging/CollisionManagement/OriginalStreamCollisionMap.cs
deleted file mode 100644
index 1dd938c672e..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/CollisionManagement/OriginalStreamCollisionMap.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Index.Hashes;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class OriginalStreamCollisionMap<TStreamId> :
-		CollisionMap<TStreamId, OriginalStreamData> {
-
-		private readonly ILongHasher<TStreamId> _hasher;
-		private readonly Func<TStreamId, bool> _isCollision;
-		private readonly IOriginalStreamScavengeMap<ulong> _nonCollisions;
-		private readonly IOriginalStreamScavengeMap<TStreamId> _collisions;
-
-		public OriginalStreamCollisionMap(
-			ILongHasher<TStreamId> hasher,
-			Func<TStreamId, bool> isCollision,
-			IOriginalStreamScavengeMap<ulong> nonCollisions,
-			IOriginalStreamScavengeMap<TStreamId> collisions) :
-			base(
-				hasher, isCollision, nonCollisions, collisions) {
-
-			_hasher = hasher;
-			_isCollision = isCollision;
-			_nonCollisions = nonCollisions;
-			_collisions = collisions;
-		}
-
-		public void SetTombstone(TStreamId streamId) {
-			if (_isCollision(streamId))
-				_collisions.SetTombstone(streamId);
-			else
-				_nonCollisions.SetTombstone(_hasher.Hash(streamId));
-		}
-
-		public void SetMetadata(TStreamId streamId, StreamMetadata metadata) {
-			if (_isCollision(streamId))
-				_collisions.SetMetadata(streamId, metadata);
-			else
-				_nonCollisions.SetMetadata(_hasher.Hash(streamId), metadata);
-		}
-
-		public void SetDiscardPoints(
-			StreamHandle<TStreamId> handle,
-			CalculationStatus status,
-			DiscardPoint discardPoint,
-			DiscardPoint maybeDiscardPoint) {
-
-			switch (handle.Kind) {
-				case StreamHandle.Kind.Hash:
-					_nonCollisions.SetDiscardPoints(
-						key: handle.StreamHash,
-						status: status,
-						discardPoint: discardPoint,
-						maybeDiscardPoint: maybeDiscardPoint);
-					break;
-				case StreamHandle.Kind.Id:
-					_collisions.SetDiscardPoints(
-						key: handle.StreamId,
-						status: status,
-						discardPoint: discardPoint,
-						maybeDiscardPoint: maybeDiscardPoint);
-					break;
-				default:
-					throw new ArgumentOutOfRangeException(nameof(handle), handle, null);
-			}
-		}
-
-		public bool TryGetChunkExecutionInfo(TStreamId streamId, out ChunkExecutionInfo info) =>
-			_isCollision(streamId)
-				? _collisions.TryGetChunkExecutionInfo(streamId, out info)
-				: _nonCollisions.TryGetChunkExecutionInfo(_hasher.Hash(streamId), out info);
-
-		public void DeleteMany(bool deleteArchived) {
-			_collisions.DeleteMany(deleteArchived: deleteArchived);
-			_nonCollisions.DeleteMany(deleteArchived: deleteArchived);
-		}
-
-		// overall sequence is collisions ++ noncollisions
-		public IEnumerable<(StreamHandle<TStreamId>, OriginalStreamData)> EnumerateActive(
-			StreamHandle<TStreamId> checkpoint) {
-
-			IEnumerable<KeyValuePair<TStreamId, OriginalStreamData>> collisionsEnumerable;
-			IEnumerable<KeyValuePair<ulong, OriginalStreamData>> nonCollisionsEnumerable;
-
-			switch (checkpoint.Kind) {
-				case StreamHandle.Kind.None:
-					// no checkpoint, emit everything
-					collisionsEnumerable = _collisions.ActiveRecords();
-					nonCollisionsEnumerable = _nonCollisions.ActiveRecords();
-					break;
-
-				case StreamHandle.Kind.Id:
-					// checkpointed in the collisions. emit the rest of those, then the non-collisions
-					collisionsEnumerable = _collisions.ActiveRecordsFromCheckpoint(checkpoint.StreamId);
-					nonCollisionsEnumerable = _nonCollisions.ActiveRecords();
-					break;
-
-				case StreamHandle.Kind.Hash:
-					// checkpointed in the noncollisions. emit the rest of those
-					collisionsEnumerable = Enumerable.Empty<KeyValuePair<TStreamId, OriginalStreamData>>();
-					nonCollisionsEnumerable = _nonCollisions.ActiveRecordsFromCheckpoint(checkpoint.StreamHash);
-					break;
-
-				default:
-					throw new ArgumentOutOfRangeException(nameof(checkpoint), checkpoint.Kind, null);
-			}
-
-			foreach (var kvp in collisionsEnumerable) {
-				yield return (StreamHandle.ForStreamId(kvp.Key), kvp.Value);
-			}
-
-			foreach (var kvp in nonCollisionsEnumerable) {
-				yield return (StreamHandle.ForHash<TStreamId>(kvp.Key), kvp.Value);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Data/CalculationStatus.cs b/src/EventStore.Core/TransactionLog/Scavenging/Data/CalculationStatus.cs
deleted file mode 100644
index 3b957952150..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Data/CalculationStatus.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public enum CalculationStatus {
-		// Invalid
-		None = 0,
-
-		// Needs to be processed by calculator next time
-		Active = 1,
-
-		// Can be skipped over by calculator next time
-		Archived = 2,
-
-		// Can be deleted by cleaner when there are no chunks pending execution
-		Spent = 3,
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Data/ChunkExecutionInfo.cs b/src/EventStore.Core/TransactionLog/Scavenging/Data/ChunkExecutionInfo.cs
deleted file mode 100644
index 583edceef76..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Data/ChunkExecutionInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	// For ChunkExecutor, which implements maxAge more accurately than the index executor
-	public struct ChunkExecutionInfo : IEquatable<ChunkExecutionInfo> {
-		public ChunkExecutionInfo(
-			bool isTombstoned,
-			DiscardPoint discardPoint,
-			DiscardPoint maybeDiscardPoint,
-			TimeSpan? maxAge) {
-
-			IsTombstoned = isTombstoned;
-			DiscardPoint = discardPoint;
-			MaybeDiscardPoint = maybeDiscardPoint;
-			MaxAge = maxAge;
-		}
-
-		public bool IsTombstoned { get; }
-		public DiscardPoint DiscardPoint { get; }
-		public DiscardPoint MaybeDiscardPoint { get; }
-		public TimeSpan? MaxAge { get; }
-
-		public bool Equals(ChunkExecutionInfo other) =>
-			IsTombstoned == other.IsTombstoned &&
-			DiscardPoint == other.DiscardPoint &&
-			MaybeDiscardPoint == other.MaybeDiscardPoint &&
-			MaxAge == other.MaxAge;
-
-		// avoid the default, reflection based, implementations if we ever need to call these
-		public override int GetHashCode() => throw new NotImplementedException();
-		public override bool Equals(object other) => throw new NotImplementedException();
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Data/ChunkTimeStampRange.cs b/src/EventStore.Core/TransactionLog/Scavenging/Data/ChunkTimeStampRange.cs
deleted file mode 100644
index 1e69825f9bd..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Data/ChunkTimeStampRange.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	// store a range per chunk so that the calculator can definitely get a timestamp range for each event
-	// that is guaranteed to contain the real timestamp of that event.
-	public struct ChunkTimeStampRange : IEquatable<ChunkTimeStampRange> {
-		public ChunkTimeStampRange(DateTime min, DateTime max) {
-			Min = min;
-			Max = max;
-		}
-
-		public DateTime Min { get; }
-
-		public DateTime Max { get; }
-
-		public bool Equals(ChunkTimeStampRange other) =>
-			Min == other.Min &&
-			Max == other.Max;
-
-		// avoid the default, reflection based, implementations if we ever need to call these
-		public override int GetHashCode() => throw new NotImplementedException();
-		public override bool Equals(object other) => throw new NotImplementedException();
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Data/CollisionResult.cs b/src/EventStore.Core/TransactionLog/Scavenging/Data/CollisionResult.cs
deleted file mode 100644
index 92d7648a0bc..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Data/CollisionResult.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public enum CollisionResult {
-		NoCollision,
-		NewCollision, // collided with something that was not previously in a collision
-		OldCollision, // collided with something that was already in a collision
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Data/DiscardDecision.cs b/src/EventStore.Core/TransactionLog/Scavenging/Data/DiscardDecision.cs
deleted file mode 100644
index 65fc9f5136d..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Data/DiscardDecision.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public enum DiscardDecision {
-		None,
-		Discard,
-		// calculator cannot tell conclusively, depends on record timestamp that it only has
-		// approximately. chunks can tell accurately because they have the precise timestamp.
-		// index will just keep such indexentries.
-		MaybeDiscard,
-		Keep,
-		AlreadyDiscarded,
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Data/DiscardPoint.cs b/src/EventStore.Core/TransactionLog/Scavenging/Data/DiscardPoint.cs
deleted file mode 100644
index 8580a24e080..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Data/DiscardPoint.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public readonly struct DiscardPoint : IEquatable<DiscardPoint> {
-		private DiscardPoint(long firstEventNumberToKeep) {
-			if (firstEventNumberToKeep < 0)
-				firstEventNumberToKeep = 0;
-
-			FirstEventNumberToKeep = firstEventNumberToKeep;
-		}
-
-		public static DiscardPoint DiscardBefore(long eventNumber) =>
-			new DiscardPoint(eventNumber);
-
-		public static DiscardPoint DiscardIncluding(long eventNumber) {
-			if (eventNumber == long.MaxValue)
-				throw new ArgumentOutOfRangeException(
-					nameof(eventNumber),
-					eventNumber,
-					"eventNumber must be less than long.MaxValue");
-
-			return DiscardBefore(eventNumber + 1);
-		}
-
-		public static DiscardPoint KeepAll { get; } = DiscardBefore(0);
-
-		public long FirstEventNumberToKeep { get; }
-
-		// Produces a discard point that discards when this OR that discard point would discard
-		// i.e. takes the bigger of the two.
-		public DiscardPoint Or(DiscardPoint x) =>
-			FirstEventNumberToKeep > x.FirstEventNumberToKeep ? this : x;
-
-		public static bool operator <(DiscardPoint x, DiscardPoint y) =>
-			x.FirstEventNumberToKeep < y.FirstEventNumberToKeep;
-
-		public static bool operator >(DiscardPoint x, DiscardPoint y) =>
-			x.FirstEventNumberToKeep > y.FirstEventNumberToKeep;
-
-		public static bool operator <=(DiscardPoint x, DiscardPoint y) =>
-			x.FirstEventNumberToKeep <= y.FirstEventNumberToKeep;
-
-		public static bool operator >=(DiscardPoint x, DiscardPoint y) =>
-			x.FirstEventNumberToKeep >= y.FirstEventNumberToKeep;
-
-		public static bool operator ==(DiscardPoint x, DiscardPoint y) =>
-			x.FirstEventNumberToKeep == y.FirstEventNumberToKeep;
-
-		public static bool operator !=(DiscardPoint x, DiscardPoint y) =>
-			x.FirstEventNumberToKeep != y.FirstEventNumberToKeep;
-
-		public bool Equals(DiscardPoint other) => this == other;
-
-		public override bool Equals(object obj) =>
-			obj is DiscardPoint that && this == that;
-
-		public override int GetHashCode() =>
-			FirstEventNumberToKeep.GetHashCode();
-
-		public bool ShouldDiscard(long eventNumber) {
-			Ensure.Nonnegative(eventNumber, nameof(eventNumber));
-			return eventNumber < FirstEventNumberToKeep;
-		}
-
-		public override string ToString() {
-			if (this == KeepAll)
-				return "Keep all";
-			else
-				return $"Discard before {FirstEventNumberToKeep}";
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Data/IndexExecutionInfo.cs b/src/EventStore.Core/TransactionLog/Scavenging/Data/IndexExecutionInfo.cs
deleted file mode 100644
index d7546f33f69..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Data/IndexExecutionInfo.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public struct IndexExecutionInfo : IEquatable<IndexExecutionInfo> {
-		public IndexExecutionInfo(
-			bool isMetastream,
-			bool isTombstoned,
-			DiscardPoint discardPoint) {
-
-			IsMetastream = isMetastream;
-			IsTombstoned = isTombstoned;
-			DiscardPoint = discardPoint;
-		}
-
-		public bool IsMetastream { get; }
-
-		/// <summary>
-		/// True when the corresponding original stream is tombstoned
-		/// </summary>
-		public bool IsTombstoned { get; }
-
-		public DiscardPoint DiscardPoint { get; }
-
-		// avoid the default, reflection based, implementations if we ever need to call these
-		public override int GetHashCode() => throw new NotImplementedException();
-		public override bool Equals(object other) => throw new NotImplementedException();
-		public bool Equals(IndexExecutionInfo other) => throw new NotImplementedException();
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Data/MetastreamData.cs b/src/EventStore.Core/TransactionLog/Scavenging/Data/MetastreamData.cs
deleted file mode 100644
index 7dc2a047e6f..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Data/MetastreamData.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public struct MetastreamData : IEquatable<MetastreamData> {
-		public static MetastreamData Empty { get; } = new MetastreamData(
-			isTombstoned: false,
-			discardPoint: DiscardPoint.KeepAll);
-
-		public MetastreamData(
-			bool isTombstoned,
-			DiscardPoint discardPoint) {
-
-			IsTombstoned = isTombstoned;
-			DiscardPoint = discardPoint;
-		}
-
-		/// <summary>
-		/// True when the corresponding original stream is tombstoned
-		/// </summary>
-		public bool IsTombstoned { get; }
-
-		public DiscardPoint DiscardPoint { get; }
-
-		public bool Equals(MetastreamData other) =>
-			IsTombstoned == other.IsTombstoned &&
-			DiscardPoint == other.DiscardPoint;
-
-		// avoid the default, reflection based, implementations if we ever need to call these
-		public override int GetHashCode() => throw new NotImplementedException();
-		public override bool Equals(object other) => throw new NotImplementedException();
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Data/OriginalStreamData.cs b/src/EventStore.Core/TransactionLog/Scavenging/Data/OriginalStreamData.cs
deleted file mode 100644
index 3ee8d567006..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Data/OriginalStreamData.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class OriginalStreamData {
-
-		public OriginalStreamData() {
-		}
-
-		// Populated by Accumulator and Calculator. Read by Calculator and Cleaner.
-		public CalculationStatus Status { get; set; }
-
-		// Populated by Accumulator. Read by Calculator.
-		// (MaxAge also read by ChunkExecutor)
-		public long? MaxCount { get; set; }
-		public TimeSpan? MaxAge { get; set; }
-		public long? TruncateBefore { get; set; }
-		public bool IsTombstoned { get; set; }
-
-		// Populated by Calculator. Read by Calculator and Executors.
-		public DiscardPoint DiscardPoint { get; set; }
-		public DiscardPoint MaybeDiscardPoint { get; set; }
-
-		public override string ToString() =>
-			$"Status: {Status} " +
-			$"MaxCount: {MaxCount} " +
-			$"MaxAge: {MaxAge} " +
-			$"TruncateBefore: {TruncateBefore} " +
-			$"IsTombstoned: {IsTombstoned} " +
-			$"DiscardPoint: {DiscardPoint} " +
-			$"MaybeDiscardPoint: {MaybeDiscardPoint} " +
-			"";
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Data/RecordForExecutor.cs b/src/EventStore.Core/TransactionLog/Scavenging/Data/RecordForExecutor.cs
deleted file mode 100644
index dc28c2c1e75..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Data/RecordForExecutor.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	// this abstracts the actual log records from the chunk execution logic
-	// TRecord is currently used as a LogRecord but in the future could just be bytes
-	public abstract class RecordForExecutor<TStreamId, TRecord> {
-		public int Length { get; private set; }
-		public TRecord Record { get; private set; }
-
-		public class Prepare : RecordForExecutor<TStreamId, TRecord> {
-			public void SetRecord(
-				int length,
-				long logPosition,
-				TRecord record,
-				DateTime timeStamp,
-				TStreamId streamId,
-				bool isSelfCommitted,
-				bool isTombstone,
-				bool isTransactionBegin,
-				long eventNumber) {
-
-				Length = length;
-				LogPosition = logPosition;
-				Record = record;
-				TimeStamp = timeStamp;
-				StreamId = streamId;
-				IsSelfCommitted = isSelfCommitted;
-				IsTombstone = isTombstone;
-				IsTransactionBegin = isTransactionBegin;
-				EventNumber = eventNumber;
-			}
-
-			public long LogPosition { get; private set; }
-			public DateTime TimeStamp { get; private set; }
-			public TStreamId StreamId { get; private set; }
-			public bool IsSelfCommitted { get; private set; }
-			public bool IsTombstone { get; private set; }
-			public bool IsTransactionBegin { get; private set; }
-			public long EventNumber { get; private set; }
-		}
-
-		public class NonPrepare : RecordForExecutor<TStreamId, TRecord> {
-			public void SetRecord(
-				int length,
-				TRecord record) {
-
-				Length = length;
-				Record = record;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Data/ScavengeCheckpoint.cs b/src/EventStore.Core/TransactionLog/Scavenging/Data/ScavengeCheckpoint.cs
deleted file mode 100644
index 2fe47e1bb6c..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Data/ScavengeCheckpoint.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using System;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	// The checkpoint stores which scavengepoint we are processing and where we are up to with it.
-
-	public abstract class ScavengeCheckpoint {
-		protected ScavengeCheckpoint(ScavengePoint scavengePoint) {
-			ScavengePoint = scavengePoint;
-		}
-
-		public ScavengePoint ScavengePoint { get; }
-
-		public class Accumulating : ScavengeCheckpoint {
-			// Accumulating with null doneLogicalChunkNumber means we are accumulating now but havent
-			// accumulated anything.
-			public Accumulating(ScavengePoint scavengePoint, int? doneLogicalChunkNumber)
-				: base(scavengePoint) {
-				DoneLogicalChunkNumber = doneLogicalChunkNumber;
-			}
-
-			public int? DoneLogicalChunkNumber { get; }
-
-			public override string ToString() =>
-				$"Accumulating {ScavengePoint.GetName()} done " +
-					(DoneLogicalChunkNumber.HasValue
-						? $"Chunk {DoneLogicalChunkNumber}"
-						: "None");
-		}
-
-		public class Calculating<TStreamId> : ScavengeCheckpoint {
-			public Calculating(ScavengePoint scavengePoint, StreamHandle<TStreamId> doneStreamHandle)
-				: base(scavengePoint) {
-				DoneStreamHandle = doneStreamHandle;
-			}
-
-			public StreamHandle<TStreamId> DoneStreamHandle { get; }
-
-			public override string ToString() =>
-				$"Calculating {ScavengePoint.GetName()} done {DoneStreamHandle}";
-		}
-
-		public class ExecutingChunks : ScavengeCheckpoint {
-			public int? DoneLogicalChunkNumber { get; }
-
-			public ExecutingChunks(ScavengePoint scavengePoint, int? doneLogicalChunkNumber)
-				: base(scavengePoint) {
-				DoneLogicalChunkNumber = doneLogicalChunkNumber;
-			}
-
-			public override string ToString() =>
-				$"Executing chunks for {ScavengePoint.GetName()} done " +
-					(DoneLogicalChunkNumber.HasValue
-						? $"Chunk {DoneLogicalChunkNumber}"
-						: "None");
-		}
-
-		public class ExecutingIndex : ScavengeCheckpoint {
-			public ExecutingIndex(ScavengePoint scavengePoint)
-				: base(scavengePoint) {
-			}
-
-			public override string ToString() =>
-				$"Executing index for {ScavengePoint.GetName()}";
-		}
-
-		public class MergingChunks : ScavengeCheckpoint {
-			public MergingChunks(ScavengePoint scavengePoint)
-				: base(scavengePoint) {
-			}
-
-			public override string ToString() =>
-				$"Merging chunks for {ScavengePoint.GetName()}";
-		}
-
-		public class Cleaning : ScavengeCheckpoint {
-			public Cleaning(ScavengePoint scavengePoint)
-				: base(scavengePoint) {
-			}
-
-			public override string ToString() =>
-				$"Cleaning for {ScavengePoint.GetName()}";
-		}
-
-		public class Done : ScavengeCheckpoint {
-			public Done(ScavengePoint scavengePoint)
-				: base(scavengePoint) {
-			}
-
-			public override string ToString() =>
-				$"Done {ScavengePoint.GetName()}";
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Data/ScavengePoint.cs b/src/EventStore.Core/TransactionLog/Scavenging/Data/ScavengePoint.cs
deleted file mode 100644
index 5aa58a0d97b..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Data/ScavengePoint.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class ScavengePoint {
-		public ScavengePoint(long position, long eventNumber, DateTime effectiveNow, int threshold) {
-			Position = position;
-			EventNumber = eventNumber;
-			EffectiveNow = effectiveNow;
-			Threshold = threshold;
-		}
-
-		// the position to scavenge up to (exclusive)
-		public long Position { get; }
-
-		public long EventNumber { get; }
-
-		public DateTime EffectiveNow { get; }
-
-		// The minimum a physical chunk must weigh before we will execute it.
-		// Stored in the scavenge point so that (later) we could specify the threshold when
-		// running the scavenge, and have it affect that scavenge on all of the nodes.
-		public int Threshold { get; }
-
-		public string GetName() => $"SP-{EventNumber}";
-
-		public override string ToString() =>
-			$"{GetName()}. Position: {Position:N0}, EffectiveNow: {EffectiveNow}, Threshold: {Threshold}.";
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Data/ScavengePointPayload.cs b/src/EventStore.Core/TransactionLog/Scavenging/Data/ScavengePointPayload.cs
deleted file mode 100644
index 05a9c40e9c7..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Data/ScavengePointPayload.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	// These are stored in the data of the payload record
-	public class ScavengePointPayload {
-		public int Threshold { get; set; }
-
-		public byte[] ToJsonBytes() =>
-			Json.ToJsonBytes(this);
-
-		public static ScavengePointPayload FromBytes(ReadOnlyMemory<byte> bytes) =>
-			Json.ParseJson<ScavengePointPayload>(bytes);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Data/StreamHandle.cs b/src/EventStore.Core/TransactionLog/Scavenging/Data/StreamHandle.cs
deleted file mode 100644
index 626f3e9b66b..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Data/StreamHandle.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	// Refers to a stream by name or by hash
-	// This struct is json serialized, don't change the names naively
-	// todo: consider making this not stream specific
-	public struct StreamHandle {
-		public enum Kind : byte {
-			None,
-			Hash,
-			Id,
-		};
-
-		public static StreamHandle<TStreamId> ForHash<TStreamId>(ulong streamHash) {
-			return new StreamHandle<TStreamId>(kind: Kind.Hash, default, streamHash);
-		}
-
-		public static StreamHandle<TStreamId> ForStreamId<TStreamId>(TStreamId streamId) {
-			return new StreamHandle<TStreamId>(kind: Kind.Id, streamId, default);
-		}
-	}
-
-	// Refers to a stream by name or by hash
-	// this unifies the entries, some just have the hash (when we know they do not collide)
-	// some contain the full stream id (when they do collide)
-	public readonly struct StreamHandle<TStreamId> : IEquatable<StreamHandle<TStreamId>> {
-		private static EqualityComparer<TStreamId> StreamIdComparer { get; } = EqualityComparer<TStreamId>.Default;
-
-		public readonly StreamHandle.Kind Kind;
-		public readonly TStreamId StreamId;
-		public readonly ulong StreamHash;
-
-		public StreamHandle(StreamHandle.Kind kind, TStreamId streamId, ulong streamHash) {
-			Kind = kind;
-			StreamId = streamId;
-			StreamHash = streamHash;
-		}
-
-		public override string ToString() {
-			switch (Kind) {
-				case StreamHandle.Kind.Hash:
-					return $"Hash: {StreamHash:N0}";
-				case StreamHandle.Kind.Id:
-					return $"Id: {StreamId}";
-				case StreamHandle.Kind.None:
-				default:
-					return $"None";
-			}
-		}
-
-		public override bool Equals(object other) {
-			if (other == null)
-				return false;
-			if (!(other is StreamHandle<TStreamId> x))
-				return false;
-			return Equals(x);
-		}
-
-		public bool Equals(StreamHandle<TStreamId> other) =>
-			Kind == other.Kind &&
-			StreamIdComparer.Equals(StreamId, other.StreamId) &&
-			StreamHash == other.StreamHash;
-
-		// avoid the default, reflection based, implementations if we ever need to call these
-		public override int GetHashCode() => throw new NotImplementedException();
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Data/Unit.cs b/src/EventStore.Core/TransactionLog/Scavenging/Data/Unit.cs
deleted file mode 100644
index 0814b163a25..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Data/Unit.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public struct Unit : IEquatable<Unit> {
-		public static readonly Unit Instance = new Unit();
-
-		public override int GetHashCode() => 1;
-		public override bool Equals(object other) => other is Unit;
-		public bool Equals(Unit other) => true;
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/ChunkManagerForExecutor.cs b/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/ChunkManagerForExecutor.cs
deleted file mode 100644
index 2efb9df552b..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/ChunkManagerForExecutor.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.Transforms;
-using Serilog;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class ChunkManagerForExecutor<TStreamId> : IChunkManagerForChunkExecutor<TStreamId, ILogRecord> {
-		private readonly ILogger _logger;
-		private readonly TFChunkManager _manager;
-		private readonly TFChunkDbConfig _dbConfig;
-		private readonly DbTransformManager _transformManager;
-
-		public ChunkManagerForExecutor(ILogger logger, TFChunkManager manager, TFChunkDbConfig dbConfig, DbTransformManager transformManager) {
-			_logger = logger;
-			_manager = manager;
-			_dbConfig = dbConfig;
-			_transformManager = transformManager;
-		}
-
-		public IChunkWriterForExecutor<TStreamId, ILogRecord> CreateChunkWriter(
-			IChunkReaderForExecutor<TStreamId, ILogRecord> sourceChunk) {
-
-			return new ChunkWriterForExecutor<TStreamId>(_logger, this, _dbConfig, sourceChunk, _transformManager);
-		}
-
-		public IChunkReaderForExecutor<TStreamId, ILogRecord> GetChunkReaderFor(long position) {
-			var tfChunk = _manager.GetChunkFor(position);
-			return new ChunkReaderForExecutor<TStreamId>(tfChunk);
-		}
-
-		public void SwitchChunk(
-			TFChunk chunk,
-			out string newFileName) {
-
-			var tfChunk = _manager.SwitchChunk(
-				chunk: chunk,
-				verifyHash: false,
-				removeChunksWithGreaterNumbers: false);
-
-			if (tfChunk == null) {
-				throw new Exception("Unexpected error: new chunk is null after switch");
-			}
-
-			newFileName = tfChunk.FileName;
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/ChunkReaderForAccumulator.cs b/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/ChunkReaderForAccumulator.cs
deleted file mode 100644
index 17a4a8622aa..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/ChunkReaderForAccumulator.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class ChunkReaderForAccumulator<TStreamId> : IChunkReaderForAccumulator<TStreamId> {
-		private readonly TFChunkManager _manager;
-		private readonly IMetastreamLookup<TStreamId> _metaStreamLookup;
-		private readonly IStreamIdConverter<TStreamId> _streamIdConverter;
-		private readonly ICheckpoint _replicationChk;
-		private readonly int _chunkSize;
-
-		private readonly Func<int, byte[]> _getBuffer;
-		private readonly Action _releaseBuffer;
-
-		public ChunkReaderForAccumulator(
-			TFChunkManager manager,
-			IMetastreamLookup<TStreamId> metastreamLookup,
-			IStreamIdConverter<TStreamId> streamIdConverter,
-			ICheckpoint replicationChk,
-			int chunkSize) {
-
-			_manager = manager;
-			_metaStreamLookup = metastreamLookup;
-			_streamIdConverter = streamIdConverter;
-			_replicationChk = replicationChk;
-			_chunkSize = chunkSize;
-
-			var reusableRecordBuffer = new ReusableBuffer(8192);
-			_getBuffer = size => reusableRecordBuffer.AcquireAsByteArray(size);
-			_releaseBuffer = () => reusableRecordBuffer.Release();
-		}
-
-		public IEnumerable<AccumulatorRecordType> ReadChunkInto(
-			int logicalChunkNumber,
-			RecordForAccumulator<TStreamId>.OriginalStreamRecord originalStreamRecord,
-			RecordForAccumulator<TStreamId>.MetadataStreamRecord metadataStreamRecord,
-			RecordForAccumulator<TStreamId>.TombStoneRecord tombStoneRecord) {
-
-			// the physical chunk might contain several logical chunks, we are only interested in one of them
-			var chunk = _manager.GetChunk(logicalChunkNumber);
-			long chunkStartPos = (long)_chunkSize * logicalChunkNumber;
-			long chunkEndPos = (long)_chunkSize * (logicalChunkNumber + 1);
-			long nextPos = chunkStartPos;
-
-			var replicationChk = _replicationChk.ReadNonFlushed();
-
-			while (true) {
-				if (nextPos >= chunkEndPos) // reached the end of this logical chunk
-					break;
-
-				if (nextPos >= replicationChk)
-					throw new InvalidOperationException(
-						$"Attempt to read at position: {nextPos} which is after the " +
-						$"replication checkpoint: {replicationChk}.");
-
-				var localPos = chunk.ChunkHeader.GetLocalLogPosition(nextPos);
-
-				var result = chunk.TryReadClosestForwardRaw(localPos, _getBuffer);
-
-				if (!result.Success) {
-					// there is no need to release the reusable buffer here since result.Success is false
-					// when attempting to read outside the bounds of a chunk and thus, the buffer will not
-					// have been acquired. in other words, whenever the buffer is acquired, either result.Success
-					// is true or an exception is thrown.
-					break;
-				}
-
-				switch (result.RecordType) {
-					case LogRecordType.Prepare:
-						var prepareView = new PrepareLogRecordView(result.RecordBuffer, result.RecordLength);
-						var streamId = _streamIdConverter.ToStreamId(prepareView.EventStreamId);
-
-						if (prepareView.Flags.HasAnyOf(PrepareFlags.StreamDelete)) {
-							tombStoneRecord.Reset(
-								streamId,
-								prepareView.LogPosition,
-								prepareView.TimeStamp,
-								prepareView.ExpectedVersion + 1);
-							yield return AccumulatorRecordType.TombstoneRecord;
-
-						} else if (_metaStreamLookup.IsMetaStream(streamId)) {
-							metadataStreamRecord.Reset(
-								streamId,
-								prepareView.LogPosition,
-								prepareView.TimeStamp,
-								prepareView.ExpectedVersion + 1,
-								StreamMetadata.TryFromJsonBytes(prepareView.Version, prepareView.Data));
-							yield return AccumulatorRecordType.MetadataStreamRecord;
-
-						} else {
-							originalStreamRecord.Reset(
-								streamId,
-								prepareView.LogPosition,
-								prepareView.TimeStamp);
-							yield return AccumulatorRecordType.OriginalStreamRecord;
-						}
-						break;
-					case LogRecordType.Commit:
-						break;
-					case LogRecordType.System:
-						break;
-					default:
-						throw new ArgumentOutOfRangeException(nameof(result.RecordType),
-							$"Unexpected log record type: {result.RecordType}");
-				}
-
-				nextPos = chunk.ChunkHeader.GetGlobalLogPosition(result.NextPosition);
-				_releaseBuffer();
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/ChunkReaderForExecutor.cs b/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/ChunkReaderForExecutor.cs
deleted file mode 100644
index 51c2b2061b5..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/ChunkReaderForExecutor.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.LogCommon;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class ChunkReaderForExecutor<TStreamId> : IChunkReaderForExecutor<TStreamId, ILogRecord> {
-		private readonly TFChunk _chunk;
-
-		public ChunkReaderForExecutor(TFChunk chunk) {
-			_chunk = chunk;
-		}
-
-		public string Name => _chunk.ToString();
-
-		public int FileSize => _chunk.FileSize;
-
-		public int ChunkStartNumber => _chunk.ChunkHeader.ChunkStartNumber;
-
-		public int ChunkEndNumber => _chunk.ChunkHeader.ChunkEndNumber;
-
-		public bool IsReadOnly => _chunk.IsReadOnly;
-
-		public long ChunkStartPosition => _chunk.ChunkHeader.ChunkStartPosition;
-
-		public long ChunkEndPosition => _chunk.ChunkHeader.ChunkEndPosition;
-
-		// similar to TFChunkScavenger.TraverseChunkBasic
-		public async IAsyncEnumerable<bool> ReadInto(
-			RecordForExecutor<TStreamId, ILogRecord>.NonPrepare nonPrepare,
-			RecordForExecutor<TStreamId, ILogRecord>.Prepare prepare,
-			[EnumeratorCancellation] CancellationToken token) {
-
-			var result = await _chunk.TryReadFirst(token);
-			while (result.Success) {
-				var record = result.LogRecord;
-				if (record.RecordType != LogRecordType.Prepare) {
-					nonPrepare.SetRecord(result.RecordLength, record);
-					yield return false;
-				} else {
-					var sourcePrepare = record as IPrepareLogRecord<TStreamId>;
-					prepare.SetRecord(
-						length: result.RecordLength,
-						logPosition: record.LogPosition,
-						record: record,
-						timeStamp: sourcePrepare.TimeStamp,
-						streamId: sourcePrepare.EventStreamId,
-						isSelfCommitted: sourcePrepare.Flags.HasAnyOf(PrepareFlags.IsCommitted),
-						isTombstone: sourcePrepare.Flags.HasAnyOf(PrepareFlags.StreamDelete),
-						isTransactionBegin: sourcePrepare.Flags.HasAnyOf(PrepareFlags.TransactionBegin),
-						eventNumber: sourcePrepare.ExpectedVersion + 1);
-					yield return true;
-				}
-
-				result = _chunk.TryReadClosestForward(result.NextPosition);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/ChunkReaderForIndexExecutor.cs b/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/ChunkReaderForIndexExecutor.cs
deleted file mode 100644
index 95ca4381b83..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/ChunkReaderForIndexExecutor.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class ChunkReaderForIndexExecutor<TStreamId> : IChunkReaderForIndexExecutor<TStreamId> {
-		private readonly Func<TFReaderLease> _tfReaderFactory;
-
-		public ChunkReaderForIndexExecutor(Func<TFReaderLease> tfReaderFactory) {
-			_tfReaderFactory = tfReaderFactory;
-		}
-
-		public bool TryGetStreamId(long position, out TStreamId streamId) {
-			using (var reader = _tfReaderFactory()) {
-				var result = reader.TryReadAt(position, couldBeScavenged: true);
-				if (!result.Success) {
-					streamId = default;
-					return false;
-				}
-
-				if (result.LogRecord is not IPrepareLogRecord<TStreamId> prepare)
-					throw new Exception($"Record in index at position {position} is not a prepare");
-
-				streamId = prepare.EventStreamId;
-				return true;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/ChunkWriterForExecutor.cs b/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/ChunkWriterForExecutor.cs
deleted file mode 100644
index 58a60dfee20..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/ChunkWriterForExecutor.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.Transforms;
-using Serilog;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class ChunkWriterForExecutor<TStreamId> : IChunkWriterForExecutor<TStreamId, ILogRecord> {
-		const int BatchLength = 2000;
-		private readonly ILogger _logger;
-		private readonly ChunkManagerForExecutor<TStreamId> _manager;
-		private readonly TFChunk _outputChunk;
-		private readonly List<List<PosMap>> _posMapss;
-		private int _lastFlushedPage = -1;
-
-		public ChunkWriterForExecutor(
-			ILogger logger,
-			ChunkManagerForExecutor<TStreamId> manager,
-			TFChunkDbConfig dbConfig,
-			IChunkReaderForExecutor<TStreamId, ILogRecord> sourceChunk,
-			DbTransformManager transformManager) {
-
-			_logger = logger;
-			_manager = manager;
-
-			// list of lists to avoid having an enormous list which could make it to the LoH
-			// and to avoid expensive resize operations on large lists
-			_posMapss = new List<List<PosMap>>(capacity: BatchLength) {
-				new List<PosMap>(capacity: BatchLength)
-			};
-
-			// from TFChunkScavenger.ScavengeChunk
-			FileName = Path.Combine(dbConfig.Path, Guid.NewGuid() + ".scavenge.tmp");
-			_outputChunk = TFChunk.CreateNew(
-				filename: FileName,
-				chunkDataSize: dbConfig.ChunkSize,
-				chunkStartNumber: sourceChunk.ChunkStartNumber,
-				chunkEndNumber: sourceChunk.ChunkEndNumber,
-				isScavenged: true,
-				inMem: dbConfig.InMemDb,
-				unbuffered: dbConfig.Unbuffered,
-				writethrough: dbConfig.WriteThrough,
-				reduceFileCachePressure: dbConfig.ReduceFileCachePressure,
-				tracker: new TFChunkTracker.NoOp(),
-				transformFactory: transformManager.GetFactoryForNewChunk());
-		}
-
-		public string FileName { get; }
-
-		public void WriteRecord(RecordForExecutor<TStreamId, ILogRecord> record) {
-			var posMap = TFChunkScavenger<TStreamId>.WriteRecord(_outputChunk, record.Record);
-
-			// add the posmap in memory so we can write it when we complete
-			var lastBatch = _posMapss[_posMapss.Count - 1];
-			if (lastBatch.Count >= BatchLength) {
-				lastBatch = new List<PosMap>(capacity: BatchLength);
-				_posMapss.Add(lastBatch);
-			}
-
-			lastBatch.Add(posMap);
-
-			// occasionally flush the chunk. based on TFChunkScavenger.ScavengeChunk
-			var currentPage = _outputChunk.RawWriterPosition / 4046;
-			if (currentPage - _lastFlushedPage > TFChunkScavenger.FlushPageInterval) {
-				_outputChunk.Flush();
-				_lastFlushedPage = currentPage;
-			}
-		}
-
-		public async ValueTask<(string, long)> Complete(CancellationToken token) {
-			// write posmap
-			var posMapCount = 0;
-			foreach (var list in _posMapss)
-				posMapCount += list.Count;
-
-			var unifiedPosMap = new List<PosMap>(capacity: posMapCount);
-			foreach (var list in _posMapss)
-				unifiedPosMap.AddRange(list);
-
-			await _outputChunk.CompleteScavenge(unifiedPosMap, token);
-			_manager.SwitchChunk(chunk: _outputChunk, out var newFileName);
-
-			return (newFileName, _outputChunk.FileSize);
-		}
-
-		// tbh not sure why this distinction is important
-		public void Abort(bool deleteImmediately) {
-			if (deleteImmediately) {
-				_outputChunk.Dispose();
-				TFChunkScavenger<TStreamId>.DeleteTempChunk(_logger, FileName, TFChunkScavenger.MaxRetryCount);
-			} else {
-				_outputChunk.MarkForDeletion();
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/IndexReaderForAccumulator.cs b/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/IndexReaderForAccumulator.cs
deleted file mode 100644
index 375780a369e..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/IndexReaderForAccumulator.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using EventStore.Core.Services.Storage.ReaderIndex;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class IndexReaderForAccumulator<TStreamId> : IIndexReaderForAccumulator<TStreamId> {
-		private readonly IReadIndex<TStreamId> _readIndex;
-
-		public IndexReaderForAccumulator(IReadIndex<TStreamId> readIndex) {
-			_readIndex = readIndex;
-		}
-
-		// reads a stream forward but only returns event info not the full event.
-		public IndexReadEventInfoResult ReadEventInfoForward(
-			StreamHandle<TStreamId> handle,
-			long fromEventNumber,
-			int maxCount,
-			ScavengePoint scavengePoint) {
-
-			switch (handle.Kind) {
-				case StreamHandle.Kind.Hash:
-					// uses the index only
-					return _readIndex.ReadEventInfoForward_NoCollisions(
-						handle.StreamHash,
-						fromEventNumber,
-						maxCount,
-						scavengePoint.Position);
-				case StreamHandle.Kind.Id:
-					// uses log to check for hash collisions
-					return _readIndex.ReadEventInfoForward_KnownCollisions(
-						handle.StreamId,
-						fromEventNumber,
-						maxCount,
-						scavengePoint.Position);
-				default:
-					throw new ArgumentOutOfRangeException(nameof(handle), handle, null);
-			}
-		}
-
-		// reads a stream backward but only returns event info not the full event.
-		public IndexReadEventInfoResult ReadEventInfoBackward(
-			TStreamId streamId,
-			StreamHandle<TStreamId> handle,
-			long fromEventNumber,
-			int maxCount,
-			ScavengePoint scavengePoint) {
-
-			switch (handle.Kind) {
-				case StreamHandle.Kind.Hash:
-					// uses the index only
-					return _readIndex.ReadEventInfoBackward_NoCollisions(
-						handle.StreamHash,
-						_ => streamId,
-						fromEventNumber,
-						maxCount,
-						scavengePoint.Position);
-				case StreamHandle.Kind.Id:
-					// uses log to check for hash collisions
-					return _readIndex.ReadEventInfoBackward_KnownCollisions(
-						handle.StreamId,
-						fromEventNumber,
-						maxCount,
-						scavengePoint.Position);
-				default:
-					throw new ArgumentOutOfRangeException(nameof(handle), handle, null);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/IndexReaderForCalculator.cs b/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/IndexReaderForCalculator.cs
deleted file mode 100644
index faf32300896..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/IndexReaderForCalculator.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using System;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.TransactionLog.LogRecords;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class IndexReaderForCalculator<TStreamId> : IIndexReaderForCalculator<TStreamId> {
-		private readonly IReadIndex<TStreamId> _readIndex;
-		private readonly Func<TFReaderLease> _tfReaderFactory;
-		private readonly Func<ulong, TStreamId> _lookupUniqueHashUser;
-
-		public IndexReaderForCalculator(
-			IReadIndex<TStreamId> readIndex,
-			Func<TFReaderLease> tfReaderFactory,
-			Func<ulong, TStreamId> lookupUniqueHashUser) {
-
-			_readIndex = readIndex;
-			_tfReaderFactory = tfReaderFactory;
-			_lookupUniqueHashUser = lookupUniqueHashUser;
-		}
-
-		public long GetLastEventNumber(
-			StreamHandle<TStreamId> handle,
-			ScavengePoint scavengePoint) {
-
-			switch (handle.Kind) {
-				case StreamHandle.Kind.Hash:
-					// tries as far as possible to use the index without consulting the log to fetch the last event number
-					return _readIndex.GetStreamLastEventNumber_NoCollisions(
-						handle.StreamHash,
-						_lookupUniqueHashUser,
-						scavengePoint.Position);
-				case StreamHandle.Kind.Id:
-					// uses the index and the log to fetch the last event number
-					return _readIndex.GetStreamLastEventNumber_KnownCollisions(
-						handle.StreamId,
-						scavengePoint.Position);
-				default:
-					throw new ArgumentOutOfRangeException(nameof(handle), handle, null);
-			}
-		}
-
-		public IndexReadEventInfoResult ReadEventInfoForward(
-			StreamHandle<TStreamId> handle,
-			long fromEventNumber,
-			int maxCount,
-			ScavengePoint scavengePoint) {
-
-			switch (handle.Kind) {
-				case StreamHandle.Kind.Hash:
-					// uses the index only
-					return _readIndex.ReadEventInfoForward_NoCollisions(
-						handle.StreamHash,
-						fromEventNumber,
-						maxCount,
-						scavengePoint.Position);
-				case StreamHandle.Kind.Id:
-					// uses log to check for hash collisions
-					return _readIndex.ReadEventInfoForward_KnownCollisions(
-						handle.StreamId,
-						fromEventNumber,
-						maxCount,
-						scavengePoint.Position);
-				default:
-					throw new ArgumentOutOfRangeException(nameof(handle), handle, null);
-			}
-		}
-
-		public bool IsTombstone(long logPosition) {
-			using (var reader = _tfReaderFactory()) {
-				var result = reader.TryReadAt(logPosition, couldBeScavenged: true);
-
-				if (!result.Success)
-					return false;
-
-				if (result.LogRecord is not IPrepareLogRecord prepare)
-					throw new Exception(
-						$"Incorrect type of log record {result.LogRecord.RecordType}, " +
-						$"expected Prepare record.");
-
-				return prepare.Flags.HasAnyOf(PrepareFlags.StreamDelete);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/IndexScavenger.cs b/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/IndexScavenger.cs
deleted file mode 100644
index dd8b0135f02..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/IndexScavenger.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Core.Index;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class IndexScavenger : IIndexScavenger {
-		private readonly ITableIndex _tableIndex;
-
-		public IndexScavenger(ITableIndex tableIndex) {
-			_tableIndex = tableIndex;
-		}
-
-		public void ScavengeIndex(
-			long scavengePoint,
-			Func<IndexEntry, bool> shouldKeep,
-			IIndexScavengerLog log,
-			CancellationToken cancellationToken) {
-
-			_tableIndex.Scavenge(shouldKeep, log, cancellationToken);
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/OldScavengeChunkMergerBackend.cs b/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/OldScavengeChunkMergerBackend.cs
deleted file mode 100644
index 5aa2c3b370f..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/OldScavengeChunkMergerBackend.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Chunks;
-using Serilog;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class OldScavengeChunkMergerBackend : IChunkMergerBackend {
-		private readonly ILogger _logger;
-		private readonly TFChunkDb _db;
-
-		public OldScavengeChunkMergerBackend(ILogger logger, TFChunkDb db) {
-			_logger = logger;
-			_db = db;
-		}
-
-		public ValueTask MergeChunks(
-			ITFChunkScavengerLog scavengerLogger,
-			Throttle throttle,
-			CancellationToken cancellationToken) {
-
-			// todo: if time permits we could look in more detail at this implementation and see if it
-			// could be improved or replaced.
-			// todo: if time permits we could stop after the chunk with the scavenge point
-			// todo: if time permits we could start with the minimum executed chunk this scavenge
-			// todo: if time permits we could add some way of checkpointing during the merges
-			// todo: move MergePhase to non-generic TFChunkScavenger
-			return TFChunkScavenger<string>.MergePhase(
-				logger: _logger,
-				db: _db,
-				maxChunkDataSize: _db.Config.ChunkSize,
-				scavengerLog: scavengerLogger,
-				throttle: throttle,
-				ct: cancellationToken);
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/ScavengePointSource.cs b/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/ScavengePointSource.cs
deleted file mode 100644
index d257d51e365..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/DbAccess/ScavengePointSource.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services;
-using EventStore.Core.Services.UserManagement;
-using Serilog;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class ScavengePointSource : IScavengePointSource {
-		private readonly ILogger _logger;
-		private readonly IODispatcher _ioDispatcher;
-
-		public ScavengePointSource(ILogger logger, IODispatcher ioDispatcher) {
-			_logger = logger;
-			_ioDispatcher = ioDispatcher;
-		}
-
-		public async Task<ScavengePoint> GetLatestScavengePointOrDefaultAsync(
-			CancellationToken cancellationToken) {
-
-			_logger.Information("SCAVENGING: Getting latest scavenge point...");
-
-			var readTcs = new TaskCompletionSource<ResolvedEvent[]>(
-				TaskCreationOptions.RunContinuationsAsynchronously);
-			var endStreamPosition = -1;
-
-			_ioDispatcher.ReadBackward(
-				streamId: SystemStreams.ScavengePointsStream,
-				fromEventNumber: endStreamPosition,
-				maxCount: 1,
-				resolveLinks: false,
-				principal: SystemAccounts.System,
-				action: m => {
-					if (m.Result == ReadStreamResult.Success)
-						readTcs.TrySetResult(m.Events);
-					else if (m.Result == ReadStreamResult.NoStream)
-						readTcs.TrySetResult(Array.Empty<ResolvedEvent>());
-					else {
-						readTcs.TrySetException(new Exception(
-							$"Failed to get latest scavenge point: {m.Result}. {m.Error}"));
-					}
-				},
-				timeoutAction: () => {
-					readTcs.TrySetException(new Exception(
-						"Failed to get latest scavenge point: read timed out"));
-				},
-				corrId: Guid.NewGuid());
-
-			ResolvedEvent[] events;
-			using (cancellationToken.Register(() => readTcs.TrySetCanceled())) {
-				events = await readTcs.Task;
-			}
-
-			if (events.Length == 0) {
-				_logger.Information("SCAVENGING: No scavenge points exist");
-				return default;
-			} else if (events.Length != 1) {
-				throw new Exception($"Expected 1 event but got {events.Length}");
-			}
-
-			var scavengePointEvent = events[0].Event;
-
-			if (scavengePointEvent.EventType != SystemEventTypes.ScavengePoint)
-				throw new Exception($"Last event in {SystemStreams.ScavengePointsStream} is not a scavenge point.");
-
-			var scavengePointPayload = ScavengePointPayload.FromBytes(scavengePointEvent.Data);
-
-			var scavengePoint = new ScavengePoint(
-				position: scavengePointEvent.LogPosition,
-				eventNumber: scavengePointEvent.EventNumber,
-				effectiveNow: scavengePointEvent.TimeStamp,
-				threshold: scavengePointPayload.Threshold);
-
-			_logger.Information("SCAVENGING: Latest scavenge point found is {scavengePoint}", scavengePoint);
-			return scavengePoint;
-		}
-
-		public async Task<ScavengePoint> AddScavengePointAsync(
-			long expectedVersion,
-			int threshold,
-			CancellationToken cancellationToken) {
-
-			_logger.Information("SCAVENGING: Adding new scavenge point #{eventNumber} with threshold {threshold}...",
-				expectedVersion + 1, threshold);
-
-			var payload = new ScavengePointPayload {
-				Threshold = threshold,
-			};
-
-			var writeTcs = new TaskCompletionSource<bool>(
-				TaskCreationOptions.RunContinuationsAsynchronously);
-			_ioDispatcher.WriteEvent(
-				streamId: SystemStreams.ScavengePointsStream,
-				expectedVersion: expectedVersion,
-				@event: new Event(
-					eventId: Guid.NewGuid(),
-					eventType: SystemEventTypes.ScavengePoint,
-					isJson: true,
-					data: payload.ToJsonBytes(),
-					metadata: null),
-				principal: SystemAccounts.System,
-				action: m => {
-					if (m.Result == OperationResult.Success) {
-						writeTcs.TrySetResult(true);
-					} else {
-						writeTcs.TrySetException(new Exception(
-							$"Failed to add new scavenge point: {m.Result}"));
-					}
-				}
-			);
-
-			using (cancellationToken.Register(() => writeTcs.TrySetCanceled())) {
-				await writeTcs.Task;
-			}
-
-			_logger.Information("SCAVENGING: Added new scavenge point.");
-
-			// initial chance to replicate (handy if we are follower)
-			await Task.Delay(500, cancellationToken);
-
-			const int MaxAttempts = 30;
-			var attempt = 0;
-			while (true) {
-				var scavengePoint = await GetLatestScavengePointOrDefaultAsync(cancellationToken);
-
-				// success
-				if (scavengePoint.EventNumber == expectedVersion + 1)
-					return scavengePoint;
-
-				// give up
-				if (++attempt > MaxAttempts)
-					throw new Exception(
-						$"Unable to read back new scavenge point {expectedVersion + 1}. " +
-						$"This node is most likely significantly behind the leader. " +
-						$"Allow it to catch up and then try again. ");
-
-				// retry
-				_logger.Information(
-					"SCAVENGING: Did not read new scavenge point. " +
-					"Found {actual} but expected {expected}. Retrying {attempt}/{maxAttempts}...",
-					scavengePoint.EventNumber, expectedVersion + 1, attempt, MaxAttempts);
-
-				await Task.Delay(1000, cancellationToken);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/InMemory/InMemoryChunkWeightScavengeMap.cs b/src/EventStore.Core/TransactionLog/Scavenging/InMemory/InMemoryChunkWeightScavengeMap.cs
deleted file mode 100644
index a24a94273ca..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/InMemory/InMemoryChunkWeightScavengeMap.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class InMemoryChunkWeightScavengeMap :
-		InMemoryScavengeMap<int, float>,
-		IChunkWeightScavengeMap {
-
-		public bool AllWeightsAreZero() {
-			foreach (var kvp in AllRecords()) {
-				if (kvp.Value != 0) {
-					return false;
-				}
-			}
-			return true;
-		}
-
-		public void IncreaseWeight(int logicalChunkNumber, float extraWeight) {
-			if (!TryGetValue(logicalChunkNumber, out var weight))
-				weight = 0;
-			this[logicalChunkNumber] = weight + extraWeight;
-		}
-
-		public void ResetChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber) {
-			for (var i = startLogicalChunkNumber; i <= endLogicalChunkNumber; i++) {
-				TryRemove(i, out _);
-			}
-		}
-
-		public float SumChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber) {
-			var totalWeight = 0f;
-			for (var i = startLogicalChunkNumber; i <= endLogicalChunkNumber; i++) {
-				if (TryGetValue(i, out var weight)) {
-					totalWeight += weight;
-				}
-			}
-
-			return totalWeight;
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/InMemory/InMemoryMetastreamScavengeMap.cs b/src/EventStore.Core/TransactionLog/Scavenging/InMemory/InMemoryMetastreamScavengeMap.cs
deleted file mode 100644
index 24465846306..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/InMemory/InMemoryMetastreamScavengeMap.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class InMemoryMetastreamScavengeMap<TKey> :
-		InMemoryScavengeMap<TKey, MetastreamData>,
-		IMetastreamScavengeMap<TKey> {
-
-		public void SetTombstone(TKey key) {
-			if (!TryGetValue(key, out var x))
-				x = new MetastreamData();
-
-			this[key] = new MetastreamData(
-				isTombstoned: true,
-				discardPoint: x.DiscardPoint);
-		}
-
-		public void SetDiscardPoint(TKey key, DiscardPoint discardPoint) {
-			if (!TryGetValue(key, out var x))
-				x = new MetastreamData();
-
-			this[key] = new MetastreamData(
-				isTombstoned: x.IsTombstoned,
-				discardPoint: discardPoint);
-		}
-
-		public void DeleteAll() {
-			foreach (var kvp in AllRecords()) {
-				TryRemove(kvp.Key, out _);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/InMemory/InMemoryOriginalStreamScavengeMap.cs b/src/EventStore.Core/TransactionLog/Scavenging/InMemory/InMemoryOriginalStreamScavengeMap.cs
deleted file mode 100644
index 7e409c5a166..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/InMemory/InMemoryOriginalStreamScavengeMap.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class InMemoryOriginalStreamScavengeMap<TKey> :
-		InMemoryScavengeMap<TKey, OriginalStreamData>,
-		IOriginalStreamScavengeMap<TKey> {
-
-		public void SetTombstone(TKey key) {
-			if (!TryGetValue(key, out var x))
-				x = new OriginalStreamData();
-
-			this[key] = new OriginalStreamData {
-				DiscardPoint = x.DiscardPoint,
-				MaybeDiscardPoint = x.MaybeDiscardPoint,
-				MaxAge = x.MaxAge,
-				MaxCount = x.MaxCount,
-				TruncateBefore = x.TruncateBefore,
-
-				Status = CalculationStatus.Active,
-				IsTombstoned = true,
-			};
-		}
-
-		public void SetMetadata(TKey key, StreamMetadata metadata) {
-			if (!TryGetValue(key, out var x))
-				x = new OriginalStreamData();
-
-			this[key] = new OriginalStreamData {
-				MaybeDiscardPoint = x.MaybeDiscardPoint,
-				DiscardPoint = x.DiscardPoint,
-				IsTombstoned = x.IsTombstoned,
-
-				Status = CalculationStatus.Active,
-				MaxAge = metadata.MaxAge,
-				MaxCount = metadata.MaxCount,
-				TruncateBefore = metadata.TruncateBefore,
-			};
-		}
-
-		public void SetDiscardPoints(
-			TKey key,
-			CalculationStatus status,
-			DiscardPoint discardPoint,
-			DiscardPoint maybeDiscardPoint) {
-
-			if (!TryGetValue(key, out var x))
-				throw new Exception("this shouldn't happen");
-
-			this[key] = new OriginalStreamData {
-				IsTombstoned = x.IsTombstoned,
-				MaxAge = x.MaxAge,
-				MaxCount = x.MaxCount,
-				TruncateBefore = x.TruncateBefore,
-
-				Status = status,
-				DiscardPoint = discardPoint,
-				MaybeDiscardPoint = maybeDiscardPoint,
-			};
-		}
-
-		public bool TryGetChunkExecutionInfo(TKey key, out ChunkExecutionInfo info) {
-			if (!TryGetValue(key, out var data)) {
-				info = default;
-				return false;
-			}
-
-			info = new ChunkExecutionInfo(
-				isTombstoned: data.IsTombstoned,
-				discardPoint: data.DiscardPoint,
-				maybeDiscardPoint: data.MaybeDiscardPoint,
-				maxAge: data.MaxAge);
-
-			return true;
-		}
-
-		private bool Filter(KeyValuePair<TKey, OriginalStreamData> kvp) =>
-			kvp.Value.Status == CalculationStatus.Active;
-
-		public IEnumerable<KeyValuePair<TKey, OriginalStreamData>> ActiveRecords() =>
-			AllRecords().Where(Filter);
-
-		public IEnumerable<KeyValuePair<TKey, OriginalStreamData>> ActiveRecordsFromCheckpoint(TKey checkpoint) =>
-			// skip those which are before or equal to the checkpoint.
-			ActiveRecords().SkipWhile(x => Comparer<TKey>.Default.Compare(x.Key, checkpoint) <= 0);
-
-		public void DeleteMany(bool deleteArchived) {
-			foreach (var kvp in AllRecords()) {
-				if ((kvp.Value.Status == CalculationStatus.Spent) ||
-					(kvp.Value.Status == CalculationStatus.Archived && deleteArchived)) {
-
-					TryRemove(kvp.Key, out _);
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/InMemory/InMemoryScavengeMap.cs b/src/EventStore.Core/TransactionLog/Scavenging/InMemory/InMemoryScavengeMap.cs
deleted file mode 100644
index 6d878fbbe5a..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/InMemory/InMemoryScavengeMap.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class InMemoryScavengeMap<TKey, TValue> : IScavengeMap<TKey, TValue> {
-		public InMemoryScavengeMap() {
-		}
-
-		private readonly Dictionary<TKey, TValue> _dict = new Dictionary<TKey, TValue>();
-
-		public TValue this[TKey key] {
-			set => _dict[key] = value;
-		}
-
-		public bool TryGetValue(TKey key, out TValue value) => _dict.TryGetValue(key, out value);
-
-		public IEnumerable<KeyValuePair<TKey, TValue>> AllRecords() =>
-			// naive copy so we can write to the values for the keys that we are iterating through.
-			_dict
-				.ToDictionary(x => x.Key, x => x.Value)
-				.OrderBy(x => x.Key);
-
-		public bool TryRemove(TKey key, out TValue value) {
-			_dict.TryGetValue(key, out value);
-			return _dict.Remove(key);
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/InMemory/InMemoryTransactionFactory.cs b/src/EventStore.Core/TransactionLog/Scavenging/InMemory/InMemoryTransactionFactory.cs
deleted file mode 100644
index 827c84191a3..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/InMemory/InMemoryTransactionFactory.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class InMemoryTransactionFactory : ITransactionFactory<int> {
-		public InMemoryTransactionFactory() {
-		}
-
-		public int Begin() {
-			return 5;
-		}
-
-		public void Commit(int transasction) {
-		}
-
-		public void Rollback(int transaction) {
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IAccumulator.cs b/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IAccumulator.cs
deleted file mode 100644
index 55f99ed4c6e..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IAccumulator.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Threading;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	// The Accumulator reads through the log up to the scavenge point
-	// its purpose is to do any log scanning that is necessary for a scavenge _only once_
-	// accumulating whatever state is necessary to avoid subsequent scans.
-	//
-	// in practice it populates the scavenge state with:
-	//  1. the scavengable streams
-	//  2. hash collisions between any streams
-	//  3. most recent metadata and whether the stream is tombstoned
-	//  4. discard points for metadata streams
-	//  5. data for maxage calculations - maybe that can be another IScavengeMap
-	public interface IAccumulator<TStreamId> {
-		void Accumulate(
-			ScavengePoint prevScavengePoint,
-			ScavengePoint scavengePoint,
-			IScavengeStateForAccumulator<TStreamId> state,
-			CancellationToken cancellationToken);
-
-		void Accumulate(
-			ScavengeCheckpoint.Accumulating checkpoint,
-			IScavengeStateForAccumulator<TStreamId> state,
-			CancellationToken cancellationToken);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/ICalculator.cs b/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/ICalculator.cs
deleted file mode 100644
index b4844f7e5ac..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/ICalculator.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Threading;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	// The Calculator calculates the DiscardPoints that depend on the ScavengePoint
-	// (after which all the scavengable streams will have discard points calculated correctly)
-	//
-	// It also creates a heuristic for which chunks are most in need of scavenging.
-	//
-	// The job of calculating the DiscardPoints is split between the Accumulator and the Calculator.
-	// The Accumulator calculates them for Metadata streams because (a) it is simple and
-	// (b) it is updating the state for each metastream record anyway.
-	// The Calculator calculates them for Original streams so save us updating them repeatedly as
-	// we accumulate each event.
-	//
-	// For streams that do not collide (which is ~all of them) the calculation can be done index-only.
-	// that is, without hitting the log at all.
-	public interface ICalculator<TStreamId> {
-		void Calculate(
-			ScavengePoint scavengePoint,
-			IScavengeStateForCalculator<TStreamId> source,
-			CancellationToken cancellationToken);
-
-		void Calculate(
-			ScavengeCheckpoint.Calculating<TStreamId> checkpoint,
-			IScavengeStateForCalculator<TStreamId> source,
-			CancellationToken cancellationToken);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkExecutor.cs b/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkExecutor.cs
deleted file mode 100644
index ee9085170d4..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkExecutor.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Chunks;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	// The chunk executor performs the actual removal of the log records
-	public interface IChunkExecutor<TStreamId> {
-		ValueTask Execute(
-			ScavengePoint scavengePoint,
-			IScavengeStateForChunkExecutor<TStreamId> state,
-			ITFChunkScavengerLog scavengerLogger,
-			CancellationToken cancellationToken);
-
-		ValueTask Execute(
-			ScavengeCheckpoint.ExecutingChunks checkpoint,
-			IScavengeStateForChunkExecutor<TStreamId> state,
-			ITFChunkScavengerLog scavengerLogger,
-			CancellationToken cancellationToken);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkManagerForChunkExecutor.cs b/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkManagerForChunkExecutor.cs
deleted file mode 100644
index 7ef0a6f27a9..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkManagerForChunkExecutor.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public interface IChunkManagerForChunkExecutor<TStreamId, TRecord> {
-		IChunkWriterForExecutor<TStreamId, TRecord> CreateChunkWriter(
-			IChunkReaderForExecutor<TStreamId, TRecord> sourceChunk);
-
-		IChunkReaderForExecutor<TStreamId, TRecord> GetChunkReaderFor(long position);
-	}
-
-	public interface IChunkWriterForExecutor<TStreamId, TRecord> {
-		string FileName { get; }
-
-		void WriteRecord(RecordForExecutor<TStreamId, TRecord> record);
-
-		ValueTask<(string NewFileName, long NewFileSize)> Complete(CancellationToken token);
-
-		void Abort(bool deleteImmediately);
-	}
-
-	public interface IChunkReaderForExecutor<TStreamId, TRecord> {
-		string Name { get; }
-		int FileSize { get; }
-		int ChunkStartNumber { get; }
-		int ChunkEndNumber { get; }
-		bool IsReadOnly { get; }
-		long ChunkStartPosition { get; }
-		long ChunkEndPosition { get; }
-		IAsyncEnumerable<bool> ReadInto(
-			RecordForExecutor<TStreamId, TRecord>.NonPrepare nonPrepare,
-			RecordForExecutor<TStreamId, TRecord>.Prepare prepare,
-			CancellationToken token);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkMerger.cs b/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkMerger.cs
deleted file mode 100644
index 53cbf9e7f23..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkMerger.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Chunks;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public interface IChunkMerger {
-		ValueTask MergeChunks(
-			ScavengePoint scavengePoint,
-			IScavengeStateForChunkMerger state,
-			ITFChunkScavengerLog scavengerLogger,
-			CancellationToken cancellationToken);
-
-		ValueTask MergeChunks(
-			ScavengeCheckpoint.MergingChunks checkpoint,
-			IScavengeStateForChunkMerger state,
-			ITFChunkScavengerLog scavengerLogger,
-			CancellationToken cancellationToken);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkMergerBackend.cs b/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkMergerBackend.cs
deleted file mode 100644
index 1410f82fec3..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkMergerBackend.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Chunks;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public interface IChunkMergerBackend {
-		ValueTask MergeChunks(
-			ITFChunkScavengerLog scavengerLogger,
-			Throttle throttle,
-			CancellationToken cancellationToken);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkReaderForAccumulator.cs b/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkReaderForAccumulator.cs
deleted file mode 100644
index ef44bd04802..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkReaderForAccumulator.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Collections.Generic;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public interface IChunkReaderForAccumulator<TStreamId> {
-		// Each element in the enumerable indicates which of the three records has been populated for
-		// that iteration.
-		IEnumerable<AccumulatorRecordType> ReadChunkInto(
-			int logicalChunkNumber,
-			RecordForAccumulator<TStreamId>.OriginalStreamRecord originalStreamRecord,
-			RecordForAccumulator<TStreamId>.MetadataStreamRecord metadataStreamRecord,
-			RecordForAccumulator<TStreamId>.TombStoneRecord tombStoneRecord);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkReaderForExecutor.cs b/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkReaderForExecutor.cs
deleted file mode 100644
index 325439be500..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkReaderForExecutor.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-using System.Collections.Generic;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkReaderForIndexExecutor.cs b/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkReaderForIndexExecutor.cs
deleted file mode 100644
index 5e348d2b887..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkReaderForIndexExecutor.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public interface IChunkReaderForIndexExecutor<TStreamId> {
-		bool TryGetStreamId(long position, out TStreamId streamId);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkWeightScavengeMap.cs b/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkWeightScavengeMap.cs
deleted file mode 100644
index 7e5b790f0ae..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IChunkWeightScavengeMap.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public interface IChunkWeightScavengeMap : IScavengeMap<int, float> {
-		bool AllWeightsAreZero();
-		void IncreaseWeight(int logicalChunkNumber, float extraWeight);
-		float SumChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber);
-		void ResetChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/ICleaner.cs b/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/ICleaner.cs
deleted file mode 100644
index 022765b184b..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/ICleaner.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Threading;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public interface ICleaner {
-		void Clean(
-			ScavengePoint scavengePoint,
-			IScavengeStateForCleaner state,
-			CancellationToken cancellationToken);
-
-		void Clean(
-			ScavengeCheckpoint.Cleaning checkpoint,
-			IScavengeStateForCleaner state,
-			CancellationToken cancellationToken);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IIndexExecutor.cs b/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IIndexExecutor.cs
deleted file mode 100644
index ab38e29f660..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IIndexExecutor.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Threading;
-using EventStore.Core.Index;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	// the index executor performs the actual removal of the index entries
-	// for non-colliding streams this is index-only
-	public interface IIndexExecutor<TStreamId> {
-		void Execute(
-			ScavengePoint scavengePoint,
-			IScavengeStateForIndexExecutor<TStreamId> state,
-			IIndexScavengerLog scavengerLogger,
-			CancellationToken cancellationToken);
-
-		void Execute(
-			ScavengeCheckpoint.ExecutingIndex checkpoint,
-			IScavengeStateForIndexExecutor<TStreamId> state,
-			IIndexScavengerLog scavengerLogger,
-			CancellationToken cancellationToken);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IIndexReaderForAccumulator.cs b/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IIndexReaderForAccumulator.cs
deleted file mode 100644
index c9d5749804f..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IIndexReaderForAccumulator.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using EventStore.Core.Services.Storage.ReaderIndex;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public interface IIndexReaderForAccumulator<TStreamId> {
-		IndexReadEventInfoResult ReadEventInfoForward(
-			StreamHandle<TStreamId> handle,
-			long fromEventNumber,
-			int maxCount,
-			ScavengePoint scavengePoint);
-
-		IndexReadEventInfoResult ReadEventInfoBackward(
-			TStreamId streamId,
-			StreamHandle<TStreamId> handle,
-			long fromEventNumber,
-			int maxCount,
-			ScavengePoint scavengePoint);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IIndexReaderForCalculator.cs b/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IIndexReaderForCalculator.cs
deleted file mode 100644
index d7db56557f2..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IIndexReaderForCalculator.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using EventStore.Core.Services.Storage.ReaderIndex;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public interface IIndexReaderForCalculator<TStreamId> {
-		long GetLastEventNumber(StreamHandle<TStreamId> streamHandle, ScavengePoint scavengePoint);
-
-		IndexReadEventInfoResult ReadEventInfoForward(
-			StreamHandle<TStreamId> stream,
-			long fromEventNumber,
-			int maxCount,
-			ScavengePoint scavengePoint);
-
-		bool IsTombstone(long logPosition);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IIndexScavenger.cs b/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IIndexScavenger.cs
deleted file mode 100644
index b4f640efcc7..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IIndexScavenger.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Core.Index;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public interface IIndexScavenger {
-		void ScavengeIndex(
-			long scavengePoint,
-			Func<IndexEntry, bool> shouldKeep,
-			IIndexScavengerLog log,
-			CancellationToken cancellationToken);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IMetastreamScavengeMap.cs b/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IMetastreamScavengeMap.cs
deleted file mode 100644
index 9c157b77213..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IMetastreamScavengeMap.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public interface IMetastreamScavengeMap<TKey> :
-		IScavengeMap<TKey, MetastreamData> {
-
-		void SetTombstone(TKey key);
-
-		void SetDiscardPoint(TKey key, DiscardPoint discardPoint);
-
-		void DeleteAll();
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IOriginalStreamScavengeMap.cs b/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IOriginalStreamScavengeMap.cs
deleted file mode 100644
index 9f86d1912aa..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IOriginalStreamScavengeMap.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public interface IOriginalStreamScavengeMap<TKey> :
-		IScavengeMap<TKey, OriginalStreamData> {
-
-		IEnumerable<KeyValuePair<TKey, OriginalStreamData>> ActiveRecords();
-
-		IEnumerable<KeyValuePair<TKey, OriginalStreamData>> ActiveRecordsFromCheckpoint(TKey checkpoint);
-
-		void SetTombstone(TKey key);
-
-		void SetMetadata(TKey key, StreamMetadata metadata);
-
-		void SetDiscardPoints(
-			TKey key,
-			CalculationStatus status,
-			DiscardPoint discardPoint,
-			DiscardPoint maybeDiscardPoint);
-
-		bool TryGetChunkExecutionInfo(TKey key, out ChunkExecutionInfo info);
-
-		void DeleteMany(bool deleteArchived);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IScavengeMap.cs b/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IScavengeMap.cs
deleted file mode 100644
index ccee3bbe736..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IScavengeMap.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public interface IScavengeMap<TKey, TValue> {
-		bool TryGetValue(TKey key, out TValue value);
-		TValue this[TKey key] { set; }
-		bool TryRemove(TKey key, out TValue value);
-		IEnumerable<KeyValuePair<TKey, TValue>> AllRecords();
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IScavengePointSource.cs b/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IScavengePointSource.cs
deleted file mode 100644
index e42f0e5e7a9..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IScavengePointSource.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public interface IScavengePointSource {
-		// returns null when no scavenge point
-		Task<ScavengePoint> GetLatestScavengePointOrDefaultAsync(CancellationToken cancellationToken);
-		Task<ScavengePoint> AddScavengePointAsync(
-			long expectedVersion,
-			int threshold,
-			CancellationToken cancellationToken);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IScavengeState.cs b/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IScavengeState.cs
deleted file mode 100644
index e7846033cde..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IScavengeState.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public interface IScavengeState<TStreamId> :
-		IScavengeStateForAccumulator<TStreamId>,
-		IScavengeStateForCalculator<TStreamId>,
-		IScavengeStateForIndexExecutor<TStreamId>,
-		IScavengeStateForChunkMerger,
-		IScavengeStateForChunkExecutor<TStreamId>,
-		IScavengeStateForCleaner,
-		IDisposable {
-
-		void Init();
-
-		bool TryGetCheckpoint(out ScavengeCheckpoint checkpoint);
-
-		IEnumerable<TStreamId> AllCollisions();
-
-		void LogStats();
-	}
-
-	// all the components use these
-	public interface IScavengeStateCommon {
-		// begin a transaction, returns the started transaction so that it can be
-		// committed or rolled back
-		ITransactionCompleter BeginTransaction();
-	}
-
-	// abstraction to allow the components to commit/rollback
-	public interface ITransactionCompleter {
-		void Rollback();
-		void Commit(ScavengeCheckpoint checkpoint);
-	}
-
-	public interface ITransactionManager : ITransactionCompleter{
-		void Begin();
-		void RegisterOnRollback(Action onRollback);
-		void UnregisterOnRollback();
-	}
-
-	// abstraction for the backing store. memory, sqlite etc.
-	public interface ITransactionFactory<TTransaction> {
-		TTransaction Begin();
-		void Rollback(TTransaction transaction);
-		void Commit(TTransaction transaction);
-	}
-
-	public interface IScavengeStateForAccumulator<TStreamId> :
-		IScavengeStateCommon,
-		IIncreaseChunkWeights {
-
-		// call this for each record as we accumulate through the log so that we can spot every hash
-		// collision to save ourselves work later.
-		// this affects multiple parts of the scavengestate and must be called within a transaction so
-		// that its effect is atomic
-		void DetectCollisions(TStreamId streamId);
-
-		void SetMetastreamDiscardPoint(TStreamId metastreamId, DiscardPoint discardPoint);
-
-		// for when the _original_ stream is tombstoned, the metadata stream can be removed entirely.
-		void SetMetastreamTombstone(TStreamId metastreamId);
-
-		void SetOriginalStreamMetadata(TStreamId originalStreamId, StreamMetadata metadata);
-
-		void SetOriginalStreamTombstone(TStreamId originalStreamId);
-
-		void SetChunkTimeStampRange(int logicalChunkNumber, ChunkTimeStampRange range);
-
-		StreamHandle<TStreamId> GetStreamHandle(TStreamId streamId);
-
-		void LogAccumulationStats();
-	}
-
-	public interface IScavengeStateForCalculatorReadOnly<TStreamId> {
-		// Calculator iterates through the scavengable original streams and their metadata
-		// it doesn't need to do anything with the metadata streams, accumulator has done those.
-		IEnumerable<(StreamHandle<TStreamId>, OriginalStreamData)> OriginalStreamsToCalculate(
-			StreamHandle<TStreamId> checkpoint);
-
-		bool TryGetChunkTimeStampRange(int logicaChunkNumber, out ChunkTimeStampRange range);
-	}
-
-	public interface IScavengeStateForCalculator<TStreamId> :
-		IScavengeStateForCalculatorReadOnly<TStreamId>,
-		IScavengeStateCommon,
-		IIncreaseChunkWeights {
-
-		void SetOriginalStreamDiscardPoints(
-			StreamHandle<TStreamId> streamHandle,
-			CalculationStatus status,
-			DiscardPoint discardPoint,
-			DiscardPoint maybeDiscardPoint);
-
-		TStreamId LookupUniqueHashUser(ulong streamHash);
-	}
-
-	public interface IIncreaseChunkWeights {
-		void IncreaseChunkWeight(int logicalChunkNumber, float extraWeight);
-	}
-
-	public interface IScavengeStateForChunkExecutor<TStreamId> : IScavengeStateCommon {
-		IScavengeStateForChunkExecutorWorker<TStreamId> BorrowStateForWorker();
-	}
-
-	// implementations must be thread-safe
-	public interface IScavengeStateForChunkExecutorWorker<TStreamId> : IDisposable {
-		void ResetChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber);
-		float SumChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber);
-		bool TryGetChunkExecutionInfo(TStreamId streamId, out ChunkExecutionInfo info);
-		bool TryGetMetastreamData(TStreamId streamId, out MetastreamData metastreamData);
-	}
-
-	public interface IScavengeStateForChunkMerger : IScavengeStateCommon {
-	}
-
-	public interface IScavengeStateForIndexExecutor<TStreamId> : IScavengeStateCommon {
-		bool IsCollision(ulong streamHash);
-		bool TryGetIndexExecutionInfo(
-			StreamHandle<TStreamId> streamHandle,
-			out IndexExecutionInfo info);
-		TStreamId LookupUniqueHashUser(ulong streamHash);
-	}
-
-	public interface IScavengeStateForCleaner : IScavengeStateCommon {
-		bool AllChunksExecuted();
-		void DeleteMetastreamData();
-		void DeleteOriginalStreamData(bool deleteArchived);
-	}
-
-	// this represents access to the actual state storage. these are grouped together into one inteface
-	// so that they can be accessed transactionally
-	public interface IScavengeStateBackend<TStreamId> : IDisposable {
-		void LogStats();
-		IScavengeMap<TStreamId, Unit> CollisionStorage { get; }
-		IScavengeMap<ulong, TStreamId> Hashes { get; }
-		IMetastreamScavengeMap<ulong> MetaStorage { get; }
-		IMetastreamScavengeMap<TStreamId> MetaCollisionStorage { get; }
-		IOriginalStreamScavengeMap<ulong> OriginalStorage { get; }
-		IOriginalStreamScavengeMap<TStreamId> OriginalCollisionStorage { get; }
-		IScavengeMap<Unit, ScavengeCheckpoint> CheckpointStorage { get; }
-		IScavengeMap<int, ChunkTimeStampRange> ChunkTimeStampRanges { get; }
-		IChunkWeightScavengeMap ChunkWeights { get; }
-		ITransactionManager TransactionManager { get; }
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IScavenger.cs b/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IScavenger.cs
deleted file mode 100644
index dae8e0f5441..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Interfaces/IScavenger.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Chunks;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	// There are two kinds of streams that we might want to remove events from
-	//    - original streams (i.e. streams with metadata)
-	//        - according to tombstone
-	//        - according to metadata (maxage, maxcount, tb)
-	//    - metadata streams
-	//        - according to tombstone
-	//        - maxcount 1
-	//
-	// In a nutshell:
-	// - The Accumulator passes through the log once (in total, not per scavenge)
-	//   accumulating state that we need and calculating some DiscardPoints.
-	// - When a ScavengePoint is set, the Calculator uses it to finish calculating
-	//   the DiscardPoints.
-	// - The Chunk and Index Executors can then use this information to perform the
-	//   actual record/indexEntry removal.
-	// - Merger merges the chunks
-	// - Cleaner removes parts of the scavenge state that are no longer needed
-	//   (as determined by the calculator)
-	public interface IScavenger : IDisposable {
-		string ScavengeId { get; }
-		Task<ScavengeResult> ScavengeAsync(CancellationToken cancellationToken);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/LruCachingScavengeMap.cs b/src/EventStore.Core/TransactionLog/Scavenging/LruCachingScavengeMap.cs
deleted file mode 100644
index e6a22a9b52a..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/LruCachingScavengeMap.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.DataStructures;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	// All access to the wrapped map must be via the cache.
-	// Currently this is only used to cache the hash users. See comments below.
-	public class LruCachingScavengeMap<TKey, TValue> : IScavengeMap<TKey, TValue> {
-		private readonly LRUCache<TKey, TValue> _cache;
-		private readonly IScavengeMap<TKey, TValue> _wrapped;
-		private long _hits;
-		private long _misses;
-
-		public LruCachingScavengeMap(string name, IScavengeMap<TKey, TValue> wrapped, int cacheMaxCount) {
-			_wrapped = wrapped;
-			_cache = new LRUCache<TKey, TValue>(name, cacheMaxCount);
-		}
-
-		public TValue this[TKey key] {
-			set {
-				_wrapped[key] = value;
-				_cache.Put(key, value);
-			}
-		}
-
-		public IEnumerable<KeyValuePair<TKey, TValue>> AllRecords() =>
-			_wrapped.AllRecords();
-
-		public bool TryGetValue(TKey key, out TValue value) {
-			if (_cache.TryGet(key, out value)) {
-				_hits++;
-				return true;
-			}
-
-			_misses++;
-
-			if (_wrapped.TryGetValue(key, out value)) {
-				_cache.Put(key, value);
-				return true;
-			}
-
-			// Currently this is only used to cache the hash users. As such if we TryGetValue and fail to
-			// find it then we will always be adding a value for that key immediately, so it is not
-			// useful to remember keys that are known to not exist.
-			return false;
-		}
-
-		public bool TryRemove(TKey key, out TValue value) {
-			_cache.Remove(key);
-			return _wrapped.TryRemove(key, out value);
-		}
-
-		public void GetStats(out long hits, out long misses) {
-			hits = _hits;
-			misses = _misses;
-			_hits = 0;
-			_misses = 0;
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/RecordForAccumulator.cs b/src/EventStore.Core/TransactionLog/Scavenging/RecordForAccumulator.cs
deleted file mode 100644
index 127d6677e3b..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/RecordForAccumulator.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public enum AccumulatorRecordType {
-		OriginalStreamRecord,
-		MetadataStreamRecord,
-		TombstoneRecord,
-	}
-
-	public abstract class RecordForAccumulator<TStreamId> {
-		public TStreamId StreamId { get; private set; }
-		public long LogPosition { get; private set; }
-		public DateTime TimeStamp { get; private set; }
-
-		protected void Reset(TStreamId streamId, long logPosition, DateTime timeStamp) {
-			StreamId = streamId;
-			LogPosition = logPosition;
-			TimeStamp = timeStamp;
-		}
-
-		// Record in original stream
-		public class OriginalStreamRecord : RecordForAccumulator<TStreamId> {
-			public new void Reset(TStreamId streamId, long logPosition, DateTime timeStamp) =>
-				base.Reset(streamId, logPosition, timeStamp);
-		}
-
-		// Record in metadata stream
-		public class MetadataStreamRecord : RecordForAccumulator<TStreamId> {
-			public void Reset(
-				TStreamId streamId,
-				long logPosition,
-				DateTime timeStamp,
-				long eventNumber,
-				StreamMetadata metadata) {
-
-				Reset(streamId, logPosition, timeStamp);
-				EventNumber = eventNumber;
-				Metadata = metadata;
-			}
-
-			public StreamMetadata Metadata { get; private set; }
-			public long EventNumber { get; private set; }
-		}
-
-		public class TombStoneRecord : RecordForAccumulator<TStreamId> {
-			public void Reset(
-				TStreamId streamId,
-				long logPosition,
-				DateTime timeStamp,
-				long eventNumber) {
-
-				Reset(streamId, logPosition, timeStamp);
-				EventNumber = eventNumber;
-			}
-
-			// old scavenge, index writer and index committer are set up to handle
-			// tombstones that have arbitrary event numbers, so let's handle them here
-			// in case it used to be possible to create them.
-			public long EventNumber { get; private set; }
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/ScavengeCheckpointJsonPersistence.cs b/src/EventStore.Core/TransactionLog/Scavenging/ScavengeCheckpointJsonPersistence.cs
deleted file mode 100644
index d1d12a90892..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/ScavengeCheckpointJsonPersistence.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using Newtonsoft.Json;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class ScavengeCheckpointJsonPersistence<TStreamId> {
-		public enum Version {
-			None,
-			V0,
-		}
-
-		public enum Stage {
-			None = 0,
-			Accumulating = 1,
-			Calculating = 2,
-			ExecutingChunks = 3,
-			MergingChunks = 4,
-			ExecutingIndex = 5,
-			Cleaning = 6,
-			Done = 7,
-		}
-
-		public ScavengePoint ScavengePoint { get; set; }
-		public Version SchemaVersion { get; set; }
-		public Stage CheckpointStage { get; set; }
-		public int? DoneLogicalChunkNumber { get; set; }
-		public StreamHandle<TStreamId> DoneStreamHandle { get; set; }
-
-		public ScavengeCheckpoint ToDomain() {
-			switch (CheckpointStage) {
-				case Stage.Accumulating:
-					return new ScavengeCheckpoint.Accumulating(ScavengePoint, DoneLogicalChunkNumber);
-				case Stage.Calculating:
-					return new ScavengeCheckpoint.Calculating<TStreamId>(ScavengePoint, DoneStreamHandle);
-				case Stage.ExecutingChunks:
-					return new ScavengeCheckpoint.ExecutingChunks(ScavengePoint, DoneLogicalChunkNumber);
-				case Stage.MergingChunks:
-					return new ScavengeCheckpoint.MergingChunks(ScavengePoint);
-				case Stage.ExecutingIndex:
-					return new ScavengeCheckpoint.ExecutingIndex(ScavengePoint);
-				case Stage.Cleaning:
-					return new ScavengeCheckpoint.Cleaning(ScavengePoint);
-				case Stage.Done:
-					return new ScavengeCheckpoint.Done(ScavengePoint);
-				default:
-					throw new ArgumentOutOfRangeException(
-						nameof(CheckpointStage),
-						CheckpointStage,
-						null);
-			}
-		}
-
-		private static ScavengeCheckpointJsonPersistence<TStreamId> ToDto(ScavengeCheckpoint checkpoint) {
-			var dto = new ScavengeCheckpointJsonPersistence<TStreamId> {
-				SchemaVersion = Version.V0,
-				ScavengePoint = checkpoint.ScavengePoint,
-			};
-
-			switch (checkpoint) {
-				case ScavengeCheckpoint.Accumulating x:
-					dto.CheckpointStage = Stage.Accumulating;
-					dto.DoneLogicalChunkNumber = x.DoneLogicalChunkNumber;
-					break;
-
-				case ScavengeCheckpoint.Calculating<TStreamId> x:
-					dto.CheckpointStage = Stage.Calculating;
-					dto.DoneStreamHandle = x.DoneStreamHandle;
-					break;
-
-				case ScavengeCheckpoint.ExecutingChunks x:
-					dto.CheckpointStage = Stage.ExecutingChunks;
-					dto.DoneLogicalChunkNumber = x.DoneLogicalChunkNumber;
-					break;
-
-				case ScavengeCheckpoint.MergingChunks _:
-					dto.CheckpointStage = Stage.MergingChunks;
-					break;
-
-				case ScavengeCheckpoint.ExecutingIndex _:
-					dto.CheckpointStage = Stage.ExecutingIndex;
-					break;
-
-				case ScavengeCheckpoint.Cleaning _:
-					dto.CheckpointStage = Stage.Cleaning;
-					break;
-
-				case ScavengeCheckpoint.Done _:
-					dto.CheckpointStage = Stage.Done;
-					break;
-
-				default:
-					throw new ArgumentOutOfRangeException(
-						nameof(checkpoint),
-						checkpoint,
-						null);
-			}
-
-			return dto;
-		}
-
-		public static bool TryDeserialize(string input, out ScavengeCheckpoint checkpoint) {
-			try {
-				var dto = JsonConvert.DeserializeObject<ScavengeCheckpointJsonPersistence<TStreamId>>(
-					input,
-					Json.JsonSettings);
-				checkpoint = dto.ToDomain();
-				return checkpoint != null;
-			} catch {
-				// no op
-			}
-
-			checkpoint = default;
-			return false;
-		}
-
-		public static string Serialize(ScavengeCheckpoint checkpoint) {
-			var dto = ToDto(checkpoint);
-			return JsonConvert.SerializeObject(dto, Json.JsonSettings);
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/ScavengeState.cs b/src/EventStore.Core/TransactionLog/Scavenging/ScavengeState.cs
deleted file mode 100644
index 084c1bb754f..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/ScavengeState.cs
+++ /dev/null
@@ -1,374 +0,0 @@
-using System.Collections.Generic;
-using System;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Data;
-using EventStore.Core.DataStructures;
-using System.Linq;
-using Serilog;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	// This datastructure is read and written to by the Accumulator/Calculator/Executors.
-	// They contain the scavenge logic, this is just the holder of the data.
-	//
-	// we store data for metadata streams and for original streams, but we need to store
-	// different data for each so we have two maps. we have one collision detector since
-	// we need to detect collisions between all of the streams.
-	// we don't need to store data for every original stream, only ones that need scavenging.
-	public class ScavengeState<TStreamId> : IScavengeState<TStreamId> {
-		private bool _initialized;
-		private IScavengeStateBackend<TStreamId> _backend;
-		private readonly ObjectPool<IScavengeStateBackend<TStreamId>> _backendPool;
-		private readonly int _hashUsersCacheCapacity;
-		private CollisionDetector<TStreamId> _collisionDetector;
-
-		// data stored keyed against metadata streams
-		private MetastreamCollisionMap<TStreamId> _metastreamDatas;
-
-		// data stored keyed against original (non-metadata) streams
-		private OriginalStreamCollisionMap<TStreamId> _originalStreamDatas;
-
-		private IScavengeMap<int, ChunkTimeStampRange> _chunkTimeStampRanges;
-		private IChunkWeightScavengeMap _chunkWeights;
-		private IScavengeMap<Unit, ScavengeCheckpoint> _checkpointStorage;
-		private ITransactionManager _transactionManager;
-
-		private readonly ILogger _logger;
-		private readonly ILongHasher<TStreamId> _hasher;
-		private readonly IMetastreamLookup<TStreamId> _metastreamLookup;
-
-		public ScavengeState(
-			ILogger logger,
-			ILongHasher<TStreamId> hasher,
-			IMetastreamLookup<TStreamId> metastreamLookup,
-			ObjectPool<IScavengeStateBackend<TStreamId>> backendPool,
-			int hashUsersCacheCapacity) {
-
-			_logger = logger;
-			_hasher = hasher;
-			_metastreamLookup = metastreamLookup;
-			_backendPool = backendPool;
-			_hashUsersCacheCapacity = hashUsersCacheCapacity;
-		}
-
-		public void Init() {
-			if (_initialized)
-				return;
-
-			_initialized = true;
-			_backend = _backendPool.Get();
-
-			// todo: in log v3 inject an implementation that doesn't store hash users
-			// since there are no collisions.
-			_collisionDetector = new CollisionDetector<TStreamId>(
-				logger: _logger,
-				hashUsers: new LruCachingScavengeMap<ulong, TStreamId>(
-					"HashUsers",
-					_backend.Hashes,
-					cacheMaxCount: _hashUsersCacheCapacity),
-				collisionStorage: _backend.CollisionStorage,
-				hasher: _hasher);
-
-			_checkpointStorage = _backend.CheckpointStorage;
-
-			_metastreamDatas = new MetastreamCollisionMap<TStreamId>(
-				_hasher,
-				_collisionDetector.IsCollision,
-				_backend.MetaStorage,
-				_backend.MetaCollisionStorage);
-
-			_originalStreamDatas = new OriginalStreamCollisionMap<TStreamId>(
-				_hasher,
-				_collisionDetector.IsCollision,
-				_backend.OriginalStorage,
-				_backend.OriginalCollisionStorage);
-
-			_chunkTimeStampRanges = _backend.ChunkTimeStampRanges;
-			_chunkWeights = _backend.ChunkWeights;
-
-			_transactionManager = _backend.TransactionManager;
-			_transactionManager.RegisterOnRollback(OnRollback);
-		}
-
-		public void Dispose() {
-			_transactionManager?.UnregisterOnRollback();
-			if (_backend != null)
-				_backendPool.Return(_backend);
-			_backendPool.Dispose();
-		}
-
-		private void OnRollback() {
-			// a transaction has been rolled back
-			// need to clear whatever we think we know about collisions to stop us mistaking a new
-			// collision for an old one.
-			_collisionDetector.ClearCaches();
-
-			// there is no need to clear the HashUsers LRU cache
-		}
-
-		public void LogStats() {
-			_backend.LogStats();
-		}
-
-		// reuses the same transaction object for multiple transactions.
-		// caller is reponsible for committing, rolling back, or disposing
-		// the transaction before calling BeginTransaction again
-		public ITransactionCompleter BeginTransaction() {
-			_transactionManager.Begin();
-			return _transactionManager;
-		}
-
-		public bool TryGetCheckpoint(out ScavengeCheckpoint checkpoint) =>
-			_checkpointStorage.TryGetValue(Unit.Instance, out checkpoint);
-
-		public IEnumerable<TStreamId> AllCollisions() {
-			return _collisionDetector.AllCollisions();
-		}
-
-		public bool TryGetOriginalStreamData(
-			TStreamId streamId,
-			out OriginalStreamData originalStreamData) =>
-
-			_originalStreamDatas.TryGetValue(streamId, out originalStreamData);
-
-		//
-		// FOR ACCUMULATOR
-		//
-
-		public void DetectCollisions(TStreamId streamId) {
-			var collisionResult = _collisionDetector.DetectCollisions(
-				streamId,
-				out var collision);
-
-			if (collisionResult == CollisionResult.NewCollision) {
-				_logger.Information(
-					"SCAVENGING: Detected collision between streams \"{streamId}\" and \"{previous}\"",
-					streamId, collision);
-
-				_metastreamDatas.NotifyCollision(collision);
-				_originalStreamDatas.NotifyCollision(collision);
-			}
-		}
-
-		public void SetMetastreamDiscardPoint(TStreamId metastreamId, DiscardPoint discardPoint) {
-			_metastreamDatas.SetDiscardPoint(metastreamId, discardPoint);
-		}
-
-		public void SetMetastreamTombstone(TStreamId metastreamId) {
-			_metastreamDatas.SetTombstone(metastreamId);
-		}
-
-		public void SetOriginalStreamMetadata(TStreamId originalStreamId, StreamMetadata metadata) {
-			_originalStreamDatas.SetMetadata(originalStreamId, metadata);
-		}
-
-		public void SetOriginalStreamTombstone(TStreamId originalStreamId) {
-			_originalStreamDatas.SetTombstone(originalStreamId);
-		}
-
-		public void SetChunkTimeStampRange(int logicalChunkNumber, ChunkTimeStampRange range) {
-			_chunkTimeStampRanges[logicalChunkNumber] = range;
-		}
-
-		public StreamHandle<TStreamId> GetStreamHandle(TStreamId streamId) =>
-			_collisionDetector.IsCollision(streamId) ?
-				StreamHandle.ForStreamId(streamId) :
-				StreamHandle.ForHash<TStreamId>(_hasher.Hash(streamId));
-
-		public void LogAccumulationStats() {
-			LogStats();
-			_collisionDetector.LogStats();
-		}
-
-		//
-		// FOR CALCULATOR
-		//
-
-		public IEnumerable<(StreamHandle<TStreamId>, OriginalStreamData)> OriginalStreamsToCalculate(
-			StreamHandle<TStreamId> checkpoint) {
-
-			return _originalStreamDatas.EnumerateActive(checkpoint);
-		}
-
-		public void SetOriginalStreamDiscardPoints(
-			StreamHandle<TStreamId> handle,
-			CalculationStatus status,
-			DiscardPoint discardPoint,
-			DiscardPoint maybeDiscardPoint) {
-
-			_originalStreamDatas.SetDiscardPoints(handle, status, discardPoint, maybeDiscardPoint);
-		}
-
-		public void IncreaseChunkWeight(int logicalChunkNumber, float extraWeight) {
-			_chunkWeights.IncreaseWeight(logicalChunkNumber, extraWeight);
-		}
-
-		public bool TryGetChunkTimeStampRange(int logicalChunkNumber, out ChunkTimeStampRange range) =>
-			_chunkTimeStampRanges.TryGetValue(logicalChunkNumber, out range);
-
-		public TStreamId LookupUniqueHashUser(ulong streamHash) =>
-			_collisionDetector.LookupUniqueHashUser(streamHash);
-
-		//
-		// FOR CHUNK EXECUTOR
-		//
-
-		// not guaranteed to be thread safe. allocations and queries, dont call this too often.
-		public IScavengeStateForChunkExecutorWorker<TStreamId> BorrowStateForWorker() {
-			var backend = _backendPool.Get();
-
-			var state = new ScavengeStateForChunkWorker<TStreamId>(
-				hasher: _hasher,
-				backend: backend,
-				collisions: AllCollisions().ToDictionary(x => x, x => Unit.Instance),
-				onDispose: () => _backendPool.Return(backend));
-			return state;
-		}
-
-		public float SumChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber) =>
-			_chunkWeights.SumChunkWeights(startLogicalChunkNumber, endLogicalChunkNumber);
-
-		public void ResetChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber) {
-			_chunkWeights.ResetChunkWeights(startLogicalChunkNumber, endLogicalChunkNumber);
-		}
-
-		public bool TryGetChunkExecutionInfo(
-			TStreamId streamId,
-			out ChunkExecutionInfo info) =>
-
-			_originalStreamDatas.TryGetChunkExecutionInfo(streamId, out info);
-
-		public bool TryGetMetastreamData(TStreamId streamId, out MetastreamData data) =>
-			_metastreamDatas.TryGetValue(streamId, out data);
-
-		//
-		// FOR INDEX EXECUTOR
-		//
-
-		public bool TryGetIndexExecutionInfo(
-			StreamHandle<TStreamId> handle,
-			out IndexExecutionInfo info) {
-
-			// here we know that the handle is of the correct kind
-			// but we do not know whether it is for a metastream or an originalstream.
-			switch (handle.Kind) {
-				case StreamHandle.Kind.Hash:
-					// not a collision, but we do not know whether it is a metastream or not.
-					// check both maps (better if we didnt have to though..)
-					return TryGetDiscardPointForOriginalStream(handle, out info)
-						|| TryGetDiscardPointForMetadataStream(handle, out info);
-				case StreamHandle.Kind.Id:
-					// collision, but at least we can tell whether it is a metastream or not.
-					// so just check one map.
-					return _metastreamLookup.IsMetaStream(handle.StreamId)
-						? TryGetDiscardPointForMetadataStream(handle, out info)
-						: TryGetDiscardPointForOriginalStream(handle, out info);
-				default:
-					throw new ArgumentOutOfRangeException(nameof(handle), handle, null);
-			}
-		}
-
-		private bool TryGetDiscardPointForMetadataStream(
-			StreamHandle<TStreamId> handle,
-			out IndexExecutionInfo info) {
-
-			if (!_metastreamDatas.TryGetValue(handle, out var data)) {
-				info = default;
-				return false;
-			}
-
-			info = new IndexExecutionInfo(
-				isMetastream: true,
-				isTombstoned: data.IsTombstoned,
-				discardPoint: data.DiscardPoint);
-			return true;
-		}
-
-		private bool TryGetDiscardPointForOriginalStream(
-			StreamHandle<TStreamId> handle,
-			out IndexExecutionInfo info) {
-
-			if (!_originalStreamDatas.TryGetValue(handle, out var data)) {
-				info = default;
-				return false;
-			}
-
-			info = new IndexExecutionInfo(
-				isMetastream: false,
-				isTombstoned: data.IsTombstoned,
-				discardPoint: data.DiscardPoint);
-			return true;
-		}
-
-		public bool IsCollision(ulong streamHash) {
-			return _collisionDetector.IsCollisionHash(streamHash);
-		}
-
-		//
-		// For cleaner
-		//
-
-		public bool AllChunksExecuted() =>
-			_chunkWeights.AllWeightsAreZero();
-
-		public void DeleteOriginalStreamData(bool deleteArchived) {
-			_originalStreamDatas.DeleteMany(deleteArchived: deleteArchived);
-		}
-
-		public void DeleteMetastreamData() {
-			_metastreamDatas.DeleteAll();
-		}
-	}
-
-
-	// in the chunk executor each worker gets its own state so that it has its own dbconnection and
-	// prepared commands.
-	public struct ScavengeStateForChunkWorker<TStreamId> : 
-		IScavengeStateForChunkExecutorWorker<TStreamId>{
-
-		private readonly MetastreamCollisionMap<TStreamId> _metastreamDatas;
-		private readonly OriginalStreamCollisionMap<TStreamId> _originalStreamDatas;
-		private readonly IChunkWeightScavengeMap _chunkWeights;
-		private readonly Action _onDispose;
-
-		public ScavengeStateForChunkWorker(
-			ILongHasher<TStreamId> hasher,
-			IScavengeStateBackend<TStreamId> backend,
-			Dictionary<TStreamId, Unit> collisions,
-			Action onDispose) {
-
-			_metastreamDatas = new MetastreamCollisionMap<TStreamId>(
-				hasher,
-				collisions.ContainsKey,
-				backend.MetaStorage,
-				backend.MetaCollisionStorage);
-
-			_originalStreamDatas = new OriginalStreamCollisionMap<TStreamId>(
-				hasher,
-				collisions.ContainsKey,
-				backend.OriginalStorage,
-				backend.OriginalCollisionStorage);
-
-			_chunkWeights = backend.ChunkWeights;
-
-			_onDispose = onDispose;
-		}
-
-		public float SumChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber) =>
-			_chunkWeights.SumChunkWeights(startLogicalChunkNumber, endLogicalChunkNumber);
-
-		public void ResetChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber) {
-			_chunkWeights.ResetChunkWeights(startLogicalChunkNumber, endLogicalChunkNumber);
-		}
-
-		public bool TryGetChunkExecutionInfo(TStreamId streamId, out ChunkExecutionInfo info) =>
-			_originalStreamDatas.TryGetChunkExecutionInfo(streamId, out info);
-
-		public bool TryGetMetastreamData(TStreamId streamId, out MetastreamData data) =>
-			_metastreamDatas.TryGetValue(streamId, out data);
-
-		public void Dispose() {
-			_onDispose();
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/ScavengeStateExtensions.cs b/src/EventStore.Core/TransactionLog/Scavenging/ScavengeStateExtensions.cs
deleted file mode 100644
index bdff93d69a2..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/ScavengeStateExtensions.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public static class ScavengeStateExtensions {
-		public static void SetCheckpoint(
-			this IScavengeStateCommon state,
-			ScavengeCheckpoint checkpoint) {
-
-			var transaction = state.BeginTransaction();
-			try {
-				transaction.Commit(checkpoint);
-			} catch {
-				transaction.Rollback();
-				throw;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/ScavengeStatusTracker.cs b/src/EventStore.Core/TransactionLog/Scavenging/ScavengeStatusTracker.cs
deleted file mode 100644
index 968ffc4e629..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/ScavengeStatusTracker.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using EventStore.Core.Metrics;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public interface IScavengeStatusTracker {
-		IDisposable StartActivity(string name);
-	}
-
-	public class ScavengeStatusTracker : IScavengeStatusTracker {
-		private static ActivityStatusSubMetric _subMetric;
-
-		public ScavengeStatusTracker(StatusMetric metric) {
-			_subMetric = new("Scavenge", metric);
-		}
-
-		public IDisposable StartActivity(string name) =>
-			_subMetric?.StartActivity(name + " Phase");
-
-		public class NoOp : IScavengeStatusTracker {
-			public IDisposable StartActivity(string name) => null;
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Scavenger.cs b/src/EventStore.Core/TransactionLog/Scavenging/Scavenger.cs
deleted file mode 100644
index 34fd0c7190f..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Scavenger.cs
+++ /dev/null
@@ -1,368 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-using DotNext.Runtime.CompilerServices;
-using EventStore.Core.Data;
-using EventStore.Core.TransactionLog.Chunks;
-using Serilog;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class Scavenger<TStreamId> : IScavenger {
-		private readonly ILogger _logger;
-		private readonly Action _checkPreconditions;
-		private readonly IScavengeState<TStreamId> _state;
-		private readonly IAccumulator<TStreamId> _accumulator;
-		private readonly ICalculator<TStreamId> _calculator;
-		private readonly IChunkExecutor<TStreamId> _chunkExecutor;
-		private readonly IChunkMerger _chunkMerger;
-		private readonly IIndexExecutor<TStreamId> _indexExecutor;
-		private readonly ICleaner _cleaner;
-		private readonly IScavengePointSource _scavengePointSource;
-		private readonly ITFChunkScavengerLog _scavengerLogger;
-		private readonly IScavengeStatusTracker _statusTracker;
-		private readonly int _thresholdForNewScavenge;
-		private readonly bool _syncOnly;
-		private readonly Func<string> _getThrottleStats;
-
-		private readonly Dictionary<string, TimeSpan> _recordedTimes =
-			new Dictionary<string, TimeSpan>();
-
-		public Scavenger(
-			ILogger logger,
-			Action checkPreconditions,
-			IScavengeState<TStreamId> state,
-			IAccumulator<TStreamId> accumulator,
-			ICalculator<TStreamId> calculator,
-			IChunkExecutor<TStreamId> chunkExecutor,
-			IChunkMerger chunkMerger,
-			IIndexExecutor<TStreamId> indexExecutor,
-			ICleaner cleaner,
-			IScavengePointSource scavengePointSource,
-			ITFChunkScavengerLog scavengerLogger,
-			IScavengeStatusTracker statusTracker,
-			int thresholdForNewScavenge,
-			bool syncOnly,
-			Func<string> getThrottleStats) {
-
-			_logger = logger;
-			_checkPreconditions = checkPreconditions;
-			_state = state;
-			_accumulator = accumulator;
-			_calculator = calculator;
-			_chunkExecutor = chunkExecutor;
-			_chunkMerger = chunkMerger;
-			_indexExecutor = indexExecutor;
-			_cleaner = cleaner;
-			_scavengePointSource = scavengePointSource;
-			_scavengerLogger = scavengerLogger;
-			_statusTracker = statusTracker;
-			_thresholdForNewScavenge = thresholdForNewScavenge;
-			_syncOnly = syncOnly;
-			_getThrottleStats = getThrottleStats;
-		}
-
-		public string ScavengeId => _scavengerLogger.ScavengeId;
-
-		public void Dispose() {
-			_state.Dispose();
-		}
-
-		// following old scavenging design the returned task must complete successfully
-		[AsyncMethodBuilder(typeof(SpawningAsyncTaskMethodBuilder<>))] // get off the main queue
-		public async Task<ScavengeResult> ScavengeAsync(CancellationToken cancellationToken) {
-			_recordedTimes.Clear();
-			var stopwatch = Stopwatch.StartNew();
-			var result = ScavengeResult.Success;
-			string error = null;
-			try {
-				_logger.Debug("SCAVENGING: Scavenge Initializing State.");
-				_state.Init();
-				_state.LogStats();
-				_logger.Debug("SCAVENGING: Scavenge Started.");
-				LogCollisions();
-
-				_scavengerLogger.ScavengeStarted();
-
-				await RunInternal(_scavengerLogger, stopwatch, cancellationToken);
-
-				_logger.Debug(
-					"SCAVENGING: Scavenge Completed. Total time taken: {elapsed}. Total space saved: {spaceSaved}.",
-					stopwatch.Elapsed, _scavengerLogger.SpaceSaved);
-
-			} catch (OperationCanceledException) {
-				_logger.Information("SCAVENGING: Scavenge Stopped. Total time taken: {elapsed}.",
-					stopwatch.Elapsed);
-				result = ScavengeResult.Stopped;
-			} catch (Exception exc) {
-				result = ScavengeResult.Errored;
-				_logger.Error(exc, "SCAVENGING: Scavenge Failed. Total time taken: {elapsed}.",
-					stopwatch.Elapsed);
-				error = string.Format("Error while scavenging DB: {0}.", exc.Message);
-			} finally {
-				try {
-					_scavengerLogger.ScavengeCompleted(result, error, stopwatch.Elapsed);
-					LogCollisions();
-					LogTimes();
-				} catch (Exception ex) {
-					_logger.Error(
-						ex,
-						"SCAVENGING: Error whilst recording scavenge completed. " +
-						"Scavenge result: {result}, Elapsed: {elapsed}, Original error: {e}",
-						result, stopwatch.Elapsed, error);
-				}
-			}
-
-			return result;
-		}
-
-		private void LogCollisions() {
-			var collisions = _state.AllCollisions().ToArray();
-			_logger.Debug("SCAVENGING: {count} KNOWN COLLISIONS", collisions.Length);
-
-			foreach (var collision in collisions) {
-				_logger.Debug("SCAVENGING: KNOWN COLLISION: \"{collision}\"", collision);
-			}
-		}
-
-		private async Task RunInternal(
-			ITFChunkScavengerLog scavengerLogger,
-			Stopwatch stopwatch,
-			CancellationToken cancellationToken) {
-
-			_checkPreconditions();
-
-			// each component can be started with either
-			//  (i) a checkpoint that it wrote previously (it will continue from there)
-			//  (ii) fresh from a given scavengepoint
-			//
-			// so if we have a checkpoint from a component, start the scavenge by passing the checkpoint
-			// into that component and then starting each subsequent component fresh for that
-			// scavengepoint.
-			//
-			// otherwise, start the whole scavenge fresh from whichever scavengepoint is applicable.
-			if (!_state.TryGetCheckpoint(out var checkpoint)) {
-				// there is no checkpoint, so this is the first scavenge of this scavenge state
-				// (not necessarily the first scavenge of this database, old scavenged may have been run
-				// or new scavenges run and the scavenge state deleted)
-				_logger.Debug("SCAVENGING: Started a new scavenge with no checkpoint");
-				await StartNewAsync(
-					prevScavengePoint: null,
-					scavengerLogger,
-					stopwatch,
-					cancellationToken);
-
-			} else if (checkpoint is ScavengeCheckpoint.Done done) {
-				// start of a subsequent scavenge.
-				_logger.Debug("SCAVENGING: Started a new scavenge after checkpoint {checkpoint}", checkpoint);
-				await StartNewAsync(
-					prevScavengePoint: done.ScavengePoint,
-					scavengerLogger,
-					stopwatch,
-					cancellationToken);
-
-			} else {
-				// the other cases are continuing an incomplete scavenge
-				_logger.Debug("SCAVENGING: Continuing a scavenge from {checkpoint}", checkpoint);
-
-				if (checkpoint is ScavengeCheckpoint.Accumulating accumulating) {
-					await Time(stopwatch, "Accumulation", cancellationToken => {
-						_accumulator.Accumulate(accumulating, _state, cancellationToken);
-						return ValueTask.CompletedTask;
-					}, cancellationToken);
-					await AfterAccumulation(
-						accumulating.ScavengePoint, scavengerLogger, stopwatch, cancellationToken);
-
-				} else if (checkpoint is ScavengeCheckpoint.Calculating<TStreamId> calculating) {
-					await Time(stopwatch, "Calculation", cancellationToken => {
-						_calculator.Calculate(calculating, _state, cancellationToken);
-						return ValueTask.CompletedTask;
-					}, cancellationToken);
-					await AfterCalculation(
-						calculating.ScavengePoint, scavengerLogger, stopwatch, cancellationToken);
-
-				} else if (checkpoint is ScavengeCheckpoint.ExecutingChunks executingChunks) {
-					await Time(stopwatch, "Chunk execution", cancellationToken =>
-						_chunkExecutor.Execute(executingChunks, _state, scavengerLogger, cancellationToken),
-						cancellationToken);
-					await AfterChunkExecution(
-						executingChunks.ScavengePoint, scavengerLogger, stopwatch, cancellationToken);
-
-				} else if (checkpoint is ScavengeCheckpoint.MergingChunks mergingChunks) {
-					await Time(stopwatch, "Chunk merging", cancellationToken =>
-						_chunkMerger.MergeChunks(mergingChunks, _state, scavengerLogger, cancellationToken),
-						cancellationToken);
-					await AfterChunkMerging(
-						mergingChunks.ScavengePoint, scavengerLogger, stopwatch, cancellationToken);
-
-				} else if (checkpoint is ScavengeCheckpoint.ExecutingIndex executingIndex) {
-					await Time(stopwatch, "Index execution", cancellationToken => {
-						_indexExecutor.Execute(executingIndex, _state, scavengerLogger, cancellationToken);
-						return ValueTask.CompletedTask;
-					}, cancellationToken);
-					await AfterIndexExecution(
-						executingIndex.ScavengePoint, stopwatch, cancellationToken);
-
-				} else if (checkpoint is ScavengeCheckpoint.Cleaning cleaning) {
-					await Time(stopwatch, "Cleaning", cancellationToken => {
-						_cleaner.Clean(cleaning, _state, cancellationToken);
-						return ValueTask.CompletedTask;
-					}, cancellationToken);
-					AfterCleaning(cleaning.ScavengePoint);
-
-				} else {
-					throw new Exception($"Unexpected checkpoint: {checkpoint}");
-				}
-			}
-		}
-
-		private async ValueTask Time(Stopwatch stopwatch, string name, Func<CancellationToken, ValueTask> f, CancellationToken token) {
-			using var _ = _statusTracker.StartActivity(name);
-			_logger.Debug("SCAVENGING: Scavenge " + name + " Phase Started.");
-			var start = stopwatch.Elapsed;
-			await f(token);
-			var elapsed = stopwatch.Elapsed - start;
-			_state.LogStats();
-			_logger.Debug($"SCAVENGING: {_getThrottleStats()}");
-			_logger.Debug("SCAVENGING: Scavenge " + name + " Phase Completed. Took {elapsed}.", elapsed);
-			_recordedTimes[name] = elapsed;
-		}
-
-		private void LogTimes() {
-			foreach (var key in _recordedTimes.Keys.OrderBy(x => x)) {
-				_logger.Debug("SCAVENGING: {name} took {elapsed}", key, _recordedTimes[key]);
-			}
-		}
-
-		private async Task StartNewAsync(
-			ScavengePoint prevScavengePoint,
-			ITFChunkScavengerLog scavengerLogger,
-			Stopwatch stopwatch,
-			CancellationToken cancellationToken) {
-
-			// prevScavengePoint is the previous one that was completed
-			// latestScavengePoint is the latest one in the database
-			// nextScavengePoint is the one we are about to scavenge up to
-
-			ScavengePoint nextScavengePoint;
-			var latestScavengePoint = await _scavengePointSource
-				.GetLatestScavengePointOrDefaultAsync(cancellationToken);
-			if (latestScavengePoint == null) {
-				if (_syncOnly) {
-					_logger.Debug("SCAVENGING: No existing scavenge point to sync with, nothing to do.");
-					return;
-				} else {
-					_logger.Debug("SCAVENGING: Creating the first scavenge point.");
-					// no latest scavenge point, create the first one
-					nextScavengePoint = await _scavengePointSource
-						.AddScavengePointAsync(
-							ExpectedVersion.NoStream,
-							threshold: _thresholdForNewScavenge,
-							cancellationToken);
-				}
-			} else {
-				// got the latest scavenge point
-				if (prevScavengePoint == null ||
-					prevScavengePoint.EventNumber < latestScavengePoint.EventNumber) {
-					// the latest scavengepoint is suitable
-					_logger.Debug(
-						"SCAVENGING: Using existing scavenge point {scavengePointNumber}",
-						latestScavengePoint.EventNumber);
-					nextScavengePoint = latestScavengePoint;
-				} else {
-					if (_syncOnly) {
-						_logger.Debug("SCAVENGING: No existing scavenge point to sync with, nothing to do.");
-						return;
-					} else {
-						// the latest scavengepoint is the prev scavenge point, so create a new one
-						var expectedVersion = prevScavengePoint.EventNumber;
-						_logger.Debug(
-							"SCAVENGING: Creating the next scavenge point: {scavengePointNumber}",
-							expectedVersion + 1);
-
-						nextScavengePoint = await _scavengePointSource
-							.AddScavengePointAsync(
-								expectedVersion,
-								threshold: _thresholdForNewScavenge,
-								cancellationToken);
-					}
-				}
-			}
-
-			// we now have a nextScavengePoint.
-			await Time(stopwatch, "Accumulation", cancellationToken => {
-				_accumulator.Accumulate(prevScavengePoint, nextScavengePoint, _state, cancellationToken);
-				return ValueTask.CompletedTask;
-			}, cancellationToken);
-			await AfterAccumulation(nextScavengePoint, scavengerLogger, stopwatch, cancellationToken);
-		}
-
-		private async ValueTask AfterAccumulation(
-			ScavengePoint scavengepoint,
-			ITFChunkScavengerLog scavengerLogger,
-			Stopwatch stopwatch,
-			CancellationToken cancellationToken) {
-
-			LogCollisions();
-			await Time(stopwatch, "Calculation", cancellationToken => {
-				_calculator.Calculate(scavengepoint, _state, cancellationToken);
-				return ValueTask.CompletedTask;
-			}, cancellationToken);
-			await AfterCalculation(scavengepoint, scavengerLogger, stopwatch, cancellationToken);
-		}
-
-		private async ValueTask AfterCalculation(
-			ScavengePoint scavengePoint,
-			ITFChunkScavengerLog scavengerLogger,
-			Stopwatch stopwatch,
-			CancellationToken cancellationToken) {
-
-			await Time(stopwatch, "Chunk execution", cancellationToken =>
-				_chunkExecutor.Execute(scavengePoint, _state, scavengerLogger, cancellationToken), cancellationToken);
-			await AfterChunkExecution(scavengePoint, scavengerLogger, stopwatch, cancellationToken);
-		}
-
-		private async ValueTask AfterChunkExecution(
-			ScavengePoint scavengePoint,
-			ITFChunkScavengerLog scavengerLogger,
-			Stopwatch stopwatch,
-			CancellationToken cancellationToken) {
-
-			await Time(stopwatch, "Chunk merging", cancellationToken =>
-				_chunkMerger.MergeChunks(scavengePoint, _state, scavengerLogger, cancellationToken), cancellationToken);
-			await AfterChunkMerging(scavengePoint, scavengerLogger, stopwatch, cancellationToken);
-		}
-
-		private async ValueTask AfterChunkMerging(
-			ScavengePoint scavengePoint,
-			ITFChunkScavengerLog scavengerLogger,
-			Stopwatch stopwatch,
-			CancellationToken cancellationToken) {
-
-			await Time(stopwatch, "Index execution", cancellationToken => {
-				_indexExecutor.Execute(scavengePoint, _state, scavengerLogger, cancellationToken);
-				return ValueTask.CompletedTask;
-			}, cancellationToken);
-			await AfterIndexExecution(scavengePoint, stopwatch, cancellationToken);
-		}
-
-		private async ValueTask AfterIndexExecution(
-			ScavengePoint scavengePoint,
-			Stopwatch stopwatch,
-			CancellationToken cancellationToken) {
-
-			await Time(stopwatch, "Cleaning", cancellationToken => {
-				_cleaner.Clean(scavengePoint, _state, cancellationToken);
-				return ValueTask.CompletedTask;
-			}, cancellationToken);
-			AfterCleaning(scavengePoint);
-		}
-
-		private void AfterCleaning(ScavengePoint scavengePoint) {
-			_state.SetCheckpoint(new ScavengeCheckpoint.Done(scavengePoint));
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/IInitializeSqliteBackend.cs b/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/IInitializeSqliteBackend.cs
deleted file mode 100644
index 046d21f0f3b..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/IInitializeSqliteBackend.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace EventStore.Core.TransactionLog.Scavenging.Sqlite {
-	public interface IInitializeSqliteBackend {
-		void Initialize(SqliteBackend sqlite);
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteBackend.cs b/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteBackend.cs
deleted file mode 100644
index ced020bd54f..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteBackend.cs
+++ /dev/null
@@ -1,231 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using Microsoft.Data.Sqlite;
-using Serilog;
-using SQLitePCL;
-
-namespace EventStore.Core.TransactionLog.Scavenging.Sqlite {
-	public class SqliteBackend : IDisposable {
-		protected static readonly ILogger Log = Serilog.Log.ForContext<SqliteBackend>();
-		private readonly SqliteConnection _connection;
-		private SqliteTransaction _transaction;
-		private const int SqliteDuplicateKeyError = 19;
-
-		public const string CacheSize = "cache_size";
-		public const string PageCount = "page_count";
-		public const string PageSize = "page_size";
-		public const string Synchronous = "synchronous";
-		public const string JournalMode = "journal_mode";
-		public const string WalAutocheckpoint = "wal_autocheckpoint";
-
-		public SqliteBackend(SqliteConnection connection) {
-			_connection = connection;
-		}
-
-		public void Dispose() {
-			_connection.Close();
-			_connection.Dispose();
-		}
-
-		public void InitializeDb(string createSql) {
-			var createTableCmd = _connection.CreateCommand();
-			createTableCmd.CommandText = createSql;
-			createTableCmd.ExecuteNonQuery();
-		}
-
-		public SqliteCommand CreateCommand() {
-			return _connection.CreateCommand();
-		}
-
-		public bool ExecuteReadAndDelete<TValue>(SqliteCommand selectCmd, SqliteCommand deleteCmd,
-			Func<SqliteDataReader, TValue> getValue, out TValue value) {
-
-			if (ExecuteSingleRead(selectCmd, getValue, out value)) {
-				var affectedRows = ExecuteNonQuery(deleteCmd);
-				
-				if (affectedRows == 1) {
-					return true;
-				} 
-				if (affectedRows > 1) {
-					throw new SystemException("More values removed than expected!");
-				}
-			}
-
-			value = default;
-			return false;
-		}
-
-		public int ExecuteNonQuery(SqliteCommand cmd) {
-			try {
-				cmd.Transaction = _transaction;
-				return cmd.ExecuteNonQuery();
-			}
-			catch (SqliteException e) when (e.SqliteErrorCode == SqliteDuplicateKeyError) {
-				throw new ArgumentException();
-			}
-		}
-
-		public bool ExecuteSingleRead<TValue>(SqliteCommand cmd, Func<SqliteDataReader, TValue> getValue, out TValue value) {
-			cmd.Transaction = _transaction;
-			using (var reader = cmd.ExecuteReader()) {
-				if (reader.Read()) {
-					value = getValue(reader);
-					return true;
-				}
-			}
-			
-			value = default;
-			return false;
-		}
-
-		public IEnumerable<KeyValuePair<TKey, TValue>> ExecuteReader<TKey, TValue>(SqliteCommand cmd,
-			Func<SqliteDataReader, KeyValuePair<TKey, TValue>> toValue) {
-
-			cmd.Transaction = _transaction;
-			using (var reader = cmd.ExecuteReader()) {
-				while (reader.Read()) {
-					yield return toValue(reader);
-				}
-			}
-		}
-
-		public static T GetNullableFieldValue<T>(int ordinal, SqliteDataReader reader) {
-			if (!reader.IsDBNull(ordinal)) {
-				return reader.GetFieldValue<T>(ordinal);
-			}
-
-			return default;
-		}
-
-		public static TimeSpan? GetTimeSpanFromSeconds(int ordinal, SqliteDataReader reader) {
-			if (!reader.IsDBNull(ordinal)) {
-				return TimeSpan.FromSeconds(reader.GetFieldValue<long>(ordinal));
-			}
-
-			return null;
-		}
-		
-		public SqliteTransaction BeginTransaction() {
-			_transaction = _connection.BeginTransaction();
-			return _transaction;
-		}
-
-		public void ClearTransaction() {
-			_transaction = null;
-
-#if MANUAL_SQLITE_CHECKPOINT
-			// This forces the WAL to checkpoint and restart (or throws), which means all the pages in
-			// the WAL are written into the database and the WAL continues to write from the beginning of
-			// the file. Its purpose is to
-			//    1. Demonstrate that this is possible - i.e. no readers or anything else preventing
-			//       the wal from being restarted, which could, if consistent, result in a very large WAL
-			//    2. Collect some data about how many pages needed to be moved
-			//
-			// We leave it off in production because
-			//    1. We don't necessarily want to do this after every commit (although our commits are
-			//       quite coarse-grained)
-			//    2. It can fail (legitimately?) on rollback when a scavenge is cancelled. We'd perhaps
-			//       only want to call this on successful commit.
-			//    3. it doesn't reuse the command or stopwatch.
-			try {
-				var sw = Stopwatch.StartNew();
-				using var cmd = _connection.CreateCommand();
-				cmd.CommandText = "PRAGMA wal_checkpoint(RESTART)";
-				using var reader = cmd.ExecuteReader();
-				if (reader.Read()) {
-					var blocked = reader.GetInt32(0);
-					var pagesModified = reader.GetInt32(1);
-					var pagesMoved = reader.GetInt32(2);
-					Log.Debug(
-						"Checkpointed and restarted the WAL in {elapsed}. blocked?: {blocked}. {pagesModified} pages modified. {pagesMoved} pages moved.",
-						sw.Elapsed, blocked, pagesModified, pagesMoved);
-				} else {
-					var msg = "Could not read result when checkpointing and restarting the WAL";
-					Log.Error(msg);
-					throw new Exception(msg);
-				}
-			} catch (Exception ex) {
-				Log.Error(ex, "Failed to checkpoint and restart the WAL");
-				throw;
-			}
-#endif
-		}
-
-		public Stats GetStats() {
-			var databaseSize = long.Parse(GetPragmaValue(PageSize)) * long.Parse(GetPragmaValue(PageCount));
-			var cacheSize = SqliteCacheSize.FromPragmaValue(GetPragmaValue(CacheSize));
-			return new Stats(raw.sqlite3_memory_used(), databaseSize, cacheSize.CacheSizeInBytes);
-		}
-
-		public void SetPragmaValue(string name, string value) {
-			using (var cmd = _connection.CreateCommand()) {
-				cmd.CommandText = $"PRAGMA {name}={value}";
-				cmd.ExecuteNonQuery();
-			}
-		}
-		
-		public string GetPragmaValue(string name) {
-			var cmd = _connection.CreateCommand();
-			cmd.CommandText = "PRAGMA " + name;
-			var result = cmd.ExecuteScalar();
-			
-			if (result != null) {
-				return result.ToString();
-			}
-
-			throw new Exception("Unexpected pragma result!");
-		}
-
-		public void SetCacheSize(long cacheSizeInBytes) {
-			// cache size in kibi bytes is passed as a negative value, otherwise it's amount of pages
-			var cacheSize = new SqliteCacheSize(cacheSizeInBytes);
-			SetPragmaValue(CacheSize, cacheSize.NegativeKibibytes.ToString());
-			var currentCacheSize = long.Parse(GetPragmaValue(CacheSize));
-			if (currentCacheSize != cacheSize.NegativeKibibytes) {
-				throw new Exception($"Failed to configure cache size, unexpected value: {currentCacheSize}");
-			}
-		}
-		
-		public class Stats {
-			public Stats(long memoryUsage, long databaseSize, long cacheSize) {
-				MemoryUsage = memoryUsage;
-				DatabaseSize = databaseSize;
-				CacheSize = cacheSize;
-			}
-
-			public long MemoryUsage { get; }
-			public long DatabaseSize { get; }
-			public long CacheSize { get; }
-
-			public string PrettyPrint() {
-				var dbSizeMb = (float)DatabaseSize / 1_000_000;
-				var cacheSizeMb = (float)CacheSize / 1_000_000;
-				var memSizeMb = (float)MemoryUsage / 1_000_000;
-				return
-					$"ScavengeState size: {dbSizeMb:N2} MB. " +
-					$"Cache size: {cacheSizeMb:N2} MB. " +
-					$"Memory usage: {memSizeMb:N2} MB";
-			}
-		}
-
-		readonly struct SqliteCacheSize {
-			public SqliteCacheSize(long cacheSizeInBytes) {
-				CacheSizeInBytes = cacheSizeInBytes;
-			}
-
-			public static SqliteCacheSize FromPragmaValue(string value) {
-				var cacheSizeInKibiBytes = long.Parse(value);
-				return new SqliteCacheSize(-1 * cacheSizeInKibiBytes * 1024);
-			}
-
-			public long CacheSizeInBytes { get; }
-			public long NegativeKibibytes {
-				get {
-					var cacheSizeInKibiBytes = CacheSizeInBytes / 1024;
-					return -1 * cacheSizeInKibiBytes;
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteChunkTimeStampRangeScavengeMap.cs b/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteChunkTimeStampRangeScavengeMap.cs
deleted file mode 100644
index b69c772c661..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteChunkTimeStampRangeScavengeMap.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.Data.Sqlite;
-
-namespace EventStore.Core.TransactionLog.Scavenging.Sqlite {
-	public class SqliteChunkTimeStampRangeScavengeMap : IInitializeSqliteBackend, IScavengeMap<int, ChunkTimeStampRange> {
-		private AddCommand _add;
-		private GetCommand _get;
-		private DeleteCommand _delete;
-		private AllRecordsCommand _all;
-		private static Func<SqliteDataReader, ChunkTimeStampRange> _readChunkTimeStampRange;
-
-		private const string TableName = "ChunkTimeStampRanges";
-
-		public SqliteChunkTimeStampRangeScavengeMap() {
-			_readChunkTimeStampRange = reader => {
-				var min = new DateTime(reader.GetInt64(0), DateTimeKind.Utc);
-				var max = new DateTime(reader.GetInt64(1), DateTimeKind.Utc);
-				return new ChunkTimeStampRange(min, max);
-			};
-		}
-
-		public void Initialize(SqliteBackend sqlite) {
-			var sql = $@"
-				CREATE TABLE IF NOT EXISTS {TableName} (
-					key INTEGER PRIMARY KEY,
-					min INTEGER,
-					max INTEGER)";
-		
-			sqlite.InitializeDb(sql);
-
-			_add = new AddCommand(TableName, sqlite);
-			_get = new GetCommand(TableName, sqlite);
-			_delete = new DeleteCommand(TableName, sqlite);
-			_all = new AllRecordsCommand(TableName, sqlite);
-		}
-
-		public ChunkTimeStampRange this[int key] {
-			set => _add.Execute(key, value);
-		}
-
-		public bool TryGetValue(int key, out ChunkTimeStampRange value) {
-			return _get.TryExecute(key, out value);
-		}
-
-		public bool TryRemove(int key, out ChunkTimeStampRange value) {
-			return _delete.TryExecute(key, out value);
-		}
-
-		public IEnumerable<KeyValuePair<int, ChunkTimeStampRange>> AllRecords() {
-			return _all.Execute();
-		}
-
-		private class AddCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly SqliteParameter _keyParam;
-			private readonly SqliteParameter _minParam;
-			private readonly SqliteParameter _maxParam;
-
-			public AddCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $@"
-					INSERT INTO {tableName}
-					VALUES($key, $min, $max)
-					ON CONFLICT(key) DO UPDATE SET min=$min, max=$max";
-
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_keyParam = _cmd.Parameters.Add("$key", SqliteType.Integer);
-				_minParam = _cmd.Parameters.Add("$min", SqliteType.Integer);
-				_maxParam = _cmd.Parameters.Add("$max", SqliteType.Integer);
-				_cmd.Prepare();
-
-				_sqlite = sqlite;
-			}
-
-			public void Execute(int key, ChunkTimeStampRange value) {
-				_keyParam.Value = key;
-				_minParam.Value = value.Min.Ticks;
-				_maxParam.Value = value.Max.Ticks;
-				_sqlite.ExecuteNonQuery(_cmd);
-			}
-		}
-
-		private class GetCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly SqliteParameter _keyParam;
-
-			public GetCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $@"
-					SELECT min, max
-					FROM {tableName}
-					WHERE key = $key";
-				
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_keyParam = _cmd.Parameters.Add("$key", SqliteType.Integer);
-				_cmd.Prepare();
-				
-				_sqlite = sqlite;
-			}
-
-			public bool TryExecute(int key, out ChunkTimeStampRange value) {
-				_keyParam.Value = key;
-				return _sqlite.ExecuteSingleRead(_cmd, _readChunkTimeStampRange, out value);
-			}
-		}
-
-		private class DeleteCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _selectCmd;
-			private readonly SqliteCommand _deleteCmd;
-			private readonly SqliteParameter _selectKeyParam;
-			private readonly SqliteParameter _deleteKeyParam;
-
-			public DeleteCommand(string tableName, SqliteBackend sqlite) {
-				var selectSql = $@"
-					SELECT min, max
-					FROM {tableName}
-					WHERE key = $key";
-				
-				_selectCmd = sqlite.CreateCommand();
-				_selectCmd.CommandText = selectSql;
-				_selectKeyParam = _selectCmd.Parameters.Add("$key", SqliteType.Integer);
-				_selectCmd.Prepare();
-
-				var deleteSql = $@"
-					DELETE FROM {tableName}
-					WHERE key = $key";
-				
-				_deleteCmd = sqlite.CreateCommand();
-				_deleteCmd.CommandText = deleteSql;
-				_deleteKeyParam = _deleteCmd.Parameters.Add("$key", SqliteType.Integer);
-				_deleteCmd.Prepare();
-				
-				_sqlite = sqlite;
-			}
-
-			public bool TryExecute(int key, out ChunkTimeStampRange value) {
-				_selectKeyParam.Value = key;
-				_deleteKeyParam.Value = key;
-				return _sqlite.ExecuteReadAndDelete(_selectCmd, _deleteCmd, _readChunkTimeStampRange, out value);
-			}
-		}
-
-		private class AllRecordsCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly Func<SqliteDataReader, KeyValuePair<int, ChunkTimeStampRange>> _reader;
-
-			public AllRecordsCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $@"
-					SELECT min, max, key
-					FROM {tableName}
-					ORDER BY key";
-				
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_cmd.Prepare();
-				
-				_sqlite = sqlite;
-
-				_reader = reader => {
-					var chunkTimeStampRange = _readChunkTimeStampRange(reader);
-					var key = reader.GetFieldValue<int>(2);
-					return new KeyValuePair<int, ChunkTimeStampRange>(key, chunkTimeStampRange);
-				};
-			}
-
-			public IEnumerable<KeyValuePair<int, ChunkTimeStampRange>> Execute() {
-				return _sqlite.ExecuteReader(_cmd, _reader);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteChunkWeightScavengeMap.cs b/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteChunkWeightScavengeMap.cs
deleted file mode 100644
index 8adfd9101c5..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteChunkWeightScavengeMap.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-using System;
-using Microsoft.Data.Sqlite;
-
-namespace EventStore.Core.TransactionLog.Scavenging.Sqlite {
-	public class SqliteChunkWeightScavengeMap : SqliteScavengeMap<int, float>, IChunkWeightScavengeMap {
-		private IncreaseWeightCommand _increaseWeight;
-		private AllWeightsAreZeroCommand _allWeightsAreZero;
-		private SumChunkWeightsCommand _sumChunkWeights;
-		private ResetChunkWeightsCommand _resetChunkWeights;
-
-		private const string MapName = "ChunkWeights";
-
-		public SqliteChunkWeightScavengeMap() : base(MapName) { }
-
-		public override void Initialize(SqliteBackend sqlite) {
-			base.Initialize(sqlite);
-
-			_increaseWeight = new IncreaseWeightCommand(TableName, sqlite);
-			_allWeightsAreZero = new AllWeightsAreZeroCommand(TableName, sqlite);
-			_sumChunkWeights = new SumChunkWeightsCommand(TableName, sqlite);
-			_resetChunkWeights = new ResetChunkWeightsCommand(TableName, sqlite);
-		}
-
-		public bool AllWeightsAreZero() {
-			return _allWeightsAreZero.Execute();
-		}
-
-		public void IncreaseWeight(int logicalChunkNumber, float extraWeight) {
-			_increaseWeight.Execute(logicalChunkNumber, extraWeight);
-		}
-
-		public float SumChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber) {
-			return _sumChunkWeights.Execute(startLogicalChunkNumber, endLogicalChunkNumber);
-		}
-
-		public void ResetChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber) {
-			_resetChunkWeights.Execute(startLogicalChunkNumber, endLogicalChunkNumber);
-		}
-		
-		private class IncreaseWeightCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly SqliteParameter _keyParam;
-			private readonly SqliteParameter _valueParam;
-
-			public IncreaseWeightCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $@"
-					INSERT INTO {tableName} (key, value)
-					VALUES($key, $value)
-				    ON CONFLICT(key) DO UPDATE SET value=value+$value";
-				
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_keyParam = _cmd.Parameters.Add("$key", SqliteType.Integer);
-				_valueParam = _cmd.Parameters.Add("$value", SqliteType.Real);
-				_cmd.Prepare();
-				
-				_sqlite = sqlite;
-			}
-
-			public void Execute(int logicalChunkNumber, float extraWeight) {
-				_keyParam.Value = logicalChunkNumber;
-				_valueParam.Value = extraWeight;
-				_sqlite.ExecuteNonQuery(_cmd);
-			}
-		}
-
-		// All weights are zero if there do not exist any rows with a nonzero weight
-		private class AllWeightsAreZeroCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private Func<SqliteDataReader, bool> _reader;
-
-			public AllWeightsAreZeroCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $@"
-					SELECT EXISTS (
-						SELECT 1
-						FROM {tableName}
-						WHERE value <> 0
-					)";
-
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_cmd.Prepare();
-
-				_sqlite = sqlite;
-				_reader = reader => reader.GetBoolean(0);
-			}
-
-			public bool Execute() {
-				_sqlite.ExecuteSingleRead(_cmd, _reader, out var exists);
-				return !exists;
-			}
-		}
-
-		private class SumChunkWeightsCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly SqliteParameter _startParam;
-			private readonly SqliteParameter _endParam;
-			private Func<SqliteDataReader, float> _reader;
-
-			public SumChunkWeightsCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $@"
-					SELECT SUM(value)
-					FROM {tableName}
-					WHERE key BETWEEN $start AND $end";
-				
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_startParam = _cmd.Parameters.Add("$start", SqliteType.Integer);
-				_endParam = _cmd.Parameters.Add("$end", SqliteType.Integer);
-				_cmd.Prepare();
-				
-				_sqlite = sqlite;
-				_reader = reader => reader.IsDBNull(0) ? 0 : reader.GetFloat(0);
-			}
-
-			public float Execute(int startLogicalChunkNumber, int endLogicalChunkNumber) {
-				_startParam.Value = startLogicalChunkNumber;
-				_endParam.Value = endLogicalChunkNumber;
-				_sqlite.ExecuteSingleRead(_cmd, _reader, out var value);
-				return value;
-			}
-		}
-		
-		private class ResetChunkWeightsCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly SqliteParameter _startParam;
-			private readonly SqliteParameter _endParam;
-
-			public ResetChunkWeightsCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $"DELETE FROM {tableName} WHERE key BETWEEN $start AND $end";
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_startParam = _cmd.Parameters.Add("$start", SqliteType.Integer);
-				_endParam = _cmd.Parameters.Add("$end", SqliteType.Integer);
-				_cmd.Prepare();
-				
-				_sqlite = sqlite;
-			}
-
-			public void Execute(int startLogicalChunkNumber, int endLogicalChunkNumber) {
-				_startParam.Value = startLogicalChunkNumber;
-				_endParam.Value = endLogicalChunkNumber;
-				_sqlite.ExecuteNonQuery(_cmd);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteCollisionScavengeMap.cs b/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteCollisionScavengeMap.cs
deleted file mode 100644
index e4dfe0d96b8..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteCollisionScavengeMap.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.Data.Sqlite;
-
-namespace EventStore.Core.TransactionLog.Scavenging.Sqlite {
-	public class SqliteCollisionScavengeMap<TKey>: IInitializeSqliteBackend, IScavengeMap<TKey, Unit> {
-		private AddCommand _add;
-		private GetCommand _get;
-		private RemoveCommand _remove;
-		private AllRecordsCommand _all;
-
-		private const string TableName = "HashCollisions";
-
-		public void Initialize(SqliteBackend sqlite) {
-			var sql = $@"
-				CREATE TABLE IF NOT EXISTS {TableName} (
-					key {SqliteTypeMapping.GetTypeName<TKey>()} PRIMARY KEY)";
-			
-			sqlite.InitializeDb(sql);
-			
-			_add = new AddCommand(sqlite);
-			_get = new GetCommand(sqlite);
-			_all = new AllRecordsCommand(sqlite);
-			_remove = new RemoveCommand(sqlite);
-		}
-
-		public Unit this[TKey key] {
-			set => AddValue(key, value);
-		}
-
-		private void AddValue(TKey key, Unit _) {
-			_add.Execute(key);
-		}
-
-		public bool TryGetValue(TKey key, out Unit value) {
-			if (_get.TryExecute(key)) {
-				value = Unit.Instance;
-				return true;
-			}
-
-			return false;
-		}
-
-		public bool TryRemove(TKey key, out Unit value) {
-			if (_remove.TryExecute(key)) {
-				value = Unit.Instance;
-				return true;
-			}
-
-			return false;
-		}
-
-		public IEnumerable<KeyValuePair<TKey, Unit>> AllRecords() {
-			return _all.Execute();
-		}
-
-		private class AddCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly SqliteParameter _keyParam;
-
-			public AddCommand(SqliteBackend sqlite) {
-				var sql = $@"
-					INSERT INTO {TableName}
-					VALUES($key)
-					ON CONFLICT(key) DO UPDATE SET key=$key";
-				
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_cmd.Prepare();
-				
-				_sqlite = sqlite;
-			}
-
-			public void Execute(TKey key) {
-				_keyParam.Value = key;
-				_sqlite.ExecuteNonQuery(_cmd);
-			}
-		}
-		
-		private class GetCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly SqliteParameter _keyParam;
-			private readonly Func<SqliteDataReader, Unit> _reader;
-
-			public GetCommand(SqliteBackend sqlite) {
-				var sql = $@"
-					SELECT key
-					FROM {TableName}
-					WHERE key = $key";
-				
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_cmd.Prepare();
-				
-				_sqlite = sqlite;
-				_reader = reader => Unit.Instance;
-			}
-
-			public bool TryExecute(TKey key) {
-				_keyParam.Value = key;
-				return _sqlite.ExecuteSingleRead(_cmd, _reader, out _);
-			}
-		}
-		private class RemoveCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _selectCmd;
-			private readonly SqliteCommand _deleteCmd;
-			private readonly SqliteParameter _selectKeyParam;
-			private readonly SqliteParameter _deleteKeyParam;
-			private readonly Func<SqliteDataReader, Unit> _reader;
-
-			public RemoveCommand(SqliteBackend sqlite) {
-				_sqlite = sqlite;
-				_reader = reader => Unit.Instance;
-				
-				var selectSql = $@"
-					SELECT key
-					FROM {TableName}
-					WHERE key = $key";
-				
-				_selectCmd = sqlite.CreateCommand();
-				_selectCmd.CommandText = selectSql;
-				_selectKeyParam = _selectCmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_selectCmd.Prepare();
-
-				var deleteSql = $@"
-					DELETE FROM {TableName}
-					WHERE key = $key";
-				
-				_deleteCmd = sqlite.CreateCommand();
-				_deleteCmd.CommandText = deleteSql;
-				_deleteKeyParam = _deleteCmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_deleteCmd.Prepare();
-			}
-
-			public bool TryExecute(TKey key) {
-				_selectKeyParam.Value = key;
-				_deleteKeyParam.Value = key;
-				return _sqlite.ExecuteReadAndDelete(_selectCmd, _deleteCmd, _reader, out _);
-			}
-		}
-		
-		private class AllRecordsCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly Func<SqliteDataReader, KeyValuePair<TKey, Unit>> _reader;
-
-			public AllRecordsCommand(SqliteBackend sqlite) {
-				var sql = $@"
-					SELECT key
-					FROM {TableName}
-					ORDER BY key";
-
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_cmd.Prepare();
-				
-				_sqlite = sqlite;
-				_reader = reader => new KeyValuePair<TKey, Unit>(reader.GetFieldValue<TKey>(0), Unit.Instance);
-			}
-
-			public IEnumerable<KeyValuePair<TKey, Unit>> Execute() {
-				return _sqlite.ExecuteReader(_cmd, _reader);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteMetastreamScavengeMap.cs b/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteMetastreamScavengeMap.cs
deleted file mode 100644
index a2d9422501a..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteMetastreamScavengeMap.cs
+++ /dev/null
@@ -1,270 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.Data.Sqlite;
-
-namespace EventStore.Core.TransactionLog.Scavenging.Sqlite {
-	
-	public class SqliteMetastreamScavengeMap<TKey> : IInitializeSqliteBackend, IMetastreamScavengeMap<TKey> {
-		private readonly string _keyTypeOverride;
-		private AddCommand _add;
-		private SetTombstoneCommand _setTombstone;
-		private SetDiscardPointCommand _setDiscardPoint;
-		private GetCommand _get;
-		private DeleteCommand _delete;
-		private DeleteAllCommand _deleteAll;
-		private AllRecordsCommand _all;
-		private static Func<SqliteDataReader, MetastreamData> _readMetastreamData;
-
-		private string TableName { get; }
-
-		public SqliteMetastreamScavengeMap(string name, string keyTypeOverride = null) {
-			TableName = name;
-			_keyTypeOverride = keyTypeOverride;
-			_readMetastreamData = reader => {
-				var isTombstoned = reader.GetBoolean(0);
-				var discardPoint = DiscardPoint.KeepAll;
-				var discardPointField = SqliteBackend.GetNullableFieldValue<long?>(1, reader);
-				if (discardPointField.HasValue) {
-					discardPoint = DiscardPoint.DiscardBefore(discardPointField.Value);
-				}
-			
-				return new MetastreamData(isTombstoned, discardPoint);
-			};
-		}
-
-		public void Initialize(SqliteBackend sqlite) {
-			var keyType = _keyTypeOverride ?? SqliteTypeMapping.GetTypeName<TKey>();
-			var sql = $@"
-				CREATE TABLE IF NOT EXISTS {TableName} (
-					key {keyType} PRIMARY KEY,
-					isTombstoned INTEGER DEFAULT 0,
-					discardPoint INTEGER NULL)";
-		
-			sqlite.InitializeDb(sql);
-
-			_add = new AddCommand(TableName, sqlite);
-			_setTombstone = new SetTombstoneCommand(TableName, sqlite);
-			_setDiscardPoint = new SetDiscardPointCommand(TableName, sqlite);
-			_get = new GetCommand(TableName, sqlite);
-			_delete = new DeleteCommand(TableName, sqlite);
-			_deleteAll = new DeleteAllCommand(TableName, sqlite);
-			_all = new AllRecordsCommand(TableName, sqlite);
-		}
-
-		public MetastreamData this[TKey key] {
-			set => _add.Execute(key, value);
-		}
-
-		public bool TryGetValue(TKey key, out MetastreamData value) {
-			return _get.TryExecute(key, out value);
-		}
-
-		public bool TryRemove(TKey key, out MetastreamData value) {
-			return _delete.TryExecute(key, out value);
-		}
-
-		public IEnumerable<KeyValuePair<TKey, MetastreamData>> AllRecords() {
-			return _all.Execute();
-		}
-
-		public void SetTombstone(TKey key) {
-			_setTombstone.Execute(key);
-		}
-
-		public void SetDiscardPoint(TKey key, DiscardPoint discardPoint) {
-			_setDiscardPoint.Execute(key, discardPoint);
-		}
-
-		public void DeleteAll() {
-			_deleteAll.Execute();
-		}
-
-		private class AddCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly SqliteParameter _keyParam;
-			private readonly SqliteParameter _isTombstonedParam;
-			private readonly SqliteParameter _discardPointParam;
-
-			public AddCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $@"
-					INSERT INTO {tableName}
-					VALUES($key, $isTombstoned, $discardPoint)
-					ON CONFLICT(key) DO UPDATE SET
-						isTombstoned=$isTombstoned,
-						discardPoint=$discardPoint";
-
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_isTombstonedParam = _cmd.Parameters.Add("$isTombstoned", SqliteType.Integer);
-				_discardPointParam = _cmd.Parameters.Add("$discardPoint", SqliteType.Integer);
-				_cmd.Prepare();
-
-				_sqlite = sqlite;
-			}
-
-			public void Execute(TKey key, MetastreamData value) {
-				_keyParam.Value = key;
-				_isTombstonedParam.Value = value.IsTombstoned;
-				_discardPointParam.Value = value.DiscardPoint.FirstEventNumberToKeep;
-				_sqlite.ExecuteNonQuery(_cmd);
-			}
-		}
-		
-		private class SetTombstoneCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly SqliteParameter _keyParam;
-
-			public SetTombstoneCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $@"
-					INSERT INTO {tableName} (key, isTombstoned)
-					VALUES($key, 1) 
-					ON CONFLICT(key) DO UPDATE SET isTombstoned=1";
-				
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_cmd.Prepare();
-
-				_sqlite = sqlite;
-			}
-
-			public void Execute(TKey key) {
-				_keyParam.Value = key;
-				_sqlite.ExecuteNonQuery(_cmd);
-			}
-		}
-
-		private class SetDiscardPointCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly SqliteParameter _keyParam;
-			private readonly SqliteParameter _discardPointParam;
-
-			public SetDiscardPointCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $@"
-					INSERT INTO {tableName} (key, discardPoint)
-					VALUES ($key, $discardPoint)
-					ON CONFLICT(key) DO UPDATE SET discardPoint = $discardPoint";
-
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_discardPointParam = _cmd.Parameters.Add("$discardPoint", SqliteType.Integer);
-				_cmd.Prepare();
-
-				_sqlite = sqlite;
-			}
-
-			public void Execute(TKey key, DiscardPoint discardPoint) {
-				_keyParam.Value = key;
-				_discardPointParam.Value = discardPoint.FirstEventNumberToKeep;
-				_sqlite.ExecuteNonQuery(_cmd);
-			}
-		}
-		
-		private class GetCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly SqliteParameter _keyParam;
-
-			public GetCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $@"
-					SELECT isTombstoned, discardPoint
-					FROM {tableName}
-					WHERE key = $key";
-				
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_cmd.Prepare();
-				
-				_sqlite = sqlite;
-			}
-
-			public bool TryExecute(TKey key, out MetastreamData value) {
-				_keyParam.Value = key;
-				return _sqlite.ExecuteSingleRead(_cmd, _readMetastreamData, out value);
-			}
-		}
-
-		private class DeleteCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _selectCmd;
-			private readonly SqliteCommand _deleteCmd;
-			private readonly SqliteParameter _selectKeyParam;
-			private readonly SqliteParameter _deleteKeyParam;
-
-			public DeleteCommand(string tableName, SqliteBackend sqlite) {
-				var selectSql = $"SELECT isTombstoned, discardPoint FROM {tableName} WHERE key = $key";
-				_selectCmd = sqlite.CreateCommand();
-				_selectCmd.CommandText = selectSql;
-				_selectKeyParam = _selectCmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_selectCmd.Prepare();
-
-				var deleteSql = $"DELETE FROM {tableName} WHERE key = $key";
-				_deleteCmd = sqlite.CreateCommand();
-				_deleteCmd.CommandText = deleteSql;
-				_deleteKeyParam = _deleteCmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_deleteCmd.Prepare();
-				
-				_sqlite = sqlite;
-			}
-
-			public bool TryExecute(TKey key, out MetastreamData value) {
-				_selectKeyParam.Value = key;
-				_deleteKeyParam.Value = key;
-				return _sqlite.ExecuteReadAndDelete(_selectCmd, _deleteCmd, _readMetastreamData, out value);
-			}
-		}
-
-		private class DeleteAllCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _deleteCmd;
-
-			public DeleteAllCommand(string tableName, SqliteBackend sqlite) {
-				// sqlite treats this efficiently (as a truncate) https://www.sqlite.org/lang_delete.html
-				var deleteSql = $"DELETE FROM {tableName}";
-				_deleteCmd = sqlite.CreateCommand();
-				_deleteCmd.CommandText = deleteSql;
-				_deleteCmd.Prepare();
-				
-				_sqlite = sqlite;
-			}
-
-			public void Execute() {
-				_sqlite.ExecuteNonQuery(_deleteCmd);
-			}
-		}
-
-		private class AllRecordsCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly Func<SqliteDataReader, KeyValuePair<TKey, MetastreamData>> _reader;
-
-			public AllRecordsCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $@"
-					SELECT isTombstoned, discardPoint, key
-					FROM {tableName}
-					ORDER BY key";
-				
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_cmd.Prepare();
-				
-				_sqlite = sqlite;
-				_reader = reader => {
-					var value = _readMetastreamData(reader);
-					var key = reader.GetFieldValue<TKey>(2);
-					return new KeyValuePair<TKey, MetastreamData>(key, value);
-				};
-			}
-
-			public IEnumerable<KeyValuePair<TKey, MetastreamData>> Execute() {
-				return _sqlite.ExecuteReader(_cmd, _reader);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteOriginalStreamScavengeMap.cs b/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteOriginalStreamScavengeMap.cs
deleted file mode 100644
index a63ed1a779f..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteOriginalStreamScavengeMap.cs
+++ /dev/null
@@ -1,521 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using Microsoft.Data.Sqlite;
-
-namespace EventStore.Core.TransactionLog.Scavenging.Sqlite {
-	public class SqliteOriginalStreamScavengeMap<TKey> : IInitializeSqliteBackend, IOriginalStreamScavengeMap<TKey> {
-		private readonly string _keyTypeOverride;
-		private AddCommand _add;
-		private SetTombstoneCommand _setTombstone;
-		private SetMetadataCommand _setMetadata;
-		private SetDiscardPointsCommand _setDiscardPoints;
-		private GetCommand _get;
-		private GetChunkExecutionInfoCommand _getChunkExecutionInfo;
-		private DeleteCommand _delete;
-		private DeleteManyCommand _deleteMany;
-		private FromCheckpointCommand _fromCheckpoint;
-		private AllRecordsCommand _all;
-		private ActiveRecordsCommand _active;
-		private static Func<SqliteDataReader, OriginalStreamData> _readOriginalStreamData;
-
-		private string TableName { get; }
-		
-		public SqliteOriginalStreamScavengeMap(string name, string keyTypeOverride = null) {
-			TableName = name;
-			_keyTypeOverride = keyTypeOverride;
-
-			_readOriginalStreamData = reader => {
-				var d = new OriginalStreamData();
-				d.IsTombstoned = reader.GetBoolean(0);
-				d.MaxAge = SqliteBackend.GetTimeSpanFromSeconds(1, reader);
-				d.MaxCount = SqliteBackend.GetNullableFieldValue<long?>(2, reader);
-				d.TruncateBefore = SqliteBackend.GetNullableFieldValue<long?>(3, reader);
-
-				var discardPoint = SqliteBackend.GetNullableFieldValue<long?>(4, reader);
-				if (discardPoint.HasValue) {
-					d.DiscardPoint = DiscardPoint.DiscardBefore(discardPoint.Value);
-				}
-
-				var maybeDiscardPoint = SqliteBackend.GetNullableFieldValue<long?>(5, reader);
-				if (maybeDiscardPoint.HasValue) {
-					d.MaybeDiscardPoint = DiscardPoint.DiscardBefore(maybeDiscardPoint.Value);
-				}
-				
-				d.Status = reader.GetFieldValue<CalculationStatus>(6);
-
-				return d;
-			};
-		}
-
-		public void Initialize(SqliteBackend sqlite) {
-			var keyType = _keyTypeOverride ?? SqliteTypeMapping.GetTypeName<TKey>();
-			var sql = $@"
-				CREATE TABLE IF NOT EXISTS {TableName} (
-					key {keyType} PRIMARY KEY,
-					isTombstoned      INTEGER DEFAULT 0,
-					maxAge            INTEGER NULL,
-					maxCount          INTEGER NULL,
-					truncateBefore    INTEGER NULL,
-					discardPoint      INTEGER DEFAULT 0,
-					maybeDiscardPoint INTEGER DEFAULT 0,
-					status            INTEGER DEFAULT 0);
-				CREATE INDEX IF NOT EXISTS {TableName}KeyStatus ON {TableName} (status, key)";
-			
-			sqlite.InitializeDb(sql);
-
-			_add = new AddCommand(TableName, sqlite);
-			_setTombstone = new SetTombstoneCommand(TableName, sqlite);
-			_setMetadata = new SetMetadataCommand(TableName, sqlite);
-			_setDiscardPoints = new SetDiscardPointsCommand(TableName, sqlite);
-			_get = new GetCommand(TableName, sqlite);
-			_getChunkExecutionInfo = new GetChunkExecutionInfoCommand(TableName, sqlite);
-			_delete = new DeleteCommand(TableName, sqlite);
-			_deleteMany = new DeleteManyCommand(TableName, sqlite);
-			_fromCheckpoint = new FromCheckpointCommand(TableName, sqlite);
-			_all = new AllRecordsCommand(TableName, sqlite);
-			_active = new ActiveRecordsCommand(TableName, sqlite);
-		}
-
-		public OriginalStreamData this[TKey key] {
-			set => _add.Execute(key, value);
-		}
-
-		public bool TryGetValue(TKey key, out OriginalStreamData value) {
-			return _get.TryExecute(key, out value);
-		}
-
-		public bool TryRemove(TKey key, out OriginalStreamData value) {
-			return _delete.TryExecute(key, out value);
-		}
-		
-		public void SetTombstone(TKey key) {
-			_setTombstone.Execute(key);
-		}
-
-		public void SetMetadata(TKey key, StreamMetadata metadata) {
-			_setMetadata.Execute(key, metadata);
-		}
-		
-		public void SetDiscardPoints(TKey key, CalculationStatus status, DiscardPoint discardPoint, DiscardPoint maybeDiscardPoint) {
-			_setDiscardPoints.Execute(key, status, discardPoint, maybeDiscardPoint);
-		}
-
-		public bool TryGetChunkExecutionInfo(TKey key, out ChunkExecutionInfo details) {
-			return _getChunkExecutionInfo.TryExecute(key, out details);
-		}
-
-		public IEnumerable<KeyValuePair<TKey, OriginalStreamData>> AllRecords() {
-			return _all.Execute();
-		}
-
-		public IEnumerable<KeyValuePair<TKey, OriginalStreamData>> ActiveRecords() {
-			return _active.Execute();
-		}
-
-		public IEnumerable<KeyValuePair<TKey, OriginalStreamData>> ActiveRecordsFromCheckpoint(TKey checkpoint) {
-			return _fromCheckpoint.Execute(checkpoint);
-		}
-
-		public void DeleteMany(bool deleteArchived) {
-			_deleteMany.Execute(deleteArchived);
-		}
-
-		private class AddCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly SqliteParameter _keyParam;
-			private readonly SqliteParameter _isTombstonedParam;
-			private readonly SqliteParameter _maxAgeParam;
-			private readonly SqliteParameter _maxCountParam;
-			private readonly SqliteParameter _truncateBeforeParam;
-			private readonly SqliteParameter _discardPointParam;
-			private readonly SqliteParameter _maybeDiscardPointParam;
-			private readonly SqliteParameter _statusParam;
-
-			public AddCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $@"
-					INSERT INTO {tableName} VALUES(
-						$key,
-						$isTombstoned,
-						$maxAge,
-						$maxCount,
-						$truncateBefore,
-						$discardPoint,
-						$maybeDiscardPoint,
-						$status)
-					ON CONFLICT(key) DO UPDATE SET
-						isTombstoned = $isTombstoned,
-						maxAge = $maxAge,
-						maxCount = $maxCount,
-						truncateBefore = $truncateBefore,
-						discardPoint = $discardPoint,
-						maybeDiscardPoint = $maybeDiscardPoint,
-						status = $status";
-
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_isTombstonedParam = _cmd.Parameters.Add("$isTombstoned", SqliteType.Integer);
-				_maxAgeParam = _cmd.Parameters.Add("$maxAge", SqliteType.Integer);
-				_maxCountParam = _cmd.Parameters.Add("$maxCount", SqliteType.Integer);
-				_truncateBeforeParam = _cmd.Parameters.Add("$truncateBefore", SqliteType.Integer);
-				_discardPointParam = _cmd.Parameters.Add("$discardPoint", SqliteType.Integer);
-				_maybeDiscardPointParam = _cmd.Parameters.Add("$maybeDiscardPoint", SqliteType.Integer);
-				_statusParam = _cmd.Parameters.Add("$status", SqliteType.Integer);
-				_cmd.Prepare();
-
-				_sqlite = sqlite;
-			}
-
-			public void Execute(TKey key, OriginalStreamData value) {
-				_keyParam.Value = key;
-				_isTombstonedParam.Value = value.IsTombstoned;
-				_maxAgeParam.Value = value.MaxAge.HasValue ? (object)(long)value.MaxAge.Value.TotalSeconds : DBNull.Value;
-				_maxCountParam.Value = value.MaxCount.HasValue ? (object)value.MaxCount : DBNull.Value;
-				_truncateBeforeParam.Value =
-					value.TruncateBefore.HasValue ? (object)value.TruncateBefore : DBNull.Value;
-				_discardPointParam.Value = value.DiscardPoint.FirstEventNumberToKeep;
-				_maybeDiscardPointParam.Value = value.MaybeDiscardPoint.FirstEventNumberToKeep;
-				_statusParam.Value = value.Status;
-
-				_sqlite.ExecuteNonQuery(_cmd);
-			}
-		}
-		
-		private class SetTombstoneCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly SqliteParameter _keyParam;
-
-			public SetTombstoneCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $@"
-					INSERT INTO {tableName} (key, isTombstoned, status)
-					VALUES ($key, 1, {(int)CalculationStatus.Active})
-					ON CONFLICT(key) DO UPDATE SET
-						isTombstoned = 1,
-						status = {(int)CalculationStatus.Active}";
-				
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_cmd.Prepare();
-
-				_sqlite = sqlite;
-			}
-
-			public void Execute(TKey key) {
-				_keyParam.Value = key;
-				_sqlite.ExecuteNonQuery(_cmd);
-			}
-		}
-		
-		private class SetMetadataCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly SqliteParameter _keyParam;
-			private readonly SqliteParameter _maxAgeParam;
-			private readonly SqliteParameter _maxCountParam;
-			private readonly SqliteParameter _truncateBeforeParam;
-
-			public SetMetadataCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $@"
-					INSERT INTO {tableName} (key, maxAge, maxCount, truncateBefore, status)
-					VALUES($key, $maxAge, $maxCount, $truncateBefore, {(int)CalculationStatus.Active})
-					ON CONFLICT(key) DO UPDATE SET
-						maxAge = $maxAge,
-						maxCount = $maxCount,
-						truncateBefore = $truncateBefore,
-						status = {(int)CalculationStatus.Active}";
-
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_maxAgeParam = _cmd.Parameters.Add("$maxAge", SqliteType.Integer);
-				_maxCountParam = _cmd.Parameters.Add("$maxCount", SqliteType.Integer);
-				_truncateBeforeParam = _cmd.Parameters.Add("$truncateBefore", SqliteType.Integer);
-				_cmd.Prepare();
-
-				_sqlite = sqlite;
-			}
-
-			public void Execute(TKey key, StreamMetadata value) {
-				_keyParam.Value = key;
-				_maxAgeParam.Value = value.MaxAge.HasValue ? (object)(long)value.MaxAge.Value.TotalSeconds : DBNull.Value;
-				_maxCountParam.Value = value.MaxCount.HasValue ? (object)value.MaxCount : DBNull.Value;
-				_truncateBeforeParam.Value = value.TruncateBefore.HasValue ? (object)value.TruncateBefore : DBNull.Value;
-				_sqlite.ExecuteNonQuery(_cmd);
-			}
-		}
-
-		private class SetDiscardPointsCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly SqliteParameter _keyParam;
-			private readonly SqliteParameter _discardPointParam;
-			private readonly SqliteParameter _maybeDiscardPointParam;
-			private readonly SqliteParameter _statusParam;
-
-			public SetDiscardPointsCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $@"
-					INSERT INTO {tableName} (key, discardPoint, maybeDiscardPoint, status)
-					VALUES ($key, $discardPoint, $maybeDiscardPoint, $status)
-					ON CONFLICT(key) DO UPDATE SET
-						discardPoint = $discardPoint,
-						maybeDiscardPoint = $maybeDiscardPoint,
-						status = $status";
-
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_discardPointParam = _cmd.Parameters.Add("$discardPoint", SqliteType.Integer);
-				_maybeDiscardPointParam = _cmd.Parameters.Add("$maybeDiscardPoint", SqliteType.Integer);
-				_statusParam = _cmd.Parameters.Add("$status", SqliteType.Integer);
-				_cmd.Prepare();
-
-				_sqlite = sqlite;
-			}
-
-			public void Execute(TKey key, CalculationStatus status, DiscardPoint discardPoint, DiscardPoint maybeDiscardPoint) {
-				_keyParam.Value = key;
-				_discardPointParam.Value = discardPoint.FirstEventNumberToKeep;
-				_maybeDiscardPointParam.Value = maybeDiscardPoint.FirstEventNumberToKeep;
-				_statusParam.Value = status;
-				_sqlite.ExecuteNonQuery(_cmd);
-			}
-		}
-
-		private class GetCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly SqliteParameter _keyParam;
-
-			public GetCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $@"
-					SELECT isTombstoned, maxAge, maxCount, truncateBefore, discardPoint, maybeDiscardPoint, status
-					FROM {tableName}
-					WHERE key = $key";
-
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_cmd.Prepare();
-				
-				_sqlite = sqlite;
-			}
-
-			public bool TryExecute(TKey key, out OriginalStreamData value) {
-				_keyParam.Value = key;
-				return _sqlite.ExecuteSingleRead(_cmd, _readOriginalStreamData, out value);
-			}
-		}
-
-		private class GetChunkExecutionInfoCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly SqliteParameter _keyParam;
-			private readonly Func<SqliteDataReader, ChunkExecutionInfo> _reader;
-
-			public GetChunkExecutionInfoCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $@"
-					SELECT isTombstoned, maxAge, discardPoint, maybeDiscardPoint
-					FROM {tableName}
-					WHERE key = $key";
-
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_cmd.Prepare();
-				
-				_sqlite = sqlite;
-				_reader = reader => {
-					var isTombstoned = reader.GetBoolean(0);
-					var maxAge = SqliteBackend.GetTimeSpanFromSeconds(1, reader);
-					var discardPoint = DiscardPoint.DiscardBefore(reader.GetFieldValue<long>(2));
-					var maybeDiscardPoint = DiscardPoint.DiscardBefore(reader.GetFieldValue<long>(3));
-					return new ChunkExecutionInfo(isTombstoned, discardPoint, maybeDiscardPoint, maxAge);
-				};
-			}
-
-			public bool TryExecute(TKey key, out ChunkExecutionInfo value) {
-				_keyParam.Value = key;
-				return _sqlite.ExecuteSingleRead(_cmd, _reader, out value);
-			}
-		}
-
-		private class DeleteCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _selectCmd;
-			private readonly SqliteCommand _deleteCmd;
-			private readonly SqliteParameter _selectKeyParam;
-			private readonly SqliteParameter _deleteKeyParam;
-
-			public DeleteCommand(string tableName, SqliteBackend sqlite) {
-				var selectSql = $@"
-					SELECT isTombstoned, maxAge, maxCount, truncateBefore, discardPoint, maybeDiscardPoint, status
-					FROM {tableName}
-					WHERE key = $key";
-
-				_selectCmd = sqlite.CreateCommand();
-				_selectCmd.CommandText = selectSql;
-				_selectKeyParam = _selectCmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_selectCmd.Prepare();
-
-				var deleteSql = $"DELETE FROM {tableName} WHERE key = $key";
-				_deleteCmd = sqlite.CreateCommand();
-				_deleteCmd.CommandText = deleteSql;
-				_deleteKeyParam = _deleteCmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_deleteCmd.Prepare();
-				
-				_sqlite = sqlite;
-			}
-
-			public bool TryExecute(TKey key, out OriginalStreamData value) {
-				_selectKeyParam.Value = key;
-				_deleteKeyParam.Value = key;
-				return _sqlite.ExecuteReadAndDelete(_selectCmd, _deleteCmd, _readOriginalStreamData, out value);
-			}
-		}
-		
-		private class DeleteManyCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _deleteCmd;
-			private readonly SqliteParameter _archiveStatusParam;
-
-			public DeleteManyCommand(string tableName, SqliteBackend sqlite) {
-				var deleteSql = $@"
-					DELETE FROM {tableName}
-					WHERE status = {(int)CalculationStatus.Spent} OR status = $archive";
-
-				_deleteCmd = sqlite.CreateCommand();
-				_deleteCmd.CommandText = deleteSql;
-				_archiveStatusParam = _deleteCmd.Parameters.Add("$archive", SqliteType.Integer);
-				_deleteCmd.Prepare();
-				
-				_sqlite = sqlite;
-			}
-
-			public void Execute(bool deleteArchived) {
-				// only delete archived when requested, otherwise only delete Spent.
-				_archiveStatusParam.Value = deleteArchived ? CalculationStatus.Archived : CalculationStatus.Spent;
-				_sqlite.ExecuteNonQuery(_deleteCmd);
-			}
-		}
-
-		// the sqlite docs (https://www.sqlite.org/lang_select.html) say that without an orderby clause
-		// the order in which the rows are returned is undefined. so we include an orderby clause
-		// in FromCheckpointCommand and ActiveRecordsCommand to facilitate checkpointing and continuing
-		//
-		// the sqlite docs (https://www.sqlite.org/isolation.html) say that on a single connection the
-		// behaviour of running insert/update/delete during a select is safe, but undefined with respect
-		// to whether the updates will appear in the select. in particular, updating the current row
-		// may cause the row to reappear later in the select. we are ordering the select by key so in
-		// our case it seems doubtful that it will reappear because it would violate the orderby clause,
-		// but in the worse case we will just duplicate the effort but otherwise no harm is done.
-		// NB we no longer have a read open while writing
-		private class FromCheckpointCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly SqliteParameter _keyParam;
-			private readonly Func<SqliteDataReader, KeyValuePair<TKey, OriginalStreamData>> _reader;
-
-			public FromCheckpointCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $@"
-					SELECT isTombstoned, maxAge, maxCount, truncateBefore, discardPoint, maybeDiscardPoint, status, key
-					FROM {tableName}
-					WHERE key > $key AND status = {(int)CalculationStatus.Active}
-					ORDER BY key";
-
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_cmd.Prepare();
-				
-				_sqlite = sqlite;
-				_reader = reader => {
-					var value = _readOriginalStreamData(reader);
-					var key = reader.GetFieldValue<TKey>(7);
-					return new KeyValuePair<TKey, OriginalStreamData>(key, value);
-				};
-			}
-
-			public IEnumerable<KeyValuePair<TKey, OriginalStreamData>> Execute(TKey key) {
-				_keyParam.Value = key;
-				return _sqlite.ExecuteReader(_cmd, _reader);
-			}
-		}
-
-		private class AllRecordsCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly Func<SqliteDataReader, KeyValuePair<TKey, OriginalStreamData>> _reader;
-
-			public AllRecordsCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $@"
-					SELECT
-						isTombstoned,
-						maxAge,
-						maxCount,
-						truncateBefore,
-						discardPoint,
-						maybeDiscardPoint,
-						status,
-						key
-					FROM {tableName}
-					ORDER BY key";
-
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_cmd.Prepare();
-				
-				_sqlite = sqlite;
-				_reader = reader => {
-					var data = _readOriginalStreamData(reader);
-					var key = reader.GetFieldValue<TKey>(7); 
-					return new KeyValuePair<TKey, OriginalStreamData>(key, data);
-				};
-			}
-
-			public IEnumerable<KeyValuePair<TKey, OriginalStreamData>> Execute() {
-				return _sqlite.ExecuteReader(_cmd, _reader);
-			}
-		}
-		
-		private class ActiveRecordsCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly Func<SqliteDataReader, KeyValuePair<TKey, OriginalStreamData>> _reader;
-
-			public ActiveRecordsCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $@"
-					SELECT
-						isTombstoned,
-						maxAge,
-						maxCount,
-						truncateBefore,
-						discardPoint,
-						maybeDiscardPoint,
-						status,
-						key
-					FROM {tableName}
-					WHERE status = {(int)CalculationStatus.Active}
-					ORDER BY key";
-
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_cmd.Prepare();
-				
-				_sqlite = sqlite;
-				_reader = reader => {
-					var data = _readOriginalStreamData(reader);
-					var key = reader.GetFieldValue<TKey>(7); 
-					return new KeyValuePair<TKey, OriginalStreamData>(key, data);
-				};
-			}
-
-			public IEnumerable<KeyValuePair<TKey, OriginalStreamData>> Execute() {
-				return _sqlite.ExecuteReader(_cmd, _reader);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteScavengeBackend.cs b/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteScavengeBackend.cs
deleted file mode 100644
index de36aafb012..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteScavengeBackend.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using Microsoft.Data.Sqlite;
-using Serilog;
-
-namespace EventStore.Core.TransactionLog.Scavenging.Sqlite {
-	// Encapsulates a connection to sqlite, complete with prepared statements and an API to access it
-	public class SqliteScavengeBackend<TStreamId> : IScavengeStateBackend<TStreamId> {
-		// WAL with SYNCHRONOUS NORMAL means that
-		//  - commiting a transaction does not wait to it to flush to disk
-		//  - which is nice and quick, but means in powerloss the last x transactions
-		//    can be lost. the database will be in a valid state.
-		//  - this is suitable for us because scavenge will continue from the last
-		//    persisted checkpoint.
-		private const string SqliteWalJournalMode = "wal";
-		private const int SqliteNormalSynchronousValue = 1;
-		private const int WalAutocheckpointDisabled = 0;
-
-		private const int DefaultSqliteCacheSize = 2 * 1024 * 1024;
-		private const int DefaultSqlitePageSize = 16 * 1024;
-		private readonly ILogger _logger;
-		private readonly int _pageSizeInBytes;
-		private readonly long _cacheSizeInBytes;
-		private SqliteBackend _sqliteBackend;
-
-		private const int SchemaVersion = 1;
-		
-		public IScavengeMap<TStreamId, Unit> CollisionStorage { get; private set; }
-		public IScavengeMap<ulong,TStreamId> Hashes { get; private set; }
-		public IMetastreamScavengeMap<ulong> MetaStorage { get; private set; }
-		public IMetastreamScavengeMap<TStreamId> MetaCollisionStorage { get; private set; }
-		public IOriginalStreamScavengeMap<ulong> OriginalStorage { get; private set; }
-		public IOriginalStreamScavengeMap<TStreamId> OriginalCollisionStorage { get; private set; }
-		public IScavengeMap<Unit,ScavengeCheckpoint> CheckpointStorage { get; private set; }
-		public IScavengeMap<int,ChunkTimeStampRange> ChunkTimeStampRanges { get; private set; }
-		public IChunkWeightScavengeMap ChunkWeights { get; private set; }
-		public ITransactionFactory<SqliteTransaction> TransactionFactory { get; private set; }
-		public ITransactionManager TransactionManager { get; private set; }
-
-		public SqliteScavengeBackend(
-			ILogger logger,
-			int pageSizeInBytes = DefaultSqlitePageSize,
-			long cacheSizeInBytes = DefaultSqliteCacheSize) {
-			Ensure.Positive(pageSizeInBytes, nameof(pageSizeInBytes));
-			Ensure.Positive(cacheSizeInBytes, nameof(cacheSizeInBytes));
-			_logger = logger;
-			_pageSizeInBytes = pageSizeInBytes;
-			_cacheSizeInBytes = cacheSizeInBytes;
-		}
-
-		public void Dispose() {
-			_sqliteBackend.Dispose();
-		}
-
-		public void Initialize(SqliteConnection connection) {
-			_sqliteBackend = new SqliteBackend(connection);
-			
-			ConfigureFeatures();
-			InitializeSchemaVersion();
-
-			var collisionStorage = new SqliteCollisionScavengeMap<TStreamId>();
-			CollisionStorage = collisionStorage;
-
-			var hashes = new SqliteScavengeMap<ulong, TStreamId>("HashUsers", "INT");
-			Hashes = hashes;
-
-			// passing "INT" could increase the speed of the accumulation when the database becomes large
-			var metaStorage = new SqliteMetastreamScavengeMap<ulong>("MetastreamDatas"/*, "INT"*/);
-			MetaStorage = metaStorage;
-			
-			var metaCollisionStorage = new SqliteMetastreamScavengeMap<TStreamId>("MetastreamDataCollisions");
-			MetaCollisionStorage = metaCollisionStorage;
-
-			// passing "INT" could increase the speed of the accumulation when the database becomes large
-			// but may slow down calculation and require adjustments to the iteration queries / indexes
-			var originalStorage = new SqliteOriginalStreamScavengeMap<ulong>("OriginalStreamDatas"/*, "INT"*/);
-			OriginalStorage = originalStorage;
-			
-			var originalCollisionStorage = new SqliteOriginalStreamScavengeMap<TStreamId>("OriginalStreamDataCollisions");
-			OriginalCollisionStorage = originalCollisionStorage;
-			
-			var checkpointStorage = new SqliteScavengeCheckpointMap<TStreamId>();
-			CheckpointStorage = checkpointStorage;
-			
-			var chunkTimeStampRanges = new SqliteChunkTimeStampRangeScavengeMap();
-			ChunkTimeStampRanges = chunkTimeStampRanges;
-			
-			var chunkWeights = new SqliteChunkWeightScavengeMap();
-			ChunkWeights = chunkWeights;
-
-			var transactionFactory = new SqliteTransactionFactory();
-			TransactionFactory = transactionFactory;
-
-			TransactionManager = new SqliteTransactionManager(TransactionFactory, CheckpointStorage);
-
-			var allMaps = new IInitializeSqliteBackend[] { collisionStorage, hashes, metaStorage, metaCollisionStorage,
-				originalStorage, originalCollisionStorage, checkpointStorage, chunkTimeStampRanges, chunkWeights,
-				transactionFactory};
-
-			foreach (var map in allMaps) {
-				map.Initialize(_sqliteBackend);
-			}
-		}
-
-		private void ConfigureFeatures() {
-			_logger.Debug("SCAVENGING: Setting page size to {pageSize:N0} bytes.", _pageSizeInBytes);
-			_sqliteBackend.SetPragmaValue(SqliteBackend.PageSize, _pageSizeInBytes.ToString());
-			var pageSize = int.Parse(_sqliteBackend.GetPragmaValue(SqliteBackend.PageSize));
-			if (pageSize != _pageSizeInBytes) {
-				// note we will fail to set it if the database already exists with a different page size
-				// the page size could be changed if the vacuumed the database
-				throw new Exception(
-					$"Failed to configure page size to {_pageSizeInBytes}. Actually {pageSize}. " +
-					$"This is probably a pre-existing database with a different page size.");
-			}
-			
-			_sqliteBackend.SetPragmaValue(SqliteBackend.JournalMode, SqliteWalJournalMode);
-			var journalMode = _sqliteBackend.GetPragmaValue(SqliteBackend.JournalMode);
-			if (journalMode.ToLower() != SqliteWalJournalMode) {
-				throw new Exception($"Failed to configure journal mode, unexpected value: {journalMode}");
-			}
-
-#if MANUAL_SQLITE_CHECKPOINT
-			_sqliteBackend.SetPragmaValue(SqliteBackend.WalAutocheckpoint, WalAutocheckpointDisabled.ToString());
-			var autocheckpoint = int.Parse(_sqliteBackend.GetPragmaValue(SqliteBackend.WalAutocheckpoint));
-			if (autocheckpoint != WalAutocheckpointDisabled) {
-				throw new Exception($"Failed to configure wal autocheckpoint, unexpected value: {autocheckpoint}");
-			}
-#endif
-
-			_sqliteBackend.SetPragmaValue(SqliteBackend.Synchronous, SqliteNormalSynchronousValue.ToString());
-			var synchronousMode = int.Parse(_sqliteBackend.GetPragmaValue(SqliteBackend.Synchronous));
-			if (synchronousMode != SqliteNormalSynchronousValue) {
-				throw new Exception($"Failed to configure synchronous mode, unexpected value: {synchronousMode}");
-			}
-
-			_sqliteBackend.SetCacheSize(_cacheSizeInBytes);
-		}
-
-		private void InitializeSchemaVersion() {
-			var tableName = "SchemaVersion";
-
-			using (var cmd = _sqliteBackend.CreateCommand()) {
-				cmd.CommandText = $"CREATE TABLE IF NOT EXISTS {tableName} (version Integer PRIMARY KEY)";
-				cmd.ExecuteNonQuery();
-
-				cmd.CommandText = $"SELECT MAX(version) FROM {tableName}";
-				var currentVersion = cmd.ExecuteScalar();
-
-				if (currentVersion == DBNull.Value) {
-					cmd.CommandText = $"INSERT INTO {tableName} VALUES({SchemaVersion})";
-					cmd.ExecuteNonQuery();
-				} else if (currentVersion != null && (long)currentVersion < SchemaVersion) {
-					// need schema update
-				}
-			}
-		}
-
-		public SqliteBackend.Stats GetStats() {
-			return _sqliteBackend.GetStats();
-		}
-
-		public void LogStats() {
-			_logger.Debug($"SCAVENGING: {GetStats().PrettyPrint()}");
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteScavengeCheckpointMap.cs b/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteScavengeCheckpointMap.cs
deleted file mode 100644
index f30b9899e2e..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteScavengeCheckpointMap.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.Data.Sqlite;
-
-namespace EventStore.Core.TransactionLog.Scavenging.Sqlite {
-	public class SqliteScavengeCheckpointMap<TStreamId>: IInitializeSqliteBackend, IScavengeMap<Unit, ScavengeCheckpoint> {
-		private AddCommand _add;
-		private GetCommand _get;
-		private RemoveCommand _remove;
-
-		private const string TableName = "Checkpoint";
-
-		public void Initialize(SqliteBackend sqlite) {
-			var sql = $@"
-				CREATE TABLE IF NOT EXISTS {TableName} (
-					key Integer PRIMARY KEY,
-					value Text NOT NULL)";
-			
-			sqlite.InitializeDb(sql);
-			
-			_add = new AddCommand(sqlite);
-			_get = new GetCommand(sqlite);
-			_remove = new RemoveCommand(sqlite);
-		}
-
-		public ScavengeCheckpoint this[Unit key] {
-			set => AddValue(key, value);
-		}
-
-		private void AddValue(Unit _, ScavengeCheckpoint value) {
-			_add.Execute(value);
-		}
-
-		public bool TryGetValue(Unit key, out ScavengeCheckpoint value) {
-			return _get.TryExecute(out value);
-		}
-
-		public bool TryRemove(Unit key, out ScavengeCheckpoint value) {
-			return _remove.TryExecute(out value);
-		}
-
-		public IEnumerable<KeyValuePair<Unit, ScavengeCheckpoint>> AllRecords() {
-			throw new NotImplementedException();
-		}
-
-		private class AddCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly SqliteParameter _valueParam;
-
-			public AddCommand(SqliteBackend sqlite) {
-				var sql = $@"
-					INSERT INTO {TableName}
-					VALUES(0, $value)
-					ON CONFLICT(key) DO UPDATE SET value=$value";
-				
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_valueParam = _cmd.Parameters.Add("$value", SqliteType.Text);
-				_cmd.Prepare();
-				
-				_sqlite = sqlite;
-			}
-
-			public void Execute(ScavengeCheckpoint value) {
-				_valueParam.Value = ScavengeCheckpointJsonPersistence<TStreamId>.Serialize(value);
-				_sqlite.ExecuteNonQuery(_cmd);
-			}
-		}
-		
-		private class GetCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly Func<SqliteDataReader, ScavengeCheckpoint> _reader;
-			
-			public GetCommand(SqliteBackend sqlite) {
-				var sql = $"SELECT value FROM {TableName} WHERE key = 0";
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_cmd.Prepare();
-				
-				_sqlite = sqlite;
-				_reader = reader => {
-					var ok = ScavengeCheckpointJsonPersistence<TStreamId>.TryDeserialize(reader.GetString(0), out var v);
-					// code executed here means a record was found, but deserialization might fail
-					// which should be handled as false (no record found), return null to indicate this.
-					return ok ? v : null;
-				};
-			}
-
-			public bool TryExecute(out ScavengeCheckpoint value) {
-				return _sqlite.ExecuteSingleRead(_cmd, _reader, out value) && value != null;
-			}
-		}
-		
-		private class RemoveCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _selectCmd;
-			private readonly SqliteCommand _deleteCmd;
-			private readonly Func<SqliteDataReader, ScavengeCheckpoint> _reader;
-
-			public RemoveCommand(SqliteBackend sqlite) {
-				_sqlite = sqlite;
-				_reader = reader => {
-					var ok = ScavengeCheckpointJsonPersistence<TStreamId>.TryDeserialize(reader.GetString(0), out var v);
-					// code executed here means a record was found, but deserialization might fail
-					// which should be handled as false (no record found), return null to indicate this.
-					return ok ? v : null;
-				};
-				
-				var selectSql = $"SELECT value FROM {TableName} WHERE key = 0";
-				_selectCmd = sqlite.CreateCommand();
-				_selectCmd.CommandText = selectSql;
-				_selectCmd.Prepare();
-
-				var deleteSql = $"DELETE FROM {TableName} WHERE key = 0";
-				_deleteCmd = sqlite.CreateCommand();
-				_deleteCmd.CommandText = deleteSql;
-				_deleteCmd.Prepare();
-			}
-
-			public bool TryExecute(out ScavengeCheckpoint value) {
-				return _sqlite.ExecuteReadAndDelete(_selectCmd, _deleteCmd, _reader, out value) && value != null;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteScavengeMap.cs b/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteScavengeMap.cs
deleted file mode 100644
index 82b444e6b92..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteScavengeMap.cs
+++ /dev/null
@@ -1,202 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.Data.Sqlite;
-
-namespace EventStore.Core.TransactionLog.Scavenging.Sqlite {
-	public class SqliteScavengeMap<TKey, TValue> :
-		IInitializeSqliteBackend,
-		IScavengeMap<TKey, TValue> {
-
-		private AddCommand _add;
-		private GetCommand _get;
-		private RemoveCommand _delete;
-		private AllRecordsCommand _all;
-
-		private readonly Dictionary<Type, string> _sqliteTypeMap = new Dictionary<Type, string>() {
-			{typeof(int), nameof(SqliteType.Integer)},
-			{typeof(float), nameof(SqliteType.Real)},
-			{typeof(ulong), nameof(SqliteType.Integer)},
-			{typeof(string), nameof(SqliteType.Text)},
-		};
-		private readonly string _keyTypeOverride;
-
-		protected string TableName { get; }
-		
-		public SqliteScavengeMap(string name, string keyTypeOverride = null) {
-			TableName = name;
-			_keyTypeOverride = keyTypeOverride;
-			AssertTypesAreSupported();
-		}
-
-		private void AssertTypesAreSupported() {
-			if (!IsSupportedType<TKey>()) {
-				throw new ArgumentException(
-					$"Scavenge map {TableName} has an unsupported type {typeof(TKey).Name} for key specified");
-			}
-			
-			if (!IsSupportedType<TValue>()) {
-				throw new ArgumentException(
-					$"Scavenge map {TableName} has an unsupported type {typeof(TValue).Name} for value specified");
-			}
-		}
-
-		private bool IsSupportedType<T>() {
-			return _sqliteTypeMap.ContainsKey(typeof(T));
-		}
-
-		public virtual void Initialize(SqliteBackend sqlite) {
-			var keyType = _keyTypeOverride ?? SqliteTypeMapping.GetTypeName<TKey>();
-			var valueType = SqliteTypeMapping.GetTypeName<TValue>();
-			var createSql = $@"
-				CREATE TABLE IF NOT EXISTS {TableName} (
-					key {keyType} PRIMARY KEY,
-					value {valueType} NOT NULL)";
-
-			sqlite.InitializeDb(createSql);
-
-			_add = new AddCommand(TableName, sqlite);
-			_get = new GetCommand(TableName, sqlite);
-			_delete = new RemoveCommand(TableName, sqlite);
-			_all = new AllRecordsCommand(TableName, sqlite);
-		}
-		
-		public TValue this[TKey key] {
-			set => AddValue(key, value);
-		}
-
-		private void AddValue(TKey key, TValue value) {
-			_add.Execute(key, value);
-		}
-
-		public bool TryGetValue(TKey key, out TValue value) {
-			return _get.TryExecute(key, out value);
-		}
-
-		public bool TryRemove(TKey key, out TValue value) {
-			return _delete.TryExecute(key, out value);
-		}
-
-		public IEnumerable<KeyValuePair<TKey, TValue>> AllRecords() {
-			return _all.Execute();
-		}
-
-		private class AddCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly SqliteParameter _keyParam;
-			private readonly SqliteParameter _valueParam;
-
-			public AddCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $@"
-					INSERT INTO {tableName}
-					VALUES($key, $value)
-					ON CONFLICT(key) DO UPDATE SET value=$value";
-				
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_valueParam = _cmd.Parameters.Add("$value", SqliteTypeMapping.Map<TKey>());
-				_cmd.Prepare();
-				
-				_sqlite = sqlite;
-			}
-
-			public void Execute(TKey key, TValue value) {
-				_keyParam.Value = key;
-				_valueParam.Value = value;
-				_sqlite.ExecuteNonQuery(_cmd);
-			}
-		}
-
-		private class GetCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly SqliteParameter _keyParam;
-			private readonly Func<SqliteDataReader, TValue> _reader;
-
-			public GetCommand(string tableName, SqliteBackend sqlite) {
-				var selectSql = $@"
-					SELECT value
-					FROM {tableName}
-					WHERE key = $key";
-				
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = selectSql;
-				_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_cmd.Prepare();
-				
-				_sqlite = sqlite;
-				_reader = reader => reader.GetFieldValue<TValue>(0);
-			}
-
-			public bool TryExecute(TKey key, out TValue value) {
-				_keyParam.Value = key;
-				return _sqlite.ExecuteSingleRead(_cmd, _reader, out value);
-			}
-		}
-
-		private class RemoveCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _selectCmd;
-			private readonly SqliteCommand _deleteCmd;
-			private readonly SqliteParameter _selectKeyParam;
-			private readonly SqliteParameter _deleteKeyParam;
-			private readonly Func<SqliteDataReader, TValue> _reader;
-
-			public RemoveCommand(string tableName, SqliteBackend sqlite) {
-				var selectSql = $@"
-					SELECT value
-					FROM {tableName}
-					WHERE key = $key";
-				
-				_selectCmd = sqlite.CreateCommand();
-				_selectCmd.CommandText = selectSql;
-				_selectKeyParam = _selectCmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_selectCmd.Prepare();
-
-				var deleteSql = $@"
-					DELETE FROM {tableName}
-					WHERE key = $key";
-				
-				_deleteCmd = sqlite.CreateCommand();
-				_deleteCmd.CommandText = deleteSql;
-				_deleteKeyParam = _deleteCmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
-				_deleteCmd.Prepare();
-				
-				_sqlite = sqlite;
-				_reader = reader => reader.GetFieldValue<TValue>(0);
-			}
-
-			public bool TryExecute(TKey key, out TValue value) {
-				_selectKeyParam.Value = key;
-				_deleteKeyParam.Value = key;
-				return _sqlite.ExecuteReadAndDelete(_selectCmd, _deleteCmd, _reader, out value);
-			}
-		}
-
-		private class AllRecordsCommand {
-			private readonly SqliteBackend _sqlite;
-			private readonly SqliteCommand _cmd;
-			private readonly Func<SqliteDataReader, KeyValuePair<TKey, TValue>> _reader;
-
-			public AllRecordsCommand(string tableName, SqliteBackend sqlite) {
-				var sql = $@"
-					SELECT key, value
-					FROM {tableName}
-					ORDER BY key";
-				
-				_cmd = sqlite.CreateCommand();
-				_cmd.CommandText = sql;
-				_cmd.Prepare();
-				
-				_sqlite = sqlite;
-				_reader = reader => new KeyValuePair<TKey, TValue>(
-					reader.GetFieldValue<TKey>(0), reader.GetFieldValue<TValue>(1));
-			}
-
-			public IEnumerable<KeyValuePair<TKey, TValue>> Execute() {
-				return _sqlite.ExecuteReader(_cmd, _reader);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteTransactionFactory.cs b/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteTransactionFactory.cs
deleted file mode 100644
index b2ef0d74a58..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteTransactionFactory.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Microsoft.Data.Sqlite;
-
-namespace EventStore.Core.TransactionLog.Scavenging.Sqlite {
-	public class SqliteTransactionFactory : IInitializeSqliteBackend, ITransactionFactory<SqliteTransaction> {
-		private SqliteBackend _sqliteBackend;
-
-		public void Initialize(SqliteBackend sqlite) {
-			_sqliteBackend = sqlite;
-		}
-
-		public SqliteTransaction Begin() {
-			return _sqliteBackend.BeginTransaction();
-		}
-
-		public void Rollback(SqliteTransaction transaction) {
-			transaction.Rollback();
-			transaction.Dispose();
-			_sqliteBackend.ClearTransaction();
-		}
-
-		public void Commit(SqliteTransaction transaction) {
-			transaction.Commit();
-			transaction.Dispose();
-			_sqliteBackend.ClearTransaction();
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteTransactionManager.cs b/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteTransactionManager.cs
deleted file mode 100644
index c719d1ad3bc..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteTransactionManager.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Microsoft.Data.Sqlite;
-
-namespace EventStore.Core.TransactionLog.Scavenging.Sqlite {
-	public class SqliteTransactionManager : TransactionManager<SqliteTransaction> {
-		public SqliteTransactionManager(ITransactionFactory<SqliteTransaction> factory,
-			IScavengeMap<Unit, ScavengeCheckpoint> storage) : base(factory, storage) {
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteTypeMapping.cs b/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteTypeMapping.cs
deleted file mode 100644
index 3db724f75bc..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Sqlite/SqliteTypeMapping.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.Data.Sqlite;
-
-namespace EventStore.Core.TransactionLog.Scavenging.Sqlite {
-	public static class SqliteTypeMapping {
-		private static readonly Dictionary<Type, SqliteType> _sqliteTypeMap = new Dictionary<Type, SqliteType>() {
-			{typeof(int), SqliteType.Integer},
-			{typeof(float), SqliteType.Real},
-			{typeof(long), SqliteType.Integer},
-			{typeof(ulong), SqliteType.Integer},
-			{typeof(string), SqliteType.Text},
-		};
-		
-		/// <summary>
-		/// Returns the mapped SqliteType. 
-		/// </summary>
-		public static SqliteType Map<T>() {
-			return _sqliteTypeMap[typeof(T)];
-		}
-		
-		/// <summary>
-		/// Returns the name of the mapped type.
-		/// </summary>
-		public static string GetTypeName<T>() {
-			return Map<T>().ToString().ToUpper();
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Stages/Accumulator.cs b/src/EventStore.Core/TransactionLog/Scavenging/Stages/Accumulator.cs
deleted file mode 100644
index 64a702c54fc..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Stages/Accumulator.cs
+++ /dev/null
@@ -1,447 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Threading;
-using EventStore.Core.LogAbstraction;
-using Serilog;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class Accumulator<TStreamId> : IAccumulator<TStreamId> {
-		private readonly ILogger _logger;
-		private readonly int _chunkSize;
-		private readonly IMetastreamLookup<TStreamId> _metastreamLookup;
-		private readonly IChunkReaderForAccumulator<TStreamId> _chunkReader;
-		private readonly IIndexReaderForAccumulator<TStreamId> _index;
-		private readonly int _cancellationCheckPeriod;
-		private readonly Throttle _throttle;
-
-		public Accumulator(
-			ILogger logger,
-			int chunkSize,
-			IMetastreamLookup<TStreamId> metastreamLookup,
-			IChunkReaderForAccumulator<TStreamId> chunkReader,
-			IIndexReaderForAccumulator<TStreamId> index,
-			int cancellationCheckPeriod,
-			Throttle throttle) {
-
-			_logger = logger;
-			_chunkSize = chunkSize;
-			_metastreamLookup = metastreamLookup;
-			_chunkReader = chunkReader;
-			_index = index;
-			_cancellationCheckPeriod = cancellationCheckPeriod;
-			_throttle = throttle;
-		}
-
-		// Start a new accumulation
-		public void Accumulate(
-			ScavengePoint prevScavengePoint,
-			ScavengePoint scavengePoint,
-			IScavengeStateForAccumulator<TStreamId> state,
-			CancellationToken cancellationToken) {
-
-			_logger.Debug("SCAVENGING: Started new scavenge accumulation phase: {prevScavengePoint} to {scavengePoint}",
-				prevScavengePoint?.GetName() ?? "beginning of log",
-				scavengePoint.GetName());
-
-			var doneLogicalChunkNumber = default(int?);
-
-			if (prevScavengePoint != null) {
-				// scavenge point always closes a chunk, and we accumulate up to and including the
-				// scavenge point, so we have done the chunk with the prev scavenge point in it.
-				doneLogicalChunkNumber = (int)(prevScavengePoint.Position / _chunkSize);
-			}
-
-			var checkpoint = new ScavengeCheckpoint.Accumulating(
-				scavengePoint: scavengePoint,
-				doneLogicalChunkNumber: doneLogicalChunkNumber);
-			state.SetCheckpoint(checkpoint);
-			Accumulate(checkpoint, state, cancellationToken);
-		}
-
-		// Continue accumulation for a particular scavenge point
-		public void Accumulate(
-			ScavengeCheckpoint.Accumulating checkpoint,
-			IScavengeStateForAccumulator<TStreamId> state,
-			CancellationToken cancellationToken) {
-
-			_logger.Debug("SCAVENGING: Accumulating from checkpoint: {checkpoint}", checkpoint);
-			var stopwatch = new Stopwatch();
-
-			// bounds are ok because we wont try to read past the scavenge point
-			var logicalChunkNumber = checkpoint.DoneLogicalChunkNumber + 1 ?? 0;
-			var scavengePoint = checkpoint.ScavengePoint;
-			var weights = new WeightAccumulator(state);
-
-			// reusable objects to avoid GC pressure
-			var originalStreamRecord = new RecordForAccumulator<TStreamId>.OriginalStreamRecord();
-			var metadataStreamRecord = new RecordForAccumulator<TStreamId>.MetadataStreamRecord();
-			var tombstoneRecord = new RecordForAccumulator<TStreamId>.TombStoneRecord();
-
-			while (AccumulateChunkAndRecordRange(
-					scavengePoint,
-					state,
-					weights,
-					logicalChunkNumber,
-					originalStreamRecord,
-					metadataStreamRecord,
-					tombstoneRecord,
-					stopwatch,
-					cancellationToken)) {
-				logicalChunkNumber++;
-			}
-		}
-
-		private bool AccumulateChunkAndRecordRange(
-			ScavengePoint scavengePoint,
-			IScavengeStateForAccumulator<TStreamId> state,
-			WeightAccumulator weights,
-			int logicalChunkNumber,
-			RecordForAccumulator<TStreamId>.OriginalStreamRecord originalStreamRecord,
-			RecordForAccumulator<TStreamId>.MetadataStreamRecord metadataStreamRecord,
-			RecordForAccumulator<TStreamId>.TombStoneRecord tombStoneRecord,
-			Stopwatch stopwatch,
-			CancellationToken cancellationToken) {
-
-			stopwatch.Restart();
-
-			// for correctness it is important that any particular DetectCollisions call is contained
-			// within a transaction.
-			var transaction = state.BeginTransaction();
-			try {
-				var ret = AccumulateChunk(
-					scavengePoint,
-					state,
-					weights,
-					logicalChunkNumber,
-					originalStreamRecord,
-					metadataStreamRecord,
-					tombStoneRecord,
-					cancellationToken,
-					out var countAccumulatedRecords,
-					out var countOriginalStreamRecords,
-					out var countMetaStreamRecords,
-					out var countTombstoneRecords,
-					out var chunkMinTimeStamp,
-					out var chunkMaxTimeStamp);
-
-				if (chunkMinTimeStamp <= chunkMaxTimeStamp) {
-					state.SetChunkTimeStampRange(
-						logicalChunkNumber: logicalChunkNumber,
-						new ChunkTimeStampRange(
-							min: chunkMinTimeStamp,
-							max: chunkMaxTimeStamp));
-				} else {
-					// empty range, no need to store it.
-				}
-
-				var accumulationElapsed = stopwatch.Elapsed;
-				var rate = countAccumulatedRecords / accumulationElapsed.TotalSeconds;
-
-				weights.Flush();
-				var weightsElapsed = stopwatch.Elapsed;
-
-				transaction.Commit(new ScavengeCheckpoint.Accumulating(
-					scavengePoint,
-					doneLogicalChunkNumber: logicalChunkNumber));
-
-				var commitElapsed = stopwatch.Elapsed;
-
-				_logger.Debug(
-					"SCAVENGING: Accumulated {countAccumulatedRecords:N0} records " +
-					"({originals:N0} originals, {metadatas:N0} metadatas, {tombstones:N0} tombstones) " +
-					"in chunk {chunk} in {elapsed}. " +
-					"{rate:N2} records per second. " +
-					"Commit: {commitElapsed}. " +
-					"Chunk total: {chunkTotalElapsed}",
-					countAccumulatedRecords,
-					countOriginalStreamRecords, countMetaStreamRecords, countTombstoneRecords,
-					logicalChunkNumber, accumulationElapsed,
-					rate,
-					commitElapsed - weightsElapsed,
-					stopwatch.Elapsed);
-
-				state.LogAccumulationStats();
-
-				return ret;
-			} catch (Exception ex) {
-				if (ex is not OperationCanceledException) {
-					_logger.Error(ex, "SCAVENGING: Rolling back");
-				}
-				// invariant: there is always an open transaction whenever an exception can be thrown
-				transaction.Rollback();
-				throw;
-			}
-		}
-
-		// returns true to continue
-		// do not assume that record TimeStamps are non descending, clocks can change.
-		private bool AccumulateChunk(
-			ScavengePoint scavengePoint,
-			IScavengeStateForAccumulator<TStreamId> state,
-			WeightAccumulator weights,
-			int logicalChunkNumber,
-			RecordForAccumulator<TStreamId>.OriginalStreamRecord originalStreamRecord,
-			RecordForAccumulator<TStreamId>.MetadataStreamRecord metadataStreamRecord,
-			RecordForAccumulator<TStreamId>.TombStoneRecord tombStoneRecord,
-			CancellationToken cancellationToken,
-			out int countAccumulatedRecords,
-			out int countOriginalStreamRecords,
-			out int countMetaStreamRecords,
-			out int countTombstoneRecords,
-			out DateTime chunkMinTimeStamp,
-			out DateTime chunkMaxTimeStamp) {
-
-			countAccumulatedRecords = 0;
-			countOriginalStreamRecords = 0;
-			countMetaStreamRecords = 0;
-			countTombstoneRecords = 0;
-			// start with empty range and expand it as we discover records.
-			chunkMinTimeStamp = DateTime.MaxValue;
-			chunkMaxTimeStamp = DateTime.MinValue;
-
-			var scavengePointPosition = scavengePoint.Position;
-
-			if ((long)logicalChunkNumber * _chunkSize > scavengePointPosition) {
-				// this can happen if we accumulated the chunk with the scavenge point in it
-				// then checkpointed that we have done so.
-				return false;
-			}
-
-			var cancellationCheckCounter = 0;
-			foreach (var recordType in _chunkReader.ReadChunkInto(
-				         logicalChunkNumber,
-				         originalStreamRecord,
-				         metadataStreamRecord,
-				         tombStoneRecord)) {
-
-				RecordForAccumulator<TStreamId> record;
-				switch (recordType) {
-					case AccumulatorRecordType.OriginalStreamRecord:
-						ProcessOriginalStreamRecord(originalStreamRecord, state);
-						record = originalStreamRecord;
-						countOriginalStreamRecords++;
-						break;
-					case AccumulatorRecordType.MetadataStreamRecord:
-						ProcessMetastreamRecord(metadataStreamRecord, scavengePoint, state, weights);
-						record = metadataStreamRecord;
-						countMetaStreamRecords++;
-						break;
-					case AccumulatorRecordType.TombstoneRecord:
-						ProcessTombstone(tombStoneRecord, scavengePoint, state, weights);
-						record = tombStoneRecord;
-						countTombstoneRecords++;
-						break;
-					default:
-						throw new InvalidOperationException($"Unexpected recordType: {recordType}");
-				}
-
-				if (record.TimeStamp < chunkMinTimeStamp)
-					chunkMinTimeStamp = record.TimeStamp;
-
-				if (record.TimeStamp > chunkMaxTimeStamp)
-					chunkMaxTimeStamp = record.TimeStamp;
-
-				countAccumulatedRecords++;
-
-				if (record.LogPosition == scavengePointPosition) {
-					// accumulated the scavenge point, time to stop.
-					return false;
-				} else if (record.LogPosition > scavengePointPosition) {
-					throw new Exception("Accumulator expected to find the scavenge point before now.");
-				}
-
-				if (++cancellationCheckCounter == _cancellationCheckPeriod) {
-					cancellationCheckCounter = 0;
-					cancellationToken.ThrowIfCancellationRequested();
-					_throttle.Rest(cancellationToken);
-				}
-			}
-
-			return true;
-		}
-
-		// For every* record in an original stream we need to see if its stream collides.
-		// its not so bad, because we have a cache
-		// * maybe not every.. once we are accumulating records that have never been scavenged then
-		// we only need to check records with eventnumber 0
-		//    (and perhaps -1 to cover transactions)
-		//    but we don't know when this starts. and we have to make sure it is impossible for a new
-		//    streams first event is anything other than 0.
-		private static void ProcessOriginalStreamRecord(
-			RecordForAccumulator<TStreamId>.OriginalStreamRecord record,
-			IScavengeStateForAccumulator<TStreamId> state) {
-
-			state.DetectCollisions(record.StreamId);
-		}
-
-		// For every record in a metadata stream
-		//   - check if the metastream or originalstream collide with anything
-		//   - store the metadata against the original stream so the calculator can calculate the
-		//         discard point.
-		//   - update the discard point of the metadatastream
-		//   - increase the weight of the chunk with the old metadata if applicable
-		// the actual type of the record isn't relevant. if it is in a metadata stream it affects
-		// the metadata. if its data parses to streammetadata then thats the metadata. if it doesn't
-		// parse, then it clears the metadata.
-		private void ProcessMetastreamRecord(
-			RecordForAccumulator<TStreamId>.MetadataStreamRecord record,
-			ScavengePoint scavengePoint,
-			IScavengeStateForAccumulator<TStreamId> state,
-			WeightAccumulator weights) {
-
-			var originalStreamId = _metastreamLookup.OriginalStreamOf(record.StreamId);
-			state.DetectCollisions(originalStreamId);
-			state.DetectCollisions(record.StreamId);
-
-			if (record.EventNumber < 0)
-				throw new InvalidOperationException(
-					$"Found metadata in transaction in stream {record.StreamId}");
-
-			CheckMetadataOrdering(
-				record,
-				state.GetStreamHandle(record.StreamId),
-				scavengePoint,
-				out var isInOrder,
-				out var replacedPosition);
-
-			if (replacedPosition.HasValue) {
-				var logicalChunkNumber = (int)(replacedPosition.Value / _chunkSize);
-				weights.OnDiscard(logicalChunkNumber: logicalChunkNumber);
-			}
-
-			if (!isInOrder) {
-				_logger.Information("SCAVENGING: Accumulator found out of order metadata: {stream}:{eventNumber}",
-					record.StreamId,
-					record.EventNumber);
-				return;
-			}
-
-			if (_metastreamLookup.IsMetaStream(originalStreamId)) {
-				// record in a metadata stream of a metadata stream: $$$$xyz
-				// this does not set metadata for $$xyz (which is fixed at maxcount1)
-				// (see IndexReader.GetStreamMetadataCached)
-				// but it does, itself, have a fixed metadata of maxcount1, so move the discard point.
-			} else {
-				// record is in a standard metadata stream: $$xyz
-				// Update the Metadata for stream xyz
-				state.SetOriginalStreamMetadata(originalStreamId, record.Metadata);
-			}
-
-			// Update the discard point
-			var discardPoint = DiscardPoint.DiscardBefore(record.EventNumber);
-			if (discardPoint != DiscardPoint.KeepAll) {
-				state.SetMetastreamDiscardPoint(record.StreamId, discardPoint);
-			} else {
-				// no need to set a discard point for the first metadata record because
-				// there is nothing to discard.
-			}
-		}
-
-		// For every tombstone
-		//   - check if the stream collides
-		//   - set the istombstoned flag to true
-		//   - increase the weight of the chunk with the old metadata if applicable
-		private void ProcessTombstone(
-			RecordForAccumulator<TStreamId>.TombStoneRecord record,
-			ScavengePoint scavengePoint,
-			IScavengeStateForAccumulator<TStreamId> state,
-			WeightAccumulator weights) {
-
-			state.DetectCollisions(record.StreamId);
-
-			if (_metastreamLookup.IsMetaStream(record.StreamId)) {
-				// isn't possible to write a tombstone to a metadatastream, but spot it in case
-				// it ever was possible.
-				throw new InvalidOperationException(
-					$"Found Tombstone in metadata stream {record.StreamId}");
-			}
-
-			if (record.EventNumber < 0) {
-				throw new InvalidOperationException(
-					$"Found Tombstone in transaction in stream {record.StreamId}");
-			}
-
-			var originalStreamId = record.StreamId;
-			state.SetOriginalStreamTombstone(originalStreamId);
-
-			var metastreamId = _metastreamLookup.MetaStreamOf(originalStreamId);
-			// required before we do state operations with the metastreamId
-			state.DetectCollisions(metastreamId);
-			state.SetMetastreamTombstone(metastreamId);
-
-			// unlike metadata, a tombstone still takes effect even it is out of order in the log
-			// (because the index will still bless it with a max event number in the indexentry)
-			// so we don't need to check for order, but just need to get the last metadata record
-			// if any, and add weight for it.
-			// note that the metadata record is in a different stream to the tombstone
-			// note that since it is tombstoned, there wont be more metadata records coming so
-			// the last one really is the one we want.
-			var eventInfos = _index.ReadEventInfoBackward(
-				streamId: metastreamId,
-				handle: state.GetStreamHandle(metastreamId),
-				fromEventNumber: -1, // last
-				maxCount: 1,
-				scavengePoint: scavengePoint).EventInfos;
-
-			foreach (var eventInfo in eventInfos) {
-				var logicalChunkNumber = (int)(eventInfo.LogPosition / _chunkSize);
-				weights.OnDiscard(logicalChunkNumber: logicalChunkNumber);
-			}
-		}
-
-		private void CheckMetadataOrdering(
-			RecordForAccumulator<TStreamId>.MetadataStreamRecord record,
-			StreamHandle<TStreamId> metastreamId,
-			ScavengePoint scavengePoint,
-			out bool isInOrder,
-			out long? replacedPosition) {
-
-			// We have just received a metadata record.
-			// we need to achieve two things here
-			// 1. determine if this record is in order. if not we will skip over it and not apply it.
-			// 2. add appropriate weights
-			//     - this is the first metadata record -> no weight to add.
-			//     - we are displacing a record -> add weight to its chunk
-			//     - we are skipping over this record -> add weight to this records chunk
-			//
-			// todo: consider searching the rest of the eventInfos in the stream, not just 100 events
-			// but the chances of that many consecutive invalid metastream records being written is slim,
-			// and if the writes didn't produce the desired effect it is likely the user wrote the
-			// metadata successfully afterwards anyway.
-
-			// start from the event before us if possible, to see which event we are replacing.
-			var fromEventNumber = record.EventNumber == 0
-				? record.EventNumber
-				: record.EventNumber - 1;
-
-			var eventInfos = _index.ReadEventInfoForward(
-				handle: metastreamId,
-				fromEventNumber: fromEventNumber,
-				maxCount: 100,
-				scavengePoint: scavengePoint).EventInfos;
-
-			isInOrder = true;
-			foreach (var eventInfo in eventInfos) {
-				if (eventInfo.LogPosition < record.LogPosition &&
-					eventInfo.EventNumber >= record.EventNumber) {
-
-					// found an event that is before us in the log but has our event number or higher.
-					// that record is the metadata that we will keep, skipping over this one.
-					isInOrder = false;
-				}
-			}
-
-			if (isInOrder) {
-				if (eventInfos.Length > 0 &&
-					eventInfos[0].EventNumber < record.EventNumber &&
-					eventInfos[0].LogPosition < record.LogPosition) {
-					replacedPosition = eventInfos[0].LogPosition;
-				} else {
-					replacedPosition = null;
-				}
-			} else {
-				replacedPosition = record.LogPosition;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Stages/Calculator.cs b/src/EventStore.Core/TransactionLog/Scavenging/Stages/Calculator.cs
deleted file mode 100644
index b537654ab1e..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Stages/Calculator.cs
+++ /dev/null
@@ -1,317 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Threading;
-using Serilog;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class Calculator<TStreamId> : ICalculator<TStreamId> {
-		private readonly ILogger _logger;
-		private readonly IIndexReaderForCalculator<TStreamId> _index;
-		private readonly int _chunkSize;
-		private readonly int _cancellationCheckPeriod;
-		private readonly Buffer _buffer;
-		private readonly Throttle _throttle;
-
-		public class Buffer {
-			public Buffer(int size) {
-				Array = new(StreamHandle<TStreamId>, OriginalStreamData)[size];
-			}
-
-			public (StreamHandle<TStreamId>, OriginalStreamData)[] Array { get; init; }
-		}
-
-		public Calculator(
-			ILogger logger,
-			IIndexReaderForCalculator<TStreamId> index,
-			int chunkSize,
-			int cancellationCheckPeriod,
-			Buffer buffer,
-			Throttle throttle) {
-
-			_logger = logger;
-			_index = index;
-			_chunkSize = chunkSize;
-			_cancellationCheckPeriod = cancellationCheckPeriod;
-			_buffer = buffer;
-			_throttle = throttle;
-		}
-
-		public void Calculate(
-			ScavengePoint scavengePoint,
-			IScavengeStateForCalculator<TStreamId> state,
-			CancellationToken cancellationToken) {
-
-			_logger.Debug("SCAVENGING: Started new scavenge calculation phase for {scavengePoint}",
-				scavengePoint.GetName());
-
-			var checkpoint = new ScavengeCheckpoint.Calculating<TStreamId>(
-				scavengePoint: scavengePoint,
-				doneStreamHandle: default);
-			state.SetCheckpoint(checkpoint);
-			Calculate(checkpoint, state, cancellationToken);
-		}
-
-		public void Calculate(
-			ScavengeCheckpoint.Calculating<TStreamId> checkpoint,
-			IScavengeStateForCalculator<TStreamId> state,
-			CancellationToken cancellationToken) {
-
-			_logger.Debug("SCAVENGING: Calculating from checkpoint: {checkpoint}", checkpoint);
-			var stopwatch = Stopwatch.StartNew();
-
-			var weights = new WeightAccumulator(state);
-			var scavengePoint = checkpoint.ScavengePoint;
-			var streamCalc = new StreamCalculator<TStreamId>(_index, scavengePoint);
-			var eventCalc = new EventCalculator<TStreamId>(_chunkSize, _index, state, scavengePoint, streamCalc);
-
-			var cancellationCheckCounter = 0;
-			var periodStart = stopwatch.Elapsed;
-			var totalCounter = 0;
-
-			// iterate through the original (i.e. non-meta) streams that need scavenging (i.e.
-			// those that have metadata or tombstones)
-			// - for each one use the accumulated data to set/update the discard points of the stream.
-			// - along the way add weight to the affected chunks.
-			// note that the discard points will never discard the last event from the stream.
-			// there are limited scenarios when we do want to do this, (metadata streams when the main
-			// stream is tombstoned, and when UnsafeIgnoreHardDeletes is true) and they are governed by
-			// the IsTombstoned flags.
-
-			// we read a batch of streams at a time so that each time we commit there is no active read
-			// prevents any risk of the WAL not being able to reset.
-			static bool TryPopulateBuffer(
-				IScavengeStateForCalculator<TStreamId> state,
-				StreamHandle<TStreamId> checkpoint,
-				(StreamHandle<TStreamId>, OriginalStreamData)[] buffer,
-				out int count) {
-
-				count = 0;
-				var streams = state.OriginalStreamsToCalculate(checkpoint);
-				foreach (var stream in streams) {
-					buffer[count++] = stream;
-					if (count == buffer.Length)
-						break;
-				}
-
-				return count > 0;
-			}
-
-			var buffer = _buffer.Array;
-			var cp = checkpoint?.DoneStreamHandle ?? default;
-			while (TryPopulateBuffer(state, cp, buffer, out var countInBatch)) {
-				// for determinism it is important that IncreaseChunkWeight is called in a transaction with
-				// its calculation and checkpoint, otherwise the weight could be increased again on recovery
-				var transaction = state.BeginTransaction();
-				try {
-					for (int i = 0; i < countInBatch; i++) {
-						var (originalStreamHandle, originalStreamData) = buffer[i];
-						if (originalStreamData.Status != CalculationStatus.Active)
-							throw new InvalidOperationException(
-								$"Attempted to calculate a {originalStreamData.Status} record: {originalStreamData}");
-
-						streamCalc.SetStream(originalStreamHandle, originalStreamData);
-						var newStatus = streamCalc.CalculateStatus();
-
-						CalculateDiscardPointsForOriginalStream(
-							eventCalc,
-							weights,
-							originalStreamHandle,
-							scavengePoint,
-							cancellationToken,
-							ref cancellationCheckCounter,
-							out var newDiscardPoint,
-							out var newMaybeDiscardPoint);
-
-						// don't allow the discard point to move backwards
-						if (newDiscardPoint < originalStreamData.DiscardPoint) {
-							newDiscardPoint = originalStreamData.DiscardPoint;
-						}
-
-						// don't allow the maybe discard point to move backwards
-						if (newMaybeDiscardPoint < originalStreamData.MaybeDiscardPoint) {
-							newMaybeDiscardPoint = originalStreamData.MaybeDiscardPoint;
-						}
-
-						if (newStatus == originalStreamData.Status &&
-							newDiscardPoint == originalStreamData.DiscardPoint &&
-							newMaybeDiscardPoint == originalStreamData.MaybeDiscardPoint) {
-
-							// nothing to update for this stream
-						} else {
-							state.SetOriginalStreamDiscardPoints(
-								streamHandle: originalStreamHandle,
-								status: newStatus,
-								discardPoint: newDiscardPoint,
-								maybeDiscardPoint: newMaybeDiscardPoint);
-						}
-
-						totalCounter++;
-					}
-
-					// the last stream we processed is in the calculator
-					cp = streamCalc.OriginalStreamHandle;
-					weights.Flush();
-					transaction.Commit(new ScavengeCheckpoint.Calculating<TStreamId>(
-						scavengePoint,
-						cp));
-
-					var elapsed = stopwatch.Elapsed;
-					LogRate($"period", countInBatch, elapsed - periodStart);
-					LogRate("total", totalCounter, elapsed);
-
-					periodStart = stopwatch.Elapsed;
-				} catch (Exception ex) {
-					if (ex is not OperationCanceledException) {
-						_logger.Error(ex, "SCAVENGING: Rolling back");
-					}
-					// invariant: there is always an open transaction whenever an exception can be thrown
-					transaction.Rollback();
-					throw;
-				}
-			}
-
-			LogRate("grand total (including rests)", totalCounter, stopwatch.Elapsed);
-			_throttle.Rest(cancellationToken);
-		}
-
-		private void LogRate(string name, int count, TimeSpan elapsed) {
-			var rate = count / elapsed.TotalSeconds;
-			_logger.Debug(
-				"SCAVENGING: Calculated in " + name + ": {count:N0} streams in {elapsed}. {rate:N2} streams per second",
-				count, elapsed, rate);
-		}
-
-		// This does two things.
-		// 1. Calculates and returns the discard points for this stream
-		// 2. Adds weight to the affected chunks so that they get scavenged.
-		//
-		// The calculator determines that we can definitely discard everything up to the discardPoint
-		// and we may be able to discard things between the discardPoint and the maybeDiscardPoint.
-		//
-		// We want to calculate the discard points from scratch, without considering what values they
-		// came out as last time.
-		private void CalculateDiscardPointsForOriginalStream(
-			EventCalculator<TStreamId> eventCalc,
-			WeightAccumulator weights,
-			StreamHandle<TStreamId> originalStreamHandle,
-			ScavengePoint scavengePoint,
-			CancellationToken cancellationToken,
-			ref int cancellationCheckCounter,
-			out DiscardPoint discardPoint,
-			out DiscardPoint maybeDiscardPoint) {
-
-			var fromEventNumber = 0L;
-
-			discardPoint = DiscardPoint.KeepAll;
-			maybeDiscardPoint = DiscardPoint.KeepAll;
-
-			const int maxCount = 8192;
-
-			var first = true;
-			var allDiscardedSoFar = true;
-
-			while (true) {
-				// read in slices because the stream might be huge.
-				// note: when the handle is a hash the ReadEventInfoForward call is index-only
-				// note: the event infos are not necessarily contiguous
-				var result = _index.ReadEventInfoForward(
-					originalStreamHandle,
-					fromEventNumber,
-					maxCount,
-					scavengePoint);
-
-				var slice = result.EventInfos;
-
-				foreach (var eventInfo in slice) {
-					// Check cancellation and rest occasionally
-					if (++cancellationCheckCounter == _cancellationCheckPeriod) {
-						cancellationCheckCounter = 0;
-						cancellationToken.ThrowIfCancellationRequested();
-						_throttle.Rest(cancellationToken);
-					}
-
-					eventCalc.SetEvent(eventInfo);
-
-					if (first) {
-						// this is the first event that is known to the index. advance the discard points
-						// to discard everything before here since they're already discarded. (we need
-						// this because the chunks haven't necessarily been executed yet so we want to
-						// make sure those records are removed when the chunks are scavenged. note that
-						// chunk weight has already been added for them, so no need to do that again.
-						discardPoint = DiscardPoint.DiscardBefore(eventInfo.EventNumber);
-						maybeDiscardPoint = discardPoint;
-						first = false;
-					}
-
-					switch (eventCalc.DecideEvent()) {
-						case DiscardDecision.Discard:
-							weights.OnDiscard(eventCalc.LogicalChunkNumber);
-							discardPoint = DiscardPoint.DiscardIncluding(eventInfo.EventNumber);
-							allDiscardedSoFar = true;
-							break;
-
-						case DiscardDecision.MaybeDiscard:
-							// add weight to the chunk so that this will be inspected more closely
-							// it is possible that we already added weight on a previous scavenge and are
-							// doing so again, but we must because the weight may have been reset
-							// by the previous scavenge
-							weights.OnMaybeDiscard(eventCalc.LogicalChunkNumber);
-							maybeDiscardPoint = DiscardPoint.DiscardIncluding(eventInfo.EventNumber);
-							allDiscardedSoFar = false;
-							break;
-
-						case DiscardDecision.AlreadyDiscarded:
-							// this event has already been deleted from the chunks but not from the index.
-							// we move the discard point forward only if all events before it have been or will be discarded for the following reasons:
-							//
-							// i) usually, there should be no gaps between the event numbers of a stream but this property is not guaranteed
-							// with the previous scavenger. if it happens that this event was in a stream gap and we always moved the discard point
-							// forward, we would end up deleting all the events that were present before the gap.
-							//
-							// ii) we do our best to delete stale entries from the index
-
-							if (allDiscardedSoFar)
-								discardPoint = DiscardPoint.DiscardIncluding(eventInfo.EventNumber);
-							break;
-
-						case DiscardDecision.Keep:
-							// found the first one to keep. we are done discarding. to help keep things
-							// simple, move the maybe up to the discardpoint if it is behind.
-							maybeDiscardPoint = maybeDiscardPoint.Or(discardPoint);
-							return;
-
-						default:
-							throw new Exception(
-								$"Invalid discard decision for stream {originalStreamHandle}.");
-					}
-				}
-
-				// we haven't found an event to definitely keep
-				if (result.IsEndOfStream) {
-					// we have finished reading the stream from the index,
-					// but not found any events to keep.
-					// we therefore didn't find any at all, or found some and discarded them all
-					// (the latter should not be possible)
-					if (first) {
-						// we didn't find any at all
-						// - the stream might actually be empty
-						// - the stream might have events after the scavenge point and old scavenge
-						//   has removed the ones before
-						// we didn't find anything to discard, so keep everything.
-						discardPoint = DiscardPoint.KeepAll;
-						maybeDiscardPoint = DiscardPoint.KeepAll;
-						return;
-					} else {
-						// we found some and discarded them all, oops.
-						throw new Exception(
-							$"Calculated that all events for stream {originalStreamHandle} " +
-							$"should be discarded. This should be impossible.");
-					}
-				} else {
-					// we aren't done reading slices, read the next slice.
-					fromEventNumber = result.NextEventNumber;
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Stages/ChunkExecutor.cs b/src/EventStore.Core/TransactionLog/Scavenging/Stages/ChunkExecutor.cs
deleted file mode 100644
index cfd779cde75..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Stages/ChunkExecutor.cs
+++ /dev/null
@@ -1,399 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Exceptions;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.TransactionLog.Chunks;
-using Serilog;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class ChunkExecutor<TStreamId, TRecord> : IChunkExecutor<TStreamId> {
-		private readonly ILogger _logger;
-		private readonly IMetastreamLookup<TStreamId> _metastreamLookup;
-		private readonly IChunkManagerForChunkExecutor<TStreamId, TRecord> _chunkManager;
-		private readonly long _chunkSize;
-		private readonly bool _unsafeIgnoreHardDeletes;
-		private readonly int _cancellationCheckPeriod;
-		private readonly int _threads;
-		private readonly Throttle _throttle;
-
-		public ChunkExecutor(
-			ILogger logger,
-			IMetastreamLookup<TStreamId> metastreamLookup,
-			IChunkManagerForChunkExecutor<TStreamId, TRecord> chunkManager,
-			long chunkSize,
-			bool unsafeIgnoreHardDeletes,
-			int cancellationCheckPeriod,
-			int threads,
-			Throttle throttle) {
-
-			_logger = logger;
-			_metastreamLookup = metastreamLookup;
-			_chunkManager = chunkManager;
-			_chunkSize = chunkSize;
-			_unsafeIgnoreHardDeletes = unsafeIgnoreHardDeletes;
-			_cancellationCheckPeriod = cancellationCheckPeriod;
-			_threads = threads;
-			_throttle = throttle;
-		}
-
-		public ValueTask Execute(
-			ScavengePoint scavengePoint,
-			IScavengeStateForChunkExecutor<TStreamId> state,
-			ITFChunkScavengerLog scavengerLogger,
-			CancellationToken cancellationToken) {
-
-			_logger.Debug("SCAVENGING: Started new scavenge chunk execution phase for {scavengePoint}",
-				scavengePoint.GetName());
-
-			var checkpoint = new ScavengeCheckpoint.ExecutingChunks(
-				scavengePoint: scavengePoint,
-				doneLogicalChunkNumber: default);
-			state.SetCheckpoint(checkpoint);
-			return Execute(checkpoint, state, scavengerLogger, cancellationToken);
-		}
-
-		public async ValueTask Execute(
-			ScavengeCheckpoint.ExecutingChunks checkpoint,
-			IScavengeStateForChunkExecutor<TStreamId> state,
-			ITFChunkScavengerLog scavengerLogger,
-			CancellationToken cancellationToken) {
-
-			_logger.Debug("SCAVENGING: Executing chunks from checkpoint: {checkpoint}", checkpoint);
-
-			var startFromChunk = checkpoint?.DoneLogicalChunkNumber + 1 ?? 0;
-			var scavengePoint = checkpoint.ScavengePoint;
-
-			var physicalChunks = GetAllPhysicalChunks(startFromChunk, scavengePoint);
-
-			var borrowedStates = new IScavengeStateForChunkExecutorWorker<TStreamId>[_threads];
-			var stopwatches = new Stopwatch[_threads];
-
-			for (var i = 0; i < borrowedStates.Length; i++) {
-				borrowedStates[i] = state.BorrowStateForWorker();
-				stopwatches[i] = new Stopwatch();
-			}
-
-			try {
-				await ParallelLoop.RunWithTrailingCheckpointAsync(
-					source: physicalChunks,
-					degreeOfParallelism: _threads,
-					getCheckpointInclusive: physicalChunk => physicalChunk.ChunkEndNumber,
-					getCheckpointExclusive: physicalChunk => {
-						if (physicalChunk.ChunkStartNumber == 0)
-							return null;
-						return physicalChunk.ChunkStartNumber - 1;
-					},
-					process: async (slot, physicalChunk, cancellationToken) => {
-						// this is called on other threads
-						var concurrentState = borrowedStates[slot];
-						var sw = stopwatches[slot];
-
-						// the physical chunks do not overlap in chunk range, so we can sum
-						// and reset them concurrently
-						var physicalWeight = concurrentState.SumChunkWeights(
-							physicalChunk.ChunkStartNumber,
-							physicalChunk.ChunkEndNumber);
-
-						if (physicalWeight > scavengePoint.Threshold || _unsafeIgnoreHardDeletes) {
-							await ExecutePhysicalChunk(
-								physicalWeight,
-								scavengePoint,
-								concurrentState,
-								scavengerLogger,
-								physicalChunk,
-								sw,
-								cancellationToken);
-
-							// resetting must happen after execution, but need not be in a transaction
-							// which is handy, because we cant run transactions concurrently very well
-							// https://www.sqlite.org/cgi/src/doc/begin-concurrent/doc/begin_concurrent.md)
-							concurrentState.ResetChunkWeights(
-								physicalChunk.ChunkStartNumber,
-								physicalChunk.ChunkEndNumber);
-						} else {
-							_logger.Debug(
-								"SCAVENGING: Skipped physical chunk: {oldChunkName} " +
-								"with weight {physicalWeight:N0}. ",
-								physicalChunk.Name,
-								physicalWeight);
-						}
-
-						cancellationToken.ThrowIfCancellationRequested();
-					},
-					emitCheckpoint: chunkEndNumber => {
-						// this is called on the thread that called the loop, which does not do any of
-						// the processing.
-						// it is called after an item has been processed and before the slot is used
-						// to process another item. this gives us a meaningful opportunity to rest.
-						state.SetCheckpoint(
-							new ScavengeCheckpoint.ExecutingChunks(
-								scavengePoint,
-								chunkEndNumber));
-
-						if (_threads == 1) {
-							_throttle.Rest(cancellationToken);
-						} else {
-							// running a multithreaded scavenge with throttle < 100
-							// is rejected by the AdminController.
-						}
-					},
-					token: cancellationToken);
-			} finally {
-				for (var i = 0; i < borrowedStates.Length; i++) {
-					borrowedStates[i].Dispose();
-				}
-			}
-		}
-
-		private IEnumerable<IChunkReaderForExecutor<TStreamId, TRecord>> GetAllPhysicalChunks(
-			int startFromChunk,
-			ScavengePoint scavengePoint) {
-
-			var scavengePos = _chunkSize * startFromChunk;
-			var upTo = scavengePoint.Position;
-			while (scavengePos < upTo) {
-				// in bounds because we stop before the scavenge point
-				var physicalChunk = _chunkManager.GetChunkReaderFor(scavengePos);
-
-				if (!physicalChunk.IsReadOnly)
-					throw new Exception(
-						$"Reached open chunk before scavenge point. " +
-						$"Chunk {physicalChunk.ChunkStartNumber}. ScavengePoint: {upTo}.");
-
-				yield return physicalChunk;
-
-				scavengePos = physicalChunk.ChunkEndPosition;
-			}
-		}
-
-		private async ValueTask ExecutePhysicalChunk(
-			float physicalWeight,
-			ScavengePoint scavengePoint,
-			IScavengeStateForChunkExecutorWorker<TStreamId> state,
-			ITFChunkScavengerLog scavengerLogger,
-			IChunkReaderForExecutor<TStreamId, TRecord> sourceChunk,
-			Stopwatch sw,
-			CancellationToken cancellationToken) {
-
-			sw.Restart();
-
-			int chunkStartNumber = sourceChunk.ChunkStartNumber;
-			long chunkStartPos = sourceChunk.ChunkStartPosition;
-			int chunkEndNumber = sourceChunk.ChunkEndNumber;
-			long chunkEndPos = sourceChunk.ChunkEndPosition;
-			var oldChunkName = sourceChunk.Name;
-
-			_logger.Debug(
-				"SCAVENGING: Started to scavenge physical chunk: {oldChunkName} " +
-				"with weight {physicalWeight:N0}. " +
-				"{chunkStartNumber} => {chunkEndNumber} ({chunkStartPosition} => {chunkEndPosition})",
-				oldChunkName,
-				physicalWeight,
-				chunkStartNumber, chunkEndNumber, chunkStartPos, chunkEndPos);
-
-			IChunkWriterForExecutor<TStreamId, TRecord> outputChunk;
-			try {
-				outputChunk = _chunkManager.CreateChunkWriter(sourceChunk);
-				_logger.Debug(
-					"SCAVENGING: Resulting temp chunk file: {tmpChunkPath}.",
-					Path.GetFileName(outputChunk.FileName));
-
-			} catch (IOException ex) {
-				_logger.Error(ex,
-					"IOException during creating new chunk for scavenging purposes. " +
-					"Stopping scavenging process...");
-				throw;
-			}
-
-			try {
-				var cancellationCheckCounter = 0;
-				var discardedCount = 0;
-				var keptCount = 0;
-
-				// nonPrepareRecord and prepareRecord ae reused through the iteration
-				var nonPrepareRecord = new RecordForExecutor<TStreamId, TRecord>.NonPrepare();
-				var prepareRecord = new RecordForExecutor<TStreamId, TRecord>.Prepare();
-
-				await foreach (var isPrepare in sourceChunk.ReadInto(nonPrepareRecord, prepareRecord, cancellationToken)) {
-					if (isPrepare) {
-						if (ShouldDiscard(state, scavengePoint, prepareRecord)) {
-							discardedCount++;
-						} else {
-							keptCount++;
-							outputChunk.WriteRecord(prepareRecord);
-						}
-					} else {
-						keptCount++;
-						outputChunk.WriteRecord(nonPrepareRecord);
-					}
-
-					if (++cancellationCheckCounter == _cancellationCheckPeriod) {
-						cancellationCheckCounter = 0;
-						cancellationToken.ThrowIfCancellationRequested();
-					}
-				}
-
-				_logger.Debug(
-					"SCAVENGING: Scavenging {oldChunkName} traversed {recordsCount:N0}. " +
-					" Kept {keptCount:N0}. Discarded {discardedCount:N0}",
-					oldChunkName, discardedCount + keptCount,
-					keptCount, discardedCount);
-
-				var (newFileName, newFileSize) = await outputChunk.Complete(cancellationToken);
-
-				var elapsed = sw.Elapsed;
-				_logger.Debug(
-					"SCAVENGING: Scavenging of chunks:"
-					+ "\n{oldChunkName}"
-					+ "\ncompleted in {elapsed}."
-					+ "\nNew chunk: {tmpChunkPath} --> #{chunkStartNumber}-{chunkEndNumber} ({newChunk})."
-					+ "\nOld chunk total size: {oldSize}, scavenged chunk size: {newSize}.",
-					oldChunkName,
-					elapsed,
-					Path.GetFileName(outputChunk.FileName), chunkStartNumber, chunkEndNumber,
-					Path.GetFileName(newFileName),
-					sourceChunk.FileSize, newFileSize);
-
-				var spaceSaved = sourceChunk.FileSize - newFileSize;
-				scavengerLogger.ChunksScavenged(chunkStartNumber, chunkEndNumber, elapsed, spaceSaved);
-
-			} catch (FileBeingDeletedException exc) {
-				_logger.Information(
-					"SCAVENGING: Got FileBeingDeletedException exception during scavenging, that probably means some chunks were re-replicated."
-					+ "\nStopping scavenging and removing temp chunk '{tmpChunkPath}'..."
-					+ "\nException message: {e}.",
-					outputChunk.FileName,
-					exc.Message);
-
-				outputChunk.Abort(deleteImmediately: true);
-				throw;
-
-			} catch (OperationCanceledException) {
-				_logger.Information("SCAVENGING: Cancelled at: {oldChunkName}", oldChunkName);
-				outputChunk.Abort(deleteImmediately: false);
-				throw;
-
-			} catch (Exception ex) {
-				_logger.Information(
-					ex,
-					"SCAVENGING: Got exception while scavenging chunk: #{chunkStartNumber}-{chunkEndNumber}.",
-					chunkStartNumber, chunkEndNumber);
-
-				outputChunk.Abort(deleteImmediately: true);
-				throw;
-			}
-		}
-
-		private bool ShouldDiscard(
-			IScavengeStateForChunkExecutorWorker<TStreamId> state,
-			ScavengePoint scavengePoint,
-			RecordForExecutor<TStreamId, TRecord>.Prepare record) {
-
-			// the discard points ought to be sufficient, but sometimes this will be quicker
-			// and it is a nice safety net
-			if (record.LogPosition >= scavengePoint.Position)
-				return false;
-
-			var details = GetStreamExecutionDetails(
-				state,
-				record.StreamId);
-
-			if (!record.IsSelfCommitted) {
-				// deal with transactions first. since it is not self committed, this prepare is
-				// associated with an explicit transaction. is one of: begin, data, end.
-				if (details.IsTombstoned) {
-					// explicit transaction in a tombstoned stream.
-					if (_unsafeIgnoreHardDeletes) {
-						// remove all prepares including the tombstone
-						return true;
-					} else {
-						// remove all the prepares except
-						// - the tombstone itself and
-						// - any TransactionBegins (because old scavenge keeps these if there is any
-						//   doubt about whether it has been committed)
-						if (record.IsTombstone || record.IsTransactionBegin) {
-							return false;
-						} else {
-							return true;
-						}
-					}
-				} else {
-					// keep it all.
-					// we could discard from transactions sometimes, either by accumulating a state for them
-					// or doing a similar trick as old scavenge and limiting it to transactions that were
-					// stated and commited in the same chunk. however for now this isn't considered so
-					// important because someone with transactions to scavenge has probably scavenged them
-					// already with old scavenge. could be added later
-					return false;
-				}
-			}
-
-			if (details.IsTombstoned) {
-				if (_unsafeIgnoreHardDeletes) {
-					// remove _everything_ for metadata and original streams
-					_logger.Information(
-						"SCAVENGING: Removing hard deleted stream tombstone for stream {stream} at position {transactionPosition}",
-						record.StreamId, record.LogPosition);
-					return true;
-				}
-
-				if (_metastreamLookup.IsMetaStream(record.StreamId)) {
-					// when the original stream is tombstoned we can discard the _whole_ metadata stream
-					return true;
-				}
-
-				// otherwise obey the discard points below.
-			}
-
-			// if discardPoint says discard then discard.
-			if (details.DiscardPoint.ShouldDiscard(record.EventNumber)) {
-				return true;
-			}
-
-			// if maybeDiscardPoint says discard then maybe we can discard - depends on maxage
-			if (!details.MaybeDiscardPoint.ShouldDiscard(record.EventNumber)) {
-				// both discard points said do not discard, so dont.
-				return false;
-			}
-
-			// discard said no, but maybe discard said yes
-			if (!details.MaxAge.HasValue) {
-				return false;
-			}
-
-			return record.TimeStamp < scavengePoint.EffectiveNow - details.MaxAge;
-		}
-
-		private ChunkExecutionInfo GetStreamExecutionDetails(
-			IScavengeStateForChunkExecutorWorker<TStreamId> state,
-			TStreamId streamId) {
-
-			if (_metastreamLookup.IsMetaStream(streamId)) {
-				if (!state.TryGetMetastreamData(streamId, out var metastreamData)) {
-					metastreamData = MetastreamData.Empty;
-				}
-
-				return new ChunkExecutionInfo(
-					isTombstoned: metastreamData.IsTombstoned,
-					discardPoint: metastreamData.DiscardPoint,
-					maybeDiscardPoint: DiscardPoint.KeepAll,
-					maxAge: null);
-			} else {
-				// original stream
-				if (state.TryGetChunkExecutionInfo(streamId, out var details)) {
-					return details;
-				} else {
-					return new ChunkExecutionInfo(
-						isTombstoned: false,
-						discardPoint: DiscardPoint.KeepAll,
-						maybeDiscardPoint: DiscardPoint.KeepAll,
-						maxAge: null);
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Stages/ChunkMerger.cs b/src/EventStore.Core/TransactionLog/Scavenging/Stages/ChunkMerger.cs
deleted file mode 100644
index c9cdd7047a2..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Stages/ChunkMerger.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.TransactionLog.Chunks;
-using Serilog;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class ChunkMerger : IChunkMerger {
-		private readonly ILogger _logger;
-		private readonly bool _mergeChunks;
-		private readonly IChunkMergerBackend _backend;
-		private readonly Throttle _throttle;
-
-		public ChunkMerger(
-			ILogger logger,
-			bool mergeChunks,
-			IChunkMergerBackend backend,
-			Throttle throttle) {
-
-			_logger = logger;
-			_mergeChunks = mergeChunks;
-			_backend = backend;
-			_throttle = throttle;
-		}
-
-		public ValueTask MergeChunks(
-			ScavengePoint scavengePoint,
-			IScavengeStateForChunkMerger state,
-			ITFChunkScavengerLog scavengerLogger,
-			CancellationToken cancellationToken) {
-
-			_logger.Debug("SCAVENGING: Started new scavenge chunk merging phase for {scavengePoint}",
-				scavengePoint.GetName());
-
-			var checkpoint = new ScavengeCheckpoint.MergingChunks(scavengePoint);
-			state.SetCheckpoint(checkpoint);
-			return MergeChunks(checkpoint, state, scavengerLogger, cancellationToken);
-		}
-
-		public ValueTask MergeChunks(
-			ScavengeCheckpoint.MergingChunks checkpoint,
-			IScavengeStateForChunkMerger state,
-			ITFChunkScavengerLog scavengerLogger,
-			CancellationToken cancellationToken) {
-
-			if (_mergeChunks) {
-				_logger.Debug("SCAVENGING: Merging chunks from checkpoint: {checkpoint}", checkpoint);
-				return _backend.MergeChunks(scavengerLogger, _throttle, cancellationToken);
-			}
-
-			_logger.Debug("SCAVENGING: Merging chunks is disabled");
-			return ValueTask.CompletedTask;
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Stages/Cleaner.cs b/src/EventStore.Core/TransactionLog/Scavenging/Stages/Cleaner.cs
deleted file mode 100644
index a3b506700b8..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Stages/Cleaner.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using System;
-using System.Threading;
-using Serilog;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class Cleaner : ICleaner {
-		private readonly ILogger _logger;
-		private readonly bool _unsafeIgnoreHardDeletes;
-
-		public Cleaner(
-			ILogger logger,
-			bool unsafeIgnoreHardDeletes) {
-			_logger = logger;
-			_unsafeIgnoreHardDeletes = unsafeIgnoreHardDeletes;
-		}
-
-		public void Clean(
-			ScavengePoint scavengePoint,
-			IScavengeStateForCleaner state,
-			CancellationToken cancellationToken) {
-
-			_logger.Debug("SCAVENGING: Started new scavenge clean up phase for {scavengePoint}",
-				scavengePoint.GetName());
-
-			var checkpoint = new ScavengeCheckpoint.Cleaning(scavengePoint);
-			state.SetCheckpoint(checkpoint);
-			Clean(checkpoint, state, cancellationToken);
-		}
-
-		public void Clean(
-			ScavengeCheckpoint.Cleaning checkpoint,
-			IScavengeStateForCleaner state,
-			CancellationToken cancellationToken) {
-
-			_logger.Debug("SCAVENGING: Cleaning checkpoint: {checkpoint}", checkpoint);
-
-			cancellationToken.ThrowIfCancellationRequested();
-
-			// we clean up in a transaction, not so that we can checkpoint, but just to save lots of
-			// implicit transactions from being created
-			var transaction = state.BeginTransaction();
-			try {
-				CleanImpl(state, cancellationToken);
-				transaction.Commit(checkpoint);
-			} catch {
-				transaction.Rollback();
-				throw;
-			}
-		}
-
-		private void CleanImpl(
-			IScavengeStateForCleaner state,
-			CancellationToken cancellationToken) {
-
-			// constant time operation
-			if (state.AllChunksExecuted()) {
-				// Now we know we have successfully executed every chunk with weight.
-
-				_logger.Debug("SCAVENGING: Deleting metastream data");
-				state.DeleteMetastreamData();
-
-				cancellationToken.ThrowIfCancellationRequested();
-
-				_logger.Debug("SCAVENGING: Deleting originalstream data. Deleting archived: {deleteArchived}",
-					_unsafeIgnoreHardDeletes);
-				state.DeleteOriginalStreamData(deleteArchived: _unsafeIgnoreHardDeletes);
-
-			} else {
-				// one or more chunks was not executed, due to error or not meeting the threshold
-				// either way, we cannot clean up the stream datas
-				if (_unsafeIgnoreHardDeletes) {
-					// the chunk executor should have stopped the scavenge if it couldn't execute any
-					// chunk when this flag is set.
-					// we could have removed the tombstone without removing all the other records.
-					throw new Exception(
-						"UnsafeIgnoreHardDeletes is true but not all chunks have been executed");
-				} else {
-					_logger.Debug("SCAVENGING: Skipping cleanup because some chunks have not been executed");
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Stages/EventCalculator.cs b/src/EventStore.Core/TransactionLog/Scavenging/Stages/EventCalculator.cs
deleted file mode 100644
index d6dd34b9e04..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Stages/EventCalculator.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	// This calculates information about the event so that the main calculator can decide what to do
-	public class EventCalculator<TStreamId> {
-		public EventCalculator(
-			int chunkSize,
-			IIndexReaderForCalculator<TStreamId> index,
-			IScavengeStateForCalculatorReadOnly<TStreamId> state,
-			ScavengePoint scavengePoint,
-			StreamCalculator<TStreamId> streamCalc) {
-
-			ChunkSize = chunkSize;
-			Index = index;
-			State = state;
-			ScavengePoint = scavengePoint;
-			Stream = streamCalc;
-		}
-
-		public void SetEvent(EventInfo eventInfo) {
-			EventInfo = eventInfo;
-		}
-
-		// State that doesn't change. scoped to the scavenge.
-		public int ChunkSize { get; }
-		public IIndexReaderForCalculator<TStreamId> Index { get; }
-		public IScavengeStateForCalculatorReadOnly<TStreamId> State { get; }
-		public ScavengePoint ScavengePoint { get; }
-		public StreamCalculator<TStreamId> Stream { get; }
-
-		// State that is scoped to the event.
-		public EventInfo EventInfo { get; private set; }
-
-		public bool IsOnOrAfterScavengePoint => EventInfo.LogPosition >= ScavengePoint.Position;
-
-		public int LogicalChunkNumber => (int)(EventInfo.LogPosition / ChunkSize);
-
-		public DiscardDecision DecideEvent() {
-			// Events in original streams can be discarded because of:
-			//   Tombstones, TruncateBefore, MaxCount, MaxAge.
-			//
-			// any one of these is enough to warrant a discard
-			// however none of them allow us to scavenge the last event
-			// or anything beyond the scavenge point, so we limit by that.
-
-			// respect the scavenge point
-			if (IsOnOrAfterScavengePoint) {
-				return DiscardDecision.Keep;
-			}
-
-			// keep last event in stream
-			// to be extra safe, we keep if it is after the 'last event' too, which should never happen.
-			if (EventInfo.EventNumber >= Stream.LastEventNumber) {
-				return DiscardDecision.Keep;
-			}
-
-			// for tombstoned streams, discard everything before the tombstone
-			if (Stream.IsTombstoned) {
-				// the tombstone is nearly always the last event and therefore already kept above ^
-				// BUT if the tombstone was created when event numbers were 32bit, and the index has
-				// not been _rebuilt_ since event numbers have been 64bit (merges and scavenges are not
-				// sufficient) then the tombstone will still appear in the index as having event number
-				// int.max instead of long.max. the system does not treat such a stream as deleted, so
-				// more events could be written and read after the tombstone, but rebuilding the index
-				// will make the whole stream deleted again.
-				//
-				// to avoid complicating this further in scavenge, we keep an eye out for such tombstones
-				// and keep the tombstone and any the events after it. without this check we would
-				// discard the tombstone and subsequent events except the last one, leaving the stream
-				// in a state where it is unclear why events were removed.
-				if (EventInfo.EventNumber == int.MaxValue && Index.IsTombstone(EventInfo.LogPosition)) {
-					return DiscardDecision.Keep;
-				}
-
-				// we already know this is not the last event, so discard it.
-				return DiscardDecision.Discard;
-			}
-
-			// truncatebefore, maxcount
-			if (Stream.TruncateBeforeOrMaxCountDiscardPoint.ShouldDiscard(EventInfo.EventNumber)) {
-				return DiscardDecision.Discard;
-			}
-
-			// up to maxage. keep if there is no maxage restriction
-			var cutoffTime = Stream.CutoffTime;
-			if (!cutoffTime.HasValue) {
-				return DiscardDecision.Keep;
-			}
-
-			// there is a maxage restriction
-			return ShouldDiscardForMaxAge(cutoffTime.Value);
-		}
-
-		private DiscardDecision ShouldDiscardForMaxAge(DateTime cutoffTime) {
-			// establish a range that the event was definitely created between.
-			if (!State.TryGetChunkTimeStampRange(LogicalChunkNumber, out var createdAtRange)) {
-				// we don't have a time stamp range for this chunk which implies that it was empty during accumulation.
-				// however while reading event infos from the index, we encountered an event from that chunk.
-				// this indicates that the event was deleted from the chunk but not from the index by the old scavenger.
-				return DiscardDecision.AlreadyDiscarded;
-			}
-
-			// range is guaranteed to be non-empty
-			if (cutoffTime <= createdAtRange.Min) {
-				// if the cutoff time is equal to the minimum then the record timestamp is definitely
-				// greater than or equal to the cutoff, so we keep it
-				return DiscardDecision.Keep;
-			}
-
-			if (createdAtRange.Max < cutoffTime) {
-				return DiscardDecision.Discard;
-			}
-
-			// it must be between min and max inclusive
-			return DiscardDecision.MaybeDiscard;
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Stages/IndexExecutor.cs b/src/EventStore.Core/TransactionLog/Scavenging/Stages/IndexExecutor.cs
deleted file mode 100644
index d6f2e25b26c..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Stages/IndexExecutor.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Core.Index;
-using Serilog;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class IndexExecutor<TStreamId> : IIndexExecutor<TStreamId> {
-		private readonly ILogger _logger;
-		private readonly IIndexScavenger _indexScavenger;
-		private readonly IChunkReaderForIndexExecutor<TStreamId> _streamLookup;
-		private readonly bool _unsafeIgnoreHardDeletes;
-		private readonly int _restPeriod;
-		private readonly Throttle _throttle;
-
-		public IndexExecutor(
-			ILogger logger,
-			IIndexScavenger indexScavenger,
-			IChunkReaderForIndexExecutor<TStreamId> streamLookup,
-			bool unsafeIgnoreHardDeletes,
-			int restPeriod,
-			Throttle throttle) {
-
-			_logger = logger;
-			_indexScavenger = indexScavenger;
-			_streamLookup = streamLookup;
-			_unsafeIgnoreHardDeletes = unsafeIgnoreHardDeletes;
-			_restPeriod = restPeriod;
-			_throttle = throttle;
-		}
-
-		public void Execute(
-			ScavengePoint scavengePoint,
-			IScavengeStateForIndexExecutor<TStreamId> state,
-			IIndexScavengerLog scavengerLogger,
-			CancellationToken cancellationToken) {
-
-			_logger.Debug("SCAVENGING: Started new scavenge index execution phase for {scavengePoint}",
-				scavengePoint.GetName());
-
-			var checkpoint = new ScavengeCheckpoint.ExecutingIndex(scavengePoint);
-			state.SetCheckpoint(checkpoint);
-			Execute(checkpoint, state, scavengerLogger, cancellationToken);
-		}
-
-		public void Execute(
-			ScavengeCheckpoint.ExecutingIndex checkpoint,
-			IScavengeStateForIndexExecutor<TStreamId> state,
-			IIndexScavengerLog scavengerLogger,
-			CancellationToken cancellationToken) {
-
-			_logger.Debug("SCAVENGING: Executing indexes from checkpoint: {checkpoint}", checkpoint);
-
-			_indexScavenger.ScavengeIndex(
-				scavengePoint: checkpoint.ScavengePoint.Position,
-				shouldKeep: GenShouldKeep(
-					checkpoint.ScavengePoint,
-					state,
-					cancellationToken),
-				log: scavengerLogger,
-				cancellationToken: cancellationToken);
-		}
-
-		private Func<IndexEntry, bool> GenShouldKeep(
-			ScavengePoint scavengePoint,
-			IScavengeStateForIndexExecutor<TStreamId> state,
-			CancellationToken cancellationToken) {
-
-			// we cache some stream info between invocations of ShouldKeep out here since it will
-			// typically be invoked repeatedly for the same stream.
-			var currentHash = (ulong?)null;
-			var currentHashIsCollision = false;
-			var currentPosition = long.MaxValue;
-			var currentDiscardPoint = DiscardPoint.KeepAll;
-			var currentIsTombstoned = false;
-			var currentIsDefinitelyMetastream = false;
-
-			var restCounter = 0;
-			var scavengePointPosition = scavengePoint.Position;
-
-			bool ShouldKeep(IndexEntry indexEntry) {
-				// Rest occasionally
-				if (++restCounter == _restPeriod) {
-					restCounter = 0;
-					_throttle.Rest(cancellationToken);
-				}
-
-				if (indexEntry.Position >= scavengePointPosition) {
-					// discard point will respect this anyway, but this is faster.
-					return true;
-				}
-
-				if (currentHash != indexEntry.Stream || currentHashIsCollision) {
-					// either the hash changed or (definitely on to a different stream) or
-					// the currentHash is a collision (maybe on to a different stream).
-					// need to set all 5 of the current* variables correctly.
-
-					currentHash = indexEntry.Stream;
-					currentHashIsCollision = state.IsCollision(indexEntry.Stream);
-					currentPosition = indexEntry.Position;
-
-					StreamHandle<TStreamId> handle = default;
-
-					if (currentHashIsCollision) {
-						// hash isn't enough to identify the stream. get its id.
-						if (!_streamLookup.TryGetStreamId(indexEntry.Position, out var streamId)) {
-							// there is no record at this position to get the stream from.
-							// we should definitely discard the entry (just like old index scavenge does)
-							// we can't even tell which stream it is for.
-							return false;
-						} else {
-							// we got a streamId, which means we must have found a record at this
-							// position, but that doesn't necessarily mean we want to keep the IndexEntry
-							// the log record might still exist only because its chunk hasn't reached
-							// the threshold.
-							handle = StreamHandle.ForStreamId(streamId);
-						}
-					} else {
-						// not a collision, we can get the discard point by hash.
-						handle = StreamHandle.ForHash<TStreamId>(currentHash.Value);
-					}
-
-					if (state.TryGetIndexExecutionInfo(handle, out var info)) {
-						currentIsTombstoned = info.IsTombstoned;
-						currentDiscardPoint = info.DiscardPoint;
-						currentIsDefinitelyMetastream = info.IsMetastream;
-					} else {
-						// this stream has no scavenge data accumulated. therefore is has no metadata
-						// and is not tombstoned.
-						currentIsTombstoned = false;
-						currentDiscardPoint = DiscardPoint.KeepAll;
-						currentIsDefinitelyMetastream = false;
-						return true; // don't need this but may as well.
-					}
-				} else {
-					// same hash as the previous invocation, and it is not a collision, so it must be for
-					// the same stream, so the current* variables are already correct.
-
-					if (indexEntry.Position >= currentPosition) {
-						// ptables are arranged (hash, version, position) descending. so for a given hash
-						// we will iterate through the versions descending. previous bugs have allowed
-						// events to be written occasionally with the wrong version number. we spot this
-						// here and log about it.
-						var stream = default(TStreamId);
-						try {
-							stream = state.LookupUniqueHashUser(indexEntry.Stream);
-						} catch {
-							// probably this isn't possible
-						}
-
-						_logger.Debug(
-							"SCAVENGING: Found out of order index entry. " +
-							"Stream \"{stream}\" has index entry {indexEntry} but " +
-							"previously saw index entry with position {previousPosition}.",
-							stream, indexEntry,
-							currentPosition);
-					}
-					currentPosition = indexEntry.Position;
-				}
-
-				// all the current* variables are now set correctly.
-				if (currentIsTombstoned) {
-					if (_unsafeIgnoreHardDeletes) {
-						// remove _everything_ for metadata and original streams
-						return false;
-					}
-
-					if (currentIsDefinitelyMetastream) {
-						// when the original stream is tombstoned we can discard the _whole_ metastream
-						return false;
-					}
-
-					// otherwise obey the discard points below.
-				}
-
-				var shouldDiscard = currentDiscardPoint.ShouldDiscard(indexEntry.Version);
-				return !shouldDiscard;
-			}
-
-			return ShouldKeep;
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Stages/StreamCalculator.cs b/src/EventStore.Core/TransactionLog/Scavenging/Stages/StreamCalculator.cs
deleted file mode 100644
index f1da578bf3d..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Stages/StreamCalculator.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using System;
-using EventStore.Core.Data;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	// the idea of this is we load some context into this class for the given stream
-	// and then it helps us calculate and make decisions about what to keep.
-	// and the calculations can be done on demand.
-	// and can be unit tested separately if necessary
-	// reused between streams to avoid allocations.
-	public class StreamCalculator<TStreamId> {
-		public StreamCalculator(
-			IIndexReaderForCalculator<TStreamId> index,
-			ScavengePoint scavengePoint) {
-
-			Index = index;
-			ScavengePoint = scavengePoint;
-		}
-
-		public void SetStream(
-			StreamHandle<TStreamId> originalStreamHandle,
-			OriginalStreamData originalStreamData) {
-
-			_lastEventNumber = null;
-			_truncateBeforeOrMaxCountDiscardPoint = null;
-
-			OriginalStreamHandle = originalStreamHandle;
-			OriginalStreamData = originalStreamData;
-		}
-
-		// State that doesn't change. scoped to the scavenge.
-		public IIndexReaderForCalculator<TStreamId> Index { get; }
-		public ScavengePoint ScavengePoint { get; }
-
-		// State that is scoped to the stream
-		public StreamHandle<TStreamId> OriginalStreamHandle { get; private set; }
-		private OriginalStreamData OriginalStreamData { get; set; }
-
-		// Returns NoStream (-1) if there are no events before the scavenge point.
-		// Caller must handle that
-		private long? _lastEventNumber;
-		public long LastEventNumber {
-			get {
-				if (!_lastEventNumber.HasValue) {
-					_lastEventNumber = Index.GetLastEventNumber(OriginalStreamHandle, ScavengePoint);
-				}
-
-				return _lastEventNumber.Value;
-			}
-		}
-
-		public DiscardPoint TruncateBeforeDiscardPoint =>
-			OriginalStreamData.TruncateBefore.HasValue
-				? DiscardPoint.DiscardBefore(OriginalStreamData.TruncateBefore.Value)
-				: DiscardPoint.KeepAll;
-
-		public DiscardPoint MaxCountDiscardPoint =>
-			// if LastEventNumber is NoStream (-1) this will always KeepAll as intended
-			OriginalStreamData.MaxCount.HasValue
-				? DiscardPoint.DiscardIncluding(LastEventNumber - OriginalStreamData.MaxCount.Value)
-				: DiscardPoint.KeepAll;
-
-		private DiscardPoint? _truncateBeforeOrMaxCountDiscardPoint;
-		public DiscardPoint TruncateBeforeOrMaxCountDiscardPoint {
-			get {
-				if (!_truncateBeforeOrMaxCountDiscardPoint.HasValue) {
-					_truncateBeforeOrMaxCountDiscardPoint =
-						TruncateBeforeDiscardPoint.Or(MaxCountDiscardPoint);
-				}
-
-				return _truncateBeforeOrMaxCountDiscardPoint.Value;
-			}
-		}
-
-		public bool IsTombstoned => OriginalStreamData.IsTombstoned;
-
-		// We can discard the event when it is older than the cutoff
-		public DateTime? CutoffTime => ScavengePoint.EffectiveNow - OriginalStreamData.MaxAge;
-
-		// Calculates whether this stream needs recalculating, assuming the metadata and istombstoned
-		// do not change (either of these updates will cause the calculator to reactivate it).
-		public CalculationStatus CalculateStatus() {
-			if (OriginalStreamData.IsTombstoned) {
-				// discard points will not move after this, BUT it cannot be deleted because we might
-				// run a scavenge with UnsafeIgnoreHardDeletes in which case we will need to know this is
-				// tombstoned in order to discard the tombstone from the index.
-				return CalculationStatus.Archived;
-			}
-
-			if (OriginalStreamData.MaxAge.HasValue) {
-				//  because time will have passed so discard points might need moving
-				return CalculationStatus.Active;
-			}
-
-			if (OriginalStreamData.MaxCount.HasValue) {
-				// new events might have been added so discard point might need moving
-				// (unless the accumulator tracked when new events have been written per stream, but
-				// this would likely not be worth it.)
-				return CalculationStatus.Active;
-			}
-
-			var tb = OriginalStreamData.TruncateBefore;
-			if (tb.HasValue &&
-				tb != EventNumber.DeletedStream &&
-				LastEventNumber < tb) {
-
-				// unspent TB. new events would cause the discard point to move.
-				// EventNumber.DeletedStream counts as spent because we would only need to
-				// recalculate if a new event is written but in that case the database will
-				// create for us a new metadata record, too.
-				// this also works if LastEventNumber is NoStream (-1)
-				return CalculationStatus.Active;
-			}
-
-			// Here it is not tombstoned, and the metadata is either a spent TB
-			// or empty (which could happen if there was metadata that was
-			// subsequently cleared).
-			// Discard points will no longer move, we can delete it.
-			return CalculationStatus.Spent;
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Stages/WeightAccumulator.cs b/src/EventStore.Core/TransactionLog/Scavenging/Stages/WeightAccumulator.cs
deleted file mode 100644
index e644c5f8685..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Stages/WeightAccumulator.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.Collections.Generic;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	public class WeightAccumulator {
-		const float DiscardWeight = 2.0f;
-		const float MaybeDiscardWeight = 1.0f;
-
-		private readonly IIncreaseChunkWeights _state;
-		private readonly Dictionary<int, float> _weights;
-
-		public WeightAccumulator(IIncreaseChunkWeights state) {
-			_state = state;
-			_weights = new Dictionary<int, float>();
-		}
-
-		public void OnDiscard(int logicalChunkNumber) => IncreaseChunkWeight(
-			logicalChunkNumber,
-			DiscardWeight);
-
-		public void OnMaybeDiscard(int logicalChunkNumber) => IncreaseChunkWeight(
-			logicalChunkNumber,
-			MaybeDiscardWeight);
-
-		private void IncreaseChunkWeight(int logicalChunkNumber, float extraWeight) {
-			if (_weights.TryGetValue(logicalChunkNumber, out var current)) {
-				_weights[logicalChunkNumber] = extraWeight + current;
-			} else {
-				_weights[logicalChunkNumber] = extraWeight;
-			}
-		}
-
-		public void Flush() {
-			foreach (var kvp in _weights) {
-				var logicalChunkNumber = kvp.Key;
-				var extraWeight = kvp.Value;
-				_state.IncreaseChunkWeight(logicalChunkNumber, extraWeight);
-			}
-			_weights.Clear();
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/Throttle.cs b/src/EventStore.Core/TransactionLog/Scavenging/Throttle.cs
deleted file mode 100644
index 1a71e7c4861..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/Throttle.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Threading;
-using Serilog;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	// Call Rest from time to time and this will rest a suitable amount of time
-	// to achieve an overall % time spent working approximately equal to activePercent.
-	public class Throttle {
-		private readonly Stopwatch _stopwatch;
-		private readonly double _minimumRestMs;
-		private readonly double _logThresholdMs;
-		private readonly double _restFactor;
-		private readonly ManualResetEventSlim _mres;
-		private readonly ILogger _logger;
-		private double _totalRestingTimeMs;
-
-		public Throttle(
-			ILogger logger,
-			TimeSpan minimumRest,
-			TimeSpan restLoggingThreshold,
-			double activePercent) {
-
-			if (activePercent <= 0 || 100 < activePercent)
-				throw new ArgumentOutOfRangeException(nameof(activePercent), activePercent, null);
-
-			_logger = logger;
-			_stopwatch = new Stopwatch();
-			_minimumRestMs = minimumRest.TotalMilliseconds;
-			_logThresholdMs = restLoggingThreshold.TotalMilliseconds;
-			_restFactor = 1 - (activePercent / 100);
-
-			_mres = new ManualResetEventSlim(false, 0);
-			Reset();
-		}
-
-		public void Reset() {
-			_totalRestingTimeMs = 0;
-			_stopwatch.Restart();
-		}
-
-		public void Rest(CancellationToken cancellationToken) {
-			if (_restFactor == 0)
-				return;
-
-			var totalTimeMs = _stopwatch.Elapsed.TotalMilliseconds;
-
-			// we want to have achieved the right proportion after the rest
-			var timeToRestMs = (_restFactor * totalTimeMs - _totalRestingTimeMs) / (1 - _restFactor);
-
-			if (timeToRestMs < _minimumRestMs)
-				return;
-
-			var isLongRest = timeToRestMs >= _logThresholdMs;
-			if (isLongRest)
-				_logger.Debug("SCAVENGING: Resting {timeToRestMs:N0}ms", timeToRestMs);
-
-			_totalRestingTimeMs += timeToRestMs;
-
-			// nothing will set the mres, we just wait until we timeout or are cancelled
-			_mres.Wait((int)timeToRestMs, cancellationToken);
-
-			if (isLongRest)
-				_logger.Debug(PrettyPrint());
-		}
-
-		public string PrettyPrint() {
-			var totalMs = _stopwatch.Elapsed.TotalMilliseconds;
-			var totalActiveTimeMs = totalMs - _totalRestingTimeMs;
-			var activePercent = 100 * totalActiveTimeMs / totalMs;
-			return
-				$"Rested {TimeSpan.FromMilliseconds(_totalRestingTimeMs)} " +
-				$"out of {TimeSpan.FromMilliseconds(totalMs)}. " +
-				$"{activePercent:N2} percent active.";
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/TransactionManager.cs b/src/EventStore.Core/TransactionLog/Scavenging/TransactionManager.cs
deleted file mode 100644
index 8c9fbf9c787..00000000000
--- a/src/EventStore.Core/TransactionLog/Scavenging/TransactionManager.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-
-namespace EventStore.Core.TransactionLog.Scavenging {
-	// This makes sure we dont accidentally start trying to nest transactions or begin them concurrently
-	// and facilitates committing the open transaction with a checkpoint
-	public class TransactionManager<TTransaction> : ITransactionManager {
-		private readonly ITransactionFactory<TTransaction> _factory;
-		private readonly IScavengeMap<Unit, ScavengeCheckpoint> _storage;
-		private Action _onRollback;
-		private bool _began;
-		private TTransaction _transaction;
-
-		public TransactionManager(
-			ITransactionFactory<TTransaction> factory,
-			IScavengeMap<Unit, ScavengeCheckpoint> storage) {
-
-			_factory = factory;
-			_storage = storage;
-		}
-
-		public void RegisterOnRollback(Action onRollback) {
-			if (_onRollback != null)
-				throw new InvalidOperationException();
-
-			_onRollback = onRollback;
-		}
-
-		public void UnregisterOnRollback() {
-			_onRollback = null;
-		}
-
-		public void Begin() {
-			if (_began)
-				throw new InvalidOperationException("Cannot begin a transaction that has already begun.");
-
-			_transaction = _factory.Begin();
-			_began = true;
-		}
-
-		public void Rollback() {
-			if (!_began)
-				throw new InvalidOperationException("Cannot rollback a transaction that has not begun.");
-
-			_factory.Rollback(_transaction);
-			_onRollback?.Invoke();
-			_began = false;
-		}
-
-		public void Commit(ScavengeCheckpoint checkpoint) {
-			if (!_began)
-				throw new InvalidOperationException("Cannot commit a transaction that has not begun.");
-
-			_storage[Unit.Instance] = checkpoint;
-
-			_factory.Commit(_transaction);
-			_began = false;
-		}
-	}
-}
diff --git a/src/EventStore.Core/TransactionLog/Unbuffered/UnbufferedFileStream.cs b/src/EventStore.Core/TransactionLog/Unbuffered/UnbufferedFileStream.cs
deleted file mode 100644
index a735a871f5e..00000000000
--- a/src/EventStore.Core/TransactionLog/Unbuffered/UnbufferedFileStream.cs
+++ /dev/null
@@ -1,282 +0,0 @@
-using System;
-using System.IO;
-using System.Runtime.InteropServices;
-using Microsoft.Win32.SafeHandles;
-using RuntimeInformation = System.Runtime.RuntimeInformation;
-
-namespace EventStore.Core.TransactionLog.Unbuffered {
-	//NOTE THIS DOES NOT SUPPORT ALL STREAM OPERATIONS AS YOU MIGHT EXPECT IT SUPPORTS WHAT WE USE!
-	public unsafe class UnbufferedFileStream : Stream {
-		private static readonly INativeFile NativeFile;
-
-		private byte* _writeBuffer;
-		private byte* _readBuffer;
-		private readonly int _writeBufferSize;
-		private readonly int _readBufferSize;
-		private readonly IntPtr _writeBufferOriginal;
-		private readonly IntPtr _readBufferOriginal;
-		private readonly uint _blockSize;
-		private long _bufferedCount;
-		private bool _aligned;
-		private long _lastPosition;
-		private bool _needsFlush;
-		private SafeFileHandle _handle;
-		private long _readLocation = -1;
-		private bool _needsRead;
-
-		static UnbufferedFileStream() => 
-            NativeFile = RuntimeInformation.IsWindows ? new NativeFileWindows() : new NativeFileUnix();
-
-        private UnbufferedFileStream(SafeFileHandle handle, uint blockSize, int internalWriteBufferSize,
-			int internalReadBufferSize) {
-			_handle = handle;
-			_readBufferSize = internalReadBufferSize;
-			_writeBufferSize = internalWriteBufferSize;
-			_writeBufferOriginal = Marshal.AllocHGlobal((int)(internalWriteBufferSize + blockSize));
-			_readBufferOriginal = Marshal.AllocHGlobal((int)(internalReadBufferSize + blockSize));
-			_readBuffer = Align(_readBufferOriginal, blockSize);
-			_writeBuffer = Align(_writeBufferOriginal, blockSize);
-			_blockSize = blockSize;
-		}
-
-		private byte* Align(IntPtr buf, uint alignTo) {
-			//This makes an aligned buffer linux needs this.
-			//The buffer must originally be at least one alignment bigger!
-			var diff = alignTo - (buf.ToInt64() % alignTo);
-			var aligned = (IntPtr)(buf.ToInt64() + diff);
-			return (byte*)aligned;
-		}
-
-		public static UnbufferedFileStream Create(string path,
-			FileMode mode,
-			FileAccess acc,
-			FileShare share,
-			int internalWriteBufferSize,
-			int internalReadBufferSize,
-			bool writeThrough,
-			uint minBlockSize) {
-			var blockSize = NativeFile.GetDriveSectorSize(path);
-			blockSize = blockSize > minBlockSize ? blockSize : minBlockSize;
-			if (internalWriteBufferSize % blockSize != 0)
-				throw new Exception("write buffer size must be aligned to block size of " + blockSize + " bytes");
-			if (internalReadBufferSize % blockSize != 0)
-				throw new Exception("read buffer size must be aligned to block size of " + blockSize + " bytes");
-
-			var handle = NativeFile.CreateUnbufferedRW(path, acc, share, mode, writeThrough);
-			return new UnbufferedFileStream(handle, blockSize, internalWriteBufferSize, internalReadBufferSize);
-		}
-
-		public override void Flush() {
-			CheckDisposed();
-			if (!_needsFlush) return;
-			var alignedbuffer = (int)GetLowestAlignment(_bufferedCount);
-			var positionAligned = GetLowestAlignment(_lastPosition);
-			if (!_aligned) {
-				SeekInternal(positionAligned, SeekOrigin.Begin);
-			}
-
-			if (_bufferedCount == alignedbuffer) {
-				InternalWrite(_writeBuffer, (uint)_bufferedCount);
-				_lastPosition = positionAligned + _bufferedCount;
-				_bufferedCount = 0;
-				_aligned = true;
-			} else {
-				var left = _bufferedCount - alignedbuffer;
-				InternalWrite(_writeBuffer, (uint)(alignedbuffer + _blockSize));
-				_lastPosition = positionAligned + alignedbuffer;
-				SetBuffer(alignedbuffer, left);
-				_bufferedCount = left;
-				_aligned = false;
-			}
-
-			_needsFlush = false;
-		}
-
-		private static void MemCopy(byte[] src, long srcOffset, byte* dest, long destOffset, long count) {
-			fixed (byte* p = src) {
-				MemCopy(p, srcOffset, dest, destOffset, count);
-			}
-		}
-
-		private static void MemCopy(byte* src, long srcOffset, byte[] dest, long destOffset, long count) {
-			fixed (byte* p = dest) {
-				MemCopy(src, srcOffset, p, destOffset, count);
-			}
-		}
-
-		private static void MemCopy(byte* src, long srcOffset, byte* dest, long destOffset, long count) {
-			byte* psrc = src + srcOffset;
-			byte* pdest = dest + destOffset;
-
-			for (var i = 0; i < count; i++) {
-				*pdest = *psrc;
-				pdest++;
-				psrc++;
-			}
-		}
-
-		private void SeekInternal(long positionAligned, SeekOrigin origin) {
-			NativeFile.Seek(_handle, positionAligned, origin);
-		}
-
-		private void InternalWrite(byte* buffer, uint count) {
-			var written = 0;
-			NativeFile.Write(_handle, buffer, count, ref written);
-		}
-
-		public override long Seek(long offset, SeekOrigin origin) {
-			long mungedOffset = offset;
-			CheckDisposed();
-			if (origin == SeekOrigin.Current) throw new NotImplementedException("only supports seek origin begin/end");
-			if (origin == SeekOrigin.End) mungedOffset = Length + offset;
-			var aligned = GetLowestAlignment(mungedOffset);
-			var left = (int)(mungedOffset - aligned);
-			Flush();
-			_bufferedCount = left;
-			_aligned = aligned == left;
-			_lastPosition = aligned;
-			//TODO cant do two seeks + a read here.
-			SeekInternal(aligned, SeekOrigin.Begin);
-			_needsRead = true;
-			return offset;
-		}
-
-		private long GetLowestAlignment(long offset) {
-			return offset - (offset % _blockSize);
-		}
-
-		public override void SetLength(long value) {
-			CheckDisposed();
-			var aligned = GetLowestAlignment(value);
-			aligned = aligned == value ? aligned : aligned + _blockSize;
-			NativeFile.SetFileSize(_handle, aligned);
-			if(Position > aligned)
-				Seek(aligned, SeekOrigin.Begin);
-		}
-
-		public override int Read(byte[] buffer, int offset, int count) {
-			CheckDisposed();
-			if (offset < 0 || buffer.Length < offset) throw new ArgumentException("offset");
-			if (count < 0 || buffer.Length < count) throw new ArgumentException("offset");
-			if (offset + count > buffer.Length)
-				throw new ArgumentException("offset + count must be less than size of array");
-			var position = GetLowestAlignment(Position);
-			var roffset = (int)(Position - position);
-
-			var bytesRead = _readBufferSize;
-			if (_readLocation + _readBufferSize <= position || _readLocation > position || _readLocation == -1) {
-				SeekInternal(position, SeekOrigin.Begin);
-				bytesRead = NativeFile.Read(_handle, _readBuffer, 0, _readBufferSize);
-				_readLocation = position;
-			} else if (_readLocation != position) {
-				roffset += (int)(position - _readLocation);
-			}
-
-			var bytesAvailable = bytesRead - roffset;
-			if (bytesAvailable <= 0) return 0;
-			var toCopy = count > bytesAvailable ? bytesAvailable : count;
-
-			MemCopy(_readBuffer, roffset, buffer, offset, toCopy);
-			_bufferedCount += toCopy;
-			if (count - toCopy == 0) return toCopy;
-			return toCopy + Read(buffer, offset + toCopy, count - toCopy);
-		}
-
-		public override void Write(byte[] buffer, int offset, int count) {
-			CheckDisposed();
-			var done = false;
-			long left = count;
-			long current = offset;
-			if (_needsRead) {
-				SeekInternal(_lastPosition, SeekOrigin.Begin);
-				NativeFile.Read(_handle, _writeBuffer, 0, (int)_blockSize);
-				SeekInternal(_lastPosition, SeekOrigin.Begin);
-				_needsRead = false;
-			}
-
-			while (!done) {
-				_needsFlush = true;
-				if (_bufferedCount + left < _writeBufferSize) {
-					CopyBuffer(buffer, current, left);
-					done = true;
-					current += left;
-				} else {
-					var toFill = _writeBufferSize - _bufferedCount;
-					CopyBuffer(buffer, current, toFill);
-					Flush();
-					left -= toFill;
-					current += toFill;
-					done = left == 0;
-				}
-			}
-		}
-
-		private void CopyBuffer(byte[] buffer, long offset, long count) {
-			MemCopy(buffer, offset, _writeBuffer, _bufferedCount, count);
-			_bufferedCount += count;
-		}
-
-		public override bool CanRead {
-			get {
-				CheckDisposed();
-				return true;
-			}
-		}
-
-		public override bool CanSeek {
-			get {
-				CheckDisposed();
-				return true;
-			}
-		}
-
-		public override bool CanWrite {
-			get {
-				CheckDisposed();
-				return true;
-			}
-		}
-
-		public override long Length {
-			get {
-				CheckDisposed();
-				return NativeFile.GetFileSize(_handle);
-			}
-		}
-
-		public override long Position {
-			get {
-				CheckDisposed();
-				if (_aligned)
-					return _lastPosition + _bufferedCount;
-				return GetLowestAlignment(_lastPosition) + _bufferedCount;
-			}
-			set {
-				CheckDisposed();
-				Seek(value, SeekOrigin.Begin);
-			}
-		}
-
-		private void SetBuffer(long alignedbuffer, long left) {
-			MemCopy(_writeBuffer, alignedbuffer, _writeBuffer, 0, left);
-		}
-
-		[System.Diagnostics.Conditional("DEBUG")]
-		private void CheckDisposed() {
-			//only check in debug
-			if (_handle == null) throw new ObjectDisposedException("object is disposed.");
-		}
-
-		protected override void Dispose(bool disposing) {
-			if (_handle == null) return;
-			Flush();
-			_handle.Close();
-			_handle = null;
-			_readBuffer = (byte*)IntPtr.Zero;
-			_writeBuffer = (byte*)IntPtr.Zero;
-			Marshal.FreeHGlobal(_readBufferOriginal);
-			Marshal.FreeHGlobal(_writeBufferOriginal);
-			GC.SuppressFinalize(this);
-		}
-	}
-}
diff --git a/src/EventStore.Core/Transforms/DbTransformManager.cs b/src/EventStore.Core/Transforms/DbTransformManager.cs
deleted file mode 100644
index 3913883c86d..00000000000
--- a/src/EventStore.Core/Transforms/DbTransformManager.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Transforms.Identity;
-using EventStore.Plugins.Transforms;
-using Serilog;
-
-namespace EventStore.Core.Transforms;
-
-public class DbTransformManager {
-	private IReadOnlyList<IDbTransform> _transforms;
-	private IDbTransform _activeTransform;
-
-	private IDbTransform FindTransform(TransformType type) {
-		if (TryFindTransform(type, out var transform))
-			return transform;
-
-		throw new Exception($"Failed to load transform: {type}");
-	}
-
-	private bool TryFindTransform(TransformType type, out IDbTransform dbTransform) {
-		dbTransform = _transforms?.FirstOrDefault(t => t.Type == type);
-		return dbTransform != null;
-	}
-
-	private bool TryFindTransform(string name, out IDbTransform dbTransform) {
-		dbTransform = _transforms?.FirstOrDefault(t => t.Name == name);
-		return dbTransform != null;
-	}
-
-	public IChunkTransformFactory GetFactoryForNewChunk() => _activeTransform?.ChunkFactory ??
-	                                                         throw new Exception("Active transform not set");
-
-	public IChunkTransformFactory GetFactoryForExistingChunk(TransformType type) => FindTransform(type).ChunkFactory;
-
-	public void LoadTransforms(IReadOnlyList<IDbTransform> transforms) {
-		_transforms = transforms;
-		Log.Information($"Loaded the following transforms: { string.Join(", ", transforms.Select(t => t.Type)) }");
-
-		// the identity transform is always required
-		_ = FindTransform(TransformType.Identity);
-	}
-
-	public void SetActiveTransform(TransformType type) {
-		Log.Information($"Setting the active transform to: {type}");
-		_activeTransform = FindTransform(type);
-	}
-
-	public bool TrySetActiveTransform(string name) {
-		if (!TryFindTransform(name, out var transform))
-			return false;
-
-		_activeTransform = transform;
-		Log.Information($"Active transform set to: {_activeTransform.Type}");
-		return true;
-	}
-
-	public bool SupportsTransform(TransformType type) => TryFindTransform(type, out _);
-
-	public static DbTransformManager Default {
-		get {
-			var dbTransformManager = new DbTransformManager();
-			var identityDbTransform = new IdentityDbTransform();
-			dbTransformManager.LoadTransforms(new [] { identityDbTransform });
-			dbTransformManager.SetActiveTransform(TransformType.Identity);
-			return dbTransformManager;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Transforms/Identity/IdentityChunkReadTransform.cs b/src/EventStore.Core/Transforms/Identity/IdentityChunkReadTransform.cs
deleted file mode 100644
index c98895c0c29..00000000000
--- a/src/EventStore.Core/Transforms/Identity/IdentityChunkReadTransform.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Transforms.Identity;
-
-public sealed class IdentityChunkReadTransform : IChunkReadTransform {
-	public static readonly IdentityChunkReadTransform Instance = new();
-
-	private IdentityChunkReadTransform() {
-
-	}
-
-	public ChunkDataReadStream TransformData(ChunkDataReadStream stream) => stream;
-}
diff --git a/src/EventStore.Core/Transforms/Identity/IdentityChunkTransform.cs b/src/EventStore.Core/Transforms/Identity/IdentityChunkTransform.cs
deleted file mode 100644
index 9ab7ea2ebaf..00000000000
--- a/src/EventStore.Core/Transforms/Identity/IdentityChunkTransform.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Transforms.Identity;
-
-public sealed class IdentityChunkTransform : IChunkTransform {
-	public IChunkReadTransform Read => IdentityChunkReadTransform.Instance;
-	public IChunkWriteTransform Write { get; } = new IdentityChunkWriteTransform();
-}
diff --git a/src/EventStore.Core/Transforms/Identity/IdentityChunkTransformFactory.cs b/src/EventStore.Core/Transforms/Identity/IdentityChunkTransformFactory.cs
deleted file mode 100644
index b66be438ca4..00000000000
--- a/src/EventStore.Core/Transforms/Identity/IdentityChunkTransformFactory.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Transforms.Identity;
-
-public sealed class IdentityChunkTransformFactory : IChunkTransformFactory {
-	public TransformType Type => TransformType.Identity;
-	public int TransformDataPosition(int dataPosition) => dataPosition;
-	public ReadOnlyMemory<byte> CreateTransformHeader() => ReadOnlyMemory<byte>.Empty;
-	public ReadOnlyMemory<byte> ReadTransformHeader(Stream stream) => ReadOnlyMemory<byte>.Empty;
-	public IChunkTransform CreateTransform(ReadOnlyMemory<byte> transformHeader) => new IdentityChunkTransform();
-}
diff --git a/src/EventStore.Core/Transforms/Identity/IdentityChunkWriteTransform.cs b/src/EventStore.Core/Transforms/Identity/IdentityChunkWriteTransform.cs
deleted file mode 100644
index 93732c579ab..00000000000
--- a/src/EventStore.Core/Transforms/Identity/IdentityChunkWriteTransform.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Transforms.Identity;
-
-public sealed class IdentityChunkWriteTransform : IChunkWriteTransform {
-	private ChunkDataWriteStream _stream;
-
-	public ChunkDataWriteStream TransformData(ChunkDataWriteStream stream) {
-		_stream = stream;
-		return _stream;
-	}
-
-	public void CompleteData(int footerSize, int alignmentSize) {
-		var chunkHeaderAndDataSize = (int)_stream.Position;
-		var alignedSize = GetAlignedSize(chunkHeaderAndDataSize + footerSize, alignmentSize);
-		var paddingSize = alignedSize - chunkHeaderAndDataSize - footerSize;
-		if (paddingSize > 0)
-			_stream.Write(new byte[paddingSize]);
-	}
-
-	public void WriteFooter(ReadOnlySpan<byte> footer, out int fileSize) {
-		_stream.ChunkFileStream.Write(footer);
-		fileSize = (int)_stream.Length;
-	}
-
-	private static int GetAlignedSize(int size, int alignmentSize) {
-		if (size % alignmentSize == 0) return size;
-		return (size / alignmentSize + 1) * alignmentSize;
-	}
-}
diff --git a/src/EventStore.Core/Transforms/Identity/IdentityDbTransform.cs b/src/EventStore.Core/Transforms/Identity/IdentityDbTransform.cs
deleted file mode 100644
index 90a09dbe413..00000000000
--- a/src/EventStore.Core/Transforms/Identity/IdentityDbTransform.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using EventStore.Plugins.Transforms;
-
-namespace EventStore.Core.Transforms.Identity;
-
-public sealed class IdentityDbTransform : IDbTransform {
-	public string Name => "identity";
-	public TransformType Type => TransformType.Identity;
-	public IChunkTransformFactory ChunkFactory { get; } = new IdentityChunkTransformFactory();
-}
diff --git a/src/EventStore.Core/Util/DefaultFiles.cs b/src/EventStore.Core/Util/DefaultFiles.cs
deleted file mode 100644
index 46240dcb3a9..00000000000
--- a/src/EventStore.Core/Util/DefaultFiles.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Runtime;
-
-namespace EventStore.Core.Util; 
-
-public static class DefaultFiles {
-    public static readonly string DefaultConfigFile = RuntimeInformation.IsWindows
-        ? string.Empty
-        : "eventstore.conf";
-}
diff --git a/src/EventStore.Core/Util/FileUtil.cs b/src/EventStore.Core/Util/FileUtil.cs
deleted file mode 100644
index 727ba957117..00000000000
--- a/src/EventStore.Core/Util/FileUtil.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.IO;
-
-namespace EventStore.Core.Util {
-	public static class FileUtils {
-		public static void DirectoryCopy(string sourceDirName, string destDirName, bool copySubDirs) {
-			// Get the subdirectories for the specified directory.
-			var dir = new DirectoryInfo(sourceDirName);
-
-			if (!dir.Exists)
-				throw new DirectoryNotFoundException("Source directory does not exist or could not be found: " +
-				                                     sourceDirName);
-
-			var subdirs = copySubDirs ? dir.GetDirectories() : null;
-
-			// If the destination directory doesn't exist, create it. 
-			if (!Directory.Exists(destDirName))
-				Directory.CreateDirectory(destDirName);
-
-			// Get the files in the directory and copy them to the new location.
-			foreach (FileInfo file in dir.GetFiles()) {
-				file.CopyTo(Path.Combine(destDirName, file.Name), false);
-			}
-
-			if (copySubDirs) {
-				foreach (DirectoryInfo subdir in subdirs) {
-					DirectoryCopy(subdir.FullName, Path.Combine(destDirName, subdir.Name), true);
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Util/Functions.cs b/src/EventStore.Core/Util/Functions.cs
deleted file mode 100644
index a23643dfb1b..00000000000
--- a/src/EventStore.Core/Util/Functions.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-#nullable enable
-
-using System;
-using EventStore.Core.Time;
-
-namespace EventStore.Core.Util;
-
-public static class Functions {
-    public static Func<T> Debounce<T>(this Func<T> func, TimeSpan timeout, IClock? clock = null) {
-        clock ??= Clock.Instance;
-        var     seconds    = timeout.TotalSeconds;
-        Instant lastCalled = default;
-        T?      current    = default;
-
-        return () => {
-            var now = clock.Now;
-            if (lastCalled == default || now.ElapsedSecondsSince(lastCalled) > seconds) {
-                current    = func();
-                lastCalled = now;
-            }
-
-            return current!;
-        };
-    }
-}
diff --git a/src/EventStore.Core/Util/MD5Hash.cs b/src/EventStore.Core/Util/MD5Hash.cs
deleted file mode 100644
index 2a6fae83c84..00000000000
--- a/src/EventStore.Core/Util/MD5Hash.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.IO;
-using System.Security.Cryptography;
-using EventStore.Common.Utils;
-using MD5 = EventStore.Core.Hashing.MD5;
-
-namespace EventStore.Core.Util {
-	public class MD5Hash {
-		public static byte[] GetHashFor(Stream s) {
-			//when using this, it will calculate from this point to the END of the stream!
-			using (var md5 = MD5.Create())
-				return md5.ComputeHash(s);
-		}
-
-		public static byte[] GetHashFor(Stream s, int startPosition, long count) {
-			Ensure.Nonnegative(count, "count");
-
-			using (var md5 = MD5.Create()) {
-				ContinuousHashFor(md5, s, startPosition, count);
-				md5.TransformFinalBlock(Empty.ByteArray, 0, 0);
-				return md5.Hash;
-			}
-		}
-
-		public static void ContinuousHashFor(HashAlgorithm md5, Stream s, int startPosition, long count) {
-			Ensure.NotNull(md5, "md5");
-			Ensure.Nonnegative(count, "count");
-
-			if (s.Position != startPosition)
-				s.Position = startPosition;
-
-			var buffer = new byte[4096];
-			long toRead = count;
-			while (toRead > 0) {
-				int read = s.Read(buffer, 0, (int)Math.Min(toRead, buffer.Length));
-				if (read == 0)
-					break;
-
-				md5.TransformBlock(buffer, 0, read, null, 0);
-				toRead -= read;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Core/Util/MiniWeb.cs b/src/EventStore.Core/Util/MiniWeb.cs
deleted file mode 100644
index 7fa54358bcd..00000000000
--- a/src/EventStore.Core/Util/MiniWeb.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using EventStore.Common.Utils;
-using EventStore.Core.Services.Transport.Http;
-using EventStore.Plugins.Authorization;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Codecs;
-using EventStore.Transport.Http.EntityManagement;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Core.Util {
-	public class MiniWeb {
-		private readonly string _localWebRootPath;
-		private readonly string _fileSystemRoot;
-		private static readonly ILogger Logger = Serilog.Log.ForContext<MiniWeb>();
-
-		public MiniWeb(string localWebRootPath) : this(localWebRootPath, GetWebRootFileSystemDirectory()) {
-		}
-
-		public MiniWeb(string localWebRootPath, string fileSystemRoot) {
-			Logger.Information("Starting MiniWeb for {localWebRootPath} ==> {fileSystemRoot}", localWebRootPath,
-				fileSystemRoot);
-			_localWebRootPath = localWebRootPath;
-			_fileSystemRoot = fileSystemRoot;
-		}
-
-		public void RegisterControllerActions(IHttpService service) {
-			var pattern = _localWebRootPath + "/{*remaining_path}";
-			Logger.Verbose("Binding MiniWeb to {path}", pattern);
-			service.RegisterAction(
-				new ControllerAction(pattern, HttpMethod.Get, Codec.NoCodecs, new ICodec[] {Codec.ManualEncoding}, new Operation(Operations.Node.StaticContent)),
-				OnStaticContent);
-		}
-
-		private void OnStaticContent(HttpEntityManager http, UriTemplateMatch match) {
-			var contentLocalPath = match.BoundVariables["remaining_path"];
-			ReplyWithContent(http, contentLocalPath);
-		}
-
-		private void ReplyWithContent(HttpEntityManager http, string contentLocalPath) {
-			//NOTE: this is fix for Mono incompatibility in UriTemplate behavior for /a/b{*C}
-			if (("/" + contentLocalPath).StartsWith(_localWebRootPath))
-				contentLocalPath = contentLocalPath.Substring(_localWebRootPath.Length);
-
-			//_logger.Trace("{contentLocalPath} requested from MiniWeb", contentLocalPath);
-			try {
-				var extensionToContentType = new Dictionary<string, string> {
-					{".png", "image/png"},
-					{".svg", "image/svg+xml"},
-					{".woff", "application/x-font-woff"},
-					{".woff2", "application/x-font-woff"},
-					{".ttf", "application/font-sfnt"},
-					{".jpg", "image/jpeg"},
-					{".jpeg", "image/jpeg"},
-					{".css", "text/css"},
-					{".htm", "text/html"},
-					{".html", "text/html"},
-					{".js", "application/javascript"},
-					{".json", "application/json"},
-					{".ico", "image/vnd.microsoft.icon"}
-				};
-
-				var extension = Path.GetExtension(contentLocalPath);
-				var fullPath = Path.Combine(_fileSystemRoot, contentLocalPath);
-
-				string contentType;
-				if (string.IsNullOrEmpty(extension)
-				    || !extensionToContentType.TryGetValue(extension.ToLower(), out contentType)
-				    || !File.Exists(fullPath)) {
-					Logger.Information("Replying 404 for {contentLocalPath} ==> {fullPath}", contentLocalPath, fullPath);
-					http.ReplyTextContent(
-						"Not Found", 404, "Not Found", "text/plain", null,
-						ex => Logger.Information(ex, "Error while replying from MiniWeb"));
-				} else {
-					var config = GetWebPageConfig(contentType);
-					var content = File.ReadAllBytes(fullPath);
-
-					http.Reply(content,
-						config.Code,
-						config.Description,
-						config.ContentType,
-						config.Encoding,
-						config.Headers,
-						ex => Logger.Information(ex, "Error while replying from MiniWeb"));
-				}
-			} catch (Exception ex) {
-				http.ReplyTextContent(ex.ToString(), 500, "Internal Server Error", "text/plain", null,
-					Console.WriteLine);
-			}
-		}
-
-		private static ResponseConfiguration GetWebPageConfig(string contentType) {
-			var encoding = contentType.StartsWith("image") ? null : Helper.UTF8NoBom;
-			int? cacheSeconds =
-#if RELEASE || CACHE_WEB_CONTENT
-                60*60; // 1 hour
-#else
-				null; // no caching
-#endif
-			// ReSharper disable ExpressionIsAlwaysNull
-			return Configure.Ok(contentType, encoding, null, cacheSeconds, isCachePublic: true);
-			// ReSharper restore ExpressionIsAlwaysNull
-		}
-
-		public static string GetWebRootFileSystemDirectory(string debugPath = null) {
-			string fileSystemWebRoot;
-			try {
-				if (!string.IsNullOrEmpty(debugPath)) {
-					var sf = new StackFrame(0, true);
-					var fileName = sf.GetFileName();
-					var sourceWebRootDirectory = string.IsNullOrEmpty(fileName)
-						? ""
-						: Path.GetFullPath(Path.Combine(fileName, @"..\..\..", debugPath));
-					fileSystemWebRoot = Directory.Exists(sourceWebRootDirectory)
-						? sourceWebRootDirectory
-						: Locations.WebContentDirectory;
-				} else {
-					fileSystemWebRoot = Locations.WebContentDirectory;
-				}
-			} catch (Exception) {
-				fileSystemWebRoot = Locations.WebContentDirectory;
-			}
-
-			return fileSystemWebRoot;
-		}
-	}
-}
diff --git a/src/EventStore.Core/Util/Opts.cs b/src/EventStore.Core/Util/Opts.cs
deleted file mode 100644
index a33d823d2ae..00000000000
--- a/src/EventStore.Core/Util/Opts.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Net;
-using EventStore.Common.Options;
-using EventStore.Core.TransactionLog.Chunks;
-
-namespace EventStore.Core.Util {
-	public static class Opts {
-		public const int ConnectionPendingSendBytesThresholdDefault = 10 * 1024 * 1024;
-		
-		public const int ConnectionQueueSizeThresholdDefault = 50000;
-
-		public const int HashCollisionReadLimitDefault = 100;
-
-		public const bool FaultOutOfOrderProjectionsDefault = false;
-
-		public const int ProjectionsQueryExpiryDefault = 5;
-
-		public const byte IndexBitnessVersionDefault = Index.PTableVersions.IndexV4;
-
-		public static readonly string AuthenticationTypeDefault = "internal";
-
-		public const bool SkipIndexScanOnReadsDefault = false;
-
-		public const long StreamExistenceFilterSizeDefault = 256_000_000;
-
-		public const int ScavengeBackendPageSizeDefault = 16 * 1024;
-
-		public const int ScavengeBackendCacheSizeDefault = 64 * 1024 * 1024;
-
-		public const int ScavengeHashUsersCacheCapacityDefault = 100_000;
-
-
-	}
-}
diff --git a/src/EventStore.Core/VNodeStatusChangeArgs.cs b/src/EventStore.Core/VNodeStatusChangeArgs.cs
deleted file mode 100644
index 56d270881ab..00000000000
--- a/src/EventStore.Core/VNodeStatusChangeArgs.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using EventStore.Core.Data;
-
-namespace EventStore.Core {
-	public class VNodeStatusChangeArgs : EventArgs {
-		public readonly VNodeState NewVNodeState;
-
-		public VNodeStatusChangeArgs(VNodeState newVNodeState) {
-			NewVNodeState = newVNodeState;
-		}
-	}
-}
diff --git a/src/EventStore.LogCommon/LogRecordType.cs b/src/EventStore.LogCommon/LogRecordType.cs
deleted file mode 100644
index f1426a7e17e..00000000000
--- a/src/EventStore.LogCommon/LogRecordType.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace EventStore.LogCommon {
-	public enum LogRecordType : byte {
-		Prepare = 0,
-		Commit = 1,
-		System = 2,
-		PartitionType = 3,
-		StreamType = 4,
-		EventType = 5,
-		ContentType = 6,
-		Partition = 7,
-		StreamWrite = 8,
-		TransactionStart = 9,
-		TransactionEnd = 10,
-		Stream = 11,
-	}
-}
diff --git a/src/EventStore.LogCommon/LogRecordVersion.cs b/src/EventStore.LogCommon/LogRecordVersion.cs
deleted file mode 100644
index 63e2fb061ad..00000000000
--- a/src/EventStore.LogCommon/LogRecordVersion.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.LogCommon {
-	public class LogRecordVersion {
-		public const byte LogRecordV0 = 0;
-		public const byte LogRecordV1 = 1;
-	}
-}
diff --git a/src/EventStore.LogV3.Tests/EventStore.LogV3.Tests.csproj b/src/EventStore.LogV3.Tests/EventStore.LogV3.Tests.csproj
deleted file mode 100644
index f5d86b86d76..00000000000
--- a/src/EventStore.LogV3.Tests/EventStore.LogV3.Tests.csproj
+++ /dev/null
@@ -1,26 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-	</PropertyGroup>
-	<ItemGroup>
-		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="ObjectLayoutInspector" Version="0.1.4" />
-		<PackageReference Include="System.Linq.Async" Version="6.0.1" />
-		<PackageReference Include="System.Net.Http" Version="4.3.4" />
-		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-		<PackageReference Include="xunit" Version="2.6.1" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="6.0.0">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\EventStore.LogV3\EventStore.LogV3.csproj" />
-	</ItemGroup>
-</Project>
diff --git a/src/EventStore.LogV3.Tests/LayoutInspections.cs b/src/EventStore.LogV3.Tests/LayoutInspections.cs
deleted file mode 100644
index e0ebe787c89..00000000000
--- a/src/EventStore.LogV3.Tests/LayoutInspections.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using ObjectLayoutInspector;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace EventStore.LogV3.Tests {
-	// For easily inspecting the layout of the structs
-	public class LayoutInspections {
-		private readonly ITestOutputHelper _output;
-
-		public LayoutInspections(ITestOutputHelper output) {
-			_output = output;
-		}
-
-		[Theory]
-		[InlineData(typeof(Raw.RecordHeader))]
-		[InlineData(typeof(Raw.EpochHeader))]
-		[InlineData(typeof(Raw.EventHeader))]
-		[InlineData(typeof(Raw.PartitionHeader))]
-		[InlineData(typeof(Raw.PartitionTypeHeader))]
-		[InlineData(typeof(Raw.StreamHeader))]
-		[InlineData(typeof(Raw.StreamTypeHeader))]
-		[InlineData(typeof(Raw.StreamWriteHeader))]
-		[InlineData(typeof(Raw.EventTypeHeader))]
-		[InlineData(typeof(Raw.ContentTypeHeader))]
-		[InlineData(typeof(Raw.TransactionStartHeader))]
-		[InlineData(typeof(Raw.TransactionEndHeader))]
-		public void InspectLayout(Type t) {
-			var layout = TypeLayout.GetLayout(t);
-			_output.WriteLine(layout.ToString(recursively: false));
-		}
-	}
-}
diff --git a/src/EventStore.LogV3.Tests/RecordCreatorTests.cs b/src/EventStore.LogV3.Tests/RecordCreatorTests.cs
deleted file mode 100644
index ae229024fc8..00000000000
--- a/src/EventStore.LogV3.Tests/RecordCreatorTests.cs
+++ /dev/null
@@ -1,249 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using EventStore.LogCommon;
-using Xunit;
-
-namespace EventStore.LogV3.Tests {
-	public class RecordCreatorTests {
-		readonly Guid _guid1 = Guid.Parse("00000000-0000-0000-0000-000000000001");
-		readonly Guid _guid2 = Guid.Parse("00000000-0000-0000-0000-000000000002");
-		readonly Guid _guid3 = Guid.Parse("00000000-0000-0000-0000-000000000003");
-		readonly DateTime _dateTime1 = new(0x08_D9_15_80_C3_A1_00_00);
-		readonly int _int1 = 1;
-		readonly long _long1 = 1;
-		readonly long _long2 = 2;
-		readonly long _long3 = 3;
-		readonly long _long4 = 4;
-		readonly uint _uint1 = 5;
-		readonly ushort _ushort1 = 6;
-		readonly string _string1 = "one";
-		readonly Raw.EventFlags _prepareflags = (Raw.EventFlags)3;
-		readonly Raw.PartitionFlags _partitionFlags = (Raw.PartitionFlags)4;
-		readonly ReadOnlyMemory<byte> _bytes1 = new byte[] { 0x10 };
-		readonly ReadOnlyMemory<byte> _bytes2 = new byte[] { 0x20, 0x01 };
-		readonly ReadOnlyMemory<byte> _bytes3 = new byte[] { 0x30, 0x01, 0x01 };
-		readonly ReadOnlyMemory<byte> _bytes4 = new byte[] { 0x40, 0x01, 0x01, 0x01 };
-
-		[Fact]
-		public void can_create_epoch() {
-			var epochNumber = 5;
-			var record = RecordCreator.CreateEpochRecord(
-				timeStamp: _dateTime1,
-				logPosition: _long1,
-				epochNumber: epochNumber,
-				epochId: _guid1,
-				prevEpochPosition: _long2,
-				leaderInstanceId: _guid2);
-
-			Assert.Equal(LogRecordType.System, record.Header.Type);
-			Assert.Equal(LogRecordVersion.LogRecordV1, record.Header.Version);
-
-			Assert.Equal(_dateTime1, record.Header.TimeStamp);
-			Assert.Equal(_guid1, record.Header.RecordId);
-			Assert.Equal(_long1, record.Header.LogPosition);
-
-			Assert.Equal(epochNumber, record.SubHeader.EpochNumber);
-			Assert.Equal(_guid2, record.SubHeader.LeaderInstanceId);
-			Assert.Equal(_long2, record.SubHeader.PrevEpochPosition);
-		}
-		
-		[Fact]
-		public void can_create_partition_record() {
-			var record = RecordCreator.CreatePartitionRecord(
-				timeStamp: _dateTime1,
-				logPosition: _long1,
-				partitionId: _guid1,
-				partitionTypeId: _guid2,
-				parentPartitionId: _guid3,
-				flags: _partitionFlags,
-				referenceNumber: _ushort1,
-				name: _string1);
-
-			Assert.Equal(LogRecordType.Partition, record.Header.Type);
-			Assert.Equal(LogRecordVersion.LogRecordV0, record.Header.Version);
-			Assert.Equal(_dateTime1, record.Header.TimeStamp);
-			Assert.Equal(_guid1, record.Header.RecordId);
-			Assert.Equal(_long1, record.Header.LogPosition);
-			Assert.Equal(_guid2, record.SubHeader.PartitionTypeId);
-			Assert.Equal(_guid3, record.SubHeader.ParentPartitionId);
-			Assert.Equal(_partitionFlags, record.SubHeader.Flags);
-			Assert.Equal(_ushort1, record.SubHeader.ReferenceNumber);
-			Assert.Equal(_string1, record.StringPayload);
-		}
-		
-		[Fact]
-		public void can_create_partition_type_record() {
-			var record = RecordCreator.CreatePartitionTypeRecord(
-				timeStamp: _dateTime1,
-				logPosition: _long1,
-				partitionTypeId: _guid1,
-				partitionId: _guid2,
-				name: _string1);
-
-			Assert.Equal(LogRecordType.PartitionType, record.Header.Type);
-			Assert.Equal(LogRecordVersion.LogRecordV0, record.Header.Version);
-			Assert.Equal(_dateTime1, record.Header.TimeStamp);
-			Assert.Equal(_guid1, record.Header.RecordId);
-			Assert.Equal(_long1, record.Header.LogPosition);
-			Assert.Equal(_guid2, record.SubHeader.PartitionId);
-			Assert.Equal(_string1, record.StringPayload);
-		}
-
-		[Fact]
-		public void can_create_stream_record() {
-			var record = RecordCreator.CreateStreamRecord(
-				streamId: _guid1,
-				timeStamp: _dateTime1,
-				logPosition: _long1,
-				streamNumber: _uint1,
-				streamName: _string1,
-				partitionId: _guid2,
-				streamTypeId: _guid3);
-
-			Assert.Equal(LogRecordType.Stream, record.Header.Type);
-			Assert.Equal(LogRecordVersion.LogRecordV0, record.Header.Version);
-			Assert.Equal(_guid1, record.Header.RecordId);
-			Assert.Equal(_dateTime1, record.Header.TimeStamp);
-			Assert.Equal(_long1, record.Header.LogPosition);
-			Assert.Equal(_guid2, record.SubHeader.PartitionId);
-			Assert.Equal(_uint1, record.SubHeader.ReferenceNumber);
-			Assert.Equal(_guid3, record.SubHeader.StreamTypeId);
-			Assert.Equal(_string1, record.StringPayload);
-		}
-
-		[Fact]
-		public void can_create_stream_type_record() {
-			var record = RecordCreator.CreateStreamTypeRecord(
-				timeStamp: _dateTime1,
-				logPosition: _long1,
-				streamTypeId: _guid1,
-				partitionId: _guid2,
-				name: _string1);
-
-			Assert.Equal(LogRecordType.StreamType, record.Header.Type);
-			Assert.Equal(LogRecordVersion.LogRecordV0, record.Header.Version);
-			Assert.Equal(_dateTime1, record.Header.TimeStamp);
-			Assert.Equal(_guid1, record.Header.RecordId);
-			Assert.Equal(_long1, record.Header.LogPosition);
-			Assert.Equal(_guid2, record.SubHeader.PartitionId);
-			Assert.Equal(_string1, record.StringPayload);
-		}
-		
-		[Fact]
-		public void can_create_event_type_record() {
-			var record = RecordCreator.CreateEventTypeRecord(
-				timeStamp: _dateTime1,
-				logPosition: _long1,
-				eventTypeId: _guid1,
-				parentEventTypeId: _guid2,
-				partitionId: _guid3,
-				eventTypeNumber: _uint1,
-				eventTypeVersion: _ushort1,
-				name: _string1);
-
-			Assert.Equal(LogRecordType.EventType, record.Header.Type);
-			Assert.Equal(LogRecordVersion.LogRecordV0, record.Header.Version);
-			Assert.Equal(_dateTime1, record.Header.TimeStamp);
-			Assert.Equal(_guid1, record.Header.RecordId);
-			Assert.Equal(_long1, record.Header.LogPosition);
-			Assert.Equal(_guid2, record.SubHeader.ParentEventTypeId);
-			Assert.Equal(_guid3, record.SubHeader.PartitionId);
-			Assert.Equal(_uint1, record.SubHeader.ReferenceNumber);
-			Assert.Equal(_ushort1, record.SubHeader.Version);
-			Assert.Equal(_string1, record.StringPayload);
-		}
-		
-		[Fact]
-		public void can_create_content_type_record() {
-			var record = RecordCreator.CreateContentTypeRecord(
-				timeStamp: _dateTime1,
-				logPosition: _long1,
-				contentTypeId: _guid1,
-				partitionId: _guid2,
-				referenceNumber: _ushort1,
-				name: _string1);
-
-			Assert.Equal(LogRecordType.ContentType, record.Header.Type);
-			Assert.Equal(LogRecordVersion.LogRecordV0, record.Header.Version);
-			Assert.Equal(_dateTime1, record.Header.TimeStamp);
-			Assert.Equal(_guid1, record.Header.RecordId);
-			Assert.Equal(_long1, record.Header.LogPosition);
-			Assert.Equal(_guid2, record.SubHeader.PartitionId);
-			Assert.Equal(_ushort1, record.SubHeader.ReferenceNumber);
-			Assert.Equal(_string1, record.StringPayload);
-		}
-
-		[Fact]
-		public void can_create_stream_write_record_for_single_event() {
-			var record = RecordCreator.CreateStreamWriteRecordForSingleEvent(
-				timeStamp: _dateTime1,
-				correlationId: _guid1,
-				logPosition: _long1,
-				transactionPosition: _long2,
-				transactionOffset: _int1,
-				streamNumber: _long3,
-				startingEventNumber: _long4,
-				eventId: _guid2,
-				eventTypeNumber: _uint1,
-				eventData: _bytes3.Span,
-				eventMetadata: _bytes4.Span,
-				eventFlags: _prepareflags);
-
-			Assert.Equal(LogRecordType.StreamWrite, record.Header.Type);
-			Assert.Equal(LogRecordVersion.LogRecordV0, record.Header.Version);
-			Assert.Equal(_dateTime1, record.Header.TimeStamp);
-			Assert.Equal(_long1, record.Header.LogPosition);
-			Assert.Equal<Guid>(_guid1, record.SystemMetadata.CorrelationId);
-			Assert.Equal(_long2, record.SystemMetadata.TransactionPosition);
-			Assert.Equal(_int1, record.SystemMetadata.TransactionOffset);
-			Assert.Equal(0, record.SystemMetadata.StartingEventNumberRoot);
-			Assert.Equal(0, record.SystemMetadata.StartingEventNumberCategory);
-			Assert.Equal(0, record.WriteId.CategoryNumber);
-			Assert.Equal(0, record.WriteId.ParentTopicNumber);
-			Assert.Equal(0, record.WriteId.TopicNumber);
-			Assert.Equal(_long3, record.WriteId.StreamNumber);
-			Assert.Equal(_long4, record.WriteId.StartingEventNumber);
-			Assert.Equal<Guid>(_guid2, record.Event.SystemMetadata.EventId);
-			Assert.Equal(_uint1, record.Event.Header.EventTypeNumber);
-			Assert.Equal(MemoryMarshal.ToEnumerable(_bytes3), MemoryMarshal.ToEnumerable(record.Event.Data));
-			Assert.Equal(MemoryMarshal.ToEnumerable(_bytes4), MemoryMarshal.ToEnumerable(record.Event.Metadata));
-			Assert.Equal(_prepareflags, record.Event.Header.Flags);
-		}
-		
-		[Fact]
-		public void can_create_transaction_start() {
-			var record = RecordCreator.CreateTransactionStartRecord(
-				timeStamp: _dateTime1,
-				logPosition: _long1,
-				transactionId: _guid1,
-				status: Raw.TransactionStatus.Failed,
-				type: Raw.TransactionType.MultipartTransaction,
-				recordCount: _uint1);
-
-			Assert.Equal(LogRecordType.TransactionStart, record.Header.Type);
-			Assert.Equal(LogRecordVersion.LogRecordV0, record.Header.Version);
-			Assert.Equal(_dateTime1, record.Header.TimeStamp);
-			Assert.Equal(_guid1, record.Header.RecordId);
-			Assert.Equal(_long1, record.Header.LogPosition);
-			Assert.Equal(Raw.TransactionStatus.Failed, record.SubHeader.Status);
-			Assert.Equal(Raw.TransactionType.MultipartTransaction, record.SubHeader.Type);
-			Assert.Equal(_uint1, record.SubHeader.RecordCount);
-		}
-		
-		[Fact]
-		public void can_create_transaction_end() {
-			var record = RecordCreator.CreateTransactionEndRecord(
-				timeStamp: _dateTime1,
-				logPosition: _long1,
-				transactionId: _guid1,
-				recordCount: _uint1);
-
-			Assert.Equal(LogRecordType.TransactionEnd, record.Header.Type);
-			Assert.Equal(LogRecordVersion.LogRecordV0, record.Header.Version);
-			Assert.Equal(_dateTime1, record.Header.TimeStamp);
-			Assert.Equal(_guid1, record.Header.RecordId);
-			Assert.Equal(_long1, record.Header.LogPosition);
-			Assert.Equal(_uint1, record.SubHeader.RecordCount);
-		}
-	}
-}
diff --git a/src/EventStore.LogV3.Tests/RecordHeaderTests.cs b/src/EventStore.LogV3.Tests/RecordHeaderTests.cs
deleted file mode 100644
index 242ef4be106..00000000000
--- a/src/EventStore.LogV3.Tests/RecordHeaderTests.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using Xunit;
-
-namespace EventStore.LogV3.Tests {
-	public class RecordHeaderTests {
-		[Fact]
-		public void can_set_time_stamp() {
-			var header = new Raw.RecordHeader {
-				TimeStamp = new DateTime(2000, 03, 21),
-				Type = LogCommon.LogRecordType.EventType,
-				Version = 0x45,
-			};
-
-			var now = DateTime.UtcNow;
-			header.TimeStamp = now;
-
-			Assert.Equal(LogCommon.LogRecordType.EventType, header.Type);
-			Assert.Equal(0x45, header.Version);
-			Assert.Equal(now, header.TimeStamp, TimeSpan.FromMilliseconds(7));
-		}
-
-		[Fact]
-		public void can_get_time_stamp() {
-			var timeStamp = new DateTime(0x08_D9_15_80_C3_A1_00_00);
-			var header = new Raw.RecordHeader {
-				TimeStamp = timeStamp,
-			};
-
-			header.Type = LogCommon.LogRecordType.EventType;
-			header.Version = 0x45;
-
-			Assert.Equal(LogCommon.LogRecordType.EventType, header.Type);
-			Assert.Equal(0x45, header.Version);
-			Assert.Equal(timeStamp, header.TimeStamp);
-		}
-	}
-}
diff --git a/src/EventStore.LogV3.Tests/RecordLayoutTests.cs b/src/EventStore.LogV3.Tests/RecordLayoutTests.cs
deleted file mode 100644
index 9e3ff1cde37..00000000000
--- a/src/EventStore.LogV3.Tests/RecordLayoutTests.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using ObjectLayoutInspector;
-using Xunit;
-
-namespace EventStore.LogV3.Tests {
-	public class RecordLayoutTests {
-		void AssertSize<T>(int expectedSize, bool allowOverlap = false) {
-			Assert.Equal(expectedSize, Unsafe.SizeOf<T>());
-			Assert.Equal(expectedSize, Marshal.SizeOf<T>());
-
-			var layout = TypeLayout.GetLayout<T>();
-
-			// check that fields are aligned
-			foreach (var field in layout.Fields) {
-				var str = $"{field}";
-				if (str.Contains("padding"))
-					continue;
-
-				var fieldAlignment = field.Size;
-				if (str.Contains("Guid"))
-					fieldAlignment = 4;
-
-				Assert.True(field.Offset % fieldAlignment == 0, $"Field {field} is not aligned");
-			}
-
-			// check that fields don't overlap
-			if (allowOverlap)
-				return;
-
-			var minOffset = 0;
-			foreach (var field in layout.Fields) {
-				Assert.True(field.Offset >= minOffset, $"Field {field.Offset} overlaps");
-				minOffset = field.Offset + field.Size;
-			}
-
-			// note that we aren't checking whether fields are efficiently arranged...
-			// also not currently checking if the whole struct is correctly aligned, only the fields within.
-		}
-
-		[Fact] public void RecordHeaderLayout() => AssertSize<Raw.RecordHeader>(Raw.RecordHeader.Size, allowOverlap: true);
-		[Fact] public void EpochRecordHeaderLayout() => AssertSize<Raw.EpochHeader>(Raw.EpochHeader.Size);
-		[Fact] public void EventHeaderLayout() => AssertSize<Raw.EventHeader>(Raw.EventHeader.Size);
-		[Fact] public void PartitionHeaderLayout() => AssertSize<Raw.PartitionHeader>(Raw.PartitionHeader.Size);
-		[Fact] public void PartitionTypeHeaderLayout() => AssertSize<Raw.PartitionTypeHeader>(Raw.PartitionTypeHeader.Size);
-		[Fact] public void StreamHeaderLayout() => AssertSize<Raw.StreamHeader>(Raw.StreamHeader.Size);
-		[Fact] public void StreamTypeHeaderLayout() => AssertSize<Raw.StreamTypeHeader>(Raw.StreamTypeHeader.Size);
-		[Fact] public void StreamWriteHeaderLayout() => AssertSize<Raw.StreamWriteHeader>(Raw.StreamWriteHeader.Size);
-		[Fact] public void EventTypeHeaderLayout() => AssertSize<Raw.EventTypeHeader>(Raw.EventTypeHeader.Size);
-		[Fact] public void ContentTypeHeaderLayout() => AssertSize<Raw.ContentTypeHeader>(Raw.ContentTypeHeader.Size);
-		[Fact] public void TransactionStartHeaderLayout() => AssertSize<Raw.TransactionStartHeader>(Raw.TransactionStartHeader.Size);
-		[Fact] public void TransactionEndHeaderLayout() => AssertSize<Raw.TransactionEndHeader>(Raw.TransactionEndHeader.Size);
-	}
-}
diff --git a/src/EventStore.LogV3.Tests/StreamWriteIdTests.cs b/src/EventStore.LogV3.Tests/StreamWriteIdTests.cs
deleted file mode 100644
index b5ce4544fcc..00000000000
--- a/src/EventStore.LogV3.Tests/StreamWriteIdTests.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using Xunit;
-
-namespace EventStore.LogV3.Tests {
-	public class StreamWriteIdTests {
-		[Theory]
-		[InlineData(Raw.StreamWriteId.MaxStartingEventNumber + 2)]
-		[InlineData(-1)]
-		public void cant_set_starting_event_number_out_of_range(long x) {
-			var writeId = new Raw.StreamWriteId {
-				ParentTopicNumber = 15,
-			};
-
-			Assert.Throws<ArgumentOutOfRangeException>(() => {
-				writeId.StartingEventNumber = x;
-			});
-			Assert.Equal(15, writeId.ParentTopicNumber);
-		}
-
-		[Theory]
-		[InlineData(Raw.StreamWriteId.EventNumberDeletedStream)]
-		[InlineData(Raw.StreamWriteId.MaxStartingEventNumber)]
-		[InlineData(0)]
-		public void can_set_starting_event_number(long x) {
-			var writeId = new Raw.StreamWriteId {
-				StartingEventNumber = 123,
-				ParentTopicNumber = 15,
-			};
-
-			writeId.StartingEventNumber = x;
-
-			Assert.Equal(15, writeId.ParentTopicNumber);
-			Assert.Equal(x, writeId.StartingEventNumber);
-		}
-
-		[Fact]
-		public void can_get_starting_event_number() {
-			var writeId = new Raw.StreamWriteId {
-				StartingEventNumber = Raw.StreamWriteId.MaxStartingEventNumber,
-			};
-
-			writeId.ParentTopicNumber = 15;
-
-			Assert.Equal(15, writeId.ParentTopicNumber);
-			Assert.Equal(Raw.StreamWriteId.MaxStartingEventNumber, writeId.StartingEventNumber);
-		}
-	}
-}
diff --git a/src/EventStore.LogV3/EventRecord.cs b/src/EventStore.LogV3/EventRecord.cs
deleted file mode 100644
index 0b53c1e105b..00000000000
--- a/src/EventStore.LogV3/EventRecord.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Buffers;
-using System.Runtime.InteropServices;
-
-namespace EventStore.LogV3 {
-	// View of an event in a stream write record
-	public struct EventRecord {
-		private readonly ReadOnlyMemory<byte> _headerMemory;
-		private readonly ReadOnlyMemory<byte> _data;
-		private readonly ReadOnlyMemory<byte> _metadata;
-
-		public ref readonly Raw.EventHeader Header => ref MemoryMarshal.AsRef<Raw.EventHeader>(_headerMemory.Span);
-		public ReadOnlyMemory<byte> Data => _data;
-		public ReadOnlyMemory<byte> Metadata => _metadata;
-		public EventSystemMetadata SystemMetadata { get; }
-
-		// bytes already populated with a event record to read
-		public EventRecord(ReadOnlyMemory<byte> bytes) {
-			var slicer = bytes.Slicer();
-			_headerMemory = slicer.Slice(Raw.EventHeader.Size);
-
-			ref readonly var header = ref MemoryMarshal.AsRef<Raw.EventHeader>(_headerMemory.Span);
-
-			var systemMetadata = slicer.Slice(header.SystemMetadataSize);
-			_data = slicer.Slice(header.DataSize);
-			_metadata = slicer.Remaining;
-
-			SystemMetadata = EventSystemMetadata.Parser.ParseFrom(new ReadOnlySequence<byte>(systemMetadata));
-		}
-	}
-}
diff --git a/src/EventStore.LogV3/EventStore.LogV3.csproj b/src/EventStore.LogV3/EventStore.LogV3.csproj
deleted file mode 100644
index 5076e8beafb..00000000000
--- a/src/EventStore.LogV3/EventStore.LogV3.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-	</PropertyGroup>
-	<ItemGroup>
-		<PackageReference Include="Google.Protobuf" Version="3.27.2" />
-		<PackageReference Include="Grpc.Tools" Version="2.65.0">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-		</PackageReference>
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\EventStore.LogCommon\EventStore.LogCommon.csproj" />
-	</ItemGroup>
-	<ItemGroup>
-		<Protobuf Include="**/*.proto" />
-	</ItemGroup>
-</Project>
diff --git a/src/EventStore.LogV3/MemorySlicer.cs b/src/EventStore.LogV3/MemorySlicer.cs
deleted file mode 100644
index 53904ec8ee1..00000000000
--- a/src/EventStore.LogV3/MemorySlicer.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-
-namespace EventStore.LogV3 {
-	public static class MemoryExtensions {
-		public static MemorySlicer<T> Slicer<T>(this Memory<T> memory) =>
-			new MemorySlicer<T>(memory);
-
-		public static ReadOnlyMemorySlicer<T> Slicer<T>(this ReadOnlyMemory<T> memory) =>
-			new ReadOnlyMemorySlicer<T>(memory);
-	}
-
-	public struct MemorySlicer<T> {
-		public Memory<T> Remaining { get; private set; }
-
-		public MemorySlicer(Memory<T> source) {
-			Remaining = source;
-		}
-
-		public Memory<T> Slice(int length) {
-			var toReturn = Remaining[..length];
-			Remaining = Remaining[length..];
-			return toReturn;
-		}
-	}
-}
diff --git a/src/EventStore.LogV3/MutableRecordView.cs b/src/EventStore.LogV3/MutableRecordView.cs
deleted file mode 100644
index 780e522f4c8..00000000000
--- a/src/EventStore.LogV3/MutableRecordView.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace EventStore.LogV3 {
-	// Mutable view of a record
-	public struct MutableRecordView<TSubHeader> where TSubHeader : unmanaged {
-		private readonly SlicedRecord _sliced;
-
-		public Memory<byte> Bytes => _sliced.Bytes;
-		public ref Raw.RecordHeader Header => ref MemoryMarshal.AsRef<Raw.RecordHeader>(_sliced.HeaderMemory.Span);
-		public ref T RecordId<T>() where T : unmanaged =>
-			ref MemoryMarshal.AsRef<T>(_sliced.HeaderMemory[Raw.RecordHeader.RecordIdOffset..].Span);
-		public ref TSubHeader SubHeader => ref MemoryMarshal.AsRef<TSubHeader>(_sliced.SubHeaderMemory.Span);
-		public Memory<byte> Payload => _sliced.PayloadMemory;
-
-		public static implicit operator RecordView<TSubHeader>(MutableRecordView<TSubHeader> record) =>
-			new RecordView<TSubHeader>(record.Bytes);
-
-		public static MutableRecordView<TSubHeader> Create(int payloadLength) {
-			// todo: later consider pool, inject allocator/use a factory
-			// ideally we could grab space _in the chunk_ that we are about to write to
-			var length = CalculateLength(payloadLength);
-			var bytes = new byte[length].AsMemory()[..length];
-			return new MutableRecordView<TSubHeader>(bytes);
-		}
-
-		unsafe static int CalculateLength(int payloadSize) =>
-			Raw.RecordHeader.Size + sizeof(TSubHeader) + payloadSize;
-
-		public MutableRecordView(Memory<byte> bytes) {
-			_sliced = SlicedRecordCreator<TSubHeader>.Create(bytes);
-		}
-	}
-}
diff --git a/src/EventStore.LogV3/ProtoGuid.cs b/src/EventStore.LogV3/ProtoGuid.cs
deleted file mode 100644
index 1cbad685f0c..00000000000
--- a/src/EventStore.LogV3/ProtoGuid.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using Google.Protobuf;
-
-namespace EventStore.LogV3 {
-	// System.Guid.ToByteArray roundtrips with the ctor that takes byte[] as the argument
-	// if changing this be careful not to break changing between endianness
-	public partial class ProtoGuid {
-		public static implicit operator Guid(ProtoGuid x) {
-			if (x == null)
-				return default;
-
-			return new Guid(x.Bytes.ToByteArray());
-		}
-
-		public static implicit operator ProtoGuid(Guid x) {
-			return new ProtoGuid {
-				Bytes = ByteString.CopyFrom(x.ToByteArray()),
-			};
-		}
-	}
-}
diff --git a/src/EventStore.LogV3/Protos/proto_guid.proto b/src/EventStore.LogV3/Protos/proto_guid.proto
deleted file mode 100644
index 17e189cb569..00000000000
--- a/src/EventStore.LogV3/Protos/proto_guid.proto
+++ /dev/null
@@ -1,6 +0,0 @@
-syntax = "proto3";
-package EventStore.LogV3;
-
-message ProtoGuid {
-	bytes bytes = 1;
-}
diff --git a/src/EventStore.LogV3/Raw.cs b/src/EventStore.LogV3/Raw.cs
deleted file mode 100644
index 7491411245f..00000000000
--- a/src/EventStore.LogV3/Raw.cs
+++ /dev/null
@@ -1,368 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using EventStore.LogCommon;
-
-namespace EventStore.LogV3 {
-	public static class Raw {
-		public const long SixMostSignificantBytes = unchecked((long)0xFF_FF_FF_FF_FF_FF_00_00);
-		public const long TwoLeastSignificantBytes = unchecked(0x00_00_00_00_00_00_FF_FF);
-		public const long SixLeastSignificantBytes = unchecked(0x00_00_FF_FF_FF_FF_FF_FF);
-		public const long TwoMostSignificantBytes = unchecked((long)0xFF_FF_00_00_00_00_00_00);
-
-		[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
-		public struct RecordHeader {
-			[FieldOffset(0)] private LogRecordType _type;
-			[FieldOffset(1)] private byte _version;
-			[FieldOffset(0)] private long _ticks;
-			[FieldOffset(RecordIdOffset)] private Guid _recordId;
-
-			// todo: remove this if possible
-			[FieldOffset(RecordIdOffset + RecordIdSize)] private long _logPosition;
-			public const int Size = 32;
-			public const int RecordIdOffset = 8;
-			public const int RecordIdSize = 16;
-
-			public LogRecordType Type {
-				get => _type;
-				set => _type = value;
-			}
-
-			public byte Version {
-				get => _version;
-				set => _version = value;
-			}
-
-			public DateTime TimeStamp {
-				// little-endian. blank out the 2 LEAST significant bytes
-				get => new(_ticks & SixMostSignificantBytes);
-				set => _ticks =
-					(TwoLeastSignificantBytes & _ticks) |
-					(SixMostSignificantBytes & value.Ticks);
-			}
-
-			public Guid RecordId {
-				get => _recordId;
-				set => _recordId = value;
-			}
-
-			public long LogPosition {
-				get => _logPosition;
-				set => _logPosition = value;
-			}
-		}
-
-		[StructLayout(LayoutKind.Explicit, Size = RecordHeader.RecordIdSize, Pack = 1)]
-		public struct StreamWriteId {
-			// ~300 trillion
-			public const long MaxStartingEventNumber = SixLeastSignificantBytes - 1;
-			public const long EventNumberDeletedStream = long.MaxValue;
-
-			[FieldOffset(0)] private ushort _topicNumber;
-			[FieldOffset(2)] private ushort _categoryNumber;
-			[FieldOffset(4)] private uint _streamNumber;
-			[FieldOffset(8)] private long _startingEventNumber;
-			[FieldOffset(14)] private ushort _parentTopicNumber;
-
-			public ushort ParentTopicNumber {
-				get => _parentTopicNumber;
-				set => _parentTopicNumber = value;
-			}
-
-			public ushort TopicNumber {
-				get => _topicNumber;
-				set => _topicNumber = value;
-			}
-
-			public ushort CategoryNumber {
-				get => _categoryNumber;
-				set => _categoryNumber = value;
-			}
-
-			public uint StreamNumber {
-				get => _streamNumber;
-				set => _streamNumber = value;
-			}
-
-			public long StartingEventNumber {
-				// little-endian. must not write the 2 MOST significant bytes
-				get {
-					var x = _startingEventNumber & SixLeastSignificantBytes;
-					return x == SixLeastSignificantBytes ? EventNumberDeletedStream : x;
-				}
-				set {
-					if (value == EventNumberDeletedStream) {
-						_startingEventNumber |= SixLeastSignificantBytes;
-						return;
-					}
-
-					if ((value | SixLeastSignificantBytes) != SixLeastSignificantBytes)
-						throw new ArgumentOutOfRangeException(nameof(value), value, null);
-					_startingEventNumber =
-						(TwoMostSignificantBytes & _startingEventNumber) |
-						value;
-				}
-			}
-		}
-
-		[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
-		public struct EpochHeader {
-			[FieldOffset(0)] private Guid _leaderInstanceId;
-			[FieldOffset(16)] private long _prevEpochPosition;
-			[FieldOffset(24)] private int _epochNumber;
-			public const int Size = 28;
-
-			public Guid LeaderInstanceId {
-				get => _leaderInstanceId;
-				set => _leaderInstanceId = value;
-			}
-
-			public long PrevEpochPosition {
-				get => _prevEpochPosition;
-				set => _prevEpochPosition = value;
-			}
-
-			public int EpochNumber {
-				get => _epochNumber;
-				set => _epochNumber = value;
-			}
-		}
-
-		[Flags]
-		public enum EventFlags : ushort {
-		}
-
-		[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
-		public struct EventHeader {
-			[FieldOffset(0)] private uint _eventTypeNumber;
-			[FieldOffset(4)] private int _eventSize;
-			[FieldOffset(8)] private int _systemMetadataSize;
-			[FieldOffset(12)] private int _dataSize;
-			[FieldOffset(16)] private EventFlags _flags;
-			public const int Size = 18;
-
-			public uint EventTypeNumber {
-				get => _eventTypeNumber;
-				set => _eventTypeNumber = value;
-			}
-
-			public EventFlags Flags {
-				get => _flags;
-				set => _flags = value;
-			}
-
-			public int EventSize {
-				get => _eventSize;
-				set => _eventSize = value;
-			}
-
-			public int SystemMetadataSize {
-				get => _systemMetadataSize;
-				set => _systemMetadataSize = value;
-			}
-
-			public int DataSize {
-				get => _dataSize;
-				set => _dataSize = value;
-			}
-		}
-
-		[Flags]
-		public enum PartitionFlags : ushort {
-		}
-
-		[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
-		public struct PartitionHeader {
-			[FieldOffset(0)] private Guid _partitionTypeId;
-			[FieldOffset(16)] private Guid _parentPartitionId;
-			[FieldOffset(32)] private PartitionFlags _flags;
-			[FieldOffset(34)] private ushort _referenceNumber;
-			public const int Size = 36;
-
-			public Guid PartitionTypeId {
-				get => _partitionTypeId;
-				set => _partitionTypeId = value;
-			}
-			
-			public Guid ParentPartitionId {
-				get => _parentPartitionId;
-				set => _parentPartitionId = value;
-			}
-			
-			public PartitionFlags Flags {
-				get => _flags;
-				set => _flags = value;
-			}
-
-			public ushort ReferenceNumber {
-				get => _referenceNumber;
-				set => _referenceNumber = value;
-			}
-		}
-		
-		[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
-		public struct PartitionTypeHeader {
-			[FieldOffset(0)] private Guid _partitionId;
-			public const int Size = 16;
-
-			public Guid PartitionId {
-				get => _partitionId;
-				set => _partitionId = value;
-			}
-		}
-
-		[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
-		public struct StreamHeader {
-			[FieldOffset(0)] private Guid _partitionId;
-			[FieldOffset(16)] private Guid _streamTypeId;
-			[FieldOffset(32)] private uint _referenceNumber;
-			public const int Size = 36;
-
-			public Guid PartitionId {
-				get => _partitionId;
-				set => _partitionId = value;
-			}
-
-			public Guid StreamTypeId {
-				get => _streamTypeId;
-				set => _streamTypeId = value;
-			}
-
-			public uint ReferenceNumber {
-				get => _referenceNumber;
-				set => _referenceNumber = value;
-			}
-		}
-
-		[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
-		public struct StreamTypeHeader {
-			[FieldOffset(0)] private Guid _partitionId;
-			public const int Size = 16;
-
-			public Guid PartitionId {
-				get => _partitionId;
-				set => _partitionId = value;
-			}
-		}
-		
-		[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
-		public struct EventTypeHeader {
-			[FieldOffset(0)] private Guid _parentEventTypeId;
-			[FieldOffset(16)] private Guid _partitionId;
-			[FieldOffset(32)] private uint _referenceNumber;
-			[FieldOffset(36)] private ushort _version;
-			
-			public const int Size = 38;
-
-			public Guid ParentEventTypeId {
-				get => _parentEventTypeId;
-				set => _parentEventTypeId = value;
-			}
-
-			public Guid PartitionId {
-				get => _partitionId;
-				set => _partitionId = value;
-			}
-			
-			public uint ReferenceNumber {
-				get => _referenceNumber;
-				set => _referenceNumber = value;
-			}
-
-			public ushort Version {
-				get => _version;
-				set => _version = value;
-			}
-		}
-
-		[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
-		public struct ContentTypeHeader {
-			[FieldOffset(0)] private Guid _partitionId;
-			[FieldOffset(16)] private ushort _referenceNumber;
-
-			public const int Size = 18;
-
-			public Guid PartitionId {
-				get => _partitionId;
-				set => _partitionId = value;
-			}
-
-			public ushort ReferenceNumber {
-				get => _referenceNumber;
-				set => _referenceNumber = value;
-			}
-		}
-
-		[Flags]
-		public enum StreamWriteFlags : ushort {
-		}
-
-		[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
-		public struct StreamWriteHeader {
-			[FieldOffset(0)] private StreamWriteFlags _flags;
-			[FieldOffset(2)] private short _count;
-			[FieldOffset(4)] private int _metadataSize;
-			public const int Size = 8;
-
-			public StreamWriteFlags Flags {
-				get => _flags;
-				set => _flags = value;
-			}
-
-			public short Count {
-				get => _count;
-				set => _count = value;
-			}
-
-			public int MetadataSize {
-				get => _metadataSize;
-				set => _metadataSize = value;
-			}
-		}
-		
-		public enum TransactionStatus : byte {
-			Prepare = 0,
-			Committed = 1,
-			Failed = 2,
-			Removed = 3
-		}
-		
-		public enum TransactionType : byte {
-			StandardWrite = 0,
-			MultipartTransaction = 1
-		}
-		
-		[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
-		public struct TransactionStartHeader {
-			[FieldOffset(0)] private uint _recordCount;
-			[FieldOffset(4)] private TransactionStatus _status;
-			[FieldOffset(5)] private TransactionType _type;
-			public const int Size = 6;
-
-			public TransactionStatus Status {
-				get => _status;
-				set => _status = value;
-			}
-
-			public TransactionType Type {
-				get => _type;
-				set => _type = value;
-			}
-
-			public uint RecordCount {
-				get => _recordCount;
-				set => _recordCount = value;
-			}
-		}
-		
-		[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
-		public struct TransactionEndHeader {
-			[FieldOffset(0)] private uint _recordCount;
-			public const int Size = 4;
-			
-			public uint RecordCount {
-				get => _recordCount;
-				set => _recordCount = value;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.LogV3/ReadOnlyMemorySlicer.cs b/src/EventStore.LogV3/ReadOnlyMemorySlicer.cs
deleted file mode 100644
index 1f7472fe3de..00000000000
--- a/src/EventStore.LogV3/ReadOnlyMemorySlicer.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-
-namespace EventStore.LogV3 {
-	public struct ReadOnlyMemorySlicer<T> {
-		public ReadOnlyMemory<T> Remaining { get; private set; }
-
-		public ReadOnlyMemorySlicer(ReadOnlyMemory<T> source) {
-			Remaining = source;
-		}
-
-		public ReadOnlyMemory<T> Slice(int length) {
-			var toReturn = Remaining[..length];
-			Remaining = Remaining[length..];
-			return toReturn;
-		}
-	}
-}
diff --git a/src/EventStore.LogV3/ReadOnlySlicedRecord.cs b/src/EventStore.LogV3/ReadOnlySlicedRecord.cs
deleted file mode 100644
index ddd54d11e5e..00000000000
--- a/src/EventStore.LogV3/ReadOnlySlicedRecord.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-
-namespace EventStore.LogV3 {
-	public struct ReadOnlySlicedRecord {
-		public ReadOnlyMemory<byte> Bytes { get; init; }
-		public ReadOnlyMemory<byte> HeaderMemory { get; init; }
-		public ReadOnlyMemory<byte> SubHeaderMemory { get; init; }
-		public ReadOnlyMemory<byte> PayloadMemory { get; init; }
-	}
-}
diff --git a/src/EventStore.LogV3/RecordCreator.cs b/src/EventStore.LogV3/RecordCreator.cs
deleted file mode 100644
index 1d06cc3cb6f..00000000000
--- a/src/EventStore.LogV3/RecordCreator.cs
+++ /dev/null
@@ -1,400 +0,0 @@
-using System;
-using System.IO;
-using System.Text;
-using System.Text.Unicode;
-using EventStore.LogCommon;
-using Google.Protobuf;
-
-namespace EventStore.LogV3 {
-	// Nice-to-use wrappers for creating and populating the raw structures.
-	public static class RecordCreator {
-		// these exist to make the code more obviously correct
-		private static byte CurrentVersion(this ref Raw.EpochHeader _) => LogRecordVersion.LogRecordV1;
-		private static byte CurrentVersion(this ref Raw.PartitionHeader _) => LogRecordVersion.LogRecordV0;
-		private static byte CurrentVersion(this ref Raw.PartitionTypeHeader _) => LogRecordVersion.LogRecordV0;
-		private static byte CurrentVersion(this ref Raw.StreamHeader _) => LogRecordVersion.LogRecordV0;
-		private static byte CurrentVersion(this ref Raw.StreamTypeHeader _) => LogRecordVersion.LogRecordV0;
-		private static byte CurrentVersion(this ref Raw.StreamWriteHeader _) => LogRecordVersion.LogRecordV0;
-		private static byte CurrentVersion(this ref Raw.EventTypeHeader _) => LogRecordVersion.LogRecordV0;
-		private static byte CurrentVersion(this ref Raw.ContentTypeHeader _) => LogRecordVersion.LogRecordV0;
-		private static byte CurrentVersion(this ref Raw.TransactionStartHeader _) => LogRecordVersion.LogRecordV0;
-		private static byte CurrentVersion(this ref Raw.TransactionEndHeader _) => LogRecordVersion.LogRecordV0;
-
-		private static LogRecordType Type(this ref Raw.EpochHeader _) => LogRecordType.System;
-		private static LogRecordType Type(this ref Raw.PartitionHeader _) => LogRecordType.Partition;
-		private static LogRecordType Type(this ref Raw.PartitionTypeHeader _) => LogRecordType.PartitionType;
-		private static LogRecordType Type(this ref Raw.StreamHeader _) => LogRecordType.Stream;
-		private static LogRecordType Type(this ref Raw.StreamTypeHeader _) => LogRecordType.StreamType;
-		private static LogRecordType Type(this ref Raw.StreamWriteHeader _) => LogRecordType.StreamWrite;
-		private static LogRecordType Type(this ref Raw.EventTypeHeader _) => LogRecordType.EventType;
-		private static LogRecordType Type(this ref Raw.ContentTypeHeader _) => LogRecordType.ContentType;
-		private static LogRecordType Type(this ref Raw.TransactionStartHeader _) => LogRecordType.TransactionStart;
-		private static LogRecordType Type(this ref Raw.TransactionEndHeader _) => LogRecordType.TransactionEnd;
-		
-		// todo: limit of 100 bytes when we know a good way to report the error to the client.
-		// throwing here will crash the writer.
-		const int MaxStringBytes = int.MaxValue;
-		public static void PopulateString(string str, Span<byte> target) {
-			Utf8.FromUtf16(str, target, out _, out var bytesWritten, true, true);
-			if (bytesWritten > MaxStringBytes)
-				throw new ArgumentException($"Name \"{str}\" is longer than {MaxStringBytes} bytes: {bytesWritten}");
-		}
-
-		private static readonly Encoding _utf8NoBom = new UTF8Encoding(
-			encoderShouldEmitUTF8Identifier: false,
-			throwOnInvalidBytes: true);
-
-		public static RecordView<Raw.EpochHeader> CreateEpochRecord(
-			DateTime timeStamp,
-			long logPosition,
-			int epochNumber,
-			Guid epochId,
-			long prevEpochPosition,
-			Guid leaderInstanceId) {
-
-			var record = MutableRecordView<Raw.EpochHeader>.Create(payloadLength: 0);
-			ref var header = ref record.Header;
-			ref var subHeader = ref record.SubHeader;
-
-			header.Type = subHeader.Type();
-			header.Version = subHeader.CurrentVersion();
-			header.TimeStamp = timeStamp;
-			header.RecordId = epochId;
-			header.LogPosition = logPosition;
-
-			subHeader.EpochNumber = epochNumber;
-			subHeader.LeaderInstanceId = leaderInstanceId;
-			subHeader.PrevEpochPosition = prevEpochPosition;
-
-			return record;
-		}
-
-		public static StringPayloadRecord<Raw.PartitionHeader> CreatePartitionRecord(
-			DateTime timeStamp,
-			long logPosition,
-			Guid partitionId,
-			Guid partitionTypeId,
-			Guid parentPartitionId,
-			Raw.PartitionFlags flags,
-			ushort referenceNumber,
-			string name) {
-
-			var payloadLength = _utf8NoBom.GetByteCount(name);
-			var record = MutableRecordView<Raw.PartitionHeader>.Create(payloadLength);
-			ref var header = ref record.Header;
-			ref var subHeader = ref record.SubHeader;
-
-			header.Type = subHeader.Type();
-			header.Version = subHeader.CurrentVersion();
-			header.TimeStamp = timeStamp;
-			header.RecordId = partitionId;
-			header.LogPosition = logPosition;
-
-			subHeader.PartitionTypeId = partitionTypeId;
-			subHeader.ParentPartitionId = parentPartitionId;
-			subHeader.Flags = flags;
-			subHeader.ReferenceNumber = referenceNumber;
-			PopulateString(name, record.Payload.Span);
-
-			return StringPayloadRecord.Create(record);
-		}
-		
-		public static StringPayloadRecord<Raw.PartitionTypeHeader> CreatePartitionTypeRecord(
-			DateTime timeStamp,
-			long logPosition,
-			Guid partitionTypeId,
-			Guid partitionId,
-			string name) {
-
-			var payloadLength = _utf8NoBom.GetByteCount(name);
-			var record = MutableRecordView<Raw.PartitionTypeHeader>.Create(payloadLength);
-			ref var header = ref record.Header;
-			ref var subHeader = ref record.SubHeader;
-
-			header.Type = subHeader.Type();
-			header.Version = subHeader.CurrentVersion();
-			header.TimeStamp = timeStamp;
-			header.RecordId = partitionTypeId;
-			header.LogPosition = logPosition;
-
-			subHeader.PartitionId = partitionId;
-			PopulateString(name, record.Payload.Span);
-
-			return StringPayloadRecord.Create(record);
-		}
-
-		public static StringPayloadRecord<Raw.StreamHeader> CreateStreamRecord(
-			Guid streamId,
-			DateTime timeStamp,
-			long logPosition,
-			uint streamNumber,
-			string streamName,
-			Guid partitionId,
-			Guid streamTypeId) {
-
-			var payloadLength = _utf8NoBom.GetByteCount(streamName);
-			var record = MutableRecordView<Raw.StreamHeader>.Create(payloadLength);
-			ref var header = ref record.Header;
-			ref var subHeader = ref record.SubHeader;
-
-			header.RecordId = streamId;
-			header.Type = subHeader.Type();
-			header.Version = subHeader.CurrentVersion();
-			header.TimeStamp = timeStamp;
-			header.LogPosition = logPosition;
-
-			subHeader.PartitionId = partitionId;
-			subHeader.StreamTypeId = streamTypeId;
-			subHeader.ReferenceNumber = streamNumber;
-
-			PopulateString(streamName, record.Payload.Span);
-
-			return StringPayloadRecord.Create(record);
-		}
-
-		public static StringPayloadRecord<Raw.StreamTypeHeader> CreateStreamTypeRecord(
-			DateTime timeStamp,
-			long logPosition,
-			Guid streamTypeId,
-			Guid partitionId,
-			string name) {
-
-			var payloadLength = _utf8NoBom.GetByteCount(name);
-			var record = MutableRecordView<Raw.StreamTypeHeader>.Create(payloadLength);
-			ref var header = ref record.Header;
-			ref var subHeader = ref record.SubHeader;
-
-			header.Type = subHeader.Type();
-			header.Version = subHeader.CurrentVersion();
-			header.TimeStamp = timeStamp;
-			header.RecordId = streamTypeId;
-			header.LogPosition = logPosition;
-
-			subHeader.PartitionId = partitionId;
-			PopulateString(name, record.Payload.Span);
-
-			return StringPayloadRecord.Create(record);
-		}
-		
-		public static StringPayloadRecord<Raw.EventTypeHeader> CreateEventTypeRecord(
-			DateTime timeStamp,
-			long logPosition,
-			Guid eventTypeId,
-			Guid parentEventTypeId,
-			Guid partitionId,
-			uint eventTypeNumber,
-			ushort eventTypeVersion,
-			string name) {
-
-			var payloadLength = _utf8NoBom.GetByteCount(name);
-			var record = MutableRecordView<Raw.EventTypeHeader>.Create(payloadLength);
-			ref var header = ref record.Header;
-			ref var subHeader = ref record.SubHeader;
-
-			header.Type = subHeader.Type();
-			header.Version = subHeader.CurrentVersion();
-			header.TimeStamp = timeStamp;
-			header.RecordId = eventTypeId;
-			header.LogPosition = logPosition;
-
-			subHeader.ParentEventTypeId = parentEventTypeId;
-			subHeader.PartitionId = partitionId;
-			subHeader.ReferenceNumber = eventTypeNumber;
-			subHeader.Version = eventTypeVersion;
-			PopulateString(name, record.Payload.Span);
-
-			return StringPayloadRecord.Create(record);
-		}
-		
-		public static StringPayloadRecord<Raw.ContentTypeHeader> CreateContentTypeRecord(
-			DateTime timeStamp,
-			long logPosition,
-			Guid contentTypeId,
-			Guid partitionId,
-			ushort referenceNumber,
-			string name) {
-
-			var payloadLength = _utf8NoBom.GetByteCount(name);
-			var record = MutableRecordView<Raw.ContentTypeHeader>.Create(payloadLength);
-			ref var header = ref record.Header;
-			ref var subHeader = ref record.SubHeader;
-
-			header.Type = subHeader.Type();
-			header.Version = subHeader.CurrentVersion();
-			header.TimeStamp = timeStamp;
-			header.RecordId = contentTypeId;
-			header.LogPosition = logPosition;
-
-			subHeader.PartitionId = partitionId;
-			subHeader.ReferenceNumber = referenceNumber;
-			PopulateString(name, record.Payload.Span);
-
-			return StringPayloadRecord.Create(record);
-		}
-
-		public static StreamWriteRecord CreateStreamWriteRecordForSingleEvent(
-			DateTime timeStamp,
-			Guid correlationId,
-			long logPosition,
-			long transactionPosition,
-			int transactionOffset,
-			long streamNumber,
-			long startingEventNumber,
-			Guid eventId,
-			uint eventTypeNumber,
-			ReadOnlySpan<byte> eventData,
-			ReadOnlySpan<byte> eventMetadata,
-			Raw.EventFlags eventFlags) {
-
-			var writeSystemMetadata = new StreamWriteSystemMetadata {
-				CorrelationId = correlationId,
-				TransactionPosition = transactionPosition,
-				TransactionOffset = transactionOffset,
-				StartingEventNumberRoot = 0,
-				StartingEventNumberCategory = 0,
-			};
-
-			var eventSystemMetadata = new EventSystemMetadata {
-				EventId = eventId,
-			};
-
-			var writeSystemMetadataSize = writeSystemMetadata.CalculateSize();
-			var eventSystemMetadataSize = eventSystemMetadata.CalculateSize();
-
-			var payloadLength = MeasureWritePayload(
-				recordMetadataSize: writeSystemMetadataSize,
-				eventSystemMetadataSize: eventSystemMetadataSize,
-				userData: eventData,
-				userMetadata: eventMetadata);
-
-			var record = MutableRecordView<Raw.StreamWriteHeader>.Create(payloadLength);
-			ref var header = ref record.Header;
-			ref var recordId = ref record.RecordId<Raw.StreamWriteId>();
-			ref var subHeader = ref record.SubHeader;
-
-			header.Type = subHeader.Type();
-			header.Version = subHeader.CurrentVersion();
-			header.TimeStamp = timeStamp;
-			header.LogPosition = logPosition;
-
-			recordId.ParentTopicNumber = 0;
-			recordId.TopicNumber = 0;
-			recordId.CategoryNumber = 0;
-			recordId.StreamNumber = (uint)streamNumber; // todo: remove cast
-			recordId.StartingEventNumber = startingEventNumber;
-
-			subHeader.Count = 1;
-			subHeader.Flags = 0;
-			subHeader.MetadataSize = writeSystemMetadataSize;
-
-			var slicer = record.Payload.Slicer();
-			writeSystemMetadata.WriteTo(slicer.Slice(subHeader.MetadataSize).Span);
-
-			PopulateEventSubRecord(
-				eventTypeNumber: eventTypeNumber,
-				flags: eventFlags,
-				systemMetadataSize: eventSystemMetadataSize,
-				systemMetadata: eventSystemMetadata,
-				data: eventData,
-				metadata: eventMetadata,
-				target: slicer.Remaining);
-
-			return new StreamWriteRecord(record);
-
-			static int MeasureWritePayload(
-				int recordMetadataSize,
-				int eventSystemMetadataSize,
-				ReadOnlySpan<byte> userData,
-				ReadOnlySpan<byte> userMetadata) {
-
-				var result =
-					recordMetadataSize +
-					MeasureForEventSubRecord(
-						systemMetadataSize: eventSystemMetadataSize,
-						data: userData,
-						metadata: userMetadata);
-				return result;
-			}
-
-			static int MeasureForEventSubRecord(
-				int systemMetadataSize,
-				ReadOnlySpan<byte> data,
-				ReadOnlySpan<byte> metadata) {
-
-				return
-					Raw.EventHeader.Size +
-					systemMetadataSize +
-					data.Length +
-					metadata.Length;
-			}
-
-			static void PopulateEventSubRecord(
-				uint eventTypeNumber,
-				Raw.EventFlags flags,
-				int systemMetadataSize,
-				EventSystemMetadata systemMetadata,
-				ReadOnlySpan<byte> data,
-				ReadOnlySpan<byte> metadata,
-				Memory<byte> target) {
-
-				var slicer = target.Slicer();
-				ref var header = ref slicer.SliceAs<Raw.EventHeader>();
-				header.EventTypeNumber = eventTypeNumber;
-				header.Flags = flags;
-				header.EventSize = MeasureForEventSubRecord(systemMetadataSize, data, metadata);
-				header.SystemMetadataSize = systemMetadataSize;
-				header.DataSize = data.Length;
-
-				systemMetadata.WriteTo(slicer.Slice(systemMetadataSize).Span);
-				data.CopyTo(slicer.Slice(header.DataSize).Span);
-				metadata.CopyTo(slicer.Remaining.Span);
-			}
-		}
-
-		public static RecordView<Raw.TransactionStartHeader> CreateTransactionStartRecord(
-			DateTime timeStamp,
-			long logPosition,
-			Guid transactionId,
-			Raw.TransactionStatus status,
-			Raw.TransactionType type,
-			uint recordCount) {
-
-			var record = MutableRecordView<Raw.TransactionStartHeader>.Create(payloadLength: 0);
-			ref var header = ref record.Header;
-			ref var subHeader = ref record.SubHeader;
-			
-			header.Type = subHeader.Type();
-			header.Version = subHeader.CurrentVersion();
-			header.TimeStamp = timeStamp;
-			header.RecordId = transactionId;
-			header.LogPosition = logPosition;
-
-			subHeader.Status = status;
-			subHeader.Type = type;
-			subHeader.RecordCount = recordCount;
-
-			return record;
-		}
-		
-		public static RecordView<Raw.TransactionEndHeader> CreateTransactionEndRecord(
-			DateTime timeStamp,
-			long logPosition,
-			Guid transactionId,
-			uint recordCount) {
-
-			var record = MutableRecordView<Raw.TransactionEndHeader>.Create(payloadLength: 0);
-			ref var header = ref record.Header;
-			ref var subHeader = ref record.SubHeader;
-
-			header.Type = subHeader.Type();
-			header.Version = subHeader.CurrentVersion();
-			header.TimeStamp = timeStamp;
-			header.RecordId = transactionId;
-			header.LogPosition = logPosition;
-			
-			subHeader.RecordCount = recordCount;
-
-			return record;
-		}
-	}
-}
diff --git a/src/EventStore.LogV3/RecordView.cs b/src/EventStore.LogV3/RecordView.cs
deleted file mode 100644
index f3160142f31..00000000000
--- a/src/EventStore.LogV3/RecordView.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace EventStore.LogV3 {
-	public interface IRecordView {
-		ReadOnlyMemory<byte> Bytes { get; }
-		ref readonly Raw.RecordHeader Header { get; }
-		ReadOnlyMemory<byte> Payload { get; }
-	}
-
-	// Immutable, generic, view of a record
-	public struct RecordView<TSubHeader> : IRecordView where TSubHeader : unmanaged {
-		private readonly ReadOnlySlicedRecord _sliced;
-
-		public ReadOnlyMemory<byte> Bytes => _sliced.Bytes;
-		public ref readonly Raw.RecordHeader Header => ref MemoryMarshal.AsRef<Raw.RecordHeader>(_sliced.HeaderMemory.Span);
-		public ref readonly T RecordId<T>() where T : unmanaged =>
-			ref MemoryMarshal.AsRef<T>(_sliced.HeaderMemory[Raw.RecordHeader.RecordIdOffset..].Span);
-		public ref readonly TSubHeader SubHeader => ref MemoryMarshal.AsRef<TSubHeader>(_sliced.SubHeaderMemory.Span);
-		public ReadOnlyMemory<byte> Payload => _sliced.PayloadMemory;
-		public int PayloadOffset => _sliced.HeaderMemory.Length + _sliced.SubHeaderMemory.Length;
-
-		public RecordView(ReadOnlyMemory<byte> bytes) {
-			_sliced = SlicedRecordCreator<TSubHeader>.Create(bytes);
-		}
-	}
-}
diff --git a/src/EventStore.LogV3/SlicedRecord.cs b/src/EventStore.LogV3/SlicedRecord.cs
deleted file mode 100644
index 28b67d78831..00000000000
--- a/src/EventStore.LogV3/SlicedRecord.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-
-namespace EventStore.LogV3 {
-	public struct SlicedRecord {
-		// todo: measure tradeoff between splitting these out on construction as we are
-		// (=> larger struct to copy around) vs getting rid of this struct and just
-		// splitting in the getters of the record
-		// (=> smaller struct but probably repeated bounds checks)
-		public Memory<byte> Bytes { get; init; }
-		public Memory<byte> HeaderMemory { get; init; }
-		public Memory<byte> SubHeaderMemory { get; init; }
-		public Memory<byte> PayloadMemory { get; init; }
-	}
-}
diff --git a/src/EventStore.LogV3/SlicedRecordCreator.cs b/src/EventStore.LogV3/SlicedRecordCreator.cs
deleted file mode 100644
index ab3dc5816b8..00000000000
--- a/src/EventStore.LogV3/SlicedRecordCreator.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-
-namespace EventStore.LogV3 {
-	// This class slices bytes up according to the headers in the desired record
-	// It exists to keep the logic between the readonly/normal versions in the same place.
-	public static class SlicedRecordCreator<TSubHeader> where TSubHeader : unmanaged {
-		public static SlicedRecord Create(Memory<byte> bytes) {
-			var slicer = bytes.Slicer();
-			return new SlicedRecord {
-				Bytes = slicer.Remaining,
-				HeaderMemory = slicer.Slice(Raw.RecordHeader.Size),
-				SubHeaderMemory = slicer.Slice<TSubHeader>(),
-				PayloadMemory = slicer.Remaining,
-			};
-		}
-
-		public static ReadOnlySlicedRecord Create(ReadOnlyMemory<byte> bytes) {
-			var slicer = bytes.Slicer();
-			return new ReadOnlySlicedRecord {
-				Bytes = slicer.Remaining,
-				HeaderMemory = slicer.Slice(Raw.RecordHeader.Size),
-				SubHeaderMemory = slicer.Slice<TSubHeader>(),
-				PayloadMemory = slicer.Remaining,
-			};
-		}
-	}
-}
diff --git a/src/EventStore.LogV3/SlicerExtensions.cs b/src/EventStore.LogV3/SlicerExtensions.cs
deleted file mode 100644
index c5d287caa25..00000000000
--- a/src/EventStore.LogV3/SlicerExtensions.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace EventStore.LogV3 {
-	public static class SlicerExtensions {
-		public static ref T SliceAs<T>(this ref MemorySlicer<byte> slicer) where T : unmanaged =>
-			ref MemoryMarshal.AsRef<T>(slicer.Slice<T>().Span);
-
-		public unsafe static Memory<byte> Slice<T>(this ref MemorySlicer<byte> slicer) where T : unmanaged =>
-			slicer.Slice(sizeof(T));
-
-		public static ref readonly T SliceAs<T>(this ref ReadOnlyMemorySlicer<byte> slicer) where T : unmanaged =>
-			ref MemoryMarshal.AsRef<T>(slicer.Slice<T>().Span);
-
-		public unsafe static ReadOnlyMemory<byte> Slice<T>(this ref ReadOnlyMemorySlicer<byte> slicer) where T : unmanaged =>
-			slicer.Slice(sizeof(T));
-	}
-}
diff --git a/src/EventStore.LogV3/StreamWriteRecord.cs b/src/EventStore.LogV3/StreamWriteRecord.cs
deleted file mode 100644
index 2a5fe5a7fd5..00000000000
--- a/src/EventStore.LogV3/StreamWriteRecord.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Buffers;
-using System.Runtime.InteropServices;
-
-namespace EventStore.LogV3 {
-	// View of a stream write record
-	// interprets the payload
-	public struct StreamWriteRecord : IRecordView {
-		private readonly ReadOnlyMemory<byte> _event;
-
-		public ReadOnlyMemory<byte> Bytes => Record.Bytes;
-		public RecordView<Raw.StreamWriteHeader> Record { get; }
-		public ref readonly Raw.RecordHeader Header => ref Record.Header;
-		public ref readonly Raw.StreamWriteId WriteId => ref Record.RecordId<Raw.StreamWriteId>();
-		public ref readonly Raw.StreamWriteHeader SubHeader => ref Record.SubHeader;
-		public ReadOnlyMemory<byte> Payload => Record.Payload;
-		public StreamWriteSystemMetadata SystemMetadata { get; }
-
-		public StreamWriteRecord(RecordView<Raw.StreamWriteHeader> record) {
-			Record = record;
-
-			var slicer = Record.Payload.Slicer();
-			var systemMetadata = slicer.Slice(Record.SubHeader.MetadataSize);
-			_event = slicer.Remaining;
-
-			SystemMetadata = StreamWriteSystemMetadata.Parser.ParseFrom(new ReadOnlySequence<byte>(systemMetadata));
-		}
-
-		public EventRecord Event {
-			get {
-				var slicer = _event.Slicer();
-				ref readonly var eventHeader = ref MemoryMarshal.AsRef<Raw.EventHeader>(slicer.Remaining.Span);
-				var eventBytes = slicer.Slice(eventHeader.EventSize);
-				return new EventRecord(eventBytes);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.LogV3/StringPayloadRecord.cs b/src/EventStore.LogV3/StringPayloadRecord.cs
deleted file mode 100644
index 5a0f156c37c..00000000000
--- a/src/EventStore.LogV3/StringPayloadRecord.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Text;
-
-namespace EventStore.LogV3 {
-	// Several records have a payload which is a dynamically sized string
-	public struct StringPayloadRecord {
-		public static StringPayloadRecord<TSubHeader> Create<TSubHeader>(RecordView<TSubHeader> record)
-			where TSubHeader : unmanaged =>
-			new(record);
-
-		public static StringPayloadRecord<TSubHeader> Create<TSubHeader>(MutableRecordView<TSubHeader> record)
-			where TSubHeader : unmanaged =>
-			new(record);
-	}
-
-	public struct StringPayloadRecord<TSubHeader> : IRecordView where TSubHeader : unmanaged {
-		public ReadOnlyMemory<byte> Bytes => Record.Bytes;
-		public RecordView<TSubHeader> Record { get; }
-
-		public ref readonly Raw.RecordHeader Header => ref Record.Header;
-		public ref readonly TSubHeader SubHeader => ref Record.SubHeader;
-		public ReadOnlyMemory<byte> Payload => Record.Payload;
-		public string StringPayload => Encoding.UTF8.GetString(Record.Payload.Span);
-
-		public StringPayloadRecord(RecordView<TSubHeader> record) {
-			Record = record;
-		}
-	}
-}
diff --git a/src/EventStore.MicroBenchmarks/EventStore.MicroBenchmarks.csproj b/src/EventStore.MicroBenchmarks/EventStore.MicroBenchmarks.csproj
deleted file mode 100644
index f1dac6dffdf..00000000000
--- a/src/EventStore.MicroBenchmarks/EventStore.MicroBenchmarks.csproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<OutputType>Exe</OutputType>
-	</PropertyGroup>
-	<ItemGroup>
-		<PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\EventStore.Projections.Core.Tests\EventStore.Projections.Core.Tests.csproj" />
-		<ProjectReference Include="..\EventStore.Projections.Core\EventStore.Projections.Core.csproj" />
-	</ItemGroup>
-</Project>
diff --git a/src/EventStore.MicroBenchmarks/Program.cs b/src/EventStore.MicroBenchmarks/Program.cs
deleted file mode 100644
index 7a37bfce529..00000000000
--- a/src/EventStore.MicroBenchmarks/Program.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Configs;
-using BenchmarkDotNet.Running;
-using EventStore.Projections.Core.Services.Interpreted;
-using EventStore.Projections.Core.Tests.Services.Jint.Serialization;
-using Jint;
-using Jint.Native;
-using Jint.Native.Json;
-
-namespace EventStore.MicroBenchmarks {
-	internal class Program {
-		static void Main(string[] args) {
-			var config = System.Diagnostics.Debugger.IsAttached ? new DebugBuildConfig(){ } : DefaultConfig.Instance;
-			BenchmarkRunner.Run<ProjectionSerializationBenchmarks>(config, args);
-		}
-	}
-
-	[MemoryDiagnoser]
-	public class ProjectionSerializationBenchmarks {
-		private JsonSerializer _builtIn;
-		private JintProjectionStateHandler _handler;
-		private JsValue _stateInstance;
-
-		public ProjectionSerializationBenchmarks() {
-			var json = when_serializing_state.ReadJsonFromFile("big_state.json");
-
-			var engine = new Engine();
-			var parser = new JsonParser(engine);
-			_builtIn = new JsonSerializer(engine);
-			_handler = new JintProjectionStateHandler("", false, TimeSpan.FromMilliseconds(500), TimeSpan.FromMilliseconds(500));
-			
-			_stateInstance = parser.Parse(json);
-
-		}
-
-		[Benchmark(Baseline = true)]
-		public void JintSerializer() {
-			var s = _builtIn.Serialize(_stateInstance, JsValue.Undefined, JsValue.Undefined).AsString();
-			if (string.IsNullOrEmpty(s))
-				throw new Exception("something went wrong");
-		}
-
-		[Benchmark]
-		public void CustomSerializer() {
-			var s = _handler.Serialize(_stateInstance);
-			if (string.IsNullOrEmpty(s))
-				throw new Exception("something went wrong");
-		}
-		
-	}
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/Collections/ObjectModel/FreezableCollection.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/Collections/ObjectModel/FreezableCollection.cs
deleted file mode 100644
index 1669a26daa4..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/Collections/ObjectModel/FreezableCollection.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-//----------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//----------------------------------------------------------------
-
-namespace System.Collections.ObjectModel
-{
-    using System;
-    using System.Collections.Generic;
-    using System.ServiceModel;
-
-    class FreezableCollection<T> : Collection<T>, ICollection<T>
-    {
-        bool frozen;
-
-        public FreezableCollection()
-            : base()
-        {
-        }
-
-        public FreezableCollection(IList<T> list)
-            : base(list)
-        {
-        }
-
-        public bool IsFrozen
-        {
-            get
-            {
-                return this.frozen;
-            }
-        }
-
-        bool ICollection<T>.IsReadOnly
-        {
-            get
-            {
-                return this.frozen;
-            }
-        }
-
-        public void Freeze()
-        {
-            this.frozen = true;
-        }
-
-        protected override void ClearItems()
-        {
-            ThrowIfFrozen();
-            base.ClearItems();
-        }
-
-        protected override void InsertItem(int index, T item)
-        {
-            ThrowIfFrozen();
-            base.InsertItem(index, item);
-        }
-
-        protected override void RemoveItem(int index)
-        {
-            ThrowIfFrozen();
-            base.RemoveItem(index);
-        }
-
-        protected override void SetItem(int index, T item)
-        {
-            ThrowIfFrozen();
-            base.SetItem(index, item);
-        }
-
-        void ThrowIfFrozen()
-        {
-            if (this.frozen)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.ObjectIsReadOnly));
-            }
-        }
-    }
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplate.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplate.cs
deleted file mode 100644
index a62d82e0b93..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplate.cs
+++ /dev/null
@@ -1,1732 +0,0 @@
-//----------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//----------------------------------------------------------------
-
-namespace System
-{
-    using System.Collections.Concurrent;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Collections.Specialized;
-    using System.Runtime;
-    using System.ServiceModel;
-    using System.ServiceModel.Channels;
-    using System.Text;
-    using System.Threading;
-    using System.Runtime.CompilerServices;
-    using System.Globalization;
-
-    [TypeForwardedFrom("System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")]
-    public class UriTemplate
-    {
-        internal readonly int firstOptionalSegment;
-
-        internal readonly string originalTemplate;
-        internal readonly Dictionary<string, UriTemplateQueryValue> queries; // keys are original case specified in UriTemplate constructor, dictionary ignores case
-        internal readonly List<UriTemplatePathSegment> segments;
-        internal const string WildcardPath = "*";
-        readonly Dictionary<string, string> additionalDefaults; // keys are original case specified in UriTemplate constructor, dictionary ignores case
-        readonly string fragment;
-
-        readonly bool ignoreTrailingSlash;
-
-        const string NullableDefault = "null";
-        readonly WildcardInfo wildcard;
-        IDictionary<string, string> defaults;
-        ConcurrentDictionary<string, string> unescapedDefaults;
-
-        VariablesCollection variables;
-
-        // constructors validates that template is well-formed
-        public UriTemplate(string template)
-            : this(template, false)
-        {
-        }
-        public UriTemplate(string template, bool ignoreTrailingSlash)
-            : this(template, ignoreTrailingSlash, null)
-        {
-        }
-        public UriTemplate(string template, IDictionary<string, string> additionalDefaults)
-            : this(template, false, additionalDefaults)
-        {
-        }
-        public UriTemplate(string template, bool ignoreTrailingSlash, IDictionary<string, string> additionalDefaults)
-        {
-            if (template == null)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("template");
-            }
-            this.originalTemplate = template;
-            this.ignoreTrailingSlash = ignoreTrailingSlash;
-            this.segments = new List<UriTemplatePathSegment>();
-            this.queries = new Dictionary<string, UriTemplateQueryValue>(StringComparer.OrdinalIgnoreCase);
-
-            // parse it
-            string pathTemplate;
-            string queryTemplate;
-            // ignore a leading slash
-            if (template.StartsWith("/", StringComparison.Ordinal))
-            {
-                template = template.Substring(1);
-            }
-            // pull out fragment
-            int fragmentStart = template.IndexOf('#');
-            if (fragmentStart == -1)
-            {
-                this.fragment = "";
-            }
-            else
-            {
-                this.fragment = template.Substring(fragmentStart + 1);
-                template = template.Substring(0, fragmentStart);
-            }
-            // pull out path and query
-            int queryStart = template.IndexOf('?');
-            if (queryStart == -1)
-            {
-                queryTemplate = string.Empty;
-                pathTemplate = template;
-            }
-            else
-            {
-                queryTemplate = template.Substring(queryStart + 1);
-                pathTemplate = template.Substring(0, queryStart);
-            }
-            template = null; // to ensure we don't accidentally reference this variable any more
-
-            // setup path template and validate
-            if (!string.IsNullOrEmpty(pathTemplate))
-            {
-                int startIndex = 0;
-                while (startIndex < pathTemplate.Length)
-                {
-                    // Identify the next segment
-                    int endIndex = pathTemplate.IndexOf('/', startIndex);
-                    string segment;
-                    if (endIndex != -1)
-                    {
-                        segment = pathTemplate.Substring(startIndex, endIndex + 1 - startIndex);
-                        startIndex = endIndex + 1;
-                    }
-                    else
-                    {
-                        segment = pathTemplate.Substring(startIndex);
-                        startIndex = pathTemplate.Length;
-                    }
-                    // Checking for wildcard segment ("*") or ("{*<var name>}")
-                    UriTemplatePartType wildcardType;
-                    if ((startIndex == pathTemplate.Length) &&
-                        UriTemplateHelpers.IsWildcardSegment(segment, out wildcardType))
-                    {
-                        switch (wildcardType)
-                        {
-                            case UriTemplatePartType.Literal:
-                                this.wildcard = new WildcardInfo(this);
-                                break;
-
-                            case UriTemplatePartType.Variable:
-                                this.wildcard = new WildcardInfo(this, segment);
-                                break;
-
-                            default:
-                                Fx.Assert("Error in identifying the type of the wildcard segment");
-                                break;
-                        }
-                    }
-                    else
-                    {
-                        this.segments.Add(UriTemplatePathSegment.CreateFromUriTemplate(segment, this));
-                    }
-                }
-            }
-
-            // setup query template and validate
-            if (!string.IsNullOrEmpty(queryTemplate))
-            {
-                int startIndex = 0;
-                while (startIndex < queryTemplate.Length)
-                {
-                    // Identify the next query part
-                    int endIndex = queryTemplate.IndexOf('&', startIndex);
-                    int queryPartStart = startIndex;
-                    int queryPartEnd;
-                    if (endIndex != -1)
-                    {
-                        queryPartEnd = endIndex;
-                        startIndex = endIndex + 1;
-                        if (startIndex >= queryTemplate.Length)
-                        {
-                            throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
-                                SR.UTQueryCannotEndInAmpersand, this.originalTemplate)));
-                        }
-                    }
-                    else
-                    {
-                        queryPartEnd = queryTemplate.Length;
-                        startIndex = queryTemplate.Length;
-                    }
-                    // Checking query part type; identifying key and value
-                    int equalSignIndex = queryTemplate.IndexOf('=', queryPartStart, queryPartEnd - queryPartStart);
-                    string key;
-                    string value;
-                    if (equalSignIndex >= 0)
-                    {
-                        key = queryTemplate.Substring(queryPartStart, equalSignIndex - queryPartStart);
-                        value = queryTemplate.Substring(equalSignIndex + 1, queryPartEnd - equalSignIndex - 1);
-                    }
-                    else
-                    {
-                        key = queryTemplate.Substring(queryPartStart, queryPartEnd - queryPartStart);
-                        value = null;
-                    }
-                    if (string.IsNullOrEmpty(key))
-                    {
-                        throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
-                            SR.UTQueryCannotHaveEmptyName, this.originalTemplate)));
-                    }
-                    if (UriTemplateHelpers.IdentifyPartType(key) != UriTemplatePartType.Literal)
-                    {
-                        throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("template", SR.GetString(
-                            SR.UTQueryMustHaveLiteralNames, this.originalTemplate));
-                    }
-                    // Adding a new entry to the queries dictionary
-                    key = UrlUtility.UrlDecode(key, Encoding.UTF8);
-                    if (this.queries.ContainsKey(key))
-                    {
-                        throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
-                            SR.UTQueryNamesMustBeUnique, this.originalTemplate)));
-                    }
-                    this.queries.Add(key, UriTemplateQueryValue.CreateFromUriTemplate(value, this));
-                }
-            }
-
-            // Process additional defaults (if has some) :
-            if (additionalDefaults != null)
-            {
-                if (this.variables == null)
-                {
-                    if (additionalDefaults.Count > 0)
-                    {
-                        this.additionalDefaults = new Dictionary<string, string>(additionalDefaults, StringComparer.OrdinalIgnoreCase);
-                    }
-                }
-                else
-                {
-                    foreach (KeyValuePair<string, string> kvp in additionalDefaults)
-                    {
-                        string uppercaseKey = kvp.Key.ToUpperInvariant();
-                        if ((this.variables.DefaultValues != null) && this.variables.DefaultValues.ContainsKey(uppercaseKey))
-                        {
-                            throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("additionalDefaults",
-                                SR.GetString(SR.UTAdditionalDefaultIsInvalid, kvp.Key, this.originalTemplate));
-                        }
-                        if (this.variables.PathSegmentVariableNames.Contains(uppercaseKey))
-                        {
-                            this.variables.AddDefaultValue(uppercaseKey, kvp.Value);
-                        }
-                        else if (this.variables.QueryValueVariableNames.Contains(uppercaseKey))
-                        {
-                            throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
-                                SR.GetString(SR.UTDefaultValueToQueryVarFromAdditionalDefaults, this.originalTemplate,
-                                uppercaseKey)));
-                        }
-                        else if (string.Compare(kvp.Value, UriTemplate.NullableDefault, StringComparison.OrdinalIgnoreCase) == 0)
-                        {
-                            throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
-                                SR.GetString(SR.UTNullableDefaultAtAdditionalDefaults, this.originalTemplate,
-                                uppercaseKey)));
-                        }
-                        else
-                        {
-                            if (this.additionalDefaults == null)
-                            {
-                                this.additionalDefaults = new Dictionary<string, string>(additionalDefaults.Count, StringComparer.OrdinalIgnoreCase);
-                            }
-                            this.additionalDefaults.Add(kvp.Key, kvp.Value);
-                        }
-                    }
-                }
-            }
-
-            // Validate defaults (if should)
-            if ((this.variables != null) && (this.variables.DefaultValues != null))
-            {
-                this.variables.ValidateDefaults(out this.firstOptionalSegment);
-            }
-            else
-            {
-                this.firstOptionalSegment = this.segments.Count;
-            }
-        }
-
-        public IDictionary<string, string> Defaults
-        {
-            get
-            {
-                if (this.defaults == null)
-                {
-                    Interlocked.CompareExchange<IDictionary<string, string>>(ref this.defaults, new UriTemplateDefaults(this), null);
-                }
-                return this.defaults;
-            }
-        }
-        public bool IgnoreTrailingSlash
-        {
-            get
-            {
-                return this.ignoreTrailingSlash;
-            }
-        }
-        public ReadOnlyCollection<string> PathSegmentVariableNames
-        {
-            get
-            {
-                if (this.variables == null)
-                {
-                    return VariablesCollection.EmptyCollection;
-                }
-                else
-                {
-                    return this.variables.PathSegmentVariableNames;
-                }
-            }
-        }
-        public ReadOnlyCollection<string> QueryValueVariableNames
-        {
-            get
-            {
-                if (this.variables == null)
-                {
-                    return VariablesCollection.EmptyCollection;
-                }
-                else
-                {
-                    return this.variables.QueryValueVariableNames;
-                }
-            }
-        }
-
-        internal bool HasNoVariables
-        {
-            get
-            {
-                return (this.variables == null);
-            }
-        }
-        internal bool HasWildcard
-        {
-            get
-            {
-                return (this.wildcard != null);
-            }
-        }
-
-        // make a Uri by subbing in the values, throw on bad input
-        public Uri BindByName(Uri baseAddress, IDictionary<string, string> parameters)
-        {
-            return BindByName(baseAddress, parameters, false);
-        }
-        public Uri BindByName(Uri baseAddress, IDictionary<string, string> parameters, bool omitDefaults)
-        {
-            if (baseAddress == null)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("baseAddress");
-            }
-            if (!baseAddress.IsAbsoluteUri)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("baseAddress", SR.GetString(
-                    SR.UTBadBaseAddress));
-            }
-
-            BindInformation bindInfo;
-            if (this.variables == null)
-            {
-                bindInfo = PrepareBindInformation(parameters, omitDefaults);
-            }
-            else
-            {
-                bindInfo = this.variables.PrepareBindInformation(parameters, omitDefaults);
-            }
-            return Bind(baseAddress, bindInfo, omitDefaults);
-        }
-        public Uri BindByName(Uri baseAddress, NameValueCollection parameters)
-        {
-            return BindByName(baseAddress, parameters, false);
-        }
-        public Uri BindByName(Uri baseAddress, NameValueCollection parameters, bool omitDefaults)
-        {
-            if (baseAddress == null)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("baseAddress");
-            }
-            if (!baseAddress.IsAbsoluteUri)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("baseAddress", SR.GetString(
-                    SR.UTBadBaseAddress));
-            }
-
-            BindInformation bindInfo;
-            if (this.variables == null)
-            {
-                bindInfo = PrepareBindInformation(parameters, omitDefaults);
-            }
-            else
-            {
-                bindInfo = this.variables.PrepareBindInformation(parameters, omitDefaults);
-            }
-            return Bind(baseAddress, bindInfo, omitDefaults);
-        }
-        public Uri BindByPosition(Uri baseAddress, params string[] values)
-        {
-            if (baseAddress == null)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("baseAddress");
-            }
-            if (!baseAddress.IsAbsoluteUri)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("baseAddress", SR.GetString(
-                    SR.UTBadBaseAddress));
-            }
-
-            BindInformation bindInfo;
-            if (this.variables == null)
-            {
-                if (values.Length > 0)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(SR.GetString(
-                        SR.UTBindByPositionNoVariables, this.originalTemplate, values.Length)));
-                }
-                bindInfo = new BindInformation(this.additionalDefaults);
-            }
-            else
-            {
-                bindInfo = this.variables.PrepareBindInformation(values);
-            }
-            return Bind(baseAddress, bindInfo, false);
-        }
-
-        // A note about UriTemplate equivalency:
-        //  The introduction of defaults and, more over, terminal defaults, broke the simple
-        //  intuative notion of equivalency between templates. We will define equivalent
-        //  templates as such based on the structure of them and not based on the set of uri
-        //  that are matched by them. The result is that, even though they do not match the
-        //  same set of uri's, the following templates are equivalent:
-        //      - "/foo/{bar}"
-        //      - "/foo/{bar=xyz}"
-        //  A direct result from the support for 'terminal defaults' is that the IsPathEquivalentTo
-        //  method, which was used both to determine the equivalence between templates, as 
-        //  well as verify that all the templates, combined together in the same PathEquivalentSet, 
-        //  are equivalent in thier path is no longer valid for both purposes. We will break 
-        //  it to two distinct methods, each will be called in a different case.
-        public bool IsEquivalentTo(UriTemplate other)
-        {
-            if (other == null)
-            {
-                return false;
-            }
-            if (other.segments == null || other.queries == null)
-            {
-                // they never are null, but PreSharp is complaining, 
-                // and warning suppression isn't working
-                return false;
-            }
-            if (!IsPathFullyEquivalent(other))
-            {
-                return false;
-            }
-            if (!IsQueryEquivalent(other))
-            {
-                return false;
-            }
-            Fx.Assert(UriTemplateEquivalenceComparer.Instance.GetHashCode(this) == UriTemplateEquivalenceComparer.Instance.GetHashCode(other), "bad GetHashCode impl");
-            return true;
-        }
-
-        public UriTemplateMatch Match(Uri baseAddress, Uri candidate)
-        {
-            if (baseAddress == null)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("baseAddress");
-            }
-            if (!baseAddress.IsAbsoluteUri)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("baseAddress", SR.GetString(
-                    SR.UTBadBaseAddress));
-            }
-            if (candidate == null)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("candidate");
-            }
-
-            // ensure that the candidate is 'under' the base address
-            if (!candidate.IsAbsoluteUri)
-            {
-                return null;
-            }
-            string basePath = UriTemplateHelpers.GetUriPath(baseAddress);
-            string candidatePath = UriTemplateHelpers.GetUriPath(candidate);
-            if (candidatePath.Length < basePath.Length)
-            {
-                return null;
-            }
-            if (!candidatePath.StartsWith(basePath, StringComparison.OrdinalIgnoreCase))
-            {
-                return null;
-            }
-
-            // Identifying the relative segments \ checking matching to the path :
-            int numSegmentsInBaseAddress = baseAddress.Segments.Length;
-            string[] candidateSegments = candidate.Segments;
-            int numMatchedSegments;
-            Collection<string> relativeCandidateSegments;
-            if (!IsCandidatePathMatch(numSegmentsInBaseAddress, candidateSegments,
-                out numMatchedSegments, out relativeCandidateSegments))
-            {
-                return null;
-            }
-            // Checking matching to the query (if should) :
-            NameValueCollection candidateQuery = null;
-            if (!UriTemplateHelpers.CanMatchQueryTrivially(this))
-            {
-                candidateQuery = UriTemplateHelpers.ParseQueryString(candidate.Query);
-                if (!UriTemplateHelpers.CanMatchQueryInterestingly(this, candidateQuery, false))
-                {
-                    return null;
-                }
-            }
-
-            // We matched; lets build the UriTemplateMatch
-            return CreateUriTemplateMatch(baseAddress, candidate, null, numMatchedSegments,
-                relativeCandidateSegments, candidateQuery);
-        }
-
-        public override string ToString()
-        {
-            return this.originalTemplate;
-        }
-
-        internal string AddPathVariable(UriTemplatePartType sourceNature, string varDeclaration)
-        {
-            bool hasDefaultValue;
-            return AddPathVariable(sourceNature, varDeclaration, out hasDefaultValue);
-        }
-        internal string AddPathVariable(UriTemplatePartType sourceNature, string varDeclaration,
-            out bool hasDefaultValue)
-        {
-            if (this.variables == null)
-            {
-                this.variables = new VariablesCollection(this);
-            }
-            return this.variables.AddPathVariable(sourceNature, varDeclaration, out hasDefaultValue);
-        }
-        internal string AddQueryVariable(string varDeclaration)
-        {
-            if (this.variables == null)
-            {
-                this.variables = new VariablesCollection(this);
-            }
-            return this.variables.AddQueryVariable(varDeclaration);
-        }
-
-        internal UriTemplateMatch CreateUriTemplateMatch(Uri baseUri, Uri uri, object data,
-            int numMatchedSegments, Collection<string> relativePathSegments, NameValueCollection uriQuery)
-        {
-            UriTemplateMatch result = new UriTemplateMatch();
-            result.RequestUri = uri;
-            result.BaseUri = baseUri;
-            if (uriQuery != null)
-            {
-                result.SetQueryParameters(uriQuery);
-            }
-            result.SetRelativePathSegments(relativePathSegments);
-            result.Data = data;
-            result.Template = this;
-            for (int i = 0; i < numMatchedSegments; i++)
-            {
-                this.segments[i].Lookup(result.RelativePathSegments[i], result.BoundVariables);
-            }
-            if (this.wildcard != null)
-            {
-                this.wildcard.Lookup(numMatchedSegments, result.RelativePathSegments,
-                    result.BoundVariables);
-            }
-            else if (numMatchedSegments < this.segments.Count)
-            {
-                BindTerminalDefaults(numMatchedSegments, result.BoundVariables);
-            }
-            if (this.queries.Count > 0)
-            {
-                foreach (KeyValuePair<string, UriTemplateQueryValue> kvp in this.queries)
-                {
-                    kvp.Value.Lookup(result.QueryParameters[kvp.Key], result.BoundVariables);
-                    //UriTemplateHelpers.AssertCanonical(varName);
-                }
-            }
-            if (this.additionalDefaults != null)
-            {
-                foreach (KeyValuePair<string, string> kvp in this.additionalDefaults)
-                {
-                    result.BoundVariables.Add(kvp.Key, UnescapeDefaultValue(kvp.Value));
-                }
-            }
-            Fx.Assert(result.RelativePathSegments.Count - numMatchedSegments >= 0, "bad segment computation");
-            result.SetWildcardPathSegmentsStart(numMatchedSegments);
-
-            return result;
-        }
-
-        internal bool IsPathPartiallyEquivalentAt(UriTemplate other, int segmentsCount)
-        {
-            // Refer to the note on template equivalency at IsEquivalentTo
-            // This method checks if any uri with given number of segments, which can be matched
-            //  by this template, can be also matched by the other template.
-            Fx.Assert(segmentsCount >= this.firstOptionalSegment - 1, "How can that be? The Trie is constructed that way!");
-            Fx.Assert(segmentsCount <= this.segments.Count, "How can that be? The Trie is constructed that way!");
-            Fx.Assert(segmentsCount >= other.firstOptionalSegment - 1, "How can that be? The Trie is constructed that way!");
-            Fx.Assert(segmentsCount <= other.segments.Count, "How can that be? The Trie is constructed that way!");
-            for (int i = 0; i < segmentsCount; ++i)
-            {
-                if (!this.segments[i].IsEquivalentTo(other.segments[i],
-                    ((i == segmentsCount - 1) && (this.ignoreTrailingSlash || other.ignoreTrailingSlash))))
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-        internal bool IsQueryEquivalent(UriTemplate other)
-        {
-            if (this.queries.Count != other.queries.Count)
-            {
-                return false;
-            }
-            foreach (string key in this.queries.Keys)
-            {
-                UriTemplateQueryValue utqv = this.queries[key];
-                UriTemplateQueryValue otherUtqv;
-                if (!other.queries.TryGetValue(key, out otherUtqv))
-                {
-                    return false;
-                }
-                if (!utqv.IsEquivalentTo(otherUtqv))
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        internal static Uri RewriteUri(Uri uri, string host)
-        {
-            if (!string.IsNullOrEmpty(host))
-            {
-                string originalHostHeader = uri.Host + ((!uri.IsDefaultPort) ? ":" + uri.Port.ToString(CultureInfo.InvariantCulture) : string.Empty);
-                if (!String.Equals(originalHostHeader, host, StringComparison.OrdinalIgnoreCase))
-                {
-                    Uri sourceUri = new Uri(String.Format(CultureInfo.InvariantCulture, "{0}://{1}", uri.Scheme, host));
-                    return (new UriBuilder(uri) { Host = sourceUri.Host, Port = sourceUri.Port }).Uri;
-                }
-            }
-            return uri;
-        }
-
-        Uri Bind(Uri baseAddress, BindInformation bindInfo, bool omitDefaults)
-        {
-            UriBuilder result = new UriBuilder(baseAddress);
-            int parameterIndex = 0;
-            int lastPathParameter = ((this.variables == null) ? -1 : this.variables.PathSegmentVariableNames.Count - 1);
-            int lastPathParameterToBind;
-            if (lastPathParameter == -1)
-            {
-                lastPathParameterToBind = -1;
-            }
-            else if (omitDefaults)
-            {
-                lastPathParameterToBind = bindInfo.LastNonDefaultPathParameter;
-            }
-            else
-            {
-                lastPathParameterToBind = bindInfo.LastNonNullablePathParameter;
-            }
-            string[] parameters = bindInfo.NormalizedParameters;
-            IDictionary<string, string> extraQueryParameters = bindInfo.AdditionalParameters;
-            // Binding the path :
-            StringBuilder pathString = new StringBuilder(result.Path);
-            if (pathString[pathString.Length - 1] != '/')
-            {
-                pathString.Append('/');
-            }
-            if (lastPathParameterToBind < lastPathParameter)
-            {
-                // Binding all the parameters we need
-                int segmentIndex = 0;
-                while (parameterIndex <= lastPathParameterToBind)
-                {
-                    Fx.Assert(segmentIndex < this.segments.Count,
-                        "Calculation of LastNonDefaultPathParameter,lastPathParameter or parameterIndex failed");
-                    this.segments[segmentIndex++].Bind(parameters, ref parameterIndex, pathString);
-                }
-                Fx.Assert(parameterIndex == lastPathParameterToBind + 1,
-                    "That is the exit criteria from the loop");
-                // Maybe we have some literals yet to bind
-                Fx.Assert(segmentIndex < this.segments.Count,
-                    "Calculation of LastNonDefaultPathParameter,lastPathParameter or parameterIndex failed");
-                while (this.segments[segmentIndex].Nature == UriTemplatePartType.Literal)
-                {
-                    this.segments[segmentIndex++].Bind(parameters, ref parameterIndex, pathString);
-                    Fx.Assert(parameterIndex == lastPathParameterToBind + 1,
-                        "We have moved the parameter index in a literal binding");
-                    Fx.Assert(segmentIndex < this.segments.Count,
-                        "Calculation of LastNonDefaultPathParameter,lastPathParameter or parameterIndex failed");
-                }
-                // We're done; skip to the beggining of the query parameters
-                parameterIndex = lastPathParameter + 1;
-            }
-            else if (this.segments.Count > 0 || this.wildcard != null)
-            {
-                for (int i = 0; i < this.segments.Count; i++)
-                {
-                    this.segments[i].Bind(parameters, ref parameterIndex, pathString);
-                }
-                if (this.wildcard != null)
-                {
-                    this.wildcard.Bind(parameters, ref parameterIndex, pathString);
-                }
-            }
-            if (this.ignoreTrailingSlash && (pathString[pathString.Length - 1] == '/'))
-            {
-                pathString.Remove(pathString.Length - 1, 1);
-            }
-            result.Path = pathString.ToString();
-            // Binding the query :
-            if ((this.queries.Count != 0) || (extraQueryParameters != null))
-            {
-                StringBuilder query = new StringBuilder("");
-                foreach (string key in this.queries.Keys)
-                {
-                    this.queries[key].Bind(key, parameters, ref parameterIndex, query);
-                }
-                if (extraQueryParameters != null)
-                {
-                    foreach (string key in extraQueryParameters.Keys)
-                    {
-                        if (this.queries.ContainsKey(key.ToUpperInvariant()))
-                        {
-                            // This can only be if the key passed has the same name as some literal key
-                            throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("parameters", SR.GetString(
-                                SR.UTBothLiteralAndNameValueCollectionKey, key));
-                        }
-                        string value = extraQueryParameters[key];
-                        string escapedValue = (string.IsNullOrEmpty(value) ? string.Empty : UrlUtility.UrlEncode(value, Encoding.UTF8));
-                        query.AppendFormat("&{0}={1}", UrlUtility.UrlEncode(key, Encoding.UTF8), escapedValue);
-                    }
-                }
-                if (query.Length != 0)
-                {
-                    query.Remove(0, 1); // remove extra leading '&'
-                }
-                result.Query = query.ToString();
-            }
-            // Adding the fragment (if needed)
-            if (this.fragment != null)
-            {
-                result.Fragment = this.fragment;
-            }
-
-            return result.Uri;
-        }
-        void BindTerminalDefaults(int numMatchedSegments, NameValueCollection boundParameters)
-        {
-            Fx.Assert(!this.HasWildcard, "There are no terminal default when ends with wildcard");
-            Fx.Assert(numMatchedSegments < this.segments.Count, "Otherwise - no defaults to bind");
-            Fx.Assert(this.variables != null, "Otherwise - no default values to bind");
-            Fx.Assert(this.variables.DefaultValues != null, "Otherwise - no default values to bind");
-            for (int i = numMatchedSegments; i < this.segments.Count; i++)
-            {
-                switch (this.segments[i].Nature)
-                {
-                    case UriTemplatePartType.Variable:
-                        {
-                            UriTemplateVariablePathSegment vps = this.segments[i] as UriTemplateVariablePathSegment;
-                            Fx.Assert(vps != null, "How can that be? That its nature");
-                            this.variables.LookupDefault(vps.VarName, boundParameters);
-                        }
-                        break;
-
-                    default:
-                        Fx.Assert("We only support terminal defaults on Variable segments");
-                        break;
-                }
-            }
-        }
-
-        bool IsCandidatePathMatch(int numSegmentsInBaseAddress, string[] candidateSegments,
-            out int numMatchedSegments, out Collection<string> relativeSegments)
-        {
-            int numRelativeSegments = candidateSegments.Length - numSegmentsInBaseAddress;
-            Fx.Assert(numRelativeSegments >= 0, "bad segments num");
-            relativeSegments = new Collection<string>();
-            bool isStillMatch = true;
-            int relativeSegmentsIndex = 0;
-            while (isStillMatch && (relativeSegmentsIndex < numRelativeSegments))
-            {
-                string segment = candidateSegments[relativeSegmentsIndex + numSegmentsInBaseAddress];
-                // Mathcing to next regular segment in the template (if there is one); building the wire segment representation
-                if (relativeSegmentsIndex < this.segments.Count)
-                {
-                    bool ignoreSlash = (this.ignoreTrailingSlash && (relativeSegmentsIndex == numRelativeSegments - 1));
-                    UriTemplateLiteralPathSegment lps = UriTemplateLiteralPathSegment.CreateFromWireData(segment);
-                    if (!this.segments[relativeSegmentsIndex].IsMatch(lps, ignoreSlash))
-                    {
-                        isStillMatch = false;
-                        break;
-                    }
-                    string relPathSeg = Uri.UnescapeDataString(segment);
-                    if (lps.EndsWithSlash)
-                    {
-                        Fx.Assert(relPathSeg.EndsWith("/", StringComparison.Ordinal), "problem with relative path segment");
-                        relPathSeg = relPathSeg.Substring(0, relPathSeg.Length - 1); // trim slash
-                    }
-                    relativeSegments.Add(relPathSeg);
-                }
-                // Checking if the template has a wild card ('*') or a final star var segment ("{*<var name>}"
-                else if (this.HasWildcard)
-                {
-                    break;
-                }
-                else
-                {
-                    isStillMatch = false;
-                    break;
-                }
-                relativeSegmentsIndex++;
-            }
-            if (isStillMatch)
-            {
-                numMatchedSegments = relativeSegmentsIndex;
-                // building the wire representation to segments that were matched to a wild card
-                if (relativeSegmentsIndex < numRelativeSegments)
-                {
-                    while (relativeSegmentsIndex < numRelativeSegments)
-                    {
-                        string relPathSeg = Uri.UnescapeDataString(candidateSegments[relativeSegmentsIndex + numSegmentsInBaseAddress]);
-                        if (relPathSeg.EndsWith("/", StringComparison.Ordinal))
-                        {
-                            relPathSeg = relPathSeg.Substring(0, relPathSeg.Length - 1); // trim slash
-                        }
-                        relativeSegments.Add(relPathSeg);
-                        relativeSegmentsIndex++;
-                    }
-                }
-                // Checking if we matched all required segments already
-                else if (numMatchedSegments < this.firstOptionalSegment)
-                {
-                    isStillMatch = false;
-                }
-            }
-            else
-            {
-                numMatchedSegments = 0;
-            }
-
-            return isStillMatch;
-        }
-
-        bool IsPathFullyEquivalent(UriTemplate other)
-        {
-            // Refer to the note on template equivalency at IsEquivalentTo
-            // This method checks if both templates has a fully equivalent path.
-            if (this.HasWildcard != other.HasWildcard)
-            {
-                return false;
-            }
-            if (this.segments.Count != other.segments.Count)
-            {
-                return false;
-            }
-            for (int i = 0; i < this.segments.Count; ++i)
-            {
-                if (!this.segments[i].IsEquivalentTo(other.segments[i],
-                    (i == this.segments.Count - 1) && !this.HasWildcard && (this.ignoreTrailingSlash || other.ignoreTrailingSlash)))
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        BindInformation PrepareBindInformation(IDictionary<string, string> parameters, bool omitDefaults)
-        {
-            if (parameters == null)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("parameters");
-            }
-
-            IDictionary<string, string> extraParameters = new Dictionary<string, string>(UriTemplateHelpers.GetQueryKeyComparer());
-            foreach (KeyValuePair<string, string> kvp in parameters)
-            {
-                if (string.IsNullOrEmpty(kvp.Key))
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("parameters",
-                        SR.GetString(SR.UTBindByNameCalledWithEmptyKey));
-                }
-
-                extraParameters.Add(kvp);
-            }
-            BindInformation bindInfo;
-            ProcessDefaultsAndCreateBindInfo(omitDefaults, extraParameters, out bindInfo);
-            return bindInfo;
-        }
-        BindInformation PrepareBindInformation(NameValueCollection parameters, bool omitDefaults)
-        {
-            if (parameters == null)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("parameters");
-            }
-
-            IDictionary<string, string> extraParameters = new Dictionary<string, string>(UriTemplateHelpers.GetQueryKeyComparer());
-            foreach (string key in parameters.AllKeys)
-            {
-                if (string.IsNullOrEmpty(key))
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("parameters",
-                        SR.GetString(SR.UTBindByNameCalledWithEmptyKey));
-                }
-
-                extraParameters.Add(key, parameters[key]);
-            }
-            BindInformation bindInfo;
-            ProcessDefaultsAndCreateBindInfo(omitDefaults, extraParameters, out bindInfo);
-            return bindInfo;
-        }
-        void ProcessDefaultsAndCreateBindInfo(bool omitDefaults, IDictionary<string, string> extraParameters,
-            out BindInformation bindInfo)
-        {
-            Fx.Assert(extraParameters != null, "We are expected to create it at the calling PrepareBindInformation");
-            if (this.additionalDefaults != null)
-            {
-                if (omitDefaults)
-                {
-                    foreach (KeyValuePair<string, string> kvp in this.additionalDefaults)
-                    {
-                        string extraParameter;
-                        if (extraParameters.TryGetValue(kvp.Key, out extraParameter))
-                        {
-                            if (string.Compare(extraParameter, kvp.Value, StringComparison.Ordinal) == 0)
-                            {
-                                extraParameters.Remove(kvp.Key);
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    foreach (KeyValuePair<string, string> kvp in this.additionalDefaults)
-                    {
-                        if (!extraParameters.ContainsKey(kvp.Key))
-                        {
-                            extraParameters.Add(kvp.Key, kvp.Value);
-                        }
-                    }
-                }
-            }
-            if (extraParameters.Count == 0)
-            {
-                extraParameters = null;
-            }
-            bindInfo = new BindInformation(extraParameters);
-        }
-
-        string UnescapeDefaultValue(string escapedValue)
-        {
-            if (string.IsNullOrEmpty(escapedValue))
-            {
-                return escapedValue;
-            }
-            if (this.unescapedDefaults == null)
-            {
-                this.unescapedDefaults = new ConcurrentDictionary<string, string>(StringComparer.Ordinal);
-            }
-
-            return this.unescapedDefaults.GetOrAdd(escapedValue, Uri.UnescapeDataString);
-        }
-
-        struct BindInformation
-        {
-            IDictionary<string, string> additionalParameters;
-            int lastNonDefaultPathParameter;
-            int lastNonNullablePathParameter;
-            string[] normalizedParameters;
-
-            public BindInformation(string[] normalizedParameters, int lastNonDefaultPathParameter,
-                int lastNonNullablePathParameter, IDictionary<string, string> additionalParameters)
-            {
-                this.normalizedParameters = normalizedParameters;
-                this.lastNonDefaultPathParameter = lastNonDefaultPathParameter;
-                this.lastNonNullablePathParameter = lastNonNullablePathParameter;
-                this.additionalParameters = additionalParameters;
-            }
-            public BindInformation(IDictionary<string, string> additionalParameters)
-            {
-                this.normalizedParameters = null;
-                this.lastNonDefaultPathParameter = -1;
-                this.lastNonNullablePathParameter = -1;
-                this.additionalParameters = additionalParameters;
-            }
-
-            public IDictionary<string, string> AdditionalParameters
-            {
-                get
-                {
-                    return this.additionalParameters;
-                }
-            }
-            public int LastNonDefaultPathParameter
-            {
-                get
-                {
-                    return this.lastNonDefaultPathParameter;
-                }
-            }
-            public int LastNonNullablePathParameter
-            {
-                get
-                {
-                    return this.lastNonNullablePathParameter;
-                }
-            }
-            public string[] NormalizedParameters
-            {
-                get
-                {
-                    return this.normalizedParameters;
-                }
-            }
-        }
-
-        class UriTemplateDefaults : IDictionary<string, string>
-        {
-            Dictionary<string, string> defaults;
-            ReadOnlyCollection<string> keys;
-            ReadOnlyCollection<string> values;
-
-            public UriTemplateDefaults(UriTemplate template)
-            {
-                this.defaults = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-                if ((template.variables != null) && (template.variables.DefaultValues != null))
-                {
-                    foreach (KeyValuePair<string, string> kvp in template.variables.DefaultValues)
-                    {
-                        this.defaults.Add(kvp.Key, kvp.Value);
-                    }
-                }
-                if (template.additionalDefaults != null)
-                {
-                    foreach (KeyValuePair<string, string> kvp in template.additionalDefaults)
-                    {
-                        this.defaults.Add(kvp.Key.ToUpperInvariant(), kvp.Value);
-                    }
-                }
-                this.keys = new ReadOnlyCollection<string>(new List<string>(this.defaults.Keys));
-                this.values = new ReadOnlyCollection<string>(new List<string>(this.defaults.Values));
-            }
-
-            // ICollection<KeyValuePair<string, string>> Members
-            public int Count
-            {
-                get
-                {
-                    return this.defaults.Count;
-                }
-            }
-            public bool IsReadOnly
-            {
-                get
-                {
-                    return true;
-                }
-            }
-
-            // IDictionary<string, string> Members
-            public ICollection<string> Keys
-            {
-                get
-                {
-                    return this.keys;
-                }
-            }
-            public ICollection<string> Values
-            {
-                get
-                {
-                    return this.values;
-                }
-            }
-            public string this[string key]
-            {
-                get
-                {
-                    return this.defaults[key];
-                }
-                set
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(
-                        SR.GetString(SR.UTDefaultValuesAreImmutable)));
-                }
-            }
-
-            public void Add(string key, string value)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(
-                    SR.GetString(SR.UTDefaultValuesAreImmutable)));
-            }
-
-            public void Add(KeyValuePair<string, string> item)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(
-                    SR.GetString(SR.UTDefaultValuesAreImmutable)));
-            }
-            public void Clear()
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(
-                    SR.GetString(SR.UTDefaultValuesAreImmutable)));
-            }
-            public bool Contains(KeyValuePair<string, string> item)
-            {
-                return (this.defaults as ICollection<KeyValuePair<string, string>>).Contains(item);
-            }
-            public bool ContainsKey(string key)
-            {
-                return this.defaults.ContainsKey(key);
-            }
-            public void CopyTo(KeyValuePair<string, string>[] array, int arrayIndex)
-            {
-                (this.defaults as ICollection<KeyValuePair<string, string>>).CopyTo(array, arrayIndex);
-            }
-
-            // IEnumerable<KeyValuePair<string, string>> Members
-            public IEnumerator<KeyValuePair<string, string>> GetEnumerator()
-            {
-                return this.defaults.GetEnumerator();
-            }
-            public bool Remove(string key)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(
-                    SR.GetString(SR.UTDefaultValuesAreImmutable)));
-            }
-            public bool Remove(KeyValuePair<string, string> item)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(
-                    SR.GetString(SR.UTDefaultValuesAreImmutable)));
-            }
-
-            // IEnumerable Members
-            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-            {
-                return this.defaults.GetEnumerator();
-            }
-            public bool TryGetValue(string key, out string value)
-            {
-                return this.defaults.TryGetValue(key, out value);
-            }
-        }
-
-        class VariablesCollection
-        {
-            readonly UriTemplate owner;
-            static ReadOnlyCollection<string> emptyStringCollection = null;
-            Dictionary<string, string> defaultValues; // key is the variable name (in uppercase; as appear in the variable names lists)
-            int firstNullablePathVariable;
-            List<string> pathSegmentVariableNames; // ToUpperInvariant, in order they occur in the original template string
-            ReadOnlyCollection<string> pathSegmentVariableNamesSnapshot = null;
-            List<UriTemplatePartType> pathSegmentVariableNature;
-            List<string> queryValueVariableNames; // ToUpperInvariant, in order they occur in the original template string
-            ReadOnlyCollection<string> queryValueVariableNamesSnapshot = null;
-
-            public VariablesCollection(UriTemplate owner)
-            {
-                this.owner = owner;
-                this.pathSegmentVariableNames = new List<string>();
-                this.pathSegmentVariableNature = new List<UriTemplatePartType>();
-                this.queryValueVariableNames = new List<string>();
-                this.firstNullablePathVariable = -1;
-            }
-
-            public static ReadOnlyCollection<string> EmptyCollection
-            {
-                get
-                {
-                    if (emptyStringCollection == null)
-                    {
-                        emptyStringCollection = new ReadOnlyCollection<string>(new List<string>());
-                    }
-                    return emptyStringCollection;
-                }
-            }
-
-            public Dictionary<string, string> DefaultValues
-            {
-                get
-                {
-                    return this.defaultValues;
-                }
-            }
-            public ReadOnlyCollection<string> PathSegmentVariableNames
-            {
-                get
-                {
-                    if (this.pathSegmentVariableNamesSnapshot == null)
-                    {
-                        Interlocked.CompareExchange<ReadOnlyCollection<string>>(ref this.pathSegmentVariableNamesSnapshot, new ReadOnlyCollection<string>(
-                            this.pathSegmentVariableNames), null);
-                    }
-                    return this.pathSegmentVariableNamesSnapshot;
-                }
-            }
-            public ReadOnlyCollection<string> QueryValueVariableNames
-            {
-                get
-                {
-                    if (this.queryValueVariableNamesSnapshot == null)
-                    {
-                        Interlocked.CompareExchange<ReadOnlyCollection<string>>(ref this.queryValueVariableNamesSnapshot, new ReadOnlyCollection<string>(
-                            this.queryValueVariableNames), null);
-                    }
-                    return this.queryValueVariableNamesSnapshot;
-                }
-            }
-
-            public void AddDefaultValue(string varName, string value)
-            {
-                int varIndex = this.pathSegmentVariableNames.IndexOf(varName);
-                Fx.Assert(varIndex != -1, "Adding default value is restricted to path variables");
-                if ((this.owner.wildcard != null) && this.owner.wildcard.HasVariable &&
-                    (varIndex == this.pathSegmentVariableNames.Count - 1))
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
-                        SR.GetString(SR.UTStarVariableWithDefaultsFromAdditionalDefaults,
-                        this.owner.originalTemplate, varName)));
-                }
-                if (this.pathSegmentVariableNature[varIndex] != UriTemplatePartType.Variable)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
-                        SR.GetString(SR.UTDefaultValueToCompoundSegmentVarFromAdditionalDefaults,
-                        this.owner.originalTemplate, varName)));
-                }
-                if (string.IsNullOrEmpty(value) ||
-                    (string.Compare(value, UriTemplate.NullableDefault, StringComparison.OrdinalIgnoreCase) == 0))
-                {
-                    value = null;
-                }
-                if (this.defaultValues == null)
-                {
-                    this.defaultValues = new Dictionary<string, string>();
-                }
-                this.defaultValues.Add(varName, value);
-            }
-
-            public string AddPathVariable(UriTemplatePartType sourceNature, string varDeclaration, out bool hasDefaultValue)
-            {
-                Fx.Assert(sourceNature != UriTemplatePartType.Literal, "Literal path segments can't be the source for path variables");
-                string varName;
-                string defaultValue;
-                ParseVariableDeclaration(varDeclaration, out varName, out defaultValue);
-                hasDefaultValue = (defaultValue != null);
-                if (varName.IndexOf(UriTemplate.WildcardPath, StringComparison.Ordinal) != -1)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
-                        SR.GetString(SR.UTInvalidWildcardInVariableOrLiteral, this.owner.originalTemplate, UriTemplate.WildcardPath)));
-                }
-                string uppercaseVarName = varName.ToUpperInvariant();
-                if (this.pathSegmentVariableNames.Contains(uppercaseVarName) ||
-                    this.queryValueVariableNames.Contains(uppercaseVarName))
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
-                        SR.GetString(SR.UTVarNamesMustBeUnique, this.owner.originalTemplate, varName)));
-                }
-                this.pathSegmentVariableNames.Add(uppercaseVarName);
-                this.pathSegmentVariableNature.Add(sourceNature);
-                if (hasDefaultValue)
-                {
-                    if (defaultValue == string.Empty)
-                    {
-                        throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
-                            SR.GetString(SR.UTInvalidDefaultPathValue, this.owner.originalTemplate,
-                            varDeclaration, varName)));
-                    }
-                    if (string.Compare(defaultValue, UriTemplate.NullableDefault, StringComparison.OrdinalIgnoreCase) == 0)
-                    {
-                        defaultValue = null;
-                    }
-                    if (this.defaultValues == null)
-                    {
-                        this.defaultValues = new Dictionary<string, string>();
-                    }
-                    this.defaultValues.Add(uppercaseVarName, defaultValue);
-                }
-                return uppercaseVarName;
-            }
-            public string AddQueryVariable(string varDeclaration)
-            {
-                string varName;
-                string defaultValue;
-                ParseVariableDeclaration(varDeclaration, out varName, out defaultValue);
-                if (varName.IndexOf(UriTemplate.WildcardPath, StringComparison.Ordinal) != -1)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
-                        SR.GetString(SR.UTInvalidWildcardInVariableOrLiteral, this.owner.originalTemplate, UriTemplate.WildcardPath)));
-                }
-                if (defaultValue != null)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
-                        SR.GetString(SR.UTDefaultValueToQueryVar, this.owner.originalTemplate,
-                        varDeclaration, varName)));
-                }
-                string uppercaseVarName = varName.ToUpperInvariant();
-                if (this.pathSegmentVariableNames.Contains(uppercaseVarName) ||
-                    this.queryValueVariableNames.Contains(uppercaseVarName))
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
-                        SR.GetString(SR.UTVarNamesMustBeUnique, this.owner.originalTemplate, varName)));
-                }
-                this.queryValueVariableNames.Add(uppercaseVarName);
-                return uppercaseVarName;
-            }
-
-            public void LookupDefault(string varName, NameValueCollection boundParameters)
-            {
-                Fx.Assert(this.defaultValues.ContainsKey(varName), "Otherwise, we don't have a value to bind");
-                boundParameters.Add(varName, owner.UnescapeDefaultValue(this.defaultValues[varName]));
-            }
-
-            public BindInformation PrepareBindInformation(IDictionary<string, string> parameters, bool omitDefaults)
-            {
-                if (parameters == null)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("parameters");
-                }
-
-                string[] normalizedParameters = PrepareNormalizedParameters();
-                IDictionary<string, string> extraParameters = null;
-                foreach (string key in parameters.Keys)
-                {
-                    ProcessBindParameter(key, parameters[key], normalizedParameters, ref extraParameters);
-                }
-                BindInformation bindInfo;
-                ProcessDefaultsAndCreateBindInfo(omitDefaults, normalizedParameters, extraParameters, out bindInfo);
-                return bindInfo;
-            }
-            public BindInformation PrepareBindInformation(NameValueCollection parameters, bool omitDefaults)
-            {
-                if (parameters == null)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("parameters");
-                }
-
-                string[] normalizedParameters = PrepareNormalizedParameters();
-                IDictionary<string, string> extraParameters = null;
-                foreach (string key in parameters.AllKeys)
-                {
-                    ProcessBindParameter(key, parameters[key], normalizedParameters, ref extraParameters);
-                }
-                BindInformation bindInfo;
-                ProcessDefaultsAndCreateBindInfo(omitDefaults, normalizedParameters, extraParameters, out bindInfo);
-                return bindInfo;
-            }
-            public BindInformation PrepareBindInformation(params string[] parameters)
-            {
-                if (parameters == null)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("values");
-                }
-                if ((parameters.Length < this.pathSegmentVariableNames.Count) ||
-                    (parameters.Length > this.pathSegmentVariableNames.Count + this.queryValueVariableNames.Count))
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
-                        SR.GetString(SR.UTBindByPositionWrongCount, this.owner.originalTemplate,
-                        this.pathSegmentVariableNames.Count, this.queryValueVariableNames.Count,
-                        parameters.Length)));
-                }
-
-                string[] normalizedParameters;
-                if (parameters.Length == this.pathSegmentVariableNames.Count + this.queryValueVariableNames.Count)
-                {
-                    normalizedParameters = parameters;
-                }
-                else
-                {
-                    normalizedParameters = new string[this.pathSegmentVariableNames.Count + this.queryValueVariableNames.Count];
-                    parameters.CopyTo(normalizedParameters, 0);
-                    for (int i = parameters.Length; i < normalizedParameters.Length; i++)
-                    {
-                        normalizedParameters[i] = null;
-                    }
-                }
-                int lastNonDefaultPathParameter;
-                int lastNonNullablePathParameter;
-                LoadDefaultsAndValidate(normalizedParameters, out lastNonDefaultPathParameter,
-                    out lastNonNullablePathParameter);
-                return new BindInformation(normalizedParameters, lastNonDefaultPathParameter,
-                    lastNonNullablePathParameter, this.owner.additionalDefaults);
-            }
-            public void ValidateDefaults(out int firstOptionalSegment)
-            {
-                Fx.Assert(this.defaultValues != null, "We are checking this condition from the c'tor");
-                Fx.Assert(this.pathSegmentVariableNames.Count > 0, "Otherwise, how can we have default values");
-                // Finding the first valid nullable defaults
-                for (int i = this.pathSegmentVariableNames.Count - 1; (i >= 0) && (this.firstNullablePathVariable == -1); i--)
-                {
-                    string varName = this.pathSegmentVariableNames[i];
-                    string defaultValue;
-                    if (!this.defaultValues.TryGetValue(varName, out defaultValue))
-                    {
-                        this.firstNullablePathVariable = i + 1;
-                    }
-                    else if (defaultValue != null)
-                    {
-                        this.firstNullablePathVariable = i + 1;
-                    }
-                }
-                if (this.firstNullablePathVariable == -1)
-                {
-                    this.firstNullablePathVariable = 0;
-                }
-                // Making sure that there are no nullables to the left of the first valid nullable
-                if (this.firstNullablePathVariable > 1)
-                {
-                    for (int i = this.firstNullablePathVariable - 2; i >= 0; i--)
-                    {
-                        string varName = this.pathSegmentVariableNames[i];
-                        string defaultValue;
-                        if (this.defaultValues.TryGetValue(varName, out defaultValue))
-                        {
-                            if (defaultValue == null)
-                            {
-                                throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
-                                    SR.GetString(SR.UTNullableDefaultMustBeFollowedWithNullables, this.owner.originalTemplate,
-                                    varName, this.pathSegmentVariableNames[i + 1])));
-                            }
-                        }
-                    }
-                }
-                // Making sure that there are no Literals\WildCards to the right
-                // Based on the fact that only Variable Path Segments support default values,
-                //  if firstNullablePathVariable=N and pathSegmentVariableNames.Count=M then
-                //  the nature of the last M-N path segments should be StringNature.Variable; otherwise,
-                //  there was a literal segment in between. Also, there shouldn't be a wildcard.
-                if (this.firstNullablePathVariable < this.pathSegmentVariableNames.Count)
-                {
-                    if (this.owner.HasWildcard)
-                    {
-                        throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
-                            SR.GetString(SR.UTNullableDefaultMustNotBeFollowedWithWildcard,
-                            this.owner.originalTemplate, this.pathSegmentVariableNames[this.firstNullablePathVariable])));
-                    }
-                    for (int i = this.pathSegmentVariableNames.Count - 1; i >= this.firstNullablePathVariable; i--)
-                    {
-                        int segmentIndex = this.owner.segments.Count - (this.pathSegmentVariableNames.Count - i);
-                        if (this.owner.segments[segmentIndex].Nature != UriTemplatePartType.Variable)
-                        {
-                            throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
-                                SR.GetString(SR.UTNullableDefaultMustNotBeFollowedWithLiteral,
-                                this.owner.originalTemplate, this.pathSegmentVariableNames[this.firstNullablePathVariable],
-                                this.owner.segments[segmentIndex].OriginalSegment)));
-                        }
-                    }
-                }
-                // Now that we have the firstNullablePathVariable set, lets calculate the firstOptionalSegment.
-                //  We already knows that the last M-N path segments (when M=pathSegmentVariableNames.Count and
-                //  N=firstNullablePathVariable) are optional (see the previos comment). We will start there and
-                //  move to the left, stopping at the first segment, which is not a variable or is a variable
-                //  and doesn't have a default value.
-                int numNullablePathVariables = (this.pathSegmentVariableNames.Count - this.firstNullablePathVariable);
-                firstOptionalSegment = this.owner.segments.Count - numNullablePathVariables;
-                if (!this.owner.HasWildcard)
-                {
-                    while (firstOptionalSegment > 0)
-                    {
-                        UriTemplatePathSegment ps = this.owner.segments[firstOptionalSegment - 1];
-                        if (ps.Nature != UriTemplatePartType.Variable)
-                        {
-                            break;
-                        }
-                        UriTemplateVariablePathSegment vps = (ps as UriTemplateVariablePathSegment);
-                        Fx.Assert(vps != null, "Should be; that's his nature");
-                        if (!this.defaultValues.ContainsKey(vps.VarName))
-                        {
-                            break;
-                        }
-                        firstOptionalSegment--;
-                    }
-                }
-            }
-
-            void AddAdditionalDefaults(ref IDictionary<string, string> extraParameters)
-            {
-                if (extraParameters == null)
-                {
-                    extraParameters = this.owner.additionalDefaults;
-                }
-                else
-                {
-                    foreach (KeyValuePair<string, string> kvp in this.owner.additionalDefaults)
-                    {
-                        if (!extraParameters.ContainsKey(kvp.Key))
-                        {
-                            extraParameters.Add(kvp.Key, kvp.Value);
-                        }
-                    }
-                }
-            }
-            void LoadDefaultsAndValidate(string[] normalizedParameters, out int lastNonDefaultPathParameter,
-                out int lastNonNullablePathParameter)
-            {
-                // First step - loading defaults
-                for (int i = 0; i < this.pathSegmentVariableNames.Count; i++)
-                {
-                    if (string.IsNullOrEmpty(normalizedParameters[i]) && (this.defaultValues != null))
-                    {
-                        this.defaultValues.TryGetValue(this.pathSegmentVariableNames[i], out normalizedParameters[i]);
-                    }
-                }
-                // Second step - calculating bind constrains
-                lastNonDefaultPathParameter = this.pathSegmentVariableNames.Count - 1;
-                if ((this.defaultValues != null) &&
-                    (this.owner.segments[this.owner.segments.Count - 1].Nature != UriTemplatePartType.Literal))
-                {
-                    bool foundNonDefaultPathParameter = false;
-                    while (!foundNonDefaultPathParameter && (lastNonDefaultPathParameter >= 0))
-                    {
-                        string defaultValue;
-                        if (this.defaultValues.TryGetValue(this.pathSegmentVariableNames[lastNonDefaultPathParameter],
-                            out defaultValue))
-                        {
-                            if (string.Compare(normalizedParameters[lastNonDefaultPathParameter],
-                                defaultValue, StringComparison.Ordinal) != 0)
-                            {
-                                foundNonDefaultPathParameter = true;
-                            }
-                            else
-                            {
-                                lastNonDefaultPathParameter--;
-                            }
-                        }
-                        else
-                        {
-                            foundNonDefaultPathParameter = true;
-                        }
-                    }
-                }
-                if (this.firstNullablePathVariable > lastNonDefaultPathParameter)
-                {
-                    lastNonNullablePathParameter = this.firstNullablePathVariable - 1;
-                }
-                else
-                {
-                    lastNonNullablePathParameter = lastNonDefaultPathParameter;
-                }
-                // Third step - validate
-                for (int i = 0; i <= lastNonNullablePathParameter; i++)
-                {
-                    // Skip validation for terminating star variable segment :
-                    if (this.owner.HasWildcard && this.owner.wildcard.HasVariable &&
-                        (i == this.pathSegmentVariableNames.Count - 1))
-                    {
-                        continue;
-                    }
-                    // Validate
-                    if (string.IsNullOrEmpty(normalizedParameters[i]))
-                    {
-                        throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("parameters",
-                            SR.GetString(SR.BindUriTemplateToNullOrEmptyPathParam, this.pathSegmentVariableNames[i]));
-                    }
-                }
-            }
-            void ParseVariableDeclaration(string varDeclaration, out string varName, out string defaultValue)
-            {
-                if ((varDeclaration.IndexOf('{') != -1) || (varDeclaration.IndexOf('}') != -1))
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
-                        SR.GetString(SR.UTInvalidVarDeclaration, this.owner.originalTemplate, varDeclaration)));
-                }
-                int equalSignIndex = varDeclaration.IndexOf('=');
-                switch (equalSignIndex)
-                {
-                    case -1:
-                        varName = varDeclaration;
-                        defaultValue = null;
-                        break;
-
-                    case 0:
-                        throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
-                            SR.GetString(SR.UTInvalidVarDeclaration, this.owner.originalTemplate, varDeclaration)));
-
-                    default:
-                        varName = varDeclaration.Substring(0, equalSignIndex);
-                        defaultValue = varDeclaration.Substring(equalSignIndex + 1);
-                        if (defaultValue.IndexOf('=') != -1)
-                        {
-                            throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
-                                SR.GetString(SR.UTInvalidVarDeclaration, this.owner.originalTemplate, varDeclaration)));
-                        }
-                        break;
-                }
-            }
-            string[] PrepareNormalizedParameters()
-            {
-                string[] normalizedParameters = new string[this.pathSegmentVariableNames.Count + this.queryValueVariableNames.Count];
-                for (int i = 0; i < normalizedParameters.Length; i++)
-                {
-                    normalizedParameters[i] = null;
-                }
-                return normalizedParameters;
-            }
-            void ProcessBindParameter(string name, string value, string[] normalizedParameters,
-                ref IDictionary<string, string> extraParameters)
-            {
-                if (string.IsNullOrEmpty(name))
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("parameters",
-                        SR.GetString(SR.UTBindByNameCalledWithEmptyKey));
-                }
-
-                string uppercaseVarName = name.ToUpperInvariant();
-                int pathVarIndex = this.pathSegmentVariableNames.IndexOf(uppercaseVarName);
-                if (pathVarIndex != -1)
-                {
-                    normalizedParameters[pathVarIndex] = (string.IsNullOrEmpty(value) ? string.Empty : value);
-                    return;
-                }
-                int queryVarIndex = this.queryValueVariableNames.IndexOf(uppercaseVarName);
-                if (queryVarIndex != -1)
-                {
-                    normalizedParameters[this.pathSegmentVariableNames.Count + queryVarIndex] = (string.IsNullOrEmpty(value) ? string.Empty : value);
-                    return;
-                }
-                if (extraParameters == null)
-                {
-                    extraParameters = new Dictionary<string, string>(UriTemplateHelpers.GetQueryKeyComparer());
-                }
-                extraParameters.Add(name, value);
-            }
-            void ProcessDefaultsAndCreateBindInfo(bool omitDefaults, string[] normalizedParameters,
-                IDictionary<string, string> extraParameters, out BindInformation bindInfo)
-            {
-                int lastNonDefaultPathParameter;
-                int lastNonNullablePathParameter;
-                LoadDefaultsAndValidate(normalizedParameters, out lastNonDefaultPathParameter,
-                    out lastNonNullablePathParameter);
-                if (this.owner.additionalDefaults != null)
-                {
-                    if (omitDefaults)
-                    {
-                        RemoveAdditionalDefaults(ref extraParameters);
-                    }
-                    else
-                    {
-                        AddAdditionalDefaults(ref extraParameters);
-                    }
-                }
-                bindInfo = new BindInformation(normalizedParameters, lastNonDefaultPathParameter,
-                    lastNonNullablePathParameter, extraParameters);
-            }
-            void RemoveAdditionalDefaults(ref IDictionary<string, string> extraParameters)
-            {
-                if (extraParameters == null)
-                {
-                    return;
-                }
-
-                foreach (KeyValuePair<string, string> kvp in this.owner.additionalDefaults)
-                {
-                    string extraParameter;
-                    if (extraParameters.TryGetValue(kvp.Key, out extraParameter))
-                    {
-                        if (string.Compare(extraParameter, kvp.Value, StringComparison.Ordinal) == 0)
-                        {
-                            extraParameters.Remove(kvp.Key);
-                        }
-                    }
-                }
-                if (extraParameters.Count == 0)
-                {
-                    extraParameters = null;
-                }
-            }
-        }
-
-        class WildcardInfo
-        {
-            readonly UriTemplate owner;
-            readonly string varName;
-
-            public WildcardInfo(UriTemplate owner)
-            {
-                this.varName = null;
-                this.owner = owner;
-            }
-            public WildcardInfo(UriTemplate owner, string segment)
-            {
-                Fx.Assert(!segment.EndsWith("/", StringComparison.Ordinal), "We are expecting to check this earlier");
-
-                bool hasDefault;
-                this.varName = owner.AddPathVariable(UriTemplatePartType.Variable,
-                    segment.Substring(1 + WildcardPath.Length, segment.Length - 2 - WildcardPath.Length),
-                    out hasDefault);
-                // Since this is a terminating star segment there shouldn't be a default
-                if (hasDefault)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
-                        SR.GetString(SR.UTStarVariableWithDefaults, owner.originalTemplate,
-                        segment, this.varName)));
-                }
-                this.owner = owner;
-            }
-
-            internal bool HasVariable
-            {
-                get
-                {
-                    return (!string.IsNullOrEmpty(this.varName));
-                }
-            }
-
-            public void Bind(string[] values, ref int valueIndex, StringBuilder path)
-            {
-                if (HasVariable)
-                {
-                    Fx.Assert(valueIndex < values.Length, "Not enough values to bind");
-                    if (string.IsNullOrEmpty(values[valueIndex]))
-                    {
-                        valueIndex++;
-                    }
-                    else
-                    {
-                        path.Append(values[valueIndex++]);
-                    }
-                }
-            }
-            public void Lookup(int numMatchedSegments, Collection<string> relativePathSegments,
-                NameValueCollection boundParameters)
-            {
-                Fx.Assert(numMatchedSegments == this.owner.segments.Count, "We should have matched the other segments");
-                if (HasVariable)
-                {
-                    StringBuilder remainingPath = new StringBuilder();
-                    for (int i = numMatchedSegments; i < relativePathSegments.Count; i++)
-                    {
-                        if (i < relativePathSegments.Count - 1)
-                        {
-                            remainingPath.AppendFormat("{0}/", relativePathSegments[i]);
-                        }
-                        else
-                        {
-                            remainingPath.Append(relativePathSegments[i]);
-                        }
-                    }
-                    boundParameters.Add(this.varName, remainingPath.ToString());
-                }
-            }
-        }
-    }
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateCompoundPathSegment.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateCompoundPathSegment.cs
deleted file mode 100644
index 5765293666c..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateCompoundPathSegment.cs
+++ /dev/null
@@ -1,487 +0,0 @@
-//----------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//----------------------------------------------------------------
-
-namespace System
-{
-    using System.Collections.Generic;
-    using System.Collections.Specialized;
-    using System.Runtime;
-    using System.ServiceModel;
-    using System.Text;
-
-    // Thin wrapper around formatted string; use type system to help ensure we
-    // are doing canonicalization right/consistently - the literal sections are held in an
-    // un-escaped format
-    // We are assuming that the string will be always built as Lit{Var}Lit[{Var}Lit[{Var}Lit[...]]],
-    // when the first and last literals may be empty
-    class UriTemplateCompoundPathSegment : UriTemplatePathSegment, IComparable<UriTemplateCompoundPathSegment>
-    {
-        readonly string firstLiteral;
-        readonly List<VarAndLitPair> varLitPairs;
-
-        CompoundSegmentClass csClass;
-
-        UriTemplateCompoundPathSegment(string originalSegment, bool endsWithSlash, string firstLiteral)
-            : base(originalSegment, UriTemplatePartType.Compound, endsWithSlash)
-        {
-            this.firstLiteral = firstLiteral;
-            this.varLitPairs = new List<VarAndLitPair>();
-        }
-        public static new UriTemplateCompoundPathSegment CreateFromUriTemplate(string segment, UriTemplate template)
-        {
-            string origSegment = segment;
-            bool endsWithSlash = segment.EndsWith("/", StringComparison.Ordinal);
-            if (endsWithSlash)
-            {
-                segment = segment.Remove(segment.Length - 1);
-            }
-
-            int nextVarStart = segment.IndexOf("{", StringComparison.Ordinal);
-            Fx.Assert(nextVarStart >= 0, "The method is only called after identifying a '{' character in the segment");
-            string firstLiteral = ((nextVarStart > 0) ? segment.Substring(0, nextVarStart) : string.Empty);
-            if (firstLiteral.IndexOf(UriTemplate.WildcardPath, StringComparison.Ordinal) != -1)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
-                    SR.GetString(SR.UTInvalidWildcardInVariableOrLiteral, template.originalTemplate, UriTemplate.WildcardPath)));
-            }
-            UriTemplateCompoundPathSegment result = new UriTemplateCompoundPathSegment(origSegment, endsWithSlash,
-                ((firstLiteral != string.Empty) ? Uri.UnescapeDataString(firstLiteral) : string.Empty));
-            do
-            {
-                int nextVarEnd = segment.IndexOf("}", nextVarStart + 1, StringComparison.Ordinal);
-                if (nextVarEnd < nextVarStart + 2)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
-                        SR.GetString(SR.UTInvalidFormatSegmentOrQueryPart, segment)));
-                }
-                bool hasDefault;
-                string varName = template.AddPathVariable(UriTemplatePartType.Compound,
-                    segment.Substring(nextVarStart + 1, nextVarEnd - nextVarStart - 1), out hasDefault);
-                if (hasDefault)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
-                        SR.GetString(SR.UTDefaultValueToCompoundSegmentVar, template, origSegment, varName)));
-                }
-                nextVarStart = segment.IndexOf("{", nextVarEnd + 1, StringComparison.Ordinal);
-                string literal;
-                if (nextVarStart > 0)
-                {
-                    if (nextVarStart == nextVarEnd + 1)
-                    {
-                        throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("template",
-                            SR.GetString(SR.UTDoesNotSupportAdjacentVarsInCompoundSegment, template, segment));
-                    }
-                    literal = segment.Substring(nextVarEnd + 1, nextVarStart - nextVarEnd - 1);
-                }
-                else if (nextVarEnd + 1 < segment.Length)
-                {
-                    literal = segment.Substring(nextVarEnd + 1);
-                }
-                else
-                {
-                    literal = string.Empty;
-                }
-                if (literal.IndexOf(UriTemplate.WildcardPath, StringComparison.Ordinal) != -1)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
-                        SR.GetString(SR.UTInvalidWildcardInVariableOrLiteral, template.originalTemplate, UriTemplate.WildcardPath)));
-                }
-                if (literal.IndexOf('}') != -1)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
-                        SR.GetString(SR.UTInvalidFormatSegmentOrQueryPart, segment)));
-                }
-                result.varLitPairs.Add(new VarAndLitPair(varName, ((literal == string.Empty) ? string.Empty : Uri.UnescapeDataString(literal))));
-            } while (nextVarStart > 0);
-
-            if (string.IsNullOrEmpty(result.firstLiteral))
-            {
-                if (string.IsNullOrEmpty(result.varLitPairs[result.varLitPairs.Count - 1].Literal))
-                {
-                    result.csClass = CompoundSegmentClass.HasNoPrefixNorSuffix;
-                }
-                else
-                {
-                    result.csClass = CompoundSegmentClass.HasOnlySuffix;
-                }
-            }
-            else
-            {
-                if (string.IsNullOrEmpty(result.varLitPairs[result.varLitPairs.Count - 1].Literal))
-                {
-                    result.csClass = CompoundSegmentClass.HasOnlyPrefix;
-                }
-                else
-                {
-                    result.csClass = CompoundSegmentClass.HasPrefixAndSuffix;
-                }
-            }
-
-            return result;
-        }
-
-        public override void Bind(string[] values, ref int valueIndex, StringBuilder path)
-        {
-            Fx.Assert(valueIndex + this.varLitPairs.Count <= values.Length, "Not enough values to bind");
-            path.Append(this.firstLiteral);
-            for (int pairIndex = 0; pairIndex < this.varLitPairs.Count; pairIndex++)
-            {
-                path.Append(values[valueIndex++]);
-                path.Append(this.varLitPairs[pairIndex].Literal);
-            }
-            if (this.EndsWithSlash)
-            {
-                path.Append("/");
-            }
-        }
-        public override bool IsEquivalentTo(UriTemplatePathSegment other, bool ignoreTrailingSlash)
-        {
-            if (other == null)
-            {
-                Fx.Assert("why would we ever call this?");
-                return false;
-            }
-            if (!ignoreTrailingSlash && (this.EndsWithSlash != other.EndsWithSlash))
-            {
-                return false;
-            }
-            UriTemplateCompoundPathSegment otherAsCompound = other as UriTemplateCompoundPathSegment;
-            if (otherAsCompound == null)
-            {
-                // if other can't be cast as a compound then it can't be equivalent
-                return false;
-            }
-            if (this.varLitPairs.Count != otherAsCompound.varLitPairs.Count)
-            {
-                return false;
-            }
-            if (StringComparer.OrdinalIgnoreCase.Compare(this.firstLiteral, otherAsCompound.firstLiteral) != 0)
-            {
-                return false;
-            }
-            for (int pairIndex = 0; pairIndex < this.varLitPairs.Count; pairIndex++)
-            {
-                if (StringComparer.OrdinalIgnoreCase.Compare(this.varLitPairs[pairIndex].Literal,
-                    otherAsCompound.varLitPairs[pairIndex].Literal) != 0)
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-        public override bool IsMatch(UriTemplateLiteralPathSegment segment, bool ignoreTrailingSlash)
-        {
-            if (!ignoreTrailingSlash && (this.EndsWithSlash != segment.EndsWithSlash))
-            {
-                return false;
-            }
-            return TryLookup(segment.AsUnescapedString(), null);
-        }
-        public override void Lookup(string segment, NameValueCollection boundParameters)
-        {
-            if (!TryLookup(segment, boundParameters))
-            {
-                Fx.Assert("How can that be? Lookup is expected to be called after IsMatch");
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
-                    SR.GetString(SR.UTCSRLookupBeforeMatch)));
-            }
-        }
-
-        bool TryLookup(string segment, NameValueCollection boundParameters)
-        {
-            int segmentPosition = 0;
-            if (!string.IsNullOrEmpty(this.firstLiteral))
-            {
-                if (segment.StartsWith(this.firstLiteral, StringComparison.Ordinal))
-                {
-                    segmentPosition = this.firstLiteral.Length;
-                }
-                else
-                {
-                    return false;
-                }
-            }
-            for (int pairIndex = 0; pairIndex < this.varLitPairs.Count - 1; pairIndex++)
-            {
-                int nextLiteralPosition = segment.IndexOf(this.varLitPairs[pairIndex].Literal, segmentPosition, StringComparison.Ordinal);
-                if (nextLiteralPosition < segmentPosition + 1)
-                {
-                    return false;
-                }
-                if (boundParameters != null)
-                {
-                    string varValue = segment.Substring(segmentPosition, nextLiteralPosition - segmentPosition);
-                    boundParameters.Add(this.varLitPairs[pairIndex].VarName, varValue);
-                }
-                segmentPosition = nextLiteralPosition + this.varLitPairs[pairIndex].Literal.Length;
-            }
-            if (segmentPosition < segment.Length)
-            {
-                if (string.IsNullOrEmpty(this.varLitPairs[varLitPairs.Count - 1].Literal))
-                {
-                    if (boundParameters != null)
-                    {
-                        boundParameters.Add(this.varLitPairs[varLitPairs.Count - 1].VarName,
-                            segment.Substring(segmentPosition));
-                    }
-                    return true;
-                }
-                else if ((segmentPosition + this.varLitPairs[varLitPairs.Count - 1].Literal.Length < segment.Length) &&
-                    segment.EndsWith(this.varLitPairs[varLitPairs.Count - 1].Literal, StringComparison.Ordinal))
-                {
-                    if (boundParameters != null)
-                    {
-                        boundParameters.Add(this.varLitPairs[varLitPairs.Count - 1].VarName,
-                            segment.Substring(segmentPosition, segment.Length - segmentPosition - this.varLitPairs[varLitPairs.Count - 1].Literal.Length));
-                    }
-                    return true;
-                }
-                else
-                {
-                    return false;
-                }
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        // A note about comparing compound segments:
-        //  We are using this for generating the sorted collections at the nodes of the UriTemplateTrieNode.
-        //  The idea is that we are sorting the segments based on preferred matching, when we have two
-        //  compound segments matching the same wire segment, we will give preference to the preceding one.
-        //  The order is based on the following concepts:
-        //   - We are defining four classes of compound segments: prefix+suffix, prefix-only, suffix-only 
-        //      and none
-        //   - Whenever we are comparing segments from different class the preferred one is the segment with
-        //      the prefared class, based on the order we defined them (p+s \ p \ s \ n).
-        //   - Within each class the preference is based on the prefix\suffix, while prefix has precedence 
-        //      over suffix if both exists.
-        //   - If after comparing the class, as well as the prefix\suffix, we didn't reach to a conclusion,
-        //      the preference is given to the segment with more variables parts.
-        //  This order mostly follows the intuitive common sense; the major issue comes from preferring the
-        //  prefix over the suffix in the case where both exist. This is derived from the problematic of any
-        //  other type of solution that don't prefere the prefix over the suffix or vice versa. To better 
-        //  understanding lets considered the following example:
-        //   In comparing 'foo{x}bar' and 'food{x}ar', unless we are preferring prefix or suffix, we have
-        //   to state that they have the same order. So is the case with 'foo{x}babar' and 'food{x}ar', which
-        //   will lead us to claiming the 'foo{x}bar' and 'foo{x}babar' are from the same order, which they
-        //   clearly are not. 
-        //  Taking other approaches to this problem results in similar cases. The only solution is preferring
-        //  either the prefix or the suffix over the other; since we already preferred prefix over suffix
-        //  implicitly (we preferred the prefix only class over the suffix only, we also prefared literal
-        //  over variable, if in the same path segment) that still maintain consistency.
-        //  Therefore:
-        //    - 'food{var}' should be before 'foo{var}'; '{x}.{y}.{z}' should be before '{x}.{y}'.
-        //    - the order between '{var}bar' and '{var}qux' is not important
-        //    - '{x}.{y}' and '{x}_{y}' should have the same order
-        //    - 'foo{x}bar' is less preferred than 'food{x}ar'
-        //  In the above third case - if we are opening the table with allowDuplicate=false, we will throw;
-        //  if we are opening it with allowDuplicate=true we will let it go and might match both templates
-        //  for certain wire candidates.
-        int IComparable<UriTemplateCompoundPathSegment>.CompareTo(UriTemplateCompoundPathSegment other)
-        {
-            Fx.Assert(other != null, "We are only expected to get here for comparing real compound segments");
-
-            switch (this.csClass)
-            {
-                case CompoundSegmentClass.HasPrefixAndSuffix:
-                    switch (other.csClass)
-                    {
-                        case CompoundSegmentClass.HasPrefixAndSuffix:
-                            return CompareToOtherThatHasPrefixAndSuffix(other);
-
-                        case CompoundSegmentClass.HasOnlyPrefix:
-                        case CompoundSegmentClass.HasOnlySuffix:
-                        case CompoundSegmentClass.HasNoPrefixNorSuffix:
-                            return -1;
-
-                        default:
-                            Fx.Assert("Invalid other.CompoundSegmentClass");
-                            return 0;
-                    }
-
-                case CompoundSegmentClass.HasOnlyPrefix:
-                    switch (other.csClass)
-                    {
-                        case CompoundSegmentClass.HasPrefixAndSuffix:
-                            return 1;
-
-                        case CompoundSegmentClass.HasOnlyPrefix:
-                            return CompareToOtherThatHasOnlyPrefix(other);
-
-                        case CompoundSegmentClass.HasOnlySuffix:
-                        case CompoundSegmentClass.HasNoPrefixNorSuffix:
-                            return -1;
-
-                        default:
-                            Fx.Assert("Invalid other.CompoundSegmentClass");
-                            return 0;
-                    }
-
-                case CompoundSegmentClass.HasOnlySuffix:
-                    switch (other.csClass)
-                    {
-                        case CompoundSegmentClass.HasPrefixAndSuffix:
-                        case CompoundSegmentClass.HasOnlyPrefix:
-                            return 1;
-
-                        case CompoundSegmentClass.HasOnlySuffix:
-                            return CompareToOtherThatHasOnlySuffix(other);
-
-                        case CompoundSegmentClass.HasNoPrefixNorSuffix:
-                            return -1;
-
-                        default:
-                            Fx.Assert("Invalid other.CompoundSegmentClass");
-                            return 0;
-                    }
-
-                case CompoundSegmentClass.HasNoPrefixNorSuffix:
-                    switch (other.csClass)
-                    {
-                        case CompoundSegmentClass.HasPrefixAndSuffix:
-                        case CompoundSegmentClass.HasOnlyPrefix:
-                        case CompoundSegmentClass.HasOnlySuffix:
-                            return 1;
-
-                        case CompoundSegmentClass.HasNoPrefixNorSuffix:
-                            return CompareToOtherThatHasNoPrefixNorSuffix(other);
-
-                        default:
-                            Fx.Assert("Invalid other.CompoundSegmentClass");
-                            return 0;
-                    }
-
-                default:
-                    Fx.Assert("Invalid this.CompoundSegmentClass");
-                    return 0;
-            }
-        }
-        int CompareToOtherThatHasPrefixAndSuffix(UriTemplateCompoundPathSegment other)
-        {
-            Fx.Assert(this.csClass == CompoundSegmentClass.HasPrefixAndSuffix, "Otherwise, how did we got here?");
-            Fx.Assert(other.csClass == CompoundSegmentClass.HasPrefixAndSuffix, "Otherwise, how did we got here?");
-
-            // In this case we are determining the order based on the prefix of the two segments,
-            //  then by their suffix and then based on the number of variables
-            int prefixOrder = ComparePrefixToOtherPrefix(other);
-            if (prefixOrder == 0)
-            {
-                int suffixOrder = CompareSuffixToOtherSuffix(other);
-                if (suffixOrder == 0)
-                {
-                    return (other.varLitPairs.Count - this.varLitPairs.Count);
-                }
-                else
-                {
-                    return suffixOrder;
-                }
-            }
-            else
-            {
-                return prefixOrder;
-            }
-        }
-        int CompareToOtherThatHasOnlyPrefix(UriTemplateCompoundPathSegment other)
-        {
-            Fx.Assert(this.csClass == CompoundSegmentClass.HasOnlyPrefix, "Otherwise, how did we got here?");
-            Fx.Assert(other.csClass == CompoundSegmentClass.HasOnlyPrefix, "Otherwise, how did we got here?");
-
-            // In this case we are determining the order based on the prefix of the two segments,
-            //  then based on the number of variables
-            int prefixOrder = ComparePrefixToOtherPrefix(other);
-            if (prefixOrder == 0)
-            {
-                return (other.varLitPairs.Count - this.varLitPairs.Count);
-            }
-            else
-            {
-                return prefixOrder;
-            }
-        }
-        int CompareToOtherThatHasOnlySuffix(UriTemplateCompoundPathSegment other)
-        {
-            Fx.Assert(this.csClass == CompoundSegmentClass.HasOnlySuffix, "Otherwise, how did we got here?");
-            Fx.Assert(other.csClass == CompoundSegmentClass.HasOnlySuffix, "Otherwise, how did we got here?");
-
-            // In this case we are determining the order based on the suffix of the two segments,
-            //  then based on the number of variables
-            int suffixOrder = CompareSuffixToOtherSuffix(other);
-            if (suffixOrder == 0)
-            {
-                return (other.varLitPairs.Count - this.varLitPairs.Count);
-            }
-            else
-            {
-                return suffixOrder;
-            }
-        }
-        int CompareToOtherThatHasNoPrefixNorSuffix(UriTemplateCompoundPathSegment other)
-        {
-            Fx.Assert(this.csClass == CompoundSegmentClass.HasNoPrefixNorSuffix, "Otherwise, how did we got here?");
-            Fx.Assert(other.csClass == CompoundSegmentClass.HasNoPrefixNorSuffix, "Otherwise, how did we got here?");
-
-            // In this case the order is determined by the number of variables
-            return (other.varLitPairs.Count - this.varLitPairs.Count);
-        }
-        int ComparePrefixToOtherPrefix(UriTemplateCompoundPathSegment other)
-        {
-            return string.Compare(other.firstLiteral, this.firstLiteral, StringComparison.OrdinalIgnoreCase);
-        }
-        int CompareSuffixToOtherSuffix(UriTemplateCompoundPathSegment other)
-        {
-            string reversedSuffix = ReverseString(this.varLitPairs[this.varLitPairs.Count - 1].Literal);
-            string reversedOtherSuffix = ReverseString(other.varLitPairs[other.varLitPairs.Count - 1].Literal);
-            return string.Compare(reversedOtherSuffix, reversedSuffix, StringComparison.OrdinalIgnoreCase);
-        }
-        static string ReverseString(string stringToReverse)
-        {
-            char[] reversedString = new char[stringToReverse.Length];
-            for (int i = 0; i < stringToReverse.Length; i++)
-            {
-                reversedString[i] = stringToReverse[stringToReverse.Length - i - 1];
-            }
-            return new string(reversedString);
-        }
-
-        enum CompoundSegmentClass
-        {
-            Undefined,
-            HasPrefixAndSuffix,
-            HasOnlyPrefix,
-            HasOnlySuffix,
-            HasNoPrefixNorSuffix
-        }
-
-        struct VarAndLitPair
-        {
-            readonly string literal;
-            readonly string varName;
-
-            public VarAndLitPair(string varName, string literal)
-            {
-                this.varName = varName;
-                this.literal = literal;
-            }
-
-            public string Literal
-            {
-                get
-                {
-                    return this.literal;
-                }
-            }
-            public string VarName
-            {
-                get
-                {
-                    return this.varName;
-                }
-            }
-        }
-    }
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateEquivalenceComparer.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateEquivalenceComparer.cs
deleted file mode 100644
index ff7b1723f0b..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateEquivalenceComparer.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-//----------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//----------------------------------------------------------------
-
-#pragma warning disable 1634, 1691 // Stops compiler from warning about unknown warnings (for Presharp)
-
-namespace System
-{
-    using System.Collections.Generic;
-    using System.ServiceModel;
-    using System.Runtime.CompilerServices;
-
-    [TypeForwardedFrom("System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")]
-    public class UriTemplateEquivalenceComparer : IEqualityComparer<UriTemplate>
-    {
-        static UriTemplateEquivalenceComparer instance;
-        internal static UriTemplateEquivalenceComparer Instance
-        {
-            get
-            {
-                if (instance == null)
-                {
-                    // lock-free, fine if we allocate more than one
-                    instance = new UriTemplateEquivalenceComparer();
-                }
-                return instance;
-            }
-        }
-
-        public bool Equals(UriTemplate x, UriTemplate y)
-        {
-            if (x == null)
-            {
-                return y == null;
-            }
-            return x.IsEquivalentTo(y);
-        }
-        public int GetHashCode(UriTemplate obj)
-        {
-            if (obj == null)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("obj");
-            }
-#pragma warning disable 56506 // obj.xxx is never null
-            // prefer final literal segment (common literal prefixes are common in some scenarios)
-            for (int i = obj.segments.Count - 1; i >= 0; --i)
-            {
-                if (obj.segments[i].Nature == UriTemplatePartType.Literal)
-                {
-                    return obj.segments[i].GetHashCode();
-                }
-            }
-            return obj.segments.Count + obj.queries.Count;
-#pragma warning restore 56506
-        }
-    }
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateHelpers.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateHelpers.cs
deleted file mode 100644
index 0028bcf9068..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateHelpers.cs
+++ /dev/null
@@ -1,388 +0,0 @@
-//----------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//----------------------------------------------------------------
-
-namespace System
-{
-    using System.Collections.Generic;
-    using System.Collections.Specialized;
-    using System.Diagnostics;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Runtime;
-    using System.ServiceModel;
-    using System.ServiceModel.Channels;
-
-    static class UriTemplateHelpers
-    {
-        static UriTemplateQueryComparer queryComparer = new UriTemplateQueryComparer();
-        static UriTemplateQueryKeyComparer queryKeyComperar = new UriTemplateQueryKeyComparer();
-
-        [Conditional("DEBUG")]
-        public static void AssertCanonical(string s)
-        {
-            Fx.Assert(s == s.ToUpperInvariant(), "non-canonicalized");
-        }
-        public static bool CanMatchQueryInterestingly(UriTemplate ut, NameValueCollection query, bool mustBeEspeciallyInteresting)
-        {
-            if (ut.queries.Count == 0)
-            {
-                return false; // trivial, not interesting
-            }
-            string[] queryKeys = query.AllKeys;
-            foreach (KeyValuePair<string, UriTemplateQueryValue> kvp in ut.queries)
-            {
-                string queryKeyName = kvp.Key;
-                if (kvp.Value.Nature == UriTemplatePartType.Literal)
-                {
-                    bool queryKeysContainsQueryVarName = false;
-                    for (int i = 0; i < queryKeys.Length; ++i)
-                    {
-                        if (StringComparer.OrdinalIgnoreCase.Equals(queryKeys[i], queryKeyName))
-                        {
-                            queryKeysContainsQueryVarName = true;
-                            break;
-                        }
-                    }
-                    if (!queryKeysContainsQueryVarName)
-                    {
-                        return false;
-                    }
-                    if (kvp.Value == UriTemplateQueryValue.Empty)
-                    {
-                        if (!string.IsNullOrEmpty(query[queryKeyName]))
-                        {
-                            return false;
-                        }
-                    }
-                    else
-                    {
-                        if (((UriTemplateLiteralQueryValue)(kvp.Value)).AsRawUnescapedString() != query[queryKeyName])
-                        {
-                            return false;
-                        }
-                    }
-                }
-                else
-                {
-                    if (mustBeEspeciallyInteresting && Array.IndexOf(queryKeys, queryKeyName) == -1)
-                    {
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-
-        public static bool CanMatchQueryTrivially(UriTemplate ut)
-        {
-            return (ut.queries.Count == 0);
-        }
-
-        public static void DisambiguateSamePath(UriTemplate[] array, int a, int b, bool allowDuplicateEquivalentUriTemplates)
-        {
-            // [a,b) all have same path
-            // ensure queries make them unambiguous
-            Fx.Assert(b > a, "array bug");
-            // sort empty queries to front
-            Array.Sort<UriTemplate>(array, a, b - a, queryComparer);
-            if (b - a == 1)
-            {
-                return; // if only one, cannot be ambiguous
-            }
-            if (!allowDuplicateEquivalentUriTemplates)
-            {
-                // ensure at most one empty query and ignore it
-                if (array[a].queries.Count == 0)
-                {
-                    a++;
-                }
-                if (array[a].queries.Count == 0)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
-                        SR.UTTDuplicate, array[a].ToString(), array[a - 1].ToString())));
-                }
-                if (b - a == 1)
-                {
-                    return; // if only one, cannot be ambiguous
-                }
-            }
-            else
-            {
-                while (a < b && array[a].queries.Count == 0)  // all equivalent
-                {
-                    a++;
-                }
-                if (b - a <= 1)
-                {
-                    return;
-                }
-            }
-            Fx.Assert(b > a, "array bug");
-            // now consider non-empty queries
-            // more than one, so enforce that
-            // forall
-            //   exist set of querystringvars S where
-            //     every op has literal value foreach var in S, and
-            //     those literal tuples are different
-            EnsureQueriesAreDistinct(array, a, b, allowDuplicateEquivalentUriTemplates);
-        }
-
-        public static IEqualityComparer<string> GetQueryKeyComparer()
-        {
-            return queryKeyComperar;
-        }
-
-        public static string GetUriPath(Uri uri)
-        {
-            return uri.GetComponents(UriComponents.Path | UriComponents.KeepDelimiter, UriFormat.Unescaped);
-        }
-        public static bool HasQueryLiteralRequirements(UriTemplate ut)
-        {
-            foreach (UriTemplateQueryValue utqv in ut.queries.Values)
-            {
-                if (utqv.Nature == UriTemplatePartType.Literal)
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        public static UriTemplatePartType IdentifyPartType(string part)
-        {
-            // Identifying the nature of a string - Literal|Compound|Variable
-            // Algorithem is based on the following steps:
-            // - Finding the position of the first open curlly brace ('{') and close curlly brace ('}') 
-            //    in the string
-            // - If we don't find any this is a Literal
-            // - otherwise, we validate that position of the close brace is at least two characters from 
-            //    the position of the open brace
-            // - Then we identify if we are dealing with a compound string or a single variable string
-            //    + var name is not at the string start --> Compound
-            //    + var name is shorter then the entire string (End < Length-2 or End==Length-2 
-            //       and string ends with '/') --> Compound
-            //    + otherwise --> Variable
-            int varStartIndex = part.IndexOf("{", StringComparison.Ordinal);
-            int varEndIndex = part.IndexOf("}", StringComparison.Ordinal);
-            if (varStartIndex == -1)
-            {
-                if (varEndIndex != -1)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
-                        SR.GetString(SR.UTInvalidFormatSegmentOrQueryPart, part)));
-                }
-                return UriTemplatePartType.Literal;
-            }
-            else
-            {
-                if (varEndIndex < varStartIndex + 2)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
-                        SR.GetString(SR.UTInvalidFormatSegmentOrQueryPart, part)));
-                }
-                if (varStartIndex > 0)
-                {
-                    return UriTemplatePartType.Compound;
-                }
-                else if ((varEndIndex < part.Length - 2) ||
-                    ((varEndIndex == part.Length - 2) && !part.EndsWith("/", StringComparison.Ordinal)))
-                {
-                    return UriTemplatePartType.Compound;
-                }
-                else
-                {
-                    return UriTemplatePartType.Variable;
-                }
-            }
-        }
-        public static bool IsWildcardPath(string path)
-        {
-            if (path.IndexOf('/') != -1)
-            {
-                return false;
-            }
-            UriTemplatePartType partType;
-            return IsWildcardSegment(path, out partType);
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1021:AvoidOutParameters", Justification = "This is internal method that needs to return multiple things")]
-        public static bool IsWildcardSegment(string segment, out UriTemplatePartType type)
-        {
-            type = IdentifyPartType(segment);
-            switch (type)
-            {
-                case UriTemplatePartType.Literal:
-                    return (string.Compare(segment, UriTemplate.WildcardPath, StringComparison.Ordinal) == 0);
-
-                case UriTemplatePartType.Compound:
-                    return false;
-
-                case UriTemplatePartType.Variable:
-                    return ((segment.IndexOf(UriTemplate.WildcardPath, StringComparison.Ordinal) == 1) &&
-                        !segment.EndsWith("/", StringComparison.Ordinal) &&
-                        (segment.Length > UriTemplate.WildcardPath.Length + 2));
-
-                default:
-                    Fx.Assert("Bad part type identification !");
-                    return false;
-            }
-        }
-        public static NameValueCollection ParseQueryString(string query)
-        {
-            // We are adjusting the parsing of UrlUtility.ParseQueryString, which identify
-            //  ?wsdl as a null key with wsdl as a value
-            NameValueCollection result = UrlUtility.ParseQueryString(query);
-            string nullKeyValuesString = result[(string)null];
-            if (!string.IsNullOrEmpty(nullKeyValuesString))
-            {
-                result.Remove(null);
-                string[] nullKeyValues = nullKeyValuesString.Split(',');
-                for (int i = 0; i < nullKeyValues.Length; i++)
-                {
-                    result.Add(nullKeyValues[i], null);
-                }
-            }
-            return result;
-        }
-        static bool AllTemplatesAreEquivalent(IList<UriTemplate> array, int a, int b)
-        {
-            for (int i = a; i < b - 1; ++i)
-            {
-                if (!array[i].IsEquivalentTo(array[i + 1]))
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        static void EnsureQueriesAreDistinct(UriTemplate[] array, int a, int b, bool allowDuplicateEquivalentUriTemplates)
-        {
-            Dictionary<string, byte> queryVarNamesWithLiteralVals = new Dictionary<string, byte>(StringComparer.OrdinalIgnoreCase);
-            for (int i = a; i < b; ++i)
-            {
-                foreach (KeyValuePair<string, UriTemplateQueryValue> kvp in array[i].queries)
-                {
-                    if (kvp.Value.Nature == UriTemplatePartType.Literal)
-                    {
-                        if (!queryVarNamesWithLiteralVals.ContainsKey(kvp.Key))
-                        {
-                            queryVarNamesWithLiteralVals.Add(kvp.Key, 0);
-                        }
-                    }
-                }
-            }
-            // now we have set of possibilities:
-            // further refine to only those for whom all templates have literals
-            Dictionary<string, byte> queryVarNamesAllLiterals = new Dictionary<string, byte>(queryVarNamesWithLiteralVals);
-            for (int i = a; i < b; ++i)
-            {
-                foreach (string s in queryVarNamesWithLiteralVals.Keys)
-                {
-                    if (!array[i].queries.ContainsKey(s) || (array[i].queries[s].Nature != UriTemplatePartType.Literal))
-                    {
-                        queryVarNamesAllLiterals.Remove(s);
-                    }
-                }
-            }
-            queryVarNamesWithLiteralVals = null; // ensure we don't reference this variable any more
-            // now we have the set of names that every operation has as a literal
-            if (queryVarNamesAllLiterals.Count == 0)
-            {
-                if (allowDuplicateEquivalentUriTemplates && AllTemplatesAreEquivalent(array, a, b))
-                {
-                    // we're ok, do nothing
-                }
-                else
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
-                        SR.UTTOtherAmbiguousQueries, array[a].ToString())));
-                }
-            }
-            // now just ensure that each template has a unique tuple of values for the names
-            string[][] upsLits = new string[b - a][];
-            for (int i = 0; i < b - a; ++i)
-            {
-                upsLits[i] = GetQueryLiterals(array[i + a], queryVarNamesAllLiterals);
-            }
-            for (int i = 0; i < b - a; ++i)
-            {
-                for (int j = i + 1; j < b - a; ++j)
-                {
-                    if (Same(upsLits[i], upsLits[j]))
-                    {
-                        if (!array[i + a].IsEquivalentTo(array[j + a]))
-                        {
-                            throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
-                                SR.UTTAmbiguousQueries, array[a + i].ToString(), array[j + a].ToString())));
-                        }
-                        Fx.Assert(array[i + a].IsEquivalentTo(array[j + a]), "bad equiv logic");
-                        if (!allowDuplicateEquivalentUriTemplates)
-                        {
-                            throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
-                                SR.UTTDuplicate, array[a + i].ToString(), array[j + a].ToString())));
-                        }
-                    }
-                }
-            }
-            // we're good.  whew!
-        }
-        static string[] GetQueryLiterals(UriTemplate up, Dictionary<string, byte> queryVarNames)
-        {
-            string[] queryLitVals = new string[queryVarNames.Count];
-            int i = 0;
-            foreach (string queryVarName in queryVarNames.Keys)
-            {
-                Fx.Assert(up.queries.ContainsKey(queryVarName), "query doesn't have name");
-                UriTemplateQueryValue utqv = up.queries[queryVarName];
-                Fx.Assert(utqv.Nature == UriTemplatePartType.Literal, "query for name is not literal");
-                if (utqv == UriTemplateQueryValue.Empty)
-                {
-                    queryLitVals[i] = null;
-                }
-                else
-                {
-                    queryLitVals[i] = ((UriTemplateLiteralQueryValue)(utqv)).AsRawUnescapedString();
-                }
-                ++i;
-            }
-            return queryLitVals;
-        }
-        static bool Same(string[] a, string[] b)
-        {
-            Fx.Assert(a.Length == b.Length, "arrays not same length");
-            for (int i = 0; i < a.Length; ++i)
-            {
-                if (a[i] != b[i])
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        class UriTemplateQueryComparer : IComparer<UriTemplate>
-        {
-            public int Compare(UriTemplate x, UriTemplate y)
-            {
-                // sort the empty queries to the front
-                return Comparer<int>.Default.Compare(x.queries.Count, y.queries.Count);
-            }
-        }
-        class UriTemplateQueryKeyComparer : IEqualityComparer<string>
-        {
-            public bool Equals(string x, string y)
-            {
-                return (string.Compare(x, y, StringComparison.OrdinalIgnoreCase) == 0);
-            }
-            public int GetHashCode(string obj)
-            {
-                if (obj == null)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("obj");
-                }
-                return obj.ToUpperInvariant().GetHashCode();
-            }
-        }
-    }
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateLiteralPathSegment.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateLiteralPathSegment.cs
deleted file mode 100644
index 74813d2e80e..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateLiteralPathSegment.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-//----------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//----------------------------------------------------------------
-
-namespace System
-{
-    using System.Collections.Specialized;
-    using System.Runtime;
-    using System.ServiceModel;
-    using System.Text;
-
-    // thin wrapper around string; use type system to help ensure we
-    // are doing canonicalization right/consistently
-    class UriTemplateLiteralPathSegment : UriTemplatePathSegment, IComparable<UriTemplateLiteralPathSegment>
-    {
-
-        // segment doesn't store trailing slash
-        readonly string segment;
-        static Uri dummyUri = new Uri("http://localhost");
-
-        UriTemplateLiteralPathSegment(string segment)
-            : base(segment, UriTemplatePartType.Literal, segment.EndsWith("/", StringComparison.Ordinal))
-        {
-            Fx.Assert(segment != null, "bad literal segment");
-            if (this.EndsWithSlash)
-            {
-                this.segment = segment.Remove(segment.Length - 1);
-            }
-            else
-            {
-                this.segment = segment;
-            }
-        }
-        public static new UriTemplateLiteralPathSegment CreateFromUriTemplate(string segment, UriTemplate template)
-        {
-            // run it through UriBuilder to escape-if-necessary it
-            if (string.Compare(segment, "/", StringComparison.Ordinal) == 0)
-            {
-                // running an empty segment through UriBuilder has unexpected/wrong results
-                return new UriTemplateLiteralPathSegment("/");
-            }
-            if (segment.IndexOf(UriTemplate.WildcardPath, StringComparison.Ordinal) != -1)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
-                    SR.GetString(SR.UTInvalidWildcardInVariableOrLiteral, template.originalTemplate, UriTemplate.WildcardPath)));
-            }
-            // '*' is not usually escaped by the Uri\UriBuilder to %2a, since we forbid passing a
-            // clear character and the workaroud is to pass the escaped form, we should replace the
-            // escaped form with the regular one.
-            segment = segment.Replace("%2a", "*").Replace("%2A", "*");
-            UriBuilder ub = new UriBuilder(dummyUri);
-            ub.Path = segment;
-            string escapedIfNecessarySegment = ub.Uri.AbsolutePath.Substring(1);
-            if (escapedIfNecessarySegment == string.Empty)
-            {
-                // This path through UriBuilder will sometimes '----' various segments
-                // such as '../' and './'.  When this happens and the result is an empty
-                // string, we should just throw and tell the user we don't handle that.
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("segment",
-                    SR.GetString(SR.UTInvalidFormatSegmentOrQueryPart, segment));
-            }
-            return new UriTemplateLiteralPathSegment(escapedIfNecessarySegment);
-        }
-        public static UriTemplateLiteralPathSegment CreateFromWireData(string segment)
-        {
-            return new UriTemplateLiteralPathSegment(segment);
-        }
-
-        public string AsUnescapedString()
-        {
-            Fx.Assert(this.segment != null, "this should only be called by Bind\\Lookup");
-            return Uri.UnescapeDataString(this.segment);
-        }
-        public override void Bind(string[] values, ref int valueIndex, StringBuilder path)
-        {
-            if (this.EndsWithSlash)
-            {
-                path.AppendFormat("{0}/", AsUnescapedString());
-            }
-            else
-            {
-                path.Append(AsUnescapedString());
-            }
-        }
-
-        public int CompareTo(UriTemplateLiteralPathSegment other)
-        {
-            return StringComparer.OrdinalIgnoreCase.Compare(this.segment, other.segment);
-        }
-
-        public override bool Equals(object obj)
-        {
-            UriTemplateLiteralPathSegment lps = obj as UriTemplateLiteralPathSegment;
-            if (lps == null)
-            {
-                Fx.Assert("why would we ever call this?");
-                return false;
-            }
-            else
-            {
-                return ((this.EndsWithSlash == lps.EndsWithSlash) &&
-                    StringComparer.OrdinalIgnoreCase.Equals(this.segment, lps.segment));
-            }
-        }
-        public override int GetHashCode()
-        {
-            return StringComparer.OrdinalIgnoreCase.GetHashCode(this.segment);
-        }
-
-        public override bool IsEquivalentTo(UriTemplatePathSegment other, bool ignoreTrailingSlash)
-        {
-            if (other == null)
-            {
-                Fx.Assert("why would we ever call this?");
-                return false;
-            }
-            if (other.Nature != UriTemplatePartType.Literal)
-            {
-                return false;
-            }
-            UriTemplateLiteralPathSegment otherAsLiteral = other as UriTemplateLiteralPathSegment;
-            Fx.Assert(otherAsLiteral != null, "The nature requires that this will be OK");
-            return IsMatch(otherAsLiteral, ignoreTrailingSlash);
-        }
-        public override bool IsMatch(UriTemplateLiteralPathSegment segment, bool ignoreTrailingSlash)
-        {
-            if (!ignoreTrailingSlash && (segment.EndsWithSlash != this.EndsWithSlash))
-            {
-                return false;
-            }
-            return (CompareTo(segment) == 0);
-        }
-        public bool IsNullOrEmpty()
-        {
-            return string.IsNullOrEmpty(this.segment);
-        }
-        public override void Lookup(string segment, NameValueCollection boundParameters)
-        {
-            Fx.Assert(StringComparer.OrdinalIgnoreCase.Compare(AsUnescapedString(), segment) == 0,
-                "How can that be? Lookup is expected to be called after IsMatch");
-        }
-    }
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateLiteralQueryValue.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateLiteralQueryValue.cs
deleted file mode 100644
index 2b95e8fab88..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateLiteralQueryValue.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-//----------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//----------------------------------------------------------------
-
-namespace System
-{
-    using System.Collections.Specialized;
-    using System.Runtime;
-    using System.ServiceModel.Channels;
-    using System.Text;
-
-    // thin wrapper around string; use type system to help ensure we
-    // are doing canonicalization right/consistently
-    class UriTemplateLiteralQueryValue : UriTemplateQueryValue, IComparable<UriTemplateLiteralQueryValue>
-    {
-        readonly string value; // an unescaped representation
-
-        UriTemplateLiteralQueryValue(string value)
-            : base(UriTemplatePartType.Literal)
-        {
-            Fx.Assert(value != null, "bad literal value");
-            this.value = value;
-        }
-        public static UriTemplateLiteralQueryValue CreateFromUriTemplate(string value)
-        {
-            return new UriTemplateLiteralQueryValue(UrlUtility.UrlDecode(value, Encoding.UTF8));
-        }
-
-        public string AsEscapedString()
-        {
-            return UrlUtility.UrlEncode(this.value, Encoding.UTF8);
-        }
-        public string AsRawUnescapedString()
-        {
-            return this.value;
-        }
-        public override void Bind(string keyName, string[] values, ref int valueIndex, StringBuilder query)
-        {
-            query.AppendFormat("&{0}={1}", UrlUtility.UrlEncode(keyName, Encoding.UTF8), AsEscapedString());
-        }
-
-        public int CompareTo(UriTemplateLiteralQueryValue other)
-        {
-            return string.Compare(this.value, other.value, StringComparison.Ordinal);
-        }
-
-        public override bool Equals(object obj)
-        {
-            UriTemplateLiteralQueryValue lqv = obj as UriTemplateLiteralQueryValue;
-            if (lqv == null)
-            {
-                Fx.Assert("why would we ever call this?");
-                return false;
-            }
-            else
-            {
-                return this.value == lqv.value;
-            }
-        }
-        public override int GetHashCode()
-        {
-            return this.value.GetHashCode();
-        }
-
-        public override bool IsEquivalentTo(UriTemplateQueryValue other)
-        {
-            if (other == null)
-            {
-                Fx.Assert("why would we ever call this?");
-                return false;
-            }
-            if (other.Nature != UriTemplatePartType.Literal)
-            {
-                return false;
-            }
-            UriTemplateLiteralQueryValue otherAsLiteral = other as UriTemplateLiteralQueryValue;
-            Fx.Assert(otherAsLiteral != null, "The nature requires that this will be OK");
-            return (CompareTo(otherAsLiteral) == 0);
-        }
-        public override void Lookup(string value, NameValueCollection boundParameters)
-        {
-            Fx.Assert(string.Compare(this.value, value, StringComparison.Ordinal) == 0, "How can that be?");
-        }
-    }
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateMatch.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateMatch.cs
deleted file mode 100644
index 5b98d65fc95..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateMatch.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-//----------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//----------------------------------------------------------------
-
-namespace System
-{
-    using System.Collections.ObjectModel;
-    using System.Collections.Specialized;
-    using System.Runtime;
-    using System.Runtime.CompilerServices;
-    using System.ServiceModel.Channels;
-    using System.Net;
-
-    [TypeForwardedFrom("System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")]
-    public class UriTemplateMatch
-    {
-        Uri baseUri;
-        NameValueCollection boundVariables;
-        object data;
-        NameValueCollection queryParameters;
-        Collection<string> relativePathSegments;
-        Uri requestUri;
-        UriTemplate template;
-        Collection<string> wildcardPathSegments;
-        int wildcardSegmentsStartOffset = -1;
-        Uri originalBaseUri;
-        HttpRequestMessageProperty requestProp;
-
-        public UriTemplateMatch()
-        {
-        }
-
-        public Uri BaseUri   // the base address, untouched
-        {
-            get
-            {
-                if (this.baseUri == null && this.originalBaseUri != null)
-                {
-                    this.baseUri = UriTemplate.RewriteUri(this.originalBaseUri, this.requestProp.Headers[HttpRequestHeader.Host]);
-                }
-                return this.baseUri;
-            }
-            set
-            {
-                this.baseUri = value;
-                this.originalBaseUri = null;
-                this.requestProp = null;
-            }
-        }
-        public NameValueCollection BoundVariables // result of TryLookup, values are decoded
-        {
-            get
-            {
-                if (this.boundVariables == null)
-                {
-                    this.boundVariables = new NameValueCollection();
-                }
-                return this.boundVariables;
-            }
-        }
-        public object Data
-        {
-            get
-            {
-                return this.data;
-            }
-            set
-            {
-                this.data = value;
-            }
-        }
-        public NameValueCollection QueryParameters  // the result of UrlUtility.ParseQueryString (keys and values are decoded)
-        {
-            get
-            {
-                if (this.queryParameters == null)
-                {
-                    PopulateQueryParameters();
-                }
-                return this.queryParameters;
-            }
-        }
-        public Collection<string> RelativePathSegments  // entire Path (after the base address), decoded
-        {
-            get
-            {
-                if (this.relativePathSegments == null)
-                {
-                    this.relativePathSegments = new Collection<string>();
-                }
-                return this.relativePathSegments;
-            }
-        }
-        public Uri RequestUri  // uri on the wire, untouched
-        {
-            get
-            {
-                return this.requestUri;
-            }
-            set
-            {
-                this.requestUri = value;
-            }
-        }
-        public UriTemplate Template // which one got matched
-        {
-            get
-            {
-                return this.template;
-            }
-            set
-            {
-                this.template = value;
-            }
-        }
-        public Collection<string> WildcardPathSegments  // just the Path part matched by "*", decoded
-        {
-            get
-            {
-                if (this.wildcardPathSegments == null)
-                {
-                    PopulateWildcardSegments();
-                }
-                return this.wildcardPathSegments;
-            }
-        }
-
-        internal void SetQueryParameters(NameValueCollection queryParameters)
-        {
-            this.queryParameters = new NameValueCollection(queryParameters);
-        }
-        internal void SetRelativePathSegments(Collection<string> segments)
-        {
-            Fx.Assert(segments != null, "segments != null");
-            this.relativePathSegments = segments;
-        }
-        internal void SetWildcardPathSegmentsStart(int startOffset)
-        {
-            Fx.Assert(startOffset >= 0, "startOffset >= 0");
-            this.wildcardSegmentsStartOffset = startOffset;
-        }
-
-        internal void SetBaseUri(Uri originalBaseUri, HttpRequestMessageProperty requestProp)
-        {
-            this.baseUri = null;
-            this.originalBaseUri = originalBaseUri;
-            this.requestProp = requestProp;
-        }
-
-        void PopulateQueryParameters()
-        {
-            if (this.requestUri != null)
-            {
-                this.queryParameters = UriTemplateHelpers.ParseQueryString(this.requestUri.Query);
-            }
-            else
-            {
-                this.queryParameters = new NameValueCollection();
-            }
-        }
-        void PopulateWildcardSegments()
-        {
-            if (wildcardSegmentsStartOffset != -1)
-            {
-                this.wildcardPathSegments = new Collection<string>();
-                for (int i = this.wildcardSegmentsStartOffset; i < this.RelativePathSegments.Count; ++i)
-                {
-                    this.wildcardPathSegments.Add(this.RelativePathSegments[i]);
-                }
-            }
-            else
-            {
-                this.wildcardPathSegments = new Collection<string>();
-            }
-        }
-    }
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateMatchException.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateMatchException.cs
deleted file mode 100644
index f5be62fc160..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateMatchException.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-//----------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//----------------------------------------------------------------
-
-namespace System
-{
-	using System.Runtime.CompilerServices;
-
-    [TypeForwardedFrom("System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")]
-    [Serializable]
-    public class UriTemplateMatchException : SystemException
-    {
-        public UriTemplateMatchException(string message)
-            : base(message)
-        {
-        }
-    }
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplatePartType.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplatePartType.cs
deleted file mode 100644
index 9b6909c67d8..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplatePartType.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-//----------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//----------------------------------------------------------------
-
-namespace System
-{
-    enum UriTemplatePartType
-    {
-        Literal,
-        Compound,
-        Variable
-    }
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplatePathPartiallyEquivalentSet.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplatePathPartiallyEquivalentSet.cs
deleted file mode 100644
index 1cfa739eefa..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplatePathPartiallyEquivalentSet.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-//----------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//----------------------------------------------------------------
-
-namespace System
-{
-    using System.Collections.Generic;
-
-    // This class was named UriTemplatePathEquivalentSet in the Orcas bits, where it used to
-    //  represent a set of uri templates, which are equivalent in thier path. The introduction
-    //  of terminal defaults, caused it to be no longer true; now it is representing a set
-    //  of templates, which are equivalent in their path till a certian point, which is stored
-    //  in the segmentsCount field. To highlight that fact the class was renamed as
-    //  UriTemplatePathPartiallyEquivalentSet.
-    class UriTemplatePathPartiallyEquivalentSet
-    {
-        List<KeyValuePair<UriTemplate, object>> kvps;
-        int segmentsCount;
-
-        public UriTemplatePathPartiallyEquivalentSet(int segmentsCount)
-        {
-            this.segmentsCount = segmentsCount;
-            this.kvps = new List<KeyValuePair<UriTemplate, object>>();
-        }
-        public List<KeyValuePair<UriTemplate, object>> Items
-        {
-            get
-            {
-                return this.kvps;
-            }
-        }
-
-        public int SegmentsCount
-        {
-            get
-            {
-                return this.segmentsCount;
-            }
-        }
-    }
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplatePathSegment.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplatePathSegment.cs
deleted file mode 100644
index 4f61ef5d86a..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplatePathSegment.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-//----------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//----------------------------------------------------------------
-
-namespace System
-{
-    using System.Collections.Specialized;
-    using System.Diagnostics;
-    using System.Runtime;
-    using System.Text;
-
-    // This represents a Path segment, which can either be a Literal, a Variable or a Compound
-    [DebuggerDisplay("Segment={originalSegment} Nature={nature}")]
-    abstract class UriTemplatePathSegment
-    {
-        readonly bool endsWithSlash;
-        readonly UriTemplatePartType nature;
-        readonly string originalSegment;
-
-        protected UriTemplatePathSegment(string originalSegment, UriTemplatePartType nature,
-            bool endsWithSlash)
-        {
-            this.originalSegment = originalSegment;
-            this.nature = nature;
-            this.endsWithSlash = endsWithSlash;
-        }
-        public bool EndsWithSlash
-        {
-            get
-            {
-                return this.endsWithSlash;
-            }
-        }
-        public UriTemplatePartType Nature
-        {
-            get
-            {
-                return this.nature;
-            }
-        }
-
-        public string OriginalSegment
-        {
-            get
-            {
-                return this.originalSegment;
-            }
-        }
-        public static UriTemplatePathSegment CreateFromUriTemplate(string segment, UriTemplate template)
-        {
-            // Identifying the type of segment - Literal|Compound|Variable
-            switch (UriTemplateHelpers.IdentifyPartType(segment))
-            {
-                case UriTemplatePartType.Literal:
-                    return UriTemplateLiteralPathSegment.CreateFromUriTemplate(segment, template);
-
-                case UriTemplatePartType.Compound:
-                    return UriTemplateCompoundPathSegment.CreateFromUriTemplate(segment, template);
-
-                case UriTemplatePartType.Variable:
-                    if (segment.EndsWith("/", StringComparison.Ordinal))
-                    {
-                        string varName = template.AddPathVariable(UriTemplatePartType.Variable,
-                            segment.Substring(1, segment.Length - 3));
-                        return new UriTemplateVariablePathSegment(segment, true, varName);
-                    }
-                    else
-                    {
-                        string varName = template.AddPathVariable(UriTemplatePartType.Variable,
-                            segment.Substring(1, segment.Length - 2));
-                        return new UriTemplateVariablePathSegment(segment, false, varName);
-                    }
-
-                default:
-                    Fx.Assert("Invalid value from IdentifyStringNature");
-                    return null;
-            }
-        }
-        public abstract void Bind(string[] values, ref int valueIndex, StringBuilder path);
-
-        public abstract bool IsEquivalentTo(UriTemplatePathSegment other, bool ignoreTrailingSlash);
-        public bool IsMatch(UriTemplateLiteralPathSegment segment)
-        {
-            return IsMatch(segment, false);
-        }
-        public abstract bool IsMatch(UriTemplateLiteralPathSegment segment, bool ignoreTrailingSlash);
-        public abstract void Lookup(string segment, NameValueCollection boundParameters);
-    }
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateQueryValue.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateQueryValue.cs
deleted file mode 100644
index 0408d4866b6..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateQueryValue.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-//----------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//----------------------------------------------------------------
-
-namespace System
-{
-    using System.Collections.Specialized;
-    using System.Runtime;
-    using System.ServiceModel;
-    using System.ServiceModel.Channels;
-    using System.Text;
-
-    // This represents a Query value, which can either be Empty, a Literal or a Variable
-    abstract class UriTemplateQueryValue
-    {
-
-        readonly UriTemplatePartType nature;
-        static UriTemplateQueryValue empty = new EmptyUriTemplateQueryValue();
-
-        protected UriTemplateQueryValue(UriTemplatePartType nature)
-        {
-            this.nature = nature;
-        }
-
-        public static UriTemplateQueryValue Empty
-        {
-            get
-            {
-                return UriTemplateQueryValue.empty;
-            }
-        }
-
-        public UriTemplatePartType Nature
-        {
-            get
-            {
-                return this.nature;
-            }
-        }
-        public static UriTemplateQueryValue CreateFromUriTemplate(string value, UriTemplate template)
-        {
-            // Checking for empty value
-            if (value == null)
-            {
-                return UriTemplateQueryValue.Empty;
-            }
-            // Identifying the type of value - Literal|Compound|Variable
-            switch (UriTemplateHelpers.IdentifyPartType(value))
-            {
-                case UriTemplatePartType.Literal:
-                    return UriTemplateLiteralQueryValue.CreateFromUriTemplate(value);
-
-                case UriTemplatePartType.Compound:
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
-                        SR.UTQueryCannotHaveCompoundValue, template.originalTemplate)));
-
-                case UriTemplatePartType.Variable:
-                    return new UriTemplateVariableQueryValue(template.AddQueryVariable(value.Substring(1, value.Length - 2)));
-
-                default:
-                    Fx.Assert("Invalid value from IdentifyStringNature");
-                    return null;
-            }
-        }
-
-        public static bool IsNullOrEmpty(UriTemplateQueryValue utqv)
-        {
-            if (utqv == null)
-            {
-                return true;
-            }
-            if (utqv == UriTemplateQueryValue.Empty)
-            {
-                return true;
-            }
-            return false;
-        }
-        public abstract void Bind(string keyName, string[] values, ref int valueIndex, StringBuilder query);
-
-        public abstract bool IsEquivalentTo(UriTemplateQueryValue other);
-        public abstract void Lookup(string value, NameValueCollection boundParameters);
-
-        class EmptyUriTemplateQueryValue : UriTemplateQueryValue
-        {
-            public EmptyUriTemplateQueryValue()
-                : base(UriTemplatePartType.Literal)
-            {
-            }
-            public override void Bind(string keyName, string[] values, ref int valueIndex, StringBuilder query)
-            {
-                query.AppendFormat("&{0}", UrlUtility.UrlEncode(keyName, Encoding.UTF8));
-            }
-
-            public override bool IsEquivalentTo(UriTemplateQueryValue other)
-            {
-                return (other == UriTemplateQueryValue.Empty);
-            }
-            public override void Lookup(string value, NameValueCollection boundParameters)
-            {
-                Fx.Assert(string.IsNullOrEmpty(value), "shouldn't have a value");
-            }
-        }
-    }
-
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateTable.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateTable.cs
deleted file mode 100644
index 9b732e587f3..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateTable.cs
+++ /dev/null
@@ -1,608 +0,0 @@
-//----------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//----------------------------------------------------------------
-
-namespace System
-{
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Collections.Specialized;
-    using System.Diagnostics;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Runtime;
-    using System.ServiceModel;
-    using System.Runtime.CompilerServices;
-
-    // this class is thread-safe
-    [TypeForwardedFrom("System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")]
-    public class UriTemplateTable
-    {
-        Uri baseAddress;
-        string basePath;
-        Dictionary<string, FastPathInfo> fastPathTable; // key is uri.PathAndQuery, fastPathTable may be null
-        bool noTemplateHasQueryPart;
-        int numSegmentsInBaseAddress;
-        Uri originalUncanonicalizedBaseAddress;
-        UriTemplateTrieNode rootNode;
-        UriTemplatesCollection templates;
-        object thisLock;
-        bool addTrailingSlashToBaseAddress;
-
-        public UriTemplateTable()
-            : this(null, null, true)
-        {
-        }
-        public UriTemplateTable(IEnumerable<KeyValuePair<UriTemplate, object>> keyValuePairs)
-            : this(null, keyValuePairs, true)
-        {
-        }
-        public UriTemplateTable(Uri baseAddress)
-            : this(baseAddress, null, true)
-        {
-        }
-
-        internal UriTemplateTable(Uri baseAddress, bool addTrailingSlashToBaseAddress)
-            : this(baseAddress, null, addTrailingSlashToBaseAddress)
-        {
-        }
-
-        public UriTemplateTable(Uri baseAddress, IEnumerable<KeyValuePair<UriTemplate, object>> keyValuePairs)
-            : this(baseAddress, keyValuePairs, true)
-        {
-        }
-
-        internal UriTemplateTable(Uri baseAddress, IEnumerable<KeyValuePair<UriTemplate, object>> keyValuePairs, bool addTrailingSlashToBaseAddress)
-        {
-            if (baseAddress != null && !baseAddress.IsAbsoluteUri)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("baseAddress", SR.GetString(
-                    SR.UTTMustBeAbsolute));
-            }
-            
-            this.addTrailingSlashToBaseAddress = addTrailingSlashToBaseAddress;
-            this.originalUncanonicalizedBaseAddress = baseAddress;
-            
-            if (keyValuePairs != null)
-            {
-                this.templates = new UriTemplatesCollection(keyValuePairs);
-            }
-            else
-            {
-                this.templates = new UriTemplatesCollection();
-            }
-
-            this.thisLock = new object();
-            this.baseAddress = baseAddress;
-            NormalizeBaseAddress();
-        }
-
-        public Uri BaseAddress
-        {
-            get
-            {
-                return this.baseAddress;
-            }
-            set
-            {
-                if (value == null)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("value");
-                }
-                lock (this.thisLock)
-                {
-                    if (this.IsReadOnly)
-                    {
-                        throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
-                            SR.GetString(SR.UTTCannotChangeBaseAddress)));
-                    }
-                    else
-                    {
-                        if (!value.IsAbsoluteUri)
-                        {
-                            throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("value", SR.GetString(
-                                SR.UTTBaseAddressMustBeAbsolute));
-                        }
-                        else
-                        {
-                            this.originalUncanonicalizedBaseAddress = value;
-                            this.baseAddress = value;
-                            NormalizeBaseAddress();
-                        }
-                    }
-                }
-            }
-        }
-
-        public Uri OriginalBaseAddress
-        {
-            get
-            {
-                return this.originalUncanonicalizedBaseAddress;
-            }
-        }
-
-        public bool IsReadOnly
-        {
-            get
-            {
-                return this.templates.IsFrozen;
-            }
-        }
-        public IList<KeyValuePair<UriTemplate, object>> KeyValuePairs
-        {
-            get
-            {
-                return this.templates;
-            }
-        }
-
-        public void MakeReadOnly(bool allowDuplicateEquivalentUriTemplates)
-        {
-            // idempotent
-            lock (this.thisLock)
-            {
-                if (!this.IsReadOnly)
-                {
-                    this.templates.Freeze();
-                    Validate(allowDuplicateEquivalentUriTemplates);
-                    ConstructFastPathTable();
-                }
-            }
-        }
-        public Collection<UriTemplateMatch> Match(Uri uri)
-        {
-            if (uri == null)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("uri");
-            }
-            if (!uri.IsAbsoluteUri)
-            {
-                return None();
-            }
-
-            this.MakeReadOnly(true);
-
-            // Matching path :
-            Collection<String> relativeSegments;
-            IList<UriTemplateTableMatchCandidate> candidates;
-            if (!FastComputeRelativeSegmentsAndLookup(uri, out relativeSegments, out candidates))
-            {
-                return None();
-            }
-            // Matching query :
-            NameValueCollection queryParameters = null;
-            if (!this.noTemplateHasQueryPart && AtLeastOneCandidateHasQueryPart(candidates))
-            {
-                Collection<UriTemplateTableMatchCandidate> nextCandidates = new Collection<UriTemplateTableMatchCandidate>();
-                Fx.Assert(nextCandidates.Count == 0, "nextCandidates should be empty");
-
-                // then deal with query
-                queryParameters = UriTemplateHelpers.ParseQueryString(uri.Query);
-                bool mustBeEspeciallyInteresting = NoCandidateHasQueryLiteralRequirementsAndThereIsAnEmptyFallback(candidates);
-                for (int i = 0; i < candidates.Count; i++)
-                {
-                    if (UriTemplateHelpers.CanMatchQueryInterestingly(candidates[i].Template, queryParameters, mustBeEspeciallyInteresting))
-                    {
-                        nextCandidates.Add(candidates[i]);
-                    }
-                }
-                if (nextCandidates.Count > 1)
-                {
-                    Fx.Assert(AllEquivalent(nextCandidates, 0, nextCandidates.Count), "demux algorithm problem, multiple non-equivalent matches");
-                }
-
-                if (nextCandidates.Count == 0)
-                {
-                    for (int i = 0; i < candidates.Count; i++)
-                    {
-                        if (UriTemplateHelpers.CanMatchQueryTrivially(candidates[i].Template))
-                        {
-                            nextCandidates.Add(candidates[i]);
-                        }
-                    }
-                }
-                if (nextCandidates.Count == 0)
-                {
-                    return None();
-                }
-                if (nextCandidates.Count > 1)
-                {
-                    Fx.Assert(AllEquivalent(nextCandidates, 0, nextCandidates.Count), "demux algorithm problem, multiple non-equivalent matches");
-                }
-
-                candidates = nextCandidates;
-            }
-            // Verifying that we have not broken the allowDuplicates settings because of terminal defaults
-            //  This situation can be caused when we are hosting ".../" and ".../{foo=xyz}" in the same
-            //  table. They are not equivalent; yet they reside together in the same path partially-equivalent
-            //  set. If we hit a uri that ends up in that particular end-of-path set, we want to provide the
-            //  user only the 'best' match and not both; thus preventing inconsistancy between the MakeReadonly
-            //  settings and the matching results. We will assume that the 'best' matches will be the ones with
-            //  the smallest number of segments - this will prefer ".../" over ".../{x=1}[/...]".
-            if (NotAllCandidatesArePathFullyEquivalent(candidates))
-            {
-                Collection<UriTemplateTableMatchCandidate> nextCandidates = new Collection<UriTemplateTableMatchCandidate>();
-                int minSegmentsCount = -1;
-                for (int i = 0; i < candidates.Count; i++)
-                {
-                    UriTemplateTableMatchCandidate candidate = candidates[i];
-                    if (minSegmentsCount == -1)
-                    {
-                        minSegmentsCount = candidate.Template.segments.Count;
-                        nextCandidates.Add(candidate);
-                    }
-                    else if (candidate.Template.segments.Count < minSegmentsCount)
-                    {
-                        minSegmentsCount = candidate.Template.segments.Count;
-                        nextCandidates.Clear();
-                        nextCandidates.Add(candidate);
-                    }
-                    else if (candidate.Template.segments.Count == minSegmentsCount)
-                    {
-                        nextCandidates.Add(candidate);
-                    }
-                }
-                Fx.Assert(minSegmentsCount != -1, "At least the first entry in the list should be kept");
-                Fx.Assert(nextCandidates.Count >= 1, "At least the first entry in the list should be kept");
-                Fx.Assert(nextCandidates[0].Template.segments.Count == minSegmentsCount, "Trivial");
-                candidates = nextCandidates;
-            }
-
-            // Building the actual result
-            Collection<UriTemplateMatch> actualResults = new Collection<UriTemplateMatch>();
-            for (int i = 0; i < candidates.Count; i++)
-            {
-                UriTemplateTableMatchCandidate candidate = candidates[i];
-                UriTemplateMatch match = candidate.Template.CreateUriTemplateMatch(this.originalUncanonicalizedBaseAddress,
-                    uri, candidate.Data, candidate.SegmentsCount, relativeSegments, queryParameters);
-                actualResults.Add(match);
-            }
-            return actualResults;
-        }
-        public UriTemplateMatch MatchSingle(Uri uri)
-        {
-            Collection<UriTemplateMatch> c = this.Match(uri);
-            if (c.Count == 0)
-            {
-                return null;
-            }
-            if (c.Count == 1)
-            {
-                return c[0];
-            }
-            throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new UriTemplateMatchException(SR.GetString(
-                SR.UTTMultipleMatches)));
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "This method is called within a Debug assert")]
-        static bool AllEquivalent(IList<UriTemplateTableMatchCandidate> list, int a, int b)
-        {
-            for (int i = a; i < b - 1; ++i)
-            {
-                if (!list[i].Template.IsPathPartiallyEquivalentAt(list[i + 1].Template, list[i].SegmentsCount))
-                {
-                    return false;
-                }
-                if (!list[i].Template.IsQueryEquivalent(list[i + 1].Template))
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        static bool AtLeastOneCandidateHasQueryPart(IList<UriTemplateTableMatchCandidate> candidates)
-        {
-            for (int i = 0; i < candidates.Count; i++)
-            {
-                if (!UriTemplateHelpers.CanMatchQueryTrivially(candidates[i].Template))
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-        static bool NoCandidateHasQueryLiteralRequirementsAndThereIsAnEmptyFallback(
-            IList<UriTemplateTableMatchCandidate> candidates)
-        {
-            bool thereIsAmEmptyFallback = false;
-            for (int i = 0; i < candidates.Count; i++)
-            {
-                if (UriTemplateHelpers.HasQueryLiteralRequirements(candidates[i].Template))
-                {
-                    return false;
-                }
-                if (candidates[i].Template.queries.Count == 0)
-                {
-                    thereIsAmEmptyFallback = true;
-                }
-            }
-            return thereIsAmEmptyFallback;
-        }
-
-        static Collection<UriTemplateMatch> None()
-        {
-            return new Collection<UriTemplateMatch>();
-        }
-        static bool NotAllCandidatesArePathFullyEquivalent(IList<UriTemplateTableMatchCandidate> candidates)
-        {
-            if (candidates.Count <= 1)
-            {
-                return false;
-            }
-
-            int segmentsCount = -1;
-            for (int i = 0; i < candidates.Count; i++)
-            {
-                if (segmentsCount == -1)
-                {
-                    segmentsCount = candidates[i].Template.segments.Count;
-                }
-                else if (segmentsCount != candidates[i].Template.segments.Count)
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        bool ComputeRelativeSegmentsAndLookup(Uri uri,
-            ICollection<string> relativePathSegments, // add to this
-            ICollection<UriTemplateTableMatchCandidate> candidates) // matched candidates
-        {
-            string[] uriSegments = uri.Segments;
-            int numRelativeSegments = uriSegments.Length - this.numSegmentsInBaseAddress;
-            Fx.Assert(numRelativeSegments >= 0, "bad num segments");
-            UriTemplateLiteralPathSegment[] uSegments = new UriTemplateLiteralPathSegment[numRelativeSegments];
-            for (int i = 0; i < numRelativeSegments; ++i)
-            {
-                string seg = uriSegments[i + this.numSegmentsInBaseAddress];
-                // compute representation for matching
-                UriTemplateLiteralPathSegment lps = UriTemplateLiteralPathSegment.CreateFromWireData(seg);
-                uSegments[i] = lps;
-                // compute representation to project out into results
-                string relPathSeg = Uri.UnescapeDataString(seg);
-                if (lps.EndsWithSlash)
-                {
-                    Fx.Assert(relPathSeg.EndsWith("/", StringComparison.Ordinal), "problem with relative path segment");
-                    relPathSeg = relPathSeg.Substring(0, relPathSeg.Length - 1); // trim slash
-                }
-                relativePathSegments.Add(relPathSeg);
-            }
-            return rootNode.Match(uSegments, candidates);
-        }
-        void ConstructFastPathTable()
-        {
-            this.noTemplateHasQueryPart = true;
-            foreach (KeyValuePair<UriTemplate, object> kvp in this.templates)
-            {
-                UriTemplate ut = kvp.Key;
-                if (!UriTemplateHelpers.CanMatchQueryTrivially(ut))
-                {
-                    this.noTemplateHasQueryPart = false;
-                }
-                if (ut.HasNoVariables && !ut.HasWildcard)
-                {
-                    // eligible for fast path
-                    if (this.fastPathTable == null)
-                    {
-                        this.fastPathTable = new Dictionary<string, FastPathInfo>();
-                    }
-                    Uri uri = ut.BindByPosition(this.originalUncanonicalizedBaseAddress);
-                    string uriPath = UriTemplateHelpers.GetUriPath(uri);
-                    if (this.fastPathTable.ContainsKey(uriPath))
-                    {
-                        // nothing to do, we've already seen it
-                    }
-                    else
-                    {
-                        FastPathInfo fpInfo = new FastPathInfo();
-                        if (ComputeRelativeSegmentsAndLookup(uri, fpInfo.RelativePathSegments,
-                            fpInfo.Candidates))
-                        {
-                            fpInfo.Freeze();
-                            this.fastPathTable.Add(uriPath, fpInfo);
-                        }
-                    }
-                }
-            }
-        }
-        // this method checks the literal cache for a match if none, goes through the slower path of cracking the segments
-        bool FastComputeRelativeSegmentsAndLookup(Uri uri, out Collection<string> relativePathSegments,
-            out IList<UriTemplateTableMatchCandidate> candidates)
-        {
-            // Consider fast-path and lookup
-            // return false if not under base uri
-            string uriPath = UriTemplateHelpers.GetUriPath(uri);
-            FastPathInfo fpInfo = null;
-            if ((this.fastPathTable != null) && this.fastPathTable.TryGetValue(uriPath, out fpInfo))
-            {
-                relativePathSegments = fpInfo.RelativePathSegments;
-                candidates = fpInfo.Candidates;
-                VerifyThatFastPathAndSlowPathHaveSameResults(uri, relativePathSegments, candidates);
-                return true;
-            }
-            else
-            {
-                relativePathSegments = new Collection<string>();
-                candidates = new Collection<UriTemplateTableMatchCandidate>();
-                return SlowComputeRelativeSegmentsAndLookup(uri, uriPath, relativePathSegments, candidates);
-            }
-        }
-
-        void NormalizeBaseAddress()
-        {
-            if (this.baseAddress != null)
-            {
-                // ensure trailing slash on baseAddress, so that IsBaseOf will work later
-                UriBuilder ub = new UriBuilder(this.baseAddress);
-                if (this.addTrailingSlashToBaseAddress && !ub.Path.EndsWith("/", StringComparison.Ordinal))
-                {
-                    ub.Path = ub.Path + "/";
-                }
-                ub.Host = "localhost"; // always normalize to localhost
-                ub.Port = -1;
-                ub.UserName = null;
-                ub.Password = null;
-                ub.Path = ub.Path.ToUpperInvariant();
-                ub.Scheme = Uri.UriSchemeHttp;
-                this.baseAddress = ub.Uri;
-                basePath = UriTemplateHelpers.GetUriPath(this.baseAddress);
-            }
-        }
-        bool SlowComputeRelativeSegmentsAndLookup(Uri uri, string uriPath, Collection<string> relativePathSegments,
-            ICollection<UriTemplateTableMatchCandidate> candidates)
-        {
-            // ensure 'under' the base address
-            if (uriPath.Length < basePath.Length)
-            {
-                return false;
-            }
-
-            if (!uriPath.StartsWith(basePath, StringComparison.OrdinalIgnoreCase))
-            {
-                return false;
-            }
-            else
-            {
-                // uriPath StartsWith basePath, but this check is not enough - basePath 'service1' should not match with uriPath 'service123'
-                // make sure that after the match the next character is /, this is to avoid a uriPath of the form /service12/ matching with a basepath of the form /service1
-                if (uriPath.Length > basePath.Length && !basePath.EndsWith("/", StringComparison.Ordinal) && uriPath[basePath.Length] != '/')
-                {
-                    return false;
-                }
-            }
-
-            return ComputeRelativeSegmentsAndLookup(uri, relativePathSegments, candidates);
-        }
-
-        void Validate(bool allowDuplicateEquivalentUriTemplates)
-        {
-            if (this.baseAddress == null)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
-                    SR.UTTBaseAddressNotSet)));
-            }
-            this.numSegmentsInBaseAddress = this.baseAddress.Segments.Length;
-            if (this.templates.Count == 0)
-            {
-                throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
-                    SR.UTTEmptyKeyValuePairs)));
-            }
-            // build the trie and
-            // validate that forall Uri u, at most one UriTemplate is a best match for u
-            rootNode = UriTemplateTrieNode.Make(this.templates, allowDuplicateEquivalentUriTemplates);
-        }
-        [Conditional("DEBUG")]
-        void VerifyThatFastPathAndSlowPathHaveSameResults(Uri uri, Collection<string> fastPathRelativePathSegments,
-            IList<UriTemplateTableMatchCandidate> fastPathCandidates)
-        {
-            Collection<string> slowPathRelativePathSegments = new Collection<string>();
-            List<UriTemplateTableMatchCandidate> slowPathCandidates = new List<UriTemplateTableMatchCandidate>();
-            if (!SlowComputeRelativeSegmentsAndLookup(uri, UriTemplateHelpers.GetUriPath(uri),
-                slowPathRelativePathSegments, slowPathCandidates))
-            {
-                Fx.Assert("fast path yielded a result but slow path yielded no result");
-            }
-            // compare results
-            if (fastPathRelativePathSegments.Count != slowPathRelativePathSegments.Count)
-            {
-                Fx.Assert("fast path yielded different number of segments from slow path");
-            }
-            for (int i = 0; i < fastPathRelativePathSegments.Count; ++i)
-            {
-                if (fastPathRelativePathSegments[i] != slowPathRelativePathSegments[i])
-                {
-                    Fx.Assert("fast path yielded different segments from slow path");
-                }
-            }
-            if (fastPathCandidates.Count != slowPathCandidates.Count)
-            {
-                Fx.Assert("fast path yielded different number of candidates from slow path");
-            }
-            for (int i = 0; i < fastPathCandidates.Count; i++)
-            {
-                if (!slowPathCandidates.Contains(fastPathCandidates[i]))
-                {
-                    Fx.Assert("fast path yielded different candidates from slow path");
-                }
-            }
-        }
-
-        class FastPathInfo
-        {
-            FreezableCollection<UriTemplateTableMatchCandidate> candidates;
-            FreezableCollection<string> relativePathSegments;
-
-            public FastPathInfo()
-            {
-                this.relativePathSegments = new FreezableCollection<string>();
-                this.candidates = new FreezableCollection<UriTemplateTableMatchCandidate>();
-            }
-            public Collection<UriTemplateTableMatchCandidate> Candidates
-            {
-                get
-                {
-                    return this.candidates;
-                }
-            }
-
-            public Collection<string> RelativePathSegments
-            {
-                get
-                {
-                    return this.relativePathSegments;
-                }
-            }
-
-            public void Freeze()
-            {
-                this.relativePathSegments.Freeze();
-                this.candidates.Freeze();
-            }
-        }
-
-        class UriTemplatesCollection : FreezableCollection<KeyValuePair<UriTemplate, object>>
-        {
-            public UriTemplatesCollection()
-                : base()
-            {
-            }
-            [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors", Justification = "This is a private class; virtual methods cannot be overriden")]
-            public UriTemplatesCollection(IEnumerable<KeyValuePair<UriTemplate, object>> keyValuePairs)
-                : base()
-            {
-                foreach (KeyValuePair<UriTemplate, object> kvp in keyValuePairs)
-                {
-                    ThrowIfInvalid(kvp.Key, "keyValuePairs");
-                    base.Add(kvp);
-                }
-            }
-
-            protected override void InsertItem(int index, KeyValuePair<UriTemplate, object> item)
-            {
-                ThrowIfInvalid(item.Key, "item");
-                base.InsertItem(index, item);
-            }
-            protected override void SetItem(int index, KeyValuePair<UriTemplate, object> item)
-            {
-                ThrowIfInvalid(item.Key, "item");
-                base.SetItem(index, item);
-            }
-
-            static void ThrowIfInvalid(UriTemplate template, string argName)
-            {
-                if (template == null)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument(argName,
-                        SR.GetString(SR.UTTNullTemplateKey));
-                }
-                if (template.IgnoreTrailingSlash)
-                {
-                    throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument(argName,
-                        SR.GetString(SR.UTTInvalidTemplateKey, template));
-                }
-            }
-        }
-    }
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateTableMatchCandidate.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateTableMatchCandidate.cs
deleted file mode 100644
index 0be734d0de6..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateTableMatchCandidate.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-//----------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//----------------------------------------------------------------
-
-namespace System
-{
-    struct UriTemplateTableMatchCandidate
-    {
-        readonly object data;
-        readonly int segmentsCount;
-        readonly UriTemplate template;
-
-        public UriTemplateTableMatchCandidate(UriTemplate template, int segmentsCount, object data)
-        {
-            this.template = template;
-            this.segmentsCount = segmentsCount;
-            this.data = data;
-        }
-        public object Data
-        {
-            get
-            {
-                return this.data;
-            }
-        }
-        public int SegmentsCount
-        {
-            get
-            {
-                return this.segmentsCount;
-            }
-        }
-
-        public UriTemplate Template
-        {
-            get
-            {
-                return this.template;
-            }
-        }
-    }
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateTrieIntraNodeLocation.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateTrieIntraNodeLocation.cs
deleted file mode 100644
index 061e53c19aa..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateTrieIntraNodeLocation.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-//----------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//----------------------------------------------------------------
-
-namespace System
-{
-    enum UriTemplateTrieIntraNodeLocation
-    {
-        BeforeLiteral,
-        AfterLiteral,
-        AfterCompound,
-        AfterVariable,
-    }
-
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateTrieLocation.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateTrieLocation.cs
deleted file mode 100644
index 2d8a3a14c8c..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateTrieLocation.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-//----------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//----------------------------------------------------------------
-
-namespace System
-{
-    class UriTemplateTrieLocation
-    {
-        public UriTemplateTrieIntraNodeLocation locationWithin;
-        public UriTemplateTrieNode node;
-        public UriTemplateTrieLocation(UriTemplateTrieNode n, UriTemplateTrieIntraNodeLocation i)
-        {
-            this.node = n;
-            this.locationWithin = i;
-        }
-    }
-
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateTrieNode.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateTrieNode.cs
deleted file mode 100644
index c1d6ebb9bbe..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateTrieNode.cs
+++ /dev/null
@@ -1,806 +0,0 @@
-//----------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//----------------------------------------------------------------
-
-namespace System
-{
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.Runtime;
-    using System.ServiceModel;
-
-    class UriTemplateTrieNode
-    {
-        int depth; // relative segment depth (root = 0)
-        UriTemplatePathPartiallyEquivalentSet endOfPath; // matches the non-existent segment at the end of a slash-terminated path
-        AscendingSortedCompoundSegmentsCollection<UriTemplatePathPartiallyEquivalentSet> finalCompoundSegment; // matches e.g. "{var}.{var}"
-        Dictionary<UriTemplateLiteralPathSegment, UriTemplatePathPartiallyEquivalentSet> finalLiteralSegment; // matches e.g. "segmentThatDoesntEndInSlash"
-        UriTemplatePathPartiallyEquivalentSet finalVariableSegment; // matches e.g. "{var}"
-        AscendingSortedCompoundSegmentsCollection<UriTemplateTrieLocation> nextCompoundSegment; // all are AfterLiteral; matches e.g. "{var}.{var}/"
-        Dictionary<UriTemplateLiteralPathSegment, UriTemplateTrieLocation> nextLiteralSegment; // all are BeforeLiteral; matches e.g. "path/"
-        UriTemplateTrieLocation nextVariableSegment; // is BeforeLiteral; matches e.g. "{var}/"
-        UriTemplateTrieLocation onFailure; // points to parent, at 'after me'
-        UriTemplatePathPartiallyEquivalentSet star; // matches any "extra/path/segments" at the end
-
-        UriTemplateTrieNode(int depth)
-        {
-            this.depth = depth;
-            this.nextLiteralSegment = null;
-            this.nextCompoundSegment = null;
-            this.finalLiteralSegment = null;
-            this.finalCompoundSegment = null;
-            this.finalVariableSegment = new UriTemplatePathPartiallyEquivalentSet(depth + 1);
-            this.star = new UriTemplatePathPartiallyEquivalentSet(depth);
-            this.endOfPath = new UriTemplatePathPartiallyEquivalentSet(depth);
-        }
-
-        public static UriTemplateTrieNode Make(IEnumerable<KeyValuePair<UriTemplate, object>> keyValuePairs,
-            bool allowDuplicateEquivalentUriTemplates)
-        {
-            // given a UTT at MakeReadOnly time, build the trie
-            // note that root.onFailure == null;
-            UriTemplateTrieNode root = new UriTemplateTrieNode(0);
-            foreach (KeyValuePair<UriTemplate, object> kvp in keyValuePairs)
-            {
-                Add(root, kvp);
-            }
-            Validate(root, allowDuplicateEquivalentUriTemplates);
-            return root;
-        }
-
-        public bool Match(UriTemplateLiteralPathSegment[] wireData, ICollection<UriTemplateTableMatchCandidate> candidates)
-        {
-            UriTemplateTrieLocation currentLocation = new UriTemplateTrieLocation(this, UriTemplateTrieIntraNodeLocation.BeforeLiteral);
-            return GetMatch(currentLocation, wireData, candidates);
-        }
-
-        static void Add(UriTemplateTrieNode root, KeyValuePair<UriTemplate, object> kvp)
-        {
-            // Currently UTT doesn't support teplates with ignoreTrailingSlash == true; thus we
-            //  don't care about supporting it in the trie as well.
-            UriTemplateTrieNode current = root;
-            UriTemplate ut = kvp.Key;
-            bool needProcessingOnFinalNode = ((ut.segments.Count == 0) || ut.HasWildcard ||
-                ut.segments[ut.segments.Count - 1].EndsWithSlash);
-            for (int i = 0; i < ut.segments.Count; ++i)
-            {
-                if (i >= ut.firstOptionalSegment)
-                {
-                    current.endOfPath.Items.Add(kvp);
-                }
-                UriTemplatePathSegment ps = ut.segments[i];
-                if (!ps.EndsWithSlash)
-                {
-                    Fx.Assert(i == ut.segments.Count - 1, "only the last segment can !EndsWithSlash");
-                    Fx.Assert(!ut.HasWildcard, "path star cannot have !EndsWithSlash");
-                    switch (ps.Nature)
-                    {
-                        case UriTemplatePartType.Literal:
-                            current.AddFinalLiteralSegment(ps as UriTemplateLiteralPathSegment, kvp);
-                            break;
-
-                        case UriTemplatePartType.Compound:
-                            current.AddFinalCompoundSegment(ps as UriTemplateCompoundPathSegment, kvp);
-                            break;
-
-                        case UriTemplatePartType.Variable:
-                            current.finalVariableSegment.Items.Add(kvp);
-                            break;
-
-                        default:
-                            Fx.Assert("Invalid value as PathSegment.Nature");
-                            break;
-                    }
-                }
-                else
-                {
-                    Fx.Assert(ps.EndsWithSlash, "ps.EndsWithSlash");
-                    switch (ps.Nature)
-                    {
-                        case UriTemplatePartType.Literal:
-                            current = current.AddNextLiteralSegment(ps as UriTemplateLiteralPathSegment);
-                            break;
-
-                        case UriTemplatePartType.Compound:
-                            current = current.AddNextCompoundSegment(ps as UriTemplateCompoundPathSegment);
-                            break;
-
-                        case UriTemplatePartType.Variable:
-                            current = current.AddNextVariableSegment();
-                            break;
-
-                        default:
-                            Fx.Assert("Invalid value as PathSegment.Nature");
-                            break;
-                    }
-                }
-            }
-            if (needProcessingOnFinalNode)
-            {
-                // if the last segment ended in a slash, there is still more to do
-                if (ut.HasWildcard)
-                {
-                    // e.g. "path1/path2/*"
-                    current.star.Items.Add(kvp);
-                }
-                else
-                {
-                    // e.g. "path1/path2/"
-                    current.endOfPath.Items.Add(kvp);
-                }
-            }
-        }
-
-        static bool CheckMultipleMatches(IList<IList<UriTemplateTrieLocation>> locationsSet, UriTemplateLiteralPathSegment[] wireData,
-            ICollection<UriTemplateTableMatchCandidate> candidates)
-        {
-            bool result = false;
-            for (int i = 0; ((i < locationsSet.Count) && !result); i++)
-            {
-                for (int j = 0; j < locationsSet[i].Count; j++)
-                {
-                    if (GetMatch(locationsSet[i][j], wireData, candidates))
-                    {
-                        result = true;
-                    }
-                }
-            }
-            return result;
-        }
-        static bool GetMatch(UriTemplateTrieLocation location, UriTemplateLiteralPathSegment[] wireData,
-            ICollection<UriTemplateTableMatchCandidate> candidates)
-        {
-            int initialDepth = location.node.depth;
-            SingleLocationOrLocationsSet nextStep;
-            UriTemplatePathPartiallyEquivalentSet answer;
-            do
-            {
-                if (TryMatch(wireData, location, out answer, out nextStep))
-                {
-                    if (answer != null)
-                    {
-                        for (int i = 0; i < answer.Items.Count; i++)
-                        {
-                            candidates.Add(new UriTemplateTableMatchCandidate(answer.Items[i].Key, answer.SegmentsCount,
-                                answer.Items[i].Value));
-                        }
-                    }
-                    return true;
-                }
-                if (nextStep.IsSingle)
-                {
-                    location = nextStep.SingleLocation;
-                }
-                else
-                {
-                    Fx.Assert(nextStep.LocationsSet != null, "This should be set to a valid value by TryMatch");
-                    if (CheckMultipleMatches(nextStep.LocationsSet, wireData, candidates))
-                    {
-                        return true;
-                    }
-                    location = GetFailureLocationFromLocationsSet(nextStep.LocationsSet);
-                }
-            } while ((location != null) && (location.node.depth >= initialDepth));
-
-            // we walked the whole trie down and found nothing
-            return false;
-        }
-        static bool TryMatch(UriTemplateLiteralPathSegment[] wireUriSegments, UriTemplateTrieLocation currentLocation,
-            out UriTemplatePathPartiallyEquivalentSet success, out SingleLocationOrLocationsSet nextStep)
-        {
-            // if returns true, success is set to answer
-            // if returns false, nextStep is set to next place to look
-            success = null;
-            nextStep = new SingleLocationOrLocationsSet();
-
-            if (wireUriSegments.Length <= currentLocation.node.depth)
-            {
-                Fx.Assert(wireUriSegments.Length == 0 || wireUriSegments[wireUriSegments.Length - 1].EndsWithSlash,
-                    "we should not have traversed this deep into the trie unless the wire path ended in a slash");
-
-                if (currentLocation.node.endOfPath.Items.Count != 0)
-                {
-                    // exact match of e.g. "path1/path2/"
-                    success = currentLocation.node.endOfPath;
-                    return true;
-                }
-                else if (currentLocation.node.star.Items.Count != 0)
-                {
-                    // inexact match of e.g. WIRE("path1/path2/") against TEMPLATE("path1/path2/*")
-                    success = currentLocation.node.star;
-                    return true;
-                }
-                else
-                {
-                    nextStep = new SingleLocationOrLocationsSet(currentLocation.node.onFailure);
-                    return false;
-                }
-            }
-            else
-            {
-                UriTemplateLiteralPathSegment curWireSeg = wireUriSegments[currentLocation.node.depth];
-                bool considerLiteral = false;
-                bool considerCompound = false;
-                bool considerVariable = false;
-                bool considerStar = false;
-                switch (currentLocation.locationWithin)
-                {
-                    case UriTemplateTrieIntraNodeLocation.BeforeLiteral:
-                        considerLiteral = true;
-                        considerCompound = true;
-                        considerVariable = true;
-                        considerStar = true;
-                        break;
-                    case UriTemplateTrieIntraNodeLocation.AfterLiteral:
-                        considerLiteral = false;
-                        considerCompound = true;
-                        considerVariable = true;
-                        considerStar = true;
-                        break;
-                    case UriTemplateTrieIntraNodeLocation.AfterCompound:
-                        considerLiteral = false;
-                        considerCompound = false;
-                        considerVariable = true;
-                        considerStar = true;
-                        break;
-                    case UriTemplateTrieIntraNodeLocation.AfterVariable:
-                        considerLiteral = false;
-                        considerCompound = false;
-                        considerVariable = false;
-                        considerStar = true;
-                        break;
-                    default:
-                        Fx.Assert("bad kind");
-                        break;
-                }
-                if (curWireSeg.EndsWithSlash)
-                {
-                    IList<IList<UriTemplateTrieLocation>> compoundLocationsSet;
-
-                    if (considerLiteral && currentLocation.node.nextLiteralSegment != null &&
-                        currentLocation.node.nextLiteralSegment.ContainsKey(curWireSeg))
-                    {
-                        nextStep = new SingleLocationOrLocationsSet(currentLocation.node.nextLiteralSegment[curWireSeg]);
-                        return false;
-                    }
-                    else if (considerCompound && currentLocation.node.nextCompoundSegment != null &&
-                        AscendingSortedCompoundSegmentsCollection<UriTemplateTrieLocation>.Lookup(currentLocation.node.nextCompoundSegment, curWireSeg, out compoundLocationsSet))
-                    {
-                        nextStep = new SingleLocationOrLocationsSet(compoundLocationsSet);
-                        return false;
-                    }
-                    else if (considerVariable && currentLocation.node.nextVariableSegment != null &&
-                        !curWireSeg.IsNullOrEmpty())
-                    {
-                        nextStep = new SingleLocationOrLocationsSet(currentLocation.node.nextVariableSegment);
-                        return false;
-                    }
-                    else if (considerStar && currentLocation.node.star.Items.Count != 0)
-                    {
-                        // matches e.g. WIRE("path1/path2/path3") and TEMPLATE("path1/*")
-                        success = currentLocation.node.star;
-                        return true;
-                    }
-                    else
-                    {
-                        nextStep = new SingleLocationOrLocationsSet(currentLocation.node.onFailure);
-                        return false;
-                    }
-                }
-                else
-                {
-                    IList<IList<UriTemplatePathPartiallyEquivalentSet>> compoundPathEquivalentSets;
-
-                    Fx.Assert(!curWireSeg.EndsWithSlash, "!curWireSeg.EndsWithSlash");
-                    Fx.Assert(!curWireSeg.IsNullOrEmpty(), "!curWireSeg.IsNullOrEmpty()");
-                    if (considerLiteral && currentLocation.node.finalLiteralSegment != null &&
-                        currentLocation.node.finalLiteralSegment.ContainsKey(curWireSeg))
-                    {
-                        // matches e.g. WIRE("path1/path2") and TEMPLATE("path1/path2")
-                        success = currentLocation.node.finalLiteralSegment[curWireSeg];
-                        return true;
-                    }
-                    else if (considerCompound && currentLocation.node.finalCompoundSegment != null &&
-                        AscendingSortedCompoundSegmentsCollection<UriTemplatePathPartiallyEquivalentSet>.Lookup(currentLocation.node.finalCompoundSegment, curWireSeg, out compoundPathEquivalentSets))
-                    {
-                        // matches e.g. WIRE("path1/path2") and TEMPLATE("path1/p{var}th2")
-                        // we should take only the highest order match!
-                        Fx.Assert(compoundPathEquivalentSets.Count >= 1, "Lookup is expected to return false otherwise");
-                        Fx.Assert(compoundPathEquivalentSets[0].Count > 0, "Find shouldn't return empty sublists");
-                        if (compoundPathEquivalentSets[0].Count == 1)
-                        {
-                            success = compoundPathEquivalentSets[0][0];
-                        }
-                        else
-                        {
-                            success = new UriTemplatePathPartiallyEquivalentSet(currentLocation.node.depth + 1);
-                            for (int i = 0; i < compoundPathEquivalentSets[0].Count; i++)
-                            {
-                                success.Items.AddRange(compoundPathEquivalentSets[0][i].Items);
-                            }
-                        }
-                        return true;
-                    }
-                    else if (considerVariable && currentLocation.node.finalVariableSegment.Items.Count != 0)
-                    {
-                        // matches e.g. WIRE("path1/path2") and TEMPLATE("path1/{var}")
-                        success = currentLocation.node.finalVariableSegment;
-                        return true;
-                    }
-                    else if (considerStar && currentLocation.node.star.Items.Count != 0)
-                    {
-                        // matches e.g. WIRE("path1/path2") and TEMPLATE("path1/*")
-                        success = currentLocation.node.star;
-                        return true;
-                    }
-                    else
-                    {
-                        nextStep = new SingleLocationOrLocationsSet(currentLocation.node.onFailure);
-                        return false;
-                    }
-                }
-            }
-        }
-
-        static UriTemplateTrieLocation GetFailureLocationFromLocationsSet(IList<IList<UriTemplateTrieLocation>> locationsSet)
-        {
-            Fx.Assert(locationsSet != null, "Shouldn't be called on null set");
-            Fx.Assert(locationsSet.Count > 0, "Shouldn't be called on empty set");
-            Fx.Assert(locationsSet[0] != null, "Shouldn't be called on a set with null sub-lists");
-            Fx.Assert(locationsSet[0].Count > 0, "Shouldn't be called on a set with empty sub-lists");
-
-            return locationsSet[0][0].node.onFailure;
-        }
-
-        static void Validate(UriTemplateTrieNode root, bool allowDuplicateEquivalentUriTemplates)
-        {
-            // walk the entire tree, and ensure that each PathEquivalentSet is ok (no ambiguous queries),
-            // verify thst compound segments didn't add potentialy multiple matchs;
-            // also Assert various data-structure invariants
-            Queue<UriTemplateTrieNode> nodesQueue = new Queue<UriTemplateTrieNode>();
-
-            UriTemplateTrieNode current = root;
-            while (true)
-            {
-                // validate all the PathEquivalentSets that live in this node
-                Validate(current.endOfPath, allowDuplicateEquivalentUriTemplates);
-                Validate(current.finalVariableSegment, allowDuplicateEquivalentUriTemplates);
-                Validate(current.star, allowDuplicateEquivalentUriTemplates);
-                if (current.finalLiteralSegment != null)
-                {
-                    foreach (KeyValuePair<UriTemplateLiteralPathSegment, UriTemplatePathPartiallyEquivalentSet> kvp in current.finalLiteralSegment)
-                    {
-                        Validate(kvp.Value, allowDuplicateEquivalentUriTemplates);
-                    }
-                }
-                if (current.finalCompoundSegment != null)
-                {
-                    IList<IList<UriTemplatePathPartiallyEquivalentSet>> pesLists = current.finalCompoundSegment.Values;
-                    for (int i = 0; i < pesLists.Count; i++)
-                    {
-                        if (!allowDuplicateEquivalentUriTemplates && (pesLists[i].Count > 1))
-                        {
-                            throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
-                                SR.UTTDuplicate, pesLists[i][0].Items[0].Key.ToString(), pesLists[i][1].Items[0].Key.ToString())));
-                        }
-                        for (int j = 0; j < pesLists[i].Count; j++)
-                        {
-                            Validate(pesLists[i][j], allowDuplicateEquivalentUriTemplates);
-                        }
-                    }
-                }
-                // deal with children of this node
-                if (current.nextLiteralSegment != null)
-                {
-                    foreach (KeyValuePair<UriTemplateLiteralPathSegment, UriTemplateTrieLocation> kvp in current.nextLiteralSegment)
-                    {
-                        Fx.Assert(kvp.Value.locationWithin == UriTemplateTrieIntraNodeLocation.BeforeLiteral, "forward-pointers should always point to a BeforeLiteral location");
-                        Fx.Assert(kvp.Value.node.depth == current.depth + 1, "kvp.Value.node.depth == current.depth + 1");
-                        Fx.Assert(kvp.Value.node.onFailure.node == current, "back pointer should point back to here");
-                        Fx.Assert(kvp.Value.node.onFailure.locationWithin == UriTemplateTrieIntraNodeLocation.AfterLiteral, "back-pointer should be AfterLiteral");
-                        nodesQueue.Enqueue(kvp.Value.node);
-                    }
-                }
-                if (current.nextCompoundSegment != null)
-                {
-                    IList<IList<UriTemplateTrieLocation>> locations = current.nextCompoundSegment.Values;
-                    for (int i = 0; i < locations.Count; i++)
-                    {
-                        if (!allowDuplicateEquivalentUriTemplates && (locations[i].Count > 1))
-                        {
-                            // In the future we might ease up the restrictions and verify if there is realy
-                            // a potential multiple match here; for now we are throwing.
-                            UriTemplate firstTemplate = FindAnyUriTemplate(locations[i][0].node);
-                            UriTemplate secondTemplate = FindAnyUriTemplate(locations[i][1].node);
-                            throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
-                                SR.UTTDuplicate, firstTemplate.ToString(), secondTemplate.ToString())));
-                        }
-                        for (int j = 0; j < locations[i].Count; j++)
-                        {
-                            UriTemplateTrieLocation location = locations[i][j];
-                            Fx.Assert(location.locationWithin == UriTemplateTrieIntraNodeLocation.BeforeLiteral, "forward-pointers should always point to a BeforeLiteral location");
-                            Fx.Assert(location.node.depth == current.depth + 1, "kvp.Value.node.depth == current.depth + 1");
-                            Fx.Assert(location.node.onFailure.node == current, "back pointer should point back to here");
-                            Fx.Assert(location.node.onFailure.locationWithin == UriTemplateTrieIntraNodeLocation.AfterCompound, "back-pointer should be AfterCompound");
-                            nodesQueue.Enqueue(location.node);
-                        }
-                    }
-                }
-                if (current.nextVariableSegment != null)
-                {
-                    Fx.Assert(current.nextVariableSegment.locationWithin == UriTemplateTrieIntraNodeLocation.BeforeLiteral, "forward-pointers should always point to a BeforeLiteral location");
-                    Fx.Assert(current.nextVariableSegment.node.depth == current.depth + 1, "current.nextVariableSegment.node.depth == current.depth + 1");
-                    Fx.Assert(current.nextVariableSegment.node.onFailure.node == current, "back pointer should point back to here");
-                    Fx.Assert(current.nextVariableSegment.node.onFailure.locationWithin == UriTemplateTrieIntraNodeLocation.AfterVariable, "back-pointer should be AfterVariable");
-                    nodesQueue.Enqueue(current.nextVariableSegment.node);
-                }
-                // move on to next bit of work
-                if (nodesQueue.Count == 0)
-                {
-                    break;
-                }
-                current = nodesQueue.Dequeue();
-            }
-        }
-        static void Validate(UriTemplatePathPartiallyEquivalentSet pes, bool allowDuplicateEquivalentUriTemplates)
-        {
-            // A set with 0 or 1 items is valid by definition
-            if (pes.Items.Count < 2)
-            {
-                return;
-            }
-            // Assert all paths are partially-equivalent
-            for (int i = 0; i < pes.Items.Count - 1; ++i)
-            {
-                Fx.Assert(pes.Items[i].Key.IsPathPartiallyEquivalentAt(pes.Items[i + 1].Key, pes.SegmentsCount),
-                    "all elements of a PES must be path partially-equivalent");
-            }
-            // We will check that the queries disambiguate only for templates, which are
-            //  matched completely at the segments count; templates, which are match at
-            //  that point due to terminal defaults, will be ruled out.
-            UriTemplate[] a = new UriTemplate[pes.Items.Count];
-            int arrayIndex = 0;
-            foreach (KeyValuePair<UriTemplate, object> kvp in pes.Items)
-            {
-                if (pes.SegmentsCount < kvp.Key.segments.Count)
-                {
-                    continue;
-                }
-                Fx.Assert(arrayIndex < a.Length, "We made enough room for all the items");
-                a[arrayIndex++] = kvp.Key;
-            }
-            // Ensure that queries disambiguate (if needed) :
-            if (arrayIndex > 0)
-            {
-                UriTemplateHelpers.DisambiguateSamePath(a, 0, arrayIndex, allowDuplicateEquivalentUriTemplates);
-            }
-        }
-
-        static UriTemplate FindAnyUriTemplate(UriTemplateTrieNode node)
-        {
-            while (node != null)
-            {
-                if (node.endOfPath.Items.Count > 0)
-                {
-                    return node.endOfPath.Items[0].Key;
-                }
-                if (node.finalVariableSegment.Items.Count > 0)
-                {
-                    return node.finalVariableSegment.Items[0].Key;
-                }
-                if (node.star.Items.Count > 0)
-                {
-                    return node.star.Items[0].Key;
-                }
-                if (node.finalLiteralSegment != null)
-                {
-                    UriTemplatePathPartiallyEquivalentSet pes =
-                        GetAnyDictionaryValue<UriTemplatePathPartiallyEquivalentSet>(node.finalLiteralSegment);
-                    Fx.Assert(pes.Items.Count > 0, "Otherwise, why creating the dictionary?");
-                    return pes.Items[0].Key;
-                }
-                if (node.finalCompoundSegment != null)
-                {
-                    UriTemplatePathPartiallyEquivalentSet pes = node.finalCompoundSegment.GetAnyValue();
-                    Fx.Assert(pes.Items.Count > 0, "Otherwise, why creating the collection?");
-                    return pes.Items[0].Key;
-                }
-
-                if (node.nextLiteralSegment != null)
-                {
-                    UriTemplateTrieLocation location =
-                        GetAnyDictionaryValue<UriTemplateTrieLocation>(node.nextLiteralSegment);
-                    node = location.node;
-                }
-                else if (node.nextCompoundSegment != null)
-                {
-                    UriTemplateTrieLocation location = node.nextCompoundSegment.GetAnyValue();
-                    node = location.node;
-                }
-                else if (node.nextVariableSegment != null)
-                {
-                    node = node.nextVariableSegment.node;
-                }
-                else
-                {
-                    node = null;
-                }
-            }
-            Fx.Assert("How did we got here without finding a UriTemplate earlier?");
-            return null;
-        }
-        static T GetAnyDictionaryValue<T>(IDictionary<UriTemplateLiteralPathSegment, T> dictionary)
-        {
-            using (IEnumerator<T> valuesEnumerator = dictionary.Values.GetEnumerator())
-            {
-                valuesEnumerator.MoveNext();
-                return valuesEnumerator.Current;
-            }
-        }
-
-        void AddFinalCompoundSegment(UriTemplateCompoundPathSegment cps, KeyValuePair<UriTemplate, object> kvp)
-        {
-            Fx.Assert(cps != null, "must be - based on the segment nature");
-            if (this.finalCompoundSegment == null)
-            {
-                this.finalCompoundSegment = new AscendingSortedCompoundSegmentsCollection<UriTemplatePathPartiallyEquivalentSet>();
-            }
-            UriTemplatePathPartiallyEquivalentSet pes = this.finalCompoundSegment.Find(cps);
-            if (pes == null)
-            {
-                pes = new UriTemplatePathPartiallyEquivalentSet(this.depth + 1);
-                this.finalCompoundSegment.Add(cps, pes);
-            }
-            pes.Items.Add(kvp);
-        }
-        void AddFinalLiteralSegment(UriTemplateLiteralPathSegment lps, KeyValuePair<UriTemplate, object> kvp)
-        {
-            Fx.Assert(lps != null, "must be - based on the segment nature");
-            if (this.finalLiteralSegment != null && this.finalLiteralSegment.ContainsKey(lps))
-            {
-                this.finalLiteralSegment[lps].Items.Add(kvp);
-            }
-            else
-            {
-                if (this.finalLiteralSegment == null)
-                {
-                    this.finalLiteralSegment = new Dictionary<UriTemplateLiteralPathSegment, UriTemplatePathPartiallyEquivalentSet>();
-                }
-                UriTemplatePathPartiallyEquivalentSet pes = new UriTemplatePathPartiallyEquivalentSet(this.depth + 1);
-                pes.Items.Add(kvp);
-                this.finalLiteralSegment.Add(lps, pes);
-            }
-        }
-        UriTemplateTrieNode AddNextCompoundSegment(UriTemplateCompoundPathSegment cps)
-        {
-            Fx.Assert(cps != null, "must be - based on the segment nature");
-            if (this.nextCompoundSegment == null)
-            {
-                this.nextCompoundSegment = new AscendingSortedCompoundSegmentsCollection<UriTemplateTrieLocation>();
-            }
-            UriTemplateTrieLocation nextLocation = this.nextCompoundSegment.Find(cps);
-            if (nextLocation == null)
-            {
-                UriTemplateTrieNode nextNode = new UriTemplateTrieNode(this.depth + 1);
-                nextNode.onFailure = new UriTemplateTrieLocation(this, UriTemplateTrieIntraNodeLocation.AfterCompound);
-                nextLocation = new UriTemplateTrieLocation(nextNode, UriTemplateTrieIntraNodeLocation.BeforeLiteral);
-                this.nextCompoundSegment.Add(cps, nextLocation);
-            }
-            return nextLocation.node;
-        }
-        UriTemplateTrieNode AddNextLiteralSegment(UriTemplateLiteralPathSegment lps)
-        {
-            Fx.Assert(lps != null, "must be - based on the segment nature");
-            if (this.nextLiteralSegment != null && this.nextLiteralSegment.ContainsKey(lps))
-            {
-                return this.nextLiteralSegment[lps].node;
-            }
-            else
-            {
-                if (this.nextLiteralSegment == null)
-                {
-                    this.nextLiteralSegment = new Dictionary<UriTemplateLiteralPathSegment, UriTemplateTrieLocation>();
-                }
-                UriTemplateTrieNode newNode = new UriTemplateTrieNode(this.depth + 1);
-                newNode.onFailure = new UriTemplateTrieLocation(this, UriTemplateTrieIntraNodeLocation.AfterLiteral);
-                this.nextLiteralSegment.Add(lps, new UriTemplateTrieLocation(newNode, UriTemplateTrieIntraNodeLocation.BeforeLiteral));
-                return newNode;
-            }
-        }
-        UriTemplateTrieNode AddNextVariableSegment()
-        {
-            if (this.nextVariableSegment != null)
-            {
-                return this.nextVariableSegment.node;
-            }
-            else
-            {
-                UriTemplateTrieNode newNode = new UriTemplateTrieNode(this.depth + 1);
-                newNode.onFailure = new UriTemplateTrieLocation(this, UriTemplateTrieIntraNodeLocation.AfterVariable);
-                this.nextVariableSegment = new UriTemplateTrieLocation(newNode, UriTemplateTrieIntraNodeLocation.BeforeLiteral);
-                return newNode;
-            }
-        }
-
-        struct SingleLocationOrLocationsSet
-        {
-            readonly bool isSingle;
-            readonly IList<IList<UriTemplateTrieLocation>> locationsSet;
-            readonly UriTemplateTrieLocation singleLocation;
-
-            public SingleLocationOrLocationsSet(UriTemplateTrieLocation singleLocation)
-            {
-                this.isSingle = true;
-                this.singleLocation = singleLocation;
-                this.locationsSet = null;
-            }
-            public SingleLocationOrLocationsSet(IList<IList<UriTemplateTrieLocation>> locationsSet)
-            {
-                this.isSingle = false;
-                this.singleLocation = null;
-                this.locationsSet = locationsSet;
-            }
-
-            public bool IsSingle
-            {
-                get
-                {
-                    return this.isSingle;
-                }
-            }
-            public IList<IList<UriTemplateTrieLocation>> LocationsSet
-            {
-                get
-                {
-                    Fx.Assert(!this.isSingle, "!this.isSingle");
-                    return this.locationsSet;
-                }
-            }
-            public UriTemplateTrieLocation SingleLocation
-            {
-                get
-                {
-                    Fx.Assert(this.isSingle, "this.isSingle");
-                    return this.singleLocation;
-                }
-            }
-        }
-
-        class AscendingSortedCompoundSegmentsCollection<T>
-            where T : class
-        {
-            SortedList<UriTemplateCompoundPathSegment, Collection<CollectionItem>> items;
-
-            public AscendingSortedCompoundSegmentsCollection()
-            {
-                this.items = new SortedList<UriTemplateCompoundPathSegment, Collection<AscendingSortedCompoundSegmentsCollection<T>.CollectionItem>>();
-            }
-
-            public IList<IList<T>> Values
-            {
-                get
-                {
-                    IList<IList<T>> results = new List<IList<T>>(this.items.Count);
-                    for (int i = 0; i < this.items.Values.Count; i++)
-                    {
-                        results.Add(new List<T>(this.items.Values[i].Count));
-                        Fx.Assert(results.Count == i + 1, "We are adding item for each values collection");
-                        for (int j = 0; j < this.items.Values[i].Count; j++)
-                        {
-                            results[i].Add(this.items.Values[i][j].Value);
-                            Fx.Assert(results[i].Count == j + 1, "We are adding item for each value in the collection");
-                        }
-                        Fx.Assert(results[i].Count == this.items.Values[i].Count, "We were supposed to add an item for each value in the collection");
-                    }
-                    Fx.Assert(results.Count == this.items.Values.Count, "We were supposed to add a sub-list for each values collection");
-                    return results;
-                }
-            }
-
-            public void Add(UriTemplateCompoundPathSegment segment, T value)
-            {
-                int index = this.items.IndexOfKey(segment);
-                if (index == -1)
-                {
-                    Collection<CollectionItem> subItems = new Collection<CollectionItem>();
-                    subItems.Add(new CollectionItem(segment, value));
-                    this.items.Add(segment, subItems);
-                }
-                else
-                {
-                    Collection<CollectionItem> subItems = this.items.Values[index];
-                    subItems.Add(new CollectionItem(segment, value));
-                }
-            }
-
-            public T Find(UriTemplateCompoundPathSegment segment)
-            {
-                int index = this.items.IndexOfKey(segment);
-                if (index == -1)
-                {
-                    return null;
-                }
-                Collection<CollectionItem> subItems = this.items.Values[index];
-                for (int i = 0; i < subItems.Count; i++)
-                {
-                    if (subItems[i].Segment.IsEquivalentTo(segment, false))
-                    {
-                        return subItems[i].Value;
-                    }
-                }
-                return null;
-            }
-            public IList<IList<T>> Find(UriTemplateLiteralPathSegment wireData)
-            {
-                IList<IList<T>> results = new List<IList<T>>();
-                for (int i = 0; i < this.items.Values.Count; i++)
-                {
-                    List<T> sameOrderResults = null;
-                    for (int j = 0; j < this.items.Values[i].Count; j++)
-                    {
-                        if (this.items.Values[i][j].Segment.IsMatch(wireData))
-                        {
-                            if (sameOrderResults == null)
-                            {
-                                sameOrderResults = new List<T>();
-                            }
-                            sameOrderResults.Add(this.items.Values[i][j].Value);
-                        }
-                    }
-                    if (sameOrderResults != null)
-                    {
-                        results.Add(sameOrderResults);
-                    }
-                }
-                return results;
-            }
-
-            public T GetAnyValue()
-            {
-                if (this.items.Values.Count > 0)
-                {
-                    Fx.Assert(this.items.Values[0].Count > 0, "We are not adding a sub-list unless there is at list one item");
-                    return this.items.Values[0][0].Value;
-                }
-                else
-                {
-                    return null;
-                }
-            }
-
-            public static bool Lookup(AscendingSortedCompoundSegmentsCollection<T> collection,
-                UriTemplateLiteralPathSegment wireData, out IList<IList<T>> results)
-            {
-                results = collection.Find(wireData);
-                return ((results != null) && (results.Count > 0));
-            }
-
-            struct CollectionItem
-            {
-                UriTemplateCompoundPathSegment segment;
-                T value;
-
-                public CollectionItem(UriTemplateCompoundPathSegment segment, T value)
-                {
-                    this.segment = segment;
-                    this.value = value;
-                }
-
-                public UriTemplateCompoundPathSegment Segment
-                {
-                    get
-                    {
-                        return this.segment;
-                    }
-                }
-                public T Value
-                {
-                    get
-                    {
-                        return this.value;
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateVariablePathSegment.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateVariablePathSegment.cs
deleted file mode 100644
index c2f643355db..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateVariablePathSegment.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-//----------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//----------------------------------------------------------------
-
-namespace System
-{
-    using System.Collections.Specialized;
-    using System.Runtime;
-    using System.Text;
-
-    class UriTemplateVariablePathSegment : UriTemplatePathSegment
-    {
-        readonly string varName;
-
-        public UriTemplateVariablePathSegment(string originalSegment, bool endsWithSlash, string varName)
-            : base(originalSegment, UriTemplatePartType.Variable, endsWithSlash)
-        {
-            Fx.Assert(!string.IsNullOrEmpty(varName), "bad variable segment");
-            this.varName = varName;
-        }
-
-        public string VarName
-        {
-            get
-            {
-                return this.varName;
-            }
-        }
-        public override void Bind(string[] values, ref int valueIndex, StringBuilder path)
-        {
-            Fx.Assert(valueIndex < values.Length, "Not enough values to bind");
-            if (this.EndsWithSlash)
-            {
-                path.AppendFormat("{0}/", values[valueIndex++]);
-            }
-            else
-            {
-                path.Append(values[valueIndex++]);
-            }
-        }
-
-        public override bool IsEquivalentTo(UriTemplatePathSegment other, bool ignoreTrailingSlash)
-        {
-            if (other == null)
-            {
-                Fx.Assert("why would we ever call this?");
-                return false;
-            }
-            if (!ignoreTrailingSlash && (this.EndsWithSlash != other.EndsWithSlash))
-            {
-                return false;
-            }
-            return (other.Nature == UriTemplatePartType.Variable);
-        }
-        public override bool IsMatch(UriTemplateLiteralPathSegment segment, bool ignoreTrailingSlash)
-        {
-            if (!ignoreTrailingSlash && (this.EndsWithSlash != segment.EndsWithSlash))
-            {
-                return false;
-            }
-            return (!segment.IsNullOrEmpty());
-        }
-        public override void Lookup(string segment, NameValueCollection boundParameters)
-        {
-            Fx.Assert(!string.IsNullOrEmpty(segment), "How can that be? Lookup is expected to be called after IsMatch");
-            boundParameters.Add(this.varName, segment);
-        }
-    }
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateVariableQueryValue.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateVariableQueryValue.cs
deleted file mode 100644
index 9e98e3edfdb..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/UriTemplateVariableQueryValue.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-//----------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//----------------------------------------------------------------
-
-namespace System
-{
-    using System.Collections.Specialized;
-    using System.Runtime;
-    using System.ServiceModel.Channels;
-    using System.Text;
-
-    class UriTemplateVariableQueryValue : UriTemplateQueryValue
-    {
-        readonly string varName;
-
-        public UriTemplateVariableQueryValue(string varName)
-            : base(UriTemplatePartType.Variable)
-        {
-            Fx.Assert(!string.IsNullOrEmpty(varName), "bad variable segment");
-            this.varName = varName;
-        }
-        public override void Bind(string keyName, string[] values, ref int valueIndex, StringBuilder query)
-        {
-            Fx.Assert(valueIndex < values.Length, "Not enough values to bind");
-            if (values[valueIndex] == null)
-            {
-                valueIndex++;
-            }
-            else
-            {
-                query.AppendFormat("&{0}={1}", UrlUtility.UrlEncode(keyName, Encoding.UTF8), UrlUtility.UrlEncode(values[valueIndex++], Encoding.UTF8));
-            }
-        }
-
-        public override bool IsEquivalentTo(UriTemplateQueryValue other)
-        {
-            if (other == null)
-            {
-                Fx.Assert("why would we ever call this?");
-                return false;
-            }
-            return (other.Nature == UriTemplatePartType.Variable);
-        }
-        public override void Lookup(string value, NameValueCollection boundParameters)
-        {
-            boundParameters.Add(this.varName, value);
-        }
-    }
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/stubs/DiagnosticUtility.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/stubs/DiagnosticUtility.cs
deleted file mode 100644
index 16482ec637d..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/stubs/DiagnosticUtility.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-
-namespace System.ServiceModel {
-	internal sealed class DiagnosticUtility {
-		internal sealed class ExceptionUtility {
-			internal static Exception ThrowHelperArgumentNull(string paramName) {
-				throw new ArgumentNullException(paramName);
-			}
-
-			internal static Exception ThrowHelperArgument(string paramName, string message) {
-				throw new ArgumentException(message, paramName);
-			}
-
-			internal static Exception ThrowHelperError(Exception exception) {
-				throw exception;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/stubs/Fx.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/stubs/Fx.cs
deleted file mode 100644
index 760dd57271e..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/stubs/Fx.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Diagnostics;
-
-namespace System.Runtime {
-	internal sealed class Fx {
-		internal static void Assert(bool condition, string message) {
-			Debug.Assert(condition, message);
-		}
-
-		internal static void Assert(string message) {
-			Debug.Assert(false, message);
-		}
-
-		internal static class Exception {
-			public static System.Exception ArgumentNull(string paramName) {
-				throw new ArgumentNullException(paramName);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/stubs/SR.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/stubs/SR.cs
deleted file mode 100644
index 9c94e1f70cf..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/stubs/SR.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-namespace System.ServiceModel
-{
-	using System.Globalization;
-    using System.Resources;
-    using System.Threading;
-
-    internal sealed class SR
-    {
-	    internal const string BindUriTemplateToNullOrEmptyPathParam = "BindUriTemplateToNullOrEmptyPathParam";
-	    internal const string ObjectIsReadOnly = "ObjectIsReadOnly";
-        internal const string UTAdditionalDefaultIsInvalid = "UTAdditionalDefaultIsInvalid";
-        internal const string UTBadBaseAddress = "UTBadBaseAddress";
-        internal const string UTBindByNameCalledWithEmptyKey = "UTBindByNameCalledWithEmptyKey";
-        internal const string UTBindByPositionNoVariables = "UTBindByPositionNoVariables";
-        internal const string UTBindByPositionWrongCount = "UTBindByPositionWrongCount";
-        internal const string UTBothLiteralAndNameValueCollectionKey = "UTBothLiteralAndNameValueCollectionKey";
-        internal const string UTCSRLookupBeforeMatch = "UTCSRLookupBeforeMatch";
-        internal const string UTDefaultValuesAreImmutable = "UTDefaultValuesAreImmutable";
-        internal const string UTDefaultValueToCompoundSegmentVar = "UTDefaultValueToCompoundSegmentVar";
-        internal const string UTDefaultValueToCompoundSegmentVarFromAdditionalDefaults = "UTDefaultValueToCompoundSegmentVarFromAdditionalDefaults";
-        internal const string UTDefaultValueToQueryVar = "UTDefaultValueToQueryVar";
-        internal const string UTDefaultValueToQueryVarFromAdditionalDefaults = "UTDefaultValueToQueryVarFromAdditionalDefaults";
-        internal const string UTDoesNotSupportAdjacentVarsInCompoundSegment = "UTDoesNotSupportAdjacentVarsInCompoundSegment";
-        internal const string UTInvalidDefaultPathValue = "UTInvalidDefaultPathValue";
-        internal const string UTInvalidFormatSegmentOrQueryPart = "UTInvalidFormatSegmentOrQueryPart";
-        internal const string UTInvalidVarDeclaration = "UTInvalidVarDeclaration";
-        internal const string UTInvalidWildcardInVariableOrLiteral = "UTInvalidWildcardInVariableOrLiteral";
-        internal const string UTNullableDefaultAtAdditionalDefaults = "UTNullableDefaultAtAdditionalDefaults";
-        internal const string UTNullableDefaultMustBeFollowedWithNullables = "UTNullableDefaultMustBeFollowedWithNullables";
-        internal const string UTNullableDefaultMustNotBeFollowedWithLiteral = "UTNullableDefaultMustNotBeFollowedWithLiteral";
-        internal const string UTNullableDefaultMustNotBeFollowedWithWildcard = "UTNullableDefaultMustNotBeFollowedWithWildcard";
-        internal const string UTQueryCannotEndInAmpersand = "UTQueryCannotEndInAmpersand";
-        internal const string UTQueryCannotHaveCompoundValue = "UTQueryCannotHaveCompoundValue";
-        internal const string UTQueryCannotHaveEmptyName = "UTQueryCannotHaveEmptyName";
-        internal const string UTQueryMustHaveLiteralNames = "UTQueryMustHaveLiteralNames";
-        internal const string UTQueryNamesMustBeUnique = "UTQueryNamesMustBeUnique";
-        internal const string UTStarVariableWithDefaults = "UTStarVariableWithDefaults";
-        internal const string UTStarVariableWithDefaultsFromAdditionalDefaults = "UTStarVariableWithDefaultsFromAdditionalDefaults";
-        internal const string UTTAmbiguousQueries = "UTTAmbiguousQueries";
-        internal const string UTTBaseAddressMustBeAbsolute = "UTTBaseAddressMustBeAbsolute";
-        internal const string UTTBaseAddressNotSet = "UTTBaseAddressNotSet";
-        internal const string UTTCannotChangeBaseAddress = "UTTCannotChangeBaseAddress";
-        internal const string UTTDuplicate = "UTTDuplicate";
-        internal const string UTTEmptyKeyValuePairs = "UTTEmptyKeyValuePairs";
-        internal const string UTTInvalidTemplateKey = "UTTInvalidTemplateKey";
-        internal const string UTTMultipleMatches = "UTTMultipleMatches";
-        internal const string UTTMustBeAbsolute = "UTTMustBeAbsolute";
-        internal const string UTTNullTemplateKey = "UTTNullTemplateKey";
-        internal const string UTTOtherAmbiguousQueries = "UTTOtherAmbiguousQueries";
-        internal const string UTVarNamesMustBeUnique = "UTVarNamesMustBeUnique";
-
-        private ResourceManager resources;
-        private static System.ServiceModel.SR loader;
-
-        internal SR()
-        {
-            this.resources = new ResourceManager("System.ServiceModel", base.GetType().Assembly);
-        }
-
-        private static System.ServiceModel.SR GetLoader()
-        {
-            if (loader == null)
-            {
-                System.ServiceModel.SR sr = new System.ServiceModel.SR();
-                Interlocked.CompareExchange<System.ServiceModel.SR>(ref loader, sr, null);
-            }
-            return loader;
-        }
-
-        public static object GetObject(string name)
-        {
-            System.ServiceModel.SR loader = GetLoader();
-            if (loader == null)
-            {
-                return null;
-            }
-            return loader.resources.GetObject(name, Culture);
-        }
-
-        public static string GetString(string name)
-        {
-            System.ServiceModel.SR loader = GetLoader();
-            if (loader == null)
-            {
-                return null;
-            }
-            return loader.resources.GetString(name, Culture);
-        }
-
-        public static string GetString(string name, params object[] args)
-        {
-            System.ServiceModel.SR loader = GetLoader();
-            if (loader == null)
-            {
-                return null;
-            }
-            string format = loader.resources.GetString(name, Culture);
-            if ((args == null) || (args.Length <= 0))
-            {
-                return format;
-            }
-            for (int i = 0; i < args.Length; i++)
-            {
-                string str2 = args[i] as string;
-                if ((str2 != null) && (str2.Length > 0x400))
-                {
-                    args[i] = str2.Substring(0, 0x3fd) + "...";
-                }
-            }
-            return string.Format(CultureInfo.CurrentCulture, format, args);
-        }
-
-        public static string GetString(string name, out bool usedFallback)
-        {
-            usedFallback = false;
-            return GetString(name);
-        }
-
-        private static CultureInfo Culture
-        {
-            get
-            {
-                return null;
-            }
-        }
-
-        public static ResourceManager Resources
-        {
-            get
-            {
-                return GetLoader().resources;
-            }
-        }
-    }
-}
diff --git a/src/EventStore.NETCore.Compatibility/System.UriTemplate/stubs/UrlUtility.cs b/src/EventStore.NETCore.Compatibility/System.UriTemplate/stubs/UrlUtility.cs
deleted file mode 100644
index 2f3782dbb29..00000000000
--- a/src/EventStore.NETCore.Compatibility/System.UriTemplate/stubs/UrlUtility.cs
+++ /dev/null
@@ -1,629 +0,0 @@
-//------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//------------------------------------------------------------
-
-namespace System.Runtime
-{
-    using System.Collections;
-    using System.Collections.Specialized;
-    using System.Runtime.Serialization;
-    using System.Text;
-
-    //copied from System.Web.HttpUtility code (renamed here) to remove dependency on System.Web.dll
-    internal sealed class UrlUtility
-    {
-        //  Query string parsing support
-        public static NameValueCollection ParseQueryString(string query)
-        {
-            return ParseQueryString(query, Encoding.UTF8);
-        }
-
-        public static NameValueCollection ParseQueryString(string query, Encoding encoding)
-        {
-            if (query == null)
-            {
-                throw Fx.Exception.ArgumentNull("query");
-            }
-
-            if (encoding == null)
-            {
-                throw Fx.Exception.ArgumentNull("encoding");
-            }
-
-            if (query.Length > 0 && query[0] == '?')
-            {
-                query = query.Substring(1);
-            }
-
-            return new HttpValueCollection(query, encoding);
-        }
-
-        public static string UrlEncode(string str)
-        {
-            if (str == null)
-            {
-                return null;
-            }
-            return UrlEncode(str, Encoding.UTF8);
-        }
-
-        // URL encodes a path portion of a URL string and returns the encoded string.
-        public static string UrlPathEncode(string str)
-        {
-            if (str == null)
-            {
-                return null;
-            }
-
-            // recurse in case there is a query string
-            int i = str.IndexOf('?');
-            if (i >= 0)
-            {
-                return UrlPathEncode(str.Substring(0, i)) + str.Substring(i);
-            }
-
-            // encode DBCS characters and spaces only
-            return UrlEncodeSpaces(UrlEncodeNonAscii(str, Encoding.UTF8));
-        }
-
-        public static string UrlEncode(string str, Encoding encoding)
-        {
-            if (str == null)
-            {
-                return null;
-            }
-            return Encoding.ASCII.GetString(UrlEncodeToBytes(str, encoding));
-        }
-
-        public static string UrlEncodeUnicode(string str)
-        {
-            if (str == null)
-                return null;
-            return UrlEncodeUnicodeStringToStringInternal(str, false);
-
-        }
-
-        private static string UrlEncodeUnicodeStringToStringInternal(string s, bool ignoreAscii)
-        {
-            int l = s.Length;
-            StringBuilder sb = new StringBuilder(l);
-
-            for (int i = 0; i < l; i++)
-            {
-                char ch = s[i];
-
-                if ((ch & 0xff80) == 0)
-                {  // 7 bit?
-                    if (ignoreAscii || IsSafe(ch))
-                    {
-                        sb.Append(ch);
-                    }
-                    else if (ch == ' ')
-                    {
-                        sb.Append('+');
-                    }
-                    else
-                    {
-                        sb.Append('%');
-                        sb.Append(IntToHex((ch >> 4) & 0xf));
-                        sb.Append(IntToHex((ch) & 0xf));
-                    }
-                }
-                else
-                { // arbitrary Unicode?
-                    sb.Append("%u");
-                    sb.Append(IntToHex((ch >> 12) & 0xf));
-                    sb.Append(IntToHex((ch >> 8) & 0xf));
-                    sb.Append(IntToHex((ch >> 4) & 0xf));
-                    sb.Append(IntToHex((ch) & 0xf));
-                }
-            }
-
-            return sb.ToString();
-        }
-
-        //  Helper to encode the non-ASCII url characters only
-        static string UrlEncodeNonAscii(string str, Encoding e)
-        {
-            if (string.IsNullOrEmpty(str))
-            {
-                return str;
-            }
-            if (e == null)
-            {
-                e = Encoding.UTF8;
-            }
-            byte[] bytes = e.GetBytes(str);
-            bytes = UrlEncodeBytesToBytesInternalNonAscii(bytes, 0, bytes.Length, false);
-            return Encoding.ASCII.GetString(bytes);
-        }
-
-        //  Helper to encode spaces only
-        static string UrlEncodeSpaces(string str)
-        {
-            if (str != null && str.IndexOf(' ') >= 0)
-            {
-                str = str.Replace(" ", "%20");
-            }
-            return str;
-        }
-
-        public static byte[] UrlEncodeToBytes(string str, Encoding e)
-        {
-            if (str == null)
-            {
-                return null;
-            }
-            byte[] bytes = e.GetBytes(str);
-            return UrlEncodeBytesToBytesInternal(bytes, 0, bytes.Length, false);
-        }
-
-        //public static string UrlDecode(string str)
-        //{
-        //    if (str == null)
-        //        return null;
-        //    return UrlDecode(str, Encoding.UTF8);
-        //}
-
-        public static string UrlDecode(string str, Encoding e)
-        {
-            if (str == null)
-            {
-                return null;
-            }
-            return UrlDecodeStringFromStringInternal(str, e);
-        }
-
-        //  Implementation for encoding
-        static byte[] UrlEncodeBytesToBytesInternal(byte[] bytes, int offset, int count, bool alwaysCreateReturnValue)
-        {
-            int cSpaces = 0;
-            int cUnsafe = 0;
-
-            // count them first
-            for (int i = 0; i < count; i++)
-            {
-                char ch = (char)bytes[offset + i];
-
-                if (ch == ' ')
-                {
-                    cSpaces++;
-                }
-                else if (!IsSafe(ch))
-                {
-                    cUnsafe++;
-                }
-            }
-
-            // nothing to expand?
-            if (!alwaysCreateReturnValue && cSpaces == 0 && cUnsafe == 0)
-            {
-                return bytes;
-            }
-
-            // expand not 'safe' characters into %XX, spaces to +s
-            byte[] expandedBytes = new byte[count + cUnsafe * 2];
-            int pos = 0;
-
-            for (int i = 0; i < count; i++)
-            {
-                byte b = bytes[offset + i];
-                char ch = (char)b;
-
-                if (IsSafe(ch))
-                {
-                    expandedBytes[pos++] = b;
-                }
-                else if (ch == ' ')
-                {
-                    expandedBytes[pos++] = (byte)'+';
-                }
-                else
-                {
-                    expandedBytes[pos++] = (byte)'%';
-                    expandedBytes[pos++] = (byte)IntToHex((b >> 4) & 0xf);
-                    expandedBytes[pos++] = (byte)IntToHex(b & 0x0f);
-                }
-            }
-
-            return expandedBytes;
-        }
-
-
-        static bool IsNonAsciiByte(byte b)
-        {
-            return (b >= 0x7F || b < 0x20);
-        }
-
-        static byte[] UrlEncodeBytesToBytesInternalNonAscii(byte[] bytes, int offset, int count, bool alwaysCreateReturnValue)
-        {
-            int cNonAscii = 0;
-
-            // count them first
-            for (int i = 0; i < count; i++)
-            {
-                if (IsNonAsciiByte(bytes[offset + i]))
-                {
-                    cNonAscii++;
-                }
-            }
-
-            // nothing to expand?
-            if (!alwaysCreateReturnValue && cNonAscii == 0)
-            {
-                return bytes;
-            }
-
-            // expand not 'safe' characters into %XX, spaces to +s
-            byte[] expandedBytes = new byte[count + cNonAscii * 2];
-            int pos = 0;
-
-            for (int i = 0; i < count; i++)
-            {
-                byte b = bytes[offset + i];
-
-                if (IsNonAsciiByte(b))
-                {
-                    expandedBytes[pos++] = (byte)'%';
-                    expandedBytes[pos++] = (byte)IntToHex((b >> 4) & 0xf);
-                    expandedBytes[pos++] = (byte)IntToHex(b & 0x0f);
-                }
-                else
-                {
-                    expandedBytes[pos++] = b;
-                }
-            }
-
-            return expandedBytes;
-        }
-
-        static string UrlDecodeStringFromStringInternal(string s, Encoding e)
-        {
-            int count = s.Length;
-            UrlDecoder helper = new UrlDecoder(count, e);
-
-            // go through the string's chars collapsing %XX and %uXXXX and
-            // appending each char as char, with exception of %XX constructs
-            // that are appended as bytes
-
-            for (int pos = 0; pos < count; pos++)
-            {
-                char ch = s[pos];
-
-                if (ch == '+')
-                {
-                    ch = ' ';
-                }
-                else if (ch == '%' && pos < count - 2)
-                {
-                    if (s[pos + 1] == 'u' && pos < count - 5)
-                    {
-                        int h1 = HexToInt(s[pos + 2]);
-                        int h2 = HexToInt(s[pos + 3]);
-                        int h3 = HexToInt(s[pos + 4]);
-                        int h4 = HexToInt(s[pos + 5]);
-
-                        if (h1 >= 0 && h2 >= 0 && h3 >= 0 && h4 >= 0)
-                        {   // valid 4 hex chars
-                            ch = (char)((h1 << 12) | (h2 << 8) | (h3 << 4) | h4);
-                            pos += 5;
-
-                            // only add as char
-                            helper.AddChar(ch);
-                            continue;
-                        }
-                    }
-                    else
-                    {
-                        int h1 = HexToInt(s[pos + 1]);
-                        int h2 = HexToInt(s[pos + 2]);
-
-                        if (h1 >= 0 && h2 >= 0)
-                        {     // valid 2 hex chars
-                            byte b = (byte)((h1 << 4) | h2);
-                            pos += 2;
-
-                            // don't add as char
-                            helper.AddByte(b);
-                            continue;
-                        }
-                    }
-                }
-
-                if ((ch & 0xFF80) == 0)
-                {
-                    helper.AddByte((byte)ch); // 7 bit have to go as bytes because of Unicode
-                }
-                else
-                {
-                    helper.AddChar(ch);
-                }
-            }
-
-            return helper.GetString();
-        }
-
-        // Private helpers for URL encoding/decoding
-        static int HexToInt(char h)
-        {
-            return (h >= '0' && h <= '9') ? h - '0' :
-            (h >= 'a' && h <= 'f') ? h - 'a' + 10 :
-            (h >= 'A' && h <= 'F') ? h - 'A' + 10 :
-            -1;
-        }
-
-        static char IntToHex(int n)
-        {
-            //WCF CHANGE: CHANGED FROM Debug.Assert() to Fx.Assert()
-            Fx.Assert(n < 0x10, "n < 0x10");
-
-            if (n <= 9)
-            {
-                return (char)(n + (int)'0');
-            }
-            else
-            {
-                return (char)(n - 10 + (int)'a');
-            }
-        }
-
-        // Set of safe chars, from RFC 1738.4 minus '+'
-        internal static bool IsSafe(char ch)
-        {
-            if (ch >= 'a' && ch <= 'z' || ch >= 'A' && ch <= 'Z' || ch >= '0' && ch <= '9')
-            {
-                return true;
-            }
-
-            switch (ch)
-            {
-                case '-':
-                case '_':
-                case '.':
-                case '!':
-                case '*':
-                case '\'':
-                case '(':
-                case ')':
-                    return true;
-            }
-
-            return false;
-        }
-
-        // Internal class to facilitate URL decoding -- keeps char buffer and byte buffer, allows appending of either chars or bytes
-        class UrlDecoder
-        {
-            int _bufferSize;
-
-            // Accumulate characters in a special array
-            int _numChars;
-            char[] _charBuffer;
-
-            // Accumulate bytes for decoding into characters in a special array
-            int _numBytes;
-            byte[] _byteBuffer;
-
-            // Encoding to convert chars to bytes
-            Encoding _encoding;
-
-            void FlushBytes()
-            {
-                if (_numBytes > 0)
-                {
-                    _numChars += _encoding.GetChars(_byteBuffer, 0, _numBytes, _charBuffer, _numChars);
-                    _numBytes = 0;
-                }
-            }
-
-            internal UrlDecoder(int bufferSize, Encoding encoding)
-            {
-                _bufferSize = bufferSize;
-                _encoding = encoding;
-
-                _charBuffer = new char[bufferSize];
-                // byte buffer created on demand
-            }
-
-            internal void AddChar(char ch)
-            {
-                if (_numBytes > 0)
-                {
-                    FlushBytes();
-                }
-
-                _charBuffer[_numChars++] = ch;
-            }
-
-            internal void AddByte(byte b)
-            {
-                // if there are no pending bytes treat 7 bit bytes as characters
-                // this optimization is temp disable as it doesn't work for some encodings
-
-                //if (_numBytes == 0 && ((b & 0x80) == 0)) {
-                //    AddChar((char)b);
-                //}
-                //else
-
-                {
-                    if (_byteBuffer == null)
-                    {
-                        _byteBuffer = new byte[_bufferSize];
-                    }
-
-                    _byteBuffer[_numBytes++] = b;
-                }
-            }
-
-            internal string GetString()
-            {
-                if (_numBytes > 0)
-                {
-                    FlushBytes();
-                }
-
-                if (_numChars > 0)
-                {
-                    return new String(_charBuffer, 0, _numChars);
-                }
-                else
-                {
-                    return string.Empty;
-                }
-            }
-        }
-
-        [Serializable]
-        class HttpValueCollection : NameValueCollection
-        {
-            internal HttpValueCollection(string str, Encoding encoding)
-                : base(StringComparer.OrdinalIgnoreCase)
-            {
-                if (!string.IsNullOrEmpty(str))
-                {
-                    FillFromString(str, true, encoding);
-                }
-
-                IsReadOnly = false;
-            }
-
-            internal void FillFromString(string s, bool urlencoded, Encoding encoding)
-            {
-                int l = (s != null) ? s.Length : 0;
-                int i = 0;
-
-                while (i < l)
-                {
-                    // find next & while noting first = on the way (and if there are more)
-
-                    int si = i;
-                    int ti = -1;
-
-                    while (i < l)
-                    {
-                        char ch = s[i];
-
-                        if (ch == '=')
-                        {
-                            if (ti < 0)
-                                ti = i;
-                        }
-                        else if (ch == '&')
-                        {
-                            break;
-                        }
-
-                        i++;
-                    }
-
-                    // extract the name / value pair
-
-                    string name = null;
-                    string value = null;
-
-                    if (ti >= 0)
-                    {
-                        name = s.Substring(si, ti - si);
-                        value = s.Substring(ti + 1, i - ti - 1);
-                    }
-                    else
-                    {
-                        value = s.Substring(si, i - si);
-                    }
-
-                    // add name / value pair to the collection
-
-                    if (urlencoded)
-                    {
-                        base.Add(
-                           UrlUtility.UrlDecode(name, encoding),
-                           UrlUtility.UrlDecode(value, encoding));
-                    }
-                    else
-                    {
-                        base.Add(name, value);
-                    }
-
-                    // trailing '&'
-
-                    if (i == l - 1 && s[i] == '&')
-                    {
-                        base.Add(null, string.Empty);
-                    }
-
-                    i++;
-                }
-            }
-
-            public override string ToString()
-            {
-                return ToString(true, null);
-            }
-
-            string ToString(bool urlencoded, IDictionary excludeKeys)
-            {
-                int n = Count;
-                if (n == 0)
-                    return string.Empty;
-
-                StringBuilder s = new StringBuilder();
-                string key, keyPrefix, item;
-
-                for (int i = 0; i < n; i++)
-                {
-                    key = GetKey(i);
-
-                    if (excludeKeys != null && key != null && excludeKeys[key] != null)
-                    {
-                        continue;
-                    }
-                    if (urlencoded)
-                    {
-                        key = UrlUtility.UrlEncodeUnicode(key);
-                    }
-                    keyPrefix = (!string.IsNullOrEmpty(key)) ? (key + "=") : string.Empty;
-
-                    ArrayList values = (ArrayList)BaseGet(i);
-                    int numValues = (values != null) ? values.Count : 0;
-
-                    if (s.Length > 0)
-                    {
-                        s.Append('&');
-                    }
-
-                    if (numValues == 1)
-                    {
-                        s.Append(keyPrefix);
-                        item = (string)values[0];
-                        if (urlencoded)
-                            item = UrlUtility.UrlEncodeUnicode(item);
-                        s.Append(item);
-                    }
-                    else if (numValues == 0)
-                    {
-                        s.Append(keyPrefix);
-                    }
-                    else
-                    {
-                        for (int j = 0; j < numValues; j++)
-                        {
-                            if (j > 0)
-                            {
-                                s.Append('&');
-                            }
-                            s.Append(keyPrefix);
-                            item = (string)values[j];
-                            if (urlencoded)
-                            {
-                                item = UrlUtility.UrlEncodeUnicode(item);
-                            }
-                            s.Append(item);
-                        }
-                    }
-                }
-
-                return s.ToString();
-            }
-        }
-    }
-}
diff --git a/src/EventStore.Native/EventStore.Native.csproj b/src/EventStore.Native/EventStore.Native.csproj
deleted file mode 100644
index 850a610b616..00000000000
--- a/src/EventStore.Native/EventStore.Native.csproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-	</PropertyGroup>
-	<ItemGroup>
-		<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
-	</ItemGroup>
-	<ItemGroup>
-	  <ProjectReference Include="..\EventStore.SystemRuntime\EventStore.SystemRuntime.csproj" />
-	</ItemGroup>
-</Project>
diff --git a/src/EventStore.Native/TransactionLog/Unbuffered/ExtendedFileOptions.cs b/src/EventStore.Native/TransactionLog/Unbuffered/ExtendedFileOptions.cs
deleted file mode 100644
index 29851ca9531..00000000000
--- a/src/EventStore.Native/TransactionLog/Unbuffered/ExtendedFileOptions.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-
-namespace EventStore.Core.TransactionLog.Unbuffered {
-	[Flags]
-	public enum ExtendedFileOptions {
-		NoBuffering = unchecked((int)0x20000000),
-		Overlapped = unchecked((int)0x40000000),
-		SequentialScan = unchecked((int)0x08000000),
-		WriteThrough = unchecked((int)0x80000000)
-	}
-}
diff --git a/src/EventStore.Native/TransactionLog/Unbuffered/INativeFile.cs b/src/EventStore.Native/TransactionLog/Unbuffered/INativeFile.cs
deleted file mode 100644
index 5d59d448545..00000000000
--- a/src/EventStore.Native/TransactionLog/Unbuffered/INativeFile.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.IO;
-using Microsoft.Win32.SafeHandles;
-
-namespace EventStore.Core.TransactionLog.Unbuffered {
-	public interface INativeFile {
-		uint GetDriveSectorSize(string path);
-		long GetPageSize(string path);
-		void SetFileSize(SafeFileHandle handle, long count);
-		unsafe void Write(SafeFileHandle handle, byte* buffer, uint count, ref int written);
-		unsafe int Read(SafeFileHandle handle, byte* buffer, int offset, int count);
-		long GetFileSize(SafeFileHandle handle);
-		SafeFileHandle Create(string path, FileAccess acc, FileShare readWrite, FileMode mode, int flags);
-
-		SafeFileHandle CreateUnbufferedRW(string path, FileAccess acc, FileShare share, FileMode mode,
-			bool writeThrough);
-
-		void Seek(SafeFileHandle handle, long position, SeekOrigin origin);
-	}
-}
diff --git a/src/EventStore.Native/TransactionLog/Unbuffered/MacCaching.cs b/src/EventStore.Native/TransactionLog/Unbuffered/MacCaching.cs
deleted file mode 100644
index acc0f5dcb52..00000000000
--- a/src/EventStore.Native/TransactionLog/Unbuffered/MacCaching.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Runtime.InteropServices;
-using Microsoft.Win32.SafeHandles;
-using Mono.Unix;
-using RuntimeInformation = System.Runtime.RuntimeInformation;
-
-namespace EventStore.Core.TransactionLog.Unbuffered {
-	internal static class MacCaching {
-		// ReSharper disable once InconsistentNaming
-		private const uint MAC_F_NOCACHE = 48;
-
-		[DllImport("libc")]
-		static extern int fcntl(int fd, uint command, int arg);
-
-		public static void Disable(SafeFileHandle handle) {
-			if (!RuntimeInformation.IsOSX)
-                return;
-
-			long r;
-			do {
-				r = fcntl(handle.DangerousGetHandle().ToInt32(), MAC_F_NOCACHE, 1);
-			} while (UnixMarshal.ShouldRetrySyscall((int)r));
-
-			if (r == -1) {
-				UnixMarshal.ThrowExceptionForLastError();
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Native/TransactionLog/Unbuffered/NativeFileUnix.cs b/src/EventStore.Native/TransactionLog/Unbuffered/NativeFileUnix.cs
deleted file mode 100644
index 9a6080ab91b..00000000000
--- a/src/EventStore.Native/TransactionLog/Unbuffered/NativeFileUnix.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-using Microsoft.Win32.SafeHandles;
-using Mono.Unix;
-using Mono.Unix.Native;
-using System;
-using System.ComponentModel;
-using System.IO;
-using System.Runtime;
-
-namespace EventStore.Core.TransactionLog.Unbuffered {
-	public unsafe class NativeFileUnix : INativeFile {
-		public uint GetDriveSectorSize(string path) {
-			return 0;
-		}
-
-		public long GetPageSize(string path) {
-			int r;
-			do {
-				r = (int)Syscall.sysconf(SysconfName._SC_PAGESIZE);
-			} while (UnixMarshal.ShouldRetrySyscall(r));
-
-			UnixMarshal.ThrowExceptionForLastErrorIf(r);
-			return r;
-		}
-
-		public void SetFileSize(SafeFileHandle handle, long count) {
-			int r;
-			do {
-				r = Syscall.ftruncate(handle.DangerousGetHandle().ToInt32(), count);
-			} while (UnixMarshal.ShouldRetrySyscall(r));
-
-			UnixMarshal.ThrowExceptionForLastErrorIf(r);
-			FSync(handle);
-		}
-
-		private static void FSync(SafeFileHandle handle) {
-			Syscall.fsync(handle.DangerousGetHandle().ToInt32());
-		}
-
-		public void Write(SafeFileHandle handle, byte* buffer, uint count, ref int written) {
-			int ret;
-			do {
-				ret = (int)Syscall.write(handle.DangerousGetHandle().ToInt32(), buffer, count);
-			} while (UnixMarshal.ShouldRetrySyscall(ret));
-
-			if (ret == -1) {
-				UnixMarshal.ThrowExceptionForLastErrorIf(ret);
-			}
-
-			written = (int)count;
-		}
-
-		public int Read(SafeFileHandle handle, byte* buffer, int offset, int count) {
-			int r;
-			do {
-				r = (int)Syscall.read(handle.DangerousGetHandle().ToInt32(), buffer, (ulong)count);
-			} while (UnixMarshal.ShouldRetrySyscall(r));
-
-			if (r == -1) {
-				UnixMarshal.ThrowExceptionForLastError();
-			}
-
-			return count;
-		}
-
-		public long GetFileSize(SafeFileHandle handle) {
-			Stat s;
-			int r;
-			do {
-				r = Syscall.fstat(handle.DangerousGetHandle().ToInt32(), out s);
-			} while (UnixMarshal.ShouldRetrySyscall(r));
-
-			UnixMarshal.ThrowExceptionForLastErrorIf(r);
-			return s.st_size;
-		}
-
-		//TODO UNBUFF use FileAccess etc or do custom?
-		public SafeFileHandle Create(string path, FileAccess acc, FileShare readWrite, FileMode mode, int flags) {
-			//TODO convert flags or separate methods?
-			return new SafeFileHandle((IntPtr)0, true);
-		}
-
-
-		public SafeFileHandle CreateUnbufferedRW(string path, FileAccess acc, FileShare share, FileMode mode,
-			bool writeThrough) {
-			//O_RDONLY is 0
-			var direct = RuntimeInformation.IsOSX ? OpenFlags.O_RDONLY : OpenFlags.O_DIRECT;
-			var flags = GetFlags(acc, mode) | direct;
-			var han = Syscall.open(path, flags, FilePermissions.S_IRWXU);
-			if (han < 0) {
-				throw new Win32Exception();
-			}
-
-			var handle = new SafeFileHandle((IntPtr)han, true);
-			if (handle.IsInvalid) {
-				throw new Exception("Invalid handle");
-			}
-
-			MacCaching.Disable(handle);
-
-			return handle;
-		}
-
-		private static OpenFlags GetFlags(FileAccess acc, FileMode mode) {
-			var flags = OpenFlags.O_RDONLY; //RDONLY is 0
-			switch (acc) {
-				case FileAccess.Read:
-					flags |= OpenFlags.O_RDONLY;
-					break;
-				case FileAccess.Write:
-					flags |= OpenFlags.O_WRONLY;
-					break;
-				case FileAccess.ReadWrite:
-					flags |= OpenFlags.O_RDWR;
-					break;
-			}
-
-			switch (mode) {
-				case FileMode.Append:
-					flags |= OpenFlags.O_APPEND;
-					break;
-				case FileMode.Create:
-				case FileMode.CreateNew:
-					flags |= OpenFlags.O_CREAT;
-					break;
-				case FileMode.Truncate:
-					flags |= OpenFlags.O_TRUNC;
-					break;
-			}
-
-			return flags;
-		}
-
-		public void Seek(SafeFileHandle handle, long position, SeekOrigin origin) {
-			int r;
-			do {
-				r = (int)Syscall.lseek(handle.DangerousGetHandle().ToInt32(), position, SeekFlags.SEEK_SET);
-			} while (UnixMarshal.ShouldRetrySyscall(r));
-
-			UnixMarshal.ThrowExceptionForLastErrorIf(r);
-		}
-	}
-}
diff --git a/src/EventStore.Native/TransactionLog/Unbuffered/NativeFileWindows.cs b/src/EventStore.Native/TransactionLog/Unbuffered/NativeFileWindows.cs
deleted file mode 100644
index e543561b0c0..00000000000
--- a/src/EventStore.Native/TransactionLog/Unbuffered/NativeFileWindows.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.IO;
-using Microsoft.Win32.SafeHandles;
-
-namespace EventStore.Core.TransactionLog.Unbuffered {
-	public unsafe class NativeFileWindows : INativeFile {
-		public uint GetDriveSectorSize(string path) {
-			WinNative.GetDiskFreeSpace(Path.GetPathRoot(path), out _, out var size, out _, out _);
-			return size;
-		}
-
-		public long GetPageSize(string path) {
-			return GetDriveSectorSize(path);
-		}
-
-		public void SetFileSize(SafeFileHandle handle, long count) {
-			var low = (int)(count & 0xffffffff);
-			var high = (int)(count >> 32);
-			WinNative.SetFilePointer(handle, low, out high, WinNative.EMoveMethod.Begin);
-			if (!WinNative.SetEndOfFile(handle)) {
-				throw new Win32Exception();
-			}
-
-			FSync(handle);
-		}
-
-		private static void FSync(SafeFileHandle handle) {
-			WinNative.FlushFileBuffers(handle);
-		}
-
-		public void Write(SafeFileHandle handle, byte* buffer, uint count, ref int written) {
-			if (!WinNative.WriteFile(handle, buffer, count, ref written, IntPtr.Zero)) {
-				throw new Win32Exception();
-			}
-		}
-
-		public int Read(SafeFileHandle handle, byte* buffer, int offset, int count) {
-			var read = 0;
-
-			if (!WinNative.ReadFile(handle, buffer, count, ref read, 0)) {
-				throw new Win32Exception();
-			}
-
-			return read;
-		}
-
-		public long GetFileSize(SafeFileHandle handle) {
-			if (!WinNative.GetFileSizeEx(handle, out var size)) {
-				throw new Win32Exception();
-			}
-
-			return size;
-		}
-
-		//TODO UNBUFF use FileAccess etc or do custom?
-		public SafeFileHandle Create(string path, FileAccess acc, FileShare readWrite, FileMode mode, int flags) {
-			var handle = WinNative.CreateFile(path,
-				acc,
-				FileShare.ReadWrite,
-				IntPtr.Zero,
-				mode,
-				flags,
-				IntPtr.Zero);
-			if (handle.IsInvalid) {
-				throw new Win32Exception();
-			}
-
-			return handle;
-		}
-
-
-		public SafeFileHandle CreateUnbufferedRW(string path, FileAccess acc, FileShare share, FileMode mode,
-			bool writeThrough) {
-			var flags = ExtendedFileOptions.NoBuffering;
-			if (writeThrough) flags = flags | ExtendedFileOptions.WriteThrough;
-			var handle = WinNative.CreateFile(path,
-				acc,
-				share,
-				IntPtr.Zero,
-				FileMode.OpenOrCreate,
-				(int)flags,
-				IntPtr.Zero);
-			if (handle.IsInvalid) {
-				throw new Win32Exception();
-			}
-
-			return handle;
-		}
-
-		public void Seek(SafeFileHandle handle, long position, SeekOrigin origin) {
-			var low = (int)(position & 0xffffffff);
-			var high = (int)(position >> 32);
-			var f = WinNative.SetFilePointer(handle, low, out high, WinNative.EMoveMethod.Begin);
-			if (f == WinNative.INVALID_SET_FILE_POINTER) {
-				throw new Win32Exception();
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Native/TransactionLog/Unbuffered/WinNative.cs b/src/EventStore.Native/TransactionLog/Unbuffered/WinNative.cs
deleted file mode 100644
index ccd3aaedac0..00000000000
--- a/src/EventStore.Native/TransactionLog/Unbuffered/WinNative.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using System.IO;
-using System.Runtime.InteropServices;
-using Microsoft.Win32.SafeHandles;
-
-namespace EventStore.Core.TransactionLog.Unbuffered {
-	internal static unsafe class WinNative {
-		[DllImport("KERNEL32", SetLastError = true, CharSet = CharSet.Auto, BestFitMapping = false)]
-		public static extern bool GetDiskFreeSpace(string path,
-			out uint sectorsPerCluster,
-			out uint bytesPerSector,
-			out uint numberOfFreeClusters,
-			out uint totalNumberOfClusters);
-
-		[DllImport("kernel32.dll", SetLastError = true)]
-		internal static extern bool WriteFile(
-			SafeFileHandle hFile,
-			byte* aBuffer,
-			UInt32 cbToWrite,
-			ref int cbThatWereWritten,
-			IntPtr pOverlapped);
-
-		[DllImport("kernel32", SetLastError = true)]
-		public static extern bool ReadFile
-		(
-			SafeFileHandle hFile,
-			byte* pBuffer,
-			int numberOfBytesToRead,
-			ref int pNumberOfBytesRead,
-			int overlapped
-		);
-
-		[DllImport("kernel32.dll")]
-		public static extern bool GetFileSizeEx(SafeFileHandle hFile, out long lpFileSize);
-
-		[DllImport("kernel32.dll", SetLastError = true)]
-		internal static extern UInt32 SetFilePointer(
-			SafeFileHandle hFile,
-			Int32 cbDistanceToMove,
-			IntPtr pDistanceToMoveHigh,
-			EMoveMethod fMoveMethod);
-
-		[DllImport("KERNEL32", SetLastError = true, CharSet = CharSet.Auto, BestFitMapping = false)]
-		public static extern SafeFileHandle CreateFile(String fileName,
-			FileAccess desiredAccess,
-			FileShare shareMode,
-			IntPtr securityAttrs,
-			FileMode creationDisposition,
-			int flagsAndAttributes,
-			IntPtr templateFile);
-
-		public enum EMoveMethod : uint {
-			Begin = 0,
-			Current = 1,
-			End = 2
-		}
-
-		[DllImport("kernel32.dll", SetLastError = true)]
-		internal static extern bool SetEndOfFile(
-			SafeFileHandle hFile);
-
-		[DllImport("kernel32.dll", SetLastError = true)]
-		internal static extern bool FlushFileBuffers(SafeFileHandle filehandle);
-
-		[DllImport("kernel32.dll", SetLastError = true)]
-		[return: MarshalAs(UnmanagedType.Bool)]
-		public static extern bool CloseHandle(IntPtr hObject);
-
-		[DllImport("Kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-		public static extern int SetFilePointer(SafeFileHandle handle, int lDistanceToMove,
-			out int lpDistanceToMoveHigh, EMoveMethod dwMoveMethod);
-
-		// ReSharper disable once InconsistentNaming
-		public const int INVALID_SET_FILE_POINTER = -1;
-	}
-}
diff --git a/src/EventStore.PluginHosting/PluginLoader.cs b/src/EventStore.PluginHosting/PluginLoader.cs
deleted file mode 100644
index 8c2f4e3580f..00000000000
--- a/src/EventStore.PluginHosting/PluginLoader.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.Loader;
-
-namespace EventStore.PluginHosting {
-	public sealed class PluginLoader : IDisposable {
-		private readonly DirectoryInfo _rootPluginDirectory;
-		private readonly PluginLoadContext[] _contexts;
-
-		private IEnumerable<DirectoryInfo> PluginDirectories {
-			get {
-				if (!_rootPluginDirectory.Exists) {
-					yield break;
-				}
-
-				yield return _rootPluginDirectory;
-				foreach (var pluginDirectory in _rootPluginDirectory.EnumerateDirectories()) {
-					yield return pluginDirectory;
-				}
-			}
-		}
-
-		public PluginLoader(DirectoryInfo rootPluginDirectory, Assembly shared = null) {
-			_rootPluginDirectory = rootPluginDirectory ?? throw new ArgumentNullException(nameof(rootPluginDirectory));
-			_contexts = PluginDirectories.Select(directory => new PluginLoadContext(directory, shared)).ToArray();
-		}
-
-		public IEnumerable<T> Load<T>() where T : class {
-			foreach (var loadContext in _contexts)
-				foreach (var assembly in loadContext.Assemblies)
-					foreach (var pluginType in assembly.GetExportedTypes())
-						if (typeof(T).IsAssignableFrom(pluginType) && !pluginType.IsAbstract && !pluginType.IsInterface)
-							yield return (T)Activator.CreateInstance(pluginType);
-		}
-
-		public void Dispose() {
-			foreach (var context in _contexts) {
-				context.Unload();
-			}
-		}
-
-		private class PluginLoadContext : AssemblyLoadContext {
-			private static readonly string[] Shared = {"Serilog", "YamlDotNet", "EventStore.Plugins"};
-			private readonly Assembly _shared;
-			private readonly AssemblyDependencyResolver _resolver;
-
-			public PluginLoadContext(DirectoryInfo directory, Assembly shared) : base(true) {
-				_resolver = new AssemblyDependencyResolver(directory.FullName);
-				foreach (var library in directory.GetFiles("*.dll")
-					.Where(file => !Shared.Contains(Path.GetFileNameWithoutExtension(file.Name)))) {
-					try {
-						LoadFromAssemblyPath(library.FullName);
-					} catch (BadImageFormatException) {
-						// We shouldn't be loading this dll. Ignore it
-					}
-				}
-				_shared = shared;
-			}
-
-			protected override Assembly Load(AssemblyName assemblyName) {
-				if (assemblyName.Name == _shared?.GetName().Name) {
-					// dont load the dependency at all, use this one from another context
-					return _shared;
-				}
-
-				var path = _resolver.ResolveAssemblyToPath(assemblyName);
-				if (path != null) {
-					// load the dependency into this context
-					return LoadFromAssemblyPath(path);
-				} else {
-					// load the dependency into the default context
-					return null;
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Javascript.Tests/Bus/SynchronousScheduler.cs b/src/EventStore.Projections.Core.Javascript.Tests/Bus/SynchronousScheduler.cs
deleted file mode 100644
index 483ecc527ab..00000000000
--- a/src/EventStore.Projections.Core.Javascript.Tests/Bus/SynchronousScheduler.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Core.Bus;
-
-public sealed class SynchronousScheduler(string name = "Test", bool watchSlowMsg = true) : InMemoryBus(name, watchSlowMsg), IPublisher {
-	public void Publish(Message msg) {
-		ArgumentNullException.ThrowIfNull(msg);
-
-		var task = DispatchAsync(msg, CancellationToken.None);
-		if (task.IsCompleted) {
-			task.GetAwaiter().GetResult();
-		} else {
-			var wrapperTask = task.AsTask();
-
-			try {
-				wrapperTask.Wait();
-			} catch (AggregateException e) when (e.InnerExceptions is [var innerEx]) {
-				throw innerEx;
-			} finally {
-				wrapperTask.Dispose();
-			}
-		}
-	}
-
-	ValueTask IAsyncHandle<Message>.HandleAsync(Message msg, CancellationToken token)
-		=> DispatchAsync(msg, token);
-}
diff --git a/src/EventStore.Projections.Core.Javascript.Tests/EventStore.Projections.Core.Javascript.Tests.csproj b/src/EventStore.Projections.Core.Javascript.Tests/EventStore.Projections.Core.Javascript.Tests.csproj
deleted file mode 100644
index ceee8acfc75..00000000000
--- a/src/EventStore.Projections.Core.Javascript.Tests/EventStore.Projections.Core.Javascript.Tests.csproj
+++ /dev/null
@@ -1,39 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<IsPackable>false</IsPackable>
-		<Nullable>enable</Nullable>
-	</PropertyGroup>
-	<ItemGroup>
-		<None Remove="Specs\account-balancer.js" />
-		<None Remove="Specs\account-closer.js" />
-		<None Remove="Specs\by-category-spec.json" />
-		<None Remove="Specs\by-category.js" />
-		<None Remove="Specs\event-data.js" />
-		<None Remove="Specs\event-data-spec.json" />
-	</ItemGroup>
-	<ItemGroup>
-		<EmbeddedResource Include="Specs\account-balancer.js" />
-		<EmbeddedResource Include="Specs\account-closer.js" />
-		<EmbeddedResource Include="Specs\by-category-spec.json" />
-		<EmbeddedResource Include="Specs\by-category.js" />
-		<EmbeddedResource Include="Specs\event-data.js" />
-		<EmbeddedResource Include="Specs\event-data-spec.json" />
-		<EmbeddedResource Include="Specs\account-spec.json" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-		<PackageReference Include="xunit" Version="2.6.1" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="6.0.0">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\EventStore.Projections.Core\EventStore.Projections.Core.csproj" />
-	</ItemGroup>
-</Project>
diff --git a/src/EventStore.Projections.Core.Javascript.Tests/Integration/MetadataSerializationTests.cs b/src/EventStore.Projections.Core.Javascript.Tests/Integration/MetadataSerializationTests.cs
deleted file mode 100644
index 3f613a45d70..00000000000
--- a/src/EventStore.Projections.Core.Javascript.Tests/Integration/MetadataSerializationTests.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using System;
-using System.Text.Json;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace EventStore.Projections.Core.Javascript.Tests.Integration {
-	public class MetadataSerializationTests : ProjectionRuntimeScenario {
-		[Fact]
-		public async Task CanHandleNulls() {
-			var notification = Notify("emitted-stream");
-
-
-			await WriteEvents("source-stream", ExpectedVersion.NoStream,
-				new Event(Guid.NewGuid(), "foo", true,
-					JsonSerializer.SerializeToUtf8Bytes(new object()), Array.Empty<byte>()));
-
-			var js = @"
-fromStream('source-stream').
-    when({
-        $any: function (s, e) {
-            emit('emitted-stream',
-			'event-type',
-			e,
-			{test:null});
-		}
-	});
-";
-			await SendProjectionMessage<ProjectionManagementMessage.Updated>(envelope =>
-				new ProjectionManagementMessage.Command.Post(envelope, ProjectionMode.Continuous,
-					"can-handle-null-metadata", ProjectionManagementMessage.RunAs.System, "js", js,
-					true, true, true,
-					false,
-					true));
-
-			await notification.WaitAsync(TestTimeout);
-			var events = await ReadStream("emitted-stream", 0);
-			var e = Assert.Single(events);
-			JsonDocument doc = JsonDocument.Parse(e.Event.Metadata);
-			Assert.True(doc.RootElement.TryGetProperty("test", out var prop));
-			Assert.Equal(JsonValueKind.Null, prop.ValueKind);
-		}
-
-		[Fact]
-		public async Task CanHandleEscapedMetadata() {
-			var notification = Notify("emitted-stream");
-
-			await WriteEvents("source-stream", ExpectedVersion.NoStream,
-				new Event(Guid.NewGuid(), "foo", true,
-					JsonSerializer.SerializeToUtf8Bytes(new object()), Array.Empty<byte>()));
-
-			var js = @"
-fromStream('source-stream').
-    when({
-        $any: function (s, e) {
-            emit('emitted-stream',
-			'event-type',
-			e,
-			{test:""\""some-data\""""});
-		}
-	});
-";
-			await SendProjectionMessage<ProjectionManagementMessage.Updated>(envelope =>
-				new ProjectionManagementMessage.Command.Post(envelope, ProjectionMode.Continuous,
-					"can-handle-null-metadata", ProjectionManagementMessage.RunAs.System, "js", js,
-					true, true, true,
-					false,
-					true));
-
-
-			await notification.WaitAsync(TestTimeout);
-			var events = await ReadStream("emitted-stream", 0);
-			var e = Assert.Single(events);
-			JsonDocument doc = JsonDocument.Parse(e.Event.Metadata);
-			Assert.True(doc.RootElement.TryGetProperty("test", out var prop));
-			Assert.Equal(JsonValueKind.String, prop.ValueKind);
-			Assert.Equal("\"some-data\"", prop.GetString());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Javascript.Tests/Integration/ProjectionRuntimeScenario.cs b/src/EventStore.Projections.Core.Javascript.Tests/Integration/ProjectionRuntimeScenario.cs
deleted file mode 100644
index 42fc9233f42..00000000000
--- a/src/EventStore.Projections.Core.Javascript.Tests/Integration/ProjectionRuntimeScenario.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Common.Options;
-using EventStore.Core;
-using EventStore.Core.Bus;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Services.Transport.Http;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Xunit.Abstractions;
-
-namespace EventStore.Projections.Core.Javascript.Tests.Integration
-{
-	public abstract class ProjectionRuntimeScenario: SubsystemScenario {
-		static readonly IConfiguration EmptyConfiguration = new ConfigurationBuilder().AddInMemoryCollection().Build();
-
-		protected ProjectionRuntimeScenario() : base(CreateRuntime, "$et", new CancellationTokenSource(System.Diagnostics.Debugger.IsAttached?5*60*1000: 5*1000).Token){
-
-		}
-
-		static (Action, IPublisher) CreateRuntime(SynchronousScheduler mainBus, IQueuedHandler mainQueue, ICheckpoint writerCheckpoint) {
-			var options = new ProjectionSubsystemOptions(3, ProjectionType.All, true, TimeSpan.FromMinutes(5), false, 500, 500);
-			var config = new TFChunkDbConfig("mem", new VersionedPatternFileNamingStrategy("mem", "chunk-"), 10000, 0, writerCheckpoint, new InMemoryCheckpoint(-1), new InMemoryCheckpoint(-1), new InMemoryCheckpoint(-1), new InMemoryCheckpoint(-1), new InMemoryCheckpoint(-1), new InMemoryCheckpoint(-1), new InMemoryCheckpoint(-1), true);
-			var db = new TFChunkDb(config);
-			var qs = new QueueStatsManager();
-			var timeProvider = new RealTimeProvider();
-			var ts = new TimerService(new TimerBasedScheduler(new RealTimer(), timeProvider));
-			var sc = new StandardComponents(db.Config, mainQueue, mainBus, ts, timeProvider, null, new IHttpService[] { }, mainBus, qs, new(), true);
-
-			var subsystem = new ProjectionsSubsystem(options);
-
-			var builder = WebApplication.CreateBuilder();
-			builder.Services.AddGrpc();
-			builder.Services.AddSingleton(sc);
-			subsystem.ConfigureServices(builder.Services, new ConfigurationBuilder().Build());
-
-			subsystem.ConfigureApplication(builder.Build().UseRouting(), EmptyConfiguration);
-			subsystem.Start();
-
-			return (() => {
-				subsystem.Stop();
-				db.Dispose();
-			}, subsystem.LeaderInputQueue);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Javascript.Tests/Integration/SubsystemScenario.cs b/src/EventStore.Projections.Core.Javascript.Tests/Integration/SubsystemScenario.cs
deleted file mode 100644
index d3cfce9d990..00000000000
--- a/src/EventStore.Projections.Core.Javascript.Tests/Integration/SubsystemScenario.cs
+++ /dev/null
@@ -1,339 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Security.Claims;
-using System.Text;
-using System.Threading;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace EventStore.Projections.Core.Javascript.Tests.Integration {
-	public abstract class SubsystemScenario  : IHandle<Message>, IAsyncLifetime {
-		private readonly Action _stop;
-		private readonly SynchronousScheduler _mainBus;
-		private readonly IQueuedHandler _mainQueue;
-
-		private readonly InMemoryCheckpoint _writerCheckpoint;
-		private readonly MiniStore _miniStore;
-		protected CancellationToken TestTimeout { get; }
-		private readonly Task _complete;
-		private readonly IPublisher _subsystemCommands;
-		private readonly Task _ready;
-		readonly ConcurrentDictionary<string, TaskCompletionSource<bool>> _notifications;
-
-		protected SubsystemScenario(Func<SynchronousScheduler, IQueuedHandler, ICheckpoint, (Action stopAction, IPublisher subsystemCommands)> createSubsystem, string readyStream, CancellationToken testTimeout) {
-			_mainBus = new SynchronousScheduler("main");
-			_mainQueue = new QueuedHandlerThreadPool(_mainBus, "bossQ", new QueueStatsManager(), new());
-			_writerCheckpoint = new InMemoryCheckpoint(0);
-			_miniStore = new MiniStore(_writerCheckpoint, _mainQueue);
-			TestTimeout = testTimeout;
-			_complete = _miniStore.NotifyAll(TestTimeout);
-			_notifications = new ConcurrentDictionary<string, TaskCompletionSource<bool>>();
-			_ready = Notify(readyStream);
-			_mainBus.Subscribe(this);
-			(_stop, _subsystemCommands) = createSubsystem(_mainBus, _mainQueue, _writerCheckpoint);
-		}
-
-		protected virtual void OnMainBusMessage(Message msg){}
-
-		public async Task InitializeAsync() {
-			var _ = _mainQueue.Start();
-			_mainQueue.Publish(new SystemMessage.SystemCoreReady());
-			_mainQueue.Publish(new SystemMessage.BecomeLeader(Guid.NewGuid()));
-			await _ready.WaitAsync(TestTimeout);
-		}
-
-		public async Task DisposeAsync() {
-			_miniStore.Complete();
-			await _complete;
-			_stop();
-			_mainQueue.Stop();
-		}
-
-		protected async Task<(long commitPosition, long nextRevision)> WriteEvents(string stream, long expectedRevision, params Event[] events) {
-			var responseEnvelope = new TellMeWhenItsDone(TestTimeout);
-			_mainQueue.Publish(new ClientMessage.WriteEvents(Guid.NewGuid(), Guid.NewGuid(),
-				responseEnvelope, false, stream, expectedRevision,
-				events, null, null));
-			var msg = await responseEnvelope.Task.WaitAsync(TestTimeout);
-			var resp = Assert.IsType<ClientMessage.WriteEventsCompleted>(msg);
-			Assert.Equal(OperationResult.Success, resp.Result);
-			return (resp.CommitPosition, resp.CurrentVersion);
-		}
-		protected async Task<IReadOnlyList<ResolvedEvent>> ReadStream(string stream, int from) {
-			var tmwid = new TellMeWhenItsDone(TestTimeout);
-			_mainQueue.Publish(new ClientMessage.ReadStreamEventsForward(Guid.NewGuid(),
-				Guid.NewGuid(), tmwid, stream, from, 100, true, false, null,
-				ClaimsPrincipal.Current, replyOnExpired: false, null, null));
-			var msg = await tmwid.Task.WaitAsync(TestTimeout);
-			var rr = Assert.IsType<ClientMessage.ReadStreamEventsForwardCompleted>(msg);
-			return rr.Events;
-		}
-
-		protected async Task<TResponse> SendProjectionMessage<TResponse>(Func<IEnvelope,
-			ProjectionManagementMessage.Command.ControlMessage> requestFactory)
-			where TResponse : Message {
-			var tmwid = new TellMeWhenItsDone(TestTimeout);
-			_subsystemCommands.Publish(requestFactory(tmwid));
-			var msg = await tmwid.Task.WaitAsync(TestTimeout);
-			return Assert.IsType<TResponse>(msg);
-		}
-		class TellMeWhenItsDone : IEnvelope {
-			private readonly TaskCompletionSource<Message> _completion;
-			private readonly CancellationTokenRegistration _registration;
-
-			public TellMeWhenItsDone(CancellationToken token) {
-				_completion = new TaskCompletionSource<Message>(TaskCreationOptions.RunContinuationsAsynchronously);
-				_registration = token.Register(static o => {
-					if (o is not TellMeWhenItsDone state) return;
-					state._registration.Dispose();
-					state._completion.TrySetCanceled(state._registration.Token);
-				}, this);
-			}
-
-			public Task<Message> Task => _completion.Task;
-
-			public void ReplyWith<T>(T message) where T : Message {
-				_completion.TrySetResult(message);
-			}
-		}
-
-		protected Task Notify(string streamName) {
-			return _notifications.GetOrAdd(streamName, new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously)).Task;
-		}
-
-		public void Handle(Message message) {
-			switch (message) {
-				case SystemMessage.SystemCoreReady:
-				case SystemMessage.BecomeLeader:
-				case ProjectionCoreServiceMessage.SubComponentStarted:
-				case AwakeServiceMessage.SubscribeAwake:
-				case SystemMessage.SubSystemInitialized:
-					return;
-				case ClientMessage.ReadStreamEventsForward m :
-					_miniStore.Handle(m);
-					return;
-				case ClientMessage.ReadStreamEventsBackward m :
-					_miniStore.Handle(m);
-					return;
-				case ClientMessage.ReadAllEventsForward m :
-					_miniStore.Handle(m);
-					return;
-				case ClientMessage.WriteEvents m :
-					_miniStore.Handle(m);
-					return;
-				case StorageMessage.EventCommitted e:
-					CheckNotifications(e);
-					break;
-			}
-			OnMainBusMessage(message);
-		}
-
-		private void CheckNotifications(StorageMessage.EventCommitted e) {
-			if (_notifications.TryRemove(e.Event.EventStreamId, out var tcs)) {
-				tcs.TrySetResult(true);
-			}
-		}
-
-		protected ResolvedEvent AtLogPosition(long position) {
-			return _miniStore.AtPosition(position);
-		}
-
-		//A super mini in memory event store purely for testing the projection runtime
-		class MiniStore :
-			IHandle<ClientMessage.ReadStreamEventsForward>,
-			IHandle<ClientMessage.ReadAllEventsForward>,
-			IHandle<ClientMessage.ReadStreamEventsBackward>,
-		IHandle<ClientMessage.WriteEvents> {
-			private readonly ICheckpoint _checkpoint;
-			private readonly IPublisher _bus;
-			private readonly List<ResolvedEvent> _all;
-			private readonly Dictionary<string, List<ResolvedEvent>> _streams;
-			private readonly Channel<int> _notifications;
-
-			public MiniStore(ICheckpoint checkpoint, IPublisher bus) {
-				_checkpoint = checkpoint;
-				_bus = bus;
-				_all = new List<ResolvedEvent>();
-				_streams = new Dictionary<string, List<ResolvedEvent>>();
-				_notifications = Channel.CreateUnbounded<int>(new UnboundedChannelOptions(){AllowSynchronousContinuations = false, SingleReader = true, SingleWriter = true});
-			}
-
-			public async Task NotifyAll(CancellationToken cancellationToken) {
-				try {
-					int next = 0;
-					await foreach (var upTo in
-					               _notifications.Reader.ReadAllAsync(cancellationToken)) {
-						while (next < upTo) {
-							var nextEvent = _all[next].OriginalEvent;
-							_bus.Publish(new StorageMessage.EventCommitted(next,nextEvent, upTo-1==next));
-							next++;
-						}
-
-						if (cancellationToken.IsCancellationRequested) break;
-					}
-				}catch(Exception ex) when (ex is TaskCanceledException or OperationCanceledException){}
-			}
-			public void Handle(ClientMessage.ReadStreamEventsForward message) {
-				ClientMessage.ReadStreamEventsForwardCompleted response;
-				if (_streams.TryGetValue(message.EventStreamId, out var events)) {
-					var from = (int)message.FromEventNumber;
-					response = new ClientMessage.ReadStreamEventsForwardCompleted(
-						message.CorrelationId, message.EventStreamId, message.FromEventNumber,
-						message.MaxCount, ReadStreamResult.Success,
-						events.Skip(from).Take(message.MaxCount).ToArray(), StreamMetadata.Empty,
-						false, null, Math.Min(from + message.MaxCount + 1, events.Count),
-						events.Count - 1, from + message.MaxCount >= events.Count,
-						_checkpoint.Read());
-
-				} else {
-					response = new ClientMessage.ReadStreamEventsForwardCompleted(
-						message.CorrelationId, message.EventStreamId, message.FromEventNumber,
-						message.MaxCount, ReadStreamResult.NoStream, Array.Empty<ResolvedEvent>(),
-						StreamMetadata.Empty, false, null, -1, -1, true, _checkpoint.Read());
-				}
-				message.Envelope.ReplyWith(response);
-			}
-
-			public void Handle(ClientMessage.ReadAllEventsForward message) {
-				ClientMessage.ReadAllEventsForwardCompleted response;
-				if (message.CommitPosition < _all.Count) {
-					var resolvedEvents = _all.Skip((int)message.CommitPosition).Take(message.MaxCount).ToArray();
-					var next = (int)Math.Min(_all.Count, message.CommitPosition + message.MaxCount);
-					var prev = Math.Max(0, message.CommitPosition - 1);
-					response = new ClientMessage.ReadAllEventsForwardCompleted(
-						message.CorrelationId, ReadAllResult.Success, null,
-						resolvedEvents, StreamMetadata.Empty, false, message.MaxCount,
-						new TFPos(message.CommitPosition, message.PreparePosition), new TFPos(next, next), new TFPos(prev, prev > 0 ? prev : long.MaxValue), _checkpoint.Read());
-				} else {
-					response = new ClientMessage.ReadAllEventsForwardCompleted(
-						message.CorrelationId, ReadAllResult.Success, null,
-						Array.Empty<ResolvedEvent>(), StreamMetadata.Empty, false, message.MaxCount,
-						new TFPos(message.CommitPosition, message.PreparePosition), new TFPos(message.CommitPosition, message.PreparePosition), new TFPos(0, long.MaxValue), _checkpoint.Read());
-				}
-				message.Envelope.ReplyWith(response);
-
-			}
-
-			public void Handle(ClientMessage.ReadStreamEventsBackward message) {
-				ClientMessage.ReadStreamEventsBackwardCompleted response;
-				if (_streams.TryGetValue(message.EventStreamId, out var events)) {
-					var from = (int)message.FromEventNumber;
-					response = new ClientMessage.ReadStreamEventsBackwardCompleted(
-						message.CorrelationId, message.EventStreamId, message.FromEventNumber,
-						message.MaxCount, ReadStreamResult.Success,
-						events.AsEnumerable().Reverse().Skip(from).Take(message.MaxCount).ToArray(), StreamMetadata.Empty,
-						false, null, Math.Max(from - message.MaxCount, 0),
-						events.Count - 1, from + message.MaxCount >= events.Count,
-						_checkpoint.Read());
-
-				} else {
-					response = new ClientMessage.ReadStreamEventsBackwardCompleted(
-						message.CorrelationId, message.EventStreamId, message.FromEventNumber,
-						message.MaxCount, ReadStreamResult.NoStream, Array.Empty<ResolvedEvent>(),
-						StreamMetadata.Empty, false, null, -1, -1, true, _checkpoint.Read());
-				}
-				message.Envelope.ReplyWith(response);
-			}
-
-			public void Handle(ClientMessage.WriteEvents message) {
-				ClientMessage.WriteEventsCompleted response;
-				if (_streams.TryGetValue(message.EventStreamId, out var events)) {
-					if (message.ExpectedVersion == ExpectedVersion.Any ||
-					    message.ExpectedVersion == events.Count - 1) {
-						response = WriteEvents(message, events);
-					} else {
-						response = new ClientMessage.WriteEventsCompleted(message.CorrelationId,
-							OperationResult.WrongExpectedVersion, "Wrong expected version",
-							_streams.Count - 1);
-					}
-				} else {
-					if (message.ExpectedVersion is ExpectedVersion.Any or ExpectedVersion.NoStream) {
-						events = new List<ResolvedEvent>();
-						_streams.Add(message.EventStreamId, events);
-						response = WriteEvents(message, events);
-					} else {
-						response = new ClientMessage.WriteEventsCompleted(message.CorrelationId,
-							OperationResult.WrongExpectedVersion, "Wrong expected version",
-							ExpectedVersion.NoStream);
-					}
-				}
-
-				message.Envelope.ReplyWith(response);
-
-				_notifications.Writer.TryWrite((int)_checkpoint.Read());
-			}
-			ClientMessage.WriteEventsCompleted WriteEvents(ClientMessage.WriteEvents message, List<ResolvedEvent> events) {
-				var stored = new List<ResolvedEvent>();
-				for (int i = 0; i < message.Events.Length; i++) {
-					var position = _all.Count + i;
-					var revision = events.Count + i;
-					var current = message.Events[i];
-
-					var flags = PrepareFlags.IsCommitted | PrepareFlags.Data;
-					if (current.IsJson) flags |= PrepareFlags.IsJson;
-					if (i == 0) flags |= PrepareFlags.TransactionBegin;
-					if(i==message.Events.Length-1) flags |= PrepareFlags.TransactionEnd;
-
-					var record = new EventRecord(revision, position, message.CorrelationId,
-						current.EventId, _all.Count, i, message.EventStreamId, -1, DateTime.Now,
-						flags, current.EventType, current.Data, current.Metadata);
-					if (current.EventType == SystemEventTypes.LinkTo) {
-						var data = Encoding.UTF8.GetString(current.Data);
-						var parts = data.Split('@', 2);
-						var number = int.Parse(parts[0]);
-						var stream = parts[1];
-						if (_streams.TryGetValue(stream, out var links) &&
-						    links.Count > number) {
-							stored.Add(ResolvedEvent.ForResolvedLink(links[number].OriginalEvent, record, position));
-						} else {
-							stored.Add(ResolvedEvent.ForFailedResolvedLink(record, ReadEventResult.NotFound));
-						}
-					} else {
-						stored.Add(ResolvedEvent.ForUnresolvedEvent(record, position));
-					}
-
-					if (stored.Count > 1) {
-						if (stored[i].OriginalPosition < stored[i - 1].OriginalPosition) {
-							Debug.WriteLine("500");
-						}
-					}
-				}
-
-				var response = new ClientMessage.WriteEventsCompleted(message.CorrelationId,
-					events.Count, Math.Max(0, events.Count + stored.Count - 1),
-					_all.Count + stored.Count, _all.Count + stored.Count);
-				events.AddRange(stored);
-				_all.AddRange(stored);
-				_checkpoint.Write(_all.Count);
-				_checkpoint.Flush();
-				return response;
-
-			}
-
-			public void Complete() {
-				_notifications.Writer.TryComplete();
-			}
-
-			public ResolvedEvent AtPosition(long position) {
-				var local = (int)position;
-				if (local < 0 || local >= _all.Count) return default;
-				return _all[local];
-			}
-		}
-	}
-}
-
diff --git a/src/EventStore.Projections.Core.Javascript.Tests/Integration/TestPollyFills.cs b/src/EventStore.Projections.Core.Javascript.Tests/Integration/TestPollyFills.cs
deleted file mode 100644
index b253007e142..00000000000
--- a/src/EventStore.Projections.Core.Javascript.Tests/Integration/TestPollyFills.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-
-namespace EventStore.Projections.Core.Javascript.Tests.Integration
-{
-	public static class TestPollyFills {
-		public static async Task WaitAsync(this Task toWaitFor, CancellationToken cancellationToken) {
-			var tcs = new TaskCompletionSource();
-			await using var reg = cancellationToken.Register(() => { tcs.TrySetCanceled();});
-			var result = await Task.WhenAny(tcs.Task, toWaitFor);
-			await result;
-		}
-		public static async Task<T> WaitAsync<T>(this Task<T> toWaitFor, CancellationToken cancellationToken) {
-			var tcs = new TaskCompletionSource<T>();
-			await using var reg = cancellationToken.Register(() => { tcs.TrySetCanceled();});
-			var result = await Task.WhenAny(tcs.Task, toWaitFor);
-			return await result;
-		}
-
-		public static Event[] LikeBeforeTheyWereSaved(this IReadOnlyList<ResolvedEvent> events) {
-			return events.Select(x => new Event(x.Event.EventId, x.Event.EventType, x.Event.IsJson,
-				x.Event.Data.ToArray(), x.Event.Metadata.ToArray())).ToArray();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Javascript.Tests/SpecRunner.cs b/src/EventStore.Projections.Core.Javascript.Tests/SpecRunner.cs
deleted file mode 100644
index 525ebfa5027..00000000000
--- a/src/EventStore.Projections.Core.Javascript.Tests/SpecRunner.cs
+++ /dev/null
@@ -1,472 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Text.Json;
-using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Interpreted;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Xunit;
-using Xunit.Abstractions;
-using JsonSerializer = System.Text.Json.JsonSerializer;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Javascript.Tests {
-	public class SpecRunner {
-		private readonly ITestOutputHelper _output;
-
-		public SpecRunner(ITestOutputHelper output) {
-			_output = output;
-		}
-
-		private static readonly Encoding Utf8NoBom = new UTF8Encoding(false, true);
-
-		public static IEnumerable<object[]> GetTestCases() {
-			var assembly = typeof(SpecRunner).Assembly;
-			var specs = assembly.GetManifestResourceNames().Where(x => x.EndsWith("-spec.json"));
-			foreach (var spec in specs) {
-				JsonDocument doc;
-				using (var stream = assembly.GetManifestResourceStream(spec)) {
-					doc = JsonDocument.Parse(stream!);
-				}
-
-				var projection = doc.RootElement.GetProperty("projection").GetString();
-				Assert.False(string.IsNullOrWhiteSpace(projection));
-				var projectionSourceName = assembly.GetManifestResourceNames()
-					.SingleOrDefault(x => x.EndsWith($"{projection}.js"));
-				Assert.NotNull(projectionSourceName);
-				string source;
-				using (var stream = assembly.GetManifestResourceStream(projectionSourceName!)) {
-					Assert.NotNull(stream);
-					using (var sr = new StreamReader(stream!)) {
-						source = sr.ReadToEnd();
-					}
-				}
-
-				List<InputEventSequence> sequences = new();
-				foreach (var inputEvent in doc.RootElement.GetProperty("input").EnumerateArray()) {
-					var stream = inputEvent.GetProperty("streamId").GetString();
-					Assert.NotNull(stream);
-					var sequence = new InputEventSequence(stream!);
-					sequences.Add(sequence);
-					foreach (var e in inputEvent.GetProperty("events").EnumerateArray()) {
-						var et = e.GetProperty("eventType").GetString();
-						Assert.NotNull(et);
-						bool skip = false;
-						if (e.TryGetProperty("skip", out var skipElement)) {
-							skip = skipElement.GetBoolean();
-						}
-
-						var initializedPartitions = new List<string>();
-						if (e.TryGetProperty("initializedPartitions", out var partitions)) {
-							foreach (var element in partitions.EnumerateArray()) {
-								initializedPartitions.Add(element.GetString()!);
-							}
-						}
-						var expectedStates = new Dictionary<string, string?>();
-						int stateCount = 0;
-						if (e.TryGetProperty("states", out var states)) {
-							foreach (var state in states.EnumerateArray()) {
-								stateCount++;
-								var expectedStateNode = state.GetProperty("state");
-								var expectedState = expectedStateNode.ValueKind == JsonValueKind.Null ? null : expectedStateNode.GetRawText();
-								if (!expectedStates.TryAdd(state.GetProperty("partition").GetString()!,
-									expectedState)) {
-									throw new InvalidOperationException("Duplicate state");
-								}
-							}
-						}
-						if (stateCount > 2)
-							throw new InvalidOperationException("Cannot specify more than 2 states");
-
-						sequence.Events.Add(new InputEvent(et!, e.GetProperty("data").GetRawText(), e.TryGetProperty("metadata", out var metadata) ? metadata.GetRawText() : null, initializedPartitions, expectedStates, skip, e.TryGetProperty("eventId", out var idElement) && idElement.TryGetGuid(out var id) ? id: Guid.NewGuid()));
-					}
-				}
-
-				var output = doc.RootElement.GetProperty("output");
-				var sdb = new SourceDefinitionBuilder();
-				var config = output.GetProperty("config");
-				foreach (var item in config.EnumerateObject()) {
-					switch (item.Name) {
-						case "definesStateTransform":
-							if (item.Value.GetBoolean())
-								sdb.SetDefinesStateTransform();
-							break;
-						case "handlesDeletedNotifications":
-							sdb.SetHandlesStreamDeletedNotifications(item.Value.GetBoolean());
-							break;
-						case "producesResults":
-							if (item.Value.GetBoolean())
-								sdb.SetOutputState();
-							break;
-						case "definesFold":
-							if (item.Value.GetBoolean())
-								sdb.SetDefinesFold();
-							break;
-						case "resultStreamName":
-							sdb.SetResultStreamNameOption(item.Value.GetString());
-							break;
-						case "partitionResultStreamNamePattern":
-							sdb.SetPartitionResultStreamNamePatternOption(item.Value.GetString());
-							break;
-						case "$includeLinks":
-							sdb.SetIncludeLinks(item.Value.GetBoolean());
-							break;
-						case "reorderEvents":
-							sdb.SetReorderEvents(item.Value.GetBoolean());
-							break;
-						case "processingLag":
-							sdb.SetProcessingLag(item.Value.GetInt32());
-							break;
-						case "biState":
-							sdb.SetIsBiState(item.Value.GetBoolean());
-							break;
-						case "categories":
-							foreach (var c in item.Value.EnumerateArray()) {
-								sdb.FromCategory(c.GetString());
-							}
-							break;
-						case "partitioned":
-							if (item.Value.GetBoolean())
-								sdb.SetByCustomPartitions();
-							break;
-						case "events":
-							foreach (var e in item.Value.EnumerateArray()) {
-								sdb.IncludeEvent(e.GetString());
-							}
-							break;
-						case "allEvents":
-							if (item.Value.GetBoolean()) {
-								sdb.AllEvents();
-							} else {
-								sdb.NotAllEvents();
-							}
-							break;
-						case "allStreams":
-							if (item.Value.GetBoolean()) {
-								sdb.FromAll();
-							}
-							break;
-						default:
-							throw new Exception($"unexpected property in expected config {item.Name}");
-					}
-				}
-#nullable disable
-
-				List<OutputEvent> expectedEmittedEvents = new();
-				if (output.TryGetProperty("emitted", out var expectedEmittedElement)) {
-					foreach (var element in expectedEmittedElement.EnumerateObject()) {
-						var stream = element.Name;
-						foreach (var eventElement in element.Value.EnumerateArray()) {
-							if (eventElement.ValueKind == JsonValueKind.String) {
-								expectedEmittedEvents.Add(
-									new OutputEvent(stream, "$>", eventElement.GetString(), null));
-							}
-						}
-					}
-				}
-				JintProjectionStateHandler runner = null;
-				IQuerySources definition = null;
-
-				IQuerySources expectedDefinition = sdb.Build();
-				yield return WithOutput($"{projection} compiles", o => {
-					runner = new JintProjectionStateHandler(source, true,
-						compilationTimeout: TimeSpan.FromMilliseconds(200),
-						executionTimeout: TimeSpan.FromMilliseconds(200));
-				});
-
-				yield return For($"{projection} getDefinition", () => {
-					definition = runner.GetSourceDefinition();
-				});
-
-				yield return For($"{projection} qs.AllStreams", () => Assert.Equal(expectedDefinition.AllStreams, definition.AllStreams));
-				yield return For($"{projection} qs.Categories", () => Assert.Equal(expectedDefinition.Categories, definition.Categories));
-				yield return For($"{projection} qs.Streams", () => Assert.Equal(expectedDefinition.Streams, definition.Streams));
-				yield return For($"{projection} qs.AllEvents", () => Assert.Equal(expectedDefinition.AllEvents, definition.AllEvents));
-				yield return For($"{projection} qs.Events", () => Assert.Equal(expectedDefinition.Events, definition.Events));
-				yield return For($"{projection} qs.ByStreams", () => Assert.Equal(expectedDefinition.ByStreams, definition.ByStreams));
-				yield return For($"{projection} qs.ByCustomPartitions", () => Assert.Equal(expectedDefinition.ByCustomPartitions, definition.ByCustomPartitions));
-				yield return For($"{projection} qs.DefinesStateTransform", () => Assert.Equal(expectedDefinition.DefinesStateTransform, definition.DefinesStateTransform));
-				yield return For($"{projection} qs.DefinesFold", () => Assert.Equal(expectedDefinition.DefinesFold, definition.DefinesFold));
-				yield return For($"{projection} qs.HandlesDeletedNotifications", () => Assert.Equal(expectedDefinition.HandlesDeletedNotifications, definition.HandlesDeletedNotifications));
-				yield return For($"{projection} qs.ProducesResults", () => Assert.Equal(expectedDefinition.ProducesResults, definition.ProducesResults));
-				yield return For($"{projection} qs.IsBiState", () => Assert.Equal(expectedDefinition.IsBiState, definition.IsBiState));
-				yield return For($"{projection} qs.IncludeLinksOption", () => Assert.Equal(expectedDefinition.IncludeLinksOption, definition.IncludeLinksOption));
-				yield return For($"{projection} qs.ResultStreamNameOption", () => Assert.Equal(expectedDefinition.ResultStreamNameOption, definition.ResultStreamNameOption));
-				yield return For($"{projection} qs.PartitionResultStreamNamePatternOption", () => Assert.Equal(expectedDefinition.PartitionResultStreamNamePatternOption,
-					definition.PartitionResultStreamNamePatternOption));
-				yield return For($"{projection} qs.ReorderEventsOption", () => Assert.Equal(expectedDefinition.ReorderEventsOption, definition.ReorderEventsOption));
-				yield return For($"{projection} qs.ProcessingLagOption", () => Assert.Equal(expectedDefinition.ProcessingLagOption, definition.ProcessingLagOption));
-				yield return For($"{projection} qs.LimitingCommitPosition", () => Assert.Equal(expectedDefinition.LimitingCommitPosition, definition.LimitingCommitPosition));
-				var partitionedState = new Dictionary<string, string>();
-				var sharedStateInitialized = false;
-				var revision = new Dictionary<string, long>();
-				List<EmittedEventEnvelope> actualEmittedEvents = new();
-
-				for (int i = 0; i < sequences.Count; i++) {
-					var sequence = sequences[i];
-					if (!revision.TryGetValue(sequence.Stream, out _)) {
-						revision[sequence.Stream] = 0;
-					}
-					for (int j = 0; j < sequences[i].Events.Count; j++) {
-						var logPosition = i * 100 + j;
-						var flags = PrepareFlags.IsJson | PrepareFlags.Data;
-						if (j == 0)
-							flags |= PrepareFlags.TransactionBegin;
-						if (j == sequence.Events.Count - 1)
-							flags |= PrepareFlags.TransactionEnd;
-
-						/*Sequence:
-						Get partition if bycustom partition or by stream 
-							if the partition is null or an empty string skip this event (NB: need to indicate that an event should be skipped)
-						load the state if it doesn't exist or tell the projection to init state
-						init shared if it doesn't exist
-						if init was state was called, call created
-						if processing a delete, call partition deleted (NB: bistate partitions do not support deletes)
-						process the event
-						save any shared state if it isn't null
-						save any state 
-						save emitted events to verify later
-						*/
-						var @event = sequence.Events[j];
-						var body = JObject.Parse(@event.Body).ToString(Formatting.Indented);
-						var metadata = Array.Empty<byte>();
-						if (@event.Metadata != null) {
-							metadata = Utf8NoBom.GetBytes(JObject.Parse(@event.Metadata).ToString(Formatting.Indented));
-						}
-						var er = new EventRecord(
-							revision[sequence.Stream], logPosition, Guid.NewGuid(), @event.EventId, i, j,
-							sequence.Stream, i, DateTime.Now, flags, @event.EventType,
-							Utf8NoBom.GetBytes(body), metadata);
-						var e = new ResolvedEvent(EventStore.Core.Data.ResolvedEvent.ForUnresolvedEvent(er, logPosition), Array.Empty<byte>());
-						if (@event.Skip) {
-							yield return For($"{projection} skips {er.EventNumber}@{sequence.Stream}",
-								() => Assert.Null(runner.GetStatePartition(CheckpointTag.Empty, "", e)));
-						} else {
-							var expectedPartition = "";
-							if (expectedDefinition.DefinesFold) {
-								if (@event.ExpectedStates.Any()) {
-									expectedPartition = @event.ExpectedStates
-										.SingleOrDefault(x => string.Empty != x.Key).Key ?? string.Empty;
-									if (expectedPartition != string.Empty) {
-										yield return For(
-											$"{projection} {er.EventNumber}@{sequence.Stream} returns expected partition",
-											() => Assert.Equal(expectedPartition,
-												runner.GetStatePartition(CheckpointTag.Empty, "", e)));
-										foreach (var initializedState in @event.InitializedPartitions) {
-											yield return For(
-												$"should not have already initialized \"{initializedState}\" at {er.EventNumber}@{sequence.Stream}",
-												() => Assert.DoesNotContain(initializedState,
-													(IReadOnlyDictionary<string, string>)partitionedState));
-										}
-									}
-
-									if (expectedDefinition.IsBiState && !sharedStateInitialized) {
-										sharedStateInitialized = true;
-										yield return For("initializes shared state without error", () => {
-											runner.InitializeShared();
-										});
-									}
-
-									if (!@event.InitializedPartitions.Contains(expectedPartition)) {
-										yield return For(
-											$"can load current state at {er.EventNumber}@{sequence.Stream}",
-											() => {
-												Assert.True(
-													partitionedState.TryGetValue(expectedPartition, out var value),
-													$"did not find expected state for partition{expectedPartition}");
-												runner.Load(value);
-											});
-									} else {
-										yield return For(
-											$"initializes new state at {er.EventNumber}@{sequence.Stream}",
-											() => {
-												var ex = Record.Exception(() => runner.Initialize());
-												Assert.Null(ex);
-											});
-
-										yield return For(
-											$"handles created partition \"{expectedPartition}\" at {er.EventNumber}@{sequence.Stream}",
-											() => {
-												var result = runner.ProcessPartitionCreated(expectedPartition,
-													CheckpointTag.Empty, e, out var emittedEvents);
-												if (emittedEvents != null && emittedEvents.Length > 0) {
-													actualEmittedEvents.AddRange(emittedEvents);
-												}
-
-												Assert.True(result);
-											});
-									}
-								}
-
-								yield return For(
-									$"process event {@event.EventType} at {er.EventNumber}@{sequence.Stream}",
-									() => {
-										Assert.True(runner.ProcessEvent(expectedPartition, CheckpointTag.Empty, "", e,
-											out var newState, out var newSharedState, out var emittedEvents), "Process event should always return true");
-										if (newSharedState != null)
-											partitionedState[""] = newSharedState;
-										partitionedState[expectedPartition] = newState;
-										if (emittedEvents != null && emittedEvents.Length > 0) {
-											actualEmittedEvents.AddRange(emittedEvents);
-										}
-									});
-								if (@event.ExpectedStates.Any()) {
-									foreach (var expectedState in @event.ExpectedStates) {
-										yield return For(
-											$"state \"{expectedState.Key}\" exists at {er.EventNumber}@{sequence.Stream}",
-											() => Assert.Contains(expectedState.Key,
-												(IReadOnlyDictionary<string, string>)partitionedState));
-										yield return For(
-											$"state \"{expectedState.Key}\" is correct at {er.EventNumber}@{sequence.Stream}",
-											() => {
-												if (string.IsNullOrEmpty(expectedState.Value)) {
-													Assert.Null(partitionedState[expectedState.Key]);
-												} else {
-													Assert.True(partitionedState.ContainsKey(expectedState.Key), $"partition does not contain key {expectedState.Key}");
-													Assert.NotNull(partitionedState[expectedState.Key]);
-													Assert.NotEmpty(partitionedState[expectedState.Key]);
-													var expected = Sort(expectedState.Value, "expected");
-													var actual = Sort(partitionedState[expectedState.Key], "actual");
-													Assert.Equal(expected.ToString(Formatting.Indented),
-														actual.ToString(Formatting.Indented));
-												}
-											});
-									}
-								}
-							}
-						}
-
-						revision[sequence.Stream] = revision[sequence.Stream] + 1;
-					}
-
-
-				}
-
-				if (expectedEmittedEvents.Count == 0) {
-					yield return For("Should have no emitted events", () => {
-						Assert.Empty(actualEmittedEvents);
-					});
-				} else {
-					foreach (var emitted in expectedEmittedEvents) {
-						yield return For(
-							$"Expected event {emitted.StreamId} {emitted.Type} {(emitted.Type == "$>" ? emitted.Data : "")} was emitted",
-							() => {
-								Assert.Contains(actualEmittedEvents, eee => eee.Event.Data == emitted.Data);
-							});
-					}
-				}
-
-				object[] For(string name, Action a) {
-					return new object[]{ new TestDefinition(Name(name),_ => {
-						a();
-						return default;
-					})};
-				}
-
-				object[] WithOutput(string name, Action<ITestOutputHelper> a) {
-					return new object[]{ new TestDefinition(Name(name),o => {
-						a(o);
-						return default;
-					})};
-				}
-
-				string Name(string name) {
-					if (name.StartsWith(projection!))
-						return name;
-					return $"{projection} {name}";
-				}
-			}
-
-			static JObject Sort(string json, string name) {
-				JObject root;
-				try {
-					root = JObject.Parse(json);
-				} catch {
-					throw;
-				}
-				return new(root.Properties().OrderBy(x => x.Name));
-			}
-		}
-
-		[Theory]
-		[MemberData(nameof(GetTestCases))]
-		public Task Test(TestDefinition def) {
-			return def.Execute(_output).AsTask();
-		}
-		
-		public class TestDefinition {
-			private readonly string _name;
-			private readonly Func<ITestOutputHelper, ValueTask> _step;
-
-			public TestDefinition(string name, Func<ITestOutputHelper, ValueTask> step) {
-				_name = name;
-				_step = step;
-			}
-
-			public ValueTask Execute(ITestOutputHelper output) {
-				return _step(output);
-			}
-
-			public override string ToString() {
-				return _name;
-			}
-		}
-
-		class InputEventSequence {
-			public string Stream { get; }
-			private readonly List<InputEvent> _events;
-			public List<InputEvent> Events => _events;
-
-			public InputEventSequence(string stream) {
-				Stream = stream;
-				_events = new List<InputEvent>();
-			}
-		}
-
-		class InputEvent {
-			public string EventType { get; }
-			public string Body { get; }
-			public string Metadata { get; }
-			public IReadOnlyList<string> InitializedPartitions { get; }
-			public IReadOnlyDictionary<string, string> ExpectedStates { get; }
-			public bool Skip { get; }
-			public Guid EventId { get; }
-
-			public InputEvent(string eventType, string body, string metadata, IReadOnlyList<string> initializedPartitions, IReadOnlyDictionary<string, string> expectedStates, bool skip, Guid eventId) {
-				EventType = eventType;
-				Body = body;
-				Metadata = metadata;
-				InitializedPartitions = initializedPartitions;
-				ExpectedStates = expectedStates;
-				Skip = skip;
-				EventId = eventId;
-			}
-		}
-
-		class OutputEvent {
-			public string StreamId { get; }
-			public string Type { get; }
-			public string Data { get; }
-			public string Metadata { get; }
-
-			public OutputEvent(string streamId, string type, string data, string metadata) {
-				StreamId = streamId;
-				Type = type;
-				Data = data;
-				Metadata = metadata;
-			}
-		}
-	}
-
-
-}
diff --git a/src/EventStore.Projections.Core.Tests/AssertEx.cs b/src/EventStore.Projections.Core.Tests/AssertEx.cs
deleted file mode 100644
index 2a871047bce..00000000000
--- a/src/EventStore.Projections.Core.Tests/AssertEx.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using Esprima.Ast;
-using EventStore.LogV3;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests {
-	public static class AssertEx {
-		public static void AreEqual(IQuerySources expected, IQuerySources actual) {
-			Assert.AreEqual(expected.AllEvents, actual.AllEvents, $"Expected {nameof(expected.AllEvents)} to be {expected.AllEvents} but was {actual.AllEvents}");
-			Assert.AreEqual(expected.AllStreams, actual.AllStreams, $"Expected {nameof(expected.AllStreams)} to be {expected.AllStreams} but was {actual.AllStreams}");
-			Assert.AreEqual(expected.ByCustomPartitions, actual.ByCustomPartitions,$"Expected {nameof(expected.ByCustomPartitions)} to be {expected.ByCustomPartitions} but was {actual.ByCustomPartitions}");
-			Assert.AreEqual(expected.ByStreams, actual.ByStreams, $"Expected {nameof(expected.ByStreams)} to be {expected.ByStreams} but was {actual.ByStreams}");
-			Assert.AreEqual(expected.DefinesFold, actual.DefinesFold, $"Expected {nameof(expected.DefinesFold)} to be {expected.DefinesFold} but was {actual.DefinesFold}");
-			Assert.AreEqual(expected.DefinesStateTransform, actual.DefinesStateTransform, $"Expected {nameof(expected.DefinesStateTransform)} to be {expected.DefinesStateTransform} but was {actual.DefinesStateTransform}");
-			
-			Assert.AreEqual(expected.IncludeLinksOption, actual.IncludeLinksOption, $"Expected {nameof(expected.IncludeLinksOption)} to be {expected.IncludeLinksOption} but was {actual.IncludeLinksOption}");
-			Assert.AreEqual(expected.IsBiState, actual.IsBiState, $"Expected {nameof(expected.IsBiState)} to be {expected.IsBiState} but was {actual.IsBiState}");
-			Assert.AreEqual(expected.LimitingCommitPosition, actual.LimitingCommitPosition, $"Expected {nameof(expected.LimitingCommitPosition)} to be {expected.LimitingCommitPosition} but was {actual.LimitingCommitPosition}");
-			Assert.AreEqual(expected.PartitionResultStreamNamePatternOption, actual.PartitionResultStreamNamePatternOption, $"Expected {nameof(expected.PartitionResultStreamNamePatternOption)} to be {expected.PartitionResultStreamNamePatternOption} but was {actual.PartitionResultStreamNamePatternOption}");
-			Assert.AreEqual(expected.ProcessingLagOption, actual.ProcessingLagOption, $"Expected {nameof(expected.ProcessingLagOption)} to be {expected.ProcessingLagOption} but was {actual.ProcessingLagOption}");
-			Assert.AreEqual(expected.ProducesResults, actual.ProducesResults, $"Expected {nameof(expected.ProducesResults)} to be {expected.ProducesResults} but was {actual.ProducesResults}");
-			Assert.AreEqual(expected.ReorderEventsOption, actual.ReorderEventsOption, $"Expected {nameof(expected.ReorderEventsOption)} to be {expected.ReorderEventsOption} but was {actual.ReorderEventsOption}");
-			Assert.AreEqual(expected.ResultStreamNameOption, actual.ResultStreamNameOption, $"Expected {nameof(expected.ResultStreamNameOption)} to be {expected.ResultStreamNameOption} but was {actual.ResultStreamNameOption}");
-			Assert.AreEqual(expected.HandlesDeletedNotifications, actual.HandlesDeletedNotifications, $"Expected {nameof(expected.HandlesDeletedNotifications)} to be {expected.HandlesDeletedNotifications} but was {actual.HandlesDeletedNotifications}");
-			AssertWithName(nameof(expected.Categories),expected.Categories, actual.Categories);
-			AssertWithName(nameof(expected.Events),expected.Events, actual.Events);
-			AssertWithName(nameof(expected.Streams),expected.Streams, actual.Streams);
-
-			static void AssertWithName(string name, string[] expected, string[] actual) {
-				try {
-					Assert.AreEqual(expected, actual);
-				} catch (Exception ex) {
-					var msg = name + ex.Message;
-					throw new Exception(msg);
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/CallbackSubscriber.cs b/src/EventStore.Projections.Core.Tests/CallbackSubscriber.cs
deleted file mode 100644
index 7e9cec78aef..00000000000
--- a/src/EventStore.Projections.Core.Tests/CallbackSubscriber.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Projections.Core.Tests {
-	public static class CallbackSubscriber {
-		class Impl<T> : IHandle<T> where T : Message {
-			private readonly Action<T> _callback;
-
-			public Impl(Action<T> callback) {
-				_callback = callback;
-			}
-
-			public void Handle(T message) {
-				_callback(message);
-			}
-		}
-
-		public static IHandle<T> Create<T>(Action<T> callback) where T : Message {
-			return new Impl<T>(callback);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/Cluster/specification_with_standard_projections_runnning.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/Cluster/specification_with_standard_projections_runnning.cs
deleted file mode 100644
index cdf4be592af..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/Cluster/specification_with_standard_projections_runnning.cs
+++ /dev/null
@@ -1,305 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Common.Log;
-using EventStore.ClientAPI.Projections;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Common.Options;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.Util;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
-using ResolvedEvent = EventStore.ClientAPI.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.Cluster {
-	[Category("ClientAPI")]
-	public abstract class specification_with_standard_projections_runnning<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		protected MiniClusterNode<TLogFormat, TStreamId>[] _nodes = new MiniClusterNode<TLogFormat, TStreamId>[3];
-		protected Endpoints[] _nodeEndpoints = new Endpoints[3];
-		protected IEventStoreConnection _conn;
-		private readonly ProjectionsSubsystem[] _projections = new ProjectionsSubsystem[3];
-		protected UserCredentials _admin = DefaultData.AdminCredentials;
-		protected ProjectionsManager _manager;
-
-		protected class Endpoints {
-			public readonly IPEndPoint InternalTcp;
-			public readonly IPEndPoint ExternalTcp;
-			public readonly IPEndPoint HttpEndPoint;
-			private readonly int[] _ports;
-
-			public Endpoints(int internalTcp, int externalTcp, int httpPort) {
-				var testIp = Environment.GetEnvironmentVariable("ES-TESTIP");
-
-				var address = string.IsNullOrEmpty(testIp) ? IPAddress.Loopback : IPAddress.Parse(testIp);
-				InternalTcp = new IPEndPoint(address, internalTcp);
-				ExternalTcp = new IPEndPoint(address, externalTcp);
-				HttpEndPoint = new IPEndPoint(address, httpPort);
-
-				_ports = new[] {internalTcp, httpPort, externalTcp};
-			}
-
-			public IEnumerable<int> Ports => _ports;
-		}
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-#if (!DEBUG)
-            Assert.Ignore("These tests require DEBUG conditional");
-#else
-			_nodeEndpoints[0] = new Endpoints(
-				PortsHelper.GetAvailablePort(IPAddress.Loopback),
-				PortsHelper.GetAvailablePort(IPAddress.Loopback),
-				PortsHelper.GetAvailablePort(IPAddress.Loopback));
-			_nodeEndpoints[1] = new Endpoints(
-				PortsHelper.GetAvailablePort(IPAddress.Loopback),
-				PortsHelper.GetAvailablePort(IPAddress.Loopback),
-				PortsHelper.GetAvailablePort(IPAddress.Loopback));
-			_nodeEndpoints[2] = new Endpoints(
-				PortsHelper.GetAvailablePort(IPAddress.Loopback),
-				PortsHelper.GetAvailablePort(IPAddress.Loopback),
-				PortsHelper.GetAvailablePort(IPAddress.Loopback));
-
-			_nodes[0] = CreateNode(0,
-				_nodeEndpoints[0], new[] { _nodeEndpoints[0].HttpEndPoint });
-			_nodes[1] = CreateNode(1,
-				_nodeEndpoints[1], new[] { _nodeEndpoints[1].HttpEndPoint });
-			_nodes[2] = CreateNode(2,
-				_nodeEndpoints[2], new[] { _nodeEndpoints[2].HttpEndPoint });
-			WaitIdle();
-
-			var projectionsStarted = _projections.Select(p => SystemProjections.Created(p.LeaderInputBus)).ToArray();
-
-			foreach (var node in _nodes) {
-				node.Start();
-				node.WaitIdle();
-			}
-
-			await Task.WhenAll(_nodes.Select(x => x.Started)).WithTimeout(TimeSpan.FromSeconds(30));
-
-			_conn = EventStoreConnection.Create(_nodes[0].ExternalTcpEndPoint);
-			await _conn.ConnectAsync().WithTimeout();
-
-			_manager = new ProjectionsManager(
-				new ConsoleLogger(),
-				_nodes.Single(x => x.NodeState == VNodeState.Leader).HttpEndPoint,
-				TimeSpan.FromMilliseconds(10000));
-
-			if (GivenStandardProjectionsRunning()) {
-				await Task.WhenAny(projectionsStarted).WithTimeout(TimeSpan.FromSeconds(10));
-				await EnableStandardProjections().WithTimeout(TimeSpan.FromMinutes(2));
-			}
-
-			WaitIdle();
-
-			try {
-				await Given().WithTimeout();
-			} catch (Exception ex) {
-				throw new Exception("Given Failed", ex);
-			}
-
-			try {
-				await When().WithTimeout();
-			} catch (Exception ex) {
-				throw new Exception("When Failed", ex);
-			}
-#endif
-		}
-
-		private MiniClusterNode<TLogFormat, TStreamId> CreateNode(int index, Endpoints endpoints, EndPoint[] gossipSeeds) {
-			_projections[index] = new ProjectionsSubsystem(new ProjectionSubsystemOptions(1, ProjectionType.All, false, TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault), Opts.FaultOutOfOrderProjectionsDefault, 500, 250));
-			var node = new MiniClusterNode<TLogFormat, TStreamId>(
-				PathName, index, endpoints.InternalTcp,
-				endpoints.ExternalTcp, endpoints.HttpEndPoint,
-				subsystems: [_projections[index]], gossipSeeds: gossipSeeds);
-			return node;
-		}
-
-		[TearDown]
-		public async Task PostTestAsserts() {
-			var all = await _manager.ListAllAsync(_admin);
-			if (all.Any(p => p.Name == "Faulted"))
-				Assert.Fail("Projections faulted while running the test" + "\r\n" + all);
-		}
-
-		protected async Task EnableStandardProjections() {
-			await EnableProjection(ProjectionNamesBuilder.StandardProjections.EventByCategoryStandardProjection);
-			await EnableProjection(ProjectionNamesBuilder.StandardProjections.EventByTypeStandardProjection);
-			await EnableProjection(ProjectionNamesBuilder.StandardProjections.StreamByCategoryStandardProjection);
-			await EnableProjection(ProjectionNamesBuilder.StandardProjections.StreamsStandardProjection);
-		}
-
-		protected async Task DisableStandardProjections() {
-			await DisableProjection(ProjectionNamesBuilder.StandardProjections.EventByCategoryStandardProjection);
-			await DisableProjection(ProjectionNamesBuilder.StandardProjections.EventByTypeStandardProjection);
-			await DisableProjection(ProjectionNamesBuilder.StandardProjections.StreamByCategoryStandardProjection);
-			await DisableProjection(ProjectionNamesBuilder.StandardProjections.StreamsStandardProjection);
-		}
-
-		protected virtual bool GivenStandardProjectionsRunning() {
-			return true;
-		}
-
-		protected async Task EnableProjection(string name) {
-			for (int i = 1; i <= 10; i++) {
-				try {
-					await _manager.EnableAsync(name, _admin);
-				} catch (Exception) {
-					if (i == 10)
-						throw;
-					await Task.Delay(5000);
-				}
-			}
-
-			await Task.Delay(1000); /* workaround for race condition when multiple projections are being enabled simultaneously */
-		}
-
-		protected Task DisableProjection(string name) {
-			return _manager.DisableAsync(name, _admin);
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			_conn.Close();
-			await Task.WhenAll(
-				_nodes[0].Shutdown(),
-				_nodes[1].Shutdown(),
-				_nodes[2].Shutdown());
-			await base.TestFixtureTearDown();
-		}
-
-		protected virtual Task When() => Task.CompletedTask;
-
-		protected virtual Task Given() => Task.CompletedTask;
-
-		protected Task PostEvent(string stream, string eventType, string data) {
-			return _conn.AppendToStreamAsync(stream, ExpectedVersion.Any, new[] { CreateEvent(eventType, data) });
-		}
-
-		protected Task HardDeleteStream(string stream) {
-			return _conn.DeleteStreamAsync(stream, ExpectedVersion.Any, true, _admin);
-		}
-
-		protected Task SoftDeleteStream(string stream) {
-			return _conn.DeleteStreamAsync(stream, ExpectedVersion.Any, false, _admin);
-		}
-
-		protected static EventData CreateEvent(string type, string data) {
-			return new EventData(Guid.NewGuid(), type, true, Encoding.UTF8.GetBytes(data), new byte[0]);
-		}
-
-		protected void WaitIdle() {
-#if DEBUG
-			_nodes[0].WaitIdle();
-			_nodes[1].WaitIdle();
-			_nodes[2].WaitIdle();
-#endif
-		}
-
-#pragma warning disable 1998
-		protected async Task AssertStreamTailAsync(string streamId, params string[] events) {
-#pragma warning restore 1998
-#if DEBUG
-			var result = await _conn.ReadStreamEventsBackwardAsync(streamId, -1, events.Length, true, _admin);
-			switch (result.Status) {
-				case SliceReadStatus.StreamDeleted:
-					Assert.Fail("Stream '{0}' is deleted", streamId);
-					break;
-				case SliceReadStatus.StreamNotFound:
-					Assert.Fail("Stream '{0}' does not exist", streamId);
-					break;
-				case SliceReadStatus.Success:
-					var resultEventsReversed = result.Events.Reverse().ToArray();
-					if (resultEventsReversed.Length < events.Length)
-						DumpFailed("Stream does not contain enough events", streamId, events, result.Events);
-					else {
-						for (var index = 0; index < events.Length; index++) {
-							var parts = events[index].Split(new char[] { ':' }, 2);
-							var eventType = parts[0];
-							var eventData = parts[1];
-
-							if (resultEventsReversed[index].Event.EventType != eventType)
-								DumpFailed("Invalid event type", streamId, events, resultEventsReversed);
-							else if (resultEventsReversed[index].Event.DebugDataView() != eventData)
-								DumpFailed("Invalid event body", streamId, events, resultEventsReversed);
-						}
-					}
-
-					break;
-			}
-#endif
-		}
-
-#pragma warning disable 1998
-		protected async Task DumpStreamAsync(string streamId) {
-#pragma warning restore 1998
-#if DEBUG
-			var result = await _conn.ReadStreamEventsBackwardAsync(streamId, -1, 100, true, _admin);
-			switch (result.Status) {
-				case SliceReadStatus.StreamDeleted:
-					Assert.Fail("Stream '{0}' is deleted", streamId);
-					break;
-				case SliceReadStatus.StreamNotFound:
-					Assert.Fail("Stream '{0}' does not exist", streamId);
-					break;
-				case SliceReadStatus.Success:
-					Dump("Dumping..", streamId, result.Events.Reverse().ToArray());
-					break;
-			}
-#endif
-		}
-
-#if DEBUG
-		private void DumpFailed(string message, string streamId, string[] events, ResolvedEvent[] resultEvents) {
-			var expected = events.Aggregate("", (a, v) => a + ", " + v);
-			var actual = resultEvents.Aggregate(
-				"", (a, v) => a + ", " + v.Event.EventType + ":" + v.Event.DebugDataView());
-
-			var actualMeta = resultEvents.Aggregate(
-				"", (a, v) => a + "\r\n" + v.Event.EventType + ":" + v.Event.DebugMetadataView());
-
-
-			Assert.Fail(
-				"Stream: '{0}'\r\n{1}\r\n\r\nExisting events: \r\n{2}\r\n Expected events: \r\n{3}\r\n\r\nActual metas:{4}",
-				streamId,
-				message, actual, expected, actualMeta);
-		}
-
-		private void Dump(string message, string streamId, ResolvedEvent[] resultEvents) {
-			var actual = resultEvents.Aggregate(
-				"", (a, v) => a + ", " + v.OriginalEvent.EventType + ":" + v.OriginalEvent.DebugDataView());
-
-			var actualMeta = resultEvents.Aggregate(
-				"", (a, v) => a + "\r\n" + v.OriginalEvent.EventType + ":" + v.OriginalEvent.DebugMetadataView());
-
-			Debug.WriteLine(
-				"Stream: '{0}'\r\n{1}\r\n\r\nExisting events: \r\n{2}\r\n \r\nActual metas:{3}", streamId,
-				message, actual, actualMeta);
-		}
-#endif
-
-		protected async Task PostProjection(string query) {
-			await _manager.CreateContinuousAsync("test-projection", query, _admin);
-			WaitIdle();
-		}
-	}
-
-	[Explicit]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class vnode_cluster_specification<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		[Test, Explicit]
-		public async Task vnode_cluster_starts() {
-			await PostProjection(@"fromStream('$user-admin').outputState()");
-			await AssertStreamTailAsync("$projections-test-projection-result", "Result:{}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/RecordedEventExtensions.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/RecordedEventExtensions.cs
deleted file mode 100644
index 9aed83efdf5..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/RecordedEventExtensions.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Text;
-using EventStore.ClientAPI;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI {
-	internal static class RecordedEventExtensions {
-		public static string DebugDataView(this RecordedEvent source) => Encoding.UTF8.GetString(source.Data);
-		public static string DebugMetadataView(this RecordedEvent source) => Encoding.UTF8.GetString(source.Metadata);
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/event_by_type_index/when_reverting_after_index_catches_up.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/event_by_type_index/when_reverting_after_index_catches_up.cs
deleted file mode 100644
index 9ec5369de84..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/event_by_type_index/when_reverting_after_index_catches_up.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.event_by_type_index {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_reverting_after_index_catches_up<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			WaitIdle();
-			await PostProjection(@"
-fromAll().foreachStream().when({
-    $init: function(){return {a:0}},
-    type1: function(s,e){s.a++},
-    type2: function(s,e){s.a++},
-    $deleted: function(s,e){s.deleted=1;},
-}).outputState();
-");
-			await _manager.AbortAsync("test-projection", _admin);
-			WaitIdle();
-
-			await EnableStandardProjections();
-			WaitIdle();
-			await DisableStandardProjections();
-			WaitIdle();
-			await EnableStandardProjections();
-			WaitIdle();
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await _manager.EnableAsync("test-projection", _admin);
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":1}", "Result:{\"a\":2}");
-			await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":1}", "Result:{\"a\":2}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/list_projections.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/list_projections.cs
deleted file mode 100644
index 2b7b8a43c8c..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/list_projections.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class list_projections<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		const string TestProjection =
-			"fromAll().when({$init: function (state, ev) {return {};},ConversationStarted: function (state, ev) {state.lastBatchSent = ev;return state;}});";
-
-		[Test]
-		public async Task list_all_projections_works() {
-			var x = await _manager.ListAllAsync(new UserCredentials("admin", "changeit"));
-			Assert.AreEqual(true, x.Any());
-			Assert.IsTrue(x.Any(p => p.Name == "$streams"));
-		}
-
-		[Test]
-		public async Task list_oneTime_projections_works() {
-			await _manager.CreateOneTimeAsync(TestProjection, new UserCredentials("admin", "changeit"));
-			var x = await _manager.ListOneTimeAsync(new UserCredentials("admin", "changeit"));
-			Assert.AreEqual(true, x.Any(p => p.Mode == "OneTime"));
-		}
-
-		[Test]
-		public async Task list_continuous_projections_works() {
-			var nameToTest = Guid.NewGuid().ToString();
-			await _manager.CreateContinuousAsync(nameToTest, TestProjection, new UserCredentials("admin", "changeit"));
-			var x = await _manager.ListContinuousAsync(new UserCredentials("admin", "changeit"));
-			Assert.AreEqual(true, x.Any(p => p.Name == nameToTest));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/projectionsManager/SpecificationWithNodeAndProjectionsManager.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/projectionsManager/SpecificationWithNodeAndProjectionsManager.cs
deleted file mode 100644
index d1e3868bf8e..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/projectionsManager/SpecificationWithNodeAndProjectionsManager.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using NUnit.Framework;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Projections;
-using EventStore.ClientAPI.Common.Log;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Common.Options;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Services;
-using EventStore.Core.Util;
-using EventStore.Projections.Core.Services.Processing;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.projectionsManager {
-	public abstract class SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		protected MiniNode<TLogFormat, TStreamId> _node;
-		protected ProjectionsManager _projManager;
-		protected IEventStoreConnection _connection;
-		protected UserCredentials _credentials;
-		protected TimeSpan _timeout;
-		protected string _tag;
-		private Task _systemProjectionsCreated;
-		private ProjectionsSubsystem _projectionsSubsystem;
-
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-			_credentials = new UserCredentials(SystemUsers.Admin, SystemUsers.DefaultAdminPassword);
-			_timeout = TimeSpan.FromSeconds(20);
-			// Check if a node is running in ProjectionsManagerTestSuiteMarkerBase
-			_tag = "_1";
-
-			_node = CreateNode();
-			await _node.Start().WithTimeout(_timeout);
-
-			await _systemProjectionsCreated.WithTimeout(_timeout);
-
-			_connection = TestConnection.Create(_node.TcpEndPoint);
-			await _connection.ConnectAsync();
-
-			_projManager = new ProjectionsManager(new ConsoleLogger(), _node.HttpEndPoint, _timeout, _node.HttpMessageHandler);
-			try {
-				await Given().WithTimeout(_timeout);
-			} catch (Exception ex) {
-				throw new Exception("Given Failed", ex);
-			}
-
-			try {
-				await When().WithTimeout(_timeout);
-			} catch (Exception ex) {
-				throw new Exception("When Failed", ex);
-			}
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			_connection.Close();
-			await _node.Shutdown();
-
-			await base.TestFixtureTearDown();
-		}
-
-		public abstract Task Given();
-		public abstract Task When();
-
-		protected MiniNode<TLogFormat, TStreamId> CreateNode() {
-			_projectionsSubsystem = new ProjectionsSubsystem(new ProjectionSubsystemOptions(1, ProjectionType.All, false, TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault), Opts.FaultOutOfOrderProjectionsDefault, 500, 250));
-			_systemProjectionsCreated = SystemProjections.Created(_projectionsSubsystem.LeaderInputBus);
-			return new MiniNode<TLogFormat, TStreamId>(
-				PathName, inMemDb: true,
-				subsystems: [_projectionsSubsystem]);
-		}
-
-		protected EventData CreateEvent(string eventType, string data) {
-			return new EventData(Guid.NewGuid(), eventType, true, Encoding.UTF8.GetBytes(data), null);
-		}
-
-		protected Task PostEvent(string stream, string eventType, string data) {
-			return _connection.AppendToStreamAsync(stream, ExpectedVersion.Any, new[] { CreateEvent(eventType, data) });
-		}
-
-		protected Task CreateOneTimeProjection() {
-			var query = CreateStandardQuery(Guid.NewGuid().ToString());
-			return _projManager.CreateOneTimeAsync(query, _credentials);
-		}
-
-		protected Task CreateContinuousProjection(string projectionName) {
-			var query = CreateStandardQuery(Guid.NewGuid().ToString());
-			return _projManager.CreateContinuousAsync(projectionName, query, _credentials);
-		}
-
-		protected string CreateStandardQuery(string stream) {
-			return @"fromStream(""" + stream + @""")
-                .when({
-                    ""$any"":function(s,e) {
-                        s.count = 1;
-                        return s;
-                    }
-            });";
-		}
-
-		protected string CreateEmittingQuery(string stream, string emittingStream) {
-			return @"fromStream(""" + stream + @""")
-                .when({
-                    ""$any"":function(s,e) {
-                        emit(""" + emittingStream + @""", ""emittedEvent"", e);
-                    }
-                });";
-		}
-
-		private List<string> _systemProjections =>
-			typeof(ProjectionNamesBuilder.StandardProjections).GetFields(
-					System.Reflection.BindingFlags.Public |
-					System.Reflection.BindingFlags.Static |
-					System.Reflection.BindingFlags.FlattenHierarchy)
-				.Where(x => x.IsLiteral && !x.IsInitOnly)
-				.Select(x => x.GetRawConstantValue().ToString())
-				.ToList();
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/projectionsManager/projectionsManagerTests.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/projectionsManager/projectionsManagerTests.cs
deleted file mode 100644
index 94fd5ccabca..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/projectionsManager/projectionsManagerTests.cs
+++ /dev/null
@@ -1,352 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using NUnit.Framework;
-using Newtonsoft.Json.Linq;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Projections;
-using EventStore.Common.Utils;
-using EventStore.Core.Tests;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.projectionsManager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	[Category("ProjectionsManager")]
-	public class when_creating_one_time_projection<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
-		private string _streamName;
-		private string _query;
-
-		public override async Task Given() {
-			_streamName = "test-stream-" + Guid.NewGuid().ToString();
-			await PostEvent(_streamName, "testEvent", "{\"A\":\"1\"}");
-			await PostEvent(_streamName, "testEvent", "{\"A\":\"2\"}");
-
-			_query = CreateStandardQuery(_streamName);
-		}
-
-		public override Task When() {
-			return _projManager.CreateOneTimeAsync(_query, _credentials);
-		}
-
-		[Test]
-		public async Task should_create_projection() {
-			var projections = await _projManager.ListOneTimeAsync(_credentials);
-			Assert.AreEqual(1, projections.Count);
-		}
-	}
-
-	[Category("ProjectionsManager")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_creating_transient_projection<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
-		private string _streamName;
-		private string _projectionName;
-		private string _query;
-
-		public override async Task Given() {
-			_streamName = "test-stream-" + Guid.NewGuid().ToString();
-			_projectionName = "when_creating_transient_projection";
-			await PostEvent(_streamName, "testEvent", "{\"A\":\"1\"}");
-			await PostEvent(_streamName, "testEvent", "{\"A\":\"2\"}");
-
-			_query = CreateStandardQuery(_streamName);
-		}
-
-		public override Task When() {
-			return _projManager.CreateTransientAsync(_projectionName, _query, _credentials);
-		}
-
-		[Test]
-		public async Task should_create_projection() {
-			var status = await _projManager.GetStatusAsync(_projectionName, _credentials);
-			Assert.IsNotEmpty(status);
-		}
-	}
-
-	[Category("ProjectionsManager")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_creating_continuous_projection<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
-		private string _streamName;
-		private string _emittedStreamName;
-		private string _projectionName;
-		private string _query;
-		private string _projectionId;
-
-		public override async Task Given() {
-			_streamName = "test-stream-" + Guid.NewGuid().ToString();
-			_projectionName = "when_creating_continuous_projection";
-			_emittedStreamName = "emittedStream-" + Guid.NewGuid().ToString();
-			await PostEvent(_streamName, "testEvent", "{\"A\":\"1\"}");
-			await PostEvent(_streamName, "testEvent", "{\"A\":\"2\"}");
-
-			_query = CreateEmittingQuery(_streamName, _emittedStreamName);
-		}
-
-		public override Task When() {
-			return _projManager.CreateContinuousAsync(_projectionName, _query, _credentials);
-		}
-
-		[Test]
-		public async Task should_create_projection() {
-			var allProjections = await _projManager.ListContinuousAsync(_credentials);
-			var proj = allProjections.FirstOrDefault(x => x.EffectiveName == _projectionName);
-			_projectionId = proj.Name;
-			Assert.IsNotNull(proj);
-		}
-
-		[Test]
-		public async Task should_have_turn_on_emit_to_stream() {
-			var events = await _connection
-				.ReadEventAsync(string.Format("$projections-{0}", _projectionId), 0, true, _credentials);
-			var data = System.Text.Encoding.UTF8.GetString(events.Event.Value.Event.Data);
-			var eventData = data.ParseJson<JObject>();
-			Assert.IsTrue((bool)eventData["emitEnabled"]);
-		}
-	}
-
-	[Category("ProjectionsManager")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_creating_continuous_projection_with_track_emitted_streams<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
-		private string _streamName;
-		private string _emittedStreamName;
-		private string _projectionName;
-		private string _query;
-		private string _projectionId;
-
-		public override async Task Given() {
-			_streamName = "test-stream-" + Guid.NewGuid().ToString();
-			_projectionName = "when_creating_continuous_projection_with_track_emitted_streams";
-			_emittedStreamName = "emittedStream-" + Guid.NewGuid().ToString();
-			await PostEvent(_streamName, "testEvent", "{\"A\":\"1\"}");
-
-			_query = CreateEmittingQuery(_streamName, _emittedStreamName);
-		}
-
-		public override Task When() {
-			return _projManager.CreateContinuousAsync(_projectionName, _query, true, _credentials);
-		}
-
-		[Test]
-		public async Task should_create_projection() {
-			var allProjections = await _projManager.ListContinuousAsync(_credentials);
-			var proj = allProjections.FirstOrDefault(x => x.EffectiveName == _projectionName);
-			_projectionId = proj.Name;
-			Assert.IsNotNull(proj);
-		}
-
-		[Test]
-		public async Task should_enable_track_emitted_streams() {
-			var events = await _connection
-				.ReadEventAsync(string.Format("$projections-{0}", _projectionId), 0, true, _credentials);
-			var data = System.Text.Encoding.UTF8.GetString(events.Event.Value.Event.Data);
-			var eventData = data.ParseJson<JObject>();
-			Assert.IsTrue((bool)eventData["trackEmittedStreams"]);
-		}
-	}
-
-	[Category("ProjectionsManager")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_disabling_projections<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
-		private string _streamName;
-		private string _projectionName;
-		private string _query;
-
-		public override async Task Given() {
-			_streamName = "test-stream-" + Guid.NewGuid().ToString();
-			_projectionName = "when_disabling_projection";
-			await PostEvent(_streamName, "testEvent", "{\"A\":\"1\"}");
-			await PostEvent(_streamName, "testEvent", "{\"A\":\"2\"}");
-
-			_query = CreateStandardQuery(_streamName);
-
-			await _projManager.CreateContinuousAsync(_projectionName, _query, _credentials);
-		}
-
-		public override Task When() {
-			return _projManager.DisableAsync(_projectionName, _credentials);
-		}
-
-		[Test]
-		public async Task should_stop_the_projection() {
-			var projectionStatus = await _projManager.GetStatusAsync(_projectionName, _credentials);
-			var status = projectionStatus.ParseJson<JObject>()["status"].ToString();
-			Assert.IsTrue(status.Contains("Stopped"));
-		}
-	}
-
-	[Category("ProjectionsManager")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_enabling_projections<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
-		private string _streamName;
-		private string _projectionName;
-		private string _query;
-
-		public override async Task Given() {
-			_streamName = "test-stream-" + Guid.NewGuid().ToString();
-			_projectionName = "when_enabling_projections";
-			await PostEvent(_streamName, "testEvent", "{\"A\":\"1\"}");
-			await PostEvent(_streamName, "testEvent", "{\"A\":\"2\"}");
-
-			_query = CreateStandardQuery(_streamName);
-
-			await _projManager.CreateContinuousAsync(_projectionName, _query, _credentials);
-			await _projManager.DisableAsync(_projectionName, _credentials);
-		}
-
-		public override Task When() {
-			return _projManager.EnableAsync(_projectionName, _credentials);
-		}
-
-		[Test]
-		public async Task should_reenable_projection() {
-			var projectionStatus = await _projManager.GetStatusAsync(_projectionName, _credentials);
-			var status = projectionStatus.ParseJson<JObject>()["status"].ToString();
-			Assert.IsTrue(status.Contains("Running"));
-		}
-	}
-
-	[Category("ProjectionsManager")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_listing_the_projections<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
-		private List<ProjectionDetails> _result;
-
-		public override Task Given() {
-			return CreateContinuousProjection(Guid.NewGuid().ToString());
-		}
-
-		public override async Task When() {
-			_result = await _projManager.ListAllAsync(_credentials);
-		}
-
-		[Test]
-		public void should_return_all_projections() {
-			Assert.IsNotEmpty(_result);
-		}
-	}
-
-	[Category("ProjectionsManager")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_listing_one_time_projections<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
-		private List<ProjectionDetails> _result;
-
-		public override Task Given() {
-			return CreateOneTimeProjection();
-		}
-
-		public override async Task When() {
-			_result = (await _projManager.ListOneTimeAsync(_credentials)).ToList();
-		}
-
-		[Test]
-		public void should_return_projections() {
-			Assert.IsNotEmpty(_result);
-		}
-	}
-
-	[Category("ProjectionsManager")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_listing_continuous_projections<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
-		private List<ProjectionDetails> _result;
-		private string _projectionName;
-
-		public override Task Given() {
-			_projectionName = Guid.NewGuid().ToString();
-			return CreateContinuousProjection(_projectionName);
-		}
-
-		public override async Task When() {
-			_result = (await _projManager.ListContinuousAsync(_credentials)).ToList();
-		}
-
-		[Test]
-		public void should_return_continuous_projections() {
-			Assert.IsTrue(_result.Any(x => x.EffectiveName == _projectionName));
-		}
-	}
-
-	[Category("ProjectionsManager")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_a_projection_is_running<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
-		private string _projectionName;
-		private string _streamName;
-		private string _query;
-
-		public override async Task Given() {
-			_projectionName = "when_getting_projection_information";
-			_streamName = "test-stream-" + Guid.NewGuid().ToString();
-
-			await PostEvent(_streamName, "testEvent", "{\"A\":\"1\"}");
-			await PostEvent(_streamName, "testEvent", "{\"A\":\"2\"}");
-		}
-
-		public override Task When() {
-			_query = CreateStandardQuery(_streamName);
-			return _projManager.CreateContinuousAsync(_projectionName, _query, _credentials);
-		}
-
-		[Test]
-		public async Task should_be_able_to_get_the_projection_state() {
-			var state = await _projManager.GetStateAsync(_projectionName, _credentials);
-			Assert.IsNotEmpty(state);
-		}
-
-		[Test]
-		public async Task should_be_able_to_get_the_projection_status() {
-			var status = await _projManager.GetStatusAsync(_projectionName, _credentials);
-			Assert.IsNotEmpty(status);
-		}
-
-		[Test]
-		public async Task should_be_able_to_get_the_projection_result() {
-			var result = await _projManager.GetResultAsync(_projectionName, _credentials);
-			Assert.AreEqual("{\"count\":1}", result);
-		}
-
-		[Test]
-		public async Task should_be_able_to_get_the_projection_query() {
-			var query = await _projManager.GetQueryAsync(_projectionName, _credentials);
-			Assert.AreEqual(_query, query);
-		}
-	}
-
-	[Category("ProjectionsManager")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_updating_a_projection_query<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
-		private string _projectionName;
-		private string _streamName;
-		private string _newQuery;
-
-		public override async Task Given() {
-			_projectionName = "when_updating_a_projection_query";
-			_streamName = "test-stream-" + Guid.NewGuid().ToString();
-
-			await PostEvent(_streamName, "testEvent", "{\"A\":\"1\"}");
-			await PostEvent(_streamName, "testEvent", "{\"A\":\"2\"}");
-
-			var origQuery = CreateStandardQuery(_streamName);
-			_newQuery = CreateStandardQuery("DifferentStream");
-			await _projManager.CreateContinuousAsync(_projectionName, origQuery, _credentials);
-		}
-
-		public override Task When() {
-			return _projManager.UpdateQueryAsync(_projectionName, _newQuery, _credentials);
-		}
-
-		[Test]
-		public async Task should_update_the_projection_query() {
-			var query = await _projManager.GetQueryAsync(_projectionName, _credentials);
-			Assert.AreEqual(_newQuery, query);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/specification_with_standard_projections_runnning.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/specification_with_standard_projections_runnning.cs
deleted file mode 100644
index f9ed5b5df42..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/specification_with_standard_projections_runnning.cs
+++ /dev/null
@@ -1,256 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Common.Log;
-using EventStore.ClientAPI.Projections;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Common.Options;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.Util;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.ClientAPI.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI {
-	[Category("ClientAPI")]
-	public abstract class specification_with_standard_projections_runnning<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
-		protected IEventStoreConnection _conn;
-		protected UserCredentials _admin = DefaultData.AdminCredentials;
-		protected ProjectionsManager _manager;
-		protected QueryManager _queryManager;
-
-		private Task _projectionsCreated;
-		private ProjectionsSubsystem _projections;
-		private MiniNode<TLogFormat, TStreamId> _node;
-
-		[OneTimeSetUp]
-		public override async Task TestFixtureSetUp() {
-			await base.TestFixtureSetUp();
-
-			var projectionWorkerThreadCount = GivenWorkerThreadCount();
-			var configuration = new ProjectionSubsystemOptions(
-				projectionWorkerThreadCount,
-				ProjectionType.All,
-				false,
-				TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault),
-				Opts.FaultOutOfOrderProjectionsDefault,
-				500,
-				250);
-			_projections = new ProjectionsSubsystem(configuration);
-			_node = new MiniNode<TLogFormat, TStreamId>(
-				PathName, inMemDb: true,
-				subsystems: [_projections]);
-			_projectionsCreated = SystemProjections.Created(_projections.LeaderInputBus);
-
-			await _node.Start();
-			_conn = EventStoreConnection.Create(new ConnectionSettingsBuilder()
-				.DisableServerCertificateValidation()
-				.Build(), _node.TcpEndPoint);
-			await _conn.ConnectAsync();
-
-			_manager = new ProjectionsManager(
-				new ConsoleLogger(),
-				_node.HttpEndPoint,
-				TimeSpan.FromMilliseconds(20000),
-				_node.HttpMessageHandler);
-
-			_queryManager = new QueryManager(
-				new ConsoleLogger(),
-				_node.HttpEndPoint,
-				TimeSpan.FromMilliseconds(20000),
-				TimeSpan.FromMilliseconds(20000),
-				_node.HttpMessageHandler);
-
-			WaitIdle();
-
-			if (GivenStandardProjectionsRunning())
-				await EnableStandardProjections();
-
-			WaitIdle();
-			try {
-				await Given().WithTimeout(TimeSpan.FromSeconds(10));
-			} catch (Exception ex) {
-				throw new Exception("Given Failed", ex);
-			}
-
-			try {
-				await When().WithTimeout(TimeSpan.FromSeconds(10));
-			} catch (Exception ex) {
-				throw new Exception("When Failed", ex);
-			}
-		}
-
-		protected virtual int GivenWorkerThreadCount() {
-			return 1;
-		}
-
-		[TearDown]
-		public async Task PostTestAsserts() {
- 			var all = await _manager.ListAllAsync(_admin);
- 			if (all.Any(p => p.Name == "Faulted"))
- 				Assert.Fail("Projections faulted while running the test" + "\r\n" + all);
-		}
-
-		protected async Task EnableStandardProjections() {
-			await _projectionsCreated;
-			await EnableProjection(ProjectionNamesBuilder.StandardProjections.EventByCategoryStandardProjection);
-			await EnableProjection(ProjectionNamesBuilder.StandardProjections.EventByTypeStandardProjection);
-			await EnableProjection(ProjectionNamesBuilder.StandardProjections.StreamByCategoryStandardProjection);
-			await EnableProjection(ProjectionNamesBuilder.StandardProjections.StreamsStandardProjection);
-		}
-
-		protected async Task DisableStandardProjections() {
-			await DisableProjection(ProjectionNamesBuilder.StandardProjections.EventByCategoryStandardProjection);
-			await DisableProjection(ProjectionNamesBuilder.StandardProjections.EventByTypeStandardProjection);
-			await DisableProjection(ProjectionNamesBuilder.StandardProjections.StreamByCategoryStandardProjection);
-			await DisableProjection(ProjectionNamesBuilder.StandardProjections.StreamsStandardProjection);
-		}
-
-		protected virtual bool GivenStandardProjectionsRunning() {
-			return true;
-		}
-
-		protected Task EnableProjection(string name) {
-			return _manager.EnableAsync(name, _admin);
-		}
-
-		protected Task DisableProjection(string name) {
-			return _manager.DisableAsync(name, _admin);
-		}
-
-		[OneTimeTearDown]
-		public override async Task TestFixtureTearDown() {
-			if (_conn != null)
-				_conn.Close();
-
-			if (_node != null)
-				await _node.Shutdown();
-
-			await base.TestFixtureTearDown();
-		}
-
-		protected virtual Task When() => Task.CompletedTask;
-
-		protected virtual Task Given() => Task.CompletedTask;
-
-		protected Task PostEvent(string stream, string eventType, string data) {
-			return _conn.AppendToStreamAsync(stream, ExpectedVersion.Any, CreateEvent(eventType, data));
-		}
-
-		protected Task HardDeleteStream(string stream) {
-			return _conn.DeleteStreamAsync(stream, ExpectedVersion.Any, true, _admin);
-		}
-
-		protected Task SoftDeleteStream(string stream) {
-			return _conn.DeleteStreamAsync(stream, ExpectedVersion.Any, false, _admin);
-		}
-
-		protected static EventData CreateEvent(string type, string data) {
-			return new EventData(Guid.NewGuid(), type, true, Encoding.UTF8.GetBytes(data), new byte[0]);
-		}
-
-		protected void WaitIdle(int multiplier = 1) {
-#if DEBUG
-			_node.WaitIdle();
-#endif
-		}
-
-#pragma warning disable 1998
-		protected async Task AssertStreamTail(string streamId, params string[] events) {
-#pragma warning restore 1998
-#if DEBUG
-			await Task.Delay(TimeSpan.FromMilliseconds(500));
-			var result = await _conn.ReadStreamEventsBackwardAsync(streamId, -1, events.Length, true, _admin);
-			switch (result.Status) {
-				case SliceReadStatus.StreamDeleted:
-					Assert.Fail("Stream '{0}' is deleted", streamId);
-					break;
-				case SliceReadStatus.StreamNotFound:
-					Assert.Fail("Stream '{0}' does not exist", streamId);
-					break;
-				case SliceReadStatus.Success:
-					var resultEventsReversed = result.Events.Reverse().ToArray();
-					if (resultEventsReversed.Length < events.Length)
-						DumpFailed("Stream does not contain enough events", streamId, events, result.Events);
-					else {
-						for (var index = 0; index < events.Length; index++) {
-							var parts = events[index].Split(new char[] {':'}, 2);
-							var eventType = parts[0];
-							var eventData = parts[1];
-
-							if (resultEventsReversed[index].Event.EventType != eventType)
-								DumpFailed("Invalid event type", streamId, events, resultEventsReversed);
-							else if (resultEventsReversed[index].Event.DebugDataView() != eventData)
-								DumpFailed("Invalid event body", streamId, events, resultEventsReversed);
-						}
-					}
-
-					break;
-			}
-#endif
-		}
-
-#pragma warning disable 1998
-		protected async Task DumpStream(string streamId) {
-#pragma warning restore 1998
-#if DEBUG
-			var result = await _conn.ReadStreamEventsBackwardAsync(streamId, -1, 100, true, _admin);
-			switch (result.Status) {
-				case SliceReadStatus.StreamDeleted:
-					Assert.Fail("Stream '{0}' is deleted", streamId);
-					break;
-				case SliceReadStatus.StreamNotFound:
-					Assert.Fail("Stream '{0}' does not exist", streamId);
-					break;
-				case SliceReadStatus.Success:
-					Dump("Dumping..", streamId, result.Events.Reverse().ToArray());
-					break;
-			}
-#endif
-		}
-
-#if DEBUG
-		private void DumpFailed(string message, string streamId, string[] events, ResolvedEvent[] resultEvents) {
-			var expected = events.Aggregate("", (a, v) => a + ", " + v);
-			var actual = resultEvents.Aggregate(
-				"", (a, v) => a + ", " + v.Event.EventType + ":" + v.Event.DebugDataView());
-
-			var actualMeta = resultEvents.Aggregate(
-				"", (a, v) => a + "\r\n" + v.Event.EventType + ":" + v.Event.DebugMetadataView());
-
-
-			Assert.Fail(
-				"Stream: '{0}'\r\n{1}\r\n\r\nExisting events: \r\n{2}\r\n Expected events: \r\n{3}\r\n\r\nActual metas:{4}",
-				streamId,
-				message, actual, expected, actualMeta);
-		}
-
-		protected void Dump(string message, string streamId, ResolvedEvent[] resultEvents) {
-			var actual = resultEvents.Aggregate(
-				"", (a, v) => a + ", " + v.OriginalEvent.EventType + ":" + v.OriginalEvent.DebugDataView());
-
-			var actualMeta = resultEvents.Aggregate(
-				"", (a, v) => a + "\r\n" + v.OriginalEvent.EventType + ":" + v.OriginalEvent.DebugMetadataView());
-
-
-			Debug.WriteLine(
-				"Stream: '{0}'\r\n{1}\r\n\r\nExisting events: \r\n{2}\r\n \r\nActual metas:{3}", streamId,
-				message, actual, actualMeta);
-		}
-#endif
-
-		protected async Task PostProjection(string query) {
-			await _manager.CreateContinuousAsync("test-projection", query, _admin);
-			WaitIdle();
-		}
-
-		protected async Task PostQuery(string query) {
-			await _manager.CreateTransientAsync("query", query, _admin);
-			WaitIdle();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_executing_query/with_long_from_all_query/when_getting_result.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_executing_query/with_long_from_all_query/when_getting_result.cs
deleted file mode 100644
index babc1e46696..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_executing_query/with_long_from_all_query/when_getting_result.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.query_result.with_long_from_all_query {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_getting_result<TLogFormat, TStreamId>
-		: specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override async Task Given() {
-			await base.Given();
-
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type1", "{}");
-
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		public async Task waits_for_results() {
-			const string query = @"
-fromAll().when({
-    $init: function(){return {count:0}},
-    type1: function(s,e){
-        var start = new Date();
-        while(new Date()-start < 150){}
-        
-        s.count++;
-    },
-});
-";
-
-			var result = await _queryManager
-				.ExecuteAsync("query", query, TimeSpan.FromMilliseconds(100), TimeSpan.FromMilliseconds(5000), _admin)
-;
-			Assert.AreEqual("{\"count\":3}", result);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_executing_query/with_long_from_all_query/when_getting_result_and_timeout_exceeded.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_executing_query/with_long_from_all_query/when_getting_result_and_timeout_exceeded.cs
deleted file mode 100644
index 23460d3f7a2..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_executing_query/with_long_from_all_query/when_getting_result_and_timeout_exceeded.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-using static EventStore.Core.Tests.AssertEx;
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_executing_query.with_long_from_all_query {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_getting_result_and_timeout_exceeded<TLogFormat, TStreamId>
-		: specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override async Task Given() {
-			await base.Given();
-
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type1", "{}");
-
-			WaitIdle();
-		}
-
-		[Test, Category("Network"), Timeout(60000)]
-		public async Task throws_exception() {
-			const string query = @"
-fromAll().when({
-    $init: function(){return {count:0}},
-    type1: function(s,e){
-        var start = new Date();
-        while(new Date()-start < 1e7){}
-        
-        s.count++;
-    },
-});
-";
-			await ThrowsAsync<OperationTimedOutException>(() => _queryManager.ExecuteAsync("query", query,
-				TimeSpan.FromMilliseconds(100), TimeSpan.FromMilliseconds(5000), _admin));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_created/with_from_all_any_foreach_projection/when_running_and_events_are_posted.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_created/with_from_all_any_foreach_projection/when_running_and_events_are_posted.cs
deleted file mode 100644
index d11040a4c18..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_created/with_from_all_any_foreach_projection/when_running_and_events_are_posted.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_created.with_from_all_any_foreach_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_running_and_events_are_posted<TLogFormat, TStreamId>
-		: specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			WaitIdle();
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await PostProjection(@"
-fromAll().foreachStream().when({
-    $init: function(){return {a:0}},
-    $any: function(s,e) {s.a++;},
-    $created: function(s,e){s.a++;},
-}).outputState();
-");
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		public async Task receives_created_notification() {
-			await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":3}");
-			await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":3}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_created/with_from_all_foreach_projection/when_running_and_events_are_indexed.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_created/with_from_all_foreach_projection/when_running_and_events_are_indexed.cs
deleted file mode 100644
index 3fd98e5be92..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_created/with_from_all_foreach_projection/when_running_and_events_are_indexed.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_created.with_from_all_foreach_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_running_and_events_are_indexed<TLogFormat, TStreamId>
-		: specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await PostProjection(@"
-fromAll().foreachStream().when({
-    $init: function(){return {a:0}},
-    type1: function(s,e){s.a++;},
-    type2: function(s,e){s.a++;},
-    $created: function(s,e){s.a++;},
-}).outputState();
-");
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":3}");
-			await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":3}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_created/with_from_category_foreach_projection/when_running_and_events_are_indexed.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_created/with_from_category_foreach_projection/when_running_and_events_are_indexed.cs
deleted file mode 100644
index 06ab775353b..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_created/with_from_category_foreach_projection/when_running_and_events_are_indexed.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_created.with_from_category_foreach_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_running_and_events_are_indexed<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			WaitIdle();
-			await EnableStandardProjections();
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await PostProjection(@"
-fromCategory('stream').foreachStream().when({
-    $init: function(){return {a:0}},
-    type1: function(s,e){s.a++;},
-    type2: function(s,e){s.a++;},
-    $created: function(s,e){s.a++;},
-}).outputState();
-");
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":3}");
-			await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":3}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/recovery/when_running_and_a_stream_gets_deleted_before_recovery.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/recovery/when_running_and_a_stream_gets_deleted_before_recovery.cs
deleted file mode 100644
index 9c295332d89..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/recovery/when_running_and_a_stream_gets_deleted_before_recovery.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_any_foreach_projection.
-	recovery {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_running_and_a_stream_gets_deleted_before_recovery<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			WaitIdle();
-			await PostProjection(@"
-fromAll().foreachStream().when({
-    $init: function(){return {a:0}},
-    $any: function(s,e){s.a++},
-    $deleted: function(s,e){s.deleted=1;},
-}).outputState();
-");
-			WaitIdle();
-			await _manager.AbortAsync("test-projection", _admin);
-			WaitIdle();
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await HardDeleteStream("stream-1");
-			WaitIdle();
-			await _manager.EnableAsync("test-projection", _admin);
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
-			await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":2}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/recovery/when_running_and_events_are_posted.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/recovery/when_running_and_events_are_posted.cs
deleted file mode 100644
index 6debf2ad352..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/recovery/when_running_and_events_are_posted.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_any_foreach_projection.
-	recovery {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_running_and_events_are_posted<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			WaitIdle();
-			await PostProjection(@"
-fromAll().foreachStream().when({
-    $init: function(){return {a:0}},
-    $any: function(s,e){s.a++},
-    $deleted: function(s,e){s.deleted=1;},
-}).outputState();
-");
-			WaitIdle();
-			await HardDeleteStream("stream-1");
-			WaitIdle();
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await _manager.AbortAsync("test-projection", _admin);
-			WaitIdle();
-			await _manager.EnableAsync("test-projection", _admin);
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
-			await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":2}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted.cs
deleted file mode 100644
index 7c7d86b7334..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_any_foreach_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_running_and_events_are_posted<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			await HardDeleteStream("stream-1");
-			WaitIdle();
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await PostProjection(@"
-fromAll().foreachStream().when({
-    $init: function(){return {a:0}},
-    $any: function(s,e){s.a++},
-    $deleted: function(s,e){s.deleted=1;},
-}).outputState();
-");
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
-			await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":2}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted_but_a_stream_and_tombstone_postponed.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted_but_a_stream_and_tombstone_postponed.cs
deleted file mode 100644
index 7744c65dcda..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted_but_a_stream_and_tombstone_postponed.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_any_foreach_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_running_and_events_are_posted_but_a_stream_and_tombstone_postponed<TLogFormat, TStreamId> :
-		specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			WaitIdle();
-
-			await PostProjection(@"
-fromAll().foreachStream().when({
-    $init: function(){return {a:0}},
-    $any: function(s,e){s.a++},
-    $deleted: function(s,e){s.deleted=1;},
-}).outputState();
-");
-			WaitIdle();
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			WaitIdle();
-			await HardDeleteStream("stream-1");
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted_but_tombstone.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted_but_tombstone.cs
deleted file mode 100644
index c914ea77995..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted_but_tombstone.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_any_foreach_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_running_and_events_are_posted_but_tombstone<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			WaitIdle();
-			await PostProjection(@"
-fromAll().foreachStream().when({
-    $init: function(){return {a:0}},
-    $any: function(s,e){s.a++},
-    $deleted: function(s,e){s.deleted=1;},
-}).outputState();
-");
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await HardDeleteStream("stream-1");
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted_including_tombstone.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted_including_tombstone.cs
deleted file mode 100644
index 3ba5dac9bb2..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted_including_tombstone.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_any_foreach_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_running_and_events_are_posted_including_tombstone<TLogFormat, TStreamId> :
-		specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await HardDeleteStream("stream-1");
-			WaitIdle();
-			await EnableStandardProjections();
-			WaitIdle();
-		}
-
-		protected override async Task When() {
-			await base.When();
-
-			await PostProjection(@"
-fromAll().foreachStream().when({
-    $init: function(){return {a:0}},
-    $any: function(s,e){s.a++},
-    $deleted: function(s,e){s.deleted=1;},
-}).outputState();
-");
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_then_other_events_tombstone_ant_other_events.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_then_other_events_tombstone_ant_other_events.cs
deleted file mode 100644
index 46b1306035a..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_then_other_events_tombstone_ant_other_events.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_any_foreach_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_running_and_then_other_events_tombstone_ant_other_events<TLogFormat, TStreamId> :
-			specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostProjection(@"
-fromAll().foreachStream().when({
-    $init: function(){return {a:0}},
-    $any: function(s,e){s.a++},
-    $deleted: function(s,e){s.deleted=1;},
-}).outputState();
-");
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			WaitIdle();
-			await HardDeleteStream("stream-1");
-			WaitIdle();
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			await PostEvent("stream-3", "type1", "{}");
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail(
-				"$projections-test-projection-stream-1-result", "Result:{\"a\":2}", "Result:{\"a\":2,\"deleted\":1}");
-			await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":4}");
-			await AssertStreamTail("$projections-test-projection-stream-3-result", "Result:{\"a\":1}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/recovery/when_running_and_events_are_indexed.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/recovery/when_running_and_events_are_indexed.cs
deleted file mode 100644
index 20f305a5d88..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/recovery/when_running_and_events_are_indexed.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_foreach_projection.recovery {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_running_and_events_are_indexed<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			WaitIdle();
-			await EnableStandardProjections();
-			WaitIdle();
-			await PostProjection(@"
-fromAll().foreachStream().when({
-    $init: function(){return {a:0}},
-    type1: function(s,e){s.a++},
-    type2: function(s,e){s.a++},
-    $deleted: function(s,e){s.deleted=1},
-}).outputState();
-");
-			WaitIdle();
-			await HardDeleteStream("stream-1");
-			WaitIdle();
-			await DisableStandardProjections();
-			WaitIdle();
-			await EnableStandardProjections();
-			WaitIdle();
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await _manager.AbortAsync("test-projection", _admin);
-			WaitIdle();
-			await _manager.EnableAsync("test-projection", _admin);
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
-			await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":2}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/recovery/when_running_and_events_get_indexed_before_recovery.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/recovery/when_running_and_events_get_indexed_before_recovery.cs
deleted file mode 100644
index f5013adea7c..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/recovery/when_running_and_events_get_indexed_before_recovery.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_foreach_projection.recovery {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_running_and_events_get_indexed_before_recovery<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			WaitIdle();
-			await PostProjection(@"
-fromAll().foreachStream().when({
-    $init: function(){return {a:0}},
-    type1: function(s,e){s.a++},
-    type2: function(s,e){s.a++},
-    $deleted: function(s,e){s.deleted=1},
-}).outputState();
-");
-			WaitIdle();
-			await HardDeleteStream("stream-1");
-			WaitIdle();
-			await _manager.AbortAsync("test-projection", _admin);
-			WaitIdle();
-			await EnableStandardProjections();
-			WaitIdle();
-			await DisableStandardProjections();
-			WaitIdle();
-			await EnableStandardProjections();
-			WaitIdle();
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await _manager.EnableAsync("test-projection", _admin);
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
-			await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":2}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed.cs
deleted file mode 100644
index 7dcbe631fc2..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_foreach_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_running_and_events_are_indexed<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			WaitIdle();
-			await EnableStandardProjections();
-			WaitIdle();
-			await HardDeleteStream("stream-1");
-			WaitIdle();
-			await DisableStandardProjections();
-			WaitIdle();
-
-			// required to flush index checkpoint
-			{
-				await EnableStandardProjections();
-				WaitIdle();
-				await DisableStandardProjections();
-				WaitIdle();
-			}
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await PostProjection(@"
-fromAll().foreachStream().when({
-    $init: function(){return {}},
-    type1: function(s,e){s.a=(s.a||0) + 1},
-    type2: function(s,e){s.a=(s.a||0) + 1},
-    $deleted: function(s,e){s.deleted=1},
-}).outputState();
-");
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		[Ignore("Regression")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"deleted\":1}");
-			await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":2}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed_but_a_stream_and_tombstone.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed_but_a_stream_and_tombstone.cs
deleted file mode 100644
index d7790f9820f..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed_but_a_stream_and_tombstone.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_foreach_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_running_and_events_are_indexed_but_a_stream_and_tombstone<TLogFormat, TStreamId> :
-		specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			WaitIdle();
-			await EnableStandardProjections();
-			WaitIdle();
-			await DisableStandardProjections();
-			WaitIdle();
-
-			// required to flush index checkpoint
-			{
-				await EnableStandardProjections();
-				WaitIdle();
-				await DisableStandardProjections();
-				WaitIdle();
-			}
-
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await HardDeleteStream("stream-1");
-			WaitIdle();
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await PostProjection(@"
-fromAll().foreachStream().when({
-    $init: function(){return {a:0}},
-    type1: function(s,e){s.a++},
-    type2: function(s,e){s.a++},
-    $deleted: function(s,e){s.deleted=1},
-}).outputState();
-");
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed_but_more_events_and_tombstone.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed_but_more_events_and_tombstone.cs
deleted file mode 100644
index fd4462206b4..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed_but_more_events_and_tombstone.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_foreach_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_running_and_events_are_indexed_but_more_events_and_tombstone<TLogFormat, TStreamId> :
-		specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			WaitIdle();
-			await EnableStandardProjections();
-			WaitIdle();
-			await DisableStandardProjections();
-			;
-			WaitIdle();
-
-			// required to flush index checkpoint
-			{
-				await EnableStandardProjections();
-				WaitIdle();
-				await DisableStandardProjections();
-				WaitIdle();
-			}
-
-			await PostEvent("stream-1", "type2", "{}");
-			await HardDeleteStream("stream-1");
-			WaitIdle();
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await PostProjection(@"
-fromAll().foreachStream().when({
-    $init: function(){return {a:0}},
-    type1: function(s,e){s.a++},
-    type2: function(s,e){},
-    $deleted: function(s,e){s.deleted=1},
-}).outputState();
-");
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":0,\"deleted\":1}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed_but_tombstone.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed_but_tombstone.cs
deleted file mode 100644
index a2fa6f06566..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed_but_tombstone.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_foreach_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_running_and_events_are_indexed_but_tombstone<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			WaitIdle();
-			await EnableStandardProjections();
-			WaitIdle();
-			await DisableStandardProjections();
-			WaitIdle();
-
-			// required to flush index checkpoint
-			{
-				await EnableStandardProjections();
-				WaitIdle();
-				await DisableStandardProjections();
-				WaitIdle();
-			}
-
-
-			await HardDeleteStream("stream-1");
-			WaitIdle();
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await PostProjection(@"
-fromAll().foreachStream().when({
-    $init: function(){return {}},
-    type1: function(s,e){s.a=1},
-    type2: function(s,e){s.a=1},
-    $deleted: function(s,e){s.deleted=1},
-}).outputState();
-");
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"deleted\":1}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_no_indexing.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_no_indexing.cs
deleted file mode 100644
index 55fe472341e..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_no_indexing.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_foreach_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_running_and_no_indexing<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			WaitIdle();
-			await PostProjection(@"
-fromAll().foreachStream().when({
-    $init: function(){return {}},
-    type1: function(s,e){s.a=1},
-    type2: function(s,e){s.a=1},
-    $deleted: function(s,e){s.deleted=1;},
-}).outputState();
-");
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await HardDeleteStream("stream-1");
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail(
-				"$projections-test-projection-stream-1-result", "Result:{\"a\":1}", "Result:{\"a\":1,\"deleted\":1}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_no_indexing_and_other_events.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_no_indexing_and_other_events.cs
deleted file mode 100644
index 14f584c740d..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_no_indexing_and_other_events.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_foreach_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_running_and_no_indexing_and_other_events<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			WaitIdle();
-			await PostProjection(@"
-fromAll().foreachStream().when({
-    $init: function(){return {a:0}},
-    type1: function(s,e){s.a++},
-    type2: function(s,e){s.a++},
-    $deleted: function(s,e){s.deleted=1;},
-}).outputState();
-");
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await HardDeleteStream("stream-1");
-			WaitIdle();
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			await PostEvent("stream-3", "type1", "{}");
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail(
-				"$projections-test-projection-stream-1-result", "Result:{\"a\":2}", "Result:{\"a\":2,\"deleted\":1}");
-			await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":4}");
-			await AssertStreamTail("$projections-test-projection-stream-3-result", "Result:{\"a\":1}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/recovery/when_running_and_events_are_indexed.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/recovery/when_running_and_events_are_indexed.cs
deleted file mode 100644
index 551afc1b5a4..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/recovery/when_running_and_events_are_indexed.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_category_foreach_projection.
-	recovery {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	// ReSharper disable once InconsistentNaming
-	public class when_running_and_events_are_indexed<TLogFormat, TStreamId>
-		: specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			WaitIdle();
-			await EnableStandardProjections();
-			WaitIdle();
-			await PostProjection(@"
-fromCategory('stream').foreachStream().when({
-    $init: function(){return {a:0}},
-    type1: function(s,e){s.a++},
-    type2: function(s,e){s.a++},
-    $deleted: function(s,e){s.deleted=1},
-}).outputState();
-");
-			WaitIdle();
-			await HardDeleteStream("stream-1");
-			WaitIdle();
-			//todo replace with a deterministic fix rather than just covering the potential race condition #2236
-			await PostEvent("stream-3", "type1", "{}");
-			await PostEvent("stream-3", "type2", "{}");
-			WaitIdle();
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await _manager.AbortAsync("test-projection", _admin);
-			WaitIdle();
-			await _manager.EnableAsync("test-projection", _admin);
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		[Ignore("Regression")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
-			await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":2}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/recovery/when_running_and_events_get_indexed_before_recovery.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/recovery/when_running_and_events_get_indexed_before_recovery.cs
deleted file mode 100644
index 855b1ce08ef..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/recovery/when_running_and_events_get_indexed_before_recovery.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_category_foreach_projection.
-	recovery {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_running_and_events_get_indexed_before_recovery<TLogFormat, TStreamId>
-		: specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			WaitIdle();
-			await EnableStandardProjections();
-			WaitIdle();
-			await PostProjection(@"
-fromCategory('stream').foreachStream().when({
-    $init: function(){return {a:0}},
-    type1: function(s,e){s.a++},
-    type2: function(s,e){s.a++},
-    $deleted: function(s,e){s.deleted=1},
-}).outputState();
-");
-			WaitIdle();
-			await HardDeleteStream("stream-1");
-			WaitIdle();
-			await _manager.AbortAsync("test-projection", _admin);
-			WaitIdle();
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await _manager.EnableAsync("test-projection", _admin);
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		[Ignore("Regression")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
-			await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":2}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed.cs
deleted file mode 100644
index 3fe552074b0..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_category_foreach_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_running_and_events_are_indexed<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			await HardDeleteStream("stream-1");
-			WaitIdle();
-			await EnableStandardProjections();
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await PostProjection(@"
-fromCategory('stream').foreachStream().when({
-    $init: function(){return {}},
-    type1: function(s,e){s.a=(s.a||0) + 1},
-    type2: function(s,e){s.a=(s.a||0) + 1},
-    $deleted: function(s,e){s.deleted=1},
-}).outputState();
-");
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		[Ignore("Regression")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"deleted\":1}");
-			await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":2}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed_but_a_stream_and_tombstone_postponed.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed_but_a_stream_and_tombstone_postponed.cs
deleted file mode 100644
index bfa80e29f30..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed_but_a_stream_and_tombstone_postponed.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_category_foreach_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	// ReSharper disable once InconsistentNaming
-	public class when_running_and_events_are_indexed_but_a_stream_and_tombstone_postponed<TLogFormat, TStreamId> :
-		specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			WaitIdle();
-			await EnableStandardProjections();
-			WaitIdle();
-			await DisableStandardProjections();
-			WaitIdle();
-
-			await PostProjection(@"
-fromCategory('stream').foreachStream().when({
-    $init: function(){return {a:0}},
-    type1: function(s,e){s.a++},
-    type2: function(s,e){s.a++},
-    $deleted: function(s,e){s.deleted=1},
-}).outputState();
-");
-			WaitIdle();
-			// SUT projection must have been joined heading reader
-			await EnableStandardProjections();
-			WaitIdle();
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await PostEvent("stream-3", "type1", "{}");
-			await PostEvent("stream-3", "type2", "{}");
-			WaitIdle();
-			WaitIdle();
-			await HardDeleteStream("stream-1");
-			WaitIdle();
-			await PostEvent("stream-3", "type1", "{}");
-			await PostEvent("stream-3", "type2", "{}");
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		[Ignore("Regression")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed_but_tombstone.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed_but_tombstone.cs
deleted file mode 100644
index 37f5b516c59..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed_but_tombstone.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_category_foreach_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_running_and_events_are_indexed_but_tombstone<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			WaitIdle();
-			await EnableStandardProjections();
-			WaitIdle();
-			await PostProjection(@"
-fromCategory('stream').foreachStream().when({
-    $init: function(){return {a:0}},
-    type1: function(s,e){s.a++},
-    type2: function(s,e){s.a++},
-    $deleted: function(s,e){s.deleted=1},
-}).outputState();
-");
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await HardDeleteStream("stream-1");
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		[Ignore("Regression")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed_including_tombstone.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed_including_tombstone.cs
deleted file mode 100644
index f37a83574fc..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed_including_tombstone.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_category_foreach_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_running_and_events_are_indexed_including_tombstone<TLogFormat, TStreamId> :
-		specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await HardDeleteStream("stream-1");
-			WaitIdle();
-			await EnableStandardProjections();
-			WaitIdle();
-		}
-
-		protected override async Task When() {
-			await base.When();
-
-			await PostProjection(@"
-fromCategory('stream').foreachStream().when({
-    $init: function(){return {a:0}},
-    type1: function(s,e){s.a++},
-    type2: function(s,e){s.a++},
-    $deleted: function(s,e){s.deleted=1},
-}).outputState();
-");
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		[Ignore("Regression")]
-		public async Task receives_deleted_notification() {
-			await DumpStream("$ce-stream");
-			await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":0,\"deleted\":1}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_then_other_events_tombstone_ant_other_events.cs b/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_then_other_events_tombstone_ant_other_events.cs
deleted file mode 100644
index a847c95602b..00000000000
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_then_other_events_tombstone_ant_other_events.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_category_foreach_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_running_and_then_other_events_tombstone_ant_other_events<TLogFormat, TStreamId> :
-			specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		protected override bool GivenStandardProjectionsRunning() {
-			return false;
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			await PostProjection(@"
-fromCategory('stream').foreachStream().when({
-    $init: function(){return {a:0}},
-    type1: function(s,e){s.a++},
-    type2: function(s,e){s.a++},
-    $deleted: function(s,e){s.deleted=1;},
-}).outputState();
-");
-			WaitIdle();
-			await EnableStandardProjections();
-		}
-
-		protected override async Task When() {
-			await base.When();
-			await PostEvent("stream-1", "type1", "{}");
-			await PostEvent("stream-1", "type2", "{}");
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			WaitIdle();
-			await HardDeleteStream("stream-1");
-			WaitIdle();
-			await PostEvent("stream-2", "type1", "{}");
-			await PostEvent("stream-2", "type2", "{}");
-			await PostEvent("stream-3", "type1", "{}");
-			WaitIdle();
-		}
-
-		[Test, Category("Network")]
-		[Ignore("Regression")]
-		public async Task receives_deleted_notification() {
-			await AssertStreamTail(
-				"$projections-test-projection-stream-1-result", "Result:{\"a\":2}", "Result:{\"a\":2,\"deleted\":1}");
-			await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":4}");
-			await AssertStreamTail("$projections-test-projection-stream-3-result", "Result:{\"a\":1}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/EventStore.Projections.Core.Tests.csproj b/src/EventStore.Projections.Core.Tests/EventStore.Projections.Core.Tests.csproj
deleted file mode 100644
index ac675b6077d..00000000000
--- a/src/EventStore.Projections.Core.Tests/EventStore.Projections.Core.Tests.csproj
+++ /dev/null
@@ -1,54 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-	</PropertyGroup>
-	<ItemGroup>
-		<Compile Remove="Services\checkpoint_strategy\**" />
-		<EmbeddedResource Remove="Services\checkpoint_strategy\**" />
-		<None Remove="Services\checkpoint_strategy\**" />
-	</ItemGroup>
-	<ItemGroup>
-		<Compile Remove="Playground\Launchpad.cs" />
-		<Compile Remove="Playground\Launchpad2.cs" />
-		<Compile Remove="Playground\Launchpad3.cs" />
-		<Compile Remove="Playground\LaunchpadBase.cs" />
-	</ItemGroup>
-	<ItemGroup>
-		<None Remove="Services\Jint\Serialization\big_state.json" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-		<PackageReference Include="NUnit" Version="3.14.0" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-		<PackageReference Include="Serilog.Sinks.TextWriter" Version="3.0.0" />
-		<PackageReference Include="Google.Protobuf" Version="3.27.2" />
-		<PackageReference Include="Grpc.Tools" Version="2.65.0">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-		</PackageReference>
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\EventStore.Common\EventStore.Common.csproj" />
-		<ProjectReference Include="..\EventStore.Core.Tests\EventStore.Core.Tests.csproj" />
-		<ProjectReference Include="..\EventStore.Core\EventStore.Core.csproj" />
-		<ProjectReference Include="..\EventStore.Projections.Core\EventStore.Projections.Core.csproj" />
-	</ItemGroup>
-	<ItemGroup>
-		<Protobuf Include="..\Protos\Grpc\projections.proto" Link="Protos\projections.proto" GrpcServices="Client" ProtoRoot="../Protos/Grpc" Access="Internal" />
-	</ItemGroup>
-	<ItemGroup>
-		<Content Include="Queries\1Query.js">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
-	<ItemGroup>
-		<EmbeddedResource Include="Services\Jint\Serialization\big_state.json" />
-	</ItemGroup>
-	<!-- TODO(jen20): Decide what is correct here -->
-	<PropertyGroup>
-		<IsMac>false</IsMac>
-		<IsMac Condition="'$(OS)' == 'Unix' And Exists ('/Library/Frameworks')">true</IsMac>
-	</PropertyGroup>
-</Project>
diff --git a/src/EventStore.Projections.Core.Tests/Integration/link_metadata/when_running_a_query_using_link_metadata.cs b/src/EventStore.Projections.Core.Tests/Integration/link_metadata/when_running_a_query_using_link_metadata.cs
deleted file mode 100644
index 79934c9017a..00000000000
--- a/src/EventStore.Projections.Core.Tests/Integration/link_metadata/when_running_a_query_using_link_metadata.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System.Linq;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Management;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Integration.link_metadata {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_running_a_query_using_link_metadata<TLogFormat, TStreamId> : specification_with_a_v8_query_posted<TLogFormat, TStreamId> {
-		protected override void GivenEvents() {
-			ExistingEvent("stream", SystemEventTypes.LinkTo, "{\"a\":1}", "0@account-01");
-			ExistingEvent("stream", SystemEventTypes.LinkTo, "{\"a\":2}", "1@account-01");
-			ExistingEvent("stream", SystemEventTypes.LinkTo, "{\"a\":10}", "0@account-02");
-
-			ExistingEvent("account-01", "test", "", "{\"a\":1}", isJson: true);
-			ExistingEvent("account-01", "test", "", "{\"a\":2}", isJson: true);
-			ExistingEvent("account-02", "test", "", "{\"a\":10}", isJson: true);
-		}
-
-		protected override string GivenQuery() {
-			return @"
-fromStream('stream').when({
-    $any: function(s, e) { 
-        // test
-        if (JSON.stringify(e.body) != JSON.stringify(e.linkMetadata))
-            throw 'invalid link metadata ' + JSON.stringify(e.linkMetadata) + ' expected is ' + JSON.stringify(e.body);
-        
-        return e.linkMetadata; 
-    }
-}).outputState()
-";
-		}
-
-		[Test]
-		public void just() {
-			AssertLastEvent("$projections-query-result", "{\"a\":10}", skip: 1 /* $eof */);
-		}
-
-		[Test]
-		public void state_becomes_completed() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetStatistics(
-					_bus, null, _projectionName, false));
-
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-					.Single()
-					.Projections.Length);
-			Assert.AreEqual(
-				_projectionName,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-					.Single()
-					.Projections.Single()
-					.Name);
-			Assert.AreEqual(
-				ManagedProjectionState.Completed,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-					.Single()
-					.Projections.Single()
-					.LeaderStatus);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Integration/scenarios/when_deleting_already_categorized_stream.cs b/src/EventStore.Projections.Core.Tests/Integration/scenarios/when_deleting_already_categorized_stream.cs
deleted file mode 100644
index 2f245ce954b..00000000000
--- a/src/EventStore.Projections.Core.Tests/Integration/scenarios/when_deleting_already_categorized_stream.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Integration.scenarios {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_deleting_already_categorized_stream<TLogFormat, TStreamId> : specification_with_a_v8_query_posted<TLogFormat, TStreamId> {
-		protected override void GivenEvents() {
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			foreach (var e in base.When()) yield return e;
-			yield return CreateWriteEvent("chat-1", "ChatMessage", @"
-    {
-      ""sender"": ""Greg"",
-      ""message"": ""Hi"",
-      ""time"": ""03:45:30""
-    }");
-			yield return CreateWriteEvent("chat-1", "ChatMessage", @"
-    {
-      ""sender"": ""Ronan"",
-      ""message"": ""starbucks"",
-      ""time"": ""03:45:31""
-    }");
-			yield return CreateWriteEvent("chat-1", "ChatMessage", @"
-    {
-      ""sender"": ""James"",
-      ""message"": ""herpherp"",
-      ""time"": ""03:45:32""
-    }");
-			yield return CreateWriteEvent("chat-2", "ChatMessage", @"
-    {
-      ""sender"": ""Rob"",
-      ""message"": ""starbucks"",
-      ""time"": ""03:45:30""
-    }");
-			yield return CreateWriteEvent("chat-2", "ChatMessage", @"
-    {
-      ""sender"": ""Ronan"",
-      ""message"": ""put the moose in the chocolate"",
-      ""time"": ""03:45:31""
-    }");
-			var corrId = Guid.NewGuid();
-			yield return
-				new ClientMessage.DeleteStream(
-					corrId, corrId, Envelope, false, "chat-2", ExpectedVersion.Any, true, null);
-			yield return CreateNewProjectionMessage("test1", @"
-fromCategory('chat').when({
-    ChatMessage: function(s, e) {
-        copyTo('out1', e);
-    }
-})
-");
-		}
-
-		protected override bool GivenInitializeSystemProjections() {
-			return true;
-		}
-
-		protected override bool GivenStartSystemProjections() {
-			return true;
-		}
-
-		protected override string GivenQuery() {
-			return "";
-		}
-
-		[Test, Explicit]
-		public void just() {
-			DumpStream("$$chat-2");
-			DumpStream("$ce-chat");
-			DumpStream("out1");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Integration/scenarios/when_recategorizing_chat_events_by_users.cs b/src/EventStore.Projections.Core.Tests/Integration/scenarios/when_recategorizing_chat_events_by_users.cs
deleted file mode 100644
index 449cec84c94..00000000000
--- a/src/EventStore.Projections.Core.Tests/Integration/scenarios/when_recategorizing_chat_events_by_users.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Integration.scenarios {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_recategorizing_chat_events_by_users<TLogFormat, TStreamId> : specification_with_a_v8_query_posted<TLogFormat, TStreamId> {
-		protected override void GivenEvents() {
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			foreach (var e in base.When()) yield return e;
-			yield return CreateWriteEvent("chat-1", "ChatMessage", @"
-    {
-      ""sender"": ""Greg"",
-      ""message"": ""Hi"",
-      ""time"": ""03:45:30""
-    }");
-			yield return CreateWriteEvent("chat-1", "ChatMessage", @"
-    {
-      ""sender"": ""Ronan"",
-      ""message"": ""starbucks"",
-      ""time"": ""03:45:31""
-    }");
-			yield return CreateWriteEvent("chat-1", "ChatMessage", @"
-    {
-      ""sender"": ""James"",
-      ""message"": ""herpherp"",
-      ""time"": ""03:45:32""
-    }");
-			yield return CreateWriteEvent("chat-2", "ChatMessage", @"
-    {
-      ""sender"": ""Rob"",
-      ""message"": ""starbucks"",
-      ""time"": ""03:45:30""
-    }");
-			yield return CreateWriteEvent("chat-2", "ChatMessage", @"
-    {
-      ""sender"": ""Ronan"",
-      ""message"": ""put the moose in the chocolate"",
-      ""time"": ""03:45:31""
-    }");
-			yield return CreateQueryMessage("query1", @"
-fromCategory(""chat"")
-    .foreachStream()
-    .when({
-        $init: function() {
-            return { count: 0 }
-        },
-        ChatMessage: function(state, event) {
-            state.count += 1;
-            return state;
-        }
-    });
-");
-			yield return CreateQueryMessage("query2", @"
-fromCategory(""user"")
-    .foreachStream()
-    .when({
-        $init: function() {
-            return { count: 0 }
-        },
-        ChatMessage: function(state, event) {
-            state.count += 1;
-            return state;
-        }
-    });
-");
-		}
-
-		protected override bool GivenInitializeSystemProjections() {
-			return true;
-		}
-
-		protected override bool GivenStartSystemProjections() {
-			return true;
-		}
-
-		protected override string GivenQuery() {
-			return "";
-		}
-
-		protected override IEnumerable<string> GivenOtherProjections() {
-			yield return @"
-fromCategory(""chat"")
-.when({
-    ChatMessage: function(state, event) {
-        var userStream = ""user-"" + event.body.sender;
-        linkTo(userStream, event);
-    }
-})";
-
-			yield return @"
-fromCategory(""user"")
-    .foreachStream()
-    .when({
-        $init: function() {
-            return { count: 0 }
-        },
-        ChatMessage: function(state, event) {
-            state.count += 1;
-            return state;
-        }
-    }).outputState();
-";
-		}
-
-		[Test]
-		public void query1_returns_correct_result() {
-			AssertStreamTailWithLinks(
-				"$projections-query1-result", @"Result:{""count"":3}", @"Result:{""count"":2}", "$Eof:");
-		}
-
-		[Test]
-		public void query2_returns_correct_result() {
-			AssertStreamTailWithLinks(
-				"$projections-query2-result", @"Result:{""count"":1}", @"Result:{""count"":2}", @"Result:{""count"":1}",
-				@"Result:{""count"":1}", "$Eof:");
-		}
-
-		[Test]
-		public void other_1_projection_produces_correct_results() {
-			AssertStreamTail(
-				"$projections-other_1-result", "0@$projections-other_1-user-Greg-result",
-				"0@$projections-other_1-user-Ronan-result", "0@$projections-other_1-user-James-result",
-				"0@$projections-other_1-user-Rob-result", "1@$projections-other_1-user-Ronan-result");
-			AssertStreamTailWithLinks(
-				"$projections-other_1-result", @"Result:{""count"":1}", @"Result:{""count"":1}",
-				@"Result:{""count"":1}",
-				@"Result:{""count"":1}", @"Result:{""count"":2}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Integration/specification_with_a_v8_query_posted.cs b/src/EventStore.Projections.Core.Tests/Integration/specification_with_a_v8_query_posted.cs
deleted file mode 100644
index a9ea49883f6..00000000000
--- a/src/EventStore.Projections.Core.Tests/Integration/specification_with_a_v8_query_posted.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using System;
-using System.Collections.Generic;
-using DotNext;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Tests.Services.projections_manager;
-
-namespace EventStore.Projections.Core.Tests.Integration {
-	public abstract class specification_with_a_v8_query_posted<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		protected string _projectionName;
-		protected string _projectionSource;
-		protected ProjectionMode _projectionMode;
-		protected bool _checkpointsEnabled;
-		protected bool _trackEmittedStreams;
-		protected bool _emitEnabled;
-		protected bool _startSystemProjections;
-
-		protected override void Given() {
-			base.Given();
-			AllWritesSucceed();
-			NoOtherStreams();
-			GivenEvents();
-			EnableReadAll();
-			_projectionName = "query";
-			_projectionSource = GivenQuery();
-			_projectionMode = ProjectionMode.Transient;
-			_checkpointsEnabled = false;
-			_trackEmittedStreams = false;
-			_emitEnabled = false;
-			_startSystemProjections = GivenStartSystemProjections();
-		}
-
-		protected override Tuple<SynchronousScheduler, IPublisher, SynchronousScheduler, Guid>[] GivenProcessingQueues() {
-			SynchronousScheduler[] buses = [new("1"), new("2")];
-			SynchronousScheduler[] outBuses = [new("o1"), new("o2")];
-			_otherQueues = [new (buses[0], _timeProvider), new(buses[1], _timeProvider)];
-			return [
-				Tuple.Create(
-					buses[0],
-					_otherQueues[0].As<IPublisher>(),
-					outBuses[0],
-					Guid.NewGuid()),
-				Tuple.Create(
-					buses[1],
-					_otherQueues[1].As<IPublisher>(),
-					outBuses[1],
-					Guid.NewGuid())
-			];
-		}
-
-		protected abstract void GivenEvents();
-
-		protected abstract string GivenQuery();
-
-		protected virtual bool GivenStartSystemProjections() {
-			return false;
-		}
-
-		protected Message CreateQueryMessage(string name, string source) {
-			return new ProjectionManagementMessage.Command.Post(
-				_bus, ProjectionMode.Transient, name,
-				ProjectionManagementMessage.RunAs.System, "JS", source, enabled: true, checkpointsEnabled: false,
-				trackEmittedStreams: false,
-				emitEnabled: false);
-		}
-
-		protected Message CreateNewProjectionMessage(string name, string source) {
-			return new ProjectionManagementMessage.Command.Post(
-				_bus, ProjectionMode.Continuous, name, ProjectionManagementMessage.RunAs.System,
-				"JS", source, enabled: true, checkpointsEnabled: true, trackEmittedStreams: true, emitEnabled: true);
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-			if (_startSystemProjections) {
-				yield return
-					new ProjectionManagementMessage.Command.Enable(
-						Envelope, ProjectionNamesBuilder.StandardProjections.StreamsStandardProjection,
-						ProjectionManagementMessage.RunAs.System);
-				yield return
-					new ProjectionManagementMessage.Command.Enable(
-						Envelope, ProjectionNamesBuilder.StandardProjections.StreamByCategoryStandardProjection,
-						ProjectionManagementMessage.RunAs.System);
-				yield return
-					new ProjectionManagementMessage.Command.Enable(
-						Envelope, ProjectionNamesBuilder.StandardProjections.EventByCategoryStandardProjection,
-						ProjectionManagementMessage.RunAs.System);
-				yield return
-					new ProjectionManagementMessage.Command.Enable(
-						Envelope, ProjectionNamesBuilder.StandardProjections.EventByTypeStandardProjection,
-						ProjectionManagementMessage.RunAs.System);
-			}
-
-			var otherProjections = GivenOtherProjections();
-			var index = 0;
-			foreach (var source in otherProjections) {
-				yield return
-					(new ProjectionManagementMessage.Command.Post(
-						_bus, ProjectionMode.Continuous, "other_" + index,
-						ProjectionManagementMessage.RunAs.System, "JS", source, enabled: true, checkpointsEnabled: true,
-						trackEmittedStreams: true,
-						emitEnabled: true));
-				index++;
-			}
-
-			if (!string.IsNullOrEmpty(_projectionSource)) {
-				yield return
-					(new ProjectionManagementMessage.Command.Post(
-						_bus, _projectionMode, _projectionName,
-						ProjectionManagementMessage.RunAs.System, "JS", _projectionSource, enabled: true,
-						checkpointsEnabled: _checkpointsEnabled, emitEnabled: _emitEnabled,
-						trackEmittedStreams: _trackEmittedStreams));
-			}
-		}
-
-		protected virtual IEnumerable<string> GivenOtherProjections() {
-			return new string[0];
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Integration/system_projections/when_changing_categorization_projection_configurations.cs b/src/EventStore.Projections.Core.Tests/Integration/system_projections/when_changing_categorization_projection_configurations.cs
deleted file mode 100644
index 885d030225d..00000000000
--- a/src/EventStore.Projections.Core.Tests/Integration/system_projections/when_changing_categorization_projection_configurations.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Services;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Integration.system_projections {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_changing_categorization_projection_configurations_to_first<TLogFormat, TStreamId> : specification_with_a_v8_query_posted<TLogFormat, TStreamId> {
-		protected override void GivenEvents() {
-			ExistingEvent("account-000-01", "test", "", "{\"a\":1}", isJson: true);
-			ExistingEvent("account-000-01", "test", "", "{\"a\":2}", isJson: true);
-			ExistingEvent("account-000-02", "test", "", "{\"a\":10}", isJson: true);
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			foreach (var e in base.When()) yield return e;
-			string query = "first\r\n-";
-			yield return
-				new ProjectionManagementMessage.Command.UpdateQuery(
-					Envelope, ProjectionNamesBuilder.StandardProjections.StreamByCategoryStandardProjection,
-					ProjectionManagementMessage.RunAs.System, query: query, emitEnabled: null);
-			yield return
-				new ProjectionManagementMessage.Command.UpdateQuery(
-					Envelope, ProjectionNamesBuilder.StandardProjections.EventByCategoryStandardProjection,
-					ProjectionManagementMessage.RunAs.System, query: query, emitEnabled: null);
-			yield return
-				new ProjectionManagementMessage.Command.Enable(
-					Envelope, ProjectionNamesBuilder.StandardProjections.StreamByCategoryStandardProjection,
-					ProjectionManagementMessage.RunAs.System);
-			yield return
-				new ProjectionManagementMessage.Command.Enable(
-					Envelope, ProjectionNamesBuilder.StandardProjections.EventByCategoryStandardProjection,
-					ProjectionManagementMessage.RunAs.System);
-		}
-
-		protected override bool GivenInitializeSystemProjections() {
-			return true;
-		}
-
-		protected override bool GivenStartSystemProjections() {
-			return false;
-		}
-
-		protected override string GivenQuery() {
-			return "";
-		}
-
-		[Test]
-		public void streams_are_categorized() {
-			AssertStreamTail("$category-account", "account-000-01", "account-000-02");
-		}
-
-		[Test]
-		public void events_are_categorized() {
-			AssertStreamTail("$ce-account", "0@account-000-01", "1@account-000-01", "0@account-000-02");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Integration/system_projections/when_recategorizing_events.cs b/src/EventStore.Projections.Core.Tests/Integration/system_projections/when_recategorizing_events.cs
deleted file mode 100644
index 641f32670e7..00000000000
--- a/src/EventStore.Projections.Core.Tests/Integration/system_projections/when_recategorizing_events.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Services;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Integration.system_projections {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_recategorizing_events<TLogFormat, TStreamId> : specification_with_a_v8_query_posted<TLogFormat, TStreamId> {
-		protected override void GivenEvents() {
-			ExistingEvent("account-01", "test", "", "{\"a\":1}", isJson: true);
-			ExistingEvent("account-01", "test", "", "{\"a\":2}", isJson: true);
-			ExistingEvent("account-02", "test", "", "{\"a\":10}", isJson: true);
-
-			ExistingEvent("categorized-0", SystemEventTypes.LinkTo, "{\"a\":2}", "1@account-01");
-			ExistingEvent("categorized-0", SystemEventTypes.LinkTo, "{\"a\":10}", "0@account-02");
-			ExistingEvent("categorized-1", SystemEventTypes.LinkTo, "{\"a\":1}", "0@account-01");
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			foreach (var e in base.When()) yield return e;
-		}
-
-		protected override bool GivenInitializeSystemProjections() {
-			return true;
-		}
-
-		protected override bool GivenStartSystemProjections() {
-			return true;
-		}
-
-		protected override string GivenQuery() {
-			return "";
-		}
-
-		[Test]
-		public void streams_are_categorized() {
-			AssertStreamTail("$category-account", "account-01", "account-02");
-			AssertStreamTail("$category-categorized", "categorized-0", "categorized-1");
-		}
-
-		[Test]
-		public void events_are_categorized() {
-			AssertStreamTail("$ce-account", "0@account-01", "1@account-01", "0@account-02");
-		}
-
-		[Test]
-		public void links_are_categorized() {
-			AssertStreamTail("$ce-categorized", "1@account-01", "0@account-02", "0@account-01");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Integration/system_projections/when_recategorizing_events_while_running.cs b/src/EventStore.Projections.Core.Tests/Integration/system_projections/when_recategorizing_events_while_running.cs
deleted file mode 100644
index 32c79da899a..00000000000
--- a/src/EventStore.Projections.Core.Tests/Integration/system_projections/when_recategorizing_events_while_running.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Services;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Integration.system_projections {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_recategorizing_events_while_running<TLogFormat, TStreamId> : specification_with_a_v8_query_posted<TLogFormat, TStreamId> {
-		protected override void GivenEvents() {
-			ExistingEvent("account-01", "test", "", "{\"a\":1}", isJson: true);
-			ExistingEvent("account-01", "test", "", "{\"a\":2}", isJson: true);
-			ExistingEvent("account-02", "test", "", "{\"a\":10}", isJson: true);
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			foreach (var e in base.When()) yield return e;
-			yield return CreateWriteEvent("categorized-0", SystemEventTypes.LinkTo, "1@account-01", "{\"a\":2}");
-			yield return CreateWriteEvent("categorized-0", SystemEventTypes.LinkTo, "0@account-02", "{\"a\":10}");
-			yield return CreateWriteEvent("categorized-1", SystemEventTypes.LinkTo, "0@account-01", "{\"a\":1}");
-		}
-
-		protected override bool GivenInitializeSystemProjections() {
-			return true;
-		}
-
-		protected override bool GivenStartSystemProjections() {
-			return true;
-		}
-
-		protected override string GivenQuery() {
-			return "";
-		}
-
-		[Test]
-		public void streams_are_categorized() {
-			AssertStreamTail("$category-account", "account-01", "account-02");
-			AssertStreamTail("$category-categorized", "categorized-0", "categorized-1");
-		}
-
-		[Test]
-		public void events_are_categorized() {
-			AssertStreamTail("$ce-account", "0@account-01", "1@account-01", "0@account-02");
-		}
-
-		[Test]
-		public void links_are_categorized() {
-			AssertStreamTail("$ce-categorized", "1@account-01", "0@account-02", "0@account-01");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Integration/system_projections/when_running_system_projections.cs b/src/EventStore.Projections.Core.Tests/Integration/system_projections/when_running_system_projections.cs
deleted file mode 100644
index 3efbbfbacd1..00000000000
--- a/src/EventStore.Projections.Core.Tests/Integration/system_projections/when_running_system_projections.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Services;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Integration.system_projections {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_running_system_projections<TLogFormat, TStreamId> : specification_with_a_v8_query_posted<TLogFormat, TStreamId> {
-		protected override void GivenEvents() {
-			ExistingEvent("account-01", "test", "", "{\"a\":1}", isJson: true);
-			ExistingEvent("account-01", "test", "", "{\"a\":2}", isJson: true);
-			ExistingEvent("account-02", "test", "", "{\"a\":10}", isJson: true);
-			ExistingEvent("account-000-02", "test", "", "{\"a\":10}", isJson: true);
-
-			ExistingEvent("stream", SystemEventTypes.LinkTo, "{\"a\":1}", "0@account-01");
-			ExistingEvent("stream", SystemEventTypes.LinkTo, "{\"a\":2}", "1@account-01");
-			ExistingEvent("stream", SystemEventTypes.LinkTo, "{\"a\":10}", "0@account-02");
-
-			ExistingEvent("stream-1", SystemEventTypes.LinkTo, "{\"a\":10}", "1@account-01");
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			foreach (var e in base.When()) yield return e;
-			yield return CreateWriteEvent("test-1", "test1", "{}", "{}", isJson: true);
-			yield return CreateWriteEvent("test-2", SystemEventTypes.LinkTo, "0@test-1", "{}", isJson: true);
-		}
-
-		protected override bool GivenInitializeSystemProjections() {
-			return true;
-		}
-
-		protected override bool GivenStartSystemProjections() {
-			return true;
-		}
-
-		protected override string GivenQuery() {
-			return "";
-		}
-
-		[Test]
-		public void streams_are_categorized() {
-			AssertStreamTail("$category-stream", "stream-1");
-			AssertStreamTail("$category-test", "test-1", "test-2");
-			AssertStreamTail("$category-account", "account-01", "account-02", "account-000-02");
-		}
-
-		[Test]
-		public void streams_are_indexed() {
-			AssertStreamContains(
-				"$streams", "0@account-01", "0@account-02", "0@stream", "0@test-1", "0@test-2", "0@stream-1",
-				"0@account-000-02");
-		}
-
-		[Test]
-		public void events_are_categorized() {
-			AssertStreamTail("$ce-stream", "1@account-01");
-			AssertStreamTail("$ce-test", "0@test-1", "0@test-1");
-			AssertStreamTail("$ce-account", "0@account-01", "1@account-01", "0@account-02", "0@account-000-02");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Other/Stopwatch.cs b/src/EventStore.Projections.Core.Tests/Other/Stopwatch.cs
deleted file mode 100644
index 5e99551cd85..00000000000
--- a/src/EventStore.Projections.Core.Tests/Other/Stopwatch.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Other {
-	[TestFixture]
-	class Stopwatch {
-		[Test]
-		public void MeasureStopwatch() {
-			var sw = new System.Diagnostics.Stopwatch();
-			var measured = new System.Diagnostics.Stopwatch();
-			sw.Reset();
-			sw.Start();
-			measured.Start();
-			measured.Stop();
-			TestHelper.Consume(measured.ElapsedMilliseconds);
-			sw.Stop();
-			TestHelper.Consume(sw.ElapsedMilliseconds);
-			measured.Reset();
-			sw.Reset();
-
-			sw.Start();
-			sw.Stop();
-			var originalTime = sw.ElapsedMilliseconds;
-			sw.Reset();
-
-			sw.Start();
-			for (var i = 0; i < 1000000; i++) {
-				measured.Start();
-				measured.Stop();
-				TestHelper.Consume(measured.ElapsedMilliseconds);
-			}
-
-			sw.Stop();
-			var measuredTime = sw.ElapsedMilliseconds;
-			Console.WriteLine(measuredTime - originalTime);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Other/json_serialization.cs b/src/EventStore.Projections.Core.Tests/Other/json_serialization.cs
deleted file mode 100644
index 6c60becae50..00000000000
--- a/src/EventStore.Projections.Core.Tests/Other/json_serialization.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using Newtonsoft.Json.Linq;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Other {
-	[TestFixture]
-	class can_serialize_and_deserialize {
-		private ProjectionVersion _version;
-
-		[SetUp]
-		public void setup() {
-			_version = new ProjectionVersion(1, 0, 0);
-		}
-
-		[Test]
-		public void position_based_checkpoint_tag() {
-			CheckpointTag tag = CheckpointTag.FromPosition(1, -1, 0);
-			byte[] bytes = tag.ToJsonBytes(_version);
-			string instring = Helper.UTF8NoBom.GetString(bytes);
-			Console.WriteLine(instring);
-
-			CheckpointTag back = instring.ParseCheckpointTagJson();
-			Assert.AreEqual(tag, back);
-		}
-
-		[Test]
-		public void prepare_position_based_checkpoint_tag_zero() {
-			CheckpointTag tag = CheckpointTag.FromPreparePosition(1, 0);
-			byte[] bytes = tag.ToJsonBytes(_version);
-			string instring = Helper.UTF8NoBom.GetString(bytes);
-			Console.WriteLine(instring);
-
-			CheckpointTag back = instring.ParseCheckpointTagJson();
-			Assert.AreEqual(tag, back);
-		}
-
-		[Test]
-		public void prepare_position_based_checkpoint_tag_minus_one() {
-			CheckpointTag tag = CheckpointTag.FromPreparePosition(1, -1);
-			byte[] bytes = tag.ToJsonBytes(_version);
-			string instring = Helper.UTF8NoBom.GetString(bytes);
-			Console.WriteLine(instring);
-
-			CheckpointTag back = instring.ParseCheckpointTagJson();
-			Assert.AreEqual(tag, back);
-		}
-
-		[Test]
-		public void prepare_position_based_checkpoint_tag() {
-			CheckpointTag tag = CheckpointTag.FromPreparePosition(1, 1234);
-			byte[] bytes = tag.ToJsonBytes(_version);
-			string instring = Helper.UTF8NoBom.GetString(bytes);
-			Console.WriteLine(instring);
-
-			CheckpointTag back = instring.ParseCheckpointTagJson();
-			Assert.AreEqual(tag, back);
-		}
-
-		[Test]
-		public void stream_based_checkpoint_tag() {
-			CheckpointTag tag = CheckpointTag.FromStreamPosition(1, "$ce-account", 12345);
-			byte[] bytes = tag.ToJsonBytes(_version);
-			string instring = Helper.UTF8NoBom.GetString(bytes);
-			Console.WriteLine(instring);
-
-			CheckpointTag back = instring.ParseCheckpointTagJson();
-			Assert.AreEqual(tag, back);
-			Assert.IsNull(back.CommitPosition);
-		}
-
-		[Test]
-		public void streams_based_checkpoint_tag() {
-			CheckpointTag tag = CheckpointTag.FromStreamPositions(1, new Dictionary<string, long> {{"a", 1}, {"b", 2}});
-			byte[] bytes = tag.ToJsonBytes(_version);
-			string instring = Helper.UTF8NoBom.GetString(bytes);
-			Console.WriteLine(instring);
-
-			CheckpointTag back = instring.ParseCheckpointTagJson();
-			Assert.AreEqual(tag, back);
-			Assert.IsNull(back.CommitPosition);
-		}
-
-		[Test]
-		public void event_by_type_index_based_checkpoint_tag() {
-			CheckpointTag tag = CheckpointTag.FromEventTypeIndexPositions(
-				0, new TFPos(100, 50), new Dictionary<string, long> {{"a", 1}, {"b", 2}});
-			byte[] bytes = tag.ToJsonBytes(_version);
-			string instring = Helper.UTF8NoBom.GetString(bytes);
-			Console.WriteLine(instring);
-
-			CheckpointTag back = instring.ParseCheckpointTagJson();
-			Assert.AreEqual(tag, back);
-		}
-
-		[Test]
-		public void phase_based_checkpoint_tag_completed() {
-			CheckpointTag tag = CheckpointTag.FromPhase(2, completed: false);
-			byte[] bytes = tag.ToJsonBytes(_version);
-			string instring = Helper.UTF8NoBom.GetString(bytes);
-			Console.WriteLine(instring);
-
-			CheckpointTag back = instring.ParseCheckpointTagJson();
-			Assert.AreEqual(tag, back);
-		}
-
-		[Test]
-		public void phase_based_checkpoint_tag_incomplete() {
-			CheckpointTag tag = CheckpointTag.FromPhase(0, completed: true);
-			byte[] bytes = tag.ToJsonBytes(_version);
-			string instring = Helper.UTF8NoBom.GetString(bytes);
-			Console.WriteLine(instring);
-
-			CheckpointTag back = instring.ParseCheckpointTagJson();
-			Assert.AreEqual(tag, back);
-		}
-
-		[Test]
-		public void by_stream_based_checkpoint_tag() {
-			CheckpointTag tag = CheckpointTag.FromByStreamPosition(0, "catalog", 1, "data", 2, 12345);
-			byte[] bytes = tag.ToJsonBytes(_version);
-			string instring = Helper.UTF8NoBom.GetString(bytes);
-			Console.WriteLine(instring);
-
-			CheckpointTag back = instring.ParseCheckpointTagJson();
-			Assert.AreEqual(tag, back);
-		}
-
-		[Test]
-		public void by_stream_based_checkpoint_tag_zero() {
-			CheckpointTag tag = CheckpointTag.FromByStreamPosition(0, "catalog", -1, null, -1, 12345);
-			byte[] bytes = tag.ToJsonBytes(_version);
-			string instring = Helper.UTF8NoBom.GetString(bytes);
-			Console.WriteLine(instring);
-
-			CheckpointTag back = instring.ParseCheckpointTagJson();
-			Assert.AreEqual(tag, back);
-		}
-
-		[Test]
-		public void extra_metadata_are_preserved() {
-			CheckpointTag tag = CheckpointTag.FromPosition(0, -1, 0);
-			var extra = new Dictionary<string, JToken> {{"$$a", new JRaw("\"b\"")}, {"$$c", new JRaw("\"d\"")}};
-			byte[] bytes = tag.ToJsonBytes(_version, extra);
-			string instring = Helper.UTF8NoBom.GetString(bytes);
-			Console.WriteLine(instring);
-
-			CheckpointTagVersion back = instring.ParseCheckpointTagVersionExtraJson(_version);
-			Assert.IsNotNull(back.ExtraMetadata);
-			JToken v;
-			Assert.IsTrue(back.ExtraMetadata.TryGetValue("$$a", out v));
-			Assert.AreEqual("b", (string)((JValue)v).Value);
-			Assert.IsTrue(back.ExtraMetadata.TryGetValue("$$c", out v));
-			Assert.AreEqual("d", (string)((JValue)v).Value);
-		}
-
-		[Test]
-		public void can_deserialize_readonly_fields() {
-			TestData data = new TestData("123");
-			byte[] bytes = data.ToJsonBytes();
-			string instring = Helper.UTF8NoBom.GetString(bytes);
-			Console.WriteLine(instring);
-
-			TestData back = instring.ParseJson<TestData>();
-			Assert.AreEqual(data, back);
-		}
-
-		private class TestData {
-			public readonly string Data;
-
-			public TestData(string data) {
-				Data = data;
-			}
-
-			protected bool Equals(TestData other) {
-				return string.Equals(Data, other.Data);
-			}
-
-			public override bool Equals(object obj) {
-				if (ReferenceEquals(null, obj)) return false;
-				if (ReferenceEquals(this, obj)) return true;
-				if (obj.GetType() != GetType()) return false;
-				return Equals((TestData)obj);
-			}
-
-			public override int GetHashCode() {
-				return (Data != null ? Data.GetHashCode() : 0);
-			}
-
-			public override string ToString() {
-				return string.Format("Data: {0}", Data);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Other/when_matching_remaining_path.cs b/src/EventStore.Projections.Core.Tests/Other/when_matching_remaining_path.cs
deleted file mode 100644
index 964a45058e9..00000000000
--- a/src/EventStore.Projections.Core.Tests/Other/when_matching_remaining_path.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Other {
-	[TestFixture, Ignore("Until resolved in MONO")]
-	class when_matching_remaining_path {
-		private UriTemplate _urlTemplate;
-		private UriTemplateMatch _match;
-
-		[SetUp]
-		public void setup() {
-			_urlTemplate = new UriTemplate("/a/b/{*C}");
-			_match = _urlTemplate.Match(new Uri("http://localhost"), new Uri("http://localhost/a/b/123"));
-		}
-
-		[Test]
-		public void bound_variable_c_is_available() {
-			Assert.IsTrue(_match.BoundVariables.AllKeys.Contains("C"));
-		}
-
-		[Test]
-		public void bound_variable_c_contains_remaining_path() {
-			Assert.AreEqual("123", _match.BoundVariables["C"]);
-		}
-	}
-
-	[TestFixture, Ignore("Until resolved in MONO")]
-	class when_matching_remaining_multi_segment_path {
-		private UriTemplate _urlTemplate;
-		private UriTemplateMatch _match;
-
-		[SetUp]
-		public void setup() {
-			_urlTemplate = new UriTemplate("/a/b/{*C}");
-			_match = _urlTemplate.Match(new Uri("http://localhost"), new Uri("http://localhost/a/b/123/456"));
-		}
-
-		[Test]
-		public void bound_variable_c_is_available() {
-			Assert.IsTrue(_match.BoundVariables.AllKeys.Contains("C"));
-		}
-
-		[Test]
-		public void bound_variable_c_contains_remaining_path() {
-			Assert.AreEqual("123/456", _match.BoundVariables["C"]);
-		}
-	}
-
-
-	[TestFixture]
-	class when_matching_uri_with_missing_query_variable {
-		private UriTemplate _urlTemplate;
-		private UriTemplateMatch _match;
-
-		[SetUp]
-		public void setup() {
-			_urlTemplate = new UriTemplate("/a/b?c={C}");
-			_match = _urlTemplate.Match(new Uri("http://localhost"), new Uri("http://localhost/a/b"));
-		}
-
-		[Test]
-		public void match_succeeds() {
-			Assert.IsTrue(_match != null);
-		}
-
-		[Test]
-		public void bound_variable_c_is_null() {
-			Assert.AreEqual(null, _match.BoundVariables["C"]);
-		}
-	}
-
-	[TestFixture]
-	class url_segments {
-		[Test]
-		public void are_not_untumatically_unescaped() {
-			var uri = new Uri("http://fake/a%24a%20/123$");
-			Assert.AreEqual(3, uri.Segments.Length);
-			Assert.AreEqual("/", uri.Segments[0]);
-			Assert.AreEqual("a%24a%20/", uri.Segments[1]);
-			Assert.AreEqual("123$", uri.Segments[2]);
-		}
-
-		[Test]
-		public void are_not_automatically_unescaped2() {
-			var ub = new UriBuilder();
-			ub.Scheme = "http";
-			ub.Host = "fake";
-			ub.Path = "/a%24a%20/123$";
-			var uri = ub.Uri;
-			Assert.AreEqual(3, uri.Segments.Length);
-			Assert.AreEqual("/", uri.Segments[0]);
-			Assert.AreEqual("a%24a%20/", uri.Segments[1]);
-			Assert.AreEqual("123$", uri.Segments[2]);
-		}
-	}
-
-	[TestFixture]
-	class when_matching_escaped_urls {
-		[Test]
-		public void Dump() {
-			var result = new List<Tuple<char, string>>();
-			for (char i = (char)1; i <= 127; i++) {
-				try {
-					var unescaped = "/z" + i + "z/";
-					var escaped = "/z" + Uri.HexEscape(i) + "z/";
-
-					var unescapedTemplate = new UriTemplate(unescaped);
-					var escapedTemplate = new UriTemplate(escaped);
-
-					Func<string, UriTemplate, bool> m =
-						(s, template) =>
-							template.Match(new Uri("http://localhost"), new Uri("http://localhost" + s)) != null;
-
-					result.Add(Tuple.Create(i, string.Format(
-						"e=>e {1}  e=>u {2}  u=>e {3} u=>u {4}", new String(i, 1), m(escaped, escapedTemplate),
-						m(unescaped, escapedTemplate), m(escaped, unescapedTemplate),
-						m(unescaped, unescapedTemplate))));
-				} catch (Exception) {
-					result.Add(
-						Tuple.Create(i, string.Format("EXCEPTION")));
-				}
-			}
-
-			foreach (var tuple in
-				from i in result
-				group i by i.Item2
-				into g
-				orderby g.Key
-				select g
-			) {
-				Console.WriteLine(tuple.Key);
-				Console.Write("   ");
-				foreach (var i in tuple) {
-					if (char.IsWhiteSpace(i.Item1))
-						Console.Write(Uri.HexEscape(i.Item1));
-					else
-						Console.Write(i.Item1);
-				}
-
-				Console.WriteLine();
-			}
-		}
-
-		private static void Matches(string template, string candidate) {
-			var urlTemplate = new UriTemplate(template);
-			var match = urlTemplate.Match(new Uri("http://localhost"), new Uri("http://localhost" + candidate));
-			Assert.IsNotNull(match);
-		}
-
-		private static void DoesNotMatch(string template, string candidate) {
-			var urlTemplate = new UriTemplate(template);
-			var match = urlTemplate.Match(new Uri("http://localhost"), new Uri("http://localhost" + candidate));
-			Assert.IsNull(match);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Playground/BusTestingExtentions.cs b/src/EventStore.Projections.Core.Tests/Playground/BusTestingExtentions.cs
deleted file mode 100644
index a31427f047e..00000000000
--- a/src/EventStore.Projections.Core.Tests/Playground/BusTestingExtentions.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Projections.Core.Tests.Playground {
-	public static class BusTestingExtentions {
-		private class Handler<T> : IHandle<T> where T : Message {
-			private readonly Action<T> _handler;
-
-			public Handler(Action<T> handler) {
-				_handler = handler;
-			}
-
-			public void Handle(T message) {
-				_handler(message);
-			}
-		}
-
-		public static void Subscribe<T>(this ISubscriber self, Action<T> handler) where T : Message {
-			self.Subscribe(new Handler<T>(handler));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/Scenarios/specification_with_js_query_posted.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/Scenarios/specification_with_js_query_posted.cs
deleted file mode 100644
index 696484c5379..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/Scenarios/specification_with_js_query_posted.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using System;
-using System.Collections.Generic;
-using DotNext;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-
-using EventStore.Projections.Core.Tests.Services.projections_manager;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint.Scenarios
-{
-    public abstract class specification_with_js_query_posted<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId>
-    {
-	    protected string _projectionName;
-	    protected string _projectionSource;
-	    protected ProjectionMode _projectionMode;
-	    protected bool _checkpointsEnabled;
-	    protected bool _trackEmittedStreams;
-	    protected bool _emitEnabled;
-	    protected bool _startSystemProjections;
-
-
-		protected override void Given() {
-			base.Given();
-			AllWritesSucceed();
-			NoOtherStreams();
-			GivenEvents();
-			EnableReadAll();
-			_projectionName = "query";
-			_projectionSource = GivenQuery();
-			_projectionMode = ProjectionMode.Transient;
-			_checkpointsEnabled = false;
-			_trackEmittedStreams = false;
-			_emitEnabled = false;
-			_startSystemProjections = GivenStartSystemProjections();
-		}
-
-		protected override Tuple<SynchronousScheduler, IPublisher, SynchronousScheduler, Guid>[] GivenProcessingQueues() {
-			SynchronousScheduler[] buses = [new("1"), new("2")];
-			SynchronousScheduler[] outBuses = [new("o1"), new("o2")];
-			_otherQueues = [new(buses[0], _timeProvider), new(buses[1], _timeProvider)];
-			return [
-				Tuple.Create(
-					buses[0],
-					_otherQueues[0].As<IPublisher>(),
-					outBuses[0],
-					Guid.NewGuid()),
-				Tuple.Create(
-					buses[1],
-					_otherQueues[1].As<IPublisher>(),
-					outBuses[1],
-					Guid.NewGuid())
-			];
-		}
-
-		protected abstract void GivenEvents();
-
-		protected abstract string GivenQuery();
-
-		protected virtual bool GivenStartSystemProjections() {
-			return false;
-		}
-
-		protected Message CreateQueryMessage(string name, string source) {
-			return new ProjectionManagementMessage.Command.Post(
-				_bus, ProjectionMode.Transient, name,
-				ProjectionManagementMessage.RunAs.System, "JS", source, enabled: true, checkpointsEnabled: false,
-				trackEmittedStreams: false,
-				emitEnabled: false);
-		}
-
-		protected Message CreateNewProjectionMessage(string name, string source) {
-			return new ProjectionManagementMessage.Command.Post(
-				_bus, ProjectionMode.Continuous, name, ProjectionManagementMessage.RunAs.System,
-				"INTERPRETED", source, enabled: true, checkpointsEnabled: true, trackEmittedStreams: true, emitEnabled: true);
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-			if (_startSystemProjections) {
-				yield return
-					new ProjectionManagementMessage.Command.Enable(
-						Envelope, ProjectionNamesBuilder.StandardProjections.StreamsStandardProjection,
-						ProjectionManagementMessage.RunAs.System);
-				yield return
-					new ProjectionManagementMessage.Command.Enable(
-						Envelope, ProjectionNamesBuilder.StandardProjections.StreamByCategoryStandardProjection,
-						ProjectionManagementMessage.RunAs.System);
-				yield return
-					new ProjectionManagementMessage.Command.Enable(
-						Envelope, ProjectionNamesBuilder.StandardProjections.EventByCategoryStandardProjection,
-						ProjectionManagementMessage.RunAs.System);
-				yield return
-					new ProjectionManagementMessage.Command.Enable(
-						Envelope, ProjectionNamesBuilder.StandardProjections.EventByTypeStandardProjection,
-						ProjectionManagementMessage.RunAs.System);
-			}
-
-			var otherProjections = GivenOtherProjections();
-			var index = 0;
-			foreach (var source in otherProjections) {
-				yield return
-					(new ProjectionManagementMessage.Command.Post(
-						_bus, ProjectionMode.Continuous, "other_" + index,
-						ProjectionManagementMessage.RunAs.System, "JS", source, enabled: true, checkpointsEnabled: true,
-						trackEmittedStreams: true,
-						emitEnabled: true));
-				index++;
-			}
-
-			if (!string.IsNullOrEmpty(_projectionSource)) {
-				yield return
-					(new ProjectionManagementMessage.Command.Post(
-						_bus, _projectionMode, _projectionName,
-						ProjectionManagementMessage.RunAs.System, "JS", _projectionSource, enabled: true,
-						checkpointsEnabled: _checkpointsEnabled, emitEnabled: _emitEnabled,
-						trackEmittedStreams: _trackEmittedStreams));
-			}
-		}
-
-		protected virtual IEnumerable<string> GivenOtherProjections() {
-			return new string[0];
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/Scenarios/when_deleting_already_categorized_stream.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/Scenarios/when_deleting_already_categorized_stream.cs
deleted file mode 100644
index a822d4fcc83..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/Scenarios/when_deleting_already_categorized_stream.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint.Scenarios
-{
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(long))]
-	public class when_deleting_already_categorized_stream<TLogFormat, TStreamId> : specification_with_js_query_posted<TLogFormat, TStreamId> {
-		protected override void GivenEvents() {
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			foreach (var e in base.When()) yield return e;
-			yield return CreateWriteEvent("chat-1", "ChatMessage", @"
-    {
-      ""sender"": ""Greg"",
-      ""message"": ""Hi"",
-      ""time"": ""03:45:30""
-    }");
-			yield return CreateWriteEvent("chat-1", "ChatMessage", @"
-    {
-      ""sender"": ""Ronan"",
-      ""message"": ""starbucks"",
-      ""time"": ""03:45:31""
-    }");
-			yield return CreateWriteEvent("chat-1", "ChatMessage", @"
-    {
-      ""sender"": ""James"",
-      ""message"": ""herpherp"",
-      ""time"": ""03:45:32""
-    }");
-			yield return CreateWriteEvent("chat-2", "ChatMessage", @"
-    {
-      ""sender"": ""Rob"",
-      ""message"": ""starbucks"",
-      ""time"": ""03:45:30""
-    }");
-			yield return CreateWriteEvent("chat-2", "ChatMessage", @"
-    {
-      ""sender"": ""Ronan"",
-      ""message"": ""put the moose in the chocolate"",
-      ""time"": ""03:45:31""
-    }");
-			var corrId = Guid.NewGuid();
-			yield return
-				new ClientMessage.DeleteStream(
-					corrId, corrId, Envelope, false, "chat-2", ExpectedVersion.Any, true, null);
-			yield return CreateNewProjectionMessage("test1", @"
-fromCategory('chat').when({
-    ChatMessage: function(s, e) {
-        copyTo('out1', e);
-    }
-})
-");
-		}
-
-		protected override bool GivenInitializeSystemProjections() {
-			return true;
-		}
-
-		protected override bool GivenStartSystemProjections() {
-			return true;
-		}
-
-		protected override string GivenQuery() {
-			return "";
-		}
-
-		[Test, Explicit]
-		public void just() {
-			DumpStream("$$chat-2");
-			DumpStream("$ce-chat");
-			DumpStream("out1");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/Scenarios/when_recategorizing_chat_events_by_users.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/Scenarios/when_recategorizing_chat_events_by_users.cs
deleted file mode 100644
index 20746ea62b4..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/Scenarios/when_recategorizing_chat_events_by_users.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint.Scenarios
-{
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(long))]
-	public class when_recategorizing_chat_events_by_users<TLogFormat, TStream> : specification_with_js_query_posted<TLogFormat, TStream> {
-		protected override void GivenEvents() {
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			foreach (var e in base.When()) yield return e;
-			yield return CreateWriteEvent("chat-1", "ChatMessage", @"
-    {
-      ""sender"": ""Greg"",
-      ""message"": ""Hi"",
-      ""time"": ""03:45:30""
-    }");
-			yield return CreateWriteEvent("chat-1", "ChatMessage", @"
-    {
-      ""sender"": ""Ronan"",
-      ""message"": ""starbucks"",
-      ""time"": ""03:45:31""
-    }");
-			yield return CreateWriteEvent("chat-1", "ChatMessage", @"
-    {
-      ""sender"": ""James"",
-      ""message"": ""herpherp"",
-      ""time"": ""03:45:32""
-    }");
-			yield return CreateWriteEvent("chat-2", "ChatMessage", @"
-    {
-      ""sender"": ""Rob"",
-      ""message"": ""starbucks"",
-      ""time"": ""03:45:30""
-    }");
-			yield return CreateWriteEvent("chat-2", "ChatMessage", @"
-    {
-      ""sender"": ""Ronan"",
-      ""message"": ""put the moose in the chocolate"",
-      ""time"": ""03:45:31""
-    }");
-			yield return CreateQueryMessage("query1", @"
-fromCategory(""chat"")
-    .foreachStream()
-    .when({
-        $init: function() {
-            return { count: 0 }
-        },
-        ChatMessage: function(state, event) {
-            state.count += 1;
-            return state;
-        }
-    });
-");
-			yield return CreateQueryMessage("query2", @"
-fromCategory(""user"")
-    .foreachStream()
-    .when({
-        $init: function() {
-            return { count: 0 }
-        },
-        ChatMessage: function(state, event) {
-            state.count += 1;
-            return state;
-        }
-    });
-");
-		}
-
-		protected override bool GivenInitializeSystemProjections() {
-			return true;
-		}
-
-		protected override bool GivenStartSystemProjections() {
-			return true;
-		}
-
-		protected override string GivenQuery() {
-			return "";
-		}
-
-		protected override IEnumerable<string> GivenOtherProjections() {
-			yield return @"
-fromCategory(""chat"")
-.when({
-    ChatMessage: function(state, event) {
-        var userStream = ""user-"" + event.body.sender;
-        linkTo(userStream, event);
-    }
-})";
-
-			yield return @"
-fromCategory(""user"")
-    .foreachStream()
-    .when({
-        $init: function() {
-            return { count: 0 }
-        },
-        ChatMessage: function(state, event) {
-            state.count += 1;
-            return state;
-        }
-    }).outputState();
-";
-		}
-
-		[Test]
-		public void query1_returns_correct_result() {
-			AssertStreamTailWithLinks(
-				"$projections-query1-result", @"Result:{""count"":3}", @"Result:{""count"":2}", "$Eof:");
-		}
-
-		[Test]
-		public void query2_returns_correct_result() {
-			AssertStreamTailWithLinks(
-				"$projections-query2-result", @"Result:{""count"":1}", @"Result:{""count"":2}", @"Result:{""count"":1}",
-				@"Result:{""count"":1}", "$Eof:");
-		}
-
-		[Test]
-		public void other_1_projection_produces_correct_results() {
-			AssertStreamTail(
-				"$projections-other_1-result", "0@$projections-other_1-user-Greg-result",
-				"0@$projections-other_1-user-Ronan-result", "0@$projections-other_1-user-James-result",
-				"0@$projections-other_1-user-Rob-result", "1@$projections-other_1-user-Ronan-result");
-			AssertStreamTailWithLinks(
-				"$projections-other_1-result", @"Result:{""count"":1}", @"Result:{""count"":1}",
-				@"Result:{""count"":1}",
-				@"Result:{""count"":1}", @"Result:{""count"":2}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/Scenarios/when_running_a_query_using_link_metadata.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/Scenarios/when_running_a_query_using_link_metadata.cs
deleted file mode 100644
index 24707c6ece7..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/Scenarios/when_running_a_query_using_link_metadata.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System.Linq;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Management;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint.Scenarios
-{
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_running_a_query_using_link_metadata<TLogFormat, TStream> : specification_with_js_query_posted<TLogFormat, TStream> {
-		protected override void GivenEvents() {
-			ExistingEvent("stream", SystemEventTypes.LinkTo, "{\"a\":1}", "0@account-01");
-			ExistingEvent("stream", SystemEventTypes.LinkTo, "{\"a\":2}", "1@account-01");
-			ExistingEvent("stream", SystemEventTypes.LinkTo, "{\"a\":10}", "0@account-02");
-
-			ExistingEvent("account-01", "test", "", "{\"a\":1}", isJson: true);
-			ExistingEvent("account-01", "test", "", "{\"a\":2}", isJson: true);
-			ExistingEvent("account-02", "test", "", "{\"a\":10}", isJson: true);
-		}
-
-		protected override string GivenQuery() {
-			return @"
-fromStream('stream').when({
-    $any: function(s, e) { 
-        // test
-        if (JSON.stringify(e.body) != JSON.stringify(e.linkMetadata))
-            throw 'invalid link metadata ' + JSON.stringify(e.linkMetadata) + ' expected is ' + JSON.stringify(e.body);
-        
-        return e.linkMetadata; 
-    }
-}).outputState()
-";
-		}
-
-		[Test]
-		public void just() {
-			AssertLastEvent("$projections-query-result", "{\"a\":10}", skip: 1 /* $eof */);
-		}
-
-		[Test]
-		public void state_becomes_completed() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetStatistics(
-					_bus, null, _projectionName, false));
-
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-					.Single()
-					.Projections.Length);
-			Assert.AreEqual(
-				_projectionName,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-					.Single()
-					.Projections.Single()
-					.Name);
-			Assert.AreEqual(
-				ManagedProjectionState.Completed,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-					.Single()
-					.Projections.Single()
-					.LeaderStatus);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/Serialization/when_serializing_state.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/Serialization/when_serializing_state.cs
deleted file mode 100644
index cacae1aaf94..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/Serialization/when_serializing_state.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Numerics;
-using System.Text.Json;
-using EventStore.Projections.Core.Services.Interpreted;
-using Jint;
-using Jint.Native;
-using Jint.Native.Json;
-using Jint.Native.Object;
-using NUnit.Framework;
-using JsonSerializer = Jint.Native.Json.JsonSerializer;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint.Serialization {
-	[TestFixture]
-	public class when_serializing_state {
-		private readonly Engine _engine;
-		private readonly JintProjectionStateHandler _sut;
-		private readonly JsonSerializer _builtIn;
-		private readonly JsonParser _parser;
-
-		public when_serializing_state() {
-			_engine = new Engine();
-			_parser = new JsonParser(_engine);
-			_builtIn = new JsonSerializer(_engine);
-			_sut = new JintProjectionStateHandler(
-				source: "",
-				enableContentTypeValidation: false,
-				compilationTimeout: TimeSpan.FromMilliseconds(500),
-				executionTimeout: TimeSpan.FromMilliseconds(500));
-		}
-
-		private void RoundTrip(string json, bool ignoreCase = false) {
-			var instance = _parser.Parse(json);
-			var builtInSerialized = _builtIn.Serialize(instance, JsValue.Undefined, JsValue.Undefined).AsString();
-			var serialized = _sut.Serialize(instance);
-
-			if (ignoreCase) {
-				Assert.IsTrue(
-					string.Equals(builtInSerialized, serialized, StringComparison.OrdinalIgnoreCase),
-					$"old {_builtIn} new {serialized}");
-				Assert.IsTrue(
-					string.Equals(json, serialized, StringComparison.OrdinalIgnoreCase),
-					$"in {json} out {serialized}");
-			} else {
-				Assert.AreEqual(builtInSerialized, serialized, "different to old serializer");
-				Assert.AreEqual(json, serialized, "did not round trip");
-			}
-		}
-
-		[Test]
-		public void round_trip_objects() {
-			RoundTrip(@"{}");
-			RoundTrip(@"{""foo"":123,""bar"":456}");
-			RoundTrip(@"{""fo o"":[1,2,3]}");
-			RoundTrip(@"{"" foo"":{}}");
-			RoundTrip(@"{""foo "":true}");
-		}
-
-		[Test]
-		public void round_trip_arrays() {
-			RoundTrip(@"[]");
-			RoundTrip(@"[[],3]");
-			RoundTrip(@"[3,[]]");
-			RoundTrip(@"[{},[[],null],{"""":[4,5,6]}]");
-		}
-
-		[Test]
-		public void round_trip_values() {
-			RoundTrip(@"""stringvalue""");
-			RoundTrip(@"34");
-			RoundTrip(@"{""foo"":""bar""}");
-			RoundTrip(@"[1,4,5,8]");
-			RoundTrip(@"true");
-			RoundTrip(@"false");
-			RoundTrip(@"null");
-		}
-
-		[Test]
-		public void round_trip_strings() {
-			RoundTrip(@"""""");
-			RoundTrip(@""" """);
-			RoundTrip(@"""foo""");
-			RoundTrip(@"""\""""");
-			RoundTrip(@"""\\""");
-			RoundTrip(@"""/""");
-			RoundTrip(@"""\b""");
-			RoundTrip(@"""\f""");
-			RoundTrip(@"""\n""");
-			RoundTrip(@"""\r""");
-			RoundTrip(@"""\t""");
-			RoundTrip(@"""€""");
-		}
-
-		[Test]
-		public void round_trip_numbers() {
-			//RoundTrip("18446744073709551615");
-			//RoundTrip("-18446744073709551615");
-			//RoundTrip("18446744073709551616");
-			//RoundTrip("-18446744073709551616");
-			RoundTrip("5");
-			RoundTrip("5E+123", ignoreCase: true);
-			RoundTrip("5E-123", ignoreCase: true);
-			RoundTrip("-5E-123", ignoreCase: true);
-			RoundTrip("-50");
-			RoundTrip("0");
-			RoundTrip("-0.03");
-			RoundTrip("0.0123");
-			RoundTrip("-0.0123");
-			RoundTrip("-1.23E-123", ignoreCase: true);
-		}
-
-		[Test]
-		public void big_int() {
-			var serialized = _sut.Serialize(new JsBigInt(BigInteger.Parse("20000000000000000000")));
-			Assert.AreEqual(@"""20000000000000000000""", serialized);
-		}
-
-		[Test]
-		public void undefined() {
-			var serialized = _sut.Serialize(JsValue.Undefined);
-			Assert.AreEqual(@"null", serialized);
-		}
-
-		[Test]
-		public void undefined_property() {
-			var instance = new JsObject(_engine);
-			instance.Set("foo", JsValue.Undefined);
-			instance.Set("bar", "baz");
-			var serialized = _sut.Serialize(instance);
-			Assert.AreEqual(@"{""bar"":""baz""}", serialized);
-		}
-
-		[Test]
-		public void whitespace() {
-			// nothing. we only want to test the serializer in this file, not the parser.
-		}
-
-		[Test]
-		public void big_state() {
-			var json = ReadJsonFromFile("big_state.json");
-			var instance = _parser.Parse(json);
-			var serialized = _sut.Serialize(instance);
-			Assert.AreEqual(json, serialized);
-		}
-
-		public static string ReadJsonFromFile(string filename)
-        {
-			var assembly = typeof(when_serializing_state).Assembly;
-			var availableFiles = assembly.GetManifestResourceNames();
-			var streamName = availableFiles.Where(
-				x=> x.StartsWith(typeof(when_serializing_state).Namespace) && x.EndsWith(filename)
-				).SingleOrDefault();
-			if(streamName == null) throw new InvalidOperationException($"Could not find {filename}");
-			using var stream = assembly.GetManifestResourceStream(streamName);
-
-			var doc = JsonDocument.Parse(stream);
-			using var ms = new MemoryStream();
-			var writer = new Utf8JsonWriter(ms);
-			doc.WriteTo(writer);
-			writer.Flush();
-			ms.Position = 0;
-			using var sr = new StreamReader(ms);
-			return sr.ReadToEnd();
-        }
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/TestFixtureWithInterpretedProjection.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/TestFixtureWithInterpretedProjection.cs
deleted file mode 100644
index abfd4194869..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/TestFixtureWithInterpretedProjection.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Management;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	public abstract class TestFixtureWithInterpretedProjection {
-		protected ProjectionStateHandlerFactory _stateHandlerFactory;
-		protected IProjectionStateHandler _stateHandler;
-		protected List<string> _logged;
-		protected string _projection;
-		protected string _state = null;
-		protected string _sharedState = null;
-		protected IQuerySources _source;
-		protected TimeSpan CompilationTimeout { get; set; } = TimeSpan.FromMilliseconds(1000);
-		protected TimeSpan ExecutionTimeout { get; set; } = TimeSpan.FromMilliseconds(500);
-
-		[SetUp]
-		public void Setup() {
-			_state = null;
-			_projection = null;
-			Given();
-			_logged = new List<string>();
-			_stateHandlerFactory =
-				new ProjectionStateHandlerFactory(CompilationTimeout, ExecutionTimeout);
-			_stateHandler = CreateStateHandler();
-			_source = _stateHandler.GetSourceDefinition();
-
-			if (_state != null)
-				_stateHandler.Load(_state);
-			else
-				_stateHandler.Initialize();
-
-			if (_sharedState != null)
-				_stateHandler.LoadShared(_sharedState);
-			When();
-		}
-
-		protected const string _projectionType = "js";
-
-		protected virtual IProjectionStateHandler CreateStateHandler() {
-			return _stateHandlerFactory.Create(
-				_projectionType, _projection, true, null, logger: (s, _) => {
-					if (s.StartsWith("P:"))
-						Console.WriteLine(s);
-					else
-						_logged.Add(s);
-				}); // skip prelude debug output
-		}
-
-		protected virtual void When() {
-		}
-
-		protected abstract void Given();
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/specification_with_event_handled.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/specification_with_event_handled.cs
deleted file mode 100644
index fd6f2e66b28..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/specification_with_event_handled.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	public abstract class specification_with_event_handled : TestFixtureWithInterpretedProjection {
-		protected ResolvedEvent _handledEvent;
-		protected string _newState;
-		protected string _newSharedState;
-		protected EmittedEventEnvelope[] _emittedEventEnvelopes;
-
-		protected override void When() {
-			_stateHandler.ProcessEvent(
-				"",
-				CheckpointTag.FromPosition(
-					0, _handledEvent.Position.CommitPosition, _handledEvent.Position.PreparePosition), "",
-				_handledEvent,
-				out _newState, out _newSharedState, out _emittedEventEnvelopes);
-		}
-
-		protected static ResolvedEvent CreateSampleEvent(
-			string streamId, int sequenceNumber, string eventType, string data, TFPos tfPos) {
-			return new ResolvedEvent(
-				streamId, sequenceNumber, streamId, sequenceNumber, true, tfPos, Guid.NewGuid(), eventType, true, data,
-				"{}", "{\"position_meta\":1}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/when_creating_jint_projection.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/when_creating_jint_projection.cs
deleted file mode 100644
index fc86faea1e6..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/when_creating_jint_projection.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using Jint.Runtime;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint {
-	class when_creating_jint_projection {
-		private ProjectionStateHandlerFactory _stateHandlerFactory;
-		private const string _projectionType = "js";
-
-		[SetUp]
-		public void Setup() {
-			_stateHandlerFactory =
-				new ProjectionStateHandlerFactory(TimeSpan.FromMilliseconds(250), TimeSpan.FromMilliseconds(100));
-		}
-
-		[Test, Category(_projectionType)]
-		public void it_can_be_created() {
-			using (_stateHandlerFactory.Create(_projectionType, @"", true, null)) {
-			}
-		}
-
-		[Test, Category(_projectionType)]
-		public void js_syntax_errors_are_reported() {
-			try {
-				using (_stateHandlerFactory.Create(_projectionType, @"log(1;", true, null, logger: (s, _) => { })) {
-				}
-			} catch (Exception ex) {
-				Assert.IsInstanceOf<Esprima.ParserException>(ex);
-			}
-		}
-
-		[Test, Category(_projectionType)]
-		public void js_exceptions_errors_are_reported() {
-			try {
-				using (_stateHandlerFactory.Create(_projectionType, @"throw 123;", true, null, logger: (s, _) => { })) {
-				}
-			} catch (Exception ex) {
-				Assert.IsInstanceOf<JavaScriptException>(ex);
-				Assert.AreEqual("123", ex.Message);
-			}
-		}
-
-		[Test, Category(_projectionType)]
-		public void long_compilation_times_out() {
-			try {
-				using (_stateHandlerFactory.Create(_projectionType,
-					@"
-                                var i = 0;
-                                while (true) i++;
-                    ",
-					true,
-					null,
-					logger: (s, _) => { })) {
-				}
-			} catch (Exception ex) {
-				Assert.IsInstanceOf<TimeoutException>(ex);
-			}
-		}
-
-		[Test, Category(_projectionType)]
-		public void long_execution_times_out() {
-			try {
-				using (var h = _stateHandlerFactory.Create(_projectionType,
-					@"
-                        fromAll().when({
-                            $any: function (s, e) {
-                                log('1');
-                                var i = 0;
-                                while (true) i++;
-                            }
-                        });
-                    ",
-					true,
-					null,
-					logger: Console.WriteLine)) {
-					h.Initialize();
-					string newState;
-					EmittedEventEnvelope[] emittedevents;
-					h.ProcessEvent(
-						"partition",
-						CheckpointTag.FromPosition(0, 100, 50),
-						"stream",
-						"event",
-						"",
-						Guid.NewGuid(),
-						1,
-						"", "{}",
-						out newState, out emittedevents);
-				}
-			} catch (Exception ex) {
-				Assert.IsInstanceOf<TimeoutException>(ex);
-			}
-		}
-
-		[Test, Category(_projectionType)]
-		public void long_post_processing_times_out() {
-			try {
-				using (var h = _stateHandlerFactory.Create(_projectionType,
-					@"
-                        fromAll().when({
-                            $any: function (s, e) {
-                                return {};
-                            }
-                        })
-                        .transformBy(function(s){
-                                log('1');
-                                var i = 0;
-                                while (true) i++;
-                        });
-                    ",
-					true,
-					null,
-					logger: Console.WriteLine)) {
-					h.Initialize();
-					string newState;
-					EmittedEventEnvelope[] emittedevents;
-					h.ProcessEvent(
-						"partition", CheckpointTag.FromPosition(0, 100, 50), "stream", "event", "", Guid.NewGuid(), 1,
-						"", "{}",
-						out newState, out emittedevents);
-					h.TransformStateToResult();
-				}
-			} catch (Exception ex) {
-				Assert.IsInstanceOf<TimeoutException>(ex);
-			}
-		}
-
-		[Test, Category(_projectionType)]
-		public void long_execution_times_out_many() {
-			for (var i = 0; i < 10; i++) {
-				try {
-					using (var h = _stateHandlerFactory.Create(
-						_projectionType, @"
-                    fromAll().when({
-                        $any: function (s, e) {
-                            log('1');
-                            var i = 0;
-                            while (true) i++;
-                        }
-                    });
-                ", true, null, logger: Console.WriteLine)) {
-						h.Initialize();
-						string newState;
-						EmittedEventEnvelope[] emittedevents;
-						h.ProcessEvent(
-							"partition", CheckpointTag.FromPosition(0, 100, 50), "stream", "event", "", Guid.NewGuid(),
-							1,
-							"", "{}", out newState, out emittedevents);
-						Assert.Fail("Timeout didn't happen");
-					}
-				} catch (TimeoutException) {
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/when_defining_a_js_projection.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/when_defining_a_js_projection.cs
deleted file mode 100644
index a2970fa3a71..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/when_defining_a_js_projection.cs
+++ /dev/null
@@ -1,529 +0,0 @@
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	[TestFixture]
-	public class when_defining_a_js_projection {
-		private const string _projectionType = "INTERPRETED";
-		[TestFixture]
-		public class with_from_all_source : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                   fromAll().when({
-                        $any:function(state, event) {
-                            return state;
-                        }});
-                ";
-				_state = @"{""count"": 0}";
-			}
-
-			[Test, Category(_projectionType)]
-			public void source_definition_is_correct() {
-				var expected = SourceDefinitionBuilder.From(b => {
-					b.FromAll();
-					b.AllEvents();
-				});
-				AssertEx.AreEqual(expected,_source);
-			}
-		}
-
-		[TestFixture]
-		public class with_from_stream : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                    fromStream('stream1').when({
-                        $any:function(state, event) {
-                            return state;
-                        }});
-                ";
-				_state = @"{""count"": 0}";
-			}
-
-			[Test, Category(_projectionType)]
-			public void source_definition_is_correct() {
-				var expected = SourceDefinitionBuilder.From(b => {
-					b.AllEvents();
-					b.FromStream("stream1");
-				});
-				AssertEx.AreEqual(expected,_source);
-			}
-		}
-
-		[TestFixture]
-		public class with_multiple_from_streams : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                    fromStreams(['stream1', 'stream2', 'stream3']).when({
-                    $any: function(state, event) {
-                            return state;
-                        }});
-                ";
-				_state = @"{""count"": 0}";
-			}
-
-			[Test, Category(_projectionType)]
-			public void source_definition_is_correct() {
-				var expected = SourceDefinitionBuilder.From(b => {
-					b.AllEvents();
-					b.FromStream("stream1");
-					b.FromStream("stream2");
-					b.FromStream("stream3");
-				});
-				AssertEx.AreEqual(expected,_source);
-			}
-		}
-
-		[TestFixture]
-		public class with_multiple_from_streams_plain : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                    fromStreams('stream1', 'stream2', 'stream3').when({
-                        $any:function(state, event) {
-                            return state;
-                        }});
-                ";
-				_state = @"{""count"": 0}";
-			}
-
-			[Test, Category(_projectionType)]
-			public void source_definition_is_correct() {
-				var expected = SourceDefinitionBuilder.From(b => {
-					b.AllEvents();
-					b.FromStream("stream1");
-					b.FromStream("stream2");
-					b.FromStream("stream3");
-				});
-				AssertEx.AreEqual(expected,_source);
-			}
-		}
-
-		[TestFixture]
-		public class with_multiple_from_categories : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                    fromCategories(['category1', 'category2', 'category3']).when({
-                    $any: function(state, event) {
-                            return state;
-                        }});
-                ";
-				_state = @"{""count"": 0}";
-			}
-
-			[Test, Category(_projectionType)]
-			public void source_definition_is_correct() {
-				var expected = SourceDefinitionBuilder.From(b => {
-					b.AllEvents();
-					b.FromStream("$ce-category1");
-					b.FromStream("$ce-category2");
-					b.FromStream("$ce-category3");
-				});
-				AssertEx.AreEqual(expected,_source);
-			}
-		}
-
-		[TestFixture]
-		public class with_multiple_from_categories_plain : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                    fromCategories('category1', 'category2', 'category3').when({
-                        $any:function(state, event) {
-                            return state;
-                        }});
-                ";
-				_state = @"{""count"": 0}";
-			}
-
-			[Test, Category(_projectionType)]
-			public void source_definition_is_correct() {
-				var expected = SourceDefinitionBuilder.From(b => {
-					b.AllEvents();
-					b.FromStream("$ce-category1");
-					b.FromStream("$ce-category2");
-					b.FromStream("$ce-category3");
-				});
-				AssertEx.AreEqual(expected,_source);
-			}
-		}
-
-		[TestFixture]
-		public class with_from_category : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                    fromCategory('category1').when({
-                        $any:function(state, event) {
-                            return state;
-                        }});
-                ";
-				_state = @"{""count"": 0}";
-			}
-
-			[Test, Category(_projectionType)]
-			public void source_definition_is_correct() {
-				var expected = SourceDefinitionBuilder.From(b => {
-					b.AllEvents();
-					b.FromCategory("category1");
-				});
-				AssertEx.AreEqual(expected,_source);
-			}
-		}
-
-		[TestFixture]
-		public class with_from_category_by_stream : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                    fromCategory('category1').foreachStream().when({
-                        $any:function(state, event) {
-                            return state;
-                        }});
-                ";
-				_state = @"{""count"": 0}";
-			}
-
-			[Test, Category(_projectionType)]
-			public void source_definition_is_correct() {
-				var expected = SourceDefinitionBuilder.From(b => {
-					b.AllEvents();
-					b.FromCategory("category1");
-					b.SetByStream();
-				});
-				AssertEx.AreEqual(expected,_source);
-			}
-		}
-
-		[TestFixture]
-		public class with_from_all_by_custom_partitions : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                    fromAll().partitionBy(function(event){
-                        return event.eventType;
-                    }).when({
-                        $any:function(state, event) {
-                            return state;
-                        }});
-                ";
-				_state = @"{""count"": 0}";
-			}
-
-			[Test]
-			public void source_definition_is_correct() {
-				var expected = SourceDefinitionBuilder.From(b => {
-					b.AllEvents();
-					b.FromAll();
-					b.SetByCustomPartitions();
-				});
-				AssertEx.AreEqual(expected,_source);
-			}
-		}
-
-		[TestFixture]
-		public class with_output_to : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                    fromAll()
-                    .when({
-                        $any:function(state, event) {
-                            return state;
-                        }})
-                    .$defines_state_transform();
-                ";
-				_state = @"{""count"": 0}";
-			}
-
-			[Test]
-			public void source_definition_is_correct() {
-				var expected = SourceDefinitionBuilder.From(b => {
-					b.AllEvents();
-					b.FromAll();
-					b.SetDefinesStateTransform();
-					b.SetOutputState();
-				});
-				AssertEx.AreEqual(expected,_source);
-			}
-		}
-
-		[TestFixture]
-		public class with_transform_by : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                    fromAll().when({
-                        $any:function(state, event) {
-                            return state;
-                        }}).transformBy(function(s) {return s;});
-                ";
-				_state = @"{""count"": 0}";
-			}
-
-			[Test, Category(_projectionType)]
-			public void source_definition_is_correct() {
-				var expected = SourceDefinitionBuilder.From(b => {
-					b.AllEvents();
-					b.FromAll();
-					b.SetDefinesStateTransform();
-					b.SetOutputState();
-				});
-				AssertEx.AreEqual(expected,_source);
-			}
-		}
-
-		public class with_filter_by : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                    fromAll().when({
-                        some: function(state, event) {
-                            return state;
-                        }
-                    }).filterBy(function(s) {return true;});
-                ";
-				_state = @"{""count"": 0}";
-			}
-
-			[Test, Category(_projectionType)]
-			public void source_definition_is_correct() {
-				var expected = SourceDefinitionBuilder.From(b => {
-					b.FromAll();
-					b.IncludeEvent("some");
-					b.SetDefinesStateTransform();
-					b.SetOutputState();
-				});
-				AssertEx.AreEqual(expected, _source);
-			}
-		}
-
-		public class with_output_state : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                    var z = fromAll().outputState();
-                ";
-				_state = @"{""count"": 0}";
-			}
-
-			[Test, Category(_projectionType)]
-			public void source_definition_is_correct() {
-				var expected = SourceDefinitionBuilder.From(b => {
-					b.AllEvents();
-					b.FromAll();
-					b.NoWhen();
-					b.SetOutputState();
-				});
-				AssertEx.AreEqual(expected,_source);
-			}
-		}
-
-		public class without_when : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                    var z = fromAll();
-                ";
-				_state = @"{""count"": 0}";
-			}
-
-			[Test, Category(_projectionType)]
-			public void source_definition_is_correct() {
-				var expected = SourceDefinitionBuilder.From(b => {
-					b.AllEvents();
-					b.FromAll();
-					b.NoWhen();
-				});
-				AssertEx.AreEqual(expected,_source);
-			}
-		}
-
-		public class with_when : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                    var z = fromAll().when({a: function(s,e) {}});
-                ";
-				_state = @"{""count"": 0}";
-			}
-
-			[Test, Category(_projectionType)]
-			public void source_definition_is_correct() {
-				var expected = SourceDefinitionBuilder.From(b => {
-					b.FromAll();
-					b.IncludeEvent("a");
-				});
-				AssertEx.AreEqual(expected,_source);
-			}
-		}
-
-		[TestFixture]
-		public class with_state_stream_name_option : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                    options({
-                        resultStreamName: 'state-stream',
-                    });
-                    fromAll().when({
-                        $any:function(state, event) {
-                            return state;
-                        }});
-                ";
-				_state = @"{""count"": 0}";
-			}
-
-			[Test, Category(_projectionType)]
-			public void source_definition_is_correct() {
-				var expected = SourceDefinitionBuilder.From(b => {
-					b.AllEvents();
-					b.FromAll();
-					b.SetResultStreamNameOption("state-stream");
-				});
-				AssertEx.AreEqual(expected,_source);
-			}
-		}
-
-		[TestFixture]
-		public class with_include_links_option : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                    options({
-                        $includeLinks: true,
-                    });
-                    fromAll().when({
-                        $any:function(state, event) {
-                            return state;
-                        }});
-                ";
-				_state = @"{""count"": 0}";
-			}
-
-			[Test, Category(_projectionType)]
-			public void source_definition_is_correct() {
-				var expected = SourceDefinitionBuilder.From(b => {
-					b.AllEvents();
-					b.FromAll();
-					b.SetIncludeLinks();
-				});
-				AssertEx.AreEqual(expected,_source);
-			}
-		}
-
-		[TestFixture]
-		public class with_bi_state_option : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                    options({
-                        biState: true,
-                    });
-                    fromAll().when({
-                        $any:function(state, sharedState, event) {
-                            return state;
-                        }});
-                ";
-				_state = @"{""count"": 0}";
-			}
-
-			[Test, Category(_projectionType)]
-			public void source_definition_is_correct() {
-				var expected = SourceDefinitionBuilder.From(b => {
-					b.AllEvents();
-					b.FromAll();
-					b.SetDefinesFold();
-					b.SetIsBiState(true);
-				});
-				AssertEx.AreEqual(expected,_source);
-			}
-		}
-
-		[TestFixture]
-		public class with_reorder_events_option : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                    options({
-                        reorderEvents: true,
-                        processingLag: 500,
-                    });
-                    fromAll().when({
-                        $any:function(state, event) {
-                            return state;
-                        }});
-                ";
-				_state = @"{""count"": 0}";
-			}
-
-			[Test, Category(_projectionType)]
-			public void source_definition_is_correct() {
-				var expected = SourceDefinitionBuilder.From(b => {
-					b.AllEvents();
-					b.FromAll();
-					b.SetProcessingLag(500);
-					b.SetReorderEvents(true);
-				});
-				AssertEx.AreEqual(expected,_source);
-			}
-		}
-
-		[TestFixture]
-		public class with_multiple_option_statements : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                    options({
-                        reorderEvents: false,
-                        processingLag: 500,
-                    });
-                    options({
-                        reorderEvents: true,
-                    });
-                    fromAll().when({
-                        $any:function(state, event) {
-                            return state;
-                        }});
-                ";
-				_state = @"{""count"": 0}";
-			}
-
-			[Test, Category(_projectionType)]
-			public void source_definition_is_correct() {
-				var expected = SourceDefinitionBuilder.From(b => {
-					b.AllEvents();
-					b.FromAll();
-					b.SetProcessingLag(500);
-					b.SetReorderEvents(true);
-				});
-				AssertEx.AreEqual(expected,_source);
-			}
-		}
-
-		[TestFixture]
-		public class with_foreach_and_deleted_notification_handled : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"fromAll().foreachStream().when({
-                $deleted: function(){}
-            })";
-				_state = @"{}";
-			}
-
-			[Test]
-			public void source_definition_is_correct() {
-				var expected = SourceDefinitionBuilder.From(b => {
-					b.AllEvents();
-					b.FromAll();
-					b.SetByStream();
-					b.SetHandlesStreamDeletedNotifications();
-				});
-				AssertEx.AreEqual(expected,_source);
-			}
-		}
-
-		[TestFixture]
-		public class with_deleted_notification_handled : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"fromAll().when({
-                $deleted: function(){}
-            })";
-				_state = @"{}";
-			}
-
-			[Test]
-			public void source_definition_is_correct() {
-				var expected = SourceDefinitionBuilder.From(b => {
-					b.AllEvents();
-					b.FromAll();
-					b.SetHandlesStreamDeletedNotifications();
-				});
-				AssertEx.AreEqual(expected,_source);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/when_initializing_state.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/when_initializing_state.cs
deleted file mode 100644
index baaacd4b5d7..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/when_initializing_state.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	[TestFixture]
-	public class when_initializing_state : TestFixtureWithInterpretedProjection {
-		protected override void Given() {
-			_projection = @"
-                fromAll().when({
-                    $init: function() {
-                        return { test: '1' };
-                    },
-                    
-                    type1: function(state, event) {
-                        return state;
-                    },
-                }).transformBy(function(s) { return s;});
-            ";
-		}
-
-		[Test, Category(_projectionType)]
-		public void process_event_should_return_initialized_state() {
-			string state;
-			EmittedEventEnvelope[] emittedEvents;
-			_stateHandler.ProcessEvent(
-				"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category",
-				Guid.NewGuid(), 0, "metadata", @"{""a"":""b""}", out state, out emittedEvents);
-			Assert.IsTrue(state.Contains("\"test\":\"1\""));
-		}
-
-		[Test, Category(_projectionType)]
-		public void transform_state_should_return_initialized_state() {
-			var result = _stateHandler.TransformStateToResult();
-			Assert.IsTrue(result.Contains("\"test\":\"1\""));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/when_js_projection_loading_state.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/when_js_projection_loading_state.cs
deleted file mode 100644
index bbf3537b3ec..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/when_js_projection_loading_state.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	[TestFixture]
-	public class when_js_projection_loading_state : TestFixtureWithInterpretedProjection {
-		protected override void Given() {
-			_projection = @"
-                fromAll().when({$any: 
-                    function(state, event) {
-                        return state;
-                    }
-                });
-            ";
-			_state = @"{""A"":""A"",""B"":""B""}";
-		}
-
-		[Test, Category(_projectionType)]
-		public void the_state_is_loaded() {
-			string state;
-			EmittedEventEnvelope[] emittedEvents;
-			_stateHandler.ProcessEvent(
-				"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
-				"metadata",
-				@"{""x"":""y""}", out state, out emittedEvents);
-
-			Assert.AreEqual(_state, state);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/when_not_returning_state_from_a_js_handler.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/when_not_returning_state_from_a_js_handler.cs
deleted file mode 100644
index f0c440a8eb4..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/when_not_returning_state_from_a_js_handler.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	[TestFixture]
-	public class when_not_returning_state_from_a_js_handler : TestFixtureWithInterpretedProjection {
-		protected override void Given() {
-			_projection = @"
-                fromAll().when({$any: function(state, event) {
-                    state.newValue = 'new';
-                }});
-            ";
-		}
-
-		[Test, Category(_projectionType)]
-		public void process_event_should_return_updated_state() {
-			string state;
-			EmittedEventEnvelope[] emittedEvents;
-			_stateHandler.ProcessEvent(
-				"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category",
-				Guid.NewGuid(), 0, "metadata", @"{""a"":""b""}", out state, out emittedEvents);
-			Assert.IsTrue(state.Contains("\"newValue\":\"new\""));
-		}
-
-		[Test, Category(_projectionType)]
-		public void process_event_returns_true() {
-			string state;
-			EmittedEventEnvelope[] emittedEvents;
-			var result = _stateHandler.ProcessEvent(
-				"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category",
-				Guid.NewGuid(), 0, "metadata", @"{""a"":""b""}", out state, out emittedEvents);
-
-			Assert.IsTrue(result);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/when_partitioning_by_custom_rule.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/when_partitioning_by_custom_rule.cs
deleted file mode 100644
index 8ba7a6139c1..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/when_partitioning_by_custom_rule.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	[TestFixture]
-	public class when_partitioning_by_custom_rule : TestFixtureWithInterpretedProjection {
-		protected override void Given() {
-			_projection = @"
-                fromAll().partitionBy(function(event){
-                    return event.body.region;
-                }).when({$any:function(event, state) {
-                    return {};
-                }});
-            ";
-		}
-
-		[Test]
-		public void get_state_partition_returns_correct_result() {
-			var result = _stateHandler.GetStatePartition(
-				CheckpointTag.FromPosition(0, 100, 50), "category",
-				new ResolvedEvent(
-					"stream1", 0, "stream1", 0, false, new TFPos(100, 50), Guid.NewGuid(), "type1", true,
-					@"{""region"":""Europe""}", "metadata"));
-
-			Assert.AreEqual("Europe", result);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/when_partitioning_by_custom_rule_returning_a_number.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/when_partitioning_by_custom_rule_returning_a_number.cs
deleted file mode 100644
index 5a0bf514c4d..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/when_partitioning_by_custom_rule_returning_a_number.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint {
-	[TestFixture]
-	public class when_partitioning_by_custom_rule_returning_a_number : TestFixtureWithInterpretedProjection {
-		protected override void Given() {
-			_projection = @"
-                fromAll().partitionBy(function(event){
-                    return event.body.index;
-                }).when({$any:function(event, state) {
-                    return {};
-                }});
-            ";
-		}
-
-		[Test]
-		public void get_state_partition_returns_correct_result() {
-			var result = _stateHandler.GetStatePartition(
-				CheckpointTag.FromPosition(0, 100, 50), "category",
-				new ResolvedEvent(
-					"stream1", 0, "stream1", 0, false, new TFPos(100, 50), Guid.NewGuid(), "type1", true,
-					@"{""index"": 42}", "metadata"));
-
-			Assert.AreEqual("42", result);
-		}
-
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_faulting_js_projection.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_faulting_js_projection.cs
deleted file mode 100644
index a94055df3b5..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_faulting_js_projection.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using Jint.Runtime;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	public class when_running_a_faulting_js_projection {
-		[TestFixture]
-		public class when_event_handler_throws : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                    fromAll();
-                    on_any(function(state, event) {
-                        log(state.count);
-                        throw ""failed"";
-                        return state;
-                    });
-                ";
-				_state = @"{""count"": 0}";
-			}
-
-			[Test, Category(_projectionType)]
-			public void process_event_throws_javascript_exception() {
-				try {
-					string state;
-					EmittedEventEnvelope[] emittedEvents;
-					_stateHandler.ProcessEvent(
-						"", CheckpointTag.FromPosition(0, 10, 5), "stream1", "type1", "category", Guid.NewGuid(), 0,
-						"metadata",
-						@"{""a"":""b""}", out state, out emittedEvents);
-				} catch (Exception ex) {
-					Assert.IsInstanceOf<JavaScriptException>(ex);
-					Assert.AreEqual("failed", ex.Message);
-				}
-			}
-		}
-
-		[TestFixture]
-		public class when_state_transform_throws : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                    fromAll().when({$any: function(state, event) {
-                        return state;
-                    }})
-                    .transformBy(function (s) { throw ""failed"";});
-                ";
-				_state = @"{""count"": 0}";
-			}
-
-			[Test, Category(_projectionType)]
-			public void process_event_throws_javascript_exception() {
-				try {
-					string state;
-					EmittedEventEnvelope[] emittedEvents;
-					Assert.DoesNotThrow(() => _stateHandler.ProcessEvent(
-						"", CheckpointTag.FromPosition(0, 10, 5), "stream1", "type1", "category", Guid.NewGuid(), 0,
-						"metadata",
-						@"{""a"":""b""}", out state, out emittedEvents));
-					_stateHandler.TransformStateToResult();
-				} catch (Exception ex) {
-					Assert.IsInstanceOf<JavaScriptException>(ex);
-					Assert.AreEqual("failed", ex.Message);
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_emitting_invalid_events.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_emitting_invalid_events.cs
deleted file mode 100644
index 41138336032..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_emitting_invalid_events.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	public abstract class when_running_a_js_projection_emitting_invalid_events : TestFixtureWithInterpretedProjection {
-		
-		protected override void Given() {
-			_projection = @"
-			              fromAll().when({$any: 
-			                  function(state, event) {
-			                      emit(" + FormatEmitParameters +@");
-			                  return {};
-			              }});
-			          ";
-		}
-
-		protected virtual string StreamId => "'testStream'";
-		protected virtual string EventType => "'testEventType'";
-		protected virtual string EventBody => "{}";
-		protected virtual string FormatEmitParameters => $"{StreamId}, {EventType}, {EventBody}";
-		protected virtual bool IsNull => false;
-		protected abstract string ParameterName { get; }
-		[Test, Category(_projectionType)]
-		public void process_event_faults() {
-			string state;
-			EmittedEventEnvelope[] emittedEvents;
-			TestDelegate td = () =>
-				_stateHandler.ProcessEvent(
-					"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
-					"metadata",
-					@"{""a"":""b""}", out state, out emittedEvents);
-			var ae = IsNull ? Assert.Throws<ArgumentNullException>(td) : Assert.Throws<ArgumentException>(td);
-			Assert.AreEqual(ParameterName, ae.ParamName);
-		}
-
-		public class null_stream : when_running_a_js_projection_emitting_invalid_events {
-			protected override string ParameterName => "streamId";
-			protected override string StreamId => "null";
-			protected override bool IsNull => true;
-		}
-
-		public class empty_stream : when_running_a_js_projection_emitting_invalid_events {
-			protected override string ParameterName => "streamId";
-			protected override string StreamId => "''";
-			protected override bool IsNull => true;
-		}
-
-		public class object_stream : when_running_a_js_projection_emitting_invalid_events {
-			protected override string ParameterName => "streamId";
-			protected override string StreamId => "{\"a\":\"b\"}";
-		}
-
-		public class undefined_stream : when_running_a_js_projection_emitting_invalid_events {
-			protected override string ParameterName => "streamId";
-			protected override string StreamId => "undefined";
-			protected override bool IsNull => true;
-
-		}
-
-
-		public class null_eventtype : when_running_a_js_projection_emitting_invalid_events {
-			protected override string ParameterName => "eventName";
-			protected override string EventType => "null";
-			protected override bool IsNull => true;
-		}
-
-		public class empty_eventtype : when_running_a_js_projection_emitting_invalid_events {
-			protected override string ParameterName => "eventName";
-			protected override string EventType => "''";
-			protected override bool IsNull => true;
-		}
-
-		public class object_eventtype : when_running_a_js_projection_emitting_invalid_events {
-			protected override string ParameterName => "eventName";
-			protected override string EventType => "{\"a\":\"b\"}";
-		}
-
-		public class undefined_eventtype : when_running_a_js_projection_emitting_invalid_events {
-			protected override string ParameterName => "eventName";
-			protected override string EventType => "undefined";
-			protected override bool IsNull => true;
-		}
-
-		public class null_eventbody : when_running_a_js_projection_emitting_invalid_events {
-			protected override string ParameterName => "eventBody";
-			protected override string EventBody => "null";
-			protected override bool IsNull => true;
-		}
-
-		public class nonobject_eventbody : when_running_a_js_projection_emitting_invalid_events {
-			protected override string ParameterName => "eventBody";
-			protected override string EventBody => "'test'";
-		}
-
-		public class undefined_eventbody : when_running_a_js_projection_emitting_invalid_events {
-			protected override string ParameterName => "eventBody";
-			protected override bool IsNull => true;
-			protected override string EventBody => "undefined";
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_emitting_invalid_links.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_emitting_invalid_links.cs
deleted file mode 100644
index 043b3eb4f6c..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_emitting_invalid_links.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	public class when_running_a_js_projection_emitting_invalid_links : TestFixtureWithInterpretedProjection {
-		protected override void Given() {
-			_projection = @"
-                fromAll().when({$any: 
-                    function(state, event) {
-						event = {};
-                    linkTo('output-stream', event);
-                    return {};
-                }});
-            ";
-		}
-		
-		[Test, Category(_projectionType)]
-		public void process_event_does_not_allow_emitted_event() {
-			var ex = Assert.Throws<Exception>(() => {
-				_stateHandler.ProcessEvent(
-					"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
-					"metadata",
-					@"{""a"":""b""}", out _, out var emittedEvents);
-			});
-			Assert.AreEqual("Invalid link to event undefined@undefined", ex.Message);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_emitting_metadata.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_emitting_metadata.cs
deleted file mode 100644
index 5a9c604536a..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_emitting_metadata.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	[TestFixture]
-	public class when_running_a_js_projection_emitting_metadata : TestFixtureWithInterpretedProjection {
-		protected override void Given() {
-			_projection = @"
-                fromAll().when({$any: 
-                    function(state, event) {
-                    emit('output-stream' + event.sequenceNumber, 'emitted-event' + event.sequenceNumber, {a: JSON.parse(event.bodyRaw).a}, {m1: 1, m2: ""2""});
-                    return {};
-                }});
-            ";
-		}
-
-		[Test, Category(_projectionType)]
-		public void process_event_returns_true() {
-			string state;
-			EmittedEventEnvelope[] emittedEvents;
-			var result = _stateHandler.ProcessEvent(
-				"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
-				"metadata",
-				@"{""a"":""b""}", out state, out emittedEvents);
-
-			Assert.IsTrue(result);
-		}
-
-		[Test, Category(_projectionType)]
-		public void process_event_returns_emitted_event() {
-			string state;
-			EmittedEventEnvelope[] emittedEvents;
-			_stateHandler.ProcessEvent(
-				"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
-				"metadata",
-				@"{""a"":""b""}", out state, out emittedEvents);
-
-			Assert.IsNotNull(emittedEvents);
-			Assert.AreEqual(1, emittedEvents.Length);
-			Assert.AreEqual("emitted-event0", emittedEvents[0].Event.EventType);
-			Assert.AreEqual("output-stream0", emittedEvents[0].Event.StreamId);
-			Assert.AreEqual(@"{""a"":""b""}", emittedEvents[0].Event.Data);
-			var extraMetaData = emittedEvents[0].Event.ExtraMetaData().ToArray();
-			Assert.IsNotNull(extraMetaData);
-			Assert.AreEqual(2, extraMetaData.Length);
-		}
-
-		[Test, Category(_projectionType), Category("Manual"), Explicit]
-		public void can_pass_though_millions_of_events() {
-			int i;
-			var sw = Stopwatch.StartNew();
-			for (i = 0; i < 100000000; i++) {
-				EmittedEventEnvelope[] emittedEvents;
-				_stateHandler.ProcessEvent(
-					"", CheckpointTag.FromPosition(0, i * 10 + 20, i * 10 + 10), "stream" + i, "type" + i, "category",
-					Guid.NewGuid(), i, "metadata", @"{""a"":""" + i + @"""}", out _, out emittedEvents);
-
-				Assert.IsNotNull(emittedEvents);
-				Assert.AreEqual(1, emittedEvents.Length);
-				Assert.AreEqual("emitted-event" + i, emittedEvents[0].Event.EventType);
-				Assert.AreEqual("output-stream" + i, emittedEvents[0].Event.StreamId);
-				Assert.AreEqual(@"{""a"":""" + i + @"""}", emittedEvents[0].Event.Data);
-				if (sw.Elapsed > TimeSpan.FromSeconds(120))
-					break;
-			}
-			
-			Console.WriteLine(i);
-
-			//TODO: replace with an actual benchmark
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_with_transform_by.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_with_transform_by.cs
deleted file mode 100644
index d4e897d9aa6..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_with_transform_by.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	[TestFixture]
-	public class when_running_a_js_projection_with_transform_by : TestFixtureWithInterpretedProjection {
-		protected override void Given() {
-			_projection = @"
-                fromAll().when({
-                    $any: function(state, event) {
-                        state.a = '1';
-                        return state;
-                    }
-                })
-                .transformBy(function(state) {
-                    state.b = '2';
-                    return state;
-                });
-            ";
-		}
-
-		[Test, Category(_projectionType)]
-		public void transform_state_returns_correct_result() {
-			string state;
-			EmittedEventEnvelope[] emittedEvents;
-			_stateHandler.ProcessEvent(
-				"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
-				"metadata",
-				@"{}", out state, out emittedEvents);
-			var result = _stateHandler.TransformStateToResult();
-
-			Assert.IsNotNull(result);
-			Assert.AreEqual(@"{""a"":""1"",""b"":""2""}", result);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_projection_with_created_handler.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_projection_with_created_handler.cs
deleted file mode 100644
index cec704dbb84..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_projection_with_created_handler.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	[TestFixture]
-	public class when_running_a_projection_with_created_handler : TestFixtureWithInterpretedProjection {
-		protected override void Given() {
-			_projection = @"
-                fromAll().foreachStream().when({
-                    $created: function(s, e) {
-                        emit('stream1', 'event1', {a:1});
-                    }   
-                });
-            ";
-			_state = @"{}";
-		}
-
-		[Test, Category(_projectionType)]
-		public void returns_emitted_events() {
-			var e = new ResolvedEvent(
-				"stream", 0, "stream", 0, false, new TFPos(1000, 900), Guid.NewGuid(), "event", true, "{}",
-				"{\"m\":1}");
-
-			EmittedEventEnvelope[] emittedEvents;
-			_stateHandler.ProcessPartitionCreated(
-				"partition", CheckpointTag.FromPosition(0, 10, 5), e, out emittedEvents);
-
-			Assert.IsNotNull(emittedEvents);
-			Assert.AreEqual(1, emittedEvents.Length);
-			Assert.AreEqual("stream1", emittedEvents[0].Event.StreamId);
-			Assert.AreEqual("event1", emittedEvents[0].Event.EventType);
-			Assert.AreEqual("{\"a\":1}", emittedEvents[0].Event.Data);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_v8_projection_emitting_stream_links.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_v8_projection_emitting_stream_links.cs
deleted file mode 100644
index 056596b774f..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_v8_projection_emitting_stream_links.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	[TestFixture]
-	public class when_running_a_v8_projection_emitting_stream_links : TestFixtureWithInterpretedProjection {
-		protected override void Given() {
-			_projection = @"
-                fromAll().when({$any: 
-                    function(state, event) {
-                    linkStreamTo('output-stream' + event.sequenceNumber, 'stream' + event.sequenceNumber);
-                    return {};
-                }});
-            ";
-		}
-
-		[Test, Category(_projectionType)]
-		public void process_event_returns_true() {
-			string state;
-			EmittedEventEnvelope[] emittedEvents;
-			var result = _stateHandler.ProcessEvent(
-				"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
-				"metadata",
-				@"{""a"":""b""}", out state, out emittedEvents);
-
-			Assert.IsTrue(result);
-		}
-
-		[Test, Category(_projectionType)]
-		public void process_event_returns_emitted_event() {
-			string state;
-			EmittedEventEnvelope[] emittedEvents;
-			_stateHandler.ProcessEvent(
-				"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
-				"metadata",
-				@"{""a"":""b""}", out state, out emittedEvents);
-
-			Assert.IsNotNull(emittedEvents);
-			Assert.AreEqual(1, emittedEvents.Length);
-			Assert.AreEqual("$@", emittedEvents[0].Event.EventType);
-			Assert.AreEqual("output-stream0", emittedEvents[0].Event.StreamId);
-			Assert.AreEqual("stream0", emittedEvents[0].Event.Data);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_v8_projection_with_not_passing_filter_by.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_v8_projection_with_not_passing_filter_by.cs
deleted file mode 100644
index 842d86d13be..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_a_v8_projection_with_not_passing_filter_by.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	[TestFixture]
-	public class when_running_a_v8_projection_with_not_passing_filter_by : TestFixtureWithInterpretedProjection {
-		protected override void Given() {
-			_projection = @"
-                fromAll().when({$any: 
-                    function(state, event) {
-                        state.a = event.body.a;
-                        return state;
-                    }
-                })
-                .filterBy(function(state) {
-                    return state.a == '2';
-                });
-            ";
-		}
-
-		[Test, Category(_projectionType)]
-		public void filter_by_that_passes_returns_correct_result() {
-			string state;
-			EmittedEventEnvelope[] emittedEvents;
-			_stateHandler.ProcessEvent(
-				"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
-				"metadata",
-				@"{""a"":""2""}", out state, out emittedEvents);
-			var result = _stateHandler.TransformStateToResult();
-
-			Assert.IsNotNull(result);
-			Assert.AreEqual(@"{""a"":""2""}", result);
-		}
-
-		[Test, Category(_projectionType)]
-		public void filter_by_that_does_not_pass_returns_correct_result() {
-			string state;
-			EmittedEventEnvelope[] emittedEvents;
-			_stateHandler.ProcessEvent(
-				"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
-				"metadata",
-				@"{""a"":""3""}", out state, out emittedEvents);
-			var result = _stateHandler.TransformStateToResult();
-
-			Assert.IsNull(result);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_bi_state_js_projection.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_bi_state_js_projection.cs
deleted file mode 100644
index b65efc7abe8..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_bi_state_js_projection.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using System.Text.Json;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	[TestFixture]
-	public class when_running_bi_state_js_projection : TestFixtureWithInterpretedProjection {
-		protected override void Given() {
-			_projection = @"
-                options({
-                    biState: true,
-                });
-                fromAll().foreachStream().when({
-                    type1: function(state, event) {
-                        state[0].count = state[0].count + 1;
-                        state[1].sharedCount = state[1].sharedCount + 1;
-                        return state;
-                    }});
-            ";
-			_state = @"{""count"": 0}";
-			_sharedState = @"{""sharedCount"": 0}";
-		}
-
-		[Test, Category(_projectionType)]
-		public void process_event_counts_events() {
-			_stateHandler.ProcessEvent(
-				"", CheckpointTag.FromPosition(0, 10, 5), "stream1", "type1", "category", Guid.NewGuid(), 0, "metadata",
-				@"{""a"":""b""}", out var state, out var sharedState, out var emittedEvents);
-
-			Assert.Null(emittedEvents);
-			Assert.NotNull(state);
-			Assert.NotNull(sharedState);
-			var stateJson = JsonDocument.Parse(state);
-			var sharedJson = JsonDocument.Parse(sharedState);
-			Assert.True(stateJson.RootElement.TryGetProperty("count", out var stateCount));
-			Assert.AreEqual(JsonValueKind.Number, stateCount.ValueKind);
-			Assert.AreEqual(1, stateCount.GetInt32());
-
-			Assert.True(sharedJson.RootElement.TryGetProperty("sharedCount", out var sharedCount));
-			Assert.AreEqual(JsonValueKind.Number, sharedCount.ValueKind);
-			Assert.AreEqual(1, sharedCount.GetInt32());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_body_reflecting_v8_projection.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_body_reflecting_v8_projection.cs
deleted file mode 100644
index bdb703baf5c..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_body_reflecting_v8_projection.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	[TestFixture]
-	public class when_running_body_reflecting_v8_projection : TestFixtureWithInterpretedProjection {
-		protected override void Given() {
-			_projection = @"
-                fromAll().when({$any: 
-                    function(state, event) {
-                        if (event.body) 
-                            return event.body; 
-                            else return {};
-                    }
-                });
-            ";
-		}
-
-		[Test, Category(_projectionType)]
-		public void process_event_should_reflect_event() {
-			string state;
-			EmittedEventEnvelope[] emittedEvents;
-			_stateHandler.ProcessEvent(
-				"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
-				"metadata",
-				@"{""a"":""b""}", out state, out emittedEvents);
-			Assert.AreEqual(@"{""a"":""b""}", state);
-		}
-
-		[Test, Category(_projectionType)]
-		public void process_event_should_not_reflect_non_json_events_even_if_valid_json() {
-			string state;
-			EmittedEventEnvelope[] emittedEvents;
-			_stateHandler.ProcessEvent(
-				"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
-				"metadata",
-				@"{""a"":""b""}", out state, out emittedEvents, isJson: false);
-			Assert.AreEqual(@"{}", state);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_counting_js_projection.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_counting_js_projection.cs
deleted file mode 100644
index c50dd456567..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_counting_js_projection.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using System.Globalization;
-using System.Text.Json;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	[TestFixture]
-	public class when_running_counting_js_projection : TestFixtureWithInterpretedProjection {
-		protected override void Given() {
-			_projection = @"
-                fromAll().when({$any: 
-                    function(state, event) {
-                        state.count = state.count + 1;
-                        return state;
-                    }});
-            ";
-			_state = @"{""count"": 0}";
-		}
-
-		[Test, Category(_projectionType)]
-		public void process_event_counts_events() {
-			string state;
-			EmittedEventEnvelope[] emittedEvents;
-			_stateHandler.ProcessEvent(
-				"", CheckpointTag.FromPosition(0, 10, 5), "stream1", "type1", "category", Guid.NewGuid(), 0, "metadata",
-				@"{""a"":""b""}", out state, out emittedEvents);
-			_stateHandler.ProcessEvent(
-				"", CheckpointTag.FromPosition(0, 20, 15), "stream1", "type1", "category", Guid.NewGuid(), 1,
-				"metadata",
-				@"{""a"":""b""}", out state, out emittedEvents);
-
-			
-			Assert.Null(emittedEvents);
-			Assert.NotNull(state);
-			
-			var stateJson = JsonDocument.Parse(state);
-			Assert.True(stateJson.RootElement.TryGetProperty("count", out var stateCount));
-			Assert.AreEqual(JsonValueKind.Number, stateCount.ValueKind);
-			Assert.AreEqual(2, stateCount.GetInt32());
-
-		}
-
-		[Test, Category(_projectionType), Category("Manual"), Explicit]
-		public void can_handle_million_events() {
-			for (var i = 0; i < 1000000; i++) {
-				_logged.Clear();
-				string state;
-				EmittedEventEnvelope[] emittedEvents;
-				_stateHandler.ProcessEvent(
-					"", CheckpointTag.FromPosition(0, i * 10, i * 10 - 5), "stream" + i, "type" + i, "category",
-					Guid.NewGuid(), 0,
-					"metadata", @"{""a"":""" + i + @"""}", out state, out emittedEvents);
-				Assert.AreEqual(1, _logged.Count);
-				Assert.AreEqual((i + 1).ToString(CultureInfo.InvariantCulture), _logged[_logged.Count - 1]);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_emitting_js_projection.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_emitting_js_projection.cs
deleted file mode 100644
index 6364911a73a..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_emitting_js_projection.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint {
-	[TestFixture]
-	public class when_running_emitting_js_projection : TestFixtureWithInterpretedProjection {
-		protected override void Given() {
-			_projection = @"
-                fromAll().when({$any: 
-                    function(state, event) {
-					let targetMetadata = Object.assign({}, event.metadata);
-					targetMetadata.g = 'h';
-					targetMetadata.i = 10;
-                    emit('output-stream' + event.sequenceNumber, 'emitted-event' + event.sequenceNumber, {a: JSON.parse(event.bodyRaw).a}, targetMetadata);
-                    return {};
-                }});
-            ";
-		}
-
-		[Test, Category(_projectionType)]
-		public void process_event_returns_true() {
-			string state;
-			EmittedEventEnvelope[] emittedEvents;
-			var result = _stateHandler.ProcessEvent(
-				"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
-				"{\"d\":\"e\"}",
-				@"{""a"":""b""}", out state, out emittedEvents);
-
-			Assert.IsTrue(result);
-		}
-
-		[Test, Category(_projectionType)]
-		public void process_event_returns_emitted_event() {
-			string state;
-			EmittedEventEnvelope[] emittedEvents;
-			_stateHandler.ProcessEvent(
-				"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
-				"{\"d\":\"e\"}",
-				@"{""a"":""b""}", out state, out emittedEvents);
-
-			Assert.IsNotNull(emittedEvents);
-			Assert.AreEqual(1, emittedEvents.Length);
-			Assert.AreEqual("emitted-event0", emittedEvents[0].Event.EventType);
-			Assert.AreEqual("output-stream0", emittedEvents[0].Event.StreamId);
-			Assert.AreEqual(@"{""a"":""b""}", emittedEvents[0].Event.Data);
-			var metadata = new Dictionary<string, string>(emittedEvents[0].Event.ExtraMetaData());
-			Assert.AreEqual("\"e\"", metadata["d"]);
-			Assert.AreEqual("\"h\"", metadata["g"]);
-			Assert.AreEqual("10", metadata["i"]);
-		}
-		//todo: actual benchmark
-		[Test, Category(_projectionType), Category("Manual"), Explicit]
-		public void can_pass_though_millions_of_events() {
-			var i = 0;
-			var sw = Stopwatch.StartNew();
-			
-			for (i = 0; i < 100000000; i++) {
-				string state;
-				EmittedEventEnvelope[] emittedEvents;
-				_stateHandler.ProcessEvent(
-					"", CheckpointTag.FromPosition(0, i * 10 + 20, i * 10 + 10), "stream" + i, "type" + i, "category",
-					Guid.NewGuid(), i,
-					"{\"d\":\"e\"}", @"{""a"":""" + i + @"""}", out state, out emittedEvents);
-
-				Assert.IsNotNull(emittedEvents);
-				Assert.AreEqual(1, emittedEvents.Length);
-				Assert.AreEqual("emitted-event" + i, emittedEvents[0].Event.EventType);
-				Assert.AreEqual("output-stream" + i, emittedEvents[0].Event.StreamId);
-				Assert.AreEqual(@"{""a"":""" + i + @"""}", emittedEvents[0].Event.Data);
-
-				if(sw.Elapsed > TimeSpan.FromSeconds(120))
-					break;
-			}
-			
-			Console.WriteLine($"processed: {i}");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_with_content_type_validation.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_with_content_type_validation.cs
deleted file mode 100644
index 4afad4d6f24..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/when_running_with_content_type_validation.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	public class when_running_with_content_type_validation {
-		[TestFixture]
-		public class when_running_with_content_type_validation_enabled : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                fromAll().when({$any:
-                    function(state, event) {
-                    linkTo('output-stream' + event.sequenceNumber, event);
-                    return {};
-                }});
-            ";
-			}
-
-			protected override IProjectionStateHandler CreateStateHandler() {
-				return _stateHandlerFactory.Create(
-					_projectionType, _projection,
-					enableContentTypeValidation: true,
-					null,
-					logger: (s, _) => {
-						if (s.StartsWith("P:"))
-							Console.WriteLine(s);
-						else
-							_logged.Add(s);
-					}); // skip prelude debug output
-			}
-
-			[Test, Category(_projectionType)]
-			public void process_null_json_event_does_not_emit() {
-				string state = null;
-				EmittedEventEnvelope[] emittedEvents = null;
-
-				var result = _stateHandler.ProcessEvent(
-					"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
-					"metadata",
-					null, out state, out emittedEvents, isJson: true);
-
-				Assert.IsNull(emittedEvents);
-			}
-
-			[Test, Category(_projectionType)]
-			public void process_null_non_json_event_does_emit() {
-				string state = null;
-				EmittedEventEnvelope[] emittedEvents = null;
-
-				var result = _stateHandler.ProcessEvent(
-					"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
-					"metadata",
-					null, out state, out emittedEvents, isJson: false);
-
-				Assert.IsNotNull(emittedEvents);
-				Assert.AreEqual(1, emittedEvents.Length);
-			}
-		}
-
-		[TestFixture]
-		public class when_running_with_content_type_validation_disabled : TestFixtureWithInterpretedProjection {
-			protected override void Given() {
-				_projection = @"
-                fromAll().when({$any:
-                    function(state, event) {
-                    linkTo('output-stream' + event.sequenceNumber, event);
-                    return {};
-                }});
-            ";
-			}
-
-			protected override IProjectionStateHandler CreateStateHandler() {
-				return _stateHandlerFactory.Create(
-					_projectionType, _projection,
-					enableContentTypeValidation: false,
-					projectionExecutionTimeout: null,
-					logger: (s, _) => {
-						if (s.StartsWith("P:"))
-							Console.WriteLine(s);
-						else
-							_logged.Add(s);
-					}); // skip prelude debug output
-			}
-
-			[Test, Category(_projectionType)]
-			public void process_null_json_event_does_not_emit() {
-				string state = null;
-				EmittedEventEnvelope[] emittedEvents = null;
-
-				var result = _stateHandler.ProcessEvent(
-					"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
-					"metadata",
-					null, out state, out emittedEvents, isJson: true);
-
-				Assert.IsNull(emittedEvents);
-			}
-
-			[Test, Category(_projectionType)]
-			public void process_null_non_json_event_does_not_emit() {
-				string state = null;
-				EmittedEventEnvelope[] emittedEvents = null;
-
-				var result = _stateHandler.ProcessEvent(
-					"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
-					"metadata",
-					null, out state, out emittedEvents, isJson: false);
-
-				Assert.IsNull(emittedEvents);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/when_specifying_meta_data_for_linked_event.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/when_specifying_meta_data_for_linked_event.cs
deleted file mode 100644
index 601dc679053..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/when_specifying_meta_data_for_linked_event.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	public class when_specifying_meta_data_for_linked_event : TestFixtureWithInterpretedProjection {
-		protected override void Given() {
-			_projection = @"
-            fromAll().when({$any: 
-                function(state, event) {
-                linkTo('output-stream', event, {'meta': 'data'});
-                return {};
-            }});
-        ";
-		}
-
-		[Test, Category(_projectionType)]
-		public void meta_data_should_be_set() {
-			string state = null;
-			EmittedEventEnvelope[] emittedEvents = null;
-		
-			var result = _stateHandler.ProcessEvent(
-				"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
-				"metadata",
-				null, out state, out emittedEvents, isJson: false);
-			
-			Assert.IsNotNull(emittedEvents);
-			Assert.AreEqual(1, emittedEvents.Length);
-			Assert.IsNotNull(emittedEvents[0].Event);
-
-			var metaData = emittedEvents[0].Event.ExtraMetaData();
-			CollectionAssert.AreEquivalent(new Dictionary<string, string> {{ "meta", "\"data\"" }}, metaData);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/with_deleted_notification_handled.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/with_deleted_notification_handled.cs
deleted file mode 100644
index 8bf82acc44f..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/with_deleted_notification_handled.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	[TestFixture]
-	public class with_deleted_notification_handled : TestFixtureWithInterpretedProjection {
-		protected override void Given() {
-			_projection = @"fromAll().foreachStream().when({
-                $deleted: function(){}
-            })";
-			_state = @"{}";
-		}
-
-		[Test]
-		public void source_definition_is_correct() {
-			Assert.AreEqual(true, _source.HandlesDeletedNotifications);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/with_foreach_and_deleted_notification_handled.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/with_foreach_and_deleted_notification_handled.cs
deleted file mode 100644
index a0e7f5435bb..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/with_foreach_and_deleted_notification_handled.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	[TestFixture]
-	public class with_foreach_and_deleted_notification_handled : TestFixtureWithInterpretedProjection {
-		protected override void Given() {
-			_projection = @"fromAll().foreachStream().when({
-                $deleted: function(){}
-            })";
-			_state = @"{}";
-		}
-
-		[Test]
-		public void source_definition_is_correct() {
-			Assert.AreEqual(true, _source.HandlesDeletedNotifications);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/with_no_when_statement.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/with_no_when_statement.cs
deleted file mode 100644
index dfbee02c499..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/with_no_when_statement.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Linq;
-using EventStore.Core.Data;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	[TestFixture]
-	public class with_no_when_statement : specification_with_event_handled {
-		protected override void Given() {
-			_projection = @"fromAll();";
-			_state = @"{}";
-			_handledEvent = CreateSampleEvent("stream", 0, "event_type", "{\"data\":1}", new TFPos(100, 50));
-		}
-
-		[Test]
-		public void returns_event_data_as_state() {
-			Assert.AreEqual("{\"data\":1}", _newState);
-			Assert.IsTrue(_emittedEventEnvelopes == null || !_emittedEventEnvelopes.Any());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/with_return_link_metadata.cs b/src/EventStore.Projections.Core.Tests/Services/Jint/with_return_link_metadata.cs
deleted file mode 100644
index e2991a5d8a0..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/Jint/with_return_link_metadata.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Linq;
-using EventStore.Core.Data;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Jint
-{
-	[TestFixture]
-	public class with_return_link_metadata : specification_with_event_handled {
-		protected override void Given() {
-			_projection = @"fromAll().when({$any:function(s,e){
-                return e.linkMetadata;
-            }})";
-			_state = @"{}";
-			_handledEvent = CreateSampleEvent("stream", 0, "event_type", "{\"data\":1}", new TFPos(100, 50));
-		}
-
-		[Test]
-		public void returns_position_metadata_as_state() {
-			Assert.AreEqual("{\"position_meta\":1}", _newState);
-			Assert.IsTrue(_emittedEventEnvelopes == null || !_emittedEventEnvelopes.Any());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/SpecificationWithEmittedStreamsTrackerAndDeleter.cs b/src/EventStore.Projections.Core.Tests/Services/SpecificationWithEmittedStreamsTrackerAndDeleter.cs
deleted file mode 100644
index 714bafc568b..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/SpecificationWithEmittedStreamsTrackerAndDeleter.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests.ClientAPI;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-
-namespace EventStore.Projections.Core.Tests.Services {
-	public abstract class SpecificationWithEmittedStreamsTrackerAndDeleter<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
-		protected IEmittedStreamsTracker _emittedStreamsTracker;
-		protected IEmittedStreamsDeleter _emittedStreamsDeleter;
-		protected ProjectionNamesBuilder _projectionNamesBuilder;
-		protected ClientMessage.ReadStreamEventsForwardCompleted _readCompleted;
-		protected IODispatcher _ioDispatcher;
-		protected bool _trackEmittedStreams = true;
-		protected string _projectionName = "test_projection";
-
-		protected override Task Given() {
-			_ioDispatcher = new IODispatcher(_node.Node.MainQueue, _node.Node.MainQueue, true);
-			_node.Node.MainBus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_ioDispatcher.BackwardReader);
-			_node.Node.MainBus.Subscribe<ClientMessage.NotHandled>(_ioDispatcher.BackwardReader);
-			_node.Node.MainBus.Subscribe(_ioDispatcher.ForwardReader);
-			_node.Node.MainBus.Subscribe(_ioDispatcher.Writer);
-			_node.Node.MainBus.Subscribe(_ioDispatcher.StreamDeleter);
-			_node.Node.MainBus.Subscribe(_ioDispatcher.Awaker);
-			_node.Node.MainBus.Subscribe<IODispatcherDelayedMessage>(_ioDispatcher);
-			_node.Node.MainBus.Subscribe<ClientMessage.NotHandled>(_ioDispatcher);
-			_projectionNamesBuilder = ProjectionNamesBuilder.CreateForTest(_projectionName);
-			_emittedStreamsTracker = new EmittedStreamsTracker(_ioDispatcher,
-				new ProjectionConfig(null, 1000, 1000 * 1000, 100, 500, true, true, false, false,
-					_trackEmittedStreams, 10000, 1, null), _projectionNamesBuilder);
-			_emittedStreamsDeleter = new EmittedStreamsDeleter(_ioDispatcher,
-				_projectionNamesBuilder.GetEmittedStreamsName(),
-				_projectionNamesBuilder.GetEmittedStreamsCheckpointName());
-			return Task.CompletedTask;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/TestFixtureWithProjectionCoreService.cs b/src/EventStore.Projections.Core.Tests/Services/TestFixtureWithProjectionCoreService.cs
deleted file mode 100644
index b70ec318a65..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/TestFixtureWithProjectionCoreService.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using EventStore.Common.Options;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Monitoring.Stats;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Bus.Helpers;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services {
-	public class TestFixtureWithProjectionCoreService {
-		class GuardBusToTriggerFixingIfUsed : IQueuedHandler, ISubscriber, IPublisher {
-			public void Handle(Message message) {
-				throw new NotImplementedException();
-			}
-
-			public void Publish(Message message) {
-				throw new NotImplementedException();
-			}
-
-			public string Name { get; }
-			public Task Start() {
-				throw new NotImplementedException();
-			}
-
-			public void Stop() {
-				throw new NotImplementedException();
-			}
-
-			public void RequestStop() {
-				throw new NotImplementedException();
-			}
-
-			public QueueStats GetStatistics() {
-				throw new NotImplementedException();
-			}
-
-			public void Subscribe<T>(IAsyncHandle<T> handler) where T : Message {
-				throw new NotImplementedException();
-			}
-
-			public void Unsubscribe<T>(IAsyncHandle<T> handler) where T : Message {
-				throw new NotImplementedException();
-			}
-		}
-		public class TestCoreProjection : ICoreProjection {
-			public List<EventReaderSubscriptionMessage.CommittedEventReceived> HandledMessages =
-				new List<EventReaderSubscriptionMessage.CommittedEventReceived>();
-
-			public void Handle(CoreProjectionProcessingMessage.CheckpointCompleted message) {
-				throw new NotImplementedException();
-			}
-
-			public void Handle(CoreProjectionProcessingMessage.CheckpointLoaded message) {
-				throw new NotImplementedException();
-			}
-
-
-			public void Handle(CoreProjectionProcessingMessage.RestartRequested message) {
-				throw new NotImplementedException();
-			}
-
-			public void Handle(CoreProjectionProcessingMessage.Failed message) {
-				throw new NotImplementedException();
-			}
-
-			public void Handle(CoreProjectionProcessingMessage.PrerecordedEventsLoaded message) {
-				throw new NotImplementedException();
-			}
-		}
-
-		protected TestHandler<Message> _consumer;
-		protected SynchronousScheduler _bus;
-		protected ProjectionCoreService _service;
-		protected EventReaderCoreService _readerService;
-
-		private ReaderSubscriptionDispatcher _subscriptionDispatcher;
-
-		protected Guid _workerId;
-
-		[SetUp]
-		public virtual void Setup() {
-			_consumer = new TestHandler<Message>();
-			_bus = new();
-			_bus.Subscribe(_consumer);
-			ICheckpoint writerCheckpoint = new InMemoryCheckpoint(1000);
-			var ioDispatcher = new IODispatcher(_bus, _bus, true);
-			_readerService = new EventReaderCoreService(_bus, ioDispatcher, 10, writerCheckpoint,
-				runHeadingReader: true, faultOutOfOrderProjections: true);
-			_subscriptionDispatcher =
-				new ReaderSubscriptionDispatcher(_bus);
-			_workerId = Guid.NewGuid();
-			var guardBus = new GuardBusToTriggerFixingIfUsed();
-			var configuration = new ProjectionsStandardComponents(1, ProjectionType.All, guardBus, guardBus, guardBus, guardBus, true,
-				 500, 250);
-			_service = new ProjectionCoreService(
-				_workerId, _bus, _bus, _subscriptionDispatcher, new RealTimeProvider(), ioDispatcher, configuration);
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CheckpointSuggested>());
-			_bus.Subscribe(_subscriptionDispatcher
-				.CreateSubscriber<EventReaderSubscriptionMessage.CommittedEventReceived>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.EofReached>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionEofReached>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionDeleted>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ProgressChanged>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.SubscriptionStarted>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.NotAuthorized>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ReaderAssignedReader>());
-
-			var instanceCorrelationId = Guid.NewGuid();
-			_readerService.Handle(new ReaderCoreServiceMessage.StartReader(instanceCorrelationId));
-			_service.Handle(new ProjectionCoreServiceMessage.StartCore(instanceCorrelationId));
-		}
-
-		protected IReaderStrategy CreateReaderStrategy() {
-			var result = new SourceDefinitionBuilder();
-			result.FromAll();
-			result.AllEvents();
-			return ReaderStrategy.Create(
-				"test",
-				0,
-				result.Build(),
-				new RealTimeProvider(),
-				stopOnEof: false,
-				runAs: null);
-		}
-
-		protected static ResolvedEvent CreateEvent() {
-			return new ResolvedEvent(
-				"test", -1, "test", -1, false, new TFPos(10, 5), new TFPos(10, 5), Guid.NewGuid(), "t", false,
-				new byte[0], new byte[0], null, null, default(DateTime));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/TestTask.cs b/src/EventStore.Projections.Core.Tests/Services/TestTask.cs
deleted file mode 100644
index ea722940663..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/TestTask.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-
-namespace EventStore.Projections.Core.Tests.Services {
-	public class TestTask : StagedTask {
-		private readonly int _steps;
-		private readonly int _completeImmediatelyUpToStage;
-		private readonly object[] _stageCorrelations;
-		private Action<int, object> _readyForStage;
-		private int _startedOnStage;
-
-		public TestTask(
-			object initialCorrelationId, int steps, int completeImmediatelyUpToStage = -1,
-			object[] stageCorrelations = null)
-			: base(initialCorrelationId) {
-			_steps = steps;
-			_completeImmediatelyUpToStage = completeImmediatelyUpToStage;
-			_stageCorrelations = stageCorrelations;
-			_startedOnStage = -1;
-		}
-
-		public bool StartedOn(int onStage) {
-			return _startedOnStage >= onStage;
-		}
-
-		public override void Process(int onStage, Action<int, object> readyForStage) {
-			_readyForStage = readyForStage;
-			_startedOnStage = onStage;
-			if (_startedOnStage <= _completeImmediatelyUpToStage)
-				Complete();
-		}
-
-		public void Complete() {
-			var correlationId = _stageCorrelations != null ? _stageCorrelations[_startedOnStage] : InitialCorrelationId;
-			_readyForStage(_startedOnStage == _steps - 1 ? -1 : _startedOnStage + 1, correlationId);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_catalog_stream.cs b/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_catalog_stream.cs
deleted file mode 100644
index a4b053a87b8..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_catalog_stream.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-#pragma warning disable 1718 // allow a == a comparison
-
-namespace EventStore.Projections.Core.Tests.Services.checkpoint_tag {
-	[TestFixture]
-	public class checkpoint_tag_by_stream_position {
-		private readonly CheckpointTag _a = CheckpointTag.FromStreamPosition(1, "stream", 9);
-		private readonly CheckpointTag _b = CheckpointTag.FromStreamPosition(1, "stream", 15);
-		private readonly CheckpointTag _c = CheckpointTag.FromStreamPosition(1, "stream", 29);
-
-		[Test]
-		public void equal_equals() {
-			Assert.IsTrue(_a.Equals(_a));
-		}
-
-		[Test]
-		public void equal_operator() {
-			Assert.IsTrue(_b == _b);
-		}
-
-		[Test]
-		public void less_operator() {
-			Assert.IsTrue(_a < _b);
-		}
-
-		[Test]
-		public void less_or_equal_operator() {
-			Assert.IsTrue(_a <= _b);
-			Assert.IsTrue(_c <= _c);
-		}
-
-		[Test]
-		public void greater_operator() {
-			Assert.IsTrue(_b > _a);
-		}
-
-		[Test]
-		public void greater_or_equal_operator() {
-			Assert.IsTrue(_b >= _a);
-			Assert.IsTrue(_c >= _c);
-		}
-	}
-#pragma warning restore 1718
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_event_type_index_positions.cs b/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_event_type_index_positions.cs
deleted file mode 100644
index c8951d2cefa..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_event_type_index_positions.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-#pragma warning disable 1718 // allow a == a comparison
-
-namespace EventStore.Projections.Core.Tests.Services.checkpoint_tag {
-	[TestFixture]
-	public class checkpoint_tag_by_event_type_index_positions {
-		private readonly CheckpointTag _a1 = CheckpointTag.FromEventTypeIndexPositions(
-			1, new TFPos(100, 50), new Dictionary<string, long> {{"a", 1}});
-
-		private readonly CheckpointTag _a1_prime = CheckpointTag.FromEventTypeIndexPositions(
-			1, new TFPos(100, 50), new Dictionary<string, long> {{"a", 0}});
-
-		private readonly CheckpointTag _b1 = CheckpointTag.FromEventTypeIndexPositions(
-			1, new TFPos(200, 150), new Dictionary<string, long> {{"b", 1}});
-
-		private readonly CheckpointTag _a1b1 = CheckpointTag.FromEventTypeIndexPositions(
-			1, new TFPos(300, 250), new Dictionary<string, long> {{"a", 1}, {"b", 1}});
-
-		private readonly CheckpointTag _a2b1 = CheckpointTag.FromEventTypeIndexPositions(
-			1, new TFPos(400, 350), new Dictionary<string, long> {{"a", 2}, {"b", 1}});
-
-		private readonly CheckpointTag _a2b1_after = CheckpointTag.FromEventTypeIndexPositions(
-			1, new TFPos(430, 420), new Dictionary<string, long> {{"a", 2}, {"b", 1}});
-
-		private readonly CheckpointTag _a1b2 = CheckpointTag.FromEventTypeIndexPositions(
-			1, new TFPos(500, 450), new Dictionary<string, long> {{"a", 1}, {"b", 2}});
-
-		private readonly CheckpointTag _a2b2 = CheckpointTag.FromEventTypeIndexPositions(
-			1, new TFPos(600, 550), new Dictionary<string, long> {{"a", 2}, {"b", 2}});
-
-		[Test]
-		public void equal_equals() {
-			Assert.IsTrue(_a1.Equals(_a1));
-		}
-
-		[Test]
-		public void equal_but_different_index_positions_still_equals() {
-			Assert.IsTrue(_a1.Equals(_a1_prime));
-		}
-
-		[Test]
-		public void equal_operator() {
-			Assert.IsTrue(_a2b1 == _a2b1);
-		}
-
-		[Test]
-		public void less_operator() {
-			Assert.IsTrue(_a1 < _a1b1);
-			Assert.IsTrue(_a1 < _a1b2);
-			Assert.IsTrue(_a1 < _a2b2);
-			Assert.IsTrue(_a2b1 < _a2b1_after);
-			Assert.IsFalse(_a1b2 < _a1b2);
-			Assert.IsFalse(_a1b2 < _a1b1);
-			Assert.IsFalse(_a1b2 < _a2b1);
-			Assert.IsTrue(_a1 < _b1);
-		}
-
-		[Test]
-		public void less_or_equal_operator() {
-			Assert.IsTrue(_a1 <= _a1b1);
-			Assert.IsTrue(_a1 <= _a1b2);
-			Assert.IsTrue(_a1 <= _a2b2);
-			Assert.IsTrue(_a2b1 <= _a2b1_after);
-			Assert.IsTrue(_a1b2 <= _a1b2);
-			Assert.IsFalse(_a1b2 <= _a1b1);
-			Assert.IsFalse(_a1b2 <= _a2b1);
-			Assert.IsTrue(_a1 <= _b1);
-		}
-
-		[Test]
-		public void greater_operator() {
-			Assert.IsFalse(_a1 > _a1b1);
-			Assert.IsFalse(_a1 > _a1b2);
-			Assert.IsFalse(_a1 > _a2b2);
-			Assert.IsFalse(_a2b1 > _a2b1_after);
-			Assert.IsTrue(_a2b1_after > _a2b1);
-			Assert.IsFalse(_a1b2 > _a1b2);
-			Assert.IsTrue(_a1b2 > _a1b1);
-			Assert.IsTrue(_a1b2 > _a2b1);
-			Assert.IsFalse(_a1 > _b1);
-		}
-
-		[Test]
-		public void greater_or_equal_operator() {
-			Assert.IsFalse(_a1 >= _a1b1);
-			Assert.IsFalse(_a1 >= _a1b2);
-			Assert.IsFalse(_a1 >= _a2b2);
-			Assert.IsFalse(_a2b1 >= _a2b1_after);
-			Assert.IsTrue(_a2b1_after >= _a2b1);
-			Assert.IsTrue(_a1b2 >= _a1b2);
-			Assert.IsTrue(_a1b2 >= _a1b1);
-			Assert.IsTrue(_a1b2 >= _a2b1);
-			Assert.IsFalse(_a1 >= _b1);
-		}
-	}
-#pragma warning restore 1718
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_event_type_index_positions_when_updating.cs b/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_event_type_index_positions_when_updating.cs
deleted file mode 100644
index 9bb942d735e..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_event_type_index_positions_when_updating.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.checkpoint_tag {
-	[TestFixture]
-	public class checkpoint_tag_by_event_type_index_positions_when_updating {
-		private readonly CheckpointTag _a1b1 = CheckpointTag.FromEventTypeIndexPositions(
-			1, new TFPos(100, 50), new Dictionary<string, long> {{"a", 1}, {"b", 1}});
-
-		[Test]
-		public void updated_tf_only_position_is_correct() {
-			var updated = _a1b1.UpdateEventTypeIndexPosition(new TFPos(200, 50));
-			Assert.AreEqual(1, updated.Streams["a"]);
-			Assert.AreEqual(new TFPos(200, 50), updated.Position);
-		}
-
-		[Test]
-		public void updated_tf_position_is_correct() {
-			var updated = _a1b1.UpdateEventTypeIndexPosition(new TFPos(200, 50), "a", 2);
-			Assert.AreEqual(2, updated.Streams["a"]);
-			Assert.AreEqual(new TFPos(200, 50), updated.Position);
-		}
-
-		[Test]
-		public void other_stream_position_is_correct() {
-			var updated = _a1b1.UpdateEventTypeIndexPosition(new TFPos(200, 50), "a", 2);
-			Assert.AreEqual(1, updated.Streams["b"]);
-		}
-
-		[Test]
-		public void streams_are_correct() {
-			var updated = _a1b1.UpdateEventTypeIndexPosition(new TFPos(200, 50), "a", 2);
-			Assert.AreEqual(2, updated.Streams.Count);
-			Assert.IsTrue(updated.Streams.Any(v => v.Key == "a"));
-			Assert.IsTrue(updated.Streams.Any(v => v.Key == "b"));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_phase.cs b/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_phase.cs
deleted file mode 100644
index 93aa936fe85..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_phase.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-#pragma warning disable 1718
-
-namespace EventStore.Projections.Core.Tests.Services.checkpoint_tag {
-	[TestFixture]
-	public class checkpoint_tag_by_phase {
-		private readonly CheckpointTag _p0 = CheckpointTag.FromPosition(0, 1000, 9);
-		private readonly CheckpointTag _p1a = CheckpointTag.FromPhase(1, completed: false);
-		private readonly CheckpointTag _p1b = CheckpointTag.FromPhase(1, completed: true);
-		private readonly CheckpointTag _p2 = CheckpointTag.FromPosition(2, 30, 29);
-		private readonly CheckpointTag _p3 = CheckpointTag.FromPosition(3, 30, 29);
-
-		private readonly CheckpointTag _p4 = CheckpointTag.FromEventTypeIndexPositions(
-			4, new TFPos(200, 150), new Dictionary<string, long> {{"a", 1}});
-
-		[Test]
-		public void equal_equals() {
-			Assert.IsTrue(_p0.Equals(_p0));
-			Assert.IsTrue(_p1a.Equals(_p1a));
-			Assert.IsTrue(_p1b.Equals(_p1b));
-			Assert.IsFalse(_p1a.Equals(_p1b));
-			Assert.IsTrue(_p2.Equals(_p2));
-			Assert.IsTrue(_p3.Equals(_p3));
-			Assert.IsFalse(_p2.Equals(_p3));
-		}
-
-		[Test]
-		public void equal_operator() {
-			Assert.IsTrue(_p1a == _p1a);
-			Assert.IsTrue(_p1a != _p1b);
-		}
-
-		[Test]
-		public void less_operator() {
-			Assert.IsTrue(_p0 < _p1a);
-			Assert.IsTrue(_p2 < _p3);
-			Assert.IsTrue(_p3 < _p4);
-			Assert.IsTrue(_p1a < _p1b);
-		}
-
-		[Test]
-		public void less_or_equal_operator() {
-			Assert.IsTrue(_p1b <= _p2);
-			Assert.IsTrue(_p2 <= _p4);
-			Assert.IsTrue(_p3 <= _p3);
-		}
-
-		[Test]
-		public void greater_operator() {
-			Assert.IsTrue(_p4 > _p1a);
-			Assert.IsTrue(_p1b > _p1a);
-		}
-
-		[Test]
-		public void greater_or_equal_operator() {
-			Assert.IsFalse(_p1a >= _p1b);
-			Assert.IsTrue(_p1a >= _p1a);
-			Assert.IsTrue(_p1a >= _p0);
-			Assert.IsTrue(_p4 >= _p3);
-			Assert.IsTrue(_p3 >= _p1a);
-			Assert.IsTrue(_p2 >= _p2);
-		}
-	}
-}
-
-#pragma warning restore 1718
diff --git a/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_prepare_position.cs b/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_prepare_position.cs
deleted file mode 100644
index de7de548402..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_prepare_position.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma warning disable 1718
-
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.checkpoint_tag {
-	[TestFixture]
-	public class checkpoint_tag_by_prepare_position {
-		private readonly CheckpointTag _aa = CheckpointTag.FromPreparePosition(1, 9);
-		private readonly CheckpointTag _b1 = CheckpointTag.FromPreparePosition(1, 15);
-		private readonly CheckpointTag _b2 = CheckpointTag.FromPreparePosition(1, 15);
-		private readonly CheckpointTag _cc = CheckpointTag.FromPreparePosition(1, 29);
-		private readonly CheckpointTag _d1 = CheckpointTag.FromPreparePosition(1, 35);
-		private readonly CheckpointTag _d2 = CheckpointTag.FromPreparePosition(1, 35);
-
-		[Test]
-		public void equal_equals() {
-			Assert.IsTrue(_aa.Equals(_aa));
-		}
-
-		[Test]
-		public void equal_operator() {
-			Assert.IsTrue(_b1 == _b1);
-			Assert.IsTrue(_b1 == _b2);
-		}
-
-		[Test]
-		public void less_operator() {
-			Assert.IsTrue(_aa < _b1);
-		}
-
-		[Test]
-		public void less_or_equal_operator() {
-			Assert.IsTrue(_aa <= _b1);
-			Assert.IsTrue(_b1 <= _b2);
-			Assert.IsTrue(_b2 <= _b2);
-		}
-
-		[Test]
-		public void greater_operator() {
-			Assert.IsTrue(_d1 > _cc);
-			Assert.IsFalse(_d2 > _d1);
-			Assert.IsFalse(_d2 > _d2);
-		}
-
-		[Test]
-		public void greater_or_equal_operator() {
-			Assert.IsTrue(_d1 >= _cc);
-			Assert.IsTrue(_d2 >= _d1);
-			Assert.IsTrue(_b2 >= _b2);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_stream_position.cs b/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_stream_position.cs
deleted file mode 100644
index fcebb3fca3d..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_stream_position.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-#pragma warning disable 1718 // allow a == a comparison
-
-namespace EventStore.Projections.Core.Tests.Services.checkpoint_tag {
-	[TestFixture]
-	public class checkpoint_tag_by_catalog_stream {
-		private readonly CheckpointTag _a = CheckpointTag.FromByStreamPosition(0, "catalog", 1, "data", 10, 12345);
-		private readonly CheckpointTag _b = CheckpointTag.FromByStreamPosition(0, "catalog", 1, "data", 20, 12345);
-		private readonly CheckpointTag _c = CheckpointTag.FromByStreamPosition(0, "catalog", 2, "data2", 20, 12345);
-
-		[Test]
-		public void equal_equals() {
-			Assert.IsTrue(_a.Equals(_a));
-		}
-
-		[Test]
-		public void equal_operator() {
-			Assert.IsTrue(_b == _b);
-		}
-
-		[Test]
-		public void less_operator() {
-			Assert.IsTrue(_a < _b);
-		}
-
-		[Test]
-		public void less_or_equal_operator() {
-			Assert.IsTrue(_a <= _b);
-			Assert.IsTrue(_c <= _c);
-		}
-
-		[Test]
-		public void greater_operator() {
-			Assert.IsTrue(_b > _a);
-		}
-
-		[Test]
-		public void greater_or_equal_operator() {
-			Assert.IsTrue(_b >= _a);
-			Assert.IsTrue(_c >= _c);
-		}
-	}
-#pragma warning restore 1718
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_stream_positions.cs b/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_stream_positions.cs
deleted file mode 100644
index d3b60e62fec..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_stream_positions.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-#pragma warning disable 1718 // allow a == a comparison
-
-namespace EventStore.Projections.Core.Tests.Services.checkpoint_tag {
-	[TestFixture]
-	public class checkpoint_tag_by_stream_positions {
-		private readonly CheckpointTag _a1 = CheckpointTag.FromStreamPositions(
-			1, new Dictionary<string, long> {{"a", 1}});
-
-		private readonly CheckpointTag _b1 = CheckpointTag.FromStreamPositions(
-			1, new Dictionary<string, long> {{"b", 1}});
-
-		private readonly CheckpointTag _a1b1 = CheckpointTag.FromStreamPositions(
-			1, new Dictionary<string, long> {{"a", 1}, {"b", 1}});
-
-		private readonly CheckpointTag _a2b1 = CheckpointTag.FromStreamPositions(
-			1, new Dictionary<string, long> {{"a", 2}, {"b", 1}});
-
-		private readonly CheckpointTag _a1b2 = CheckpointTag.FromStreamPositions(
-			1, new Dictionary<string, long> {{"a", 1}, {"b", 2}});
-
-		private readonly CheckpointTag _a2b2 = CheckpointTag.FromStreamPositions(
-			1, new Dictionary<string, long> {{"a", 2}, {"b", 2}});
-
-		[Test]
-		public void equal_equals() {
-			Assert.IsTrue(_a1.Equals(_a1));
-		}
-
-		[Test]
-		public void equal_operator() {
-			Assert.IsTrue(_a2b1 == _a2b1);
-		}
-
-		[Test]
-		public void less_operator() {
-			Assert.IsTrue(_a1 < _a1b1);
-			Assert.IsTrue(_a1 < _a1b2);
-			Assert.IsTrue(_a1 < _a2b2);
-			Assert.IsFalse(_a1b2 < _a1b2);
-			Assert.IsFalse(_a1b2 < _a1b1);
-			Assert.Throws<InvalidOperationException>(() => TestHelper.Consume(_a1b2 < _a2b1));
-			Assert.Throws<InvalidOperationException>(() => TestHelper.Consume(_a1 < _b1));
-		}
-
-		[Test]
-		public void less_or_equal_operator() {
-			Assert.IsTrue(_a1 <= _a1b1);
-			Assert.IsTrue(_a1 <= _a1b2);
-			Assert.IsTrue(_a1 <= _a2b2);
-			Assert.IsTrue(_a1b2 <= _a1b2);
-			Assert.IsFalse(_a1b2 <= _a1b1);
-			Assert.Throws<InvalidOperationException>(() => TestHelper.Consume(_a1b2 <= _a2b1));
-			Assert.Throws<InvalidOperationException>(() => TestHelper.Consume(_a1 <= _b1));
-		}
-
-		[Test]
-		public void greater_operator() {
-			Assert.IsFalse(_a1 > _a1b1);
-			Assert.IsFalse(_a1 > _a1b2);
-			Assert.IsFalse(_a1 > _a2b2);
-			Assert.IsFalse(_a1b2 > _a1b2);
-			Assert.IsTrue(_a1b2 > _a1b1);
-			Assert.Throws<InvalidOperationException>(() => TestHelper.Consume(_a1b2 > _a2b1));
-			Assert.Throws<InvalidOperationException>(() => TestHelper.Consume(_a1 > _b1));
-		}
-
-		[Test]
-		public void greater_or_equal_operator() {
-			Assert.IsFalse(_a1 >= _a1b1);
-			Assert.IsFalse(_a1 >= _a1b2);
-			Assert.IsFalse(_a1 >= _a2b2);
-			Assert.IsTrue(_a1b2 >= _a1b2);
-			Assert.IsTrue(_a1b2 >= _a1b1);
-			Assert.Throws<InvalidOperationException>(() => TestHelper.Consume(_a1b2 >= _a2b1));
-			Assert.Throws<InvalidOperationException>(() => TestHelper.Consume(_a1 >= _b1));
-		}
-	}
-#pragma warning restore 1718
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_stream_positions_when_updating.cs b/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_stream_positions_when_updating.cs
deleted file mode 100644
index 4d79fbeb7d5..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_stream_positions_when_updating.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.checkpoint_tag {
-	[TestFixture]
-	public class checkpoint_tag_by_stream_positions_when_updating {
-		private readonly CheckpointTag _a1b1 = CheckpointTag.FromStreamPositions(
-			1, new Dictionary<string, long> {{"a", 1}, {"b", 1}});
-
-		[Test]
-		public void updated_position_is_correct() {
-			var updated = _a1b1.UpdateStreamPosition("a", 2);
-			Assert.AreEqual(2, updated.Streams["a"]);
-		}
-
-		[Test]
-		public void other_stream_position_is_correct() {
-			var updated = _a1b1.UpdateStreamPosition("a", 2);
-			Assert.AreEqual(1, updated.Streams["b"]);
-		}
-
-		[Test]
-		public void streams_are_correct() {
-			var updated = _a1b1.UpdateStreamPosition("a", 2);
-			Assert.AreEqual(2, updated.Streams.Count);
-			Assert.IsTrue(updated.Streams.Any(v => v.Key == "a"));
-			Assert.IsTrue(updated.Streams.Any(v => v.Key == "b"));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_tf_position.cs b/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_tf_position.cs
deleted file mode 100644
index 7ee71f7e57b..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_tf_position.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-#pragma warning disable 1718 // allow a == a comparison
-
-namespace EventStore.Projections.Core.Tests.Services.checkpoint_tag {
-	[TestFixture]
-	public class checkpoint_tag_by_tf_position {
-		private readonly CheckpointTag _aa = CheckpointTag.FromPosition(1, 10, 9);
-		private readonly CheckpointTag _b1 = CheckpointTag.FromPosition(1, 20, 15);
-		private readonly CheckpointTag _b2 = CheckpointTag.FromPosition(1, 20, 17);
-		private readonly CheckpointTag _cc = CheckpointTag.FromPosition(1, 30, 29);
-		private readonly CheckpointTag _d1 = CheckpointTag.FromPosition(1, 40, 35);
-		private readonly CheckpointTag _d2 = CheckpointTag.FromPosition(1, 40, 36);
-
-		[Test]
-		public void equal_equals() {
-			Assert.IsTrue(_aa.Equals(_aa));
-		}
-
-		[Test]
-		public void equal_operator() {
-			Assert.IsTrue(_b1 == _b1);
-		}
-
-		[Test]
-		public void less_operator() {
-			Assert.IsTrue(_aa < _b1);
-			Assert.IsTrue(_b1 < _b2);
-		}
-
-		[Test]
-		public void less_or_equal_operator() {
-			Assert.IsTrue(_aa <= _b1);
-			Assert.IsTrue(_b1 <= _b2);
-			Assert.IsTrue(_b2 <= _b2);
-		}
-
-		[Test]
-		public void greater_operator() {
-			Assert.IsTrue(_d1 > _cc);
-			Assert.IsTrue(_d2 > _d1);
-		}
-
-		[Test]
-		public void greater_or_equal_operator() {
-			Assert.IsTrue(_d1 >= _cc);
-			Assert.IsTrue(_d2 >= _d1);
-			Assert.IsTrue(_b2 >= _b2);
-		}
-	}
-#pragma warning restore 1718
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_phase.cs b/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_phase.cs
deleted file mode 100644
index 330d73a91f9..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_phase.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-#pragma warning disable 1718 // allow a == a comparison
-
-namespace EventStore.Projections.Core.Tests.Services.checkpoint_tag {
-	[TestFixture]
-	public class checkpoint_tag_phase {
-		private readonly CheckpointTag _p0 = CheckpointTag.FromPosition(0, 1000, 9);
-		private readonly CheckpointTag _p1a = CheckpointTag.FromPosition(1, 500, 400);
-		private readonly CheckpointTag _p1b = CheckpointTag.FromPosition(1, 500, 450);
-		private readonly CheckpointTag _p2 = CheckpointTag.FromPosition(2, 30, 29);
-		private readonly CheckpointTag _p3 = CheckpointTag.FromStreamPosition(3, "stream", 100);
-
-		private readonly CheckpointTag _p4 = CheckpointTag.FromEventTypeIndexPositions(
-			4, new TFPos(200, 150), new Dictionary<string, long> {{"a", 1}});
-
-		[Test]
-		public void equal_equals() {
-			Assert.IsTrue(_p0.Equals(_p0));
-			Assert.IsTrue(_p1a.Equals(_p1a));
-			Assert.IsTrue(_p1b.Equals(_p1b));
-			Assert.IsTrue(_p2.Equals(_p2));
-			Assert.IsTrue(_p3.Equals(_p3));
-		}
-
-		[Test]
-		public void equal_operator() {
-			Assert.IsTrue(_p1a == _p1a);
-		}
-
-		[Test]
-		public void less_operator() {
-			Assert.IsTrue(_p0 < _p1a);
-			Assert.IsTrue(_p2 < _p3);
-			Assert.IsTrue(_p3 < _p4);
-		}
-
-		[Test]
-		public void less_or_equal_operator() {
-			Assert.IsTrue(_p1b <= _p2);
-			Assert.IsTrue(_p2 <= _p4);
-			Assert.IsTrue(_p3 <= _p3);
-		}
-
-		[Test]
-		public void greater_operator() {
-			Assert.IsTrue(_p4 > _p1a);
-			Assert.IsTrue(_p1b > _p1a);
-		}
-
-		[Test]
-		public void greater_or_equal_operator() {
-			Assert.IsTrue(_p1a >= _p0);
-			Assert.IsTrue(_p4 >= _p3);
-			Assert.IsTrue(_p3 >= _p1a);
-			Assert.IsTrue(_p2 >= _p2);
-		}
-	}
-#pragma warning restore 1718
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_to_from_json.cs b/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_to_from_json.cs
deleted file mode 100644
index 2d1ed17c7c0..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_to_from_json.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.checkpoint_tag {
-	[TestFixture]
-	public class checkpoint_tag_to_from_json {
-		[Test]
-		public void stream_position_should_not_overflow() {
-			var checkpointTag = CheckpointTag.FromStreamPosition(1, "test", 9876543210L);
-			var json = checkpointTag.ToJsonString();
-
-			var jsonReader = new JsonTextReader(new StringReader(json));
-			var checkpointTagFromJson = CheckpointTag.FromJson(jsonReader, new ProjectionVersion(0, 0, 0));
-			Assert.AreEqual(9876543210L, checkpointTagFromJson.Tag.Streams["test"]);
-		}
-
-		[Test]
-		public void data_and_catalog_position_should_not_overflow() {
-			var checkpointTag =
-				CheckpointTag.FromByStreamPosition(1, "catalog", 9876543210L, "data", 9876543211L, 9876543212L);
-			var json = checkpointTag.ToJsonString();
-
-			var jsonReader = new JsonTextReader(new StringReader(json));
-			var checkpointTagFromJson = CheckpointTag.FromJson(jsonReader, new ProjectionVersion(0, 0, 0));
-			Assert.AreEqual(9876543210L, checkpointTagFromJson.Tag.CatalogPosition);
-			Assert.AreEqual(9876543211L, checkpointTagFromJson.Tag.DataPosition);
-		}
-
-		[Test]
-		public void prepare_and_commit_positions_should_not_overflow() {
-			var checkpointTag =
-				CheckpointTag.FromPosition(1, 9876543210L, 9876543211L);
-			var json = checkpointTag.ToJsonString();
-
-			var jsonReader = new JsonTextReader(new StringReader(json));
-			var checkpointTagFromJson = CheckpointTag.FromJson(jsonReader, new ProjectionVersion(0, 0, 0));
-			Assert.AreEqual(9876543210L, checkpointTagFromJson.Tag.CommitPosition);
-			Assert.AreEqual(9876543211L, checkpointTagFromJson.Tag.PreparePosition);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_restarting_with_projection_type_all.cs b/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_restarting_with_projection_type_all.cs
deleted file mode 100644
index dd24aa7bdce..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_restarting_with_projection_type_all.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-using System;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Common.Options;
-using EventStore.Projections.Core.Messages;
-using EventStore.Core.Tests.Fakes;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Projections.Core.Services.Processing;
-
-namespace EventStore.Projections.Core.Tests.Services.core_coordinator {
-	[TestFixture]
-	public class when_restarting_with_projection_type_all {
-		private FakePublisher[] queues;
-		private FakePublisher publisher;
-		private ProjectionCoreCoordinator _coordinator;
-		private Guid instanceCorrelationId = Guid.NewGuid();
-		private Guid queueId;
-
-		[SetUp]
-		public void Setup() {
-			queues = new List<FakePublisher>() {new FakePublisher()}.ToArray();
-			publisher = new FakePublisher();
-
-			_coordinator =
-				new ProjectionCoreCoordinator(ProjectionType.All, queues, publisher);
-
-			// Start components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(instanceCorrelationId));
-
-			// All components started
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStarted(EventReaderCoreService.SubComponentName,
-					instanceCorrelationId));
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStarted(ProjectionCoreService.SubComponentName,
-					instanceCorrelationId));
-
-			// Stop components, but don't handle any sub component stopped messages
-			_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(instanceCorrelationId));
-
-			var stopCore = queues[0].Messages.OfType<ProjectionCoreServiceMessage.StopCore>().First();
-			queueId = stopCore.QueueId;
-			//clear queues for clearer testing
-			queues[0].Messages.Clear();
-		}
-
-		[Test]
-		public void should_not_start_if_subcomponents_not_stopped() {
-			// None of the subcomponents have been stopped
-
-			// Start Components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StartReader).Count);
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StartCore).Count);
-		}
-
-		[Test]
-		public void should_not_start_if_not_all_subcomponents_stopped() {
-			// Not all subcomponents stopped
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
-					queueId));
-
-			// Start Components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StartReader).Count);
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StartCore).Count);
-		}
-
-		[Test]
-		public void should_start_if_subcomponents_stopped_before_starting_components_again() {
-			// All components have been stopped
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
-					queueId));
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStopped(ProjectionCoreService.SubComponentName,
-					queueId));
-
-			// Start components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-
-			Assert.AreEqual(1, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StartReader).Count);
-			Assert.AreEqual(1, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StartCore).Count);
-		}
-
-		[Test]
-		public void should_not_stop_if_all_subcomponents_not_started() {
-			var restartCorrelationId = Guid.NewGuid();
-
-			// All subcomponents stopped
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
-					queueId));
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStopped(ProjectionCoreService.SubComponentName,
-					queueId));
-
-			// Start components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(restartCorrelationId));
-
-			// Some components started, but not all
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStarted(EventReaderCoreService.SubComponentName,
-					restartCorrelationId));
-
-			queues[0].Messages.Clear();
-			// Attempt to stop the components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(restartCorrelationId));
-
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StopReader).Count);
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StopCore).Count);
-		}
-
-		[Test]
-		public void should_not_stop_if_not_started() {
-			// All components stopped
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
-					queueId));
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStopped(ProjectionCoreService.SubComponentName,
-					queueId));
-
-			queues[0].Messages.Clear();
-			// Stop components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(instanceCorrelationId));
-
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StopReader).Count);
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StopCore).Count);
-		}
-
-		[Test]
-		public void should_not_stop_if_correlation_id_is_different() {
-			var restartCorrelationId = Guid.NewGuid();
-
-			// All components stopped
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
-					queueId));
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStopped(ProjectionCoreService.SubComponentName,
-					queueId));
-
-			// Start Components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(restartCorrelationId));
-
-			// All components started
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStarted(EventReaderCoreService.SubComponentName,
-					restartCorrelationId));
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStarted(ProjectionCoreService.SubComponentName,
-					restartCorrelationId));
-
-			queues[0].Messages.Clear();
-			// Stop components with a different correlation id
-			var incorrectCorrelationId = Guid.NewGuid();
-			_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(incorrectCorrelationId));
-
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StopReader).Count);
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StopCore).Count);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_restarting_with_projection_type_none.cs b/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_restarting_with_projection_type_none.cs
deleted file mode 100644
index 66aec783d5d..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_restarting_with_projection_type_none.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using System;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Common.Options;
-using EventStore.Projections.Core.Messages;
-using EventStore.Core.Tests.Fakes;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Projections.Core.Services.Processing;
-
-namespace EventStore.Projections.Core.Tests.Services.core_coordinator {
-	[TestFixture]
-	public class when_restarting_with_projection_type_none {
-		private FakePublisher[] queues;
-		private FakePublisher publisher;
-		private ProjectionCoreCoordinator _coordinator;
-		private Guid instanceCorrelationId = Guid.NewGuid();
-		private Guid queueId;
-
-		[SetUp]
-		public void Setup() {
-			queues = new List<FakePublisher>() {new FakePublisher()}.ToArray();
-			publisher = new FakePublisher();
-
-			_coordinator =
-				new ProjectionCoreCoordinator(ProjectionType.None, queues, publisher);
-
-			// Start components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(instanceCorrelationId));
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStarted(EventReaderCoreService.SubComponentName,
-					instanceCorrelationId));
-
-			// Stop components but don't handle component stopped
-			_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(instanceCorrelationId));
-
-			var stopReader = queues[0].Messages.OfType<ReaderCoreServiceMessage.StopReader>().First();
-			queueId = stopReader.QueueId;
-			//clear queues for clearer testing
-			queues[0].Messages.Clear();
-		}
-
-		[Test]
-		public void should_not_start_reader_if_subcomponents_not_stopped() {
-			// None of the subcomponents stopped
-
-			// Start components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StartReader).Count);
-		}
-
-
-		[Test]
-		public void should_start_reader_if_subcomponents_stopped_before_starting_components_again() {
-			// Component stopped
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
-					queueId));
-
-			// Start component
-			_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-
-			Assert.AreEqual(1, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StartReader).Count);
-		}
-
-		[Test]
-		public void should_not_stop_reader_if_subcomponents_not_started_yet() {
-			var newInstanceCorrelationId = Guid.NewGuid();
-
-			// Stop components
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
-					queueId));
-
-			// Start components but don't handle component started
-			_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(newInstanceCorrelationId));
-
-			// Stop components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(newInstanceCorrelationId));
-
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StopReader).Count);
-		}
-
-		[Test]
-		public void should_not_stop_reader_if_subcomponents_not_started() {
-			// Stop components
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
-					queueId));
-
-			// Stop components without starting
-			_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(Guid.NewGuid()));
-
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StopReader).Count);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_restarting_with_projection_type_system.cs b/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_restarting_with_projection_type_system.cs
deleted file mode 100644
index 2d51ffed6b6..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_restarting_with_projection_type_system.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-using System;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Common.Options;
-using EventStore.Projections.Core.Messages;
-using EventStore.Core.Tests.Fakes;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Projections.Core.Services.Processing;
-
-namespace EventStore.Projections.Core.Tests.Services.core_coordinator {
-	[TestFixture]
-	public class when_restarting_with_projection_type_system {
-		private FakePublisher[] queues;
-		private FakePublisher publisher;
-		private ProjectionCoreCoordinator _coordinator;
-		private Guid instanceCorrelationId = Guid.NewGuid();
-		private Guid queueId;
-
-		[SetUp]
-		public void Setup() {
-			queues = new List<FakePublisher>() {new FakePublisher()}.ToArray();
-			publisher = new FakePublisher();
-
-			_coordinator =
-				new ProjectionCoreCoordinator(ProjectionType.System, queues, publisher);
-
-			// Start components and handle started
-			_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(instanceCorrelationId));
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStarted(EventReaderCoreService.SubComponentName,
-					instanceCorrelationId));
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStarted(ProjectionCoreService.SubComponentName,
-					instanceCorrelationId));
-
-			// Stop components but don't handle stopped
-			_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(instanceCorrelationId));
-
-			var stopCore = queues[0].Messages.OfType<ProjectionCoreServiceMessage.StopCore>().First();
-			queueId = stopCore.QueueId;
-			//clear queues for clearer testing
-			queues[0].Messages.Clear();
-		}
-
-		[Test]
-		public void should_not_start_if_subcomponents_not_stopped() {
-			// None of the subcomponents stopped
-
-			// Start Components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StartReader).Count);
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StartCore).Count);
-		}
-
-		[Test]
-		public void should_not_start_if_not_all_subcomponents_stopped() {
-			// Not all components stopped
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
-					queueId));
-
-			// Start Components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StartReader).Count);
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StartCore).Count);
-		}
-
-		[Test]
-		public void should_start_if_subcomponents_stopped_before_starting_components_again() {
-			// All components stopped
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
-					queueId));
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStopped(ProjectionCoreService.SubComponentName,
-					queueId));
-
-			// Start components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-
-			Assert.AreEqual(1, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StartReader).Count);
-			Assert.AreEqual(1, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StartCore).Count);
-		}
-
-		[Test]
-		public void should_not_stop_if_all_subcomponents_not_started() {
-			var newInstanceCorrelationId = Guid.NewGuid();
-
-			// All components stopped
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
-					queueId));
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStopped(ProjectionCoreService.SubComponentName,
-					queueId));
-
-			queues[0].Messages.Clear();
-
-			// Start components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(newInstanceCorrelationId));
-
-			// Not all subcomponents started
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStarted(EventReaderCoreService.SubComponentName,
-					newInstanceCorrelationId));
-
-			// Stop components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(newInstanceCorrelationId));
-
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StopReader).Count);
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StopCore).Count);
-		}
-
-		[Test]
-		public void should_not_stop_if_not_started() {
-			// All components stopped
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
-					queueId));
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStopped(ProjectionCoreService.SubComponentName,
-					queueId));
-
-			queues[0].Messages.Clear();
-
-			// Stop components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(Guid.NewGuid()));
-
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StopReader).Count);
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StopCore).Count);
-		}
-
-		[Test]
-		public void should_not_stop_if_correlation_id_is_different() {
-			var newInstanceCorrelationId = Guid.NewGuid();
-
-			// All components stopped
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
-					queueId));
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStopped(ProjectionCoreService.SubComponentName,
-					queueId));
-
-			// Start components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(newInstanceCorrelationId));
-
-			// All components started
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStarted(EventReaderCoreService.SubComponentName,
-					newInstanceCorrelationId));
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStarted(ProjectionCoreService.SubComponentName,
-					newInstanceCorrelationId));
-
-			queues[0].Messages.Clear();
-			// Stop components with a different correlation id
-			var incorrectCorrelationId = Guid.NewGuid();
-			_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(incorrectCorrelationId));
-
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StopReader).Count);
-			Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StopCore).Count);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_starting_with_projection_type_all.cs b/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_starting_with_projection_type_all.cs
deleted file mode 100644
index 3331319ea03..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_starting_with_projection_type_all.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Common.Options;
-using EventStore.Projections.Core.Messages;
-using EventStore.Core.Tests.Fakes;
-using System.Collections.Generic;
-
-namespace EventStore.Projections.Core.Tests.Services.core_coordinator {
-	[TestFixture]
-	public class when_starting_with_projection_type_all {
-		private FakePublisher[] queues;
-		private FakePublisher publisher;
-		private ProjectionCoreCoordinator _coordinator;
-
-		[SetUp]
-		public void Setup() {
-			queues = new List<FakePublisher>() {new FakePublisher()}.ToArray();
-			publisher = new FakePublisher();
-
-			_coordinator =
-				new ProjectionCoreCoordinator(ProjectionType.All, queues, publisher);
-			_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-		}
-
-		[Test]
-		public void should_publish_start_reader_messages() {
-			Assert.AreEqual(1, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StartReader).Count);
-		}
-
-		[Test]
-		public void should_publish_start_core_messages() {
-			Assert.AreEqual(1,
-				queues[0].Messages.FindAll(x => x.GetType() == typeof(ProjectionCoreServiceMessage.StartCore)).Count);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_starting_with_projection_type_none.cs b/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_starting_with_projection_type_none.cs
deleted file mode 100644
index 8d8972a4262..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_starting_with_projection_type_none.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Common.Options;
-using EventStore.Projections.Core.Messages;
-using EventStore.Core.Tests.Fakes;
-using System.Collections.Generic;
-
-namespace EventStore.Projections.Core.Tests.Services.core_coordinator {
-	[TestFixture]
-	public class when_starting_with_projection_type_none {
-		private FakePublisher[] queues;
-		private FakePublisher publisher;
-		private ProjectionCoreCoordinator _coordinator;
-
-		[SetUp]
-		public void Setup() {
-			queues = new List<FakePublisher>() {new FakePublisher()}.ToArray();
-			publisher = new FakePublisher();
-
-			_coordinator =
-				new ProjectionCoreCoordinator(ProjectionType.None, queues, publisher);
-			_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-		}
-
-		[Test]
-		public void should_publish_start_reader_messages() {
-			Assert.AreEqual(1, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StartReader).Count);
-		}
-
-		[Test]
-		public void should_not_publish_start_core_messages() {
-			Assert.AreEqual(0,
-				queues[0].Messages.FindAll(x => x.GetType() == typeof(ProjectionCoreServiceMessage.StartCore)).Count);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_starting_with_projection_type_system.cs b/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_starting_with_projection_type_system.cs
deleted file mode 100644
index 0198d4e0c6a..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_starting_with_projection_type_system.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Common.Options;
-using EventStore.Projections.Core.Messages;
-using EventStore.Core.Tests.Fakes;
-using System.Collections.Generic;
-
-namespace EventStore.Projections.Core.Tests.Services.core_coordinator {
-	[TestFixture]
-	public class when_starting_with_projection_type_system {
-		private FakePublisher[] queues;
-		private FakePublisher publisher;
-		private ProjectionCoreCoordinator _coordinator;
-
-		[SetUp]
-		public void Setup() {
-			queues = new List<FakePublisher>() {new FakePublisher()}.ToArray();
-			publisher = new FakePublisher();
-
-			_coordinator =
-				new ProjectionCoreCoordinator(ProjectionType.System, queues, publisher);
-			_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-		}
-
-		[Test]
-		public void should_publish_start_reader_messages() {
-			Assert.AreEqual(1, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StartReader).Count);
-		}
-
-		[Test]
-		public void should_publish_start_core_messages() {
-			Assert.AreEqual(1,
-				queues[0].Messages.FindAll(x => x.GetType() == typeof(ProjectionCoreServiceMessage.StartCore)).Count);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_stopping_with_projection_type_all.cs b/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_stopping_with_projection_type_all.cs
deleted file mode 100644
index 90fcb5d30c3..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_stopping_with_projection_type_all.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System;
-using System.Linq;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Common.Options;
-using EventStore.Projections.Core.Messages;
-using EventStore.Core.Tests.Fakes;
-using System.Collections.Generic;
-using EventStore.Projections.Core.Services.Processing;
-
-namespace EventStore.Projections.Core.Tests.Services.core_coordinator {
-	[TestFixture]
-	public class when_stopping_with_projection_type_all {
-		private FakePublisher[] queues;
-		private FakePublisher publisher;
-		private ProjectionCoreCoordinator _coordinator;
-
-		private List<ProjectionCoreServiceMessage.StopCore> stopCoreMessages =
-			new List<ProjectionCoreServiceMessage.StopCore>();
-
-		[SetUp]
-		public void Setup() {
-			queues = new List<FakePublisher>() {new FakePublisher()}.ToArray();
-			publisher = new FakePublisher();
-
-			var instanceCorrelationId = Guid.NewGuid();
-			_coordinator =
-				new ProjectionCoreCoordinator(ProjectionType.All, queues, publisher);
-
-			// Start all sub components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(instanceCorrelationId));
-
-			// All components started
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStarted(EventReaderCoreService.SubComponentName,
-					instanceCorrelationId));
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStarted(ProjectionCoreService.SubComponentName,
-					instanceCorrelationId));
-
-			// Stop Components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(instanceCorrelationId));
-
-			// Publish SubComponent stopped messages for the projection core service
-			stopCoreMessages = queues[0].Messages
-				.FindAll(x => x.GetType() == typeof(ProjectionCoreServiceMessage.StopCore))
-				.Select(x => x as ProjectionCoreServiceMessage.StopCore)
-				.ToList();
-			foreach (var msg in stopCoreMessages)
-				_coordinator.Handle(
-					new ProjectionCoreServiceMessage.SubComponentStopped(ProjectionCoreService.SubComponentName,
-						msg.QueueId));
-		}
-
-		[Test]
-		public void should_publish_stop_core_messages() {
-			Assert.AreEqual(1, stopCoreMessages.Count);
-		}
-
-		[Test]
-		public void should_publish_stop_reader_messages_after_core_stopped() {
-			Assert.AreEqual(1, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StopReader).Count);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_stopping_with_projection_type_none.cs b/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_stopping_with_projection_type_none.cs
deleted file mode 100644
index 506f278619a..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_stopping_with_projection_type_none.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Common.Options;
-using EventStore.Projections.Core.Messages;
-using EventStore.Core.Tests.Fakes;
-using System.Collections.Generic;
-using EventStore.Projections.Core.Services.Processing;
-
-namespace EventStore.Projections.Core.Tests.Services.core_coordinator {
-	[TestFixture]
-	public class when_stopping_with_projection_type_none {
-		private FakePublisher[] queues;
-		private FakePublisher publisher;
-		private ProjectionCoreCoordinator _coordinator;
-
-		[SetUp]
-		public void Setup() {
-			queues = new List<FakePublisher>() {new FakePublisher()}.ToArray();
-			publisher = new FakePublisher();
-
-			var instanceCorrelationId = Guid.NewGuid();
-			_coordinator =
-				new ProjectionCoreCoordinator(ProjectionType.None, queues, publisher);
-
-			// Start components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(instanceCorrelationId));
-
-			// start sub components
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStarted(EventReaderCoreService.SubComponentName,
-					instanceCorrelationId));
-
-			//force stop
-			_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(instanceCorrelationId));
-		}
-
-		[Test]
-		public void should_publish_stop_reader_messages() {
-			Assert.AreEqual(1, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StopReader).Count);
-		}
-
-		[Test]
-		public void should_not_publish_stop_core_messages() {
-			Assert.AreEqual(0,
-				queues[0].Messages.FindAll(x => x.GetType() == typeof(ProjectionCoreServiceMessage.StopCore)).Count);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_stopping_with_projection_type_system.cs b/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_stopping_with_projection_type_system.cs
deleted file mode 100644
index 0fa9f0d27e9..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_coordinator/when_stopping_with_projection_type_system.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Linq;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Common.Options;
-using EventStore.Projections.Core.Messages;
-using EventStore.Core.Tests.Fakes;
-using System.Collections.Generic;
-using EventStore.Projections.Core.Services.Processing;
-
-namespace EventStore.Projections.Core.Tests.Services.core_coordinator {
-	[TestFixture]
-	public class when_stopping_with_projection_type_system {
-		private FakePublisher[] queues;
-		private FakePublisher publisher;
-		private ProjectionCoreCoordinator _coordinator;
-
-		private List<ProjectionCoreServiceMessage.StopCore> stopCoreMessages =
-			new List<ProjectionCoreServiceMessage.StopCore>();
-
-		[SetUp]
-		public void Setup() {
-			queues = new List<FakePublisher>() {new FakePublisher()}.ToArray();
-			publisher = new FakePublisher();
-
-			var instanceCorrelationId = Guid.NewGuid();
-			_coordinator =
-				new ProjectionCoreCoordinator(ProjectionType.System, queues, publisher);
-
-			// Start components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(instanceCorrelationId));
-
-			// Start all sub components
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStarted(EventReaderCoreService.SubComponentName,
-					instanceCorrelationId));
-			_coordinator.Handle(
-				new ProjectionCoreServiceMessage.SubComponentStarted(ProjectionCoreService.SubComponentName,
-					instanceCorrelationId));
-
-			// Stop components
-			_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(instanceCorrelationId));
-
-			// Publish SubComponent stopped messages for the projection core service
-			stopCoreMessages = queues[0].Messages.OfType<ProjectionCoreServiceMessage.StopCore>().ToList();
-			foreach (var msg in stopCoreMessages)
-				_coordinator.Handle(
-					new ProjectionCoreServiceMessage.SubComponentStopped(ProjectionCoreService.SubComponentName,
-						msg.QueueId));
-		}
-
-		[Test]
-		public void should_publish_stop_core_messages() {
-			Assert.AreEqual(1, stopCoreMessages.Count);
-		}
-
-		[Test]
-		public void should_publish_stop_reader_messages() {
-			Assert.AreEqual(1, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StopReader).Count);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/FakeProjectionHandler.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/FakeProjectionHandler.cs
deleted file mode 100644
index fd4a423f9cc..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/FakeProjectionHandler.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	public class FakeProjectionStateHandler : IProjectionStateHandler {
-		public int _initializeCalled = 0;
-		public int _initializeSharedCalled = 0;
-		public int _loadCalled = 0;
-		public int _eventsProcessed = 0;
-		public int _partitionCreatedProcessed = 0;
-		public string _loadedState = null;
-		public string _lastProcessedStreamId;
-		public string _lastProcessedEventType;
-		public Guid _lastProcessedEventId;
-		public long _lastProcessedSequencenumber;
-		public string _lastProcessedMetadata;
-		public string _lastProcessedData;
-		public string _lastPartition;
-		public const string _emit1Data = @"{""emit"":1}";
-		public const string _emit2Data = @"{""emit"":2}";
-		public const string _emit3Data = @"{""emit"":3}";
-		public const string _emit1StreamId = "/emit1";
-		public const string _emit2StreamId = "/emit2";
-		public const string _emit1EventType = "emit1_event_type";
-		public const string _emit2EventType = "emit2_event_type";
-
-		private readonly bool _failOnInitialize;
-		private readonly bool _failOnLoad;
-		private readonly bool _failOnProcessEvent;
-		private readonly bool _failOnGetPartition;
-		private readonly Action<SourceDefinitionBuilder> _configureBuilder;
-		private readonly IQuerySources _definition;
-
-		public FakeProjectionStateHandler(string source, Action<string, object[]> logger) {
-			_definition = source.ParseJson<QuerySourcesDefinition>();
-		}
-
-		public FakeProjectionStateHandler(
-			bool failOnInitialize = false, bool failOnLoad = false, bool failOnProcessEvent = false,
-			bool failOnGetPartition = true,
-			Action<SourceDefinitionBuilder> configureBuilder = null) {
-			_failOnInitialize = failOnInitialize;
-			_failOnLoad = failOnLoad;
-			_failOnProcessEvent = failOnProcessEvent;
-			_failOnGetPartition = failOnGetPartition;
-			_configureBuilder = configureBuilder;
-		}
-
-		public void ConfigureSourceProcessingStrategy(SourceDefinitionBuilder builder) {
-			if (_configureBuilder != null)
-				_configureBuilder(builder);
-			else {
-				builder.FromAll();
-				builder.AllEvents();
-				builder.SetDefinesStateTransform();
-				builder.SetOutputState();
-			}
-		}
-
-		public void Load(string state) {
-			if (_failOnLoad)
-				throw new Exception("LOAD_FAILED");
-			_loadCalled++;
-			_loadedState = state;
-		}
-
-		public void LoadShared(string state) {
-			throw new NotImplementedException();
-		}
-
-		public void Initialize() {
-			if (_failOnInitialize)
-				throw new Exception("INITIALIZE_FAILED");
-			_initializeCalled++;
-			_loadedState = "";
-		}
-
-		public void InitializeShared() {
-			if (_failOnInitialize)
-				throw new Exception("INITIALIZE_SHARED_FAILED");
-			_initializeSharedCalled++;
-			_loadedState = "";
-		}
-
-
-		public string GetStatePartition(CheckpointTag eventPosition, string category, ResolvedEvent data) {
-			if (_failOnGetPartition)
-				throw new Exception("GetStatePartition FAILED");
-			return "region-a";
-		}
-
-		public bool ProcessEvent(
-			string partition, CheckpointTag eventPosition, string category1, ResolvedEvent data,
-			out string newState, out string newSharedState, out EmittedEventEnvelope[] emittedEvents) {
-			newSharedState = null;
-			if (_failOnProcessEvent)
-				throw new Exception("PROCESS_EVENT_FAILED");
-			_lastProcessedStreamId = data.EventStreamId;
-			_lastProcessedEventType = data.EventType;
-			_lastProcessedEventId = data.EventId;
-			_lastProcessedSequencenumber = data.EventSequenceNumber;
-			_lastProcessedMetadata = data.Metadata;
-			_lastProcessedData = data.Data;
-			_lastPartition = partition;
-
-			_eventsProcessed++;
-			switch (data.EventType) {
-				case "skip_this_type":
-					newState = null;
-					emittedEvents = null;
-					return false;
-				case "handle_this_type":
-					_loadedState = newState = data.Data;
-					emittedEvents = null;
-					return true;
-				case "append":
-					_loadedState = newState = _loadedState + data.Data;
-					emittedEvents = null;
-					return true;
-				case "no_state_emit1_type":
-					_loadedState = newState = "";
-					emittedEvents = new[] {
-						new EmittedEventEnvelope(
-							new EmittedDataEvent(
-								_emit1StreamId, Guid.NewGuid(), _emit1EventType, true, _emit1Data, null, eventPosition,
-								null)),
-					};
-					return true;
-				case "emit1_type":
-					_loadedState = newState = data.Data;
-					emittedEvents = new[] {
-						new EmittedEventEnvelope(
-							new EmittedDataEvent(
-								_emit1StreamId, Guid.NewGuid(), _emit1EventType, true, _emit1Data, null, eventPosition,
-								null)),
-					};
-					return true;
-				case "emit22_type":
-					_loadedState = newState = data.Data;
-					emittedEvents = new[] {
-						new EmittedEventEnvelope(
-							new EmittedDataEvent(
-								_emit2StreamId, Guid.NewGuid(), _emit2EventType, true, _emit1Data, null, eventPosition,
-								null)),
-						new EmittedEventEnvelope(
-							new EmittedDataEvent(
-								_emit2StreamId, Guid.NewGuid(), _emit2EventType, true, _emit2Data, null, eventPosition,
-								null)),
-					};
-					return true;
-				case "emit212_type":
-					_loadedState = newState = data.Data;
-					emittedEvents = new[] {
-						new EmittedEventEnvelope(
-							new EmittedDataEvent(
-								_emit2StreamId, Guid.NewGuid(), _emit2EventType, true, _emit1Data, null, eventPosition,
-								null)),
-						new EmittedEventEnvelope(
-							new EmittedDataEvent(
-								_emit1StreamId, Guid.NewGuid(), _emit1EventType, true, _emit2Data, null, eventPosition,
-								null)),
-						new EmittedEventEnvelope(
-							new EmittedDataEvent(
-								_emit2StreamId, Guid.NewGuid(), _emit2EventType, true, _emit3Data, null, eventPosition,
-								null)),
-					};
-					return true;
-				case "emit12_type":
-					_loadedState = newState = data.Data;
-					emittedEvents = new[] {
-						new EmittedEventEnvelope(
-							new EmittedDataEvent(
-								_emit1StreamId, Guid.NewGuid(), _emit1EventType, true, _emit1Data, null, eventPosition,
-								null)),
-						new EmittedEventEnvelope(
-							new EmittedDataEvent(
-								_emit2StreamId, Guid.NewGuid(), _emit2EventType, true, _emit2Data, null, eventPosition,
-								null)),
-					};
-					return true;
-				case "just_emit":
-					newState = _loadedState;
-					emittedEvents = new[] {
-						new EmittedEventEnvelope(
-							new EmittedDataEvent(
-								_emit1StreamId, Guid.NewGuid(), _emit1EventType, true, _emit1Data, null, eventPosition,
-								null)),
-					};
-					return true;
-				default:
-					throw new NotSupportedException();
-			}
-		}
-
-		public bool ProcessPartitionCreated(string partition, CheckpointTag createPosition, ResolvedEvent data,
-			out EmittedEventEnvelope[] emittedEvents) {
-			_partitionCreatedProcessed++;
-			emittedEvents = null;
-			return true;
-		}
-
-		public bool ProcessPartitionDeleted(string partition, CheckpointTag deletePosition, out string newState) {
-			throw new NotImplementedException();
-		}
-
-		public string TransformStateToResult() {
-			return _loadedState;
-		}
-
-		public void Dispose() {
-		}
-
-		public IQuerySources GetSourceDefinition() {
-			return _definition ?? SourceDefinitionBuilder.From(ConfigureSourceProcessingStrategy);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/TestCheckpointManagerMessageHandler.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/TestCheckpointManagerMessageHandler.cs
deleted file mode 100644
index 09922253de9..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/TestCheckpointManagerMessageHandler.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	public class TestCheckpointManagerMessageHandler : IProjectionCheckpointManager, IEmittedStreamContainer {
-		public readonly List<CoreProjectionProcessingMessage.ReadyForCheckpoint> HandledMessages =
-			new List<CoreProjectionProcessingMessage.ReadyForCheckpoint>();
-
-		public readonly List<CoreProjectionProcessingMessage.RestartRequested> HandledRestartRequestedMessages =
-			new List<CoreProjectionProcessingMessage.RestartRequested>();
-
-		public readonly List<CoreProjectionProcessingMessage.Failed> HandledFailedMessages =
-			new List<CoreProjectionProcessingMessage.Failed>();
-
-		public readonly List<CoreProjectionProcessingMessage.EmittedStreamWriteCompleted> HandledWriteCompletedMessage =
-			new List<CoreProjectionProcessingMessage.EmittedStreamWriteCompleted>();
-
-		public readonly List<CoreProjectionProcessingMessage.EmittedStreamAwaiting> HandledStreamAwaitingMessage =
-			new List<CoreProjectionProcessingMessage.EmittedStreamAwaiting>();
-
-		public void Handle(CoreProjectionProcessingMessage.ReadyForCheckpoint message) {
-			HandledMessages.Add(message);
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.RestartRequested message) {
-			HandledRestartRequestedMessages.Add(message);
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.Failed message) {
-			HandledFailedMessages.Add(message);
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.EmittedStreamAwaiting message) {
-			HandledStreamAwaitingMessage.Add(message);
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.EmittedStreamWriteCompleted message) {
-			HandledWriteCompletedMessage.Add(message);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/TestFixtureUtils.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/TestFixtureUtils.cs
deleted file mode 100644
index b77b26f3e6f..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/TestFixtureUtils.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	public static class TestFixtureUtils {
-		public static IEnumerable<ClientMessage.WriteEvents> ToStream(
-			this IEnumerable<ClientMessage.WriteEvents> self, string streamId) {
-			return self.Where(v => v.EventStreamId == streamId);
-		}
-
-		public static List<ClientMessage.WriteEvents> ToStream(
-			this List<ClientMessage.WriteEvents> self, string streamId) {
-			return self.Where(v => v.EventStreamId == streamId).ToList();
-		}
-
-		public static IEnumerable<Event> OfEventType(
-			this IEnumerable<ClientMessage.WriteEvents> self, string type) {
-			return self.SelectMany(v => v.Events).Where(v => v.EventType == type);
-		}
-
-		public static IEnumerable<Event> ExceptOfEventType(
-			this IEnumerable<ClientMessage.WriteEvents> self, string type) {
-			return self.SelectMany(v => v.Events).Where(v => v.EventType != type);
-		}
-
-		public static List<Event> OfEventType(
-			this List<ClientMessage.WriteEvents> self, string type) {
-			return self.SelectMany(v => v.Events).Where(v => v.EventType == type).ToList();
-		}
-
-		public static List<ClientMessage.WriteEvents> WithEventType(
-			this List<ClientMessage.WriteEvents> self, string type) {
-			return self.Where(v => v.Events.Any(m => m.EventType == type)).ToList();
-		}
-
-		public static IEnumerable<T> OfTypes<T, T1, T2>(this IEnumerable<object> source) where T1 : T where T2 : T {
-			return source.OfType<T>().Where(v => v is T1 || v is T2);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/TestFixtureWithCoreProjection.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/TestFixtureWithCoreProjection.cs
deleted file mode 100644
index d1ca7c49fda..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/TestFixtureWithCoreProjection.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.Tests.Bus.Helpers;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	public abstract class TestFixtureWithCoreProjection<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		protected CoreProjection _coreProjection;
-		protected TestHandler<ReaderSubscriptionManagement.Subscribe> _subscribeProjectionHandler;
-		protected TestHandler<ClientMessage.WriteEvents> _writeEventHandler;
-		protected Guid _firstWriteCorrelationId;
-		protected FakeProjectionStateHandler _stateHandler;
-		protected int _checkpointHandledThreshold = 5;
-		protected int _checkpointUnhandledBytesThreshold = 10000;
-		protected Action<SourceDefinitionBuilder> _configureBuilderByQuerySource = null;
-		protected Guid _projectionCorrelationId;
-		private bool _createTempStreams = false;
-		protected ProjectionConfig _projectionConfig;
-		protected ProjectionVersion _version;
-		protected string _projectionName;
-		protected Guid _workerId;
-
-		protected override void Given1() {
-			_version = new ProjectionVersion(1, 0, 0);
-			_projectionName = "projection";
-		}
-
-		[SetUp]
-		public void setup() {
-			_subscribeProjectionHandler = new TestHandler<ReaderSubscriptionManagement.Subscribe>();
-			_writeEventHandler = new TestHandler<ClientMessage.WriteEvents>();
-			_bus.Subscribe(_subscribeProjectionHandler);
-			_bus.Subscribe(_writeEventHandler);
-
-
-			_stateHandler = GivenProjectionStateHandler();
-			_firstWriteCorrelationId = Guid.NewGuid();
-			_workerId = Guid.NewGuid();
-			var dispatcher = new ProjectionManagerMessageDispatcher(new Dictionary<Guid, IPublisher>
-				{{_workerId, GetInputQueue()}});
-			_projectionCorrelationId = Guid.NewGuid();
-			_projectionConfig = GivenProjectionConfig();
-			var projectionProcessingStrategy = GivenProjectionProcessingStrategy();
-			_coreProjection = GivenCoreProjection(projectionProcessingStrategy);
-			_bus.Subscribe<CoreProjectionProcessingMessage.CheckpointCompleted>(_coreProjection);
-			_bus.Subscribe<CoreProjectionProcessingMessage.CheckpointLoaded>(_coreProjection);
-			_bus.Subscribe<CoreProjectionProcessingMessage.PrerecordedEventsLoaded>(_coreProjection);
-			_bus.Subscribe<CoreProjectionProcessingMessage.RestartRequested>(_coreProjection);
-			_bus.Subscribe<CoreProjectionProcessingMessage.Failed>(_coreProjection);
-			_bus.Subscribe(new AdHocHandler<ProjectionCoreServiceMessage.CoreTick>(tick => tick.Action()));
-			PreWhen();
-			When();
-		}
-
-		protected virtual CoreProjection
-			GivenCoreProjection(ProjectionProcessingStrategy projectionProcessingStrategy) {
-			return projectionProcessingStrategy.Create(
-				_projectionCorrelationId,
-				_bus,
-				_workerId,
-				SystemAccounts.System,
-				_bus,
-				_ioDispatcher,
-				_subscriptionDispatcher,
-				_timeProvider);
-		}
-
-		protected virtual ProjectionProcessingStrategy GivenProjectionProcessingStrategy() {
-			return CreateProjectionProcessingStrategy();
-		}
-
-		protected ProjectionProcessingStrategy CreateProjectionProcessingStrategy() {
-			return new ContinuousProjectionProcessingStrategy(
-				_projectionName, _version, _stateHandler, _projectionConfig, _stateHandler.GetSourceDefinition(), null,
-				_subscriptionDispatcher, true);
-		}
-
-		protected ProjectionProcessingStrategy CreateQueryProcessingStrategy() {
-			return new QueryProcessingStrategy(
-				_projectionName, _version, _stateHandler, _projectionConfig, _stateHandler.GetSourceDefinition(), null,
-				_subscriptionDispatcher, true);
-		}
-
-		protected virtual ProjectionConfig GivenProjectionConfig() {
-			return new ProjectionConfig(
-				null, _checkpointHandledThreshold, _checkpointUnhandledBytesThreshold, GivenPendingEventsThreshold(),
-				GivenMaxWriteBatchLength(), GivenEmitEventEnabled(), GivenCheckpointsEnabled(), _createTempStreams,
-				GivenStopOnEof(), GivenTrackEmittedStreams(), GivenCheckpointAfterMs(),
-				GivenMaximumAllowedWritesInFlight(), null);
-		}
-
-		protected virtual int GivenMaxWriteBatchLength() {
-			return 250;
-		}
-
-		protected virtual int GivenPendingEventsThreshold() {
-			return 1000;
-		}
-
-		protected virtual bool GivenStopOnEof() {
-			return false;
-		}
-
-		protected virtual bool GivenCheckpointsEnabled() {
-			return true;
-		}
-
-		protected virtual bool GivenTrackEmittedStreams() {
-			return true;
-		}
-
-		protected virtual bool GivenEmitEventEnabled() {
-			return true;
-		}
-
-		protected virtual int GivenCheckpointAfterMs() {
-			return 10000;
-		}
-
-		protected virtual int GivenMaximumAllowedWritesInFlight() {
-			return 1;
-		}
-
-		protected virtual FakeProjectionStateHandler GivenProjectionStateHandler() {
-			return new FakeProjectionStateHandler(configureBuilder: _configureBuilderByQuerySource);
-		}
-
-		protected new virtual void PreWhen() {
-		}
-
-		protected new abstract void When();
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/TestFixtureWithCoreProjectionLoaded.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/TestFixtureWithCoreProjectionLoaded.cs
deleted file mode 100644
index 88ef1670cbe..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/TestFixtureWithCoreProjectionLoaded.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	public abstract class TestFixtureWithCoreProjectionLoaded<TLogFormat, TStreamId> : TestFixtureWithCoreProjection<TLogFormat, TStreamId> {
-		protected override void PreWhen() {
-			_coreProjection.LoadStopped();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/TestFixtureWithCoreProjectionStarted.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/TestFixtureWithCoreProjectionStarted.cs
deleted file mode 100644
index 36806ed7fb4..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/TestFixtureWithCoreProjectionStarted.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	public abstract class TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> : TestFixtureWithCoreProjection<TLogFormat, TStreamId> {
-		protected Guid _subscriptionId;
-
-		protected override void PreWhen() {
-			_coreProjection.Start();
-			var lastSubscribe =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionManagement.Subscribe>().LastOrDefault();
-			_subscriptionId = lastSubscribe != null ? lastSubscribe.SubscriptionId : Guid.NewGuid();
-			_bus.Publish(new EventReaderSubscriptionMessage.ReaderAssignedReader(_subscriptionId, Guid.NewGuid()));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/TestFixtureWithExistingEvents.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/TestFixtureWithExistingEvents.cs
deleted file mode 100644
index 5341700a6fd..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/TestFixtureWithExistingEvents.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Messaging;
-using EventStore.Projections.Core.Services;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	public abstract class TestFixtureWithExistingEvents<TLogFormat, TStreamId> : EventStore.Core.Tests.Helpers.TestFixtureWithExistingEvents<TLogFormat, TStreamId>,
-		IHandle<ProjectionCoreServiceMessage.CoreTick> {
-		protected ReaderSubscriptionDispatcher _subscriptionDispatcher;
-
-		private bool _ticksAreHandledImmediately;
-		protected AwakeService AwakeService;
-
-		protected override void Given1() {
-			base.Given1();
-			_ticksAreHandledImmediately = false;
-		}
-
-		[SetUp]
-		public void SetUp() {
-			_subscriptionDispatcher = new ReaderSubscriptionDispatcher(_bus);
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CommittedEventReceived>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CheckpointSuggested>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.EofReached>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionEofReached>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionDeleted>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ProgressChanged>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.SubscriptionStarted>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.NotAuthorized>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ReaderAssignedReader>());
-			_bus.Subscribe<ProjectionCoreServiceMessage.CoreTick>(this);
-
-			AwakeService = new AwakeService();
-			_bus.Subscribe<StorageMessage.EventCommitted>(AwakeService);
-			_bus.Subscribe<StorageMessage.TfEofAtNonCommitRecord>(AwakeService);
-			_bus.Subscribe<AwakeServiceMessage.SubscribeAwake>(AwakeService);
-			_bus.Subscribe<AwakeServiceMessage.UnsubscribeAwake>(AwakeService);
-			_bus.Subscribe(new UnwrapEnvelopeHandler());
-		}
-
-		public void Handle(ProjectionCoreServiceMessage.CoreTick message) {
-			if (_ticksAreHandledImmediately)
-				message.Action();
-		}
-
-		protected void TicksAreHandledImmediately() {
-			_ticksAreHandledImmediately = true;
-		}
-
-		protected ClientMessage.WriteEvents CreateWriteEvent(
-			string streamId, string eventType, string data, string metadata = null, bool isJson = true,
-			Guid? correlationId = null) {
-			return new ClientMessage.WriteEvents(
-				Guid.NewGuid(), correlationId ?? Guid.NewGuid(), GetInputQueue(), false, streamId,
-				ExpectedVersion.Any, new Event(Guid.NewGuid(), eventType, isJson, data, metadata), null);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/TestFixtureWithReadWriteDispatchers.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/TestFixtureWithReadWriteDispatchers.cs
deleted file mode 100644
index 10217fef90e..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/TestFixtureWithReadWriteDispatchers.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	public abstract class TestFixtureWithReadWriteDispatchers :
-		EventStore.Core.Tests.Helpers.TestFixtureWithReadWriteDispatchers {
-		protected ReaderSubscriptionDispatcher _subscriptionDispatcher;
-
-		[SetUp]
-		public void SetUp() {
-			_subscriptionDispatcher = new ReaderSubscriptionDispatcher(_bus);
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CommittedEventReceived>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CheckpointSuggested>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.EofReached>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionEofReached>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionDeleted>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ProgressChanged>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.SubscriptionStarted>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.NotAuthorized>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ReaderAssignedReader>());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/another_epoch/when_loading_an_existing_projection.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/another_epoch/when_loading_an_existing_projection.cs
deleted file mode 100644
index 2bce7a41249..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/another_epoch/when_loading_an_existing_projection.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.another_epoch {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_starting_an_existing_projection<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		private string _testProjectionState = @"{""test"":1}";
-
-		protected override void Given() {
-			_version = new ProjectionVersion(1, 2, 2);
-			ExistingEvent(
-				"$projections-projection-result", "Result",
-				@"{""v"":1, ""c"": 100, ""p"": 50}", _testProjectionState);
-			ExistingEvent(
-				"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
-				@"{""v"":1, ""c"": 100, ""p"": 50}", _testProjectionState);
-			ExistingEvent(
-				"$projections-projection-result", "Result",
-				@"{""v"":1, ""c"": 200, ""p"": 150}", _testProjectionState);
-			ExistingEvent(
-				"$projections-projection-result", "Result",
-				@"{""v"":1, ""c"": 300, ""p"": 250}", _testProjectionState);
-		}
-
-		protected override void When() {
-		}
-
-
-		[Test]
-		public void should_subscribe_from_the_beginning() {
-			Assert.AreEqual(1, _subscribeProjectionHandler.HandledMessages.Count);
-			Assert.AreEqual(0, _subscribeProjectionHandler.HandledMessages[0].FromPosition.Position.CommitPosition);
-			Assert.AreEqual(-1, _subscribeProjectionHandler.HandledMessages[0].FromPosition.Position.PreparePosition);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/FakeCoreProjection.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/FakeCoreProjection.cs
deleted file mode 100644
index 91a5cf43daf..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/FakeCoreProjection.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Bus;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Phases;
-using EventStore.Projections.Core.Services.Processing.WorkItems;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.checkpoint_manager {
-	public class FakeCoreProjection : ICoreProjection,
-		ICoreProjectionForProcessingPhase,
-		IHandle<EventReaderSubscriptionMessage.ReaderAssignedReader> {
-		public readonly List<CoreProjectionProcessingMessage.CheckpointCompleted> _checkpointCompletedMessages =
-			new List<CoreProjectionProcessingMessage.CheckpointCompleted>();
-
-		public readonly List<CoreProjectionProcessingMessage.CheckpointLoaded> _checkpointLoadedMessages =
-			new List<CoreProjectionProcessingMessage.CheckpointLoaded>();
-
-		public readonly List<CoreProjectionProcessingMessage.PrerecordedEventsLoaded> _prerecordedEventsLoadedMessages =
-			new List<CoreProjectionProcessingMessage.PrerecordedEventsLoaded>();
-
-		public void Handle(CoreProjectionProcessingMessage.CheckpointCompleted message) {
-			_checkpointCompletedMessages.Add(message);
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.CheckpointLoaded message) {
-			_checkpointLoadedMessages.Add(message);
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.RestartRequested message) {
-			throw new System.NotImplementedException();
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.Failed message) {
-			throw new System.NotImplementedException();
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.PrerecordedEventsLoaded message) {
-			_prerecordedEventsLoadedMessages.Add(message);
-		}
-
-		public void CompletePhase() {
-			CompletePhaseInvoked++;
-		}
-
-		public void SetFaulted(string reason) {
-			throw new NotImplementedException();
-		}
-
-		public void SetFaulted(Exception ex) {
-			throw new NotImplementedException();
-		}
-
-		public void SetFaulting(string reason) {
-			throw new NotImplementedException();
-		}
-
-		public void SetCurrentCheckpointSuggestedWorkItem(CheckpointSuggestedWorkItem checkpointSuggestedWorkItem) {
-			throw new NotImplementedException();
-		}
-
-		public void EnsureTickPending() {
-			throw new NotImplementedException();
-		}
-
-		public CheckpointTag LastProcessedEventPosition {
-			get { throw new NotImplementedException(); }
-		}
-
-		public int SubscribedInvoked { get; set; }
-		public int CompletePhaseInvoked { get; set; }
-
-		public void Subscribed() {
-			SubscribedInvoked++;
-		}
-
-		public void Handle(EventReaderSubscriptionMessage.ReaderAssignedReader message) {
-			throw new NotImplementedException();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/TestFixtureWithCoreProjectionCheckpointManager.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/TestFixtureWithCoreProjectionCheckpointManager.cs
deleted file mode 100644
index 13e7fb7e970..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/TestFixtureWithCoreProjectionCheckpointManager.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.checkpoint_manager {
-	public abstract class TestFixtureWithCoreProjectionCheckpointManager<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		protected DefaultCheckpointManager _manager;
-		protected FakeCoreProjection _projection;
-		protected ProjectionConfig _config;
-		protected int _checkpointHandledThreshold;
-		protected int _checkpointUnhandledBytesThreshold;
-		protected int _pendingEventsThreshold;
-		protected int _maxWriteBatchLength;
-		protected bool _emitEventEnabled;
-		protected bool _checkpointsEnabled;
-		protected bool _trackEmittedStreams;
-		protected int _checkpointAfterMs;
-		protected int _maximumAllowedWritesInFlight;
-		protected bool _producesResults;
-		protected bool _definesFold = true;
-		protected Guid _projectionCorrelationId;
-		private string _projectionCheckpointStreamId;
-		protected bool _createTempStreams;
-		protected bool _stopOnEof;
-		protected ProjectionNamesBuilder _namingBuilder;
-		protected CoreProjectionCheckpointWriter _checkpointWriter;
-		protected CoreProjectionCheckpointReader _checkpointReader;
-		protected string _projectionName;
-		protected ProjectionVersion _projectionVersion;
-
-		[SetUp]
-		public void setup() {
-			Given();
-			_namingBuilder = ProjectionNamesBuilder.CreateForTest("projection");
-			_config = new ProjectionConfig(null, _checkpointHandledThreshold, _checkpointUnhandledBytesThreshold,
-				_pendingEventsThreshold, _maxWriteBatchLength, _emitEventEnabled,
-				_checkpointsEnabled, _createTempStreams, _stopOnEof, _trackEmittedStreams, _checkpointAfterMs,
-				_maximumAllowedWritesInFlight, null);
-			When();
-		}
-
-		protected new virtual void When() {
-			_projectionVersion = new ProjectionVersion(1, 0, 0);
-			_projectionName = "projection";
-			_checkpointWriter = new CoreProjectionCheckpointWriter(
-				_namingBuilder.MakeCheckpointStreamName(), _ioDispatcher, _projectionVersion, _projectionName);
-			_checkpointReader = new CoreProjectionCheckpointReader(
-				GetInputQueue(), _projectionCorrelationId, _ioDispatcher, _projectionCheckpointStreamId,
-				_projectionVersion, _checkpointsEnabled);
-			_manager = GivenCheckpointManager();
-		}
-
-		protected virtual DefaultCheckpointManager GivenCheckpointManager() {
-			return new DefaultCheckpointManager(
-				_bus, _projectionCorrelationId, _projectionVersion, null, _ioDispatcher, _config, _projectionName,
-				new StreamPositionTagger(0, "stream"), _namingBuilder, _checkpointsEnabled, _producesResults,
-				_definesFold,
-				_checkpointWriter);
-		}
-
-		protected new virtual void Given() {
-			_projectionCheckpointStreamId = "$projections-projection-checkpoint";
-			_projectionCorrelationId = Guid.NewGuid();
-			_projection = new FakeCoreProjection();
-			_bus.Subscribe<CoreProjectionProcessingMessage.CheckpointCompleted>(_projection);
-			_bus.Subscribe<CoreProjectionProcessingMessage.CheckpointLoaded>(_projection);
-			_bus.Subscribe<CoreProjectionProcessingMessage.PrerecordedEventsLoaded>(_projection);
-			_bus.Subscribe<CoreProjectionProcessingMessage.RestartRequested>(_projection);
-			_bus.Subscribe<CoreProjectionProcessingMessage.Failed>(_projection);
-			_bus.Subscribe<EventReaderSubscriptionMessage.ReaderAssignedReader>(_projection);
-
-			_bus.Subscribe(_subscriptionDispatcher
-				.CreateSubscriber<EventReaderSubscriptionMessage.CommittedEventReceived>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CheckpointSuggested>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.EofReached>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionEofReached>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionDeleted>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ProgressChanged>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.NotAuthorized>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ReaderAssignedReader>());
-			_checkpointHandledThreshold = 2;
-			_checkpointUnhandledBytesThreshold = 5;
-			_pendingEventsThreshold = 5;
-			_maxWriteBatchLength = 5;
-			_maximumAllowedWritesInFlight = 1;
-			_emitEventEnabled = true;
-			_checkpointsEnabled = true;
-			_producesResults = true;
-			_definesFold = true;
-			_createTempStreams = false;
-			_stopOnEof = false;
-			NoStream(_projectionCheckpointStreamId);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/checkpoint_manager_with_partition.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/checkpoint_manager_with_partition.cs
deleted file mode 100644
index 8a09e97b02f..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/checkpoint_manager_with_partition.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.checkpoint_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class checkpoint_manager_with_partition<TLogFormat, TStreamId> :
-		TestFixtureWithCoreProjectionCheckpointManager<TLogFormat, TStreamId> {
-		[Test]
-		public void when_loading_partition_state_for_a_partition() {
-			var checkpointMetadata = @"{
-				  ""$v"": ""1:-1:0:1"",
-				  ""$s"": {
-					""$ce-Evnt"": 0
-				  }
-				}";
-			PartitionState state = new PartitionState("{\"foo\":1}", "{\"bar\":1}", CheckpointTag.Empty);
-			var serializedState = state.Serialize();
-			var partition = "abc";
-			ExistingEvent(_namingBuilder.MakePartitionCheckpointStreamName(partition), "$Checkpoint",
-				checkpointMetadata, serializedState);
-			_manager.BeginLoadPartitionStateAt(partition, CheckpointTag.Empty, state => {
-				Assert.AreEqual(serializedState, state.Serialize());
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/TestFixtureWithMultiStreamCheckpointManager.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/TestFixtureWithMultiStreamCheckpointManager.cs
deleted file mode 100644
index 3f9ace2db7b..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/TestFixtureWithMultiStreamCheckpointManager.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.checkpoint_manager.multi_stream {
-	public abstract class TestFixtureWithMultiStreamCheckpointManager<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionCheckpointManager<TLogFormat, TStreamId> {
-		protected new string[] _streams;
-
-		protected override void Given() {
-			base.Given();
-			_projectionVersion = new ProjectionVersion(1, 0, 0);
-			_streams = new[] {"a", "b", "c"};
-		}
-
-		protected override DefaultCheckpointManager GivenCheckpointManager() {
-			return new MultiStreamMultiOutputCheckpointManager(
-				_bus, _projectionCorrelationId, _projectionVersion, null, _ioDispatcher, _config, _projectionName,
-				new MultiStreamPositionTagger(0, _streams), _namingBuilder, _checkpointsEnabled, true, true,
-				_checkpointWriter);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_prerecording_event_order.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_prerecording_event_order.cs
deleted file mode 100644
index 6d9e87dd427..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_prerecording_event_order.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.checkpoint_manager.multi_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_prerecording_event_order<TLogFormat, TStreamId> : TestFixtureWithMultiStreamCheckpointManager<TLogFormat, TStreamId> {
-		private ResolvedEvent _event1;
-		private ResolvedEvent _event2;
-
-		protected override void Given() {
-			base.Given();
-			_streams = new[] {"pa", "pb"};
-			ExistingEvent("a", "test1", "{}", "{}");
-			ExistingEvent("b", "test1", "{}", "{}");
-
-			ExistingEvent("pa", "$>", "1@a", "{$o:\"oa\"}");
-			ExistingEvent("pb", "$>", "1@b", "{$o:\"ob\"}");
-
-			_event1 = new ResolvedEvent("pa", 1, "a", 1, true, new TFPos(200, 150), Guid.NewGuid(), "test1", true, "{}",
-				"{}", "{$o:\"oa\"");
-			_event2 = new ResolvedEvent("pb", 1, "b", 1, true, new TFPos(300, 250), Guid.NewGuid(), "test1", true, "{}",
-				"{}", "{$o:\"ob\"");
-
-			NoOtherStreams();
-			AllWritesSucceed();
-		}
-
-		protected override void When() {
-			base.When();
-			Action noop = () => { };
-			_manager.Initialize();
-			_checkpointReader.BeginLoadState();
-			var checkpointLoaded =
-				_consumer.HandledMessages.OfType<CoreProjectionProcessingMessage.CheckpointLoaded>().First();
-			_checkpointWriter.StartFrom(checkpointLoaded.CheckpointTag, checkpointLoaded.CheckpointEventNumber);
-			_manager.BeginLoadPrerecordedEvents(checkpointLoaded.CheckpointTag);
-
-			_manager.Start(CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"pa", -1}, {"pb", -1}}),
-				null);
-			_manager.RecordEventOrder(_event1,
-				CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"pa", 1}, {"pb", -1}}),
-				committed: noop);
-			_manager.RecordEventOrder(_event2,
-				CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"pa", 1}, {"pb", 1}}),
-				committed: noop);
-		}
-
-		[Test]
-		public void writes_correct_link_tos() {
-			var writeEvents =
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
-					.SelectMany(v => v.Events)
-					.Where(v => v.EventType == SystemEventTypes.LinkTo)
-					.ToArray();
-			Assert.AreEqual(2, writeEvents.Length);
-			Assert.AreEqual("1@pa", Helper.UTF8NoBom.GetString(writeEvents[0].Data));
-			Assert.AreEqual("1@pb", Helper.UTF8NoBom.GetString(writeEvents[1].Data));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_and_enqueue_prerecorded_events_read_times_out.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_and_enqueue_prerecorded_events_read_times_out.cs
deleted file mode 100644
index 4420c424bc1..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_and_enqueue_prerecorded_events_read_times_out.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.checkpoint_manager.multi_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_starting_and_enqueue_prerecorded_events_read_times_out<TLogFormat, TStreamId> : with_multi_stream_checkpoint_manager<TLogFormat, TStreamId>,
-		IHandle<TimerMessage.Schedule>,
-		IHandle<CoreProjectionProcessingMessage.PrerecordedEventsLoaded> {
-		private bool _hasTimedOut;
-		private Guid _timeoutCorrelationId;
-		private ManualResetEventSlim _mre = new ManualResetEventSlim();
-		private CoreProjectionProcessingMessage.PrerecordedEventsLoaded _eventsLoadedMessage;
-
-		public override void When() {
-			_bus.Subscribe<TimerMessage.Schedule>(this);
-			_bus.Subscribe<CoreProjectionProcessingMessage.PrerecordedEventsLoaded>(this);
-
-			_checkpointManager.Initialize();
-			var positions = new Dictionary<string, long> {{"a", 1}, {"b", 1}, {"c", 1}};
-			_checkpointManager.BeginLoadPrerecordedEvents(CheckpointTag.FromStreamPositions(0, positions));
-
-			if (!_mre.Wait(10000)) {
-				Assert.Fail("Timed out waiting for pre recorded events loaded message");
-			}
-		}
-
-		public override void Handle(ClientMessage.ReadStreamEventsBackward message) {
-			if (!_hasTimedOut && message.EventStreamId == "a") {
-				_hasTimedOut = true;
-				_timeoutCorrelationId = message.CorrelationId;
-				return;
-			}
-
-			base.Handle(message);
-		}
-
-		public void Handle(TimerMessage.Schedule message) {
-			var delay = message.ReplyMessage as IODispatcherDelayedMessage;
-			if (delay != null && delay.MessageCorrelationId == _timeoutCorrelationId) {
-				message.Reply();
-			}
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.PrerecordedEventsLoaded message) {
-			_eventsLoadedMessage = message;
-			_mre.Set();
-		}
-
-		[Test]
-		public void should_send_prerecorded_events_message() {
-			Assert.IsNotNull(_eventsLoadedMessage);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_and_read_prerecorded_events_successfully.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_and_read_prerecorded_events_successfully.cs
deleted file mode 100644
index 79c4c0a7709..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_and_read_prerecorded_events_successfully.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System.Collections.Generic;
-using System.Threading;
-using EventStore.Core.Bus;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.checkpoint_manager.multi_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_starting_and_read_prerecorded_events_successfully<TLogFormat, TStreamId> : with_multi_stream_checkpoint_manager<TLogFormat, TStreamId>,
-		IHandle<CoreProjectionProcessingMessage.PrerecordedEventsLoaded> {
-		private ManualResetEventSlim _mre = new ManualResetEventSlim();
-		private CoreProjectionProcessingMessage.PrerecordedEventsLoaded _eventsLoadedMessage;
-
-		public override void When() {
-			_bus.Subscribe<CoreProjectionProcessingMessage.PrerecordedEventsLoaded>(this);
-
-			_checkpointManager.Initialize();
-			var positions = new Dictionary<string, long> {{"a", 1}, {"b", 1}, {"c", 1}};
-			_checkpointManager.BeginLoadPrerecordedEvents(CheckpointTag.FromStreamPositions(0, positions));
-
-			if (!_mre.Wait(10000)) {
-				Assert.Fail("Timed out waiting for pre recorded events loaded message");
-			}
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.PrerecordedEventsLoaded message) {
-			_eventsLoadedMessage = message;
-			_mre.Set();
-		}
-
-		[Test]
-		public void should_send_prerecorded_events_message() {
-			Assert.IsNotNull(_eventsLoadedMessage);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_and_read_prerecorded_events_times_out.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_and_read_prerecorded_events_times_out.cs
deleted file mode 100644
index 30578f24364..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_and_read_prerecorded_events_times_out.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.checkpoint_manager.multi_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_starting_and_read_prerecorded_events_times_out<TLogFormat, TStreamId> : with_multi_stream_checkpoint_manager<TLogFormat, TStreamId>,
-		IHandle<TimerMessage.Schedule>,
-		IHandle<CoreProjectionProcessingMessage.PrerecordedEventsLoaded> {
-		private bool _hasTimedOut;
-		private Guid _timeoutCorrelationId;
-		private ManualResetEventSlim _mre = new ManualResetEventSlim();
-		private CoreProjectionProcessingMessage.PrerecordedEventsLoaded _eventsLoadedMessage;
-
-		public override void When() {
-			_bus.Subscribe<TimerMessage.Schedule>(this);
-			_bus.Subscribe<CoreProjectionProcessingMessage.PrerecordedEventsLoaded>(this);
-
-			_checkpointManager.Initialize();
-			var positions = new Dictionary<string, long> {{"a", 1}, {"b", 1}, {"c", 1}};
-			_checkpointManager.BeginLoadPrerecordedEvents(CheckpointTag.FromStreamPositions(0, positions));
-
-			if (!_mre.Wait(10000)) {
-				Assert.Fail("Timed out waiting for pre recorded events loaded message");
-			}
-		}
-
-		public override void Handle(ClientMessage.ReadStreamEventsBackward message) {
-			if (!_hasTimedOut) {
-				_hasTimedOut = true;
-				_timeoutCorrelationId = message.CorrelationId;
-				return;
-			}
-
-			base.Handle(message);
-		}
-
-		public void Handle(TimerMessage.Schedule message) {
-			var delay = message.ReplyMessage as IODispatcherDelayedMessage;
-			if (delay != null && delay.MessageCorrelationId == _timeoutCorrelationId) {
-				message.Reply();
-			}
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.PrerecordedEventsLoaded message) {
-			_eventsLoadedMessage = message;
-			_mre.Set();
-		}
-
-		[Test]
-		public void should_send_prerecorded_events_message() {
-			Assert.IsNotNull(_eventsLoadedMessage);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_with_prerecorded_events_after_the_last_checkpoint.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_with_prerecorded_events_after_the_last_checkpoint.cs
deleted file mode 100644
index 6b9b0136895..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_with_prerecorded_events_after_the_last_checkpoint.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.checkpoint_manager.multi_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_starting_with_prerecorded_events_after_the_last_checkpoint<TLogFormat, TStreamId> :
-		TestFixtureWithMultiStreamCheckpointManager<TLogFormat, TStreamId> {
-		private readonly CheckpointTag _tag1 =
-			CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"a", 0}, {"b", 0}, {"c", 1}});
-
-		private readonly CheckpointTag _tag2 =
-			CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"a", 1}, {"b", 0}, {"c", 1}});
-
-		private readonly CheckpointTag _tag3 =
-			CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"a", 1}, {"b", 1}, {"c", 1}});
-
-		protected override void Given() {
-			base.Given();
-			ExistingEvent(
-				"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
-				@"{""s"": {""a"": 0, ""b"": 0, ""c"": 0}}", "{}");
-			ExistingEvent("a", "StreamCreated", "", "");
-			ExistingEvent("b", "StreamCreated", "", "");
-			ExistingEvent("c", "StreamCreated", "", "");
-			ExistingEvent("d", "StreamCreated", "", "");
-
-			ExistingEvent("a", "Event", "", @"{""data"":""a""");
-			ExistingEvent("b", "Event", "bb", @"{""data"":""b""");
-			ExistingEvent("c", "$>", "{$o:\"org\"}", @"1@d");
-			ExistingEvent("d", "Event", "dd", @"{""data"":""d""");
-
-			ExistingEvent(
-				"$projections-projection-order", "$>", @"{""s"": {""a"": 0, ""b"": 0, ""c"": 0}}", "0@c");
-			ExistingEvent(
-				"$projections-projection-order", "$>", @"{""s"": {""a"": 0, ""b"": 0, ""c"": 1}}", "1@c");
-			ExistingEvent(
-				"$projections-projection-order", "$>", @"{""s"": {""a"": 1, ""b"": 0, ""c"": 1}}", "1@a");
-			ExistingEvent(
-				"$projections-projection-order", "$>", @"{""s"": {""a"": 1, ""b"": 1, ""c"": 1}}", "1@b");
-		}
-
-		protected override void When() {
-			base.When();
-			_checkpointReader.BeginLoadState();
-			var checkpointLoaded =
-				_consumer.HandledMessages.OfType<CoreProjectionProcessingMessage.CheckpointLoaded>().First();
-			_checkpointWriter.StartFrom(checkpointLoaded.CheckpointTag, checkpointLoaded.CheckpointEventNumber);
-			_manager.BeginLoadPrerecordedEvents(checkpointLoaded.CheckpointTag);
-		}
-
-		[Test]
-		public void sends_correct_checkpoint_loaded_message() {
-			Assert.AreEqual(1, _projection._checkpointLoadedMessages.Count);
-			Assert.AreEqual(
-				CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"a", 0}, {"b", 0}, {"c", 0}}),
-				_projection._checkpointLoadedMessages.Single().CheckpointTag);
-			Assert.AreEqual("{}", _projection._checkpointLoadedMessages.Single().CheckpointData);
-		}
-
-		[Test]
-		public void sends_correct_preprecoded_events_loaded_message() {
-			Assert.AreEqual(1, _projection._prerecordedEventsLoadedMessages.Count);
-			Assert.AreEqual(
-				CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"a", 1}, {"b", 1}, {"c", 1}}),
-				_projection._prerecordedEventsLoadedMessages.Single().CheckpointTag);
-		}
-
-		[Test]
-		public void sends_commited_event_received_messages_in_correct_order() {
-			var messages = HandledMessages.OfType<EventReaderSubscriptionMessage.CommittedEventReceived>().ToList();
-			Assert.AreEqual(3, messages.Count);
-
-			var message1 = messages[0];
-			var message2 = messages[1];
-			var message3 = messages[2];
-
-			Assert.AreEqual(_tag1, message1.CheckpointTag);
-			Assert.AreEqual(_tag2, message2.CheckpointTag);
-			Assert.AreEqual(_tag3, message3.CheckpointTag);
-		}
-
-		[Test]
-		public void sends_correct_commited_event_received_messages() {
-			var messages = HandledMessages.OfType<EventReaderSubscriptionMessage.CommittedEventReceived>().ToList();
-			Assert.AreEqual(3, messages.Count);
-
-			var message1 = messages[0];
-			var message2 = messages[1];
-			var message3 = messages[2];
-
-			Assert.AreEqual(@"{""data"":""d""", message1.Data.Data);
-			Assert.AreEqual(@"{""data"":""a""", message2.Data.Data);
-			Assert.AreEqual(@"{""data"":""b""", message3.Data.Data);
-
-			Assert.AreEqual(@"dd", message1.Data.Metadata);
-			Assert.IsNull(message2.Data.Metadata);
-			Assert.AreEqual(@"bb", message3.Data.Metadata);
-
-			Assert.AreEqual("{$o:\"org\"}", message1.Data.PositionMetadata);
-			Assert.IsNull(message2.Data.PositionMetadata);
-			Assert.IsNull(message3.Data.PositionMetadata);
-
-			Assert.AreEqual("Event", message1.Data.EventType);
-			Assert.AreEqual("Event", message2.Data.EventType);
-			Assert.AreEqual("Event", message3.Data.EventType);
-
-			Assert.AreEqual("c", message1.Data.PositionStreamId);
-			Assert.AreEqual("a", message2.Data.PositionStreamId);
-			Assert.AreEqual("b", message3.Data.PositionStreamId);
-
-			Assert.AreEqual("d", message1.Data.EventStreamId);
-			Assert.AreEqual("a", message2.Data.EventStreamId);
-			Assert.AreEqual("b", message3.Data.EventStreamId);
-
-			Assert.AreEqual(_projectionCorrelationId, message1.SubscriptionId);
-			Assert.AreEqual(_projectionCorrelationId, message2.SubscriptionId);
-			Assert.AreEqual(_projectionCorrelationId, message3.SubscriptionId);
-
-			Assert.AreEqual(true, message1.Data.ResolvedLinkTo);
-			Assert.AreEqual(false, message2.Data.ResolvedLinkTo);
-			Assert.AreEqual(false, message3.Data.ResolvedLinkTo);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_with_prerecorded_events_before_the_last_checkpoint.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_with_prerecorded_events_before_the_last_checkpoint.cs
deleted file mode 100644
index ad0bf99e29c..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_with_prerecorded_events_before_the_last_checkpoint.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.checkpoint_manager.multi_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_starting_with_prerecorded_events_before_the_last_checkpoint<TLogFormat, TStreamId> :
-		TestFixtureWithMultiStreamCheckpointManager<TLogFormat, TStreamId> {
-		protected override void Given() {
-			base.Given();
-			ExistingEvent(
-				"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
-				@"{""s"": {""a"": 0, ""b"": 1, ""c"": 0}}", "{}");
-			ExistingEvent("a", "StreamCreated", "", "");
-			ExistingEvent("b", "StreamCreated", "", "");
-			ExistingEvent("c", "StreamCreated", "", "");
-			ExistingEvent("d", "StreamCreated", "", "");
-
-			ExistingEvent("a", "Event", "", @"{""data"":""a""");
-			ExistingEvent("b", "Event", "bb", @"{""data"":""b""");
-			ExistingEvent("c", "$>", "{$o:\"org\"}", @"1@d");
-			ExistingEvent("d", "Event", "dd", @"{""data"":""d""");
-
-			// Lots of pre-recorded events before the checkpoint.
-			for (int i = 0; i < 1000; i++) {
-				ExistingEvent(
-					"$projections-projection-order", "$>", @"{""s"": {""a"": 0, ""b"": 0, ""c"": 0}}", "0@c");
-			}
-
-			// Pre-recorded event at checkpoint 
-			ExistingEvent(
-				"$projections-projection-order", "$>", @"{""s"": {""a"": 0, ""b"": 1, ""c"": 0}}", "1@b");
-		}
-
-		protected override void When() {
-			base.When();
-			_checkpointReader.BeginLoadState();
-			var checkpointLoaded =
-				_consumer.HandledMessages.OfType<CoreProjectionProcessingMessage.CheckpointLoaded>().First();
-			_checkpointWriter.StartFrom(checkpointLoaded.CheckpointTag, checkpointLoaded.CheckpointEventNumber);
-			_manager.BeginLoadPrerecordedEvents(checkpointLoaded.CheckpointTag);
-		}
-
-		[Test]
-		public void stops_reading_prerecorded_events_after_found_checkpoint() {
-			Assert.AreEqual(1,
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsBackward>()
-					.Count(_ => _.EventStreamId == "$projections-projection-order"));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_with_prerecorded_events_in_past_epoch.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_with_prerecorded_events_in_past_epoch.cs
deleted file mode 100644
index 1f0e281d710..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_with_prerecorded_events_in_past_epoch.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.checkpoint_manager.multi_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_starting_with_prerecorded_events_in_past_epoch<TLogFormat, TStreamId> : TestFixtureWithMultiStreamCheckpointManager<TLogFormat, TStreamId> {
-		private readonly CheckpointTag _tag1 =
-			CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"a", 0}, {"b", 0}, {"c", 1}});
-
-		private readonly CheckpointTag _tag2 =
-			CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"a", 1}, {"b", 0}, {"c", 1}});
-
-		//private readonly CheckpointTag _tag3 =CheckpointTag.FromStreamPositions(new Dictionary<string, int> {{"a", 1}, {"b", 1}, {"c", 1}});
-
-		protected override void Given() {
-			base.Given();
-			_projectionVersion = new ProjectionVersion(1, 2, 2);
-			ExistingEvent(
-				"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
-				@"{""v"":2, ""s"": {""a"": 0, ""b"": 0, ""c"": 0}}",
-				"{}");
-			ExistingEvent("a", "StreamCreated", "", "");
-			ExistingEvent("b", "StreamCreated", "", "");
-			ExistingEvent("c", "StreamCreated", "", "");
-
-			ExistingEvent("a", "Event", "", @"{""data"":""a""");
-			ExistingEvent("b", "Event", "", @"{""data"":""b""");
-			ExistingEvent("c", "Event", "", @"{""data"":""c""");
-
-			ExistingEvent("$projections-projection-order", "$>", @"{""v"":1, ""s"": {""a"": 0, ""b"": 0, ""c"": 0}}",
-				"0@c");
-			ExistingEvent("$projections-projection-order", "$>", @"{""v"":1, ""s"": {""a"": 0, ""b"": 0, ""c"": 1}}",
-				"1@c");
-			ExistingEvent("$projections-projection-order", "$>", @"{""v"":1, ""s"": {""a"": 1, ""b"": 0, ""c"": 1}}",
-				"1@a");
-			ExistingEvent("$projections-projection-order", "$>", @"{""v"":1, ""s"": {""a"": 1, ""b"": 1, ""c"": 1}}",
-				"1@b");
-			ExistingEvent("$projections-projection-order", "$>", @"{""v"":2, ""s"": {""a"": 0, ""b"": 0, ""c"": 0}}",
-				"0@c");
-			ExistingEvent("$projections-projection-order", "$>", @"{""v"":2, ""s"": {""a"": 0, ""b"": 0, ""c"": 1}}",
-				"1@c");
-			ExistingEvent("$projections-projection-order", "$>", @"{""v"":2, ""s"": {""a"": 1, ""b"": 0, ""c"": 1}}",
-				"1@a");
-		}
-
-		protected override void When() {
-			base.When();
-			_checkpointReader.BeginLoadState();
-			var checkpointLoaded =
-				_consumer.HandledMessages.OfType<CoreProjectionProcessingMessage.CheckpointLoaded>().First();
-			_checkpointWriter.StartFrom(checkpointLoaded.CheckpointTag, checkpointLoaded.CheckpointEventNumber);
-			_manager.BeginLoadPrerecordedEvents(checkpointLoaded.CheckpointTag);
-		}
-
-		[Test]
-		public void sends_correct_checkpoint_loaded_message() {
-			Assert.AreEqual(1, _projection._checkpointLoadedMessages.Count);
-			Assert.AreEqual(
-				CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"a", 0}, {"b", 0}, {"c", 0}}),
-				_projection._checkpointLoadedMessages.Single().CheckpointTag);
-			Assert.AreEqual("{}", _projection._checkpointLoadedMessages.Single().CheckpointData);
-		}
-
-		[Test]
-		public void sends_correct_prerecorded_events_loaded_message() {
-			Assert.AreEqual(1, _projection._prerecordedEventsLoadedMessages.Count);
-			Assert.AreEqual(
-				CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"a", 1}, {"b", 0}, {"c", 1}}),
-				_projection._prerecordedEventsLoadedMessages.Single().CheckpointTag);
-		}
-
-		[Test]
-		public void sends_committed_event_received_messages_in_correct_order() {
-			var messages = HandledMessages.OfType<EventReaderSubscriptionMessage.CommittedEventReceived>().ToList();
-			Assert.AreEqual(2, messages.Count);
-
-			var message1 = messages[0];
-			var message2 = messages[1];
-
-			Assert.AreEqual(_tag1, message1.CheckpointTag);
-			Assert.AreEqual(_tag2, message2.CheckpointTag);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/with_multi_stream_checkpoint_manager.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/with_multi_stream_checkpoint_manager.cs
deleted file mode 100644
index 931f4471e2f..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/with_multi_stream_checkpoint_manager.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.Tests.Helpers.IODispatcherTests;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.checkpoint_manager.multi_stream {
-	public abstract class with_multi_stream_checkpoint_manager<TLogFormat, TStreamId> : IHandle<ClientMessage.ReadStreamEventsBackward> {
-		protected readonly SynchronousScheduler _bus = new();
-		protected readonly Guid _projectionId = Guid.NewGuid();
-		protected readonly string[] _streams = new string[] {"a", "b", "c"};
-		protected readonly string _projectionName = "test_projection";
-
-		protected IODispatcher _ioDispatcher;
-		protected ProjectionVersion _projectionVersion;
-		protected ProjectionConfig _projectionConfig;
-		protected PositionTagger _positionTagger;
-		protected ProjectionNamesBuilder _namingBuilder;
-		protected CoreProjectionCheckpointWriter _coreProjectionCheckpointWriter;
-		protected MultiStreamMultiOutputCheckpointManager _checkpointManager;
-
-		private bool _hasRead;
-
-		[OneTimeSetUp]
-		public void TestFixtureSetUp() {
-			_ioDispatcher = new IODispatcher(_bus, _bus, true);
-			_projectionVersion = new ProjectionVersion(3, 1, 2);
-			_projectionConfig = new ProjectionConfig(SystemAccounts.System, 10, 1000, 1000, 10, true, true, true,
-				false,
-				false, 5000, 10, null);
-			_positionTagger = new MultiStreamPositionTagger(3, _streams);
-			_positionTagger.AdjustTag(CheckpointTag.FromStreamPositions(3,
-				new Dictionary<string, long> {{"a", 0}, {"b", 0}, {"c", 0}}));
-			_namingBuilder = ProjectionNamesBuilder.CreateForTest("projection");
-
-			IODispatcherTestHelpers.SubscribeIODispatcher(_ioDispatcher, _bus);
-			_bus.Subscribe<ClientMessage.ReadStreamEventsBackward>(this);
-
-			_coreProjectionCheckpointWriter = new CoreProjectionCheckpointWriter(
-				_namingBuilder.MakeCheckpointStreamName(), _ioDispatcher,
-				_projectionVersion, _projectionName);
-
-			_checkpointManager = new MultiStreamMultiOutputCheckpointManager(_bus, _projectionId, _projectionVersion,
-				SystemAccounts.System,
-				_ioDispatcher, _projectionConfig, _projectionName, _positionTagger, _namingBuilder, true, true, false,
-				_coreProjectionCheckpointWriter);
-
-			When();
-		}
-
-		public abstract void When();
-
-		public virtual void Handle(ClientMessage.ReadStreamEventsBackward message) {
-			if (message.EventStreamId == _namingBuilder.GetOrderStreamName())
-				message.Envelope.ReplyWith(ReadOrderStream(message));
-			if (message.EventStreamId == "a")
-				message.Envelope.ReplyWith(ReadTestStream(message));
-		}
-
-		public ClientMessage.ReadStreamEventsBackwardCompleted ReadOrderStream(
-			ClientMessage.ReadStreamEventsBackward message) {
-			ResolvedEvent[] events;
-			if (!_hasRead) {
-				var checkpoint =
-					CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"a", 5}, {"b", 5}, {"c", 5}});
-				events = IODispatcherTestHelpers.CreateResolvedEvent<TLogFormat, TStreamId>(message.EventStreamId, "$>",
-					"10@a", checkpoint.ToJsonString(new ProjectionVersion(3, 0, 1)));
-				_hasRead = true;
-			} else {
-				events = new ResolvedEvent[0] { };
-			}
-
-			return new ClientMessage.ReadStreamEventsBackwardCompleted(message.CorrelationId, message.EventStreamId,
-				message.FromEventNumber,
-				message.MaxCount, ReadStreamResult.Success, events, null, true, "",
-				message.FromEventNumber - events.Length, message.FromEventNumber, true, 10000);
-		}
-
-		public ClientMessage.ReadStreamEventsBackwardCompleted ReadTestStream(
-			ClientMessage.ReadStreamEventsBackward message) {
-			var events =
-				IODispatcherTestHelpers.CreateResolvedEvent<TLogFormat, TStreamId>(message.EventStreamId, "testevent", "{ \"data\":1 }");
-			return new ClientMessage.ReadStreamEventsBackwardCompleted(message.CorrelationId, message.EventStreamId,
-				message.FromEventNumber,
-				message.MaxCount, ReadStreamResult.Success, events, null, true, "", message.FromEventNumber - 1,
-				message.FromEventNumber, true, 10000);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_a_checkpoint_has_been_completed_and_requesting_checkpoint_to_stop.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_a_checkpoint_has_been_completed_and_requesting_checkpoint_to_stop.cs
deleted file mode 100644
index 75d7a8a37eb..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_a_checkpoint_has_been_completed_and_requesting_checkpoint_to_stop.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.checkpoint_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_a_checkpoint_has_been_completed_and_requesting_checkpoint_to_stop<TLogFormat, TStreamId> :
-		TestFixtureWithCoreProjectionCheckpointManager<TLogFormat, TStreamId> {
-		private Exception _exception;
-
-		protected override void Given() {
-			AllWritesSucceed();
-			base.Given();
-			this._checkpointHandledThreshold = 2; //NOTE: does not play any role anymore here
-		}
-
-		protected override void When() {
-			base.When();
-			_exception = null;
-			try {
-				_checkpointReader.BeginLoadState();
-				var checkpointLoaded =
-					_consumer.HandledMessages.OfType<CoreProjectionProcessingMessage.CheckpointLoaded>().First();
-				_checkpointWriter.StartFrom(checkpointLoaded.CheckpointTag, checkpointLoaded.CheckpointEventNumber);
-				_manager.BeginLoadPrerecordedEvents(checkpointLoaded.CheckpointTag);
-
-				_manager.Start(CheckpointTag.FromStreamPosition(0, "stream", 10), null);
-//                _manager.StateUpdated("", @"{""state"":""state1""}");
-				_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 11), 77.7f);
-//                _manager.StateUpdated("", @"{""state"":""state2""}");
-				_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 12), 77.8f);
-				_manager.CheckpointSuggested(CheckpointTag.FromStreamPosition(0, "stream", 12), 77.8f);
-				_manager.Stopping();
-			} catch (Exception ex) {
-				_exception = ex;
-			}
-		}
-
-		[Test]
-		public void does_not_throw() {
-			Assert.IsNull(_exception);
-		}
-
-		[Test]
-		public void two_checkpoints_are_completed() {
-			Assert.AreEqual(2, _projection._checkpointCompletedMessages.Count);
-		}
-
-
-		[Test]
-		public void only_one_checkpoint_has_been_written() {
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
-					.ToStream("$projections-projection-checkpoint")
-					.Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_a_core_projection_checkpoint_manager_has_been_created.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_a_core_projection_checkpoint_manager_has_been_created.cs
deleted file mode 100644
index 5f2a8b7e10d..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_a_core_projection_checkpoint_manager_has_been_created.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.checkpoint_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_a_core_projection_checkpoint_manager_has_been_created<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionCheckpointManager<TLogFormat, TStreamId> {
-		[Test]
-		public void stopping_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => { _manager.Stopping(); });
-		}
-
-		[Test]
-		public void stopped_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => { _manager.Stopped(); });
-		}
-
-		[Test]
-		public void event_processed_throws_invalid_operation_exception() {
-//            _manager.StateUpdated("", @"{""state"":""state""}");
-			Assert.Throws<InvalidOperationException>(() => {
-				_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 10), 77.7f);
-			});
-		}
-
-		[Test]
-		public void checkpoint_suggested_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_manager.CheckpointSuggested(CheckpointTag.FromStreamPosition(0, "stream", 10), 77.7f);
-			});
-		}
-
-		[Test]
-		public void ready_for_checkpoint_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_manager.Handle(new CoreProjectionProcessingMessage.ReadyForCheckpoint(null));
-			});
-		}
-
-		[Test]
-		public void can_begin_load_state() {
-			_checkpointWriter.StartFrom(CheckpointTag.FromPosition(0, 0, -1), ExpectedVersion.NoStream);
-		}
-
-		[Test]
-		public void can_be_started() {
-			_manager.Start(CheckpointTag.FromStreamPosition(0, "stream", 10), null);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_a_default_checkpoint_manager_has_been_reinitialized.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_a_default_checkpoint_manager_has_been_reinitialized.cs
deleted file mode 100644
index 58952fdb0db..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_a_default_checkpoint_manager_has_been_reinitialized.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.checkpoint_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_a_default_checkpoint_manager_has_been_reinitialized<TLogFormat, TStreamId> :
-		TestFixtureWithCoreProjectionCheckpointManager<TLogFormat, TStreamId> {
-		//private Exception _exception;
-
-		protected override void Given() {
-			AllWritesSucceed();
-			base.Given();
-			_checkpointHandledThreshold = 2;
-		}
-
-		protected override void When() {
-			base.When();
-			//_exception = null;
-			try {
-				_checkpointReader.BeginLoadState();
-				var checkpointLoaded =
-					_consumer.HandledMessages.OfType<CoreProjectionProcessingMessage.CheckpointLoaded>().First();
-				_checkpointWriter.StartFrom(checkpointLoaded.CheckpointTag, checkpointLoaded.CheckpointEventNumber);
-				_manager.BeginLoadPrerecordedEvents(checkpointLoaded.CheckpointTag);
-
-				_manager.Start(CheckpointTag.FromStreamPosition(0, "stream", 10), null);
-//                _manager.StateUpdated("", @"{""state"":""state1""}");
-				_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 11), 77.7f);
-//                _manager.StateUpdated("", @"{""state"":""state2""}");
-				_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 12), 77.7f);
-				_manager.Initialize();
-				_checkpointReader.Initialize();
-			} catch (Exception) {
-				//_exception = ex;
-			}
-		}
-
-
-		[Test]
-		public void stopping_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => { _manager.Stopping(); });
-		}
-
-		[Test]
-		public void stopped_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => { _manager.Stopped(); });
-		}
-
-		[Test]
-		public void event_processed_throws_invalid_operation_exception() {
-//            _manager.StateUpdated("", @"{""state"":""state""}");
-			Assert.Throws<InvalidOperationException>(() => {
-				_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 10), 77.7f);
-			});
-		}
-
-		[Test]
-		public void checkpoint_suggested_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_manager.CheckpointSuggested(CheckpointTag.FromStreamPosition(0, "stream", 10), 77.7f);
-			});
-		}
-
-		[Test]
-		public void ready_for_checkpoint_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_manager.Handle(new CoreProjectionProcessingMessage.ReadyForCheckpoint(null));
-			});
-		}
-
-		[Test]
-		public void can_begin_load_state() {
-			_checkpointReader.BeginLoadState();
-		}
-
-		[Test]
-		public void can_be_started() {
-			_manager.Start(CheckpointTag.FromStreamPosition(0, "stream", 10), null);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_beginning_to_load_state_the_core_projection_checkpoint_manager.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_beginning_to_load_state_the_core_projection_checkpoint_manager.cs
deleted file mode 100644
index 9b215a6c5cb..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_beginning_to_load_state_the_core_projection_checkpoint_manager.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.checkpoint_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_beginning_to_load_state_the_core_projection_checkpoint_manager<TLogFormat, TStreamId> :
-		TestFixtureWithCoreProjectionCheckpointManager<TLogFormat, TStreamId> {
-		private Exception _exception;
-
-		protected override void When() {
-			base.When();
-			_exception = null;
-			try {
-				_checkpointReader.BeginLoadState();
-			} catch (Exception ex) {
-				_exception = ex;
-			}
-		}
-
-		[Test]
-		public void it_can_be_invoked() {
-			Assert.IsNull(_exception);
-		}
-
-		[Test]
-		public void start_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => { _checkpointReader.BeginLoadState(); });
-		}
-
-		[Test]
-		public void stopping_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => { _manager.Stopping(); });
-		}
-
-		[Test]
-		public void stopped_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => { _manager.Stopped(); });
-		}
-
-		[Test]
-		public void event_processed_throws_invalid_operation_exception() {
-//            _manager.StateUpdated("", @"{""state"":""state""}");
-			Assert.Throws<InvalidOperationException>(() => {
-				_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 10), 77.7f);
-			});
-		}
-
-		[Test]
-		public void checkpoint_suggested_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_manager.CheckpointSuggested(CheckpointTag.FromStreamPosition(0, "stream", 10), 77.7f);
-			});
-		}
-
-		[Test]
-		public void ready_for_checkpoint_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_manager.Handle(new CoreProjectionProcessingMessage.ReadyForCheckpoint(null));
-			});
-		}
-
-		[Test]
-		public void can_be_started() {
-			_manager.Start(CheckpointTag.FromStreamPosition(0, "stream", 10), null);
-		}
-
-		[Test]
-		public void cannot_be_started_from_incompatible_checkpoint_tag() {
-			//TODO: move to when loaded
-			Assert.Throws<InvalidOperationException>(() => {
-				_manager.Start(CheckpointTag.FromStreamPosition(0, "stream1", 10), null);
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_creating_a_default_checkpoint_manager.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_creating_a_default_checkpoint_manager.cs
deleted file mode 100644
index 3b76ef8e6e5..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_creating_a_default_checkpoint_manager.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using System;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.checkpoint_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_creating_a_default_checkpoint_manager<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionCheckpointManager<TLogFormat, TStreamId> {
-		private CoreProjectionCheckpointWriter _coreProjectionCheckpointWriter;
-
-		protected override void When() {
-			// do not create
-			_coreProjectionCheckpointWriter =
-				new CoreProjectionCheckpointWriter(
-					_namingBuilder.MakeCheckpointStreamName(), _ioDispatcher, _projectionVersion, _projectionName);
-			_namingBuilder = ProjectionNamesBuilder.CreateForTest("projection");
-		}
-
-		[Test]
-		public void it_can_be_created() {
-			_manager = new DefaultCheckpointManager(
-				_bus, _projectionCorrelationId, new ProjectionVersion(1, 0, 0), null, _ioDispatcher, _config,
-				"projection", new StreamPositionTagger(0, "stream"), _namingBuilder, _checkpointsEnabled,
-				_producesResults, _definesFold, _coreProjectionCheckpointWriter);
-		}
-
-		[Test]
-		public void null_publisher_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				_manager = new DefaultCheckpointManager(
-					null, _projectionCorrelationId, new ProjectionVersion(1, 0, 0), null, _ioDispatcher, _config,
-					"projection", new StreamPositionTagger(0, "stream"), _namingBuilder, _checkpointsEnabled,
-					_producesResults, _definesFold, _coreProjectionCheckpointWriter);
-			});
-		}
-
-		[Test]
-		public void null_io_dispatcher_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				_manager = new DefaultCheckpointManager(
-					_bus, _projectionCorrelationId, new ProjectionVersion(1, 0, 0), null, null, _config, "projection",
-					new StreamPositionTagger(0, "stream"), _namingBuilder, _checkpointsEnabled, _producesResults,
-					_definesFold, _coreProjectionCheckpointWriter);
-			});
-		}
-
-		[Test]
-		public void null_projection_config_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				_manager = new DefaultCheckpointManager(
-					_bus, _projectionCorrelationId, new ProjectionVersion(1, 0, 0), null, _ioDispatcher, null,
-					"projection",
-					new StreamPositionTagger(0, "stream"), _namingBuilder, _checkpointsEnabled, _producesResults,
-					_definesFold, _coreProjectionCheckpointWriter);
-			});
-		}
-
-		[Test]
-		public void null_projection_name_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				_manager = new DefaultCheckpointManager(
-					_bus, _projectionCorrelationId, new ProjectionVersion(1, 0, 0), null, _ioDispatcher, _config, null,
-					new StreamPositionTagger(0, "stream"), _namingBuilder, _checkpointsEnabled, _producesResults,
-					_definesFold, _coreProjectionCheckpointWriter);
-			});
-		}
-
-		[Test]
-		public void null_position_tagger_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				_manager = new DefaultCheckpointManager(
-					_bus, _projectionCorrelationId, new ProjectionVersion(1, 0, 0), null, _ioDispatcher, _config,
-					"projection", null, _namingBuilder, _checkpointsEnabled, _producesResults,
-					_definesFold, _coreProjectionCheckpointWriter);
-			});
-		}
-
-		[Test]
-		public void empty_projection_checkpoint_stream_id_throws_argument_exception() {
-			Assert.Throws<ArgumentException>(() => {
-				_manager = new DefaultCheckpointManager(
-					_bus, _projectionCorrelationId, new ProjectionVersion(1, 0, 0), null, _ioDispatcher, _config, "",
-					new StreamPositionTagger(0, "stream"), _namingBuilder, _checkpointsEnabled, _producesResults,
-					_definesFold, _coreProjectionCheckpointWriter);
-			});
-		}
-
-		[Test]
-		public void empty_projection_name_throws_argument_exception() {
-			Assert.Throws<ArgumentException>(() => {
-				_manager = new DefaultCheckpointManager(
-					_bus, _projectionCorrelationId, new ProjectionVersion(1, 0, 0), null, _ioDispatcher, _config, "",
-					new StreamPositionTagger(0, "stream"), _namingBuilder, _checkpointsEnabled, _producesResults,
-					_definesFold, _coreProjectionCheckpointWriter);
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_multiple_event_processed_received_the_core_projection_checkpoint_manager.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_multiple_event_processed_received_the_core_projection_checkpoint_manager.cs
deleted file mode 100644
index af51b88ba9e..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_multiple_event_processed_received_the_core_projection_checkpoint_manager.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.checkpoint_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_multiple_event_processed_received_the_core_projection_checkpoint_manager<TLogFormat, TStreamId> :
-		TestFixtureWithCoreProjectionCheckpointManager<TLogFormat, TStreamId> {
-		private Exception _exception;
-
-		protected override void Given() {
-			AllWritesSucceed();
-			base.Given();
-			this._checkpointHandledThreshold = 2;
-		}
-
-		protected override void When() {
-			base.When();
-			_exception = null;
-			try {
-				_checkpointReader.BeginLoadState();
-				var checkpointLoaded =
-					_consumer.HandledMessages.OfType<CoreProjectionProcessingMessage.CheckpointLoaded>().First();
-				_checkpointWriter.StartFrom(checkpointLoaded.CheckpointTag, checkpointLoaded.CheckpointEventNumber);
-				_manager.BeginLoadPrerecordedEvents(checkpointLoaded.CheckpointTag);
-
-				_manager.Start(CheckpointTag.FromStreamPosition(0, "stream", 10), null);
-//                _manager.StateUpdated("", @"{""state"":""state1""}");
-				_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 11), 77.7f);
-//                _manager.StateUpdated("", @"{""state"":""state2""}");
-				_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 12), 77.7f);
-			} catch (Exception ex) {
-				_exception = ex;
-			}
-		}
-
-		[Test]
-		public void messages_are_handled() {
-			Assert.IsNull(_exception);
-		}
-
-		[Test]
-		public void accepts_stopping() {
-			_manager.Stopping();
-		}
-
-		[Test]
-		public void accepts_stopped() {
-			_manager.Stopped();
-		}
-
-		[Test]
-		public void accepts_event_processed() {
-//            _manager.StateUpdated("", @"{""state"":""state""}");
-			_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 13), 77.7f);
-		}
-
-		[Test]
-		public void event_processed_at_the_start_position_throws_invalid_operation_exception() {
-//            _manager.StateUpdated("", @"{""state"":""state""}");
-			Assert.Throws<InvalidOperationException>(() => {
-				_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 10), 77.7f);
-			});
-		}
-
-		[Test]
-		public void accepts_checkpoint_suggested() {
-			_manager.CheckpointSuggested(CheckpointTag.FromStreamPosition(0, "stream", 13), 77.7f);
-		}
-
-		[Test]
-		public void checkpoint_suggested_at_the_start_position_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_manager.CheckpointSuggested(CheckpointTag.FromStreamPosition(0, "stream", 10), 77.7f);
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_starting_the_core_projection_checkpoint_manager.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_starting_the_core_projection_checkpoint_manager.cs
deleted file mode 100644
index 997ad14f825..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_starting_the_core_projection_checkpoint_manager.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.checkpoint_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_starting_the_core_projection_checkpoint_manager<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionCheckpointManager<TLogFormat, TStreamId> {
-		private Exception _exception;
-
-		protected override void Given() {
-			base.Given();
-			AllWritesSucceed();
-		}
-
-		protected override void When() {
-			base.When();
-			_exception = null;
-			try {
-				_checkpointReader.BeginLoadState();
-				var checkpointLoaded =
-					_consumer.HandledMessages.OfType<CoreProjectionProcessingMessage.CheckpointLoaded>().First();
-				_checkpointWriter.StartFrom(checkpointLoaded.CheckpointTag, checkpointLoaded.CheckpointEventNumber);
-				_manager.BeginLoadPrerecordedEvents(checkpointLoaded.CheckpointTag);
-
-				_manager.Start(CheckpointTag.FromStreamPosition(0, "stream", 10), null);
-			} catch (Exception ex) {
-				_exception = ex;
-			}
-		}
-
-		[Test]
-		public void it_can_be_started() {
-			Assert.IsNull(_exception);
-		}
-
-		[Test]
-		public void start_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_manager.Start(CheckpointTag.FromStreamPosition(0, "stream", 10), null);
-			});
-		}
-
-		[Test]
-		public void accepts_stopping() {
-			_manager.Stopping();
-		}
-
-		[Test]
-		public void accepts_stopped() {
-			_manager.Stopped();
-		}
-
-		[Test]
-		public void accepts_event_processed() {
-//            _manager.StateUpdated("", @"{""state"":""state""}");
-			_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 11), 77.7f);
-		}
-
-		[Test]
-		public void event_processed_at_the_start_position_throws_invalid_operation_exception() {
-//            _manager.StateUpdated("", @"{""state"":""state""}");
-			Assert.Throws<InvalidOperationException>(() => {
-				_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 10), 77.7f);
-			});
-		}
-
-		[Test]
-		public void accepts_checkpoint_suggested() {
-			_manager.CheckpointSuggested(CheckpointTag.FromStreamPosition(0, "stream", 11), 77.7f);
-			Assert.AreEqual(1, _projection._checkpointCompletedMessages.Count);
-		}
-
-		[Test]
-		public void accepts_checkpoint_suggested_even_at_the_start_position_but_does_not_complete_it() {
-			_manager.CheckpointSuggested(CheckpointTag.FromStreamPosition(0, "stream", 10), 77.7f);
-			Assert.AreEqual(0, _projection._checkpointCompletedMessages.Count);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_suggested.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_suggested.cs
deleted file mode 100644
index 9fa62c77fe8..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/checkpoint_suggested.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	public static class checkpoint_suggested {
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_the_checkpoint_is_suggested<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-			protected override void Given() {
-				_checkpointHandledThreshold = 10;
-				_checkpointUnhandledBytesThreshold = 41;
-				_configureBuilderByQuerySource = source => {
-					source.FromAll();
-					source.IncludeEvent("non-existing");
-				};
-				NoStream("$projections-projection-state");
-				NoStream("$projections-projection-order");
-				AllWritesToSucceed("$projections-projection-order");
-				NoStream("$projections-projection-checkpoint");
-				NoStream(FakeProjectionStateHandler._emit1StreamId);
-				AllWritesSucceed();
-			}
-
-			protected override void When() {
-				//projection subscribes here
-				_bus.Publish(
-					new EventReaderSubscriptionMessage.CheckpointSuggested(
-						_subscriptionId,
-						CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(140, 130),
-							new Dictionary<string, long> {{"non-existing", -1}}), 55.5f, 0));
-			}
-
-			[Test]
-			public void a_projection_checkpoint_event_is_published() {
-				// projection checkpoint is written even though no events are passing the projection event filter
-				Assert.AreEqual(
-					1,
-					_writeEventHandler.HandledMessages.Count(v =>
-						v.Events.Any(e => e.EventType == ProjectionEventTypes.ProjectionCheckpoint)));
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_the_second_checkpoint_is_suggested<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-			protected override void Given() {
-				_checkpointHandledThreshold = 10;
-				_checkpointUnhandledBytesThreshold = 41;
-				_configureBuilderByQuerySource = source => {
-					source.FromAll();
-					source.IncludeEvent("non-existing");
-				};
-				NoStream("$$$projections-projection-order");
-				NoStream("$projections-projection-order");
-				AllWritesToSucceed("$$$projections-projection-order");
-				AllWritesToSucceed("$projections-projection-order");
-
-				NoStream("$$$projections-projection-checkpoint");
-				NoStream("$projections-projection-checkpoint");
-				AllWritesToSucceed("$$$projections-projection-checkpoint");
-
-				NoStream(FakeProjectionStateHandler._emit1StreamId);
-				AllWritesQueueUp();
-			}
-
-			protected override void When() {
-				//projection subscribes here
-				_bus.Publish(
-					new EventReaderSubscriptionMessage.CheckpointSuggested(
-						_subscriptionId,
-						CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(140, 130),
-							new Dictionary<string, long> {{"non-existing", -1}}), 55.5f, 0));
-				_bus.Publish(
-					new EventReaderSubscriptionMessage.CheckpointSuggested(
-						_subscriptionId,
-						CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(160, 150),
-							new Dictionary<string, long> {{"non-existing", -1}}), 55.6f, 1));
-			}
-
-			[Test]
-			public void a_projection_checkpoint_event_is_published() {
-				// projection checkpoint is written even though no events are passing the projection event filter
-				Assert.AreEqual(
-					1,
-					_writeEventHandler.HandledMessages.Count(v =>
-						v.Events.Any(e => e.EventType == ProjectionEventTypes.ProjectionCheckpoint)));
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_the_second_checkpoint_is_suggested_and_write_succeeds<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-			protected override void Given() {
-				_checkpointHandledThreshold = 10;
-				_checkpointUnhandledBytesThreshold = 41;
-				_configureBuilderByQuerySource = source => {
-					source.FromAll();
-					source.IncludeEvent("non-existing");
-				};
-				NoStream("$projections-projection-state");
-				NoStream("$projections-projection-order");
-				AllWritesToSucceed("$projections-projection-order");
-				NoStream("$projections-projection-checkpoint");
-				NoStream(FakeProjectionStateHandler._emit1StreamId);
-				AllWritesSucceed();
-			}
-
-			protected override void When() {
-				//projection subscribes here
-				_bus.Publish(
-					new EventReaderSubscriptionMessage.CheckpointSuggested(
-						_subscriptionId,
-						CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(140, 130),
-							new Dictionary<string, long> {{"non-existing", -1}}), 55.5f, 0));
-				_bus.Publish(
-					new EventReaderSubscriptionMessage.CheckpointSuggested(
-						_subscriptionId,
-						CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(160, 150),
-							new Dictionary<string, long> {{"non-existing", -1}}), 55.6f, 1));
-			}
-
-			[Test]
-			public void a_projection_checkpoint_event_is_published() {
-				// projection checkpoint is written even though no events are passing the projection event filter
-				Assert.AreEqual(
-					2,
-					_writeEventHandler.HandledMessages.Count(v =>
-						v.Events.Any(e => e.EventType == ProjectionEventTypes.ProjectionCheckpoint)));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/multi_phase/specification_with_multi_phase_core_projection.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/multi_phase/specification_with_multi_phase_core_projection.cs
deleted file mode 100644
index 2256306c1f2..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/multi_phase/specification_with_multi_phase_core_projection.cs
+++ /dev/null
@@ -1,404 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Core.Services.TimerService;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using EventStore.Projections.Core.Services.Processing.Phases;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
-using Serilog;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.multi_phase {
-	abstract class specification_with_multi_phase_core_projection<TLogFormat, TStreamId> : TestFixtureWithCoreProjection<TLogFormat, TStreamId> {
-		private FakeCheckpointManager _phase1checkpointManager;
-		private FakeCheckpointManager _phase2checkpointManager;
-		private IEmittedStreamsTracker _emittedStreamsTracker;
-		private FakeProjectionProcessingPhase _phase1;
-		private FakeProjectionProcessingPhase _phase2;
-		private IReaderStrategy _phase1readerStrategy;
-		private IReaderStrategy _phase2readerStrategy;
-
-		class FakeProjectionProcessingStrategy : ProjectionProcessingStrategy {
-			private readonly FakeProjectionProcessingPhase _phase1;
-			private readonly FakeProjectionProcessingPhase _phase2;
-
-			public FakeProjectionProcessingStrategy(
-				string name, ProjectionVersion projectionVersion, ILogger logger, FakeProjectionProcessingPhase phase1,
-				FakeProjectionProcessingPhase phase2)
-				: base(name, projectionVersion, logger) {
-				_phase1 = phase1;
-				_phase2 = phase2;
-			}
-
-			protected override IQuerySources GetSourceDefinition() {
-				return new QuerySourcesDefinition {
-					AllStreams = true,
-					AllEvents = true,
-					ByStreams = true,
-					Options = new QuerySourcesDefinitionOptions()
-				};
-			}
-
-			public override bool GetStopOnEof() {
-				return true;
-			}
-
-			public override bool GetUseCheckpoints() {
-				return false;
-			}
-
-			public override bool GetRequiresRootPartition() {
-				return false;
-			}
-
-			public override bool GetProducesRunningResults() {
-				return true;
-			}
-
-			public override void EnrichStatistics(ProjectionStatistics info) {
-			}
-
-			public override IProjectionProcessingPhase[] CreateProcessingPhases(
-				IPublisher publisher,
-				IPublisher inputQueue,
-				Guid projectionCorrelationId,
-				PartitionStateCache partitionStateCache,
-				Action updateStatistics,
-				CoreProjection coreProjection,
-				ProjectionNamesBuilder namingBuilder,
-				ITimeProvider timeProvider,
-				IODispatcher ioDispatcher,
-				CoreProjectionCheckpointWriter coreProjectionCheckpointWriter) {
-				return new IProjectionProcessingPhase[] {_phase1, _phase2};
-			}
-		}
-
-		internal class FakeProjectionProcessingPhase : IProjectionProcessingPhase {
-			private readonly int _phase;
-			private readonly specification_with_multi_phase_core_projection<TLogFormat, TStreamId> _specification;
-			private readonly ICoreProjectionCheckpointManager _checkpointManager;
-			private readonly IEmittedStreamsTracker _emittedStreamsTracker;
-			private readonly IReaderStrategy _readerStrategy;
-
-			private bool _initializedFromCheckpoint;
-			private CheckpointTag _initializedFromCheckpointAt;
-			private PhaseState _state;
-			private Guid _subscriptionId;
-			private int _subscribeInvoked;
-
-			public FakeProjectionProcessingPhase(int phase,
-				specification_with_multi_phase_core_projection<TLogFormat, TStreamId> specification,
-				ICoreProjectionCheckpointManager checkpointManager, IReaderStrategy readerStrategy,
-				IEmittedStreamsTracker emittedStreamsTracker) {
-				_phase = phase;
-				_specification = specification;
-				_checkpointManager = checkpointManager;
-				_readerStrategy = readerStrategy;
-				_emittedStreamsTracker = emittedStreamsTracker;
-			}
-
-			public void Dispose() {
-				throw new NotImplementedException();
-			}
-
-			public void Handle(CoreProjectionManagementMessage.GetState message) {
-				throw new NotImplementedException();
-			}
-
-			public void Handle(CoreProjectionManagementMessage.GetResult message) {
-				throw new NotImplementedException();
-			}
-
-			public void Handle(CoreProjectionProcessingMessage.PrerecordedEventsLoaded message) {
-				throw new NotImplementedException();
-			}
-
-			public CheckpointTag AdjustTag(CheckpointTag tag) {
-				return tag;
-			}
-
-			public void InitializeFromCheckpoint(CheckpointTag checkpointTag) {
-				_initializedFromCheckpoint = true;
-				_initializedFromCheckpointAt = checkpointTag;
-			}
-
-			public void SetProjectionState(PhaseState state) {
-				_state = state;
-			}
-
-			public void ProcessEvent() {
-				ProcessEventInvoked++;
-			}
-
-			public void Subscribe(CheckpointTag from, bool fromCheckpoint) {
-				_subscribeInvoked++;
-				_subscriptionId = Guid.NewGuid();
-				_specification._coreProjection.Subscribed();
-			}
-
-			public void EnsureUnsubscribed() {
-				throw new NotImplementedException();
-			}
-
-			public CheckpointTag MakeZeroCheckpointTag() {
-				return CheckpointTag.FromPhase(_phase, completed: false);
-			}
-
-			public ICoreProjectionCheckpointManager CheckpointManager {
-				get { return _checkpointManager; }
-			}
-
-			public IEmittedStreamsTracker EmittedStreamsTracker {
-				get { return _emittedStreamsTracker; }
-			}
-
-			public IReaderStrategy ReaderStrategy {
-				get { return _readerStrategy; }
-			}
-
-			public bool InitializedFromCheckpoint {
-				get { return _initializedFromCheckpoint; }
-			}
-
-			public CheckpointTag InitializedFromCheckpointAt {
-				get { return _initializedFromCheckpointAt; }
-			}
-
-			public PhaseState State {
-				get { return _state; }
-			}
-
-			public Guid SubscriptionId {
-				get { return _subscriptionId; }
-			}
-
-			public bool Unsubscribed_ {
-				get { return false; }
-			}
-
-			public int ProcessEventInvoked { get; set; }
-
-			public int SubscribeInvoked {
-				get { return _subscribeInvoked; }
-				set { _subscribeInvoked = value; }
-			}
-
-			public void GetStatistics(ProjectionStatistics info) {
-			}
-
-			public void Complete() {
-				_specification._coreProjection.CompletePhase();
-			}
-		}
-
-		internal class FakeCheckpointManager : ICoreProjectionCheckpointManager, IEmittedEventWriter {
-			private readonly IPublisher _publisher;
-			private readonly Guid _projectionCorrelationId;
-
-			private bool _started;
-			private CheckpointTag _startedAt;
-			private CheckpointTag _lastEvent;
-			private float _progress;
-			private bool _stopped;
-			private bool _stopping;
-			private readonly List<EmittedEventEnvelope> _emittedEvents = new List<EmittedEventEnvelope>();
-
-			public FakeCheckpointManager(IPublisher publisher, Guid projectionCorrelationId) {
-				_publisher = publisher;
-				_projectionCorrelationId = projectionCorrelationId;
-			}
-
-			public void Initialize() {
-			}
-
-			public void Start(CheckpointTag checkpointTag, PartitionState rootPartitionState) {
-				_started = true;
-				_startedAt = checkpointTag;
-				_lastEvent = checkpointTag;
-			}
-
-			public void Stopping() {
-				_stopping = true;
-				_publisher.Publish(
-					new CoreProjectionProcessingMessage.CheckpointCompleted(_projectionCorrelationId, _lastEvent));
-			}
-
-			public void Stopped() {
-				_stopped = true;
-			}
-
-			public void GetStatistics(ProjectionStatistics info) {
-			}
-
-			public void NewPartition(string partition, CheckpointTag eventCheckpointTag) {
-				throw new NotImplementedException();
-			}
-
-			public void EventsEmitted(
-				EmittedEventEnvelope[] scheduledWrites, Guid causedBy, string correlationId) {
-				EmittedEvents.AddRange(scheduledWrites);
-			}
-
-			public void StateUpdated(string partition, PartitionState oldState, PartitionState newState) {
-				throw new NotImplementedException();
-			}
-
-			public void PartitionCompleted(string partition) {
-			}
-
-			public void EventProcessed(CheckpointTag checkpointTag, float progress) {
-				_lastEvent = checkpointTag;
-			}
-
-			public bool CheckpointSuggested(CheckpointTag checkpointTag, float progress) {
-				throw new NotImplementedException();
-			}
-
-			public void Progress(float progress) {
-				_progress = progress;
-			}
-
-			public void BeginLoadState() {
-				_publisher.Publish(
-					new CoreProjectionProcessingMessage.CheckpointLoaded(
-						_projectionCorrelationId, CheckpointTag.FromPosition(0, 0, -1), "", 0));
-			}
-
-			public void BeginLoadPrerecordedEvents(CheckpointTag checkpointTag) {
-				_publisher.Publish(
-					new CoreProjectionProcessingMessage.PrerecordedEventsLoaded(_projectionCorrelationId,
-						checkpointTag));
-			}
-
-			public void BeginLoadPartitionStateAt(string statePartition, CheckpointTag requestedStateCheckpointTag,
-				Action<PartitionState> loadCompleted) {
-				throw new NotImplementedException();
-			}
-
-			public void RecordEventOrder(ResolvedEvent resolvedEvent, CheckpointTag orderCheckpointTag,
-				Action committed) {
-				throw new NotImplementedException();
-			}
-
-			public CheckpointTag LastProcessedEventPosition {
-				get { return _lastEvent; }
-			}
-
-			public bool Started {
-				get { return _started; }
-			}
-
-			public CheckpointTag StartedAt {
-				get { return _startedAt; }
-			}
-
-			public float Progress_ {
-				get { return _progress; }
-			}
-
-			public bool Stopped_ {
-				get { return _stopped; }
-			}
-
-			public bool Stopping_ {
-				get { return _stopping; }
-			}
-
-			public List<EmittedEventEnvelope> EmittedEvents {
-				get { return _emittedEvents; }
-			}
-		}
-
-		protected class FakeReaderStrategy : IReaderStrategy {
-			private readonly int _phase;
-
-			public FakeReaderStrategy(int phase) {
-				_phase = phase;
-			}
-
-			public bool IsReadingOrderRepeatable {
-				get { throw new NotImplementedException(); }
-			}
-
-			public EventFilter EventFilter {
-				get { throw new NotImplementedException(); }
-			}
-
-			public PositionTagger PositionTagger {
-				get { return new TransactionFilePositionTagger(Phase); }
-			}
-
-			public int Phase {
-				get { return _phase; }
-			}
-
-			public IReaderSubscription CreateReaderSubscription(
-				IPublisher publisher, CheckpointTag fromCheckpointTag, Guid subscriptionId,
-				ReaderSubscriptionOptions readerSubscriptionOptions) {
-				throw new NotImplementedException();
-			}
-
-			public IEventReader CreatePausedEventReader(
-				Guid eventReaderId, IPublisher publisher, IODispatcher ioDispatcher, CheckpointTag checkpointTag,
-				bool stopOnEof, int? stopAfterNEvents) {
-				throw new NotImplementedException();
-			}
-		}
-
-		public class FakeEmittedStreamsTracker : IEmittedStreamsTracker {
-			public void Initialize() {
-			}
-
-			public void TrackEmittedStream(EmittedEvent[] emittedEvents) {
-			}
-		}
-
-		public FakeCheckpointManager Phase1CheckpointManager {
-			get { return _phase1checkpointManager; }
-		}
-
-		public FakeCheckpointManager Phase2CheckpointManager {
-			get { return _phase2checkpointManager; }
-		}
-
-
-		public FakeProjectionProcessingPhase Phase1 {
-			get { return _phase1; }
-		}
-
-		public FakeProjectionProcessingPhase Phase2 {
-			get { return _phase2; }
-		}
-
-		protected override ProjectionProcessingStrategy GivenProjectionProcessingStrategy() {
-			_phase1checkpointManager = new FakeCheckpointManager(_bus, _projectionCorrelationId);
-			_phase2checkpointManager = new FakeCheckpointManager(_bus, _projectionCorrelationId);
-			_emittedStreamsTracker = new FakeEmittedStreamsTracker();
-			_phase1readerStrategy = GivenPhase1ReaderStrategy();
-			_phase2readerStrategy = GivenPhase2ReaderStrategy();
-			_phase1 = new FakeProjectionProcessingPhase(0, this, Phase1CheckpointManager, _phase1readerStrategy,
-				_emittedStreamsTracker);
-			_phase2 = new FakeProjectionProcessingPhase(1, this, Phase2CheckpointManager, _phase2readerStrategy,
-				_emittedStreamsTracker);
-			return new FakeProjectionProcessingStrategy(
-				_projectionName, _version, Log.Logger, Phase1, Phase2);
-		}
-
-		protected virtual FakeReaderStrategy GivenPhase2ReaderStrategy() {
-			return new FakeReaderStrategy(1);
-		}
-
-		protected virtual FakeReaderStrategy GivenPhase1ReaderStrategy() {
-			return new FakeReaderStrategy(0);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/multi_phase/when_completing_phase1_of_a_multiphase_projection.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/multi_phase/when_completing_phase1_of_a_multiphase_projection.cs
deleted file mode 100644
index d69022d3937..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/multi_phase/when_completing_phase1_of_a_multiphase_projection.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Linq;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.multi_phase {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_completing_phase1_of_a_multiphase_projection<TLogFormat, TStreamId> : specification_with_multi_phase_core_projection<TLogFormat, TStreamId> {
-		protected override void When() {
-			_coreProjection.Start();
-			Phase1.Complete();
-		}
-
-		[Test]
-		public void stops_phase1_checkpoint_manager() {
-			Assert.IsTrue(Phase1CheckpointManager.Stopped_);
-		}
-
-		[Test]
-		public void initializes_phase2() {
-			Assert.IsTrue(Phase2.InitializedFromCheckpoint);
-		}
-
-		[Test]
-		public void updates_checkpoint_tag_phase() {
-			Assert.AreEqual(1, _coreProjection.LastProcessedEventPosition.Phase);
-		}
-
-		[Test]
-		public void publishes_subscribe_message() {
-			Assert.AreEqual(1, Phase2.SubscribeInvoked);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/multi_phase/when_creating_a_multi_phase_projection.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/multi_phase/when_creating_a_multi_phase_projection.cs
deleted file mode 100644
index 61dc603caec..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/multi_phase/when_creating_a_multi_phase_projection.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.multi_phase {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_creating_a_multi_phase_projection<TLogFormat, TStreamId> : specification_with_multi_phase_core_projection<TLogFormat, TStreamId> {
-		protected override void When() {
-		}
-
-		[Test]
-		public void it_is_created() {
-		}
-	}
-}
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.multi_phase {
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/multi_phase/when_starting_a_multi_phase_projection.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/multi_phase/when_starting_a_multi_phase_projection.cs
deleted file mode 100644
index e5109f151ea..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/multi_phase/when_starting_a_multi_phase_projection.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.multi_phase {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_starting_a_multi_phase_projection<TLogFormat, TStreamId> : specification_with_multi_phase_core_projection<TLogFormat, TStreamId> {
-		protected override void When() {
-			_coreProjection.Start();
-		}
-
-		[Test]
-		public void it_starts() {
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/multi_phase/when_starting_phase2_without_a_reader_strategy.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/multi_phase/when_starting_phase2_without_a_reader_strategy.cs
deleted file mode 100644
index e7a19f93767..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/multi_phase/when_starting_phase2_without_a_reader_strategy.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Linq;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.multi_phase {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_starting_phase2_without_a_reader_strategy<TLogFormat, TStreamId> : specification_with_multi_phase_core_projection<TLogFormat, TStreamId> {
-		protected override FakeReaderStrategy GivenPhase2ReaderStrategy() {
-			return null;
-		}
-
-		protected override void When() {
-			_coreProjection.Start();
-			Phase1.Complete();
-		}
-
-		[Test]
-		public void initializes_phase2() {
-			Assert.IsTrue(Phase2.InitializedFromCheckpoint);
-		}
-
-		[Test]
-		public void updates_checkpoint_tag_phase() {
-			Assert.AreEqual(1, _coreProjection.LastProcessedEventPosition.Phase);
-		}
-
-		[Test]
-		public void starts_processing_phase2() {
-			Assert.AreEqual(1, Phase2.ProcessEventInvoked);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/the_non_started_checkpoint.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/the_non_started_checkpoint.cs
deleted file mode 100644
index f00c9548d12..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/the_non_started_checkpoint.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.projection_checkpoint {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class the_non_started_checkpoint<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private ProjectionCheckpoint _checkpoint;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_checkpoint = new ProjectionCheckpoint(
-				_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
-				CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
-		}
-
-		[Test]
-		public void prepare_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_checkpoint.Prepare(CheckpointTag.FromPosition(0, 200, 150));
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/the_started_checkpoint_with_some_events_emitted.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/the_started_checkpoint_with_some_events_emitted.cs
deleted file mode 100644
index b38b9cd256e..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/the_started_checkpoint_with_some_events_emitted.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Bus.Helpers;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.projection_checkpoint {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class the_started_checkpoint_with_some_events_emitted<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private ProjectionCheckpoint _checkpoint;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			;
-			_checkpoint = new ProjectionCheckpoint(
-				_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
-				CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
-			_checkpoint.Start();
-			_checkpoint.ValidateOrderAndEmitEvents(
-				new[] {
-					new EmittedEventEnvelope(new EmittedDataEvent(
-						"stream2", Guid.NewGuid(), "type", true, "data2", null, CheckpointTag.FromPosition(0, 120, 110),
-						null)),
-					new EmittedEventEnvelope(new EmittedDataEvent(
-						"stream2", Guid.NewGuid(), "type", true, "data4", null, CheckpointTag.FromPosition(0, 120, 110),
-						null)),
-				});
-			_checkpoint.ValidateOrderAndEmitEvents(
-				new[] {
-					new EmittedEventEnvelope(new EmittedDataEvent(
-						"stream1", Guid.NewGuid(), "type", true, "data", null, CheckpointTag.FromPosition(0, 140, 130),
-						null))
-				});
-			_checkpoint.ValidateOrderAndEmitEvents(
-				new[] {
-					new EmittedEventEnvelope(new EmittedDataEvent(
-						"stream1", Guid.NewGuid(), "type", true, "data", null, CheckpointTag.FromPosition(0, 160, 150),
-						null))
-				});
-		}
-
-		[Test]
-		public void requesting_checkpoints_with_position_before_the_last_known_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_checkpoint.Prepare(CheckpointTag.FromPosition(0, 140, 130));
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_creating_a_projection_checkpoint.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_creating_a_projection_checkpoint.cs
deleted file mode 100644
index 73af15ecd45..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_creating_a_projection_checkpoint.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.projection_checkpoint {
-	[TestFixture]
-	public class when_creating_a_projection_checkpoint {
-		private FakePublisher _fakePublisher;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-		private IODispatcher _ioDispatcher;
-
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_fakePublisher = new FakePublisher();
-			_ioDispatcher = new IODispatcher(_fakePublisher, _fakePublisher, true);
-		}
-
-		[Test]
-		public void null_publisher_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				new ProjectionCheckpoint(
-					null, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
-					CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
-			});
-		}
-
-		[Test]
-		public void null_io_dispatcher_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				new ProjectionCheckpoint(
-					_fakePublisher, null, new ProjectionVersion(1, 0, 0), null, _readyHandler,
-					CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
-			});
-		}
-
-		[Test]
-		public void null_ready_handler_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				new ProjectionCheckpoint(
-					_fakePublisher, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, null,
-					CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
-			});
-		}
-
-		[Test]
-		public void commit_position_less_than_or_equal_to_prepare_position_throws_argument_exception() {
-			Assert.Throws<ArgumentException>(() => {
-				new ProjectionCheckpoint(
-					_fakePublisher, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
-					CheckpointTag.FromPosition(0, 100, 101), new TransactionFilePositionTagger(0), 250, 1);
-			});
-		}
-
-		[Test]
-		public void it_can_be_created() {
-			new ProjectionCheckpoint(
-				_fakePublisher, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
-				CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_before_from_position_the_projection_checkpoint.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_before_from_position_the_projection_checkpoint.cs
deleted file mode 100644
index 7f15dc62bab..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_before_from_position_the_projection_checkpoint.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.projection_checkpoint {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_emitting_events_before_from_position_the_projection_checkpoint<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private ProjectionCheckpoint _checkpoint;
-		private Exception _lastException;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_checkpoint = new ProjectionCheckpoint(
-				_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
-				CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
-			try {
-				_checkpoint.ValidateOrderAndEmitEvents(
-					new[] {
-						new EmittedEventEnvelope(
-							new EmittedDataEvent(
-								"stream1", Guid.NewGuid(), "type", true, "data", null,
-								CheckpointTag.FromPosition(0, 40, 30), null))
-					});
-			} catch (Exception ex) {
-				_lastException = ex;
-			}
-		}
-
-		[Test]
-		public void throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => {
-				if (_lastException != null) throw _lastException;
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_in_backward_order_to_the_same_stream_the_projection_checkpoint.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_in_backward_order_to_the_same_stream_the_projection_checkpoint.cs
deleted file mode 100644
index 08e237ac219..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_in_backward_order_to_the_same_stream_the_projection_checkpoint.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Bus.Helpers;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.projection_checkpoint {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_emitting_events_in_backward_order_to_the_same_stream_the_projection_checkpoint<TLogFormat, TStreamId> :
-			TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private ProjectionCheckpoint _checkpoint;
-		private Exception _lastException;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_checkpoint = new ProjectionCheckpoint(
-				_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
-				CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
-			try {
-				_checkpoint.ValidateOrderAndEmitEvents(
-					new[] {
-						new EmittedEventEnvelope(
-							new EmittedDataEvent(
-								"stream1", Guid.NewGuid(), "type", true, "data", null,
-								CheckpointTag.FromPosition(0, 140, 130), null))
-					});
-				_checkpoint.ValidateOrderAndEmitEvents(
-					new[] {
-						new EmittedEventEnvelope(
-							new EmittedDataEvent(
-								"stream1", Guid.NewGuid(), "type", true, "data2", null,
-								CheckpointTag.FromPosition(0, 120, 110), null))
-					});
-			} catch (Exception ex) {
-				_lastException = ex;
-			}
-		}
-
-		[Test]
-		public void throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => {
-				if (_lastException != null) throw _lastException;
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_in_correct_order_the_started_projection_checkpoint.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_in_correct_order_the_started_projection_checkpoint.cs
deleted file mode 100644
index 0e57b508e14..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_in_correct_order_the_started_projection_checkpoint.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Services;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.projection_checkpoint {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_emitting_events_in_correct_order_the_started_projection_checkpoint<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private ProjectionCheckpoint _checkpoint;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		protected override void Given() {
-			AllWritesQueueUp();
-			AllWritesToSucceed("$$stream1");
-			AllWritesToSucceed("$$stream2");
-			AllWritesToSucceed("$$stream3");
-			NoOtherStreams();
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_checkpoint = new ProjectionCheckpoint(
-				_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
-				CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
-			_checkpoint.Start();
-			_checkpoint.ValidateOrderAndEmitEvents(
-				new[] {
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream2", Guid.NewGuid(), "type1", true, "data2", null,
-							CheckpointTag.FromPosition(0, 120, 110), null)),
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream3", Guid.NewGuid(), "type2", true, "data3", null,
-							CheckpointTag.FromPosition(0, 120, 110), null)),
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream2", Guid.NewGuid(), "type3", true, "data4", null,
-							CheckpointTag.FromPosition(0, 120, 110), null)),
-				});
-			_checkpoint.ValidateOrderAndEmitEvents(
-				new[] {
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream1", Guid.NewGuid(), "type4", true, "data", null,
-							CheckpointTag.FromPosition(0, 140, 130), null))
-				});
-			OneWriteCompletes(); //stream2
-			OneWriteCompletes(); //stream3
-		}
-
-		[Test]
-		public void should_publish_write_events() {
-			var writeEvents =
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
-					.ExceptOfEventType(SystemEventTypes.StreamMetadata);
-			Assert.AreEqual(4, writeEvents.Count());
-		}
-
-		[Test]
-		public void should_publish_write_events_to_correct_streams() {
-			Assert.IsTrue(
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Any(v => v.EventStreamId == "stream1"));
-			Assert.IsTrue(
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Any(v => v.EventStreamId == "stream2"));
-			Assert.IsTrue(
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Any(v => v.EventStreamId == "stream3"));
-		}
-
-		[Test]
-		public void should_group_events_to_the_same_stream_caused_by_the_same_event() {
-			// this is important for the projection to be able to recover by CausedBy.  Unless we commit all the events
-			// to the stream in a single transaction we can get into situation when only part of events CausedBy the same event
-			// are present in a stream
-			Assert.AreEqual(
-				2,
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Single(v => v.EventStreamId == "stream2")
-					.Events.Length);
-		}
-
-		[Test]
-		public void should_not_write_a_second_group_until_the_first_write_completes() {
-			_checkpoint.ValidateOrderAndEmitEvents(
-				new[] {
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream1", Guid.NewGuid(), "type", true, "data", null,
-							CheckpointTag.FromPosition(0, 170, 160), null))
-				});
-			var writeRequests =
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Where(v => v.EventStreamId == "stream1");
-			var writeEvents = writeRequests.Single();
-			writeEvents.Envelope.ReplyWith(
-				new ClientMessage.WriteEventsCompleted(writeEvents.CorrelationId, 0, 0, -1, -1));
-			Assert.AreEqual(2, writeRequests.Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_the_non_started_checkpoint.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_the_non_started_checkpoint.cs
deleted file mode 100644
index e9e5d005888..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_the_non_started_checkpoint.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.projection_checkpoint {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_emitting_events_the_non_started_checkpoint<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private ProjectionCheckpoint _checkpoint;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_checkpoint = new ProjectionCheckpoint(
-				_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
-				CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
-			_checkpoint.ValidateOrderAndEmitEvents(
-				new[] {
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream2", Guid.NewGuid(), "type", true, "data2", null,
-							CheckpointTag.FromPosition(0, 120, 110), null)),
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream3", Guid.NewGuid(), "type", true, "data3", null,
-							CheckpointTag.FromPosition(0, 120, 110), null)),
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream2", Guid.NewGuid(), "type", true, "data4", null,
-							CheckpointTag.FromPosition(0, 120, 110), null)),
-				});
-			_checkpoint.ValidateOrderAndEmitEvents(
-				new[] {
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream1", Guid.NewGuid(), "type", true, "data", null,
-							CheckpointTag.FromPosition(0, 140, 130), null))
-				});
-		}
-
-		[Test]
-		public void does_not_publish_write_events() {
-			Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_with_maximum_allowed_writes_in_flight_set.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_with_maximum_allowed_writes_in_flight_set.cs
deleted file mode 100644
index 7e2637834ce..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_with_maximum_allowed_writes_in_flight_set.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-using System.Collections;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Common;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.projection_checkpoint {
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string), 1)]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), 1)]
-	[TestFixture(typeof(LogFormat.V2), typeof(string), 2)]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), 2)]
-	[TestFixture(typeof(LogFormat.V2), typeof(string), 3)]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), 3)]
-	public class when_emitting_events_with_maximum_allowed_writes_in_flight_set<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private ProjectionCheckpoint _checkpoint;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		private int _maximumNumberOfAllowedWritesInFlight;
-
-		public when_emitting_events_with_maximum_allowed_writes_in_flight_set(
-			int maximumNumberOfAllowedWritesInFlight) {
-			_maximumNumberOfAllowedWritesInFlight = maximumNumberOfAllowedWritesInFlight;
-		}
-
-		protected override void Given() {
-			AllWritesQueueUp();
-			AllWritesToSucceed("$$stream1");
-			AllWritesToSucceed("$$stream2");
-			AllWritesToSucceed("$$stream3");
-			NoOtherStreams();
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_checkpoint = new ProjectionCheckpoint(
-				_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
-				CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250,
-				_maximumNumberOfAllowedWritesInFlight);
-			_checkpoint.Start();
-			_checkpoint.ValidateOrderAndEmitEvents(
-				new[] {
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream1", Guid.NewGuid(), "type1", true, "data1", null,
-							CheckpointTag.FromPosition(0, 120, 110), null)),
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream2", Guid.NewGuid(), "type2", true, "data2", null,
-							CheckpointTag.FromPosition(0, 120, 110), null)),
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream3", Guid.NewGuid(), "type3", true, "data3", null,
-							CheckpointTag.FromPosition(0, 120, 110), null)),
-				});
-		}
-
-		[Test]
-		public void should_have_the_same_number_writes_in_flight_as_configured() {
-			var writeEvents =
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
-					.ExceptOfEventType(SystemEventTypes.StreamMetadata);
-			Assert.AreEqual(_maximumNumberOfAllowedWritesInFlight, writeEvents.Count());
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_emitting_events_with_maximum_allowed_writes_in_flight_set_to_unlimited<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private ProjectionCheckpoint _checkpoint;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		protected override void Given() {
-			AllWritesQueueUp();
-			AllWritesToSucceed("$$stream1");
-			AllWritesToSucceed("$$stream2");
-			AllWritesToSucceed("$$stream3");
-			NoOtherStreams();
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_checkpoint = new ProjectionCheckpoint(
-				_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
-				CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250,
-				AllowedWritesInFlight.Unbounded);
-			_checkpoint.Start();
-			_checkpoint.ValidateOrderAndEmitEvents(
-				new[] {
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream1", Guid.NewGuid(), "type1", true, "data1", null,
-							CheckpointTag.FromPosition(0, 120, 110), null)),
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream2", Guid.NewGuid(), "type2", true, "data2", null,
-							CheckpointTag.FromPosition(0, 120, 110), null)),
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream3", Guid.NewGuid(), "type3", true, "data3", null,
-							CheckpointTag.FromPosition(0, 120, 110), null)),
-				});
-		}
-
-		[Test]
-		public void should_have_as_many_writes_in_flight_as_requested() {
-			var writeEvents =
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
-					.ExceptOfEventType(SystemEventTypes.StreamMetadata);
-			Assert.AreEqual(3, writeEvents.Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_with_null_streamId.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_with_null_streamId.cs
deleted file mode 100644
index 05c222c6961..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_with_null_streamId.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.projection_checkpoint {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_emitting_events_with_null_streamId<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private ProjectionCheckpoint _checkpoint;
-		private Exception _lastException;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_checkpoint = new ProjectionCheckpoint(
-				_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
-				CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
-			try {
-				_checkpoint.ValidateOrderAndEmitEvents(
-					new[] {
-						new EmittedEventEnvelope(
-							new EmittedDataEvent(
-								null, Guid.NewGuid(), "type", true, "data", null, CheckpointTag.FromPosition(0, 40, 30),
-								null))
-					});
-			} catch (Exception ex) {
-				_lastException = ex;
-			}
-		}
-
-		[Test]
-		public void throws_invalid_operation_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				if (_lastException != null) throw _lastException;
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_handling_stream_awaiting_message.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_handling_stream_awaiting_message.cs
deleted file mode 100644
index 79fea47edca..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_handling_stream_awaiting_message.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Services.Replication;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.projection_checkpoint {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_stream_awaiting_message<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private ProjectionCheckpoint _checkpoint;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-		private FakeEnvelope _fakeEnvelope;
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_checkpoint = new ProjectionCheckpoint(
-				_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
-				CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
-
-			_fakeEnvelope = new FakeEnvelope();
-			_checkpoint.Handle(
-				new CoreProjectionProcessingMessage.EmittedStreamAwaiting("awaiting_stream", _fakeEnvelope));
-		}
-
-		[Test]
-		public void broadcasts_write_completed_to_awaiting_streams() {
-			_checkpoint.Handle(new CoreProjectionProcessingMessage.EmittedStreamWriteCompleted("completed_stream"));
-			Assert.AreEqual(1, _fakeEnvelope.Replies.Count);
-			Assert.IsInstanceOf<CoreProjectionProcessingMessage.EmittedStreamWriteCompleted>(_fakeEnvelope.Replies[0]);
-		}
-
-		[Test]
-		public void does_not_broadcast_second_write_completed_to_awaiting_streams() {
-			_checkpoint.Handle(new CoreProjectionProcessingMessage.EmittedStreamWriteCompleted("completed_stream1"));
-			_checkpoint.Handle(new CoreProjectionProcessingMessage.EmittedStreamWriteCompleted("completed_stream2"));
-			Assert.AreEqual(1, _fakeEnvelope.Replies.Count);
-			Assert.IsInstanceOf<CoreProjectionProcessingMessage.EmittedStreamWriteCompleted>(_fakeEnvelope.Replies[0]);
-			Assert.AreEqual("completed_stream1",
-				((CoreProjectionProcessingMessage.EmittedStreamWriteCompleted)_fakeEnvelope.Replies[0]).StreamId);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_requesting_checkpoint_after_all_writes_completed.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_requesting_checkpoint_after_all_writes_completed.cs
deleted file mode 100644
index 2a01d9d075f..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_requesting_checkpoint_after_all_writes_completed.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Bus.Helpers;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.projection_checkpoint {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_requesting_checkpoint_after_all_writes_completed<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private ProjectionCheckpoint _checkpoint;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		protected override void Given() {
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_checkpoint = new ProjectionCheckpoint(
-				_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
-				CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
-			_checkpoint.Start();
-			_checkpoint.ValidateOrderAndEmitEvents(
-				new[] {
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream2", Guid.NewGuid(), "type", true, "data2", null,
-							CheckpointTag.FromPosition(0, 120, 110), null)),
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream2", Guid.NewGuid(), "type", true, "data4", null,
-							CheckpointTag.FromPosition(0, 120, 110), null)),
-				});
-			_checkpoint.ValidateOrderAndEmitEvents(
-				new[] {
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream1", Guid.NewGuid(), "type", true, "data", null,
-							CheckpointTag.FromPosition(0, 140, 130), null))
-				});
-			var writes = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().ToArray();
-			writes[0].Envelope.ReplyWith(new ClientMessage.WriteEventsCompleted(writes[0].CorrelationId, 0, 0, -1, -1));
-			writes[1].Envelope.ReplyWith(new ClientMessage.WriteEventsCompleted(writes[1].CorrelationId, 0, 0, -1, -1));
-			_checkpoint.Prepare(CheckpointTag.FromPosition(0, 200, 150));
-			//TODO: test whether checkpoint does not allow positions before last emitted event caused by position
-		}
-
-		[Test]
-		public void ready_for_checkpoint_immediately() {
-			Assert.AreEqual(
-				1, _readyHandler.HandledMessages.OfType<CoreProjectionProcessingMessage.ReadyForCheckpoint>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_requesting_checkpoint_before_all_writes_completed.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_requesting_checkpoint_before_all_writes_completed.cs
deleted file mode 100644
index bbda4da0e6d..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_requesting_checkpoint_before_all_writes_completed.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Bus.Helpers;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.projection_checkpoint {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_requesting_checkpoint_before_all_writes_completed<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private ProjectionCheckpoint _checkpoint;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		protected override void Given() {
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_checkpoint = new ProjectionCheckpoint(
-				_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
-				CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
-			_checkpoint.Start();
-			_checkpoint.ValidateOrderAndEmitEvents(
-				new[] {
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream2", Guid.NewGuid(), "type", true, "data2", null,
-							CheckpointTag.FromPosition(0, 120, 110), null)),
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream2", Guid.NewGuid(), "type", true, "data4", null,
-							CheckpointTag.FromPosition(0, 120, 110), null)),
-				});
-			_checkpoint.ValidateOrderAndEmitEvents(
-				new[] {
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream1", Guid.NewGuid(), "type", true, "data", null,
-							CheckpointTag.FromPosition(0, 140, 130), null))
-				});
-			_checkpoint.ValidateOrderAndEmitEvents(
-				new[] {
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream1", Guid.NewGuid(), "type", true, "data", null,
-							CheckpointTag.FromPosition(0, 160, 150), null))
-				});
-			_checkpoint.Prepare(CheckpointTag.FromPosition(0, 200, 150));
-		}
-
-		[Test]
-		public void not_ready_for_checkpoint_immediately() {
-			Assert.AreEqual(0,
-				_consumer.HandledMessages.OfType<CoreProjectionProcessingMessage.ReadyForCheckpoint>().Count());
-		}
-
-		[Test]
-		public void ready_for_checkpoint_after_all_writes_complete() {
-			var writes = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().ToArray();
-			writes[0].Envelope.ReplyWith(new ClientMessage.WriteEventsCompleted(writes[0].CorrelationId, 0, 0, -1, -1));
-			writes[1].Envelope.ReplyWith(new ClientMessage.WriteEventsCompleted(writes[1].CorrelationId, 0, 0, -1, -1));
-			writes = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().ToArray();
-			writes[2].Envelope.ReplyWith(new ClientMessage.WriteEventsCompleted(writes[2].CorrelationId, 0, 0, -1, -1));
-
-			Assert.AreEqual(1,
-				_readyHandler.HandledMessages.OfType<CoreProjectionProcessingMessage.ReadyForCheckpoint>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_starting_the_projection_checkpoint_with_some_events_already_emitted.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_starting_the_projection_checkpoint_with_some_events_already_emitted.cs
deleted file mode 100644
index 54e8a0a2fce..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_starting_the_projection_checkpoint_with_some_events_already_emitted.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-using EventStore.Projections.Core.Common;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.projection_checkpoint {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_starting_the_projection_checkpoint_with_some_events_already_emitted<TLogFormat, TStreamId> :
-		TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private ProjectionCheckpoint _checkpoint;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		protected override void Given() {
-			NoStream("stream1");
-			NoStream("stream2");
-			NoStream("stream3");
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_checkpoint = new ProjectionCheckpoint(
-				_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
-				CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250,
-				AllowedWritesInFlight.Unbounded);
-			_checkpoint.ValidateOrderAndEmitEvents(
-				new[] {
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream2", Guid.NewGuid(), "type", true, "data2", null,
-							CheckpointTag.FromPosition(0, 120, 110), null)),
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream3", Guid.NewGuid(), "type", true, "data3", null,
-							CheckpointTag.FromPosition(0, 120, 110), null)),
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream2", Guid.NewGuid(), "type", true, "data4", null,
-							CheckpointTag.FromPosition(0, 120, 110), null)),
-				});
-			_checkpoint.ValidateOrderAndEmitEvents(
-				new[] {
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							"stream1", Guid.NewGuid(), "type", true, "data", null,
-							CheckpointTag.FromPosition(0, 140, 130), null))
-				});
-			_checkpoint.Start();
-		}
-
-		[Test]
-		public void should_publish_write_events() {
-			Assert.AreEqual(3, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_the_projection_checkpoint_has_been_started.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_the_projection_checkpoint_has_been_started.cs
deleted file mode 100644
index 739e643fb7f..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_the_projection_checkpoint_has_been_started.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.projection_checkpoint {
-	[TestFixture]
-	public class when_the_projection_checkpoint_has_been_started : TestFixtureWithReadWriteDispatchers {
-		private ProjectionCheckpoint _checkpoint;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_checkpoint = new ProjectionCheckpoint(
-				_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
-				CheckpointTag.FromPosition(0, 0, -1), new TransactionFilePositionTagger(0), 250, 1);
-			_checkpoint.Start();
-		}
-
-		[Test]
-		public void start_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => { _checkpoint.Start(); });
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint_reader/when_projection_reader_reads_successfully.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint_reader/when_projection_reader_reads_successfully.cs
deleted file mode 100644
index 95cf21e53c3..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint_reader/when_projection_reader_reads_successfully.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Threading;
-using EventStore.Core.Bus;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.projection_checkpoint_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_projection_reader_reads_successfully<TLogFormat, TStreamId> : with_projection_checkpoint_reader<TLogFormat, TStreamId>,
-		IHandle<CoreProjectionProcessingMessage.CheckpointLoaded> {
-		private ManualResetEventSlim _mre = new ManualResetEventSlim();
-		private CoreProjectionProcessingMessage.CheckpointLoaded _checkpointLoaded;
-
-		public override void When() {
-			_bus.Subscribe<CoreProjectionProcessingMessage.CheckpointLoaded>(this);
-
-			_reader.Initialize();
-			_reader.BeginLoadState();
-			if (!_mre.Wait(10000)) {
-				Assert.Fail("Timed out waiting for checkpoint to load");
-			}
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.CheckpointLoaded message) {
-			_checkpointLoaded = message;
-			_mre.Set();
-		}
-
-		[Test]
-		public void should_load_checkpoint() {
-			Assert.IsNotNull(_checkpointLoaded);
-			Assert.AreEqual(_checkpointLoaded.ProjectionId, _projectionId);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint_reader/when_projection_reader_times_out_on_read.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint_reader/when_projection_reader_times_out_on_read.cs
deleted file mode 100644
index fb40ee67240..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint_reader/when_projection_reader_times_out_on_read.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Helpers.IODispatcherTests;
-using EventStore.Projections.Core.Services;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.projection_checkpoint_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_projection_reader_times_out_on_read<TLogFormat, TStreamId> : with_projection_checkpoint_reader<TLogFormat, TStreamId>,
-		IHandle<CoreProjectionProcessingMessage.CheckpointLoaded>,
-		IHandle<TimerMessage.Schedule> {
-		private ManualResetEventSlim _mre = new ManualResetEventSlim();
-		private CoreProjectionProcessingMessage.CheckpointLoaded _checkpointLoaded;
-		private bool _hasTimedOut;
-		private Guid _timeoutCorrelationId;
-
-		public override void When() {
-			_bus.Subscribe<CoreProjectionProcessingMessage.CheckpointLoaded>(this);
-			_bus.Subscribe<TimerMessage.Schedule>(this);
-
-			_reader.Initialize();
-			_reader.BeginLoadState();
-			if (!_mre.Wait(10000)) {
-				Assert.Fail("Timed out waiting for checkpoint to load");
-			}
-		}
-
-		public override void Handle(ClientMessage.ReadStreamEventsBackward message) {
-			if (!_hasTimedOut) {
-				_timeoutCorrelationId = message.CorrelationId;
-				_hasTimedOut = true;
-				return;
-			}
-
-			var evnts = IODispatcherTestHelpers.CreateResolvedEvent<TLogFormat, TStreamId>(message.EventStreamId,
-				ProjectionEventTypes.ProjectionCheckpoint, "[]",
-				@"{
-                    ""$v"": ""1:-1:3:3"",
-                    ""$c"": 269728,
-                    ""$p"": 269728
-                }");
-			var reply = new ClientMessage.ReadStreamEventsBackwardCompleted(message.CorrelationId,
-				message.EventStreamId, message.FromEventNumber, message.MaxCount, ReadStreamResult.Success,
-				evnts, null, true, "", 0, 0, true, 10000);
-			message.Envelope.ReplyWith(reply);
-		}
-
-		public void Handle(TimerMessage.Schedule message) {
-			var delay = message.ReplyMessage as IODispatcherDelayedMessage;
-			if (delay != null && delay.MessageCorrelationId == _timeoutCorrelationId) {
-				message.Reply();
-			}
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.CheckpointLoaded message) {
-			_checkpointLoaded = message;
-			_mre.Set();
-		}
-
-		[Test]
-		public void should_load_checkpoint() {
-			Assert.IsNotNull(_checkpointLoaded);
-			Assert.AreEqual(_checkpointLoaded.ProjectionId, _projectionId);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint_reader/with_projection_checkpoint_reader.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint_reader/with_projection_checkpoint_reader.cs
deleted file mode 100644
index f6710c2b881..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/projection_checkpoint_reader/with_projection_checkpoint_reader.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Helpers.IODispatcherTests;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection.projection_checkpoint_reader {
-	public abstract class with_projection_checkpoint_reader<TLogFormat, TStreamId> : IHandle<ClientMessage.ReadStreamEventsBackward> {
-		protected readonly string _projectionCheckpointStreamId = "projection-checkpoint-stream";
-		protected readonly Guid _projectionId = Guid.NewGuid();
-
-		protected SynchronousScheduler _bus = new();
-		protected IODispatcher _ioDispatcher;
-		protected ProjectionVersion _projectionVersion;
-		protected CoreProjectionCheckpointReader _reader;
-
-		[OneTimeSetUp]
-		public void TestFixtureSetUp() {
-			_ioDispatcher = new IODispatcher(_bus, _bus, true);
-			IODispatcherTestHelpers.SubscribeIODispatcher(_ioDispatcher, _bus);
-			_bus.Subscribe<ClientMessage.ReadStreamEventsBackward>(this);
-			_projectionVersion = new ProjectionVersion(1, 2, 3);
-			_reader = new CoreProjectionCheckpointReader(_bus, _projectionId, _ioDispatcher,
-				_projectionCheckpointStreamId, _projectionVersion, true);
-			When();
-		}
-
-		public abstract void When();
-
-		public virtual void Handle(ClientMessage.ReadStreamEventsBackward message) {
-			var evnts = IODispatcherTestHelpers.CreateResolvedEvent<TLogFormat, TStreamId>(message.EventStreamId,
-				ProjectionEventTypes.ProjectionCheckpoint, "[]",
-				@"{
-                    ""$v"": ""1:-1:3:3"",
-                    ""$c"": 269728,
-                    ""$p"": 269728
-                }");
-			var reply = new ClientMessage.ReadStreamEventsBackwardCompleted(message.CorrelationId,
-				message.EventStreamId, message.FromEventNumber, message.MaxCount, ReadStreamResult.Success,
-				evnts, null, true, "", 0, 0, true, 10000);
-			message.Envelope.ReplyWith(reply);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_creating_a_new_partitiion_the_projection_should.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_creating_a_new_partitiion_the_projection_should.cs
deleted file mode 100644
index 5d74deb4187..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_creating_a_new_partitiion_the_projection_should.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_creating_a_new_partitiion_the_projection_should<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		private Guid _eventId;
-
-		protected override void Given() {
-			_configureBuilderByQuerySource = source => {
-				source.FromAll();
-				source.AllEvents();
-				source.SetByStream();
-				source.SetDefinesStateTransform();
-			};
-			TicksAreHandledImmediately();
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		protected override void When() {
-			//projection subscribes here
-			_eventId = Guid.NewGuid();
-			_consumer.HandledMessages.Clear();
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"account-01", -1, "account-01", -1, false, new TFPos(120, 110), _eventId, "handle_this_type",
-						false, "data", "metadata"), _subscriptionId, 0));
-		}
-
-		[Test]
-		public void passes_partition_created_notification_to_the_handler() {
-			Assert.AreEqual(1, _stateHandler._partitionCreatedProcessed);
-			Assert.Inconclusive();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_creating_a_projection.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_creating_a_projection.cs
deleted file mode 100644
index a542eb83780..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_creating_a_projection.cs
+++ /dev/null
@@ -1,310 +0,0 @@
-using System;
-using EventStore.Core.Helpers;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture]
-	public class when_creating_a_projection {
-		[SetUp]
-		public void Setup() {
-			var fakePublisher = new FakePublisher();
-			_ioDispatcher = new IODispatcher(fakePublisher, fakePublisher, true);
-
-			_subscriptionDispatcher = new ReaderSubscriptionDispatcher(new FakePublisher());
-		}
-
-		private readonly ProjectionConfig _defaultProjectionConfig = new ProjectionConfig(
-			null, 5, 10, 1000, 250, true, true, true, true, true, 10000, 1, null);
-
-		private IODispatcher _ioDispatcher;
-
-
-		private ReaderSubscriptionDispatcher _subscriptionDispatcher;
-
-		[Test]
-		public void
-			a_checkpoint_threshold_less_tan_checkpoint_handled_threshold_throws_argument_out_of_range_exception() {
-			Assert.Throws<ArgumentException>(() => {
-				IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
-				var version = new ProjectionVersion(1, 0, 0);
-				var projectionConfig = new ProjectionConfig(null, 10, 5, 1000, 250, true, true, false, false,
-					true, 10000, 1, null);
-				new ContinuousProjectionProcessingStrategy(
-					"projection",
-					version,
-					projectionStateHandler,
-					projectionConfig,
-					projectionStateHandler.GetSourceDefinition(),
-					null,
-					_subscriptionDispatcher,
-					true).Create(
-					Guid.NewGuid(),
-					new FakePublisher(),
-					Guid.NewGuid(),
-					SystemAccounts.System,
-					new FakePublisher(),
-					_ioDispatcher,
-					_subscriptionDispatcher,
-					new RealTimeProvider());
-			});
-		}
-
-		[Test]
-		public void a_negative_checkpoint_handled_interval_throws_argument_out_of_range_exception() {
-			Assert.Throws<ArgumentOutOfRangeException>(() => {
-				IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
-				var version = new ProjectionVersion(1, 0, 0);
-				var projectionConfig = new ProjectionConfig(null, -1, 10, 1000, 250, true, true, false, false,
-					true, 10000, 1, null);
-				new ContinuousProjectionProcessingStrategy(
-					"projection",
-					version,
-					projectionStateHandler,
-					projectionConfig,
-					projectionStateHandler.GetSourceDefinition(),
-					null,
-					_subscriptionDispatcher,
-					true).Create(
-					Guid.NewGuid(),
-					new FakePublisher(),
-					Guid.NewGuid(),
-					SystemAccounts.System,
-					new FakePublisher(),
-					_ioDispatcher,
-					_subscriptionDispatcher,
-					new RealTimeProvider());
-			});
-		}
-
-		[Test]
-		public void a_null_io_dispatcher__throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
-				var version = new ProjectionVersion(1, 0, 0);
-				new ContinuousProjectionProcessingStrategy(
-					"projection",
-					version,
-					projectionStateHandler,
-					_defaultProjectionConfig,
-					projectionStateHandler.GetSourceDefinition(),
-					null,
-					_subscriptionDispatcher,
-					true).Create(
-					Guid.NewGuid(),
-					new FakePublisher(),
-					Guid.NewGuid(),
-					SystemAccounts.System,
-					new FakePublisher(),
-					null,
-					_subscriptionDispatcher,
-					new RealTimeProvider());
-			});
-		}
-
-		[Test]
-		public void a_null_name_throws_argument_null_excveption() {
-			Assert.Throws<ArgumentNullException>(() => {
-				IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
-				var version = new ProjectionVersion(1, 0, 0);
-				new ContinuousProjectionProcessingStrategy(
-					null,
-					version,
-					projectionStateHandler,
-					_defaultProjectionConfig,
-					projectionStateHandler.GetSourceDefinition(),
-					null,
-					_subscriptionDispatcher,
-					true).Create(
-					Guid.NewGuid(),
-					new FakePublisher(),
-					Guid.NewGuid(),
-					SystemAccounts.System,
-					new FakePublisher(),
-					_ioDispatcher,
-					_subscriptionDispatcher,
-					new RealTimeProvider());
-			});
-		}
-
-		[Test]
-		public void a_null_publisher_throws_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
-				var version = new ProjectionVersion(1, 0, 0);
-				new ContinuousProjectionProcessingStrategy(
-					"projection",
-					version,
-					projectionStateHandler,
-					_defaultProjectionConfig,
-					projectionStateHandler.GetSourceDefinition(),
-					null,
-					_subscriptionDispatcher,
-					true).Create(
-					Guid.NewGuid(),
-					new FakePublisher(),
-					Guid.NewGuid(),
-					SystemAccounts.System,
-					null,
-					_ioDispatcher,
-					_subscriptionDispatcher,
-					new RealTimeProvider());
-			});
-		}
-
-		[Test]
-		public void a_null_input_queue_throws_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
-				var version = new ProjectionVersion(1, 0, 0);
-				new ContinuousProjectionProcessingStrategy(
-					"projection",
-					version,
-					projectionStateHandler,
-					_defaultProjectionConfig,
-					projectionStateHandler.GetSourceDefinition(),
-					null,
-					_subscriptionDispatcher,
-					true).Create(
-					Guid.NewGuid(),
-					null,
-					Guid.NewGuid(),
-					SystemAccounts.System,
-					new FakePublisher(),
-					_ioDispatcher,
-					_subscriptionDispatcher,
-					new RealTimeProvider());
-			});
-		}
-
-		[Test]
-		public void a_null_run_as_does_not_throw_exception() {
-			IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
-			var version = new ProjectionVersion(1, 0, 0);
-			new ContinuousProjectionProcessingStrategy(
-				"projection",
-				version,
-				projectionStateHandler,
-				_defaultProjectionConfig,
-				projectionStateHandler.GetSourceDefinition(),
-				null,
-				_subscriptionDispatcher,
-				true).Create(
-				Guid.NewGuid(),
-				new FakePublisher(),
-				Guid.NewGuid(),
-				null,
-				new FakePublisher(),
-				_ioDispatcher,
-				_subscriptionDispatcher,
-				new RealTimeProvider());
-		}
-
-		[Test]
-		public void a_null_subscription_dispatcher__throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
-				var version = new ProjectionVersion(1, 0, 0);
-				new ContinuousProjectionProcessingStrategy(
-					"projection",
-					version,
-					projectionStateHandler,
-					_defaultProjectionConfig,
-					projectionStateHandler.GetSourceDefinition(),
-					null,
-					_subscriptionDispatcher,
-					true).Create(
-					Guid.NewGuid(),
-					new FakePublisher(),
-					Guid.NewGuid(),
-					SystemAccounts.System,
-					new FakePublisher(),
-					_ioDispatcher,
-					null,
-					new RealTimeProvider());
-			});
-		}
-
-		[Test]
-		public void a_null_time_provider__throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
-				var version = new ProjectionVersion(1, 0, 0);
-				new ContinuousProjectionProcessingStrategy(
-					"projection",
-					version,
-					projectionStateHandler,
-					_defaultProjectionConfig,
-					projectionStateHandler.GetSourceDefinition(),
-					null,
-					_subscriptionDispatcher,
-					true).Create(
-					Guid.NewGuid(),
-					new FakePublisher(),
-					Guid.NewGuid(),
-					SystemAccounts.System,
-					new FakePublisher(),
-					_ioDispatcher,
-					_subscriptionDispatcher,
-					null);
-			});
-		}
-
-		[Test]
-		public void a_zero_checkpoint_handled_threshold_throws_argument_out_of_range_exception() {
-			Assert.Throws<ArgumentOutOfRangeException>(() => {
-				IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
-				var version = new ProjectionVersion(1, 0, 0);
-				var projectionConfig = new ProjectionConfig(null, 0, 10, 1000, 250, true, true, false, false,
-					true, 10000, 1, null);
-				new ContinuousProjectionProcessingStrategy(
-					"projection",
-					version,
-					projectionStateHandler,
-					projectionConfig,
-					projectionStateHandler.GetSourceDefinition(),
-					null,
-					_subscriptionDispatcher,
-					true).Create(
-					Guid.NewGuid(),
-					new FakePublisher(),
-					Guid.NewGuid(),
-					SystemAccounts.System,
-					new FakePublisher(),
-					_ioDispatcher,
-					_subscriptionDispatcher,
-					new RealTimeProvider());
-			});
-		}
-
-		[Test]
-		public void an_empty_name_throws_argument_exception() {
-			Assert.Throws<ArgumentException>(() => {
-				IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
-				var version = new ProjectionVersion(1, 0, 0);
-				new ContinuousProjectionProcessingStrategy(
-					"",
-					version,
-					projectionStateHandler,
-					_defaultProjectionConfig,
-					projectionStateHandler.GetSourceDefinition(),
-					null,
-					_subscriptionDispatcher,
-					true).Create(
-					Guid.NewGuid(),
-					new FakePublisher(),
-					Guid.NewGuid(),
-					SystemAccounts.System,
-					new FakePublisher(),
-					_ioDispatcher,
-					_subscriptionDispatcher,
-					new RealTimeProvider());
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_killing_a_projection_and_an_event_is_received.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_killing_a_projection_and_an_event_is_received.cs
deleted file mode 100644
index b937275986a..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_killing_a_projection_and_an_event_is_received.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-using EventStore.Projections.Core.Services;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_killing_a_projection_and_an_event_is_received<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		private Guid _lastEventIdBeforeKill;
-
-		protected override void Given() {
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		protected override void When() {
-			//receive first event
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110), Guid.NewGuid(),
-						"handle_this_type", false, "data1", "metadata"), _subscriptionId, 0));
-
-			//receive second event
-			_lastEventIdBeforeKill = Guid.NewGuid();
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(140, 130),
-						_lastEventIdBeforeKill,
-						"handle_this_type", false, "data2", "metadata"), _subscriptionId, 1));
-
-			//kill the projection
-			_coreProjection.Kill();
-
-			//receive third event
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(160, 150), Guid.NewGuid(),
-						"handle_this_type", false, "data3", "metadata"), _subscriptionId, 2));
-		}
-
-		[Test]
-		public void event_received_after_kill_is_not_processed() {
-			Assert.AreEqual(2, _stateHandler._eventsProcessed);
-			Assert.AreEqual(_lastEventIdBeforeKill, _stateHandler._lastProcessedEventId);
-			Assert.AreEqual("data2", _stateHandler._lastProcessedData);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_loading_a_new_projection.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_loading_a_new_projection.cs
deleted file mode 100644
index 5bd39078bd6..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_loading_a_new_projection.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Linq;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_loading_a_new_projection<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionLoaded<TLogFormat, TStreamId> {
-		protected override void Given() {
-			NoStream("$projections-projection-result");
-			NoStream("$projections-projection-order");
-			AllWritesToSucceed("$projections-projection-order");
-			NoStream("$projections-projection-checkpoint");
-		}
-
-		protected override void When() {
-		}
-
-		[Test]
-		public void should_not_subscribe() {
-			Assert.AreEqual(0, _subscribeProjectionHandler.HandledMessages.Count);
-		}
-
-		[Test]
-		public void should_not_initialize_projection_state_handler() {
-			Assert.AreEqual(0, _stateHandler._initializeCalled);
-		}
-
-		[Test]
-		public void should_not_publish_started_message() {
-			Assert.AreEqual(0, _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Started>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_loading_an_existing_projection.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_loading_an_existing_projection.cs
deleted file mode 100644
index 714a49c9847..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_loading_an_existing_projection.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_loading_an_existing_projection<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionLoaded<TLogFormat, TStreamId> {
-		private string _testProjectionState = @"{""test"":1}";
-
-		protected override void Given() {
-			ExistingEvent(
-				"$projections-projection-result", "Result",
-				@"{""c"": 100, ""p"": 50}", _testProjectionState);
-			ExistingEvent(
-				"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
-				@"{""c"": 100, ""p"": 50}", _testProjectionState);
-			ExistingEvent(
-				"$projections-projection-result", "Result",
-				@"{""c"": 200, ""p"": 150}", _testProjectionState);
-			ExistingEvent(
-				"$projections-projection-result", "Result",
-				@"{""c"": 300, ""p"": 250}", _testProjectionState);
-		}
-
-		protected override void When() {
-		}
-
-
-		[Test]
-		public void should_not_subscribe() {
-			Assert.AreEqual(0, _subscribeProjectionHandler.HandledMessages.Count);
-		}
-
-		[Test]
-		public void should_not_load_projection_state_handler() {
-			Assert.AreEqual(0, _stateHandler._loadCalled);
-		}
-
-		[Test]
-		public void should_not_publish_started_message() {
-			Assert.AreEqual(0, _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Started>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_receiving_a_committed_event_the_projection_should.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_receiving_a_committed_event_the_projection_should.cs
deleted file mode 100644
index 1c854ab7f09..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_receiving_a_committed_event_the_projection_should.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.Text;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Core.Util;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_receiving_a_committed_event_the_projection_should<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		private Guid _eventId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		protected override void When() {
-			//projection subscribes here
-			_eventId = Guid.NewGuid();
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110), _eventId,
-						"handle_this_type", false, "data", "metadata"), _subscriptionId, 0));
-		}
-
-		[Test]
-		public void update_state_snapshot_at_correct_position() {
-			Assert.AreEqual(1, _writeEventHandler.HandledMessages.OfEventType("Result").Count);
-
-			var metedata =
-				_writeEventHandler.HandledMessages.OfEventType("Result")[0].Metadata
-					.ParseCheckpointTagVersionExtraJson(default(ProjectionVersion));
-
-			Assert.AreEqual(120, metedata.Tag.CommitPosition);
-			Assert.AreEqual(110, metedata.Tag.PreparePosition);
-		}
-
-		[Test]
-		public void pass_event_to_state_handler() {
-			Assert.AreEqual(1, _stateHandler._eventsProcessed);
-			Assert.AreEqual("/event_category/1", _stateHandler._lastProcessedStreamId);
-			Assert.AreEqual("handle_this_type", _stateHandler._lastProcessedEventType);
-			Assert.AreEqual(_eventId, _stateHandler._lastProcessedEventId);
-			//TODO: support sequence numbers here
-			Assert.AreEqual("metadata", _stateHandler._lastProcessedMetadata);
-			Assert.AreEqual("data", _stateHandler._lastProcessedData);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_receiving_a_committed_event_the_projection_with_partitioned_state_by_custom_rule_should.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_receiving_a_committed_event_the_projection_with_partitioned_state_by_custom_rule_should.cs
deleted file mode 100644
index 56b3af48fcd..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_receiving_a_committed_event_the_projection_with_partitioned_state_by_custom_rule_should.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_receiving_a_committed_event_the_projection_with_partitioned_state_by_custom_rule_should<TLogFormat, TStreamId> :
-		TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		private Guid _eventId;
-
-		protected override void Given() {
-			_configureBuilderByQuerySource = source => {
-				source.FromAll();
-				source.AllEvents();
-				source.SetByCustomPartitions();
-				source.SetDefinesStateTransform();
-				source.SetOutputState();
-			};
-			TicksAreHandledImmediately();
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		protected override FakeProjectionStateHandler GivenProjectionStateHandler() {
-			return new FakeProjectionStateHandler(
-				configureBuilder: _configureBuilderByQuerySource, failOnGetPartition: false);
-		}
-
-		protected override void When() {
-			//projection subscribes here
-			_eventId = Guid.NewGuid();
-			_consumer.HandledMessages.Clear();
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"account-01", -1, "account-01", -1, false, new TFPos(120, 110), _eventId,
-						"handle_this_type", false, "data", "metadata"), _subscriptionId, 0));
-		}
-
-		[Test]
-		public void request_partition_state_from_the_correct_stream() {
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsBackward>()
-					.Count(v => v.EventStreamId == "$projections-projection-region-a-checkpoint"));
-		}
-
-		[Test]
-		public void update_state_snapshot_is_written_to_the_correct_stream() {
-			Assert.AreEqual(1, _writeEventHandler.HandledMessages.OfEventType("Result").Count);
-			var message = _writeEventHandler.HandledMessages.WithEventType("Result")[0];
-			Assert.AreEqual("$projections-projection-region-a-result", message.EventStreamId);
-		}
-
-		[Test]
-		public void pass_partition_name_to_state_handler() {
-			Assert.AreEqual("region-a", _stateHandler._lastPartition);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_receiving_a_committed_event_the_projection_with_partitioned_state_should.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_receiving_a_committed_event_the_projection_with_partitioned_state_should.cs
deleted file mode 100644
index 7f242216a61..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_receiving_a_committed_event_the_projection_with_partitioned_state_should.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Core.Util;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_receiving_a_committed_event_the_projection_with_partitioned_state_should<TLogFormat, TStreamId> :
-		TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		private Guid _eventId;
-
-		protected override void Given() {
-			_configureBuilderByQuerySource = source => {
-				source.FromAll();
-				source.AllEvents();
-				source.SetByStream();
-				source.SetDefinesStateTransform();
-				source.SetOutputState();
-			};
-			TicksAreHandledImmediately();
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		protected override void When() {
-			//projection subscribes here
-			_eventId = Guid.NewGuid();
-			_consumer.HandledMessages.Clear();
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"account-01", -1, "account-01", -1, false, new TFPos(120, 110), _eventId,
-						"handle_this_type", false, "data", "metadata"), _subscriptionId, 0));
-		}
-
-		[Test]
-		public void request_partition_state_from_the_correct_stream() {
-			// 1 - for load state
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsBackward>()
-					.Count(v => v.EventStreamId == "$projections-projection-account-01-checkpoint"));
-		}
-
-		[Test]
-		public void update_state_snapshot_is_written_to_the_correct_stream() {
-			var writeEvents =
-				_writeEventHandler.HandledMessages.Where(v => v.Events.Any(e => e.EventType == "Result")).ToList();
-			Assert.AreEqual(1, writeEvents.Count);
-
-			var message = writeEvents[0];
-			Assert.AreEqual("$projections-projection-account-01-result", message.EventStreamId);
-		}
-
-		[Test]
-		public void update_state_snapshot_at_correct_position() {
-			var writeEvents =
-				_writeEventHandler.HandledMessages.Where(v => v.Events.Any(e => e.EventType == "Result")).ToList();
-			Assert.AreEqual(1, writeEvents.Count);
-
-			var metedata = writeEvents[0].Events[0].Metadata
-				.ParseCheckpointTagVersionExtraJson(default(ProjectionVersion));
-
-			Assert.AreEqual(120, metedata.Tag.CommitPosition);
-			Assert.AreEqual(110, metedata.Tag.PreparePosition);
-		}
-
-		[Test]
-		public void pass_event_to_state_handler() {
-			Assert.AreEqual(1, _stateHandler._eventsProcessed);
-			Assert.AreEqual("account-01", _stateHandler._lastProcessedStreamId);
-			Assert.AreEqual("handle_this_type", _stateHandler._lastProcessedEventType);
-			Assert.AreEqual(_eventId, _stateHandler._lastProcessedEventId);
-			//TODO: support sequence numbers here
-			Assert.AreEqual("metadata", _stateHandler._lastProcessedMetadata);
-			Assert.AreEqual("data", _stateHandler._lastProcessedData);
-		}
-
-		[Test]
-		public void register_new_partition_state_stream() {
-			var writes =
-				_writeEventHandler.HandledMessages.Where(v => v.EventStreamId == "$projections-projection-partitions")
-					.ToArray();
-			Assert.AreEqual(1, writes.Length);
-			var write = writes[0];
-
-			Assert.AreEqual(1, write.Events.Length);
-
-			var @event = write.Events[0];
-
-			Assert.AreEqual("account-01", Helper.UTF8NoBom.GetString(@event.Data));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_receiving_committed_event_the_projection_with_existing_partitioned_state_should.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_receiving_committed_event_the_projection_with_existing_partitioned_state_should.cs
deleted file mode 100644
index b229d7dfc84..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_receiving_committed_event_the_projection_with_existing_partitioned_state_should.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-using EventStore.Projections.Core.Services;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_receiving_committed_event_the_projection_with_existing_partitioned_state_should<TLogFormat, TStreamId> :
-		TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		private Guid _eventId;
-		private string _testProjectionState = @"{""test"":1}";
-
-		protected override void Given() {
-			_configureBuilderByQuerySource = source => {
-				source.FromAll();
-				source.AllEvents();
-				source.SetByStream();
-			};
-			TicksAreHandledImmediately();
-			NoStream("$projections-projection-result");
-			NoStream("$projections-projection-order");
-			AllWritesToSucceed("$projections-projection-order");
-			ExistingEvent(
-				"$projections-projection-partitions", "PartitionCreated",
-				@"{""c"": 100, ""p"": 50}", "account-01");
-			ExistingEvent(
-				"$projections-projection-account-01-result", "Result",
-				@"{""c"": 100, ""p"": 50}", _testProjectionState);
-			ExistingEvent(
-				"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
-				@"{""c"": 100, ""p"": 50}", _testProjectionState);
-			AllWritesSucceed();
-		}
-
-		protected override void When() {
-			//projection subscribes here
-			_eventId = Guid.NewGuid();
-			_consumer.HandledMessages.Clear();
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"account-01", 2, "account-01", 2, false, new TFPos(120, 110), _eventId,
-						"handle_this_type", false, "data1", "metadata"), _subscriptionId, 0));
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"account-01", 3, "account-01", 3, false, new TFPos(160, 150), _eventId, "append", false,
-						"$", "metadata"),
-					_subscriptionId, 1));
-		}
-
-		[Test]
-		public void register_new_partition_state_stream_only_once() {
-			var writes =
-				_writeEventHandler.HandledMessages.Where(v => v.EventStreamId == "$projections-projection-partitions")
-					.ToArray();
-			Assert.AreEqual(0, writes.Length);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_receiving_committed_events_the_projection_with_partitioned_state_should.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_receiving_committed_events_the_projection_with_partitioned_state_should.cs
deleted file mode 100644
index 8b2d1e19e60..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_receiving_committed_events_the_projection_with_partitioned_state_should.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_receiving_committed_events_the_projection_with_partitioned_state_should<TLogFormat, TStreamId> :
-		TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		private Guid _eventId;
-
-		protected override void Given() {
-			_configureBuilderByQuerySource = source => {
-				source.FromAll();
-				source.AllEvents();
-				source.SetByStream();
-				source.SetDefinesFold();
-				source.SetOutputState();
-			};
-			TicksAreHandledImmediately();
-			NoOtherStreams();
-			AllWritesSucceed();
-		}
-
-		protected override void When() {
-			//projection subscribes here
-			_eventId = Guid.NewGuid();
-			_consumer.HandledMessages.Clear();
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"account-01", 1, "account-01", 1, false, new TFPos(120, 110), _eventId,
-						"handle_this_type", false, "data1", "metadata"), _subscriptionId, 0));
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"account-02", 2, "account-02", 2, false, new TFPos(140, 130), _eventId,
-						"handle_this_type", false, "data2", "metadata"), _subscriptionId, 1));
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"account-01", 2, "account-01", 2, false, new TFPos(160, 150), _eventId, "append", false,
-						"$", "metadata"),
-					_subscriptionId, 2));
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"account-02", 3, "account-02", 3, false, new TFPos(180, 170), _eventId, "append", false,
-						"$", "metadata"),
-					_subscriptionId, 3));
-		}
-
-		[Test]
-		public void request_partition_state_from_the_correct_stream() {
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsBackward>()
-					.Count(v => v.EventStreamId == "$projections-projection-account-01-checkpoint"));
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsBackward>()
-					.Count(v => v.EventStreamId == "$projections-projection-account-02-checkpoint"));
-		}
-
-		[Test]
-		public void update_state_snapshots_are_written_to_the_correct_stream() {
-			var writeEvents =
-				_writeEventHandler.HandledMessages.Where(v => v.Events.Any(e => e.EventType == "Result")).ToList();
-			Assert.AreEqual(4, writeEvents.Count);
-			Assert.AreEqual("$projections-projection-account-01-result", writeEvents[0].EventStreamId);
-			Assert.AreEqual("$projections-projection-account-02-result", writeEvents[1].EventStreamId);
-			Assert.AreEqual("$projections-projection-account-01-result", writeEvents[2].EventStreamId);
-			Assert.AreEqual("$projections-projection-account-02-result", writeEvents[3].EventStreamId);
-		}
-
-		[Test]
-		public void update_state_snapshots_are_correct() {
-			var writeEvents =
-				_writeEventHandler.HandledMessages.Where(v => v.Events.Any(e => e.EventType == "Result")).ToList();
-			Assert.AreEqual(4, writeEvents.Count);
-			Assert.AreEqual("data1", Helper.UTF8NoBom.GetString(writeEvents[0].Events[0].Data));
-			Assert.AreEqual("data2", Helper.UTF8NoBom.GetString(writeEvents[1].Events[0].Data));
-			Assert.AreEqual("data1$", Helper.UTF8NoBom.GetString(writeEvents[2].Events[0].Data));
-			Assert.AreEqual("data2$", Helper.UTF8NoBom.GetString(writeEvents[3].Events[0].Data));
-		}
-
-		[Test]
-		public void register_new_partition_state_stream_only_once() {
-			var writes =
-				_writeEventHandler.HandledMessages.Where(v => v.EventStreamId == "$projections-projection-partitions")
-					.ToArray();
-			Assert.AreEqual(2, writes.Length);
-
-			Assert.AreEqual(1, writes[0].Events.Length);
-			Assert.AreEqual("account-01", Helper.UTF8NoBom.GetString(writes[0].Events[0].Data));
-
-			Assert.AreEqual(1, writes[1].Events.Length);
-			Assert.AreEqual("account-02", Helper.UTF8NoBom.GetString(writes[1].Events[0].Data));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_receiving_committed_events_the_projection_without_when.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_receiving_committed_events_the_projection_without_when.cs
deleted file mode 100644
index 4e39f233d26..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_receiving_committed_events_the_projection_without_when.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	public abstract class specification_with_query_without_when<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		protected Guid _eventId;
-
-		protected override bool GivenCheckpointsEnabled() {
-			return false;
-		}
-
-		protected override bool GivenEmitEventEnabled() {
-			return false;
-		}
-
-		protected override bool GivenStopOnEof() {
-			return true;
-		}
-
-		protected override int GivenPendingEventsThreshold() {
-			return 0;
-		}
-
-		protected override ProjectionProcessingStrategy GivenProjectionProcessingStrategy() {
-			return CreateQueryProcessingStrategy();
-		}
-
-		protected override void Given() {
-			_checkpointHandledThreshold = 0;
-			_checkpointUnhandledBytesThreshold = 0;
-			_configureBuilderByQuerySource = source => {
-				source.FromAll();
-				source.AllEvents();
-				source.NoWhen();
-			};
-			TicksAreHandledImmediately();
-			NoOtherStreams();
-			AllWritesSucceed();
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_receiving_committed_events_the_projection_without_when<TLogFormat, TStreamId> : specification_with_query_without_when<TLogFormat, TStreamId> {
-		protected override void When() {
-			//projection subscribes here
-			_eventId = Guid.NewGuid();
-			_consumer.HandledMessages.Clear();
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"account-01", 1, "account-01", 1, false, new TFPos(120, 110), _eventId, "handle_this_type",
-						false, "data1", "metadata"), _subscriptionId, 0));
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"account-02", 2, "account-02", 2, false, new TFPos(140, 130), _eventId, "handle_this_type",
-						false, "data2", "metadata"), _subscriptionId, 1));
-		}
-
-		[Test]
-		public void update_state_snapshots_are_written_to_the_correct_stream() {
-			var writeEvents =
-				_writeEventHandler.HandledMessages.Where(v => v.Events.Any(e => e.EventType == "Result")).ToList();
-			Assert.AreEqual(2, writeEvents.Count);
-			Assert.AreEqual("$projections-projection-result", writeEvents[0].EventStreamId);
-			Assert.AreEqual("$projections-projection-result", writeEvents[1].EventStreamId);
-			Assert.AreEqual("data1", Encoding.UTF8.GetString(writeEvents[0].Events[0].Data));
-			Assert.AreEqual("data2", Encoding.UTF8.GetString(writeEvents[1].Events[0].Data));
-		}
-	}
-
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_handling_event_does_not_change_state_the_projection_without_when<TLogFormat, TStreamId> : specification_with_query_without_when<TLogFormat, TStreamId> {
-		protected override void When() {
-			//projection subscribes here
-			_eventId = Guid.NewGuid();
-			_consumer.HandledMessages.Clear();
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"account-01", 1, "account-01", 1, false, new TFPos(120, 110), _eventId, "handle_this_type",
-						false, "data1", "metadata"), _subscriptionId, 0));
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"account-01", 2, "account-01", 2, false, new TFPos(140, 130), _eventId, "handle_this_type",
-						false, "data1", "metadata"), _subscriptionId, 1));
-		}
-
-		[Test, Ignore("To be fixed")]
-		public void result_events_are_produced_for_each_received_event() {
-			var writeEvents =
-				_writeEventHandler.HandledMessages.Where(v => v.Events.Any(e => e.EventType == "Result")).ToList();
-			Assert.AreEqual(2, writeEvents.Count);
-			Assert.AreEqual("$projections-projection-result", writeEvents[0].EventStreamId);
-			Assert.AreEqual("$projections-projection-result", writeEvents[1].EventStreamId);
-			Assert.AreEqual("data1", Encoding.UTF8.GetString(writeEvents[0].Events[0].Data));
-			Assert.AreEqual("data1", Encoding.UTF8.GetString(writeEvents[1].Events[0].Data));
-		}
-
-		[Test]
-		public void no_result_removed_events_are_produced() {
-			var writeEvents =
-				_writeEventHandler.HandledMessages.Where(v => v.Events.Any(e => e.EventType == "ResultRemoved"))
-					.ToList();
-			Assert.AreEqual(0, writeEvents.Count);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_starting_a_new_projection.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_starting_a_new_projection.cs
deleted file mode 100644
index 85fdd664d5c..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_starting_a_new_projection.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using System.Linq;
-using EventStore.Core.Tests;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_starting_a_new_projection<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		protected override void Given() {
-			NoStream("$projections-projection-result");
-			NoStream("$projections-projection-order");
-			AllWritesToSucceed("$projections-projection-order");
-			NoStream("$projections-projection-checkpoint");
-		}
-
-		protected override void When() {
-		}
-
-		[Test]
-		public void should_subscribe_from_beginning() {
-			Assert.AreEqual(1, _subscribeProjectionHandler.HandledMessages.Count);
-			Assert.AreEqual(0, _subscribeProjectionHandler.HandledMessages[0].FromPosition.Position.CommitPosition);
-			Assert.AreEqual(-1, _subscribeProjectionHandler.HandledMessages[0].FromPosition.Position.PreparePosition);
-		}
-
-		[Test]
-		public void should_publish_started_message() {
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Started>().Count());
-			var startedMessage = _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Started>().Single();
-			Assert.AreEqual(_projectionCorrelationId, startedMessage.ProjectionId);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_starting_a_new_projection_and_an_event_is_received.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_starting_a_new_projection_and_an_event_is_received.cs
deleted file mode 100644
index d8e7387987d..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_starting_a_new_projection_and_an_event_is_received.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Text;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_starting_a_new_projection_and_an_event_is_received<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		protected override void Given() {
-			NoStream("$projections-projection-result");
-			NoStream("$projections-projection-order");
-			AllWritesToSucceed("$projections-projection-order");
-			NoStream("$projections-projection-checkpoint");
-		}
-
-		protected override void When() {
-			var eventId = Guid.NewGuid();
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110), eventId,
-						"handle_this_type", false, "data", "metadata"), _subscriptionId, 0));
-		}
-
-		[Test]
-		public void should_initialize_projection_state_handler() {
-			Assert.AreEqual(1, _stateHandler._initializeCalled);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_starting_a_projection.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_starting_a_projection.cs
deleted file mode 100644
index 66d2da16b61..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_starting_a_projection.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.Tests.Bus.Helpers;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture]
-	public class when_starting_a_projection {
-		private const string _projectionStateStream = "$projections-projection-result";
-		private const string _projectionCheckpointStream = "$projections-projection-checkpoint";
-		private CoreProjection _coreProjection;
-		private SynchronousScheduler _bus;
-		private TestHandler<ClientMessage.ReadStreamEventsBackward> _listEventsHandler;
-		private IODispatcher _ioDispatcher;
-		private ReaderSubscriptionDispatcher _subscriptionDispatcher;
-		private ProjectionConfig _projectionConfig;
-
-		[SetUp]
-		public void setup() {
-			_bus = new();
-			_listEventsHandler = new TestHandler<ClientMessage.ReadStreamEventsBackward>();
-			_bus.Subscribe(_listEventsHandler);
-			_ioDispatcher = new IODispatcher(_bus, _bus, true);
-			_subscriptionDispatcher = new ReaderSubscriptionDispatcher(_bus);
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CommittedEventReceived>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CheckpointSuggested>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.EofReached>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionEofReached>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionDeleted>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ProgressChanged>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.SubscriptionStarted>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.NotAuthorized>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ReaderAssignedReader>());
-			_bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_ioDispatcher.BackwardReader);
-			_bus.Subscribe<ClientMessage.NotHandled>(_ioDispatcher.BackwardReader);
-			_bus.Subscribe(_ioDispatcher.ForwardReader);
-			_bus.Subscribe(_ioDispatcher.Writer);
-			_bus.Subscribe<IODispatcherDelayedMessage>(_ioDispatcher);
-			_bus.Subscribe<ClientMessage.NotHandled>(_ioDispatcher);
-			IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
-			_projectionConfig =
-				new ProjectionConfig(null, 5, 10, 1000, 250, true, true, false, false, true, 10000, 1, null);
-			var version = new ProjectionVersion(1, 0, 0);
-			var projectionProcessingStrategy = new ContinuousProjectionProcessingStrategy(
-				"projection", version, projectionStateHandler, _projectionConfig,
-				projectionStateHandler.GetSourceDefinition(), null, _subscriptionDispatcher, true);
-			_coreProjection = projectionProcessingStrategy.Create(
-				Guid.NewGuid(),
-				_bus,
-				Guid.NewGuid(),
-				SystemAccounts.System,
-				_bus,
-				_ioDispatcher,
-				_subscriptionDispatcher,
-				new RealTimeProvider());
-			_coreProjection.Start();
-		}
-
-		[Test]
-		public void should_request_state_snapshot() {
-			Assert.IsTrue(_listEventsHandler.HandledMessages.Count == 1);
-		}
-
-		[Test]
-		public void should_request_state_snapshot_on_correct_stream() {
-			Assert.AreEqual(_projectionCheckpointStream, _listEventsHandler.HandledMessages[0].EventStreamId);
-		}
-
-		[Test]
-		public async Task should_accept_no_event_stream_response() {
-			await _bus.DispatchAsync(
-				new ClientMessage.ReadStreamEventsBackwardCompleted(
-					_listEventsHandler.HandledMessages[0].CorrelationId,
-					_listEventsHandler.HandledMessages[0].EventStreamId, 100, 100, ReadStreamResult.NoStream,
-					new ResolvedEvent[0], null, false, string.Empty, -1, -1, true, 1000));
-		}
-
-		[Test]
-		public async Task should_accept_events_not_found_response() {
-			await _bus.DispatchAsync(
-				new ClientMessage.ReadStreamEventsBackwardCompleted(
-					_listEventsHandler.HandledMessages[0].CorrelationId,
-					_listEventsHandler.HandledMessages[0].EventStreamId, 100, 100, ReadStreamResult.Success,
-					new ResolvedEvent[0], null, false, string.Empty, -1, -1, false, 1000));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection.cs
deleted file mode 100644
index 45a0e530a51..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_starting_an_existing_projection<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		private string _testProjectionState = @"{""test"":1}";
-
-		protected override void Given() {
-			ExistingEvent(
-				"$projections-projection-result", "Result",
-				@"{""c"": 100, ""p"": 50}", _testProjectionState);
-			ExistingEvent(
-				"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
-				@"{""c"": 100, ""p"": 50}", _testProjectionState);
-			ExistingEvent(
-				"$projections-projection-result", "Result",
-				@"{""c"": 200, ""p"": 150}", _testProjectionState);
-			ExistingEvent(
-				"$projections-projection-result", "Result",
-				@"{""c"": 300, ""p"": 250}", _testProjectionState);
-		}
-
-		protected override void When() {
-		}
-
-
-		[Test]
-		public void should_subscribe_from_the_last_known_checkpoint_position() {
-			Assert.AreEqual(1, _subscribeProjectionHandler.HandledMessages.Count);
-			Assert.AreEqual(100, _subscribeProjectionHandler.HandledMessages[0].FromPosition.Position.CommitPosition);
-			Assert.AreEqual(50, _subscribeProjectionHandler.HandledMessages[0].FromPosition.Position.PreparePosition);
-		}
-
-		[Test]
-		public void should_publish_started_message() {
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Started>().Count());
-			var startedMessage = _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Started>().Single();
-			Assert.AreEqual(_projectionCorrelationId, startedMessage.ProjectionId);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection_and_an_event_is_received.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection_and_an_event_is_received.cs
deleted file mode 100644
index 6c986303b05..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection_and_an_event_is_received.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Text;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-using EventStore.Projections.Core.Services;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_starting_an_existing_projection_and_an_event_is_received<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		private string _testProjectionState = @"{""test"":1}";
-
-		protected override void Given() {
-			ExistingEvent(
-				"$projections-projection-result", "Result", @"{""c"": 100, ""p"": 50}",
-				_testProjectionState);
-			ExistingEvent(
-				"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
-				@"{""c"": 100, ""p"": 50}", _testProjectionState);
-			ExistingEvent(
-				"$projections-projection-result", "Result", @"{""c"": 200, ""p"": 150}",
-				_testProjectionState);
-			ExistingEvent(
-				"$projections-projection-result", "Result", @"{""c"": 300, ""p"": 250}",
-				_testProjectionState);
-			NoStream("$projections-projection-order");
-			AllWritesToSucceed("$projections-projection-order");
-		}
-
-		protected override void When() {
-			var eventId = Guid.NewGuid();
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110), eventId,
-						"append", false, "data", "metadata"), _subscriptionId, 0));
-		}
-
-
-		[Test]
-		public void should_load_projection_state_handler() {
-			Assert.AreEqual(1, _stateHandler._loadCalled);
-			Assert.AreEqual(_testProjectionState + "data", _stateHandler._loadedState);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection_missing_last_emitted_event_and_state_snapshot.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection_missing_last_emitted_event_and_state_snapshot.cs
deleted file mode 100644
index ea22c43840f..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection_missing_last_emitted_event_and_state_snapshot.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-using EventStore.Projections.Core.Services;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_starting_an_existing_projection_missing_last_emitted_event_and_state_snapshot<TLogFormat, TStreamId> :
-		TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		private readonly Guid _causedByEventId = Guid.NewGuid();
-
-		protected override void Given() {
-			ExistingEvent(
-				"$projections-projection-result", "Result", @"{""c"": 100, ""p"": 50}", "{}");
-			ExistingEvent(
-				"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
-				@"{""c"": 100, ""p"": 50}", "{}");
-
-			ExistingEvent(
-				FakeProjectionStateHandler._emit1StreamId, FakeProjectionStateHandler._emit1EventType,
-				@"{""c"": 120, ""p"": 110}", FakeProjectionStateHandler._emit1Data);
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		protected override void When() {
-			//projection subscribes here
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
-						_causedByEventId, "emit12_type", false, "data",
-						"metadata"), _subscriptionId, 0));
-		}
-
-		[Test]
-		public void should_write_second_emitted_event_and_state_snapshot() {
-			Assert.AreEqual(1, _writeEventHandler.HandledMessages.OfEventType("Result").Count);
-			Assert.AreEqual(
-				1, _writeEventHandler.HandledMessages.OfEventType(FakeProjectionStateHandler._emit2EventType).Count);
-
-			Assert.IsTrue(
-				_writeEventHandler.HandledMessages.Any(
-					v => Helper.UTF8NoBom.GetString(v.Events[0].Data) == FakeProjectionStateHandler._emit2Data));
-			Assert.IsTrue(_writeEventHandler.HandledMessages.Any(v => v.Events[0].EventType == "Result"));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection_missing_last_state_snapshot.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection_missing_last_state_snapshot.cs
deleted file mode 100644
index 22a87d44c9a..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection_missing_last_state_snapshot.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-using EventStore.Projections.Core.Services;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_starting_an_existing_projection_missing_last_state_snapshot<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		private readonly Guid _causedByEventId = Guid.NewGuid();
-
-		protected override void Given() {
-			ExistingEvent(
-				"$projections-projection-result", "Result", @"{""c"": 100, ""p"": 50}", "{}");
-			ExistingEvent(
-				"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
-				@"{""c"": 100, ""p"": 50}", "{}");
-			ExistingEvent(
-				FakeProjectionStateHandler._emit1StreamId, FakeProjectionStateHandler._emit1EventType,
-				@"{""c"": 120, ""p"": 110}", FakeProjectionStateHandler._emit1Data);
-			NoStream("$projections-projection-order");
-			AllWritesToSucceed("$projections-projection-order");
-		}
-
-		protected override void When() {
-			//projection subscribes here
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
-						_causedByEventId, "emit1_type", false, "data",
-						"metadata"), _subscriptionId, 0));
-		}
-
-		[Test]
-		public void should_not_emit_events_but_write_the_new_state_snapshot() {
-			Assert.AreEqual(2, _writeEventHandler.HandledMessages.Count);
-
-			var data = Helper.UTF8NoBom.GetString(_writeEventHandler.HandledMessages[1].Events[0].Data);
-			Assert.AreEqual("data", data);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_stopping_a_projection_with_existing_state_without_updating_the_state.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_stopping_a_projection_with_existing_state_without_updating_the_state.cs
deleted file mode 100644
index 7205123d68b..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_stopping_a_projection_with_existing_state_without_updating_the_state.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Services.Processing;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_stopping_a_projection_with_existing_state_without_updating_the_state<TLogFormat, TStreamId> :
-			TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		private string _testProjectionState = @"{""test"":1}";
-
-		protected override void Given() {
-			//write existing checkpoint
-			ExistingEvent(
-				"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
-				@"{""c"": 100, ""p"": 50}", _testProjectionState);
-
-			AllWritesQueueUp();
-		}
-
-		protected override void When() {
-			//force write of another checkpoint
-			_bus.Publish(
-				new EventReaderSubscriptionMessage.CheckpointSuggested(
-					_subscriptionId, CheckpointTag.FromPosition(0, 160, 150), 77.7f, 0));
-
-			_coreProjection.Stop();
-		}
-
-		[Test]
-		public void a_projection_checkpoint_event_is_published() {
-			AllWriteComplete();
-			Assert.AreEqual(
-				1,
-				_writeEventHandler.HandledMessages.Count(v =>
-					v.Events.Any(e => e.EventType == ProjectionEventTypes.ProjectionCheckpoint)));
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Stopped>().Count());
-		}
-
-		[Test]
-		public void previous_state_is_saved_in_checkpoint_event() {
-			AllWriteComplete();
-			Assert.AreEqual(
-				1,
-				_writeEventHandler.HandledMessages.Count(
-					v => v.Events.Any(
-						e => e.EventType == ProjectionEventTypes.ProjectionCheckpoint
-						     && Helper.UTF8NoBom.GetString(e.Data).Equals("[" + _testProjectionState + "]")
-					)
-				)
-			);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_suspending_a_projection_and_an_event_is_received.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_suspending_a_projection_and_an_event_is_received.cs
deleted file mode 100644
index 052d6701fdf..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_suspending_a_projection_and_an_event_is_received.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_suspending_a_projection_and_an_event_is_received<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		private Guid _lastEventIdBeforeSuspension;
-
-		protected override void Given() {
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		protected override void When() {
-			//receive first event
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110), Guid.NewGuid(),
-						"handle_this_type", false, "data1", "metadata"), _subscriptionId, 0));
-
-			//receive second event
-			_lastEventIdBeforeSuspension = Guid.NewGuid();
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(140, 130),
-						_lastEventIdBeforeSuspension,
-						"handle_this_type", false, "data2", "metadata"), _subscriptionId, 1));
-
-			//suspend the projection
-			var suspended = _coreProjection.Suspend();
-			Assert.True(suspended, "Projection was not suspended");
-
-			//receive third event
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(160, 150), Guid.NewGuid(),
-						"handle_this_type", false, "data3", "metadata"), _subscriptionId, 2));
-		}
-
-		[Test]
-		public void event_received_after_suspend_is_not_processed() {
-			Assert.AreEqual(2, _stateHandler._eventsProcessed);
-			Assert.AreEqual(_lastEventIdBeforeSuspension, _stateHandler._lastProcessedEventId);
-			Assert.AreEqual("data2", _stateHandler._lastProcessedData);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_projection_with_pending_checkpoint_is_stopped.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_projection_with_pending_checkpoint_is_stopped.cs
deleted file mode 100644
index 46d99613b00..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_projection_with_pending_checkpoint_is_stopped.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_the_projection_with_pending_checkpoint_is_stopped<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		protected override void Given() {
-			_checkpointHandledThreshold = 2;
-			NoStream("$projections-projection-result");
-			NoStream("$projections-projection-order");
-			AllWritesToSucceed("$projections-projection-order");
-			NoStream("$projections-projection-checkpoint");
-			NoStream(FakeProjectionStateHandler._emit1StreamId);
-			AllWritesQueueUp();
-		}
-
-		protected override void When() {
-			//projection subscribes here
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
-						Guid.NewGuid(), "handle_this_type", false, "data1",
-						"metadata"), _subscriptionId, 0));
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(140, 130),
-						Guid.NewGuid(), "handle_this_type", false, "data2",
-						"metadata"), _subscriptionId, 1));
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(160, 150),
-						Guid.NewGuid(), "handle_this_type", false, "data3",
-						"metadata"), _subscriptionId, 2));
-			_bus.Publish(
-				new EventReaderSubscriptionMessage.CheckpointSuggested(
-					_subscriptionId, CheckpointTag.FromPosition(0, 160, 150), 77.7f, 3));
-			_coreProjection.Stop();
-		}
-
-		[Test]
-		public void a_projection_checkpoint_event_is_published() {
-			AllWriteComplete();
-			Assert.AreEqual(
-				1,
-				_writeEventHandler.HandledMessages.Count(v =>
-					v.Events.Any(e => e.EventType == ProjectionEventTypes.ProjectionCheckpoint)));
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Stopped>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_projection_with_pending_writes_is_stopped.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_projection_with_pending_writes_is_stopped.cs
deleted file mode 100644
index 4954a810cef..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_projection_with_pending_writes_is_stopped.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-using EventStore.Projections.Core.Services;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_the_projection_with_pending_writes_is_stopped<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		protected override void Given() {
-			_checkpointHandledThreshold = 2;
-			NoStream("$projections-projection-result");
-			NoStream("$projections-projection-order");
-			AllWritesToSucceed("$projections-projection-order");
-			NoStream("$projections-projection-checkpoint");
-			NoStream(FakeProjectionStateHandler._emit1StreamId);
-			AllWritesQueueUp();
-		}
-
-		protected override void When() {
-			//projection subscribes here
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
-						Guid.NewGuid(), "handle_this_type", false, "data1",
-						"metadata"), _subscriptionId, 0));
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(140, 130),
-						Guid.NewGuid(), "handle_this_type", false, "data2",
-						"metadata"), _subscriptionId, 1));
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(160, 150),
-						Guid.NewGuid(), "handle_this_type", false, "data3",
-						"metadata"), _subscriptionId, 2));
-			_coreProjection.Stop();
-		}
-
-		[Test]
-		public void a_projection_checkpoint_event_is_published() {
-			AllWriteComplete();
-			Assert.AreEqual(
-				1,
-				_writeEventHandler.HandledMessages.Count(v =>
-					v.Events.Any(e => e.EventType == ProjectionEventTypes.ProjectionCheckpoint)));
-		}
-
-		[Test]
-		public void other_events_are_not_written_after_the_checkpoint_write() {
-			AllWriteComplete();
-			var index =
-				_writeEventHandler.HandledMessages.FindIndex(
-					v => v.Events.Any(e => e.EventType == ProjectionEventTypes.ProjectionCheckpoint));
-			Assert.AreEqual(index + 1, _writeEventHandler.HandledMessages.Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_emit_an_event_the_projection_should.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_emit_an_event_the_projection_should.cs
deleted file mode 100644
index caee5e9692c..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_emit_an_event_the_projection_should.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Core.Util;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_the_state_handler_does_emit_an_event_the_projection_should<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		private Guid _causingEventId;
-
-		protected override void Given() {
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		protected override void When() {
-			//projection subscribes here
-			_causingEventId = Guid.NewGuid();
-			var committedEventReceived =
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
-						_causingEventId, "no_state_emit1_type", false, "data",
-						"metadata"), _subscriptionId, 0);
-			_bus.Publish(committedEventReceived);
-		}
-
-		[Test]
-		public void write_the_emitted_event() {
-			Assert.IsTrue(
-				_writeEventHandler.HandledMessages.Any(
-					v => Helper.UTF8NoBom.GetString(v.Events[0].Data) == FakeProjectionStateHandler._emit1Data));
-		}
-
-		[Test]
-		public void set_a_caused_by_position_attributes() {
-			var metadata = _writeEventHandler.HandledMessages[0].Events[0].Metadata
-				.ParseCheckpointTagVersionExtraJson(default(ProjectionVersion));
-			Assert.AreEqual(120, metadata.Tag.CommitPosition);
-			Assert.AreEqual(110, metadata.Tag.PreparePosition);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_emit_multiple_interleaved_events_into_the_same_stream_the_projection_should.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_emit_multiple_interleaved_events_into_the_same_stream_the_projection_should.cs
deleted file mode 100644
index 8fab23960d7..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_emit_multiple_interleaved_events_into_the_same_stream_the_projection_should.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-using EventStore.Projections.Core.Services;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_the_state_handler_does_emit_multiple_interleaved_events_into_the_same_stream_the_projection_should<TLogFormat, TStreamId> :
-			TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		protected override void Given() {
-			ExistingEvent(
-				"$projections-projection-result", "Result", @"{""c"": 100, ""p"": 50}", "{}");
-			ExistingEvent(
-				"$projections-projection-result", ProjectionEventTypes.ProjectionCheckpoint,
-				@"{""c"": 100, ""p"": 50}", "{}");
-			NoStream(FakeProjectionStateHandler._emit1StreamId);
-			NoStream(FakeProjectionStateHandler._emit2StreamId);
-		}
-
-		protected override void When() {
-			//projection subscribes here
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
-						Guid.NewGuid(), "emit212_type", false, "data",
-						"metadata"), _subscriptionId, 0));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_emit_multiple_subsequent_events_into_the_same_stream_the_projection_should.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_emit_multiple_subsequent_events_into_the_same_stream_the_projection_should.cs
deleted file mode 100644
index 6d1f4ee8f17..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_emit_multiple_subsequent_events_into_the_same_stream_the_projection_should.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-using EventStore.Projections.Core.Services;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_the_state_handler_does_emit_multiple_subsequent_events_into_the_same_stream_the_projection_should<TLogFormat, TStreamId> :
-			TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		protected override void Given() {
-			ExistingEvent(
-				"$projections-projection-result", "Result", @"{""c"": 100, ""p"": 50}", "{}");
-			ExistingEvent(
-				"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
-				@"{""c"": 100, ""p"": 50}", "{}");
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		protected override void When() {
-			//projection subscribes here
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
-						Guid.NewGuid(), "emit22_type", false, "data",
-						"metadata"), _subscriptionId, 0));
-		}
-
-
-		[Test]
-		public void write_events_in_a_single_transaction() {
-			Assert.IsTrue(_writeEventHandler.HandledMessages.Any(v => v.Events.Length == 2));
-		}
-
-		[Test]
-		public void write_all_the_emitted_events() {
-			Assert.AreEqual(
-				2, _writeEventHandler.HandledMessages.Single(v => v.EventStreamId == "/emit2").Events.Length);
-		}
-
-		[Test]
-		public void write_events_in_correct_order() {
-			Assert.AreEqual(
-				FakeProjectionStateHandler._emit1Data,
-				Helper.UTF8NoBom.GetString(
-					_writeEventHandler.HandledMessages.Single(v => v.EventStreamId == "/emit2").Events[0].Data));
-			Assert.AreEqual(
-				FakeProjectionStateHandler._emit2Data,
-				Helper.UTF8NoBom.GetString(
-					_writeEventHandler.HandledMessages.Single(v => v.EventStreamId == "/emit2").Events[1].Data));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_not_process_event_the_projection_should.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_not_process_event_the_projection_should.cs
deleted file mode 100644
index c2dd561d3d0..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_not_process_event_the_projection_should.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-using EventStore.Projections.Core.Services;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_the_state_handler_does_not_process_event_the_projection_should<TLogFormat, TStreamId> :
-		TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		protected override void Given() {
-			ExistingEvent(
-				"$projections-projection-result", "Result", @"{""c"": 100, ""p"": 50}", "{}");
-			ExistingEvent(
-				"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
-				@"{""c"": 100, ""p"": 50}", "{}");
-		}
-
-		protected override void When() {
-			//projection subscribes here
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
-						new TFPos(120, 110),
-						Guid.NewGuid(), "skip_this_type", false, new byte[0], new byte[0], null, null,
-						default(DateTime)),
-					_subscriptionId, 0));
-		}
-
-		[Test]
-		public void not_update_state_snapshot() {
-			Assert.AreEqual(0, _writeEventHandler.HandledMessages.Count);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_process_an_event_the_projection_should.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_process_an_event_the_projection_should.cs
deleted file mode 100644
index 61844130e7b..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_process_an_event_the_projection_should.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-using EventStore.Projections.Core.Services;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_the_state_handler_does_process_an_event_the_projection_should<TLogFormat, TStreamId> :
-		TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		protected override void Given() {
-			ExistingEvent(
-				"$projections-projection-result", "Result", @"{""c"": 100, ""p"": 50}", "{}");
-			ExistingEvent(
-				"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
-				@"{""c"": 100, ""p"": 50}", "{}");
-			NoStream("$projections-projection-order");
-			AllWritesToSucceed("$projections-projection-order");
-		}
-
-		protected override void When() {
-			//projection subscribes here
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
-						Guid.NewGuid(), "handle_this_type", false, "data",
-						"metadata"), _subscriptionId, 0));
-		}
-
-		[Test]
-		public void write_the_new_state_snapshot() {
-			Assert.AreEqual(1, _writeEventHandler.HandledMessages.OfEventType("Result").Count);
-
-			var data = Helper.UTF8NoBom.GetString(_writeEventHandler.HandledMessages.OfEventType("Result")[0].Data);
-			Assert.AreEqual("data", data);
-		}
-
-		[Test]
-		public void emit_a_state_updated_event() {
-			Assert.AreEqual(1, _writeEventHandler.HandledMessages.OfEventType("Result").Count);
-
-			var @event = _writeEventHandler.HandledMessages.OfEventType("Result")[0];
-			Assert.AreEqual("Result", @event.EventType);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_fails_to_load_state_the_projection_should.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_fails_to_load_state_the_projection_should.cs
deleted file mode 100644
index 49d7d2944ab..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_fails_to_load_state_the_projection_should.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-using EventStore.Projections.Core.Services;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_the_state_handler_fails_to_load_state_the_projection_should<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		protected override void Given() {
-			ExistingEvent(
-				"$projections-projection-result", "Result", @"{""c"": 100, ""p"": 50}", "{}");
-			ExistingEvent(
-				"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
-				@"{""c"": 100, ""p"": 50}", "{}");
-			NoStream("$projections-projection-order");
-			AllWritesToSucceed("$projections-projection-order");
-		}
-
-		protected override FakeProjectionStateHandler GivenProjectionStateHandler() {
-			return new FakeProjectionStateHandler(failOnLoad: true);
-		}
-
-		protected override void When() {
-			//projection subscribes here
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
-						Guid.NewGuid(), "handle_this_type", false, "data",
-						"metadata"), _subscriptionId, 0));
-		}
-
-		[Test]
-		public void should_publish_faulted_message() {
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Faulted>().Count());
-		}
-
-		[Test]
-		public void not_emit_a_state_updated_event() {
-			Assert.AreEqual(0, _writeEventHandler.HandledMessages.OfEventType("StateUpdate").Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_fails_to_process_an_event_the_projection_should.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_fails_to_process_an_event_the_projection_should.cs
deleted file mode 100644
index 71eac929ec2..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_fails_to_process_an_event_the_projection_should.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-using EventStore.Projections.Core.Services;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_the_state_handler_fails_to_process_an_event_the_projection_should<TLogFormat, TStreamId> :
-		TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		protected override void Given() {
-			ExistingEvent(
-				"$projections-projection-result", "Result", @"{""c"": 100, ""p"": 50}", "{}");
-			ExistingEvent(
-				"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
-				@"{""c"": 100, ""p"": 50}", "{}");
-			NoStream("$projections-projection-order");
-			AllWritesToSucceed("$projections-projection-order");
-		}
-
-		protected override FakeProjectionStateHandler GivenProjectionStateHandler() {
-			return new FakeProjectionStateHandler(failOnProcessEvent: true);
-		}
-
-		protected override void When() {
-			//projection subscribes here
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
-						Guid.NewGuid(), "handle_this_type", false, "data",
-						"metadata"), _subscriptionId, 0));
-		}
-
-		[Test]
-		public void should_publish_faulted_message() {
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Faulted>().Count());
-		}
-
-		[Test]
-		public void not_emit_a_state_updated_event() {
-			Assert.AreEqual(0, _writeEventHandler.HandledMessages.OfEventType("Result").Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_with_configured_state_stream_does_process_an_event_the_projection_should.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_with_configured_state_stream_does_process_an_event_the_projection_should.cs
deleted file mode 100644
index 9d2d8f7ea42..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_the_state_handler_with_configured_state_stream_does_process_an_event_the_projection_should.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_the_state_handler_with_configured_state_stream_does_process_an_event_the_projection_should<TLogFormat, TStreamId> :
-		TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
-		protected override void Given() {
-			_configureBuilderByQuerySource = source => {
-				source.FromAll();
-				source.AllEvents();
-				source.SetResultStreamNameOption("state-stream");
-				source.SetDefinesStateTransform();
-				source.SetOutputState();
-			};
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		protected override void When() {
-			//projection subscribes here
-			_bus.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
-					new ResolvedEvent(
-						"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
-						Guid.NewGuid(), "handle_this_type", false, "data",
-						"metadata"), _subscriptionId, 0));
-		}
-
-		[Test]
-		public void write_the_new_state_snapshot() {
-			Assert.AreEqual(1, _writeEventHandler.HandledMessages.ToStream("state-stream").Count);
-
-			var message = _writeEventHandler.HandledMessages.ToStream("state-stream")[0];
-			var data = Helper.UTF8NoBom.GetString(message.Events[0].Data);
-			Assert.AreEqual("data", data);
-			Assert.AreEqual("state-stream", message.EventStreamId);
-		}
-
-		[Test]
-		public void emit_a_state_updated_event() {
-			Assert.AreEqual(1, _writeEventHandler.HandledMessages.ToStream("state-stream").Count);
-
-			var @event = _writeEventHandler.HandledMessages.ToStream("state-stream")[0].Events[0];
-			Assert.AreEqual("Result", @event.EventType);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_writing_projection_persisted_state_races_with_stream_deletion.cs b/src/EventStore.Projections.Core.Tests/Services/core_projection/when_writing_projection_persisted_state_races_with_stream_deletion.cs
deleted file mode 100644
index 3e9734b859d..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_projection/when_writing_projection_persisted_state_races_with_stream_deletion.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Tests.Services.projections_manager;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_projection {
-	/**
-	 * tests whether race condition exists or not; currently deleting a projection involves following operations
-	 * 1. Deleting projection "sub-streams" (checkpoint, emitted, etc. streams)
-	 * 2. Writing new projection persisted state to $projection-<projection_name> stream
-	 *
-	 * steps 1 and 2 are independent and gives rise to race condition :
-	 * * if step 2 completes after step 1, multiple ProjectionManagement.Internal.Deleted events will be published
-	 * * in addition, if step 2 completes shortly after step 1, WrongExpectedVersion will be encountered
-	 */
-	
-	public static class when_writing_projection_persisted_state_races_with_stream_deletion {
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_projection_persisted_state_write_races_with_projections_substream_deletion<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-			private const string _projectionName = "my-projection";
-
-			protected override void Given() {
-				base.Given();
-				NoOtherStreams();
-				AllWritesSucceed();
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-				yield return
-					(new ProjectionManagementMessage.Command.Post(
-						_bus, ProjectionMode.Continuous, _projectionName,
-						ProjectionManagementMessage.RunAs.System, "native:" + typeof(FakeProjection).AssemblyQualifiedName,
-						@"", enabled: true, checkpointsEnabled: true,
-						emitEnabled: false, trackEmittedStreams: false));
-				yield return
-					new ProjectionManagementMessage.Command.Disable(_bus, _projectionName, ProjectionManagementMessage.RunAs.System);
-				yield return new ProjectionManagementMessage.Command.Delete(new NoopEnvelope(), _projectionName, ProjectionManagementMessage.RunAs.System, 
-					true, false, false);
-			}
-
-			[Test]
-			public void should_publish_single_projection_deleted_event() {
-				Assert.AreEqual(
-					1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Internal.Deleted>().Count()); }
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_service/when_a_subscribed_projection_handler_throws.cs b/src/EventStore.Projections.Core.Tests/Services/core_service/when_a_subscribed_projection_handler_throws.cs
deleted file mode 100644
index 8ce40e67702..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_service/when_a_subscribed_projection_handler_throws.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-using EventStore.Projections.Core.Tests.Services.event_reader.heading_event_reader;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
-
-namespace EventStore.Projections.Core.Tests.Services.core_service {
-	[TestFixture]
-	public class when_a_subscribed_projection_handler_throws : TestFixtureWithProjectionCoreService {
-		[SetUp]
-		public new void Setup() {
-			var readerStrategy = new FakeReaderStrategy();
-			var projectionCorrelationId = Guid.NewGuid();
-			_readerService.Handle(
-				new ReaderSubscriptionManagement.Subscribe(
-					projectionCorrelationId, CheckpointTag.FromPosition(0, 0, 0), readerStrategy,
-					new ReaderSubscriptionOptions(1000, 2000, 10000, false, stopAfterNEvents: null, true)));
-			_readerService.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					readerStrategy.EventReaderId, new TFPos(20, 10), "throws", 10, false, Guid.NewGuid(),
-					"type", false, new byte[0], new byte[0]));
-		}
-
-		[Test]
-		public void projection_is_notified_that_it_is_to_fault() {
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.Failed>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/core_service/when_unsubscribing_a_subscribed_projection.cs b/src/EventStore.Projections.Core.Tests/Services/core_service/when_unsubscribing_a_subscribed_projection.cs
deleted file mode 100644
index 4f1a8f81987..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/core_service/when_unsubscribing_a_subscribed_projection.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.core_service {
-	[TestFixture]
-	public class when_unsubscribing_a_subscribed_projection : TestFixtureWithProjectionCoreService {
-		private TestCoreProjection _committedeventHandler;
-		private Guid _projectionCorrelationId;
-
-		//private TestCoreProjection _committedeventHandler2;
-		private Guid _projectionCorrelationId2;
-
-		[SetUp]
-		public new void Setup() {
-			_committedeventHandler = new TestCoreProjection();
-			//_committedeventHandler2 = new TestCoreProjection();
-			_projectionCorrelationId = Guid.NewGuid();
-			_projectionCorrelationId2 = Guid.NewGuid();
-			_readerService.Handle(
-				new ReaderSubscriptionManagement.Subscribe(
-					_projectionCorrelationId, CheckpointTag.FromPosition(0, 0, 0), CreateReaderStrategy(),
-					new ReaderSubscriptionOptions(1000, 2000, 10000, false, stopAfterNEvents: null, enableContentTypeValidation: true)));
-			_readerService.Handle(
-				new ReaderSubscriptionManagement.Subscribe(
-					_projectionCorrelationId2, CheckpointTag.FromPosition(0, 0, 0), CreateReaderStrategy(),
-					new ReaderSubscriptionOptions(1000, 2000, 10000, false, stopAfterNEvents: null, enableContentTypeValidation: true)));
-			// when
-			_readerService.Handle(new ReaderSubscriptionManagement.Unsubscribe(_projectionCorrelationId));
-		}
-
-		[Test]
-		public void committed_events_are_no_longer_distributed_to_the_projection() {
-			_readerService.Handle(
-				new ReaderSubscriptionMessage.CommittedEventDistributed(_projectionCorrelationId, CreateEvent()));
-			Assert.AreEqual(0, _committedeventHandler.HandledMessages.Count);
-		}
-
-		[Test]
-		public void the_projection_cannot_be_resumed() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_readerService.Handle(new ReaderSubscriptionManagement.Resume(_projectionCorrelationId));
-				_readerService.Handle(
-					new ReaderSubscriptionMessage.CommittedEventDistributed(_projectionCorrelationId, CreateEvent()));
-				Assert.AreEqual(0, _committedeventHandler.HandledMessages.Count);
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/a_checkpoint_requested_on_a_non_started_stream.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/a_checkpoint_requested_on_a_non_started_stream.cs
deleted file mode 100644
index d1525b84d73..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/a_checkpoint_requested_on_a_non_started_stream.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture]
-	public class a_checkpoint_requested_on_a_non_started_stream : TestFixtureWithReadWriteDispatchers {
-		private EmittedStream _stream;
-
-		private TestCheckpointManagerMessageHandler _readyHandler;
-		private Exception _caughtException;
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			;
-			_stream = new EmittedStream(
-				"test",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50), new ProjectionVersion(1, 0, 0),
-				new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _bus, _ioDispatcher,
-				_readyHandler);
-			try {
-				_stream.Checkpoint();
-			} catch (Exception ex) {
-				_caughtException = ex;
-			}
-		}
-
-		[Test]
-		public void throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => {
-				if (_caughtException != null) throw _caughtException;
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/another_epoch/when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/another_epoch/when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream.cs
deleted file mode 100644
index e5481c606c1..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/another_epoch/when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Services;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream.another_epoch {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		protected override void Given() {
-			ExistingEvent("test_stream", "type", @"{""v"": 1, ""c"": 100, ""p"": 50}", "data");
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_stream = new EmittedStream(
-				"test_stream",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
-				new ProjectionVersion(1, 2, 2), new TransactionFilePositionTagger(0),
-				CheckpointTag.FromPosition(0, 0, -1),
-				_bus, _ioDispatcher, _readyHandler);
-			_stream.Start();
-		}
-
-		[Test]
-		public void requests_restart_if_different_smaller_tag() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 100, 50), CheckpointTag.FromPosition(0, 40, 20))
-				});
-			Assert.AreEqual(
-				0,
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
-					.ExceptOfEventType(SystemEventTypes.StreamMetadata)
-					.Count());
-			Assert.AreEqual(1, _readyHandler.HandledRestartRequestedMessages.Count());
-		}
-
-		[Test]
-		public void publishes_all_events_even_with_smaller_tag() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 40, 20), null)
-				});
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
-					.ExceptOfEventType(SystemEventTypes.StreamMetadata)
-					.Count());
-		}
-
-		[Test]
-		public void requests_restart_even_if_expected_tag_is_the_same_but_epoch() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 200, 150), CheckpointTag.FromPosition(0, 100, 50))
-				});
-			Assert.AreEqual(
-				0,
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
-					.ExceptOfEventType(SystemEventTypes.StreamMetadata)
-					.Count());
-			Assert.AreEqual(1, _readyHandler.HandledRestartRequestedMessages.Count());
-		}
-
-		[Test]
-		public void metadata_include_correct_version() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 200, 150), null)
-				});
-			var metaData =
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
-					.OfEventType("type")
-					.Single()
-					.Metadata.ParseCheckpointTagVersionExtraJson(default(ProjectionVersion));
-			Assert.AreEqual(new ProjectionVersion(1, 2, 2), metaData.Version);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/another_epoch/when_handling_emits_with_previously_written_events_at_the_same_position.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/another_epoch/when_handling_emits_with_previously_written_events_at_the_same_position.cs
deleted file mode 100644
index d78e490e8c9..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/another_epoch/when_handling_emits_with_previously_written_events_at_the_same_position.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Messages;
-using EventStore.Core.Services;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using Newtonsoft.Json.Linq;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream.another_epoch {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_handling_emits_with_previously_written_events_at_the_same_position<TLogFormat, TStreamId> : core_projection.TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-		private long _1;
-		private long _2;
-		private long _3;
-
-		protected override void Given() {
-			AllWritesQueueUp();
-			AllWritesToSucceed("$$test_stream");
-			//NOTE: it is possible for a batch of events to be partially written if it contains links
-			ExistingEvent("test_stream", "type1", @"{""v"": 1, ""c"": 100, ""p"": 50}", "data");
-			ExistingEvent("test_stream", "type2", @"{""v"": 1, ""c"": 100, ""p"": 50}", "data");
-			NoOtherStreams();
-		}
-
-		private EmittedEvent[] CreateEventBatch() {
-			return new EmittedEvent[] {
-				new EmittedDataEvent(
-					(string)"test_stream", Guid.NewGuid(), (string)"type1", (bool)true,
-					(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
-					v => _1 = v),
-				new EmittedDataEvent(
-					(string)"test_stream", Guid.NewGuid(), (string)"type2", (bool)true,
-					(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
-					v => _2 = v),
-				new EmittedDataEvent(
-					(string)"test_stream", Guid.NewGuid(), (string)"type3", (bool)true,
-					(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
-					v => _3 = v)
-			};
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_stream = new EmittedStream(
-				"test_stream",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
-				new ProjectionVersion(1, 2, 2), new TransactionFilePositionTagger(0),
-				CheckpointTag.FromPosition(0, 100, 50),
-				_bus, _ioDispatcher, _readyHandler);
-			_stream.Start();
-			_stream.EmitEvents(CreateEventBatch());
-			OneWriteCompletes();
-		}
-
-		[Test]
-		public void truncates_existing_stream_at_correct_position() {
-			var writes =
-				HandledMessages.OfType<ClientMessage.WriteEvents>()
-					.OfEventType(SystemEventTypes.StreamMetadata)
-					.ToArray();
-			Assert.AreEqual(1, writes.Length);
-			HelperExtensions.AssertJson(new {___tb = 2}, writes[0].Data.ParseJson<JObject>());
-		}
-
-		[Test]
-		public void publishes_all_events() {
-			var writtenEvents =
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
-					.ExceptOfEventType(SystemEventTypes.StreamMetadata)
-					.ToArray();
-			Assert.AreEqual(3, writtenEvents.Length);
-			Assert.AreEqual("type1", writtenEvents[0].EventType);
-			Assert.AreEqual("type2", writtenEvents[1].EventType);
-			Assert.AreEqual("type3", writtenEvents[2].EventType);
-		}
-
-		[Test]
-		public void updates_stream_metadata() {
-			var writes =
-				HandledMessages.OfType<ClientMessage.WriteEvents>()
-					.OfEventType(SystemEventTypes.StreamMetadata)
-					.ToArray();
-			Assert.AreEqual(1, writes.Length);
-		}
-
-		[Test]
-		public void reports_correct_event_numbers() {
-			Assert.AreEqual(2, _1);
-			Assert.AreEqual(3, _2);
-			Assert.AreEqual(4, _3);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/another_epoch/when_handling_emits_with_previously_written_events_in_different_epochs.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/another_epoch/when_handling_emits_with_previously_written_events_in_different_epochs.cs
deleted file mode 100644
index b8d610d98f8..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/another_epoch/when_handling_emits_with_previously_written_events_in_different_epochs.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Services;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream.another_epoch {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_handling_emits_with_previously_written_events_in_different_epochs<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-		private long _1;
-		private long _2;
-		private long _3;
-
-		protected override void Given() {
-			AllWritesQueueUp();
-			//NOTE: it is possible for a batch of events to be partially written if it contains links
-			ExistingEvent("test_stream", "type1", @"{""v"": 1, ""c"": 100, ""p"": 50}", "data");
-			ExistingEvent("test_stream", "type1", @"{""v"": 2, ""c"": 100, ""p"": 50}", "data");
-		}
-
-		private EmittedEvent[] CreateEventBatch() {
-			return new EmittedEvent[] {
-				new EmittedDataEvent(
-					(string)"test_stream", Guid.NewGuid(), (string)"type1", (bool)true,
-					(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
-					v => _1 = v),
-				new EmittedDataEvent(
-					(string)"test_stream", Guid.NewGuid(), (string)"type2", (bool)true,
-					(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
-					v => _2 = v),
-				new EmittedDataEvent(
-					(string)"test_stream", Guid.NewGuid(), (string)"type3", (bool)true,
-					(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
-					v => _3 = v)
-			};
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_stream = new EmittedStream(
-				"test_stream",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
-				new ProjectionVersion(1, 2, 2), new TransactionFilePositionTagger(0),
-				CheckpointTag.FromPosition(0, 20, 10),
-				_bus, _ioDispatcher, _readyHandler);
-			_stream.Start();
-			_stream.EmitEvents(CreateEventBatch());
-			OneWriteCompletes();
-		}
-
-		[Test]
-		public void publishes_all_events() {
-			var writtenEvents =
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().SelectMany(v => v.Events).ToArray();
-			Assert.AreEqual(2, writtenEvents.Length);
-			Assert.AreEqual("type2", writtenEvents[0].EventType);
-			Assert.AreEqual("type3", writtenEvents[1].EventType);
-		}
-
-		[Test]
-		public void updates_stream_metadata() {
-			var writes =
-				HandledMessages.OfType<ClientMessage.WriteEvents>()
-					.OfEventType(SystemEventTypes.StreamMetadata)
-					.ToArray();
-			Assert.AreEqual(0, writes.Length);
-		}
-
-
-		[Test]
-		public void reports_correct_event_numbers() {
-			Assert.AreEqual(1, _1);
-			Assert.AreEqual(2, _2);
-			Assert.AreEqual(3, _3);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/another_projection/when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/another_projection/when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream.cs
deleted file mode 100644
index 2bb9c575670..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/another_projection/when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream.another_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		protected override void Given() {
-			ExistingEvent("test_stream", "type", @"{""v"": ""2:3:4"", ""c"": 100, ""p"": 50}", "data");
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_stream = new EmittedStream(
-				"test_stream",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
-				new ProjectionVersion(1, 2, 2), new TransactionFilePositionTagger(0),
-				CheckpointTag.FromPosition(0, 0, -1),
-				_bus, _ioDispatcher, _readyHandler);
-			_stream.Start();
-		}
-
-		[Test]
-		public void fails_the_projection() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 100, 50), CheckpointTag.FromPosition(0, 40, 20))
-				});
-			Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
-			Assert.AreEqual(1, _readyHandler.HandledFailedMessages.Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_a_read_completes_before_a_timeout_in_recovery.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_a_read_completes_before_a_timeout_in_recovery.cs
deleted file mode 100644
index 9962fdb0ea9..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_a_read_completes_before_a_timeout_in_recovery.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_a_read_completes_before_a_timeout_in_recovery<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private const string TestStreamId = "test_stream";
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-		private List<TimerMessage.Schedule> timerMessages = new();
-
-		protected override void Given() {
-			AllWritesQueueUp();
-			ExistingEvent(TestStreamId, "type", @"{""c"": 100, ""p"": 50}", "data");
-			ReadsBackwardQueuesUp();
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_bus.Subscribe(new AdHocHandler<TimerMessage.Schedule>(msg => timerMessages.Add(msg)));
-
-			_stream = new EmittedStream(
-				TestStreamId,
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
-				new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
-				CheckpointTag.FromPosition(0, 40, 30),
-				_bus, _ioDispatcher, _readyHandler);
-			_stream.Start();
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						TestStreamId, Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 200, 150), null)
-				});
-			CompleteOneReadBackwards();
-		}
-
-		[Test]
-		public void should_not_retry_the_read_upon_the_read_timing_out() {
-			var timerMessage = timerMessages.FirstOrDefault();
-			Assert.NotNull(timerMessage,
-				$"Expected a {nameof(TimerMessage.Schedule)} to have been published, but none were received");
-			timerMessage.Reply();
-
-			var readEventsBackwards = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsBackward>()
-				.Where(x => x.EventStreamId == TestStreamId);
-
-			Assert.AreEqual(1, readEventsBackwards.Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_a_read_times_out_in_recovery.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_a_read_times_out_in_recovery.cs
deleted file mode 100644
index f2cd339372b..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_a_read_times_out_in_recovery.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_a_read_times_out_in_recovery<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private const string TestStreamId = "test_stream";
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-		private List<TimerMessage.Schedule> timerMessages = new();
-
-		protected override void Given() {
-			AllWritesQueueUp();
-			ExistingEvent(TestStreamId, "type", @"{""c"": 100, ""p"": 50}", "data");
-			ReadsBackwardQueuesUp();
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_bus.Subscribe(new AdHocHandler<TimerMessage.Schedule>(msg => timerMessages.Add(msg)));
-
-			_stream = new EmittedStream(
-				TestStreamId,
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
-				new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
-				CheckpointTag.FromPosition(0, 40, 30),
-				_bus, _ioDispatcher, _readyHandler);
-			_stream.Start();
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						TestStreamId, Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 200, 150), null)
-				});
-		}
-
-		[Test]
-		public void should_retry_the_read_upon_the_read_timing_out() {
-			var timerMessage = timerMessages.FirstOrDefault();
-			Assert.NotNull(timerMessage,
-				$"Expected a {nameof(TimerMessage.Schedule)} to have been published, but none were received");
-
-			timerMessage.Reply();
-
-			var readEventsBackwards = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsBackward>()
-							.Where(x => x.EventStreamId == TestStreamId).ToArray();
-			Assert.AreEqual(2, readEventsBackwards.Length);
-			Assert.AreEqual(readEventsBackwards[0].FromEventNumber, readEventsBackwards[1].FromEventNumber);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested.cs
deleted file mode 100644
index 3f39e8fd68d..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture]
-	public class when_checkpoint_requested : TestFixtureWithReadWriteDispatchers {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			;
-			_stream = new EmittedStream(
-				"test",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50), new ProjectionVersion(1, 0, 0),
-				new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _bus, _ioDispatcher,
-				_readyHandler);
-			_stream.Start();
-			_stream.Checkpoint();
-		}
-
-		[Test]
-		public void emit_events_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_stream.EmitEvents(
-					new[] {
-						new EmittedDataEvent(
-							"test", Guid.NewGuid(), "type2", true, "data2", null, CheckpointTag.FromPosition(0, -1, -1),
-							null)
-					});
-			});
-		}
-
-		[Test]
-		public void checkpoint_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => { _stream.Checkpoint(); });
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested_but_disabled.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested_but_disabled.cs
deleted file mode 100644
index 8ba1d885771..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested_but_disabled.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture]
-	public class when_checkpoint_requested_but_disabled : TestFixtureWithReadWriteDispatchers {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-		private Exception _exception;
-
-		[SetUp]
-		public void setup() {
-			_exception = null;
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_stream = new EmittedStream(
-				"test",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50), new ProjectionVersion(1, 0, 0),
-				new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _bus, _ioDispatcher,
-				_readyHandler,
-				noCheckpoints: true);
-			_stream.Start();
-			try {
-				_stream.Checkpoint();
-			} catch (Exception ex) {
-				_exception = ex;
-			}
-		}
-
-		[Test]
-		public void invalid_operation_exceptioon_is_thrown() {
-			Assert.IsNotNull(_exception);
-			Assert.IsInstanceOf<InvalidOperationException>(_exception);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested_with_all_writes_already_completed.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested_with_all_writes_already_completed.cs
deleted file mode 100644
index ba2d2fa9914..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested_with_all_writes_already_completed.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_checkpoint_requested_with_all_writes_already_completed<TLogFormat, TStreamId> : core_projection.TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		protected override void Given() {
-			base.Given();
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		[SetUp]
-		public void Setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_stream = new EmittedStream(
-				"test",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50), new ProjectionVersion(1, 0, 0),
-				new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _bus, _ioDispatcher,
-				_readyHandler);
-			_stream.Start();
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test", Guid.NewGuid(), "type", true, "data", null, CheckpointTag.FromPosition(0, 10, 5), null)
-				});
-			var msg = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().First();
-			_bus.Publish(new ClientMessage.WriteEventsCompleted(msg.CorrelationId, 0, 0, -1, -1));
-			_stream.Checkpoint();
-		}
-
-		[Test]
-		public void publishes_ready_for_checkpoint() {
-			Assert.IsTrue(
-				_readyHandler.HandledMessages.ContainsSingle<CoreProjectionProcessingMessage.ReadyForCheckpoint>());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested_with_pending_writes.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested_with_pending_writes.cs
deleted file mode 100644
index eabf38c11f4..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested_with_pending_writes.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_checkpoint_requested_with_pending_writes<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		protected override void Given() {
-			base.Given();
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			;
-			_stream = new EmittedStream(
-				"test",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50), new ProjectionVersion(1, 0, 0),
-				new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _bus, _ioDispatcher,
-				_readyHandler);
-			_stream.Start();
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test", Guid.NewGuid(), "type", true, "data", null, CheckpointTag.FromPosition(0, 100, 50),
-						null)
-				});
-			_stream.Checkpoint();
-		}
-
-		[Test]
-		public void does_not_publish_ready_for_checkpoint_immediately() {
-			Assert.AreEqual(
-				0, _consumer.HandledMessages.OfType<CoreProjectionProcessingMessage.ReadyForCheckpoint>().Count());
-		}
-
-		[Test]
-		public void publishes_ready_for_checkpoint_on_handling_last_write_events_completed() {
-			var msg = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().First();
-			_bus.Publish(new ClientMessage.WriteEventsCompleted(msg.CorrelationId, 0, 0, -1, -1));
-			Assert.AreEqual(
-				1, _readyHandler.HandledMessages.OfType<CoreProjectionProcessingMessage.ReadyForCheckpoint>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_creating_an_emitted_stream.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_creating_an_emitted_stream.cs
deleted file mode 100644
index 0d4770d8e95..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_creating_an_emitted_stream.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using System;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture]
-	public class when_creating_an_emitted_stream {
-		private FakePublisher _fakePublisher;
-		private IODispatcher _ioDispatcher;
-
-
-		[SetUp]
-		public void setup() {
-			_fakePublisher = new FakePublisher();
-			_ioDispatcher = new IODispatcher(_fakePublisher, _fakePublisher, true);
-		}
-
-		[Test]
-		public void null_stream_id_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				new EmittedStream(
-					null,
-					new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-						new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50),
-					new ProjectionVersion(1, 0, 0),
-					new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _fakePublisher,
-					_ioDispatcher,
-					new TestCheckpointManagerMessageHandler());
-			});
-		}
-
-		[Test]
-		public void null_writer_configuration_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				new EmittedStream(
-					null, null, new ProjectionVersion(1, 0, 0),
-					new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _fakePublisher,
-					_ioDispatcher,
-					new TestCheckpointManagerMessageHandler());
-			});
-		}
-
-		[Test]
-		public void empty_stream_id_throws_argument_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				new EmittedStream(
-					"",
-					new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-						new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50),
-					new ProjectionVersion(1, 0, 0),
-					new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _fakePublisher,
-					_ioDispatcher,
-					new TestCheckpointManagerMessageHandler());
-			});
-		}
-
-		[Test]
-		public void null_from_throws_argument_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				new EmittedStream(
-					"",
-					new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-						new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50),
-					new ProjectionVersion(1, 0, 0),
-					new TransactionFilePositionTagger(0), null, _fakePublisher, _ioDispatcher,
-					new TestCheckpointManagerMessageHandler());
-			});
-		}
-
-		[Test]
-		public void null_publisher_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				new EmittedStream(
-					"test",
-					new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-						new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50),
-					new ProjectionVersion(1, 0, 0),
-					new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), null, _ioDispatcher,
-					new TestCheckpointManagerMessageHandler());
-			});
-		}
-
-		[Test]
-		public void null_io_dispatcher_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				new EmittedStream(
-					"test",
-					new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-						new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50),
-					new ProjectionVersion(1, 0, 0),
-					new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _fakePublisher, null,
-					new TestCheckpointManagerMessageHandler());
-			});
-		}
-
-		[Test]
-		public void null_ready_handler_throws_argumenbt_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				new EmittedStream(
-					"test",
-					new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-						new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50),
-					new ProjectionVersion(1, 0, 0),
-					new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _fakePublisher,
-					_ioDispatcher, null);
-			});
-		}
-
-		[Test]
-		public void it_can_be_created() {
-			new EmittedStream(
-				"test",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50), new ProjectionVersion(1, 0, 0),
-				new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _fakePublisher,
-				_ioDispatcher,
-				new TestCheckpointManagerMessageHandler());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_a_timeout.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_a_timeout.cs
deleted file mode 100644
index 0d840aba1ba..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_a_timeout.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using System.Collections.Generic;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream.another_epoch {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_a_timeout<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		protected override void Given() {
-			AllWritesQueueUp();
-			ExistingEvent("test_stream", "type1", @"{""v"": 1, ""c"": 100, ""p"": 50}", "data");
-			ExistingEvent("test_stream", "type1", @"{""v"": 2, ""c"": 100, ""p"": 50}", "data");
-		}
-
-		private EmittedEvent[] CreateEventBatch() {
-			return new EmittedEvent[] {
-				new EmittedDataEvent(
-					(string)"test_stream", Guid.NewGuid(), (string)"type1", (bool)true,
-					(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
-					null),
-				new EmittedDataEvent(
-					(string)"test_stream", Guid.NewGuid(), (string)"type2", (bool)true,
-					(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
-					null),
-				new EmittedDataEvent(
-					(string)"test_stream", Guid.NewGuid(), (string)"type3", (bool)true,
-					(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
-					null)
-			};
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_stream = new EmittedStream(
-				"test_stream",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
-				new ProjectionVersion(1, 2, 2), new TransactionFilePositionTagger(0), CheckpointTag.Empty,
-				_bus, _ioDispatcher, _readyHandler);
-			_stream.Start();
-			_stream.EmitEvents(CreateEventBatch());
-
-			CompleteWriteWithResult(OperationResult.CommitTimeout);
-		}
-
-		[Test]
-		public void should_retry_the_write_with_the_same_events() {
-			var current = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Last();
-			while (_consumer.HandledMessages.Last().GetType() ==
-			       typeof(EventStore.Core.Services.TimerService.TimerMessage.Schedule)) {
-				var message =
-					_consumer.HandledMessages.Last() as EventStore.Core.Services.TimerService.TimerMessage.Schedule;
-				message.Envelope.ReplyWith(message.ReplyMessage);
-
-				CompleteWriteWithResult(OperationResult.CommitTimeout);
-
-				var last = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Last();
-
-				Assert.AreEqual(current.EventStreamId, last.EventStreamId);
-				Assert.AreEqual(current.Events, last.Events);
-
-				current = last;
-			}
-
-			Assert.AreEqual(1,
-				_readyHandler.HandledFailedMessages.OfType<CoreProjectionProcessingMessage.Failed>().Count(),
-				"Should fail the projection after exhausting all the write retries");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_the_not_started_stream.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_the_not_started_stream.cs
deleted file mode 100644
index 77247db3360..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_the_not_started_stream.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_an_emit_the_not_started_stream<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private EmittedStream _stream;
-
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		protected override void Given() {
-			base.Given();
-			NoStream("test");
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			;
-			_stream = new EmittedStream(
-				"test",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50), new ProjectionVersion(1, 0, 0),
-				new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _bus, _ioDispatcher,
-				_readyHandler);
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test", Guid.NewGuid(), "type", true, "data", null, CheckpointTag.FromPosition(0, 200, 150),
-						null)
-				});
-		}
-
-		[Test]
-		public void does_not_publish_write_events() {
-			Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
-		}
-
-		[Test]
-		public void publishes_write_events_when_started() {
-			_stream.Start();
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_the_started_in_recovery_stream.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_the_started_in_recovery_stream.cs
deleted file mode 100644
index 3eb5ec0ddd8..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_the_started_in_recovery_stream.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_an_emit_the_started_in_recovery_stream<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		protected override void Given() {
-			AllWritesQueueUp();
-			ExistingEvent("test_stream", "type", @"{""c"": 100, ""p"": 50}", "data");
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_stream = new EmittedStream(
-				"test_stream",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
-				new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
-				CheckpointTag.FromPosition(0, 40, 30),
-				_bus, _ioDispatcher, _readyHandler);
-			_stream.Start();
-		}
-
-		[Test]
-		public void throws_if_position_is_prior_to_from_position() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_stream.EmitEvents(
-					new[] {
-						new EmittedDataEvent(
-							"test_stream", Guid.NewGuid(), "type", true, "data", null,
-							CheckpointTag.FromPosition(0, 20, 10), null)
-					});
-			});
-		}
-
-		[Test]
-		public void does_not_publish_already_published_events() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 100, 50), null)
-				});
-			Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
-		}
-
-		[Test]
-		public void publishes_not_yet_published_events() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 200, 150), null)
-				});
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
-		}
-
-		[Test]
-		public void does_not_reply_with_write_completed_message() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 200, 150), null)
-				});
-			Assert.AreEqual(0, _readyHandler.HandledWriteCompletedMessage.Count);
-		}
-
-		[Test]
-		public void reply_with_write_completed_message_when_write_completes() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 200, 150), null)
-				});
-			OneWriteCompletes();
-			Assert.IsTrue(_readyHandler.HandledWriteCompletedMessage.Any(v => v.StreamId == "test_stream"));
-			// more than one is ok
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_to_the_nonexisting_stream.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_to_the_nonexisting_stream.cs
deleted file mode 100644
index 61a79fe4e7b..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_to_the_nonexisting_stream.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Services;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_an_emit_to_the_nonexisting_stream<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		protected override void Given() {
-			AllWritesQueueUp();
-			AllWritesToSucceed("$$test_stream");
-			NoOtherStreams();
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_stream = new EmittedStream(
-				"test_stream",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
-				new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
-				CheckpointTag.FromPosition(0, 40, 30),
-				_bus, _ioDispatcher, _readyHandler);
-			_stream.Start();
-		}
-
-		[Test]
-		public void throws_if_position_is_prior_to_from_position() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_stream.EmitEvents(
-					new[] {
-						new EmittedDataEvent(
-							"test_stream", Guid.NewGuid(), "type", true, "data", null,
-							CheckpointTag.FromPosition(0, 20, 10), null)
-					});
-			});
-		}
-
-		[Test]
-		public void publishes_already_published_events() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 100, 50), null)
-				});
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
-					.ExceptOfEventType(SystemEventTypes.StreamMetadata)
-					.Count());
-		}
-
-		[Test]
-		public void publishes_not_yet_published_events() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 200, 150), null)
-				});
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
-					.ExceptOfEventType(SystemEventTypes.StreamMetadata)
-					.Count());
-		}
-
-		[Test]
-		public void does_not_reply_with_write_completed_message() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 200, 150), null)
-				});
-			Assert.AreEqual(0, _readyHandler.HandledWriteCompletedMessage.Count);
-		}
-
-		[Test]
-		public void reply_with_write_completed_message_when_write_completes() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 200, 150), null)
-				});
-			OneWriteCompletes();
-			Assert.IsTrue(_readyHandler.HandledWriteCompletedMessage.Any(v => v.StreamId == "test_stream"));
-			// more than one is ok
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_caused_by_and_correlation_id.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_caused_by_and_correlation_id.cs
deleted file mode 100644
index dcbbf05103a..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_caused_by_and_correlation_id.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Messages;
-using EventStore.Core.Services;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using Newtonsoft.Json.Linq;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_an_emit_with_caused_by_and_correlation_id<TLogFormat, TStreamId> : core_projection.TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-		private EmittedDataEvent _emittedDataEvent;
-		private Guid _causedBy;
-		private string _correlationId;
-
-		protected override void Given() {
-			AllWritesQueueUp();
-			AllWritesToSucceed("$$test_stream");
-			NoOtherStreams();
-		}
-
-		[SetUp]
-		public void setup() {
-			_causedBy = Guid.NewGuid();
-			_correlationId = "correlation_id";
-
-			_emittedDataEvent = new EmittedDataEvent(
-				"test_stream", Guid.NewGuid(), "type", true, "data", null, CheckpointTag.FromPosition(0, 200, 150),
-				null);
-
-			_emittedDataEvent.SetCausedBy(_causedBy);
-			_emittedDataEvent.SetCorrelationId(_correlationId);
-
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_stream = new EmittedStream(
-				"test_stream",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
-				new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
-				CheckpointTag.FromPosition(0, 40, 30),
-				_bus, _ioDispatcher, _readyHandler);
-			_stream.Start();
-			_stream.EmitEvents(new[] {_emittedDataEvent});
-		}
-
-
-		[Test]
-		public void publishes_write_events() {
-			var writeEvents =
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
-					.ExceptOfEventType(SystemEventTypes.StreamMetadata)
-					.ToArray();
-			Assert.AreEqual(1, writeEvents.Length);
-			var writeEvent = writeEvents.Single();
-			Assert.NotNull(writeEvent.Metadata);
-			var metadata = Helper.UTF8NoBom.GetString(writeEvent.Metadata);
-			HelperExtensions.AssertJson(
-				new {___causedBy = _causedBy, ___correlationId = _correlationId}, metadata.ParseJson<JObject>());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_committed_callback.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_committed_callback.cs
deleted file mode 100644
index be8d092c252..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_committed_callback.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_an_emit_with_committed_callback<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		protected override void Given() {
-			ExistingEvent("test_stream", "type", @"{""c"": 100, ""p"": 50}", "data");
-			AllWritesSucceed();
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_stream = new EmittedStream(
-				"test_stream",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
-				new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
-				CheckpointTag.FromPosition(0, 0, -1),
-				_bus, _ioDispatcher, _readyHandler);
-			_stream.Start();
-		}
-
-		[Test]
-		public void completes_already_published_events() {
-			var invoked = false;
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						(string)"test_stream", Guid.NewGuid(), (string)"type", (bool)true,
-						(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50),
-						(CheckpointTag)null, v => invoked = true)
-				});
-			Assert.IsTrue(invoked);
-		}
-
-		[Test]
-		public void completes_not_yet_published_events() {
-			var invoked = false;
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						(string)"test_stream", Guid.NewGuid(), (string)"type", (bool)true,
-						(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 200, 150),
-						(CheckpointTag)null, v => invoked = true)
-				});
-			Assert.IsTrue(invoked);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream.cs
deleted file mode 100644
index 570b567fad4..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		protected override void Given() {
-			ExistingEvent("test_stream", "type", @"{""c"": 100, ""p"": 50}", "data");
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_stream = new EmittedStream(
-				"test_stream",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
-				new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
-				CheckpointTag.FromPosition(0, 0, -1),
-				_bus, _ioDispatcher, _readyHandler);
-			_stream.Start();
-		}
-
-		[Test]
-		public void does_not_publish_already_published_events() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 100, 50), CheckpointTag.FromPosition(0, 40, 20))
-				});
-			Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
-		}
-
-		[Test]
-		public void publishes_not_yet_published_events_if_expected_tag_is_the_same() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 200, 150), CheckpointTag.FromPosition(0, 100, 50))
-				});
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
-		}
-
-		[Test]
-		public void does_not_publish_not_yet_published_events_if_expected_tag_is_before_last_event_tag() {
-			//TODO: is it corrupted dB case? 
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 200, 150), CheckpointTag.FromPosition(0, 40, 20))
-				});
-			Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
-		}
-
-		[Test]
-		public void correct_stream_id_is_set_on_write_events_message() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 200, 150), CheckpointTag.FromPosition(0, 100, 50))
-				});
-			Assert.AreEqual(
-				"test_stream", _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Single().EventStreamId);
-		}
-
-		[Test]
-		public void metadata_include_commit_and_prepare_positions() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 200, 150), CheckpointTag.FromPosition(0, 100, 50))
-				});
-			var metaData =
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Single().Events[0].Metadata
-					.ParseCheckpointTagVersionExtraJson(default(ProjectionVersion));
-			Assert.AreEqual(200, metaData.Tag.CommitPosition);
-			Assert.AreEqual(150, metaData.Tag.PreparePosition);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_extra_metadata.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_extra_metadata.cs
deleted file mode 100644
index 7d344fb7811..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_extra_metadata.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using Newtonsoft.Json.Linq;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_an_emit_with_extra_metadata<TLogFormat, TStreamId> : core_projection.TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		protected override void Given() {
-			AllWritesQueueUp();
-			ExistingEvent("test_stream", "type", @"{""c"": 100, ""p"": 50}", "data");
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_stream = new EmittedStream(
-				"test_stream",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
-				new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
-				CheckpointTag.FromPosition(0, 40, 30),
-				_bus, _ioDispatcher, _readyHandler);
-			_stream.Start();
-
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data",
-						new ExtraMetaData(new Dictionary<string, string> {{"a", "1"}, {"b", "{}"}}),
-						CheckpointTag.FromPosition(0, 200, 150), null)
-				});
-		}
-
-		[Test]
-		public void publishes_not_yet_published_events() {
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
-		}
-
-		[Test]
-		public void combines_checkpoint_tag_with_extra_metadata() {
-			var writeEvent = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Single();
-
-			Assert.AreEqual(1, writeEvent.Events.Length);
-			var @event = writeEvent.Events[0];
-			var metadata = Helper.UTF8NoBom.GetString(@event.Metadata).ParseJson<JObject>();
-
-			HelperExtensions.AssertJson(new {a = 1, b = new { }}, metadata);
-			var checkpoint = @event.Metadata.ParseCheckpointTagJson();
-			Assert.AreEqual(CheckpointTag.FromPosition(0, 200, 150), checkpoint);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_not_ready_event.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_not_ready_event.cs
deleted file mode 100644
index 370c1c0eb4d..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_not_ready_event.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Services;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_an_emit_with_not_ready_event<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		protected override void Given() {
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_stream = new EmittedStream(
-				"test_stream",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
-				new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
-				CheckpointTag.FromPosition(0, 0, -1),
-				_bus, _ioDispatcher, _readyHandler);
-			_stream.Start();
-		}
-
-		[Test]
-		public void replies_with_await_message() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedLinkTo(
-						"test_stream", Guid.NewGuid(), "other_stream", CheckpointTag.FromPosition(0, 1100, 1000), null)
-				});
-			Assert.AreEqual(1, _readyHandler.HandledStreamAwaitingMessage.Count);
-			Assert.AreEqual("test_stream", _readyHandler.HandledStreamAwaitingMessage[0].StreamId);
-		}
-
-		[Test]
-		public void processes_write_on_write_completed_if_ready() {
-			var linkTo = new EmittedLinkTo(
-				"test_stream", Guid.NewGuid(), "other_stream", CheckpointTag.FromPosition(0, 1100, 1000), null);
-			_stream.EmitEvents(new[] {linkTo});
-			linkTo.SetTargetEventNumber(1);
-			_stream.Handle(new CoreProjectionProcessingMessage.EmittedStreamWriteCompleted("other_stream"));
-
-			Assert.AreEqual(1, _readyHandler.HandledStreamAwaitingMessage.Count);
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
-					.OfEventType(SystemEventTypes.LinkTo)
-					.Count());
-		}
-
-		[Test]
-		public void replies_with_await_message_on_write_completed_if_not_yet_ready() {
-			var linkTo = new EmittedLinkTo(
-				"test_stream", Guid.NewGuid(), "other_stream", CheckpointTag.FromPosition(0, 1100, 1000), null);
-			_stream.EmitEvents(new[] {linkTo});
-			_stream.Handle(new CoreProjectionProcessingMessage.EmittedStreamWriteCompleted("one_more_stream"));
-
-			Assert.AreEqual(2, _readyHandler.HandledStreamAwaitingMessage.Count);
-			Assert.AreEqual("test_stream", _readyHandler.HandledStreamAwaitingMessage[0].StreamId);
-			Assert.AreEqual("test_stream", _readyHandler.HandledStreamAwaitingMessage[1].StreamId);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_stream_metadata.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_stream_metadata.cs
deleted file mode 100644
index 77506949f1b..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_stream_metadata.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_an_emit_with_stream_metadata_to_empty_stream<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-		private EmittedStream.WriterConfiguration.StreamMetadata _streamMetadata;
-		private EmittedStream.WriterConfiguration _writerConfiguration;
-
-		protected override void Given() {
-			AllWritesQueueUp();
-			NoStream("test_stream");
-			_streamMetadata = new EmittedStream.WriterConfiguration.StreamMetadata(maxCount: 10);
-			_writerConfiguration = new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-				_streamMetadata, null, maxWriteBatchLength: 50);
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_stream = new EmittedStream(
-				"test_stream", _writerConfiguration, new ProjectionVersion(1, 0, 0),
-				new TransactionFilePositionTagger(0),
-				CheckpointTag.FromPosition(0, 40, 30), _bus, _ioDispatcher, _readyHandler);
-			_stream.Start();
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 200, 150), null)
-				});
-		}
-
-		[Test]
-		public void publishes_write_stream_metadata() {
-			Assert.AreEqual(
-				1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().ToStream("$$test_stream").Count());
-		}
-
-		[Test]
-		public void does_not_write_stream_metadata_second_time() {
-			OneWriteCompletes();
-			OneWriteCompletes();
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 400, 350), null)
-				});
-			Assert.AreEqual(
-				1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().ToStream("$$test_stream").Count());
-		}
-
-		[Test]
-		public void publishes_write_emitted_event_on_write_stream_metadata_completed() {
-			OneWriteCompletes();
-			Assert.AreEqual(
-				1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().ToStream("test_stream").Count());
-		}
-
-		[Test]
-		public void does_not_reply_with_write_completed_message() {
-			Assert.AreEqual(0, _readyHandler.HandledWriteCompletedMessage.Count);
-		}
-
-		[Test]
-		public void reply_with_write_completed_message_when_write_completes() {
-			OneWriteCompletes();
-			OneWriteCompletes();
-			Assert.IsTrue(_readyHandler.HandledWriteCompletedMessage.Any(v => v.StreamId == "test_stream"));
-			// more than one is ok
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_write_as_configured.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_write_as_configured.cs
deleted file mode 100644
index 57480cdc28c..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_write_as_configured.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-using System.Linq;
-using System.Security.Claims;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_an_emit_with_write_as_configured<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-		private ClaimsPrincipal _writeAs;
-
-		protected override void Given() {
-			AllWritesQueueUp();
-			ExistingEvent("test_stream", "type", @"{""c"": 100, ""p"": 50}", "data");
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_writeAs = new ClaimsPrincipal(new ClaimsIdentity(new []{new Claim(ClaimTypes.Role, "test-user") },"ES-Test"));
-			_stream = new EmittedStream(
-				"test_stream",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), _writeAs, maxWriteBatchLength: 50),
-				new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
-				CheckpointTag.FromPosition(0, 40, 30),
-				_bus, _ioDispatcher, _readyHandler);
-			_stream.Start();
-
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 200, 150), null)
-				});
-		}
-
-		[Test]
-		public void publishes_not_yet_published_events() {
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
-		}
-
-		[Test]
-		public void publishes_write_event_with_correct_user_account() {
-			var writeEvent = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Single();
-
-			Assert.AreSame(_writeAs, writeEvent.User);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_emits_in_invalid_order.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_emits_in_invalid_order.cs
deleted file mode 100644
index a7e13ff4635..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_emits_in_invalid_order.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_emits_in_invalid_order<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		protected override void Given() {
-			ExistingEvent("test_stream", "type", @"{""c"": 100, ""p"": 50}", "data");
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_stream = new EmittedStream(
-				"test_stream",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
-				new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
-				CheckpointTag.FromPosition(0, 40, 30),
-				_bus, _ioDispatcher, _readyHandler);
-			_stream.Start();
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 100, 90), null)
-				});
-		}
-
-		[Test]
-		public void throws_if_position_is_prior_to_the_last_event_position() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_stream.EmitEvents(
-					new[] {
-						new EmittedDataEvent(
-							"test_stream", Guid.NewGuid(), "type", true, "data", null,
-							CheckpointTag.FromPosition(0, 80, 70), null)
-					});
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_emits_with_previously_written_events.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_emits_with_previously_written_events.cs
deleted file mode 100644
index 528c41e5fd4..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_emits_with_previously_written_events.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_emits_with_previously_written_events<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		protected override void Given() {
-			AllWritesQueueUp();
-			ExistingEvent("test_stream", "type1", @"{""c"": 100, ""p"": 50}", "data");
-			ExistingEvent("test_stream", "type2", @"{""c"": 200, ""p"": 150}", "data");
-			ExistingEvent("test_stream", "type3", @"{""c"": 300, ""p"": 250}", "data");
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_stream = new EmittedStream(
-				"test_stream",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
-				new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
-				CheckpointTag.FromPosition(0, 100, 50), _bus, _ioDispatcher, _readyHandler);
-			_stream.Start();
-		}
-
-		[Test]
-		public void does_not_publish_already_published_events() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type2", true, "data", null,
-						CheckpointTag.FromPosition(0, 200, 150), null)
-				});
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type3", true, "data", null,
-						CheckpointTag.FromPosition(0, 300, 250), null)
-				});
-			Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
-		}
-
-		[Test]
-		public void does_not_fail_the_projection_if_events_are_skipped() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type3", true, "data", null,
-						CheckpointTag.FromPosition(0, 300, 250), null)
-				});
-			Assert.AreEqual(0, _readyHandler.HandledFailedMessages.Count);
-			Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
-		}
-
-		[Test]
-		public void fails_the_projection_if_events_are_at_different_positions() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type3", true, "data", null,
-						CheckpointTag.FromPosition(0, 250, 220), null)
-				});
-			Assert.AreEqual(1, _readyHandler.HandledFailedMessages.Count);
-			Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
-		}
-
-		[Test]
-		public void publishes_not_yet_published_events() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 400, 350), null)
-				});
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
-		}
-
-		[Test]
-		public void replies_with_write_completed_message_for_existing_events() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type2", true, "data", null,
-						CheckpointTag.FromPosition(0, 200, 150), null)
-				});
-			Assert.AreEqual(1, _readyHandler.HandledWriteCompletedMessage.Count);
-		}
-
-		[Test]
-		public void retrieves_event_number_for_previously_written_events() {
-			long eventNumber = -1;
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						(string)"test_stream", Guid.NewGuid(), (string)"type2", (bool)true,
-						(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 200, 150),
-						(CheckpointTag)null, v => eventNumber = v)
-				});
-			Assert.AreEqual(1, eventNumber);
-		}
-
-		[Test]
-		public void reply_with_write_completed_message_when_write_completes() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "type", true, "data", null,
-						CheckpointTag.FromPosition(0, 400, 350), null)
-				});
-			OneWriteCompletes();
-			Assert.IsTrue(_readyHandler.HandledWriteCompletedMessage.Any(v => v.StreamId == "test_stream"));
-			// more than one is ok
-		}
-
-		[Test]
-		public void reports_event_number_for_new_events() {
-			long eventNumber = -1;
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						(string)"test_stream", Guid.NewGuid(), (string)"type", (bool)true,
-						(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 400, 350),
-						(CheckpointTag)null, v => eventNumber = v)
-				});
-			OneWriteCompletes();
-			Assert.AreEqual(3, eventNumber);
-		}
-
-		[Test]
-		public void does_not_fail_if_link_event_target_does_not_exist() {
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test_stream", Guid.NewGuid(), "$>", true, "0@foobar", null,
-						CheckpointTag.FromPosition(0, 150, 100), null)
-				});
-			Assert.AreEqual(0, _readyHandler.HandledFailedMessages.Count);
-			Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.ReadEvent>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_emits_with_previously_written_events_at_the_same_position.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_emits_with_previously_written_events_at_the_same_position.cs
deleted file mode 100644
index 6c0981afd83..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_handling_emits_with_previously_written_events_at_the_same_position.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_handling_emits_with_previously_written_events_at_the_same_position<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-		private long _1;
-		private long _2;
-		private long _3;
-
-		protected override void Given() {
-			AllWritesQueueUp();
-			//NOTE: it is possible for a batch of events to be partially written if it contains links
-			ExistingEvent("test_stream", "type1", @"{""c"": 100, ""p"": 50}", "data");
-			ExistingEvent("test_stream", "type2", @"{""c"": 100, ""p"": 50}", "data");
-		}
-
-		private EmittedEvent[] CreateEventBatch() {
-			return new EmittedEvent[] {
-				new EmittedDataEvent(
-					(string)"test_stream", Guid.NewGuid(), (string)"type1", (bool)true,
-					(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
-					v => _1 = v),
-				new EmittedDataEvent(
-					(string)"test_stream", Guid.NewGuid(), (string)"type2", (bool)true,
-					(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
-					v => _2 = v),
-				new EmittedDataEvent(
-					(string)"test_stream", Guid.NewGuid(), (string)"type3", (bool)true,
-					(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
-					v => _3 = v)
-			};
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_stream = new EmittedStream(
-				"test_stream",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
-				new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
-				CheckpointTag.FromPosition(0, 20, 10),
-				_bus, _ioDispatcher, _readyHandler);
-			_stream.Start();
-			_stream.EmitEvents(CreateEventBatch());
-			OneWriteCompletes();
-		}
-
-		[Test]
-		public void publishes_not_yet_written_events_only() {
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
-			var writeMessage = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Single();
-			Assert.AreEqual(1, writeMessage.Events.Length);
-			Assert.AreEqual("type3", writeMessage.Events[0].EventType);
-		}
-
-		[Test]
-		public void reports_correct_event_numbers() {
-			Assert.AreEqual(0, _1);
-			Assert.AreEqual(1, _2);
-			Assert.AreEqual(2, _3);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_the_stream_is_started.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_the_stream_is_started.cs
deleted file mode 100644
index ba89c2a1ac9..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_the_stream_is_started.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture]
-	public class when_the_stream_is_started : TestFixtureWithReadWriteDispatchers {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			_stream = new EmittedStream(
-				"test",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50), new ProjectionVersion(1, 0, 0),
-				new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _bus, _ioDispatcher,
-				_readyHandler);
-			;
-			_stream.Start();
-		}
-
-		[Test]
-		public void start_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => { _stream.Start(); });
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_the_stream_is_started_with_already_emitted_events.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_the_stream_is_started_with_already_emitted_events.cs
deleted file mode 100644
index ba480241bd7..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_stream/when_the_stream_is_started_with_already_emitted_events.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_the_stream_is_started_with_already_emitted_events<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private EmittedStream _stream;
-		private TestCheckpointManagerMessageHandler _readyHandler;
-
-		protected override void Given() {
-			base.Given();
-			NoStream("test");
-		}
-
-		[SetUp]
-		public void setup() {
-			_readyHandler = new TestCheckpointManagerMessageHandler();
-			;
-			_stream = new EmittedStream(
-				"test",
-				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
-					new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50), new ProjectionVersion(1, 0, 0),
-				new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _bus, _ioDispatcher,
-				_readyHandler);
-			_stream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						"test", Guid.NewGuid(), "type", true, "data", null, CheckpointTag.FromPosition(0, 100, 50),
-						null)
-				});
-			_stream.Start();
-		}
-
-		[Test]
-		public void publishes_write_events() {
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/when_checkpoint_read_times_out.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/when_checkpoint_read_times_out.cs
deleted file mode 100644
index 38b612b16d6..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/when_checkpoint_read_times_out.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_streams_deleter.when_deleting {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_checkpoint_read_times_out<TLogFormat, TStreamId> : with_emitted_stream_deleter<TLogFormat, TStreamId>,
-		IHandle<TimerMessage.Schedule> {
-		protected Action _onDeleteStreamCompleted;
-		private ManualResetEventSlim _mre = new ManualResetEventSlim();
-		private List<ClientMessage.DeleteStream> _deleteMessages = new List<ClientMessage.DeleteStream>();
-		private bool _hasTimerTimedOut;
-
-		private Guid _timedOutCorrelationId;
-
-		public override void When() {
-			_bus.Subscribe<TimerMessage.Schedule>(this);
-			_onDeleteStreamCompleted = () => { _mre.Set(); };
-
-			_deleter.DeleteEmittedStreams(_onDeleteStreamCompleted);
-		}
-
-		public override void Handle(ClientMessage.ReadStreamEventsBackward message) {
-			if (message.CorrelationId == _timedOutCorrelationId) {
-				return;
-			} else {
-				base.Handle(message);
-			}
-		}
-
-		public override void Handle(ClientMessage.DeleteStream message) {
-			_deleteMessages.Add(message);
-			message.Envelope.ReplyWith(new ClientMessage.DeleteStreamCompleted(
-				message.CorrelationId, OperationResult.Success, String.Empty));
-		}
-
-		public void Handle(TimerMessage.Schedule message) {
-			if (!_hasTimerTimedOut) {
-				var delay = message.ReplyMessage as IODispatcherDelayedMessage;
-				if (delay != null) {
-					_timedOutCorrelationId = delay.MessageCorrelationId.Value;
-					_hasTimerTimedOut = true;
-					message.Reply();
-				}
-			}
-		}
-
-		[Test]
-		public void should_have_deleted_the_tracked_emitted_stream() {
-			if (!_mre.Wait(10000)) {
-				Assert.Fail("Timed out waiting for event to be deleted");
-			}
-
-			Assert.AreEqual(_testStreamName, _deleteMessages[0].EventStreamId);
-			Assert.AreEqual(_checkpointName, _deleteMessages[1].EventStreamId);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/when_delete_stream_succeeds.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/when_delete_stream_succeeds.cs
deleted file mode 100644
index 42b4dd8b7bf..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/when_delete_stream_succeeds.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_streams_deleter.when_deleting {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_delete_stream_succeeds<TLogFormat, TStreamId> : with_emitted_stream_deleter<TLogFormat, TStreamId> {
-		protected Action _onDeleteStreamCompleted;
-		private readonly ManualResetEventSlim _mre = new ManualResetEventSlim();
-		private readonly List<ClientMessage.DeleteStream> _deleteMessages = new List<ClientMessage.DeleteStream>();
-
-		public override void When() {
-			_onDeleteStreamCompleted = () => { _mre.Set(); };
-
-			_deleter.DeleteEmittedStreams(_onDeleteStreamCompleted);
-		}
-
-		public override void Handle(ClientMessage.DeleteStream message) {
-			_deleteMessages.Add(message);
-			message.Envelope.ReplyWith(new ClientMessage.DeleteStreamCompleted(
-				message.CorrelationId, OperationResult.Success, String.Empty));
-		}
-
-		[Test]
-		public void should_have_deleted_the_tracked_emitted_stream() {
-			if (!_mre.Wait(10000)) {
-				Assert.Fail("Timed out waiting for event to be deleted");
-			}
-
-			Assert.AreEqual(_testStreamName, _deleteMessages[0].EventStreamId);
-			Assert.AreEqual(_checkpointName, _deleteMessages[1].EventStreamId);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/when_emitted_streams_read_times_out.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/when_emitted_streams_read_times_out.cs
deleted file mode 100644
index 1de61a6c406..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/when_emitted_streams_read_times_out.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_streams_deleter.when_deleting {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_emitted_streams_read_times_out<TLogFormat, TStreamId> : with_emitted_stream_deleter<TLogFormat, TStreamId>,
-		IHandle<TimerMessage.Schedule> {
-		protected Action _onDeleteStreamCompleted;
-		private ManualResetEventSlim _mre = new ManualResetEventSlim();
-		private List<ClientMessage.DeleteStream> _deleteMessages = new List<ClientMessage.DeleteStream>();
-		private bool _hasTimedOut;
-
-		private Guid _timedOutCorrelationId;
-
-		public override void When() {
-			_bus.Subscribe<TimerMessage.Schedule>(this);
-			_onDeleteStreamCompleted = () => { _mre.Set(); };
-
-			_deleter.DeleteEmittedStreams(_onDeleteStreamCompleted);
-		}
-
-		public override void Handle(ClientMessage.ReadStreamEventsForward message) {
-			if (!_hasTimedOut) {
-				_hasTimedOut = true;
-				_timedOutCorrelationId = message.CorrelationId;
-				return;
-			} else {
-				base.Handle(message);
-			}
-		}
-
-		public override void Handle(ClientMessage.DeleteStream message) {
-			_deleteMessages.Add(message);
-			message.Envelope.ReplyWith(new ClientMessage.DeleteStreamCompleted(
-				message.CorrelationId, OperationResult.Success, String.Empty));
-		}
-
-		public void Handle(TimerMessage.Schedule message) {
-			var delay = message.ReplyMessage as IODispatcherDelayedMessage;
-			if (delay != null && delay.MessageCorrelationId.Value == _timedOutCorrelationId) {
-				message.Reply();
-			}
-		}
-
-		[Test]
-		public void should_have_deleted_the_tracked_emitted_stream() {
-			if (!_mre.Wait(10000)) {
-				Assert.Fail("Timed out waiting for event to be deleted");
-			}
-
-			Assert.AreEqual(_testStreamName, _deleteMessages[0].EventStreamId);
-			Assert.AreEqual(_checkpointName, _deleteMessages[1].EventStreamId);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_an_existing_emitted_streams_stream.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_an_existing_emitted_streams_stream.cs
deleted file mode 100644
index 98904c3442f..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_an_existing_emitted_streams_stream.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using EventStore.ClientAPI;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_streams_deleter.when_deleting {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_an_existing_emitted_streams_stream<TLogFormat, TStreamId> : SpecificationWithEmittedStreamsTrackerAndDeleter<TLogFormat, TStreamId> {
-		protected Action _onDeleteStreamCompleted;
-		protected ManualResetEvent _resetEvent = new ManualResetEvent(false);
-		private string _testStreamName = "test_stream";
-		private ManualResetEvent _eventAppeared = new ManualResetEvent(false);
-		private EventStore.ClientAPI.SystemData.UserCredentials _credentials;
-
-		protected override async Task Given() {
-			_credentials = new EventStore.ClientAPI.SystemData.UserCredentials("admin", "changeit");
-			_onDeleteStreamCompleted = () => { _resetEvent.Set(); };
-
-			await base.Given();
-			var sub = await _conn.SubscribeToStreamAsync(_projectionNamesBuilder.GetEmittedStreamsName(), true, (s, evnt) => {
-				_eventAppeared.Set();
-				return Task.CompletedTask;
-			}, userCredentials: _credentials);
-
-			_emittedStreamsTracker.TrackEmittedStream(new EmittedEvent[] {
-				new EmittedDataEvent(
-					_testStreamName, Guid.NewGuid(), "type1", true,
-					"data", null, CheckpointTag.FromPosition(0, 100, 50), null),
-			});
-
-			if (!_eventAppeared.WaitOne(TimeSpan.FromSeconds(5))) {
-				Assert.Fail("Timed out waiting for emitted stream event");
-			}
-
-			sub.Unsubscribe();
-
-			var emittedStreamResult =
-				await _conn.ReadStreamEventsForwardAsync(_projectionNamesBuilder.GetEmittedStreamsName(), 0, 1, false,
-					_credentials);
-			Assert.AreEqual(1, emittedStreamResult.Events.Length);
-			Assert.AreEqual(SliceReadStatus.Success, emittedStreamResult.Status);
-		}
-
-		protected override Task When() {
-			_emittedStreamsDeleter.DeleteEmittedStreams(_onDeleteStreamCompleted);
-			if (!_resetEvent.WaitOne(TimeSpan.FromSeconds(10))) {
-				throw new Exception("Timed out waiting callback.");
-			}
-
-			return Task.CompletedTask;
-		}
-
-		[Test]
-		public async Task should_have_deleted_the_tracked_emitted_stream() {
-			var result = await _conn.ReadStreamEventsForwardAsync(_testStreamName, 0, 1, false,
-				new EventStore.ClientAPI.SystemData.UserCredentials("admin", "changeit"));
-			Assert.AreEqual(SliceReadStatus.StreamNotFound, result.Status);
-		}
-
-
-		[Test]
-		public async Task should_have_deleted_the_checkpoint_stream() {
-			var result = await _conn.ReadStreamEventsForwardAsync(_projectionNamesBuilder.GetEmittedStreamsCheckpointName(),
-				0, 1, false, new EventStore.ClientAPI.SystemData.UserCredentials("admin", "changeit"));
-			Assert.AreEqual(SliceReadStatus.StreamNotFound, result.Status);
-		}
-
-		[Test]
-		public async Task should_have_deleted_the_emitted_streams_stream() {
-			var result = await _conn.ReadStreamEventsForwardAsync(_projectionNamesBuilder.GetEmittedStreamsName(), 0, 1,
-				false, new EventStore.ClientAPI.SystemData.UserCredentials("admin", "changeit"));
-			Assert.AreEqual(SliceReadStatus.StreamNotFound, result.Status);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_emitted_stream_deleter.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_emitted_stream_deleter.cs
deleted file mode 100644
index 75724447bc4..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_emitted_stream_deleter.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.Tests.Helpers.IODispatcherTests;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_streams_deleter.when_deleting {
-	public abstract class with_emitted_stream_deleter<TLogFormat, TStreamId> : IHandle<ClientMessage.ReadStreamEventsForward>,
-		IHandle<ClientMessage.ReadStreamEventsBackward>,
-		IHandle<ClientMessage.DeleteStream> {
-		protected SynchronousScheduler _bus = new();
-		protected IODispatcher _ioDispatcher;
-		protected EmittedStreamsDeleter _deleter;
-		protected ProjectionNamesBuilder _projectionNamesBuilder;
-		protected string _projectionName = "test_projection";
-		protected string _checkpointName;
-		protected string _testStreamName = "test_stream";
-		private bool _hasReadForward;
-
-		[OneTimeSetUp]
-		protected virtual void SetUp() {
-			_ioDispatcher = new IODispatcher(_bus, _bus, true);
-			_projectionNamesBuilder = ProjectionNamesBuilder.CreateForTest(_projectionName);
-			_checkpointName = _projectionNamesBuilder.GetEmittedStreamsCheckpointName();
-
-			_deleter = new EmittedStreamsDeleter(_ioDispatcher,
-				_projectionNamesBuilder.GetEmittedStreamsName(),
-				_checkpointName);
-
-			IODispatcherTestHelpers.SubscribeIODispatcher(_ioDispatcher, _bus);
-
-			_bus.Subscribe<ClientMessage.ReadStreamEventsForward>(this);
-			_bus.Subscribe<ClientMessage.ReadStreamEventsBackward>(this);
-			_bus.Subscribe<ClientMessage.DeleteStream>(this);
-
-			When();
-		}
-
-		public abstract void When();
-
-		public virtual void Handle(ClientMessage.ReadStreamEventsBackward message) {
-			var events = IODispatcherTestHelpers.CreateResolvedEvent<TLogFormat, TStreamId>(message.EventStreamId,
-				ProjectionEventTypes.ProjectionCheckpoint, "0");
-			var reply = new ClientMessage.ReadStreamEventsBackwardCompleted(message.CorrelationId,
-				message.EventStreamId, message.FromEventNumber, message.MaxCount,
-				ReadStreamResult.Success, events, null, false, String.Empty, 0, message.FromEventNumber, true, 1000);
-
-			message.Envelope.ReplyWith(reply);
-		}
-
-		public virtual void Handle(ClientMessage.ReadStreamEventsForward message) {
-			ClientMessage.ReadStreamEventsForwardCompleted reply;
-
-			if (!_hasReadForward) {
-				_hasReadForward = true;
-				var events = IODispatcherTestHelpers.CreateResolvedEvent<TLogFormat, TStreamId>(message.EventStreamId,
-					ProjectionEventTypes.ProjectionCheckpoint, _testStreamName);
-				reply = new ClientMessage.ReadStreamEventsForwardCompleted(message.CorrelationId, message.EventStreamId,
-					message.FromEventNumber, message.MaxCount,
-					ReadStreamResult.Success, events, null, false, String.Empty, message.FromEventNumber + 1,
-					message.FromEventNumber, true, 1000);
-			} else {
-				reply = new ClientMessage.ReadStreamEventsForwardCompleted(message.CorrelationId, message.EventStreamId,
-					message.FromEventNumber, message.MaxCount,
-					ReadStreamResult.Success, new ResolvedEvent[] { }, null, false, String.Empty,
-					message.FromEventNumber, message.FromEventNumber, true, 1000);
-			}
-
-			message.Envelope.ReplyWith(reply);
-		}
-
-		public abstract void Handle(ClientMessage.DeleteStream message);
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_multiple_tracked_streams.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_multiple_tracked_streams.cs
deleted file mode 100644
index e11168899d3..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_multiple_tracked_streams.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using EventStore.ClientAPI;
-using EventStore.Common.Utils;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_streams_deleter.when_deleting {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_multiple_tracked_streams<TLogFormat, TStreamId> : SpecificationWithEmittedStreamsTrackerAndDeleter<TLogFormat, TStreamId> {
-		protected Action _onDeleteStreamCompleted;
-		protected ManualResetEvent _resetEvent = new ManualResetEvent(false);
-		protected CountdownEvent _eventAppeared;
-		private int _numberOfTrackedEvents = 200;
-		private string _testStreamFormat = "test_stream_{0}";
-		private EventStore.ClientAPI.SystemData.UserCredentials _credentials;
-
-		protected override async Task Given() {
-			_credentials = new EventStore.ClientAPI.SystemData.UserCredentials("admin", "changeit");
-			_eventAppeared = new CountdownEvent(_numberOfTrackedEvents);
-			_onDeleteStreamCompleted = () => { _resetEvent.Set(); };
-			await base.Given();
-
-			var sub = await _conn.SubscribeToStreamAsync(_projectionNamesBuilder.GetEmittedStreamsName(), true, (s, evnt) => {
-				_eventAppeared.Signal();
-				return Task.CompletedTask;
-			}, userCredentials: _credentials);
-
-			for (int i = 0; i < _numberOfTrackedEvents; i++) {
-				await _conn.AppendToStreamAsync(String.Format(_testStreamFormat, i), ExpectedVersion.Any,
-					new EventData(Guid.NewGuid(), "type1", true, Helper.UTF8NoBom.GetBytes("data"), null));
-				_emittedStreamsTracker.TrackEmittedStream(new EmittedEvent[] {
-					new EmittedDataEvent(
-						String.Format(_testStreamFormat, i), Guid.NewGuid(), "type1", true,
-						"data", null, CheckpointTag.FromPosition(0, 100, 50), null),
-				});
-			}
-
-			if (!_eventAppeared.Wait(TimeSpan.FromSeconds(10))) {
-				Assert.Fail("Timed out waiting for emitted streams");
-			}
-
-			var emittedStreamResult =
-				await _conn.ReadStreamEventsForwardAsync(_projectionNamesBuilder.GetEmittedStreamsName(), 0,
-					_numberOfTrackedEvents, false, _credentials);
-			Assert.AreEqual(_numberOfTrackedEvents, emittedStreamResult.Events.Length);
-			Assert.AreEqual(SliceReadStatus.Success, emittedStreamResult.Status);
-		}
-
-		protected override Task When() {
-			_emittedStreamsDeleter.DeleteEmittedStreams(_onDeleteStreamCompleted);
-			if (!_resetEvent.WaitOne(TimeSpan.FromSeconds(10))) {
-				throw new Exception("Timed out waiting callback.");
-			}
-
-			return Task.CompletedTask;
-		}
-
-		[Test]
-		public async Task should_have_deleted_the_tracked_emitted_streams() {
-			for (int i = 0; i < _numberOfTrackedEvents; i++) {
-				var result = await _conn.ReadStreamEventsForwardAsync(String.Format(_testStreamFormat, i), 0, 1, false,
-					new EventStore.ClientAPI.SystemData.UserCredentials("admin", "changeit"));
-				Assert.AreEqual(SliceReadStatus.StreamNotFound, result.Status);
-			}
-		}
-
-
-		[Test]
-		public async Task should_have_deleted_the_checkpoint_stream() {
-			var result = await _conn.ReadStreamEventsForwardAsync(_projectionNamesBuilder.GetEmittedStreamsCheckpointName(),
-				0, 1, false, new EventStore.ClientAPI.SystemData.UserCredentials("admin", "changeit"));
-			Assert.AreEqual(SliceReadStatus.StreamNotFound, result.Status);
-		}
-
-		[Test]
-		public async Task should_have_deleted_the_emitted_streams_stream() {
-			var result = await _conn.ReadStreamEventsForwardAsync(_projectionNamesBuilder.GetEmittedStreamsName(), 0, 1,
-				false, new EventStore.ClientAPI.SystemData.UserCredentials("admin", "changeit"));
-			Assert.AreEqual(SliceReadStatus.StreamNotFound, result.Status);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_no_emitted_streams_stream.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_no_emitted_streams_stream.cs
deleted file mode 100644
index f6435038156..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_no_emitted_streams_stream.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using NUnit.Framework;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_streams_deleter.when_deleting {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_no_emitted_streams_stream<TLogFormat, TStreamId> : SpecificationWithEmittedStreamsTrackerAndDeleter<TLogFormat, TStreamId> {
-		protected Action _onDeleteStreamCompleted;
-		protected ManualResetEvent _resetEvent = new ManualResetEvent(false);
-
-		protected override Task Given() {
-			_onDeleteStreamCompleted = () => { _resetEvent.Set(); };
-			return base.Given();
-		}
-
-		protected override Task When() {
-			_emittedStreamsDeleter.DeleteEmittedStreams(_onDeleteStreamCompleted);
-			return Task.CompletedTask;
-		}
-
-		[Test]
-		public void should_have_called_completed() {
-			if (!_resetEvent.WaitOne(TimeSpan.FromSeconds(10))) {
-				throw new Exception("Timed out waiting callback.");
-			}
-
-			;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_streams_tracker/when_tracking/with_tracking_disabled.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_streams_tracker/when_tracking/with_tracking_disabled.cs
deleted file mode 100644
index 3541b184fd2..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_streams_tracker/when_tracking/with_tracking_disabled.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using EventStore.ClientAPI.SystemData;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_streams_tracker.when_tracking {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_tracking_disabled<TLogFormat, TStreamId> : SpecificationWithEmittedStreamsTrackerAndDeleter<TLogFormat, TStreamId> {
-		private CountdownEvent _eventAppeared = new CountdownEvent(1);
-		private UserCredentials _credentials = new UserCredentials("admin", "changeit");
-
-		protected override TimeSpan Timeout { get; } = TimeSpan.FromSeconds(10);
-
-		protected override Task Given() {
-			_trackEmittedStreams = false;
-			return base.Given();
-		}
-
-		protected override async Task When() {
-			var sub = await _conn.SubscribeToStreamAsync(_projectionNamesBuilder.GetEmittedStreamsName(), true, (s, evnt) => {
-				_eventAppeared.Signal();
-				return Task.CompletedTask;
-			}, userCredentials: _credentials);
-
-			_emittedStreamsTracker.TrackEmittedStream(new EmittedEvent[] {
-				new EmittedDataEvent(
-					"test_stream", Guid.NewGuid(), "type1", true,
-					"data", null, CheckpointTag.FromPosition(0, 100, 50), null, null)
-			});
-
-			_eventAppeared.Wait(TimeSpan.FromSeconds(5));
-			sub.Unsubscribe();
-		}
-
-		[Test]
-		public async Task should_write_a_stream_tracked_event() {
-			var result = await _conn.ReadStreamEventsForwardAsync(_projectionNamesBuilder.GetEmittedStreamsName(), 0, 200,
-				false, _credentials);
-			Assert.AreEqual(0, result.Events.Length);
-			Assert.AreEqual(1, _eventAppeared.CurrentCount); //no event appeared should get through
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_streams_tracker/when_tracking/with_tracking_enabled.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_streams_tracker/when_tracking/with_tracking_enabled.cs
deleted file mode 100644
index dcecb54c32c..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_streams_tracker/when_tracking/with_tracking_enabled.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using EventStore.ClientAPI.Common.Utils;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_streams_tracker.when_tracking {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_tracking_enabled<TLogFormat, TStreamId> : SpecificationWithEmittedStreamsTrackerAndDeleter<TLogFormat, TStreamId> {
-		private CountdownEvent _eventAppeared = new CountdownEvent(1);
-		private UserCredentials _credentials = new UserCredentials("admin", "changeit");
-
-		protected override async Task When() {
-			var sub = await _conn.SubscribeToStreamAsync(_projectionNamesBuilder.GetEmittedStreamsName(), true, (s, evnt) => {
-				_eventAppeared.Signal();
-				return Task.CompletedTask;
-			}, userCredentials: _credentials);
-
-			_emittedStreamsTracker.TrackEmittedStream(new EmittedEvent[] {
-				new EmittedDataEvent(
-					"test_stream", Guid.NewGuid(), "type1", true,
-					"data", null, CheckpointTag.FromPosition(0, 100, 50), null, null)
-			});
-
-			_eventAppeared.Wait(TimeSpan.FromSeconds(5));
-			sub.Unsubscribe();
-		}
-
-		[Test]
-		public async Task should_write_a_stream_tracked_event() {
-			var result = await _conn.ReadStreamEventsForwardAsync(_projectionNamesBuilder.GetEmittedStreamsName(), 0, 200,
-				false, _credentials);
-			Assert.AreEqual(1, result.Events.Length);
-			Assert.AreEqual("test_stream", Helper.UTF8NoBom.GetString(result.Events[0].Event.Data));
-			Assert.AreEqual(0, _eventAppeared.CurrentCount);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/emitted_streams_tracker/when_tracking/with_tracking_enabled_with_duplicate_event_streams.cs b/src/EventStore.Projections.Core.Tests/Services/emitted_streams_tracker/when_tracking/with_tracking_enabled_with_duplicate_event_streams.cs
deleted file mode 100644
index 149089370c5..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/emitted_streams_tracker/when_tracking/with_tracking_enabled_with_duplicate_event_streams.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using EventStore.ClientAPI.Common.Utils;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Tests.Services.emitted_stream_manager.when_tracking {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_tracking_enabled_with_duplicate_event_streams<TLogFormat, TStreamId> : SpecificationWithEmittedStreamsTrackerAndDeleter<TLogFormat, TStreamId> {
-		private CountdownEvent _eventAppeared = new CountdownEvent(2);
-		private UserCredentials _credentials = new UserCredentials("admin", "changeit");
-
-		protected override TimeSpan Timeout { get; } = TimeSpan.FromSeconds(10);
-
-		protected override async Task When() {
-			var sub = await _conn.SubscribeToStreamAsync(_projectionNamesBuilder.GetEmittedStreamsName(), true, (s, evnt) => {
-				_eventAppeared.Signal();
-				return Task.CompletedTask;
-			}, userCredentials: _credentials);
-
-			_emittedStreamsTracker.TrackEmittedStream(new EmittedEvent[] {
-				new EmittedDataEvent(
-					"test_stream", Guid.NewGuid(), "type1", true,
-					"data", null, CheckpointTag.FromPosition(0, 100, 50), null, null),
-				new EmittedDataEvent(
-					"test_stream", Guid.NewGuid(), "type1", true,
-					"data", null, CheckpointTag.FromPosition(0, 100, 50), null, null)
-			});
-
-			_eventAppeared.Wait(TimeSpan.FromSeconds(5));
-			sub.Unsubscribe();
-		}
-
-		[Test]
-		public async Task should_at_best_attempt_to_track_a_unique_list_of_streams() {
-			var result = await _conn.ReadStreamEventsForwardAsync(_projectionNamesBuilder.GetEmittedStreamsName(), 0, 200,
-				false, _credentials);
-			Assert.AreEqual(1, result.Events.Length);
-			Assert.AreEqual("test_stream", Helper.UTF8NoBom.GetString(result.Events[0].Event.Data));
-			Assert.AreEqual(1, _eventAppeared.CurrentCount); //only 1 event appeared should get through
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_filter/TestFixtureWithEventFilter.cs b/src/EventStore.Projections.Core.Tests/Services/event_filter/TestFixtureWithEventFilter.cs
deleted file mode 100644
index 469fd5b3e27..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_filter/TestFixtureWithEventFilter.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using EventStore.Core.Services.TimerService;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_filter {
-	public class TestFixtureWithEventFilter {
-		protected SourceDefinitionBuilder _builder;
-		protected EventFilter _ef;
-		protected Exception _exception;
-
-		[SetUp]
-		public void Setup() {
-			_builder = new SourceDefinitionBuilder();
-			Given();
-			When();
-		}
-
-		protected virtual void Given() {
-		}
-
-		protected virtual void When() {
-			_ef = null;
-			try {
-				var sources = _builder.Build();
-				_ef =
-					ReaderStrategy.Create("test", 0, sources, new RealTimeProvider(), stopOnEof: false, runAs: null)
-						.EventFilter;
-			} catch (Exception ex) {
-				_exception = ex;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_filter/empty_event_filter.cs b/src/EventStore.Projections.Core.Tests/Services/event_filter/empty_event_filter.cs
deleted file mode 100644
index 0915327b9f0..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_filter/empty_event_filter.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_filter {
-	[TestFixture]
-	public class empty_event_filter : TestFixtureWithEventFilter {
-		[Test]
-		public void cannot_be_built() {
-			Assert.IsAssignableFrom(typeof(InvalidOperationException), _exception);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_filter/include_everything_event_filter.cs b/src/EventStore.Projections.Core.Tests/Services/event_filter/include_everything_event_filter.cs
deleted file mode 100644
index ca7e265c900..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_filter/include_everything_event_filter.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using EventStore.ClientAPI.Common;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_filter {
-	[TestFixture]
-	public class include_everything_event_filter : TestFixtureWithEventFilter {
-		protected override void Given() {
-			_builder.FromAll();
-			_builder.AllEvents();
-		}
-
-		[Test]
-		public void can_be_built() {
-			Assert.IsNotNull(_ef);
-		}
-
-		[Test]
-		public void does_not_pass_categorized_event() {
-			Assert.IsFalse(_ef.Passes(true, "$ce-stream", "event"));
-		}
-
-		[Test]
-		public void passes_uncategorized_event() {
-			Assert.IsTrue(_ef.Passes(false, "stream", "event"));
-		}
-
-		[Test]
-		public void passes_stream_deleted_event() {
-			Assert.IsTrue(_ef.Passes(false, "stream", SystemEventTypes.StreamMetadata, isStreamDeletedEvent: true));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_filter/include_everything_handling_deleted_notifications_event_filter.cs b/src/EventStore.Projections.Core.Tests/Services/event_filter/include_everything_handling_deleted_notifications_event_filter.cs
deleted file mode 100644
index 2814ee99815..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_filter/include_everything_handling_deleted_notifications_event_filter.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using EventStore.ClientAPI.Common;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_filter {
-	[TestFixture]
-	public class include_everything_handling_deleted_notifications_event_filter : TestFixtureWithEventFilter {
-		protected override void Given() {
-			_builder.FromAll();
-			_builder.AllEvents();
-			_builder.SetHandlesStreamDeletedNotifications();
-			_builder.SetByStream();
-		}
-
-		[Test]
-		public void can_be_built() {
-			Assert.IsNotNull(_ef);
-		}
-
-		[Test]
-		public void does_not_pass_categorized_event() {
-			Assert.IsFalse(_ef.Passes(true, "$ce-stream", "event"));
-		}
-
-		[Test]
-		public void passes_uncategorized_event() {
-			Assert.IsTrue(_ef.Passes(false, "stream", "event"));
-		}
-
-		[Test]
-		public void does_not_pass_stream_deleted_event() {
-			Assert.IsFalse(_ef.Passes(false, "stream", SystemEventTypes.StreamMetadata, isStreamDeletedEvent: true));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_filter/just_all_events_event_filter.cs b/src/EventStore.Projections.Core.Tests/Services/event_filter/just_all_events_event_filter.cs
deleted file mode 100644
index 366a357866e..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_filter/just_all_events_event_filter.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_filter {
-	[TestFixture]
-	public class just_all_events_event_filter : TestFixtureWithEventFilter {
-		[Test]
-		public void cannot_be_built() {
-			Assert.IsAssignableFrom(typeof(InvalidOperationException), _exception);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_filter/just_from_all_event_filter.cs b/src/EventStore.Projections.Core.Tests/Services/event_filter/just_from_all_event_filter.cs
deleted file mode 100644
index f32a1963301..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_filter/just_from_all_event_filter.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_filter {
-	[TestFixture]
-	public class just_from_all_event_filter : TestFixtureWithEventFilter {
-		[Test]
-		public void cannot_be_built() {
-			Assert.IsAssignableFrom(typeof(InvalidOperationException), _exception);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_filter/specific_category_event_filter.cs b/src/EventStore.Projections.Core.Tests/Services/event_filter/specific_category_event_filter.cs
deleted file mode 100644
index c71958e4c97..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_filter/specific_category_event_filter.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_filter {
-	[TestFixture]
-	public class specific_category_event_filter : TestFixtureWithEventFilter {
-		protected override void Given() {
-			_builder.FromCategory("category");
-			_builder.AllEvents();
-		}
-
-		[Test]
-		public void can_be_built() {
-			Assert.IsNotNull(_ef);
-		}
-
-		[Test]
-		public void passes_event_with_correct_category() {
-			Assert.IsTrue(_ef.Passes(true, "$ce-category", "event"));
-		}
-
-		[Test]
-		public void does_not_pass_event_with_incorrect_category() {
-			Assert.IsFalse(_ef.Passes(true, "$ce-another", "event"));
-		}
-
-		[Test]
-		public void does_not_pass_uncategorized_event() {
-			Assert.IsFalse(_ef.Passes(false, "stream", "event"));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_filter/specific_event_event_filter.cs b/src/EventStore.Projections.Core.Tests/Services/event_filter/specific_event_event_filter.cs
deleted file mode 100644
index 7140e3a5fc5..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_filter/specific_event_event_filter.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_filter {
-	[TestFixture]
-	public class specific_event_event_filter : TestFixtureWithEventFilter {
-		protected override void Given() {
-			_builder.FromAll();
-			_builder.IncludeEvent("event");
-		}
-
-		[Test]
-		public void can_be_built() {
-			Assert.IsNotNull(_ef);
-		}
-
-		[Test]
-		public void does_not_pass_categorized_event_with_correct_event_name() {
-			Assert.IsFalse(_ef.Passes(true, "stream", "event"));
-		}
-
-		[Test]
-		public void does_not_pass_categorized_event_with_incorrect_event_name() {
-			Assert.IsFalse(_ef.Passes(true, "stream", "incorrect_event"));
-		}
-
-		[Test]
-		public void passes_uncategorized_event_with_correct_event_name() {
-			Assert.IsTrue(_ef.Passes(false, "stream", "event"));
-		}
-
-		[Test]
-		public void does_not_pass_uncategorized_event_with_incorrect_event_name() {
-			Assert.IsFalse(_ef.Passes(true, "stream", "incorrect_event"));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_filter/specific_events_event_filter.cs b/src/EventStore.Projections.Core.Tests/Services/event_filter/specific_events_event_filter.cs
deleted file mode 100644
index 51a0f9bf769..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_filter/specific_events_event_filter.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_filter {
-	[TestFixture]
-	public class specific_events_event_filter : TestFixtureWithEventFilter {
-		protected override void Given() {
-			_builder.FromAll();
-			_builder.IncludeEvent("eventOne");
-			_builder.IncludeEvent("eventTwo");
-		}
-
-		[Test]
-		public void can_be_built() {
-			Assert.IsNotNull(_ef);
-		}
-
-		[Test]
-		public void should_allow_non_linked_events() {
-			Assert.IsTrue(_ef.Passes(false, "stream", "eventOne"));
-		}
-
-		[Test]
-		public void should_allow_events_from_event_type_stream() {
-			Assert.IsTrue(_ef.Passes(true, "$et-eventOne", "eventOne"));
-		}
-
-		[Test]
-		public void should_not_allow_events_from_event_type_stream_that_is_not_included() {
-			Assert.IsFalse(_ef.Passes(true, "$et-eventThree", "eventThree"));
-		}
-
-		[Test]
-		public void should_not_allow_events_from_system_streams() {
-			Assert.IsFalse(_ef.Passes(false, "$ct-test", "eventOne"));
-		}
-
-		[Test]
-		public void should_not_allow_linked_events_from_system_streams() {
-			Assert.IsFalse(_ef.Passes(true, "$ct-test", "eventOne"));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_filter/specific_stream_and_category_event_filter.cs b/src/EventStore.Projections.Core.Tests/Services/event_filter/specific_stream_and_category_event_filter.cs
deleted file mode 100644
index 701dc9f71d7..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_filter/specific_stream_and_category_event_filter.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_filter {
-	[TestFixture]
-	public class specific_stream_and_category_event_filter : TestFixtureWithEventFilter {
-		protected override void Given() {
-			_builder.FromCategory("category");
-			_builder.FromStream("/test");
-			_builder.AllEvents();
-		}
-
-		[Test]
-		public void cannot_be_built() {
-			Assert.IsAssignableFrom(typeof(InvalidOperationException), _exception);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_filter/specific_stream_event_filter.cs b/src/EventStore.Projections.Core.Tests/Services/event_filter/specific_stream_event_filter.cs
deleted file mode 100644
index b93582382e3..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_filter/specific_stream_event_filter.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_filter {
-	[TestFixture]
-	public class specific_stream_event_filter : TestFixtureWithEventFilter {
-		protected override void Given() {
-			_builder.FromStream("/test");
-			_builder.AllEvents();
-		}
-
-		[Test]
-		public void can_be_built() {
-			Assert.IsNotNull(_ef);
-		}
-
-		[Test]
-		public void passes_categorized_event_with_correct_stream_id() {
-			//NOTE: this is possible if you read from $ce-account stream
-			// this is not the same as reading an account category as you can see at 
-			// least StreamCreate even there
-			Assert.IsTrue(_ef.Passes(true, "/test", "event"));
-		}
-
-		[Test]
-		public void does_not_pass_categorized_event_with_incorrect_stream_id() {
-			Assert.IsFalse(_ef.Passes(true, "incorrect_stream", "event"));
-		}
-
-		[Test]
-		public void passes_uncategorized_event_with_correct_stream_id() {
-			Assert.IsTrue(_ef.Passes(false, "/test", "event"));
-		}
-
-		[Test]
-		public void does_not_pass_uncategorized_event_with_incorrect_stream_id() {
-			Assert.IsFalse(_ef.Passes(true, "incorrect_stream", "event"));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_filter/specific_streams_event_filter.cs b/src/EventStore.Projections.Core.Tests/Services/event_filter/specific_streams_event_filter.cs
deleted file mode 100644
index d7ac114af56..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_filter/specific_streams_event_filter.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_filter {
-	[TestFixture]
-	public class specific_streams_event_filter : TestFixtureWithEventFilter {
-		protected override void Given() {
-			_builder.FromStream("a");
-			_builder.FromStream("b");
-			_builder.AllEvents();
-		}
-
-		[Test]
-		public void can_be_built() {
-			Assert.IsNotNull(_ef);
-		}
-
-		[Test]
-		public void passes_categorized_event_with_correct_stream_id() {
-			//NOTE: this is possible if you read from $ce-account stream
-			// this is not the same as reading an account category as you can see at 
-			// least StreamCreate even there
-			Assert.IsTrue(_ef.Passes(true, "a", "event"));
-		}
-
-		[Test]
-		public void does_not_pass_categorized_event_with_incorrect_stream_id() {
-			Assert.IsFalse(_ef.Passes(true, "incorrect_stream", "event"));
-		}
-
-		[Test]
-		public void passes_uncategorized_event_with_correct_stream_id() {
-			Assert.IsTrue(_ef.Passes(false, "b", "event"));
-		}
-
-		[Test]
-		public void does_not_pass_uncategorized_event_with_incorrect_stream_id() {
-			Assert.IsFalse(_ef.Passes(true, "incorrect_stream", "event"));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_position.cs b/src/EventStore.Projections.Core.Tests/Services/event_position.cs
deleted file mode 100644
index 5410af1e2aa..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_position.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using EventStore.Core.Data;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services {
-#pragma warning disable 1718 // allow a == a comparison
-	[TestFixture]
-	public class event_position {
-		private readonly TFPos _aa = new TFPos(10, 9);
-		private readonly TFPos _b1 = new TFPos(20, 15);
-		private readonly TFPos _b2 = new TFPos(20, 17);
-		private readonly TFPos _cc = new TFPos(30, 29);
-		private readonly TFPos _d1 = new TFPos(40, 35);
-		private readonly TFPos _d2 = new TFPos(40, 36);
-
-		[Test]
-		public void equal_equals() {
-			Assert.IsTrue(_aa.Equals(_aa));
-		}
-
-		[Test]
-		public void equal_operator() {
-			Assert.IsTrue(_b1 == _b1);
-		}
-
-		[Test]
-		public void less_operator() {
-			Assert.IsTrue(_aa < _b1);
-			Assert.IsTrue(_b1 < _b2);
-		}
-
-		[Test]
-		public void less_or_equal_operator() {
-			Assert.IsTrue(_aa <= _b1);
-			Assert.IsTrue(_b1 <= _b2);
-			Assert.IsTrue(_b2 <= _b2);
-		}
-
-		[Test]
-		public void greater_operator() {
-			Assert.IsTrue(_d1 > _cc);
-			Assert.IsTrue(_d2 > _d1);
-		}
-
-		[Test]
-		public void greater_or_equal_operator() {
-			Assert.IsTrue(_d1 >= _cc);
-			Assert.IsTrue(_d2 >= _d1);
-			Assert.IsTrue(_b2 >= _b2);
-		}
-	}
-#pragma warning restore 1718
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/TestFixtureWithEventReaderService.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/TestFixtureWithEventReaderService.cs
deleted file mode 100644
index 7f21645dd96..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/TestFixtureWithEventReaderService.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader {
-	public class TestFixtureWithEventReaderService<TLogFormat, TStreamId> : core_projection.TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		protected EventReaderCoreService _readerService;
-
-		protected override void Given1() {
-			base.Given1();
-			EnableReadAll();
-		}
-
-		protected override ManualQueue GiveInputQueue() {
-			return new ManualQueue(_bus, _timeProvider);
-		}
-
-		[SetUp]
-		public void Setup() {
-			_bus.Subscribe(_consumer);
-
-			ICheckpoint writerCheckpoint = new InMemoryCheckpoint(1000);
-			_readerService = new EventReaderCoreService(
-				GetInputQueue(), _ioDispatcher, 10, writerCheckpoint, runHeadingReader: GivenHeadingReaderRunning(),
-				faultOutOfOrderProjections: true);
-			_subscriptionDispatcher = new ReaderSubscriptionDispatcher(GetInputQueue());
-
-
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CheckpointSuggested>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CommittedEventReceived>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.EofReached>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionEofReached>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ProgressChanged>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.SubscriptionStarted>());
-			_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.NotAuthorized>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ReaderAssignedReader>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.Failed>());
-			_bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.SubscribeTimeout>());
-
-			_bus.Subscribe<ReaderCoreServiceMessage.StartReader>(_readerService);
-			_bus.Subscribe<ReaderCoreServiceMessage.StopReader>(_readerService);
-			_bus.Subscribe<ReaderSubscriptionMessage.CommittedEventDistributed>(_readerService);
-			_bus.Subscribe<ReaderSubscriptionMessage.EventReaderEof>(_readerService);
-			_bus.Subscribe<ReaderSubscriptionMessage.EventReaderPartitionEof>(_readerService);
-			_bus.Subscribe<ReaderSubscriptionMessage.EventReaderPartitionDeleted>(_readerService);
-			_bus.Subscribe<ReaderSubscriptionMessage.EventReaderNotAuthorized>(_readerService);
-			_bus.Subscribe<ReaderSubscriptionMessage.EventReaderIdle>(_readerService);
-			_bus.Subscribe<ReaderSubscriptionMessage.EventReaderStarting>(_readerService);
-			_bus.Subscribe<ReaderSubscriptionManagement.Pause>(_readerService);
-			_bus.Subscribe<ReaderSubscriptionManagement.Resume>(_readerService);
-			_bus.Subscribe<ReaderSubscriptionManagement.Subscribe>(_readerService);
-			_bus.Subscribe<ReaderSubscriptionManagement.Unsubscribe>(_readerService);
-
-			GivenAdditionalServices();
-
-			_bus.Publish(new ReaderCoreServiceMessage.StartReader(Guid.NewGuid()));
-
-			WhenLoop();
-		}
-
-		protected virtual bool GivenHeadingReaderRunning() {
-			return false;
-		}
-
-		protected virtual void GivenAdditionalServices() {
-		}
-
-		protected Guid GetReaderId() {
-			var readerAssignedMessage =
-				_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.ReaderAssignedReader>().LastOrDefault();
-			Assert.IsNotNull(readerAssignedMessage);
-			var reader = readerAssignedMessage.ReaderId;
-			return reader;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_index_based_checkpoint_read_timeout_occurs.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_index_based_checkpoint_read_timeout_occurs.cs
deleted file mode 100644
index f4ec281cc21..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_index_based_checkpoint_read_timeout_occurs.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Common.Utils;
-using NUnit.Framework;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing.EventByType;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.event_by_type_index_event_reader {
-	[Category("test")]
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_index_based_checkpoint_read_timeout_occurs<TLogFormat, TStreamId> : EventByTypeIndexEventReaderTestFixture<TLogFormat, TStreamId> {
-		private EventByTypeIndexEventReader _eventReader;
-		private Guid _distributionCorrelationId;
-		private Guid _checkpointStreamCorrelationId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		private FakeTimeProvider _fakeTimeProvider;
-
-		[SetUp]
-		public new void When() {
-			_distributionCorrelationId = Guid.NewGuid();
-			_fakeTimeProvider = new FakeTimeProvider();
-			var fromPositions = new Dictionary<string, long>();
-			fromPositions.Add("$et-eventTypeOne", 0);
-			fromPositions.Add("$et-eventTypeTwo", 0);
-			_eventReader = new EventByTypeIndexEventReader(_bus, _distributionCorrelationId,
-				null, new[] {"eventTypeOne", "eventTypeTwo"},
-				false, new TFPos(0, 0),
-				fromPositions, true,
-				_fakeTimeProvider,
-				stopOnEof: true);
-
-			_eventReader.Resume();
-
-			_checkpointStreamCorrelationId = TimeoutRead("$et", Guid.Empty);
-
-			CompleteForwardStreamRead("$et-eventTypeOne", Guid.Empty, new[] {
-				ResolvedEvent.ForUnresolvedEvent(
-					new EventRecord(
-						1, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "$et-eventTypeOne", ExpectedVersion.Any,
-						DateTime.UtcNow,
-						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
-						PrepareFlags.IsJson,
-						"$>", Helper.UTF8NoBom.GetBytes("0@test-stream"),
-						Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(50, 50))))),
-				ResolvedEvent.ForUnresolvedEvent(
-					new EventRecord(
-						2, 150, Guid.NewGuid(), Guid.NewGuid(), 150, 0, "$et-eventTypeOne", ExpectedVersion.Any,
-						DateTime.UtcNow,
-						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-						"$>", Helper.UTF8NoBom.GetBytes("1@test-stream"),
-						Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(150, 150)))))
-			});
-
-			CompleteForwardStreamRead("$et-eventTypeTwo", Guid.Empty, new[] {
-				ResolvedEvent.ForUnresolvedEvent(
-					new EventRecord(
-						1, 100, Guid.NewGuid(), Guid.NewGuid(), 100, 0, "$et-eventTypeTwo", ExpectedVersion.Any,
-						DateTime.UtcNow,
-						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
-						PrepareFlags.IsJson,
-						"$>", Helper.UTF8NoBom.GetBytes("2@test-stream"),
-						Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(100, 100))))),
-				ResolvedEvent.ForUnresolvedEvent(
-					new EventRecord(
-						2, 200, Guid.NewGuid(), Guid.NewGuid(), 200, 0, "$et-eventTypeTwo", ExpectedVersion.Any,
-						DateTime.UtcNow,
-						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-						"$>", Helper.UTF8NoBom.GetBytes("3@test-stream"),
-						Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(200, 200)))))
-			});
-		}
-
-		[Test]
-		public void should_not_deliver_events() {
-			Assert.AreEqual(0,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-		}
-
-		[Test]
-		public void should_attempt_another_checkpoint_read() {
-			var checkpointReads = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsBackward>()
-				.Where(x => x.EventStreamId == "$et");
-
-			Assert.AreEqual(checkpointReads.First().CorrelationId, _checkpointStreamCorrelationId);
-			Assert.AreEqual(1, checkpointReads.Skip(1).Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_index_based_read_completes_before_timeout.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_index_based_read_completes_before_timeout.cs
deleted file mode 100644
index 1633438b367..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_index_based_read_completes_before_timeout.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using EventStore.Common.Utils;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing.EventByType;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.event_by_type_index_event_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_index_based_read_completes_before_timeout<TLogFormat, TStreamId> : EventByTypeIndexEventReaderTestFixture<TLogFormat, TStreamId> {
-		private EventByTypeIndexEventReader _eventReader;
-		private Guid _distributionCorrelationId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		private FakeTimeProvider _fakeTimeProvider;
-
-		[SetUp]
-		public new void When() {
-			_distributionCorrelationId = Guid.NewGuid();
-			_fakeTimeProvider = new FakeTimeProvider();
-			var fromPositions = new Dictionary<string, long>();
-			fromPositions.Add("$et-eventTypeOne", 0);
-			fromPositions.Add("$et-eventTypeTwo", 0);
-			_eventReader = new EventByTypeIndexEventReader(_bus, _distributionCorrelationId,
-				null, new string[] {"eventTypeOne", "eventTypeTwo"},
-				false, new TFPos(-1, -1),
-				fromPositions, true,
-				_fakeTimeProvider,
-				stopOnEof: true);
-
-			_eventReader.Resume();
-
-			var correlationId = CompleteForwardStreamRead("$et-eventTypeOne", Guid.Empty, new[] {
-				ResolvedEvent.ForUnresolvedEvent(
-					new EventRecord(
-						1, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "$et-eventTypeOne", ExpectedVersion.Any,
-						DateTime.UtcNow,
-						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
-						PrepareFlags.IsJson,
-						"$>", Helper.UTF8NoBom.GetBytes("0@test-stream"),
-						Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(50, 50))))),
-				ResolvedEvent.ForUnresolvedEvent(
-					new EventRecord(
-						2, 150, Guid.NewGuid(), Guid.NewGuid(), 150, 0, "$et-eventTypeOne", ExpectedVersion.Any,
-						DateTime.UtcNow,
-						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-						"$>", Helper.UTF8NoBom.GetBytes("1@test-stream"),
-						Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(150, 150)))))
-			});
-
-			TimeoutRead("$et-eventTypeOne", correlationId);
-
-			correlationId = CompleteForwardStreamRead("$et-eventTypeTwo", Guid.Empty, new[] {
-				ResolvedEvent.ForUnresolvedEvent(
-					new EventRecord(
-						1, 100, Guid.NewGuid(), Guid.NewGuid(), 100, 0, "$et-eventTypeTwo", ExpectedVersion.Any,
-						DateTime.UtcNow,
-						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
-						PrepareFlags.IsJson,
-						"$>", Helper.UTF8NoBom.GetBytes("2@test-stream"),
-						Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(100, 100))))),
-				ResolvedEvent.ForUnresolvedEvent(
-					new EventRecord(
-						2, 200, Guid.NewGuid(), Guid.NewGuid(), 200, 0, "$et-eventTypeTwo", ExpectedVersion.Any,
-						DateTime.UtcNow,
-						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-						"$>", Helper.UTF8NoBom.GetBytes("3@test-stream"),
-						Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(200, 200)))))
-			});
-
-			TimeoutRead("$et-eventTypeTwo", correlationId);
-		}
-
-		[Test]
-		public void should_deliver_events() {
-			Assert.AreEqual(3,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_index_based_read_timeout_occurs.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_index_based_read_timeout_occurs.cs
deleted file mode 100644
index 5e24ede9ef0..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_index_based_read_timeout_occurs.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using EventStore.Common.Utils;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing.EventByType;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.event_by_type_index_event_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_index_based_read_timeout_occurs<TLogFormat, TStreamId> : EventByTypeIndexEventReaderTestFixture<TLogFormat, TStreamId> {
-		private EventByTypeIndexEventReader _eventReader;
-		private Guid _distributionCorrelationId;
-		private Guid _eventTypeOneStreamReadCorrelationId;
-		private Guid _eventTypeTwoStreamReadCorrelationId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		private FakeTimeProvider _fakeTimeProvider;
-
-		[SetUp]
-		public new void When() {
-			_distributionCorrelationId = Guid.NewGuid();
-			_fakeTimeProvider = new FakeTimeProvider();
-			var fromPositions = new Dictionary<string, long>();
-			fromPositions.Add("$et-eventTypeOne", 0);
-			fromPositions.Add("$et-eventTypeTwo", 0);
-			_eventReader = new EventByTypeIndexEventReader(_bus, _distributionCorrelationId,
-				null, new string[] {"eventTypeOne", "eventTypeTwo"},
-				false, new TFPos(0, 0),
-				fromPositions, true,
-				_fakeTimeProvider,
-				stopOnEof: true);
-
-			_eventReader.Resume();
-
-			_eventTypeOneStreamReadCorrelationId = TimeoutRead("$et-eventTypeOne", Guid.Empty);
-
-			CompleteForwardStreamRead("$et-eventTypeOne", _eventTypeOneStreamReadCorrelationId, new[] {
-				ResolvedEvent.ForUnresolvedEvent(
-					new EventRecord(
-						1, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "$et-eventTypeOne", ExpectedVersion.Any,
-						DateTime.UtcNow,
-						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
-						PrepareFlags.IsJson,
-						"$>", Helper.UTF8NoBom.GetBytes("0@test-stream"),
-						Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(50, 50))))),
-				ResolvedEvent.ForUnresolvedEvent(
-					new EventRecord(
-						2, 150, Guid.NewGuid(), Guid.NewGuid(), 150, 0, "$et-eventTypeOne", ExpectedVersion.Any,
-						DateTime.UtcNow,
-						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-						"$>", Helper.UTF8NoBom.GetBytes("1@test-stream"),
-						Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(150, 150)))))
-			});
-
-			_eventTypeTwoStreamReadCorrelationId = TimeoutRead("$et-eventTypeTwo", Guid.Empty);
-
-			CompleteForwardStreamRead("$et-eventTypeTwo", _eventTypeTwoStreamReadCorrelationId, new[] {
-				ResolvedEvent.ForUnresolvedEvent(
-					new EventRecord(
-						1, 100, Guid.NewGuid(), Guid.NewGuid(), 100, 0, "$et-eventTypeTwo", ExpectedVersion.Any,
-						DateTime.UtcNow,
-						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
-						PrepareFlags.IsJson,
-						"$>", Helper.UTF8NoBom.GetBytes("2@test-stream"),
-						Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(100, 100))))),
-				ResolvedEvent.ForUnresolvedEvent(
-					new EventRecord(
-						2, 200, Guid.NewGuid(), Guid.NewGuid(), 200, 0, "$et-eventTypeTwo", ExpectedVersion.Any,
-						DateTime.UtcNow,
-						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-						"$>", Helper.UTF8NoBom.GetBytes("3@test-stream"),
-						Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(200, 200)))))
-			});
-		}
-
-		[Test]
-		public void should_not_deliver_events() {
-			Assert.AreEqual(0,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-		}
-
-		[Test]
-		public void should_attempt_another_read_for_the_timed_out_reads() {
-			var eventTypeOneStreamReads = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Where(x => x.EventStreamId == "$et-eventTypeOne");
-
-			Assert.AreEqual(eventTypeOneStreamReads.First().CorrelationId, _eventTypeOneStreamReadCorrelationId);
-			Assert.AreEqual(1, eventTypeOneStreamReads.Skip(1).Count());
-
-			var eventTypeTwoStreamReads = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Where(x => x.EventStreamId == "$et-eventTypeTwo");
-
-			Assert.AreEqual(eventTypeTwoStreamReads.First().CorrelationId, _eventTypeTwoStreamReadCorrelationId);
-			Assert.AreEqual(1, eventTypeTwoStreamReads.Skip(1).Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_tf_based_read_completes_before_timeout.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_tf_based_read_completes_before_timeout.cs
deleted file mode 100644
index f6cddafe820..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_tf_based_read_completes_before_timeout.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.EventByType;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.event_by_type_index_event_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_tf_based_read_completes_before_timeout<TLogFormat, TStreamId> : EventByTypeIndexEventReaderTestFixture<TLogFormat, TStreamId> {
-		private EventByTypeIndexEventReader _eventReader;
-		private Guid _distributionCorrelationId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		private FakeTimeProvider _fakeTimeProvider;
-
-		[SetUp]
-		public new void When() {
-			_distributionCorrelationId = Guid.NewGuid();
-			_fakeTimeProvider = new FakeTimeProvider();
-			var fromPositions = new Dictionary<string, long>();
-			fromPositions.Add("$et-eventTypeOne", 0);
-			fromPositions.Add("$et-eventTypeTwo", 0);
-			_eventReader = new EventByTypeIndexEventReader(_bus, _distributionCorrelationId,
-				null, new string[] {"eventTypeOne", "eventTypeTwo"},
-				false, new TFPos(0, 0),
-				fromPositions, true,
-				_fakeTimeProvider,
-				stopOnEof: true);
-
-			_eventReader.Resume();
-
-			CompleteForwardStreamRead("$et-eventTypeOne", Guid.Empty);
-			CompleteForwardStreamRead("$et-eventTypeTwo", Guid.Empty);
-			CompleteBackwardStreamRead("$et", Guid.Empty);
-
-			var correlationId = CompleteForwardAllStreamRead(Guid.Empty, new[] {
-				EventStore.Core.Data.ResolvedEvent.ForUnresolvedEvent(
-					new EventRecord(
-						1, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "test_stream", ExpectedVersion.Any,
-						_fakeTimeProvider.UtcNow,
-						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-						"eventTypeOne", new byte[] {1}, new byte[] {2}), 100),
-				EventStore.Core.Data.ResolvedEvent.ForUnresolvedEvent(
-					new EventRecord(
-						2, 150, Guid.NewGuid(), Guid.NewGuid(), 150, 0, "test_stream", ExpectedVersion.Any,
-						_fakeTimeProvider.UtcNow,
-						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-						"eventTypeTwo", new byte[] {1}, new byte[] {2}), 200),
-			});
-
-			TimeoutRead("$all", correlationId);
-		}
-
-		[Test]
-		public void should_deliver_events() {
-			Assert.AreEqual(2,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_tf_based_read_timeout_occurs.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_tf_based_read_timeout_occurs.cs
deleted file mode 100644
index ce2858aed39..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_tf_based_read_timeout_occurs.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.EventByType;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.event_by_type_index_event_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_tf_based_read_timeout_occurs<TLogFormat, TStreamId> : EventByTypeIndexEventReaderTestFixture<TLogFormat, TStreamId> {
-		private EventByTypeIndexEventReader _eventReader;
-		private Guid _distributionCorrelationId;
-		private Guid _readAllEventsForwardCorrelationId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		private FakeTimeProvider _fakeTimeProvider;
-
-		[SetUp]
-		public new void When() {
-			_distributionCorrelationId = Guid.NewGuid();
-			_fakeTimeProvider = new FakeTimeProvider();
-			var fromPositions = new Dictionary<string, long>();
-			fromPositions.Add("$et-eventTypeOne", 0);
-			fromPositions.Add("$et-eventTypeTwo", 0);
-			_eventReader = new EventByTypeIndexEventReader(_bus, _distributionCorrelationId,
-				null, new string[] {"eventTypeOne", "eventTypeTwo"},
-				false, new TFPos(0, 0),
-				fromPositions, true,
-				_fakeTimeProvider,
-				stopOnEof: true);
-
-			_eventReader.Resume();
-
-			CompleteForwardStreamRead("$et-eventTypeOne", Guid.Empty);
-			CompleteForwardStreamRead("$et-eventTypeTwo", Guid.Empty);
-			CompleteBackwardStreamRead("$et", Guid.Empty);
-
-			_readAllEventsForwardCorrelationId = TimeoutRead("$all", Guid.Empty);
-
-			CompleteForwardAllStreamRead(_readAllEventsForwardCorrelationId, new[] {
-				ResolvedEvent.ForUnresolvedEvent(
-					new EventRecord(
-						1, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "test_stream", ExpectedVersion.Any,
-						_fakeTimeProvider.UtcNow,
-						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-						"eventTypeOne", new byte[] {1}, new byte[] {2}), 100),
-				ResolvedEvent.ForUnresolvedEvent(
-					new EventRecord(
-						2, 150, Guid.NewGuid(), Guid.NewGuid(), 150, 0, "test_stream", ExpectedVersion.Any,
-						_fakeTimeProvider.UtcNow,
-						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-						"eventTypeTwo", new byte[] {1}, new byte[] {2}), 200),
-			});
-		}
-
-		[Test]
-		public void should_not_deliver_events() {
-			Assert.AreEqual(0,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-		}
-
-		[Test]
-		public void should_attempt_another_read_for_the_timed_out_reads() {
-			var readAllEventsForwardMessages = _consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>();
-
-			Assert.AreEqual(readAllEventsForwardMessages.First().CorrelationId, _readAllEventsForwardCorrelationId);
-			Assert.AreEqual(1, readAllEventsForwardMessages.Skip(1).Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/FakeReaderSubscription.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/FakeReaderSubscription.cs
deleted file mode 100644
index 00cf0e31c1d..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/FakeReaderSubscription.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.heading_event_reader {
-	public class FakeReaderSubscription : IReaderSubscription {
-		private readonly IPublisher _publisher;
-		private readonly Guid _subscriptionId;
-
-		public FakeReaderSubscription() {
-			_subscriptionId = Guid.NewGuid();
-		}
-
-		public FakeReaderSubscription(IPublisher publisher, Guid subscriptionId) {
-			_publisher = publisher;
-			_subscriptionId = subscriptionId;
-		}
-		private readonly List<ReaderSubscriptionMessage.CommittedEventDistributed> _receivedEvents =
-			new List<ReaderSubscriptionMessage.CommittedEventDistributed>();
-
-		private readonly List<ReaderSubscriptionMessage.EventReaderIdle> _receivedIdleNotifications =
-			new List<ReaderSubscriptionMessage.EventReaderIdle>();
-
-		private readonly List<ReaderSubscriptionMessage.EventReaderStarting> _receivedStartingNotifications =
-			new List<ReaderSubscriptionMessage.EventReaderStarting>();
-
-		private readonly List<ReaderSubscriptionMessage.EventReaderEof> _receivedEofNotifications =
-			new List<ReaderSubscriptionMessage.EventReaderEof>();
-
-		private readonly List<ReaderSubscriptionMessage.EventReaderPartitionEof> _receivedPartitionEofNotifications =
-			new List<ReaderSubscriptionMessage.EventReaderPartitionEof>();
-
-		private readonly List<ReaderSubscriptionMessage.EventReaderPartitionDeleted>
-			_receivedPartitionDeletedNotifications =
-				new List<ReaderSubscriptionMessage.EventReaderPartitionDeleted>();
-
-		private readonly List<ReaderSubscriptionMessage.EventReaderNotAuthorized> _receivedNotAuthorizedNotifications =
-			new List<ReaderSubscriptionMessage.EventReaderNotAuthorized>();
-
-		public void Handle(ReaderSubscriptionMessage.CommittedEventDistributed message) {
-			if (message.Data != null && message.Data.PositionStreamId == "throws") {
-				throw new Exception("Bad Handler");
-			}
-
-			_receivedEvents.Add(message);
-			_publisher?.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived
-					.FromCommittedEventDistributed(message,
-					CheckpointTag.Empty, "", _subscriptionId, 0));
-		}
-
-		public List<ReaderSubscriptionMessage.CommittedEventDistributed> ReceivedEvents {
-			get { return _receivedEvents; }
-		}
-
-		public List<ReaderSubscriptionMessage.EventReaderIdle> ReceivedIdleNotifications {
-			get { return _receivedIdleNotifications; }
-		}
-
-		public List<ReaderSubscriptionMessage.EventReaderStarting> ReceivedStartingNotifications {
-			get { return _receivedStartingNotifications; }
-		}
-
-		public List<ReaderSubscriptionMessage.EventReaderEof> ReceivedEofNotifications {
-			get { return _receivedEofNotifications; }
-		}
-
-		public List<ReaderSubscriptionMessage.EventReaderPartitionEof> ReceivedPartitionEofNotifications {
-			get { return _receivedPartitionEofNotifications; }
-		}
-
-		public List<ReaderSubscriptionMessage.EventReaderPartitionDeleted> ReceivedPartitionDeletedNotifications {
-			get { return _receivedPartitionDeletedNotifications; }
-		}
-
-		public List<ReaderSubscriptionMessage.EventReaderNotAuthorized> ReceivedNotAuthorizedNotifications {
-			get { return _receivedNotAuthorizedNotifications; }
-		}
-
-		public void Handle(ReaderSubscriptionMessage.EventReaderIdle message) {
-			_receivedIdleNotifications.Add(message);
-		}
-
-		public void Handle(ReaderSubscriptionMessage.EventReaderStarting message) {
-			_receivedStartingNotifications.Add(message);
-		}
-
-		public void Handle(ReaderSubscriptionMessage.EventReaderEof message) {
-			_receivedEofNotifications.Add(message);
-		}
-
-		public void Handle(ReaderSubscriptionMessage.EventReaderPartitionEof message) {
-			_receivedPartitionEofNotifications.Add(message);
-		}
-
-		public void Handle(ReaderSubscriptionMessage.EventReaderPartitionDeleted message) {
-			_receivedPartitionDeletedNotifications.Add(message);
-		}
-
-		public void Handle(ReaderSubscriptionMessage.EventReaderNotAuthorized message) {
-			_receivedNotAuthorizedNotifications.Add(message);
-		}
-
-		public void Handle(ReaderSubscriptionMessage.Faulted message) {
-			//ignore
-		}
-
-		public void Handle(ReaderSubscriptionMessage.ReportProgress message) {
-			//ignore
-		}
-
-		public string Tag {
-			get { return "FakeReaderSubscription"; }
-		}
-
-		public Guid SubscriptionId {
-			get { return Guid.Empty; }
-		}
-
-		private FakeEventReader _eventReader;
-
-		public FakeEventReader EventReader {
-			get { return _eventReader; }
-		}
-
-		public IEventReader CreatePausedEventReader(
-			IPublisher publisher, IODispatcher ioDispatcher, Guid forkedEventReaderId) {
-			_eventReader = new FakeEventReader(forkedEventReaderId);
-			return _eventReader;
-		}
-	}
-
-	public class FakeEventReader : IEventReader {
-		public Guid EventReaderId { get; private set; }
-
-		public FakeEventReader(Guid eventReaderId) {
-			EventReaderId = eventReaderId;
-		}
-
-		public void Dispose() {
-		}
-
-		public void Pause() {
-		}
-
-		public void Resume() {
-		}
-
-		public void SendNotAuthorized() {
-		}
-	}
-
-	public class FakeReaderStrategy : IReaderStrategy {
-		public EventFilter EventFilter { get; set; }
-		public bool IsReadingOrderRepeatable { get; set; }
-		public PositionTagger PositionTagger { get; set; }
-		private FakeReaderSubscription _subscription;
-
-		public Guid EventReaderId {
-			get { return _subscription.EventReader.EventReaderId; }
-		}
-
-		public IEventReader CreatePausedEventReader(Guid eventReaderId, IPublisher publisher, IODispatcher ioDispatcher,
-			CheckpointTag checkpointTag, bool stopOnEof, int? stopAfterNEvents) {
-			throw new NotImplementedException();
-		}
-
-		public IReaderSubscription CreateReaderSubscription(IPublisher publisher, CheckpointTag fromCheckpointTag,
-			Guid subscriptionId, ReaderSubscriptionOptions readerSubscriptionOptions) {
-			_subscription = new FakeReaderSubscription(publisher, subscriptionId);
-			return _subscription;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_heading_event_reader_has_been_created.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_heading_event_reader_has_been_created.cs
deleted file mode 100644
index d131f20e5d2..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_heading_event_reader_has_been_created.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Tests.Services.projections_manager.managed_projection;
-using NUnit.Framework;
-using HeadingEventReader = EventStore.Projections.Core.Services.Processing.TransactionFile.HeadingEventReader;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.heading_event_reader {
-	[TestFixture]
-	public class when_heading_event_reader_has_been_created : TestFixtureWithReadWriteDispatchers {
-		private HeadingEventReader _point;
-		private Exception _exception;
-
-		[SetUp]
-		public void setup() {
-			_exception = null;
-			try {
-				_point = new HeadingEventReader(10, _bus);
-			} catch (Exception ex) {
-				_exception = ex;
-			}
-		}
-
-		[Test]
-		public void it_has_been_created() {
-			Assert.IsNull(_exception, ((object)_exception ?? "").ToString());
-		}
-
-		[Test]
-		public void stop_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => { _point.Stop(); });
-		}
-
-		[Test]
-		public void try_subscribe_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_point.TrySubscribe(Guid.NewGuid(), new FakeReaderSubscription(), 10);
-			});
-		}
-
-		[Test]
-		public void usubscribe_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => { _point.Unsubscribe(Guid.NewGuid()); });
-		}
-
-		[Test]
-		public void handle_throws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_point.Handle(
-					ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						Guid.NewGuid(), new TFPos(20, 10), "stream", 10, false, Guid.NewGuid(), "type", false,
-						new byte[0], new byte[0]));
-			});
-		}
-
-		[Test]
-		public void can_be_started() {
-			var eventReaderId = Guid.NewGuid();
-			_point.Start(
-				eventReaderId,
-				new TransactionFileEventReader(_bus, eventReaderId, null, new TFPos(0, -1), new RealTimeProvider()));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_starting_a_heading_event_reader.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_starting_a_heading_event_reader.cs
deleted file mode 100644
index a13aa3d66ae..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_starting_a_heading_event_reader.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using NUnit.Framework;
-using HeadingEventReader = EventStore.Projections.Core.Services.Processing.TransactionFile.HeadingEventReader;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.heading_event_reader {
-	[TestFixture]
-	public class when_starting_a_heading_event_reader : TestFixtureWithReadWriteDispatchers {
-		private HeadingEventReader _point;
-		private Exception _exception;
-		private Guid _distibutionPointCorrelationId;
-
-		[SetUp]
-		public void setup() {
-			_exception = null;
-			try {
-				_point = new HeadingEventReader(10, _bus);
-			} catch (Exception ex) {
-				_exception = ex;
-			}
-
-			Assume.That(_exception == null);
-
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_point.Start(
-				_distibutionPointCorrelationId,
-				new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(0, -1),
-					new RealTimeProvider()));
-		}
-
-		[Test]
-		public void transaction_file_reader_publishes_read_events_from_tf() {
-			Assert.IsTrue(_consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>().Any());
-		}
-
-		[Test]
-		public void can_handle_events() {
-			_point.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_distibutionPointCorrelationId, new TFPos(20, 10), "stream", 10, false, Guid.NewGuid(),
-					"type", false, new byte[0], new byte[0]));
-		}
-
-		[Test]
-		public void can_be_stopped() {
-			_point.Stop();
-		}
-
-
-		[Test]
-		public void cannot_suibscribe_even_from_reader_zero_position() {
-			var subscribed = _point.TrySubscribe(Guid.NewGuid(), new FakeReaderSubscription(), -1);
-			Assert.AreEqual(false, subscribed);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_handles_an_event.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_handles_an_event.cs
deleted file mode 100644
index 0c32e4563f9..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_handles_an_event.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Tests.Services.projections_manager.managed_projection;
-using NUnit.Framework;
-using HeadingEventReader = EventStore.Projections.Core.Services.Processing.TransactionFile.HeadingEventReader;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.heading_event_reader {
-	[TestFixture]
-	public class when_the_heading_event_reader_handles_an_event : TestFixtureWithReadWriteDispatchers {
-		private HeadingEventReader _point;
-		private Exception _exception;
-		private Guid _distibutionPointCorrelationId;
-
-		[SetUp]
-		public void setup() {
-			_exception = null;
-			try {
-				_point = new HeadingEventReader(10, _bus);
-			} catch (Exception ex) {
-				_exception = ex;
-			}
-
-			Assume.That(_exception == null);
-
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_point.Start(
-				_distibutionPointCorrelationId,
-				new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(0, -1),
-					new RealTimeProvider()));
-			_point.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_distibutionPointCorrelationId, new TFPos(20, 10), "stream", 10, false, Guid.NewGuid(),
-					"type", false, new byte[0], new byte[0]));
-		}
-
-		[Test]
-		public void can_handle_next_event() {
-			_point.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_distibutionPointCorrelationId, new TFPos(40, 30), "stream", 12, false, Guid.NewGuid(),
-					"type", false, new byte[0], new byte[0]));
-		}
-
-		//TODO: SW1
-/*
-        [Test]
-        public void can_handle_special_update_position_event()
-        {
-            _point.Handle(
-                new ProjectionCoreServiceMessage.CommittedEventDistributed(
-                    _distibutionPointCorrelationId, new EventPosition(long.MinValue, 30), "stream", 12, false, null));
-        }
-*/
-
-		[Test]
-		public void cannot_handle_previous_event() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_point.Handle(
-					ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						_distibutionPointCorrelationId, new TFPos(5, 0), "stream", 8, false, Guid.NewGuid(), "type",
-						false, new byte[0], new byte[0]));
-			});
-		}
-
-		[Test]
-		public void a_projection_can_be_subscribed_after_event_position() {
-			var subscribed = _point.TrySubscribe(Guid.NewGuid(), new FakeReaderSubscription(), 30);
-			Assert.AreEqual(true, subscribed);
-		}
-
-		[Test]
-		public void a_projection_cannot_be_subscribed_at_earlier_position() {
-			var subscribed = _point.TrySubscribe(Guid.NewGuid(), new FakeReaderSubscription(), 10);
-			Assert.AreEqual(false, subscribed);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_subscribes_a_projection.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_subscribes_a_projection.cs
deleted file mode 100644
index 1adfab4892b..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_subscribes_a_projection.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Tests.Services.projections_manager.managed_projection;
-using NUnit.Framework;
-using HeadingEventReader = EventStore.Projections.Core.Services.Processing.TransactionFile.HeadingEventReader;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.heading_event_reader {
-	[TestFixture]
-	public class when_the_heading_event_reader_subscribes_a_projection : TestFixtureWithReadWriteDispatchers {
-		private HeadingEventReader _point;
-		private Exception _exception;
-		private Guid _distibutionPointCorrelationId;
-		private FakeReaderSubscription _subscription;
-		private Guid _projectionSubscriptionId;
-
-		[SetUp]
-		public void setup() {
-			_exception = null;
-			try {
-				_point = new HeadingEventReader(10, _bus);
-			} catch (Exception ex) {
-				_exception = ex;
-			}
-
-			Assume.That(_exception == null);
-
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_point.Start(
-				_distibutionPointCorrelationId,
-				new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(0, -1),
-					new RealTimeProvider()));
-			_point.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_distibutionPointCorrelationId, new TFPos(20, 10), "stream", 10, false, Guid.NewGuid(),
-					"type", false, new byte[0], new byte[0]));
-			_point.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_distibutionPointCorrelationId, new TFPos(40, 30), "stream", 11, false, Guid.NewGuid(),
-					"type", false, new byte[0], new byte[0]));
-			_subscription = new FakeReaderSubscription();
-			_projectionSubscriptionId = Guid.NewGuid();
-			_point.TrySubscribe(_projectionSubscriptionId, _subscription, 30);
-		}
-
-
-		[Test]
-		public void projection_receives_at_least_one_cached_event_before_the_subscription_position() {
-			Assert.AreEqual(true, _subscription.ReceivedEvents.Any(v => v.Data.Position.PreparePosition <= 30));
-		}
-
-		[Test]
-		public void projection_receives_all_the_previously_handled_events_after_the_subscription_position() {
-			Assert.AreEqual(true, _subscription.ReceivedEvents.Any(v => v.Data.Position.PreparePosition == 30));
-		}
-
-		[Test]
-		public void it_can_be_unsubscribed() {
-			_point.Unsubscribe(_projectionSubscriptionId);
-		}
-
-		[Test]
-		public void no_other_projection_can_subscribe_with_the_same_projection_id() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_point.TrySubscribe(_projectionSubscriptionId, _subscription, 30);
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_unsubscribes_a_projection.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_unsubscribes_a_projection.cs
deleted file mode 100644
index 3c0aad1951e..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_unsubscribes_a_projection.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Tests.Services.projections_manager.managed_projection;
-using NUnit.Framework;
-using HeadingEventReader = EventStore.Projections.Core.Services.Processing.TransactionFile.HeadingEventReader;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.heading_event_reader {
-	[TestFixture]
-	public class when_the_heading_event_reader_unsubscribes_a_projection : TestFixtureWithReadWriteDispatchers {
-		private HeadingEventReader _point;
-		private Exception _exception;
-		private Guid _distibutionPointCorrelationId;
-		private FakeReaderSubscription _subscription;
-		private Guid _projectionSubscriptionId;
-
-		[SetUp]
-		public void setup() {
-			_exception = null;
-			try {
-				_point = new HeadingEventReader(10, _bus);
-			} catch (Exception ex) {
-				_exception = ex;
-			}
-
-			Assume.That(_exception == null);
-
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_point.Start(
-				_distibutionPointCorrelationId,
-				new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(0, -1),
-					new RealTimeProvider()));
-			_point.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_distibutionPointCorrelationId, new TFPos(20, 10), "stream", 10, false, Guid.NewGuid(),
-					"type", false, new byte[0], new byte[0]));
-			_point.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_distibutionPointCorrelationId, new TFPos(40, 30), "stream", 11, false, Guid.NewGuid(),
-					"type", false, new byte[0], new byte[0]));
-			_subscription = new FakeReaderSubscription();
-			_projectionSubscriptionId = Guid.NewGuid();
-			var subscribed = _point.TrySubscribe(_projectionSubscriptionId, _subscription, 30);
-			Assert.IsTrue(subscribed); // ensure we really unsubscribing.. even if it is tested elsewhere
-			_point.Unsubscribe(_projectionSubscriptionId);
-		}
-
-
-		[Test]
-		public void projection_does_not_receive_any_events_after_unsubscribing() {
-			var count = _subscription.ReceivedEvents.Count;
-			_point.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_distibutionPointCorrelationId, new TFPos(60, 50), "stream", 12, false, Guid.NewGuid(),
-					"type", false, new byte[0], new byte[0]));
-			Assert.AreEqual(count, _subscription.ReceivedEvents.Count);
-		}
-
-		[Test]
-		public void it_cannot_be_unsubscribed_twice() {
-			Assert.Throws<InvalidOperationException>(() => { _point.Unsubscribe(_projectionSubscriptionId); });
-		}
-
-		[Test]
-		public void projection_can_resubscribe_with() {
-			var subscribed = _point.TrySubscribe(_projectionSubscriptionId, _subscription, 30);
-			Assert.AreEqual(true, subscribed);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_a_cached_event_and_throws.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_a_cached_event_and_throws.cs
deleted file mode 100644
index 8a5c999337f..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_a_cached_event_and_throws.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using NUnit.Framework;
-using HeadingEventReader = EventStore.Projections.Core.Services.Processing.TransactionFile.HeadingEventReader;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.heading_event_reader {
-	[TestFixture]
-	public class when_the_heading_event_reader_with_a_subscribed_projection_handles_a_cached_event_and_throws :
-		TestFixtureWithReadWriteDispatchers {
-		private HeadingEventReader _point;
-		private Guid _distibutionPointCorrelationId;
-		private Guid _projectionSubscriptionId;
-
-		[SetUp]
-		public void setup() {
-			_point = new HeadingEventReader(10, _bus);
-
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_point.Start(
-				_distibutionPointCorrelationId,
-				new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(0, -1),
-					new RealTimeProvider()));
-			_point.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_distibutionPointCorrelationId, new TFPos(20, 10), "throws", 10, false, Guid.NewGuid(),
-					"type", false, new byte[0], new byte[0]));
-			_point.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_distibutionPointCorrelationId, new TFPos(40, 30), "throws", 11, false, Guid.NewGuid(),
-					"type", false, new byte[0], new byte[0]));
-			_projectionSubscriptionId = Guid.NewGuid();
-			_point.TrySubscribe(_projectionSubscriptionId, new FakeReaderSubscription(), 30);
-		}
-
-
-		[Test]
-		public void projection_is_notified_that_it_is_to_fault() {
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.Failed>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_a_live_event_and_throws.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_a_live_event_and_throws.cs
deleted file mode 100644
index 16bcde23cd0..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_a_live_event_and_throws.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using NUnit.Framework;
-using HeadingEventReader = EventStore.Projections.Core.Services.Processing.TransactionFile.HeadingEventReader;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.heading_event_reader {
-	[TestFixture]
-	public class when_the_heading_event_reader_with_a_subscribed_projection_handles_a_live_event_and_throws :
-		TestFixtureWithReadWriteDispatchers {
-		private HeadingEventReader _point;
-		private Guid _distibutionPointCorrelationId;
-		private Guid _projectionSubscriptionId;
-
-		[SetUp]
-		public void setup() {
-			_point = new HeadingEventReader(10, _bus);
-
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_point.Start(
-				_distibutionPointCorrelationId,
-				new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(0, -1),
-					new RealTimeProvider()));
-			_point.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_distibutionPointCorrelationId, new TFPos(20, 10), "stream", 10, false, Guid.NewGuid(),
-					"type", false, new byte[0], new byte[0]));
-			_point.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_distibutionPointCorrelationId, new TFPos(40, 30), "stream", 11, false, Guid.NewGuid(),
-					"type", false, new byte[0], new byte[0]));
-			_projectionSubscriptionId = Guid.NewGuid();
-			_point.TrySubscribe(_projectionSubscriptionId, new FakeReaderSubscription(), 30);
-			_point.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_distibutionPointCorrelationId, new TFPos(60, 50), "throws", 12, false, Guid.NewGuid(),
-					"type", false, new byte[0], new byte[0]));
-		}
-
-		[Test]
-		public void projection_is_notified_that_it_is_to_fault() {
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.Failed>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_an_event.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_an_event.cs
deleted file mode 100644
index f2f633b6aa7..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_an_event.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Tests.Services.projections_manager.managed_projection;
-using NUnit.Framework;
-using HeadingEventReader = EventStore.Projections.Core.Services.Processing.TransactionFile.HeadingEventReader;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.heading_event_reader {
-	[TestFixture]
-	public class when_the_heading_event_reader_with_a_subscribed_projection_handles_an_event :
-		TestFixtureWithReadWriteDispatchers {
-		private HeadingEventReader _point;
-		private Exception _exception;
-		private Guid _distibutionPointCorrelationId;
-		private FakeReaderSubscription _subscription;
-		private Guid _projectionSubscriptionId;
-
-		[SetUp]
-		public void setup() {
-			_exception = null;
-			try {
-				_point = new HeadingEventReader(10, _bus);
-			} catch (Exception ex) {
-				_exception = ex;
-			}
-
-			Assume.That(_exception == null);
-
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_point.Start(
-				_distibutionPointCorrelationId,
-				new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(0, -1),
-					new RealTimeProvider()));
-			_point.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_distibutionPointCorrelationId, new TFPos(20, 10), "stream", 10, false, Guid.NewGuid(),
-					"type", false, new byte[0], new byte[0]));
-			_point.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_distibutionPointCorrelationId, new TFPos(40, 30), "stream", 11, false, Guid.NewGuid(),
-					"type", false, new byte[0], new byte[0]));
-			_subscription = new FakeReaderSubscription();
-			_projectionSubscriptionId = Guid.NewGuid();
-			_point.TrySubscribe(_projectionSubscriptionId, _subscription, 30);
-			_point.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_distibutionPointCorrelationId, new TFPos(60, 50), "stream", 12, false, Guid.NewGuid(),
-					"type", false, new byte[0], new byte[0]));
-		}
-
-
-		[Test]
-		public void projection_receives_events_after_the_subscription_point() {
-			Assert.AreEqual(50, _subscription.ReceivedEvents.Last().Data.Position.PreparePosition);
-		}
-
-		[Test]
-		public void it_can_be_unsubscribed() {
-			_point.Unsubscribe(_projectionSubscriptionId);
-		}
-
-		[Test]
-		public void no_other_projection_can_subscribe_with_the_same_projection_id() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_point.TrySubscribe(_projectionSubscriptionId, _subscription, 30);
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_an_idle_notification.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_an_idle_notification.cs
deleted file mode 100644
index c55fc3cb29c..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_an_idle_notification.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Tests.Services.projections_manager.managed_projection;
-using NUnit.Framework;
-using HeadingEventReader = EventStore.Projections.Core.Services.Processing.TransactionFile.HeadingEventReader;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.heading_event_reader {
-	[TestFixture]
-	public class when_the_heading_event_reader_with_a_subscribed_projection_handles_an_idle_notification :
-		TestFixtureWithReadWriteDispatchers {
-		private HeadingEventReader _point;
-
-		//private Exception _exception;
-		private Guid _distibutionPointCorrelationId;
-		private FakeReaderSubscription _subscription;
-		private Guid _projectionSubscriptionId;
-
-		[SetUp]
-		public void setup() {
-			//_exception = null;
-			try {
-				_point = new HeadingEventReader(10, _bus);
-			} catch (Exception) {
-				//_exception = ex;
-			}
-
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_point.Start(
-				_distibutionPointCorrelationId,
-				new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(0, -1),
-					new RealTimeProvider()));
-			DateTime timestamp = DateTime.UtcNow;
-			_point.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_distibutionPointCorrelationId, new TFPos(20, 10), "stream", 10, false, Guid.NewGuid(),
-					"type", false, new byte[0], new byte[0], timestamp));
-			_point.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_distibutionPointCorrelationId, new TFPos(40, 30), "stream", 11, false, Guid.NewGuid(),
-					"type", false, new byte[0], new byte[0], timestamp.AddMilliseconds(1)));
-			_subscription = new FakeReaderSubscription();
-			_projectionSubscriptionId = Guid.NewGuid();
-			_point.TrySubscribe(_projectionSubscriptionId, _subscription, 30);
-			_point.Handle(
-				new ReaderSubscriptionMessage.EventReaderIdle(
-					_distibutionPointCorrelationId, timestamp.AddMilliseconds(1100)));
-		}
-
-
-		[Test]
-		public void projection_receives_events_after_the_subscription_point() {
-			Assert.AreEqual(1, _subscription.ReceivedIdleNotifications.Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_creating.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_creating.cs
deleted file mode 100644
index 3694aa40188..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_creating.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.multi_stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_creating<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private string[] _abStreams;
-		private Dictionary<string, long> _ab12Tag;
-		private new RealTimeProvider _timeProvider;
-
-		[SetUp]
-		public void setup() {
-			_timeProvider = new RealTimeProvider();
-			_ab12Tag = new Dictionary<string, long> {{"a", 1}, {"b", 2}};
-			_abStreams = new[] {"a", "b"};
-		}
-
-		[Test]
-		public void it_can_be_created() {
-			new MultiStreamEventReader(
-				_ioDispatcher, _bus, Guid.NewGuid(), null, 0, _abStreams, _ab12Tag, false, _timeProvider);
-		}
-
-		[Test]
-		public void null_publisher_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				new MultiStreamEventReader(
-					_ioDispatcher, null, Guid.NewGuid(), null, 0, _abStreams, _ab12Tag, false, _timeProvider);
-			});
-		}
-
-		[Test]
-		public void empty_event_reader_id_throws_argument_exception() {
-			Assert.Throws<ArgumentException>(() => {
-				new MultiStreamEventReader(
-					_ioDispatcher, _bus, Guid.Empty, null, 0, _abStreams, _ab12Tag, false, _timeProvider);
-			});
-		}
-
-		[Test]
-		public void null_streams_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				new MultiStreamEventReader(
-					_ioDispatcher, _bus, Guid.NewGuid(), null, 0, null, _ab12Tag, false, _timeProvider);
-			});
-		}
-
-		[Test]
-		public void null_time_provider_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				new MultiStreamEventReader(_ioDispatcher, _bus, Guid.NewGuid(), null, 0, _abStreams, _ab12Tag, false,
-					null);
-			});
-		}
-
-		[Test]
-		public void empty_streams_throws_argument_exception() {
-			Assert.Throws<ArgumentException>(() => {
-				new MultiStreamEventReader(
-					_ioDispatcher, _bus, Guid.NewGuid(), null, 0, new string[0], _ab12Tag, false, _timeProvider);
-			});
-		}
-
-		[Test]
-		public void invalid_from_tag_throws_argument_exception() {
-			Assert.Throws<ArgumentException>(() => {
-				new MultiStreamEventReader(
-					_ioDispatcher, _bus, Guid.NewGuid(), null, 0, _abStreams,
-					new Dictionary<string, long> {{"a", 1}, {"c", 2}}, false, _timeProvider);
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_deleted_streams.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_deleted_streams.cs
deleted file mode 100644
index 53d667964d1..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_deleted_streams.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.multi_stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_deleted_streams<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private MultiStreamEventReader _edp;
-		private string[] _streamNames;
-		private Dictionary<string, long> _streamPositions;
-		private Guid _distibutionPointCorrelationId;
-		private long _fromSequenceNumber = 10;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-			_streamNames = new[] {"stream1", "stream2"};
-			_streamPositions = new Dictionary<string, long> {{"stream1", 10}, {"stream2", _fromSequenceNumber}};
-		}
-
-		[SetUp]
-		public new void When() {
-			_distibutionPointCorrelationId = Guid.NewGuid();
-
-			_edp = new MultiStreamEventReader(
-				_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _streamNames, _streamPositions, false,
-				new RealTimeProvider());
-
-			_edp.Resume();
-		}
-
-		private void HandleEvents(string stream, long[] eventNumbers) {
-			string eventType = "event_type";
-			List<ResolvedEvent> events = new List<ResolvedEvent>();
-
-			foreach (long eventNumber in eventNumbers) {
-				events.Add(
-					ResolvedEvent.ForUnresolvedEvent(
-						new EventRecord(
-							eventNumber, 50 * (eventNumber + 1), Guid.NewGuid(), Guid.NewGuid(), 50 * (eventNumber + 1),
-							0, stream, ExpectedVersion.Any, DateTime.UtcNow,
-							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-							eventType, new byte[] {0}, new byte[] {0}
-						)
-					)
-				);
-			}
-
-			long start, end;
-			if (eventNumbers.Length > 0) {
-				start = eventNumbers[0];
-				end = eventNumbers[eventNumbers.Length - 1];
-			} else {
-				start = _fromSequenceNumber;
-				end = _fromSequenceNumber;
-			}
-
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == stream).CorrelationId;
-
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, stream, start, 100, ReadStreamResult.Success, events.ToArray(), null, false, "",
-					start + 1, end, true, 200)
-			);
-		}
-
-		private void HandleEvents(string stream, long start, long end) {
-			List<long> eventNumbers = new List<long>();
-			for (long i = start; i <= end; i++) eventNumbers.Add(i);
-			HandleEvents(stream, eventNumbers.ToArray());
-		}
-
-		private void HandleDeletedStream(string stream, long sequenceNumber, ReadStreamResult result) {
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == stream).CorrelationId;
-
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, stream, sequenceNumber, 100, result, new ResolvedEvent[] { }, null, false, "", -1,
-					sequenceNumber, true, 200)
-			);
-		}
-
-		[Test]
-		public void when_no_stream_and_sequence_num_equal_to_minus_one_should_not_publish_partition_deleted_message() {
-			HandleDeletedStream(_streamNames[0], -1, ReadStreamResult.NoStream);
-			//trigger event delivery:
-			HandleEvents(_streamNames[1], _fromSequenceNumber, _fromSequenceNumber);
-
-			Assert.AreEqual(0,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().Count());
-		}
-
-		[Test]
-		public void when_no_stream_and_sequence_num_equal_to_zero_should_publish_partition_deleted_message() {
-			HandleDeletedStream(_streamNames[0], 0, ReadStreamResult.NoStream);
-			//trigger event delivery:
-			HandleEvents(_streamNames[1], _fromSequenceNumber, _fromSequenceNumber);
-
-			Assert.AreEqual(1,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().Count());
-			Assert.AreEqual(_streamNames[0],
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().First()
-					.Partition);
-		}
-
-		[Test]
-		public void when_no_stream_and_sequence_num_greater_than_zero_should_publish_partition_deleted_message() {
-			HandleDeletedStream(_streamNames[0], 100, ReadStreamResult.NoStream);
-			//trigger event delivery:
-			HandleEvents(_streamNames[1], _fromSequenceNumber, _fromSequenceNumber);
-
-			Assert.AreEqual(1,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().Count());
-			Assert.AreEqual(_streamNames[0],
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().First()
-					.Partition);
-		}
-
-		[Test]
-		public void when_stream_deleted_should_publish_partition_deleted_message() {
-			HandleDeletedStream(_streamNames[0], 0, ReadStreamResult.StreamDeleted);
-			//trigger event delivery:
-			HandleEvents(_streamNames[1], _fromSequenceNumber, _fromSequenceNumber);
-
-			Assert.AreEqual(1,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().Count());
-			Assert.AreEqual(_streamNames[0],
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().First()
-					.Partition);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_eof_for_all_streams_and_idle_eof.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_eof_for_all_streams_and_idle_eof.cs
deleted file mode 100644
index fc8e260cfc2..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_eof_for_all_streams_and_idle_eof.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.multi_stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_eof_for_all_streams_and_idle_eof<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private MultiStreamEventReader _edp;
-		private Guid _distibutionPointCorrelationId;
-		private Guid _firstEventId;
-		private Guid _secondEventId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		private string[] _abStreams;
-		private Dictionary<string, long> _ab12Tag;
-		private FakeTimeProvider _fakeTimeProvider;
-
-		[SetUp]
-		public new void When() {
-			_ab12Tag = new Dictionary<string, long> {{"a", 1}, {"b", 2}};
-			_abStreams = new[] {"a", "b"};
-
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_fakeTimeProvider = new FakeTimeProvider();
-			_edp = new MultiStreamEventReader(
-				_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
-				_fakeTimeProvider);
-			_edp.Resume();
-			_firstEventId = Guid.NewGuid();
-			_secondEventId = Guid.NewGuid();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "a").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "a", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any,
-								_fakeTimeProvider.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-					}, null, false, "", 2, 1, true, 200));
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "b").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "b", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 100, Guid.NewGuid(), _secondEventId, 100, 0, "b", ExpectedVersion.Any,
-								_fakeTimeProvider.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-					}, null, false, "", 3, 2, true, 200));
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "a").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "a", 100, 100, ReadStreamResult.Success, new ResolvedEvent[] { }, null, false, "", 2,
-					1, true, 400));
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "b").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "b", 100, 100, ReadStreamResult.Success, new ResolvedEvent[] { }, null, false, "", 3,
-					2, true, 400));
-			_fakeTimeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(500));
-			correlationId = ((ClientMessage.ReadStreamEventsForward)(_consumer.HandledMessages
-				.OfType<AwakeServiceMessage.SubscribeAwake>().Last().ReplyWithMessage)).CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "a", 100, 100, ReadStreamResult.Success, new ResolvedEvent[] { }, null, false, "", 2,
-					1, true, 600));
-		}
-
-		[Test]
-		public void publishes_event_distribution_idle_messages() {
-			Assert.AreEqual(2, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderIdle>().Count());
-			var first = _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderIdle>().First();
-			var second = _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderIdle>().Skip(1).First();
-
-			Assert.AreEqual(first.CorrelationId, _distibutionPointCorrelationId);
-			Assert.AreEqual(second.CorrelationId, _distibutionPointCorrelationId);
-
-			Assert.AreEqual(TimeSpan.FromMilliseconds(500), second.IdleTimestampUtc - first.IdleTimestampUtc);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed.cs
deleted file mode 100644
index 31895ce8bab..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.multi_stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_read_completed<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private MultiStreamEventReader _edp;
-		private Guid _distibutionPointCorrelationId;
-		private Guid _firstEventId;
-		private Guid _secondEventId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		private string[] _abStreams;
-		private Dictionary<string, long> _ab12Tag;
-
-		[SetUp]
-		public new void When() {
-			_ab12Tag = new Dictionary<string, long> {{"a", 1}, {"b", 2}};
-			_abStreams = new[] {"a", "b"};
-
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_edp = new MultiStreamEventReader(
-				_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
-				new RealTimeProvider());
-			_edp.Resume();
-			_firstEventId = Guid.NewGuid();
-			_secondEventId = Guid.NewGuid();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "a").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "a", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any, DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 100, Guid.NewGuid(), _secondEventId, 100, 0, "a", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 3, 4, false, 200));
-		}
-
-		[Test]
-		public void cannot_be_resumed() {
-			Assert.Throws<InvalidOperationException>(() => { _edp.Resume(); });
-		}
-
-		[Test]
-		public void cannot_be_paused() {
-			_edp.Pause();
-		}
-
-		[Test]
-		public void does_not_publish_committed_event_received_messages() {
-			Assert.AreEqual(
-				0, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-		}
-
-		[Test]
-		public void publishes_read_events_from_beginning_with_correct_next_event_number() {
-			// do not publish new read requests until we consume already available events
-			Assert.AreEqual(2, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-					.Last(v => v.EventStreamId == "a")
-					.FromEventNumber);
-		}
-
-		[Test]
-		public void cannot_handle_repeated_read_events_completed() {
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "a").CorrelationId;
-			Assert.Throws<InvalidOperationException>(() => {
-				_edp.Handle(
-					new ClientMessage.ReadStreamEventsForwardCompleted(
-						correlationId, "a", 100, 100, ReadStreamResult.Success,
-						new[] {
-							ResolvedEvent.ForUnresolvedEvent(
-								new EventRecord(
-									2, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "a", ExpectedVersion.Any,
-									DateTime.UtcNow,
-									PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin |
-									PrepareFlags.TransactionEnd,
-									"event_type", new byte[0], new byte[0]))
-						}, null, false, "", 3, 4, false, 100));
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_and_no_stream.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_and_no_stream.cs
deleted file mode 100644
index bb5fda8c4a6..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_and_no_stream.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.multi_stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_read_completed_and_no_stream<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private MultiStreamEventReader _edp;
-		private Guid _distibutionPointCorrelationId;
-		private Guid _firstEventId;
-		private Guid _secondEventId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		private string[] _abStreams;
-		private Dictionary<string, long> _ab12Tag;
-
-		[SetUp]
-		public new void When() {
-			_ab12Tag = new Dictionary<string, long> {{"a", 1}, {"b", 0}};
-			_abStreams = new[] {"a", "b"};
-
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_edp = new MultiStreamEventReader(
-				_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
-				new RealTimeProvider());
-			_edp.Resume();
-			_firstEventId = Guid.NewGuid();
-			_secondEventId = Guid.NewGuid();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "a").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "a", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any, DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 100, Guid.NewGuid(), _secondEventId, 100, 0, "a", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 3, 2, true, 200));
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "b").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "b", 100, 100, ReadStreamResult.Success, new ResolvedEvent[0], null, false, "",
-					-1, ExpectedVersion.NoStream, true, 200));
-		}
-
-		[Test]
-		public void publishes_read_events_from_beginning_with_correct_next_event_number() {
-			Assert.AreEqual(3, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
-			Assert.IsTrue(
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-					.Any(m => m.EventStreamId == "a"));
-			Assert.IsTrue(
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-					.Any(m => m.EventStreamId == "b"));
-			Assert.AreEqual(
-				3,
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-					.Last(m => m.EventStreamId == "a")
-					.FromEventNumber);
-			Assert.AreEqual(
-				0,
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-					.Last(m => m.EventStreamId == "b")
-					.FromEventNumber);
-		}
-
-		[Test]
-		public void publishes_correct_committed_event_received_messages() {
-			Assert.AreEqual(
-				3, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-			var first =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().First();
-			var second =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
-					.Skip(1)
-					.First();
-			var third =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
-					.Skip(2)
-					.First();
-
-			Assert.IsNull(third.Data);
-			Assert.AreEqual(100, third.SafeTransactionFileReaderJoinPosition);
-
-			Assert.AreEqual("event_type1", first.Data.EventType);
-			Assert.AreEqual("event_type2", second.Data.EventType);
-			Assert.AreEqual(_firstEventId, first.Data.EventId);
-			Assert.AreEqual(_secondEventId, second.Data.EventId);
-			Assert.AreEqual(1, first.Data.Data[0]);
-			Assert.AreEqual(2, first.Data.Metadata[0]);
-			Assert.AreEqual(3, second.Data.Data[0]);
-			Assert.AreEqual(4, second.Data.Metadata[0]);
-			Assert.AreEqual("a", first.Data.EventStreamId);
-			Assert.AreEqual("a", second.Data.EventStreamId);
-			Assert.AreEqual(50, first.Data.Position.PreparePosition);
-			Assert.AreEqual(100, second.Data.Position.PreparePosition);
-			Assert.AreEqual(-1, first.Data.Position.CommitPosition);
-			Assert.AreEqual(-1, second.Data.Position.CommitPosition);
-			Assert.AreEqual(50, first.SafeTransactionFileReaderJoinPosition);
-			Assert.AreEqual(100, second.SafeTransactionFileReaderJoinPosition);
-		}
-
-
-		[Test]
-		public void publishes_subscribe_awake() {
-			Assert.AreEqual(2, _consumer.HandledMessages.OfType<AwakeServiceMessage.SubscribeAwake>().Count());
-		}
-
-		[Test]
-		public void can_handle_following_read_events_completed() {
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					_distibutionPointCorrelationId, "a", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								3, 250, Guid.NewGuid(), Guid.NewGuid(), 250, 0, "a", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type", new byte[0], new byte[0]))
-					}, null, false, "", 4, 3, true, 300));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams.cs
deleted file mode 100644
index 41f6480b42f..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.multi_stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_read_completed_for_all_streams<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private MultiStreamEventReader _edp;
-		private Guid _distibutionPointCorrelationId;
-		private Guid _firstEventId;
-		private Guid _secondEventId;
-		private Guid _thirdEventId;
-		private Guid _fourthEventId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		private string[] _abStreams;
-		private Dictionary<string, long> _ab12Tag;
-
-		[SetUp]
-		public new void When() {
-			_ab12Tag = new Dictionary<string, long> {{"a", 1}, {"b", 2}};
-			_abStreams = new[] {"a", "b"};
-
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_edp = new MultiStreamEventReader(
-				_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
-				new RealTimeProvider());
-			_edp.Resume();
-			_firstEventId = Guid.NewGuid();
-			_secondEventId = Guid.NewGuid();
-			_thirdEventId = Guid.NewGuid();
-			_fourthEventId = Guid.NewGuid();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "a").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "a", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any, DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
-								PrepareFlags.IsJson,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 150, Guid.NewGuid(), _secondEventId, 150, 0, "a", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 3, 2, true, 200));
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "b").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "b", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 100, Guid.NewGuid(), _thirdEventId, 100, 0, "b", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								3, 200, Guid.NewGuid(), _fourthEventId, 200, 0, "b", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 4, 3, true, 200));
-		}
-
-		[Test]
-		public void cannot_be_resumed() {
-			Assert.Throws<InvalidOperationException>(() => { _edp.Resume(); });
-		}
-
-		[Test]
-		public void cannot_be_paused() {
-			_edp.Pause();
-		}
-
-		[Test]
-		public void publishes_correct_committed_event_received_messages() {
-			Assert.AreEqual(
-				3, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-			var first =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().First();
-			var second =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
-					.Skip(1)
-					.First();
-
-			Assert.AreEqual("event_type1", first.Data.EventType);
-			Assert.AreEqual("event_type1", second.Data.EventType);
-			Assert.AreEqual(_firstEventId, first.Data.EventId);
-			Assert.AreEqual(_thirdEventId, second.Data.EventId);
-			Assert.AreEqual(1, first.Data.Data[0]);
-			Assert.AreEqual(2, first.Data.Metadata[0]);
-			Assert.AreEqual(1, second.Data.Data[0]);
-			Assert.AreEqual(2, second.Data.Metadata[0]);
-			Assert.AreEqual("a", first.Data.EventStreamId);
-			Assert.AreEqual("b", second.Data.EventStreamId);
-			Assert.AreEqual(50, first.Data.Position.PreparePosition);
-			Assert.AreEqual(100, second.Data.Position.PreparePosition);
-			Assert.AreEqual(-1, first.Data.Position.CommitPosition);
-			Assert.AreEqual(-1, second.Data.Position.CommitPosition);
-			Assert.AreEqual(50, first.SafeTransactionFileReaderJoinPosition);
-			Assert.AreEqual(100, second.SafeTransactionFileReaderJoinPosition);
-		}
-
-		[Test]
-		public void publishes_read_events_from_beginning_with_correct_next_event_number() {
-			Assert.AreEqual(3, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
-			Assert.IsTrue(
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-					.Any(m => m.EventStreamId == "a"));
-			Assert.IsTrue(
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-					.Any(m => m.EventStreamId == "b"));
-			Assert.AreEqual(
-				3,
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-					.Last(m => m.EventStreamId == "a")
-					.FromEventNumber);
-			Assert.AreEqual(
-				2, // still first read request
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-					.Last(m => m.EventStreamId == "b")
-					.FromEventNumber);
-		}
-
-		[Test]
-		public void cannot_handle_repeated_read_events_completed() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_edp.Handle(
-					new ClientMessage.ReadStreamEventsForwardCompleted(
-						_distibutionPointCorrelationId, "stream", 100, 100, ReadStreamResult.Success,
-						new[] {
-							ResolvedEvent.ForUnresolvedEvent(
-								new EventRecord(
-									10, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "stream", ExpectedVersion.Any,
-									DateTime.UtcNow,
-									PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin |
-									PrepareFlags.TransactionEnd,
-									"event_type", new byte[0], new byte[0]))
-						}, null, false, "", 11, 10, true, 100));
-			});
-		}
-
-		[Test]
-		public void can_handle_following_read_events_completed() {
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "a").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "a", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								3, 250, Guid.NewGuid(), Guid.NewGuid(), 250, 0, "a", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type", new byte[0], new byte[0]))
-					}, null, false, "", 4, 4, false, 300));
-		}
-
-		[Test]
-		public void publishes_committed_event_received_messages_in_correct_order() {
-			Assert.AreEqual(
-				3, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-			var first =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
-					.Skip(0)
-					.First();
-			var second =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
-					.Skip(1)
-					.First();
-			var third =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
-					.Skip(2)
-					.First();
-
-			Assert.AreEqual(first.Data.EventId, _firstEventId);
-			Assert.AreEqual(second.Data.EventId, _thirdEventId);
-			Assert.AreEqual(third.Data.EventId, _secondEventId);
-
-			Assert.IsTrue(first.Data.IsJson);
-			Assert.IsFalse(second.Data.IsJson);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams_after_pause_requested.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams_after_pause_requested.cs
deleted file mode 100644
index c821de3b52c..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams_after_pause_requested.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.multi_stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_read_completed_for_all_streams_after_pause_requested<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private MultiStreamEventReader _edp;
-		private Guid _distibutionPointCorrelationId;
-		private Guid _firstEventId;
-		private Guid _secondEventId;
-		private Guid _thirdEventId;
-		private Guid _fourthEventId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		private string[] _abStreams;
-		private Dictionary<string, long> _ab12Tag;
-
-		[SetUp]
-		public new void When() {
-			_ab12Tag = new Dictionary<string, long> {{"a", 1}, {"b", 2}};
-			_abStreams = new[] {"a", "b"};
-
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_edp = new MultiStreamEventReader(
-				_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
-				new RealTimeProvider());
-			_edp.Resume();
-			_firstEventId = Guid.NewGuid();
-			_secondEventId = Guid.NewGuid();
-			_thirdEventId = Guid.NewGuid();
-			_fourthEventId = Guid.NewGuid();
-			_edp.Pause();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "a").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "a", 100, 100, ReadStreamResult.Success,
-					new[] {
-						EventStore.Core.Data.ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any, DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						EventStore.Core.Data.ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 150, Guid.NewGuid(), _secondEventId, 150, 0, "a", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 3, 2, true, 200));
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "b").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "b", 100, 100, ReadStreamResult.Success,
-					new[] {
-						EventStore.Core.Data.ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 100, Guid.NewGuid(), _thirdEventId, 100, 0, "b", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						EventStore.Core.Data.ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								3, 200, Guid.NewGuid(), _fourthEventId, 200, 0, "b", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 4, 3, true, 200));
-		}
-
-		[Test]
-		public void can_be_resumed() {
-			_edp.Resume();
-		}
-
-		[Test]
-		public void cannot_be_paused() {
-			Assert.Throws<InvalidOperationException>(() => { _edp.Pause(); });
-		}
-
-		[Test]
-		public void publishes_correct_number_of_committed_event_received_messages() {
-			Assert.AreEqual(
-				3, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-		}
-
-		[Test]
-		public void cannot_handle_following_read_events_completed() {
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "a").CorrelationId;
-			Assert.Throws<InvalidOperationException>(() => {
-				_edp.Handle(
-					new ClientMessage.ReadStreamEventsForwardCompleted(
-						correlationId, "a", 100, 100, ReadStreamResult.Success,
-						new[] {
-							EventStore.Core.Data.ResolvedEvent.ForUnresolvedEvent(
-								new EventRecord(
-									3, 250, Guid.NewGuid(), Guid.NewGuid(), 250, 0, "a", ExpectedVersion.Any,
-									DateTime.UtcNow,
-									PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin |
-									PrepareFlags.TransactionEnd,
-									"event_type", new byte[0], new byte[0]))
-						}, null, false, "", 4, 4, false, 300));
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams_and_eofs.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams_and_eofs.cs
deleted file mode 100644
index 93e096a4ad1..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams_and_eofs.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.multi_stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_read_completed_for_all_streams_and_eofs<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private MultiStreamEventReader _edp;
-		private Guid _distibutionPointCorrelationId;
-		private Guid _firstEventId;
-		private Guid _secondEventId;
-		private Guid _thirdEventId;
-		private Guid _fourthEventId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		private string[] _abStreams;
-		private Dictionary<string, long> _ab12Tag;
-
-		[SetUp]
-		public new void When() {
-			_ab12Tag = new Dictionary<string, long> {{"a", 1}, {"b", 2}};
-			_abStreams = new[] {"a", "b"};
-
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_edp = new MultiStreamEventReader(
-				_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
-				new RealTimeProvider());
-			_edp.Resume();
-			_firstEventId = Guid.NewGuid();
-			_secondEventId = Guid.NewGuid();
-			_thirdEventId = Guid.NewGuid();
-			_fourthEventId = Guid.NewGuid();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "a").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "a", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any, DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 150, Guid.NewGuid(), _secondEventId, 150, 0, "a", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 3, 2, true, 200));
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "a").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "b", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 100, Guid.NewGuid(), _thirdEventId, 100, 0, "b", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								3, 200, Guid.NewGuid(), _fourthEventId, 200, 0, "b", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 4, 3, true, 200));
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "a").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "a", 100, 100, ReadStreamResult.Success, new ResolvedEvent[0], null, false, "", 3,
-					2, true, 400));
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "b").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "b", 100, 100, ReadStreamResult.Success, new ResolvedEvent[0], null, false, "", 4,
-					3, true, 400));
-		}
-
-		[Test]
-		public void publishes_correct_committed_event_received_messages() {
-			Assert.AreEqual(
-				6, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-			var first =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().First();
-			var fifth =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
-					.Skip(4)
-					.First();
-			var sixth =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
-					.Skip(5)
-					.First();
-
-			Assert.AreEqual("event_type1", first.Data.EventType);
-			Assert.IsNull(fifth.Data);
-			Assert.IsNull(sixth.Data);
-			Assert.AreEqual(_firstEventId, first.Data.EventId);
-			Assert.AreEqual(1, first.Data.Data[0]);
-			Assert.AreEqual(2, first.Data.Metadata[0]);
-			Assert.AreEqual("a", first.Data.EventStreamId);
-			Assert.IsNull(fifth.Data);
-//            Assert.IsNullOrEmpty("", fifth.EventStreamId);
-			Assert.AreEqual(50, first.Data.Position.PreparePosition);
-//            Assert.AreEqual(0, fifth.Position.PreparePosition);
-			Assert.AreEqual(-1, first.Data.Position.CommitPosition);
-//            Assert.AreEqual(0, fifth.Position.CommitPosition);
-			Assert.AreEqual(50, first.SafeTransactionFileReaderJoinPosition);
-//            Assert.AreEqual(200, fifth.SafeTransactionFileReaderJoinPosition);
-			Assert.AreEqual(400, sixth.SafeTransactionFileReaderJoinPosition);
-		}
-
-		[Test]
-		public void publishes_read_events_from_beginning_with_correct_next_event_number() {
-			Assert.AreEqual(4, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
-			Assert.IsTrue(
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-					.Any(m => m.EventStreamId == "a"));
-			Assert.IsTrue(
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-					.Any(m => m.EventStreamId == "b"));
-			Assert.AreEqual(
-				3,
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-					.Last(m => m.EventStreamId == "a")
-					.FromEventNumber);
-			Assert.AreEqual(
-				4,
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-					.Last(m => m.EventStreamId == "b")
-					.FromEventNumber);
-		}
-
-		[Test]
-		public void publishes_subscribe_awake() {
-			Assert.AreEqual(4, _consumer.HandledMessages.OfType<AwakeServiceMessage.SubscribeAwake>().Count());
-		}
-
-
-		[Test]
-		public void publishes_committed_event_received_messages_in_correct_order() {
-			Assert.AreEqual(
-				6, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-			var first =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
-					.Skip(0)
-					.First();
-			var second =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
-					.Skip(1)
-					.First();
-			var third =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
-					.Skip(2)
-					.First();
-			var fourth =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
-					.Skip(3)
-					.First();
-			var fifth =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
-					.Skip(4)
-					.First();
-			var sixth =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
-					.Skip(5)
-					.First();
-
-			Assert.AreEqual(first.Data.EventId, _firstEventId);
-			Assert.AreEqual(second.Data.EventId, _thirdEventId);
-			Assert.AreEqual(third.Data.EventId, _secondEventId);
-			Assert.AreEqual(fourth.Data.EventId, _fourthEventId);
-			Assert.IsNull(fifth.Data);
-			Assert.IsNull(sixth.Data);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams_then_pause_requested_then_eof.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams_then_pause_requested_then_eof.cs
deleted file mode 100644
index 0a38de15cd6..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams_then_pause_requested_then_eof.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.multi_stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_read_completed_for_all_streams_then_pause_requested_then_eof<TLogFormat, TStreamId> :
-		TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private MultiStreamEventReader _edp;
-		private Guid _distibutionPointCorrelationId;
-		private Guid _firstEventId;
-		private Guid _secondEventId;
-		private Guid _thirdEventId;
-		private Guid _fourthEventId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		private string[] _abStreams;
-		private Dictionary<string, long> _ab12Tag;
-
-		[SetUp]
-		public new void When() {
-			_ab12Tag = new Dictionary<string, long> {{"a", 1}, {"b", 2}};
-			_abStreams = new[] {"a", "b"};
-
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_edp = new MultiStreamEventReader(
-				_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
-				new RealTimeProvider());
-			_edp.Resume();
-			_firstEventId = Guid.NewGuid();
-			_secondEventId = Guid.NewGuid();
-			_thirdEventId = Guid.NewGuid();
-			_fourthEventId = Guid.NewGuid();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "a").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "a", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any, DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 100, Guid.NewGuid(), _secondEventId, 100, 0, "a", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 3, 2, true, 200));
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "b").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "b", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 150, Guid.NewGuid(), _thirdEventId, 150, 0, "b", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								3, 200, Guid.NewGuid(), _fourthEventId, 200, 0, "b", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 4, 3, true, 200));
-			_edp.Pause();
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "a").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "a", 100, 100, ReadStreamResult.Success, new ResolvedEvent[] { }, null, false, "", 3,
-					2, true, 400));
-		}
-
-		[Test]
-		public void publishes_read_events_from_beginning_with_correct_next_event_number() {
-			Assert.AreEqual(3, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
-			Assert.IsTrue(
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-					.Any(m => m.EventStreamId == "a"));
-			Assert.IsTrue(
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-					.Any(m => m.EventStreamId == "b"));
-			Assert.AreEqual(
-				3,
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-					.Last(m => m.EventStreamId == "a")
-					.FromEventNumber);
-			Assert.AreEqual(
-				2,
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-					.Last(m => m.EventStreamId == "b")
-					.FromEventNumber);
-		}
-
-		[Test]
-		public void does_not_publish_schedule() {
-			Assert.AreEqual(0,
-				_consumer.HandledMessages.OfType<TimerMessage.Schedule>().Where(x =>
-					x.ReplyMessage.GetType() != typeof(ProjectionManagementMessage.Internal.ReadTimeout)).Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_after_event_zero.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_after_event_zero.cs
deleted file mode 100644
index 101942cc3f9..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_after_event_zero.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.multi_stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_handling_streams_with_deleted_events_and_reader_starting_after_event_zero<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private MultiStreamEventReader _edp;
-		private int _fromSequenceNumber;
-		private string[] _streamNames;
-		private Dictionary<string, long> _streamPositions;
-		private Guid _distibutionPointCorrelationId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-			_fromSequenceNumber = 10;
-			_streamNames = new[] {"stream1", "stream2"};
-			_streamPositions = new Dictionary<string, long> {{"stream1", _fromSequenceNumber}, {"stream2", 100}};
-		}
-
-		[SetUp]
-		public new void When() {
-			_distibutionPointCorrelationId = Guid.NewGuid();
-
-			_edp = new MultiStreamEventReader(
-				_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _streamNames, _streamPositions, false,
-				new RealTimeProvider());
-
-			_edp.Resume();
-		}
-
-		private void HandleEvents(string stream, long[] eventNumbers) {
-			string eventType = "event_type";
-			List<ResolvedEvent> events = new List<ResolvedEvent>();
-
-			foreach (long eventNumber in eventNumbers) {
-				events.Add(
-					ResolvedEvent.ForUnresolvedEvent(
-						new EventRecord(
-							eventNumber, 50 * (eventNumber + 1), Guid.NewGuid(), Guid.NewGuid(), 50 * (eventNumber + 1),
-							0, stream, ExpectedVersion.Any, DateTime.UtcNow,
-							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-							eventType, new byte[] {0}, new byte[] {0}
-						)
-					)
-				);
-			}
-
-			long start, end;
-			if (eventNumbers.Length > 0) {
-				start = eventNumbers[0];
-				end = eventNumbers[eventNumbers.Length - 1];
-			} else {
-				start = _fromSequenceNumber;
-				end = _fromSequenceNumber;
-			}
-
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == stream).CorrelationId;
-
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, stream, start, 100, ReadStreamResult.Success, events.ToArray(), null, false, "",
-					start + 1, end, true, 200)
-			);
-		}
-
-		private void HandleEvents(string stream, long start, long end) {
-			List<long> eventNumbers = new List<long>();
-			for (long i = start; i <= end; i++) eventNumbers.Add(i);
-			HandleEvents(stream, eventNumbers.ToArray());
-		}
-
-		[Test]
-		public void allows_first_event_to_be_equal_to_sequence_number() {
-			long eventSequenceNumber = _fromSequenceNumber;
-
-			Assert.DoesNotThrow(() => {
-				HandleEvents(_streamNames[0], eventSequenceNumber, eventSequenceNumber);
-				//to trigger event delivery:
-				HandleEvents(_streamNames[1], 100, 101);
-			});
-		}
-
-		[Test]
-		public void should_not_allow_first_event_to_be_greater_than_sequence_number() {
-			long eventSequenceNumber = _fromSequenceNumber + 5;
-
-			HandleEvents(_streamNames[0], eventSequenceNumber, eventSequenceNumber);
-			//to trigger event delivery:
-			HandleEvents(_streamNames[1], 100, 101);
-
-			Assert.AreEqual(1, HandledMessages.OfType<ReaderSubscriptionMessage.Faulted>().Count());
-		}
-
-		[Test]
-		public void should_not_allow_first_event_to_be_less_than_sequence_number() {
-			long eventSequenceNumber = _fromSequenceNumber - 1;
-
-			HandleEvents(_streamNames[0], eventSequenceNumber, eventSequenceNumber);
-			//to trigger event delivery:
-			HandleEvents(_streamNames[1], 100, 101);
-
-			Assert.AreEqual(1, HandledMessages.OfType<ReaderSubscriptionMessage.Faulted>().Count());
-		}
-
-		[Test]
-		public void events_after_first_event_should_not_be_in_sequence() {
-			//_fromSequenceNumber+2 has been omitted
-			HandleEvents(_streamNames[0],
-				new long[] {
-					_fromSequenceNumber, _fromSequenceNumber + 1, _fromSequenceNumber + 3, _fromSequenceNumber + 4
-				});
-			//to trigger event delivery:
-			HandleEvents(_streamNames[1], 100, 101);
-
-			Assert.AreEqual(2, HandledMessages.OfType<ReaderSubscriptionMessage.Faulted>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_at_event_zero.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_at_event_zero.cs
deleted file mode 100644
index 38c40fb4fa6..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_at_event_zero.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.multi_stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_handling_streams_with_deleted_events_and_reader_starting_at_event_zero<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private MultiStreamEventReader _edp;
-		private int _fromSequenceNumber;
-		private string[] _streamNames;
-		private Dictionary<string, long> _streamPositions;
-		private Guid _distibutionPointCorrelationId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-			_fromSequenceNumber = 0;
-			_streamNames = new[] {"stream1", "stream2"};
-			_streamPositions = new Dictionary<string, long> {{"stream1", _fromSequenceNumber}, {"stream2", 100}};
-		}
-
-		[SetUp]
-		public new void When() {
-			_distibutionPointCorrelationId = Guid.NewGuid();
-
-			_edp = new MultiStreamEventReader(
-				_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _streamNames, _streamPositions, false,
-				new RealTimeProvider());
-
-			_edp.Resume();
-		}
-
-		private void HandleEvents(string stream, long[] eventNumbers) {
-			string eventType = "event_type";
-			List<ResolvedEvent> events = new List<ResolvedEvent>();
-
-			foreach (long eventNumber in eventNumbers) {
-				events.Add(
-					ResolvedEvent.ForUnresolvedEvent(
-						new EventRecord(
-							eventNumber, 50 * (eventNumber + 1), Guid.NewGuid(), Guid.NewGuid(), 50 * (eventNumber + 1),
-							0, stream, ExpectedVersion.Any, DateTime.UtcNow,
-							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-							eventType, new byte[] {0}, new byte[] {0}
-						)
-					)
-				);
-			}
-
-			long start, end;
-			if (eventNumbers.Length > 0) {
-				start = eventNumbers[0];
-				end = eventNumbers[eventNumbers.Length - 1];
-			} else {
-				start = _fromSequenceNumber;
-				end = _fromSequenceNumber;
-			}
-
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == stream).CorrelationId;
-
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, stream, start, 100, ReadStreamResult.Success, events.ToArray(), null, false, "",
-					start + 1, end, true, 200)
-			);
-		}
-
-		private void HandleEvents(string stream, long start, long end) {
-			List<long> eventNumbers = new List<long>();
-			for (long i = start; i <= end; i++) eventNumbers.Add(i);
-			HandleEvents(stream, eventNumbers.ToArray());
-		}
-
-		[Test]
-		public void allows_first_event_to_be_equal_to_sequence_number() {
-			long eventSequenceNumber = _fromSequenceNumber;
-
-			Assert.DoesNotThrow(() => {
-				HandleEvents(_streamNames[0], eventSequenceNumber, eventSequenceNumber);
-				//to trigger event delivery:
-				HandleEvents(_streamNames[1], 100, 101);
-			});
-		}
-
-		[Test]
-		public void allows_first_event_to_be_greater_than_sequence_number() {
-			long eventSequenceNumber = _fromSequenceNumber + 5;
-
-			Assert.DoesNotThrow(() => {
-				HandleEvents(_streamNames[0], eventSequenceNumber, eventSequenceNumber);
-				//to trigger event delivery:
-				HandleEvents(_streamNames[1], 100, 101);
-			});
-		}
-
-		[Test]
-		public void events_after_first_event_should_not_be_in_sequence() {
-			//_fromSequenceNumber+2 has been omitted
-			HandleEvents(_streamNames[0],
-				new long[] {
-					_fromSequenceNumber, _fromSequenceNumber + 1, _fromSequenceNumber + 3, _fromSequenceNumber + 4
-				});
-			//to trigger event delivery:
-			HandleEvents(_streamNames[1], 100, 101);
-
-			Assert.AreEqual(2, HandledMessages.OfType<ReaderSubscriptionMessage.Faulted>().Count());
-		}
-
-		[Test]
-		public void events_fault_message_for_out_of_sequence_events_should_be() {
-			//_fromSequenceNumber+2 has been omitted
-			HandleEvents(_streamNames[0],
-				new long[] {
-					_fromSequenceNumber, _fromSequenceNumber + 1, _fromSequenceNumber + 3, _fromSequenceNumber + 4
-				});
-			//to trigger event delivery:
-			HandleEvents(_streamNames[1], 100, 101);
-
-			Assert.IsTrue(HandledMessages.OfType<ReaderSubscriptionMessage.Faulted>().First().Reason
-				.Contains(" was expected in the stream "));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_has_been_created.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_has_been_created.cs
deleted file mode 100644
index 4282aa1b039..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_has_been_created.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.multi_stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_has_been_created<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private MultiStreamEventReader _edp;
-		private Guid _distibutionPointCorrelationId;
-		private string[] _abStreams;
-		private Dictionary<string, long> _ab12Tag;
-
-		[SetUp]
-		public new void When() {
-			_ab12Tag = new Dictionary<string, long> {{"a", 1}, {"b", 2}};
-			_abStreams = new[] {"a", "b"};
-
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_edp = new MultiStreamEventReader(
-				_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
-				new RealTimeProvider());
-		}
-
-		[Test]
-		public void it_can_be_resumed() {
-			_edp.Resume();
-		}
-
-		[Test]
-		public void it_cannot_be_paused() {
-			Assert.Throws<InvalidOperationException>(() => { _edp.Pause(); });
-		}
-
-		[Test]
-		public void handle_read_events_completed_throws() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_edp.Handle(
-					new ClientMessage.ReadStreamEventsForwardCompleted(
-						_distibutionPointCorrelationId, "a", 100, 100, ReadStreamResult.Success, new ResolvedEvent[0],
-						null, false, "", -1, 4, true, 100));
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_onetime_reader_handles_eof.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_onetime_reader_handles_eof.cs
deleted file mode 100644
index 7f6b7f73503..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_onetime_reader_handles_eof.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.multi_stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_onetime_reader_handles_eof<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private MultiStreamEventReader _edp;
-		private Guid _distibutionPointCorrelationId;
-		private Guid _firstEventId;
-		private Guid _secondEventId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		private string[] _abStreams;
-		private Dictionary<string, long> _ab12Tag;
-		private FakeTimeProvider _fakeTimeProvider;
-
-		[SetUp]
-		public new void When() {
-			_ab12Tag = new Dictionary<string, long> {{"a", 1}, {"b", 2}};
-			_abStreams = new[] {"a", "b"};
-
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_fakeTimeProvider = new FakeTimeProvider();
-			_edp = new MultiStreamEventReader(
-				_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
-				_fakeTimeProvider, stopOnEof: true);
-			_edp.Resume();
-			_firstEventId = Guid.NewGuid();
-			_secondEventId = Guid.NewGuid();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "a").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "a", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any,
-								_fakeTimeProvider.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-					}, null, false, "", 2, 1, true, 200));
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "b").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "b", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 100, Guid.NewGuid(), _secondEventId, 100, 0, "b", ExpectedVersion.Any,
-								_fakeTimeProvider.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-					}, null, false, "", 3, 2, true, 200));
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "a").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "a", 100, 100, ReadStreamResult.Success, new ResolvedEvent[] { }, null, false, "", 2,
-					1, true, 400));
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "b").CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "b", 100, 100, ReadStreamResult.Success, new ResolvedEvent[] { }, null, false, "", 3,
-					2, true, 400));
-		}
-
-		[Test]
-		public void publishes_eof_message() {
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderEof>().Count());
-			var first = _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderEof>().First();
-			Assert.AreEqual(first.CorrelationId, _distibutionPointCorrelationId);
-		}
-
-		[Test]
-		public void does_not_publish_read_messages_anymore() {
-			Assert.AreEqual(4, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_read_completes_before_timeout.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_read_completes_before_timeout.cs
deleted file mode 100644
index d00233eb1b9..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_read_completes_before_timeout.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.multi_stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_read_completes_before_timeout<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private MultiStreamEventReader _eventReader;
-		private Guid _distibutionPointCorrelationId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		private string[] _abStreams;
-		private Dictionary<string, long> _ab12Tag;
-
-		[SetUp]
-		public new void When() {
-			_ab12Tag = new Dictionary<string, long> {{"a", 1}, {"b", 2}};
-			_abStreams = new[] {"a", "b"};
-
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_eventReader = new MultiStreamEventReader(
-				_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
-				new RealTimeProvider());
-			_eventReader.Resume();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "a").CorrelationId;
-			_eventReader.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "a", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								1, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "a", ExpectedVersion.Any, DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
-								PrepareFlags.IsJson,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 150, Guid.NewGuid(), Guid.NewGuid(), 150, 0, "a", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 3, 2, true, 200));
-			_eventReader.Handle(
-				new ProjectionManagementMessage.Internal.ReadTimeout(correlationId, "a"));
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "b").CorrelationId;
-			_eventReader.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "b", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 100, Guid.NewGuid(), Guid.NewGuid(), 100, 0, "b", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								3, 200, Guid.NewGuid(), Guid.NewGuid(), 200, 0, "b", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 4, 3, true, 200));
-			_eventReader.Handle(
-				new ProjectionManagementMessage.Internal.ReadTimeout(correlationId, "b"));
-		}
-
-		[Test]
-		public void should_deliver_events() {
-			Assert.AreEqual(3,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_read_for_one_stream_completes_but_times_out_for_another.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_read_for_one_stream_completes_but_times_out_for_another.cs
deleted file mode 100644
index 586df670bf8..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_read_for_one_stream_completes_but_times_out_for_another.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.multi_stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_read_for_one_stream_completes_but_times_out_for_another<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private MultiStreamEventReader _eventReader;
-		private Guid _distibutionPointCorrelationId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		private string[] _abStreams;
-		private Dictionary<string, long> _ab12Tag;
-
-		[SetUp]
-		public new void When() {
-			_ab12Tag = new Dictionary<string, long> {{"a", 1}, {"b", 2}};
-			_abStreams = new[] {"a", "b"};
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_eventReader = new MultiStreamEventReader(
-				_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
-				new RealTimeProvider());
-			_eventReader.Resume();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "a").CorrelationId;
-			_eventReader.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "a", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								1, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "a", ExpectedVersion.Any, DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
-								PrepareFlags.IsJson,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 150, Guid.NewGuid(), Guid.NewGuid(), 150, 0, "a", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 3, 2, true, 200));
-			//timeout follows
-			_eventReader.Handle(
-				new ProjectionManagementMessage.Internal.ReadTimeout(correlationId, "a"));
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "b").CorrelationId;
-			_eventReader.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "b", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 100, Guid.NewGuid(), Guid.NewGuid(), 100, 0, "b", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								3, 200, Guid.NewGuid(), Guid.NewGuid(), 200, 0, "b", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 4, 3, true, 200));
-			//timeout follows
-			_eventReader.Handle(
-				new ProjectionManagementMessage.Internal.ReadTimeout(correlationId, "b"));
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "a").CorrelationId;
-			_consumer.HandledMessages.Clear();
-			//timeout before read completes
-			_eventReader.Handle(
-				new ProjectionManagementMessage.Internal.ReadTimeout(correlationId, "a"));
-			_eventReader.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "a", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								3, 300, Guid.NewGuid(), Guid.NewGuid(), 300, 0, "a", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
-								PrepareFlags.IsJson,
-								"event_type1", new byte[] {4}, new byte[] {6})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								4, 400, Guid.NewGuid(), Guid.NewGuid(), 400, 0, "a", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {6}, new byte[] {8}))
-					}, null, false, "", 3, 2, true, 200));
-		}
-
-		[Test]
-		public void should_not_deliver_events_from_last_read() {
-			Assert.AreEqual(0,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_read_timeout_occurs.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_read_timeout_occurs.cs
deleted file mode 100644
index 7f4de33e399..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_read_timeout_occurs.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.multi_stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_read_timeout_occurs<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private MultiStreamEventReader _eventReader;
-		private Guid _distibutionPointCorrelationId;
-		private Guid _streamReadACorrelationId;
-		private Guid _streamReadBCorrelationId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		private string[] _abStreams;
-		private Dictionary<string, long> _ab12Tag;
-
-		[SetUp]
-		public new void When() {
-			_ab12Tag = new Dictionary<string, long> {{"a", 1}, {"b", 2}};
-			_abStreams = new[] {"a", "b"};
-
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_eventReader = new MultiStreamEventReader(
-				_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
-				new RealTimeProvider());
-			_eventReader.Resume();
-			_streamReadACorrelationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "a").CorrelationId;
-			_eventReader.Handle(
-				new ProjectionManagementMessage.Internal.ReadTimeout(_streamReadACorrelationId, "a"));
-			_eventReader.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					_streamReadACorrelationId, "a", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								1, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "a", ExpectedVersion.Any, DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
-								PrepareFlags.IsJson,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 150, Guid.NewGuid(), Guid.NewGuid(), 150, 0, "a", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 3, 2, true, 200));
-			_streamReadBCorrelationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == "b").CorrelationId;
-			_eventReader.Handle(
-				new ProjectionManagementMessage.Internal.ReadTimeout(_streamReadBCorrelationId, "b"));
-			_eventReader.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					_streamReadBCorrelationId, "b", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 100, Guid.NewGuid(), Guid.NewGuid(), 100, 0, "b", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								3, 200, Guid.NewGuid(), Guid.NewGuid(), 200, 0, "b", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 4, 3, true, 200));
-		}
-
-		[Test]
-		public void should_not_deliver_events() {
-			Assert.AreEqual(0,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-		}
-
-		[Test]
-		public void should_attempt_another_read_for_the_timed_out_reads() {
-			var streamAReads = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Where(x => x.EventStreamId == "a");
-
-			Assert.AreEqual(streamAReads.First().CorrelationId, _streamReadACorrelationId);
-			Assert.AreEqual(1, streamAReads.Skip(1).Count());
-
-			var streamBReads = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Where(x => x.EventStreamId == "b");
-
-			Assert.AreEqual(streamBReads.First().CorrelationId, _streamReadBCorrelationId);
-			Assert.AreEqual(1, streamBReads.Skip(1).Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_resuming.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_resuming.cs
deleted file mode 100644
index ccd1eeb1277..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_resuming.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.multi_stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_resuming<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private MultiStreamEventReader _edp;
-		private Guid _distibutionPointCorrelationId;
-
-		private string[] _abStreams;
-		private Dictionary<string, long> _ab12Tag;
-
-		[SetUp]
-		public new void When() {
-			_ab12Tag = new Dictionary<string, long> {{"a", 1}, {"b", 2}};
-			_abStreams = new[] {"a", "b"};
-
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_edp = new MultiStreamEventReader(
-				_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
-				new RealTimeProvider());
-
-			_edp.Resume();
-		}
-
-		[Test]
-		public void it_cannot_be_resumed() {
-			Assert.Throws<InvalidOperationException>(() => { _edp.Resume(); });
-		}
-
-		[Test]
-		public void it_cannot_be_paused() {
-			_edp.Pause();
-		}
-
-		[Test]
-		public void it_publishes_read_events_from_beginning() {
-			Assert.AreEqual(2, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
-			Assert.IsTrue(
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-					.Any(m => m.EventStreamId == "a"));
-			Assert.IsTrue(
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-					.Any(m => m.EventStreamId == "b"));
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-					.Single(m => m.EventStreamId == "a")
-					.FromEventNumber);
-			Assert.AreEqual(
-				2,
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-					.Single(m => m.EventStreamId == "b")
-					.FromEventNumber);
-		}
-
-		[Test]
-		public void can_handle_read_events_completed() {
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					_distibutionPointCorrelationId, "a", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								1, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "a", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type", new byte[0], new byte[0]), 0)
-					}, null, false, "", 2, 4, false, 100));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_creating_stream_event_reader.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_creating_stream_event_reader.cs
deleted file mode 100644
index 62e3bcb193c..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_creating_stream_event_reader.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_creating_stream_event_reader<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		[Test]
-		public void it_can_be_created() {
-			new StreamEventReader(_bus, Guid.NewGuid(), null, "stream", 0, new RealTimeProvider(), false,
-				produceStreamDeletes: false);
-		}
-
-		[Test]
-		public void null_publisher_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				new StreamEventReader(null, Guid.NewGuid(), null, "stream", 0, new RealTimeProvider(), false,
-					produceStreamDeletes: false);
-			});
-		}
-
-		[Test]
-		public void empty_event_reader_id_throws_argument_exception() {
-			Assert.Throws<ArgumentException>(() => {
-				new StreamEventReader(_bus, Guid.Empty, null, "stream", 0, new RealTimeProvider(), false,
-					produceStreamDeletes: false);
-			});
-		}
-
-		[Test]
-		public void null_stream_name_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				new StreamEventReader(_bus, Guid.NewGuid(), null, null, 0, new RealTimeProvider(), false,
-					produceStreamDeletes: false);
-			});
-		}
-
-		[Test]
-		public void empty_stream_name_throws_argument_exception() {
-			Assert.Throws<ArgumentException>(() => {
-				new StreamEventReader(_bus, Guid.NewGuid(), null, "", 0, new RealTimeProvider(), false,
-					produceStreamDeletes: false);
-			});
-		}
-
-		[Test]
-		public void negative_event_sequence_number_throws_argument_exception() {
-			Assert.Throws<ArgumentException>(() => {
-				new StreamEventReader(_bus, Guid.NewGuid(), null, "", -1, new RealTimeProvider(), false,
-					produceStreamDeletes: false);
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_deleted_streams.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_deleted_streams.cs
deleted file mode 100644
index 2b9b035a393..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_deleted_streams.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_deleted_streams<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private StreamEventReader _edp;
-		private string _streamName;
-		private Guid _distibutionPointCorrelationId;
-		private long _fromSequenceNumber = 10;
-		private FakeTimeProvider _fakeTimeProvider;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-			_streamName = "stream1";
-			_fromSequenceNumber = 10;
-		}
-
-		[SetUp]
-		public new void When() {
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_fakeTimeProvider = new FakeTimeProvider();
-			_edp = new StreamEventReader(_bus, _distibutionPointCorrelationId, null, _streamName, _fromSequenceNumber,
-				_fakeTimeProvider, false, produceStreamDeletes: false);
-			_edp.Resume();
-		}
-
-		private void HandleEvents(string stream, long[] eventNumbers) {
-			string eventType = "event_type";
-			List<ResolvedEvent> events = new List<ResolvedEvent>();
-
-			foreach (long eventNumber in eventNumbers) {
-				events.Add(
-					ResolvedEvent.ForUnresolvedEvent(
-						new EventRecord(
-							eventNumber, 50 * (eventNumber + 1), Guid.NewGuid(), Guid.NewGuid(), 50 * (eventNumber + 1),
-							0, stream, ExpectedVersion.Any, DateTime.UtcNow,
-							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-							eventType, new byte[] {0}, new byte[] {0}
-						)
-					)
-				);
-			}
-
-			long start, end;
-			if (eventNumbers.Length > 0) {
-				start = eventNumbers[0];
-				end = eventNumbers[eventNumbers.Length - 1];
-			} else {
-				start = _fromSequenceNumber;
-				end = _fromSequenceNumber;
-			}
-
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == stream).CorrelationId;
-
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, stream, start, 100, ReadStreamResult.Success, events.ToArray(), null, false, "",
-					start + 1, end, true, 200)
-			);
-		}
-
-		private void HandleEvents(string stream, long start, long end) {
-			List<long> eventNumbers = new List<long>();
-			for (long i = start; i <= end; i++) eventNumbers.Add(i);
-			HandleEvents(stream, eventNumbers.ToArray());
-		}
-
-		private void HandleDeletedStream(string stream, long sequenceNumber, ReadStreamResult result) {
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Last(x => x.EventStreamId == stream).CorrelationId;
-
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, stream, sequenceNumber, 100, result, new ResolvedEvent[] { }, null, false, "", -1,
-					sequenceNumber, true, 200)
-			);
-		}
-
-		[Test]
-		public void when_no_stream_and_sequence_num_equal_to_minus_one_should_not_publish_partition_deleted_message() {
-			HandleDeletedStream(_streamName, -1, ReadStreamResult.NoStream);
-			Assert.AreEqual(0,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().Count());
-		}
-
-		[Test]
-		public void when_no_stream_and_sequence_num_equal_to_zero_should_publish_partition_deleted_message() {
-			HandleDeletedStream(_streamName, 0, ReadStreamResult.NoStream);
-			Assert.AreEqual(1,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().Count());
-			Assert.AreEqual(_streamName,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().First()
-					.Partition);
-		}
-
-		[Test]
-		public void when_no_stream_and_sequence_num_greater_than_zero_should_publish_partition_deleted_message() {
-			HandleDeletedStream(_streamName, 100, ReadStreamResult.NoStream);
-			Assert.AreEqual(1,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().Count());
-			Assert.AreEqual(_streamName,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().First()
-					.Partition);
-		}
-
-		[Test]
-		public void when_stream_deleted_should_publish_partition_deleted_message() {
-			HandleDeletedStream(_streamName, 0, ReadStreamResult.StreamDeleted);
-			Assert.AreEqual(1,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().Count());
-			Assert.AreEqual(_streamName,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().First()
-					.Partition);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_eof_and_idle_eof.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_eof_and_idle_eof.cs
deleted file mode 100644
index c7ad6ba88a6..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_eof_and_idle_eof.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_eof_and_idle_eof<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private StreamEventReader _edp;
-
-		//private Guid _publishWithCorrelationId;
-		private Guid _distibutionPointCorrelationId;
-		private Guid _firstEventId;
-		private Guid _secondEventId;
-		private FakeTimeProvider _fakeTimeProvider;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		[SetUp]
-		public new void When() {
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_fakeTimeProvider = new FakeTimeProvider();
-			_edp = new StreamEventReader(_bus, _distibutionPointCorrelationId, null, "stream", 10, _fakeTimeProvider,
-				false,
-				produceStreamDeletes: false);
-			_edp.Resume();
-			_firstEventId = Guid.NewGuid();
-			_secondEventId = Guid.NewGuid();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
-				.CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "stream", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								10, 50, Guid.NewGuid(), _firstEventId, 50, 0, "stream", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								11, 100, Guid.NewGuid(), _secondEventId, 100, 0, "stream", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 12, 11, true, 200));
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
-				.CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "stream", 100, 100, ReadStreamResult.Success,
-					new ResolvedEvent[] { }, null, false, "", 12, 11, true, 400));
-			_fakeTimeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(500));
-			correlationId = ((ClientMessage.ReadStreamEventsForward)(_consumer.HandledMessages
-				.OfType<AwakeServiceMessage.SubscribeAwake>().Last().ReplyWithMessage)).CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "stream", 100, 100, ReadStreamResult.Success,
-					new ResolvedEvent[] { }, null, false, "", 12, 11, true, 400));
-		}
-
-		[Test]
-		public void publishes_event_distribution_idle_messages() {
-			Assert.AreEqual(
-				2, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderIdle>().Count());
-			var first =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderIdle>().First();
-			var second =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderIdle>()
-					.Skip(1)
-					.First();
-
-			Assert.AreEqual(first.CorrelationId, _distibutionPointCorrelationId);
-			Assert.AreEqual(second.CorrelationId, _distibutionPointCorrelationId);
-
-			Assert.AreEqual(TimeSpan.FromMilliseconds(500), second.IdleTimestampUtc - first.IdleTimestampUtc);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_no_stream.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_no_stream.cs
deleted file mode 100644
index 7e8dab9419a..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_no_stream.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_no_stream<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private StreamEventReader _edp;
-		private Guid _distibutionPointCorrelationId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		[SetUp]
-		public new void When() {
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_edp = new StreamEventReader(_bus, _distibutionPointCorrelationId, null, "stream", 0,
-				new RealTimeProvider(), false,
-				produceStreamDeletes: false);
-			_edp.Resume();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
-				.CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "stream", 100, 100,
-					ReadStreamResult.NoStream, new ResolvedEvent[0], null, false, "", -1, ExpectedVersion.NoStream,
-					true, 200));
-		}
-
-		[Test]
-		public void cannot_be_resumed() {
-			Assert.Throws<InvalidOperationException>(() => { _edp.Resume(); });
-		}
-
-		[Test]
-		public void cannot_be_paused() {
-			_edp.Pause();
-		}
-
-		[Test]
-		public void publishes_read_events_from_beginning_with_correct_next_event_number() {
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
-			Assert.AreEqual(
-				"stream",
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last().EventStreamId);
-			Assert.AreEqual(
-				0, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last().FromEventNumber);
-		}
-
-		[Test]
-		public void publishes_correct_committed_event_received_messages() {
-			Assert.AreEqual(
-				1, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-			var first =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Single();
-			Assert.IsNull(first.Data);
-			Assert.AreEqual(200, first.SafeTransactionFileReaderJoinPosition);
-		}
-
-		[Test]
-		public void publishes_subscribe_awake() {
-			Assert.AreEqual(2, _consumer.HandledMessages.OfType<AwakeServiceMessage.SubscribeAwake>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_read_completed_and_eof.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_read_completed_and_eof.cs
deleted file mode 100644
index e38b7b8e215..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_read_completed_and_eof.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_read_completed_and_eof<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private StreamEventReader _edp;
-		private Guid _distibutionPointCorrelationId;
-		private Guid _firstEventId;
-		private Guid _secondEventId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		[SetUp]
-		public new void When() {
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_edp = new StreamEventReader(_bus, _distibutionPointCorrelationId, null, "stream", 10,
-				new RealTimeProvider(), false,
-				produceStreamDeletes: false);
-			_edp.Resume();
-			_firstEventId = Guid.NewGuid();
-			_secondEventId = Guid.NewGuid();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
-				.CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "stream", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								10, 50, Guid.NewGuid(), _firstEventId, 50, 0, "stream", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								11, 100, Guid.NewGuid(), _secondEventId, 100, 0, "stream", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 12, 11, true, 200));
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
-				.CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "stream", 100, 100, ReadStreamResult.Success, new ResolvedEvent[0]
-					, null, false, "", 12, 11, true, 400));
-		}
-
-		[Test]
-		public void cannot_be_resumed() {
-			Assert.Throws<InvalidOperationException>(() => { _edp.Resume(); });
-		}
-
-		[Test]
-		public void cannot_be_paused() {
-			_edp.Pause();
-		}
-
-		[Test]
-		public void publishes_correct_committed_event_received_messages() {
-			Assert.AreEqual(
-				3, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-			var first =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().First();
-			var second =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
-					.Skip(1)
-					.First();
-			var third =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
-					.Skip(2)
-					.First();
-			Assert.IsNull(third.Data);
-			Assert.AreEqual(400, third.SafeTransactionFileReaderJoinPosition);
-
-			Assert.AreEqual("event_type1", first.Data.EventType);
-			Assert.AreEqual("event_type2", second.Data.EventType);
-			Assert.AreEqual(_firstEventId, first.Data.EventId);
-			Assert.AreEqual(_secondEventId, second.Data.EventId);
-			Assert.AreEqual(1, first.Data.Data[0]);
-			Assert.AreEqual(2, first.Data.Metadata[0]);
-			Assert.AreEqual(3, second.Data.Data[0]);
-			Assert.AreEqual(4, second.Data.Metadata[0]);
-			Assert.AreEqual("stream", first.Data.EventStreamId);
-			Assert.AreEqual("stream", second.Data.EventStreamId);
-			Assert.AreEqual(50, first.Data.Position.PreparePosition);
-			Assert.AreEqual(100, second.Data.Position.PreparePosition);
-			Assert.AreEqual(-1, first.Data.Position.CommitPosition);
-			Assert.AreEqual(-1, second.Data.Position.CommitPosition);
-			Assert.AreEqual(50, first.Data.EventOrLinkTargetPosition.PreparePosition);
-			Assert.AreEqual(100, second.Data.EventOrLinkTargetPosition.PreparePosition);
-			Assert.AreEqual(-1, first.Data.EventOrLinkTargetPosition.CommitPosition);
-			Assert.AreEqual(-1, second.Data.EventOrLinkTargetPosition.CommitPosition);
-			Assert.AreEqual(50, first.SafeTransactionFileReaderJoinPosition);
-			Assert.AreEqual(100, second.SafeTransactionFileReaderJoinPosition);
-		}
-
-		[Test]
-		public void publishes_subscribe_awake() {
-			Assert.AreEqual(2, _consumer.HandledMessages.OfType<AwakeServiceMessage.SubscribeAwake>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_read_completed_stream_event_reader.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_read_completed_stream_event_reader.cs
deleted file mode 100644
index e0f4ad5f43b..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_read_completed_stream_event_reader.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_read_completed_stream_event_reader<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private StreamEventReader _edp;
-		private Guid _distibutionPointCorrelationId;
-		private Guid _firstEventId;
-		private Guid _secondEventId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		[SetUp]
-		public new void When() {
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_edp = new StreamEventReader(_bus, _distibutionPointCorrelationId, null, "stream", 10,
-				new RealTimeProvider(), false,
-				produceStreamDeletes: false);
-			_edp.Resume();
-			_firstEventId = Guid.NewGuid();
-			_secondEventId = Guid.NewGuid();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
-				.CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "stream", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								10, 50, Guid.NewGuid(), _firstEventId, 50, 0, "stream", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								11, 100, Guid.NewGuid(), _secondEventId, 100, 0, "stream", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
-								PrepareFlags.IsJson,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 12, 11, true, 200));
-		}
-
-		[Test]
-		public void cannot_be_resumed() {
-			Assert.Throws<InvalidOperationException>(() => { _edp.Resume(); });
-		}
-
-		[Test]
-		public void cannot_be_paused() {
-			_edp.Pause();
-		}
-
-		[Test]
-		public void publishes_correct_committed_event_received_messages() {
-			Assert.AreEqual(
-				2, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-			var first =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().First();
-			var second =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
-					.Skip(1)
-					.First();
-
-			Assert.AreEqual("event_type1", first.Data.EventType);
-			Assert.AreEqual("event_type2", second.Data.EventType);
-			Assert.AreEqual(_firstEventId, first.Data.EventId);
-			Assert.AreEqual(_secondEventId, second.Data.EventId);
-			Assert.AreEqual(1, first.Data.Data[0]);
-			Assert.AreEqual(2, first.Data.Metadata[0]);
-			Assert.AreEqual(3, second.Data.Data[0]);
-			Assert.AreEqual(4, second.Data.Metadata[0]);
-			Assert.AreEqual("stream", first.Data.EventStreamId);
-			Assert.AreEqual("stream", second.Data.EventStreamId);
-			Assert.AreEqual(50, first.Data.Position.PreparePosition);
-			Assert.AreEqual(100, second.Data.Position.PreparePosition);
-			Assert.AreEqual(-1, first.Data.Position.CommitPosition);
-			Assert.AreEqual(-1, second.Data.Position.CommitPosition);
-			Assert.AreEqual(50, first.Data.EventOrLinkTargetPosition.PreparePosition);
-			Assert.AreEqual(100, second.Data.EventOrLinkTargetPosition.PreparePosition);
-			Assert.AreEqual(-1, first.Data.EventOrLinkTargetPosition.CommitPosition);
-			Assert.AreEqual(-1, second.Data.EventOrLinkTargetPosition.CommitPosition);
-			Assert.AreEqual(50, first.SafeTransactionFileReaderJoinPosition);
-			Assert.AreEqual(100, second.SafeTransactionFileReaderJoinPosition);
-			Assert.IsFalse(first.Data.IsJson);
-			Assert.IsTrue(second.Data.IsJson);
-		}
-
-		[Test]
-		public void publishes_read_events_from_beginning_with_correct_next_event_number() {
-			Assert.AreEqual(2, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
-			Assert.AreEqual(
-				"stream",
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last().EventStreamId);
-			Assert.AreEqual(
-				12, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last().FromEventNumber);
-		}
-
-		[Test]
-		public void cannot_handle_repeated_read_events_completed() {
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
-				.CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "stream", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								10, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "stream", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type", new byte[0], new byte[0]))
-					}, null, false, "", 11, 10, true, 100));
-			Assert.AreEqual(1, HandledMessages.OfType<ReaderSubscriptionMessage.Faulted>().Count());
-		}
-
-		[Test]
-		public void can_handle_following_read_events_completed() {
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
-				.CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "stream", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								12, 250, Guid.NewGuid(), Guid.NewGuid(), 250, 0, "stream", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type", new byte[0], new byte[0]))
-					}, null, false, "", 13, 11, true, 300));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_read_completed_then_pause_then_eof.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_read_completed_then_pause_then_eof.cs
deleted file mode 100644
index 234d5049808..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_read_completed_then_pause_then_eof.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_read_completed_then_pause_then_eof<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private StreamEventReader _edp;
-		private Guid _distibutionPointCorrelationId;
-		private Guid _firstEventId;
-		private Guid _secondEventId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		[SetUp]
-		public new void When() {
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_edp = new StreamEventReader(_bus, _distibutionPointCorrelationId, null, "stream", 10,
-				new RealTimeProvider(), false,
-				produceStreamDeletes: false);
-			_edp.Resume();
-			_firstEventId = Guid.NewGuid();
-			_secondEventId = Guid.NewGuid();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
-				.CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "stream", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								10, 50, Guid.NewGuid(), _firstEventId, 50, 0, "stream", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								11, 100, Guid.NewGuid(), _secondEventId, 100, 0, "stream", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 12, 11, true, 200));
-			_edp.Pause();
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
-				.CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "stream", 100, 100, ReadStreamResult.Success, new ResolvedEvent[0]
-					, null, false, "", 12, 11, true, 400));
-		}
-
-		[Test]
-		public void can_be_resumed() {
-			_edp.Resume();
-		}
-
-		[Test]
-		public void cannot_be_paused() {
-			Assert.Throws<InvalidOperationException>(() => { _edp.Pause(); });
-		}
-
-		[Test]
-		public void publishes_correct_committed_event_received_messages() {
-			Assert.AreEqual(
-				3, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-			var first =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().First();
-			var second =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
-					.Skip(1)
-					.First();
-			var third =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
-					.Skip(2)
-					.First();
-			Assert.IsNull(third.Data);
-			Assert.AreEqual(400, third.SafeTransactionFileReaderJoinPosition);
-
-			Assert.AreEqual("event_type1", first.Data.EventType);
-			Assert.AreEqual("event_type2", second.Data.EventType);
-			Assert.AreEqual(_firstEventId, first.Data.EventId);
-			Assert.AreEqual(_secondEventId, second.Data.EventId);
-			Assert.AreEqual(1, first.Data.Data[0]);
-			Assert.AreEqual(2, first.Data.Metadata[0]);
-			Assert.AreEqual(3, second.Data.Data[0]);
-			Assert.AreEqual(4, second.Data.Metadata[0]);
-			Assert.AreEqual("stream", first.Data.EventStreamId);
-			Assert.AreEqual("stream", second.Data.EventStreamId);
-			Assert.AreEqual(50, first.Data.Position.PreparePosition);
-			Assert.AreEqual(100, second.Data.Position.PreparePosition);
-			Assert.AreEqual(-1, first.Data.Position.CommitPosition);
-			Assert.AreEqual(-1, second.Data.Position.CommitPosition);
-			Assert.AreEqual(50, first.Data.EventOrLinkTargetPosition.PreparePosition);
-			Assert.AreEqual(100, second.Data.EventOrLinkTargetPosition.PreparePosition);
-			Assert.AreEqual(-1, first.Data.EventOrLinkTargetPosition.CommitPosition);
-			Assert.AreEqual(-1, second.Data.EventOrLinkTargetPosition.CommitPosition);
-			Assert.AreEqual(50, first.SafeTransactionFileReaderJoinPosition);
-			Assert.AreEqual(100, second.SafeTransactionFileReaderJoinPosition);
-		}
-
-		[Test]
-		public void does_not_publish_schedule() {
-			Assert.AreEqual(0,
-				_consumer.HandledMessages.OfType<TimerMessage.Schedule>().Where(x =>
-					x.ReplyMessage.GetType() != typeof(ProjectionManagementMessage.Internal.ReadTimeout)).Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_soft_deleted_stream_with_a_single_event_event_reader.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_soft_deleted_stream_with_a_single_event_event_reader.cs
deleted file mode 100644
index 94e2ffc09bb..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_soft_deleted_stream_with_a_single_event_event_reader.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-using System.Linq;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_soft_deleted_stream_with_a_single_event_event_reader<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private StreamEventReader _streamEventReader;
-		private Guid _distibutionPointCorrelationId;
-		private Guid _firstEventId;
-		private Guid _secondEventId;
-		private string _streamId = Guid.NewGuid().ToString();
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_streamEventReader = new StreamEventReader(_bus, _distibutionPointCorrelationId, null, _streamId, 0,
-				new RealTimeProvider(), false,
-				produceStreamDeletes: false);
-			_streamEventReader.Resume();
-			_firstEventId = Guid.NewGuid();
-			_secondEventId = Guid.NewGuid();
-		}
-
-		[SetUp]
-		public new void When() {
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
-				.CorrelationId;
-			_streamEventReader.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, _streamId, 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								10, 50, Guid.NewGuid(), _firstEventId, 50, 0, _streamId, ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								11, 100, Guid.NewGuid(), _secondEventId, 100, 0, _streamId, ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
-								PrepareFlags.IsJson,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 12, 11, true, 200));
-		}
-
-		[Test]
-		public void should_handle_the_2_events() {
-			Assert.AreEqual(2,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-
-			var first = _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().First();
-			Assert.AreEqual(first.Data.EventId, _firstEventId,
-				String.Format("Expected the first event to be {0}, but got {1}", _firstEventId, first.Data.EventId));
-			var second = _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Skip(1)
-				.First();
-			Assert.AreEqual(second.Data.EventId, _secondEventId,
-				String.Format("Expected the second event to be {0}, but got {1}", _secondEventId, second.Data.EventId));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_after_event_zero.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_after_event_zero.cs
deleted file mode 100644
index c9ddbcb622f..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_after_event_zero.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_handling_streams_with_deleted_events_and_reader_starting_after_event_zero<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private StreamEventReader _edp;
-		private int _fromSequenceNumber;
-		const string _streamName = "stream";
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-			_fromSequenceNumber = 10;
-		}
-
-		[SetUp]
-		public new void When() {
-			_edp = new StreamEventReader(_bus, Guid.NewGuid(), null, _streamName, _fromSequenceNumber,
-				new RealTimeProvider(), false,
-				produceStreamDeletes: false);
-			_edp.Resume();
-		}
-
-		private void HandleEvents(long[] eventNumbers) {
-			string eventType = "event_type";
-			List<ResolvedEvent> events = new List<ResolvedEvent>();
-
-			foreach (long eventNumber in eventNumbers) {
-				events.Add(
-					ResolvedEvent.ForUnresolvedEvent(
-						new EventRecord(
-							eventNumber, 50 * (eventNumber + 1), Guid.NewGuid(), Guid.NewGuid(), 50 * (eventNumber + 1),
-							0, _streamName, ExpectedVersion.Any, DateTime.UtcNow,
-							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-							eventType, new byte[] {0}, new byte[] {0}
-						)
-					)
-				);
-			}
-
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
-				.CorrelationId;
-
-			long start, end;
-			if (eventNumbers.Length > 0) {
-				start = eventNumbers[0];
-				end = eventNumbers[eventNumbers.Length - 1];
-			} else {
-				start = _fromSequenceNumber;
-				end = _fromSequenceNumber;
-			}
-
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, _streamName, start, 100, ReadStreamResult.Success, events.ToArray(), null, false, "",
-					start + 1, end, true, 200)
-			);
-		}
-
-		private void HandleEvents(long start, long end) {
-			List<long> eventNumbers = new List<long>();
-			for (long i = start; i <= end; i++) eventNumbers.Add(i);
-			HandleEvents(eventNumbers.ToArray());
-		}
-
-		[Test]
-		public void allows_first_event_to_be_equal_to_sequence_number() {
-			long eventSequenceNumber = _fromSequenceNumber;
-
-			Assert.DoesNotThrow(() => { HandleEvents(eventSequenceNumber, eventSequenceNumber); });
-		}
-
-		[Test]
-		public void should_not_allow_first_event_to_be_greater_than_sequence_number() {
-			long eventSequenceNumber = _fromSequenceNumber + 5;
-
-			HandleEvents(eventSequenceNumber, eventSequenceNumber);
-
-			Assert.AreEqual(1, HandledMessages.OfType<ReaderSubscriptionMessage.Faulted>().Count());
-		}
-
-		[Test]
-		public void should_not_allow_first_event_to_be_less_than_sequence_number() {
-			long eventSequenceNumber = _fromSequenceNumber - 1;
-
-			HandleEvents(eventSequenceNumber, eventSequenceNumber);
-
-			Assert.AreEqual(1, HandledMessages.OfType<ReaderSubscriptionMessage.Faulted>().Count());
-		}
-
-		[Test]
-		public void events_after_second_event_should_not_be_in_sequence() {
-			//_fromSequenceNumber+2 has been omitted
-			HandleEvents(new long[]
-				{_fromSequenceNumber, _fromSequenceNumber + 1, _fromSequenceNumber + 3, _fromSequenceNumber + 4});
-
-			Assert.AreEqual(2, HandledMessages.OfType<ReaderSubscriptionMessage.Faulted>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_at_event_zero.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_at_event_zero.cs
deleted file mode 100644
index 1e82fcd1983..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_at_event_zero.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_handling_streams_with_deleted_events_and_reader_starting_at_event_zero<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private StreamEventReader _edp;
-		private int _fromSequenceNumber;
-		const string _streamName = "stream";
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-			_fromSequenceNumber = 0;
-		}
-
-		[SetUp]
-		public new void When() {
-			_edp = new StreamEventReader(_bus, Guid.NewGuid(), null, _streamName, _fromSequenceNumber,
-				new RealTimeProvider(), false,
-				produceStreamDeletes: false);
-			_edp.Resume();
-		}
-
-		private void HandleEvents(long[] eventNumbers) {
-			string eventType = "event_type";
-			List<ResolvedEvent> events = new List<ResolvedEvent>();
-
-			foreach (long eventNumber in eventNumbers) {
-				events.Add(
-					ResolvedEvent.ForUnresolvedEvent(
-						new EventRecord(
-							eventNumber, 50 * (eventNumber + 1), Guid.NewGuid(), Guid.NewGuid(), 50 * (eventNumber + 1),
-							0, _streamName, ExpectedVersion.Any, DateTime.UtcNow,
-							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-							eventType, new byte[] {0}, new byte[] {0}
-						)
-					)
-				);
-			}
-
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
-				.CorrelationId;
-
-			long start, end;
-			if (eventNumbers.Length > 0) {
-				start = eventNumbers[0];
-				end = eventNumbers[eventNumbers.Length - 1];
-			} else {
-				start = _fromSequenceNumber;
-				end = _fromSequenceNumber;
-			}
-
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, _streamName, start, 100, ReadStreamResult.Success, events.ToArray(), null, false, "",
-					start + 1, end, true, 200)
-			);
-		}
-
-		private void HandleEvents(long start, long end) {
-			List<long> eventNumbers = new List<long>();
-			for (long i = start; i <= end; i++) eventNumbers.Add(i);
-			HandleEvents(eventNumbers.ToArray());
-		}
-
-		[Test]
-		public void allows_first_event_to_be_equal_to_sequence_number() {
-			long eventSequenceNumber = _fromSequenceNumber;
-
-			Assert.DoesNotThrow(() => { HandleEvents(eventSequenceNumber, eventSequenceNumber); });
-		}
-
-		[Test]
-		public void allows_first_event_to_be_greater_than_sequence_number() {
-			long eventSequenceNumber = _fromSequenceNumber + 5;
-
-			Assert.DoesNotThrow(() => { HandleEvents(eventSequenceNumber, eventSequenceNumber); });
-		}
-
-		[Test]
-		public void events_after_second_event_should_not_be_in_sequence() {
-			//_fromSequenceNumber+2 has been omitted
-			HandleEvents(new long[]
-				{_fromSequenceNumber, _fromSequenceNumber + 1, _fromSequenceNumber + 3, _fromSequenceNumber + 4});
-
-			Assert.AreEqual(2, HandledMessages.OfType<ReaderSubscriptionMessage.Faulted>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_onetime_reader_handles_eof.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_onetime_reader_handles_eof.cs
deleted file mode 100644
index 2ffeaaa1fe2..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_onetime_reader_handles_eof.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_onetime_reader_handles_eof<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private StreamEventReader _edp;
-
-		//private Guid _publishWithCorrelationId;
-		private Guid _distibutionPointCorrelationId;
-		private Guid _firstEventId;
-		private Guid _secondEventId;
-		private FakeTimeProvider _fakeTimeProvider;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		[SetUp]
-		public new void When() {
-			//_publishWithCorrelationId = Guid.NewGuid();
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_fakeTimeProvider = new FakeTimeProvider();
-			_edp = new StreamEventReader(_bus, _distibutionPointCorrelationId, null, "stream", 10, _fakeTimeProvider,
-				resolveLinkTos: false, stopOnEof: true, produceStreamDeletes: false);
-			_edp.Resume();
-			_firstEventId = Guid.NewGuid();
-			_secondEventId = Guid.NewGuid();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
-				.CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "stream", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								10, 50, Guid.NewGuid(), _firstEventId, 50, 0, "stream", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								11, 100, Guid.NewGuid(), _secondEventId, 100, 0, "stream", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 12, 11, true, 200));
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
-				.CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "stream", 100, 100, ReadStreamResult.Success, new ResolvedEvent[] { }, null, false,
-					"", 12, 11, true, 400));
-		}
-
-		[Test]
-		public void publishes_eof_message() {
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderEof>().Count());
-			var first = _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderEof>().First();
-			Assert.AreEqual(first.CorrelationId, _distibutionPointCorrelationId);
-		}
-
-		[Test]
-		public void does_not_publish_read_messages_anymore() {
-			Assert.AreEqual(2, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_paused_then_handling_no_stream.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_paused_then_handling_no_stream.cs
deleted file mode 100644
index 4cacb6e417a..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_paused_then_handling_no_stream.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_paused_then_handling_no_stream<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private StreamEventReader _edp;
-		private Guid _distibutionPointCorrelationId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		[SetUp]
-		public new void When() {
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_edp = new StreamEventReader(_bus, _distibutionPointCorrelationId, null, "stream", 0,
-				new RealTimeProvider(), false,
-				produceStreamDeletes: false);
-			_edp.Resume();
-			_edp.Pause();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
-				.CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "stream", 100, 100, ReadStreamResult.NoStream, new ResolvedEvent[0]
-					, null, false, "", -1, ExpectedVersion.NoStream, true, 200));
-		}
-
-		[Test]
-		public void can_be_resumed() {
-			_edp.Resume();
-		}
-
-		[Test]
-		public void cannot_be_paused() {
-			Assert.Throws<InvalidOperationException>(() => { _edp.Pause(); });
-		}
-
-		[Test]
-		public void publishes_read_events_from_beginning_with_correct_next_event_number() {
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
-			Assert.AreEqual(
-				"stream",
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last().EventStreamId);
-			Assert.AreEqual(
-				0, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last().FromEventNumber);
-		}
-
-		[Test]
-		public void publishes_correct_committed_event_received_messages() {
-			Assert.AreEqual(
-				1, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-			var first =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Single();
-			Assert.IsNull(first.Data);
-			Assert.AreEqual(200, first.SafeTransactionFileReaderJoinPosition);
-		}
-
-		[Test]
-		public void does_not_publish_schedule() {
-			Assert.AreEqual(0,
-				_consumer.HandledMessages.OfType<TimerMessage.Schedule>().Where(x =>
-					x.ReplyMessage.GetType() != typeof(ProjectionManagementMessage.Internal.ReadTimeout)).Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_read_completes_before_timeout.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_read_completes_before_timeout.cs
deleted file mode 100644
index a8c59642bc1..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_read_completes_before_timeout.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_read_completes_before_timeout<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private StreamEventReader _eventReader;
-		private Guid _distributionCorrelationId;
-		private FakeTimeProvider _fakeTimeProvider;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		[SetUp]
-		public new void When() {
-			_distributionCorrelationId = Guid.NewGuid();
-			_fakeTimeProvider = new FakeTimeProvider();
-			_eventReader = new StreamEventReader(_bus, _distributionCorrelationId, null, "stream", 10,
-				_fakeTimeProvider,
-				resolveLinkTos: false, stopOnEof: true, produceStreamDeletes: false);
-			_eventReader.Resume();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
-				.CorrelationId;
-			_eventReader.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					correlationId, "stream", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								10, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "stream", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								11, 100, Guid.NewGuid(), Guid.NewGuid(), 100, 0, "stream", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 12, 11, true, 200));
-			_eventReader.Handle(
-				new ProjectionManagementMessage.Internal.ReadTimeout(correlationId, "stream"));
-		}
-
-		[Test]
-		public void should_deliver_events() {
-			Assert.AreEqual(2,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_read_timeout_occurs.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_read_timeout_occurs.cs
deleted file mode 100644
index 54f2bfd0f8b..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_read_timeout_occurs.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_read_timeout_occurs<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private StreamEventReader _eventReader;
-		private Guid _distributionCorrelationId;
-		private FakeTimeProvider _fakeTimeProvider;
-		private Guid _readCorrelationId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		[SetUp]
-		public new void When() {
-			_distributionCorrelationId = Guid.NewGuid();
-			_fakeTimeProvider = new FakeTimeProvider();
-			_eventReader = new StreamEventReader(_bus, _distributionCorrelationId, null, "stream", 10,
-				_fakeTimeProvider,
-				resolveLinkTos: false, stopOnEof: true, produceStreamDeletes: false);
-			_eventReader.Resume();
-			_readCorrelationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
-				.CorrelationId;
-			_eventReader.Handle(
-				new ProjectionManagementMessage.Internal.ReadTimeout(_readCorrelationId, "stream"));
-			_eventReader.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					_readCorrelationId, "stream", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								10, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "stream", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2})),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								11, 100, Guid.NewGuid(), Guid.NewGuid(), 100, 0, "stream", ExpectedVersion.Any,
-								DateTime.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type2", new byte[] {3}, new byte[] {4}))
-					}, null, false, "", 12, 11, true, 200));
-		}
-
-		[Test]
-		public void should_not_deliver_events() {
-			Assert.AreEqual(0,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-		}
-
-		[Test]
-		public void should_attempt_another_read_for_the_timed_out_reads() {
-			var reads = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
-				.Where(x => x.EventStreamId == "stream");
-
-			Assert.AreEqual(reads.First().CorrelationId, _readCorrelationId);
-			Assert.AreEqual(1, reads.Skip(1).Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_resuming_stream_event_reader.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_resuming_stream_event_reader.cs
deleted file mode 100644
index 1c8888a64ed..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_resuming_stream_event_reader.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_resuming_stream_event_reader<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private StreamEventReader _edp;
-		private Guid _distibutionPointCorrelationId;
-
-		[SetUp]
-		public new void When() {
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_edp = new StreamEventReader(_bus, _distibutionPointCorrelationId, null, "stream", 10,
-				new RealTimeProvider(), false,
-				produceStreamDeletes: false);
-			_edp.Resume();
-		}
-
-		[Test]
-		public void it_cannot_be_resumed() {
-			Assert.Throws<InvalidOperationException>(() => { _edp.Resume(); });
-		}
-
-		[Test]
-		public void it_cannot_be_paused() {
-			_edp.Pause();
-		}
-
-		[Test]
-		public void it_publishes_read_events_from_beginning() {
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
-			Assert.AreEqual(
-				"stream",
-				_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Single().EventStreamId);
-			Assert.AreEqual(
-				10, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Single().FromEventNumber);
-		}
-
-		[Test]
-		public void can_handle_read_events_completed() {
-			_edp.Handle(
-				new ClientMessage.ReadStreamEventsForwardCompleted(
-					_distibutionPointCorrelationId, "stream", 100, 100, ReadStreamResult.Success,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(new EventRecord(
-							10, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "stream", ExpectedVersion.Any,
-							DateTime.UtcNow,
-							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-							"event_type", new byte[0], new byte[0]), 0)
-					}, null, false, "", 11, 10, true, 100));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_stream_event_reader_has_been_created.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_stream_event_reader_has_been_created.cs
deleted file mode 100644
index 6b27f9c618a..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/stream_reader/when_stream_event_reader_has_been_created.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.stream_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_stream_event_reader_has_been_created<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private StreamEventReader _edp;
-
-		//private Guid _publishWithCorrelationId;
-		private Guid _distibutionPointCorrelationId;
-
-		[SetUp]
-		public new void When() {
-			//_publishWithCorrelationId = Guid.NewGuid();
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_edp = new StreamEventReader(_bus, _distibutionPointCorrelationId, null, "stream", 0,
-				new RealTimeProvider(), false,
-				produceStreamDeletes: false);
-		}
-
-		[Test]
-		public void it_can_be_resumed() {
-			_edp.Resume();
-		}
-
-		[Test]
-		public void it_cannot_be_paused() {
-			Assert.Throws<InvalidOperationException>(() => { _edp.Pause(); });
-		}
-
-		[Test]
-		public void handle_read_events_completed_throws() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_edp.Handle(
-					new ClientMessage.ReadStreamEventsForwardCompleted(
-						_distibutionPointCorrelationId, "stream", 100, 100, ReadStreamResult.Success,
-						new ResolvedEvent[0], null, false, "", -1, 4, true, 100));
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_handling_eof_and_idle_eof.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_handling_eof_and_idle_eof.cs
deleted file mode 100644
index 61b9c90eb7a..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_handling_eof_and_idle_eof.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.transaction_file_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_eof_and_idle_eof<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private TransactionFileEventReader _edp;
-		private Guid _distibutionPointCorrelationId;
-		private Guid _firstEventId;
-		private Guid _secondEventId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		private FakeTimeProvider _fakeTimeProvider;
-
-		[SetUp]
-		public new void When() {
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_fakeTimeProvider = new FakeTimeProvider();
-			_edp = new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(100, 50),
-				_fakeTimeProvider,
-				deliverEndOfTFPosition: false);
-			_edp.Resume();
-			_firstEventId = Guid.NewGuid();
-			_secondEventId = Guid.NewGuid();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>().Last()
-				.CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadAllEventsForwardCompleted(
-					correlationId, ReadAllResult.Success, null,
-					new[] {
-						EventStore.Core.Data.ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any,
-								_fakeTimeProvider.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2}), 100),
-						EventStore.Core.Data.ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 150, Guid.NewGuid(), _secondEventId, 150, 0, "b", ExpectedVersion.Any,
-								_fakeTimeProvider.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2}), 200),
-					}, null, false, 100,
-					new TFPos(200, 150), new TFPos(500, -1), new TFPos(100, 50), 500));
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>().Last().CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadAllEventsForwardCompleted(
-					correlationId, ReadAllResult.Success, null,
-					new EventStore.Core.Data.ResolvedEvent[0], null, false, 100, new TFPos(), new TFPos(), new TFPos(),
-					500));
-			_fakeTimeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(500));
-			correlationId = ((ClientMessage.ReadAllEventsForward)(_consumer.HandledMessages
-				.OfType<AwakeServiceMessage.SubscribeAwake>().Last().ReplyWithMessage)).CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadAllEventsForwardCompleted(
-					correlationId, ReadAllResult.Success, null,
-					new EventStore.Core.Data.ResolvedEvent[0], null, false, 100, new TFPos(), new TFPos(), new TFPos(),
-					500));
-		}
-
-		[Test]
-		public void publishes_event_distribution_idle_messages() {
-			Assert.AreEqual(
-				2, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderIdle>().Count());
-			var first =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderIdle>().First();
-			var second =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderIdle>()
-					.Skip(1)
-					.First();
-
-			Assert.AreEqual(first.CorrelationId, _distibutionPointCorrelationId);
-			Assert.AreEqual(second.CorrelationId, _distibutionPointCorrelationId);
-
-			Assert.AreEqual(TimeSpan.FromMilliseconds(500), second.IdleTimestampUtc - first.IdleTimestampUtc);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_handling_stream_hard_deleted.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_handling_stream_hard_deleted.cs
deleted file mode 100644
index ef6508aa10d..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_handling_stream_hard_deleted.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.transaction_file_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_stream_hard_deleted<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private TransactionFileEventReader _edp;
-		private Guid _distibutionPointCorrelationId;
-		private Guid _firstEventId;
-		private Guid _secondEventId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		private FakeTimeProvider _fakeTimeProvider;
-
-		[SetUp]
-		public new void When() {
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_fakeTimeProvider = new FakeTimeProvider();
-			_edp = new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(100, 50),
-				_fakeTimeProvider,
-				deliverEndOfTFPosition: false);
-			_edp.Resume();
-			_firstEventId = Guid.NewGuid();
-			_secondEventId = Guid.NewGuid();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>().Last()
-				.CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadAllEventsForwardCompleted(
-					correlationId, ReadAllResult.Success, null,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any,
-								_fakeTimeProvider.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2}), 100),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 150, Guid.NewGuid(), _secondEventId, 150, 0, "a", ExpectedVersion.Any,
-								_fakeTimeProvider.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								SystemEventTypes.StreamDeleted, new byte[] {1}, new byte[] {2}), 200),
-					}, null, false, 100,
-					new TFPos(200, 150), new TFPos(500, -1), new TFPos(100, 50), 500));
-		}
-
-		[Test]
-		public void publishes_event_reader_partition_deleted_messages() {
-			var deleteds =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().ToArray();
-			Assert.AreEqual(1, deleteds.Count());
-			Assert.AreEqual("a", deleteds[0].Partition);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_handling_stream_soft_deleted.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_handling_stream_soft_deleted.cs
deleted file mode 100644
index 58ff88cbb76..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_handling_stream_soft_deleted.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.transaction_file_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_handling_stream_soft_deleted<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private TransactionFileEventReader _edp;
-		private Guid _distibutionPointCorrelationId;
-		private Guid _firstEventId;
-		private Guid _secondEventId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		private FakeTimeProvider _fakeTimeProvider;
-
-		[SetUp]
-		public new void When() {
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_fakeTimeProvider = new FakeTimeProvider();
-			_edp = new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(100, 50),
-				_fakeTimeProvider,
-				deliverEndOfTFPosition: false);
-			_edp.Resume();
-			_firstEventId = Guid.NewGuid();
-			_secondEventId = Guid.NewGuid();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>().Last()
-				.CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadAllEventsForwardCompleted(
-					correlationId, ReadAllResult.Success, null,
-					new[] {
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any,
-								_fakeTimeProvider.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2}), 100),
-						ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 150, Guid.NewGuid(), _secondEventId, 150, 0, "$$a", ExpectedVersion.Any,
-								_fakeTimeProvider.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								SystemEventTypes.StreamMetadata,
-								new StreamMetadata(truncateBefore: EventNumber.DeletedStream).ToJsonBytes(),
-								new byte[] {2}), 200),
-					}, null, false, 100, new TFPos(200, 150), new TFPos(500, -1),
-					new TFPos(100, 50), 500));
-		}
-
-		[Test]
-		public void publishes_event_reader_partition_deleted_messages() {
-			var deleteds =
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().ToArray();
-			Assert.AreEqual(1, deleteds.Count());
-			Assert.AreEqual("a", deleteds[0].Partition);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_onetime_reader_handles_eof.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_onetime_reader_handles_eof.cs
deleted file mode 100644
index 7993d6caeb1..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_onetime_reader_handles_eof.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.transaction_file_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_onetime_reader_handles_eof<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private TransactionFileEventReader _edp;
-		private Guid _distibutionPointCorrelationId;
-		private Guid _firstEventId;
-		private Guid _secondEventId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		private FakeTimeProvider _fakeTimeProvider;
-
-		[SetUp]
-		public new void When() {
-			_distibutionPointCorrelationId = Guid.NewGuid();
-			_fakeTimeProvider = new FakeTimeProvider();
-			_edp = new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(100, 50),
-				_fakeTimeProvider,
-				deliverEndOfTFPosition: false, stopOnEof: true);
-			_edp.Resume();
-			_firstEventId = Guid.NewGuid();
-			_secondEventId = Guid.NewGuid();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>().Last()
-				.CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadAllEventsForwardCompleted(
-					correlationId, ReadAllResult.Success, null,
-					new[] {
-						EventStore.Core.Data.ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any,
-								_fakeTimeProvider.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2}), 100),
-						EventStore.Core.Data.ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 150, Guid.NewGuid(), _secondEventId, 150, 0, "b", ExpectedVersion.Any,
-								_fakeTimeProvider.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2}), 200),
-					}, null, false, 100, new TFPos(200, 150), new TFPos(500, -1), new TFPos(100, 50), 500));
-			correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>().Last().CorrelationId;
-			_edp.Handle(
-				new ClientMessage.ReadAllEventsForwardCompleted(
-					correlationId, ReadAllResult.Success, null,
-					new EventStore.Core.Data.ResolvedEvent[0], null, false, 100, new TFPos(), new TFPos(), new TFPos(),
-					500));
-		}
-
-		[Test]
-		public void publishes_eof_message() {
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderEof>().Count());
-			var first = _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderEof>().First();
-			Assert.AreEqual(first.CorrelationId, _distibutionPointCorrelationId);
-		}
-
-		[Test]
-		public void does_not_publish_read_messages_anymore() {
-			Assert.AreEqual(2, _consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_read_completes_before_timeout.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_read_completes_before_timeout.cs
deleted file mode 100644
index 824c5bea938..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_read_completes_before_timeout.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.transaction_file_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_read_completes_before_timeout<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private TransactionFileEventReader _eventReader;
-		private Guid _distributionCorrelationId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		private FakeTimeProvider _fakeTimeProvider;
-
-		[SetUp]
-		public new void When() {
-			_distributionCorrelationId = Guid.NewGuid();
-			_fakeTimeProvider = new FakeTimeProvider();
-			_eventReader = new TransactionFileEventReader(_bus, _distributionCorrelationId, null, new TFPos(100, 50),
-				_fakeTimeProvider,
-				deliverEndOfTFPosition: false, stopOnEof: true);
-			_eventReader.Resume();
-			var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>().Last()
-				.CorrelationId;
-			_eventReader.Handle(
-				new ClientMessage.ReadAllEventsForwardCompleted(
-					correlationId, ReadAllResult.Success, null,
-					new[] {
-						EventStore.Core.Data.ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								1, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "a", ExpectedVersion.Any,
-								_fakeTimeProvider.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2}), 100),
-						EventStore.Core.Data.ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 150, Guid.NewGuid(), Guid.NewGuid(), 150, 0, "b", ExpectedVersion.Any,
-								_fakeTimeProvider.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2}), 200),
-					}, null, false, 100, new TFPos(200, 150), new TFPos(500, -1), new TFPos(100, 50), 500));
-			_eventReader.Handle(
-				new ProjectionManagementMessage.Internal.ReadTimeout(correlationId, "$all"));
-		}
-
-		[Test]
-		public void should_deliver_events() {
-			Assert.AreEqual(2,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_read_timeout_occurs.cs b/src/EventStore.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_read_timeout_occurs.cs
deleted file mode 100644
index c82fa11d3b9..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_read_timeout_occurs.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reader.transaction_file_reader {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_read_timeout_occurs<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private TransactionFileEventReader _eventReader;
-		private Guid _distributionCorrelationId;
-		private Guid _readAllEventsForwardCorrelationId;
-
-		protected override void Given() {
-			TicksAreHandledImmediately();
-		}
-
-		private FakeTimeProvider _fakeTimeProvider;
-
-		[SetUp]
-		public new void When() {
-			_distributionCorrelationId = Guid.NewGuid();
-			_fakeTimeProvider = new FakeTimeProvider();
-			_eventReader = new TransactionFileEventReader(_bus, _distributionCorrelationId, null, new TFPos(100, 50),
-				_fakeTimeProvider,
-				deliverEndOfTFPosition: false, stopOnEof: true);
-			_eventReader.Resume();
-			_readAllEventsForwardCorrelationId = _consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>()
-				.Last().CorrelationId;
-			_eventReader.Handle(
-				new ProjectionManagementMessage.Internal.ReadTimeout(_readAllEventsForwardCorrelationId, "$all"));
-			_eventReader.Handle(
-				new ClientMessage.ReadAllEventsForwardCompleted(
-					_readAllEventsForwardCorrelationId, ReadAllResult.Success, null,
-					new[] {
-						EventStore.Core.Data.ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								1, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "a", ExpectedVersion.Any,
-								_fakeTimeProvider.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2}), 100),
-						EventStore.Core.Data.ResolvedEvent.ForUnresolvedEvent(
-							new EventRecord(
-								2, 150, Guid.NewGuid(), Guid.NewGuid(), 150, 0, "b", ExpectedVersion.Any,
-								_fakeTimeProvider.UtcNow,
-								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
-								"event_type1", new byte[] {1}, new byte[] {2}), 200),
-					}, null, false, 100, new TFPos(200, 150), new TFPos(500, -1), new TFPos(100, 50), 500));
-		}
-
-		[Test]
-		public void should_not_deliver_events() {
-			Assert.AreEqual(0,
-				_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
-		}
-
-		[Test]
-		public void should_attempt_another_read_for_the_timed_out_reads() {
-			var readAllEventsForwardMessages = _consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>();
-
-			Assert.AreEqual(readAllEventsForwardMessages.First().CorrelationId, _readAllEventsForwardCorrelationId);
-			Assert.AreEqual(1, readAllEventsForwardMessages.Skip(1).Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/TestFixtureWithEventReorderingProjectionSubscription.cs b/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/TestFixtureWithEventReorderingProjectionSubscription.cs
deleted file mode 100644
index d1ecad89580..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/TestFixtureWithEventReorderingProjectionSubscription.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Services.TimerService;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
-using EventStore.Projections.Core.Tests.Services.projection_subscription;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reordering_projection_subscription {
-	public abstract class TestFixtureWithEventReorderingProjectionSubscription : TestFixtureWithProjectionSubscription {
-		protected int _timeBetweenEvents;
-		protected int _processingLagMs;
-
-		protected override void Given() {
-			_timeBetweenEvents = 1100;
-			_processingLagMs = 500;
-			base.Given();
-			_source = builder => {
-				builder.FromStream("a");
-				builder.FromStream("b");
-				builder.AllEvents();
-				builder.SetReorderEvents(true);
-				builder.SetProcessingLag(1000); // ms
-			};
-		}
-
-		protected override IReaderSubscription CreateProjectionSubscription() {
-			return new EventReorderingReaderSubscription(_bus,
-				_projectionCorrelationId,
-				CheckpointTag.FromStreamPositions(0,
-					new Dictionary<string, long> {{"a", ExpectedVersion.NoStream}, {"b", ExpectedVersion.NoStream}}),
-				_readerStrategy,
-				_timeProvider,
-				_checkpointUnhandledBytesThreshold, _checkpointProcessedEventsThreshold, _checkpointAfterMs,
-				_processingLagMs,
-				false,
-				null,
-				false);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_creating_projection_subscription.cs b/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_creating_projection_subscription.cs
deleted file mode 100644
index 80a288f3459..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_creating_projection_subscription.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using System;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reordering_projection_subscription {
-	[TestFixture]
-	public class when_creating_projection_subscription {
-		[Test]
-		public void it_can_be_created() {
-			new EventReorderingReaderSubscription(
-				new FakePublisher(),
-				Guid.NewGuid(),
-				CheckpointTag.FromPosition(0, 0, -1),
-				CreateReaderStrategy(),
-				new FakeTimeProvider(),
-				1000,
-				2000,
-				10000,
-				500,
-				false,
-				null,
-				false);
-		}
-
-		[Test]
-		public void null_publisher_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				new EventReorderingReaderSubscription(
-					null,
-					Guid.NewGuid(),
-					CheckpointTag.FromPosition(0, 0, -1),
-					CreateReaderStrategy(),
-					new FakeTimeProvider(),
-					1000,
-					2000,
-					10000,
-					500,
-					false,
-					null,
-					false);
-			});
-		}
-
-		[Test]
-		public void null_describe_source_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				new EventReorderingReaderSubscription(
-					new FakePublisher(),
-					Guid.NewGuid(),
-					CheckpointTag.FromPosition(0, 0, -1),
-					null,
-					new FakeTimeProvider(),
-					1000,
-					2000,
-					10000,
-					500,
-					false,
-					null,
-					false);
-			});
-		}
-
-		[Test]
-		public void null_time_provider_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				new EventReorderingReaderSubscription(
-					new FakePublisher(),
-					Guid.NewGuid(),
-					CheckpointTag.FromPosition(0, 0, -1),
-					CreateReaderStrategy(),
-					null,
-					1000,
-					2000,
-					10000,
-					500,
-					false,
-					null,
-					false);
-			});
-		}
-
-		private IReaderStrategy CreateReaderStrategy() {
-			var result = new SourceDefinitionBuilder();
-			result.FromAll();
-			result.AllEvents();
-			return ReaderStrategy.Create(
-				"test",
-				0,
-				result.Build(),
-				new RealTimeProvider(),
-				stopOnEof: false,
-				runAs: null);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_a_second_event_after_the_delay.cs b/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_a_second_event_after_the_delay.cs
deleted file mode 100644
index 951f0d370eb..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_a_second_event_after_the_delay.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reordering_projection_subscription {
-	[TestFixture]
-	public class when_handling_a_second_event_after_the_delay : TestFixtureWithEventReorderingProjectionSubscription {
-		private Guid _firstEventId;
-		private DateTime _firstEventTimestamp;
-#pragma warning disable 108,114
-		private int _timeBetweenEvents;
-#pragma warning restore 108,114
-
-		protected override void When() {
-			_firstEventId = Guid.NewGuid();
-			_firstEventTimestamp = DateTime.UtcNow;
-			_timeBetweenEvents = 1100;
-
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(200, 150), "a", 1, false, _firstEventId, "bad-event-type", false,
-					new byte[0], new byte[0], _firstEventTimestamp));
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(300, 250), "a", 2, false, Guid.NewGuid(), "bad-event-type", false,
-					new byte[0], new byte[0], _firstEventTimestamp.AddMilliseconds(_timeBetweenEvents)));
-		}
-
-		[Test]
-		public void no_events_are_passed_to_downstream_handler_immediately() {
-			Assert.AreEqual(1, _eventHandler.HandledMessages.Count);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_an_event_after_the_delay_and_reordering_is_required.cs b/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_an_event_after_the_delay_and_reordering_is_required.cs
deleted file mode 100644
index 485452a327a..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_an_event_after_the_delay_and_reordering_is_required.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reordering_projection_subscription {
-	[TestFixture]
-	public class when_handling_an_event_after_the_delay_and_reordering_is_required :
-		TestFixtureWithEventReorderingProjectionSubscription {
-		private Guid _firstEventId;
-		private DateTime _firstEventTimestamp;
-		private Guid _secondEventId;
-
-		protected override void When() {
-			_firstEventId = Guid.NewGuid();
-			_secondEventId = Guid.NewGuid();
-			_firstEventTimestamp = DateTime.UtcNow;
-
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(200, 150), "a", 1, false, _secondEventId, "bad-event-type", false,
-					new byte[0], new byte[0], _firstEventTimestamp));
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(300, 100), "b", 1, false, _firstEventId, "bad-event-type", false,
-					new byte[0], new byte[0], _firstEventTimestamp.AddMilliseconds(1)));
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(310, 305), "a", 2, false, Guid.NewGuid(), "bad-event-type", false,
-					new byte[0], new byte[0], _firstEventTimestamp.AddMilliseconds(_timeBetweenEvents)));
-		}
-
-		[Test]
-		public void first_two_events_are_reordered() {
-			Assert.AreEqual(2, _eventHandler.HandledMessages.Count);
-			var first = _eventHandler.HandledMessages[0];
-			var second = _eventHandler.HandledMessages[1];
-			Assert.AreEqual(_firstEventId, first.Data.EventId);
-			Assert.AreEqual(_secondEventId, second.Data.EventId);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_an_idle_notification_and_reordering_is_required.cs b/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_an_idle_notification_and_reordering_is_required.cs
deleted file mode 100644
index 66f55e4e413..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_an_idle_notification_and_reordering_is_required.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reordering_projection_subscription {
-	[TestFixture]
-	public class when_handling_an_idle_notification_and_reordering_is_required :
-		TestFixtureWithEventReorderingProjectionSubscription {
-		private Guid _firstEventId;
-		private DateTime _firstEventTimestamp;
-		private Guid _secondEventId;
-
-		protected override void When() {
-			_firstEventId = Guid.NewGuid();
-			_secondEventId = Guid.NewGuid();
-			_firstEventTimestamp = DateTime.UtcNow;
-
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(200, 150), "a", 1, false, _secondEventId, "bad-event-type", false,
-					new byte[0], new byte[0], _firstEventTimestamp));
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(300, 100), "b", 1, false, _firstEventId, "bad-event-type", false,
-					new byte[0], new byte[0], _firstEventTimestamp.AddMilliseconds(1)));
-			_subscription.Handle(
-				new ReaderSubscriptionMessage.EventReaderIdle(
-					Guid.NewGuid(), _firstEventTimestamp.AddMilliseconds(_timeBetweenEvents)));
-		}
-
-		[Test]
-		public void events_are_reordered() {
-			Assert.AreEqual(2, _eventHandler.HandledMessages.Count);
-			var first = _eventHandler.HandledMessages[0];
-			var second = _eventHandler.HandledMessages[1];
-			Assert.AreEqual(_firstEventId, first.Data.EventId);
-			Assert.AreEqual(_secondEventId, second.Data.EventId);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_committed_event_passing_the_filter.cs b/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_committed_event_passing_the_filter.cs
deleted file mode 100644
index 40b4eb65432..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_committed_event_passing_the_filter.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reordering_projection_subscription {
-	[TestFixture]
-	public class
-		when_handling_committed_event_passing_the_filter : TestFixtureWithEventReorderingProjectionSubscription {
-		protected override void When() {
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(200, 150), "a", 1, false, Guid.NewGuid(), "bad-event-type", false,
-					new byte[0], new byte[0]));
-		}
-
-		[Test]
-		public void event_is_not_passed_to_downstream_handler_immediately() {
-			Assert.AreEqual(0, _eventHandler.HandledMessages.Count);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_duplicate_events.cs b/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_duplicate_events.cs
deleted file mode 100644
index 347057036a6..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_duplicate_events.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reordering_projection_subscription {
-	[TestFixture]
-	public class when_handling_duplicate_events : TestFixtureWithEventReorderingProjectionSubscription {
-		private DateTime _timestamp;
-
-		protected override void When() {
-			_timestamp = DateTime.UtcNow;
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_projectionCorrelationId, new TFPos(200, 150), "a", 1, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0], _timestamp));
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_projectionCorrelationId, new TFPos(100, 50), "a", 0, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0], _timestamp.AddMilliseconds(1)));
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_projectionCorrelationId, new TFPos(200, 150), "a", 1, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0], _timestamp.AddMilliseconds(1)));
-			_subscription.Handle(
-				new ReaderSubscriptionMessage.EventReaderIdle(
-					_projectionCorrelationId, _timestamp.AddMilliseconds(1100)));
-		}
-
-		[Test]
-		public void duplicates_are_not_passed_to_downstream_handler() {
-			Assert.AreEqual(2, _eventHandler.HandledMessages.Count);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_two_subsequent_events.cs b/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_two_subsequent_events.cs
deleted file mode 100644
index 1b3d75ec45d..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_two_subsequent_events.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reordering_projection_subscription {
-	[TestFixture]
-	public class when_handling_two_subsequent_events : TestFixtureWithEventReorderingProjectionSubscription {
-		private Guid _firstEventId;
-		private DateTime _firstEventTimestamp;
-#pragma warning disable 108,114
-		private int _timeBetweenEvents;
-#pragma warning restore 108,114
-
-		protected override void When() {
-			_firstEventId = Guid.NewGuid();
-			_firstEventTimestamp = DateTime.UtcNow;
-			_timeBetweenEvents = 1;
-
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(200, 150), "a", 1, false, _firstEventId, "bad-event-type", false,
-					new byte[0], new byte[0], _firstEventTimestamp));
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(300, 250), "a", 2, false, Guid.NewGuid(), "bad-event-type", false,
-					new byte[0], new byte[0], _firstEventTimestamp.AddMilliseconds(_timeBetweenEvents)));
-		}
-
-		[Test]
-		public void no_events_are_passed_to_downstream_handler_immediately() {
-			Assert.AreEqual(0, _eventHandler.HandledMessages.Count);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_receiving_multiple_events_not_passing_event_filter.cs b/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_receiving_multiple_events_not_passing_event_filter.cs
deleted file mode 100644
index 8acdd967ec3..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_receiving_multiple_events_not_passing_event_filter.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.event_reordering_projection_subscription {
-	[TestFixture]
-	public class when_receiving_multiple_events_not_passing_event_filter :
-		TestFixtureWithEventReorderingProjectionSubscription {
-		private DateTime _timestamp;
-
-		protected override void Given() {
-			base.Given();
-			_source = builder => {
-				builder.FromStream("a");
-				builder.FromStream("b");
-				builder.IncludeEvent("specific-event");
-				builder.SetReorderEvents(true);
-				builder.SetProcessingLag(1000); // ms
-			};
-		}
-
-		protected override void When() {
-			_timestamp = DateTime.UtcNow;
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_projectionCorrelationId, new TFPos(200, 150), "a", 1, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0], _timestamp));
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_projectionCorrelationId, new TFPos(2000, 950), "a", 2, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0], _timestamp.AddMilliseconds(1)));
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					_projectionCorrelationId, new TFPos(2100, 2050), "b", 1, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0], _timestamp.AddMilliseconds(1)));
-			_subscription.Handle(
-				new ReaderSubscriptionMessage.EventReaderIdle(
-					_projectionCorrelationId, _timestamp.AddMilliseconds(1100)));
-		}
-
-		[Test]
-		public void checkpoint_suggested_message_is_published_once_for_interval() {
-			Assert.AreEqual(1, _checkpointHandler.HandledMessages.Count);
-			Assert.AreEqual(2, _checkpointHandler.HandledMessages[0].CheckpointTag.Streams["a"]);
-			Assert.AreEqual(1, _checkpointHandler.HandledMessages[0].CheckpointTag.Streams["b"]);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/feed_reader/TestFixtureWithFeedReaderService.cs b/src/EventStore.Projections.Core.Tests/Services/feed_reader/TestFixtureWithFeedReaderService.cs
deleted file mode 100644
index 44131d356d7..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/feed_reader/TestFixtureWithFeedReaderService.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using EventStore.Projections.Core.EventReaders.Feeds;
-using EventStore.Projections.Core.Tests.Services.event_reader;
-
-namespace EventStore.Projections.Core.Tests.Services.feed_reader {
-	public abstract class TestFixtureWithFeedReaderService<TLogFormat, TStreamId> : TestFixtureWithEventReaderService<TLogFormat, TStreamId> {
-		protected FeedReaderService _feedReaderService;
-
-		protected override void Given1() {
-			base.Given1();
-			EnableReadAll();
-		}
-
-		protected override void GivenAdditionalServices() {
-			_feedReaderService = new FeedReaderService(_subscriptionDispatcher, _timeProvider);
-			_bus.Subscribe(_feedReaderService);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/grpc_service/ServerFeaturesTests.cs b/src/EventStore.Projections.Core.Tests/Services/grpc_service/ServerFeaturesTests.cs
deleted file mode 100644
index 5e2d2180371..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/grpc_service/ServerFeaturesTests.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
-using EventStore.Client;
-using EventStore.Client.ServerFeatures;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Tests.ClientAPI.projectionsManager;
-using Google.Protobuf.Reflection;
-using Grpc.Net.Client;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.grpc_service {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class ServerFeaturesTests<TLogFormat, TStreamId>: SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
-		private List<SupportedMethod> _supportedEndPoints = new ();
-		private List<SupportedMethod> _expectedEndPoints = new ();
-
-		public override Task Given() {
-			_expectedEndPoints.AddRange(GetEndPoints(Client.Projections.Projections.Descriptor));
-			var createEndPoint = _expectedEndPoints.FirstOrDefault(ep => ep.MethodName.Contains("create"));
-			createEndPoint?.Features.Add("track_emitted_streams");
-
-			return Task.CompletedTask;
-		}
-
-		public override async Task When() {
-
-			using var channel = GrpcChannel.ForAddress(
-				new Uri($"https://{_node.HttpEndPoint}"),
-				new GrpcChannelOptions {
-					HttpHandler = _node.HttpMessageHandler
-				});
-			var client = new ServerFeatures.ServerFeaturesClient(channel);
-
-			var resp = await client.GetSupportedMethodsAsync(new Empty());
-			_supportedEndPoints = resp.Methods.Where(x => x.ServiceName.Contains("projections")).ToList();
-		}
-
-		private SupportedMethod[] GetEndPoints(ServiceDescriptor desc) =>
-			desc.Methods.Select(x => new SupportedMethod {
-				MethodName = x.Name.ToLower(),
-				ServiceName = x.Service.FullName.ToLower()
-			}).ToArray();
-
-		[Test]
-		public void should_receive_expected_endpoints() {
-			CollectionAssert.AreEquivalent(_expectedEndPoints, _supportedEndPoints);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/handlers/categorize_events_by_correlation_id.cs b/src/EventStore.Projections.Core.Tests/Services/handlers/categorize_events_by_correlation_id.cs
deleted file mode 100644
index 5ac032d8b0e..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/handlers/categorize_events_by_correlation_id.cs
+++ /dev/null
@@ -1,311 +0,0 @@
-using System;
-using System.Text;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Standard;
-using Newtonsoft.Json.Linq;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.handlers {
-	public static class categorize_events_by_correlation_id {
-		[TestFixture]
-		public class when_handling_simple_event {
-			private ByCorrelationId _handler;
-			private string _state;
-			private EmittedEventEnvelope[] _emittedEvents;
-			private bool _result;
-			private DateTime _dateTime;
-
-			[SetUp]
-			public void when() {
-				_handler = new ByCorrelationId("", Console.WriteLine);
-				_handler.Initialize();
-				_dateTime = DateTime.UtcNow;
-				var dataBytes = Encoding.ASCII.GetBytes("{}");
-				var metadataBytes = Encoding.ASCII.GetBytes("{\"$correlationId\":\"testing1\"}");
-
-				string sharedState;
-				_result = _handler.ProcessEvent(
-					"", CheckpointTag.FromPosition(0, 200, 150), null,
-					new ResolvedEvent(
-						"cat1-stream1", 10, "cat1-stream1", 10, false, new TFPos(200, 150), new TFPos(200, 150),
-						Guid.NewGuid(),
-						"event_type", true, dataBytes, metadataBytes, null, null, _dateTime), out _state,
-					out sharedState, out _emittedEvents);
-			}
-
-			[Test]
-			public void result_is_true() {
-				Assert.IsTrue(_result);
-			}
-
-			[Test]
-			public void state_stays_null() {
-				Assert.IsNull(_state);
-			}
-
-			[Test]
-			public void emits_correct_link() {
-				Assert.NotNull(_emittedEvents);
-				Assert.AreEqual(1, _emittedEvents.Length);
-				var @event = _emittedEvents[0].Event;
-				Assert.AreEqual("$>", @event.EventType);
-				Assert.AreEqual("$bc-testing1", @event.StreamId);
-				Assert.AreEqual("10@cat1-stream1", @event.Data);
-
-				string eventTimestampJson = null;
-				var extraMetadata = @event.ExtraMetaData();
-				foreach (var kvp in extraMetadata) {
-					if (kvp.Key.Equals("$eventTimestamp")) {
-						eventTimestampJson = kvp.Value;
-					}
-				}
-
-				Assert.NotNull(eventTimestampJson);
-				Assert.AreEqual("\"" + _dateTime.ToString("yyyy-MM-ddTHH:mm:ss.ffffffZ") + "\"", eventTimestampJson);
-			}
-		}
-
-		[TestFixture]
-		public class when_handling_link_to_event {
-			private ByCorrelationId _handler;
-			private string _state;
-			private EmittedEventEnvelope[] _emittedEvents;
-			private bool _result;
-			private DateTime _dateTime;
-			private Guid _eventId;
-
-			[SetUp]
-			public void when() {
-				_handler = new ByCorrelationId("", Console.WriteLine);
-				_handler.Initialize();
-				_dateTime = DateTime.UtcNow;
-				string sharedState;
-
-				var dataBytes = Encoding.ASCII.GetBytes("10@cat1-stream1");
-				var metadataBytes =
-					Encoding.ASCII.GetBytes("{\"$correlationId\":\"testing2\", \"$whatever\":\"hello\"}");
-				var myEvent = new ResolvedEvent("cat2-stream2", 20, "cat2-stream2", 20, true, new TFPos(200, 150),
-					new TFPos(200, 150), Guid.NewGuid(), "$>", true, dataBytes, metadataBytes, null, null, _dateTime);
-
-				_eventId = myEvent.EventId;
-				_result = _handler.ProcessEvent(
-					"", CheckpointTag.FromPosition(0, 200, 150), null,
-					myEvent, out _state, out sharedState, out _emittedEvents);
-			}
-
-			[Test]
-			public void result_is_true() {
-				Assert.IsTrue(_result);
-			}
-
-			[Test]
-			public void state_stays_null() {
-				Assert.IsNull(_state);
-			}
-
-			[Test]
-			public void emits_correct_link() {
-				Assert.NotNull(_emittedEvents);
-				Assert.AreEqual(1, _emittedEvents.Length);
-				var @event = _emittedEvents[0].Event;
-				Assert.AreEqual("$>", @event.EventType);
-				Assert.AreEqual("$bc-testing2", @event.StreamId);
-				Assert.AreEqual("10@cat1-stream1", @event.Data);
-
-				string eventTimestampJson = null;
-				string linkJson = null;
-				var extraMetadata = @event.ExtraMetaData();
-				foreach (var kvp in extraMetadata) {
-					switch (kvp.Key) {
-						case "$eventTimestamp":
-							eventTimestampJson = kvp.Value;
-							break;
-						case "$link":
-							linkJson = kvp.Value;
-							break;
-					}
-				}
-
-				Assert.NotNull(eventTimestampJson);
-				Assert.AreEqual("\"" + _dateTime.ToString("yyyy-MM-ddTHH:mm:ss.ffffffZ") + "\"", eventTimestampJson);
-
-				//the link's metadata should be copied to $link.metadata and id to $link.eventId
-				Assert.NotNull(linkJson);
-				var link = JObject.Parse(linkJson);
-				Assert.AreEqual(link.GetValue("eventId").ToObject<string>(), _eventId.ToString());
-
-				var linkMetadata = (JObject)link.GetValue("metadata");
-				Assert.AreEqual(linkMetadata.GetValue("$correlationId").ToObject<string>(), "testing2");
-				Assert.AreEqual(linkMetadata.GetValue("$whatever").ToObject<string>(), "hello");
-			}
-		}
-
-		[TestFixture]
-		public class when_handling_non_json_event {
-			private ByCorrelationId _handler;
-			private string _state;
-			private EmittedEventEnvelope[] _emittedEvents;
-			private bool _result;
-
-			[SetUp]
-			public void when() {
-				_handler = new ByCorrelationId("", Console.WriteLine);
-				_handler.Initialize();
-				string sharedState;
-				_result = _handler.ProcessEvent(
-					"", CheckpointTag.FromPosition(0, 200, 150), null,
-					new ResolvedEvent(
-						"cat1-stream1", 10, "cat1-stream1", 10, false, new TFPos(200, 150), Guid.NewGuid(),
-						"event_type", false, "non_json_data", "non_json_metadata"), out _state, out sharedState,
-					out _emittedEvents);
-			}
-
-			[Test]
-			public void result_is_false() {
-				Assert.IsFalse(_result);
-			}
-
-			[Test]
-			public void state_stays_null() {
-				Assert.IsNull(_state);
-			}
-
-			[Test]
-			public void does_not_emit_link() {
-				Assert.IsNull(_emittedEvents);
-			}
-		}
-
-		[TestFixture]
-		public class when_handling_json_event_with_no_correlation_id {
-			private ByCorrelationId _handler;
-			private string _state;
-			private EmittedEventEnvelope[] _emittedEvents;
-			private bool _result;
-
-			[SetUp]
-			public void when() {
-				_handler = new ByCorrelationId("", Console.WriteLine);
-				_handler.Initialize();
-				string sharedState;
-				_result = _handler.ProcessEvent(
-					"", CheckpointTag.FromPosition(0, 200, 150), null,
-					new ResolvedEvent(
-						"cat1-stream1", 10, "cat1-stream1", 10, false, new TFPos(200, 150), Guid.NewGuid(),
-						"event_type", true, "{}", "{}"), out _state, out sharedState, out _emittedEvents);
-			}
-
-			[Test]
-			public void result_is_false() {
-				Assert.IsFalse(_result);
-			}
-
-			[Test]
-			public void state_stays_null() {
-				Assert.IsNull(_state);
-			}
-
-			[Test]
-			public void does_not_emit_link() {
-				Assert.IsNull(_emittedEvents);
-			}
-		}
-
-		[TestFixture]
-		public class when_handling_json_event_with_non_json_metadata {
-			private ByCorrelationId _handler;
-			private string _state;
-			private EmittedEventEnvelope[] _emittedEvents;
-			private bool _result;
-
-			[SetUp]
-			public void when() {
-				_handler = new ByCorrelationId("", Console.WriteLine);
-				_handler.Initialize();
-				string sharedState;
-				_result = _handler.ProcessEvent(
-					"", CheckpointTag.FromPosition(0, 200, 150), null,
-					new ResolvedEvent(
-						"cat1-stream1", 10, "cat1-stream1", 10, false, new TFPos(200, 150), Guid.NewGuid(),
-						"event_type", true, "{}", "non_json_metadata"), out _state, out sharedState,
-					out _emittedEvents);
-			}
-
-			[Test]
-			public void result_is_false() {
-				Assert.IsFalse(_result);
-			}
-
-			[Test]
-			public void state_stays_null() {
-				Assert.IsNull(_state);
-			}
-
-			[Test]
-			public void does_not_emit_link() {
-				Assert.IsNull(_emittedEvents);
-			}
-		}
-
-		[TestFixture]
-		public class with_custom_valid_correlation_id_property {
-			private ByCorrelationId _handler;
-			private string _state;
-			private EmittedEventEnvelope[] _emittedEvents;
-			private bool _result;
-			private string source = "{\"correlationIdProperty\":\"$myCorrelationId\"}";
-
-			[SetUp]
-			public void when() {
-				_handler = new ByCorrelationId(source, Console.WriteLine);
-				_handler.Initialize();
-				string sharedState;
-				_result = _handler.ProcessEvent(
-					"", CheckpointTag.FromPosition(0, 200, 150), null,
-					new ResolvedEvent(
-						"cat1-stream1", 10, "cat1-stream1", 10, false, new TFPos(200, 150), Guid.NewGuid(),
-						"event_type", true, "{}", "{\"$myCorrelationId\":\"testing1\"}"), out _state, out sharedState,
-					out _emittedEvents);
-			}
-
-			[Test]
-			public void result_is_true() {
-				Assert.IsTrue(_result);
-			}
-
-			[Test]
-			public void state_stays_null() {
-				Assert.IsNull(_state);
-			}
-
-			[Test]
-			public void emits_correct_link() {
-				Assert.NotNull(_emittedEvents);
-				Assert.AreEqual(1, _emittedEvents.Length);
-				var @event = _emittedEvents[0].Event;
-				Assert.AreEqual("$>", @event.EventType);
-				Assert.AreEqual("$bc-testing1", @event.StreamId);
-				Assert.AreEqual("10@cat1-stream1", @event.Data);
-			}
-		}
-
-		[TestFixture]
-		public class with_custom_invalid_correlation_id_property {
-			private string source = "{\"thisisnotvalid\":\"$myCorrelationId\"}";
-
-			[SetUp]
-			public void when() {
-			}
-
-			[Test]
-			public void should_throw_invalid_operation_exception() {
-				Assert.Throws<InvalidOperationException>(() => { new ByCorrelationId(source, Console.WriteLine); });
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/handlers/categorize_events_by_stream_path.cs b/src/EventStore.Projections.Core.Tests/Services/handlers/categorize_events_by_stream_path.cs
deleted file mode 100644
index 29d1f5bf6c3..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/handlers/categorize_events_by_stream_path.cs
+++ /dev/null
@@ -1,226 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Standard;
-using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Tests.Services.handlers {
-	public static class categorize_events_by_stream_path {
-		[TestFixture]
-		public class when_handling_simple_event {
-			private CategorizeEventsByStreamPath _handler;
-			private string _state;
-			private EmittedEventEnvelope[] _emittedEvents;
-			private bool _result;
-
-			[SetUp]
-			public void when() {
-				_handler = new CategorizeEventsByStreamPath("-", Console.WriteLine);
-				_handler.Initialize();
-				string sharedState;
-				_result = _handler.ProcessEvent(
-					"", CheckpointTag.FromPosition(0, 200, 150), null,
-					new ResolvedEvent(
-						"cat1-stream1", 10, "cat1-stream1", 10, false, new TFPos(200, 150), Guid.NewGuid(),
-						"event_type", true, "{}", "{}"), out _state, out sharedState, out _emittedEvents);
-			}
-
-			[Test]
-			public void result_is_true() {
-				Assert.IsTrue(_result);
-			}
-
-			[Test]
-			public void state_stays_null() {
-				Assert.IsNull(_state);
-			}
-
-			[Test]
-			public void emits_correct_link() {
-				Assert.NotNull(_emittedEvents);
-				Assert.AreEqual(1, _emittedEvents.Length);
-				var @event = _emittedEvents[0].Event;
-				Assert.AreEqual("$>", @event.EventType);
-				Assert.AreEqual("$ce-cat1", @event.StreamId);
-				Assert.AreEqual("10@cat1-stream1", @event.Data);
-			}
-		}
-
-		[TestFixture]
-		public class when_handling_link_to_event {
-			private CategorizeEventsByStreamPath _handler;
-			private string _state;
-			private EmittedEventEnvelope[] _emittedEvents;
-			private bool _result;
-
-			[SetUp]
-			public void when() {
-				_handler = new CategorizeEventsByStreamPath("-", Console.WriteLine);
-				_handler.Initialize();
-				string sharedState;
-				_result = _handler.ProcessEvent(
-					"", CheckpointTag.FromPosition(0, 200, 150), null,
-					new ResolvedEvent(
-						"cat2-stream2", 20, "cat2-stream2", 20, true, new TFPos(200, 150), Guid.NewGuid(),
-						"$>", true, "10@cat1-stream1", "{}"), out _state, out sharedState, out _emittedEvents);
-			}
-
-			[Test]
-			public void result_is_true() {
-				Assert.IsTrue(_result);
-			}
-
-			[Test]
-			public void state_stays_null() {
-				Assert.IsNull(_state);
-			}
-
-			[Test]
-			public void emits_correct_link() {
-				Assert.NotNull(_emittedEvents);
-				Assert.AreEqual(1, _emittedEvents.Length);
-				var @event = _emittedEvents[0].Event;
-				Assert.AreEqual("$>", @event.EventType);
-				Assert.AreEqual("$ce-cat2", @event.StreamId);
-				Assert.AreEqual("10@cat1-stream1", @event.Data);
-			}
-		}
-
-		[TestFixture]
-		public class when_handling_normal_stream_metadata_event {
-			private CategorizeEventsByStreamPath _handler;
-			private string _state;
-			private EmittedEventEnvelope[] _emittedEvents;
-			private bool _result;
-
-			[SetUp]
-			public void when() {
-				_handler = new CategorizeEventsByStreamPath("-", Console.WriteLine);
-				_handler.Initialize();
-				string sharedState;
-				_result = _handler.ProcessEvent(
-					"", CheckpointTag.FromPosition(0, 200, 150), null,
-					new ResolvedEvent(
-						"$$cat3-stream3", 20, "$$cat3-stream3", 20, true, new TFPos(200, 150), Guid.NewGuid(),
-						"$metadata", true, "{}", "{}"), out _state, out sharedState, out _emittedEvents);
-			}
-
-			[Test]
-			public void result_is_true() {
-				Assert.IsTrue(_result);
-			}
-
-			[Test]
-			public void state_stays_null() {
-				Assert.IsNull(_state);
-			}
-
-			[Test]
-			public void does_not_emit_events() {
-				Assert.IsNull(_emittedEvents);
-			}
-		}
-
-[TestFixture]
-		public class when_handling_soft_deleted_stream_metadata_event {
-			private CategorizeEventsByStreamPath _handler;
-			private string _state;
-			private EmittedEventEnvelope[] _emittedEvents;
-			private bool _result;
-
-			[SetUp]
-			public void when() {
-				_handler = new CategorizeEventsByStreamPath("-", Console.WriteLine);
-				_handler.Initialize();
-				string sharedState;
-				_result = _handler.ProcessEvent(
-					"", CheckpointTag.FromPosition(0, 200, 150), null,
-					new ResolvedEvent(
-						"$$cat4-stream4", 20, "$$cat4-stream4", 20, true, new TFPos(200, 150), Guid.NewGuid(),
-						"$metadata", true, "{ \"$tb\": "+long.MaxValue+" }", "{}"), out _state, out sharedState, out _emittedEvents);
-			}
-
-			[Test]
-			public void result_is_true() {
-				Assert.IsTrue(_result);
-			}
-
-			[Test]
-			public void state_stays_null() {
-				Assert.IsNull(_state);
-			}
-
-			[Test]
-			public void emits_correct_link() {
-				Assert.NotNull(_emittedEvents);
-				Assert.AreEqual(1, _emittedEvents.Length);
-				var @event = _emittedEvents[0].Event;
-				Assert.AreEqual("$>", @event.EventType);
-				Assert.AreEqual("$ce-cat4", @event.StreamId);
-				Assert.AreEqual("20@$$cat4-stream4", @event.Data);
-				var metadata = new Dictionary<string,string>();
-				foreach(var kvp in @event.ExtraMetaData()){
-					metadata[kvp.Key] = kvp.Value;
-				}
-				Assert.NotNull(metadata["$o"]);
-				Assert.AreEqual("\"cat4-stream4\"", metadata["$o"]);
-				Assert.NotNull(metadata["$deleted"]);
-				Assert.AreEqual("-1", metadata["$deleted"]);
-			}
-		}
-
-[TestFixture]
-		public class when_handling_hard_deleted_stream_event {
-			private CategorizeEventsByStreamPath _handler;
-			private string _state;
-			private EmittedEventEnvelope[] _emittedEvents;
-			private bool _result;
-
-			[SetUp]
-			public void when() {
-				_handler = new CategorizeEventsByStreamPath("-", Console.WriteLine);
-				_handler.Initialize();
-				string sharedState;
-				_result = _handler.ProcessEvent(
-					"", CheckpointTag.FromPosition(0, 200, 150), null,
-					new ResolvedEvent(
-						"cat5-stream5", 20, "cat5-stream5", 20, true, new TFPos(200, 150), Guid.NewGuid(),
-						"$streamDeleted", true, "{}", "{}"), out _state, out sharedState, out _emittedEvents);
-			}
-
-			[Test]
-			public void result_is_true() {
-				Assert.IsTrue(_result);
-			}
-
-			[Test]
-			public void state_stays_null() {
-				Assert.IsNull(_state);
-			}
-
-			[Test]
-			public void emits_correct_link() {
-				Assert.NotNull(_emittedEvents);
-				Assert.AreEqual(1, _emittedEvents.Length);
-				var @event = _emittedEvents[0].Event;
-				Assert.AreEqual("$>", @event.EventType);
-				Assert.AreEqual("$ce-cat5", @event.StreamId);
-				Assert.AreEqual("20@cat5-stream5", @event.Data);
-
-				var metadata = new Dictionary<string,string>();
-				foreach(var kvp in @event.ExtraMetaData()){
-					metadata[kvp.Key] = kvp.Value;
-				}
-				Assert.NotNull(metadata["$o"]);
-				Assert.AreEqual("\"cat5-stream5\"", metadata["$o"]);
-				Assert.NotNull(metadata["$deleted"]);
-				Assert.AreEqual("-1", metadata["$deleted"]);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/http_service/authorization_tests.cs b/src/EventStore.Projections.Core.Tests/Services/http_service/authorization_tests.cs
deleted file mode 100644
index c5672e7e4db..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/http_service/authorization_tests.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Tests.ClientAPI.Cluster;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.Transport.Http {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class Authorization<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
-		private Dictionary<string, HttpClient> _httpClients = new Dictionary<string, HttpClient>();
-		private TimeSpan _timeout = TimeSpan.FromSeconds(10);
-		private int _leaderId;
-
-		private HttpClient CreateHttpClient(string username, string password) {
-			var client = new HttpClient(new HttpClientHandler {
-				AllowAutoRedirect = false
-			}) {
-				Timeout = _timeout
-			};
-			if (!string.IsNullOrEmpty(username)) {
-				client.DefaultRequestHeaders.Authorization =
-					new AuthenticationHeaderValue(
-						"Basic", System.Convert.ToBase64String(
-							System.Text.Encoding.ASCII.GetBytes(
-								$"{username}:{password}")));
-			}
-
-			return client;
-		}
-
-		private async Task<int> SendRequest(HttpClient client, HttpMethod method, string url, string body, string contentType) {
-			using var request = new HttpRequestMessage {Method = method, RequestUri = new Uri(url)};
-
-			if (body != null) {
-				var bodyBytes = Helper.UTF8NoBom.GetBytes(body);
-				var stream = new MemoryStream(bodyBytes);
-				var content = new StreamContent(stream);
-				content.Headers.ContentLength = bodyBytes.Length;
-				if (contentType != null)
-					content.Headers.ContentType = new MediaTypeHeaderValue(contentType);
-				request.Content = content;
-			}
-
-			var result = await client.SendAsync(request);
-			return (int)result.StatusCode;
-		}
-
-		private HttpMethod GetHttpMethod(string method) {
-			switch (method) {
-				case "GET":
-					return HttpMethod.Get;
-				case "POST":
-					return HttpMethod.Post;
-				case "PUT":
-					return HttpMethod.Put;
-				case "DELETE":
-					return HttpMethod.Delete;
-				default:
-					throw new Exception("Unknown Http Method");
-			}
-		}
-
-		private int GetAuthLevel(string userAuthorizationLevel) {
-			switch (userAuthorizationLevel) {
-				case "None":
-					return 0;
-				case "User":
-					return 1;
-				case "Ops":
-					return 2;
-				case "Admin":
-					return 3;
-				default:
-					throw new Exception("Unknown authorization level");
-			}
-		}
-		public async Task CreateUser(string username, string password) {
-			for (int trial = 1; trial <= 5; trial++) {
-				try {
-					var dataStr = string.Format("{{loginName: '{0}', fullName: '{1}', password: '{2}', groups: []}}", username, username, password);
-					var data = Helper.UTF8NoBom.GetBytes(dataStr);
-					var stream = new MemoryStream(data);
-					var content = new StreamContent(stream);
-					content.Headers.Add("Content-Type", "application/json");
-
-					var res = await _httpClients["Admin"].PostAsync(
-						string.Format("http://{0}/users/", _nodes[_leaderId].HttpEndPoint),
-						content
-					);
-					res.EnsureSuccessStatusCode();
-					break;
-				} catch (HttpRequestException) {
-					if (trial == 5) {
-						throw new Exception(string.Format("Error creating user: {0}", username));
-					}
-					await Task.Delay(1000);
-				}
-			}
-		}
-
-		protected override async Task Given() {
-			await base.Given();
-			//find the leader node
-			for (int i = 0; i < _nodes.Length; i++) {
-				if (_nodes[i].NodeState == EventStore.Core.Data.VNodeState.Leader) {
-					_leaderId = i;
-					break;
-				}
-			}
-
-			_httpClients["Admin"] = CreateHttpClient("admin", "changeit");
-			_httpClients["Ops"] = CreateHttpClient("ops", "changeit");
-			await CreateUser("user", "changeit");
-			_httpClients["User"] = CreateHttpClient("user", "changeit");
-			_httpClients["None"] = CreateHttpClient(null, null);
-		}
-
-		[OneTimeTearDown]
-		public override Task TestFixtureTearDown() {
-			foreach (var kvp in _httpClients) {
-				kvp.Value.Dispose();
-			}
-			return base.TestFixtureTearDown();
-		}
-		//just using Ignore not being honored for Combinatorial tests in the dotnet test runner
-		//[Test, Combinatorial, Ignore("Invalid URl templates, retained for future refactoring")]
-		public async Task authorization_tests(
-			[Values(
-				"None",
-				"User",
-				"Ops",
-				"Admin"
-			)] string userAuthorizationLevel,
-			[Values(
-				"/web/es/js/projections/{*remaining_path};GET;None",
-				"/web/es/js/projections/v8/Prelude/{*remaining_path};GET;None",
-				"/web/projections;GET;None",
-				"/projections;GET;User",
-				"/projections/any;GET;User",
-				"/projections/all-non-transient;GET;User",
-				"/projections/transient;GET;User",
-				"/projections/onetime;GET;User",
-				"/projections/continuous;GET;User",
-				"/projections/transient?name=name&type=type&enabled={enabled};POST;User", /* /projections/transient?name={name}&type={type}&enabled={enabled} */
-				"/projections/onetime?name=name&type=type&enabled={enabled}&checkpoints={checkpoints}&emit={emit}&trackemittedstreams={trackemittedstreams};POST;Ops", /* /projections/onetime?name={name}&type={type}&enabled={enabled}&checkpoints={checkpoints}&emit={emit}&trackemittedstreams={trackemittedstreams} */
-				"/projections/continuous?name=name&type=type&enabled={enabled}&emit={emit}&trackemittedstreams={trackemittedstreams};POST;Ops", /* /projections/continuous?name={name}&type={type}&enabled={enabled}&emit={emit}&trackemittedstreams={trackemittedstreams} */
-				"/projection/name/query?config={config};GET;User", /* /projection/{name}/query?config={config} */
-				"/projection/name/query?type={type}&emit={emit};PUT;User", /* /projection/{name}/query?type={type}&emit={emit} */
-				"/projection/name;GET;User", /* /projection/{name} */
-				"/projection/name?deleteStateStream={deleteStateStream}&deleteCheckpointStream={deleteCheckpointStream}&deleteEmittedStreams={deleteEmittedStreams};DELETE;Ops", /* /projection/{name}?deleteStateStream={deleteStateStream}&deleteCheckpointStream={deleteCheckpointStream}&deleteEmittedStreams={deleteEmittedStreams} */
-				"/projection/name/statistics;GET;User", /* projection/{name}/statistics */
-				"/projections/read-events;POST;User",
-				"/projection/{name}/state?partition={partition};GET;User",
-				"/projection/{name}/result?partition={partition};GET;User",
-				"/projection/{name}/command/disable?enableRunAs={enableRunAs};POST;User",
-				"/projection/{name}/command/enable?enableRunAs={enableRunAs};POST;User",
-				"/projection/{name}/command/reset?enableRunAs={enableRunAs};POST;User",
-				"/projection/{name}/command/abort?enableRunAs={enableRunAs};POST;User",
-				"/projection/{name}/config;GET;Ops",
-				"/projection/{name}/config;PUT;Ops"
-				/*"/sys/subsystems;GET;Ops"*/ /* this endpoint has been commented since this controller is not registered when using a MiniNode */
-			)] string httpEndpointDetails
-		) {
-			/*use the leader node endpoint to avoid any redirects*/
-			var nodeEndpoint = _nodes[_leaderId].HttpEndPoint;
-			var httpEndpointTokens = httpEndpointDetails.Split(';');
-			var endpointUrl = httpEndpointTokens[0];
-			var httpMethod = GetHttpMethod(httpEndpointTokens[1]);
-			var requiredMinAuthorizationLevel = httpEndpointTokens[2];
-
-			var url = $"http://{nodeEndpoint}{endpointUrl}";
-			var body = GetData(httpMethod, endpointUrl);
-			var contentType = httpMethod == HttpMethod.Post || httpMethod == HttpMethod.Put || httpMethod == HttpMethod.Delete ? "application/json" : null;
-			var statusCode = await SendRequest(_httpClients[userAuthorizationLevel], httpMethod, url, body, contentType);
-
-			if (GetAuthLevel(userAuthorizationLevel) >= GetAuthLevel(requiredMinAuthorizationLevel)) {
-				Assert.AreNotEqual(401, statusCode);
-			} else {
-				Assert.AreEqual(401, statusCode);
-			}
-		}
-
-		private string GetData(HttpMethod httpMethod, string url) {
-			if (httpMethod == HttpMethod.Post || httpMethod == HttpMethod.Put || httpMethod == HttpMethod.Delete) {
-				return "{}";
-			} else {
-				return null;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/mixed_checkpoint_tags.cs b/src/EventStore.Projections.Core.Tests/Services/mixed_checkpoint_tags.cs
deleted file mode 100644
index d8054f16614..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/mixed_checkpoint_tags.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services {
-	[TestFixture]
-	public class mixed_checkpoint_tags {
-		private readonly CheckpointTag _a = CheckpointTag.FromStreamPosition(0, "stream1", 9);
-		private readonly CheckpointTag _b = CheckpointTag.FromStreamPosition(0, "stream2", 15);
-		private readonly CheckpointTag _c = CheckpointTag.FromPosition(0, 50, 29);
-
-		[Test]
-		public void are_not_equal() {
-			Assert.AreNotEqual(_a, _b);
-			Assert.AreNotEqual(_a, _c);
-			Assert.AreNotEqual(_b, _c);
-
-			Assert.IsTrue(_a != _b);
-			Assert.IsTrue(_a != _c);
-			Assert.IsTrue(_b != _c);
-		}
-
-		[Test]
-		public void cannot_be_compared() {
-			Assert.IsTrue(throws(() => _a > _b));
-			Assert.IsTrue(throws(() => _a >= _b));
-			Assert.IsTrue(throws(() => _a > _c));
-			Assert.IsTrue(throws(() => _a >= _c));
-			Assert.IsTrue(throws(() => _b > _c));
-			Assert.IsTrue(throws(() => _b >= _c));
-			Assert.IsTrue(throws(() => _a < _b));
-			Assert.IsTrue(throws(() => _a <= _b));
-			Assert.IsTrue(throws(() => _a < _c));
-			Assert.IsTrue(throws(() => _a <= _c));
-			Assert.IsTrue(throws(() => _b < _c));
-			Assert.IsTrue(throws(() => _b <= _c));
-		}
-
-		private bool throws(Func<bool> func) {
-			try {
-				func();
-				return false;
-			} catch (Exception) {
-				return true;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/not_started_event_distribution_point_should.cs b/src/EventStore.Projections.Core.Tests/Services/not_started_event_distribution_point_should.cs
deleted file mode 100644
index 8b137891791..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/not_started_event_distribution_point_should.cs
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/EventStore.Projections.Core.Tests/Services/partition_state/partition_state.cs b/src/EventStore.Projections.Core.Tests/Services/partition_state/partition_state.cs
deleted file mode 100644
index 0707964ada7..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/partition_state/partition_state.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.partition_state {
-	public static class partition_state {
-		[TestFixture]
-		public class when_creating {
-			[Test]
-			public void throws_argument_null_exception_if_state_is_null() {
-				Assert.Throws<ArgumentNullException>(() => {
-					new PartitionState(null, "result", CheckpointTag.FromPosition(0, 100, 50));
-				});
-			}
-
-			[Test]
-			public void throws_argument_null_exception_if_caused_by_is_null() {
-				Assert.Throws<ArgumentNullException>(() => { new PartitionState("state", "result", null); });
-			}
-
-			[Test]
-			public void can_be_created() {
-				new PartitionState("state", "result", CheckpointTag.FromPosition(0, 100, 50));
-			}
-		}
-
-		[TestFixture]
-		public class can_be_deserialized_from_serialized_form {
-			[Test]
-			public void simple_object() {
-				AssertCorrect(@"");
-				AssertCorrect(@"{""a"":""b""}");
-				AssertCorrect(@"{""a"":""b"",""c"":1}");
-				AssertCorrect(@"{""z"":null,""a"":""b"",""c"":1}");
-			}
-
-			[Test]
-			public void complex_object() {
-				AssertCorrect(@"{""a"":""b"",""c"":[1,2,3]}");
-				AssertCorrect(@"{""a"":""b"",""c"":{""a"":""b""}}");
-				AssertCorrect(@"{""a"":""b"",""c"":[{},[],null]}");
-			}
-
-			[Test]
-			public void array() {
-				AssertCorrect(@"[]");
-				AssertCorrect(@"[""one"",""two""]");
-				AssertCorrect(@"[{""data"":{}}]");
-			}
-
-			[Test]
-			public void dates() {
-				foreach(var info in TimeZoneInfo.GetSystemTimeZones())
-					AssertCorrect($@"[""{DateTimeOffset.UtcNow.ToOffset(info.BaseUtcOffset):yyyy-MM-ddThh:mm:sszzz}""]");
-			}
-
-			[Test]
-			public void null_deserialization() {
-				var deserialized = PartitionState.Deserialize(null, CheckpointTag.FromPosition(0, 100, 50));
-				Assert.AreEqual("", deserialized.State);
-				Assert.IsNull(deserialized.Result);
-			}
-
-			private void AssertCorrect(string state, string result = null) {
-				var partitionState = new PartitionState(state, result, CheckpointTag.FromPosition(0, 100, 50));
-				var serialized = partitionState.Serialize();
-				var deserialized = PartitionState.Deserialize(serialized, CheckpointTag.FromPosition(0, 100, 50));
-
-				Assert.AreEqual(partitionState.State, deserialized.State);
-				Assert.AreEqual(partitionState.Result, deserialized.Result);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_caching_a_parition_state.cs b/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_caching_a_parition_state.cs
deleted file mode 100644
index 4010a9cf9b7..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_caching_a_parition_state.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.partition_state_cache {
-	[TestFixture]
-	public class when_caching_a_parition_state {
-		private PartitionStateCache _cache;
-		private CheckpointTag _cachedAtCheckpointTag;
-
-		[SetUp]
-		public void when() {
-			_cache = new PartitionStateCache();
-			_cachedAtCheckpointTag = CheckpointTag.FromPosition(0, 1000, 900);
-			_cache.CachePartitionState(
-				"partition", new PartitionState("data", null, _cachedAtCheckpointTag));
-		}
-
-		[Test]
-		public void the_state_cannot_be_retrieved_as_locked() {
-			Assert.Throws<InvalidOperationException>(() => {
-				var state = _cache.GetLockedPartitionState("partition");
-				Assert.AreEqual("data", state.State);
-			});
-		}
-
-		[Test]
-		public void the_state_can_be_retrieved() {
-			var state = _cache.TryGetPartitionState("partition");
-			Assert.AreEqual("data", state.State);
-		}
-
-		[Test]
-		public void the_state_can_be_retrieved_as_unlocked_and_relocked_at_later_position() {
-			var state = _cache.TryGetAndLockPartitionState("partition", CheckpointTag.FromPosition(0, 1500, 1400));
-			Assert.AreEqual("data", state.State);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_caching_a_parition_state_as_locked.cs b/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_caching_a_parition_state_as_locked.cs
deleted file mode 100644
index bf1c38136dd..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_caching_a_parition_state_as_locked.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.partition_state_cache {
-	[TestFixture]
-	public class when_caching_a_parition_state_as_locked {
-		private PartitionStateCache _cache;
-		private CheckpointTag _cachedAtCheckpointTag;
-
-		[SetUp]
-		public void when() {
-			_cache = new PartitionStateCache();
-			_cachedAtCheckpointTag = CheckpointTag.FromPosition(0, 1000, 900);
-			_cache.CacheAndLockPartitionState("partition", new PartitionState("data", null, _cachedAtCheckpointTag),
-				_cachedAtCheckpointTag);
-		}
-
-		[Test]
-		public void the_state_can_be_retrieved_as_locked() {
-			var state = _cache.GetLockedPartitionState("partition");
-			Assert.AreEqual("data", state.State);
-		}
-
-		[Test]
-		public void the_state_can_be_retrieved() {
-			var state = _cache.TryGetPartitionState("partition");
-			Assert.AreEqual("data", state.State);
-		}
-
-		[Test]
-		public void the_state_can_be_retrieved_as_unlocked_and_relocked_at_later_position() {
-			var state = _cache.TryGetAndLockPartitionState("partition", CheckpointTag.FromPosition(0, 1500, 1400));
-			Assert.AreEqual("data", state.State);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_relocking_the_state_at_earlier_position.cs b/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_relocking_the_state_at_earlier_position.cs
deleted file mode 100644
index 6ce6be7d48f..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_relocking_the_state_at_earlier_position.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.partition_state_cache {
-	[TestFixture]
-	public class when_relocking_the_state_at_earlier_position {
-		private PartitionStateCache _cache;
-		private CheckpointTag _cachedAtCheckpointTag;
-
-		[SetUp]
-		public void given() {
-			//given
-			_cache = new PartitionStateCache();
-			_cachedAtCheckpointTag = CheckpointTag.FromPosition(0, 1000, 900);
-			_cache.CacheAndLockPartitionState("partition", new PartitionState("data", null, _cachedAtCheckpointTag),
-				_cachedAtCheckpointTag);
-		}
-
-		[Test]
-		public void thorws_invalid_operation_exception() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_cache.TryGetAndLockPartitionState("partition", CheckpointTag.FromPosition(0, 500, 400));
-			});
-		}
-
-		[Test]
-		public void the_state_can_be_retrieved() {
-			var state = _cache.TryGetPartitionState("partition");
-			Assert.AreEqual("data", state.State);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_relocking_the_state_at_later_position.cs b/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_relocking_the_state_at_later_position.cs
deleted file mode 100644
index 9425d3811dc..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_relocking_the_state_at_later_position.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.partition_state_cache {
-	[TestFixture]
-	public class when_relocking_the_state_at_later_position {
-		private PartitionStateCache _cache;
-		private CheckpointTag _cachedAtCheckpointTag;
-		private PartitionState _relockedData;
-
-		[SetUp]
-		public void given() {
-			//given
-			_cache = new PartitionStateCache();
-			_cachedAtCheckpointTag = CheckpointTag.FromPosition(0, 1000, 900);
-			_cache.CacheAndLockPartitionState("partition", new PartitionState("data", null, _cachedAtCheckpointTag),
-				_cachedAtCheckpointTag);
-			_relockedData = _cache.TryGetAndLockPartitionState("partition", CheckpointTag.FromPosition(0, 2000, 1900));
-		}
-
-		[Test]
-		public void returns_correct_cached_data() {
-			Assert.AreEqual("data", _relockedData.State);
-		}
-
-		[Test]
-		public void relocked_state_can_be_retrieved_as_locked() {
-			var state = _cache.GetLockedPartitionState("partition");
-			Assert.AreEqual("data", state.State);
-		}
-
-		[Test]
-		public void cannot_be_relocked_at_the_previous_position() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_cache.TryGetAndLockPartitionState("partition", _cachedAtCheckpointTag);
-			});
-		}
-
-		[Test]
-		public void the_state_can_be_retrieved() {
-			var state = _cache.TryGetPartitionState("partition");
-			Assert.AreEqual("data", state.State);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_relocking_the_state_at_the_same_position.cs b/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_relocking_the_state_at_the_same_position.cs
deleted file mode 100644
index e5d525328b1..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_relocking_the_state_at_the_same_position.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.partition_state_cache {
-	[TestFixture]
-	public class when_relocking_the_state_at_the_same_position {
-		private PartitionStateCache _cache;
-		private CheckpointTag _cachedAtCheckpointTag;
-
-		[SetUp]
-		public void given() {
-			//given
-			_cache = new PartitionStateCache();
-			_cachedAtCheckpointTag = CheckpointTag.FromPosition(0, 1000, 900);
-			_cache.CacheAndLockPartitionState("partition", new PartitionState("data", null, _cachedAtCheckpointTag),
-				_cachedAtCheckpointTag);
-		}
-
-		[Test]
-		public void thorws_invalid_operation_exception_if_not_allowed() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_cache.TryGetAndLockPartitionState("partition", CheckpointTag.FromPosition(0, 1000, 900));
-			});
-		}
-
-		[Test]
-		public void the_state_can_be_retrieved() {
-			var state = _cache.TryGetPartitionState("partition");
-			Assert.AreEqual("data", state.State);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_the_partition_state_cache_has_been_created.cs b/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_the_partition_state_cache_has_been_created.cs
deleted file mode 100644
index 83e566ae7b3..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_the_partition_state_cache_has_been_created.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.partition_state_cache {
-	[TestFixture]
-	public class when_the_partition_state_cache_has_been_created {
-		private PartitionStateCache _cache;
-		private Exception _exception;
-
-		[SetUp]
-		public void when() {
-			try {
-				_cache = new PartitionStateCache();
-			} catch (Exception ex) {
-				_exception = ex;
-			}
-		}
-
-		[Test]
-		public void it_has_been_created() {
-			Assert.IsNotNull(_cache, ((object)_exception ?? "").ToString());
-		}
-
-		[Test]
-		public void state_can_be_cached() {
-			CheckpointTag at = CheckpointTag.FromPosition(0, 100, 90);
-			_cache.CacheAndLockPartitionState("partition", new PartitionState("data", null, at), at);
-		}
-
-		[Test]
-		public void no_items_are_cached() {
-			Assert.AreEqual(0, _cache.CachedItemCount);
-		}
-
-		[Test]
-		public void random_item_cannot_be_retrieved_as_locked() {
-			Assert.IsNull(
-				_cache.TryGetAndLockPartitionState(
-					"random", CheckpointTag.FromPosition(0, 200, 190)),
-				"Cache should be empty");
-		}
-
-		[Test]
-		public void random_item_cannot_be_retrieved() {
-			Assert.IsNull(_cache.TryGetPartitionState("random"), "Cache should be empty");
-		}
-
-		[Test]
-		public void root_partition_state_cannot_be_retrieved() {
-			Assert.IsNull(
-				_cache.TryGetAndLockPartitionState(
-					"", CheckpointTag.FromPosition(0, 200, 190)),
-				"Cache should be empty");
-		}
-
-		[Test]
-		public void unlock_succeeds() {
-			_cache.Unlock(CheckpointTag.FromPosition(0, 300, 290));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_the_partition_state_cache_has_been_reinitialized.cs b/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_the_partition_state_cache_has_been_reinitialized.cs
deleted file mode 100644
index 6d59659e9df..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_the_partition_state_cache_has_been_reinitialized.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.partition_state_cache {
-	[TestFixture]
-	public class when_the_partition_state_cache_has_been_reinitialized {
-		private PartitionStateCache _cache;
-		private CheckpointTag _cachedAtCheckpointTag1;
-		private CheckpointTag _cachedAtCheckpointTag2;
-		private CheckpointTag _cachedAtCheckpointTag3;
-
-		[SetUp]
-		public void setup() {
-			//given
-			_cache = new PartitionStateCache(10);
-			_cachedAtCheckpointTag1 = CheckpointTag.FromPosition(0, 1000, 900);
-			for (var i = 0; i < 15; i++) {
-				CheckpointTag at = CheckpointTag.FromPosition(0, 1000 + (i * 100), 1000 + (i * 100) - 50);
-				_cache.CacheAndLockPartitionState("partition1", new PartitionState("data1", null, at), at);
-			}
-
-			_cachedAtCheckpointTag2 = CheckpointTag.FromPosition(0, 20100, 20050);
-			_cachedAtCheckpointTag3 = CheckpointTag.FromPosition(0, 20200, 20150);
-			_cache.CacheAndLockPartitionState(
-				"partition1", new PartitionState("data1", null, _cachedAtCheckpointTag1), _cachedAtCheckpointTag1);
-			_cache.CacheAndLockPartitionState(
-				"partition2", new PartitionState("data2", null, _cachedAtCheckpointTag2), _cachedAtCheckpointTag2);
-			_cache.CacheAndLockPartitionState(
-				"partition3", new PartitionState("data3", null, _cachedAtCheckpointTag3), _cachedAtCheckpointTag3);
-			_cache.Unlock(_cachedAtCheckpointTag2);
-			// when
-			_cache.Initialize();
-		}
-
-		[Test]
-		public void state_can_be_cached() {
-			CheckpointTag at = CheckpointTag.FromPosition(0, 100, 90);
-			_cache.CacheAndLockPartitionState("partition", new PartitionState("data", null, at), at);
-		}
-
-		[Test]
-		public void no_items_are_cached() {
-			Assert.AreEqual(0, _cache.CachedItemCount);
-		}
-
-		[Test]
-		public void random_item_cannot_be_retrieved_as_locked() {
-			Assert.IsNull(
-				_cache.TryGetAndLockPartitionState(
-					"random", CheckpointTag.FromPosition(0, 200, 190)),
-				"Cache should be empty");
-		}
-
-		[Test]
-		public void random_item_cannot_be_retrieved() {
-			Assert.IsNull(_cache.TryGetPartitionState("random"), "Cache should be empty");
-		}
-
-		[Test]
-		public void root_partition_state_cannot_be_retrieved() {
-			Assert.IsNull(
-				_cache.TryGetAndLockPartitionState(
-					"", CheckpointTag.FromPosition(0, 200, 190)),
-				"Cache should be empty");
-		}
-
-		[Test]
-		public void unlock_succeeds() {
-			_cache.Unlock(CheckpointTag.FromPosition(0, 300, 290));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_unlocking_an_overflowed_cache.cs b/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_unlocking_an_overflowed_cache.cs
deleted file mode 100644
index 96bc087d54c..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_unlocking_an_overflowed_cache.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.partition_state_cache {
-	[TestFixture]
-	public class when_unlocking_an_overflowed_cache {
-		private PartitionStateCache _cache;
-		private CheckpointTag _cachedAtCheckpointTag1;
-		private CheckpointTag _cachedAtCheckpointTag2;
-		private CheckpointTag _cachedAtCheckpointTag3;
-
-		[SetUp]
-		public void setup() {
-			//given
-			_cache = new PartitionStateCache(10);
-			_cachedAtCheckpointTag1 = CheckpointTag.FromPosition(0, 1000, 900);
-			for (var i = 0; i < 15; i++) {
-				CheckpointTag at = CheckpointTag.FromPosition(0, 1000 + (i * 100), 1000 + (i * 100) - 50);
-				_cache.CacheAndLockPartitionState("partition1", new PartitionState("data1", null, at), at);
-			}
-
-			_cachedAtCheckpointTag2 = CheckpointTag.FromPosition(0, 20100, 20050);
-			_cachedAtCheckpointTag3 = CheckpointTag.FromPosition(0, 20200, 20150);
-			_cache.CacheAndLockPartitionState(
-				"partition1", new PartitionState("data1", null, _cachedAtCheckpointTag1), _cachedAtCheckpointTag1);
-			_cache.CacheAndLockPartitionState(
-				"partition2", new PartitionState("data2", null, _cachedAtCheckpointTag2), _cachedAtCheckpointTag2);
-			_cache.CacheAndLockPartitionState(
-				"partition3", new PartitionState("data3", null, _cachedAtCheckpointTag3), _cachedAtCheckpointTag3);
-			// when
-			_cache.Unlock(_cachedAtCheckpointTag2);
-		}
-
-		[Test]
-		public void partitions_locked_before_the_unlock_position_cannot_be_retrieved_as_locked() {
-			Assert.Throws<InvalidOperationException>(() => { _cache.GetLockedPartitionState("partition1"); });
-		}
-
-		[Test]
-		public void
-			the_first_partition_locked_before_the_unlock_position_cannot_be_retrieved_and_relocked_at_later_position() {
-			var data = _cache.TryGetAndLockPartitionState(
-				"partition1", CheckpointTag.FromPosition(0, 25000, 24000));
-			Assert.AreEqual("data1", data.State);
-		}
-
-		[Test]
-		public void partitions_locked_at_the_unlock_position_cannot_be_retrieved_as_locked() {
-			Assert.Throws<InvalidOperationException>(() => { _cache.GetLockedPartitionState("partition2"); });
-		}
-
-		[Test]
-		public void the_still_cached_unlocked_state_can_be_retrieved() {
-			var state = _cache.TryGetPartitionState("partition2");
-			Assert.AreEqual("data2", state.State);
-		}
-
-		[Test]
-		public void partitions_locked_at_the_unlock_position_can_be_retrieved_and_relocked_at_later_position() {
-			var data = _cache.TryGetAndLockPartitionState(
-				"partition2", CheckpointTag.FromPosition(0, 25000, 24000));
-			Assert.AreEqual("data2", data.State);
-		}
-
-		[Test]
-		public void partitions_locked_after_the_unlock_position_can_be_retrieved_as_locked() {
-			var data = _cache.GetLockedPartitionState("partition3");
-			Assert.AreEqual("data3", data.State);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_unlocking_and_forgetting_part_of_cached_states.cs b/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_unlocking_and_forgetting_part_of_cached_states.cs
deleted file mode 100644
index 13f016e4b03..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_unlocking_and_forgetting_part_of_cached_states.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.partition_state_cache {
-	[TestFixture]
-	public class when_unlocking_and_forgetting_part_of_cached_states {
-		private PartitionStateCache _cache;
-		private CheckpointTag _cachedAtCheckpointTag1;
-		private CheckpointTag _cachedAtCheckpointTag2;
-		private CheckpointTag _cachedAtCheckpointTag3;
-
-		[SetUp]
-		public void setup() {
-			//given
-			_cache = new PartitionStateCache();
-			_cachedAtCheckpointTag1 = CheckpointTag.FromPosition(0, 1000, 900);
-			_cachedAtCheckpointTag2 = CheckpointTag.FromPosition(0, 1200, 1100);
-			_cachedAtCheckpointTag3 = CheckpointTag.FromPosition(0, 1400, 1300);
-			_cache.CacheAndLockPartitionState(
-				"partition1", new PartitionState("data1", null, _cachedAtCheckpointTag1), _cachedAtCheckpointTag1);
-			_cache.CacheAndLockPartitionState(
-				"partition2", new PartitionState("data2", null, _cachedAtCheckpointTag2), _cachedAtCheckpointTag2);
-			_cache.CacheAndLockPartitionState(
-				"partition3", new PartitionState("data3", null, _cachedAtCheckpointTag3), _cachedAtCheckpointTag3);
-			// when
-			_cache.Unlock(_cachedAtCheckpointTag2, forgetUnlocked: true);
-		}
-
-		[Test]
-		public void partitions_locked_before_the_unlock_position_cannot_be_retrieved_as_locked() {
-			Assert.Throws<InvalidOperationException>(() => { _cache.GetLockedPartitionState("partition1"); });
-		}
-
-		[Test]
-		public void partitions_locked_before_the_unlock_position_cannot_be_retrieved_and_relocked_at_later_position() {
-			var data = _cache.TryGetAndLockPartitionState("partition1", CheckpointTag.FromPosition(0, 1600, 1500));
-			Assert.IsNull(data);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_unlocking_part_of_cached_states.cs b/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_unlocking_part_of_cached_states.cs
deleted file mode 100644
index 4b4d06c8203..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/partition_state_cache/when_unlocking_part_of_cached_states.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.partition_state_cache {
-	[TestFixture]
-	public class when_unlocking_part_of_cached_states {
-		private PartitionStateCache _cache;
-		private CheckpointTag _cachedAtCheckpointTag1;
-		private CheckpointTag _cachedAtCheckpointTag2;
-		private CheckpointTag _cachedAtCheckpointTag3;
-
-		[SetUp]
-		public void setup() {
-			//given
-			_cache = new PartitionStateCache();
-			_cachedAtCheckpointTag1 = CheckpointTag.FromPosition(0, 1000, 900);
-			_cachedAtCheckpointTag2 = CheckpointTag.FromPosition(0, 1200, 1100);
-			_cachedAtCheckpointTag3 = CheckpointTag.FromPosition(0, 1400, 1300);
-			_cache.CacheAndLockPartitionState(
-				"partition1", new PartitionState("data1", null, _cachedAtCheckpointTag1), _cachedAtCheckpointTag1);
-			_cache.CacheAndLockPartitionState(
-				"partition2", new PartitionState("data2", null, _cachedAtCheckpointTag2), _cachedAtCheckpointTag2);
-			_cache.CacheAndLockPartitionState(
-				"partition3", new PartitionState("data3", null, _cachedAtCheckpointTag3), _cachedAtCheckpointTag3);
-			// when
-			_cache.Unlock(_cachedAtCheckpointTag2);
-		}
-
-		[Test]
-		public void partitions_locked_before_the_unlock_position_cannot_be_retrieved_as_locked() {
-			Assert.Throws<InvalidOperationException>(() => { _cache.GetLockedPartitionState("partition1"); });
-		}
-
-		[Test]
-		public void partitions_locked_before_the_unlock_position_can_be_retrieved_and_relocked_at_later_position() {
-			var data = _cache.TryGetAndLockPartitionState(
-				"partition1", CheckpointTag.FromPosition(0, 1600, 1500));
-			Assert.AreEqual("data1", data.State);
-		}
-
-
-		[Test]
-		public void partitions_locked_at_the_unlock_position_cannot_be_retrieved_as_locked() {
-			Assert.Throws<InvalidOperationException>(() => { _cache.GetLockedPartitionState("partition2"); });
-		}
-
-		[Test]
-		public void partitions_locked_at_the_unlock_position_cannot_be_retrieved_as_relocked_at_later_position() {
-			var data = _cache.TryGetAndLockPartitionState(
-				"partition2", CheckpointTag.FromPosition(0, 1600, 1500));
-			Assert.AreEqual("data2", data.State);
-		}
-
-		[Test]
-		public void partitions_locked_after_the_unlock_position_can_be_retrieved_as_locked() {
-			var data = _cache.GetLockedPartitionState("partition3");
-			Assert.AreEqual("data3", data.State);
-		}
-
-		[Test]
-		public void no_other_partition_states_can_be_locked_before_the_unlock_position() {
-			Assert.Throws<InvalidOperationException>(() => {
-				CheckpointTag at = CheckpointTag.FromPosition(0, 1040, 1030);
-				_cache.CacheAndLockPartitionState("partition4", new PartitionState("data4", null, at), at);
-			});
-		}
-
-		[Test]
-		public void cached_partition_states_cannot_be_locked_before_the_unlock_position() {
-			Assert.Throws<InvalidOperationException>(() => {
-				_cache.TryGetAndLockPartitionState(
-					"partition1", CheckpointTag.FromPosition(0, 1040, 1030));
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/partition_state_update_manager/FakeEventWriter.cs b/src/EventStore.Projections.Core.Tests/Services/partition_state_update_manager/FakeEventWriter.cs
deleted file mode 100644
index 0f8b5da534d..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/partition_state_update_manager/FakeEventWriter.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Tests.Services.partition_state_update_manager {
-	class FakeEventWriter : IEventWriter {
-		private readonly List<EmittedEvent[]> _writes = new List<EmittedEvent[]>();
-
-		public List<EmittedEvent[]> Writes {
-			get { return _writes; }
-		}
-
-		public void ValidateOrderAndEmitEvents(EmittedEventEnvelope[] events) {
-			Writes.Add(events.Select(v => v.Event).ToArray());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/partition_state_update_manager/when_created.cs b/src/EventStore.Projections.Core.Tests/Services/partition_state_update_manager/when_created.cs
deleted file mode 100644
index e715181ec01..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/partition_state_update_manager/when_created.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.partition_state_update_manager {
-	[TestFixture]
-	public class when_created {
-		private PartitionStateUpdateManager _updateManager;
-
-		[SetUp]
-		public void setup() {
-			_updateManager = new PartitionStateUpdateManager(ProjectionNamesBuilder.CreateForTest("projection"));
-		}
-
-		[Test]
-		public void handles_state_updated() {
-			_updateManager.StateUpdated("partition",
-				new PartitionState("state", null, CheckpointTag.FromPosition(0, 100, 50)),
-				CheckpointTag.FromPosition(0, 200, 150));
-		}
-
-		[Test]
-		public void emit_events_does_not_write_any_events() {
-			_updateManager.EmitEvents(new FakeEventWriter());
-		}
-
-		class FakeEventWriter : IEventWriter {
-			public void ValidateOrderAndEmitEvents(EmittedEventEnvelope[] events) {
-				Assert.Fail("Should not write any events");
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/partition_state_update_manager/when_creating.cs b/src/EventStore.Projections.Core.Tests/Services/partition_state_update_manager/when_creating.cs
deleted file mode 100644
index 8d798cc3ee5..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/partition_state_update_manager/when_creating.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.partition_state_update_manager {
-	[TestFixture]
-	public class when_creating {
-		[Test]
-		public void no_exceptions_are_thrown() {
-			new PartitionStateUpdateManager(ProjectionNamesBuilder.CreateForTest("projection"));
-		}
-
-		[Test]
-		public void null_naming_builder_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => { new PartitionStateUpdateManager(null); });
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/partition_state_update_manager/when_state_updated.cs b/src/EventStore.Projections.Core.Tests/Services/partition_state_update_manager/when_state_updated.cs
deleted file mode 100644
index 52aab76009e..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/partition_state_update_manager/when_state_updated.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System.Text;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.partition_state_update_manager {
-	[TestFixture]
-	public class when_state_updated {
-		private PartitionStateUpdateManager _updateManager;
-		private CheckpointTag _zero = CheckpointTag.FromPosition(0, 100, 50);
-		private CheckpointTag _one = CheckpointTag.FromPosition(0, 200, 150);
-		private CheckpointTag _two = CheckpointTag.FromPosition(0, 300, 250);
-
-		[SetUp]
-		public void setup() {
-			_updateManager = new PartitionStateUpdateManager(ProjectionNamesBuilder.CreateForTest("projection"));
-			_updateManager.StateUpdated("partition", new PartitionState("{\"state\":1}", null, _one), _zero);
-		}
-
-		[Test]
-		public void handles_state_updated_for_the_same_partition() {
-			_updateManager.StateUpdated("partition", new PartitionState("{\"state\":1}", null, _two), _one);
-		}
-
-		[Test]
-		public void handles_state_updated_for_another_partition() {
-			_updateManager.StateUpdated("partition", new PartitionState("{\"state\":1}", null, _two), _one);
-		}
-
-		[Test]
-		public void emit_events_writes_single_state_updated_event() {
-			var eventWriter = new FakeEventWriter();
-			_updateManager.EmitEvents(eventWriter);
-			Assert.AreEqual(1, eventWriter.Writes.Count);
-			Assert.AreEqual(1, eventWriter.Writes[0].Length);
-		}
-
-		[Test]
-		public void emit_events_writes_correct_state_data() {
-			var eventWriter = new FakeEventWriter();
-			_updateManager.EmitEvents(eventWriter);
-			EmittedEvent @event = eventWriter.Writes[0][0];
-			Assert.AreEqual("[{\"state\":1}]", @event.Data);
-		}
-
-		[Test]
-		public void emit_events_writes_event_with_correct_caused_by_tag() {
-			var eventWriter = new FakeEventWriter();
-			_updateManager.EmitEvents(eventWriter);
-			EmittedEvent @event = eventWriter.Writes[0][0];
-			Assert.AreEqual(_one, @event.CausedByTag);
-		}
-
-		[Test]
-		public void emit_events_writes_event_with_correct_expected_tag() {
-			var eventWriter = new FakeEventWriter();
-			_updateManager.EmitEvents(eventWriter);
-			EmittedEvent @event = eventWriter.Writes[0][0];
-			Assert.AreEqual(_zero, @event.ExpectedTag);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/partition_state_update_manager/when_state_updated_twice.cs b/src/EventStore.Projections.Core.Tests/Services/partition_state_update_manager/when_state_updated_twice.cs
deleted file mode 100644
index 041db1e1eff..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/partition_state_update_manager/when_state_updated_twice.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System.Text;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.partition_state_update_manager {
-	[TestFixture]
-	public class when_state_updated_twice {
-		private PartitionStateUpdateManager _updateManager;
-		private CheckpointTag _zero = CheckpointTag.FromPosition(0, 100, 50);
-		private CheckpointTag _one = CheckpointTag.FromPosition(0, 200, 150);
-		private CheckpointTag _two = CheckpointTag.FromPosition(0, 300, 250);
-		private CheckpointTag _three = CheckpointTag.FromPosition(0, 400, 350);
-
-		[SetUp]
-		public void setup() {
-			_updateManager = new PartitionStateUpdateManager(ProjectionNamesBuilder.CreateForTest("projection"));
-			_updateManager.StateUpdated("partition", new PartitionState("{\"state\":1}", null, _one), _zero);
-			_updateManager.StateUpdated("partition", new PartitionState("{\"state\":2}", null, _two), _one);
-		}
-
-		[Test]
-		public void handles_state_updated_for_the_same_partition() {
-			_updateManager.StateUpdated("partition", new PartitionState("{\"state\":1}", null, _three), _two);
-		}
-
-		[Test]
-		public void handles_state_updated_for_another_partition() {
-			_updateManager.StateUpdated("partition", new PartitionState("{\"state\":1}", null, _three), _two);
-		}
-
-		[Test]
-		public void emit_events_writes_single_state_updated_event() {
-			var eventWriter = new FakeEventWriter();
-			_updateManager.EmitEvents(eventWriter);
-			Assert.AreEqual(1, eventWriter.Writes.Count);
-			Assert.AreEqual(1, eventWriter.Writes[0].Length);
-		}
-
-		[Test]
-		public void emit_events_writes_correct_state_data() {
-			var eventWriter = new FakeEventWriter();
-			_updateManager.EmitEvents(eventWriter);
-			EmittedEvent @event = eventWriter.Writes[0][0];
-			Assert.AreEqual("[{\"state\":2}]", @event.Data);
-		}
-
-		[Test]
-		public void emit_events_writes_event_with_correct_caused_by_tag() {
-			var eventWriter = new FakeEventWriter();
-			_updateManager.EmitEvents(eventWriter);
-			EmittedEvent @event = eventWriter.Writes[0][0];
-			Assert.AreEqual(_two, @event.CausedByTag);
-		}
-
-		[Test]
-		public void emit_events_writes_event_with_correct_expected_tag() {
-			var eventWriter = new FakeEventWriter();
-			_updateManager.EmitEvents(eventWriter);
-			EmittedEvent @event = eventWriter.Writes[0][0];
-			Assert.AreEqual(_zero, @event.ExpectedTag);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/partition_state_update_manager/when_two_states_were_updated.cs b/src/EventStore.Projections.Core.Tests/Services/partition_state_update_manager/when_two_states_were_updated.cs
deleted file mode 100644
index 8974679241c..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/partition_state_update_manager/when_two_states_were_updated.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using System.Linq;
-using System.Text;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.partition_state_update_manager {
-	[TestFixture]
-	public class when_two_states_were_updated {
-		private PartitionStateUpdateManager _updateManager;
-		private readonly CheckpointTag _zero = CheckpointTag.FromPosition(0, 100, 50);
-		private readonly CheckpointTag _one = CheckpointTag.FromPosition(0, 200, 150);
-		private readonly CheckpointTag _two = CheckpointTag.FromPosition(0, 300, 250);
-		private readonly CheckpointTag _three = CheckpointTag.FromPosition(0, 400, 350);
-
-		[SetUp]
-		public void setup() {
-			_updateManager = new PartitionStateUpdateManager(ProjectionNamesBuilder.CreateForTest("projection"));
-			_updateManager.StateUpdated("partition1", new PartitionState("{\"state\":1}", null, _one), _zero);
-			_updateManager.StateUpdated("partition2", new PartitionState("{\"state\":2}", null, _two), _zero);
-		}
-
-		[Test]
-		public void handles_state_updated_for_the_same_partition() {
-			_updateManager.StateUpdated("partition1", new PartitionState("{\"state\":0}", null, _three), _two);
-		}
-
-		[Test]
-		public void handles_state_updated_for_another_partition() {
-			_updateManager.StateUpdated("partition3", new PartitionState("{\"state\":0}", null, _three), _two);
-		}
-
-		[Test]
-		public void emit_events_writes_both_state_updated_event() {
-			var eventWriter = new FakeEventWriter();
-			_updateManager.EmitEvents(eventWriter);
-			Assert.AreEqual(2, (eventWriter.Writes.SelectMany(write => write)).Count());
-		}
-
-		[Test]
-		public void emit_events_writes_to_correct_streams() {
-			var eventWriter = new FakeEventWriter();
-			_updateManager.EmitEvents(eventWriter);
-			var events = eventWriter.Writes.SelectMany(write => write).ToArray();
-			Assert.IsTrue(events.Any((v => "$projections-projection-partition1-checkpoint" == v.StreamId)));
-			Assert.IsTrue(events.Any((v => "$projections-projection-partition2-checkpoint" == v.StreamId)));
-		}
-
-		[Test]
-		public void emit_events_writes_correct_state_data() {
-			var eventWriter = new FakeEventWriter();
-			_updateManager.EmitEvents(eventWriter);
-			var events = eventWriter.Writes.SelectMany(write => write).ToArray();
-			var event1 = events.Single(v => "$projections-projection-partition1-checkpoint" == v.StreamId);
-			var event2 = events.Single(v => "$projections-projection-partition2-checkpoint" == v.StreamId);
-
-			Assert.AreEqual("[{\"state\":1}]", event1.Data);
-			Assert.AreEqual("[{\"state\":2}]", event2.Data);
-		}
-
-		[Test]
-		public void emit_events_writes_event_with_correct_caused_by_tag() {
-			var eventWriter = new FakeEventWriter();
-			_updateManager.EmitEvents(eventWriter);
-			var events = eventWriter.Writes.SelectMany(write => write).ToArray();
-			var event1 = events.Single(v => "$projections-projection-partition1-checkpoint" == v.StreamId);
-			var event2 = events.Single(v => "$projections-projection-partition2-checkpoint" == v.StreamId);
-			Assert.AreEqual(_one, event1.CausedByTag);
-			Assert.AreEqual(_two, event2.CausedByTag);
-		}
-
-		[Test]
-		public void emit_events_writes_event_with_correct_expected_tag() {
-			var eventWriter = new FakeEventWriter();
-			_updateManager.EmitEvents(eventWriter);
-			var events = eventWriter.Writes.SelectMany(write => write).ToArray();
-			var event1 = events.Single(v => "$projections-projection-partition1-checkpoint" == v.StreamId);
-			var event2 = events.Single(v => "$projections-projection-partition2-checkpoint" == v.StreamId);
-			Assert.AreEqual(_zero, event1.ExpectedTag);
-			Assert.AreEqual(_zero, event2.ExpectedTag);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/paused_at_event_distribution_point.cs b/src/EventStore.Projections.Core.Tests/Services/paused_at_event_distribution_point.cs
deleted file mode 100644
index 8b137891791..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/paused_at_event_distribution_point.cs
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/event_by_type_index_position_tagger.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/event_by_type_index_position_tagger.cs
deleted file mode 100644
index 535431cba6d..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/event_by_type_index_position_tagger.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.EventByType;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.event_by_type_index_position_tagger {
-	[TestFixture]
-	public class event_by_type_index_position_tagger {
-		private ReaderSubscriptionMessage.CommittedEventDistributed _zeroEvent;
-		private ReaderSubscriptionMessage.CommittedEventDistributed _firstEvent;
-		private ReaderSubscriptionMessage.CommittedEventDistributed _secondEvent;
-		private ReaderSubscriptionMessage.CommittedEventDistributed _thirdEvent;
-
-		[SetUp]
-		public void setup() {
-			_zeroEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-				Guid.NewGuid(), new TFPos(-1, 120), new TFPos(20, 10), "$et-type1", 0, "stream1", 0, true,
-				Guid.NewGuid(), "type1", true, Helper.UTF8NoBom.GetBytes("{}"), new byte[0], null, 10f);
-
-			_firstEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-				Guid.NewGuid(), new TFPos(-1, 130), new TFPos(30, 20), "$et-type2", 0, "stream1", 1, true,
-				Guid.NewGuid(), "type2", true, Helper.UTF8NoBom.GetBytes("{}"), new byte[0], null, 20f);
-
-			_secondEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-				Guid.NewGuid(), new TFPos(-1, 140), new TFPos(50, 40), "$et-type1", 1, "stream2", 0, false,
-				Guid.NewGuid(), "type1", true, Helper.UTF8NoBom.GetBytes("{}"), new byte[0], null, 30f);
-
-			_thirdEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-				Guid.NewGuid(), new TFPos(-1, 150), new TFPos(70, 60), "$et-type2", 1, "stream2", 1, false,
-				Guid.NewGuid(), "type2", true, Helper.UTF8NoBom.GetBytes("{}"), new byte[0], null, 40f);
-		}
-
-		[Test]
-		public void can_be_created() {
-			var t = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			new PositionTracker(t);
-		}
-
-		[Test]
-		public void is_message_after_checkpoint_tag_after_case() {
-			var t = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			var result =
-				t.IsMessageAfterCheckpointTag(
-					CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(10, 5),
-						new Dictionary<string, long> {{"type1", 0}, {"type2", -1}}), _firstEvent);
-			Assert.IsTrue(result);
-		}
-
-		[Test]
-		public void is_message_after_checkpoint_tag_tf_only_after_case() {
-			var t = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			var result =
-				t.IsMessageAfterCheckpointTag(
-					CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(10, 5),
-						new Dictionary<string, long> {{"type1", 0}, {"type2", 0}}), _firstEvent);
-			Assert.IsTrue(result);
-		}
-
-		[Test]
-		public void is_message_after_checkpoint_tag_before_case() {
-			var t = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			var result =
-				t.IsMessageAfterCheckpointTag(
-					CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(40, 35),
-						new Dictionary<string, long> {{"type1", 2}, {"type2", 2}}),
-					_firstEvent);
-			Assert.IsFalse(result);
-		}
-
-		[Test]
-		public void is_message_after_checkpoint_tag_tf_only_before_case() {
-			var t = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			var result =
-				t.IsMessageAfterCheckpointTag(
-					CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(40, 35),
-						new Dictionary<string, long> {{"type1", 0}, {"type2", 0}}),
-					_firstEvent);
-			Assert.IsFalse(result);
-		}
-
-		[Test]
-		public void is_message_after_checkpoint_tag_equal_case() {
-			var t = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			var result =
-				t.IsMessageAfterCheckpointTag(
-					CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(30, 20),
-						new Dictionary<string, long> {{"type1", 0}, {"type2", 0}}),
-					_firstEvent);
-			Assert.IsFalse(result);
-		}
-
-		[Test]
-		public void is_message_after_checkpoint_tag_tf_only_equal_case() {
-			var t = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			var result =
-				t.IsMessageAfterCheckpointTag(
-					CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(30, 20),
-						new Dictionary<string, long> {{"type1", -1}, {"type2", -1}}),
-					_firstEvent);
-			Assert.IsFalse(result);
-		}
-
-		[Test]
-		public void is_message_after_checkpoint_tag_incompatible_streams_case() {
-			var t = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			var result =
-				t.IsMessageAfterCheckpointTag(
-					CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(30, 20),
-						new Dictionary<string, long> {{"type1", -1}, {"type3", -1}}),
-					_firstEvent);
-			Assert.IsFalse(result);
-		}
-
-
-		[Test]
-		public void null_streams_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => { new EventByTypeIndexPositionTagger(0, null); });
-		}
-
-		[Test]
-		public void empty_streams_throws_argument_exception() {
-			Assert.Throws<ArgumentException>(() => { new EventByTypeIndexPositionTagger(0, new string[] { }); });
-		}
-
-		[Test]
-		public void position_checkpoint_tag_is_incompatible() {
-			var t = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			Assert.IsFalse(t.IsCompatible(CheckpointTag.FromPosition(0, 1000, 500)));
-		}
-
-		[Test]
-		public void streams_checkpoint_tag_is_incompatible() {
-			var t = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			Assert.IsFalse(
-				t.IsCompatible(
-					CheckpointTag.FromStreamPositions(0,
-						new Dictionary<string, long> {{"$et-type1", 100}, {"$et-type2", 150}})));
-		}
-
-		[Test]
-		public void another_events_checkpoint_tag_is_compatible() {
-			var t = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			Assert.IsFalse(
-				t.IsCompatible(
-					CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(100, 50),
-						new Dictionary<string, long> {{"type1", 100}, {"type3", 150}})));
-		}
-
-		[Test]
-		public void the_same_events_checkpoint_tag_is_compatible() {
-			var t = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			Assert.IsTrue(
-				t.IsCompatible(
-					CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(100, 50),
-						new Dictionary<string, long> {{"type1", 100}, {"type2", 150}})));
-		}
-
-		[Test]
-		public void adjust_compatible_tag_returns_the_same_tag() {
-			var t = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			var tag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(100, 50),
-				new Dictionary<string, long> {{"type1", 1}, {"type2", 2}});
-			Assert.AreEqual(tag, t.AdjustTag(tag));
-		}
-
-		[Test]
-		public void can_adjust_tf_position_tag() {
-			var t = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			var tag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(100, 50),
-				new Dictionary<string, long> {{"type1", 1}, {"type2", 2}});
-			var original = CheckpointTag.FromPosition(0, 100, 50);
-			Assert.AreEqual(tag, t.AdjustTag(original));
-		}
-
-		[Test]
-		public void zero_position_tag_is_before_first_event_possible() {
-			var t = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			var zero = t.MakeZeroCheckpointTag();
-
-			var zeroFromEvent = t.MakeCheckpointTag(zero, _zeroEvent);
-
-			Assert.IsTrue(zeroFromEvent > zero);
-		}
-
-		[Test]
-		public void can_update_by_tf_event_if_with_prior_index_position() {
-			var t = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			var linkEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-				Guid.NewGuid(), new TFPos(180, 170), "$et-type2", 1, false, Guid.NewGuid(), "$>", false,
-				Helper.UTF8NoBom.GetBytes("0@stream2"), new byte[0]);
-			var tag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(70, 60),
-				new Dictionary<string, long> {{"type1", 2}, {"type2", 2}});
-			var updated = t.MakeCheckpointTag(tag, linkEvent);
-			Assert.AreEqual(new TFPos(180, 170), updated.Position);
-			Assert.AreEqual(2, updated.Streams["type1"]);
-			Assert.AreEqual(2, updated.Streams["type2"]);
-		}
-
-		[Test]
-		public void cannot_update_by_prior_tf_position() {
-			var t = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			var linkEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-				Guid.NewGuid(), new TFPos(180, 170), "$et-type2", 1, false, Guid.NewGuid(), "$>", false,
-				Helper.UTF8NoBom.GetBytes("0@stream2"), new byte[0]);
-			var tag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(270, 260),
-				new Dictionary<string, long> {{"type1", 2}, {"type2", 2}});
-			Assert.Throws<InvalidOperationException>(() => { t.MakeCheckpointTag(tag, linkEvent); });
-		}
-
-		[Test]
-		public void produced_checkpoint_tags_are_correctly_ordered() {
-			var t = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			var zero = t.MakeZeroCheckpointTag();
-
-			var zeroEvent = t.MakeCheckpointTag(zero, _zeroEvent);
-			var zeroEvent2 = t.MakeCheckpointTag(zeroEvent, _zeroEvent);
-			var first = t.MakeCheckpointTag(zeroEvent2, _firstEvent);
-			var second = t.MakeCheckpointTag(first, _secondEvent);
-			var second2 = t.MakeCheckpointTag(zeroEvent, _secondEvent);
-			var third = t.MakeCheckpointTag(second, _thirdEvent);
-
-			Assert.IsTrue(zeroEvent > zero);
-			Assert.IsTrue(first > zero);
-			Assert.IsTrue(second > first);
-
-			Assert.AreEqual(zeroEvent2, zeroEvent);
-			Assert.AreEqual(second, second2); // strong order (by tf)
-			Assert.IsTrue(second2 > zeroEvent);
-			Assert.IsTrue(second2 > first);
-
-			Assert.IsTrue(third > second);
-			Assert.IsTrue(third > first);
-			Assert.IsTrue(third > zeroEvent);
-			Assert.IsTrue(third > zero);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_creating_event_by_type_index_position_tracker.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_creating_event_by_type_index_position_tracker.cs
deleted file mode 100644
index 28f08e802d6..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_creating_event_by_type_index_position_tracker.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.EventByType;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.event_by_type_index_position_tagger {
-	[TestFixture]
-	public class when_creating_event_by_type_index_position_tracker {
-		private EventByTypeIndexPositionTagger _tagger;
-		private PositionTracker _positionTracker;
-
-		[SetUp]
-		public void when() {
-			_tagger = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			_positionTracker = new PositionTracker(_tagger);
-		}
-
-		[Test]
-		public void it_can_be_updated_with_correct_event_types() {
-			// even not initialized (UpdateToZero can be removed)
-			var newTag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(100, 50),
-				new Dictionary<string, long> {{"type1", 10}, {"type2", 20}});
-			_positionTracker.UpdateByCheckpointTagInitial(newTag);
-		}
-
-		[Test]
-		public void it_cannot_be_updated_with_other_event_types() {
-			var newTag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(100, 50),
-				new Dictionary<string, long> {{"type1", 10}, {"type3", 20}});
-			Assert.Throws<InvalidOperationException>(() => { _positionTracker.UpdateByCheckpointTagInitial(newTag); });
-		}
-
-		[Test]
-		public void it_cannot_be_updated_forward() {
-			var newTag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(100, 50),
-				new Dictionary<string, long> {{"type1", 10}, {"type2", 20}});
-			Assert.Throws<InvalidOperationException>(() => { _positionTracker.UpdateByCheckpointTagForward(newTag); });
-		}
-
-		[Test]
-		public void initial_position_cannot_be_set_twice() {
-			Assert.Throws<InvalidOperationException>(() => {
-				var newTag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(100, 50),
-					new Dictionary<string, long> {{"type1", 10}, {"type2", 20}});
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-			});
-		}
-
-		[Test]
-		public void it_can_be_updated_to_zero() {
-			_positionTracker.UpdateByCheckpointTagInitial(_tagger.MakeZeroCheckpointTag());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_updating_event_by_type_index_position_tracker_from_a_tag.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_updating_event_by_type_index_position_tracker_from_a_tag.cs
deleted file mode 100644
index f99f14c87a1..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_updating_event_by_type_index_position_tracker_from_a_tag.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.EventByType;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.event_by_type_index_position_tagger {
-	[TestFixture]
-	public class when_updating_event_by_type_index_position_tracker_from_a_tag {
-		private EventByTypeIndexPositionTagger _tagger;
-		private CheckpointTag _tag;
-		private PositionTracker _positionTracker;
-
-		[SetUp]
-		public void When() {
-			// given
-			var tagger = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			var tracker = new PositionTracker(tagger);
-
-			var newTag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(10, 5),
-				new Dictionary<string, long> {{"type1", 1}, {"type2", 2}});
-
-			tracker.UpdateByCheckpointTagInitial(newTag);
-			_tag = tracker.LastTag;
-			_tagger = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			_positionTracker = new PositionTracker(_tagger);
-			// when
-
-			_positionTracker.UpdateByCheckpointTagInitial(_tag);
-		}
-
-		[Test]
-		public void stream_position_is_updated() {
-			Assert.AreEqual(1, _positionTracker.LastTag.Streams["type1"]);
-			Assert.AreEqual(2, _positionTracker.LastTag.Streams["type2"]);
-		}
-
-		[Test]
-		public void tf_stream_position_is_updated() {
-			Assert.AreEqual(new TFPos(10, 5), _positionTracker.LastTag.Position);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_updating_event_by_type_index_position_tracker_to_zero.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_updating_event_by_type_index_position_tracker_to_zero.cs
deleted file mode 100644
index d570a169c5e..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_updating_event_by_type_index_position_tracker_to_zero.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.EventByType;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.event_by_type_index_position_tagger {
-	[TestFixture]
-	public class when_updating_event_by_type_index_position_tracker_to_zero {
-		private EventByTypeIndexPositionTagger _tagger;
-		private PositionTracker _positionTracker;
-
-		[SetUp]
-		public void When() {
-			_tagger = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			_positionTracker = new PositionTracker(_tagger);
-			// when 
-
-			_positionTracker.UpdateByCheckpointTagInitial(_tagger.MakeZeroCheckpointTag());
-		}
-
-		[Test]
-		public void streams_are_set_up() {
-			Assert.Contains("type1", _positionTracker.LastTag.Streams.Keys);
-			Assert.Contains("type2", _positionTracker.LastTag.Streams.Keys);
-		}
-
-		[Test]
-		public void stream_position_is_minus_one() {
-			Assert.AreEqual(ExpectedVersion.NoStream, _positionTracker.LastTag.Streams["type1"]);
-			Assert.AreEqual(ExpectedVersion.NoStream, _positionTracker.LastTag.Streams["type2"]);
-		}
-
-		[Test]
-		public void tf_position_is_zero() {
-			Assert.AreEqual(new TFPos(0, -1), _positionTracker.LastTag.Position);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_updating_postion_event_by_type_index_position_tracker.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_updating_postion_event_by_type_index_position_tracker.cs
deleted file mode 100644
index 5f95be69217..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_updating_postion_event_by_type_index_position_tracker.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.EventByType;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.event_by_type_index_position_tagger {
-	[TestFixture]
-	public class when_updating_postion_event_by_type_index_position_tracker {
-		private EventByTypeIndexPositionTagger _tagger;
-		private PositionTracker _positionTracker;
-
-		[SetUp]
-		public void When() {
-			// given
-			_tagger = new EventByTypeIndexPositionTagger(0, new[] {"type1", "type2"});
-			_positionTracker = new PositionTracker(_tagger);
-			var newTag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(10, 5),
-				new Dictionary<string, long> {{"type1", 1}, {"type2", 2}});
-			var newTag2 = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(20, 15),
-				new Dictionary<string, long> {{"type1", 1}, {"type2", 3}});
-			_positionTracker.UpdateByCheckpointTagInitial(newTag);
-			_positionTracker.UpdateByCheckpointTagForward(newTag2);
-		}
-
-		[Test]
-		public void stream_position_is_updated() {
-			Assert.AreEqual(1, _positionTracker.LastTag.Streams["type1"]);
-			Assert.AreEqual(3, _positionTracker.LastTag.Streams["type2"]);
-		}
-
-		[Test]
-		public void tf_position_is_updated() {
-			Assert.AreEqual(new TFPos(20, 15), _positionTracker.LastTag.Position);
-		}
-
-		[Test]
-		public void cannot_update_to_the_same_position() {
-			var newTag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(20, 15),
-				new Dictionary<string, long> {{"type1", 1}, {"type2", 3}});
-			Assert.Throws<InvalidOperationException>(() => { _positionTracker.UpdateByCheckpointTagForward(newTag); });
-		}
-
-		[Test]
-		public void can_update_to_the_same_index_position_but_tf() {
-			var newTag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(30, 25),
-				new Dictionary<string, long> {{"type1", 1}, {"type2", 3}});
-			_positionTracker.UpdateByCheckpointTagForward(newTag);
-		}
-
-		[Test]
-		public void it_cannot_be_updated_with_other_stream() {
-			// even not initialized (UpdateToZero can be removed)
-			var newTag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(30, 25),
-				new Dictionary<string, long> {{"type1", 1}, {"type3", 3}});
-			Assert.Throws<InvalidOperationException>(() => { _positionTracker.UpdateByCheckpointTagForward(newTag); });
-		}
-
-		//TODO: write tests on updating with incompatible snapshot loaded
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/multistream_position_tagger.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/multistream_position_tagger.cs
deleted file mode 100644
index 12d78efaa96..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/multistream_position_tagger.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.multistream_position_tagger {
-	[TestFixture]
-	public class multistream_position_tagger {
-		private ReaderSubscriptionMessage.CommittedEventDistributed _zeroEvent;
-		private ReaderSubscriptionMessage.CommittedEventDistributed _firstEvent;
-		private ReaderSubscriptionMessage.CommittedEventDistributed _secondEvent;
-		private ReaderSubscriptionMessage.CommittedEventDistributed _thirdEvent;
-
-		[SetUp]
-		public void setup() {
-			_zeroEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-				Guid.NewGuid(), new TFPos(10, 0), "stream1", 0, false, Guid.NewGuid(), "StreamCreated", false,
-				new byte[0], new byte[0]);
-			_firstEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-				Guid.NewGuid(), new TFPos(30, 20), "stream1", 1, false, Guid.NewGuid(), "Data", true,
-				Helper.UTF8NoBom.GetBytes("{}"), new byte[0]);
-			_secondEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-				Guid.NewGuid(), new TFPos(50, 40), "stream2", 0, false, Guid.NewGuid(), "StreamCreated", false,
-				new byte[0], new byte[0]);
-			_thirdEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-				Guid.NewGuid(), new TFPos(70, 60), "stream2", 1, false, Guid.NewGuid(), "Data", true,
-				Helper.UTF8NoBom.GetBytes("{}"), new byte[0]);
-		}
-
-		[Test]
-		public void can_be_created() {
-			var t = new MultiStreamPositionTagger(0, new[] {"stream1", "stream2"});
-			new PositionTracker(t);
-		}
-
-		[Test]
-		public void is_message_after_checkpoint_tag_after_case() {
-			var t = new MultiStreamPositionTagger(0, new[] {"stream1", "stream2"});
-			var result =
-				t.IsMessageAfterCheckpointTag(
-					CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"stream1", 0}, {"stream2", 0}}),
-					_firstEvent);
-			Assert.IsTrue(result);
-		}
-
-		[Test]
-		public void is_message_after_checkpoint_tag_before_case() {
-			var t = new MultiStreamPositionTagger(0, new[] {"stream1", "stream2"});
-			var result =
-				t.IsMessageAfterCheckpointTag(
-					CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"stream1", 2}, {"stream2", 2}}),
-					_firstEvent);
-			Assert.IsFalse(result);
-		}
-
-		[Test]
-		public void is_message_after_checkpoint_tag_equal_case() {
-			var t = new MultiStreamPositionTagger(0, new[] {"stream1", "stream2"});
-			var result =
-				t.IsMessageAfterCheckpointTag(
-					CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"stream1", 1}, {"stream2", 1}}),
-					_firstEvent);
-			Assert.IsFalse(result);
-		}
-
-		[Test]
-		public void is_message_after_checkpoint_tag_incompatible_streams_case() {
-			var t = new MultiStreamPositionTagger(0, new[] {"stream-other", "stream2"});
-			var result =
-				t.IsMessageAfterCheckpointTag(
-					CheckpointTag.FromStreamPositions(0,
-						new Dictionary<string, long> {{"stream-other", 0}, {"stream2", 0}}),
-					_firstEvent);
-			Assert.IsFalse(result);
-		}
-
-
-		[Test]
-		public void null_streams_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => { new MultiStreamPositionTagger(0, null); });
-		}
-
-		[Test]
-		public void empty_streams_throws_argument_exception() {
-			Assert.Throws<ArgumentException>(() => { new MultiStreamPositionTagger(0, new string[] { }); });
-		}
-
-		[Test]
-		public void position_checkpoint_tag_is_incompatible() {
-			var t = new MultiStreamPositionTagger(0, new[] {"stream1", "stream2"});
-			Assert.IsFalse(t.IsCompatible(CheckpointTag.FromPosition(0, 1000, 500)));
-		}
-
-		[Test]
-		public void another_streams_checkpoint_tag_is_incompatible() {
-			var t = new MultiStreamPositionTagger(0, new[] {"stream1", "stream2"});
-			Assert.IsFalse(
-				t.IsCompatible(
-					CheckpointTag.FromStreamPositions(0,
-						new Dictionary<string, long> {{"stream2", 100}, {"stream3", 150}})));
-		}
-
-		[Test]
-		public void the_same_stream_checkpoint_tag_is_compatible() {
-			var t = new MultiStreamPositionTagger(0, new[] {"stream1", "stream2"});
-			Assert.IsTrue(
-				t.IsCompatible(
-					CheckpointTag.FromStreamPositions(0,
-						new Dictionary<string, long> {{"stream1", 100}, {"stream2", 150}})));
-		}
-
-		[Test]
-		public void adjust_compatible_tag_returns_the_same_tag() {
-			var t = new MultiStreamPositionTagger(0, new[] {"stream1", "stream2"});
-			var tag = CheckpointTag.FromStreamPositions(0,
-				new Dictionary<string, long> {{"stream1", 1}, {"stream2", 2}});
-			Assert.AreEqual(tag, t.AdjustTag(tag));
-		}
-
-		[Test]
-		public void can_adjust_stream_position_tag() {
-			var t = new MultiStreamPositionTagger(0, new[] {"stream1", "stream2"});
-			var tag = CheckpointTag.FromStreamPositions(0,
-				new Dictionary<string, long> {{"stream1", 1}, {"stream2", -1}});
-			var original = CheckpointTag.FromStreamPosition(0, "stream1", 1);
-			Assert.AreEqual(tag, t.AdjustTag(original));
-		}
-
-		[Test]
-		public void zero_position_tag_is_before_first_event_possible() {
-			var t = new MultiStreamPositionTagger(0, new[] {"stream1", "stream2"});
-			var zero = t.MakeZeroCheckpointTag();
-
-			var zeroFromEvent = t.MakeCheckpointTag(zero, _zeroEvent);
-
-			Assert.IsTrue(zeroFromEvent > zero);
-		}
-
-		[Test]
-		public void produced_checkpoint_tags_are_correctly_ordered() {
-			var t = new MultiStreamPositionTagger(0, new[] {"stream1", "stream2"});
-			var zero = t.MakeZeroCheckpointTag();
-
-			var zeroEvent = t.MakeCheckpointTag(zero, _zeroEvent);
-			var zeroEvent2 = t.MakeCheckpointTag(zeroEvent, _zeroEvent);
-			var first = t.MakeCheckpointTag(zeroEvent2, _firstEvent);
-			var second = t.MakeCheckpointTag(first, _secondEvent);
-			var second2 = t.MakeCheckpointTag(zeroEvent, _secondEvent);
-			var third = t.MakeCheckpointTag(second, _thirdEvent);
-
-			Assert.IsTrue(zeroEvent > zero);
-			Assert.IsTrue(first > zero);
-			Assert.IsTrue(second > first);
-
-			Assert.AreEqual(zeroEvent2, zeroEvent);
-			Assert.AreNotEqual(second, second2);
-			Assert.IsTrue(second2 > zeroEvent);
-			Assert.Throws<InvalidOperationException>(() => TestHelper.Consume(second2 > first));
-
-			Assert.IsTrue(third > second);
-			Assert.IsTrue(third > first);
-			Assert.IsTrue(third > zeroEvent);
-			Assert.IsTrue(third > zero);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_creating_multistream_postion_tracker.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_creating_multistream_postion_tracker.cs
deleted file mode 100644
index f9f3be2558a..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_creating_multistream_postion_tracker.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.multistream_position_tagger {
-	[TestFixture]
-	public class when_creating_multistream_postion_tracker {
-		private MultiStreamPositionTagger _tagger;
-		private PositionTracker _positionTracker;
-
-		[SetUp]
-		public void when() {
-			_tagger = new MultiStreamPositionTagger(0, new[] {"stream1", "stream2"});
-			_positionTracker = new PositionTracker(_tagger);
-		}
-
-		[Test]
-		public void it_can_be_updated_with_correct_streams() {
-			// even not initialized (UpdateToZero can be removed)
-			var newTag =
-				CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"stream1", 10}, {"stream2", 20}});
-			_positionTracker.UpdateByCheckpointTagInitial(newTag);
-		}
-
-		[Test]
-		public void it_cannot_be_updated_with_other_streams() {
-			Assert.Throws<InvalidOperationException>(() => {
-				var newTag = CheckpointTag.FromStreamPositions(0,
-					new Dictionary<string, long> {{"stream1", 10}, {"stream3", 20}});
-				_positionTracker.UpdateByCheckpointTagInitial(newTag);
-			});
-		}
-
-		[Test]
-		public void it_cannot_be_updated_forward() {
-			Assert.Throws<InvalidOperationException>(() => {
-				var newTag = CheckpointTag.FromStreamPositions(0,
-					new Dictionary<string, long> {{"stream1", 10}, {"stream2", 20}});
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-			});
-		}
-
-		[Test]
-		public void initial_position_cannot_be_set_twice() {
-			Assert.Throws<InvalidOperationException>(() => {
-				var newTag = CheckpointTag.FromStreamPositions(0,
-					new Dictionary<string, long> {{"stream1", 10}, {"stream2", 20}});
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-			});
-		}
-
-		[Test]
-		public void it_can_be_updated_to_zero() {
-			_positionTracker.UpdateByCheckpointTagInitial(_tagger.MakeZeroCheckpointTag());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_updating_multistream_postion_tracker_from_a_tag.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_updating_multistream_postion_tracker_from_a_tag.cs
deleted file mode 100644
index f7e93f969b0..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_updating_multistream_postion_tracker_from_a_tag.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.multistream_position_tagger {
-	[TestFixture]
-	public class when_updating_multistream_postion_tracker_from_a_tag {
-		private MultiStreamPositionTagger _tagger;
-		private CheckpointTag _tag;
-		private PositionTracker _positionTracker;
-
-		[SetUp]
-		public void When() {
-			// given
-			var tagger = new MultiStreamPositionTagger(0, new[] {"stream1", "stream2"});
-			var tracker = new PositionTracker(tagger);
-
-			var newTag =
-				CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"stream1", 1}, {"stream2", 2}});
-			tracker.UpdateByCheckpointTagInitial(newTag);
-			_tag = tracker.LastTag;
-			_tagger = new MultiStreamPositionTagger(0, new[] {"stream1", "stream2"});
-			_positionTracker = new PositionTracker(_tagger);
-			// when
-
-			_positionTracker.UpdateByCheckpointTagInitial(_tag);
-		}
-
-		[Test]
-		public void stream_position_is_updated() {
-			Assert.AreEqual(1, _positionTracker.LastTag.Streams["stream1"]);
-			Assert.AreEqual(2, _positionTracker.LastTag.Streams["stream2"]);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_updating_multistream_postion_tracker_to_zero.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_updating_multistream_postion_tracker_to_zero.cs
deleted file mode 100644
index 0d64f7d79f0..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_updating_multistream_postion_tracker_to_zero.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.multistream_position_tagger {
-	[TestFixture]
-	public class when_updating_multistream_postion_tracker_to_zero {
-		private MultiStreamPositionTagger _tagger;
-		private PositionTracker _positionTracker;
-
-		[SetUp]
-		public void When() {
-			_tagger = new MultiStreamPositionTagger(0, new[] {"stream1", "stream2"});
-			_positionTracker = new PositionTracker(_tagger);
-			// when 
-
-			_positionTracker.UpdateByCheckpointTagInitial(_tagger.MakeZeroCheckpointTag());
-		}
-
-		[Test]
-		public void streams_are_set_up() {
-			Assert.Contains("stream1", _positionTracker.LastTag.Streams.Keys);
-			Assert.Contains("stream2", _positionTracker.LastTag.Streams.Keys);
-		}
-
-		[Test]
-		public void stream_position_is_minus_one() {
-			Assert.AreEqual(ExpectedVersion.NoStream, _positionTracker.LastTag.Streams["stream1"]);
-			Assert.AreEqual(ExpectedVersion.NoStream, _positionTracker.LastTag.Streams["stream2"]);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_updating_postion_multistream_position_tracker.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_updating_postion_multistream_position_tracker.cs
deleted file mode 100644
index 3abd4dce8c3..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_updating_postion_multistream_position_tracker.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.multistream_position_tagger {
-	[TestFixture]
-	public class when_updating_postion_multistream_position_tracker {
-		private MultiStreamPositionTagger _tagger;
-		private PositionTracker _positionTracker;
-
-		[SetUp]
-		public void When() {
-			// given
-			_tagger = new MultiStreamPositionTagger(0, new[] {"stream1", "stream2"});
-			_positionTracker = new PositionTracker(_tagger);
-			var newTag =
-				CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"stream1", 1}, {"stream2", 2}});
-			var newTag2 =
-				CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"stream1", 1}, {"stream2", 3}});
-			_positionTracker.UpdateByCheckpointTagInitial(newTag);
-			_positionTracker.UpdateByCheckpointTagForward(newTag2);
-		}
-
-		[Test]
-		public void stream_position_is_updated() {
-			Assert.AreEqual(1, _positionTracker.LastTag.Streams["stream1"]);
-			Assert.AreEqual(3, _positionTracker.LastTag.Streams["stream2"]);
-		}
-
-
-		[Test]
-		public void cannot_update_to_the_same_postion() {
-			Assert.Throws<InvalidOperationException>(() => {
-				var newTag =
-					CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"stream1", 1}, {"stream2", 3}});
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-			});
-		}
-
-		[Test]
-		public void it_cannot_be_updated_with_other_stream() {
-			Assert.Throws<InvalidOperationException>(() => {
-				// even not initialized (UpdateToZero can be removed)
-				var newTag =
-					CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"stream1", 3}, {"stream3", 2}});
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-			});
-		}
-
-		//TODO: write tests on updating with incompatible snapshot loaded
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/prepare_position_tagger.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/prepare_position_tagger.cs
deleted file mode 100644
index e919f8a6822..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/prepare_position_tagger.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using System;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.prepare_position_tagger {
-	[TestFixture]
-	public class prepare_position_tagger {
-		private ReaderSubscriptionMessage.CommittedEventDistributed _zeroEvent;
-		private ReaderSubscriptionMessage.CommittedEventDistributed _firstEvent;
-		private ReaderSubscriptionMessage.CommittedEventDistributed _secondEvent;
-
-		[SetUp]
-		public void setup() {
-			_zeroEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-				Guid.NewGuid(), new TFPos(10, 0), "stream", 0, false, Guid.NewGuid(), "StreamCreated", false,
-				new byte[0], new byte[0]);
-			_firstEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-				Guid.NewGuid(), new TFPos(0, 20), "stream", 1, false, Guid.NewGuid(), "Data", true,
-				Helper.UTF8NoBom.GetBytes("{}"), new byte[0]);
-			_secondEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-				Guid.NewGuid(), new TFPos(50, 40), "stream", 2, false, Guid.NewGuid(), "Data", true,
-				Helper.UTF8NoBom.GetBytes("{}"), new byte[0]);
-		}
-
-		[Test]
-		public void can_be_created() {
-			new PreparePositionTagger(0);
-		}
-
-		[Test]
-		public void is_message_after_checkpoint_tag_after_case() {
-			var t = new PreparePositionTagger(0);
-			var result = t.IsMessageAfterCheckpointTag(CheckpointTag.FromPreparePosition(0, 10), _firstEvent);
-			Assert.IsTrue(result);
-		}
-
-		[Test]
-		public void is_message_after_checkpoint_tag_before_case() {
-			var t = new PreparePositionTagger(0);
-			var result = t.IsMessageAfterCheckpointTag(CheckpointTag.FromPreparePosition(0, 40), _firstEvent);
-			Assert.IsFalse(result);
-		}
-
-		[Test]
-		public void is_message_after_checkpoint_tag_equal_case() {
-			var t = new PreparePositionTagger(0);
-			var result = t.IsMessageAfterCheckpointTag(CheckpointTag.FromPreparePosition(0, 20), _firstEvent);
-			Assert.IsFalse(result);
-		}
-
-		[Test]
-		public void prepare_position_checkpoint_tag_is_compatible() {
-			var t = new PreparePositionTagger(0);
-			Assert.IsTrue(t.IsCompatible(CheckpointTag.FromPreparePosition(0, 500)));
-		}
-
-		[Test]
-		public void tf_position_checkpoint_tag_is_incompatible() {
-			var t = new PreparePositionTagger(0);
-			Assert.IsFalse(t.IsCompatible(CheckpointTag.FromPosition(0, 510, 500)));
-		}
-
-		[Test]
-		public void stream_checkpoint_tag_is_incompatible() {
-			var t = new PreparePositionTagger(0);
-			Assert.IsFalse(t.IsCompatible(CheckpointTag.FromStreamPosition(0, "stream2", 100)));
-		}
-
-		[Test]
-		public void zero_position_tag_is_before_first_event_possible() {
-			var t = new PreparePositionTagger(0);
-			var zero = t.MakeZeroCheckpointTag();
-
-			var zeroFromEvent = t.MakeCheckpointTag(zero, _zeroEvent);
-
-			Assert.IsTrue(zeroFromEvent > zero);
-		}
-
-		[Test]
-		public void produced_checkpoint_tags_are_correctly_ordered() {
-			var t = new PreparePositionTagger(0);
-			var zero = t.MakeZeroCheckpointTag();
-
-			var zeroEvent = t.MakeCheckpointTag(zero, _zeroEvent);
-			var zeroEvent2 = t.MakeCheckpointTag(zeroEvent, _zeroEvent);
-			var first = t.MakeCheckpointTag(zeroEvent2, _firstEvent);
-			var second = t.MakeCheckpointTag(first, _secondEvent);
-			var second2 = t.MakeCheckpointTag(zero, _secondEvent);
-
-			Assert.IsTrue(zeroEvent > zero);
-			Assert.IsTrue(first > zero);
-			Assert.IsTrue(second > first);
-
-			Assert.AreEqual(zeroEvent2, zeroEvent);
-			Assert.AreEqual(second, second2);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_creating_prepare_postion_tracker.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_creating_prepare_postion_tracker.cs
deleted file mode 100644
index 7fbed124201..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_creating_prepare_postion_tracker.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.prepare_position_tagger {
-	[TestFixture]
-	public class when_creating_prepare_postion_tracker {
-		private PositionTagger _tagger;
-		private PositionTracker _positionTracker;
-
-		[SetUp]
-		public void when() {
-			_tagger = new PreparePositionTagger(0);
-			_positionTracker = new PositionTracker(_tagger);
-		}
-
-		[Test]
-		public void it_can_be_updated() {
-			// even not initialized (UpdateToZero can be removed)
-			var newTag = CheckpointTag.FromPreparePosition(0, 50);
-			_positionTracker.UpdateByCheckpointTagInitial(newTag);
-		}
-
-		[Test]
-		public void initial_position_cannot_be_set_twice() {
-			Assert.Throws<InvalidOperationException>(() => {
-				var newTag = CheckpointTag.FromPreparePosition(0, 50);
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-			});
-		}
-
-		[Test]
-		public void it_can_be_updated_to_zero() {
-			_positionTracker.UpdateByCheckpointTagInitial(_tagger.MakeZeroCheckpointTag());
-		}
-
-		[Test]
-		public void it_cannot_be_updated_forward() {
-			Assert.Throws<InvalidOperationException>(() => {
-				var newTag = CheckpointTag.FromPreparePosition(0, 50);
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_reinitializing_prepapre_postion_tracker.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_reinitializing_prepapre_postion_tracker.cs
deleted file mode 100644
index 35a7158e5be..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_reinitializing_prepapre_postion_tracker.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.prepare_position_tagger {
-	[TestFixture]
-	public class when_reinitializing_prepapre_postion_tracker {
-		private PositionTagger _tagger;
-		private CheckpointTag _tag;
-		private PositionTracker _positionTracker;
-
-		[SetUp]
-		public void When() {
-			// given
-			var tagger = new PreparePositionTagger(0);
-			var positionTracker = new PositionTracker(tagger);
-
-			var newTag = CheckpointTag.FromPreparePosition(0, 50);
-			positionTracker.UpdateByCheckpointTagInitial(newTag);
-			_tag = positionTracker.LastTag;
-			_tagger = new PreparePositionTagger(0);
-			_positionTracker = new PositionTracker(_tagger);
-			_positionTracker.UpdateByCheckpointTagInitial(_tag);
-			// when
-
-
-			_positionTracker.Initialize();
-		}
-
-		[Test]
-		public void it_can_be_updated() {
-			// even not initialized (UpdateToZero can be removed)
-			var newTag = CheckpointTag.FromPreparePosition(0, 50);
-			_positionTracker.UpdateByCheckpointTagInitial(newTag);
-		}
-
-		[Test]
-		public void initial_position_cannot_be_set_twice() {
-			Assert.Throws<InvalidOperationException>(() => {
-				var newTag = CheckpointTag.FromPreparePosition(0, 50);
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-			});
-		}
-
-		[Test]
-		public void it_can_be_updated_to_zero() {
-			_positionTracker.UpdateByCheckpointTagInitial(_tagger.MakeZeroCheckpointTag());
-		}
-
-		[Test]
-		public void it_cannot_be_updated_forward() {
-			Assert.Throws<InvalidOperationException>(() => {
-				var newTag = CheckpointTag.FromPreparePosition(0, 50);
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_updating_postion_tagger_from_a_tag.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_updating_postion_tagger_from_a_tag.cs
deleted file mode 100644
index 42d4f421381..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_updating_postion_tagger_from_a_tag.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.prepare_position_tagger {
-	[TestFixture]
-	public class when_updating_postion_tagger_from_a_tag {
-		private PositionTagger _tagger;
-		private CheckpointTag _tag;
-		private PositionTracker _positionTracker;
-
-		[SetUp]
-		public void When() {
-			// given
-			var tagger = new PreparePositionTagger(0);
-			var positionTracker = new PositionTracker(tagger);
-
-			var newTag = CheckpointTag.FromPreparePosition(0, 50);
-			positionTracker.UpdateByCheckpointTagInitial(newTag);
-			_tag = positionTracker.LastTag;
-			_tagger = new PreparePositionTagger(0);
-			_positionTracker = new PositionTracker(_tagger);
-			// when
-
-			_positionTracker.UpdateByCheckpointTagInitial(_tag);
-		}
-
-		[Test]
-		public void position_is_updated() {
-			Assert.AreEqual(50, _positionTracker.LastTag.PreparePosition);
-			Assert.IsNull(_positionTracker.LastTag.CommitPosition);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_updating_prepare_postion_tracker.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_updating_prepare_postion_tracker.cs
deleted file mode 100644
index 2e453a57a2e..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_updating_prepare_postion_tracker.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.prepare_position_tagger {
-	[TestFixture]
-	public class when_updating_prepare_postion_tracker {
-		private PositionTagger _tagger;
-		private PositionTracker _positionTracker;
-
-		[SetUp]
-		public void When() {
-			// given
-			_tagger = new PreparePositionTagger(0);
-			_positionTracker = new PositionTracker(_tagger);
-			var newTag = CheckpointTag.FromPreparePosition(0, 50);
-			_positionTracker.UpdateByCheckpointTagInitial(newTag);
-		}
-
-		[Test]
-		public void checkpoint_tag_is_for_correct_position() {
-			Assert.AreEqual(50, _positionTracker.LastTag.Position.PreparePosition);
-		}
-
-		[Test]
-		public void cannot_update_to_the_same_postion() {
-			Assert.Throws<InvalidOperationException>(() => {
-				var newTag = CheckpointTag.FromPreparePosition(0, 50);
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/stream_position_tagger.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/stream_position_tagger.cs
deleted file mode 100644
index ceb87be2583..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/stream_position_tagger.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.stream_position_tagger {
-	[TestFixture]
-	public class stream_position_tagger {
-		private ReaderSubscriptionMessage.CommittedEventDistributed _zeroEvent;
-		private ReaderSubscriptionMessage.CommittedEventDistributed _firstEvent;
-		private ReaderSubscriptionMessage.CommittedEventDistributed _secondEvent;
-
-		[SetUp]
-		public void setup() {
-			_zeroEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-				Guid.NewGuid(), new TFPos(10, 0), "stream1", 0, false, Guid.NewGuid(), "StreamCreated", false,
-				new byte[0], new byte[0]);
-			_firstEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-				Guid.NewGuid(), new TFPos(30, 20), "stream1", 1, false, Guid.NewGuid(), "Data", true,
-				Helper.UTF8NoBom.GetBytes("{}"), new byte[0]);
-			_secondEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-				Guid.NewGuid(), new TFPos(50, 40), "stream1", 2, false, Guid.NewGuid(), "Data", true,
-				Helper.UTF8NoBom.GetBytes("{}"), new byte[0]);
-		}
-
-		[Test]
-		public void can_be_created() {
-			var t = new StreamPositionTagger(0, "stream1");
-			new PositionTracker(t);
-		}
-
-		[Test]
-		public void is_message_after_checkpoint_tag_after_case() {
-			var t = new StreamPositionTagger(0, "stream1");
-			var result = t.IsMessageAfterCheckpointTag(CheckpointTag.FromStreamPosition(0, "stream1", 0), _firstEvent);
-			Assert.IsTrue(result);
-		}
-
-		[Test]
-		public void is_message_after_checkpoint_tag_before_case() {
-			var t = new StreamPositionTagger(0, "stream1");
-			var result = t.IsMessageAfterCheckpointTag(CheckpointTag.FromStreamPosition(0, "stream1", 2), _firstEvent);
-			Assert.IsFalse(result);
-		}
-
-		[Test]
-		public void is_message_after_checkpoint_tag_equal_case() {
-			var t = new StreamPositionTagger(0, "stream1");
-			var result = t.IsMessageAfterCheckpointTag(CheckpointTag.FromStreamPosition(0, "stream1", 1), _firstEvent);
-			Assert.IsFalse(result);
-		}
-
-		[Test]
-		public void is_message_after_checkpoint_tag_incompatible_case() {
-			// events from other streams are not after any tag
-			var t = new StreamPositionTagger(0, "stream-other");
-			var result = t.IsMessageAfterCheckpointTag(CheckpointTag.FromStreamPosition(0, "stream1", 1), _firstEvent);
-			Assert.IsFalse(result);
-		}
-
-
-		[Test]
-		public void null_stream_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => { new StreamPositionTagger(0, null); });
-		}
-
-		[Test]
-		public void empty_stream_throws_argument_exception() {
-			Assert.Throws<ArgumentException>(() => { new StreamPositionTagger(0, ""); });
-		}
-
-		[Test]
-		public void position_checkpoint_tag_is_incompatible() {
-			var t = new StreamPositionTagger(0, "stream1");
-			Assert.IsFalse(t.IsCompatible(CheckpointTag.FromPosition(0, 1000, 500)));
-		}
-
-		[Test]
-		public void anothe_stream_checkpoint_tag_is_incompatible() {
-			var t = new StreamPositionTagger(0, "stream1");
-			Assert.IsFalse(t.IsCompatible(CheckpointTag.FromStreamPosition(0, "stream2", 100)));
-		}
-
-		[Test]
-		public void the_same_stream_checkpoint_tag_is_compatible() {
-			var t = new StreamPositionTagger(0, "stream1");
-			Assert.IsTrue(t.IsCompatible(CheckpointTag.FromStreamPosition(0, "stream1", 100)));
-		}
-
-		[Test]
-		public void adjust_compatible_tag_returns_the_same_tag() {
-			var t = new StreamPositionTagger(0, "stream1");
-			var tag = CheckpointTag.FromStreamPosition(0, "stream1", 1);
-			Assert.AreEqual(tag, t.AdjustTag(tag));
-		}
-
-		[Test]
-		public void can_adjust_multi_stream_position_tag() {
-			var t = new StreamPositionTagger(0, "stream1");
-			var tag = CheckpointTag.FromStreamPosition(0, "stream1", 1);
-			var original =
-				CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"stream1", 1}, {"stream2", 2}});
-			Assert.AreEqual(tag, t.AdjustTag(original));
-		}
-
-		[Test]
-		public void zero_position_tag_is_before_first_event_possible() {
-			var t = new StreamPositionTagger(0, "stream1");
-			var zero = t.MakeZeroCheckpointTag();
-
-			var zeroFromEvent = t.MakeCheckpointTag(zero, _zeroEvent);
-
-			Assert.IsTrue(zeroFromEvent > zero);
-		}
-
-		[Test]
-		public void produced_checkpoint_tags_are_correctly_ordered() {
-			var t = new StreamPositionTagger(0, "stream1");
-			var zero = t.MakeZeroCheckpointTag();
-
-			var zeroEvent = t.MakeCheckpointTag(zero, _zeroEvent);
-			var zeroEvent2 = t.MakeCheckpointTag(zeroEvent, _zeroEvent);
-			var first = t.MakeCheckpointTag(zeroEvent2, _firstEvent);
-			var second = t.MakeCheckpointTag(first, _secondEvent);
-			var second2 = t.MakeCheckpointTag(zero, _secondEvent);
-
-			Assert.IsTrue(zeroEvent > zero);
-			Assert.IsTrue(first > zero);
-			Assert.IsTrue(second > first);
-
-			Assert.AreEqual(zeroEvent2, zeroEvent);
-			Assert.AreEqual(second, second2);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_creating_stream_postion_tracker.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_creating_stream_postion_tracker.cs
deleted file mode 100644
index f0f2b29ee8e..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_creating_stream_postion_tracker.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.stream_position_tagger {
-	[TestFixture]
-	public class when_creating_stream_postion_tracker {
-		private StreamPositionTagger _tagger;
-		private PositionTracker _positionTracker;
-
-		[SetUp]
-		public void when() {
-			_tagger = new StreamPositionTagger(0, "stream1");
-			_positionTracker = new PositionTracker(_tagger);
-		}
-
-		[Test]
-		public void it_can_be_updated_with_correct_stream() {
-			// even not initialized (UpdateToZero can be removed)
-			var newTag = CheckpointTag.FromStreamPosition(0, "stream1", 1);
-			_positionTracker.UpdateByCheckpointTagInitial(newTag);
-		}
-
-		[Test]
-		public void it_cannot_be_updated_with_other_stream() {
-			Assert.Throws<InvalidOperationException>(() => {
-				var newTag = CheckpointTag.FromStreamPosition(0, "other_stream1", 1);
-				_positionTracker.UpdateByCheckpointTagInitial(newTag);
-			});
-		}
-
-		[Test]
-		public void it_cannot_be_updated_forward() {
-			Assert.Throws<InvalidOperationException>(() => {
-				var newTag = CheckpointTag.FromStreamPosition(0, "stream1", 1);
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-			});
-		}
-
-		[Test]
-		public void initial_position_cannot_be_set_twice() {
-			Assert.Throws<InvalidOperationException>(() => {
-				var newTag = CheckpointTag.FromStreamPosition(0, "stream1", 1);
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-			});
-		}
-
-		[Test]
-		public void it_can_be_updated_to_zero() {
-			_positionTracker.UpdateByCheckpointTagInitial(_tagger.MakeZeroCheckpointTag());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_updating_postion_stream_position_tracker.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_updating_postion_stream_position_tracker.cs
deleted file mode 100644
index 45ef5e9f8de..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_updating_postion_stream_position_tracker.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.stream_position_tagger {
-	[TestFixture]
-	public class when_updating_postion_stream_position_tracker {
-		private StreamPositionTagger _tagger;
-		private PositionTracker _positionTracker;
-
-		[SetUp]
-		public void When() {
-			// given
-			_tagger = new StreamPositionTagger(0, "stream1");
-			_positionTracker = new PositionTracker(_tagger);
-			var newTag = CheckpointTag.FromStreamPosition(0, "stream1", 1);
-			var newTag2 = CheckpointTag.FromStreamPosition(0, "stream1", 2);
-			_positionTracker.UpdateByCheckpointTagInitial(newTag);
-			_positionTracker.UpdateByCheckpointTagForward(newTag2);
-		}
-
-		[Test]
-		public void stream_position_is_updated() {
-			Assert.AreEqual(2, _positionTracker.LastTag.Streams["stream1"]);
-		}
-
-
-		[Test]
-		public void cannot_update_to_the_same_postion() {
-			Assert.Throws<InvalidOperationException>(() => {
-				var newTag = CheckpointTag.FromStreamPosition(0, "stream1", 2);
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-			});
-		}
-
-		[Test]
-		public void it_cannot_be_updated_with_other_stream() {
-			Assert.Throws<InvalidOperationException>(() => {
-				// even not initialized (UpdateToZero can be removed)
-				var newTag = CheckpointTag.FromStreamPosition(0, "other_stream1", 2);
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-			});
-		}
-
-		//TODO: write tests on updating with incompatible snapshot loaded
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_updating_stream_postion_tracker_from_a_tag.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_updating_stream_postion_tracker_from_a_tag.cs
deleted file mode 100644
index 4d431e851bc..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_updating_stream_postion_tracker_from_a_tag.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.stream_position_tagger {
-	[TestFixture]
-	public class when_updating_stream_postion_tracker_from_a_tag {
-		private StreamPositionTagger _tagger;
-		private CheckpointTag _tag;
-		private PositionTracker _positionTracker;
-
-		[SetUp]
-		public void When() {
-			// given
-			var tagger = new StreamPositionTagger(0, "stream1");
-			var tracker = new PositionTracker(tagger);
-
-			var newTag = CheckpointTag.FromStreamPosition(0, "stream1", 1);
-			tracker.UpdateByCheckpointTagInitial(newTag);
-			_tag = tracker.LastTag;
-			_tagger = new StreamPositionTagger(0, "stream1");
-			_positionTracker = new PositionTracker(_tagger);
-			// when
-
-			_positionTracker.UpdateByCheckpointTagInitial(_tag);
-		}
-
-		[Test]
-		public void stream_position_is_updated() {
-			Assert.AreEqual(1, _positionTracker.LastTag.Streams["stream1"]);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_updating_stream_postion_tracker_to_zero.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_updating_stream_postion_tracker_to_zero.cs
deleted file mode 100644
index 3e15311bf29..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_updating_stream_postion_tracker_to_zero.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.stream_position_tagger {
-	[TestFixture]
-	public class when_updating_stream_postion_tracker_to_zero {
-		private StreamPositionTagger _tagger;
-		private PositionTracker _positionTracker;
-
-		[SetUp]
-		public void When() {
-			_tagger = new StreamPositionTagger(0, "stream1");
-			_positionTracker = new PositionTracker(_tagger);
-			// when 
-
-			_positionTracker.UpdateByCheckpointTagInitial(_tagger.MakeZeroCheckpointTag());
-		}
-
-		[Test]
-		public void streams_are_set_up() {
-			Assert.Contains("stream1", _positionTracker.LastTag.Streams.Keys);
-		}
-
-		[Test]
-		public void stream_position_is_minus_one() {
-			Assert.AreEqual(-1, _positionTracker.LastTag.Streams["stream1"]);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/transaction_file_position_tagger.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/transaction_file_position_tagger.cs
deleted file mode 100644
index a366f15beee..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/transaction_file_position_tagger.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.transaction_file_position_tagger {
-	[TestFixture]
-	public class transaction_file_position_tagger {
-		private ReaderSubscriptionMessage.CommittedEventDistributed _zeroEvent;
-		private ReaderSubscriptionMessage.CommittedEventDistributed _firstEvent;
-		private ReaderSubscriptionMessage.CommittedEventDistributed _secondEvent;
-
-		[SetUp]
-		public void setup() {
-			_zeroEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-				Guid.NewGuid(), new TFPos(10, 0), "stream", 0, false, Guid.NewGuid(), "StreamCreated", false,
-				new byte[0], new byte[0]);
-			_firstEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-				Guid.NewGuid(), new TFPos(30, 20), "stream", 1, false, Guid.NewGuid(), "Data", true,
-				Helper.UTF8NoBom.GetBytes("{}"), new byte[0]);
-			_secondEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-				Guid.NewGuid(), new TFPos(50, 40), "stream", 2, false, Guid.NewGuid(), "Data", true,
-				Helper.UTF8NoBom.GetBytes("{}"), new byte[0]);
-		}
-
-		[Test]
-		public void can_be_created() {
-			new TransactionFilePositionTagger(0);
-		}
-
-		[Test]
-		public void is_message_after_checkpoint_tag_after_case() {
-			var t = new TransactionFilePositionTagger(0);
-			var result = t.IsMessageAfterCheckpointTag(CheckpointTag.FromPosition(0, 20, 10), _firstEvent);
-			Assert.IsTrue(result);
-		}
-
-		[Test]
-		public void is_message_after_checkpoint_tag_before_case() {
-			var t = new TransactionFilePositionTagger(0);
-			var result = t.IsMessageAfterCheckpointTag(CheckpointTag.FromPosition(0, 50, 40), _firstEvent);
-			Assert.IsFalse(result);
-		}
-
-		[Test]
-		public void is_message_after_checkpoint_tag_equal_case() {
-			var t = new TransactionFilePositionTagger(0);
-			var result = t.IsMessageAfterCheckpointTag(CheckpointTag.FromPosition(0, 30, 20), _firstEvent);
-			Assert.IsFalse(result);
-		}
-
-		[Test]
-		public void position_checkpoint_tag_is_compatible() {
-			var t = new TransactionFilePositionTagger(0);
-			Assert.IsTrue(t.IsCompatible(CheckpointTag.FromPosition(0, 1000, 500)));
-		}
-
-		[Test]
-		public void stream_checkpoint_tag_is_incompatible() {
-			var t = new TransactionFilePositionTagger(0);
-			Assert.IsFalse(t.IsCompatible(CheckpointTag.FromStreamPosition(0, "stream2", 100)));
-		}
-
-		[Test]
-		public void adjust_compatible_tag_returns_the_same_tag() {
-			var t = new TransactionFilePositionTagger(0);
-			var tag = CheckpointTag.FromPosition(0, 100, 50);
-			Assert.AreSame(tag, t.AdjustTag(tag));
-		}
-
-		[Test]
-		public void can_adjust_tf_position_tag() {
-			var t = new TransactionFilePositionTagger(0);
-			var tag = CheckpointTag.FromPosition(0, 100, 50);
-			var original = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(100, 50),
-				new Dictionary<string, long> {{"type1", 1}, {"type2", 2}});
-			Assert.AreEqual(tag, t.AdjustTag(original));
-		}
-
-		[Test]
-		public void zero_position_tag_is_before_first_event_possible() {
-			var t = new TransactionFilePositionTagger(0);
-			var zero = t.MakeZeroCheckpointTag();
-
-			var zeroFromEvent = t.MakeCheckpointTag(zero, _zeroEvent);
-
-			Assert.IsTrue(zeroFromEvent > zero);
-		}
-
-		[Test]
-		public void produced_checkpoint_tags_are_correctly_ordered() {
-			var t = new TransactionFilePositionTagger(0);
-			var zero = t.MakeZeroCheckpointTag();
-
-			var zeroEvent = t.MakeCheckpointTag(zero, _zeroEvent);
-			var zeroEvent2 = t.MakeCheckpointTag(zeroEvent, _zeroEvent);
-			var first = t.MakeCheckpointTag(zeroEvent2, _firstEvent);
-			var second = t.MakeCheckpointTag(first, _secondEvent);
-			var second2 = t.MakeCheckpointTag(zero, _secondEvent);
-
-			Assert.IsTrue(zeroEvent > zero);
-			Assert.IsTrue(first > zero);
-			Assert.IsTrue(second > first);
-
-			Assert.AreEqual(zeroEvent2, zeroEvent);
-			Assert.AreEqual(second, second2);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_creating_transaction_file_postion_tracker.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_creating_transaction_file_postion_tracker.cs
deleted file mode 100644
index ddd9e8a6160..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_creating_transaction_file_postion_tracker.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.transaction_file_position_tagger {
-	[TestFixture]
-	public class when_creating_transaction_file_postion_tracker {
-		private PositionTagger _tagger;
-		private PositionTracker _positionTracker;
-
-		[SetUp]
-		public void when() {
-			_tagger = new TransactionFilePositionTagger(0);
-			_positionTracker = new PositionTracker(_tagger);
-		}
-
-		[Test]
-		public void it_can_be_updated() {
-			// even not initialized (UpdateToZero can be removed)
-			var newTag = CheckpointTag.FromPosition(0, 100, 50);
-			_positionTracker.UpdateByCheckpointTagInitial(newTag);
-		}
-
-		[Test]
-		public void initial_position_cannot_be_set_twice() {
-			Assert.Throws<InvalidOperationException>(() => {
-				var newTag = CheckpointTag.FromPosition(0, 100, 50);
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-			});
-		}
-
-		[Test]
-		public void it_can_be_updated_to_zero() {
-			_positionTracker.UpdateByCheckpointTagInitial(_tagger.MakeZeroCheckpointTag());
-		}
-
-		[Test]
-		public void it_cannot_be_updated_forward() {
-			Assert.Throws<InvalidOperationException>(() => {
-				var newTag = CheckpointTag.FromPosition(0, 100, 50);
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_reinitializing_transaction_file_postion_tracker.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_reinitializing_transaction_file_postion_tracker.cs
deleted file mode 100644
index a6f3f6a729a..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_reinitializing_transaction_file_postion_tracker.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.transaction_file_position_tagger {
-	[TestFixture]
-	public class when_reinitializing_transaction_file_postion_tracker {
-		private PositionTagger _tagger;
-		private CheckpointTag _tag;
-		private PositionTracker _positionTracker;
-
-		[SetUp]
-		public void When() {
-			// given
-			var tagger = new TransactionFilePositionTagger(0);
-			var positionTracker = new PositionTracker(tagger);
-
-			var newTag = CheckpointTag.FromPosition(0, 100, 50);
-			positionTracker.UpdateByCheckpointTagInitial(newTag);
-			_tag = positionTracker.LastTag;
-			_tagger = new TransactionFilePositionTagger(0);
-			_positionTracker = new PositionTracker(_tagger);
-			_positionTracker.UpdateByCheckpointTagInitial(_tag);
-			// when
-
-
-			_positionTracker.Initialize();
-		}
-
-		[Test]
-		public void it_can_be_updated() {
-			// even not initialized (UpdateToZero can be removed)
-			var newTag = CheckpointTag.FromPosition(0, 100, 50);
-			_positionTracker.UpdateByCheckpointTagInitial(newTag);
-		}
-
-		[Test]
-		public void initial_position_cannot_be_set_twice() {
-			Assert.Throws<InvalidOperationException>(() => {
-				var newTag = CheckpointTag.FromPosition(0, 100, 50);
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-			});
-		}
-
-		[Test]
-		public void it_can_be_updated_to_zero() {
-			_positionTracker.UpdateByCheckpointTagInitial(_tagger.MakeZeroCheckpointTag());
-		}
-
-		[Test]
-		public void it_cannot_be_updated_forward() {
-			Assert.Throws<InvalidOperationException>(() => {
-				var newTag = CheckpointTag.FromPosition(0, 100, 50);
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_updating_postion_tagger_from_a_tag.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_updating_postion_tagger_from_a_tag.cs
deleted file mode 100644
index c6919ac4e13..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_updating_postion_tagger_from_a_tag.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.transaction_file_position_tagger {
-	[TestFixture]
-	public class when_updating_postion_tagger_from_a_tag {
-		private PositionTagger _tagger;
-		private CheckpointTag _tag;
-		private PositionTracker _positionTracker;
-
-		[SetUp]
-		public void When() {
-			// given
-			var tagger = new TransactionFilePositionTagger(0);
-			var positionTracker = new PositionTracker(tagger);
-
-			var newTag = CheckpointTag.FromPosition(0, 100, 50);
-			positionTracker.UpdateByCheckpointTagInitial(newTag);
-			_tag = positionTracker.LastTag;
-			_tagger = new TransactionFilePositionTagger(0);
-			_positionTracker = new PositionTracker(_tagger);
-			// when
-
-			_positionTracker.UpdateByCheckpointTagInitial(_tag);
-		}
-
-		[Test]
-		public void position_is_updated() {
-			Assert.AreEqual(50, _positionTracker.LastTag.PreparePosition);
-			Assert.AreEqual(100, _positionTracker.LastTag.CommitPosition);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_updating_transaction_file_postion_tracker.cs b/src/EventStore.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_updating_transaction_file_postion_tracker.cs
deleted file mode 100644
index 2dea0056822..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_updating_transaction_file_postion_tracker.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.position_tagging.transaction_file_position_tagger {
-	[TestFixture]
-	public class when_updating_transaction_file_postion_tracker {
-		private PositionTagger _tagger;
-		private PositionTracker _positionTracker;
-
-		[SetUp]
-		public void When() {
-			// given
-			_tagger = new TransactionFilePositionTagger(0);
-			_positionTracker = new PositionTracker(_tagger);
-			var newTag = CheckpointTag.FromPosition(0, 100, 50);
-			_positionTracker.UpdateByCheckpointTagInitial(newTag);
-		}
-
-		[Test]
-		public void checkpoint_tag_is_for_correct_position() {
-			Assert.AreEqual(new TFPos(100, 50), _positionTracker.LastTag.Position);
-		}
-
-		[Test]
-		public void cannot_update_to_the_same_postion() {
-			Assert.Throws<InvalidOperationException>(() => {
-				var newTag = CheckpointTag.FromPosition(0, 100, 50);
-				_positionTracker.UpdateByCheckpointTagForward(newTag);
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projection_core_service/when_stopping_the_projection_core_service.cs b/src/EventStore.Projections.Core.Tests/Services/projection_core_service/when_stopping_the_projection_core_service.cs
deleted file mode 100644
index 644307dfbe5..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projection_core_service/when_stopping_the_projection_core_service.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projection_core_service {
-	[TestFixture]
-	public class when_stopping_the_projection_core_service_with_no_running_projections
-		: TestFixtureWithProjectionCoreService {
-		private readonly Guid _stopCorrelationId = Guid.NewGuid();
-
-		[SetUp]
-		public override void Setup() {
-			base.Setup();
-			_service.Handle(new ProjectionCoreServiceMessage.StopCore(_stopCorrelationId));
-		}
-
-		[Test]
-		public void should_handle_subcomponent_stopped() {
-			var componentStopped = _consumer.HandledMessages
-				.OfType<ProjectionCoreServiceMessage.SubComponentStopped>()
-				.LastOrDefault(x => x.SubComponent == "ProjectionCoreService");
-			Assert.IsNotNull(componentStopped);
-			Assert.AreEqual(_stopCorrelationId, componentStopped.QueueId);
-		}
-	}
-
-	[TestFixture]
-	public class when_stopping_the_projection_core_service_with_running_projections
-		: TestFixtureWithProjectionCoreService  {
-		private readonly Guid _projectionId = Guid.NewGuid();
-		private readonly Guid _stopCorrelationId = Guid.NewGuid();
-
-		[SetUp]
-		public override void Setup() {
-			base.Setup();
-			_bus.Subscribe<CoreProjectionStatusMessage.Suspended>(_service);
-			_service.Handle(new CoreProjectionManagementMessage.CreateAndPrepare(
-				_projectionId, _workerId, "test-projection",
-				new ProjectionVersion(), new ProjectionConfig(null, 1000, 1000 * 1000, 100, 500, true, true, false, false, true, 10000,
-					1, 250),
-				"JS", "fromStream('$user-admin').outputState()", true));
-			_service.Handle(new ProjectionCoreServiceMessage.StopCore(_stopCorrelationId));
-		}
-
-		[Test]
-		public void should_handle_projection_suspended_message() {
-			var suspended = _consumer.HandledMessages
-				.OfType<CoreProjectionStatusMessage.Suspended>()
-				.LastOrDefault(x => x.ProjectionId == _projectionId);
-			Assert.IsNotNull(suspended);
-		}
-
-		[Test]
-		public void should_handle_subcomponent_stopped() {
-			var componentStopped = _consumer.HandledMessages
-				.OfType<ProjectionCoreServiceMessage.SubComponentStopped>()
-				.LastOrDefault(x => x.SubComponent == "ProjectionCoreService");
-			Assert.IsNotNull(componentStopped);
-		}
-	}
-
-	[TestFixture]
-	public class when_stopping_the_projection_core_service_times_out_suspending_projections
-		: TestFixtureWithProjectionCoreService  {
-		private readonly Guid _projectionId = Guid.NewGuid();
-		private readonly Guid _stopCorrelationId = Guid.NewGuid();
-
-		[SetUp]
-		public override void Setup() {
-			base.Setup();
-			// Don't subscribe to the suspended message
-			_bus.Unsubscribe<CoreProjectionStatusMessage.Suspended>(_service);
-			_service.Handle(new CoreProjectionManagementMessage.CreateAndPrepare(
-				_projectionId, _workerId, "test-projection",
-				new ProjectionVersion(), new ProjectionConfig(null, 1000, 1000 * 1000, 100, 500, true, true, false, false, true, 10000,
-					1, 250),
-				"JS", "fromStream('$user-admin').outputState()", true));
-			_service.Handle(new ProjectionCoreServiceMessage.StopCore(_stopCorrelationId));
-			_service.Handle(new ProjectionCoreServiceMessage.StopCoreTimeout(_stopCorrelationId));
-		}
-
-		[Test]
-		public void should_handle_subcomponent_stopped() {
-			var componentStopped = _consumer.HandledMessages
-				.OfType<ProjectionCoreServiceMessage.SubComponentStopped>()
-				.LastOrDefault(x => x.SubComponent == "ProjectionCoreService");
-			Assert.IsNotNull(componentStopped);
-		}
-	}
-
-	[TestFixture]
-	public class when_stopping_the_projection_core_service_and_timeout_for_wrong_correlation_received
-		: TestFixtureWithProjectionCoreService  {
-		private readonly Guid _projectionId = Guid.NewGuid();
-		private readonly Guid _stopCorrelationId = Guid.NewGuid();
-
-		[SetUp]
-		public override void Setup() {
-			base.Setup();
-			// Don't subscribe to the suspended message
-			_bus.Unsubscribe<CoreProjectionStatusMessage.Suspended>(_service);
-			_service.Handle(new CoreProjectionManagementMessage.CreateAndPrepare(
-				_projectionId, _workerId, "test-projection",
-				new ProjectionVersion(), new ProjectionConfig(null, 1000, 1000 * 1000, 100, 500, true, true, false, false, true, 10000,
-					1, 250),
-				"JS", "fromStream('$user-admin').outputState()", true));
-			_service.Handle(new ProjectionCoreServiceMessage.StopCore(_stopCorrelationId));
-			_service.Handle(new ProjectionCoreServiceMessage.StopCoreTimeout(Guid.NewGuid()));
-		}
-
-		[Test]
-		public void should_not_handle_subcomponent_stopped() {
-			var componentStopped = _consumer.HandledMessages
-				.OfType<ProjectionCoreServiceMessage.SubComponentStopped>()
-				.LastOrDefault(x => x.SubComponent == "ProjectionCoreService");
-			Assert.IsNull(componentStopped);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projection_subscription/TestFixtureWithProjectionSubscription.cs b/src/EventStore.Projections.Core.Tests/Services/projection_subscription/TestFixtureWithProjectionSubscription.cs
deleted file mode 100644
index 86f116468a6..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projection_subscription/TestFixtureWithProjectionSubscription.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Bus.Helpers;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projection_subscription {
-	public abstract class TestFixtureWithProjectionSubscription {
-		protected Guid _projectionCorrelationId;
-		protected TestHandler<EventReaderSubscriptionMessage.CommittedEventReceived> _eventHandler;
-		protected TestHandler<EventReaderSubscriptionMessage.CheckpointSuggested> _checkpointHandler;
-		protected TestHandler<EventReaderSubscriptionMessage.ProgressChanged> _progressHandler;
-		protected TestHandler<EventReaderSubscriptionMessage.SubscriptionStarted> _subscriptionStartedHandler;
-		protected TestHandler<EventReaderSubscriptionMessage.NotAuthorized> _notAuthorizedHandler;
-		protected TestHandler<EventReaderSubscriptionMessage.EofReached> _eofHandler;
-		protected TestHandler<EventReaderSubscriptionMessage.PartitionEofReached> _partitionEofHandler;
-		protected TestHandler<EventReaderSubscriptionMessage.PartitionDeleted> _partitionDeletedHandler;
-		protected IReaderSubscription _subscription;
-		protected ITimeProvider _timeProvider;
-		protected SynchronousScheduler _bus;
-		protected Action<SourceDefinitionBuilder> _source = null;
-		protected int _checkpointUnhandledBytesThreshold;
-		protected int _checkpointProcessedEventsThreshold;
-		protected int _checkpointAfterMs;
-		protected IReaderStrategy _readerStrategy;
-
-		[SetUp]
-		public void setup() {
-			_checkpointUnhandledBytesThreshold = 1000;
-			_checkpointProcessedEventsThreshold = 2000;
-			_checkpointAfterMs = 10000;
-			_timeProvider = new RealTimeProvider();
-			Given();
-			_bus = new();
-			_projectionCorrelationId = Guid.NewGuid();
-			_eventHandler = new TestHandler<EventReaderSubscriptionMessage.CommittedEventReceived>();
-			_checkpointHandler = new TestHandler<EventReaderSubscriptionMessage.CheckpointSuggested>();
-			_progressHandler = new TestHandler<EventReaderSubscriptionMessage.ProgressChanged>();
-			_subscriptionStartedHandler = new TestHandler<EventReaderSubscriptionMessage.SubscriptionStarted>();
-			_notAuthorizedHandler = new TestHandler<EventReaderSubscriptionMessage.NotAuthorized>();
-			_eofHandler = new TestHandler<EventReaderSubscriptionMessage.EofReached>();
-			_partitionEofHandler = new TestHandler<EventReaderSubscriptionMessage.PartitionEofReached>();
-			_partitionDeletedHandler = new TestHandler<EventReaderSubscriptionMessage.PartitionDeleted>();
-
-			_bus.Subscribe(_eventHandler);
-			_bus.Subscribe(_checkpointHandler);
-			_bus.Subscribe(_progressHandler);
-			_bus.Subscribe(_eofHandler);
-			_bus.Subscribe(_partitionEofHandler);
-			_readerStrategy = CreateCheckpointStrategy();
-			_subscription = CreateProjectionSubscription();
-
-
-			When();
-		}
-
-		protected virtual IReaderSubscription CreateProjectionSubscription() {
-			return new ReaderSubscription(
-				"Test Subscription",
-				_bus,
-				_projectionCorrelationId,
-				_readerStrategy.PositionTagger.MakeZeroCheckpointTag(),
-				_readerStrategy,
-				_timeProvider,
-				_checkpointUnhandledBytesThreshold,
-				_checkpointProcessedEventsThreshold,
-				_checkpointAfterMs,
-				false,
-				null,
-				false);
-		}
-
-		protected virtual void Given() {
-		}
-
-		protected abstract void When();
-
-		protected virtual IReaderStrategy CreateCheckpointStrategy() {
-			var readerBuilder = new SourceDefinitionBuilder();
-			if (_source != null) {
-				_source(readerBuilder);
-			} else {
-				readerBuilder.FromAll();
-				readerBuilder.AllEvents();
-			}
-
-			var config = new ProjectionConfig(null, 1000, 1000 * 1000, 100, 500, true, true, false, false, true, 10000,
-				1, 250);
-			IQuerySources sources = readerBuilder.Build();
-			var readerStrategy = ReaderStrategy.Create(
-				"test",
-				0,
-				sources,
-				_timeProvider,
-				stopOnEof: false,
-				runAs: config.RunAs);
-			return readerStrategy;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projection_subscription/failing_test_github_issue_2785.cs b/src/EventStore.Projections.Core.Tests/Services/projection_subscription/failing_test_github_issue_2785.cs
deleted file mode 100644
index e4d44ef0bcd..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projection_subscription/failing_test_github_issue_2785.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projection_subscription {
-	public class
-		failing_test_github_issue_2785 :
-			TestFixtureWithProjectionSubscription {
-
-		protected override void Given() {
-			_source = source => {
-				source.FromAll();
-				source.IncludeEvent("good-event-type");
-			};
-		}
-
-		protected override void When() {
-		}
-
-		[Test]
-		public void should_gracefully_handle_resolved_linkto_events() {
-			var stream = "any-stream-name";
-			var eventType = "any-event-type";
-			var position = new TFPos(-1, 200); //resolved linkTo event with incomplete TF position
-			var resolvedLinkToEvent = true;
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), position, stream, 1, resolvedLinkToEvent, Guid.NewGuid(),
-					eventType, false, new byte[0], new byte[0]));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_creating_projection_subscription.cs b/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_creating_projection_subscription.cs
deleted file mode 100644
index 094930169e8..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_creating_projection_subscription.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using System;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projection_subscription {
-	[TestFixture]
-	public class when_creating_projection_subscription {
-		[Test]
-		public void it_can_be_created() {
-			new ReaderSubscription(
-				"Test Subscription",
-				new FakePublisher(),
-				Guid.NewGuid(),
-				CheckpointTag.FromPosition(0, 0, -1),
-				CreateReaderStrategy(),
-				new FakeTimeProvider(),
-				1000,
-				2000,
-				10000,
-				false,
-				null,
-				false);
-		}
-
-		[Test]
-		public void null_publisher_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				new ReaderSubscription(
-					"Test Subscription",
-					null,
-					Guid.NewGuid(),
-					CheckpointTag.FromPosition(0, 0, -1),
-					CreateReaderStrategy(),
-					new FakeTimeProvider(),
-					1000,
-					2000,
-					10000,
-					false,
-					null,
-					false);
-			});
-		}
-
-		[Test]
-		public void null_checkpoint_strategy_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				new ReaderSubscription(
-					"Test Subscription",
-					new FakePublisher(),
-					Guid.NewGuid(),
-					CheckpointTag.FromPosition(0, 0, -1),
-					null,
-					new FakeTimeProvider(),
-					1000,
-					2000,
-					10000,
-					false,
-					null,
-					false);
-			});
-		}
-
-		[Test]
-		public void null_time_provider_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				new ReaderSubscription(
-					"Test Subscription",
-					new FakePublisher(),
-					Guid.NewGuid(),
-					CheckpointTag.FromPosition(0, 0, -1),
-					CreateReaderStrategy(),
-					null,
-					1000,
-					2000,
-					10000,
-					false,
-					null,
-					false);
-			});
-		}
-
-		private IReaderStrategy CreateReaderStrategy() {
-			var result = new SourceDefinitionBuilder();
-			result.FromAll();
-			result.AllEvents();
-			return ReaderStrategy.Create(
-				"test",
-				0,
-				result.Build(),
-				new RealTimeProvider(),
-				stopOnEof: false,
-				runAs: null);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_handling_committed_event_passing_the_filter.cs b/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_handling_committed_event_passing_the_filter.cs
deleted file mode 100644
index a2620e655e1..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_handling_committed_event_passing_the_filter.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projection_subscription {
-	[TestFixture]
-	public class when_handling_committed_event_passing_the_filter : TestFixtureWithProjectionSubscription {
-		protected override void When() {
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(200, 150), "test-stream", 1, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0]));
-		}
-
-		[Test]
-		public void event_is_passed_to_downstream_handler() {
-			Assert.AreEqual(1, _eventHandler.HandledMessages.Count);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_handling_duplicate_events.cs b/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_handling_duplicate_events.cs
deleted file mode 100644
index 47af5ecd8bd..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_handling_duplicate_events.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projection_subscription {
-	[TestFixture]
-	public class when_handling_duplicate_events : TestFixtureWithProjectionSubscription {
-		protected override void When() {
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(200, 150), "test-stream", 1, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0]));
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(100, 50), "test-stream", 0, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0]));
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(200, 150), "test-stream", 1, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0]));
-		}
-
-		[Test]
-		public void duplicates_are_not_passed_to_downstream_handler() {
-			Assert.AreEqual(1, _eventHandler.HandledMessages.Count);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_handling_enough_events_for_a_checkpoint_after_specified_time_elapses.cs b/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_handling_enough_events_for_a_checkpoint_after_specified_time_elapses.cs
deleted file mode 100644
index ee1d22f753b..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_handling_enough_events_for_a_checkpoint_after_specified_time_elapses.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using EventStore.Core.Tests.Services.TimeService;
-
-namespace EventStore.Projections.Core.Tests.Services.projection_subscription {
-	[TestFixture]
-	public class
-		when_handling_enough_events_for_a_checkpoint_after_specified_time_elapses :
-			TestFixtureWithProjectionSubscription {
-		protected override void Given() {
-			_checkpointAfterMs = 1000;
-			_checkpointProcessedEventsThreshold = 1;
-			_timeProvider = new FakeTimeProvider();
-		}
-
-		protected override void When() {
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(200, 200), "test-stream", 1, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0]));
-			_checkpointHandler.HandledMessages.Clear();
-			((FakeTimeProvider)_timeProvider).AddToUtcTime(TimeSpan.FromMilliseconds(_checkpointAfterMs + 1));
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(300, 300), "test-stream", 1, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0]));
-		}
-
-		[Test]
-		public void checkpoint_is_suggested() {
-			Assert.AreEqual(1, _checkpointHandler.HandledMessages.Count);
-		}
-	}
-
-	[TestFixture]
-	public class
-		when_handling_enough_events_for_a_checkpoint_after_specified_time_elapses_and_not_passing_filter :
-			TestFixtureWithProjectionSubscription {
-		protected override void Given() {
-			_source = source => {
-				source.FromAll();
-				source.IncludeEvent("specific-event");
-			};
-			_checkpointAfterMs = 1000;
-			_checkpointUnhandledBytesThreshold = 50;
-			_checkpointProcessedEventsThreshold = 1;
-			_timeProvider = new FakeTimeProvider();
-		}
-
-		protected override void When() {
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(200, 200), "test-stream", 1, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0]));
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(300, 300), "test-stream", 1, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0]));
-			_checkpointHandler.HandledMessages.Clear();
-			((FakeTimeProvider)_timeProvider).AddToUtcTime(TimeSpan.FromMilliseconds(_checkpointAfterMs + 1));
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(400, 400), "test-stream", 1, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0]));
-		}
-
-		[Test]
-		public void checkpoint_is_suggested() {
-			Assert.AreEqual(1, _checkpointHandler.HandledMessages.Count);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_handling_enough_events_for_a_checkpoint_before_specified_time_elapses.cs b/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_handling_enough_events_for_a_checkpoint_before_specified_time_elapses.cs
deleted file mode 100644
index 0c51482befd..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_handling_enough_events_for_a_checkpoint_before_specified_time_elapses.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using EventStore.Core.Tests.Services.TimeService;
-
-namespace EventStore.Projections.Core.Tests.Services.projection_subscription {
-	[TestFixture]
-	public class
-		when_handling_enough_events_for_a_checkpoint_before_specified_time_elapses :
-			TestFixtureWithProjectionSubscription {
-		protected override void Given() {
-			_checkpointAfterMs = 1000;
-			_checkpointProcessedEventsThreshold = 1;
-			_timeProvider = new FakeTimeProvider();
-		}
-
-		protected override void When() {
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(200, 200), "test-stream", 1, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0]));
-			_checkpointHandler.HandledMessages.Clear();
-			((FakeTimeProvider)_timeProvider).AddToUtcTime(TimeSpan.FromMilliseconds(_checkpointAfterMs));
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(300, 300), "test-stream", 1, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0]));
-		}
-
-		[Test]
-		public void checkpoint_is_not_suggested() {
-			Assert.AreEqual(0, _checkpointHandler.HandledMessages.Count);
-		}
-	}
-
-	[TestFixture]
-	public class
-		when_handling_enough_events_for_a_checkpoint_before_specified_time_elapses_and_not_passing_filter :
-			TestFixtureWithProjectionSubscription {
-		protected override void Given() {
-			_source = source => {
-				source.FromAll();
-				source.IncludeEvent("specific-event");
-			};
-			_checkpointAfterMs = 1000;
-			_checkpointUnhandledBytesThreshold = 50;
-			_checkpointProcessedEventsThreshold = 1;
-			_timeProvider = new FakeTimeProvider();
-		}
-
-		protected override void When() {
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(200, 200), "test-stream", 1, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0]));
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(300, 300), "test-stream", 1, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0]));
-			_checkpointHandler.HandledMessages.Clear();
-			((FakeTimeProvider)_timeProvider).AddToUtcTime(TimeSpan.FromMilliseconds(_checkpointAfterMs));
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(400, 400), "test-stream", 1, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0]));
-		}
-
-		[Test]
-		public void checkpoint_is_not_suggested() {
-			Assert.AreEqual(0, _checkpointHandler.HandledMessages.Count);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_handling_events_with_content_type_validation.cs b/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_handling_events_with_content_type_validation.cs
deleted file mode 100644
index 924c9deb213..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_handling_events_with_content_type_validation.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-using System;
-using System.Text;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projection_subscription {
-	public class when_handling_events_with_content_type_validation {
-		[TestFixture]
-		public class given_json_events_and_content_type_validation_enabled : TestFixtureWithProjectionSubscription {
-			protected override void When() {
-				_subscription.Handle(
-					ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						Guid.NewGuid(), new TFPos(100, 100), "test-stream", 0, false, Guid.NewGuid(),
-						"null-json", true, null, null));
-				_subscription.Handle(
-					ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						Guid.NewGuid(), new TFPos(200, 200), "test-stream", 1, false, Guid.NewGuid(),
-						"invalid-json", true, Encoding.UTF8.GetBytes("{foo:bar}"), new byte[0]));
-				_subscription.Handle(
-					ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						Guid.NewGuid(), new TFPos(300, 300), "test-stream", 2, false, Guid.NewGuid(),
-						"valid-json", true, Encoding.UTF8.GetBytes("{\"foo\":\"bar\"}"), new byte[0]));
-			}
-
-			protected override IReaderSubscription CreateProjectionSubscription() {
-				return new ReaderSubscription(
-					"Test Subscription",
-					_bus,
-					_projectionCorrelationId,
-					_readerStrategy.PositionTagger.MakeZeroCheckpointTag(),
-					_readerStrategy,
-					_timeProvider,
-					_checkpointUnhandledBytesThreshold,
-					_checkpointProcessedEventsThreshold,
-					_checkpointAfterMs,
-					false,
-					null,
-					true);
-			}
-
-			[Test]
-			public void only_the_valid_json_is_handled() {
-				Assert.AreEqual(1, _eventHandler.HandledMessages.Count);
-				Assert.AreEqual("valid-json", _eventHandler.HandledMessages[0].Data.EventType);
-			}
-		}
-
-		[TestFixture]
-		public class given_non_json_events_and_content_type_validation_enabled : TestFixtureWithProjectionSubscription {
-			protected override void When() {
-				_subscription.Handle(
-					ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						Guid.NewGuid(), new TFPos(100, 100), "test-stream", 0, false, Guid.NewGuid(),
-						"null-event", false, null, null));
-				_subscription.Handle(
-					ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						Guid.NewGuid(), new TFPos(200, 200), "test-stream", 1, false, Guid.NewGuid(),
-						"plain-text", false, Encoding.UTF8.GetBytes("foo bar"), new byte[0]));
-				_subscription.Handle(
-					ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						Guid.NewGuid(), new TFPos(300, 300), "test-stream", 2, false, Guid.NewGuid(),
-						"valid-json", false, Encoding.UTF8.GetBytes("{\"foo\":\"bar\"}"), new byte[0]));
-			}
-
-			protected override IReaderSubscription CreateProjectionSubscription() {
-				return new ReaderSubscription(
-					"Test Subscription",
-					_bus,
-					_projectionCorrelationId,
-					_readerStrategy.PositionTagger.MakeZeroCheckpointTag(),
-					_readerStrategy,
-					_timeProvider,
-					_checkpointUnhandledBytesThreshold,
-					_checkpointProcessedEventsThreshold,
-					_checkpointAfterMs,
-					false,
-					null,
-					true);
-			}
-
-			[Test]
-			public void all_events_are_handled() {
-				Assert.AreEqual(3, _eventHandler.HandledMessages.Count);
-			}
-		}
-
-		[TestFixture]
-		public class given_json_and_non_json_events_and_content_type_validation_disabled : TestFixtureWithProjectionSubscription {
-			protected override void When() {
-				_subscription.Handle(
-					ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						Guid.NewGuid(), new TFPos(100, 100), "test-stream", 0, false, Guid.NewGuid(),
-						"null-json", true, null, null));
-				_subscription.Handle(
-					ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						Guid.NewGuid(), new TFPos(200, 200), "test-stream", 1, false, Guid.NewGuid(),
-						"invalid-json", true, Encoding.UTF8.GetBytes("{foo:bar}"), new byte[0]));
-				_subscription.Handle(
-					ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						Guid.NewGuid(), new TFPos(300, 300), "test-stream", 2, false, Guid.NewGuid(),
-						"valid-json", true, Encoding.UTF8.GetBytes("{\"foo\":\"bar\"}"), new byte[0]));
-				_subscription.Handle(
-					ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						Guid.NewGuid(), new TFPos(400, 400), "test-stream", 3, false, Guid.NewGuid(),
-						"null-event", false, null, null));
-				_subscription.Handle(
-					ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						Guid.NewGuid(), new TFPos(500, 500), "test-stream", 4, false, Guid.NewGuid(),
-						"plain-text", false, Encoding.UTF8.GetBytes("foo bar"), new byte[0]));
-				_subscription.Handle(
-					ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						Guid.NewGuid(), new TFPos(600, 600), "test-stream", 5, false, Guid.NewGuid(),
-						"valid-json", false, Encoding.UTF8.GetBytes("{\"foo\":\"bar\"}"), new byte[0]));
-			}
-
-			protected override IReaderSubscription CreateProjectionSubscription() {
-				return new ReaderSubscription(
-					"Test Subscription",
-					_bus,
-					_projectionCorrelationId,
-					_readerStrategy.PositionTagger.MakeZeroCheckpointTag(),
-					_readerStrategy,
-					_timeProvider,
-					_checkpointUnhandledBytesThreshold,
-					_checkpointProcessedEventsThreshold,
-					_checkpointAfterMs,
-					false,
-					null,
-					false);
-			}
-
-			[Test]
-			public void all_events_are_handled() {
-				Assert.AreEqual(6, _eventHandler.HandledMessages.Count);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_handling_events_with_different_event_filters.cs b/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_handling_events_with_different_event_filters.cs
deleted file mode 100644
index d1dd8ce4d78..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_handling_events_with_different_event_filters.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using EventStore.Core.Tests.Services.TimeService;
-
-namespace EventStore.Projections.Core.Tests.Services.projection_subscription {
-	[TestFixture("$all", "good-event-type", "any-stream", "bad-event-type", true, true)]
-	[TestFixture("$all", "good-event-type", "any-stream", "bad-event-type", true, false)]
-	[TestFixture("$all", "good-event-type", "any-stream", "bad-event-type", false, true)]
-	[TestFixture("$all", "good-event-type", "any-stream", "bad-event-type", false, false)]
-	[TestFixture("$all", "good-event-type", "any-stream", "good-event-type", true, true)]
-	[TestFixture("$all", "good-event-type", "any-stream", "good-event-type", true, false)]
-	[TestFixture("$all", "good-event-type", "any-stream", "good-event-type", false, true)]
-	[TestFixture("$all", "good-event-type", "any-stream", "good-event-type", false, false)]
-	[TestFixture("good-stream", "good-event-type", "good-stream", "good-event-type", true, true)]
-	[TestFixture("good-stream", "good-event-type", "good-stream", "good-event-type", true, false)]
-	[TestFixture("good-stream", "good-event-type", "good-stream", "good-event-type", false, true)]
-	[TestFixture("good-stream", "good-event-type", "good-stream", "good-event-type", false, false)]
-	[TestFixture("good-stream", "good-event-type", "good-stream", "bad-event-type", true, true)]
-	[TestFixture("good-stream", "good-event-type", "good-stream", "bad-event-type", true, false)]
-	[TestFixture("good-stream", "good-event-type", "good-stream", "bad-event-type", false, true)]
-	[TestFixture("good-stream", "good-event-type", "good-stream", "bad-event-type", false, false)]
-	[TestFixture("good-stream", "good-event-type", "bad-stream", "good-event-type", false, true)]
-	[TestFixture("good-stream", "good-event-type", "bad-stream", "good-event-type", false, false)]
-	[TestFixture("good-stream", "good-event-type", "bad-stream", "bad-event-type", false, true)]
-	[TestFixture("good-stream", "good-event-type", "bad-stream", "bad-event-type", false, false)]
-	public class
-		when_handling_events_with_different_event_filters :
-			TestFixtureWithProjectionSubscription {
-		private string _sourceStream;
-		private string _sourceEventType;
-		private string _stream;
-		private string _eventType;
-		private bool _exceedUnhandledBytesThreshold;
-		private bool _checkpointIfEventsProcessed;
-		private int _processedEvents;
-
-		public when_handling_events_with_different_event_filters(
-			string sourceStream, string sourceEventType, string stream, string eventType, bool exceedUnhandledBytesThreshold, bool checkpointIfEventsProcessed) {
-			_sourceStream = sourceStream;
-			_sourceEventType = sourceEventType;
-			_stream = stream;
-			_eventType = eventType;
-			_exceedUnhandledBytesThreshold = exceedUnhandledBytesThreshold;
-			_checkpointIfEventsProcessed = checkpointIfEventsProcessed;
-			var passesEventFilter = (sourceStream == "$all" || stream == sourceStream) && eventType == sourceEventType;
-			_processedEvents =  passesEventFilter ? 1 : 0;
-		}
-
-		protected override void Given() {
-			_source = source => {
-				if (_sourceStream == "$all") {
-					source.FromAll();
-				} else {
-					source.FromStream(_sourceStream);
-				}
-				source.IncludeEvent(_sourceEventType);
-			};
-			_checkpointAfterMs = 1000;
-			_checkpointProcessedEventsThreshold = _checkpointIfEventsProcessed ? 1 : 2;
-			_checkpointUnhandledBytesThreshold = 4096;
-			_timeProvider = new FakeTimeProvider();
-		}
-
-		protected override void When() {
-			var firstPosition = new TFPos(200, 200);
-			var offset = _exceedUnhandledBytesThreshold
-				? (_checkpointUnhandledBytesThreshold + 1)
-				: _checkpointUnhandledBytesThreshold;
-			var secondPosition = new TFPos(firstPosition.CommitPosition + offset, firstPosition.PreparePosition + offset);
-
-			//send a first event for checkpointing initialization if necessary
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), firstPosition, "a-random-stream-name", 1, false, Guid.NewGuid(),
-					"a-random-event-type", false, new byte[0], new byte[0]));
-
-			_checkpointHandler.HandledMessages.Clear();
-
-			//send a second event to trigger checkpoint if necessary
-			((FakeTimeProvider)_timeProvider).AddToUtcTime(TimeSpan.FromMilliseconds(_checkpointAfterMs + 1));
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), secondPosition, _stream, 1, false, Guid.NewGuid(),
-					_eventType, false, new byte[0], new byte[0]));
-		}
-
-		[Test]
-		public void checkpoint_is_suggested_when_processed_events_threshold_exceeded_or_unhandled_bytes_threshold_exceeded() {
-			var shouldCheckpoint = (_processedEvents >= _checkpointProcessedEventsThreshold) ||
-			                       (_processedEvents == 0 && _exceedUnhandledBytesThreshold);
-			Assert.AreEqual(shouldCheckpoint ? 1 : 0, _checkpointHandler.HandledMessages.Count);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_handling_multiple_committed_event_passing_the_filter.cs b/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_handling_multiple_committed_event_passing_the_filter.cs
deleted file mode 100644
index 57553b9c3b6..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_handling_multiple_committed_event_passing_the_filter.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projection_subscription {
-	[TestFixture]
-	public class when_handling_multiple_committed_event_passing_the_filter : TestFixtureWithProjectionSubscription {
-		protected override void Given() {
-			base.Given();
-			_checkpointProcessedEventsThreshold = 2;
-		}
-
-		protected override void When() {
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(200, 150), "test-stream", 1, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0]));
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(300, 250), "test-stream", 2, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0]));
-		}
-
-		[Test]
-		public void events_passed_to_downstream_handler_have_correct_subscription_sequence_numbers() {
-			Assert.AreEqual(2, _eventHandler.HandledMessages.Count);
-
-			Assert.AreEqual(0, _eventHandler.HandledMessages[0].SubscriptionMessageSequenceNumber);
-			Assert.AreEqual(1, _eventHandler.HandledMessages[1].SubscriptionMessageSequenceNumber);
-		}
-
-		[Test]
-		public void suggests_a_checkpoint() {
-			Assert.AreEqual(1, _checkpointHandler.HandledMessages.Count);
-			Assert.AreEqual(CheckpointTag.FromPosition(0, 300, 250),
-				_checkpointHandler.HandledMessages[0].CheckpointTag);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_receiving_multiple_events_not_passing_event_filter.cs b/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_receiving_multiple_events_not_passing_event_filter.cs
deleted file mode 100644
index 228a4589796..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projection_subscription/when_receiving_multiple_events_not_passing_event_filter.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projection_subscription {
-	[TestFixture]
-	public class when_receiving_multiple_events_not_passing_event_filter : TestFixtureWithProjectionSubscription {
-		protected override void Given() {
-			_source = source => {
-				source.FromAll();
-				source.IncludeEvent("specific-event");
-			};
-		}
-
-		protected override void When() {
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(200, 150), "test-stream", 1, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0]));
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(2000, 1950), "test-stream", 2, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0]));
-			_subscription.Handle(
-				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-					Guid.NewGuid(), new TFPos(2100, 2050), "test-stream", 2, false, Guid.NewGuid(),
-					"bad-event-type", false, new byte[0], new byte[0]));
-		}
-
-		[Test]
-		public void checkpoint_suggested_message_is_published_once_for_interval() {
-			Assert.AreEqual(1, _checkpointHandler.HandledMessages.Count);
-			Assert.AreEqual(2000, _checkpointHandler.HandledMessages[0].CheckpointTag.CommitPosition);
-			Assert.AreEqual(1950, _checkpointHandler.HandledMessages[0].CheckpointTag.PreparePosition);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projection_version/when_comparing.cs b/src/EventStore.Projections.Core.Tests/Services/projection_version/when_comparing.cs
deleted file mode 100644
index bbbc9e7e3e5..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projection_version/when_comparing.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projection_version {
-	[TestFixture]
-	public class when_comparing {
-		[Test]
-		public void equal() {
-			var v1 = new ProjectionVersion(10, 5, 6);
-			var v2 = new ProjectionVersion(10, 5, 6);
-
-			Assert.AreEqual(v1, v2);
-		}
-
-		[Test]
-		public void not_equal_id() {
-			var v1 = new ProjectionVersion(10, 5, 6);
-			var v2 = new ProjectionVersion(11, 5, 6);
-
-			Assert.AreNotEqual(v1, v2);
-		}
-
-		[Test]
-		public void not_equal_epoch() {
-			var v1 = new ProjectionVersion(10, 5, 6);
-			var v2 = new ProjectionVersion(11, 6, 6);
-
-			Assert.AreNotEqual(v1, v2);
-		}
-
-		[Test]
-		public void not_equal_version() {
-			var v1 = new ProjectionVersion(10, 5, 6);
-			var v2 = new ProjectionVersion(10, 5, 7);
-
-			Assert.AreNotEqual(v1, v2);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/FakeBiStateProjection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/FakeBiStateProjection.cs
deleted file mode 100644
index 6707f7c28cc..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/FakeBiStateProjection.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	public class FakeBiStateProjection : IProjectionStateHandler {
-		private readonly string _query;
-		private readonly Action<string, object[]> _logger;
-
-		public FakeBiStateProjection(string query, Action<string, object[]> logger) {
-			_query = query;
-			_logger = logger;
-		}
-
-		public void Dispose() {
-		}
-
-		private void Log(string msg, params object[] args) {
-			_logger(msg, args);
-		}
-
-		public void ConfigureSourceProcessingStrategy(SourceDefinitionBuilder builder) {
-			Log("ConfigureSourceProcessingStrategy(" + builder + ")");
-			builder.FromAll();
-			builder.AllEvents();
-			builder.SetByStream();
-			builder.SetIsBiState(true);
-		}
-
-		public void Load(string state) {
-			Log("Load(" + state + ")");
-		}
-
-		public void LoadShared(string state) {
-			Log("LoadShared(" + state + ")");
-		}
-
-		public void Initialize() {
-			Log("Initialize");
-		}
-
-		public void InitializeShared() {
-			Log("InitializeShared");
-		}
-
-		public string GetStatePartition(CheckpointTag eventPosition, string category, ResolvedEvent data) {
-			Log("GetStatePartition(" + "..." + ")");
-			throw new NotImplementedException();
-		}
-
-		public bool ProcessEvent(
-			string partition, CheckpointTag eventPosition, string category1, ResolvedEvent data, out string newState,
-			out string newSharedState, out EmittedEventEnvelope[] emittedEvents) {
-			newSharedState = null;
-			if (data.EventType == "fail" || _query == "fail")
-				throw new Exception("failed");
-			Log("ProcessEvent(" + "..." + ")");
-			newState = "{\"data\": 1}";
-			newSharedState = "{\"data\": 2}";
-			emittedEvents = null;
-			return true;
-		}
-
-		public bool ProcessPartitionCreated(string partition, CheckpointTag createPosition, ResolvedEvent data,
-			out EmittedEventEnvelope[] emittedEvents) {
-			Log("ProcessPartitionCreated");
-			emittedEvents = null;
-			return false;
-		}
-
-		public bool ProcessPartitionDeleted(string partition, CheckpointTag deletePosition, out string newState) {
-			throw new NotImplementedException();
-		}
-
-		public string TransformStateToResult() {
-			throw new NotImplementedException();
-		}
-
-		public IQuerySources GetSourceDefinition() {
-			return SourceDefinitionBuilder.From(ConfigureSourceProcessingStrategy);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/FakeForeachStreamProjection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/FakeForeachStreamProjection.cs
deleted file mode 100644
index 36e2a113edd..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/FakeForeachStreamProjection.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	public class FakeForeachStreamProjection : IProjectionStateHandler {
-		private readonly string _query;
-		private readonly Action<string, object[]> _logger;
-		private string _state;
-
-		public FakeForeachStreamProjection(string query, Action<string, object[]> logger) {
-			_query = query;
-			_logger = logger;
-		}
-
-		public void Dispose() {
-		}
-
-		private void Log(string msg, params object[] args) {
-			_logger(msg, args);
-		}
-
-		public void ConfigureSourceProcessingStrategy(SourceDefinitionBuilder builder) {
-			Log("ConfigureSourceProcessingStrategy(" + builder + ")");
-			builder.FromAll();
-			builder.AllEvents();
-			builder.SetByStream();
-			builder.SetDefinesStateTransform();
-		}
-
-		public void Load(string state) {
-			Log("Load(" + state + ")");
-			_state = state;
-		}
-
-		public void LoadShared(string state) {
-			throw new NotImplementedException();
-		}
-
-		public void Initialize() {
-			Log("Initialize");
-			_state = "";
-		}
-
-		public void InitializeShared() {
-			Log("InitializeShared");
-			throw new NotImplementedException();
-		}
-
-		public string GetStatePartition(CheckpointTag eventPosition, string category, ResolvedEvent data) {
-			Log("GetStatePartition(" + "..." + ")");
-			return @data.EventStreamId;
-		}
-
-		public bool ProcessEvent(
-			string partition, CheckpointTag eventPosition, string category1, ResolvedEvent data,
-			out string newState, out string newSharedState, out EmittedEventEnvelope[] emittedEvents) {
-			newSharedState = null;
-			if (data.EventType == "fail" || _query == "fail")
-				throw new Exception("failed");
-			Log("ProcessEvent(" + "..." + ")");
-			newState = "{\"data\": " + _state + data + "}";
-			emittedEvents = null;
-			return true;
-		}
-
-		public bool ProcessPartitionCreated(string partition, CheckpointTag createPosition, ResolvedEvent data,
-			out EmittedEventEnvelope[] emittedEvents) {
-			Log("Process ProcessPartitionCreated");
-			emittedEvents = null;
-			return false;
-		}
-
-		public bool ProcessPartitionDeleted(string partition, CheckpointTag deletePosition, out string newState) {
-			throw new NotImplementedException();
-		}
-
-		public string TransformStateToResult() {
-			return _state;
-		}
-
-		public IQuerySources GetSourceDefinition() {
-			return SourceDefinitionBuilder.From(ConfigureSourceProcessingStrategy);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/FakeProjection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/FakeProjection.cs
deleted file mode 100644
index 2ddd5e17261..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/FakeProjection.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	public class FakeProjection : IProjectionStateHandler {
-		private readonly string _query;
-		private readonly Action<string, object[]> _logger;
-
-		public FakeProjection(string query, Action<string, object[]> logger) {
-			_query = query;
-			_logger = logger;
-		}
-
-		public void Dispose() {
-		}
-
-		private void Log(string msg, params object[] args) {
-			_logger(msg, args);
-		}
-
-		public void ConfigureSourceProcessingStrategy(SourceDefinitionBuilder builder) {
-			Log("ConfigureSourceProcessingStrategy(" + builder + ")");
-			builder.FromAll();
-			builder.AllEvents();
-		}
-
-		public void Load(string state) {
-			Log("Load(" + state + ")");
-			throw new NotImplementedException();
-		}
-
-		public void LoadShared(string state) {
-			throw new NotImplementedException();
-		}
-
-		public void Initialize() {
-			Log("Initialize");
-		}
-
-		public void InitializeShared() {
-			Log("InitializeShared");
-		}
-
-		public string GetStatePartition(CheckpointTag eventPosition, string category, ResolvedEvent data) {
-			Log("GetStatePartition(" + "..." + ")");
-			throw new NotImplementedException();
-		}
-
-		public bool ProcessEvent(
-			string partition, CheckpointTag eventPosition, string category1, ResolvedEvent data,
-			out string newState, out string newSharedState, out EmittedEventEnvelope[] emittedEvents) {
-			newSharedState = null;
-			if (data.EventType == "fail" || _query == "fail")
-				throw new Exception("failed");
-			Log("ProcessEvent(" + "..." + ")");
-			newState = "{\"data\": 1}";
-			emittedEvents = null;
-			return true;
-		}
-
-		public bool ProcessPartitionCreated(string partition, CheckpointTag createPosition, ResolvedEvent data,
-			out EmittedEventEnvelope[] emittedEvents) {
-			Log("Process ProcessPartitionCreated");
-			emittedEvents = null;
-			return false;
-		}
-
-		public bool ProcessPartitionDeleted(string partition, CheckpointTag deletePosition, out string newState) {
-			throw new NotImplementedException();
-		}
-
-		public string TransformStateToResult() {
-			throw new NotImplementedException();
-		}
-
-		public IQuerySources GetSourceDefinition() {
-			return SourceDefinitionBuilder.From(ConfigureSourceProcessingStrategy);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/TestFixtureWithProjectionCoreAndManagementServices.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/TestFixtureWithProjectionCoreAndManagementServices.cs
deleted file mode 100644
index 99522e123c3..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/TestFixtureWithProjectionCoreAndManagementServices.cs
+++ /dev/null
@@ -1,264 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using DotNext;
-using EventStore.Common.Options;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Services.Monitoring.Stats;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.Util;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Messaging;
-using EventStore.Projections.Core.Metrics;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	public abstract class TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> : core_projection.TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		protected class GuardBusToTriggerFixingIfUsed : IQueuedHandler, IPublisher, ISubscriber {
-			public void Handle(Message message) {
-				throw new NotImplementedException();
-			}
-
-			public void Publish(Message message) {
-				throw new NotImplementedException();
-			}
-
-			public string Name { get; }
-			public Task Start() {
-				throw new NotImplementedException();
-			}
-
-			public void Stop() {
-				throw new NotImplementedException();
-			}
-
-			public void RequestStop() {
-				throw new NotImplementedException();
-			}
-
-			public QueueStats GetStatistics() {
-				throw new NotImplementedException();
-			}
-
-			public void Subscribe<T>(IAsyncHandle<T> handler) where T : Message {
-				throw new NotImplementedException();
-			}
-
-			public void Unsubscribe<T>(IAsyncHandle<T> handler) where T : Message {
-				throw new NotImplementedException();
-			}
-		}
-		protected ProjectionManager _manager;
-		protected ProjectionManagerMessageDispatcher _managerMessageDispatcher;
-		private bool _initializeSystemProjections;
-		protected Tuple<SynchronousScheduler, IPublisher, SynchronousScheduler, Guid>[] _processingQueues;
-		private ProjectionCoreCoordinator _coordinator;
-
-		protected override void Given1() {
-			base.Given1();
-			_initializeSystemProjections = GivenInitializeSystemProjections();
-			if (!_initializeSystemProjections) {
-				ExistingEvent(ProjectionNamesBuilder.ProjectionsRegistrationStream,
-					ProjectionEventTypes.ProjectionsInitialized, "", "");
-			}
-		}
-
-		protected virtual bool GivenInitializeSystemProjections() {
-			return false;
-		}
-
-		protected override ManualQueue GiveInputQueue() {
-			return new ManualQueue(_bus, _timeProvider);
-		}
-
-		[SetUp]
-		public void Setup() {
-			//TODO: this became an integration test - proper ProjectionCoreService and ProjectionManager testing is required as well
-			_bus.Subscribe(_consumer);
-
-			_processingQueues = GivenProcessingQueues();
-			var queues = _processingQueues.ToDictionary(v => v.Item4, v => v.Item1.As<IPublisher>());
-			_managerMessageDispatcher = new ProjectionManagerMessageDispatcher(queues);
-			_manager = new ProjectionManager(
-				GetInputQueue(),
-				GetInputQueue(),
-				queues,
-				_timeProvider,
-				ProjectionType.All,
-				_ioDispatcher,
-				TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault),
-				IProjectionTracker.NoOp,
-				_initializeSystemProjections);
-
-			_coordinator = new ProjectionCoreCoordinator(
-				ProjectionType.All,
-				queues.Values.ToArray(),
-				_bus);
-
-			_bus.Subscribe<ProjectionManagementMessage.Internal.CleanupExpired>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Internal.Deleted>(_manager);
-			_bus.Subscribe<CoreProjectionStatusMessage.Started>(_manager);
-			_bus.Subscribe<CoreProjectionStatusMessage.Stopped>(_manager);
-			_bus.Subscribe<CoreProjectionStatusMessage.Prepared>(_manager);
-			_bus.Subscribe<CoreProjectionStatusMessage.Faulted>(_manager);
-			_bus.Subscribe<CoreProjectionStatusMessage.StateReport>(_manager);
-			_bus.Subscribe<CoreProjectionStatusMessage.ResultReport>(_manager);
-			_bus.Subscribe<CoreProjectionStatusMessage.StatisticsReport>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.Post>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.PostBatch>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.UpdateQuery>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.GetQuery>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.Delete>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.GetStatistics>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.GetState>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.GetResult>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.Disable>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.Enable>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.Abort>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.SetRunAs>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.Reset>(_manager);
-			_bus.Subscribe<ClientMessage.WriteEventsCompleted>(_manager);
-			_bus.Subscribe<ClientMessage.ReadStreamEventsForwardCompleted>(_manager);
-			_bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_manager);
-			_bus.Subscribe<ClientMessage.DeleteStreamCompleted>(_manager);
-			_bus.Subscribe<ProjectionSubsystemMessage.StartComponents>(_manager);
-			_bus.Subscribe<ProjectionSubsystemMessage.StopComponents>(_manager);
-			_bus.Subscribe<ProjectionSubsystemMessage.StartComponents>(_coordinator);
-			_bus.Subscribe<ProjectionSubsystemMessage.StopComponents>(_coordinator);
-
-			if (GetInputQueue() != _processingQueues.First().Item2) {
-				_bus.Subscribe<CoreProjectionManagementControlMessage>(
-					_managerMessageDispatcher);
-			}
-
-			foreach (var q in _processingQueues)
-				SetUpCoreServices(q.Item4, q.Item1, q.Item2, q.Item3);
-
-			//Given();
-			WhenLoop();
-		}
-
-		protected virtual Tuple<SynchronousScheduler, IPublisher, SynchronousScheduler, Guid>[] GivenProcessingQueues() {
-			return new[] {
-				Tuple.Create(_bus, GetInputQueue(), (SynchronousScheduler)null, Guid.NewGuid())
-			};
-		}
-
-		private void SetUpCoreServices(
-			Guid workerId,
-			SynchronousScheduler bus,
-			IPublisher inputQueue,
-			SynchronousScheduler output_) {
-			var output = (output_ ?? inputQueue);
-			ICheckpoint writerCheckpoint = new InMemoryCheckpoint(1000);
-			var readerService = new EventReaderCoreService(
-				output,
-				_ioDispatcher,
-				10,
-				writerCheckpoint,
-				runHeadingReader: true, faultOutOfOrderProjections: true);
-			_subscriptionDispatcher = new ReaderSubscriptionDispatcher(inputQueue);
-
-			bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CheckpointSuggested>());
-			bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CommittedEventReceived>());
-			bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.EofReached>());
-			bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionEofReached>());
-			bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionDeleted>());
-			bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ProgressChanged>());
-			bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.SubscriptionStarted>());
-			bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.NotAuthorized>());
-			bus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ReaderAssignedReader>());
-
-			var ioDispatcher = new IODispatcher(output, inputQueue, true);
-
-			var guardBus = new GuardBusToTriggerFixingIfUsed();
-			var configuration = new ProjectionsStandardComponents(1, ProjectionType.All, guardBus, guardBus, guardBus, guardBus, true,
-				500, 250);
-			var coreService = new ProjectionCoreService(
-				workerId,
-				inputQueue,
-				output,
-				_subscriptionDispatcher,
-				_timeProvider,
-				ioDispatcher,
-				configuration);
-
-			bus.Subscribe<CoreProjectionManagementMessage.CreateAndPrepare>(coreService);
-			bus.Subscribe<CoreProjectionManagementMessage.CreatePrepared>(coreService);
-			bus.Subscribe<CoreProjectionManagementMessage.Dispose>(coreService);
-			bus.Subscribe<CoreProjectionManagementMessage.Start>(coreService);
-			bus.Subscribe<CoreProjectionManagementMessage.LoadStopped>(coreService);
-			bus.Subscribe<CoreProjectionManagementMessage.Stop>(coreService);
-			bus.Subscribe<CoreProjectionManagementMessage.Kill>(coreService);
-			bus.Subscribe<CoreProjectionManagementMessage.GetState>(coreService);
-			bus.Subscribe<CoreProjectionManagementMessage.GetResult>(coreService);
-			bus.Subscribe<CoreProjectionProcessingMessage.CheckpointCompleted>(coreService);
-			bus.Subscribe<CoreProjectionProcessingMessage.CheckpointLoaded>(coreService);
-			bus.Subscribe<CoreProjectionProcessingMessage.PrerecordedEventsLoaded>(coreService);
-			bus.Subscribe<CoreProjectionProcessingMessage.RestartRequested>(coreService);
-			bus.Subscribe<CoreProjectionProcessingMessage.Failed>(coreService);
-			bus.Subscribe<ClientMessage.ReadStreamEventsForwardCompleted>(ioDispatcher.ForwardReader);
-			bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(ioDispatcher.BackwardReader);
-			bus.Subscribe<ClientMessage.NotHandled>(ioDispatcher.BackwardReader);
-			bus.Subscribe<ClientMessage.WriteEventsCompleted>(ioDispatcher.Writer);
-			bus.Subscribe<ClientMessage.DeleteStreamCompleted>(ioDispatcher.StreamDeleter);
-			bus.Subscribe<IODispatcherDelayedMessage>(ioDispatcher.Awaker);
-			bus.Subscribe<IODispatcherDelayedMessage>(ioDispatcher);
-			bus.Subscribe<ProjectionCoreServiceMessage.StartCore>(coreService);
-			bus.Subscribe<ProjectionCoreServiceMessage.StopCore>(coreService);
-			bus.Subscribe<ReaderCoreServiceMessage.StartReader>(readerService);
-			bus.Subscribe<ReaderCoreServiceMessage.StopReader>(readerService);
-			bus.Subscribe<ProjectionCoreServiceMessage.CoreTick>(coreService);
-			bus.Subscribe<ReaderSubscriptionMessage.CommittedEventDistributed>(readerService);
-			bus.Subscribe<ReaderSubscriptionMessage.EventReaderEof>(readerService);
-			bus.Subscribe<ReaderSubscriptionMessage.EventReaderPartitionEof>(readerService);
-			bus.Subscribe<ReaderSubscriptionMessage.EventReaderPartitionDeleted>(readerService);
-			bus.Subscribe<ReaderSubscriptionMessage.EventReaderNotAuthorized>(readerService);
-			bus.Subscribe<ReaderSubscriptionMessage.EventReaderIdle>(readerService);
-			bus.Subscribe<ReaderSubscriptionMessage.EventReaderStarting>(readerService);
-			bus.Subscribe<ReaderSubscriptionManagement.Pause>(readerService);
-			bus.Subscribe<ReaderSubscriptionManagement.Resume>(readerService);
-			bus.Subscribe<ReaderSubscriptionManagement.Subscribe>(readerService);
-			bus.Subscribe<ReaderSubscriptionManagement.Unsubscribe>(readerService);
-
-			if (output_ != null) {
-				bus.Subscribe(new UnwrapEnvelopeHandler());
-				output_.Subscribe(Forwarder.Create<CoreProjectionStatusMessage.StateReport>(GetInputQueue()));
-				output_.Subscribe(Forwarder.Create<CoreProjectionStatusMessage.ResultReport>(GetInputQueue()));
-				output_.Subscribe(Forwarder.Create<CoreProjectionStatusMessage.StatisticsReport>(GetInputQueue()));
-				output_.Subscribe(Forwarder.Create<CoreProjectionStatusMessage.Started>(GetInputQueue()));
-				output_.Subscribe(Forwarder.Create<CoreProjectionStatusMessage.Stopped>(GetInputQueue()));
-				output_.Subscribe(Forwarder.Create<CoreProjectionStatusMessage.Faulted>(GetInputQueue()));
-				output_.Subscribe(Forwarder.Create<CoreProjectionStatusMessage.Prepared>(GetInputQueue()));
-				output_.Subscribe(
-					Forwarder.Create<ProjectionManagementMessage.Command.ControlMessage>(GetInputQueue()));
-				output_.Subscribe(Forwarder.Create<AwakeServiceMessage.SubscribeAwake>(GetInputQueue()));
-				output_.Subscribe(Forwarder.Create<AwakeServiceMessage.UnsubscribeAwake>(GetInputQueue()));
-				output_.Subscribe(Forwarder.Create<Message>(inputQueue)); // forward all
-
-				var forwarder = new RequestResponseQueueForwarder(
-					inputQueue: inputQueue,
-					externalRequestQueue: GetInputQueue());
-				// forwarded messages
-				output_.Subscribe<ClientMessage.ReadEvent>(forwarder);
-				output_.Subscribe<ClientMessage.ReadStreamEventsBackward>(forwarder);
-				output_.Subscribe<ClientMessage.ReadStreamEventsForward>(forwarder);
-				output_.Subscribe<ClientMessage.ReadAllEventsForward>(forwarder);
-				output_.Subscribe<ClientMessage.WriteEvents>(forwarder);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/bi_state/a_new_posted_projection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/bi_state/a_new_posted_projection.cs
deleted file mode 100644
index 6b9a30c0889..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/bi_state/a_new_posted_projection.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager.bi_state {
-	public static class a_new_posted_projection {
-		public abstract class Base<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-			protected string _projectionName;
-			protected string _projectionSource;
-			protected Type _fakeProjectionType;
-			protected ProjectionMode _projectionMode;
-			protected bool _checkpointsEnabled;
-			protected bool _trackEmittedStreams;
-			protected bool _emitEnabled;
-
-			protected override void Given() {
-				base.Given();
-				AllWritesSucceed();
-				NoOtherStreams();
-
-				_projectionName = "test-projection";
-				_projectionSource = @"";
-				_fakeProjectionType = typeof(FakeBiStateProjection);
-				_projectionMode = ProjectionMode.Continuous;
-				_checkpointsEnabled = true;
-				_trackEmittedStreams = true;
-				_emitEnabled = false;
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-				yield return
-					(new ProjectionManagementMessage.Command.Post(
-						_bus, _projectionMode, _projectionName,
-						ProjectionManagementMessage.RunAs.System, "native:" + _fakeProjectionType.AssemblyQualifiedName,
-						_projectionSource, enabled: true, checkpointsEnabled: _checkpointsEnabled,
-						trackEmittedStreams: _trackEmittedStreams,
-						emitEnabled: _emitEnabled));
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_get_state<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-				yield return (
-					new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, ""));
-			}
-
-			[Test]
-			public void returns_correct_state() {
-				Assert.AreEqual(
-					1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
-				Assert.AreEqual(
-					_projectionName,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().Name);
-				Assert.AreEqual(
-					"", _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().State);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_stopping<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
-			private Guid _reader;
-
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-
-				var readerAssignedMessage =
-					_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.ReaderAssignedReader>()
-						.LastOrDefault();
-				Assert.IsNotNull(readerAssignedMessage);
-				_reader = readerAssignedMessage.ReaderId;
-
-				yield return
-					(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						_reader, new TFPos(100, 50), new TFPos(100, 50), "stream1", 1, "stream1", 1, false,
-						Guid.NewGuid(),
-						"type", false, Helper.UTF8NoBom.GetBytes("1"), new byte[0], 100, 33.3f));
-
-				yield return
-					(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						_reader, new TFPos(200, 150), new TFPos(200, 150), "stream2", 1, "stream2", 1, false,
-						Guid.NewGuid(),
-						"type", false, Helper.UTF8NoBom.GetBytes("1"), new byte[0], 100, 33.3f));
-
-				yield return
-					new ProjectionManagementMessage.Command.Disable(
-						_bus, _projectionName, ProjectionManagementMessage.RunAs.System);
-			}
-
-			[Test]
-			public void writes_both_stream_and_shared_partition_checkpoints() {
-				var writeProjectionCheckpoints =
-					HandledMessages.OfType<ClientMessage.WriteEvents>()
-						.OfEventType(ProjectionEventTypes.ProjectionCheckpoint).ToArray();
-				var writeCheckpoints =
-					HandledMessages.OfType<ClientMessage.WriteEvents>()
-						.OfEventType(ProjectionEventTypes.PartitionCheckpoint).ToArray();
-
-				Assert.AreEqual(1, writeProjectionCheckpoints.Length);
-				Assert.AreEqual(@"[{""data"": 2}]", Encoding.UTF8.GetString(writeProjectionCheckpoints[0].Data));
-				Assert.AreEqual(2, writeCheckpoints.Length);
-
-				Assert.That(
-					writeCheckpoints.All(
-						v => Encoding.UTF8.GetString(v.Data) == @"[{""data"": 1},{""data"": 1}]"));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/continuous/a_new_posted_projection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/continuous/a_new_posted_projection.cs
deleted file mode 100644
index fc23b6f0534..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/continuous/a_new_posted_projection.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager.continuous {
-	public static class a_new_posted_projection {
-		public abstract class Base<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-			protected string _projectionName;
-			protected string _projectionSource;
-			protected Type _fakeProjectionType;
-			protected ProjectionMode _projectionMode;
-			protected bool _checkpointsEnabled;
-			protected bool _trackEmittedStreams;
-			protected bool _emitEnabled;
-			protected bool _projectionEnabled;
-
-			protected override void Given() {
-				base.Given();
-
-				_projectionName = "test-projection";
-				_projectionSource = @"";
-				_fakeProjectionType = typeof(FakeProjection);
-				_projectionMode = ProjectionMode.Continuous;
-				_checkpointsEnabled = true;
-				_trackEmittedStreams = true;
-				_emitEnabled = true;
-				_projectionEnabled = true;
-
-				NoStream("$projections-test-projection-checkpoint");
-				NoStream("$projections-test-projection-order");
-				NoOtherStreams();
-				AllWritesSucceed();
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-				yield return (
-					new ProjectionManagementMessage.Command.Post(
-						_bus, _projectionMode, _projectionName,
-						ProjectionManagementMessage.RunAs.System,
-						"native:" + _fakeProjectionType.AssemblyQualifiedName, _projectionSource,
-						enabled: _projectionEnabled,
-						checkpointsEnabled: _checkpointsEnabled, trackEmittedStreams: _trackEmittedStreams,
-						emitEnabled: _emitEnabled));
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_get_query<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When())
-					yield return m;
-				yield return
-					(new ProjectionManagementMessage.Command.GetQuery(
-						_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
-			}
-
-			[Test]
-			public void returns_correct_source() {
-				Assert.AreEqual(
-					1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
-				var projectionQuery =
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
-				Assert.AreEqual(_projectionName, projectionQuery.Name);
-				Assert.AreEqual("", projectionQuery.Query);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_get_state<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
-			protected override void Given() {
-				base.Given();
-				EnableReadAll();
-				ExistingEvent("temp1", "test1", "{}", "{}");
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-				yield return (new ProjectionManagementMessage.Command.GetState(_bus,
-					_projectionName, ""));
-			}
-
-			[Test]
-			public void returns_correct_state() {
-				Assert.AreEqual(
-					1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
-				Assert.AreEqual(
-					_projectionName,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().Name);
-				//at least projection initializaed message is here
-				Assert.AreEqual(
-					"{\"data\": 1}",
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().State);
-				Assert.AreEqual(
-					_all.Last(v => !SystemStreams.IsSystemStream(v.Value.EventStreamId)).Key,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>()
-						.Single()
-						.Position.Position);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_failing<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-				var readerAssignedMessage =
-					_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.ReaderAssignedReader>()
-						.LastOrDefault();
-				Assert.IsNotNull(readerAssignedMessage);
-				var reader = readerAssignedMessage.ReaderId;
-
-				yield return
-					(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						reader, new TFPos(100, 50), new TFPos(100, 50), "stream", 1, "stream", 1, false, Guid.NewGuid(),
-						"fail", false, new byte[0], new byte[0], 100, 33.3f));
-			}
-
-			[Test]
-			public void publishes_faulted_message() {
-				Assert.AreEqual(1, _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Faulted>().Count());
-			}
-
-			[Test]
-			public void the_projection_status_becomes_faulted() {
-				_manager.Handle(
-					new ProjectionManagementMessage.Command.GetStatistics(
-						_bus, null, _projectionName, false));
-
-				Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-				Assert.AreEqual(
-					1,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Length);
-				Assert.AreEqual(
-					_projectionName,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Name);
-				Assert.AreEqual(
-					ManagedProjectionState.Faulted,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.LeaderStatus);
-			}
-		}
-	}
-
-	public class an_expired_projection {
-		public abstract class Base<TLogFormat, TStreamId> : a_new_posted_projection.Base<TLogFormat, TStreamId> {
-			protected Guid _reader;
-
-			protected override void Given() {
-				AllWritesSucceed();
-				base.Given();
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-				var readerAssignedMessage =
-					_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.ReaderAssignedReader>()
-						.LastOrDefault();
-				Assert.IsNotNull(readerAssignedMessage);
-				_reader = readerAssignedMessage.ReaderId;
-
-				yield return
-					(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						_reader, new TFPos(100, 50), new TFPos(100, 50), "stream", 1, "stream", 1, false,
-						Guid.NewGuid(),
-						"type", false, new byte[0], new byte[0], 100, 33.3f));
-				_timeProvider.AddToUtcTime(TimeSpan.FromMinutes(6));
-				yield return Yield;
-				foreach (var m in _consumer.HandledMessages.OfType<TimerMessage.Schedule>().ToArray())
-					m.Envelope.ReplyWith(m.ReplyMessage);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_statistics<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var s in base.When()) yield return s;
-				_consumer.HandledMessages.Clear();
-				yield return (
-					new ProjectionManagementMessage.Command.GetStatistics(
-						_bus, null, _projectionName, false));
-			}
-
-			[Test]
-			public void projection_is_not_deleted() {
-				Assert.IsFalse(_consumer.HandledMessages.OfType<ProjectionManagementMessage.NotFound>().Any());
-				var res = _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-					.First(x => x.Projections.Any(y => y.Name == _projectionName));
-				Assert.AreEqual("Running", res.Projections.First(x => x.Name == _projectionName).Status);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/continuous/a_running_projection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/continuous/a_running_projection.cs
deleted file mode 100644
index c3bbd14648c..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/continuous/a_running_projection.cs
+++ /dev/null
@@ -1,288 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Management;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager.continuous {
-	public class a_running_projection {
-		public abstract class Base<TLogFormat, TStreamId> : a_new_posted_projection.Base<TLogFormat, TStreamId> {
-			protected Guid _reader;
-
-			protected override void Given() {
-				base.Given();
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-				var readerAssignedMessage =
-					_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.ReaderAssignedReader>()
-						.LastOrDefault();
-				if (_projectionEnabled) {
-					Assert.IsNotNull(readerAssignedMessage);
-					_reader = readerAssignedMessage.ReaderId;
-
-					yield return
-						(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-							_reader, new TFPos(100, 50), new TFPos(100, 50), "stream", 1, "stream", 1, false,
-							Guid.NewGuid(), "type", false, new byte[0], new byte[0], 100, 33.3f));
-				} else
-					_reader = Guid.Empty;
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_stopping<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-
-				yield return
-					(new ProjectionManagementMessage.Command.Disable(
-						_bus, _projectionName, ProjectionManagementMessage.RunAs.System));
-				for (var i = 0; i < 50; i++) {
-					yield return
-						(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-							_reader, new TFPos(100 * i + 200, 150), new TFPos(100 * i + 200, 150), "stream", 1 + i + 1,
-							"stream", 1 + i + 1, false, Guid.NewGuid(), "type", false, new byte[0], new byte[0],
-							100 * i + 200, 33.3f));
-				}
-			}
-
-			[Test]
-			public void pause_message_is_published() {
-				Assert.Inconclusive("actually in unsubscribes...");
-			}
-
-			[Test]
-			public void unsubscribe_message_is_published() {
-				Assert.Inconclusive("actually in unsubscribes...");
-			}
-
-
-			[Test]
-			public void the_projection_status_becomes_stopped_disabled() {
-				_manager.Handle(
-					new ProjectionManagementMessage.Command.GetStatistics(
-						_bus, null, _projectionName, false));
-
-				Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-				Assert.AreEqual(
-					1,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Length);
-				Assert.AreEqual(
-					_projectionName,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Name);
-				Assert.AreEqual(
-					ManagedProjectionState.Stopped,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.LeaderStatus);
-				Assert.AreEqual(
-					false,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Enabled);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_handling_event<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-				yield return
-					(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						_reader, new TFPos(200, 150), new TFPos(200, 150), "stream", 2, "stream", 2, false,
-						Guid.NewGuid(), "type", false, new byte[0], new byte[0], 100, 33.3f));
-			}
-
-			[Test]
-			public void the_projection_status_remains_running_enabled() {
-				_manager.Handle(
-					new ProjectionManagementMessage.Command.GetStatistics(
-						_bus, null, _projectionName, false));
-
-				Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-				Assert.AreEqual(
-					1,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Length);
-				Assert.AreEqual(
-					_projectionName,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Name);
-				Assert.AreEqual(
-					ManagedProjectionState.Running,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.LeaderStatus);
-				Assert.AreEqual(
-					true,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Enabled);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_resetting<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
-			protected override void Given() {
-				base.Given();
-				_projectionEnabled = false;
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-
-				yield return
-					(new ProjectionManagementMessage.Command.Reset(
-						_bus, _projectionName, ProjectionManagementMessage.RunAs.System));
-			}
-
-			[Test]
-			public void the_projection_epoch_changes() {
-				_manager.Handle(
-					new ProjectionManagementMessage.Command.GetStatistics(
-						_bus, null, _projectionName, false));
-
-				Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-				Assert.AreEqual(
-					1,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Length);
-				Assert.AreEqual(
-					1,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Epoch);
-				Assert.AreEqual(
-					1,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Version);
-			}
-
-			[Test]
-			public void the_projection_status_is_enabled_running() {
-				_manager.Handle(
-					new ProjectionManagementMessage.Command.GetStatistics(
-						_bus, null, _projectionName, false));
-
-				Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-				Assert.AreEqual(
-					1,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Length);
-				Assert.AreEqual(
-					ManagedProjectionState.Stopped,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.LeaderStatus);
-				Assert.AreEqual(
-					false,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Enabled);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_resetting_and_starting<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
-			protected override void Given() {
-				base.Given();
-				_projectionEnabled = false;
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-				yield return
-					(new ProjectionManagementMessage.Command.Reset(
-						_bus, _projectionName, ProjectionManagementMessage.RunAs.System));
-				yield return
-					(new ProjectionManagementMessage.Command.Enable(
-						_bus, _projectionName, ProjectionManagementMessage.RunAs.System));
-				yield return
-					(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						_reader, new TFPos(100, 150), new TFPos(100, 150), "stream", 1 + 1, "stream", 1 + 1, false,
-						Guid.NewGuid(), "type", false, new byte[0], new byte[0], 200, 33.3f));
-			}
-
-			[Test]
-			public void the_projection_epoch_changes() {
-				_manager.Handle(
-					new ProjectionManagementMessage.Command.GetStatistics(
-						_bus, null, _projectionName, false));
-
-				Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-				Assert.AreEqual(
-					1,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Length);
-				Assert.AreEqual(
-					1,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Epoch);
-				Assert.AreEqual(
-					2,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Version);
-			}
-
-			[Test]
-			public void the_projection_status_is_enabled_running() {
-				_manager.Handle(
-					new ProjectionManagementMessage.Command.GetStatistics(
-						_bus, null, _projectionName, false));
-
-				Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-				Assert.AreEqual(
-					1,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Length);
-				Assert.AreEqual(
-					ManagedProjectionState.Running,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.LeaderStatus);
-				Assert.AreEqual(
-					true,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Enabled);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/managed_projection/when_creating_a_managed_projection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/managed_projection/when_creating_a_managed_projection.cs
deleted file mode 100644
index 0caee9efe1d..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/managed_projection/when_creating_a_managed_projection.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.Util;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Management;
-using NUnit.Framework;
-using TestFixtureWithReadWriteDispatchers =
-	EventStore.Projections.Core.Tests.Services.core_projection.TestFixtureWithReadWriteDispatchers;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager.managed_projection {
-	[TestFixture]
-	public class when_creating_a_managed_projection : TestFixtureWithReadWriteDispatchers {
-		private new ITimeProvider _timeProvider;
-
-		private
-			RequestResponseDispatcher<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>
-			_getStateDispatcher;
-
-		private
-			RequestResponseDispatcher
-			<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>
-			_getResultDispatcher;
-
-		[SetUp]
-		public void setup() {
-			_timeProvider = new FakeTimeProvider();
-			_getStateDispatcher =
-				new RequestResponseDispatcher
-					<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>(
-						_bus,
-						v => v.CorrelationId,
-						v => v.CorrelationId,
-						_bus);
-			_getResultDispatcher =
-				new RequestResponseDispatcher
-					<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>(
-						_bus,
-						v => v.CorrelationId,
-						v => v.CorrelationId,
-						_bus);
-		}
-
-
-		[Test]
-		public void empty_guid_throws_invalid_argument_exception() {
-			Assert.Throws<ArgumentException>(() => {
-				new ManagedProjection(
-					Guid.NewGuid(),
-					Guid.Empty,
-					1,
-					"name",
-					true,
-					null,
-					_streamDispatcher,
-					_writeDispatcher,
-					_readDispatcher,
-					_bus,
-					_timeProvider,
-					_getStateDispatcher,
-					_getResultDispatcher,
-					_ioDispatcher,
-					TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault));
-			});
-		}
-
-		[Test]
-		public void null_name_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				new ManagedProjection(
-					Guid.NewGuid(),
-					Guid.NewGuid(),
-					1,
-					null,
-					true,
-					null,
-					_streamDispatcher,
-					_writeDispatcher,
-					_readDispatcher,
-					_bus,
-					_timeProvider,
-					_getStateDispatcher,
-					_getResultDispatcher,
-					_ioDispatcher,
-					TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault));
-			});
-		}
-
-		[Test]
-		public void empty_name_throws_argument_exception() {
-			Assert.Throws<ArgumentException>(() => {
-				new ManagedProjection(
-					Guid.NewGuid(),
-					Guid.NewGuid(),
-					1,
-					"",
-					true,
-					null,
-					_streamDispatcher,
-					_writeDispatcher,
-					_readDispatcher,
-					_bus,
-					_timeProvider,
-					_getStateDispatcher,
-					_getResultDispatcher,
-					_ioDispatcher,
-					TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault));
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/managed_projection/when_loading_a_managed_projection_state.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/managed_projection/when_loading_a_managed_projection_state.cs
deleted file mode 100644
index 4ac5c0c4754..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/managed_projection/when_loading_a_managed_projection_state.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.Util;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager.managed_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_loading_a_managed_projection_state<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private new ITimeProvider _timeProvider;
-
-		private ManagedProjection _mp;
-
-		protected override void Given() {
-			_timeProvider = new FakeTimeProvider();
-			_mp = new ManagedProjection(
-				Guid.NewGuid(),
-				Guid.NewGuid(),
-				1,
-				"name",
-				true,
-				null,
-				_streamDispatcher,
-				_writeDispatcher,
-				_readDispatcher,
-				_bus,
-				_timeProvider, new RequestResponseDispatcher
-					<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>(
-						_bus,
-						v => v.CorrelationId,
-						v => v.CorrelationId,
-						_bus), new RequestResponseDispatcher
-					<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>(
-						_bus,
-						v => v.CorrelationId,
-						v => v.CorrelationId,
-						_bus),
-				_ioDispatcher,
-				TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault));
-		}
-
-		[Test]
-		public void null_handler_type_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				ProjectionManagementMessage.Command.Post message = new ProjectionManagementMessage.Command.Post(
-					new NoopEnvelope(), ProjectionMode.OneTime, "name", ProjectionManagementMessage.RunAs.Anonymous,
-					(string)null, @"log(1);", enabled: true, checkpointsEnabled: false, emitEnabled: false,
-					trackEmittedStreams: false);
-				_mp.InitializeNew(
-					new ManagedProjection.PersistedState {
-						Enabled = message.Enabled,
-						HandlerType = message.HandlerType,
-						Query = message.Query,
-						Mode = message.Mode,
-						EmitEnabled = message.EmitEnabled,
-						CheckpointsDisabled = !message.CheckpointsEnabled,
-						Epoch = -1,
-						Version = -1,
-						RunAs = message.EnableRunAs ? SerializedRunAs.SerializePrincipal(message.RunAs) : null,
-					},
-					null);
-			});
-		}
-
-		[Test]
-		public void empty_handler_type_throws_argument_null_exception() {
-			Assert.Throws<ArgumentException>(() => {
-				ProjectionManagementMessage.Command.Post message = new ProjectionManagementMessage.Command.Post(
-					new NoopEnvelope(), ProjectionMode.OneTime, "name", ProjectionManagementMessage.RunAs.Anonymous, "",
-					@"log(1);", enabled: true, checkpointsEnabled: false, emitEnabled: false,
-					trackEmittedStreams: false);
-				_mp.InitializeNew(
-					new ManagedProjection.PersistedState {
-						Enabled = message.Enabled,
-						HandlerType = message.HandlerType,
-						Query = message.Query,
-						Mode = message.Mode,
-						EmitEnabled = message.EmitEnabled,
-						CheckpointsDisabled = !message.CheckpointsEnabled,
-						Epoch = -1,
-						Version = -1,
-						RunAs = message.EnableRunAs ? SerializedRunAs.SerializePrincipal(message.RunAs) : null,
-					},
-					null);
-			});
-		}
-
-		[Test]
-		public void null_query_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				ProjectionManagementMessage.Command.Post message = new ProjectionManagementMessage.Command.Post(
-					new NoopEnvelope(), ProjectionMode.OneTime, "name", ProjectionManagementMessage.RunAs.Anonymous,
-					"JS", query: null, enabled: true, checkpointsEnabled: false, emitEnabled: false,
-					trackEmittedStreams: false);
-				_mp.InitializeNew(
-					new ManagedProjection.PersistedState {
-						Enabled = message.Enabled,
-						HandlerType = message.HandlerType,
-						Query = message.Query,
-						Mode = message.Mode,
-						EmitEnabled = message.EmitEnabled,
-						CheckpointsDisabled = !message.CheckpointsEnabled,
-						Epoch = -1,
-						Version = -1,
-						RunAs = message.EnableRunAs ? SerializedRunAs.SerializePrincipal(message.RunAs) : null,
-					},
-					null);
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/managed_projection/when_loading_existing_projection_state.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/managed_projection/when_loading_existing_projection_state.cs
deleted file mode 100644
index 71b50612c00..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/managed_projection/when_loading_existing_projection_state.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.Util;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager.managed_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_loading_existing_projection_state_with_no_projection_subsystem_version<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private new ITimeProvider _timeProvider;
-		private string _projectionName = Guid.NewGuid().ToString();
-
-		private ManagedProjection _mp;
-
-		protected override void Given() {
-			var persistedState = new ManagedProjection.PersistedState {
-					Enabled = true,
-					HandlerType = "JS",
-					Query = @"log(1);", 
-					Mode = ProjectionMode.Continuous,
-					EmitEnabled = true,
-					CheckpointsDisabled = true,
-					Epoch = -1,
-					Version = -1,
-					RunAs = SerializedRunAs.SerializePrincipal(ProjectionManagementMessage.RunAs.Anonymous)
-			};
-			ExistingEvent(ProjectionNamesBuilder.ProjectionsStreamPrefix + _projectionName,
-				ProjectionEventTypes.ProjectionUpdated, "", persistedState.ToJson());
-
-			_timeProvider = new FakeTimeProvider();
-			_mp = new ManagedProjection(
-				Guid.NewGuid(),
-				Guid.NewGuid(),
-				1,
-				"name",
-				true,
-				null,
-				_streamDispatcher,
-				_writeDispatcher,
-				_readDispatcher,
-				_bus,
-				_timeProvider, new RequestResponseDispatcher
-					<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>(
-						_bus,
-						v => v.CorrelationId,
-						v => v.CorrelationId,
-						_bus), new RequestResponseDispatcher
-					<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>(
-						_bus,
-						v => v.CorrelationId,
-						v => v.CorrelationId,
-						_bus),
-				_ioDispatcher,
-				TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault));
-		}
-
-		[Test]
-		public void content_type_validation_is_disabled() {
-			_mp.InitializeExisting(_projectionName);
-			Assert.False(_mp.EnableContentTypeValidation);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_loading_existing_projection_state_with_projection_subsystem_version<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private new ITimeProvider _timeProvider;
-		private string _projectionName = Guid.NewGuid().ToString();
-
-		private ManagedProjection _mp;
-
-		protected override void Given() {
-			var persistedState = new ManagedProjection.PersistedState {
-				Enabled = true,
-				HandlerType = "JS",
-				Query = @"log(1);", 
-				Mode = ProjectionMode.Continuous,
-				EmitEnabled = true,
-				CheckpointsDisabled = true,
-				Epoch = -1,
-				Version = -1,
-				RunAs = SerializedRunAs.SerializePrincipal(ProjectionManagementMessage.RunAs.Anonymous),
-				ProjectionSubsystemVersion = 4
-			};
-			ExistingEvent(ProjectionNamesBuilder.ProjectionsStreamPrefix + _projectionName,
-				ProjectionEventTypes.ProjectionUpdated, "", persistedState.ToJson());
-
-			_timeProvider = new FakeTimeProvider();
-			_mp = new ManagedProjection(
-				Guid.NewGuid(),
-				Guid.NewGuid(),
-				1,
-				"name",
-				true,
-				null,
-				_streamDispatcher,
-				_writeDispatcher,
-				_readDispatcher,
-				_bus,
-				_timeProvider, new RequestResponseDispatcher
-					<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>(
-						_bus,
-						v => v.CorrelationId,
-						v => v.CorrelationId,
-						_bus), new RequestResponseDispatcher
-					<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>(
-						_bus,
-						v => v.CorrelationId,
-						v => v.CorrelationId,
-						_bus),
-				_ioDispatcher,
-				TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault));
-		}
-
-		[Test]
-		public void content_type_validation_is_enabled() {
-			_mp.InitializeExisting(_projectionName);
-			Assert.True(_mp.EnableContentTypeValidation);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/managed_projection/when_persisted_state_write_fails.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/managed_projection/when_persisted_state_write_fails.cs
deleted file mode 100644
index c8b04381608..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/managed_projection/when_persisted_state_write_fails.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.Util;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Tests;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager.managed_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string), OperationResult.CommitTimeout)]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), OperationResult.CommitTimeout)]
-	[TestFixture(typeof(LogFormat.V2), typeof(string), OperationResult.ForwardTimeout)]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), OperationResult.ForwardTimeout)]
-	[TestFixture(typeof(LogFormat.V2), typeof(string), OperationResult.PrepareTimeout)]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), OperationResult.PrepareTimeout)]
-	public class when_persisted_state_write_fails<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private new ITimeProvider _timeProvider;
-		private ManagedProjection _managedProjection;
-		private Guid _coreProjectionId;
-		private string _projectionName;
-		private string _projectionDefinitionStreamId;
-		private Guid _originalPersistedStateEventId;
-
-		private OperationResult _failureCondition;
-
-		public when_persisted_state_write_fails(OperationResult failureCondition) {
-			_failureCondition = failureCondition;
-		}
-
-		protected override ManualQueue GiveInputQueue() {
-			return new ManualQueue(_bus, _timeProvider);
-		}
-
-		[SetUp]
-		public void SetUp() {
-			AllWritesQueueUp();
-			WhenLoop();
-		}
-
-		protected override void Given() {
-			_projectionName = "projectionName";
-			_projectionDefinitionStreamId = ProjectionNamesBuilder.ProjectionsStreamPrefix + _projectionName;
-			_coreProjectionId = Guid.NewGuid();
-			_timeProvider = new FakeTimeProvider();
-			_managedProjection = new ManagedProjection(
-				Guid.NewGuid(),
-				Guid.NewGuid(),
-				1,
-				_projectionName,
-				true,
-				null,
-				_streamDispatcher,
-				_writeDispatcher,
-				_readDispatcher,
-				_bus,
-				_timeProvider, new RequestResponseDispatcher
-					<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>(
-						_bus,
-						v => v.CorrelationId,
-						v => v.CorrelationId,
-						_bus),
-				new RequestResponseDispatcher
-					<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>(
-						_bus,
-						v => v.CorrelationId,
-						v => v.CorrelationId,
-						_bus),
-				_ioDispatcher,
-				TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault));
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			ProjectionManagementMessage.Command.Post message = new ProjectionManagementMessage.Command.Post(
-				Envelope, ProjectionMode.OneTime, _projectionName, ProjectionManagementMessage.RunAs.System,
-				typeof(FakeForeachStreamProjection), "", true, false, false, false);
-			_managedProjection.InitializeNew(
-				new ManagedProjection.PersistedState {
-					Enabled = message.Enabled,
-					HandlerType = message.HandlerType,
-					Query = message.Query,
-					Mode = message.Mode,
-					EmitEnabled = message.EmitEnabled,
-					CheckpointsDisabled = !message.CheckpointsEnabled,
-					Epoch = -1,
-					Version = -1,
-					RunAs = message.EnableRunAs ? SerializedRunAs.SerializePrincipal(message.RunAs) : null,
-				},
-				null);
-
-			var sourceDefinition = new FakeForeachStreamProjection("", Console.WriteLine).GetSourceDefinition();
-			var projectionSourceDefinition = ProjectionSourceDefinition.From(sourceDefinition);
-
-			_managedProjection.Handle(
-				new CoreProjectionStatusMessage.Prepared(
-					_coreProjectionId, projectionSourceDefinition));
-
-			_originalPersistedStateEventId = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
-				.Where(x => x.EventStreamId == _projectionDefinitionStreamId).First().Events[0].EventId;
-
-			CompleteWriteWithResult(_failureCondition);
-
-			_consumer.HandledMessages.Clear();
-
-			yield break;
-		}
-
-		[Test]
-		public void should_retry_writing_the_persisted_state_with_the_same_event_id() {
-			var eventId = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
-				.Where(x => x.EventStreamId == _projectionDefinitionStreamId).First().Events[0].EventId;
-			Assert.AreEqual(eventId, _originalPersistedStateEventId);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/managed_projection/when_starting_a_managed_projection_without_follower_projections.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/managed_projection/when_starting_a_managed_projection_without_follower_projections.cs
deleted file mode 100644
index fe0fe4f1cf7..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/managed_projection/when_starting_a_managed_projection_without_follower_projections.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Core.Util;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager.managed_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_starting_a_managed_projection_without_follower_projections<TLogFormat, TStreamId> : core_projection.TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private new ITimeProvider _timeProvider;
-
-		private ManagedProjection _mp;
-		private Guid _coreProjectionId;
-		private string _projectionName;
-
-		[SetUp]
-		public new void SetUp() {
-			WhenLoop();
-		}
-
-		protected override ManualQueue GiveInputQueue() {
-			return new ManualQueue(_bus, _timeProvider);
-		}
-
-		protected override void Given() {
-			_projectionName = "projection";
-			_coreProjectionId = Guid.NewGuid();
-			_timeProvider = new FakeTimeProvider();
-			_mp = new ManagedProjection(
-				Guid.NewGuid(),
-				Guid.NewGuid(),
-				1,
-				"name",
-				true,
-				null,
-				_streamDispatcher,
-				_writeDispatcher,
-				_readDispatcher,
-				_bus,
-				_timeProvider, new RequestResponseDispatcher
-					<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>(
-						_bus,
-						v => v.CorrelationId,
-						v => v.CorrelationId,
-						_bus), new RequestResponseDispatcher
-					<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>(
-						_bus,
-						v => v.CorrelationId,
-						v => v.CorrelationId,
-						_bus), _ioDispatcher,
-				TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault));
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			ProjectionManagementMessage.Command.Post message = new ProjectionManagementMessage.Command.Post(
-				Envelope, ProjectionMode.Transient, _projectionName, ProjectionManagementMessage.RunAs.System,
-				typeof(FakeForeachStreamProjection), "", true, false, false, false);
-			_mp.InitializeNew(
-				new ManagedProjection.PersistedState {
-					Enabled = message.Enabled,
-					HandlerType = message.HandlerType,
-					Query = message.Query,
-					Mode = message.Mode,
-					EmitEnabled = message.EmitEnabled,
-					CheckpointsDisabled = !message.CheckpointsEnabled,
-					Epoch = -1,
-					Version = -1,
-					RunAs = message.EnableRunAs ? SerializedRunAs.SerializePrincipal(message.RunAs) : null,
-				},
-				null);
-
-			var sourceDefinition = new FakeForeachStreamProjection("", Console.WriteLine).GetSourceDefinition();
-			var projectionSourceDefinition = ProjectionSourceDefinition.From(sourceDefinition);
-
-			_mp.Handle(
-				new CoreProjectionStatusMessage.Prepared(
-					_coreProjectionId, projectionSourceDefinition));
-			yield break;
-		}
-
-		[Test]
-		public void publishes_start_message() {
-			var startMessage = HandledMessages.OfType<CoreProjectionManagementMessage.Start>().LastOrDefault();
-			Assert.IsNotNull(startMessage);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/managed_projection/when_updating_projection_config.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/managed_projection/when_updating_projection_config.cs
deleted file mode 100644
index 6743aa6f0c9..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/managed_projection/when_updating_projection_config.cs
+++ /dev/null
@@ -1,445 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.Util;
-using EventStore.Projections.Core.Common;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager.managed_projection {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	public class when_initializing_projection_with_default_options<TLogFormat, TStreamId> : projection_config_test_base<TLogFormat, TStreamId> {
-		private ManagedProjection _mp;
-		private Guid _projectionId = Guid.NewGuid();
-		private ProjectionManagementMessage.ProjectionConfig _config;
-		private EventRecord _persistedStateWrite;
-
-		private ManagedProjection.PersistedState _persistedState = new ManagedProjection.PersistedState {
-			Enabled = true,
-			HandlerType = "JS",
-			Query = "fromAll().when({});",
-			Mode = ProjectionMode.Continuous,
-			CheckpointsDisabled = null,
-			Epoch = null,
-			Version = null,
-			RunAs = null,
-			EmitEnabled = null,
-			TrackEmittedStreams = null,
-			CheckpointAfterMs = (int)ProjectionConsts.CheckpointAfterMs.TotalMilliseconds,
-			CheckpointHandledThreshold = ProjectionConsts.CheckpointHandledThreshold,
-			CheckpointUnhandledBytesThreshold = ProjectionConsts.CheckpointUnhandledBytesThreshold,
-			MaxAllowedWritesInFlight = ProjectionConsts.MaxAllowedWritesInFlight,
-			ProjectionExecutionTimeout = null,
-			CreateTempStreams = null
-		};
-
-		public when_initializing_projection_with_default_options() {
-			AllWritesQueueUp();
-		}
-
-		protected override void Given() {
-			_timeProvider = new FakeTimeProvider();
-			_mp = CreateManagedProjection();
-
-			_mp.InitializeNew(
-				_persistedState,
-				null);
-			_mp.Handle(new CoreProjectionStatusMessage.Prepared(_projectionId, new ProjectionSourceDefinition()));
-
-			// Complete write of persisted state to start projection
-			OneWriteCompletes();
-			_config = GetProjectionConfig(_mp);
-			_persistedStateWrite = _streams[ProjectionStreamId].LastOrDefault();
-		}
-
-		[Test]
-		public void projection_execution_timeout_should_be_null() {
-			Assert.IsNotNull(_config);
-			Assert.IsNull(_config.ProjectionExecutionTimeout, "ProjectionExecutionTimeout");
-		}
-
-		[Test]
-		public void emit_options_should_default_to_false() {
-			Assert.IsNotNull(_config);
-			Assert.AreEqual(false, _config.EmitEnabled, "EmitEnabled");
-			Assert.AreEqual(false, _config.TrackEmittedStreams, "TrackEmittedStreams");
-		}
-
-		[Test]
-		public void persisted_state_should_leave_fallback_options_unset() {
-			Assert.IsNotNull(_persistedStateWrite);
-			var actualState = _persistedStateWrite.Data.ParseJson<ManagedProjection.PersistedState>();
-			Assert.IsNull(actualState.ProjectionExecutionTimeout, "ProjectionExecutionTimeout");
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_initializing_projection_with_persisted_state<TLogFormat, TStreamId> : projection_config_test_base<TLogFormat, TStreamId> {
-		private ManagedProjection _mp;
-		private Guid _projectionId = Guid.NewGuid();
-		private ProjectionManagementMessage.ProjectionConfig _config;
-		private EventRecord _persistedStateWrite;
-
-		private ManagedProjection.PersistedState _persistedState = new ManagedProjection.PersistedState {
-			Enabled = true,
-			HandlerType = "JS",
-			Query = "fromAll().when({});",
-			Mode = ProjectionMode.Continuous,
-			CheckpointsDisabled = false,
-			Epoch = -1,
-			Version = -1,
-			RunAs = SerializedRunAs.SerializePrincipal(ProjectionManagementMessage.RunAs.Anonymous),
-			EmitEnabled = false,
-			TrackEmittedStreams = true,
-			CheckpointAfterMs = 1,
-			CheckpointHandledThreshold = 2,
-			CheckpointUnhandledBytesThreshold = 3,
-			PendingEventsThreshold = 4,
-			MaxWriteBatchLength = 5,
-			MaxAllowedWritesInFlight = 6,
-			ProjectionExecutionTimeout = 11
-		};
-
-		public when_initializing_projection_with_persisted_state() {
-			AllWritesQueueUp();
-		}
-
-		protected override void Given() {
-			_timeProvider = new FakeTimeProvider();
-			_mp = CreateManagedProjection();
-
-			_mp.InitializeNew(
-				_persistedState,
-				null);
-			_mp.Handle(new CoreProjectionStatusMessage.Prepared(_projectionId, new ProjectionSourceDefinition()));
-
-			// Complete write of persisted state to start projection
-			OneWriteCompletes();
-			_config = GetProjectionConfig(_mp);
-			_persistedStateWrite = _streams[ProjectionStreamId].LastOrDefault();
-		}
-
-		[Test]
-		public void config_should_be_same_as_persisted_state() {
-			Assert.IsNotNull(_config);
-			Assert.AreEqual(_persistedState.EmitEnabled, _config.EmitEnabled, "EmitEnabled");
-			Assert.AreEqual(_persistedState.TrackEmittedStreams, _config.TrackEmittedStreams, "TrackEmittedStreams");
-			Assert.AreEqual(_persistedState.CheckpointAfterMs, _config.CheckpointAfterMs, "CheckpointAfterMs");
-			Assert.AreEqual(_persistedState.CheckpointHandledThreshold, _config.CheckpointHandledThreshold,
-				"CheckpointHandledThreshold");
-			Assert.AreEqual(_persistedState.CheckpointUnhandledBytesThreshold,
-				_config.CheckpointUnhandledBytesThreshold, "CheckpointUnhandledBytesThreshold");
-			Assert.AreEqual(_persistedState.PendingEventsThreshold, _config.PendingEventsThreshold,
-				"PendingEventsThreshold");
-			Assert.AreEqual(_persistedState.MaxWriteBatchLength, _config.MaxWriteBatchLength, "MaxWriteBatchLength");
-			Assert.AreEqual(_persistedState.MaxAllowedWritesInFlight, _config.MaxAllowedWritesInFlight,
-				"MaxAllowedWritesInFlight");
-			Assert.AreEqual(_persistedState.ProjectionExecutionTimeout, _config.ProjectionExecutionTimeout,
-				"ProjectionExecutionTimeout");
-		}
-
-		[Test]
-		public void persisted_state_is_written_correctly() {
-			Assert.IsNotNull(_persistedStateWrite);
-			var actualState = _persistedStateWrite.Data.ParseJson<ManagedProjection.PersistedState>();
-
-			Assert.AreEqual(_persistedState.EmitEnabled, actualState.EmitEnabled, "EmitEnabled");
-			Assert.AreEqual(_persistedState.TrackEmittedStreams, actualState.TrackEmittedStreams, "TrackEmittedStreams");
-			Assert.AreEqual(_persistedState.CheckpointAfterMs, actualState.CheckpointAfterMs, "CheckpointAfterMs");
-			Assert.AreEqual(_persistedState.CheckpointHandledThreshold, actualState.CheckpointHandledThreshold,
-				"CheckpointHandledThreshold");
-			Assert.AreEqual(_persistedState.CheckpointUnhandledBytesThreshold,
-				actualState.CheckpointUnhandledBytesThreshold, "CheckpointUnhandledBytesThreshold");
-			Assert.AreEqual(_persistedState.PendingEventsThreshold, actualState.PendingEventsThreshold,
-				"PendingEventsThreshold");
-			Assert.AreEqual(_persistedState.MaxWriteBatchLength, actualState.MaxWriteBatchLength, "MaxWriteBatchLength");
-			Assert.AreEqual(_persistedState.MaxAllowedWritesInFlight, actualState.MaxAllowedWritesInFlight,
-				"MaxAllowedWritesInFlight");
-			Assert.AreEqual(_persistedState.ProjectionExecutionTimeout, actualState.ProjectionExecutionTimeout,
-				"ProjectionExecutionTimeout");
-		}
-	}
-
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	public class when_updating_projection_config_to_remove_execution_timeout<TLogFormat, TStreamId> : projection_config_test_base<TLogFormat, TStreamId> {
-		private ManagedProjection _mp;
-		private Guid _projectionId = Guid.NewGuid();
-		private ProjectionManagementMessage.ProjectionConfig _config;
-		private EventRecord _persistedStateWrite;
-		private ProjectionManagementMessage.Command.UpdateConfig _updateConfig;
-
-		private ManagedProjection.PersistedState _persistedState => new ManagedProjection.PersistedState {
-			Enabled = false,
-			HandlerType = "JS",
-			Query = "fromAll().when({});",
-			Mode = ProjectionMode.Continuous,
-			CheckpointsDisabled = false,
-			Epoch = -1,
-			Version = -1,
-			RunAs = SerializedRunAs.SerializePrincipal(ProjectionManagementMessage.RunAs.Anonymous),
-			EmitEnabled = false,
-			TrackEmittedStreams = true,
-			CheckpointAfterMs = 1,
-			CheckpointHandledThreshold = 2,
-			CheckpointUnhandledBytesThreshold = 3,
-			PendingEventsThreshold = 4,
-			MaxWriteBatchLength = 5,
-			MaxAllowedWritesInFlight = 6,
-			ProjectionExecutionTimeout = 11
-		};
-
-		public when_updating_projection_config_to_remove_execution_timeout() {
-			AllWritesQueueUp();
-		}
-
-		protected override void Given() {
-			_timeProvider = new FakeTimeProvider();
-			_mp = CreateManagedProjection();
-
-			_mp.InitializeNew(
-				_persistedState,
-				null);
-			_mp.Handle(new CoreProjectionStatusMessage.Prepared(_projectionId, new ProjectionSourceDefinition()));
-			OneWriteCompletes();
-			_mp.Handle(new CoreProjectionStatusMessage.Stopped(_projectionId, ProjectionName, false));
-
-			_updateConfig = new ProjectionManagementMessage.Command.UpdateConfig(
-				new NoopEnvelope(), ProjectionName, _persistedState.EmitEnabled ?? false, _persistedState.TrackEmittedStreams ?? false,
-				_persistedState.CheckpointAfterMs, _persistedState.CheckpointHandledThreshold, _persistedState.CheckpointUnhandledBytesThreshold,
-				_persistedState.PendingEventsThreshold, _persistedState.MaxWriteBatchLength, _persistedState.MaxAllowedWritesInFlight,
-				_persistedState.RunAs,
-				projectionExecutionTimeout: null);
-			_mp.Handle(_updateConfig);
-			OneWriteCompletes();
-
-			_config = GetProjectionConfig(_mp);
-			_persistedStateWrite = _streams[ProjectionStreamId].LastOrDefault();
-
-		}
-
-		[Test]
-		public void config_should_have_null_projection_execution_timeout() {
-			Assert.IsNotNull(_config);
-			Assert.IsNull(_config.ProjectionExecutionTimeout, "ProjectionExecutionTimeout");
-		}
-
-		[Test]
-		public void persisted_state_should_have_null_projection_execution_timeout() {
-		Assert.IsNotNull(_persistedStateWrite);
-			var actualState = _persistedStateWrite.Data.ParseJson<ManagedProjection.PersistedState>();
-			Assert.IsNull(actualState.ProjectionExecutionTimeout, "ProjectionExecutionTimeout");
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_updating_projection_config_of_faulted_projection<TLogFormat, TStreamId> : projection_config_test_base<TLogFormat, TStreamId> {
-		private ManagedProjection _mp;
-		private Guid _projectionId = Guid.NewGuid();
-		private Exception _thrownException;
-		private ProjectionManagementMessage.Command.UpdateConfig _updateConfig;
-
-		public when_updating_projection_config_of_faulted_projection() {
-			AllWritesQueueUp();
-		}
-
-		protected override void Given() {
-			_timeProvider = new FakeTimeProvider();
-			_mp = CreateManagedProjection();
-			_mp.InitializeNew(
-				new ManagedProjection.PersistedState {
-					Enabled = false,
-					HandlerType = "JS",
-					Query = "fromAll().when({});",
-					Mode = ProjectionMode.Continuous,
-					EmitEnabled = true,
-					CheckpointsDisabled = false,
-					Epoch = -1,
-					Version = -1,
-					RunAs = SerializedRunAs.SerializePrincipal(ProjectionManagementMessage.RunAs.Anonymous),
-					ProjectionExecutionTimeout = 11
-				},
-				null);
-
-			_mp.Handle(new CoreProjectionStatusMessage.Prepared(_projectionId, new ProjectionSourceDefinition()));
-			OneWriteCompletes();
-			_consumer.HandledMessages.Clear();
-
-			_mp.Handle(new CoreProjectionStatusMessage.Faulted(
-				_projectionId,
-				"test"));
-
-			_updateConfig = CreateConfig();
-			try {
-				_mp.Handle(_updateConfig);
-			} catch (Exception ex) {
-				_thrownException = ex;
-			}
-		}
-
-		[Test]
-		public void persisted_state_is_written() {
-			var writeEvents = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().ToList();
-			Assert.AreEqual(1, writeEvents.Count());
-			Assert.AreEqual(ProjectionStreamId, writeEvents[0].EventStreamId);
-		}
-
-		[Test]
-		public void config_update_does_not_throw_exception() {
-			Assert.IsNull(_thrownException);
-		}
-
-		[Test]
-		public void config_is_updated() {
-			var getConfigResult = GetProjectionConfig(_mp);
-
-			Assert.IsNotNull(getConfigResult);
-			Assert.AreEqual(_updateConfig.EmitEnabled, getConfigResult.EmitEnabled);
-			Assert.AreEqual(_updateConfig.TrackEmittedStreams, getConfigResult.TrackEmittedStreams);
-			Assert.AreEqual(_updateConfig.CheckpointAfterMs, getConfigResult.CheckpointAfterMs);
-			Assert.AreEqual(_updateConfig.CheckpointHandledThreshold, getConfigResult.CheckpointHandledThreshold);
-			Assert.AreEqual(_updateConfig.CheckpointUnhandledBytesThreshold,
-				getConfigResult.CheckpointUnhandledBytesThreshold);
-			Assert.AreEqual(_updateConfig.PendingEventsThreshold, getConfigResult.PendingEventsThreshold);
-			Assert.AreEqual(_updateConfig.MaxWriteBatchLength, getConfigResult.MaxWriteBatchLength);
-			Assert.AreEqual(_updateConfig.MaxAllowedWritesInFlight, getConfigResult.MaxAllowedWritesInFlight);
-		}
-	}
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_updating_projection_config_of_running_projection<TLogFormat, TStreamId> : projection_config_test_base<TLogFormat, TStreamId> {
-		private ManagedProjection _mp;
-		private Guid _projectionId = Guid.NewGuid();
-
-		private ManagedProjection.PersistedState _persistedState = new ManagedProjection.PersistedState {
-			Enabled = true,
-			HandlerType = "JS",
-			Query = "fromAll().when({});",
-			Mode = ProjectionMode.Continuous,
-			CheckpointsDisabled = false,
-			Epoch = -1,
-			Version = -1,
-			RunAs = SerializedRunAs.SerializePrincipal(ProjectionManagementMessage.RunAs.Anonymous),
-			EmitEnabled = false,
-			TrackEmittedStreams = true,
-			CheckpointAfterMs = 1,
-			CheckpointHandledThreshold = 2,
-			CheckpointUnhandledBytesThreshold = 3,
-			PendingEventsThreshold = 4,
-			MaxWriteBatchLength = 5,
-			MaxAllowedWritesInFlight = 6,
-			ProjectionExecutionTimeout = 11
-		};
-
-		private InvalidOperationException _thrownException;
-
-		public when_updating_projection_config_of_running_projection() {
-			AllWritesQueueUp();
-		}
-
-		protected override void Given() {
-			_timeProvider = new FakeTimeProvider();
-			_mp = CreateManagedProjection();
-
-			_mp.InitializeNew(
-				_persistedState,
-				null);
-			_mp.Handle(new CoreProjectionStatusMessage.Prepared(_projectionId, new ProjectionSourceDefinition()));
-
-			// Complete write of persisted state to start projection
-			OneWriteCompletes();
-
-			try {
-				_mp.Handle(CreateConfig());
-			} catch (InvalidOperationException ex) {
-				_thrownException = ex;
-			}
-		}
-
-		[Test]
-		public void should_throw_exception_when_trying_to_update_config() {
-			Assert.IsNotNull(_thrownException);
-		}
-
-		[Test]
-		public void config_should_remain_unchanged() {
-			var getConfigResult = GetProjectionConfig(_mp);
-
-			Assert.IsNotNull(getConfigResult);
-			Assert.AreEqual(_persistedState.EmitEnabled, getConfigResult.EmitEnabled, "EmitEnabled");
-			Assert.AreEqual(_persistedState.TrackEmittedStreams, getConfigResult.TrackEmittedStreams,
-				"TrackEmittedStreams");
-			Assert.AreEqual(_persistedState.CheckpointAfterMs, getConfigResult.CheckpointAfterMs, "CheckpointAfterMs");
-			Assert.AreEqual(_persistedState.CheckpointHandledThreshold, getConfigResult.CheckpointHandledThreshold,
-				"CheckpointHandledThreshold");
-			Assert.AreEqual(_persistedState.CheckpointUnhandledBytesThreshold,
-				getConfigResult.CheckpointUnhandledBytesThreshold, "CheckpointUnhandledBytesThreshold");
-			Assert.AreEqual(_persistedState.PendingEventsThreshold, getConfigResult.PendingEventsThreshold,
-				"PendingEventsThreshold");
-			Assert.AreEqual(_persistedState.MaxWriteBatchLength, getConfigResult.MaxWriteBatchLength,
-				"MaxWriteBatchLength");
-			Assert.AreEqual(_persistedState.MaxAllowedWritesInFlight, getConfigResult.MaxAllowedWritesInFlight,
-				"MaxAllowedWritesInFlight");
-			Assert.AreEqual(_persistedState.ProjectionExecutionTimeout, getConfigResult.ProjectionExecutionTimeout,
-				"ProjectionExecutionTimeout");
-		}
-	}
-
-	public abstract class projection_config_test_base<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		protected const string ProjectionName = "name";
-		protected readonly string ProjectionStreamId = ProjectionNamesBuilder.ProjectionsStreamPrefix + ProjectionName;
-		protected ManagedProjection CreateManagedProjection() {
-			return new ManagedProjection(
-				Guid.NewGuid(),
-				Guid.NewGuid(),
-				1,
-				ProjectionName,
-				true,
-				null,
-				_streamDispatcher,
-				_writeDispatcher,
-				_readDispatcher,
-				_bus,
-				_timeProvider, new RequestResponseDispatcher
-					<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>(
-						_bus,
-						v => v.CorrelationId,
-						v => v.CorrelationId,
-						_bus), new RequestResponseDispatcher
-					<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>(
-						_bus,
-						v => v.CorrelationId,
-						v => v.CorrelationId,
-						_bus),
-				_ioDispatcher,
-				TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault));
-		}
-
-		protected ProjectionManagementMessage.Command.UpdateConfig CreateConfig() {
-			return new ProjectionManagementMessage.Command.UpdateConfig(
-				new NoopEnvelope(), ProjectionName, true, false, 100, 200, 300, 400, 500, 600,
-				ProjectionManagementMessage.RunAs.Anonymous, ClusterVNodeOptions.ProjectionOptions.DefaultProjectionExecutionTimeout);
-		}
-
-		protected ProjectionManagementMessage.ProjectionConfig GetProjectionConfig(ManagedProjection mp) {
-			ProjectionManagementMessage.ProjectionConfig getConfigResult = null;
-			mp.Handle(new ProjectionManagementMessage.Command.GetConfig(
-				new CallbackEnvelope(m => getConfigResult = (ProjectionManagementMessage.ProjectionConfig)m), "name",
-				SerializedRunAs.SerializePrincipal(ProjectionManagementMessage.RunAs.Anonymous)));
-			return getConfigResult;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/query/a_failed_projection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/query/a_failed_projection.cs
deleted file mode 100644
index c99c1dfb6b9..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/query/a_failed_projection.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Management;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager.query {
-	public class a_failed_projection {
-		public abstract class Base<TLogFormat, TStreamId> : a_new_posted_projection.Base<TLogFormat, TStreamId> {
-			protected override void Given() {
-				base.Given();
-				_projectionSource = "fail";
-				NoOtherStreams();
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-				var readerAssignedMessage =
-					_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.ReaderAssignedReader>()
-						.LastOrDefault();
-				Assert.IsNotNull(readerAssignedMessage);
-				var reader = readerAssignedMessage.ReaderId;
-				yield return
-					(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						reader, new TFPos(100, 50), new TFPos(100, 50), "stream", 1, "stream", 1, false, Guid.NewGuid(),
-						"event", false, new byte[0], new byte[0], 100, 33.3f));
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_updating_query<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-				yield return
-					(new ProjectionManagementMessage.Command.UpdateQuery(
-						_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous,
-						@"", null));
-			}
-
-			[Test]
-			public void the_projection_status_becomes_running() {
-				_manager.Handle(
-					new ProjectionManagementMessage.Command.GetStatistics(
-						_bus, null, _projectionName, false));
-
-				Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-				Assert.AreEqual(
-					1,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Length);
-				Assert.AreEqual(
-					_projectionName,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Name);
-				Assert.AreEqual(
-					ManagedProjectionState.Running,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.LeaderStatus);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_stopping<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-				yield return
-					(new ProjectionManagementMessage.Command.Disable(
-						_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
-			}
-
-			[Test]
-			public void the_projection_status_becomes_faulted_disabled() {
-				_manager.Handle(
-					new ProjectionManagementMessage.Command.GetStatistics(
-						_bus, null, _projectionName, false));
-
-				Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-				Assert.AreEqual(
-					1,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Length);
-				Assert.AreEqual(
-					_projectionName,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Name);
-				Assert.AreEqual(
-					ManagedProjectionState.Stopped,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.LeaderStatus);
-				Assert.AreEqual(
-					false,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Enabled);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_starting<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-				yield return
-					(new ProjectionManagementMessage.Command.Enable(
-						_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
-			}
-
-			[Test]
-			public void the_projection_status_becomes_running_enabled() // as we restart
-			{
-				_manager.Handle(
-					new ProjectionManagementMessage.Command.GetStatistics(
-						_bus, null, _projectionName, false));
-
-				Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-				Assert.AreEqual(
-					1,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Length);
-				Assert.AreEqual(
-					_projectionName,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Name);
-				Assert.AreEqual(
-					ManagedProjectionState.Running,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.LeaderStatus);
-				Assert.AreEqual(
-					true,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Enabled);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/query/a_new_posted_projection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/query/a_new_posted_projection.cs
deleted file mode 100644
index ecdf31492c8..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/query/a_new_posted_projection.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Management;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager.query {
-	public static class a_new_posted_projection {
-		public abstract class Base<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-			protected string _projectionName;
-			protected string _projectionSource;
-			protected Type _fakeProjectionType;
-			protected ProjectionMode _projectionMode;
-			protected bool _checkpointsEnabled;
-			protected bool _trackEmittedStreams;
-			protected bool _emitEnabled;
-
-			protected override void Given() {
-				base.Given();
-
-				_projectionName = "test-projection";
-				_projectionSource = @"";
-				_fakeProjectionType = typeof(FakeProjection);
-				_projectionMode = ProjectionMode.Transient;
-				_checkpointsEnabled = false;
-				_trackEmittedStreams = false;
-				_emitEnabled = false;
-				NoOtherStreams();
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-				yield return
-					(new ProjectionManagementMessage.Command.Post(
-						_bus, _projectionMode, _projectionName,
-						ProjectionManagementMessage.RunAs.System, "native:" + _fakeProjectionType.AssemblyQualifiedName,
-						_projectionSource, enabled: true, checkpointsEnabled: _checkpointsEnabled,
-						emitEnabled: _emitEnabled, trackEmittedStreams: _trackEmittedStreams));
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_get_query<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-				yield return
-					(new ProjectionManagementMessage.Command.GetQuery(
-						_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
-			}
-
-			[Test]
-			public void returns_correct_source() {
-				Assert.AreEqual(
-					1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
-				var projectionQuery =
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
-				Assert.AreEqual(_projectionName, projectionQuery.Name);
-				Assert.AreEqual("", projectionQuery.Query);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_get_state<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-				yield return (
-					new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, ""));
-			}
-
-			[Test]
-			public void returns_correct_state() {
-				Assert.AreEqual(
-					1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
-				Assert.AreEqual(
-					_projectionName,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().Name);
-				Assert.AreEqual(
-					"", _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().State);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_failing<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-				var readerAssignedMessage =
-					_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.ReaderAssignedReader>()
-						.LastOrDefault();
-				Assert.IsNotNull(readerAssignedMessage);
-				var reader = readerAssignedMessage.ReaderId;
-
-				yield return
-					(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						reader, new TFPos(100, 50), new TFPos(100, 50), "stream", 1, "stream", 1, false, Guid.NewGuid(),
-						"fail", false, new byte[0], new byte[0], 100, 33.3f));
-			}
-
-			[Test]
-			public void publishes_faulted_message() {
-				Assert.AreEqual(1, _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Faulted>().Count());
-			}
-
-			[Test]
-			public void the_projection_status_becomes_faulted() {
-				_manager.Handle(
-					new ProjectionManagementMessage.Command.GetStatistics(
-						_bus, null, _projectionName, false));
-
-				Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-				Assert.AreEqual(
-					1,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Length);
-				Assert.AreEqual(
-					_projectionName,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Name);
-				Assert.AreEqual(
-					ManagedProjectionState.Faulted,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.LeaderStatus);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/query/a_running_foreach_stream_projection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/query/a_running_foreach_stream_projection.cs
deleted file mode 100644
index afcb02398bc..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/query/a_running_foreach_stream_projection.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Management;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager.query {
-	public class a_running_foreach_stream_projection {
-		public abstract class Base<TLogFormat, TStreamId> : a_new_posted_projection.Base<TLogFormat, TStreamId> {
-			protected Guid _reader;
-
-			protected override void Given() {
-				base.Given();
-				_fakeProjectionType = typeof(FakeForeachStreamProjection);
-				_projectionMode = ProjectionMode.Transient;
-				_checkpointsEnabled = false;
-				_emitEnabled = false;
-				AllWritesSucceed();
-				NoOtherStreams();
-				//NOTE: do not respond to reads from the following stream
-				//NoStream("$projections-test-projection-stream-checkpoint");
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-				var readerAssignedMessage =
-					_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.ReaderAssignedReader>()
-						.LastOrDefault();
-				Assert.IsNotNull(readerAssignedMessage);
-				_reader = readerAssignedMessage.ReaderId;
-
-				_consumer.HandledMessages.Clear();
-
-				yield return
-					(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						_reader, new TFPos(100, 50), new TFPos(100, 50), "stream1", 1, "stream1", 1, false,
-						Guid.NewGuid(),
-						"type", false, Helper.UTF8NoBom.GetBytes("1"), new byte[0], 100, 33.3f));
-				yield return
-					(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						_reader, new TFPos(200, 150), new TFPos(200, 150), "stream2", 1, "stream2", 1, false,
-						Guid.NewGuid(),
-						"type", false, Helper.UTF8NoBom.GetBytes("1"), new byte[0], 100, 33.3f));
-				yield return
-					(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						_reader, new TFPos(300, 250), new TFPos(300, 250), "stream3", 1, "stream3", 1, false,
-						Guid.NewGuid(),
-						"type", false, Helper.UTF8NoBom.GetBytes("1"), new byte[0], 100, 33.3f));
-				yield return
-					(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						_reader, new TFPos(400, 350), new TFPos(400, 350), "stream1", 2, "stream1", 2, false,
-						Guid.NewGuid(),
-						"type", false, Helper.UTF8NoBom.GetBytes("1"), new byte[0], 100, 33.3f));
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_receiving_eof<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-
-				yield return (new ReaderSubscriptionMessage.EventReaderEof(_reader));
-			}
-
-			[Test]
-			public void the_projection_status_becomes_completed_enabled() {
-				_manager.Handle(
-					new ProjectionManagementMessage.Command.GetStatistics(
-						_bus, null, _projectionName, false));
-
-				Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-				Assert.AreEqual(
-					1,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Length);
-				Assert.AreEqual(
-					_projectionName,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Name);
-				Assert.AreEqual(
-					ManagedProjectionState.Completed,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.LeaderStatus);
-				Assert.AreEqual(
-					true,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Enabled);
-			}
-
-			[Test]
-			public void writes_result_stream() {
-				List<EventRecord> resultsStream;
-				Assert.IsTrue((_streams.TryGetValue("$projections-test-projection-result", out resultsStream)));
-				Assert.AreEqual(3 + 1 /* $Eof */, resultsStream.Count);
-			}
-
-			[Test]
-			public void does_not_write_to_any_other_streams() {
-				Assert.IsEmpty(
-					HandledMessages.OfType<ClientMessage.WriteEvents>()
-						.Where(v => v.EventStreamId != "$projections-test-projection-result")
-						.Where(v => v.EventStreamId != "$$$projections-test-projection-result")
-						.Select(v => v.EventStreamId));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/query/a_running_projection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/query/a_running_projection.cs
deleted file mode 100644
index 6ff5a5beac3..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/query/a_running_projection.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Management;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager.query {
-	namespace a_running_projection {
-		public abstract class Base<TLogFormat, TStreamId> : a_new_posted_projection.Base<TLogFormat, TStreamId> {
-			protected Guid _reader;
-
-			protected override void Given() {
-				base.Given();
-				AllWritesSucceed();
-				NoOtherStreams();
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-				var readerAssignedMessage =
-					_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.ReaderAssignedReader>()
-						.LastOrDefault();
-				Assert.IsNotNull(readerAssignedMessage);
-				_reader = readerAssignedMessage.ReaderId;
-				_consumer.HandledMessages.Clear();
-				yield return
-					(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						_reader, new TFPos(100, 50), new TFPos(100, 50), "stream", 1, "stream", 1, false,
-						Guid.NewGuid(),
-						"type", false, new byte[0], new byte[0], 100, 33.3f));
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_handling_eof<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-
-				yield return (new ReaderSubscriptionMessage.EventReaderEof(_reader));
-			}
-
-			[Test]
-			public void pause_message_is_published() {
-				Assert.Inconclusive("actually in unsubscribes...");
-			}
-
-
-			[Test]
-			public void the_projection_status_becomes_completed_enabled() {
-				_manager.Handle(
-					new ProjectionManagementMessage.Command.GetStatistics(
-						_bus, null, _projectionName, false));
-
-				Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-				Assert.AreEqual(
-					1,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Length);
-				Assert.AreEqual(
-					_projectionName,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Name);
-				Assert.AreEqual(
-					ManagedProjectionState.Completed,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.LeaderStatus);
-				Assert.AreEqual(
-					true,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Enabled);
-			}
-
-			[Test]
-			public void writes_result_stream() {
-				List<EventRecord> resultsStream;
-				Assert.IsTrue((_streams.TryGetValue("$projections-test-projection-result", out resultsStream)));
-				Assert.AreEqual(1 + 1 /* $Eof*/, resultsStream.Count);
-				Assert.AreEqual("{\"data\": 1}", Encoding.UTF8.GetString(resultsStream[0].Data.Span));
-			}
-
-			[Test]
-			public void does_not_write_to_any_other_streams() {
-				Assert.IsEmpty(
-					HandledMessages.OfType<ClientMessage.WriteEvents>()
-						.Where(v => v.EventStreamId != "$projections-test-projection-result")
-						.Where(v => v.EventStreamId != "$$$projections-test-projection-result")
-						.Select(v => v.EventStreamId));
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_handling_event<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-				yield return
-					(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						_reader, new TFPos(200, 150), new TFPos(200, 150), "stream", 2, "stream", 1, false,
-						Guid.NewGuid(), "type", false, new byte[0], new byte[0], 100, 33.3f));
-			}
-
-			[Test]
-			public void the_projection_status_remains_running_enabled() {
-				_manager.Handle(
-					new ProjectionManagementMessage.Command.GetStatistics(
-						_bus, null, _projectionName, false));
-
-				Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-				Assert.AreEqual(
-					1,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Length);
-				Assert.AreEqual(
-					_projectionName,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Name);
-				Assert.AreEqual(
-					ManagedProjectionState.Running,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.LeaderStatus);
-				Assert.AreEqual(
-					true,
-					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-						.Single()
-						.Projections.Single()
-						.Enabled);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/query/an_expired_projection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/query/an_expired_projection.cs
deleted file mode 100644
index 3869ba86c27..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/query/an_expired_projection.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager.query {
-	public class an_expired_projection {
-		public abstract class Base<TLogFormat, TStreamId> : a_new_posted_projection.Base<TLogFormat, TStreamId> {
-			protected Guid _reader;
-
-			protected override void Given() {
-				AllWritesSucceed();
-				base.Given();
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
-				var readerAssignedMessage =
-					_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.ReaderAssignedReader>()
-						.LastOrDefault();
-				Assert.IsNotNull(readerAssignedMessage);
-				_reader = readerAssignedMessage.ReaderId;
-
-				yield return
-					(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
-						_reader, new TFPos(100, 50), new TFPos(100, 50), "stream", 1, "stream", 1, false,
-						Guid.NewGuid(),
-						"type", false, new byte[0], new byte[0], 100, 33.3f));
-				_timeProvider.AddToUtcTime(TimeSpan.FromMinutes(6));
-				yield return Yield;
-				foreach (var m in _consumer.HandledMessages.OfType<TimerMessage.Schedule>().ToArray())
-					m.Envelope.ReplyWith(m.ReplyMessage);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_retrieving_statistics<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var s in base.When()) yield return s;
-				_consumer.HandledMessages.Clear();
-				yield return (
-					new ProjectionManagementMessage.Command.GetStatistics(
-						_bus, null, _projectionName, false));
-			}
-
-			[Test]
-			public void projection_is_not_found() {
-				Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.NotFound>().Count());
-				Assert.IsFalse(_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Any());
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class when_deleted_on_expiry<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> When() {
-				foreach (var s in base.When()) yield return s;
-				_consumer.HandledMessages.Clear();
-			}
-
-			[Test]
-			public void projection_deletion_should_not_be_written() {
-				var registrationEvents = _streams["$projections-$all"];
-				Assert.AreEqual(1, registrationEvents.Count(e => e.EventType == "$ProjectionsInitialized"));
-				Assert.AreEqual(0,
-					registrationEvents.Count(e => Helper.UTF8NoBom.GetString(e.Data.ToArray()) == _projectionName));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/runas/when_posting_a_persistent_projection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/runas/when_posting_a_persistent_projection.cs
deleted file mode 100644
index 9038e57079d..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/runas/when_posting_a_persistent_projection.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using EventStore.Core.Messaging;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using NUnit.Framework;
-using System.Linq;
-using EventStore.Core.Tests;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager.runas {
-	namespace when_posting_a_persistent_projection {
-		[Ignore("Persistent projections are admin only")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class Authenticated<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-			private string _projectionName;
-			private ClaimsPrincipal _testUserPrincipal;
-
-			private string _projectionBody = @"fromAll().when({$any:function(s,e){return s;}});";
-
-			protected override void Given() {
-				_projectionName = "test-projection";
-				_projectionBody = @"fromAll().when({$any:function(s,e){return s;}});";
-				_testUserPrincipal = new ClaimsPrincipal(new ClaimsIdentity(
-					new [] {
-						new Claim(ClaimTypes.Name,"test-user"),
-						new Claim(ClaimTypes.Role,"test-role1"), 
-						new Claim(ClaimTypes.Role,"test-role2")
-					}
-					, "ES-Test"));
-
-				AllWritesSucceed();
-				NoOtherStreams();
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
-				yield return
-					new ProjectionManagementMessage.Command.Post(
-						GetInputQueue(), ProjectionMode.Continuous, _projectionName,
-						new ProjectionManagementMessage.RunAs(_testUserPrincipal), "JS", _projectionBody, enabled: true,
-						checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true, enableRunAs: true);
-			}
-
-			[Test, Ignore("Persistent projections are admin only")]
-			public void anonymous_cannot_retrieve_projection_query() {
-				GetInputQueue()
-					.Publish(
-						new ProjectionManagementMessage.Command.GetQuery(
-							Envelope, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
-				_queue.Process();
-
-				Assert.IsTrue(HandledMessages.OfType<ProjectionManagementMessage.NotAuthorized>().Any());
-			}
-
-			[Test]
-			public void projection_owner_can_retrieve_projection_query() {
-				GetInputQueue()
-					.Publish(
-						new ProjectionManagementMessage.Command.GetQuery(
-							Envelope, _projectionName, new ProjectionManagementMessage.RunAs(_testUserPrincipal)));
-				_queue.Process();
-
-				var query = HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().FirstOrDefault();
-				Assert.NotNull(query);
-				Assert.AreEqual(_projectionBody, query.Query);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class Anonymous<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-			private string _projectionName;
-
-			private string _projectionBody = @"fromAll().when({$any:function(s,e){return s;}});";
-
-			protected override void Given() {
-				_projectionName = "test-projection";
-				_projectionBody = @"fromAll().when({$any:function(s,e){return s;}});";
-
-				AllWritesSucceed();
-				NoOtherStreams();
-			}
-
-			protected override IEnumerable<WhenStep> When() {
-				yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
-				yield return
-					new ProjectionManagementMessage.Command.Post(
-						GetInputQueue(), ProjectionMode.Continuous, _projectionName,
-						ProjectionManagementMessage.RunAs.Anonymous, "JS", _projectionBody, enabled: true,
-						checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true, enableRunAs: true);
-			}
-
-			[Test]
-			public void replies_with_not_authorized() {
-				Assert.IsTrue(HandledMessages.OfType<ProjectionManagementMessage.NotAuthorized>().Any());
-			}
-		}
-	}
-
-	namespace when_setting_new_runas_account {
-		public abstract class with_runas_projection<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-			protected string _projectionName;
-			protected ClaimsPrincipal _testUserPrincipal;
-			protected ClaimsPrincipal _testUserPrincipal2;
-
-			protected string _projectionBody = @"fromAll().when({$any:function(s,e){return s;}});";
-
-			protected override void Given() {
-				_projectionName = "test-projection";
-				_projectionBody = @"fromAll().when({$any:function(s,e){return s;}});";
-				_testUserPrincipal = new ClaimsPrincipal(new ClaimsIdentity(
-					new [] {
-						new Claim(ClaimTypes.Name,"test-user"),
-						new Claim(ClaimTypes.Role,"test-role1"), 
-						new Claim(ClaimTypes.Role,"test-role2")
-					}
-					, "ES-Test"));
-				_testUserPrincipal2 = new ClaimsPrincipal(new ClaimsIdentity(
-					new [] {
-						new Claim(ClaimTypes.Name,"test-user2"),
-						new Claim(ClaimTypes.Role,"test-role2"), 
-						new Claim(ClaimTypes.Role,"test-role3")
-					}
-					, "ES-Test"));
-
-				AllWritesSucceed();
-				NoOtherStreams();
-			}
-
-			protected override IEnumerable<WhenStep> PreWhen() {
-				yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
-				yield return
-					new ProjectionManagementMessage.Command.Post(
-						GetInputQueue(), ProjectionMode.Continuous, _projectionName,
-						new ProjectionManagementMessage.RunAs(_testUserPrincipal), "JS", _projectionBody, enabled: true,
-						checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true, enableRunAs: true);
-			}
-		}
-
-		[Ignore("Persistent projections are admin only")]
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		public class as_another_user<TLogFormat, TStreamId> : with_runas_projection<TLogFormat, TStreamId> {
-			protected override IEnumerable<WhenStep> When() {
-				yield return
-					new ProjectionManagementMessage.Command.SetRunAs(
-						Envelope, _projectionName, new ProjectionManagementMessage.RunAs(_testUserPrincipal2),
-						ProjectionManagementMessage.Command.SetRunAs.SetRemove.Set);
-			}
-
-			[Test]
-			public void new_projection_owner_can_retrieve_projection_query() {
-				GetInputQueue()
-					.Publish(
-						new ProjectionManagementMessage.Command.GetQuery(
-							Envelope, _projectionName, new ProjectionManagementMessage.RunAs(_testUserPrincipal2)));
-				_queue.Process();
-
-				var query = HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().FirstOrDefault();
-				Assert.NotNull(query);
-				Assert.AreEqual(_projectionBody, query.Query);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/specification_with_projection_management_service.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/specification_with_projection_management_service.cs
deleted file mode 100644
index 1708d390e93..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/specification_with_projection_management_service.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Common.Options;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.Util;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Metrics;
-using EventStore.Projections.Core.Services.Management;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	public abstract class specification_with_projection_management_service<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		protected ProjectionManager _manager;
-		protected ProjectionManagerMessageDispatcher _managerMessageDispatcher;
-		private bool _initializeSystemProjections;
-		protected AwakeService AwakeService;
-
-
-		protected override void Given1() {
-			base.Given1();
-			_initializeSystemProjections = GivenInitializeSystemProjections();
-			if (!_initializeSystemProjections) {
-				ExistingEvent(ProjectionNamesBuilder.ProjectionsRegistrationStream,
-					ProjectionEventTypes.ProjectionsInitialized, "", "");
-			}
-		}
-
-		protected virtual bool GivenInitializeSystemProjections() {
-			return false;
-		}
-
-		protected override ManualQueue GiveInputQueue() {
-			return new ManualQueue(_bus, _timeProvider);
-		}
-
-		[SetUp]
-		public void Setup() {
-			//TODO: this became an integration test - proper ProjectionCoreService and ProjectionManager testing is required as well
-			_bus.Subscribe(_consumer);
-
-			var queues = GivenCoreQueues();
-			_managerMessageDispatcher = new ProjectionManagerMessageDispatcher(queues);
-			_manager = new ProjectionManager(
-				GetInputQueue(),
-				GetInputQueue(),
-				queues,
-				_timeProvider,
-				ProjectionType.All,
-				_ioDispatcher,
-				TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault),
-				IProjectionTracker.NoOp,
-				_initializeSystemProjections);
-
-			IPublisher inputQueue = GetInputQueue();
-			IPublisher publisher = GetInputQueue();
-			var ioDispatcher = new IODispatcher(publisher, inputQueue, true);
-			_bus.Subscribe<ProjectionManagementMessage.Internal.CleanupExpired>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Internal.Deleted>(_manager);
-			_bus.Subscribe<CoreProjectionStatusMessage.Started>(_manager);
-			_bus.Subscribe<CoreProjectionStatusMessage.Stopped>(_manager);
-			_bus.Subscribe<CoreProjectionStatusMessage.Prepared>(_manager);
-			_bus.Subscribe<CoreProjectionStatusMessage.Faulted>(_manager);
-			_bus.Subscribe<CoreProjectionStatusMessage.StateReport>(_manager);
-			_bus.Subscribe<CoreProjectionStatusMessage.ResultReport>(_manager);
-			_bus.Subscribe<CoreProjectionStatusMessage.StatisticsReport>(_manager);
-
-			_bus.Subscribe<ProjectionManagementMessage.Command.Post>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.PostBatch>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.UpdateQuery>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.GetQuery>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.Delete>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.GetStatistics>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.GetState>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.GetResult>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.Disable>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.Enable>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.Abort>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.SetRunAs>(_manager);
-			_bus.Subscribe<ProjectionManagementMessage.Command.Reset>(_manager);
-			_bus.Subscribe<ClientMessage.WriteEventsCompleted>(_manager);
-			_bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_manager);
-			_bus.Subscribe<ClientMessage.WriteEventsCompleted>(_manager);
-			_bus.Subscribe<ProjectionSubsystemMessage.StartComponents>(_manager);
-			_bus.Subscribe<ProjectionSubsystemMessage.StopComponents>(_manager);
-			_bus.Subscribe<CoreProjectionManagementControlMessage>(_managerMessageDispatcher);
-
-			_bus.Subscribe<ClientMessage.ReadStreamEventsForwardCompleted>(ioDispatcher.ForwardReader);
-			_bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(ioDispatcher.BackwardReader);
-			_bus.Subscribe<ClientMessage.NotHandled>(ioDispatcher.BackwardReader);
-			_bus.Subscribe<ClientMessage.WriteEventsCompleted>(ioDispatcher.Writer);
-			_bus.Subscribe<ClientMessage.DeleteStreamCompleted>(ioDispatcher.StreamDeleter);
-			_bus.Subscribe<IODispatcherDelayedMessage>(ioDispatcher.Awaker);
-			_bus.Subscribe<IODispatcherDelayedMessage>(ioDispatcher);
-
-			AwakeService = new AwakeService();
-			_bus.Subscribe<StorageMessage.EventCommitted>(AwakeService);
-			_bus.Subscribe<StorageMessage.TfEofAtNonCommitRecord>(AwakeService);
-			_bus.Subscribe<AwakeServiceMessage.SubscribeAwake>(AwakeService);
-			_bus.Subscribe<AwakeServiceMessage.UnsubscribeAwake>(AwakeService);
-
-
-			Given();
-			WhenLoop();
-		}
-
-		protected abstract Dictionary<Guid, IPublisher> GivenCoreQueues();
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/verify_persistent_state_rules_for_deleting_streams.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/verify_persistent_state_rules_for_deleting_streams.cs
deleted file mode 100644
index 331a85d78a3..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/verify_persistent_state_rules_for_deleting_streams.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-namespace EventStore.Projections.Core.Tests.Services.projections_manager{
-	using Core.Services.Management;
-	using NUnit.Framework;
-
-	[TestFixture]
-	public class VerifyPersistentStateRulesForDeletingStreams {
-		[Test]
-		[TestCase(true,true,true)]
-		[TestCase(false,true,false)]
-		[TestCase(true,false,false)]
-		[TestCase(false,false,false)]
-		public void EmitStreamNeedsDeletedAsExpected(bool emitEnabled,bool deleteEmitStreams,bool expectedResult) {
-			ManagedProjection.PersistedState persistedState = new ManagedProjection.PersistedState();
-
-			persistedState.EmitEnabled = emitEnabled;
-			persistedState.DeleteEmittedStreams = deleteEmitStreams;
-
-			Assert.IsTrue(persistedState.EmitStreamNeedsDeleted() == expectedResult);
-		}
-
-		[Test]
-		[TestCase(true, true, false)]
-		[TestCase(false, true, true)]
-		[TestCase(true, false, false)]
-		[TestCase(false, false, false)]
-		public void CheckpointStreamNeedsDeletedAsExpected(bool checkPointsDisabled, bool deleteCheckpointStreams, bool expectedResult) {
-			ManagedProjection.PersistedState persistedState = new ManagedProjection.PersistedState();
-
-			persistedState.CheckpointsDisabled = checkPointsDisabled;
-			persistedState.DeleteCheckpointStream = deleteCheckpointStreams;
-
-			Assert.IsTrue(persistedState.CheckpointStreamNeedsDeleted() == expectedResult);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_a_disabled_projection_has_been_loaded.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_a_disabled_projection_has_been_loaded.cs
deleted file mode 100644
index 6a4d2ccb86d..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_a_disabled_projection_has_been_loaded.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Management;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_a_disabled_projection_has_been_loaded<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		protected override void Given() {
-			base.Given();
-			NoStream("$projections-test-projection-result");
-			NoStream("$projections-test-projection-order");
-			AllWritesToSucceed("$projections-test-projection-order");
-			NoStream("$projections-test-projection-checkpoint");
-			ExistingEvent(ProjectionNamesBuilder.ProjectionsRegistrationStream, ProjectionEventTypes.ProjectionCreated,
-				null, "test-projection");
-			ExistingEvent(
-				"$projections-test-projection", ProjectionEventTypes.ProjectionUpdated, null,
-				@"{
-                    ""Query"":""fromAll(); on_any(function(){});log('hello-from-projection-definition');"", 
-                    ""Mode"":""3"", 
-                    ""Enabled"":false, 
-                    ""HandlerType"":""JS"",
-                    ""SourceDefinition"":{
-                        ""AllEvents"":true,
-                        ""AllStreams"":true,
-                    }
-                }");
-			AllWritesSucceed();
-		}
-
-		private string _projectionName;
-
-		protected override IEnumerable<WhenStep> When() {
-			_projectionName = "test-projection";
-			yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
-		}
-
-		[Test]
-		public void the_projection_source_can_be_retrieved() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetQuery(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
-			var projectionQuery =
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
-			Assert.AreEqual(_projectionName, projectionQuery.Name);
-		}
-
-		[Test]
-		public void the_projection_status_is_stopped() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetStatistics(_bus, null, _projectionName,
-					false));
-
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Length);
-			Assert.AreEqual(
-				_projectionName,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Single()
-					.Name);
-			Assert.AreEqual(
-				ManagedProjectionState.Stopped,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Single()
-					.LeaderStatus);
-		}
-
-		[Test]
-		public void the_projection_state_can_be_retrieved() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, ""));
-			_queue.Process();
-
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
-			Assert.AreEqual(
-				_projectionName,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().Name);
-			Assert.AreEqual(
-				"", _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().State);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_creating_projection_manager.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_creating_projection_manager.cs
deleted file mode 100644
index 41a97ef1bc4..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_creating_projection_manager.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Options;
-using EventStore.Core.Bus;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.Util;
-using EventStore.Projections.Core.Services.Management;
-using NUnit.Framework;
-using EventStore.Core.Helpers;
-using EventStore.Projections.Core.Metrics;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture]
-	public class when_creating_projection_manager {
-		private ITimeProvider _timeProvider;
-		private Dictionary<Guid, IPublisher> _queues;
-		private IODispatcher _ioDispatcher;
-
-		[SetUp]
-		public void setup() {
-			_timeProvider = new FakeTimeProvider();
-			_queues = new Dictionary<Guid, IPublisher> {{Guid.NewGuid(), new FakePublisher()}};
-			var fakePublisher = new FakePublisher();
-			new ProjectionCoreCoordinator(
-				ProjectionType.All,
-				_queues.Values.ToArray(),
-				fakePublisher);
-			_ioDispatcher = new IODispatcher(fakePublisher, fakePublisher, true);
-		}
-
-		[Test]
-		public void it_can_be_created() {
-			using (
-				new ProjectionManager(
-					new FakePublisher(),
-					new FakePublisher(),
-					_queues,
-					_timeProvider,
-					ProjectionType.All,
-					_ioDispatcher,
-					TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault),
-					IProjectionTracker.NoOp)) {
-			}
-		}
-
-		[Test]
-		public void null_main_queue_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				using (
-					new ProjectionManager(
-						null,
-						new FakePublisher(),
-						_queues,
-						_timeProvider,
-						ProjectionType.All,
-						_ioDispatcher,
-						TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault),
-						IProjectionTracker.NoOp)) {
-				}
-			});
-		}
-
-		[Test]
-		public void null_publisher_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				using (
-					new ProjectionManager(
-						new FakePublisher(),
-						null,
-						_queues,
-						_timeProvider,
-						ProjectionType.All,
-						_ioDispatcher,
-						TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault),
-						IProjectionTracker.NoOp)) {
-				}
-			});
-		}
-
-		[Test]
-		public void null_queues_throws_argument_null_exception() {
-			Assert.Throws<ArgumentNullException>(() => {
-				using (
-					new ProjectionManager(
-						new FakePublisher(),
-						new FakePublisher(),
-						null,
-						_timeProvider,
-						ProjectionType.All,
-						_ioDispatcher,
-						TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault),
-						IProjectionTracker.NoOp)) {
-				}
-			});
-		}
-
-		[Test]
-		public void empty_queues_throws_argument_exception() {
-			Assert.Throws<ArgumentException>(() => {
-				using (
-					new ProjectionManager(
-						new FakePublisher(),
-						new FakePublisher(),
-						new Dictionary<Guid, IPublisher>(),
-						_timeProvider,
-						ProjectionType.All,
-						_ioDispatcher,
-						TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault),
-						IProjectionTracker.NoOp)) {
-				}
-			});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_faulted_persistent_projection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_faulted_persistent_projection.cs
deleted file mode 100644
index 4d5bd433a9b..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_faulted_persistent_projection.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_deleting_a_faulted_persistent_projection<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		private string _projectionName;
-		private const string _projectionCheckpointStream = "$projections-test-projection-checkpoint";
-		private const string _projectionEmittedStreamsStream = "$projections-test-projection-emittedstreams";
-
-		protected override void Given() {
-			_projectionName = "test-projection";
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
-			yield return
-				new ProjectionManagementMessage.Command.Post(
-					_bus, ProjectionMode.Continuous, _projectionName,
-					ProjectionManagementMessage.RunAs.System, "JS", @"faulted_projection",
-					enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true);
-			yield return
-				new ProjectionManagementMessage.Command.Delete(
-					_bus, _projectionName,
-					ProjectionManagementMessage.RunAs.System, true, true, true);
-		}
-
-		[Test, Category("v8")]
-		public void a_projection_deleted_event_is_written() {
-			Assert.AreEqual(
-				true,
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Any(x =>
-					x.Events[0].EventType == ProjectionEventTypes.ProjectionDeleted &&
-					Helper.UTF8NoBom.GetString(x.Events[0].Data) == _projectionName));
-		}
-
-		[Test, Category("v8")]
-		public void should_have_attempted_to_delete_the_checkpoint_stream() {
-			Assert.IsTrue(
-				_consumer.HandledMessages.OfType<ClientMessage.DeleteStream>()
-					.Any(x => x.EventStreamId == _projectionCheckpointStream));
-		}
-
-		[Test, Category("v8")]
-		public void should_have_attempted_to_delete_the_emitted_streams_stream() {
-			Assert.IsTrue(
-				_consumer.HandledMessages.OfType<ClientMessage.DeleteStream>()
-					.Any(x => x.EventStreamId == _projectionEmittedStreamsStream));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection.cs
deleted file mode 100644
index 13e1b164163..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_deleting_a_persistent_projection<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		private string _projectionName;
-		private const string _projectionCheckpointStream = "$projections-test-projection-checkpoint";
-		private const string _projectionEmittedStreamsStream = "$projections-test-projection-emittedstreams";
-
-		protected override void Given() {
-			_projectionName = "test-projection";
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
-			yield return
-				new ProjectionManagementMessage.Command.Post(
-					_bus, ProjectionMode.Continuous, _projectionName,
-					ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
-					enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true);
-			yield return
-				new ProjectionManagementMessage.Command.Disable(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.System);
-			yield return
-				new ProjectionManagementMessage.Command.Delete(
-					_bus, _projectionName,
-					ProjectionManagementMessage.RunAs.System, true, true, true);
-		}
-
-		[Test, Category("v8")]
-		public void a_projection_deleted_event_is_written() {
-			Assert.AreEqual(
-				true,
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Any(x =>
-					x.Events[0].EventType == ProjectionEventTypes.ProjectionDeleted &&
-					Helper.UTF8NoBom.GetString(x.Events[0].Data) == _projectionName));
-		}
-
-		[Test, Category("v8")]
-		public void should_have_attempted_to_delete_the_checkpoint_stream() {
-			Assert.IsTrue(
-				_consumer.HandledMessages.OfType<ClientMessage.DeleteStream>()
-					.Any(x => x.EventStreamId == _projectionCheckpointStream));
-		}
-
-		[Test, Category("v8")]
-		public void should_have_attempted_to_delete_the_emitted_streams_stream() {
-			Assert.IsTrue(
-				_consumer.HandledMessages.OfType<ClientMessage.DeleteStream>()
-					.Any(x => x.EventStreamId == _projectionEmittedStreamsStream));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_emitted_not_enabled.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_emitted_not_enabled.cs
deleted file mode 100644
index db33c7d638f..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_emitted_not_enabled.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-namespace EventStore.Projections.Core.Tests.Services.projections_manager{
-	using System;
-	using System.Collections.Generic;
-	using System.Linq;
-	using System.Runtime.CompilerServices;
-	using Core.Services;
-	using EventStore.Common.Utils;
-	using EventStore.Core.Messages;
-	using EventStore.Core.Messaging;
-	using EventStore.Core.Tests;
-	using Messages;
-	using NUnit.Framework;
-
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class WhenDeletingAPersistentProjectionAndEmittedNotEnabled<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		private string _projectionName;
-
-		protected override void Given() {
-			_projectionName = "test-projection";
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
-			yield return
-				new ProjectionManagementMessage.Command.Post(
-				                                             _bus, ProjectionMode.Continuous, _projectionName,
-				                                             ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
-				                                             enabled: true, checkpointsEnabled: true, emitEnabled: false, trackEmittedStreams: false);
-			yield return
-				new ProjectionManagementMessage.Command.Disable(
-				                                                _bus, _projectionName, ProjectionManagementMessage.RunAs.System);
-			yield return
-				new ProjectionManagementMessage.Command.Delete(
-				                                               _bus, _projectionName,
-				                                               ProjectionManagementMessage.RunAs.System, true, true, true);
-		}
-
-		[Test, Category("v8")]
-		public void a_projection_deleted_event_is_written() {
-			var deletedStreamEvents = _consumer.HandledMessages.OfType<ClientMessage.DeleteStream>().ToList();
-
-			Assert.AreEqual(deletedStreamEvents.Count, 1);
-
-			Assert.AreEqual(deletedStreamEvents.First().EventStreamId,$"$projections-{_projectionName}-checkpoint");
-
-			Assert.AreEqual(true, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Any(x => x.Events[0].EventType == ProjectionEventTypes.ProjectionDeleted && Helper.UTF8NoBom.GetString(x.Events[0].Data) == _projectionName));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_keep_checkpoint_stream.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_keep_checkpoint_stream.cs
deleted file mode 100644
index d5da69af481..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_keep_checkpoint_stream.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_deleting_a_persistent_projection_and_keep_checkpoint_stream<TLogFormat, TStreamId> :
-			TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		private string _projectionName;
-		private const string _projectionStateStream = "$projections-test-projection-result";
-		private const string _projectionCheckpointStream = "$projections-test-projection-checkpoint";
-
-		protected override void Given() {
-			_projectionName = "test-projection";
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
-			yield return
-				new ProjectionManagementMessage.Command.Post(
-					_bus, ProjectionMode.Continuous, _projectionName,
-					ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
-					enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true);
-			yield return
-				new ProjectionManagementMessage.Command.Disable(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.System);
-			yield return
-				new ProjectionManagementMessage.Command.Delete(
-					_bus, _projectionName,
-					ProjectionManagementMessage.RunAs.System, false, false, false);
-		}
-
-		[Test, Category("v8")]
-		public void a_projection_deleted_event_is_written() {
-			Assert.AreEqual(
-				true,
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Any(x =>
-					x.Events[0].EventType == ProjectionEventTypes.ProjectionDeleted &&
-					Helper.UTF8NoBom.GetString(x.Events[0].Data) == _projectionName));
-		}
-
-		[Test, Category("v8")]
-		public void should_not_have_attempted_to_delete_the_checkpoint_stream() {
-			Assert.IsFalse(
-				_consumer.HandledMessages.OfType<ClientMessage.DeleteStream>()
-					.Any(x => x.EventStreamId == _projectionCheckpointStream));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_keep_emitted_streams_stream.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_keep_emitted_streams_stream.cs
deleted file mode 100644
index d0ac5a2f590..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_keep_emitted_streams_stream.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_deleting_a_persistent_projection_and_keep_emitted_streams_stream<TLogFormat, TStreamId> :
-			TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		private string _projectionName;
-		private const string _projectionEmittedStreamsStream = "$projections-test-projection-emittedstreams";
-
-		protected override void Given() {
-			_projectionName = "test-projection";
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
-			yield return
-				new ProjectionManagementMessage.Command.Post(
-					_bus, ProjectionMode.Continuous, _projectionName,
-					ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
-					enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true);
-			yield return
-				new ProjectionManagementMessage.Command.Disable(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.System);
-			yield return
-				new ProjectionManagementMessage.Command.Delete(
-					_bus, _projectionName,
-					ProjectionManagementMessage.RunAs.System, false, false, false);
-		}
-
-		[Test, Category("v8")]
-		public void a_projection_deleted_event_is_written() {
-			Assert.AreEqual(
-				true,
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Any(x =>
-					x.Events[0].EventType == ProjectionEventTypes.ProjectionDeleted &&
-					Helper.UTF8NoBom.GetString(x.Events[0].Data) == _projectionName));
-		}
-
-		[Test, Category("v8")]
-		public void should_not_have_attempted_to_delete_the_emitted_streams_stream() {
-			Assert.IsFalse(
-				_consumer.HandledMessages.OfType<ClientMessage.DeleteStream>()
-					.Any(x => x.EventStreamId == _projectionEmittedStreamsStream));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_not_authorised.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_not_authorised.cs
deleted file mode 100644
index 70d4f2cc58b..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_not_authorised.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_deleting_a_persistent_projection_and_not_authorised<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		private string _projectionName;
-
-		protected override void Given() {
-			_projectionName = "test-projection";
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
-			yield return
-				new ProjectionManagementMessage.Command.Post(
-					_bus, ProjectionMode.Continuous, _projectionName,
-					ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
-					enabled: true, checkpointsEnabled: true, emitEnabled: false, trackEmittedStreams: true);
-			yield return
-				new ProjectionManagementMessage.Command.Disable(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.System);
-			yield return
-				new ProjectionManagementMessage.Command.Delete(
-					_bus, _projectionName,
-					ProjectionManagementMessage.RunAs.Anonymous, false, false, false);
-		}
-
-		[Test, Category("v8")]
-		public void a_projection_deleted_event_is_not_written() {
-			Assert.AreNotEqual(
-				ProjectionEventTypes.ProjectionDeleted,
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Last().Events[0].EventType,
-				$"{ProjectionEventTypes.ProjectionDeleted} event was not supposed to be written");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_with_default_options.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_with_default_options.cs
deleted file mode 100644
index bdfa6f13930..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_with_default_options.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_deleting_a_persistent_projection_with_default_options<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		private string _projectionName;
-
-		protected override void Given() {
-			_projectionName = "test-projection";
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
-			yield return
-				new ProjectionManagementMessage.Command.Post(
-					_bus, ProjectionMode.Continuous, _projectionName,
-					ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
-					enabled: true, checkpointsEnabled: true, emitEnabled: false, trackEmittedStreams: true);
-			yield return
-				new ProjectionManagementMessage.Command.Disable(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.System);
-			yield return
-				new ProjectionManagementMessage.Command.Delete(
-					_bus, _projectionName,
-					ProjectionManagementMessage.RunAs.System, true, true, true);
-		}
-
-		[Test, Category("v8")]
-		public void a_projection_deleted_event_is_written() {
-			var deletedStreamEvents =_consumer.HandledMessages.OfType<ClientMessage.DeleteStream>().ToList();
-			Assert.AreEqual(true, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Any(x => x.Events[0].EventType == ProjectionEventTypes.ProjectionDeleted && Helper.UTF8NoBom.GetString(x.Events[0].Data) == _projectionName));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_running_persistent_projection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_running_persistent_projection.cs
deleted file mode 100644
index 620a62d48f6..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_running_persistent_projection.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_deleting_a_running_persistent_projection<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		private string _projectionName;
-		private const string _projectionCheckpointStream = "$projections-test-projection-checkpoint";
-
-		protected override void Given() {
-			_projectionName = "test-projection";
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
-			yield return
-				new ProjectionManagementMessage.Command.Post(
-					_bus, ProjectionMode.Continuous, _projectionName,
-					ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
-					enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true);
-			yield return
-				new ProjectionManagementMessage.Command.Delete(
-					_bus, _projectionName,
-					ProjectionManagementMessage.RunAs.System, true, true, false);
-		}
-
-		[Test, Category("v8")]
-		public void a_projection_deleted_event_is_not_written() {
-			var projectionDeletedEventExists = _consumer.HandledMessages.Any(x =>
-				x.GetType() == typeof(ClientMessage.WriteEvents) &&
-				((ClientMessage.WriteEvents)x).Events[0].EventType == ProjectionEventTypes.ProjectionDeleted);
-			Assert.IsFalse(projectionDeletedEventExists,
-				$"Expected that the {ProjectionEventTypes.ProjectionDeleted} event not to have been written");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_system_projection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_system_projection.cs
deleted file mode 100644
index 07c496138b2..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_deleting_a_system_projection.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using EventStore.ClientAPI.Common.Utils;
-using System.Collections;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services;
-using LogV3StreamId = System.UInt32;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	public class SystemProjectionNames : IEnumerable {
-		public IEnumerator GetEnumerator() {
-			foreach (var projection in typeof(ProjectionNamesBuilder.StandardProjections).GetFields(
-					System.Reflection.BindingFlags.Public |
-					System.Reflection.BindingFlags.Static |
-					System.Reflection.BindingFlags.FlattenHierarchy)
-				.Where(x => x.IsLiteral && !x.IsInitOnly)
-				.Select(x => x.GetRawConstantValue())) {
-				yield return new[] {typeof(LogFormat.V2), typeof(string), projection};
-				yield return new[] {typeof(LogFormat.V3), typeof(LogV3StreamId), projection};
-			}
-		}
-	}
-
-	[TestFixture, TestFixtureSource(typeof(SystemProjectionNames))]
-	public class when_deleting_a_system_projection<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		private string _systemProjectionName;
-
-		public when_deleting_a_system_projection(string projectionName) {
-			_systemProjectionName = projectionName;
-		}
-
-		protected override bool GivenInitializeSystemProjections() {
-			return true;
-		}
-
-		protected override void Given() {
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
-			yield return
-				new ProjectionManagementMessage.Command.Disable(
-					_bus, _systemProjectionName, ProjectionManagementMessage.RunAs.System);
-			yield return
-				new ProjectionManagementMessage.Command.Delete(
-					_bus, _systemProjectionName,
-					ProjectionManagementMessage.RunAs.System, false, false, false);
-		}
-
-		[Test, Category("v8")]
-		public void a_projection_deleted_event_is_not_written() {
-			Assert.IsFalse(
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Any(x =>
-					x.Events[0].EventType == ProjectionEventTypes.ProjectionDeleted &&
-					Helper.UTF8NoBom.GetString(x.Events[0].Data) == _systemProjectionName));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_posting_a_persistent_projection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_posting_a_persistent_projection.cs
deleted file mode 100644
index 1e066266497..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_posting_a_persistent_projection.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_posting_a_persistent_projection<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		private string _projectionName;
-
-		protected override void Given() {
-			_projectionName = "test-projection";
-			AllWritesQueueUp();
-			NoOtherStreams();
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
-			yield return
-				new ProjectionManagementMessage.Command.Post(
-					_bus, ProjectionMode.Continuous, _projectionName,
-					ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
-					enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true);
-			OneWriteCompletes();
-		}
-
-		[Test, Category("v8")]
-		public void the_projection_status_is_writing() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetStatistics(_bus, null, _projectionName,
-					true));
-			Assert.AreEqual(
-				ManagedProjectionState.Prepared,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections[0]
-					.LeaderStatus);
-		}
-
-		[Test, Category("v8")]
-		public void a_projection_created_event_is_written() {
-			var createdEventWrite = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().FirstOrDefault();
-			Assert.NotNull(createdEventWrite);
-			Assert.AreEqual(ProjectionNamesBuilder.ProjectionsRegistrationStream, createdEventWrite.EventStreamId);
-			Assert.AreEqual(ProjectionEventTypes.ProjectionCreated, createdEventWrite.Events[0].EventType);
-			Assert.AreEqual(_projectionName, Helper.UTF8NoBom.GetString(createdEventWrite.Events[0].Data));
-		}
-
-		[Test, Category("v8")]
-		public void persisted_projection_state_is_written_with_empty_execution_timeout() {
-			var persistedStateStream = ProjectionNamesBuilder.ProjectionsStreamPrefix + _projectionName;
-			var persistedStateWrite = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
-				.FirstOrDefault(x => x.EventStreamId == persistedStateStream);
-
-			Assert.NotNull(persistedStateWrite);
-			Assert.AreEqual(ProjectionEventTypes.ProjectionUpdated, persistedStateWrite.Events[0].EventType);
-			var actualState = persistedStateWrite.Events[0].Data.ParseJson<ManagedProjection.PersistedState>();
-			Assert.IsNull(actualState.ProjectionExecutionTimeout);
-		}
-
-		[Test, Category("v8")]
-		public void a_projection_updated_message_is_not_published() {
-			// not published until all writes complete
-			Assert.AreEqual(0, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Updated>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_posting_a_persistent_projection_and_registration_write_fails.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_posting_a_persistent_projection_and_registration_write_fails.cs
deleted file mode 100644
index 0240bacfcd2..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_posting_a_persistent_projection_and_registration_write_fails.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Management;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services.Processing;
-using System.Collections;
-using EventStore.Core.Tests;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string), OperationResult.CommitTimeout)]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), OperationResult.CommitTimeout)]
-	[TestFixture(typeof(LogFormat.V2), typeof(string), OperationResult.ForwardTimeout)]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), OperationResult.ForwardTimeout)]
-	[TestFixture(typeof(LogFormat.V2), typeof(string), OperationResult.PrepareTimeout)]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), OperationResult.PrepareTimeout)]
-	public class
-		when_posting_a_persistent_projection_and_registration_write_fails<TLogFormat, TStreamId> :
-			TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		private OperationResult _failureCondition;
-
-		public when_posting_a_persistent_projection_and_registration_write_fails(OperationResult failureCondition) {
-			_failureCondition = failureCondition;
-		}
-
-		protected override void Given() {
-			NoStream("$projections-test-projection-order");
-			AllWritesToSucceed("$projections-test-projection-order");
-			NoStream("$projections-test-projection-checkpoint");
-			NoOtherStreams();
-			AllWritesQueueUp();
-		}
-
-		private string _projectionName;
-
-		protected override IEnumerable<WhenStep> When() {
-			_projectionName = "test-projection";
-			yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
-			yield return
-				new ProjectionManagementMessage.Command.Post(
-					_bus, ProjectionMode.Continuous, _projectionName,
-					ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
-					enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true);
-		}
-
-		[Test, Category("v8")]
-		public void retries_creating_the_projection_only_the_specified_number_of_times_and_the_same_event_id() {
-			int retryCount = 0;
-			var projectionRegistrationWrite = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
-				.Where(x => x.EventStreamId == ProjectionNamesBuilder.ProjectionsRegistrationStream).Last();
-			var eventId = projectionRegistrationWrite.Events[0].EventId;
-			while (projectionRegistrationWrite != null) {
-				Assert.AreEqual(eventId, projectionRegistrationWrite.Events[0].EventId);
-				projectionRegistrationWrite.Envelope.ReplyWith(new ClientMessage.WriteEventsCompleted(
-					projectionRegistrationWrite.CorrelationId, _failureCondition,
-					Enum.GetName(typeof(OperationResult), _failureCondition)));
-				_queue.Process();
-				projectionRegistrationWrite = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
-					.Where(x => x.EventStreamId == ProjectionNamesBuilder.ProjectionsRegistrationStream)
-					.LastOrDefault();
-				if (projectionRegistrationWrite != null) {
-					retryCount++;
-				}
-
-				_consumer.HandledMessages.Clear();
-			}
-
-			Assert.AreEqual(ProjectionManager.ProjectionCreationRetryCount, retryCount);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_posting_a_persistent_projection_and_writes_succeed.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_posting_a_persistent_projection_and_writes_succeed.cs
deleted file mode 100644
index 119478e1cca..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_posting_a_persistent_projection_and_writes_succeed.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Management;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_posting_a_persistent_projection_and_writes_succeed<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		protected override void Given() {
-			NoStream("$projections-test-projection-order");
-			AllWritesToSucceed("$projections-test-projection-order");
-			NoStream("$projections-test-projection-checkpoint");
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		private string _projectionName;
-
-		protected override IEnumerable<WhenStep> When() {
-			_projectionName = "test-projection";
-			yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
-			yield return
-				new ProjectionManagementMessage.Command.Post(
-					_bus, ProjectionMode.Continuous, _projectionName,
-					ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
-					enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true);
-		}
-
-		[Test, Category("v8")]
-		public void projection_status_is_running() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetStatistics(_bus, null, _projectionName,
-					true));
-			Assert.AreEqual(
-				ManagedProjectionState.Running,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections[0]
-					.LeaderStatus);
-		}
-
-		[Test, Category("v8")]
-		public void a_projection_updated_event_is_written() {
-			Assert.IsTrue(
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Any(
-					v => v.Events[0].EventType == ProjectionEventTypes.ProjectionUpdated));
-		}
-
-		[Test, Category("v8")]
-		public void a_projection_updated_message_is_published() {
-			// not published until writes complete
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Updated>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_posting_an_onetime_projection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_posting_an_onetime_projection.cs
deleted file mode 100644
index f6075ec9468..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_posting_an_onetime_projection.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_posting_an_onetime_projection<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		protected override void Given() {
-			NoOtherStreams();
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-			yield return
-				(new ProjectionManagementMessage.Command.Post(
-					_bus, ProjectionManagementMessage.RunAs.Anonymous,
-					@"fromAll().when({$any:function(s,e){return s;}});", enabled: true));
-		}
-
-		[Test, Category("v8")]
-		public void projection_updated_is_published() {
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Updated>().Count());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_reading_registered_projections/with_no_stream.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_reading_registered_projections/with_no_stream.cs
deleted file mode 100644
index d7345164387..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_reading_registered_projections/with_no_stream.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services.Processing;
-using System.Collections.Generic;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager.when_reading_registered_projections {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class with_no_stream<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		protected override void Given() {
-			AllWritesSucceed();
-			NoStream(ProjectionNamesBuilder.ProjectionsRegistrationStream);
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
-		}
-
-		protected override bool GivenInitializeSystemProjections() {
-			return false;
-		}
-
-		[Test]
-		public void it_should_write_the_projections_initialized_event() {
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count(x =>
-				x.EventStreamId == ProjectionNamesBuilder.ProjectionsRegistrationStream &&
-				x.Events[0].EventType == ProjectionEventTypes.ProjectionsInitialized));
-		}
-
-		[Test]
-		public void it_should_not_write_any_projection_created_events() {
-			Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count(x =>
-				x.EventStreamId == ProjectionNamesBuilder.ProjectionsRegistrationStream &&
-				x.Events[0].EventType == ProjectionEventTypes.ProjectionCreated));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_reading_registered_projections/with_no_stream_and_intialize_system_projections.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_reading_registered_projections/with_no_stream_and_intialize_system_projections.cs
deleted file mode 100644
index 8de782335aa..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_reading_registered_projections/with_no_stream_and_intialize_system_projections.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services.Processing;
-using System.Collections.Generic;
-using System.Collections;
-using EventStore.Common.Utils;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Messages;
-using LogV3StreamId = System.UInt32;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager.when_reading_registered_projections {
-	[TestFixture, TestFixtureSource(typeof(SystemProjectionNames))]
-	public class with_no_stream_and_intialize_system_projections<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		private string _systemProjectionName;
-
-		public with_no_stream_and_intialize_system_projections(string projectionName) {
-			_systemProjectionName = projectionName;
-		}
-
-		protected override void Given() {
-			AllWritesSucceed();
-			NoStream(ProjectionNamesBuilder.ProjectionsRegistrationStream);
-			NoOtherStreams();
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
-		}
-
-		protected override bool GivenInitializeSystemProjections() {
-			return true;
-		}
-
-		[Test]
-		public void it_should_write_the_projections_initialized_event() {
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count(x =>
-				x.EventStreamId == ProjectionNamesBuilder.ProjectionsRegistrationStream &&
-				x.Events[0].EventType == ProjectionEventTypes.ProjectionsInitialized));
-		}
-
-		[Test]
-		public void it_should_write_the_system_projection_created_event() {
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count(x =>
-				x.EventStreamId == ProjectionNamesBuilder.ProjectionsRegistrationStream &&
-				x.Events.All(e => e.EventType == ProjectionEventTypes.ProjectionCreated) &&
-				x.Events.Any(e => Helper.UTF8NoBom.GetString(e.Data) == _systemProjectionName)));
-		}
-	}
-
-	public class SystemProjectionNames : IEnumerable {
-		public IEnumerator GetEnumerator() {
-			foreach (var projection in typeof(ProjectionNamesBuilder.StandardProjections).GetFields(
-					System.Reflection.BindingFlags.Public |
-					System.Reflection.BindingFlags.Static |
-					System.Reflection.BindingFlags.FlattenHierarchy)
-				.Where(x => x.IsLiteral && !x.IsInitOnly)
-				.Select(x => x.GetRawConstantValue())) {
-				yield return new[] { typeof(LogFormat.V2), typeof(string), projection };
-				yield return new[] { typeof(LogFormat.V3), typeof(LogV3StreamId), projection };
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_recreating_a_deleted_projection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_recreating_a_deleted_projection.cs
deleted file mode 100644
index 907594e122f..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_recreating_a_deleted_projection.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_recreating_a_deleted_projection<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		private string _projectionName;
-
-		protected override void Given() {
-			_projectionName = "test-projection";
-			AllWritesSucceed();
-			NoOtherStreams();
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
-			yield return
-				new ProjectionManagementMessage.Command.Post(
-					_bus, ProjectionMode.Continuous, _projectionName,
-					ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
-					enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true);
-			yield return
-				new ProjectionManagementMessage.Command.Disable(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.System);
-			yield return
-				new ProjectionManagementMessage.Command.Delete(
-					_bus, _projectionName,
-					ProjectionManagementMessage.RunAs.System, true, true, false);
-			yield return
-				new ProjectionManagementMessage.Command.Post(
-					_bus, ProjectionMode.Continuous, _projectionName,
-					ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
-					enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true);
-		}
-
-		[Test, Category("v8")]
-		public void a_projection_created_event_should_be_written() {
-			Assert.AreEqual(
-				ProjectionEventTypes.ProjectionCreated,
-				_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().First().Events[0].EventType);
-			Assert.AreEqual(
-				_projectionName,
-				Helper.UTF8NoBom.GetString(_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().First()
-					.Events[0].Data));
-		}
-
-		[Test, Category("v8")]
-		public void it_can_be_listed() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetStatistics(_bus, null, null, false));
-
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count(
-					v => v.Projections.Any(p => p.Name == _projectionName)));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_requesting_partition_state_from_a_stopped_foreach_projection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_requesting_partition_state_from_a_stopped_foreach_projection.cs
deleted file mode 100644
index 7a6b69a001f..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_requesting_partition_state_from_a_stopped_foreach_projection.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_requesting_partition_state_from_a_stopped_foreach_projection<TLogFormat, TStreamId> :
-		TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		protected override void Given() {
-			NoStream("$projections-test-projection-order");
-			ExistingEvent(ProjectionNamesBuilder.ProjectionsRegistrationStream, ProjectionEventTypes.ProjectionCreated,
-				null, "test-projection");
-			ExistingEvent(
-				"$projections-test-projection", ProjectionEventTypes.ProjectionUpdated, null,
-				@"{""Query"":""fromCategory('test').foreachStream().when({'e': function(s,e){}})"", 
-                    ""Mode"":""3"", ""Enabled"":false, ""HandlerType"":""JS"",
-                    ""SourceDefinition"":{
-                        ""AllEvents"":true,
-                        ""AllStreams"":false,
-                        ""Streams"":[""$ce-test""]
-                    }
-                }");
-			ExistingEvent("$projections-test-projection-a-checkpoint", ProjectionEventTypes.PartitionCheckpoint,
-				@"{""s"":{""$ce-test"": 9}}", @"{""data"":1}");
-			NoStream("$projections-test-projection-b-checkpoint");
-			ExistingEvent("$projections-test-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
-				@"{""s"":{""$ce-test"": 10}}", @"{}");
-			AllWritesSucceed();
-		}
-
-		private string _projectionName;
-
-		protected override IEnumerable<WhenStep> When() {
-			_projectionName = "test-projection";
-			// when
-			yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-		}
-
-		[Test]
-		public void the_projection_state_can_be_retrieved() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, "a"));
-			_queue.Process();
-
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
-
-			var first = _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().First();
-			Assert.AreEqual(_projectionName, first.Name);
-			Assert.AreEqual(@"{""data"":1}", first.State);
-
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, "b"));
-			_queue.Process();
-
-			Assert.AreEqual(2, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
-			var second = _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Skip(1)
-				.First();
-			Assert.AreEqual(_projectionName, second.Name);
-			Assert.AreEqual("", second.State);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_starting_the_projection_manager_with_duplicate_projection_created.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_starting_the_projection_manager_with_duplicate_projection_created.cs
deleted file mode 100644
index f5fdb4bbcab..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_starting_the_projection_manager_with_duplicate_projection_created.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Options;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.Util;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Metrics;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class
-		when_starting_the_projection_manager_with_duplicate_projection_created<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private new ITimeProvider _timeProvider;
-		private ProjectionManager _manager;
-		private Guid _workerId;
-
-		protected override void Given() {
-			_workerId = Guid.NewGuid();
-			ExistingEvent(ProjectionNamesBuilder.ProjectionsRegistrationStream, ProjectionEventTypes.ProjectionCreated,
-				null, "projection1");
-			ExistingEvent(ProjectionNamesBuilder.ProjectionsRegistrationStream, ProjectionEventTypes.ProjectionCreated,
-				null, "projection1");
-			ExistingEvent(
-				"$projections-projection1", ProjectionEventTypes.ProjectionUpdated, null,
-				@"{""Query"":""fromAll(); on_any(function(){});log('hello-from-projection-definition');"", ""Mode"":""3"", ""Enabled"":true, ""HandlerType"":""JS""}");
-		}
-
-		[SetUp]
-		public void setup() {
-			_timeProvider = new FakeTimeProvider();
-			var queues = new Dictionary<Guid, IPublisher> {{_workerId, _bus}};
-			_manager = new ProjectionManager(
-				_bus,
-				_bus,
-				queues,
-				_timeProvider,
-				ProjectionType.All,
-				_ioDispatcher,
-				TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault),
-				IProjectionTracker.NoOp);
-			_bus.Subscribe<ClientMessage.WriteEventsCompleted>(_manager);
-			_bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_manager);
-			_bus.Subscribe<ClientMessage.ReadStreamEventsForwardCompleted>(_manager);
-			_manager.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-		}
-
-		[TearDown]
-		public void TearDown() {
-			_manager.Dispose();
-		}
-
-		[Test]
-		public void projection_status_is_preparing() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetStatistics(_bus, null, "projection1",
-					true));
-			Assert.AreEqual(
-				ManagedProjectionState.Preparing,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().SingleOrDefault(
-					v => v.Projections[0].Name == "projection1").Projections[0].LeaderStatus);
-		}
-
-		[Test]
-		public void projection_id_is_latest() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetStatistics(_bus, null, "projection1",
-					true));
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().SingleOrDefault(
-					v => v.Projections[0].Name == "projection1").Projections[0].ProjectionId);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_starting_the_projection_manager_with_existing_partially_created_projection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_starting_the_projection_manager_with_existing_partially_created_projection.cs
deleted file mode 100644
index 5a60c95c7d4..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_starting_the_projection_manager_with_existing_partially_created_projection.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Options;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.Util;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Metrics;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_starting_the_projection_manager_with_existing_partially_created_projection<TLogFormat, TStreamId> :
-		TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private ProjectionManager _manager;
-		private new ITimeProvider _timeProvider;
-		private Guid _workerId;
-
-		protected override void Given() {
-			_workerId = Guid.NewGuid();
-			ExistingEvent(ProjectionNamesBuilder.ProjectionsRegistrationStream, ProjectionEventTypes.ProjectionCreated,
-				null, "projection1");
-			NoStream("$projections-projection1");
-		}
-
-
-		[SetUp]
-		public void setup() {
-			_timeProvider = new FakeTimeProvider();
-			var queues = new Dictionary<Guid, IPublisher> {{_workerId, _bus}};
-			_manager = new ProjectionManager(
-				_bus,
-				_bus,
-				queues,
-				_timeProvider,
-				ProjectionType.All,
-				_ioDispatcher,
-				TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault),
-				IProjectionTracker.NoOp);
-			_bus.Subscribe<ClientMessage.WriteEventsCompleted>(_manager);
-			_bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_manager);
-			_bus.Subscribe<ClientMessage.ReadStreamEventsForwardCompleted>(_manager);
-			_manager.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-		}
-
-		[TearDown]
-		public void TearDown() {
-			_manager.Dispose();
-		}
-
-		[Test]
-		public void projection_status_can_be_retrieved() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetStatistics(_bus, null, "projection1",
-					true));
-			Assert.IsNotNull(
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().SingleOrDefault(
-					v => v.Projections[0].Name == "projection1"));
-		}
-
-		[Test]
-		public void projection_status_is_creating() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetStatistics(_bus, null, "projection1",
-					true));
-			Assert.AreEqual(
-				ManagedProjectionState.Creating,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().SingleOrDefault(
-					v => v.Projections[0].Name == "projection1").Projections[0].LeaderStatus);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_starting_the_projection_manager_with_existing_projection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_starting_the_projection_manager_with_existing_projection.cs
deleted file mode 100644
index da0e0720d7a..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_starting_the_projection_manager_with_existing_projection.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json.Nodes;
-using EventStore.Common.Options;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Telemetry;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Services.TimeService;
-using EventStore.Core.Util;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Metrics;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_starting_the_projection_manager_with_existing_projection<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
-		private new ITimeProvider _timeProvider;
-		private ProjectionManager _manager;
-		private Guid _workerId;
-
-		protected override void Given() {
-			_workerId = Guid.NewGuid();
-			ExistingEvent(ProjectionNamesBuilder.ProjectionsRegistrationStream, ProjectionEventTypes.ProjectionCreated,
-				null, "projection1");
-			ExistingEvent(
-				"$projections-projection1", ProjectionEventTypes.ProjectionUpdated, null,
-				@"{""Query"":""fromAll(); on_any(function(){});log('hello-from-projection-definition');"", ""Mode"":""3"", ""Enabled"":true, ""HandlerType"":""JS""}");
-		}
-
-
-		[SetUp]
-		public void setup() {
-			_timeProvider = new FakeTimeProvider();
-			var queues = new Dictionary<Guid, IPublisher> {{_workerId, _bus}};
-			_manager = new ProjectionManager(
-				_bus,
-				_bus,
-				queues,
-				_timeProvider,
-				ProjectionType.All,
-				_ioDispatcher,
-				TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault),
-				IProjectionTracker.NoOp);
-			_bus.Subscribe<ClientMessage.WriteEventsCompleted>(_manager);
-			_bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_manager);
-			_bus.Subscribe<ClientMessage.ReadStreamEventsForwardCompleted>(_manager);
-			_manager.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-		}
-
-		[TearDown]
-		public void TearDown() {
-			_manager.Dispose();
-		}
-
-		[Test]
-		public void projection_status_can_be_retrieved() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetStatistics(_bus, null, "projection1",
-					true));
-			Assert.IsNotNull(
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().SingleOrDefault(
-					v => v.Projections[0].Name == "projection1"));
-		}
-
-		[Test]
-		public void projection_status_is_starting() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetStatistics(_bus, null, "projection1",
-					true));
-			Assert.AreEqual(
-				ManagedProjectionState.Preparing,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().SingleOrDefault(
-					v => v.Projections[0].Name == "projection1").Projections[0].LeaderStatus);
-		}
-
-		[Test]
-		public void projection_telemetry_working() {
-			_manager.Handle(
-				new TelemetryMessage.Request(
-					_bus));
-
-			var actual = _consumer.HandledMessages.OfType<TelemetryMessage.Response>().Single();
-
-			Assert.AreEqual("projections", actual.Key);
-			Assert.AreEqual(
-				new JsonObject {
-					["customProjectionCount"] = 1,
-					["standardProjectionCount"] = 0,
-					["customProjectionRunningCount"] = 0,
-					["standardProjectionRunningCount"] = 0,
-					["totalCount"] = 1,
-					["totalRunningCount"] = 0,
-				}.ToJsonString(),
-				actual.Value.ToJsonString());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_the_onetime_projection_has_been_posted.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_the_onetime_projection_has_been_posted.cs
deleted file mode 100644
index d149c9140b2..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_the_onetime_projection_has_been_posted.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_the_onetime_projection_has_been_posted<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		private string _projectionName;
-		private string _projectionQuery;
-
-		protected override void Given() {
-			NoOtherStreams();
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			_projectionQuery = @"fromAll(); on_any(function(){});log(1);";
-			yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-			yield return
-				(new ProjectionManagementMessage.Command.Post(
-					_bus, ProjectionManagementMessage.RunAs.Anonymous, _projectionQuery,
-					enabled: true));
-			_projectionName = _consumer.HandledMessages.OfType<ProjectionManagementMessage.Updated>().Single().Name;
-		}
-
-		[Test, Category("v8")]
-		public void it_has_been_posted() {
-			Assert.IsFalse(string.IsNullOrEmpty(_projectionName));
-		}
-
-		[Test, Category("v8")]
-		public void it_cab_be_listed() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetStatistics(_bus, null, null, false));
-
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count(
-					v => v.Projections.Any(p => p.Name == _projectionName)));
-		}
-
-		[Test, Category("v8")]
-		public void the_projection_status_can_be_retrieved() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetStatistics(
-					_bus, null, _projectionName, false));
-
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Length);
-			Assert.AreEqual(
-				_projectionName,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Single()
-					.Name);
-		}
-
-		[Test, Category("v8")]
-		public void the_projection_state_can_be_retrieved() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, ""));
-			_queue.Process();
-
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
-			Assert.AreEqual(
-				_projectionName,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().Name);
-			Assert.AreEqual(
-				"", _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().State);
-		}
-
-		[Test, Category("v8")]
-		public void the_projection_source_can_be_retrieved() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetQuery(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
-			var projectionQuery = _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>()
-				.Single();
-			Assert.AreEqual(_projectionName, projectionQuery.Name);
-			Assert.AreEqual(_projectionQuery, projectionQuery.Query);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_the_projections_initialized_write_fails.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_the_projections_initialized_write_fails.cs
deleted file mode 100644
index 8a2585844ed..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_the_projections_initialized_write_fails.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Messages;
-using NUnit.Framework;
-using EventStore.Projections.Core.Services.Processing;
-using System.Collections;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string), OperationResult.CommitTimeout)]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), OperationResult.CommitTimeout)]
-	[TestFixture(typeof(LogFormat.V2), typeof(string), OperationResult.PrepareTimeout)]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), OperationResult.PrepareTimeout)]
-	[TestFixture(typeof(LogFormat.V2), typeof(string), OperationResult.ForwardTimeout)]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint), OperationResult.ForwardTimeout)]
-	public class
-		when_writing_the_projections_initialized_event_fails<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-
-		private OperationResult _failureCondition;
-
-		public when_writing_the_projections_initialized_event_fails(OperationResult failureCondition) {
-			_failureCondition = failureCondition;
-		}
-
-		protected override void Given() {
-			AllWritesQueueUp();
-			NoStream(ProjectionNamesBuilder.ProjectionsRegistrationStream);
-		}
-
-		protected override bool GivenInitializeSystemProjections() {
-			return false;
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
-		}
-
-		[Test, Category("v8")]
-		public void retries_writing_with_the_same_event_id() {
-			int retryCount = 0;
-			var projectionsInitializedWrite = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Where(x =>
-				x.EventStreamId == ProjectionNamesBuilder.ProjectionsRegistrationStream &&
-				x.Events[0].EventType == ProjectionEventTypes.ProjectionsInitialized).Last();
-			var eventId = projectionsInitializedWrite.Events[0].EventId;
-			while (retryCount < 5) {
-				Assert.AreEqual(eventId, projectionsInitializedWrite.Events[0].EventId);
-				projectionsInitializedWrite.Envelope.ReplyWith(new ClientMessage.WriteEventsCompleted(
-					projectionsInitializedWrite.CorrelationId, _failureCondition,
-					Enum.GetName(typeof(OperationResult), _failureCondition)));
-				_queue.Process();
-				projectionsInitializedWrite = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Where(x =>
-					x.EventStreamId == ProjectionNamesBuilder.ProjectionsRegistrationStream &&
-					x.Events[0].EventType == ProjectionEventTypes.ProjectionsInitialized).LastOrDefault();
-				if (projectionsInitializedWrite != null) {
-					retryCount++;
-				}
-
-				_consumer.HandledMessages.Clear();
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_updating_a_disabled_projection_query_text.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_updating_a_disabled_projection_query_text.cs
deleted file mode 100644
index d76ec6b5e54..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_updating_a_disabled_projection_query_text.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Management;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_updating_a_disabled_projection_query_text<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		protected override void Given() {
-			NoStream("$projections-test-projection");
-			NoStream("$projections-test-projection-result");
-			NoStream("$projections-test-projection-order");
-			AllWritesToSucceed("$projections-test-projection-order");
-			NoStream("$projections-test-projection-checkpoint");
-			AllWritesSucceed();
-		}
-
-		private string _projectionName;
-		private string _newProjectionSource;
-
-		protected override IEnumerable<WhenStep> When() {
-			_projectionName = "test-projection";
-			yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-			yield return
-				(new ProjectionManagementMessage.Command.Post(
-					_bus, ProjectionMode.Continuous, _projectionName,
-					ProjectionManagementMessage.RunAs.System, "JS", @"fromAll(); on_any(function(){});log(1);",
-					enabled: false, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true));
-			// when
-			_newProjectionSource = @"fromAll(); on_any(function(){});log(2);";
-			yield return
-				(new ProjectionManagementMessage.Command.UpdateQuery(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.System,
-					_newProjectionSource, emitEnabled: null));
-		}
-
-		[Test, Category("v8")]
-		public void the_projection_source_can_be_retrieved() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetQuery(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
-			var projectionQuery =
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
-			Assert.AreEqual(_projectionName, projectionQuery.Name);
-			Assert.AreEqual(_newProjectionSource, projectionQuery.Query);
-		}
-
-		[Test, Category("v8")]
-		public void the_projection_status_is_still_stopped() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetStatistics(_bus, null, _projectionName,
-					false));
-
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Length);
-			Assert.AreEqual(
-				_projectionName,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-					.Single()
-					.Projections.Single()
-					.Name);
-			Assert.AreEqual(
-				ManagedProjectionState.Stopped,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-					.Single()
-					.Projections.Single()
-					.LeaderStatus);
-		}
-
-		[Test, Category("v8")]
-		public void the_projection_state_can_be_retrieved() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, ""));
-			_queue.Process();
-
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
-			Assert.AreEqual(
-				_projectionName,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().Name);
-			Assert.AreEqual(
-				"", _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().State);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_updating_a_faulted_projection_query_text_invalid_defintion.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_updating_a_faulted_projection_query_text_invalid_defintion.cs
deleted file mode 100644
index 2c4e1c17e43..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_updating_a_faulted_projection_query_text_invalid_defintion.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Management;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_updating_a_faulted_projection_query_text_invalid_defintion<TLogFormat, TStreamId> :
-		TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		protected override void Given() {
-			NoStream("$projections-test-projection");
-			NoStream("$projections-test-projection-result");
-			NoStream("$projections-test-projection-order");
-			AllWritesToSucceed("$projections-test-projection-order");
-			NoStream("$projections-test-projection-checkpoint");
-			AllWritesSucceed();
-		}
-
-		private string _projectionName;
-		private string _newProjectionSource;
-
-		protected override IEnumerable<WhenStep> When() {
-			_projectionName = "test-projection";
-			yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-			yield return
-				(new ProjectionManagementMessage.Command.Post(
-					_bus, ProjectionMode.Continuous, _projectionName,
-					ProjectionManagementMessage.RunAs.System, "JS", @"fromAll(); on_any(function(){});log(1****);",
-					enabled: false, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true));
-			// when
-			_newProjectionSource = @"fromAll(); on_any(function(){});log(2);";
-			yield return
-				(new ProjectionManagementMessage.Command.UpdateQuery(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.System,
-					_newProjectionSource, emitEnabled: null));
-		}
-
-		[Test, Category("v8")]
-		public void the_projection_source_can_be_retrieved() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetQuery(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
-			var projectionQuery =
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
-			Assert.AreEqual(_projectionName, projectionQuery.Name);
-			Assert.AreEqual(_newProjectionSource, projectionQuery.Query);
-		}
-
-		[Test, Category("v8")]
-		public void the_projection_status_is_stopped() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetStatistics(_bus, null, _projectionName,
-					false));
-
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Length);
-			Assert.AreEqual(
-				_projectionName,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-					.Single()
-					.Projections.Single()
-					.Name);
-			Assert.AreEqual(
-				ManagedProjectionState.Stopped,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
-					.Single()
-					.Projections.Single()
-					.LeaderStatus);
-		}
-
-		[Test, Category("v8")]
-		public void the_projection_state_can_be_retrieved() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, ""));
-			_queue.Process();
-
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
-			Assert.AreEqual(
-				_projectionName,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().Name);
-			Assert.AreEqual(
-				"", _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().State);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_updating_a_persistent_projection_emit_enabled_option.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_updating_a_persistent_projection_emit_enabled_option.cs
deleted file mode 100644
index 5f4e968e02f..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_updating_a_persistent_projection_emit_enabled_option.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_updating_a_persistent_projection_emit_enabled_option<TLogFormat, TStreamId> :
-		TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		protected override void Given() {
-			NoStream("$projections-test-projection");
-			NoStream("$projections-test-projection-result");
-			NoStream("$projections-test-projection-order");
-			AllWritesToSucceed("$projections-test-projection-order");
-			NoStream("$projections-test-projection-checkpoint");
-			AllWritesSucceed();
-		}
-
-		private string _projectionName;
-		private string _source;
-
-		protected override IEnumerable<WhenStep> When() {
-			_projectionName = "test-projection";
-			_source = @"fromAll(); on_any(function(){});log(1);";
-			yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-			yield return
-				(new ProjectionManagementMessage.Command.Post(
-					_bus, ProjectionMode.Continuous, _projectionName,
-					ProjectionManagementMessage.RunAs.System, "JS", _source, enabled: true, checkpointsEnabled: true,
-					emitEnabled: true, trackEmittedStreams: true));
-			// when
-			yield return
-				(new ProjectionManagementMessage.Command.UpdateQuery(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.System,
-					_source, emitEnabled: false));
-		}
-
-		[Test, Category("v8")]
-		public void emit_enabled_options_remains_unchanged() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetQuery(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
-			var projectionQuery =
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
-			Assert.AreEqual(_projectionName, projectionQuery.Name);
-			Assert.AreEqual(false, projectionQuery.EmitEnabled);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_updating_a_persistent_projection_query_text.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_updating_a_persistent_projection_query_text.cs
deleted file mode 100644
index 9c6d414e4f3..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_updating_a_persistent_projection_query_text.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Management;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_updating_a_persistent_projection_query_text<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		protected override void Given() {
-			NoStream("$projections-test-projection");
-			NoStream("$projections-test-projection-result");
-			NoStream("$projections-test-projection-order");
-			AllWritesToSucceed("$projections-test-projection-order");
-			NoStream("$projections-test-projection-checkpoint");
-			AllWritesSucceed();
-		}
-
-		private string _projectionName;
-		private string _newProjectionSource;
-
-		protected override IEnumerable<WhenStep> When() {
-			_projectionName = "test-projection";
-			yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-			yield return
-				(new ProjectionManagementMessage.Command.Post(
-					_bus, ProjectionMode.Continuous, _projectionName,
-					ProjectionManagementMessage.RunAs.System, "JS",
-					@"fromAll(); on_any(function(){return {};});log(1);",
-					enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true));
-			// when
-			_newProjectionSource = @"fromAll().when({a:function(){return {};}});log(2);";
-			yield return
-				(new ProjectionManagementMessage.Command.UpdateQuery(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.System,
-					_newProjectionSource, emitEnabled: null));
-		}
-
-		[Test, Category("v8")]
-		public void the_projection_source_can_be_retrieved() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetQuery(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
-			var projectionQuery =
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
-			Assert.AreEqual(_projectionName, projectionQuery.Name);
-			Assert.AreEqual(_newProjectionSource, projectionQuery.Query);
-		}
-
-		[Test, Category("v8")]
-		public void emit_enabled_options_remains_unchanged() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetQuery(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
-			var projectionQuery =
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
-			Assert.AreEqual(_projectionName, projectionQuery.Name);
-			Assert.AreEqual(true, projectionQuery.EmitEnabled);
-		}
-
-		[Test, Category("v8")]
-		public void the_projection_status_is_still_running() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetStatistics(_bus, null, _projectionName,
-					false));
-
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Length);
-			Assert.AreEqual(
-				_projectionName,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Single()
-					.Name);
-			Assert.AreEqual(
-				ManagedProjectionState.Running,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Single()
-					.LeaderStatus);
-		}
-
-		[Test, Category("v8")]
-		public void the_projection_state_can_be_retrieved() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, ""));
-			_queue.Process();
-
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
-			Assert.AreEqual(
-				_projectionName,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().Name);
-			Assert.AreEqual( // empty? why?
-				"", _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().State);
-		}
-
-		[Test, Category("v8")]
-		public void correct_query_has_been_prepared() {
-			var lastPrepared = _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Prepared>().LastOrDefault();
-			Assert.IsNotNull(lastPrepared);
-			Assert.IsFalse(lastPrepared.SourceDefinition.AllEvents);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_updating_a_persistent_system_projection_query_text.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_updating_a_persistent_system_projection_query_text.cs
deleted file mode 100644
index f4d9a54d2d3..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_updating_a_persistent_system_projection_query_text.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Management;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_updating_a_continous_system_projection_query_text<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		protected override void Given() {
-			NoStream("$projections-$by_correlation_id");
-			NoStream("$projections-$by_correlation_id-result");
-			NoStream("$projections-$by_correlation_id-order");
-			AllWritesToSucceed("$projections-$by_correlation_id-order");
-			NoStream("$projections-$by_correlation_id-checkpoint");
-			AllWritesSucceed();
-		}
-
-		private string _projectionName;
-		private string _newProjectionSource;
-
-		protected override IEnumerable<WhenStep> When() {
-			_projectionName = "$by_correlation_id";
-			yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-			yield return
-				(new ProjectionManagementMessage.Command.Post(
-					_bus, ProjectionMode.Continuous, _projectionName,
-					ProjectionManagementMessage.RunAs.System,"native:EventStore.Projections.Core.Standard.ByCorrelationId", "{\"correlationIdProperty\":\"$myCorrelationId\"}",
-					enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true));
-			// when
-			_newProjectionSource = "{\"correlationIdProperty\":\"$updateCorrelationId\"}";
-			yield return
-				(new ProjectionManagementMessage.Command.UpdateQuery(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.System,
-					_newProjectionSource, emitEnabled: null));
-		}
-
-		[Test, Category("v8")]
-		public void the_projection_source_can_be_retrieved() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetQuery(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
-			var projectionQuery =
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
-			Assert.AreEqual(_projectionName, projectionQuery.Name);
-			Assert.AreEqual(_newProjectionSource, projectionQuery.Query);
-		}
-
-		[Test, Category("v8")]
-		public void emit_enabled_options_remains_unchanged() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetQuery(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
-			var projectionQuery =
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
-			Assert.AreEqual(_projectionName, projectionQuery.Name);
-			Assert.AreEqual(true, projectionQuery.EmitEnabled);
-		}
-
-		[Test, Category("v8")]
-		public void the_projection_status_is_still_running() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetStatistics(_bus, null, _projectionName,
-					false));
-
-			 Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Length);
-			Assert.AreEqual(
-				_projectionName,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Single()
-					.Name);
-			Assert.AreEqual(
-				ManagedProjectionState.Running,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Single()
-					.LeaderStatus);
-		}
-
-		[Test, Category("v8")]
-		public void the_projection_state_can_be_retrieved() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, ""));
-			_queue.Process();
-
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
-			Assert.AreEqual(
-				_projectionName,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().Name);
-			Assert.AreEqual( // empty? why?
-				"", _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().State);
-		}
-
-		[Test, Category("v8")]
-		public void correct_query_has_been_prepared() {
-			var lastPrepared = _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Prepared>().LastOrDefault();
-			Assert.IsNotNull(lastPrepared);
-			Assert.IsTrue(lastPrepared.SourceDefinition.AllEvents);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_updating_an_onetime_projection_query_text.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_updating_an_onetime_projection_query_text.cs
deleted file mode 100644
index aa5c8f395b5..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_updating_an_onetime_projection_query_text.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Management;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_updating_an_onetime_projection_query_text<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		private string _projectionName;
-		private string _newProjectionSource;
-
-		protected override void Given() {
-			NoOtherStreams();
-		}
-
-		[Test, Category("v8")]
-		public void the_projection_source_can_be_retrieved() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetQuery(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
-			var projectionQuery =
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
-			Assert.AreEqual(_projectionName, projectionQuery.Name);
-			Assert.AreEqual(_newProjectionSource, projectionQuery.Query);
-		}
-
-		[Test, Category("v8")]
-		public void the_projection_status_is_still_running() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetStatistics(_bus, null, _projectionName,
-					false));
-
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Length);
-			Assert.AreEqual(
-				_projectionName,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Single()
-					.Name);
-			Assert.AreEqual(
-				ManagedProjectionState.Running,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Single()
-					.LeaderStatus);
-		}
-
-		[Test, Category("v8")]
-		public void the_projection_state_can_be_retrieved() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, ""));
-			_queue.Process();
-
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
-			Assert.AreEqual(
-				_projectionName,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().Name);
-			Assert.AreEqual(
-				"", _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().State);
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			_projectionName = "test-projection";
-			yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-			yield return
-				(new ProjectionManagementMessage.Command.Post(
-					_bus, ProjectionMode.Transient, _projectionName,
-					ProjectionManagementMessage.RunAs.Anonymous, "JS", @"fromAll(); on_any(function(){});log(1);",
-					enabled: true, checkpointsEnabled: false, emitEnabled: false, trackEmittedStreams: true));
-			// when
-			_newProjectionSource = @"fromAll(); on_any(function(){});log(2);";
-			yield return
-				(new ProjectionManagementMessage.Command.UpdateQuery(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous,
-					_newProjectionSource, emitEnabled: null));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_updating_an_onetime_system_projection_query_text.cs b/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_updating_an_onetime_system_projection_query_text.cs
deleted file mode 100644
index 0c732c41faa..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/when_updating_an_onetime_system_projection_query_text.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Management;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_manager {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	public class when_updating_an_onetime_system_projection_query_text<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		private string _projectionName;
-		private string _newProjectionSource;
-
-		protected override void Given() {
-			NoOtherStreams();
-		}
-		
-		protected override IEnumerable<WhenStep> When() {
-			_projectionName = "$by_correlation_id";
-			yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
-			yield return
-				(new ProjectionManagementMessage.Command.Post(
-					_bus, ProjectionMode.Transient, _projectionName,
-					ProjectionManagementMessage.RunAs.Anonymous, "native:EventStore.Projections.Core.Standard.ByCorrelationId", "{\"correlationIdProperty\":\"$myCorrelationId\"}",
-					enabled: true, checkpointsEnabled: false, emitEnabled: false, trackEmittedStreams: true));
-			// when
-			_newProjectionSource = "{\"correlationIdProperty\":\"$updateCorrelationId\"}";
-			yield return
-				(new ProjectionManagementMessage.Command.UpdateQuery(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous,
-					_newProjectionSource, emitEnabled: null));
-		}
-
-		[Test, Category("v8")]
-		public void the_projection_source_can_be_retrieved() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetQuery(
-					_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
-			var projectionQuery =
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
-			Assert.AreEqual(_projectionName, projectionQuery.Name);
-			Assert.AreEqual(_newProjectionSource, projectionQuery.Query);
-		}
-
-		[Test, Category("v8")]
-		public void the_projection_status_is_still_running() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetStatistics(_bus, null, _projectionName,
-					false));
-
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
-			Assert.AreEqual(
-				1,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Length);
-			Assert.AreEqual(
-				_projectionName,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Single()
-					.Name);
-			Assert.AreEqual(
-				ManagedProjectionState.Running,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Single()
-					.LeaderStatus);
-		}
-
-		[Test, Category("v8")]
-		public void the_projection_state_can_be_retrieved() {
-			_manager.Handle(
-				new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, ""));
-			_queue.Process();
-
-			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
-			Assert.AreEqual(
-				_projectionName,
-				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().Name);
-			Assert.AreEqual(
-				"", _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().State);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_system/when_requesting_state_from_a_faulted_projection.cs b/src/EventStore.Projections.Core.Tests/Services/projections_system/when_requesting_state_from_a_faulted_projection.cs
deleted file mode 100644
index c14c537b987..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_system/when_requesting_state_from_a_faulted_projection.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using NUnit.Framework;
-using System.Linq;
-using EventStore.Core.Tests;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_system {
-	[TestFixture(typeof(LogFormat.V2), typeof(string))]
-	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-	class when_requesting_state_from_a_faulted_projection<TLogFormat, TStreamId> : with_projection_config<TLogFormat, TStreamId> {
-		private TFPos _message1Position;
-
-		protected override void Given() {
-			base.Given();
-			NoOtherStreams();
-			_message1Position = ExistingEvent("stream1", "message1", null, "{}");
-
-			_projectionSource = @"fromAll().when({message1: function(s,e){ throw 1; }});";
-		}
-
-		protected override IEnumerable<WhenStep> When() {
-			yield return
-				new ProjectionManagementMessage.Command.Post(
-					Envelope, ProjectionMode.Continuous, _projectionName, ProjectionManagementMessage.RunAs.System,
-					"js",
-					_projectionSource, enabled: true, checkpointsEnabled: true, emitEnabled: true,
-					trackEmittedStreams: true);
-			yield return Yield;
-			yield return new ProjectionManagementMessage.Command.GetState(Envelope, _projectionName, "");
-		}
-
-		protected override bool GivenStartSystemProjections() {
-			return true;
-		}
-
-		[Test]
-		public void reported_state_is_before_the_fault_position() {
-			var states = HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().ToArray();
-			Assert.AreEqual(1, states.Length);
-			var state = states[0];
-
-			Assert.That(state.Position.Streams.Count == 1);
-			Assert.That(state.Position.Streams.Keys.First() == "message1");
-			Assert.That(state.Position.Streams["message1"] == -1);
-			Assert.That(
-				state.Position.Position <= _message1Position, "{0} <= {1}", state.Position.Position, _message1Position);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_system/with_projection_config.cs b/src/EventStore.Projections.Core.Tests/Services/projections_system/with_projection_config.cs
deleted file mode 100644
index fecbc2a5d1b..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_system/with_projection_config.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using EventStore.Projections.Core.Services.Processing;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_system {
-	public abstract class with_projection_config<TLogFormat, TStreamId> : with_projections_subsystem<TLogFormat, TStreamId> {
-		protected string _projectionName;
-		protected string _projectionSource;
-		protected bool _checkpointsEnabled;
-		protected bool _trackEmittedStreams;
-		protected bool _emitEnabled;
-
-		protected override void Given() {
-			base.Given();
-
-			_projectionName = "test-projection";
-			_projectionSource = @"";
-			_checkpointsEnabled = true;
-			_trackEmittedStreams = true;
-			_emitEnabled = true;
-
-			NoStream(ProjectionNamesBuilder.ProjectionsStreamPrefix + _projectionName + "-checkpoint");
-			NoStream(ProjectionNamesBuilder.ProjectionsStreamPrefix + _projectionName + "-order");
-			NoStream(ProjectionNamesBuilder.ProjectionsStreamPrefix + _projectionName + "-emittedstreams");
-			AllWritesSucceed();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_system/with_projections_subsystem.cs b/src/EventStore.Projections.Core.Tests/Services/projections_system/with_projections_subsystem.cs
deleted file mode 100644
index 73581a26127..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/projections_system/with_projections_subsystem.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Tests.Services.projections_manager;
-using System.Linq;
-
-namespace EventStore.Projections.Core.Tests.Services.projections_system {
-	public abstract class with_projections_subsystem<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
-		protected bool _startSystemProjections;
-		protected Guid _instanceCorrelation = Guid.NewGuid();
-
-		protected override bool GivenInitializeSystemProjections() {
-			return true;
-		}
-
-		protected override void Given1() {
-			base.Given1();
-			_startSystemProjections = GivenStartSystemProjections();
-			AllWritesSucceed();
-			NoOtherStreams();
-			EnableReadAll();
-		}
-
-		protected virtual bool GivenStartSystemProjections() {
-			return false;
-		}
-
-		protected override IEnumerable<WhenStep> PreWhen() {
-			yield return (new ProjectionSubsystemMessage.StartComponents(_instanceCorrelation));
-			yield return Yield;
-			if (_startSystemProjections) {
-				yield return
-					new ProjectionManagementMessage.Command.GetStatistics(Envelope, ProjectionMode.AllNonTransient,
-						null, false)
-					;
-				var statistics = HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Last();
-				foreach (var projection in statistics.Projections) {
-					if (projection.Status != "Running")
-						yield return
-							new ProjectionManagementMessage.Command.Enable(
-								Envelope, projection.Name, ProjectionManagementMessage.RunAs.Anonymous);
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/result_emitter/result_emitter.cs b/src/EventStore.Projections.Core.Tests/Services/result_emitter/result_emitter.cs
deleted file mode 100644
index 8cdf2b8cf6a..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/result_emitter/result_emitter.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-using System;
-using System.Text;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.result_emitter {
-	public static class result_emitter {
-		[TestFixture]
-		public class when_creating {
-			private ProjectionNamesBuilder _namesBuilder;
-
-			[SetUp]
-			public void setup() {
-				_namesBuilder = ProjectionNamesBuilder.CreateForTest("projection");
-			}
-
-			[Test]
-			public void it_can_be_created() {
-				new ResultEventEmitter(_namesBuilder);
-			}
-
-			[Test]
-			public void null_names_builder_throws_argument_null_exception() {
-				Assert.Throws<ArgumentNullException>(() => { new ResultEventEmitter(null); });
-			}
-		}
-
-		[TestFixture]
-		public class when_result_updated {
-			private ProjectionNamesBuilder _namesBuilder;
-			private ResultEventEmitter _re;
-			private string _partition;
-			private string _projection;
-			private CheckpointTag _resultAt;
-			private EmittedEventEnvelope[] _emittedEvents;
-			private string _result;
-
-			[SetUp]
-			public void setup() {
-				Given();
-				When();
-			}
-
-			private void Given() {
-				_projection = "projection";
-				_resultAt = CheckpointTag.FromPosition(0, 100, 50);
-				_partition = "partition";
-				_result = "{\"result\":1}";
-				_namesBuilder = ProjectionNamesBuilder.CreateForTest(_projection);
-				_re = new ResultEventEmitter(_namesBuilder);
-			}
-
-			private void When() {
-				_emittedEvents = _re.ResultUpdated(_partition, _result, _resultAt);
-			}
-
-			[Test]
-			public void emits_result_event() {
-				Assert.NotNull(_emittedEvents);
-				Assert.AreEqual(2, _emittedEvents.Length);
-				var @event = _emittedEvents[0];
-				var link = _emittedEvents[1].Event;
-
-				Assert.AreEqual("Result", @event.Event.EventType);
-				Assert.AreEqual(_result, @event.Event.Data);
-				Assert.AreEqual("$projections-projection-partition-result", @event.Event.StreamId);
-				Assert.AreEqual(_resultAt, @event.Event.CausedByTag);
-				Assert.IsNull(@event.Event.ExpectedTag);
-
-				Assert.AreEqual("$>", link.EventType);
-				((EmittedLinkTo)link).SetTargetEventNumber(1);
-				Assert.AreEqual("1@$projections-projection-partition-result", link.Data);
-				Assert.AreEqual("$projections-projection-result", link.StreamId);
-				Assert.AreEqual(_resultAt, link.CausedByTag);
-				Assert.IsNull(link.ExpectedTag);
-			}
-		}
-
-		[TestFixture]
-		public class when_result_removed {
-			private ProjectionNamesBuilder _namesBuilder;
-			private ResultEventEmitter _re;
-			private string _partition;
-			private string _projection;
-			private CheckpointTag _resultAt;
-			private EmittedEventEnvelope[] _emittedEvents;
-
-			[SetUp]
-			public void setup() {
-				Given();
-				When();
-			}
-
-			private void Given() {
-				_projection = "projection";
-				_resultAt = CheckpointTag.FromPosition(0, 100, 50);
-				_partition = "partition";
-				_namesBuilder = ProjectionNamesBuilder.CreateForTest(_projection);
-				_re = new ResultEventEmitter(_namesBuilder);
-			}
-
-			private void When() {
-				_emittedEvents = _re.ResultUpdated(_partition, null, _resultAt);
-			}
-
-			[Test]
-			public void emits_result_event() {
-				Assert.NotNull(_emittedEvents);
-				Assert.AreEqual(2, _emittedEvents.Length);
-				var @event = _emittedEvents[0];
-				var link = _emittedEvents[1].Event;
-
-				Assert.AreEqual("ResultRemoved", @event.Event.EventType);
-				Assert.IsNull(@event.Event.Data);
-				Assert.AreEqual("$projections-projection-partition-result", @event.Event.StreamId);
-				Assert.AreEqual(_resultAt, @event.Event.CausedByTag);
-				Assert.IsNull(@event.Event.ExpectedTag);
-
-				Assert.AreEqual("$>", link.EventType);
-				((EmittedLinkTo)link).SetTargetEventNumber(1);
-				Assert.AreEqual("1@$projections-projection-partition-result", link.Data);
-				Assert.AreEqual("$projections-projection-result", link.StreamId);
-				Assert.AreEqual(_resultAt, link.CausedByTag);
-				Assert.IsNull(link.ExpectedTag);
-			}
-		}
-
-		[TestFixture]
-		public class when_result_updated_on_root_partition {
-			private ProjectionNamesBuilder _namesBuilder;
-			private ResultEventEmitter _re;
-			private string _partition;
-			private string _projection;
-			private CheckpointTag _resultAt;
-			private EmittedEventEnvelope[] _emittedEvents;
-			private string _result;
-
-			[SetUp]
-			public void setup() {
-				Given();
-				When();
-			}
-
-			private void Given() {
-				_projection = "projection";
-				_resultAt = CheckpointTag.FromPosition(0, 100, 50);
-				_partition = "";
-				_result = "{\"result\":1}";
-				_namesBuilder = ProjectionNamesBuilder.CreateForTest(_projection);
-				_re = new ResultEventEmitter(_namesBuilder);
-			}
-
-			private void When() {
-				_emittedEvents = _re.ResultUpdated(_partition, _result, _resultAt);
-			}
-
-			[Test]
-			public void emits_result_event() {
-				Assert.NotNull(_emittedEvents);
-				Assert.AreEqual(1, _emittedEvents.Length);
-				var @event = _emittedEvents[0].Event;
-
-				Assert.AreEqual("Result", @event.EventType);
-				Assert.AreEqual(_result, @event.Data);
-				Assert.AreEqual("$projections-projection-result", @event.StreamId);
-				Assert.AreEqual(_resultAt, @event.CausedByTag);
-				Assert.IsNull(@event.ExpectedTag);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/staged_processing_queue.cs b/src/EventStore.Projections.Core.Tests/Services/staged_processing_queue.cs
deleted file mode 100644
index 6c9d4856682..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/staged_processing_queue.cs
+++ /dev/null
@@ -1,434 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services {
-	public class staged_processing_queue {
-		[TestFixture]
-		public class when_creating {
-			private StagedProcessingQueue _q;
-
-			[SetUp]
-			public void when() {
-				_q = new StagedProcessingQueue(new[] {true});
-			}
-
-			[Test]
-			public void it_can_be_created() {
-				Assert.IsNotNull(_q);
-			}
-
-			[Test]
-			public void task_can_be_enqueued() {
-				_q.Enqueue(new TestTask(1, 1));
-			}
-
-			[Test]
-			public void process_does_not_proces_anything() {
-				var processed = _q.Process();
-				Assert.IsFalse(processed);
-			}
-		}
-
-		[TestFixture]
-		public class when_enqueuing_a_one_step_task {
-			private StagedProcessingQueue _q;
-			private TestTask _t1;
-
-			[SetUp]
-			public void when() {
-				_q = new StagedProcessingQueue(new[] {true});
-				_t1 = new TestTask(1, 1);
-				_q.Enqueue(_t1);
-			}
-
-			[Test]
-			public void process_executes_the_task_at_stage_zero() {
-				_q.Process();
-
-				Assert.That(_t1.StartedOn(0));
-			}
-
-			[Test]
-			public void process_returns_true() {
-				var processed = _q.Process();
-
-				Assert.IsTrue(processed);
-			}
-		}
-
-		[TestFixture]
-		public class when_enqueuing_a_two_step_task_and_the_first_step_completes_immediately {
-			private StagedProcessingQueue _q;
-			private TestTask _t1;
-
-			[SetUp]
-			public void when() {
-				_q = new StagedProcessingQueue(new[] {true, true});
-				_t1 = new TestTask(1, 2, 0);
-				_q.Enqueue(_t1);
-			}
-
-			[Test]
-			public void process_executes_the_task_up_to_stage_one() {
-				_q.Process(max: 2);
-
-				Assert.That(_t1.StartedOn(1));
-			}
-		}
-
-		[TestFixture]
-		public class when_reinitializing {
-			private StagedProcessingQueue _q;
-			private TestTask _t1;
-
-			[SetUp]
-			public void when() {
-				_q = new StagedProcessingQueue(new[] {true, true});
-				_t1 = new TestTask(1, 2, 0);
-				_q.Enqueue(_t1);
-				_q.Initialize();
-			}
-
-			[Test]
-			public void process_does_not_execute_a_task() {
-				_q.Process();
-
-				Assert.That(!_t1.StartedOn(0));
-			}
-
-			[Test]
-			public void queue_length_iz_zero() {
-				Assert.AreEqual(0, _q.Count);
-			}
-
-			[Test]
-			public void task_can_be_enqueued() {
-				_q.Enqueue(new TestTask(1, 1));
-			}
-		}
-
-		[TestFixture]
-		public class when_enqueuing_a_two_step_task_and_both_steps_complete_immediately {
-			private StagedProcessingQueue _q;
-			private TestTask _t1;
-
-			[SetUp]
-			public void when() {
-				_q = new StagedProcessingQueue(new[] {true, true});
-				_t1 = new TestTask(1, 2, 1);
-				_q.Enqueue(_t1);
-			}
-
-			[Test]
-			public void queue_becomes_empty() {
-				_q.Process(max: 2);
-
-				Assert.That(_q.IsEmpty);
-			}
-
-			[Test]
-			public void process_returns_true() {
-				var processed = _q.Process(max: 2);
-
-				Assert.IsTrue(processed);
-			}
-		}
-
-		[TestFixture]
-		public class when_enqueuing_two_related_one_step_tasks {
-			private StagedProcessingQueue _q;
-			private TestTask _t1;
-			private TestTask _t2;
-
-			[SetUp]
-			public void when() {
-				_q = new StagedProcessingQueue(new[] {true, true});
-				_t1 = new TestTask(1, 1);
-				_t2 = new TestTask(1, 1);
-				_q.Enqueue(_t1);
-				_q.Enqueue(_t2);
-			}
-
-			[Test]
-			public void two_process_execute_only_the_first_task() {
-				_q.Process();
-				_q.Process();
-
-				Assert.That(_t1.StartedOn(0));
-				Assert.That(!_t2.StartedOn(0));
-			}
-		}
-
-		[TestFixture]
-		public class when_enqueuing_two_related_one_step_tasks_one_by_one {
-			private StagedProcessingQueue _q;
-			private TestTask _t1;
-			private TestTask _t2;
-
-			[SetUp]
-			public void when() {
-				_q = new StagedProcessingQueue(new[] {true, true});
-				_t1 = new TestTask(1, 1, 1);
-				_t2 = new TestTask(1, 1, 1);
-				_q.Enqueue(_t1);
-				_q.Process();
-				_q.Enqueue(_t2);
-				_q.Process();
-			}
-
-			[Test]
-			public void two_process_execute_only_the_first_task() {
-				Assert.That(_t1.StartedOn(0));
-				Assert.That(_t2.StartedOn(0));
-			}
-		}
-
-		[TestFixture]
-		public class when_enqueuing_two_two_step_tasks_that_relate_on_first_stage {
-			private StagedProcessingQueue _q;
-			private TestTask _t1;
-			private TestTask _t2;
-
-			[SetUp]
-			public void when() {
-				_q = new StagedProcessingQueue(new[] {true, true});
-				_t1 = new TestTask(null, 2, stageCorrelations: new object[] {"a", "a"});
-				_t2 = new TestTask(null, 2, stageCorrelations: new object[] {"a", "a"});
-				_q.Enqueue(_t1);
-				_q.Enqueue(_t2);
-			}
-
-			[Test]
-			public void first_task_starts_on_second_stage_on_first_stage_completion() {
-				_q.Process();
-				_q.Process();
-
-				_t1.Complete();
-
-				_q.Process();
-
-				Assert.That(_t1.StartedOn(1));
-			}
-
-			[Test]
-			public void second_task_does_not_start_on_second_stage_on_first_stage_completion() {
-				_q.Process();
-				_q.Process();
-
-				_t2.Complete();
-
-				_q.Process();
-				_q.Process();
-
-				Assert.That(!_t2.StartedOn(1));
-			}
-
-			[Test]
-			public void second_task_does_not_start_on_both_task_completion_on_the_first_stage() {
-				_q.Process();
-				_q.Process();
-
-				_t1.Complete();
-				_t2.Complete();
-
-				_q.Process();
-				_q.Process();
-
-				Assert.That(!_t2.StartedOn(1));
-			}
-
-			[Test]
-			public void second_task_starts_on_the_first_task_completion_on_the_first_stage() {
-				_q.Process();
-				_q.Process();
-
-				_t1.Complete();
-				_t2.Complete();
-
-				_q.Process();
-				_q.Process();
-
-				_t1.Complete();
-
-				_q.Process();
-
-
-				Assert.That(_t2.StartedOn(1));
-			}
-		}
-
-		[TestFixture]
-		public class when_enqueuing_two_two_step_tasks_and_the_second_completes_first {
-			private StagedProcessingQueue _q;
-			private TestTask _t1;
-			private TestTask _t2;
-
-			[SetUp]
-			public void when() {
-				_q = new StagedProcessingQueue(new[] {true, true});
-				_t1 = new TestTask(1, 2);
-				_t2 = new TestTask(2, 2, 0);
-				_q.Enqueue(_t1);
-				_q.Enqueue(_t2);
-				_q.Process(max: 2);
-				_q.Process(max: 2);
-				_q.Process(max: 2);
-			}
-
-			[Test]
-			public void process_waits_for_the_first_task_to_complete() {
-				Assert.That(_t1.StartedOn(0));
-				Assert.That(_t2.StartedOn(0));
-			}
-
-			[Test]
-			public void first_task_completed_unblocks_both_tasks() {
-				_t1.Complete();
-				_q.Process();
-				_q.Process();
-
-				Assert.That(_t1.StartedOn(1));
-				Assert.That(_t2.StartedOn(1));
-			}
-		}
-
-		[TestFixture]
-		public class when_enqueuing_two_async_async_sync_step_tasks_and_the_second_completes_first {
-			private StagedProcessingQueue _q;
-			private TestTask _t1;
-			private TestTask _t2;
-
-			[SetUp]
-			public void when() {
-				_q = new StagedProcessingQueue(new[] {false, false, true});
-				_t1 = new TestTask(1, 3);
-				_t2 = new TestTask(2, 3, 0);
-				_q.Enqueue(_t1);
-				_q.Enqueue(_t2);
-				_q.Process(max: 3);
-				_q.Process(max: 3);
-				_q.Process(max: 3);
-			}
-
-			[Test]
-			public void start_processing_second_task_on_stage_one() {
-				Assert.That(_t1.StartedOn(0));
-				Assert.That(_t2.StartedOn(1));
-			}
-
-			[Test]
-			public void first_task_completed_unblocks_both_tasks() {
-				_t1.Complete();
-				_q.Process();
-				_q.Process();
-
-				Assert.That(_t1.StartedOn(1));
-				Assert.That(_t2.StartedOn(1));
-			}
-		}
-
-		[TestFixture]
-		public class when_enqueuing_three_async_async_sync_step_tasks_and_they_complete_starting_from_second {
-			private StagedProcessingQueue _q;
-			private TestTask _t1;
-			private TestTask _t2;
-			private TestTask _t3;
-
-			[SetUp]
-			public void when() {
-				_q = new StagedProcessingQueue(new[] {false, false, true});
-				_t1 = new TestTask(1, 3);
-				_t2 = new TestTask(2, 3, 0);
-				_t3 = new TestTask(3, 3, 0);
-				_q.Enqueue(_t1);
-				_q.Enqueue(_t2);
-				_q.Enqueue(_t3);
-				_q.Process(max: 3);
-				_q.Process(max: 3);
-				_q.Process(max: 3);
-			}
-
-			[Test]
-			public void start_processing_second_and_third_tasks_on_stage_one() {
-				Assert.That(_t1.StartedOn(0));
-				Assert.That(_t2.StartedOn(1));
-				Assert.That(_t3.StartedOn(1));
-			}
-
-			[Test]
-			public void first_task_keeps_other_blocked_at_stage_two() {
-				_t1.Complete();
-				_q.Process(max: 2);
-				_q.Process(max: 2);
-				_t2.Complete();
-				_t3.Complete();
-				_q.Process();
-				Assert.That(!_t2.StartedOn(2));
-				Assert.That(!_t3.StartedOn(2));
-			}
-
-			[Test]
-			public void first_task_completed_at_stage_one_unblock_all() {
-				_t1.Complete();
-				_q.Process();
-				_q.Process();
-				_t2.Complete();
-				_t3.Complete();
-				_q.Process();
-				_t1.Complete();
-				_q.Process();
-				_q.Process();
-				_q.Process();
-
-				Assert.That(_t2.StartedOn(2));
-				Assert.That(_t3.StartedOn(2));
-			}
-		}
-
-		[TestFixture]
-		public class when_enqueuing_two_one_step_tasks {
-			private StagedProcessingQueue _q;
-			private TestTask _t1;
-			private TestTask _t2;
-
-			[SetUp]
-			public void when() {
-				_q = new StagedProcessingQueue(new[] {true, true});
-				_t1 = new TestTask(1, 1);
-				_t2 = new TestTask(2, 1);
-				_q.Enqueue(_t1);
-				_q.Enqueue(_t2);
-			}
-
-			[Test]
-			public void two_process_execute_both_tasks_at_stage_zero() {
-				_q.Process();
-				_q.Process();
-
-				Assert.That(_t1.StartedOn(0));
-				Assert.That(_t2.StartedOn(0));
-			}
-		}
-
-
-		[TestFixture]
-		public class when_changing_correlation_id_on_unordered_stage {
-			private StagedProcessingQueue _q;
-			private TestTask _t1;
-
-			[SetUp]
-			public void when() {
-				_q = new StagedProcessingQueue(new[] {false});
-				_t1 = new TestTask(Guid.NewGuid(), 1, stageCorrelations: new object[] {"a"});
-				_q.Enqueue(_t1);
-			}
-
-			[Test]
-			public void first_task_starts_on_second_stage_on_first_stage_completion() {
-				_q.Process();
-				Assert.Throws<InvalidOperationException>(() => { _t1.Complete(); });
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Services/write_query_result_phase/creating.cs b/src/EventStore.Projections.Core.Tests/Services/write_query_result_phase/creating.cs
deleted file mode 100644
index febcceef9d6..00000000000
--- a/src/EventStore.Projections.Core.Tests/Services/write_query_result_phase/creating.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Core.Bus;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using EventStore.Projections.Core.Services.Processing.Phases;
-using EventStore.Projections.Core.Tests.Services.core_projection.checkpoint_manager;
-using EventStore.Projections.Core.Tests.Services.core_projection.multi_phase;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Services.write_query_result_phase {
-	namespace creating {
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		class when_creating<TLogFormat, TStreamId> {
-			[Test]
-			public void it_can_be_created() {
-				var coreProjection = new FakeCoreProjection();
-				var stateCache = new PartitionStateCache();
-				var bus = new SynchronousScheduler();
-				var fakeCheckpointManager =
-					new specification_with_multi_phase_core_projection<TLogFormat, TStreamId>.FakeCheckpointManager(bus, Guid.NewGuid());
-				var fakeEmittedStreamsTracker =
-					new specification_with_multi_phase_core_projection<TLogFormat, TStreamId>.FakeEmittedStreamsTracker();
-				TestHelper.Consume(
-					new WriteQueryResultProjectionProcessingPhase(
-						bus,
-						1,
-						"result-stream",
-						coreProjection,
-						stateCache,
-						fakeCheckpointManager,
-						fakeCheckpointManager,
-						fakeEmittedStreamsTracker));
-			}
-		}
-
-		abstract class specification_with_write_query_result_projection_processing_phase<TLogFormat, TStreamId> {
-			protected WriteQueryResultProjectionProcessingPhase _phase;
-			protected specification_with_multi_phase_core_projection<TLogFormat, TStreamId>.FakeCheckpointManager _checkpointManager;
-			protected specification_with_multi_phase_core_projection<TLogFormat, TStreamId>.FakeEmittedStreamsTracker _emittedStreamsTracker;
-			protected SynchronousScheduler _publisher;
-			protected PartitionStateCache _stateCache;
-			protected string _resultStreamName;
-			protected FakeCoreProjection _coreProjection;
-
-			[SetUp]
-			public void SetUp() {
-				_stateCache = GivenStateCache();
-				_publisher = new();
-				_coreProjection = new FakeCoreProjection();
-				_checkpointManager = new specification_with_multi_phase_core_projection<TLogFormat, TStreamId>.FakeCheckpointManager(
-					_publisher, Guid.NewGuid());
-				_emittedStreamsTracker = new specification_with_multi_phase_core_projection<TLogFormat, TStreamId>.FakeEmittedStreamsTracker();
-				_resultStreamName = "result-stream";
-				_phase = new WriteQueryResultProjectionProcessingPhase(
-					_publisher,
-					1,
-					_resultStreamName,
-					_coreProjection,
-					_stateCache,
-					_checkpointManager,
-					_checkpointManager,
-					_emittedStreamsTracker);
-				When();
-			}
-
-			protected virtual PartitionStateCache GivenStateCache() {
-				var stateCache = new PartitionStateCache();
-
-				stateCache.CachePartitionState(
-					"a", new PartitionState("{}", null, CheckpointTag.FromPhase(0, completed: false)));
-				stateCache.CachePartitionState(
-					"b", new PartitionState("{}", null, CheckpointTag.FromPhase(0, completed: false)));
-				stateCache.CachePartitionState(
-					"c", new PartitionState("{}", null, CheckpointTag.FromPhase(0, completed: false)));
-				return stateCache;
-			}
-
-			protected abstract void When();
-
-			[TearDown]
-			public void TearDown() {
-				_phase = null;
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		class when_created<TLogFormat, TStreamId> : specification_with_write_query_result_projection_processing_phase<TLogFormat, TStreamId> {
-			protected override void When() {
-			}
-
-			[Test]
-			public void can_be_initialized_from_phase_checkpoint() {
-				_phase.InitializeFromCheckpoint(CheckpointTag.FromPhase(1, completed: false));
-			}
-
-			[Test]
-			public void process_event_throws_invalid_operation_exception() {
-				Assert.Throws<InvalidOperationException>(() => { _phase.ProcessEvent(); });
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		class when_subscribing<TLogFormat, TStreamId> : specification_with_write_query_result_projection_processing_phase<TLogFormat, TStreamId> {
-			protected override void When() {
-				_phase.Subscribe(CheckpointTag.FromPhase(1, completed: false), false);
-			}
-
-			[Test]
-			public void notifies_core_projection_with_subscribed() {
-				Assert.AreEqual(1, _coreProjection.SubscribedInvoked);
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		class when_processing_event<TLogFormat, TStreamId> : specification_with_write_query_result_projection_processing_phase<TLogFormat, TStreamId> {
-			protected override void When() {
-				_phase.Subscribe(CheckpointTag.FromPhase(1, completed: false), false);
-				_phase.SetProjectionState(PhaseState.Running);
-				_phase.ProcessEvent();
-			}
-
-			[Test]
-			public void writes_query_results() {
-				Assert.AreEqual(3, _checkpointManager.EmittedEvents.Count(v => v.Event.EventType == "Result"));
-			}
-		}
-
-		[TestFixture(typeof(LogFormat.V2), typeof(string))]
-		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
-		class
-			when_completed_query_processing_event<TLogFormat, TStreamId> : specification_with_write_query_result_projection_processing_phase<TLogFormat, TStreamId> {
-			protected override void When() {
-				_phase.Subscribe(CheckpointTag.FromPhase(1, completed: false), false);
-				_phase.SetProjectionState(PhaseState.Running);
-				_phase.ProcessEvent();
-				_phase.SetProjectionState(PhaseState.Stopped);
-				_phase.ProcessEvent();
-			}
-
-			[Test]
-			public void writes_query_results_only_once() {
-				Assert.AreEqual(3, _checkpointManager.EmittedEvents.Count(v => v.Event.EventType == "Result"));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Subsystem/TestFixtureWithProjectionSubsystem.cs b/src/EventStore.Projections.Core.Tests/Subsystem/TestFixtureWithProjectionSubsystem.cs
deleted file mode 100644
index 9b442e9374d..00000000000
--- a/src/EventStore.Projections.Core.Tests/Subsystem/TestFixtureWithProjectionSubsystem.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Common.Options;
-using EventStore.Core;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Services.Transport.Http;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Projections.Core.Messages;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Subsystem {
-	public class TestFixtureWithProjectionSubsystem {
-		private StandardComponents _standardComponents;
-
-		protected ProjectionsSubsystem Subsystem;
-		protected const int WaitTimeoutMs = 3000;
-
-		private readonly ManualResetEvent _stopReceived = new ManualResetEvent(false);
-		private ProjectionSubsystemMessage.StopComponents _lastStopMessage;
-
-		private readonly ManualResetEvent _startReceived = new ManualResetEvent(false);
-		private ProjectionSubsystemMessage.StartComponents _lastStartMessage;
-
-		protected Task Started { get; private set; }
-
-		static readonly IConfiguration EmptyConfiguration = new ConfigurationBuilder().AddInMemoryCollection().Build();
-
-		private StandardComponents CreateStandardComponents() {
-			var dbConfig = TFChunkHelper.CreateDbConfig(Path.GetTempPath(), 0);
-			var mainQueue = new QueuedHandlerThreadPool
-			(new AdHocHandler<Message>(msg => {
-				/* Ignore messages */
-			}), "MainQueue", new QueueStatsManager(), new());
-			var mainBus = new InMemoryBus("mainBus");
-			var threadBasedScheduler = new ThreadBasedScheduler(new QueueStatsManager(), new());
-			var timerService = new TimerService(threadBasedScheduler);
-
-			return new StandardComponents(dbConfig, mainQueue, mainBus,
-				timerService, timeProvider: null, httpForwarder: null, httpServices: new IHttpService[] { },
-				networkSendService: null, queueStatsManager: new QueueStatsManager(),
-				trackers: new(), true);
-		}
-
-		[OneTimeSetUp]
-		public void SetUp() {
-			_standardComponents = CreateStandardComponents();
-
-			var builder = WebApplication.CreateBuilder();
-			builder.Services.AddGrpc();
-			builder.Services.AddSingleton(_standardComponents);
-
-			Subsystem = new ProjectionsSubsystem(
-				new ProjectionSubsystemOptions(1, ProjectionType.All, true, TimeSpan.FromSeconds(3), true, 500, 250));
-
-			Subsystem.ConfigureServices(builder.Services, new ConfigurationBuilder().Build());
-			Subsystem.ConfigureApplication(builder.Build().UseRouting(), EmptyConfiguration);
-
-			// Unsubscribe from the actual components so we can test in isolation
-			Subsystem.LeaderInputBus.Unsubscribe<ProjectionSubsystemMessage.ComponentStarted>(Subsystem);
-			Subsystem.LeaderInputBus.Unsubscribe<ProjectionSubsystemMessage.ComponentStopped>(Subsystem);
-
-			Subsystem.LeaderInputBus.Subscribe(new AdHocHandler<Message>(
-				msg => {
-					switch (msg) {
-						case ProjectionSubsystemMessage.StartComponents start: {
-							_lastStartMessage = start;
-							_startReceived.Set();
-							break;
-						}
-						case ProjectionSubsystemMessage.StopComponents stop: {
-							_lastStopMessage = stop;
-							_stopReceived.Set();
-							break;
-						}
-					}
-				}));
-
-			Started = Subsystem.Start();
-
-			Given();
-		}
-
-		[OneTimeTearDown]
-		public void TearDown() {
-			_standardComponents.TimerService.Dispose();
-		}
-
-		protected virtual void Given() {
-		}
-
-		protected ProjectionSubsystemMessage.StartComponents WaitForStartMessage
-			(string timeoutMsg = null, bool failOnTimeout = true) {
-			timeoutMsg ??= "Timed out waiting for Start Components";
-			if (_startReceived.WaitOne(WaitTimeoutMs))
-				return _lastStartMessage;
-			if (failOnTimeout)
-				Assert.Fail(timeoutMsg);
-			return null;
-		}
-
-		protected ProjectionSubsystemMessage.StopComponents WaitForStopMessage(string timeoutMsg = null) {
-			timeoutMsg ??= "Timed out waiting for Stop Components";
-			if (_stopReceived.WaitOne(WaitTimeoutMs)) {
-				return _lastStopMessage;
-			}
-
-			Assert.Fail(timeoutMsg);
-			return null;
-		}
-
-		protected void ResetMessageEvents() {
-			_stopReceived.Reset();
-			_startReceived.Reset();
-			_lastStopMessage = null;
-			_lastStartMessage = null;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Subsystem/when_projection_subsystem_restarting.cs b/src/EventStore.Projections.Core.Tests/Subsystem/when_projection_subsystem_restarting.cs
deleted file mode 100644
index 6f5f549862d..00000000000
--- a/src/EventStore.Projections.Core.Tests/Subsystem/when_projection_subsystem_restarting.cs
+++ /dev/null
@@ -1,294 +0,0 @@
-using System;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-// ReSharper disable InconsistentNaming
-
-namespace EventStore.Projections.Core.Tests.Subsystem {
-
-	[TestFixture]
-	public class when_projection_subsystem_restarted
-		: TestFixtureWithProjectionSubsystem {
-		private Guid _instanceCorrelation;
-		private Message _restartResponse;
-
-		protected override void Given() {
-			Subsystem.Handle(new SystemMessage.SystemCoreReady());
-			Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
-
-			var startMsg = WaitForStartMessage();
-			ResetMessageEvents();
-			_instanceCorrelation = startMsg.InstanceCorrelationId;
-
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
-				ProjectionManager.ServiceName, _instanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
-				ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
-
-			Subsystem.Handle(new ProjectionSubsystemMessage.RestartSubsystem(
-				new CallbackEnvelope(message => _restartResponse = message)));
-		}
-
-		[Test]
-		public void should_respond_that_subsystem_is_restarting() {
-			Assert.IsInstanceOf<ProjectionSubsystemMessage.SubsystemRestarting>(_restartResponse);
-		}
-
-		[Test]
-		public void should_stop_the_subsystem() {
-			var stopMsg = WaitForStopMessage();
-			Assert.AreEqual(_instanceCorrelation, stopMsg.InstanceCorrelationId);
-		}
-
-		[Test]
-		public void should_start_the_subsystem_when_fully_stopped() {
-			WaitForStopMessage();
-
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
-				ProjectionManager.ServiceName, _instanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
-				ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionManager.ServiceName));
-			Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionCoreService.SubComponentName));
-
-			var restartMsg = WaitForStartMessage("Timed out waiting for restart StartComponents");
-
-			Assert.AreNotEqual(_instanceCorrelation, restartMsg.InstanceCorrelationId);
-		}
-	}
-
-	[TestFixture,Explicit]
-	public class when_projection_subsystem_restarted_twice
-		: TestFixtureWithProjectionSubsystem {
-		private Guid _instanceCorrelation;
-		private Guid _restartInstanceCorrelation;
-
-		private Message _secondRestartResponse;
-
-		protected override void Given() {
-			// Start subsystem
-			Subsystem.Handle(new SystemMessage.SystemCoreReady());
-			Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
-
-			 var startMsg = WaitForStartMessage();
-			ResetMessageEvents();
-			_instanceCorrelation = startMsg.InstanceCorrelationId;
-
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
-				ProjectionManager.ServiceName, _instanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
-				ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
-
-			// Restart subsystem
-			Subsystem.Handle(new ProjectionSubsystemMessage.RestartSubsystem(new NoopEnvelope()));
-
-			WaitForStopMessage("Timed out waiting for StopComponents on first restart");
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
-				ProjectionManager.ServiceName, _instanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
-				ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionManager.ServiceName));
-			Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionCoreService.SubComponentName));
-
-			var restartMsg = WaitForStartMessage("Timed out waiting for StartComponents on first restart");
-			ResetMessageEvents();
-			_restartInstanceCorrelation = restartMsg.InstanceCorrelationId;
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
-				ProjectionManager.ServiceName, _restartInstanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
-				ProjectionCoreCoordinator.ComponentName, _restartInstanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionManager.ServiceName));
-			Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionCoreService.SubComponentName));
-
-			Subsystem.Handle(new ProjectionSubsystemMessage.RestartSubsystem(
-				new CallbackEnvelope(message => _secondRestartResponse = message)));
-		}
-
-		[Test]
-		public void should_respond_success_on_second_restart() {
-			Assert.IsInstanceOf<ProjectionSubsystemMessage.SubsystemRestarting>(_secondRestartResponse);
-		}
-
-		[Test]
-		public void should_stop_the_subsystem() {
-			var stopMsg = WaitForStopMessage("Timed out waiting for StopComponents on second restart");
-			Assert.AreEqual(_restartInstanceCorrelation, stopMsg.InstanceCorrelationId);
-		}
-
-		[Test]
-		public void should_start_the_subsystem() {
-			WaitForStopMessage("Timed out waiting for StopComponents on second restart");
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
-				ProjectionManager.ServiceName, _restartInstanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
-				ProjectionCoreCoordinator.ComponentName, _restartInstanceCorrelation));
-
-			var restartMsg = WaitForStartMessage("Timed out waiting for StartComponents on second restart");
-			Assert.AreNotEqual(_restartInstanceCorrelation, restartMsg.InstanceCorrelationId);
-		}
-	}
-
-	[TestFixture]
-	public class when_projection_subsystem_restarting_and_node_becomes_unknown
-		: TestFixtureWithProjectionSubsystem {
-		private Guid _instanceCorrelation;
-		private ProjectionSubsystemMessage.StopComponents _stopMsg;
-
-		protected override void Given() {
-			Subsystem.Handle(new SystemMessage.SystemCoreReady());
-			Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
-
-			var startMsg = WaitForStartMessage();
-			ResetMessageEvents();
-			_instanceCorrelation = startMsg.InstanceCorrelationId;
-
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
-				ProjectionManager.ServiceName, _instanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
-				ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
-
-			Subsystem.Handle(new ProjectionSubsystemMessage.RestartSubsystem(new NoopEnvelope()));
-
-			_stopMsg = WaitForStopMessage();
-
-			// Become unknown before components stopped
-			Subsystem.Handle(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
-
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
-				ProjectionManager.ServiceName, _instanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
-				ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionManager.ServiceName));
-			Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionCoreService.SubComponentName));
-		}
-
-		[Test]
-		public void should_stop_the_subsystem_for_the_restart() {
-			Assert.AreEqual(_instanceCorrelation, _stopMsg.InstanceCorrelationId);
-		}
-
-		[Test]
-		public void should_not_start_the_subsystem() {
-			var startMsg = WaitForStartMessage(failOnTimeout: false);
-			Assert.IsNull(startMsg);
-		}
-	}
-
-	[TestFixture]
-	public class when_projection_subsystem_starting_and_told_to_restart
-		: TestFixtureWithProjectionSubsystem {
-		private Message _restartResponse;
-
-		protected override void Given() {
-			Subsystem.Handle(new SystemMessage.SystemCoreReady());
-			Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
-
-			WaitForStartMessage();
-
-			// Restart subsystem before fully started
-			Subsystem.Handle(new ProjectionSubsystemMessage.RestartSubsystem(
-				new CallbackEnvelope(message => _restartResponse = message)));
-		}
-
-		[Test]
-		public void should_report_restart_failure() {
-			Assert.IsInstanceOf<ProjectionSubsystemMessage.InvalidSubsystemRestart>(_restartResponse);
-		}
-	}
-
-	[TestFixture]
-	public class when_projection_subsystem_stopping_and_told_to_restart
-		: TestFixtureWithProjectionSubsystem {
-		private Guid _instanceCorrelation;
-		private Message _restartResponse;
-
-		protected override void Given() {
-			Subsystem.Handle(new SystemMessage.SystemCoreReady());
-			Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
-
-			var startMsg = WaitForStartMessage();
-			ResetMessageEvents();
-			_instanceCorrelation = startMsg.InstanceCorrelationId;
-
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
-				ProjectionManager.ServiceName, _instanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
-				ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionManager.ServiceName));
-			Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionCoreService.SubComponentName));
-
-			Subsystem.Handle(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
-
-			WaitForStopMessage();
-
-			// Restart subsystem before fully stopped
-			Subsystem.Handle(new ProjectionSubsystemMessage.RestartSubsystem(
-				new CallbackEnvelope(message => _restartResponse = message)));
-		}
-
-		[Test]
-		public void should_report_restart_failure() {
-			Assert.IsInstanceOf<ProjectionSubsystemMessage.InvalidSubsystemRestart>(_restartResponse);
-		}
-	}
-
-	[TestFixture]
-	public class when_projection_subsystem_restarting_and_told_to_restart
-		: TestFixtureWithProjectionSubsystem {
-		private Guid _instanceCorrelation;
-		private Message _restartResponse;
-
-		protected override void Given() {
-			Subsystem.Handle(new SystemMessage.SystemCoreReady());
-			Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
-
-			var startMsg = WaitForStartMessage();
-			_instanceCorrelation = startMsg.InstanceCorrelationId;
-
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
-				ProjectionManager.ServiceName, _instanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
-				ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionManager.ServiceName));
-			Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionCoreService.SubComponentName));
-
-			// First restart
-			Subsystem.Handle(new ProjectionSubsystemMessage.RestartSubsystem(new NoopEnvelope()));
-
-			WaitForStopMessage();
-
-			// Restart subsystem before finished restart
-			Subsystem.Handle(new ProjectionSubsystemMessage.RestartSubsystem(
-				new CallbackEnvelope(message => _restartResponse = message)));
-		}
-
-		[Test]
-		public void should_report_restart_failure() {
-			Assert.IsInstanceOf<ProjectionSubsystemMessage.InvalidSubsystemRestart>(_restartResponse);
-		}
-	}
-
-	[TestFixture]
-	public class when_projection_subsystem_stopped_and_told_to_restart
-		: TestFixtureWithProjectionSubsystem {
-		private Message _restartResponse;
-
-		protected override void Given() {
-			Subsystem.Handle(new SystemMessage.SystemCoreReady());
-			// Don't start the subsystem
-			Subsystem.Handle(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
-
-			// Restart subsystem while stopped
-			Subsystem.Handle(new ProjectionSubsystemMessage.RestartSubsystem(
-				new CallbackEnvelope(message => _restartResponse = message)));
-		}
-
-		[Test]
-		public void should_report_restart_failure() {
-			Assert.IsInstanceOf<ProjectionSubsystemMessage.InvalidSubsystemRestart>(_restartResponse);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/Subsystem/when_projection_subsystem_starting.cs b/src/EventStore.Projections.Core.Tests/Subsystem/when_projection_subsystem_starting.cs
deleted file mode 100644
index bda53096a18..00000000000
--- a/src/EventStore.Projections.Core.Tests/Subsystem/when_projection_subsystem_starting.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-using System;
-using System.Threading;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests.Subsystem {
-	[TestFixture]
-	public class when_projection_subsystem_starting_and_all_components_started
-		: TestFixtureWithProjectionSubsystem {
-		private readonly ManualResetEventSlim _initializedReceived = new ManualResetEventSlim();
-
-		protected override void Given() {
-			Subsystem.LeaderOutputBus.Subscribe(
-				new AdHocHandler<ProjectionSubsystemMessage.ComponentStarted>(msg => {
-					_initializedReceived.Set();
-				}));
-
-			Subsystem.Handle(new SystemMessage.SystemCoreReady());
-			Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
-		}
-
-		[Test]
-		public void should_publish_all_components_started() {
-			if (!_initializedReceived.Wait(WaitTimeoutMs)) {
-				Assert.Fail("Timed out waiting for Subsystem Initialized");
-			}
-		}
-	}
-
-	[TestFixture]
-	public class when_projection_subsystem_starting_and_wrong_components_started
-		: TestFixtureWithProjectionSubsystem {
-		private readonly ManualResetEventSlim _initializedReceived = new ManualResetEventSlim();
-
-		protected override void Given() {
-			Subsystem.Handle(new SystemMessage.SystemCoreReady());
-			Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
-
-			WaitForStartMessage();
-
-			var wrongCorrelation = Guid.NewGuid();
-
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
-				ProjectionManager.ServiceName, wrongCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
-				ProjectionCoreCoordinator.ComponentName, wrongCorrelation));
-		}
-
-		[Test]
-		public void should_ignore_component_started_for_incorrect_correlation() {
-			Assert.False(Started.Wait(WaitTimeoutMs));
-		}
-	}
-
-	[TestFixture]
-	public class when_projection_subsystem_started_and_leader_changes
-		: TestFixtureWithProjectionSubsystem {
-		private Guid _instanceCorrelation;
-
-		protected override void Given() {
-			Subsystem.Handle(new SystemMessage.SystemCoreReady());
-			Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
-
-			var startMsg = WaitForStartMessage();
-			_instanceCorrelation = startMsg.InstanceCorrelationId;
-
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
-				ProjectionManager.ServiceName, _instanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
-				ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
-
-			Subsystem.Handle(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
-		}
-
-		[Test]
-		public void should_stop_the_subsystem_with_start_correlation() {
-			var stopMessage = WaitForStopMessage();
-			Assert.NotNull(stopMessage);
-			Assert.AreEqual(_instanceCorrelation, stopMessage.InstanceCorrelationId);
-		}
-	}
-
-	[TestFixture]
-	public class when_projection_subsystem_stopping_and_all_components_stopped
-		: TestFixtureWithProjectionSubsystem {
-		private Guid _instanceCorrelation;
-
-		protected override void Given() {
-			Subsystem.Handle(new SystemMessage.SystemCoreReady());
-			Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
-
-			var startMessage = WaitForStartMessage();
-			ResetMessageEvents();
-			_instanceCorrelation = startMessage.InstanceCorrelationId;
-
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
-				ProjectionManager.ServiceName, _instanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
-				ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
-
-			Subsystem.Handle(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
-
-			WaitForStopMessage();
-
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
-				ProjectionManager.ServiceName, _instanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
-				ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionManager.ServiceName));
-			Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionCoreService.SubComponentName));
-		}
-
-		[Test]
-		public void should_allow_starting_the_subsystem_again() {
-			Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
-			var startMessage = WaitForStartMessage();
-
-			Assert.AreNotEqual(_instanceCorrelation, startMessage.InstanceCorrelationId);
-		}
-	}
-
-	[TestFixture]
-	public class when_projection_subsystem_starting_and_node_becomes_unknown
-		: TestFixtureWithProjectionSubsystem {
-		private Guid _instanceCorrelation;
-
-		protected override void Given() {
-			Subsystem.Handle(new SystemMessage.SystemCoreReady());
-			Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
-
-			var startMessage = WaitForStartMessage();
-			_instanceCorrelation = startMessage.InstanceCorrelationId;
-
-			// Become unknown before components started
-			Subsystem.Handle(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
-
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
-				ProjectionManager.ServiceName, _instanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
-				ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
-		}
-
-		[Test]
-		public void should_stop_the_subsystem() {
-			var stopMessage = WaitForStopMessage();
-			Assert.AreEqual(_instanceCorrelation, stopMessage.InstanceCorrelationId);
-		}
-	}
-
-	[TestFixture]
-	public class when_projection_subsystem_stopping_and_node_becomes_leader
-		: TestFixtureWithProjectionSubsystem {
-		private Guid _instanceCorrelation;
-
-		protected override void Given() {
-			Subsystem.Handle(new SystemMessage.SystemCoreReady());
-			Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
-
-			var startMessage = WaitForStartMessage();
-			ResetMessageEvents();
-			_instanceCorrelation = startMessage.InstanceCorrelationId;
-
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
-				ProjectionManager.ServiceName, _instanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
-				ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
-
-			// Become unknown to stop the subsystem
-			Subsystem.Handle(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
-			WaitForStopMessage();
-
-			// Become leader again before subsystem fully stopped
-			Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
-
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
-				ProjectionManager.ServiceName, _instanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
-				ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
-			Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionManager.ServiceName));
-			Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionCoreService.SubComponentName));
-		}
-
-		[Test]
-		public void should_start_the_subsystem_again() {
-			var startMessages = WaitForStartMessage();
-			Assert.AreNotEqual(_instanceCorrelation, startMessages.InstanceCorrelationId);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/SystemProjections.cs b/src/EventStore.Projections.Core.Tests/SystemProjections.cs
deleted file mode 100644
index a2ae028ef77..00000000000
--- a/src/EventStore.Projections.Core.Tests/SystemProjections.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-
-namespace EventStore.Projections.Core.Tests {
-	internal static class SystemProjections {
-		public static Task Created(ISubscriber bus) {
-			var systemProjectionsReady =
-				typeof(ProjectionNamesBuilder.StandardProjections).GetFields(
-						System.Reflection.BindingFlags.Public |
-						System.Reflection.BindingFlags.Static |
-						System.Reflection.BindingFlags.FlattenHierarchy)
-					.Where(x => x.IsLiteral && !x.IsInitOnly)
-					.Select(x => x.GetRawConstantValue().ToString())
-					.ToDictionary(x => x, _ => new TaskCompletionSource<bool>());
-
-			bus.Subscribe(new AdHocHandler<CoreProjectionStatusMessage.Stopped>(m => {
-				if (!systemProjectionsReady.TryGetValue(m.Name, out var ready)) return;
-				ready.TrySetResult(true);
-			}));
-
-			return Task.WhenAll(systemProjectionsReady.Values.Select(x => x.Task));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.Tests/TestsInitFixture.cs b/src/EventStore.Projections.Core.Tests/TestsInitFixture.cs
deleted file mode 100644
index 71eb0143819..00000000000
--- a/src/EventStore.Projections.Core.Tests/TestsInitFixture.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using NUnit.Framework;
-
-namespace EventStore.Projections.Core.Tests {
-	[SetUpFixture]
-	public class TestsInitFixture {
-		private readonly EventStore.Core.Tests.TestsInitFixture _initFixture =
-			new EventStore.Core.Tests.TestsInitFixture();
-
-		[OneTimeSetUp]
-		public void SetUp() {
-			_initFixture.SetUp();
-		}
-
-		[OneTimeTearDown]
-		public void TearDown() {
-			_initFixture.TearDown();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core.XUnit.Tests/EventStore.Projections.Core.XUnit.Tests.csproj b/src/EventStore.Projections.Core.XUnit.Tests/EventStore.Projections.Core.XUnit.Tests.csproj
deleted file mode 100644
index dda0edd059c..00000000000
--- a/src/EventStore.Projections.Core.XUnit.Tests/EventStore.Projections.Core.XUnit.Tests.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\EventStore.Core.Tests\EventStore.Core.Tests.csproj" />
-      <ProjectReference Include="..\EventStore.Projections.Core\EventStore.Projections.Core.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <PackageReference Include="coverlet.collector" Version="6.0.2">
-        <PrivateAssets>all</PrivateAssets>
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageReference>
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-      <PackageReference Include="xunit" Version="2.8.0" />
-      <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
-        <PrivateAssets>all</PrivateAssets>
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageReference>
-    </ItemGroup>
-
-</Project>
diff --git a/src/EventStore.Projections.Core/Common/AllowedWritesInFlight.cs b/src/EventStore.Projections.Core/Common/AllowedWritesInFlight.cs
deleted file mode 100644
index 04d4ab9d902..00000000000
--- a/src/EventStore.Projections.Core/Common/AllowedWritesInFlight.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace EventStore.Projections.Core.Common {
-	public static class AllowedWritesInFlight {
-		public const int Unbounded = 0;
-	}
-}
diff --git a/src/EventStore.Projections.Core/Common/ProjectionConsts.cs b/src/EventStore.Projections.Core/Common/ProjectionConsts.cs
deleted file mode 100644
index 7166b938008..00000000000
--- a/src/EventStore.Projections.Core/Common/ProjectionConsts.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace EventStore.Projections.Core.Common {
-	public static class ProjectionConsts {
-		public const int CheckpointHandledThreshold = 4000;
-		public const int PendingEventsThreshold = 5000;
-		public const int MaxWriteBatchLength = 500;
-		public const int CheckpointUnhandledBytesThreshold = 10 * 1000 * 1000;
-		public const int MaxAllowedWritesInFlight = AllowedWritesInFlight.Unbounded;
-		public static TimeSpan CheckpointAfterMs = TimeSpan.FromSeconds(0);
-	}
-}
diff --git a/src/EventStore.Projections.Core/EventReaders/Feeds/FeedReader.cs b/src/EventStore.Projections.Core/EventReaders/Feeds/FeedReader.cs
deleted file mode 100644
index 52dd859b2d2..00000000000
--- a/src/EventStore.Projections.Core/EventReaders/Feeds/FeedReader.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Messages.EventReaders.Feeds;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
-
-namespace EventStore.Projections.Core.EventReaders.Feeds {
-	public class FeedReader : IHandle<EventReaderSubscriptionMessage.CommittedEventReceived>,
-		IHandle<EventReaderSubscriptionMessage.EofReached>,
-		IHandle<EventReaderSubscriptionMessage.PartitionEofReached>,
-		IHandle<EventReaderSubscriptionMessage.CheckpointSuggested>,
-		IHandle<EventReaderSubscriptionMessage.NotAuthorized> {
-		private readonly
-			ReaderSubscriptionDispatcher _subscriptionDispatcher;
-
-		private readonly ClaimsPrincipal _user;
-
-		private readonly QuerySourcesDefinition _querySource;
-		private readonly CheckpointTag _fromPosition;
-		private readonly int _maxEvents;
-		private readonly Guid _requestCorrelationId;
-
-		private readonly List<TaggedResolvedEvent> _batch = new List<TaggedResolvedEvent>();
-		private readonly IEnvelope _replyEnvelope;
-		private readonly ITimeProvider _timeProvider;
-
-		private Guid _subscriptionId;
-		private CheckpointTag _lastReaderPosition;
-
-		public static FeedReader Create(
-			ReaderSubscriptionDispatcher readerSubscriptionDispatcher, FeedReaderMessage.ReadPage message, ITimeProvider timeProvider) {
-			return new FeedReader(
-				readerSubscriptionDispatcher, message.User, message.QuerySource, message.FromPosition, message.MaxEvents,
-				message.CorrelationId, message.Envelope, timeProvider);
-		}
-
-		public FeedReader(
-			ReaderSubscriptionDispatcher subscriptionDispatcher, ClaimsPrincipal user,
-			QuerySourcesDefinition querySource, CheckpointTag fromPosition,
-			int maxEvents, Guid requestCorrelationId, IEnvelope replyEnvelope, ITimeProvider timeProvider) {
-			ArgumentNullException.ThrowIfNull(subscriptionDispatcher);
-			ArgumentNullException.ThrowIfNull(querySource);
-			ArgumentNullException.ThrowIfNull(fromPosition);
-			ArgumentNullException.ThrowIfNull(replyEnvelope);
-			if (maxEvents <= 0) throw new ArgumentException("non-negative expected", nameof(maxEvents));
-
-			_subscriptionDispatcher = subscriptionDispatcher;
-			_user = user;
-			_querySource = querySource;
-			_fromPosition = fromPosition;
-			_maxEvents = maxEvents;
-			_requestCorrelationId = requestCorrelationId;
-			_replyEnvelope = replyEnvelope;
-			_timeProvider = timeProvider;
-		}
-
-		public void Start() {
-			var readerStrategy = ReaderStrategy.Create(
-				_querySource.ToJson(), // tag
-				0,
-				_querySource,
-				_timeProvider,
-				stopOnEof: true,
-				runAs: _user);
-
-			//TODO: make reader mode explicit
-			var readerOptions = new ReaderSubscriptionOptions(
-				1024 * 1024,
-				checkpointAfterMs: 10000,
-				checkpointProcessedEventsThreshold: null,
-				stopOnEof: true,
-				stopAfterNEvents: _maxEvents,
-				// The projection must be stopped for debugging, so will enable content type validation automatically
-				enableContentTypeValidation: true);
-
-			_subscriptionId = Guid.NewGuid();
-			_subscriptionDispatcher.PublishSubscribe(
-				new ReaderSubscriptionManagement.Subscribe(
-					_subscriptionId, _fromPosition, readerStrategy, readerOptions), this, false);
-		}
-
-		public void Handle(EventReaderSubscriptionMessage.CommittedEventReceived message) {
-			_lastReaderPosition = message.CheckpointTag;
-			_batch.Add(new TaggedResolvedEvent(message.Data, message.CheckpointTag));
-		}
-
-		public void Handle(EventReaderSubscriptionMessage.EofReached message) {
-			_lastReaderPosition = message.CheckpointTag;
-			Reply();
-			Unsubscribe();
-		}
-
-		public void Handle(EventReaderSubscriptionMessage.PartitionEofReached message) {
-			_lastReaderPosition = message.CheckpointTag;
-		}
-
-		public void Handle(EventReaderSubscriptionMessage.CheckpointSuggested message) {
-			throw new NotSupportedException();
-		}
-
-		private void Unsubscribe() {
-			_subscriptionDispatcher.Cancel(_subscriptionId);
-		}
-
-		private void Reply() {
-			_replyEnvelope.ReplyWith(
-				new FeedReaderMessage.FeedPage(
-					_requestCorrelationId, FeedReaderMessage.FeedPage.ErrorStatus.Success, _batch.ToArray(),
-					_lastReaderPosition));
-		}
-
-		private void ReplyNotAuthorized() {
-			_replyEnvelope.ReplyWith(
-				new FeedReaderMessage.FeedPage(
-					_requestCorrelationId, FeedReaderMessage.FeedPage.ErrorStatus.NotAuthorized, null,
-					_lastReaderPosition));
-		}
-
-		public void Handle(EventReaderSubscriptionMessage.NotAuthorized message) {
-			ReplyNotAuthorized();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/EventReaders/Feeds/FeedReaderService.cs b/src/EventStore.Projections.Core/EventReaders/Feeds/FeedReaderService.cs
deleted file mode 100644
index d608543a8ff..00000000000
--- a/src/EventStore.Projections.Core/EventReaders/Feeds/FeedReaderService.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using EventStore.Core.Bus;
-using EventStore.Core.Services.TimerService;
-using EventStore.Projections.Core.Messages.EventReaders.Feeds;
-using EventStore.Projections.Core.Services;
-
-namespace EventStore.Projections.Core.EventReaders.Feeds {
-	public class FeedReaderService : IHandle<FeedReaderMessage.ReadPage> {
-		private readonly ReaderSubscriptionDispatcher _subscriptionDispatcher;
-
-		private readonly ITimeProvider _timeProvider;
-
-		public FeedReaderService(ReaderSubscriptionDispatcher subscriptionDispatcher, ITimeProvider timeProvider) {
-			_subscriptionDispatcher = subscriptionDispatcher;
-			_timeProvider = timeProvider;
-		}
-
-		public void Handle(FeedReaderMessage.ReadPage message) {
-			var reader = FeedReader.Create(_subscriptionDispatcher, message, _timeProvider);
-			reader.Start();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/EventStore.Projections.Core.csproj b/src/EventStore.Projections.Core/EventStore.Projections.Core.csproj
deleted file mode 100644
index 66a4ed96745..00000000000
--- a/src/EventStore.Projections.Core/EventStore.Projections.Core.csproj
+++ /dev/null
@@ -1,44 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-	</PropertyGroup>
-	<ItemGroup>
-		<None Remove="Prelude\1Prelude.js" />
-		<None Remove="Prelude\Modules.js" />
-		<None Remove="Prelude\ModulesExecuted.js" />
-		<None Remove="Prelude\Projections.js" />
-	</ItemGroup>
-	<ItemGroup>
-		<Content Include="Prelude\1Prelude.js">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Prelude\Modules.js">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Prelude\ModulesExecuted.js">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Prelude\Projections.js">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="Grpc.Tools" Version="2.65.0">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-		</PackageReference>
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="Jint" Version="3.0.0" />
-		<ProjectReference Include="..\EventStore.Common\EventStore.Common.csproj" />
-		<ProjectReference Include="..\EventStore.Core\EventStore.Core.csproj" />
-		<ProjectReference Include="..\EventStore.Transport.Http\EventStore.Transport.Http.csproj" />
-		<ProjectReference Include="..\EventStore.SourceGenerators\EventStore.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-	</ItemGroup>
-	<ItemGroup>
-		<Protobuf Include="../Protos/Grpc/projections.proto" GrpcServices="Server" LinkBase="Services/Grpc" Access="Internal">
-			<Link>Services\Grpc\Protos\projections.proto</Link>
-		</Protobuf>
-	</ItemGroup>
-</Project>
diff --git a/src/EventStore.Projections.Core/Messages/CoreProjectionManagementControlMessage.cs b/src/EventStore.Projections.Core/Messages/CoreProjectionManagementControlMessage.cs
deleted file mode 100644
index 3bd1b8e2b43..00000000000
--- a/src/EventStore.Projections.Core/Messages/CoreProjectionManagementControlMessage.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Projections.Core.Messages {
-	[DerivedMessage]
-	public abstract partial class CoreProjectionManagementControlMessage : CoreProjectionManagementMessageBase {
-		private readonly Guid _workerId;
-
-		public Guid WorkerId {
-			get { return _workerId; }
-		}
-
-		public CoreProjectionManagementControlMessage(Guid projectionId, Guid workerId)
-			: base(projectionId) {
-			_workerId = workerId;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Messages/CoreProjectionManagementMessage.cs b/src/EventStore.Projections.Core/Messages/CoreProjectionManagementMessage.cs
deleted file mode 100644
index 5024e2c7efe..00000000000
--- a/src/EventStore.Projections.Core/Messages/CoreProjectionManagementMessage.cs
+++ /dev/null
@@ -1,201 +0,0 @@
-using System;
-using EventStore.Core.Messaging;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-
-namespace EventStore.Projections.Core.Messages {
-	public static partial class CoreProjectionManagementMessage {
-		[DerivedMessage(ProjectionMessage.CoreManagement)]
-		public partial class Start : CoreProjectionManagementControlMessage {
-			public Start(Guid projectionId, Guid workerId)
-				: base(projectionId, workerId) {
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.CoreManagement)]
-		public partial class LoadStopped : CoreProjectionManagementControlMessage {
-			public LoadStopped(Guid correlationId, Guid workerId)
-				: base(correlationId, workerId) {
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.CoreManagement)]
-		public partial class Stop : CoreProjectionManagementControlMessage {
-			public Stop(Guid projectionId, Guid workerId)
-				: base(projectionId, workerId) {
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.CoreManagement)]
-		public partial class Kill : CoreProjectionManagementControlMessage {
-			public Kill(Guid projectionId, Guid workerId)
-				: base(projectionId, workerId) {
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.CoreManagement)]
-		public partial class GetState : CoreProjectionManagementControlMessage {
-			private readonly Guid _correlationId;
-			private readonly string _partition;
-
-			public GetState(Guid correlationId, Guid projectionId, string partition, Guid workerId)
-				: base(projectionId, workerId) {
-				if (partition == null) throw new ArgumentNullException("partition");
-				_correlationId = correlationId;
-				_partition = partition;
-			}
-
-			public string Partition {
-				get { return _partition; }
-			}
-
-			public Guid CorrelationId {
-				get { return _correlationId; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.CoreManagement)]
-		public partial class GetResult : CoreProjectionManagementControlMessage {
-			private readonly Guid _correlationId;
-			private readonly string _partition;
-
-			public GetResult(Guid correlationId, Guid projectionId, string partition, Guid workerId)
-				: base(projectionId, workerId) {
-				if (partition == null) throw new ArgumentNullException("partition");
-				_correlationId = correlationId;
-				_partition = partition;
-			}
-
-			public string Partition {
-				get { return _partition; }
-			}
-
-			public Guid CorrelationId {
-				get { return _correlationId; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.CoreManagement)]
-		public partial class CreateAndPrepare : CoreProjectionManagementControlMessage {
-			private readonly ProjectionConfig _config;
-			private readonly string _handlerType;
-			private readonly string _query;
-			private readonly string _name;
-			private readonly ProjectionVersion _version;
-			private readonly bool _enableContentTypeValidation;
-
-			public CreateAndPrepare(
-				Guid projectionId,
-				Guid workerId,
-				string name,
-				ProjectionVersion version,
-				ProjectionConfig config,
-				string handlerType,
-				string query,
-				bool enableContentTypeValidation)
-				: base(projectionId, workerId) {
-				_name = name;
-				_version = version;
-				_config = config;
-				_handlerType = handlerType;
-				_query = query;
-				_enableContentTypeValidation = enableContentTypeValidation;
-			}
-
-			public ProjectionConfig Config {
-				get { return _config; }
-			}
-
-			public string Name {
-				get { return _name; }
-			}
-
-			public ProjectionVersion Version {
-				get { return _version; }
-			}
-
-			public string HandlerType {
-				get { return _handlerType; }
-			}
-
-			public string Query {
-				get { return _query; }
-			}
-
-			public bool EnableContentTypeValidation {
-				get { return _enableContentTypeValidation; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.CoreManagement)]
-		public partial class CreatePrepared : CoreProjectionManagementControlMessage {
-			private readonly ProjectionConfig _config;
-			private readonly QuerySourcesDefinition _sourceDefinition;
-			private readonly string _handlerType;
-			private readonly string _query;
-			private readonly string _name;
-			private readonly ProjectionVersion _version;
-			private readonly bool _enableContentTypeValidation;
-
-			public CreatePrepared(
-				Guid projectionId,
-				Guid workerId,
-				string name,
-				ProjectionVersion version,
-				ProjectionConfig config,
-				QuerySourcesDefinition sourceDefinition,
-				string handlerType,
-				string query,
-				bool enableContentTypeValidation)
-				: base(projectionId, workerId) {
-				if (name == null) throw new ArgumentNullException("name");
-				if (config == null) throw new ArgumentNullException("config");
-				if (sourceDefinition == null) throw new ArgumentNullException("sourceDefinition");
-				if (handlerType == null) throw new ArgumentNullException("handlerType");
-				if (query == null) throw new ArgumentNullException("query");
-				_name = name;
-				_version = version;
-				_config = config;
-				_sourceDefinition = sourceDefinition;
-				_handlerType = handlerType;
-				_query = query;
-				_enableContentTypeValidation = enableContentTypeValidation;
-			}
-
-			public ProjectionConfig Config {
-				get { return _config; }
-			}
-
-			public string Name {
-				get { return _name; }
-			}
-
-			public QuerySourcesDefinition SourceDefinition {
-				get { return _sourceDefinition; }
-			}
-
-			public ProjectionVersion Version {
-				get { return _version; }
-			}
-
-			public string HandlerType {
-				get { return _handlerType; }
-			}
-
-			public string Query {
-				get { return _query; }
-			}
-
-			public bool EnableContentTypeValidation {
-				get { return _enableContentTypeValidation; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.CoreManagement)]
-		public partial class Dispose : CoreProjectionManagementControlMessage {
-			public Dispose(Guid projectionId, Guid workerId)
-				: base(projectionId, workerId) {
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Messages/CoreProjectionManagementMessageBase.cs b/src/EventStore.Projections.Core/Messages/CoreProjectionManagementMessageBase.cs
deleted file mode 100644
index 87a25afdad3..00000000000
--- a/src/EventStore.Projections.Core/Messages/CoreProjectionManagementMessageBase.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Projections.Core.Messages {
-	[DerivedMessage]
-	public abstract partial class CoreProjectionManagementMessageBase : Message {
-		private readonly Guid _projectionIdId;
-
-		protected CoreProjectionManagementMessageBase(Guid projectionId) {
-			_projectionIdId = projectionId;
-		}
-
-		public Guid ProjectionId {
-			get { return _projectionIdId; }
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Messages/CoreProjectionProcessingMessage.cs b/src/EventStore.Projections.Core/Messages/CoreProjectionProcessingMessage.cs
deleted file mode 100644
index bc4fdb14acb..00000000000
--- a/src/EventStore.Projections.Core/Messages/CoreProjectionProcessingMessage.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-using System;
-using EventStore.Core.Messaging;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Messages {
-	public static partial class CoreProjectionCheckpointWriterMessage {
-		[DerivedMessage(ProjectionMessage.CoreProcessing)]
-		public sealed partial class CheckpointWritten : Message {
-			private readonly CheckpointTag _position;
-
-			public CheckpointWritten(CheckpointTag position) {
-				_position = position;
-			}
-
-			public CheckpointTag Position {
-				get { return _position; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.CoreProcessing)]
-		public sealed partial class RestartRequested : Message {
-			public string Reason {
-				get { return _reason; }
-			}
-
-			private readonly string _reason;
-
-			public RestartRequested(string reason) {
-				_reason = reason;
-			}
-		}
-	}
-}
-
-public static partial class CoreProjectionProcessingMessage {
-	[DerivedMessage]
-	public abstract partial class Message : EventStore.Core.Messaging.Message {
-		private readonly Guid _projectionId;
-
-		protected Message(Guid projectionId) {
-			_projectionId = projectionId;
-		}
-
-		public Guid ProjectionId {
-			get { return _projectionId; }
-		}
-	}
-
-	[DerivedMessage(ProjectionMessage.CoreProcessing)]
-	public partial class CheckpointLoaded : Message {
-		private readonly CheckpointTag _checkpointTag;
-		private readonly string _checkpointData;
-		private readonly long _checkpointEventNumber;
-
-		public CheckpointLoaded(
-			Guid projectionId, CheckpointTag checkpointTag, string checkpointData, long checkpointEventNumber)
-			: base(projectionId) {
-			_checkpointTag = checkpointTag;
-			_checkpointData = checkpointData;
-			_checkpointEventNumber = checkpointEventNumber;
-		}
-
-		public CheckpointTag CheckpointTag {
-			get { return _checkpointTag; }
-		}
-
-		public string CheckpointData {
-			get { return _checkpointData; }
-		}
-
-		public long CheckpointEventNumber {
-			get { return _checkpointEventNumber; }
-		}
-	}
-
-	[DerivedMessage(ProjectionMessage.CoreProcessing)]
-	public partial class PrerecordedEventsLoaded : Message {
-		private readonly CheckpointTag _checkpointTag;
-
-		public PrerecordedEventsLoaded(Guid projectionId, CheckpointTag checkpointTag)
-			: base(projectionId) {
-			_checkpointTag = checkpointTag;
-		}
-
-		public CheckpointTag CheckpointTag {
-			get { return _checkpointTag; }
-		}
-	}
-
-	[DerivedMessage(ProjectionMessage.CoreProcessing)]
-	public partial class CheckpointCompleted : Message {
-		private readonly CheckpointTag _checkpointTag;
-
-		public CheckpointCompleted(Guid projectionId, CheckpointTag checkpointTag)
-			: base(projectionId) {
-			_checkpointTag = checkpointTag;
-		}
-
-		public CheckpointTag CheckpointTag {
-			get { return _checkpointTag; }
-		}
-	}
-
-	[DerivedMessage(ProjectionMessage.CoreProcessing)]
-	public partial class RestartRequested : Message {
-		private readonly string _reason;
-
-		public RestartRequested(Guid projectionId, string reason)
-			: base(projectionId) {
-			_reason = reason;
-		}
-
-		public string Reason {
-			get { return _reason; }
-		}
-	}
-
-	[DerivedMessage(ProjectionMessage.CoreProcessing)]
-	public partial class Failed : Message {
-		private readonly string _reason;
-
-		public Failed(Guid projectionId, string reason)
-			: base(projectionId) {
-			_reason = reason;
-		}
-
-		public string Reason {
-			get { return _reason; }
-		}
-	}
-
-	[DerivedMessage(ProjectionMessage.CoreProcessing)]
-	public partial class ReadyForCheckpoint : EventStore.Core.Messaging.Message {
-		private readonly object _sender;
-
-		public ReadyForCheckpoint(object sender) {
-			_sender = sender;
-		}
-
-		public object Sender {
-			get { return _sender; }
-		}
-	}
-
-	[DerivedMessage(ProjectionMessage.CoreProcessing)]
-	public partial class EmittedStreamAwaiting : EventStore.Core.Messaging.Message {
-		private readonly IEnvelope _envelope;
-		private readonly string _streamId;
-
-		public EmittedStreamAwaiting(string streamId, IEnvelope envelope) {
-			_envelope = envelope;
-			_streamId = streamId;
-		}
-
-		public string StreamId {
-			get { return _streamId; }
-		}
-
-		public IEnvelope Envelope {
-			get { return _envelope; }
-		}
-	}
-
-	[DerivedMessage(ProjectionMessage.CoreProcessing)]
-	public partial class EmittedStreamWriteCompleted : EventStore.Core.Messaging.Message {
-		private readonly string _streamId;
-
-		public EmittedStreamWriteCompleted(string streamId) {
-			_streamId = streamId;
-		}
-
-		public string StreamId {
-			get { return _streamId; }
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Messages/CoreProjectionStatusMessage.cs b/src/EventStore.Projections.Core/Messages/CoreProjectionStatusMessage.cs
deleted file mode 100644
index db55351b05f..00000000000
--- a/src/EventStore.Projections.Core/Messages/CoreProjectionStatusMessage.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-using System;
-using EventStore.Core.Messaging;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Messages {
-	public static partial class CoreProjectionStatusMessage {
-		[DerivedMessage(ProjectionMessage.CoreStatus)]
-		public partial class CoreProjectionStatusMessageBase : CoreProjectionManagementMessageBase {
-			protected CoreProjectionStatusMessageBase(Guid projectionId)
-				: base(projectionId) {
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.CoreStatus)]
-		public partial class Started : CoreProjectionStatusMessageBase {
-			public string Name { get; }
-			public Started(Guid projectionId, string name)
-				: base(projectionId) {
-				Name = name;
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.CoreStatus)]
-		public partial class Faulted : CoreProjectionStatusMessageBase {
-			private readonly string _faultedReason;
-
-			public Faulted(Guid projectionId, string faultedReason)
-				: base(projectionId) {
-				_faultedReason = faultedReason;
-			}
-
-			public string FaultedReason {
-				get { return _faultedReason; }
-			}
-		}
-
-		[DerivedMessage]
-		public abstract partial class DataReportBase : CoreProjectionStatusMessageBase {
-			private readonly Guid _correlationId;
-			private readonly string _partition;
-			private readonly CheckpointTag _position;
-
-			protected DataReportBase(Guid correlationId, Guid projectionId, string partition, CheckpointTag position)
-				: base(projectionId) {
-				_correlationId = correlationId;
-				_partition = partition;
-				_position = position;
-			}
-
-			public string Partition {
-				get { return _partition; }
-			}
-
-			public Guid CorrelationId {
-				get { return _correlationId; }
-			}
-
-			public CheckpointTag Position {
-				get { return _position; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.CoreStatus)]
-		public partial class StateReport : DataReportBase {
-			private readonly string _state;
-
-			public StateReport(
-				Guid correlationId,
-				Guid projectionId,
-				string partition,
-				string state,
-				CheckpointTag position)
-				: base(correlationId, projectionId, partition, position) {
-				_state = state;
-			}
-
-			public string State {
-				get { return _state; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.CoreStatus)]
-		public partial class ResultReport : DataReportBase {
-			private readonly string _result;
-
-			public ResultReport(
-				Guid correlationId,
-				Guid projectionId,
-				string partition,
-				string result,
-				CheckpointTag position)
-				: base(correlationId, projectionId, partition, position) {
-				_result = result;
-			}
-
-			public string Result {
-				get { return _result; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.CoreStatus)]
-		public partial class StatisticsReport : CoreProjectionStatusMessageBase {
-			private readonly ProjectionStatistics _statistics;
-			private readonly int _sequentialNumber;
-
-			public StatisticsReport(Guid projectionId, ProjectionStatistics statistics, int sequentialNumber)
-				: base(projectionId) {
-				_statistics = statistics;
-				_sequentialNumber = sequentialNumber;
-			}
-
-			public ProjectionStatistics Statistics {
-				get { return _statistics; }
-			}
-
-			public int SequentialNumber {
-				get { return _sequentialNumber; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.CoreStatus)]
-		public partial class Prepared : CoreProjectionStatusMessageBase {
-			private readonly ProjectionSourceDefinition _sourceDefinition;
-
-			public Prepared(Guid projectionId, ProjectionSourceDefinition sourceDefinition)
-				: base(projectionId) {
-				_sourceDefinition = sourceDefinition;
-			}
-
-			public ProjectionSourceDefinition SourceDefinition {
-				get { return _sourceDefinition; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.CoreStatus)]
-		public partial class Suspended : CoreProjectionStatusMessageBase {
-			public Suspended(Guid projectionId)
-				: base(projectionId) {
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.CoreStatus)]
-		public partial class Stopped : CoreProjectionStatusMessageBase {
-			private readonly bool _completed;
-			private readonly string _name;
-
-			public Stopped(Guid projectionId, string name, bool completed)
-				: base(projectionId) {
-				_completed = completed;
-				_name = name;
-			}
-
-			public bool Completed {
-				get { return _completed; }
-			}
-
-			public string Name {
-				get { return _name; }
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Messages/EventReaderSubscriptionMessageBase.cs b/src/EventStore.Projections.Core/Messages/EventReaderSubscriptionMessageBase.cs
deleted file mode 100644
index 39f48c4017c..00000000000
--- a/src/EventStore.Projections.Core/Messages/EventReaderSubscriptionMessageBase.cs
+++ /dev/null
@@ -1,236 +0,0 @@
-using System;
-using EventStore.Core.Messaging;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Messages {
-	public static partial class EventReaderSubscriptionMessage {
-		/// <summary>
-		/// A CheckpointSuggested message is sent to core projection
-		/// to allow bookmarking a position that can be used to
-		/// restore the projection processing (typically
-		/// an event at this position does not satisfy projection filter)
-		/// </summary>
-		[DerivedMessage(ProjectionMessage.EventReaderSubscription)]
-		public partial class CheckpointSuggested : EventReaderSubscriptionMessageBase {
-			public CheckpointSuggested(
-				Guid subscriptionId, CheckpointTag checkpointTag, float progress,
-				long subscriptionMessageSequenceNumber, object source = null)
-				: base(subscriptionId, checkpointTag, progress, subscriptionMessageSequenceNumber, source) {
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.EventReaderSubscription)]
-		public partial class ProgressChanged : EventReaderSubscriptionMessageBase {
-			public ProgressChanged(
-				Guid subscriptionId, CheckpointTag checkpointTag, float progress,
-				long subscriptionMessageSequenceNumber, object source = null)
-				: base(subscriptionId, checkpointTag, progress, subscriptionMessageSequenceNumber, source) {
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.EventReaderSubscription)]
-		public partial class SubscriptionStarted : EventReaderSubscriptionMessageBase {
-			private readonly long _startingLastCommitPosition;
-
-			public long StartingLastCommitPosition {
-				get { return _startingLastCommitPosition; }
-			}
-
-			public SubscriptionStarted(
-				Guid subscriptionId, CheckpointTag checkpointTag, long startingLastCommitPosition,
-				long subscriptionMessageSequenceNumber, object source = null)
-				: base(subscriptionId, checkpointTag, 0f, subscriptionMessageSequenceNumber, source) {
-				_startingLastCommitPosition = startingLastCommitPosition;
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.EventReaderSubscription)]
-		public sealed partial class NotAuthorized : EventReaderSubscriptionMessageBase {
-			public NotAuthorized(
-				Guid subscriptionId, CheckpointTag checkpointTag, float progress,
-				long subscriptionMessageSequenceNumber,
-				object source = null)
-				: base(subscriptionId, checkpointTag, progress, subscriptionMessageSequenceNumber, source) {
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.EventReaderSubscription)]
-		public sealed partial class SubscribeTimeout : EventReaderSubscriptionMessageBase {
-			public SubscribeTimeout(Guid subscriptionId)
-				: base(subscriptionId, CheckpointTag.Empty, 100.0f, -1, null) {
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.EventReaderSubscription)]
-		public sealed partial class Failed : EventReaderSubscriptionMessageBase {
-			private readonly string _reason;
-
-			public string Reason {
-				get { return _reason; }
-			}
-
-			public Failed(Guid subscriptionId, string reason)
-				: base(subscriptionId, CheckpointTag.Empty, 100.0f, -1, null) {
-				_reason = reason;
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.EventReaderSubscription)]
-		public partial class EofReached : EventReaderSubscriptionMessageBase {
-			public EofReached(
-				Guid subscriptionId, CheckpointTag checkpointTag,
-				long subscriptionMessageSequenceNumber, object source = null)
-				: base(subscriptionId, checkpointTag, 100.0f, subscriptionMessageSequenceNumber, source) {
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.EventReaderSubscription)]
-		public partial class PartitionEofReached : EventReaderSubscriptionMessageBase {
-			private readonly string _partition;
-
-			public string Partition {
-				get { return _partition; }
-			}
-
-			public PartitionEofReached(
-				Guid subscriptionId, CheckpointTag checkpointTag, string partition,
-				long subscriptionMessageSequenceNumber, object source = null)
-				: base(subscriptionId, checkpointTag, 100.0f, subscriptionMessageSequenceNumber, source) {
-				_partition = partition;
-			}
-		}
-
-		/// <summary>
-		/// NOTEL the PartitionDeleted may appear out-of-order and is not guaranteed
-		/// to appear at the same sequence position in a recovery
-		/// </summary>
-		[DerivedMessage(ProjectionMessage.EventReaderSubscription)]
-		public partial class PartitionDeleted : EventReaderSubscriptionMessageBase {
-			private readonly string _partition;
-
-			public string Partition {
-				get { return _partition; }
-			}
-
-			public PartitionDeleted(
-				Guid subscriptionId, CheckpointTag checkpointTag, string partition,
-				long subscriptionMessageSequenceNumber, object source = null)
-				: base(subscriptionId, checkpointTag, 100.0f, subscriptionMessageSequenceNumber, source) {
-				_partition = partition;
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.EventReaderSubscription)]
-		public partial class CommittedEventReceived : EventReaderSubscriptionMessageBase {
-			public static CommittedEventReceived Sample(
-				ResolvedEvent data, Guid subscriptionId, long subscriptionMessageSequenceNumber) {
-				return new CommittedEventReceived(
-					subscriptionId, 0, null, data, 77.7f, subscriptionMessageSequenceNumber);
-			}
-
-			public static CommittedEventReceived Sample(
-				ResolvedEvent data, CheckpointTag checkpointTag, Guid subscriptionId,
-				long subscriptionMessageSequenceNumber) {
-				return new CommittedEventReceived(
-					subscriptionId, checkpointTag, null, data, 77.7f, subscriptionMessageSequenceNumber, null);
-			}
-
-			private readonly ResolvedEvent _data;
-
-			private readonly string _eventCategory;
-
-			private CommittedEventReceived(
-				Guid subscriptionId, CheckpointTag checkpointTag, string eventCategory, ResolvedEvent data,
-				float progress, long subscriptionMessageSequenceNumber, object source)
-				: base(subscriptionId, checkpointTag, progress, subscriptionMessageSequenceNumber, source) {
-				if (data == null)
-					throw new ArgumentNullException("data");
-				_data = data;
-				_eventCategory = eventCategory;
-			}
-
-			private CommittedEventReceived(
-				Guid subscriptionId, int phase, string eventCategory, ResolvedEvent data, float progress,
-				long subscriptionMessageSequenceNumber)
-				: this(
-					subscriptionId,
-					CheckpointTag.FromPosition(phase, data.Position.CommitPosition, data.Position.PreparePosition),
-					eventCategory, data, progress, subscriptionMessageSequenceNumber, null) {
-			}
-
-			public ResolvedEvent Data {
-				get { return _data; }
-			}
-
-			public string EventCategory {
-				get { return _eventCategory; }
-			}
-
-			public static CommittedEventReceived FromCommittedEventDistributed(
-				ReaderSubscriptionMessage.CommittedEventDistributed message, CheckpointTag checkpointTag,
-				string eventCategory, Guid subscriptionId, long subscriptionMessageSequenceNumber) {
-				return new CommittedEventReceived(
-					subscriptionId, checkpointTag, eventCategory, message.Data, message.Progress,
-					subscriptionMessageSequenceNumber, message.Source);
-			}
-
-			public override string ToString() {
-				return CheckpointTag.ToString();
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.EventReaderSubscription)]
-		public partial class ReaderAssignedReader : EventReaderSubscriptionMessageBase {
-			private readonly Guid _readerId;
-
-			public ReaderAssignedReader(Guid subscriptionId, Guid readerId)
-				: base(subscriptionId, null, 0, 0, null) {
-				_readerId = readerId;
-			}
-
-			public Guid ReaderId {
-				get { return _readerId; }
-			}
-		}
-	}
-
-	[DerivedMessage]
-	public abstract partial class EventReaderSubscriptionMessageBase : Message {
-		private readonly Guid _subscriptionId;
-		private readonly long _subscriptionMessageSequenceNumber;
-		private readonly object _source;
-		private readonly CheckpointTag _checkpointTag;
-		private readonly float _progress;
-
-		internal EventReaderSubscriptionMessageBase(Guid subscriptionId, CheckpointTag checkpointTag, float progress,
-			long subscriptionMessageSequenceNumber, object source) {
-			_subscriptionId = subscriptionId;
-			_checkpointTag = checkpointTag;
-			_progress = progress;
-			_subscriptionMessageSequenceNumber = subscriptionMessageSequenceNumber;
-			_source = source;
-		}
-
-
-		public CheckpointTag CheckpointTag {
-			get { return _checkpointTag; }
-		}
-
-		public float Progress {
-			get { return _progress; }
-		}
-
-		public long SubscriptionMessageSequenceNumber {
-			get { return _subscriptionMessageSequenceNumber; }
-		}
-
-		public Guid SubscriptionId {
-			get { return _subscriptionId; }
-		}
-
-		public object Source {
-			get { return _source; }
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Messages/EventReaders/Feeds/FeedReaderMessage.cs b/src/EventStore.Projections.Core/Messages/EventReaders/Feeds/FeedReaderMessage.cs
deleted file mode 100644
index 1f914a6f342..00000000000
--- a/src/EventStore.Projections.Core/Messages/EventReaders/Feeds/FeedReaderMessage.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.Security.Claims;
-using EventStore.Core.Messaging;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Messages.EventReaders.Feeds {
-	public static partial class FeedReaderMessage {
-		[DerivedMessage]
-		public abstract partial class FeedReaderMessageBase : Message {
-		}
-
-		[DerivedMessage(ProjectionMessage.FeedReader)]
-		public sealed partial class ReadPage : FeedReaderMessageBase {
-			public readonly Guid CorrelationId;
-			public readonly IEnvelope Envelope;
-			public readonly ClaimsPrincipal User;
-
-			public readonly QuerySourcesDefinition QuerySource;
-			public readonly CheckpointTag FromPosition;
-			public readonly int MaxEvents;
-
-			public ReadPage(
-				Guid correlationId, IEnvelope envelope, ClaimsPrincipal user, QuerySourcesDefinition querySource,
-				CheckpointTag fromPosition,
-				int maxEvents) {
-				User = user;
-				CorrelationId = correlationId;
-				Envelope = envelope;
-				QuerySource = querySource;
-				FromPosition = fromPosition;
-				MaxEvents = maxEvents;
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.FeedReader)]
-		public sealed partial class FeedPage : FeedReaderMessageBase {
-			public enum ErrorStatus {
-				Success,
-				NotAuthorized
-			}
-
-			public readonly Guid CorrelationId;
-			public readonly ErrorStatus Error;
-			public readonly TaggedResolvedEvent[] Events;
-			public readonly CheckpointTag LastReaderPosition;
-
-			public FeedPage(
-				Guid correlationId, ErrorStatus error, TaggedResolvedEvent[] events, CheckpointTag lastReaderPosition) {
-				CorrelationId = correlationId;
-				Error = error;
-				Events = events;
-				LastReaderPosition = lastReaderPosition;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Messages/ICoreProjection.cs b/src/EventStore.Projections.Core/Messages/ICoreProjection.cs
deleted file mode 100644
index 0b976e17944..00000000000
--- a/src/EventStore.Projections.Core/Messages/ICoreProjection.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using EventStore.Core.Bus;
-
-namespace EventStore.Projections.Core.Messages {
-	public interface ICoreProjection :
-		IHandle<CoreProjectionProcessingMessage.CheckpointLoaded>,
-		IHandle<CoreProjectionProcessingMessage.PrerecordedEventsLoaded>,
-		IHandle<CoreProjectionProcessingMessage.CheckpointCompleted>,
-		IHandle<CoreProjectionProcessingMessage.RestartRequested>,
-		IHandle<CoreProjectionProcessingMessage.Failed> {
-	}
-}
diff --git a/src/EventStore.Projections.Core/Messages/IProjectionCheckpointManager.cs b/src/EventStore.Projections.Core/Messages/IProjectionCheckpointManager.cs
deleted file mode 100644
index 55bf7237885..00000000000
--- a/src/EventStore.Projections.Core/Messages/IProjectionCheckpointManager.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using EventStore.Core.Bus;
-
-namespace EventStore.Projections.Core.Messages {
-	public interface IProjectionCheckpointManager : IHandle<CoreProjectionProcessingMessage.ReadyForCheckpoint>,
-		IHandle<CoreProjectionProcessingMessage.RestartRequested>,
-		IHandle<CoreProjectionProcessingMessage.Failed> {
-	}
-
-	public interface IEmittedStreamContainer : IProjectionCheckpointManager,
-		IHandle<CoreProjectionProcessingMessage.EmittedStreamAwaiting>,
-		IHandle<CoreProjectionProcessingMessage.EmittedStreamWriteCompleted> {
-	}
-}
diff --git a/src/EventStore.Projections.Core/Messages/IQuerySources.cs b/src/EventStore.Projections.Core/Messages/IQuerySources.cs
deleted file mode 100644
index a57a68122a1..00000000000
--- a/src/EventStore.Projections.Core/Messages/IQuerySources.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-namespace EventStore.Projections.Core.Messages {
-	public interface IQuerySources {
-		bool AllStreams { get; }
-
-		string[] Categories { get; }
-
-		string[] Streams { get; }
-
-		bool AllEvents { get; }
-
-		string[] Events { get; }
-
-		bool ByStreams { get; }
-
-		bool ByCustomPartitions { get; }
-
-		bool DefinesStateTransform { get; }
-
-		bool DefinesFold { get; }
-
-		bool HandlesDeletedNotifications { get; }
-
-		bool ProducesResults { get; }
-
-		bool IsBiState { get; }
-
-		bool IncludeLinksOption { get; }
-
-		string ResultStreamNameOption { get; }
-
-		string PartitionResultStreamNamePatternOption { get; }
-
-		bool ReorderEventsOption { get; }
-
-		int? ProcessingLagOption { get; }
-
-		long? LimitingCommitPosition { get; }
-	}
-
-	public static class QuerySourcesExtensions {
-		public static bool HasStreams(this IQuerySources sources) {
-			var streams = sources.Streams;
-			return streams != null && streams.Length > 0;
-		}
-
-		public static bool HasCategories(this IQuerySources sources) {
-			var categories = sources.Categories;
-			return categories != null && categories.Length > 0;
-		}
-
-		public static bool HasEvents(this IQuerySources sources) {
-			var events = sources.Events;
-			return events != null && events.Length > 0;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Messages/ProjectionCoreServiceMessage.cs b/src/EventStore.Projections.Core/Messages/ProjectionCoreServiceMessage.cs
deleted file mode 100644
index 82e8289e23e..00000000000
--- a/src/EventStore.Projections.Core/Messages/ProjectionCoreServiceMessage.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Projections.Core.Messages {
-	public static partial class ProjectionCoreServiceMessage {
-		[DerivedMessage(ProjectionMessage.ServiceMessage)]
-		public partial class StartCore : Message {
-			public readonly Guid InstanceCorrelationId;
-
-			public StartCore(Guid instanceCorrelationId) {
-				InstanceCorrelationId = instanceCorrelationId;
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.ServiceMessage)]
-		public partial class StopCore : Message {
-			public Guid QueueId { get; }
-
-			public StopCore(Guid queueId) {
-				QueueId = queueId;
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.ServiceMessage)]
-		public partial class StopCoreTimeout : Message {
-			public Guid QueueId { get; }
-
-			public StopCoreTimeout(Guid queueId) {
-				QueueId = queueId;
-			}
-		}
-		
-		[DerivedMessage(ProjectionMessage.ServiceMessage)]
-		public partial class CoreTick : Message {
-			private readonly Action _action;
-
-			public CoreTick(Action action) {
-				_action = action;
-			}
-
-			public Action Action {
-				get { return _action; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.ServiceMessage)]
-		public partial class SubComponentStarted : Message {
-			public string SubComponent { get; }
-			public Guid InstanceCorrelationId { get; }
-		
-			public SubComponentStarted(string subComponent, Guid instanceCorrelationId) {
-				InstanceCorrelationId = instanceCorrelationId;
-				SubComponent = subComponent;
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.ServiceMessage)]
-		public partial class SubComponentStopped : Message {
-			public readonly string SubComponent;
-
-			public Guid QueueId { get; }
-
-			public SubComponentStopped(string subComponent, Guid queueId) {
-				SubComponent = subComponent;
-				QueueId = queueId;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Messages/ProjectionManagementMessage.cs b/src/EventStore.Projections.Core/Messages/ProjectionManagementMessage.cs
deleted file mode 100644
index bb683a1033f..00000000000
--- a/src/EventStore.Projections.Core/Messages/ProjectionManagementMessage.cs
+++ /dev/null
@@ -1,852 +0,0 @@
-using System;
-using System.Security.Claims;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Messages {
-	public static partial class ProjectionManagementMessage {
-		public static partial class Command {
-			[DerivedMessage]
-			public abstract partial class ControlMessage : Message {
-				private readonly IEnvelope _envelope;
-				public readonly RunAs RunAs;
-
-				protected ControlMessage(IEnvelope envelope, RunAs runAs) {
-					_envelope = envelope;
-					RunAs = runAs;
-				}
-
-				public IEnvelope Envelope {
-					get { return _envelope; }
-				}
-			}
-
-			[DerivedMessage(ProjectionMessage.Management)]
-			public partial class PostBatch : ControlMessage {
-				public ProjectionPost[] Projections { get; }
-
-				public PostBatch(
-					IEnvelope envelope, RunAs runAs, ProjectionPost[] projections)
-					: base(envelope, runAs) {
-						Projections = projections;
-				}
-
-				public class ProjectionPost
-				{
-					public ProjectionMode Mode { get; }
-					public RunAs RunAs {get;}
-					public string Name { get; }
-					public string HandlerType { get; }
-					public string Query { get; }
-					public bool Enabled { get;}
-					public bool CheckpointsEnabled{ get;}
-					public bool EmitEnabled { get; }
-					public bool EnableRunAs { get; }
-					public bool TrackEmittedStreams { get; }
-
-					public ProjectionPost(
-						ProjectionMode mode, RunAs runAs, string name, string handlerType, string query,
-						bool enabled, bool checkpointsEnabled, bool emitEnabled, bool enableRunAs,
-						bool trackEmittedStreams)
-					{
-						Mode = mode;
-						RunAs = runAs;
-						Name = name;
-						HandlerType = handlerType;
-						Query = query;
-						Enabled = enabled;
-						CheckpointsEnabled = checkpointsEnabled;
-						EmitEnabled = emitEnabled;
-						EnableRunAs = enableRunAs;
-						TrackEmittedStreams = trackEmittedStreams;
-					}
-				}
-			}
-
-			[DerivedMessage(ProjectionMessage.Management)]
-			public partial class Post : ControlMessage {
-				private readonly ProjectionMode _mode;
-				private readonly string _name;
-				private readonly string _handlerType;
-				private readonly string _query;
-				private readonly bool _enabled;
-				private readonly bool _checkpointsEnabled;
-				private readonly bool _emitEnabled;
-				private readonly bool _enableRunAs;
-				private readonly bool _trackEmittedStreams;
-
-				public Post(
-					IEnvelope envelope, ProjectionMode mode, string name, RunAs runAs, string handlerType, string query,
-					bool enabled, bool checkpointsEnabled, bool emitEnabled, bool trackEmittedStreams,
-					bool enableRunAs = false)
-					: base(envelope, runAs) {
-					_name = name;
-					_handlerType = handlerType;
-					_mode = mode;
-					_query = query;
-					_enabled = enabled;
-					_checkpointsEnabled = checkpointsEnabled;
-					_emitEnabled = emitEnabled;
-					_trackEmittedStreams = trackEmittedStreams;
-					_enableRunAs = enableRunAs;
-				}
-
-				public Post(
-					IEnvelope envelope, ProjectionMode mode, string name, RunAs runAs, Type handlerType, string query,
-					bool enabled, bool checkpointsEnabled, bool emitEnabled, bool trackEmittedStreams,
-					bool enableRunAs = false)
-					: base(envelope, runAs) {
-					_name = name;
-					_handlerType = "native:" + handlerType.Namespace + "." + handlerType.Name;
-					_mode = mode;
-					_query = query;
-					_enabled = enabled;
-					_checkpointsEnabled = checkpointsEnabled;
-					_emitEnabled = emitEnabled;
-					_trackEmittedStreams = trackEmittedStreams;
-					_enableRunAs = enableRunAs;
-				}
-
-				// shortcut for posting ad-hoc JS queries
-				public Post(IEnvelope envelope, RunAs runAs, string query, bool enabled)
-					: base(envelope, runAs) {
-					_name = Guid.NewGuid().ToString("D");
-					_handlerType = "JS";
-					_mode = ProjectionMode.Transient;
-					_query = query;
-					_enabled = enabled;
-					_checkpointsEnabled = false;
-					_emitEnabled = false;
-					_trackEmittedStreams = false;
-				}
-
-				public ProjectionMode Mode {
-					get { return _mode; }
-				}
-
-				public string Query {
-					get { return _query; }
-				}
-
-				public string Name {
-					get { return _name; }
-				}
-
-				public string HandlerType {
-					get { return _handlerType; }
-				}
-
-				public bool Enabled {
-					get { return _enabled; }
-				}
-
-				public bool EmitEnabled {
-					get { return _emitEnabled; }
-				}
-
-				public bool CheckpointsEnabled {
-					get { return _checkpointsEnabled; }
-				}
-
-				public bool EnableRunAs {
-					get { return _enableRunAs; }
-				}
-
-				public bool TrackEmittedStreams {
-					get { return _trackEmittedStreams; }
-				}
-			}
-
-			[DerivedMessage(ProjectionMessage.Management)]
-			public partial class Disable : ControlMessage {
-				private readonly string _name;
-
-				public Disable(IEnvelope envelope, string name, RunAs runAs)
-					: base(envelope, runAs) {
-					_name = name;
-				}
-
-				public string Name {
-					get { return _name; }
-				}
-			}
-
-			[DerivedMessage(ProjectionMessage.Management)]
-			public partial class Enable : ControlMessage {
-				private readonly string _name;
-
-				public Enable(IEnvelope envelope, string name, RunAs runAs)
-					: base(envelope, runAs) {
-					_name = name;
-				}
-
-				public string Name {
-					get { return _name; }
-				}
-			}
-
-			[DerivedMessage(ProjectionMessage.Management)]
-			public partial class Abort : ControlMessage {
-				private readonly string _name;
-
-				public Abort(IEnvelope envelope, string name, RunAs runAs)
-					: base(envelope, runAs) {
-					_name = name;
-				}
-
-				public string Name {
-					get { return _name; }
-				}
-			}
-
-			[DerivedMessage(ProjectionMessage.Management)]
-			public partial class SetRunAs : ControlMessage {
-				public enum SetRemove {
-					Set,
-					Remove
-				};
-
-				private readonly string _name;
-				private readonly SetRemove _action;
-
-				public SetRunAs(IEnvelope envelope, string name, RunAs runAs, SetRemove action)
-					: base(envelope, runAs) {
-					_name = name;
-					_action = action;
-				}
-
-				public string Name {
-					get { return _name; }
-				}
-
-				public SetRemove Action {
-					get { return _action; }
-				}
-			}
-
-			[DerivedMessage(ProjectionMessage.Management)]
-			public partial class UpdateQuery : ControlMessage {
-				private readonly string _name;
-				private readonly string _query;
-				private readonly bool? _emitEnabled;
-
-				public UpdateQuery(
-					IEnvelope envelope, string name, RunAs runAs, string query, bool? emitEnabled)
-					: base(envelope, runAs) {
-					_name = name;
-					_query = query;
-					_emitEnabled = emitEnabled;
-				}
-
-				public string Query {
-					get { return _query; }
-				}
-
-				public string Name {
-					get { return _name; }
-				}
-
-				public bool? EmitEnabled {
-					get { return _emitEnabled; }
-				}
-			}
-
-			[DerivedMessage(ProjectionMessage.Management)]
-			public partial class Reset : ControlMessage {
-				private readonly string _name;
-
-				public Reset(IEnvelope envelope, string name, RunAs runAs)
-					: base(envelope, runAs) {
-					_name = name;
-				}
-
-				public string Name {
-					get { return _name; }
-				}
-			}
-
-			[DerivedMessage(ProjectionMessage.Management)]
-			public partial class Delete : ControlMessage {
-				private readonly string _name;
-				private readonly bool _deleteCheckpointStream;
-				private readonly bool _deleteStateStream;
-				private readonly bool _deleteEmittedStreams;
-
-				public Delete(
-					IEnvelope envelope, string name, RunAs runAs, bool deleteCheckpointStream, bool deleteStateStream,
-					bool deleteEmittedStreams)
-					: base(envelope, runAs) {
-					_name = name;
-					_deleteCheckpointStream = deleteCheckpointStream;
-					_deleteStateStream = deleteStateStream;
-					_deleteEmittedStreams = deleteEmittedStreams;
-				}
-
-				public string Name {
-					get { return _name; }
-				}
-
-				public bool DeleteCheckpointStream {
-					get { return _deleteCheckpointStream; }
-				}
-
-				public bool DeleteStateStream {
-					get { return _deleteStateStream; }
-				}
-
-				public bool DeleteEmittedStreams {
-					get { return _deleteEmittedStreams; }
-				}
-			}
-
-			[DerivedMessage(ProjectionMessage.Management)]
-			public partial class GetQuery : ControlMessage {
-				private readonly string _name;
-
-				public GetQuery(IEnvelope envelope, string name, RunAs runAs) :
-					base(envelope, runAs) {
-					_name = name;
-				}
-
-				public string Name {
-					get { return _name; }
-				}
-			}
-
-			[DerivedMessage(ProjectionMessage.Management)]
-			public partial class GetConfig : ControlMessage {
-				private readonly string _name;
-
-				public GetConfig(IEnvelope envelope, string name, RunAs runAs) :
-					base(envelope, runAs) {
-					_name = name;
-				}
-
-				public string Name {
-					get { return _name; }
-				}
-			}
-
-			[DerivedMessage(ProjectionMessage.Management)]
-			public partial class UpdateConfig : ControlMessage {
-				private readonly string _name;
-				private readonly bool _emitEnabled;
-				private readonly bool _trackEmittedStreams;
-				private readonly int _checkpointAfterMs;
-				private readonly int _checkpointHandledThreshold;
-				private readonly int _checkpointUnhandledBytesThreshold;
-				private readonly int _pendingEventsThreshold;
-				private readonly int _maxWriteBatchLength;
-				private readonly int _maxAllowedWritesInFlight;
-				private readonly int? _projectionExecutionTimeout;
-
-				public UpdateConfig(IEnvelope envelope, string name, bool emitEnabled, bool trackEmittedStreams,
-					int checkpointAfterMs,
-					int checkpointHandledThreshold, int checkpointUnhandledBytesThreshold, int pendingEventsThreshold,
-					int maxWriteBatchLength, int maxAllowedWritesInFlight, RunAs runAs, int? projectionExecutionTimeout) :
-					base(envelope, runAs) {
-					_name = name;
-					_emitEnabled = emitEnabled;
-					_trackEmittedStreams = trackEmittedStreams;
-					_checkpointAfterMs = checkpointAfterMs;
-					_checkpointHandledThreshold = checkpointHandledThreshold;
-					_checkpointUnhandledBytesThreshold = checkpointUnhandledBytesThreshold;
-					_pendingEventsThreshold = pendingEventsThreshold;
-					_maxWriteBatchLength = maxWriteBatchLength;
-					_maxAllowedWritesInFlight = maxAllowedWritesInFlight;
-					_projectionExecutionTimeout = projectionExecutionTimeout;
-				}
-
-				public string Name {
-					get { return _name; }
-				}
-
-				public bool EmitEnabled {
-					get { return _emitEnabled; }
-				}
-
-				public bool TrackEmittedStreams {
-					get { return _trackEmittedStreams; }
-				}
-
-				public int CheckpointAfterMs {
-					get { return _checkpointAfterMs; }
-				}
-
-				public int CheckpointHandledThreshold {
-					get { return _checkpointHandledThreshold; }
-				}
-
-				public int CheckpointUnhandledBytesThreshold {
-					get { return _checkpointUnhandledBytesThreshold; }
-				}
-
-				public int PendingEventsThreshold {
-					get { return _pendingEventsThreshold; }
-				}
-
-				public int MaxWriteBatchLength {
-					get { return _maxWriteBatchLength; }
-				}
-
-				public int MaxAllowedWritesInFlight {
-					get { return _maxAllowedWritesInFlight; }
-				}
-
-				public int? ProjectionExecutionTimeout { get => _projectionExecutionTimeout; }
-			}
-
-			[DerivedMessage(ProjectionMessage.Management)]
-			public partial class GetStatistics : Message {
-				private readonly IEnvelope _envelope;
-				private readonly ProjectionMode? _mode;
-				private readonly string _name;
-				private readonly bool _includeDeleted;
-
-				public GetStatistics(IEnvelope envelope, ProjectionMode? mode, string name, bool includeDeleted) {
-					_envelope = envelope;
-					_mode = mode;
-					_name = name;
-					_includeDeleted = includeDeleted;
-				}
-
-				public ProjectionMode? Mode {
-					get { return _mode; }
-				}
-
-				public string Name {
-					get { return _name; }
-				}
-
-				public bool IncludeDeleted {
-					get { return _includeDeleted; }
-				}
-
-				public IEnvelope Envelope {
-					get { return _envelope; }
-				}
-			}
-
-			[DerivedMessage(ProjectionMessage.Management)]
-			public partial class GetState : Message {
-				private readonly IEnvelope _envelope;
-				private readonly string _name;
-				private readonly string _partition;
-
-				public GetState(IEnvelope envelope, string name, string partition) {
-					if (envelope == null) throw new ArgumentNullException("envelope");
-					if (name == null) throw new ArgumentNullException("name");
-					if (partition == null) throw new ArgumentNullException("partition");
-					_envelope = envelope;
-					_name = name;
-					_partition = partition;
-				}
-
-				public string Name {
-					get { return _name; }
-				}
-
-				public IEnvelope Envelope {
-					get { return _envelope; }
-				}
-
-				public string Partition {
-					get { return _partition; }
-				}
-			}
-
-			[DerivedMessage(ProjectionMessage.Management)]
-			public partial class GetResult : Message {
-				private readonly IEnvelope _envelope;
-				private readonly string _name;
-				private readonly string _partition;
-
-				public GetResult(IEnvelope envelope, string name, string partition) {
-					if (envelope == null) throw new ArgumentNullException("envelope");
-					if (name == null) throw new ArgumentNullException("name");
-					if (partition == null) throw new ArgumentNullException("partition");
-					_envelope = envelope;
-					_name = name;
-					_partition = partition;
-				}
-
-				public string Name {
-					get { return _name; }
-				}
-
-				public IEnvelope Envelope {
-					get { return _envelope; }
-				}
-
-				public string Partition {
-					get { return _partition; }
-				}
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.Management)]
-		public partial class OperationFailed : Message {
-			private readonly string _reason;
-
-			public OperationFailed(string reason) {
-				_reason = reason;
-			}
-
-			public string Reason {
-				get { return _reason; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.Management)]
-		public partial class NotFound : OperationFailed {
-			public NotFound()
-				: base("Not Found") {
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.Management)]
-		public partial class NotAuthorized : OperationFailed {
-			public NotAuthorized()
-				: base("Not authorized") {
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.Management)]
-		public partial class Conflict : OperationFailed {
-			public Conflict(string reason)
-				: base(reason) {
-			}
-		}
-
-		public sealed class RunAs {
-			private readonly ClaimsPrincipal _runAs;
-
-			public RunAs(ClaimsPrincipal runAs) {
-				_runAs = runAs;
-			}
-
-			private static readonly RunAs _anonymous = new RunAs(SystemAccounts.Anonymous);
-			private static readonly RunAs _system = new RunAs(SystemAccounts.System);
-
-			public static RunAs Anonymous {
-				get { return _anonymous; }
-			}
-
-			public static RunAs System {
-				get { return _system; }
-			}
-
-			public ClaimsPrincipal Principal {
-				get { return _runAs; }
-			}
-
-			public static bool ValidateRunAs(ProjectionMode mode, ReadWrite readWrite, ClaimsPrincipal existingRunAs,
-				Command.ControlMessage message, bool replace = false) {
-				if (mode > ProjectionMode.Transient && readWrite == ReadWrite.Write
-				                                    && (message.RunAs == null || message.RunAs.Principal == null
-				                                                              || !(
-																					   message.RunAs.Principal.LegacyRoleCheck(SystemRoles.Admins)
-																			  		|| message.RunAs.Principal.LegacyRoleCheck(SystemRoles.Operations)
-																				  ))) {
-					message.Envelope.ReplyWith(new NotAuthorized());
-					return false;
-				}
-
-				if (replace && message.RunAs.Principal == null) {
-					message.Envelope.ReplyWith(new NotAuthorized());
-					return false;
-				}
-
-				if (replace && message.RunAs.Principal != null)
-					return true; // enable this operation while no projection permissions are defined
-
-				return true;
-
-				//if (existingRunAs == null)
-				//    return true;
-				//if (message.RunAs1.Principal == null
-				//    || !string.Equals(
-				//        existingRunAs.Identity.Name, message.RunAs1.Principal.Identity.Name,
-				//        StringComparison.OrdinalIgnoreCase))
-				//{
-				//    message.Envelope.ReplyWith(new NotAuthorized());
-				//    return false;
-				//}
-				//return true;
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.Management)]
-		public partial class Updated : Message {
-			private readonly string _name;
-
-			public Updated(string name) {
-				_name = name;
-			}
-
-			public string Name {
-				get { return _name; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.Management)]
-		public partial class Statistics : Message {
-			private readonly ProjectionStatistics[] _projections;
-
-			public Statistics(ProjectionStatistics[] projections) {
-				_projections = projections;
-			}
-
-			public ProjectionStatistics[] Projections {
-				get { return _projections; }
-			}
-		}
-
-		[DerivedMessage]
-		public abstract partial class ProjectionDataBase : Message {
-			private readonly string _name;
-			private readonly string _partition;
-			private readonly CheckpointTag _position;
-			private readonly Exception _exception;
-
-			protected ProjectionDataBase(
-				string name, string partition, CheckpointTag position, Exception exception = null) {
-				_name = name;
-				_partition = partition;
-				_position = position;
-				_exception = exception;
-			}
-
-			public string Name {
-				get { return _name; }
-			}
-
-			public Exception Exception {
-				get { return _exception; }
-			}
-
-			public string Partition {
-				get { return _partition; }
-			}
-
-			public CheckpointTag Position {
-				get { return _position; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.Management)]
-		public partial class ProjectionState : ProjectionDataBase {
-			private readonly string _state;
-
-			public ProjectionState(
-				string name, string partition, string state, CheckpointTag position, Exception exception = null)
-				: base(name, partition, position, exception) {
-				_state = state;
-			}
-
-			public string State {
-				get { return _state; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.Management)]
-		public partial class ProjectionResult : ProjectionDataBase {
-			private readonly string _result;
-
-			public ProjectionResult(
-				string name, string partition, string result, CheckpointTag position, Exception exception = null)
-				: base(name, partition, position, exception) {
-				_result = result;
-			}
-
-			public string Result {
-				get { return _result; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.Management)]
-		public partial class ProjectionQuery : Message {
-			private readonly string _name;
-			private readonly string _query;
-			private readonly bool _emitEnabled;
-			private readonly ProjectionSourceDefinition _definition;
-			private readonly ProjectionOutputConfig _outputConfig;
-			private readonly string _projectionType;
-			private readonly bool? _trackEmittedStreams;
-			private readonly bool? _checkpointsEnabled;
-
-			public ProjectionQuery(
-				string name,
-				string query,
-				bool emitEnabled,
-				string projectionType,
-				bool? trackEmittedStreams,
-				bool? checkpointsEnabled,
-				ProjectionSourceDefinition definition,
-				ProjectionOutputConfig outputConfig) {
-				_name = name;
-				_query = query;
-				_emitEnabled = emitEnabled;
-				_projectionType = projectionType;
-				_trackEmittedStreams = trackEmittedStreams;
-				_checkpointsEnabled = checkpointsEnabled;
-				_definition = definition;
-				_outputConfig = outputConfig;
-			}
-
-			public string Name {
-				get { return _name; }
-			}
-
-			public string Query {
-				get { return _query; }
-			}
-
-			public bool EmitEnabled {
-				get { return _emitEnabled; }
-			}
-
-			public bool? TrackEmittedStreams {
-				get { return _trackEmittedStreams; }
-			}
-
-			public bool? CheckpointsEnabled {
-				get { return _checkpointsEnabled; }
-			}
-
-			public string Type {
-				get { return _projectionType; }
-			}
-
-			public ProjectionSourceDefinition Definition {
-				get { return _definition; }
-			}
-
-			public ProjectionOutputConfig OutputConfig {
-				get { return _outputConfig; }
-			}
-		}
-
-		public static partial class Internal {
-			[DerivedMessage(ProjectionMessage.Management)]
-			public partial class CleanupExpired : Message {
-			}
-
-			[DerivedMessage(ProjectionMessage.Management)]
-			public partial class ReadTimeout : Message {
-				private readonly Guid _correlationId;
-				private readonly string _streamId;
-				private readonly Dictionary<string, object> _parameters;
-
-				public Guid CorrelationId {
-					get { return _correlationId; }
-				}
-
-				public string StreamId {
-					get { return _streamId; }
-				}
-
-				public Dictionary<string, object> Parameters {
-					get { return _parameters; }
-				}
-
-				public ReadTimeout(Guid correlationId, string streamId, Dictionary<string, object> parameters) {
-					_correlationId = correlationId;
-					_streamId = streamId;
-					_parameters = parameters;
-				}
-
-				public ReadTimeout(Guid correlationId, string streamId) : this(correlationId, streamId,
-					new Dictionary<string, object>()) {
-				}
-			}
-
-			[DerivedMessage(ProjectionMessage.Management)]
-			public partial class Deleted : Message {
-				private readonly string _name;
-				private readonly Guid _id;
-
-				public Deleted(string name, Guid id) {
-					_name = name;
-					_id = id;
-				}
-
-				public string Name {
-					get { return _name; }
-				}
-
-				public Guid Id {
-					get { return _id; }
-				}
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.Management)]
-		public partial class ProjectionConfig : Message {
-			private readonly bool _emitEnabled;
-			private readonly bool _trackEmittedStreams;
-			private readonly int _checkpointAfterMs;
-			private readonly int _checkpointHandledThreshold;
-			private readonly int _checkpointUnhandledBytesThreshold;
-			private readonly int _pendingEventsThreshold;
-			private readonly int _maxWriteBatchLength;
-			private readonly int _maxAllowedWritesInFlight;
-			private readonly int? _projectionExecutionTimeout;
-
-			public ProjectionConfig(bool emitEnabled, bool trackEmittedStreams, int checkpointAfterMs,
-				int checkpointHandledThreshold,
-				int checkpointUnhandledBytesThreshold, int pendingEventsThreshold, int maxWriteBatchLength,
-				int maxAllowedWritesInFlight, int? projectionExecutionTimeout) {
-				_emitEnabled = emitEnabled;
-				_trackEmittedStreams = trackEmittedStreams;
-				_checkpointAfterMs = checkpointAfterMs;
-				_checkpointHandledThreshold = checkpointHandledThreshold;
-				_checkpointUnhandledBytesThreshold = checkpointUnhandledBytesThreshold;
-				_pendingEventsThreshold = pendingEventsThreshold;
-				_maxWriteBatchLength = maxWriteBatchLength;
-				_maxAllowedWritesInFlight = maxAllowedWritesInFlight;
-				_projectionExecutionTimeout = projectionExecutionTimeout;
-			}
-
-			public bool EmitEnabled {
-				get { return _emitEnabled; }
-			}
-
-			public bool TrackEmittedStreams {
-				get { return _trackEmittedStreams; }
-			}
-
-			public int CheckpointAfterMs {
-				get { return _checkpointAfterMs; }
-			}
-
-			public int CheckpointHandledThreshold {
-				get { return _checkpointHandledThreshold; }
-			}
-
-			public int CheckpointUnhandledBytesThreshold {
-				get { return _checkpointUnhandledBytesThreshold; }
-			}
-
-			public int PendingEventsThreshold {
-				get { return _pendingEventsThreshold; }
-			}
-
-			public int MaxWriteBatchLength {
-				get { return _maxWriteBatchLength; }
-			}
-
-			public int MaxAllowedWritesInFlight {
-				get { return _maxAllowedWritesInFlight; }
-			}
-
-			public int? ProjectionExecutionTimeout { get => _projectionExecutionTimeout; }
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Messages/ProjectionMessage.cs b/src/EventStore.Projections.Core/Messages/ProjectionMessage.cs
deleted file mode 100644
index 9bbc895da92..00000000000
--- a/src/EventStore.Projections.Core/Messages/ProjectionMessage.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace EventStore.Projections.Core.Messages {
-	// The name of this enum and its members are used for metrics
-	public enum ProjectionMessage {
-		None,
-		CoreManagement,
-		CoreProcessing,
-		CoreStatus,
-		EventReaderSubscription,
-		FeedReader,
-		Management,
-		Misc,
-		ReaderCoreService,
-		ReaderSubscription,
-		ReaderSubscriptionManagement,
-		ServiceMessage,
-		Subsystem,
-	}
-}
diff --git a/src/EventStore.Projections.Core/Messages/ProjectionSubsystemMessage.cs b/src/EventStore.Projections.Core/Messages/ProjectionSubsystemMessage.cs
deleted file mode 100644
index 136bebb78ed..00000000000
--- a/src/EventStore.Projections.Core/Messages/ProjectionSubsystemMessage.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Projections.Core.Messages {
-	public static partial class ProjectionSubsystemMessage {
-		[DerivedMessage(ProjectionMessage.Subsystem)]
-		public partial class RestartSubsystem : Message  {
-			public IEnvelope ReplyEnvelope { get; }
-			
-			public RestartSubsystem(IEnvelope replyEnvelope) {
-				ReplyEnvelope = replyEnvelope;
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.Subsystem)]
-		public partial class InvalidSubsystemRestart : Message {
-			public string SubsystemState { get; }
-			public string Reason { get; }
-
-			public InvalidSubsystemRestart(string subsystemState, string reason) {
-				SubsystemState = subsystemState;
-				Reason = reason;
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.Subsystem)]
-		public partial class SubsystemRestarting : Message {
-		}
-
-		[DerivedMessage(ProjectionMessage.Subsystem)]
-		public partial class StartComponents : Message  {
-			public Guid InstanceCorrelationId { get; }
-
-			public StartComponents(Guid instanceCorrelationId) {
-				InstanceCorrelationId = instanceCorrelationId;
-			}
-		}	
-			
-		[DerivedMessage(ProjectionMessage.Subsystem)]
-		public partial class ComponentStarted : Message  {
-			public string ComponentName { get; }
-			public Guid InstanceCorrelationId { get; }
-
-			public ComponentStarted(string componentName, Guid instanceCorrelationId) {
-				ComponentName = componentName;
-				InstanceCorrelationId = instanceCorrelationId;
-			}
-		}	
-	
-		[DerivedMessage(ProjectionMessage.Subsystem)]
-		public partial class StopComponents : Message  {
-			public Guid InstanceCorrelationId { get; }
-
-			public StopComponents(Guid instanceCorrelationId) {
-				InstanceCorrelationId = instanceCorrelationId;
-			}
-		}
-		
-		[DerivedMessage(ProjectionMessage.Subsystem)]
-		public partial class ComponentStopped : Message {
-			public string ComponentName { get; }
-			public Guid InstanceCorrelationId { get; }
-
-			public ComponentStopped(string componentName, Guid instanceCorrelationId) {
-				ComponentName = componentName;
-				InstanceCorrelationId = instanceCorrelationId;
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.Subsystem)]
-		public partial class IODispatcherDrained : Message {
-			public string ComponentName { get; }
-
-			public IODispatcherDrained(string componentName) {
-				ComponentName = componentName;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Messages/QuerySourcesDefinition.cs b/src/EventStore.Projections.Core/Messages/QuerySourcesDefinition.cs
deleted file mode 100644
index 7244daf8c13..00000000000
--- a/src/EventStore.Projections.Core/Messages/QuerySourcesDefinition.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using System.Linq;
-using System.Runtime.Serialization;
-
-namespace EventStore.Projections.Core.Messages {
-	[DataContract]
-	public class QuerySourcesDefinition : IQuerySources {
-		[DataMember(Name = "allStreams")] public bool AllStreams { get; set; }
-
-		[DataMember(Name = "categories")] public string[] Categories { get; set; }
-
-		[DataMember(Name = "streams")] public string[] Streams { get; set; }
-
-		[DataMember(Name = "allEvents")] public bool AllEvents { get; set; }
-
-		[DataMember(Name = "events")] public string[] Events { get; set; }
-
-		[DataMember(Name = "byStreams")] public bool ByStreams { get; set; }
-
-		[DataMember(Name = "byCustomPartitions")]
-		public bool ByCustomPartitions { get; set; }
-
-		[DataMember(Name = "limitingCommitPosition")]
-		public long? LimitingCommitPosition { get; set; }
-
-		bool IQuerySources.DefinesStateTransform {
-			get { return Options != null && Options.DefinesStateTransform; }
-		}
-
-		bool IQuerySources.ProducesResults {
-			get { return Options != null && Options.ProducesResults; }
-		}
-
-		bool IQuerySources.DefinesFold {
-			get { return Options != null && Options.DefinesFold; }
-		}
-
-		bool IQuerySources.HandlesDeletedNotifications {
-			get { return Options != null && Options.HandlesDeletedNotifications; }
-		}
-
-		bool IQuerySources.IncludeLinksOption {
-			get { return Options != null && Options.IncludeLinks; }
-		}
-
-		string IQuerySources.ResultStreamNameOption {
-			get { return Options != null ? Options.ResultStreamName : null; }
-		}
-
-		string IQuerySources.PartitionResultStreamNamePatternOption {
-			get { return Options != null ? Options.PartitionResultStreamNamePattern : null; }
-		}
-
-		bool IQuerySources.ReorderEventsOption {
-			get { return Options != null && Options.ReorderEvents; }
-		}
-
-		int? IQuerySources.ProcessingLagOption {
-			get { return Options != null ? Options.ProcessingLag : null; }
-		}
-
-		bool IQuerySources.IsBiState {
-			get { return Options != null ? Options.IsBiState : false; }
-		}
-
-		[DataMember(Name = "options")] public QuerySourcesDefinitionOptions Options { get; set; }
-
-		public static QuerySourcesDefinition From(IQuerySources sources) {
-			return new QuerySourcesDefinition {
-				AllEvents = sources.AllEvents,
-				AllStreams = sources.AllStreams,
-				ByStreams = sources.ByStreams,
-				ByCustomPartitions = sources.ByCustomPartitions,
-				Categories = (sources.Categories ?? new string[0]).ToArray(),
-				Events = (sources.Events ?? new string[0]).ToArray(),
-				Streams = (sources.Streams ?? new string[0]).ToArray(),
-				LimitingCommitPosition = sources.LimitingCommitPosition,
-				Options =
-					new QuerySourcesDefinitionOptions {
-						DefinesStateTransform = sources.DefinesStateTransform,
-						ProducesResults = sources.ProducesResults,
-						DefinesFold = sources.DefinesFold,
-						HandlesDeletedNotifications = sources.HandlesDeletedNotifications,
-						IncludeLinks = sources.IncludeLinksOption,
-						PartitionResultStreamNamePattern = sources.PartitionResultStreamNamePatternOption,
-						ProcessingLag = sources.ProcessingLagOption.GetValueOrDefault(),
-						IsBiState = sources.IsBiState,
-						ReorderEvents = sources.ReorderEventsOption,
-						ResultStreamName = sources.ResultStreamNameOption,
-					}
-			};
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Messages/QuerySourcesDefinitionOptions.cs b/src/EventStore.Projections.Core/Messages/QuerySourcesDefinitionOptions.cs
deleted file mode 100644
index 421d3fe6de0..00000000000
--- a/src/EventStore.Projections.Core/Messages/QuerySourcesDefinitionOptions.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Runtime.Serialization;
-
-namespace EventStore.Projections.Core.Messages {
-	[DataContract]
-	public class QuerySourcesDefinitionOptions {
-		[DataMember(Name = "producesResults")] public bool ProducesResults { get; set; }
-
-		[DataMember(Name = "definesFold")] public bool DefinesFold { get; set; }
-
-		[DataMember(Name = "handlesDeletedNotifications")]
-		public bool HandlesDeletedNotifications { get; set; }
-
-		[DataMember(Name = "definesStateTransform")]
-		public bool DefinesStateTransform { get; set; }
-
-		[DataMember(Name = "resultStreamName")]
-		public string ResultStreamName { get; set; }
-
-		[DataMember(Name = "partitionResultStreamNamePattern")]
-		public string PartitionResultStreamNamePattern { get; set; }
-
-		[DataMember(Name = "$includeLinks")] public bool IncludeLinks { get; set; }
-
-		[DataMember(Name = "reorderEvents")] public bool ReorderEvents { get; set; }
-
-		[DataMember(Name = "processingLag")] public int? ProcessingLag { get; set; }
-
-		[DataMember(Name = "biState")] public bool IsBiState { get; set; }
-	}
-}
diff --git a/src/EventStore.Projections.Core/Messages/ReaderCoreServiceMessage.cs b/src/EventStore.Projections.Core/Messages/ReaderCoreServiceMessage.cs
deleted file mode 100644
index 0b486112ade..00000000000
--- a/src/EventStore.Projections.Core/Messages/ReaderCoreServiceMessage.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Projections.Core.Messages {
-	public static partial class ReaderCoreServiceMessage {
-		[DerivedMessage(ProjectionMessage.ReaderCoreService)]
-		public partial class StartReader : Message {
-			public Guid InstanceCorrelationId { get; }
-
-			public StartReader(Guid instanceCorrelationId) {
-				InstanceCorrelationId = instanceCorrelationId;
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.ReaderCoreService)]
-		public partial class StopReader : Message {
-			public Guid QueueId { get; }
-			
-			public StopReader(Guid queueId) {
-				QueueId = queueId;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Messages/ReaderSubscriptionManagement.cs b/src/EventStore.Projections.Core/Messages/ReaderSubscriptionManagement.cs
deleted file mode 100644
index d8d2134f066..00000000000
--- a/src/EventStore.Projections.Core/Messages/ReaderSubscriptionManagement.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using EventStore.Core.Messaging;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
-
-namespace EventStore.Projections.Core.Messages {
-	public static partial class ReaderSubscriptionManagement {
-		[DerivedMessage]
-		public abstract partial class ReaderSubscriptionManagementMessage : Message {
-			private readonly Guid _subscriptionId;
-
-			protected ReaderSubscriptionManagementMessage(Guid subscriptionId) {
-				_subscriptionId = subscriptionId;
-			}
-
-			public Guid SubscriptionId {
-				get { return _subscriptionId; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.ReaderSubscriptionManagement)]
-		public partial class Subscribe : ReaderSubscriptionManagementMessage {
-			private readonly CheckpointTag _fromPosition;
-			private readonly IReaderStrategy _readerStrategy;
-			private readonly ReaderSubscriptionOptions _options;
-
-			public Subscribe(
-				Guid subscriptionId, CheckpointTag from,
-				IReaderStrategy readerStrategy, ReaderSubscriptionOptions readerSubscriptionOptions) : base(
-				subscriptionId) {
-				if (@from == null) throw new ArgumentNullException("from");
-				if (readerStrategy == null) throw new ArgumentNullException("readerStrategy");
-				_fromPosition = @from;
-				_readerStrategy = readerStrategy;
-				_options = readerSubscriptionOptions;
-			}
-
-			public CheckpointTag FromPosition {
-				get { return _fromPosition; }
-			}
-
-			public IReaderStrategy ReaderStrategy {
-				get { return _readerStrategy; }
-			}
-
-			public ReaderSubscriptionOptions Options {
-				get { return _options; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.ReaderSubscriptionManagement)]
-		public partial class Pause : ReaderSubscriptionManagementMessage {
-			public Pause(Guid subscriptionId)
-				: base(subscriptionId) {
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.ReaderSubscriptionManagement)]
-		public partial class Resume : ReaderSubscriptionManagementMessage {
-			public Resume(Guid subscriptionId)
-				: base(subscriptionId) {
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.ReaderSubscriptionManagement)]
-		public partial class Unsubscribe : ReaderSubscriptionManagementMessage {
-			public Unsubscribe(Guid subscriptionId)
-				: base(subscriptionId) {
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Messages/ReaderSubscriptionMessage.cs b/src/EventStore.Projections.Core/Messages/ReaderSubscriptionMessage.cs
deleted file mode 100644
index d447399c07e..00000000000
--- a/src/EventStore.Projections.Core/Messages/ReaderSubscriptionMessage.cs
+++ /dev/null
@@ -1,231 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Messaging;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Messages {
-	public static partial class ReaderSubscriptionMessage {
-		[DerivedMessage(ProjectionMessage.ReaderSubscription)]
-		public partial class SubscriptionMessage : Message {
-			private readonly Guid _correlationId;
-			private readonly CheckpointTag _preTagged;
-			private readonly object _source;
-
-			public SubscriptionMessage(Guid correlationId, CheckpointTag preTagged, object source) {
-				_correlationId = correlationId;
-				_preTagged = preTagged;
-				_source = source;
-			}
-
-			public Guid CorrelationId {
-				get { return _correlationId; }
-			}
-
-			public CheckpointTag PreTagged {
-				get { return _preTagged; }
-			}
-
-			public object Source {
-				get { return _source; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.ReaderSubscription)]
-		public partial class EventReaderIdle : SubscriptionMessage {
-			private readonly DateTime _idleTimestampUtc;
-
-			public EventReaderIdle(Guid correlationId, DateTime idleTimestampUtc, object source = null)
-				: base(correlationId, null, source) {
-				_idleTimestampUtc = idleTimestampUtc;
-			}
-
-			public DateTime IdleTimestampUtc {
-				get { return _idleTimestampUtc; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.ReaderSubscription)]
-		public sealed partial class EventReaderStarting : SubscriptionMessage {
-			private readonly long _lastCommitPosition;
-
-			public EventReaderStarting(Guid correlationId, long lastCommitPosition, object source = null)
-				: base(correlationId, null, source) {
-				_lastCommitPosition = lastCommitPosition;
-			}
-
-			public long LastCommitPosition {
-				get { return _lastCommitPosition; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.ReaderSubscription)]
-		public partial class EventReaderEof : SubscriptionMessage {
-			private readonly bool _maxEventsReached;
-
-			public EventReaderEof(Guid correlationId, bool maxEventsReached = false, object source = null)
-				: base(correlationId, null, source) {
-				_maxEventsReached = maxEventsReached;
-			}
-
-			public bool MaxEventsReached {
-				get { return _maxEventsReached; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.ReaderSubscription)]
-		public partial class EventReaderPartitionEof : SubscriptionMessage {
-			private readonly string _partition;
-
-			public EventReaderPartitionEof(
-				Guid correlationId, string partition, CheckpointTag preTagged, object source = null)
-				: base(correlationId, preTagged, source) {
-				_partition = partition;
-			}
-
-			public string Partition {
-				get { return _partition; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.ReaderSubscription)]
-		public partial class EventReaderPartitionDeleted : SubscriptionMessage {
-			private readonly string _partition;
-			private readonly long? _lastEventNumber;
-			private readonly TFPos? _deleteLinkOrEventPosition;
-			private readonly TFPos? _deleteEventOrLinkTargetPosition;
-			private readonly string _positionStreamId;
-			private readonly long? _positionEventNumber;
-
-			public EventReaderPartitionDeleted(
-				Guid correlationId, string partition, long? lastEventNumber, TFPos? deleteLinkOrEventPosition,
-				TFPos? deleteEventOrLinkTargetPosition, string positionStreamId, long? positionEventNumber,
-				CheckpointTag preTagged = null, object source = null)
-				: base(correlationId, preTagged, source) {
-				_partition = partition;
-				_lastEventNumber = lastEventNumber;
-				_deleteLinkOrEventPosition = deleteLinkOrEventPosition;
-				_deleteEventOrLinkTargetPosition = deleteEventOrLinkTargetPosition;
-				_positionStreamId = positionStreamId;
-				_positionEventNumber = positionEventNumber;
-			}
-
-			public string Partition {
-				get { return _partition; }
-			}
-
-			public long? LastEventNumber {
-				get { return _lastEventNumber; }
-			}
-
-			public TFPos? DeleteEventOrLinkTargetPosition {
-				get { return _deleteEventOrLinkTargetPosition; }
-			}
-
-			public string PositionStreamId {
-				get { return _positionStreamId; }
-			}
-
-			public long? PositionEventNumber {
-				get { return _positionEventNumber; }
-			}
-
-			public TFPos? DeleteLinkOrEventPosition {
-				get { return _deleteLinkOrEventPosition; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.ReaderSubscription)]
-		public sealed partial class EventReaderNotAuthorized : SubscriptionMessage {
-			public EventReaderNotAuthorized(Guid correlationId, object source = null)
-				: base(correlationId, null, source) {
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.ReaderSubscription)]
-		public partial class CommittedEventDistributed : SubscriptionMessage {
-			public static CommittedEventDistributed Sample(
-				Guid correlationId, TFPos position, TFPos originalPosition, string positionStreamId,
-				long positionSequenceNumber,
-				string eventStreamId, long eventSequenceNumber, bool resolvedLinkTo, Guid eventId, string eventType,
-				bool isJson, byte[] data, byte[] metadata, long? safeTransactionFileReaderJoinPosition,
-				float progress) {
-				return new CommittedEventDistributed(
-					correlationId,
-					new ResolvedEvent(
-						positionStreamId, positionSequenceNumber, eventStreamId, eventSequenceNumber, resolvedLinkTo,
-						position, originalPosition, eventId, eventType, isJson, data, metadata, null, null,
-						default(DateTime)),
-					safeTransactionFileReaderJoinPosition, progress);
-			}
-
-			public static CommittedEventDistributed Sample(
-				Guid correlationId, TFPos position, string eventStreamId, long eventSequenceNumber,
-				bool resolvedLinkTo, Guid eventId, string eventType, bool isJson, byte[] data, byte[] metadata,
-				DateTime? timestamp = null) {
-				return new CommittedEventDistributed(
-					correlationId,
-					new ResolvedEvent(
-						eventStreamId, eventSequenceNumber, eventStreamId, eventSequenceNumber, resolvedLinkTo,
-						position,
-						position, eventId, eventType, isJson, data, metadata, null, null,
-						timestamp.GetValueOrDefault()),
-					position.PreparePosition, 11.1f);
-			}
-
-			private readonly ResolvedEvent _data;
-			private readonly long? _safeTransactionFileReaderJoinPosition;
-			private readonly float _progress;
-
-			//NOTE: committed event with null event _data means - end of the source reached.
-			// Current last available TF commit position is in _position.CommitPosition
-			// TODO: separate message?
-
-			public CommittedEventDistributed(
-				Guid correlationId, ResolvedEvent data, long? safeTransactionFileReaderJoinPosition, float progress,
-				object source = null, CheckpointTag preTagged = null)
-				: base(correlationId, preTagged, source) {
-				_data = data;
-				_safeTransactionFileReaderJoinPosition = safeTransactionFileReaderJoinPosition;
-				_progress = progress;
-			}
-
-			public CommittedEventDistributed(Guid correlationId, ResolvedEvent data, CheckpointTag preTagged = null)
-				: this(correlationId, data, data.Position.PreparePosition, 11.1f, preTagged) {
-			}
-
-			public ResolvedEvent Data {
-				get { return _data; }
-			}
-
-			public long? SafeTransactionFileReaderJoinPosition {
-				get { return _safeTransactionFileReaderJoinPosition; }
-			}
-
-			public float Progress {
-				get { return _progress; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.ReaderSubscription)]
-		public partial class Faulted : SubscriptionMessage {
-			private readonly string _reason;
-
-			public Faulted(
-				Guid correlationId, string reason, object source = null)
-				: base(correlationId, null, source) {
-				_reason = reason;
-			}
-
-			public string Reason {
-				get { return _reason; }
-			}
-		}
-
-		[DerivedMessage(ProjectionMessage.ReaderSubscription)]
-		public partial class ReportProgress : SubscriptionMessage {
-			public ReportProgress(Guid correlationId, object source = null) : base(correlationId, null, source) { }
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Messaging/PublishToWrapEnvelop.cs b/src/EventStore.Projections.Core/Messaging/PublishToWrapEnvelop.cs
deleted file mode 100644
index 5bf6065dfbe..00000000000
--- a/src/EventStore.Projections.Core/Messaging/PublishToWrapEnvelop.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-
-namespace EventStore.Projections.Core.Messaging {
-	class PublishToWrapEnvelop : IEnvelope {
-		private readonly IPublisher _publisher;
-		private readonly IEnvelope _nestedEnevelop;
-
-		public PublishToWrapEnvelop(IPublisher publisher, IEnvelope nestedEnevelop) {
-			_publisher = publisher;
-			_nestedEnevelop = nestedEnevelop;
-		}
-
-		public void ReplyWith<T>(T message) where T : Message {
-			_publisher.Publish(new UnwrapEnvelopeMessage(() => _nestedEnevelop.ReplyWith(message)));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Messaging/UnwrapEnvelopeHandler.cs b/src/EventStore.Projections.Core/Messaging/UnwrapEnvelopeHandler.cs
deleted file mode 100644
index 30ec7eccfa6..00000000000
--- a/src/EventStore.Projections.Core/Messaging/UnwrapEnvelopeHandler.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using EventStore.Core.Bus;
-
-namespace EventStore.Projections.Core.Messaging {
-	public class UnwrapEnvelopeHandler : IHandle<UnwrapEnvelopeMessage> {
-		public void Handle(UnwrapEnvelopeMessage message) {
-			message.Action();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Messaging/UnwrapEnvelopeMessage.cs b/src/EventStore.Projections.Core/Messaging/UnwrapEnvelopeMessage.cs
deleted file mode 100644
index aadcf66d770..00000000000
--- a/src/EventStore.Projections.Core/Messaging/UnwrapEnvelopeMessage.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using EventStore.Core.Messaging;
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Messaging {
-	[DerivedMessage(ProjectionMessage.Misc)]
-	public partial class UnwrapEnvelopeMessage : Message {
-		private readonly Action _action;
-
-		public UnwrapEnvelopeMessage(Action action) {
-			_action = action;
-		}
-
-		public Action Action {
-			get { return _action; }
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Metrics/IProjectionTracker.cs b/src/EventStore.Projections.Core/Metrics/IProjectionTracker.cs
deleted file mode 100644
index a528fc64ba8..00000000000
--- a/src/EventStore.Projections.Core/Metrics/IProjectionTracker.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using EventStore.Projections.Core.Services;
-
-namespace EventStore.Projections.Core.Metrics;
-
-public interface IProjectionTracker {
-	void OnNewStats(ProjectionStatistics[] newStats);
-
-	public static IProjectionTracker NoOp => NoOpTracker.Instance;
-}
-
-file sealed class NoOpTracker : IProjectionTracker {
-	public static NoOpTracker Instance { get; } = new();
-
-	public void OnNewStats(ProjectionStatistics[] newStats) { }
-}
diff --git a/src/EventStore.Projections.Core/ProjectionCoreWorkersNode.cs b/src/EventStore.Projections.Core/ProjectionCoreWorkersNode.cs
deleted file mode 100644
index 95d59d73876..00000000000
--- a/src/EventStore.Projections.Core/ProjectionCoreWorkersNode.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Options;
-using EventStore.Core;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Services.TimerService;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Messages.EventReaders.Feeds;
-using EventStore.Projections.Core.Messaging;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Projections.Core.Services.Processing;
-
-namespace EventStore.Projections.Core {
-	public static class ProjectionCoreWorkersNode {
-		public static Dictionary<Guid, CoreWorker> CreateCoreWorkers(
-			StandardComponents standardComponents,
-			ProjectionsStandardComponents projectionsStandardComponents) {
-			var coreWorkers = new Dictionary<Guid, CoreWorker>();
-			while (coreWorkers.Count < projectionsStandardComponents.ProjectionWorkerThreadCount) {
-				var coreInputBus = new InMemoryBus("bus");
-				var coreInputQueue = new QueuedHandlerThreadPool(coreInputBus,
-					"Projection Core #" + coreWorkers.Count,
-					standardComponents.QueueStatsManager,
-					standardComponents.QueueTrackers,
-					groupName: "Projection Core");
-				var coreOutputBus = new InMemoryBus("output bus");
-				var coreOutputQueue = new QueuedHandlerThreadPool(coreOutputBus,
-					"Projection Core #" + coreWorkers.Count + " output",
-					standardComponents.QueueStatsManager,
-					standardComponents.QueueTrackers,
-					groupName: "Projection Core");
-				var workerId = Guid.NewGuid();
-				var projectionNode = new ProjectionWorkerNode(
-					workerId,
-					standardComponents.DbConfig,
-					inputQueue: coreInputQueue,
-					outputQueue: coreOutputQueue,
-					coreOutputBus,
-					standardComponents.TimeProvider,
-					projectionsStandardComponents.RunProjections,
-					projectionsStandardComponents.FaultOutOfOrderProjections,
-					projectionsStandardComponents.LeaderOutputQueue,
-					projectionsStandardComponents);
-				projectionNode.SetupMessaging(coreInputBus);
-
-				var forwarder = new RequestResponseQueueForwarder(
-					inputQueue: coreInputQueue,
-					externalRequestQueue: standardComponents.MainQueue);
-				// forwarded messages
-				var coreOutput = projectionNode.CoreOutputBus;
-				coreOutput.Subscribe<ClientMessage.ReadEvent>(forwarder);
-				coreOutput.Subscribe<ClientMessage.ReadStreamEventsBackward>(forwarder);
-				coreOutput.Subscribe<ClientMessage.ReadStreamEventsForward>(forwarder);
-				coreOutput.Subscribe<ClientMessage.ReadAllEventsForward>(forwarder);
-				coreOutput.Subscribe<ClientMessage.WriteEvents>(forwarder);
-				coreOutput.Subscribe<ClientMessage.DeleteStream>(forwarder);
-				coreOutput.Subscribe<ProjectionCoreServiceMessage.SubComponentStarted>(forwarder);
-				coreOutput.Subscribe<ProjectionCoreServiceMessage.SubComponentStopped>(forwarder);
-
-				if (projectionsStandardComponents.RunProjections >= ProjectionType.System) {
-					coreOutput.Subscribe(
-						Forwarder.Create<AwakeServiceMessage.SubscribeAwake>(standardComponents.MainQueue));
-					coreOutput.Subscribe(
-						Forwarder.Create<AwakeServiceMessage.UnsubscribeAwake>(standardComponents.MainQueue));
-					coreOutput.Subscribe(
-						Forwarder.Create<ProjectionSubsystemMessage.IODispatcherDrained>(projectionsStandardComponents
-							.LeaderOutputQueue));
-				}
-
-				coreOutput.Subscribe<TimerMessage.Schedule>(standardComponents.TimerService);
-
-				coreOutput.Subscribe(Forwarder.Create<Message>(coreInputQueue)); // forward all
-
-				coreInputBus.Subscribe(new UnwrapEnvelopeHandler());
-
-				coreWorkers.Add(workerId, new CoreWorker(workerId, coreInputQueue, coreOutputQueue));
-			}
-
-			var queues = coreWorkers.Select(v => v.Value.CoreInputQueue).ToArray();
-			var coordinator = new ProjectionCoreCoordinator(
-				projectionsStandardComponents.RunProjections,
-				queues,
-				projectionsStandardComponents.LeaderOutputQueue);
-
-			coordinator.SetupMessaging(projectionsStandardComponents.LeaderInputBus);
-			projectionsStandardComponents.LeaderInputBus.Subscribe(
-				Forwarder.CreateBalancing<FeedReaderMessage.ReadPage>(coreWorkers
-					.Select(x => x.Value.CoreInputQueue)
-					.ToArray()));
-			return coreWorkers;
-		}
-	}
-
-	public class CoreWorker {
-		public Guid WorkerId { get; }
-		public IQueuedHandler CoreInputQueue { get; }
-		public IQueuedHandler CoreOutputQueue { get; }
-
-		public CoreWorker(Guid workerId, IQueuedHandler inputQueue, IQueuedHandler outputQueue) {
-			WorkerId = workerId;
-			CoreInputQueue = inputQueue;
-			CoreOutputQueue = outputQueue;
-		}
-
-		public void Start() {
-			CoreInputQueue.Start();
-			CoreOutputQueue.Start();
-		}
-
-		public void Stop() {
-			CoreInputQueue.Stop();
-			CoreOutputQueue.Stop();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/ProjectionManagerNode.cs b/src/EventStore.Projections.Core/ProjectionManagerNode.cs
deleted file mode 100644
index 7e6ff7f5ed9..00000000000
--- a/src/EventStore.Projections.Core/ProjectionManagerNode.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Common.Options;
-using EventStore.Core;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Telemetry;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Messaging;
-using EventStore.Projections.Core.Metrics;
-using EventStore.Projections.Core.Services.Http;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Projections.Core.Services.Processing;
-
-namespace EventStore.Projections.Core {
-	public class ProjectionManagerNode {
-		public static void CreateManagerService(
-			StandardComponents standardComponents,
-			ProjectionsStandardComponents projectionsStandardComponents,
-			IDictionary<Guid, IPublisher> queues,
-			TimeSpan projectionQueryExpiry,
-			IProjectionTracker projectionTracker) {
-			IPublisher inputQueue = projectionsStandardComponents.LeaderInputQueue;
-			IPublisher outputQueue = projectionsStandardComponents.LeaderOutputQueue;
-			var ioDispatcher = new IODispatcher(outputQueue, inputQueue, true);
-
-			var projectionsController = new ProjectionsController(
-				standardComponents.HttpForwarder,
-				inputQueue,
-				standardComponents.NetworkSendService);
-
-			var forwarder = new RequestResponseQueueForwarder(
-				inputQueue: projectionsStandardComponents.LeaderInputQueue,
-				externalRequestQueue: standardComponents.MainQueue);
-
-			if (projectionsStandardComponents.RunProjections != ProjectionType.None) {
-				foreach (var httpService in standardComponents.HttpServices) {
-					httpService.SetupController(projectionsController);
-				}
-			}
-
-			var projectionManagerMessageDispatcher = new ProjectionManagerMessageDispatcher(queues);
-
-			var projectionManager = new ProjectionManager(
-				inputQueue,
-				outputQueue,
-				queues,
-				new RealTimeProvider(),
-				projectionsStandardComponents.RunProjections,
-				ioDispatcher,
-				projectionQueryExpiry,
-				projectionTracker);
-
-			SubscribeMainBus(
-				projectionsStandardComponents.LeaderInputBus,
-				projectionManager,
-				projectionsStandardComponents.RunProjections,
-				ioDispatcher,
-				projectionManagerMessageDispatcher);
-
-
-			SubscribeOutputBus(standardComponents, projectionsStandardComponents, forwarder, ioDispatcher);
-		}
-
-		private static void SubscribeMainBus(
-			ISubscriber mainBus,
-			ProjectionManager projectionManager,
-			ProjectionType runProjections,
-			IODispatcher ioDispatcher,
-			ProjectionManagerMessageDispatcher projectionManagerMessageDispatcher) {
-			if (runProjections >= ProjectionType.System) {
-				mainBus.Subscribe<ProjectionManagementMessage.Command.Post>(projectionManager);
-				mainBus.Subscribe<ProjectionManagementMessage.Command.PostBatch>(projectionManager);
-				mainBus.Subscribe<ProjectionManagementMessage.Command.UpdateQuery>(projectionManager);
-				mainBus.Subscribe<ProjectionManagementMessage.Command.GetQuery>(projectionManager);
-				mainBus.Subscribe<ProjectionManagementMessage.Command.Delete>(projectionManager);
-				mainBus.Subscribe<ProjectionManagementMessage.Command.GetStatistics>(projectionManager);
-				mainBus.Subscribe<ProjectionManagementMessage.Command.GetState>(projectionManager);
-				mainBus.Subscribe<ProjectionManagementMessage.Command.GetResult>(projectionManager);
-				mainBus.Subscribe<ProjectionManagementMessage.Command.Disable>(projectionManager);
-				mainBus.Subscribe<ProjectionManagementMessage.Command.Enable>(projectionManager);
-				mainBus.Subscribe<ProjectionManagementMessage.Command.Abort>(projectionManager);
-				mainBus.Subscribe<ProjectionManagementMessage.Command.SetRunAs>(projectionManager);
-				mainBus.Subscribe<ProjectionManagementMessage.Command.Reset>(projectionManager);
-				mainBus.Subscribe<ProjectionManagementMessage.Command.GetConfig>(projectionManager);
-				mainBus.Subscribe<ProjectionManagementMessage.Command.UpdateConfig>(projectionManager);
-				mainBus.Subscribe<ProjectionManagementMessage.Internal.CleanupExpired>(projectionManager);
-				mainBus.Subscribe<ProjectionManagementMessage.Internal.Deleted>(projectionManager);
-				mainBus.Subscribe<CoreProjectionStatusMessage.Started>(projectionManager);
-				mainBus.Subscribe<CoreProjectionStatusMessage.Stopped>(projectionManager);
-				mainBus.Subscribe<CoreProjectionStatusMessage.Faulted>(projectionManager);
-				mainBus.Subscribe<CoreProjectionStatusMessage.Prepared>(projectionManager);
-				mainBus.Subscribe<CoreProjectionStatusMessage.StateReport>(projectionManager);
-				mainBus.Subscribe<CoreProjectionStatusMessage.ResultReport>(projectionManager);
-				mainBus.Subscribe<CoreProjectionStatusMessage.StatisticsReport>(projectionManager);
-				mainBus.Subscribe<ProjectionSubsystemMessage.StartComponents>(projectionManager);
-				mainBus.Subscribe<ProjectionSubsystemMessage.StopComponents>(projectionManager);
-			}
-
-			mainBus.Subscribe<ClientMessage.WriteEventsCompleted>(projectionManager);
-			mainBus.Subscribe<ClientMessage.DeleteStreamCompleted>(projectionManager);
-			mainBus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(projectionManager);
-			mainBus.Subscribe<ClientMessage.ReadStreamEventsForwardCompleted>(projectionManager);
-			mainBus.Subscribe<TelemetryMessage.Request>(projectionManager);
-
-			mainBus.Subscribe(ioDispatcher.Awaker);
-			mainBus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(ioDispatcher.BackwardReader);
-			mainBus.Subscribe<ClientMessage.NotHandled>(ioDispatcher.BackwardReader);
-			mainBus.Subscribe(ioDispatcher.ForwardReader);
-			mainBus.Subscribe(ioDispatcher.StreamDeleter);
-			mainBus.Subscribe(ioDispatcher.Writer);
-			mainBus.Subscribe(ioDispatcher.EventReader);
-			mainBus.Subscribe<IODispatcherDelayedMessage>(ioDispatcher);
-			mainBus.Subscribe<ClientMessage.NotHandled>(ioDispatcher);
-
-			mainBus.Subscribe(projectionManagerMessageDispatcher);
-		}
-
-		private static void SubscribeOutputBus(
-			StandardComponents standardComponents,
-			ProjectionsStandardComponents projectionsStandardComponents,
-			RequestResponseQueueForwarder forwarder,
-			IODispatcher ioDispatcher) {
-			var managerOutput = projectionsStandardComponents.LeaderOutputBus;
-			managerOutput.Subscribe<ClientMessage.ReadEvent>(forwarder);
-			managerOutput.Subscribe<ClientMessage.ReadStreamEventsBackward>(forwarder);
-			managerOutput.Subscribe<ClientMessage.ReadStreamEventsForward>(forwarder);
-			managerOutput.Subscribe<ClientMessage.WriteEvents>(forwarder);
-			managerOutput.Subscribe<ClientMessage.DeleteStream>(forwarder);
-			managerOutput.Subscribe(Forwarder.Create<Message>(projectionsStandardComponents.LeaderInputQueue));
-			managerOutput.Subscribe<ClientMessage.NotHandled>(ioDispatcher);
-
-			managerOutput.Subscribe<TimerMessage.Schedule>(standardComponents.TimerService);
-			managerOutput.Subscribe(Forwarder.Create<AwakeServiceMessage.SubscribeAwake>(standardComponents.MainQueue));
-			managerOutput.Subscribe(
-				Forwarder.Create<AwakeServiceMessage.UnsubscribeAwake>(standardComponents.MainQueue));
-			managerOutput.Subscribe<SystemMessage.SubSystemInitialized>(forwarder);
-
-			// self forward all
-			standardComponents.MainBus.Subscribe(
-				Forwarder.Create<SystemMessage.StateChangeMessage>(projectionsStandardComponents.LeaderInputQueue));
-			standardComponents.MainBus.Subscribe(
-				Forwarder.Create<SystemMessage.SystemCoreReady>(projectionsStandardComponents.LeaderInputQueue));
-			standardComponents.MainBus.Subscribe(
-				Forwarder.Create<SystemMessage.EpochWritten>(projectionsStandardComponents.LeaderInputQueue));
-			standardComponents.MainBus.Subscribe(
-				Forwarder.Create<ProjectionCoreServiceMessage.SubComponentStarted>(projectionsStandardComponents
-					.LeaderInputQueue));
-			standardComponents.MainBus.Subscribe(
-				Forwarder.Create<ProjectionCoreServiceMessage.SubComponentStopped>(projectionsStandardComponents
-					.LeaderInputQueue));
-			standardComponents.MainBus.Subscribe(
-				Forwarder.Create<TelemetryMessage.Request>(projectionsStandardComponents.LeaderInputQueue));
-			projectionsStandardComponents.LeaderInputBus.Subscribe(new UnwrapEnvelopeHandler());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/ProjectionWorkerNode.cs b/src/EventStore.Projections.Core/ProjectionWorkerNode.cs
deleted file mode 100644
index efc8c328add..00000000000
--- a/src/EventStore.Projections.Core/ProjectionWorkerNode.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-using System;
-using EventStore.Common.Options;
-using EventStore.Core.Bus;
-using EventStore.Common.Utils;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Projections.Core.EventReaders.Feeds;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-
-namespace EventStore.Projections.Core {
-	public class ProjectionWorkerNode {
-		private readonly ProjectionType _runProjections;
-		private readonly ProjectionCoreService _projectionCoreService;
-		private readonly ISubscriber _coreOutputBus;
-		private readonly EventReaderCoreService _eventReaderCoreService;
-
-		private readonly ReaderSubscriptionDispatcher _subscriptionDispatcher;
-
-		private readonly FeedReaderService _feedReaderService;
-		private readonly IODispatcher _ioDispatcher;
-		private readonly IPublisher _leaderOutputQueue;
-
-		public ProjectionWorkerNode(
-			Guid workerId,
-			TFChunkDbConfig dbConfig,
-			IPublisher inputQueue,
-			IPublisher outputQueue,
-			ISubscriber outputBus,
-			ITimeProvider timeProvider,
-			ProjectionType runProjections,
-			bool faultOutOfOrderProjections,
-			IPublisher leaderOutputQueue,
-			ProjectionsStandardComponents configuration) {
-			_runProjections = runProjections;
-			Ensure.NotNull(dbConfig, "dbConfig");
-
-			_leaderOutputQueue = leaderOutputQueue;
-			_coreOutputBus = outputBus;
-
-			_subscriptionDispatcher = new ReaderSubscriptionDispatcher(outputQueue);
-
-			_ioDispatcher = new IODispatcher(outputQueue, inputQueue, true);
-			_eventReaderCoreService = new EventReaderCoreService(
-				outputQueue,
-				_ioDispatcher,
-				10,
-				dbConfig.WriterCheckpoint,
-				runHeadingReader: runProjections >= ProjectionType.System,
-				faultOutOfOrderProjections: faultOutOfOrderProjections);
-
-			_feedReaderService = new FeedReaderService(_subscriptionDispatcher, timeProvider);
-			if (runProjections >= ProjectionType.System) {
-				_projectionCoreService = new ProjectionCoreService(
-					workerId,
-					inputQueue,
-					outputQueue,
-					_subscriptionDispatcher,
-					timeProvider,
-					_ioDispatcher,
-					configuration);
-			}
-		}
-
-		public ISubscriber CoreOutputBus {
-			get { return _coreOutputBus;  }
-		}
-
-		public void SetupMessaging(ISubscriber coreInputBus) {
-			coreInputBus.Subscribe(_subscriptionDispatcher
-				.CreateSubscriber<EventReaderSubscriptionMessage.CheckpointSuggested>());
-			coreInputBus.Subscribe(_subscriptionDispatcher
-				.CreateSubscriber<EventReaderSubscriptionMessage.CommittedEventReceived>());
-			coreInputBus.Subscribe(
-				_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.EofReached>());
-			coreInputBus.Subscribe(_subscriptionDispatcher
-				.CreateSubscriber<EventReaderSubscriptionMessage.PartitionEofReached>());
-			coreInputBus.Subscribe(_subscriptionDispatcher
-				.CreateSubscriber<EventReaderSubscriptionMessage.PartitionDeleted>());
-			coreInputBus.Subscribe(_subscriptionDispatcher
-				.CreateSubscriber<EventReaderSubscriptionMessage.ProgressChanged>());
-			coreInputBus.Subscribe(_subscriptionDispatcher
-				.CreateSubscriber<EventReaderSubscriptionMessage.SubscriptionStarted>());
-			coreInputBus.Subscribe(_subscriptionDispatcher
-				.CreateSubscriber<EventReaderSubscriptionMessage.NotAuthorized>());
-			coreInputBus.Subscribe(_subscriptionDispatcher
-				.CreateSubscriber<EventReaderSubscriptionMessage.ReaderAssignedReader>());
-			coreInputBus.Subscribe(_subscriptionDispatcher
-				.CreateSubscriber<EventReaderSubscriptionMessage.SubscribeTimeout>());
-			coreInputBus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.Failed>());
-
-			coreInputBus.Subscribe(_feedReaderService);
-
-			if (_runProjections >= ProjectionType.System) {
-				coreInputBus.Subscribe<ProjectionCoreServiceMessage.StartCore>(_projectionCoreService);
-				coreInputBus.Subscribe<ProjectionCoreServiceMessage.StopCore>(_projectionCoreService);
-				coreInputBus.Subscribe<ProjectionCoreServiceMessage.StopCoreTimeout>(_projectionCoreService);
-				coreInputBus.Subscribe<ProjectionCoreServiceMessage.CoreTick>(_projectionCoreService);
-				coreInputBus.Subscribe<CoreProjectionManagementMessage.CreateAndPrepare>(_projectionCoreService);
-				coreInputBus.Subscribe<CoreProjectionManagementMessage.CreatePrepared>(_projectionCoreService);
-				coreInputBus.Subscribe<CoreProjectionManagementMessage.Dispose>(_projectionCoreService);
-				coreInputBus.Subscribe<CoreProjectionManagementMessage.Start>(_projectionCoreService);
-				coreInputBus.Subscribe<CoreProjectionManagementMessage.LoadStopped>(_projectionCoreService);
-				coreInputBus.Subscribe<CoreProjectionManagementMessage.Stop>(_projectionCoreService);
-				coreInputBus.Subscribe<CoreProjectionManagementMessage.Kill>(_projectionCoreService);
-				coreInputBus.Subscribe<CoreProjectionManagementMessage.GetState>(_projectionCoreService);
-				coreInputBus.Subscribe<CoreProjectionManagementMessage.GetResult>(_projectionCoreService);
-				coreInputBus.Subscribe<ClientMessage.ReadStreamEventsForwardCompleted>(_ioDispatcher.ForwardReader);
-				coreInputBus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_ioDispatcher.BackwardReader);
-				coreInputBus.Subscribe<ClientMessage.NotHandled>(_ioDispatcher.BackwardReader);
-				coreInputBus.Subscribe<ClientMessage.ReadEventCompleted>(_ioDispatcher.EventReader);
-				coreInputBus.Subscribe<ClientMessage.WriteEventsCompleted>(_ioDispatcher.Writer);
-				coreInputBus.Subscribe<ClientMessage.DeleteStreamCompleted>(_ioDispatcher.StreamDeleter);
-				coreInputBus.Subscribe<IODispatcherDelayedMessage>(_ioDispatcher.Awaker);
-				coreInputBus.Subscribe<IODispatcherDelayedMessage>(_ioDispatcher);
-				coreInputBus.Subscribe<ClientMessage.NotHandled>(_ioDispatcher);
-				coreInputBus.Subscribe<CoreProjectionProcessingMessage.CheckpointCompleted>(_projectionCoreService);
-				coreInputBus.Subscribe<CoreProjectionProcessingMessage.CheckpointLoaded>(_projectionCoreService);
-				coreInputBus.Subscribe<CoreProjectionProcessingMessage.PrerecordedEventsLoaded>(_projectionCoreService);
-				coreInputBus.Subscribe<CoreProjectionProcessingMessage.RestartRequested>(_projectionCoreService);
-				coreInputBus.Subscribe<CoreProjectionProcessingMessage.Failed>(_projectionCoreService);
-				coreInputBus.Subscribe<CoreProjectionStatusMessage.Suspended>(_projectionCoreService);
-				//NOTE: message forwarding is set up outside (for Read/Write events)
-
-				// Forward messages back to projection manager
-				coreInputBus.Subscribe(
-					Forwarder.Create<ProjectionManagementMessage.Command.ControlMessage>(_leaderOutputQueue));
-				coreInputBus.Subscribe(
-					Forwarder.Create<CoreProjectionStatusMessage.CoreProjectionStatusMessageBase>(_leaderOutputQueue));
-				coreInputBus.Subscribe(
-					Forwarder.Create<CoreProjectionStatusMessage.DataReportBase>(_leaderOutputQueue));
-			}
-
-			coreInputBus.Subscribe<ReaderCoreServiceMessage.StartReader>(_eventReaderCoreService);
-			coreInputBus.Subscribe<ReaderCoreServiceMessage.StopReader>(_eventReaderCoreService);
-			coreInputBus.Subscribe<ReaderSubscriptionManagement.Subscribe>(_eventReaderCoreService);
-			coreInputBus.Subscribe<ReaderSubscriptionManagement.Unsubscribe>(_eventReaderCoreService);
-			coreInputBus.Subscribe<ReaderSubscriptionManagement.Pause>(_eventReaderCoreService);
-			coreInputBus.Subscribe<ReaderSubscriptionManagement.Resume>(_eventReaderCoreService);
-			coreInputBus.Subscribe<ReaderSubscriptionMessage.CommittedEventDistributed>(_eventReaderCoreService);
-			coreInputBus.Subscribe<ReaderSubscriptionMessage.EventReaderIdle>(_eventReaderCoreService);
-			coreInputBus.Subscribe<ReaderSubscriptionMessage.EventReaderStarting>(_eventReaderCoreService);
-			coreInputBus.Subscribe<ReaderSubscriptionMessage.EventReaderEof>(_eventReaderCoreService);
-			coreInputBus.Subscribe<ReaderSubscriptionMessage.EventReaderPartitionEof>(_eventReaderCoreService);
-			coreInputBus.Subscribe<ReaderSubscriptionMessage.EventReaderPartitionDeleted>(_eventReaderCoreService);
-			coreInputBus.Subscribe<ReaderSubscriptionMessage.EventReaderNotAuthorized>(_eventReaderCoreService);
-			coreInputBus.Subscribe<ReaderSubscriptionMessage.Faulted>(_eventReaderCoreService);
-			coreInputBus.Subscribe<ReaderSubscriptionMessage.ReportProgress>(_eventReaderCoreService);
-			//NOTE: message forwarding is set up outside (for Read/Write events)
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/ProjectionsStandardComponents.cs b/src/EventStore.Projections.Core/ProjectionsStandardComponents.cs
deleted file mode 100644
index 5a80bf8463a..00000000000
--- a/src/EventStore.Projections.Core/ProjectionsStandardComponents.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using EventStore.Common.Options;
-using EventStore.Core.Bus;
-
-namespace EventStore.Projections.Core {
-	public class ProjectionsStandardComponents {
-		public ProjectionsStandardComponents(
-			int projectionWorkerThreadCount,
-			ProjectionType runProjections,
-			ISubscriber leaderOutputBus,
-			IPublisher leaderOutputQueue,
-			ISubscriber leaderInputBus,
-			IPublisher leaderInputQueue,
-			bool faultOutOfOrderProjections, int projectionCompilationTimeout, int projectionExecutionTimeout) {
-			ProjectionWorkerThreadCount = projectionWorkerThreadCount;
-			RunProjections = runProjections;
-			LeaderOutputBus = leaderOutputBus;
-			LeaderOutputQueue = leaderOutputQueue;
-			LeaderInputQueue = leaderInputQueue;
-			LeaderInputBus = leaderInputBus;
-			FaultOutOfOrderProjections = faultOutOfOrderProjections;
-			ProjectionCompilationTimeout = projectionCompilationTimeout;
-			ProjectionExecutionTimeout = projectionExecutionTimeout;
-		}
-
-		public int ProjectionWorkerThreadCount { get; }
-
-		public ProjectionType RunProjections { get; }
-
-		public ISubscriber LeaderOutputBus { get; }
-		public IPublisher LeaderOutputQueue { get; }
-
-		public IPublisher LeaderInputQueue { get; }
-		public ISubscriber LeaderInputBus { get; }
-
-		public bool FaultOutOfOrderProjections { get; }
-
-		public int ProjectionCompilationTimeout { get; }
-
-		public int ProjectionExecutionTimeout { get; }
-	}
-}
diff --git a/src/EventStore.Projections.Core/ProjectionsSubsystem.cs b/src/EventStore.Projections.Core/ProjectionsSubsystem.cs
deleted file mode 100644
index 6ba24027d76..00000000000
--- a/src/EventStore.Projections.Core/ProjectionsSubsystem.cs
+++ /dev/null
@@ -1,429 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Metrics;
-using System.Linq;
-using System.Threading.Tasks;
-using DotNext;
-using EventStore.Common.Options;
-using EventStore.Core;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Plugins.Authorization;
-using EventStore.Plugins.Subsystems;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Metrics;
-using EventStore.Projections.Core.Services.Grpc;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Projections.Core {
-	public record ProjectionSubsystemOptions(
-		int ProjectionWorkerThreadCount,
-		ProjectionType RunProjections,
-		bool StartStandardProjections,
-		TimeSpan ProjectionQueryExpiry,
-		bool FaultOutOfOrderProjections,
-		int CompilationTimeout,
-		int ExecutionTimeout);
-
-	public sealed class ProjectionsSubsystem : ISubsystem,
-		IHandle<SystemMessage.SystemCoreReady>,
-		IHandle<SystemMessage.StateChangeMessage>,
-		IHandle<CoreProjectionStatusMessage.Stopped>,
-		IHandle<CoreProjectionStatusMessage.Started>,
-		IHandle<ProjectionSubsystemMessage.RestartSubsystem>,
-		IHandle<ProjectionSubsystemMessage.ComponentStarted>,
-		IHandle<ProjectionSubsystemMessage.ComponentStopped>,
-		IHandle<ProjectionSubsystemMessage.IODispatcherDrained> {
-
-		static readonly ILogger Logger = Serilog.Log.ForContext<ProjectionsSubsystem>();
-
-		public const int VERSION = 4;
-		public const int CONTENT_TYPE_VALIDATION_VERSION = 4;
-
-		private readonly int _projectionWorkerThreadCount;
-		private readonly ProjectionType _runProjections;
-		private readonly bool _startStandardProjections;
-		private readonly TimeSpan _projectionsQueryExpiry;
-
-		private readonly InMemoryBus _leaderInputBus;
-		private readonly InMemoryBus _leaderOutputBus;
-
-		private IQueuedHandler _leaderInputQueue;
-		private IQueuedHandler _leaderOutputQueue;
-
-		private IDictionary<Guid, CoreWorker> _coreWorkers;
-		private Dictionary<Guid, IPublisher> _queueMap;
-		private bool _subsystemStarted;
-		private readonly TaskCompletionSource _subsystemInitialized;
-
-		private readonly bool _faultOutOfOrderProjections;
-
-		private readonly int _compilationTimeout;
-		private readonly int _executionTimeout;
-
-		private readonly int _componentCount;
-		private readonly int _dispatcherCount;
-		private bool _restarting;
-		private int _pendingComponentStarts;
-		private int _runningComponentCount;
-		private int _runningDispatchers;
-
-		private VNodeState _nodeState;
-		private SubsystemState _subsystemState = SubsystemState.NotReady;
-		private Guid _instanceCorrelationId;
-		private IProjectionTracker _projectionTracker = IProjectionTracker.NoOp;
-
-		private readonly List<string> _standardProjections = new List<string> {
-			"$by_category",
-			"$stream_by_category",
-			"$streams",
-			"$by_event_type",
-			"$by_correlation_id"
-		};
-
-		public ProjectionsSubsystem(ProjectionSubsystemOptions projectionSubsystemOptions) {
-			if (projectionSubsystemOptions.RunProjections <= ProjectionType.System)
-				_projectionWorkerThreadCount = 1;
-			else
-				_projectionWorkerThreadCount = projectionSubsystemOptions.ProjectionWorkerThreadCount;
-
-			_runProjections = projectionSubsystemOptions.RunProjections;
-			// Projection manager & Projection Core Coordinator
-			// The manager only starts when projections are running
-			_componentCount = _runProjections == ProjectionType.None ? 1 : 2;
-
-			// Projection manager & each projection core worker
-			_dispatcherCount = 1 + _projectionWorkerThreadCount;
-
-			_startStandardProjections = projectionSubsystemOptions.StartStandardProjections;
-			_projectionsQueryExpiry = projectionSubsystemOptions.ProjectionQueryExpiry;
-			_faultOutOfOrderProjections = projectionSubsystemOptions.FaultOutOfOrderProjections;
-
-			_leaderInputBus = new InMemoryBus("manager input bus");
-			_leaderOutputBus = new InMemoryBus("ProjectionManagerAndCoreCoordinatorOutput");
-
-			_subsystemInitialized = new();
-			_executionTimeout = projectionSubsystemOptions.ExecutionTimeout;
-			_compilationTimeout = projectionSubsystemOptions.CompilationTimeout;
-		}
-
-		public IPublisher LeaderOutputQueue => _leaderOutputQueue;
-		public IPublisher LeaderInputQueue => _leaderInputQueue;
-		public ISubscriber LeaderOutputBus => _leaderOutputBus;
-		public ISubscriber LeaderInputBus => _leaderInputBus;
-
-		public string Name => "Projections";
-		public string DiagnosticsName => Name;
-		public KeyValuePair<string, object>[] DiagnosticsTags => [];
-		public string Version => VERSION.ToString();
-		public bool Enabled => true;
-		public string LicensePublicKey => string.Empty;
-
-		public void ConfigureApplication(IApplicationBuilder builder, IConfiguration configuration) {
-			var standardComponents = builder.ApplicationServices.GetRequiredService<StandardComponents>();
-
-			_leaderInputQueue = new QueuedHandlerThreadPool(
-				_leaderInputBus,
-				"Projections Leader",
-				standardComponents.QueueStatsManager,
-				standardComponents.QueueTrackers
-			);
-			_leaderOutputQueue = new QueuedHandlerThreadPool(
-				_leaderOutputBus,
-				"Projections Leader",
-				standardComponents.QueueStatsManager,
-				standardComponents.QueueTrackers
-			);
-
-			LeaderInputBus.Subscribe<ProjectionSubsystemMessage.RestartSubsystem>(this);
-			LeaderInputBus.Subscribe<ProjectionSubsystemMessage.ComponentStarted>(this);
-			LeaderInputBus.Subscribe<ProjectionSubsystemMessage.ComponentStopped>(this);
-			LeaderInputBus.Subscribe<ProjectionSubsystemMessage.IODispatcherDrained>(this);
-			LeaderInputBus.Subscribe<SystemMessage.SystemCoreReady>(this);
-			LeaderInputBus.Subscribe<SystemMessage.StateChangeMessage>(this);
-
-			var projectionsStandardComponents = new ProjectionsStandardComponents(
-				_projectionWorkerThreadCount,
-				_runProjections,
-				leaderOutputBus: _leaderOutputBus,
-				leaderOutputQueue: _leaderOutputQueue,
-				leaderInputBus: _leaderInputBus,
-				leaderInputQueue: _leaderInputQueue,
-				_faultOutOfOrderProjections,
-				_compilationTimeout,
-				_executionTimeout);
-
-			CreateAwakerService(standardComponents);
-			_coreWorkers = ProjectionCoreWorkersNode.CreateCoreWorkers(standardComponents, projectionsStandardComponents);
-			_queueMap = _coreWorkers.ToDictionary(v => v.Key, v => v.Value.CoreInputQueue.As<IPublisher>());
-
-			ConfigureProjectionMetrics(standardComponents.ProjectionStats);
-
-			ProjectionManagerNode.CreateManagerService(standardComponents, projectionsStandardComponents, _queueMap,
-				_projectionsQueryExpiry, _projectionTracker);
-			LeaderInputBus.Subscribe<CoreProjectionStatusMessage.Stopped>(this);
-			LeaderInputBus.Subscribe<CoreProjectionStatusMessage.Started>(this);
-
-			 builder.UseEndpoints(endpoints => endpoints.MapGrpcService<ProjectionManagement>());
-		}
-
-		private void ConfigureProjectionMetrics(bool isEnabled) {
-			if (!isEnabled)
-				return;
-
-			var projectionMeter = new Meter("EventStore.Projections.Core", version: "1.0.0");
-
-			var tracker = new ProjectionTracker();
-			_projectionTracker = tracker;
-
-			projectionMeter.CreateObservableCounter("eventstore-projection-events-processed-after-restart-total", tracker.ObserveEventsProcessed);
-			projectionMeter.CreateObservableUpDownCounter("eventstore-projection-progress", tracker.ObserveProgress);
-			projectionMeter.CreateObservableUpDownCounter("eventstore-projection-running", tracker.ObserveRunning);
-			projectionMeter.CreateObservableUpDownCounter("eventstore-projection-status", tracker.ObserveStatus);
-		}
-
-		public void ConfigureServices(IServiceCollection services, IConfiguration configuration) =>
-			services.AddSingleton(provider => new ProjectionManagement(_leaderInputQueue, provider.GetRequiredService<IAuthorizationProvider>()));
-
-		private static void CreateAwakerService(StandardComponents standardComponents) {
-			var awakeReaderService = new AwakeService();
-			standardComponents.MainBus.Subscribe<StorageMessage.EventCommitted>(awakeReaderService);
-			standardComponents.MainBus.Subscribe<StorageMessage.TfEofAtNonCommitRecord>(awakeReaderService);
-			standardComponents.MainBus.Subscribe<AwakeServiceMessage.SubscribeAwake>(awakeReaderService);
-			standardComponents.MainBus.Subscribe<AwakeServiceMessage.UnsubscribeAwake>(awakeReaderService);
-		}
-
-		public void Handle(SystemMessage.SystemCoreReady message) {
-			if (_subsystemState != SubsystemState.NotReady) return;
-			_subsystemState = SubsystemState.Ready;
-			if (_nodeState == VNodeState.Leader) {
-				StartComponents();
-				return;
-			}
-			if (_nodeState == VNodeState.Follower || _nodeState == VNodeState.ReadOnlyReplica) {
-				PublishInitialized();
-			}
-		}
-
-		public void Handle(SystemMessage.StateChangeMessage message) {
-			_nodeState = message.State;
-			if (_subsystemState == SubsystemState.NotReady) return;
-
-			if (_nodeState == VNodeState.Leader) {
-				StartComponents();
-				return;
-			}
-
-			if (_nodeState == VNodeState.Follower || _nodeState == VNodeState.ReadOnlyReplica) {
-				PublishInitialized();
-			}
-			StopComponents();
-		}
-
-		private void StartComponents() {
-			if (_nodeState != VNodeState.Leader) {
-				Logger.Debug("PROJECTIONS SUBSYSTEM: Not starting because node is not leader. Current node state: {nodeState}",
-					_nodeState);
-				return;
-			}
-			if (_subsystemState != SubsystemState.Ready && _subsystemState != SubsystemState.Stopped) {
-				Logger.Debug("PROJECTIONS SUBSYSTEM: Not starting because system is not ready or stopped. Current Subsystem state: {subsystemState}",
-					_subsystemState);
-				return;
-			}
-			if (_runningComponentCount > 0) {
-				Logger.Warning("PROJECTIONS SUBSYSTEM: Subsystem is stopped, but components are still running.");
-				return;
-			}
-
-			_subsystemState = SubsystemState.Starting;
-			_restarting = false;
-			_instanceCorrelationId = Guid.NewGuid();
-			Logger.Information("PROJECTIONS SUBSYSTEM: Starting components for Instance: {instanceCorrelationId}", _instanceCorrelationId);
-			_pendingComponentStarts = _componentCount;
-			LeaderInputQueue.Publish(new ProjectionSubsystemMessage.StartComponents(_instanceCorrelationId));
-		}
-
-		private void StopComponents() {
-			if (_subsystemState != SubsystemState.Started) {
-				Logger.Debug("PROJECTIONS SUBSYSTEM: Not stopping because subsystem is not in a started state. Current Subsystem state: {state}", _subsystemState);
-				return;
-			}
-
-			Logger.Information("PROJECTIONS SUBSYSTEM: Stopping components for Instance: {instanceCorrelationId}", _instanceCorrelationId);
-			_subsystemState = SubsystemState.Stopping;
-			LeaderInputQueue.Publish(new ProjectionSubsystemMessage.StopComponents(_instanceCorrelationId));
-		}
-
-		public void Handle(ProjectionSubsystemMessage.RestartSubsystem message) {
-			if (_restarting) {
-				var info = "PROJECTIONS SUBSYSTEM: Not restarting because the subsystem is already being restarted.";
-				Logger.Information(info);
-				message.ReplyEnvelope.ReplyWith(new ProjectionSubsystemMessage.InvalidSubsystemRestart("Restarting", info));
-				return;
-			}
-
-			if (_subsystemState != SubsystemState.Started) {
-				var info =
-					$"PROJECTIONS SUBSYSTEM: Not restarting because the subsystem is not started. Current subsystem state: {_subsystemState}";
-				Logger.Information(info);
-				message.ReplyEnvelope.ReplyWith(new ProjectionSubsystemMessage.InvalidSubsystemRestart(_subsystemState.ToString(), info));
-				return;
-			}
-
-			Logger.Information("PROJECTIONS SUBSYSTEM: Restarting subsystem.");
-			_restarting = true;
-			StopComponents();
-			message.ReplyEnvelope.ReplyWith(new ProjectionSubsystemMessage.SubsystemRestarting());
-		}
-
-		public void Handle(ProjectionSubsystemMessage.ComponentStarted message) {
-			if (message.InstanceCorrelationId != _instanceCorrelationId) {
-				Logger.Debug(
-					"PROJECTIONS SUBSYSTEM: Received component started for incorrect instance id. " +
-					"Requested: {requestedCorrelationId} | Current: {instanceCorrelationId}",
-					message.InstanceCorrelationId, _instanceCorrelationId);
-				return;
-			}
-
-			if (_pendingComponentStarts <= 0 || _subsystemState != SubsystemState.Starting)
-				return;
-
-			Logger.Debug("PROJECTIONS SUBSYSTEM: Component '{componentName}' started for Instance: {instanceCorrelationId}",
-				message.ComponentName, message.InstanceCorrelationId);
-			_pendingComponentStarts--;
-			_runningComponentCount++;
-
-			if (_pendingComponentStarts == 0) {
-				AllComponentsStarted();
-			}
-		}
-
-		public void Handle(ProjectionSubsystemMessage.IODispatcherDrained message) {
-			_runningDispatchers--;
-			Logger.Information(
-				"PROJECTIONS SUBSYSTEM: IO Dispatcher from {componentName} has been drained. {runningCount} of {totalCount} queues empty.",
-				message.ComponentName, _runningDispatchers, _dispatcherCount);
-			FinishStopping();
-		}
-
-		private void AllComponentsStarted() {
-			Logger.Information("PROJECTIONS SUBSYSTEM: All components started for Instance: {instanceCorrelationId}",
-				_instanceCorrelationId);
-			_subsystemState = SubsystemState.Started;
-			_runningDispatchers = _dispatcherCount;
-
-			PublishInitialized();
-
-			if (_nodeState != VNodeState.Leader) {
-				Logger.Information("PROJECTIONS SUBSYSTEM: Node state is no longer Leader. Stopping projections. Current node state: {nodeState}",
-					_nodeState);
-				StopComponents();
-			}
-		}
-
-		public void Handle(ProjectionSubsystemMessage.ComponentStopped message) {
-			if (message.InstanceCorrelationId != _instanceCorrelationId) {
-				Logger.Debug(
-					"PROJECTIONS SUBSYSTEM: Received component stopped for incorrect correlation id. " +
-					"Requested: {requestedCorrelationId} | Instance: {instanceCorrelationId}",
-					message.InstanceCorrelationId, _instanceCorrelationId);
-				return;
-			}
-
-			if (_subsystemState != SubsystemState.Stopping)
-				return;
-
-			Logger.Debug("PROJECTIONS SUBSYSTEM: Component '{componentName}' stopped for Instance: {instanceCorrelationId}",
-				message.ComponentName, message.InstanceCorrelationId);
-			_runningComponentCount--;
-			if (_runningComponentCount < 0) {
-				Logger.Warning("PROJECTIONS SUBSYSTEM: Got more component stopped messages than running components.");
-				_runningComponentCount = 0;
-			}
-
-			FinishStopping();
-		}
-
-		private void FinishStopping() {
-			if (_runningDispatchers > 0) return;
-			if (_runningComponentCount > 0) return;
-
-			Logger.Information(
-				"PROJECTIONS SUBSYSTEM: All components stopped and dispatchers drained for Instance: {correlationId}",
-				_instanceCorrelationId);
-			_subsystemState = SubsystemState.Stopped;
-
-			if (_restarting) {
-				StartComponents();
-				return;
-			}
-
-			if (_nodeState == VNodeState.Leader) {
-				Logger.Information("PROJECTIONS SUBSYSTEM: Node state has changed to Leader. Starting projections.");
-				StartComponents();
-			}
-		}
-
-		private void PublishInitialized() {
-			_subsystemInitialized.TrySetResult();
-		}
-
-		public Task Start() {
-			if (_subsystemStarted == false) {
-				_leaderInputQueue?.Start();
-				_leaderOutputQueue?.Start();
-
-				foreach (var queue in _coreWorkers)
-					queue.Value.Start();
-			}
-
-			_subsystemStarted = true;
-
-			return _subsystemInitialized.Task;
-		}
-
-		public Task Stop() {
-			if (_subsystemStarted) {
-				if (_leaderInputQueue != null)
-					_leaderInputQueue.Stop();
-				foreach (var queue in _coreWorkers)
-					queue.Value.Stop();
-			}
-
-			_subsystemStarted = false;
-
-			return Task.CompletedTask;
-		}
-
-		public void Handle(CoreProjectionStatusMessage.Stopped message) {
-			if (_startStandardProjections) {
-				if (_standardProjections.Contains(message.Name)) {
-					_standardProjections.Remove(message.Name);
-					var envelope = new NoopEnvelope();
-					LeaderInputQueue.Publish(new ProjectionManagementMessage.Command.Enable(envelope, message.Name,
-						ProjectionManagementMessage.RunAs.System));
-				}
-			}
-		}
-
-		public void Handle(CoreProjectionStatusMessage.Started message) {
-			_standardProjections.Remove(message.Name);
-		}
-
-		private enum SubsystemState {
-			NotReady,
-			Ready,
-			Starting,
-			Started,
-			Stopping,
-			Stopped
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Create.cs b/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Create.cs
deleted file mode 100644
index 38421474714..00000000000
--- a/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Create.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Messaging;
-using EventStore.Client.Projections;
-using EventStore.Core.Services.Transport.Grpc;
-using EventStore.Plugins.Authorization;
-using EventStore.Projections.Core.Messages;
-using Grpc.Core;
-using static EventStore.Client.Projections.CreateReq.Types.Options;
-
-namespace EventStore.Projections.Core.Services.Grpc {
-	internal partial class ProjectionManagement {
-		private static readonly Operation CreateOperation = new Operation(Operations.Projections.Create);
-
-		public override async Task<CreateResp> Create(CreateReq request, ServerCallContext context) {
-			var createdSource = new TaskCompletionSource<bool>();
-			var options = request.Options;
-
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, CreateOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			const string handlerType = "JS";
-			var name = options.ModeCase switch {
-				ModeOneofCase.Continuous => options.Continuous.Name,
-				ModeOneofCase.Transient => options.Transient.Name,
-				ModeOneofCase.OneTime => Guid.NewGuid().ToString("D"),
-				_ => throw new InvalidOperationException()
-			};
-			var projectionMode = options.ModeCase switch {
-				ModeOneofCase.Continuous => ProjectionMode.Continuous,
-				ModeOneofCase.Transient => ProjectionMode.Transient,
-				ModeOneofCase.OneTime => ProjectionMode.OneTime,
-				_ => throw new InvalidOperationException()
-			};
-			var emitEnabled = options.ModeCase switch {
-				ModeOneofCase.Continuous => options.Continuous.EmitEnabled,
-				_ => false
-			};
-			var trackEmittedStreams = (options.ModeCase, emitEnabled, options.Continuous?.TrackEmittedStreams) switch {
-				(ModeOneofCase.Continuous, true, true) => true,
-				(ModeOneofCase.Continuous, false, true) =>
-					throw new InvalidOperationException("EmitEnabled must be set to true to track emitted streams."),
-				_ => false
-			};
-			var checkpointsEnabled = options.ModeCase switch {
-				ModeOneofCase.Continuous => true,
-				ModeOneofCase.OneTime => false,
-				ModeOneofCase.Transient => false,
-				_ => throw new InvalidOperationException()
-			};
-
-			var runAs = new ProjectionManagementMessage.RunAs(user);
-
-			var envelope = new CallbackEnvelope(OnMessage);
-
-			_publisher.Publish(new ProjectionManagementMessage.Command.Post(envelope, projectionMode, name, runAs,
-				handlerType, options.Query, true, checkpointsEnabled, emitEnabled, trackEmittedStreams, true));
-
-			await createdSource.Task;
-
-			return new CreateResp();
-
-			void OnMessage(Message message) {
-				if (message is not ProjectionManagementMessage.Updated) {
-					createdSource.TrySetException(UnknownMessage<ProjectionManagementMessage.Updated>(message));
-					return;
-				}
-
-				createdSource.TrySetResult(true);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Delete.cs b/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Delete.cs
deleted file mode 100644
index 468b12a30dd..00000000000
--- a/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Delete.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Messaging;
-using EventStore.Client.Projections;
-using EventStore.Core.Services.Transport.Grpc;
-using EventStore.Plugins.Authorization;
-using EventStore.Projections.Core.Messages;
-using Grpc.Core;
-
-namespace EventStore.Projections.Core.Services.Grpc {
-	internal partial class ProjectionManagement {
-		private static readonly Operation DeleteOperation = new Operation(Operations.Projections.Delete);
-		public override async Task<DeleteResp> Delete(DeleteReq request, ServerCallContext context) {
-			var deletedSource = new TaskCompletionSource<bool>();
-			var options = request.Options;
-
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, DeleteOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			var name = options.Name;
-			var deleteCheckpointStream = options.DeleteCheckpointStream;
-			var deleteStateStream = options.DeleteStateStream;
-			var deleteEmittedStreams = options.DeleteEmittedStreams;
-			var runAs = new ProjectionManagementMessage.RunAs(user);
-
-			var envelope = new CallbackEnvelope(OnMessage);
-
-			_publisher.Publish(new ProjectionManagementMessage.Command.Delete(envelope, name, runAs,
-				deleteCheckpointStream, deleteStateStream, deleteEmittedStreams));
-
-			await deletedSource.Task;
-
-			return new DeleteResp();
-
-			void OnMessage(Message message) {
-				switch (message) {
-					case ProjectionManagementMessage.Updated:
-						deletedSource.TrySetResult(true);
-						break;
-					case ProjectionManagementMessage.NotFound:
-						deletedSource.TrySetException(ProjectionNotFound(name));
-						break;
-					default:
-						deletedSource.TrySetException(UnknownMessage<ProjectionManagementMessage.Updated>(message));
-						break;
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Disable.cs b/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Disable.cs
deleted file mode 100644
index 3115575cf8c..00000000000
--- a/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Disable.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Messaging;
-using EventStore.Client.Projections;
-using EventStore.Core.Services.Transport.Grpc;
-using EventStore.Plugins.Authorization;
-using EventStore.Projections.Core.Messages;
-using Grpc.Core;
-
-namespace EventStore.Projections.Core.Services.Grpc {
-	internal partial class ProjectionManagement {
-		private static readonly Operation DisableOperation = new Operation(Operations.Projections.Disable);
-		public override async Task<DisableResp> Disable(DisableReq request, ServerCallContext context) {
-			var disableSource = new TaskCompletionSource<bool>();
-
-			var options = request.Options;
-
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, DisableOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			var name = options.Name;
-			var runAs = new ProjectionManagementMessage.RunAs(user);
-
-			var envelope = new CallbackEnvelope(OnMessage);
-
-			_publisher.Publish(options.WriteCheckpoint
-				? new ProjectionManagementMessage.Command.Disable(envelope, name, runAs)
-				: (Message)new ProjectionManagementMessage.Command.Abort(envelope, name, runAs));
-
-			await disableSource.Task;
-
-			return new DisableResp();
-
-			void OnMessage(Message message) {
-				switch (message) {
-					case ProjectionManagementMessage.Updated:
-						disableSource.TrySetResult(true);
-						break;
-					case ProjectionManagementMessage.NotFound:
-						disableSource.TrySetException(ProjectionNotFound(name));
-						break;
-					default:
-						disableSource.TrySetException(UnknownMessage<ProjectionManagementMessage.Updated>(message));
-						break;
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Enable.cs b/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Enable.cs
deleted file mode 100644
index e4322b8ec12..00000000000
--- a/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Enable.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Messaging;
-using EventStore.Client.Projections;
-using EventStore.Core.Services.Transport.Grpc;
-using EventStore.Plugins.Authorization;
-using EventStore.Projections.Core.Messages;
-using Grpc.Core;
-
-namespace EventStore.Projections.Core.Services.Grpc {
-	internal partial class ProjectionManagement {
-		private static readonly Operation EnableOperation = new Operation(Operations.Projections.Enable);
-		public override async Task<EnableResp> Enable(EnableReq request, ServerCallContext context) {
-			var enableSource = new TaskCompletionSource<bool>();
-
-			var options = request.Options;
-
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, EnableOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			var name = options.Name;
-			var runAs = new ProjectionManagementMessage.RunAs(user);
-
-			var envelope = new CallbackEnvelope(OnMessage);
-
-			_publisher.Publish(new ProjectionManagementMessage.Command.Enable(envelope, name, runAs));
-
-			await enableSource.Task;
-
-			return new EnableResp();
-
-			void OnMessage(Message message) {
-				switch (message) {
-					case ProjectionManagementMessage.Updated:
-						enableSource.TrySetResult(true);
-						break;
-					case ProjectionManagementMessage.NotFound:
-						enableSource.TrySetException(ProjectionNotFound(name));
-						break;
-					default:
-						enableSource.TrySetException(UnknownMessage<ProjectionManagementMessage.Updated>(message));
-						break;
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Reset.cs b/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Reset.cs
deleted file mode 100644
index f2e32c30db7..00000000000
--- a/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Reset.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Messaging;
-using EventStore.Client.Projections;
-using EventStore.Core.Services.Transport.Grpc;
-using EventStore.Plugins.Authorization;
-using EventStore.Projections.Core.Messages;
-using Grpc.Core;
-
-namespace EventStore.Projections.Core.Services.Grpc {
-	internal partial class ProjectionManagement {
-		private static readonly Operation ResetOperation = new Operation(Operations.Projections.Create);
-		public override async Task<ResetResp> Reset(ResetReq request, ServerCallContext context) {
-			var resetSource = new TaskCompletionSource<bool>();
-
-			var options = request.Options;
-
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, ResetOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			var name = options.Name;
-			var runAs = new ProjectionManagementMessage.RunAs(user);
-
-			var envelope = new CallbackEnvelope(OnMessage);
-
-			_publisher.Publish(new ProjectionManagementMessage.Command.Reset(envelope, name, runAs));
-
-			await resetSource.Task;
-
-			return new ResetResp();
-
-			void OnMessage(Message message) {
-				switch (message) {
-					case ProjectionManagementMessage.Updated:
-						resetSource.TrySetResult(true);
-						break;
-					case ProjectionManagementMessage.NotFound:
-						resetSource.TrySetException(ProjectionNotFound(name));
-						break;
-					default:
-						resetSource.TrySetException(UnknownMessage<ProjectionManagementMessage.Updated>(message));
-						break;
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.RestartSubsystem.cs b/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.RestartSubsystem.cs
deleted file mode 100644
index b3b78e176b3..00000000000
--- a/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.RestartSubsystem.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.Threading.Tasks;
-using EventStore.Core.Messaging;
-using EventStore.Client;
-using EventStore.Core.Services.Transport.Grpc;
-using EventStore.Plugins.Authorization;
-using EventStore.Projections.Core.Messages;
-using Grpc.Core;
-
-namespace EventStore.Projections.Core.Services.Grpc {
-	internal partial class ProjectionManagement {
-		private static readonly Operation RestartOperation = new Operation(Operations.Projections.Restart);
-
-		public override async Task<Empty> RestartSubsystem(Empty empty, ServerCallContext context) {
-			var restart = new TaskCompletionSource<bool>();
-			var envelope = new CallbackEnvelope(OnMessage);
-
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, RestartOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-
-			_publisher.Publish(new ProjectionSubsystemMessage.RestartSubsystem(envelope));
-
-			await restart.Task;
-			return new Empty();
-
-			void OnMessage(Message message) {
-				switch (message) {
-					case ProjectionSubsystemMessage.SubsystemRestarting _:
-						restart.TrySetResult(true);
-						break;
-					case ProjectionSubsystemMessage.InvalidSubsystemRestart fail:
-						restart.TrySetException(InvalidSubsystemRestart(fail.SubsystemState));
-						break;
-					default:
-						restart.TrySetException(
-							UnknownMessage<ProjectionSubsystemMessage.SubsystemRestarting>(message));
-						break;
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Result.cs b/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Result.cs
deleted file mode 100644
index 66ef12c8228..00000000000
--- a/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Result.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using System.Text.Json;
-using System.Threading.Tasks;
-using EventStore.Core.Messaging;
-using EventStore.Client.Projections;
-using EventStore.Core.Services.Transport.Grpc;
-using EventStore.Plugins.Authorization;
-using EventStore.Projections.Core.Messages;
-using Google.Protobuf.WellKnownTypes;
-using Grpc.Core;
-
-namespace EventStore.Projections.Core.Services.Grpc {
-	internal partial class ProjectionManagement {
-		private static readonly Operation ResultOperation = new Operation(Operations.Projections.Result);
-		private static readonly Operation StateOperation = new Operation(Operations.Projections.State);
-		public override async Task<ResultResp> Result(ResultReq request, ServerCallContext context) {
-
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, ResultOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-
-			var resultSource = new TaskCompletionSource<Value>();
-			var options = request.Options;
-
-			var name = options.Name;
-			var partition = options.Partition ?? string.Empty;
-
-			var envelope = new CallbackEnvelope(OnMessage);
-
-			_publisher.Publish(new ProjectionManagementMessage.Command.GetResult(envelope, name, partition));
-
-			return new ResultResp {
-				Result = await resultSource.Task
-			};
-
-			void OnMessage(Message message) {
-				switch (message) {
-					case ProjectionManagementMessage.ProjectionResult result:
-						if (string.IsNullOrEmpty(result.Result)) {
-							resultSource.TrySetResult(new Value {
-								StructValue = new Struct()
-							});
-						} else {
-							var document = JsonDocument.Parse(result.Result);
-							resultSource.TrySetResult(GetProtoValue(document.RootElement));
-						}
-						break;
-					case ProjectionManagementMessage.NotFound:
-						resultSource.TrySetException(ProjectionNotFound(name));
-						break;
-					default:
-						resultSource.TrySetException(UnknownMessage<ProjectionManagementMessage.ProjectionResult>(message));
-						break;
-				}
-			}
-		}
-
-		public override async Task<StateResp> State(StateReq request, ServerCallContext context) {
-
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, StateOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-			var resultSource = new TaskCompletionSource<Value>();
-
-			var options = request.Options;
-
-			var name = options.Name;
-			var partition = options.Partition ?? string.Empty;
-
-			var envelope = new CallbackEnvelope(OnMessage);
-
-			_publisher.Publish(new ProjectionManagementMessage.Command.GetState(envelope, name, partition));
-
-			return new StateResp {
-				State = await resultSource.Task
-			};
-
-			void OnMessage(Message message) {
-				switch (message) {
-					case ProjectionManagementMessage.ProjectionState result:
-						if (string.IsNullOrEmpty(result.State)) {
-							resultSource.TrySetResult(new Value {
-								StructValue = new Struct()
-							});
-						} else {
-							var document = JsonDocument.Parse(result.State);
-							resultSource.TrySetResult(GetProtoValue(document.RootElement));
-						}
-						break;
-					case ProjectionManagementMessage.NotFound:
-						resultSource.TrySetException(ProjectionNotFound(name));
-						break;
-					default:
-						resultSource.TrySetException(UnknownMessage<ProjectionManagementMessage.ProjectionState>(message));
-						break;
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Statistics.cs b/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Statistics.cs
deleted file mode 100644
index dd5033d14cd..00000000000
--- a/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Statistics.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Messaging;
-using EventStore.Client.Projections;
-using EventStore.Core.Services.Transport.Grpc;
-using EventStore.Plugins.Authorization;
-using EventStore.Projections.Core.Messages;
-using Grpc.Core;
-using static EventStore.Client.Projections.StatisticsReq.Types.Options;
-
-namespace EventStore.Projections.Core.Services.Grpc {
-	internal partial class ProjectionManagement {
-		private static readonly Operation StatisticsOperation = new Operation(Operations.Projections.Statistics);
-		public override async Task Statistics(StatisticsReq request, IServerStreamWriter<StatisticsResp> responseStream,
-			ServerCallContext context) {
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, StatisticsOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-
-			var statsSource = new TaskCompletionSource<ProjectionStatistics[]>();
-
-			var options = request.Options;
-			var name = string.IsNullOrEmpty(options.Name) ? null : options.Name;
-			var mode = options.ModeCase switch {
-				ModeOneofCase.Continuous => ProjectionMode.Continuous,
-				ModeOneofCase.Transient => ProjectionMode.Transient,
-				ModeOneofCase.OneTime => ProjectionMode.OneTime,
-				_ => default(Nullable<ProjectionMode>)
-			};
-
-			var envelope = new CallbackEnvelope(OnMessage);
-
-			_publisher.Publish(new ProjectionManagementMessage.Command.GetStatistics(envelope, mode, name, true));
-
-			foreach (var stats in Array.ConvertAll(await statsSource.Task, s => new StatisticsResp.Types.Details {
-				BufferedEvents = s.BufferedEvents,
-				CheckpointStatus = s.CheckpointStatus,
-				CoreProcessingTime = s.CoreProcessingTime,
-				EffectiveName = s.EffectiveName,
-				Epoch = s.Epoch,
-				EventsProcessedAfterRestart = s.EventsProcessedAfterRestart,
-				LastCheckpoint = s.LastCheckpoint,
-				Mode = s.Mode.ToString(),
-				Name = s.Name,
-				ReadsInProgress = s.ReadsInProgress,
-				PartitionsCached = s.PartitionsCached,
-				Position = s.Position,
-				Progress = s.Progress,
-				StateReason = s.StateReason,
-				Status = s.Status,
-				Version = s.Version,
-				WritePendingEventsAfterCheckpoint = s.WritePendingEventsAfterCheckpoint,
-				WritePendingEventsBeforeCheckpoint = s.WritePendingEventsBeforeCheckpoint,
-				WritesInProgress = s.WritesInProgress
-			})) {
-				await responseStream.WriteAsync(new StatisticsResp { Details = stats });
-			}
-
-			void OnMessage(Message message) {
-				switch (message) {
-					case ProjectionManagementMessage.Statistics statistics:
-						statsSource.TrySetResult(statistics.Projections);
-						break;
-					case ProjectionManagementMessage.NotFound:
-						statsSource.TrySetException(ProjectionNotFound(name));
-						break;
-					default:
-						statsSource.TrySetException(UnknownMessage<ProjectionManagementMessage.Statistics>(message));
-						break;
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Update.cs b/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Update.cs
deleted file mode 100644
index 57f17fdef3b..00000000000
--- a/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.Update.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using EventStore.Core.Messaging;
-using EventStore.Client.Projections;
-using EventStore.Core.Services.Transport.Grpc;
-using EventStore.Plugins.Authorization;
-using EventStore.Projections.Core.Messages;
-using Grpc.Core;
-using static EventStore.Client.Projections.UpdateReq.Types.Options;
-
-namespace EventStore.Projections.Core.Services.Grpc {
-	internal partial class ProjectionManagement {
-		private static readonly Operation UpdateOperation = new Operation(Operations.Projections.Update);
-		public override async Task<UpdateResp> Update(UpdateReq request, ServerCallContext context) {
-			var updatedSource = new TaskCompletionSource<bool>();
-			var options = request.Options;
-
-			var user = context.GetHttpContext().User;
-			if (!await _authorizationProvider.CheckAccessAsync(user, UpdateOperation, context.CancellationToken)) {
-				throw RpcExceptions.AccessDenied();
-			}
-
-			var name = options.Name;
-			var query = options.Query;
-			bool? emitEnabled = (options.EmitOptionCase, options.EmitEnabled) switch {
-				(EmitOptionOneofCase.EmitEnabled, true) => true,
-				(EmitOptionOneofCase.EmitEnabled, false) => false,
-				(EmitOptionOneofCase.NoEmitOptions, _) => default,
-				_ => throw new InvalidOperationException()
-			};
-			var runAs = new ProjectionManagementMessage.RunAs(user);
-
-			var envelope = new CallbackEnvelope(OnMessage);
-			_publisher.Publish(
-				new ProjectionManagementMessage.Command.UpdateQuery(envelope, name, runAs, query,
-					emitEnabled));
-
-			await updatedSource.Task;
-
-			return new UpdateResp();
-
-			void OnMessage(Message message) {
-				switch (message) {
-					case ProjectionManagementMessage.Updated:
-						updatedSource.TrySetResult(true);
-						break;
-					case ProjectionManagementMessage.NotFound:
-						updatedSource.TrySetException(ProjectionNotFound(name));
-						break;
-					default:
-						updatedSource.TrySetException(UnknownMessage<ProjectionManagementMessage.Updated>(message));
-						break;
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.cs b/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.cs
deleted file mode 100644
index 37463436c7c..00000000000
--- a/src/EventStore.Projections.Core/Services/Grpc/ProjectionManagement.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using System.Linq;
-using System.Text.Json;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Transport.Grpc;
-using EventStore.Plugins.Authorization;
-using Google.Protobuf.WellKnownTypes;
-using Grpc.Core;
-
-namespace EventStore.Client.Projections {
-	partial class Projections {
-		partial class ProjectionsBase : ServiceBase {
-		}
-	}
-}
-
-namespace EventStore.Projections.Core.Services.Grpc {
-	internal partial class ProjectionManagement : EventStore.Client.Projections.Projections.ProjectionsBase {
-		private readonly IPublisher _publisher;
-		private readonly IAuthorizationProvider _authorizationProvider;
-
-		public ProjectionManagement(IPublisher publisher, IAuthorizationProvider authorizationProvider) {
-			if (publisher == null) throw new ArgumentNullException(nameof(publisher));
-			if (authorizationProvider == null) throw new ArgumentNullException(nameof(authorizationProvider));
-			_publisher = publisher;
-			_authorizationProvider = authorizationProvider;
-		}
-
-		private static Exception UnknownMessage<T>(Message message) where T : Message =>
-			new RpcException(
-				new Status(StatusCode.Unknown,
-					$"Envelope callback expected {typeof(T).Name}, received {message.GetType().Name} instead"));
-		private static Exception InvalidSubsystemRestart(string state) =>
-			new RpcException(
-				new Status(StatusCode.FailedPrecondition,
-					$"Projection Subsystem cannot be restarted as it is in the wrong state: {state}"));
-
-		private static Exception ProjectionNotFound(string name) =>
-			new RpcException(new Status(StatusCode.NotFound, $"Projection '{name}' not found"));
-
-		private static Value GetProtoValue(JsonElement element) =>
-			element.ValueKind switch {
-				JsonValueKind.Null => new Value {NullValue = NullValue.NullValue},
-				JsonValueKind.Array => new Value {
-					ListValue = new ListValue {
-						Values = {
-							element.EnumerateArray().Select(GetProtoValue)
-						}
-					}
-				},
-				JsonValueKind.False => new Value {BoolValue = false},
-				JsonValueKind.True => new Value {BoolValue = true},
-				JsonValueKind.String => new Value {StringValue = element.GetString()},
-				JsonValueKind.Number => new Value {NumberValue = element.GetDouble()},
-				JsonValueKind.Object => new Value {StructValue = GetProtoStruct(element)},
-				JsonValueKind.Undefined => new Value(),
-				_ => throw new InvalidOperationException()
-			};
-
-		private static Struct GetProtoStruct(JsonElement element) {
-			var structValue = new Struct();
-			foreach (var property in element.EnumerateObject()) {
-				structValue.Fields.Add(property.Name, GetProtoValue(property.Value));
-			}
-
-			return structValue;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Http/ProjectionStatisticsHttpFormatted.cs b/src/EventStore.Projections.Core/Services/Http/ProjectionStatisticsHttpFormatted.cs
deleted file mode 100644
index 34b5928f9fb..00000000000
--- a/src/EventStore.Projections.Core/Services/Http/ProjectionStatisticsHttpFormatted.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using System;
-
-namespace EventStore.Projections.Core.Services.Http {
-	public class ProjectionStatisticsHttpFormatted {
-		public ProjectionStatisticsHttpFormatted(ProjectionStatistics source, Func<string, string> makeAbsoluteUrl) {
-			this.Status = source.Status;
-			this.StateReason = source.StateReason;
-			this.Name = source.Name;
-			this.EffectiveName = source.Name;
-			this.Epoch = source.Epoch;
-			this.Version = source.Version;
-			this.Mode = source.Mode;
-			this.Position = (source.Position ?? (object)"").ToString();
-			this.Progress = source.Progress;
-			this.LastCheckpoint = source.LastCheckpoint;
-			this.EventsProcessedAfterRestart = source.EventsProcessedAfterRestart;
-			this.BufferedEvents = source.BufferedEvents;
-			this.CheckpointStatus = source.CheckpointStatus;
-			this.WritePendingEventsBeforeCheckpoint = source.WritePendingEventsBeforeCheckpoint;
-			this.WritePendingEventsAfterCheckpoint = source.WritePendingEventsAfterCheckpoint;
-			this.ReadsInProgress = source.ReadsInProgress;
-			this.WritesInProgress = source.WritesInProgress;
-			this.CoreProcessingTime = source.CoreProcessingTime;
-			this.PartitionsCached = source.PartitionsCached;
-			var statusLocalUrl = "/projection/" + source.Name;
-			this.StatusUrl = makeAbsoluteUrl(statusLocalUrl);
-			this.StateUrl = makeAbsoluteUrl(statusLocalUrl + "/state");
-			this.ResultUrl = makeAbsoluteUrl(statusLocalUrl + "/result");
-			this.QueryUrl = makeAbsoluteUrl(statusLocalUrl + "/query?config=yes");
-			if (!string.IsNullOrEmpty(source.ResultStreamName))
-				this.ResultStreamUrl = makeAbsoluteUrl("/streams/" + Uri.EscapeDataString(source.ResultStreamName));
-			this.DisableCommandUrl = makeAbsoluteUrl(statusLocalUrl + "/command/disable");
-			this.EnableCommandUrl = makeAbsoluteUrl(statusLocalUrl + "/command/enable");
-		}
-
-		public long CoreProcessingTime { get; set; }
-
-		public long Version { get; set; }
-
-		public long Epoch { get; set; }
-
-		public string EffectiveName { get; set; }
-
-		public int WritesInProgress { get; set; }
-
-		public int ReadsInProgress { get; set; }
-
-		public int PartitionsCached { get; set; }
-
-		public string Status { get; set; }
-
-		public string StateReason { get; set; }
-
-		public string Name { get; set; }
-
-		public ProjectionMode Mode { get; set; }
-
-		public string Position { get; set; }
-
-		public float Progress { get; set; }
-
-		public string LastCheckpoint { get; set; }
-
-		public int EventsProcessedAfterRestart { get; set; }
-
-		public string StatusUrl { get; set; }
-
-		public string StateUrl { get; set; }
-
-		public string ResultUrl { get; set; }
-
-		public string QueryUrl { get; set; }
-
-		public string ResultStreamUrl { get; set; }
-
-		public string EnableCommandUrl { get; set; }
-
-		public string DisableCommandUrl { get; set; }
-
-		public string CheckpointStatus { get; set; }
-
-		public int BufferedEvents { get; set; }
-
-		public int WritePendingEventsBeforeCheckpoint { get; set; }
-
-		public int WritePendingEventsAfterCheckpoint { get; set; }
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Http/ProjectionsController.cs b/src/EventStore.Projections.Core/Services/Http/ProjectionsController.cs
deleted file mode 100644
index 99f82250c8c..00000000000
--- a/src/EventStore.Projections.Core/Services/Http/ProjectionsController.cs
+++ /dev/null
@@ -1,663 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Core.Services.Transport.Http;
-using EventStore.Core.Services.Transport.Http.Controllers;
-using EventStore.Core.Util;
-using EventStore.Plugins.Authorization;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Messages.EventReaders.Feeds;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Transport.Http;
-using EventStore.Transport.Http.Codecs;
-using EventStore.Transport.Http.EntityManagement;
-using Newtonsoft.Json.Linq;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Projections.Core.Services.Http {
-	public class ProjectionsController : CommunicationController {
-		private static readonly ILogger Log = Serilog.Log.ForContext<ProjectionsController>();
-
-		private static readonly ICodec[] SupportedCodecs = {Codec.Json};
-
-		private readonly MiniWeb _clusterNodeJs;
-		private readonly MiniWeb _miniWebPrelude;
-		private readonly IHttpForwarder _httpForwarder;
-		private readonly IPublisher _networkSendQueue;
-
-		public ProjectionsController(IHttpForwarder httpForwarder, IPublisher publisher, IPublisher networkSendQueue)
-			: base(publisher) {
-			_httpForwarder = httpForwarder;
-
-			_clusterNodeJs = new MiniWeb("/web/es/js/projections", Locations.ProjectionsDirectory);
-
-			_networkSendQueue = networkSendQueue;
-			_miniWebPrelude = new MiniWeb("/web/es/js/projections/v8/Prelude", Locations.PreludeDirectory);
-		}
-
-		protected override void SubscribeCore(IHttpService service) {
-			_clusterNodeJs.RegisterControllerActions(service);
-
-			_miniWebPrelude.RegisterControllerActions(service);
-
-			HttpHelpers.RegisterRedirectAction(service, "/web/projections", "/web/projections.htm");
-
-			Register(service, "/projections",
-				HttpMethod.Get, OnProjections, Codec.NoCodecs, new ICodec[] {Codec.ManualEncoding}, new Operation(Operations.Projections.List));
-			Register(service, "/projections/restart",
-				HttpMethod.Post, OnProjectionsRestart, new ICodec[] { Codec.ManualEncoding}, SupportedCodecs, new Operation(Operations.Projections.Restart));
-			Register(service, "/projections/any",
-				HttpMethod.Get, OnProjectionsGetAny, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.List));
-			Register(service, "/projections/all-non-transient",
-				HttpMethod.Get, OnProjectionsGetAllNonTransient, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.List));
-			Register(service, "/projections/transient",
-				HttpMethod.Get, OnProjectionsGetTransient, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.List));
-			Register(service, "/projections/onetime",
-				HttpMethod.Get, OnProjectionsGetOneTime, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.List));
-			Register(service, "/projections/continuous",
-				HttpMethod.Get, OnProjectionsGetContinuous, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.List));
-			Register(service, "/projections/transient?name={name}&type={type}&enabled={enabled}",
-				HttpMethod.Post, OnProjectionsPostTransient, new ICodec[] {Codec.ManualEncoding}, SupportedCodecs, new Operation(Operations.Projections.Create).WithParameter(Operations.Projections.Parameters.Query));
-			Register(service,
-				"/projections/onetime?name={name}&type={type}&enabled={enabled}&checkpoints={checkpoints}&emit={emit}&trackemittedstreams={trackemittedstreams}",
-				HttpMethod.Post, OnProjectionsPostOneTime, new ICodec[] {Codec.ManualEncoding}, SupportedCodecs, new Operation(Operations.Projections.Create).WithParameter(Operations.Projections.Parameters.OneTime));
-			Register(service,
-				"/projections/continuous?name={name}&type={type}&enabled={enabled}&emit={emit}&trackemittedstreams={trackemittedstreams}",
-				HttpMethod.Post, OnProjectionsPostContinuous, new ICodec[] {Codec.ManualEncoding}, SupportedCodecs, new Operation(Operations.Projections.Create).WithParameter(Operations.Projections.Parameters.Continuous));
-			Register(service, "/projection/{name}/query?config={config}",
-				HttpMethod.Get, OnProjectionQueryGet, Codec.NoCodecs, new ICodec[] {Codec.ManualEncoding}, new Operation(Operations.Projections.Read));
-			Register(service, "/projection/{name}/query?type={type}&emit={emit}",
-				HttpMethod.Put, OnProjectionQueryPut, new ICodec[] {Codec.ManualEncoding}, SupportedCodecs, new Operation(Operations.Projections.Update)); /* source of transient projections can be set by a normal user. Authorization checks are done internally for non-transient projections. */
-			Register(service, "/projection/{name}",
-				HttpMethod.Get, OnProjectionStatusGet, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.Status));
-			Register(service,
-				"/projection/{name}?deleteStateStream={deleteStateStream}&deleteCheckpointStream={deleteCheckpointStream}&deleteEmittedStreams={deleteEmittedStreams}",
-				HttpMethod.Delete, OnProjectionDelete, Codec.NoCodecs, SupportedCodecs,new Operation(Operations.Projections.Delete));
-			Register(service, "/projection/{name}/statistics",
-				HttpMethod.Get, OnProjectionStatisticsGet, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.Statistics));
-			Register(service, "/projections/read-events",
-				HttpMethod.Post, OnProjectionsReadEvents, SupportedCodecs, SupportedCodecs, new Operation(Operations.Projections.DebugProjection));
-			Register(service, "/projection/{name}/state?partition={partition}",
-				HttpMethod.Get, OnProjectionStateGet, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.State));
-			Register(service, "/projection/{name}/result?partition={partition}",
-				HttpMethod.Get, OnProjectionResultGet, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.Result));
-			Register(service, "/projection/{name}/command/disable?enableRunAs={enableRunAs}",
-				HttpMethod.Post, OnProjectionCommandDisable, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.Disable)); /* transient projections can be stopped by a normal user. Authorization checks are done internally for non-transient projections.*/
-			Register(service, "/projection/{name}/command/enable?enableRunAs={enableRunAs}",
-				HttpMethod.Post, OnProjectionCommandEnable, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.Enable)); /* transient projections can be enabled by a normal user. Authorization checks are done internally for non-transient projections.*/
-			Register(service, "/projection/{name}/command/reset?enableRunAs={enableRunAs}",
-				HttpMethod.Post, OnProjectionCommandReset, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.Reset)); /* transient projections can be reset by a normal user (when debugging). Authorization checks are done internally for non-transient projections.*/
-			Register(service, "/projection/{name}/command/abort?enableRunAs={enableRunAs}",
-				HttpMethod.Post, OnProjectionCommandAbort, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.Abort)); /* transient projections can be aborted by a normal user. Authorization checks are done internally for non-transient projections.*/
-			Register(service, "/projection/{name}/config",
-				HttpMethod.Get, OnProjectionConfigGet, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.ReadConfiguration));
-			Register(service, "/projection/{name}/config",
-				HttpMethod.Put, OnProjectionConfigPut, SupportedCodecs, SupportedCodecs, new Operation(Operations.Projections.UpdateConfiguration));
-		}
-
-		private void OnProjections(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-
-			http.ReplyTextContent(
-				"Moved", 302, "Found", "text/plain",
-				new[] {
-					new KeyValuePair<string, string>(
-						"Location", new Uri(match.BaseUri, "/web/projections.htm").AbsoluteUri)
-				}, x => Log.Debug(x, "Reply Text Content Failed."));
-		}
-
-		private void OnProjectionsRestart(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-
-			var envelope = new SendToHttpEnvelope<ProjectionSubsystemMessage.SubsystemRestarting>(_networkSendQueue, http,
-				(e, message) => e.To("Restarting"),
-				(e, message) => {
-					switch (message) {
-						case ProjectionSubsystemMessage.SubsystemRestarting _:
-							return Configure.Ok(e.ContentType);
-						default:
-							return Configure.InternalServerError();
-					}
-				}, CreateErrorEnvelope(http)
-			);
-
-			Publish(new ProjectionSubsystemMessage.RestartSubsystem(envelope));
-		}
-
-		private void OnProjectionsGetAny(HttpEntityManager http, UriTemplateMatch match) {
-			ProjectionsGet(http, match, null);
-		}
-
-		private void OnProjectionsGetAllNonTransient(HttpEntityManager http, UriTemplateMatch match) {
-			ProjectionsGet(http, match, ProjectionMode.AllNonTransient);
-		}
-
-		private void OnProjectionsGetTransient(HttpEntityManager http, UriTemplateMatch match) {
-			ProjectionsGet(http, match, ProjectionMode.Transient);
-		}
-
-		private void OnProjectionsGetOneTime(HttpEntityManager http, UriTemplateMatch match) {
-			ProjectionsGet(http, match, ProjectionMode.OneTime);
-		}
-
-		private void OnProjectionsGetContinuous(HttpEntityManager http, UriTemplateMatch match) {
-			ProjectionsGet(http, match, ProjectionMode.Continuous);
-		}
-
-		private void OnProjectionsPostTransient(HttpEntityManager http, UriTemplateMatch match) {
-			ProjectionsPost(http, match, ProjectionMode.Transient, match.BoundVariables["name"]);
-		}
-
-		private void OnProjectionsPostOneTime(HttpEntityManager http, UriTemplateMatch match) {
-			ProjectionsPost(http, match, ProjectionMode.OneTime, match.BoundVariables["name"]);
-		}
-
-		private void OnProjectionsPostContinuous(HttpEntityManager http, UriTemplateMatch match) {
-			ProjectionsPost(http, match, ProjectionMode.Continuous, match.BoundVariables["name"]);
-		}
-
-		private void OnProjectionQueryGet(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-
-			SendToHttpEnvelope<ProjectionManagementMessage.ProjectionQuery> envelope;
-			var withConfig = IsOn(match, "config", false);
-			if (withConfig)
-				envelope = new SendToHttpEnvelope<ProjectionManagementMessage.ProjectionQuery>(
-					_networkSendQueue, http, QueryConfigFormatter, QueryConfigConfigurator, CreateErrorEnvelope(http));
-			else
-				envelope = new SendToHttpEnvelope<ProjectionManagementMessage.ProjectionQuery>(
-					_networkSendQueue, http, QueryFormatter, QueryConfigurator, CreateErrorEnvelope(http));
-			Publish(new ProjectionManagementMessage.Command.GetQuery(envelope, match.BoundVariables["name"],
-				GetRunAs(http, match)));
-		}
-
-		private void OnProjectionQueryPut(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-
-			var envelope = new SendToHttpEnvelope<ProjectionManagementMessage.Updated>(
-				_networkSendQueue, http, DefaultFormatter, OkResponseConfigurator, CreateErrorEnvelope(http));
-			var emitEnabled = IsOn(match, "emit", null);
-			http.ReadTextRequestAsync(
-				(o, s) =>
-					Publish(
-				new ProjectionManagementMessage.Command.UpdateQuery(
-					envelope, match.BoundVariables["name"], GetRunAs(http, match),
-					s, emitEnabled: emitEnabled)), Console.WriteLine);
-		}
-
-		private void OnProjectionConfigGet(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-
-			var envelope = new SendToHttpEnvelope<ProjectionManagementMessage.ProjectionConfig>(
-				_networkSendQueue, http, ProjectionConfigFormatter, ProjectionConfigConfigurator, CreateErrorEnvelope(http));
-			Publish(
-				new ProjectionManagementMessage.Command.GetConfig(
-					envelope, match.BoundVariables["name"], GetRunAs(http, match)));
-		}
-
-		private void OnProjectionConfigPut(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-
-			var envelope = new SendToHttpEnvelope<ProjectionManagementMessage.Updated>(
-				_networkSendQueue, http, DefaultFormatter, OkResponseConfigurator, CreateErrorEnvelope(http));
-			http.ReadTextRequestAsync(
-				(o, s) => {
-					var config = http.RequestCodec.From<ProjectionConfigData>(s);
-					if (config == null) {
-						SendBadRequest(o, "Failed to parse the projection config");
-						return;
-					}
-
-					if (config.ProjectionExecutionTimeout is not null && config.ProjectionExecutionTimeout <= 0) {
-						SendBadRequest(o, $"projectionExecutionTimeout should be positive. Found : {config.ProjectionExecutionTimeout}");
-						return;
-					}
-					var message = new ProjectionManagementMessage.Command.UpdateConfig(
-						envelope, match.BoundVariables["name"], config.EmitEnabled, config.TrackEmittedStreams,
-						config.CheckpointAfterMs, config.CheckpointHandledThreshold,
-						config.CheckpointUnhandledBytesThreshold, config.PendingEventsThreshold,
-						config.MaxWriteBatchLength, config.MaxAllowedWritesInFlight, GetRunAs(http, match), config.ProjectionExecutionTimeout);
-					Publish(message);
-				}, ex => Log.Debug("Failed to update projection configuration. Error: {e}", ex));
-		}
-
-		private void OnProjectionCommandDisable(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-
-			var envelope = new SendToHttpEnvelope<ProjectionManagementMessage.Updated>(
-				_networkSendQueue, http, DefaultFormatter, OkResponseConfigurator, CreateErrorEnvelope(http));
-			Publish(new ProjectionManagementMessage.Command.Disable(envelope, match.BoundVariables["name"],
-				GetRunAs(http, match)));
-		}
-
-		private void OnProjectionCommandEnable(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-
-			var envelope = new SendToHttpEnvelope<ProjectionManagementMessage.Updated>(
-				_networkSendQueue, http, DefaultFormatter, OkResponseConfigurator, CreateErrorEnvelope(http));
-			var name = match.BoundVariables["name"];
-			Publish(new ProjectionManagementMessage.Command.Enable(envelope, name, GetRunAs(http, match)));
-		}
-
-		private void OnProjectionCommandReset(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-
-			var envelope = new SendToHttpEnvelope<ProjectionManagementMessage.Updated>(
-				_networkSendQueue, http, DefaultFormatter, OkResponseConfigurator, CreateErrorEnvelope(http));
-			Publish(new ProjectionManagementMessage.Command.Reset(envelope, match.BoundVariables["name"],
-				GetRunAs(http, match)));
-		}
-
-		private void OnProjectionCommandAbort(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-
-			var envelope = new SendToHttpEnvelope<ProjectionManagementMessage.Updated>(
-				_networkSendQueue, http, DefaultFormatter, OkResponseConfigurator, CreateErrorEnvelope(http));
-			Publish(new ProjectionManagementMessage.Command.Abort(envelope, match.BoundVariables["name"],
-				GetRunAs(http, match)));
-		}
-
-		private void OnProjectionStatusGet(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-
-			var envelope =
-				new SendToHttpWithConversionEnvelope
-					<ProjectionManagementMessage.Statistics, ProjectionStatisticsHttpFormatted>(
-						_networkSendQueue, http, DefaultFormatter, OkNoCacheResponseConfigurator,
-						status => new ProjectionStatisticsHttpFormatted(status.Projections[0], s => MakeUrl(http, s)),
-						CreateErrorEnvelope(http));
-			Publish(new ProjectionManagementMessage.Command.GetStatistics(envelope, null, match.BoundVariables["name"],
-				true));
-		}
-
-		private void OnProjectionDelete(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-
-			var envelope = new SendToHttpEnvelope<ProjectionManagementMessage.Updated>(
-				_networkSendQueue, http, DefaultFormatter, OkResponseConfigurator, CreateErrorEnvelope(http));
-			Publish(
-				new ProjectionManagementMessage.Command.Delete(
-					envelope, match.BoundVariables["name"], GetRunAs(http, match),
-					IsOn(match, "deleteCheckpointStream", false),
-					IsOn(match, "deleteStateStream", false),
-					IsOn(match, "deleteEmittedStreams", false)));
-		}
-
-		private void OnProjectionStatisticsGet(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-
-			var envelope =
-				new SendToHttpWithConversionEnvelope
-					<ProjectionManagementMessage.Statistics, ProjectionsStatisticsHttpFormatted>(
-						_networkSendQueue, http, DefaultFormatter, OkNoCacheResponseConfigurator,
-						status => new ProjectionsStatisticsHttpFormatted(status, s => MakeUrl(http, s)),
-						CreateErrorEnvelope(http));
-			Publish(new ProjectionManagementMessage.Command.GetStatistics(envelope, null, match.BoundVariables["name"],
-				true));
-		}
-
-		private void OnProjectionStateGet(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-
-			var envelope = new SendToHttpEnvelope<ProjectionManagementMessage.ProjectionState>(
-				_networkSendQueue, http, StateFormatter, StateConfigurator, CreateErrorEnvelope(http));
-			Publish(
-				new ProjectionManagementMessage.Command.GetState(
-					envelope, match.BoundVariables["name"], match.BoundVariables["partition"] ?? ""));
-		}
-
-		private void OnProjectionResultGet(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-
-			var envelope = new SendToHttpEnvelope<ProjectionManagementMessage.ProjectionResult>(
-				_networkSendQueue, http, ResultFormatter, ResultConfigurator, CreateErrorEnvelope(http));
-			Publish(
-				new ProjectionManagementMessage.Command.GetResult(
-					envelope, match.BoundVariables["name"], match.BoundVariables["partition"] ?? ""));
-		}
-
-		public class ReadEventsBody {
-			public QuerySourcesDefinition Query { get; set; }
-			public JObject Position { get; set; }
-			public int? MaxEvents { get; set; }
-		}
-
-		private void OnProjectionsReadEvents(HttpEntityManager http, UriTemplateMatch match) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-
-			var envelope = new SendToHttpEnvelope<FeedReaderMessage.FeedPage>(
-				_networkSendQueue, http, FeedPageFormatter, FeedPageConfigurator, CreateErrorEnvelope(http));
-
-			http.ReadTextRequestAsync(
-				(o, body) => {
-					var bodyParsed = body.ParseJson<ReadEventsBody>();
-					var fromPosition = CheckpointTag.FromJson(
-						new JTokenReader(bodyParsed.Position), new ProjectionVersion(0, 0, 0));
-
-
-					Publish(
-						new FeedReaderMessage.ReadPage(
-							Guid.NewGuid(),
-							envelope,
-							http.User,
-							bodyParsed.Query,
-							fromPosition.Tag,
-							bodyParsed.MaxEvents ?? 10));
-				},
-				x => Log.Debug(x, "Read Request Body Failed."));
-		}
-
-		private void ProjectionsGet(HttpEntityManager http, UriTemplateMatch match, ProjectionMode? mode) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-
-			var envelope =
-				new SendToHttpWithConversionEnvelope<ProjectionManagementMessage.Statistics,
-					ProjectionsStatisticsHttpFormatted>(
-					_networkSendQueue, http, DefaultFormatter, OkNoCacheResponseConfigurator,
-					status => new ProjectionsStatisticsHttpFormatted(status, s => MakeUrl(http, s)),
-					CreateErrorEnvelope(http));
-			Publish(new ProjectionManagementMessage.Command.GetStatistics(envelope, mode, null, true));
-		}
-
-		private void ProjectionsPost(HttpEntityManager http, UriTemplateMatch match, ProjectionMode mode, string name) {
-			if (_httpForwarder.ForwardRequest(http))
-				return;
-
-			var envelope = new SendToHttpEnvelope<ProjectionManagementMessage.Updated>(
-				_networkSendQueue, http, DefaultFormatter, (codec, message) => {
-					var localPath = string.Format("/projection/{0}", message.Name);
-					var url = MakeUrl(http, localPath);
-					return new ResponseConfiguration(
-						201, "Created", codec.ContentType, codec.Encoding,
-						new KeyValuePair<string, string>("Location", url));
-				}, CreateErrorEnvelope(http));
-			http.ReadTextRequestAsync(
-				(o, s) => {
-					ProjectionManagementMessage.Command.Post postMessage;
-					string handlerType = match.BoundVariables["type"] ?? "JS";
-					bool emitEnabled = IsOn(match, "emit", false);
-					bool checkpointsEnabled = mode >= ProjectionMode.Continuous || IsOn(match, "checkpoints", false);
-					bool enabled = IsOn(match, "enabled", def: true);
-					bool trackEmittedStreams = IsOn(match, "trackemittedstreams", def: false);
-					if (!emitEnabled) {
-						trackEmittedStreams = false;
-					}
-
-					var runAs = GetRunAs(http, match);
-					if (mode <= ProjectionMode.OneTime && string.IsNullOrEmpty(name))
-						postMessage = new ProjectionManagementMessage.Command.Post(
-							envelope, mode, Guid.NewGuid().ToString("D"), runAs, handlerType, s, enabled: enabled,
-							checkpointsEnabled: checkpointsEnabled, emitEnabled: emitEnabled,
-							trackEmittedStreams: trackEmittedStreams, enableRunAs: true);
-					else
-						postMessage = new ProjectionManagementMessage.Command.Post(
-							envelope, mode, name, runAs, handlerType, s, enabled: enabled,
-							checkpointsEnabled: checkpointsEnabled, emitEnabled: emitEnabled,
-							trackEmittedStreams: trackEmittedStreams, enableRunAs: true);
-					Publish(postMessage);
-				}, x => Log.Debug(x, "Reply Text Body Failed."));
-		}
-
-		private ResponseConfiguration
-			StateConfigurator(ICodec codec, ProjectionManagementMessage.ProjectionState state) {
-			if (state.Exception != null)
-				return Configure.InternalServerError();
-			else
-				return state.Position != null
-					? Configure.Ok("application/json", Helper.UTF8NoBom, null, null, false,
-						new KeyValuePair<string, string>(SystemHeaders.ProjectionPosition,
-							state.Position.ToJsonString()))
-					: Configure.Ok("application/json", Helper.UTF8NoBom, null, null, false);
-		}
-
-		private ResponseConfiguration ResultConfigurator(ICodec codec,
-			ProjectionManagementMessage.ProjectionResult state) {
-			if (state.Exception != null)
-				return Configure.InternalServerError();
-			else
-				return state.Position != null
-					? Configure.Ok("application/json", Helper.UTF8NoBom, null, null, false,
-						new KeyValuePair<string, string>(SystemHeaders.ProjectionPosition,
-							state.Position.ToJsonString()))
-					: Configure.Ok("application/json", Helper.UTF8NoBom, null, null, false);
-		}
-
-		private ResponseConfiguration FeedPageConfigurator(ICodec codec, FeedReaderMessage.FeedPage page) {
-			if (page.Error == FeedReaderMessage.FeedPage.ErrorStatus.NotAuthorized)
-				return Configure.Unauthorized();
-			return Configure.Ok("application/json", Helper.UTF8NoBom, null, null, false);
-		}
-
-		private string StateFormatter(ICodec codec, ProjectionManagementMessage.ProjectionState state) {
-			if (state.Exception != null)
-				return state.Exception.ToString();
-			else
-				return state.State;
-		}
-
-		private string ResultFormatter(ICodec codec, ProjectionManagementMessage.ProjectionResult state) {
-			if (state.Exception != null)
-				return state.Exception.ToString();
-			else
-				return state.Result;
-		}
-
-		private string FeedPageFormatter(ICodec codec, FeedReaderMessage.FeedPage page) {
-			if (page.Error != FeedReaderMessage.FeedPage.ErrorStatus.Success)
-				return null;
-
-			return new {
-				CorrelationId = page.CorrelationId,
-				ReaderPosition = page.LastReaderPosition.ToJsonRaw(),
-				Events = (from e in page.Events
-					let resolvedEvent = e.ResolvedEvent
-					let isJson = resolvedEvent.IsJson
-					let data = isJson
-						? EatException(() => (object)(resolvedEvent.Data.ParseJson<JObject>()), resolvedEvent.Data)
-						: resolvedEvent.Data
-					let metadata = isJson
-						? EatException(() => (object)(resolvedEvent.Metadata.ParseJson<JObject>()),
-							resolvedEvent.Metadata)
-						: resolvedEvent.Metadata
-					let linkMetadata = isJson
-						? EatException(() => (object)(resolvedEvent.PositionMetadata.ParseJson<JObject>()),
-							resolvedEvent.PositionMetadata)
-						: resolvedEvent.PositionMetadata
-					select new {
-						EventStreamId = resolvedEvent.EventStreamId,
-						EventNumber = resolvedEvent.EventSequenceNumber,
-						EventType = resolvedEvent.EventType,
-						Data = data,
-						Metadata = metadata,
-						LinkMetadata = linkMetadata,
-						IsJson = isJson,
-						ReaderPosition = e.ReaderPosition.ToJsonRaw(),
-					}).ToArray()
-			}.ToJson();
-		}
-
-		private ResponseConfiguration
-			QueryConfigurator(ICodec codec, ProjectionManagementMessage.ProjectionQuery state) {
-			return Configure.Ok("application/javascript", Helper.UTF8NoBom, null, null, false);
-		}
-
-		private string QueryFormatter(ICodec codec, ProjectionManagementMessage.ProjectionQuery state) {
-			return state.Query;
-		}
-
-		private string QueryConfigFormatter(ICodec codec, ProjectionManagementMessage.ProjectionQuery state) {
-			return state.ToJson();
-		}
-
-		private ResponseConfiguration QueryConfigConfigurator(ICodec codec,
-			ProjectionManagementMessage.ProjectionQuery state) {
-			return Configure.Ok("application/json", Helper.UTF8NoBom, null, null, false);
-		}
-
-		private string ProjectionConfigFormatter(ICodec codec, ProjectionManagementMessage.ProjectionConfig config) {
-			return config.ToJson();
-		}
-
-		private ResponseConfiguration ProjectionConfigConfigurator(ICodec codec,
-			ProjectionManagementMessage.ProjectionConfig state) {
-			return Configure.Ok("application/json", Helper.UTF8NoBom, null, null, false);
-		}
-
-		private ResponseConfiguration OkResponseConfigurator<T>(ICodec codec, T message) {
-			return new ResponseConfiguration(200, "OK", codec.ContentType, Helper.UTF8NoBom);
-		}
-
-		private ResponseConfiguration OkNoCacheResponseConfigurator<T>(ICodec codec, T message) {
-			return Configure.Ok(codec.ContentType, codec.Encoding, null, null, false);
-		}
-
-		private IEnvelope CreateErrorEnvelope(HttpEntityManager http) {
-			return new SendToHttpEnvelope<ProjectionManagementMessage.NotFound>(
-				_networkSendQueue,
-				http,
-				NotFoundFormatter,
-				NotFoundConfigurator,
-				new SendToHttpEnvelope<ProjectionManagementMessage.NotAuthorized>(
-					_networkSendQueue,
-					http,
-					NotAuthorizedFormatter,
-					NotAuthorizedConfigurator,
-					new SendToHttpEnvelope<ProjectionManagementMessage.Conflict>(
-						_networkSendQueue,
-						http,
-						ConflictFormatter,
-						ConflictConfigurator,
-						new SendToHttpEnvelope<ProjectionManagementMessage.OperationFailed>(
-							_networkSendQueue,
-							http,
-							OperationFailedFormatter,
-							OperationFailedConfigurator,
-							new SendToHttpEnvelope<ProjectionSubsystemMessage.InvalidSubsystemRestart>(
-								_networkSendQueue,
-								http,
-								InvalidSubsystemRestartFormatter,
-								InvalidSubsystemRestartConfigurator,
-								null)))));
-		}
-
-		private ResponseConfiguration NotFoundConfigurator(ICodec codec, ProjectionManagementMessage.NotFound message) {
-			return new ResponseConfiguration(404, "Not Found", "text/plain", Helper.UTF8NoBom);
-		}
-
-		private string NotFoundFormatter(ICodec codec, ProjectionManagementMessage.NotFound message) {
-			return message.Reason;
-		}
-
-		private ResponseConfiguration NotAuthorizedConfigurator(
-			ICodec codec, ProjectionManagementMessage.NotAuthorized message) {
-			return new ResponseConfiguration(401, "Not Authorized", "text/plain", Encoding.UTF8);
-		}
-
-		private string NotAuthorizedFormatter(ICodec codec, ProjectionManagementMessage.NotAuthorized message) {
-			return message.Reason;
-		}
-
-		private ResponseConfiguration OperationFailedConfigurator(
-			ICodec codec, ProjectionManagementMessage.OperationFailed message) {
-			return new ResponseConfiguration(500, "Failed", "text/plain", Helper.UTF8NoBom);
-		}
-
-		private string OperationFailedFormatter(ICodec codec, ProjectionManagementMessage.OperationFailed message) {
-			return message.Reason;
-		}
-
-		private ResponseConfiguration ConflictConfigurator(
-			ICodec codec, ProjectionManagementMessage.OperationFailed message) {
-			return new ResponseConfiguration(409, "Conflict", "text/plain", Helper.UTF8NoBom);
-		}
-
-		private string ConflictFormatter(ICodec codec, ProjectionManagementMessage.OperationFailed message) {
-			return message.Reason;
-		}
-
-		private static string DefaultFormatter<T>(ICodec codec, T message) {
-			return codec.To(message);
-		}
-
-		private ResponseConfiguration InvalidSubsystemRestartConfigurator(ICodec codec, ProjectionSubsystemMessage.InvalidSubsystemRestart message) {
-			return new ResponseConfiguration(HttpStatusCode.BadRequest, "Bad Request", "text/plain",
-				Helper.UTF8NoBom);
-		}
-
-		private string InvalidSubsystemRestartFormatter(ICodec codec, ProjectionSubsystemMessage.InvalidSubsystemRestart message) {
-			return message.Reason;
-		}
-
-
-		private static ProjectionManagementMessage.RunAs GetRunAs(HttpEntityManager http, UriTemplateMatch match) {
-			return new ProjectionManagementMessage.RunAs(http.User);
-		}
-
-		private static bool? IsOn(UriTemplateMatch match, string option, bool? def) {
-			var rawValue = match.BoundVariables[option];
-			if (string.IsNullOrEmpty(rawValue))
-				return def;
-			var value = rawValue.ToLowerInvariant();
-			if ("yes" == value || "true" == value || "1" == value)
-				return true;
-			if ("no" == value || "false" == value || "0" == value)
-				return false;
-			//TODO: throw?
-			return def;
-		}
-
-		private static bool IsOn(UriTemplateMatch match, string option, bool def) {
-			var rawValue = match.BoundVariables[option];
-			if (string.IsNullOrEmpty(rawValue))
-				return def;
-			var value = rawValue.ToLowerInvariant();
-			return "yes" == value || "true" == value || "1" == value;
-		}
-
-		public static T EatException<T>(Func<T> func, T defaultValue = default(T)) {
-			Ensure.NotNull(func, "func");
-			try {
-				return func();
-			} catch (Exception) {
-				return defaultValue;
-			}
-		}
-
-		public class ProjectionConfigData {
-			public bool EmitEnabled { get; set; }
-			public bool TrackEmittedStreams { get; set; }
-			public int CheckpointAfterMs { get; set; }
-			public int CheckpointHandledThreshold { get; set; }
-			public int CheckpointUnhandledBytesThreshold { get; set; }
-			public int PendingEventsThreshold { get; set; }
-			public int MaxWriteBatchLength { get; set; }
-			public int MaxAllowedWritesInFlight { get; set; }
-
-			public int? ProjectionExecutionTimeout { get; set; }
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Http/ProjectionsStatisticsHttpFormatted.cs b/src/EventStore.Projections.Core/Services/Http/ProjectionsStatisticsHttpFormatted.cs
deleted file mode 100644
index 0006d6a5299..00000000000
--- a/src/EventStore.Projections.Core/Services/Http/ProjectionsStatisticsHttpFormatted.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Services.Http {
-	public class ProjectionsStatisticsHttpFormatted {
-		private readonly ProjectionStatisticsHttpFormatted[] _projections;
-
-		public ProjectionsStatisticsHttpFormatted(
-			ProjectionManagementMessage.Statistics source, Func<string, string> makeAbsouteUrl) {
-			_projections =
-				source.Projections.Select(v => new ProjectionStatisticsHttpFormatted(v, makeAbsouteUrl)).ToArray();
-		}
-
-		public ProjectionStatisticsHttpFormatted[] Projections {
-			get { return _projections; }
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/IProjectionStateHandler.cs b/src/EventStore.Projections.Core/Services/IProjectionStateHandler.cs
deleted file mode 100644
index 3f63782c5da..00000000000
--- a/src/EventStore.Projections.Core/Services/IProjectionStateHandler.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Services {
-	public interface ISourceDefinitionSource {
-		IQuerySources GetSourceDefinition();
-	}
-
-
-	public interface IProjectionStateHandler : IDisposable, ISourceDefinitionSource {
-		void Load(string state);
-		void LoadShared(string state);
-		void Initialize();
-		void InitializeShared();
-
-		/// <summary>
-		/// Get state partition from the event
-		/// </summary>
-		/// <returns>partition name</returns>
-		string GetStatePartition(CheckpointTag eventPosition, string category, ResolvedEvent data);
-
-		/// <summary>
-		/// Processes event and updates internal state if necessary.
-		/// </summary>
-		/// <returns>true - if event was processed (new state must be returned) </returns>
-		bool ProcessEvent(
-			string partition, CheckpointTag eventPosition, string category, ResolvedEvent @event, out string newState,
-			out string newSharedState, out EmittedEventEnvelope[] emittedEvents);
-
-		/// <summary>
-		/// Processes partition created notification and updates internal state if necessary.
-		/// </summary>
-		/// <param name="partition"></param>
-		/// <param name="createPosition"></param>
-		/// <param name="event"></param>
-		/// <param name="emittedEvents"></param>
-		/// <returns>true - if notification was processed (new state must be returned)</returns>
-		bool ProcessPartitionCreated(
-			string partition, CheckpointTag createPosition, ResolvedEvent @event,
-			out EmittedEventEnvelope[] emittedEvents);
-
-		/// <summary>
-		/// Processes partition deleted notification and updates internal state if necessary.
-		/// </summary>
-		/// <returns>true - if event was processed (new state must be returned) </returns>
-		bool ProcessPartitionDeleted(string partition, CheckpointTag deletePosition, out string newState);
-
-		/// <summary>
-		/// Transforms current state into a projection result.  Should not call any emit/linkTo etc
-		/// </summary>
-		/// <returns>result JSON or NULL if current state has been skipped</returns>
-		string TransformStateToResult();
-	}
-
-	public interface IProjectionCheckpointHandler {
-		void ProcessNewCheckpoint(CheckpointTag checkpointPosition, out EmittedEventEnvelope[] emittedEvents);
-	}
-
-	public static class ProjectionStateHandlerTestExtensions {
-		public static bool ProcessEvent(
-			this IProjectionStateHandler self, string partition, CheckpointTag eventPosition, string streamId,
-			string eventType, string category, Guid eventId, long eventSequenceNumber, string metadata, string data,
-			out string state, out EmittedEventEnvelope[] emittedEvents, bool isJson = true) {
-			string ignoredSharedState;
-			return self.ProcessEvent(
-				partition, eventPosition, category,
-				new ResolvedEvent(
-					streamId, eventSequenceNumber, streamId, eventSequenceNumber, false, new TFPos(0, -1), eventId,
-					eventType, isJson, data, metadata), out state, out ignoredSharedState, out emittedEvents);
-		}
-
-		public static bool ProcessEvent(
-			this IProjectionStateHandler self, string partition, CheckpointTag eventPosition, string streamId,
-			string eventType, string category, Guid eventId, long eventSequenceNumber, string metadata, string data,
-			out string state, out string sharedState, out EmittedEventEnvelope[] emittedEvents, bool isJson = true) {
-			return self.ProcessEvent(
-				partition, eventPosition, category,
-				new ResolvedEvent(
-					streamId, eventSequenceNumber, streamId, eventSequenceNumber, false, new TFPos(0, -1), eventId,
-					eventType, isJson, data, metadata), out state, out sharedState, out emittedEvents);
-		}
-
-		public static string GetNativeHandlerName(this Type handlerType) {
-			return "native:" + handlerType.Namespace + "." + handlerType.Name;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Interpreted/JintProjectionStateHandler.cs b/src/EventStore.Projections.Core/Services/Interpreted/JintProjectionStateHandler.cs
deleted file mode 100644
index c7e7c334aa1..00000000000
--- a/src/EventStore.Projections.Core/Services/Interpreted/JintProjectionStateHandler.cs
+++ /dev/null
@@ -1,1227 +0,0 @@
-using System;
-using System.Buffers;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Text.Json;
-using EventStore.Core.Services;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using Jint;
-using Jint.Native;
-using Jint.Native.Array;
-using Jint.Native.Function;
-using Jint.Native.Json;
-using Jint.Native.Object;
-using Jint.Runtime;
-using Jint.Runtime.Descriptors;
-using Jint.Runtime.Interop;
-using ILogger = Serilog.ILogger;
-
-
-#nullable enable
-namespace EventStore.Projections.Core.Services.Interpreted {
-	public class JintProjectionStateHandler : IProjectionStateHandler {
-		private readonly ILogger _logger = Serilog.Log.ForContext<JintProjectionStateHandler>();
-		private readonly bool _enableContentTypeValidation;
-		private static readonly Stopwatch _sw = Stopwatch.StartNew();
-		private readonly Engine _engine;
-		private readonly SourceDefinitionBuilder _definitionBuilder;
-		private readonly List<EmittedEventEnvelope> _emitted;
-		private readonly InterpreterRuntime _interpreterRuntime;
-		private readonly JsonParser _parser;
-		private CheckpointTag? _currentPosition;
-
-		private JsValue _state;
-		private JsValue _sharedState;
-
-		public JintProjectionStateHandler(string source, bool enableContentTypeValidation, TimeSpan compilationTimeout, TimeSpan executionTimeout) {
-
-			_enableContentTypeValidation = enableContentTypeValidation;
-			_definitionBuilder = new SourceDefinitionBuilder();
-			_definitionBuilder.NoWhen();
-			_definitionBuilder.AllEvents();
-			TimeConstraint timeConstraint = new(compilationTimeout, executionTimeout);
-			_engine = new Engine(opts => opts.Constraint(timeConstraint).DisableStringCompilation());
-			_state = JsValue.Undefined;
-			_sharedState = JsValue.Undefined;
-			_interpreterRuntime = new InterpreterRuntime(_engine, _definitionBuilder);
-			_engine.Global.FastAddProperty("log", new ClrFunction(_engine, "log", Log), false, false, false);
-
-			timeConstraint.Compiling();
-			_engine.Execute(source);
-			timeConstraint.Executing();
-			_parser = _interpreterRuntime.SwitchToExecutionMode();
-
-
-			_engine.Global.FastAddProperty("emit", new ClrFunction(_engine, "emit", Emit, 4), true, false, true);
-			_engine.Global.FastAddProperty("linkTo", new ClrFunction(_engine, "linkTo", LinkTo, 3), true, false, true);
-			_engine.Global.FastAddProperty("linkStreamTo", new ClrFunction(_engine, "linkStreamTo", LinkStreamTo, 3), true, false, true);
-			_engine.Global.FastAddProperty("copyTo", new ClrFunction(_engine, "copyTo", CopyTo, 3), true, false, true);
-			_emitted = new List<EmittedEventEnvelope>();
-		}
-
-		public void Dispose() {
-			_engine.Dispose();
-		}
-
-		public IQuerySources GetSourceDefinition() {
-			_engine.Constraints.Reset();
-			return _definitionBuilder.Build();
-		}
-
-		public void Load(string? state) {
-			_engine.Constraints.Reset();
-			if (state != null) {
-				var jsValue = _parser.Parse(state);
-				LoadCurrentState(jsValue);
-			} else {
-				LoadCurrentState(JsValue.Null);
-			}
-		}
-
-		private void LoadCurrentState(JsValue jsValue) {
-			if (_definitionBuilder.IsBiState) {
-				if (_state == null || _state == JsValue.Undefined)
-					_state = new JsArray(_engine, new[]
-					{
-						JsValue.Undefined, JsValue.Undefined
-					});
-
-				_state.AsArray()[0] = jsValue;
-			} else {
-				_state = jsValue;
-			}
-		}
-
-		public void LoadShared(string? state) {
-			_engine.Constraints.Reset();
-			if (state != null) {
-				var jsValue = _parser.Parse(state);
-				LoadCurrentSharedState(jsValue);
-			} else {
-				LoadCurrentSharedState(JsValue.Null);
-			}
-		}
-
-		private void LoadCurrentSharedState(JsValue jsValue) {
-			if (_definitionBuilder.IsBiState) {
-				if (_state == null || _state == JsValue.Undefined)
-					_state = new JsArray(_engine, new[]
-					{
-						JsValue.Undefined, JsValue.Undefined,
-					});
-
-				_state.AsArray()[1] = jsValue;
-			} else {
-				_state = jsValue;
-			}
-		}
-
-		public void Initialize() {
-			_engine.Constraints.Reset();
-			var state = _interpreterRuntime.InitializeState();
-			LoadCurrentState(state);
-
-		}
-
-		public void InitializeShared() {
-			_engine.Constraints.Reset();
-			_sharedState = _interpreterRuntime.InitializeSharedState();
-			LoadCurrentSharedState(_sharedState);
-		}
-
-		public string? GetStatePartition(CheckpointTag eventPosition, string category, ResolvedEvent data) {
-			_currentPosition = eventPosition;
-			_engine.Constraints.Reset();
-			var envelope = CreateEnvelope("", data, category);
-			var partition = _interpreterRuntime.GetPartition(envelope);
-			if (partition == JsValue.Null || partition == JsValue.Undefined || !(partition.IsString() || partition.IsNumber()))
-				return null;
-
-			return partition.IsNumber() ? partition.AsNumber().ToString() : partition.AsString();
-		}
-
-		public bool ProcessPartitionCreated(string partition, CheckpointTag createPosition, ResolvedEvent @event,
-			out EmittedEventEnvelope[]? emittedEvents) {
-			_engine.Constraints.Reset();
-			_currentPosition = createPosition;
-			var envelope = CreateEnvelope(partition, @event, "");
-			_interpreterRuntime.HandleCreated(_state, envelope);
-
-			emittedEvents = _emitted.Count > 0 ? _emitted.ToArray() : null;
-			_emitted.Clear();
-			return true;
-		}
-
-		public bool ProcessPartitionDeleted(string partition, CheckpointTag deletePosition, out string? newState) {
-			_engine.Constraints.Reset();
-			_currentPosition = deletePosition;
-
-			_interpreterRuntime.HandleDeleted(_state, partition, false);
-			newState = ConvertToStringHandlingNulls(_state);
-			return true;
-		}
-
-		public string? TransformStateToResult() {
-			_engine.Constraints.Reset();
-			var result = _interpreterRuntime.TransformStateToResult(_state);
-			if (result == JsValue.Null || result == JsValue.Undefined)
-				return null;
-			return Serialize(result);
-		}
-
-		public bool ProcessEvent(string partition, CheckpointTag eventPosition, string category, ResolvedEvent @event,
-			out string? newState, out string? newSharedState, out EmittedEventEnvelope[]? emittedEvents) {
-			_currentPosition = eventPosition;
-			_engine.Constraints.Reset();
-			if ((@event.IsJson && string.IsNullOrWhiteSpace(@event.Data)) ||
-			    (!_enableContentTypeValidation && !@event.IsJson && string.IsNullOrEmpty(@event.Data))) {
-				PrepareOutput(out newState, out newSharedState, out emittedEvents);
-				return true;
-			}
-
-			var envelope = CreateEnvelope(partition, @event, category);
-			_state = _interpreterRuntime.Handle(_state, envelope);
-			PrepareOutput(out newState, out newSharedState, out emittedEvents);
-			return true;
-		}
-
-		private void PrepareOutput(out string? newState, out string? newSharedState, out EmittedEventEnvelope[]? emittedEvents) {
-			emittedEvents = _emitted.Count > 0 ? _emitted.ToArray() : null;
-			_emitted.Clear();
-			if (_definitionBuilder.IsBiState && _state.IsArray()) {
-				var arr = _state.AsArray();
-				if (arr.TryGetValue(0, out var state)) {
-					if (_state.IsString()) {
-						newState = _state.AsString();
-					} else {
-						newState = ConvertToStringHandlingNulls(state);
-					}
-				} else {
-					newState = "";
-				}
-
-				if (arr.TryGetValue(1, out var sharedState)) {
-					newSharedState = ConvertToStringHandlingNulls(sharedState);
-				} else {
-					newSharedState = null;
-				}
-
-			} else if (_state.IsString()) {
-				newState = _state.AsString();
-				newSharedState = null;
-			} else {
-				newState = ConvertToStringHandlingNulls(_state);
-				newSharedState = null;
-			}
-		}
-
-		private string? ConvertToStringHandlingNulls(JsValue value) {
-			if (value.IsNull() || value.IsUndefined())
-				return null;
-			return Serialize(value);
-		}
-
-		JsValue Emit(JsValue thisValue, JsValue[] parameters) {
-			if (parameters.Length < 3)
-				throw new ArgumentException("invalid number of parameters");
-
-			string stream = EnsureNonNullStringValue(parameters.At(0), "streamId");
-			var eventType = EnsureNonNullStringValue(parameters.At(1), "eventName");
-			var eventBody = EnsureNonNullObjectValue(parameters.At(2), "eventBody");
-
-			if (parameters.Length == 4 && !parameters.At(3).IsObject())
-#pragma warning disable CA2208 // ReSharper disable once NotResolvedInText
-				throw new ArgumentException("object expected", "metadata");
-#pragma warning restore CA2208
-
-			var data = Serialize(eventBody);
-			ExtraMetaData? metadata = null;
-			if (parameters.Length == 4) {
-				var md = parameters.At(3).AsObject();
-				var d = new Dictionary<string, string?>();
-				foreach (var kvp in md.GetOwnProperties()) {
-					if (kvp.Value.Value.Type is Types.Empty or Types.Undefined)
-						continue;
-					d.Add(kvp.Key.AsString(), Serialize(kvp.Value.Value));
-				}
-
-				metadata = new ExtraMetaData(d);
-			}
-			_emitted.Add(new EmittedEventEnvelope(new EmittedDataEvent(stream, Guid.NewGuid(), eventType, true, data, metadata, _currentPosition, null)));
-			return JsValue.Undefined;
-		}
-
-		private static ObjectInstance EnsureNonNullObjectValue(JsValue parameter, string parameterName) {
-			if (parameter == JsValue.Null || parameter == JsValue.Undefined)
-				throw new ArgumentNullException(parameterName);
-			if (!parameter.IsObject())
-				throw new ArgumentException("object expected", parameterName);
-			return parameter.AsObject();
-		}
-
-		private static string EnsureNonNullStringValue(JsValue parameter, string parameterName) {
-			if (parameter != JsValue.Null &&
-				parameter.IsString() &&
-				(parameter.AsString() is { } value &&
-				 !string.IsNullOrWhiteSpace(value)))
-				return value;
-
-			if (parameter == JsValue.Null || parameter == JsValue.Undefined || parameter.IsString())
-				throw new ArgumentNullException(parameterName);
-
-			throw new ArgumentException("string expected", parameterName);
-		}
-
-		string? AsString(JsValue? value, bool formatForRaw) {
-			return value switch {
-				JsBoolean b => b.AsBoolean() ? "true" : "false",
-				JsString s => formatForRaw ? $"\"{s.AsString()}\"" : s.AsString(),
-				JsNumber n => n.AsNumber().ToString(CultureInfo.InvariantCulture),
-				JsNull => null,
-				JsUndefined => null, { } v => Serialize(value),
-				_ => null
-			};
-		}
-
-		JsValue LinkTo(JsValue thisValue, JsValue[] parameters) {
-			if (parameters.Length != 2 && parameters.Length != 3)
-				throw new ArgumentException("wrong number of parameters");
-			var stream = EnsureNonNullStringValue(parameters.At(0), "streamId");
-			var @event = EnsureNonNullObjectValue(parameters.At(1), "event");
-
-			if (!@event.TryGetValue("sequenceNumber", out var numberValue) | !@event.TryGetValue("streamId", out var sourceValue) || !numberValue.IsNumber()
-				 || !sourceValue.IsString()) {
-				throw new Exception($"Invalid link to event {numberValue}@{sourceValue}");
-			}
-
-			var number = (long)numberValue.AsNumber();
-			var source = sourceValue.AsString();
-			ExtraMetaData? metadata = null;
-			if (parameters.Length == 3) {
-				var md = EnsureNonNullObjectValue(parameters.At(2), "metaData");
-				var d = new Dictionary<string, string?>();
-				foreach (var kvp in md.GetOwnProperties()) {
-					d.Add(kvp.Key.AsString(), AsString(kvp.Value.Value, true));
-				}
-				metadata = new ExtraMetaData(d);
-			}
-
-			_emitted.Add(new EmittedEventEnvelope(
-				new EmittedDataEvent(stream, Guid.NewGuid(), SystemEventTypes.LinkTo, false, $"{number}@{source}", metadata, _currentPosition, null)));
-			return JsValue.Undefined;
-		}
-
-		JsValue LinkStreamTo(JsValue thisValue, JsValue[] parameters) {
-
-			var stream = EnsureNonNullStringValue(parameters.At(0), "streamId");
-			var linkedStreamId = EnsureNonNullStringValue(parameters.At(1), "linkedStreamId");
-			if (parameters.Length == 3) {
-
-			}
-
-			ExtraMetaData? metadata = null;
-			if (parameters.Length == 3) {
-				var md = parameters.At(4).AsObject();
-				var d = new Dictionary<string, string?>();
-				foreach (var kvp in md.GetOwnProperties()) {
-					d.Add(kvp.Key.AsString(), AsString(kvp.Value.Value, true));
-				}
-				metadata = new ExtraMetaData(d);
-			}
-			_emitted.Add(new EmittedEventEnvelope(
-				new EmittedDataEvent(stream, Guid.NewGuid(), SystemEventTypes.StreamReference, false, linkedStreamId, metadata, _currentPosition, null)));
-			return JsValue.Undefined;
-		}
-
-		JsValue CopyTo(JsValue thisValue, JsValue[] parameters) {
-			return JsValue.Undefined;
-		}
-
-		void Log(string message) {
-			_logger.Debug(message, Array.Empty<object>());
-		}
-
-		private JsValue Log(JsValue thisValue, JsValue[] parameters) {
-			if (parameters.Length == 0)
-				return JsValue.Undefined;
-			if (parameters.Length == 1) {
-				var p0 = parameters.At(0);
-				if (p0 != null && p0.IsPrimitive())
-					Log(p0.ToString());
-				if (p0 is ObjectInstance oi)
-					Log(Serialize(oi));
-				return JsValue.Undefined;
-			}
-
-
-			if (parameters.Length > 1) {
-				var sb = new StringBuilder();
-				for (int i = 0; i < parameters.Length; i++) {
-					if (i > 1)
-						sb.Append(" ,");
-					var p = parameters.At(i);
-					if (p != null && p.IsPrimitive())
-						Log(p.ToString());
-					if (p is ObjectInstance oi)
-						sb.Append(Serialize(oi));
-				}
-
-				Log(sb.ToString());
-			}
-			return JsValue.Undefined;
-		}
-
-		class TimeConstraint : Constraint {
-			private readonly TimeSpan _compilationTimeout;
-			private readonly TimeSpan _executionTimeout;
-			private TimeSpan _start;
-			private TimeSpan _timeout;
-			private bool _executing;
-
-			public TimeConstraint(TimeSpan compilationTimeout, TimeSpan executionTimeout) {
-				_compilationTimeout = compilationTimeout;
-				_executionTimeout = executionTimeout;
-				_timeout = _compilationTimeout;
-			}
-
-			public void Compiling() {
-				_timeout = _compilationTimeout;
-				_executing = false;
-			}
-
-			public void Executing() {
-				_timeout = _executionTimeout;
-				_executing = true;
-
-			}
-			public override void Reset() {
-				_start = _sw.Elapsed;
-			}
-
-			public override void Check() {
-				if (_sw.Elapsed - _start >= _timeout) {
-					if (Debugger.IsAttached)
-						return;
-					var action = _executing ? "execute" : "compile";
-					throw new TimeoutException($"Projection script took too long to {action} (took: {_sw.Elapsed - _start:c}, allowed: {_timeout:c}");
-				}
-			}
-		}
-
-		class InterpreterRuntime : ObjectInstance {
-
-			private readonly Dictionary<string, ScriptFunction> _handlers;
-			private readonly List<(TransformType, ScriptFunction)> _transforms;
-			private readonly List<ScriptFunction> _createdHandlers;
-			private ScriptFunction? _init;
-			private ScriptFunction? _initShared;
-			private ScriptFunction? _any;
-			private ScriptFunction? _deleted;
-			private ScriptFunction? _partitionFunction;
-
-			private readonly JsValue _whenInstance;
-			private readonly JsValue _partitionByInstance;
-			private readonly JsValue _outputStateInstance;
-			private readonly JsValue _foreachStreamInstance;
-			private readonly JsValue _transformByInstance;
-			private readonly JsValue _filterByInstance;
-			private readonly JsValue _outputToInstance;
-			private readonly JsValue _definesStateTransformInstance;
-
-			private readonly SourceDefinitionBuilder _definitionBuilder;
-			private readonly JsonParser _parser;
-
-			private static readonly Dictionary<string, Action<InterpreterRuntime>> _possibleProperties = new Dictionary<string, Action<InterpreterRuntime>>() {
-				["when"] = i => i.FastAddProperty("when", i._whenInstance, true, false, true),
-				["partitionBy"] = i => i.FastAddProperty("partitionBy", i._partitionByInstance, true, false, true),
-				["outputState"] = i => i.FastAddProperty("outputState", i._outputStateInstance, true, false, true),
-				["foreachStream"] = i => i.FastAddProperty("foreachStream", i._foreachStreamInstance, true, false, true),
-				["transformBy"] = i => i.FastAddProperty("transformBy", i._transformByInstance, true, false, true),
-				["filterBy"] = i => i.FastAddProperty("filterBy", i._filterByInstance, true, false, true),
-				["outputTo"] = i => i.FastAddProperty("outputTo", i._outputToInstance, true, false, true),
-				["$defines_state_transform"] = i => i.FastAddProperty("$defines_state_transform", i._definesStateTransformInstance, true, false, true),
-			};
-
-			private static readonly Dictionary<string, string[]> _availableProperties = new Dictionary<string, string[]>() {
-				["fromStream"] = new[] { "when", "partitionBy", "outputState" },
-				["fromAll"] = new[] { "when", "partitionBy", "outputState", "foreachStream" },
-				["fromStreams"] = new[] { "when", "partitionBy", "outputState" },
-				["fromCategory"] = new[] { "when", "partitionBy", "outputState", "foreachStream" },
-				["when"] = new[] { "transformBy", "filterBy", "outputState", "outputTo", "$defines_state_transform" },
-				["foreachStream"] = new[] { "when" },
-				["outputState"] = new[] { "transformBy", "filterBy", "outputTo" },
-				["partitionBy"] = new[] { "when" },
-				["transformBy"] = new[] { "transformBy", "filterBy", "outputState", "outputTo" },
-				["filterBy"] = new[] { "transformBy", "filterBy", "outputState", "outputTo" },
-				["outputTo"] = Array.Empty<string>(),
-				["execution"] = Array.Empty<string>()
-			};
-
-			private static readonly Dictionary<string, Action<SourceDefinitionBuilder, JsValue>> _setters =
-				new Dictionary<string, Action<SourceDefinitionBuilder, JsValue>>(StringComparer.OrdinalIgnoreCase) {
-					{"$includeLinks", (options, value) => options.SetIncludeLinks(value.IsBoolean()? value.AsBoolean() : throw new Exception("Invalid value"))},
-					{"reorderEvents", (options, value) => options.SetReorderEvents(value.IsBoolean()? value.AsBoolean(): throw new Exception("Invalid value"))},
-					{"processingLag", (options, value) => options.SetProcessingLag(value.IsNumber() ? (int)value.AsNumber() : throw new Exception("Invalid value"))},
-					{"resultStreamName", (options, value) => options.SetResultStreamNameOption(value.IsString() ? value.AsString() : throw new Exception("Invalid value"))},
-					{"biState", (options, value) => options.SetIsBiState(value.IsBoolean()? value.AsBoolean() : throw new Exception("Invalid value"))},
-				};
-
-			private readonly List<string> _definitionFunctions;
-
-			public InterpreterRuntime(Engine engine, SourceDefinitionBuilder builder) : base(engine) {
-
-				_definitionBuilder = builder;
-				_handlers = new Dictionary<string, ScriptFunction>(StringComparer.Ordinal);
-				_createdHandlers = new List<ScriptFunction>();
-				_transforms = new List<(TransformType, ScriptFunction)>();
-				_parser = new JsonParser(engine);
-				_definitionFunctions = new List<string>();
-				AddDefinitionFunction("options", SetOptions, 1);
-				AddDefinitionFunction("fromStream", FromStream, 1);
-				AddDefinitionFunction("fromCategory", FromCategory, 4);
-				AddDefinitionFunction("fromCategories", FromCategory, 4);
-				AddDefinitionFunction("fromAll", FromAll, 0);
-				AddDefinitionFunction("fromStreams", FromStreams, 1);
-				AddDefinitionFunction("on_event", OnEvent, 1);
-				AddDefinitionFunction("on_any", OnAny, 1);
-				_whenInstance = new ClrFunction(engine, "when", When, 1);
-				_partitionByInstance = new ClrFunction(engine, "partitionBy", PartitionBy, 1);
-				_outputStateInstance = new ClrFunction(engine, "outputState", OutputState, 1);
-				_foreachStreamInstance = new ClrFunction(engine, "foreachStream", ForEachStream, 1);
-				_transformByInstance = new ClrFunction(engine, "transformBy", TransformBy, 1);
-				_filterByInstance = new ClrFunction(engine, "filterBy", FilterBy, 1);
-				_outputToInstance = new ClrFunction(engine, "outputTo", OutputTo, 1);
-				_definesStateTransformInstance = new ClrFunction(engine, "$defines_state_transform", DefinesStateTransform);
-
-			}
-
-			private void AddDefinitionFunction(string name, Func<JsValue, JsValue[], JsValue> func, int length) {
-				_definitionFunctions.Add(name);
-				_engine.Global.FastAddProperty(name, new ClrFunction(_engine, name, func, length), true, false, true);
-			}
-
-			private JsValue FromStream(JsValue _, JsValue[] parameters) {
-				var stream = parameters.At(0);
-				if (stream is not JsString)
-					throw new ArgumentException("stream");
-				_definitionBuilder.FromStream(stream.AsString());
-				RestrictProperties("fromStream");
-
-				return this;
-			}
-
-			private JsValue FromCategory(JsValue thisValue, JsValue[] parameters) {
-				if (parameters.Length == 0)
-					return this;
-				if (parameters.Length == 1 && parameters.At(0).IsArray()) {
-					foreach (var cat in parameters.At(0).AsArray()) {
-						if (cat is not JsString s) {
-							throw new ArgumentException("categories");
-						}
-						_definitionBuilder.FromStream($"$ce-{s.AsString()}");
-					}
-				} else if (parameters.Length > 1) {
-					foreach (var cat in parameters) {
-						if (cat is not JsString s) {
-							throw new ArgumentException("categories");
-						}
-						_definitionBuilder.FromStream($"$ce-{s.AsString()}");
-					}
-				} else {
-					var p0 = parameters.At(0);
-					if (p0 is not JsString s)
-						throw new ArgumentException("category");
-					_definitionBuilder.FromCategory(s.AsString());
-				}
-
-				RestrictProperties("fromCategory");
-
-				return this;
-			}
-
-			private JsValue When(JsValue thisValue, JsValue[] parameters) {
-				if (parameters.At(0) is ObjectInstance handlers) {
-					foreach (var kvp in handlers.GetOwnProperties()) {
-						if (kvp.Key.IsString() && kvp.Value.Value is ScriptFunction) {
-							var key = kvp.Key.AsString();
-							AddHandler(key, (ScriptFunction)kvp.Value.Value);
-						}
-					}
-				}
-				_definitionBuilder.SetDefinesFold();
-				RestrictProperties("when");
-				return this;
-			}
-
-			private JsValue PartitionBy(JsValue thisValue, JsValue[] parameters) {
-				if (parameters.At(0) is ScriptFunction partitionFunction) {
-					_definitionBuilder.SetByCustomPartitions();
-
-
-					_partitionFunction = partitionFunction;
-					RestrictProperties("partitionBy");
-					return this;
-				}
-
-				throw new ArgumentException("partitionBy");
-			}
-
-			private JsValue ForEachStream(JsValue thisValue, JsValue[] parameters) {
-				_definitionBuilder.SetByStream();
-				RestrictProperties("foreachStream");
-				return this;
-			}
-
-			private JsValue OutputState(JsValue thisValue, JsValue[] parameters) {
-				RestrictProperties("outputState");
-				_definitionBuilder.SetOutputState();
-				return this;
-			}
-
-			private JsValue OutputTo(JsValue thisValue, JsValue[] parameters) {
-				if (parameters.Length != 1 && parameters.Length != 2)
-					throw new ArgumentException("invalid number of parameters");
-				if (!parameters.At(0).IsString())
-#pragma warning disable CA2208 // ReSharper disable NotResolvedInText
-					throw new ArgumentException("expected string value", "resultStream");
-				if (parameters.Length == 2 && !parameters.At(1).IsString())
-					throw new ArgumentException("expected string value", "partitionResultStreamPattern");
-#pragma warning restore CA2208 // ReSharper restore NotResolvedInText
-				_definitionBuilder.SetResultStreamNameOption(parameters.At(0).AsString());
-				if (parameters.Length == 2)
-					_definitionBuilder.SetPartitionResultStreamNamePatternOption(parameters.At(1).AsString());
-				RestrictProperties("outputTo");
-				return this;
-			}
-
-			private JsValue DefinesStateTransform(JsValue thisValue, JsValue[] parameters) {
-				_definitionBuilder.SetDefinesStateTransform();
-				_definitionBuilder.SetOutputState();
-				return Undefined;
-			}
-
-			private JsValue FilterBy(JsValue thisValue, JsValue[] parameters) {
-				if (parameters.At(0) is ScriptFunction fi) {
-					_definitionBuilder.SetDefinesStateTransform();
-					_definitionBuilder.SetOutputState();
-					_transforms.Add((TransformType.Filter, fi));
-					RestrictProperties("filterBy");
-					return this;
-				}
-
-				throw new ArgumentException("expected function");
-			}
-
-			private JsValue TransformBy(JsValue thisValue, JsValue[] parameters) {
-				if (parameters.At(0) is ScriptFunction fi) {
-					_definitionBuilder.SetDefinesStateTransform();
-					_definitionBuilder.SetOutputState();
-					_transforms.Add((TransformType.Transform, fi));
-					RestrictProperties("transformBy");
-					return this;
-				}
-
-				throw new ArgumentException("expected function");
-			}
-
-			private JsValue OnEvent(JsValue thisValue, JsValue[] parameters) {
-				if (parameters.Length != 2)
-					throw new ArgumentException("invalid number of parameters");
-				var eventName = parameters.At(0);
-				var handler = parameters.At(1);
-				if (!eventName.IsString())
-					throw new ArgumentException("eventName");
-				if (handler is not ScriptFunction fi)
-					throw new ArgumentException("eventHandler");
-				AddHandler(eventName.AsString(), fi);
-				return Undefined;
-			}
-
-			private JsValue OnAny(JsValue thisValue, JsValue[] parameters) {
-				if (parameters.Length != 1)
-					throw new ArgumentException("invalid number of parameters");
-				if (parameters.At(0) is not ScriptFunction fi)
-					throw new ArgumentException("eventHandler");
-				AddHandler("$any", fi);
-				return Undefined;
-			}
-
-			private void AddHandler(string name, ScriptFunction handler) {
-				switch (name) {
-					case "$init":
-						_init = handler;
-						break;
-					case "$initShared":
-						_definitionBuilder.SetIsBiState(true);
-						_initShared = handler;
-						break;
-					case "$any":
-						_any = handler;
-						_definitionBuilder.AllEvents();
-						break;
-					case "$created":
-						_createdHandlers.Add(handler);
-						break;
-					case "$deleted" when !_definitionBuilder.IsBiState:
-						_definitionBuilder.SetHandlesStreamDeletedNotifications();
-						_deleted = handler;
-						break;
-					case "$deleted" when _definitionBuilder.IsBiState:
-						throw new Exception("Cannot handle deletes in bi-state projections");
-					default:
-						_definitionBuilder.NotAllEvents();
-						_definitionBuilder.IncludeEvent(name);
-						_handlers.Add(name, handler);
-						break;
-				}
-			}
-
-			private void RestrictProperties(string state) {
-				var allowed = _availableProperties[state];
-				var current = GetOwnPropertyKeys();
-				foreach (var p in current) {
-					if (!allowed.Contains(p.AsString())) {
-						RemoveOwnProperty(p);
-					}
-				}
-
-				foreach (var p in allowed) {
-					if (!HasOwnProperty(p)) {
-						_possibleProperties[p](this);
-					}
-				}
-			}
-
-			public JsValue InitializeState() {
-				return _init == null ? new JsObject(Engine) : _init.Call();
-			}
-
-			public JsValue InitializeSharedState() {
-				return _initShared == null ? new JsObject(Engine) : _initShared.Call();
-			}
-
-			public JsValue Handle(JsValue state, EventEnvelope eventEnvelope) {
-				JsValue newState;
-				if (_handlers.TryGetValue(eventEnvelope.EventType, out var handler)) {
-					newState = handler.Call(state, FromObject(Engine, eventEnvelope));
-				} else if (_any != null) {
-					newState = _any.Call(state, FromObject(Engine, eventEnvelope));
-				} else {
-					newState = eventEnvelope.BodyRaw;
-				}
-				return newState == Undefined ? state : newState;
-			}
-
-			public JsValue TransformStateToResult(JsValue state) {
-				foreach (var (type, transform) in _transforms) {
-					switch (type) {
-						case TransformType.Transform:
-							state = transform.Call(state);
-							break;
-						case TransformType.Filter: {
-								var result = transform.Call(state);
-								if (!(result.IsBoolean() && result.AsBoolean()) || result == Null || result == Undefined) {
-									return Null;
-								}
-								break;
-							}
-						case TransformType.None:
-							throw new InvalidOperationException("Unknown transform type");
-					}
-
-					if (state == Null || state == Undefined)
-						return Null;
-				}
-
-				return state;
-			}
-
-			JsValue FromAll(JsValue _, JsValue[] __) {
-				_definitionBuilder.FromAll();
-				RestrictProperties("fromAll");
-				return this;
-			}
-
-			JsValue FromStreams(JsValue _, JsValue[] parameters) {
-				IEnumerator<JsValue>? streams = null;
-				try {
-					streams = parameters.At(0).IsArray() ? parameters.At(0).AsArray().GetEnumerator() : parameters.AsEnumerable().GetEnumerator();
-					while (streams.MoveNext()) {
-						if (!streams.Current.IsString())
-							throw new ArgumentException("streams");
-						_definitionBuilder.FromStream(streams.Current.AsString());
-					}
-				} finally {
-					streams?.Dispose();
-				}
-
-				RestrictProperties("fromStreams");
-				return this;
-			}
-
-
-			JsValue SetOptions(JsValue thisValue, JsValue[] parameters) {
-				var p0 = parameters.At(0);
-				if (p0 is ObjectInstance opts) {
-					foreach (var kvp in opts.GetOwnProperties()) {
-						if (_setters.TryGetValue(kvp.Key.AsString(), out var setter)) {
-							setter(_definitionBuilder, kvp.Value.Value);
-						} else {
-							throw new Exception($"Unrecognized option: {kvp.Key}");
-						}
-					}
-				}
-
-				return Undefined;
-			}
-
-			public JsValue GetPartition(EventEnvelope envelope) {
-				if (_partitionFunction != null)
-					return _partitionFunction.Call(envelope);
-				return Null;
-			}
-
-			public void HandleCreated(JsValue state, EventEnvelope envelope) {
-				for (int i = 0; i < _createdHandlers.Count; i++) {
-					_createdHandlers[i].Call(Undefined, new[] { state, envelope });
-				}
-			}
-
-			enum TransformType {
-				None,
-				Filter,
-				Transform
-			}
-
-			public JsonParser SwitchToExecutionMode() {
-				RestrictProperties("execution");
-				foreach (var globalProp in _definitionFunctions) {
-					_engine.Global.RemoveOwnProperty(globalProp);
-				}
-				return _parser;
-			}
-
-
-			public void HandleDeleted(JsValue state, string partition, bool isSoftDelete) {
-				if (_deleted != null) {
-					_deleted.Call(this, new JsValue[] { state, Null, partition, isSoftDelete });
-				}
-			}
-		}
-
-		EventEnvelope CreateEnvelope(string partition, ResolvedEvent @event, string category) {
-			var envelope = new EventEnvelope(_engine, _parser, this);
-			envelope.Partition = partition;
-			envelope.BodyRaw = @event.Data;
-			envelope.MetadataRaw = @event.Metadata;
-			envelope.StreamId = @event.EventStreamId;
-			envelope.EventId = @event.EventId.ToString("D");
-			envelope.EventType = @event.EventType;
-			envelope.LinkMetadataRaw = @event.PositionMetadata;
-			envelope.IsJson = @event.IsJson;
-			envelope.Category = category;
-			envelope.SequenceNumber = @event.EventSequenceNumber;
-			return envelope;
-		}
-		sealed class EventEnvelope : ObjectInstance {
-			private readonly JsonParser _parser;
-			private readonly JintProjectionStateHandler _parent;
-
-			public string StreamId {
-				set => SetOwnProperty("streamId", new PropertyDescriptor(value, false, true, false));
-			}
-			public long SequenceNumber {
-				set => SetOwnProperty("sequenceNumber", new PropertyDescriptor(value, false, true, false));
-			}
-
-			public string EventType {
-				get => _parent.AsString(Get("eventType"), false) ?? "";
-				set => SetOwnProperty("eventType", new PropertyDescriptor(value, false, true, false));
-			}
-
-			public JsValue Body {
-				get {
-					if (TryGetValue("body", out var value) && value is ObjectInstance oi)
-						return oi;
-					if (EnsureBody(out JsValue objectInstance))
-						return objectInstance;
-
-					return Undefined;
-				}
-			}
-
-			private bool EnsureBody(out JsValue objectInstance) {
-				if (IsJson && TryGetValue("bodyRaw", out var raw) && raw is not JsUndefined) {
-					var body = raw.IsNull() ? raw : _parser.Parse(raw.AsString());
-					var pd = new PropertyDescriptor(body, false, true, false);
-					SetOwnProperty("body", pd);
-					SetOwnProperty("data", pd);
-					objectInstance = (ObjectInstance)body;
-					return true;
-				}
-
-				objectInstance = Undefined;
-				return false;
-			}
-
-			public bool IsJson {
-				get => Get("isJson").AsBoolean();
-				set => SetOwnProperty("isJson", new PropertyDescriptor(value, false, true, false));
-			}
-
-			public string? BodyRaw {
-				get => _parent.AsString(Get("bodyRaw"), false);
-				set => SetOwnProperty("bodyRaw", new PropertyDescriptor(value, false, true, false));
-			}
-
-			private JsValue Metadata {
-				get {
-					if (TryGetValue("metadata", out var value) && value is ObjectInstance oi)
-						return oi;
-					if (EnsureMetadata(out value))
-						return value;
-
-					return Undefined;
-				}
-			}
-
-			private bool EnsureMetadata(out JsValue value) {
-				if (TryGetValue("metadataRaw", out var raw) && raw is not JsUndefined) {
-					var metadata = raw.IsNull() ? raw : _parser.Parse(raw.AsString());
-					SetOwnProperty("metadata", new PropertyDescriptor(metadata, false, true, false));
-					{
-						value = metadata;
-						return true;
-					}
-				}
-
-				value = Undefined;
-				return false;
-			}
-
-			public string MetadataRaw {
-				set => FastSetProperty("metadataRaw", new PropertyDescriptor(value, false, true, false));
-			}
-
-			private JsValue LinkMetadata {
-				get {
-					if (TryGetValue("linkMetadata", out var value) && value is ObjectInstance oi)
-						return oi;
-					if (EnsureLinkMetadata(out value))
-						return value;
-
-					return Undefined;
-				}
-			}
-
-			private bool EnsureLinkMetadata(out JsValue value) {
-				if (TryGetValue("linkMetadataRaw", out var raw) && raw is not JsUndefined) {
-					var metadata = raw.IsNull() ? raw : _parser.Parse(raw.AsString());
-					SetOwnProperty("linkMetadata", new PropertyDescriptor(metadata, false, true, false));
-					{
-						value = metadata;
-						return true;
-					}
-				}
-
-				value = Undefined;
-				return false;
-			}
-
-			public string LinkMetadataRaw {
-				set => SetOwnProperty("linkMetadataRaw", new PropertyDescriptor(value, false, true, false));
-			}
-
-			public string Partition {
-				set => SetOwnProperty("partition", new PropertyDescriptor(value, false, true, false));
-			}
-
-			public string Category {
-				set => SetOwnProperty("category", new PropertyDescriptor(value, false, true, false));
-			}
-
-			public string EventId {
-				set => SetOwnProperty("eventId", new PropertyDescriptor(value, false, true, false));
-			}
-
-			public EventEnvelope(Engine engine, JsonParser parser, JintProjectionStateHandler parent) : base(engine) {
-				_parser = parser;
-				_parent = parent;
-			}
-
-			public override JsValue Get(JsValue property, JsValue receiver) {
-				if (property == "body" || property == "data") {
-					return Body;
-				}
-
-				if (property == "metadata") {
-					return Metadata;
-				}
-
-				if (property == "linkMetadata") {
-					return LinkMetadata;
-				}
-				return base.Get(property, receiver);
-			}
-
-			public override List<JsValue> GetOwnPropertyKeys(Types types = Types.String | Types.Symbol) {
-				var list = base.GetOwnPropertyKeys(types);
-				return list;
-			}
-
-			public override IEnumerable<KeyValuePair<JsValue, PropertyDescriptor>> GetOwnProperties() {
-				if (!HasOwnProperty("body")) {
-					EnsureBody(out _);
-				}
-
-				if (!HasOwnProperty("metadata")) {
-					EnsureMetadata(out _);
-				}
-
-				if (!HasOwnProperty("linkMetadata")) {
-					EnsureLinkMetadata(out _);
-				}
-
-				var list = base.GetOwnProperties();
-
-				return list;
-			}
-		}
-
-		private readonly Serializer _serializer = new Serializer();
-		public string Serialize(JsValue value) {
-			var serialized = _serializer.Serialize(value);
-			return Encoding.UTF8.GetString(serialized.Span);
-		}
-
-		private class Serializer {
-			private readonly WriteState[] _iterators;
-			private readonly ArrayBufferWriter<byte> _bufferWriter;
-			private readonly Utf8JsonWriter _writer;
-			private readonly Dictionary<string, JsonEncodedText> _knownPropertyNames;
-			private int _depth;
-
-			public Serializer() {
-				_iterators = new WriteState[64];
-				_bufferWriter = new ArrayBufferWriter<byte>(1024 * 1024);
-				_writer = new Utf8JsonWriter(
-					_bufferWriter,
-					new JsonWriterOptions {
-						Indented = false,
-						SkipValidation = true,
-						Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping
-					});
-				_knownPropertyNames = new Dictionary<string, JsonEncodedText>();
-			}
-
-			public ReadOnlyMemory<byte> Serialize(JsValue value) {
-				_depth = 0;
-				_bufferWriter.Clear();
-				_writer.Reset();
-
-				if (value is JsArray array) {
-					_iterators[_depth] = new WriteState(array);
-				} else if (value is ObjectInstance oi) {
-					_iterators[_depth] = new WriteState(oi);
-				} else {
-					_iterators[_depth] = new WriteState(value);
-				}
-				ref var current = ref _iterators[0];
-
-				while (current.Write(_writer, ref _depth, _iterators, _knownPropertyNames)) {
-					current = ref _iterators[_depth];
-				}
-				_writer.Flush();
-				return _bufferWriter.WrittenMemory;
-
-			}
-
-			struct WriteState {
-				private enum Type {
-					Complete,
-					Array,
-					Object,
-					Primitive,
-				}
-
-				private static readonly IEnumerator<KeyValuePair<JsValue, PropertyDescriptor>> _emptyIterator =
-					new NoopIterator();
-
-				class NoopIterator : IEnumerator<KeyValuePair<JsValue, PropertyDescriptor>> {
-					public KeyValuePair<JsValue, PropertyDescriptor> Current => default;
-
-					object? IEnumerator.Current => default;
-
-					public void Dispose() {
-					}
-
-					public bool MoveNext() {
-						return false;
-					}
-
-					public void Reset() {
-					}
-				}
-
-				public WriteState(JsArray instance) {
-					_position = -1;
-					_length = (int)instance.Length;
-					_instance = instance;
-					_type = Type.Array;
-					_started = false;
-					_iterator = _emptyIterator;
-				}
-
-				public WriteState(ObjectInstance instance) {
-					_position = -1;
-					_length = -1;
-					_instance = JsValue.Null;
-					_type = Type.Object;
-					_started = false;
-					_iterator = instance.GetOwnProperties().GetEnumerator();
-				}
-
-				public WriteState(JsValue instance) {
-					if (instance.Type == Types.Object)
-						throw new ArgumentException("Primitive overload called for object instance");
-					_position = -1;
-					_length = -1;
-					_instance = instance;
-					_type = Type.Primitive;
-					_started = false;
-					_iterator = _emptyIterator;
-				}
-
-				private readonly JsValue _instance;
-				private readonly IEnumerator<KeyValuePair<JsValue, PropertyDescriptor>> _iterator;
-				private readonly Type _type;
-				private readonly int _length;
-				private int _position;
-				private bool _started;
-
-				[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-				public bool Write(
-					Utf8JsonWriter writer,
-					ref int depth,
-					WriteState[] writeStates,
-					Dictionary<string, JsonEncodedText> knownPropertyNames) {
-
-					switch (_type) {
-						case Type.Array:
-							if (_position == -1) {
-								writer.WriteStartArray();
-								_position++;
-							}
-							var instance = (JsArray)_instance;
-							for (; _position < _length; _position++) {
-								var value = instance[(uint)_position];
-								if (value.Type == Types.Object) {
-									if (value is JsArray ai) {
-										writeStates[++depth] = new WriteState(ai);
-									} else {
-										writeStates[++depth] = new WriteState(value.AsObject());
-									}
-									_position++;
-									return true;
-								}
-								SerializePrimitive(value, writer);
-							}
-							writer.WriteEndArray();
-							break;
-						case Type.Object:
-							if (!_started) {
-								writer.WriteStartObject();
-								_started = true;
-							}
-							while (_iterator.MoveNext()) {
-								var (name, propertyDescriptor) = _iterator.Current;
-								var value = propertyDescriptor.Value;
-								if (value.Type == Types.Undefined)
-									continue;
-
-								WriteMaybeCachedPropertyName(name.AsString(), knownPropertyNames, writer);
-								if (value.Type == Types.Object) {
-									if (value is JsArray ai) {
-										writeStates[++depth] = new WriteState(ai);
-									} else {
-										writeStates[++depth] = new WriteState(value.AsObject());
-									}
-									_position++;
-									return true;
-								} else {
-									SerializePrimitive(value, writer);
-								}
-
-							}
-
-							writer.WriteEndObject();
-							break;
-						case Type.Primitive:
-							SerializePrimitive(_instance, writer);
-							break;
-					}
-					writeStates[depth] = default;
-					depth--;
-					return depth >= 0;
-				}
-			}
-
-			[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-			private static void WriteMaybeCachedPropertyName(string name, Dictionary<string, JsonEncodedText> knownPropertyNames, Utf8JsonWriter writer) {
-				if (!knownPropertyNames.TryGetValue(name, out var propertyName)) {
-					propertyName = JsonEncodedText.Encode(name);
-					if (knownPropertyNames.Count < 1000) {
-						knownPropertyNames.Add(name, propertyName);
-					}
-				}
-				writer.WritePropertyName(propertyName);
-			}
-
-			[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-			static void SerializePrimitive(JsValue value, Utf8JsonWriter writer) {
-
-				switch (value.Type) {
-					case Types.Null:
-					case Types.Undefined:
-					case Types.Empty:
-						writer.WriteNullValue();
-						break;
-					case Types.Boolean:
-						if (ReferenceEquals(value, JsBoolean.False))
-							writer.WriteBooleanValue(false);
-						else
-							writer.WriteBooleanValue(true);
-						break;
-					case Types.Number:
-						writer.WriteNumberValue(value.AsNumber());
-						break;
-					case Types.BigInt:
-						writer.WriteStringValue(value.ToString());
-						break;
-					case Types.String:
-						writer.WriteStringValue(value.AsString());
-						break;
-					default:
-						throw new Exception($"Cannot serialize {value.Type} as primitive");
-				}
-			}
-		}
-	}
-}
-
-internal static class ObjectInstanceExtensions {
-	public static void FastAddProperty(this ObjectInstance target, string name, JsValue value, bool writable, bool enumerable, bool configurable) {
-		target.FastSetProperty(name, new PropertyDescriptor(value, writable, enumerable, configurable));
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Management/ManagedProjection.cs b/src/EventStore.Projections.Core/Services/Management/ManagedProjection.cs
deleted file mode 100644
index 1b10dacb4a9..00000000000
--- a/src/EventStore.Projections.Core/Services/Management/ManagedProjection.cs
+++ /dev/null
@@ -1,1113 +0,0 @@
-using System;
-using System.Linq;
-using System.Security.Claims;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Management.ManagedProjectionStates;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Utils;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
-using System.Threading;
-using EventStore.Core;
-using EventStore.Core.Helpers;
-using EventStore.Projections.Core.Common;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using FastSerialization;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Projections.Core.Services.Management {
-
-	public static class PersistedStateExtensions {
-		public static Boolean CheckpointStreamNeedsDeleted(this ManagedProjection.PersistedState persistedState) {
-			return persistedState.DeleteCheckpointStream && persistedState.CheckpointsDisabled.GetValueOrDefault() == false;
-		}
-
-		public static Boolean EmitStreamNeedsDeleted(this ManagedProjection.PersistedState persistedState) {
-			return (persistedState.DeleteEmittedStreams && persistedState.EmitEnabled.GetValueOrDefault());
-		}
-	}
-
-		/// <summary>
-		/// managed projection controls start/stop/create/update/delete lifecycle of the projection.
-		/// </summary>
-		public class ManagedProjection : IDisposable {
-		public class PersistedState {
-			public string HandlerType { get; set; }
-			public string Query { get; set; }
-			public ProjectionMode Mode { get; set; }
-			public bool Enabled { get; set; }
-			public bool Deleted { get; set; }
-			public bool Deleting { get; set; }
-			public bool DeleteEmittedStreams { get; set; }
-			public bool DeleteCheckpointStream { get; set; }
-			public bool DeleteStateStream { get; set; }
-			public int NumberOfPrequisitesMetForDeletion;
-			public string Message { get; set; }
-
-			public ProjectionSourceDefinition SourceDefinition { get; set; }
-			public bool? EmitEnabled { get; set; }
-			public bool? CreateTempStreams { get; set; }
-			public bool? CheckpointsDisabled { get; set; }
-			public bool? TrackEmittedStreams { get; set; }
-			public long? Epoch { get; set; }
-			public long? Version { get; set; }
-			public SerializedRunAs RunAs { get; set; }
-			public int CheckpointHandledThreshold { get; set; }
-			public int CheckpointAfterMs { get; set; }
-			public int CheckpointUnhandledBytesThreshold { get; set; }
-			public int PendingEventsThreshold { get; set; }
-			public int MaxWriteBatchLength { get; set; }
-			public int MaxAllowedWritesInFlight { get; set; }
-			public int? ProjectionSubsystemVersion { get; set; }
-
-			public int? ProjectionExecutionTimeout { get; set; }
-
-			public PersistedState() {
-				CheckpointHandledThreshold = ProjectionConsts.CheckpointHandledThreshold;
-				CheckpointAfterMs = (int)ProjectionConsts.CheckpointAfterMs.TotalMilliseconds;
-				CheckpointUnhandledBytesThreshold = ProjectionConsts.CheckpointUnhandledBytesThreshold;
-				PendingEventsThreshold = ProjectionConsts.PendingEventsThreshold;
-				MaxWriteBatchLength = ProjectionConsts.MaxWriteBatchLength;
-				MaxAllowedWritesInFlight = ProjectionConsts.MaxAllowedWritesInFlight;
-			}
-		}
-
-		private readonly IPublisher _output;
-
-		private readonly RequestResponseDispatcher<ClientMessage.DeleteStream, ClientMessage.DeleteStreamCompleted>
-			_streamDispatcher;
-
-		private readonly RequestResponseDispatcher<ClientMessage.WriteEvents, ClientMessage.WriteEventsCompleted>
-			_writeDispatcher;
-
-		private readonly ReadDispatcher _readDispatcher;
-
-		private readonly
-			RequestResponseDispatcher
-			<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>
-			_getStateDispatcher;
-
-		private readonly
-			RequestResponseDispatcher
-			<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>
-			_getResultDispatcher;
-
-
-		private readonly Serilog.ILogger _logger;
-		private readonly ITimeProvider _timeProvider;
-		private readonly Guid _workerId;
-		private readonly Guid _id;
-		private readonly long _projectionId;
-		private readonly string _name;
-		private readonly bool _enabledToRun;
-		private ManagedProjectionState _state;
-		internal PersistedState PersistedProjectionState = new PersistedState();
-
-		private bool _persistedStateLoaded = false;
-
-		private string _faultedReason;
-
-		private ProjectionStatistics _lastReceivedStatistics;
-		private DateTime _lastAccessed;
-		private long _lastWrittenVersion = -1;
-
-		private ClaimsPrincipal _runAs;
-		internal bool Prepared;
-		internal bool Created;
-		private bool _pendingWritePersistedState;
-		private readonly TimeSpan _projectionsQueryExpiry;
-
-		private ManagedProjectionStateBase _stateHandler;
-		private IEnvelope _lastReplyEnvelope;
-		private bool _writing;
-		private IODispatcher _ioDispatcher;
-		private ProjectionConfig _projectionConfig;
-		private IEmittedStreamsDeleter _emittedStreamsDeleter;
-
-		public ManagedProjection(
-			Guid workerId,
-			Guid id,
-			long projectionId,
-			string name,
-			bool enabledToRun,
-			ILogger logger,
-			RequestResponseDispatcher<ClientMessage.DeleteStream, ClientMessage.DeleteStreamCompleted> streamDispatcher,
-			RequestResponseDispatcher<ClientMessage.WriteEvents, ClientMessage.WriteEventsCompleted> writeDispatcher,
-			ReadDispatcher readDispatcher,
-			IPublisher output,
-			ITimeProvider timeProvider,
-			RequestResponseDispatcher<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>
-				getStateDispatcher,
-			RequestResponseDispatcher
-				<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>
-				getResultDispatcher,
-			IODispatcher ioDispatcher,
-			TimeSpan projectionQueryExpiry) {
-			if (id == Guid.Empty) throw new ArgumentException("id");
-			if (name == null) throw new ArgumentNullException("name");
-			if (output == null) throw new ArgumentNullException("output");
-			if (getStateDispatcher == null) throw new ArgumentNullException("getStateDispatcher");
-			if (getResultDispatcher == null) throw new ArgumentNullException("getResultDispatcher");
-			if (name == "") throw new ArgumentException("name");
-			_workerId = workerId;
-			_id = id;
-			_projectionId = projectionId;
-			_name = name;
-			_enabledToRun = enabledToRun;
-			_logger = logger ?? Serilog.Log.ForContext<ManagedProjection>();
-			_streamDispatcher = streamDispatcher;
-			_writeDispatcher = writeDispatcher;
-			_readDispatcher = readDispatcher;
-			_output = output;
-			_timeProvider = timeProvider;
-			_getStateDispatcher = getStateDispatcher;
-			_getResultDispatcher = getResultDispatcher;
-			_lastAccessed = _timeProvider.UtcNow;
-			_ioDispatcher = ioDispatcher;
-			_projectionsQueryExpiry = projectionQueryExpiry;
-		}
-
-		private string HandlerType {
-			get { return PersistedProjectionState.HandlerType; }
-		}
-
-		private string Query {
-			get { return PersistedProjectionState.Query; }
-		}
-
-		private bool Enabled {
-			get { return PersistedProjectionState.Enabled; }
-			set { PersistedProjectionState.Enabled = value; }
-		}
-
-		private bool IsMultiStream {
-			get {
-				return PersistedProjectionState.SourceDefinition != null &&
-				       PersistedProjectionState.SourceDefinition.Streams != null &&
-				       PersistedProjectionState.SourceDefinition.Streams.Length > 1;
-			}
-		}
-
-		public bool Deleted {
-			get { return PersistedProjectionState.Deleted; }
-			private set { PersistedProjectionState.Deleted = value; }
-		}
-
-		public bool Deleting {
-			get { return PersistedProjectionState.Deleting; }
-			private set { PersistedProjectionState.Deleting = value; }
-		}
-
-		public Guid Id {
-			get { return _id; }
-		}
-
-		public ProjectionMode Mode {
-			get { return PersistedProjectionState.Mode; }
-		}
-
-		public ClaimsPrincipal RunAs {
-			get { return _runAs; }
-		}
-
-		public bool EnableContentTypeValidation {
-			get {
-				return PersistedProjectionState.ProjectionSubsystemVersion >=
-				       ProjectionsSubsystem.CONTENT_TYPE_VALIDATION_VERSION;
-			}
-		}
-
-		internal void SetState(ManagedProjectionState value) {
-			_state = value;
-			switch (value) {
-				case ManagedProjectionState.Aborted:
-					_stateHandler = new AbortedState(this);
-					break;
-				case ManagedProjectionState.Aborting:
-					_stateHandler = new AbortingState(this);
-					break;
-				case ManagedProjectionState.Completed:
-					_stateHandler = new CompletedState(this);
-					break;
-				case ManagedProjectionState.Creating:
-				case ManagedProjectionState.Loading:
-				case ManagedProjectionState.Loaded:
-					_stateHandler = new CreatingLoadingLoadedState(this);
-					break;
-				case ManagedProjectionState.Faulted:
-					_stateHandler = new FaultedState(this);
-					break;
-				case ManagedProjectionState.LoadingStopped:
-					_stateHandler = new LoadingStateState(this);
-					break;
-				case ManagedProjectionState.Prepared:
-					_stateHandler = new PreparedState(this);
-					break;
-				case ManagedProjectionState.Preparing:
-					_stateHandler = new PreparingState(this);
-					break;
-				case ManagedProjectionState.Running:
-					_stateHandler = new RunningState(this);
-					break;
-				case ManagedProjectionState.Starting:
-					_stateHandler = new StartingState(this);
-					break;
-				case ManagedProjectionState.Stopped:
-					_stateHandler = new StoppedState(this);
-					break;
-				case ManagedProjectionState.Stopping:
-					_stateHandler = new StoppingState(this);
-					break;
-				case ManagedProjectionState.Deleting:
-					_stateHandler = new DeletingState(this);
-					break;
-				default:
-					throw InvalidProjectionState(value);
-			}
-		}
-
-		public void Dispose() {
-			DisposeCoreProjection();
-		}
-
-		public ProjectionStatistics GetStatistics() {
-			ProjectionStatistics status;
-			if (_lastReceivedStatistics == null) {
-				status = new ProjectionStatistics {
-					Name = _name,
-					ProjectionId = _projectionId,
-					Epoch = -1,
-					Version = -1,
-					Mode = Mode,
-					Status = _state.EnumValueName(),
-					LeaderStatus = _state
-				};
-			} else {
-				status = _lastReceivedStatistics.Clone();
-				status.Mode = Mode;
-				status.Name = _name;
-				status.ProjectionId = _projectionId;
-				var enabledSuffix =
-					((_state == ManagedProjectionState.Stopped || _state == ManagedProjectionState.Faulted) && Enabled
-						? " (Enabled)"
-						: "");
-				status.Status = (status.Status == "Stopped" && _state == ManagedProjectionState.Completed
-					                ? _state.EnumValueName()
-					                : (!status.Status.StartsWith(_state.EnumValueName())
-						                ? _state.EnumValueName() + "/" + status.Status
-						                : status.Status)) + enabledSuffix;
-				status.LeaderStatus = _state;
-			}
-
-			if (_state == ManagedProjectionState.Faulted)
-				status.StateReason = _faultedReason;
-			status.Enabled = Enabled;
-			return status;
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.GetState message) {
-			_lastAccessed = _timeProvider.UtcNow;
-			if (_state >= ManagedProjectionState.Running) {
-				_getStateDispatcher.Publish(
-					new CoreProjectionManagementMessage.GetState(Guid.NewGuid(), Id, message.Partition, _workerId),
-					m =>
-						message.Envelope.ReplyWith(
-							new ProjectionManagementMessage.ProjectionState(_name, m.Partition, m.State, m.Position)));
-			} else {
-				message.Envelope.ReplyWith(
-					new ProjectionManagementMessage.ProjectionState(
-						message.Name, message.Partition, "", position: null));
-			}
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.GetResult message) {
-			_lastAccessed = _timeProvider.UtcNow;
-			if (_state >= ManagedProjectionState.Running) {
-				_getResultDispatcher.Publish(
-					new CoreProjectionManagementMessage.GetResult(Guid.NewGuid(), Id, message.Partition, _workerId),
-					m =>
-						message.Envelope.ReplyWith(
-							new ProjectionManagementMessage.ProjectionResult(_name, m.Partition, m.Result,
-								m.Position)));
-			} else {
-				message.Envelope.ReplyWith(
-					new ProjectionManagementMessage.ProjectionResult(
-						message.Name, message.Partition, "", position: null));
-			}
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.GetQuery message) {
-			_lastAccessed = _timeProvider.UtcNow;
-
-			var emitEnabled = PersistedProjectionState.EmitEnabled ?? false;
-
-			var projectionOutputConfig = new ProjectionOutputConfig {
-				ResultStreamName =
-					PersistedProjectionState.SourceDefinition == null
-						? ""
-						: new ProjectionNamesBuilder(_name, PersistedProjectionState.SourceDefinition)
-							.GetResultStreamName()
-			};
-
-			message.Envelope.ReplyWith(
-				new ProjectionManagementMessage.ProjectionQuery(
-					_name,
-					Query,
-					emitEnabled,
-					PersistedProjectionState.Mode.ToString(),
-					PersistedProjectionState.TrackEmittedStreams,
-					!PersistedProjectionState.CheckpointsDisabled,
-					PersistedProjectionState.SourceDefinition,
-					projectionOutputConfig));
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.UpdateQuery message) {
-			_lastAccessed = _timeProvider.UtcNow;
-
-			Prepared = false;
-			UpdateQuery(message);
-			UpdateProjectionVersion();
-			SetLastReplyEnvelope(message.Envelope);
-			StopUnlessPreparedOrLoaded();
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.Disable message) {
-			_lastAccessed = _timeProvider.UtcNow;
-			SetLastReplyEnvelope(message.Envelope);
-			Disable();
-			UpdateProjectionVersion();
-			StopUnlessPreparedOrLoaded();
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.Abort message) {
-			_lastAccessed = _timeProvider.UtcNow;
-			UpdateProjectionVersion();
-			SetLastReplyEnvelope(message.Envelope);
-			Disable();
-			Abort();
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.Enable message) {
-			_lastAccessed = _timeProvider.UtcNow;
-			if (Enabled
-			    && !(_state == ManagedProjectionState.Completed || _state == ManagedProjectionState.Faulted
-			                                                    || _state == ManagedProjectionState.Aborted ||
-			                                                    _state == ManagedProjectionState.Loaded
-			                                                    || _state == ManagedProjectionState.Prepared ||
-			                                                    _state == ManagedProjectionState.Stopped)) {
-				//Projection is probably Running
-				message.Envelope.ReplyWith(new ProjectionManagementMessage.Updated(message.Name));
-				return;
-			}
-
-			Enable();
-			_pendingWritePersistedState = true;
-			UpdateProjectionVersion();
-			SetLastReplyEnvelope(message.Envelope);
-			StopUnlessPreparedOrLoaded();
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.SetRunAs message) {
-			_lastAccessed = _timeProvider.UtcNow;
-			Prepared = false;
-			SetRunAs(message);
-			UpdateProjectionVersion();
-			SetLastReplyEnvelope(message.Envelope);
-			StopUnlessPreparedOrLoaded();
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.Delete message) {
-			if ((_state != ManagedProjectionState.Stopped && _state != ManagedProjectionState.Faulted) &&
-			    Mode != ProjectionMode.Transient)
-				throw new InvalidOperationException("Cannot delete a projection that hasn't been stopped or faulted.");
-			_lastAccessed = _timeProvider.UtcNow;
-
-			PersistedProjectionState.DeleteCheckpointStream = message.DeleteCheckpointStream;
-			PersistedProjectionState.DeleteStateStream = message.DeleteStateStream;
-			PersistedProjectionState.DeleteEmittedStreams = message.DeleteEmittedStreams;
-
-			if (PersistedProjectionState.CheckpointStreamNeedsDeleted()) {
-				PersistedProjectionState.NumberOfPrequisitesMetForDeletion++;
-			}
-
-			if ((PersistedProjectionState.EmitEnabled ?? false) &&
-			    ((PersistedProjectionState.TrackEmittedStreams ?? false) &&
-			     PersistedProjectionState.DeleteEmittedStreams)) {
-				PersistedProjectionState.NumberOfPrequisitesMetForDeletion++;
-			}
-
-			if ((PersistedProjectionState.EmitEnabled ?? false) && IsMultiStream) {
-				PersistedProjectionState.NumberOfPrequisitesMetForDeletion++;
-			}
-
-			Delete();
-			UpdateProjectionVersion();
-			SetLastReplyEnvelope(message.Envelope);
-			SetState(ManagedProjectionState.Deleting);
-			StopUnlessPreparedOrLoaded();
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.GetConfig message) {
-			_lastAccessed = _timeProvider.UtcNow;
-
-			var emitEnabled = PersistedProjectionState.EmitEnabled ?? false;
-			var trackEmittedStreams = PersistedProjectionState.TrackEmittedStreams ?? false;
-
-			message.Envelope.ReplyWith(
-				new ProjectionManagementMessage.ProjectionConfig(emitEnabled, trackEmittedStreams,
-					PersistedProjectionState.CheckpointAfterMs,
-					PersistedProjectionState.CheckpointHandledThreshold,
-					PersistedProjectionState.CheckpointUnhandledBytesThreshold,
-					PersistedProjectionState.PendingEventsThreshold,
-					PersistedProjectionState.MaxWriteBatchLength,
-					PersistedProjectionState.MaxAllowedWritesInFlight,
-					PersistedProjectionState.ProjectionExecutionTimeout));
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.UpdateConfig message) {
-			if ((_state != ManagedProjectionState.Stopped && _state != ManagedProjectionState.Faulted) &&
-			    Mode != ProjectionMode.Transient)
-				throw new InvalidOperationException(
-					"Cannot update the config of a projection that hasn't been stopped or faulted.");
-			_lastAccessed = _timeProvider.UtcNow;
-
-			PersistedProjectionState.EmitEnabled = message.EmitEnabled;
-			PersistedProjectionState.TrackEmittedStreams = message.TrackEmittedStreams;
-			PersistedProjectionState.CheckpointAfterMs = message.CheckpointAfterMs;
-			PersistedProjectionState.CheckpointHandledThreshold = message.CheckpointHandledThreshold;
-			PersistedProjectionState.CheckpointUnhandledBytesThreshold = message.CheckpointUnhandledBytesThreshold;
-			PersistedProjectionState.PendingEventsThreshold = message.PendingEventsThreshold;
-			PersistedProjectionState.MaxWriteBatchLength = message.MaxWriteBatchLength;
-			PersistedProjectionState.MaxAllowedWritesInFlight = message.MaxAllowedWritesInFlight;
-			PersistedProjectionState.ProjectionExecutionTimeout = message.ProjectionExecutionTimeout;
-
-			UpdateProjectionVersion();
-			_pendingWritePersistedState = true;
-			WritePersistedState(CreatePersistedStateEvent(Guid.NewGuid(), PersistedProjectionState,
-				ProjectionNamesBuilder.ProjectionsStreamPrefix + _name));
-
-			message.Envelope.ReplyWith(new ProjectionManagementMessage.Updated(message.Name));
-		}
-
-		public void DeleteProjectionStreams() {
-			var sourceDefinition = PersistedProjectionState.SourceDefinition ?? new ProjectionSourceDefinition();
-			var projectionNamesBuilder = new ProjectionNamesBuilder(_name, sourceDefinition);
-
-			if (PersistedProjectionState.EmitStreamNeedsDeleted()  && IsMultiStream) {
-				DeleteStream(projectionNamesBuilder.GetOrderStreamName(), DeleteIfConditionsAreMet);
-			}
-
-			if(PersistedProjectionState.CheckpointStreamNeedsDeleted()){
-				 DeleteStream(projectionNamesBuilder.MakeCheckpointStreamName(), DeleteIfConditionsAreMet);
-			}
-
-			if (PersistedProjectionState.EmitStreamNeedsDeleted()) {
-				if (_emittedStreamsDeleter == null) {
-					_emittedStreamsDeleter = new EmittedStreamsDeleter(_ioDispatcher, projectionNamesBuilder.GetEmittedStreamsName(), projectionNamesBuilder.GetEmittedStreamsCheckpointName());
-				}
-
-				_emittedStreamsDeleter.DeleteEmittedStreams(DeleteIfConditionsAreMet);
-			}
-
-			if (!PersistedProjectionState.CheckpointStreamNeedsDeleted() &&
-				!PersistedProjectionState.EmitStreamNeedsDeleted()) {
-				DeleteIfConditionsAreMet();
-			}
-		}
-
-		private void DeleteIfConditionsAreMet() {
-			if (Interlocked.Decrement(ref PersistedProjectionState.NumberOfPrequisitesMetForDeletion) <= 0) {
-				Deleted = true;
-				Deleting = false;
-				Reply();
-			}
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.Reset message) {
-			_lastAccessed = _timeProvider.UtcNow;
-			Prepared = false;
-			_pendingWritePersistedState = true;
-			Reset();
-			UpdateProjectionVersion();
-			SetLastReplyEnvelope(message.Envelope);
-			StopUnlessPreparedOrLoaded();
-		}
-
-		public void Handle(ProjectionManagementMessage.Internal.CleanupExpired message) {
-			if (IsExpiredProjection()) {
-				if (_state == ManagedProjectionState.Creating) {
-					// NOTE: workaround for stop not working on creating state (just ignore them)
-					return;
-				}
-
-				_logger.Warning(
-					"Transient projection {projection} has expired and will be deleted. Last accessed at {lastAccessed}",
-					_name, _lastAccessed);
-				Handle(
-					new ProjectionManagementMessage.Command.Delete(
-						new NoopEnvelope(),
-						_name,
-						ProjectionManagementMessage.RunAs.System,
-						false,
-						false,
-						false));
-			}
-		}
-
-		public void Handle(CoreProjectionStatusMessage.Started message) {
-			_stateHandler.Started();
-		}
-
-		public void Handle(CoreProjectionStatusMessage.Stopped message) {
-			_stateHandler.Stopped(message);
-			if (Deleting) {
-				SetState(ManagedProjectionState.Deleting);
-			}
-		}
-
-		public void Handle(CoreProjectionStatusMessage.Faulted message) {
-			_stateHandler.Faulted(message);
-		}
-
-		public void Handle(CoreProjectionStatusMessage.Prepared message) {
-			_stateHandler.Prepared(message);
-		}
-
-		public void Handle(CoreProjectionStatusMessage.StatisticsReport message) {
-			_lastReceivedStatistics = message.Statistics;
-		}
-
-		private void SetRunAs(ProjectionManagementMessage.Command.SetRunAs message) {
-			PersistedProjectionState.RunAs =
-				message.Action == ProjectionManagementMessage.Command.SetRunAs.SetRemove.Set
-					? SerializedRunAs.SerializePrincipal(message.RunAs)
-					: null;
-			_runAs = SerializedRunAs.DeserializePrincipal(PersistedProjectionState.RunAs);
-			_pendingWritePersistedState = true;
-		}
-
-		private void SetLastReplyEnvelope(IEnvelope envelope) {
-			if (_lastReplyEnvelope != null)
-				_lastReplyEnvelope.ReplyWith(
-					new ProjectionManagementMessage.OperationFailed("Aborted by subsequent operation"));
-			_lastReplyEnvelope = envelope;
-		}
-
-		private void Reset() {
-			UpdateProjectionVersion(force: true);
-			PersistedProjectionState.Epoch = PersistedProjectionState.Version;
-		}
-
-		private bool IsExpiredProjection() {
-			return Mode == ProjectionMode.Transient &&
-			       _lastAccessed.Add(_projectionsQueryExpiry) < _timeProvider.UtcNow && _persistedStateLoaded;
-		}
-
-		public void InitializeNew(PersistedState persistedState, IEnvelope replyEnvelope) {
-			LoadPersistedState(persistedState);
-			UpdateProjectionVersion();
-			_pendingWritePersistedState = true;
-			SetLastReplyEnvelope(replyEnvelope);
-			PrepareOrWriteStartOrLoadStopped();
-		}
-
-		public void InitializeExisting(string name) {
-			SetState(ManagedProjectionState.Loading);
-			ReadPersistedState(name);
-		}
-
-		private void ReadPersistedState(string name) {
-			var corrId = Guid.NewGuid();
-			_readDispatcher.Publish(
-				new ClientMessage.ReadStreamEventsBackward(
-					corrId, corrId, _readDispatcher.Envelope, ProjectionNamesBuilder.ProjectionsStreamPrefix + name, -1,
-					1,
-					resolveLinkTos: false, requireLeader: false, validationStreamVersion: null,
-					user: SystemAccounts.System),
-				new ReadStreamEventsBackwardHandlers.Optimistic(PersistedStateReadCompleted));
-		}
-
-		private void PersistedStateReadCompleted(ClientMessage.ReadStreamEventsBackwardCompleted completed) {
-			if (completed.Result == ReadStreamResult.Success && completed.Events.Length == 1) {
-				var persistedState = completed.Events[0].Event.Data.ParseJson<PersistedState>();
-
-				_lastWrittenVersion = completed.Events[0].Event.EventNumber;
-				FixUpOldFormat(completed, persistedState);
-				FixupOldProjectionModes(persistedState);
-				FixUpOldProjectionRunAs(persistedState);
-
-				LoadPersistedState(persistedState);
-				//TODO: encapsulate this into managed projection
-				SetState(ManagedProjectionState.Loaded);
-				_pendingWritePersistedState = false;
-				SetLastReplyEnvelope(null);
-				PrepareOrWriteStartOrLoadStopped();
-				return;
-			}
-
-			SetState(ManagedProjectionState.Creating);
-
-			_logger.Verbose(
-				"Projection manager did not find any projection configuration records in the {stream} stream.  Projection stays in CREATING state",
-				completed.EventStreamId);
-		}
-
-		private void FixUpOldProjectionRunAs(PersistedState persistedState) {
-			if (persistedState.RunAs == null || string.IsNullOrEmpty(persistedState.RunAs.Name)) {
-				_runAs = SystemAccounts.System;
-				persistedState.RunAs = SerializedRunAs.SerializePrincipal(ProjectionManagementMessage.RunAs.System);
-			}
-		}
-
-		private void FixUpOldFormat(ClientMessage.ReadStreamEventsBackwardCompleted completed,
-			PersistedState persistedState) {
-			if (persistedState.Version == null) {
-				persistedState.Version = completed.Events[0].Event.EventNumber;
-				persistedState.Epoch = -1;
-			}
-
-			if (_lastWrittenVersion > persistedState.Version)
-				persistedState.Version = _lastWrittenVersion;
-		}
-
-		private void FixupOldProjectionModes(PersistedState persistedState) {
-			switch ((int)persistedState.Mode) {
-				case 2: // old continuous
-					persistedState.Mode = ProjectionMode.Continuous;
-					break;
-				case 3: // old persistent
-					persistedState.Mode = ProjectionMode.Continuous;
-					persistedState.EmitEnabled = persistedState.EmitEnabled ?? true;
-					break;
-			}
-		}
-
-		private void LoadPersistedState(PersistedState persistedState) {
-			var handlerType = persistedState.HandlerType;
-			var query = persistedState.Query;
-
-			if (handlerType == null) throw new ArgumentNullException("persistedState", "HandlerType");
-			if (query == null) throw new ArgumentNullException("persistedState", "Query");
-			if (handlerType == "") throw new ArgumentException("HandlerType", "persistedState");
-
-			if (_state != ManagedProjectionState.Creating && _state != ManagedProjectionState.Loading)
-				throw new InvalidOperationException("LoadPersistedState is now allowed in this state");
-
-			PersistedProjectionState = persistedState;
-			_runAs = SerializedRunAs.DeserializePrincipal(persistedState.RunAs);
-			_persistedStateLoaded = true;
-		}
-
-		internal void WriteStartOrLoadStopped() {
-			if (_pendingWritePersistedState)
-				WritePersistedState(CreatePersistedStateEvent(Guid.NewGuid(), PersistedProjectionState,
-					ProjectionNamesBuilder.ProjectionsStreamPrefix + _name));
-			else
-				StartOrLoadStopped();
-		}
-
-		internal void StartCompleted() {
-			Reply();
-		}
-
-		private ClientMessage.WriteEvents CreatePersistedStateEvent(Guid correlationId, PersistedState persistedState,
-			string eventStreamId) {
-			return new ClientMessage.WriteEvents(
-				correlationId, correlationId, _writeDispatcher.Envelope, true, eventStreamId, ExpectedVersion.Any,
-				new Event(Guid.NewGuid(), ProjectionEventTypes.ProjectionUpdated, true, persistedState.ToJsonBytes(),
-					Empty.ByteArray),
-				SystemAccounts.System);
-		}
-
-		private void WritePersistedState(ClientMessage.WriteEvents persistedStateEvent) {
-			if (Mode == ProjectionMode.Transient) {
-				//TODO: move to common completion procedure
-				_lastWrittenVersion = PersistedProjectionState.Version ?? -1;
-				_pendingWritePersistedState = false;
-				StartOrLoadStopped();
-				return;
-			}
-
-			_writing = true;
-			_writeDispatcher.Publish(
-				persistedStateEvent,
-				m => WritePersistedStateCompleted(m, persistedStateEvent, persistedStateEvent.EventStreamId));
-		}
-
-		private void WritePersistedStateCompleted(ClientMessage.WriteEventsCompleted message,
-			ClientMessage.WriteEvents eventToRetry, string eventStreamId) {
-			if (!_writing) {
-				_logger.Error("Projection definition write completed in non writing state. ({projection})", _name);
-			}
-
-			if (message.Result == OperationResult.Success) {
-				_logger.Information("'{projection}' projection source has been written", _name);
-				_pendingWritePersistedState = false;
-				var writtenEventNumber = message.FirstEventNumber;
-				if (writtenEventNumber != (PersistedProjectionState.Version ?? writtenEventNumber))
-					throw new Exception("Projection version and event number mismatch");
-				_lastWrittenVersion = (PersistedProjectionState.Version ?? writtenEventNumber);
-				StartOrLoadStopped();
-				return;
-			}
-
-			_logger.Information(
-				"Projection '{projection}' source has not been written to {stream}. Error: {e}",
-				_name,
-				eventStreamId,
-				Enum.GetName(typeof(OperationResult), message.Result));
-			if (message.Result == OperationResult.CommitTimeout || message.Result == OperationResult.ForwardTimeout
-			                                                    || message.Result == OperationResult.PrepareTimeout
-			                                                    || message.Result ==
-			                                                    OperationResult.WrongExpectedVersion) {
-				_logger.Information("Retrying write projection source for {projection}", _name);
-				WritePersistedState(eventToRetry);
-			} else
-				throw new NotSupportedException("Unsupported error code received");
-		}
-
-		private void DeleteStream(string streamId, Action completed) {
-			//delete checkpoint stream
-			var correlationId = Guid.NewGuid();
-			_streamDispatcher.Publish(new ClientMessage.DeleteStream(
-				correlationId,
-				correlationId,
-				_writeDispatcher.Envelope,
-				true,
-				streamId,
-				ExpectedVersion.Any,
-				false,
-				SystemAccounts.System), m => DeleteStreamCompleted(m, streamId, completed));
-		}
-
-		private void DeleteStreamCompleted(ClientMessage.DeleteStreamCompleted message, string streamId,
-			Action completed) {
-			// currently, WrongExpectedVersion is returned when deleting non-existing streams, even when specifying ExpectedVersion.Any.
-			// it is not too intuitive but changing the response would break the contract and compatibility with TCP/gRPC/web clients or require adding a new error code to all clients.
-			// note: we don't need to check if CurrentVersion == -1 here to make sure it's a non-existing stream since the deletion is done with ExpectedVersion.Any
-			if (message.Result == OperationResult.WrongExpectedVersion) {
-				// stream was never created
-				_logger.Information("PROJECTIONS: Projection Stream '{stream}' was not deleted since it does not exist", streamId);
-				completed();
-				return;
-			}
-			if (message.Result == OperationResult.Success || message.Result == OperationResult.StreamDeleted) {
-				_logger.Information("PROJECTIONS: Projection Stream '{stream}' deleted", streamId);
-				completed();
-				return;
-			}
-
-			_logger.Information(
-				"PROJECTIONS: Projection stream '{stream}' could not be deleted. Error: {e}",
-				streamId,
-				Enum.GetName(typeof(OperationResult), message.Result));
-			if (message.Result == OperationResult.CommitTimeout ||
-			    message.Result == OperationResult.ForwardTimeout) {
-				DeleteStream(streamId, completed);
-			} else
-				throw new NotSupportedException("Unsupported error code received");
-		}
-
-		private void Prepare(Message message) {
-			if (_state >= ManagedProjectionState.Preparing) {
-				DisposeCoreProjection();
-				SetState(ManagedProjectionState.Loaded);
-			}
-
-			//note: set running before start as coreProjection.start() can respond with faulted
-			SetState(ManagedProjectionState.Preparing);
-			_output.Publish(message);
-		}
-
-		private void Start() {
-			if (!Enabled)
-				throw new InvalidOperationException("Projection is disabled");
-			SetState(ManagedProjectionState.Starting);
-			_output.Publish(new CoreProjectionManagementMessage.Start(Id, _workerId));
-		}
-
-		private void LoadStopped() {
-			SetState(ManagedProjectionState.LoadingStopped);
-			_output.Publish(new CoreProjectionManagementMessage.LoadStopped(Id, _workerId));
-		}
-
-		private void DisposeCoreProjection() {
-			Created = false;
-			_output.Publish(new CoreProjectionManagementMessage.Dispose(Id, _workerId));
-		}
-
-		private void Enable() {
-			Enabled = true;
-		}
-
-		private Message CreateCreateAndPrepareMessage(ProjectionConfig config) {
-			return new CoreProjectionManagementMessage.CreateAndPrepare(
-					Id,
-					_workerId,
-					_name,
-					new ProjectionVersion(_projectionId, PersistedProjectionState.Epoch ?? 0,
-						PersistedProjectionState.Version ?? 0),
-					config,
-					HandlerType,
-					Query,
-					EnableContentTypeValidation);
-		}
-
-		private CoreProjectionManagementMessage.CreatePrepared CreatePreparedMessage(ProjectionConfig config) {
-			if (PersistedProjectionState.SourceDefinition == null)
-				throw new Exception(
-					"The projection cannot be loaded as stopped as it was stored in the old format.  Update the projection query text to force prepare");
-
-			var createProjectionMessage = new CoreProjectionManagementMessage.CreatePrepared(
-				Id,
-				_workerId,
-				_name,
-				new ProjectionVersion(_projectionId, PersistedProjectionState.Epoch ?? 0,
-					PersistedProjectionState.Version ?? 1),
-				config,
-				QuerySourcesDefinition.From(PersistedProjectionState.SourceDefinition),
-				HandlerType,
-				Query,
-				EnableContentTypeValidation);
-			return createProjectionMessage;
-		}
-
-		private void StopUnlessPreparedOrLoaded() {
-			switch (_state) {
-				case ManagedProjectionState.Prepared:
-				case ManagedProjectionState.Loaded:
-					PrepareOrWriteStartOrLoadStopped();
-					break;
-				case ManagedProjectionState.Stopped:
-				case ManagedProjectionState.Completed:
-				case ManagedProjectionState.Aborted:
-				case ManagedProjectionState.Faulted:
-					SetState(ManagedProjectionState.Stopped);
-					PrepareOrWriteStartOrLoadStopped();
-					return;
-				case ManagedProjectionState.Deleting:
-					PrepareOrWriteStartOrLoadStopped();
-					break;
-				case ManagedProjectionState.Loading:
-				case ManagedProjectionState.Creating:
-					throw new InvalidOperationException(
-						string.Format(
-							"Cannot stop a projection in the '{0}' state",
-							Enum.GetName(typeof(ManagedProjectionState), _state)));
-				case ManagedProjectionState.Stopping:
-				case ManagedProjectionState.Aborting:
-					return;
-				case ManagedProjectionState.Running:
-				case ManagedProjectionState.Starting:
-					SetState(ManagedProjectionState.Stopping);
-					_output.Publish(new CoreProjectionManagementMessage.Stop(Id, _workerId));
-					break;
-				default:
-					throw InvalidProjectionState(_state);
-			}
-		}
-
-		private void Abort() {
-			switch (_state) {
-				case ManagedProjectionState.Stopped:
-				case ManagedProjectionState.Completed:
-				case ManagedProjectionState.Aborted:
-				case ManagedProjectionState.Faulted:
-				case ManagedProjectionState.Loaded:
-					PrepareOrWriteStartOrLoadStopped();
-					return;
-				case ManagedProjectionState.Loading:
-				case ManagedProjectionState.Creating:
-					throw new InvalidOperationException(
-						string.Format(
-							"Cannot stop a projection in the '{0}' state",
-							Enum.GetName(typeof(ManagedProjectionState), _state)));
-				case ManagedProjectionState.Stopping:
-					SetState(ManagedProjectionState.Aborting);
-					_output.Publish(new CoreProjectionManagementMessage.Kill(Id, _workerId));
-					return;
-				case ManagedProjectionState.Aborting:
-					return;
-				case ManagedProjectionState.Running:
-				case ManagedProjectionState.Starting:
-					SetState(ManagedProjectionState.Aborting);
-					_output.Publish(new CoreProjectionManagementMessage.Kill(Id, _workerId));
-					break;
-				default:
-					throw InvalidProjectionState(_state);
-			}
-		}
-
-
-		public void Fault(string reason) {
-			_logger.Error("The '{projection}' projection faulted due to '{e}'", _name, reason);
-			SetState(ManagedProjectionState.Faulted);
-			_faultedReason = reason;
-		}
-
-		private ProjectionConfig CreateDefaultProjectionConfiguration() {
-			var checkpointsEnabled = PersistedProjectionState.CheckpointsDisabled != true;
-			var trackEmittedStreams = PersistedProjectionState.TrackEmittedStreams == true;
-			var maximumCheckpointCount = checkpointsEnabled ? PersistedProjectionState.CheckpointHandledThreshold : 0;
-			var checkpointAfterMs = checkpointsEnabled ? PersistedProjectionState.CheckpointAfterMs : 0;
-			var checkpointUnhandledBytesThreshold =
-				checkpointsEnabled ? PersistedProjectionState.CheckpointUnhandledBytesThreshold : 0;
-			var pendingEventsThreshold = PersistedProjectionState.PendingEventsThreshold;
-			var maxWriteBatchLength = PersistedProjectionState.MaxWriteBatchLength;
-			var maximumAllowedWritesInFlight = PersistedProjectionState.MaxAllowedWritesInFlight;
-			var emitEventEnabled = PersistedProjectionState.EmitEnabled == true;
-			var createTempStreams = PersistedProjectionState.CreateTempStreams == true;
-			var stopOnEof = PersistedProjectionState.Mode <= ProjectionMode.OneTime;
-			var projectionExecutionTimeout = PersistedProjectionState.ProjectionExecutionTimeout;
-
-			var projectionConfig = new ProjectionConfig(
-				_runAs,
-				maximumCheckpointCount,
-				checkpointUnhandledBytesThreshold,
-				pendingEventsThreshold,
-				maxWriteBatchLength,
-				emitEventEnabled,
-				checkpointsEnabled,
-				createTempStreams,
-				stopOnEof,
-				trackEmittedStreams,
-				checkpointAfterMs,
-				maximumAllowedWritesInFlight,
-				projectionExecutionTimeout);
-			return projectionConfig;
-		}
-
-		private void StartOrLoadStopped() {
-			if (_state == ManagedProjectionState.Prepared) {
-				if (Enabled && _enabledToRun)
-					Start();
-				else {
-					LoadStopped();
-				}
-			} else if (_state == ManagedProjectionState.Aborted ||
-			           _state == ManagedProjectionState.Completed ||
-			           _state == ManagedProjectionState.Faulted ||
-			           _state == ManagedProjectionState.Stopped ||
-			           _state == ManagedProjectionState.Deleting)
-				Reply();
-			else
-				throw InvalidProjectionState(_state);
-		}
-
-		private void UpdateQuery(ProjectionManagementMessage.Command.UpdateQuery message) {
-			PersistedProjectionState.Query = message.Query;
-			PersistedProjectionState.EmitEnabled = message.EmitEnabled ?? PersistedProjectionState.EmitEnabled;
-			_pendingWritePersistedState = true;
-			if (_state == ManagedProjectionState.Completed) {
-				Reset();
-			}
-		}
-
-		private void Disable() {
-			Enabled = false;
-			_pendingWritePersistedState = true;
-		}
-
-		public void PrepareOrWriteStartOrLoadStopped() {
-			if (_state == ManagedProjectionState.Prepared) {
-				WriteStartOrLoadStopped();
-				return;
-			}
-
-			if (Prepared && Created && !(Enabled && _enabledToRun)) {
-				WriteStartOrLoadStopped();
-				return;
-			}
-
-			_projectionConfig = CreateDefaultProjectionConfiguration();
-
-			var prepareMessage = !(Enabled && _enabledToRun) && !_pendingWritePersistedState
-				? CreatePreparedMessage(_projectionConfig)
-				: CreateCreateAndPrepareMessage(_projectionConfig);
-
-			Prepare(prepareMessage);
-		}
-
-		private void Reply() {
-			if (_lastReplyEnvelope != null)
-				_lastReplyEnvelope.ReplyWith(new ProjectionManagementMessage.Updated(_name));
-			_lastReplyEnvelope = null;
-			if (Deleted && !_pendingWritePersistedState) {
-				DisposeCoreProjection();
-				_output.Publish(new ProjectionManagementMessage.Internal.Deleted(_name, Id));
-			}
-		}
-
-		private void Delete() {
-			Enabled = false;
-			Deleted = false;
-			Deleting = true;
-			_pendingWritePersistedState = true;
-		}
-
-		private void UpdateProjectionVersion(bool force = false) {
-			if (_lastWrittenVersion == PersistedProjectionState.Version) {
-				PersistedProjectionState.Version++;
-				PersistedProjectionState.ProjectionSubsystemVersion = ProjectionsSubsystem.VERSION;
-			} else if (force)
-				throw new ApplicationException(
-					"Internal error: projection definition must be saved before forced updating version");
-		}
-
-		private static InvalidOperationException InvalidProjectionState(ManagedProjectionState state) =>
-			new InvalidOperationException($"Did not expect {nameof(ManagedProjectionState)} in state {state}.");
-	}
-
-	public class SerializedRunAs {
-		public string Name { get; set; }
-		public string[] Roles { get; set; }
-
-		public static implicit operator SerializedRunAs(ProjectionManagementMessage.RunAs runAs) {
-			return runAs == null ? null : SerializePrincipal(runAs);
-		}
-
-		public static implicit operator ProjectionManagementMessage.RunAs(SerializedRunAs runAs) {
-			return new ProjectionManagementMessage.RunAs(DeserializePrincipal(runAs));
-		}
-
-		public static SerializedRunAs SerializePrincipal(ProjectionManagementMessage.RunAs runAs) {
-			if (runAs?.Principal == null || runAs.Principal.HasClaim(x=>x.Type == ClaimTypes.Anonymous))
-				return null; // anonymous
-			if (runAs.Principal == SystemAccounts.System)
-				return new SerializedRunAs {Name = "$system"};
-
-			var principal = runAs.Principal;
-			var roles = principal.Claims
-				.Where(x => x.Type == ClaimTypes.Role)
-				.Select(c => $"{c.Type}$$${c.Value}").ToArray();
-			return new SerializedRunAs {Name = runAs.Principal.Identity.Name, Roles = roles};
-		}
-
-		public static ClaimsPrincipal DeserializePrincipal(SerializedRunAs runAs) {
-			if (runAs?.Name == null)
-				return SystemAccounts.Anonymous;
-			if (runAs.Name == "$system") //TODO: make sure nobody else uses it
-				return SystemAccounts.System;
-			var claims = runAs.Roles.Select(x => x.Split("$$$")).Select(x => {
-				return x.Length switch
-				{
-					1 =>  new Claim(ClaimTypes.Role, x[0]),
-					2 => new Claim(x[0], x[1]),
-					_ =>throw new SerializationException("Could not deserialize run as")
-				};
-
-			}).ToList();
-			if (!claims.Exists(x => x.Type == ClaimTypes.Name)) {
-				claims.Add(new Claim(ClaimTypes.Name, runAs.Name));
-			}
-
-			return new ClaimsPrincipal(new ClaimsIdentity(claims, "ES-Projections"));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionState.cs b/src/EventStore.Projections.Core/Services/Management/ManagedProjectionState.cs
deleted file mode 100644
index edcd643aad6..00000000000
--- a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionState.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace EventStore.Projections.Core.Services.Management {
-	public enum ManagedProjectionState {
-		Creating,
-		Loading,
-		Loaded,
-		Preparing,
-		Prepared,
-		Starting,
-		LoadingStopped,
-		Running,
-		Stopping,
-		Aborting,
-		Stopped,
-		Completed,
-		Aborted,
-		Faulted,
-		Deleting,
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/AbortedState.cs b/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/AbortedState.cs
deleted file mode 100644
index 3a489a56525..00000000000
--- a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/AbortedState.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EventStore.Projections.Core.Services.Management.ManagedProjectionStates {
-	class AbortedState : ManagedProjectionStateBase {
-		public AbortedState(ManagedProjection managedProjection)
-			: base(managedProjection) {
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/AbortingState.cs b/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/AbortingState.cs
deleted file mode 100644
index bafe478af9c..00000000000
--- a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/AbortingState.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Services.Management.ManagedProjectionStates {
-	class AbortingState : ManagedProjectionStateBase {
-		public AbortingState(ManagedProjection managedProjection)
-			: base(managedProjection) {
-		}
-
-		protected internal override void Stopped(CoreProjectionStatusMessage.Stopped message) {
-			_managedProjection.SetState(ManagedProjectionState.Aborted);
-			_managedProjection.PrepareOrWriteStartOrLoadStopped();
-		}
-
-		protected internal override void Faulted(CoreProjectionStatusMessage.Faulted message) {
-			_managedProjection.SetState(ManagedProjectionState.Aborted);
-			_managedProjection.PrepareOrWriteStartOrLoadStopped();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/CompletedState.cs b/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/CompletedState.cs
deleted file mode 100644
index 7e102928f1f..00000000000
--- a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/CompletedState.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EventStore.Projections.Core.Services.Management.ManagedProjectionStates {
-	class CompletedState : ManagedProjectionStateBase {
-		public CompletedState(ManagedProjection managedProjection)
-			: base(managedProjection) {
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/CreatingLoadingLoadedState.cs b/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/CreatingLoadingLoadedState.cs
deleted file mode 100644
index c3dd0d14828..00000000000
--- a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/CreatingLoadingLoadedState.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EventStore.Projections.Core.Services.Management.ManagedProjectionStates {
-	class CreatingLoadingLoadedState : ManagedProjectionStateBase {
-		public CreatingLoadingLoadedState(ManagedProjection managedProjection)
-			: base(managedProjection) {
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/DeletingState.cs b/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/DeletingState.cs
deleted file mode 100644
index 7dd04cc0983..00000000000
--- a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/DeletingState.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace EventStore.Projections.Core.Services.Management.ManagedProjectionStates {
-	class DeletingState : ManagedProjectionStateBase {
-		public DeletingState(ManagedProjection managedProjection)
-			: base(managedProjection) {
-			managedProjection.DeleteProjectionStreams();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/FaultedState.cs b/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/FaultedState.cs
deleted file mode 100644
index 3d74c54c256..00000000000
--- a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/FaultedState.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EventStore.Projections.Core.Services.Management.ManagedProjectionStates {
-	class FaultedState : ManagedProjectionStateBase {
-		public FaultedState(ManagedProjection managedProjection)
-			: base(managedProjection) {
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/LoadingStateState.cs b/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/LoadingStateState.cs
deleted file mode 100644
index 45a80cd0e24..00000000000
--- a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/LoadingStateState.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Services.Management.ManagedProjectionStates {
-	class LoadingStateState : ManagedProjectionStateBase {
-		public LoadingStateState(ManagedProjection managedProjection)
-			: base(managedProjection) {
-		}
-
-		protected internal override void Stopped(CoreProjectionStatusMessage.Stopped message) {
-			_managedProjection.SetState(ManagedProjectionState.Stopped);
-			_managedProjection.PrepareOrWriteStartOrLoadStopped();
-		}
-
-		protected internal override void Faulted(CoreProjectionStatusMessage.Faulted message) {
-			SetFaulted(message.FaultedReason);
-			_managedProjection.PrepareOrWriteStartOrLoadStopped();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/ManagedProjectionStateBase.cs b/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/ManagedProjectionStateBase.cs
deleted file mode 100644
index e6c4ae561c3..00000000000
--- a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/ManagedProjectionStateBase.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Services.Management.ManagedProjectionStates {
-	internal abstract class ManagedProjectionStateBase {
-		protected readonly ManagedProjection _managedProjection;
-
-		protected ManagedProjectionStateBase(ManagedProjection managedProjection) {
-			_managedProjection = managedProjection;
-		}
-
-		private void Unexpected(string message) {
-			_managedProjection.Fault(message + " in " + this.GetType().Name);
-		}
-
-		protected void SetFaulted(string reason) {
-			_managedProjection.Fault(reason);
-		}
-
-		protected internal virtual void Started() {
-			Unexpected("Unexpected 'STARTED' message");
-		}
-
-		protected internal virtual void Stopped(CoreProjectionStatusMessage.Stopped message) {
-			Unexpected("Unexpected 'STOPPED' message");
-		}
-
-		protected internal virtual void Faulted(CoreProjectionStatusMessage.Faulted message) {
-			Unexpected("Unexpected 'FAULTED' message");
-		}
-
-		protected internal virtual void Prepared(CoreProjectionStatusMessage.Prepared message) {
-			Unexpected("Unexpected 'PREPARED' message");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/PreparedState.cs b/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/PreparedState.cs
deleted file mode 100644
index 5a4cd19b278..00000000000
--- a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/PreparedState.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EventStore.Projections.Core.Services.Management.ManagedProjectionStates {
-	class PreparedState : ManagedProjectionStateBase {
-		public PreparedState(ManagedProjection managedProjection)
-			: base(managedProjection) {
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/PreparingState.cs b/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/PreparingState.cs
deleted file mode 100644
index 2c5e86da1c1..00000000000
--- a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/PreparingState.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Services.Management.ManagedProjectionStates {
-	class PreparingState : ManagedProjectionStateBase {
-		public PreparingState(ManagedProjection managedProjection)
-			: base(managedProjection) {
-		}
-
-		protected internal override void Faulted(CoreProjectionStatusMessage.Faulted message) {
-			SetFaulted(message.FaultedReason);
-			_managedProjection.PersistedProjectionState.SourceDefinition = null;
-			_managedProjection.WriteStartOrLoadStopped();
-		}
-
-		protected internal override void Prepared(CoreProjectionStatusMessage.Prepared message) {
-			_managedProjection.SetState(ManagedProjectionState.Prepared);
-			_managedProjection.PersistedProjectionState.SourceDefinition = message.SourceDefinition;
-			_managedProjection.Prepared = true;
-			_managedProjection.Created = true;
-			_managedProjection.WriteStartOrLoadStopped();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/RunningState.cs b/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/RunningState.cs
deleted file mode 100644
index 34851c1f322..00000000000
--- a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/RunningState.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Services.Management.ManagedProjectionStates {
-	class RunningState : ManagedProjectionStateBase {
-		public RunningState(ManagedProjection managedProjection)
-			: base(managedProjection) {
-		}
-
-		protected internal override void Faulted(CoreProjectionStatusMessage.Faulted message) {
-			SetFaulted(message.FaultedReason);
-		}
-
-		protected internal override void Started() {
-			// do nothing - may mean second pahse started
-			//TODO: stop sending second Started
-		}
-
-		protected internal override void Stopped(CoreProjectionStatusMessage.Stopped message) {
-			if (message.Completed)
-				_managedProjection.SetState(ManagedProjectionState.Completed);
-			else
-				base.Stopped(message);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/StartingState.cs b/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/StartingState.cs
deleted file mode 100644
index 487ad978d75..00000000000
--- a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/StartingState.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Services.Management.ManagedProjectionStates {
-	class StartingState : ManagedProjectionStateBase {
-		public StartingState(ManagedProjection managedProjection)
-			: base(managedProjection) {
-		}
-
-		protected internal override void Started() {
-			_managedProjection.SetState(ManagedProjectionState.Running);
-			_managedProjection.StartCompleted();
-		}
-
-		protected internal override void Faulted(CoreProjectionStatusMessage.Faulted message) {
-			SetFaulted(message.FaultedReason);
-			_managedProjection.StartCompleted();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/StoppedState.cs b/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/StoppedState.cs
deleted file mode 100644
index 5744ba1655a..00000000000
--- a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/StoppedState.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EventStore.Projections.Core.Services.Management.ManagedProjectionStates {
-	class StoppedState : ManagedProjectionStateBase {
-		public StoppedState(ManagedProjection managedProjection)
-			: base(managedProjection) {
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/StoppingState.cs b/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/StoppingState.cs
deleted file mode 100644
index 9d34b20b1e2..00000000000
--- a/src/EventStore.Projections.Core/Services/Management/ManagedProjectionStates/StoppingState.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Services.Management.ManagedProjectionStates {
-	class StoppingState : ManagedProjectionStateBase {
-		public StoppingState(ManagedProjection managedProjection)
-			: base(managedProjection) {
-		}
-
-		protected internal override void Stopped(CoreProjectionStatusMessage.Stopped message) {
-			_managedProjection.SetState(
-				message.Completed ? ManagedProjectionState.Completed : ManagedProjectionState.Stopped);
-			_managedProjection.PrepareOrWriteStartOrLoadStopped();
-		}
-
-		protected internal override void Faulted(CoreProjectionStatusMessage.Faulted message) {
-			SetFaulted(message.FaultedReason);
-			_managedProjection.PrepareOrWriteStartOrLoadStopped();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Management/ProjectionCoreCoordinator.cs b/src/EventStore.Projections.Core/Services/Management/ProjectionCoreCoordinator.cs
deleted file mode 100644
index fbc44d9d4ee..00000000000
--- a/src/EventStore.Projections.Core/Services/Management/ProjectionCoreCoordinator.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Common.Options;
-using EventStore.Core.Bus;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using Serilog;
-
-namespace EventStore.Projections.Core.Services.Management {
-	public class ProjectionCoreCoordinator
-		: IHandle<ProjectionSubsystemMessage.StartComponents>,
-			IHandle<ProjectionSubsystemMessage.StopComponents>,
-			IHandle<ProjectionCoreServiceMessage.SubComponentStarted>,
-			IHandle<ProjectionCoreServiceMessage.SubComponentStopped> {
-		public const string ComponentName = "ProjectionCoreCoordinator";
-
-		private readonly ILogger Log = Serilog.Log.ForContext<ProjectionCoreCoordinator>();
-		private readonly ProjectionType _runProjections;
-
-		private readonly Dictionary<Guid, IPublisher> _queues = new Dictionary<Guid, IPublisher>();
-		private readonly IPublisher _publisher;
-
-		private int _pendingSubComponentsStarts;
-		private int _activeSubComponents;
-
-		private Guid _instanceCorrelationId = Guid.Empty;
-		private CoreCoordinatorState _currentState = CoreCoordinatorState.Stopped;
-
-		public ProjectionCoreCoordinator(
-			ProjectionType runProjections,
-			IReadOnlyList<IPublisher> queues,
-			IPublisher publisher){
-			_runProjections = runProjections;
-			_queues = queues.ToDictionary(_ => Guid.NewGuid(), q => q);
-			_publisher = publisher;
-		}
-
-		public void Handle(ProjectionSubsystemMessage.StartComponents message) {
-			if (_currentState != CoreCoordinatorState.Stopped) {
-				Log.Debug("PROJECTIONS: Projection Core Coordinator cannot start components as it's not stopped. Correlation: {correlation}",
-					message.InstanceCorrelationId);
-				return;
-			}
-			_instanceCorrelationId = message.InstanceCorrelationId;
-			Log.Debug("PROJECTIONS: Projection Core Coordinator component starting. Correlation: {correlation}",
-				_instanceCorrelationId);
-			Start();
-		}
-
-		public void Handle(ProjectionSubsystemMessage.StopComponents message) {
-			if (_currentState != CoreCoordinatorState.Started) {
-				Log.Debug("PROJECTIONS: Projection Core Coordinator cannot stop components as it's not started. Correlation: {correlation}",
-					message.InstanceCorrelationId);
-				return;
-			}
-			if (_instanceCorrelationId != message.InstanceCorrelationId) {
-				Log.Debug("PROJECTIONS: Projection Core Coordinator received stop request for incorrect correlation id." +
-				          "Current: {correlationId}. Requested: {requestedCorrelationId}", _instanceCorrelationId, message.InstanceCorrelationId);
-				return;
-			}
-			Stop(message);
-		}
-
-		private void Start() {
-			if (_currentState != CoreCoordinatorState.Stopped) {
-				Log.Warning("PROJECTIONS: Projection Core Coordinated tried to start when not stopped.");
-				return;
-			}
-			Log.Debug("PROJECTIONS: Starting Projections Core Coordinator");
-			_pendingSubComponentsStarts = 0;
-			_activeSubComponents = 0;
-			_currentState = CoreCoordinatorState.Starting;
-
-			foreach (var queue in _queues.Values) {
-				queue.Publish(new ReaderCoreServiceMessage.StartReader(_instanceCorrelationId));
-				_pendingSubComponentsStarts += 1 /*EventReaderCoreService*/;
-
-				if (_runProjections >= ProjectionType.System) {
-					queue.Publish(new ProjectionCoreServiceMessage.StartCore(_instanceCorrelationId));
-					_pendingSubComponentsStarts += 1; /*ProjectionCoreService*/
-				}
-			}
-		}
-
-		private void Stop(ProjectionSubsystemMessage.StopComponents message) {
-			if (_currentState != CoreCoordinatorState.Started) {
-				Log.Debug("PROJECTIONS: Projections Core Coordinator trying to stop when not started. " +
-				          "Current state: {currentState}. StopCorrelation: {correlation}", _currentState,
-					message.InstanceCorrelationId);
-				return;
-			}
-
-			Log.Debug("PROJECTIONS: Stopping Projections Core Coordinator");
-			_currentState = CoreCoordinatorState.Stopping;
-			foreach (var queue in _queues) {
-				if (_runProjections >= ProjectionType.System) {
-					 queue.Value.Publish(new ProjectionCoreServiceMessage.StopCore(queue.Key));
-				} else {
-					 // TODO: Find out why projections still run even when ProjectionType.None
-					 queue.Value.Publish(new ReaderCoreServiceMessage.StopReader(queue.Key));
-				}
-			}
-		}
-
-		public void Handle(ProjectionCoreServiceMessage.SubComponentStarted message) {
-			if (_currentState != CoreCoordinatorState.Starting) {
-				Log.Debug("PROJECTIONS: Projection Core Coordinator received SubComponent Started when not starting. " +
-					"SubComponent: {subComponent}, InstanceCorrelationId: {correlationId}, CurrentState: {currentState}",
-					message.SubComponent, message.InstanceCorrelationId, _currentState);
-				return;
-			}
-			if (message.InstanceCorrelationId != _instanceCorrelationId) {
-				Log.Debug("PROJECTIONS: Projection Core Coordinator received SubComponent Started for wrong correlation id. " +
-					"SubComponent: {subComponent}, RequestedCorrelation: {requestedCorrelation}, InstanceCorrelationId: {correlationId}",
-					message.SubComponent, message.InstanceCorrelationId, _instanceCorrelationId);
-				return;
-			}
-			_pendingSubComponentsStarts--;
-			_activeSubComponents++;
-			Log.Debug("PROJECTIONS: SubComponent Started: {subComponent}", message.SubComponent);
-
-			if (_pendingSubComponentsStarts == 0) {
-				_publisher.Publish(
-					new ProjectionSubsystemMessage.ComponentStarted(ComponentName, _instanceCorrelationId));
-				_currentState = CoreCoordinatorState.Started;
-			}
-		}
-
-		public void Handle(ProjectionCoreServiceMessage.SubComponentStopped message) {
-			if (_currentState != CoreCoordinatorState.Stopping) {
-				Log.Debug("PROJECTIONS: Projection Core Coordinator received SubComponent Stopped when not stopping. " +
-				          "SubComponent: {subComponent}, CurrentState: {currentState}",
-					message.SubComponent, _currentState);
-				return;
-			}
-			_activeSubComponents--;
-			Log.Debug("PROJECTIONS: SubComponent Stopped: {subComponent}", message.SubComponent);
-
-			if (message.SubComponent == ProjectionCoreService.SubComponentName) {
-				if (!_queues.TryGetValue(message.QueueId, out var queue))
-					return;
-				queue.Publish(new ReaderCoreServiceMessage.StopReader(message.QueueId));
-			}
-
-			if (_activeSubComponents == 0) {
-				_publisher.Publish(
-					new ProjectionSubsystemMessage.ComponentStopped(ComponentName, _instanceCorrelationId));
-				_currentState = CoreCoordinatorState.Stopped;
-			}
-		}
-
-		public void SetupMessaging(ISubscriber bus) {
-			bus.Subscribe<ProjectionCoreServiceMessage.SubComponentStarted>(this);
-			bus.Subscribe<ProjectionCoreServiceMessage.SubComponentStopped>(this);
-			bus.Subscribe<ProjectionSubsystemMessage.StartComponents>(this);
-			bus.Subscribe<ProjectionSubsystemMessage.StopComponents>(this);
-		}
-
-		private enum CoreCoordinatorState {
-			Stopped,
-			Stopping,
-			Starting,
-			Started
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Management/ProjectionManager.cs b/src/EventStore.Projections.Core/Services/Management/ProjectionManager.cs
deleted file mode 100644
index ffbb43c8b67..00000000000
--- a/src/EventStore.Projections.Core/Services/Management/ProjectionManager.cs
+++ /dev/null
@@ -1,1356 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json.Nodes;
-using EventStore.Common.Options;
-using EventStore.Common.Utils;
-using EventStore.Core;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Projections.Core.Messages;
-using EventStore.Core.Helpers;
-using EventStore.Core.Telemetry;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Standard;
-using EventStore.Projections.Core.Common;
-using EventStore.Projections.Core.Metrics;
-using ILogger = Serilog.ILogger;
-using OperationResult = EventStore.Core.Messages.OperationResult;
-
-namespace EventStore.Projections.Core.Services.Management {
-	public class ProjectionManager
-		: IDisposable,
-			IHandle<ClientMessage.ReadStreamEventsBackwardCompleted>,
-			IHandle<ClientMessage.ReadStreamEventsForwardCompleted>,
-			IHandle<ClientMessage.WriteEventsCompleted>,
-			IHandle<ClientMessage.DeleteStreamCompleted>,
-			IHandle<ProjectionManagementMessage.Command.Post>,
-			IHandle<ProjectionManagementMessage.Command.PostBatch>,
-			IHandle<ProjectionManagementMessage.Command.UpdateQuery>,
-			IHandle<ProjectionManagementMessage.Command.GetQuery>,
-			IHandle<ProjectionManagementMessage.Command.Delete>,
-			IHandle<ProjectionManagementMessage.Command.GetStatistics>,
-			IHandle<ProjectionManagementMessage.Command.GetState>,
-			IHandle<ProjectionManagementMessage.Command.GetResult>,
-			IHandle<ProjectionManagementMessage.Command.Disable>,
-			IHandle<ProjectionManagementMessage.Command.Enable>,
-			IHandle<ProjectionManagementMessage.Command.Abort>,
-			IHandle<ProjectionManagementMessage.Command.SetRunAs>,
-			IHandle<ProjectionManagementMessage.Command.Reset>,
-			IHandle<ProjectionManagementMessage.Command.GetConfig>,
-			IHandle<ProjectionManagementMessage.Command.UpdateConfig>,
-			IHandle<ProjectionSubsystemMessage.StartComponents>,
-			IHandle<ProjectionSubsystemMessage.StopComponents>,
-			IHandle<ProjectionManagementMessage.Internal.CleanupExpired>,
-			IHandle<ProjectionManagementMessage.Internal.Deleted>,
-			IHandle<CoreProjectionStatusMessage.Started>,
-			IHandle<CoreProjectionStatusMessage.Stopped>,
-			IHandle<CoreProjectionStatusMessage.Faulted>,
-			IHandle<CoreProjectionStatusMessage.Prepared>,
-			IHandle<CoreProjectionStatusMessage.StateReport>,
-			IHandle<CoreProjectionStatusMessage.ResultReport>,
-			IHandle<CoreProjectionStatusMessage.StatisticsReport>,
-			IHandle<TelemetryMessage.Request> {
-		public const int ProjectionQueryId = -2;
-		public const int ProjectionCreationRetryCount = 1;
-		public const string ServiceName = "ProjectionManager";
-
-		private readonly ILogger _logger = Serilog.Log.ForContext<ProjectionManager>();
-
-		private readonly IPublisher _inputQueue;
-		private readonly IPublisher _publisher;
-		private readonly Tuple<Guid, IPublisher>[] _queues;
-		private readonly Guid[] _workers;
-		private readonly TimeSpan _projectionsQueryExpiry;
-
-		private readonly ITimeProvider _timeProvider;
-		private readonly ProjectionType _runProjections;
-		private readonly bool _initializeSystemProjections;
-		private readonly Dictionary<string, ManagedProjection> _projections;
-		private readonly Dictionary<Guid, string> _projectionsMap;
-
-		private readonly RequestResponseDispatcher<ClientMessage.WriteEvents, ClientMessage.WriteEventsCompleted>
-			_writeDispatcher;
-
-		private readonly RequestResponseDispatcher<ClientMessage.DeleteStream, ClientMessage.DeleteStreamCompleted>
-			_streamDispatcher;
-
-		private readonly
-			RequestResponseDispatcher
-			<ClientMessage.ReadStreamEventsForward, ClientMessage.ReadStreamEventsForwardCompleted>
-			_readForwardDispatcher;
-
-		private readonly ReadDispatcher _readDispatcher;
-
-		private int _readEventsBatchSize = 100;
-
-		private int _lastUsedQueue = 0;
-		private bool _started;
-		private bool _projectionsStarted;
-		private long _projectionsRegistrationExpectedVersion = 0;
-		private bool _isWritePending = false;
-		private HashSet<string> _projectionsRegistrationState = new HashSet<string>();
-		private readonly IEnvelope _publishEnvelope;
-
-		private readonly
-			RequestResponseDispatcher<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>
-			_getStateDispatcher;
-
-		private readonly
-			RequestResponseDispatcher
-			<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>
-			_getResultDispatcher;
-
-		private readonly IODispatcher _ioDispatcher;
-
-		private Guid _instanceCorrelationId = Guid.Empty;
-		private IProjectionTracker _projectionTracker;
-		private readonly TimeSpan _interval = TimeSpan.FromMilliseconds(2000);
-		private readonly TimerMessage.Schedule _getStats;
-
-		public ProjectionManager(
-			IPublisher inputQueue,
-			IPublisher publisher,
-			IDictionary<Guid, IPublisher> queueMap,
-			ITimeProvider timeProvider,
-			ProjectionType runProjections,
-			IODispatcher ioDispatcher,
-			TimeSpan projectionQueryExpiry,
-			IProjectionTracker projectionTracker,
-			bool initializeSystemProjections = true) {
-			if (inputQueue == null) throw new ArgumentNullException("inputQueue");
-			if (publisher == null) throw new ArgumentNullException("publisher");
-			if (queueMap == null) throw new ArgumentNullException("queueMap");
-			if (queueMap.Count == 0) throw new ArgumentException("At least one queue is required", "queueMap");
-
-			_inputQueue = inputQueue;
-			_publisher = publisher;
-			_queues = queueMap.Select(v => Tuple.Create(v.Key, v.Value)).ToArray();
-			_workers = _queues.Select(v => v.Item1).ToArray();
-
-			_timeProvider = timeProvider;
-			_runProjections = runProjections;
-			_initializeSystemProjections = initializeSystemProjections;
-			_ioDispatcher = ioDispatcher;
-			_projectionsQueryExpiry = projectionQueryExpiry;
-			_projectionTracker = projectionTracker;
-
-			_writeDispatcher =
-				new RequestResponseDispatcher<ClientMessage.WriteEvents, ClientMessage.WriteEventsCompleted>(
-					publisher,
-					v => v.CorrelationId,
-					v => v.CorrelationId,
-					_inputQueue);
-			_readDispatcher = new ReadDispatcher(
-				publisher,
-				v => v.CorrelationId,
-				v => v.CorrelationId,
-				v => v.CorrelationId,
-				_inputQueue);
-			_readForwardDispatcher =
-				new RequestResponseDispatcher
-					<ClientMessage.ReadStreamEventsForward, ClientMessage.ReadStreamEventsForwardCompleted>(
-						publisher,
-						v => v.CorrelationId,
-						v => v.CorrelationId,
-						_inputQueue);
-			_streamDispatcher =
-				new RequestResponseDispatcher<ClientMessage.DeleteStream, ClientMessage.DeleteStreamCompleted>(
-					publisher,
-					v => v.CorrelationId,
-					v => v.CorrelationId,
-					_inputQueue);
-
-			_projections = new Dictionary<string, ManagedProjection>();
-			_projectionsMap = new Dictionary<Guid, string>();
-			_publishEnvelope = _inputQueue;
-			_getStateDispatcher =
-				new RequestResponseDispatcher
-					<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>(
-						_publisher,
-						v => v.CorrelationId,
-						v => v.CorrelationId,
-						_inputQueue);
-			_getResultDispatcher =
-				new RequestResponseDispatcher
-					<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>(
-						_publisher,
-						v => v.CorrelationId,
-						v => v.CorrelationId,
-						_inputQueue);
-			_getStats = TimerMessage.Schedule.Create(_interval, _inputQueue,
-				new ProjectionManagementMessage.Command.GetStatistics(new CallbackEnvelope(PushStatsToProjectionTracker), ProjectionMode.AllNonTransient, null, true));
-		}
-
-		private void PushStatsToProjectionTracker(Message message) {
-			if (message is ProjectionManagementMessage.Statistics stats) {
-				_projectionTracker.OnNewStats(stats.Projections);
-			}
-			_publisher.Publish(_getStats);
-		}
-
-		public void Handle(ProjectionSubsystemMessage.StartComponents message) {
-			if (_started) {
-				_logger.Debug("PROJECTIONS: Projection manager already started. Correlation: {correlation}",
-					message.InstanceCorrelationId);
-				return;
-			}
-
-			_instanceCorrelationId = message.InstanceCorrelationId;
-			_logger.Debug("PROJECTIONS: Starting Projections Manager. Correlation: {correlation}", _instanceCorrelationId);
-
-			_started = true;
-			if (_runProjections >= ProjectionType.System)
-				StartExistingProjections(
-					() => {
-						_projectionsStarted = true;
-						_publisher.Publish(_getStats);
-						ScheduleExpire();
-					});
-			_publisher.Publish(new ProjectionSubsystemMessage.ComponentStarted(ServiceName, _instanceCorrelationId));
-		}
-
-		public void Handle(ProjectionSubsystemMessage.StopComponents message) {
-			if (!_started) {
-				_logger.Debug("PROJECTIONS: Projection manager already stopped. Correlation: {correlation}",
-					message.InstanceCorrelationId);
-				return;
-			}
-
-			if (_instanceCorrelationId != message.InstanceCorrelationId) {
-				_logger.Debug("PROJECTIONS: Projection Manager received stop request for incorrect correlation id." +
-				              "Current: {correlationId}. Requested: {requestedCorrelationId}", _instanceCorrelationId, message.InstanceCorrelationId);
-				return;
-			}
-			_logger.Debug("PROJECTIONS: Stopping Projections Manager. Correlation {correlation}", _instanceCorrelationId);
-			Stop();
-		}
-
-		private void ScheduleExpire() {
-			if (!_projectionsStarted)
-				return;
-			_publisher.Publish(
-				TimerMessage.Schedule.Create(
-					TimeSpan.FromSeconds(60),
-					_publishEnvelope,
-					new ProjectionManagementMessage.Internal.CleanupExpired()));
-		}
-
-		private void Stop() {
-			_started = false;
-			_projectionsStarted = false;
-			_ioDispatcher.StartDraining(() =>
-				_publisher.Publish(new ProjectionSubsystemMessage.IODispatcherDrained(ServiceName)));
-
-			_projections.Clear();
-			_projectionsMap.Clear();
-
-			_publisher.Publish(new ProjectionSubsystemMessage.ComponentStopped(ServiceName, _instanceCorrelationId));
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.Post message) {
-			if (!_projectionsStarted)
-				return;
-
-			if (message.Mode == ProjectionMode.Transient) {
-				var transientProjection = new PendingProjection(ProjectionQueryId, message);
-				if (!ValidateProjections(new [] {transientProjection}, message)) return;
-
-				PostNewTransientProjection(transientProjection, message.Envelope);
-			} else {
-				if (_isWritePending) {
-					DelayMessage(message);
-				} else {
-					var expectedVersion = _projectionsRegistrationExpectedVersion;
-					var pendingProjections = new Dictionary<string, PendingProjection> {
-						{message.Name, new PendingProjection(expectedVersion + 1, message)}
-					};
-					if (!ValidateProjections(pendingProjections.Values.ToArray(), message)) return;
-
-					PostNewProjections(pendingProjections, expectedVersion, message.Envelope);
-				}
-			}
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.PostBatch message) {
-			if (!_projectionsStarted || !message.Projections.Any())
-				return;
-
-			if (message.Projections.Any(p => p.Mode == ProjectionMode.Transient)) {
-				message.Envelope.ReplyWith(
-					new ProjectionManagementMessage.OperationFailed(
-						"Transient projections in batches are not supported."));
-				return;
-			}
-			if (_isWritePending) {
-				DelayMessage(message);
-			} else {
-				var expectedVersion = _projectionsRegistrationExpectedVersion;
-				var pendingProjections = new Dictionary<string, PendingProjection>();
-
-				var projectionId = expectedVersion + 1;
-				foreach (var projection in message.Projections) {
-					pendingProjections.Add(projection.Name, new PendingProjection(projectionId, projection));
-					projectionId++;
-				}
-
-				if (!ValidateProjections(pendingProjections.Values.ToArray(), message)) return;
-
-				PostNewProjections(pendingProjections, expectedVersion, message.Envelope);
-			}
-		}
-
-		private bool ValidateProjections(
-			PendingProjection[] projections,
-			ProjectionManagementMessage.Command.ControlMessage message) {
-			var duplicateNames = new List<string>();
-
-			foreach (var projection in projections) {
-				if (!ProjectionManagementMessage.RunAs.ValidateRunAs(
-						projection.Mode,
-						ReadWrite.Write,
-						null,
-						message,
-						replace: projection.EnableRunAs)) {
-
-					_logger.Information("PROJECTIONS: Projections batch rejected due to invalid RunAs");
-					message.Envelope.ReplyWith(
-						new ProjectionManagementMessage.OperationFailed("Invalid RunAs"));
-					return false;
-				}
-
-				if (string.IsNullOrWhiteSpace(projection.Name)) {
-					message.Envelope.ReplyWith(
-						new ProjectionManagementMessage.OperationFailed("Projection name is required"));
-					return false;
-				}
-
-				if (_projectionsRegistrationState.Contains(projection.Name)) {
-					duplicateNames.Add(projection.Name);
-				}
-			}
-
-			if (duplicateNames.Any()) {
-				var duplicatesMsg = $"Duplicate projection names : {string.Join(", ", duplicateNames)}";
-				_logger.Debug($"PROJECTIONS: Conflict. {duplicatesMsg}");
-				message.Envelope.ReplyWith(
-					new ProjectionManagementMessage.Conflict(duplicatesMsg));
-				return false;
-			}
-
-			return true;
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.Delete message) {
-			if (!_projectionsStarted)
-				return;
-			var projection = GetProjection(message.Name);
-			if (projection == null) {
-				message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
-				return;
-			}
-
-			if (IsSystemProjection(message.Name)) {
-				message.Envelope.ReplyWith(
-					new ProjectionManagementMessage.OperationFailed(
-						"We currently don't allow for the deletion of System Projections."));
-				return;
-			}
-
-			if (!ProjectionManagementMessage.RunAs.ValidateRunAs(projection.Mode, ReadWrite.Write, projection.RunAs,
-				message)) return;
-			try {
-				projection.Handle(message);
-			} catch (InvalidOperationException ex) {
-				message.Envelope.ReplyWith(new ProjectionManagementMessage.OperationFailed(ex.Message));
-			}
-		}
-
-		private bool IsSystemProjection(string name) {
-			return name == ProjectionNamesBuilder.StandardProjections.EventByCategoryStandardProjection ||
-			       name == ProjectionNamesBuilder.StandardProjections.EventByTypeStandardProjection ||
-			       name == ProjectionNamesBuilder.StandardProjections.StreamByCategoryStandardProjection ||
-			       name == ProjectionNamesBuilder.StandardProjections.StreamsStandardProjection ||
-			       name == ProjectionNamesBuilder.StandardProjections.EventByCorrIdStandardProjection;
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.GetQuery message) {
-			if (!_projectionsStarted)
-				return;
-			var projection = GetProjection(message.Name);
-			if (projection == null)
-				message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
-			else {
-				if (!ProjectionManagementMessage.RunAs.ValidateRunAs(projection.Mode, ReadWrite.Read, projection.RunAs,
-					message)) return;
-				projection.Handle(message);
-			}
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.UpdateQuery message) {
-			if (!_projectionsStarted)
-				return;
-			_logger.Information(
-				"Updating '{projection}' projection source to '{source}`",
-				message.Name,
-				message.Query);
-			var projection = GetProjection(message.Name);
-
-			if (projection == null)
-				message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
-			else {
-				if (!ProjectionManagementMessage.RunAs.ValidateRunAs(projection.Mode, ReadWrite.Write, projection.RunAs,
-					message)) return;
-				projection.Handle(message); // update query text
-			}
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.Disable message) {
-			if (!_projectionsStarted)
-				return;
-			_logger.Information("Disabling '{projection}' projection", message.Name);
-
-			var projection = GetProjection(message.Name);
-			if (projection == null)
-				message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
-			else {
-				if (!ProjectionManagementMessage.RunAs.ValidateRunAs(projection.Mode, ReadWrite.Write, projection.RunAs,
-					message)) return;
-				projection.Handle(message);
-			}
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.Enable message) {
-			if (!_projectionsStarted)
-				return;
-			_logger.Information("Enabling '{projection}' projection", message.Name);
-
-			var projection = GetProjection(message.Name);
-			if (projection == null) {
-				_logger.Error("DBG: PROJECTION *{projection}* NOT FOUND.", message.Name);
-				message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
-			} else {
-				if (!ProjectionManagementMessage.RunAs.ValidateRunAs(projection.Mode, ReadWrite.Write, projection.RunAs,
-					message)) return;
-				projection.Handle(message);
-			}
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.Abort message) {
-			if (!_projectionsStarted)
-				return;
-			_logger.Information("Aborting '{projection}' projection", message.Name);
-
-			var projection = GetProjection(message.Name);
-			if (projection == null)
-				message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
-			else {
-				if (!ProjectionManagementMessage.RunAs.ValidateRunAs(projection.Mode, ReadWrite.Write, projection.RunAs,
-					message)) return;
-				projection.Handle(message);
-			}
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.SetRunAs message) {
-			if (!_projectionsStarted)
-				return;
-			_logger.Information("Setting RunAs1 account for '{projection}' projection", message.Name);
-
-			var projection = GetProjection(message.Name);
-			if (projection == null) {
-				_logger.Error("DBG: PROJECTION *{projection}* NOT FOUND.", message.Name);
-				message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
-			} else {
-				if (
-					!ProjectionManagementMessage.RunAs.ValidateRunAs(
-						projection.Mode, ReadWrite.Write, projection.RunAs, message,
-						message.Action == ProjectionManagementMessage.Command.SetRunAs.SetRemove.Set)) return;
-
-				projection.Handle(message);
-			}
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.Reset message) {
-			if (!_projectionsStarted)
-				return;
-			_logger.Information("Resetting '{projection}' projection", message.Name);
-
-			var projection = GetProjection(message.Name);
-			if (projection == null) {
-				_logger.Error("DBG: PROJECTION *{projection}* NOT FOUND.", message.Name);
-				message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
-			} else {
-				if (!ProjectionManagementMessage.RunAs.ValidateRunAs(projection.Mode, ReadWrite.Write, projection.RunAs,
-					message)) return;
-				projection.Handle(message);
-			}
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.GetStatistics message) {
-			if (!_projectionsStarted)
-				return;
-			if (!string.IsNullOrEmpty(message.Name)) {
-				var projection = GetProjection(message.Name);
-				if (projection == null)
-					message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
-				else
-					message.Envelope.ReplyWith(
-						new ProjectionManagementMessage.Statistics(new[] {projection.GetStatistics()}));
-
-			} else {
-				var statuses = (from projectionNameValue in _projections
-					let projection = projectionNameValue.Value
-					where !projection.Deleted
-					where
-						message.Mode == null || message.Mode == projection.Mode
-						                     || (message.Mode.GetValueOrDefault() == ProjectionMode.AllNonTransient
-						                         && projection.Mode != ProjectionMode.Transient)
-					let status = projection.GetStatistics()
-					select status).ToArray();
-				message.Envelope.ReplyWith(new ProjectionManagementMessage.Statistics(statuses));
-			}
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.GetState message) {
-			if (!_projectionsStarted)
-				return;
-			var projection = GetProjection(message.Name);
-			if (projection == null)
-				message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
-			else
-				projection.Handle(message);
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.GetResult message) {
-			if (!_projectionsStarted)
-				return;
-			var projection = GetProjection(message.Name);
-			if (projection == null)
-				message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
-			else
-				projection.Handle(message);
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.GetConfig message) {
-			if (!_projectionsStarted)
-				return;
-			var projection = GetProjection(message.Name);
-			if (projection == null)
-				message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
-			else {
-				if (!ProjectionManagementMessage.RunAs.ValidateRunAs(projection.Mode, ReadWrite.Read, projection.RunAs,
-					message)) return;
-				projection.Handle(message);
-			}
-		}
-
-		public void Handle(ProjectionManagementMessage.Command.UpdateConfig message) {
-			if (!_projectionsStarted)
-				return;
-			var projection = GetProjection(message.Name);
-			if (projection == null)
-				message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
-			else {
-				if (!ProjectionManagementMessage.RunAs.ValidateRunAs(projection.Mode, ReadWrite.Read, projection.RunAs,
-					message)) return;
-				try {
-					projection.Handle(message);
-				} catch (InvalidOperationException ex) {
-					message.Envelope.ReplyWith(new ProjectionManagementMessage.OperationFailed(ex.Message));
-					return;
-				}
-			}
-		}
-
-		public void Handle(ProjectionManagementMessage.Internal.CleanupExpired message) {
-			ScheduleExpire();
-			CleanupExpired();
-		}
-
-		private void CleanupExpired() {
-			foreach (var managedProjection in _projections.ToArray()) {
-				managedProjection.Value.Handle(new ProjectionManagementMessage.Internal.CleanupExpired());
-			}
-		}
-
-		public void Handle(CoreProjectionStatusMessage.Started message) {
-			string name;
-			if (_projectionsMap.TryGetValue(message.ProjectionId, out name)) {
-				var projection = _projections[name];
-				projection.Handle(message);
-			}
-		}
-
-		public void Handle(CoreProjectionStatusMessage.Stopped message) {
-			string name;
-			if (_projectionsMap.TryGetValue(message.ProjectionId, out name)) {
-				var projection = _projections[name];
-				projection.Handle(message);
-			}
-		}
-
-		public void Handle(CoreProjectionStatusMessage.Faulted message) {
-			string name;
-			if (_projectionsMap.TryGetValue(message.ProjectionId, out name)) {
-				var projection = _projections[name];
-				projection.Handle(message);
-			}
-		}
-
-		public void Handle(CoreProjectionStatusMessage.Prepared message) {
-			string name;
-			if (_projectionsMap.TryGetValue(message.ProjectionId, out name)) {
-				var projection = _projections[name];
-				projection.Handle(message);
-			}
-		}
-
-		public void Handle(CoreProjectionStatusMessage.StateReport message) {
-			_getStateDispatcher.Handle(message);
-		}
-
-		public void Handle(CoreProjectionStatusMessage.ResultReport message) {
-			_getResultDispatcher.Handle(message);
-		}
-
-		public void Handle(CoreProjectionStatusMessage.StatisticsReport message) {
-			string name;
-			if (_projectionsMap.TryGetValue(message.ProjectionId, out name)) {
-				var projection = _projections[name];
-				projection.Handle(message);
-			}
-		}
-
-		public void Handle(ClientMessage.ReadStreamEventsBackwardCompleted message) {
-			_readDispatcher.Handle(message);
-		}
-
-		public void Handle(ClientMessage.ReadStreamEventsForwardCompleted message) {
-			_readForwardDispatcher.Handle(message);
-		}
-
-		public void Handle(ClientMessage.WriteEventsCompleted message) {
-			_writeDispatcher.Handle(message);
-		}
-
-		public void Handle(ClientMessage.DeleteStreamCompleted message) {
-			_streamDispatcher.Handle(message);
-		}
-
-		public void Handle(ProjectionManagementMessage.Internal.Deleted message) {
-			var projection = GetProjection(message.Name);
-
-			if (projection == null) return;
-
-			if (projection.Mode == ProjectionMode.Transient) {
-					// We don't need to write a delete, as transient projections don't write creations
-					_projections.Remove(message.Name);
-					_projectionsMap.Remove(message.Id);
-					_projectionsRegistrationState.Remove(message.Name);
-					return;
-			}
-
-			if (_isWritePending) {
-				DelayMessage(message);
-			} else {
-				DeleteProjection(message,
-					expVer => {
-						_projections.Remove(message.Name);
-						_projectionsMap.Remove(message.Id);
-						_projectionsRegistrationState.Remove(message.Name);
-						_projectionsRegistrationExpectedVersion = expVer;
-					});
-			}
-		}
-
-		private void DeleteProjection(
-			ProjectionManagementMessage.Internal.Deleted message, Action<long> completed, int retryCount = ProjectionCreationRetryCount) {
-			var corrId = Guid.NewGuid();
-			var writeDelete = new ClientMessage.WriteEvents(
-					corrId,
-					corrId,
-					_writeDispatcher.Envelope,
-					true,
-					ProjectionNamesBuilder.ProjectionsRegistrationStream,
-					_projectionsRegistrationExpectedVersion,
-					new Event(
-						Guid.NewGuid(),
-						ProjectionEventTypes.ProjectionDeleted,
-						false,
-						Helper.UTF8NoBom.GetBytes(message.Name),
-						Empty.ByteArray),
-					SystemAccounts.System);
-
-			_isWritePending = true;
-			_writeDispatcher.Publish(
-				writeDelete,
-				m => WriteProjectionDeletedCompleted(m, writeDelete, message, completed, retryCount));
-		}
-
-		public void Dispose() {
-			foreach (var projection in _projections.Values)
-				projection.Dispose();
-			_projections.Clear();
-		}
-
-		private ManagedProjection GetProjection(string name) {
-			ManagedProjection result;
-			return _projections.TryGetValue(name, out result) ? result : null;
-		}
-
-		private void StartExistingProjections(Action completed) {
-			var registeredProjections = new Dictionary<string, long>();
-			ReadProjectionsList(
-				registeredProjections,
-				r => StartRegisteredProjections(r, completed));
-		}
-
-		private void ReadProjectionsList(
-			IDictionary<string, long> registeredProjections,
-			Action<IDictionary<string, long>> completedAction,
-			long from = 0) {
-
-			_logger.Debug("PROJECTIONS: Reading Existing Projections from {stream}", ProjectionNamesBuilder.ProjectionsRegistrationStream);
-			var corrId = Guid.NewGuid();
-			_readForwardDispatcher.Publish(
-				new ClientMessage.ReadStreamEventsForward(
-					corrId,
-					corrId,
-					_readDispatcher.Envelope,
-					ProjectionNamesBuilder.ProjectionsRegistrationStream,
-					from,
-					_readEventsBatchSize,
-					resolveLinkTos: false,
-					requireLeader: false,
-					validationStreamVersion: null,
-					user: SystemAccounts.System,
-					replyOnExpired: false),
-				m => OnProjectionsListReadCompleted(m, registeredProjections, from, completedAction));
-		}
-
-		private void OnProjectionsListReadCompleted(
-			ClientMessage.ReadStreamEventsForwardCompleted msg,
-			IDictionary<string, long> registeredProjections,
-			long requestedFrom,
-			Action<IDictionary<string, long>> completedAction) {
-			switch (msg.Result) {
-				case ReadStreamResult.Success:
-					foreach (var evnt in msg.Events) {
-						var projectionId = evnt.Event.EventNumber;
-						if (projectionId == 0)
-							projectionId = Int32.MaxValue - 1;
-						if (evnt.Event.EventType == ProjectionEventTypes.ProjectionsInitialized) {
-							registeredProjections.Add(ProjectionEventTypes.ProjectionsInitialized, projectionId);
-							continue;
-						}
-
-						var projectionName = Helper.UTF8NoBom.GetString(evnt.Event.Data.Span);
-						if (string.IsNullOrEmpty(projectionName)
-						    || _projections.ContainsKey(projectionName)) {
-							_logger.Warning(
-								"PROJECTIONS: The following projection: {projection} has a duplicate registration event.",
-								projectionName);
-							continue;
-						}
-
-						if (evnt.Event.EventType == ProjectionEventTypes.ProjectionCreated) {
-							if (registeredProjections.ContainsKey(projectionName)) {
-								registeredProjections[projectionName] = projectionId;
-								_logger.Warning(
-									"PROJECTIONS: The following projection: {projection} has a duplicate created event. Using projection Id {projectionId}",
-									projectionName, projectionId);
-								continue;
-							}
-
-							registeredProjections.Add(projectionName, projectionId);
-						} else if (evnt.Event.EventType == ProjectionEventTypes.ProjectionDeleted) {
-							registeredProjections.Remove(projectionName);
-						}
-					}
-					_projectionsRegistrationExpectedVersion = msg.LastEventNumber;
-
-					if (!msg.IsEndOfStream) {
-						ReadProjectionsList(registeredProjections, completedAction, @from: msg.NextEventNumber);
-						return;
-					}
-
-					break;
-				case ReadStreamResult.StreamDeleted:
-				case ReadStreamResult.Error:
-				case ReadStreamResult.AccessDenied:
-					_logger.Fatal(
-						"There was an error reading the projections list due to {e}. Projections could not be loaded.",
-						msg.Result);
-					return;
-			}
-			completedAction(registeredProjections);
-		}
-
-		private void StartRegisteredProjections(IDictionary<string, long> registeredProjections,
-			Action completedAction) {
-			if (!registeredProjections.Any()) {
-				_logger.Debug("PROJECTIONS: No projections were found in {stream}, starting from empty stream",
-					ProjectionNamesBuilder.ProjectionsRegistrationStream);
-				WriteProjectionsInitialized(
-					() => {
-						completedAction();
-						CreateSystemProjections();
-					},
-					Guid.NewGuid());
-				return;
-			}
-
-			List<string> projections = registeredProjections
-				.Where(x => x.Key != ProjectionEventTypes.ProjectionsInitialized)
-				.Select(x => x.Key).ToList();
-
-			_logger.Debug(
-				"PROJECTIONS: Found the following projections in {stream}: {projections}",
-				ProjectionNamesBuilder.ProjectionsRegistrationStream,
-				projections);
-
-			foreach(var projection in projections)
-				_projectionsRegistrationState.Add(projection);
-
-			//create any missing system projections
-			CreateSystemProjections(registeredProjections.Select(x => x.Key).ToList());
-
-			foreach (var projectionRegistration in registeredProjections.Where(x =>
-				x.Key != ProjectionEventTypes.ProjectionsInitialized)) {
-				int queueIndex = GetNextWorkerIndex();
-				var managedProjection = CreateManagedProjectionInstance(
-					projectionRegistration.Key,
-					projectionRegistration.Value,
-					Guid.NewGuid(),
-					_workers[queueIndex]);
-				managedProjection.InitializeExisting(projectionRegistration.Key);
-			}
-
-			completedAction();
-		}
-
-		private bool IsProjectionEnabledToRunByMode(string projectionName) {
-			return _runProjections >= ProjectionType.All
-			       || _runProjections == ProjectionType.System && projectionName.StartsWith("$");
-		}
-
-		private void WriteProjectionsInitialized(Action action, Guid registrationEventId) {
-			var corrId = Guid.NewGuid();
-			_writeDispatcher.Publish(
-				new ClientMessage.WriteEvents(
-					corrId,
-					corrId,
-					_writeDispatcher.Envelope,
-					true,
-					ProjectionNamesBuilder.ProjectionsRegistrationStream,
-					ExpectedVersion.NoStream,
-					new Event(registrationEventId, ProjectionEventTypes.ProjectionsInitialized, false, Empty.ByteArray,
-						Empty.ByteArray),
-					SystemAccounts.System),
-				completed => WriteProjectionsInitializedCompleted(completed, registrationEventId, action));
-		}
-
-		private void WriteProjectionsInitializedCompleted(ClientMessage.WriteEventsCompleted completed,
-			Guid registrationEventId, Action action) {
-			switch (completed.Result) {
-				case OperationResult.Success:
-					action();
-					break;
-				case OperationResult.CommitTimeout:
-				case OperationResult.ForwardTimeout:
-				case OperationResult.PrepareTimeout:
-					WriteProjectionsInitialized(action, registrationEventId);
-					break;
-				default:
-					_logger.Fatal("Cannot initialize projections subsystem. Cannot write a fake projection");
-					break;
-			}
-		}
-
-		private void CreateSystemProjections() {
-			CreateSystemProjections(new List<string>());
-		}
-
-		private void CreateSystemProjections(List<string> existingSystemProjections) {
-			var systemProjections = new List<ProjectionManagementMessage.Command.PostBatch.ProjectionPost>();
-
-			if (!_initializeSystemProjections) {
-				return;
-			}
-
-			if (!existingSystemProjections.Contains(ProjectionNamesBuilder.StandardProjections
-				.StreamsStandardProjection))
-				systemProjections.Add(CreateSystemProjectionPost(
-					ProjectionNamesBuilder.StandardProjections.StreamsStandardProjection,
-					typeof(IndexStreams),
-					""));
-
-			if (!existingSystemProjections.Contains(ProjectionNamesBuilder.StandardProjections
-				.StreamByCategoryStandardProjection))
-				systemProjections.Add(CreateSystemProjectionPost(
-					ProjectionNamesBuilder.StandardProjections.StreamByCategoryStandardProjection,
-					typeof(CategorizeStreamByPath),
-					"first\r\n-"));
-
-			if (!existingSystemProjections.Contains(ProjectionNamesBuilder.StandardProjections
-				.EventByCategoryStandardProjection))
-				systemProjections.Add(CreateSystemProjectionPost(
-					ProjectionNamesBuilder.StandardProjections.EventByCategoryStandardProjection,
-					typeof(CategorizeEventsByStreamPath),
-					"first\r\n-"));
-
-			if (!existingSystemProjections.Contains(ProjectionNamesBuilder.StandardProjections
-				.EventByTypeStandardProjection))
-				systemProjections.Add(CreateSystemProjectionPost(
-					ProjectionNamesBuilder.StandardProjections.EventByTypeStandardProjection,
-					typeof(IndexEventsByEventType),
-					""));
-
-			if (!existingSystemProjections.Contains(ProjectionNamesBuilder.StandardProjections
-				.EventByCorrIdStandardProjection))
-				systemProjections.Add(CreateSystemProjectionPost(
-					ProjectionNamesBuilder.StandardProjections.EventByCorrIdStandardProjection,
-					typeof(ByCorrelationId),
-					"{\"correlationIdProperty\":\"$correlationId\"}"));
-
-			IEnvelope envelope = new NoopEnvelope();
-			var postBatchMessage = new ProjectionManagementMessage.Command.PostBatch(
-				envelope, ProjectionManagementMessage.RunAs.System, systemProjections.ToArray());
-			_publisher.Publish(postBatchMessage);
-		}
-
-		private ProjectionManagementMessage.Command.PostBatch.ProjectionPost CreateSystemProjectionPost
-			(string name, Type handlerType, string config) {
-			return new ProjectionManagementMessage.Command.PostBatch.ProjectionPost(
-				ProjectionMode.Continuous,
-				ProjectionManagementMessage.RunAs.System,
-				name,
-				"native:" + handlerType.Namespace + "." + handlerType.Name,
-				config,
-				enabled: false,
-				checkpointsEnabled: true,
-				emitEnabled: true,
-				trackEmittedStreams: false,
-				enableRunAs: true);
-		}
-
-		private void PostNewTransientProjection(PendingProjection projection, IEnvelope replyEnvelope) {
-			var initializer = projection.CreateInitializer(replyEnvelope);
-			ReadProjectionPossibleStream(projection.Name,
-				m => ReadProjectionPossibleStreamCompleted
-					(m, initializer, replyEnvelope));
-		}
-
-		private void PostNewProjections
-			(IDictionary<string, PendingProjection> newProjections, long expectedVersion, IEnvelope replyEnvelope) {
-			var corrId = Guid.NewGuid();
-			var events = new List<Event>();
-
-			foreach (var projection in newProjections.Values) {
-				if (projection.Mode >= ProjectionMode.OneTime) {
-					var eventId = Guid.NewGuid();
-					events.Add(new Event(
-						eventId,
-						ProjectionEventTypes.ProjectionCreated,
-						false,
-						Helper.UTF8NoBom.GetBytes(projection.Name),
-						Empty.ByteArray));
-				} else {
-					_logger.Warning("PROJECTIONS: Should not be processing transient projections here.");
-				}
-			}
-
-			if (!events.Any()) return;
-
-			var writeEvents = new ClientMessage.WriteEvents(
-				corrId,
-				corrId,
-				_writeDispatcher.Envelope,
-				true,
-				ProjectionNamesBuilder.ProjectionsRegistrationStream,
-				expectedVersion,
-				events.ToArray(),
-				SystemAccounts.System);
-
-			_isWritePending = true;
-			_writeDispatcher.Publish(
-				writeEvents,
-				m => WriteNewProjectionsCompleted
-					(m, writeEvents, newProjections, replyEnvelope));
-		}
-
-
-		private void WriteNewProjectionsCompleted(ClientMessage.WriteEventsCompleted completed,
-			ClientMessage.WriteEvents write,
-			IDictionary<string, PendingProjection> newProjections,
-			IEnvelope envelope, int retryCount = ProjectionCreationRetryCount) {
-
-			_isWritePending = false;
-			if (completed.Result == OperationResult.Success) {
-				foreach (var name in newProjections.Keys)
-					_projectionsRegistrationState.Add(name);
-
-				_projectionsRegistrationExpectedVersion = completed.LastEventNumber;
-				StartNewlyRegisteredProjections(newProjections, OnProjectionsRegistrationCaughtUp, envelope);
-				return;
-			}
-
-			_logger.Information(
-				"PROJECTIONS: Created event for projections has not been written to {stream}: {projections}. Error: {error}",
-				ProjectionNamesBuilder.ProjectionsRegistrationStream,
-				newProjections.Keys,
-				Enum.GetName(typeof(OperationResult), completed.Result));
-
-			if (completed.Result == OperationResult.ForwardTimeout ||
-				completed.Result == OperationResult.PrepareTimeout ||
-				completed.Result == OperationResult.CommitTimeout) {
-				if (retryCount > 0) {
-					_logger.Information("PROJECTIONS: Retrying write projection creations for {projections}",
-						newProjections.Keys);
-					_isWritePending = true;
-					_writeDispatcher.Publish(
-						write,
-						m => WriteNewProjectionsCompleted
-							(m, write, newProjections, envelope, retryCount - 1));
-					return;
-				}
-			}
-
-			envelope.ReplyWith(new ProjectionManagementMessage.OperationFailed(
-				string.Format(
-					"The projections '{0}' could not be created because the registration could not be written due to {1}",
-					string.Join(", ", newProjections.Keys), completed.Result)));
-		}
-
-		private void StartNewlyRegisteredProjections
-			(IDictionary<string, PendingProjection> newProjections,
-			Action completedAction, IEnvelope replyEnvelope) {
-
-			if (!newProjections.Any()) {
-				replyEnvelope.ReplyWith(
-					new ProjectionManagementMessage.OperationFailed("Projections were invalid"));
-				return;
-			}
-
-			_logger.Debug(
-				"PROJECTIONS: Found the following new projections in {stream}: {projections}",
-				ProjectionNamesBuilder.ProjectionsRegistrationStream,
-				newProjections.Keys);
-
-			try {
-				foreach (var projection in newProjections.Values) {
-					var initializer = projection.CreateInitializer(replyEnvelope);
-					ReadProjectionPossibleStream(projection.Name,
-						m => ReadProjectionPossibleStreamCompleted
-							(m, initializer, replyEnvelope));
-				}
-			} catch (Exception ex) {
-				replyEnvelope.ReplyWith(new ProjectionManagementMessage.OperationFailed(ex.Message));
-			}
-
-			completedAction();
-		}
-
-		private void ReadProjectionPossibleStream(
-			string projectionName,
-			Action<ClientMessage.ReadStreamEventsBackwardCompleted> onComplete) {
-			var corrId = Guid.NewGuid();
-			_readDispatcher.Publish(
-				new ClientMessage.ReadStreamEventsBackward(
-					corrId,
-					corrId,
-					_readDispatcher.Envelope,
-					ProjectionNamesBuilder.ProjectionsStreamPrefix + projectionName,
-					0,
-					_readEventsBatchSize,
-					resolveLinkTos: false,
-					requireLeader: false,
-					validationStreamVersion: null,
-					user: SystemAccounts.System),
-				new ReadStreamEventsBackwardHandlers.Optimistic(onComplete));
-		}
-
-		private void ReadProjectionPossibleStreamCompleted(
-			ClientMessage.ReadStreamEventsBackwardCompleted completed,
-			NewProjectionInitializer initializer,
-			IEnvelope replyEnvelope) {
-
-			long version = -1;
-			if (completed.Result == ReadStreamResult.Success) {
-				version = completed.LastEventNumber + 1;
-			}
-
-			try {
-				int queueIndex = GetNextWorkerIndex();
-				initializer.
-					CreateAndInitializeNewProjection(this, Guid.NewGuid(), _workers[queueIndex],
-					version: version);
-			} catch (Exception ex) {
-				replyEnvelope.ReplyWith(new ProjectionManagementMessage.OperationFailed(ex.Message));
-			}
-		}
-
-		private void OnProjectionsRegistrationCaughtUp() {
-			_logger.Debug($"PROJECTIONS: Caught up with projections registration. Next expected version: {_projectionsRegistrationExpectedVersion}");
-		}
-
-		private void WriteProjectionDeletedCompleted(ClientMessage.WriteEventsCompleted writeCompleted,
-			ClientMessage.WriteEvents writeDelete,
-			ProjectionManagementMessage.Internal.Deleted message,
-			Action<long> onCompleted,
-			int retryCount) {
-
-			_isWritePending = false;
-			if (writeCompleted.Result == OperationResult.Success) {
-				onCompleted?.Invoke(writeCompleted.LastEventNumber);
-				return;
-			}
-
-			_logger.Information(
-				"PROJECTIONS: Projection '{projection}' deletion has not been written to {stream}. Error: {e}",
-				message.Name,
-				ProjectionNamesBuilder.ProjectionsRegistrationStream,
-				Enum.GetName(typeof(OperationResult), writeCompleted.Result));
-
-			if (writeCompleted.Result == OperationResult.CommitTimeout || writeCompleted.Result == OperationResult.ForwardTimeout
-																	   || writeCompleted.Result == OperationResult.PrepareTimeout) {
-				if (retryCount > 0) {
-					_logger.Information("PROJECTIONS: Retrying write projection deletion for {projection}", message.Name);
-					_isWritePending = true;
-					_writeDispatcher.Publish(
-						writeDelete,
-						m => WriteProjectionDeletedCompleted(m, writeDelete, message, onCompleted, retryCount - 1));
-					return;
-				}
-			}
-
-			if (writeCompleted.Result == OperationResult.WrongExpectedVersion) {
-				_logger.Error("PROJECTIONS: Got wrong expected version writing projection deletion for {projection}.",
-					message.Name);
-				return;
-			}
-
-			_logger.Error(
-				"PROJECTIONS: The projection '{0}' could not be deleted because the deletion event could not be written due to {1}",
-				message.Name, writeCompleted.Result);
-		}
-
-		private void DelayMessage(Message messageToDelay) {
-			_publisher.Publish(TimerMessage.Schedule.Create(TimeSpan.FromSeconds(2), _inputQueue, messageToDelay));
-		}
-
-		public class NewProjectionInitializer {
-			private readonly long _projectionId;
-			private readonly bool _enabled;
-			private readonly string _handlerType;
-			private readonly string _query;
-			private readonly ProjectionMode _projectionMode;
-			private readonly bool _emitEnabled;
-			private readonly bool _checkpointsEnabled;
-			private readonly bool _trackEmittedStreams;
-			private readonly bool _enableRunAs;
-			private readonly ProjectionManagementMessage.RunAs _runAs;
-			private readonly IEnvelope _replyEnvelope;
-			private readonly string _name;
-
-			public NewProjectionInitializer(
-				long projectionId,
-				string name,
-				ProjectionMode projectionMode,
-				string handlerType,
-				string query,
-				bool enabled,
-				bool emitEnabled,
-				bool checkpointsEnabled,
-				bool enableRunAs,
-				bool trackEmittedStreams,
-				ProjectionManagementMessage.RunAs runAs,
-				IEnvelope replyEnvelope) {
-				if (projectionMode >= ProjectionMode.Continuous && !checkpointsEnabled)
-					throw new InvalidOperationException("Continuous mode requires checkpoints");
-
-				if (emitEnabled && !checkpointsEnabled)
-					throw new InvalidOperationException("Emit requires checkpoints");
-
-				_projectionId = projectionId;
-				_enabled = enabled;
-				_handlerType = handlerType;
-				_query = query;
-				_projectionMode = projectionMode;
-				_emitEnabled = emitEnabled;
-				_checkpointsEnabled = checkpointsEnabled;
-				_trackEmittedStreams = trackEmittedStreams;
-				_enableRunAs = enableRunAs;
-				_runAs = runAs;
-				_replyEnvelope = replyEnvelope;
-				_name = name;
-			}
-
-			public void CreateAndInitializeNewProjection(
-				ProjectionManager projectionManager,
-				Guid projectionCorrelationId,
-				Guid workerId,
-				long? version = -1) {
-				var projection = projectionManager.CreateManagedProjectionInstance(
-					_name,
-					_projectionId,
-					projectionCorrelationId,
-					workerId);
-				projection.InitializeNew(
-					new ManagedProjection.PersistedState {
-						Enabled = _enabled,
-						HandlerType = _handlerType,
-						Query = _query,
-						Mode = _projectionMode,
-						EmitEnabled = _emitEnabled,
-						CheckpointsDisabled = !_checkpointsEnabled,
-						TrackEmittedStreams = _trackEmittedStreams,
-						CheckpointHandledThreshold = ProjectionConsts.CheckpointHandledThreshold,
-						CheckpointAfterMs = (int)ProjectionConsts.CheckpointAfterMs.TotalMilliseconds,
-						MaxAllowedWritesInFlight = ProjectionConsts.MaxAllowedWritesInFlight,
-						Epoch = -1,
-						Version = version,
-						RunAs = _enableRunAs ? SerializedRunAs.SerializePrincipal(_runAs) : null,
-						ProjectionSubsystemVersion = ProjectionsSubsystem.VERSION,
-						ProjectionExecutionTimeout = null
-					},
-					_replyEnvelope);
-			}
-		}
-
-		private ManagedProjection CreateManagedProjectionInstance(
-			string name,
-			long projectionId,
-			Guid projectionCorrelationId,
-			Guid workerID) {
-			var enabledToRun = IsProjectionEnabledToRunByMode(name);
-			var workerId = workerID;
-			var managedProjectionInstance = new ManagedProjection(
-				workerId,
-				projectionCorrelationId,
-				projectionId,
-				name,
-				enabledToRun,
-				_logger,
-				_streamDispatcher,
-				_writeDispatcher,
-				_readDispatcher,
-				_publisher,
-				_timeProvider,
-				_getStateDispatcher,
-				_getResultDispatcher,
-				_ioDispatcher,
-				_projectionsQueryExpiry);
-
-			_projectionsMap.Add(projectionCorrelationId, name);
-			_projections.Add(name, managedProjectionInstance);
-			_logger.Debug("Adding projection {projectionCorrelationId}@{projection} to list", projectionCorrelationId,
-				name);
-			return managedProjectionInstance;
-		}
-
-		private int GetNextWorkerIndex() {
-			if (_lastUsedQueue >= _workers.Length)
-				_lastUsedQueue = 0;
-			var queueIndex = _lastUsedQueue;
-			_lastUsedQueue++;
-			return queueIndex;
-		}
-
-		public class PendingProjection {
-			public ProjectionMode Mode { get; }
-			public SerializedRunAs RunAs { get; }
-			public string Name { get; }
-			public string HandlerType { get; }
-			public string Query { get; }
-			public bool Enabled { get; }
-			public bool CheckpointsEnabled { get; }
-			public bool EmitEnabled { get; }
-			public bool EnableRunAs { get; }
-			public bool TrackEmittedStreams { get; }
-			public long ProjectionId { get; }
-
-			public PendingProjection(
-				long projectionId, ProjectionMode mode, SerializedRunAs runAs, string name, string handlerType, string query,
-				bool enabled, bool checkpointsEnabled, bool emitEnabled, bool enableRunAs,
-				bool trackEmittedStreams) {
-				ProjectionId = projectionId;
-				Mode = mode;
-				RunAs = runAs;
-				Name = name;
-				HandlerType = handlerType;
-				Query = query;
-				Enabled = enabled;
-				CheckpointsEnabled = checkpointsEnabled;
-				EmitEnabled = emitEnabled;
-				EnableRunAs = enableRunAs;
-				TrackEmittedStreams = trackEmittedStreams;
-			}
-
-			public PendingProjection(long projectionId, ProjectionManagementMessage.Command.PostBatch.ProjectionPost projection)
-				: this(projectionId, projection.Mode, projection.RunAs, projection.Name, projection.HandlerType,
-					projection.Query, projection.Enabled, projection.CheckpointsEnabled,
-					projection.EmitEnabled, projection.EnableRunAs, projection.TrackEmittedStreams) { }
-
-			public PendingProjection(long projectionId, ProjectionManagementMessage.Command.Post projection)
-				: this(projectionId, projection.Mode, projection.RunAs, projection.Name, projection.HandlerType,
-					projection.Query, projection.Enabled, projection.CheckpointsEnabled,
-					projection.EmitEnabled, projection.EnableRunAs, projection.TrackEmittedStreams) { }
-
-			public NewProjectionInitializer CreateInitializer(IEnvelope replyEnvelope) {
-				return new NewProjectionInitializer(
-					ProjectionId,
-					Name,
-					Mode,
-					HandlerType,
-					Query,
-					Enabled,
-					EmitEnabled,
-					CheckpointsEnabled,
-					EnableRunAs,
-					TrackEmittedStreams,
-					RunAs,
-					replyEnvelope);
-			}
-		}
-
-		public void Handle(TelemetryMessage.Request message) {
-			var customProjectionCount = 0;
-			var customProjectionRunningCount = 0;
-			var standardProjectionCount = 0;
-			var standardProjectionRunningCount = 0;
-
-			foreach (var proj in _projections.Values) {
-				if (proj.Mode != ProjectionMode.Continuous)
-					continue;
-
-				var stats = proj.GetStatistics();
-
-				if (stats.Name.StartsWith("$")) {
-					standardProjectionCount += 1;
-
-					if (stats.Status.Contains("Running"))
-						standardProjectionRunningCount += 1;
-				} else {
-					customProjectionCount += 1;
-
-					if (stats.Status.Contains("Running"))
-						customProjectionRunningCount += 1;
-				}
-			}
-
-			message.Envelope.ReplyWith(new TelemetryMessage.Response("projections", new JsonObject {
-				["customProjectionCount"] = customProjectionCount,
-				["standardProjectionCount"] = standardProjectionCount,
-				["customProjectionRunningCount"] = customProjectionRunningCount,
-				["standardProjectionRunningCount"] = standardProjectionRunningCount,
-				["totalCount"] = customProjectionCount + standardProjectionCount,
-				["totalRunningCount"] = customProjectionRunningCount + standardProjectionRunningCount,
-			}));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Management/ProjectionManagerMessageDispatcher.cs b/src/EventStore.Projections.Core/Services/Management/ProjectionManagerMessageDispatcher.cs
deleted file mode 100644
index 65f1c50e524..00000000000
--- a/src/EventStore.Projections.Core/Services/Management/ProjectionManagerMessageDispatcher.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Projections.Core.Messages;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Projections.Core.Services.Management {
-	public class ProjectionManagerMessageDispatcher
-		: IHandle<CoreProjectionManagementControlMessage> {
-		private readonly ILogger _logger = Serilog.Log.ForContext<ProjectionManager>();
-		private readonly IDictionary<Guid, IPublisher> _queueMap;
-
-		public ProjectionManagerMessageDispatcher(IDictionary<Guid, IPublisher> queueMap) {
-			_queueMap = queueMap;
-		}
-
-		public void Handle(CoreProjectionManagementControlMessage message) {
-			DispatchWorkerMessage(message, message.WorkerId);
-		}
-
-		private void DispatchWorkerMessage(Message message, Guid workerId) {
-			IPublisher worker;
-			if (_queueMap.TryGetValue(workerId, out worker))
-				worker.Publish(message);
-			else
-				_logger.Information("Cannot find a worker with ID: {workerId}", workerId);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Management/ProjectionStateHandlerFactory.cs b/src/EventStore.Projections.Core/Services/Management/ProjectionStateHandlerFactory.cs
deleted file mode 100644
index 24b72292a9b..00000000000
--- a/src/EventStore.Projections.Core/Services/Management/ProjectionStateHandlerFactory.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Projections.Core.Services.Interpreted;
-
-namespace EventStore.Projections.Core.Services.Management {
-
-
-	public class ProjectionStateHandlerFactory {
-		private readonly TimeSpan _javascriptCompilationTimeout;
-		private readonly TimeSpan _javascriptExecutionTimeout;
-
-		public ProjectionStateHandlerFactory(TimeSpan javascriptCompilationTimeout, TimeSpan javascriptExecutionTimeout) {
-			_javascriptCompilationTimeout = javascriptCompilationTimeout;
-			_javascriptExecutionTimeout = javascriptExecutionTimeout;
-		}
-		public IProjectionStateHandler Create(
-			string factoryType, string source,
-			bool enableContentTypeValidation,
-			int? projectionExecutionTimeout,
-			Action<string, object[]> logger = null) {
-			var colonPos = factoryType.IndexOf(':');
-			string kind = null;
-			string rest = null;
-			if (colonPos > 0) {
-				kind = factoryType.Substring(0, colonPos);
-				rest = factoryType.Substring(colonPos + 1);
-			} else {
-				kind = factoryType;
-			}
-
-			IProjectionStateHandler result;
-			var executionTimeout = projectionExecutionTimeout is > 0
-				? TimeSpan.FromMilliseconds(projectionExecutionTimeout.Value)
-				: _javascriptExecutionTimeout;
-			switch (kind.ToLowerInvariant()) {
-				case "js":
-					result = new JintProjectionStateHandler(source, enableContentTypeValidation,
-						_javascriptCompilationTimeout, executionTimeout);
-					break;
-				case "native":
-					var type = Type.GetType(rest);
-					if (type == null) {
-						//TODO: explicitly list all the assemblies to look for handlers
-						type =
-							AppDomain.CurrentDomain.GetAssemblies()
-								.Select(v => v.GetType(rest))
-								.FirstOrDefault(v => v != null);
-					}
-
-					var handler = Activator.CreateInstance(type, source, logger);
-					result = (IProjectionStateHandler)handler;
-					break;
-				default:
-					throw new NotSupportedException(string.Format("'{0}' handler type is not supported", factoryType));
-			}
-
-			return result;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/CheckpointTag.cs b/src/EventStore.Projections.Core/Services/Processing/Checkpointing/CheckpointTag.cs
deleted file mode 100644
index d3baf4fed5c..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/CheckpointTag.cs
+++ /dev/null
@@ -1,778 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace EventStore.Projections.Core.Services.Processing.Checkpointing {
-	public class CheckpointTag : IComparable<CheckpointTag> {
-		public readonly int Phase;
-
-		public readonly TFPos Position;
-
-		//TODO: rename to StreamsOrEventTypes or just Positions
-		public readonly Dictionary<string, long> Streams;
-
-		public readonly string CatalogStream;
-		public readonly string DataStream;
-		public readonly long CatalogPosition;
-		public readonly long DataPosition;
-
-		internal enum Mode {
-			Phase,
-			Position,
-			Stream,
-			MultiStream,
-			EventTypeIndex,
-			PreparePosition,
-			ByStream
-		}
-
-		private CheckpointTag(int phase, bool completed) {
-			Phase = phase;
-			Position = completed ? new TFPos(long.MaxValue, long.MaxValue) : new TFPos(long.MinValue, long.MinValue);
-			Streams = null;
-			Mode_ = CalculateMode();
-		}
-
-		private CheckpointTag(int phase, TFPos position, Dictionary<string, long> streams) {
-			Phase = phase;
-			Position = position;
-			Streams = streams;
-			Mode_ = CalculateMode();
-		}
-
-		private CheckpointTag(int phase, long preparePosition) {
-			Phase = phase;
-			Position = new TFPos(long.MinValue, preparePosition);
-			Mode_ = CalculateMode();
-		}
-
-		private CheckpointTag(int phase, TFPos position) {
-			Phase = phase;
-			Position = position;
-			Mode_ = CalculateMode();
-		}
-
-		private CheckpointTag(int phase, IDictionary<string, long> streams) {
-			Phase = phase;
-			foreach (var stream in streams) {
-				if (stream.Key == "") throw new ArgumentException("Empty stream name", "streams");
-				if (stream.Value < 0 && stream.Value != ExpectedVersion.NoStream)
-					throw new ArgumentException("Invalid sequence number", "streams");
-			}
-
-			Streams = new Dictionary<string, long>(streams); // clone
-			Position = new TFPos(Int64.MinValue, Int64.MinValue);
-			Mode_ = CalculateMode();
-		}
-
-		private CheckpointTag(int phase, IDictionary<string, long> eventTypes, TFPos position) {
-			Phase = phase;
-			Position = position;
-			foreach (var stream in eventTypes) {
-				if (stream.Key == "") throw new ArgumentException("Empty stream name", "eventTypes");
-				if (stream.Value < 0 && stream.Value != ExpectedVersion.NoStream)
-					throw new ArgumentException("Invalid sequence number", "eventTypes");
-			}
-
-			Streams = new Dictionary<string, long>(eventTypes); // clone
-			Mode_ = CalculateMode();
-		}
-
-		private CheckpointTag(int phase, string stream, long sequenceNumber) {
-			Phase = phase;
-			if (stream == null) throw new ArgumentNullException("stream");
-			if (stream == "") throw new ArgumentException("stream");
-			if (sequenceNumber < 0 && sequenceNumber != ExpectedVersion.NoStream)
-				throw new ArgumentException("sequenceNumber");
-			Position = new TFPos(Int64.MinValue, Int64.MinValue);
-			Streams = new Dictionary<string, long> {{stream, sequenceNumber}};
-			Mode_ = CalculateMode();
-		}
-
-		private CheckpointTag(
-			int phase, string catalogStream, long catalogPosition, string dataStream, long dataPosition,
-			long commitPosition) {
-			Phase = phase;
-			CatalogStream = catalogStream;
-			CatalogPosition = catalogPosition;
-			DataStream = dataStream;
-			DataPosition = dataPosition;
-			Position = new TFPos(commitPosition, Int64.MinValue);
-			Mode_ = Mode.ByStream;
-		}
-
-		private Mode CalculateMode() {
-			if (Streams == null || Streams.Count == 0)
-				if (Position.CommitPosition == Int64.MinValue && Position.PreparePosition == Int64.MinValue)
-					return Mode.Phase;
-				else if (Position.CommitPosition == Int64.MaxValue && Position.PreparePosition == Int64.MaxValue)
-					return Mode.Phase;
-				else if (Position.CommitPosition == Int64.MinValue && Position.PreparePosition != Int64.MinValue)
-					return Mode.PreparePosition;
-				else
-					return Mode.Position;
-			if (Position != new TFPos(Int64.MinValue, Int64.MinValue))
-				return Mode.EventTypeIndex;
-			if (Streams.Count == 1)
-				return Mode.Stream;
-			return Mode.MultiStream;
-		}
-
-		public static bool operator >(CheckpointTag left, CheckpointTag right) {
-			if (ReferenceEquals(left, right))
-				return false;
-			if (!ReferenceEquals(left, null) && ReferenceEquals(right, null))
-				return true;
-			if (ReferenceEquals(left, null) && !ReferenceEquals(right, null))
-				return false;
-			if (left.Phase > right.Phase)
-				return true;
-			if (left.Phase < right.Phase)
-				return false;
-			var leftMode = left.Mode_;
-			var rightMode = right.Mode_;
-			UpgradeModes(ref leftMode, ref rightMode);
-			if (leftMode != rightMode)
-				throw new NotSupportedException("Cannot compare checkpoint tags in different modes");
-			switch (leftMode) {
-				case Mode.ByStream:
-					CheckCatalogCompatibility(left, right);
-					return left.CatalogPosition > right.CatalogPosition
-					       || (left.CatalogPosition == right.CatalogPosition && left.DataPosition > right.DataPosition);
-				case Mode.Phase:
-					return left.Position > right.Position;
-				case Mode.Position:
-				case Mode.EventTypeIndex:
-					return left.Position > right.Position;
-				case Mode.PreparePosition:
-					return left.PreparePosition > right.PreparePosition;
-				case Mode.Stream:
-					if (left.Streams.Keys.First() != right.Streams.Keys.First())
-						throw new InvalidOperationException("Cannot compare checkpoint tags across different streams");
-					var result = left.Streams.Values.First() > right.Streams.Values.First();
-					return result;
-				case Mode.MultiStream:
-					long rvalue;
-					bool anyLeftGreater = left.Streams.Any(l =>
-						!right.Streams.TryGetValue(l.Key, out rvalue) || l.Value > rvalue);
-
-					long lvalue;
-					bool anyRightGreater = right.Streams.Any(r =>
-						!left.Streams.TryGetValue(r.Key, out lvalue) || r.Value > lvalue);
-
-					if (anyLeftGreater && anyRightGreater)
-						ThrowIncomparable(left, right);
-					return anyLeftGreater;
-				default:
-					throw new NotSupportedException("Checkpoint tag mode is not supported in comparison");
-			}
-		}
-
-		private static void CheckCatalogCompatibility(CheckpointTag left, CheckpointTag right) {
-			if (left.CatalogStream != right.CatalogStream)
-				throw new Exception("Cannot compare tags with different catalog streams");
-		}
-
-		private static void ThrowIncomparable(CheckpointTag left, CheckpointTag right) {
-			throw new InvalidOperationException(
-				string.Format("Incomparable multi-stream checkpoint tags. '{0}' and '{1}'", left, right));
-		}
-
-		public static bool operator >=(CheckpointTag left, CheckpointTag right) {
-			if (ReferenceEquals(left, right))
-				return true;
-			if (!ReferenceEquals(left, null) && ReferenceEquals(right, null))
-				return true;
-			if (ReferenceEquals(left, null) && !ReferenceEquals(right, null))
-				return false;
-			if (left.Phase > right.Phase)
-				return true;
-			if (left.Phase < right.Phase)
-				return false;
-			var leftMode = left.Mode_;
-			var rightMode = right.Mode_;
-			UpgradeModes(ref leftMode, ref rightMode);
-			if (leftMode != rightMode)
-				throw new NotSupportedException("Cannot compare checkpoint tags in different modes");
-			switch (leftMode) {
-				case Mode.ByStream:
-					CheckCatalogCompatibility(left, right);
-					return left.CatalogPosition > right.CatalogPosition
-					       || (left.CatalogPosition == right.CatalogPosition &&
-					           left.DataPosition >= right.DataPosition);
-				case Mode.Phase:
-					return left.Position >= right.Position;
-				case Mode.Position:
-				case Mode.EventTypeIndex:
-					return left.Position >= right.Position;
-				case Mode.PreparePosition:
-					return left.PreparePosition >= right.PreparePosition;
-				case Mode.Stream:
-					if (left.Streams.Keys.First() != right.Streams.Keys.First())
-						throw new InvalidOperationException("Cannot compare checkpoint tags across different streams");
-					var result = left.Streams.Values.First() >= right.Streams.Values.First();
-					return result;
-				case Mode.MultiStream:
-					long rvalue;
-					bool anyLeftGreater = left.Streams.Any(l =>
-						!right.Streams.TryGetValue(l.Key, out rvalue) || l.Value > rvalue);
-
-					long lvalue;
-					bool anyRightGreater = right.Streams.Any(r =>
-						!left.Streams.TryGetValue(r.Key, out lvalue) || r.Value > lvalue);
-
-					if (anyLeftGreater && anyRightGreater)
-						ThrowIncomparable(left, right);
-					return !anyRightGreater;
-				default:
-					throw new NotSupportedException("Checkpoint tag mode is not supported in comparison");
-			}
-		}
-
-		public static bool operator <(CheckpointTag left, CheckpointTag right) {
-			return !(left >= right);
-		}
-
-		public static bool operator <=(CheckpointTag left, CheckpointTag right) {
-			return !(left > right);
-		}
-
-		public static bool operator ==(CheckpointTag left, CheckpointTag right) {
-			return Equals(left, right);
-		}
-
-		public static bool operator !=(CheckpointTag left, CheckpointTag right) {
-			return !(left == right);
-		}
-
-		protected bool Equals(CheckpointTag other) {
-			if (Phase != other.Phase)
-				return false;
-			var leftMode = Mode_;
-			var rightMode = other.Mode_;
-			if (leftMode != rightMode)
-				return false;
-			UpgradeModes(ref leftMode, ref rightMode);
-			switch (leftMode) {
-				case Mode.ByStream:
-					return CatalogStream == other.CatalogStream && CatalogPosition == other.CatalogPosition
-					                                            && DataStream == other.DataStream &&
-					                                            DataPosition == other.DataPosition
-					                                            && CommitPosition == other.CommitPosition;
-				case Mode.Phase:
-					return Position == other.Position;
-				case Mode.EventTypeIndex:
-					// NOTE: we ignore stream positions as they are only suggestion on
-					//       where to start to gain better performance
-					goto case Mode.Position;
-				case Mode.Position:
-					return Position == other.Position;
-				case Mode.PreparePosition:
-					return PreparePosition == other.PreparePosition;
-				case Mode.Stream:
-					if (Streams.Keys.First() != other.Streams.Keys.First())
-						return false;
-					var result = Streams.Values.First() == other.Streams.Values.First();
-					return result;
-				case Mode.MultiStream:
-					long rvalue = 0;
-					return Streams.Count == other.Streams.Count
-					       && Streams.All(l => other.Streams.TryGetValue(l.Key, out rvalue) && l.Value == rvalue);
-				default:
-					throw new NotSupportedException("Checkpoint tag mode is not supported in comparison");
-			}
-		}
-
-		public override bool Equals(object obj) {
-			if (ReferenceEquals(null, obj)) return false;
-			if (ReferenceEquals(this, obj)) return true;
-			if (obj.GetType() != GetType()) return false;
-			return Equals((CheckpointTag)obj);
-		}
-
-		public override int GetHashCode() {
-			return Position.GetHashCode();
-		}
-
-
-		public long? CommitPosition {
-			get {
-				var commitPosition = Position.CommitPosition;
-				switch (Mode_) {
-					case Mode.ByStream:
-						return commitPosition == long.MinValue ? (long?)null : commitPosition;
-					case Mode.Position:
-					case Mode.EventTypeIndex:
-						return commitPosition;
-					default:
-						return null;
-				}
-			}
-		}
-
-		public long? PreparePosition {
-			get {
-				switch (Mode_) {
-					case Mode.Position:
-					case Mode.PreparePosition:
-					case Mode.EventTypeIndex:
-						return Position.PreparePosition;
-					default:
-						return null;
-				}
-			}
-		}
-
-		public static CheckpointTag Empty {
-			get { return _empty; }
-		}
-
-		internal readonly Mode Mode_;
-		private static readonly CheckpointTag _empty = new CheckpointTag(-1, false);
-
-		public static CheckpointTag FromPhase(int phase, bool completed) {
-			return new CheckpointTag(phase, completed);
-		}
-
-		public static CheckpointTag FromPosition(int phase, long commitPosition, long preparePosition) {
-			return new CheckpointTag(phase, new TFPos(commitPosition, preparePosition));
-		}
-
-		public static CheckpointTag FromPosition(int phase, TFPos position) {
-			return new CheckpointTag(phase, position);
-		}
-
-		public static CheckpointTag FromPreparePosition(int phase, long preparePosition) {
-			return new CheckpointTag(phase, preparePosition);
-		}
-
-		public static CheckpointTag FromStreamPosition(int phase, string stream, long sequenceNumber) {
-			return new CheckpointTag(phase, stream, sequenceNumber);
-		}
-
-		public static CheckpointTag FromStreamPositions(int phase, IDictionary<string, long> streams) {
-			// streams cloned inside
-			return new CheckpointTag(phase, streams);
-		}
-
-		public static CheckpointTag FromEventTypeIndexPositions(int phase, TFPos position,
-			IDictionary<string, long> streams) {
-			// streams cloned inside
-			return new CheckpointTag(phase, streams, position);
-		}
-
-		public static CheckpointTag FromByStreamPosition(
-			int phase, string catalogStream, long catalogPosition, string dataStream, long dataPosition,
-			long commitPosition) {
-			return new CheckpointTag(phase, catalogStream, catalogPosition, dataStream, dataPosition, commitPosition);
-		}
-
-		public int CompareTo(CheckpointTag other) {
-			return this < other ? -1 : (this > other ? 1 : 0);
-		}
-
-		public override string ToString() {
-			string result;
-			switch (Mode_) {
-				case Mode.Phase:
-					return "Phase: " + Phase + (Completed ? " (completed)" : "");
-				case Mode.Position:
-					result = Position.ToString();
-					break;
-				case Mode.PreparePosition:
-					result = PreparePosition.ToString();
-					break;
-				case Mode.Stream:
-					result = Streams.Keys.First() + ": " + Streams.Values.First();
-					break;
-				case Mode.MultiStream:
-				case Mode.EventTypeIndex:
-					var sb = new StringBuilder();
-					if (Mode_ == Mode.EventTypeIndex) {
-						sb.Append(Position.ToString());
-						sb.Append("; ");
-					}
-
-					foreach (var stream in Streams) {
-						sb.AppendFormat("{0}: {1}; ", stream.Key, stream.Value);
-					}
-
-					result = sb.ToString();
-					break;
-				case Mode.ByStream:
-					result = string.Format(
-						"{0}:{1}/{2}:{3}/{4}", CatalogStream, CatalogPosition, DataStream, DataPosition,
-						CommitPosition);
-					break;
-				default:
-					return "Unsupported mode: " + Mode_.ToString();
-			}
-
-			if (Phase == 0)
-				return result;
-			else {
-				return "(" + Phase + ") " + result;
-			}
-		}
-
-		public bool Completed {
-			get { return Position.CommitPosition == Int64.MaxValue; }
-		}
-
-		private static void UpgradeModes(ref Mode leftMode, ref Mode rightMode) {
-			if (leftMode == Mode.Stream && rightMode == Mode.MultiStream) {
-				leftMode = Mode.MultiStream;
-				return;
-			}
-
-			if (leftMode == Mode.MultiStream && rightMode == Mode.Stream) {
-				rightMode = Mode.MultiStream;
-				return;
-			}
-
-			if (leftMode == Mode.Position && rightMode == Mode.EventTypeIndex) {
-				leftMode = Mode.EventTypeIndex;
-				return;
-			}
-
-			if (leftMode == Mode.EventTypeIndex && rightMode == Mode.Position) {
-				rightMode = Mode.EventTypeIndex;
-				return;
-			}
-		}
-
-		public CheckpointTag UpdateStreamPosition(string streamId, long eventSequenceNumber) {
-			if (Mode_ != Mode.MultiStream)
-				throw new ArgumentException("Invalid tag mode", "tag");
-			var resultDictionary = PatchStreamsDictionary(streamId, eventSequenceNumber);
-			return FromStreamPositions(Phase, resultDictionary);
-		}
-
-		public CheckpointTag UpdateEventTypeIndexPosition(TFPos position, string eventType, long eventSequenceNumber) {
-			if (Mode_ != Mode.EventTypeIndex)
-				throw new ArgumentException("Invalid tag mode", "tag");
-			var resultDictionary = PatchStreamsDictionary(eventType, eventSequenceNumber);
-			return FromEventTypeIndexPositions(Phase, position, resultDictionary);
-		}
-
-		public CheckpointTag UpdateEventTypeIndexPosition(TFPos position) {
-			if (Mode_ != Mode.EventTypeIndex)
-				throw new ArgumentException("Invalid tag mode", "tag");
-			return FromEventTypeIndexPositions(Phase, position, Streams);
-		}
-
-		private Dictionary<string, long> PatchStreamsDictionary(string streamId, long eventSequenceNumber) {
-			var resultDictionary = new Dictionary<string, long>();
-			var was = false;
-			foreach (var stream in Streams) {
-				if (stream.Key == streamId) {
-					was = true;
-					if (eventSequenceNumber < stream.Value)
-						resultDictionary.Add(stream.Key, stream.Value);
-					else
-						resultDictionary.Add(stream.Key, eventSequenceNumber);
-				} else {
-					resultDictionary.Add(stream.Key, stream.Value);
-				}
-			}
-
-			if (!was)
-				throw new ArgumentException("Key not found: " + streamId, "streamId");
-			if (resultDictionary.Count < Streams.Count)
-				resultDictionary.Add(streamId, eventSequenceNumber);
-			return resultDictionary;
-		}
-
-		public byte[] ToJsonBytes(ProjectionVersion projectionVersion,
-			IEnumerable<KeyValuePair<string, JToken>> extraMetaData = null) {
-			if (projectionVersion.ProjectionId == -1)
-				throw new ArgumentException("projectionId is required", "projectionVersion");
-
-			using (var memoryStream = new MemoryStream()) {
-				using (var textWriter = new StreamWriter(memoryStream, Helper.UTF8NoBom))
-				using (var jsonWriter = new JsonTextWriter(textWriter)) {
-					WriteTo(projectionVersion, extraMetaData, jsonWriter);
-				}
-
-				return memoryStream.ToArray();
-			}
-		}
-
-		public string ToJsonString(ProjectionVersion projectionVersion,
-			IEnumerable<KeyValuePair<string, JToken>> extraMetaData = null) {
-			if (projectionVersion.ProjectionId == -1)
-				throw new ArgumentException("projectionId is required", "projectionVersion");
-
-			using (var textWriter = new StringWriter()) {
-				using (var jsonWriter = new JsonTextWriter(textWriter)) {
-					WriteTo(projectionVersion, extraMetaData, jsonWriter);
-				}
-
-				return textWriter.ToString();
-			}
-		}
-
-		public string ToJsonString(IEnumerable<KeyValuePair<string, JToken>> extraMetaData = null) {
-			using (var textWriter = new StringWriter()) {
-				using (var jsonWriter = new JsonTextWriter(textWriter)) {
-					WriteTo(default(ProjectionVersion), extraMetaData, jsonWriter);
-				}
-
-				return textWriter.ToString();
-			}
-		}
-
-		public JRaw ToJsonRaw(IEnumerable<KeyValuePair<string, JToken>> extraMetaData = null) {
-			using (var textWriter = new StringWriter()) {
-				using (var jsonWriter = new JsonTextWriter(textWriter)) {
-					WriteTo(default(ProjectionVersion), extraMetaData, jsonWriter);
-				}
-
-				return new JRaw(textWriter.ToString());
-			}
-		}
-
-		public void WriteTo(ProjectionVersion projectionVersion,
-			IEnumerable<KeyValuePair<string, JToken>> extraMetaData, JsonWriter jsonWriter) {
-			jsonWriter.WriteStartObject();
-			if (projectionVersion.ProjectionId > 0) {
-				jsonWriter.WritePropertyName("$v");
-				WriteVersion(projectionVersion, jsonWriter);
-			}
-
-			if (Phase != 0) {
-				jsonWriter.WritePropertyName("$ph");
-				jsonWriter.WriteValue(Phase);
-			}
-
-			switch (Mode_) {
-				case Mode.Phase:
-					jsonWriter.WritePropertyName("$cp");
-					jsonWriter.WriteValue(Completed);
-					break;
-				case Mode.Position:
-				case Mode.EventTypeIndex:
-					jsonWriter.WritePropertyName("$c");
-					jsonWriter.WriteValue(CommitPosition.GetValueOrDefault());
-					jsonWriter.WritePropertyName("$p");
-					jsonWriter.WriteValue(PreparePosition.GetValueOrDefault());
-					if (Mode_ == Mode.EventTypeIndex)
-						goto case Mode.MultiStream;
-					break;
-				case Mode.PreparePosition:
-					jsonWriter.WritePropertyName("$p");
-					jsonWriter.WriteValue(PreparePosition.GetValueOrDefault());
-					break;
-				case Mode.Stream:
-				case Mode.MultiStream:
-					jsonWriter.WritePropertyName("$s");
-					jsonWriter.WriteStartObject();
-					foreach (var stream in Streams) {
-						jsonWriter.WritePropertyName(stream.Key);
-						jsonWriter.WriteValue(stream.Value);
-					}
-
-					jsonWriter.WriteEndObject();
-					break;
-				case Mode.ByStream:
-					jsonWriter.WritePropertyName("$m");
-					jsonWriter.WriteValue("bs");
-					jsonWriter.WritePropertyName("$c");
-					jsonWriter.WriteValue(CommitPosition.GetValueOrDefault());
-					jsonWriter.WritePropertyName("$s");
-					jsonWriter.WriteStartArray();
-					jsonWriter.WriteStartObject();
-					jsonWriter.WritePropertyName(CatalogStream);
-					jsonWriter.WriteValue(CatalogPosition);
-					jsonWriter.WriteEndObject();
-					if (!string.IsNullOrEmpty(DataStream)) {
-						jsonWriter.WriteStartObject();
-						jsonWriter.WritePropertyName(DataStream);
-						jsonWriter.WriteValue(DataPosition);
-						jsonWriter.WriteEndObject();
-					}
-
-					jsonWriter.WriteEndArray();
-					break;
-			}
-
-			if (extraMetaData != null) {
-				foreach (var pair in extraMetaData) {
-					jsonWriter.WritePropertyName(pair.Key);
-					pair.Value.WriteTo(jsonWriter);
-				}
-			}
-
-			jsonWriter.WriteEndObject();
-		}
-
-		private static void WriteVersion(ProjectionVersion projectionVersion, JsonWriter jsonWriter) {
-			jsonWriter.WriteValue(
-				projectionVersion.ProjectionId + ":" + projectionVersion.Epoch + ":" + projectionVersion.Version + ":"
-				+ ProjectionsSubsystem.VERSION);
-		}
-
-		public static CheckpointTagVersion FromJson(JsonReader reader, ProjectionVersion current,
-			bool skipStartObject = false) {
-			if (!skipStartObject)
-				Check(reader.Read(), reader);
-			Check(JsonToken.StartObject, reader);
-			long? commitPosition = null;
-			long? preparePosition = null;
-			string catalogStream = null;
-			string dataStream = null;
-			long? catalogPosition = null;
-			long? dataPosition = null;
-			bool byStreamMode = false;
-			Dictionary<string, long> streams = null;
-			Dictionary<string, JToken> extra = null;
-			var projectionId = current.ProjectionId;
-			var projectionEpoch = 0;
-			int projectionVersion = 0;
-			var projectionSystemVersion = 0;
-			int projectionPhase = 0;
-			while (true) {
-				Check(reader.Read(), reader);
-				if (reader.TokenType == JsonToken.EndObject)
-					break;
-				Check(JsonToken.PropertyName, reader);
-				var name = (string)reader.Value;
-				switch (name) {
-					case "$cp":
-						Check(reader.Read(), reader);
-						var completed = (bool)reader.Value;
-						commitPosition = completed ? Int64.MaxValue : Int64.MinValue;
-						preparePosition = completed ? Int64.MaxValue : Int64.MinValue;
-						break;
-					case "$v":
-					case "v":
-						Check(reader.Read(), reader);
-						if (reader.ValueType == typeof(long)) {
-							var v = (int)(long)reader.Value;
-							if (v > 0) // TODO: remove this if with time
-								projectionVersion = v;
-						} else {
-							//TODO: better handle errors
-							var v = (string)reader.Value;
-							string[] parts = v.Split(':');
-							if (parts.Length == 2) {
-								projectionVersion = Int32.Parse(parts[1]);
-							} else {
-								projectionId = Int32.Parse(parts[0]);
-								projectionEpoch = Int32.Parse(parts[1]);
-								projectionVersion = Int32.Parse(parts[2]);
-								if (parts.Length >= 4)
-									projectionSystemVersion = Int32.Parse(parts[3]);
-							}
-						}
-
-						break;
-					case "$c":
-					case "c":
-					case "commitPosition":
-						Check(reader.Read(), reader);
-						commitPosition = (long)reader.Value;
-						break;
-					case "$p":
-					case "p":
-					case "preparePosition":
-						Check(reader.Read(), reader);
-						preparePosition = (long)reader.Value;
-						break;
-					case "$s":
-					case "s":
-					case "streams":
-						Check(reader.Read(), reader);
-						if (reader.TokenType == JsonToken.StartArray) {
-							Check(reader.Read(), reader);
-							Check(JsonToken.StartObject, reader);
-							Check(reader.Read(), reader);
-							Check(JsonToken.PropertyName, reader);
-							catalogStream = (string)reader.Value;
-							Check(reader.Read(), reader);
-							catalogPosition = (long)reader.Value;
-							Check(reader.Read(), reader);
-							Check(JsonToken.EndObject, reader);
-
-							Check(reader.Read(), reader);
-							if (reader.TokenType == JsonToken.StartObject) {
-								Check(reader.Read(), reader);
-								Check(JsonToken.PropertyName, reader);
-								dataStream = (string)reader.Value;
-								Check(reader.Read(), reader);
-								dataPosition = (long)reader.Value;
-								Check(reader.Read(), reader);
-								Check(JsonToken.EndObject, reader);
-								Check(reader.Read(), reader);
-							}
-
-							Check(JsonToken.EndArray, reader);
-						} else {
-							Check(JsonToken.StartObject, reader);
-							streams = new Dictionary<string, long>();
-							while (true) {
-								Check(reader.Read(), reader);
-								if (reader.TokenType == JsonToken.EndObject)
-									break;
-								Check(JsonToken.PropertyName, reader);
-								var streamName = (string)reader.Value;
-								Check(reader.Read(), reader);
-								long position = (long)reader.Value;
-								streams.Add(streamName, position);
-							}
-						}
-
-						break;
-					case "$ph":
-						Check(reader.Read(), reader);
-						projectionPhase = (int)(long)reader.Value;
-						break;
-					case "$m":
-						Check(reader.Read(), reader);
-						var readMode = (string)reader.Value;
-						if (readMode != "bs")
-							throw new ApplicationException("Unknown checkpoint tag mode: " + readMode);
-						byStreamMode = true;
-						break;
-					default:
-						if (extra == null)
-							extra = new Dictionary<string, JToken>();
-						Check(reader.Read(), reader);
-						var jToken = JToken.ReadFrom(reader);
-						extra.Add(name, jToken);
-						break;
-				}
-			}
-
-			return new CheckpointTagVersion {
-				Tag =
-					byStreamMode
-						? new CheckpointTag(
-							projectionPhase, catalogStream, catalogPosition.GetValueOrDefault(), dataStream,
-							dataPosition ?? -1, commitPosition.GetValueOrDefault())
-						: new CheckpointTag(
-							projectionPhase,
-							new TFPos(commitPosition ?? Int64.MinValue, preparePosition ?? Int64.MinValue), streams),
-				Version = new ProjectionVersion(projectionId, projectionEpoch, projectionVersion),
-				SystemVersion = projectionSystemVersion,
-				ExtraMetadata = extra,
-			};
-		}
-
-		public static void Check(JsonToken type, JsonReader reader) {
-			if (reader.TokenType != type)
-				throw new Exception("Invalid JSON");
-		}
-
-		public static void Check(bool read, JsonReader reader) {
-			if (!read)
-				throw new Exception("Invalid JSON");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/CheckpointTagExtensions.cs b/src/EventStore.Projections.Core/Services/Processing/Checkpointing/CheckpointTagExtensions.cs
deleted file mode 100644
index 51eaa1997cf..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/CheckpointTagExtensions.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace EventStore.Projections.Core.Services.Processing.Checkpointing {
-	public static class CheckpointTagExtensions {
-		public static CheckpointTag ParseCheckpointTagJson(this string source) {
-			if (string.IsNullOrEmpty(source))
-				return null;
-			var reader = new JsonTextReader(new StringReader(source));
-			return CheckpointTag.FromJson(reader, default(ProjectionVersion)).Tag;
-		}
-
-		public static CheckpointTag ParseCheckpointTagJson(this byte[] source) {
-			if (source == null || source.Length == 0)
-				return null;
-			var reader = new JsonTextReader(new StreamReader(new MemoryStream(source)));
-			return CheckpointTag.FromJson(reader, default(ProjectionVersion)).Tag;
-		}
-
-		public static CheckpointTag ParseCheckpointTagJson(this ReadOnlyMemory<byte> source) {
-			if (source.Length == 0)
-				return null;
-			var reader = new JsonTextReader(new StreamReader(new MemoryStream(source.ToArray())));
-			return CheckpointTag.FromJson(reader, default(ProjectionVersion)).Tag;
-		}
-
-		public static CheckpointTagVersion ParseCheckpointTagVersionExtraJson(this byte[] source,
-			ProjectionVersion current) {
-			if (source == null || source.Length == 0)
-				return new CheckpointTagVersion
-					{Version = new ProjectionVersion(current.ProjectionId, 0, 0), Tag = null};
-			var reader = new JsonTextReader(new StreamReader(new MemoryStream(source)));
-			return CheckpointTag.FromJson(reader, current);
-		}
-
-		public static CheckpointTagVersion ParseCheckpointTagVersionExtraJson(this ReadOnlyMemory<byte> source,
-			ProjectionVersion current) {
-			if (source.Length == 0)
-				return new CheckpointTagVersion { Version = new ProjectionVersion(current.ProjectionId, 0, 0), Tag = null };
-			var reader = new JsonTextReader(new StreamReader(new MemoryStream(source.ToArray())));
-			return CheckpointTag.FromJson(reader, current);
-		}
-
-		public static CheckpointTagVersion ParseCheckpointTagVersionExtraJson(this string source,
-			ProjectionVersion current) {
-			if (string.IsNullOrEmpty(source))
-				return new CheckpointTagVersion
-					{Version = new ProjectionVersion(current.ProjectionId, 0, 0), Tag = null};
-			var reader = new JsonTextReader(new StringReader(source));
-			return CheckpointTag.FromJson(reader, current);
-		}
-
-		public static Dictionary<string, JToken> ParseCheckpointExtraJson(this string source) {
-			if (string.IsNullOrEmpty(source))
-				return null;
-			var reader = new JsonTextReader(new StringReader(source));
-			return CheckpointTag.FromJson(reader, default(ProjectionVersion)).ExtraMetadata;
-		}
-
-		public static string ParseCheckpointTagCorrelationId(this string source) {
-			try {
-				if (string.IsNullOrEmpty(source))
-					return null;
-				var reader = new JsonTextReader(new StringReader(source));
-				if (!reader.Read()) return null;
-				if (reader.TokenType != JsonToken.StartObject) return null;
-				while (true) {
-					CheckpointTag.Check(reader.Read(), reader);
-					if (reader.TokenType == JsonToken.EndObject)
-						break;
-					if (reader.TokenType != JsonToken.PropertyName) return null;
-					var name = (string)reader.Value;
-					switch (name) {
-						default:
-							if (!reader.Read()) return null;
-							var jToken = JToken.ReadFrom(reader);
-							if (name == "$correlationId")
-								return jToken.ToString();
-							break;
-					}
-				}
-
-				return null;
-			} catch (JsonReaderException) {
-				return null;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/CheckpointTagVersion.cs b/src/EventStore.Projections.Core/Services/Processing/Checkpointing/CheckpointTagVersion.cs
deleted file mode 100644
index fea78950725..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/CheckpointTagVersion.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Collections.Generic;
-using Newtonsoft.Json.Linq;
-
-namespace EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-public struct CheckpointTagVersion {
-	public ProjectionVersion Version;
-	public int SystemVersion;
-	public CheckpointTag Tag;
-	public Dictionary<string, JToken> ExtraMetadata;
-
-	public CheckpointTag AdjustBy(PositionTagger tagger, ProjectionVersion version) {
-		if (SystemVersion == ProjectionsSubsystem.VERSION && Version.Version == version.Version
-		                                                  && Version.ProjectionId == version.ProjectionId)
-			return Tag;
-
-		return tagger.AdjustTag(Tag);
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/CoreProjectionCheckpointManager.cs b/src/EventStore.Projections.Core/Services/Processing/Checkpointing/CoreProjectionCheckpointManager.cs
deleted file mode 100644
index 4b8995e49aa..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/CoreProjectionCheckpointManager.cs
+++ /dev/null
@@ -1,390 +0,0 @@
-using System;
-using System.Diagnostics.Contracts;
-using EventStore.Core.Bus;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using Serilog;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Projections.Core.Services.Processing.Checkpointing {
-	public abstract class CoreProjectionCheckpointManager : IProjectionCheckpointManager,
-		ICoreProjectionCheckpointManager,
-		IEmittedEventWriter {
-		protected readonly ProjectionNamesBuilder _namingBuilder;
-		protected readonly ProjectionConfig _projectionConfig;
-		protected readonly ILogger _logger;
-
-		private readonly bool _usePersistentCheckpoints;
-
-		protected readonly IPublisher _publisher;
-		private readonly Guid _projectionCorrelationId;
-		private readonly CheckpointTag _zeroTag;
-
-
-		protected ProjectionCheckpoint _currentCheckpoint;
-		private ProjectionCheckpoint _closingCheckpoint;
-		internal CheckpointTag _requestedCheckpointPosition;
-		private bool _inCheckpoint;
-		private PartitionState _requestedCheckpointState;
-		private CheckpointTag _lastCompletedCheckpointPosition;
-		private readonly PositionTracker _lastProcessedEventPosition;
-		private float _lastProcessedEventProgress;
-
-		private int _eventsProcessedAfterRestart;
-		private bool _started;
-		protected bool _stopping;
-		protected bool _stopped;
-
-		private PartitionState _currentProjectionState;
-		private bool _largeStateWarningLogged = false;
-
-		protected CoreProjectionCheckpointManager(
-			IPublisher publisher,
-			Guid projectionCorrelationId,
-			ProjectionConfig projectionConfig,
-			string name,
-			PositionTagger positionTagger,
-			ProjectionNamesBuilder namingBuilder,
-			bool usePersistentCheckpoints) {
-			if (publisher == null) throw new ArgumentNullException("publisher");
-			if (projectionConfig == null) throw new ArgumentNullException("projectionConfig");
-			if (name == null) throw new ArgumentNullException("name");
-			if (positionTagger == null) throw new ArgumentNullException("positionTagger");
-			if (namingBuilder == null) throw new ArgumentNullException("namingBuilder");
-			if (name == "") throw new ArgumentException("name");
-
-			_lastProcessedEventPosition = new PositionTracker(positionTagger);
-			_zeroTag = positionTagger.MakeZeroCheckpointTag();
-
-			_publisher = publisher;
-			_projectionCorrelationId = projectionCorrelationId;
-			_projectionConfig = projectionConfig;
-			_logger = Serilog.Log.ForContext<CoreProjectionCheckpointManager>();
-			_namingBuilder = namingBuilder;
-			_usePersistentCheckpoints = usePersistentCheckpoints;
-			_requestedCheckpointState = new PartitionState("", null, _zeroTag);
-			_currentProjectionState = new PartitionState("", null, _zeroTag);
-		}
-
-		protected abstract ProjectionCheckpoint CreateProjectionCheckpoint(CheckpointTag checkpointPosition);
-
-		protected abstract void BeginWriteCheckpoint(
-			CheckpointTag requestedCheckpointPosition, string requestedCheckpointState);
-
-		protected abstract void CapturePartitionStateUpdated(string partition, PartitionState oldState,
-			PartitionState newState);
-
-		protected abstract void EmitPartitionCheckpoints();
-
-		public abstract void RecordEventOrder(ResolvedEvent resolvedEvent, CheckpointTag orderCheckpointTag,
-			Action committed);
-
-		public abstract void BeginLoadPartitionStateAt(
-			string statePartition, CheckpointTag requestedStateCheckpointTag, Action<PartitionState> loadCompleted);
-
-		public abstract void PartitionCompleted(string partition);
-
-		public virtual void Initialize() {
-			if (_currentCheckpoint != null) _currentCheckpoint.Dispose();
-			if (_closingCheckpoint != null) _closingCheckpoint.Dispose();
-			_currentCheckpoint = null;
-			_closingCheckpoint = null;
-			_requestedCheckpointPosition = null;
-			_inCheckpoint = false;
-			_requestedCheckpointState = new PartitionState("", null, _zeroTag);
-			_lastCompletedCheckpointPosition = null;
-			_lastProcessedEventPosition.Initialize();
-			_lastProcessedEventProgress = -1;
-
-			_eventsProcessedAfterRestart = 0;
-			_started = false;
-			_stopping = false;
-			_stopped = false;
-			_currentProjectionState = new PartitionState("", null, _zeroTag);
-		}
-
-		public virtual void Start(CheckpointTag checkpointTag, PartitionState rootPartitionState) {
-			Contract.Requires(_currentCheckpoint == null);
-			if (_started)
-				throw new InvalidOperationException("Already started");
-			_started = true;
-
-			if (rootPartitionState != null)
-				_currentProjectionState = rootPartitionState;
-
-			_lastProcessedEventPosition.UpdateByCheckpointTagInitial(checkpointTag);
-			_lastProcessedEventProgress = -1;
-			_lastCompletedCheckpointPosition = checkpointTag;
-			_requestedCheckpointPosition = null;
-			_currentCheckpoint = CreateProjectionCheckpoint(_lastProcessedEventPosition.LastTag);
-			_currentCheckpoint.Start();
-		}
-
-		public void Stopping() {
-			EnsureStarted();
-			if (_stopping)
-				throw new InvalidOperationException("Already stopping");
-			_stopping = true;
-			RequestCheckpointToStop();
-		}
-
-		public void Stopped() {
-			EnsureStarted();
-			_started = false;
-			_stopped = true;
-
-			if (_currentCheckpoint != null) _currentCheckpoint.Dispose();
-			_currentCheckpoint = null;
-
-			if (_closingCheckpoint != null) _closingCheckpoint.Dispose();
-			_closingCheckpoint = null;
-		}
-
-		public virtual void GetStatistics(ProjectionStatistics info) {
-			info.Position = (_lastProcessedEventPosition.LastTag ?? (object)"").ToString();
-			info.Progress = _lastProcessedEventProgress;
-			info.LastCheckpoint = _lastCompletedCheckpointPosition != null
-				? _lastCompletedCheckpointPosition.ToString()
-				: "";
-			info.EventsProcessedAfterRestart = _eventsProcessedAfterRestart;
-			info.WritePendingEventsBeforeCheckpoint = _closingCheckpoint != null
-				? _closingCheckpoint.GetWritePendingEvents()
-				: 0;
-			info.WritePendingEventsAfterCheckpoint = (_currentCheckpoint != null
-				? _currentCheckpoint.GetWritePendingEvents()
-				: 0);
-			info.ReadsInProgress = /*_readDispatcher.ActiveRequestCount*/
-				+ +(_closingCheckpoint != null ? _closingCheckpoint.GetReadsInProgress() : 0)
-				+ (_currentCheckpoint != null ? _currentCheckpoint.GetReadsInProgress() : 0);
-			info.WritesInProgress = (_closingCheckpoint != null ? _closingCheckpoint.GetWritesInProgress() : 0)
-			                        + (_currentCheckpoint != null ? _currentCheckpoint.GetWritesInProgress() : 0);
-			info.CheckpointStatus = _inCheckpoint ? "Requested" : "";
-		}
-
-		public void StateUpdated(
-			string partition, PartitionState oldState, PartitionState newState) {
-			if (_stopped)
-				return;
-			EnsureStarted();
-			if (_stopping)
-				throw new InvalidOperationException("Stopping");
-
-			if (partition == "" && newState.State == null) // ignore non-root partitions and non-changed states
-				throw new NotSupportedException("Internal check");
-
-			CheckStateSize(newState , partition);
-
-			if (_usePersistentCheckpoints && partition != "")
-				CapturePartitionStateUpdated(partition, oldState, newState);
-
-			if (partition == "")
-				_currentProjectionState = newState;
-		}
-
-		private void CheckStateSize(PartitionState result , string partition) {
-			if (!_largeStateWarningLogged && result.Size >= 8_000_000 && !partition.Equals("")) {
-				Log.Warning(
-					"State size for the Projection {projectionName} for Partition {partitionName} is greater than 8 MB. State size for a projection must be less than 16 MB. Current state size for Partition {partitionName} is {stateSize} MB.",
-					_namingBuilder.EffectiveProjectionName, partition, partition,
-					result.Size / Math.Pow(10, 6));
-				_largeStateWarningLogged = true;
-			}
-			else if (!_largeStateWarningLogged && result.Size >= 8_000_000 && partition.Equals("") ) {
-				Log.Warning(
-					"State size for the Projection {projectionName} is greater than 8 MB. State size for a projection must be less than 16 MB. Current state size for Projection {projectionName} is {stateSize} MB.",
-					_namingBuilder.EffectiveProjectionName, _namingBuilder.EffectiveProjectionName,
-					result.Size / Math.Pow(10, 6));
-				_largeStateWarningLogged = true;
-			}
-		}
-
-		public void EventProcessed(CheckpointTag checkpointTag, float progress) {
-			if (_stopped)
-				return;
-			EnsureStarted();
-			if (_stopping)
-				throw new InvalidOperationException("Stopping");
-			_eventsProcessedAfterRestart++;
-			_lastProcessedEventPosition.UpdateByCheckpointTagForward(checkpointTag);
-			_lastProcessedEventProgress = progress;
-			// running state only
-		}
-
-		public void EventsEmitted(EmittedEventEnvelope[] scheduledWrites, Guid causedBy, string correlationId) {
-			if (_stopped)
-				return;
-			EnsureStarted();
-			if (_stopping)
-				throw new InvalidOperationException("Stopping");
-			if (scheduledWrites != null) {
-				foreach (var @event in scheduledWrites) {
-					var emittedEvent = @event.Event;
-					if (string.IsNullOrEmpty(@event.Event.StreamId)) {
-						Failed("Cannot write to a null stream id");
-						return;
-					}
-
-					emittedEvent.SetCausedBy(causedBy);
-					emittedEvent.SetCorrelationId(correlationId);
-				}
-
-				_currentCheckpoint.ValidateOrderAndEmitEvents(scheduledWrites);
-			}
-		}
-
-		public bool CheckpointSuggested(CheckpointTag checkpointTag, float progress) {
-			if (!_usePersistentCheckpoints)
-				throw new InvalidOperationException("Checkpoints are not used");
-			if (_stopped || _stopping)
-				return true;
-			EnsureStarted();
-			if (checkpointTag != _lastProcessedEventPosition.LastTag) // allow checkpoint at the current position
-				_lastProcessedEventPosition.UpdateByCheckpointTagForward(checkpointTag);
-			_lastProcessedEventProgress = progress;
-			return RequestCheckpoint(_lastProcessedEventPosition);
-		}
-
-		public void Progress(float progress) {
-			if (_stopping || _stopped)
-				return;
-			_lastProcessedEventProgress = progress < -1 ? -1 : progress;
-		}
-
-		public CheckpointTag LastProcessedEventPosition {
-			get { return _lastProcessedEventPosition.LastTag; }
-		}
-
-
-		public void Handle(CoreProjectionProcessingMessage.ReadyForCheckpoint message) {
-			// ignore any messages - typically when faulted
-			if (_stopped)
-				return;
-			// ignore any messages from previous checkpoints probably before RestartRequested
-			if (message.Sender != _closingCheckpoint)
-				return;
-			if (!_inCheckpoint)
-				throw new InvalidOperationException();
-			if (_usePersistentCheckpoints)
-				BeginWriteCheckpoint(_requestedCheckpointPosition, _requestedCheckpointState.Serialize());
-			else
-				CheckpointWritten(_requestedCheckpointPosition);
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.RestartRequested message) {
-			if (_stopped)
-				return;
-			RequestRestart(message.Reason);
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.Failed message) {
-			if (_stopped)
-				return;
-			Failed(message.Reason);
-		}
-
-		protected void PrerecordedEventsLoaded(CheckpointTag checkpointTag) {
-			_publisher.Publish(
-				new CoreProjectionProcessingMessage.PrerecordedEventsLoaded(_projectionCorrelationId, checkpointTag));
-		}
-
-		private void RequestCheckpointToStop() {
-			EnsureStarted();
-			if (!_stopping)
-				throw new InvalidOperationException("Not stopping");
-			if (_inCheckpoint) // checkpoint in progress.  no other writes will happen, so we can stop here.
-				return;
-			// do not request checkpoint if no events were processed since last checkpoint
-			//NOTE: we ignore _usePersistentCheckpoints flag as we need to flush final writes before query object
-			// has been disposed
-			if ( /* _usePersistentCheckpoints && */
-				_lastCompletedCheckpointPosition < _lastProcessedEventPosition.LastTag) {
-				RequestCheckpoint(_lastProcessedEventPosition, forcePrepareCheckpoint: true);
-				return;
-			}
-
-			_publisher.Publish(
-				new CoreProjectionProcessingMessage.CheckpointCompleted(
-					_projectionCorrelationId, _lastCompletedCheckpointPosition));
-		}
-
-		protected void EnsureStarted() {
-			if (!_started)
-				throw new InvalidOperationException("Not started");
-		}
-
-		/// <returns>true - if checkpoint has beem completed in-sync</returns>
-		private bool RequestCheckpoint(PositionTracker lastProcessedEventPosition,
-			bool forcePrepareCheckpoint = false) {
-			if (!forcePrepareCheckpoint && !_usePersistentCheckpoints)
-				throw new InvalidOperationException("Checkpoints are not allowed");
-			if (_inCheckpoint)
-				throw new InvalidOperationException("Checkpoint in progress");
-			return StartCheckpoint(lastProcessedEventPosition, _currentProjectionState);
-		}
-
-		/// <returns>true - if checkpoint has been completed in-sync</returns>
-		private bool StartCheckpoint(PositionTracker lastProcessedEventPosition, PartitionState projectionState) {
-			Contract.Requires(_closingCheckpoint == null);
-			if (projectionState == null) throw new ArgumentNullException("projectionState");
-
-			CheckpointTag requestedCheckpointPosition = lastProcessedEventPosition.LastTag;
-			if (requestedCheckpointPosition == _lastCompletedCheckpointPosition)
-				return true; // either suggested or requested to stop
-
-			if (_usePersistentCheckpoints) // do not emit any events if we do not use persistent checkpoints
-				EmitPartitionCheckpoints();
-
-			_inCheckpoint = true;
-			_requestedCheckpointPosition = requestedCheckpointPosition;
-			_requestedCheckpointState = projectionState;
-			_closingCheckpoint = _currentCheckpoint;
-			_currentCheckpoint = CreateProjectionCheckpoint(requestedCheckpointPosition);
-			// checkpoint only after assigning new current checkpoint, as it may call back immediately
-			_closingCheckpoint.Prepare(requestedCheckpointPosition);
-			return false; // even if prepare completes in sync it notifies the world by a message
-		}
-
-		protected void SendPrerecordedEvent(
-			EventStore.Core.Data.ResolvedEvent pair, CheckpointTag positionTag,
-			long prerecordedEventMessageSequenceNumber) {
-			var committedEvent = new ReaderSubscriptionMessage.CommittedEventDistributed(
-				Guid.Empty, new ResolvedEvent(pair, null), null, -1, source: this.GetType());
-			_publisher.Publish(
-				EventReaderSubscriptionMessage.CommittedEventReceived.FromCommittedEventDistributed(
-					committedEvent, positionTag, null, _projectionCorrelationId,
-					prerecordedEventMessageSequenceNumber));
-		}
-
-
-		protected void RequestRestart(string reason) {
-			_stopped = true; // ignore messages
-			_publisher.Publish(new CoreProjectionProcessingMessage.RestartRequested(_projectionCorrelationId, reason));
-		}
-
-		private void Failed(string reason) {
-			_stopped = true; // ignore messages
-			_publisher.Publish(new CoreProjectionProcessingMessage.Failed(_projectionCorrelationId, reason));
-		}
-
-		protected void CheckpointWritten(CheckpointTag lastCompletedCheckpointPosition) {
-			Contract.Requires(_closingCheckpoint != null);
-			_lastCompletedCheckpointPosition = lastCompletedCheckpointPosition;
-			_closingCheckpoint.Dispose();
-			_closingCheckpoint = null;
-			if (!_stopping)
-				// ignore any writes pending in the current checkpoint (this is not the best, but they will never hit the storage, so it is safe)
-				_currentCheckpoint.Start();
-			_inCheckpoint = false;
-
-			//NOTE: the next checkpoint will start by completing checkpoint work item
-			_publisher.Publish(
-				new CoreProjectionProcessingMessage.CheckpointCompleted(
-					_projectionCorrelationId, _lastCompletedCheckpointPosition));
-		}
-
-		public virtual void BeginLoadPrerecordedEvents(CheckpointTag checkpointTag) {
-			PrerecordedEventsLoaded(checkpointTag);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/CoreProjectionCheckpointReader.cs b/src/EventStore.Projections.Core/Services/Processing/Checkpointing/CoreProjectionCheckpointReader.cs
deleted file mode 100644
index 1ad9f0a23ff..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/CoreProjectionCheckpointReader.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.UserManagement;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Projections.Core.Services.Processing.Checkpointing {
-	public class CoreProjectionCheckpointReader : ICoreProjectionCheckpointReader {
-		private readonly IPublisher _publisher;
-		private readonly Guid _projectionCorrelationId;
-		private readonly IODispatcher _ioDispatcher;
-		private readonly string _projectionCheckpointStreamId;
-		private readonly bool _useCheckpoints;
-		private readonly ILogger _logger = Serilog.Log.ForContext<CoreProjectionCheckpointReader>();
-
-		private bool _stateRequested;
-
-		private long _nextStateIndexToRequest;
-		private ProjectionVersion _projectionVersion;
-		private Guid _readRequestId;
-		private long _lastWrittenCheckpointEventNumber;
-
-		public CoreProjectionCheckpointReader(
-			IPublisher publisher, Guid projectionCorrelationId, IODispatcher ioDispatcher,
-			string projectionCheckpointStreamId, ProjectionVersion projectionVersion, bool useCheckpoints) {
-			_publisher = publisher;
-			_projectionCorrelationId = projectionCorrelationId;
-			_ioDispatcher = ioDispatcher;
-			_projectionCheckpointStreamId = projectionCheckpointStreamId;
-			_projectionVersion = projectionVersion;
-			_useCheckpoints = useCheckpoints;
-		}
-
-		public void BeginLoadState() {
-			if (_stateRequested)
-				throw new InvalidOperationException("State has been already requested");
-			BeforeBeginLoadState();
-			_stateRequested = true;
-			if (_useCheckpoints) {
-				RequestLoadState();
-			} else {
-				CheckpointLoaded(null, null);
-			}
-		}
-
-		public void Initialize() {
-			_ioDispatcher.BackwardReader.Cancel(_readRequestId);
-			_readRequestId = Guid.Empty;
-			_stateRequested = false;
-		}
-
-		protected void BeforeBeginLoadState() {
-			_lastWrittenCheckpointEventNumber = ExpectedVersion.NoStream;
-			_nextStateIndexToRequest = -1; // from the end
-		}
-
-		protected void RequestLoadState() {
-			const int recordsToRequest = 10;
-			_readRequestId = Guid.NewGuid();
-			_ioDispatcher.ReadBackward(
-				_projectionCheckpointStreamId, _nextStateIndexToRequest, recordsToRequest, false,
-				SystemAccounts.System, OnLoadStateReadRequestCompleted,
-				() => {
-					_logger.Warning("Read forward of stream {stream} timed out. Retrying.", _projectionCheckpointStreamId);
-					RequestLoadState();
-				}, _readRequestId);
-		}
-
-
-		private void OnLoadStateReadRequestCompleted(ClientMessage.ReadStreamEventsBackwardCompleted message) {
-			if (message.Events.Length > 0) {
-				var checkpoint = message.Events
-					.Where(v => v.Event.EventType == ProjectionEventTypes.ProjectionCheckpoint).Select(x => x.Event)
-					.FirstOrDefault();
-				if (checkpoint != null) {
-					var parsed = checkpoint.Metadata.ParseCheckpointTagVersionExtraJson(_projectionVersion);
-					if (parsed.Version.ProjectionId != _projectionVersion.ProjectionId
-					    || _projectionVersion.Epoch > parsed.Version.Version) {
-						_lastWrittenCheckpointEventNumber = checkpoint.EventNumber;
-						CheckpointLoaded(null, null);
-					} else {
-						//TODO: check epoch and correctly set _lastWrittenCheckpointEventNumber
-						var checkpointData = Helper.UTF8NoBom.GetString(checkpoint.Data.Span);
-						_lastWrittenCheckpointEventNumber = checkpoint.EventNumber;
-						var adjustedTag = parsed.Tag; // the same projection and epoch, handle upgrades internally
-						CheckpointLoaded(adjustedTag, checkpointData);
-					}
-
-					return;
-				}
-			}
-
-			if (message.NextEventNumber != -1) {
-				_nextStateIndexToRequest = message.NextEventNumber;
-				RequestLoadState();
-				return;
-			}
-
-			_lastWrittenCheckpointEventNumber = message.LastEventNumber;
-			CheckpointLoaded(null, null);
-		}
-
-
-		protected void CheckpointLoaded(CheckpointTag checkpointTag, string checkpointData) {
-			if (checkpointTag == null) // no checkpoint data found
-			{
-				checkpointData = null;
-			}
-
-			_publisher.Publish(
-				new CoreProjectionProcessingMessage.CheckpointLoaded(
-					_projectionCorrelationId, checkpointTag, checkpointData, _lastWrittenCheckpointEventNumber));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/CoreProjectionCheckpointWriter.cs b/src/EventStore.Projections.Core/Services/Processing/Checkpointing/CoreProjectionCheckpointWriter.cs
deleted file mode 100644
index 1c09905e7b6..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/CoreProjectionCheckpointWriter.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Projections.Core.Messages;
-using Serilog;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Projections.Core.Services.Processing.Checkpointing {
-	public class CoreProjectionCheckpointWriter {
-		private readonly string _projectionCheckpointStreamId;
-		private readonly ILogger _logger;
-		private readonly IODispatcher _ioDispatcher;
-		private readonly ProjectionVersion _projectionVersion;
-		private readonly string _name;
-
-		private Guid _writeRequestId;
-		private int _inCheckpointWriteAttempt;
-		private long _lastWrittenCheckpointEventNumber;
-		private Event _checkpointEventToBePublished;
-		private CheckpointTag _requestedCheckpointPosition;
-		private IEnvelope _envelope;
-		private const int MaxNumberOfRetries = 12;
-		private const int MinAttemptWarnThreshold = 5;
-		private bool _metaStreamWritten;
-		private Random _random = new Random();
-		private bool _largeCheckpointStateWarningLogged = false;
-
-		public CoreProjectionCheckpointWriter(
-			string projectionCheckpointStreamId, IODispatcher ioDispatcher, ProjectionVersion projectionVersion,
-			string name) {
-			_projectionCheckpointStreamId = projectionCheckpointStreamId;
-			_logger = Serilog.Log.ForContext<CoreProjectionCheckpointWriter>();
-			_ioDispatcher = ioDispatcher;
-			_projectionVersion = projectionVersion;
-			_name = name;
-		}
-
-		public void BeginWriteCheckpoint(IEnvelope envelope,
-			CheckpointTag requestedCheckpointPosition, string requestedCheckpointState) {
-			_envelope = envelope;
-			_requestedCheckpointPosition = requestedCheckpointPosition;
-			_inCheckpointWriteAttempt = 1;
-			//TODO: pass correct expected version
-			_checkpointEventToBePublished = new Event(
-				Guid.NewGuid(), ProjectionEventTypes.ProjectionCheckpoint, true,
-				requestedCheckpointState == null ? null : Helper.UTF8NoBom.GetBytes(requestedCheckpointState),
-				requestedCheckpointPosition.ToJsonBytes(projectionVersion: _projectionVersion));
-			PublishWriteStreamMetadataAndCheckpointEventDelayed();
-		}
-
-		private void WriteCheckpointEventCompleted(
-			string eventStreamId, OperationResult operationResult, long firstWrittenEventNumber) {
-			if (_inCheckpointWriteAttempt == 0)
-				throw new InvalidOperationException();
-			if (operationResult == OperationResult.Success) {
-				if (_logger != null)
-					_logger.Verbose(
-						"Checkpoint has been written for projection {projection} at sequence number {firstWrittenEventNumber} (current)",
-						_name,
-						firstWrittenEventNumber);
-				_lastWrittenCheckpointEventNumber = firstWrittenEventNumber;
-
-				_inCheckpointWriteAttempt = 0;
-				_envelope.ReplyWith(
-					new CoreProjectionCheckpointWriterMessage.CheckpointWritten(_requestedCheckpointPosition));
-			} else {
-				if (_logger != null) {
-					_logger.Information(
-						"Failed to write projection checkpoint to stream {stream}. Error: {e}", eventStreamId,
-						Enum.GetName(typeof(OperationResult), operationResult));
-				}
-
-				switch (operationResult) {
-					case OperationResult.WrongExpectedVersion:
-						_envelope.ReplyWith(new CoreProjectionProcessingMessage.Failed(Guid.Empty,
-							$"Checkpoint stream `{eventStreamId}` has been written to from the outside"
-						));
-						break;
-					case OperationResult.PrepareTimeout:
-					case OperationResult.ForwardTimeout:
-					case OperationResult.CommitTimeout:
-						if (_inCheckpointWriteAttempt >= MaxNumberOfRetries) {
-							//The first parameter is not needed in this case as the CoreProjectionCheckpointManager takes care of filling in the projection id when it reconstructs the message
-							_envelope.ReplyWith(new CoreProjectionProcessingMessage.Failed(Guid.Empty,
-								string.Format(
-									"After retrying {0} times, we failed to write the checkpoint for {1} to {2} due to a {3}",
-									MaxNumberOfRetries, _name, eventStreamId,
-									Enum.GetName(typeof(OperationResult), operationResult))));
-							_inCheckpointWriteAttempt = 0;
-							return;
-						}
-
-						_inCheckpointWriteAttempt++;
-						PublishWriteStreamMetadataAndCheckpointEventDelayed();
-						break;
-					default:
-						throw new NotSupportedException("Unsupported error code received");
-				}
-			}
-		}
-
-		private void PublishWriteStreamMetadataAndCheckpointEventDelayed() {
-			var attempt = _inCheckpointWriteAttempt;
-			var delayInSeconds = CalculateBackoffTimeSecs(attempt);
-			if(delayInSeconds == 0)
-				PublishWriteStreamMetadataAndCheckpointEvent();
-			else {
-				if (attempt >= MinAttemptWarnThreshold && _logger != null) {
-					_logger.Warning("Attempt: {attempt} to write checkpoint for {projection} at {requestedCheckpointPosition} with expected version number {lastWrittenCheckpointEventNumber}. Backing off for {time} second(s).",
-						attempt,
-						_name,
-						_requestedCheckpointPosition,
-						_lastWrittenCheckpointEventNumber,
-						delayInSeconds);
-				}
-				_ioDispatcher.Delay(
-					TimeSpan.FromSeconds(delayInSeconds),
-					_ => PublishWriteStreamMetadataAndCheckpointEvent());
-			}
-		}
-
-		private void PublishWriteStreamMetadataAndCheckpointEvent() {
-			if (_logger != null)
-				_logger.Verbose(
-					"Writing checkpoint for {projection} at {requestedCheckpointPosition} with expected version number {lastWrittenCheckpointEventNumber}",
-					_name, _requestedCheckpointPosition, _lastWrittenCheckpointEventNumber);
-			if (!_metaStreamWritten)
-				PublishWriteStreamMetadata();
-			else
-				PublishWriteCheckpointEvent();
-		}
-
-		private void PublishWriteStreamMetadata() {
-			var metaStreamId = SystemStreams.MetastreamOf(_projectionCheckpointStreamId);
-			_writeRequestId = _ioDispatcher.WriteEvent(
-				metaStreamId, ExpectedVersion.Any, CreateStreamMetadataEvent(), SystemAccounts.System, msg => {
-					switch (msg.Result) {
-						case OperationResult.Success:
-							_metaStreamWritten = true;
-							PublishWriteCheckpointEvent();
-							break;
-						default:
-							WriteCheckpointEventCompleted(metaStreamId, msg.Result, ExpectedVersion.Invalid);
-							break;
-					}
-				});
-		}
-
-		private Event CreateStreamMetadataEvent() {
-			var eventId = Guid.NewGuid();
-			var acl = new StreamAcl(
-				readRole: SystemRoles.Admins, writeRole: SystemRoles.Admins,
-				deleteRole: SystemRoles.Admins, metaReadRole: SystemRoles.All,
-				metaWriteRole: SystemRoles.Admins);
-			var metadata = new StreamMetadata(maxCount: 2, maxAge: null, cacheControl: null, acl: acl);
-			var dataBytes = metadata.ToJsonBytes();
-			return new Event(eventId, SystemEventTypes.StreamMetadata, isJson: true, data: dataBytes, metadata: null);
-		}
-
-		private void PublishWriteCheckpointEvent() {
-			CheckpointStateSizeCheck();
-			_writeRequestId = _ioDispatcher.WriteEvent(
-				_projectionCheckpointStreamId, _lastWrittenCheckpointEventNumber, _checkpointEventToBePublished,
-				SystemAccounts.System,
-				msg => WriteCheckpointEventCompleted(_projectionCheckpointStreamId, msg.Result, msg.FirstEventNumber));
-		}
-
-		private void CheckpointStateSizeCheck() {
-			if (!_largeCheckpointStateWarningLogged && _checkpointEventToBePublished.Data.Length >= 8_000_000) {
-				Log.Warning(
-					"State size for the Projection {projectionName} is greater than 8 MB. State size for a projection should be less than 16 MB. Current state size for Projection {projectionName} is {stateSize} MB.",
-					_name, _name,
-					_checkpointEventToBePublished.Data.Length / Math.Pow(10, 6));
-				_largeCheckpointStateWarningLogged = true;
-			}
-		}
-
-		public void Initialize() {
-			_checkpointEventToBePublished = null;
-			_inCheckpointWriteAttempt = 0;
-			_ioDispatcher.Writer.Cancel(_writeRequestId);
-			_lastWrittenCheckpointEventNumber = ExpectedVersion.Invalid;
-			_metaStreamWritten = false;
-		}
-
-		public void GetStatistics(ProjectionStatistics info) {
-			info.WritesInProgress = ((_inCheckpointWriteAttempt != 0) ? 1 : 0) + info.WritesInProgress;
-			info.CheckpointStatus = _inCheckpointWriteAttempt > 0
-				? "Writing (" + _inCheckpointWriteAttempt + ")"
-				: info.CheckpointStatus;
-		}
-
-		public void StartFrom(CheckpointTag checkpointTag, long checkpointEventNumber) {
-			_lastWrittenCheckpointEventNumber = checkpointEventNumber;
-			_metaStreamWritten = checkpointEventNumber != ExpectedVersion.NoStream;
-		}
-
-		private int CalculateBackoffTimeSecs(int attempt) {
-			attempt--;
-			if (attempt == 0) return 0;
-			var expBackoff = attempt < 9 ? (1 << attempt) : 256;
-			return _random.Next(1, expBackoff + 1);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/DefaultCheckpointManager.cs b/src/EventStore.Projections.Core/Services/Processing/Checkpointing/DefaultCheckpointManager.cs
deleted file mode 100644
index 475e9c8a962..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/DefaultCheckpointManager.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-
-namespace EventStore.Projections.Core.Services.Processing.Checkpointing {
-	public class DefaultCheckpointManager : CoreProjectionCheckpointManager,
-		IHandle<CoreProjectionCheckpointWriterMessage.CheckpointWritten>,
-		IHandle<CoreProjectionCheckpointWriterMessage.RestartRequested> {
-		private readonly ClaimsPrincipal _runAs;
-		private readonly CheckpointTag _zeroTag;
-		private int _readRequestsInProgress;
-		private readonly HashSet<Guid> _loadStateRequests = new HashSet<Guid>();
-
-		protected readonly ProjectionVersion _projectionVersion;
-		protected readonly IODispatcher _ioDispatcher;
-		private readonly PositionTagger _positionTagger;
-		private readonly CoreProjectionCheckpointWriter _coreProjectionCheckpointWriter;
-		private PartitionStateUpdateManager _partitionStateUpdateManager;
-
-		public DefaultCheckpointManager(
-			IPublisher publisher, Guid projectionCorrelationId, ProjectionVersion projectionVersion, ClaimsPrincipal runAs,
-			IODispatcher ioDispatcher, ProjectionConfig projectionConfig, string name, PositionTagger positionTagger,
-			ProjectionNamesBuilder namingBuilder, bool usePersistentCheckpoints, bool producesRunningResults,
-			bool definesFold,
-			CoreProjectionCheckpointWriter coreProjectionCheckpointWriter)
-			: base(
-				publisher, projectionCorrelationId, projectionConfig, name, positionTagger, namingBuilder,
-				usePersistentCheckpoints) {
-			if (ioDispatcher == null) throw new ArgumentNullException("ioDispatcher");
-			_projectionVersion = projectionVersion;
-			_runAs = runAs;
-			_ioDispatcher = ioDispatcher;
-			_positionTagger = positionTagger;
-			_coreProjectionCheckpointWriter = coreProjectionCheckpointWriter;
-			_zeroTag = positionTagger.MakeZeroCheckpointTag();
-		}
-
-		protected override void BeginWriteCheckpoint(
-			CheckpointTag requestedCheckpointPosition, string requestedCheckpointState) {
-			_requestedCheckpointPosition = requestedCheckpointPosition;
-			_coreProjectionCheckpointWriter.BeginWriteCheckpoint(
-				new SendToThisEnvelope(this), requestedCheckpointPosition, requestedCheckpointState);
-		}
-
-		public override void RecordEventOrder(
-			ResolvedEvent resolvedEvent, CheckpointTag orderCheckpointTag, Action committed) {
-			committed();
-		}
-
-		public override void PartitionCompleted(string partition) {
-			_partitionStateUpdateManager.PartitionCompleted(partition);
-		}
-
-		public override void Initialize() {
-			base.Initialize();
-			_partitionStateUpdateManager = null;
-			foreach (var requestId in _loadStateRequests)
-				_ioDispatcher.BackwardReader.Cancel(requestId);
-			_loadStateRequests.Clear();
-			_coreProjectionCheckpointWriter.Initialize();
-			_requestedCheckpointPosition = null;
-			_readRequestsInProgress = 0;
-		}
-
-		public override void GetStatistics(ProjectionStatistics info) {
-			base.GetStatistics(info);
-			info.ReadsInProgress += _readRequestsInProgress;
-			_coreProjectionCheckpointWriter.GetStatistics(info);
-		}
-
-		public override void BeginLoadPartitionStateAt(
-			string statePartition, CheckpointTag requestedStateCheckpointTag, Action<PartitionState> loadCompleted) {
-			var stateEventType = ProjectionEventTypes.PartitionCheckpoint;
-			var partitionCheckpointStreamName = _namingBuilder.MakePartitionCheckpointStreamName(statePartition);
-
-			ReadPartitionStream(partitionCheckpointStreamName, -1, requestedStateCheckpointTag, loadCompleted,
-				stateEventType);
-		}
-
-		private void ReadPartitionStream(string partitionStreamName, long eventNumber,
-			CheckpointTag requestedStateCheckpointTag,
-			Action<PartitionState> loadCompleted, string stateEventType) {
-			_readRequestsInProgress++;
-			var requestId = Guid.NewGuid();
-			_ioDispatcher.ReadBackward(
-				partitionStreamName, eventNumber, 1, false, SystemAccounts.System,
-				m =>
-					OnLoadPartitionStateReadStreamEventsBackwardCompleted(
-						m, requestedStateCheckpointTag, loadCompleted, partitionStreamName, stateEventType),
-				() => {
-					_logger.Warning("Read backward for stream {stream} timed out. Retrying", partitionStreamName);
-					_loadStateRequests.Remove(requestId);
-					_readRequestsInProgress--;
-					ReadPartitionStream(partitionStreamName, eventNumber, requestedStateCheckpointTag, loadCompleted,
-						stateEventType);
-				}, requestId);
-			if (requestId != Guid.Empty)
-				_loadStateRequests.Add(requestId);
-		}
-
-		private void OnLoadPartitionStateReadStreamEventsBackwardCompleted(
-			ClientMessage.ReadStreamEventsBackwardCompleted message, CheckpointTag requestedStateCheckpointTag,
-			Action<PartitionState> loadCompleted, string partitionStreamName, string stateEventType) {
-			_loadStateRequests.Remove(message.CorrelationId);
-
-			_readRequestsInProgress--;
-			if (message.Events.Length == 1) {
-				EventRecord @event = message.Events[0].Event;
-				if (@event.EventType == stateEventType) {
-					var parsed = @event.Metadata.ParseCheckpointTagVersionExtraJson(_projectionVersion);
-					if (parsed.Version.ProjectionId != _projectionVersion.ProjectionId
-					    || _projectionVersion.Epoch > parsed.Version.Version) {
-						var state = new PartitionState("", null, _zeroTag);
-						loadCompleted(state);
-						return;
-					} else {
-						var loadedStateCheckpointTag = parsed.AdjustBy(_positionTagger, _projectionVersion);
-						var state = PartitionState.Deserialize(
-							Helper.UTF8NoBom.GetString(@event.Data.Span), loadedStateCheckpointTag);
-						loadCompleted(state);
-						return;
-					}
-				}
-			}
-
-			if (message.NextEventNumber == -1) {
-				var state = new PartitionState("", null, _zeroTag);
-				loadCompleted(state);
-				return;
-			}
-
-			ReadPartitionStream(partitionStreamName, message.NextEventNumber, requestedStateCheckpointTag,
-				loadCompleted, stateEventType);
-		}
-
-		protected override ProjectionCheckpoint CreateProjectionCheckpoint(CheckpointTag checkpointPosition) {
-			return new ProjectionCheckpoint(
-				_publisher, _ioDispatcher, _projectionVersion, _runAs, this, checkpointPosition, _positionTagger,
-				_projectionConfig.MaxWriteBatchLength, _projectionConfig.MaximumAllowedWritesInFlight, _logger);
-		}
-
-		public void Handle(CoreProjectionCheckpointWriterMessage.CheckpointWritten message) {
-			CheckpointWritten(message.Position);
-		}
-
-		public void Handle(CoreProjectionCheckpointWriterMessage.RestartRequested message) {
-			RequestRestart(message.Reason);
-		}
-
-		protected override void CapturePartitionStateUpdated(string partition, PartitionState oldState,
-			PartitionState newState) {
-			if (_partitionStateUpdateManager == null)
-				_partitionStateUpdateManager = new PartitionStateUpdateManager(_namingBuilder);
-			_partitionStateUpdateManager.StateUpdated(partition, newState, oldState.CausedBy);
-		}
-
-		protected override void EmitPartitionCheckpoints() {
-			if (_partitionStateUpdateManager != null) {
-				_partitionStateUpdateManager.EmitEvents(_currentCheckpoint);
-				_partitionStateUpdateManager = null;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/ICoreProjectionCheckpointManager.cs b/src/EventStore.Projections.Core/Services/Processing/Checkpointing/ICoreProjectionCheckpointManager.cs
deleted file mode 100644
index 54168f76176..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/ICoreProjectionCheckpointManager.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-
-namespace EventStore.Projections.Core.Services.Processing.Checkpointing {
-	public interface ICoreProjectionCheckpointManager {
-		void Initialize();
-		void Start(CheckpointTag checkpointTag, PartitionState rootPartitionState);
-		void Stopping();
-		void Stopped();
-		void GetStatistics(ProjectionStatistics info);
-
-
-		void StateUpdated(string partition, PartitionState oldState, PartitionState newState);
-		void PartitionCompleted(string partition);
-		void EventProcessed(CheckpointTag checkpointTag, float progress);
-
-		/// <summary>
-		/// Suggests a checkpoint which may complete immediately or be delayed
-		/// </summary>
-		/// <param name="checkpointTag"></param>
-		/// <param name="progress"></param>
-		/// <returns>true - if checkpoint has been completed (or skipped)</returns>
-		bool CheckpointSuggested(CheckpointTag checkpointTag, float progress);
-
-		void Progress(float progress);
-
-		void BeginLoadPrerecordedEvents(CheckpointTag checkpointTag);
-
-		void BeginLoadPartitionStateAt(
-			string statePartition, CheckpointTag requestedStateCheckpointTag,
-			Action<PartitionState> loadCompleted);
-
-		void RecordEventOrder(ResolvedEvent resolvedEvent, CheckpointTag orderCheckpointTag, Action committed);
-		CheckpointTag LastProcessedEventPosition { get; }
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/ICoreProjectionCheckpointReader.cs b/src/EventStore.Projections.Core/Services/Processing/Checkpointing/ICoreProjectionCheckpointReader.cs
deleted file mode 100644
index 3d05fd47606..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/ICoreProjectionCheckpointReader.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-public interface ICoreProjectionCheckpointReader {
-	void BeginLoadState();
-	void Initialize();
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/IEmittedEventWriter.cs b/src/EventStore.Projections.Core/Services/Processing/Checkpointing/IEmittedEventWriter.cs
deleted file mode 100644
index 266476d7544..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/IEmittedEventWriter.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-public interface IEmittedEventWriter {
-	void EventsEmitted(EmittedEventEnvelope[] scheduledWrites, Guid causedBy, string correlationId);
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/IEventWriter.cs b/src/EventStore.Projections.Core/Services/Processing/Checkpointing/IEventWriter.cs
deleted file mode 100644
index 21360a72cf7..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/IEventWriter.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Services.Processing.Checkpointing {
-	public interface IEventWriter {
-		void ValidateOrderAndEmitEvents(EmittedEventEnvelope[] events);
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/PositionTagger.cs b/src/EventStore.Projections.Core/Services/Processing/Checkpointing/PositionTagger.cs
deleted file mode 100644
index 0ecc88b5a1c..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/PositionTagger.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Services.Processing.Checkpointing {
-	public abstract class PositionTagger {
-		public readonly int Phase;
-
-		public PositionTagger(int phase) {
-			Phase = phase;
-		}
-
-		public abstract bool IsMessageAfterCheckpointTag(
-			CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent);
-
-		public abstract CheckpointTag MakeCheckpointTag(
-			CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent);
-
-		public abstract CheckpointTag MakeCheckpointTag(
-			CheckpointTag previous, ReaderSubscriptionMessage.EventReaderPartitionEof partitionEof);
-
-		public abstract CheckpointTag MakeCheckpointTag(
-			CheckpointTag previous, ReaderSubscriptionMessage.EventReaderPartitionDeleted partitionDeleted);
-
-		public abstract CheckpointTag MakeZeroCheckpointTag();
-
-		public abstract bool IsCompatible(CheckpointTag checkpointTag);
-
-		public abstract CheckpointTag AdjustTag(CheckpointTag tag);
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/PositionTracker.cs b/src/EventStore.Projections.Core/Services/Processing/Checkpointing/PositionTracker.cs
deleted file mode 100644
index e78004b8f02..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/PositionTracker.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-
-namespace EventStore.Projections.Core.Services.Processing.Checkpointing {
-	public class PositionTracker {
-		private readonly PositionTagger _positionTagger;
-		private CheckpointTag _lastTag = null;
-
-		public PositionTracker(PositionTagger positionTagger) {
-			_positionTagger = positionTagger;
-		}
-
-		public CheckpointTag LastTag {
-			get { return _lastTag; }
-		}
-
-		public void UpdateByCheckpointTagForward(CheckpointTag newTag) {
-			if (_lastTag == null)
-				throw new InvalidOperationException("Initial position was not set");
-			if (newTag <= _lastTag)
-				throw new InvalidOperationException(
-					string.Format("Event at checkpoint tag {0} has been already processed", newTag));
-			InternalUpdate(newTag);
-		}
-
-		public void UpdateByCheckpointTagInitial(CheckpointTag checkpointTag) {
-			if (_lastTag != null)
-				throw new InvalidOperationException("Position tagger has be already updated");
-			InternalUpdate(checkpointTag);
-		}
-
-		private void InternalUpdate(CheckpointTag newTag) {
-			if (!_positionTagger.IsCompatible(newTag))
-				throw new InvalidOperationException("Cannot update by incompatible checkpoint tag");
-			_lastTag = newTag;
-		}
-
-		public void Initialize() {
-			_lastTag = null;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/ProjectionCheckpoint.cs b/src/EventStore.Projections.Core/Services/Processing/Checkpointing/ProjectionCheckpoint.cs
deleted file mode 100644
index f07d3de19e9..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Checkpointing/ProjectionCheckpoint.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messaging;
-using EventStore.Projections.Core.Common;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Projections.Core.Services.Processing.Checkpointing {
-	public class ProjectionCheckpoint : IDisposable, IEmittedStreamContainer, IEventWriter {
-		private readonly int _maxWriteBatchLength;
-		private readonly Serilog.ILogger _logger;
-
-		private readonly Dictionary<string, EmittedStream> _emittedStreams = new Dictionary<string, EmittedStream>();
-		private readonly ClaimsPrincipal _runAs;
-		private readonly CheckpointTag _from;
-		private CheckpointTag _last;
-		private readonly IProjectionCheckpointManager _readyHandler;
-		private readonly PositionTagger _positionTagger;
-
-		private bool _checkpointRequested = false;
-		private int _requestedCheckpoints;
-		private bool _started = false;
-
-		private readonly IODispatcher _ioDispatcher;
-		private readonly IPublisher _publisher;
-
-		private readonly ProjectionVersion _projectionVersion;
-
-		private List<IEnvelope> _awaitingStreams;
-
-		private Guid[] _writeQueueIds;
-		private int _maximumAllowedWritesInFlight;
-
-		public ProjectionCheckpoint(
-			IPublisher publisher,
-			IODispatcher ioDispatcher,
-			ProjectionVersion projectionVersion,
-			ClaimsPrincipal runAs,
-			IProjectionCheckpointManager readyHandler,
-			CheckpointTag from,
-			PositionTagger positionTagger,
-			int maxWriteBatchLength,
-			int maximumAllowedWritesInFlight,
-			ILogger logger = null) {
-			if (publisher == null) throw new ArgumentNullException("publisher");
-			if (ioDispatcher == null) throw new ArgumentNullException("ioDispatcher");
-			if (readyHandler == null) throw new ArgumentNullException("readyHandler");
-			if (positionTagger == null) throw new ArgumentNullException("positionTagger");
-			if (from.CommitPosition < from.PreparePosition) throw new ArgumentException("from");
-			//NOTE: fromCommit can be equal fromPrepare on 0 position.  Is it possible anytime later? Ignoring for now.
-			_maximumAllowedWritesInFlight = maximumAllowedWritesInFlight;
-			_publisher = publisher;
-			_ioDispatcher = ioDispatcher;
-			_projectionVersion = projectionVersion;
-			_runAs = runAs;
-			_readyHandler = readyHandler;
-			_positionTagger = positionTagger;
-			_from = _last = from;
-			_maxWriteBatchLength = maxWriteBatchLength;
-			_logger = logger;
-			_writeQueueIds = Enumerable.Range(0, _maximumAllowedWritesInFlight).Select(x => Guid.NewGuid()).ToArray();
-		}
-
-		public void Start() {
-			if (_started)
-				throw new InvalidOperationException("Projection has been already started");
-			_started = true;
-			foreach (var stream in _emittedStreams.Values) {
-				stream.Start();
-			}
-		}
-
-		public void ValidateOrderAndEmitEvents(EmittedEventEnvelope[] events) {
-			UpdateLastPosition(events);
-			EnsureCheckpointNotRequested();
-
-			var groupedEvents = events.GroupBy(v => v.Event.StreamId);
-			foreach (var eventGroup in groupedEvents) {
-				EmitEventsToStream(eventGroup.Key, eventGroup.ToArray());
-			}
-		}
-
-		private void UpdateLastPosition(EmittedEventEnvelope[] events) {
-			foreach (var emittedEvent in events) {
-				if (emittedEvent.Event.CausedByTag > _last)
-					_last = emittedEvent.Event.CausedByTag;
-			}
-		}
-
-		private void ValidateCheckpointPosition(CheckpointTag position) {
-			if (position <= _from)
-				throw new InvalidOperationException(
-					string.Format(
-						"Checkpoint position before or equal to the checkpoint start position. Requested: '{0}' Started: '{1}'",
-						position, _from));
-			if (position < _last)
-				throw new InvalidOperationException(
-					string.Format(
-						"Checkpoint position before last handled position. Requested: '{0}' Last: '{1}'", position,
-						_last));
-		}
-
-		public void Prepare(CheckpointTag position) {
-			if (!_started)
-				throw new InvalidOperationException("Projection has not been started");
-			ValidateCheckpointPosition(position);
-			_checkpointRequested = true;
-			_requestedCheckpoints = 1; // avoid multiple checkpoint ready messages if already ready
-			foreach (var emittedStream in _emittedStreams.Values) {
-				_requestedCheckpoints++;
-				emittedStream.Checkpoint();
-			}
-
-			_requestedCheckpoints--;
-			OnCheckpointCompleted();
-		}
-
-		private void EnsureCheckpointNotRequested() {
-			if (_checkpointRequested)
-				throw new InvalidOperationException("Checkpoint requested");
-		}
-
-		private void EmitEventsToStream(string streamId, EmittedEventEnvelope[] emittedEvents) {
-			if (string.IsNullOrEmpty(streamId))
-				throw new ArgumentNullException("streamId");
-			EmittedStream stream;
-			if (!_emittedStreams.TryGetValue(streamId, out stream)) {
-				var streamMetadata = emittedEvents.Length > 0 ? emittedEvents[0].StreamMetadata : null;
-
-				var writeQueueId = _maximumAllowedWritesInFlight == AllowedWritesInFlight.Unbounded
-					? (Guid?)null
-					: _writeQueueIds[_emittedStreams.Count % _maximumAllowedWritesInFlight];
-
-				IEmittedStreamsWriter writer;
-				if (writeQueueId == null)
-					writer = new EmittedStreamsWriter(_ioDispatcher);
-				else
-					writer = new QueuedEmittedStreamsWriter(_ioDispatcher, writeQueueId.Value);
-
-				var writerConfiguration = new EmittedStream.WriterConfiguration(
-					writer, streamMetadata, _runAs, maxWriteBatchLength: _maxWriteBatchLength, logger: _logger);
-
-				stream = new EmittedStream(streamId, writerConfiguration, _projectionVersion, _positionTagger, _from,
-					_publisher, _ioDispatcher, this);
-
-				if (_started)
-					stream.Start();
-				_emittedStreams.Add(streamId, stream);
-			}
-
-			stream.EmitEvents(emittedEvents.Select(v => v.Event).ToArray());
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.ReadyForCheckpoint message) {
-			_requestedCheckpoints--;
-			OnCheckpointCompleted();
-		}
-
-		private void OnCheckpointCompleted() {
-			if (_requestedCheckpoints == 0) {
-				_readyHandler.Handle(new CoreProjectionProcessingMessage.ReadyForCheckpoint(this));
-			}
-		}
-
-		public int GetWritePendingEvents() {
-			return _emittedStreams.Values.Sum(v => v.GetWritePendingEvents());
-		}
-
-		public int GetWritesInProgress() {
-			return _emittedStreams.Values.Sum(v => v.GetWritesInProgress());
-		}
-
-		public int GetReadsInProgress() {
-			return _emittedStreams.Values.Sum(v => v.GetReadsInProgress());
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.RestartRequested message) {
-			_readyHandler.Handle(message);
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.Failed message) {
-			_readyHandler.Handle(message);
-		}
-
-		public void Dispose() {
-			if (_emittedStreams != null)
-				foreach (var stream in _emittedStreams.Values)
-					stream.Dispose();
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.EmittedStreamAwaiting message) {
-			if (_awaitingStreams == null)
-				_awaitingStreams = new List<IEnvelope>();
-			_awaitingStreams.Add(message.Envelope);
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.EmittedStreamWriteCompleted message) {
-			var awaitingStreams = _awaitingStreams;
-			_awaitingStreams = null; // still awaiting will re-register
-			if (awaitingStreams != null)
-				foreach (var stream in awaitingStreams)
-					stream.ReplyWith(message);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/CoreProjection.cs b/src/EventStore.Projections.Core/Services/Processing/CoreProjection.cs
deleted file mode 100644
index 00c3f207799..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/CoreProjection.cs
+++ /dev/null
@@ -1,628 +0,0 @@
-using System;
-using System.Security.Claims;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Core.Services.TimerService;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using EventStore.Projections.Core.Services.Processing.Phases;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using EventStore.Projections.Core.Services.Processing.WorkItems;
-using EventStore.Projections.Core.Utils;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Projections.Core.Services.Processing {
-
-	public class CoreProjection : IDisposable,
-		ICoreProjection,
-		ICoreProjectionForProcessingPhase,
-		IHandle<CoreProjectionManagementMessage.GetState>,
-		IHandle<CoreProjectionManagementMessage.GetResult> {
-		[Flags]
-		private enum State : uint {
-			Initial = 0x80000000,
-			LoadStateRequested = 0x2,
-			StateLoaded = 0x4,
-			Subscribed = 0x8,
-			Running = 0x10,
-			Stopping = 0x40,
-			Stopped = 0x80,
-			FaultedStopping = 0x100,
-			Faulted = 0x200,
-			CompletingPhase = 0x400,
-			PhaseCompleted = 0x800,
-			Suspended = 0x900,
-		}
-
-		private readonly string _name;
-		private readonly ProjectionVersion _version;
-
-		private readonly IPublisher _publisher;
-		private readonly IODispatcher _ioDispatcher;
-
-		private readonly ProjectionProcessingStrategy _projectionProcessingStrategy;
-		private readonly Guid _workerId;
-		internal readonly Guid _projectionCorrelationId;
-		private readonly IPublisher _inputQueue;
-		private readonly ClaimsPrincipal _runAs;
-
-		private readonly Serilog.ILogger _logger;
-
-		private State _state;
-
-		private string _faultedReason;
-
-		private readonly PartitionStateCache _partitionStateCache;
-		private ICoreProjectionCheckpointManager _checkpointManager;
-		private readonly ICoreProjectionCheckpointReader _checkpointReader;
-
-		private bool _tickPending;
-
-		private bool _startOnLoad;
-		private bool _completed;
-
-		private CheckpointSuggestedWorkItem _checkpointSuggestedWorkItem;
-		private IProjectionProcessingPhase _projectionProcessingPhase;
-		private readonly bool _stopOnEof;
-		private readonly IProjectionProcessingPhase[] _projectionProcessingPhases;
-		private readonly CoreProjectionCheckpointWriter _coreProjectionCheckpointWriter;
-		private readonly bool _requiresRootPartition;
-		private readonly Action<ProjectionStatistics> _enrichStatistics;
-
-		private int _statisticsSequentialNumber;
-		private bool _disposed;
-
-		public CoreProjection(
-			ProjectionProcessingStrategy projectionProcessingStrategy,
-			ProjectionVersion version,
-			Guid projectionCorrelationId,
-			IPublisher inputQueue,
-			Guid workerId,
-			ClaimsPrincipal runAs,
-			IPublisher publisher,
-			IODispatcher ioDispatcher,
-			ReaderSubscriptionDispatcher subscriptionDispatcher,
-			ILogger logger,
-			ProjectionNamesBuilder namingBuilder,
-			CoreProjectionCheckpointWriter coreProjectionCheckpointWriter,
-			PartitionStateCache partitionStateCache,
-			string effectiveProjectionName,
-			ITimeProvider timeProvider) {
-			if (publisher == null) throw new ArgumentNullException("publisher");
-			if (ioDispatcher == null) throw new ArgumentNullException("ioDispatcher");
-			if (subscriptionDispatcher == null) throw new ArgumentNullException("subscriptionDispatcher");
-
-			_projectionProcessingStrategy = projectionProcessingStrategy;
-			_projectionCorrelationId = projectionCorrelationId;
-			_inputQueue = inputQueue;
-			_workerId = workerId;
-			_runAs = runAs;
-			_name = effectiveProjectionName;
-			_version = version;
-			_stopOnEof = projectionProcessingStrategy.GetStopOnEof();
-			_logger = logger ?? Serilog.Log.ForContext<CoreProjection>();
-			_publisher = publisher;
-			_ioDispatcher = ioDispatcher;
-			_partitionStateCache = partitionStateCache;
-			_requiresRootPartition = projectionProcessingStrategy.GetRequiresRootPartition();
-			var useCheckpoints = projectionProcessingStrategy.GetUseCheckpoints();
-
-			_coreProjectionCheckpointWriter = coreProjectionCheckpointWriter;
-
-			_projectionProcessingPhases = projectionProcessingStrategy.CreateProcessingPhases(
-				publisher,
-				inputQueue,
-				projectionCorrelationId,
-				partitionStateCache,
-				UpdateStatistics,
-				this,
-				namingBuilder,
-				timeProvider,
-				ioDispatcher,
-				coreProjectionCheckpointWriter);
-
-
-			//NOTE: currently assuming the first checkpoint manager to be able to load any state
-			_checkpointReader = new CoreProjectionCheckpointReader(
-				publisher,
-				_projectionCorrelationId,
-				ioDispatcher,
-				namingBuilder.MakeCheckpointStreamName(),
-				_version,
-				useCheckpoints);
-			_enrichStatistics = projectionProcessingStrategy.EnrichStatistics;
-			GoToState(State.Initial);
-		}
-
-		private void BeginPhase(IProjectionProcessingPhase processingPhase, CheckpointTag startFrom,
-			PartitionState rootPartitionState) {
-			_projectionProcessingPhase = processingPhase;
-			_projectionProcessingPhase.SetProjectionState(PhaseState.Starting);
-			_checkpointManager = processingPhase.CheckpointManager;
-
-			_projectionProcessingPhase.InitializeFromCheckpoint(startFrom);
-			_checkpointManager.Start(startFrom, rootPartitionState);
-		}
-
-		private void UpdateStatistics() {
-			if (_disposed)
-				return;
-			int sequentialNumber = _statisticsSequentialNumber++;
-			var info = new ProjectionStatistics();
-			GetStatistics(info);
-			_publisher.Publish(
-				new CoreProjectionStatusMessage.StatisticsReport(_projectionCorrelationId, info, sequentialNumber));
-		}
-
-		public void Start() {
-			EnsureState(State.Initial);
-			_startOnLoad = true;
-			GoToState(State.LoadStateRequested);
-		}
-
-		public void LoadStopped() {
-			_startOnLoad = false;
-			EnsureState(State.Initial);
-			GoToState(State.LoadStateRequested);
-		}
-
-		public void Stop() {
-			EnsureState(
-				State.LoadStateRequested | State.StateLoaded | State.Subscribed | State.Running | State.PhaseCompleted
-				| State.CompletingPhase);
-			try {
-				if (_state == State.LoadStateRequested || _state == State.PhaseCompleted)
-					GoToState(State.Stopped);
-				else
-					GoToState(State.Stopping);
-			} catch (Exception ex) {
-				SetFaulted(ex);
-			}
-		}
-
-		public void Kill() {
-			if (_state != State.Stopped)
-				GoToState(State.Stopped);
-		}
-
-		public bool Suspend() {
-			if (_state == State.Stopped || _state == State.Suspended)
-				return false;
-
-			GoToState(State.Suspended);
-			return true;
-		}
-
-		private void EnterSuspended() {
-			EnsureUnsubscribed();
-			_publisher.Publish(new CoreProjectionStatusMessage.Suspended(_projectionCorrelationId));
-		}
-
-		private void GetStatistics(ProjectionStatistics info) {
-			_checkpointManager.GetStatistics(info);
-			if (float.IsNaN(info.Progress) || float.IsNegativeInfinity(info.Progress)
-			                               || float.IsPositiveInfinity(info.Progress)) {
-				info.Progress = -2.0f;
-			}
-
-			info.Status = _state.EnumValueName() + info.Status;
-			info.Name = _name;
-			info.EffectiveName = _name;
-			info.ProjectionId = _version.ProjectionId;
-			info.Epoch = _version.Epoch;
-			info.Version = _version.Version;
-			info.StateReason = "";
-			info.BufferedEvents = 0;
-			info.PartitionsCached = _partitionStateCache.CachedItemCount;
-			_enrichStatistics(info);
-			if (_projectionProcessingPhase != null)
-				_projectionProcessingPhase.GetStatistics(info);
-		}
-
-		public void CompletePhase() {
-			if (_state != State.Running)
-				return;
-			if (!_stopOnEof)
-				throw new InvalidOperationException("!_projectionConfig.StopOnEof");
-			_completed = true;
-			_checkpointManager.Progress(100.0f);
-			GoToState(State.CompletingPhase);
-		}
-
-		public void Handle(CoreProjectionManagementMessage.GetState message) {
-			if (_state == State.LoadStateRequested || _state == State.StateLoaded ||
-			    _projectionProcessingPhase == null) {
-				_publisher.Publish(
-					new CoreProjectionStatusMessage.StateReport(
-						message.CorrelationId, _projectionCorrelationId, message.Partition, state: null,
-						position: null));
-				return;
-			}
-
-			EnsureState(
-				State.Running | State.Stopping | State.Stopped | State.FaultedStopping | State.Faulted
-				| State.CompletingPhase | State.PhaseCompleted);
-
-			_projectionProcessingPhase.Handle(message);
-		}
-
-		public void Handle(CoreProjectionManagementMessage.GetResult message) {
-			if (_state == State.LoadStateRequested || _state == State.StateLoaded ||
-			    _projectionProcessingPhase == null) {
-				_publisher.Publish(
-					new CoreProjectionStatusMessage.ResultReport(
-						message.CorrelationId, _projectionCorrelationId, message.Partition, result: null,
-						position: null));
-				return;
-			}
-
-			EnsureState(
-				State.Running | State.Stopping | State.Stopped | State.FaultedStopping | State.Faulted
-				| State.CompletingPhase | State.PhaseCompleted);
-
-			_projectionProcessingPhase.Handle(message);
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.CheckpointCompleted message) {
-			CheckpointCompleted(message.CheckpointTag);
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.CheckpointLoaded message) {
-			EnsureState(State.LoadStateRequested);
-			try {
-				var checkpointTag = message.CheckpointTag;
-				var phase = checkpointTag == null ? 0 : checkpointTag.Phase;
-				var projectionProcessingPhase = _projectionProcessingPhases[phase];
-				if (checkpointTag == null)
-					checkpointTag = projectionProcessingPhase.MakeZeroCheckpointTag();
-				checkpointTag = projectionProcessingPhase.AdjustTag(checkpointTag);
-				//TODO: initialize projection state here (test it)
-				//TODO: write test to ensure projection state is correctly loaded from a checkpoint and posted back when enough empty records processed
-				//TODO: handle errors
-				_coreProjectionCheckpointWriter.StartFrom(checkpointTag, message.CheckpointEventNumber);
-
-				PartitionState rootPartitionState = null;
-				if (_requiresRootPartition) {
-					rootPartitionState = PartitionState.Deserialize(message.CheckpointData, checkpointTag);
-					_partitionStateCache.CacheAndLockPartitionState("", rootPartitionState, null);
-				}
-
-				BeginPhase(projectionProcessingPhase, checkpointTag, rootPartitionState);
-				GoToState(State.StateLoaded);
-				if (_startOnLoad) {
-					_projectionProcessingPhase.Subscribe(checkpointTag, fromCheckpoint: true);
-				} else
-					GoToState(State.Stopped);
-			} catch (Exception ex) {
-				SetFaulted(ex);
-			}
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.PrerecordedEventsLoaded message) {
-			EnsureState(State.StateLoaded);
-			try {
-				_projectionProcessingPhase.Handle(message);
-			} catch (Exception ex) {
-				SetFaulted(ex);
-			}
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.RestartRequested message) {
-			_logger.Information(
-				"Projection '{projection}'({projectionCorrelationId}) restart has been requested due to: '{reason}'",
-				_name, _projectionCorrelationId,
-				message.Reason);
-			if (_state != State.Running) {
-				SetFaulted(
-					string.Format(
-						"A concurrency violation was detected, but the projection is not running. Current state is: {0}.  The reason for the restart is: '{1}' ",
-						_state, message.Reason));
-				return;
-			}
-
-			CompleteCheckpointSuggestedWorkItem();
-			EnsureUnsubscribed();
-			GoToState(State.Initial);
-			Start();
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.Failed message) {
-			SetFaulted(message.Reason);
-		}
-
-		public void EnsureUnsubscribed() {
-			if (_projectionProcessingPhase != null)
-				_projectionProcessingPhase.EnsureUnsubscribed();
-		}
-
-		private void GoToState(State state) {
-			if (_state == State.Suspended) {
-				_logger.Debug($"Projection {_name} has been suspended for a subsystem restart. Cannot go to state {state}");
-				return;
-			}
-//            _logger.Trace("CP: {projection} {stateFrom} => {stateTo}", _name, _state, state);
-			var wasStopped = _state == State.Stopped || _state == State.Faulted || _state == State.PhaseCompleted;
-			var wasStopping = _state == State.Stopping || _state == State.FaultedStopping
-			                                           || _state == State.CompletingPhase;
-			var wasStarting = _state == State.LoadStateRequested || _state == State.StateLoaded
-			                                                     || _state == State.Subscribed;
-			var wasStarted = _state == State.Subscribed || _state == State.Running || _state == State.Stopping
-			                 || _state == State.FaultedStopping || _state == State.CompletingPhase;
-			var wasRunning = _state == State.Running;
-			var stateChanged = _state != state;
-			_state = state; // set state before transition to allow further state change
-			switch (state) {
-				case State.Stopped:
-				case State.Faulted:
-				case State.PhaseCompleted:
-					if (wasStarted && !wasStopped)
-						_checkpointManager.Stopped();
-					break;
-				case State.Stopping:
-				case State.FaultedStopping:
-				case State.CompletingPhase:
-					if (wasStarted && !wasStopping)
-						_checkpointManager.Stopping();
-					break;
-			}
-
-
-			if (_projectionProcessingPhase != null) // null while loading state
-				switch (state) {
-					case State.LoadStateRequested:
-					case State.StateLoaded:
-					case State.Subscribed:
-						if (!wasStarting)
-							_projectionProcessingPhase.SetProjectionState(PhaseState.Starting);
-						break;
-					case State.Running:
-						if (!wasRunning)
-							_projectionProcessingPhase.SetProjectionState(PhaseState.Running);
-						break;
-					case State.Faulted:
-					case State.FaultedStopping:
-						if (wasRunning)
-							_projectionProcessingPhase.SetProjectionState(PhaseState.Stopped);
-						break;
-					case State.Stopped:
-					case State.Stopping:
-					case State.CompletingPhase:
-					case State.PhaseCompleted:
-						if (wasRunning)
-							_projectionProcessingPhase.SetProjectionState(PhaseState.Stopped);
-						break;
-					default:
-						_projectionProcessingPhase.SetProjectionState(PhaseState.Unknown);
-						break;
-				}
-			switch (state) {
-				case State.Initial:
-					EnterInitial();
-					break;
-				case State.LoadStateRequested:
-					EnterLoadStateRequested();
-					break;
-				case State.StateLoaded:
-					EnterStateLoaded();
-					break;
-				case State.Subscribed:
-					EnterSubscribed();
-					break;
-				case State.Running:
-					EnterRunning();
-					break;
-				case State.Stopping:
-					EnterStopping();
-					break;
-				case State.Stopped:
-					EnterStopped();
-					break;
-				case State.FaultedStopping:
-					EnterFaultedStopping();
-					break;
-				case State.Faulted:
-					EnterFaulted();
-					break;
-				case State.CompletingPhase:
-					EnterCompletingPhase();
-					break;
-				case State.PhaseCompleted:
-					EnterPhaseCompleted();
-					break;
-				case State.Suspended:
-					EnterSuspended();
-					break;
-				default:
-					throw new Exception();
-			}
-
-			if (stateChanged)
-				UpdateStatistics();
-		}
-
-		private void EnterInitial() {
-			_completed = false;
-			_partitionStateCache.Initialize();
-			_projectionProcessingPhase = null;
-			_checkpointManager = _projectionProcessingPhases[0].CheckpointManager;
-			var emittedStreamsTracker = _projectionProcessingPhases[0].EmittedStreamsTracker;
-			emittedStreamsTracker.Initialize();
-			_checkpointManager.Initialize();
-			_checkpointReader.Initialize();
-			_tickPending = false;
-			if (_requiresRootPartition)
-				_partitionStateCache.CacheAndLockPartitionState("", new PartitionState("", null, CheckpointTag.Empty),
-					null);
-			// NOTE: this is to workaround exception in GetState requests submitted by client
-		}
-
-		private void EnterLoadStateRequested() {
-			_checkpointReader.BeginLoadState();
-		}
-
-		private void EnterStateLoaded() {
-		}
-
-		private void EnterSubscribed() {
-			if (_startOnLoad) {
-				GoToState(State.Running);
-			} else
-				GoToState(State.Stopped);
-		}
-
-		private void EnterRunning() {
-			try {
-				_publisher.Publish(
-					new CoreProjectionStatusMessage.Started(_projectionCorrelationId, _name));
-				_projectionProcessingPhase.ProcessEvent();
-			} catch (Exception ex) {
-				SetFaulted(ex);
-			}
-		}
-
-		private void EnterStopping() {
-			EnsureUnsubscribed();
-		}
-
-		private void EnterStopped() {
-			EnsureUnsubscribed();
-			_publisher.Publish(new CoreProjectionStatusMessage.Stopped(_projectionCorrelationId, _name, _completed));
-		}
-
-		private void EnterFaultedStopping() {
-			EnsureUnsubscribed();
-		}
-
-		private void EnterFaulted() {
-			EnsureUnsubscribed();
-			_publisher.Publish(
-				new CoreProjectionStatusMessage.Faulted(_projectionCorrelationId, _faultedReason));
-		}
-
-		private void EnterCompletingPhase() {
-		}
-
-		private void EnterPhaseCompleted() {
-			var completedPhaseIndex = _checkpointManager.LastProcessedEventPosition.Phase;
-			if (completedPhaseIndex == _projectionProcessingPhases.Length - 1) {
-				Stop();
-			} else {
-				var nextPhase = _projectionProcessingPhases[completedPhaseIndex + 1];
-				var nextPhaseZeroPosition = nextPhase.MakeZeroCheckpointTag();
-				BeginPhase(nextPhase, nextPhaseZeroPosition, null);
-				_projectionProcessingPhase.Subscribe(nextPhaseZeroPosition, fromCheckpoint: false);
-			}
-		}
-
-		private void EnsureState(State expectedStates) {
-			if ((_state & expectedStates) == 0) {
-				throw new Exception(
-					string.Format("Current state is {0}. Expected states are: {1}", _state, expectedStates));
-			}
-		}
-
-		private void Tick() {
-			// ignore any ticks received when not pending. this may happen when restart requested
-			if (!_tickPending)
-				return;
-			// process messages in almost all states as we now ignore work items when processing
-			if (_state == State.LoadStateRequested) {
-				_tickPending = false;
-				return;
-			}
-
-			EnsureState(
-				State.Running | State.Stopping | State.Stopped | State.FaultedStopping | State.Faulted
-				| State.CompletingPhase | State.PhaseCompleted);
-
-			try {
-				_tickPending = false;
-				_projectionProcessingPhase.ProcessEvent();
-			} catch (Exception ex) {
-				SetFaulted(ex);
-			}
-		}
-
-
-		public void Dispose() {
-			_disposed = true;
-			EnsureUnsubscribed();
-			if (_projectionProcessingPhase != null)
-				_projectionProcessingPhase.Dispose();
-		}
-
-		public void EnsureTickPending() {
-			// ticks are requested when an async operation is completed or when an item is being processed
-			// thus, the tick message is removed from the queue when it does not process any work item (and
-			// it is renewed therefore)
-			if (_tickPending)
-				return;
-			_tickPending = true;
-			_publisher.Publish(new ProjectionCoreServiceMessage.CoreTick(Tick));
-		}
-
-		public void SetFaulted(Exception ex) {
-			SetFaulted(ex.Message + "\r\n" + (ex.StackTrace ?? "").ToString());
-		}
-
-		public void SetFaulted(string reason) {
-			if (_state != State.FaultedStopping && _state != State.Faulted)
-				_faultedReason = reason;
-			if (_state != State.Faulted)
-				GoToState(State.Faulted);
-		}
-
-		public void SetFaulting(string reason) {
-			if (_state != State.FaultedStopping && _state != State.Faulted) {
-				_faultedReason = reason;
-				GoToState(State.FaultedStopping);
-			}
-		}
-
-		private void CheckpointCompleted(CheckpointTag lastCompletedCheckpointPosition) {
-			CompleteCheckpointSuggestedWorkItem();
-			// all emitted events caused by events before the checkpoint position have been written
-			// unlock states, so the cache can be clean up as they can now be safely reloaded from the ES
-			_partitionStateCache.Unlock(lastCompletedCheckpointPosition);
-
-			switch (_state) {
-				case State.Stopping:
-					GoToState(State.Stopped);
-					break;
-				case State.FaultedStopping:
-					GoToState(State.Faulted);
-					break;
-				case State.CompletingPhase:
-					GoToState(State.PhaseCompleted);
-					break;
-			}
-		}
-
-		public void SetCurrentCheckpointSuggestedWorkItem(CheckpointSuggestedWorkItem checkpointSuggestedWorkItem) {
-			if (_checkpointSuggestedWorkItem != null && checkpointSuggestedWorkItem != null)
-				throw new InvalidOperationException("Checkpoint in progress");
-			if (_checkpointSuggestedWorkItem == null && checkpointSuggestedWorkItem == null)
-				throw new InvalidOperationException("No checkpoint in progress");
-			_checkpointSuggestedWorkItem = checkpointSuggestedWorkItem;
-		}
-
-		private void CompleteCheckpointSuggestedWorkItem() {
-			var workItem = _checkpointSuggestedWorkItem;
-			if (workItem != null) {
-				_checkpointSuggestedWorkItem = null;
-				workItem.CheckpointCompleted();
-				EnsureTickPending();
-			}
-		}
-
-
-		public CheckpointTag LastProcessedEventPosition {
-			get { return _checkpointManager.LastProcessedEventPosition; }
-		}
-
-		public void Subscribed() {
-			GoToState(State.Subscribed);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/CoreProjectionQueue.cs b/src/EventStore.Projections.Core/Services/Processing/CoreProjectionQueue.cs
deleted file mode 100644
index 0fc7467cbc8..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/CoreProjectionQueue.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.WorkItems;
-
-namespace EventStore.Projections.Core.Services.Processing {
-	public class CoreProjectionQueue {
-		private readonly StagedProcessingQueue _queuePendingEvents;
-
-		private readonly IPublisher _publisher;
-		private readonly int _pendingEventsThreshold;
-
-		private CheckpointTag _lastEnqueuedEventTag;
-		private bool _justInitialized;
-		private bool _subscriptionPaused;
-
-		public event Action EnsureTickPending {
-			add { _queuePendingEvents.EnsureTickPending += value; }
-			remove { _queuePendingEvents.EnsureTickPending -= value; }
-		}
-
-		public CoreProjectionQueue(IPublisher publisher, int pendingEventsThreshold, bool orderedPartitionProcessing) {
-			_queuePendingEvents =
-				new StagedProcessingQueue(
-					new[] {
-						true /* record event order - async with ordered output*/, true
-						/* get state partition - ordered as it may change correlation id - sync */,
-						false
-						/* load foreach state - async- unordered completion*/,
-						orderedPartitionProcessing
-						/* process Js - unordered/ordered - inherently unordered/ordered completion*/,
-						true
-						/* write emits - ordered - async ordered completion*/,
-						false /* complete item */
-					});
-			_publisher = publisher;
-			_pendingEventsThreshold = pendingEventsThreshold;
-		}
-
-		public bool IsRunning {
-			get { return _isRunning; }
-		}
-
-		public bool ProcessEvent() {
-			var processed = false;
-			if (_queuePendingEvents.Count > 0) {
-				processed = ProcessOneEventBatch();
-			} else if (_queuePendingEvents.Count == 0 && _subscriptionPaused && !_unsubscribed) {
-				ResumeSubscription();
-			}
-
-			return processed;
-		}
-
-		public int GetBufferedEventCount() {
-			return _queuePendingEvents.Count;
-		}
-
-		public void EnqueueTask(WorkItem workItem, CheckpointTag workItemCheckpointTag,
-			bool allowCurrentPosition = false) {
-			ValidateQueueingOrder(workItemCheckpointTag, allowCurrentPosition);
-			workItem.SetProjectionQueue(this);
-			workItem.SetCheckpointTag(workItemCheckpointTag);
-			_queuePendingEvents.Enqueue(workItem);
-		}
-
-		public void EnqueueOutOfOrderTask(WorkItem workItem) {
-			if (_lastEnqueuedEventTag == null)
-				throw new InvalidOperationException(
-					"Cannot enqueue an out-of-order task.  The projection position is currently unknown.");
-			workItem.SetProjectionQueue(this);
-			workItem.SetCheckpointTag(_lastEnqueuedEventTag);
-			_queuePendingEvents.Enqueue(workItem);
-		}
-
-		public void InitializeQueue(CheckpointTag startingPosition) {
-			_subscriptionPaused = false;
-			_unsubscribed = false;
-			_subscriptionId = Guid.Empty;
-
-			_queuePendingEvents.Initialize();
-
-			_lastEnqueuedEventTag = startingPosition;
-			_justInitialized = true;
-		}
-
-		public string GetStatus() {
-			return (_subscriptionPaused ? "/Paused" : "");
-		}
-
-		private void ValidateQueueingOrder(CheckpointTag eventTag, bool allowCurrentPosition = false) {
-			if (eventTag < _lastEnqueuedEventTag ||
-				(!(allowCurrentPosition || _justInitialized) && eventTag <= _lastEnqueuedEventTag))
-				throw new InvalidOperationException(
-					string.Format(
-						"Invalid order.  Last known tag is: '{0}'.  Current tag is: '{1}'", _lastEnqueuedEventTag,
-						eventTag));
-			_justInitialized = _justInitialized && (eventTag == _lastEnqueuedEventTag);
-			_lastEnqueuedEventTag = eventTag;
-		}
-
-		private void PauseSubscription() {
-			if (_subscriptionId == Guid.Empty)
-				throw new InvalidOperationException("Not subscribed");
-			if (!_subscriptionPaused && !_unsubscribed) {
-				_subscriptionPaused = true;
-				_publisher.Publish(
-					new ReaderSubscriptionManagement.Pause(_subscriptionId));
-			}
-		}
-
-		private void ResumeSubscription() {
-			if (_subscriptionId == Guid.Empty)
-				throw new InvalidOperationException("Not subscribed");
-			if (_subscriptionPaused && !_unsubscribed) {
-				_subscriptionPaused = false;
-				_publisher.Publish(
-					new ReaderSubscriptionManagement.Resume(_subscriptionId));
-			}
-		}
-
-		private bool _unsubscribed;
-		private Guid _subscriptionId;
-		private bool _isRunning;
-
-		private bool ProcessOneEventBatch() {
-			if (_queuePendingEvents.Count > _pendingEventsThreshold)
-				PauseSubscription();
-			var processed = _queuePendingEvents.Process(max: 30);
-			if (_subscriptionPaused && _queuePendingEvents.Count < _pendingEventsThreshold / 2)
-				ResumeSubscription();
-
-			return processed;
-		}
-
-		public void Unsubscribed() {
-			_unsubscribed = true;
-		}
-
-		public void Subscribed(Guid currentSubscriptionId) {
-			if (_unsubscribed)
-				throw new InvalidOperationException("Unsubscribed");
-			if (_subscriptionId != Guid.Empty)
-				throw new InvalidOperationException("Already subscribed");
-			_subscriptionId = currentSubscriptionId;
-		}
-
-		public void SetIsRunning(bool isRunning) {
-			_isRunning = isRunning;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedDataEvent.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedDataEvent.cs
deleted file mode 100644
index 518a7afc7c4..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedDataEvent.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents {
-	public class EmittedDataEvent : EmittedEvent {
-		private readonly string _data;
-		private readonly ExtraMetaData _metadata;
-		private readonly bool _isJson;
-
-		public EmittedDataEvent(
-			string streamId, Guid eventId,
-			string eventType, bool isJson, string data, ExtraMetaData metadata, CheckpointTag causedByTag,
-			CheckpointTag expectedTag,
-			Action<long> onCommitted = null)
-			: base(streamId, eventId, eventType, causedByTag, expectedTag, onCommitted) {
-			_isJson = isJson;
-			_data = data;
-			_metadata = metadata;
-		}
-
-		public override string Data {
-			get { return _data; }
-		}
-
-		public ExtraMetaData Metadata {
-			get { return _metadata; }
-		}
-
-		public override bool IsJson {
-			get { return _isJson; }
-		}
-
-		public override bool IsReady() {
-			return true;
-		}
-
-		public override IEnumerable<KeyValuePair<string, string>> ExtraMetaData() {
-			return _metadata == null ? null : _metadata.Metadata;
-		}
-
-		public override string ToString() {
-			return string.Format("Event Id: {0}, Event Type: {1}, Data: {2}", EventId, EventType, Data);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedEvent.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedEvent.cs
deleted file mode 100644
index 061e2ca0222..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedEvent.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents {
-	public abstract class EmittedEvent {
-		public readonly string StreamId;
-		public readonly Guid EventId;
-		public readonly string EventType;
-		private readonly CheckpointTag _causedByTag;
-		private readonly CheckpointTag _expectedTag;
-		private readonly Action<long> _onCommitted;
-		private Guid _causedBy;
-		private string _correlationId;
-
-		protected EmittedEvent(
-			string streamId, Guid eventId,
-			string eventType, CheckpointTag causedByTag, CheckpointTag expectedTag, Action<long> onCommitted = null) {
-			if (causedByTag == null) throw new ArgumentNullException("causedByTag");
-			StreamId = streamId;
-			EventId = eventId;
-			EventType = eventType;
-			_causedByTag = causedByTag;
-			_expectedTag = expectedTag;
-			_onCommitted = onCommitted;
-		}
-
-		public abstract string Data { get; }
-
-		public CheckpointTag CausedByTag {
-			get { return _causedByTag; }
-		}
-
-		public CheckpointTag ExpectedTag {
-			get { return _expectedTag; }
-		}
-
-		public Action<long> OnCommitted {
-			get { return _onCommitted; }
-		}
-
-		public Guid CausedBy {
-			get { return _causedBy; }
-		}
-
-		public string CorrelationId {
-			get { return _correlationId; }
-		}
-
-		public abstract bool IsJson { get; }
-
-		public abstract bool IsReady();
-
-		public virtual IEnumerable<KeyValuePair<string, string>> ExtraMetaData() {
-			return null;
-		}
-
-		public void SetCausedBy(Guid causedBy) {
-			_causedBy = causedBy;
-		}
-
-		public void SetCorrelationId(string correlationId) {
-			_correlationId = correlationId;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedEventEnvelope.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedEventEnvelope.cs
deleted file mode 100644
index 0be115c43b1..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedEventEnvelope.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents {
-	public sealed class EmittedEventEnvelope {
-		public readonly EmittedEvent Event;
-		public readonly EmittedStream.WriterConfiguration.StreamMetadata StreamMetadata;
-
-		public EmittedEventEnvelope(
-			EmittedEvent @event, EmittedStream.WriterConfiguration.StreamMetadata streamMetadata = null) {
-			Event = @event;
-			StreamMetadata = streamMetadata;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedEventResolutionNeeded.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedEventResolutionNeeded.cs
deleted file mode 100644
index 88857c0872c..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedEventResolutionNeeded.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-sealed class EmittedEventResolutionNeeded : IValidatedEmittedEvent {
-	public string StreamId { get; }
-	public long Revision { get; }
-	public Tuple<CheckpointTag, string, long> TopCommitted { get; }
-
-	public EmittedEventResolutionNeeded(string streamId, long revision, Tuple<CheckpointTag, string, long> topCommitted) {
-		StreamId = streamId;
-		Revision = revision;
-		TopCommitted = topCommitted;
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedLinkTo.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedLinkTo.cs
deleted file mode 100644
index 60d078ac596..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedLinkTo.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Globalization;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents {
-	public class EmittedLinkTo : EmittedEvent {
-		private readonly string _targetStreamId;
-		private long? _eventNumber;
-
-		public EmittedLinkTo(
-			string streamId, Guid eventId,
-			string targetStreamId, CheckpointTag causedByTag, CheckpointTag expectedTag,
-			Action<long> onCommitted = null)
-			: base(streamId, eventId, "$>", causedByTag, expectedTag, onCommitted) {
-			_targetStreamId = targetStreamId;
-		}
-
-		public EmittedLinkTo(
-			string streamId, Guid eventId,
-			string targetStreamId, int targetEventNumber, CheckpointTag causedByTag, CheckpointTag expectedTag,
-			string originalStreamId = null)
-			: base(streamId, eventId, "$>", causedByTag, expectedTag, null) {
-			_eventNumber = targetEventNumber;
-			_targetStreamId = targetStreamId;
-		}
-
-		public override string Data {
-			get {
-				if (!IsReady())
-					throw new InvalidOperationException("Link target has not been yet committed");
-				return
-					_eventNumber.Value.ToString(CultureInfo.InvariantCulture) + "@" + _targetStreamId;
-			}
-		}
-
-		public override bool IsJson {
-			get { return false; }
-		}
-
-		public override bool IsReady() {
-			return _eventNumber != null;
-		}
-
-		public void SetTargetEventNumber(long eventNumber) {
-			if (_eventNumber != null)
-				throw new InvalidOperationException("Target event number has been already set");
-			_eventNumber = eventNumber;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedLinkToWithRecategorization.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedLinkToWithRecategorization.cs
deleted file mode 100644
index 9e441b69119..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedLinkToWithRecategorization.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using Newtonsoft.Json;
-
-namespace EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents {
-	public class EmittedLinkToWithRecategorization : EmittedEvent {
-		private readonly string _target;
-		private readonly string _originalStreamId;
-		private readonly int? _streamDeletedAt;
-
-		public EmittedLinkToWithRecategorization(
-			string streamId, Guid eventId, string target, CheckpointTag causedByTag, CheckpointTag expectedTag,
-			string originalStreamId, int? streamDeletedAt)
-			: base(streamId, eventId, "$>", causedByTag, expectedTag, null) {
-			_target = target;
-			_originalStreamId = originalStreamId;
-			_streamDeletedAt = streamDeletedAt;
-		}
-
-		public override string Data {
-			get { return _target; }
-		}
-
-		public override bool IsJson {
-			get { return false; }
-		}
-
-		public override bool IsReady() {
-			return true;
-		}
-
-		public override IEnumerable<KeyValuePair<string, string>> ExtraMetaData() {
-			if (!string.IsNullOrEmpty(_originalStreamId))
-				yield return new KeyValuePair<string, string>("$o", JsonConvert.ToString(_originalStreamId));
-			if (_streamDeletedAt != null)
-				yield return new KeyValuePair<string, string>("$deleted", JsonConvert.ToString(_streamDeletedAt.Value));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/ErroredEmittedEvent.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/ErroredEmittedEvent.cs
deleted file mode 100644
index 91c99e7ba1d..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/ErroredEmittedEvent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-
-namespace EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-sealed class ErroredEmittedEvent : IValidatedEmittedEvent {
-	public Exception Exception { get; private set; }
-
-	public ErroredEmittedEvent(InvalidEmittedEventSequenceException exception) {
-		Exception = exception;
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/ExtraMetaData.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/ExtraMetaData.cs
deleted file mode 100644
index 78ed384edb4..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/ExtraMetaData.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Newtonsoft.Json.Linq;
-
-namespace EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents {
-	public class ExtraMetaData {
-		private readonly Dictionary<string, string> _metadata;
-
-		public ExtraMetaData(Dictionary<string, JRaw> metadata) {
-			_metadata = metadata.ToDictionary(v => v.Key, v => v.Value.ToString());
-		}
-
-		public ExtraMetaData(Dictionary<string, string> metadata) {
-			_metadata = metadata.ToDictionary(v => v.Key, v => v.Value);
-		}
-
-		public Dictionary<string, string> Metadata {
-			get { return _metadata; }
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/IValidatedEmittedEvent.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/IValidatedEmittedEvent.cs
deleted file mode 100644
index 7ee0926569a..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/IValidatedEmittedEvent.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-interface IValidatedEmittedEvent {}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/IgnoredEmittedEvent.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/IgnoredEmittedEvent.cs
deleted file mode 100644
index ca79c36b50e..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/IgnoredEmittedEvent.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-sealed class IgnoredEmittedEvent : IValidatedEmittedEvent {
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/ValidEmittedEvent.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/ValidEmittedEvent.cs
deleted file mode 100644
index 2d820419263..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedEvents/ValidEmittedEvent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-sealed class ValidEmittedEvent : IValidatedEmittedEvent {
-	public CheckpointTag Checkpoint { get; private set; }
-	public string EventType { get; private set; }
-	public long Revision { get; private set; }
-
-	public ValidEmittedEvent(CheckpointTag checkpoint, string eventType, long revision) {
-		Checkpoint = checkpoint;
-		EventType = eventType;
-		Revision = revision;
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedStream.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedStream.cs
deleted file mode 100644
index a296e42bfd4..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedStream.cs
+++ /dev/null
@@ -1,719 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using Newtonsoft.Json.Linq;
-using Serilog;
-
-namespace EventStore.Projections.Core.Services.Processing.Emitting {
-	public partial class EmittedStream : IDisposable,
-		IHandle<CoreProjectionProcessingMessage.EmittedStreamWriteCompleted> {
-		private readonly IODispatcher _ioDispatcher;
-		private readonly IPublisher _publisher;
-
-		private readonly ILogger _logger;
-		private readonly string _streamId;
-		private readonly string _metadataStreamId;
-		private readonly WriterConfiguration _writerConfiguration;
-		private readonly ProjectionVersion _projectionVersion;
-		private readonly ClaimsPrincipal _writeAs;
-		private readonly PositionTagger _positionTagger;
-		private readonly CheckpointTag _zeroPosition;
-		private readonly CheckpointTag _fromCheckpointPosition;
-		private readonly IEmittedStreamContainer _readyHandler;
-		private static readonly string LinkEventType = "$>";
-		private static readonly char[] LinkToSeparator = new[] {'@'};
-
-		private readonly Stack<Tuple<CheckpointTag, string, long>> _alreadyCommittedEvents =
-			new Stack<Tuple<CheckpointTag, string, long>>();
-
-		private readonly Queue<EmittedEvent> _pendingWrites = new Queue<EmittedEvent>();
-
-		private bool _checkpointRequested;
-		private bool _awaitingWriteCompleted;
-		private bool _awaitingMetadataWriteCompleted;
-		private bool _awaitingReady;
-		private bool _awaitingListEventsCompleted;
-		private bool _started;
-		private bool _awaitingLinkToResolution;
-
-		private readonly int _maxWriteBatchLength;
-		private CheckpointTag _lastCommittedOrSubmittedEventPosition; // TODO: rename
-		private bool _metadataStreamCreated;
-		private CheckpointTag _lastQueuedEventPosition;
-		private Event[] _submittedToWriteEvents;
-		private EmittedEvent[] _submittedToWriteEmittedEvents;
-		private long _lastKnownEventNumber = ExpectedVersion.Invalid;
-		private long _retrievedNextEventNumber = ExpectedVersion.Invalid;
-		private readonly bool _noCheckpoints;
-		private bool _disposed;
-		private bool _recoveryCompleted;
-		private Event _submittedWriteMetaStreamEvent;
-		private const int MaxRetryCount = 12;
-		private const int MinAttemptWarnThreshold = 5;
-		private Guid _pendingRequestCorrelationId;
-		private Random _random = new Random();
-
-		public EmittedStream(
-			string streamId, WriterConfiguration writerConfiguration, ProjectionVersion projectionVersion,
-			PositionTagger positionTagger, CheckpointTag fromCheckpointPosition, IPublisher publisher,
-			IODispatcher ioDispatcher,
-			IEmittedStreamContainer readyHandler, bool noCheckpoints = false) {
-			if (string.IsNullOrEmpty(streamId)) throw new ArgumentNullException("streamId");
-			if (writerConfiguration == null) throw new ArgumentNullException("writerConfiguration");
-			if (positionTagger == null) throw new ArgumentNullException("positionTagger");
-			if (fromCheckpointPosition == null) throw new ArgumentNullException("fromCheckpointPosition");
-			if (publisher == null) throw new ArgumentNullException("publisher");
-			if (ioDispatcher == null) throw new ArgumentNullException("ioDispatcher");
-			if (readyHandler == null) throw new ArgumentNullException("readyHandler");
-			_streamId = streamId;
-			_metadataStreamId = SystemStreams.MetastreamOf(streamId);
-			_writerConfiguration = writerConfiguration;
-			_projectionVersion = projectionVersion;
-			_writeAs = writerConfiguration.WriteAs;
-			_positionTagger = positionTagger;
-			_zeroPosition = positionTagger.MakeZeroCheckpointTag();
-			_fromCheckpointPosition = fromCheckpointPosition;
-			_lastQueuedEventPosition = null;
-			_publisher = publisher;
-			_ioDispatcher = ioDispatcher;
-			_readyHandler = readyHandler;
-			_maxWriteBatchLength = writerConfiguration.MaxWriteBatchLength;
-			_logger = writerConfiguration.Logger;
-			_noCheckpoints = noCheckpoints;
-		}
-
-		public void EmitEvents(EmittedEvent[] events) {
-			if (events == null) throw new ArgumentNullException("events");
-			CheckpointTag groupCausedBy = null;
-			foreach (var @event in events) {
-				if (groupCausedBy == null) {
-					groupCausedBy = @event.CausedByTag;
-					if (!(_lastQueuedEventPosition != null && groupCausedBy > _lastQueuedEventPosition) &&
-					    !(_lastQueuedEventPosition == null && groupCausedBy >= _fromCheckpointPosition))
-						throw new InvalidOperationException(
-							string.Format("Invalid event order.  '{0}' goes after '{1}'", @event.CausedByTag,
-								_lastQueuedEventPosition));
-					_lastQueuedEventPosition = groupCausedBy;
-				} else if (@event.CausedByTag != groupCausedBy)
-					throw new ArgumentException("events must share the same CausedByTag");
-
-				if (@event.StreamId != _streamId)
-					throw new ArgumentException("Invalid streamId", "events");
-			}
-
-			EnsureCheckpointNotRequested();
-			foreach (var @event in events)
-				_pendingWrites.Enqueue(@event);
-			ProcessWrites();
-		}
-
-		public void Checkpoint() {
-			EnsureCheckpointsEnabled();
-			EnsureStreamStarted();
-			EnsureCheckpointNotRequested();
-			_checkpointRequested = true;
-			ProcessRequestedCheckpoint();
-		}
-
-		public void Start() {
-			EnsureCheckpointNotRequested();
-			if (_started)
-				throw new InvalidOperationException("Stream is already started");
-			_started = true;
-			ProcessWrites();
-		}
-
-		public int GetWritePendingEvents() {
-			return _pendingWrites.Count;
-		}
-
-		public int GetWritesInProgress() {
-			return (_awaitingWriteCompleted ? 1 : 0) + (_awaitingMetadataWriteCompleted ? 1 : 0);
-		}
-
-		public int GetReadsInProgress() {
-			return _awaitingListEventsCompleted ? 1 : 0;
-		}
-
-		private void HandleWriteEventsCompleted(ClientMessage.WriteEventsCompleted message, int retryCount) {
-			if (!_awaitingWriteCompleted)
-				throw new InvalidOperationException("WriteEvents has not been submitted");
-			if (_disposed)
-				return;
-			_awaitingWriteCompleted = false;
-			if (message.Result == OperationResult.Success) {
-				_lastKnownEventNumber = message.FirstEventNumber + _submittedToWriteEvents.Length - 1;
-				NotifyEventsCommitted(_submittedToWriteEmittedEvents, message.FirstEventNumber);
-				OnWriteCompleted();
-				return;
-			}
-
-			if (_logger != null) {
-				_logger.Information("Failed to write events to stream {stream}. Error: {e}",
-					_streamId,
-					Enum.GetName(typeof(OperationResult), message.Result));
-			}
-
-			switch (message.Result) {
-				case OperationResult.WrongExpectedVersion:
-					RequestRestart(string.Format(
-						"The '{0}' stream has been written to from the outside. Expected Version: {1}, Current Version: {2}. Checkpoint: {3}.",
-						_streamId, _lastKnownEventNumber, message.CurrentVersion, _fromCheckpointPosition));
-					break;
-				case OperationResult.PrepareTimeout:
-				case OperationResult.ForwardTimeout:
-				case OperationResult.CommitTimeout:
-					if (retryCount > 0) {
-						PublishWriteEvents(--retryCount);
-					} else {
-						Failed(string.Format(
-							"Failed to write events to {0}. Retry limit of {1} reached. Reason: {2}. Checkpoint: {3}.",
-							_streamId, MaxRetryCount, message.Result, _fromCheckpointPosition));
-					}
-
-					break;
-				default:
-					throw new NotSupportedException("Unsupported error code received");
-			}
-		}
-
-		private void RequestRestart(string reason) {
-			_readyHandler.Handle(new CoreProjectionProcessingMessage.RestartRequested(Guid.Empty, reason));
-		}
-
-		private void Failed(string reason) {
-			_readyHandler.Handle(new CoreProjectionProcessingMessage.Failed(Guid.Empty, reason));
-		}
-
-		private void ReadStreamEventsBackwardCompleted(ClientMessage.ReadStreamEventsBackwardCompleted message,
-			CheckpointTag lastCheckpointPosition) {
-			if (!_awaitingListEventsCompleted)
-				throw new InvalidOperationException("ReadStreamEventsBackward has not been requested");
-			if (_disposed)
-				return;
-			if (message.CorrelationId != _pendingRequestCorrelationId)
-				return;
-			if (message.Result == ReadStreamResult.StreamDeleted) {
-				Failed($"Stream : {_streamId} is deleted. Cannot emit events to it");
-				return;
-			}
-
-			_pendingRequestCorrelationId = Guid.Empty;
-			_awaitingListEventsCompleted = false;
-
-			var newPhysicalStream = message.LastEventNumber == ExpectedVersion.NoStream;
-			_retrievedNextEventNumber = newPhysicalStream
-				? (message.StreamMetadata != null ? (message.StreamMetadata.TruncateBefore ?? 0) : 0)
-				: message.LastEventNumber + 1;
-
-			if (_lastCommittedOrSubmittedEventPosition == null) {
-				var parsed = default(CheckpointTagVersion);
-				if (!newPhysicalStream && message.Events.Length > 0) {
-					parsed = message.Events[0].Event.Metadata.ParseCheckpointTagVersionExtraJson(_projectionVersion);
-					if (parsed.Tag == null) {
-						Failed(string.Format(
-							"The '{0}' stream managed by projection {1} has been written to from the outside.",
-							_streamId, _projectionVersion.ProjectionId));
-						return;
-					}
-
-					if (_projectionVersion.ProjectionId != parsed.Version.ProjectionId) {
-						Failed(
-							string.Format(
-								"Multiple projections emitting to the same stream detected.  Stream: '{0}'. Last event projection: '{1}'.  Emitting projection: '{2}'",
-								_streamId, parsed.Version.ProjectionId, _projectionVersion.ProjectionId));
-						return;
-					}
-				}
-
-				var newLogicalStream = newPhysicalStream
-				                       || (_projectionVersion.ProjectionId != parsed.Version.ProjectionId ||
-				                           _projectionVersion.Epoch > parsed.Version.Version);
-
-				_lastKnownEventNumber = newPhysicalStream ? ExpectedVersion.NoStream : message.LastEventNumber;
-
-				if (newLogicalStream) {
-					_lastCommittedOrSubmittedEventPosition = _zeroPosition;
-					_metadataStreamCreated = false;
-				} else {
-					//TODO: verify order - as we are reading backward
-					try {
-						_lastCommittedOrSubmittedEventPosition = parsed.AdjustBy(_positionTagger, _projectionVersion);
-						_metadataStreamCreated = true; // should exist or no need to create
-					} catch (NotSupportedException ex) {
-						Failed(ex.Message);
-					}
-				}
-			}
-
-			var stop = CollectAlreadyCommittedEvents(message, lastCheckpointPosition);
-
-			if (stop)
-				try {
-					SubmitWriteEventsInRecovery();
-				} catch (InvalidEmittedEventSequenceException ex) {
-					Failed(ex.Message);
-				}
-			else
-				SubmitListEvents(lastCheckpointPosition, message.NextEventNumber);
-		}
-
-		private bool CollectAlreadyCommittedEvents(
-			ClientMessage.ReadStreamEventsBackwardCompleted message, CheckpointTag lastCheckpointPosition) {
-			var stop = false;
-			foreach (var e in message.Events) {
-				var checkpointTagVersion = e.Event.Metadata.ParseCheckpointTagVersionExtraJson(_projectionVersion);
-				var ourEpoch = checkpointTagVersion.Version.ProjectionId == _projectionVersion.ProjectionId
-				               && checkpointTagVersion.Version.Version >= _projectionVersion.Epoch;
-
-				if (IsV1StreamCreatedEvent(e))
-					continue;
-
-				if (checkpointTagVersion.Tag == null) {
-					Failed(
-						string.Format(
-							"A unstamped event found. Stream: '{0}'. EventNumber: '{1}'", message.EventStreamId,
-							e.OriginalEventNumber));
-					return true;
-				}
-
-				var doStop = !ourEpoch;
-				if (!doStop) {
-					//NOTE: may need to compare with last pre-recorded event
-					//      but should not push to alreadyCommitted if source changed (must be at checkpoint)
-					var adjustedTag = checkpointTagVersion.AdjustBy(_positionTagger, _projectionVersion);
-					doStop = adjustedTag <= lastCheckpointPosition;
-				}
-
-				if (doStop)
-					// ignore any events prior to the requested lastCheckpointPosition (== first emitted event position)
-				{
-					stop = true;
-					break;
-				}
-
-				var eventType = e.Event.EventType;
-				_alreadyCommittedEvents.Push(Tuple.Create(checkpointTagVersion.Tag, eventType, e.Event.EventNumber));
-			}
-
-			return stop || message.IsEndOfStream;
-		}
-
-		private static bool IsV1StreamCreatedEvent(EventStore.Core.Data.ResolvedEvent e) {
-			return e.Link == null && e.OriginalEventNumber == 0
-			                      && (e.OriginalEvent.EventType == SystemEventTypes.V1__StreamCreatedImplicit__
-			                          || e.OriginalEvent.EventType == SystemEventTypes.V1__StreamCreated__);
-		}
-
-		private void ProcessWrites() {
-			if (_started && !_awaitingListEventsCompleted && !_awaitingWriteCompleted
-			    && !_awaitingMetadataWriteCompleted && _pendingWrites.Count > 0) {
-				if (_lastCommittedOrSubmittedEventPosition == null)
-					SubmitListEvents(_fromCheckpointPosition);
-				else
-					SubmitWriteEventsInRecovery();
-			}
-		}
-
-		private void SubmitListEvents(CheckpointTag upTo, long fromEventNumber = -1) {
-			if (_awaitingWriteCompleted || _awaitingMetadataWriteCompleted || _awaitingListEventsCompleted)
-				throw new Exception();
-			_awaitingListEventsCompleted = true;
-			_pendingRequestCorrelationId = Guid.NewGuid();
-			_ioDispatcher.ReadBackward(
-				_streamId, fromEventNumber, 1, resolveLinks: false, principal: SystemAccounts.System,
-				action: completed => ReadStreamEventsBackwardCompleted(completed, upTo),
-				corrId: _pendingRequestCorrelationId,
-				timeoutAction: CreateReadTimeoutAction(_pendingRequestCorrelationId, upTo, fromEventNumber));
-		}
-
-		private Action CreateReadTimeoutAction(Guid correlationId, CheckpointTag upTo, long fromEventNumber) {
-			return () => {
-				if (correlationId != _pendingRequestCorrelationId) return;
-				_pendingRequestCorrelationId = Guid.Empty;
-				_awaitingListEventsCompleted = false;
-				SubmitListEvents(upTo, fromEventNumber);
-			};
-		}
-
-		private void SubmitWriteMetadata() {
-			if (_awaitingWriteCompleted || _awaitingMetadataWriteCompleted || _awaitingListEventsCompleted)
-				throw new Exception();
-			var streamAcl = _streamId.StartsWith("$")
-				? new StreamAcl(SystemRoles.All, null, null, SystemRoles.All, null)
-				: new StreamAcl((string)null, null, null, null, null);
-
-			var streamMetadata = new StreamMetadata(
-				_writerConfiguration.MaxCount, _writerConfiguration.MaxAge, acl: streamAcl,
-				truncateBefore: _retrievedNextEventNumber == 0 ? (long?)null : _retrievedNextEventNumber);
-
-			_submittedWriteMetaStreamEvent = new Event(
-				Guid.NewGuid(), SystemEventTypes.StreamMetadata, true, streamMetadata.ToJsonBytes(), null);
-
-			_awaitingMetadataWriteCompleted = true;
-
-			PublishWriteMetaStream(MaxRetryCount);
-		}
-
-		private void PublishWriteMetaStream(int retryCount) {
-			int attempt = MaxRetryCount - retryCount + 1;
-			var delayInSeconds = CalculateBackoffTimeSecs(attempt);
-			if (attempt >= MinAttemptWarnThreshold && _logger != null) {
-				_logger.Warning("Attempt: {attempt} to write events to stream {stream}. Backing off for {time} second(s).",
-					attempt,
-					_metadataStreamId,
-					delayInSeconds);
-			}
-
-			if (delayInSeconds == 0) {
-				_writerConfiguration.Writer.WriteEvents(
-					_metadataStreamId, ExpectedVersion.Any, new Event[] {_submittedWriteMetaStreamEvent}, _writeAs,
-					m => HandleMetadataWriteCompleted(m, retryCount));
-			} else {
-				_ioDispatcher.Delay(TimeSpan.FromSeconds(delayInSeconds),
-					_ => _writerConfiguration.Writer.WriteEvents(
-						_metadataStreamId, ExpectedVersion.Any, new Event[] {_submittedWriteMetaStreamEvent}, _writeAs,
-						m => HandleMetadataWriteCompleted(m, retryCount)));
-			}
-		}
-
-		private void HandleMetadataWriteCompleted(ClientMessage.WriteEventsCompleted message, int retryCount) {
-			if (!_awaitingMetadataWriteCompleted)
-				throw new InvalidOperationException("WriteEvents to metadata stream has not been submitted");
-			if (_disposed)
-				return;
-			if (message.Result == OperationResult.Success) {
-				_metadataStreamCreated = true;
-				_awaitingMetadataWriteCompleted = false;
-				PublishWriteEvents(MaxRetryCount);
-				return;
-			}
-
-			if (_logger != null) {
-				_logger.Information("Failed to write events to stream {stream}. Error: {e}",
-					_metadataStreamId,
-					Enum.GetName(typeof(OperationResult), message.Result));
-			}
-
-			switch (message.Result) {
-				case OperationResult.WrongExpectedVersion:
-					RequestRestart(string.Format("The '{0}' stream has been written to from the outside",
-						_metadataStreamId));
-					break;
-				case OperationResult.PrepareTimeout:
-				case OperationResult.ForwardTimeout:
-				case OperationResult.CommitTimeout:
-					if (retryCount > 0) {
-						PublishWriteMetaStream(--retryCount);
-					} else {
-						Failed(string.Format(
-							"Failed to write an events to {0}. Retry limit of {1} reached. Reason: {2}",
-							_metadataStreamId, MaxRetryCount, message.Result));
-					}
-
-					break;
-				default:
-					throw new NotSupportedException("Unsupported error code received");
-			}
-		}
-
-		private void SubmitWriteEvents() {
-			if (_awaitingWriteCompleted || _awaitingMetadataWriteCompleted || _awaitingListEventsCompleted)
-				throw new Exception();
-			if (!_metadataStreamCreated)
-				if (_lastCommittedOrSubmittedEventPosition != _zeroPosition)
-					throw new Exception("Internal error");
-			var events = new List<Event>();
-			var emittedEvents = new List<EmittedEvent>();
-			while (_pendingWrites.Count > 0 && events.Count < _maxWriteBatchLength) {
-				var e = _pendingWrites.Peek();
-				if (!e.IsReady()) {
-					_readyHandler.Handle(
-						new CoreProjectionProcessingMessage.EmittedStreamAwaiting(
-							_streamId, new SendToThisEnvelope(this)));
-					_awaitingReady = true;
-					break;
-				}
-
-				_pendingWrites.Dequeue();
-
-				var expectedTag = e.ExpectedTag;
-				var causedByTag = e.CausedByTag;
-				if (expectedTag != null)
-					if (DetectConcurrencyViolations(expectedTag)) {
-						RequestRestart(
-							string.Format(
-								"Wrong expected tag while submitting write event request to the '{0}' stream.  The last known stream tag is: '{1}'  the expected tag is: '{2}'",
-								_streamId, _lastCommittedOrSubmittedEventPosition, expectedTag));
-						return;
-					}
-
-				_lastCommittedOrSubmittedEventPosition = causedByTag;
-				try {
-					events.Add(
-						new Event(
-							e.EventId, e.EventType, e.IsJson, e.Data != null ? Helper.UTF8NoBom.GetBytes(e.Data) : null,
-							e.CausedByTag.ToJsonBytes(_projectionVersion, MetadataWithCausedByAndCorrelationId(e))));
-				} catch (ArgumentException ex) {
-					Failed(string.Format("Failed to write the event: {0} to stream: {1} failed. Reason: {2}.", e,
-						_streamId, ex.Message));
-					return;
-				}
-
-				emittedEvents.Add(e);
-			}
-
-			_submittedToWriteEvents = events.ToArray();
-			_submittedToWriteEmittedEvents = emittedEvents.ToArray();
-
-			if (_submittedToWriteEvents.Length > 0)
-				PublishWriteEvents(MaxRetryCount);
-		}
-
-		private IEnumerable<KeyValuePair<string, JToken>> MetadataWithCausedByAndCorrelationId(
-			EmittedEvent emittedEvent) {
-			var extraMetaData = emittedEvent.ExtraMetaData();
-			var correlationIdFound = false;
-			if (extraMetaData != null)
-				foreach (var valuePair in from pair in extraMetaData
-					where pair.Key != "$causedBy"
-					select pair) {
-					if (valuePair.Key == "$correlationId")
-						correlationIdFound = true;
-					yield return new KeyValuePair<string, JToken>(valuePair.Key, new JRaw(valuePair.Value));
-				}
-
-			if (emittedEvent.CausedBy != Guid.Empty)
-				yield return
-					new KeyValuePair<string, JToken>(
-						"$causedBy", JValue.CreateString(emittedEvent.CausedBy.ToString("D")));
-			if (!correlationIdFound && !string.IsNullOrEmpty(emittedEvent.CorrelationId))
-				yield return
-					new KeyValuePair<string, JToken>("$correlationId", JValue.CreateString(emittedEvent.CorrelationId));
-		}
-
-		private bool DetectConcurrencyViolations(CheckpointTag expectedTag) {
-			//NOTE: the comment below is not longer actual
-			//      Keeping it for reference only
-			//      We do back-read all the streams when loading state, so we know exactly which version to expect
-
-			//TODO: if the following statement is about event order stream - let write null event into this stream
-			//NOTE: the following condition is only meant to detect concurrency violations when
-			// another instance of the projection (running in the another node etc) has been writing to
-			// the same stream.  However, the expected tag sometimes can be greater than last actually written tag
-			// This happens when a projection is restarted from a checkpoint and the checkpoint has been made at
-			// position not updating the projection state
-			return expectedTag != _lastCommittedOrSubmittedEventPosition;
-		}
-
-		private void PublishWriteEvents(int retryCount) {
-			if (!_metadataStreamCreated) {
-				SubmitWriteMetadata();
-				return;
-			}
-
-			_awaitingWriteCompleted = true;
-			int attempt = MaxRetryCount - retryCount + 1;
-			var delayInSeconds = CalculateBackoffTimeSecs(attempt);
-			if (attempt >= MinAttemptWarnThreshold && _logger != null) {
-				_logger.Warning("Attempt: {attempt} to write events to stream {stream}. Backing off for {time} second(s).",
-					attempt,
-					_streamId,
-					delayInSeconds);
-			}
-
-			if (delayInSeconds == 0) {
-				_writerConfiguration.Writer.WriteEvents(
-					_streamId, _lastKnownEventNumber, _submittedToWriteEvents, _writeAs,
-					m => HandleWriteEventsCompleted(m, retryCount));
-			} else {
-				_ioDispatcher.Delay(TimeSpan.FromSeconds(delayInSeconds),
-					_ => _writerConfiguration.Writer.WriteEvents(
-						_streamId, _lastKnownEventNumber, _submittedToWriteEvents, _writeAs,
-						m => HandleWriteEventsCompleted(m, retryCount)));
-			}
-		}
-
-		private int CalculateBackoffTimeSecs(int attempt) {
-			attempt--;
-			if (attempt == 0) return 0;
-			var expBackoff = attempt < 9 ? (1 << attempt) : 256;
-			return _random.Next(1, expBackoff + 1);
-		}
-
-		private void EnsureCheckpointNotRequested() {
-			if (_checkpointRequested)
-				throw new InvalidOperationException("Checkpoint requested");
-		}
-
-		private void EnsureStreamStarted() {
-			if (!_started)
-				throw new InvalidOperationException("Not started");
-		}
-
-		private void OnWriteCompleted() {
-			NotifyWriteCompleted();
-			ProcessWrites();
-			ProcessRequestedCheckpoint();
-		}
-
-		private void NotifyWriteCompleted() {
-			_readyHandler.Handle(new CoreProjectionProcessingMessage.EmittedStreamWriteCompleted(_streamId));
-		}
-
-		private void ProcessRequestedCheckpoint() {
-			if (_checkpointRequested && !_awaitingWriteCompleted && !_awaitingMetadataWriteCompleted
-			    && _pendingWrites.Count == 0) {
-				EnsureCheckpointsEnabled();
-				_readyHandler.Handle(new CoreProjectionProcessingMessage.ReadyForCheckpoint(this));
-			}
-		}
-
-		private void EnsureCheckpointsEnabled() {
-			if (_noCheckpoints)
-				throw new InvalidOperationException("Checkpoints disabled");
-		}
-
-		private void SubmitWriteEventsInRecovery() {
-			SubmitWriteEventsInRecoveryLoop(false);
-		}
-
-		private void SubmitWriteEventsInRecoveryLoop(bool anyFound) {
-			if (_awaitingLinkToResolution)
-				return;
-
-			while (_pendingWrites.Count > 0) {
-				var eventToWrite = _pendingWrites.Peek();
-				if (eventToWrite.CausedByTag > _lastCommittedOrSubmittedEventPosition ||
-				    _alreadyCommittedEvents.Count == 0)
-					RecoveryCompleted();
-				if (_recoveryCompleted) {
-					if (anyFound)
-						NotifyWriteCompleted(); // unlock pending write-resolves if any
-					SubmitWriteEvents();
-					return;
-				}
-
-				var report = ValidateEmittedEventInRecoveryMode(eventToWrite);
-
-				if (report is IgnoredEmittedEvent) {
-					Log.Verbose($"Emitted event ignored because it links to an event that no longer exists: eventId: {eventToWrite.EventId}, eventType: {eventToWrite.EventId}, checkpoint: {eventToWrite.CorrelationId}, causedBy: {eventToWrite.CausedBy}");
-					continue;
-				}
-
-				if (report is ErroredEmittedEvent error)
-					throw error.Exception;
-
-				if (report is ValidEmittedEvent valid) {
-					anyFound = true;
-					NotifyEventCommitted(eventToWrite, valid.Revision);
-					_pendingWrites.Dequeue();
-				}
-
-				if (report is EmittedEventResolutionNeeded resolution) {
-					_awaitingLinkToResolution = true;
-					_ioDispatcher.ReadEvent(resolution.StreamId, resolution.Revision, _writeAs, resp => {
-						OnEmittedLinkEventResolved(anyFound, eventToWrite, resolution.TopCommitted, resp);
-					}, () => {
-						Log.Warning(
-							"Timed out reading original event for emitted event at revision {eventNumber} in stream '{streamName}'.",
-							resolution.Revision, resolution.StreamId);
-					}, Guid.NewGuid());
-					break;
-				}
-			}
-
-			if (_pendingWrites.Count == 0)
-				OnWriteCompleted();
-		}
-
-		private IValidatedEmittedEvent ValidateEmittedEventInRecoveryMode(EmittedEvent eventToWrite) {
-			var topAlreadyCommitted = _alreadyCommittedEvents.Pop();
-
-			if (topAlreadyCommitted.Item1 < eventToWrite.CausedByTag)
-				return new IgnoredEmittedEvent();
-
-			var failed = topAlreadyCommitted.Item1 != eventToWrite.CausedByTag ||
-			             topAlreadyCommitted.Item2 != eventToWrite.EventType;
-
-			if (failed && eventToWrite.EventType.Equals(LinkEventType)) {
-				// We check if the linked event still exists. If not, we skip that emitted event.
-				var parts = eventToWrite.Data.Split(LinkToSeparator, 2);
-				var streamId = parts[1];
-				if (!long.TryParse(parts[0], out long eventNumber))
-					throw new Exception($"Unexpected exception: Emitted event is an invalid link event: Body ({eventToWrite.Data}) CausedByTag ({eventToWrite.CausedByTag}) StreamId ({eventToWrite.StreamId})");
-
-				return new EmittedEventResolutionNeeded(streamId, eventNumber, topAlreadyCommitted);
-			}
-
-			if (failed) {
-				var error = CreateSequenceException(topAlreadyCommitted, eventToWrite);
-				return new ErroredEmittedEvent(error);
-			}
-
-			return new ValidEmittedEvent(topAlreadyCommitted.Item1, topAlreadyCommitted.Item2, topAlreadyCommitted.Item3);
-		}
-
-		// Used when we need to resolve a link event to see if it points to an event that no longer exists. If that
-		// event no longer exists, we skip it and resume the recovery process.
-		private void OnEmittedLinkEventResolved(bool anyFound, EmittedEvent eventToWrite, Tuple<CheckpointTag, string, long> topAlreadyCommitted, ClientMessage.ReadEventCompleted resp) {
-			if (resp.Result != ReadEventResult.StreamDeleted && resp.Result != ReadEventResult.NotFound && resp.Result != ReadEventResult.NoStream && resp.Result != ReadEventResult.Success) {
-				throw CreateSequenceException(topAlreadyCommitted, eventToWrite);
-			}
-
-			if (resp.Result == ReadEventResult.Success) {
-				anyFound = true;
-				NotifyEventCommitted(eventToWrite, topAlreadyCommitted.Item3);
-			} else {
-				Log.Verbose($"Emitted event ignored after resolution because it links to an event that no longer exists: eventId: {eventToWrite.EventId}, eventType: {eventToWrite.EventId}, checkpoint: {eventToWrite.CorrelationId}, causedBy: {eventToWrite.CausedBy}");
-			}
-			_pendingWrites.Dequeue();
-			_awaitingLinkToResolution = false;
-			SubmitWriteEventsInRecoveryLoop(anyFound);
-		}
-
-		private InvalidEmittedEventSequenceException CreateSequenceException(
-			Tuple<CheckpointTag, string, long> committed, EmittedEvent eventToWrite) {
-			return new InvalidEmittedEventSequenceException(
-				$"An event emitted in recovery for stream {_streamId} differs from the originally emitted event. Existing('{committed.Item2}', '{committed.Item1}'). New('{eventToWrite.EventType}', '{eventToWrite.CausedByTag}')"
-			);
-		}
-
-		private void RecoveryCompleted() {
-			_recoveryCompleted = true;
-		}
-
-		private static void NotifyEventsCommitted(EmittedEvent[] events, long firstEventNumber) {
-			var sequenceNumber = firstEventNumber;
-			foreach (var e in events)
-				NotifyEventCommitted(e, sequenceNumber++);
-		}
-
-		private static void NotifyEventCommitted(EmittedEvent @event, long eventNumber) {
-			if (@event.OnCommitted != null)
-				@event.OnCommitted(eventNumber);
-		}
-
-		public void Dispose() {
-			_disposed = true;
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.EmittedStreamWriteCompleted message) {
-			if (!_awaitingReady)
-				throw new InvalidOperationException("AwaitingReady state required");
-			ProcessWrites();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedStreamsDeleter.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedStreamsDeleter.cs
deleted file mode 100644
index 99afea2bdf8..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedStreamsDeleter.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.UserManagement;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Projections.Core.Services.Processing.Emitting {
-	public class EmittedStreamsDeleter : IEmittedStreamsDeleter {
-		private static readonly ILogger Log = Serilog.Log.ForContext<EmittedStreamsDeleter>();
-		private readonly IODispatcher _ioDispatcher;
-		private readonly int _checkPointThreshold = 4000;
-		private int _numberOfEventsProcessed = 0;
-		private const int RetryLimit = 3;
-		private int _retryCount = RetryLimit;
-		private readonly string _emittedStreamsId;
-		private readonly string _emittedStreamsCheckpointStreamId;
-
-		public EmittedStreamsDeleter(IODispatcher ioDispatcher, string emittedStreamsId,
-			string emittedStreamsCheckpointStreamId) {
-			_ioDispatcher = ioDispatcher;
-			_emittedStreamsId = emittedStreamsId;
-			_emittedStreamsCheckpointStreamId = emittedStreamsCheckpointStreamId;
-		}
-
-		public void DeleteEmittedStreams(Action onEmittedStreamsDeleted) {
-			_ioDispatcher.ReadBackward(_emittedStreamsCheckpointStreamId, -1, 1, false, SystemAccounts.System,
-				result => {
-					var deleteFromPosition = GetPositionToDeleteFrom(result);
-					DeleteEmittedStreamsFrom(deleteFromPosition, onEmittedStreamsDeleted);
-				},
-				() => DeleteEmittedStreams(onEmittedStreamsDeleted),
-				Guid.NewGuid());
-		}
-
-		private int GetPositionToDeleteFrom(ClientMessage.ReadStreamEventsBackwardCompleted onReadCompleted) {
-			int deleteFromPosition = 0;
-			if (onReadCompleted.Result == ReadStreamResult.Success) {
-				if (onReadCompleted.Events.Length > 0) {
-					var checkpoint = onReadCompleted.Events
-						.Where(v => v.Event.EventType == ProjectionEventTypes.ProjectionCheckpoint).Select(x => x.Event)
-						.FirstOrDefault();
-					if (checkpoint != null) {
-						deleteFromPosition = checkpoint.Data.ParseJson<int>();
-					}
-				}
-			}
-
-			return deleteFromPosition;
-		}
-
-		private void DeleteEmittedStreamsFrom(long fromPosition, Action onEmittedStreamsDeleted) {
-			_ioDispatcher.ReadForward(_emittedStreamsId, fromPosition, 1, false, SystemAccounts.System,
-				x => ReadCompleted(x, onEmittedStreamsDeleted),
-				() => DeleteEmittedStreamsFrom(fromPosition, onEmittedStreamsDeleted),
-				Guid.NewGuid());
-		}
-
-		private void ReadCompleted(ClientMessage.ReadStreamEventsForwardCompleted onReadCompleted,
-			Action onEmittedStreamsDeleted) {
-			if (onReadCompleted.Result == ReadStreamResult.Success ||
-			    onReadCompleted.Result == ReadStreamResult.NoStream) {
-				if (onReadCompleted.Events.Length == 0 && !onReadCompleted.IsEndOfStream) {
-					DeleteEmittedStreamsFrom(onReadCompleted.NextEventNumber, onEmittedStreamsDeleted);
-					return;
-				}
-
-				if (onReadCompleted.Events.Length == 0) {
-					_ioDispatcher.DeleteStream(_emittedStreamsCheckpointStreamId, ExpectedVersion.Any, false,
-						SystemAccounts.System, x => {
-							// currently, WrongExpectedVersion is returned when deleting non-existing streams, even when specifying ExpectedVersion.Any.
-							// it is not too intuitive but changing the response would break the contract and compatibility with TCP/gRPC/web clients or require adding a new error code to all clients.
-							// note: we don't need to check if CurrentVersion == -1 here to make sure it's a non-existing stream since the deletion is done with ExpectedVersion.Any
-							if (x.Result == OperationResult.WrongExpectedVersion) {
-								// stream was never created
-								Log.Information("PROJECTIONS: Projection Stream '{stream}' was not deleted since it does not exist", _emittedStreamsCheckpointStreamId);
-							} else if (x.Result == OperationResult.Success || x.Result == OperationResult.StreamDeleted) {
-								Log.Information("PROJECTIONS: Projection Stream '{stream}' deleted",
-									_emittedStreamsCheckpointStreamId);
-							} else {
-								Log.Error("PROJECTIONS: Failed to delete projection stream '{stream}'. Reason: {e}",
-									_emittedStreamsCheckpointStreamId, x.Result);
-							}
-
-							_ioDispatcher.DeleteStream(_emittedStreamsId, ExpectedVersion.Any, false,
-								SystemAccounts.System, y => {
-									// currently, WrongExpectedVersion is returned when deleting non-existing streams, even when specifying ExpectedVersion.Any.
-									// it is not too intuitive but changing the response would break the contract and compatibility with TCP/gRPC/web clients or require adding a new error code to all clients.
-									// note: we don't need to check if CurrentVersion == -1 here to make sure it's a non-existing stream since the deletion is done with ExpectedVersion.Any
-									if (x.Result == OperationResult.WrongExpectedVersion) {
-										// stream was never created
-										Log.Information("PROJECTIONS: Projection Stream '{stream}' was not deleted since it does not exist", _emittedStreamsId);
-									} else if (y.Result == OperationResult.Success ||
-									           y.Result == OperationResult.StreamDeleted) {
-										Log.Information("PROJECTIONS: Projection Stream '{stream}' deleted",
-											_emittedStreamsId);
-									} else {
-										Log.Error(
-											"PROJECTIONS: Failed to delete projection stream '{stream}'. Reason: {e}",
-											_emittedStreamsId, y.Result);
-									}
-
-									onEmittedStreamsDeleted();
-								});
-						});
-				} else {
-					var streamId = Helper.UTF8NoBom.GetString(onReadCompleted.Events[0].Event.Data.Span);
-					_ioDispatcher.DeleteStream(streamId, ExpectedVersion.Any, false, SystemAccounts.System,
-						x => DeleteStreamCompleted(x, onEmittedStreamsDeleted, streamId,
-							onReadCompleted.Events[0].OriginalEventNumber));
-				}
-			}
-		}
-
-		private void DeleteStreamCompleted(ClientMessage.DeleteStreamCompleted deleteStreamCompleted,
-			Action onEmittedStreamsDeleted, string streamId, long eventNumber) {
-			if (deleteStreamCompleted.Result == OperationResult.Success ||
-			    deleteStreamCompleted.Result == OperationResult.StreamDeleted) {
-				_retryCount = RetryLimit;
-				_numberOfEventsProcessed++;
-				if (_numberOfEventsProcessed >= _checkPointThreshold) {
-					_numberOfEventsProcessed = 0;
-					TryMarkCheckpoint(eventNumber);
-				}
-
-				DeleteEmittedStreamsFrom(eventNumber + 1, onEmittedStreamsDeleted);
-			} else {
-				if (_retryCount == 0) {
-					Log.Error(
-						"PROJECTIONS: Retry limit reached, could not delete stream: {stream}. Manual intervention is required and you may need to delete this stream manually",
-						streamId);
-					_retryCount = RetryLimit;
-					DeleteEmittedStreamsFrom(eventNumber + 1, onEmittedStreamsDeleted);
-					return;
-				}
-
-				Log.Error(
-					"PROJECTIONS: Failed to delete emitted stream {stream}, Retrying ({retryCount}/{maxRetryCount}). Reason: {reason}",
-					streamId, (RetryLimit - _retryCount) + 1, RetryLimit, deleteStreamCompleted.Result);
-				_retryCount--;
-				DeleteEmittedStreamsFrom(eventNumber, onEmittedStreamsDeleted);
-			}
-		}
-
-		private void TryMarkCheckpoint(long eventNumber) {
-			_ioDispatcher.WriteEvent(_emittedStreamsCheckpointStreamId, ExpectedVersion.Any,
-				new Event(Guid.NewGuid(), ProjectionEventTypes.PartitionCheckpoint, true, eventNumber.ToJson(), null),
-				SystemAccounts.System, x => {
-					if (x.Result == OperationResult.Success) {
-						Log.Debug("PROJECTIONS: Emitted Stream Deletion Checkpoint written at {eventNumber}",
-							eventNumber);
-					} else {
-						Log.Debug(
-							"PROJECTIONS: Emitted Stream Deletion Checkpoint Failed to be written at {eventNumber}",
-							eventNumber);
-					}
-				});
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedStreamsTracker.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedStreamsTracker.cs
deleted file mode 100644
index c57acb9e077..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedStreamsTracker.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.Settings;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Projections.Core.Services.Processing.Emitting {
-	public class EmittedStreamsTracker : IEmittedStreamsTracker {
-		private static readonly ILogger Log = Serilog.Log.ForContext<EmittedStreamsTracker>();
-		private readonly IODispatcher _ioDispatcher;
-		private readonly ProjectionConfig _projectionConfig;
-		private readonly ProjectionNamesBuilder _projectionNamesBuilder;
-
-		private readonly BoundedCache<string, string> _streamIdCache = new BoundedCache<string, string>(int.MaxValue,
-			ESConsts.CommitedEventsMemCacheLimit, x => 16 + 4 + IntPtr.Size + 2 * x.Length);
-
-		private const int MaxRetryCount = 3;
-		private readonly object _locker = new object();
-
-		public EmittedStreamsTracker(IODispatcher ioDispatcher, ProjectionConfig projectionConfig,
-			ProjectionNamesBuilder projectionNamesBuilder) {
-			_ioDispatcher = ioDispatcher;
-			_projectionConfig = projectionConfig;
-			_projectionNamesBuilder = projectionNamesBuilder;
-		}
-
-		public void Initialize() {
-			ReadEmittedStreamStreamIdsIntoCache(0); //start from the beginning
-		}
-
-		private void ReadEmittedStreamStreamIdsIntoCache(long position) {
-			_ioDispatcher.ReadForward(_projectionNamesBuilder.GetEmittedStreamsName(), position, 1, false,
-				SystemAccounts.System, x => {
-					if (x.Events.Length > 0) {
-						for (int i = 0; i < x.Events.Length; i++) {
-							var streamId = Helper.UTF8NoBom.GetString(x.Events[i].Event.Data.Span);
-							lock (_locker) {
-								_streamIdCache.PutRecord(streamId, streamId, false);
-							}
-						}
-					}
-
-					if (!x.IsEndOfStream) {
-						ReadEmittedStreamStreamIdsIntoCache(x.NextEventNumber);
-					}
-				}, () => {
-					Log.Error(
-						"Timed out reading emitted stream ids into cache from {streamName} at position {position}.",
-						_projectionNamesBuilder.GetEmittedStreamsName(), position);
-				}, Guid.NewGuid());
-		}
-
-		public void TrackEmittedStream(EmittedEvent[] emittedEvents) {
-			if (!_projectionConfig.TrackEmittedStreams) return;
-			foreach (var emittedEvent in emittedEvents) {
-				string streamId;
-				if (!_streamIdCache.TryGetRecord(emittedEvent.StreamId, out streamId)) {
-					var trackEvent = new Event(Guid.NewGuid(), ProjectionEventTypes.StreamTracked, false,
-						Helper.UTF8NoBom.GetBytes(emittedEvent.StreamId), null);
-					lock (_locker) {
-						_streamIdCache.PutRecord(emittedEvent.StreamId, emittedEvent.StreamId, false);
-					}
-
-					WriteEvent(trackEvent, MaxRetryCount);
-				}
-			}
-		}
-
-		private void WriteEvent(Event evnt, int retryCount) {
-			_ioDispatcher.WriteEvent(_projectionNamesBuilder.GetEmittedStreamsName(), ExpectedVersion.Any, evnt,
-				SystemAccounts.System,
-				x => OnWriteComplete(x, evnt, Helper.UTF8NoBom.GetString(evnt.Data), retryCount));
-		}
-
-		private void OnWriteComplete(ClientMessage.WriteEventsCompleted completed, Event evnt, string streamId,
-			int retryCount) {
-			if (completed.Result != OperationResult.Success) {
-				if (retryCount > 0) {
-					WriteEvent(evnt, retryCount - 1);
-				} else {
-					Log.Error(
-						"PROJECTIONS: Failed to write a tracked stream id of {stream} to the {emittedStream} stream. Retry limit of {maxRetryCount} reached. Reason: {e}",
-						streamId, _projectionNamesBuilder.GetEmittedStreamsName(), MaxRetryCount, completed.Result);
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedStreamsWriter.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedStreamsWriter.cs
deleted file mode 100644
index 638cc858004..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedStreamsWriter.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Security.Claims;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-
-namespace EventStore.Projections.Core.Services.Processing.Emitting {
-	public class EmittedStreamsWriter : IEmittedStreamsWriter {
-		private IODispatcher _ioDispatcher;
-
-		public EmittedStreamsWriter(IODispatcher ioDispatcher) {
-			_ioDispatcher = ioDispatcher;
-		}
-
-		public void WriteEvents(string streamId, long expectedVersion, Event[] events, ClaimsPrincipal writeAs,
-			Action<ClientMessage.WriteEventsCompleted> complete) {
-			_ioDispatcher.WriteEvents(streamId, expectedVersion, events, writeAs, complete);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/IEmittedStreamsDeleter.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/IEmittedStreamsDeleter.cs
deleted file mode 100644
index 3299a87417b..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/IEmittedStreamsDeleter.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using System;
-
-namespace EventStore.Projections.Core.Services.Processing.Emitting;
-
-public interface IEmittedStreamsDeleter {
-	void DeleteEmittedStreams(Action onEmittedStreamsDeleted);
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/IEmittedStreamsTracker.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/IEmittedStreamsTracker.cs
deleted file mode 100644
index ee1ab93ae33..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/IEmittedStreamsTracker.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Services.Processing.Emitting;
-
-public interface IEmittedStreamsTracker {
-	void TrackEmittedStream(EmittedEvent[] emittedEvents);
-	void Initialize();
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/IEmittedStreamsWriter.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/IEmittedStreamsWriter.cs
deleted file mode 100644
index cab81899b58..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/IEmittedStreamsWriter.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Security.Claims;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-
-namespace EventStore.Projections.Core.Services.Processing.Emitting;
-
-public interface IEmittedStreamsWriter {
-	void WriteEvents(string streamId, long expectedVersion, Event[] events, ClaimsPrincipal writeAs,
-		Action<ClientMessage.WriteEventsCompleted> complete);
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/IResultEventEmitter.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/IResultEventEmitter.cs
deleted file mode 100644
index 7815c2c6918..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/IResultEventEmitter.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Services.Processing.Emitting;
-
-public interface IResultEventEmitter {
-	EmittedEventEnvelope[] ResultUpdated(string partition, string result, CheckpointTag at);
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/InvalidEmittedEventSequenceException.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/InvalidEmittedEventSequenceException.cs
deleted file mode 100644
index ff42699168d..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/InvalidEmittedEventSequenceException.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-
-namespace EventStore.Projections.Core.Services.Processing.Emitting;
-
-class InvalidEmittedEventSequenceException : Exception {
-	public InvalidEmittedEventSequenceException(string message)
-		: base(message) {
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/NoopResultEventEmitter.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/NoopResultEventEmitter.cs
deleted file mode 100644
index 411006f8124..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/NoopResultEventEmitter.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Services.Processing.Emitting;
-
-public class NoopResultEventEmitter : IResultEventEmitter {
-	public EmittedEventEnvelope[] ResultUpdated(string partition, string result, CheckpointTag at) {
-		throw new NotSupportedException("No results are expected from the projection");
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/QueuedEmittedStreamsWriter.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/QueuedEmittedStreamsWriter.cs
deleted file mode 100644
index 08e8300ca2f..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/QueuedEmittedStreamsWriter.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Security.Claims;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-
-namespace EventStore.Projections.Core.Services.Processing.Emitting;
-
-public class QueuedEmittedStreamsWriter : IEmittedStreamsWriter {
-	private IODispatcher _ioDispatcher;
-	private Guid _writeQueueId;
-
-	public QueuedEmittedStreamsWriter(IODispatcher ioDispatcher, Guid writeQueueId) {
-		_ioDispatcher = ioDispatcher;
-		_writeQueueId = writeQueueId;
-	}
-
-	public void WriteEvents(string streamId, long expectedVersion, Event[] events, ClaimsPrincipal writeAs,
-		Action<ClientMessage.WriteEventsCompleted> complete) {
-		_ioDispatcher.QueueWriteEvents(_writeQueueId, streamId, expectedVersion, events, writeAs, complete);
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/ResultEventEmitter.cs b/src/EventStore.Projections.Core/Services/Processing/Emitting/ResultEventEmitter.cs
deleted file mode 100644
index 2271a02d50d..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/ResultEventEmitter.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Services.Processing.Emitting {
-	public class ResultEventEmitter : IResultEventEmitter {
-		private readonly ProjectionNamesBuilder _namesBuilder;
-
-		private readonly EmittedStream.WriterConfiguration.StreamMetadata _resultStreamMetadata =
-			new EmittedStream.WriterConfiguration.StreamMetadata( /* TBD */);
-
-		public ResultEventEmitter(ProjectionNamesBuilder namesBuilder) {
-			if (namesBuilder == null) throw new ArgumentNullException("namesBuilder");
-			_namesBuilder = namesBuilder;
-		}
-
-		public EmittedEventEnvelope[] ResultUpdated(string partition, string result, CheckpointTag at) {
-			return CreateResultUpdatedEvents(partition, result, at);
-		}
-
-		private EmittedEventEnvelope[] CreateResultUpdatedEvents(string partition, string projectionResult,
-			CheckpointTag at) {
-			var streamId = _namesBuilder.MakePartitionResultStreamName(partition);
-			var allResultsStreamId = _namesBuilder.GetResultStreamName();
-			if (string.IsNullOrEmpty(partition)) {
-				var result =
-					new EmittedEventEnvelope(
-						projectionResult == null
-							? new EmittedDataEvent(
-								streamId, Guid.NewGuid(), "ResultRemoved", true, null, null, at, null)
-							: new EmittedDataEvent(
-								streamId, Guid.NewGuid(), "Result", true, projectionResult, null, at, null),
-						_resultStreamMetadata);
-
-				return new[] {result};
-			} else {
-				var linkTo = new EmittedLinkTo(allResultsStreamId, Guid.NewGuid(), streamId, at, null);
-				var linkToEnvelope = new EmittedEventEnvelope(linkTo, _resultStreamMetadata);
-				var result =
-					new EmittedEventEnvelope(
-						projectionResult == null
-							? new EmittedDataEvent(
-								streamId, Guid.NewGuid(), "ResultRemoved", true, null, null, at, null,
-								linkTo.SetTargetEventNumber)
-							: new EmittedDataEvent(
-								streamId, Guid.NewGuid(), "Result", true, projectionResult, null, at, null,
-								linkTo.SetTargetEventNumber), _resultStreamMetadata);
-				return new[] {result, linkToEnvelope};
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventFilter.cs b/src/EventStore.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventFilter.cs
deleted file mode 100644
index ffd9111b5cd..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventFilter.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Services;
-
-namespace EventStore.Projections.Core.Services.Processing.EventByType {
-	public class EventByTypeIndexEventFilter : EventFilter {
-		private readonly HashSet<string> _streams;
-
-		public EventByTypeIndexEventFilter(HashSet<string> events)
-			: base(false, false, events) {
-			_streams = new HashSet<string>(from eventType in events
-				select "$et-" + eventType);
-		}
-
-		protected override bool DeletedNotificationPasses(string positionStreamId) {
-			return true;
-		}
-
-		public override bool PassesSource(bool resolvedFromLinkTo, string positionStreamId, string eventType) {
-			if (_streams.Contains(positionStreamId)) return true;
-			return !resolvedFromLinkTo && !SystemStreams.IsSystemStream(positionStreamId);
-		}
-
-		public override string GetCategory(string positionStreamId) {
-			return null;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.PendingEvent.cs b/src/EventStore.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.PendingEvent.cs
deleted file mode 100644
index 53c1c234582..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.PendingEvent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using EventStore.Core.Data;
-
-namespace EventStore.Projections.Core.Services.Processing.EventByType;
-
-public partial class EventByTypeIndexEventReader
-{
-	private class PendingEvent {
-		public readonly EventStore.Core.Data.ResolvedEvent ResolvedEvent;
-		public readonly float Progress;
-		public readonly TFPos TfPosition;
-
-		public PendingEvent(EventStore.Core.Data.ResolvedEvent resolvedEvent, TFPos tfPosition, float progress) {
-			ResolvedEvent = resolvedEvent;
-			Progress = progress;
-			TfPosition = tfPosition;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.cs b/src/EventStore.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.cs
deleted file mode 100644
index 7f4685e4f5a..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Services.TimerService;
-
-namespace EventStore.Projections.Core.Services.Processing.EventByType {
-	public partial class EventByTypeIndexEventReader : EventReader {
-		public const int MaxReadCount = 50;
-		private readonly HashSet<string> _eventTypes;
-		private readonly bool _resolveLinkTos;
-		private readonly bool _includeDeletedStreamNotification;
-		private readonly ITimeProvider _timeProvider;
-
-		private State _state;
-		private TFPos _lastEventPosition;
-		private readonly Dictionary<string, long> _fromPositions;
-		private readonly Dictionary<string, string> _streamToEventType;
-		private long _lastPosition;
-
-		public EventByTypeIndexEventReader(
-			IPublisher publisher,
-			Guid eventReaderCorrelationId,
-			ClaimsPrincipal readAs,
-			string[] eventTypes,
-			bool includeDeletedStreamNotification,
-			TFPos fromTfPosition,
-			Dictionary<string, long> fromPositions,
-			bool resolveLinkTos,
-			ITimeProvider timeProvider,
-			bool stopOnEof = false)
-			: base(publisher, eventReaderCorrelationId, readAs, stopOnEof) {
-			if (eventTypes == null) throw new ArgumentNullException("eventTypes");
-			if (timeProvider == null) throw new ArgumentNullException("timeProvider");
-			if (eventTypes.Length == 0) throw new ArgumentException("empty", "eventTypes");
-
-			_includeDeletedStreamNotification = includeDeletedStreamNotification;
-			_timeProvider = timeProvider;
-			_eventTypes = new HashSet<string>(eventTypes);
-			if (includeDeletedStreamNotification)
-				_eventTypes.Add("$deleted");
-			_streamToEventType = eventTypes.ToDictionary(v => "$et-" + v, v => v);
-			_lastEventPosition = fromTfPosition;
-			_resolveLinkTos = resolveLinkTos;
-
-			ValidateTag(fromPositions);
-
-			_fromPositions = fromPositions;
-			_state = new IndexBased(_eventTypes, this, readAs);
-		}
-
-		private void ValidateTag(Dictionary<string, long> fromPositions) {
-			if (_eventTypes.Count != fromPositions.Count)
-				throw new ArgumentException("Number of streams does not match", "fromPositions");
-
-			foreach (var stream in _streamToEventType.Keys.Where(stream => !fromPositions.ContainsKey(stream))) {
-				throw new ArgumentException(
-					String.Format("The '{0}' stream position has not been set", stream), "fromPositions");
-			}
-		}
-
-
-		public override void Dispose() {
-			_state.Dispose();
-			base.Dispose();
-		}
-
-		protected override void RequestEvents() {
-			if (_disposed || PauseRequested || Paused)
-				return;
-			_state.RequestEvents();
-		}
-
-		protected override bool AreEventsRequested() {
-			return _state.AreEventsRequested();
-		}
-
-		private void PublishIORequest(bool delay, Message readEventsForward, Message timeoutMessage,
-			Guid correlationId) {
-			if (delay) {
-				_publisher.Publish(
-					new AwakeServiceMessage.SubscribeAwake(
-						_publisher, correlationId, null,
-						new TFPos(_lastPosition, _lastPosition), readEventsForward));
-			} else {
-				_publisher.Publish(readEventsForward);
-				_publisher.Publish(timeoutMessage);
-			}
-		}
-
-		private void UpdateNextStreamPosition(string eventStreamId, long nextPosition) {
-			long streamPosition;
-			if (!_fromPositions.TryGetValue(eventStreamId, out streamPosition))
-				streamPosition = -1;
-			if (nextPosition > streamPosition)
-				_fromPositions[eventStreamId] = nextPosition;
-		}
-
-		private void DoSwitch(TFPos lastKnownIndexCheckpointPosition) {
-			if (Paused || PauseRequested || _disposed)
-				throw new InvalidOperationException("_paused || _pauseRequested || _disposed");
-
-			// skip reading TF up to last know index checkpoint position
-			// as we could only gethere if there is no more indexed events before this point
-			if (lastKnownIndexCheckpointPosition > _lastEventPosition)
-				_lastEventPosition = lastKnownIndexCheckpointPosition;
-
-			_state = new TfBased(_timeProvider, this, _lastEventPosition, this._publisher, ReadAs);
-			_state.RequestEvents();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/EventByType/EventByTypeIndexPositionTagger.cs b/src/EventStore.Projections.Core/Services/Processing/EventByType/EventByTypeIndexPositionTagger.cs
deleted file mode 100644
index fa15d3a2dfe..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/EventByType/EventByTypeIndexPositionTagger.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Services.Processing.EventByType {
-	public class EventByTypeIndexPositionTagger : PositionTagger {
-		private readonly HashSet<string> _streams;
-		private readonly HashSet<string> _eventTypes;
-		private readonly Dictionary<string, string> _streamToEventType;
-
-		public EventByTypeIndexPositionTagger(
-			int phase, string[] eventTypes, bool includeStreamDeletedNotification = false)
-			: base(phase) {
-			if (eventTypes == null) throw new ArgumentNullException("eventTypes");
-			if (eventTypes.Length == 0) throw new ArgumentException("eventTypes");
-			_eventTypes = new HashSet<string>(eventTypes);
-			if (includeStreamDeletedNotification)
-				_eventTypes.Add("$deleted");
-			_streams = new HashSet<string>(from eventType in eventTypes
-				select "$et-" + eventType);
-			_streamToEventType = eventTypes.ToDictionary(v => "$et-" + v, v => v);
-		}
-
-		public override bool IsMessageAfterCheckpointTag(
-			CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
-			if (previous.Phase < Phase)
-				return true;
-			if (previous.Mode_ != CheckpointTag.Mode.EventTypeIndex)
-				throw new ArgumentException("Mode.EventTypeIndex expected", "previous");
-			if (committedEvent.Data.EventOrLinkTargetPosition.CommitPosition <= 0)
-				throw new ArgumentException("complete TF position required", "committedEvent");
-
-			return committedEvent.Data.EventOrLinkTargetPosition > previous.Position;
-		}
-
-		public override CheckpointTag MakeCheckpointTag(
-			CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
-			if (previous.Phase != Phase)
-				throw new ArgumentException(
-					string.Format("Invalid checkpoint tag phase.  Expected: {0} Was: {1}", Phase, previous.Phase));
-
-			if (committedEvent.Data.EventOrLinkTargetPosition < previous.Position)
-				throw new InvalidOperationException(
-					string.Format(
-						"Cannot make a checkpoint tag at earlier position. '{0}' < '{1}'",
-						committedEvent.Data.EventOrLinkTargetPosition, previous.Position));
-			var byIndex = _streams.Contains(committedEvent.Data.PositionStreamId);
-			return byIndex
-				? previous.UpdateEventTypeIndexPosition(
-					committedEvent.Data.EventOrLinkTargetPosition,
-					_streamToEventType[committedEvent.Data.PositionStreamId],
-					committedEvent.Data.PositionSequenceNumber)
-				: previous.UpdateEventTypeIndexPosition(committedEvent.Data.EventOrLinkTargetPosition);
-		}
-
-		public override CheckpointTag MakeCheckpointTag(CheckpointTag previous,
-			ReaderSubscriptionMessage.EventReaderPartitionEof partitionEof) {
-			throw new NotImplementedException();
-		}
-
-		public override CheckpointTag MakeCheckpointTag(
-			CheckpointTag previous, ReaderSubscriptionMessage.EventReaderPartitionDeleted partitionDeleted) {
-			if (previous.Phase != Phase)
-				throw new ArgumentException(
-					string.Format("Invalid checkpoint tag phase.  Expected: {0} Was: {1}", Phase, previous.Phase));
-
-			if (partitionDeleted.DeleteEventOrLinkTargetPosition < previous.Position)
-				throw new InvalidOperationException(
-					string.Format(
-						"Cannot make a checkpoint tag at earlier position. '{0}' < '{1}'",
-						partitionDeleted.DeleteEventOrLinkTargetPosition, previous.Position));
-			var byIndex = _streams.Contains(partitionDeleted.PositionStreamId);
-			//TODO: handle invalid partition deleted messages without required values
-			return byIndex
-				? previous.UpdateEventTypeIndexPosition(
-					partitionDeleted.DeleteEventOrLinkTargetPosition.Value,
-					_streamToEventType[partitionDeleted.PositionStreamId],
-					partitionDeleted.PositionEventNumber.Value)
-				: previous.UpdateEventTypeIndexPosition(partitionDeleted.DeleteEventOrLinkTargetPosition.Value);
-		}
-
-		public override CheckpointTag MakeZeroCheckpointTag() {
-			return CheckpointTag.FromEventTypeIndexPositions(
-				Phase, new TFPos(0, -1), _eventTypes.ToDictionary(v => v, v => ExpectedVersion.NoStream));
-		}
-
-		public override bool IsCompatible(CheckpointTag checkpointTag) {
-			//TODO: should Stream be supported here as well if in the set?
-			return checkpointTag.Mode_ == CheckpointTag.Mode.EventTypeIndex
-			       && checkpointTag.Streams.All(v => _eventTypes.Contains(v.Key));
-		}
-
-		public override CheckpointTag AdjustTag(CheckpointTag tag) {
-			if (tag.Phase < Phase)
-				return tag;
-			if (tag.Phase > Phase)
-				throw new ArgumentException(
-					string.Format("Invalid checkpoint tag phase.  Expected less or equal to: {0} Was: {1}", Phase,
-						tag.Phase), "tag");
-
-			if (tag.Mode_ == CheckpointTag.Mode.EventTypeIndex) {
-				long p;
-				return CheckpointTag.FromEventTypeIndexPositions(
-					tag.Phase, tag.Position,
-					_eventTypes.ToDictionary(v => v, v => tag.Streams.TryGetValue(v, out p) ? p : -1));
-			}
-
-			switch (tag.Mode_) {
-				case CheckpointTag.Mode.MultiStream:
-					throw new NotSupportedException(
-						"Conversion from MultiStream to EventTypeIndex position tag is not supported");
-				case CheckpointTag.Mode.Stream:
-					throw new NotSupportedException(
-						"Conversion from Stream to EventTypeIndex position tag is not supported");
-				case CheckpointTag.Mode.PreparePosition:
-					throw new NotSupportedException(
-						"Conversion from PreparePosition to EventTypeIndex position tag is not supported");
-				case CheckpointTag.Mode.Position:
-					return CheckpointTag.FromEventTypeIndexPositions(
-						tag.Phase, tag.Position, _eventTypes.ToDictionary(v => v, v => (long)-1));
-				default:
-					throw new NotSupportedException(string.Format(
-						"The given checkpoint is invalid. Possible causes might include having written an event to the projection's managed stream. The bad checkpoint: {0}",
-						tag.ToString()));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/EventFilter.cs b/src/EventStore.Projections.Core/Services/Processing/EventFilter.cs
deleted file mode 100644
index 4cbc79c6eab..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/EventFilter.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-
-namespace EventStore.Projections.Core.Services.Processing {
-	public abstract class EventFilter {
-		private readonly bool _allEvents;
-		private readonly bool _includeDeletedStreamEvents;
-		private readonly HashSet<string> _events;
-
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="allEvents"></param>
-		/// <param name="includeDeletedStreamEvents">indicates whether non-link stream tombstone or 
-		/// metastream stream deleted events should be included. Links resolved into metastream 
-		/// stream deleted events are not restricted</param>
-		/// <param name="events"></param>
-		protected EventFilter(bool allEvents, bool includeDeletedStreamEvents, HashSet<string> events) {
-			_allEvents = allEvents;
-			_includeDeletedStreamEvents = includeDeletedStreamEvents;
-			_events = events;
-		}
-
-		public bool Passes(
-			bool resolvedFromLinkTo, string eventStreamId, string eventName, bool isStreamDeletedEvent = false) {
-			return (PassesSource(resolvedFromLinkTo, eventStreamId, eventName))
-			       && ((_allEvents || _events != null && _events.Contains(eventName))
-			           && (!isStreamDeletedEvent || _includeDeletedStreamEvents));
-		}
-
-		public bool PassesValidation(bool isJson, string data) {
-			if (!isJson) return true;
-			if (data is null) {
-				return false;
-			}
-			return data.IsValidJson();
-		}
-
-		protected abstract bool DeletedNotificationPasses(string positionStreamId);
-		public abstract bool PassesSource(bool resolvedFromLinkTo, string positionStreamId, string eventType);
-		public abstract string GetCategory(string positionStreamId);
-
-		public bool PassesDeleteNotification(string positionStreamId) {
-			return !_includeDeletedStreamEvents && DeletedNotificationPasses(positionStreamId);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/EventProcessedResult.cs b/src/EventStore.Projections.Core/Services/Processing/EventProcessedResult.cs
deleted file mode 100644
index 0f1887d2f15..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/EventProcessedResult.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-
-namespace EventStore.Projections.Core.Services.Processing {
-	public class EventProcessedResult {
-		private readonly EmittedEventEnvelope[] _emittedEvents;
-		private readonly PartitionState _oldState;
-		private readonly PartitionState _newState;
-		private readonly PartitionState _oldSharedState;
-		private readonly PartitionState _newSharedState;
-		private readonly string _partition;
-		private readonly CheckpointTag _checkpointTag;
-		private readonly Guid _causedBy;
-		private readonly string _correlationId;
-		private readonly bool _isPartitionTombstone;
-
-		public EventProcessedResult(
-			string partition, CheckpointTag checkpointTag, PartitionState oldState, PartitionState newState,
-			PartitionState oldSharedState, PartitionState newSharedState, EmittedEventEnvelope[] emittedEvents,
-			Guid causedBy, string correlationId, bool isPartitionTombstone = false) {
-			if (partition == null) throw new ArgumentNullException("partition");
-			if (checkpointTag == null) throw new ArgumentNullException("checkpointTag");
-			_emittedEvents = emittedEvents;
-			_causedBy = causedBy;
-			_correlationId = correlationId;
-			_isPartitionTombstone = isPartitionTombstone;
-			_oldState = oldState;
-			_newState = newState;
-			_oldSharedState = oldSharedState;
-			_newSharedState = newSharedState;
-			_partition = partition;
-			_checkpointTag = checkpointTag;
-		}
-
-		public EmittedEventEnvelope[] EmittedEvents {
-			get { return _emittedEvents; }
-		}
-
-		public PartitionState OldState {
-			get { return _oldState; }
-		}
-
-		/// <summary>
-		/// null - means no state change
-		/// </summary>
-		public PartitionState NewState {
-			get { return _newState; }
-		}
-
-		public PartitionState OldSharedState {
-			get { return _oldSharedState; }
-		}
-
-		/// <summary>
-		/// null - means no state change
-		/// </summary>
-		public PartitionState NewSharedState {
-			get { return _newSharedState; }
-		}
-
-		public string Partition {
-			get { return _partition; }
-		}
-
-		public CheckpointTag CheckpointTag {
-			get { return _checkpointTag; }
-		}
-
-		public Guid CausedBy {
-			get { return _causedBy; }
-		}
-
-		public string CorrelationId {
-			get { return _correlationId; }
-		}
-
-		public bool IsPartitionTombstone {
-			get { return _isPartitionTombstone; }
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/EventReader.cs b/src/EventStore.Projections.Core/Services/Processing/EventReader.cs
deleted file mode 100644
index b1072b50c19..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/EventReader.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-using System;
-using System.Security.Claims;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Services.Processing {
-	public abstract class EventReader : IEventReader {
-		protected readonly Guid EventReaderCorrelationId;
-		private readonly ClaimsPrincipal _readAs;
-		protected readonly IPublisher _publisher;
-
-		protected readonly bool _stopOnEof;
-		private bool _paused = true;
-		private bool _pauseRequested = true;
-		protected bool _disposed;
-		private bool _startingSent;
-
-		protected EventReader(IPublisher publisher, Guid eventReaderCorrelationId, ClaimsPrincipal readAs, bool stopOnEof) {
-			if (publisher == null) throw new ArgumentNullException("publisher");
-			if (eventReaderCorrelationId == Guid.Empty)
-				throw new ArgumentException("eventReaderCorrelationId");
-			_publisher = publisher;
-			EventReaderCorrelationId = eventReaderCorrelationId;
-			_readAs = readAs;
-			_stopOnEof = stopOnEof;
-		}
-
-		protected bool PauseRequested {
-			get { return _pauseRequested; }
-		}
-
-		protected bool Paused {
-			get { return _paused; }
-		}
-
-		protected ClaimsPrincipal ReadAs {
-			get { return _readAs; }
-		}
-
-		public void Resume() {
-			if (_disposed) throw new InvalidOperationException("Disposed");
-			if (!_pauseRequested)
-				throw new InvalidOperationException("Is not paused");
-			if (!_paused) {
-				_pauseRequested = false;
-				return;
-			}
-
-			_paused = false;
-			_pauseRequested = false;
-//            _logger.Trace("Resuming event distribution {eventReaderCorrelationId} at '{at}'", EventReaderCorrelationId, FromAsText());
-			RequestEvents();
-		}
-
-		public void Pause() {
-			if (_disposed)
-				return; // due to possible self disposed
-
-			if (_pauseRequested)
-				throw new InvalidOperationException("Pause has been already requested");
-			_pauseRequested = true;
-			if (!AreEventsRequested())
-				_paused = true;
-//            _logger.Trace("Pausing event distribution {eventReaderCorrelationId} at '{at}'", EventReaderCorrelationId, FromAsText());
-		}
-
-		public virtual void Dispose() {
-			_disposed = true;
-		}
-
-		protected abstract bool AreEventsRequested();
-		protected abstract void RequestEvents();
-
-		protected void SendEof() {
-			if (_stopOnEof) {
-				_publisher.Publish(new ReaderSubscriptionMessage.EventReaderEof(EventReaderCorrelationId));
-				Dispose();
-			}
-		}
-
-		protected void SendPartitionEof(string partition, CheckpointTag preTagged) {
-			if (_disposed)
-				return;
-			_publisher.Publish(
-				new ReaderSubscriptionMessage.EventReaderPartitionEof(EventReaderCorrelationId, partition, preTagged));
-		}
-
-		protected void SendPartitionDeleted_WhenReadingDataStream(
-			string partition, long? lastEventNumber, TFPos? deletedLinkOrEventPosition, TFPos? deletedEventPosition,
-			string positionStreamId,
-			int? positionEventNumber, CheckpointTag preTagged = null) {
-			if (_disposed)
-				return;
-			_publisher.Publish(
-				new ReaderSubscriptionMessage.EventReaderPartitionDeleted(
-					EventReaderCorrelationId, partition, lastEventNumber, deletedLinkOrEventPosition,
-					deletedEventPosition, positionStreamId, positionEventNumber, preTagged));
-		}
-
-		public void SendNotAuthorized() {
-			if (_disposed)
-				return;
-			_publisher.Publish(new ReaderSubscriptionMessage.EventReaderNotAuthorized(EventReaderCorrelationId));
-			Dispose();
-		}
-
-		protected static long? GetLastCommitPositionFrom(ClientMessage.ReadStreamEventsForwardCompleted msg) {
-			return (msg.IsEndOfStream
-			        || msg.Result == ReadStreamResult.NoStream
-			        || msg.Result == ReadStreamResult.StreamDeleted)
-				? (msg.TfLastCommitPosition == -1 ? (long?)null : msg.TfLastCommitPosition)
-				: (long?)null;
-		}
-
-		protected void PauseOrContinueProcessing() {
-			if (_disposed)
-				return;
-			if (_pauseRequested)
-				_paused = !AreEventsRequested();
-			else
-				RequestEvents();
-		}
-
-		private void SendStarting(long startingLastCommitPosition) {
-			_publisher.Publish(
-				new ReaderSubscriptionMessage.EventReaderStarting(EventReaderCorrelationId,
-					startingLastCommitPosition));
-		}
-
-		protected void NotifyIfStarting(long startingLastCommitPosition) {
-			if (!_startingSent) {
-				_startingSent = true;
-				SendStarting(startingLastCommitPosition);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/EventReaderCoreService.cs b/src/EventStore.Projections.Core/Services/Processing/EventReaderCoreService.cs
deleted file mode 100644
index e4fa34a652b..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/EventReaderCoreService.cs
+++ /dev/null
@@ -1,365 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
-using HeadingEventReader = EventStore.Projections.Core.Services.Processing.TransactionFile.HeadingEventReader;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Projections.Core.Services.Processing {
-	public class EventReaderCoreService :
-		IHandle<ReaderCoreServiceMessage.StartReader>,
-		IHandle<ReaderCoreServiceMessage.StopReader>,
-		IHandle<ReaderSubscriptionManagement.Subscribe>,
-		IHandle<ReaderSubscriptionManagement.Unsubscribe>,
-		IHandle<ReaderSubscriptionManagement.Pause>,
-		IHandle<ReaderSubscriptionManagement.Resume>,
-		IHandle<ReaderSubscriptionMessage.CommittedEventDistributed>,
-		IHandle<ReaderSubscriptionMessage.EventReaderIdle>,
-		IHandle<ReaderSubscriptionMessage.EventReaderStarting>,
-		IHandle<ReaderSubscriptionMessage.EventReaderNotAuthorized>,
-		IHandle<ReaderSubscriptionMessage.EventReaderEof>,
-		IHandle<ReaderSubscriptionMessage.EventReaderPartitionEof>,
-		IHandle<ReaderSubscriptionMessage.EventReaderPartitionDeleted>,
-		IHandle<ReaderSubscriptionMessage.Faulted>,
-		IHandle<ReaderSubscriptionMessage.ReportProgress> {
-		public const string SubComponentName = "EventReaderCoreService";
-
-		private readonly IPublisher _publisher;
-		private readonly IODispatcher _ioDispatcher;
-		private readonly ILogger _logger = Serilog.Log.ForContext<ProjectionCoreService>();
-		private bool _stopped = true;
-
-		private readonly Dictionary<Guid, IReaderSubscription> _subscriptions =
-			new Dictionary<Guid, IReaderSubscription>();
-
-		private readonly Dictionary<Guid, IEventReader> _eventReaders = new Dictionary<Guid, IEventReader>();
-
-		private readonly Dictionary<Guid, Guid> _subscriptionEventReaders = new Dictionary<Guid, Guid>();
-		private readonly Dictionary<Guid, Guid> _eventReaderSubscriptions = new Dictionary<Guid, Guid>();
-		private readonly HashSet<Guid> _pausedSubscriptions = new HashSet<Guid>();
-		private readonly HeadingEventReader _headingEventReader;
-		private readonly ICheckpoint _writerCheckpoint;
-		private readonly bool _runHeadingReader;
-		private readonly bool _faultOutOfOrderProjections;
-		private readonly IEnvelope _publishEnvelope;
-		private Guid _defaultEventReaderId;
-		private Guid _reportProgressId;
-
-		public EventReaderCoreService(
-			IPublisher publisher, IODispatcher ioDispatcher, int eventCacheSize,
-			ICheckpoint writerCheckpoint, bool runHeadingReader, bool faultOutOfOrderProjections) {
-			_publisher = publisher;
-			_ioDispatcher = ioDispatcher;
-			if (runHeadingReader)
-				_headingEventReader = new HeadingEventReader(eventCacheSize, _publisher);
-			_writerCheckpoint = writerCheckpoint;
-			_runHeadingReader = runHeadingReader;
-			_faultOutOfOrderProjections = faultOutOfOrderProjections;
-			_publishEnvelope = publisher;
-		}
-
-		public void Handle(ReaderSubscriptionManagement.Pause message) {
-			if (!_pausedSubscriptions.Add(message.SubscriptionId))
-				throw new InvalidOperationException("Already paused projection");
-
-			IReaderSubscription projectionSubscription;
-			if (!_subscriptions.TryGetValue(message.SubscriptionId, out projectionSubscription))
-				return; // may be already unsubscribed when self-unsubscribing
-
-			var eventReaderId = _subscriptionEventReaders[message.SubscriptionId];
-			if (eventReaderId == Guid.Empty) // head
-			{
-				_subscriptionEventReaders.Remove(message.SubscriptionId);
-				_headingEventReader.Unsubscribe(message.SubscriptionId);
-				var forkedEventReaderId = Guid.NewGuid();
-				var forkedEventReader = projectionSubscription.CreatePausedEventReader(
-					_publisher, _ioDispatcher, forkedEventReaderId);
-				_subscriptionEventReaders.Add(message.SubscriptionId, forkedEventReaderId);
-				_eventReaderSubscriptions.Add(forkedEventReaderId, message.SubscriptionId);
-				_eventReaders.Add(forkedEventReaderId, forkedEventReader);
-				_publisher.Publish(
-					new EventReaderSubscriptionMessage.ReaderAssignedReader(
-						message.SubscriptionId, forkedEventReaderId));
-			} else {
-				_eventReaders[eventReaderId].Pause();
-			}
-		}
-
-		public void Handle(ReaderSubscriptionManagement.Resume message) {
-			if (!_pausedSubscriptions.Remove(message.SubscriptionId))
-				throw new InvalidOperationException("Not a paused projection");
-			var eventReader = _subscriptionEventReaders[message.SubscriptionId];
-			_eventReaders[eventReader].Resume();
-		}
-
-		public void Handle(ReaderSubscriptionManagement.Subscribe message) {
-			if (_stopped) {
-				_publisher.Publish(
-					new EventReaderSubscriptionMessage.Failed(
-						message.SubscriptionId, $"{nameof(EventReaderCoreService)} is stopped"));
-				return;
-			}
-
-			var fromCheckpointTag = message.FromPosition;
-			var subscriptionId = message.SubscriptionId;
-			try {
-				var projectionSubscription = message.ReaderStrategy.CreateReaderSubscription(
-					_publisher, fromCheckpointTag, message.SubscriptionId, message.Options);
-				_subscriptions.Add(subscriptionId, projectionSubscription);
-
-				var distributionPointCorrelationId = Guid.NewGuid();
-				var eventReader = projectionSubscription.CreatePausedEventReader(
-					_publisher, _ioDispatcher, distributionPointCorrelationId);
-				_eventReaders.Add(distributionPointCorrelationId, eventReader);
-				_subscriptionEventReaders.Add(subscriptionId, distributionPointCorrelationId);
-				_eventReaderSubscriptions.Add(distributionPointCorrelationId, subscriptionId);
-				_publisher.Publish(
-					new EventReaderSubscriptionMessage.ReaderAssignedReader(
-						subscriptionId, distributionPointCorrelationId));
-				eventReader.Resume();
-			} catch (Exception ex) {
-				_publisher.Publish(new EventReaderSubscriptionMessage.Failed(
-					subscriptionId, ex.ToString()));
-			}
-		}
-
-		public void Handle(ReaderSubscriptionManagement.Unsubscribe message) {
-			if (!_pausedSubscriptions.Contains(message.SubscriptionId))
-				Handle(new ReaderSubscriptionManagement.Pause(message.SubscriptionId));
-			var eventReaderId = Guid.Empty;
-			_subscriptionEventReaders.TryGetValue(message.SubscriptionId, out eventReaderId);
-			if (eventReaderId != Guid.Empty) {
-				_eventReaders[eventReaderId].Dispose();
-				_eventReaders.Remove(eventReaderId);
-				_eventReaderSubscriptions.Remove(eventReaderId);
-				_publisher.Publish(
-					new EventReaderSubscriptionMessage.ReaderAssignedReader(message.SubscriptionId, Guid.Empty));
-			}
-
-			_pausedSubscriptions.Remove(message.SubscriptionId);
-			_subscriptionEventReaders.Remove(message.SubscriptionId);
-			_subscriptions.Remove(message.SubscriptionId);
-		}
-
-		public void Handle(ReaderSubscriptionMessage.CommittedEventDistributed message) {
-			Guid projectionId;
-			if (_stopped)
-				return;
-			if (_runHeadingReader && _headingEventReader.Handle(message))
-				return;
-			if (!_eventReaderSubscriptions.TryGetValue(message.CorrelationId, out projectionId))
-				return; // unsubscribed
-
-			if (TrySubscribeHeadingEventReader(message, projectionId))
-				return;
-			if (message.Data != null) {
-				try {
-					_subscriptions[projectionId].Handle(message);
-				} catch (Exception ex) {
-					var subscription = _subscriptions[projectionId];
-					Handle(new ReaderSubscriptionManagement.Unsubscribe(subscription.SubscriptionId));
-					_publisher.Publish(new EventReaderSubscriptionMessage.Failed(subscription.SubscriptionId,
-						string.Format("The subscription failed to handle an event {0}:{1}@{2} because {3}",
-							message.Data.EventStreamId, message.Data.EventType, message.Data.EventSequenceNumber,
-							ex.Message)));
-				}
-			}
-		}
-
-		public void Handle(ReaderSubscriptionMessage.EventReaderIdle message) {
-			Guid projectionId;
-			if (_stopped)
-				return;
-			if (_runHeadingReader && _headingEventReader.Handle(message))
-				return;
-			if (!_eventReaderSubscriptions.TryGetValue(message.CorrelationId, out projectionId))
-				return; // unsubscribed
-			_subscriptions[projectionId].Handle(message);
-		}
-
-		public void Handle(ReaderSubscriptionMessage.EventReaderStarting message) {
-			Guid projectionId;
-			if (_stopped)
-				return;
-			if (!_eventReaderSubscriptions.TryGetValue(message.CorrelationId, out projectionId))
-				return; // unsubscribed
-			_subscriptions[projectionId].Handle(message);
-		}
-
-		public void Handle(ReaderSubscriptionMessage.EventReaderEof message) {
-			Guid projectionId;
-			if (_stopped)
-				return;
-			if (!_eventReaderSubscriptions.TryGetValue(message.CorrelationId, out projectionId))
-				return; // unsubscribed
-			_subscriptions[projectionId].Handle(message);
-
-//            _pausedSubscriptions.Add(projectionId); // it is actually disposed -- workaround
-//            Handle(new ReaderSubscriptionManagement.Unsubscribe(projectionId));
-		}
-
-		public void Handle(ReaderSubscriptionMessage.EventReaderPartitionEof message) {
-			Guid projectionId;
-			if (_stopped)
-				return;
-			if (!_eventReaderSubscriptions.TryGetValue(message.CorrelationId, out projectionId))
-				return; // unsubscribed
-			_subscriptions[projectionId].Handle(message);
-		}
-
-		public void Handle(ReaderSubscriptionMessage.EventReaderPartitionDeleted message) {
-			Guid projectionId;
-			if (_stopped)
-				return;
-			if (_runHeadingReader && _headingEventReader.Handle(message))
-				return;
-			if (!_eventReaderSubscriptions.TryGetValue(message.CorrelationId, out projectionId))
-				return; // unsubscribed
-			_subscriptions[projectionId].Handle(message);
-		}
-
-		public void Handle(ReaderSubscriptionMessage.EventReaderNotAuthorized message) {
-			Guid projectionId;
-			if (_stopped)
-				return;
-			if (!_eventReaderSubscriptions.TryGetValue(message.CorrelationId, out projectionId))
-				return; // unsubscribed
-			_subscriptions[projectionId].Handle(message);
-
-			_pausedSubscriptions.Add(projectionId); // it is actually disposed -- workaround
-			Handle(new ReaderSubscriptionManagement.Unsubscribe(projectionId));
-		}
-
-		public void Handle(ReaderSubscriptionMessage.Faulted message) {
-			Guid projectionId;
-			if (_stopped)
-				return;
-			if (!_eventReaderSubscriptions.TryGetValue(message.CorrelationId, out projectionId))
-				return; // unsubscribed
-
-			if (!_faultOutOfOrderProjections && message.Reason.Contains("was expected in the stream")) {
-				// Log without fault the projection
-				_logger.Verbose(message.Reason);
-				return;
-			}
-
-			var subscription = _subscriptions[projectionId];
-			Handle(new ReaderSubscriptionManagement.Unsubscribe(subscription.SubscriptionId));
-			_publisher.Publish(new EventReaderSubscriptionMessage.Failed(subscription.SubscriptionId, message.Reason));
-		}
-
-		public void Handle(ReaderSubscriptionMessage.ReportProgress message) {
-			if (_stopped || message.CorrelationId != _reportProgressId)
-				return;
-
-			foreach (var subscription in _subscriptions.Values) {
-				subscription.Handle(message);
-			}
-
-			_reportProgressId = Guid.NewGuid();
-			_publisher.Publish(TimerMessage.Schedule.Create(TimeSpan.FromMilliseconds(500), _publishEnvelope, new ReaderSubscriptionMessage.ReportProgress(_reportProgressId)));
-		}
-
-		private void StartReaders() {
-			//TODO: do we need to clear subscribed projections here?
-			//TODO: do we need to clear subscribed distribution points here?
-			_stopped = false;
-			_defaultEventReaderId = Guid.NewGuid();
-			var transactionFileReader = new TransactionFileEventReader(
-				_publisher,
-				_defaultEventReaderId,
-				SystemAccounts.System,
-				new TFPos(_writerCheckpoint.Read(), -1),
-				new RealTimeProvider(),
-				deliverEndOfTFPosition: false);
-
-			_eventReaders.Add(_defaultEventReaderId, transactionFileReader);
-			if (_runHeadingReader)
-				_headingEventReader.Start(_defaultEventReaderId, transactionFileReader);
-		}
-
-		private void StopReaders(ReaderCoreServiceMessage.StopReader message) {
-			if (_eventReaders.TryGetValue(_defaultEventReaderId, out var eventReader)) {
-				eventReader.Dispose();
-				_eventReaders.Remove(_defaultEventReaderId);
-				_eventReaderSubscriptions.Remove(_defaultEventReaderId);
-			}
-			_defaultEventReaderId = Guid.Empty;
-
-			if (_subscriptions.Count > 0) {
-				_logger.Information("_subscriptions is not empty after all the projections have been killed");
-				_subscriptions.Clear();
-			}
-
-			if (_eventReaders.Count > 0) {
-				_logger.Information("_eventReaders is not empty after all the projections have been killed");
-				_eventReaders.Clear();
-			}
-
-			if (_subscriptionEventReaders.Count > 0) {
-				_logger.Information("_subscriptionEventReaders is not empty after all the projections have been killed");
-				_subscriptionEventReaders.Clear();
-			}
-
-			if (_eventReaderSubscriptions.Count > 0) {
-				_logger.Information("_eventReaderSubscriptions is not empty after all the projections have been killed");
-				_eventReaderSubscriptions.Clear();
-			}
-
-			if (_runHeadingReader)
-				_headingEventReader.Stop();
-			_stopped = true;
-
-			_publisher.Publish(
-				new ProjectionCoreServiceMessage.SubComponentStopped(SubComponentName, message.QueueId));
-		}
-
-		private bool TrySubscribeHeadingEventReader(
-			ReaderSubscriptionMessage.CommittedEventDistributed message, Guid projectionId) {
-			if (message.SafeTransactionFileReaderJoinPosition == null)
-				return false;
-
-			if (!_runHeadingReader)
-				return false;
-
-			if (_pausedSubscriptions.Contains(projectionId))
-				return false;
-
-			var projectionSubscription = _subscriptions[projectionId];
-
-			if (
-				!_headingEventReader.TrySubscribe(
-					projectionId, projectionSubscription, message.SafeTransactionFileReaderJoinPosition.Value))
-				return false;
-
-			Guid eventReaderId = message.CorrelationId;
-			_eventReaders[eventReaderId].Dispose();
-			_eventReaders.Remove(eventReaderId);
-			_eventReaderSubscriptions.Remove(eventReaderId);
-			_subscriptionEventReaders[projectionId] = Guid.Empty;
-			_publisher.Publish(
-				new EventReaderSubscriptionMessage.ReaderAssignedReader(message.CorrelationId, Guid.Empty));
-			return true;
-		}
-
-		public void Handle(ReaderCoreServiceMessage.StartReader message) {
-			StartReaders();
-			_publisher.Publish(new ProjectionCoreServiceMessage.SubComponentStarted(
-				SubComponentName, message.InstanceCorrelationId));
-			_reportProgressId = Guid.NewGuid();
-			 _publisher.Publish(TimerMessage.Schedule.Create(TimeSpan.FromMilliseconds(500), _publishEnvelope, new ReaderSubscriptionMessage.ReportProgress(_reportProgressId)));
-		}
-
-		public void Handle(ReaderCoreServiceMessage.StopReader message) {
-			StopReaders(message);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/IEventReader.cs b/src/EventStore.Projections.Core/Services/Processing/IEventReader.cs
deleted file mode 100644
index d21bd1b8147..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/IEventReader.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-
-namespace EventStore.Projections.Core.Services.Processing {
-	public interface IEventReader : IDisposable {
-		void Resume();
-		void Pause();
-		void SendNotAuthorized();
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/MultiStream/MultiStreamEventFilter.cs b/src/EventStore.Projections.Core/Services/Processing/MultiStream/MultiStreamEventFilter.cs
deleted file mode 100644
index 31ee3361635..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/MultiStream/MultiStreamEventFilter.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Collections.Generic;
-
-namespace EventStore.Projections.Core.Services.Processing.MultiStream {
-	public class MultiStreamEventFilter : EventFilter {
-		private readonly HashSet<string> _streams;
-
-		public MultiStreamEventFilter(HashSet<string> streams, bool allEvents, HashSet<string> events)
-			: base(allEvents, false, events) {
-			_streams = streams;
-		}
-
-		protected override bool DeletedNotificationPasses(string positionStreamId) {
-			return false;
-		}
-
-		public override bool PassesSource(bool resolvedFromLinkTo, string positionStreamId, string eventType) {
-			return _streams.Contains(positionStreamId);
-		}
-
-		public override string GetCategory(string positionStreamId) {
-			return null;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/MultiStream/MultiStreamEventReader.cs b/src/EventStore.Projections.Core/Services/Processing/MultiStream/MultiStreamEventReader.cs
deleted file mode 100644
index 9dcf518d994..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/MultiStream/MultiStreamEventReader.cs
+++ /dev/null
@@ -1,361 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Settings;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Messaging;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Services.Processing.MultiStream {
-	public class MultiStreamEventReader : EventReader,
-		IHandle<ClientMessage.ReadStreamEventsForwardCompleted>,
-		IHandle<ProjectionManagementMessage.Internal.ReadTimeout> {
-		private readonly HashSet<string> _streams;
-		private CheckpointTag _fromPositions;
-		private readonly bool _resolveLinkTos;
-		private readonly ITimeProvider _timeProvider;
-
-		private readonly HashSet<string> _eventsRequested = new HashSet<string>();
-		private readonly Dictionary<string, long?> _preparePositions = new Dictionary<string, long?>();
-
-		// event, link, progress
-		// null element in a queue means stream deleted
-		private readonly Dictionary<string, Queue<Tuple<EventStore.Core.Data.ResolvedEvent, float>>> _buffers =
-			new Dictionary<string, Queue<Tuple<EventStore.Core.Data.ResolvedEvent, float>>>();
-
-		private const int _maxReadCount = 111;
-		private long? _safePositionToJoin;
-		private readonly ConcurrentDictionary<string, bool> _eofs;
-		private int _deliveredEvents;
-		private long _lastPosition;
-
-		private readonly ConcurrentDictionary<string, Guid> _pendingRequests;
-
-		public MultiStreamEventReader(
-			IODispatcher ioDispatcher, IPublisher publisher, Guid eventReaderCorrelationId, ClaimsPrincipal readAs,
-			int phase,
-			string[] streams, Dictionary<string, long> fromPositions, bool resolveLinkTos, ITimeProvider timeProvider,
-			bool stopOnEof = false, int? stopAfterNEvents = null)
-			: base(publisher, eventReaderCorrelationId, readAs, stopOnEof) {
-			if (streams == null) throw new ArgumentNullException("streams");
-			if (timeProvider == null) throw new ArgumentNullException("timeProvider");
-			if (streams.Length == 0) throw new ArgumentException("streams");
-			_streams = new HashSet<string>(streams);
-			_eofs = new ConcurrentDictionary<string, bool>(_streams.ToDictionary(v => v, v => false));
-			var positions = CheckpointTag.FromStreamPositions(phase, fromPositions);
-			ValidateTag(positions);
-			_fromPositions = positions;
-			_resolveLinkTos = resolveLinkTos;
-			_timeProvider = timeProvider;
-			_pendingRequests = new ConcurrentDictionary<string, Guid>();
-			foreach (var stream in streams) {
-				_pendingRequests[stream] = Guid.Empty;
-				_preparePositions.Add(stream, null);
-			}
-		}
-
-		private void ValidateTag(CheckpointTag fromPositions) {
-			if (_streams.Count != fromPositions.Streams.Count)
-				throw new ArgumentException("Number of streams does not match", "fromPositions");
-
-			foreach (var stream in _streams) {
-				if (!fromPositions.Streams.ContainsKey(stream))
-					throw new ArgumentException(
-						string.Format("The '{0}' stream position has not been set", stream), "fromPositions");
-			}
-		}
-
-		protected override void RequestEvents() {
-			if (PauseRequested || Paused)
-				return;
-			if (_eofs.Any(v => v.Value))
-				_publisher.Publish(
-					TimerMessage.Schedule.Create(
-						TimeSpan.FromMilliseconds(250), _publisher,
-						new UnwrapEnvelopeMessage(ProcessBuffers2)));
-			foreach (var stream in _streams)
-				RequestEvents(stream, delay: _eofs[stream]);
-		}
-
-		private void ProcessBuffers2() {
-			ProcessBuffers();
-			CheckIdle();
-		}
-
-		protected override bool AreEventsRequested() {
-			return _eventsRequested.Count != 0;
-		}
-
-		public void Handle(ClientMessage.ReadStreamEventsForwardCompleted message) {
-			if (_disposed)
-				return;
-			if (!_streams.Contains(message.EventStreamId))
-				throw new InvalidOperationException(string.Format("Invalid stream name: {0}", message.EventStreamId));
-			if (!_eventsRequested.Contains(message.EventStreamId))
-				throw new InvalidOperationException("Read events has not been requested");
-			if (Paused)
-				throw new InvalidOperationException("Paused");
-			if (!_pendingRequests.Values.Any(x => x == message.CorrelationId)) return;
-
-			_lastPosition = message.TfLastCommitPosition;
-			switch (message.Result) {
-				case ReadStreamResult.StreamDeleted:
-				case ReadStreamResult.NoStream:
-					_eofs[message.EventStreamId] = true;
-					UpdateSafePositionToJoin(message.EventStreamId, MessageToLastCommitPosition(message));
-					if (message.Result == ReadStreamResult.StreamDeleted
-					    || (message.Result == ReadStreamResult.NoStream && message.LastEventNumber >= 0))
-						EnqueueItem(null, message.EventStreamId);
-					ProcessBuffers();
-					_eventsRequested.Remove(message.EventStreamId);
-					PauseOrContinueProcessing();
-					CheckIdle();
-					CheckEof();
-					break;
-				case ReadStreamResult.Success:
-					if ((message.Events.Length == 0) && message.IsEndOfStream) {
-						// the end
-						_eofs[message.EventStreamId] = true;
-						UpdateSafePositionToJoin(message.EventStreamId, MessageToLastCommitPosition(message));
-						CheckIdle();
-						CheckEof();
-					} else {
-						_eofs[message.EventStreamId] = false;
-						if (message.Events.Length == 0) {
-							_fromPositions.Streams[message.EventStreamId] = message.NextEventNumber;
-						}
-						for (int index = 0; index < message.Events.Length; index++) {
-							var @event = message.Events[index].Event;
-							var @link = message.Events[index].Link;
-							EventRecord positionEvent = (link ?? @event);
-							UpdateSafePositionToJoin(
-								positionEvent.EventStreamId, EventPairToPosition(message.Events[index]));
-							Tuple<EventStore.Core.Data.ResolvedEvent, float> itemToEnqueue = Tuple.Create(
-								message.Events[index],
-								100.0f * (link ?? @event).EventNumber / message.LastEventNumber);
-							EnqueueItem(itemToEnqueue, positionEvent.EventStreamId);
-						}
-					}
-
-					ProcessBuffers();
-					_eventsRequested.Remove(message.EventStreamId);
-					PauseOrContinueProcessing();
-					break;
-				case ReadStreamResult.AccessDenied:
-					SendNotAuthorized();
-					return;
-				default:
-					throw new NotSupportedException(
-						string.Format("ReadEvents result code was not recognized. Code: {0}", message.Result));
-			}
-		}
-
-		public void Handle(ProjectionManagementMessage.Internal.ReadTimeout message) {
-			if (_disposed) return;
-			if (Paused) return;
-			if (!_pendingRequests.Values.Any(x => x == message.CorrelationId)) return;
-
-			_eventsRequested.Remove(message.StreamId);
-			PauseOrContinueProcessing();
-		}
-
-		private void EnqueueItem(Tuple<EventStore.Core.Data.ResolvedEvent, float> itemToEnqueue, string streamId) {
-			Queue<Tuple<EventStore.Core.Data.ResolvedEvent, float>> queue;
-			if (!_buffers.TryGetValue(streamId, out queue)) {
-				queue = new Queue<Tuple<EventStore.Core.Data.ResolvedEvent, float>>();
-				_buffers.Add(streamId, queue);
-			}
-
-			//TODO: progress calculation below is incorrect.  sum(current)/sum(last_event) where sum by all streams
-			queue.Enqueue(itemToEnqueue);
-		}
-
-		private void CheckEof() {
-			if (_eofs.All(v => v.Value))
-				SendEof();
-		}
-
-		private void CheckIdle() {
-			if (_eofs.All(v => v.Value))
-				_publisher.Publish(
-					new ReaderSubscriptionMessage.EventReaderIdle(EventReaderCorrelationId, _timeProvider.UtcNow));
-		}
-
-		private void ProcessBuffers() {
-			if (_disposed)
-				return;
-			if (_safePositionToJoin == null)
-				return;
-			while (true) {
-				var anyNonEmpty = false;
-
-				var anyEvent = false;
-				var minStreamId = "";
-				var minPosition = GetMaxPosition();
-
-				var anyDeletedStream = false;
-				var deletedStreamId = "";
-
-				foreach (var buffer in _buffers) {
-					if (buffer.Value.Count == 0)
-						continue;
-					anyNonEmpty = true;
-					var head = buffer.Value.Peek();
-
-					var currentStreamId = buffer.Key;
-
-					if (head != null) {
-						var itemPosition = GetItemPosition(head);
-						if (_safePositionToJoin != null
-						    && itemPosition.CompareTo(_safePositionToJoin.GetValueOrDefault()) <= 0
-						    && itemPosition.CompareTo(minPosition) < 0) {
-							minPosition = itemPosition;
-							minStreamId = currentStreamId;
-							anyEvent = true;
-						}
-					} else {
-						anyDeletedStream = true;
-						deletedStreamId = currentStreamId;
-					}
-				}
-
-				if (!anyEvent && !anyDeletedStream) {
-					if (!anyNonEmpty)
-						DeliverSafePositionToJoin();
-					break;
-				}
-
-				if (anyEvent) {
-					var minHead = _buffers[minStreamId].Dequeue();
-					DeliverEvent(minHead.Item1, minHead.Item2);
-
-					if (_buffers[minStreamId].Count == 0)
-						PauseOrContinueProcessing();
-				}
-
-				if (anyDeletedStream) {
-					_buffers[deletedStreamId].Dequeue();
-					SendPartitionDeleted_WhenReadingDataStream(deletedStreamId, -1, null, null, null, null);
-				}
-			}
-		}
-
-		private void RequestEvents(string stream, bool delay) {
-			if (_disposed) throw new InvalidOperationException("Disposed");
-			if (PauseRequested || Paused)
-				throw new InvalidOperationException("Paused or pause requested");
-
-			if (_eventsRequested.Contains(stream))
-				return;
-			Queue<Tuple<EventStore.Core.Data.ResolvedEvent, float>> queue;
-			if (_buffers.TryGetValue(stream, out queue) && queue.Count > 0)
-				return;
-			_eventsRequested.Add(stream);
-
-			var pendingRequestCorrelationId = Guid.NewGuid();
-			_pendingRequests[stream] = pendingRequestCorrelationId;
-
-			var readEventsForward = new ClientMessage.ReadStreamEventsForward(
-				Guid.NewGuid(), pendingRequestCorrelationId, new SendToThisEnvelope(this), stream,
-				_fromPositions.Streams[stream],
-				_maxReadCount, _resolveLinkTos, false, null, ReadAs, replyOnExpired: false);
-			if (delay) {
-				_publisher.Publish(
-					new AwakeServiceMessage.SubscribeAwake(
-						_publisher, Guid.NewGuid(), null,
-						new TFPos(_lastPosition, _lastPosition),
-						CreateReadTimeoutMessage(pendingRequestCorrelationId, stream)));
-				_publisher.Publish(
-					new AwakeServiceMessage.SubscribeAwake(
-						_publisher, Guid.NewGuid(), null,
-						new TFPos(_lastPosition, _lastPosition), readEventsForward));
-			} else {
-				_publisher.Publish(readEventsForward);
-				ScheduleReadTimeoutMessage(pendingRequestCorrelationId, stream);
-			}
-		}
-
-		private void ScheduleReadTimeoutMessage(Guid correlationId, string streamId) {
-			_publisher.Publish(CreateReadTimeoutMessage(correlationId, streamId));
-		}
-
-		private Message CreateReadTimeoutMessage(Guid correlationId, string streamId) {
-			return TimerMessage.Schedule.Create(
-				TimeSpan.FromMilliseconds(ESConsts.ReadRequestTimeout),
-				new SendToThisEnvelope(this),
-				new ProjectionManagementMessage.Internal.ReadTimeout(correlationId, streamId));
-		}
-
-		private void DeliverSafePositionToJoin() {
-			if (_stopOnEof || _safePositionToJoin == null)
-				return;
-			// deliver if already available
-			_publisher.Publish(
-				new ReaderSubscriptionMessage.CommittedEventDistributed(
-					EventReaderCorrelationId, null, PositionToSafeJoinPosition(_safePositionToJoin), 100.0f,
-					source: this.GetType()));
-		}
-
-		private void UpdateSafePositionToJoin(string streamId, long? preparePosition) {
-			_preparePositions[streamId] = preparePosition;
-			if (_preparePositions.All(v => v.Value != null))
-				_safePositionToJoin = _preparePositions.Min(v => v.Value.GetValueOrDefault());
-		}
-
-		private void DeliverEvent(EventStore.Core.Data.ResolvedEvent pair, float progress) {
-			_deliveredEvents++;
-			var positionEvent = pair.OriginalEvent;
-			string streamId = positionEvent.EventStreamId;
-			long fromPosition = _fromPositions.Streams[streamId];
-
-			//if events have been deleted from the beginning of the stream, start from the first event we find
-			if (fromPosition == 0 && positionEvent.EventNumber > 0) {
-				fromPosition = positionEvent.EventNumber;
-			}
-
-			if (positionEvent.EventNumber != fromPosition) {
-				// This can happen when the original stream has $maxAge/$maxCount set
-				_publisher.Publish(new ReaderSubscriptionMessage.Faulted(EventReaderCorrelationId, string.Format(
-					"Event number {0} was expected in the stream {1}, but event number {2} was received. This may happen if events have been deleted from the beginning of your stream, please reset your projection.",
-					fromPosition, streamId, positionEvent.EventNumber), this.GetType()));
-				return;
-			}
-
-			_fromPositions = _fromPositions.UpdateStreamPosition(streamId, positionEvent.EventNumber + 1);
-			_publisher.Publish(
-				//TODO: publish both link and event data
-				new ReaderSubscriptionMessage.CommittedEventDistributed(
-					EventReaderCorrelationId, new ResolvedEvent(pair, null),
-					_stopOnEof ? (long?)null : positionEvent.LogPosition, progress, source: this.GetType()));
-		}
-
-		private long? EventPairToPosition(EventStore.Core.Data.ResolvedEvent resolvedEvent) {
-			return resolvedEvent.OriginalEvent.LogPosition;
-		}
-
-		private long? MessageToLastCommitPosition(ClientMessage.ReadStreamEventsForwardCompleted message) {
-			return GetLastCommitPositionFrom(message);
-		}
-
-		private long GetItemPosition(Tuple<EventStore.Core.Data.ResolvedEvent, float> head) {
-			return head.Item1.OriginalEvent.LogPosition;
-		}
-
-		private long GetMaxPosition() {
-			return long.MaxValue;
-		}
-
-		private long? PositionToSafeJoinPosition(long? safePositionToJoin) {
-			return safePositionToJoin;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/MultiStream/MultiStreamMultiOutputCheckpointManager.Item.cs b/src/EventStore.Projections.Core/Services/Processing/MultiStream/MultiStreamMultiOutputCheckpointManager.Item.cs
deleted file mode 100644
index db826b0d410..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/MultiStream/MultiStreamMultiOutputCheckpointManager.Item.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Services.Processing.MultiStream;
-
-public partial class MultiStreamMultiOutputCheckpointManager
-{
-	private class Item {
-		internal EventStore.Core.Data.ResolvedEvent? _result;
-		private readonly CheckpointTag _tag;
-
-		public Item(CheckpointTag tag) {
-			_tag = tag;
-		}
-
-		public CheckpointTag Tag {
-			get { return _tag; }
-		}
-
-		public void SetLoadedEvent(EventStore.Core.Data.ResolvedEvent eventLinkPair) {
-			_result = eventLinkPair;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/MultiStream/MultiStreamMultiOutputCheckpointManager.cs b/src/EventStore.Projections.Core/Services/Processing/MultiStream/MultiStreamMultiOutputCheckpointManager.cs
deleted file mode 100644
index cf6699aa94b..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/MultiStream/MultiStreamMultiOutputCheckpointManager.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-
-namespace EventStore.Projections.Core.Services.Processing.MultiStream {
-	public partial class MultiStreamMultiOutputCheckpointManager : DefaultCheckpointManager, IEmittedStreamContainer {
-		private readonly PositionTagger _positionTagger;
-		private CheckpointTag _lastOrderCheckpointTag; //TODO: use position tracker to ensure order?
-		private EmittedStream _orderStream;
-		private bool _orderStreamReadingCompleted;
-		private int _loadingItemsCount;
-		private readonly Stack<Item> _loadQueue = new Stack<Item>();
-		private CheckpointTag _loadingPrerecordedEventsFrom;
-		private static readonly char[] _linkToSeparator = new[] {'@'};
-
-		public MultiStreamMultiOutputCheckpointManager(
-			IPublisher publisher, Guid projectionCorrelationId, ProjectionVersion projectionVersion, ClaimsPrincipal runAs,
-			IODispatcher ioDispatcher, ProjectionConfig projectionConfig, string name, PositionTagger positionTagger,
-			ProjectionNamesBuilder namingBuilder, bool usePersistentCheckpoints, bool producesRunningResults,
-			bool definesFold,
-			CoreProjectionCheckpointWriter coreProjectionCheckpointWriter)
-			: base(
-				publisher, projectionCorrelationId, projectionVersion, runAs, ioDispatcher, projectionConfig, name,
-				positionTagger, namingBuilder, usePersistentCheckpoints, producesRunningResults, definesFold,
-				coreProjectionCheckpointWriter) {
-			_positionTagger = positionTagger;
-		}
-
-		public override void Initialize() {
-			base.Initialize();
-			_lastOrderCheckpointTag = null;
-			if (_orderStream != null) _orderStream.Dispose();
-			_orderStream = null;
-		}
-
-		public override void Start(CheckpointTag checkpointTag, PartitionState rootPartitionState) {
-			base.Start(checkpointTag, rootPartitionState);
-			_orderStream = CreateOrderStream(checkpointTag);
-			_orderStream.Start();
-		}
-
-		public override void RecordEventOrder(
-			ResolvedEvent resolvedEvent, CheckpointTag orderCheckpointTag, Action committed) {
-			EnsureStarted();
-			if (_stopping)
-				throw new InvalidOperationException("Stopping");
-			var orderStreamName = _namingBuilder.GetOrderStreamName();
-			//TODO: -order stream requires correctly configured event expiration.
-			// the best is to truncate using $startFrom, but $maxAge should be also acceptable
-			_orderStream.EmitEvents(
-				new[] {
-					new EmittedDataEvent(
-						orderStreamName, Guid.NewGuid(), "$>",
-						false, resolvedEvent.PositionSequenceNumber + "@" + resolvedEvent.PositionStreamId, null,
-						orderCheckpointTag, _lastOrderCheckpointTag, v => committed())
-				});
-			_lastOrderCheckpointTag = orderCheckpointTag;
-		}
-
-		private EmittedStream CreateOrderStream(CheckpointTag from) {
-			//TODO: this stream requires $startFrom to be updated from time to time to reduce space taken
-			return new EmittedStream(
-				/* MUST NEVER SEND READY MESSAGE */
-				_namingBuilder.GetOrderStreamName(),
-				new EmittedStream.WriterConfiguration(
-					new EmittedStreamsWriter(_ioDispatcher), new EmittedStream.WriterConfiguration.StreamMetadata(),
-					SystemAccounts.System, 100, _logger),
-				_projectionVersion, _positionTagger, @from, _publisher, _ioDispatcher, this, noCheckpoints: true);
-		}
-
-		public override void GetStatistics(ProjectionStatistics info) {
-			base.GetStatistics(info);
-			if (_orderStream != null) {
-				info.WritePendingEventsAfterCheckpoint += _orderStream.GetWritePendingEvents();
-				info.ReadsInProgress += _orderStream.GetReadsInProgress();
-				info.WritesInProgress += _orderStream.GetWritesInProgress();
-			}
-		}
-
-
-		public override void BeginLoadPrerecordedEvents(CheckpointTag checkpointTag) {
-			BeginLoadPrerecordedEventsChunk(checkpointTag, -1);
-		}
-
-		private void BeginLoadPrerecordedEventsChunk(CheckpointTag checkpointTag, long fromEventNumber) {
-			_loadingPrerecordedEventsFrom = checkpointTag;
-			_ioDispatcher.ReadBackward(
-				_namingBuilder.GetOrderStreamName(), fromEventNumber, 100, false, SystemAccounts.System,
-				completed => {
-					switch (completed.Result) {
-						case ReadStreamResult.NoStream:
-							_lastOrderCheckpointTag = _positionTagger.MakeZeroCheckpointTag();
-							PrerecordedEventsLoaded(checkpointTag);
-							break;
-						case ReadStreamResult.Success:
-							var epochEnded = false;
-							foreach (var @event in completed.Events) {
-								var parsed = @event.Event.Metadata.ParseCheckpointTagVersionExtraJson(
-									_projectionVersion);
-								//TODO: throw exception if different projectionID?
-								if (_projectionVersion.ProjectionId != parsed.Version.ProjectionId
-								    || _projectionVersion.Epoch > parsed.Version.Version) {
-									epochEnded = true;
-									break;
-								}
-
-								var tag = parsed.AdjustBy(_positionTagger, _projectionVersion);
-								//NOTE: even if this tag <= checkpointTag we set last tag
-								// this is to know the exact last tag to request when writing
-								if (_lastOrderCheckpointTag == null)
-									_lastOrderCheckpointTag = tag;
-
-								if (tag <= checkpointTag) {
-									SetOrderStreamReadCompleted();
-									return;
-								}
-
-								EnqueuePrerecordedEvent(@event.Event, tag);
-							}
-
-							if (epochEnded || completed.IsEndOfStream)
-								SetOrderStreamReadCompleted();
-							else
-								BeginLoadPrerecordedEventsChunk(checkpointTag, completed.NextEventNumber);
-							break;
-						default:
-							throw new Exception("Cannot read order stream");
-					}
-				}, () => {
-					_logger.Warning("Read backward of stream {stream} timed out. Retrying",
-						_namingBuilder.GetOrderStreamName());
-					BeginLoadPrerecordedEventsChunk(checkpointTag, fromEventNumber);
-				}, Guid.NewGuid());
-		}
-
-		private void EnqueuePrerecordedEvent(EventRecord @event, CheckpointTag tag) {
-			if (@event == null) throw new ArgumentNullException("event");
-			if (tag == null) throw new ArgumentNullException("tag");
-			if (@event.EventType != "$>")
-				throw new ArgumentException("linkto ($>) event expected", "event");
-
-			_loadingItemsCount++;
-
-			var item = new Item(tag);
-			_loadQueue.Push(item);
-			//NOTE: we do manual link-to resolution as we write links to the position events
-			//      which may in turn be a link.  This is necessary to provide a correct
-			//       ResolvedEvent when replaying from the -order stream
-			var linkTo = Helper.UTF8NoBom.GetString(@event.Data.Span);
-			string[] parts = linkTo.Split(_linkToSeparator, 2);
-			long eventNumber = long.Parse(parts[0]);
-			string streamId = parts[1];
-
-			ReadPrerecordedEventStream(streamId, eventNumber, completed => {
-				switch (completed.Result) {
-					case ReadStreamResult.Success:
-					case ReadStreamResult.NoStream:
-					case ReadStreamResult.StreamDeleted:
-						if (completed.Events.Length == 1)
-							item.SetLoadedEvent(completed.Events[0]);
-						_loadingItemsCount--;
-						CheckAllEventsLoaded();
-						break;
-					default:
-						throw new Exception(string.Format("Cannot read {0}. Error: {1}", linkTo, completed.Error));
-				}
-			});
-		}
-
-		private void ReadPrerecordedEventStream(string streamId, long eventNumber,
-			Action<ClientMessage.ReadStreamEventsBackwardCompleted> action) {
-			_ioDispatcher.ReadBackward(
-				streamId, eventNumber, 1, true, SystemAccounts.System, action, () => {
-					_logger.Warning("Read backward of stream {stream} timed out. Retrying", streamId);
-					ReadPrerecordedEventStream(streamId, eventNumber, action);
-				}, Guid.NewGuid());
-		}
-
-		private void CheckAllEventsLoaded() {
-			CheckpointTag lastTag = null;
-			if (_orderStreamReadingCompleted && _loadingItemsCount == 0) {
-				var number = 0;
-				while (_loadQueue.Count > 0) {
-					var item = _loadQueue.Pop();
-					var @event = item._result;
-					lastTag = item.Tag;
-					if (@event.HasValue) {
-						SendPrerecordedEvent(@event.Value, lastTag, number);
-						number++;
-					}
-				}
-
-				_loadingItemsCount = -1; // completed - do not dispatch one more time
-				PrerecordedEventsLoaded(lastTag ?? _loadingPrerecordedEventsFrom);
-			}
-		}
-
-		private void SetOrderStreamReadCompleted() {
-			_orderStreamReadingCompleted = true;
-			CheckAllEventsLoaded();
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.EmittedStreamAwaiting message) {
-			if (_stopped)
-				return;
-			throw new NotImplementedException();
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.EmittedStreamWriteCompleted message) {
-			if (_stopped)
-				return;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/MultiStream/MultiStreamPositionTagger.cs b/src/EventStore.Projections.Core/Services/Processing/MultiStream/MultiStreamPositionTagger.cs
deleted file mode 100644
index d6fd9b000fc..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/MultiStream/MultiStreamPositionTagger.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Services.Processing.MultiStream {
-	public class MultiStreamPositionTagger : PositionTagger {
-		private readonly HashSet<string> _streams;
-
-		public MultiStreamPositionTagger(int phase, string[] streams) : base(phase) {
-			if (streams == null) throw new ArgumentNullException("streams");
-			if (streams.Length == 0) throw new ArgumentException("streams");
-			_streams = new HashSet<string>(streams);
-		}
-
-		public override bool IsMessageAfterCheckpointTag(
-			CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
-			if (previous.Phase < Phase)
-				return true;
-			if (previous.Mode_ != CheckpointTag.Mode.MultiStream)
-				throw new ArgumentException("Mode.MultiStream expected", "previous");
-			return _streams.Contains(committedEvent.Data.PositionStreamId)
-			       && committedEvent.Data.PositionSequenceNumber >
-			       previous.Streams[committedEvent.Data.PositionStreamId];
-		}
-
-		public override CheckpointTag MakeCheckpointTag(
-			CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
-			if (previous.Phase != Phase)
-				throw new ArgumentException(
-					string.Format("Invalid checkpoint tag phase.  Expected: {0} Was: {1}", Phase, previous.Phase));
-
-			if (!_streams.Contains(committedEvent.Data.PositionStreamId))
-				throw new InvalidOperationException(
-					string.Format("Invalid stream '{0}'", committedEvent.Data.EventStreamId));
-			return previous.UpdateStreamPosition(
-				committedEvent.Data.PositionStreamId, committedEvent.Data.PositionSequenceNumber);
-		}
-
-		public override CheckpointTag MakeCheckpointTag(CheckpointTag previous,
-			ReaderSubscriptionMessage.EventReaderPartitionEof partitionEof) {
-			throw new NotImplementedException();
-		}
-
-		public override CheckpointTag MakeCheckpointTag(CheckpointTag previous,
-			ReaderSubscriptionMessage.EventReaderPartitionDeleted partitionDeleted) {
-			throw new NotSupportedException();
-		}
-
-		public override CheckpointTag MakeZeroCheckpointTag() {
-			return CheckpointTag.FromStreamPositions(Phase,
-				_streams.ToDictionary(v => v, v => (long)ExpectedVersion.NoStream));
-		}
-
-		public override bool IsCompatible(CheckpointTag checkpointTag) {
-			//TODO: should Stream be supported here as well if in the set?
-			return checkpointTag.Mode_ == CheckpointTag.Mode.MultiStream
-			       && checkpointTag.Streams.All(v => _streams.Contains(v.Key));
-		}
-
-		public override CheckpointTag AdjustTag(CheckpointTag tag) {
-			if (tag.Phase < Phase)
-				return tag;
-			if (tag.Phase > Phase)
-				throw new ArgumentException(
-					string.Format("Invalid checkpoint tag phase.  Expected less or equal to: {0} Was: {1}", Phase,
-						tag.Phase), "tag");
-
-			if (tag.Mode_ == CheckpointTag.Mode.MultiStream) {
-				long p;
-				return CheckpointTag.FromStreamPositions(
-					tag.Phase, _streams.ToDictionary(v => v, v => tag.Streams.TryGetValue(v, out p) ? p : -1));
-			}
-
-			switch (tag.Mode_) {
-				case CheckpointTag.Mode.EventTypeIndex:
-					throw new NotSupportedException(
-						"Conversion from EventTypeIndex to MultiStream position tag is not supported");
-				case CheckpointTag.Mode.Stream:
-					long p;
-					return CheckpointTag.FromStreamPositions(
-						tag.Phase, _streams.ToDictionary(v => v, v => tag.Streams.TryGetValue(v, out p) ? p : -1));
-				case CheckpointTag.Mode.PreparePosition:
-					throw new NotSupportedException(
-						"Conversion from PreparePosition to MultiStream position tag is not supported");
-				case CheckpointTag.Mode.Position:
-					throw new NotSupportedException(
-						"Conversion from Position to MultiStream position tag is not supported");
-				default:
-					throw new NotSupportedException(string.Format(
-						"The given checkpoint is invalid. Possible causes might include having written an event to the projection's managed stream. The bad checkpoint: {0}",
-						tag.ToString()));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Partitioning/ByHandleStatePartitionSelector.cs b/src/EventStore.Projections.Core/Services/Processing/Partitioning/ByHandleStatePartitionSelector.cs
deleted file mode 100644
index f94e1be524d..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Partitioning/ByHandleStatePartitionSelector.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Services.Processing.Partitioning {
-	public class ByHandleStatePartitionSelector : StatePartitionSelector {
-		private readonly IProjectionStateHandler _handler;
-
-		public ByHandleStatePartitionSelector(IProjectionStateHandler handler) {
-			_handler = handler;
-		}
-
-		public override string GetStatePartition(EventReaderSubscriptionMessage.CommittedEventReceived @event) {
-			return _handler.GetStatePartition(@event.CheckpointTag, @event.EventCategory, @event.Data);
-		}
-
-		public override bool EventReaderBasePartitionDeletedIsSupported() {
-			return false;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Partitioning/ByStreamStatePartitionSelector.cs b/src/EventStore.Projections.Core/Services/Processing/Partitioning/ByStreamStatePartitionSelector.cs
deleted file mode 100644
index 60d4c7a75dc..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Partitioning/ByStreamStatePartitionSelector.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using EventStore.Core.Services;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using Newtonsoft.Json.Linq;
-
-namespace EventStore.Projections.Core.Services.Processing.Partitioning {
-	public class ByStreamStatePartitionSelector : StatePartitionSelector {
-		public override string GetStatePartition(EventReaderSubscriptionMessage.CommittedEventReceived @event) {
-			if (@event.Data.ResolvedLinkTo && @event.Data.PositionMetadata != null) {
-				var extra = @event.Data.PositionMetadata.ParseCheckpointExtraJson();
-				JToken v;
-				if (extra != null && extra.TryGetValue("$o", out v)) {
-					//TODO: handle exceptions properly
-					var originalStream = (string)((JValue)v).Value;
-					return originalStream;
-				}
-			}
-
-			var eventStreamId = @event.Data.EventStreamId;
-			return SystemStreams.IsMetastream(eventStreamId)
-				? eventStreamId.Substring("$$".Length)
-				: eventStreamId;
-		}
-
-		public override bool EventReaderBasePartitionDeletedIsSupported() {
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Partitioning/NoopStatePartitionSelector.cs b/src/EventStore.Projections.Core/Services/Processing/Partitioning/NoopStatePartitionSelector.cs
deleted file mode 100644
index 4c30addae76..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Partitioning/NoopStatePartitionSelector.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Services.Processing.Partitioning {
-	public class NoopStatePartitionSelector : StatePartitionSelector {
-		public override string GetStatePartition(EventReaderSubscriptionMessage.CommittedEventReceived @event) {
-			return "";
-		}
-
-		public override bool EventReaderBasePartitionDeletedIsSupported() {
-			return false;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Partitioning/PartitionState.cs b/src/EventStore.Projections.Core/Services/Processing/Partitioning/PartitionState.cs
deleted file mode 100644
index eff6c4d862c..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Partitioning/PartitionState.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace EventStore.Projections.Core.Services.Processing.Partitioning {
-	public class PartitionState {
-		private static readonly JsonSerializerSettings JsonSettings = new JsonSerializerSettings {
-			DateParseHandling = DateParseHandling.None,
-		};
-
-		public bool IsChanged(PartitionState newState) {
-			return State != newState.State || Result != newState.Result;
-		}
-
-		public static PartitionState Deserialize(string serializedState, CheckpointTag causedBy) {
-			if (serializedState == null)
-				return new PartitionState("", null, causedBy);
-
-			JToken state = null;
-			JToken result = null;
-
-			if (!string.IsNullOrEmpty(serializedState)) {
-				var deserialized = JsonConvert.DeserializeObject(serializedState, JsonSettings);
-				var array = deserialized as JArray;
-				if (array != null && array.Count > 0) {
-					state = array[0] as JToken;
-					if (array.Count == 2) {
-						result = array[1] as JToken;
-					}
-				} else {
-					state = deserialized as JObject;
-				}
-			}
-
-			var stateJson = state != null ? state.ToCanonicalJson() : "";
-			var resultJson = result != null ? result.ToCanonicalJson() : null;
-
-			return new PartitionState(stateJson, resultJson, causedBy);
-		}
-
-		private static void Error(JsonTextReader reader, string message) {
-			throw new Exception(string.Format("{0} (At: {1}, {2})", message, reader.LineNumber, reader.LinePosition));
-		}
-
-		private readonly string _state;
-		private readonly string _result;
-		private readonly CheckpointTag _causedBy;
-		private int _size;
-
-		public PartitionState(string state, string result, CheckpointTag causedBy) {
-			if (state == null) throw new ArgumentNullException("state");
-			if (causedBy == null) throw new ArgumentNullException("causedBy");
-
-			_state = state;
-			_result = result;
-			_causedBy = causedBy;
-			_size = _state.Length + _result?.Length ?? 0;
-		}
-
-		public string State {
-			get { return _state; }
-		}
-
-		public CheckpointTag CausedBy {
-			get { return _causedBy; }
-		}
-
-		public string Result {
-			get { return _result; }
-		}
-
-		public int Size {
-			get { return _size; }
-		}
-
-		public string Serialize() {
-			var state = _state;
-			if (state == "" && Result != null)
-				throw new Exception("state == \"\" && Result != null");
-			return Result != null
-				? "[" + state + "," + _result + "]"
-				: "[" + state + "]";
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Partitioning/PartitionStateCache.cs b/src/EventStore.Projections.Core/Services/Processing/Partitioning/PartitionStateCache.cs
deleted file mode 100644
index f2e7fe856ce..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Partitioning/PartitionStateCache.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Services.Processing.Partitioning {
-	public class PartitionStateCache {
-		private readonly int _maxCachedPartitions;
-
-		private readonly LinkedList<Tuple<CheckpointTag, string>> _cacheOrder =
-			new LinkedList<Tuple<CheckpointTag, string>>();
-
-		private readonly Dictionary<string, Tuple<PartitionState, CheckpointTag>> _partitionStates =
-			new Dictionary<string, Tuple<PartitionState, CheckpointTag>>();
-
-		private int _cachedItemCount;
-
-		private CheckpointTag _unlockedBefore;
-		private readonly CheckpointTag _zeroPosition;
-
-		public PartitionStateCache(int maxCachedPartitions = 4000) {
-			_zeroPosition = CheckpointTag.Empty;
-			_unlockedBefore = CheckpointTag.Empty;
-			_maxCachedPartitions = maxCachedPartitions;
-		}
-
-		public int CachedItemCount {
-			get { return _cachedItemCount; }
-		}
-
-		public void Initialize() {
-			_partitionStates.Clear();
-			_cachedItemCount = 0;
-
-			_cacheOrder.Clear();
-			_unlockedBefore = _zeroPosition;
-		}
-
-		public void CacheAndLockPartitionState(string partition, PartitionState data, CheckpointTag at) {
-			if (partition == null) throw new ArgumentNullException("partition");
-			if (data == null) throw new ArgumentNullException("data");
-			EnsureCanLockPartitionAt(partition, at);
-
-			_partitionStates[partition] = Tuple.Create(data, at);
-			_cachedItemCount = _partitionStates.Count;
-
-			if (!string.IsNullOrEmpty(partition)) // cached forever - for root state
-				_cacheOrder.AddLast(Tuple.Create(at, partition));
-			CleanUp();
-		}
-
-		public void CachePartitionState(string partition, PartitionState data) {
-			if (partition == null) throw new ArgumentNullException("partition");
-			if (data == null) throw new ArgumentNullException("data");
-
-			_partitionStates[partition] = Tuple.Create(data, _zeroPosition);
-			_cachedItemCount = _partitionStates.Count;
-
-			_cacheOrder.AddFirst(Tuple.Create(_zeroPosition, partition));
-			CleanUp();
-		}
-
-		public PartitionState TryGetAndLockPartitionState(string partition, CheckpointTag lockAt) {
-			if (partition == null) throw new ArgumentNullException("partition");
-			Tuple<PartitionState, CheckpointTag> stateData;
-			if (!_partitionStates.TryGetValue(partition, out stateData))
-				return null;
-			EnsureCanLockPartitionAt(partition, lockAt);
-			if (lockAt != null && lockAt <= stateData.Item2)
-				throw new InvalidOperationException(
-					string.Format(
-						"Attempt to relock the '{0}' partition state locked at the '{1}' position at the earlier position '{2}'",
-						partition, stateData.Item2, lockAt));
-
-			_partitionStates[partition] = Tuple.Create(stateData.Item1, lockAt);
-			_cachedItemCount = _partitionStates.Count;
-
-			if (!string.IsNullOrEmpty(partition)) // cached forever - for root state
-				_cacheOrder.AddLast(Tuple.Create(lockAt, partition));
-			CleanUp();
-			return stateData.Item1;
-		}
-
-		public PartitionState TryGetPartitionState(string partition) {
-			if (partition == null) throw new ArgumentNullException("partition");
-			Tuple<PartitionState, CheckpointTag> stateData;
-			if (!_partitionStates.TryGetValue(partition, out stateData))
-				return null;
-			return stateData.Item1;
-		}
-
-		public PartitionState GetLockedPartitionState(string partition) {
-			Tuple<PartitionState, CheckpointTag> stateData;
-			if (!_partitionStates.TryGetValue(partition, out stateData)) {
-				throw new InvalidOperationException(
-					string.Format(
-						"Partition '{0}' state was requested as locked but it is missing in the cache.", partition));
-			}
-
-			if (stateData.Item2 != null && stateData.Item2 <= _unlockedBefore)
-				throw new InvalidOperationException(
-					string.Format(
-						"Partition '{0}' state was requested as locked but it is cached as unlocked", partition));
-			return stateData.Item1;
-		}
-
-		public void Unlock(CheckpointTag beforeCheckpoint, bool forgetUnlocked = false) {
-			_unlockedBefore = beforeCheckpoint;
-			CleanUp(removeAllUnlocked: forgetUnlocked);
-		}
-
-		private void CleanUp(bool removeAllUnlocked = false) {
-			while (removeAllUnlocked || _cacheOrder.Count > _maxCachedPartitions * 5
-			                         || CachedItemCount > _maxCachedPartitions) {
-				if (_cacheOrder.Count == 0)
-					break;
-				Tuple<CheckpointTag, string> top = _cacheOrder.FirstOrDefault();
-				if (top.Item1 >= _unlockedBefore)
-					break; // other entries were locked after the checkpoint (or almost .. order is not very strong)
-				_cacheOrder.RemoveFirst();
-				Tuple<PartitionState, CheckpointTag> entry;
-				if (!_partitionStates.TryGetValue(top.Item2, out entry))
-					continue; // already removed
-				if (entry.Item2 >= _unlockedBefore)
-					continue; // was relocked
-
-				_partitionStates.Remove(top.Item2);
-				_cachedItemCount = _partitionStates.Count;
-			}
-		}
-
-		private void EnsureCanLockPartitionAt(string partition, CheckpointTag at) {
-			if (partition == null) throw new ArgumentNullException("partition");
-			if (at == null && partition != "")
-				throw new InvalidOperationException("Only the root partition can be locked forever");
-			if (partition == "" && at != null)
-				throw new InvalidOperationException("Root partition must be locked forever");
-			if (at != null && at <= _unlockedBefore)
-				throw new InvalidOperationException(
-					string.Format(
-						"Attempt to lock the '{0}' partition state at the position '{1}' before the unlocked position '{2}'",
-						partition, at, _unlockedBefore));
-		}
-
-		public IEnumerable<Tuple<string, PartitionState>> Enumerate() {
-			return _partitionStates.Select(v => Tuple.Create(v.Key, v.Value.Item1)).ToList();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Partitioning/PartitionStateUpdateManager.cs b/src/EventStore.Projections.Core/Services/Processing/Partitioning/PartitionStateUpdateManager.cs
deleted file mode 100644
index 5a38b71e99a..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Partitioning/PartitionStateUpdateManager.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Services.Processing.Partitioning {
-	public class PartitionStateUpdateManager {
-		private class State {
-			public PartitionState PartitionState;
-			public CheckpointTag ExpectedTag;
-		}
-
-		private readonly Dictionary<string, State> _states = new Dictionary<string, State>();
-		private readonly ProjectionNamesBuilder _namingBuilder;
-
-		private readonly EmittedStream.WriterConfiguration.StreamMetadata _partitionCheckpointStreamMetadata =
-			new EmittedStream.WriterConfiguration.StreamMetadata(maxCount: 2);
-
-		public PartitionStateUpdateManager(ProjectionNamesBuilder namingBuilder) {
-			if (namingBuilder == null) throw new ArgumentNullException("namingBuilder");
-			_namingBuilder = namingBuilder;
-		}
-
-		public void StateUpdated(string partition, PartitionState state, CheckpointTag basedOn) {
-			State stateEntry;
-			if (_states.TryGetValue(partition, out stateEntry)) {
-				stateEntry.PartitionState = state;
-			} else {
-				_states.Add(partition, new State {PartitionState = state, ExpectedTag = basedOn});
-			}
-		}
-
-		public void EmitEvents(IEventWriter eventWriter) {
-			if (_states.Count > 0) {
-				var list = new List<EmittedEventEnvelope>();
-				foreach (var entry in _states) {
-					var partition = entry.Key;
-					var streamId = _namingBuilder.MakePartitionCheckpointStreamName(partition);
-					var data = entry.Value.PartitionState.Serialize();
-					var causedBy = entry.Value.PartitionState.CausedBy;
-					var expectedTag = entry.Value.ExpectedTag;
-					list.Add(
-						new EmittedEventEnvelope(
-							new EmittedDataEvent(
-								streamId, Guid.NewGuid(), ProjectionEventTypes.PartitionCheckpoint, true,
-								data, null, causedBy, expectedTag), _partitionCheckpointStreamMetadata));
-				}
-
-				//NOTE: order yb is required to satisfy internal emit events validation
-				// which ensures that events are ordered by causedBy tag.
-				// it is too strong check, but ...
-				eventWriter.ValidateOrderAndEmitEvents(list.OrderBy(v => v.Event.CausedByTag).ToArray());
-			}
-		}
-
-		public void PartitionCompleted(string partition) {
-			_states.Remove(partition);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Partitioning/StatePartitionSelector.cs b/src/EventStore.Projections.Core/Services/Processing/Partitioning/StatePartitionSelector.cs
deleted file mode 100644
index 34d445b5ba8..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Partitioning/StatePartitionSelector.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Services.Processing.Partitioning {
-	public abstract class StatePartitionSelector {
-		public abstract string GetStatePartition(EventReaderSubscriptionMessage.CommittedEventReceived @event);
-		public abstract bool EventReaderBasePartitionDeletedIsSupported();
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Phases/EventProcessingProjectionProcessingPhase.cs b/src/EventStore.Projections.Core/Services/Processing/Phases/EventProcessingProjectionProcessingPhase.cs
deleted file mode 100644
index b34625677b4..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Phases/EventProcessingProjectionProcessingPhase.cs
+++ /dev/null
@@ -1,386 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
-using EventStore.Core.Bus;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using EventStore.Projections.Core.Services.Processing.WorkItems;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Projections.Core.Services.Processing.Phases {
-	public class EventProcessingProjectionProcessingPhase : EventSubscriptionBasedProjectionProcessingPhase,
-		IHandle<EventReaderSubscriptionMessage.CommittedEventReceived>,
-		IHandle<EventReaderSubscriptionMessage.PartitionEofReached>,
-		IHandle<EventReaderSubscriptionMessage.PartitionDeleted>,
-		IEventProcessingProjectionPhase {
-		private readonly IProjectionStateHandler _projectionStateHandler;
-		private readonly bool _definesStateTransform;
-		private readonly StatePartitionSelector _statePartitionSelector;
-		private readonly bool _isBiState;
-
-		private string _handlerPartition;
-
-		//private bool _sharedStateSet;
-		private readonly Stopwatch _stopwatch;
-
-
-		public EventProcessingProjectionProcessingPhase(
-			CoreProjection coreProjection,
-			Guid projectionCorrelationId,
-			IPublisher publisher,
-			IPublisher inputQueue,
-			ProjectionConfig projectionConfig,
-			Action updateStatistics,
-			IProjectionStateHandler projectionStateHandler,
-			PartitionStateCache partitionStateCache,
-			bool definesStateTransform,
-			string projectionName,
-			ILogger logger,
-			CheckpointTag zeroCheckpointTag,
-			ICoreProjectionCheckpointManager coreProjectionCheckpointManager,
-			StatePartitionSelector statePartitionSelector,
-			ReaderSubscriptionDispatcher subscriptionDispatcher,
-			IReaderStrategy readerStrategy,
-			IResultWriter resultWriter,
-			bool useCheckpoints,
-			bool stopOnEof,
-			bool isBiState,
-			bool orderedPartitionProcessing,
-			IEmittedStreamsTracker emittedStreamsTracker,
-			bool enableContentTypeValidation)
-			: base(
-				publisher,
-				inputQueue,
-				coreProjection,
-				projectionCorrelationId,
-				coreProjectionCheckpointManager,
-				projectionConfig,
-				projectionName,
-				logger,
-				zeroCheckpointTag,
-				partitionStateCache,
-				resultWriter,
-				updateStatistics,
-				subscriptionDispatcher,
-				readerStrategy,
-				useCheckpoints,
-				stopOnEof,
-				orderedPartitionProcessing,
-				isBiState,
-				emittedStreamsTracker,
-				enableContentTypeValidation) {
-			_projectionStateHandler = projectionStateHandler;
-			_definesStateTransform = definesStateTransform;
-			_statePartitionSelector = statePartitionSelector;
-			_isBiState = isBiState;
-
-			_stopwatch = new Stopwatch();
-		}
-
-		public void Handle(EventReaderSubscriptionMessage.CommittedEventReceived message) {
-			//TODO:  make sure this is no longer required : if (_state != State.StateLoaded)
-			if (IsOutOfOrderSubscriptionMessage(message))
-				return;
-			RegisterSubscriptionMessage(message);
-			try {
-				CheckpointTag eventTag = message.CheckpointTag;
-				var committedEventWorkItem = new CommittedEventWorkItem(this, message, _statePartitionSelector);
-				_processingQueue.EnqueueTask(committedEventWorkItem, eventTag);
-				if (_state == PhaseState.Running) // prevent processing mostly one projection
-					EnsureTickPending();
-			} catch (Exception ex) {
-				_coreProjection.SetFaulted(ex);
-			}
-		}
-
-		public void Handle(EventReaderSubscriptionMessage.PartitionDeleted message) {
-			//TODO:  make sure this is no longer required : if (_state != State.StateLoaded)
-			if (IsOutOfOrderSubscriptionMessage(message))
-				return;
-			RegisterSubscriptionMessage(message);
-			try {
-				if (_statePartitionSelector.EventReaderBasePartitionDeletedIsSupported()) {
-					var partitionDeletedWorkItem = new PartitionDeletedWorkItem(this, message);
-					_processingQueue.EnqueueOutOfOrderTask(partitionDeletedWorkItem);
-					if (_state == PhaseState.Running) // prevent processing mostly one projection
-						EnsureTickPending();
-				}
-			} catch (Exception ex) {
-				_coreProjection.SetFaulted(ex);
-			}
-		}
-
-		public void Handle(EventReaderSubscriptionMessage.PartitionEofReached message) {
-			if (IsOutOfOrderSubscriptionMessage(message))
-				return;
-			RegisterSubscriptionMessage(message);
-			try {
-				var partitionCompletedWorkItem = new PartitionCompletedWorkItem(
-					this, _checkpointManager, message.Partition, message.CheckpointTag);
-				_processingQueue.EnqueueTask(
-					partitionCompletedWorkItem, message.CheckpointTag, allowCurrentPosition: true);
-				ProcessEvent();
-			} catch (Exception ex) {
-				_coreProjection.SetFaulted(ex);
-			}
-		}
-
-		public EventProcessedResult ProcessCommittedEvent(
-			EventReaderSubscriptionMessage.CommittedEventReceived message, string partition) {
-			switch (_state) {
-				case PhaseState.Running:
-					var result = InternalProcessCommittedEvent(partition, message);
-					return result;
-				case PhaseState.Stopped:
-					_logger.Error("Ignoring committed event in stopped state");
-					return null;
-				default:
-					throw new NotSupportedException();
-			}
-		}
-
-		public EventProcessedResult ProcessPartitionDeleted(string partition, CheckpointTag deletedPosition) {
-			switch (_state) {
-				case PhaseState.Running:
-					var result = InternalProcessPartitionDeleted(partition, deletedPosition);
-					return result;
-				case PhaseState.Stopped:
-					_logger.Error("Ignoring committed event in stopped state");
-					return null;
-				default:
-					throw new NotSupportedException();
-			}
-		}
-
-		private EventProcessedResult InternalProcessCommittedEvent(
-			string partition, EventReaderSubscriptionMessage.CommittedEventReceived message) {
-			string newState;
-			string projectionResult;
-			EmittedEventEnvelope[] emittedEvents;
-			//TODO: support shared state
-			string newSharedState;
-			var hasBeenProcessed = SafeProcessEventByHandler(
-				partition, message, out newState, out newSharedState, out projectionResult, out emittedEvents);
-			if (hasBeenProcessed) {
-				var newPartitionState = new PartitionState(newState, projectionResult, message.CheckpointTag);
-				var newSharedPartitionState = newSharedState != null
-					? new PartitionState(newSharedState, null, message.CheckpointTag)
-					: null;
-
-				return InternalCommittedEventProcessed(
-					partition, message, emittedEvents, newPartitionState, newSharedPartitionState);
-			}
-
-			return null;
-		}
-
-		private EventProcessedResult InternalProcessPartitionDeleted(
-			string partition, CheckpointTag deletedPosition) {
-			string newState;
-			string projectionResult;
-			var hasBeenProcessed = SafeProcessPartitionDeletedByHandler(
-				partition, deletedPosition, out newState, out projectionResult);
-			if (hasBeenProcessed) {
-				var newPartitionState = new PartitionState(newState, projectionResult, deletedPosition);
-
-				return InternalPartitionDeletedProcessed(partition, deletedPosition, newPartitionState);
-			}
-
-			return null;
-		}
-
-		private bool SafeProcessEventByHandler(
-			string partition, EventReaderSubscriptionMessage.CommittedEventReceived message, out string newState,
-			out string newSharedState, out string projectionResult, out EmittedEventEnvelope[] emittedEvents) {
-			projectionResult = null;
-			//TODO: not emitting (optimized) projection handlers can skip serializing state on each processed event
-			bool hasBeenProcessed;
-			try {
-				hasBeenProcessed = ProcessEventByHandler(
-					partition, message, out newState, out newSharedState, out projectionResult, out emittedEvents);
-			} catch (Exception ex) {
-				// update progress to reflect exact fault position
-				_checkpointManager.Progress(message.Progress);
-				SetFaulting(
-					String.Format(
-						"The {0} projection failed to process an event.\r\nHandler: {1}\r\nEvent Position: {2}\r\n\r\nMessage:\r\n\r\n{3}",
-						_projectionName, GetHandlerTypeName(), message.CheckpointTag, ex.Message), ex);
-				newState = null;
-				newSharedState = null;
-				emittedEvents = null;
-				hasBeenProcessed = false;
-			}
-
-			newState = newState ?? "";
-			return hasBeenProcessed;
-		}
-
-		private bool SafeProcessPartitionDeletedByHandler(
-			string partition, CheckpointTag deletedPosition, out string newState,
-			out string projectionResult) {
-			projectionResult = null;
-			//TODO: not emitting (optimized) projection handlers can skip serializing state on each processed event
-			bool hasBeenProcessed;
-			try {
-				hasBeenProcessed = ProcessPartitionDeletedByHandler(
-					partition, deletedPosition, out newState, out projectionResult);
-			} catch (Exception ex) {
-				SetFaulting(
-					String.Format(
-						"The {0} projection failed to process a delete partition notification.\r\nHandler: {1}\r\nEvent Position: {2}\r\n\r\nMessage:\r\n\r\n{3}",
-						_projectionName, GetHandlerTypeName(), deletedPosition, ex.Message), ex);
-				newState = null;
-				hasBeenProcessed = false;
-			}
-
-			newState = newState ?? "";
-			return hasBeenProcessed;
-		}
-
-		private string GetHandlerTypeName() {
-			return _projectionStateHandler.GetType().Namespace + "." + _projectionStateHandler.GetType().Name;
-		}
-
-		private bool ProcessEventByHandler(
-			string partition, EventReaderSubscriptionMessage.CommittedEventReceived message, out string newState,
-			out string newSharedState, out string projectionResult, out EmittedEventEnvelope[] emittedEvents) {
-			projectionResult = null;
-			var newPatitionInitialized = InitOrLoadHandlerState(partition);
-			_stopwatch.Start();
-			EmittedEventEnvelope[] eventsEmittedOnInitialization = null;
-			if (newPatitionInitialized) {
-				_projectionStateHandler.ProcessPartitionCreated(
-					partition, message.CheckpointTag, message.Data, out eventsEmittedOnInitialization);
-			}
-
-			var result = _projectionStateHandler.ProcessEvent(
-				partition, message.CheckpointTag, message.EventCategory, message.Data, out newState, out newSharedState,
-				out emittedEvents);
-			if (result) {
-				var oldState = _partitionStateCache.GetLockedPartitionState(partition);
-				//TODO: depending on query processing final state to result transformation should happen either here (if EOF) on while writing results
-				if ( /*_producesRunningResults && */oldState.State != newState) {
-					if (_definesStateTransform) {
-						projectionResult = _projectionStateHandler.TransformStateToResult();
-					} else {
-						projectionResult = newState;
-					}
-				} else {
-					projectionResult = oldState.Result;
-				}
-			}
-
-			_stopwatch.Stop();
-			if (eventsEmittedOnInitialization != null) {
-				if (emittedEvents == null || emittedEvents.Length == 0)
-					emittedEvents = eventsEmittedOnInitialization;
-				else
-					emittedEvents = eventsEmittedOnInitialization.Concat(emittedEvents).ToArray();
-			}
-
-			return result;
-		}
-
-		private bool ProcessPartitionDeletedByHandler(
-			string partition, CheckpointTag deletePosition, out string newState,
-			out string projectionResult) {
-			projectionResult = null;
-			InitOrLoadHandlerState(partition);
-			_stopwatch.Start();
-			var result = _projectionStateHandler.ProcessPartitionDeleted(
-				partition, deletePosition, out newState);
-			if (result) {
-				var oldState = _partitionStateCache.GetLockedPartitionState(partition);
-				//TODO: depending on query processing final state to result transformation should happen either here (if EOF) on while writing results
-				if ( /*_producesRunningResults && */oldState.State != newState) {
-					if (_definesStateTransform) {
-						projectionResult = _projectionStateHandler.TransformStateToResult();
-					} else {
-						projectionResult = newState;
-					}
-				} else {
-					projectionResult = oldState.Result;
-				}
-			}
-
-			_stopwatch.Stop();
-			return result;
-		}
-
-		/// <summary>
-		/// initializes or loads existing partition state
-		/// </summary>
-		/// <param name="partition"></param>
-		/// <returns>true - if new partition state was initialized</returns>
-		private bool InitOrLoadHandlerState(string partition) {
-			if (_handlerPartition == partition)
-				return false;
-
-			var newState = _partitionStateCache.GetLockedPartitionState(partition);
-			_handlerPartition = partition;
-			var initialized = false;
-			if (newState != null && !String.IsNullOrEmpty(newState.State))
-				_projectionStateHandler.Load(newState.State);
-			else {
-				initialized = true;
-				_projectionStateHandler.Initialize();
-			}
-
-			//if (!_sharedStateSet && _isBiState)
-			if (_isBiState) {
-				var newSharedState = _partitionStateCache.GetLockedPartitionState("");
-				if (newSharedState != null && !String.IsNullOrEmpty(newSharedState.State))
-					_projectionStateHandler.LoadShared(newSharedState.State);
-				else
-					_projectionStateHandler.InitializeShared();
-			}
-
-			return initialized;
-		}
-
-		public override void NewCheckpointStarted(CheckpointTag at) {
-			if (!(_state == PhaseState.Running || _state == PhaseState.Starting)) {
-				_logger.Debug("Starting a checkpoint in non-runnable state");
-				return;
-			}
-
-			var checkpointHandler = _projectionStateHandler as IProjectionCheckpointHandler;
-			if (checkpointHandler != null) {
-				EmittedEventEnvelope[] emittedEvents;
-				try {
-					checkpointHandler.ProcessNewCheckpoint(at, out emittedEvents);
-				} catch (Exception ex) {
-					var faultedReason =
-						String.Format(
-							"The {0} projection failed to process a checkpoint start.\r\nHandler: {1}\r\nEvent Position: {2}\r\n\r\nMessage:\r\n\r\n{3}",
-							_projectionName, GetHandlerTypeName(), at, ex.Message);
-					SetFaulting(faultedReason, ex);
-					emittedEvents = null;
-				}
-
-				if (emittedEvents != null && emittedEvents.Length > 0) {
-					if (!ValidateEmittedEvents(emittedEvents))
-						return;
-
-					if (_state == PhaseState.Running || _state == PhaseState.Starting)
-						_resultWriter.EventsEmitted(
-							emittedEvents, Guid.Empty, correlationId: null);
-				}
-			}
-		}
-
-		public override void GetStatistics(ProjectionStatistics info) {
-			base.GetStatistics(info);
-			info.CoreProcessingTime = _stopwatch.ElapsedMilliseconds;
-		}
-
-		public override void Dispose() {
-			if (_projectionStateHandler != null)
-				_projectionStateHandler.Dispose();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Phases/EventSubscriptionBasedProjectionProcessingPhase.ProgressResultWriter.cs b/src/EventStore.Projections.Core/Services/Processing/Phases/EventSubscriptionBasedProjectionProcessingPhase.ProgressResultWriter.cs
deleted file mode 100644
index bfe6a04a2ee..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Phases/EventSubscriptionBasedProjectionProcessingPhase.ProgressResultWriter.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using EventStore.Projections.Core.Services.Processing.Strategies;
-
-namespace EventStore.Projections.Core.Services.Processing.Phases;
-
-public abstract partial class EventSubscriptionBasedProjectionProcessingPhase
-{
-	internal class ProgressResultWriter : IProgressResultWriter {
-		private readonly EventSubscriptionBasedProjectionProcessingPhase _phase;
-		private readonly IResultWriter _resultWriter;
-
-		public ProgressResultWriter(EventSubscriptionBasedProjectionProcessingPhase phase,
-			IResultWriter resultWriter) {
-			_phase = phase;
-			_resultWriter = resultWriter;
-		}
-
-		public void WriteProgress(float progress) {
-			_resultWriter.WriteProgress(_phase._currentSubscriptionId, progress);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Phases/EventSubscriptionBasedProjectionProcessingPhase.cs b/src/EventStore.Projections.Core/Services/Processing/Phases/EventSubscriptionBasedProjectionProcessingPhase.cs
deleted file mode 100644
index 3f4108e7493..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Phases/EventSubscriptionBasedProjectionProcessingPhase.cs
+++ /dev/null
@@ -1,580 +0,0 @@
-using System;
-using System.Diagnostics.Contracts;
-using System.Linq;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Settings;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Messaging;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
-using EventStore.Projections.Core.Services.Processing.WorkItems;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Projections.Core.Services.Processing.Phases {
-	public abstract partial class EventSubscriptionBasedProjectionProcessingPhase : IProjectionPhaseCompleter,
-		IProjectionPhaseCheckpointManager,
-		IHandle<EventReaderSubscriptionMessage.ProgressChanged>,
-		IHandle<EventReaderSubscriptionMessage.SubscriptionStarted>,
-		IHandle<EventReaderSubscriptionMessage.NotAuthorized>,
-		IHandle<EventReaderSubscriptionMessage.EofReached>,
-		IHandle<EventReaderSubscriptionMessage.CheckpointSuggested>,
-		IHandle<EventReaderSubscriptionMessage.ReaderAssignedReader>,
-		IHandle<EventReaderSubscriptionMessage.Failed>,
-		IHandle<EventReaderSubscriptionMessage.SubscribeTimeout>,
-		IProjectionProcessingPhase,
-		IProjectionPhaseStateManager {
-		protected readonly IPublisher _publisher;
-		private readonly IPublisher _inputQueue;
-		protected readonly ICoreProjectionForProcessingPhase _coreProjection;
-		protected readonly Guid _projectionCorrelationId;
-		protected readonly ICoreProjectionCheckpointManager _checkpointManager;
-		protected readonly IProgressResultWriter _progressResultWriter;
-		protected readonly ProjectionConfig _projectionConfig;
-		protected readonly string _projectionName;
-		protected readonly Serilog.ILogger _logger;
-		protected readonly CheckpointTag _zeroCheckpointTag;
-		protected readonly CoreProjectionQueue _processingQueue;
-		protected readonly PartitionStateCache _partitionStateCache;
-		protected readonly ReaderSubscriptionDispatcher _subscriptionDispatcher;
-		protected readonly IReaderStrategy _readerStrategy;
-		protected readonly IResultWriter _resultWriter;
-		protected readonly bool _useCheckpoints;
-		protected long _expectedSubscriptionMessageSequenceNumber = -1;
-		protected Guid _currentSubscriptionId;
-		protected PhaseSubscriptionState _subscriptionState;
-		protected PhaseState _state;
-		protected readonly bool _stopOnEof;
-		private readonly bool _isBiState;
-		protected readonly IEmittedStreamsTracker _emittedStreamsTracker;
-		protected readonly bool _enableContentTypeValidation;
-
-		private readonly Action _updateStatistics;
-
-		protected EventSubscriptionBasedProjectionProcessingPhase(
-			IPublisher publisher,
-			IPublisher inputQueue,
-			ICoreProjectionForProcessingPhase coreProjection,
-			Guid projectionCorrelationId,
-			ICoreProjectionCheckpointManager checkpointManager,
-			ProjectionConfig projectionConfig,
-			string projectionName,
-			ILogger logger,
-			CheckpointTag zeroCheckpointTag,
-			PartitionStateCache partitionStateCache,
-			IResultWriter resultWriter,
-			Action updateStatistics,
-			ReaderSubscriptionDispatcher subscriptionDispatcher,
-			IReaderStrategy readerStrategy,
-			bool useCheckpoints,
-			bool stopOnEof,
-			bool orderedPartitionProcessing,
-			bool isBiState,
-			IEmittedStreamsTracker emittedStreamsTracker,
-			bool enableContentTypeValidation) {
-			_publisher = publisher;
-			_inputQueue = inputQueue;
-			_coreProjection = coreProjection;
-			_projectionCorrelationId = projectionCorrelationId;
-			_checkpointManager = checkpointManager;
-			_projectionConfig = projectionConfig;
-			_projectionName = projectionName;
-			_logger = logger;
-			_zeroCheckpointTag = zeroCheckpointTag;
-			_partitionStateCache = partitionStateCache;
-			_resultWriter = resultWriter;
-			_updateStatistics = updateStatistics;
-			_processingQueue = new CoreProjectionQueue(publisher,
-				projectionConfig.PendingEventsThreshold,
-				orderedPartitionProcessing);
-			_processingQueue.EnsureTickPending += EnsureTickPending;
-			_subscriptionDispatcher = subscriptionDispatcher;
-			_readerStrategy = readerStrategy;
-			_useCheckpoints = useCheckpoints;
-			_stopOnEof = stopOnEof;
-			_isBiState = isBiState;
-			_progressResultWriter = new ProgressResultWriter(this, _resultWriter);
-			_inutQueueEnvelope = _inputQueue;
-			_emittedStreamsTracker = emittedStreamsTracker;
-			_enableContentTypeValidation = enableContentTypeValidation;
-		}
-
-		public void UnlockAndForgetBefore(CheckpointTag checkpointTag) {
-			_partitionStateCache.Unlock(checkpointTag, forgetUnlocked: true);
-		}
-
-		public CheckpointTag LastProcessedEventPosition {
-			get { return _coreProjection.LastProcessedEventPosition; }
-		}
-
-		public ICoreProjectionCheckpointManager CheckpointManager {
-			get { return _checkpointManager; }
-		}
-
-		public IEmittedStreamsTracker EmittedStreamsTracker {
-			get { return _emittedStreamsTracker; }
-		}
-
-		protected bool IsOutOfOrderSubscriptionMessage(EventReaderSubscriptionMessageBase message) {
-			if (_currentSubscriptionId != message.SubscriptionId)
-				return true;
-			if (_expectedSubscriptionMessageSequenceNumber != message.SubscriptionMessageSequenceNumber)
-				throw new InvalidOperationException("Out of order message detected");
-			return false;
-		}
-
-		protected void RegisterSubscriptionMessage(EventReaderSubscriptionMessageBase message) {
-			_expectedSubscriptionMessageSequenceNumber = message.SubscriptionMessageSequenceNumber + 1;
-		}
-
-		protected void EnsureTickPending() {
-			_coreProjection.EnsureTickPending();
-		}
-
-		public void ProcessEvent() {
-			_processingQueue.ProcessEvent();
-			EnsureUpdateStatisticksTickPending();
-		}
-
-		private void EnsureUpdateStatisticksTickPending() {
-			if (_updateStatisticsTicketPending)
-				return;
-			_updateStatisticsTicketPending = true;
-			_publisher.Publish(
-				TimerMessage.Schedule.Create(
-					_updateInterval,
-					_inutQueueEnvelope,
-					new UnwrapEnvelopeMessage(MarkTicketReceivedAndUpdateStatistics)));
-		}
-
-		private void MarkTicketReceivedAndUpdateStatistics() {
-			_updateStatisticsTicketPending = false;
-			UpdateStatistics();
-		}
-
-		private void UpdateStatistics() {
-			if (_updateStatistics != null)
-				_updateStatistics();
-		}
-
-		public void Handle(EventReaderSubscriptionMessage.ProgressChanged message) {
-			if (IsOutOfOrderSubscriptionMessage(message))
-				return;
-			RegisterSubscriptionMessage(message);
-			try {
-				var progressWorkItem =
-					new ProgressWorkItem(_checkpointManager, _progressResultWriter, message.Progress);
-				_processingQueue.EnqueueTask(progressWorkItem, message.CheckpointTag, allowCurrentPosition: true);
-				ProcessEvent();
-			} catch (Exception ex) {
-				_coreProjection.SetFaulted(ex);
-			}
-		}
-
-		public void Handle(EventReaderSubscriptionMessage.SubscriptionStarted message) {
-			if (IsOutOfOrderSubscriptionMessage(message))
-				return;
-			RegisterSubscriptionMessage(message);
-			try {
-				_subscriptionStartedAtLastCommitPosition = message.StartingLastCommitPosition;
-			} catch (Exception ex) {
-				_coreProjection.SetFaulted(ex);
-			}
-		}
-
-		public void Handle(EventReaderSubscriptionMessage.NotAuthorized message) {
-			if (IsOutOfOrderSubscriptionMessage(message))
-				return;
-			RegisterSubscriptionMessage(message);
-			try {
-				var progressWorkItem = new NotAuthorizedWorkItem();
-				_processingQueue.EnqueueTask(progressWorkItem, message.CheckpointTag, allowCurrentPosition: true);
-				ProcessEvent();
-			} catch (Exception ex) {
-				_coreProjection.SetFaulted(ex);
-			}
-		}
-
-		public void Unsubscribed() {
-			_subscriptionDispatcher.Cancel(_projectionCorrelationId);
-			_subscriptionState = PhaseSubscriptionState.Unsubscribed;
-			_processingQueue.Unsubscribed();
-		}
-
-		public void Handle(EventReaderSubscriptionMessage.EofReached message) {
-			if (IsOutOfOrderSubscriptionMessage(message))
-				return;
-			RegisterSubscriptionMessage(message);
-			try {
-				Unsubscribed();
-				var completedWorkItem = new CompletedWorkItem(this);
-				_processingQueue.EnqueueTask(completedWorkItem, message.CheckpointTag, allowCurrentPosition: true);
-				ProcessEvent();
-			} catch (Exception ex) {
-				_coreProjection.SetFaulted(ex);
-			}
-		}
-
-		public void Handle(EventReaderSubscriptionMessage.CheckpointSuggested message) {
-			if (IsOutOfOrderSubscriptionMessage(message))
-				return;
-			RegisterSubscriptionMessage(message);
-			try {
-				if (_useCheckpoints) {
-					CheckpointTag checkpointTag = message.CheckpointTag;
-					var checkpointSuggestedWorkItem =
-						new CheckpointSuggestedWorkItem(this, message, _checkpointManager);
-					_processingQueue.EnqueueTask(checkpointSuggestedWorkItem, checkpointTag,
-						allowCurrentPosition: true);
-				}
-
-				ProcessEvent();
-			} catch (Exception ex) {
-				_coreProjection.SetFaulted(ex);
-			}
-		}
-
-		public void Handle(CoreProjectionManagementMessage.GetState message) {
-			try {
-				var getStateWorkItem = new GetStateWorkItem(
-					_publisher, message.CorrelationId, message.ProjectionId, this, message.Partition);
-				_processingQueue.EnqueueOutOfOrderTask(getStateWorkItem);
-				ProcessEvent();
-			} catch (Exception ex) {
-				_publisher.Publish(
-					new CoreProjectionStatusMessage.StateReport(
-						message.CorrelationId, _projectionCorrelationId, message.Partition, state: null,
-						position: null));
-				_coreProjection.SetFaulted(ex);
-			}
-		}
-
-		public void Handle(CoreProjectionManagementMessage.GetResult message) {
-			try {
-				var getResultWorkItem = new GetResultWorkItem(
-					_publisher, message.CorrelationId, message.ProjectionId, this, message.Partition);
-				_processingQueue.EnqueueOutOfOrderTask(getResultWorkItem);
-				ProcessEvent();
-			} catch (Exception ex) {
-				_publisher.Publish(
-					new CoreProjectionStatusMessage.ResultReport(
-						message.CorrelationId, _projectionCorrelationId, message.Partition, result: null,
-						position: null));
-				_coreProjection.SetFaulted(ex);
-			}
-		}
-
-		public void Handle(EventReaderSubscriptionMessage.SubscribeTimeout message) {
-			if (_subscriptionState is not PhaseSubscriptionState.Subscribing
-			    || message.SubscriptionId != _currentSubscriptionId) return;
-			SubscriptionFailed("Reader subscription timed out");
-		}
-
-		public void Handle(EventReaderSubscriptionMessage.Failed message) => SubscriptionFailed(message.Reason);
-
-		private void SubscriptionFailed(string reason) {
-			if (_subscriptionState is PhaseSubscriptionState.Subscribed or PhaseSubscriptionState.Subscribing)
-				_subscriptionDispatcher.Cancel(_currentSubscriptionId);
-			_subscriptionState = PhaseSubscriptionState.Failed;
-			_coreProjection.SetFaulted(reason);
-		}
-
-		protected void UnsubscribeFromPreRecordedOrderEvents() {
-			// projectionCorrelationId is used as a subscription identifier for delivery
-			// of pre-recorded order events recovered by checkpoint manager
-			_subscriptionDispatcher.Cancel(_projectionCorrelationId);
-			_subscriptionState = PhaseSubscriptionState.Unsubscribed;
-		}
-
-		public void Subscribed(Guid subscriptionId) {
-			_processingQueue.Subscribed(subscriptionId);
-		}
-
-		public ReaderSubscriptionOptions GetSubscriptionOptions() {
-			return new ReaderSubscriptionOptions(
-				_projectionConfig.CheckpointUnhandledBytesThreshold, _projectionConfig.CheckpointHandledThreshold,
-				_projectionConfig.CheckpointAfterMs,
-				_stopOnEof, stopAfterNEvents: null, _enableContentTypeValidation);
-		}
-
-		protected void SubscribeReaders(CheckpointTag checkpointTag) {
-			_expectedSubscriptionMessageSequenceNumber = 0;
-			_currentSubscriptionId = Guid.NewGuid();
-			Subscribed(_currentSubscriptionId);
-			var readerStrategy = _readerStrategy;
-			if (readerStrategy != null) {
-				_subscriptionState = PhaseSubscriptionState.Subscribing;
-				_subscriptionDispatcher.PublishSubscribe(
-					new ReaderSubscriptionManagement.Subscribe(
-						_currentSubscriptionId, checkpointTag, readerStrategy,
-						GetSubscriptionOptions()), this, scheduleTimeout: true);
-			} else {
-				_coreProjection.Subscribed();
-			}
-		}
-
-		public void SubscribeToPreRecordedOrderEvents() {
-			var coreProjection = (CoreProjection)_coreProjection;
-			// projectionCorrelationId is used as a subscription identifier for delivery
-			// of pre-recorded order events recovered by checkpoint manager
-			_expectedSubscriptionMessageSequenceNumber = 0;
-			_currentSubscriptionId = coreProjection._projectionCorrelationId;
-			_subscriptionDispatcher.Subscribed(coreProjection._projectionCorrelationId, this);
-			// even if it is not a real subscription we need to unsubscribe
-			_subscriptionState = PhaseSubscriptionState.Subscribed;
-		}
-
-		public virtual void Subscribe(CheckpointTag from, bool fromCheckpoint) {
-			Contract.Assert(_checkpointManager.LastProcessedEventPosition == @from);
-			if (fromCheckpoint) {
-				SubscribeToPreRecordedOrderEvents();
-				_checkpointManager.BeginLoadPrerecordedEvents(@from);
-			} else
-				SubscribeReaders(@from);
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.PrerecordedEventsLoaded message) {
-			UnsubscribeFromPreRecordedOrderEvents();
-			SubscribeReaders(message.CheckpointTag);
-		}
-
-		public CheckpointTag AdjustTag(CheckpointTag tag) {
-			return _readerStrategy.PositionTagger.AdjustTag(tag);
-		}
-
-		protected void SetFaulting(string faultedReason, Exception ex = null) {
-			if (_logger != null) {
-				if (ex != null)
-					_logger.Error(ex, faultedReason);
-				else
-					_logger.Error(faultedReason);
-			}
-
-			_coreProjection.SetFaulting(faultedReason);
-		}
-
-		protected bool ValidateEmittedEvents(EmittedEventEnvelope[] emittedEvents) {
-			if (!_projectionConfig.EmitEventEnabled) {
-				if (emittedEvents != null && emittedEvents.Length > 0) {
-					SetFaulting("'emit' is not allowed by the projection/configuration/mode");
-					return false;
-				}
-			}
-
-			return true;
-		}
-
-		public abstract void NewCheckpointStarted(CheckpointTag at);
-
-		public void InitializeFromCheckpoint(CheckpointTag checkpointTag) {
-			_subscriptionState = PhaseSubscriptionState.Unknown;
-			// this can be old checkpoint
-			var adjustedCheckpointTag = _readerStrategy.PositionTagger.AdjustTag(checkpointTag);
-			_processingQueue.InitializeQueue(adjustedCheckpointTag);
-		}
-
-		public int GetBufferedEventCount() {
-			return _processingQueue.GetBufferedEventCount();
-		}
-
-		public string GetStatus() {
-			return _processingQueue.GetStatus();
-		}
-
-		protected EventProcessedResult InternalCommittedEventProcessed(
-			string partition, EventReaderSubscriptionMessage.CommittedEventReceived message,
-			EmittedEventEnvelope[] emittedEvents, PartitionState newPartitionState,
-			PartitionState newSharedPartitionState) {
-			if (_subscriptionState != PhaseSubscriptionState.Subscribed)
-				_logger?.Verbose("Got CommittedEventReceived in {state} SubscriptionState, but expected to be in {expectedState}",
-					_subscriptionState, PhaseSubscriptionState.Subscribed);
-
-			if (!ValidateEmittedEvents(emittedEvents))
-				return null;
-
-			bool eventsWereEmitted = emittedEvents != null;
-			var oldState = _partitionStateCache.GetLockedPartitionState(partition);
-			var oldSharedState = _isBiState ? _partitionStateCache.GetLockedPartitionState("") : null;
-			bool changed = oldState.IsChanged(newPartitionState)
-			               || (_isBiState && oldSharedState.IsChanged(newSharedPartitionState));
-
-			PartitionState partitionState = null;
-			// NOTE: projectionResult cannot change independently unless projection definition has changed
-			if (changed) {
-				var lockPartitionStateAt = partition != "" ? message.CheckpointTag : null;
-				partitionState = newPartitionState;
-				_partitionStateCache.CacheAndLockPartitionState(partition, partitionState, lockPartitionStateAt);
-				if (_isBiState) {
-					_partitionStateCache.CacheAndLockPartitionState("", newSharedPartitionState, null);
-				}
-			}
-
-			if (changed || eventsWereEmitted) {
-				var correlationId =
-					message.Data.IsJson ? message.Data.Metadata.ParseCheckpointTagCorrelationId() : null;
-				return new EventProcessedResult(
-					partition, message.CheckpointTag, oldState, partitionState, oldSharedState, newSharedPartitionState,
-					emittedEvents, message.Data.EventId, correlationId);
-			} else return null;
-		}
-
-		protected EventProcessedResult InternalPartitionDeletedProcessed(
-			string partition, CheckpointTag deletePosition,
-			PartitionState newPartitionState
-		) {
-			var oldState = _partitionStateCache.GetLockedPartitionState(partition);
-			var oldSharedState = _isBiState ? _partitionStateCache.GetLockedPartitionState("") : null;
-			bool changed = oldState.IsChanged(newPartitionState);
-
-
-			PartitionState partitionState = null;
-			// NOTE: projectionResult cannot change independently unless projection definition has changed
-			if (changed) {
-				var lockPartitionStateAt = partition != "" ? deletePosition : null;
-				partitionState = newPartitionState;
-				_partitionStateCache.CacheAndLockPartitionState(partition, partitionState, lockPartitionStateAt);
-			}
-
-			return new EventProcessedResult(
-				partition, deletePosition, oldState, partitionState, oldSharedState, null, null, Guid.Empty, null,
-				isPartitionTombstone: true);
-		}
-
-		public void BeginGetPartitionStateAt(
-			string statePartition, CheckpointTag at, Action<PartitionState> loadCompleted, bool lockLoaded) {
-			if (statePartition == "") // root is always cached
-			{
-				// root partition is always locked
-				var state = _partitionStateCache.TryGetAndLockPartitionState(statePartition, null);
-				loadCompleted(state);
-			} else {
-				var s = lockLoaded
-					? _partitionStateCache.TryGetAndLockPartitionState(statePartition, at)
-					: _partitionStateCache.TryGetPartitionState(statePartition);
-				if (s != null)
-					loadCompleted(s);
-				else {
-					Action<PartitionState> completed = state => {
-						if (lockLoaded)
-							_partitionStateCache.CacheAndLockPartitionState(statePartition, state, at);
-						else
-							_partitionStateCache.CachePartitionState(statePartition, state);
-						loadCompleted(state);
-					};
-					if (_projectionConfig.CheckpointsEnabled) {
-						_checkpointManager.BeginLoadPartitionStateAt(statePartition, at, completed);
-					} else {
-						var state = new PartitionState("", null, _zeroCheckpointTag);
-						completed(state);
-					}
-				}
-			}
-		}
-
-		public void FinalizeEventProcessing(
-			EventProcessedResult result, CheckpointTag eventCheckpointTag, float progress) {
-			if (_state == PhaseState.Running) {
-				//TODO: move to separate projection method and cache result in work item
-				if (result != null) {
-					_resultWriter.AccountPartition(result);
-					if (_projectionConfig.EmitEventEnabled && result.EmittedEvents != null) {
-						_resultWriter.EventsEmitted(
-							result.EmittedEvents, result.CausedBy, result.CorrelationId);
-						_emittedStreamsTracker.TrackEmittedStream(result.EmittedEvents.Select(x => x.Event).ToArray());
-					}
-
-					if (result.NewState != null) {
-						_resultWriter.WriteRunningResult(result);
-						_checkpointManager.StateUpdated(result.Partition, result.OldState, result.NewState);
-					}
-
-					if (result.NewSharedState != null) {
-						_checkpointManager.StateUpdated("", result.OldSharedState, result.NewSharedState);
-					}
-				}
-
-				_checkpointManager.EventProcessed(eventCheckpointTag, progress);
-				_progressResultWriter.WriteProgress(progress);
-			}
-		}
-
-		public void EmitEofResult(
-			string partition, string resultBody, CheckpointTag causedBy, Guid causedByGuid, string correlationId) {
-			_resultWriter.WriteEofResult(
-				_currentSubscriptionId, partition, resultBody, causedBy, causedByGuid, correlationId);
-		}
-
-		public void RecordEventOrder(ResolvedEvent resolvedEvent, CheckpointTag orderCheckpointTag, Action completed) {
-			switch (_state) {
-				case PhaseState.Running:
-					_checkpointManager.RecordEventOrder(
-						resolvedEvent, orderCheckpointTag, completed);
-					break;
-				case PhaseState.Stopped:
-					_logger.Error("Should not receive events in stopped state anymore");
-					completed(); // allow collecting events for debugging
-					break;
-			}
-		}
-
-		public void Complete() {
-			//NOTE: no need for EnsureUnsubscribed  as EOF
-			Unsubscribed();
-			_coreProjection.CompletePhase();
-		}
-
-		public void SetCurrentCheckpointSuggestedWorkItem(CheckpointSuggestedWorkItem checkpointSuggestedWorkItem) {
-			_coreProjection.SetCurrentCheckpointSuggestedWorkItem(checkpointSuggestedWorkItem);
-		}
-
-		public virtual void GetStatistics(ProjectionStatistics info) {
-			info.Status = info.Status + GetStatus();
-			info.BufferedEvents += GetBufferedEventCount();
-		}
-
-		public CheckpointTag MakeZeroCheckpointTag() {
-			return _zeroCheckpointTag;
-		}
-
-		public void EnsureUnsubscribed() {
-			if (_subscriptionState is PhaseSubscriptionState.Subscribed) {
-				Unsubscribed();
-				// this way we distinguish pre-recorded events subscription
-				if (_currentSubscriptionId != _projectionCorrelationId)
-					_publisher.Publish(
-						new ReaderSubscriptionManagement.Unsubscribe(_currentSubscriptionId));
-			}
-		}
-
-		protected long _subscriptionStartedAtLastCommitPosition;
-		private readonly IEnvelope _inutQueueEnvelope;
-		private readonly TimeSpan _updateInterval = TimeSpan.FromMilliseconds(250);
-		private bool _updateStatisticsTicketPending;
-
-		public void Handle(EventReaderSubscriptionMessage.ReaderAssignedReader message) {
-			if (_state != PhaseState.Starting)
-				return;
-			if (_subscriptionState is not PhaseSubscriptionState.Subscribing
-			    || message.SubscriptionId != _currentSubscriptionId)
-				return;
-			_subscriptionState = PhaseSubscriptionState.Subscribed;
-			_coreProjection.Subscribed();
-		}
-
-		public abstract void Dispose();
-
-		public void SetProjectionState(PhaseState state) {
-			var starting = _state == PhaseState.Starting && state == PhaseState.Running;
-
-			_state = state;
-			_processingQueue.SetIsRunning(state == PhaseState.Running);
-			if (starting)
-				NewCheckpointStarted(LastProcessedEventPosition);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Phases/ICoreProjectionForProcessingPhase.cs b/src/EventStore.Projections.Core/Services/Processing/Phases/ICoreProjectionForProcessingPhase.cs
deleted file mode 100644
index 5f9e71e9389..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Phases/ICoreProjectionForProcessingPhase.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.WorkItems;
-
-namespace EventStore.Projections.Core.Services.Processing.Phases {
-	public interface ICoreProjectionForProcessingPhase {
-		void CompletePhase();
-		void SetFaulted(string reason);
-		void SetFaulted(Exception ex);
-		void SetFaulting(string reason);
-		void SetCurrentCheckpointSuggestedWorkItem(CheckpointSuggestedWorkItem checkpointSuggestedWorkItem);
-		void EnsureTickPending();
-		CheckpointTag LastProcessedEventPosition { get; }
-		void Subscribed();
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Phases/IEventProcessingPhase.cs b/src/EventStore.Projections.Core/Services/Processing/Phases/IEventProcessingPhase.cs
deleted file mode 100644
index 14f96710955..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Phases/IEventProcessingPhase.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using EventStore.Projections.Core.Services.Processing.WorkItems;
-
-namespace EventStore.Projections.Core.Services.Processing.Phases {
-	public interface IProjectionPhaseCompleter {
-		void Complete();
-	}
-
-	public interface IProjectionPhaseCheckpointManager {
-		void NewCheckpointStarted(CheckpointTag checkpointTag);
-		void SetCurrentCheckpointSuggestedWorkItem(CheckpointSuggestedWorkItem checkpointSuggestedWorkItem);
-	}
-
-	public interface IProjectionPhaseStateManager {
-		void BeginGetPartitionStateAt(
-			string statePartition, CheckpointTag at, Action<PartitionState> loadCompleted,
-			bool lockLoaded);
-
-		void UnlockAndForgetBefore(CheckpointTag checkpointTag);
-
-		CheckpointTag LastProcessedEventPosition { get; }
-	}
-
-	public interface IEventProcessingProjectionPhase : IProjectionPhaseStateManager {
-		EventProcessedResult ProcessCommittedEvent(EventReaderSubscriptionMessage.CommittedEventReceived message,
-			string partition);
-
-		void FinalizeEventProcessing(
-			EventProcessedResult result, CheckpointTag eventCheckpointTag, float progress);
-
-		void RecordEventOrder(ResolvedEvent resolvedEvent, CheckpointTag orderCheckpointTag, Action completed);
-
-		void EmitEofResult(
-			string partition, string resultBody, CheckpointTag causedBy, Guid causedByGuid, string correlationId);
-
-		EventProcessedResult ProcessPartitionDeleted(string partition, CheckpointTag deletedPosition);
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Phases/IProgressResultWriter.cs b/src/EventStore.Projections.Core/Services/Processing/Phases/IProgressResultWriter.cs
deleted file mode 100644
index bb109c4d000..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Phases/IProgressResultWriter.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace EventStore.Projections.Core.Services.Processing.Phases {
-	public interface IProgressResultWriter {
-		void WriteProgress(float progress);
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Phases/IProjectionProcessingPhase.cs b/src/EventStore.Projections.Core/Services/Processing/Phases/IProjectionProcessingPhase.cs
deleted file mode 100644
index 4890822738f..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Phases/IProjectionProcessingPhase.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-
-namespace EventStore.Projections.Core.Services.Processing.Phases {
-	public interface IProjectionProcessingPhase : IDisposable,
-		IHandle<CoreProjectionManagementMessage.GetState>,
-		IHandle<CoreProjectionManagementMessage.GetResult>,
-		IHandle<CoreProjectionProcessingMessage.PrerecordedEventsLoaded> {
-		CheckpointTag AdjustTag(CheckpointTag tag);
-
-		void InitializeFromCheckpoint(CheckpointTag checkpointTag);
-
-		//TODO: remove from - it is passed for validation purpose only
-		void Subscribe(CheckpointTag from, bool fromCheckpoint);
-
-		void ProcessEvent();
-
-		void EnsureUnsubscribed();
-
-		void SetProjectionState(PhaseState state);
-
-		void GetStatistics(ProjectionStatistics info);
-
-		CheckpointTag MakeZeroCheckpointTag();
-		ICoreProjectionCheckpointManager CheckpointManager { get; }
-		IEmittedStreamsTracker EmittedStreamsTracker { get; }
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Phases/PhasePositionTagger.cs b/src/EventStore.Projections.Core/Services/Processing/Phases/PhasePositionTagger.cs
deleted file mode 100644
index 40ebb5ea04a..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Phases/PhasePositionTagger.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Services.Processing.Phases {
-	public class PhasePositionTagger : PositionTagger {
-		public PhasePositionTagger(int phase) : base(phase) {
-		}
-
-		public override bool IsMessageAfterCheckpointTag(
-			CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
-			throw new NotSupportedException();
-		}
-
-		public override CheckpointTag MakeCheckpointTag(
-			CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
-			throw new NotSupportedException();
-		}
-
-		public override CheckpointTag MakeCheckpointTag(CheckpointTag previous,
-			ReaderSubscriptionMessage.EventReaderPartitionEof partitionEof) {
-			throw new NotSupportedException();
-		}
-
-		public override CheckpointTag MakeCheckpointTag(CheckpointTag previous,
-			ReaderSubscriptionMessage.EventReaderPartitionDeleted partitionDeleted) {
-			throw new NotSupportedException();
-		}
-
-		public override CheckpointTag MakeZeroCheckpointTag() {
-			return CheckpointTag.FromPhase(Phase, completed: false);
-		}
-
-		public override bool IsCompatible(CheckpointTag checkpointTag) {
-			return checkpointTag.Mode_ == CheckpointTag.Mode.Phase;
-		}
-
-		public override CheckpointTag AdjustTag(CheckpointTag tag) {
-			if (tag.Phase < Phase)
-				return tag;
-			if (tag.Phase > Phase)
-				throw new ArgumentException(
-					string.Format("Invalid checkpoint tag phase.  Expected less or equal to: {0} Was: {1}", Phase,
-						tag.Phase), "tag");
-
-			if (tag.Mode_ == CheckpointTag.Mode.Phase) {
-				return tag;
-			}
-
-			throw new NotSupportedException("Conversion to phase based checkpoint tag is not supported");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Phases/PhaseState.cs b/src/EventStore.Projections.Core/Services/Processing/Phases/PhaseState.cs
deleted file mode 100644
index d602b08d380..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Phases/PhaseState.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace EventStore.Projections.Core.Services.Processing.Phases;
-
-public enum PhaseState {
-	Unknown,
-	Stopped,
-	Starting,
-	Running,
-}
-
-public enum PhaseSubscriptionState {
-	Unknown = 0,
-	Unsubscribed,
-	Subscribing,
-	Subscribed,
-	Failed
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Phases/WriteQueryEofProjectionProcessingPhase.cs b/src/EventStore.Projections.Core/Services/Processing/Phases/WriteQueryEofProjectionProcessingPhase.cs
deleted file mode 100644
index ce47b828f4a..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Phases/WriteQueryEofProjectionProcessingPhase.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Bus;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-
-namespace EventStore.Projections.Core.Services.Processing.Phases {
-	public sealed class WriteQueryEofProjectionProcessingPhase : WriteQueryResultProjectionProcessingPhaseBase {
-		public WriteQueryEofProjectionProcessingPhase(
-			IPublisher publisher,
-			int phase,
-			string resultStream,
-			ICoreProjectionForProcessingPhase coreProjection,
-			PartitionStateCache stateCache,
-			ICoreProjectionCheckpointManager checkpointManager,
-			IEmittedEventWriter emittedEventWriter,
-			IEmittedStreamsTracker emittedStreamsTracker)
-			: base(publisher, phase, resultStream, coreProjection, stateCache, checkpointManager, emittedEventWriter,
-				emittedStreamsTracker) {
-		}
-
-		protected override IEnumerable<EmittedEventEnvelope> WriteResults(CheckpointTag phaseCheckpointTag) {
-			// do nothing
-			yield break;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Phases/WriteQueryResultProjectionProcessingPhase.cs b/src/EventStore.Projections.Core/Services/Processing/Phases/WriteQueryResultProjectionProcessingPhase.cs
deleted file mode 100644
index d2c32f9b655..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Phases/WriteQueryResultProjectionProcessingPhase.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Bus;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-
-namespace EventStore.Projections.Core.Services.Processing.Phases {
-	public sealed class WriteQueryResultProjectionProcessingPhase : WriteQueryResultProjectionProcessingPhaseBase {
-		public WriteQueryResultProjectionProcessingPhase(
-			IPublisher publisher,
-			int phase,
-			string resultStream,
-			ICoreProjectionForProcessingPhase coreProjection,
-			PartitionStateCache stateCache,
-			ICoreProjectionCheckpointManager checkpointManager,
-			IEmittedEventWriter emittedEventWriter,
-			IEmittedStreamsTracker emittedStreamsTracker)
-			: base(publisher, phase, resultStream, coreProjection, stateCache, checkpointManager, emittedEventWriter,
-				emittedStreamsTracker) {
-		}
-
-		protected override IEnumerable<EmittedEventEnvelope> WriteResults(CheckpointTag phaseCheckpointTag) {
-			var items = _stateCache.Enumerate();
-			EmittedStream.WriterConfiguration.StreamMetadata streamMetadata = null;
-			return from item in items
-				let partitionState = item.Item2
-				select
-					new EmittedEventEnvelope(
-						new EmittedDataEvent(
-							_resultStream,
-							Guid.NewGuid(),
-							"Result",
-							true,
-							partitionState.Result,
-							null,
-							phaseCheckpointTag,
-							null),
-						streamMetadata);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Phases/WriteQueryResultProjectionProcessingPhaseBase.cs b/src/EventStore.Projections.Core/Services/Processing/Phases/WriteQueryResultProjectionProcessingPhaseBase.cs
deleted file mode 100644
index ed41a4d5633..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Phases/WriteQueryResultProjectionProcessingPhaseBase.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Bus;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-
-namespace EventStore.Projections.Core.Services.Processing.Phases {
-	public abstract class WriteQueryResultProjectionProcessingPhaseBase : IProjectionProcessingPhase {
-		private readonly IPublisher _publisher;
-		private readonly int _phase;
-		protected readonly string _resultStream;
-		private readonly ICoreProjectionForProcessingPhase _coreProjection;
-		protected readonly PartitionStateCache _stateCache;
-		protected readonly ICoreProjectionCheckpointManager _checkpointManager;
-		protected readonly IEmittedEventWriter _emittedEventWriter;
-		protected readonly IEmittedStreamsTracker _emittedStreamsTracker;
-		private bool _subscribed;
-		private PhaseState _projectionState;
-
-		public WriteQueryResultProjectionProcessingPhaseBase(
-			IPublisher publisher,
-			int phase,
-			string resultStream,
-			ICoreProjectionForProcessingPhase coreProjection,
-			PartitionStateCache stateCache,
-			ICoreProjectionCheckpointManager checkpointManager,
-			IEmittedEventWriter emittedEventWriter,
-			IEmittedStreamsTracker emittedStreamsTracker) {
-			if (resultStream == null) throw new ArgumentNullException("resultStream");
-			if (coreProjection == null) throw new ArgumentNullException("coreProjection");
-			if (stateCache == null) throw new ArgumentNullException("stateCache");
-			if (checkpointManager == null) throw new ArgumentNullException("checkpointManager");
-			if (emittedEventWriter == null) throw new ArgumentNullException("emittedEventWriter");
-			if (emittedStreamsTracker == null) throw new ArgumentNullException("emittedStreamsTracker");
-			if (string.IsNullOrEmpty(resultStream)) throw new ArgumentException("resultStream");
-
-			_publisher = publisher;
-			_phase = phase;
-			_resultStream = resultStream;
-			_coreProjection = coreProjection;
-			_stateCache = stateCache;
-			_checkpointManager = checkpointManager;
-			_emittedEventWriter = emittedEventWriter;
-			_emittedStreamsTracker = emittedStreamsTracker;
-		}
-
-		public ICoreProjectionCheckpointManager CheckpointManager {
-			get { return _checkpointManager; }
-		}
-
-		public IEmittedStreamsTracker EmittedStreamsTracker {
-			get { return _emittedStreamsTracker; }
-		}
-
-		public void Dispose() {
-		}
-
-		public void Handle(CoreProjectionManagementMessage.GetState message) {
-			var state = _stateCache.TryGetPartitionState(message.Partition);
-			var stateString = state != null ? state.State : null;
-			_publisher.Publish(
-				new CoreProjectionStatusMessage.StateReport(
-					message.CorrelationId,
-					message.CorrelationId,
-					message.Partition,
-					state: stateString,
-					position: null));
-		}
-
-		public void Handle(CoreProjectionManagementMessage.GetResult message) {
-			var state = _stateCache.TryGetPartitionState(message.Partition);
-			var resultString = state != null ? state.Result : null;
-			_publisher.Publish(
-				new CoreProjectionStatusMessage.ResultReport(
-					message.CorrelationId,
-					message.CorrelationId,
-					message.Partition,
-					result: resultString,
-					position: null));
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.PrerecordedEventsLoaded message) {
-			throw new NotImplementedException();
-		}
-
-		public CheckpointTag AdjustTag(CheckpointTag tag) {
-			return tag;
-		}
-
-		public void InitializeFromCheckpoint(CheckpointTag checkpointTag) {
-			_subscribed = false;
-		}
-
-		public void ProcessEvent() {
-			if (!_subscribed)
-				throw new InvalidOperationException();
-			if (_projectionState != PhaseState.Running)
-				return;
-
-			var phaseCheckpointTag = CheckpointTag.FromPhase(_phase, completed: true);
-			var writeResults = WriteResults(phaseCheckpointTag);
-
-			var writeEofResults = WriteEofEvent(phaseCheckpointTag);
-
-			_emittedEventWriter.EventsEmitted(writeResults.Concat(writeEofResults).ToArray(), Guid.Empty, null);
-
-			_checkpointManager.EventProcessed(phaseCheckpointTag, 100.0f);
-			_coreProjection.CompletePhase();
-		}
-
-		private IEnumerable<EmittedEventEnvelope> WriteEofEvent(CheckpointTag phaseCheckpointTag) {
-			EmittedStream.WriterConfiguration.StreamMetadata streamMetadata = null;
-			yield return
-				new EmittedEventEnvelope(
-					new EmittedDataEvent(
-						_resultStream,
-						Guid.NewGuid(),
-						"$Eof",
-						true,
-						null,
-						null,
-						phaseCheckpointTag,
-						null),
-					streamMetadata);
-		}
-
-		protected abstract IEnumerable<EmittedEventEnvelope> WriteResults(CheckpointTag phaseCheckpointTag);
-
-		public void Subscribe(CheckpointTag from, bool fromCheckpoint) {
-			_subscribed = true;
-			_coreProjection.Subscribed();
-		}
-
-		public void SetProjectionState(PhaseState state) {
-			_projectionState = state;
-		}
-
-		public void GetStatistics(ProjectionStatistics info) {
-			info.Status = info.Status + "/Writing results";
-		}
-
-		public CheckpointTag MakeZeroCheckpointTag() {
-			return CheckpointTag.FromPhase(_phase, completed: false);
-		}
-
-		public void EnsureUnsubscribed() {
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/ProjectionCoreService.cs b/src/EventStore.Projections.Core/Services/Processing/ProjectionCoreService.cs
deleted file mode 100644
index 718d82a26ec..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/ProjectionCoreService.cs
+++ /dev/null
@@ -1,310 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Core.Services.TimerService;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Management;
-using EventStore.Common.Utils;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using Serilog;
-
-namespace EventStore.Projections.Core.Services.Processing {
-	public class ProjectionCoreService
-		: IHandle<ProjectionCoreServiceMessage.StartCore>,
-			IHandle<ProjectionCoreServiceMessage.StopCore>,
-			IHandle<ProjectionCoreServiceMessage.CoreTick>,
-			IHandle<CoreProjectionManagementMessage.CreateAndPrepare>,
-			IHandle<CoreProjectionManagementMessage.CreatePrepared>,
-			IHandle<CoreProjectionManagementMessage.Dispose>,
-			IHandle<CoreProjectionManagementMessage.Start>,
-			IHandle<CoreProjectionManagementMessage.LoadStopped>,
-			IHandle<CoreProjectionManagementMessage.Stop>,
-			IHandle<CoreProjectionManagementMessage.Kill>,
-			IHandle<CoreProjectionManagementMessage.GetState>,
-			IHandle<CoreProjectionManagementMessage.GetResult>,
-			IHandle<CoreProjectionProcessingMessage.CheckpointCompleted>,
-			IHandle<CoreProjectionProcessingMessage.CheckpointLoaded>,
-			IHandle<CoreProjectionProcessingMessage.PrerecordedEventsLoaded>,
-			IHandle<CoreProjectionProcessingMessage.RestartRequested>,
-			IHandle<CoreProjectionProcessingMessage.Failed>,
-			IHandle<ProjectionCoreServiceMessage.StopCoreTimeout>,
-			IHandle<CoreProjectionStatusMessage.Suspended> {
-		public const string SubComponentName = "ProjectionCoreService";
-
-		private readonly Guid _workerId;
-		private readonly IPublisher _publisher;
-		private readonly IPublisher _inputQueue;
-		private readonly ILogger _logger = Log.ForContext<ProjectionCoreService>();
-
-		private readonly Dictionary<Guid, CoreProjection> _projections = new Dictionary<Guid, CoreProjection>();
-
-		private readonly IODispatcher _ioDispatcher;
-
-		private readonly ReaderSubscriptionDispatcher _subscriptionDispatcher;
-
-		private readonly ITimeProvider _timeProvider;
-		private readonly ProcessingStrategySelector _processingStrategySelector;
-
-		private bool _stopping;
-		private readonly Dictionary<Guid, CoreProjection> _suspendingProjections = new Dictionary<Guid, CoreProjection>();
-		private Guid _stopQueueId = Guid.Empty;
-		private int _projectionStopTimeoutMs = 5000;
-		private readonly ProjectionStateHandlerFactory _factory;
-
-		public ProjectionCoreService(
-			Guid workerId,
-			IPublisher inputQueue,
-			IPublisher publisher,
-			ReaderSubscriptionDispatcher subscriptionDispatcher,
-			ITimeProvider timeProvider,
-			IODispatcher ioDispatcher,
-			ProjectionsStandardComponents configuration) {
-			_workerId = workerId;
-			_inputQueue = inputQueue;
-			_publisher = publisher;
-			_ioDispatcher = ioDispatcher;
-			_subscriptionDispatcher = subscriptionDispatcher;
-			_timeProvider = timeProvider;
-			_processingStrategySelector = new ProcessingStrategySelector(_subscriptionDispatcher);
-			_factory = new ProjectionStateHandlerFactory(TimeSpan.FromMilliseconds(configuration.ProjectionCompilationTimeout),
-				TimeSpan.FromMilliseconds(configuration.ProjectionExecutionTimeout));
-		}
-
-		public ILogger Logger {
-			get { return _logger; }
-		}
-
-		public void Handle(ProjectionCoreServiceMessage.StartCore message) {
-			_publisher.Publish(new ProjectionCoreServiceMessage.SubComponentStarted(
-				SubComponentName, message.InstanceCorrelationId));
-		}
-
-		public void Handle(ProjectionCoreServiceMessage.StopCore message) {
-			_stopQueueId = message.QueueId;
-			StopProjections();
-		}
-
-		private void StopProjections() {
-			_stopping = true;
-
-			_ioDispatcher.StartDraining(
-				() => _publisher.Publish(new ProjectionSubsystemMessage.IODispatcherDrained(SubComponentName)));
-
-			var allProjections = _projections.Values.ToArray();
-			foreach (var projection in allProjections)
-			{
-				var requiresStopping = projection.Suspend();
-				if (requiresStopping) {
-					_suspendingProjections.Add(projection._projectionCorrelationId, projection);
-				}
-			}
-
-			if (_suspendingProjections.IsEmpty()) {
-				FinishStopping();
-			} else {
-				_publisher.Publish(TimerMessage.Schedule.Create(
-					TimeSpan.FromMilliseconds(_projectionStopTimeoutMs),
-					_inputQueue,
-					new ProjectionCoreServiceMessage.StopCoreTimeout(_stopQueueId)));
-			}
-		}
-
-		public void Handle(ProjectionCoreServiceMessage.StopCoreTimeout message) {
-			if (message.QueueId != _stopQueueId) return;
-			_logger.Debug("PROJECTIONS: Suspending projections in Projection Core Service timed out. Force stopping.");
-			FinishStopping();
-		}
-
-		public void Handle(CoreProjectionStatusMessage.Suspended message) {
-			if (!_stopping) return;
-
-			_suspendingProjections.Remove(message.ProjectionId);
-			if (_suspendingProjections.Count == 0) {
-				FinishStopping();
-			}
-		}
-
-		private void FinishStopping() {
-			if (!_stopping) return;
-
-			_projections.Clear();
-			_stopping = false;
-			_publisher.Publish(new ProjectionCoreServiceMessage.SubComponentStopped(
-				nameof(ProjectionCoreService), _stopQueueId));
-			_stopQueueId = Guid.Empty;
-		}
-
-		public void Handle(ProjectionCoreServiceMessage.CoreTick message) {
-			message.Action();
-		}
-
-		public void Handle(CoreProjectionManagementMessage.CreateAndPrepare message) {
-			try {
-				//TODO: factory method can throw
-				var stateHandler = CreateStateHandler(_factory,
-					_logger,
-					message.HandlerType,
-					message.Query,
-					message.EnableContentTypeValidation,
-					message.Config.ProjectionExecutionTimeout);
-
-				string name = message.Name;
-				var sourceDefinition = ProjectionSourceDefinition.From(stateHandler.GetSourceDefinition());
-
-				var projectionVersion = message.Version;
-				var projectionConfig = message.Config;
-				var namesBuilder = new ProjectionNamesBuilder(name, sourceDefinition);
-
-				var projectionProcessingStrategy = _processingStrategySelector.CreateProjectionProcessingStrategy(
-					name,
-					projectionVersion,
-					namesBuilder,
-					sourceDefinition,
-					projectionConfig,
-					stateHandler,
-					message.HandlerType,
-					message.Query,
-					message.EnableContentTypeValidation);
-
-				CreateCoreProjection(message.ProjectionId, projectionConfig.RunAs, projectionProcessingStrategy);
-				_publisher.Publish(
-					new CoreProjectionStatusMessage.Prepared(
-						message.ProjectionId, sourceDefinition));
-			} catch (Exception ex) {
-				_publisher.Publish(
-					new CoreProjectionStatusMessage.Faulted(message.ProjectionId, ex.Message));
-			}
-		}
-
-		public void Handle(CoreProjectionManagementMessage.CreatePrepared message) {
-			try {
-				var name = message.Name;
-				var sourceDefinition = ProjectionSourceDefinition.From(message.SourceDefinition);
-				var projectionVersion = message.Version;
-				var projectionConfig = message.Config;
-				var namesBuilder = new ProjectionNamesBuilder(name, sourceDefinition);
-
-				var projectionProcessingStrategy = _processingStrategySelector.CreateProjectionProcessingStrategy(
-					name,
-					projectionVersion,
-					namesBuilder,
-					sourceDefinition,
-					projectionConfig,
-					null,
-					message.HandlerType,
-					message.Query,
-					message.EnableContentTypeValidation);
-
-				CreateCoreProjection(message.ProjectionId, projectionConfig.RunAs, projectionProcessingStrategy);
-				_publisher.Publish(
-					new CoreProjectionStatusMessage.Prepared(
-						message.ProjectionId, sourceDefinition));
-			} catch (Exception ex) {
-				_publisher.Publish(
-					new CoreProjectionStatusMessage.Faulted(message.ProjectionId, ex.Message));
-			}
-		}
-
-		private void CreateCoreProjection(
-			Guid projectionCorrelationId, ClaimsPrincipal runAs, ProjectionProcessingStrategy processingStrategy) {
-			var projection = processingStrategy.Create(
-				projectionCorrelationId,
-				_inputQueue,
-				_workerId,
-				runAs,
-				_publisher,
-				_ioDispatcher,
-				_subscriptionDispatcher,
-				_timeProvider);
-			_projections.Add(projectionCorrelationId, projection);
-		}
-
-		public void Handle(CoreProjectionManagementMessage.Dispose message) {
-			CoreProjection projection;
-			if (_projections.TryGetValue(message.ProjectionId, out projection)) {
-				_projections.Remove(message.ProjectionId);
-				projection.Dispose();
-			}
-		}
-
-		public void Handle(CoreProjectionManagementMessage.Start message) {
-			var projection = _projections[message.ProjectionId];
-			projection.Start();
-		}
-
-		public void Handle(CoreProjectionManagementMessage.LoadStopped message) {
-			var projection = _projections[message.ProjectionId];
-			projection.LoadStopped();
-		}
-
-		public void Handle(CoreProjectionManagementMessage.Stop message) {
-			var projection = _projections[message.ProjectionId];
-			projection.Stop();
-		}
-
-		public void Handle(CoreProjectionManagementMessage.Kill message) {
-			var projection = _projections[message.ProjectionId];
-			projection.Kill();
-		}
-
-		public void Handle(CoreProjectionManagementMessage.GetState message) {
-			CoreProjection projection;
-			if (_projections.TryGetValue(message.ProjectionId, out projection))
-				projection.Handle(message);
-		}
-
-		public void Handle(CoreProjectionManagementMessage.GetResult message) {
-			CoreProjection projection;
-			if (_projections.TryGetValue(message.ProjectionId, out projection))
-				projection.Handle(message);
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.CheckpointCompleted message) {
-			CoreProjection projection;
-			if (_projections.TryGetValue(message.ProjectionId, out projection))
-				projection.Handle(message);
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.CheckpointLoaded message) {
-			CoreProjection projection;
-			if (_projections.TryGetValue(message.ProjectionId, out projection))
-				projection.Handle(message);
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.PrerecordedEventsLoaded message) {
-			CoreProjection projection;
-			if (_projections.TryGetValue(message.ProjectionId, out projection))
-				projection.Handle(message);
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.RestartRequested message) {
-			CoreProjection projection;
-			if (_projections.TryGetValue(message.ProjectionId, out projection))
-				projection.Handle(message);
-		}
-
-		public void Handle(CoreProjectionProcessingMessage.Failed message) {
-			CoreProjection projection;
-			if (_projections.TryGetValue(message.ProjectionId, out projection))
-				projection.Handle(message);
-		}
-
-		public static IProjectionStateHandler CreateStateHandler(ProjectionStateHandlerFactory factory,
-			ILogger logger,
-			string handlerType,
-			string query,
-			bool enableContentTypeValidation,
-			int? projectionExecutionTimeout) {
-			var stateHandler = factory.Create(
-				handlerType,
-				query,
-				enableContentTypeValidation,
-				projectionExecutionTimeout,
-				logger: logger.Verbose);
-			return stateHandler;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/ProjectionNamesBuilder.cs b/src/EventStore.Projections.Core/Services/Processing/ProjectionNamesBuilder.cs
deleted file mode 100644
index 88efaf7cf41..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/ProjectionNamesBuilder.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using System;
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Services.Processing {
-	public class ProjectionNamesBuilder {
-		public static class StandardProjections {
-			public const string StreamsStandardProjection = "$streams";
-			public const string StreamByCategoryStandardProjection = "$stream_by_category";
-			public const string EventByCategoryStandardProjection = "$by_category";
-			public const string EventByTypeStandardProjection = "$by_event_type";
-			public const string EventByCorrIdStandardProjection = "$by_correlation_id";
-		}
-
-		public static ProjectionNamesBuilder CreateForTest(string name) {
-			return new ProjectionNamesBuilder(name);
-		}
-
-		private readonly string _name;
-		private readonly IQuerySources _sources;
-		private readonly string _resultStreamName;
-		private readonly string _partitionCatalogStreamName;
-		private readonly string _checkpointStreamName;
-		private readonly string _orderStreamName;
-		private readonly string _emittedStreamsName;
-		private readonly string _emittedStreamsCheckpointName;
-
-		private ProjectionNamesBuilder(string name)
-			: this(name, new QuerySourcesDefinition()) {
-		}
-
-		public ProjectionNamesBuilder(string name, IQuerySources sources) {
-			if (sources == null) throw new ArgumentNullException("sources");
-			_name = name;
-			_sources = sources;
-			_resultStreamName = _sources.ResultStreamNameOption
-			                    ?? ProjectionsStreamPrefix + EffectiveProjectionName + ProjectionsStateStreamSuffix;
-			_partitionCatalogStreamName = ProjectionsStreamPrefix + EffectiveProjectionName
-			                                                      + ProjectionPartitionCatalogStreamSuffix;
-			_checkpointStreamName =
-				ProjectionsStreamPrefix + EffectiveProjectionName + ProjectionCheckpointStreamSuffix;
-			_orderStreamName = ProjectionsStreamPrefix + EffectiveProjectionName + ProjectionOrderStreamSuffix;
-			_emittedStreamsName = ProjectionsStreamPrefix + EffectiveProjectionName + ProjectionEmittedStreamSuffix;
-			_emittedStreamsCheckpointName = ProjectionsStreamPrefix + EffectiveProjectionName +
-			                                ProjectionEmittedStreamSuffix + ProjectionCheckpointStreamSuffix;
-		}
-
-		public string EffectiveProjectionName {
-			get { return _name; }
-		}
-
-
-		private string GetPartitionResultStreamName(string partitionName) {
-			return String.Format(GetPartitionResultStreamNamePattern(), partitionName);
-		}
-
-		public string GetResultStreamName() {
-			return _resultStreamName;
-		}
-
-		public string GetPartitionResultStreamNamePattern() {
-			return _sources.PartitionResultStreamNamePatternOption
-			       ?? ProjectionsStreamPrefix + EffectiveProjectionName + "-{0}" + ProjectionsStateStreamSuffix;
-		}
-
-		public const string ProjectionsStreamPrefix = "$projections-";
-		private const string ProjectionsStateStreamSuffix = "-result";
-		private const string ProjectionCheckpointStreamSuffix = "-checkpoint";
-		private const string ProjectionEmittedStreamSuffix = "-emittedstreams";
-		private const string ProjectionOrderStreamSuffix = "-order";
-		private const string ProjectionPartitionCatalogStreamSuffix = "-partitions";
-		public const string ProjectionsRegistrationStream = "$projections-$all";
-
-		public string GetPartitionCatalogStreamName() {
-			return _partitionCatalogStreamName;
-		}
-
-		public string MakePartitionResultStreamName(string statePartition) {
-			return String.IsNullOrEmpty(statePartition)
-				? GetResultStreamName()
-				: GetPartitionResultStreamName(statePartition);
-		}
-
-		public string MakePartitionCheckpointStreamName(string statePartition) {
-			if (String.IsNullOrEmpty(statePartition))
-				throw new InvalidOperationException("Root partition cannot have a partition checkpoint stream");
-
-			return ProjectionsStreamPrefix + EffectiveProjectionName + "-" + statePartition
-			       + ProjectionCheckpointStreamSuffix;
-		}
-
-
-		public string MakeCheckpointStreamName() {
-			return _checkpointStreamName;
-		}
-
-		public string GetEmittedStreamsName() {
-			return _emittedStreamsName;
-		}
-
-		public string GetEmittedStreamsCheckpointName() {
-			return _emittedStreamsCheckpointName;
-		}
-
-		public string GetOrderStreamName() {
-			return _orderStreamName;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/ProjectionOutputConfig.cs b/src/EventStore.Projections.Core/Services/Processing/ProjectionOutputConfig.cs
deleted file mode 100644
index bd4424661ad..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/ProjectionOutputConfig.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System.Runtime.Serialization;
-
-namespace EventStore.Projections.Core.Services.Processing {
-	[DataContract]
-	public class ProjectionOutputConfig {
-		[DataMember] public string ResultStreamName { get; set; }
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/ProjectionSourceDefinition.cs b/src/EventStore.Projections.Core/Services/Processing/ProjectionSourceDefinition.cs
deleted file mode 100644
index 013c04eca11..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/ProjectionSourceDefinition.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using System.Linq;
-using System.Runtime.Serialization;
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Services.Processing {
-	[DataContract]
-	public class ProjectionSourceDefinition : IQuerySources {
-		[DataMember] public bool AllEvents { get; set; }
-
-		[DataMember] public bool AllStreams { get; set; }
-
-		[DataMember] public bool ByStream { get; set; }
-
-		[DataMember] public bool ByCustomPartitions { get; set; }
-
-		[DataMember] public string[] Categories { get; set; }
-
-		[DataMember] public string[] Events { get; set; }
-
-		[DataMember] public string[] Streams { get; set; }
-
-		[DataMember] public long? LimitingCommitPosition { get; set; }
-
-		[DataMember] public QuerySourceOptions Options { get; set; }
-
-		bool IQuerySources.DefinesStateTransform {
-			get { return Options != null && Options.DefinesStateTransform; }
-		}
-
-		bool IQuerySources.ProducesResults {
-			get { return Options != null && Options.ProducesResults; }
-		}
-
-		bool IQuerySources.DefinesFold {
-			get { return Options != null && Options.DefinesFold; }
-		}
-
-		bool IQuerySources.HandlesDeletedNotifications {
-			get { return Options != null && Options.HandlesDeletedNotifications; }
-		}
-
-		bool IQuerySources.IncludeLinksOption {
-			get { return Options != null && Options.IncludeLinks; }
-		}
-
-		string IQuerySources.ResultStreamNameOption {
-			get { return Options != null ? Options.ResultStreamName : null; }
-		}
-
-		string IQuerySources.PartitionResultStreamNamePatternOption {
-			get { return Options != null ? Options.PartitionResultStreamNamePattern : null; }
-		}
-
-		bool IQuerySources.ReorderEventsOption {
-			get { return Options != null && Options.ReorderEvents; }
-		}
-
-		int? IQuerySources.ProcessingLagOption {
-			get { return Options != null ? Options.ProcessingLag : (int?)null; }
-		}
-
-		bool IQuerySources.IsBiState {
-			get { return Options != null ? Options.IsBiState : false; }
-		}
-
-		bool IQuerySources.ByStreams {
-			get { return ByStream; }
-		}
-
-		public static ProjectionSourceDefinition From(IQuerySources sources) {
-			return new ProjectionSourceDefinition {
-				AllEvents = sources.AllEvents,
-				AllStreams = sources.AllStreams,
-				ByStream = sources.ByStreams,
-				ByCustomPartitions = sources.ByCustomPartitions,
-				Categories = (sources.Categories ?? new string[0]).ToArray(),
-				Events = (sources.Events ?? new string[0]).ToArray(),
-				Streams = (sources.Streams ?? new string[0]).ToArray(),
-				LimitingCommitPosition = sources.LimitingCommitPosition,
-				Options =
-					new QuerySourceOptions {
-						DefinesStateTransform = sources.DefinesStateTransform,
-						ProducesResults = sources.ProducesResults,
-						DefinesFold = sources.DefinesFold,
-						HandlesDeletedNotifications = sources.HandlesDeletedNotifications,
-						IncludeLinks = sources.IncludeLinksOption,
-						PartitionResultStreamNamePattern = sources.PartitionResultStreamNamePatternOption,
-						ProcessingLag = sources.ProcessingLagOption.GetValueOrDefault(),
-						IsBiState = sources.IsBiState,
-						ReorderEvents = sources.ReorderEventsOption,
-						ResultStreamName = sources.ResultStreamNameOption,
-					},
-			};
-		}
-
-		private bool Equals(string[] a, string[] b) {
-			bool aEmpty = (a == null || a.Length == 0);
-			bool bEmpty = (b == null || b.Length == 0);
-			if (aEmpty && bEmpty)
-				return true;
-			if (aEmpty || bEmpty)
-				return false;
-			return a.SequenceEqual(b);
-		}
-
-		protected bool Equals(ProjectionSourceDefinition other) {
-			return AllEvents.Equals(other.AllEvents) && AllStreams.Equals(other.AllStreams)
-			                                         && ByStream.Equals(other.ByStream) &&
-			                                         ByCustomPartitions.Equals(other.ByCustomPartitions)
-			                                         && Equals(Categories, other.Categories) &&
-			                                         Equals(Events, other.Events)
-			                                         && Equals(Streams, other.Streams)
-			                                         && LimitingCommitPosition == other.LimitingCommitPosition &&
-			                                         Equals(Options, other.Options);
-		}
-
-		public override bool Equals(object obj) {
-			if (ReferenceEquals(null, obj)) return false;
-			if (ReferenceEquals(this, obj)) return true;
-			if (obj.GetType() != this.GetType()) return false;
-			return Equals((ProjectionSourceDefinition)obj);
-		}
-
-		public override int GetHashCode() {
-			unchecked {
-				int hashCode = AllEvents.GetHashCode();
-				hashCode = (hashCode * 397) ^ AllStreams.GetHashCode();
-				hashCode = (hashCode * 397) ^ ByStream.GetHashCode();
-				hashCode = (hashCode * 397) ^ ByCustomPartitions.GetHashCode();
-				hashCode = (hashCode * 397) ^ LimitingCommitPosition.GetHashCode();
-				hashCode = (hashCode * 397) ^ (Options != null ? Options.GetHashCode() : 0);
-				return hashCode;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/ProjectionVersion.cs b/src/EventStore.Projections.Core/Services/Processing/ProjectionVersion.cs
deleted file mode 100644
index 409c37949da..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/ProjectionVersion.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-namespace EventStore.Projections.Core.Services.Processing {
-	public struct ProjectionVersion {
-		public readonly long ProjectionId;
-		public readonly long Epoch;
-		public readonly long Version;
-
-		public ProjectionVersion(long projectionId, long epoch, long version) {
-			ProjectionId = projectionId;
-			Epoch = epoch;
-			Version = version;
-		}
-
-		public bool Equals(ProjectionVersion other) {
-			return ProjectionId == other.ProjectionId && Epoch == other.Epoch && Version == other.Version;
-		}
-
-		public override bool Equals(object obj) {
-			if (ReferenceEquals(null, obj)) return false;
-			return obj is ProjectionVersion && Equals((ProjectionVersion)obj);
-		}
-
-		public override int GetHashCode() {
-			unchecked {
-				var hashCode = ProjectionId.GetHashCode();
-				hashCode = (hashCode * 397) ^ Epoch.GetHashCode();
-				hashCode = (hashCode * 397) ^ Version.GetHashCode();
-				return hashCode;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/QuerySourceOptions.cs b/src/EventStore.Projections.Core/Services/Processing/QuerySourceOptions.cs
deleted file mode 100644
index 72df311ebd7..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/QuerySourceOptions.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System.Runtime.Serialization;
-
-namespace EventStore.Projections.Core.Services.Processing;
-
-[DataContract]
-public class QuerySourceOptions {
-	[DataMember] public string ResultStreamName { get; set; }
-
-	[DataMember] public string PartitionResultStreamNamePattern { get; set; }
-
-	[DataMember] public bool ReorderEvents { get; set; }
-
-	[DataMember] public int ProcessingLag { get; set; }
-
-	[DataMember] public bool IsBiState { get; set; }
-
-	[DataMember] public bool DefinesStateTransform { get; set; }
-
-	[DataMember] public bool ProducesResults { get; set; }
-
-	[DataMember] public bool DefinesFold { get; set; }
-
-	[DataMember] public bool HandlesDeletedNotifications { get; set; }
-
-	[DataMember] public bool IncludeLinks { get; set; }
-
-	protected bool Equals(QuerySourceOptions other) {
-		return string.Equals(ResultStreamName, other.ResultStreamName)
-		       && string.Equals(PartitionResultStreamNamePattern, other.PartitionResultStreamNamePattern)
-		       && ReorderEvents.Equals(other.ReorderEvents) && ProcessingLag == other.ProcessingLag
-		       && IsBiState.Equals(other.IsBiState) && DefinesStateTransform.Equals(other.DefinesStateTransform)
-		       && ProducesResults.Equals(other.ProducesResults) && DefinesFold.Equals(other.DefinesFold)
-		       && HandlesDeletedNotifications.Equals(other.HandlesDeletedNotifications)
-		       && IncludeLinks.Equals(other.IncludeLinks);
-	}
-
-	public override bool Equals(object obj) {
-		if (ReferenceEquals(null, obj)) return false;
-		if (ReferenceEquals(this, obj)) return true;
-		if (obj.GetType() != this.GetType()) return false;
-		return Equals((QuerySourceOptions)obj);
-	}
-
-	public override int GetHashCode() {
-		unchecked {
-			int hashCode = (ResultStreamName != null ? ResultStreamName.GetHashCode() : 0);
-			hashCode = (hashCode * 397) ^ (PartitionResultStreamNamePattern != null
-				? PartitionResultStreamNamePattern.GetHashCode()
-				: 0);
-			hashCode = (hashCode * 397) ^ ReorderEvents.GetHashCode();
-			hashCode = (hashCode * 397) ^ ProcessingLag;
-			hashCode = (hashCode * 397) ^ IsBiState.GetHashCode();
-			hashCode = (hashCode * 397) ^ DefinesStateTransform.GetHashCode();
-			hashCode = (hashCode * 397) ^ ProducesResults.GetHashCode();
-			hashCode = (hashCode * 397) ^ DefinesFold.GetHashCode();
-			hashCode = (hashCode * 397) ^ HandlesDeletedNotifications.GetHashCode();
-			hashCode = (hashCode * 397) ^ IncludeLinks.GetHashCode();
-			return hashCode;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/RequestResponseQueueForwarder.cs b/src/EventStore.Projections.Core/Services/Processing/RequestResponseQueueForwarder.cs
deleted file mode 100644
index 0d563060932..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/RequestResponseQueueForwarder.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Messaging;
-
-namespace EventStore.Projections.Core.Services.Processing {
-	public class RequestResponseQueueForwarder : IHandle<ClientMessage.ReadEvent>,
-		IHandle<ClientMessage.ReadStreamEventsBackward>,
-		IHandle<ClientMessage.ReadStreamEventsForward>,
-		IHandle<ClientMessage.ReadAllEventsForward>,
-		IHandle<ClientMessage.WriteEvents>,
-		IHandle<ClientMessage.DeleteStream>,
-		IHandle<SystemMessage.SubSystemInitialized>,
-		IHandle<ProjectionCoreServiceMessage.SubComponentStarted>,
-		IHandle<ProjectionCoreServiceMessage.SubComponentStopped> {
-		private readonly IPublisher _externalRequestQueue;
-		private readonly IPublisher _inputQueue;
-
-		public RequestResponseQueueForwarder(IPublisher inputQueue, IPublisher externalRequestQueue) {
-			_inputQueue = inputQueue;
-			_externalRequestQueue = externalRequestQueue;
-		}
-
-		public void Handle(ClientMessage.ReadEvent msg) {
-			_externalRequestQueue.Publish(
-				new ClientMessage.ReadEvent(
-					msg.InternalCorrId, msg.CorrelationId, new PublishToWrapEnvelop(_inputQueue, msg.Envelope),
-					msg.EventStreamId, msg.EventNumber, msg.ResolveLinkTos, msg.RequireLeader, msg.User));
-		}
-
-		public void Handle(ClientMessage.WriteEvents msg) {
-			_externalRequestQueue.Publish(
-				new ClientMessage.WriteEvents(
-					msg.InternalCorrId, msg.CorrelationId, new PublishToWrapEnvelop(_inputQueue, msg.Envelope), true,
-					msg.EventStreamId, msg.ExpectedVersion, msg.Events, msg.User));
-		}
-
-		public void Handle(ClientMessage.DeleteStream msg) {
-			_externalRequestQueue.Publish(
-				new ClientMessage.DeleteStream(
-					msg.InternalCorrId, msg.CorrelationId, new PublishToWrapEnvelop(_inputQueue, msg.Envelope), true,
-					msg.EventStreamId, msg.ExpectedVersion, msg.HardDelete, msg.User));
-		}
-
-		public void Handle(ClientMessage.ReadStreamEventsBackward msg) {
-			_externalRequestQueue.Publish(
-				new ClientMessage.ReadStreamEventsBackward(
-					msg.InternalCorrId, msg.CorrelationId, new PublishToWrapEnvelop(_inputQueue, msg.Envelope),
-					msg.EventStreamId, msg.FromEventNumber, msg.MaxCount, msg.ResolveLinkTos, msg.RequireLeader,
-					msg.ValidationStreamVersion, msg.User));
-		}
-
-		public void Handle(ClientMessage.ReadStreamEventsForward msg) {
-			_externalRequestQueue.Publish(
-				new ClientMessage.ReadStreamEventsForward(
-					msg.InternalCorrId, msg.CorrelationId, new PublishToWrapEnvelop(_inputQueue, msg.Envelope),
-					msg.EventStreamId, msg.FromEventNumber, msg.MaxCount, msg.ResolveLinkTos, msg.RequireLeader,
-					msg.ValidationStreamVersion, msg.User, replyOnExpired: false));
-		}
-
-		public void Handle(ClientMessage.ReadAllEventsForward msg) {
-			_externalRequestQueue.Publish(
-				new ClientMessage.ReadAllEventsForward(
-					msg.InternalCorrId, msg.CorrelationId, new PublishToWrapEnvelop(_inputQueue, msg.Envelope),
-					msg.CommitPosition, msg.PreparePosition, msg.MaxCount, msg.ResolveLinkTos, msg.RequireLeader,
-					msg.ValidationTfLastCommitPosition, msg.User, replyOnExpired: false));
-		}
-
-		public void Handle(SystemMessage.SubSystemInitialized msg) {
-			_externalRequestQueue.Publish(
-				new SystemMessage.SubSystemInitialized(msg.SubSystemName));
-		}
-
-		void IHandle<ProjectionCoreServiceMessage.SubComponentStarted>.Handle(
-			ProjectionCoreServiceMessage.SubComponentStarted message) {
-			_externalRequestQueue.Publish(
-				new ProjectionCoreServiceMessage.SubComponentStarted(message.SubComponent, message.InstanceCorrelationId)
-			);
-		}
-
-		void IHandle<ProjectionCoreServiceMessage.SubComponentStopped>.Handle(
-			ProjectionCoreServiceMessage.SubComponentStopped message) {
-			_externalRequestQueue.Publish(
-				new ProjectionCoreServiceMessage.SubComponentStopped(message.SubComponent, message.QueueId)
-			);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/ResolvedEvent.cs b/src/EventStore.Projections.Core/Services/Processing/ResolvedEvent.cs
deleted file mode 100644
index 924afe4ef0f..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/ResolvedEvent.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Services;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Standard;
-using Newtonsoft.Json.Linq;
-
-namespace EventStore.Projections.Core.Services.Processing {
-	public class ResolvedEvent {
-		private readonly string _eventStreamId;
-		private readonly long _eventSequenceNumber;
-		private readonly bool _resolvedLinkTo;
-
-		private readonly string _positionStreamId;
-		private readonly long _positionSequenceNumber;
-		private readonly TFPos _position;
-		private readonly TFPos _eventOrLinkTargetPosition;
-		private readonly TFPos _linkOrEventPosition;
-
-
-		public readonly Guid EventId;
-		public readonly string EventType;
-		public readonly bool IsJson;
-		public readonly DateTime Timestamp;
-
-		public readonly string Data;
-		public readonly string Metadata;
-		public readonly string PositionMetadata;
-		public readonly string StreamMetadata;
-		public readonly bool IsLinkToDeletedStream;
-		public readonly bool IsLinkToDeletedStreamTombstone;
-
-		public ResolvedEvent(EventStore.Core.Data.ResolvedEvent resolvedEvent, byte[] streamMetadata) {
-			var positionEvent = resolvedEvent.Link ?? resolvedEvent.Event;
-			_linkOrEventPosition = resolvedEvent.OriginalPosition.GetValueOrDefault();
-			var @event = resolvedEvent.Event;
-			_positionStreamId = positionEvent.EventStreamId;
-			_positionSequenceNumber = positionEvent.EventNumber;
-			_eventStreamId = @event != null ? @event.EventStreamId : null;
-			_eventSequenceNumber = @event != null ? @event.EventNumber : -1;
-			_resolvedLinkTo = positionEvent != @event;
-			_position = resolvedEvent.OriginalPosition ?? new TFPos(-1, positionEvent.LogPosition);
-			EventId = @event != null ? @event.EventId : Guid.Empty;
-			EventType = @event != null ? @event.EventType : null;
-			IsJson = @event != null && (@event.Flags & PrepareFlags.IsJson) != 0;
-			Timestamp = positionEvent.TimeStamp;
-
-			//TODO: handle utf-8 conversion exception
-			Data = @event != null && @event.Data.Length > 0 ? Helper.UTF8NoBom.GetString(@event.Data.Span) : null;
-			Metadata = @event != null && @event.Metadata.Length > 0 ? Helper.UTF8NoBom.GetString(@event.Metadata.Span) : null;
-			PositionMetadata = _resolvedLinkTo
-				? (positionEvent.Metadata.Length > 0 ? Helper.UTF8NoBom.GetString(positionEvent.Metadata.Span) : null)
-				: null;
-			StreamMetadata = streamMetadata != null ? Helper.UTF8NoBom.GetString(streamMetadata) : null;
-
-			TFPos eventOrLinkTargetPosition;
-			if (_resolvedLinkTo) {
-				Dictionary<string, JToken> extraMetadata = null;
-				if (positionEvent.Metadata.Length > 0 && positionEvent.Metadata.Length > 0) {
-					//TODO: parse JSON only when unresolved link and just tag otherwise
-					CheckpointTag tag;
-					if (resolvedEvent.Link != null && resolvedEvent.Event == null) {
-						var checkpointTagJson =
-							positionEvent.Metadata.ParseCheckpointTagVersionExtraJson(default(ProjectionVersion));
-						tag = checkpointTagJson.Tag;
-						extraMetadata = checkpointTagJson.ExtraMetadata;
-
-						var parsedPosition = tag.Position;
-
-						eventOrLinkTargetPosition = parsedPosition != new TFPos(long.MinValue, long.MinValue)
-							? parsedPosition
-							: new TFPos(-1, positionEvent.LogPosition);
-					} else {
-						tag = positionEvent.Metadata.ParseCheckpointTagJson();
-						var parsedPosition = tag.Position;
-						if (parsedPosition == new TFPos(long.MinValue, long.MinValue) &&
-						    @event.Metadata.IsValidJson()) {
-							tag = @event.Metadata.ParseCheckpointTagJson();
-							if (tag != null) {
-								parsedPosition = tag.Position;
-							}
-						}
-
-						eventOrLinkTargetPosition = parsedPosition != new TFPos(long.MinValue, long.MinValue)
-							? parsedPosition
-							: new TFPos(-1, resolvedEvent.Event.LogPosition);
-					}
-				} else {
-					eventOrLinkTargetPosition = @event != null
-						? new TFPos(-1, @event.LogPosition)
-						: new TFPos(-1, positionEvent.LogPosition);
-				}
-
-				JToken deletedValue;
-				IsLinkToDeletedStreamTombstone = extraMetadata != null
-				                                 && extraMetadata.TryGetValue("$deleted", out deletedValue);
-				if (resolvedEvent.ResolveResult == ReadEventResult.NoStream
-				    || resolvedEvent.ResolveResult == ReadEventResult.StreamDeleted || IsLinkToDeletedStreamTombstone) {
-					IsLinkToDeletedStream = true;
-					var streamId = SystemEventTypes.StreamReferenceEventToStreamId(
-						SystemEventTypes.LinkTo, resolvedEvent.Link.Data);
-					_eventStreamId = streamId;
-				}
-			} else {
-				// not a link
-				eventOrLinkTargetPosition = resolvedEvent.OriginalPosition ?? new TFPos(-1, positionEvent.LogPosition);
-			}
-
-			_eventOrLinkTargetPosition = eventOrLinkTargetPosition;
-		}
-
-
-		public ResolvedEvent(
-			string positionStreamId, long positionSequenceNumber, string eventStreamId, long eventSequenceNumber,
-			bool resolvedLinkTo, TFPos position, TFPos eventOrLinkTargetPosition, Guid eventId, string eventType,
-			bool isJson, byte[] data,
-			byte[] metadata, byte[] positionMetadata, byte[] streamMetadata, DateTime timestamp) {
-			_positionStreamId = positionStreamId;
-			_positionSequenceNumber = positionSequenceNumber;
-			_eventStreamId = eventStreamId;
-			_eventSequenceNumber = eventSequenceNumber;
-			_resolvedLinkTo = resolvedLinkTo;
-			_position = position;
-			_eventOrLinkTargetPosition = eventOrLinkTargetPosition;
-			EventId = eventId;
-			EventType = eventType;
-			IsJson = isJson;
-			Timestamp = timestamp;
-
-			//TODO: handle utf-8 conversion exception
-			Data = data != null ? Helper.UTF8NoBom.GetString(data) : null;
-			Metadata = metadata != null ? Helper.UTF8NoBom.GetString(metadata) : null;
-			PositionMetadata = positionMetadata != null ? Helper.UTF8NoBom.GetString(positionMetadata) : null;
-			StreamMetadata = streamMetadata != null ? Helper.UTF8NoBom.GetString(streamMetadata) : null;
-		}
-
-
-		public ResolvedEvent(
-			string positionStreamId, long positionSequenceNumber, string eventStreamId, long eventSequenceNumber,
-			bool resolvedLinkTo, TFPos position, Guid eventId, string eventType, bool isJson, string data,
-			string metadata, string positionMetadata = null, string streamMetadata = null) {
-			DateTime timestamp = default(DateTime);
-			if (Guid.Empty == eventId)
-				throw new ArgumentException("Empty eventId provided.");
-			if (string.IsNullOrEmpty(eventType))
-				throw new ArgumentException("Empty eventType provided.");
-
-			_positionStreamId = positionStreamId;
-			_positionSequenceNumber = positionSequenceNumber;
-			_eventStreamId = eventStreamId;
-			_eventSequenceNumber = eventSequenceNumber;
-			_resolvedLinkTo = resolvedLinkTo;
-			_position = position;
-			EventId = eventId;
-			EventType = eventType;
-			IsJson = isJson;
-			Timestamp = timestamp;
-
-			Data = data;
-			Metadata = metadata;
-			PositionMetadata = positionMetadata;
-			StreamMetadata = streamMetadata;
-		}
-
-		public string EventStreamId {
-			get { return _eventStreamId; }
-		}
-
-		public long EventSequenceNumber {
-			get { return _eventSequenceNumber; }
-		}
-
-		public bool ResolvedLinkTo {
-			get { return _resolvedLinkTo; }
-		}
-
-		public string PositionStreamId {
-			get { return _positionStreamId; }
-		}
-
-		public long PositionSequenceNumber {
-			get { return _positionSequenceNumber; }
-		}
-
-		public TFPos Position {
-			get { return _position; }
-		}
-
-		public TFPos EventOrLinkTargetPosition {
-			get { return _eventOrLinkTargetPosition; }
-		}
-
-		public TFPos LinkOrEventPosition {
-			get { return _linkOrEventPosition; }
-		}
-
-		public bool IsStreamDeletedEvent {
-			get {
-				string temp;
-				return StreamDeletedHelper.IsStreamDeletedEvent(EventStreamId, EventType, Data, out temp);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/SingleStream/CategoryEventFilter.cs b/src/EventStore.Projections.Core/Services/Processing/SingleStream/CategoryEventFilter.cs
deleted file mode 100644
index 1cbaadb79eb..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/SingleStream/CategoryEventFilter.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace EventStore.Projections.Core.Services.Processing.SingleStream {
-	public class CategoryEventFilter : EventFilter {
-		private readonly string _category;
-		private readonly string _categoryStream;
-
-		public CategoryEventFilter(string category, bool allEvents, HashSet<string> events)
-			: base(allEvents, false, events) {
-			_category = category;
-			_categoryStream = "$ce-" + category;
-		}
-
-		protected override bool DeletedNotificationPasses(string positionStreamId) {
-			return _categoryStream == positionStreamId;
-		}
-
-		public override bool PassesSource(bool resolvedFromLinkTo, string positionStreamId, string eventType) {
-			return resolvedFromLinkTo && _categoryStream == positionStreamId;
-		}
-
-		public override string GetCategory(string positionStreamId) {
-			if (!positionStreamId.StartsWith("$ce-"))
-				throw new ArgumentException(string.Format("'{0}' is not a category stream", positionStreamId),
-					"positionStreamId");
-			return positionStreamId.Substring("$ce-".Length);
-		}
-
-		public override string ToString() {
-			return string.Format("Category: {0}, CategoryStream: {1}", _category, _categoryStream);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/SingleStream/StreamEventFilter.cs b/src/EventStore.Projections.Core/Services/Processing/SingleStream/StreamEventFilter.cs
deleted file mode 100644
index 70a1f9647f4..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/SingleStream/StreamEventFilter.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Collections.Generic;
-
-namespace EventStore.Projections.Core.Services.Processing.SingleStream {
-	public class StreamEventFilter : EventFilter {
-		private readonly string _streamId;
-
-		public StreamEventFilter(string streamId, bool allEvents, HashSet<string> events)
-			: base(allEvents, false, events) {
-			_streamId = streamId;
-		}
-
-		protected override bool DeletedNotificationPasses(string positionStreamId) {
-			return positionStreamId == _streamId;
-		}
-
-		public override bool PassesSource(bool resolvedFromLinkTo, string positionStreamId, string eventType) {
-			return positionStreamId == _streamId;
-		}
-
-		public override string GetCategory(string positionStreamId) {
-			return null;
-		}
-
-		public override string ToString() {
-			return string.Format("StreamId: {0}", _streamId);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/SingleStream/StreamEventReader.cs b/src/EventStore.Projections.Core/Services/Processing/SingleStream/StreamEventReader.cs
deleted file mode 100644
index 37f3315eee9..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/SingleStream/StreamEventReader.cs
+++ /dev/null
@@ -1,242 +0,0 @@
-using System;
-using System.Security.Claims;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Settings;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Standard;
-
-namespace EventStore.Projections.Core.Services.Processing.SingleStream {
-	public class StreamEventReader : EventReader,
-		IHandle<ClientMessage.ReadStreamEventsForwardCompleted>,
-		IHandle<ProjectionManagementMessage.Internal.ReadTimeout> {
-		private readonly string _streamName;
-		private long _fromSequenceNumber;
-		private readonly ITimeProvider _timeProvider;
-		private readonly bool _resolveLinkTos;
-		private readonly bool _produceStreamDeletes;
-
-		private bool _eventsRequested;
-		private int _maxReadCount = 111;
-		private long _lastPosition;
-		private bool _eof;
-		private Guid _pendingRequestCorrelationId;
-
-		public StreamEventReader(
-			IPublisher publisher,
-			Guid eventReaderCorrelationId,
-			ClaimsPrincipal readAs,
-			string streamName,
-			long fromSequenceNumber,
-			ITimeProvider timeProvider,
-			bool resolveLinkTos,
-			bool produceStreamDeletes,
-			bool stopOnEof = false)
-			: base(publisher, eventReaderCorrelationId, readAs, stopOnEof) {
-			if (fromSequenceNumber < 0) throw new ArgumentException("fromSequenceNumber");
-			if (streamName == null) throw new ArgumentNullException("streamName");
-			if (string.IsNullOrEmpty(streamName)) throw new ArgumentException("streamName");
-			_streamName = streamName;
-			_fromSequenceNumber = fromSequenceNumber;
-			_timeProvider = timeProvider;
-			_resolveLinkTos = resolveLinkTos;
-			_produceStreamDeletes = produceStreamDeletes;
-		}
-
-		protected override bool AreEventsRequested() {
-			return _eventsRequested;
-		}
-
-		public void Handle(ClientMessage.ReadStreamEventsForwardCompleted message) {
-			if (_disposed)
-				return;
-			if (!_eventsRequested)
-				throw new InvalidOperationException("Read events has not been requested");
-			if (message.EventStreamId != _streamName)
-				throw new InvalidOperationException(
-					string.Format("Invalid stream name: {0}.  Expected: {1}", message.EventStreamId, _streamName));
-			if (Paused)
-				throw new InvalidOperationException("Paused");
-			if (message.CorrelationId != _pendingRequestCorrelationId) {
-				return;
-			}
-
-			_eventsRequested = false;
-			_lastPosition = message.TfLastCommitPosition;
-			NotifyIfStarting(message.TfLastCommitPosition);
-			switch (message.Result) {
-				case ReadStreamResult.StreamDeleted:
-					_eof = true;
-					DeliverSafeJoinPosition(GetLastCommitPositionFrom(message)); // allow joining heading distribution
-					PauseOrContinueProcessing();
-					SendIdle();
-					SendPartitionDeleted_WhenReadingDataStream(_streamName, -1, null, null, null, null);
-					SendEof();
-					break;
-				case ReadStreamResult.NoStream:
-					_eof = true;
-					DeliverSafeJoinPosition(GetLastCommitPositionFrom(message)); // allow joining heading distribution
-					PauseOrContinueProcessing();
-					SendIdle();
-					if (message.LastEventNumber >= 0)
-						SendPartitionDeleted_WhenReadingDataStream(_streamName, message.LastEventNumber, null, null,
-							null, null);
-					SendEof();
-					break;
-				case ReadStreamResult.Success:
-					var oldFromSequenceNumber = StartFrom(message, _fromSequenceNumber);
-					_fromSequenceNumber = message.NextEventNumber;
-					var eof = (message.Events.Length == 0) && message.IsEndOfStream;
-					_eof = eof;
-					var willDispose = eof && _stopOnEof;
-
-					if (!willDispose) {
-						PauseOrContinueProcessing();
-					}
-
-					if (eof) {
-						// the end
-						DeliverSafeJoinPosition(GetLastCommitPositionFrom(message));
-						SendIdle();
-						SendEof();
-					} else {
-						for (int index = 0; index < message.Events.Length; index++) {
-							var @event = message.Events[index].Event;
-							var @link = message.Events[index].Link;
-							DeliverEvent(message.Events[index],
-								100.0f * (link ?? @event).EventNumber / message.LastEventNumber,
-								ref oldFromSequenceNumber);
-						}
-					}
-
-					break;
-				case ReadStreamResult.AccessDenied:
-					SendNotAuthorized();
-					return;
-				default:
-					throw new NotSupportedException(
-						string.Format("ReadEvents result code was not recognized. Code: {0}", message.Result));
-			}
-		}
-
-		public void Handle(ProjectionManagementMessage.Internal.ReadTimeout message) {
-			if (_disposed) return;
-			if (Paused) return;
-			if (message.CorrelationId != _pendingRequestCorrelationId) return;
-
-			_eventsRequested = false;
-			PauseOrContinueProcessing();
-		}
-
-		private long StartFrom(ClientMessage.ReadStreamEventsForwardCompleted message, long fromSequenceNumber) {
-			if (fromSequenceNumber != 0) return fromSequenceNumber;
-			if (message.Events.Length > 0) {
-				return message.Events[0].OriginalEventNumber;
-			}
-
-			return fromSequenceNumber;
-		}
-
-		private void SendIdle() {
-			_publisher.Publish(
-				new ReaderSubscriptionMessage.EventReaderIdle(EventReaderCorrelationId, _timeProvider.UtcNow));
-		}
-
-		protected override void RequestEvents() {
-			if (_disposed) throw new InvalidOperationException("Disposed");
-			if (_eventsRequested)
-				throw new InvalidOperationException("Read operation is already in progress");
-			if (PauseRequested || Paused)
-				throw new InvalidOperationException("Paused or pause requested");
-			_eventsRequested = true;
-
-			_pendingRequestCorrelationId = Guid.NewGuid();
-			var readEventsForward = CreateReadEventsMessage(_pendingRequestCorrelationId);
-			if (_eof) {
-				_publisher.Publish(
-					new AwakeServiceMessage.SubscribeAwake(
-						_publisher, Guid.NewGuid(), null,
-						new TFPos(_lastPosition, _lastPosition),
-						CreateReadTimeoutMessage(_pendingRequestCorrelationId, _streamName)));
-				_publisher.Publish(
-					new AwakeServiceMessage.SubscribeAwake(
-						_publisher, Guid.NewGuid(), null,
-						new TFPos(_lastPosition, _lastPosition), readEventsForward));
-			} else {
-				_publisher.Publish(readEventsForward);
-				ScheduleReadTimeoutMessage(_pendingRequestCorrelationId, _streamName);
-			}
-		}
-
-		private void ScheduleReadTimeoutMessage(Guid correlationId, string streamId) {
-			_publisher.Publish(CreateReadTimeoutMessage(correlationId, streamId));
-		}
-
-		private Message CreateReadTimeoutMessage(Guid correlationId, string streamId) {
-			return TimerMessage.Schedule.Create(
-				TimeSpan.FromMilliseconds(ESConsts.ReadRequestTimeout),
-				new SendToThisEnvelope(this),
-				new ProjectionManagementMessage.Internal.ReadTimeout(correlationId, streamId));
-		}
-
-		private Message CreateReadEventsMessage(Guid readCorrelationId) {
-			return new ClientMessage.ReadStreamEventsForward(
-				readCorrelationId, readCorrelationId, new SendToThisEnvelope(this), _streamName, _fromSequenceNumber,
-				_maxReadCount, _resolveLinkTos, false, null, ReadAs, replyOnExpired: false);
-		}
-
-		private void DeliverSafeJoinPosition(long? safeJoinPosition) {
-			if (_stopOnEof || safeJoinPosition == null || safeJoinPosition == -1)
-				return; //TODO: this should not happen, but StorageReader does not return it now
-			_publisher.Publish(
-				new ReaderSubscriptionMessage.CommittedEventDistributed(
-					EventReaderCorrelationId, null, safeJoinPosition, 100.0f, source: this.GetType()));
-		}
-
-		private void DeliverEvent(EventStore.Core.Data.ResolvedEvent pair, float progress, ref long sequenceNumber) {
-			EventRecord positionEvent = pair.OriginalEvent;
-			if (positionEvent.EventNumber != sequenceNumber) {
-				// This can happen when the original stream has $maxAge/$maxCount set
-				_publisher.Publish(new ReaderSubscriptionMessage.Faulted(EventReaderCorrelationId, string.Format(
-					"Event number {0} was expected in the stream {1}, but event number {2} was received. This may happen if events have been deleted from the beginning of your stream, please reset your projection.",
-					sequenceNumber, _streamName, positionEvent.EventNumber), this.GetType()));
-				return;
-			}
-
-			sequenceNumber = positionEvent.EventNumber + 1;
-			var resolvedEvent = new ResolvedEvent(pair, null);
-
-			string deletedPartitionStreamId;
-
-			if (resolvedEvent.IsLinkToDeletedStream && !resolvedEvent.IsLinkToDeletedStreamTombstone)
-				return;
-
-			bool isDeletedStreamEvent =
-				StreamDeletedHelper.IsStreamDeletedEventOrLinkToStreamDeletedEvent(resolvedEvent, pair.ResolveResult,
-					out deletedPartitionStreamId);
-
-			if (isDeletedStreamEvent) {
-				var deletedPartition = deletedPartitionStreamId;
-
-				if (_produceStreamDeletes)
-					_publisher.Publish(
-						//TODO: publish both link and event data
-						new ReaderSubscriptionMessage.EventReaderPartitionDeleted(
-							EventReaderCorrelationId, deletedPartition, source: this.GetType(), lastEventNumber: -1,
-							deleteEventOrLinkTargetPosition: null,
-							deleteLinkOrEventPosition: resolvedEvent.EventOrLinkTargetPosition,
-							positionStreamId: resolvedEvent.PositionStreamId,
-							positionEventNumber: resolvedEvent.PositionSequenceNumber));
-			} else if (!resolvedEvent.IsStreamDeletedEvent)
-				_publisher.Publish(
-					//TODO: publish both link and event data
-					new ReaderSubscriptionMessage.CommittedEventDistributed(
-						EventReaderCorrelationId, resolvedEvent, _stopOnEof ? (long?)null : positionEvent.LogPosition,
-						progress, source: this.GetType()));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/SingleStream/StreamPositionTagger.cs b/src/EventStore.Projections.Core/Services/Processing/SingleStream/StreamPositionTagger.cs
deleted file mode 100644
index 7f11ea55ee0..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/SingleStream/StreamPositionTagger.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using System;
-using System.Linq;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Services.Processing.SingleStream {
-	public class StreamPositionTagger : PositionTagger {
-		private readonly string _stream;
-
-		public StreamPositionTagger(int phase, string stream) : base(phase) {
-			if (stream == null) throw new ArgumentNullException("stream");
-			if (string.IsNullOrEmpty(stream)) throw new ArgumentException("stream");
-			_stream = stream;
-		}
-
-		public override bool IsMessageAfterCheckpointTag(
-			CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
-			if (previous.Phase < Phase)
-				return true;
-			if (previous.Mode_ != CheckpointTag.Mode.Stream)
-				throw new ArgumentException("Mode.Stream expected", "previous");
-			return committedEvent.Data.PositionStreamId == _stream
-			       && committedEvent.Data.PositionSequenceNumber > previous.Streams[_stream];
-		}
-
-		public override CheckpointTag MakeCheckpointTag(
-			CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
-			if (previous.Phase != Phase)
-				throw new ArgumentException(
-					string.Format("Invalid checkpoint tag phase.  Expected: {0} Was: {1}", Phase, previous.Phase));
-
-			if (committedEvent.Data.PositionStreamId != _stream)
-				throw new InvalidOperationException(
-					string.Format(
-						"Invalid stream '{0}'.  Expected stream is '{1}'", committedEvent.Data.EventStreamId, _stream));
-			return CheckpointTag.FromStreamPosition(previous.Phase, committedEvent.Data.PositionStreamId,
-				committedEvent.Data.PositionSequenceNumber);
-		}
-
-		public override CheckpointTag MakeCheckpointTag(CheckpointTag previous,
-			ReaderSubscriptionMessage.EventReaderPartitionEof partitionEof) {
-			throw new NotImplementedException();
-		}
-
-		public override CheckpointTag MakeCheckpointTag(
-			CheckpointTag previous, ReaderSubscriptionMessage.EventReaderPartitionDeleted partitionDeleted) {
-			if (previous.Phase != Phase)
-				throw new ArgumentException(
-					string.Format("Invalid checkpoint tag phase.  Expected: {0} Was: {1}", Phase, previous.Phase));
-
-			if (partitionDeleted.PositionStreamId != _stream)
-				throw new InvalidOperationException(
-					string.Format(
-						"Invalid stream '{0}'.  Expected stream is '{1}'", partitionDeleted.Partition, _stream));
-
-			// return ordinary checkpoint tag (suitable for fromCategory.foreachStream as well as for regular fromStream
-			return CheckpointTag.FromStreamPosition(
-				previous.Phase, partitionDeleted.PositionStreamId, partitionDeleted.PositionEventNumber.Value);
-		}
-
-		public override CheckpointTag MakeZeroCheckpointTag() {
-			return CheckpointTag.FromStreamPosition(Phase, _stream, -1);
-		}
-
-		public override bool IsCompatible(CheckpointTag checkpointTag) {
-			return checkpointTag.Mode_ == CheckpointTag.Mode.Stream && checkpointTag.Streams.Keys.First() == _stream;
-		}
-
-		public override CheckpointTag AdjustTag(CheckpointTag tag) {
-			if (tag.Phase < Phase)
-				return tag;
-			if (tag.Phase > Phase)
-				throw new ArgumentException(
-					string.Format("Invalid checkpoint tag phase.  Expected less or equal to: {0} Was: {1}", Phase,
-						tag.Phase), "tag");
-
-
-			if (tag.Mode_ == CheckpointTag.Mode.Stream) {
-				long p;
-				return CheckpointTag.FromStreamPosition(
-					tag.Phase, _stream, tag.Streams.TryGetValue(_stream, out p) ? p : -1);
-			}
-
-			switch (tag.Mode_) {
-				case CheckpointTag.Mode.EventTypeIndex:
-					throw new NotSupportedException(
-						"Conversion from EventTypeIndex to Stream position tag is not supported");
-				case CheckpointTag.Mode.PreparePosition:
-					throw new NotSupportedException(
-						"Conversion from PreparePosition to Stream position tag is not supported");
-				case CheckpointTag.Mode.MultiStream:
-					long p;
-					return CheckpointTag.FromStreamPosition(
-						tag.Phase, _stream, tag.Streams.TryGetValue(_stream, out p) ? p : -1);
-				case CheckpointTag.Mode.Position:
-					throw new NotSupportedException("Conversion from Position to Stream position tag is not supported");
-				default:
-					throw new NotSupportedException(string.Format(
-						"The given checkpoint is invalid. Possible causes might include having written an event to the projection's managed stream. The bad checkpoint: {0}",
-						tag.ToString()));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/SourceDefinitionBuilder.cs b/src/EventStore.Projections.Core/Services/Processing/SourceDefinitionBuilder.cs
deleted file mode 100644
index 82ba9393d1b..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/SourceDefinitionBuilder.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Services.Processing {
-	public sealed class SourceDefinitionBuilder : IQuerySources
-	{
-		private readonly QuerySourceOptions _options = new QuerySourceOptions();
-		private bool _allStreams;
-		private List<string> _categories;
-		private List<string> _streams;
-		private bool _allEvents;
-		private List<string> _events;
-		private bool _byStream;
-		private bool _byCustomPartitions;
-		private long? _limitingCommitPosition;
-
-		public SourceDefinitionBuilder() {
-			_options.DefinesFold = true;
-		}
-
-		public void FromAll() {
-			_allStreams = true;
-		}
-
-		public void FromCategory(string categoryName) {
-			if (_categories == null)
-				_categories = new List<string>();
-			_categories.Add(categoryName);
-		}
-
-		public void FromStream(string streamName) {
-			if (_streams == null)
-				_streams = new List<string>();
-			_streams.Add(streamName);
-		}
-
-		public void AllEvents() {
-			_allEvents = true;
-		}
-
-		public void NotAllEvents() {
-			_allEvents = false;
-		}
-
-		public void SetIncludeLinks(bool includeLinks = true) {
-			_options.IncludeLinks = includeLinks;
-		}
-
-		public void IncludeEvent(string eventName) {
-			if (_events == null)
-				_events = new List<string>();
-			_events.Add(eventName);
-		}
-
-		public void SetByStream() {
-			_byStream = true;
-		}
-
-		public void SetByCustomPartitions() {
-			_byCustomPartitions = true;
-		}
-
-		public void SetDefinesStateTransform() {
-			_options.DefinesStateTransform = true;
-		}
-
-		public void SetOutputState() {
-			_options.ProducesResults = true;
-		}
-
-		public void NoWhen() {
-			_options.DefinesFold = false;
-		}
-
-		public void SetDefinesFold() {
-			_options.DefinesFold = true;
-		}
-
-		public void SetResultStreamNameOption(string resultStreamName) {
-			_options.ResultStreamName = String.IsNullOrWhiteSpace(resultStreamName) ? null : resultStreamName;
-		}
-
-		public void SetPartitionResultStreamNamePatternOption(string partitionResultStreamNamePattern) {
-			_options.PartitionResultStreamNamePattern = String.IsNullOrWhiteSpace(partitionResultStreamNamePattern)
-				? null
-				: partitionResultStreamNamePattern;
-		}
-
-		public void SetReorderEvents(bool reorderEvents) {
-			_options.ReorderEvents = reorderEvents;
-		}
-
-		public void SetProcessingLag(int processingLag) {
-			_options.ProcessingLag = processingLag;
-		}
-
-		public void SetIsBiState(bool isBiState) {
-			_options.IsBiState = isBiState;
-		}
-
-		public void SetHandlesStreamDeletedNotifications(bool value = true) {
-			_options.HandlesDeletedNotifications = value;
-		}
-
-		public bool AllStreams {
-			get { return _allStreams; }
-		}
-
-		public string[] Categories {
-			get { return _categories != null ? _categories.ToArray() : null; }
-		}
-
-		public string[] Streams {
-			get { return _streams != null ? _streams.ToArray() : null; }
-		}
-
-		bool IQuerySources.AllEvents {
-			get { return _allEvents; }
-		}
-
-		public string[] Events {
-			get { return _events != null ? _events.ToArray() : null; }
-		}
-
-		public bool ByStreams {
-			get { return _byStream; }
-		}
-
-		public bool ByCustomPartitions {
-			get { return _byCustomPartitions; }
-		}
-
-		public long? LimitingCommitPosition {
-			get { return _limitingCommitPosition; }
-		}
-
-		public bool DefinesStateTransform {
-			get { return _options.DefinesStateTransform; }
-		}
-
-		public bool ProducesResults {
-			get { return _options.ProducesResults; }
-		}
-
-		public bool DefinesFold {
-			get { return _options.DefinesFold; }
-		}
-
-		public bool HandlesDeletedNotifications {
-			get { return _options.HandlesDeletedNotifications; }
-		}
-
-		public bool IncludeLinksOption {
-			get { return _options.IncludeLinks; }
-		}
-
-		public string ResultStreamNameOption {
-			get { return _options.ResultStreamName; }
-		}
-
-		public string PartitionResultStreamNamePatternOption {
-			get { return _options.PartitionResultStreamNamePattern; }
-		}
-
-		public bool ReorderEventsOption {
-			get { return _options.ReorderEvents; }
-		}
-
-		public int? ProcessingLagOption {
-			get { return _options.ProcessingLag; }
-		}
-
-		public bool IsBiState {
-			get { return _options.IsBiState; }
-		}
-
-		public static IQuerySources From(Action<SourceDefinitionBuilder> configure) {
-			var b = new SourceDefinitionBuilder();
-			configure(b);
-			return b.Build();
-		}
-
-		public IQuerySources Build() {
-			return QuerySourcesDefinition.From(this);
-		}
-
-		public void SetLimitingCommitPosition(long limitingCommitPosition) {
-			_limitingCommitPosition = limitingCommitPosition;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/StagedProcessingQueue.cs b/src/EventStore.Projections.Core/Services/Processing/StagedProcessingQueue.cs
deleted file mode 100644
index b1567318906..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/StagedProcessingQueue.cs
+++ /dev/null
@@ -1,266 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace EventStore.Projections.Core.Services.Processing {
-	/// <summary>
-	/// Staged processing queue allows queued processing of multi-step tasks.  The 
-	/// processing order allows multiple tasks to be processed at the same time with a constraint
-	/// a) ordered stage: all preceding tasks in the queue has already started processing at the given stage. 
-	/// b) unordered stage: no items with the same correlation_id are in the queue before current item
-	/// 
-	/// For instance:  multiple foreach sub-projections can request state to be loaded, then they can process
-	/// it and store.  But no subprojection can process events prior to preceding projections has completed processing. 
-	/// </summary>
-	public class StagedProcessingQueue {
-		private class TaskEntry {
-			public readonly StagedTask Task;
-			public readonly long Sequence;
-			public bool Busy;
-			public object BusyCorrelationId;
-			public TaskEntry PreviousByCorrelation;
-			public TaskEntry NextByCorrelation;
-			public TaskEntry Next;
-			public bool Completed;
-			public int ReadForStage;
-
-			public TaskEntry(StagedTask task, long sequence) {
-				Task = task;
-				ReadForStage = -1;
-				Sequence = sequence;
-			}
-
-			public override string ToString() {
-				return string.Format("ReadForStage: {3},  Busy: {1}, Completed: {2} => {0}", Task, Busy, Completed,
-					ReadForStage);
-			}
-		}
-
-		private class StageEntry {
-			public TaskEntry Entry;
-			public StageEntry Next;
-		}
-
-		private readonly bool[] _orderedStage;
-		private readonly Dictionary<object, TaskEntry> _correlationLastEntries = new Dictionary<object, TaskEntry>();
-		private StageEntry[] _byUnorderedStageFirst; // null means all processed? so append need to set it?
-		private StageEntry[] _byUnorderedStageLast; // null means all processed? so append need to set it?
-		private TaskEntry[] _byOrderedStageLast; // null means all processed? so append need to set it?
-		private long _sequence = 0;
-		private TaskEntry _first;
-		private TaskEntry _last;
-		private int _count;
-		private readonly int _maxStage;
-		public event Action EnsureTickPending;
-
-		public StagedProcessingQueue(bool[] orderedStage) {
-			_orderedStage = orderedStage.ToArray();
-			_byUnorderedStageFirst = new StageEntry[_orderedStage.Length];
-			_byUnorderedStageLast = new StageEntry[_orderedStage.Length];
-			_byOrderedStageLast = new TaskEntry[_orderedStage.Length];
-			_maxStage = _orderedStage.Length - 1;
-		}
-
-		public bool IsEmpty {
-			get { return _count == 0; }
-		}
-
-		public int Count {
-			get { return _count; }
-		}
-
-		public void Enqueue(StagedTask stagedTask) {
-			var entry = new TaskEntry(stagedTask, ++_sequence);
-			if (_first == null) {
-				_first = entry;
-				_last = entry;
-				_count = 1;
-			} else {
-				_last.Next = entry;
-				_last = entry;
-				_count++;
-			}
-
-			// re-initialize already completed queues
-			for (var stage = 0; stage <= _maxStage; stage++)
-				if (_orderedStage[stage] && _byOrderedStageLast[stage] == null)
-					_byOrderedStageLast[stage] = entry;
-
-			SetEntryCorrelation(entry, stagedTask.InitialCorrelationId);
-			EnqueueForStage(entry, 0);
-		}
-
-		public bool Process(int max = 1) {
-			int processed = 0;
-			int fromStage = _maxStage;
-			while (_count > 0 && processed < max) {
-				RemoveCompleted();
-				var entry = GetEntryToProcess(fromStage);
-				if (entry == null)
-					break;
-				ProcessEntry(entry);
-				fromStage = entry.ReadForStage;
-				processed++;
-			}
-
-			return processed > 0;
-		}
-
-		private void ProcessEntry(TaskEntry entry) {
-			// here we should be at the first StagedTask of current processing level which is not busy
-			entry.Busy = true;
-			AdvanceStage(entry.ReadForStage, entry);
-			entry.Task.Process(
-				entry.ReadForStage,
-				(readyForStage, newCorrelationId) => CompleteTaskProcessing(entry, readyForStage, newCorrelationId));
-		}
-
-		private TaskEntry GetEntryToProcess(int fromStage) {
-			var stageIndex = fromStage;
-			while (stageIndex >= 0) {
-				TaskEntry task = null;
-				if (!_orderedStage[stageIndex]) {
-					if (_byUnorderedStageFirst[stageIndex] != null
-					    && _byUnorderedStageFirst[stageIndex].Entry.PreviousByCorrelation == null) {
-						var stageEntry = _byUnorderedStageFirst[stageIndex];
-						task = stageEntry.Entry;
-					}
-				} else {
-					var taskEntry = _byOrderedStageLast[stageIndex];
-					if (taskEntry != null && taskEntry.ReadForStage == stageIndex && !taskEntry.Busy
-					    && !taskEntry.Completed && taskEntry.PreviousByCorrelation == null)
-						task = taskEntry;
-				}
-
-				if (task == null) {
-					stageIndex--;
-					continue;
-				}
-
-				if (task.ReadForStage != stageIndex)
-					throw new Exception();
-				return task;
-			}
-
-			return null;
-		}
-
-		private void RemoveCompleted() {
-			while (_first != null && _first.Completed) {
-				var task = _first;
-				_first = task.Next;
-				if (_first == null)
-					_last = null;
-				_count--;
-				if (task.BusyCorrelationId != null) {
-					var nextByCorrelation = task.NextByCorrelation;
-					if (nextByCorrelation != null) {
-						if (nextByCorrelation.PreviousByCorrelation != task)
-							throw new Exception("Invalid linked list by correlation");
-						task.NextByCorrelation = null;
-						nextByCorrelation.PreviousByCorrelation = null;
-						if (!_orderedStage[nextByCorrelation.ReadForStage])
-							EnqueueForStage(nextByCorrelation, nextByCorrelation.ReadForStage);
-					} else {
-						// remove the last one
-						_correlationLastEntries.Remove(task.BusyCorrelationId);
-					}
-				}
-			}
-		}
-
-		private void CompleteTaskProcessing(TaskEntry entry, int readyForStage, object newCorrelationId) {
-			if (!entry.Busy)
-				throw new InvalidOperationException("Task was not in progress");
-			entry.Busy = false;
-			SetEntryCorrelation(entry, newCorrelationId);
-			if (readyForStage < 0) {
-				MarkCompletedTask(entry);
-				if (entry == _first)
-					RemoveCompleted();
-			} else
-				EnqueueForStage(entry, readyForStage);
-
-			if (EnsureTickPending != null)
-				EnsureTickPending();
-		}
-
-		private void EnqueueForStage(TaskEntry entry, int readyForStage) {
-			entry.ReadForStage = readyForStage;
-			if (!_orderedStage[readyForStage] && (entry.PreviousByCorrelation == null)) {
-				var stageEntry = new StageEntry {Entry = entry, Next = null};
-				if (_byUnorderedStageFirst[readyForStage] != null) {
-					_byUnorderedStageLast[readyForStage].Next = stageEntry;
-					_byUnorderedStageLast[readyForStage] = stageEntry;
-				} else {
-					_byUnorderedStageFirst[readyForStage] = stageEntry;
-					_byUnorderedStageLast[readyForStage] = stageEntry;
-				}
-			}
-		}
-
-		private void AdvanceStage(int stage, TaskEntry entry) {
-			if (!_orderedStage[stage]) {
-				if (_byUnorderedStageFirst[stage].Entry != entry)
-					throw new ArgumentException(
-						string.Format("entry is not a head of the queue at the stage {0}", stage), "entry");
-				_byUnorderedStageFirst[stage] = _byUnorderedStageFirst[stage].Next;
-				if (_byUnorderedStageFirst[stage] == null)
-					_byUnorderedStageLast[stage] = null;
-			} else {
-				if (_byOrderedStageLast[stage] != entry)
-					throw new ArgumentException(
-						string.Format("entry is not a head of the queue at the stage {0}", stage), "entry");
-				_byOrderedStageLast[stage] = entry.Next;
-			}
-		}
-
-		private void SetEntryCorrelation(TaskEntry entry, object newCorrelationId) {
-			if (!Equals(entry.BusyCorrelationId, newCorrelationId)) {
-				if (entry.ReadForStage != -1 && !_orderedStage[entry.ReadForStage])
-					throw new InvalidOperationException("Cannot set busy correlation id at non-ordered stage");
-				if (entry.BusyCorrelationId != null)
-					throw new InvalidOperationException("Busy correlation id has been already set");
-
-				entry.BusyCorrelationId = newCorrelationId;
-				if (newCorrelationId != null) {
-					TaskEntry lastEntry;
-					if (_correlationLastEntries.TryGetValue(newCorrelationId, out lastEntry)) {
-						if (entry.Sequence < lastEntry.Sequence)
-							//NOTE: should never happen as we require ordered stage or initialization
-							throw new InvalidOperationException(
-								"Cannot inject task correlation id before another task with the same correlation id");
-						lastEntry.NextByCorrelation = entry;
-						entry.PreviousByCorrelation = lastEntry;
-						_correlationLastEntries[newCorrelationId] = entry;
-					} else
-						_correlationLastEntries.Add(newCorrelationId, entry);
-				}
-			}
-		}
-
-		private void MarkCompletedTask(TaskEntry entry) {
-			entry.Completed = true;
-		}
-
-		public void Initialize() {
-			_correlationLastEntries.Clear();
-			_byUnorderedStageFirst = new StageEntry[_orderedStage.Length];
-			_byUnorderedStageLast = new StageEntry[_orderedStage.Length];
-			_byOrderedStageLast = new TaskEntry[_orderedStage.Length];
-			_count = 0;
-			_first = null;
-			_last = null;
-		}
-	}
-
-	public abstract class StagedTask {
-		public readonly object InitialCorrelationId;
-
-		protected StagedTask(object initialCorrelationId) {
-			InitialCorrelationId = initialCorrelationId;
-		}
-
-		public abstract void Process(int onStage, Action<int, object> readyForStage);
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Strategies/ContinuousProjectionProcessingStrategy.cs b/src/EventStore.Projections.Core/Services/Processing/Strategies/ContinuousProjectionProcessingStrategy.cs
deleted file mode 100644
index 2868e5217f6..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Strategies/ContinuousProjectionProcessingStrategy.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using EventStore.Projections.Core.Services.Processing.Phases;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Projections.Core.Services.Processing.Strategies {
-	public class ContinuousProjectionProcessingStrategy : DefaultProjectionProcessingStrategy {
-		public ContinuousProjectionProcessingStrategy(
-			string name, ProjectionVersion projectionVersion, IProjectionStateHandler stateHandler,
-			ProjectionConfig projectionConfig, IQuerySources sourceDefinition, ILogger logger,
-			ReaderSubscriptionDispatcher subscriptionDispatcher, bool enableContentTypeValidation)
-			: base(
-				name, projectionVersion, stateHandler, projectionConfig, sourceDefinition, logger,
-				subscriptionDispatcher, enableContentTypeValidation) {
-		}
-
-		public override bool GetStopOnEof() {
-			return false;
-		}
-
-		public override bool GetUseCheckpoints() {
-			return _projectionConfig.CheckpointsEnabled;
-		}
-
-		public override bool GetProducesRunningResults() {
-			return _sourceDefinition.ProducesResults;
-		}
-
-		protected override IProjectionProcessingPhase[] CreateProjectionProcessingPhases(
-			IPublisher publisher,
-			IPublisher inputQueue,
-			Guid projectionCorrelationId,
-			ProjectionNamesBuilder namingBuilder,
-			PartitionStateCache partitionStateCache,
-			CoreProjection coreProjection,
-			IODispatcher ioDispatcher,
-			IProjectionProcessingPhase firstPhase) {
-			return new IProjectionProcessingPhase[] {firstPhase};
-		}
-
-		protected override IResultEventEmitter CreateFirstPhaseResultEmitter(ProjectionNamesBuilder namingBuilder) {
-			return _sourceDefinition.ProducesResults
-				? new ResultEventEmitter(namingBuilder)
-				: (IResultEventEmitter)new NoopResultEventEmitter();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Strategies/DefaultProjectionProcessingStrategy.cs b/src/EventStore.Projections.Core/Services/Processing/Strategies/DefaultProjectionProcessingStrategy.cs
deleted file mode 100644
index 0f54cdf73d5..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Strategies/DefaultProjectionProcessingStrategy.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using EventStore.Projections.Core.Services.Processing.Phases;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Projections.Core.Services.Processing.Strategies {
-	public abstract class DefaultProjectionProcessingStrategy : EventReaderBasedProjectionProcessingStrategy {
-		private readonly IProjectionStateHandler _stateHandler;
-
-		protected DefaultProjectionProcessingStrategy(
-			string name, ProjectionVersion projectionVersion, IProjectionStateHandler stateHandler,
-			ProjectionConfig projectionConfig, IQuerySources sourceDefinition, ILogger logger,
-			ReaderSubscriptionDispatcher subscriptionDispatcher, bool enableContentTypeValidation)
-			: base(name, projectionVersion, projectionConfig, sourceDefinition, logger, subscriptionDispatcher, enableContentTypeValidation) {
-			_stateHandler = stateHandler;
-		}
-
-		protected override IProjectionProcessingPhase CreateFirstProcessingPhase(
-			IPublisher publisher,
-			IPublisher inputQueue,
-			Guid projectionCorrelationId,
-			PartitionStateCache partitionStateCache,
-			Action updateStatistics,
-			CoreProjection coreProjection,
-			ReaderSubscriptionDispatcher subscriptionDispatcher,
-			CheckpointTag zeroCheckpointTag,
-			ICoreProjectionCheckpointManager checkpointManager,
-			IReaderStrategy readerStrategy,
-			IResultWriter resultWriter,
-			IEmittedStreamsTracker emittedStreamsTracker) {
-			var statePartitionSelector = CreateStatePartitionSelector();
-
-			var orderedPartitionProcessing = _sourceDefinition.ByStreams && _sourceDefinition.IsBiState;
-			return new EventProcessingProjectionProcessingPhase(
-				coreProjection,
-				projectionCorrelationId,
-				publisher,
-				inputQueue,
-				_projectionConfig,
-				updateStatistics,
-				_stateHandler,
-				partitionStateCache,
-				_sourceDefinition.DefinesStateTransform,
-				_name,
-				_logger,
-				zeroCheckpointTag,
-				checkpointManager,
-				statePartitionSelector,
-				subscriptionDispatcher,
-				readerStrategy,
-				resultWriter,
-				_projectionConfig.CheckpointsEnabled,
-				this.GetStopOnEof(),
-				_sourceDefinition.IsBiState,
-				orderedPartitionProcessing: orderedPartitionProcessing,
-				emittedStreamsTracker: emittedStreamsTracker,
-				enableContentTypeValidation: _enableContentTypeValidation);
-		}
-
-		protected virtual StatePartitionSelector CreateStatePartitionSelector() {
-			return _sourceDefinition.ByCustomPartitions
-				? new ByHandleStatePartitionSelector(_stateHandler)
-				: (_sourceDefinition.ByStreams
-					? (StatePartitionSelector)new ByStreamStatePartitionSelector()
-					: new NoopStatePartitionSelector());
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Strategies/IReaderStrategy.cs b/src/EventStore.Projections.Core/Services/Processing/Strategies/IReaderStrategy.cs
deleted file mode 100644
index 439fe679a3b..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Strategies/IReaderStrategy.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
-
-namespace EventStore.Projections.Core.Services.Processing.Strategies {
-	public interface IReaderStrategy {
-		bool IsReadingOrderRepeatable { get; }
-		EventFilter EventFilter { get; }
-		PositionTagger PositionTagger { get; }
-
-		IReaderSubscription CreateReaderSubscription(
-			IPublisher publisher, CheckpointTag fromCheckpointTag, Guid subscriptionId,
-			ReaderSubscriptionOptions readerSubscriptionOptions);
-
-		IEventReader CreatePausedEventReader(
-			Guid eventReaderId, IPublisher publisher, IODispatcher ioDispatcher, CheckpointTag checkpointTag,
-			bool stopOnEof, int? stopAfterNEvents);
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Strategies/IResultWriter.cs b/src/EventStore.Projections.Core/Services/Processing/Strategies/IResultWriter.cs
deleted file mode 100644
index 7e3655f9dde..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Strategies/IResultWriter.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Services.Processing.Strategies {
-	public interface IResultWriter {
-		//NOTE: subscriptionId should not be here.  Reconsider how to pass it to follower projection result writer
-		void WriteEofResult(
-			Guid subscriptionId, string partition, string resultBody, CheckpointTag causedBy, Guid causedByGuid,
-			string correlationId);
-
-		void WriteRunningResult(EventProcessedResult result);
-
-		void AccountPartition(EventProcessedResult result);
-
-		void EventsEmitted(EmittedEventEnvelope[] scheduledWrites, Guid causedBy, string correlationId);
-
-		void WriteProgress(Guid subscriptionId, float progress);
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Strategies/ProcessingStrategySelector.cs b/src/EventStore.Projections.Core/Services/Processing/Strategies/ProcessingStrategySelector.cs
deleted file mode 100644
index 9ec9d148074..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Strategies/ProcessingStrategySelector.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using EventStore.Projections.Core.Messages;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Projections.Core.Services.Processing.Strategies {
-	public class ProcessingStrategySelector {
-		private readonly ILogger _logger = Serilog.Log.ForContext<ProcessingStrategySelector>();
-		private readonly ReaderSubscriptionDispatcher _subscriptionDispatcher;
-
-		public ProcessingStrategySelector(
-			ReaderSubscriptionDispatcher subscriptionDispatcher) {
-			_subscriptionDispatcher = subscriptionDispatcher;
-		}
-
-		public ProjectionProcessingStrategy CreateProjectionProcessingStrategy(
-			string name,
-			ProjectionVersion projectionVersion,
-			ProjectionNamesBuilder namesBuilder,
-			IQuerySources sourceDefinition,
-			ProjectionConfig projectionConfig,
-			IProjectionStateHandler stateHandler, string handlerType, string query, bool enableContentTypeValidation) {
-
-			return projectionConfig.StopOnEof
-				? (ProjectionProcessingStrategy)
-				new QueryProcessingStrategy(
-					name,
-					projectionVersion,
-					stateHandler,
-					projectionConfig,
-					sourceDefinition,
-					_logger,
-					_subscriptionDispatcher,
-					enableContentTypeValidation)
-				: new ContinuousProjectionProcessingStrategy(
-					name,
-					projectionVersion,
-					stateHandler,
-					projectionConfig,
-					sourceDefinition,
-					_logger,
-					_subscriptionDispatcher,
-					enableContentTypeValidation);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Strategies/ProjectionProcessingStrategy.cs b/src/EventStore.Projections.Core/Services/Processing/Strategies/ProjectionProcessingStrategy.cs
deleted file mode 100644
index 6e4311e088f..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Strategies/ProjectionProcessingStrategy.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using System;
-using System.Security.Claims;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Core.Services.TimerService;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using EventStore.Projections.Core.Services.Processing.Phases;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Projections.Core.Services.Processing.Strategies {
-	public abstract class ProjectionProcessingStrategy {
-		protected readonly string _name;
-		protected readonly ProjectionVersion _projectionVersion;
-		protected readonly ILogger _logger;
-
-		protected ProjectionProcessingStrategy(string name, ProjectionVersion projectionVersion, ILogger logger) {
-			_name = name;
-			_projectionVersion = projectionVersion;
-			_logger = logger;
-		}
-
-		public CoreProjection Create(
-			Guid projectionCorrelationId,
-			IPublisher inputQueue,
-			Guid workerId,
-			ClaimsPrincipal runAs,
-			IPublisher publisher,
-			IODispatcher ioDispatcher,
-			ReaderSubscriptionDispatcher subscriptionDispatcher,
-			ITimeProvider timeProvider) {
-			if (inputQueue == null) throw new ArgumentNullException("inputQueue");
-			//if (runAs == null) throw new ArgumentNullException("runAs");
-			if (publisher == null) throw new ArgumentNullException("publisher");
-			if (ioDispatcher == null) throw new ArgumentNullException("ioDispatcher");
-			if (timeProvider == null) throw new ArgumentNullException("timeProvider");
-
-			var namingBuilder = new ProjectionNamesBuilder(_name, GetSourceDefinition());
-
-			var coreProjectionCheckpointWriter =
-				new CoreProjectionCheckpointWriter(
-					namingBuilder.MakeCheckpointStreamName(),
-					ioDispatcher,
-					_projectionVersion,
-					namingBuilder.EffectiveProjectionName);
-
-			var partitionStateCache = new PartitionStateCache();
-
-			return new CoreProjection(
-				this,
-				_projectionVersion,
-				projectionCorrelationId,
-				inputQueue,
-				workerId,
-				runAs,
-				publisher,
-				ioDispatcher,
-				subscriptionDispatcher,
-				_logger,
-				namingBuilder,
-				coreProjectionCheckpointWriter,
-				partitionStateCache,
-				namingBuilder.EffectiveProjectionName,
-				timeProvider);
-		}
-
-		protected abstract IQuerySources GetSourceDefinition();
-
-		public abstract bool GetStopOnEof();
-		public abstract bool GetUseCheckpoints();
-		public abstract bool GetRequiresRootPartition();
-		public abstract bool GetProducesRunningResults();
-		public abstract void EnrichStatistics(ProjectionStatistics info);
-
-		public abstract IProjectionProcessingPhase[] CreateProcessingPhases(
-			IPublisher publisher,
-			IPublisher inputQueue,
-			Guid projectionCorrelationId,
-			PartitionStateCache partitionStateCache,
-			Action updateStatistics,
-			CoreProjection coreProjection,
-			ProjectionNamesBuilder namingBuilder,
-			ITimeProvider timeProvider,
-			IODispatcher ioDispatcher,
-			CoreProjectionCheckpointWriter coreProjectionCheckpointWriter);
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Strategies/QueryProcessingStrategy.cs b/src/EventStore.Projections.Core/Services/Processing/Strategies/QueryProcessingStrategy.cs
deleted file mode 100644
index b56b05b2f3d..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Strategies/QueryProcessingStrategy.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using EventStore.Projections.Core.Services.Processing.Phases;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Projections.Core.Services.Processing.Strategies {
-	public class QueryProcessingStrategy : DefaultProjectionProcessingStrategy {
-		public QueryProcessingStrategy(
-			string name, ProjectionVersion projectionVersion, IProjectionStateHandler stateHandler,
-			ProjectionConfig projectionConfig, IQuerySources sourceDefinition, ILogger logger,
-			ReaderSubscriptionDispatcher subscriptionDispatcher, bool enableContentTypeValidation)
-			: base(
-				name, projectionVersion, stateHandler, projectionConfig, sourceDefinition, logger,
-				subscriptionDispatcher, enableContentTypeValidation) {
-		}
-
-		public override bool GetStopOnEof() {
-			return true;
-		}
-
-		public override bool GetUseCheckpoints() {
-			return false;
-		}
-
-		public override bool GetProducesRunningResults() {
-			return !_sourceDefinition.DefinesFold;
-		}
-
-		protected override IProjectionProcessingPhase[] CreateProjectionProcessingPhases(
-			IPublisher publisher, IPublisher inputQueue, Guid projectionCorrelationId,
-			ProjectionNamesBuilder namingBuilder,
-			PartitionStateCache partitionStateCache, CoreProjection coreProjection, IODispatcher ioDispatcher,
-			IProjectionProcessingPhase firstPhase) {
-			var coreProjectionCheckpointWriter =
-				new CoreProjectionCheckpointWriter(
-					namingBuilder.MakeCheckpointStreamName(), ioDispatcher, _projectionVersion, _name);
-			var checkpointManager2 = new DefaultCheckpointManager(
-				publisher, projectionCorrelationId, _projectionVersion, SystemAccounts.System, ioDispatcher,
-				_projectionConfig, _name, new PhasePositionTagger(1), namingBuilder, GetUseCheckpoints(), false,
-				_sourceDefinition.DefinesFold, coreProjectionCheckpointWriter);
-
-			IProjectionProcessingPhase writeResultsPhase;
-			if (GetProducesRunningResults())
-				writeResultsPhase = new WriteQueryEofProjectionProcessingPhase(
-					publisher,
-					1,
-					namingBuilder.GetResultStreamName(),
-					coreProjection,
-					partitionStateCache,
-					checkpointManager2,
-					checkpointManager2,
-					firstPhase.EmittedStreamsTracker);
-			else
-				writeResultsPhase = new WriteQueryResultProjectionProcessingPhase(
-					publisher,
-					1,
-					namingBuilder.GetResultStreamName(),
-					coreProjection,
-					partitionStateCache,
-					checkpointManager2,
-					checkpointManager2,
-					firstPhase.EmittedStreamsTracker);
-
-			return new[] {firstPhase, writeResultsPhase};
-		}
-
-		protected override IResultEventEmitter CreateFirstPhaseResultEmitter(ProjectionNamesBuilder namingBuilder) {
-			return new ResultEventEmitter(namingBuilder);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Strategies/ReaderStrategy.cs b/src/EventStore.Projections.Core/Services/Processing/Strategies/ReaderStrategy.cs
deleted file mode 100644
index a942778b6aa..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Strategies/ReaderStrategy.cs
+++ /dev/null
@@ -1,296 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Services.TimerService;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.AllStream;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.EventByType;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using EventStore.Projections.Core.Services.Processing.SingleStream;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
-
-namespace EventStore.Projections.Core.Services.Processing.Strategies {
-	public class ReaderStrategy : IReaderStrategy {
-		private readonly bool _allStreams;
-		private readonly HashSet<string> _categories;
-		private readonly HashSet<string> _streams;
-		private readonly bool _allEvents;
-		private readonly bool _includeLinks;
-		private readonly HashSet<string> _events;
-		private readonly bool _includeStreamDeletedNotification;
-		private readonly bool _reorderEvents;
-		private readonly ClaimsPrincipal _runAs;
-		private readonly int _processingLag;
-
-
-		private readonly EventFilter _eventFilter;
-		private readonly PositionTagger _positionTagger;
-		private readonly ITimeProvider _timeProvider;
-
-		private readonly string _tag;
-		private readonly int _phase;
-
-		public static IReaderStrategy Create(
-			string tag,
-			int phase,
-			IQuerySources sources,
-			ITimeProvider timeProvider,
-			bool stopOnEof,
-			ClaimsPrincipal runAs) {
-			if (!sources.AllStreams && !sources.HasCategories() && !sources.HasStreams())
-				throw new InvalidOperationException("None of streams and categories are included");
-			if (!sources.AllEvents && !sources.HasEvents())
-				throw new InvalidOperationException("None of events are included");
-			if (sources.HasStreams() && sources.HasCategories())
-				throw new InvalidOperationException(
-					"Streams and categories cannot be included in a filter at the same time");
-			if (sources.AllStreams && (sources.HasCategories() || sources.HasStreams()))
-				throw new InvalidOperationException("Both FromAll and specific categories/streams cannot be set");
-			if (sources.AllEvents && sources.HasEvents())
-				throw new InvalidOperationException("Both AllEvents and specific event filters cannot be set");
-
-			if (sources.ByStreams && sources.HasStreams())
-				throw new InvalidOperationException(
-					"foreachStream projections are not supported on stream based sources");
-
-			if (sources.ReorderEventsOption) {
-				if (sources.AllStreams)
-					throw new InvalidOperationException("Event reordering cannot be used with fromAll()");
-				if (!(sources.HasStreams() && sources.Streams.Length > 1)) {
-					throw new InvalidOperationException(
-						"Event reordering is only available in fromStreams([]) projections");
-				}
-
-				if (sources.ProcessingLagOption < 50)
-					throw new InvalidOperationException("Event reordering requires processing lag at least of 50ms");
-			}
-
-			if (sources.HandlesDeletedNotifications && !sources.ByStreams)
-				throw new InvalidOperationException(
-					"Deleted stream notifications are only supported with foreachStream()");
-
-			var readerStrategy = new ReaderStrategy(
-				tag,
-				phase,
-				sources.AllStreams,
-				sources.Categories,
-				sources.Streams,
-				sources.AllEvents,
-				sources.IncludeLinksOption,
-				sources.Events,
-				sources.HandlesDeletedNotifications,
-				sources.ProcessingLagOption,
-				sources.ReorderEventsOption,
-				runAs,
-				timeProvider);
-			return readerStrategy;
-		}
-
-		private ReaderStrategy(
-			string tag,
-			int phase,
-			bool allStreams,
-			string[] categories,
-			string[] streams,
-			bool allEvents,
-			bool includeLinks,
-			string[] events,
-			bool includeStreamDeletedNotification,
-			int? processingLag,
-			bool reorderEvents,
-			ClaimsPrincipal runAs,
-			ITimeProvider timeProvider) {
-			_tag = tag;
-			_phase = phase;
-			_allStreams = allStreams;
-			_categories = categories != null && categories.Length > 0 ? new HashSet<string>(categories) : null;
-			_streams = streams != null && streams.Length > 0 ? new HashSet<string>(streams) : null;
-			_allEvents = allEvents;
-			_includeLinks = includeLinks;
-			_events = events != null && events.Length > 0 ? new HashSet<string>(events) : null;
-			_includeStreamDeletedNotification = includeStreamDeletedNotification;
-			_processingLag = processingLag.GetValueOrDefault();
-			_reorderEvents = reorderEvents;
-			_runAs = runAs;
-
-			_eventFilter = CreateEventFilter();
-			_positionTagger = CreatePositionTagger();
-			_timeProvider = timeProvider;
-		}
-
-		public bool IsReadingOrderRepeatable {
-			get { return !(_streams != null && _streams.Count > 1); }
-		}
-
-		public EventFilter EventFilter {
-			get { return _eventFilter; }
-		}
-
-		public PositionTagger PositionTagger {
-			get { return _positionTagger; }
-		}
-
-		public int Phase {
-			get { return _phase; }
-		}
-
-		public IReaderSubscription CreateReaderSubscription(
-			IPublisher publisher, CheckpointTag fromCheckpointTag, Guid subscriptionId,
-			ReaderSubscriptionOptions readerSubscriptionOptions) {
-			if (_reorderEvents)
-				return new EventReorderingReaderSubscription(
-					publisher,
-					subscriptionId,
-					fromCheckpointTag,
-					this,
-					_timeProvider,
-					readerSubscriptionOptions.CheckpointUnhandledBytesThreshold,
-					readerSubscriptionOptions.CheckpointProcessedEventsThreshold,
-					readerSubscriptionOptions.CheckpointAfterMs,
-					_processingLag,
-					readerSubscriptionOptions.StopOnEof,
-					readerSubscriptionOptions.StopAfterNEvents,
-					readerSubscriptionOptions.EnableContentTypeValidation);
-			else
-				return new ReaderSubscription(
-					_tag,
-					publisher,
-					subscriptionId,
-					fromCheckpointTag,
-					this,
-					_timeProvider,
-					readerSubscriptionOptions.CheckpointUnhandledBytesThreshold,
-					readerSubscriptionOptions.CheckpointProcessedEventsThreshold,
-					readerSubscriptionOptions.CheckpointAfterMs,
-					readerSubscriptionOptions.StopOnEof,
-					readerSubscriptionOptions.StopAfterNEvents,
-					readerSubscriptionOptions.EnableContentTypeValidation);
-		}
-
-		public IEventReader CreatePausedEventReader(
-			Guid eventReaderId, IPublisher publisher, IODispatcher ioDispatcher, CheckpointTag checkpointTag,
-			bool stopOnEof, int? stopAfterNEvents) {
-			if (_allStreams && _events != null && _events.Count >= 1) {
-				//IEnumerable<string> streams = GetEventIndexStreams();
-				return CreatePausedEventIndexEventReader(
-					eventReaderId, ioDispatcher, publisher, checkpointTag, stopOnEof, stopAfterNEvents, true, _events,
-					_includeStreamDeletedNotification);
-			}
-
-			if (_allStreams) {
-				var eventReader = new TransactionFileEventReader(publisher, eventReaderId, _runAs,
-					new TFPos(checkpointTag.CommitPosition.Value, checkpointTag.PreparePosition.Value), _timeProvider,
-					deliverEndOfTFPosition: true, stopOnEof: stopOnEof, resolveLinkTos: false);
-				return eventReader;
-			}
-
-			if (_streams != null && _streams.Count == 1) {
-				var streamName = checkpointTag.Streams.Keys.First();
-				//TODO: handle if not the same
-				return CreatePausedStreamEventReader(
-					eventReaderId, ioDispatcher, publisher, checkpointTag, streamName, stopOnEof, resolveLinkTos: true,
-					stopAfterNEvents: stopAfterNEvents, produceStreamDeletes: _includeStreamDeletedNotification);
-			}
-
-			if (_categories != null && _categories.Count == 1) {
-				var streamName = checkpointTag.Streams.Keys.First();
-				return CreatePausedStreamEventReader(
-					eventReaderId, ioDispatcher, publisher, checkpointTag, streamName, stopOnEof, resolveLinkTos: true,
-					stopAfterNEvents: stopAfterNEvents, produceStreamDeletes: _includeStreamDeletedNotification);
-			}
-
-			if (_streams != null && _streams.Count > 1) {
-				return CreatePausedMultiStreamEventReader(
-					eventReaderId, ioDispatcher, publisher, checkpointTag, stopOnEof, stopAfterNEvents, true, _streams);
-			}
-
-			throw new NotSupportedException();
-		}
-
-		//TODO: clean up $deleted event notification vs $streamDeleted event
-
-		private EventFilter CreateEventFilter() {
-			if (_allStreams && _events != null && _events.Count >= 1)
-				return new EventByTypeIndexEventFilter(_events);
-			if (_allStreams)
-				//NOTE: a projection cannot handle both stream deleted notifications
-				// and real stream tombstone/stream deleted events as they have the same position
-				// and thus processing cannot be correctly checkpointed
-				return new TransactionFileEventFilter(
-					_allEvents, !_includeStreamDeletedNotification, _events, includeLinks: _includeLinks);
-			if (_categories != null && _categories.Count == 1)
-				return new CategoryEventFilter(_categories.First(), _allEvents, _events);
-			if (_categories != null)
-				throw new NotSupportedException();
-			if (_streams != null && _streams.Count == 1)
-				return new StreamEventFilter(_streams.First(), _allEvents, _events);
-			if (_streams != null && _streams.Count > 1)
-				return new MultiStreamEventFilter(_streams, _allEvents, _events);
-			throw new NotSupportedException();
-		}
-
-		private PositionTagger CreatePositionTagger() {
-			if (_allStreams && _events != null && _events.Count >= 1)
-				return new EventByTypeIndexPositionTagger(_phase, _events.ToArray(), _includeStreamDeletedNotification);
-			if (_allStreams && _reorderEvents)
-				return new PreparePositionTagger(_phase);
-			if (_allStreams)
-				return new TransactionFilePositionTagger(_phase);
-			if (_categories != null && _categories.Count == 1)
-				//TODO: '-' is a hardcoded separator
-				return new StreamPositionTagger(_phase, "$ce-" + _categories.First());
-			if (_categories != null)
-				throw new NotSupportedException();
-			if (_streams != null && _streams.Count == 1)
-				return new StreamPositionTagger(_phase, _streams.First());
-			if (_streams != null && _streams.Count > 1)
-				return new MultiStreamPositionTagger(_phase, _streams.ToArray());
-			//TODO: consider passing projection phase from outside (above)
-			throw new NotSupportedException();
-		}
-
-
-		private IEventReader CreatePausedStreamEventReader(
-			Guid eventReaderId, IODispatcher ioDispatcher, IPublisher publisher, CheckpointTag checkpointTag,
-			string streamName, bool stopOnEof, int? stopAfterNEvents, bool resolveLinkTos, bool produceStreamDeletes) {
-			var lastProcessedSequenceNumber = checkpointTag.Streams.Values.First();
-			var fromSequenceNumber = lastProcessedSequenceNumber + 1;
-			var eventReader = new StreamEventReader(publisher, eventReaderId, _runAs, streamName, fromSequenceNumber,
-				_timeProvider,
-				resolveLinkTos, produceStreamDeletes, stopOnEof);
-			return eventReader;
-		}
-
-		private IEventReader CreatePausedEventIndexEventReader(
-			Guid eventReaderId, IODispatcher ioDispatcher, IPublisher publisher, CheckpointTag checkpointTag,
-			bool stopOnEof, int? stopAfterNEvents, bool resolveLinkTos, IEnumerable<string> eventTypes,
-			bool includeStreamDeletedNotification) {
-			//NOTE: just optimization - anyway if reading from TF events may reappear
-			long p;
-			var nextPositions = eventTypes.ToDictionary(
-				v => "$et-" + v, v => checkpointTag.Streams.TryGetValue(v, out p) ? p + 1 : 0);
-
-			if (includeStreamDeletedNotification)
-				nextPositions.Add("$et-$deleted", checkpointTag.Streams.TryGetValue("$deleted", out p) ? p + 1 : 0);
-
-			return new EventByTypeIndexEventReader(publisher, eventReaderId, _runAs, eventTypes.ToArray(),
-				includeStreamDeletedNotification,
-				checkpointTag.Position, nextPositions, resolveLinkTos, _timeProvider, stopOnEof);
-		}
-
-		private IEventReader CreatePausedMultiStreamEventReader(
-			Guid eventReaderId, IODispatcher ioDispatcher, IPublisher publisher, CheckpointTag checkpointTag,
-			bool stopOnEof, int? stopAfterNEvents, bool resolveLinkTos, IEnumerable<string> streams) {
-			var nextPositions = checkpointTag.Streams.ToDictionary(v => v.Key, v => v.Value + 1);
-
-			return new MultiStreamEventReader(
-				ioDispatcher, publisher, eventReaderId, _runAs, Phase, streams.ToArray(), nextPositions, resolveLinkTos,
-				_timeProvider, stopOnEof, stopAfterNEvents);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Strategies/ResultWriter.cs b/src/EventStore.Projections.Core/Services/Processing/Strategies/ResultWriter.cs
deleted file mode 100644
index 82eac71c6ea..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Strategies/ResultWriter.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Services.Processing.Strategies {
-	public class ResultWriter : IResultWriter {
-		private readonly IResultEventEmitter _resultEventEmitter;
-		private readonly IEmittedEventWriter _coreProjectionCheckpointManager;
-		private readonly bool _producesRunningResults;
-		private readonly CheckpointTag _zeroCheckpointTag;
-		private readonly string _partitionCatalogStreamName;
-
-		public ResultWriter(
-			IResultEventEmitter resultEventEmitter, IEmittedEventWriter coreProjectionCheckpointManager,
-			bool producesRunningResults, CheckpointTag zeroCheckpointTag, string partitionCatalogStreamName) {
-			_resultEventEmitter = resultEventEmitter;
-			_coreProjectionCheckpointManager = coreProjectionCheckpointManager;
-			_producesRunningResults = producesRunningResults;
-			_zeroCheckpointTag = zeroCheckpointTag;
-			_partitionCatalogStreamName = partitionCatalogStreamName;
-		}
-
-		public void WriteEofResult(
-			Guid subscriptionId, string partition, string resultBody, CheckpointTag causedBy, Guid causedByGuid,
-			string correlationId) {
-			if (resultBody != null)
-				WriteResult(partition, resultBody, causedBy, causedByGuid, correlationId);
-		}
-
-		private void WriteResult(
-			string partition, string resultBody, CheckpointTag causedBy, Guid causedByGuid, string correlationId) {
-			var resultEvents = ResultUpdated(partition, resultBody, causedBy);
-			if (resultEvents != null)
-				_coreProjectionCheckpointManager.EventsEmitted(resultEvents, causedByGuid, correlationId);
-		}
-
-		public void WriteRunningResult(EventProcessedResult result) {
-			if (!_producesRunningResults)
-				return;
-			var oldState = result.OldState;
-			var newState = result.NewState;
-			var resultBody = newState.Result;
-			if (oldState.Result != resultBody) {
-				var partition = result.Partition;
-				var causedBy = newState.CausedBy;
-				WriteResult(
-					partition, resultBody, causedBy, result.CausedBy, result.CorrelationId);
-			}
-		}
-
-		private EmittedEventEnvelope[] ResultUpdated(string partition, string result, CheckpointTag causedBy) {
-			return _resultEventEmitter.ResultUpdated(partition, result, causedBy);
-		}
-
-		protected EmittedEventEnvelope[] RegisterNewPartition(string partition, CheckpointTag at) {
-			return new[] {
-				new EmittedEventEnvelope(
-					new EmittedDataEvent(
-						_partitionCatalogStreamName, Guid.NewGuid(), "$partition", false, partition,
-						null, at, null))
-			};
-		}
-
-		public void AccountPartition(EventProcessedResult result) {
-			if (_producesRunningResults)
-				if (result.Partition != "" && result.OldState.CausedBy == _zeroCheckpointTag) {
-					var resultEvents = RegisterNewPartition(result.Partition, result.CheckpointTag);
-					if (resultEvents != null)
-						_coreProjectionCheckpointManager.EventsEmitted(
-							resultEvents, Guid.Empty, correlationId: null);
-				}
-		}
-
-		public void EventsEmitted(
-			EmittedEventEnvelope[] scheduledWrites, Guid causedBy, string correlationId) {
-			_coreProjectionCheckpointManager.EventsEmitted(
-				scheduledWrites, causedBy, correlationId);
-		}
-
-		public void WriteProgress(Guid subscriptionId, float progress) {
-			// intentionally does nothing
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Subscriptions/EventReorderingReaderSubscription.cs b/src/EventStore.Projections.Core/Services/Processing/Subscriptions/EventReorderingReaderSubscription.cs
deleted file mode 100644
index 8bbe15ad839..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Subscriptions/EventReorderingReaderSubscription.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventStore.Core.Bus;
-using EventStore.Core.Services.TimerService;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-
-namespace EventStore.Projections.Core.Services.Processing.Subscriptions {
-	public class EventReorderingReaderSubscription : ReaderSubscriptionBase, IReaderSubscription {
-		private readonly SortedList<long, ReaderSubscriptionMessage.CommittedEventDistributed> _buffer =
-			new SortedList<long, ReaderSubscriptionMessage.CommittedEventDistributed>();
-
-		private readonly int _processingLagMs;
-
-		public EventReorderingReaderSubscription(
-			IPublisher publisher,
-			Guid subscriptionId,
-			CheckpointTag @from,
-			IReaderStrategy readerStrategy,
-			ITimeProvider timeProvider,
-			long? checkpointUnhandledBytesThreshold,
-			int? checkpointProcessedEventsThreshold,
-			int checkpointAfterMs,
-			int processingLagMs,
-			bool stopOnEof,
-			int? stopAfterNEvents,
-			bool enableContentTypeValidation)
-			: base(
-				publisher,
-				subscriptionId,
-				@from,
-				readerStrategy,
-				timeProvider,
-				checkpointUnhandledBytesThreshold,
-				checkpointProcessedEventsThreshold,
-				checkpointAfterMs,
-				stopOnEof,
-				stopAfterNEvents,
-				enableContentTypeValidation) {
-			_processingLagMs = processingLagMs;
-		}
-
-		public void Handle(ReaderSubscriptionMessage.CommittedEventDistributed message) {
-			if (message.Data == null)
-				throw new NotSupportedException();
-			ReaderSubscriptionMessage.CommittedEventDistributed existing;
-			// ignore duplicate messages (when replaying from heading event distribution point)
-			if (!_buffer.TryGetValue(message.Data.Position.PreparePosition, out existing)) {
-				_buffer.Add(message.Data.Position.PreparePosition, message);
-				var maxTimestamp = _buffer.Max(v => v.Value.Data.Timestamp);
-				ProcessAllFor(maxTimestamp);
-			}
-		}
-
-		private void ProcessAllFor(DateTime maxTimestamp) {
-			//NOTE: this is the most straightforward implementation
-			//TODO: build proper data structure when the approach is finalized
-			bool processed;
-			do {
-				processed = ProcessFor(maxTimestamp);
-			} while (processed);
-		}
-
-		private bool ProcessFor(DateTime maxTimestamp) {
-			if (_buffer.Count == 0)
-				return false;
-			var first = _buffer.ElementAt(0);
-			if ((maxTimestamp - first.Value.Data.Timestamp).TotalMilliseconds > _processingLagMs) {
-				_buffer.RemoveAt(0);
-				ProcessOne(first.Value);
-				return true;
-			}
-
-			return false;
-		}
-
-		public void Handle(ReaderSubscriptionMessage.EventReaderIdle message) {
-			ProcessAllFor(message.IdleTimestampUtc);
-		}
-
-
-		protected override void EofReached() {
-			// flush all available events as wqe reached eof (currently onetime projections only)
-			ProcessAllFor(DateTime.MaxValue);
-		}
-
-		public new void Handle(ReaderSubscriptionMessage.EventReaderPartitionEof message) {
-			throw new NotSupportedException();
-		}
-
-		public void Handle(ReaderSubscriptionMessage.EventReaderPartitionDeleted message) {
-			throw new NotSupportedException();
-		}
-
-		public void Handle(ReaderSubscriptionMessage.ReportProgress message) {
-			NotifyProgress();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Subscriptions/IReaderSubscription.cs b/src/EventStore.Projections.Core/Services/Processing/Subscriptions/IReaderSubscription.cs
deleted file mode 100644
index 8c872840442..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Subscriptions/IReaderSubscription.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Services.Processing.Subscriptions {
-	public interface IReaderSubscription : IHandle<ReaderSubscriptionMessage.CommittedEventDistributed>,
-		IHandle<ReaderSubscriptionMessage.EventReaderIdle>,
-		IHandle<ReaderSubscriptionMessage.EventReaderStarting>,
-		IHandle<ReaderSubscriptionMessage.EventReaderEof>,
-		IHandle<ReaderSubscriptionMessage.EventReaderPartitionEof>,
-		IHandle<ReaderSubscriptionMessage.EventReaderPartitionDeleted>,
-		IHandle<ReaderSubscriptionMessage.EventReaderNotAuthorized>,
-		IHandle<ReaderSubscriptionMessage.ReportProgress> {
-		string Tag { get; }
-		Guid SubscriptionId { get; }
-		IEventReader CreatePausedEventReader(IPublisher publisher, IODispatcher ioDispatcher, Guid forkedEventReaderId);
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Subscriptions/ReaderSubscription.cs b/src/EventStore.Projections.Core/Services/Processing/Subscriptions/ReaderSubscription.cs
deleted file mode 100644
index 698b04e6456..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Subscriptions/ReaderSubscription.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Services.TimerService;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-
-namespace EventStore.Projections.Core.Services.Processing.Subscriptions {
-	public class ReaderSubscription : ReaderSubscriptionBase, IReaderSubscription {
-		public ReaderSubscription(
-			string tag,
-			IPublisher publisher,
-			Guid subscriptionId,
-			CheckpointTag @from,
-			IReaderStrategy readerStrategy,
-			ITimeProvider timeProvider,
-			long? checkpointUnhandledBytesThreshold,
-			int? checkpointProcessedEventsThreshold,
-			int checkpointAfterMs,
-			bool stopOnEof,
-			int? stopAfterNEvents,
-			bool enableContentTypeValidation)
-			: base(
-				publisher,
-				subscriptionId,
-				@from,
-				readerStrategy,
-				timeProvider,
-				checkpointUnhandledBytesThreshold,
-				checkpointProcessedEventsThreshold,
-				checkpointAfterMs,
-				stopOnEof,
-				stopAfterNEvents,
-				enableContentTypeValidation) {
-			_tag = tag;
-		}
-
-		public void Handle(ReaderSubscriptionMessage.CommittedEventDistributed message) {
-			ProcessOne(message);
-		}
-
-		public void Handle(ReaderSubscriptionMessage.EventReaderIdle message) {
-			ForceProgressValue(100);
-		}
-
-		public void Handle(ReaderSubscriptionMessage.EventReaderPartitionDeleted message) {
-			if (!base._eventFilter.PassesDeleteNotification(message.PositionStreamId))
-				return;
-			var deletePosition = _positionTagger.MakeCheckpointTag(_positionTracker.LastTag, message);
-			PublishPartitionDeleted(message.Partition, deletePosition);
-		}
-
-		public void Handle(ReaderSubscriptionMessage.ReportProgress message) {
-			NotifyProgress();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Subscriptions/ReaderSubscriptionBase.cs b/src/EventStore.Projections.Core/Services/Processing/Subscriptions/ReaderSubscriptionBase.cs
deleted file mode 100644
index 3a4fd00c570..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Subscriptions/ReaderSubscriptionBase.cs
+++ /dev/null
@@ -1,257 +0,0 @@
-using System;
-using System.Diagnostics;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Core.Services.TimerService;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using Serilog;
-
-namespace EventStore.Projections.Core.Services.Processing.Subscriptions {
-	public class ReaderSubscriptionBase {
-		private readonly IPublisher _publisher;
-		private readonly IReaderStrategy _readerStrategy;
-		private readonly ITimeProvider _timeProvider;
-		private readonly long? _checkpointUnhandledBytesThreshold;
-		private readonly int? _checkpointProcessedEventsThreshold;
-		private readonly bool _stopOnEof;
-		private readonly int? _stopAfterNEvents;
-		protected readonly EventFilter _eventFilter;
-		protected readonly PositionTagger _positionTagger;
-		protected readonly PositionTracker _positionTracker;
-		private long? _lastPassedOrCheckpointedEventPosition;
-		private float _progress = -1;
-		private long _subscriptionMessageSequenceNumber;
-		private int _eventsSinceLastCheckpointSuggestedOrStart;
-		private readonly Guid _subscriptionId;
-		private bool _eofReached;
-		protected string _tag;
-		private TimeSpan _checkpointAfter;
-		private DateTime _lastCheckpointTime = DateTime.MinValue;
-		private bool _enableContentTypeValidation;
-		private ILogger _logger;
-		private CheckpointTag _lastCheckpointTag;
-
-		protected ReaderSubscriptionBase(
-			IPublisher publisher,
-			Guid subscriptionId,
-			CheckpointTag @from,
-			IReaderStrategy readerStrategy,
-			ITimeProvider timeProvider,
-			long? checkpointUnhandledBytesThreshold,
-			int? checkpointProcessedEventsThreshold,
-			int checkpointAfterMs,
-			bool stopOnEof,
-			int? stopAfterNEvents,
-			bool enableContentTypeValidation) {
-			if (publisher == null) throw new ArgumentNullException("publisher");
-			if (readerStrategy == null) throw new ArgumentNullException("readerStrategy");
-			if (timeProvider == null) throw new ArgumentNullException("timeProvider");
-			if (checkpointProcessedEventsThreshold > 0 && stopAfterNEvents > 0)
-				throw new ArgumentException("checkpointProcessedEventsThreshold > 0 && stopAfterNEvents > 0");
-
-			_publisher = publisher;
-			_readerStrategy = readerStrategy;
-			_timeProvider = timeProvider;
-			_checkpointUnhandledBytesThreshold = checkpointUnhandledBytesThreshold;
-			_checkpointProcessedEventsThreshold = checkpointProcessedEventsThreshold;
-			_checkpointAfter = TimeSpan.FromMilliseconds(checkpointAfterMs);
-			_stopOnEof = stopOnEof;
-			_stopAfterNEvents = stopAfterNEvents;
-			_subscriptionId = subscriptionId;
-			_lastPassedOrCheckpointedEventPosition = null;
-
-			_eventFilter = readerStrategy.EventFilter;
-
-			_positionTagger = readerStrategy.PositionTagger;
-			_positionTracker = new PositionTracker(_positionTagger);
-			_positionTracker.UpdateByCheckpointTagInitial(@from);
-			_lastCheckpointTag = _positionTracker.LastTag;
-			_enableContentTypeValidation = enableContentTypeValidation;
-			_logger = Serilog.Log.ForContext<ReaderSubscriptionBase>();
-		}
-
-		public string Tag {
-			get { return _tag; }
-		}
-
-		public Guid SubscriptionId {
-			get { return _subscriptionId; }
-		}
-
-		protected void ProcessOne(ReaderSubscriptionMessage.CommittedEventDistributed message) {
-			if (_eofReached)
-				return; // eof may be set by reach N events
-
-			// NOTE: we may receive here messages from heading event distribution point
-			// and they may not pass out source filter.  Discard them first
-			var roundedProgress = (float)Math.Round(message.Progress, 1);
-			bool progressChanged = _progress != roundedProgress;
-
-			bool passesStreamSourceFilter = _eventFilter.PassesSource(message.Data.ResolvedLinkTo, message.Data.PositionStreamId, message.Data.EventType);
-			bool passesEventFilter = _eventFilter.Passes(message.Data.ResolvedLinkTo, message.Data.PositionStreamId, message.Data.EventType, message.Data.IsStreamDeletedEvent);
-			bool isValid = !_enableContentTypeValidation || _eventFilter.PassesValidation(message.Data.IsJson, message.Data.Data);
-			if (!isValid) {
-				_logger.Verbose($"Event {message.Data.EventSequenceNumber}@{message.Data.EventStreamId} is not valid json. Data: ({message.Data.Data})");
-			}
-
-			CheckpointTag eventCheckpointTag = null;
-
-			if (passesStreamSourceFilter) {
-				// NOTE: after joining heading distribution point it delivers all cached events to the subscription
-				// some of this events we may have already received. The delivered events may have different order
-				// (in case of partially ordered cases multi-stream reader etc). We discard all the messages that are not
-				// after the last available checkpoint tag
-
-				//NOTE: older events can appear here when replaying events from the heading event reader
-				//      or when event-by-type-index reader reads TF and both event and resolved-event appear as output
-				if (!_positionTagger.IsMessageAfterCheckpointTag(_positionTracker.LastTag, message))
-					return;
-
-				eventCheckpointTag = _positionTagger.MakeCheckpointTag(_positionTracker.LastTag, message);
-				_positionTracker.UpdateByCheckpointTagForward(eventCheckpointTag);
-			}
-
-			var now = _timeProvider.UtcNow;
-			var timeDifference = now - _lastCheckpointTime;
-			if (isValid && passesEventFilter) {
-				Debug.Assert(passesStreamSourceFilter, "Event passes event filter but not source filter");
-				Debug.Assert(eventCheckpointTag != null, "Event checkpoint tag is null");
-
-				_lastPassedOrCheckpointedEventPosition = message.Data.Position.PreparePosition;
-				var convertedMessage =
-					EventReaderSubscriptionMessage.CommittedEventReceived.FromCommittedEventDistributed(
-						message, eventCheckpointTag, _eventFilter.GetCategory(message.Data.PositionStreamId),
-						_subscriptionId, _subscriptionMessageSequenceNumber++);
-				_publisher.Publish(convertedMessage);
-				_eventsSinceLastCheckpointSuggestedOrStart++;
-				if (_checkpointProcessedEventsThreshold > 0
-				    && timeDifference > _checkpointAfter
-				    && _eventsSinceLastCheckpointSuggestedOrStart >= _checkpointProcessedEventsThreshold
-				    && _lastCheckpointTag != _positionTracker.LastTag)
-					SuggestCheckpoint(message);
-				if (_stopAfterNEvents > 0 && _eventsSinceLastCheckpointSuggestedOrStart >= _stopAfterNEvents)
-					NEventsReached();
-			} else {
-				if (_checkpointUnhandledBytesThreshold > 0
-				    && timeDifference > _checkpointAfter
-				    && (_lastPassedOrCheckpointedEventPosition != null
-				        && message.Data.Position.PreparePosition - _lastPassedOrCheckpointedEventPosition.Value
-				        > _checkpointUnhandledBytesThreshold)
-				    && _lastCheckpointTag != _positionTracker.LastTag)
-					SuggestCheckpoint(message);
-				else if (progressChanged)
-					_progress = roundedProgress;
-			}
-
-			// initialize checkpointing based on first message
-			if (_lastPassedOrCheckpointedEventPosition == null)
-				_lastPassedOrCheckpointedEventPosition = message.Data.Position.PreparePosition;
-		}
-
-		private void NEventsReached() {
-			ProcessEofAndEmitEof();
-		}
-
-		protected void NotifyProgress() {
-			_publisher.Publish(new EventReaderSubscriptionMessage.ProgressChanged(
-				_subscriptionId,
-				_positionTracker.LastTag,
-				_progress,
-				_subscriptionMessageSequenceNumber++));
-		}
-
-		/// <summary>
-		/// Forces a progression value.
-		/// </summary>
-		/// <param name="value">a percentage rate. For example if the progress is 42%, value parameter must be 42</param>
-		protected void ForceProgressValue(float value) {
-			_progress = value;
-		}
-
-		protected void PublishPartitionDeleted(string partition, CheckpointTag deletePosition) {
-			_publisher.Publish(
-				new EventReaderSubscriptionMessage.PartitionDeleted(
-					_subscriptionId, deletePosition, partition, _subscriptionMessageSequenceNumber++));
-		}
-
-		private void PublishStartingAt(long startingLastCommitPosition) {
-			_publisher.Publish(
-				new EventReaderSubscriptionMessage.SubscriptionStarted(
-					_subscriptionId, _positionTracker.LastTag, startingLastCommitPosition,
-					_subscriptionMessageSequenceNumber++));
-		}
-
-		private void SuggestCheckpoint(ReaderSubscriptionMessage.CommittedEventDistributed message) {
-			_lastPassedOrCheckpointedEventPosition = message.Data.Position.PreparePosition;
-			_lastCheckpointTag = _positionTracker.LastTag;
-			_publisher.Publish(
-				new EventReaderSubscriptionMessage.CheckpointSuggested(
-					_subscriptionId, _positionTracker.LastTag, message.Progress,
-					_subscriptionMessageSequenceNumber++));
-			_eventsSinceLastCheckpointSuggestedOrStart = 0;
-			_lastCheckpointTime = _timeProvider.UtcNow;
-		}
-
-		public IEventReader CreatePausedEventReader(IPublisher publisher, IODispatcher ioDispatcher,
-			Guid eventReaderId) {
-			if (_eofReached)
-				throw new InvalidOperationException("Onetime projection has already reached the eof position");
-//            _logger.Trace("Creating an event distribution point at '{lastTag}'", _positionTracker.LastTag);
-			return _readerStrategy.CreatePausedEventReader(
-				eventReaderId, publisher, ioDispatcher, _positionTracker.LastTag, _stopOnEof, _stopAfterNEvents);
-		}
-
-		public void Handle(ReaderSubscriptionMessage.EventReaderEof message) {
-			if (_eofReached)
-				return; // self eof-reached, but reader is still running
-
-			if (_stopOnEof)
-				ProcessEofAndEmitEof();
-		}
-
-		private void ProcessEofAndEmitEof() {
-			_eofReached = true;
-			EofReached();
-			_publisher.Publish(
-				new EventReaderSubscriptionMessage.EofReached(
-					_subscriptionId,
-					_positionTracker.LastTag,
-					_subscriptionMessageSequenceNumber++));
-			// self unsubscribe
-			_publisher.Publish(new ReaderSubscriptionManagement.Unsubscribe(_subscriptionId));
-		}
-
-		public void Handle(ReaderSubscriptionMessage.EventReaderPartitionEof message) {
-			if (_eofReached)
-				return; // self eof-reached, but reader is still running
-
-			var eventCheckpointTag = _positionTagger.MakeCheckpointTag(_positionTracker.LastTag, message);
-
-			_publisher.Publish(
-				new EventReaderSubscriptionMessage.PartitionEofReached(
-					_subscriptionId, eventCheckpointTag, message.Partition,
-					_subscriptionMessageSequenceNumber++));
-		}
-
-		public void Handle(ReaderSubscriptionMessage.EventReaderNotAuthorized message) {
-			if (_eofReached)
-				return; // self eof-reached, but reader is still running
-
-			if (_stopOnEof) {
-				_eofReached = true;
-			}
-			_publisher.Publish(
-				new EventReaderSubscriptionMessage.NotAuthorized(
-					_subscriptionId, _positionTracker.LastTag, _progress, _subscriptionMessageSequenceNumber++));
-		}
-
-		public void Handle(ReaderSubscriptionMessage.EventReaderStarting message) {
-			PublishStartingAt(message.LastCommitPosition);
-		}
-
-		protected virtual void EofReached() {
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Subscriptions/ReaderSubscriptionOptions.cs b/src/EventStore.Projections.Core/Services/Processing/Subscriptions/ReaderSubscriptionOptions.cs
deleted file mode 100644
index 8c6c2bdbd0b..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/Subscriptions/ReaderSubscriptionOptions.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-namespace EventStore.Projections.Core.Services.Processing.Subscriptions {
-	public class ReaderSubscriptionOptions {
-		private readonly long _checkpointUnhandledBytesThreshold;
-		private readonly int? _checkpointProcessedEventsThreshold;
-		private readonly int _checkpointAfterMs;
-		private readonly bool _stopOnEof;
-		private readonly int? _stopAfterNEvents;
-		private readonly bool _enableContentTypeValidation;
-
-		public ReaderSubscriptionOptions(
-			long checkpointUnhandledBytesThreshold, int? checkpointProcessedEventsThreshold, int checkpointAfterMs,
-			bool stopOnEof, int? stopAfterNEvents, bool enableContentTypeValidation) {
-			_checkpointUnhandledBytesThreshold = checkpointUnhandledBytesThreshold;
-			_checkpointProcessedEventsThreshold = checkpointProcessedEventsThreshold;
-			_checkpointAfterMs = checkpointAfterMs;
-			_stopOnEof = stopOnEof;
-			_stopAfterNEvents = stopAfterNEvents;
-			_enableContentTypeValidation = enableContentTypeValidation;
-		}
-
-		public long CheckpointUnhandledBytesThreshold {
-			get { return _checkpointUnhandledBytesThreshold; }
-		}
-
-		public int? CheckpointProcessedEventsThreshold {
-			get { return _checkpointProcessedEventsThreshold; }
-		}
-
-		public int CheckpointAfterMs {
-			get { return _checkpointAfterMs; }
-		}
-
-		public bool StopOnEof {
-			get { return _stopOnEof; }
-		}
-
-		public int? StopAfterNEvents {
-			get { return _stopAfterNEvents; }
-		}
-
-		public bool EnableContentTypeValidation {
-			get { return _enableContentTypeValidation; }
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/TaggedResolvedEvent.cs b/src/EventStore.Projections.Core/Services/Processing/TaggedResolvedEvent.cs
deleted file mode 100644
index 443811650bf..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/TaggedResolvedEvent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Services.Processing {
-	public sealed class TaggedResolvedEvent {
-		public readonly ResolvedEvent ResolvedEvent;
-		public readonly CheckpointTag ReaderPosition;
-
-		public TaggedResolvedEvent(ResolvedEvent resolvedEvent, CheckpointTag readerPosition) {
-			ResolvedEvent = resolvedEvent;
-			ReaderPosition = readerPosition;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.CommittedEventItem.cs b/src/EventStore.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.CommittedEventItem.cs
deleted file mode 100644
index 85096c10e0f..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.CommittedEventItem.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
-
-namespace EventStore.Projections.Core.Services.Processing.TransactionFile;
-
-public partial class HeadingEventReader
-{
-	private class CommittedEventItem : HeadingEventReader.Item {
-		public readonly ReaderSubscriptionMessage.CommittedEventDistributed Message;
-
-		public CommittedEventItem(ReaderSubscriptionMessage.CommittedEventDistributed message)
-			: base(message.Data.Position) {
-			Message = message;
-		}
-
-		public override void Handle(IReaderSubscription subscription) {
-			subscription.Handle(Message);
-		}
-
-		public override string ToString() {
-			return string.Format(
-				"{0} : {2}@{1}",
-				Message.Data.EventType,
-				Message.Data.PositionStreamId,
-				Message.Data.PositionSequenceNumber);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.Item.cs b/src/EventStore.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.Item.cs
deleted file mode 100644
index 20fc4ed3087..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.Item.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
-
-namespace EventStore.Projections.Core.Services.Processing.TransactionFile;
-
-public partial class HeadingEventReader
-{
-	private abstract class Item {
-		public readonly TFPos Position;
-
-		protected Item(TFPos position) {
-			Position = position;
-		}
-
-		public abstract void Handle(IReaderSubscription subscription);
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.PartitionDeletedItem.cs b/src/EventStore.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.PartitionDeletedItem.cs
deleted file mode 100644
index da07789bdeb..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.PartitionDeletedItem.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
-
-namespace EventStore.Projections.Core.Services.Processing.TransactionFile;
-
-public partial class HeadingEventReader
-{
-	private class PartitionDeletedItem : Item {
-		public readonly ReaderSubscriptionMessage.EventReaderPartitionDeleted Message;
-
-		public PartitionDeletedItem(ReaderSubscriptionMessage.EventReaderPartitionDeleted message)
-			: base(message.DeleteLinkOrEventPosition.Value) {
-			Message = message;
-		}
-
-		public override void Handle(IReaderSubscription subscription) {
-			subscription.Handle(Message);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.cs b/src/EventStore.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.cs
deleted file mode 100644
index 925c42547d7..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
-
-namespace EventStore.Projections.Core.Services.Processing.TransactionFile {
-	public partial class HeadingEventReader {
-		private IEventReader _headEventReader;
-		private TFPos _subscribeFromPosition = new TFPos(long.MaxValue, long.MaxValue);
-
-		private readonly Queue<HeadingEventReader.Item> _lastMessages = new Queue<HeadingEventReader.Item>();
-
-		private readonly int _eventCacheSize;
-
-		private readonly Dictionary<Guid, IReaderSubscription> _headSubscribers =
-			new Dictionary<Guid, IReaderSubscription>();
-
-		private Guid _eventReaderId;
-
-		private bool _started;
-
-		private TFPos _lastEventPosition = new TFPos(0, -1);
-		private TFPos _lastDeletePosition = new TFPos(0, -1);
-
-		private IPublisher _publisher;
-
-		public HeadingEventReader(int eventCacheSize, IPublisher publisher) {
-			_eventCacheSize = eventCacheSize;
-			_publisher = publisher;
-		}
-
-		public bool Handle(ReaderSubscriptionMessage.CommittedEventDistributed message) {
-			EnsureStarted();
-			if (message.CorrelationId != _eventReaderId)
-				return false;
-			if (message.Data == null)
-				return true;
-
-			ValidateEventOrder(message);
-
-			CacheRecentMessage(message);
-			DistributeMessage(message);
-			return true;
-		}
-
-		public bool Handle(ReaderSubscriptionMessage.EventReaderPartitionDeleted message) {
-			EnsureStarted();
-			if (message.CorrelationId != _eventReaderId)
-				return false;
-
-			ValidateEventOrder(message);
-
-
-			CacheRecentMessage(message);
-			DistributeMessage(message);
-			return true;
-		}
-
-		public bool Handle(ReaderSubscriptionMessage.EventReaderIdle message) {
-			EnsureStarted();
-			if (message.CorrelationId != _eventReaderId)
-				return false;
-			DistributeMessage(message);
-			return true;
-		}
-
-		private void ValidateEventOrder(ReaderSubscriptionMessage.CommittedEventDistributed message) {
-			if (_lastEventPosition >= message.Data.Position || _lastDeletePosition > message.Data.Position)
-				throw new InvalidOperationException(
-					string.Format(
-						"Invalid committed event order.  Last: '{0}' Received: '{1}'  LastDelete: '{2}'",
-						_lastEventPosition, message.Data.Position, _lastEventPosition));
-			_lastEventPosition = message.Data.Position;
-		}
-
-		private void ValidateEventOrder(ReaderSubscriptionMessage.EventReaderPartitionDeleted message) {
-			if (_lastEventPosition > message.DeleteLinkOrEventPosition.Value
-			    || _lastDeletePosition >= message.DeleteLinkOrEventPosition.Value)
-				throw new InvalidOperationException(
-					string.Format(
-						"Invalid partition deleted event order.  Last: '{0}' Received: '{1}'  LastDelete: '{2}'",
-						_lastEventPosition, message.DeleteLinkOrEventPosition.Value, _lastEventPosition));
-			_lastDeletePosition = message.DeleteLinkOrEventPosition.Value;
-		}
-
-		public void Start(Guid eventReaderId, IEventReader eventReader) {
-			if (_started)
-				throw new InvalidOperationException("Already started");
-			_eventReaderId = eventReaderId;
-			_headEventReader = eventReader;
-			//Guid.Empty means head distribution point
-			_started = true; // started before resume due to old style test with immediate callback
-			_headEventReader.Resume();
-		}
-
-		public void Stop() {
-			EnsureStarted();
-			_headEventReader.Pause();
-			_headEventReader = null;
-			EmptyCache();
-			_started = false;
-		}
-
-		public bool TrySubscribe(
-			Guid projectionId, IReaderSubscription readerSubscription, long fromTransactionFilePosition) {
-			EnsureStarted();
-			if (_headSubscribers.ContainsKey(projectionId))
-				throw new InvalidOperationException(
-					string.Format("Projection '{0}' has been already subscribed", projectionId));
-			if (_subscribeFromPosition.CommitPosition <= fromTransactionFilePosition) {
-				if (!DispatchRecentMessagesTo(readerSubscription, fromTransactionFilePosition)) {
-					return false;
-				}
-
-				AddSubscriber(projectionId, readerSubscription);
-				return true;
-			}
-
-			return false;
-		}
-
-		public void Unsubscribe(Guid projectionId) {
-			EnsureStarted();
-			if (!_headSubscribers.ContainsKey(projectionId))
-				throw new InvalidOperationException(
-					string.Format("Projection '{0}' has not been subscribed", projectionId));
-			_headSubscribers.Remove(projectionId);
-		}
-
-		private bool DispatchRecentMessagesTo(IReaderSubscription subscription, long fromTransactionFilePosition) {
-			foreach (var m in _lastMessages) {
-				if (m.Position.CommitPosition >= fromTransactionFilePosition) {
-					try {
-						m.Handle(subscription);
-					} catch (Exception ex) {
-						var item = m as HeadingEventReader.CommittedEventItem;
-						string message;
-						if (item != null) {
-							message = string.Format(
-								"The heading subscription failed to handle a recently cached event {0}:{1}@{2} because {3}",
-								item.Message.Data.EventStreamId, item.Message.Data.EventType,
-								item.Message.Data.PositionSequenceNumber, ex.Message);
-						} else {
-							message = string.Format(
-								"The heading subscription failed to handle a recently cached deleted event at position {0} because {1}",
-								m.Position, ex.Message);
-						}
-
-						_publisher.Publish(
-							new EventReaderSubscriptionMessage.Failed(subscription.SubscriptionId, message));
-						return false;
-					}
-				}
-			}
-
-			return true;
-		}
-
-		private void DistributeMessage(ReaderSubscriptionMessage.CommittedEventDistributed message) {
-			foreach (var subscriber in _headSubscribers.Values) {
-				try {
-					subscriber.Handle(message);
-				} catch (Exception ex) {
-					_publisher.Publish(new EventReaderSubscriptionMessage.Failed(subscriber.SubscriptionId,
-						string.Format("The heading subscription failed to handle an event {0}:{1}@{2} because {3}",
-							message.Data.EventStreamId, message.Data.EventType, message.Data.PositionSequenceNumber,
-							ex.Message)));
-				}
-			}
-		}
-
-		private void DistributeMessage(ReaderSubscriptionMessage.EventReaderPartitionDeleted message) {
-			foreach (var subscriber in _headSubscribers.Values)
-				subscriber.Handle(message);
-		}
-
-		private void DistributeMessage(ReaderSubscriptionMessage.EventReaderIdle message) {
-			foreach (var subscriber in _headSubscribers.Values)
-				subscriber.Handle(message);
-		}
-
-		private void CacheRecentMessage(ReaderSubscriptionMessage.CommittedEventDistributed message) {
-			_lastMessages.Enqueue(new HeadingEventReader.CommittedEventItem(message));
-			CleanUpCache();
-		}
-
-		private void CacheRecentMessage(ReaderSubscriptionMessage.EventReaderPartitionDeleted message) {
-			_lastMessages.Enqueue(new HeadingEventReader.PartitionDeletedItem(message));
-			CleanUpCache();
-		}
-
-		private void CleanUpCache() {
-			if (_lastMessages.Count > _eventCacheSize) {
-				var removed = _lastMessages.Dequeue();
-				// as we may have multiple items at the same position it is important to
-				// remove them together as we may subscribe in the middle otherwise
-				while (_lastMessages.Count > 0 && _lastMessages.Peek().Position == removed.Position)
-					_lastMessages.Dequeue();
-			}
-
-			var lastAvailableCommittedEvent = _lastMessages.Peek();
-			_subscribeFromPosition = lastAvailableCommittedEvent.Position;
-		}
-
-		private void EmptyCache() {
-			_lastMessages.Clear();
-			_subscribeFromPosition = new TFPos(long.MaxValue, long.MaxValue);
-		}
-
-		private void AddSubscriber(Guid publishWithCorrelationId, IReaderSubscription subscription) {
-			_headSubscribers.Add(publishWithCorrelationId, subscription);
-		}
-
-		private void EnsureStarted() {
-			if (!_started)
-				throw new InvalidOperationException("Not started");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/TransactionFile/PreparePositionTagger.cs b/src/EventStore.Projections.Core/Services/Processing/TransactionFile/PreparePositionTagger.cs
deleted file mode 100644
index 6a6127c2851..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/TransactionFile/PreparePositionTagger.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Services.Processing.AllStream {
-	public class PreparePositionTagger : PositionTagger {
-		public PreparePositionTagger(int phase)
-			: base(phase) {
-		}
-
-		public override bool IsMessageAfterCheckpointTag(
-			CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
-			if (previous.Phase < Phase)
-				return true;
-			return committedEvent.Data.Position.PreparePosition > previous.PreparePosition;
-		}
-
-		public override CheckpointTag MakeCheckpointTag(
-			CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
-			if (previous.Phase != Phase)
-				throw new ArgumentException(
-					string.Format("Invalid checkpoint tag phase.  Expected: {0} Was: {1}", Phase, previous.Phase));
-
-			return CheckpointTag.FromPreparePosition(previous.Phase, committedEvent.Data.Position.PreparePosition);
-		}
-
-		public override CheckpointTag MakeCheckpointTag(
-			CheckpointTag previous, ReaderSubscriptionMessage.EventReaderPartitionEof partitionEof) {
-			throw new NotImplementedException();
-		}
-
-		public override CheckpointTag MakeCheckpointTag(
-			CheckpointTag previous, ReaderSubscriptionMessage.EventReaderPartitionDeleted partitionDeleted) {
-			throw new NotSupportedException();
-		}
-
-		public override CheckpointTag MakeZeroCheckpointTag() {
-			return CheckpointTag.FromPreparePosition(Phase, -1);
-		}
-
-		public override bool IsCompatible(CheckpointTag checkpointTag) {
-			return checkpointTag.Mode_ == CheckpointTag.Mode.PreparePosition;
-		}
-
-		public override CheckpointTag AdjustTag(CheckpointTag tag) {
-			if (tag.Phase < Phase)
-				return tag;
-			if (tag.Phase > Phase)
-				throw new ArgumentException(
-					string.Format(
-						"Invalid checkpoint tag phase.  Expected less or equal to: {0} Was: {1}", Phase, tag.Phase),
-					"tag");
-
-			if (tag.Mode_ == CheckpointTag.Mode.PreparePosition)
-				return tag;
-
-			switch (tag.Mode_) {
-				case CheckpointTag.Mode.EventTypeIndex:
-					throw new NotSupportedException(
-						"Conversion from EventTypeIndex to PreparePosition position tag is not supported");
-				case CheckpointTag.Mode.Stream:
-					throw new NotSupportedException(
-						"Conversion from Stream to PreparePosition position tag is not supported");
-				case CheckpointTag.Mode.MultiStream:
-					throw new NotSupportedException(
-						"Conversion from MultiStream to PreparePosition position tag is not supported");
-				case CheckpointTag.Mode.Position:
-					throw new NotSupportedException(
-						"Conversion from Position to PreparePosition position tag is not supported");
-				default:
-					throw new NotSupportedException(string.Format(
-						"The given checkpoint is invalid. Possible causes might include having written an event to the projection's managed stream. The bad checkpoint: {0}",
-						tag.ToString()));
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/TransactionFile/TransactionFileEventFilter.cs b/src/EventStore.Projections.Core/Services/Processing/TransactionFile/TransactionFileEventFilter.cs
deleted file mode 100644
index db1c05536f1..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/TransactionFile/TransactionFileEventFilter.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Collections.Generic;
-using EventStore.Core.Services;
-
-namespace EventStore.Projections.Core.Services.Processing.AllStream {
-	public class TransactionFileEventFilter : EventFilter {
-		private readonly bool _includeLinks;
-
-		public TransactionFileEventFilter(
-			bool allEvents, bool includeDeletedStreamEvents, HashSet<string> events, bool includeLinks = false)
-			: base(allEvents, includeDeletedStreamEvents, events) {
-			_includeLinks = includeLinks;
-		}
-
-		protected override bool DeletedNotificationPasses(string positionStreamId) {
-			return true;
-		}
-
-		public override bool PassesSource(bool resolvedFromLinkTo, string positionStreamId, string eventType) {
-			if (!_includeLinks && eventType == SystemEventTypes.LinkTo) return false;
-			return (_includeLinks || !resolvedFromLinkTo)
-			       && (!SystemStreams.IsSystemStream(positionStreamId)
-			           || SystemStreams.IsMetastream(positionStreamId)
-			           && !SystemStreams.IsSystemStream(SystemStreams.OriginalStreamOf(positionStreamId)));
-		}
-
-		public override string GetCategory(string positionStreamId) {
-			return null;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/TransactionFile/TransactionFileEventReader.cs b/src/EventStore.Projections.Core/Services/Processing/TransactionFile/TransactionFileEventReader.cs
deleted file mode 100644
index dca2f96cbba..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/TransactionFile/TransactionFileEventReader.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-using System;
-using System.Security.Claims;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Settings;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Standard;
-
-namespace EventStore.Projections.Core.Services.Processing.AllStream {
-	public class TransactionFileEventReader : EventReader,
-		IHandle<ClientMessage.ReadAllEventsForwardCompleted>,
-		IHandle<ProjectionManagementMessage.Internal.ReadTimeout> {
-		private bool _eventsRequested;
-		private int _maxReadCount = 250;
-		private TFPos _from;
-		private readonly bool _deliverEndOfTfPosition;
-		private readonly bool _resolveLinkTos;
-		private readonly ITimeProvider _timeProvider;
-		private long _lastPosition;
-		private bool _eof;
-		private Guid _pendingRequestCorrelationId;
-
-		public TransactionFileEventReader(
-			IPublisher publisher,
-			Guid eventReaderCorrelationId,
-			ClaimsPrincipal readAs,
-			TFPos @from,
-			ITimeProvider timeProvider,
-			bool stopOnEof = false,
-			bool deliverEndOfTFPosition = true,
-			bool resolveLinkTos = true)
-			: base(publisher, eventReaderCorrelationId, readAs, stopOnEof) {
-			if (publisher == null) throw new ArgumentNullException("publisher");
-			_from = @from;
-			_deliverEndOfTfPosition = deliverEndOfTFPosition;
-			_resolveLinkTos = resolveLinkTos;
-			_timeProvider = timeProvider;
-		}
-
-		protected override bool AreEventsRequested() {
-			return _eventsRequested;
-		}
-
-		public void Handle(ClientMessage.ReadAllEventsForwardCompleted message) {
-			if (_disposed)
-				return;
-			if (!_eventsRequested)
-				throw new InvalidOperationException("Read events has not been requested");
-			if (Paused)
-				throw new InvalidOperationException("Paused");
-			if (message.CorrelationId != _pendingRequestCorrelationId) {
-				return;
-			}
-
-			_eventsRequested = false;
-			_lastPosition = message.TfLastCommitPosition;
-			if (message.Result == ReadAllResult.AccessDenied) {
-				SendNotAuthorized();
-				return;
-			}
-
-			var eof = (message.Events.Length == 0) && message.IsEndOfStream;
-			_eof = eof;
-			var willDispose = _stopOnEof && eof;
-			var oldFrom = _from;
-			_from = message.NextPos;
-
-			if (!willDispose) {
-				PauseOrContinueProcessing();
-			}
-
-			if (eof) {
-				// the end
-				if (_deliverEndOfTfPosition)
-					DeliverLastCommitPosition(_from);
-				// allow joining heading distribution
-				SendIdle();
-				SendEof();
-			} else {
-				for (int index = 0; index < message.Events.Length; index++) {
-					var @event = message.Events[index];
-					DeliverEvent(@event, message.TfLastCommitPosition, oldFrom);
-				}
-			}
-		}
-
-		public void Handle(ProjectionManagementMessage.Internal.ReadTimeout message) {
-			if (_disposed) return;
-			if (Paused) return;
-			if (message.CorrelationId != _pendingRequestCorrelationId) return;
-
-			_eventsRequested = false;
-			PauseOrContinueProcessing();
-		}
-
-		private void SendIdle() {
-			_publisher.Publish(
-				new ReaderSubscriptionMessage.EventReaderIdle(EventReaderCorrelationId, _timeProvider.UtcNow));
-		}
-
-		protected override void RequestEvents() {
-			if (_disposed) throw new InvalidOperationException("Disposed");
-			if (_eventsRequested)
-				throw new InvalidOperationException("Read operation is already in progress");
-			if (PauseRequested || Paused)
-				throw new InvalidOperationException("Paused or pause requested");
-			_eventsRequested = true;
-
-			_pendingRequestCorrelationId = Guid.NewGuid();
-			var readEventsForward = CreateReadEventsMessage(_pendingRequestCorrelationId);
-			if (_eof) {
-				_publisher.Publish(
-					new AwakeServiceMessage.SubscribeAwake(
-						_publisher, Guid.NewGuid(), null,
-						new TFPos(_lastPosition, _lastPosition),
-						CreateReadTimeoutMessage(_pendingRequestCorrelationId, "$all")));
-				_publisher.Publish(
-					new AwakeServiceMessage.SubscribeAwake(
-						_publisher, Guid.NewGuid(), null,
-						new TFPos(_lastPosition, _lastPosition), readEventsForward));
-			} else {
-				_publisher.Publish(readEventsForward);
-				ScheduleReadTimeoutMessage(_pendingRequestCorrelationId, "$all");
-			}
-		}
-
-		private void ScheduleReadTimeoutMessage(Guid correlationId, string streamId) {
-			_publisher.Publish(CreateReadTimeoutMessage(correlationId, streamId));
-		}
-
-		private Message CreateReadTimeoutMessage(Guid correlationId, string streamId) {
-			return TimerMessage.Schedule.Create(
-				TimeSpan.FromMilliseconds(ESConsts.ReadRequestTimeout),
-				new SendToThisEnvelope(this),
-				new ProjectionManagementMessage.Internal.ReadTimeout(correlationId, streamId));
-		}
-
-		private Message CreateReadEventsMessage(Guid correlationId) {
-			return new ClientMessage.ReadAllEventsForward(
-				correlationId, correlationId, new SendToThisEnvelope(this), _from.CommitPosition,
-				_from.PreparePosition == -1 ? _from.CommitPosition : _from.PreparePosition, _maxReadCount,
-				_resolveLinkTos, false, null, ReadAs, replyOnExpired: false);
-		}
-
-		private void DeliverLastCommitPosition(TFPos lastPosition) {
-			if (_stopOnEof)
-				return;
-			_publisher.Publish(
-				new ReaderSubscriptionMessage.CommittedEventDistributed(
-					EventReaderCorrelationId, null, lastPosition.PreparePosition, 100.0f, source: this.GetType()));
-			//TODO: check was is passed here
-		}
-
-		private void DeliverEvent(
-			EventStore.Core.Data.ResolvedEvent @event, long lastCommitPosition, TFPos currentFrom) {
-			EventRecord linkEvent = @event.Link;
-			EventRecord targetEvent = @event.Event ?? linkEvent;
-			EventRecord positionEvent = (linkEvent ?? targetEvent);
-
-			TFPos receivedPosition = @event.OriginalPosition.Value;
-			if (currentFrom > receivedPosition)
-				throw new Exception(
-					string.Format(
-						"ReadFromTF returned events in incorrect order.  Last known position is: {0}.  Received position is: {1}",
-						currentFrom, receivedPosition));
-
-			var resolvedEvent = new ResolvedEvent(@event, null);
-
-			string deletedPartitionStreamId;
-			if (resolvedEvent.IsLinkToDeletedStream && !resolvedEvent.IsLinkToDeletedStreamTombstone)
-				return;
-
-			bool isDeletedStreamEvent = StreamDeletedHelper.IsStreamDeletedEventOrLinkToStreamDeletedEvent(
-				resolvedEvent, @event.ResolveResult, out deletedPartitionStreamId);
-
-			_publisher.Publish(
-				new ReaderSubscriptionMessage.CommittedEventDistributed(
-					EventReaderCorrelationId,
-					resolvedEvent,
-					_stopOnEof ? (long?)null : receivedPosition.PreparePosition,
-					100.0f * positionEvent.LogPosition / lastCommitPosition,
-					source: this.GetType()));
-			if (isDeletedStreamEvent)
-				_publisher.Publish(
-					new ReaderSubscriptionMessage.EventReaderPartitionDeleted(
-						EventReaderCorrelationId, deletedPartitionStreamId, source: this.GetType(), lastEventNumber: -1,
-						deleteEventOrLinkTargetPosition: resolvedEvent.EventOrLinkTargetPosition,
-						deleteLinkOrEventPosition: resolvedEvent.LinkOrEventPosition,
-						positionStreamId: positionEvent.EventStreamId, positionEventNumber: positionEvent.EventNumber));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/TransactionFile/TransactionFilePositionTagger.cs b/src/EventStore.Projections.Core/Services/Processing/TransactionFile/TransactionFilePositionTagger.cs
deleted file mode 100644
index 5fcc7612ca9..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/TransactionFile/TransactionFilePositionTagger.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Services.Processing.AllStream {
-	public class TransactionFilePositionTagger : PositionTagger {
-		public TransactionFilePositionTagger(int phase)
-			: base(phase) {
-		}
-
-		public override bool IsCompatible(CheckpointTag checkpointTag) {
-			return checkpointTag.Mode_ == CheckpointTag.Mode.Position;
-		}
-
-		public override CheckpointTag AdjustTag(CheckpointTag tag) {
-			if (tag.Phase < Phase)
-				return tag;
-			if (tag.Phase > Phase)
-				throw new ArgumentException(
-					string.Format("Invalid checkpoint tag phase.  Expected less or equal to: {0} Was: {1}", Phase,
-						tag.Phase), "tag");
-
-			if (tag.Mode_ == CheckpointTag.Mode.Position)
-				return tag;
-
-			switch (tag.Mode_) {
-				case CheckpointTag.Mode.EventTypeIndex:
-					return CheckpointTag.FromPosition(
-						tag.Phase, tag.Position.CommitPosition, tag.Position.PreparePosition);
-				case CheckpointTag.Mode.Stream:
-					throw new NotSupportedException("Conversion from Stream to Position position tag is not supported");
-				case CheckpointTag.Mode.MultiStream:
-					throw new NotSupportedException(
-						"Conversion from MultiStream to Position position tag is not supported");
-				case CheckpointTag.Mode.PreparePosition:
-					throw new NotSupportedException(
-						"Conversion from PreparePosition to Position position tag is not supported");
-				default:
-					throw new NotSupportedException(string.Format(
-						"The given checkpoint is invalid. Possible causes might include having written an event to the projection's managed stream. The bad checkpoint: {0}",
-						tag.ToString()));
-			}
-		}
-
-		public override bool IsMessageAfterCheckpointTag(
-			CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
-			if (previous.Phase < Phase)
-				return true;
-			if (previous.Mode_ != CheckpointTag.Mode.Position)
-				throw new ArgumentException("Mode.Position expected", "previous");
-			return committedEvent.Data.Position > previous.Position;
-		}
-
-		public override CheckpointTag MakeCheckpointTag(
-			CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
-			if (previous.Phase != Phase)
-				throw new ArgumentException(
-					string.Format("Invalid checkpoint tag phase.  Expected: {0} Was: {1}", Phase, previous.Phase));
-
-			return CheckpointTag.FromPosition(previous.Phase, committedEvent.Data.Position);
-		}
-
-		public override CheckpointTag MakeCheckpointTag(CheckpointTag previous,
-			ReaderSubscriptionMessage.EventReaderPartitionEof partitionEof) {
-			throw new NotImplementedException();
-		}
-
-		public override CheckpointTag MakeCheckpointTag(CheckpointTag previous,
-			ReaderSubscriptionMessage.EventReaderPartitionDeleted partitionDeleted) {
-			if (previous.Phase != Phase)
-				throw new ArgumentException(
-					string.Format("Invalid checkpoint tag phase.  Expected: {0} Was: {1}", Phase, previous.Phase));
-
-			if (partitionDeleted.DeleteLinkOrEventPosition == null)
-				throw new ArgumentException(
-					"Invalid partiton deleted message. deleteEventOrLinkTargetPosition required");
-
-			return CheckpointTag.FromPosition(previous.Phase, partitionDeleted.DeleteLinkOrEventPosition.Value);
-		}
-
-		public override CheckpointTag MakeZeroCheckpointTag() {
-			return CheckpointTag.FromPosition(Phase, 0, -1);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/WorkItems/CheckpointSuggestedWorkItem.cs b/src/EventStore.Projections.Core/Services/Processing/WorkItems/CheckpointSuggestedWorkItem.cs
deleted file mode 100644
index 53d63e11348..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/WorkItems/CheckpointSuggestedWorkItem.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Phases;
-
-namespace EventStore.Projections.Core.Services.Processing.WorkItems {
-	public class CheckpointSuggestedWorkItem : CheckpointWorkItemBase {
-		private readonly IProjectionPhaseCheckpointManager _projectionPhase;
-		private readonly EventReaderSubscriptionMessage.CheckpointSuggested _message;
-		private readonly ICoreProjectionCheckpointManager _checkpointManager;
-
-		private bool _completed = false;
-		private bool _completeRequested = false;
-
-		public CheckpointSuggestedWorkItem(
-			IProjectionPhaseCheckpointManager projectionPhase,
-			EventReaderSubscriptionMessage.CheckpointSuggested message,
-			ICoreProjectionCheckpointManager checkpointManager)
-			: base() {
-			_projectionPhase = projectionPhase;
-			_message = message;
-			_checkpointManager = checkpointManager;
-		}
-
-		protected override void WriteOutput() {
-			_projectionPhase.SetCurrentCheckpointSuggestedWorkItem(this);
-			if (_checkpointManager.CheckpointSuggested(_message.CheckpointTag, _message.Progress)) {
-				_projectionPhase.SetCurrentCheckpointSuggestedWorkItem(null);
-				_completed = true;
-			}
-
-			_projectionPhase.NewCheckpointStarted(_message.CheckpointTag);
-			NextStage();
-		}
-
-		protected override void CompleteItem() {
-			if (_completed)
-				NextStage();
-			else
-				_completeRequested = true;
-		}
-
-		internal void CheckpointCompleted() {
-			if (_completeRequested)
-				NextStage();
-			else
-				_completed = true;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/WorkItems/CheckpointWorkItemBase.cs b/src/EventStore.Projections.Core/Services/Processing/WorkItems/CheckpointWorkItemBase.cs
deleted file mode 100644
index 52a8127713c..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/WorkItems/CheckpointWorkItemBase.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace EventStore.Projections.Core.Services.Processing.WorkItems {
-	public class CheckpointWorkItemBase : WorkItem {
-		private static readonly object _correlationId = new object();
-
-		protected CheckpointWorkItemBase()
-			: base(_correlationId) {
-			_requiresRunning = true;
-		}
-
-		protected CheckpointWorkItemBase(object correlation)
-			: base(correlation) {
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/WorkItems/CommittedEventWorkItem.cs b/src/EventStore.Projections.Core/Services/Processing/WorkItems/CommittedEventWorkItem.cs
deleted file mode 100644
index bde4451e847..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/WorkItems/CommittedEventWorkItem.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using EventStore.Projections.Core.Services.Processing.Phases;
-
-namespace EventStore.Projections.Core.Services.Processing.WorkItems {
-	class CommittedEventWorkItem : WorkItem {
-		private readonly EventReaderSubscriptionMessage.CommittedEventReceived _message;
-		private string _partition;
-		private readonly IEventProcessingProjectionPhase _projection;
-		private readonly StatePartitionSelector _statePartitionSelector;
-		private EventProcessedResult _eventProcessedResult;
-
-		public CommittedEventWorkItem(
-			IEventProcessingProjectionPhase projection, EventReaderSubscriptionMessage.CommittedEventReceived message,
-			StatePartitionSelector statePartitionSelector)
-			: base(null) {
-			_projection = projection;
-			_statePartitionSelector = statePartitionSelector;
-			_message = message;
-			_requiresRunning = true;
-		}
-
-		protected override void RecordEventOrder() {
-			_projection.RecordEventOrder(_message.Data, _message.CheckpointTag, () => NextStage());
-		}
-
-		protected override void GetStatePartition() {
-			_partition = _statePartitionSelector.GetStatePartition(_message);
-			if (_partition == null)
-				// skip processing of events not mapped to any partition
-				NextStage();
-			else
-				NextStage(_partition);
-		}
-
-		protected override void Load(CheckpointTag checkpointTag) {
-			if (_partition == null) {
-				NextStage();
-				return;
-			}
-
-			// we load partition state even if stopping etc.  should we skip?
-			_projection.BeginGetPartitionStateAt(
-				_partition, _message.CheckpointTag, LoadCompleted, lockLoaded: true);
-		}
-
-		private void LoadCompleted(PartitionState state) {
-			NextStage();
-		}
-
-		protected override void ProcessEvent() {
-			if (_partition == null) {
-				NextStage();
-				return;
-			}
-
-			var eventProcessedResult = _projection.ProcessCommittedEvent(_message, _partition);
-			if (eventProcessedResult != null)
-				SetEventProcessedResult(eventProcessedResult);
-			NextStage();
-		}
-
-		protected override void WriteOutput() {
-			if (_partition == null) {
-				NextStage();
-				return;
-			}
-
-			_projection.FinalizeEventProcessing(_eventProcessedResult, _message.CheckpointTag, _message.Progress);
-			NextStage();
-		}
-
-		private void SetEventProcessedResult(EventProcessedResult eventProcessedResult) {
-			_eventProcessedResult = eventProcessedResult;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/WorkItems/CompletedWorkItem.cs b/src/EventStore.Projections.Core/Services/Processing/WorkItems/CompletedWorkItem.cs
deleted file mode 100644
index 82911ef0e99..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/WorkItems/CompletedWorkItem.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using EventStore.Projections.Core.Services.Processing.Phases;
-
-namespace EventStore.Projections.Core.Services.Processing.WorkItems {
-	class CompletedWorkItem : CheckpointWorkItemBase {
-		private readonly IProjectionPhaseCompleter _projection;
-
-		public CompletedWorkItem(IProjectionPhaseCompleter projection)
-			: base() {
-			_projection = projection;
-		}
-
-		protected override void WriteOutput() {
-			_projection.Complete();
-			NextStage();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/WorkItems/GetDataWorkItemBase.cs b/src/EventStore.Projections.Core/Services/Processing/WorkItems/GetDataWorkItemBase.cs
deleted file mode 100644
index a6f7409c2ea..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/WorkItems/GetDataWorkItemBase.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using EventStore.Projections.Core.Services.Processing.Phases;
-
-namespace EventStore.Projections.Core.Services.Processing.WorkItems {
-	abstract class GetDataWorkItemBase : WorkItem {
-		protected readonly IPublisher _publisher;
-		protected readonly string _partition;
-		protected Guid _correlationId;
-		protected Guid _projectionId;
-		private readonly IProjectionPhaseStateManager _projection;
-		private PartitionState _state;
-		private CheckpointTag _lastProcessedCheckpointTag;
-
-		protected GetDataWorkItemBase(
-			IPublisher publisher,
-			Guid correlationId,
-			Guid projectionId,
-			IProjectionPhaseStateManager projection,
-			string partition)
-			: base(null) {
-			if (partition == null) throw new ArgumentNullException("partition");
-			_publisher = publisher;
-			_partition = partition;
-			_correlationId = correlationId;
-			_projectionId = projectionId;
-			_projection = projection;
-		}
-
-		protected override void GetStatePartition() {
-			NextStage(_partition);
-		}
-
-		protected override void Load(CheckpointTag checkpointTag) {
-			_lastProcessedCheckpointTag = _projection.LastProcessedEventPosition;
-			_projection.BeginGetPartitionStateAt(
-				_partition,
-				_lastProcessedCheckpointTag,
-				LoadCompleted,
-				lockLoaded: false);
-		}
-
-		private void LoadCompleted(PartitionState state) {
-			_state = state;
-			NextStage();
-		}
-
-		protected override void WriteOutput() {
-			Reply(_state, _lastProcessedCheckpointTag);
-			NextStage();
-		}
-
-		protected abstract void Reply(PartitionState state, CheckpointTag checkpointTag);
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/WorkItems/GetResultWorkItem.cs b/src/EventStore.Projections.Core/Services/Processing/WorkItems/GetResultWorkItem.cs
deleted file mode 100644
index 102c87eba1a..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/WorkItems/GetResultWorkItem.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using EventStore.Projections.Core.Services.Processing.Phases;
-
-namespace EventStore.Projections.Core.Services.Processing.WorkItems {
-	class GetResultWorkItem : GetDataWorkItemBase {
-		public GetResultWorkItem(
-			IPublisher publisher,
-			Guid correlationId,
-			Guid projectionId,
-			IProjectionPhaseStateManager projection,
-			string partition)
-			: base(publisher, correlationId, projectionId, projection, partition) {
-		}
-
-		protected override void Reply(PartitionState state, CheckpointTag checkpointTag) {
-			if (state == null)
-				_publisher.Publish(
-					new CoreProjectionStatusMessage.ResultReport(
-						_correlationId,
-						_projectionId,
-						_partition,
-						null,
-						checkpointTag));
-			else
-				_publisher.Publish(
-					new CoreProjectionStatusMessage.ResultReport(
-						_correlationId,
-						_projectionId,
-						_partition,
-						state.Result,
-						checkpointTag));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/WorkItems/GetStateWorkItem.cs b/src/EventStore.Projections.Core/Services/Processing/WorkItems/GetStateWorkItem.cs
deleted file mode 100644
index 99cea4f2b70..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/WorkItems/GetStateWorkItem.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using EventStore.Core.Bus;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using EventStore.Projections.Core.Services.Processing.Phases;
-
-namespace EventStore.Projections.Core.Services.Processing.WorkItems {
-	class GetStateWorkItem : GetDataWorkItemBase {
-		public GetStateWorkItem(
-			IPublisher publisher,
-			Guid correlationId,
-			Guid projectionId,
-			IProjectionPhaseStateManager projection,
-			string partition)
-			: base(publisher, correlationId, projectionId, projection, partition) {
-		}
-
-		protected override void Reply(PartitionState state, CheckpointTag checkpointTag) {
-			if (state == null)
-				_publisher.Publish(
-					new CoreProjectionStatusMessage.StateReport(
-						_correlationId,
-						_projectionId,
-						_partition,
-						null,
-						checkpointTag));
-			else
-				_publisher.Publish(
-					new CoreProjectionStatusMessage.StateReport(
-						_correlationId,
-						_projectionId,
-						_partition,
-						state.State,
-						checkpointTag));
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/WorkItems/NotAuthorizedWorkItem.cs b/src/EventStore.Projections.Core/Services/Processing/WorkItems/NotAuthorizedWorkItem.cs
deleted file mode 100644
index a4889e5bb8f..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/WorkItems/NotAuthorizedWorkItem.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-
-namespace EventStore.Projections.Core.Services.Processing.WorkItems {
-	class NotAuthorizedWorkItem : CheckpointWorkItemBase {
-		public NotAuthorizedWorkItem()
-			: base(null) {
-		}
-
-		protected override void ProcessEvent() {
-			throw new Exception("Projection cannot read its source. Not authorized.");
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/WorkItems/PartitionCompletedWorkItem.cs b/src/EventStore.Projections.Core/Services/Processing/WorkItems/PartitionCompletedWorkItem.cs
deleted file mode 100644
index ce97adebac0..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/WorkItems/PartitionCompletedWorkItem.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using EventStore.Projections.Core.Services.Processing.Phases;
-
-namespace EventStore.Projections.Core.Services.Processing.WorkItems {
-	class PartitionCompletedWorkItem : CheckpointWorkItemBase {
-		private readonly IEventProcessingProjectionPhase _projection;
-		private readonly ICoreProjectionCheckpointManager _checkpointManager;
-		private readonly string _partition;
-		private readonly CheckpointTag _checkpointTag;
-		private PartitionState _state;
-
-		public PartitionCompletedWorkItem(
-			IEventProcessingProjectionPhase projection, ICoreProjectionCheckpointManager checkpointManager,
-			string partition, CheckpointTag checkpointTag)
-			: base() {
-			_projection = projection;
-			_checkpointManager = checkpointManager;
-			_partition = partition;
-			_checkpointTag = checkpointTag;
-		}
-
-		protected override void Load(CheckpointTag checkpointTag) {
-			if (_partition == null)
-				throw new NotSupportedException();
-			_projection.BeginGetPartitionStateAt(_partition, _checkpointTag, LoadCompleted, lockLoaded: false);
-		}
-
-		private void LoadCompleted(PartitionState obj) {
-			_state = obj;
-			NextStage();
-		}
-
-		protected override void WriteOutput() {
-			_projection.EmitEofResult(_partition, _state.Result, _checkpointTag, Guid.Empty, null);
-			//NOTE: write output is an ordered processing stage
-			//      thus all the work items before have been already processed
-			//      and as we are processing in the stream-by-stream mode
-			//      it is safe to clean everything before this position up
-			_projection.UnlockAndForgetBefore(_checkpointTag);
-			_checkpointManager.PartitionCompleted(_partition);
-			NextStage();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/WorkItems/PartitionDeletedWorkItem.cs b/src/EventStore.Projections.Core/Services/Processing/WorkItems/PartitionDeletedWorkItem.cs
deleted file mode 100644
index f7fb70823a6..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/WorkItems/PartitionDeletedWorkItem.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using EventStore.Projections.Core.Services.Processing.Phases;
-
-namespace EventStore.Projections.Core.Services.Processing.WorkItems {
-	class PartitionDeletedWorkItem : WorkItem {
-		private readonly EventReaderSubscriptionMessage.PartitionDeleted _message;
-		private readonly string _partition;
-		private readonly IEventProcessingProjectionPhase _projection;
-		private EventProcessedResult _eventProcessedResult;
-
-		public PartitionDeletedWorkItem(
-			IEventProcessingProjectionPhase projection, EventReaderSubscriptionMessage.PartitionDeleted message)
-			: base(null) {
-			_partition = message.Partition;
-			_projection = projection;
-			_message = message;
-			_requiresRunning = true;
-		}
-
-		protected override void GetStatePartition() {
-			NextStage(_partition);
-		}
-
-		protected override void Load(CheckpointTag checkpointTag) {
-			// we load partition state even if stopping etc.  should we skip?
-			_projection.BeginGetPartitionStateAt(_partition, _message.CheckpointTag, LoadCompleted, lockLoaded: true);
-		}
-
-		private void LoadCompleted(PartitionState state) {
-			NextStage();
-		}
-
-		protected override void ProcessEvent() {
-			if (_partition == null) {
-				NextStage();
-				return;
-			}
-
-			var eventProcessedResult = _projection.ProcessPartitionDeleted(_partition, _message.CheckpointTag);
-			if (eventProcessedResult != null)
-				SetEventProcessedResult(eventProcessedResult);
-			NextStage();
-		}
-
-		protected override void WriteOutput() {
-			if (_partition == null) {
-				NextStage();
-				return;
-			}
-
-			_projection.FinalizeEventProcessing(_eventProcessedResult, _message.CheckpointTag, _message.Progress);
-			NextStage();
-		}
-
-		private void SetEventProcessedResult(EventProcessedResult eventProcessedResult) {
-			_eventProcessedResult = eventProcessedResult;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/WorkItems/ProgressWorkItem.cs b/src/EventStore.Projections.Core/Services/Processing/WorkItems/ProgressWorkItem.cs
deleted file mode 100644
index 9955fa72686..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/WorkItems/ProgressWorkItem.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Phases;
-
-namespace EventStore.Projections.Core.Services.Processing.WorkItems {
-	class ProgressWorkItem : CheckpointWorkItemBase {
-		private readonly ICoreProjectionCheckpointManager _checkpointManager;
-		private readonly IProgressResultWriter _resultWriter;
-		private readonly float _progress;
-
-		public ProgressWorkItem(ICoreProjectionCheckpointManager checkpointManager, IProgressResultWriter resultWriter,
-			float progress)
-			: base(null) {
-			_checkpointManager = checkpointManager;
-			_resultWriter = resultWriter;
-			_progress = progress;
-		}
-
-		protected override void WriteOutput() {
-			_checkpointManager.Progress(_progress);
-			_resultWriter.WriteProgress(_progress);
-			NextStage();
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/Processing/WorkItems/WorkItem.cs b/src/EventStore.Projections.Core/Services/Processing/WorkItems/WorkItem.cs
deleted file mode 100644
index fc621a234f7..00000000000
--- a/src/EventStore.Projections.Core/Services/Processing/WorkItems/WorkItem.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using System;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Services.Processing.WorkItems {
-	public abstract class WorkItem : StagedTask {
-		private readonly int _lastStage;
-		private Action<int, object> _complete;
-		private int _onStage;
-		private CheckpointTag _checkpointTag;
-		private object _lastStageCorrelationId;
-		private CoreProjectionQueue _queue;
-		protected bool _requiresRunning;
-
-		protected WorkItem(object initialCorrelationId)
-			: base(initialCorrelationId) {
-			_lastStage = 5;
-		}
-
-		protected CoreProjectionQueue Queue {
-			get { return _queue; }
-		}
-
-		public override void Process(int onStage, Action<int, object> readyForStage) {
-			if (_checkpointTag == null)
-				throw new InvalidOperationException("CheckpointTag has not been initialized");
-			_complete = readyForStage;
-			_onStage = onStage;
-			//TODO:
-			if (_requiresRunning && !Queue.IsRunning)
-				NextStage();
-			else {
-				switch (onStage) {
-					case 0:
-						RecordEventOrder();
-						break;
-					case 1:
-						GetStatePartition();
-						break;
-					case 2:
-						Load(_checkpointTag);
-						break;
-					case 3:
-						ProcessEvent();
-						break;
-					case 4:
-						WriteOutput();
-						break;
-					case 5:
-						CompleteItem();
-						break;
-					default:
-						throw new NotSupportedException();
-				}
-			}
-		}
-
-		protected virtual void RecordEventOrder() {
-			NextStage();
-		}
-
-		protected virtual void GetStatePartition() {
-			NextStage();
-		}
-
-		protected virtual void Load(CheckpointTag checkpointTag) {
-			NextStage();
-		}
-
-		protected virtual void ProcessEvent() {
-			NextStage();
-		}
-
-		protected virtual void WriteOutput() {
-			NextStage();
-		}
-
-
-		protected virtual void CompleteItem() {
-			NextStage();
-		}
-
-		protected void NextStage(object newCorrelationId = null) {
-			_lastStageCorrelationId = newCorrelationId ?? _lastStageCorrelationId ?? InitialCorrelationId;
-			_complete(_onStage == _lastStage ? -1 : _onStage + 1, _lastStageCorrelationId);
-		}
-
-		public void SetCheckpointTag(CheckpointTag checkpointTag) {
-			_checkpointTag = checkpointTag;
-		}
-
-		public void SetProjectionQueue(CoreProjectionQueue coreProjectionQueue) {
-			_queue = coreProjectionQueue;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/ProjectionConfig.cs b/src/EventStore.Projections.Core/Services/ProjectionConfig.cs
deleted file mode 100644
index 453403756c1..00000000000
--- a/src/EventStore.Projections.Core/Services/ProjectionConfig.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using EventStore.Projections.Core.Common;
-using System;
-using System.Security.Claims;
-using EventStore.Core;
-
-namespace EventStore.Projections.Core.Services {
-	public class ProjectionConfig {
-		private readonly ClaimsPrincipal _runAs;
-		private readonly int _checkpointHandledThreshold;
-		private readonly int _checkpointUnhandledBytesThreshold;
-		private readonly int _pendingEventsThreshold;
-		private readonly int _maxWriteBatchLength;
-		private readonly bool _emitEventEnabled;
-		private readonly bool _checkpointsEnabled;
-		private readonly bool _createTempStreams;
-		private readonly bool _stopOnEof;
-		private readonly bool _trackEmittedStreams;
-		private readonly int _checkpointAfterMs;
-		private readonly int _maximumAllowedWritesInFlight;
-
-		public ProjectionConfig(ClaimsPrincipal runAs, int checkpointHandledThreshold, int checkpointUnhandledBytesThreshold,
-			int pendingEventsThreshold, int maxWriteBatchLength, bool emitEventEnabled, bool checkpointsEnabled,
-			bool createTempStreams, bool stopOnEof, bool trackEmittedStreams,
-			int checkpointAfterMs, int maximumAllowedWritesInFlight, int? projectionExecutionTimeout) {
-			if (checkpointsEnabled) {
-				if (checkpointHandledThreshold <= 0)
-					throw new ArgumentOutOfRangeException("checkpointHandledThreshold");
-				if (checkpointUnhandledBytesThreshold < checkpointHandledThreshold)
-					throw new ArgumentException(
-						"Checkpoint threshold cannot be less than checkpoint handled threshold");
-			} else {
-				if (checkpointHandledThreshold != 0)
-					throw new ArgumentOutOfRangeException("checkpointHandledThreshold must be 0");
-				if (checkpointUnhandledBytesThreshold != 0)
-					throw new ArgumentException("checkpointUnhandledBytesThreshold must be 0");
-			}
-
-			if (maximumAllowedWritesInFlight < AllowedWritesInFlight.Unbounded) {
-				throw new ArgumentException(
-					$"The Maximum Number of Allowed Writes in Flight cannot be less than {AllowedWritesInFlight.Unbounded}");
-			}
-
-			if (projectionExecutionTimeout is not null && projectionExecutionTimeout <= 0) {
-				throw new ArgumentException(
-					$"The projection execution timeout should be positive. Found : {projectionExecutionTimeout}");
-			}
-
-			_runAs = runAs;
-			_checkpointHandledThreshold = checkpointHandledThreshold;
-			_checkpointUnhandledBytesThreshold = checkpointUnhandledBytesThreshold;
-			_pendingEventsThreshold = pendingEventsThreshold;
-			_maxWriteBatchLength = maxWriteBatchLength;
-			_emitEventEnabled = emitEventEnabled;
-			_checkpointsEnabled = checkpointsEnabled;
-			_createTempStreams = createTempStreams;
-			_stopOnEof = stopOnEof;
-			_trackEmittedStreams = trackEmittedStreams;
-			_checkpointAfterMs = checkpointAfterMs;
-			_maximumAllowedWritesInFlight = maximumAllowedWritesInFlight;
-			ProjectionExecutionTimeout = projectionExecutionTimeout;
-		}
-
-		public int CheckpointHandledThreshold {
-			get { return _checkpointHandledThreshold; }
-		}
-
-		public int CheckpointUnhandledBytesThreshold {
-			get { return _checkpointUnhandledBytesThreshold; }
-		}
-
-		public int MaxWriteBatchLength {
-			get { return _maxWriteBatchLength; }
-		}
-
-		public bool EmitEventEnabled {
-			get { return _emitEventEnabled; }
-		}
-
-		public bool CheckpointsEnabled {
-			get { return _checkpointsEnabled; }
-		}
-
-		public int PendingEventsThreshold {
-			get { return _pendingEventsThreshold; }
-		}
-
-		public bool CreateTempStreams {
-			get { return _createTempStreams; }
-		}
-
-		public bool StopOnEof {
-			get { return _stopOnEof; }
-		}
-
-		public ClaimsPrincipal RunAs {
-			get { return _runAs; }
-		}
-
-		public bool TrackEmittedStreams {
-			get { return _trackEmittedStreams; }
-		}
-
-		public int CheckpointAfterMs {
-			get { return _checkpointAfterMs; }
-		}
-
-		public int MaximumAllowedWritesInFlight {
-			get { return _maximumAllowedWritesInFlight; }
-		}
-
-		public int? ProjectionExecutionTimeout { get; }
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/ProjectionMode.cs b/src/EventStore.Projections.Core/Services/ProjectionMode.cs
deleted file mode 100644
index c37c6e6d9fd..00000000000
--- a/src/EventStore.Projections.Core/Services/ProjectionMode.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace EventStore.Projections.Core.Services {
-	public enum ProjectionMode {
-		Transient = 0,
-		OneTime = 1,
-
-		//____1 = 1,
-		//____2 = 2,
-		//____3 = 3,
-		Continuous = 4,
-		AllNonTransient = 999,
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/ProjectionStatistics.cs b/src/EventStore.Projections.Core/Services/ProjectionStatistics.cs
deleted file mode 100644
index 30045b9a6d5..00000000000
--- a/src/EventStore.Projections.Core/Services/ProjectionStatistics.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using EventStore.Projections.Core.Services.Management;
-
-namespace EventStore.Projections.Core.Services {
-	public class ProjectionStatistics {
-		//TODO: resolve name collisions...
-
-		public string Status { get; set; }
-
-		public bool Enabled { get; set; }
-
-		public ManagedProjectionState LeaderStatus { get; set; }
-
-		public string StateReason { get; set; }
-
-		public string Name { get; set; }
-
-		public long ProjectionId { get; set; }
-
-		public long Epoch { get; set; }
-
-		public long Version { get; set; }
-
-		public ProjectionMode Mode { get; set; }
-
-		public string Position { get; set; }
-
-		public float Progress { get; set; }
-
-		public string LastCheckpoint { get; set; }
-
-		public int EventsProcessedAfterRestart { get; set; }
-
-		public int BufferedEvents { get; set; }
-
-		public string CheckpointStatus { get; set; }
-
-		public int WritePendingEventsBeforeCheckpoint { get; set; }
-
-		public int WritePendingEventsAfterCheckpoint { get; set; }
-
-		public int PartitionsCached { get; set; }
-
-		public int ReadsInProgress { get; set; }
-
-		public int WritesInProgress { get; set; }
-
-		public string EffectiveName { get; set; }
-
-		public string ResultStreamName { get; set; }
-
-		public long CoreProcessingTime { get; set; }
-
-		public ProjectionStatistics Clone() {
-			return (ProjectionStatistics)MemberwiseClone();
-		}
-
-		protected bool Equals(ProjectionStatistics other) {
-			return string.Equals(Status, other.Status) && Enabled.Equals(other.Enabled)
-			                                           && LeaderStatus == other.LeaderStatus &&
-			                                           string.Equals(StateReason, other.StateReason)
-			                                           && string.Equals(Name, other.Name) &&
-			                                           ProjectionId == other.ProjectionId && Epoch == other.Epoch
-			                                           && Version == other.Version && Mode == other.Mode &&
-			                                           Equals(Position, other.Position)
-			                                           && Progress.Equals(other.Progress) &&
-			                                           string.Equals(LastCheckpoint, other.LastCheckpoint)
-			                                           && EventsProcessedAfterRestart ==
-			                                           other.EventsProcessedAfterRestart
-			                                           && BufferedEvents == other.BufferedEvents &&
-			                                           string.Equals(CheckpointStatus, other.CheckpointStatus)
-			                                           && WritePendingEventsBeforeCheckpoint ==
-			                                           other.WritePendingEventsBeforeCheckpoint
-			                                           && WritePendingEventsAfterCheckpoint ==
-			                                           other.WritePendingEventsAfterCheckpoint
-			                                           && PartitionsCached == other.PartitionsCached &&
-			                                           ReadsInProgress == other.ReadsInProgress
-			                                           && WritesInProgress == other.WritesInProgress &&
-			                                           string.Equals(EffectiveName, other.EffectiveName)
-			                                           && string.Equals(ResultStreamName, other.ResultStreamName) &&
-			                                           CoreProcessingTime == other.CoreProcessingTime;
-		}
-
-		public override bool Equals(object obj) {
-			if (ReferenceEquals(null, obj)) return false;
-			if (ReferenceEquals(this, obj)) return true;
-			if (obj.GetType() != this.GetType()) return false;
-			return Equals((ProjectionStatistics)obj);
-		}
-
-		public override int GetHashCode() {
-			unchecked {
-				int hashCode = (Status != null ? Status.GetHashCode() : 0);
-				hashCode = (hashCode * 397) ^ Enabled.GetHashCode();
-				hashCode = (hashCode * 397) ^ (int)LeaderStatus;
-				hashCode = (hashCode * 397) ^ (StateReason != null ? StateReason.GetHashCode() : 0);
-				hashCode = (hashCode * 397) ^ (Name != null ? Name.GetHashCode() : 0);
-				hashCode = (hashCode * 397) ^ ProjectionId.GetHashCode();
-				hashCode = (hashCode * 397) ^ Epoch.GetHashCode();
-				hashCode = (hashCode * 397) ^ Version.GetHashCode();
-				hashCode = (hashCode * 397) ^ (int)Mode;
-				hashCode = (hashCode * 397) ^ (Position != null ? Position.GetHashCode() : 0);
-				hashCode = (hashCode * 397) ^ Progress.GetHashCode();
-				hashCode = (hashCode * 397) ^ (LastCheckpoint != null ? LastCheckpoint.GetHashCode() : 0);
-				hashCode = (hashCode * 397) ^ EventsProcessedAfterRestart;
-				hashCode = (hashCode * 397) ^ BufferedEvents;
-				hashCode = (hashCode * 397) ^ (CheckpointStatus != null ? CheckpointStatus.GetHashCode() : 0);
-				hashCode = (hashCode * 397) ^ WritePendingEventsBeforeCheckpoint;
-				hashCode = (hashCode * 397) ^ WritePendingEventsAfterCheckpoint;
-				hashCode = (hashCode * 397) ^ PartitionsCached;
-				hashCode = (hashCode * 397) ^ ReadsInProgress;
-				hashCode = (hashCode * 397) ^ WritesInProgress;
-				hashCode = (hashCode * 397) ^ (EffectiveName != null ? EffectiveName.GetHashCode() : 0);
-				hashCode = (hashCode * 397) ^ (ResultStreamName != null ? ResultStreamName.GetHashCode() : 0);
-				hashCode = (hashCode * 397) ^ CoreProcessingTime.GetHashCode();
-				return hashCode;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/ReadWrite.cs b/src/EventStore.Projections.Core/Services/ReadWrite.cs
deleted file mode 100644
index cd0dd5bccaa..00000000000
--- a/src/EventStore.Projections.Core/Services/ReadWrite.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace EventStore.Projections.Core.Services {
-	public enum ReadWrite {
-		Read,
-		Write
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/ReaderSubscriptionDispatcher.cs b/src/EventStore.Projections.Core/Services/ReaderSubscriptionDispatcher.cs
deleted file mode 100644
index 1fbe0e70037..00000000000
--- a/src/EventStore.Projections.Core/Services/ReaderSubscriptionDispatcher.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Settings;
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Services {
-	public sealed class ReaderSubscriptionDispatcher {
-		private readonly ConcurrentDictionary<Guid, object> _map = new();
-		private readonly IPublisher _publisher;
-		private readonly IEnvelope _publishEnvelope;
-		private readonly TimeSpan _readerSubscriptionTimeout =
-			TimeSpan.FromMilliseconds(ESConsts.ReadRequestTimeout);
-
-		public ReaderSubscriptionDispatcher(IPublisher publisher) {
-			_publisher = publisher;
-			_publishEnvelope = _publisher;
-		}
-
-		/// <summary>
-		/// Publishes the <see cref="ReaderSubscriptionManagement.Subscribe"/> message to be handled later.
-		/// The caller must wait for further <see cref="EventReaderSubscriptionMessage"/>s to determine whether
-		/// the subscription was successful.
-		/// </summary>
-		/// <param name="request">The subscription to request</param>
-		/// <param name="subscriber">The subscriber to call with any responses for this subscription</param>
-		/// <param name="scheduleTimeout">Whether to schedule a <see cref="EventReaderSubscriptionMessage.SubscribeTimeout"/> message for this subscription</param>
-		/// <returns></returns>
-		public void PublishSubscribe(
-			ReaderSubscriptionManagement.Subscribe request, object subscriber, bool scheduleTimeout) {
-			_map.TryAdd(request.SubscriptionId, subscriber);
-			_publisher.Publish(request);
-			if (scheduleTimeout)
-				ScheduleSubscriptionTimeout(request.SubscriptionId);
-		}
-
-		private void ScheduleSubscriptionTimeout(Guid subscriptionId) {
-			_publisher.Publish(TimerMessage.Schedule.Create(
-				_readerSubscriptionTimeout, _publishEnvelope,
-				new EventReaderSubscriptionMessage.SubscribeTimeout(subscriptionId)));
-		}
-
-		public void Cancel(Guid requestId) {
-			_map.TryRemove(requestId, out _);
-		}
-
-		public IHandle<T> CreateSubscriber<T>() where T : EventReaderSubscriptionMessageBase {
-			return new Subscriber<T>(this);
-		}
-
-		private void Handle<T>(T message) where T : EventReaderSubscriptionMessageBase {
-			var correlationId = message.SubscriptionId;
-			if (_map.TryGetValue(correlationId, out var subscriber)) {
-				if (subscriber is IHandle<T> h) {
-					h.Handle(message);
-				} else if (subscriber is IAsyncHandle<T>) {
-					throw new Exception($"ReaderSubscriptionDispatcher does not support asynchronous subscribers. Subscriber: {subscriber}");
-				}
-			}
-		}
-
-		public void Subscribed(Guid correlationId, object subscriber) {
-			_map.TryAdd(correlationId, subscriber);
-		}
-
-		private class Subscriber<T> : IHandle<T> where T : EventReaderSubscriptionMessageBase {
-			private readonly ReaderSubscriptionDispatcher _host;
-
-			public Subscriber(
-				ReaderSubscriptionDispatcher host) {
-				_host = host;
-			}
-
-			public void Handle(T message) {
-				_host.Handle(message);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Services/SystemNames.cs b/src/EventStore.Projections.Core/Services/SystemNames.cs
deleted file mode 100644
index a4668e82a8d..00000000000
--- a/src/EventStore.Projections.Core/Services/SystemNames.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace EventStore.Projections.Core.Services {
-	public static class ProjectionEventTypes {
-		public const string ProjectionCheckpoint = "$ProjectionCheckpoint";
-		public const string PartitionCheckpoint = "$Checkpoint";
-		public const string StreamTracked = "$StreamTracked";
-
-		public const string ProjectionCreated = "$ProjectionCreated";
-		public const string ProjectionDeleted = "$ProjectionDeleted";
-		public const string ProjectionsInitialized = "$ProjectionsInitialized";
-		public const string ProjectionUpdated = "$ProjectionUpdated";
-	}
-}
diff --git a/src/EventStore.Projections.Core/Standard/ByCorrelationId.cs b/src/EventStore.Projections.Core/Standard/ByCorrelationId.cs
deleted file mode 100644
index a695c302854..00000000000
--- a/src/EventStore.Projections.Core/Standard/ByCorrelationId.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Core.Services;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using EventStore.Common.Utils;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Standard {
-	public class ByCorrelationId : IProjectionStateHandler {
-		private readonly string _corrIdStreamPrefix;
-
-		public ByCorrelationId(string source, Action<string, object[]> logger) {
-			if (!string.IsNullOrWhiteSpace(source)) {
-				string correlationIdProperty;
-				if (!TryParseCorrelationIdProperty(source, out correlationIdProperty)) {
-					throw new InvalidOperationException(
-						"Could not parse projection source. Please make sure the source is a valid JSON string with a property: 'correlationIdProperty' having a string value");
-				}
-
-				CorrelationIdPropertyContext.CorrelationIdProperty = correlationIdProperty;
-			}
-
-			_corrIdStreamPrefix = "$bc-";
-		}
-
-		private bool TryParseCorrelationIdProperty(string source, out string correlationIdProperty) {
-			correlationIdProperty = null;
-			JObject obj = null;
-			try {
-				obj = JObject.Parse(source);
-				string prop = obj["correlationIdProperty"].Value<string>();
-				if (prop != null) {
-					correlationIdProperty = prop;
-					return true;
-				} else {
-					return false;
-				}
-			} catch (Exception) {
-				return false;
-			}
-		}
-
-		public void ConfigureSourceProcessingStrategy(SourceDefinitionBuilder builder) {
-			builder.FromAll();
-			builder.AllEvents();
-		}
-
-		public void Load(string state) {
-		}
-
-		public void LoadShared(string state) {
-			throw new NotImplementedException();
-		}
-
-		public void Initialize() {
-		}
-
-		public void InitializeShared() {
-		}
-
-		public string GetStatePartition(CheckpointTag eventPosition, string category, ResolvedEvent data) {
-			throw new NotImplementedException();
-		}
-
-		public bool ProcessEvent(
-			string partition, CheckpointTag eventPosition, string category1, ResolvedEvent data,
-			out string newState, out string newSharedState, out EmittedEventEnvelope[] emittedEvents) {
-			newSharedState = null;
-			emittedEvents = null;
-			newState = null;
-			if (data.EventStreamId != data.PositionStreamId)
-				return false;
-
-			if (data.Metadata == null)
-				return false;
-
-			JObject metadata = null;
-
-			try {
-				metadata = JObject.Parse(data.Metadata);
-			} catch (JsonReaderException) {
-				return false;
-			}
-
-			if (metadata[CorrelationIdPropertyContext.CorrelationIdProperty] == null)
-				return false;
-
-			string correlationId = metadata[CorrelationIdPropertyContext.CorrelationIdProperty].Value<string>();
-			if (correlationId == null)
-				return false;
-
-			string linkTarget;
-			if (data.EventType == SystemEventTypes.LinkTo)
-				linkTarget = data.Data;
-			else
-				linkTarget = data.EventSequenceNumber + "@" + data.EventStreamId;
-
-			var metadataDict = new Dictionary<string, string>();
-			metadataDict.Add("$eventTimestamp", "\"" + data.Timestamp.ToString("yyyy-MM-ddTHH:mm:ss.ffffffZ") + "\"");
-			if (data.EventType == SystemEventTypes.LinkTo) {
-				JObject linkObj = new JObject();
-				linkObj.Add("eventId", data.EventId);
-				linkObj.Add("metadata", metadata);
-				metadataDict.Add("$link", linkObj.ToJson());
-			}
-
-			var linkMetadata = new ExtraMetaData(metadataDict);
-
-			emittedEvents = new[] {
-				new EmittedEventEnvelope(
-					new EmittedDataEvent(
-						_corrIdStreamPrefix + correlationId, Guid.NewGuid(), "$>", false,
-						linkTarget,
-						linkMetadata,
-						eventPosition,
-						expectedTag: null))
-			};
-
-
-			return true;
-		}
-
-		public bool ProcessPartitionCreated(string partition, CheckpointTag createPosition, ResolvedEvent data,
-			out EmittedEventEnvelope[] emittedEvents) {
-			emittedEvents = null;
-			return false;
-		}
-
-		public bool ProcessPartitionDeleted(string partition, CheckpointTag deletePosition, out string newState) {
-			throw new NotImplementedException();
-		}
-
-		public string TransformStateToResult() {
-			throw new NotImplementedException();
-		}
-
-		public void Dispose() {
-		}
-
-		public IQuerySources GetSourceDefinition() {
-			return SourceDefinitionBuilder.From(ConfigureSourceProcessingStrategy);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Standard/CategorizeEventsByStreamPath.cs b/src/EventStore.Projections.Core/Standard/CategorizeEventsByStreamPath.cs
deleted file mode 100644
index d923e0fa197..00000000000
--- a/src/EventStore.Projections.Core/Standard/CategorizeEventsByStreamPath.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Standard {
-	public class CategorizeEventsByStreamPath : IProjectionStateHandler {
-		private readonly string _categoryStreamPrefix;
-		private readonly StreamCategoryExtractor _streamCategoryExtractor;
-
-		public CategorizeEventsByStreamPath(string source, Action<string, object[]> logger) {
-			var extractor = StreamCategoryExtractor.GetExtractor(source, logger);
-			// we will need to declare event types we are interested in
-			_categoryStreamPrefix = "$ce-";
-			_streamCategoryExtractor = extractor;
-		}
-
-		public void ConfigureSourceProcessingStrategy(SourceDefinitionBuilder builder) {
-			builder.FromAll();
-			builder.AllEvents();
-			builder.SetIncludeLinks();
-		}
-
-		public void Load(string state) {
-		}
-
-		public void LoadShared(string state) {
-			throw new NotImplementedException();
-		}
-
-		public void Initialize() {
-		}
-
-		public void InitializeShared() {
-		}
-
-		public string GetStatePartition(CheckpointTag eventPosition, string category, ResolvedEvent data) {
-			throw new NotImplementedException();
-		}
-
-		public bool ProcessEvent(
-			string partition, CheckpointTag eventPosition, string category1, ResolvedEvent data,
-			out string newState, out string newSharedState, out EmittedEventEnvelope[] emittedEvents) {
-			newSharedState = null;
-			emittedEvents = null;
-			newState = null;
-			string deletedStreamId;
-			var isStreamDeletedEvent = StreamDeletedHelper.IsStreamDeletedEvent(
-				data.PositionStreamId, data.EventType, data.Data, out deletedStreamId);
-
-			var category = _streamCategoryExtractor.GetCategoryByStreamId(isStreamDeletedEvent?deletedStreamId:data.PositionStreamId);
-			if (category == null)
-				return true; // handled but not interesting
-
-
-			string linkTarget;
-			if (data.EventType == SystemEventTypes.LinkTo)
-				linkTarget = data.Data;
-			else
-				linkTarget = data.EventSequenceNumber + "@" + data.EventStreamId;
-
-			emittedEvents = new[] {
-				new EmittedEventEnvelope(
-					new EmittedLinkToWithRecategorization(
-						_categoryStreamPrefix + category, Guid.NewGuid(), linkTarget, eventPosition, expectedTag: null,
-						originalStreamId: isStreamDeletedEvent?deletedStreamId:data.PositionStreamId, streamDeletedAt: isStreamDeletedEvent ? -1 : (int?)null))
-			};
-
-			return true;
-		}
-
-		public bool ProcessPartitionCreated(string partition, CheckpointTag createPosition, ResolvedEvent data,
-			out EmittedEventEnvelope[] emittedEvents) {
-			emittedEvents = null;
-			return false;
-		}
-
-		public bool ProcessPartitionDeleted(string partition, CheckpointTag deletePosition, out string newState) {
-			throw new NotImplementedException();
-		}
-
-		public string TransformStateToResult() {
-			throw new NotImplementedException();
-		}
-
-		public void Dispose() {
-		}
-
-		public IQuerySources GetSourceDefinition() {
-			return SourceDefinitionBuilder.From(ConfigureSourceProcessingStrategy);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Standard/CategorizeStreamByPath.cs b/src/EventStore.Projections.Core/Standard/CategorizeStreamByPath.cs
deleted file mode 100644
index f446b13c8d7..00000000000
--- a/src/EventStore.Projections.Core/Standard/CategorizeStreamByPath.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using System;
-using EventStore.Core.Services;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Standard {
-	public class CategorizeStreamByPath : IProjectionStateHandler {
-		private readonly StreamCategoryExtractor _streamCategoryExtractor;
-
-		public CategorizeStreamByPath(string source, Action<string, object[]> logger) {
-			var extractor = StreamCategoryExtractor.GetExtractor(source, logger);
-			// we will need to declare event types we are interested in
-			_streamCategoryExtractor = extractor;
-		}
-
-		public void ConfigureSourceProcessingStrategy(SourceDefinitionBuilder builder) {
-			builder.FromAll();
-			builder.AllEvents();
-			builder.SetIncludeLinks();
-		}
-
-		public void Load(string state) {
-		}
-
-		public void LoadShared(string state) {
-			throw new NotImplementedException();
-		}
-
-		public void Initialize() {
-		}
-
-		public void InitializeShared() {
-		}
-
-		public string GetStatePartition(CheckpointTag eventPosition, string category, ResolvedEvent data) {
-			throw new NotImplementedException();
-		}
-
-		public bool ProcessEvent(
-			string partition, CheckpointTag eventPosition, string category1, ResolvedEvent data,
-			out string newState, out string newSharedState, out EmittedEventEnvelope[] emittedEvents) {
-			newSharedState = null;
-			emittedEvents = null;
-			newState = null;
-
-			if (data.PositionSequenceNumber != 0)
-				return false; // not our event
-
-			var category = _streamCategoryExtractor.GetCategoryByStreamId(data.PositionStreamId);
-			if (category == null)
-				return true; // handled but not interesting
-
-			emittedEvents = new[] {
-				new EmittedEventEnvelope(
-					new EmittedDataEvent(
-						"$category" + "-" + category, Guid.NewGuid(), SystemEventTypes.StreamReference, false,
-						data.PositionStreamId, null, eventPosition, expectedTag: null))
-			};
-
-			return true;
-		}
-
-		public bool ProcessPartitionCreated(string partition, CheckpointTag createPosition, ResolvedEvent data,
-			out EmittedEventEnvelope[] emittedEvents) {
-			emittedEvents = null;
-			return false;
-		}
-
-		public bool ProcessPartitionDeleted(string partition, CheckpointTag deletePosition, out string newState) {
-			throw new NotImplementedException();
-		}
-
-		public string TransformStateToResult() {
-			throw new NotImplementedException();
-		}
-
-		public void Dispose() {
-		}
-
-		public IQuerySources GetSourceDefinition() {
-			return SourceDefinitionBuilder.From(ConfigureSourceProcessingStrategy);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Standard/IndexEventsByEventType.cs b/src/EventStore.Projections.Core/Standard/IndexEventsByEventType.cs
deleted file mode 100644
index 563eed0cd67..00000000000
--- a/src/EventStore.Projections.Core/Standard/IndexEventsByEventType.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace EventStore.Projections.Core.Standard {
-	public class IndexEventsByEventType : IProjectionStateHandler, IProjectionCheckpointHandler {
-		private readonly string _indexStreamPrefix;
-		private readonly string _indexCheckpointStream;
-
-		public IndexEventsByEventType(string source, Action<string, object[]> logger) {
-			if (!string.IsNullOrWhiteSpace(source))
-				throw new InvalidOperationException("Empty source expected");
-			if (logger != null) {
-//                logger("Index events by event type projection handler has been initialized");
-			}
-
-			// we will need to declare event types we are interested in
-			_indexStreamPrefix = "$et-";
-			_indexCheckpointStream = "$et";
-		}
-
-		public void ConfigureSourceProcessingStrategy(SourceDefinitionBuilder builder) {
-			builder.FromAll();
-			builder.AllEvents();
-		}
-
-		public void Load(string state) {
-		}
-
-		public void LoadShared(string state) {
-			throw new NotImplementedException();
-		}
-
-		public void Initialize() {
-		}
-
-		public void InitializeShared() {
-		}
-
-		public string GetStatePartition(CheckpointTag eventPosition, string category, ResolvedEvent data) {
-			throw new NotImplementedException();
-		}
-
-		public bool ProcessEvent(
-			string partition, CheckpointTag eventPosition, string category1, ResolvedEvent data,
-			out string newState, out string newSharedState, out EmittedEventEnvelope[] emittedEvents) {
-			newSharedState = null;
-			emittedEvents = null;
-			newState = null;
-			if (data.EventStreamId != data.PositionStreamId)
-				return false;
-			var indexedEventType = data.EventType;
-			if (indexedEventType == "$>")
-				return false;
-
-			string positionStreamId;
-			var isStreamDeletedEvent = StreamDeletedHelper.IsStreamDeletedEvent(
-				data.PositionStreamId, data.EventType, data.Data, out positionStreamId);
-			if (isStreamDeletedEvent)
-				indexedEventType = "$deleted";
-
-			emittedEvents = new[] {
-				new EmittedEventEnvelope(
-					new EmittedDataEvent(
-						_indexStreamPrefix + indexedEventType, Guid.NewGuid(), "$>", false,
-						data.EventSequenceNumber + "@" + positionStreamId,
-						isStreamDeletedEvent
-							? new ExtraMetaData(new Dictionary<string, JRaw> {{"$deleted", new JRaw(-1)}})
-							: null, eventPosition, expectedTag: null))
-			};
-
-			return true;
-		}
-
-		public bool ProcessPartitionCreated(string partition, CheckpointTag createPosition, ResolvedEvent data,
-			out EmittedEventEnvelope[] emittedEvents) {
-			emittedEvents = null;
-			return false;
-		}
-
-		public bool ProcessPartitionDeleted(string partition, CheckpointTag deletePosition, out string newState) {
-			throw new NotImplementedException();
-		}
-
-		public string TransformStateToResult() {
-			throw new NotImplementedException();
-		}
-
-		public void Dispose() {
-		}
-
-		public void ProcessNewCheckpoint(CheckpointTag checkpointPosition, out EmittedEventEnvelope[] emittedEvents) {
-			emittedEvents = new[] {
-				new EmittedEventEnvelope(
-					new EmittedDataEvent(
-						_indexCheckpointStream, Guid.NewGuid(), ProjectionEventTypes.PartitionCheckpoint,
-						true, checkpointPosition.ToJsonString(), null, checkpointPosition, expectedTag: null))
-			};
-		}
-
-		public IQuerySources GetSourceDefinition() {
-			return SourceDefinitionBuilder.From(ConfigureSourceProcessingStrategy);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Standard/IndexStreams.cs b/src/EventStore.Projections.Core/Standard/IndexStreams.cs
deleted file mode 100644
index d467fa5e205..00000000000
--- a/src/EventStore.Projections.Core/Standard/IndexStreams.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-using EventStore.Core.Services;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.Emitting.EmittedEvents;
-
-namespace EventStore.Projections.Core.Standard {
-	public class IndexStreams : IProjectionStateHandler {
-		public IndexStreams(string source, Action<string, object[]> logger) {
-			var trimmedSource = source == null ? null : source.Trim();
-			if (!string.IsNullOrEmpty(trimmedSource))
-				throw new InvalidOperationException(
-					"Cannot initialize categorize stream projection handler.  No source is allowed.");
-			if (logger != null) {
-//                logger(string.Format("Index streams projection handler has been initialized"));
-			}
-		}
-
-		public void ConfigureSourceProcessingStrategy(SourceDefinitionBuilder builder) {
-			builder.FromAll();
-			builder.AllEvents();
-			builder.SetIncludeLinks();
-		}
-
-		public void Load(string state) {
-		}
-
-		public void LoadShared(string state) {
-			throw new NotImplementedException();
-		}
-
-		public void Initialize() {
-		}
-
-		public void InitializeShared() {
-		}
-
-		public string GetStatePartition(CheckpointTag eventPosition, string category, ResolvedEvent data) {
-			throw new NotImplementedException();
-		}
-
-		public bool ProcessEvent(
-			string partition, CheckpointTag eventPosition, string category1, ResolvedEvent data,
-			out string newState, out string newSharedState, out EmittedEventEnvelope[] emittedEvents) {
-			newSharedState = null;
-			emittedEvents = null;
-			newState = null;
-			if (data.PositionSequenceNumber != 0)
-				return false; // not our event
-
-			emittedEvents = new[] {
-				new EmittedEventEnvelope(
-					new EmittedDataEvent(
-						SystemStreams.StreamsStream, Guid.NewGuid(), SystemEventTypes.LinkTo, false,
-						data.PositionSequenceNumber + "@" + data.PositionStreamId, null, eventPosition,
-						expectedTag: null))
-			};
-
-			return true;
-		}
-
-		public bool ProcessPartitionCreated(string partition, CheckpointTag createPosition, ResolvedEvent data,
-			out EmittedEventEnvelope[] emittedEvents) {
-			emittedEvents = null;
-			return false;
-		}
-
-		public bool ProcessPartitionDeleted(string partition, CheckpointTag deletePosition, out string newState) {
-			throw new NotImplementedException();
-		}
-
-		public string TransformStateToResult() {
-			throw new NotImplementedException();
-		}
-
-		public void Dispose() {
-		}
-
-		public IQuerySources GetSourceDefinition() {
-			return SourceDefinitionBuilder.From(ConfigureSourceProcessingStrategy);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Standard/StreamCategoryExtractor.cs b/src/EventStore.Projections.Core/Standard/StreamCategoryExtractor.cs
deleted file mode 100644
index 756e59ca833..00000000000
--- a/src/EventStore.Projections.Core/Standard/StreamCategoryExtractor.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-
-namespace EventStore.Projections.Core.Standard {
-	public abstract class StreamCategoryExtractor {
-		private const string ConfigurationFormatIs = "Configuration format is: \r\nfirst|last\r\nseparator";
-
-		public abstract string GetCategoryByStreamId(string streamId);
-
-		public static StreamCategoryExtractor GetExtractor(string source, Action<string, object[]> logger) {
-			var trimmedSource = source == null ? null : source.Trim();
-			if (string.IsNullOrEmpty(source))
-				throw new InvalidOperationException(
-					"Cannot initialize categorization projection handler.  "
-					+ "One symbol separator or configuration must be supplied in the source.  "
-					+ ConfigurationFormatIs);
-
-			if (trimmedSource.Length == 1) {
-				var separator = trimmedSource[0];
-				if (logger != null) {
-/*
-                    logger(
-                        String.Format(
-                            "Categorize stream projection handler has been initialized with separator: '{0}'", separator));
-*/
-				}
-
-				var extractor = new StreamCategoryExtractorByLastSeparator(separator);
-				return extractor;
-			}
-
-			var parts = trimmedSource.Split(new[] {'\n'});
-
-			if (parts.Length != 2)
-				throw new InvalidOperationException(
-					"Cannot initialize categorization projection handler.  "
-					+ "Invalid configuration  "
-					+ ConfigurationFormatIs);
-
-			var direction = parts[0].ToLowerInvariant().Trim();
-			if (direction != "first" && direction != "last")
-				throw new InvalidOperationException(
-					"Cannot initialize categorization projection handler.  "
-					+ "Invalid direction specifier.  Expected 'first' or 'last'. "
-					+ ConfigurationFormatIs);
-
-			var separatorLine = parts[1];
-			if (separatorLine.Length != 1)
-				throw new InvalidOperationException(
-					"Cannot initialize categorization projection handler.  "
-					+ "Single separator expected. "
-					+ ConfigurationFormatIs);
-
-			switch (direction) {
-				case "first":
-					return new StreamCategoryExtractorByFirstSeparator(separatorLine[0]);
-				case "last":
-					return new StreamCategoryExtractorByLastSeparator(separatorLine[0]);
-				default:
-					throw new Exception();
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Standard/StreamCategoryExtractorByFirstSeparator.cs b/src/EventStore.Projections.Core/Standard/StreamCategoryExtractorByFirstSeparator.cs
deleted file mode 100644
index d6c1be35434..00000000000
--- a/src/EventStore.Projections.Core/Standard/StreamCategoryExtractorByFirstSeparator.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace EventStore.Projections.Core.Standard {
-	public class StreamCategoryExtractorByFirstSeparator : StreamCategoryExtractor {
-		private readonly char _separator;
-
-		public StreamCategoryExtractorByFirstSeparator(char separator) {
-			_separator = separator;
-		}
-
-		public override string GetCategoryByStreamId(string streamId) {
-			string category = null;
-			if (!streamId.StartsWith("$")) {
-				var lastSeparatorPosition = streamId.IndexOf(_separator);
-				if (lastSeparatorPosition > 0)
-					category = streamId.Substring(0, lastSeparatorPosition);
-			}
-
-			return category;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Standard/StreamCategoryExtractorByLastSeparator.cs b/src/EventStore.Projections.Core/Standard/StreamCategoryExtractorByLastSeparator.cs
deleted file mode 100644
index 90e89ec91c7..00000000000
--- a/src/EventStore.Projections.Core/Standard/StreamCategoryExtractorByLastSeparator.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace EventStore.Projections.Core.Standard {
-	public class StreamCategoryExtractorByLastSeparator : StreamCategoryExtractor {
-		private readonly char _separator;
-
-		public StreamCategoryExtractorByLastSeparator(char separator) {
-			_separator = separator;
-		}
-
-		public override string GetCategoryByStreamId(string streamId) {
-			string category = null;
-			if (!streamId.StartsWith("$")) {
-				var lastSeparatorPosition = streamId.LastIndexOf(_separator);
-				if (lastSeparatorPosition > 0)
-					category = streamId.Substring(0, lastSeparatorPosition);
-			}
-
-			return category;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Standard/StreamDeletedHelper.cs b/src/EventStore.Projections.Core/Standard/StreamDeletedHelper.cs
deleted file mode 100644
index b824dc2f830..00000000000
--- a/src/EventStore.Projections.Core/Standard/StreamDeletedHelper.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System;
-using EventStore.Core.Data;
-using EventStore.Core.Services;
-using EventStore.Projections.Core.Utils;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
-
-namespace EventStore.Projections.Core.Standard {
-	public static class StreamDeletedHelper {
-		public static bool IsStreamDeletedEventOrLinkToStreamDeletedEvent(ResolvedEvent resolvedEvent,
-			ReadEventResult resolveResult, out string deletedPartitionStreamId) {
-			bool isDeletedStreamEvent;
-			// If the event didn't resolve, we can't rely on it as a deleted event
-			if (resolveResult != ReadEventResult.Success) {
-				deletedPartitionStreamId = null;
-				return false;
-			}
-			
-			if (resolvedEvent.IsLinkToDeletedStreamTombstone) {
-				isDeletedStreamEvent = true;
-				deletedPartitionStreamId = resolvedEvent.EventStreamId;
-			} else {
-				isDeletedStreamEvent = StreamDeletedHelper.IsStreamDeletedEvent(
-					resolvedEvent.EventStreamId, resolvedEvent.EventType, resolvedEvent.Data,
-					out deletedPartitionStreamId);
-			}
-
-			return isDeletedStreamEvent;
-		}
-
-		public static bool IsStreamDeletedEvent(
-			string streamOrMetaStreamId, string eventType, string eventData, out string deletedPartitionStreamId) {
-			if (string.IsNullOrEmpty(streamOrMetaStreamId)) {
-				deletedPartitionStreamId = null;
-				return false;
-			}
-
-			bool isMetaStream;
-			if (SystemStreams.IsMetastream(streamOrMetaStreamId)) {
-				isMetaStream = true;
-				deletedPartitionStreamId = streamOrMetaStreamId.Substring("$$".Length);
-			} else {
-				isMetaStream = false;
-				deletedPartitionStreamId = streamOrMetaStreamId;
-			}
-
-			var isStreamDeletedEvent = false;
-			if (isMetaStream) {
-				if (eventType == SystemEventTypes.StreamMetadata) {
-					var metadata = StreamMetadata.FromJson(eventData);
-					//NOTE: we do not ignore JSON deserialization exceptions here assuming that metadata stream events must be deserializable
-
-					if (metadata.TruncateBefore == EventNumber.DeletedStream)
-						isStreamDeletedEvent = true;
-				}
-			} else {
-				if (eventType == SystemEventTypes.StreamDeleted)
-					isStreamDeletedEvent = true;
-			}
-
-			return isStreamDeletedEvent;
-		}
-
-		public static bool IsStreamDeletedEvent(
-			string streamOrMetaStreamId, string eventType, ReadOnlyMemory<byte> eventData, out string deletedPartitionStreamId) {
-			bool isMetaStream;
-			if (SystemStreams.IsMetastream(streamOrMetaStreamId)) {
-				isMetaStream = true;
-				deletedPartitionStreamId = streamOrMetaStreamId.Substring("$$".Length);
-			} else {
-				isMetaStream = false;
-				deletedPartitionStreamId = streamOrMetaStreamId;
-			}
-
-			var isStreamDeletedEvent = false;
-			if (isMetaStream) {
-				if (eventType == SystemEventTypes.StreamMetadata) {
-					var metadata = StreamMetadata.FromJson(eventData.FromUtf8());
-					//NOTE: we do not ignore JSON deserialization exceptions here assuming that metadata stream events must be deserializable
-
-					if (metadata.TruncateBefore == EventNumber.DeletedStream)
-						isStreamDeletedEvent = true;
-				}
-			} else {
-				if (eventType == SystemEventTypes.StreamDeleted)
-					isStreamDeletedEvent = true;
-			}
-
-			return isStreamDeletedEvent;
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Utils/EncodingExtensions.cs b/src/EventStore.Projections.Core/Utils/EncodingExtensions.cs
deleted file mode 100644
index 23c328857ea..00000000000
--- a/src/EventStore.Projections.Core/Utils/EncodingExtensions.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-
-namespace EventStore.Projections.Core.Utils {
-	public static class EncodingExtensions {
-		public static string FromUtf8(this byte[] self) {
-			return Helper.UTF8NoBom.GetString(self);
-		}
-
-		public static string FromUtf8(this ReadOnlyMemory<byte> self) {
-			return Helper.UTF8NoBom.GetString(self.Span);
-		}
-
-		public static byte[] ToUtf8(this string self) {
-			return Helper.UTF8NoBom.GetBytes(self);
-		}
-
-		public static string Apply(this string format, params object[] args) {
-			return string.Format(format, args);
-		}
-	}
-}
diff --git a/src/EventStore.Projections.Core/Utils/EnumExtensions.cs b/src/EventStore.Projections.Core/Utils/EnumExtensions.cs
deleted file mode 100644
index d4cca1bb837..00000000000
--- a/src/EventStore.Projections.Core/Utils/EnumExtensions.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-
-namespace EventStore.Projections.Core.Utils {
-	public static class EnumExtensions {
-		public static string EnumValueName<T>(this T value) where T : struct {
-			return Enum.GetName(typeof(T), value);
-		}
-	}
-}
diff --git a/src/EventStore.SourceGenerators.Tests/EventStore.SourceGenerators.Tests.csproj b/src/EventStore.SourceGenerators.Tests/EventStore.SourceGenerators.Tests.csproj
deleted file mode 100644
index b8f14800975..00000000000
--- a/src/EventStore.SourceGenerators.Tests/EventStore.SourceGenerators.Tests.csproj
+++ /dev/null
@@ -1,106 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
-	</PropertyGroup>
-	<ItemGroup>
-		<Compile Remove="Messaging\Cases\AbstractWithGroup.NOTCOMPILED.g.cs" />
-		<Compile Remove="Messaging\Cases\ConcreteWithoutGroup.NOTCOMPILED.g.cs" />
-		<Compile Remove="Messaging\Cases\Impartial.NOTCOMPILED.g.cs" />
-		<Compile Remove="Messaging\Cases\ImpartialNested.NOTCOMPILED.g.cs" />
-	</ItemGroup>
-	<ItemGroup>
-		<None Include="Messaging\Cases\AbstractWithGroup.NOTCOMPILED.g.cs">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Include="Messaging\Cases\ConcreteWithoutGroup.NOTCOMPILED.g.cs">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Include="Messaging\Cases\Impartial.NOTCOMPILED.g.cs">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Include="Messaging\Cases\ImpartialNested.NOTCOMPILED.g.cs">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.1" />
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-		<!-- upgrade because of transitive dependency vulnerability -->
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<!-- upgrade because of transitive dependency vulnerability -->
-		<PackageReference Include="NuGet.Protocol" Version="6.7.1" />
-		<!-- upgrade because of transitive dependency vulnerability https://github.com/advisories/GHSA-447r-wph3-92pm -->
-		<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
-		<PackageReference Include="System.Linq.Async" Version="6.0.1" />
-		<!-- upgrade because of transitive dependency vulnerability -->
-		<PackageReference Include="System.Net.Http" Version="4.3.4" />
-		<!-- upgrade because of transitive dependency vulnerability -->
-		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-		<PackageReference Include="xunit" Version="2.6.1" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="6.0.0">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\EventStore.SourceGenerators\EventStore.SourceGenerators.csproj" />
-	</ItemGroup>
-	<ItemGroup>
-		<Compile Update="Messaging\Cases\AbstractWithGroup.cs">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Compile>
-		<Compile Update="Messaging\Cases\FileScopedNamespace.g.cs">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Compile>
-		<Compile Update="Messaging\Cases\ConcreteWithoutGroup.cs">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Compile>
-		<Compile Update="Messaging\Cases\ImpartialNested.cs">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Compile>
-		<Compile Update="Messaging\Cases\Nested.g.cs">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Compile>
-		<Compile Update="Messaging\Cases\NestedDerived.g.cs">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Compile>
-		<Compile Update="Messaging\Cases\Impartial.cs">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Compile>
-		<Compile Update="Messaging\Cases\Simple.g.cs">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Compile>
-		<Compile Update="Messaging\Cases\Abstract.cs">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Compile>
-		<Compile Update="Messaging\Cases\Abstract.g.cs">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Compile>
-		<Compile Update="Messaging\Cases\FileScopedNamespace.cs">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Compile>
-		<Compile Update="Messaging\Cases\Message.cs">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Compile>
-		<Compile Update="Messaging\Cases\Message.g.cs">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Compile>
-		<Compile Update="Messaging\Cases\Nested.cs">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Compile>
-		<Compile Update="Messaging\Cases\NestedDerived.cs">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Compile>
-		<Compile Update="Messaging\Cases\Simple.cs">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Compile>
-	</ItemGroup>
-</Project>
diff --git a/src/EventStore.SourceGenerators.Tests/Messaging/CSharpSourceGeneratorVerifier.cs b/src/EventStore.SourceGenerators.Tests/Messaging/CSharpSourceGeneratorVerifier.cs
deleted file mode 100644
index cd88cd65f9d..00000000000
--- a/src/EventStore.SourceGenerators.Tests/Messaging/CSharpSourceGeneratorVerifier.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
-
-namespace EventStore.SourceGenerators.Tests.Messaging {
-	// https://github.com/dotnet/roslyn/blob/main/docs/features/source-generators.cookbook.md#unit-testing-of-generators
-	public static class CSharpSourceGeneratorVerifier<TSourceGenerator> 
-		where TSourceGenerator : ISourceGenerator, new() {
-
-		public class Test : CSharpSourceGeneratorTest<TSourceGenerator, XUnitVerifier> {
-			public Test() {
-			}
-
-			protected override CompilationOptions CreateCompilationOptions() {
-				var compilationOptions = base.CreateCompilationOptions();
-				return compilationOptions.WithSpecificDiagnosticOptions(
-					 compilationOptions.SpecificDiagnosticOptions.SetItems(GetNullableWarningsFromCompiler()));
-			}
-
-			public LanguageVersion LanguageVersion { get; set; } = LanguageVersion.Default;
-
-			private static ImmutableDictionary<string, ReportDiagnostic> GetNullableWarningsFromCompiler() {
-				string[] args = { "/warnaserror:nullable" };
-				var commandLineArguments = CSharpCommandLineParser.Default.Parse(
-					args: args,
-					baseDirectory: Environment.CurrentDirectory,
-					sdkDirectory: Environment.CurrentDirectory);
-				var nullableWarnings = commandLineArguments.CompilationOptions.SpecificDiagnosticOptions;
-
-				return nullableWarnings;
-			}
-
-			protected override ParseOptions CreateParseOptions() {
-				return ((CSharpParseOptions)base.CreateParseOptions()).WithLanguageVersion(LanguageVersion);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Abstract.cs b/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Abstract.cs
deleted file mode 100644
index b42b5dde165..00000000000
--- a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Abstract.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace EventStore.SourceGenerators.Tests.Messaging.Abstract {
-	[DerivedMessage]
-	abstract partial class B : Message {
-		[DerivedMessage(TestMessageGroup.Abstract)]
-		private partial class A : B {
-		}
-	}
-}
diff --git a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/AbstractWithGroup.NOTCOMPILED.g.cs b/src/EventStore.SourceGenerators.Tests/Messaging/Cases/AbstractWithGroup.NOTCOMPILED.g.cs
deleted file mode 100644
index e063aa8b2c4..00000000000
--- a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/AbstractWithGroup.NOTCOMPILED.g.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// autogenerated
-using System.Threading;
-
-#pragma warning disable CS0108 // Member hides inherited member; missing new keyword
-namespace EventStore.SourceGenerators.Tests.Messaging.AbstractWithGroup
-{
-	public abstract partial class A
-	{
-	}
-}
diff --git a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/AbstractWithGroup.cs b/src/EventStore.SourceGenerators.Tests/Messaging/Cases/AbstractWithGroup.cs
deleted file mode 100644
index 6f7506d0224..00000000000
--- a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/AbstractWithGroup.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace EventStore.SourceGenerators.Tests.Messaging.AbstractWithGroup {
-	[DerivedMessage(TestMessageGroup.AbstractWithGroup)]
-	public abstract partial class A : Message {
-	}
-}
diff --git a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/ConcreteWithoutGroup.NOTCOMPILED.g.cs b/src/EventStore.SourceGenerators.Tests/Messaging/Cases/ConcreteWithoutGroup.NOTCOMPILED.g.cs
deleted file mode 100644
index e035dcdf65e..00000000000
--- a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/ConcreteWithoutGroup.NOTCOMPILED.g.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-// autogenerated
-using System.Threading;
-
-#pragma warning disable CS0108 // Member hides inherited member; missing new keyword
-namespace EventStore.SourceGenerators.Tests.Messaging.ConcreteWithoutGroup
-{
-	public partial class A
-	{
-	}
-}
diff --git a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/ConcreteWithoutGroup.cs b/src/EventStore.SourceGenerators.Tests/Messaging/Cases/ConcreteWithoutGroup.cs
deleted file mode 100644
index 0a901feb89c..00000000000
--- a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/ConcreteWithoutGroup.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace EventStore.SourceGenerators.Tests.Messaging.ConcreteWithoutGroup {
-	[DerivedMessage]
-	public partial class A : Message {
-	}
-}
diff --git a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/FileScopedNamespace.cs b/src/EventStore.SourceGenerators.Tests/Messaging/Cases/FileScopedNamespace.cs
deleted file mode 100644
index 4c80e16bfe8..00000000000
--- a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/FileScopedNamespace.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace EventStore.SourceGenerators.Tests.Messaging.FileScopedNamespace;
-
-[DerivedMessage(TestMessageGroup.FileScopedNamespace)]
-public partial class A : Message {
-}
-
-[DerivedMessage(TestMessageGroup.FileScopedNamespace)]
-public partial class B : Message {
-}
diff --git a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Impartial.cs b/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Impartial.cs
deleted file mode 100644
index ff46cc9d61f..00000000000
--- a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Impartial.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace EventStore.SourceGenerators.Tests.Messaging.Impartial {
-	[DerivedMessage(TestMessageGroup.Impartial)]
-	public class A : Message {
-	}
-}
diff --git a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/ImpartialNested.cs b/src/EventStore.SourceGenerators.Tests/Messaging/Cases/ImpartialNested.cs
deleted file mode 100644
index 2e00e960883..00000000000
--- a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/ImpartialNested.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EventStore.SourceGenerators.Tests.Messaging.ImpartialNested {
-	public class N {
-		[DerivedMessage(TestMessageGroup.ImpartialNested)]
-		public partial class A : Message {
-		}
-	}
-}
diff --git a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Message.cs b/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Message.cs
deleted file mode 100644
index 6edd4fd81aa..00000000000
--- a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Message.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-
-namespace EventStore.SourceGenerators.Tests.Messaging {
-	[AttributeUsage(AttributeTargets.Class)]
-	public class BaseMessageAttribute : Attribute {
-		public BaseMessageAttribute() {
-		}
-	}
-
-	[AttributeUsage(AttributeTargets.Class)]
-	public class DerivedMessageAttribute : Attribute {
-		public DerivedMessageAttribute() {
-		}
-
-		public DerivedMessageAttribute(object messageGroup) {
-		}
-	}
-
-	[BaseMessage]
-	public abstract partial class Message {
-	}
-
-	enum TestMessageGroup {
-		None,
-		Abstract,
-		AbstractWithGroup,
-		FileScopedNamespace,
-		Impartial,
-		ImpartialNested,
-		Nested,
-		NestedDerived,
-		Simple,
-	}
-}
diff --git a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/NestedDerived.cs b/src/EventStore.SourceGenerators.Tests/Messaging/Cases/NestedDerived.cs
deleted file mode 100644
index 1f37811a7d8..00000000000
--- a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/NestedDerived.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace EventStore.SourceGenerators.Tests.Messaging.NestedDerived {
-	[DerivedMessage(TestMessageGroup.NestedDerived)]
-	partial class B : Message {
-		[DerivedMessage(TestMessageGroup.NestedDerived)]
-		private partial class A : B {
-		} 
-	}
-}
diff --git a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Simple.cs b/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Simple.cs
deleted file mode 100644
index 3553a22db1e..00000000000
--- a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Simple.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace EventStore.SourceGenerators.Tests.Messaging.Simple {
-	[DerivedMessage(TestMessageGroup.Simple)]
-	public partial class A : Message {
-	}
-
-	[DerivedMessage(TestMessageGroup.Simple)]
-	public partial class B : Message {
-	}
-}
diff --git a/src/EventStore.SourceGenerators.Tests/Messaging/GeneratorTests.cs b/src/EventStore.SourceGenerators.Tests/Messaging/GeneratorTests.cs
deleted file mode 100644
index f8945a1017e..00000000000
--- a/src/EventStore.SourceGenerators.Tests/Messaging/GeneratorTests.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
-using EventStore.SourceGenerators.Messaging;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Text;
-using Xunit;
-
-namespace EventStore.SourceGenerators.Tests.Messaging {
-	using Test = CSharpSourceGeneratorVerifier<MessageSourceGenerator>.Test;
-
-	public class GeneratorTests {
-		private static uint GenHash(int fileNumber) => (uint)$"/0/Test{fileNumber}.cs".GetHashCode();
-		private static string ReadFile(string fileName) => File.ReadAllText($"./Messaging/Cases/{fileName}");
-
-		private static async Task RunTestAsync(
-			string sourcePath,
-			string expectedPath,
-			params DiagnosticResult[] expectedDiagnostics) {
-
-			var test = new Test() {
-				TestState = {
-					Sources = {
-						ReadFile("Message.cs"),
-						ReadFile(sourcePath),
-					},
-					GeneratedSources = {
-						(
-							typeof(MessageSourceGenerator),
-							$"Test0-{GenHash(0)}.g.cs",
-							SourceText.From(ReadFile("Message.g.cs"), Encoding.UTF8, SourceHashAlgorithm.Sha256)
-						),
-						(
-							typeof(MessageSourceGenerator),
-							$"Test1-{GenHash(1)}.g.cs",
-							SourceText.From(ReadFile(expectedPath), Encoding.UTF8, SourceHashAlgorithm.Sha256)
-						)
-					},
-					AdditionalReferences = {
-						typeof(DerivedMessageAttribute).Assembly,
-					},
-				}
-			};
-
-			test.TestState.ExpectedDiagnostics.AddRange(expectedDiagnostics);
-
-			await test.RunAsync();
-		}
-
-		[Fact]
-		public async Task Simple() =>
-			await RunTestAsync("Simple.cs", "Simple.g.cs");
-
-		[Fact]
-		public async Task Abstract() =>
-			await RunTestAsync("Abstract.cs", "Abstract.g.cs");
-
-		[Fact]
-		public async Task FileScopedNamespace() =>
-			await RunTestAsync("FileScopedNamespace.cs", "FileScopedNamespace.g.cs");
-
-		[Fact]
-		public async Task Nested() =>
-			await RunTestAsync("Nested.cs", "Nested.g.cs");
-
-		[Fact]
-		public async Task NestedDerived() =>
-			await RunTestAsync("NestedDerived.cs", "NestedDerived.g.cs");
-
-		[Fact]
-		public async Task Impartial() =>
-			await RunTestAsync(
-				"Impartial.cs",
-				"Impartial.NOTCOMPILED.g.cs",
-				new DiagnosticResult("ESGEN001", DiagnosticSeverity.Error)
-					.WithSpan("/0/Test1.cs", 2, 2, 4, 3)
-					.WithMessage("Class \"A\" is not partial"),
-				new DiagnosticResult("CS0101", DiagnosticSeverity.Error)
-					.WithSpan(
-						$"EventStore.SourceGenerators{Path.DirectorySeparatorChar}" +
-						$"EventStore.SourceGenerators.Messaging.{nameof(MessageSourceGenerator)}{Path.DirectorySeparatorChar}" +
-						$"Test1-{GenHash(1)}.g.cs", 7, 15, 7, 16)
-					.WithArguments("A", "EventStore.SourceGenerators.Tests.Messaging.Impartial"));
-
-		[Fact]
-		public async Task ImpartialNested() =>
-			await RunTestAsync(
-				"ImpartialNested.cs",
-				"ImpartialNested.NOTCOMPILED.g.cs",
-				new DiagnosticResult("ESGEN001", DiagnosticSeverity.Error)
-					.WithSpan("/0/Test1.cs", 2, 2, 6, 3)
-					.WithMessage("Class \"N\" is not partial"),
-				new DiagnosticResult("CS0101", DiagnosticSeverity.Error)
-					.WithSpan(
-						$"EventStore.SourceGenerators{Path.DirectorySeparatorChar}" +
-						$"EventStore.SourceGenerators.Messaging.{nameof(MessageSourceGenerator)}{Path.DirectorySeparatorChar}" +
-						$"Test1-{GenHash(1)}.g.cs", 7, 15, 7, 16)
-					.WithArguments("N", "EventStore.SourceGenerators.Tests.Messaging.ImpartialNested"));
-
-		[Fact]
-		public async Task AbstractWithGroup() =>
-			await RunTestAsync(
-				"AbstractWithGroup.cs",
-				"AbstractWithGroup.NOTCOMPILED.g.cs",
-				new DiagnosticResult("ESGEN002", DiagnosticSeverity.Error)
-					.WithSpan("/0/Test1.cs", 2, 2, 4, 3)
-					.WithMessage("Abstract class \"A\" has a group specified")
-					.WithArguments("A"));
-
-		[Fact]
-		public async Task ConcreteWithoutGroup() =>
-			await RunTestAsync(
-				"ConcreteWithoutGroup.cs",
-				"ConcreteWithoutGroup.NOTCOMPILED.g.cs",
-				new DiagnosticResult("ESGEN003", DiagnosticSeverity.Error)
-					.WithSpan("/0/Test1.cs", 2, 2, 4, 3)
-					.WithMessage("Concrete class \"A\" does not have a group specified")
-					.WithArguments("A"));
-	}
-}
diff --git a/src/EventStore.SourceGenerators/Messaging/ClassDeclarationGenerationExtensions.cs b/src/EventStore.SourceGenerators/Messaging/ClassDeclarationGenerationExtensions.cs
deleted file mode 100644
index 9b003fd7d39..00000000000
--- a/src/EventStore.SourceGenerators/Messaging/ClassDeclarationGenerationExtensions.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using System;
-using System.Linq;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-
-namespace EventStore.SourceGenerators.Messaging {
-	static class ClassDeclarationGenerationExtensions {
-		enum Kind {
-			None,
-			Base,
-			Derived,
-		};
-
-		public static bool TryGetBaseMessageAttribute(this ClassDeclarationSyntax node, out AttributeSyntax attributeSyntax) =>
-			node.TryGetAttribute("BaseMessage", minArgCount: 0, maxArgCount: 0, attributeSyntax: out attributeSyntax);
-
-		public static bool TryGetDerivedMessageAttribute(this ClassDeclarationSyntax node, out AttributeSyntax attributeSyntax) =>
-			node.TryGetAttribute("DerivedMessage", minArgCount: 0, maxArgCount: 1, attributeSyntax: out attributeSyntax);
-
-		public static ClassDeclarationSyntax AddGeneratedMembers(
-			this ClassDeclarationSyntax node,
-			GeneratorExecutionContext context,
-			ClassDeclarationSyntax originalNode) =>
-
-			GetStatsAttribute(originalNode) switch {
-				(Kind.None, _) => node,
-				(Kind.Base, _) => node.AddBaseStatsMembers(),
-				(Kind.Derived, var derivedMessageAttribute) =>
-					node.AddDerivedStatsMembers(context, originalNode, derivedMessageAttribute),
-				_ => throw new InvalidOperationException(),
-			};
-
-		static (Kind, AttributeSyntax) GetStatsAttribute(
-			ClassDeclarationSyntax node) {
-
-			if (node.TryGetBaseMessageAttribute(out var attributeSyntax)) {
-				return (Kind.Base, attributeSyntax);
-			}
-
-			if (node.TryGetDerivedMessageAttribute(out attributeSyntax)) {
-				return (Kind.Derived, attributeSyntax);
-			}
-
-			return (Kind.None, default);
-		}
-
-		public static ClassDeclarationSyntax AddBaseStatsMembers(this ClassDeclarationSyntax node) =>
-			node.AddMembers(AbstractLabel);
-
-		public static ClassDeclarationSyntax AddDerivedStatsMembers(
-			this ClassDeclarationSyntax node,
-			GeneratorExecutionContext context,
-			ClassDeclarationSyntax originalNode,
-			AttributeSyntax derivedMessageAttribute) {
-			var args = derivedMessageAttribute.ArgumentList;
-			var argsCount = args?.Arguments.Count ?? 0;
-			var isAbstract = node.Modifiers.Any(SyntaxKind.AbstractKeyword);
-			if (isAbstract) {
-				if (argsCount > 0) {
-					context.ReportAbstractMessageWithGroup(originalNode);
-				}
-			} else {
-				if (argsCount != 1) {
-					context.ReportConcreteMessageWithoutGroup(originalNode);
-				} else {
-					var label = $"{args.Arguments[0]}.{node.Identifier}"
-						.Replace('.', '-'); // because . would make for messy regexps
-					node = node.AddMembers(RegisterConcreteLabel(label));
-				}
-			}
-
-			return node;
-		}
-
-		private static readonly string[] AbstractLabel = new[] {
-			$"public virtual string Label => \"\";",
-		};
-
-		private static string[] RegisterConcreteLabel(string label) => new[] {
-			$"public static string OriginalLabelStatic {{ get; }} = \"{label}\";",
-			$"public static string LabelStatic {{ get; set; }} = \"{label}\";",
-			$"public override string Label => LabelStatic;",
-		};
-
-		public static ClassDeclarationSyntax AddMembers(this ClassDeclarationSyntax node, params string[] members) {
-			var parsed = members
-				.Select(static x => SyntaxFactory.ParseMemberDeclaration(x))
-				.ToArray();
-
-			for (var i = 0; i < parsed.Length; i++) {
-				if (parsed[i] is null)
-					throw new Exception($"Could not parse member: {members[i]}");
-			}
-
-			return node.AddMembers(parsed);
-		}
-	}
-}
diff --git a/src/EventStore.SourceGenerators/Messaging/ContextReportingExtensions.cs b/src/EventStore.SourceGenerators/Messaging/ContextReportingExtensions.cs
deleted file mode 100644
index 300b57724a6..00000000000
--- a/src/EventStore.SourceGenerators/Messaging/ContextReportingExtensions.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-
-namespace EventStore.SourceGenerators.Messaging {
-	static class ContextReportingExtensions {
-		static readonly DiagnosticDescriptor _impartialMessage = new(
-			id: "ESGEN001",
-			title: "Messages must be partial classes",
-			messageFormat: "Class \"{0}\" is not partial",
-			category: "EventStore.Messaging",
-			DiagnosticSeverity.Error,
-			isEnabledByDefault: true);
-
-		static readonly DiagnosticDescriptor _abstractWithGroupMessage = new(
-			id: "ESGEN002",
-			title: "Abstract messages must not have a group specified",
-			messageFormat: "Abstract class \"{0}\" has a group specified",
-			category: "EventStore.Messaging",
-			DiagnosticSeverity.Error,
-			isEnabledByDefault: true);
-
-		static readonly DiagnosticDescriptor _concreteWithoutGroupMessage = new(
-			id: "ESGEN003",
-			title: "Concrete messages must have a group specified",
-			messageFormat: "Concrete class \"{0}\" does not have a group specified",
-			category: "EventStore.Messaging",
-			DiagnosticSeverity.Error,
-			isEnabledByDefault: true);
-
-		private static void Report(
-			this GeneratorExecutionContext context,
-			ClassDeclarationSyntax node,
-			DiagnosticDescriptor descriptor,
-			params object[] messageArgs) =>
-
-			context.ReportDiagnostic(Diagnostic.Create(descriptor, node.GetLocation(), messageArgs));
-
-		public static void ReportImpartialMessage(
-			this GeneratorExecutionContext context, ClassDeclarationSyntax node) =>
-			Report(context, node, _impartialMessage, node.Identifier);
-
-		public static void ReportAbstractMessageWithGroup(
-			this GeneratorExecutionContext context, ClassDeclarationSyntax node) =>
-			Report(context, node, _abstractWithGroupMessage, node.Identifier);
-
-		public static void ReportConcreteMessageWithoutGroup(
-			this GeneratorExecutionContext context, ClassDeclarationSyntax node) =>
-			Report(context, node, _concreteWithoutGroupMessage, node.Identifier);
-	}
-}
diff --git a/src/EventStore.SourceGenerators/Messaging/MessageSourceGenerator.cs b/src/EventStore.SourceGenerators/Messaging/MessageSourceGenerator.cs
deleted file mode 100644
index e4a15963a95..00000000000
--- a/src/EventStore.SourceGenerators/Messaging/MessageSourceGenerator.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Text;
-
-// for speed and simplicity this does all its generation based on the syntax tree and not on the semantic model
-// there are essentially three phases:
-// 1. use a SyntaxReceiver to detect and record uses of the attributes that we will generate code for
-// 2. Register each usage, discovering how they are related to each other in the abstract syntax tree, bottom-up
-// 3. Process the resulting relationship tree top-down, adding in the extra generated code that we want.
-// todo: consider incremental generators if necessary. for now it looks like the generator is run
-// only on build which could be sufficient for us
-namespace EventStore.SourceGenerators.Messaging {
-	[Generator]
-	public class MessageSourceGenerator : ISourceGenerator {
-		GeneratorExecutionContext _context;
-
-		public void Initialize(GeneratorInitializationContext context) {
-			context.RegisterForSyntaxNotifications(() => new SyntaxReceiver());
-		}
-
-		public void Execute(GeneratorExecutionContext context) {
-			try {
-				ExecuteImpl(context);
-			} catch (Exception ex) {
-				// tooling only shows the first line of the exception, so make the most of it
-				var stack = ex.StackTrace.Replace("\r\n", " >> ");
-				throw new Exception($"{ex.Message}. Stack: {stack}", ex);
-			}
-		}
-
-		void ExecuteImpl(GeneratorExecutionContext context) {
-			_context = context;
-
-			if (context.SyntaxReceiver is not SyntaxReceiver syntaxReceiver) {
-				throw new Exception("Unexpected syntax receiver");
-			}
-
-			var roots = new HashSet<CompilationUnitSyntax>();
-			var members = new MemberTree();
-			foreach (var candidate in syntaxReceiver.Candidates) {
-				RegisterMember(candidate, members, roots);
-			}
-
-			foreach (var node in roots) {
-				context.AddSource(
-					GenFileName(node),
-					SourceText.From(
-						GenSource(node, members),
-						Encoding.UTF8, SourceHashAlgorithm.Sha256));
-			}
-		}
-
-		string GenSource(CompilationUnitSyntax node, MemberTree members) => $@"// autogenerated
-using System.Threading;
-
-#pragma warning disable CS0108 // Member hides inherited member; missing new keyword
-{Transform(node, members).NormalizeWhitespace(indentation: "\t", eol: Environment.NewLine).ToFullString()}
-";
-
-		string GenFileName(SyntaxNode node) {
-			var path = node.SyntaxTree.FilePath;
-			var fileName = Path.GetFileNameWithoutExtension(path);
-			return $"{fileName}-{(uint)path.GetHashCode()}.g.cs";
-		}
-
-		void RegisterMember(MemberDeclarationSyntax member, MemberTree members, HashSet<CompilationUnitSyntax> roots) {
-			if (members.TryGetValue(member.Parent, out var siblings)) {
-				siblings.Add(member);
-			} else {
-				members[member.Parent] = new HashSet<MemberDeclarationSyntax> { member };
-				if (member.Parent is MemberDeclarationSyntax mds) {
-					RegisterMember(mds, members, roots);
-				} else if (member.Parent is CompilationUnitSyntax cus) {
-					roots.Add(cus);
-				} else {
-					throw new Exception($"Unexpected parent: \"{member.Parent.Kind()}\"");
-				}
-			}
-		}
-
-		CompilationUnitSyntax Transform(CompilationUnitSyntax node, MemberTree members) =>
-			SyntaxFactory
-				.CompilationUnit()
-				.AddMembers(TransformChildren(node, members));
-
-		MemberDeclarationSyntax[] TransformChildren(SyntaxNode node, MemberTree members) =>
-			members.TryGetValue(node, out var children)
-				? children
-					.Select(x => Transform(x, members))
-					.ToArray()
-				: Array.Empty<MemberDeclarationSyntax>();
-
-		MemberDeclarationSyntax Transform(MemberDeclarationSyntax node, MemberTree members) =>
-			node switch {
-				NamespaceDeclarationSyntax x => Transform(x, members),
-				FileScopedNamespaceDeclarationSyntax x => Transform(x, members),
-				ClassDeclarationSyntax x => Transform(x, members),
-				_ => throw new Exception($"Unexpected MemberDeclarationSyntax syntax: \"{node.Kind()}\"")
-			};
-
-		NamespaceDeclarationSyntax Transform(NamespaceDeclarationSyntax node, MemberTree members) =>
-			SyntaxFactory
-				.NamespaceDeclaration(
-					name: node.Name,
-					externs: default,
-					usings: node.Usings,
-					members: default)
-				.AddMembers(TransformChildren(node, members));
-
-		FileScopedNamespaceDeclarationSyntax Transform(FileScopedNamespaceDeclarationSyntax node, MemberTree members) =>
-			SyntaxFactory
-				.FileScopedNamespaceDeclaration(
-					attributeLists: default,
-					modifiers: default,
-					name: node.Name,
-					externs: default,
-					usings: node.Usings,
-					members: default)
-				.AddMembers(TransformChildren(node, members));
-
-		ClassDeclarationSyntax Transform(ClassDeclarationSyntax node, MemberTree members) {
-			if (!node.Modifiers.Any(SyntaxKind.PartialKeyword))
-				_context.ReportImpartialMessage(node);
-
-			return SyntaxFactory
-				.ClassDeclaration(
-					attributeLists: default,
-					modifiers: node.Modifiers,
-					identifier: node.Identifier,
-					typeParameterList: node.TypeParameterList,
-					baseList: default,
-					constraintClauses: default,
-					members: default)
-				.AddMembers(TransformChildren(node, members))
-				.AddGeneratedMembers(_context, node)
-				.WithoutTrivia();
-		}
-
-		class SyntaxReceiver : ISyntaxReceiver {
-			public List<MemberDeclarationSyntax> Candidates { get; } = new();
-
-			public void OnVisitSyntaxNode(SyntaxNode syntaxNode) {
-				if (syntaxNode is ClassDeclarationSyntax classDeclarationSyntax &&
-					(classDeclarationSyntax.TryGetDerivedMessageAttribute(out _) ||
-					 classDeclarationSyntax.TryGetBaseMessageAttribute(out _))) {
-
-					Candidates.Add(classDeclarationSyntax);
-				}
-			}
-		}
-
-		class MemberTree : Dictionary<SyntaxNode, HashSet<MemberDeclarationSyntax>> {
-		}
-	}
-}
diff --git a/src/EventStore.SourceGenerators/Messaging/SyntaxExtensions.cs b/src/EventStore.SourceGenerators/Messaging/SyntaxExtensions.cs
deleted file mode 100644
index 8ce61a983c8..00000000000
--- a/src/EventStore.SourceGenerators/Messaging/SyntaxExtensions.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-
-namespace EventStore.SourceGenerators.Messaging {
-	static class SyntaxExtensions {
-		public static bool TryGetAttribute(
-			this MemberDeclarationSyntax node,
-			string attributeName,
-			int minArgCount,
-			int maxArgCount,
-			out AttributeSyntax attributeSyntax) {
-
-			foreach (var attributeList in node.AttributeLists) {
-				foreach (var candidate in attributeList.Attributes) {
-					var actualArgCount = candidate.ArgumentList?.Arguments.Count ?? 0;
-					if (candidate.Name.ToString() == attributeName &&
-						actualArgCount >= minArgCount &&
-						actualArgCount <= maxArgCount) {
-
-						attributeSyntax = candidate;
-						return true;
-					}
-				}
-			}
-
-			attributeSyntax = default;
-			return false;
-		}
-	}
-}
diff --git a/src/EventStore.SystemRuntime/Diagnostics/DriveStats.cs b/src/EventStore.SystemRuntime/Diagnostics/DriveStats.cs
deleted file mode 100644
index a65965007ab..00000000000
--- a/src/EventStore.SystemRuntime/Diagnostics/DriveStats.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// ReSharper disable CheckNamespace
-
-namespace System.Diagnostics;
-
-public static class DriveStats {
-    public static DriveData GetDriveInfo(string path) {
-        var info = new DriveInfo(Directory.GetDirectoryRoot(path));
-        var data = new DriveData(info.Name, info.TotalSize, info.AvailableFreeSpace);
-        return data;
-    }
-}
-
-/// <summary>
-/// Represents a data structure for drive information.
-/// </summary>
-/// <param name="DiskName">The name of the disk.</param>
-/// <param name="TotalBytes">The total size of the disk in bytes.</param>
-/// <param name="AvailableBytes">The available free space on the disk in bytes.</param>
-public readonly record struct DriveData(string DiskName, long TotalBytes, long AvailableBytes) 
-{
-    /// <summary>
-    /// The used space on the disk in bytes.
-    /// </summary>
-    public long UsedBytes { get; } = TotalBytes - AvailableBytes;
-
-    /// <summary>
-    /// The usage of the disk as a percentage of the total size.
-    /// </summary>
-    public int Usage { get; } = (int)(TotalBytes != 0 ? (TotalBytes - AvailableBytes) * 100 / TotalBytes : 0);
-}
diff --git a/src/EventStore.SystemRuntime/Diagnostics/Interop/OsxNative.cs b/src/EventStore.SystemRuntime/Diagnostics/Interop/OsxNative.cs
deleted file mode 100644
index 6bdd3d7c873..00000000000
--- a/src/EventStore.SystemRuntime/Diagnostics/Interop/OsxNative.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-// ReSharper disable InconsistentNaming
-// ReSharper disable CheckNamespace
-
-using System.Runtime;
-using System.Runtime.InteropServices;
-
-namespace System.Diagnostics.Interop;
-
-public static partial class OsxNative {
-    public static partial class IO {
-        public static DiskIoData GetDiskIo(int processId) {
-            const int PROC_PID_RUSAGE = 2;
-            const int PROC_PID_RUSAGE_SIZE = 232;
-            
-            var buffer = Marshal.AllocHGlobal(PROC_PID_RUSAGE_SIZE);
-            try {
-                if (proc_pidinfo(processId, PROC_PID_RUSAGE, 0, buffer, PROC_PID_RUSAGE_SIZE) != PROC_PID_RUSAGE_SIZE)
-                    throw GetLastExternalException($"Failed to get {RuntimeOSPlatform.OSX} usage info to extract disk I/O");
-
-                var info = Marshal.PtrToStructure<rusage_info_v4>(buffer);
-                return new(info.ri_diskio_bytesread, info.ri_diskio_byteswritten, 0 , 0);
-            }
-            finally {
-                Marshal.FreeHGlobal(buffer);
-            }
-        }
-
-        #region . native .
-        
-        [LibraryImport("libproc.dylib", SetLastError = true)]
-        private static partial int proc_pidinfo(int pid, int flavor, ulong arg, IntPtr buffer, int buffersize);
-
-        [StructLayout(LayoutKind.Sequential)]
-        private struct rusage_info_v4 {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] ri_uuid;
-
-            public ulong ri_user_time;
-            public ulong ri_system_time;
-            public ulong ri_pkg_idle_wkups;
-            public ulong ri_interrupt_wkups;
-            public ulong ri_pageins;
-            public ulong ri_wired_size;
-            public ulong ri_resident_size;
-            public ulong ri_phys_footprint;
-            public ulong ri_proc_start_abstime;
-            public ulong ri_proc_exit_abstime;
-            public ulong ri_child_user_time;
-            public ulong ri_child_system_time;
-            public ulong ri_child_pkg_idle_wkups;
-            public ulong ri_child_interrupt_wkups;
-            public ulong ri_child_pageins;
-            public ulong ri_child_elapsed_abstime;
-            public ulong ri_diskio_bytesread;
-            public ulong ri_diskio_byteswritten;
-            public ulong ri_cpu_time_qos_default;
-            public ulong ri_cpu_time_qos_maintenance;
-            public ulong ri_cpu_time_qos_background;
-            public ulong ri_cpu_time_qos_utility;
-            public ulong ri_cpu_time_qos_legacy;
-            public ulong ri_cpu_time_qos_user_initiated;
-            public ulong ri_cpu_time_qos_user_interactive;
-            public ulong ri_billed_system_time;
-            public ulong ri_serviced_system_time;
-            public ulong ri_logical_writes;
-        }
-        
-        #endregion
-    }
-
-    public static partial class Memory {
-        public static long GetFreeMemory() {
-            const int HOST_VM_INFO64 = 4;
-            const int KERN_SUCCESS = 0;
-
-            var host = mach_host_self();
-            
-            if (host_page_size(host, out var page_size) != KERN_SUCCESS) 
-                throw GetLastExternalException($"Failed to get {RuntimeOSPlatform.OSX} host page size to calculate free memory");
-
-            var count = (uint)Marshal.SizeOf<vm_statistics64>() / sizeof(uint);
-            if (host_statistics64(host, HOST_VM_INFO64, out var vmStats, ref count) != KERN_SUCCESS) 
-                throw GetLastExternalException($"Failed to get {RuntimeOSPlatform.OSX} host statistics to calculate free memory");
-
-            return (long)vmStats.free_count * page_size;
-        }
-  
-        #region . native .
-        
-        [LibraryImport("libSystem.dylib", SetLastError = true)]
-        private static partial IntPtr mach_host_self();
-
-        [LibraryImport("libSystem.dylib", SetLastError = true)]
-        private static partial int host_page_size(IntPtr host, out uint page_size);
-
-        [LibraryImport("libSystem.dylib", SetLastError = true)]
-        private static partial int host_statistics64(IntPtr host, int flavor, out vm_statistics64 vmStats, ref uint count);
-        
-        [StructLayout(LayoutKind.Sequential)]
-        private struct vm_statistics64 {
-            public uint  free_count;                             // # of pages free
-            public uint  active_count;                           // # of pages active
-            public uint  inactive_count;                         // # of pages inactive
-            public uint  wire_count;                             // # of pages wired down
-            public uint  zero_fill_count;                        // # of zero fill pages
-            public uint  reactivations;                          // # of pages reactivated
-            public uint  pageins;                                // # of pageins
-            public uint  pageouts;                               // # of pageouts
-            public uint  faults;                                 // # of faults
-            public uint  cow_faults;                             // # of copy-on-writes
-            public uint  lookups;                                // object cache lookups
-            public uint  hits;                                   // object cache hits
-            public uint  purges;                                 // # of pages purged
-            public uint  purgeable_count;                        // # of pages purgeable
-            public uint  speculative_count;                      // # of pages speculative
-            public ulong decompressions;                         // # of pages decompressed
-            public ulong compressions;                           // # of pages compressed
-            public ulong swapins;                                // # of pages swapped in (via compression segments)
-            public ulong swapouts;                               // # of pages swapped out (via compression segments)
-            public uint  compressor_page_count;                  // # of pages used by the compressed pager to hold all the compressed data
-            public uint  throttled_count;                        // # of pages throttled
-            public uint  external_page_count;                    // # of pages that are file-backed (non-swap)
-            public uint  internal_page_count;                    // # of pages that are anonymous
-            public uint  total_uncompressed_pages_in_compressor; // # of pages (uncompressed) held within the compressor.
-        }
-        
-        #endregion
-    }
-    
-    static ExternalException GetLastExternalException(string errorMessage) {
-        var errorCode = Marshal.GetLastPInvokeError();
-        return errorCode != 0
-            ? new ExternalException($"{errorMessage}. P/Invoke error code: {errorCode}. Message: {Marshal.GetLastPInvokeErrorMessage()}")
-            : new ExternalException(errorMessage);
-    }
-}
diff --git a/src/EventStore.SystemRuntime/Diagnostics/Interop/WindowsNative.cs b/src/EventStore.SystemRuntime/Diagnostics/Interop/WindowsNative.cs
deleted file mode 100644
index 450f00988c1..00000000000
--- a/src/EventStore.SystemRuntime/Diagnostics/Interop/WindowsNative.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// ReSharper disable CheckNamespace
-// ReSharper disable InconsistentNaming
-
-using System.ComponentModel;
-using System.Runtime.InteropServices;
-
-namespace System.Diagnostics.Interop;
-
-public static partial class WindowsNative {
-    public static partial class IO {
-        public static DiskIoData GetDiskIo(Process process) {
-            if (GetProcessIoCounters(process.Handle, out var counters)) {
-                return new() {
-                    ReadBytes    = counters.ReadTransferCount,
-                    WrittenBytes = counters.WriteTransferCount,
-                    ReadOps      = counters.ReadOperationCount,
-                    WriteOps     = counters.WriteOperationCount
-                };
-            }
-            
-            throw new Win32Exception();
-        }
-
-        public static DiskIoData GetDiskIo() =>
-            GetDiskIo(Process.GetCurrentProcess());
-        
-        #region . native .
-        
-        // http://msdn.microsoft.com/en-us/library/ms683218%28VS.85%29.aspx
-        [StructLayout(LayoutKind.Sequential)]
-        private struct IO_COUNTERS {
-            public ulong ReadOperationCount;
-            public ulong WriteOperationCount;
-            public ulong OtherOperationCount;
-            public ulong ReadTransferCount;
-            public ulong WriteTransferCount;
-            public ulong OtherTransferCount;
-        }
-
-        [return: MarshalAs(UnmanagedType.Bool)]
-        [LibraryImport("kernel32.dll", SetLastError = true)]
-        private static partial bool GetProcessIoCounters(IntPtr processHandle, out IO_COUNTERS ioCounters);
-        
-        #endregion
-    }
-}
diff --git a/src/EventStore.SystemRuntime/Diagnostics/Interop/WindowsProcessUtil.cs b/src/EventStore.SystemRuntime/Diagnostics/Interop/WindowsProcessUtil.cs
deleted file mode 100644
index 9e49e419286..00000000000
--- a/src/EventStore.SystemRuntime/Diagnostics/Interop/WindowsProcessUtil.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-// ReSharper disable CheckNamespace
-
-using System.Runtime.InteropServices;
-using Serilog;
-using RuntimeInformation = System.Runtime.RuntimeInformation;
-
-namespace System.Diagnostics;
-
-/*Courtesy of Eric Johannsen: https://stackoverflow.com/a/20623311*/
-public static class WindowsProcessUtil {
-	[StructLayout(LayoutKind.Sequential)]
-	struct RM_UNIQUE_PROCESS {
-		public int dwProcessId;
-		public System.Runtime.InteropServices.ComTypes.FILETIME ProcessStartTime;
-	}
-
-	const int RmRebootReasonNone = 0;
-	const int CCH_RM_MAX_APP_NAME = 255;
-	const int CCH_RM_MAX_SVC_NAME = 63;
-
-	enum RM_APP_TYPE {
-		RmUnknownApp = 0,
-		RmMainWindow = 1,
-		RmOtherWindow = 2,
-		RmService = 3,
-		RmExplorer = 4,
-		RmConsole = 5,
-		RmCritical = 1000
-	}
-
-	[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-	struct RM_PROCESS_INFO {
-		public RM_UNIQUE_PROCESS Process;
-
-		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = CCH_RM_MAX_APP_NAME + 1)]
-		public string strAppName;
-
-		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = CCH_RM_MAX_SVC_NAME + 1)]
-		public string strServiceShortName;
-
-		public RM_APP_TYPE ApplicationType;
-		public uint AppStatus;
-		public uint TSSessionId;
-		[MarshalAs(UnmanagedType.Bool)] public bool bRestartable;
-	}
-
-	[DllImport("rstrtmgr.dll", CharSet = CharSet.Unicode)]
-	static extern int RmRegisterResources(uint pSessionHandle,
-		UInt32 nFiles,
-		string[] rgsFilenames,
-		UInt32 nApplications,
-		[In] RM_UNIQUE_PROCESS[] rgApplications,
-		UInt32 nServices,
-		string[] rgsServiceNames);
-
-	[DllImport("rstrtmgr.dll", CharSet = CharSet.Auto)]
-	static extern int RmStartSession(out uint pSessionHandle, int dwSessionFlags, string strSessionKey);
-
-	[DllImport("rstrtmgr.dll")]
-	static extern int RmEndSession(uint pSessionHandle);
-
-	[DllImport("rstrtmgr.dll")]
-	static extern int RmGetList(uint dwSessionHandle,
-		out uint pnProcInfoNeeded,
-		ref uint pnProcInfo,
-		[In, Out] RM_PROCESS_INFO[] rgAffectedApps,
-		ref uint lpdwRebootReasons);
-
-	/// <summary>
-	/// Find out what process(es) have a lock on the specified file.
-	/// </summary>
-	/// <param name="path">Path of the file.</param>
-	/// <returns>Processes locking the file</returns>
-	/// <remarks>See also:
-	/// http://msdn.microsoft.com/en-us/library/windows/desktop/aa373661(v=vs.85).aspx
-	/// </remarks>
-    static List<Process> WhoIsLocking(string path) {
-		uint handle;
-		var key = Guid.NewGuid().ToString();
-		List<Process> processes = [];
-
-		var res = RmStartSession(out handle, 0, key);
-		if (res != 0) throw new Exception("Could not begin restart session.  Unable to determine file locker.");
-
-		try {
-			const int ERROR_MORE_DATA = 234;
-            
-			uint pnProcInfoNeeded = 0,
-				pnProcInfo = 0,
-				lpdwRebootReasons = RmRebootReasonNone;
-
-			var resources = new string[] {path}; // Just checking on one resource.
-
-			res = RmRegisterResources(handle, (uint)resources.Length, resources, 0, null!, 0, null!);
-
-			if (res != 0) throw new Exception("Could not register resource.");
-
-			//Note: there's a race condition here -- the first call to RmGetList() returns
-			//      the total number of process. However, when we call RmGetList() again to get
-			//      the actual processes this number may have increased.
-			res = RmGetList(handle, out pnProcInfoNeeded, ref pnProcInfo, null!, ref lpdwRebootReasons);
-
-			if (res == ERROR_MORE_DATA) {
-				// Create an array to store the process results
-				RM_PROCESS_INFO[] processInfo = new RM_PROCESS_INFO[pnProcInfoNeeded];
-				pnProcInfo = pnProcInfoNeeded;
-
-				// Get the list
-				res = RmGetList(handle, out pnProcInfoNeeded, ref pnProcInfo, processInfo, ref lpdwRebootReasons);
-				if (res == 0) {
-					processes = new ((int)pnProcInfo);
-
-					// Enumerate all the results and add them to the
-					// list to be returned
-					for (var i = 0; i < pnProcInfo; i++) {
-						try {
-							processes.Add(Process.GetProcessById(processInfo[i].Process.dwProcessId));
-						}
-						// catch the error -- in case the process is no longer running
-						catch (ArgumentException) {
-						}
-					}
-				} else throw new Exception("Could not list processes locking resource.");
-			} else if (res != 0)
-				throw new Exception("Could not list processes locking resource. Failed to get size of result.");
-		} finally {
-			RmEndSession(handle);
-		}
-
-		return processes;
-	}
-
-    public static bool TryGetWhoIsLocking(string path, out List<Process> processes, out Exception? error) {
-        if (!RuntimeInformation.IsWindows) {
-            processes = [];
-            error = null;
-            return false;
-        }
-        
-        try {
-             processes = WhoIsLocking(path);
-             error = null;
-             return true;
-        } catch (Exception ex) {
-            processes = [];
-            error = ex;
-            return false;
-        }
-    }
-    
-    public static void PrintWhoIsLocking(string path, ILogger logger) {
-        logger.Information("Trying to retrieve list of processes having a file handle open on {Path} (requires admin privileges)", path);
-        if (TryGetWhoIsLocking(path, out var processes, out var error))
-            logger.Information(
-                $"Processes locking {{Path}}:{Environment.NewLine}{{ProcessList}}",
-                path, string.Join(Environment.NewLine, processes.Select(x => $"[{x.Id}] {x.MainModule?.FileName}"))
-            );
-        else
-            logger.Error(error, "Could not retrieve list of processes using file handle {Path}", path);
-    }
-}
diff --git a/src/EventStore.SystemRuntime/Diagnostics/ProcessStats.cs b/src/EventStore.SystemRuntime/Diagnostics/ProcessStats.cs
deleted file mode 100644
index 0575a5e879d..00000000000
--- a/src/EventStore.SystemRuntime/Diagnostics/ProcessStats.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// ReSharper disable CheckNamespace
-
-using System.Runtime;
-using OsxNative = System.Diagnostics.Interop.OsxNative;
-using WindowsNative = System.Diagnostics.Interop.WindowsNative;
-
-namespace System.Diagnostics;
-
-[PublicAPI]
-public static class ProcessStats {
-    public static DiskIoData GetDiskIo(Process process) {
-        return RuntimeInformation.OsPlatform switch {
-            RuntimeOSPlatform.Linux   => GetDiskIoLinux(process),
-            RuntimeOSPlatform.OSX     => GetDiskIoOsx(process),
-            RuntimeOSPlatform.Windows => GetDiskIoWindows(process),
-            RuntimeOSPlatform.FreeBSD => default,
-            _                         => throw new NotSupportedException("Operating system not supported")
-        };
-
-        static DiskIoData GetDiskIoLinux(Process process) {
-            var procIoFile = $"/proc/{process.Id}/io";
-
-            try {
-                var result = new DiskIoData();
-
-                foreach (var line in File.ReadLines(procIoFile)) {
-                    if (TryExtractIoValue(line, "read_bytes", out var readBytes))
-                        result = result with { ReadBytes = readBytes };
-                    else if (TryExtractIoValue(line, "write_bytes", out var writeBytes))
-                        result = result with { WrittenBytes = writeBytes };
-                    else if (TryExtractIoValue(line, "syscr", out var readOps))
-                        result = result with { ReadOps = readOps };
-                    else if (TryExtractIoValue(line, "syscw", out var writeOps)) {
-                        result = result with { WriteOps = writeOps };
-                        break;
-                    }
-                }
-
-                return result;
-            }
-            catch (Exception ex) {
-                throw new ApplicationException("Failed to get Linux process I/O info", ex);
-            }
-
-            static bool TryExtractIoValue(string line, string key, out ulong value) {
-                if (line.StartsWith(key)) {
-                    var rawValue = line[(key.Length + 1)..].Trim(); // handle the `:` character
-                    value = Convert.ToUInt64(rawValue);
-                    return true;
-                }
-
-                value = 0;
-                return false;
-            }
-        }
-        
-        static DiskIoData GetDiskIoOsx(Process process) => 
-            OsxNative.IO.GetDiskIo(process.Id);
-
-        static DiskIoData GetDiskIoWindows(Process process) =>
-            WindowsNative.IO.GetDiskIo(process);
-    }
-
-    public static DiskIoData GetDiskIo() => 
-        GetDiskIo(Process.GetCurrentProcess());
-}
-
-/// <summary>
-/// Represents a record struct for Disk I/O data.
-/// </summary>
-public readonly record struct DiskIoData {
-    public DiskIoData() { }
-
-    public DiskIoData(ulong readBytes, ulong writtenBytes, ulong readOps, ulong writeOps) {
-        ReadBytes = readBytes;
-        WrittenBytes = writtenBytes;
-        ReadOps = readOps;
-        WriteOps = writeOps;
-    }
-
-    /// <summary>
-    /// Gets or sets the number of bytes read.
-    /// </summary>
-    public ulong ReadBytes { get; init; }
-
-    /// <summary>
-    /// Gets or sets the number of bytes written.
-    /// </summary>
-    public ulong WrittenBytes { get; init; }
-
-    /// <summary>
-    /// Gets or sets the number of read operations.
-    /// </summary>
-    public ulong ReadOps { get; init; }
-
-    /// <summary>
-    /// Gets or sets the number of write operations.
-    /// </summary>
-    public ulong WriteOps { get; init; }
-}
diff --git a/src/EventStore.SystemRuntime/Diagnostics/RuntimeStats.cs b/src/EventStore.SystemRuntime/Diagnostics/RuntimeStats.cs
deleted file mode 100644
index 3978587a18c..00000000000
--- a/src/EventStore.SystemRuntime/Diagnostics/RuntimeStats.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-// ReSharper disable CheckNamespace
-
-using System.Diagnostics.CodeAnalysis;
-using System.Diagnostics.Interop;
-using System.Runtime;
-using static System.Convert;
-using static System.Globalization.CultureInfo;
-using static System.Reflection.BindingFlags;
-
-namespace System.Diagnostics;
-
-[PublicAPI]
-public static class RuntimeStats {
-    static RuntimeStats() {
-        GetCpuUsageInternal = typeof(GC)
-            .Assembly
-            .GetType("System.Diagnostics.Tracing.RuntimeEventSourceHelper")!
-            .GetMethod("GetCpuUsage", Static | NonPublic)!
-            .CreateDelegate<Func<double>>();
-
-        GetExceptionCountInternal = typeof(Exception)
-            .GetMethod("GetExceptionCount", Static | NonPublic)!
-            .CreateDelegate<Func<uint>>();
-
-        GetLastGCPercentTimeInGCInternal = typeof(GC)
-            .GetMethod("GetLastGCPercentTimeInGC", Static | NonPublic)!
-            .CreateDelegate<Func<int>>();
-    }
-
-    static Func<double> GetCpuUsageInternal { get; }
-    static Func<uint> GetExceptionCountInternal { get; }
-    static Func<int> GetLastGCPercentTimeInGCInternal { get; }
-
-    public static double GetCpuUsage() => GetCpuUsageInternal();
-
-    public static int GetExceptionCount() => (int)GetExceptionCountInternal();
-
-    public static int GetLastGCPercentTimeInGC() => GetLastGCPercentTimeInGCInternal();
-
-    public static long GetTotalMemory() => 
-        GC.GetGCMemoryInfo(GCKind.Background).TotalAvailableMemoryBytes;
-
-    public static ValueTask<long> GetFreeMemoryAsync() {
-        return RuntimeInformation.OsPlatform switch {
-            RuntimeOSPlatform.Linux   => GetFreeMemoryLinux(),
-            RuntimeOSPlatform.FreeBSD => GetFreeMemoryLinux(),
-            RuntimeOSPlatform.OSX     => GetFreeMemoryOSX(true),
-            RuntimeOSPlatform.Windows => GetFreeMemoryWindows(),
-            _ => throw new NotSupportedException("Operating system not supported")
-        };
-
-        static async ValueTask<long> GetFreeMemoryLinux() {
-            var output = await ExecuteShellCommandAsync("grep MemFree /proc/meminfo"); // old code uses MemAvailable
-            var parts  = output.Split(' ', StringSplitOptions.RemoveEmptyEntries);
-            var value  = ToInt64(parts[1]) * 1024; // Convert KB to bytes
-            return value;
-        }
-
-        static async ValueTask<long> GetFreeMemoryOSX(bool native = false) {
-            if (native)
-                return OsxNative.Memory.GetFreeMemory();
-
-            var output = await ExecuteShellCommandAsync("vm_stat | head -n 2");
-
-            var lines = output.Split('\n');
-            var value = ParseFreePages(lines[1]) * ParsePageSize(lines[0]);
-
-            return value;
-
-            static long ParsePageSize(string line) =>
-                ToInt64(line.Split(' ', StringSplitOptions.RemoveEmptyEntries)[7]);
-
-            static long ParseFreePages(string line) =>
-                ToInt64(line.Split(' ', StringSplitOptions.RemoveEmptyEntries)[2].TrimEnd('.'));
-        }
-
-        [SuppressMessage("Interoperability", "CA1416:Validate platform compatibility")]
-        static ValueTask<long> GetFreeMemoryWindows() {
-            using var counter = new PerformanceCounter("Memory", "Available Bytes");
-            var value = ToInt64(counter.NextValue());
-            return ValueTask.FromResult(value);
-        }
-    }
-
-    public static ValueTask<(double OneMinute, double FiveMinutes, double FifteenMinutes)> GetCpuLoadAveragesAsync() {
-        return RuntimeInformation.OsPlatform switch {
-            RuntimeOSPlatform.Linux   => GetLoadAveragesLinux(),
-            RuntimeOSPlatform.FreeBSD => GetLoadAveragesFreeBSD(),
-            RuntimeOSPlatform.OSX     => GetLoadAveragesMac(),
-            RuntimeOSPlatform.Windows => default,
-            _                         => throw new NotSupportedException("Operating system not supported")
-        };
-
-        static async ValueTask<(double OneMinute, double FiveMinutes, double FifteenMinutes)> GetLoadAveragesLinux() {
-            // On Linux, the /proc/loadavg file provides load averages along with some additional scheduling information.
-            // The file typically looks something like this:
-            //
-            // 0.01 0.05 0.05 1/789 12345
-            //
-            // Here:
-            //
-            // - 0.01 is the 1-minute load average.
-            // - 0.05 is the 5-minute load average.
-            // - 0.05 is the 15-minute load average.
-            // - 1/789 indicates the number of currently running processes over the total number of processes.
-            // - 12345 is the last process ID used.
-
-            var output = await ExecuteShellCommandAsync("grep -Eo '^[^ ]+ [^ ]+ [^ ]+' /proc/loadavg");
-            var values = output.Split(' ');
-
-            return (
-                OneMinute: ToDouble(values[0], InvariantCulture),
-                FiveMinutes: ToDouble(values[1], InvariantCulture),
-                FifteenMinutes: ToDouble(values[2], InvariantCulture)
-            );
-        }
-
-        static async ValueTask<(double OneMinute, double FiveMinutes, double FifteenMinutes)> GetLoadAveragesMac() {
-            // On macOS, the uptime command might give you something like this:
-            //
-            // 14:55  up 10 days,  4:02, 4 users, load averages: 2.43 2.72 2.89
-            //
-            // Here:
-            //
-            // - 2.43 is the 1-minute load average.
-            // - 2.72 is the 5-minute load average.
-            // - 2.89 is the 15-minute load average.
-
-            var output = await ExecuteShellCommandAsync("uptime");
-            var startIndex = output.LastIndexOf(':') + 1; // find the last colon and start right after it
-            var loadAverages = output[startIndex..].Trim();
-            var values = loadAverages.Split(' ', StringSplitOptions.RemoveEmptyEntries);
-
-            return (
-                OneMinute: ToDouble(values[0], InvariantCulture),
-                FiveMinutes: ToDouble(values[1], InvariantCulture),
-                FifteenMinutes: ToDouble(values[2], InvariantCulture)
-            );
-        }
-
-        static async ValueTask<(double OneMinute, double FiveMinutes, double FifteenMinutes)> GetLoadAveragesFreeBSD() {
-            // works on macOS as well
-            // Example output: "{ 0.12 0.26 0.21 }"
-            var output = await ExecuteShellCommandAsync("sysctl -n vm.loadavg");
-            var values = output.Trim('{', '}', ' ').Split(' ');
-
-            return (
-                OneMinute: ToDouble(values[0], InvariantCulture),
-                FiveMinutes: ToDouble(values[1], InvariantCulture),
-                FifteenMinutes: ToDouble(values[2], InvariantCulture)
-            );
-        }
-    }
-
-    public static long GetFreeMemory() =>
-        GetFreeMemoryAsync().AsTask().GetAwaiter().GetResult();
-
-    public static (double OneMinute, double FiveMinutes, double FifteenMinutes) GetCpuLoadAverages() =>
-        GetCpuLoadAveragesAsync().AsTask().GetAwaiter().GetResult();
-    
-    static async ValueTask<string> ExecuteShellCommandAsync(string command) {
-        var escapedArgs = command.Replace(@"\", @"\\");
-
-        var psi = new ProcessStartInfo {
-            FileName = "/bin/sh",
-            Arguments = $"-c \"{escapedArgs}\"",
-            RedirectStandardOutput = true,
-            UseShellExecute = false,
-            CreateNoWindow = true,
-        };
-    
-        using var process = Process.Start(psi);
-    
-        if (process is null)
-            throw new InvalidOperationException($"Could not start sh process to execute: {psi.FileName} {psi.Arguments}");
-    
-        var result = await process.StandardOutput.ReadToEndAsync();
-    
-        await process.WaitForExitAsync();
-    
-        return result.Trim();
-    }
-}
diff --git a/src/EventStore.SystemRuntime/EventStore.SystemRuntime.csproj b/src/EventStore.SystemRuntime/EventStore.SystemRuntime.csproj
deleted file mode 100644
index 4140a5ebf15..00000000000
--- a/src/EventStore.SystemRuntime/EventStore.SystemRuntime.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-	</PropertyGroup>
-
-	<ItemGroup>
-	  <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
-	  <PackageReference Include="Serilog" Version="4.0.1" />
-	  <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Using Include="JetBrains.Annotations" />
-	</ItemGroup>
-
-</Project>
diff --git a/src/EventStore.SystemRuntime/RuntimeInformation.cs b/src/EventStore.SystemRuntime/RuntimeInformation.cs
deleted file mode 100644
index 4bc74863824..00000000000
--- a/src/EventStore.SystemRuntime/RuntimeInformation.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-// ReSharper disable CheckNamespace
-// ReSharper disable InconsistentNaming
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-using static System.Environment;
-using static System.Runtime.InteropServices.RuntimeInformation;
-using static System.String;
-
-namespace System.Runtime;
-
-[PublicAPI]
-public static class RuntimeInformation {
-    static RuntimeInformation() {
-        if (IsOSPlatform(OSPlatform.OSX)) {
-            OsPlatform = RuntimeOSPlatform.OSX;
-            IsOSX = true;
-        }
-        else if (IsOSPlatform(OSPlatform.Linux)) {
-            OsPlatform = RuntimeOSPlatform.Linux;
-            IsLinux = true;
-        }
-        else if (IsOSPlatform(OSPlatform.Windows)) {
-            OsPlatform = RuntimeOSPlatform.Windows;
-            IsWindows = true;
-        }
-        else if (IsOSPlatform(OSPlatform.FreeBSD)) {
-            OsPlatform = RuntimeOSPlatform.FreeBSD;
-            IsFreeBSD = true;
-        }
-        else
-            OsPlatform = RuntimeOSPlatform.Unknown;
-
-        IsUnix = IsLinux || IsFreeBSD || IsOSX;
-
-        IsRunningInContainer  = !IsNullOrEmpty(GetEnvironmentVariable("DOTNET_RUNNING_IN_CONTAINER"));
-        IsRunningInKubernetes = !IsNullOrEmpty(GetEnvironmentVariable("KUBERNETES_SERVICE_HOST"));
-        
-        Host = DotNetHostInfo.Collect();
-
-        HomeFolder = GetFolderPath(SpecialFolder.UserProfile);
-    }
-
-    /// <summary>
-    /// Indicates if the current process is running in a container.
-    /// </summary>
-    public static readonly bool IsRunningInContainer;
-    
-    /// <summary>
-    /// Indicates if the current process is running in a Kubernetes cluster.
-    /// </summary>
-    public static readonly bool IsRunningInKubernetes;
-
-    /// <summary>
-    /// The operating system platform the current process is running on.
-    /// </summary>
-    public static readonly RuntimeOSPlatform OsPlatform;
-
-    /// <summary>
-    /// Indicates if the current operating system is Linux.
-    /// </summary>
-    public static readonly bool IsLinux;
-
-    /// <summary>
-    /// Indicates if the current operating system is Windows.
-    /// </summary>
-    public static readonly bool IsWindows;
-
-    /// <summary>
-    /// Indicates if the current operating system is macOS.
-    /// </summary>
-    public static readonly bool IsOSX;
-
-    /// <summary>
-    /// Indicates if the current operating system is FreeBSD.
-    /// </summary>
-    public static readonly bool IsFreeBSD;
-
-    /// <summary>
-    /// Indicates if the current operating system is a Unix-based system (Linux, FreeBSD or macOS).
-    /// </summary>
-    public static readonly bool IsUnix;
-
-    /// <summary>
-    /// Information about the .NET host environment.
-    /// This includes details such as the version of the .NET runtime, the architecture, the mode (e.g., 64 for a 64-bit runtime), the commit hash of the .NET runtime, and a custom runtime version of the .NET host.
-    /// </summary>
-    public static readonly DotNetHostInfo Host;
-    
-    /// <summary>
-    /// The user's profile folder.
-    /// </summary>
-    /// <remarks>
-    /// Applications should not create files or folders at this level; they should put their data under the locations referred to by <see cref="F:System.Environment.SpecialFolder.ApplicationData" />.
-    /// </remarks>
-    public static readonly string HomeFolder;
-
-    /// <summary>
-    /// Custom runtime version of the .NET host.
-    /// </summary>
-    public static readonly string RuntimeVersion = Host.RuntimeVersion;
-
-    /// <summary>
-    /// The mode of the .NET runtime, represented as the size of a pointer (e.g., 64 for a 64-bit runtime).
-    /// </summary>
-    public static readonly int RuntimeMode = Host.Mode;
-}
-
-/// <summary>
-/// Represents information about the .NET host environment.
-/// </summary>
-/// <param name="Version">The version of the .NET runtime.</param>
-/// <param name="Architecture">The architecture of the .NET runtime (e.g., x64, arm64).</param>
-/// <param name="Mode">The mode of the .NET runtime, represented as the size of a pointer (e.g., 64 for a 64-bit runtime).</param>
-/// <param name="Commit">The commit hash of the .NET runtime.</param>
-/// <param name="RuntimeVersion">Custom runtime version of the .NET host.</param>
-public readonly record struct DotNetHostInfo(string Version, Architecture Architecture, int Mode, string Commit, string RuntimeVersion) {
-    public override string ToString() => RuntimeVersion;
-    
-    public static DotNetHostInfo Collect() {
-        var assemblyVersion = typeof(object).Assembly
-            .GetCustomAttribute<AssemblyInformationalVersionAttribute>()
-            ?.InformationalVersion!;
-
-        var commit = assemblyVersion.Substring(assemblyVersion.IndexOf('+') + 1, 9);
-
-        return new () {
-            Version = Environment.Version.ToString(),
-            Architecture = OSArchitecture,
-            Mode = IntPtr.Size * 8,
-            Commit = commit,
-            RuntimeVersion = $"{FrameworkDescription}/{commit}"
-        };
-    }
-}
diff --git a/src/EventStore.SystemRuntime/RuntimeOSPlatform.cs b/src/EventStore.SystemRuntime/RuntimeOSPlatform.cs
deleted file mode 100644
index 9cbcea237a2..00000000000
--- a/src/EventStore.SystemRuntime/RuntimeOSPlatform.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// ReSharper disable InconsistentNaming
-// ReSharper disable CheckNamespace
-
-namespace System.Runtime;
-
-/// <summary>
-/// Enum representing the operating system platform.
-/// </summary>
-public enum RuntimeOSPlatform {
-    /// <summary>
-    /// Represents an unknown operating system platform.
-    /// </summary>
-    Unknown,
-     
-    /// <summary>
-    /// Represents the FreeBSD operating system platform.
-    /// </summary>
-    FreeBSD,
-    
-    /// <summary>
-    /// Represents the Linux operating system platform.
-    /// </summary>
-    Linux, 
-
-    /// <summary>
-    /// Represents the OSX (macOS) operating system platform.
-    /// </summary>
-    OSX, 
-    
-    /// <summary>
-    /// Represents the Windows operating system platform.
-    /// </summary>
-    Windows
-}
diff --git a/src/EventStore.TestClient/Client.cs b/src/EventStore.TestClient/Client.cs
deleted file mode 100644
index 90d9716fa6e..00000000000
--- a/src/EventStore.TestClient/Client.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using EventStore.Common.Utils;
-using EventStore.TestClient.Commands;
-using EventStore.TestClient.Commands.DvuBasic;
-using Connection = EventStore.Transport.Tcp.TcpTypedConnection<byte[]>;
-using ILogger = Serilog.ILogger;
-#pragma warning disable 1591
-
-namespace EventStore.TestClient {
-	public class Client {
-		public static readonly TimeSpan ConnectionTimeout = TimeSpan.FromMilliseconds(1000);
-		private static readonly ILogger Log = Serilog.Log.ForContext<Client>();
-
-		public readonly bool InteractiveMode;
-
-		public readonly ClientOptions Options;
-
-		public readonly TcpTestClient _tcpTestClient;
-		public readonly GrpcTestClient _grpcTestClient;
-		public readonly ClientApiTcpTestClient _clientApiTestClient;
-
-		private readonly CommandsProcessor _commands = new CommandsProcessor(Log);
-
-		public Client(ClientOptions options, CancellationTokenSource cancellationTokenSource) {
-			Options = options;
-
-			var interactiveMode = options.Command.IsEmpty();
-
-			InteractiveMode = options.Command.IsEmpty();
-
-			_tcpTestClient = new TcpTestClient(options, interactiveMode, Log);
-			_grpcTestClient = new GrpcTestClient(options, Log);
-			_clientApiTestClient = new ClientApiTcpTestClient(options, Log);
-
-			RegisterProcessors(cancellationTokenSource);
-		}
-
-		private void RegisterProcessors(CancellationTokenSource cancellationTokenSource) {
-			_commands.Register(new UsageProcessor(_commands), usageProcessor: true);
-			_commands.Register(new ExitProcessor(cancellationTokenSource));
-
-			_commands.Register(new PingProcessor());
-			_commands.Register(new PingFloodProcessor());
-			_commands.Register(new PingFloodWaitingProcessor());
-
-			_commands.Register(new WriteProcessor());
-			_commands.Register(new WriteJsonProcessor());
-			_commands.Register(new WriteFloodProcessor());
-			_commands.Register(new WriteFloodClientApiProcessor());
-			_commands.Register(new WriteFloodWaitingProcessor());
-
-			_commands.Register(new MultiWriteProcessor());
-			_commands.Register(new MultiWriteFloodWaitingProcessor());
-
-			_commands.Register(new TransactionWriteProcessor());
-
-			_commands.Register(new DeleteProcessor());
-
-			_commands.Register(new ReadAllProcessor());
-			_commands.Register(new ReadProcessor());
-			_commands.Register(new ReadFloodProcessor());
-
-			_commands.Register(new WriteLongTermProcessor());
-
-			_commands.Register(new DvuBasicProcessor());
-			_commands.Register(new RunTestScenariosProcessor());
-
-			_commands.Register(new SubscribeToStreamProcessor());
-
-			_commands.Register(new ScavengeProcessor());
-
-			_commands.Register(new TcpSanitazationCheckProcessor());
-
-			_commands.Register(new SubscriptionStressTestProcessor());
-
-			// gRPC
-			_commands.Register(new GrpcCommands.ReadAllProcessor());
-			_commands.Register(new GrpcCommands.WriteFloodProcessor());
-
-			// TCP Client API
-			_commands.Register(new ClientApiTcpCommands.WriteFloodProcessor());
-		}
-
-		public string GetCommandList() {
-			var sb = new StringBuilder();
-			_commands.RegisteredProcessors.Select(x => x.Usage.ToUpper()).ToList().ForEach(s => sb.AppendLine(s));
-			return sb.ToString();
-		}
-
-		public int Run(CancellationToken cancellationToken) {
-			if (!InteractiveMode) {
-				var args = ParseCommandLine(Options.Command[0]);
-				return Execute(args, cancellationToken);
-			}
-			
-			new Thread(() => {
-				Thread.Sleep(100);
-				Console.WriteLine(GetCommandList());
-				Console.Write(">>> ");
-
-				string line;
-				while ((line = Console.ReadLine()) != null) {
-					try {
-						if (string.IsNullOrWhiteSpace(line))
-							continue;
-
-						try {
-							var args = ParseCommandLine(line);
-							Execute(args, cancellationToken);
-						} catch (Exception exc) {
-							Log.Error(exc, "Error during executing command.");
-						}
-					} finally {
-						Thread.Sleep(100);
-						Console.Write(">>> ");
-					}
-				}
-			}) {IsBackground = true, Name = "Client Main Loop Thread"}.Start();
-			return 0;
-		}
-
-		private static string[] ParseCommandLine(string line) {
-			return line.Split(new[] {' ', '\t'}, StringSplitOptions.RemoveEmptyEntries);
-		}
-
-		private int Execute(string[] args, CancellationToken cancellationToken) {
-			Log.Information("Processing command: {command}.", string.Join(" ", args));
-
-			var context = new CommandProcessorContext(_tcpTestClient, _grpcTestClient, _clientApiTestClient, Options.Timeout,
-				Log, Options.StatsLog, Options.OutputCsv, new ManualResetEventSlim(true), cancellationToken);
-
-			int exitCode;
-			if (_commands.TryProcess(context, args, out exitCode)) {
-				Log.Information("Command exited with code {exitCode}.", exitCode);
-				return exitCode;
-			}
-
-			return exitCode;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/ClientApiLoggerBridge.cs b/src/EventStore.TestClient/ClientApiLoggerBridge.cs
deleted file mode 100644
index 513bf86f651..00000000000
--- a/src/EventStore.TestClient/ClientApiLoggerBridge.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.TestClient {
-	internal class ClientApiLoggerBridge : ClientAPI.ILogger {
-		public static readonly ClientApiLoggerBridge Default =
-			new ClientApiLoggerBridge(Serilog.Log.ForContext(Serilog.Core.Constants.SourceContextPropertyName,
-				"client-api"));
-
-		private readonly Serilog.ILogger _log;
-
-		public ClientApiLoggerBridge(ILogger log) {
-			Ensure.NotNull(log, "log");
-			_log = log;
-		}
-
-		public void Error(string format, params object[] args) {
-			if (args.Length == 0)
-				_log.Error(format);
-			else
-				_log.Error(format, args);
-		}
-
-		public void Error(Exception ex, string format, params object[] args) {
-			if (args.Length == 0)
-				_log.Error(ex, format);
-			else
-				_log.Error(ex, format, args);
-		}
-
-		public void Info(string format, params object[] args) {
-			if (args.Length == 0)
-				_log.Information(format);
-			else
-				_log.Information(format, args);
-		}
-
-		public void Info(Exception ex, string format, params object[] args) {
-			if (args.Length == 0)
-				_log.Information(ex, format);
-			else
-				_log.Information(ex, format, args);
-		}
-
-		public void Debug(string format, params object[] args) {
-			if (args.Length == 0)
-				_log.Debug(format);
-			else
-				_log.Debug(format, args);
-		}
-
-		public void Debug(Exception ex, string format, params object[] args) {
-			if (args.Length == 0)
-				_log.Debug(ex, format);
-			else
-				_log.Debug(ex, format, args);
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/ClientApiTcpCommands/WriteFloodProcessor.cs b/src/EventStore.TestClient/ClientApiTcpCommands/WriteFloodProcessor.cs
deleted file mode 100644
index 33138652623..00000000000
--- a/src/EventStore.TestClient/ClientApiTcpCommands/WriteFloodProcessor.cs
+++ /dev/null
@@ -1,220 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.Exceptions;
-using EventStore.TestClient.Commands;
-using EventStore.TestClient.Statistics;
-using EventData = EventStore.ClientAPI.EventData;
-using ExpectedVersion = EventStore.Core.Data.ExpectedVersion;
-using StreamDeletedException = EventStore.ClientAPI.Exceptions.StreamDeletedException;
-using WrongExpectedVersionException = EventStore.ClientAPI.Exceptions.WrongExpectedVersionException;
-
-namespace EventStore.TestClient.ClientApiTcpCommands {
-	internal class WriteFloodProcessor : ICmdProcessor {
-		public string Usage {
-			//                        0          1            2           3          4              5
-			get { return "WRFLTCP [<clients> <requests> [<streams-cnt> [<size> [<batchsize> [<stream-prefix>]]]]]"; }
-		}
-
-		public string Keyword {
-			get { return "WRFLTCP"; }
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			int clientsCnt = 1;
-			long requestsCnt = 5000;
-			int streamsCnt = 1000;
-			int size = 256;
-			int batchSize = 1;
-			string streamPrefix = "";
-			if (args.Length > 0) {
-				if (args.Length < 2 || args.Length > 6)
-					return false;
-
-				try {
-					clientsCnt = MetricPrefixValue.ParseInt(args[0]);
-					requestsCnt = MetricPrefixValue.ParseLong(args[1]);
-					if (args.Length >= 3)
-						streamsCnt = MetricPrefixValue.ParseInt(args[2]);
-					if (args.Length >= 4)
-						size = MetricPrefixValue.ParseInt(args[3]);
-					if (args.Length >= 5)
-						batchSize = MetricPrefixValue.ParseInt(args[4]);
-					if (args.Length >= 6)
-						streamPrefix = args[5];
-				} catch {
-					return false;
-				}
-			}
-
-			var stats = new WriteFloodStats(Keyword, context.OutputCsv, args);
-			var monitor = new RequestMonitor();
-			WriteFlood(context, stats, clientsCnt, requestsCnt, streamsCnt, size, batchSize, streamPrefix, monitor)
-				.GetAwaiter().GetResult();
-			return true;
-		}
-
-		private async Task WriteFlood(CommandProcessorContext context, WriteFloodStats stats, int clientsCnt, long requestsCnt, int streamsCnt,
-			int size, int batchSize, string streamPrefix, RequestMonitor monitor) {
-			context.IsAsync();
-
-			var doneEvent = new ManualResetEventSlim(false);
-			var clients = new List<IEventStoreConnection>();
-
-			long last = 0;
-
-			var streams = Enumerable.Range(0, streamsCnt).Select(x =>
-				string.IsNullOrWhiteSpace(streamPrefix)
-					? Guid.NewGuid().ToString()
-					: $"{streamPrefix}-{x}").ToArray();
-
-			context.Log.Information("Writing streams randomly between {first} and {last}",
-				streams.FirstOrDefault(),
-				streams.LastOrDefault());
-
-			var start = new TaskCompletionSource();
-			stats.StartTime = DateTime.UtcNow;
-			var sw2 = new Stopwatch();
-			var capacity = 2000 / clientsCnt;
-			var clientTasks = new List<Task>();
-			for (int i = 0; i < clientsCnt; i++) {
-				var count = requestsCnt / clientsCnt + ((i == clientsCnt - 1) ? requestsCnt % clientsCnt : 0);
-
-				var client = context._clientApiTestClient.CreateConnection();
-				await client.ConnectAsync();
-				clientTasks.Add(RunClient(client, count));
-			}
-
-			async Task RunClient(IEventStoreConnection client, long count) {
-				var rnd = new Random();
-				List<Task> pending = new List<Task>(capacity);
-				await start.Task;
-
-				for (int j = 0; j < count; ++j) {
-					var events = new EventData[batchSize];
-					for (int q = 0; q < batchSize; q++) {
-						events[q] = new EventData(Guid.NewGuid(),
-							"TakeSomeSpaceEvent", false,
-							Common.Utils.Helper.UTF8NoBom.GetBytes(
-								"{ \"DATA\" : \"" + new string('*', size) + "\"}"),
-							Common.Utils.Helper.UTF8NoBom.GetBytes(
-								"{ \"METADATA\" : \"" + new string('$', 100) + "\"}"));
-					}
-
-					var corrid = Guid.NewGuid();
-					monitor.StartOperation(corrid);
-
-					pending.Add(client.AppendToStreamAsync(streams[rnd.Next(streamsCnt)], ExpectedVersion.Any, events)
-						.ContinueWith(t => {
-							monitor.EndOperation(corrid);
-							if (t.IsCompletedSuccessfully) Interlocked.Add(ref stats.Succ, batchSize);
-							else {
-								if (Interlocked.Increment(ref stats.Fail) % 1000 == 0) {
-									Console.Write("#");
-								}
-
-								if (t.Exception != null) {
-									var exception = t.Exception.Flatten();
-									switch (exception.InnerException) {
-										case WrongExpectedVersionException _:
-											Interlocked.Increment(ref stats.WrongExpVersion);
-											break;
-										case StreamDeletedException _:
-											Interlocked.Increment(ref stats.StreamDeleted);
-											break;
-										case OperationTimedOutException _:
-											Interlocked.Increment(ref stats.CommitTimeout);
-											break;
-									}
-								}
-							}
-
-							Interlocked.Add(ref stats.Succ, batchSize);
-							if (stats.Succ - last > 1000) {
-								last = stats.Succ;
-								Console.Write(".");
-							}
-
-							var localAll = Interlocked.Add(ref stats.All, batchSize);
-							if (localAll % 100000 == 0) {
-								stats.Elapsed = sw2.Elapsed;
-								stats.Rate = 1000.0 * 100000 / stats.Elapsed.TotalMilliseconds;
-								sw2.Restart();
-								context.Log.Debug(
-									"\nDONE TOTAL {writes} WRITES IN {elapsed} ({rate:0.0}/s) [S:{success}, F:{failures} (WEV:{wrongExpectedVersion}, P:{prepareTimeout}, C:{commitTimeout}, F:{forwardTimeout}, D:{streamDeleted})].",
-									localAll, stats.Elapsed, stats.Rate,
-									stats.Succ, stats.Fail,
-									stats.WrongExpVersion, stats.PrepTimeout, stats.CommitTimeout, stats.ForwardTimeout, stats.StreamDeleted);
-								stats.WriteStatsToFile(context.StatsLogger);
-							}
-
-							if (localAll >= requestsCnt) {
-								context.Success();
-								doneEvent.Set();
-							}
-						}));
-					if (pending.Count == capacity) {
-						await Task.WhenAny(pending);
-
-						while (pending.Count > 0 && Task.WhenAny(pending).IsCompleted) {
-							pending.RemoveAll(x => x.IsCompleted);
-							if (stats.Succ - last > 1000) {
-								Console.Write(".");
-								last = stats.Succ;
-							}
-						}
-					}
-				}
-
-				if (pending.Count > 0) await Task.WhenAll(pending);
-			}
-
-			var sw = Stopwatch.StartNew();
-			sw2.Start();
-			start.SetResult();
-			await Task.WhenAll(clientTasks);
-			sw.Stop();
-
-			clients.ForEach(client => client.Close());
-
-			context.Log.Information(
-				"Completed. Successes: {success}, failures: {failures} (WRONG VERSION: {wrongExpectedVersion}, P: {prepareTimeout}, C: {commitTimeout}, F: {forwardTimeout}, D: {streamDeleted})",
-				stats.Succ, stats.Fail,
-				stats.WrongExpVersion, stats.PrepTimeout, stats.CommitTimeout, stats.ForwardTimeout, stats.StreamDeleted);
-			stats.WriteStatsToFile(context.StatsLogger);
-
-			var reqPerSec = (stats.All + 0.0) / sw.ElapsedMilliseconds * 1000;
-			context.Log.Information("{requests} requests completed in {elapsed}ms ({rate:0.00} reqs per sec).", stats.All,
-				sw.ElapsedMilliseconds, reqPerSec);
-
-			PerfUtils.LogData(
-				Keyword,
-				PerfUtils.Row(PerfUtils.Col("clientsCnt", clientsCnt),
-					PerfUtils.Col("requestsCnt", requestsCnt),
-					PerfUtils.Col("ElapsedMilliseconds", sw.ElapsedMilliseconds)),
-				PerfUtils.Row(PerfUtils.Col("successes", stats.Succ), PerfUtils.Col("failures", stats.Fail)));
-
-			var failuresRate = (int)(100 * stats.Fail / (stats.Fail + stats.Succ));
-			PerfUtils.LogTeamCityGraphData(string.Format("{0}-{1}-{2}-reqPerSec", Keyword, clientsCnt, requestsCnt),
-				(int)reqPerSec);
-			PerfUtils.LogTeamCityGraphData(
-				string.Format("{0}-{1}-{2}-failureSuccessRate", Keyword, clientsCnt, requestsCnt), failuresRate);
-			PerfUtils.LogTeamCityGraphData(
-				string.Format("{0}-c{1}-r{2}-st{3}-s{4}-reqPerSec", Keyword, clientsCnt, requestsCnt, streamsCnt,
-					size),
-				(int)reqPerSec);
-			PerfUtils.LogTeamCityGraphData(
-				string.Format("{0}-c{1}-r{2}-st{3}-s{4}-failureSuccessRate", Keyword, clientsCnt, requestsCnt,
-					streamsCnt, size), failuresRate);
-			monitor.GetMeasurementDetails();
-			if (Interlocked.Read(ref stats.Succ) != requestsCnt)
-				context.Fail(reason: "There were errors or not all requests completed.");
-			else
-				context.Success();
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/ClientApiTcpTestClient.cs b/src/EventStore.TestClient/ClientApiTcpTestClient.cs
deleted file mode 100644
index 4c388623cd5..00000000000
--- a/src/EventStore.TestClient/ClientApiTcpTestClient.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using EventStore.ClientAPI;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.TestClient {
-	/// <summary>
-	/// A test client that connects using the legacy dotnet TCP client
-	/// </summary>
-	public class ClientApiTcpTestClient {
-		/// <summary>
-		/// The options specified when starting the EventStore.TestClient
-		/// </summary>
-		public ClientOptions Options { get; set; }
-		private ILogger _log;
-
-		/// <summary>
-		/// Constructs a new <see cref="ClientApiTcpTestClient"/>
-		/// </summary>
-		/// <param name="options"></param>
-		/// <param name="log"></param>
-		public ClientApiTcpTestClient(ClientOptions options, ILogger log) {
-			Options = options;
-			_log = log;
-		}
-
-		/// <summary>
-		/// Creates a new TCP connection.
-		/// </summary>
-		/// <returns></returns>
-		public IEventStoreConnection CreateConnection() {
-			var connectionString = string.IsNullOrWhiteSpace(Options.ConnectionString)
-				? $"ConnectTo=tcp://{Options.Host}:{Options.TcpPort};UseSslConnection={Options.UseTls};ValidateServer={Options.TlsValidateServer}"
-				: Options.ConnectionString;
-			_log.Debug("Creating TCP client with connection string '{connectionString}.", connectionString);
-
-			var connectionSettings = ConnectionSettings.Create()
-				.LimitRetriesForOperationTo(0)
-				.KeepReconnecting();
-			return EventStoreConnection.Create(connectionString, connectionSettings);
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/ClientOptions.cs b/src/EventStore.TestClient/ClientOptions.cs
deleted file mode 100644
index 90db0e3c2ba..00000000000
--- a/src/EventStore.TestClient/ClientOptions.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Collections;
-using System.Linq;
-using System.Net;
-using System.Reflection;
-using System.Text;
-using Serilog;
-
-#pragma warning disable 1591
-
-namespace EventStore.TestClient {
-	/// <summary>
-	/// Data contract for the command-line options accepted by test client.
-	/// This contract is handled by CommandLine project for .NET
-	/// </summary>
-	public sealed record ClientOptions {
-		public string Host { get; init; }
-		public int TcpPort { get; init; }
-		public int HttpPort { get; init; }
-		public int Timeout { get; init; }
-		public int ReadWindow { get; init; }
-		public int WriteWindow { get; init; }
-		public int PingWindow { get; init; }
-		public string[] Command { get; init; }
-		public bool Reconnect { get; set; }
-
-		public bool UseTls { get; init; }
-		public bool TlsValidateServer { get; init; }
-
-		public string ConnectionString { get; set; }
-		public bool OutputCsv { get; set; }
-		public ILogger StatsLog { get; set; }
-
-		public ClientOptions() {
-			Command = Array.Empty<string>();
-			Host = IPAddress.Loopback.ToString();
-			TcpPort = 1113;
-			HttpPort = 2113;
-			Timeout = -1;
-			ReadWindow = 2000;
-			WriteWindow = 2000;
-			PingWindow = 2000;
-			Reconnect = true;
-			UseTls = false;
-			TlsValidateServer = false;
-			ConnectionString = string.Empty;
-			OutputCsv = true;
-		}
-
-		public override string ToString() {
-			return GetType()
-				.GetProperties()
-				.Aggregate(new StringBuilder(),
-					(builder, option) => builder.AppendLine($"{option.Name}: {GetValue(option)}"))
-				.ToString();
-
-			object GetValue(PropertyInfo propertyInfo) => propertyInfo.PropertyType.IsArray
-				? string.Join(",", ((IEnumerable)propertyInfo.GetValue(this)).OfType<object>())
-				: propertyInfo.GetValue(this);
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/CommandProcessorContext.cs b/src/EventStore.TestClient/CommandProcessorContext.cs
deleted file mode 100644
index 422ce641c41..00000000000
--- a/src/EventStore.TestClient/CommandProcessorContext.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Threading;
-using ILogger = Serilog.ILogger;
-#pragma warning disable 1591
-
-namespace EventStore.TestClient {
-	/// <summary>
-	/// This context is passed to the instances of <see cref="ICmdProcessor"/>
-	/// when they are executed. It can also be used for async synchronization
-	/// </summary>
-	public class CommandProcessorContext {
-		public int ExitCode;
-		public Exception Error;
-		public string Reason;
-
-		/// <summary>
-		/// Current logger of the test client
-		/// </summary>
-		public readonly ILogger Log;
-
-		/// <summary>
-		/// Stats logger for the test client
-		/// </summary>
-		public readonly ILogger StatsLogger;
-
-		/// <summary>
-		/// Whether stats should be CSV or Json
-		/// </summary>
-		public bool OutputCsv = false;
-
-		public readonly TcpTestClient _tcpTestClient;
-		public readonly GrpcTestClient _grpcTestClient;
-		public readonly ClientApiTcpTestClient _clientApiTestClient;
-
-		private readonly ManualResetEventSlim _doneEvent;
-		private readonly CancellationToken _cancellationToken;
-		private int _completed;
-		private int _timeout;
-
-		public CommandProcessorContext(TcpTestClient tcpTestClient, GrpcTestClient grpcTestClient,
-			ClientApiTcpTestClient clientApiTestClient, int timeout, ILogger log, ILogger statsLogger, bool outputCsv,
-			ManualResetEventSlim doneEvent, CancellationToken cancellationToken) {
-			
-			_tcpTestClient = tcpTestClient;
-			_grpcTestClient = grpcTestClient;
-			_clientApiTestClient = clientApiTestClient;
-			Log = log;
-			StatsLogger = statsLogger;
-			_doneEvent = doneEvent;
-			_cancellationToken = cancellationToken;
-			_timeout = timeout;
-			OutputCsv = outputCsv;
-		}
-
-		public void Completed(int exitCode = (int)Common.Utils.ExitCode.Success, Exception error = null,
-			string reason = null) {
-			
-			if (Interlocked.CompareExchange(ref _completed, 1, 0) == 0) {
-				ExitCode = exitCode;
-
-				Error = error ?? Error;
-				Reason = reason ?? Reason;
-
-				_doneEvent.Set();
-			}
-		}
-
-		public void Fail(Exception exc = null, string reason = null) {
-			Completed((int)Common.Utils.ExitCode.Error, exc, reason);
-		}
-
-		public void Success() {
-			Completed();
-		}
-
-		public void IsAsync() {
-			_doneEvent.Reset();
-		}
-
-		public void WaitForCompletion() {
-			if (_timeout < 0)
-				_doneEvent.Wait(_cancellationToken);
-			else {
-				if (!_doneEvent.Wait(_timeout * 1000, _cancellationToken))
-					throw new TimeoutException("Command didn't finished within timeout.");
-			}
-		}
-
-		public TimeSpan Time(Action action) {
-			var sw = Stopwatch.StartNew();
-			action();
-			sw.Stop();
-			return sw.Elapsed;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/DeleteProcessor.cs b/src/EventStore.TestClient/Commands/DeleteProcessor.cs
deleted file mode 100644
index a18f6067603..00000000000
--- a/src/EventStore.TestClient/Commands/DeleteProcessor.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System;
-using System.Diagnostics;
-using EventStore.Client.Messages;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Transport.Tcp;
-using OperationResult = EventStore.Client.Messages.OperationResult;
-
-namespace EventStore.TestClient.Commands {
-	internal class DeleteProcessor : ICmdProcessor {
-		public string Usage {
-			get { return "DEL [<stream-id> [<expected-version>]]"; }
-		}
-
-		public string Keyword {
-			get { return "DEL"; }
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			var eventStreamId = "test-stream";
-			var expectedVersion = ExpectedVersion.Any;
-
-			if (args.Length > 0) {
-				if (args.Length > 2)
-					return false;
-				eventStreamId = args[0];
-				if (args.Length == 2)
-					expectedVersion = args[1].Trim().ToUpper() == "ANY" ? ExpectedVersion.Any : int.Parse(args[1]);
-			}
-
-			context.IsAsync();
-			var sw = new Stopwatch();
-			context._tcpTestClient.CreateTcpConnection(
-				context,
-				connectionEstablished: conn => {
-					context.Log.Information(
-						"[{remoteEndPoint}, L{localEndPoint}]: Trying to delete event stream '{stream}'...",
-						conn.RemoteEndPoint, conn.LocalEndPoint, eventStreamId);
-					var corrid = Guid.NewGuid();
-					var deleteDto = new DeleteStream(eventStreamId, expectedVersion, false, true);
-					var package = new TcpPackage(TcpCommand.DeleteStream, corrid, deleteDto.Serialize()).AsByteArray();
-					sw.Start();
-					conn.EnqueueSend(package);
-				},
-				handlePackage: (conn, pkg) => {
-					sw.Stop();
-					context.Log.Information("Delete request took: {elapsed}.", sw.Elapsed);
-
-					if (pkg.Command != TcpCommand.DeleteStreamCompleted) {
-						context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
-						return;
-					}
-
-					var dto = pkg.Data.Deserialize<DeleteStreamCompleted>();
-					if (dto.Result == OperationResult.Success) {
-						context.Log.Information("DELETED event stream {stream}.", eventStreamId);
-						PerfUtils.LogTeamCityGraphData(string.Format("{0}-latency-ms", Keyword),
-							(int)Math.Round(sw.Elapsed.TotalMilliseconds));
-						context.Success();
-					} else {
-						context.Log.Information("DELETION FAILED for event stream {stream}: {message} ({e}).", eventStreamId,
-							dto.Message, dto.Result);
-						context.Fail();
-					}
-
-					conn.Close();
-				},
-				connectionClosed: (connection, error) => context.Fail(reason: "Connection was closed prematurely."));
-
-			context.WaitForCompletion();
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/DvuBasic/BankAccountBasicProducer.cs b/src/EventStore.TestClient/Commands/DvuBasic/BankAccountBasicProducer.cs
deleted file mode 100644
index bb727de72b6..00000000000
--- a/src/EventStore.TestClient/Commands/DvuBasic/BankAccountBasicProducer.cs
+++ /dev/null
@@ -1,226 +0,0 @@
-using System;
-using System.Globalization;
-using System.Text;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Transport.Http.Codecs;
-using ILogger = Serilog.ILogger;
-#pragma warning disable 1591
-
-namespace EventStore.TestClient.Commands.DvuBasic {
-	internal class BankAccountBasicProducer : IBasicProducer {
-		private static readonly ILogger Log = Serilog.Log.ForContext<BankAccountBasicProducer>();
-
-		public string Name {
-			get { return "account"; }
-		}
-
-		public Event Create(int version) {
-			var accountObject = BankAccountEventFactory.CreateAccountObject(version);
-
-			var serializedObject = Codec.Json.To(accountObject);
-			var @event = new Event(Guid.NewGuid(), accountObject.GetType().Name, true,
-				Helper.UTF8NoBom.GetBytes(serializedObject), new byte[0]);
-
-			return @event;
-		}
-
-		public bool Equal(int eventVersion, string eventType, byte[] actualData) {
-			var generated = BankAccountEventFactory.CreateAccountObject(eventVersion);
-			object deserialized;
-
-			bool isEqual;
-			string reason;
-			if (actualData == null) {
-				isEqual = false;
-				reason = "Null received";
-			} else {
-				deserialized = Deserialize(eventType, actualData);
-
-				if (deserialized.GetType() != generated.GetType()) {
-					isEqual = false;
-					reason = string.Format("Type does not match, actual type is {0}", deserialized.GetType().Name);
-				} else {
-					isEqual = generated.Equals(deserialized);
-					reason = "Value differs";
-				}
-			}
-
-			if (!isEqual) {
-				LogExpected(generated, actualData, reason);
-			}
-
-			return isEqual;
-		}
-
-		private object Deserialize(string eventType, byte[] actualData) {
-			object result = null;
-			var strData = Helper.UTF8NoBom.GetString(actualData);
-			if (eventType == typeof(AccountCreated).FullName) {
-				result = Codec.Json.From<AccountCreated>(strData);
-			} else {
-				if (eventType == typeof(AccountCredited).Name) {
-					result = Codec.Json.From<AccountCredited>(strData);
-				} else {
-					if (eventType == typeof(AccountDebited).Name) {
-						result = Codec.Json.From<AccountDebited>(strData);
-					} else {
-						if (eventType == typeof(AccountCheckPoint).Name) {
-							result = Codec.Json.From<AccountCheckPoint>(strData);
-						} else {
-							throw new NotSupportedException(string.Format("Event type {0} is not recognized.",
-								eventType));
-						}
-					}
-				}
-			}
-
-			return result;
-		}
-
-		private static void LogExpected(object generated, object actual, string reason) {
-			Log.Information("Expected: {expected}\n" +
-			         "  Actual: {actual}\n" +
-			         " Details: {reason}",
-				generated.ToString(),
-				(actual == null ? "<null>" : actual.ToString()),
-				reason
-			);
-		}
-	}
-
-	public class AccountCreated {
-		public readonly string AccountNumber;
-
-		public AccountCreated(string accountNumber) {
-			AccountNumber = accountNumber;
-		}
-
-		public override bool Equals(object obj) {
-			if (obj == null)
-				return false;
-
-			if (obj.GetType() != GetType())
-				return false;
-
-			var casted = (AccountCreated)obj;
-			return Equals(casted);
-		}
-
-		protected bool Equals(AccountCreated other) {
-			return string.Equals(AccountNumber, other.AccountNumber);
-		}
-
-		public override int GetHashCode() {
-			return (AccountNumber != null ? AccountNumber.GetHashCode() : 0);
-		}
-
-		public override string ToString() {
-			return string.Format("Type: {0}; AccountNumber: {1}", GetType().Name, AccountNumber);
-		}
-	}
-
-	public class AccountCredited {
-		public readonly decimal CreditedAmount;
-		public readonly string Kind;
-
-		public AccountCredited(decimal creditedAmount, int kind) {
-			CreditedAmount = creditedAmount;
-			Kind = kind.ToString(CultureInfo.InvariantCulture);
-		}
-
-		public override bool Equals(object obj) {
-			if (obj == null)
-				return false;
-
-			if (obj.GetType() != GetType())
-				return false;
-
-			var casted = (AccountCredited)obj;
-			return Equals(casted);
-		}
-
-		protected bool Equals(AccountCredited other) {
-			return CreditedAmount == other.CreditedAmount;
-		}
-
-		public override int GetHashCode() {
-			return CreditedAmount.GetHashCode();
-		}
-
-		public override string ToString() {
-			return string.Format("Type: {0}; CreditedAmount: {1}", GetType().Name, CreditedAmount);
-		}
-	}
-
-	public class AccountDebited {
-		public readonly decimal DebitedAmount;
-		public readonly string Kind;
-
-		public AccountDebited(decimal debitedAmount, int kind) {
-			DebitedAmount = debitedAmount;
-			Kind = kind.ToString(CultureInfo.InvariantCulture);
-		}
-
-		public override bool Equals(object obj) {
-			if (obj == null)
-				return false;
-
-			if (obj.GetType() != GetType())
-				return false;
-
-			var casted = (AccountDebited)obj;
-			return Equals(casted);
-		}
-
-		protected bool Equals(AccountDebited other) {
-			return DebitedAmount == other.DebitedAmount;
-		}
-
-		public override int GetHashCode() {
-			return DebitedAmount.GetHashCode();
-		}
-
-		public override string ToString() {
-			return string.Format("Type: {0}; DebitedAmount: {1}", GetType().Name, DebitedAmount);
-		}
-	}
-
-	public class AccountCheckPoint {
-		public readonly decimal CreditedAmount;
-		public readonly decimal DebitedAmount;
-
-		public AccountCheckPoint(decimal creditedAmount, decimal debitedAmount) {
-			CreditedAmount = creditedAmount;
-			DebitedAmount = debitedAmount;
-		}
-
-		public override bool Equals(object obj) {
-			if (obj == null)
-				return false;
-
-			if (obj.GetType() != GetType())
-				return false;
-
-			var casted = (AccountCheckPoint)obj;
-			return Equals(casted);
-		}
-
-		protected bool Equals(AccountCheckPoint other) {
-			return CreditedAmount == other.CreditedAmount && DebitedAmount == other.DebitedAmount;
-		}
-
-		public override int GetHashCode() {
-			unchecked {
-				return (CreditedAmount.GetHashCode() * 397) ^ DebitedAmount.GetHashCode();
-			}
-		}
-
-		public override string ToString() {
-			return string.Format("Type: {0}; CreditedAmount: {1}, DebitedAmount: {2}",
-				GetType().Name,
-				CreditedAmount,
-				DebitedAmount);
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/DvuBasic/BankAccountEventFactory.cs b/src/EventStore.TestClient/Commands/DvuBasic/BankAccountEventFactory.cs
deleted file mode 100644
index a909ea6f635..00000000000
--- a/src/EventStore.TestClient/Commands/DvuBasic/BankAccountEventFactory.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-namespace EventStore.TestClient.Commands.DvuBasic {
-	internal static class BankAccountEventFactory {
-		public static object CreateAccountObject(int version) {
-			object accountObject = null;
-
-			var internalCounter = version + 1;
-
-			{
-				const int checkpointVersion = 10;
-
-				var checkPointModVersion = internalCounter % checkpointVersion;
-				if (checkPointModVersion == 0) {
-					int otherCheckPointsCount = internalCounter / checkpointVersion;
-
-					var elementsCount = internalCounter / 2;
-
-					var creditedSum = ComputeSum(20, elementsCount, 20) - ComputeSum(100, otherCheckPointsCount, 100);
-					var debitedSum = ComputeSum(10, elementsCount, 20);
-
-					var checkpoint = new AccountCheckPoint(creditedSum, debitedSum);
-
-					accountObject = checkpoint;
-				} else {
-					var modVersion = internalCounter % 2;
-					if (modVersion == 0) {
-						var credited = new AccountCredited(internalCounter * 10, internalCounter % 17);
-						accountObject = credited;
-					} else {
-						var debited = new AccountDebited(internalCounter * 10, internalCounter % 17);
-						accountObject = debited;
-					}
-				}
-			}
-			return accountObject;
-		}
-
-		private static int ComputeSum(int first, int count, int step) {
-			var sum = count * (2 * first + step * (count - 1)) / 2;
-			return sum;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/DvuBasic/DvuBasicProcessor.cs b/src/EventStore.TestClient/Commands/DvuBasic/DvuBasicProcessor.cs
deleted file mode 100644
index 9edee9f25e9..00000000000
--- a/src/EventStore.TestClient/Commands/DvuBasic/DvuBasicProcessor.cs
+++ /dev/null
@@ -1,413 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Sockets;
-using System.Threading;
-using EventStore.Client.Messages;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.Transport.Tcp;
-using OperationResult = EventStore.Client.Messages.OperationResult;
-
-namespace EventStore.TestClient.Commands.DvuBasic {
-	internal class DvuBasicProcessor : ICmdProcessor {
-		public string Keyword {
-			get { return "verify"; }
-		}
-
-		public string Usage {
-			get {
-				return string.Format("{0} " +
-				                     "<writers, default = 20> " +
-				                     "<readers, default = 30> " +
-				                     "<events, default = 1000000> " +
-				                     "<streams per plugin, default = 1000> " +
-				                     "<producers, default = [bank], available = [{1}]>",
-					Keyword,
-					string.Join(",", AvailableProducers));
-			}
-		}
-
-		public IEnumerable<string> AvailableProducers {
-			get { yield return "bank"; }
-		}
-
-		public IBasicProducer[] Producers { get; set; }
-
-		private int _writers;
-		private string[] _streams;
-		private int[] _heads;
-
-		private volatile bool _stopReading;
-		private readonly object _factoryLock = new object();
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			var writers = 20;
-			var readers = 30;
-			var events = 1000000;
-			var streams = 1000;
-			var producers = new[] {"bank"};
-
-			if (args.Length != 0 && args.Length != 5) {
-				context.Log.Error("Invalid number of arguments. Should be 0 or 5");
-				return false;
-			}
-
-			if (args.Length > 0) {
-				int writersArg;
-				int readersArg;
-				int eventsArg;
-				int streamsArg;
-
-				if (!int.TryParse(args[0], out writersArg)) {
-					context.Log.Error("Invalid argument value for <writers>");
-					return false;
-				}
-
-				if (!int.TryParse(args[1], out readersArg)) {
-					context.Log.Error("Invalid argument value for <readers>");
-					return false;
-				}
-
-				if (!int.TryParse(args[2], out eventsArg)) {
-					context.Log.Error("Invalid argument value for <events>");
-					return false;
-				}
-
-				if (!int.TryParse(args[3], out streamsArg)) {
-					context.Log.Error("Invalid argument value for <streams>");
-					return false;
-				}
-
-				string[] producersArg = args[4].Split(new[] {","}, StringSplitOptions.RemoveEmptyEntries)
-					.Select(p => p.Trim().ToLower()).Distinct().ToArray();
-				if (producersArg.Length <= 0) {
-					context.Log.Error("Invalid argument value for <plugins>");
-					return false;
-				}
-
-				if (producersArg.Any(p => !AvailableProducers.Contains(p))) {
-					context.Log.Error("Invalid producers argument. Pass comma-separated subset of [{producers}]",
-						string.Join(",", AvailableProducers));
-					return false;
-				}
-
-				writers = writersArg;
-				readers = readersArg;
-				events = eventsArg;
-				streams = streamsArg;
-				producers = producersArg;
-			}
-
-			_writers = writers;
-			return InitProducers(producers) && Run(context, writers, readers, events, streams);
-		}
-
-		private bool InitProducers(string[] producers) {
-			if (producers.Length == 1 && producers[0] == "bank") {
-				Producers = new IBasicProducer[] {new BankAccountBasicProducer()};
-				return true;
-			}
-
-			return false;
-		}
-
-		private bool Run(CommandProcessorContext context, int writers, int readers, int events, int streams) {
-			context.IsAsync();
-
-			_streams = new string[streams * Producers.Length];
-			for (var i = 0; i < Producers.Length; i++) {
-				for (var j = i * streams; j < streams * (i + 1); j++) {
-					_streams[j] = StreamNamesGenerator.GenerateName(Producers[i].Name, j - i * streams);
-				}
-			}
-
-			_heads = Enumerable.Repeat(-1, streams * Producers.Length).ToArray();
-
-			return Verify(context, writers, readers, events);
-		}
-
-		private bool Verify(CommandProcessorContext context, int writers, int readers, int events) {
-			var readStatuses = Enumerable.Range(0, readers).Select(x => new Status(context.Log)).ToArray();
-			var readNotifications = Enumerable.Range(0, readers).Select(x => new ManualResetEventSlim(false)).ToArray();
-			var writeStatuses = Enumerable.Range(0, writers).Select(x => new Status(context.Log)).ToArray();
-			var writeNotifications =
-				Enumerable.Range(0, writers).Select(x => new ManualResetEventSlim(false)).ToArray();
-
-			for (int i = 0; i < readers; i++) {
-				var i1 = i;
-				var thread = new Thread(() => Read(readStatuses[i1], i1, context, readNotifications[i1]));
-				thread.IsBackground = true;
-				thread.Start();
-			}
-
-			for (int i = 0; i < writers; i++) {
-				var i1 = i;
-				var thread = new Thread(() =>
-					Write(writeStatuses[i1], i1, context, events / writers, writeNotifications[i1]));
-				thread.IsBackground = true;
-				thread.Start();
-			}
-
-			foreach (var writeNotification in writeNotifications) {
-				writeNotification.Wait();
-			}
-
-			_stopReading = true;
-			foreach (var readNotification in readNotifications) {
-				readNotification.Wait();
-			}
-
-			context.Log.Information("dvub finished execution : ");
-
-			var writersTable = new ConsoleTable("WRITER ID", "Status");
-
-			foreach (var ws in writeStatuses) {
-				writersTable.AppendRow(ws.ThreadId.ToString(), ws.Success ? "Success" : "Fail");
-			}
-
-			var readersTable = new ConsoleTable("READER ID", "Status");
-			foreach (var rs in readStatuses) {
-				readersTable.AppendRow(rs.ThreadId.ToString(), rs.Success ? "Success" : "Fail");
-			}
-
-			context.Log.Information(writersTable.CreateIndentedTable());
-			context.Log.Information(readersTable.CreateIndentedTable());
-
-			var success = writeStatuses.All(s => s.Success) && readStatuses.All(s => s.Success);
-			if (success)
-				context.Success();
-			else
-				context.Fail();
-			return success;
-		}
-
-		private void Write(Status status, int writerIdx, CommandProcessorContext context, int requests,
-			ManualResetEventSlim finish) {
-			TcpTypedConnection<byte[]> connection;
-			var iteration = new AutoResetEvent(false);
-
-			var sent = 0;
-
-			var prepareTimeouts = 0;
-			var commitTimeouts = 0;
-			var forwardTimeouts = 0;
-			var wrongExpectedVersion = 0;
-			var streamsDeleted = 0;
-
-			var failed = 0;
-
-			var rnd = new Random(writerIdx);
-
-			var streamIdx = -1;
-			var head = -1;
-
-			Action<TcpTypedConnection<byte[]>, TcpPackage> packageHandler = (conn, pkg) => {
-				var dto = pkg.Data.Deserialize<WriteEventsCompleted>();
-				switch (dto.Result) {
-					case OperationResult.Success:
-						lock (_heads) {
-							var currentHead = _heads[streamIdx];
-							Ensure.Equal(currentHead, head, "currentHead");
-							_heads[streamIdx]++;
-						}
-
-						break;
-					case OperationResult.PrepareTimeout:
-						prepareTimeouts++;
-						failed++;
-						break;
-					case OperationResult.CommitTimeout:
-						commitTimeouts++;
-						failed++;
-						break;
-					case OperationResult.ForwardTimeout:
-						forwardTimeouts++;
-						failed++;
-						break;
-					case OperationResult.WrongExpectedVersion:
-						wrongExpectedVersion++;
-						failed++;
-						break;
-					case OperationResult.StreamDeleted:
-						streamsDeleted++;
-						failed++;
-						break;
-					default:
-						throw new ArgumentOutOfRangeException();
-				}
-
-				sent++;
-				if (sent % 1000 == 0)
-					status.ReportWritesProgress(writerIdx, sent, prepareTimeouts, commitTimeouts, forwardTimeouts,
-						wrongExpectedVersion, streamsDeleted, failed, requests);
-				iteration.Set();
-			};
-
-			Action<TcpTypedConnection<byte[]>> established = _ => { };
-			Action<TcpTypedConnection<byte[]>, SocketError> closed = null;
-			closed = (_, __) => {
-				if (!context._tcpTestClient.Options.Reconnect) return;
-				Thread.Sleep(TimeSpan.FromSeconds(1));
-				connection =
-					context._tcpTestClient.CreateTcpConnection(context, packageHandler, cn => iteration.Set(), closed, false);
-			};
-
-			connection = context._tcpTestClient.CreateTcpConnection(context, packageHandler, established, closed, false);
-
-			for (var i = 0; i < requests; ++i) {
-				streamIdx = NextStreamForWriting(rnd, writerIdx);
-				lock (_heads) {
-					head = _heads[streamIdx];
-				}
-
-				var evnt = CreateEvent(_streams[streamIdx], head + 1);
-				var write = new WriteEvents(
-					_streams[streamIdx],
-					head,
-					new[] {
-						new NewEvent(evnt.EventId.ToByteArray(), evnt.EventType,
-							evnt.IsJson ? 1 : 0, 0, evnt.Data, evnt.Metadata)
-					},
-					false);
-
-				var package = new TcpPackage(TcpCommand.WriteEvents, Guid.NewGuid(), write.Serialize());
-				connection.EnqueueSend(package.AsByteArray());
-				iteration.WaitOne();
-			}
-
-			status.ReportWritesProgress(writerIdx, sent, prepareTimeouts, commitTimeouts, forwardTimeouts,
-				wrongExpectedVersion, streamsDeleted, failed, requests);
-			status.FinilizeStatus(writerIdx, failed != sent);
-			context._tcpTestClient.Options.Reconnect = false;
-			connection.Close();
-			finish.Set();
-		}
-
-		private void Read(Status status, int readerIdx, CommandProcessorContext context,
-			ManualResetEventSlim finishedEvent) {
-			TcpTypedConnection<byte[]> connection;
-			var iteration = new AutoResetEvent(false);
-
-			var successes = 0;
-			var fails = 0;
-
-			var rnd = new Random(readerIdx);
-
-			var streamIdx = -1;
-			var eventidx = -1;
-
-			Action<TcpTypedConnection<byte[]>, TcpPackage> packageReceived = (conn, pkg) => {
-				var dto = pkg.Data.Deserialize<ReadEventCompleted>();
-				switch (dto.Result) {
-					case ReadEventCompleted.Types.ReadEventResult.Success:
-						if (Equal(_streams[streamIdx], eventidx, dto.Event.Event.EventType, dto.Event.Event.Data.ToByteArray())) {
-							successes++;
-							if (successes % 1000 == 0)
-								status.ReportReadsProgress(readerIdx, successes, fails);
-						} else {
-							fails++;
-							status.ReportReadError(readerIdx, _streams[streamIdx], eventidx);
-						}
-
-						break;
-					case ReadEventCompleted.Types.ReadEventResult.NotFound:
-					case ReadEventCompleted.Types.ReadEventResult.NoStream:
-					case ReadEventCompleted.Types.ReadEventResult.StreamDeleted:
-					case ReadEventCompleted.Types.ReadEventResult.Error:
-					case ReadEventCompleted.Types.ReadEventResult.AccessDenied:
-						fails++;
-						status.ReportNotFoundOnRead(readerIdx, _streams[streamIdx], eventidx);
-						break;
-					default:
-						throw new ArgumentOutOfRangeException();
-				}
-
-				iteration.Set();
-			};
-			Action<TcpTypedConnection<byte[]>> established = _ => { };
-			Action<TcpTypedConnection<byte[]>, SocketError> closed = null;
-			closed = (_, __) => {
-				if (!context._tcpTestClient.Options.Reconnect) return;
-				Thread.Sleep(TimeSpan.FromSeconds(1));
-				connection =
-					context._tcpTestClient.CreateTcpConnection(context, packageReceived, cn => iteration.Set(), closed, false);
-			};
-
-			connection = context._tcpTestClient.CreateTcpConnection(context, packageReceived, established, closed, false);
-
-			while (!_stopReading) {
-				streamIdx = NextStreamForReading(rnd, readerIdx);
-				int head;
-				lock (_heads)
-					head = _heads[streamIdx];
-
-				if (head > 0) {
-					eventidx = NextRandomEventVersion(rnd, head);
-					var stream = _streams[streamIdx];
-					var corrid = Guid.NewGuid();
-					var read = new ReadEvent(stream, eventidx, resolveLinkTos: false,
-						requireLeader: false);
-					var package = new TcpPackage(TcpCommand.ReadEvent, corrid, read.Serialize());
-
-					connection.EnqueueSend(package.AsByteArray());
-					iteration.WaitOne();
-				} else
-					Thread.Sleep(100);
-			}
-
-			status.ReportReadsProgress(readerIdx, successes, fails);
-			status.FinilizeStatus(readerIdx, fails == 0);
-			context._tcpTestClient.Options.Reconnect = false;
-			connection.Close();
-			finishedEvent.Set();
-		}
-
-		private int NextStreamForWriting(Random rnd, int writerIdx) {
-			if (_writers >= _streams.Length) {
-				if (_writers > _streams.Length)
-					return writerIdx % _streams.Length;
-
-				return writerIdx;
-			}
-
-			return rnd.Next(_streams.Length);
-		}
-
-		private int NextStreamForReading(Random rnd, int readerIdx) {
-			return rnd.Next(_streams.Length);
-		}
-
-		private int NextRandomEventVersion(Random rnd, int head) {
-			return head % 2 == 0 ? head : rnd.Next(1, head);
-		}
-
-		private IBasicProducer CorrespondingProducer(string stream) {
-			return Producers.Single(f => string.Equals(f.Name, stream, StringComparison.OrdinalIgnoreCase));
-		}
-
-		private Event CreateEvent(string stream, int version) {
-			var originalName = StreamNamesGenerator.GetOriginalName(stream);
-			var factory = CorrespondingProducer(originalName);
-
-			Event generated;
-			lock (_factoryLock)
-				generated = factory.Create(version);
-
-			return generated;
-		}
-
-		private bool Equal(string stream, int expectedIdx, string eventType, byte[] actual) {
-			var originalName = StreamNamesGenerator.GetOriginalName(stream);
-			var producer = CorrespondingProducer(originalName);
-
-			bool equal;
-			lock (_factoryLock)
-				equal = producer.Equal(expectedIdx, eventType, actual);
-
-			return equal;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/DvuBasic/IBasicProducer.cs b/src/EventStore.TestClient/Commands/DvuBasic/IBasicProducer.cs
deleted file mode 100644
index 2673c67a9b1..00000000000
--- a/src/EventStore.TestClient/Commands/DvuBasic/IBasicProducer.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using EventStore.Core.Data;
-#pragma warning disable 1591
-
-namespace EventStore.TestClient.Commands.DvuBasic {
-	public interface IBasicProducer {
-		string Name { get; }
-
-		Event Create(int version);
-		bool Equal(int eventVersion, string eventType, byte[] actualData);
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/DvuBasic/Status.cs b/src/EventStore.TestClient/Commands/DvuBasic/Status.cs
deleted file mode 100644
index 81102da1127..00000000000
--- a/src/EventStore.TestClient/Commands/DvuBasic/Status.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using EventStore.Common.Utils;
-using ILogger = Serilog.ILogger;
-#pragma warning disable 1591
-
-namespace EventStore.TestClient.Commands.DvuBasic {
-	public class Status {
-		private readonly Serilog.ILogger _log;
-
-		public int ThreadId { get; private set; }
-		public bool Success { get; private set; }
-
-		public Status(ILogger log) {
-			Ensure.NotNull(log, "log");
-			_log = log;
-		}
-
-		public void ReportWritesProgress(int threadId,
-			int sent,
-			int prepareTimeouts,
-			int commitTimeouts,
-			int forwardTimeouts,
-			int wrongExpctdVersions,
-			int streamsDeleted,
-			int fails,
-			int requests) {
-			var sentP = ToPercent(sent, requests);
-			var failsP = ToPercent(fails, sent);
-
-			var table = new ConsoleTable("WRITER ID", "Completed %", "Completed/Total",
-				"Failed %", "Failed/Sent", "Prepare Timeouts",
-				"Commit Timeouts", "Forward Timeouts",
-				"Wrong Versions", "Stream Deleted");
-			table.AppendRow(threadId.ToString(), string.Format("{0:0.0}%", sentP),
-				string.Format("{0}/{1}", sent, requests),
-				string.Format("{0:0.0}%", failsP), string.Format("{0}/{1}", fails, sent), prepareTimeouts.ToString(),
-				commitTimeouts.ToString(), forwardTimeouts.ToString(),
-				wrongExpctdVersions.ToString(), streamsDeleted.ToString());
-
-			if (failsP > 50d)
-				_log.Fatal(table.CreateIndentedTable());
-			else
-				_log.Information(table.CreateIndentedTable());
-		}
-
-		public void ReportReadsProgress(int threadId, int successes, int fails) {
-			var all = successes + fails;
-
-			var table = new ConsoleTable("READER ID", "Fails", "Total Random Reads");
-			table.AppendRow(threadId.ToString(), fails.ToString(), all.ToString());
-
-			if (fails != 0)
-				_log.Fatal(table.CreateIndentedTable());
-			else
-				_log.Information(table.CreateIndentedTable());
-		}
-
-		public void ReportReadError(int threadId, string stream, int indx) {
-			_log.Fatal("FATAL : READER [{threadId}] encountered an error in {stream} ({index})", threadId, stream,
-				indx);
-		}
-
-		public void ReportNotFoundOnRead(int threadId, string stream, int indx) {
-			_log.Fatal(
-				"FATAL : READER [{threadId}] asked for event {index} in '{stream}' but server returned 'Not Found'",
-				threadId,
-				indx, stream);
-		}
-
-		public void FinilizeStatus(int threadId, bool success) {
-			ThreadId = threadId;
-			Success = success;
-		}
-
-		private double ToPercent(int value, int max) {
-			var approx = (value / (double)max) * 100d;
-			return approx <= 100d ? approx : 100;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/DvuBasic/StreamNamesGenerator.cs b/src/EventStore.TestClient/Commands/DvuBasic/StreamNamesGenerator.cs
deleted file mode 100644
index 9ed9a7f8407..00000000000
--- a/src/EventStore.TestClient/Commands/DvuBasic/StreamNamesGenerator.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-
-namespace EventStore.TestClient.Commands.DvuBasic {
-	internal static class StreamNamesGenerator {
-		public static string GenerateName(string original, int index) {
-			return string.Format("{0}-{1}", original, index);
-		}
-
-		public static string GetOriginalName(string autogenerated) {
-			return autogenerated.Substring(0, autogenerated.LastIndexOf('-'));
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/ExitProcessor.cs b/src/EventStore.TestClient/Commands/ExitProcessor.cs
deleted file mode 100644
index 0a75ffa5047..00000000000
--- a/src/EventStore.TestClient/Commands/ExitProcessor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Threading;
-using EventStore.Common.Utils;
-
-namespace EventStore.TestClient.Commands {
-	internal class ExitProcessor : ICmdProcessor {
-		private readonly CancellationTokenSource _cancellationTokenSource;
-
-		public ExitProcessor(CancellationTokenSource cancellationTokenSource) {
-			_cancellationTokenSource = cancellationTokenSource;
-		}
-
-		public string Usage {
-			get { return Keyword; }
-		}
-
-		public string Keyword {
-			get { return "EXIT"; }
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			context.Log.Information("Exiting...");
-			_cancellationTokenSource.Cancel();
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/MultiWriteFloodWaiting.cs b/src/EventStore.TestClient/Commands/MultiWriteFloodWaiting.cs
deleted file mode 100644
index 6e00dae40e5..00000000000
--- a/src/EventStore.TestClient/Commands/MultiWriteFloodWaiting.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using EventStore.Client.Messages;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.Transport.Tcp;
-using OperationResult = EventStore.Client.Messages.OperationResult;
-
-namespace EventStore.TestClient.Commands {
-	internal class MultiWriteFloodWaitingProcessor : ICmdProcessor {
-		public string Usage {
-			get { return "MWRFLW [<events-count> [<clients> <requests>]]"; }
-		}
-
-		public string Keyword {
-			get { return "MWRFLW"; }
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			int clientsCnt = 1;
-			long requestsCnt = 5000;
-			var writeCount = 10;
-
-			if (args.Length > 0) {
-				if (args.Length != 1 && args.Length != 3)
-					return false;
-				try {
-					writeCount = MetricPrefixValue.ParseInt(args[0]);
-					if (args.Length > 1) {
-						clientsCnt = MetricPrefixValue.ParseInt(args[1]);
-						requestsCnt = MetricPrefixValue.ParseLong(args[2]);
-					}
-				} catch {
-					return false;
-				}
-			}
-
-			WriteFlood(context, writeCount, clientsCnt, requestsCnt);
-			return true;
-		}
-
-		private void WriteFlood(CommandProcessorContext context, int writeCnt, int clientsCnt, long requestsCnt) {
-			const string data = "test-data";
-
-			context.IsAsync();
-
-			var clients = new List<TcpTypedConnection<byte[]>>();
-			var threads = new List<Thread>();
-			var doneEvent = new ManualResetEventSlim(false);
-			long succ = 0;
-			long fail = 0;
-			long all = 0;
-
-			for (int i = 0; i < clientsCnt; i++) {
-				var count = requestsCnt / clientsCnt + ((i == clientsCnt - 1) ? requestsCnt % clientsCnt : 0);
-				var localDoneEvent = new AutoResetEvent(false);
-				var eventStreamId = "es" + Guid.NewGuid();
-				var client = context._tcpTestClient.CreateTcpConnection(
-					context,
-					(conn, pkg) => {
-						if (pkg.Command != TcpCommand.WriteEventsCompleted) {
-							context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
-							return;
-						}
-
-						var dto = pkg.Data.Deserialize<WriteEventsCompleted>();
-						if (dto.Result == OperationResult.Success) {
-							if (Interlocked.Increment(ref succ) % 1000 == 0) Console.Write(".");
-						} else {
-							if (Interlocked.Increment(ref fail) % 1000 == 0) Console.Write("#");
-						}
-
-						if (Interlocked.Increment(ref all) == requestsCnt) {
-							context.Success();
-							doneEvent.Set();
-						}
-
-						localDoneEvent.Set();
-					},
-					connectionClosed: (conn, err) => context.Fail(reason: "Connection was closed prematurely."));
-				clients.Add(client);
-
-				threads.Add(new Thread(() => {
-					for (int j = 0; j < count; ++j) {
-						var writeDto = new WriteEvents(
-							eventStreamId,
-							ExpectedVersion.Any,
-							Enumerable.Range(0, writeCnt).Select(x =>
-								new NewEvent(Guid.NewGuid().ToByteArray(),
-									"type",
-									0, 0,
-									Common.Utils.Helper.UTF8NoBom.GetBytes(data),
-									new byte[0])).ToArray(),
-							false);
-						var package = new TcpPackage(TcpCommand.WriteEvents, Guid.NewGuid(), writeDto.Serialize());
-						client.EnqueueSend(package.AsByteArray());
-						localDoneEvent.WaitOne();
-					}
-				}) {IsBackground = true});
-			}
-
-			var sw = Stopwatch.StartNew();
-			threads.ForEach(thread => thread.Start());
-			doneEvent.Wait();
-			sw.Stop();
-			clients.ForEach(client => client.Close());
-
-			var reqPerSec = (all + 0.0) / sw.ElapsedMilliseconds * 1000;
-			context.Log.Information("Completed. Successes: {success}, failures: {failures}", succ, fail);
-			context.Log.Information("{requests} requests completed in {elapsed}ms ({rate:0.00} reqs per sec).", all,
-				sw.ElapsedMilliseconds, reqPerSec);
-
-			PerfUtils.LogData(Keyword,
-				PerfUtils.Row(PerfUtils.Col("clientsCnt", clientsCnt),
-					PerfUtils.Col("requestsCnt", requestsCnt),
-					PerfUtils.Col("ElapsedMilliseconds", sw.ElapsedMilliseconds)),
-				PerfUtils.Row(PerfUtils.Col("successes", succ), PerfUtils.Col("failures", fail)));
-			PerfUtils.LogTeamCityGraphData(string.Format("{0}-{1}-{2}-reqPerSec", Keyword, clientsCnt, requestsCnt),
-				(int)reqPerSec);
-			PerfUtils.LogTeamCityGraphData(
-				string.Format("{0}-{1}-{2}-failureSuccessRate", Keyword, clientsCnt, requestsCnt),
-				(int)(100.0 * fail / (fail + succ)));
-			PerfUtils.LogTeamCityGraphData(string.Format("{0}-latency-ms", Keyword),
-				(int)Math.Round(sw.Elapsed.TotalMilliseconds / requestsCnt));
-
-			if (succ != requestsCnt)
-				context.Fail(reason: "There were errors or not all requests completed.");
-			else
-				context.Success();
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/MultiWriteProcessor.cs b/src/EventStore.TestClient/Commands/MultiWriteProcessor.cs
deleted file mode 100644
index 83c6addceac..00000000000
--- a/src/EventStore.TestClient/Commands/MultiWriteProcessor.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
-using EventStore.Client.Messages;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Transport.Tcp;
-
-namespace EventStore.TestClient.Commands {
-	internal class MultiWriteProcessor : ICmdProcessor {
-		public string Usage {
-			get { return "MWR [<write-count=10> [<stream=test-stream> [<expected-version=ANY>]]"; }
-		}
-		
-		public string Keyword {
-			get { return "MWR"; }
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			const string data = "test-data";
-			var eventStreamId = "test-stream";
-			var writeCount = 10;
-			var expectedVersion = ExpectedVersion.Any;
-
-			if (args.Length > 0) {
-				if (args.Length > 3)
-					return false;
-				writeCount = MetricPrefixValue.ParseInt(args[0]);
-				if (args.Length >= 2)
-					eventStreamId = args[1];
-				if (args.Length >= 3)
-					expectedVersion = args[2].Trim().ToUpper() == "ANY"
-						? ExpectedVersion.Any
-						: int.Parse(args[2].Trim());
-			}
-
-			context.IsAsync();
-			var sw = new Stopwatch();
-			context._tcpTestClient.CreateTcpConnection(
-				context,
-				connectionEstablished: conn => {
-					context.Log.Information("[{remoteEndPoint}, L{localEndPoint}]: Writing...", conn.RemoteEndPoint,
-						conn.LocalEndPoint);
-					var writeDto = new WriteEvents(
-						eventStreamId,
-						expectedVersion,
-						Enumerable.Range(0, writeCount).Select(x => new NewEvent(
-							Guid.NewGuid().ToByteArray(),
-							"type",
-							0, 0,
-							Helper.UTF8NoBom.GetBytes(data),
-							new byte[0])).ToArray(),
-						false);
-					var package = new TcpPackage(TcpCommand.WriteEvents, Guid.NewGuid(), writeDto.Serialize())
-						.AsByteArray();
-					sw.Start();
-					conn.EnqueueSend(package);
-				},
-				handlePackage: (conn, pkg) => {
-					sw.Stop();
-					context.Log.Information("Write request took: {elapsed}.", sw.Elapsed);
-
-					if (pkg.Command != TcpCommand.WriteEventsCompleted) {
-						context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
-						return;
-					}
-
-					var dto = pkg.Data.Deserialize<WriteEventsCompleted>();
-					if (dto.Result == EventStore.Client.Messages.OperationResult.Success) {
-						context.Log.Information("Successfully written {writeCount} events.", writeCount);
-						PerfUtils.LogTeamCityGraphData(string.Format("{0}-latency-ms", Keyword),
-							(int)Math.Round(sw.Elapsed.TotalMilliseconds));
-						context.Success();
-					} else {
-						context.Log.Information("Error while writing: {e}.", dto.Result);
-						context.Fail();
-					}
-
-					conn.Close();
-				},
-				connectionClosed: (connection, error) => context.Fail(reason: "Connection was closed prematurely."));
-
-			context.WaitForCompletion();
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/PingFloodProcessor.cs b/src/EventStore.TestClient/Commands/PingFloodProcessor.cs
deleted file mode 100644
index 569d1311879..00000000000
--- a/src/EventStore.TestClient/Commands/PingFloodProcessor.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.Transport.Tcp;
-
-namespace EventStore.TestClient.Commands {
-	internal class PingFloodProcessor : ICmdProcessor {
-		private static readonly byte[] Payload = new byte[0];
-
-		public string Usage {
-			get { return "PINGFL [<clients> <messages>]"; }
-		}
-		
-		public string Keyword {
-			get { return "PINGFL"; }
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			int clientsCnt = 1;
-			long requestsCnt = 1000000;
-			if (args.Length > 0) {
-				if (args.Length != 2)
-					return false;
-				try {
-					clientsCnt = MetricPrefixValue.ParseInt(args[0]);
-					requestsCnt = MetricPrefixValue.ParseLong(args[1]);
-				} catch {
-					return false;
-				}
-			}
-
-			PingFlood(context, clientsCnt, requestsCnt);
-			return true;
-		}
-
-		private void PingFlood(CommandProcessorContext context, int clientsCnt, long requestsCnt) {
-			context.IsAsync();
-
-			var doneEvent = new ManualResetEventSlim(false);
-			var clients = new List<TcpTypedConnection<byte[]>>();
-			var threads = new List<Thread>();
-			long all = 0;
-
-			for (int i = 0; i < clientsCnt; i++) {
-				var count = requestsCnt / clientsCnt + ((i == clientsCnt - 1) ? requestsCnt % clientsCnt : 0);
-				long received = 0;
-				long sent = 0;
-				var client = context._tcpTestClient.CreateTcpConnection(
-					context,
-					(conn, msg) => {
-						Interlocked.Increment(ref received);
-						var pongs = Interlocked.Increment(ref all);
-						if (pongs % 10000 == 0) Console.Write('.');
-						if (pongs == requestsCnt) {
-							context.Success();
-							doneEvent.Set();
-						}
-					},
-					connectionClosed: (conn, err) => context.Fail(reason: "Connection was closed prematurely."));
-				clients.Add(client);
-
-				threads.Add(new Thread(() => {
-					for (int j = 0; j < count; ++j) {
-						var package = new TcpPackage(TcpCommand.Ping, Guid.NewGuid(), Payload);
-						client.EnqueueSend(package.AsByteArray());
-
-						var localSent = Interlocked.Increment(ref sent);
-						while (localSent - Interlocked.Read(ref received) >
-						       context._tcpTestClient.Options.PingWindow / clientsCnt) {
-							Thread.Sleep(1);
-						}
-					}
-				}) {IsBackground = true});
-			}
-
-			var sw = Stopwatch.StartNew();
-			threads.ForEach(thread => thread.Start());
-			doneEvent.Wait();
-			sw.Stop();
-			clients.ForEach(client => client.Close());
-
-			var reqPerSec = (all + 0.0) / sw.ElapsedMilliseconds * 1000;
-			context.Log.Information("{requests} requests completed in {elapsed}ms ({rate:0.00} reqs per sec).", all,
-				sw.ElapsedMilliseconds, reqPerSec);
-			PerfUtils.LogData(Keyword,
-				PerfUtils.Row(PerfUtils.Col("clientsCnt", clientsCnt),
-					PerfUtils.Col("requestsCnt", requestsCnt),
-					PerfUtils.Col("ElapsedMilliseconds", sw.ElapsedMilliseconds)));
-			PerfUtils.LogTeamCityGraphData(string.Format("{0}-{1}-{2}-reqPerSec", Keyword, clientsCnt, requestsCnt),
-				(int)reqPerSec);
-
-			if (Interlocked.Read(ref all) == requestsCnt)
-				context.Success();
-			else
-				context.Fail();
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/PingFloodWaitingProcessor.cs b/src/EventStore.TestClient/Commands/PingFloodWaitingProcessor.cs
deleted file mode 100644
index bdcdf9a731f..00000000000
--- a/src/EventStore.TestClient/Commands/PingFloodWaitingProcessor.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.Transport.Tcp;
-
-namespace EventStore.TestClient.Commands {
-	internal class PingFloodWaitingProcessor : ICmdProcessor {
-		public string Usage {
-			get { return "PINGFLW [<clients> <messages>]"; }
-		}
-
-		public string Keyword {
-			get { return "PINGFLW"; }
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			int clientsCnt = 1;
-			long requestsCnt = 100000;
-			if (args.Length > 0) {
-				if (args.Length != 2)
-					return false;
-				try {
-					clientsCnt = MetricPrefixValue.ParseInt(args[0]);
-					requestsCnt = MetricPrefixValue.ParseLong(args[1]);
-				} catch {
-					return false;
-				}
-			}
-
-			PingFloodWaiting(context, clientsCnt, requestsCnt);
-			return true;
-		}
-
-		private void PingFloodWaiting(CommandProcessorContext context, int clientsCnt, long requestsCnt) {
-			context.IsAsync();
-
-			var clients = new List<TcpTypedConnection<byte[]>>();
-			var threads = new List<Thread>();
-			var doneEvent = new ManualResetEventSlim(false);
-			var clientsDone = 0;
-			long all = 0;
-			for (int i = 0; i < clientsCnt; i++) {
-				var autoResetEvent = new AutoResetEvent(false);
-				var client = context._tcpTestClient.CreateTcpConnection(
-					context,
-					(_, __) => {
-						Interlocked.Increment(ref all);
-						autoResetEvent.Set();
-					},
-					connectionClosed: (conn, err) => context.Fail(reason: "Connection was closed prematurely."));
-				clients.Add(client);
-
-				var count = requestsCnt / clientsCnt + ((i == clientsCnt - 1) ? requestsCnt % clientsCnt : 0);
-				threads.Add(new Thread(() => {
-					for (int j = 0; j < count; ++j) {
-						var package = new TcpPackage(TcpCommand.Ping, Guid.NewGuid(), null);
-						client.EnqueueSend(package.AsByteArray());
-						autoResetEvent.WaitOne();
-					}
-
-					if (Interlocked.Increment(ref clientsDone) == clientsCnt) {
-						context.Success();
-						doneEvent.Set();
-					}
-				}) {IsBackground = true});
-			}
-
-			var sw = Stopwatch.StartNew();
-			threads.ForEach(thread => thread.Start());
-			doneEvent.Wait();
-			sw.Stop();
-			clients.ForEach(x => x.Close());
-
-			var reqPerSec = (all + 0.0) / sw.ElapsedMilliseconds * 1000;
-			context.Log.Information("{requests} requests completed in {elapsed}ms ({rate:0.00} reqs per sec).", all,
-				sw.ElapsedMilliseconds, reqPerSec);
-			PerfUtils.LogData(Keyword,
-				PerfUtils.Row(PerfUtils.Col("clientsCnt", clientsCnt),
-					PerfUtils.Col("requestsCnt", requestsCnt),
-					PerfUtils.Col("ElapsedMilliseconds", sw.ElapsedMilliseconds)));
-			PerfUtils.LogTeamCityGraphData(string.Format("{0}-{1}-{2}-reqPerSec", Keyword, clientsCnt, requestsCnt),
-				(int)reqPerSec);
-			PerfUtils.LogTeamCityGraphData(string.Format("{0}-latency-ms", Keyword),
-				(int)Math.Round(sw.Elapsed.TotalMilliseconds / all));
-
-			if (Interlocked.Read(ref all) == requestsCnt)
-				context.Success();
-			else
-				context.Fail();
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/PingProcessor.cs b/src/EventStore.TestClient/Commands/PingProcessor.cs
deleted file mode 100644
index 72bd4db6ec6..00000000000
--- a/src/EventStore.TestClient/Commands/PingProcessor.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using EventStore.Core.Services.Transport.Tcp;
-
-namespace EventStore.TestClient.Commands {
-	internal class PingProcessor : ICmdProcessor {
-		public string Usage {
-			get { return Keyword; }
-		}
-
-		public string Keyword {
-			get { return "PING"; }
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			context.IsAsync();
-
-			context._tcpTestClient.CreateTcpConnection(
-				context,
-				connectionEstablished: conn => {
-					var package = new TcpPackage(TcpCommand.Ping, Guid.NewGuid(), null);
-					context.Log.Information("[{ip}:{tcpPort}]: PING...", context._tcpTestClient.Options.Host,
-						context._tcpTestClient.Options.TcpPort);
-					conn.EnqueueSend(package.AsByteArray());
-				},
-				handlePackage: (conn, pkg) => {
-					if (pkg.Command != TcpCommand.Pong) {
-						context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
-						return;
-					}
-
-					context.Log.Information("[{ip}:{tcpPort}]: PONG!", context._tcpTestClient.Options.Host,
-						context._tcpTestClient.Options.TcpPort);
-					context.Success();
-					conn.Close();
-				},
-				connectionClosed: (typedConnection, error) =>
-					context.Fail(reason: "Connection was closed prematurely."));
-			context.WaitForCompletion();
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/ReadAllProcessor.cs b/src/EventStore.TestClient/Commands/ReadAllProcessor.cs
deleted file mode 100644
index 7998d376514..00000000000
--- a/src/EventStore.TestClient/Commands/ReadAllProcessor.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Text;
-using EventStore.Client.Messages;
-using EventStore.Common.Utils;
-using EventStore.Core.Services.Transport.Tcp;
-
-namespace EventStore.TestClient.Commands {
-	internal class ReadAllProcessor : ICmdProcessor {
-		public string Usage {
-			get { return "RDALL [[F|B] [<commit pos> <prepare pos> [<only-if-leader>]]]"; }
-		}
-
-		public string Keyword {
-			get { return "RDALL"; }
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			bool forward = true;
-			long commitPos = 0;
-			long preparePos = 0;
-			bool posOverriden = false;
-			bool resolveLinkTos = false;
-			bool requireLeader = false;
-
-			if (args.Length > 0) {
-				if (args.Length != 1 && args.Length != 3 && args.Length != 4)
-					return false;
-
-				if (args[0].ToUpper() == "F")
-					forward = true;
-				else if (args[0].ToUpper() == "B")
-					forward = false;
-				else
-					return false;
-
-				if (args.Length >= 3) {
-					posOverriden = true;
-					if (!long.TryParse(args[1], out commitPos) || !long.TryParse(args[2], out preparePos))
-						return false;
-				}
-
-				if (args.Length >= 4)
-					requireLeader = bool.Parse(args[3]);
-			}
-
-			if (!posOverriden) {
-				commitPos = forward ? 0 : -1;
-				preparePos = forward ? 0 : -1;
-			}
-
-			context.IsAsync();
-
-			int total = 0;
-			var sw = new Stopwatch();
-			var tcpCommand = forward ? TcpCommand.ReadAllEventsForward : TcpCommand.ReadAllEventsBackward;
-			var tcpCommandToReceive = forward ? TcpCommand.ReadAllEventsForwardCompleted : TcpCommand.ReadAllEventsBackwardCompleted;
-
-			context._tcpTestClient.CreateTcpConnection(
-				context,
-				connectionEstablished: conn => {
-					context.Log.Information("[{remoteEndPoint}, L{localEndPoint}]: Reading all {readDirection}...",
-						conn.RemoteEndPoint, conn.LocalEndPoint, forward ? "FORWARD" : "BACKWARD");
-
-					var readDto =
-						new ReadAllEvents(commitPos, preparePos, 10, resolveLinkTos, requireLeader);
-					var package = new TcpPackage(tcpCommand, Guid.NewGuid(), readDto.Serialize()).AsByteArray();
-					sw.Start();
-					conn.EnqueueSend(package);
-				},
-				handlePackage: (conn, pkg) => {
-					if (pkg.Command != tcpCommandToReceive) {
-						context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
-						return;
-					}
-
-					var dto = pkg.Data.Deserialize<ReadAllEventsCompleted>();
-					if (dto.Events.IsEmpty()) {
-						sw.Stop();
-						context.Log.Information("=== Reading ALL {readDirection} completed in {elapsed}. Total read: {total}",
-							forward ? "FORWARD" : "BACKWARD", sw.Elapsed, total);
-						context.Success();
-						conn.Close();
-						return;
-					}
-
-					total += dto.Events.Count;
-
-					var readDto = new ReadAllEvents(dto.NextCommitPosition, dto.NextPreparePosition,
-						10, resolveLinkTos, requireLeader);
-					var package = new TcpPackage(tcpCommand, Guid.NewGuid(), readDto.Serialize()).AsByteArray();
-					conn.EnqueueSend(package);
-				},
-				connectionClosed: (connection, error) => context.Fail(reason: "Connection was closed prematurely."));
-
-			context.WaitForCompletion();
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/ReadFloodProcessor.cs b/src/EventStore.TestClient/Commands/ReadFloodProcessor.cs
deleted file mode 100644
index 8f6fade32ed..00000000000
--- a/src/EventStore.TestClient/Commands/ReadFloodProcessor.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using EventStore.Client.Messages;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.Transport.Tcp;
-
-namespace EventStore.TestClient.Commands {
-	internal class ReadFloodProcessor : ICmdProcessor {
-		public string Usage {
-			//                     0          1           2               3                  4
-			get { return "RDFL [<clients> <requests> [<streams-cnt> [<stream-prefix> [<require-leader>]]]]"; }
-		}
-		
-		public string Keyword {
-			get { return "RDFL"; }
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			int clientsCnt = 1;
-			long requestsCnt = 5000;
-			int streamsCnt = 1;
-			var streamPrefix = "test-stream";
-			bool resolveLinkTos = false;
-			bool requireLeader = false;
-			if (args.Length > 0) {
-				if (args.Length != 2 && args.Length != 3 && args.Length != 4 && args.Length != 5)
-					return false;
-
-				try {
-					clientsCnt = MetricPrefixValue.ParseInt(args[0]);
-					requestsCnt = MetricPrefixValue.ParseLong(args[1]);
-					if (args.Length >= 3)
-						streamsCnt = MetricPrefixValue.ParseInt(args[2]);
-					if (args.Length >= 4)
-						streamPrefix = args[3];
-					if (args.Length >= 5)
-						requireLeader = bool.Parse(args[4]);
-				} catch {
-					return false;
-				}
-			}
-
-			RequestMonitor monitor = new RequestMonitor();
-			ReadFlood(context, streamPrefix, clientsCnt, requestsCnt, streamsCnt, resolveLinkTos, requireLeader, monitor);
-			return true;
-		}
-
-		private void ReadFlood(CommandProcessorContext context, string streamPrefix, int clientsCnt, long requestsCnt, int streamsCnt,
-			bool resolveLinkTos, bool requireLeader, RequestMonitor monitor) {
-			context.IsAsync();
-
-			string[] streams = streamsCnt == 1
-				? new[] { streamPrefix }
-				: Enumerable.Range(0, streamsCnt).Select(x => $"{streamPrefix}-{x}").ToArray();
-
-			context.Log.Information("Reading streams {first} through to {last}",
-				streams.FirstOrDefault(),
-				streams.LastOrDefault());
-
-			var clients = new List<TcpTypedConnection<byte[]>>();
-			var threads = new List<Thread>();
-			var doneEvent = new ManualResetEventSlim(false);
-			var sw2 = new Stopwatch();
-			long succ = 0;
-			long fail = 0;
-			long all = 0;
-			for (int i = 0; i < clientsCnt; i++) {
-				var count = requestsCnt / clientsCnt + ((i == clientsCnt - 1) ? requestsCnt % clientsCnt : 0);
-				long received = 0;
-				long sent = 0;
-				var client = context._tcpTestClient.CreateTcpConnection(
-					context,
-					(conn, pkg) => {
-						if (pkg.Command != TcpCommand.ReadEventCompleted) {
-							context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
-							return;
-						}
-
-						var dto = pkg.Data.Deserialize<ReadEventCompleted>();
-						monitor.EndOperation(pkg.CorrelationId);
-						if (dto.Result == ReadEventCompleted.Types.ReadEventResult.Success) {
-							if (Interlocked.Increment(ref succ) % 1000 == 0) Console.Write(".");
-						} else {
-							if (Interlocked.Increment(ref fail) % 1000 == 0) Console.Write("#");
-						}
-						
-						Interlocked.Increment(ref received);
-						var localAll = Interlocked.Increment(ref all);
-						if (localAll % 100000 == 0) {
-							var elapsed = sw2.Elapsed;
-							sw2.Restart();
-							context.Log.Information("\nDONE TOTAL {reads} READS IN {elapsed} ({rate:0.0}/s).", localAll,
-								elapsed, 1000.0 * 100000 / elapsed.TotalMilliseconds);
-						}
-
-						if (localAll == requestsCnt) {
-							doneEvent.Set();
-						}
-					},
-					connectionClosed: (conn, err) => context.Fail(reason: "Connection was closed prematurely."));
-				clients.Add(client);
-
-				var clientNum = i;
-				threads.Add(new Thread(() => {
-					int streamIndex = (streamsCnt / clientsCnt) * clientNum;
-					context.Log.Information("Reader #{clientNum} performing {count} reads on {streamsCnt} streams starting at stream index {streamIndex}",
-						clientNum, count, streamsCnt, streamIndex);
-					for (int j = 0; j < count; ++j) {
-						var corrId = Guid.NewGuid();
-
-						var eventStreamId = streams[streamIndex++];
-						if (streamIndex >= streamsCnt)
-							streamIndex = 0;
-						var read = new ReadEvent(eventStreamId, 0, resolveLinkTos, requireLeader);
-						var package = new TcpPackage(TcpCommand.ReadEvent, corrId, read.Serialize());
-						monitor.StartOperation(corrId);
-						client.EnqueueSend(package.AsByteArray());
-
-						var localSent = Interlocked.Increment(ref sent);
-						while (localSent - Interlocked.Read(ref received) >
-						       context._tcpTestClient.Options.ReadWindow / clientsCnt) {
-							Thread.Sleep(1);
-						}
-					}
-					context.Log.Information("Reader #{clientNum} done", clientNum);
-					
-				}) {IsBackground = true});
-			}
-
-			var sw = Stopwatch.StartNew();
-			sw2.Start();
-			threads.ForEach(thread => thread.Start());
-			doneEvent.Wait();
-			sw.Stop();
-			clients.ForEach(client => client.Close());
-
-			var reqPerSec = (all + 0.0) / sw.ElapsedMilliseconds * 1000;
-			context.Log.Information("Completed. READS succ: {success}, fail: {failures}.", Interlocked.Read(ref succ),
-				Interlocked.Read(ref fail));
-			context.Log.Information("{requests} requests completed in {elapsed}ms ({rate:0.00} reqs per sec).", all,
-				sw.ElapsedMilliseconds, reqPerSec);
-			monitor.GetMeasurementDetails();
-			PerfUtils.LogData(Keyword,
-				PerfUtils.Row(PerfUtils.Col("clientsCnt", clientsCnt),
-					PerfUtils.Col("requestsCnt", requestsCnt),
-					PerfUtils.Col("ElapsedMilliseconds", sw.ElapsedMilliseconds)),
-				PerfUtils.Row(PerfUtils.Col("readsCnt", all)));
-			PerfUtils.LogTeamCityGraphData(string.Format("{0}-{1}-{2}-reqPerSec", Keyword, clientsCnt, requestsCnt),
-				(int)reqPerSec);
-
-			if (succ != requestsCnt)
-				context.Fail(reason: "There were errors or not all requests completed.");
-			else
-				context.Success();
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/ReadProcessor.cs b/src/EventStore.TestClient/Commands/ReadProcessor.cs
deleted file mode 100644
index 83b0c861f72..00000000000
--- a/src/EventStore.TestClient/Commands/ReadProcessor.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using System;
-using System.Diagnostics;
-using EventStore.Client.Messages;
-using EventStore.Common.Utils;
-using EventStore.Core.Services.Transport.Tcp;
-
-namespace EventStore.TestClient.Commands {
-	internal class ReadProcessor : ICmdProcessor {
-		public string Usage {
-			get { return "RD [<stream-id> [<from-number> [<only-if-leader>]]]"; }
-		}
-
-		public string Keyword {
-			get { return "RD"; }
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			var eventStreamId = "test-stream";
-			var fromNumber = 0;
-			const bool resolveLinkTos = false;
-			var requireLeader = false;
-
-			if (args.Length > 0) {
-				if (args.Length > 3)
-					return false;
-				eventStreamId = args[0];
-				if (args.Length >= 2)
-					fromNumber = MetricPrefixValue.ParseInt(args[1]);
-				if (args.Length >= 3)
-					requireLeader = bool.Parse(args[2]);
-			}
-
-			context.IsAsync();
-
-			var sw = new Stopwatch();
-			context._tcpTestClient.CreateTcpConnection(
-				context,
-				connectionEstablished: conn => {
-					context.Log.Information("[{remoteEndPoint}, L{localEndPoint}]: Reading...", conn.RemoteEndPoint,
-						conn.LocalEndPoint);
-					var readDto =
-						new ReadEvent(eventStreamId, fromNumber, resolveLinkTos, requireLeader);
-					var package =
-						new TcpPackage(TcpCommand.ReadEvent, Guid.NewGuid(), readDto.Serialize()).AsByteArray();
-					sw.Start();
-					conn.EnqueueSend(package);
-				},
-				handlePackage: (conn, pkg) => {
-					sw.Stop();
-					context.Log.Information("Read request took: {elapsed}.", sw.Elapsed);
-
-					if (pkg.Command != TcpCommand.ReadEventCompleted) {
-						context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
-						return;
-					}
-
-					var dto = pkg.Data.Deserialize<ReadEventCompleted>();
-					context.Log.Information("READ events from <{stream}>:\n\n"
-					                 + "\tEventStreamId: {stream}\n"
-					                 + "\tEventNumber:   {eventNumber}\n"
-					                 + "\tReadResult:    {readResult}\n"
-					                 + "\tEventType:     {eventType}\n"
-					                 + "\tData:          {data}\n"
-					                 + "\tMetadata:      {metadata}\n",
-						eventStreamId,
-						eventStreamId,
-						dto.Event.Event.EventNumber,
-						dto.Result,
-						dto.Event.Event.EventType,
-						Helper.UTF8NoBom.GetString(dto.Event.Event.Data.ToByteArray()),
-						Helper.UTF8NoBom.GetString(dto.Event.Event.Metadata.ToByteArray()));
-
-
-					if (dto.Result == ReadEventCompleted.Types.ReadEventResult.Success) {
-						PerfUtils.LogTeamCityGraphData(string.Format("{0}-latency-ms", Keyword),
-							(int)Math.Round(sw.Elapsed.TotalMilliseconds));
-						context.Success();
-					} else
-						context.Fail();
-
-					conn.Close();
-				},
-				connectionClosed: (connection, error) => context.Fail(reason: "Connection was closed prematurely."));
-
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/RequestMonitor.cs b/src/EventStore.TestClient/Commands/RequestMonitor.cs
deleted file mode 100644
index 83d8fef7eef..00000000000
--- a/src/EventStore.TestClient/Commands/RequestMonitor.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Collections.Concurrent;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.Transport.Tcp;
-
-namespace EventStore.TestClient.Commands {
-	internal class RequestMonitor {
-		private ConcurrentQueue<int> _measurements = new ConcurrentQueue<int>();
-		private ConcurrentDictionary<Guid, Operation> _operations = new ConcurrentDictionary<Guid, Operation>();
-		Stopwatch _watch = new Stopwatch();
-
-		public RequestMonitor() {
-			_watch.Start();
-		}
-
-		public void StartOperation(Guid id) {
-			var record = new Operation();
-			record.Start = _watch.ElapsedTicks;
-			_operations.AddOrUpdate(id, record, (q, val) => record);
-		}
-
-		public void EndOperation(Guid id) {
-			Operation record;
-			if (_operations.TryRemove(id, out record)) {
-				var current = _watch.ElapsedTicks;
-				var time = current - record.Start;
-				var ms = time / TimeSpan.TicksPerMillisecond;
-				_measurements.Enqueue((int)ms);
-			} else {
-				Console.Write("x");
-			}
-		}
-
-		public void PrintRawMeasurementDetails() {
-			foreach (var i in _measurements) {
-				Console.Write(i + ",");
-			}
-		}
-
-		public void GetMeasurementDetails() {
-			var items = _measurements.ToArray();
-			Array.Sort(items);
-			Console.WriteLine("fastest: " + items[0]);
-			Console.WriteLine("quintiles");
-			for (int i = 20; i <= 100; i += 20) {
-				Console.WriteLine(i + "% : " + items[GetPercentile((decimal)i - 20, items.Length)] + "-" +
-				                  items[GetPercentile((decimal)i, items.Length)]);
-			}
-
-			Console.WriteLine("90% : " + items[GetPercentile(90m, items.Length)]);
-			Console.WriteLine("95% : " + items[GetPercentile(95m, items.Length)]);
-			Console.WriteLine("98% : " + items[GetPercentile(98m, items.Length)]);
-			Console.WriteLine("99% : " + items[GetPercentile(99m, items.Length)]);
-			Console.WriteLine("99.5% : " + items[GetPercentile(99.5m, items.Length)]);
-			Console.WriteLine("99.9% : " + items[GetPercentile(99.9m, items.Length)]);
-			Console.WriteLine("99.99% : " + items[GetPercentile(99.99m, items.Length)]);
-			Console.WriteLine("99.999% : " + items[GetPercentile(99.999m, items.Length)]);
-			Console.WriteLine("99.9999% : " + items[GetPercentile(99.9999m, items.Length)]);
-			Console.WriteLine("99.99999% : " + items[GetPercentile(99.99999m, items.Length)]);
-			Console.WriteLine("Highest : " + items[items.Length - 1]);
-		}
-
-		private int GetPercentile(decimal percentile, int size) {
-			decimal percent = 0;
-			percent = percentile / 100m;
-			var ret = (int)(percent * size);
-			if (ret == size) ret -= 1;
-			return ret;
-		}
-
-		struct Operation {
-			public long Start;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/RunTestScenarios/BankAccountEvent.cs b/src/EventStore.TestClient/Commands/RunTestScenarios/BankAccountEvent.cs
deleted file mode 100644
index fb5bc70dd0e..00000000000
--- a/src/EventStore.TestClient/Commands/RunTestScenarios/BankAccountEvent.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using EventStore.ClientAPI;
-using EventStore.Common.Utils;
-using EventStore.Transport.Http.Codecs;
-
-namespace EventStore.TestClient.Commands.RunTestScenarios {
-	internal class BankAccountEvent {
-		public static EventData FromEvent(object accountObject) {
-			if (accountObject == null)
-				throw new ArgumentNullException("accountObject");
-
-			var type = accountObject.GetType().Name;
-			var encodedData = Helper.UTF8NoBom.GetBytes(Codec.Json.To(accountObject));
-			var encodedMetadata =
-				Helper.UTF8NoBom.GetBytes(Codec.Json.To(new Dictionary<string, object> {{"IsEmpty", true}}));
-
-			return new EventData(Guid.NewGuid(), type, true, encodedData, encodedMetadata);
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/RunTestScenarios/IScenario.cs b/src/EventStore.TestClient/Commands/RunTestScenarios/IScenario.cs
deleted file mode 100644
index a54c122bd68..00000000000
--- a/src/EventStore.TestClient/Commands/RunTestScenarios/IScenario.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace EventStore.TestClient.Commands.RunTestScenarios {
-	internal interface IScenario : IDisposable {
-		void Run();
-		void Clean();
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/RunTestScenarios/JsonEventContainer.cs b/src/EventStore.TestClient/Commands/RunTestScenarios/JsonEventContainer.cs
deleted file mode 100644
index 0449689466e..00000000000
--- a/src/EventStore.TestClient/Commands/RunTestScenarios/JsonEventContainer.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using EventStore.ClientAPI;
-using EventStore.Common.Utils;
-using EventStore.Transport.Http.Codecs;
-
-namespace EventStore.TestClient.Commands.RunTestScenarios {
-	internal static class JsonEventContainer {
-		public static EventData ForEvent(object @event) {
-			if (@event == null)
-				throw new ArgumentNullException("event");
-
-			var encodedData = Helper.UTF8NoBom.GetBytes(Codec.Json.To(@event));
-			var encodedMetadata =
-				Helper.UTF8NoBom.GetBytes(Codec.Json.To(new Dictionary<string, object> {{"IsEmpty", true}}));
-
-			return new EventData(Guid.NewGuid(), @event.GetType().Name, true, encodedData, encodedMetadata);
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/RunTestScenarios/LoopingProjTranWriteScenario.cs b/src/EventStore.TestClient/Commands/RunTestScenarios/LoopingProjTranWriteScenario.cs
deleted file mode 100644
index 89371148e41..00000000000
--- a/src/EventStore.TestClient/Commands/RunTestScenarios/LoopingProjTranWriteScenario.cs
+++ /dev/null
@@ -1,241 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-
-namespace EventStore.TestClient.Commands.RunTestScenarios {
-	internal class LoopingProjTranWriteScenario : ProjectionsScenarioBase {
-		private readonly TimeSpan _executionPeriod;
-
-		private readonly Random _random;
-
-		public LoopingProjTranWriteScenario(Action<IPEndPoint, byte[]> directSendOverTcp,
-			int maxConcurrentRequests,
-			int connections,
-			int streams,
-			int eventsPerStream,
-			int streamDeleteStep,
-			TimeSpan executionPeriod,
-			string dbParentPath,
-			NodeConnectionInfo customNode)
-			: base(directSendOverTcp, maxConcurrentRequests, connections, streams, eventsPerStream, streamDeleteStep,
-				dbParentPath, customNode) {
-			_executionPeriod = executionPeriod;
-			_random = new Random();
-		}
-
-		private EventData CreateEventA(int version) {
-			var @event = JsonEventContainer.ForEvent(new VersionnedEventA(version));
-			return @event;
-		}
-
-		private EventData CreateEventB(int version) {
-			var @event = JsonEventContainer.ForEvent(new VersionnedEventB(version));
-			return @event;
-		}
-
-		internal class VersionnedEvent {
-			public readonly int Version;
-
-			public VersionnedEvent(int version) {
-				Version = version;
-			}
-		}
-
-		internal class VersionnedEventA : VersionnedEvent {
-			public VersionnedEventA(int version) : base(version) {
-			}
-		}
-
-		internal class VersionnedEventB : VersionnedEvent {
-			public VersionnedEventB(int version) : base(version) {
-			}
-		}
-
-		protected override void RunInternal() {
-			var stopWatch = Stopwatch.StartNew();
-
-			var runIndex = 0;
-			while (stopWatch.Elapsed < _executionPeriod) {
-				var msg = string.Format(
-					"=================== Start run #{0}, elapsed {1} of {2} minutes, {3} =================== ",
-					runIndex,
-					(int)stopWatch.Elapsed.TotalMinutes,
-					_executionPeriod.TotalMinutes,
-					GetType().Name);
-				Log.Information(
-					"=================== Start run #{runIndex}, elapsed {elapsed} of {executionPeriod} minutes, {type} =================== ",
-					runIndex,
-					(int)stopWatch.Elapsed.TotalMinutes,
-					_executionPeriod.TotalMinutes,
-					GetType().Name);
-				Log.Information("##teamcity[message '{message}']", msg);
-
-				InnerRun(runIndex);
-				runIndex += 1;
-			}
-		}
-
-		private void InnerRun(int runIndex) {
-			var nodeId = StartNode();
-
-			try {
-				EnableProjectionByCategory();
-
-				var streamA = string.Format("numberedevents{0}-stream_a", runIndex);
-				var streamB = string.Format("numberedevents{0}-stream_b", runIndex);
-
-				var store = GetConnection();
-
-				var writtenCountA = 0;
-				var writtenCountB = 0;
-				while (writtenCountA + writtenCountB < EventsPerStream) {
-					var batchSizeA = _random.Next(1, EventsPerStream / 10);
-					var batchSizeB = _random.Next(1, EventsPerStream / 10);
-
-					var transactionA = store.StartTransactionAsync(streamA, ExpectedVersion.Any).Result;
-
-					var w1 = WriteTransactionData(transactionA, writtenCountA, batchSizeA, CreateEventA);
-					w1.Wait();
-
-					var transactionB = store.StartTransactionAsync(streamB, ExpectedVersion.Any).Result;
-					var w2 = WriteTransactionData(transactionB, writtenCountB, batchSizeB, CreateEventB);
-					w2.Wait();
-
-					var cB = CommitTransaction(transactionB);
-					cB.Wait();
-
-					var cA = CommitTransaction(transactionA);
-					cA.Wait();
-
-					writtenCountA += batchSizeA;
-					writtenCountB += batchSizeB;
-				}
-
-				var projectionName = string.Format("NumberedByType{0}", runIndex);
-				var projection = string.Format(@"
-                fromCategory('numberedevents{0}')
-                    .when({{
-                        $init: function() {{ 
-                            return {{aVer:0, aList:'', bVer:0, bList:''}}; 
-                        }},
-                        VersionnedEventA: function(state, event) {{
-                            state.aVer += 1;
-                            if (state.aVer != event.body.version) {{
-                                throw JSON.stringify({{
-                                    message: 'Version in A is incorrect. ',
-                                    stream: event.streamId,
-                                    seqNumber: event.sequenceNumber,
-                                    eventType: event.eventType,
-                                    eventInternalVer: event.body.version,
-                                    detailsAVer: state.aVer,
-                                    detailsBVer: state.bVer}});
-                            }}
-                            return state;
-                        }},
-                        VersionnedEventB: function(state, event) {{  
-                            state.bVer += 1;
-                            if (state.bVer != event.body.version) {{
-                                throw JSON.stringify({{
-                                    message: 'Version in B is incorrect. ',
-                                    stream: event.streamId,
-                                    seqNumber: event.sequenceNumber,
-                                    eventType: event.eventType,
-                                    eventInternalVer: event.body.version,
-                                    detailsAVer: state.aVer,
-                                    detailsBVer: state.bVer }});
-                            }}
-                            return state;
-                        }}
-                    }})   
-", runIndex);
-
-				var projectionManager = GetProjectionsManager();
-				projectionManager.CreateContinuousAsync(projectionName, projection, AdminCredentials).Wait();
-
-				WaitAndCheckIfIsFaulted(projectionName);
-
-				Log.Debug("Done iteration {runIndex}", runIndex);
-			} finally {
-				KillNode(nodeId);
-			}
-		}
-
-		private Task<object> WriteTransactionData(EventStoreTransaction transaction, int startingVersion,
-			int eventCount, Func<int, EventData> createEvent) {
-			Log.Information("Starting to write {eventCount} events in transaction {transactionId}", eventCount,
-				transaction.TransactionId);
-
-			var resSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
-
-			Action<Task> fail = prevTask => {
-				Log.Information("WriteEventsInTransactionalWay for transaction {transactionId} failed.",
-					transaction.TransactionId);
-				resSource.SetException(prevTask.Exception);
-			};
-
-			int version = startingVersion;
-
-			Action<Task> writeTransactionEvent = null;
-			writeTransactionEvent = _ => {
-				if (version == startingVersion + eventCount) {
-					resSource.SetResult(null);
-					return;
-				}
-
-				version += 1;
-
-				var writeTask = transaction.WriteAsync(new[] {createEvent(version)});
-				writeTask.ContinueWith(fail, TaskContinuationOptions.OnlyOnFaulted);
-				writeTask.ContinueWith(writeTransactionEvent, TaskContinuationOptions.OnlyOnRanToCompletion);
-			};
-
-			Task.Factory.StartNew(() => writeTransactionEvent(null));
-
-			return resSource.Task;
-		}
-
-		private Task<object> CommitTransaction(EventStoreTransaction transaction) {
-			var resSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
-
-			Action<Task> fail = prevTask => {
-				Log.Information("WriteEventsInTransactionalWay for transaction {transactionId} failed",
-					transaction.TransactionId);
-				resSource.SetException(prevTask.Exception);
-			};
-
-			var commitTask = transaction.CommitAsync();
-			commitTask.ContinueWith(fail, TaskContinuationOptions.OnlyOnFaulted);
-			commitTask.ContinueWith(t => {
-				Log.Information("Committed transaction {transactionId}", transaction.TransactionId);
-				resSource.SetResult(null);
-			}, TaskContinuationOptions.OnlyOnRanToCompletion);
-
-			return resSource.Task;
-		}
-
-		private void WaitAndCheckIfIsFaulted(string projectionName) {
-			var stopWatch = Stopwatch.StartNew();
-
-			var waitDuration = TimeSpan.FromMilliseconds(20 * 1000 + 5 * Streams * EventsPerStream);
-			while (stopWatch.Elapsed < waitDuration) {
-				string reason;
-				var failed = GetProjectionIsFaulted(projectionName, out reason);
-				if (failed) {
-					var message = string.Format("Projection {0} failed, reason:\n{1}", projectionName, reason);
-					throw new ApplicationException(message);
-				}
-
-				var position = GetProjectionPosition(projectionName);
-				if (position >= (EventsPerStream - 1)) {
-					Log.Debug("Expected position reached, done.");
-					break;
-				}
-
-				Thread.Sleep(2000);
-			}
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/RunTestScenarios/LoopingProjectionKillScenario.cs b/src/EventStore.TestClient/Commands/RunTestScenarios/LoopingProjectionKillScenario.cs
deleted file mode 100644
index 75f2972d788..00000000000
--- a/src/EventStore.TestClient/Commands/RunTestScenarios/LoopingProjectionKillScenario.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace EventStore.TestClient.Commands.RunTestScenarios {
-	internal class LoopingProjectionKillScenario : ProjectionsKillScenario {
-		private TimeSpan _executionPeriod;
-
-		private int _iterationCode;
-		private readonly TimeSpan _iterationLoopDuration;
-		private readonly TimeSpan _firstKillInterval;
-
-		public LoopingProjectionKillScenario(Action<IPEndPoint, byte[]> directSendOverTcp, int maxConcurrentRequests,
-			int connections, int streams, int eventsPerStream, int streamDeleteStep, TimeSpan executionPeriod,
-			string dbParentPath, NodeConnectionInfo customNode)
-			: base(directSendOverTcp, maxConcurrentRequests, connections, streams, eventsPerStream, streamDeleteStep,
-				dbParentPath, customNode) {
-			_executionPeriod = executionPeriod;
-
-			_iterationLoopDuration = TimeSpan.FromMilliseconds(10 * (Streams * EventsPerStream + Streams) + 20 * 1000);
-			_firstKillInterval = TimeSpan.FromSeconds(_iterationLoopDuration.TotalSeconds / 2);
-		}
-
-		protected override int GetIterationCode() {
-			return _iterationCode;
-		}
-
-		protected void SetNextIterationCode() {
-			_iterationCode += 1;
-		}
-
-		protected override void RunInternal() {
-			var nodeProcessId = StartNode();
-			EnableProjectionByCategory();
-
-			var stopWatch = Stopwatch.StartNew();
-
-			while (stopWatch.Elapsed < _executionPeriod) {
-				var msg = string.Format(
-					"=================== Start run #{0}, elapsed {1} of {2} minutes, {3} =================== ",
-					GetIterationCode(),
-					(int)stopWatch.Elapsed.TotalMinutes,
-					_executionPeriod.TotalMinutes,
-					GetType().Name);
-				Log.Information(
-					"=================== Start run #{iteration}, elapsed {elapsed} of {executionPeriod} minutes, {type} =================== ",
-					GetIterationCode(),
-					(int)stopWatch.Elapsed.TotalMinutes,
-					_executionPeriod.TotalMinutes,
-					GetType().Name);
-				Log.Information("##teamcity[message '{message}']", msg);
-
-				var iterationTask = RunIteration();
-
-				Thread.Sleep(_firstKillInterval);
-
-				KillNode(nodeProcessId);
-				nodeProcessId = StartNode();
-
-				if (!iterationTask.Wait(_iterationLoopDuration))
-					throw new TimeoutException("Iteration execution timeout.");
-
-				if (iterationTask.Result != true)
-					throw new ApplicationException("Iteration faulted.", iterationTask.Exception);
-
-				SetNextIterationCode();
-			}
-		}
-
-		private Task<bool> RunIteration() {
-			var countItem = CreateCountItem();
-			var sumCheckForBankAccount0 = CreateSumCheckForBankAccount0();
-
-			var writeTask = WriteData();
-
-			var expectedAllEventsCount = (Streams * EventsPerStream).ToString();
-			var lastExpectedEventVersion = (EventsPerStream - 1).ToString();
-
-			var successTask = Task.Factory.StartNew(() => {
-				var success = false;
-				var stopWatch = new Stopwatch();
-				while (stopWatch.Elapsed < _iterationLoopDuration) {
-					if (writeTask.IsFaulted)
-						throw new ApplicationException("Failed to write data");
-
-					if (writeTask.IsCompleted && !stopWatch.IsRunning) {
-						stopWatch.Start();
-					}
-
-					success = CheckProjectionState(countItem, "count", x => x == expectedAllEventsCount)
-					          && CheckProjectionState(sumCheckForBankAccount0, "success",
-						          x => x == lastExpectedEventVersion);
-
-					if (success)
-						break;
-
-					Thread.Sleep(4000);
-				}
-
-				if (!CheckProjectionState(countItem, "count", x => x == expectedAllEventsCount))
-					Log.Error(
-						"Projection '{projection}' has not completed with expected result {expectedCount} in time. ",
-						countItem, expectedAllEventsCount);
-
-				if (!CheckProjectionState(sumCheckForBankAccount0, "success", x => x == lastExpectedEventVersion))
-					Log.Error(
-						"Projection '{projection}' has not completed with expected result {lastExpectedEventVersion} in time.",
-						sumCheckForBankAccount0, lastExpectedEventVersion);
-
-				return success;
-			});
-
-			writeTask.Wait();
-
-			return successTask;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/RunTestScenarios/LoopingScenario.cs b/src/EventStore.TestClient/Commands/RunTestScenarios/LoopingScenario.cs
deleted file mode 100644
index 706ae2fd40c..00000000000
--- a/src/EventStore.TestClient/Commands/RunTestScenarios/LoopingScenario.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
-
-namespace EventStore.TestClient.Commands.RunTestScenarios {
-	internal class LoopingScenario : ScenarioBase {
-		private readonly TimeSpan _executionPeriod;
-
-		private readonly Random _rnd = new Random();
-		private volatile bool _stopParalleWrites;
-		private TimeSpan _startupWaitInterval;
-
-		protected override TimeSpan StartupWaitInterval {
-			get { return _startupWaitInterval; }
-		}
-
-		public LoopingScenario(Action<IPEndPoint, byte[]> directSendOverTcp,
-			int maxConcurrentRequests,
-			int connections,
-			int streams,
-			int eventsPerStream,
-			int streamDeleteStep,
-			TimeSpan executionPeriod,
-			string dbParentPath,
-			NodeConnectionInfo customNodeConnection)
-			: base(directSendOverTcp, maxConcurrentRequests, connections, streams, eventsPerStream, streamDeleteStep,
-				dbParentPath, customNodeConnection) {
-			_executionPeriod = executionPeriod;
-			SetStartupWaitInterval(TimeSpan.FromSeconds(10));
-		}
-
-		private void SetStartupWaitInterval(TimeSpan interval) {
-			_startupWaitInterval = interval;
-		}
-
-		protected override void RunInternal() {
-			var stopWatch = Stopwatch.StartNew();
-
-			var runIndex = 0;
-			while (stopWatch.Elapsed < _executionPeriod) {
-				var msg = string.Format(
-					"=================== Start run #{0}, elapsed {1} of {2} minutes, {3} =================== ",
-					runIndex,
-					(int)stopWatch.Elapsed.TotalMinutes,
-					_executionPeriod.TotalMinutes,
-					GetType().Name);
-				Log.Information(
-					"=================== Start run #{runIndex}, elapsed {elapsed} of {executionPeriod} minutes, {type} =================== ",
-					runIndex,
-					(int)stopWatch.Elapsed.TotalMinutes,
-					_executionPeriod.TotalMinutes,
-					GetType().Name);
-				Log.Information("##teamcity[message '{message}']", msg);
-
-				SetStartupWaitInterval(TimeSpan.FromSeconds(10 + (2 * (runIndex % 200))));
-				InnerRun(runIndex);
-				runIndex += 1;
-			}
-		}
-
-		protected virtual void InnerRun(int runIndex) {
-			var nodeProcessId = StartNode();
-
-			var parallelWritesTimeout = TimeSpan.FromMinutes((EventsPerStream / 1000.0) * 10);
-
-			var parallelWriteTask = RunParallelWrites(runIndex);
-
-			var streams = Enumerable.Range(0, Streams).Select(i => FormatStreamName(runIndex, i)).ToArray();
-
-			var slices = Split(streams, 3);
-			var singleEventSlice = slices.Take(1).SelectMany(x => x).ToArray();
-			var batchSlice = slices.Skip(1).Take(1).SelectMany(x => x).ToArray();
-			var transSlice = slices.Skip(2).Take(1).SelectMany(x => x).ToArray();
-
-			var wr1 = Write(WriteMode.SingleEventAtTime, singleEventSlice, EventsPerStream);
-			var wr2 = Write(WriteMode.Bucket, batchSlice, EventsPerStream);
-			var wr3 = Write(WriteMode.Transactional, transSlice, EventsPerStream);
-
-			if (runIndex % 4 == 0)
-				Scavenge();
-
-			Task.WaitAll(wr1, wr2, wr3);
-
-			var deleted = streams.Where((s, i) => i % StreamDeleteStep == 0).ToArray();
-			DeleteStreams(deleted);
-
-			_stopParalleWrites = true;
-			if (!parallelWriteTask.Wait(parallelWritesTimeout))
-				throw new ApplicationException("Parallel writes stop timed out, 1.");
-
-			KillNode(nodeProcessId);
-			nodeProcessId = StartNode();
-
-			parallelWriteTask = RunParallelWrites(runIndex);
-
-			var dl1 = CheckStreamsDeleted(deleted);
-
-			var exceptDeleted = streams.Except(deleted).ToArray();
-
-			var readCnt = Math.Min(100, EventsPerStream / 3);
-			var rd1 = Read(exceptDeleted, @from: 0, count: readCnt);
-			var rd2 = Read(exceptDeleted, @from: EventsPerStream - readCnt, count: readCnt);
-			var rd3 = Read(exceptDeleted, @from: EventsPerStream / 2,
-				count: Math.Min(readCnt, EventsPerStream - EventsPerStream / 2));
-
-			Log.Information("== READ from picked ALL ==");
-
-			var allExistingStreamsSlice = (from run in Enumerable.Range(0, runIndex + 1)
-				from streamNum in Enumerable.Range(0, Streams)
-				where streamNum % StreamDeleteStep != 0
-				where _rnd.NextDouble() < 0.1
-				select FormatStreamName(run, streamNum)).ToArray();
-
-			var allDeletedStreamsSlice = (from run in Enumerable.Range(0, runIndex + 1)
-				from streamNum in Enumerable.Range(0, Streams)
-				where streamNum % StreamDeleteStep == 0
-				where _rnd.NextDouble() < 0.1
-				select FormatStreamName(run, streamNum)).ToArray();
-
-			var prevCheckTasks = new List<Task>();
-			if (allExistingStreamsSlice.Length > 0) {
-				var rd4 = Read(allExistingStreamsSlice, 0, Math.Max(1, EventsPerStream / 5));
-				var rd5 = Read(allExistingStreamsSlice, EventsPerStream / 2, Math.Max(1, EventsPerStream / 5));
-
-				prevCheckTasks.Add(rd4);
-				prevCheckTasks.Add(rd5);
-			}
-
-			if (allDeletedStreamsSlice.Length > 0) {
-				var dl2 = CheckStreamsDeleted(allDeletedStreamsSlice);
-				prevCheckTasks.Add(dl2);
-			}
-
-			Task.WaitAll(new[] {dl1, rd1, rd2, rd3}.Union(prevCheckTasks).ToArray());
-
-			_stopParalleWrites = true;
-			if (!parallelWriteTask.Wait(parallelWritesTimeout))
-				throw new ApplicationException("Parallel writes stop timed out, 2.");
-
-			KillNode(nodeProcessId);
-		}
-
-		protected virtual Task RunParallelWrites(int runIndex) {
-			_stopParalleWrites = false;
-
-			return Task.Factory.StartNew(() => {
-				int index = 0;
-				while (!_stopParalleWrites) {
-					Log.Debug("Start RunParallelWrites #{index} for runIndex {runIndex}", index, runIndex);
-
-					var parallelStreams = Enumerable.Range(0, 2)
-						.Select(x => string.Format("parallel-write-stream-in{0}-{1}-{2}",
-							runIndex,
-							x,
-							string.Format("rnd{0}-{1}", _rnd.Next(), DateTime.UtcNow.Ticks)))
-						.ToArray();
-
-					var wr = Write(WriteMode.SingleEventAtTime, parallelStreams, EventsPerStream);
-					wr.Wait();
-
-					Log.Debug("Wrote RunParallelWrites #{index} for runIndex {runIndex}", index, runIndex);
-
-					var rd1 = Read(parallelStreams, 0, EventsPerStream / 6);
-					var rd2 = Read(parallelStreams, EventsPerStream / 3, EventsPerStream / 6);
-					var rd3 = Read(parallelStreams, EventsPerStream - EventsPerStream / 10, EventsPerStream / 10);
-					Task.WaitAll(rd1, rd2, rd3);
-
-					Log.Debug("Done RunParallelWrites #{index} for runIndex {runIndex}", index, runIndex);
-
-					index += 1;
-				}
-			}, TaskCreationOptions.LongRunning);
-		}
-
-		protected static string FormatStreamName(int runIndex, int i) {
-			return string.Format("stream-in{0}-{1}", runIndex, i);
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/RunTestScenarios/MassProjectionsScenario.cs b/src/EventStore.TestClient/Commands/RunTestScenarios/MassProjectionsScenario.cs
deleted file mode 100644
index 58ab00ed430..00000000000
--- a/src/EventStore.TestClient/Commands/RunTestScenarios/MassProjectionsScenario.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace EventStore.TestClient.Commands.RunTestScenarios {
-	internal class MassProjectionsScenario : ProjectionsKillScenario {
-		private readonly Random _random = new Random();
-
-		public MassProjectionsScenario(Action<IPEndPoint, byte[]> directSendOverTcp, int maxConcurrentRequests,
-			int threads, int streams, int eventsPerStream, int streamDeleteStep, string dbParentPath,
-			NodeConnectionInfo customNode)
-			: base(directSendOverTcp, maxConcurrentRequests, threads, streams, eventsPerStream, streamDeleteStep,
-				dbParentPath, customNode) {
-		}
-
-		protected override void RunInternal() {
-			var success = true;
-
-			var nodeProcessId = StartNode();
-			EnableProjectionByCategory();
-
-			var countProjections = new List<string>();
-			var bankProjections = new List<string>();
-
-			var writeTasks = new List<Task>();
-
-			while (GetIterationCode() < Streams / 3) {
-				writeTasks.Add(WriteData());
-
-				SetNextIterationCode();
-
-				countProjections.Add(CreateCountItem());
-				bankProjections.Add(CreateSumCheckForBankAccount0());
-
-				Log.Information("Created {bankProjections} and {countProjections}", bankProjections[bankProjections.Count - 1],
-					countProjections[countProjections.Count - 1]);
-			}
-
-			KillNode(nodeProcessId);
-			nodeProcessId = StartNode();
-
-			writeTasks.Add(WriteData());
-
-			var writeTask = Task.Factory.ContinueWhenAll(writeTasks.ToArray(), tsks => Log.Information("All Data written"));
-
-			KillNode(nodeProcessId);
-			nodeProcessId = StartNode();
-
-			int count = 10;
-			while (count > 0) {
-				Log.Information("Stop and start projection, remaining iterations {count}, waiting for data to be written.",
-					count);
-
-				StartOrStopProjection(countProjections, false);
-				StartOrStopProjection(bankProjections, false);
-
-				Thread.Sleep(TimeSpan.FromSeconds(10));
-
-				StartOrStopProjection(countProjections, true);
-				StartOrStopProjection(bankProjections, true);
-
-				if (writeTask.IsCompleted)
-					count -= 1;
-
-				if (writeTask.IsFaulted)
-					throw new ApplicationException("Failed to write data", writeTask.Exception);
-
-				success = CheckProjectionState(bankProjections[bankProjections.Count - 1],
-					"success",
-					x => x == (EventsPerStream - 1).ToString());
-				if (success)
-					break;
-
-				var sleepTimeSeconds = 10 + Streams * EventsPerStream / 1000.0;
-				Log.Information("Sleep 1 for {sleepTime} seconds, remaining count {count}", sleepTimeSeconds, count);
-				Thread.Sleep(TimeSpan.FromSeconds(sleepTimeSeconds));
-			}
-
-			writeTask.Wait();
-
-			count = 20;
-			success = false;
-			while (!success && count > 0) {
-				Log.Information("Wait until projections are computed, remaining iterations {count}", count);
-				KillNode(nodeProcessId);
-				nodeProcessId = StartNode();
-
-				success = CheckProjectionState(bankProjections[bankProjections.Count - 1],
-					"success",
-					x => x == (EventsPerStream - 1).ToString());
-
-				if (success)
-					break;
-
-				var sleepTimeSeconds = 10 + (Streams * EventsPerStream) / 500;
-				Log.Information("Sleep 2 for {sleepTime} seconds, remaining count {count}", sleepTimeSeconds, count);
-				Thread.Sleep(TimeSpan.FromSeconds(sleepTimeSeconds));
-
-				count -= 1;
-			}
-
-			if (!success)
-				throw new ApplicationException("Last bank projection failed");
-		}
-		
-		private void StartOrStopProjection(IEnumerable<string> projections, bool enable) {
-			var manager = GetProjectionsManager();
-			const int retriesNumber = 5;
-
-			foreach (var projection in projections.ToArray()) {
-				var retry = 0;
-
-				int shortWait = 50 + _random.Next(100);
-				Log.Debug("Wait for {waitTime}ms before next enable/disable projection", shortWait);
-				Thread.Sleep(shortWait);
-
-				while (retry <= retriesNumber) {
-					var isRunning = GetProjectionIsRunning(projection);
-
-					try {
-						if (enable) {
-							if (!isRunning)
-								manager.EnableAsync(projection, AdminCredentials).Wait();
-							else
-								Log.Information("Projection '{projection}' is already running and will not be enabled.",
-									projection);
-						} else {
-							if (isRunning)
-								manager.DisableAsync(projection, AdminCredentials).Wait();
-							else
-								Log.Information(
-									"Projection '{projection}' is already not running and will not be disabled again.",
-									projection);
-						}
-
-						break;
-					} catch (Exception ex) {
-						var waitForMs = 5000 + (retry * (3000 + _random.Next(2000)));
-
-						Log.Information(ex,
-							"Failed to StartOrStopProjection (enable:{enable}; isRunning:{isRunning}) projection {projection}, retry #{retry}, wait {waitTime}ms",
-							enable,
-							isRunning,
-							projection,
-							retry,
-							waitForMs);
-
-						if (retry != 0)
-							Thread.Sleep(waitForMs);
-
-						if (retry == retriesNumber)
-							throw new ApplicationException(string.Format(
-									"Failed to StartOrStopProjection (enable:{0}) projection {1}," +
-									" max number ({2}) of retries reached.",
-									enable,
-									projection,
-									retry),
-								ex);
-					}
-
-
-					retry++;
-				}
-			}
-		}
-
-		private int _iterationCode;
-
-		protected override int GetIterationCode() {
-			return _iterationCode;
-		}
-
-		private void SetNextIterationCode() {
-			_iterationCode += 1;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/RunTestScenarios/NodeConnectionInfo.cs b/src/EventStore.TestClient/Commands/RunTestScenarios/NodeConnectionInfo.cs
deleted file mode 100644
index 4420a0175b8..00000000000
--- a/src/EventStore.TestClient/Commands/RunTestScenarios/NodeConnectionInfo.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Net;
-
-namespace EventStore.TestClient.Commands.RunTestScenarios {
-	internal class NodeConnectionInfo {
-		public IPAddress IpAddress { get; private set; }
-		public int TcpPort { get; private set; }
-		public int HttpPort { get; private set; }
-
-		public NodeConnectionInfo(IPAddress ipAddress, int tcpPort, int httPort) {
-			IpAddress = ipAddress;
-			TcpPort = tcpPort;
-			HttpPort = httPort;
-		}
-
-		public override string ToString() {
-			return string.Format("[{0}:{1}:{2}]", IpAddress, TcpPort, HttpPort);
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/RunTestScenarios/ProjForeachForcedCommonNameScenario.cs b/src/EventStore.TestClient/Commands/RunTestScenarios/ProjForeachForcedCommonNameScenario.cs
deleted file mode 100644
index e6db25544bd..00000000000
--- a/src/EventStore.TestClient/Commands/RunTestScenarios/ProjForeachForcedCommonNameScenario.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.TestClient.Commands.DvuBasic;
-
-namespace EventStore.TestClient.Commands.RunTestScenarios {
-	internal class ProjForeachForcedCommonNameScenario : ProjectionsScenarioBase {
-		private int _iterationCode = 0;
-		private TimeSpan _executionPeriod;
-
-		public ProjForeachForcedCommonNameScenario(Action<IPEndPoint, byte[]> directSendOverTcp,
-			int maxConcurrentRequests, int connections, int streams, int eventsPerStream, int streamDeleteStep,
-			TimeSpan executionPeriod, string dbParentPath, NodeConnectionInfo customNode)
-			: base(directSendOverTcp, maxConcurrentRequests, connections, streams, eventsPerStream, streamDeleteStep,
-				dbParentPath, customNode) {
-			_executionPeriod = executionPeriod;
-		}
-
-		private EventData CreateBankEvent(int version) {
-			var accountObject = BankAccountEventFactory.CreateAccountObject(version);
-			var @event = BankAccountEvent.FromEvent(accountObject);
-			return @event;
-		}
-
-		protected virtual int GetIterationCode() {
-			return _iterationCode;
-		}
-
-		protected virtual bool ShouldRestartNode {
-			get { return true; }
-		}
-
-		protected override void RunInternal() {
-			var started = DateTime.UtcNow;
-
-			while ((DateTime.UtcNow - started) < _executionPeriod) {
-				var msg = string.Format(
-					"=================== Start run #{0}, elapsed {1} of {2} minutes, {3} =================== ",
-					GetIterationCode(),
-					(int)(DateTime.Now - started).TotalMinutes,
-					_executionPeriod.TotalMinutes,
-					GetType().Name);
-				Log.Information(
-					"=================== Start run #{iteration}, elapsed {elapsed} of {executionPeriod} minutes, {type} =================== ",
-					GetIterationCode(),
-					(int)(DateTime.Now - started).TotalMinutes,
-					_executionPeriod.TotalMinutes,
-					GetType().Name);
-				Log.Information("##teamcity[message '{message}']", msg);
-
-
-				InnerRun();
-				_iterationCode += 1;
-			}
-		}
-
-		private void InnerRun() {
-			int nodeProcessId = -1;
-
-			if (ShouldRestartNode)
-				nodeProcessId = StartNode();
-
-			EnableProjectionByCategory();
-
-			var sumCheckForBankAccounts = CreateSumCheckForBankAccounts("sumCheckForBankAccounts", "1");
-			var sumCheckForBankAccounts2 = CreateSumCheckForBankAccounts("sumCheckForBankAccounts", "2");
-
-			var projections = new[] {sumCheckForBankAccounts, sumCheckForBankAccounts2};
-
-			var writeTask = WriteData();
-
-			bool failed = false;
-			string failReason = null;
-
-			var isWatchStarted = false;
-			var expectedAllEventsCount = Streams + (Streams * EventsPerStream);
-
-			var stopWatch = new Stopwatch();
-
-			var waitDuration = TimeSpan.FromMilliseconds(20 * 1000 + 5 * Streams * EventsPerStream);
-			while (stopWatch.Elapsed < waitDuration) {
-				if (writeTask.IsFaulted)
-					throw new ApplicationException("Failed to write data");
-
-				if (writeTask.IsCompleted && !stopWatch.IsRunning) {
-					stopWatch.Start();
-					isWatchStarted = true;
-				}
-
-				if (isWatchStarted)
-					stopWatch.Stop();
-
-				failed = CheckIsFaulted(projections, out failReason);
-				if (failed)
-					break;
-
-				if (CheckIsCompleted(projections, expectedAllEventsCount))
-					break;
-
-				Thread.Sleep((int)(waitDuration.TotalMilliseconds / 6));
-
-				failed = CheckIsFaulted(projections, out failReason);
-				if (failed)
-					break;
-
-				if (ShouldRestartNode) {
-					KillNode(nodeProcessId);
-					nodeProcessId = StartNode();
-				}
-
-				if (isWatchStarted)
-					stopWatch.Start();
-			}
-
-			writeTask.Wait();
-
-			for (int i = 3; i < 11; ++i) {
-				var newSumCheckForBankAccounts = CreateSumCheckForBankAccounts("sumCheckForBankAccounts", i.ToString());
-				Thread.Sleep(200);
-				failed = CheckIsFaulted(new[] {newSumCheckForBankAccounts}, out failReason);
-
-				if (failed)
-					break;
-			}
-
-			if (ShouldRestartNode)
-				KillNode(nodeProcessId);
-
-			if (failed)
-				throw new ApplicationException(string.Format("Projection failed due to reason: {0}.", failReason));
-		}
-
-		private bool CheckIsFaulted(IEnumerable<string> projectionsNames, out string failReason) {
-			var faulted = false;
-			failReason = null;
-			foreach (var projectionName in projectionsNames) {
-				faulted = faulted || GetProjectionIsFaulted(projectionName, out failReason);
-			}
-
-			return faulted;
-		}
-
-		private bool CheckIsCompleted(IEnumerable<string> projectionsNames, int expectedAllEventsCount) {
-			var completed = false;
-			foreach (var projectionName in projectionsNames) {
-				var position = GetProjectionPosition(projectionName);
-				if (position == expectedAllEventsCount) {
-					Log.Debug("Expected position reached in {projection}, done.", projectionName);
-					completed = true;
-				}
-			}
-
-			return completed;
-		}
-
-		protected Task WriteData() {
-			var streams = Enumerable.Range(0, Streams)
-				.Select(i => string.Format("bank_account_it{0}-{1}", GetIterationCode(), i)).ToArray();
-			var slices = Split(streams, 3);
-
-			var w1 = Write(WriteMode.SingleEventAtTime, slices[0], EventsPerStream, CreateBankEvent);
-			var w2 = Write(WriteMode.Bucket, slices[1], EventsPerStream, CreateBankEvent);
-			var w3 = Write(WriteMode.Transactional, slices[2], EventsPerStream, CreateBankEvent);
-
-			var task = Task.Factory.ContinueWhenAll(new[] {w1, w2, w3}, Task.WaitAll);
-			return task.ContinueWith(x => Log.Information("Data written for iteration {iteration}.", GetIterationCode()));
-		}
-
-		protected string CreateSumCheckForBankAccounts(string projectionName, string suffix = "") {
-			var fullProjectionName = string.Format("{0}_it{1}_{2}", projectionName, GetIterationCode(), suffix);
-			var countItemsProjection = string.Format(@"
-                fromCategory('bank_account_it{1}').foreachStream().when({{
-                    $init: function() {{ 
-                        return {{credited:0, credsum:'', debited:0, debsum:''}}; 
-                    }},
-                    AccountCredited: function (state, event) {{ 
-                        state.credited += event.body.creditedAmount; 
-                        /*state.credsum += '#' + event.sequenceNumber + ':' + event.body.creditedAmount + ';'*/ 
-                    }},
-                    AccountDebited: function (state, event) {{ 
-                        state.debited += event.body.debitedAmount; 
-                        /*state.debsum += '#' + event.sequenceNumber + ':' + event.body.debitedAmount + ';'*/ 
-                    }},
-                    AccountCheckPoint: function(state, event) {{ 
-                        if (state.credited != event.body.creditedAmount) {{
-                            throw JSON.stringify({{
-                                message: 'Credited amount is incorrect. ',
-                                expected: event.body.creditedAmount,
-                                actual: state.credited,
-                                stream: event.streamId,
-                                ver: event.sequenceNumber,
-                                details: state.credsum }});
-                        }}
-                        if (state.debited != event.body.debitedAmount) {{
-                            throw JSON.stringify({{
-                                message: 'Debited amount is incorrect. ',
-                                expected: event.body.debitedAmount,
-                                actual: state.debited,
-                                stream: event.streamId,
-                                ver: event.sequenceNumber,
-                                details: state.debsum }});
-                        }}
-                        state.success=event.sequenceNumber;
-                    }}
-                }})
-", projectionName, GetIterationCode());
-
-			GetProjectionsManager().CreateContinuousAsync(fullProjectionName, countItemsProjection, AdminCredentials)
-				.Wait();
-
-			return fullProjectionName;
-		}
-	}
-
-	internal class ProjForeachForcedCommonNameNoRestartScenario : ProjForeachForcedCommonNameScenario {
-		public ProjForeachForcedCommonNameNoRestartScenario(Action<IPEndPoint, byte[]> directSendOverTcp,
-			int maxConcurrentRequests,
-			int connections,
-			int streams,
-			int eventsPerStream,
-			int streamDeleteStep,
-			TimeSpan executionPeriod,
-			string dbParentPath,
-			NodeConnectionInfo customNode)
-			: base(directSendOverTcp, maxConcurrentRequests, connections, streams, eventsPerStream, streamDeleteStep,
-				executionPeriod, dbParentPath, customNode) {
-		}
-
-		protected override bool ShouldRestartNode {
-			get { return false; }
-		}
-
-		protected override void RunInternal() {
-			StartNode();
-			base.RunInternal();
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/RunTestScenarios/ProjectionWrongTagCheck.cs b/src/EventStore.TestClient/Commands/RunTestScenarios/ProjectionWrongTagCheck.cs
deleted file mode 100644
index 90f21b91978..00000000000
--- a/src/EventStore.TestClient/Commands/RunTestScenarios/ProjectionWrongTagCheck.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace EventStore.TestClient.Commands.RunTestScenarios {
-	internal class ProjectionWrongTagCheck : ProjectionsKillScenario {
-		private TimeSpan _executionPeriod;
-
-		public ProjectionWrongTagCheck(Action<IPEndPoint, byte[]> directSendOverTcp, int maxConcurrentRequests,
-			int connections, int streams, int eventsPerStream, int streamDeleteStep, TimeSpan executionPeriod,
-			string dbParentPath, NodeConnectionInfo customNode)
-			: base(directSendOverTcp, maxConcurrentRequests, connections, streams, eventsPerStream, streamDeleteStep,
-				dbParentPath, customNode) {
-			_executionPeriod = executionPeriod;
-		}
-
-		private int _iterationCode = 0;
-
-		protected override int GetIterationCode() {
-			return _iterationCode;
-		}
-
-		protected void SetNextIterationCode() {
-			_iterationCode += 1;
-		}
-
-		protected override void RunInternal() {
-			var nodeProcessId = StartNode();
-			EnableProjectionByCategory();
-			KillNode(nodeProcessId);
-
-			var stopWatch = Stopwatch.StartNew();
-
-			while (stopWatch.Elapsed < _executionPeriod) {
-				var msg = string.Format(
-					"=================== Start run #{0}, elapsed {1} of {2} minutes, {3} =================== ",
-					GetIterationCode(),
-					(int)stopWatch.Elapsed.TotalMinutes,
-					_executionPeriod.TotalMinutes,
-					GetType().Name);
-
-				Log.Information(
-					"=================== Start run #{iteration}, elapsed {elapsed} of {executionPeriod} minutes, {type} =================== ",
-					GetIterationCode(),
-					(int)stopWatch.Elapsed.TotalMinutes,
-					_executionPeriod.TotalMinutes,
-					GetType().Name);
-				Log.Information("##teamcity[message '{message}']", msg);
-
-				var iterationTask = RunIteration();
-				iterationTask.Wait();
-
-				SetNextIterationCode();
-			}
-		}
-
-		private Task RunIteration() {
-			var nodeProcessId = StartNode();
-
-
-			var sumCheckForBankAccount0 = CreateSumCheckForBankAccount0();
-
-			var writeTask = WriteData();
-
-			var lastExpectedEventVersion = (EventsPerStream - 1).ToString();
-
-			var successTask = Task.Factory.StartNew<bool>(() => {
-				var success = true;
-				var stopWatch = new Stopwatch();
-
-				var wasLessLastTime = false;
-				while (stopWatch.Elapsed < TimeSpan.FromMilliseconds(10 * (Streams * EventsPerStream + Streams))) {
-					if (!wasLessLastTime) {
-						KillNode(nodeProcessId);
-						nodeProcessId = StartNode();
-					}
-
-					if (writeTask.IsFaulted)
-						throw new ApplicationException("Failed to write data");
-
-					if (writeTask.IsCompleted && !stopWatch.IsRunning) {
-						stopWatch.Start();
-					}
-
-					var count1 = GetProjectionStateValue(sumCheckForBankAccount0, "success", int.Parse, -1);
-					for (var i = 0; i < 5; ++i) {
-						Thread.Sleep(TimeSpan.FromSeconds(1));
-						var count2 = GetProjectionStateValue(sumCheckForBankAccount0, "success", int.Parse, -1);
-
-						if (count1 > count2) {
-							if (wasLessLastTime) {
-								success = false;
-								break;
-							}
-
-							wasLessLastTime = true;
-						}
-
-						count1 = count2;
-					}
-
-					if (!success)
-						break;
-
-					if (CheckProjectionState(sumCheckForBankAccount0, "success", x => x == lastExpectedEventVersion))
-						break;
-				}
-
-				KillNode(nodeProcessId);
-
-				if (!success)
-					throw new ApplicationException(string.Format(
-						"Projection {0} has not completed with expected result {1} in time.", sumCheckForBankAccount0,
-						lastExpectedEventVersion));
-
-				return success;
-			});
-
-			return Task.Factory.ContinueWhenAll(new[] {writeTask, successTask}, tasks => {
-				Log.Information("Iteration {iteration} tasks completed", GetIterationCode());
-				Task.WaitAll(tasks);
-				Log.Information("Iteration {iteration} successful", GetIterationCode());
-			});
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/RunTestScenarios/ProjectionsKillScenario.cs b/src/EventStore.TestClient/Commands/RunTestScenarios/ProjectionsKillScenario.cs
deleted file mode 100644
index c95b2273b94..00000000000
--- a/src/EventStore.TestClient/Commands/RunTestScenarios/ProjectionsKillScenario.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.TestClient.Commands.DvuBasic;
-
-namespace EventStore.TestClient.Commands.RunTestScenarios {
-	internal class ProjectionsKillScenario : ProjectionsScenarioBase {
-		public ProjectionsKillScenario(Action<IPEndPoint, byte[]> directSendOverTcp,
-			int maxConcurrentRequests,
-			int connections,
-			int streams,
-			int eventsPerStream,
-			int streamDeleteStep,
-			string dbParentPath,
-			NodeConnectionInfo customNode)
-			: base(directSendOverTcp, maxConcurrentRequests, connections, streams, eventsPerStream, streamDeleteStep,
-				dbParentPath, customNode) {
-		}
-
-		private EventData CreateBankEvent(int version) {
-			var accountObject = BankAccountEventFactory.CreateAccountObject(version);
-			var @event = BankAccountEvent.FromEvent(accountObject);
-			return @event;
-		}
-
-		protected virtual int GetIterationCode() {
-			return 0;
-		}
-
-		protected override void RunInternal() {
-			var nodeProcessId = StartNode();
-			EnableProjectionByCategory();
-
-			var countItem = CreateCountItem();
-			var sumCheckForBankAccount0 = CreateSumCheckForBankAccount0();
-
-			var writeTask = WriteData();
-
-			var success = false;
-			var expectedAllEventsCount = (Streams * EventsPerStream).ToString();
-			var lastExpectedEventVersion = (EventsPerStream - 1).ToString();
-
-			var isWatchStarted = false;
-
-			var stopWatch = new Stopwatch();
-
-			var waitDuration = TimeSpan.FromMilliseconds(20 * 1000 + 5 * Streams * EventsPerStream);
-			while (stopWatch.Elapsed < waitDuration) {
-				if (writeTask.IsFaulted)
-					throw new ApplicationException("Failed to write data");
-
-				if (writeTask.IsCompleted && !stopWatch.IsRunning) {
-					stopWatch.Start();
-					isWatchStarted = true;
-				}
-
-				success = CheckProjectionState(countItem, "count", x => x == expectedAllEventsCount)
-				          && CheckProjectionState(sumCheckForBankAccount0, "success",
-					          x => x == lastExpectedEventVersion);
-
-				if (success)
-					break;
-
-				if (isWatchStarted)
-					stopWatch.Stop();
-
-				Thread.Sleep((int)(waitDuration.TotalMilliseconds / 10));
-
-				KillNode(nodeProcessId);
-				nodeProcessId = StartNode();
-
-				if (isWatchStarted)
-					stopWatch.Start();
-			}
-
-			writeTask.Wait();
-
-			KillNode(nodeProcessId);
-
-			if (!success)
-				throw new ApplicationException(
-					string.Format("Projections did not complete with expected result in time"));
-		}
-
-		protected Task WriteData() {
-			var streams = Enumerable.Range(0, Streams)
-				.Select(i => string.Format("bank_account_it{0}-{1}", GetIterationCode(), i)).ToArray();
-			var slices = Split(streams, 3);
-
-			var w1 = Write(WriteMode.SingleEventAtTime, slices[0], EventsPerStream, CreateBankEvent);
-			var w2 = Write(WriteMode.Bucket, slices[1], EventsPerStream, CreateBankEvent);
-			var w3 = Write(WriteMode.Transactional, slices[2], EventsPerStream, CreateBankEvent);
-
-			var task = Task.Factory.ContinueWhenAll(new[] {w1, w2, w3}, Task.WaitAll);
-			return task.ContinueWith(x => Log.Information("Data written for iteration {iteration}.", GetIterationCode()));
-		}
-
-		protected string CreateCountItem() {
-			var projectionManager = GetProjectionsManager();
-
-			string countItemsProjectionName = string.Format("CountItems_it{0}", GetIterationCode());
-			string countItemsProjection = string.Format(@"
-                fromCategory('bank_account_it{0}').when({{
-                $init: function() {{ return {{count:0}}; }},
-                AccountCredited: function (state, event) {{ 
-                                        state.count += 1; 
-                                    }},
-                AccountDebited: function (state, event) {{ 
-                                        state.count += 1; 
-                                    }},
-                AccountCheckPoint: function (state, event) {{ 
-                                        state.count += 1; 
-                                    }}
-                }})
-", GetIterationCode());
-
-			projectionManager.CreateContinuousAsync(countItemsProjectionName, countItemsProjection, AdminCredentials)
-				.Wait();
-			return countItemsProjectionName;
-		}
-
-		protected string CreateSumCheckForBankAccount0() {
-			string countItemsProjectionName = string.Format("CheckSumsInAccounts_it{0}", GetIterationCode());
-			string countItemsProjection = string.Format(@"
-                fromStream('bank_account_it{0}-0').when({{
-                    $init: function() {{ 
-                        return {{credited:0, credsum:'', debited:0, debsum:''}}; 
-                    }},
-                    AccountCredited: function (state, event) {{ 
-                        state.credited += event.body.creditedAmount; 
-                        /*state.credsum += '#' + event.sequenceNumber + ':' + event.body.creditedAmount + ';'*/ 
-                    }},
-                    AccountDebited: function (state, event) {{ 
-                        state.debited += event.body.debitedAmount; 
-                        /*state.debsum += '#' + event.sequenceNumber + ':' + event.body.debitedAmount + ';'*/ 
-                    }},
-                    AccountCheckPoint: function(state, event) {{ 
-                        if (state.credited != event.body.creditedAmount) {{
-                            throw JSON.stringify({{
-                                message: 'Credited amount is incorrect. ',
-                                expected: event.body.creditedAmount,
-                                actual: state.credited,
-                                stream: event.streamId,
-                                ver: event.sequenceNumber,
-                                details: state.credsum }});
-                        }}
-                        if (state.debited != event.body.debitedAmount) {{
-                            throw JSON.stringify({{
-                                message: 'Debited amount is incorrect. ',
-                                expected: event.body.debitedAmount,
-                                actual: state.debited,
-                                stream: event.streamId,
-                                ver: event.sequenceNumber,
-                                details: state.debsum }});
-                        }}
-                        state.success=event.sequenceNumber;
-                    }}
-                }})                
-", GetIterationCode());
-
-			GetProjectionsManager()
-				.CreateContinuousAsync(countItemsProjectionName, countItemsProjection, AdminCredentials).Wait();
-
-			return countItemsProjectionName;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/RunTestScenarios/ProjectionsScenarioBase.cs b/src/EventStore.TestClient/Commands/RunTestScenarios/ProjectionsScenarioBase.cs
deleted file mode 100644
index 393113d04c4..00000000000
--- a/src/EventStore.TestClient/Commands/RunTestScenarios/ProjectionsScenarioBase.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Threading;
-using EventStore.Transport.Http.Codecs;
-
-namespace EventStore.TestClient.Commands.RunTestScenarios {
-	internal abstract class ProjectionsScenarioBase : ScenarioBase {
-		protected ProjectionsScenarioBase(Action<IPEndPoint, byte[]> directSendOverTcp, int maxConcurrentRequests,
-			int connections, int streams, int eventsPerStream, int streamDeleteStep, string dbParentPath,
-			NodeConnectionInfo customNode)
-			: base(directSendOverTcp, maxConcurrentRequests, connections, streams, eventsPerStream, streamDeleteStep,
-				dbParentPath, customNode) {
-		}
-
-		protected bool CheckProjectionState(string projectionName, string key, Func<string, bool> checkValue) {
-			var state = GetProjectionState(projectionName);
-			string value;
-			return state != null && state.Count > 0 && state.TryGetValue(key, out value) && checkValue(value);
-		}
-
-		protected T GetProjectionStateValue<T>(string projectionName, string key, Func<string, T> convert,
-			T defaultValue) {
-			var result = defaultValue;
-
-			var state = GetProjectionState(projectionName);
-			string value;
-			if (state != null && state.Count > 0 && state.TryGetValue(key, out value))
-				result = convert(value);
-
-			return result;
-		}
-
-		protected bool GetProjectionIsRunning(string projectionName) {
-			var dic = GetProjectionStatistics(projectionName);
-
-			string value;
-			var isRunning = dic != null && dic.TryGetValue("status", out value) && value == "Running";
-
-			return isRunning;
-		}
-
-		protected long GetProjectionPosition(string projectionName) {
-			var dic = GetProjectionStatistics(projectionName);
-
-			long result = -1;
-
-			string value;
-			if (dic != null && dic.TryGetValue("position", out value)) {
-				if (!string.IsNullOrWhiteSpace(value)) {
-					var subpositions = value.Split(':');
-					var positionString = subpositions.Length == 2 ? subpositions[1] : value;
-					result = long.Parse(positionString);
-				} else {
-					result = -1;
-				}
-
-				return result;
-			}
-
-			return result;
-		}
-
-		protected bool GetProjectionIsFaulted(string projectionName, out string reason) {
-			var dic = GetProjectionStatistics(projectionName);
-
-			string status;
-			var isFaulted = dic != null && dic.TryGetValue("status", out status) && status.StartsWith("Faulted");
-
-			if (isFaulted)
-				dic.TryGetValue("stateReason", out reason);
-			else
-				reason = null;
-
-			return isFaulted;
-		}
-
-		private Dictionary<string, string> GetProjectionStatistics(string projectionName) {
-			string rawState;
-			try {
-				rawState = GetProjectionsManager().GetStatisticsAsync(projectionName, AdminCredentials).Result;
-			} catch (Exception ex) {
-				Log.Information(ex, "Failed to read projection statistics. Will continue.");
-				rawState = null;
-			}
-
-			Log.Information("Raw {projection} stats: {rawState}", projectionName, rawState);
-
-			if (string.IsNullOrEmpty(rawState))
-				return null;
-
-			if (rawState == "*** UNKNOWN ***")
-				return null;
-
-			var start = rawState.IndexOf('[');
-			var end = rawState.IndexOf(']');
-
-			if (start == -1 || end == -1)
-				return null;
-
-			var statDic = rawState.Substring(start + 1, end - start - 1);
-
-			var state = Codec.Json.From<Dictionary<string, string>>(statDic);
-			return state;
-		}
-
-		private Dictionary<string, string> GetProjectionState(string projectionName) {
-			var rawState = GetProjectionStateSafe(projectionName);
-
-			Log.Information("Raw {projection} state: {rawState}", projectionName, rawState);
-
-			if (string.IsNullOrEmpty(rawState))
-				return null;
-
-			if (rawState == "*** UNKNOWN ***")
-				return null;
-
-			var state = Codec.Json.From<Dictionary<string, string>>(rawState);
-			return state;
-		}
-
-		private string GetProjectionStateSafe(string projectionName) {
-			string rawState;
-			try {
-				rawState = GetProjectionsManager().GetStateAsync(projectionName, AdminCredentials).Result;
-			} catch (Exception ex) {
-				rawState = null;
-				Log.Information(ex, "Failed to get projection state");
-			}
-
-			return rawState;
-		}
-
-		protected void EnableProjectionByCategory() {
-			const string byCategoryProjection = "$by_category";
-
-			var retryCount = 0;
-			Exception exception = null;
-			while (retryCount < 5) {
-				Thread.Sleep(250 * (retryCount * retryCount));
-				try {
-					var isRunning = GetProjectionIsRunning(byCategoryProjection);
-
-					if (!isRunning) {
-						Log.Debug("Enable *{projection}* projection", byCategoryProjection);
-						GetProjectionsManager().EnableAsync(byCategoryProjection, AdminCredentials).Wait();
-					} else {
-						Log.Debug("Already enabled *{projection}* projection", byCategoryProjection);
-					}
-
-					exception = null;
-					break;
-				} catch (Exception ex) {
-					exception = new ApplicationException("Failed to enable by_category.", ex);
-					Log.Error(ex, "Failed to enable *$by_category* projection, retry #{retryCount}.",
-						retryCount);
-				}
-
-				retryCount += 1;
-			}
-
-			if (exception != null)
-				throw exception;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/RunTestScenarios/ScenarioBase.cs b/src/EventStore.TestClient/Commands/RunTestScenarios/ScenarioBase.cs
deleted file mode 100644
index 34310280308..00000000000
--- a/src/EventStore.TestClient/Commands/RunTestScenarios/ScenarioBase.cs
+++ /dev/null
@@ -1,601 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.ClientAPI.SystemData;
-using EventStore.Core.Services;
-using ConsoleLogger = EventStore.ClientAPI.Common.Log.ConsoleLogger;
-using ILogger = Serilog.ILogger;
-using TcpCommand = EventStore.Core.Services.Transport.Tcp.TcpCommand;
-using TcpPackage = EventStore.Core.Services.Transport.Tcp.TcpPackage;
-using EventStore.ClientAPI.Projections;
-
-namespace EventStore.TestClient.Commands.RunTestScenarios {
-	internal abstract class ScenarioBase : IScenario {
-		protected static readonly ILogger Log = Serilog.Log.ForContext<ScenarioBase>();
-
-		protected static readonly ClientAPI.ILogger ApiLogger =
-			new ClientApiLoggerBridge(Serilog.Log.ForContext(Serilog.Core.Constants.SourceContextPropertyName,
-				"client-api"));
-
-		protected readonly UserCredentials AdminCredentials =
-			new UserCredentials(SystemUsers.Admin, SystemUsers.DefaultAdminPassword);
-
-		protected readonly Action<IPEndPoint, byte[]> DirectSendOverTcp;
-		protected readonly int MaxConcurrentRequests;
-		protected readonly int Connections;
-		protected readonly int Streams;
-		protected readonly int EventsPerStream;
-		protected readonly int StreamDeleteStep;
-
-		private readonly NodeConnectionInfo _customNodeConnection;
-		private readonly NodeConnectionInfo _nodeConnection;
-
-		private readonly HashSet<int> _startedNodesProcIds;
-
-		private readonly string _dbPath;
-
-		private readonly Dictionary<WriteMode, Func<string, int, Func<int, EventData>, Task>> _writeHandlers;
-		private readonly IEventStoreConnection[] _connections;
-		private int _nextConnectionNum = -1;
-		private readonly ProjectionsManager _projectionsManager;
-
-		protected virtual TimeSpan StartupWaitInterval {
-			get { return TimeSpan.FromSeconds(12); }
-		}
-
-		protected ScenarioBase(Action<IPEndPoint, byte[]> directSendOverTcp,
-			int maxConcurrentRequests,
-			int connections,
-			int streams,
-			int eventsPerStream,
-			int streamDeleteStep,
-			string dbParentPath,
-			NodeConnectionInfo customNodeConnection) {
-			DirectSendOverTcp = directSendOverTcp;
-			MaxConcurrentRequests = maxConcurrentRequests;
-			Connections = connections;
-			Streams = streams;
-			EventsPerStream = eventsPerStream;
-			StreamDeleteStep = streamDeleteStep;
-			_customNodeConnection = customNodeConnection;
-
-			_startedNodesProcIds = new HashSet<int>();
-
-			var ipAddress = IPAddress.Loopback;
-
-			if (_customNodeConnection != null) {
-				_nodeConnection = _customNodeConnection;
-				_dbPath = null;
-			} else {
-				_dbPath = CreateNewDbPath(dbParentPath);
-				_nodeConnection = new NodeConnectionInfo(ipAddress,
-					PortsHelper.GetAvailablePort(ipAddress),
-					PortsHelper.GetAvailablePort(ipAddress));
-			}
-
-			_connections = new IEventStoreConnection[connections];
-
-			Log.Information("Projection manager points to {nodeConnection}.", _nodeConnection);
-			_projectionsManager = new ProjectionsManager(new ConsoleLogger(),
-				new IPEndPoint(_nodeConnection.IpAddress, _nodeConnection.HttpPort), TimeSpan.FromMilliseconds(5000));
-
-			_writeHandlers = new Dictionary<WriteMode, Func<string, int, Func<int, EventData>, Task>> {
-				{WriteMode.SingleEventAtTime, WriteSingleEventAtTime},
-				{WriteMode.Bucket, WriteBucketOfEventsAtTime},
-				{WriteMode.Transactional, WriteEventsInTransactionalWay}
-			};
-		}
-
-		private static string CreateNewDbPath(string dbParentPath) {
-			var dbParent = dbParentPath ?? Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-
-			var dataFolder = Path.Combine(dbParent, "data");
-			var idx = 0;
-			var dbPath = Path.Combine(dataFolder, string.Format("es_{0}", idx));
-
-			while (Directory.Exists(dbPath)) {
-				idx += 1;
-				dbPath = Path.Combine(dataFolder, string.Format("es_{0}", idx));
-			}
-
-			return dbPath;
-		}
-
-		protected IEventStoreConnection GetConnection() {
-			var connectionNum = (int)(((uint)Interlocked.Increment(ref _nextConnectionNum)) % Connections);
-			return _connections[connectionNum];
-		}
-
-		protected ProjectionsManager GetProjectionsManager() {
-			return _projectionsManager;
-		}
-
-		public void Run() {
-			const int maxReconnections = 200;
-			const int maxOperationRetries = 200;
-
-			for (int i = 0; i < Connections; ++i) {
-				_connections[i] = EventStoreConnection.Create(
-					ConnectionSettings.Create()
-						.UseCustomLogger(ApiLogger)
-						.LimitConcurrentOperationsTo(MaxConcurrentRequests)
-						.LimitRetriesForOperationTo(maxReconnections)
-						.LimitReconnectionsTo(maxOperationRetries)
-						.FailOnNoServerResponse(),
-					new Uri(string.Format("tcp://admin:changeit@{0}:{1}", _nodeConnection.IpAddress,
-						_nodeConnection.TcpPort)),
-					string.Format("ESConn-{0}", i));
-				_connections[i].Closed += (s, e) =>
-					Log.Debug("[SCENARIO] {connection} closed.", e.Connection.ConnectionName);
-				_connections[i].Connected += (s, e) =>
-					Log.Debug("[SCENARIO] {connection} connected to [{remoteEndPoint}].", e.Connection.ConnectionName,
-						e.RemoteEndPoint);
-				_connections[i].Disconnected += (s, e) =>
-					Log.Debug("[SCENARIO] {connection} disconnected from [{remoteEndPoint}].",
-						e.Connection.ConnectionName, e.RemoteEndPoint);
-				_connections[i].Reconnecting += (s, e) =>
-					Log.Debug("[SCENARIO] {connection} reconnecting.", e.Connection.ConnectionName);
-				_connections[i].ErrorOccurred += (s, e) => Log.Debug(e.Exception,
-					"[SCENARIO] {connection} error occurred.", e.Connection.ConnectionName);
-				_connections[i].ConnectAsync().Wait();
-			}
-
-			RunInternal();
-		}
-
-		protected abstract void RunInternal();
-
-		public void Clean() {
-			CloseConnections();
-			KillStartedNodes();
-			DeleteDatabase();
-		}
-
-		private void DeleteDatabase() {
-			try {
-				if (_dbPath != null) {
-					Log.Information("Deleting {dbPath}...", _dbPath);
-					Directory.Delete(_dbPath, true);
-					Log.Information("Deleted {dbPath}", _dbPath);
-				}
-			} catch (IOException ex) {
-				Log.Error(ex, "Failed to delete dir {dbPath}, IOException was raised", _dbPath);
-			} catch (UnauthorizedAccessException ex) {
-				Log.Error(ex, "Failed to delete dir {dbPath}, UnauthorizedAccessException was raised",
-					_dbPath);
-			}
-		}
-
-		protected T[][] Split<T>(IEnumerable<T> sequence, int parts) {
-			return sequence.Select((x, i) => new {GroupNum = i % parts, Item = x})
-				.GroupBy(x => x.GroupNum, y => y.Item)
-				.Select(x => x.ToArray())
-				.ToArray();
-		}
-
-
-		protected Task Write(WriteMode mode, string[] streams, int eventsPerStream) {
-			Func<int, EventData> createEvent = TestEvent.NewTestEvent;
-			return Write(mode, streams, eventsPerStream, createEvent);
-		}
-
-		protected Task Write(WriteMode mode, string[] streams, int eventsPerStream, Func<int, EventData> createEvent) {
-			Log.Information(
-				"Writing. Mode : {mode,-15} Streams : {streamsLength,-10} Events per stream : {eventsPerStream,-10}",
-				mode,
-				streams.Length,
-				eventsPerStream);
-
-			Func<string, int, Func<int, EventData>, Task> handler;
-			if (!_writeHandlers.TryGetValue(mode, out handler))
-				throw new ArgumentOutOfRangeException("mode");
-
-			var tasks = new List<Task>();
-			for (var i = 0; i < streams.Length; i++) {
-				//Console.WriteLine("WRITING TO {0}", streams[i]);
-				tasks.Add(handler(streams[i], eventsPerStream, createEvent));
-			}
-
-			return Task.Factory.ContinueWhenAll(tasks.ToArray(), tsks => {
-				Task.WaitAll(tsks);
-				Log.Information(
-					"Finished writing. Mode : {mode,-15} Streams : {streamsLength,-10} Events per stream : {eventsPerStream,-10}",
-					mode,
-					streams.Length,
-					eventsPerStream);
-			});
-		}
-
-		protected void DeleteStreams(IEnumerable<string> streams) {
-			Log.Information("Deleting streams...");
-			var store = GetConnection();
-
-			var tasks = new List<Task>();
-			foreach (var stream in streams) {
-				var s = stream;
-				Log.Information("Deleting stream {stream}...", stream);
-				var task = store.DeleteStreamAsync(stream, (EventsPerStream - 1), hardDelete: true)
-					.ContinueWith(x => Log.Information("Stream {stream} successfully deleted", s));
-
-				tasks.Add(task);
-			}
-
-			Task.WaitAll(tasks.ToArray());
-
-			Log.Information("All streams successfully deleted");
-		}
-
-		protected Task CheckStreamsDeleted(IEnumerable<string> streams) {
-			Log.Information("Verifying streams are deleted...");
-
-			var store = GetConnection();
-			var tasks = new List<Task>();
-
-			foreach (var stream in streams) {
-				var s = stream;
-				var task = store.ReadStreamEventsForwardAsync(stream, 0, 1, resolveLinkTos: false).ContinueWith(t => {
-					if (t.Result.Status != SliceReadStatus.StreamDeleted)
-						throw new Exception(string.Format("Stream '{0}' is not deleted, but should be!", s));
-				});
-
-				tasks.Add(task);
-			}
-
-			return Task.Factory.ContinueWhenAll(tasks.ToArray(), tsks => {
-				Task.WaitAll(tsks);
-				Log.Information("Stream deletion verification succeeded.");
-			});
-		}
-
-		protected Task Read(string[] streams, int @from, int count) {
-			if (streams.Length == 0) {
-				Debugger.Break();
-				throw new Exception("Streams shouldn't be empty.");
-			}
-
-			Log.Information("Reading [{streams}]\nfrom {from,-10} count {count,-10}", string.Join(",", streams), from, count);
-
-			var tasks = new List<Task>();
-
-			for (int i = 0; i < streams.Length; i++) {
-				var task = ReadStream(streams[i], from, count);
-				tasks.Add(task);
-			}
-
-			return Task.Factory.ContinueWhenAll(tasks.ToArray(), tsks => {
-				Task.WaitAll(tsks);
-				Log.Information("Done reading [{streams}]", string.Join(",", streams));
-			});
-		}
-
-		private bool TryGetPathToMono(out string pathToMono) {
-			const string monopathVariable = "EVENTSTORE_MONOPATH";
-			pathToMono = Environment.GetEnvironmentVariable(monopathVariable);
-			return !string.IsNullOrEmpty(pathToMono);
-		}
-
-		protected int StartNode() {
-			int processId = -1;
-			if (_customNodeConnection == null)
-				processId = StartNewNode();
-
-			return processId;
-		}
-
-		private int StartNewNode() {
-			var clientFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-			//../../EventStore.ClusterNode/net471/EventStore.ClusterNode.exe
-			var clusterNodeFolder = System.IO.Directory.GetParent(System.IO.Directory.GetParent(clientFolder).FullName)
-			                        + "/EventStore.ClusterNode/net471/";
-			string fileName;
-			string argumentsHead;
-
-			string pathToMono;
-			if (TryGetPathToMono(out pathToMono)) {
-				Log.Information("Mono at {pathToMono} will be used.", pathToMono);
-				fileName = pathToMono;
-				argumentsHead = string.Format("--debug --gc=sgen {0}",
-					Path.Combine(clusterNodeFolder, "EventStore.ClusterNode.exe"));
-			} else {
-				fileName = Path.Combine(clusterNodeFolder, "EventStore.ClusterNode.exe");
-				argumentsHead = "";
-			}
-
-			var arguments = string.Format(
-				"{0} --run-projections=all --ext-ip {1} --ext-tcp-port {2} --ext-http-port {3} --db {4}",
-				argumentsHead,
-				_nodeConnection.IpAddress,
-				_nodeConnection.TcpPort,
-				_nodeConnection.HttpPort,
-				_dbPath);
-
-			Log.Information("Starting [{fileName} {arguments}]...", fileName, arguments);
-
-			var startInfo = new ProcessStartInfo(fileName, arguments);
-
-			var nodeProcess = Process.Start(startInfo);
-			if (nodeProcess == null || nodeProcess.HasExited)
-				throw new ApplicationException(string.Format("Process was not started [{0} {1}].", fileName,
-					arguments));
-
-			Thread.Sleep(3000);
-			Process tmp;
-			var running = TryGetProcessById(nodeProcess.Id, out tmp);
-			if (!running || tmp.HasExited)
-				throw new ApplicationException(string.Format("Process was not started [{0} {1}].", fileName,
-					arguments));
-
-			_startedNodesProcIds.Add(nodeProcess.Id);
-
-			Log.Information("Started node with process id {id}", nodeProcess.Id);
-
-			Thread.Sleep(StartupWaitInterval);
-			Log.Information("Started [{fileName} {arguments}]", fileName, arguments);
-
-			return nodeProcess.Id;
-		}
-
-		private bool TryGetProcessById(int processId, out Process process) {
-			process = null;
-
-			try {
-				process = Process.GetProcessById(processId);
-			} catch (ArgumentException) {
-				return false;
-			} catch (InvalidOperationException) {
-				return false;
-			}
-
-			return true;
-		}
-
-		protected void KillNode(int processId) {
-			if (processId != -1)
-				KillStartedNode(processId);
-			else
-				Log.Information("Skip killing, procId -1");
-		}
-
-		private void KillStartedNode(int processId) {
-			Log.Information("Killing {processId}...", processId);
-
-			Process process;
-			if (TryGetProcessById(processId, out process)) {
-				process.Kill();
-
-				var waitCount = 200;
-				while (!process.HasExited && waitCount > 0) {
-					Thread.Sleep(250);
-					waitCount -= 1;
-				}
-
-				if (process.HasExited) {
-					_startedNodesProcIds.Remove(processId);
-
-					PortsHelper.ReturnPort(_nodeConnection.TcpPort);
-					PortsHelper.ReturnPort(_nodeConnection.HttpPort);
-
-					Log.Information("Killed process {processId}, wait a bit.", processId);
-					Thread.Sleep(1000); // wait for system to release port used by HttpListener.
-				} else {
-					Process temp;
-					if (TryGetProcessById(processId, out temp))
-						Log.Error(
-							"Process {processId} did not report about exit in time and is still present in processes list.",
-							processId);
-					else
-						Log.Information("Process {processId} did not report about exit in time but is not found again.",
-							processId);
-				}
-			} else
-				Log.Error("Process {processId} was not found to be killed.", processId);
-		}
-
-		public void Dispose() {
-			CloseConnections();
-			Thread.Sleep(2 * 1000);
-			KillStartedNodes();
-		}
-
-		private void CloseConnections() {
-			for (int i = 0; i < _connections.Length; ++i) {
-				_connections[i].Close();
-			}
-		}
-
-		private void KillStartedNodes() {
-			Log.Information("Killing remaining nodes...");
-			try {
-				_startedNodesProcIds.ToList().ForEach(KillNode);
-			} catch (Exception ex) {
-				Log.Error("Failed to kill started nodes: {e}.", ex.Message);
-			}
-		}
-
-		protected void Scavenge() {
-			Log.Information("Send scavenge command...");
-			var package = new TcpPackage(TcpCommand.ScavengeDatabase, Guid.NewGuid(), null).AsByteArray();
-			DirectSendOverTcp(new IPEndPoint(_nodeConnection.IpAddress, _nodeConnection.TcpPort), package);
-			Log.Information("Scavenge command was sent.");
-		}
-
-		private Task WriteSingleEventAtTime(string stream, int events, Func<int, EventData> createEvent) {
-			var resSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
-
-			Log.Information("Starting to write {events} events to [{stream}]", events, stream);
-			var store = GetConnection();
-			int eventVersion = 0;
-
-			Action<Task> fail = prevTask => {
-				Log.Information("WriteSingleEventAtTime for stream {stream} failed.", stream);
-				resSource.SetException(prevTask.Exception);
-			};
-
-			Action<Task> writeSingleEvent = null;
-			writeSingleEvent = _ => {
-				if (eventVersion == events) {
-					Log.Information("Wrote {events} events to [{stream}]", events, stream);
-					resSource.SetResult(null);
-					return;
-				}
-
-				var writeTask = store.AppendToStreamAsync(stream,
-					eventVersion - 1,
-					new[] {createEvent(eventVersion)});
-
-				eventVersion += 1;
-
-				writeTask.ContinueWith(fail, TaskContinuationOptions.OnlyOnFaulted);
-				writeTask.ContinueWith(writeSingleEvent, TaskContinuationOptions.OnlyOnRanToCompletion);
-			};
-
-			writeSingleEvent(null);
-
-			return resSource.Task;
-		}
-
-		private Task WriteBucketOfEventsAtTime(string stream, int eventCount, Func<int, EventData> createEvent) {
-			const int bucketSize = 25;
-			Log.Information("Starting to write {eventCount} events to [{stream}] ({bucketSize} events at once)", eventCount,
-				stream, bucketSize);
-
-			var resSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
-			var store = GetConnection();
-			int writtenCount = 0;
-
-			Action<Task> fail = prevTask => {
-				Log.Information("WriteBucketOfEventsAtTime for stream {stream} failed.", stream);
-				resSource.SetException(prevTask.Exception);
-			};
-
-			Action<Task> writeBatch = null;
-			writeBatch = _ => {
-				if (writtenCount == eventCount) {
-					Log.Information("Wrote {eventCount} events to [{stream}] ({bucketSize} events at once)", eventCount,
-						stream, bucketSize);
-					resSource.SetResult(null);
-					return;
-				}
-
-				var startIndex = writtenCount;
-				var endIndex = Math.Min(eventCount, startIndex + bucketSize);
-				var events = Enumerable.Range(startIndex, endIndex - startIndex).Select(createEvent).ToArray();
-
-				writtenCount = endIndex;
-
-				var expectedVersion = startIndex - 1;
-				var writeTask = store.AppendToStreamAsync(stream, expectedVersion, events);
-
-				writeTask.ContinueWith(fail, TaskContinuationOptions.OnlyOnFaulted);
-				writeTask.ContinueWith(writeBatch, TaskContinuationOptions.OnlyOnRanToCompletion);
-			};
-
-			writeBatch(null);
-
-			return resSource.Task;
-		}
-
-		private Task WriteEventsInTransactionalWay(string stream, int eventCount, Func<int, EventData> createEvent) {
-			Log.Information("Starting to write {eventCount} events to [{stream}] (in single transaction)", eventCount, stream);
-
-			var resSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
-			var store = GetConnection();
-
-			Action<Task> fail = prevTask => {
-				Log.Information("WriteEventsInTransactionalWay for stream {stream} failed.", stream);
-				resSource.SetException(prevTask.Exception);
-			};
-
-			int writtenCount = 0;
-			EventStoreTransaction transaction = null;
-
-			Action<Task> writeTransactionEvent = null;
-			writeTransactionEvent = prevTask => {
-				if (writtenCount == eventCount) {
-					var commitTask = transaction.CommitAsync();
-					commitTask.ContinueWith(fail, TaskContinuationOptions.OnlyOnFaulted);
-					commitTask.ContinueWith(t => {
-						Log.Information("Wrote {eventCount} events to [{stream}] (in single transaction)", eventCount, stream);
-						resSource.SetResult(null);
-					}, TaskContinuationOptions.OnlyOnRanToCompletion);
-					return;
-				}
-
-				var writeTask = transaction.WriteAsync(createEvent(writtenCount));
-
-				writtenCount += 1;
-
-				writeTask.ContinueWith(fail, TaskContinuationOptions.OnlyOnFaulted);
-				writeTask.ContinueWith(writeTransactionEvent, TaskContinuationOptions.OnlyOnRanToCompletion);
-			};
-
-			var startTask = store.StartTransactionAsync(stream, -1);
-			startTask.ContinueWith(fail, TaskContinuationOptions.OnlyOnFaulted);
-			startTask.ContinueWith(t => {
-				transaction = t.Result;
-				writeTransactionEvent(t);
-			}, TaskContinuationOptions.OnlyOnRanToCompletion);
-
-			return resSource.Task;
-		}
-
-		private Task ReadStream(string stream, int from, int count) {
-			Log.Information("Reading [{stream}] from {from,-10} count {count,-10}", stream, from, count);
-			var resSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
-			var store = GetConnection();
-
-			Action<Task> fail = prevTask => {
-				Log.Information("ReadStream for stream {stream} failed.", stream);
-				resSource.SetException(prevTask.Exception);
-			};
-
-			var readTask = store.ReadStreamEventsForwardAsync(stream, @from, count, resolveLinkTos: false);
-			readTask.ContinueWith(fail, TaskContinuationOptions.OnlyOnFaulted);
-			readTask.ContinueWith(t => {
-				try {
-					var slice = t.Result;
-					if (slice?.Events == null || slice.Events.Length != count) {
-						throw new Exception(string.Format(
-							"Tried to read {0} events from event number {1} from stream '{2}' but failed. Reason: {3}.",
-							count,
-							from,
-							stream,
-							slice == null ? "slice == null"
-							: slice.Events == null ? "slive.Events == null"
-							: slice.Events.Length != count ? string.Format("Expected count: {0}, actual count: {1}.",
-								count, slice.Events.Length)
-							: "WAT?!?"));
-					}
-
-					for (int i = 0; i < count; ++i) {
-						var evnt = slice.Events[i].Event;
-						if (evnt.EventNumber != i + from) {
-							throw new Exception(string.Format(
-								"Received event with wrong event number. Expected: {0}, actual: {1}.\nEvent: {2}.",
-								from + i,
-								evnt.EventNumber,
-								evnt));
-						}
-
-						TestEvent.VerifyIfMatched(evnt);
-					}
-
-					Log.Information("Done reading [{stream}] from {from,-10} count {count,-10}", stream, from, count);
-					resSource.SetResult(null);
-				} catch (Exception exc) {
-					Log.Information("ReadStream for stream {stream} failed.", stream);
-					resSource.SetException(exc);
-				}
-			}, TaskContinuationOptions.OnlyOnRanToCompletion);
-
-			return resSource.Task;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/RunTestScenarios/TestEvent.cs b/src/EventStore.TestClient/Commands/RunTestScenarios/TestEvent.cs
deleted file mode 100644
index 5d62b826f52..00000000000
--- a/src/EventStore.TestClient/Commands/RunTestScenarios/TestEvent.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Text;
-using EventStore.ClientAPI;
-using EventStore.Common.Utils;
-
-namespace EventStore.TestClient.Commands.RunTestScenarios {
-	internal class TestEvent {
-		public static EventData NewTestEvent(int index) {
-			var subIndex = (index % 50);
-			var type = "TestEvent-" + subIndex.ToString();
-			var body = new string('#', 1 + subIndex * subIndex);
-			var encodedData = Helper.UTF8NoBom.GetBytes(string.Format("{0}-{1}-{2}", index, body.Length, body));
-
-			return new EventData(Guid.NewGuid(), type, false, encodedData, new byte[0]);
-		}
-
-		public static void VerifyIfMatched(RecordedEvent evnt) {
-			if (evnt.EventType.StartsWith("TestEvent")) {
-				var data = Common.Utils.Helper.UTF8NoBom.GetString(evnt.Data);
-				var atoms = data.Split('-');
-				if (atoms.Length != 3)
-					throw new ApplicationException(string.Format("Invalid TestEvent object: currupted data format: {0}",
-						RecordDetailsString(evnt)));
-
-				var expectedLength = int.Parse(atoms[1]);
-				if (expectedLength != atoms[2].Length)
-					throw new ApplicationException(string.Format(
-						"Invalid TestEvent object: not expected data length: {0}",
-						RecordDetailsString(evnt)));
-
-				if (new string('#', expectedLength) != atoms[2])
-					throw new ApplicationException(string.Format("Invalid TestEvent object: currupted data: {0}",
-						RecordDetailsString(evnt)));
-			}
-		}
-
-		private static string RecordDetailsString(RecordedEvent evnt) {
-			var data = Common.Utils.Helper.UTF8NoBom.GetString(evnt.Data);
-			return string.Format("[stream:{0}; eventNumber:{1}; type:{2}; data:{3}]",
-				evnt.EventStreamId,
-				evnt.EventNumber,
-				evnt.EventType,
-				data.Length > 12 ? (data.Substring(0, 12) + "...") : data);
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/RunTestScenarios/WriteMode.cs b/src/EventStore.TestClient/Commands/RunTestScenarios/WriteMode.cs
deleted file mode 100644
index b94d3a03523..00000000000
--- a/src/EventStore.TestClient/Commands/RunTestScenarios/WriteMode.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace EventStore.TestClient.Commands.RunTestScenarios {
-	internal enum WriteMode {
-		SingleEventAtTime,
-		Bucket,
-		Transactional
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/RunTestScenariosProcessor.cs b/src/EventStore.TestClient/Commands/RunTestScenariosProcessor.cs
deleted file mode 100644
index e5c1da0ae66..00000000000
--- a/src/EventStore.TestClient/Commands/RunTestScenariosProcessor.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-using System;
-using System.Linq;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.TestClient.Commands.RunTestScenarios;
-using EventStore.Transport.Tcp;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.TestClient.Commands {
-	internal class RunTestScenariosProcessor : ICmdProcessor {
-		private static readonly ILogger Log = Serilog.Log.ForContext<RunTestScenariosProcessor>();
-		private const string AllScenariosFlag = "ALL";
-
-		public string Keyword {
-			get { return "RT"; }
-		}
-
-		public string Usage {
-			get {
-				const string usage = "<max concurrent requests, int> " +
-				                     "\n<connections, int> " +
-				                     "\n<streams count, int> " +
-				                     "\n<eventsPerStream, int> " +
-				                     "\n<streams delete step, int> " +
-				                     "\n<scenario name, string, " + AllScenariosFlag + " for all scenarios>" +
-				                     "\n<execution period minutes, int>" +
-				                     "\n<dbParentPath or custom node, string or ip:tcp:http>";
-
-				return usage;
-			}
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			if (args.Length != 0 && false == (args.Length == 7 || args.Length == 8))
-				return false;
-
-			var maxConcurrentRequests = 20;
-			var connections = 10;
-			var streams = 100;
-			var eventsPerStream = 400;
-			var streamDeleteStep = 7;
-			var scenarioName = "";
-			var executionPeriodMinutes = 2;
-			string dbParentPath = null;
-			NodeConnectionInfo customNode = null;
-
-			{
-				if (args.Length == 9) {
-					throw new ArgumentException(
-						"Not compatible arguments, only one of <dbPath> or <custom node> can be specified.");
-				}
-
-				if (args.Length == 8) {
-					IPAddress ip;
-					int tcpPort;
-					int httpPort;
-
-					var atoms = args[7].Split(':');
-					if (atoms.Length == 3
-					    && IPAddress.TryParse(atoms[0], out ip)
-					    && int.TryParse(atoms[1], out tcpPort)
-					    && int.TryParse(atoms[2], out httpPort)) {
-						customNode = new NodeConnectionInfo(ip, tcpPort, httpPort);
-
-						args = CutLastArgument(args);
-					}
-				}
-
-				if (args.Length == 7 || args.Length == 8) {
-					try {
-						maxConcurrentRequests = int.Parse(args[0]);
-						connections = int.Parse(args[1]);
-						streams = int.Parse(args[2]);
-						eventsPerStream = int.Parse(args[3]);
-						streamDeleteStep = int.Parse(args[4]);
-						scenarioName = args[5];
-						executionPeriodMinutes = int.Parse(args[6]);
-
-						if (args.Length == 8) {
-							dbParentPath = args[7];
-						} else {
-							var envDbPath = Environment.GetEnvironmentVariable("EVENTSTORE_DATABASEPATH");
-							if (!string.IsNullOrEmpty(envDbPath))
-								dbParentPath = envDbPath;
-						}
-					} catch (Exception e) {
-						Log.Error("Invalid arguments ({e})", e.Message);
-						return false;
-					}
-				}
-			}
-
-			context.IsAsync();
-
-			Log.Information("\n---" +
-			         "\nRunning scenario {scenario} using {connections} connections with {maxConcurrentRequests} max concurrent requests," +
-			         "\nfor {streams} streams {eventsPerStream} events each deleting every {streamDeleteStep}th stream. " +
-			         "\nExecution period {executionPeriod} minutes. " +
-			         "\nDatabase path {dbParentPath};" +
-			         "\nCustom Node {customNode};" +
-			         "\n---",
-				scenarioName,
-				connections,
-				maxConcurrentRequests,
-				streams,
-				eventsPerStream,
-				streamDeleteStep,
-				executionPeriodMinutes,
-				dbParentPath,
-				customNode);
-
-			var directTcpSender = CreateDirectTcpSender(context);
-			var allScenarios = new IScenario[] {
-				new LoopingScenario(directTcpSender,
-					maxConcurrentRequests,
-					connections,
-					streams,
-					eventsPerStream,
-					streamDeleteStep,
-					TimeSpan.FromMinutes(executionPeriodMinutes),
-					dbParentPath,
-					customNode),
-				new ProjectionsKillScenario(directTcpSender,
-					maxConcurrentRequests,
-					connections,
-					streams,
-					eventsPerStream,
-					streamDeleteStep,
-					dbParentPath,
-					customNode),
-				new ProjForeachForcedCommonNameScenario(directTcpSender,
-					maxConcurrentRequests,
-					connections,
-					streams,
-					eventsPerStream,
-					streamDeleteStep,
-					TimeSpan.FromMinutes(executionPeriodMinutes),
-					dbParentPath,
-					customNode),
-				new ProjForeachForcedCommonNameNoRestartScenario(directTcpSender,
-					maxConcurrentRequests,
-					connections,
-					streams,
-					eventsPerStream,
-					streamDeleteStep,
-					TimeSpan.FromMinutes(executionPeriodMinutes),
-					dbParentPath,
-					customNode),
-				new LoopingProjTranWriteScenario(directTcpSender,
-					maxConcurrentRequests,
-					connections,
-					streams,
-					eventsPerStream,
-					streamDeleteStep,
-					TimeSpan.FromMinutes(executionPeriodMinutes),
-					dbParentPath,
-					customNode),
-				new LoopingProjectionKillScenario(directTcpSender,
-					maxConcurrentRequests,
-					connections,
-					streams,
-					eventsPerStream,
-					streamDeleteStep,
-					TimeSpan.FromMinutes(executionPeriodMinutes),
-					dbParentPath,
-					customNode),
-				new MassProjectionsScenario(directTcpSender,
-					maxConcurrentRequests,
-					connections,
-					streams,
-					eventsPerStream,
-					streamDeleteStep,
-					dbParentPath,
-					customNode),
-				new ProjectionWrongTagCheck(directTcpSender,
-					maxConcurrentRequests,
-					connections,
-					streams,
-					eventsPerStream,
-					streamDeleteStep,
-					TimeSpan.FromMinutes(executionPeriodMinutes),
-					dbParentPath,
-					customNode),
-			};
-
-			Log.Information("Found scenarios {scenariosCount} total :\n{scenarios}.", allScenarios.Length,
-				allScenarios.Aggregate(new StringBuilder(),
-					(sb, s) => sb.AppendFormat("{0}, ", s.GetType().Name)));
-			var scenarios = allScenarios.Where(x => scenarioName == AllScenariosFlag
-			                                        || x.GetType().Name.Equals(scenarioName,
-				                                        StringComparison.InvariantCultureIgnoreCase))
-				.ToArray();
-
-			Log.Information("Running test scenarios ({scenarios} total)...", scenarios.Length);
-
-			foreach (var scenario in scenarios) {
-				using (scenario) {
-					try {
-						Log.Information("Run scenario {type}", scenario.GetType().Name);
-						scenario.Run();
-						scenario.Clean();
-						Log.Information("Scenario run successfully");
-					} catch (Exception e) {
-						context.Fail(e);
-					}
-				}
-			}
-
-			Log.Information("Finished running test scenarios");
-
-			if (context.ExitCode == 0)
-				context.Success();
-
-			return true;
-		}
-
-		private static string[] CutLastArgument(string[] args) {
-			var cutArgs = new string[7];
-			Array.Copy(args, cutArgs, 7);
-			return cutArgs;
-		}
-
-		private Action<IPEndPoint, byte[]> CreateDirectTcpSender(CommandProcessorContext context) {
-			const int timeoutMilliseconds = 4000;
-
-			Action<IPEndPoint, byte[]> sender = (tcpEndPoint, bytes) => {
-				var sent = new AutoResetEvent(false);
-
-				Action<TcpTypedConnection<byte[]>, TcpPackage> handlePackage = (_, __) => { };
-				Action<TcpTypedConnection<byte[]>> established = connection => {
-					connection.EnqueueSend(bytes);
-					connection.Close();
-					sent.Set();
-				};
-				Action<TcpTypedConnection<byte[]>, SocketError> closed = (_, __) => sent.Set();
-
-				context._tcpTestClient.CreateTcpConnection(context, handlePackage, established, closed, false, tcpEndPoint);
-				if (!sent.WaitOne(timeoutMilliseconds))
-					throw new ApplicationException("Connection to server was not closed in time.");
-			};
-
-			return sender;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/ScavengeProcessor.cs b/src/EventStore.TestClient/Commands/ScavengeProcessor.cs
deleted file mode 100644
index b230c62f8ed..00000000000
--- a/src/EventStore.TestClient/Commands/ScavengeProcessor.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Net.Sockets;
-using EventStore.Core.Services.Transport.Tcp;
-
-namespace EventStore.TestClient.Commands {
-	internal class ScavengeProcessor : ICmdProcessor {
-		public string Usage {
-			get { return Keyword; }
-		}
-
-		public string Keyword {
-			get { return "SCAVENGE"; }
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			var package = new TcpPackage(TcpCommand.ScavengeDatabase, Guid.NewGuid(), null);
-			context.Log.Information("Sending SCAVENGE request...");
-
-			var connection = context._tcpTestClient.CreateTcpConnection(
-				context,
-				(conn, pkg) => { },
-				null,
-				(typedConnection, error) => {
-					if (error == SocketError.Success)
-						context.Success();
-					else
-						context.Fail();
-				});
-			connection.EnqueueSend(package.AsByteArray());
-			connection.Close("OK");
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/SubscribeToStreamProcessor.cs b/src/EventStore.TestClient/Commands/SubscribeToStreamProcessor.cs
deleted file mode 100644
index 83060147411..00000000000
--- a/src/EventStore.TestClient/Commands/SubscribeToStreamProcessor.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net.Sockets;
-using EventStore.Client.Messages;
-using EventStore.Core.Services.Transport.Tcp;
-
-namespace EventStore.TestClient.Commands {
-	internal class SubscribeToStreamProcessor : ICmdProcessor {
-		public string Usage {
-			get { return "SUBSCR [<stream_1> <stream_2> ... <stream_n>]"; }
-		}
-
-		public string Keyword {
-			get { return "SUBSCR"; }
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			context.IsAsync();
-
-			var streamByCorrId = new Dictionary<Guid, string>();
-
-			var connection = context._tcpTestClient.CreateTcpConnection(
-				context,
-				connectionEstablished: conn => { },
-				handlePackage: (conn, pkg) => {
-					switch (pkg.Command) {
-						case TcpCommand.SubscriptionConfirmation: {
-							var dto = pkg.Data.Deserialize<SubscriptionConfirmation>();
-							context.Log.Information(
-								"Subscription to <{stream}> WAS CONFIRMED! Subscribed at {lastIndexedPosition} ({lastEventNumber})",
-								streamByCorrId[pkg.CorrelationId], dto.LastCommitPosition, dto.LastEventNumber);
-							break;
-						}
-						case TcpCommand.StreamEventAppeared: {
-							var dto = pkg.Data.Deserialize<StreamEventAppeared>();
-							context.Log.Information("NEW EVENT:\n\n"
-							                 + "\tEventStreamId: {stream}\n"
-							                 + "\tEventNumber:   {eventNumber}\n"
-							                 + "\tEventType:     {eventType}\n"
-							                 + "\tData:          {data}\n"
-							                 + "\tMetadata:      {metadata}\n",
-								dto.Event.Event.EventStreamId,
-								dto.Event.Event.EventNumber,
-								dto.Event.Event.EventType,
-								Common.Utils.Helper.UTF8NoBom.GetString(dto.Event.Event.Data.ToByteArray()),
-								Common.Utils.Helper.UTF8NoBom.GetString(dto.Event.Event.Metadata.ToByteArray()));
-							break;
-						}
-						case TcpCommand.SubscriptionDropped: {
-							pkg.Data.Deserialize<SubscriptionDropped>();
-							context.Log.Error("Subscription to <{stream}> WAS DROPPED!",
-								streamByCorrId[pkg.CorrelationId]);
-							break;
-						}
-						default:
-							context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
-							break;
-					}
-				},
-				connectionClosed: (c, error) => {
-					if (error == SocketError.Success)
-						context.Success();
-					else
-						context.Fail();
-				});
-
-			if (args.Length == 0) {
-				context.Log.Information("SUBSCRIBING TO ALL STREAMS...");
-				var cmd = new SubscribeToStream(string.Empty, resolveLinkTos: false);
-				Guid correlationId = Guid.NewGuid();
-				streamByCorrId[correlationId] = "$all";
-				connection.EnqueueSend(new TcpPackage(TcpCommand.SubscribeToStream, correlationId, cmd.Serialize())
-					.AsByteArray());
-			} else {
-				foreach (var stream in args) {
-					context.Log.Information("SUBSCRIBING TO STREAM <{stream}>...", stream);
-					var cmd = new SubscribeToStream(stream, resolveLinkTos: false);
-					var correlationId = Guid.NewGuid();
-					streamByCorrId[correlationId] = stream;
-					connection.EnqueueSend(new TcpPackage(TcpCommand.SubscribeToStream, correlationId, cmd.Serialize())
-						.AsByteArray());
-				}
-			}
-
-			context.WaitForCompletion();
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/SubscriptionStressTestProcessor.cs b/src/EventStore.TestClient/Commands/SubscriptionStressTestProcessor.cs
deleted file mode 100644
index efc79c6398c..00000000000
--- a/src/EventStore.TestClient/Commands/SubscriptionStressTestProcessor.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.ClientAPI;
-using EventStore.Common.Utils;
-
-namespace EventStore.TestClient.Commands {
-	internal class SubscriptionStressTestProcessor : ICmdProcessor {
-		public string Usage {
-			get { return "SST [<subscription-count>]"; }
-		}
-
-		public string Keyword {
-			get { return "SST"; }
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			int subscriptionCount = 5000;
-
-			if (args.Length > 0) {
-				if (args.Length > 1)
-					return false;
-				subscriptionCount = MetricPrefixValue.ParseInt(args[0]);
-			}
-
-			context.IsAsync();
-
-			var conn = EventStoreConnection.Create(ConnectionSettings.Create()
-					.UseCustomLogger(new ClientApiLoggerBridge(context.Log))
-					.FailOnNoServerResponse()
-				/*.EnableVerboseLogging()*/,
-				new Uri($"tcp://{context._tcpTestClient.TcpEndpoint.GetHost()}:{context._tcpTestClient.TcpEndpoint.GetPort()}"));
-			conn.ConnectAsync().Wait();
-
-			long appearedCnt = 0;
-			var sw = Stopwatch.StartNew();
-			for (int i = 0; i < subscriptionCount; ++i) {
-				conn.SubscribeToStreamAsync(
-					string.Format("stream-{0}", i),
-					false,
-					(s, e) => {
-						var c = Interlocked.Increment(ref appearedCnt);
-						if (c % 1000 == 0) Console.Write('\'');
-						if (c % 100000 == 0) {
-							context.Log.Debug("Received total {events} events ({rate} per sec)...", c,
-								100000.0 / sw.Elapsed.TotalSeconds);
-							sw.Restart();
-						}
-
-						return Task.CompletedTask;
-					}).Wait();
-			}
-
-			context.Log.Information("Subscribed to {subscriptionCount} streams...", subscriptionCount);
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/TcpSanitazationCheckProcessor.cs b/src/EventStore.TestClient/Commands/TcpSanitazationCheckProcessor.cs
deleted file mode 100644
index 56f5f3db82b..00000000000
--- a/src/EventStore.TestClient/Commands/TcpSanitazationCheckProcessor.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Sockets;
-using System.Threading;
-using EventStore.Core.Services.Transport.Tcp;
-using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Transport.Tcp;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.TestClient.Commands {
-	internal class TcpSanitazationCheckProcessor : ICmdProcessor {
-		private static readonly ILogger Log = Serilog.Log.ForContext<TcpSanitazationCheckProcessor>();
-
-		public string Keyword {
-			get { return "CHKTCP"; }
-		}
-
-		public string Usage {
-			get { return Keyword; }
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			context.IsAsync();
-
-			var commandsToCheck = new[] {
-				(byte)TcpCommand.WriteEvents,
-				(byte)TcpCommand.TransactionStart,
-				(byte)TcpCommand.TransactionWrite,
-				(byte)TcpCommand.TransactionCommit,
-				(byte)TcpCommand.DeleteStream,
-				(byte)TcpCommand.ReadEvent,
-				(byte)TcpCommand.ReadStreamEventsForward,
-				(byte)TcpCommand.ReadStreamEventsBackward,
-				(byte)TcpCommand.ReadAllEventsForward,
-				(byte)TcpCommand.ReadAllEventsBackward,
-				(byte)TcpCommand.SubscribeToStream,
-				(byte)TcpCommand.UnsubscribeFromStream,
-			};
-
-			var packages = commandsToCheck.Select(c =>
-					new TcpPackage((TcpCommand)c, Guid.NewGuid(), new byte[] {0, 1, 0, 1}).AsByteArray())
-				.Union(new[] {
-					BitConverter.GetBytes(int.MaxValue).Union(new byte[] {1, 2, 3, 4}).ToArray(),
-					BitConverter.GetBytes(int.MinValue).Union(new byte[] {1, 2, 3, 4}).ToArray(),
-					BitConverter.GetBytes(0).Union(Enumerable.Range(0, 256).Select(x => (byte)x)).ToArray()
-				});
-
-			int step = 0;
-			foreach (var pkg in packages) {
-				var established = new AutoResetEvent(false);
-				var dropped = new AutoResetEvent(false);
-
-				if (step < commandsToCheck.Length)
-					Console.WriteLine("{0} Starting step {1} ({2}) {0}", new string('#', 20), step,
-						(TcpCommand)commandsToCheck[step]);
-				else
-					Console.WriteLine("{0} Starting step {1} (RANDOM BYTES) {0}", new string('#', 20), step);
-
-				var connection = context._tcpTestClient.CreateTcpConnection(
-					context,
-					(conn, package) => {
-						if (package.Command != TcpCommand.BadRequest)
-							context.Fail(null, string.Format("Bad request expected, got {0}!", package.Command));
-					},
-					conn => established.Set(),
-					(conn, err) => dropped.Set());
-
-				established.WaitOne();
-				connection.EnqueueSend(pkg);
-				dropped.WaitOne();
-
-				if (step < commandsToCheck.Length)
-					Console.WriteLine("{0} Step {1} ({2}) Completed {0}", new string('#', 20), step,
-						(TcpCommand)commandsToCheck[step]);
-				else
-					Console.WriteLine("{0} Step {1} (RANDOM BYTES) Completed {0}", new string('#', 20), step);
-
-				step++;
-			}
-
-			Log.Information(
-				"Sent {packages} packages. {commandsToCheck} invalid dtos, {barFormattedPackages} bar formatted packages. Got {badRequests} BadRequests. Success",
-				packages.Count(),
-				commandsToCheck.Length,
-				packages.Count() - commandsToCheck.Length,
-				packages.Count());
-
-			Log.Information("Now sending raw bytes...");
-			try {
-				SendRaw(context._tcpTestClient.TcpEndpoint, BitConverter.GetBytes(int.MaxValue));
-				SendRaw(context._tcpTestClient.TcpEndpoint, BitConverter.GetBytes(int.MinValue));
-
-				SendRaw(context._tcpTestClient.TcpEndpoint, BitConverter.GetBytes(double.MinValue));
-				SendRaw(context._tcpTestClient.TcpEndpoint, BitConverter.GetBytes(double.MinValue));
-
-				SendRaw(context._tcpTestClient.TcpEndpoint, BitConverter.GetBytes(new Random().NextDouble()));
-			} catch (Exception e) {
-				context.Fail(e, "Raw bytes sent failed");
-				return false;
-			}
-
-			context.Success();
-			return true;
-		}
-
-		private void SendRaw(EndPoint endPoint, byte[] package) {
-			using var client = new TcpClient();
-			client.Connect(endPoint.ResolveDnsToIPAddress());
-			using var stream = client.GetStream();
-			stream.Write(package, 0, package.Length);
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/TransactionWriteProcessor.cs b/src/EventStore.TestClient/Commands/TransactionWriteProcessor.cs
deleted file mode 100644
index 838c584cc82..00000000000
--- a/src/EventStore.TestClient/Commands/TransactionWriteProcessor.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Net.Sockets;
-using System.Text;
-using EventStore.Client.Messages;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Transport.Tcp;
-using OperationResult = EventStore.Client.Messages.OperationResult;
-
-namespace EventStore.TestClient.Commands {
-	internal class TransactionWriteProcessor : ICmdProcessor {
-		public string Usage {
-			get { return "TWR [<stream-id> [<expected-version> [<events-cnt>]]]"; }
-		}
-
-		public string Keyword {
-			get { return "TWR"; }
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			var eventStreamId = "test-stream";
-			var expectedVersion = ExpectedVersion.Any;
-			int eventsCnt = 10;
-
-			if (args.Length > 0) {
-				if (args.Length > 3)
-					return false;
-				eventStreamId = args[0];
-				if (args.Length > 1)
-					expectedVersion = args[1].ToUpper() == "ANY" ? ExpectedVersion.Any : int.Parse(args[1]);
-				if (args.Length > 2)
-					eventsCnt = MetricPrefixValue.ParseInt(args[1]);
-			}
-
-			context.IsAsync();
-
-			var sw = new Stopwatch();
-			var stage = Stage.AcquiringTransactionId;
-			long transactionId = -1;
-			var writtenEvents = 0;
-			context._tcpTestClient.CreateTcpConnection(
-				context,
-				connectionEstablished: conn => {
-					context.Log.Information("[{remoteEndPoint}, L{localEndPoint}]: Starting transaction...",
-						conn.RemoteEndPoint, conn.LocalEndPoint);
-					sw.Start();
-
-					var tranStart = new TransactionStart(eventStreamId, expectedVersion, false);
-					var package = new TcpPackage(TcpCommand.TransactionStart, Guid.NewGuid(), tranStart.Serialize());
-					conn.EnqueueSend(package.AsByteArray());
-				},
-				handlePackage: (conn, pkg) => {
-					switch (stage) {
-						case Stage.AcquiringTransactionId: {
-							if (pkg.Command != TcpCommand.TransactionStartCompleted) {
-								context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
-								return;
-							}
-
-							var dto = pkg.Data.Deserialize<TransactionStartCompleted>();
-							if (dto.Result != OperationResult.Success) {
-								var msg = string.Format("Error while starting transaction: {0} ({1}).", dto.Message,
-									dto.Result);
-								context.Log.Information("Error while starting transaction: {message} ({e}).", dto.Message,
-									dto.Result);
-								context.Fail(reason: msg);
-							} else {
-								context.Log.Information("Successfully started transaction. TransactionId: {transactionId}.",
-									dto.TransactionId);
-								context.Log.Information("Now sending transactional events. TransactionId: {transactionId}",
-									dto.TransactionId);
-
-								transactionId = dto.TransactionId;
-								stage = Stage.Writing;
-								for (int i = 0; i < eventsCnt; ++i) {
-									var writeDto = new TransactionWrite(
-										transactionId,
-										new[] {
-											new NewEvent(Guid.NewGuid().ToByteArray(),
-												"TakeSomeSpaceEvent",
-												0, 0,
-												Common.Utils.Helper.UTF8NoBom.GetBytes(Guid.NewGuid().ToString()),
-												Common.Utils.Helper.UTF8NoBom.GetBytes(Guid.NewGuid().ToString()))
-										},
-										false);
-									var package = new TcpPackage(TcpCommand.TransactionWrite, Guid.NewGuid(),
-										writeDto.Serialize());
-									conn.EnqueueSend(package.AsByteArray());
-								}
-							}
-
-							break;
-						}
-						case Stage.Writing: {
-							if (pkg.Command != TcpCommand.TransactionWriteCompleted) {
-								context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
-								return;
-							}
-
-							var dto = pkg.Data.Deserialize<TransactionWriteCompleted>();
-							if (dto.Result != OperationResult.Success) {
-								context.Log.Information("Error while writing transactional event: {message} ({e}).",
-									dto.Message, dto.Result);
-								var msg = String.Format("Error while writing transactional event: {0} ({1}).",
-									dto.Message, dto.Result);
-								context.Fail(reason: msg);
-							} else {
-								writtenEvents += 1;
-								if (writtenEvents == eventsCnt) {
-									context.Log.Information("Written all events. Committing...");
-
-									stage = Stage.Committing;
-									var commitDto = new TransactionCommit(transactionId, false);
-									var package = new TcpPackage(TcpCommand.TransactionCommit, Guid.NewGuid(),
-										commitDto.Serialize());
-									conn.EnqueueSend(package.AsByteArray());
-								}
-							}
-
-							break;
-						}
-						case Stage.Committing: {
-							if (pkg.Command != TcpCommand.TransactionCommitCompleted) {
-								context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
-								return;
-							}
-
-							sw.Stop();
-
-							var dto = pkg.Data.Deserialize<TransactionCommitCompleted>();
-							if (dto.Result != OperationResult.Success) {
-								var msg = string.Format("Error while committing transaction: {0} ({1}).", dto.Message,
-									dto.Result);
-								context.Log.Information("Error while committing transaction: {message} ({e}).", dto.Message,
-									dto.Result);
-								context.Log.Information("Transaction took: {elapsed}.", sw.Elapsed);
-								context.Fail(reason: msg);
-							} else {
-								context.Log.Information("Successfully committed transaction [{transactionId}]!",
-									dto.TransactionId);
-								context.Log.Information("Transaction took: {elapsed}.", sw.Elapsed);
-								PerfUtils.LogTeamCityGraphData(string.Format("{0}-latency-ms", Keyword),
-									(int)Math.Round(sw.Elapsed.TotalMilliseconds));
-								context.Success();
-							}
-
-							conn.Close();
-							break;
-						}
-						default:
-							throw new ArgumentOutOfRangeException();
-					}
-				},
-				connectionClosed: (connection, error) => context.Fail(reason: "Connection was closed prematurely."));
-			context.WaitForCompletion();
-			return true;
-		}
-
-		private enum Stage {
-			AcquiringTransactionId,
-			Writing,
-			Committing
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/UsageProcessor.cs b/src/EventStore.TestClient/Commands/UsageProcessor.cs
deleted file mode 100644
index 759905e4175..00000000000
--- a/src/EventStore.TestClient/Commands/UsageProcessor.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Linq;
-
-namespace EventStore.TestClient.Commands {
-	internal class UsageProcessor : ICmdProcessor {
-		public string Keyword {
-			get { return "USAGE"; }
-		}
-
-		public string Usage {
-			get { return "USAGE"; }
-		}
-
-		private readonly CommandsProcessor _commands;
-
-		public UsageProcessor(CommandsProcessor commands) {
-			_commands = commands;
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			var allCommands = _commands.RegisteredProcessors.Select(x => x.Usage.ToUpper());
-			context.Log.Information("Available commands:");
-
-			foreach (var command in allCommands) {
-				context.Log.Information("    {command}", command);
-			}
-
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/WriteFloodClientApiProcessor.cs b/src/EventStore.TestClient/Commands/WriteFloodClientApiProcessor.cs
deleted file mode 100644
index 0e056a6f0a8..00000000000
--- a/src/EventStore.TestClient/Commands/WriteFloodClientApiProcessor.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using EventStore.ClientAPI;
-using EventStore.Common.Utils;
-using ExpectedVersion = EventStore.Core.Data.ExpectedVersion;
-
-namespace EventStore.TestClient.Commands {
-	internal class WriteFloodClientApiProcessor : ICmdProcessor {
-		public string Usage {
-			get { return "WRFLCA [<clients> <requests> [<streams-cnt> [<size>]]]"; }
-		}
-
-		public string Keyword {
-			get { return "WRFLCA"; }
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			int clientsCnt = 1;
-			long requestsCnt = 5000;
-			int streamsCnt = 1000;
-			int size = 256;
-			if (args.Length > 0) {
-				if (args.Length < 2 || args.Length > 4)
-					return false;
-
-				try {
-					clientsCnt = MetricPrefixValue.ParseInt(args[0]);
-					requestsCnt = MetricPrefixValue.ParseLong(args[1]);
-					if (args.Length >= 3)
-						streamsCnt = MetricPrefixValue.ParseInt(args[2]);
-					if (args.Length >= 4)
-						size = MetricPrefixValue.ParseInt(args[3]);
-				} catch {
-					return false;
-				}
-			}
-
-			WriteFlood(context, clientsCnt, requestsCnt, streamsCnt, size);
-			return true;
-		}
-
-		private void WriteFlood(CommandProcessorContext context, int clientsCnt, long requestsCnt, int streamsCnt,
-			int size) {
-			context.IsAsync();
-
-			var doneEvent = new ManualResetEventSlim(false);
-			var clients = new List<IEventStoreConnection>();
-			var threads = new List<Thread>();
-
-			long succ = 0;
-
-			var streams = Enumerable.Range(0, streamsCnt).Select(x => Guid.NewGuid().ToString()).ToArray();
-			var sw2 = new Stopwatch();
-			for (int i = 0; i < clientsCnt; i++) {
-				var count = requestsCnt / clientsCnt + ((i == clientsCnt - 1) ? requestsCnt % clientsCnt : 0);
-				var rnd = new Random();
-
-				var settings = ConnectionSettings.Create()
-					.UseConsoleLogger()
-					.PerformOnAnyNode()
-					.LimitReconnectionsTo(10)
-					.LimitRetriesForOperationTo(10)
-					.LimitOperationsQueueTo(10000)
-					.LimitConcurrentOperationsTo(context._tcpTestClient.Options.WriteWindow / clientsCnt)
-					.FailOnNoServerResponse();
-
-				var client = EventStoreConnection.Create(settings,
-					new Uri($"tcp://{context._tcpTestClient.TcpEndpoint.GetHost()}:{context._tcpTestClient.TcpEndpoint.GetPort()}"));
-				clients.Add(client);
-
-				threads.Add(new Thread(_ => {
-					client.ErrorOccurred += (s, e) => context.Fail(e.Exception, "Error on connection");
-					client.ConnectAsync().Wait();
-
-					for (int j = 0; j < count; ++j) {
-						var task = client.AppendToStreamAsync(streams[rnd.Next(streamsCnt)],
-							ExpectedVersion.Any,
-							new EventData(Guid.NewGuid(),
-								"TakeSomeSpaceEvent",
-								false,
-								Common.Utils.Helper.UTF8NoBom.GetBytes("DATA" + new string('*', size)),
-								Common.Utils.Helper.UTF8NoBom.GetBytes("METADATA" + new string('$', 100))));
-						task.ContinueWith(x => {
-							if (x.IsFaulted) {
-								context.Fail(x.Exception.InnerException, "Error on writing operation.");
-								return;
-							}
-
-							var localAll = Interlocked.Increment(ref succ);
-							if (localAll % 1000 == 0) Console.Write('.');
-							if (localAll % 100000 == 0) {
-								var elapsed = sw2.Elapsed;
-								sw2.Restart();
-								context.Log.Debug("\nDONE TOTAL {writes} WRITES IN {elapsed} ({rate:0.0}/s).",
-									localAll,
-									elapsed,
-									1000.0 * 100000 / elapsed.TotalMilliseconds);
-							}
-
-							if (localAll == requestsCnt) {
-								context.Success();
-								doneEvent.Set();
-							}
-						});
-					}
-				}) {IsBackground = true});
-			}
-
-			var sw = Stopwatch.StartNew();
-			sw2.Start();
-			threads.ForEach(thread => thread.Start());
-			doneEvent.Wait();
-			clients.ForEach(x => x.Close());
-			sw.Stop();
-
-			context.Log.Information("Completed. Successes: {success}.", succ);
-
-			var reqPerSec = (succ + 0.0) / sw.ElapsedMilliseconds * 1000;
-			context.Log.Information("{requests} requests completed in {elapsed}ms ({rate:0.00} reqs per sec).", succ,
-				sw.ElapsedMilliseconds, reqPerSec);
-
-			var fail = requestsCnt - succ;
-			PerfUtils.LogData(
-				Keyword,
-				PerfUtils.Row(PerfUtils.Col("clientsCnt", clientsCnt),
-					PerfUtils.Col("requestsCnt", requestsCnt),
-					PerfUtils.Col("ElapsedMilliseconds", sw.ElapsedMilliseconds)),
-				PerfUtils.Row(PerfUtils.Col("successes", succ), PerfUtils.Col("failures", fail)));
-			var failuresRate = (int)(100 * fail / (fail + succ));
-			PerfUtils.LogTeamCityGraphData(string.Format("{0}-{1}-{2}-reqPerSec", Keyword, clientsCnt, requestsCnt),
-				(int)reqPerSec);
-			PerfUtils.LogTeamCityGraphData(
-				string.Format("{0}-{1}-{2}-failureSuccessRate", Keyword, clientsCnt, requestsCnt), failuresRate);
-			PerfUtils.LogTeamCityGraphData(
-				string.Format("{0}-c{1}-r{2}-st{3}-s{4}-reqPerSec", Keyword, clientsCnt, requestsCnt, streamsCnt, size),
-				(int)reqPerSec);
-			PerfUtils.LogTeamCityGraphData(
-				string.Format("{0}-c{1}-r{2}-st{3}-s{4}-failureSuccessRate", Keyword, clientsCnt, requestsCnt,
-					streamsCnt, size), failuresRate);
-
-			if (Interlocked.Read(ref succ) != requestsCnt)
-				context.Fail(reason: "There were errors or not all requests completed.");
-			else
-				context.Success();
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/WriteFloodProcessor.cs b/src/EventStore.TestClient/Commands/WriteFloodProcessor.cs
deleted file mode 100644
index 050d3466b3b..00000000000
--- a/src/EventStore.TestClient/Commands/WriteFloodProcessor.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using EventStore.Client.Messages;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.TestClient.Statistics;
-using EventStore.Transport.Tcp;
-
-namespace EventStore.TestClient.Commands {
-	internal class WriteFloodProcessor : ICmdProcessor {
-		public string Usage {
-			//                     0          1            2           3          4             5
-			get { return "WRFL [<clients> <requests> [<streams-cnt> [<size> [<batchsize> [<stream-prefix>]]]]]"; }
-		}
-
-		public string Keyword {
-			get { return "WRFL"; }
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			int clientsCnt = 1;
-			long requestsCnt = 5000;
-			int streamsCnt = 1000;
-			int size = 256;
-			int batchSize = 1;
-			string streamNamePrefix = string.Empty;
-			if (args.Length > 0) {
-				if (args.Length < 2 || args.Length > 6)
-					return false;
-
-				try {
-					clientsCnt = MetricPrefixValue.ParseInt(args[0]);
-					requestsCnt = MetricPrefixValue.ParseLong(args[1]);
-					if (args.Length >= 3)
-						streamsCnt = MetricPrefixValue.ParseInt(args[2]);
-					if (args.Length >= 4)
-						size = MetricPrefixValue.ParseInt(args[3]);
-					if (args.Length >= 5)
-						batchSize = MetricPrefixValue.ParseInt(args[4]);
-					if (args.Length >= 6)
-						streamNamePrefix = args[5];
-				} catch {
-					return false;
-				}
-			}
-
-			var stats = new WriteFloodStats(Keyword, context.OutputCsv, args);
-			var monitor = new RequestMonitor();
-			WriteFlood(context, stats, clientsCnt, requestsCnt, streamsCnt, size, batchSize, streamNamePrefix, monitor);
-			return true;
-		}
-
-		private void WriteFlood(CommandProcessorContext context, WriteFloodStats stats, int clientsCnt, long requestsCnt, int streamsCnt,
-			int size, int batchSize, string streamNamePrefix, RequestMonitor monitor) {
-			context.IsAsync();
-
-			var doneEvent = new ManualResetEventSlim(false);
-			var clients = new List<TcpTypedConnection<byte[]>>();
-			var threads = new List<Thread>();
-
-			long last = 0;
-
-			string[] streams = Enumerable.Range(0, streamsCnt).Select(x =>
-				string.IsNullOrWhiteSpace(streamNamePrefix)
-					? Guid.NewGuid().ToString()
-					: $"{streamNamePrefix}-{x}"
-			).ToArray();
-
-			context.Log.Information("Writing streams randomly between {first} and {last}",
-				streams.FirstOrDefault(),
-				streams.LastOrDefault());
-
-			Console.WriteLine($"Last stream: {streams.LastOrDefault()}");
-			stats.StartTime = DateTime.UtcNow;
-			var sw2 = new Stopwatch();
-			for (int i = 0; i < clientsCnt; i++) {
-				var count = requestsCnt / clientsCnt + ((i == clientsCnt - 1) ? requestsCnt % clientsCnt : 0);
-				long sent = 0;
-				long received = 0;
-				var rnd = new Random();
-				var client = context._tcpTestClient.CreateTcpConnection(
-					context,
-					(conn, pkg) => {
-						if (pkg.Command != TcpCommand.WriteEventsCompleted) {
-							context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
-							return;
-						}
-
-						var dto = pkg.Data.Deserialize<WriteEventsCompleted>();
-						monitor.EndOperation(pkg.CorrelationId);
-						switch (dto.Result) {
-							case OperationResult.Success:
-								Interlocked.Add(ref stats.Succ, batchSize);
-								if (stats.Succ - last > 1000) {
-									last = stats.Succ;
-									Console.Write(".");
-								}
-
-								break;
-							case OperationResult.PrepareTimeout:
-								Interlocked.Increment(ref stats.PrepTimeout);
-								break;
-							case OperationResult.CommitTimeout:
-								Interlocked.Increment(ref stats.CommitTimeout);
-								break;
-							case OperationResult.ForwardTimeout:
-								Interlocked.Increment(ref stats.ForwardTimeout);
-								break;
-							case OperationResult.WrongExpectedVersion:
-								Interlocked.Increment(ref stats.WrongExpVersion);
-								break;
-							case OperationResult.StreamDeleted:
-								Interlocked.Increment(ref stats.StreamDeleted);
-								break;
-							default:
-								throw new ArgumentOutOfRangeException();
-						}
-
-						if (dto.Result != OperationResult.Success)
-							if (Interlocked.Increment(ref stats.Fail) % 1000 == 0)
-								Console.Write('#');
-						Interlocked.Increment(ref received);
-						var localAll = Interlocked.Add(ref stats.All, batchSize);
-						if (localAll % 100000 == 0) {
-							stats.Elapsed = sw2.Elapsed;
-							stats.Rate =  1000.0 * 100000 / stats.Elapsed.TotalMilliseconds;
-							sw2.Restart();
-							context.Log.Debug(
-								"\nDONE TOTAL {writes} WRITES IN {elapsed} ({rate:0.0}/s) [S:{success}, F:{failures} (WEV:{wrongExpectedVersion}, " +
-								"P:{prepareTimeout}, C:{commitTimeout}, F:{forwardTimeout}, D:{streamDeleted})].",
-								localAll, stats.Elapsed, stats.Rate, stats.Succ, stats.Fail,
-								stats.WrongExpVersion, stats.PrepTimeout, stats.CommitTimeout, stats.ForwardTimeout, stats.StreamDeleted);
-							stats.WriteStatsToFile(context.StatsLogger);
-						}
-
-						if (localAll >= requestsCnt) {
-							context.Success();
-							doneEvent.Set();
-						}
-					},
-					connectionClosed: (conn, err) => context.Fail(reason: "Connection was closed prematurely."));
-				clients.Add(client);
-
-				threads.Add(new Thread(() => {
-					for (int j = 0; j < count; ++j) {
-						var events = new NewEvent[batchSize];
-						for (int q = 0; q < batchSize; q++) {
-							events[q] = new NewEvent(Guid.NewGuid().ToByteArray(),
-								"TakeSomeSpaceEvent",
-								1, 0,
-								Common.Utils.Helper.UTF8NoBom.GetBytes(
-									"{ \"DATA\" : \"" + new string('*', size) + "\"}"),
-								Common.Utils.Helper.UTF8NoBom.GetBytes(
-									"{ \"METADATA\" : \"" + new string('$', 100) + "\"}"));
-						}
-
-						var corrid = Guid.NewGuid();
-						var write = new WriteEvents(
-							streams[rnd.Next(streamsCnt)],
-							ExpectedVersion.Any,
-							events,
-							false);
-						var package = new TcpPackage(TcpCommand.WriteEvents, corrid, write.Serialize());
-						monitor.StartOperation(corrid);
-						client.EnqueueSend(package.AsByteArray());
-
-						var localSent = Interlocked.Increment(ref sent);
-						while (localSent - Interlocked.Read(ref received) >
-						       context._tcpTestClient.Options.WriteWindow / clientsCnt) {
-							Thread.Sleep(1);
-						}
-					}
-				}) {IsBackground = true});
-			}
-
-			var sw = Stopwatch.StartNew();
-			sw2.Start();
-			threads.ForEach(thread => thread.Start());
-			doneEvent.Wait();
-			sw.Stop();
-			clients.ForEach(client => client.Close());
-
-			stats.WriteStatsToFile(context.StatsLogger);
-			context.Log.Information(
-				"Completed. Successes: {success}, failures: {failures} (WRONG VERSION: {wrongExpectedVersion}, P: {prepareTimeout}, " +
-				"C: {commitTimeout}, F: {forwardTimeout}, D: {streamDeleted})",
-				stats.Succ, stats.Fail, stats.WrongExpVersion, stats.PrepTimeout, stats.CommitTimeout, stats.ForwardTimeout, stats.StreamDeleted);
-
-			var reqPerSec = (stats.All + 0.0) / sw.ElapsedMilliseconds * 1000;
-			context.Log.Information("{requests} requests completed in {elapsed}ms ({rate:0.00} reqs per sec).", stats.All,
-				sw.ElapsedMilliseconds, reqPerSec);
-
-			PerfUtils.LogData(
-				Keyword,
-				PerfUtils.Row(PerfUtils.Col("clientsCnt", clientsCnt),
-					PerfUtils.Col("requestsCnt", requestsCnt),
-					PerfUtils.Col("ElapsedMilliseconds", sw.ElapsedMilliseconds)),
-				PerfUtils.Row(PerfUtils.Col("successes", stats.Succ), PerfUtils.Col("failures", stats.Fail)));
-
-			var failuresRate = (int)(100 * stats.Fail / (stats.Fail + stats.Succ));
-			PerfUtils.LogTeamCityGraphData(string.Format("{0}-{1}-{2}-reqPerSec", Keyword, clientsCnt, requestsCnt),
-				(int)reqPerSec);
-			PerfUtils.LogTeamCityGraphData(
-				string.Format("{0}-{1}-{2}-failureSuccessRate", Keyword, clientsCnt, requestsCnt), failuresRate);
-			PerfUtils.LogTeamCityGraphData(
-				string.Format("{0}-c{1}-r{2}-st{3}-s{4}-reqPerSec", Keyword, clientsCnt, requestsCnt, streamsCnt, size),
-				(int)reqPerSec);
-			PerfUtils.LogTeamCityGraphData(
-				string.Format("{0}-c{1}-r{2}-st{3}-s{4}-failureSuccessRate", Keyword, clientsCnt, requestsCnt,
-					streamsCnt, size), failuresRate);
-			monitor.GetMeasurementDetails();
-			if (Interlocked.Read(ref stats.Succ) != requestsCnt)
-				context.Fail(reason: "There were errors or not all requests completed.");
-			else
-				context.Success();
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/WriteFloodWaitingProcessor.cs b/src/EventStore.TestClient/Commands/WriteFloodWaitingProcessor.cs
deleted file mode 100644
index 7ce1ee5f40d..00000000000
--- a/src/EventStore.TestClient/Commands/WriteFloodWaitingProcessor.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading;
-using EventStore.Client.Messages;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.Transport.Tcp;
-
-namespace EventStore.TestClient.Commands {
-	internal class WriteFloodWaitingProcessor : ICmdProcessor {
-		public string Usage {
-			get { return "WRFLW [<clients> <requests> [payload-size]]"; }
-		}
-
-		public string Keyword {
-			get { return "WRFLW"; }
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			int clientsCnt = 1;
-			int requestsCnt = 5000;
-			int payloadSize = 256 + 100;
-			if (args.Length > 0) {
-				if (args.Length > 3 || args.Length < 2)
-					return false;
-
-				try {
-					clientsCnt = MetricPrefixValue.ParseInt(args[0]);
-					requestsCnt = MetricPrefixValue.ParseInt(args[1]);
-					if (args.Length == 3)
-						payloadSize = MetricPrefixValue.ParseInt(args[2]);
-				} catch {
-					return false;
-				}
-			}
-
-			WriteFlood(context, clientsCnt, requestsCnt, payloadSize);
-			return true;
-		}
-
-		private void WriteFlood(CommandProcessorContext context, int clientsCnt, int requestsCnt, int payloadSize) {
-			context.IsAsync();
-
-			var dataSize = Math.Max(0, payloadSize - 100);
-			var metadataSize = Math.Min(100, payloadSize);
-
-			var clients = new List<TcpTypedConnection<byte[]>>();
-			var threads = new List<Thread>();
-			var doneEvent = new ManualResetEventSlim(false);
-			var succ = 0;
-			var fail = 0;
-			var all = 0;
-			for (int i = 0; i < clientsCnt; i++) {
-				var count = requestsCnt / clientsCnt + ((i == clientsCnt - 1) ? requestsCnt % clientsCnt : 0);
-				var autoEvent = new AutoResetEvent(false);
-				var eventStreamId = "es" + Guid.NewGuid();
-				var received = 0;
-				var client = context._tcpTestClient.CreateTcpConnection(
-					context,
-					(conn, pkg) => {
-						if (pkg.Command != TcpCommand.WriteEventsCompleted) {
-							context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
-							return;
-						}
-
-						Interlocked.Increment(ref received);
-						var dto = pkg.Data.Deserialize<WriteEventsCompleted>();
-						if (dto.Result == OperationResult.Success) {
-							if (Interlocked.Increment(ref succ) % 1000 == 0) Console.Write(".");
-						} else {
-							if (Interlocked.Increment(ref fail) % 1000 == 0) Console.Write("#");
-						}
-
-						if (Interlocked.Increment(ref all) == requestsCnt) {
-							doneEvent.Set();
-						}
-
-						autoEvent.Set();
-					},
-					connectionClosed: (conn, err) => context.Fail(reason: "Connection was closed prematurely."));
-				clients.Add(client);
-
-				threads.Add(new Thread(() => {
-					for (int j = 0; j < count; ++j) {
-						var write = new WriteEvents(
-							eventStreamId,
-							ExpectedVersion.Any,
-							new[] {
-								new NewEvent(Guid.NewGuid().ToByteArray(),
-									"TakeSomeSpaceEvent",
-									0, 0,
-									Common.Utils.Helper.UTF8NoBom.GetBytes("DATA" + new string('*', dataSize)),
-									Common.Utils.Helper.UTF8NoBom.GetBytes("METADATA" + new string('$', metadataSize)))
-							},
-							false);
-						var package = new TcpPackage(TcpCommand.WriteEvents, Guid.NewGuid(), write.Serialize());
-						client.EnqueueSend(package.AsByteArray());
-						autoEvent.WaitOne();
-					}
-				}) {IsBackground = true});
-			}
-
-			var sw = Stopwatch.StartNew();
-			threads.ForEach(thread => thread.Start());
-			doneEvent.Wait();
-			sw.Stop();
-			clients.ForEach(client => client.Close());
-
-			var reqPerSec = (all + 0.0) / sw.ElapsedMilliseconds * 1000;
-			context.Log.Information("Completed. Successes: {success}, failures: {failures}", succ, fail);
-			context.Log.Information(
-				"{requests} requests completed in {elapsed}ms ({rate:0.00} reqs per sec, latency: {latency:0.00} ms).",
-				all, sw.ElapsedMilliseconds, reqPerSec, (sw.Elapsed.TotalMilliseconds + 0.0) / requestsCnt);
-			PerfUtils.LogData(Keyword,
-				PerfUtils.Row(PerfUtils.Col("clientsCnt", clientsCnt),
-					PerfUtils.Col("requestsCnt", requestsCnt),
-					PerfUtils.Col("ElapsedMilliseconds", sw.ElapsedMilliseconds)),
-				PerfUtils.Row(PerfUtils.Col("successes", succ), PerfUtils.Col("failures", fail)));
-			PerfUtils.LogTeamCityGraphData(string.Format("{0}-{1}-{2}-reqPerSec", Keyword, clientsCnt, requestsCnt),
-				(int)reqPerSec);
-			PerfUtils.LogTeamCityGraphData(
-				string.Format("{0}-{1}-{2}-failureSuccessRate", Keyword, clientsCnt, requestsCnt),
-				(int)(100.0 * fail / (fail + succ)));
-			PerfUtils.LogTeamCityGraphData(string.Format("{0}-latency-ms", Keyword),
-				(int)Math.Round(sw.Elapsed.TotalMilliseconds / requestsCnt));
-
-			if (succ != requestsCnt)
-				context.Fail(reason: "There were errors or not all requests completed.");
-			else
-				context.Success();
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/WriteJsonProcessor.cs b/src/EventStore.TestClient/Commands/WriteJsonProcessor.cs
deleted file mode 100644
index 069c9fb824d..00000000000
--- a/src/EventStore.TestClient/Commands/WriteJsonProcessor.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Net.Sockets;
-using EventStore.Client.Messages;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.Transport.Http.Codecs;
-
-
-namespace EventStore.TestClient.Commands {
-	internal class WriteJsonProcessor : ICmdProcessor {
-		public string Usage {
-			get { return "WRJ [<stream-id> <expected-version> <data> [<metadata>]]"; }
-		}
-
-		public string Keyword {
-			get { return "WRJ"; }
-		}
-
-		private readonly Random _random = new Random();
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			var eventStreamId = "test-stream";
-			var expectedVersion = ExpectedVersion.Any;
-			var data = GenerateTestData();
-			string metadata = null;
-
-			if (args.Length > 0) {
-				if (args.Length < 3 || args.Length > 4)
-					return false;
-				eventStreamId = args[0];
-				expectedVersion = args[1].ToUpper() == "ANY" ? ExpectedVersion.Any : int.Parse(args[1]);
-				data = args[2];
-				if (args.Length == 4)
-					metadata = args[3];
-			}
-
-			context.IsAsync();
-			var writeDto = new WriteEvents(
-				eventStreamId,
-				expectedVersion,
-				new[] {
-					new NewEvent(Guid.NewGuid().ToByteArray(),
-						"JsonDataEvent",
-						1, 0,
-						Helper.UTF8NoBom.GetBytes(data),
-						Helper.UTF8NoBom.GetBytes(metadata ?? string.Empty))
-				},
-				false);
-			var package = new TcpPackage(TcpCommand.WriteEvents, Guid.NewGuid(), writeDto.Serialize());
-
-			var sw = new Stopwatch();
-			bool dataReceived = false;
-
-			context._tcpTestClient.CreateTcpConnection(
-				context,
-				connectionEstablished: conn => {
-					context.Log.Information("[{remoteEndPoint}, L{localEndPoint}]: Writing...", conn.RemoteEndPoint,
-						conn.LocalEndPoint);
-					sw.Start();
-					conn.EnqueueSend(package.AsByteArray());
-				},
-				handlePackage: (conn, pkg) => {
-					if (pkg.Command != TcpCommand.WriteEventsCompleted) {
-						context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
-						return;
-					}
-
-					dataReceived = true;
-					sw.Stop();
-
-					var dto = pkg.Data.Deserialize<WriteEventsCompleted>();
-					if (dto.Result == OperationResult.Success) {
-						context.Log.Information("Successfully written. EventId: {correlationId}.", package.CorrelationId);
-						PerfUtils.LogTeamCityGraphData(string.Format("{0}-latency-ms", Keyword),
-							(int)Math.Round(sw.Elapsed.TotalMilliseconds));
-					} else {
-						context.Log.Information("Error while writing: {message} ({e}).", dto.Message, dto.Result);
-					}
-
-					context.Log.Information("Write request took: {elapsed}.", sw.Elapsed);
-					conn.Close();
-					context.Success();
-				},
-				connectionClosed: (connection, error) => {
-					if (dataReceived && error == SocketError.Success)
-						context.Success();
-					else
-						context.Fail();
-				});
-
-			context.WaitForCompletion();
-			return true;
-		}
-
-		private string GenerateTestData() {
-			return Codec.Json.To(new TestData(Guid.NewGuid().ToString(), _random.Next(1, 101)));
-		}
-	}
-
-	internal class TestData {
-		public string Name { get; set; }
-		public int Version { get; set; }
-
-		public TestData() {
-		}
-
-		public TestData(string name, int version) {
-			Name = name;
-			Version = version;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/WriteLongTermProcessor.cs b/src/EventStore.TestClient/Commands/WriteLongTermProcessor.cs
deleted file mode 100644
index b5cd876accd..00000000000
--- a/src/EventStore.TestClient/Commands/WriteLongTermProcessor.cs
+++ /dev/null
@@ -1,214 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading;
-using EventStore.Client.Messages;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.Transport.Tcp;
-
-namespace EventStore.TestClient.Commands {
-	internal class WriteLongTermProcessor : ICmdProcessor {
-		public string Usage {
-			get {
-				return
-					"WRLT <clients> <min req. per second> <max req. per second> <run for n minutes> [<event-stream>]";
-			}
-		}
-
-		public string Keyword {
-			get { return "WRLT"; }
-		}
-
-		private readonly object _randomLockRoot = new object();
-		private readonly Random _random = new Random();
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			int clientsCnt = 1;
-			int minPerSecond = 1;
-			int maxPerSecond = 2;
-			int runTimeMinutes = 1;
-			string eventStreamId = null;
-
-			if (args.Length > 0) {
-				if (args.Length != 4 && args.Length != 5)
-					return false;
-
-				try {
-					clientsCnt = MetricPrefixValue.ParseInt(args[0]);
-					minPerSecond = MetricPrefixValue.ParseInt(args[1]);
-					maxPerSecond = MetricPrefixValue.ParseInt(args[2]);
-					runTimeMinutes = MetricPrefixValue.ParseInt(args[3]);
-					if (args.Length == 5)
-						eventStreamId = args[4];
-				} catch {
-					return false;
-				}
-			}
-
-			Flood(context, eventStreamId, clientsCnt, minPerSecond, maxPerSecond, runTimeMinutes);
-			return true;
-		}
-
-		private void Flood(CommandProcessorContext context,
-			string eventStreamId,
-			int clientsCnt,
-			int minPerSecond,
-			int maxPerSecond,
-			int runTimeMinutes) {
-			context.IsAsync();
-
-			var clients = new List<TcpTypedConnection<byte[]>>();
-			var threads = new List<Thread>();
-			var doneEvent = new ManualResetEvent(false);
-			var done = false;
-
-			var succ = 0;
-			var fail = 0;
-
-			var requestsCnt = 0;
-
-			int sent = 0;
-			int received = 0;
-
-			var watchLockRoot = new object();
-			var sw = Stopwatch.StartNew();
-			for (int i = 0; i < clientsCnt; i++) {
-				var esId = eventStreamId ?? "Stream-" + Thread.CurrentThread.ManagedThreadId % 3;
-
-				var client = context._tcpTestClient.CreateTcpConnection(
-					context,
-					(conn, pkg) => {
-						if (pkg.Command != TcpCommand.WriteEventsCompleted) {
-							context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
-							return;
-						}
-
-						var dto = pkg.Data.Deserialize<WriteEventsCompleted>();
-						if (dto.Result == OperationResult.Success) {
-							var succDone = Interlocked.Increment(ref succ);
-							if (succDone % maxPerSecond == 0)
-								Console.Write(".");
-
-							Interlocked.Increment(ref requestsCnt);
-						} else
-							Interlocked.Increment(ref fail);
-
-						Interlocked.Increment(ref received);
-					},
-					connectionClosed: (conn, err) => {
-						if (!done)
-							context.Fail(reason: "Socket was closed, but not all requests were completed.");
-						else
-							context.Success();
-					});
-				clients.Add(client);
-
-				threads.Add(new Thread(() => {
-					var sentCount = 0;
-					var sleepTime = 0;
-
-					var dataSizeCoefficient = 1;
-					var currentMinute = -1;
-
-					while (true) {
-						TimeSpan elapsed;
-						lock (watchLockRoot)
-							elapsed = sw.Elapsed;
-
-						if (elapsed.TotalMinutes > runTimeMinutes) {
-							done = true;
-							doneEvent.Set();
-							break;
-						}
-
-						if (sentCount == 0) {
-							int elapsedMinutesInt = (int)elapsed.TotalMinutes;
-							lock (_randomLockRoot) {
-								sentCount = minPerSecond == maxPerSecond
-									? maxPerSecond
-									: _random.Next(minPerSecond, maxPerSecond);
-								dataSizeCoefficient = _random.Next(8, 256);
-							}
-
-							if (currentMinute != elapsedMinutesInt) {
-								currentMinute = elapsedMinutesInt;
-								context.Log.Information(
-									"\nElapsed {elapsed} of {runTime} minutes, sent {sent}; next block coef. {dataSizeCoefficient}",
-									elapsedMinutesInt,
-									runTimeMinutes,
-									sent,
-									dataSizeCoefficient);
-							}
-
-							sleepTime = 1000 / sentCount;
-						}
-
-						var dataSize = dataSizeCoefficient * 8;
-						var write = new WriteEvents(
-							esId,
-							ExpectedVersion.Any,
-							new[] {
-								new NewEvent(
-									Guid.NewGuid().ToByteArray(),
-									"TakeSomeSpaceEvent",
-									0, 0,
-									Helper.UTF8NoBom.GetBytes(
-										"DATA" + dataSize.ToString(" 00000 ") + new string('*', dataSize)),
-									Helper.UTF8NoBom.GetBytes("METADATA" + new string('$', 100)))
-							},
-							false);
-						var package = new TcpPackage(TcpCommand.WriteEvents, Guid.NewGuid(), write.Serialize());
-						client.EnqueueSend(package.AsByteArray());
-
-						Interlocked.Increment(ref sent);
-
-						Thread.Sleep(sleepTime);
-						sentCount -= 1;
-
-						while (sent - received > context._tcpTestClient.Options.WriteWindow / clientsCnt) {
-							Thread.Sleep(1);
-						}
-					}
-				}));
-			}
-
-			foreach (var thread in threads) {
-				thread.IsBackground = true;
-				thread.Start();
-			}
-
-			doneEvent.WaitOne();
-			sw.Stop();
-
-			foreach (var client in clients) {
-				client.Close();
-			}
-
-			context.Log.Information("Completed. Successes: {success}, failures: {failures}", succ, fail);
-			var reqPerSec = (requestsCnt + 0.0) / sw.ElapsedMilliseconds * 1000;
-			context.Log.Information("{requests} requests completed in {elapsed}ms ({rate:0.00} reqs per sec).",
-				requestsCnt,
-				sw.ElapsedMilliseconds,
-				reqPerSec);
-
-			PerfUtils.LogData(
-				Keyword,
-				PerfUtils.Row(PerfUtils.Col("clientsCnt", clientsCnt),
-					PerfUtils.Col("requestsCnt", requestsCnt),
-					PerfUtils.Col("ElapsedMilliseconds", sw.ElapsedMilliseconds)),
-				PerfUtils.Row(PerfUtils.Col("successes", succ), PerfUtils.Col("failures", fail))
-			);
-
-			PerfUtils.LogTeamCityGraphData(string.Format("{0}-{1}-{2}-reqPerSec", Keyword, clientsCnt, requestsCnt),
-				(int)reqPerSec);
-
-			PerfUtils.LogTeamCityGraphData(
-				string.Format("{0}-{1}-{2}-failureSuccessRate", Keyword, clientsCnt, requestsCnt),
-				100 * fail / (fail + succ));
-
-			context.Success();
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Commands/WriteProcessor.cs b/src/EventStore.TestClient/Commands/WriteProcessor.cs
deleted file mode 100644
index a4b45082977..00000000000
--- a/src/EventStore.TestClient/Commands/WriteProcessor.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using System;
-using System.Diagnostics;
-using EventStore.Client.Messages;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Transport.Tcp;
-
-namespace EventStore.TestClient.Commands {
-	internal class WriteProcessor : ICmdProcessor {
-		public string Usage {
-			get { return "WR [<stream-id> <expected-version> <data> [<metadata> [<is-json> [<login> <pass>]]]"; }
-		}
-
-		public string Keyword {
-			get { return "WR"; }
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			var eventStreamId = "test-stream";
-			var expectedVersion = ExpectedVersion.Any;
-			var data = "test-data";
-			string metadata = null;
-			bool isJson = false;
-			string login = null;
-			string pass = null;
-
-			if (args.Length > 0) {
-				if (args.Length < 3 || args.Length > 7 || args.Length == 6)
-					return false;
-				eventStreamId = args[0];
-				expectedVersion = args[1].ToUpper() == "ANY" ? ExpectedVersion.Any : int.Parse(args[1]);
-				data = args[2];
-				if (args.Length >= 4)
-					metadata = args[3];
-				if (args.Length >= 5)
-					isJson = bool.Parse(args[4]);
-				if (args.Length >= 7) {
-					login = args[5];
-					pass = args[6];
-				}
-			}
-
-			context.IsAsync();
-			var sw = new Stopwatch();
-			context._tcpTestClient.CreateTcpConnection(
-				context,
-				connectionEstablished: conn => {
-					context.Log.Information("[{remoteEndPoint}, L{localEndPoint}]: Writing...", conn.RemoteEndPoint,
-						conn.LocalEndPoint);
-					var writeDto = new WriteEvents(
-						eventStreamId,
-						expectedVersion,
-						new[] {
-							new NewEvent(Guid.NewGuid().ToByteArray(),
-								"TakeSomeSpaceEvent",
-								isJson ? 1 : 0, 0,
-								Helper.UTF8NoBom.GetBytes(data),
-								Helper.UTF8NoBom.GetBytes(metadata ?? string.Empty))
-						},
-						false);
-					var package = new TcpPackage(TcpCommand.WriteEvents,
-						login == null ? TcpFlags.None : TcpFlags.Authenticated,
-						Guid.NewGuid(),
-						login,
-						pass,
-						writeDto.Serialize()).AsByteArray();
-					sw.Start();
-					conn.EnqueueSend(package);
-				},
-				handlePackage: (conn, pkg) => {
-					sw.Stop();
-					context.Log.Information("Write request took: {elapsed}.", sw.Elapsed);
-
-					if (pkg.Command != TcpCommand.WriteEventsCompleted) {
-						context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
-						return;
-					}
-
-					var dto = pkg.Data.Deserialize<WriteEventsCompleted>();
-					if (dto.Result == EventStore.Client.Messages.OperationResult.Success) {
-						context.Log.Information("Successfully written.");
-						PerfUtils.LogTeamCityGraphData(string.Format("{0}-latency-ms", Keyword),
-							(int)Math.Round(sw.Elapsed.TotalMilliseconds));
-						context.Success();
-					} else {
-						context.Log.Information("Error while writing: {message} ({e}).", dto.Message, dto.Result);
-						context.Fail();
-					}
-
-					conn.Close();
-				},
-				connectionClosed: (connection, error) => context.Fail(reason: "Connection was closed prematurely."));
-
-			context.WaitForCompletion();
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/CommandsProcessor.cs b/src/EventStore.TestClient/CommandsProcessor.cs
deleted file mode 100644
index 2e3e7fe3c6b..00000000000
--- a/src/EventStore.TestClient/CommandsProcessor.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.TestClient {
-	internal class CommandsProcessor {
-		public IEnumerable<ICmdProcessor> RegisteredProcessors {
-			get { return _processors.Values; }
-		}
-
-		private readonly Serilog.ILogger _log;
-		private readonly IDictionary<string, ICmdProcessor> _processors = new Dictionary<string, ICmdProcessor>();
-		private ICmdProcessor _regCommandsProcessor;
-
-		public CommandsProcessor(ILogger log) {
-			_log = log;
-		}
-
-		public void Register(ICmdProcessor processor, bool usageProcessor = false) {
-			var cmd = processor.Keyword.ToUpper();
-
-			if (_processors.ContainsKey(cmd))
-				throw new InvalidOperationException(
-					string.Format("The processor for command '{0}' is already registered.", cmd));
-
-			_processors[cmd] = processor;
-
-			if (usageProcessor)
-				_regCommandsProcessor = processor;
-		}
-		
-		public bool TryProcess(CommandProcessorContext context, string[] args, out int exitCode) {
-			var commandName = args[0].ToUpper();
-			var commandArgs = args.Skip(1).ToArray();
-
-			ICmdProcessor commandProcessor;
-			if (!_processors.TryGetValue(commandName, out commandProcessor)) {
-				_log.Information("Unknown command: {command}.", commandName);
-				if (_regCommandsProcessor != null)
-					_regCommandsProcessor.Execute(context, new string[0]);
-				exitCode = 1;
-				return false;
-			}
-
-			int exitC = 0;
-			var executedEvent = new AutoResetEvent(false);
-
-			ThreadPool.QueueUserWorkItem(_ => {
-				try {
-					var syntaxOk = commandProcessor.Execute(context, commandArgs);
-					if (syntaxOk) {
-						exitC = context.ExitCode;
-					} else {
-						exitC = 1;
-						_log.Information("Usage of {command}:", commandName);
-						
-						foreach (var s in commandProcessor.Usage.Split("\n")) {
-							_log.Information("    {usage}", s);
-						}
-					}
-
-					executedEvent.Set();
-				} catch (Exception exc) {
-					_log.Error(exc, "Error while executing command {command}.", commandName);
-					exitC = -1;
-					executedEvent.Set();
-				}
-			});
-
-			executedEvent.WaitOne(1000);
-			context.WaitForCompletion();
-
-			if (!string.IsNullOrWhiteSpace(context.Reason))
-				_log.Error("Error during execution of command: {e}.", context.Reason);
-			if (context.Error != null) {
-				_log.Error(context.Error, "Error during execution of command");
-
-				var details = new StringBuilder();
-				BuildFullException(context.Error, details);
-				_log.Error("Details: {details}", details.ToString());
-			}
-
-			exitCode = exitC == 0 ? context.ExitCode : exitC;
-			return true;
-		}
-
-		private static void BuildFullException(Exception ex, StringBuilder details, int level = 0) {
-			const int maxLevel = 3;
-
-			if (details == null)
-				throw new ArgumentNullException("details");
-
-			if (level > maxLevel)
-				return;
-
-			while (ex != null) {
-				details.AppendFormat("\n{0}-->{1}", new string(' ', level * 2), ex.Message);
-
-				var aggregated = ex as AggregateException;
-				if (aggregated?.InnerExceptions != null) {
-					if (level > maxLevel)
-						break;
-
-					foreach (var innerException in aggregated.InnerExceptions.Take(2))
-						BuildFullException(innerException, details, level + 1);
-				} else
-					ex = ex.InnerException;
-
-				level += 1;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/ConsoleTable.cs b/src/EventStore.TestClient/ConsoleTable.cs
deleted file mode 100644
index 5f6fbaab7a0..00000000000
--- a/src/EventStore.TestClient/ConsoleTable.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using EventStore.Common.Utils;
-#pragma warning disable 1591
-
-namespace EventStore.TestClient {
-	public class ConsoleTable {
-		private readonly string[] _header;
-		private readonly int[] _columnWidths;
-		private readonly List<string> _rows;
-
-		public ConsoleTable(params string[] header) {
-			Ensure.NotNull(header, "header");
-
-			_header = header;
-			_columnWidths = _header.Select(s => s.Length + 4).ToArray();
-			_rows = new List<string>();
-
-			AppendRow(_header);
-		}
-
-		public string CreateIndentedTable() {
-			return string.Format("{0}{1}{0}", Environment.NewLine, CreateTable());
-		}
-
-		public string CreateTable() {
-			var lineSeparator = RowSeparator(_columnWidths.Sum() + _columnWidths.Length + 1);
-
-			var table = new StringBuilder();
-			foreach (var row in _rows) {
-				table.AppendLine(lineSeparator);
-				table.AppendLine(row);
-			}
-
-			table.Append(lineSeparator);
-
-			return table.ToString();
-		}
-
-		private string RowSeparator(int width) {
-			return new string('-', width);
-		}
-
-		public void AppendRow(params string[] cells) {
-			if (cells == null || cells.Length != _header.Length)
-				return;
-
-			var row = new StringBuilder();
-			for (int i = 0; i < cells.Length; i++) {
-				var format = "|{0," + _columnWidths[i] + "}";
-				row.AppendFormat(format, cells[i]);
-			}
-
-			row.Append("|");
-
-			_rows.Add(row.ToString());
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/EventStore.TestClient.csproj b/src/EventStore.TestClient/EventStore.TestClient.csproj
deleted file mode 100644
index 3d6bffb5029..00000000000
--- a/src/EventStore.TestClient/EventStore.TestClient.csproj
+++ /dev/null
@@ -1,35 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<OutputType>Exe</OutputType>
-		<GenerateSupportedRuntime>false</GenerateSupportedRuntime>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-		<NoWarn>1701;1702;1591</NoWarn>
-	</PropertyGroup>
-	<ItemGroup>
-		<PackageReference Include="EventStore.Client" Version="21.2.0" />
-		<PackageReference Include="EventStore.Client.Grpc.Streams" Version="23.3.3" />
-		<PackageReference Include="EventStore.Plugins" Version="24.10.3" />
-		<PackageReference Include="Google.Protobuf" Version="3.27.2" />
-		<PackageReference Include="Grpc.Net.Client" Version="2.64.0" />
-		<PackageReference Include="Grpc.Tools" Version="2.65.0">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-		<PackageReference Include="System.CommandLine.DragonFruit" Version="0.3.0-alpha.21216.1" />
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\EventStore.BufferManagement\EventStore.BufferManagement.csproj" />
-		<ProjectReference Include="..\EventStore.Common\EventStore.Common.csproj" />
-		<ProjectReference Include="..\EventStore.Core\EventStore.Core.csproj" />
-		<ProjectReference Include="..\EventStore.Transport.Http\EventStore.Transport.Http.csproj" />
-		<ProjectReference Include="..\EventStore.Transport.Tcp\EventStore.Transport.Tcp.csproj" />
-	</ItemGroup>
-	<ItemGroup>
-		<None Include="..\EventStore.ClusterNode\logconfig.json">
-			<Link>logconfig.json</Link>
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-	</ItemGroup>
-</Project>
diff --git a/src/EventStore.TestClient/GrpcCommands/ReadAllProcessor.cs b/src/EventStore.TestClient/GrpcCommands/ReadAllProcessor.cs
deleted file mode 100644
index 4fb6cff3991..00000000000
--- a/src/EventStore.TestClient/GrpcCommands/ReadAllProcessor.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Client;
-using Serilog;
-
-namespace EventStore.TestClient.GrpcCommands {
-	internal class ReadAllProcessor : ICmdProcessor {
-		public string Usage {
-			get { return "RDALLGRPC [[F|B] [clients] [<commit pos> <prepare pos>]]"; }
-		}
-
-		public string Keyword {
-			get { return "RDALLGRPC"; }
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			Direction direction = Direction.Forwards;
-			Position position = Position.Start;
-			bool forward = true;
-			bool posOverriden = false;
-			int clientCount = 1;
-
-			if (args.Length > 0) {
-				if (args.Length > 4)
-					return false;
-
-				if (args[0].ToUpper() == "F")
-					forward = true;
-				else if (args[0].ToUpper() == "B")
-					forward = false;
-				else
-					return false;
-
-				if (args.Length > 1) {
-					clientCount = MetricPrefixValue.ParseInt(args[1]);
-				}
-
-				if (args.Length == 4) {
-					posOverriden = true;
-					if (!ulong.TryParse(args[2], out var commitPos) || !ulong.TryParse(args[3], out var preparePos))
-						return false;
-
-					position = new Position(commitPos, preparePos);
-				}
-			}
-
-			if (!posOverriden) {
-				position = forward ? Position.Start : Position.End;
-			}
-
-			context.IsAsync();
-
-			if (context._grpcTestClient.AreCredentialsMissing) {
-				context.Fail(reason: "Credentials are needed in order to read from the $all stream, specify a connection string with credentials!");
-				return true;
-			}
-			
-			var task = ReadAll(context, clientCount, direction, position);
-			task.Wait();
-
-			return true;
-		}
-		
-		private async Task ReadAll(CommandProcessorContext context, int clientCount, Direction direction, Position position) {
-
-			var cts = new CancellationTokenSource();
-
-			ProgressMonitor monitor = new ProgressMonitor(context.Log);
-
-			var clientTasks = new List<Task>();
-			for (int i = 0; i < clientCount; i++) {
-				if (i > 0) {
-					await Task.Delay(TimeSpan.FromSeconds(30));
-				}
-				
-				EventStoreClient client = context._grpcTestClient.CreateGrpcClient();
-				clientTasks.Add(ReadAllTask(client));
-			}
-			
-			await Task.WhenAll(clientTasks);
-			
-			monitor.Stop();
-			context.Log.Information("=== Reading ALL {readDirection} completed in {elapsed}. Total read: {total}",
-				direction, monitor.Duration, monitor.Total);
-			context.Success();
-			
-			async Task ReadAllTask(EventStoreClient c) {
-				var r = c.ReadAllAsync(direction, position, cancellationToken: cts.Token);
-				await foreach (var _ in r.Messages.WithCancellation(cts.Token)) {
-					monitor.Increment();
-				}
-			}
-		}
-		
-		class ProgressMonitor {
-			private ulong _i;
-			private readonly ILogger _log;
-			private readonly Stopwatch _duration;
-			private readonly Stopwatch _interval;
-
-			public ProgressMonitor (ILogger log) {
-				_log = log;
-				_duration = Stopwatch.StartNew();
-				_interval = Stopwatch.StartNew();
-			}
-
-			public TimeSpan Duration => _duration.Elapsed;
-			public ulong Total => _i;
-			
-			public void Increment() {
-				var result = Interlocked.Increment(ref _i);
-
-				if (result % 1000 == 0) {
-					Console.Write(".");
-				}
-				
-				if (result % 100_000 == 0) {
-					_log.Information(
-						"\nDONE TOTAL {reads} READ IN {elapsed} ({rate:0.0}/s)",
-						_i, _interval.Elapsed, 1000.0 * (_i / _duration.Elapsed.TotalMilliseconds));
-					_interval.Restart();
-				}
-			}
-
-			public void Stop() {
-				_duration.Stop();
-				_interval.Stop();
-			}
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/GrpcCommands/WriteFloodProcessor.cs b/src/EventStore.TestClient/GrpcCommands/WriteFloodProcessor.cs
deleted file mode 100644
index 6953636f062..00000000000
--- a/src/EventStore.TestClient/GrpcCommands/WriteFloodProcessor.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Client;
-using EventStore.TestClient.Commands;
-using EventStore.TestClient.Statistics;
-
-namespace EventStore.TestClient.GrpcCommands {
-	internal class WriteFloodProcessor : ICmdProcessor {
-		private static readonly UTF8Encoding UTF8NoBom = new UTF8Encoding(false);
-
-		public string Usage {
-			//                         0          1            2           3          4              5
-			get { return "WRFLGRPC [<clients> <requests> [<streams-cnt> [<size> [<batchsize> [<stream-prefix>]]]]]"; }
-		}
-
-		public string Keyword {
-			get { return "WRFLGRPC"; }
-		}
-
-		public bool Execute(CommandProcessorContext context, string[] args) {
-			int clientsCnt = 1;
-			long requestsCnt = 5000;
-			int streamsCnt = 1000;
-			int size = 256;
-			int batchSize = 1;
-			string streamNamePrefix = string.Empty;
-			if (args.Length > 0)
-			{
-			    if (args.Length < 2 || args.Length > 6)
-			        return false;
-
-				try
-				{
-					clientsCnt = MetricPrefixValue.ParseInt(args[0]);
-					requestsCnt = MetricPrefixValue.ParseLong(args[1]);
-					if (args.Length >= 3)
-						streamsCnt = MetricPrefixValue.ParseInt(args[2]);
-					if (args.Length >= 4)
-						size = MetricPrefixValue.ParseInt(args[3]);
-					if (args.Length >= 5)
-						batchSize = MetricPrefixValue.ParseInt(args[4]);
-					if (args.Length >= 6)
-						streamNamePrefix = args[5];
-				}
-				catch
-				{
-					return false;
-				}
-			}
-
-			var stats = new WriteFloodStats(Keyword, context.OutputCsv, args);
-			var monitor = new RequestMonitor();
-			try {
-				var task = WriteFlood(context, stats, clientsCnt, requestsCnt, streamsCnt, size, batchSize, streamNamePrefix, monitor);
-				task.Wait();
-			} catch (Exception ex) {
-				context.Fail(ex);
-			}
-
-			return true;
-		}
-
-		private async Task WriteFlood(CommandProcessorContext context, WriteFloodStats stats, int clientsCnt, long requestsCnt, int streamsCnt,
-			int size, int batchSize, string streamNamePrefix, RequestMonitor monitor) {
-			context.IsAsync();
-
-			long last = 0;
-			long currentInterval = 0;
-			long interval = 100000;
-			byte[] data = UTF8NoBom.GetBytes("{ \"DATA\" : \"" + new string('*', size) + "\"}");
-			byte[] metadata = UTF8NoBom.GetBytes("{ \"METADATA\" : \"" + new string('$', 100) + "\"}");
-
-			string[] streams = Enumerable.Range(0, streamsCnt).Select(x =>
-				string.IsNullOrWhiteSpace(streamNamePrefix)
-					? Guid.NewGuid().ToString()
-					: $"{streamNamePrefix}-{x}"
-			).ToArray();
-
-			context.Log.Information("Writing streams randomly between {first} and {last}",
-				streams.FirstOrDefault(),
-				streams.LastOrDefault());
-
-			var start = new TaskCompletionSource();
-			stats.StartTime = DateTime.UtcNow;
-			var sw2 = new Stopwatch();
-			var capacity = 2000 / clientsCnt;
-			var clientTasks = new List<Task>();
-			for (int i = 0; i < clientsCnt; i++) {
-				var count = requestsCnt / clientsCnt + ((i == clientsCnt - 1) ? requestsCnt % clientsCnt : 0);
-				var client = context._grpcTestClient.CreateGrpcClient();
-				clientTasks.Add(RunClient(client, count));
-			}
-
-			async Task RunClient(EventStoreClient client, long count) {
-				var rnd = new Random();
-				List<Task> pending = new List<Task>(capacity);
-				await start.Task;
-				for (int j = 0; j < count; ++j) {
-					var events = new EventData[batchSize];
-
-					for (int q = 0; q < batchSize; q++) {
-						events[q] = new EventData(Uuid.FromGuid(Guid.NewGuid()), "TakeSomeSpaceEvent", data, metadata);
-					}
-
-					var corrid = Guid.NewGuid();
-					monitor.StartOperation(corrid);
-
-					pending.Add(client.AppendToStreamAsync(streams[rnd.Next(streamsCnt)], StreamState.Any, events).ContinueWith(t => {
-						if (t.IsCompletedSuccessfully) Interlocked.Increment(ref stats.Succ);
-						else {
-							if (Interlocked.Increment(ref stats.Fail) % 1000 == 0) {
-								Console.Write("#");
-								if (t.Exception != null) {
-									var msg = string.Join("\n", t.Exception.ToString().Split("\n").Take(5)); 
-									context.Log.Error(msg);
-								}
-							}
-						}
-						var localAll = Interlocked.Add(ref stats.All, batchSize);
-						if (localAll - currentInterval > interval) {
-							var localInterval = Interlocked.Exchange(ref currentInterval, localAll);
-							stats.Elapsed = sw2.Elapsed;
-							stats.Rate = 1000.0 * (localAll - localInterval) / stats.Elapsed.TotalMilliseconds;
-							sw2.Restart();
-							context.Log.Information(
-								"\nDONE TOTAL {writes} WRITES IN {elapsed} ({rate:0.0}/s) [S:{success}, F:{failures} (WEV:{wrongExpectedVersion}, " +
-								"P:{prepareTimeout}, C:{commitTimeout}, F:{forwardTimeout}, D:{streamDeleted})].",
-								localAll, stats.Elapsed, stats.Rate, stats.Succ, stats.Fail,
-								stats.WrongExpVersion, stats.PrepTimeout, stats.CommitTimeout, stats.ForwardTimeout, stats.StreamDeleted);
-							stats.WriteStatsToFile(context.StatsLogger);
-						}
-
-						monitor.EndOperation(corrid);
-					}));
-					
-					if (pending.Count >= capacity) {
-						await Task.WhenAny(pending);
-						
-						while (pending.Count > 0 && Task.WhenAny(pending).IsCompleted) {
-							pending
-								.Where(x => x.IsCompleted).ToList()
-								.ForEach(p => {
-									p.Dispose();
-									pending.Remove(p);
-								});
-							
-							if (stats.Succ - last > 1000) {
-								Console.Write(".");
-								last = stats.Succ;
-							}
-						}
-					}
-				}
-
-				if (pending.Count > 0) await Task.WhenAll(pending);
-			}
-
-			var sw = Stopwatch.StartNew();
-			sw2.Start();
-			start.SetResult();
-			await Task.WhenAll(clientTasks);
-			sw.Stop();
-
-			context.Log.Information(
-				"Completed. Successes: {success}, failures: {failures} (WRONG VERSION: {wrongExpectedVersion}, P: {prepareTimeout}, C: {commitTimeout}, F: {forwardTimeout}, D: {streamDeleted})",
-				stats.Succ, stats.Fail,
-				stats.WrongExpVersion, stats.PrepTimeout, stats.CommitTimeout, stats.ForwardTimeout, stats.StreamDeleted);
-			stats.WriteStatsToFile(context.StatsLogger);
-
-			var reqPerSec = (stats.All + 0.0) / sw.ElapsedMilliseconds * 1000;
-			context.Log.Information("{requests} requests completed in {elapsed}ms ({rate:0.00} reqs per sec).", stats.All,
-				sw.ElapsedMilliseconds, reqPerSec);
-
-			PerfUtils.LogData(
-				Keyword,
-				PerfUtils.Row(PerfUtils.Col("clientsCnt", clientsCnt),
-					PerfUtils.Col("requestsCnt", requestsCnt),
-					PerfUtils.Col("ElapsedMilliseconds", sw.ElapsedMilliseconds)),
-				PerfUtils.Row(PerfUtils.Col("successes", stats.Succ), PerfUtils.Col("failures", stats.Fail)));
-
-			var failuresRate = (int)(100 * stats.Fail / (stats.Fail + stats.Succ));
-			PerfUtils.LogTeamCityGraphData(string.Format("{0}-{1}-{2}-reqPerSec", Keyword, clientsCnt, requestsCnt),
-				(int)reqPerSec);
-			PerfUtils.LogTeamCityGraphData(
-				string.Format("{0}-{1}-{2}-failureSuccessRate", Keyword, clientsCnt, requestsCnt), failuresRate);
-			PerfUtils.LogTeamCityGraphData(
-				string.Format("{0}-c{1}-r{2}-st{3}-s{4}-reqPerSec", Keyword, clientsCnt, requestsCnt, streamsCnt, size),
-				(int)reqPerSec);
-			PerfUtils.LogTeamCityGraphData(
-				string.Format("{0}-c{1}-r{2}-st{3}-s{4}-failureSuccessRate", Keyword, clientsCnt, requestsCnt,
-					streamsCnt, size), failuresRate);
-			monitor.GetMeasurementDetails();
-			if (Interlocked.Read(ref stats.Succ) != requestsCnt)
-				context.Fail(reason: "There were errors or not all requests completed.");
-			else
-				context.Success();
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/GrpcTestClient.cs b/src/EventStore.TestClient/GrpcTestClient.cs
deleted file mode 100644
index 0f5fccf769a..00000000000
--- a/src/EventStore.TestClient/GrpcTestClient.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using EventStore.Client;
-using Connection = EventStore.Transport.Tcp.TcpTypedConnection<byte[]>;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.TestClient {
-	/// <summary>
-	/// A test client that connects using the dotnet gRPC client
-	/// </summary>
-	public class GrpcTestClient {
-		private ClientOptions _options;
-		private ILogger _log;
-
-		/// <summary>
-		/// Constructs a new <see cref="GrpcTestClient"/>
-		/// </summary>
-		/// <param name="options"></param>
-		/// <param name="log"></param>
-		public GrpcTestClient(ClientOptions options, ILogger log) {
-			_options = options;
-			_log = log;
-		}
-
-		/// <summary>
-		/// Creates a new gRPC client
-		/// </summary>
-		/// <returns></returns>
-		public EventStoreClient CreateGrpcClient() {
-			_log.Debug("Creating gRPC client with connection string '{connectionString}'.", ConnectionString);
-			return new EventStoreClient(Settings);
-		}
-
-		/// <summary>
-		/// True in case username and/or password are not specified.
-		/// </summary>
-		public bool AreCredentialsMissing =>
-			string.IsNullOrWhiteSpace(Settings.DefaultCredentials?.Username) ||
-			string.IsNullOrWhiteSpace(Settings.DefaultCredentials?.Password);
-
-		private EventStoreClientSettings Settings => EventStoreClientSettings.Create(ConnectionString);
-		
-		private string ConnectionString => string.IsNullOrWhiteSpace(_options.ConnectionString)
-			? $"esdb://{_options.Host}:{_options.HttpPort}?tls={_options.UseTls}&tlsVerifyCert={_options.TlsValidateServer}"
-			: _options.ConnectionString;
-		
-	}
-}
diff --git a/src/EventStore.TestClient/ICmdProcessor.cs b/src/EventStore.TestClient/ICmdProcessor.cs
deleted file mode 100644
index d8aa9f226b2..00000000000
--- a/src/EventStore.TestClient/ICmdProcessor.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma warning disable 1591
-namespace EventStore.TestClient {
-	/// <summary>
-	/// Standalone command executable within the test client
-	/// </summary>
-	public interface ICmdProcessor {
-		/// <summary>
-		/// Keyword associated with this command (to start it)
-		/// </summary>
-		string Keyword { get; }
-
-		/// <summary>
-		/// Short usage string with optional and required parameters
-		/// </summary>
-		string Usage { get; }
-
-		bool Execute(CommandProcessorContext context, string[] args);
-	}
-}
diff --git a/src/EventStore.TestClient/PerfUtils.cs b/src/EventStore.TestClient/PerfUtils.cs
deleted file mode 100644
index c2d0b1e8970..00000000000
--- a/src/EventStore.TestClient/PerfUtils.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System;
-using System.Text;
-using ILogger = Serilog.ILogger;
-#pragma warning disable 1591
-
-namespace EventStore.TestClient {
-	public static class PerfUtils {
-		private static readonly ILogger Log = Serilog.Log.ForContext(typeof(PerfUtils));
-
-		private const string ColumnSplitter = ";";
-		private const string PairSplitter = ":";
-
-		public static NameValue Col(string name, object value) {
-			return new NameValue(name, value);
-		}
-
-		public static NameValue[] Row(params NameValue[] nameValuesList) {
-			return nameValuesList;
-		}
-
-		public static void LogData(string dataName, params NameValue[][] rows) {
-			var sb = new StringBuilder();
-
-			sb.AppendLine("[[begin");
-			sb.AppendLine(Format("DataName", dataName));
-			foreach (var cols in rows) {
-				foreach (var nameValue in cols) {
-					sb.Append(Format(nameValue.Name, nameValue.Value));
-				}
-
-				sb.AppendLine();
-			}
-
-			sb.AppendLine("end]]");
-
-			Log.Debug(sb.ToString());
-		}
-
-		private static string Format(string name, object value) {
-			return string.Format("{0}{1}{2}{3}", name, PairSplitter, value, ColumnSplitter);
-		}
-
-		/// <summary>
-		/// Prints key-value point to the log in a way that TeamCity build server
-		/// would be able to capture and then plot on build statistics page,
-		/// tracking performance across multiple builds (need server-side config per project).
-		/// </summary>
-		public static void LogTeamCityGraphData(string key, long value) {
-			if (value < 0) {
-				Log.Error("Value is {value}, however TeamCity requires Value as a positive (non negative) integer.",
-					value);
-				return;
-			}
-
-			Log.Debug("\n##teamcity[buildStatisticValue key='{key}' value='{value}']", key, value);
-		}
-
-		public class NameValue {
-			public readonly string Name;
-			public readonly object Value;
-
-			public NameValue(string name, object value) {
-				Name = name;
-				Value = value;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/PortsHelper.cs b/src/EventStore.TestClient/PortsHelper.cs
deleted file mode 100644
index ddbd774bebc..00000000000
--- a/src/EventStore.TestClient/PortsHelper.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
-using System.Net;
-using System.Net.Sockets;
-using System.Threading.Tasks;
-using System.Collections.Concurrent;
-using System.Net.Http;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.TestClient {
-	internal static class PortsHelper {
-		private static readonly ILogger Log =
-			Serilog.Log.ForContext(Serilog.Core.Constants.SourceContextPropertyName, "PortsHelper");
-
-		public const int PortStart = 45000;
-		public const int PortCount = 200;
-
-		private static readonly ConcurrentQueue<int> AvailablePorts =
-			new ConcurrentQueue<int>(Enumerable.Range(PortStart, PortCount));
-
-		public static void InitPorts(IPAddress ip) {
-			var sw = Stopwatch.StartNew();
-
-			int p;
-			while (AvailablePorts.TryDequeue(out p)) {
-			}
-
-			Log.Verbose("PortsHelper: starting to examine ports at [{ip}].", ip);
-
-			int succ = 0;
-			for (int port = PortStart; port < PortStart + PortCount; ++port) {
-				try {
-					var listener = new TcpListener(ip, port);
-					listener.Start();
-					listener.Stop();
-				} catch (Exception exc) {
-					Log.Verbose(exc, "PortsHelper: port {port} unavailable for TcpListener. Error: {e}.", port,
-						exc.Message);
-					continue;
-				}
-
-				try {
-					var httpListener = new HttpListener();
-					httpListener.Prefixes.Add(string.Format("http://+:{0}/", port));
-					httpListener.Start();
-
-					Exception httpListenerError = null;
-					var listenTask = Task.Factory.StartNew(() => {
-						try {
-							var context = httpListener.GetContext();
-							context.Response.Close(new byte[] {1, 2, 3}, true);
-						} catch (Exception exc) {
-							httpListenerError = exc;
-						}
-					});
-					var client = new HttpClient();
-					var request = client.GetAsync(string.Format("http://{0}:{1}/", ip, port)).Result;
-					var buffer = new byte[256];
-					var read = request.Content.ReadAsStream().Read(buffer, 0, buffer.Length);
-					if (read != 3 || buffer[0] != 1 || buffer[1] != 2 || buffer[2] != 3)
-						throw new Exception(string.Format("Unexpected response received from HTTP on port {0}.", port));
-
-					if (!listenTask.Wait(5000))
-						throw new Exception("PortsHelper: time out waiting for HttpListener to return.");
-					if (httpListenerError != null)
-						throw httpListenerError;
-
-					httpListener.Stop();
-				} catch (Exception exc) {
-					Log.Verbose(exc, "PortsHelper: port {port} unavailable for HttpListener. Error: {e}.", port,
-						exc.Message);
-					continue;
-				}
-
-				AvailablePorts.Enqueue(port);
-				succ += 1;
-			}
-
-			Log.Verbose("PortsHelper: {ports} ports are available at [{ip}].", succ, ip);
-			if (succ <= PortCount / 2)
-				throw new Exception("More than half requested ports are unavailable.");
-
-			Log.Verbose("PortsHelper: test took {elapsed}.", sw.Elapsed);
-		}
-
-		public static int GetAvailablePort(IPAddress ip) {
-			for (int i = 0; i < 50; ++i) {
-				int port;
-				if (!AvailablePorts.TryDequeue(out port))
-					throw new Exception("Couldn't get free TCP port for MiniNode.");
-
-/*
-                try
-                {
-                    var listener = new TcpListener(ip, port);
-                    listener.Start();
-                    listener.Stop();
-                }
-                catch (Exception)
-                {
-                    AvailablePorts.Enqueue(port);
-                    continue;
-                }
-*/
-
-				try {
-					var httpListener = new HttpListener();
-					httpListener.Prefixes.Add(string.Format("http://127.0.0.1:{0}/", port));
-					httpListener.Start();
-					httpListener.Stop();
-				} catch (Exception) {
-					AvailablePorts.Enqueue(port);
-					continue;
-//                    throw new Exception(
-//                        string.Format("HttpListener couldn't listen on port {0}, but TcpListener was OK.\nError: {1}", port, exc), exc);
-				}
-
-				return port;
-			}
-
-			throw new Exception("Reached trials limit while trying to get free port for MiniNode");
-		}
-
-		public static void ReturnPort(int port) {
-			AvailablePorts.Enqueue(port);
-		}
-
-/*
-        private static int[] GetRandomPorts(int from, int portCount)
-        {
-            var res = new int[portCount];
-            var rnd = new Random(Math.Abs(Guid.NewGuid().GetHashCode()));
-            for (int i = 0; i < portCount; ++i)
-            {
-                res[i] = from + i;
-            }
-            for (int i = 0; i < portCount; ++i)
-            {
-                int index = rnd.Next(portCount - i);
-                int tmp = res[i];
-                res[i] = res[i + index];
-                res[i + index] = tmp;
-            }
-            return res;
-        }
-*/
-	}
-}
diff --git a/src/EventStore.TestClient/Program.cs b/src/EventStore.TestClient/Program.cs
deleted file mode 100644
index 2e607169ff5..00000000000
--- a/src/EventStore.TestClient/Program.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Common.Log;
-using EventStore.Common.Options;
-using EventStore.Common.Utils;
-using EventStore.TestClient.Statistics;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Serilog;
-
-#nullable enable
-namespace EventStore.TestClient {
-	internal enum StatsFormat {
-		Csv,
-		Json
-	}
-	internal static class Program {
-		/// <summary>
-		///
-		/// </summary>
-		/// <param name="version">Show version.</param>
-		/// <param name="log">Path where to keep log files.</param>
-		/// <param name="whatIf">Print effective configuration to console and then exit.</param>
-		/// <param name="command"></param>
-		/// <param name="host">The host to bind to.</param>
-		/// <param name="tcpPort">The port to run the TCP server on.</param>
-		/// <param name="httpPort">The port to run the HTTP server on.</param>
-		/// <param name="timeout"></param>
-		/// <param name="readWindow"></param>
-		/// <param name="writeWindow"></param>
-		/// <param name="pingWindow"></param>
-		/// <param name="reconnect"></param>
-		/// <param name="useTls"></param>
-		/// <param name="tlsValidateServer"></param>
-		/// <param name="connectionString">The connection string to use when connecting to the server. Not used by the raw TCP client</param>
-		/// <param name="statsFormat">The format for the stats log.</param>
-		/// <returns></returns>
-		public static async Task<int> Main(bool version = false, FileInfo? log = null, bool whatIf = false,
-			string[]? command = null, string host = "localhost", int tcpPort = 1113, int httpPort = 2113,
-			int timeout = Timeout.Infinite, int readWindow = 2000, int writeWindow = 2000, int pingWindow = 2000,
-			bool reconnect = true, bool useTls = false, bool tlsValidateServer = false, string connectionString = "",
-			StatsFormat statsFormat = StatsFormat.Csv) {
-			Log.Logger = EventStoreLoggerConfiguration.ConsoleLog;
-
-			try {
-				var logsDirectory = log?.FullName ?? Locations.DefaultTestClientLogDirectory;
-				EventStoreLoggerConfiguration.Initialize(logsDirectory, "client", LogConsoleFormat.Plain,
-					1024 * 1024 * 1024, RollingInterval.Day, 31, false);
-				var statsLog = statsFormat == StatsFormat.Csv
-					? TestClientCsvLoggerConfiguration.Initialize(logsDirectory, "client")
-					: Log.ForContext(Serilog.Core.Constants.SourceContextPropertyName, "REGULAR-STATS-LOGGER");
-
-				var options = new ClientOptions {
-					Timeout = timeout,
-					HttpPort = httpPort,
-					Host = host,
-					TcpPort = tcpPort,
-					Reconnect = reconnect,
-					PingWindow = pingWindow,
-					ReadWindow = readWindow,
-					WriteWindow = writeWindow,
-					UseTls = useTls,
-					TlsValidateServer = tlsValidateServer,
-					ConnectionString = connectionString,
-					Command = command ?? Array.Empty<string>(),
-					OutputCsv = statsFormat == StatsFormat.Csv,
-					StatsLog = statsLog
-				};
-
-				var hostedService = new TestClientHostedService(options);
-
-				if (whatIf) {
-					await Console.Out.WriteLineAsync(options.ToString());
-				}
-
-				if (version || whatIf) {
-					await Console.Out.WriteLineAsync(VersionInfo.Text);
-
-					await Console.Out.FlushAsync();
-
-					return 0;
-				}
-				await CreateHostBuilder(hostedService, Environment.GetCommandLineArgs())
-					.RunConsoleAsync(options => options.SuppressStatusMessages = true, hostedService.CancellationToken);
-				return await hostedService.Exited;
-			} catch (Exception ex) {
-				Log.Fatal(ex, "Host terminated unexpectedly.");
-				return 1;
-			} finally {
-				await Log.CloseAndFlushAsync();
-			}
-		}
-
-		private static IHostBuilder CreateHostBuilder(IHostedService hostedService, string[] args) =>
-			new HostBuilder()
-				.ConfigureHostConfiguration(builder =>
-					builder.AddEnvironmentVariables("DOTNET_").AddCommandLine(args))
-				.ConfigureAppConfiguration(builder =>
-					builder.AddEnvironmentVariables().AddCommandLine(args))
-				.ConfigureServices(services => services.AddSingleton(hostedService))
-				.ConfigureLogging(logging => logging.AddSerilog());
-	}
-}
diff --git a/src/EventStore.TestClient/Statistics/StatsCsvEncoder.cs b/src/EventStore.TestClient/Statistics/StatsCsvEncoder.cs
deleted file mode 100644
index 66f45653050..00000000000
--- a/src/EventStore.TestClient/Statistics/StatsCsvEncoder.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-
-namespace EventStore.Core.Services.Monitoring.Utils {
-	public static class StatsCsvEncoder {
-		private const string Comma = ",";
-		private const string CommaEscapeSymbol = ";";
-
-		public static string GetHeader(Dictionary<string, object> stats) {
-			return Join(stats.Keys).Prepend("Time");
-		}
-
-		public static string GetLine(Dictionary<string, object> stats) {
-			return Join(stats.Values).PrependTime();
-		}
-
-		private static string Prepend(this string csvLine, string column) {
-			return string.Format("{0}{1}{2}", column, Comma, csvLine);
-		}
-
-		private static string PrependTime(this string csvLine) {
-			return csvLine.Prepend(DateTime.UtcNow.ToString("O", CultureInfo.InvariantCulture));
-		}
-
-		private static string Join(IEnumerable<object> items) {
-			var strValues = items.Select(TryGetInvariantString);
-			var escapedValues = strValues.Select(str => str.Replace(Comma, CommaEscapeSymbol)); //extra safety
-
-			return string.Join(Comma, escapedValues);
-		}
-
-		private static string TryGetInvariantString(object obj) {
-			if (obj == null)
-				return string.Empty;
-
-			var convertible = obj as IConvertible;
-			if (convertible != null)
-				return convertible.ToString(CultureInfo.InvariantCulture);
-
-			return obj.ToString();
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Statistics/TestClientCsvLoggerConfiguration.cs b/src/EventStore.TestClient/Statistics/TestClientCsvLoggerConfiguration.cs
deleted file mode 100644
index 35f8fa5fa9e..00000000000
--- a/src/EventStore.TestClient/Statistics/TestClientCsvLoggerConfiguration.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.IO;
-using System.Threading;
-using EventStore.Common.Exceptions;
-using Serilog;
-
-namespace EventStore.TestClient.Statistics {
-	/// <summary>
-	/// Csv logger configuration for the TestClient
-	/// </summary>
-	public class TestClientCsvLoggerConfiguration {
-		private static int Initialized;
-		private static readonly string outputTemplate = "{Message}{NewLine}";
-
-		/// <summary>
-		/// Initialize the csv logger
-		/// </summary>
-		/// <param name="logsDirectory"></param>
-		/// <param name="componentName"></param>
-		public static ILogger Initialize(string logsDirectory, string componentName) {
-			if (Interlocked.Exchange(ref Initialized, 1) == 1) {
-				throw new InvalidOperationException($"{nameof(Initialize)} may not be called more than once.");
-			}
-
-			if (logsDirectory.StartsWith("~")) {
-				throw new ApplicationInitializationException(
-					"The given log path starts with a '~'. Event Store does not expand '~'.");
-			}
-
-			var filename = Path.Combine(logsDirectory, $"{componentName}/log-stats.csv");
-			return new LoggerConfiguration()
-				.WriteTo.File(filename, outputTemplate: outputTemplate)
-				.CreateLogger();
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/Statistics/WriteFloodStats.cs b/src/EventStore.TestClient/Statistics/WriteFloodStats.cs
deleted file mode 100644
index 66d99babeae..00000000000
--- a/src/EventStore.TestClient/Statistics/WriteFloodStats.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using EventStore.Core.Services.Monitoring.Stats;
-using EventStore.Core.Services.Monitoring.Utils;
-using Serilog;
-
-namespace EventStore.TestClient.Statistics {
-	/// <summary>
-	/// Statistics for WriteFlood
-	/// </summary>
-	public class WriteFloodStats {
-		/// <summary>
-		/// The number of successful writes
-		/// </summary>
-		public long Succ = 0;
-		/// <summary>
-		/// The number of failing writes
-		/// </summary>
-		public long Fail = 0;
-		/// <summary>
-		/// The number of writes that failed with PrepareTimeout
-		/// </summary>
-		public long PrepTimeout = 0;
-		/// <summary>
-		/// The number of writes that failed with CommitTimeout
-		/// </summary>
-		public long CommitTimeout = 0;
-		/// <summary>
-		/// The number of writes that failed with ForwardTimeout
-		/// </summary>
-		public long ForwardTimeout = 0;
-		/// <summary>
-		/// The number of writes that failed with WrongExpectedVersion
-		/// </summary>
-		public long WrongExpVersion = 0;
-		/// <summary>
-		/// The number of writes that failed with StreamDeleted
-		/// </summary>
-		public long StreamDeleted = 0;
-		/// <summary>
-		/// The total number of completed writes
-		/// </summary>
-		public long All = 0;
-		/// <summary>
-		/// The amount of time that has elapsed since the last measurement
-		/// </summary>
-		public TimeSpan Elapsed = TimeSpan.Zero;
-		/// <summary>
-		/// The time in UTC that the command was started
-		/// </summary>
-		public DateTime StartTime = DateTime.UtcNow;
-		/// <summary>
-		/// The command that was run
-		/// </summary>
-		public string Command;
-		/// <summary>
-		/// The current write rate
-		/// </summary>
-		public double Rate;
-		/// <summary>
-		/// The command and arguments used to run this command
-		/// </summary>
-		public string CommandString;
-
-		private bool _csv;
-
-		/// <summary>
-		/// </summary>
-		/// <param name="command"></param>
-		/// <param name="csv"></param>
-		/// <param name="args"></param>
-		public WriteFloodStats(string command, bool csv, string[] args) {
-			Command = command;
-			_csv = csv;
-			CommandString = $"{Command} {string.Join(" ", args)}";
-		}
-
-		private Dictionary<string, object> GetStats() {
-			var stats = new Dictionary<string, object>();
-			stats[$"{Command}-starttime"] = StartTime.ToString("O", CultureInfo.InvariantCulture);
-			stats[$"{Command}-succ"] = Succ;
-			stats[$"{Command}-fail"] = Fail;
-			stats[$"{Command}-prepTimeout"] = PrepTimeout;
-			stats[$"{Command}-commitTimeout"] = CommitTimeout;
-			stats[$"{Command}-forwardTimeout"] = ForwardTimeout;
-			stats[$"{Command}-wrongExpVersion"] = WrongExpVersion;
-			stats[$"{Command}-streamDeleted"] = StreamDeleted;
-			stats[$"{Command}-all"] = All;
-			stats[$"{Command}-elapsed"] = Elapsed;
-			stats[$"{Command}-rate"] = Rate;
-			stats[$"{Command}-command"] = CommandString;
-
-			return stats;
-		}
-
-		private string _lastWrittenCsvHeader = string.Empty;
-		/// <summary>
-		/// Write the current round of stats to the log
-		/// </summary>
-		/// <param name="log">The logger to write to</param>
-		public void WriteStatsToFile(ILogger log) {
-			try {
-				var statsContainer = new StatsContainer();
-				statsContainer.Add(GetStats());
-				var rawStats = statsContainer.GetStats(useGrouping: false, useMetadata: false);
-				if (!_csv) {
-					rawStats.Add("timestamp", DateTime.UtcNow.ToString("O", CultureInfo.InvariantCulture));
-					log.Information("{@stats}", rawStats);
-				} else {
-					var writeHeader = false;
-					var header = StatsCsvEncoder.GetHeader(rawStats);
-					if (header != _lastWrittenCsvHeader) {
-						_lastWrittenCsvHeader = header;
-						writeHeader = true;
-					}
-
-					var line = StatsCsvEncoder.GetLine(rawStats);
-					var timestamp = GetTimestamp(line);
-
-					if(writeHeader){
-						log.Information(Environment.NewLine);
-						log.Information(header);
-					}
-					log.Information(line);
-				}
-
-			} catch (Exception ex) {
-				Log.Error(ex, "Error on regular stats collection.");
-			}
-		}
-
-		private DateTime? GetTimestamp(string line) {
-			var separatorIdx = line.IndexOf(',');
-			if(separatorIdx == -1)
-				return null;
-
-			try{
-				return DateTime.Parse(line.Substring(0, separatorIdx)).ToUniversalTime();
-			}
-			catch{
-				return null;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/TcpTestClient.cs b/src/EventStore.TestClient/TcpTestClient.cs
deleted file mode 100644
index e675490589f..00000000000
--- a/src/EventStore.TestClient/TcpTestClient.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-using System;
-using System.Net;
-using System.Net.Security;
-using System.Net.Sockets;
-using System.Threading;
-using EventStore.BufferManagement;
-using EventStore.Common.Utils;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.Transport.Tcp;
-using EventStore.Transport.Tcp.Formatting;
-using EventStore.Transport.Tcp.Framing;
-using Connection = EventStore.Transport.Tcp.TcpTypedConnection<byte[]>;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.TestClient {
-	/// <summary>
-	/// A test client that connects over Raw TCP connections
-	/// </summary>
-	public class TcpTestClient {
-		private readonly BufferManager _bufferManager =
-			new BufferManager(TcpConfiguration.BufferChunksCount, TcpConfiguration.SocketBufferSize);
-
-		private readonly TcpClientConnector _connector = new TcpClientConnector();
-
-		private readonly bool _validateServer;
-		private readonly bool _useSsl;
-		private readonly ILogger _log;
-		private readonly bool _interactiveMode;
-		/// <summary>
-		/// The TCP EndPoint of the Event Store node
-		/// </summary>
-		public readonly EndPoint TcpEndpoint;
-		/// <summary>
-		/// The Client Options used to start EventStore.TestClient
-		/// </summary>
-		public readonly ClientOptions Options;
-
-		/// <summary>
-		/// Constructs a new <see cref="TcpTestClient"/>
-		/// </summary>
-		/// <param name="options"></param>
-		/// <param name="interactiveMode"></param>
-		/// <param name="log"></param>
-		public TcpTestClient(ClientOptions options, bool interactiveMode, ILogger log) {
-			_interactiveMode = interactiveMode;
-			_log = log;
-			_useSsl = options.UseTls;
-			TcpEndpoint = new DnsEndPoint(options.Host, options.TcpPort);
-			_validateServer = options.TlsValidateServer;
-			Options = options;
-		}
-
-		/// <summary>
-		/// Creates a new raw TCP connection
-		/// </summary>
-		/// <param name="context"></param>
-		/// <param name="handlePackage"></param>
-		/// <param name="connectionEstablished"></param>
-		/// <param name="connectionClosed"></param>
-		/// <param name="failContextOnError"></param>
-		/// <param name="tcpEndPoint"></param>
-		/// <returns></returns>
-		/// <exception cref="Exception"></exception>
-		public Connection CreateTcpConnection(CommandProcessorContext context,
-			Action<Connection, TcpPackage> handlePackage,
-			Action<Connection> connectionEstablished = null,
-			Action<Connection, SocketError> connectionClosed = null,
-			bool failContextOnError = true,
-			IPEndPoint tcpEndPoint = null) {
-			var connectionCreatedEvent = new ManualResetEventSlim(false);
-			Connection typedConnection = null;
-
-			Action<ITcpConnection> onConnectionEstablished = conn => {
-				// we execute callback on ThreadPool because on FreeBSD it can be called synchronously
-				// causing deadlock
-				ThreadPool.QueueUserWorkItem(_ => {
-					if (!_interactiveMode)
-						_log.Information(
-							"TcpTypedConnection: connected to [{remoteEndPoint}, L{localEndPoint}, {connectionId:B}].",
-							conn.RemoteEndPoint, conn.LocalEndPoint, conn.ConnectionId);
-					if (connectionEstablished != null) {
-						if (!connectionCreatedEvent.Wait(10000))
-							throw new Exception("TcpTypedConnection: creation took too long!");
-						connectionEstablished(typedConnection);
-					}
-				});
-			};
-			Action<ITcpConnection, SocketError> onConnectionFailed = (conn, error) => {
-				_log.Error(
-					"TcpTypedConnection: connection to [{remoteEndPoint}, L{localEndPoint}, {connectionId:B}] failed. Error: {e}.",
-					conn.RemoteEndPoint, conn.LocalEndPoint, conn.ConnectionId, error);
-
-				if (connectionClosed != null)
-					connectionClosed(null, error);
-
-				if (failContextOnError)
-					context.Fail(reason: string.Format("Socket connection failed with error {0}.", error));
-			};
-
-			var endpoint = tcpEndPoint ?? TcpEndpoint;
-			ITcpConnection connection;
-			if (_useSsl) {
-				connection = _connector.ConnectSslTo(
-					Guid.NewGuid(),
-					endpoint.GetHost(),
-					endpoint.GetOtherNames(),
-					endpoint.ResolveDnsToIPAddress(),
-					TcpConnectionManager.ConnectionTimeout,
-					(_, _, err, _) => (err == SslPolicyErrors.None || !_validateServer, err.ToString()),
-					() => null,
-					onConnectionEstablished,
-					onConnectionFailed,
-					verbose: false);
-			} else {
-				connection = _connector.ConnectTo(
-					Guid.NewGuid(),
-					endpoint.ResolveDnsToIPAddress(),
-					TcpConnectionManager.ConnectionTimeout,
-					onConnectionEstablished,
-					onConnectionFailed,
-					verbose: false);
-			}
-
-			typedConnection = new Connection(connection, new RawMessageFormatter(_bufferManager),
-				new LengthPrefixMessageFramer());
-			typedConnection.ConnectionClosed +=
-				(conn, error) => {
-					if (!_interactiveMode || error != SocketError.Success) {
-						_log.Information(
-							"TcpTypedConnection: connection [{remoteEndPoint}, L{localEndPoint}] was closed {status}",
-							conn.RemoteEndPoint, conn.LocalEndPoint,
-							error == SocketError.Success ? "cleanly." : "with error: " + error + ".");
-					}
-
-					if (connectionClosed != null)
-						connectionClosed(conn, error);
-					else
-						_log.Information("connectionClosed callback was null");
-				};
-			connectionCreatedEvent.Set();
-
-			typedConnection.ReceiveAsync(
-				(conn, pkg) => {
-					var package = new TcpPackage();
-					bool validPackage = false;
-					try {
-						package = TcpPackage.FromArraySegment(new ArraySegment<byte>(pkg));
-						validPackage = true;
-
-						if (package.Command == TcpCommand.HeartbeatRequestCommand) {
-							var resp = new TcpPackage(TcpCommand.HeartbeatResponseCommand, Guid.NewGuid(), null);
-							conn.EnqueueSend(resp.AsByteArray());
-							return;
-						}
-
-						handlePackage(conn, package);
-					} catch (Exception ex) {
-						_log.Information(ex,
-							"TcpTypedConnection: [{remoteEndPoint}, L{localEndPoint}] ERROR for {package}. Connection will be closed.",
-							conn.RemoteEndPoint, conn.LocalEndPoint,
-							validPackage ? package.Command as object : "<invalid package>");
-						conn.Close(ex.Message);
-
-						if (failContextOnError)
-							context.Fail(ex);
-					}
-				});
-
-			return typedConnection;
-		}
-	}
-}
diff --git a/src/EventStore.TestClient/TestClientHostedService.cs b/src/EventStore.TestClient/TestClientHostedService.cs
deleted file mode 100644
index 8eadefba691..00000000000
--- a/src/EventStore.TestClient/TestClientHostedService.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Hosting;
-
-namespace EventStore.TestClient {
-	internal class TestClientHostedService : IHostedService {
-		private readonly Client _client;
-		private readonly CancellationTokenSource _stopped;
-		private readonly TaskCompletionSource<int> _exitCode;
-
-		public Task<int> Exited => _exitCode.Task;
-
-		public CancellationToken CancellationToken => _stopped.Token;
-
-		public TestClientHostedService(ClientOptions options) {
-			_exitCode = new TaskCompletionSource<int>();
-			_stopped = new CancellationTokenSource();
-			_stopped.Token.Register(() => _exitCode.TrySetResult(0));
-			_client = new Client(options, _stopped);
-		}
-		public Task StartAsync(CancellationToken cancellationToken) {
-			cancellationToken.Register(_stopped.Cancel);
-			return Task.Run(() => {
-				_exitCode.SetResult(_client.Run(cancellationToken));
-				if (!_client.InteractiveMode) {
-					_stopped.Cancel();
-				}
-			}, _stopped.Token);
-		}
-
-		public Task StopAsync(CancellationToken cancellationToken) {
-			_stopped.Cancel();
-			return Task.CompletedTask;
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/AsyncQueuedBufferWriter.cs b/src/EventStore.Transport.Http/AsyncQueuedBufferWriter.cs
deleted file mode 100644
index 7df19831cbb..00000000000
--- a/src/EventStore.Transport.Http/AsyncQueuedBufferWriter.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Threading;
-using System.Collections.Concurrent;
-
-namespace EventStore.Transport.Http {
-	/// <summary>
-	/// Manages a queue of buffers to send to output stream and 
-	/// sens them to the output stream as previous requests complete
-	/// </summary>
-	public class AsyncQueuedBufferWriter : IDisposable {
-		private class Item {
-			public readonly byte[] Buffer;
-			public readonly Action<Exception> OnCompletion;
-
-			public Item(byte[] buffer, Action<Exception> onCompletion) {
-				Buffer = buffer;
-				OnCompletion = onCompletion;
-			}
-		}
-
-		private readonly Stream _outputStream;
-		private readonly Action _onDispose;
-		private readonly ConcurrentQueue<Item> _queue = new ConcurrentQueue<Item>();
-
-		private int _processing;
-		private Exception _error;
-		private int _disposed;
-
-		/// <param name="outputStream">NOTE: outputStream is NOT auto-disposed.</param>
-		/// <param name="onDispose">Use to dispose response streams and close connections.</param>
-		public AsyncQueuedBufferWriter(Stream outputStream, Action onDispose) {
-			_outputStream = outputStream;
-			_onDispose = onDispose;
-		}
-
-		public void Append(byte[] buffer, Action<Exception> onCompletion) {
-			var item = new Item(buffer, onCompletion);
-			_queue.Enqueue(item);
-
-			if (Interlocked.CompareExchange(ref _processing, 1, 0) == 0)
-				BeginProcessing();
-		}
-
-		/// <summary>
-		/// Schedules auto-dispose when all previous writes are completed
-		/// </summary>
-		/// <param name="onCompletion">onCompletion handler is called after the object has been disposed</param>
-		public void AppendDispose(Action<Exception> onCompletion) {
-			var item = new Item(null, onCompletion);
-			_queue.Enqueue(item);
-
-			if (Interlocked.CompareExchange(ref _processing, 1, 0) == 0)
-				BeginProcessing();
-		}
-
-		private void BeginProcessing() {
-			if (_processing != 1)
-				throw new InvalidOperationException();
-			ContinueWriteOrStop();
-		}
-
-		private void ContinueWriteOrStop() {
-			bool proceed = true;
-			while (proceed) {
-				Item item;
-				if (_queue.TryDequeue(out item)) {
-					try {
-						if (item.Buffer != null)
-							_outputStream.BeginWrite(item.Buffer, 0, item.Buffer.Length, WriteCompleted, item);
-						else {
-							Dispose();
-							if (item.OnCompletion != null)
-								item.OnCompletion(null);
-						}
-					} catch (Exception ex) {
-						_error = ex;
-						Dispose();
-					}
-
-					return;
-				}
-
-				Interlocked.Exchange(ref _processing, 0);
-				proceed = !_queue.IsEmpty && Interlocked.CompareExchange(ref _processing, 1, 0) == 0;
-			}
-		}
-
-		private void WriteCompleted(IAsyncResult ar) {
-			var item = (Item)ar.AsyncState;
-			EndWrite(ar);
-			RaiseCompletion(item);
-			ContinueWriteOrStop();
-		}
-
-		private void EndWrite(IAsyncResult ar) {
-			try {
-				_outputStream.EndWrite(ar);
-			} catch (Exception ex) {
-				_error = ex;
-				Dispose();
-			}
-		}
-
-		private void RaiseCompletion(Item item) {
-			try {
-				if (item.OnCompletion != null)
-					item.OnCompletion(_error);
-			} catch (Exception ex) {
-				_error = ex;
-			}
-		}
-
-		public void Dispose() {
-			if (Interlocked.CompareExchange(ref _disposed, 1, 0) != 0)
-				return;
-			if (_onDispose != null)
-				_onDispose();
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/AsyncStreamCopier.cs b/src/EventStore.Transport.Http/AsyncStreamCopier.cs
deleted file mode 100644
index 30887e51b19..00000000000
--- a/src/EventStore.Transport.Http/AsyncStreamCopier.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Common.Utils;
-
-namespace EventStore.Transport.Http {
-	public class AsyncStreamCopier<T> {
-		public Exception Error { get; private set; }
-		public readonly T AsyncState;
-
-		private readonly byte[] _buffer = new byte[4096];
-		private readonly Stream _input;
-		private readonly Stream _output;
-		private readonly Action<AsyncStreamCopier<T>> _onCompleted;
-
-		public AsyncStreamCopier(Stream input, Stream output, T state, Action<AsyncStreamCopier<T>> onCompleted) {
-			Ensure.NotNull(input, "input");
-			Ensure.NotNull(output, "output");
-			Ensure.NotNull(onCompleted, "onCompleted");
-
-			_input = input;
-			_output = output;
-			_onCompleted = onCompleted;
-
-			AsyncState = state;
-			Error = null;
-		}
-
-		public void Start() {
-			GetNextChunk();
-		}
-
-		private void GetNextChunk() {
-			try {
-				_input.BeginRead(_buffer, 0, _buffer.Length, InputReadCompleted, null);
-			} catch (Exception e) {
-				Error = e;
-				OnCompleted();
-			}
-		}
-
-		private void InputReadCompleted(IAsyncResult ar) {
-			try {
-				int bytesRead = _input.EndRead(ar);
-				if (bytesRead <= 0) // mono can return -1
-				{
-					OnCompleted();
-					return;
-				}
-
-				_output.BeginWrite(_buffer, 0, bytesRead, OutputWriteCompleted, null);
-			} catch (Exception e) {
-				Error = e;
-				OnCompleted();
-			}
-		}
-
-		private void OutputWriteCompleted(IAsyncResult ar) {
-			try {
-				_output.EndWrite(ar);
-				GetNextChunk();
-			} catch (Exception e) {
-				Error = e;
-				OnCompleted();
-			}
-		}
-
-		private void OnCompleted() {
-			if (_onCompleted != null)
-				_onCompleted(this);
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/Atom/AtomExceptions.cs b/src/EventStore.Transport.Http/Atom/AtomExceptions.cs
deleted file mode 100644
index 2c32a0ddf7f..00000000000
--- a/src/EventStore.Transport.Http/Atom/AtomExceptions.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-
-namespace EventStore.Transport.Http.Atom {
-	public class AtomSpecificationViolationException : Exception {
-		public AtomSpecificationViolationException(string message) : base(message) {
-		}
-	}
-
-	public class ThrowHelper {
-		public static void ThrowSpecificationViolation(string message) {
-			throw new AtomSpecificationViolationException(message);
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/Atom/AtomSpecs.cs b/src/EventStore.Transport.Http/Atom/AtomSpecs.cs
deleted file mode 100644
index 1ceb38ba7d1..00000000000
--- a/src/EventStore.Transport.Http/Atom/AtomSpecs.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace EventStore.Transport.Http.Atom {
-	public class AtomSpecs {
-		public const int FeedPageSize = 20;
-
-		public const string Author = "EventStore";
-
-		public const string AtomV1Namespace = "http://www.w3.org/2005/Atom";
-		public const string AtomPubV1Namespace = "http://www.w3.org/2007/app";
-	}
-}
diff --git a/src/EventStore.Transport.Http/Atom/Feed.cs b/src/EventStore.Transport.Http/Atom/Feed.cs
deleted file mode 100644
index 670d32b6a30..00000000000
--- a/src/EventStore.Transport.Http/Atom/Feed.cs
+++ /dev/null
@@ -1,327 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Xml;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-using EventStore.Common.Utils;
-using Newtonsoft.Json;
-
-namespace EventStore.Transport.Http.Atom {
-	public class FeedElement : IXmlSerializable {
-		public string Title { get; set; }
-		public string Id { get; set; }
-		public string Updated { get; set; }
-		public string StreamId { get; set; }
-		public PersonElement Author { get; set; }
-		public bool HeadOfStream { get; set; }
-		public string SelfUrl { get; set; }
-		public string ETag { get; set; }
-
-		public List<LinkElement> Links { get; set; }
-		public List<EntryElement> Entries { get; set; }
-
-		public FeedElement() {
-			Links = new List<LinkElement>();
-			Entries = new List<EntryElement>();
-		}
-
-		public void SetTitle(string title) {
-			Ensure.NotNull(title, "title");
-			Title = title;
-		}
-
-		public void SetId(string id) {
-			Ensure.NotNull(id, "id");
-			Id = id;
-		}
-
-		public void SetUpdated(DateTime dateTime) {
-			Updated = XmlConvert.ToString(dateTime, XmlDateTimeSerializationMode.Utc);
-		}
-
-		public void SetAuthor(string name) {
-			Ensure.NotNull(name, "name");
-			Author = new PersonElement(name);
-		}
-
-		public void SetHeadOfStream(bool headOfStream) {
-			this.HeadOfStream = headOfStream;
-		}
-
-		public void SetSelfUrl(string self) {
-			this.SelfUrl = self;
-		}
-
-		public void SetETag(string etag) {
-			this.ETag = etag;
-		}
-
-		public void AddLink(string relation, string uri, string contentType = null) {
-			Ensure.NotNull(uri, "uri");
-			Links.Add(new LinkElement(uri, relation, contentType));
-		}
-
-		public void AddEntry(EntryElement entry) {
-			Ensure.NotNull(entry, "entry");
-			Entries.Add(entry);
-		}
-
-		public XmlSchema GetSchema() {
-			return null;
-		}
-
-		public void ReadXml(XmlReader reader) {
-			throw new NotImplementedException();
-		}
-
-		public void WriteXml(XmlWriter writer) {
-			if (string.IsNullOrEmpty(Title))
-				ThrowHelper.ThrowSpecificationViolation(
-					"atom:feed elements MUST contain exactly one atom:title element.");
-			if (string.IsNullOrEmpty(Id))
-				ThrowHelper.ThrowSpecificationViolation("atom:feed elements MUST contain exactly one atom:id element.");
-			if (string.IsNullOrEmpty(Updated))
-				ThrowHelper.ThrowSpecificationViolation(
-					"atom:feed elements MUST contain exactly one atom:updated element.");
-			if (Author == null)
-				ThrowHelper.ThrowSpecificationViolation(
-					"atom:feed elements MUST contain one or more atom:author elements");
-			if (Links.Count == 0)
-				ThrowHelper.ThrowSpecificationViolation(
-					"atom:feed elements SHOULD contain one atom:link element with a "
-					+ "rel attribute value of 'self'. This is the preferred URI for retrieving Atom Feed Documents representing this Atom feed.");
-
-			writer.WriteStartElement("feed", AtomSpecs.AtomV1Namespace);
-
-			writer.WriteElementString("title", AtomSpecs.AtomV1Namespace, Title);
-			writer.WriteElementString("id", AtomSpecs.AtomV1Namespace, Id);
-			writer.WriteElementString("updated", AtomSpecs.AtomV1Namespace, Updated);
-			Author.WriteXml(writer);
-
-			Links.ForEach(link => link.WriteXml(writer));
-			Entries.ForEach(entry => entry.WriteXml(writer, usePrefix: false));
-
-			writer.WriteEndElement();
-		}
-	}
-
-	public class EntryElement : IXmlSerializable {
-		private object _content;
-		public string Title { get; set; }
-		public string Id { get; set; }
-		public string Updated { get; set; }
-		public PersonElement Author { get; set; }
-		public string Summary { get; set; }
-		public int? RetryCount { get; set; }
-
-		public object Content {
-			get { return _content; }
-			set { throw new NotSupportedException(); }
-		}
-
-		public List<LinkElement> Links { get; set; }
-
-		public EntryElement() {
-			Links = new List<LinkElement>();
-		}
-
-		public void SetTitle(string title) {
-			Ensure.NotNull(title, "title");
-			Title = title;
-		}
-
-		public void SetId(string id) {
-			Ensure.NotNull(id, "id");
-			Id = id;
-		}
-
-		public void SetUpdated(DateTime dateTime) {
-			Updated = XmlConvert.ToString(dateTime, XmlDateTimeSerializationMode.Utc);
-		}
-
-		public void SetAuthor(string name) {
-			Ensure.NotNull(name, "name");
-			Author = new PersonElement(name);
-		}
-
-		public void SetSummary(string summary) {
-			Ensure.NotNull(summary, "summary");
-			Summary = summary;
-		}
-
-		public void AddLink(string relation, string uri, string type = null) {
-			Ensure.NotNull(uri, "uri");
-			Links.Add(new LinkElement(uri, relation, type));
-		}
-
-		public void AddRetryCount(int value) {
-			RetryCount = value;
-		}
-
-		public XmlSchema GetSchema() {
-			return null;
-		}
-
-		public void ReadXml(XmlReader reader) {
-			reader.ReadStartElement("entry");
-
-			Title = reader.ReadElementString("title");
-			Id = reader.ReadElementString("id");
-			Updated = reader.ReadElementString("updated");
-			Author.ReadXml(reader);
-			Summary = reader.ReadElementString("summary");
-			Links.ForEach(l => l.ReadXml(reader));
-
-			reader.ReadEndElement();
-		}
-
-		public void WriteXml(XmlWriter writer) {
-			WriteXml(writer, usePrefix: true);
-		}
-
-		public void WriteXml(XmlWriter writer, bool usePrefix) {
-			if (string.IsNullOrEmpty(Title))
-				ThrowHelper.ThrowSpecificationViolation(
-					"atom:entry elements MUST contain exactly one atom:title element.");
-			if (string.IsNullOrEmpty(Id))
-				ThrowHelper.ThrowSpecificationViolation(
-					"atom:entry elements MUST contain exactly one atom:id element.");
-			if (string.IsNullOrEmpty(Updated))
-				ThrowHelper.ThrowSpecificationViolation(
-					"atom:entry elements MUST contain exactly one atom:updated element.");
-			if (Author == null)
-				ThrowHelper.ThrowSpecificationViolation(
-					"atom:entry elements MUST contain one or more atom:author elements");
-			if (string.IsNullOrEmpty(Summary))
-				ThrowHelper.ThrowSpecificationViolation("atom:entry elements MUST contain an atom:summary element");
-
-			if (usePrefix)
-				writer.WriteStartElement("atom", "entry", AtomSpecs.AtomV1Namespace);
-			else
-				writer.WriteStartElement("entry", AtomSpecs.AtomV1Namespace);
-
-			writer.WriteElementString("title", AtomSpecs.AtomV1Namespace, Title);
-			writer.WriteElementString("id", AtomSpecs.AtomV1Namespace, Id);
-			writer.WriteElementString("updated", AtomSpecs.AtomV1Namespace, Updated);
-			Author.WriteXml(writer);
-			writer.WriteElementString("summary", AtomSpecs.AtomV1Namespace, Summary);
-
-			if (RetryCount != null) {
-				writer.WriteElementString("retryCount", RetryCount.Value.ToString());
-			}
-
-			Links.ForEach(link => link.WriteXml(writer));
-			if (Content != null) {
-				var serializeObject = JsonConvert.SerializeObject(Content);
-				var deserializeXmlNode = JsonConvert.DeserializeXmlNode(serializeObject, "content");
-				writer.WriteStartElement("content", AtomSpecs.AtomV1Namespace);
-				writer.WriteAttributeString("type", ContentType.ApplicationXml);
-				deserializeXmlNode.DocumentElement.WriteContentTo(writer);
-				writer.WriteEndElement();
-			}
-
-			writer.WriteEndElement();
-		}
-
-		public void SetContent(object content) {
-			_content = content;
-		}
-	}
-
-	public class RichEntryElement : EntryElement {
-		public Guid EventId { get; set; }
-		public string EventType { get; set; }
-		public long EventNumber { get; set; }
-		public string Data { get; set; }
-		public string MetaData { get; set; }
-		public string LinkMetaData { get; set; }
-
-		public string StreamId { get; set; }
-
-		public bool IsJson { get; set; }
-
-		public bool IsMetaData { get; set; }
-		public bool IsLinkMetaData { get; set; }
-		public bool IsRedacted { get; set; }
-
-		public long PositionEventNumber { get; set; }
-
-		public string PositionStreamId { get; set; }
-	}
-
-	public class LinkElement : IXmlSerializable {
-		public string Uri { get; set; }
-		public string Relation { get; set; }
-		public string Type { get; set; }
-
-		public LinkElement(string uri) : this(uri, null, null) {
-		}
-
-		public LinkElement(string uri, string relation) : this(uri, relation, null) {
-		}
-
-		public LinkElement(string uri, string relation, string type) {
-			Uri = uri;
-			Relation = relation;
-			Type = type;
-		}
-
-		public XmlSchema GetSchema() {
-			return null;
-		}
-
-		public void ReadXml(XmlReader reader) {
-			reader.ReadStartElement("link");
-
-			Uri = reader.GetAttribute("href");
-			Relation = reader.GetAttribute("rel");
-			Type = reader.GetAttribute("type");
-
-			reader.ReadEndElement();
-		}
-
-		public void WriteXml(XmlWriter writer) {
-			if (string.IsNullOrEmpty(Uri))
-				ThrowHelper.ThrowSpecificationViolation(
-					"atom:link elements MUST have an href attribute, whose value MUST be a URI reference");
-
-			writer.WriteStartElement("link", AtomSpecs.AtomV1Namespace);
-			writer.WriteAttributeString("href", Uri);
-
-			if (Relation != null)
-				writer.WriteAttributeString("rel", Relation);
-			if (Type != null)
-				writer.WriteAttributeString("type", Type);
-
-			writer.WriteEndElement();
-		}
-	}
-
-	public class PersonElement : IXmlSerializable {
-		public string Name { get; set; }
-
-		public PersonElement(string name) {
-			Name = name;
-		}
-
-		public XmlSchema GetSchema() {
-			return null;
-		}
-
-		public void ReadXml(XmlReader reader) {
-			reader.ReadStartElement("author");
-			Name = reader.ReadElementString("name");
-			reader.ReadEndElement();
-		}
-
-		public void WriteXml(XmlWriter writer) {
-			if (string.IsNullOrEmpty(Name))
-				ThrowHelper.ThrowSpecificationViolation(
-					"Person constructs MUST contain exactly one 'atom:name' element.");
-
-			writer.WriteStartElement("author", AtomSpecs.AtomV1Namespace);
-			writer.WriteElementString("name", AtomSpecs.AtomV1Namespace, Name);
-			writer.WriteEndElement();
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/Atom/ServiceDocument.cs b/src/EventStore.Transport.Http/Atom/ServiceDocument.cs
deleted file mode 100644
index ca619de4661..00000000000
--- a/src/EventStore.Transport.Http/Atom/ServiceDocument.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Xml;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-using EventStore.Common.Utils;
-
-namespace EventStore.Transport.Http.Atom {
-	public class ServiceDocument : IXmlSerializable {
-		public List<WorkspaceElement> Workspaces { get; set; }
-
-		public ServiceDocument() {
-			Workspaces = new List<WorkspaceElement>();
-		}
-
-		public void AddWorkspace(WorkspaceElement workspace) {
-			Ensure.NotNull(workspace, "workspace");
-			Workspaces.Add(workspace);
-		}
-
-		public XmlSchema GetSchema() {
-			return null;
-		}
-
-		public void ReadXml(XmlReader reader) {
-			throw new NotImplementedException();
-		}
-
-		public void WriteXml(XmlWriter writer) {
-			if (Workspaces.Count == 0)
-				ThrowHelper.ThrowSpecificationViolation(
-					"An app:service element MUST contain one or more app:workspace elements.");
-
-			writer.WriteStartElement("service", AtomSpecs.AtomPubV1Namespace);
-			writer.WriteAttributeString("xmlns", "atom", null, AtomSpecs.AtomV1Namespace);
-			Workspaces.ForEach(w => w.WriteXml(writer));
-
-			writer.WriteEndElement();
-		}
-	}
-
-	public class WorkspaceElement : IXmlSerializable {
-		public string Title { get; set; }
-		public List<CollectionElement> Collections { get; set; }
-
-		public WorkspaceElement() {
-			Collections = new List<CollectionElement>();
-		}
-
-		public void SetTitle(string title) {
-			Ensure.NotNull(title, "title");
-			Title = title;
-		}
-
-		public void AddCollection(CollectionElement collection) {
-			Ensure.NotNull(collection, "collection");
-			Collections.Add(collection);
-		}
-
-		public XmlSchema GetSchema() {
-			return null;
-		}
-
-		public void ReadXml(XmlReader reader) {
-			throw new NotImplementedException();
-		}
-
-		public void WriteXml(XmlWriter writer) {
-			if (string.IsNullOrEmpty(Title))
-				ThrowHelper.ThrowSpecificationViolation(
-					"The app:workspace element MUST contain one 'atom:title' element");
-
-			writer.WriteStartElement("workspace");
-
-			writer.WriteElementString("atom", "title", AtomSpecs.AtomV1Namespace, Title);
-			Collections.ForEach(c => c.WriteXml(writer));
-
-			writer.WriteEndElement();
-		}
-	}
-
-	public class CollectionElement : IXmlSerializable {
-		public string Title { get; set; }
-		public string Uri { get; set; }
-
-		public List<AcceptElement> Accepts { get; set; }
-
-		public CollectionElement() {
-			Accepts = new List<AcceptElement>();
-		}
-
-		public void SetTitle(string title) {
-			Ensure.NotNull(title, "title");
-			Title = title;
-		}
-
-		public void SetUri(string uri) {
-			Ensure.NotNull(uri, "uri");
-			Uri = uri;
-		}
-
-		public void AddAcceptType(string type) {
-			Ensure.NotNull(type, "type");
-			Accepts.Add(new AcceptElement(type));
-		}
-
-		public XmlSchema GetSchema() {
-			return null;
-		}
-
-		public void ReadXml(XmlReader reader) {
-			throw new NotImplementedException();
-		}
-
-		public void WriteXml(XmlWriter writer) {
-			if (string.IsNullOrEmpty(Title))
-				ThrowHelper.ThrowSpecificationViolation(
-					"The app: collection element MUST contain one atom:title element.");
-			if (string.IsNullOrEmpty(Uri))
-				ThrowHelper.ThrowSpecificationViolation(
-					"The app:collection element MUST contain an 'href' attribute, " +
-					"whose value gives the IRI of the Collection.");
-
-			writer.WriteStartElement("collection");
-			writer.WriteAttributeString("href", Uri);
-			writer.WriteElementString("atom", "title", AtomSpecs.AtomV1Namespace, Title);
-			Accepts.ForEach(a => a.WriteXml(writer));
-
-			writer.WriteEndElement();
-		}
-	}
-
-	public class AcceptElement : IXmlSerializable {
-		public string Type { get; set; }
-
-		public AcceptElement(string type) {
-			Type = type;
-		}
-
-		public XmlSchema GetSchema() {
-			return null;
-		}
-
-		public void ReadXml(XmlReader reader) {
-			throw new NotImplementedException();
-		}
-
-		public void WriteXml(XmlWriter writer) {
-			if (string.IsNullOrEmpty(Type))
-				ThrowHelper.ThrowSpecificationViolation("atom:accept element MUST contain value");
-			writer.WriteElementString("accept", Type);
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/Client/ClientOperationState.cs b/src/EventStore.Transport.Http/Client/ClientOperationState.cs
deleted file mode 100644
index 9fdac385f37..00000000000
--- a/src/EventStore.Transport.Http/Client/ClientOperationState.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Net.Http;
-using EventStore.Common.Utils;
-
-namespace EventStore.Transport.Http.Client {
-	public class ClientOperationState {
-		public readonly HttpRequestMessage Request;
-		public readonly Action<HttpResponse> OnSuccess;
-		public readonly Action<Exception> OnError;
-
-		public HttpResponse Response { get; set; }
-
-		public ClientOperationState(HttpRequestMessage request, Action<HttpResponse> onSuccess,
-			Action<Exception> onError) {
-			Ensure.NotNull(request, "request");
-			Ensure.NotNull(onSuccess, "onSuccess");
-			Ensure.NotNull(onError, "onError");
-
-			Request = request;
-			OnSuccess = onSuccess;
-			OnError = onError;
-		}
-
-		public void Dispose() {
-			Request.Dispose();
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/Client/HttpAsyncClient.cs b/src/EventStore.Transport.Http/Client/HttpAsyncClient.cs
deleted file mode 100644
index 87379daa118..00000000000
--- a/src/EventStore.Transport.Http/Client/HttpAsyncClient.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using EventStore.Common.Utils;
-using System.Net.Http;
-using System.Threading.Tasks;
-using System.Net.Http.Headers;
-
-namespace EventStore.Transport.Http.Client {
-	public class HttpAsyncClient : IHttpClient {
-		private readonly HttpClient _client;
-
-		static HttpAsyncClient() {
-			ServicePointManager.MaxServicePointIdleTime = 10000;
-			ServicePointManager.DefaultConnectionLimit = 500;
-		}
-
-		public HttpAsyncClient(TimeSpan timeout, HttpMessageHandler httpMessageHandler = null) {
-			_client = httpMessageHandler == null ? new HttpClient() : new HttpClient(httpMessageHandler);
-			_client.Timeout = timeout;
-		}
-
-		public void Get(string url, Action<HttpResponse> onSuccess, Action<Exception> onException) {
-			Get(url, null, onSuccess, onException);
-		}
-
-		public void Get(string url, IEnumerable<KeyValuePair<string, string>> headers, Action<HttpResponse> onSuccess,
-			Action<Exception> onException) {
-			Ensure.NotNull(url, "url");
-			Ensure.NotNull(onSuccess, "onSuccess");
-			Ensure.NotNull(onException, "onException");
-
-			Receive(HttpMethod.Get, url, headers, onSuccess, onException);
-		}
-
-		public void Post(string url, string body, string contentType, Action<HttpResponse> onSuccess,
-			Action<Exception> onException) {
-			Post(url, body, contentType, null, onSuccess, onException);
-		}
-
-		public void Post(string url, string body, string contentType, IEnumerable<KeyValuePair<string, string>> headers,
-			Action<HttpResponse> onSuccess, Action<Exception> onException) {
-			Ensure.NotNull(url, "url");
-			Ensure.NotNull(body, "body");
-			Ensure.NotNull(contentType, "contentType");
-			Ensure.NotNull(onSuccess, "onSuccess");
-			Ensure.NotNull(onException, "onException");
-
-			Send(HttpMethod.Post, url, body, contentType, headers, onSuccess, onException);
-		}
-
-		public void Delete(string url, Action<HttpResponse> onSuccess, Action<Exception> onException) {
-			Ensure.NotNull(url, "url");
-			Ensure.NotNull(onSuccess, "onSuccess");
-			Ensure.NotNull(onException, "onException");
-
-			Receive(HttpMethod.Delete, url, null, onSuccess, onException);
-		}
-
-		public void Put(string url, string body, string contentType, Action<HttpResponse> onSuccess,
-			Action<Exception> onException) {
-			Ensure.NotNull(url, "url");
-			Ensure.NotNull(body, "body");
-			Ensure.NotNull(contentType, "contentType");
-			Ensure.NotNull(onSuccess, "onSuccess");
-			Ensure.NotNull(onException, "onException");
-
-			Send(HttpMethod.Put, url, body, contentType, null, onSuccess, onException);
-		}
-
-		public void Dispose() {
-			_client.Dispose();
-		}
-
-		private void Receive(string method, string url, IEnumerable<KeyValuePair<string, string>> headers,
-			Action<HttpResponse> onSuccess, Action<Exception> onException) {
-			var request = new HttpRequestMessage();
-			request.Method = new System.Net.Http.HttpMethod(method);
-			request.RequestUri = new Uri(url);
-
-			if (headers != null) {
-				foreach (var header in headers) {
-					request.Headers.Add(header.Key, header.Value);
-				}
-			}
-
-			Task.Run(() => SendRequest(request, onSuccess, onException));
-		}
-
-		private void Send(string method, string url, string body, string contentType,
-			IEnumerable<KeyValuePair<string, string>> headers,
-			Action<HttpResponse> onSuccess, Action<Exception> onException) {
-			var bodyBytes = Helper.UTF8NoBom.GetBytes(body);
-			var stream = new MemoryStream(bodyBytes);
-			var request = new HttpRequestMessage {
-				Method = new System.Net.Http.HttpMethod(method),
-				RequestUri = new Uri(url),
-				Content = new StreamContent(stream) {
-					Headers = {
-						ContentType = new MediaTypeHeaderValue(contentType),
-						ContentLength = bodyBytes.Length
-					}
-				}
-			};
-
-			if (headers != null) {
-				foreach (var (key, value) in headers) {
-					request.Headers.Add(key, value);
-				}
-			}
-
-			Task.Run(() => SendRequest(request, onSuccess, onException));
-		}
-
-		private async Task SendRequest(HttpRequestMessage request, Action<HttpResponse> onSuccess, Action<Exception> onException) {
-			try {
-				using var response = await _client.SendAsync(request);
-				onSuccess(new HttpResponse(response) {
-					Body = await response.Content.ReadAsStringAsync()
-				});
-			} catch (Exception ex) {
-				onException(ex);
-				throw;
-			} finally {
-				request.Dispose();
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/Client/IHttpClient.cs b/src/EventStore.Transport.Http/Client/IHttpClient.cs
deleted file mode 100644
index bc96e5a3346..00000000000
--- a/src/EventStore.Transport.Http/Client/IHttpClient.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-
-namespace EventStore.Transport.Http.Client {
-	public interface IHttpClient {
-		void Get(string url, Action<HttpResponse> onSuccess, Action<Exception> onException);
-
-		void Post(string url, string request, string contentType, Action<HttpResponse> onSuccess,
-			Action<Exception> onException);
-
-		void Delete(string url, Action<HttpResponse> onSuccess, Action<Exception> onException);
-
-		void Put(string url, string request, string contentType, Action<HttpResponse> onSuccess,
-			Action<Exception> onException);
-	}
-}
diff --git a/src/EventStore.Transport.Http/Codecs/Codec.cs b/src/EventStore.Transport.Http/Codecs/Codec.cs
deleted file mode 100644
index 130388ca170..00000000000
--- a/src/EventStore.Transport.Http/Codecs/Codec.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System.Text;
-using EventStore.Common.Utils;
-
-namespace EventStore.Transport.Http.Codecs {
-	public static class Codec {
-		public static readonly NoCodec NoCodec = new NoCodec();
-		public static readonly ICodec[] NoCodecs = new ICodec[0];
-		public static readonly ManualEncoding ManualEncoding = new ManualEncoding();
-
-		public static readonly JsonCodec Json = new JsonCodec();
-		public static readonly XmlCodec Xml = new XmlCodec();
-
-		public static readonly CustomCodec ApplicationXml =
-			new CustomCodec(Xml, ContentType.ApplicationXml, Helper.UTF8NoBom, false, false);
-
-		public static readonly CustomCodec EventXml =
-			new CustomCodec(Xml, ContentType.EventXml, Helper.UTF8NoBom, true, true);
-
-		public static readonly CustomCodec EventJson =
-			new CustomCodec(Json, ContentType.EventJson, Helper.UTF8NoBom, true, true);
-
-		public static readonly CustomCodec EventsXml =
-			new CustomCodec(Xml, ContentType.EventsXml, Helper.UTF8NoBom, true, true);
-
-		public static readonly CustomCodec EventsJson =
-			new CustomCodec(Json, ContentType.EventsJson, Helper.UTF8NoBom, true, true);
-
-		public static readonly ICodec EventStoreXmlCodec =
-			Codec.CreateCustom(Codec.Xml, ContentType.Atom, Helper.UTF8NoBom, false, false);
-
-		public static readonly ICodec EventStoreJsonCodec =
-			Codec.CreateCustom(Codec.Json, ContentType.AtomJson, Helper.UTF8NoBom, false, false);
-
-		public static readonly CustomCodec DescriptionJson =
-			new CustomCodec(Json, ContentType.DescriptionDocJson, Helper.UTF8NoBom, true, true);
-
-		public static readonly CustomCodec CompetingXml =
-			new CustomCodec(Xml, ContentType.Competing, Helper.UTF8NoBom, true, true);
-
-		public static readonly CustomCodec CompetingJson =
-			new CustomCodec(Json, ContentType.CompetingJson, Helper.UTF8NoBom, true, true);
-
-		public static readonly CustomCodec Raw = new CustomCodec(NoCodec, ContentType.Raw, null, false, false);
-		public static readonly TextCodec Text = new TextCodec();
-
-		public static ICodec CreateCustom(ICodec codec, string contentType, Encoding encoding, bool hasEventIds,
-			bool hasEventTypes) {
-			return new CustomCodec(codec, contentType, encoding, hasEventIds, hasEventTypes);
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/Codecs/CustomCodec.cs b/src/EventStore.Transport.Http/Codecs/CustomCodec.cs
deleted file mode 100644
index ec4e02cebfd..00000000000
--- a/src/EventStore.Transport.Http/Codecs/CustomCodec.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using System.Text;
-using EventStore.Common.Utils;
-
-namespace EventStore.Transport.Http.Codecs {
-	public class CustomCodec : ICodec {
-		public ICodec BaseCodec {
-			get { return _codec; }
-		}
-
-		public string ContentType {
-			get { return _contentType; }
-		}
-
-		public Encoding Encoding {
-			get { return _encoding; }
-		}
-
-		public bool HasEventIds {
-			get { return _hasEventIds; }
-		}
-
-		public bool HasEventTypes {
-			get { return _hasEventTypes; }
-		}
-
-		private readonly ICodec _codec;
-		private readonly string _contentType;
-		private readonly string _type;
-		private readonly string _subtype;
-		private readonly Encoding _encoding;
-		private readonly bool _hasEventIds;
-		private readonly bool _hasEventTypes;
-
-		internal CustomCodec(ICodec codec, string contentType, Encoding encoding, bool hasEventIds,
-			bool hasEventTypes) {
-			Ensure.NotNull(codec, "codec");
-			Ensure.NotNull(contentType, "contentType");
-			_hasEventTypes = hasEventTypes;
-			_hasEventIds = hasEventIds;
-			_codec = codec;
-			_contentType = contentType;
-			_encoding = encoding;
-			var parts = contentType.Split(new[] {'/'}, 2);
-			if (parts.Length != 2)
-				throw new ArgumentException("contentType");
-			_type = parts[0];
-			_subtype = parts[1];
-		}
-
-		public bool CanParse(MediaType format) {
-			return format != null && format.Matches(ContentType, Encoding);
-		}
-
-		public bool SuitableForResponse(MediaType component) {
-			return component.Type == "*"
-			       || (string.Equals(component.Type, _type, StringComparison.OrdinalIgnoreCase)
-			           && (component.Subtype == "*"
-			               || string.Equals(component.Subtype, _subtype, StringComparison.OrdinalIgnoreCase)));
-		}
-
-		public T From<T>(string text) {
-			return _codec.From<T>(text);
-		}
-
-		public string To<T>(T value) {
-			return _codec.To(value);
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/Codecs/JsonCodec.cs b/src/EventStore.Transport.Http/Codecs/JsonCodec.cs
deleted file mode 100644
index 09ba6ee6a95..00000000000
--- a/src/EventStore.Transport.Http/Codecs/JsonCodec.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using System.Text;
-using EventStore.Common.Utils;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Transport.Http.Codecs {
-	public class JsonCodec : ICodec {
-		public static Formatting Formatting = Formatting.Indented;
-
-		private static readonly ILogger Log = Serilog.Log.ForContext<JsonCodec>();
-
-		private static readonly JsonSerializerSettings FromSettings = new JsonSerializerSettings {
-			ContractResolver = new CamelCasePropertyNamesContractResolver(),
-			DateParseHandling = DateParseHandling.None,
-			NullValueHandling = NullValueHandling.Ignore,
-			DefaultValueHandling = DefaultValueHandling.Include,
-			MissingMemberHandling = MissingMemberHandling.Ignore,
-			TypeNameHandling = TypeNameHandling.None,
-			MetadataPropertyHandling = MetadataPropertyHandling.Ignore,
-			Converters = new JsonConverter[] {
-				new StringEnumConverter()
-			}
-		};
-
-		public static readonly JsonSerializerSettings ToSettings = new JsonSerializerSettings {
-			ContractResolver = new CamelCasePropertyNamesContractResolver(),
-			DateFormatHandling = DateFormatHandling.IsoDateFormat,
-			NullValueHandling = NullValueHandling.Include,
-			DefaultValueHandling = DefaultValueHandling.Include,
-			MissingMemberHandling = MissingMemberHandling.Ignore,
-			TypeNameHandling = TypeNameHandling.None,
-			Converters = new JsonConverter[] {new StringEnumConverter()}
-		};
-
-
-		public string ContentType {
-			get { return Http.ContentType.Json; }
-		}
-
-		public Encoding Encoding {
-			get { return Helper.UTF8NoBom; }
-		}
-
-		public bool HasEventIds {
-			get { return false; }
-		}
-
-		public bool HasEventTypes {
-			get { return false; }
-		}
-
-		public bool CanParse(MediaType format) {
-			return format != null && format.Matches(ContentType, Encoding);
-		}
-
-		public bool SuitableForResponse(MediaType component) {
-			return component.Type == "*"
-			       || (string.Equals(component.Type, "application", StringComparison.OrdinalIgnoreCase)
-			           && (component.Subtype == "*"
-			               || string.Equals(component.Subtype, "json", StringComparison.OrdinalIgnoreCase)));
-		}
-
-		public T From<T>(string text) {
-			try {
-				return JsonConvert.DeserializeObject<T>(text, FromSettings);
-			} catch (Exception e) {
-				Log.Error(e, "'{text}' is not a valid serialized {type}", text, typeof(T).FullName);
-				return default(T);
-			}
-		}
-
-		public string To<T>(T value) {
-			if (value == null)
-				return "";
-
-			if ((object)value == Empty.Result)
-				return Empty.Json;
-
-			try {
-				return JsonConvert.SerializeObject(value, Formatting, ToSettings);
-			} catch (Exception ex) {
-				Log.Error(ex, "Error serializing object {value}", value);
-				return null;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/Codecs/ManualEncoding.cs b/src/EventStore.Transport.Http/Codecs/ManualEncoding.cs
deleted file mode 100644
index 708734839c7..00000000000
--- a/src/EventStore.Transport.Http/Codecs/ManualEncoding.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Text;
-
-namespace EventStore.Transport.Http.Codecs {
-	public class ManualEncoding : ICodec {
-		public string ContentType {
-			get { throw new InvalidOperationException(); }
-		}
-
-		public Encoding Encoding {
-			get { throw new InvalidOperationException(); }
-		}
-
-		public bool HasEventIds {
-			get { return false; }
-		}
-
-		public bool HasEventTypes {
-			get { return false; }
-		}
-
-		public bool CanParse(MediaType format) {
-			return true;
-		}
-
-		public bool SuitableForResponse(MediaType component) {
-			return true;
-		}
-
-		public T From<T>(string text) {
-			throw new InvalidOperationException();
-		}
-
-		public string To<T>(T value) {
-			throw new InvalidOperationException();
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/Codecs/NoCodec.cs b/src/EventStore.Transport.Http/Codecs/NoCodec.cs
deleted file mode 100644
index c7e0c8e544d..00000000000
--- a/src/EventStore.Transport.Http/Codecs/NoCodec.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Text;
-
-namespace EventStore.Transport.Http.Codecs {
-	public class NoCodec : ICodec {
-		public string ContentType {
-			get { throw new NotSupportedException(); }
-		}
-
-		public Encoding Encoding {
-			get { throw new NotSupportedException(); }
-		}
-
-		public bool HasEventIds {
-			get { return false; }
-		}
-
-		public bool HasEventTypes {
-			get { return false; }
-		}
-
-		public bool CanParse(MediaType format) {
-			return false;
-		}
-
-		public bool SuitableForResponse(MediaType component) {
-			return false;
-		}
-
-		public T From<T>(string text) {
-			throw new NotSupportedException();
-		}
-
-		public string To<T>(T value) {
-			throw new NotSupportedException();
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/Codecs/TextCodec.cs b/src/EventStore.Transport.Http/Codecs/TextCodec.cs
deleted file mode 100644
index 253ab16f56c..00000000000
--- a/src/EventStore.Transport.Http/Codecs/TextCodec.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.Text;
-using EventStore.Common.Utils;
-
-namespace EventStore.Transport.Http.Codecs {
-	public class TextCodec : ICodec {
-		public string ContentType {
-			get { return Http.ContentType.PlainText; }
-		}
-
-		public Encoding Encoding {
-			get { return Helper.UTF8NoBom; }
-		}
-
-		public bool HasEventIds {
-			get { return false; }
-		}
-
-		public bool HasEventTypes {
-			get { return false; }
-		}
-
-		public bool CanParse(MediaType format) {
-			return format != null && format.Matches(ContentType, Encoding);
-		}
-
-		public bool SuitableForResponse(MediaType component) {
-			return component.Type == "*"
-			       || (string.Equals(component.Type, "text", StringComparison.OrdinalIgnoreCase)
-			           && (component.Subtype == "*"
-			               || string.Equals(component.Subtype, "plain", StringComparison.OrdinalIgnoreCase)));
-		}
-
-		public T From<T>(string text) {
-			throw new NotSupportedException();
-		}
-
-		public string To<T>(T value) {
-			return ((object)value) != null ? value.ToString() : null;
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/Codecs/XmlCodec.cs b/src/EventStore.Transport.Http/Codecs/XmlCodec.cs
deleted file mode 100644
index f374cea89e1..00000000000
--- a/src/EventStore.Transport.Http/Codecs/XmlCodec.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using System.IO;
-using System.Text;
-using System.Xml;
-using System.Xml.Serialization;
-using EventStore.Common.Utils;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Transport.Http.Codecs {
-	public class XmlCodec : ICodec {
-		private static readonly ILogger Log = Serilog.Log.ForContext<XmlCodec>();
-
-		public string ContentType {
-			get { return EventStore.Transport.Http.ContentType.Xml; }
-		}
-
-		public Encoding Encoding {
-			get { return Helper.UTF8NoBom; }
-		}
-
-		public bool HasEventIds {
-			get { return false; }
-		}
-
-		public bool HasEventTypes {
-			get { return false; }
-		}
-
-		public bool CanParse(MediaType format) {
-			return format != null && format.Matches(ContentType, Encoding);
-		}
-
-		public bool SuitableForResponse(MediaType component) {
-			return component.Type == "*"
-			       || (string.Equals(component.Type, "text", StringComparison.OrdinalIgnoreCase)
-			           && (component.Subtype == "*"
-			               || string.Equals(component.Subtype, "xml", StringComparison.OrdinalIgnoreCase)));
-		}
-
-		public T From<T>(string text) {
-			if (string.IsNullOrEmpty(text))
-				return default(T);
-
-			try {
-				using (var reader = new StringReader(text)) {
-					return (T)new XmlSerializer(typeof(T)).Deserialize(reader);
-				}
-			} catch (Exception e) {
-				Log.Error(e, "'{text}' is not a valid serialized {type}", text, typeof(T).FullName);
-				return default(T);
-			}
-		}
-
-		public string To<T>(T value) {
-			if ((object)value == null)
-				return null;
-
-			if ((object)value == Empty.Result)
-				return Empty.Xml;
-
-			try {
-				using (var memory = new MemoryStream())
-				using (var writer = new XmlTextWriter(memory, Helper.UTF8NoBom)) {
-					var serializable = value as IXmlSerializable;
-					if (serializable != null) {
-						writer.WriteStartDocument();
-						serializable.WriteXml(writer);
-						writer.WriteEndDocument();
-					} else {
-						new XmlSerializer(typeof(T)).Serialize(writer, value);
-					}
-
-					writer.Flush();
-					return Helper.UTF8NoBom.GetString(memory.GetBuffer(), 0, (int)memory.Length);
-				}
-			} catch (Exception exc) {
-				Log.Error(exc, "Error serializing object of type {type}", value.GetType().FullName);
-				return null;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/CompressionAlgorithms.cs b/src/EventStore.Transport.Http/CompressionAlgorithms.cs
deleted file mode 100644
index 5d68f40f3bc..00000000000
--- a/src/EventStore.Transport.Http/CompressionAlgorithms.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace EventStore.Transport.Http {
-	public class CompressionAlgorithms {
-		public const string Gzip = "gzip";
-		public const string Deflate = "deflate";
-	}
-}
diff --git a/src/EventStore.Transport.Http/ContentType.cs b/src/EventStore.Transport.Http/ContentType.cs
deleted file mode 100644
index 4d30eceb39a..00000000000
--- a/src/EventStore.Transport.Http/ContentType.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-namespace EventStore.Transport.Http {
-	public static class ContentType {
-		public const string Any = "*/*";
-
-		public const string Json = "application/json";
-		public const string Xml = "text/xml";
-		public const string ApplicationXml = "application/xml";
-		public const string PlainText = "text/plain";
-		public const string Html = "text/html";
-
-		public const string Atom = "application/atom+xml";
-		public const string AtomJson = "application/vnd.eventstore.atom+json";
-
-		public const string AtomServiceDoc = "application/atomsvc+xml";
-		public const string AtomServiceDocJson = "application/vnd.eventstore.atomsvc+json";
-
-		public const string EventJson = "application/vnd.eventstore.event+json";
-		public const string EventXml = "application/vnd.eventstore.event+xml";
-
-		public const string EventsJson = "application/vnd.eventstore.events+json";
-		public const string EventsXml = "application/vnd.eventstore.events+xml";
-
-		public const string DescriptionDocJson = "application/vnd.eventstore.streamdesc+json";
-
-		public const string Competing = "application/vnd.eventstore.competingatom+xml";
-		public const string CompetingJson = "application/vnd.eventstore.competingatom+json";
-
-		public const string Raw = "application/octet-stream";
-	}
-}
diff --git a/src/EventStore.Transport.Http/EntityManagement/CoreHttpRequestAdapter.cs b/src/EventStore.Transport.Http/EntityManagement/CoreHttpRequestAdapter.cs
deleted file mode 100644
index a281f938263..00000000000
--- a/src/EventStore.Transport.Http/EntityManagement/CoreHttpRequestAdapter.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Features;
-using Microsoft.Extensions.Primitives;
-
-namespace EventStore.Transport.Http.EntityManagement {
-	public class CoreHttpRequestAdapter : IHttpRequest {
-		private readonly HttpRequest _inner;
-
-		public CoreHttpRequestAdapter(HttpRequest inner) {
-			_inner = inner;
-		}
-
-		public string[] AcceptTypes => _inner.Headers.GetCommaSeparatedValues("accept");
-
-		public long ContentLength64 => _inner.ContentLength ?? 0;
-
-		public string ContentType => _inner.ContentType;
-
-		public string HttpMethod => _inner.Method;
-
-		public Stream InputStream => _inner.Body;
-
-		public string RawUrl => _inner.Path + (_inner.QueryString.HasValue ? _inner.QueryString.Value : null);
-
-		public IPEndPoint RemoteEndPoint => _inner.HttpContext.Connection.RemoteIpAddress != null ? new IPEndPoint(
-			_inner.HttpContext.Connection.RemoteIpAddress, _inner.HttpContext.Connection.RemotePort) : null;
-
-		public Uri Url => new Uri(new Uri($"{_inner.Scheme}://{_inner.Host}"), RawUrl);
-
-		public IEnumerable<string> GetQueryStringKeys() => _inner.Query.Keys;
-
-		public StringValues GetQueryStringValues(string key) => _inner.Query[key];
-
-		public IEnumerable<string> GetHeaderKeys() => _inner.Headers.Keys;
-		public StringValues GetHeaderValues(string key) => _inner.Headers[key];
-	}
-}
diff --git a/src/EventStore.Transport.Http/EntityManagement/CoreHttpResponseAdapter.cs b/src/EventStore.Transport.Http/EntityManagement/CoreHttpResponseAdapter.cs
deleted file mode 100644
index 31117375aa5..00000000000
--- a/src/EventStore.Transport.Http/EntityManagement/CoreHttpResponseAdapter.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System.IO;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Features;
-
-namespace EventStore.Transport.Http.EntityManagement {
-	public class CoreHttpResponseAdapter : IHttpResponse {
-		private readonly Microsoft.AspNetCore.Http.HttpResponse _inner;
-
-		public CoreHttpResponseAdapter(Microsoft.AspNetCore.Http.HttpResponse inner) {
-			_inner = inner;
-		}
-		public void AddHeader(string name, string value) => _inner.Headers.Append(name, value);
-
-		public void Close() {
-			_inner.Body.Close();
-		}
-
-		public long ContentLength64 {
-			get => _inner.ContentLength.GetValueOrDefault();
-			set => _inner.ContentLength = value;
-		}
-
-		public string ContentType {
-			get => _inner.ContentType;
-			set => _inner.ContentType = value;
-		}
-
-		public Stream OutputStream => _inner.Body;
-
-		public int StatusCode {
-			get => _inner.StatusCode;
-			set => _inner.StatusCode = value;
-		}
-
-		public string StatusDescription {
-			get => _inner.HttpContext.Features.Get<IHttpResponseFeature>().ReasonPhrase;
-			set => _inner.HttpContext.Features.Get<IHttpResponseFeature>().ReasonPhrase = value;
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/EntityManagement/HttpEntity.cs b/src/EventStore.Transport.Http/EntityManagement/HttpEntity.cs
deleted file mode 100644
index 80a528c287d..00000000000
--- a/src/EventStore.Transport.Http/EntityManagement/HttpEntity.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System;
-using System.Net;
-using System.Security.Claims;
-using EventStore.Common.Utils;
-using EventStore.Transport.Http.Codecs;
-using System.Linq;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Primitives;
-
-namespace EventStore.Transport.Http.EntityManagement {
-	public class HttpEntity {
-		public readonly HttpContext Context;
-		private readonly bool _logHttpRequests;
-		public readonly Action OnComplete;
-		public readonly Uri RequestedUrl;
-		public readonly Uri ResponseUrl;
-
-		public readonly IHttpRequest Request;
-		internal readonly IHttpResponse Response;
-		public ClaimsPrincipal User => Context.User;
-
-		public HttpEntity(HttpContext context, bool logHttpRequests, string advertiseAsHost, int advertiseAsPort,
-			Action onComplete) {
-			Context = context;
-			Ensure.NotNull(context, nameof(context));
-			Ensure.NotNull(onComplete, nameof(onComplete));
-
-			var request = new CoreHttpRequestAdapter(context.Request);
-			var response = new CoreHttpResponseAdapter(context.Response);
-			_logHttpRequests = logHttpRequests;
-			OnComplete = onComplete;
-			RequestedUrl = BuildRequestedUrl(request, advertiseAsHost, advertiseAsPort);
-			ResponseUrl = BuildRequestedUrl(request, advertiseAsHost, advertiseAsPort, true);
-			Request = request;
-			Response = response;
-			Context = context;
-		}
-
-		public static Uri BuildRequestedUrl(IHttpRequest request,
-			string advertiseAsAddress, int advertiseAsPort, bool overridePath = false) {
-			var uriBuilder = new UriBuilder(request.Url);
-			if (overridePath) {
-				uriBuilder.Path = string.Empty;
-			}
-
-			if (advertiseAsAddress != null) {
-				uriBuilder.Host = advertiseAsAddress.ToString();
-			}
-
-			if (advertiseAsPort > 0) {
-				uriBuilder.Port = advertiseAsPort;
-			}
-
-			var forwardedPortHeaderValue = request.GetHeaderValues(ProxyHeaders.XForwardedPort);
-			if (!StringValues.IsNullOrEmpty(forwardedPortHeaderValue)) {
-				if (int.TryParse(forwardedPortHeaderValue.First(), out var requestPort)) {
-					uriBuilder.Port = requestPort;
-				}
-			}
-
-			var forwardedProtoHeaderValue = request.GetHeaderValues(ProxyHeaders.XForwardedProto);
-
-			if (!StringValues.IsNullOrEmpty(forwardedProtoHeaderValue)) {
-				uriBuilder.Scheme = forwardedProtoHeaderValue.First();
-			}
-
-			var forwardedHostHeaderValue = request.GetHeaderValues(ProxyHeaders.XForwardedHost);
-
-			if (!StringValues.IsNullOrEmpty(forwardedHostHeaderValue)) {
-				var host = forwardedHostHeaderValue.First();
-				if (!string.IsNullOrEmpty(host)) {
-					var parts = host.Split(new[] { ":" }, StringSplitOptions.RemoveEmptyEntries);
-					uriBuilder.Host = parts[0];
-					if (parts.Length > 1 && int.TryParse(parts[1], out var port)) {
-						uriBuilder.Port = port;
-					}
-				}
-			}
-
-			var forwardedPrefixHeaderValue = request.GetHeaderValues(ProxyHeaders.XForwardedPrefix);
-			if (!string.IsNullOrEmpty(forwardedPrefixHeaderValue)) {
-				uriBuilder.Path = forwardedPrefixHeaderValue + uriBuilder.Path;
-			}
-
-			return uriBuilder.Uri;
-		}
-
-		public HttpEntityManager CreateManager(
-			ICodec requestCodec, ICodec responseCodec, string[] allowedMethods, Action<HttpEntity> onRequestSatisfied) {
-			return new HttpEntityManager(this, allowedMethods, onRequestSatisfied, requestCodec, responseCodec,
-				_logHttpRequests, OnComplete);
-		}
-
-		public HttpEntityManager CreateManager()
-			=> CreateManager(Codec.NoCodec, Codec.NoCodec, Array.Empty<string>(), _ => { });
-	}
-}
diff --git a/src/EventStore.Transport.Http/EntityManagement/HttpEntityManager.cs b/src/EventStore.Transport.Http/EntityManagement/HttpEntityManager.cs
deleted file mode 100644
index 416fbe428d2..00000000000
--- a/src/EventStore.Transport.Http/EntityManagement/HttpEntityManager.cs
+++ /dev/null
@@ -1,462 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Security.Claims;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.BufferManagement;
-using EventStore.Common.Utils;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Transport.Http.EntityManagement {
-	public sealed class HttpEntityManager {
-		private static readonly ILogger Log = Serilog.Log.ForContext<HttpEntityManager>();
-
-		public object AsyncState { get; set; }
-		public readonly HttpEntity HttpEntity;
-
-		public bool IsProcessing {
-			get { return _processing != 0; }
-		}
-
-		private int _processing;
-		private readonly string[] _allowedMethods;
-		private readonly Action<HttpEntity> _onRequestSatisfied;
-		private readonly ICodec _requestCodec;
-		private readonly ICodec _responseCodec;
-		private readonly Uri _responseUrl;
-		private readonly Uri _requestedUrl;
-		private readonly string _responseContentEncoding;
-
-		private static readonly string[] SupportedCompressionAlgorithms =
-			{CompressionAlgorithms.Gzip, CompressionAlgorithms.Deflate};
-
-		private static readonly BufferManager
-			_compressionBufferManager = new BufferManager(20, 50 * 1024); //create 20 50KB buffers (1MB total)
-
-		private readonly bool _logHttpRequests;
-		private readonly Action _onComplete;
-
-		public readonly DateTime TimeStamp;
-
-
-		internal HttpEntityManager(HttpEntity httpEntity, string[] allowedMethods,
-			Action<HttpEntity> onRequestSatisfied, ICodec requestCodec,
-			ICodec responseCodec, bool logHttpRequests, Action onComplete) {
-			Ensure.NotNull(httpEntity, "httpEntity");
-			Ensure.NotNull(allowedMethods, "allowedMethods");
-			Ensure.NotNull(onRequestSatisfied, "onRequestSatisfied");
-			Ensure.NotNull(onComplete, nameof(onComplete));
-
-			HttpEntity = httpEntity;
-			TimeStamp = DateTime.UtcNow;
-
-			_allowedMethods = allowedMethods;
-			_onRequestSatisfied = onRequestSatisfied;
-			_requestCodec = requestCodec;
-			_responseCodec = responseCodec;
-			_responseUrl = httpEntity.ResponseUrl;
-			_requestedUrl = httpEntity.RequestedUrl;
-			_responseContentEncoding = GetRequestedContentEncoding(httpEntity);
-			_logHttpRequests = logHttpRequests;
-			_onComplete = onComplete;
-
-			if (HttpEntity.Request != null && HttpEntity.Request.ContentLength64 == 0) {
-				LogRequest(new byte[0]);
-			}
-		}
-
-		public ICodec RequestCodec {
-			get { return _requestCodec; }
-		}
-
-		public ICodec ResponseCodec {
-			get { return _responseCodec; }
-		}
-
-		public Uri ResponseUrl {
-			get { return _responseUrl; }
-		}
-
-		public Uri RequestedUrl {
-			get { return _requestedUrl; }
-		}
-
-		public ClaimsPrincipal User {
-			get { return HttpEntity.User; }
-		}
-
-		private void SetResponseCode(int code) {
-			try {
-				HttpEntity.Response.StatusCode = code;
-			} catch (ObjectDisposedException) {
-				// ignore
-			} catch (ProtocolViolationException e) {
-				Log.Error(e, "Attempt to set invalid HTTP status code occurred.");
-			}
-		}
-
-		private void SetResponseDescription(string desc) {
-			try {
-				HttpEntity.Response.StatusDescription = desc;
-			} catch (ObjectDisposedException) {
-				// ignore
-			} catch (ArgumentException e) {
-				Log.Error(e,
-					"Description string '{description}' did not pass validation. Status description was not set.",
-					desc);
-			}
-		}
-
-		private void SetContentType(string contentType, Encoding encoding) {
-			if (contentType == null)
-				return;
-			try {
-				HttpEntity.Response.ContentType =
-					contentType + (encoding != null ? ("; charset=" + encoding.WebName) : "");
-			} catch (ObjectDisposedException) {
-				// ignore
-			} catch (InvalidOperationException e) {
-				Log.Debug("Error during setting content type on HTTP response: {e}.", e.Message);
-			} catch (ArgumentOutOfRangeException e) {
-				Log.Error(e, "Invalid response type.");
-			}
-		}
-
-		private void SetResponseLength(long length) {
-			try {
-				HttpEntity.Response.ContentLength64 = length;
-			} catch (ObjectDisposedException) {
-				// ignore
-			} catch (InvalidOperationException e) {
-				Log.Debug("Error during setting content length on HTTP response: {e}.", e.Message);
-			} catch (ArgumentOutOfRangeException e) {
-				Log.Error(e, "Attempt to set invalid value '{length}' as content length.", length);
-			}
-		}
-
-		private void SetRequiredHeaders() {
-			try {
-				HttpEntity.Response.AddHeader("Access-Control-Allow-Methods", string.Join(", ", _allowedMethods));
-				HttpEntity.Response.AddHeader("Access-Control-Allow-Headers",
-					"Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequireMaster, ES-RequireLeader, ES-HardDelete, ES-ResolveLinkTos");
-				HttpEntity.Response.AddHeader("Access-Control-Allow-Origin", "*");
-				HttpEntity.Response.AddHeader("Access-Control-Expose-Headers",
-					"Location, ES-Position, ES-CurrentVersion");
-				if (HttpEntity.Response.StatusCode == HttpStatusCode.Unauthorized)
-					HttpEntity.Response.AddHeader("WWW-Authenticate", "BasicCustom realm=\"ES\"");
-			} catch (ObjectDisposedException) {
-				// ignore
-			} catch (Exception e) {
-				Log.Debug("Failed to set required response headers: {e}.", e.Message);
-			}
-		}
-
-		private void SetContentEncodingHeader(String contentEncoding) {
-			try {
-				HttpEntity.Response.AddHeader("Content-Encoding", contentEncoding);
-			} catch (Exception e) {
-				Log.Debug("Failed to set Content-Encoding header: {e}.", e.Message);
-			}
-		}
-
-		private void SetAdditionalHeaders(IEnumerable<KeyValuePair<string, string>> headers) {
-			try {
-				foreach (var kvp in headers) {
-					HttpEntity.Response.AddHeader(kvp.Key, kvp.Value);
-				}
-			} catch (ObjectDisposedException) {
-				// ignore
-			} catch (Exception e) {
-				Log.Debug("Failed to set additional response headers: {e}.", e.Message);
-			}
-		}
-
-		public void ReadRequestAsync(Action<HttpEntityManager, byte[]> onReadSuccess, Action<Exception> onError) {
-			Ensure.NotNull(onReadSuccess, "OnReadSuccess");
-			Ensure.NotNull(onError, "onError");
-
-			var state = new ManagerOperationState(
-				HttpEntity.Request.InputStream, new MemoryStream(), onReadSuccess, onError);
-			var copier = new AsyncStreamCopier<ManagerOperationState>(
-				state.InputStream, state.OutputStream, state, RequestRead);
-			copier.Start();
-		}
-
-		public bool BeginReply(
-			int code, string description, string contentType, Encoding encoding,
-			IEnumerable<KeyValuePair<string, string>> headers) {
-			if (HttpEntity.Response == null) // test instance
-				return false;
-
-			bool isAlreadyProcessing = Interlocked.CompareExchange(ref _processing, 1, 0) == 1;
-			if (isAlreadyProcessing)
-				return false;
-
-			SetResponseCode(code);
-			SetResponseDescription(description);
-			SetContentType(contentType, encoding);
-
-			SetRequiredHeaders();
-			if (!string.IsNullOrEmpty(_responseContentEncoding))
-				SetContentEncodingHeader(_responseContentEncoding);
-
-			SetAdditionalHeaders(headers.Safe());
-			return true;
-		}
-
-		public void ContinueReply(byte[] response, Action<Exception> onError, Action onCompleted) {
-			Ensure.NotNull(onError, "onError");
-			Ensure.NotNull(onCompleted, "onCompleted");
-
-			Task.Run(async () => {
-				try {
-					await HttpEntity.Response.OutputStream.WriteAsync(response);
-					onCompleted();
-				} catch (Exception ex) {
-					onError(ex);
-				}
-			});
-		}
-
-		public void EndReply() {
-		}
-
-		public void Reply(
-			byte[] response, int code, string description, string contentType, Encoding encoding,
-			IEnumerable<KeyValuePair<string, string>> headers, Action<Exception> onError) {
-			Ensure.NotNull(onError, "onError");
-
-			if (!BeginReply(code, description, contentType, encoding, headers))
-				return;
-
-			if (response == null || response.Length == 0) {
-				LogResponse(Array.Empty<byte>());
-				SetResponseLength(0);
-				_onComplete();
-				CloseConnection(onError);
-			} else {
-				LogResponse(response);
-				if (!string.IsNullOrEmpty(_responseContentEncoding))
-					response = CompressResponse(response, _responseContentEncoding);
-				SetResponseLength(response.Length);
-				ContinueReply(response, onError, _onComplete);
-			}
-		}
-
-		public void ForwardReply(HttpResponseMessage response, Action<Exception> onError) {
-			Ensure.NotNull(response, "response");
-			Ensure.NotNull(onError, "onError");
-
-			if (Interlocked.CompareExchange(ref _processing, 1, 0) != 0)
-				return;
-
-			try {
-				HttpEntity.Response.StatusCode = (int)response.StatusCode;
-				HttpEntity.Response.StatusDescription = response.ReasonPhrase;
-				if (response.Content != null) {
-					if (response.Content.Headers.ContentType != null) {
-						HttpEntity.Response.ContentType = response.Content.Headers.ContentType.MediaType;
-					}
-
-					IEnumerable<string> values;
-					if (response.Content.Headers.TryGetValues("Content-Encoding", out values)) {
-						HttpEntity.Response.AddHeader("Content-Encoding", values.FirstOrDefault());
-					}
-
-					HttpEntity.Response.ContentLength64 = response.Content.Headers.ContentLength.GetValueOrDefault();
-				}
-
-				foreach (var header in response.Headers) {
-					string headerValue;
-					switch (header.Key) {
-						case "Content-Length":
-							break;
-						case "Keep-Alive":
-							break;
-						case "Transfer-Encoding":
-							break;
-						case "WWW-Authenticate":
-							headerValue = header.Value.FirstOrDefault();
-							HttpEntity.Response.AddHeader(header.Key, headerValue);
-							break;
-
-						default:
-							headerValue = header.Value.FirstOrDefault();
-							HttpEntity.Response.AddHeader(header.Key, headerValue);
-							break;
-					}
-				}
-
-				if (HttpEntity.Response.ContentLength64 > 0) {
-					response.Content.ReadAsStreamAsync()
-						.ContinueWith(task => {
-							new AsyncStreamCopier<IHttpResponse>(
-								task.Result,
-								HttpEntity.Response.OutputStream,
-								HttpEntity.Response,
-								copier => { Helper.EatException(_onComplete); }).Start();
-						});
-				} else {
-					Helper.EatException(_onComplete);
-				}
-			} catch (Exception e) {
-				Log.Error(e, "Failed to set up forwarded response parameters for '{requestedUrl}'.",
-					RequestedUrl);
-			}
-		}
-
-		private void RequestRead(AsyncStreamCopier<ManagerOperationState> copier) {
-			var state = copier.AsyncState;
-
-			if (copier.Error != null) {
-				state.Dispose();
-				CloseConnection(exc =>
-					Log.Debug("Close connection error (after crash in read request): {e}", exc.Message));
-
-				state.OnError(copier.Error);
-				return;
-			}
-
-			state.OutputStream.Seek(0, SeekOrigin.Begin);
-			var memory = (MemoryStream)state.OutputStream;
-
-			var request = memory.GetBuffer();
-			if (memory.Length != memory.GetBuffer().Length) {
-				request = new byte[memory.Length];
-				Buffer.BlockCopy(memory.GetBuffer(), 0, request, 0, (int)memory.Length);
-			}
-
-			LogRequest(request);
-			state.OnReadSuccess(this, request);
-		}
-
-		private void CloseConnection(Action<Exception> onError) {
-			try {
-				_onRequestSatisfied(HttpEntity);
-				_onComplete();
-			} catch (Exception e) {
-				onError(e);
-			}
-		}
-
-		private string CreateHeaderLog() {
-			var logBuilder = new StringBuilder();
-			foreach (var header in HttpEntity.Request.GetHeaderKeys()) {
-				logBuilder.AppendFormat("{0}: {1}\n", header, HttpEntity.Request.GetHeaderValues(header));
-			}
-
-			return logBuilder.ToString();
-		}
-
-		private Dictionary<string, object> CreateHeaderLogStructured() {
-			var dict = new Dictionary<string, object>();
-			foreach (var header in HttpEntity.Request.GetHeaderKeys()) {
-				dict.Add(header, HttpEntity.Request.GetHeaderValues(header));
-			}
-
-			return dict;
-		}
-
-		private void LogRequest(byte[] body) {
-			if (_logHttpRequests) {
-				var bodyStr = "";
-				if (body != null && body.Length > 0) {
-					bodyStr = Encoding.Default.GetString(body);
-				}
-
-				Log.Debug("HTTP Request Received\n{dateTime}\nFrom: {remoteEndPoint}\n{httpMethod} {requestUrl}\n{headers}" + "\n{body}"
-					, DateTime.Now
-					, HttpEntity.Request.RemoteEndPoint.ToString()
-					, HttpEntity.Request.HttpMethod
-					, HttpEntity.Request.Url
-					, CreateHeaderLogStructured()
-					, bodyStr
-				);
-			}
-		}
-
-		private void LogResponse(byte[] body) {
-			if (_logHttpRequests) {
-				var bodyStr = "";
-				if (body != null && body.Length > 0) {
-					bodyStr = Encoding.Default.GetString(body);
-				}
-
-				Log.Debug(
-					"HTTP Response\n{dateTime}\n{statusCode} {statusDescription}\n{headers}\n{body}",
-					DateTime.Now,
-					HttpEntity.Response.StatusCode,
-					HttpEntity.Response.StatusDescription,
-					CreateHeaderLogStructured(),
-					bodyStr
-				);
-			}
-		}
-
-		public static byte[] CompressResponse(byte[] response, string compressionAlgorithm) {
-			if (string.IsNullOrEmpty(compressionAlgorithm) ||
-			    !SupportedCompressionAlgorithms.Contains(compressionAlgorithm))
-				return response;
-
-			MemoryStream outputStream;
-			var useBufferManager =
-				10L * response.Length <=
-				9L * _compressionBufferManager
-					.ChunkSize; //in some rare cases, compression can result in larger outputs. Added a 10% overhead just to be sure.
-			var bufferManagerArraySegment = new ArraySegment<byte>();
-
-			if (useBufferManager) {
-				//use buffer manager to handle responses less than ~50kb long to prevent excessive memory allocations
-				bufferManagerArraySegment = _compressionBufferManager.CheckOut();
-				outputStream = new MemoryStream(bufferManagerArraySegment.Array, bufferManagerArraySegment.Offset,
-					bufferManagerArraySegment.Count);
-				outputStream.SetLength(0);
-			} else {
-				//since Gzip/Deflate compression ratio doesn't go below 20% in most cases, we can initialize the array to a quarter of the original response length
-				//this also limits memory stream growth operations to at most 2.
-				outputStream = new MemoryStream((response.Length + 4 - 1) / 4);
-			}
-
-			using (outputStream) {
-				Stream compressedStream = null;
-				if (compressionAlgorithm.Equals(CompressionAlgorithms.Gzip))
-					compressedStream = new GZipStream(outputStream, CompressionLevel.Fastest);
-				else if (compressionAlgorithm.Equals(CompressionAlgorithms.Deflate))
-					compressedStream = new DeflateStream(outputStream, CompressionLevel.Fastest);
-
-				using (compressedStream)
-				using (var dataStream = new MemoryStream(response)) {
-					dataStream.CopyTo(compressedStream);
-				}
-
-				var result = outputStream.ToArray();
-				if (useBufferManager)
-					_compressionBufferManager.CheckIn(bufferManagerArraySegment);
-				return result;
-			}
-		}
-
-		private string GetRequestedContentEncoding(HttpEntity httpEntity) {
-			if (httpEntity?.Request == null)
-				return null;
-
-			var httpEntityRequest = httpEntity.Request;
-			string contentEncoding = null;
-			var values = httpEntityRequest.GetHeaderValues("Accept-Encoding");
-			foreach (string value in values) {
-				if (SupportedCompressionAlgorithms.Contains(value)) {
-					contentEncoding = value;
-					break;
-				}
-			}
-
-			return contentEncoding;
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/EntityManagement/HttpEntityManagerExtensions.cs b/src/EventStore.Transport.Http/EntityManagement/HttpEntityManagerExtensions.cs
deleted file mode 100644
index e0575759c98..00000000000
--- a/src/EventStore.Transport.Http/EntityManagement/HttpEntityManagerExtensions.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-
-namespace EventStore.Transport.Http.EntityManagement {
-	public static class HttpEntityManagerExtensions {
-		public static void ReplyStatus(this HttpEntityManager self, int code, string description,
-			Action<Exception> onError, IEnumerable<KeyValuePair<string, string>> headers = null) {
-			self.Reply(null, code, description, null, null, null, onError);
-		}
-
-		public static void ReplyContent(this HttpEntityManager self,
-			byte[] response,
-			int code,
-			string description,
-			string type,
-			IEnumerable<KeyValuePair<string, string>> headers,
-			Action<Exception> onError) {
-			self.Reply(response, code, description, type, null, headers, onError);
-		}
-
-		public static void ReplyTextContent(this HttpEntityManager self,
-			string response,
-			int code,
-			string description,
-			string type,
-			IEnumerable<KeyValuePair<string, string>> headers,
-			Action<Exception> onError) {
-			//TODO: add encoding header???
-			self.Reply(Helper.UTF8NoBom.GetBytes(response ?? string.Empty), code, description, type, Helper.UTF8NoBom,
-				headers, onError);
-		}
-
-		public static void ContinueReplyTextContent(
-			this HttpEntityManager self, string response, Action<Exception> onError, Action completed) {
-			//TODO: add encoding header???
-			var bytes = Helper.UTF8NoBom.GetBytes(response ?? string.Empty);
-			self.ContinueReply(bytes, onError, completed);
-		}
-
-		public static void ReadTextRequestAsync(
-			this HttpEntityManager self, Action<HttpEntityManager, string> onSuccess, Action<Exception> onError) {
-			self.ReadRequestAsync(
-				(manager, bytes) => {
-					int offset = 0;
-
-					// check for UTF-8 BOM (0xEF, 0xBB, 0xBF) and skip it safely, if any
-					if (bytes.Length >= 3 && bytes[0] == 0xEF && bytes[1] == 0xBB && bytes[2] == 0xBF)
-						offset = 3;
-
-					onSuccess(manager, Helper.UTF8NoBom.GetString(bytes, offset, bytes.Length - offset));
-				},
-				onError);
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/EntityManagement/HttpListenerRequestAdapter.cs b/src/EventStore.Transport.Http/EntityManagement/HttpListenerRequestAdapter.cs
deleted file mode 100644
index da6b73ea1bf..00000000000
--- a/src/EventStore.Transport.Http/EntityManagement/HttpListenerRequestAdapter.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Primitives;
-
-namespace EventStore.Transport.Http.EntityManagement {
-	public class HttpListenerRequestAdapter : IHttpRequest {
-		private readonly HttpListenerRequest _inner;
-
-		public string[] AcceptTypes => _inner.AcceptTypes;
-		public long ContentLength64 => _inner.ContentLength64;
-		public string ContentType => _inner.ContentType;
-		public string HttpMethod => _inner.HttpMethod;
-		public Stream InputStream => _inner.InputStream;
-		public string RawUrl => _inner.RawUrl;
-		public IPEndPoint RemoteEndPoint => _inner.RemoteEndPoint;
-		public Uri Url => _inner.Url;
-
-		public HttpListenerRequestAdapter(HttpListenerRequest inner) {
-			_inner = inner;
-		}
-
-		public IEnumerable<string> GetHeaderKeys() => _inner.Headers.AllKeys;
-		public StringValues GetHeaderValues(string key) => _inner.Headers.GetValues(key);
-
-		public IEnumerable<string> GetQueryStringKeys() => _inner.QueryString.AllKeys;
-		public StringValues GetQueryStringValues(string key) => _inner.QueryString.GetValues(key);
-
-	}
-}
diff --git a/src/EventStore.Transport.Http/EntityManagement/HttpListenerResponseAdapter.cs b/src/EventStore.Transport.Http/EntityManagement/HttpListenerResponseAdapter.cs
deleted file mode 100644
index a86370a90a6..00000000000
--- a/src/EventStore.Transport.Http/EntityManagement/HttpListenerResponseAdapter.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.IO;
-using System.Net;
-using System.Text;
-
-namespace EventStore.Transport.Http.EntityManagement {
-	public class HttpListenerResponseAdapter : IHttpResponse {
-		private readonly HttpListenerResponse _inner;
-
-		public void AddHeader(string name, string value) => _inner.AddHeader(name, value);
-
-		public void Close() => _inner.Close();
-
-		public Encoding ContentEncoding {
-			get => _inner.ContentEncoding;
-			set => _inner.ContentEncoding = value;
-		}
-
-		public long ContentLength64 {
-			get => _inner.ContentLength64;
-			set => _inner.ContentLength64 = value;
-		}
-
-		public string ContentType {
-			get => _inner.ContentType;
-			set => _inner.ContentType = value;
-		}
-
-		public Stream OutputStream => _inner.OutputStream;
-
-		public int StatusCode {
-			get => _inner.StatusCode;
-			set => _inner.StatusCode = value;
-		}
-
-		public string StatusDescription {
-			get => _inner.StatusDescription;
-			set => _inner.StatusDescription = value;
-		}
-
-		public HttpListenerResponseAdapter(HttpListenerResponse inner) {
-			_inner = inner;
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/EntityManagement/IHttpRequest.cs b/src/EventStore.Transport.Http/EntityManagement/IHttpRequest.cs
deleted file mode 100644
index 9e02d00a6fe..00000000000
--- a/src/EventStore.Transport.Http/EntityManagement/IHttpRequest.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Primitives;
-
-namespace EventStore.Transport.Http.EntityManagement {
-	public interface IHttpRequest {
-		string[] AcceptTypes { get; }
-		long ContentLength64 { get; }
-		string ContentType { get; }
-		string HttpMethod { get; }
-		Stream InputStream { get; }
-		string RawUrl { get; }
-		IPEndPoint RemoteEndPoint { get; }
-		Uri Url { get; }
-		IEnumerable<string> GetHeaderKeys();
-		StringValues GetHeaderValues(string key);
-		IEnumerable<string> GetQueryStringKeys();
-		StringValues GetQueryStringValues(string key);
-	}
-}
diff --git a/src/EventStore.Transport.Http/EntityManagement/IHttpResponse.cs b/src/EventStore.Transport.Http/EntityManagement/IHttpResponse.cs
deleted file mode 100644
index 3eade94ecc1..00000000000
--- a/src/EventStore.Transport.Http/EntityManagement/IHttpResponse.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Specialized;
-using System.IO;
-using System.Net;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
-
-namespace EventStore.Transport.Http.EntityManagement {
-	public interface IHttpResponse {
-		void AddHeader(string name, string value);
-		void Close();
-		long ContentLength64 { get; set; }
-		string ContentType { get; set; }
-		Stream OutputStream { get; }
-		int StatusCode { get; set; }
-		string StatusDescription { get; set; }
-	}
-}
diff --git a/src/EventStore.Transport.Http/EntityManagement/ManagerOperationState.cs b/src/EventStore.Transport.Http/EntityManagement/ManagerOperationState.cs
deleted file mode 100644
index 2734e733a6c..00000000000
--- a/src/EventStore.Transport.Http/EntityManagement/ManagerOperationState.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.IO;
-using EventStore.Common.Utils;
-
-namespace EventStore.Transport.Http.EntityManagement {
-	internal class ManagerOperationState : IDisposable {
-		public readonly Action<HttpEntityManager, byte[]> OnReadSuccess;
-		public readonly Action<Exception> OnError;
-
-		public readonly Stream InputStream;
-		public readonly Stream OutputStream;
-
-		public ManagerOperationState(Stream inputStream,
-			Stream outputStream,
-			Action<HttpEntityManager, byte[]> onReadSuccess,
-			Action<Exception> onError) {
-			Ensure.NotNull(inputStream, "inputStream");
-			Ensure.NotNull(outputStream, "outputStream");
-			Ensure.NotNull(onReadSuccess, "onReadSuccess");
-			Ensure.NotNull(onError, "onError");
-
-			InputStream = inputStream;
-			OutputStream = outputStream;
-			OnReadSuccess = onReadSuccess;
-			OnError = onError;
-		}
-
-		public void Dispose() {
-			IOStreams.SafelyDispose(InputStream, OutputStream);
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/EventStore.Transport.Http.csproj b/src/EventStore.Transport.Http/EventStore.Transport.Http.csproj
deleted file mode 100644
index b2082df78d8..00000000000
--- a/src/EventStore.Transport.Http/EventStore.Transport.Http.csproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-	</PropertyGroup>
-	<ItemGroup>
-		<FrameworkReference Include="Microsoft.AspNetCore.App" />
-		<PackageReference Include="Microsoft.Net.Http.Headers" Version="8.0.0" />
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\EventStore.BufferManagement\EventStore.BufferManagement.csproj" />
-		<ProjectReference Include="..\EventStore.Common\EventStore.Common.csproj" />
-	</ItemGroup>
-</Project>
diff --git a/src/EventStore.Transport.Http/HttpMethod.cs b/src/EventStore.Transport.Http/HttpMethod.cs
deleted file mode 100644
index 00a5899abbd..00000000000
--- a/src/EventStore.Transport.Http/HttpMethod.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace EventStore.Transport.Http {
-	public static class HttpMethod {
-		public const string Get = "GET";
-		public const string Post = "POST";
-		public const string Put = "PUT";
-		public const string Delete = "DELETE";
-		public const string Options = "OPTIONS";
-		public const string Head = "HEAD";
-		public const string Patch = "PATCH";
-	}
-}
diff --git a/src/EventStore.Transport.Http/HttpResponse.cs b/src/EventStore.Transport.Http/HttpResponse.cs
deleted file mode 100644
index dcd5e6d705f..00000000000
--- a/src/EventStore.Transport.Http/HttpResponse.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Linq;
-
-namespace EventStore.Transport.Http {
-	public class HttpResponse {
-		public string CharacterSet { get; private set; }
-
-		public string ContentEncoding { get; private set; }
-		public long ContentLength { get; private set; }
-		public string ContentType { get; private set; }
-
-		//public CookieCollection Cookies { get; private set; }
-		public HttpResponseHeaders Headers { get; private set; }
-
-		//public bool IsFromCache { get; private set; }
-		//public bool IsMutuallyAuthenticated { get; private set; }//TODO TR: not implemented in mono
-		//public DateTime LastModified { get; private set; }
-
-		public string Method { get; private set; }
-		//public Version ProtocolVersion { get; private set; }
-
-		//public Uri ResponseUri { get; private set; }
-		//public string Server { get; private set; }
-
-		public int HttpStatusCode { get; private set; }
-		public string StatusDescription { get; private set; }
-
-		public string Body { get; internal set; }
-
-		public HttpResponse(HttpResponseMessage responseMessage) {
-			ContentEncoding = responseMessage.Content.Headers.ContentEncoding.FirstOrDefault();
-			ContentLength = responseMessage.Content.Headers.ContentLength.Value;
-
-			if (responseMessage.Content.Headers.ContentType != null) {
-				CharacterSet = responseMessage.Content.Headers.ContentType.CharSet;
-				ContentType = responseMessage.Content.Headers.ContentType.MediaType;
-			}
-
-			//Cookies = httpWebResponse.Cookies;
-			Headers = responseMessage.Headers;
-
-			//IsFromCache = httpWebResponse.IsFromCache;
-			//IsMutuallyAuthenticated = httpWebResponse.IsMutuallyAuthenticated;
-
-			//LastModified = httpWebResponse.LastModified;
-
-			Method = responseMessage.RequestMessage.Method.ToString();
-			//ProtocolVersion = httpWebResponse.ProtocolVersion;
-
-			//ResponseUri = httpWebResponse.ResponseUri;
-			//Server = httpWebResponse.Server;
-
-			HttpStatusCode = (int)responseMessage.StatusCode;
-			StatusDescription = responseMessage.ReasonPhrase;
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/HttpStatusCode.cs b/src/EventStore.Transport.Http/HttpStatusCode.cs
deleted file mode 100644
index 62dd338d88c..00000000000
--- a/src/EventStore.Transport.Http/HttpStatusCode.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-namespace EventStore.Transport.Http {
-	public static class HttpStatusCode {
-		public const int Continue = (int)System.Net.HttpStatusCode.Continue;
-		public const int SwitchingProtocols = (int)System.Net.HttpStatusCode.SwitchingProtocols;
-		public const int OK = (int)System.Net.HttpStatusCode.OK;
-		public const int Created = (int)System.Net.HttpStatusCode.Created;
-		public const int Accepted = (int)System.Net.HttpStatusCode.Accepted;
-		public const int NonAuthoritativeInformation = (int)System.Net.HttpStatusCode.NonAuthoritativeInformation;
-		public const int NoContent = (int)System.Net.HttpStatusCode.NoContent;
-		public const int ResetContent = (int)System.Net.HttpStatusCode.ResetContent;
-		public const int PartialContent = (int)System.Net.HttpStatusCode.PartialContent;
-		public const int Ambiguous = (int)System.Net.HttpStatusCode.Ambiguous;
-		public const int MultipleChoices = (int)System.Net.HttpStatusCode.MultipleChoices;
-		public const int Moved = (int)System.Net.HttpStatusCode.Moved;
-		public const int MovedPermanently = (int)System.Net.HttpStatusCode.MovedPermanently;
-		public const int Found = (int)System.Net.HttpStatusCode.Found;
-		public const int Redirect = (int)System.Net.HttpStatusCode.Redirect;
-		public const int RedirectMethod = (int)System.Net.HttpStatusCode.RedirectMethod;
-		public const int SeeOther = (int)System.Net.HttpStatusCode.SeeOther;
-		public const int NotModified = (int)System.Net.HttpStatusCode.NotModified;
-		public const int UseProxy = (int)System.Net.HttpStatusCode.UseProxy;
-		public const int Unused = (int)System.Net.HttpStatusCode.Unused;
-		public const int RedirectKeepVerb = (int)System.Net.HttpStatusCode.RedirectKeepVerb;
-		public const int TemporaryRedirect = (int)System.Net.HttpStatusCode.TemporaryRedirect;
-		public const int BadRequest = (int)System.Net.HttpStatusCode.BadRequest;
-		public const int Unauthorized = (int)System.Net.HttpStatusCode.Unauthorized;
-		public const int PaymentRequired = (int)System.Net.HttpStatusCode.PaymentRequired;
-		public const int Forbidden = (int)System.Net.HttpStatusCode.Forbidden;
-		public const int NotFound = (int)System.Net.HttpStatusCode.NotFound;
-		public const int MethodNotAllowed = (int)System.Net.HttpStatusCode.MethodNotAllowed;
-		public const int NotAcceptable = (int)System.Net.HttpStatusCode.NotAcceptable;
-		public const int ProxyAuthenticationRequired = (int)System.Net.HttpStatusCode.ProxyAuthenticationRequired;
-		public const int RequestTimeout = (int)System.Net.HttpStatusCode.RequestTimeout;
-		public const int Conflict = (int)System.Net.HttpStatusCode.Conflict;
-		public const int Gone = (int)System.Net.HttpStatusCode.Gone;
-		public const int LengthRequired = (int)System.Net.HttpStatusCode.LengthRequired;
-		public const int PreconditionFailed = (int)System.Net.HttpStatusCode.PreconditionFailed;
-		public const int RequestEntityTooLarge = (int)System.Net.HttpStatusCode.RequestEntityTooLarge;
-		public const int RequestUriTooLong = (int)System.Net.HttpStatusCode.RequestUriTooLong;
-		public const int UnsupportedMediaType = (int)System.Net.HttpStatusCode.UnsupportedMediaType;
-		public const int RequestedRangeNotSatisfiable = (int)System.Net.HttpStatusCode.RequestedRangeNotSatisfiable;
-		public const int ExpectationFailed = (int)System.Net.HttpStatusCode.ExpectationFailed;
-		public const int InternalServerError = (int)System.Net.HttpStatusCode.InternalServerError;
-		public const int NotImplemented = (int)System.Net.HttpStatusCode.NotImplemented;
-		public const int BadGateway = (int)System.Net.HttpStatusCode.BadGateway;
-		public const int ServiceUnavailable = (int)System.Net.HttpStatusCode.ServiceUnavailable;
-		public const int GatewayTimeout = (int)System.Net.HttpStatusCode.GatewayTimeout;
-		public const int HttpVersionNotSupported = (int)System.Net.HttpStatusCode.HttpVersionNotSupported;
-	}
-}
diff --git a/src/EventStore.Transport.Http/ICodec.cs b/src/EventStore.Transport.Http/ICodec.cs
deleted file mode 100644
index bff5cad0999..00000000000
--- a/src/EventStore.Transport.Http/ICodec.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Text;
-
-namespace EventStore.Transport.Http {
-	public interface ICodec {
-		string ContentType { get; }
-		Encoding Encoding { get; }
-		bool CanParse(MediaType format);
-		bool SuitableForResponse(MediaType component);
-		bool HasEventIds { get; }
-		bool HasEventTypes { get; }
-		T From<T>(string text);
-		string To<T>(T value);
-	}
-}
diff --git a/src/EventStore.Transport.Http/IOStreams.cs b/src/EventStore.Transport.Http/IOStreams.cs
deleted file mode 100644
index 005baf37acc..00000000000
--- a/src/EventStore.Transport.Http/IOStreams.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.IO;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Transport.Http {
-	public class IOStreams {
-		private static readonly ILogger Log = Serilog.Log.ForContext<IOStreams>();
-
-		public static void SafelyDispose(params Stream[] streams) {
-			if (streams == null || streams.Length == 0)
-				return;
-
-			foreach (var stream in streams) {
-				try {
-					if (stream != null)
-						stream.Dispose();
-				} catch (Exception e) {
-					//Exceptions may be thrown when client shutdowned and we were unable to write all the data,
-					//Nothing we can do, ignore (another option - globally ignore write errors)
-					Log.Information("Error while closing stream : {e}", e.Message);
-				}
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/MediaType.cs b/src/EventStore.Transport.Http/MediaType.cs
deleted file mode 100644
index b15741b6c60..00000000000
--- a/src/EventStore.Transport.Http/MediaType.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System;
-using System.Globalization;
-using System.Text;
-using EventStore.Common.Utils;
-
-namespace EventStore.Transport.Http {
-	public class MediaType {
-		public readonly string Range;
-		public readonly string Type;
-		public readonly string Subtype;
-		public readonly float Priority;
-		public readonly bool EncodingSpecified;
-		public readonly Encoding Encoding;
-
-		public MediaType(string range, string type, string subtype, float priority, bool encodingSpecified,
-			Encoding encoding) {
-			Range = range;
-			Type = type;
-			Subtype = subtype;
-			Priority = priority;
-			EncodingSpecified = encodingSpecified;
-			Encoding = encoding;
-		}
-
-		public MediaType(string range, string type, string subtype, float priority)
-			: this(range, type, subtype, priority, false, null) {
-		}
-
-		public bool Matches(string mediaRange, Encoding encoding) {
-			if (EncodingSpecified)
-				return Range == mediaRange && Encoding.Equals(encoding);
-
-			return Range == mediaRange;
-		}
-
-		public static bool TryParse(string componentText, out MediaType result) {
-			return TryParseInternal(componentText, false, out result);
-		}
-
-		public static MediaType TryParse(string componentText) {
-			MediaType result;
-			return TryParseInternal(componentText, false, out result) ? result : null;
-		}
-
-		public static MediaType Parse(string componentText) {
-			MediaType result;
-			if (!TryParseInternal(componentText, true, out result))
-				throw new Exception("This should never happen!");
-			return result;
-		}
-
-		private static bool TryParseInternal(string componentText, bool throwExceptions, out MediaType result) {
-			result = null;
-
-			if (componentText == null) {
-				if (throwExceptions)
-					throw new ArgumentNullException("componentText");
-				return false;
-			}
-
-			if (componentText == "") {
-				if (throwExceptions)
-					throw new ArgumentException("componentText");
-				return false;
-			}
-
-			var priority = 1.0f; // default priority
-			var encodingSpecified = false;
-			Encoding encoding = null;
-
-			var parts = componentText.Split(';');
-			var mediaRange = parts[0];
-
-			var typeParts = mediaRange.Split(new[] {'/'}, 2);
-			if (typeParts.Length != 2) {
-				if (throwExceptions)
-					throw new ArgumentException("componentText");
-				return false;
-			}
-
-			var mediaType = typeParts[0];
-			var mediaSubtype = typeParts[1];
-
-			if (parts.Length > 1) {
-				for (var i = 1; i < parts.Length; i++) {
-					var part = parts[i].ToLowerInvariant().Trim();
-					if (part.StartsWith("q=")) {
-						var quality = part.Substring(2);
-						float q;
-						if (float.TryParse(quality, NumberStyles.Float, CultureInfo.InvariantCulture, out q)) {
-							priority = q;
-						}
-					} else if (part.StartsWith("charset=")) {
-						encodingSpecified = true;
-						try {
-							var encName = part.Substring(8);
-							encoding = encName.Equals("utf-8", StringComparison.OrdinalIgnoreCase)
-								? Helper.UTF8NoBom
-								: Encoding.GetEncoding(encName);
-						} catch (ArgumentException) {
-							encoding = null;
-						}
-					}
-				}
-			}
-
-			result = new MediaType(mediaRange, mediaType, mediaSubtype, priority, encodingSpecified, encoding);
-			return true;
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Http/ProxyHeaders.cs b/src/EventStore.Transport.Http/ProxyHeaders.cs
deleted file mode 100644
index b7213ae406b..00000000000
--- a/src/EventStore.Transport.Http/ProxyHeaders.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace EventStore.Transport.Http {
-	public static class ProxyHeaders {
-		public const string XForwardedPort = "X-Forwarded-Port";
-		public const string XForwardedProto = "X-Forwarded-Proto";
-		public const string XForwardedHost = "X-Forwarded-Host";
-		public const string XForwardedPrefix = "X-Forwarded-Prefix";
-	}
-
-	public static class ProxyHeaderValues {
-		public const string XForwardedProtoHttp = "http";
-		public const string XForwardedProtoHttps = "https";
-	}
-}
diff --git a/src/EventStore.Transport.Http/WebRequestExtensions.cs b/src/EventStore.Transport.Http/WebRequestExtensions.cs
deleted file mode 100644
index b457b1c632e..00000000000
--- a/src/EventStore.Transport.Http/WebRequestExtensions.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Net;
-
-namespace EventStore.Transport.Http {
-	public static class WebRequestExtensions {
-		public static WebResponse EndGetResponseExtended(this WebRequest request, IAsyncResult asyncResult) {
-			try {
-				return request.EndGetResponse(asyncResult);
-			} catch (WebException e) {
-				if (e.Response != null)
-					return e.Response; //for 404 and 500
-
-				throw;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Tcp/EventStore.Transport.Tcp.csproj b/src/EventStore.Transport.Tcp/EventStore.Transport.Tcp.csproj
deleted file mode 100644
index 069ee6f2425..00000000000
--- a/src/EventStore.Transport.Tcp/EventStore.Transport.Tcp.csproj
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-	</PropertyGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\EventStore.BufferManagement\EventStore.BufferManagement.csproj" />
-		<ProjectReference Include="..\EventStore.Common\EventStore.Common.csproj" />
-	</ItemGroup>
-	<ItemGroup />
-</Project>
diff --git a/src/EventStore.Transport.Tcp/Formatting/FormatterBase.cs b/src/EventStore.Transport.Tcp/Formatting/FormatterBase.cs
deleted file mode 100644
index 1f9dc87fe4f..00000000000
--- a/src/EventStore.Transport.Tcp/Formatting/FormatterBase.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using System.IO;
-using EventStore.BufferManagement;
-
-namespace EventStore.Transport.Tcp.Formatting {
-	public abstract class FormatterBase<T> : IMessageFormatter<T> {
-		/// <summary>
-		/// Gets a <see cref="BufferPool"></see> representing the IMessage provided.
-		/// </summary>
-		/// <param name="message">The message.</param>
-		/// <returns>A <see cref="BufferPool"></see> with a representation of the message</returns>
-		public abstract BufferPool ToBufferPool(T message);
-
-		/// <summary>
-		/// converts the message to a <see cref="ArraySegment{T}"></see>
-		/// </summary>
-		/// <param name="message">The message.</param>
-		/// <returns></returns>
-		public virtual ArraySegment<byte> ToArraySegment(T message) {
-			return new ArraySegment<byte>(ToArray(message));
-		}
-
-		/// <summary>
-		/// Converts the message to a byte array
-		/// </summary>
-		/// <param name="message">The message.</param>
-		/// <returns></returns>
-		public virtual byte[] ToArray(T message) {
-			using (BufferPool pool = ToBufferPool(message)) {
-				return pool.ToByteArray();
-			}
-		}
-
-		/// <summary>
-		/// Gets a message from a <see cref="BufferPool"/>
-		/// </summary>
-		/// <param name="bufferPool">The BufferPool to get data from.</param>
-		/// <returns></returns>
-		public virtual T From(BufferPool bufferPool) {
-			if (bufferPool == null)
-				throw new ArgumentNullException("bufferPool");
-			var stream = new BufferPoolStream(bufferPool);
-			return From(stream);
-		}
-
-		/// <summary>
-		/// Gets a message from a <see cref="ArraySegment{Byte}"></see>
-		/// </summary>
-		/// <param name="segment">The segment containing the raw data.</param>
-		/// <returns></returns>
-		public virtual T From(ArraySegment<byte> segment) {
-			using (var stream = new MemoryStream(segment.Array, segment.Offset, segment.Count, false)) {
-				return From(stream);
-			}
-		}
-
-		/// <summary>
-		/// Gets a message from a byte array
-		/// </summary>
-		/// <param name="array">The byte array.</param>
-		/// <returns></returns>
-		public virtual T From(byte[] array) {
-			if (array == null)
-				throw new ArgumentNullException("array");
-			using (var stream = new MemoryStream(array, 0, array.Length, false)) {
-				return From(stream);
-			}
-		}
-
-		/// <summary>
-		/// Creates a message object from the specified stream
-		/// </summary>
-		/// <param name="stream">The stream.</param>
-		/// <returns></returns>
-		public abstract T From(Stream stream);
-	}
-}
diff --git a/src/EventStore.Transport.Tcp/Formatting/IMessageFormatter.cs b/src/EventStore.Transport.Tcp/Formatting/IMessageFormatter.cs
deleted file mode 100644
index b5d83d0eacd..00000000000
--- a/src/EventStore.Transport.Tcp/Formatting/IMessageFormatter.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using EventStore.BufferManagement;
-
-namespace EventStore.Transport.Tcp.Formatting {
-	public interface IMessageFormatter<T> {
-		/// <summary>
-		/// Converts the object to a <see cref="BufferPool"></see> representing a binary format of it.
-		/// </summary>
-		/// <param name="message">The message to convert.</param>
-		/// <returns>A <see cref="BufferPool"></see> containing the data representing the object.</returns>
-		BufferPool ToBufferPool(T message);
-
-		/// <summary>
-		/// Converts the object to a <see cref="ArraySegment{Byte}"></see> representing a binary format of it.
-		/// </summary>
-		/// <param name="message">The message to convert.</param>
-		/// <returns>A <see cref="BufferPool"></see> containing the data representing the object.</returns>
-		ArraySegment<byte> ToArraySegment(T message);
-
-		/// <summary>
-		/// Converts the object to a byte array representing a binary format of it.
-		/// </summary>
-		/// <param name="message">The message to convert.</param>
-		/// <returns>A <see cref="BufferPool"></see> containing the data representing the object.</returns>
-		byte[] ToArray(T message);
-
-		/// <summary>
-		/// Takes a <see cref="BufferPool"></see> and converts its contents to a message object
-		/// </summary>
-		/// <param name="bufferPool">The buffer pool.</param>
-		/// <returns>A message representing the data given</returns>
-		T From(BufferPool bufferPool);
-
-		/// <summary>
-		/// Takes an ArraySegment and converts its contents to a message object
-		/// </summary>
-		/// <param name="segment">The buffer pool.</param>
-		/// <returns>A message representing the data given</returns>
-		T From(ArraySegment<byte> segment);
-
-		/// <summary>
-		/// Takes an Array and converts its contents to a message object
-		/// </summary>
-		/// <param name="array">The buffer pool.</param>
-		/// <returns>A message representing the data given</returns>
-		T From(byte[] array);
-	}
-}
diff --git a/src/EventStore.Transport.Tcp/Formatting/RawMessageFormatter.cs b/src/EventStore.Transport.Tcp/Formatting/RawMessageFormatter.cs
deleted file mode 100644
index 333b3bdab19..00000000000
--- a/src/EventStore.Transport.Tcp/Formatting/RawMessageFormatter.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using EventStore.BufferManagement;
-
-namespace EventStore.Transport.Tcp.Formatting {
-	/// <summary>
-	/// Formatter which does not format anything, actually. Just outputs raw byte[].
-	/// </summary>
-	public class RawMessageFormatter : IMessageFormatter<byte[]> {
-		private readonly BufferManager _bufferManager;
-		private readonly int _initialBuffers;
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="RawMessageFormatter"/> class.
-		/// </summary>
-		public RawMessageFormatter() : this(BufferManager.Default, 2) {
-		}
-
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="RawMessageFormatter"/> class.
-		/// </summary>
-		/// <param name="bufferManager">The buffer manager.</param>
-		public RawMessageFormatter(BufferManager bufferManager) : this(bufferManager, 2) {
-		}
-
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="RawMessageFormatter"/> class.
-		/// </summary>
-		/// <param name="bufferManager">The buffer manager.</param>
-		/// <param name="initialBuffers">The number of initial buffers.</param>
-		public RawMessageFormatter(BufferManager bufferManager, int initialBuffers) {
-			_bufferManager = bufferManager;
-			_initialBuffers = initialBuffers;
-		}
-
-		public BufferPool ToBufferPool(byte[] message) {
-			if (message == null) throw new ArgumentNullException("message");
-
-			var bufferPool = new BufferPool(_initialBuffers, _bufferManager);
-			var stream = new BufferPoolStream(bufferPool);
-			stream.Write(message, 0, message.Length);
-			return bufferPool;
-		}
-
-		public ArraySegment<byte> ToArraySegment(byte[] message) {
-			if (message == null) throw new ArgumentNullException("message");
-			return new ArraySegment<byte>(message, 0, message.Length);
-		}
-
-		public byte[] ToArray(byte[] message) {
-			if (message == null) throw new ArgumentNullException("message");
-			return message;
-		}
-
-		public byte[] From(BufferPool bufferPool) {
-			return bufferPool.ToByteArray();
-		}
-
-		public byte[] From(ArraySegment<byte> segment) {
-			var msg = new byte[segment.Count];
-			Buffer.BlockCopy(segment.Array, segment.Offset, msg, 0, segment.Count);
-			return msg;
-		}
-
-		public byte[] From(byte[] array) {
-			return array;
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Tcp/Framing/IMessageFramer.cs b/src/EventStore.Transport.Tcp/Framing/IMessageFramer.cs
deleted file mode 100644
index 24aad733147..00000000000
--- a/src/EventStore.Transport.Tcp/Framing/IMessageFramer.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace EventStore.Transport.Tcp.Framing {
-	/// <summary>
-	/// Encodes outgoing messages in frames and decodes incoming frames. 
-	/// For decoding it uses an internal state, raising a registered 
-	/// callback, once full message arrives
-	/// </summary>
-	public interface IMessageFramer<TMessage> {
-		bool HasData { get; }
-		IEnumerable<ArraySegment<byte>> FrameData(ArraySegment<byte> data);
-		void UnFrameData(IEnumerable<ArraySegment<byte>> data);
-		void UnFrameData(ArraySegment<byte> data);
-		void RegisterMessageArrivedCallback(Action<TMessage> handler);
-		void Reset();
-	}
-}
diff --git a/src/EventStore.Transport.Tcp/Framing/LengthPrefixMessageFramer.cs b/src/EventStore.Transport.Tcp/Framing/LengthPrefixMessageFramer.cs
deleted file mode 100644
index e0b353bb1db..00000000000
--- a/src/EventStore.Transport.Tcp/Framing/LengthPrefixMessageFramer.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.Common.Utils;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Transport.Tcp.Framing {
-	/// <summary>
-	/// Uses length-prefixed framing to encode outgoing messages and decode
-	/// incoming messages, using internal state and raising a callback once 
-	/// full message arrives.
-	/// </summary>
-	public class LengthPrefixMessageFramer : IMessageFramer<ArraySegment<byte>> {
-		private static readonly ILogger Log = Serilog.Log.ForContext<LengthPrefixMessageFramer>();
-
-		public const int HeaderLength = sizeof(Int32);
-
-		private byte[] _messageBuffer;
-		private int _bufferIndex = 0;
-		private Action<ArraySegment<byte>> _receivedHandler;
-		private readonly int _maxPackageSize;
-
-		private int _headerBytes = 0;
-		private int _packageLength = 0;
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="LengthPrefixMessageFramer"/> class.
-		/// </summary>
-		public LengthPrefixMessageFramer(int maxPackageSize = 64 * 1024 * 1024) {
-			Ensure.Positive(maxPackageSize, "maxPackageSize");
-			_maxPackageSize = maxPackageSize;
-		}
-
-		public bool HasData => _headerBytes > 0;
-
-		public void Reset() {
-			_messageBuffer = null;
-			_headerBytes = 0;
-			_packageLength = 0;
-			_bufferIndex = 0;
-		}
-
-		public void UnFrameData(IEnumerable<ArraySegment<byte>> data) {
-			if (data == null)
-				throw new ArgumentNullException("data");
-
-			foreach (ArraySegment<byte> buffer in data) {
-				Parse(buffer);
-			}
-		}
-
-		public void UnFrameData(ArraySegment<byte> data) {
-			Parse(data);
-		}
-
-		/// <summary>
-		/// Parses a stream chunking based on length-prefixed framing. 
-		/// Calls are re-entrant and hold state internally. Once full message arrives,
-		/// callback is raised (it is registered via <see cref="RegisterMessageArrivedCallback"/>
-		/// </summary>
-		/// <param name="bytes">A byte array of data to append</param>
-		private void Parse(ArraySegment<byte> bytes) {
-			byte[] data = bytes.Array;
-			for (int i = bytes.Offset, n = bytes.Offset + bytes.Count; i < n; i++) {
-				if (_headerBytes < HeaderLength) {
-					_packageLength |= (data[i] << (_headerBytes * 8)); // little-endian order
-					++_headerBytes;
-					if (_headerBytes == HeaderLength) {
-						if (_packageLength <= 0 || _packageLength > _maxPackageSize) {
-							Log.Error("FRAMING ERROR! Data:\n {data}", Common.Utils.Helper.FormatBinaryDump(bytes));
-							throw new PackageFramingException(string.Format(
-								"Package size is out of bounds: {0} (max: {1}).",
-								_packageLength, _maxPackageSize));
-						}
-
-						_messageBuffer = new byte[_packageLength];
-					}
-				} else {
-					int copyCnt = Math.Min(bytes.Count + bytes.Offset - i, _packageLength - _bufferIndex);
-					Buffer.BlockCopy(bytes.Array, i, _messageBuffer, _bufferIndex, copyCnt);
-					_bufferIndex += copyCnt;
-					i += copyCnt - 1;
-
-					if (_bufferIndex == _packageLength) {
-						if (_receivedHandler != null)
-							_receivedHandler(new ArraySegment<byte>(_messageBuffer, 0, _bufferIndex));
-						_messageBuffer = null;
-						_headerBytes = 0;
-						_packageLength = 0;
-						_bufferIndex = 0;
-					}
-				}
-			}
-		}
-
-		public IEnumerable<ArraySegment<byte>> FrameData(ArraySegment<byte> data) {
-			var length = data.Count;
-
-			yield return new ArraySegment<byte>(
-				new[] {(byte)length, (byte)(length >> 8), (byte)(length >> 16), (byte)(length >> 24)});
-			yield return data;
-		}
-
-		public void RegisterMessageArrivedCallback(Action<ArraySegment<byte>> handler) {
-			Ensure.NotNull(handler, nameof(handler));
-			_receivedHandler = handler;
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Tcp/Framing/LengthPrefixMessageFramerWithBufferPool.cs b/src/EventStore.Transport.Tcp/Framing/LengthPrefixMessageFramerWithBufferPool.cs
deleted file mode 100644
index bdf65f8dd2d..00000000000
--- a/src/EventStore.Transport.Tcp/Framing/LengthPrefixMessageFramerWithBufferPool.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EventStore.BufferManagement;
-using EventStore.Common.Utils;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Transport.Tcp.Framing {
-	public class LengthPrefixMessageFramerWithBufferPool {
-		private static readonly ILogger Log = Serilog.Log.ForContext<LengthPrefixMessageFramerWithBufferPool>();
-
-		private const int PrefixLength = sizeof(int);
-
-		private readonly int _maxPackageSize;
-		private readonly BufferManager _bufferManager;
-		private BufferPool _messageBuffer;
-		private Action<BufferPool> _receivedHandler;
-
-		private int _headerBytes;
-		private int _packageLength;
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="LengthPrefixMessageFramerWithBufferPool"/> class.
-		/// </summary>
-		public LengthPrefixMessageFramerWithBufferPool(BufferManager bufferManager,
-			int maxPackageSize = 16 * 1024 * 1024) {
-			Ensure.NotNull(bufferManager, "bufferManager");
-			Ensure.Positive(maxPackageSize, "maxPackageSize");
-			_bufferManager = bufferManager;
-			_maxPackageSize = maxPackageSize;
-		}
-
-		public void Reset() {
-			_messageBuffer = null;
-			_headerBytes = 0;
-			_packageLength = 0;
-		}
-
-		public void UnFrameData(IEnumerable<ArraySegment<byte>> data) {
-			if (data == null)
-				throw new ArgumentNullException("data");
-
-			foreach (ArraySegment<byte> buffer in data) {
-				Parse(buffer);
-			}
-		}
-
-		public void UnFrameData(ArraySegment<byte> data) {
-			Parse(data);
-		}
-
-		/// <summary>
-		/// Parses a stream chunking based on length-prefixed framing. Calls are re-entrant and hold state internally.
-		/// </summary>
-		/// <param name="bytes">A byte array of data to append</param>
-		private void Parse(ArraySegment<byte> bytes) {
-			byte[] data = bytes.Array;
-			for (int i = bytes.Offset; i < bytes.Offset + bytes.Count;) {
-				if (_headerBytes < PrefixLength) {
-					_packageLength |= (data[i] << (_headerBytes * 8)); // little-endian order
-					++_headerBytes;
-					i += 1;
-					if (_headerBytes == PrefixLength) {
-						if (_packageLength <= 0 || _packageLength > _maxPackageSize) {
-							Log.Error("FRAMING ERROR! Data:\n {data}", Common.Utils.Helper.FormatBinaryDump(bytes));
-							throw new PackageFramingException(string.Format(
-								"Package size is out of bounds: {0} (max: {1}).",
-								_packageLength, _maxPackageSize));
-						}
-
-						_messageBuffer = new BufferPool(_bufferManager);
-					}
-				} else {
-					int copyCnt = Math.Min(bytes.Count + bytes.Offset - i, _packageLength - _messageBuffer.Length);
-					_messageBuffer.Append(bytes.Array, i, copyCnt);
-					i += copyCnt;
-
-					if (_messageBuffer.Length == _packageLength) {
-						if (_receivedHandler != null)
-							_receivedHandler(_messageBuffer);
-						_messageBuffer = null;
-						_headerBytes = 0;
-						_packageLength = 0;
-					}
-				}
-			}
-		}
-
-		public IEnumerable<ArraySegment<byte>> FrameData(ArraySegment<byte> data) {
-			var length = data.Count;
-
-			yield return new ArraySegment<byte>(
-				new[] {(byte)length, (byte)(length >> 8), (byte)(length >> 16), (byte)(length >> 24)});
-			yield return data;
-		}
-
-		public void RegisterMessageArrivedCallback(Action<BufferPool> handler) {
-			if (handler == null)
-				throw new ArgumentNullException("handler");
-
-			_receivedHandler = handler;
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Tcp/Framing/PackageFramingException.cs b/src/EventStore.Transport.Tcp/Framing/PackageFramingException.cs
deleted file mode 100644
index 8d0f6a83541..00000000000
--- a/src/EventStore.Transport.Tcp/Framing/PackageFramingException.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-using System.Runtime.Serialization;
-
-namespace EventStore.Transport.Tcp.Framing {
-	public class PackageFramingException : Exception {
-		public PackageFramingException(string message) : base(message) {
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Tcp/Helper.cs b/src/EventStore.Transport.Tcp/Helper.cs
deleted file mode 100644
index 34049256696..00000000000
--- a/src/EventStore.Transport.Tcp/Helper.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using EventStore.Common.Utils;
-
-namespace EventStore.Transport.Tcp {
-	internal static class Helper {
-		public static void EatException(Action action) {
-			try {
-				action();
-			} catch (Exception) {
-			}
-		}
-
-		public static T EatException<T>(Func<T> func, T defaultValue = default(T)) {
-			Ensure.NotNull(func, "func");
-			try {
-				return func();
-			} catch (Exception) {
-				return defaultValue;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Tcp/IMonitoredTcpConnection.cs b/src/EventStore.Transport.Tcp/IMonitoredTcpConnection.cs
deleted file mode 100644
index dac19f1478b..00000000000
--- a/src/EventStore.Transport.Tcp/IMonitoredTcpConnection.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-
-namespace EventStore.Transport.Tcp {
-	public interface IMonitoredTcpConnection {
-		bool IsReadyForSend { get; }
-		bool IsReadyForReceive { get; }
-		bool IsInitialized { get; }
-		bool IsFaulted { get; }
-		bool IsClosed { get; }
-
-		bool InSend { get; }
-		bool InReceive { get; }
-
-		DateTime? LastSendStarted { get; }
-		DateTime? LastReceiveStarted { get; }
-
-		int PendingSendBytes { get; }
-		int InSendBytes { get; }
-		int PendingReceivedBytes { get; }
-
-		long TotalBytesSent { get; }
-		long TotalBytesReceived { get; }
-	}
-}
diff --git a/src/EventStore.Transport.Tcp/ITcpConnection.cs b/src/EventStore.Transport.Tcp/ITcpConnection.cs
deleted file mode 100644
index ca8169b8958..00000000000
--- a/src/EventStore.Transport.Tcp/ITcpConnection.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Sockets;
-
-namespace EventStore.Transport.Tcp {
-	public interface ITcpConnection {
-		event Action<ITcpConnection, SocketError> ConnectionClosed;
-
-		Guid ConnectionId { get; }
-		string ClientConnectionName { get; }
-		IPEndPoint RemoteEndPoint { get; }
-		IPEndPoint LocalEndPoint { get; }
-		int SendQueueSize { get; }
-		int PendingSendBytes { get; }
-		long TotalBytesSent { get; }
-		long TotalBytesReceived { get; }
-		bool IsClosed { get; }
-
-		void ReceiveAsync(Action<ITcpConnection, IEnumerable<ArraySegment<byte>>> callback);
-		void EnqueueSend(IEnumerable<ArraySegment<byte>> data);
-		void Close(string reason);
-		void SetClientConnectionName(string clientConnectionName);
-	}
-}
diff --git a/src/EventStore.Transport.Tcp/SocketArgsPool.cs b/src/EventStore.Transport.Tcp/SocketArgsPool.cs
deleted file mode 100644
index 964702245d9..00000000000
--- a/src/EventStore.Transport.Tcp/SocketArgsPool.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Net.Sockets;
-
-namespace EventStore.Transport.Tcp {
-	internal class SocketArgsPool {
-		public readonly string Name;
-
-		private readonly Func<SocketAsyncEventArgs> _socketArgsCreator;
-
-		private readonly ConcurrentStack<SocketAsyncEventArgs> _socketArgsPool =
-			new ConcurrentStack<SocketAsyncEventArgs>();
-
-		public SocketArgsPool(string name, int initialCount, Func<SocketAsyncEventArgs> socketArgsCreator) {
-			if (socketArgsCreator == null)
-				throw new ArgumentNullException("socketArgsCreator");
-			if (initialCount < 0)
-				throw new ArgumentOutOfRangeException("initialCount");
-
-			Name = name;
-			_socketArgsCreator = socketArgsCreator;
-
-			for (int i = 0; i < initialCount; ++i) {
-				_socketArgsPool.Push(socketArgsCreator());
-			}
-		}
-
-		public SocketAsyncEventArgs Get() {
-			SocketAsyncEventArgs result;
-			if (_socketArgsPool.TryPop(out result))
-				return result;
-			return _socketArgsCreator();
-		}
-
-		public void Return(SocketAsyncEventArgs socketArgs) {
-			_socketArgsPool.Push(socketArgs);
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Tcp/TcpClientConnector.cs b/src/EventStore.Transport.Tcp/TcpClientConnector.cs
deleted file mode 100644
index 1d5c8ed55d3..00000000000
--- a/src/EventStore.Transport.Tcp/TcpClientConnector.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Net;
-using System.Net.Security;
-using System.Net.Sockets;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading;
-using EventStore.Common.Utils;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Transport.Tcp {
-	public class TcpClientConnector {
-		private const int CheckPeriodMs = 200;
-
-		private readonly SocketArgsPool _connectSocketArgsPool;
-		private readonly ConcurrentDictionary<Guid, PendingConnection> _pendingConections;
-		private readonly Timer _timer;
-
-		private static readonly ILogger Log = Serilog.Log.ForContext<TcpClientConnector>();
-
-		public TcpClientConnector() {
-			_connectSocketArgsPool = new SocketArgsPool("TcpClientConnector._connectSocketArgsPool",
-				TcpConfiguration.ConnectPoolSize,
-				CreateConnectSocketArgs);
-			_pendingConections = new ConcurrentDictionary<Guid, PendingConnection>();
-			_timer = new Timer(TimerCallback);
-			// prevent possible null reference exceptions in case of slow initialization
-			_timer.Change(CheckPeriodMs, Timeout.Infinite);
-		}
-
-		private SocketAsyncEventArgs CreateConnectSocketArgs() {
-			var socketArgs = new SocketAsyncEventArgs();
-			socketArgs.Completed += ConnectCompleted;
-			socketArgs.UserToken = new CallbacksStateToken();
-			return socketArgs;
-		}
-
-		public ITcpConnection ConnectTo(Guid connectionId,
-			IPEndPoint remoteEndPoint,
-			TimeSpan connectionTimeout,
-			Action<ITcpConnection> onConnectionEstablished = null,
-			Action<ITcpConnection, SocketError> onConnectionFailed = null,
-			bool verbose = true) {
-			Ensure.NotNull(remoteEndPoint, "remoteEndPoint");
-			return TcpConnection.CreateConnectingTcpConnection(connectionId, remoteEndPoint, this, connectionTimeout,
-				onConnectionEstablished, onConnectionFailed, verbose);
-		}
-
-		public ITcpConnection ConnectSslTo(Guid connectionId,
-			string targetHost,
-			string[] otherNames,
-			IPEndPoint remoteEndPoint,
-			TimeSpan connectionTimeout,
-			CertificateDelegates.ServerCertificateValidator sslServerCertValidator,
-			Func<X509CertificateCollection> clientCertificatesSelector,
-			Action<ITcpConnection> onConnectionEstablished = null,
-			Action<ITcpConnection, SocketError> onConnectionFailed = null,
-			bool verbose = true) {
-			Ensure.NotNull(remoteEndPoint, "remoteEndPoint");
-			return TcpConnectionSsl.CreateConnectingConnection(connectionId, targetHost, otherNames, remoteEndPoint, sslServerCertValidator,
-				clientCertificatesSelector, this, connectionTimeout, onConnectionEstablished, onConnectionFailed, verbose);
-		}
-
-		internal void InitConnect(IPEndPoint serverEndPoint,
-			Action<Socket> onSocketAssigned,
-			Action<IPEndPoint, Socket> onConnectionEstablished,
-			Action<IPEndPoint, SocketError> onConnectionFailed,
-			ITcpConnection connection,
-			TimeSpan connectionTimeout) {
-			if (serverEndPoint == null)
-				throw new ArgumentNullException("serverEndPoint");
-			if (onSocketAssigned == null)
-				throw new ArgumentNullException("onSocketAssigned");
-			if (onConnectionEstablished == null)
-				throw new ArgumentNullException("onConnectionEstablished");
-			if (onConnectionFailed == null)
-				throw new ArgumentNullException("onConnectionFailed");
-
-			var socketArgs = _connectSocketArgsPool.Get();
-			var connectingSocket = new Socket(serverEndPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
-			onSocketAssigned(connectingSocket);
-			socketArgs.RemoteEndPoint = serverEndPoint;
-			socketArgs.AcceptSocket = connectingSocket;
-			var callbacks = (CallbacksStateToken)socketArgs.UserToken;
-			callbacks.OnConnectionEstablished = onConnectionEstablished;
-			callbacks.OnConnectionFailed = onConnectionFailed;
-			callbacks.PendingConnection = new PendingConnection(connection, DateTime.UtcNow.Add(connectionTimeout));
-
-			AddToConnecting(callbacks.PendingConnection);
-
-			try {
-				var firedAsync = connectingSocket.ConnectAsync(socketArgs);
-				if (!firedAsync)
-					ProcessConnect(socketArgs);
-			} catch (ObjectDisposedException) {
-				HandleBadConnect(socketArgs);
-			}
-		}
-
-		private void ConnectCompleted(object sender, SocketAsyncEventArgs e) {
-			ProcessConnect(e);
-		}
-
-		private void ProcessConnect(SocketAsyncEventArgs e) {
-			if (e.SocketError != SocketError.Success)
-				HandleBadConnect(e);
-			else
-				OnSocketConnected(e);
-		}
-
-		private void HandleBadConnect(SocketAsyncEventArgs socketArgs) {
-			var serverEndPoint = socketArgs.RemoteEndPoint;
-			var socketError = socketArgs.SocketError;
-			var callbacks = (CallbacksStateToken)socketArgs.UserToken;
-			var onConnectionFailed = callbacks.OnConnectionFailed;
-			var pendingConnection = callbacks.PendingConnection;
-
-			Helper.EatException(() => socketArgs.AcceptSocket.Close());
-			socketArgs.AcceptSocket = null;
-			callbacks.Reset();
-			_connectSocketArgsPool.Return(socketArgs);
-
-			if (RemoveFromConnecting(pendingConnection))
-				onConnectionFailed((IPEndPoint)serverEndPoint, socketError);
-		}
-
-		private void OnSocketConnected(SocketAsyncEventArgs socketArgs) {
-			var remoteEndPoint = (IPEndPoint)socketArgs.RemoteEndPoint;
-			var socket = socketArgs.AcceptSocket;
-			var callbacks = (CallbacksStateToken)socketArgs.UserToken;
-			var onConnectionEstablished = callbacks.OnConnectionEstablished;
-			var pendingConnection = callbacks.PendingConnection;
-
-			socketArgs.AcceptSocket = null;
-			callbacks.Reset();
-			_connectSocketArgsPool.Return(socketArgs);
-
-			if (RemoveFromConnecting(pendingConnection))
-				onConnectionEstablished(remoteEndPoint, socket);
-		}
-
-		private void TimerCallback(object state) {
-			foreach (var pendingConnection in _pendingConections.Values) {
-				if (DateTime.UtcNow >= pendingConnection.WhenToKill && RemoveFromConnecting(pendingConnection))
-					Helper.EatException(() => pendingConnection.Connection.Close("Connection establishment timeout."));
-			}
-
-			try {
-				_timer.Change(CheckPeriodMs, Timeout.Infinite);
-			} catch (ObjectDisposedException) {
-				// ignore
-			}
-		}
-
-		private void AddToConnecting(PendingConnection pendingConnection) {
-			_pendingConections.TryAdd(pendingConnection.Connection.ConnectionId, pendingConnection);
-		}
-
-		private bool RemoveFromConnecting(PendingConnection pendingConnection) {
-			PendingConnection conn;
-			if (pendingConnection.Connection == null) {
-				Log.Warning("Network Card disconnected");
-				return false;
-			}
-
-			return _pendingConections.TryRemove(pendingConnection.Connection.ConnectionId, out conn)
-			       && Interlocked.CompareExchange(ref conn.Done, 1, 0) == 0;
-		}
-
-		private class CallbacksStateToken {
-			public Action<IPEndPoint, Socket> OnConnectionEstablished;
-			public Action<IPEndPoint, SocketError> OnConnectionFailed;
-			public PendingConnection PendingConnection;
-
-			public void Reset() {
-				OnConnectionEstablished = null;
-				OnConnectionFailed = null;
-				PendingConnection = null;
-			}
-		}
-
-		private class PendingConnection {
-			public readonly ITcpConnection Connection;
-			public readonly DateTime WhenToKill;
-			public int Done;
-
-			public PendingConnection(ITcpConnection connection, DateTime whenToKill) {
-				Connection = connection;
-				WhenToKill = whenToKill;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Tcp/TcpConfiguration.cs b/src/EventStore.Transport.Tcp/TcpConfiguration.cs
deleted file mode 100644
index db57c5bc6b1..00000000000
--- a/src/EventStore.Transport.Tcp/TcpConfiguration.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace EventStore.Transport.Tcp {
-	public static class TcpConfiguration {
-		public const int SocketCloseTimeoutSecs = 1;
-
-		public const int AcceptBacklogCount = 128;
-		public const int ConcurrentAccepts = 1;
-		public const int AcceptPoolSize = ConcurrentAccepts * 2;
-
-		public const int ConnectPoolSize = 32;
-		public const int SendReceivePoolSize = 512;
-
-		public const int BufferChunksCount = 512;
-		public const int SocketBufferSize = 8 * 1024;
-	}
-}
diff --git a/src/EventStore.Transport.Tcp/TcpConnection.cs b/src/EventStore.Transport.Tcp/TcpConnection.cs
deleted file mode 100644
index b1866b77c93..00000000000
--- a/src/EventStore.Transport.Tcp/TcpConnection.cs
+++ /dev/null
@@ -1,436 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using System.Threading;
-using EventStore.BufferManagement;
-using EventStore.Common.Utils;
-using System.Collections.Concurrent;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Transport.Tcp {
-	public class TcpConnection : TcpConnectionBase, ITcpConnection {
-		internal const int MaxSendPacketSize = 65535 /*Max IP packet size*/ - 20 /*IP packet header size*/ - 32 /*TCP min header size*/;
-
-		internal static readonly BufferManager BufferManager =
-			new BufferManager(TcpConfiguration.BufferChunksCount, TcpConfiguration.SocketBufferSize);
-
-		private static readonly ILogger Log = Serilog.Log.ForContext<TcpConnection>();
-
-		private static readonly SocketArgsPool SocketArgsPool = new SocketArgsPool("TcpConnection.SocketArgsPool",
-			TcpConfiguration.SendReceivePoolSize,
-			() => new SocketAsyncEventArgs());
-
-		public static ITcpConnection CreateConnectingTcpConnection(Guid connectionId,
-			IPEndPoint remoteEndPoint,
-			TcpClientConnector connector,
-			TimeSpan connectionTimeout,
-			Action<ITcpConnection> onConnectionEstablished,
-			Action<ITcpConnection, SocketError> onConnectionFailed,
-			bool verbose) {
-			var connection = new TcpConnection(connectionId, remoteEndPoint, verbose);
-// ReSharper disable ImplicitlyCapturedClosure
-			connector.InitConnect(remoteEndPoint,
-				(socket) => {
-					connection.InitSocket(socket);
-				},
-				(_, socket) => {
-					connection.InitSendReceive();
-					if (onConnectionEstablished != null)
-						onConnectionEstablished(connection);
-				},
-				(_, socketError) => {
-					if (onConnectionFailed != null)
-						onConnectionFailed(connection, socketError);
-				}, connection, connectionTimeout);
-// ReSharper restore ImplicitlyCapturedClosure
-			return connection;
-		}
-
-		public static ITcpConnection CreateAcceptedTcpConnection(Guid connectionId, IPEndPoint remoteEndPoint,
-			Socket socket, bool verbose) {
-			var connection = new TcpConnection(connectionId, remoteEndPoint, verbose);
-			connection.InitSocket(socket);
-			connection.InitSendReceive();
-			return connection;
-		}
-
-		public event Action<ITcpConnection, SocketError> ConnectionClosed;
-
-		public Guid ConnectionId {
-			get { return _connectionId; }
-		}
-
-		public int SendQueueSize {
-			get { return _sendQueue.Count; }
-		}
-
-		public string ClientConnectionName {
-			get { return _clientConnectionName; }
-		}
-
-		private readonly Guid _connectionId;
-		private readonly bool _verbose;
-		private string _clientConnectionName;
-
-		private Socket _socket;
-		private SocketAsyncEventArgs _receiveSocketArgs;
-		private SocketAsyncEventArgs _sendSocketArgs;
-
-		private readonly ConcurrentQueueWrapper<ArraySegment<byte>> _sendQueue =
-			new ConcurrentQueueWrapper<ArraySegment<byte>>();
-
-		private readonly Queue<ReceivedData> _receiveQueue = new Queue<ReceivedData>();
-		private readonly MemoryStream _memoryStream = new MemoryStream();
-		private long _memoryStreamOffset = 0L;
-
-		private readonly object _receivingLock = new object();
-		private readonly object _sendLock = new object();
-		private readonly object _closeLock = new object();
-		private bool _isSending;
-		private volatile bool _isClosed;
-		private volatile bool _isClosing;
-
-		private Action<ITcpConnection, IEnumerable<ArraySegment<byte>>> _receiveCallback;
-
-		private TcpConnection(Guid connectionId, IPEndPoint remoteEndPoint, bool verbose) : base(remoteEndPoint) {
-			Ensure.NotEmptyGuid(connectionId, "connectionId");
-
-			_connectionId = connectionId;
-			_verbose = verbose;
-		}
-
-		private void InitSocket(Socket socket) {
-			_socket = socket;
-		}
-
-		private void InitSendReceive() {
-			InitConnectionBase(_socket);
-			lock (_sendLock) {
-				try {
-					_socket.NoDelay = true;
-				} catch (ObjectDisposedException) {
-					CloseInternal(SocketError.Shutdown, "Socket disposed.");
-					return;
-				} catch (SocketException) {
-					CloseInternal(SocketError.Shutdown, "Socket is disposed.");
-					return;
-				}
-
-				var receiveSocketArgs = SocketArgsPool.Get();
-				_receiveSocketArgs = receiveSocketArgs;
-				_receiveSocketArgs.AcceptSocket = _socket;
-				_receiveSocketArgs.Completed += OnReceiveAsyncCompleted;
-
-				var sendSocketArgs = SocketArgsPool.Get();
-				_sendSocketArgs = sendSocketArgs;
-				_sendSocketArgs.AcceptSocket = _socket;
-				_sendSocketArgs.Completed += OnSendAsyncCompleted;
-			}
-
-			StartReceive();
-			TrySend();
-		}
-
-		public void EnqueueSend(IEnumerable<ArraySegment<byte>> data) {
-			lock (_sendLock) {
-				int bytes = 0;
-				foreach (var segment in data) {
-					_sendQueue.Enqueue(segment);
-					bytes += segment.Count;
-				}
-
-				NotifySendScheduled(bytes);
-			}
-
-			TrySend();
-		}
-
-		private void TrySend() {
-			bool continueSendSynchronously = true;
-			try {
-				do {
-					lock (_sendLock) {
-						if (_isSending || (_sendQueue.IsEmpty && _memoryStreamOffset >= _memoryStream.Length) || _sendSocketArgs == null) return;
-						if (TcpConnectionMonitor.Default.IsSendBlocked()) return;
-						_isSending = true;
-					}
-
-					if (_memoryStreamOffset >= _memoryStream.Length) {
-						_memoryStream.SetLength(0);
-						_memoryStreamOffset = 0L;
-
-						ArraySegment<byte> sendPiece;
-						while (_sendQueue.TryDequeue(out sendPiece)) {
-							_memoryStream.Write(sendPiece.Array, sendPiece.Offset, sendPiece.Count);
-							if (_memoryStream.Length >= MaxSendPacketSize)
-								break;
-						}
-					}
-
-					int sendingBytes = Math.Min((int)_memoryStream.Length - (int) _memoryStreamOffset, MaxSendPacketSize);
-
-					_sendSocketArgs.SetBuffer(_memoryStream.GetBuffer(), (int) _memoryStreamOffset, sendingBytes);
-					_memoryStreamOffset += sendingBytes;
-
-					NotifySendStarting(_sendSocketArgs.Count);
-					var firedAsync = _sendSocketArgs.AcceptSocket.SendAsync(_sendSocketArgs);
-					if (firedAsync) {
-						continueSendSynchronously = false;
-					} else {
-						continueSendSynchronously = ProcessSend(_sendSocketArgs);
-					}
-				} while (continueSendSynchronously);
-			} catch (ObjectDisposedException) {
-				ReturnSendingSocketArgs();
-			}
-		}
-
-		private void OnSendAsyncCompleted(object sender, SocketAsyncEventArgs e) {
-			if (ProcessSend(e)) {
-				TrySend();
-			}
-		}
-
-		private bool ProcessSend(SocketAsyncEventArgs socketArgs) {
-			if (socketArgs.SocketError != SocketError.Success) {
-				NotifySendCompleted(0);
-				ReturnSendingSocketArgs();
-				CloseInternal(socketArgs.SocketError, "Socket send error.");
-				return false;
-			} else {
-				NotifySendCompleted(socketArgs.Count);
-
-				if (_isClosed) {
-					ReturnSendingSocketArgs();
-					return false;
-				} else {
-					lock (_sendLock) {
-						_isSending = false;
-					}
-
-					return true;
-				}
-			}
-		}
-
-		public void ReceiveAsync(Action<ITcpConnection, IEnumerable<ArraySegment<byte>>> callback) {
-			if (callback == null)
-				throw new ArgumentNullException("callback");
-
-			lock (_receivingLock) {
-				if (_receiveCallback != null) {
-					Log.Fatal("ReceiveAsync called again while previous call was not fulfilled");
-					throw new InvalidOperationException(
-						"ReceiveAsync called again while previous call was not fulfilled");
-				}
-
-				_receiveCallback = callback;
-			}
-
-			TryDequeueReceivedData();
-		}
-
-		private void StartReceive() {
-			try {
-				bool continueReceiveSynchronously = true;
-
-				do {
-					var buffer = BufferManager.CheckOut();
-					if (buffer.Array == null || buffer.Count == 0 || buffer.Array.Length < buffer.Offset + buffer.Count)
-						throw new Exception("Invalid buffer allocated");
-					// TODO AN: do we need to lock on _receiveSocketArgs?..
-					lock (_receiveSocketArgs) {
-						_receiveSocketArgs.SetBuffer(buffer.Array, buffer.Offset, buffer.Count);
-						if (_receiveSocketArgs.Buffer == null) throw new Exception("Buffer was not set");
-					}
-
-					NotifyReceiveStarting();
-					bool firedAsync;
-					lock (_receiveSocketArgs) {
-						if (_receiveSocketArgs.Buffer == null) throw new Exception("Buffer was lost");
-						firedAsync = _receiveSocketArgs.AcceptSocket.ReceiveAsync(_receiveSocketArgs);
-					}
-
-					if (firedAsync) {
-						continueReceiveSynchronously = false;
-					} else {
-						var processReceiveSuccess = ProcessReceive(_receiveSocketArgs);
-						if (processReceiveSuccess) {
-							TryDequeueReceivedData();
-						}
-
-						continueReceiveSynchronously = processReceiveSuccess;
-					}
-				} while (continueReceiveSynchronously);
-			} catch (ObjectDisposedException) {
-				ReturnReceivingSocketArgs();
-			}
-		}
-
-		private void OnReceiveAsyncCompleted(object sender, SocketAsyncEventArgs e) {
-			if (ProcessReceive(e)) {
-				TryDequeueReceivedData();
-				StartReceive();
-			}
-		}
-
-		private bool ProcessReceive(SocketAsyncEventArgs socketArgs) {
-			// socket closed normally or some error occurred
-			if (socketArgs.BytesTransferred == 0 || socketArgs.SocketError != SocketError.Success) {
-				NotifyReceiveCompleted(0);
-				ReturnReceivingSocketArgs();
-				CloseInternal(socketArgs.SocketError,
-					socketArgs.SocketError != SocketError.Success ? "Socket receive error" : "Socket closed");
-				return false;
-			}
-
-			NotifyReceiveCompleted(socketArgs.BytesTransferred);
-
-			lock (_receivingLock) {
-				var buf = new ArraySegment<byte>(socketArgs.Buffer, socketArgs.Offset, socketArgs.Count);
-				_receiveQueue.Enqueue(new ReceivedData(buf, socketArgs.BytesTransferred));
-			}
-
-			lock (_receiveSocketArgs) {
-				if (socketArgs.Buffer == null)
-					throw new Exception("Cleaning already null buffer");
-				socketArgs.SetBuffer(null, 0, 0);
-			}
-
-			return true;
-		}
-
-		private void TryDequeueReceivedData() {
-			Action<ITcpConnection, IEnumerable<ArraySegment<byte>>> callback;
-			List<ReceivedData> res;
-			lock (_receivingLock) {
-				// no awaiting callback or no data to dequeue
-				if (_receiveCallback == null || _receiveQueue.Count == 0)
-					return;
-
-				res = new List<ReceivedData>(_receiveQueue.Count);
-				while (_receiveQueue.Count > 0) {
-					res.Add(_receiveQueue.Dequeue());
-				}
-
-				callback = _receiveCallback;
-				_receiveCallback = null;
-			}
-
-			var data = new ArraySegment<byte>[res.Count];
-			int bytes = 0;
-			for (int i = 0; i < data.Length; ++i) {
-				var d = res[i];
-				bytes += d.DataLen;
-				data[i] = new ArraySegment<byte>(d.Buf.Array, d.Buf.Offset, d.DataLen);
-			}
-
-			lock (_closeLock) {
-				if(!_isClosed)
-					callback(this, data);
-			}
-
-			for (int i = 0, n = res.Count; i < n; ++i) {
-				BufferManager.CheckIn(res[i].Buf); // dispose buffers
-			}
-
-			NotifyReceiveDispatched(bytes);
-		}
-
-		public void Close(string reason) {
-			CloseInternal(SocketError.Success, reason ?? "Normal socket close."); // normal socket closing
-		}
-
-		private void CloseInternal(SocketError socketError, string reason) {
-			lock (_closeLock) {
-				if (_isClosing) return;
-				_isClosing = true;
-			}
-
-			if (_socket != null) {
-				Helper.EatException(() => _socket.Shutdown(SocketShutdown.Both));
-				Helper.EatException(() => _socket.Close());
-			}
-
-			lock (_closeLock) {
-				_isClosed = true;
-			}
-
-			NotifyClosed();
-
-			if (_verbose) {
-				Log.Information(
-					"ES {connectionType} closed [{dateTime:HH:mm:ss.fff}: N{remoteEndPoint}, L{localEndPoint}, {connectionId:B}]:Received bytes: {totalBytesReceived}, Sent bytes: {totalBytesSent}",
-					GetType().Name, DateTime.UtcNow, RemoteEndPoint, LocalEndPoint, _connectionId,
-					TotalBytesReceived, TotalBytesSent);
-				Log.Information(
-					"ES {connectionType} closed [{dateTime:HH:mm:ss.fff}: N{remoteEndPoint}, L{localEndPoint}, {connectionId:B}]:Send calls: {sendCalls}, callbacks: {sendCallbacks}",
-					GetType().Name, DateTime.UtcNow, RemoteEndPoint, LocalEndPoint, _connectionId,
-					SendCalls, SendCallbacks);
-				Log.Information(
-					"ES {connectionType} closed [{dateTime:HH:mm:ss.fff}: N{remoteEndPoint}, L{localEndPoint}, {connectionId:B}]:Receive calls: {receiveCalls}, callbacks: {receiveCallbacks}",
-					GetType().Name, DateTime.UtcNow, RemoteEndPoint, LocalEndPoint, _connectionId,
-					ReceiveCalls, ReceiveCallbacks);
-				Log.Information(
-					"ES {connectionType} closed [{dateTime:HH:mm:ss.fff}: N{remoteEndPoint}, L{localEndPoint}, {connectionId:B}]:Close reason: [{socketError}] {reason}",
-					GetType().Name, DateTime.UtcNow, RemoteEndPoint, LocalEndPoint, _connectionId,
-					socketError, reason);
-			}
-
-			lock (_sendLock) {
-				if (!_isSending)
-					ReturnSendingSocketArgs();
-			}
-
-			var handler = ConnectionClosed;
-			if (handler != null)
-				handler(this, socketError);
-		}
-
-		private void ReturnSendingSocketArgs() {
-			var socketArgs = Interlocked.Exchange(ref _sendSocketArgs, null);
-			if (socketArgs != null) {
-				socketArgs.Completed -= OnSendAsyncCompleted;
-				socketArgs.AcceptSocket = null;
-				if (socketArgs.Buffer != null)
-					socketArgs.SetBuffer(null, 0, 0);
-				SocketArgsPool.Return(socketArgs);
-			}
-		}
-
-		private void ReturnReceivingSocketArgs() {
-			var socketArgs = Interlocked.Exchange(ref _receiveSocketArgs, null);
-			if (socketArgs != null) {
-				socketArgs.Completed -= OnReceiveAsyncCompleted;
-				socketArgs.AcceptSocket = null;
-				if (socketArgs.Buffer != null) {
-					BufferManager.CheckIn(
-						new ArraySegment<byte>(socketArgs.Buffer, socketArgs.Offset, socketArgs.Count));
-					socketArgs.SetBuffer(null, 0, 0);
-				}
-
-				SocketArgsPool.Return(socketArgs);
-			}
-		}
-
-		public void SetClientConnectionName(string clientConnectionName) {
-			_clientConnectionName = clientConnectionName;
-		}
-
-		public override string ToString() {
-			return RemoteEndPoint.ToString();
-		}
-
-		private struct ReceivedData {
-			public readonly ArraySegment<byte> Buf;
-			public readonly int DataLen;
-
-			public ReceivedData(ArraySegment<byte> buf, int dataLen) {
-				Buf = buf;
-				DataLen = dataLen;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Tcp/TcpConnectionBase.cs b/src/EventStore.Transport.Tcp/TcpConnectionBase.cs
deleted file mode 100644
index 454d5b5a06c..00000000000
--- a/src/EventStore.Transport.Tcp/TcpConnectionBase.cs
+++ /dev/null
@@ -1,191 +0,0 @@
-using System;
-using System.Net;
-using System.Net.Sockets;
-using System.Threading;
-using EventStore.Common.Utils;
-
-namespace EventStore.Transport.Tcp {
-	public class TcpConnectionBase : IMonitoredTcpConnection {
-		public IPEndPoint RemoteEndPoint {
-			get { return _remoteEndPoint; }
-		}
-
-		public IPEndPoint LocalEndPoint {
-			get { return _localEndPoint; }
-		}
-
-		public bool IsInitialized {
-			get { return _socket != null; }
-		}
-
-		public bool IsClosed {
-			get { return _isClosed; }
-		}
-
-		public bool InSend {
-			get { return Interlocked.Read(ref _lastSendStarted) >= 0; }
-		}
-
-		public bool InReceive {
-			get { return Interlocked.Read(ref _lastReceiveStarted) >= 0; }
-		}
-
-		public int PendingSendBytes {
-			get { return _pendingSendBytes; }
-		}
-
-		public int InSendBytes {
-			get { return _inSendBytes; }
-		}
-
-		public int PendingReceivedBytes {
-			get { return _pendingReceivedBytes; }
-		}
-
-		public long TotalBytesSent {
-			get { return Interlocked.Read(ref _totalBytesSent); }
-		}
-
-		public long TotalBytesReceived {
-			get { return Interlocked.Read(ref _totalBytesReceived); }
-		}
-
-		public int SendCalls {
-			get { return _sentAsyncs; }
-		}
-
-		public int SendCallbacks {
-			get { return _sentAsyncCallbacks; }
-		}
-
-		public int ReceiveCalls {
-			get { return _recvAsyncs; }
-		}
-
-		public int ReceiveCallbacks {
-			get { return _recvAsyncCallbacks; }
-		}
-
-		public bool IsReadyForSend {
-			get {
-				try {
-					return !_isClosed && _socket.Poll(0, SelectMode.SelectWrite);
-				} catch (ObjectDisposedException) {
-					//TODO: why do we get this?
-					return false;
-				}
-			}
-		}
-
-		public bool IsReadyForReceive {
-			get {
-				try {
-					return !_isClosed && _socket.Poll(0, SelectMode.SelectRead);
-				} catch (ObjectDisposedException) {
-					//TODO: why do we get this?
-					return false;
-				}
-			}
-		}
-
-		public bool IsFaulted {
-			get {
-				try {
-					return !_isClosed && _socket.Poll(0, SelectMode.SelectError);
-				} catch (ObjectDisposedException) {
-					//TODO: why do we get this?
-					return false;
-				}
-			}
-		}
-
-		public DateTime? LastSendStarted {
-			get {
-				var ticks = Interlocked.Read(ref _lastSendStarted);
-				return ticks >= 0 ? new DateTime(ticks) : (DateTime?)null;
-			}
-		}
-
-		public DateTime? LastReceiveStarted {
-			get {
-				var ticks = Interlocked.Read(ref _lastReceiveStarted);
-				return ticks >= 0 ? new DateTime(ticks) : (DateTime?)null;
-			}
-		}
-
-		private Socket _socket;
-		protected readonly IPEndPoint _remoteEndPoint;
-		private IPEndPoint _localEndPoint;
-
-		private long _lastSendStarted = -1;
-		private long _lastReceiveStarted = -1;
-		private bool _isClosed;
-
-		private int _pendingSendBytes;
-		private int _inSendBytes;
-		private int _pendingReceivedBytes;
-		private long _totalBytesSent;
-		private long _totalBytesReceived;
-
-		private int _sentAsyncs;
-		private int _sentAsyncCallbacks;
-		private int _recvAsyncs;
-		private int _recvAsyncCallbacks;
-
-		public TcpConnectionBase(IPEndPoint remoteEndPoint) {
-			Ensure.NotNull(remoteEndPoint, "remoteEndPoint");
-			_remoteEndPoint = remoteEndPoint;
-
-			TcpConnectionMonitor.Default.Register(this);
-		}
-
-		protected void InitConnectionBase(Socket socket) {
-			Ensure.NotNull(socket, "socket");
-
-			_socket = socket;
-			_localEndPoint = Helper.EatException(() => (IPEndPoint)socket.LocalEndPoint);
-		}
-
-		protected void NotifySendScheduled(int bytes) {
-			Interlocked.Add(ref _pendingSendBytes, bytes);
-		}
-
-		protected void NotifySendStarting(int bytes) {
-			if (Interlocked.CompareExchange(ref _lastSendStarted, DateTime.UtcNow.Ticks, -1) != -1)
-				throw new Exception("Concurrent send detected.");
-			Interlocked.Add(ref _pendingSendBytes, -bytes);
-			Interlocked.Add(ref _inSendBytes, bytes);
-			Interlocked.Increment(ref _sentAsyncs);
-		}
-
-		protected void NotifySendCompleted(int bytes) {
-			Interlocked.Exchange(ref _lastSendStarted, -1);
-			Interlocked.Add(ref _inSendBytes, -bytes);
-			Interlocked.Add(ref _totalBytesSent, bytes);
-			Interlocked.Increment(ref _sentAsyncCallbacks);
-		}
-
-		protected void NotifyReceiveStarting() {
-			if (Interlocked.CompareExchange(ref _lastReceiveStarted, DateTime.UtcNow.Ticks, -1) != -1)
-				throw new Exception("Concurrent receive detected.");
-
-			Interlocked.Increment(ref _recvAsyncs);
-		}
-
-		protected void NotifyReceiveCompleted(int bytes) {
-			Interlocked.Exchange(ref _lastReceiveStarted, -1);
-			Interlocked.Add(ref _pendingReceivedBytes, bytes);
-			Interlocked.Add(ref _totalBytesReceived, bytes);
-			Interlocked.Increment(ref _recvAsyncCallbacks);
-		}
-
-		protected void NotifyReceiveDispatched(int bytes) {
-			Interlocked.Add(ref _pendingReceivedBytes, -bytes);
-		}
-
-		protected void NotifyClosed() {
-			_isClosed = true;
-			TcpConnectionMonitor.Default.Unregister(this);
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Tcp/TcpConnectionMonitor.cs b/src/EventStore.Transport.Tcp/TcpConnectionMonitor.cs
deleted file mode 100644
index 1463a202206..00000000000
--- a/src/EventStore.Transport.Tcp/TcpConnectionMonitor.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Linq;
-using EventStore.Common.Utils;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Transport.Tcp {
-	public class TcpConnectionMonitor {
-		public static readonly TcpConnectionMonitor Default = new TcpConnectionMonitor();
-		private static readonly ILogger Log = Serilog.Log.ForContext<TcpConnectionMonitor>();
-
-		private readonly object _statsLock = new object();
-
-		private readonly ConcurrentDictionary<IMonitoredTcpConnection, ConnectionData> _connections =
-			new ConcurrentDictionary<IMonitoredTcpConnection, ConnectionData>();
-
-		private long _sentTotal;
-		private long _receivedTotal;
-		private long _sentSinceLastRun;
-		private long _receivedSinceLastRun;
-		private long _pendingSendOnLastRun;
-		private long _inSendOnLastRun;
-		private long _pendingReceivedOnLastRun;
-
-		private bool _anySendBlockedOnLastRun;
-		private DateTime _lastUpdateTime;
-
-		private TcpConnectionMonitor() {
-		}
-
-		public void Register(IMonitoredTcpConnection connection) {
-			_connections.TryAdd(connection, new ConnectionData(connection));
-		}
-
-		public void Unregister(IMonitoredTcpConnection connection) {
-			ConnectionData data;
-			_connections.TryRemove(connection, out data);
-		}
-
-		public TcpStats GetTcpStats() {
-			ConnectionData[] connections = _connections.Values.ToArray();
-			lock (_statsLock) {
-				var stats = AnalyzeConnections(connections, DateTime.UtcNow - _lastUpdateTime);
-				_lastUpdateTime = DateTime.UtcNow;
-				return stats;
-			}
-		}
-
-		public IMonitoredTcpConnection[] GetTcpConnectionStats() {
-			GetTcpStats();
-			var monitoredConnections = _connections.Values.Select(conn => conn.Connection).ToArray();
-			return monitoredConnections;
-		}
-
-		private TcpStats AnalyzeConnections(ConnectionData[] connections, TimeSpan measurePeriod) {
-			_receivedSinceLastRun = 0;
-			_sentSinceLastRun = 0;
-			_pendingSendOnLastRun = 0;
-			_inSendOnLastRun = 0;
-			_pendingReceivedOnLastRun = 0;
-			_anySendBlockedOnLastRun = false;
-
-			foreach (var connection in connections) {
-				AnalyzeConnection(connection);
-			}
-
-			var stats = new TcpStats(connections.Length,
-				_sentTotal,
-				_receivedTotal,
-				_sentSinceLastRun,
-				_receivedSinceLastRun,
-				_pendingSendOnLastRun,
-				_inSendOnLastRun,
-				_pendingReceivedOnLastRun,
-				measurePeriod);
-
-			return stats;
-		}
-
-		private void AnalyzeConnection(ConnectionData connectionData) {
-			var connection = connectionData.Connection;
-			if (!connection.IsInitialized)
-				return;
-
-			if (connection.IsFaulted) {
-				Log.Information("# {connection} is faulted", connection);
-				return;
-			}
-
-			UpdateStatistics(connectionData);
-
-			CheckPendingReceived(connection);
-			CheckPendingSend(connection);
-			CheckMissingSendCallback(connectionData, connection);
-			CheckMissingReceiveCallback(connectionData, connection);
-		}
-
-		private void UpdateStatistics(ConnectionData connectionData) {
-			var connection = connectionData.Connection;
-			long totalBytesSent = connection.TotalBytesSent;
-			long totalBytesReceived = connection.TotalBytesReceived;
-			long pendingSend = connection.PendingSendBytes;
-			long inSend = connection.InSendBytes;
-			long pendingReceived = connection.PendingReceivedBytes;
-
-			_sentSinceLastRun += totalBytesSent - connectionData.LastTotalBytesSent;
-			_receivedSinceLastRun += totalBytesReceived - connectionData.LastTotalBytesReceived;
-
-			_sentTotal += _sentSinceLastRun;
-			_receivedTotal += _receivedSinceLastRun;
-
-			_pendingSendOnLastRun += pendingSend;
-			_inSendOnLastRun += inSend;
-			_pendingReceivedOnLastRun = pendingReceived;
-
-			connectionData.LastTotalBytesSent = totalBytesSent;
-			connectionData.LastTotalBytesReceived = totalBytesReceived;
-		}
-
-		private static void CheckMissingReceiveCallback(ConnectionData connectionData,
-			IMonitoredTcpConnection connection) {
-			bool inReceive = connection.InReceive;
-			bool isReadyForReceive = connection.IsReadyForReceive;
-			DateTime? lastReceiveStarted = connection.LastReceiveStarted;
-
-			int sinceLastReceive = (int)(DateTime.UtcNow - lastReceiveStarted.GetValueOrDefault()).TotalMilliseconds;
-			bool missingReceiveCallback = inReceive && isReadyForReceive && sinceLastReceive > 500;
-
-			if (missingReceiveCallback && connectionData.LastMissingReceiveCallBack) {
-				Log.Error(
-					"# {connection} {sinceLastReceive}ms since last Receive started. No completion callback received, but socket status is READY_FOR_RECEIVE",
-					connection, sinceLastReceive);
-			}
-
-			connectionData.LastMissingReceiveCallBack = missingReceiveCallback;
-		}
-
-		private void CheckMissingSendCallback(ConnectionData connectionData, IMonitoredTcpConnection connection) {
-			// snapshot all data?
-			bool inSend = connection.InSend;
-			bool isReadyForSend = connection.IsReadyForSend;
-			DateTime? lastSendStarted = connection.LastSendStarted;
-			int inSendBytes = connection.InSendBytes;
-
-			int sinceLastSend = (int)(DateTime.UtcNow - lastSendStarted.GetValueOrDefault()).TotalMilliseconds;
-			bool missingSendCallback = inSend && isReadyForSend && sinceLastSend > 500;
-
-			if (missingSendCallback && connectionData.LastMissingSendCallBack) {
-				// _anySendBlockedOnLastRun = true;
-				Log.Error(
-					"# {connection} {sinceLastSend}ms since last send started. No completion callback received, but socket status is READY_FOR_SEND. In send: {inSendBytes}",
-					connection, sinceLastSend, inSendBytes);
-			}
-
-			connectionData.LastMissingSendCallBack = missingSendCallback;
-		}
-
-		private static void CheckPendingSend(IMonitoredTcpConnection connection) {
-			int pendingSendBytes = connection.PendingSendBytes;
-			if (pendingSendBytes > 128 * 1024) {
-				Log.Information("# {connection} {pendingSendKiloBytes}kb pending send", connection, pendingSendBytes / 1024);
-			}
-		}
-
-		private static void CheckPendingReceived(IMonitoredTcpConnection connection) {
-			int pendingReceivedBytes = connection.PendingReceivedBytes;
-			if (pendingReceivedBytes > 128 * 1024) {
-				Log.Information("# {connection} {pendingReceivedKiloBytes}kb are not dispatched", connection,
-					pendingReceivedBytes / 1024);
-			}
-		}
-
-		public bool IsSendBlocked() {
-			return _anySendBlockedOnLastRun;
-		}
-
-		private class ConnectionData {
-			public readonly IMonitoredTcpConnection Connection;
-			public bool LastMissingSendCallBack;
-			public bool LastMissingReceiveCallBack;
-			public long LastTotalBytesSent;
-			public long LastTotalBytesReceived;
-
-			public ConnectionData(IMonitoredTcpConnection connection) {
-				Connection = connection;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Tcp/TcpConnectionSsl.cs b/src/EventStore.Transport.Tcp/TcpConnectionSsl.cs
deleted file mode 100644
index 32a13e49922..00000000000
--- a/src/EventStore.Transport.Tcp/TcpConnectionSsl.cs
+++ /dev/null
@@ -1,612 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Net.Security;
-using System.Net.Sockets;
-using System.Security.Authentication;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading;
-using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Transport.Tcp {
-	public class TcpConnectionSsl : TcpConnectionBase, ITcpConnection {
-		private static readonly ILogger Log = Serilog.Log.ForContext<TcpConnectionSsl>();
-
-		public static ITcpConnection CreateConnectingConnection(Guid connectionId,
-			string targetHost,
-			string[] otherNames,
-			IPEndPoint remoteEndPoint,
-			CertificateDelegates.ServerCertificateValidator serverCertValidator,
-			Func<X509CertificateCollection> clientCertificatesSelector,
-			TcpClientConnector connector,
-			TimeSpan connectionTimeout,
-			Action<ITcpConnection> onConnectionEstablished,
-			Action<ITcpConnection, SocketError> onConnectionFailed,
-			bool verbose) {
-			var connection = new TcpConnectionSsl(connectionId, remoteEndPoint, verbose);
-			// ReSharper disable ImplicitlyCapturedClosure
-			connector.InitConnect(remoteEndPoint,
-				(socket) => {
-					connection.InitClientSocket(socket);
-				},
-				(_, socket) => {
-					connection.InitSslStream(targetHost, otherNames, serverCertValidator, clientCertificatesSelector, verbose);
-					if (onConnectionEstablished != null)
-						onConnectionEstablished(connection);
-				},
-				(_, socketError) => {
-					if (onConnectionFailed != null)
-						onConnectionFailed(connection, socketError);
-				}, connection, connectionTimeout);
-			// ReSharper restore ImplicitlyCapturedClosure
-			return connection;
-		}
-
-		public static ITcpConnection CreateServerFromSocket(Guid connectionId,
-			IPEndPoint remoteEndPoint,
-			Socket socket,
-			Func<X509Certificate2> serverCertificateSelector,
-			Func<X509Certificate2Collection> intermediatesSelector,
-			CertificateDelegates.ClientCertificateValidator clientCertValidator,
-			bool verbose) {
-			var connection = new TcpConnectionSsl(connectionId, remoteEndPoint, verbose);
-			connection.InitServerSocket(socket, serverCertificateSelector, intermediatesSelector, clientCertValidator, verbose);
-			return connection;
-		}
-
-		public event Action<ITcpConnection, SocketError> ConnectionClosed;
-
-		public Guid ConnectionId {
-			get { return _connectionId; }
-		}
-
-		public int SendQueueSize {
-			get { return _sendQueue.Count; }
-		}
-
-		public string ClientConnectionName {
-			get { return _clientConnectionName; }
-		}
-
-		private readonly Guid _connectionId;
-		private readonly bool _verbose;
-		public string _clientConnectionName;
-
-		private Socket _socket;
-
-		private readonly ConcurrentQueueWrapper<ArraySegment<byte>> _sendQueue =
-			new ConcurrentQueueWrapper<ArraySegment<byte>>();
-
-		private readonly ConcurrentQueueWrapper<ReceivedData>
-			_receiveQueue = new ConcurrentQueueWrapper<ReceivedData>();
-
-		private readonly MemoryStream _memoryStream = new MemoryStream();
-		private long _memoryStreamOffset = 0L;
-
-		private readonly object _streamLock = new object();
-		private readonly object _closeLock = new object();
-		private bool _isSending;
-		private int _receiveHandling;
-		private volatile bool _isClosed;
-		private volatile bool _isClosing;
-
-		private Action<ITcpConnection, IEnumerable<ArraySegment<byte>>> _receiveCallback;
-
-		private SslStream _sslStream;
-		private bool _isAuthenticated;
-		private int _sendingBytes;
-		private CertificateDelegates.ServerCertificateValidator _serverCertValidator;
-		private CertificateDelegates.ClientCertificateValidator _clientCertValidator;
-		private string[] _otherNames;
-		private readonly byte[] _receiveBuffer = new byte[TcpConnection.BufferManager.ChunkSize];
-
-		private TcpConnectionSsl(Guid connectionId, IPEndPoint remoteEndPoint, bool verbose) : base(remoteEndPoint) {
-			Ensure.NotEmptyGuid(connectionId, "connectionId");
-
-			_connectionId = connectionId;
-			_verbose = verbose;
-		}
-
-		private void InitServerSocket(
-			Socket socket,
-			Func<X509Certificate2> serverCertificateSelector,
-			Func<X509Certificate2Collection> intermediatesSelector,
-			CertificateDelegates.ClientCertificateValidator clientCertValidator,
-			bool verbose) {
-			InitConnectionBase(socket);
-			if (verbose)
-				Console.WriteLine("TcpConnectionSsl::InitClientSocket({0}, L{1})", RemoteEndPoint, LocalEndPoint);
-
-			_clientCertValidator = clientCertValidator;
-
-			lock (_streamLock) {
-				try {
-					socket.NoDelay = true;
-				} catch (ObjectDisposedException) {
-					CloseInternal(SocketError.Shutdown, "Socket is disposed.");
-					return;
-				} catch (SocketException) {
-					CloseInternal(SocketError.Shutdown, "Socket is disposed.");
-					return;
-				}
-
-				try {
-					_sslStream = new SslStream(new NetworkStream(socket, true), false);
-				} catch (IOException exc) {
-					Log.Debug(exc, "[S{remoteEndPoint}, L{localEndPoint}]: IOException on NetworkStream. The socket has already been disposed.", RemoteEndPoint,
-						LocalEndPoint);
-					return;
-				}
-
-				Task.Run(async () => await AuthenticateAsServerAsync(serverCertificateSelector, intermediatesSelector));
-			}
-		}
-
-		private async Task AuthenticateAsServerAsync(
-			Func<X509Certificate2> serverCertificateSelector,
-			Func<X509Certificate2Collection> intermediatesSelector) {
-			try {
-				var enabledSslProtocols = SslProtocols.Tls12 | SslProtocols.Tls13;
-				var certificate = serverCertificateSelector?.Invoke();
-				var intermediates = intermediatesSelector?.Invoke();
-				Ensure.NotNull(certificate, "certificate");
-
-				await _sslStream.AuthenticateAsServerAsync(new SslServerAuthenticationOptions {
-					ServerCertificateContext = SslStreamCertificateContext.Create(
-						certificate!, intermediates, offline: true),
-					ClientCertificateRequired = true,
-					EnabledSslProtocols = enabledSslProtocols,
-					CertificateRevocationCheckMode = X509RevocationMode.NoCheck,
-					RemoteCertificateValidationCallback = ValidateClientCertificate,
-					ApplicationProtocols = new List<SslApplicationProtocol>(),
-					AllowRenegotiation = false,
-				});
-
-				lock (_streamLock) {
-					if (_verbose)
-						DisplaySslStreamInfo(_sslStream);
-					_isAuthenticated = true;
-				}
-			} catch (AuthenticationException exc) {
-				Log.Information(exc,
-					"[S{remoteEndPoint}, L{localEndPoint}]: Authentication exception on AuthenticateAsServerAsync.",
-					RemoteEndPoint, LocalEndPoint);
-				CloseInternal(SocketError.SocketError, exc.Message);
-			} catch (ObjectDisposedException) {
-				CloseInternal(SocketError.SocketError, "SslStream disposed.");
-			} catch (Exception exc) {
-				Log.Information(exc,
-					"[S{remoteEndPoint}, L{localEndPoint}]: Exception on AuthenticateAsServerAsync.",
-					RemoteEndPoint, LocalEndPoint);
-				CloseInternal(SocketError.SocketError, exc.Message);
-			}
-
-			StartReceive();
-			TrySend();
-		}
-
-		private void InitClientSocket(Socket socket) {
-			_socket = socket;
-		}
-
-		private void InitSslStream(string targetHost, string[] otherNames, CertificateDelegates.ServerCertificateValidator serverCertValidator, Func<X509CertificateCollection> clientCertificatesSelector, bool verbose) {
-			Ensure.NotNull(targetHost, "targetHost");
-			InitConnectionBase(_socket);
-			if (verbose)
-				Console.WriteLine("TcpConnectionSsl::InitClientSslStream({0}, L{1})", RemoteEndPoint, LocalEndPoint);
-
-			_serverCertValidator = serverCertValidator;
-			_otherNames = otherNames;
-
-			lock (_streamLock) {
-				try {
-					_socket.NoDelay = true;
-				} catch (ObjectDisposedException) {
-					CloseInternal(SocketError.Shutdown, "Socket is disposed.");
-					return;
-				} catch (SocketException) {
-					CloseInternal(SocketError.Shutdown, "Socket is disposed.");
-					return;
-				}
-
-				try {
-					_sslStream = new SslStream(new NetworkStream(_socket, true), false, ValidateServerCertificate, null);
-				} catch (IOException exc) {
-					Log.Debug(exc, "[S{remoteEndPoint}, L{localEndPoint}]: IOException on NetworkStream. The socket has already been disposed.", RemoteEndPoint,
-						LocalEndPoint);
-					return;
-				}
-
-				try {
-					var enabledSslProtocols = SslProtocols.Tls12 | SslProtocols.Tls13;
-					var clientCertificates = clientCertificatesSelector?.Invoke();
-					_sslStream.BeginAuthenticateAsClient(targetHost, clientCertificates, enabledSslProtocols, false, OnEndAuthenticateAsClient, _sslStream);
-				} catch (AuthenticationException exc) {
-					Log.Information(exc,
-						"[S{remoteEndPoint}, L{localEndPoint}]: Authentication exception on BeginAuthenticateAsClient.",
-						RemoteEndPoint, LocalEndPoint);
-					CloseInternal(SocketError.SocketError, exc.Message);
-				} catch (ObjectDisposedException) {
-					CloseInternal(SocketError.SocketError, "SslStream disposed.");
-				} catch (Exception exc) {
-					Log.Information(exc,
-						"[S{remoteEndPoint}, {localEndPoint}]: Exception on BeginAuthenticateAsClient.", RemoteEndPoint,
-						LocalEndPoint);
-					CloseInternal(SocketError.SocketError, exc.Message);
-				}
-			}
-		}
-
-		private void OnEndAuthenticateAsClient(IAsyncResult ar) {
-			try {
-				lock (_streamLock) {
-					var sslStream = (SslStream)ar.AsyncState;
-					sslStream.EndAuthenticateAsClient(ar);
-					if (_verbose)
-						DisplaySslStreamInfo(sslStream);
-					_isAuthenticated = true;
-				}
-
-				StartReceive();
-				TrySend();
-			} catch (AuthenticationException exc) {
-				Log.Information(exc,
-					"[S{remoteEndPoint}, L{localEndPoint}]: Authentication exception on EndAuthenticateAsClient.",
-					RemoteEndPoint, LocalEndPoint);
-				CloseInternal(SocketError.SocketError, exc.Message);
-			} catch (ObjectDisposedException) {
-				CloseInternal(SocketError.SocketError, "SslStream disposed.");
-			} catch (Exception exc) {
-				Log.Information(exc, "[S{remoteEndPoint}, L{localEndPoint}]: Exception on EndAuthenticateAsClient.",
-					RemoteEndPoint, LocalEndPoint);
-				CloseInternal(SocketError.SocketError, exc.Message);
-			}
-		}
-
-		// The following method is invoked by the RemoteCertificateValidationDelegate. 
-		public bool ValidateServerCertificate(object sender, X509Certificate certificate, X509Chain chain,
-			SslPolicyErrors sslPolicyErrors) {
-			var (isValid, error) = _serverCertValidator(certificate, chain, sslPolicyErrors, _otherNames);
-			if (!isValid && error != null) {
-				Log.Error("Server certificate validation error: {e}", error);
-			}
-			return isValid;
-		}
-
-		public bool ValidateClientCertificate(object sender, X509Certificate certificate, X509Chain chain,
-			SslPolicyErrors sslPolicyErrors) {
-			var (isValid, error) = _clientCertValidator(certificate, chain, sslPolicyErrors);
-			if (!isValid && error != null) {
-				Log.Error("Client certificate validation error: {e}", error);
-			}
-			return isValid;
-		}
-
-		private void DisplaySslStreamInfo(SslStream stream) {
-			Log.Information("[S{remoteEndPoint}, L{localEndPoint}]", RemoteEndPoint, LocalEndPoint);
-			Log.Verbose("Cipher: {cipherAlgorithm}", stream.CipherAlgorithm);
-			try {
-				Log.Verbose("Cipher strength: {cipherStrength}", stream.CipherStrength);
-			} catch (NotImplementedException) {
-			}
-
-			Log.Verbose("Hash: {hashAlgorithm}", stream.HashAlgorithm);
-			try {
-				Log.Verbose("Hash strength: {hashStrength}", stream.HashStrength);
-			} catch (NotImplementedException) {
-			}
-
-			Log.Verbose("Key exchange: {keyExchangeAlgorithm}", stream.KeyExchangeAlgorithm);
-			try {
-				Log.Verbose("Key exchange strength: {keyExchangeStrength}", stream.KeyExchangeStrength);
-			} catch (NotImplementedException) {
-			}
-
-			Log.Information("Protocol: {sslProtocol}", stream.SslProtocol);
-			Log.Information("Is authenticated: {isAuthenticated} as server? {isServer}", stream.IsAuthenticated,
-				stream.IsServer);
-			Log.Information("IsSigned: {isSigned}", stream.IsSigned);
-			Log.Information("Is Encrypted: {isEncrypted}", stream.IsEncrypted);
-			Log.Information("Can read: {canRead}, write {canWrite}", stream.CanRead, stream.CanWrite);
-			Log.Information("Can timeout: {canTimeout}", stream.CanTimeout);
-			try {
-				Log.Information("Certificate revocation list checked: {checkCertRevocationStatus}",
-					stream.CheckCertRevocationStatus);
-			} catch (NotImplementedException) {
-			}
-
-			X509Certificate localCert = stream.LocalCertificate;
-			if (localCert != null)
-				Log.Information(
-					"Local certificate was issued to {subject} and is valid from {effectiveDate} until {expirationDate}.",
-					localCert.Subject, localCert.GetEffectiveDateString(), localCert.GetExpirationDateString());
-			else
-				Log.Information("Local certificate is null.");
-
-			// Display the properties of the client's certificate.
-			X509Certificate remoteCert = stream.RemoteCertificate;
-			if (remoteCert != null)
-				Log.Information(
-					"Remote certificate was issued to {subject} and is valid from {remoteCertEffectiveDate} until {remoteCertExpirationDate}.",
-					remoteCert.Subject, remoteCert.GetEffectiveDateString(), remoteCert.GetExpirationDateString());
-			else
-				Log.Information("Remote certificate is null.");
-		}
-
-		public void EnqueueSend(IEnumerable<ArraySegment<byte>> data) {
-			lock (_streamLock) {
-				int bytes = 0;
-				foreach (var segment in data) {
-					_sendQueue.Enqueue(segment);
-					bytes += segment.Count;
-				}
-
-				NotifySendScheduled(bytes);
-			}
-
-			TrySend();
-		}
-
-		private void TrySend() {
-			bool continueSendSynchronously = true;
-			try {
-				do {
-					lock (_streamLock) {
-						if (_isSending || (_sendQueue.IsEmpty && _memoryStreamOffset >= _memoryStream.Length) || _sslStream == null || !_isAuthenticated) return;
-						if (TcpConnectionMonitor.Default.IsSendBlocked()) return;
-						_isSending = true;
-					}
-
-					if (_memoryStreamOffset >= _memoryStream.Length) {
-						_memoryStream.SetLength(0);
-						_memoryStreamOffset = 0L;
-
-						ArraySegment<byte> sendPiece;
-						while (_sendQueue.TryDequeue(out sendPiece)) {
-							_memoryStream.Write(sendPiece.Array, sendPiece.Offset, sendPiece.Count);
-							if (_memoryStream.Length >= TcpConnection.MaxSendPacketSize)
-								break;
-						}
-					}
-
-					_sendingBytes = Math.Min((int)_memoryStream.Length - (int) _memoryStreamOffset, TcpConnection.MaxSendPacketSize);
-
-					NotifySendStarting(_sendingBytes);
-					var result = _sslStream.BeginWrite(_memoryStream.GetBuffer(), (int)_memoryStreamOffset, _sendingBytes, OnEndWrite, null);
-					_memoryStreamOffset += _sendingBytes;
-					continueSendSynchronously = result.CompletedSynchronously;
-					if (continueSendSynchronously) {
-						EndWrite(result);
-					}
-				} while (continueSendSynchronously);
-			} catch (SocketException exc) {
-				Log.Debug(exc, "SocketException '{e}' during BeginWrite.", exc.SocketErrorCode);
-				CloseInternal(exc.SocketErrorCode, "SocketException during BeginWrite.");
-			} catch (ObjectDisposedException) {
-				CloseInternal(SocketError.SocketError, "SslStream disposed.");
-			} catch (Exception exc) {
-				Log.Debug(exc, "Exception during BeginWrite.");
-				CloseInternal(SocketError.SocketError, "Exception during BeginWrite");
-			}
-		}
-
-		private void OnEndWrite(IAsyncResult ar) {
-			if (ar.CompletedSynchronously) return;
-
-			EndWrite(ar);
-			TrySend();
-		}
-
-		private void EndWrite(IAsyncResult ar) {
-			try {
-				_sslStream.EndWrite(ar);
-				NotifySendCompleted(_sendingBytes);
-
-				lock (_streamLock) {
-					_isSending = false;
-				}
-			} catch (SocketException exc) {
-				Log.Debug(exc, "SocketException '{e}' during EndWrite.", exc.SocketErrorCode);
-				NotifySendCompleted(0);
-				CloseInternal(exc.SocketErrorCode, "SocketException during EndWrite.");
-			} catch (ObjectDisposedException) {
-				NotifySendCompleted(0);
-				CloseInternal(SocketError.SocketError, "SslStream disposed.");
-			} catch (Exception exc) {
-				Log.Debug(exc, "Exception during EndWrite.");
-				NotifySendCompleted(0);
-				CloseInternal(SocketError.SocketError, "Exception during EndWrite.");
-			}
-		}
-
-		public void ReceiveAsync(Action<ITcpConnection, IEnumerable<ArraySegment<byte>>> callback) {
-			Ensure.NotNull(callback, "callback");
-
-			if (Interlocked.Exchange(ref _receiveCallback, callback) != null) {
-				Log.Fatal("ReceiveAsync called again while previous call wasn't fulfilled");
-				throw new InvalidOperationException("ReceiveAsync called again while previous call wasn't fulfilled");
-			}
-
-			TryDequeueReceivedData();
-		}
-
-		private void StartReceive() {
-			try {
-				bool continueReceiveSynchronously = true;
-
-				do {
-					NotifyReceiveStarting();
-					var result = _sslStream.BeginRead(_receiveBuffer, 0, _receiveBuffer.Length, OnEndRead, null);
-					continueReceiveSynchronously = result.CompletedSynchronously;
-					if (continueReceiveSynchronously) {
-						EndRead(result);
-					}
-				} while (continueReceiveSynchronously);
-			} catch (SocketException exc) {
-				Log.Debug(exc, "SocketException '{e}' during BeginRead.", exc.SocketErrorCode);
-				CloseInternal(exc.SocketErrorCode, "SocketException during BeginRead.");
-			} catch (ObjectDisposedException) {
-				CloseInternal(SocketError.SocketError, "SslStream disposed.");
-			} catch (Exception exc) {
-				Log.Debug(exc, "Exception during BeginRead.");
-				CloseInternal(SocketError.SocketError, "Exception during BeginRead.");
-			}
-		}
-
-		private void OnEndRead(IAsyncResult ar) {
-			if (ar.CompletedSynchronously) return;
-
-			EndRead(ar);
-			StartReceive();
-		}
-
-		private void EndRead(IAsyncResult ar) {
-			int bytesRead;
-			try {
-				bytesRead = _sslStream.EndRead(ar);
-			} catch (SocketException exc) {
-				Log.Debug(exc, "SocketException '{e}' during EndRead.", exc.SocketErrorCode);
-				NotifyReceiveCompleted(0);
-				CloseInternal(exc.SocketErrorCode, "SocketException during EndRead.");
-				return;
-			} catch (ObjectDisposedException) {
-				NotifyReceiveCompleted(0);
-				CloseInternal(SocketError.SocketError, "SslStream disposed.");
-				return;
-			} catch (Exception exc) {
-				Log.Debug(exc, "Exception during EndRead.");
-				NotifyReceiveCompleted(0);
-				CloseInternal(SocketError.SocketError, "Exception during EndRead.");
-				return;
-			}
-
-			if (bytesRead <= 0) // socket closed normally
-			{
-				NotifyReceiveCompleted(0);
-				CloseInternal(SocketError.Success, "Socket closed.");
-				return;
-			}
-
-			NotifyReceiveCompleted(bytesRead);
-
-			var buffer = TcpConnection.BufferManager.CheckOut();
-			if (buffer.Array == null || buffer.Count == 0 || buffer.Array.Length < buffer.Offset + buffer.Count)
-				throw new Exception("Invalid buffer allocated.");
-			Buffer.BlockCopy(_receiveBuffer, 0, buffer.Array, buffer.Offset, bytesRead);
-			var buf = new ArraySegment<byte>(buffer.Array, buffer.Offset, buffer.Count);
-			_receiveQueue.Enqueue(new ReceivedData(buf, bytesRead));
-
-			TryDequeueReceivedData();
-		}
-
-		private void TryDequeueReceivedData() {
-			if (Interlocked.CompareExchange(ref _receiveHandling, 1, 0) != 0)
-				return;
-			do {
-				if (!_receiveQueue.IsEmpty && _receiveCallback != null) {
-					var callback = Interlocked.Exchange(ref _receiveCallback, null);
-					if (callback == null) {
-						Log.Fatal("Some threading issue in TryDequeueReceivedData! Callback is null!");
-						throw new Exception("Some threading issue in TryDequeueReceivedData! Callback is null!");
-					}
-
-					var res = new List<ReceivedData>(_receiveQueue.Count);
-					ReceivedData piece;
-					while (_receiveQueue.TryDequeue(out piece)) {
-						res.Add(piece);
-					}
-
-					var data = new ArraySegment<byte>[res.Count];
-					int bytes = 0;
-					for (int i = 0; i < data.Length; ++i) {
-						var d = res[i];
-						bytes += d.DataLen;
-						data[i] = new ArraySegment<byte>(d.Buf.Array, d.Buf.Offset, d.DataLen);
-					}
-
-					lock (_closeLock) {
-						if(!_isClosed)
-							callback(this, data);
-					}
-
-					for (int i = 0, n = res.Count; i < n; ++i) {
-						TcpConnection.BufferManager.CheckIn(res[i].Buf); // dispose buffers
-					}
-
-					NotifyReceiveDispatched(bytes);
-				}
-
-				Interlocked.Exchange(ref _receiveHandling, 0);
-			} while (!_receiveQueue.IsEmpty
-			         && _receiveCallback != null
-			         && Interlocked.CompareExchange(ref _receiveHandling, 1, 0) == 0);
-		}
-
-		public void Close(string reason) {
-			CloseInternal(SocketError.Success, reason ?? "Normal socket close."); // normal socket closing
-		}
-
-		private void CloseInternal(SocketError socketError, string reason) {
-			lock (_closeLock) {
-				if (_isClosing) return;
-				_isClosing = true;
-			}
-
-			if (_sslStream != null)
-				Helper.EatException(() => _sslStream.Close());
-
-			if (_socket != null)
-				Helper.EatException(() => _socket.Dispose());
-
-			lock (_closeLock) {
-				_isClosed = true;
-			}
-
-			NotifyClosed();
-
-			if (_verbose) {
-				Log.Information(
-					"ES {connectionType} closed [{dateTime:HH:mm:ss.fff}: N{remoteEndPoint}, L{localEndPoint}, {connectionId:B}]:Received bytes: {totalBytesReceived}, Sent bytes: {totalBytesSent}",
-					GetType().Name, DateTime.UtcNow, RemoteEndPoint, LocalEndPoint, _connectionId,
-					TotalBytesReceived, TotalBytesSent);
-				Log.Information(
-					"ES {connectionType} closed [{dateTime:HH:mm:ss.fff}: N{remoteEndPoint}, L{localEndPoint}, {connectionId:B}]:Send calls: {sendCalls}, callbacks: {sendCallbacks}",
-					GetType().Name, DateTime.UtcNow, RemoteEndPoint, LocalEndPoint, _connectionId,
-					SendCalls, SendCallbacks);
-				Log.Information(
-					"ES {connectionType} closed [{dateTime:HH:mm:ss.fff}: N{remoteEndPoint}, L{localEndPoint}, {connectionId:B}]:Receive calls: {receiveCalls}, callbacks: {receiveCallbacks}",
-					GetType().Name, DateTime.UtcNow, RemoteEndPoint, LocalEndPoint, _connectionId,
-					ReceiveCalls, ReceiveCallbacks);
-				Log.Information(
-					"ES {connectionType} closed [{dateTime:HH:mm:ss.fff}: N{remoteEndPoint}, L{localEndPoint}, {connectionId:B}]:Close reason: [{e}] {reason}",
-					GetType().Name, DateTime.UtcNow, RemoteEndPoint, LocalEndPoint, _connectionId,
-					socketError, reason);
-			}
-
-			var handler = ConnectionClosed;
-			if (handler != null)
-				handler(this, socketError);
-		}
-
-		public void SetClientConnectionName(string clientConnectionName) {
-			_clientConnectionName = clientConnectionName;
-		}
-
-		public override string ToString() {
-			return "S" + RemoteEndPoint;
-		}
-
-		private struct ReceivedData {
-			public readonly ArraySegment<byte> Buf;
-			public readonly int DataLen;
-
-			public ReceivedData(ArraySegment<byte> buf, int dataLen) {
-				Buf = buf;
-				DataLen = dataLen;
-			}
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Tcp/TcpServerListener.cs b/src/EventStore.Transport.Tcp/TcpServerListener.cs
deleted file mode 100644
index c770ff3877d..00000000000
--- a/src/EventStore.Transport.Tcp/TcpServerListener.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System;
-using System.Net;
-using System.Net.Sockets;
-using EventStore.Common.Utils;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Transport.Tcp {
-	public class TcpServerListener {
-		private static readonly ILogger Log = Serilog.Log.ForContext<TcpServerListener>();
-
-		private readonly IPEndPoint _serverEndPoint;
-		private readonly Socket _listeningSocket;
-		private readonly SocketArgsPool _acceptSocketArgsPool;
-		private Action<IPEndPoint, Socket> _onSocketAccepted;
-
-		public TcpServerListener(IPEndPoint serverEndPoint) {
-			Ensure.NotNull(serverEndPoint, "serverEndPoint");
-
-			_serverEndPoint = serverEndPoint;
-
-			_listeningSocket = new Socket(serverEndPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
-
-			_acceptSocketArgsPool = new SocketArgsPool("TcpServerListener.AcceptSocketArgsPool",
-				TcpConfiguration.ConcurrentAccepts * 2,
-				CreateAcceptSocketArgs);
-		}
-
-		private SocketAsyncEventArgs CreateAcceptSocketArgs() {
-			var socketArgs = new SocketAsyncEventArgs();
-			socketArgs.Completed += AcceptCompleted;
-			return socketArgs;
-		}
-
-		public void StartListening(Action<IPEndPoint, Socket> callback, string securityType) {
-			Ensure.NotNull(callback, "callback");
-
-			_onSocketAccepted = callback;
-
-			Log.Information("Starting {securityType} TCP listening on TCP endpoint: {serverEndPoint}.", securityType,
-				_serverEndPoint);
-			try {
-				_listeningSocket.ExclusiveAddressUse = true;
-				_listeningSocket.Bind(_serverEndPoint);
-				_listeningSocket.Listen(TcpConfiguration.AcceptBacklogCount);
-			} catch (Exception) {
-				Log.Information("Failed to listen on TCP endpoint: {serverEndPoint}.", _serverEndPoint);
-				Helper.EatException(() => _listeningSocket.Close(TcpConfiguration.SocketCloseTimeoutSecs));
-				throw;
-			}
-
-			for (int i = 0; i < TcpConfiguration.ConcurrentAccepts; ++i) {
-				StartAccepting();
-			}
-		}
-
-		private void StartAccepting() {
-			var socketArgs = _acceptSocketArgsPool.Get();
-
-			try {
-				var firedAsync = _listeningSocket.AcceptAsync(socketArgs);
-				if (!firedAsync)
-					ProcessAccept(socketArgs);
-			} catch (ObjectDisposedException) {
-				HandleBadAccept(socketArgs);
-			}
-		}
-
-		private void AcceptCompleted(object sender, SocketAsyncEventArgs e) {
-			ProcessAccept(e);
-		}
-
-		private void ProcessAccept(SocketAsyncEventArgs e) {
-			if (e.SocketError != SocketError.Success) {
-				HandleBadAccept(e);
-			} else {
-				var acceptSocket = e.AcceptSocket;
-				e.AcceptSocket = null;
-				_acceptSocketArgsPool.Return(e);
-
-				OnSocketAccepted(acceptSocket);
-			}
-
-			StartAccepting();
-		}
-
-		private void HandleBadAccept(SocketAsyncEventArgs socketArgs) {
-			Helper.EatException(
-				() => {
-					if (socketArgs.AcceptSocket != null) // avoid annoying exceptions
-						socketArgs.AcceptSocket.Close(TcpConfiguration.SocketCloseTimeoutSecs);
-				});
-			socketArgs.AcceptSocket = null;
-			_acceptSocketArgsPool.Return(socketArgs);
-		}
-
-		private void OnSocketAccepted(Socket socket) {
-			IPEndPoint socketEndPoint;
-			try {
-				socketEndPoint = (IPEndPoint)socket.RemoteEndPoint;
-			} catch (Exception) {
-				return;
-			}
-
-			_onSocketAccepted(socketEndPoint, socket);
-		}
-
-		public void Stop() {
-			Helper.EatException(() => _listeningSocket.Close(TcpConfiguration.SocketCloseTimeoutSecs));
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Tcp/TcpStats.cs b/src/EventStore.Transport.Tcp/TcpStats.cs
deleted file mode 100644
index e05a534afe7..00000000000
--- a/src/EventStore.Transport.Tcp/TcpStats.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-
-namespace EventStore.Transport.Tcp {
-	public class TcpStats {
-		///<summary>
-		///Number of TCP connections to Event Store
-		///</summary>
-		public readonly int Connections;
-		///<summary>
-		///Total bytes sent from TCP connections
-		///</summary>
-		public readonly long SentBytesTotal;
-		///<summary>
-		///Total bytes received by TCP connections
-		///</summary>
-		public readonly long ReceivedBytesTotal;
-		///<summary>
-		///Total bytes sent to TCP connections since last run
-		///</summary>
-		public readonly long SentBytesSinceLastRun;
-		///<summary>
-		///Total bytes received by TCP connections since last run
-		///</summary>
-		public readonly long ReceivedBytesSinceLastRun;
-		///<summary>
-		///Sending speed in bytes per second
-		///</summary>
-		public readonly double SendingSpeed;
-		///<summary>
-		///Receiving speed in bytes per second.
-		///</summary>
-		public readonly double ReceivingSpeed;
-		///<summary>
-		///Number of bytes waiting to be sent to connections
-		///</summary>
-		public readonly long PendingSend;
-		///<summary>
-		///Number of bytes sent to connections but not yet acknowledged by the receiving party
-		///</summary>
-		public readonly long InSend;
-		///<summary>
-		///Number of bytes waiting to be received by connections
-		///</summary>
-		public readonly long PendingReceived;
-		///<summary>
-		///Time elapsed since last stats read
-		///</summary>
-		public readonly TimeSpan MeasureTime;
-
-		public TcpStats(int connections,
-			long sentBytesTotal,
-			long receivedBytesTotal,
-			long sentBytesSinceLastRunSinceLastRun,
-			long receivedBytesSinceLastRun,
-			long pendingSend,
-			long inSend,
-			long pendingReceived,
-			TimeSpan measureTime) {
-			Connections = connections;
-			SentBytesTotal = sentBytesTotal;
-			ReceivedBytesTotal = receivedBytesTotal;
-			SentBytesSinceLastRun = sentBytesSinceLastRunSinceLastRun;
-			ReceivedBytesSinceLastRun = receivedBytesSinceLastRun;
-			PendingSend = pendingSend;
-			InSend = inSend;
-			PendingReceived = pendingReceived;
-			MeasureTime = measureTime;
-			SendingSpeed = (MeasureTime.TotalSeconds < 0.00001) ? 0 : SentBytesSinceLastRun / MeasureTime.TotalSeconds;
-			ReceivingSpeed = (MeasureTime.TotalSeconds < 0.00001)
-				? 0
-				: ReceivedBytesSinceLastRun / MeasureTime.TotalSeconds;
-		}
-	}
-}
diff --git a/src/EventStore.Transport.Tcp/TcpTypedConnection.cs b/src/EventStore.Transport.Tcp/TcpTypedConnection.cs
deleted file mode 100644
index 10d36b643a8..00000000000
--- a/src/EventStore.Transport.Tcp/TcpTypedConnection.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Sockets;
-using EventStore.Transport.Tcp.Formatting;
-using EventStore.Transport.Tcp.Framing;
-using ILogger = Serilog.ILogger;
-
-namespace EventStore.Transport.Tcp {
-	public class TcpTypedConnection<T> {
-		private static readonly ILogger Log =
-			Serilog.Log.ForContext(Serilog.Core.Constants.SourceContextPropertyName, "TcpTypedConnection");
-
-		public event Action<TcpTypedConnection<T>, SocketError> ConnectionClosed;
-
-		private readonly ITcpConnection _connection;
-		private readonly IMessageFormatter<T> _formatter;
-		private readonly IMessageFramer<ArraySegment<byte>> _framer;
-
-		private Action<TcpTypedConnection<T>, T> _receiveCallback;
-
-		public EndPoint RemoteEndPoint {
-			get { return _connection.RemoteEndPoint; }
-		}
-
-		public EndPoint LocalEndPoint {
-			get { return _connection.LocalEndPoint; }
-		}
-
-		public int SendQueueSize {
-			get { return _connection.SendQueueSize; }
-		}
-
-		public TcpTypedConnection(ITcpConnection connection,
-			IMessageFormatter<T> formatter,
-			IMessageFramer<ArraySegment<byte>> framer) {
-			if (formatter == null)
-				throw new ArgumentNullException("formatter");
-			if (framer == null)
-				throw new ArgumentNullException("framer");
-
-			_connection = connection;
-			_formatter = formatter;
-			_framer = framer;
-
-			connection.ConnectionClosed += OnConnectionClosed;
-
-			//Setup callback for incoming messages
-			framer.RegisterMessageArrivedCallback(IncomingMessageArrived);
-		}
-
-		private void OnConnectionClosed(ITcpConnection connection, SocketError socketError) {
-			connection.ConnectionClosed -= OnConnectionClosed;
-
-			var handler = ConnectionClosed;
-			if (handler != null)
-				handler(this, socketError);
-		}
-
-		public void EnqueueSend(T message) {
-			var data = _formatter.ToArraySegment(message);
-			_connection.EnqueueSend(_framer.FrameData(data));
-		}
-
-		public void ReceiveAsync(Action<TcpTypedConnection<T>, T> callback) {
-			if (_receiveCallback != null)
-				throw new InvalidOperationException("ReceiveAsync should be called just once.");
-
-			if (callback == null)
-				throw new ArgumentNullException("callback");
-
-			_receiveCallback = callback;
-
-			_connection.ReceiveAsync(OnRawDataReceived);
-		}
-
-		private void OnRawDataReceived(ITcpConnection connection, IEnumerable<ArraySegment<byte>> data) {
-			try {
-				_framer.UnFrameData(data);
-			} catch (PackageFramingException exc) {
-				Log.Information(exc, "Invalid TCP frame received.");
-				Close("Invalid TCP frame received.");
-				return;
-			}
-
-			connection.ReceiveAsync(OnRawDataReceived);
-		}
-
-		private void IncomingMessageArrived(ArraySegment<byte> message) {
-			_receiveCallback(this, _formatter.From(message));
-		}
-
-		public void Close(string reason = null) {
-			_connection.Close(reason);
-		}
-	}
-}
diff --git a/src/EventStore.UI b/src/EventStore.UI
deleted file mode 160000
index 4175ff3f9c1..00000000000
--- a/src/EventStore.UI
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4175ff3f9c18cfd5432f76e3b3a5bed868084fca
diff --git a/src/EventStore.sln b/src/EventStore.sln
deleted file mode 100644
index e176b07773b..00000000000
--- a/src/EventStore.sln
+++ /dev/null
@@ -1,397 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.3.32929.385
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.BufferManagement", "EventStore.BufferManagement\EventStore.BufferManagement.csproj", "{C7B79854-21DB-48A9-89E3-136404F13DF5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.BufferManagement.Tests", "EventStore.BufferManagement.Tests\EventStore.BufferManagement.Tests.csproj", "{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.Projections.Core.Tests", "EventStore.Projections.Core.Tests\EventStore.Projections.Core.Tests.csproj", "{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.ClusterNode.Web", "EventStore.ClusterNode.Web\EventStore.ClusterNode.Web.csproj", "{401862D3-E12F-470C-9137-B9DE10591AC6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.Common", "EventStore.Common\EventStore.Common.csproj", "{3F955137-DC23-4AC1-B7F8-6D0857234CCB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.Core.Tests", "EventStore.Core.Tests\EventStore.Core.Tests.csproj", "{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.Projections.Core", "EventStore.Projections.Core\EventStore.Projections.Core.csproj", "{800E7456-4BC4-49B5-940F-1D634B687C6E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.TestClient", "EventStore.TestClient\EventStore.TestClient.csproj", "{68011903-5E41-41E2-891B-2C0B3B13C189}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.Transport.Http", "EventStore.Transport.Http\EventStore.Transport.Http.csproj", "{EB8587FE-7805-4306-AD50-EBE45AB0A189}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.Core", "EventStore.Core\EventStore.Core.csproj", "{9957CA10-8A8A-419F-92BD-7A8BE3014345}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.Transport.Tcp", "EventStore.Transport.Tcp\EventStore.Transport.Tcp.csproj", "{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.ClusterNode", "EventStore.ClusterNode\EventStore.ClusterNode.csproj", "{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.Native", "EventStore.Native\EventStore.Native.csproj", "{03FA0763-6D41-44C0-911D-662AE2B10084}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A19631BB-65CF-4726-8732-4EFD977E9B32}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		..\.github\CODEOWNERS = ..\.github\CODEOWNERS
-		Directory.Build.props = Directory.Build.props
-		Directory.Build.targets = Directory.Build.targets
-		..\Dockerfile = ..\Dockerfile
-		..\qodana.yaml = ..\qodana.yaml
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.NETCore.Compatibility", "EventStore.NETCore.Compatibility\EventStore.NETCore.Compatibility.csproj", "{066B6514-86A0-41D8-BB6A-D9B05141D026}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.LogV3", "EventStore.LogV3\EventStore.LogV3.csproj", "{0A8829D0-0A6F-43A5-ACD4-970690296C52}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.LogV3.Tests", "EventStore.LogV3.Tests\EventStore.LogV3.Tests.csproj", "{97EDD08B-0E2F-4445-A4CA-36285954BBDC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.LogCommon", "EventStore.LogCommon\EventStore.LogCommon.csproj", "{B1185D46-45AE-49DD-99BF-602B9359BACF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.Core.XUnit.Tests", "EventStore.Core.XUnit.Tests\EventStore.Core.XUnit.Tests.csproj", "{101DD668-2140-4183-8C97-F641173AF736}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.Projections.Core.Javascript.Tests", "EventStore.Projections.Core.Javascript.Tests\EventStore.Projections.Core.Javascript.Tests.csproj", "{1826D544-16E6-460F-A8F2-1D56B5041AE7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.MicroBenchmarks", "EventStore.MicroBenchmarks\EventStore.MicroBenchmarks.csproj", "{87F81751-192B-4263-A658-6DFC51EA557C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.SourceGenerators", "EventStore.SourceGenerators\EventStore.SourceGenerators.csproj", "{24BA3208-F690-4DD4-AECB-E339DEE0C69E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.SourceGenerators.Tests", "EventStore.SourceGenerators.Tests\EventStore.SourceGenerators.Tests.csproj", "{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.Common.Tests", "EventStore.Common.Tests\EventStore.Common.Tests.csproj", "{58219323-BD46-4F67-A83A-410F56F84EE3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.PluginHosting", "EventStore.PluginHosting\EventStore.PluginHosting.csproj", "{8B021F57-D4B1-47D6-85AA-DE2D20486840}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.SystemRuntime", "EventStore.SystemRuntime\EventStore.SystemRuntime.csproj", "{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.Projections.Core.XUnit.Tests", "EventStore.Projections.Core.XUnit.Tests\EventStore.Projections.Core.XUnit.Tests.csproj", "{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM64 = Debug|ARM64
-		Debug|x64 = Debug|x64
-		Release|Any CPU = Release|Any CPU
-		Release|ARM64 = Release|ARM64
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Debug|ARM64.Build.0 = Debug|ARM64
-		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Debug|x64.ActiveCfg = Debug|x64
-		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Debug|x64.Build.0 = Debug|x64
-		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Release|ARM64.ActiveCfg = Release|ARM64
-		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Release|ARM64.Build.0 = Release|ARM64
-		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Release|x64.ActiveCfg = Release|x64
-		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Release|x64.Build.0 = Release|x64
-		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Debug|ARM64.Build.0 = Debug|ARM64
-		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Debug|x64.ActiveCfg = Debug|x64
-		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Debug|x64.Build.0 = Debug|x64
-		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Release|ARM64.ActiveCfg = Release|ARM64
-		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Release|ARM64.Build.0 = Release|ARM64
-		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Release|x64.ActiveCfg = Release|x64
-		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Release|x64.Build.0 = Release|x64
-		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Debug|ARM64.Build.0 = Debug|ARM64
-		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Debug|x64.ActiveCfg = Debug|x64
-		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Debug|x64.Build.0 = Debug|x64
-		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Release|Any CPU.Build.0 = Release|Any CPU
-		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Release|ARM64.ActiveCfg = Release|ARM64
-		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Release|ARM64.Build.0 = Release|ARM64
-		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Release|x64.ActiveCfg = Release|x64
-		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Release|x64.Build.0 = Release|x64
-		{401862D3-E12F-470C-9137-B9DE10591AC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{401862D3-E12F-470C-9137-B9DE10591AC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{401862D3-E12F-470C-9137-B9DE10591AC6}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{401862D3-E12F-470C-9137-B9DE10591AC6}.Debug|ARM64.Build.0 = Debug|ARM64
-		{401862D3-E12F-470C-9137-B9DE10591AC6}.Debug|x64.ActiveCfg = Debug|x64
-		{401862D3-E12F-470C-9137-B9DE10591AC6}.Debug|x64.Build.0 = Debug|x64
-		{401862D3-E12F-470C-9137-B9DE10591AC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{401862D3-E12F-470C-9137-B9DE10591AC6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{401862D3-E12F-470C-9137-B9DE10591AC6}.Release|ARM64.ActiveCfg = Release|ARM64
-		{401862D3-E12F-470C-9137-B9DE10591AC6}.Release|ARM64.Build.0 = Release|ARM64
-		{401862D3-E12F-470C-9137-B9DE10591AC6}.Release|x64.ActiveCfg = Release|x64
-		{401862D3-E12F-470C-9137-B9DE10591AC6}.Release|x64.Build.0 = Release|x64
-		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Debug|ARM64.Build.0 = Debug|ARM64
-		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Debug|x64.ActiveCfg = Debug|x64
-		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Debug|x64.Build.0 = Debug|x64
-		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Release|ARM64.ActiveCfg = Release|ARM64
-		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Release|ARM64.Build.0 = Release|ARM64
-		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Release|x64.ActiveCfg = Release|x64
-		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Release|x64.Build.0 = Release|x64
-		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Debug|ARM64.Build.0 = Debug|ARM64
-		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Debug|x64.ActiveCfg = Debug|x64
-		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Debug|x64.Build.0 = Debug|x64
-		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Release|ARM64.ActiveCfg = Release|ARM64
-		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Release|ARM64.Build.0 = Release|ARM64
-		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Release|x64.ActiveCfg = Release|x64
-		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Release|x64.Build.0 = Release|x64
-		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Debug|ARM64.Build.0 = Debug|ARM64
-		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Debug|x64.ActiveCfg = Debug|x64
-		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Debug|x64.Build.0 = Debug|x64
-		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Release|ARM64.ActiveCfg = Release|ARM64
-		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Release|ARM64.Build.0 = Release|ARM64
-		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Release|x64.ActiveCfg = Release|x64
-		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Release|x64.Build.0 = Release|x64
-		{68011903-5E41-41E2-891B-2C0B3B13C189}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{68011903-5E41-41E2-891B-2C0B3B13C189}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{68011903-5E41-41E2-891B-2C0B3B13C189}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{68011903-5E41-41E2-891B-2C0B3B13C189}.Debug|ARM64.Build.0 = Debug|ARM64
-		{68011903-5E41-41E2-891B-2C0B3B13C189}.Debug|x64.ActiveCfg = Debug|x64
-		{68011903-5E41-41E2-891B-2C0B3B13C189}.Debug|x64.Build.0 = Debug|x64
-		{68011903-5E41-41E2-891B-2C0B3B13C189}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{68011903-5E41-41E2-891B-2C0B3B13C189}.Release|Any CPU.Build.0 = Release|Any CPU
-		{68011903-5E41-41E2-891B-2C0B3B13C189}.Release|ARM64.ActiveCfg = Release|ARM64
-		{68011903-5E41-41E2-891B-2C0B3B13C189}.Release|ARM64.Build.0 = Release|ARM64
-		{68011903-5E41-41E2-891B-2C0B3B13C189}.Release|x64.ActiveCfg = Release|x64
-		{68011903-5E41-41E2-891B-2C0B3B13C189}.Release|x64.Build.0 = Release|x64
-		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Debug|ARM64.Build.0 = Debug|ARM64
-		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Debug|x64.ActiveCfg = Debug|x64
-		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Debug|x64.Build.0 = Debug|x64
-		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Release|ARM64.ActiveCfg = Release|ARM64
-		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Release|ARM64.Build.0 = Release|ARM64
-		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Release|x64.ActiveCfg = Release|x64
-		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Release|x64.Build.0 = Release|x64
-		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Debug|ARM64.Build.0 = Debug|ARM64
-		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Debug|x64.ActiveCfg = Debug|x64
-		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Debug|x64.Build.0 = Debug|x64
-		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Release|ARM64.ActiveCfg = Release|ARM64
-		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Release|ARM64.Build.0 = Release|ARM64
-		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Release|x64.ActiveCfg = Release|x64
-		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Release|x64.Build.0 = Release|x64
-		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Debug|ARM64.Build.0 = Debug|ARM64
-		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Debug|x64.ActiveCfg = Debug|x64
-		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Debug|x64.Build.0 = Debug|x64
-		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Release|ARM64.ActiveCfg = Release|ARM64
-		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Release|ARM64.Build.0 = Release|ARM64
-		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Release|x64.ActiveCfg = Release|x64
-		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Release|x64.Build.0 = Release|x64
-		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Debug|ARM64.Build.0 = Debug|ARM64
-		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Debug|x64.ActiveCfg = Debug|x64
-		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Debug|x64.Build.0 = Debug|x64
-		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Release|ARM64.ActiveCfg = Release|ARM64
-		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Release|ARM64.Build.0 = Release|ARM64
-		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Release|x64.ActiveCfg = Release|x64
-		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Release|x64.Build.0 = Release|x64
-		{03FA0763-6D41-44C0-911D-662AE2B10084}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{03FA0763-6D41-44C0-911D-662AE2B10084}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{03FA0763-6D41-44C0-911D-662AE2B10084}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{03FA0763-6D41-44C0-911D-662AE2B10084}.Debug|ARM64.Build.0 = Debug|ARM64
-		{03FA0763-6D41-44C0-911D-662AE2B10084}.Debug|x64.ActiveCfg = Debug|x64
-		{03FA0763-6D41-44C0-911D-662AE2B10084}.Debug|x64.Build.0 = Debug|x64
-		{03FA0763-6D41-44C0-911D-662AE2B10084}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{03FA0763-6D41-44C0-911D-662AE2B10084}.Release|Any CPU.Build.0 = Release|Any CPU
-		{03FA0763-6D41-44C0-911D-662AE2B10084}.Release|ARM64.ActiveCfg = Release|ARM64
-		{03FA0763-6D41-44C0-911D-662AE2B10084}.Release|ARM64.Build.0 = Release|ARM64
-		{03FA0763-6D41-44C0-911D-662AE2B10084}.Release|x64.ActiveCfg = Release|x64
-		{03FA0763-6D41-44C0-911D-662AE2B10084}.Release|x64.Build.0 = Release|x64
-		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Debug|ARM64.Build.0 = Debug|ARM64
-		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Debug|x64.ActiveCfg = Debug|x64
-		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Debug|x64.Build.0 = Debug|x64
-		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Release|Any CPU.Build.0 = Release|Any CPU
-		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Release|ARM64.ActiveCfg = Release|ARM64
-		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Release|ARM64.Build.0 = Release|ARM64
-		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Release|x64.ActiveCfg = Release|x64
-		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Release|x64.Build.0 = Release|x64
-		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Debug|ARM64.Build.0 = Debug|ARM64
-		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Debug|x64.ActiveCfg = Debug|x64
-		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Debug|x64.Build.0 = Debug|x64
-		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Release|ARM64.ActiveCfg = Release|ARM64
-		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Release|ARM64.Build.0 = Release|ARM64
-		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Release|x64.ActiveCfg = Release|x64
-		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Release|x64.Build.0 = Release|x64
-		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Debug|ARM64.Build.0 = Debug|ARM64
-		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Debug|x64.ActiveCfg = Debug|x64
-		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Debug|x64.Build.0 = Debug|x64
-		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Release|ARM64.ActiveCfg = Release|ARM64
-		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Release|ARM64.Build.0 = Release|ARM64
-		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Release|x64.ActiveCfg = Release|x64
-		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Release|x64.Build.0 = Release|x64
-		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Debug|ARM64.Build.0 = Debug|ARM64
-		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Debug|x64.ActiveCfg = Debug|x64
-		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Debug|x64.Build.0 = Debug|x64
-		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Release|ARM64.ActiveCfg = Release|ARM64
-		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Release|ARM64.Build.0 = Release|ARM64
-		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Release|x64.ActiveCfg = Release|x64
-		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Release|x64.Build.0 = Release|x64
-		{101DD668-2140-4183-8C97-F641173AF736}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{101DD668-2140-4183-8C97-F641173AF736}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{101DD668-2140-4183-8C97-F641173AF736}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{101DD668-2140-4183-8C97-F641173AF736}.Debug|ARM64.Build.0 = Debug|ARM64
-		{101DD668-2140-4183-8C97-F641173AF736}.Debug|x64.ActiveCfg = Debug|x64
-		{101DD668-2140-4183-8C97-F641173AF736}.Debug|x64.Build.0 = Debug|x64
-		{101DD668-2140-4183-8C97-F641173AF736}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{101DD668-2140-4183-8C97-F641173AF736}.Release|Any CPU.Build.0 = Release|Any CPU
-		{101DD668-2140-4183-8C97-F641173AF736}.Release|ARM64.ActiveCfg = Release|ARM64
-		{101DD668-2140-4183-8C97-F641173AF736}.Release|ARM64.Build.0 = Release|ARM64
-		{101DD668-2140-4183-8C97-F641173AF736}.Release|x64.ActiveCfg = Release|x64
-		{101DD668-2140-4183-8C97-F641173AF736}.Release|x64.Build.0 = Release|x64
-		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Debug|ARM64.Build.0 = Debug|ARM64
-		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Debug|x64.ActiveCfg = Debug|x64
-		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Debug|x64.Build.0 = Debug|x64
-		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Release|ARM64.ActiveCfg = Release|ARM64
-		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Release|ARM64.Build.0 = Release|ARM64
-		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Release|x64.ActiveCfg = Release|x64
-		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Release|x64.Build.0 = Release|x64
-		{87F81751-192B-4263-A658-6DFC51EA557C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87F81751-192B-4263-A658-6DFC51EA557C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87F81751-192B-4263-A658-6DFC51EA557C}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{87F81751-192B-4263-A658-6DFC51EA557C}.Debug|ARM64.Build.0 = Debug|ARM64
-		{87F81751-192B-4263-A658-6DFC51EA557C}.Debug|x64.ActiveCfg = Debug|x64
-		{87F81751-192B-4263-A658-6DFC51EA557C}.Debug|x64.Build.0 = Debug|x64
-		{87F81751-192B-4263-A658-6DFC51EA557C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{87F81751-192B-4263-A658-6DFC51EA557C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{87F81751-192B-4263-A658-6DFC51EA557C}.Release|ARM64.ActiveCfg = Release|ARM64
-		{87F81751-192B-4263-A658-6DFC51EA557C}.Release|ARM64.Build.0 = Release|ARM64
-		{87F81751-192B-4263-A658-6DFC51EA557C}.Release|x64.ActiveCfg = Release|x64
-		{87F81751-192B-4263-A658-6DFC51EA557C}.Release|x64.Build.0 = Release|x64
-		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Debug|ARM64.Build.0 = Debug|ARM64
-		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Debug|x64.ActiveCfg = Debug|x64
-		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Debug|x64.Build.0 = Debug|x64
-		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Release|ARM64.ActiveCfg = Release|ARM64
-		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Release|ARM64.Build.0 = Release|ARM64
-		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Release|x64.ActiveCfg = Release|x64
-		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Release|x64.Build.0 = Release|x64
-		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Debug|ARM64.Build.0 = Debug|ARM64
-		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Debug|x64.ActiveCfg = Debug|x64
-		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Debug|x64.Build.0 = Debug|x64
-		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Release|ARM64.ActiveCfg = Release|ARM64
-		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Release|ARM64.Build.0 = Release|ARM64
-		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Release|x64.ActiveCfg = Release|x64
-		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Release|x64.Build.0 = Release|x64
-		{58219323-BD46-4F67-A83A-410F56F84EE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{58219323-BD46-4F67-A83A-410F56F84EE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{58219323-BD46-4F67-A83A-410F56F84EE3}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{58219323-BD46-4F67-A83A-410F56F84EE3}.Debug|ARM64.Build.0 = Debug|ARM64
-		{58219323-BD46-4F67-A83A-410F56F84EE3}.Debug|x64.ActiveCfg = Debug|x64
-		{58219323-BD46-4F67-A83A-410F56F84EE3}.Debug|x64.Build.0 = Debug|x64
-		{58219323-BD46-4F67-A83A-410F56F84EE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{58219323-BD46-4F67-A83A-410F56F84EE3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{58219323-BD46-4F67-A83A-410F56F84EE3}.Release|ARM64.ActiveCfg = Release|ARM64
-		{58219323-BD46-4F67-A83A-410F56F84EE3}.Release|ARM64.Build.0 = Release|ARM64
-		{58219323-BD46-4F67-A83A-410F56F84EE3}.Release|x64.ActiveCfg = Release|x64
-		{58219323-BD46-4F67-A83A-410F56F84EE3}.Release|x64.Build.0 = Release|x64
-		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Debug|ARM64.Build.0 = Debug|ARM64
-		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Debug|x64.ActiveCfg = Debug|x64
-		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Debug|x64.Build.0 = Debug|x64
-		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Release|ARM64.ActiveCfg = Release|ARM64
-		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Release|ARM64.Build.0 = Release|ARM64
-		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Release|x64.ActiveCfg = Release|x64
-		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Release|x64.Build.0 = Release|x64
-		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Debug|ARM64.Build.0 = Debug|ARM64
-		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Debug|x64.ActiveCfg = Debug|x64
-		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Debug|x64.Build.0 = Debug|x64
-		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Release|ARM64.ActiveCfg = Release|ARM64
-		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Release|ARM64.Build.0 = Release|ARM64
-		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Release|x64.ActiveCfg = Release|x64
-		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Release|x64.Build.0 = Release|x64
-		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Debug|ARM64.Build.0 = Debug|ARM64
-		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Debug|x64.ActiveCfg = Debug|x64
-		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Debug|x64.Build.0 = Debug|x64
-		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Release|ARM64.ActiveCfg = Release|ARM64
-		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Release|ARM64.Build.0 = Release|ARM64
-		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Release|x64.ActiveCfg = Release|x64
-		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {CD63E89D-F4FA-42A7-A10B-50CF854078FA}
-	EndGlobalSection
-EndGlobal
diff --git a/src/KurrentDB.Auth.Ldaps.Tests/FactRequiringDockerAttribute.cs b/src/KurrentDB.Auth.Ldaps.Tests/FactRequiringDockerAttribute.cs
new file mode 100644
index 00000000000..d87b472f647
--- /dev/null
+++ b/src/KurrentDB.Auth.Ldaps.Tests/FactRequiringDockerAttribute.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using Xunit;
+
+namespace KurrentDB.Auth.Ldaps.Tests;
+
+public sealed class FactRequiringDockerAttribute : FactAttribute {
+	public FactRequiringDockerAttribute() {
+		if (OperatingSystem.IsWindows()) {
+			var gha = Environment.GetEnvironmentVariable("GITHUB_ACTIONS") ?? "false";
+			if (gha.Equals("true", StringComparison.InvariantCultureIgnoreCase)) {
+				Skip = "Windows machines in GitHub actions do not have access to linux docker containers.";
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Auth.Ldaps.Tests/KurrentDB.Auth.Ldaps.Tests.csproj b/src/KurrentDB.Auth.Ldaps.Tests/KurrentDB.Auth.Ldaps.Tests.csproj
new file mode 100644
index 00000000000..7fd891a7de0
--- /dev/null
+++ b/src/KurrentDB.Auth.Ldaps.Tests/KurrentDB.Auth.Ldaps.Tests.csproj
@@ -0,0 +1,42 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+      <TargetFramework>net8.0</TargetFramework>
+      <IsPackable>false</IsPackable>
+      <IsPublishable>false</IsPublishable>
+			<IsTestProject>true</IsTestProject>
+      <Configurations>Release;Debug</Configurations>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+      <DebugSymbols>true</DebugSymbols>
+    </PropertyGroup>
+
+    <ItemGroup>
+			<PackageReference Include="EventStore.Plugins" Version="25.2.5" />
+      <PackageReference Include="Ductus.FluentDocker.XUnit" Version="2.10.59" />
+      <PackageReference Include="EventStore.Client.Grpc.Streams" Version="23.1.0" />
+			<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3">
+			  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			  <PrivateAssets>all</PrivateAssets>
+			</PackageReference>
+			<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.11" />
+			<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+			<PackageReference Include="xunit" Version="2.6.6" />
+      <PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\KurrentDB.Auth.Ldaps\KurrentDB.Auth.Ldaps.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Content Include="conf\ldaps.conf">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </Content>
+    </ItemGroup>
+
+</Project>
diff --git a/src/KurrentDB.Auth.Ldaps.Tests/LdapsFixture.cs b/src/KurrentDB.Auth.Ldaps.Tests/LdapsFixture.cs
new file mode 100644
index 00000000000..ddc5cdccfd1
--- /dev/null
+++ b/src/KurrentDB.Auth.Ldaps.Tests/LdapsFixture.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using Ductus.FluentDocker.Builders;
+using Ductus.FluentDocker.Extensions;
+using Ductus.FluentDocker.Services;
+using Ductus.FluentDocker.Services.Extensions;
+using Xunit.Abstractions;
+
+namespace KurrentDB.Auth.Ldaps.Tests;
+
+public class LdapsFixture : IDisposable {
+
+	private const int InsecurePort = 10389;
+	private const int SecurePort = 10636;
+
+	private readonly ITestOutputHelper _output;
+	private readonly IContainerService _ldapsServer;
+
+	public LdapsFixture(ITestOutputHelper output) {
+		_output = output;
+
+		_ldapsServer = new Builder()
+			.UseContainer()
+			.UseImage("rroemhild/test-openldap")
+			.WithName("es-openldap-server")
+			.ExposePort(InsecurePort, InsecurePort)
+			.ExposePort(SecurePort, SecurePort)
+			.Build();
+	}
+
+	public void Start() {
+		_ldapsServer.ShipContainerLogs(_output);
+		_ldapsServer.Start();
+	}
+
+	public void Dispose() => _ldapsServer?.Dispose();
+}
+internal static class ContainerExtensions {
+	public static void ShipContainerLogs(this IContainerService container, ITestOutputHelper testOutputHelper) =>
+		Task.Run(() => {
+			using var logs = container.Logs(true);
+			foreach (var line in logs.ReadToEnd()) {
+				testOutputHelper.WriteLine(line);
+			}
+		});
+}
diff --git a/src/KurrentDB.Auth.Ldaps.Tests/LdapsPluginTests.cs b/src/KurrentDB.Auth.Ldaps.Tests/LdapsPluginTests.cs
new file mode 100644
index 00000000000..d9f7a02b9e5
--- /dev/null
+++ b/src/KurrentDB.Auth.Ldaps.Tests/LdapsPluginTests.cs
@@ -0,0 +1,206 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using EventStore.Plugins.Licensing;
+using KurrentDB.Plugins.TestHelpers;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace KurrentDB.Auth.Ldaps.Tests;
+
+public class LdapsPluginTests {
+
+	private const string _roleClaimType = "http://schemas.microsoft.com/ws/2008/06/identity/claims/role";
+	private readonly ITestOutputHelper _output;
+
+	private readonly string _configFile;
+	private readonly TimeSpan _timeout = TimeSpan.FromSeconds(5);
+
+	public LdapsPluginTests(ITestOutputHelper output) {
+		_output = output;
+		_configFile = Path.Combine(Environment.CurrentDirectory, "conf", "ldaps.conf");
+	}
+
+	private async Task<LdapsFixture> CreateAndStartFixture() {
+		var fixture = new LdapsFixture(_output);
+		fixture.Start();
+
+		var sut = new LdapsAuthenticationPlugin()
+			.GetAuthenticationProviderFactory(_configFile)
+			.Build(false);
+
+		// There is no health check in this container
+		// Simply try a few requests until one succeeds
+		for (var i = 0; i < 5; i++) {
+			var completionSource = new TaskCompletionSource<TestAuthenticationResponse>();
+			var request = CreateAuthenticationRequest("professor", "professor", completionSource);
+			var task = completionSource.Task;
+			sut.Authenticate(request);
+
+			if (await Task.WhenAny(task, Task.Delay(_timeout)) == task &&
+				string.IsNullOrEmpty(task.Result.FailureReason))
+				return fixture;
+
+			await Task.Delay(500);
+		}
+
+		throw new Exception("LDAPS fixture did not start up in time");
+	}
+
+	[FactRequiringDocker]
+	public async Task authenticate_admin_user_returns_admin_role() {
+		var sut = new LdapsAuthenticationPlugin()
+			.GetAuthenticationProviderFactory(_configFile)
+			.Build(false);
+
+		using var fixture = await CreateAndStartFixture();
+
+		var completionSource = new TaskCompletionSource<TestAuthenticationResponse>();
+		var request = CreateAuthenticationRequest("professor", "professor", completionSource);
+		sut.Authenticate(request);
+
+		var task = completionSource.Task;
+		if (await Task.WhenAny(task, Task.Delay(_timeout)) == task) {
+			var result = await completionSource.Task;
+
+			Assert.Null(result.FailureReason);
+			Assert.NotNull(result.Principal);
+			Assert.Equal("professor", result.Principal.Identity?.Name);
+			Assert.True(result.Principal.HasClaim(_roleClaimType, "$admins"));
+		}
+	}
+
+	[FactRequiringDocker]
+	public async Task authenticate_with_incorrect_password_returns_unauthorized() {
+		var sut = new LdapsAuthenticationPlugin()
+			.GetAuthenticationProviderFactory(_configFile)
+			.Build(false);
+
+		using var fixture = await CreateAndStartFixture();
+
+		var completionSource = new TaskCompletionSource<TestAuthenticationResponse>();
+		var request = CreateAuthenticationRequest("professor", "wrong", completionSource);
+		sut.Authenticate(request);
+
+		var task = completionSource.Task;
+		if (await Task.WhenAny(task, Task.Delay(_timeout)) == task) {
+			var result = await completionSource.Task;
+			Assert.Null(result.Principal);
+			Assert.Equal("unauthorized", result.FailureReason);
+		}
+	}
+
+	[FactRequiringDocker]
+	public async Task authenticate_with_non_existent_user_returns_unauthorized() {
+		var sut = new LdapsAuthenticationPlugin()
+			.GetAuthenticationProviderFactory(_configFile)
+			.Build(false);
+
+		using var fixture = await CreateAndStartFixture();
+
+		var completionSource = new TaskCompletionSource<TestAuthenticationResponse>();
+		var request = CreateAuthenticationRequest("wrong", "wrong", completionSource);
+		sut.Authenticate(request);
+
+		var task = completionSource.Task;
+		if (await Task.WhenAny(task, Task.Delay(_timeout)) == task) {
+			var result = await completionSource.Task;
+			Assert.Null(result.Principal);
+			Assert.Equal("unauthorized", result.FailureReason);
+		}
+	}
+
+	[FactRequiringDocker]
+	public async Task authenticate_user_with_custom_role_returns_expected_roles() {
+		var sut = new LdapsAuthenticationPlugin()
+			.GetAuthenticationProviderFactory(_configFile)
+			.Build(false);
+
+		using var fixture = await CreateAndStartFixture();
+
+		var completionSource = new TaskCompletionSource<TestAuthenticationResponse>();
+		var request = CreateAuthenticationRequest("fry", "fry", completionSource);
+		sut.Authenticate(request);
+
+		var task = completionSource.Task;
+		if (await Task.WhenAny(task, Task.Delay(_timeout)) == task) {
+			var result = await completionSource.Task;
+			Assert.Null(result.FailureReason);
+			Assert.NotNull(result.Principal);
+			Assert.Equal("fry", result.Principal.Identity?.Name);
+			Assert.True(result.Principal.HasClaim(_roleClaimType, "others"));
+			Assert.False(result.Principal.HasClaim(_roleClaimType, "$admins"));
+		}
+	}
+
+	[Fact(Skip = "This currently results in an error and the request never returns")]
+	public async Task authenticate_user_with_no_roles_returns_no_roles() {
+		var sut = new LdapsAuthenticationPlugin()
+			.GetAuthenticationProviderFactory(_configFile)
+			.Build(false);
+
+		using var fixture = await CreateAndStartFixture();
+
+		var completionSource = new TaskCompletionSource<TestAuthenticationResponse>();
+		var request = CreateAuthenticationRequest("amy", "amy", completionSource);
+		sut.Authenticate(request);
+
+		var task = completionSource.Task;
+		if (await Task.WhenAny(task, Task.Delay(_timeout)) == task) {
+			var result = await completionSource.Task;
+
+			Assert.Null(result.FailureReason);
+			Assert.NotNull(result.Principal);
+			Assert.Equal("amy", result.Principal.Identity?.Name);
+			Assert.DoesNotContain(result.Principal.Claims, x => x.Type == _roleClaimType);
+		}
+	}
+
+	private TestAuthenticationRequest CreateAuthenticationRequest(string username, string password,
+		TaskCompletionSource<TestAuthenticationResponse> completionSource) {
+		return new(username, password,
+			p => completionSource.TrySetResult(new TestAuthenticationResponse(p)),
+			() => completionSource.TrySetResult(new TestAuthenticationResponse("unauthorized")),
+			() => completionSource.TrySetResult(new TestAuthenticationResponse("error")),
+			() => completionSource.TrySetResult(new TestAuthenticationResponse("notready")));
+	}
+
+	[Theory]
+	[InlineData(true, "LDAPS_AUTHENTICATION", false)]
+	[InlineData(true, "NONE", true)]
+	[InlineData(false, "NONE", true)]
+	public void respects_license(bool licensePresent, string entitlement, bool expectedException) {
+		// given
+		var sut = new LdapsAuthenticationPlugin()
+			.GetAuthenticationProviderFactory(_configFile)
+			.Build(false);
+
+		var config = new ConfigurationBuilder().Build();
+		var builder = WebApplication.CreateBuilder();
+
+		var licenseService = new Fixtures.FakeLicenseService(licensePresent, entitlement);
+		builder.Services.AddSingleton<ILicenseService>(licenseService);
+
+		sut.ConfigureServices(
+			builder.Services,
+			config);
+
+		var app = builder.Build();
+
+		// when
+		sut.ConfigureApplication(app, config);
+
+		// then
+		if (expectedException) {
+			Assert.NotNull(licenseService.RejectionException);
+		} else {
+			Assert.Null(licenseService.RejectionException);
+		}
+	}
+}
diff --git a/src/KurrentDB.Auth.Ldaps.Tests/TestAuthenticationRequest.cs b/src/KurrentDB.Auth.Ldaps.Tests/TestAuthenticationRequest.cs
new file mode 100644
index 00000000000..2249e6ec076
--- /dev/null
+++ b/src/KurrentDB.Auth.Ldaps.Tests/TestAuthenticationRequest.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using EventStore.Plugins.Authentication;
+
+namespace KurrentDB.Auth.Ldaps.Tests;
+
+public class TestAuthenticationRequest : AuthenticationRequest {
+	private Action<ClaimsPrincipal> _onAuthenticated;
+	private Action _onUnauthorized;
+	private Action _onError;
+	private Action _onNotReady;
+
+	public TestAuthenticationRequest(IReadOnlyDictionary<string, string> tokens) : base("test", tokens) {
+	}
+
+	public TestAuthenticationRequest(
+		string name,
+		string suppliedPassword,
+		Action<ClaimsPrincipal> onAuthenticated,
+		Action onUnauthorized = null,
+		Action onError = null,
+		Action onNotReady = null) : base("test", new Dictionary<string, string> {
+			["uid"] = name,
+			["pwd"] = suppliedPassword
+		}) {
+		_onAuthenticated = onAuthenticated;
+		_onUnauthorized = onUnauthorized;
+		_onError = onError;
+		_onNotReady = onNotReady;
+	}
+
+	public override void Unauthorized() {
+		_onUnauthorized?.Invoke();
+	}
+
+	public override void Authenticated(ClaimsPrincipal principal) {
+		_onAuthenticated?.Invoke(principal);
+	}
+
+	public override void Error() {
+		_onError?.Invoke();
+	}
+
+	public override void NotReady() {
+		_onNotReady?.Invoke();
+	}
+}
+
+public class TestAuthenticationResponse {
+	public readonly ClaimsPrincipal Principal;
+	public readonly string FailureReason;
+
+	public TestAuthenticationResponse(ClaimsPrincipal principal) {
+		Principal = principal;
+	}
+
+	public TestAuthenticationResponse(string failureReason) {
+		FailureReason = failureReason;
+	}
+}
diff --git a/src/KurrentDB.Auth.Ldaps.Tests/conf/ldaps.conf b/src/KurrentDB.Auth.Ldaps.Tests/conf/ldaps.conf
new file mode 100644
index 00000000000..284aed51802
--- /dev/null
+++ b/src/KurrentDB.Auth.Ldaps.Tests/conf/ldaps.conf
@@ -0,0 +1,19 @@
+AuthenticationType: ldaps
+LdapsAuth:
+  Host: 127.0.0.1
+  Port: 10636
+  ValidateServerCertificate: false
+  UseSSL: true
+  AnonymousBind: false
+  BindUser: cn=admin,dc=planetexpress,dc=com
+  BindPassword: GoodNewsEveryone
+  BaseDn: dc=planetexpress,dc=com
+  ObjectClass: organizationalPerson
+  Filter: uid
+  GroupMembershipAttribute: memberOf
+  RequireGroupMembership: false
+  RequiredGroupDn: 'cn=admin_staff,ou=people,dc=planetexpress,dc=com'
+  PrincipalCacheDurationSec: 60
+  LdapGroupRoles:
+    'cn=admin_staff,ou=people,dc=planetexpress,dc=com': '$admins'
+    'cn=ship_crew,ou=people,dc=planetexpress,dc=com': 'others'
diff --git a/src/KurrentDB.Auth.Ldaps/CachedPrincipalWithTimeout.cs b/src/KurrentDB.Auth.Ldaps/CachedPrincipalWithTimeout.cs
new file mode 100644
index 00000000000..a32b4630870
--- /dev/null
+++ b/src/KurrentDB.Auth.Ldaps/CachedPrincipalWithTimeout.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+
+namespace KurrentDB.Auth.Ldaps;
+
+internal class CachedPrincipalWithTimeout {
+	public readonly string Password;
+	public readonly ClaimsPrincipal Principal;
+	public readonly DateTime ValidUntil;
+
+	public CachedPrincipalWithTimeout(string password, ClaimsPrincipal principal, DateTime validUntil) {
+		Password = password;
+		Principal = principal;
+		ValidUntil = validUntil;
+	}
+}
diff --git a/src/KurrentDB.Auth.Ldaps/ILdapsCredentialValidator.cs b/src/KurrentDB.Auth.Ldaps/ILdapsCredentialValidator.cs
new file mode 100644
index 00000000000..3b54121c62e
--- /dev/null
+++ b/src/KurrentDB.Auth.Ldaps/ILdapsCredentialValidator.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Auth.Ldaps;
+
+public interface ILdapsCredentialValidator : IDisposable {
+	bool TryValidateCredentials(string username, string password, out LdapInfo ldapUser);
+}
diff --git a/src/KurrentDB.Auth.Ldaps/KurrentDB.Auth.Ldaps.csproj b/src/KurrentDB.Auth.Ldaps/KurrentDB.Auth.Ldaps.csproj
new file mode 100644
index 00000000000..94c000b4f47
--- /dev/null
+++ b/src/KurrentDB.Auth.Ldaps/KurrentDB.Auth.Ldaps.csproj
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<OutputType>Library</OutputType>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
+	</PropertyGroup>
+	<PropertyGroup>
+		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+	  <DebugSymbols>true</DebugSymbols>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="EventStore.Plugins" Version="25.2.5" />
+		<PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.6.0" />
+		<PackageReference Include="System.ComponentModel.Composition" Version="8.0.0" />
+		<PackageReference Include="Serilog" Version="4.0.1" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.Auth.Ldaps/LRUCache.cs b/src/KurrentDB.Auth.Ldaps/LRUCache.cs
new file mode 100644
index 00000000000..22001ca4a5d
--- /dev/null
+++ b/src/KurrentDB.Auth.Ldaps/LRUCache.cs
@@ -0,0 +1,162 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+
+namespace KurrentDB.Auth.Ldaps;
+
+public class LRUCache<TKey, TValue> {
+	private class LRUItem {
+		public TKey Key;
+		public TValue Value;
+	}
+
+	private readonly LinkedList<LRUItem> _orderList = new LinkedList<LRUItem>();
+
+	private readonly Dictionary<TKey, LinkedListNode<LRUItem>> _items =
+		new Dictionary<TKey, LinkedListNode<LRUItem>>();
+
+	private readonly Queue<LinkedListNode<LRUItem>> _nodesPool = new Queue<LinkedListNode<LRUItem>>();
+
+	private readonly int _maxCount;
+	private readonly object _lock = new object();
+
+	private Func<object, bool>
+		_onPut, _onRemove; //_onPut is not called if a key-value pair already exists in the cache
+
+	public LRUCache(int maxCount) {
+		if (maxCount < 0)
+			throw new ArgumentException("Should be non negative", nameof(maxCount));
+		_maxCount = maxCount;
+	}
+
+	public LRUCache(int maxCount, Func<object, bool> onPut, Func<object, bool> onRemove) {
+		if (maxCount < 0)
+			throw new ArgumentException("Should be non negative", nameof(maxCount));
+		_maxCount = maxCount;
+		_onPut = onPut;
+		_onRemove = onRemove;
+	}
+
+	public bool TryGet(TKey key, out TValue value) {
+		lock (_lock) {
+			LinkedListNode<LRUItem> node;
+			if (_items.TryGetValue(key, out node)) {
+				_orderList.Remove(node);
+				_orderList.AddLast(node);
+				value = node.Value.Value;
+				return true;
+			}
+
+			value = default(TValue);
+			return false;
+		}
+	}
+
+	public TValue Put(TKey key, TValue value) {
+		lock (_lock) {
+			LinkedListNode<LRUItem> node;
+			if (!_items.TryGetValue(key, out node)) {
+				node = GetNode();
+				node.Value.Key = key;
+				node.Value.Value = value;
+
+				EnsureCapacity();
+
+				_items.Add(key, node);
+				_orderList.AddLast(node);
+
+				if (_onPut != null)
+					_onPut(node.Value.Value);
+			} else {
+				node.Value.Value = value;
+
+				if (!ReferenceEquals(node, _orderList.Last)) {
+					_orderList.Remove(node);
+					_orderList.AddLast(node);
+				}
+			}
+
+			return value;
+		}
+	}
+
+	public void Remove(TKey key) {
+		lock (_lock) {
+			LinkedListNode<LRUItem> node;
+			if (_items.TryGetValue(key, out node)) {
+				_orderList.Remove(node);
+				_items.Remove(key);
+				if (_onRemove != null)
+					_onRemove(node.Value.Value);
+
+				ReturnNode(node);
+			}
+		}
+	}
+
+	public void Clear() {
+		lock (_lock) {
+			while (_orderList.Count > 0) {
+				var node = _orderList.First;
+				_orderList.RemoveFirst();
+				_items.Remove(node.Value.Key);
+				if (_onRemove != null)
+					_onRemove(node.Value.Value);
+
+				ReturnNode(node);
+			}
+		}
+	}
+
+	public TValue Put<T>(TKey key, T userData, Func<TKey, T, TValue> addFactory,
+		Func<TKey, TValue, T, TValue> updateFactory) {
+		lock (_lock) {
+			LinkedListNode<LRUItem> node;
+			if (!_items.TryGetValue(key, out node)) {
+				node = GetNode();
+				node.Value.Key = key;
+				node.Value.Value = addFactory(key, userData);
+
+				EnsureCapacity();
+
+				_items.Add(key, node);
+				_orderList.AddLast(node);
+				if (_onPut != null)
+					_onPut(node.Value.Value);
+			} else {
+				node.Value.Value = updateFactory(key, node.Value.Value, userData);
+
+				if (!ReferenceEquals(node, _orderList.Last)) {
+					_orderList.Remove(node);
+					_orderList.AddLast(node);
+				}
+			}
+
+			return node.Value.Value;
+		}
+	}
+
+	private void EnsureCapacity() {
+		while (_items.Count > 0 && _items.Count >= _maxCount) {
+			var node = _orderList.First;
+			_orderList.Remove(node);
+			_items.Remove(node.Value.Key);
+			if (_onRemove != null)
+				_onRemove(node.Value.Value);
+
+			ReturnNode(node);
+		}
+	}
+
+	private LinkedListNode<LRUItem> GetNode() {
+		if (_nodesPool.Count > 0)
+			return _nodesPool.Dequeue();
+		return new LinkedListNode<LRUItem>(new LRUItem());
+	}
+
+	private void ReturnNode(LinkedListNode<LRUItem> node) {
+		_nodesPool.Enqueue(node);
+	}
+}
diff --git a/src/KurrentDB.Auth.Ldaps/LdapInfo.cs b/src/KurrentDB.Auth.Ldaps/LdapInfo.cs
new file mode 100644
index 00000000000..a186eb23b5a
--- /dev/null
+++ b/src/KurrentDB.Auth.Ldaps/LdapInfo.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+
+namespace KurrentDB.Auth.Ldaps;
+
+/// <summary>
+/// Represents the distinguished name of an object and an array of the distinguished names
+/// of groups to which the object belongs.
+/// </summary>
+public class LdapInfo {
+	/// <summary>
+	/// The login name of the object (for example, sAMAccountName on ActiveDirectory, uid on OpenLDAP)
+	/// </summary>
+	public readonly string LoginName;
+
+	/// <summary>
+	/// Distinguished name of the object
+	/// </summary>
+	public readonly string DistinguishedName;
+
+	/// <summary>
+	/// Array of group distinguished names to which the object with the distinguished name belongs
+	/// </summary>
+	public readonly string[] GroupDistinguishedNames;
+
+	/// <summary>
+	/// Creates a new LdapInfo struct
+	/// </summary>
+	/// <param name="loginName">The login name (e.g. sAMAccountName on Windows) of the object</param>
+	/// <param name="distinguishedName">The distinguished name of the object</param>
+	/// <param name="groupDistinguishedNames">The distinguished names of the groups to which the object belongs</param>
+	public LdapInfo(string loginName, string distinguishedName, string[] groupDistinguishedNames) {
+		LoginName = loginName;
+		DistinguishedName = distinguishedName;
+		GroupDistinguishedNames = groupDistinguishedNames;
+	}
+
+	/// <summary>
+	/// Tests whether the object is a member of the group with the given distinguished name
+	/// </summary>
+	/// <param name="groupDistinguishedName">The distinguished name of the group</param>
+	/// <returns>True if a member, false otherwise</returns>
+	public bool IsMemberOf(string groupDistinguishedName) {
+		return GroupDistinguishedNames.Contains(groupDistinguishedName);
+	}
+
+	/// <summary>
+	/// An empty LdapInfo (no DN, no group DNs).
+	/// </summary>
+	public static readonly LdapInfo Empty = new LdapInfo("", "", new string[0]);
+}
diff --git a/src/KurrentDB.Auth.Ldaps/LdapsAuthenticationPlugin.cs b/src/KurrentDB.Auth.Ldaps/LdapsAuthenticationPlugin.cs
new file mode 100644
index 00000000000..7b5cb859dcb
--- /dev/null
+++ b/src/KurrentDB.Auth.Ldaps/LdapsAuthenticationPlugin.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.ComponentModel.Composition;
+using EventStore.Plugins.Authentication;
+
+namespace KurrentDB.Auth.Ldaps;
+
+[Export(typeof(IAuthenticationPlugin))]
+public class LdapsAuthenticationPlugin : IAuthenticationPlugin {
+	public string Name { get { return "LDAPS"; } }
+
+	public string Version {
+		get { return typeof(LdapsAuthenticationPlugin).Assembly.GetName().Version.ToString(); }
+	}
+
+	public string CommandLineName { get { return "ldaps"; } }
+
+	public IAuthenticationProviderFactory GetAuthenticationProviderFactory(string authenticationConfigPath) {
+		if (string.IsNullOrWhiteSpace(authenticationConfigPath))
+			throw new LdapsConfigurationException(string.Format(
+				"No LDAPS configuration file was specified. Use the --{0} option to specify " +
+				"the path to the LDAPS configuration.", "authentication-config-file"));
+
+		return new LdapsAuthenticationProviderFactory(authenticationConfigPath);
+	}
+}
diff --git a/src/KurrentDB.Auth.Ldaps/LdapsAuthenticationProvider.cs b/src/KurrentDB.Auth.Ldaps/LdapsAuthenticationProvider.cs
new file mode 100644
index 00000000000..73d6a3fdff9
--- /dev/null
+++ b/src/KurrentDB.Auth.Ldaps/LdapsAuthenticationProvider.cs
@@ -0,0 +1,156 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authentication;
+using Microsoft.AspNetCore.Authorization.Policy;
+using Serilog;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Auth.Ldaps;
+
+internal class LdapsAuthenticationProvider : AuthenticationProviderBase {
+	private static readonly ILogger Logger = Log.ForContext<PolicyEvaluator>();
+	private readonly ILogger _logger;
+	private readonly LdapsSettings _ldapsSettings;
+	private readonly bool _logFailedAuthenticationAttempts;
+	private readonly IDictionary<string, string> _ldapGroupDistinguishedNameToRoleNames;
+	private readonly LRUCache<string, CachedPrincipalWithTimeout> _userPasswordsCache;
+	private readonly TimeSpan _cacheDuration;
+
+	public LdapsAuthenticationProvider(LdapsSettings settings, int cacheSize,
+		bool logFailedAuthenticationAttempts)
+		: base(
+			requiredEntitlements: ["LDAPS_AUTHENTICATION"]) {
+
+		_logger = Logger;
+		_ldapsSettings = settings;
+		_logFailedAuthenticationAttempts =
+			logFailedAuthenticationAttempts; //TODO: log failed authentication attempts
+		_userPasswordsCache = new LRUCache<string, CachedPrincipalWithTimeout>(cacheSize);
+		_ldapGroupDistinguishedNameToRoleNames = settings.LdapGroupRoles;
+		_cacheDuration = TimeSpan.FromSeconds(_ldapsSettings.PrincipalCacheDurationSec);
+		_logFailedAuthenticationAttempts = logFailedAuthenticationAttempts;
+	}
+
+	public override void Authenticate(AuthenticationRequest authenticationRequest) {
+		CachedPrincipalWithTimeout cached;
+		if (_userPasswordsCache.TryGet(authenticationRequest.Name, out cached)) {
+			if (cached.ValidUntil > DateTime.UtcNow) {
+				AuthenticateFromCache(authenticationRequest, cached);
+			} else {
+				_userPasswordsCache.Remove(authenticationRequest.Name);
+				AuthenticateWithLdapsServer(authenticationRequest);
+			}
+		} else {
+			AuthenticateWithLdapsServer(authenticationRequest);
+		}
+	}
+
+	public override IReadOnlyList<string> GetSupportedAuthenticationSchemes() {
+		return new[] {
+			"Basic"
+		};
+	}
+
+	public ClaimsPrincipal GetUser(string loginName) {
+		CachedPrincipalWithTimeout cached;
+		if (_userPasswordsCache.TryGet(loginName, out cached)) {
+			return cached.Principal as ClaimsPrincipal;
+		}
+
+		return null;
+	}
+
+	private void AuthenticateWithLdapsServer(AuthenticationRequest authenticationRequest) {
+		var authenticateTask = new Task<LdapAuthenticationResponse>(() => {
+			using (var validator = new LdapsCredentialValidator(_ldapsSettings)) {
+				LdapInfo ldapInfo;
+				if (validator.TryValidateCredentials(authenticationRequest.Name,
+					authenticationRequest.SuppliedPassword, out ldapInfo))
+					return new LdapAuthenticationResponse(authenticationRequest, true, ldapInfo);
+
+				return new LdapAuthenticationResponse(authenticationRequest, false, LdapInfo.Empty);
+			}
+		});
+
+		authenticateTask.ContinueWith(ant => {
+			_logger.Error("Error authenticating with LDAPS server. {0}", ant.Exception);
+			ant.Result.Request.Error();
+		}, TaskContinuationOptions.OnlyOnFaulted);
+
+		authenticateTask.ContinueWith(ant => {
+			if (!ant.Result.IsAuthenticated) {
+				if (_logFailedAuthenticationAttempts)
+					_logger.Warning("LDAPS Authentication Failed for {id}.", authenticationRequest.Id);
+				authenticationRequest.Unauthorized();
+				return;
+			}
+
+			var principal = CreatePrincipal(ant.Result.LdapInfo);
+			CachePrincipal(authenticationRequest.Name, authenticationRequest.SuppliedPassword, principal);
+
+			authenticationRequest.Authenticated(principal);
+		}, TaskContinuationOptions.NotOnFaulted);
+
+		authenticateTask.Start();
+	}
+
+	private void AuthenticateFromCache(AuthenticationRequest authenticationRequest,
+		CachedPrincipalWithTimeout cached) {
+		if (authenticationRequest.SuppliedPassword != cached.Password) {
+			if (_logFailedAuthenticationAttempts)
+				_logger.Warning("LDAPS Authentication Failed for {id}.", authenticationRequest.Id);
+			authenticationRequest.Unauthorized();
+			_userPasswordsCache.Remove(authenticationRequest.Name);
+			return;
+		}
+
+		authenticationRequest.Authenticated(cached.Principal);
+	}
+
+	private void CachePrincipal(string loginName, string password, ClaimsPrincipal principal) {
+		var cachedPrincipal =
+			new CachedPrincipalWithTimeout(password, principal, DateTime.UtcNow.Add(_cacheDuration));
+		_userPasswordsCache.Put(loginName, cachedPrincipal);
+	}
+
+	private ClaimsPrincipal CreatePrincipal(LdapInfo ldapInfo) {
+		var claims = new List<Claim> { new Claim(ClaimTypes.Name, ldapInfo.LoginName) };
+		if (ldapInfo.GroupDistinguishedNames != null) {
+			claims.AddRange(ConvertLdapGroupsToRoleNames(ldapInfo).Select(x => new Claim(ClaimTypes.Role, x)));
+		}
+
+		var identity = new ClaimsIdentity(claims, "ES-Legacy");
+		var principal = new ClaimsPrincipal(identity);
+		return principal;
+	}
+
+	private string[] ConvertLdapGroupsToRoleNames(LdapInfo ldapInfo) {
+		var roles = new List<string> { ldapInfo.LoginName };
+		foreach (var ldapGroupDn in ldapInfo.GroupDistinguishedNames) {
+			string roleName;
+			if (!_ldapGroupDistinguishedNameToRoleNames.TryGetValue(ldapGroupDn, out roleName))
+				continue;
+			roles.Add(roleName);
+		}
+
+		return roles.ToArray();
+	}
+
+	private class LdapAuthenticationResponse {
+		public readonly AuthenticationRequest Request;
+		public readonly bool IsAuthenticated;
+		public readonly LdapInfo LdapInfo;
+
+		public LdapAuthenticationResponse(AuthenticationRequest request, bool isAuthenticated, LdapInfo ldapInfo) {
+			Request = request;
+			IsAuthenticated = isAuthenticated;
+			LdapInfo = ldapInfo;
+		}
+	}
+}
diff --git a/src/KurrentDB.Auth.Ldaps/LdapsAuthenticationProviderFactory.cs b/src/KurrentDB.Auth.Ldaps/LdapsAuthenticationProviderFactory.cs
new file mode 100644
index 00000000000..a6e7a20fcae
--- /dev/null
+++ b/src/KurrentDB.Auth.Ldaps/LdapsAuthenticationProviderFactory.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins;
+using EventStore.Plugins.Authentication;
+
+namespace KurrentDB.Auth.Ldaps;
+
+internal class LdapsAuthenticationProviderFactory : IAuthenticationProviderFactory {
+	public const int CachedPrincipalCount = 1000;
+	private readonly string _configPath;
+	private LdapsAuthenticationProvider _authenticationProvider;
+
+	public LdapsAuthenticationProviderFactory(string configPath) {
+		_configPath = configPath;
+	}
+
+	public IAuthenticationProvider Build(bool logFailedAuthenticationAttempts) {
+		var ldapsSettings = ConfigParser.ReadConfiguration<LdapsSettings>(_configPath, "LdapsAuth");
+		_authenticationProvider = new LdapsAuthenticationProvider(ldapsSettings,
+			CachedPrincipalCount, logFailedAuthenticationAttempts);
+		return _authenticationProvider;
+	}
+}
diff --git a/src/KurrentDB.Auth.Ldaps/LdapsConfigurationException.cs b/src/KurrentDB.Auth.Ldaps/LdapsConfigurationException.cs
new file mode 100644
index 00000000000..8260785b768
--- /dev/null
+++ b/src/KurrentDB.Auth.Ldaps/LdapsConfigurationException.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Auth.Ldaps;
+
+public class LdapsConfigurationException : Exception {
+	public LdapsConfigurationException(string message)
+		: base(message) {
+	}
+}
diff --git a/src/KurrentDB.Auth.Ldaps/LdapsCredentialValidator.cs b/src/KurrentDB.Auth.Ldaps/LdapsCredentialValidator.cs
new file mode 100644
index 00000000000..3b09ed95ce2
--- /dev/null
+++ b/src/KurrentDB.Auth.Ldaps/LdapsCredentialValidator.cs
@@ -0,0 +1,209 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Net.Security;
+using System.Runtime.InteropServices;
+using System.Security.Cryptography.X509Certificates;
+using System.Text;
+using Novell.Directory.Ldap;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Auth.Ldaps;
+
+/// <summary>
+/// A <see cref="LdapsCredentialValidator"/> can be used to validate user credentials with
+/// an LDAP server, connecting over SSL only (since we definitely send credentials
+/// over the connection).
+/// </summary>
+internal class LdapsCredentialValidator : ILdapsCredentialValidator, IDisposable {
+	private static readonly ILogger Log = Serilog.Log.ForContext<LdapsCredentialValidator>();
+	private readonly LdapSearchConstraints _ldapSearchConstraints;
+
+	private readonly LdapsSettings _settings;
+	private readonly LdapConnection _connection;
+
+	private string LdapServer {
+		get { return string.Format("{0}:{1}", _settings.Host, _settings.Port); }
+	}
+
+	public LdapsCredentialValidator(LdapsSettings settings) {
+		_settings = settings;
+
+		_ldapSearchConstraints = new LdapSearchConstraints {
+			BatchSize = 0, TimeLimit = _settings.LdapOperationTimeout, ServerTimeLimit = _settings.LdapOperationTimeout,
+			ReferralFollowing = true
+		};
+		var ldapConstraints = new LdapConstraints { TimeLimit = _settings.LdapOperationTimeout };
+		_connection = new LdapConnection {
+			SecureSocketLayer = _settings.UseSSL,
+			Constraints = ldapConstraints
+		};
+
+#pragma warning disable CS0618 // Type or member is obsolete
+		_connection.UserDefinedServerCertValidationDelegate += ConnectionOnUserDefinedServerCertValidationDelegate;
+#pragma warning restore CS0618 // Type or member is obsolete
+	}
+
+	private bool ConnectionOnUserDefinedServerCertValidationDelegate
+		(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors certificateErrors) {
+		if (!_settings.ValidateServerCertificate)
+			return true;
+
+		if (certificateErrors == SslPolicyErrors.None)
+			return true;
+
+		if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
+			var certificate2 = new X509Certificate2(certificate);
+			return chain.Build(certificate2);
+		}
+
+		Log.Error("[LDAP-S: {server}] - Server certificate error: {e}", LdapServer,
+			string.Join(",", certificateErrors));
+		return false;
+	}
+
+	private void ConnectToLdapServer() {
+		if (_connection.Connected)
+			return;
+
+		Log.Debug("Connecting to LDAP server: {server}", LdapServer);
+		_connection.Connect(_settings.Host, _settings.Port);
+	}
+
+	private bool TryFindLdapInfoForLoginUsername(string username, out LdapInfo ldapInfo) {
+		ldapInfo = LdapInfo.Empty;
+		var query = string.Format("(&(objectClass={0})({1}={2}))", EscapeLdapSearchFilter(_settings.ObjectClass),
+			EscapeLdapSearchFilter(_settings.Filter), EscapeLdapSearchFilter(username));
+
+		try {
+			var search = _connection.Search(_settings.BaseDn, LdapConnection.ScopeSub, query,
+				new[] { _settings.GroupMembershipAttribute }, false, _ldapSearchConstraints);
+
+			var entries = new List<LdapEntry>();
+			while (search.HasMore())
+				entries.Add(search.Next());
+
+			if (entries.Count != 1)
+				return false;
+
+			var directoryEntry = entries[0];
+
+			//TODO: Return roles here instead of groups
+
+			var attributeSet = directoryEntry.GetAttribute(_settings.GroupMembershipAttribute);
+			ldapInfo = new LdapInfo(username, directoryEntry.Dn,
+				attributeSet == null ? new string[0] : attributeSet.StringValueArray);
+			return true;
+		} catch (LdapException ex) {
+			if (ex.ResultCode == LdapException.LdapTimeout || ex.ResultCode == LdapException.TimeLimitExceeded) {
+				Log.Error(ex, "[LDAP-S: {server}] - Search operation timed out.", LdapServer);
+				Disconnect();
+				return false;
+			}
+
+			Log.Error(ex, "[LDAP-S: {server}] - Exception during search.", LdapServer);
+			Disconnect();
+			return false;
+		}
+	}
+
+	public bool TryValidateCredentials(string username, string password, out LdapInfo ldapUser) {
+		ldapUser = LdapInfo.Empty;
+
+		if (string.IsNullOrEmpty(username))
+			return false;
+
+		try {
+			ConnectToLdapServer();
+		} catch (LdapException ex) {
+			Log.Error(ex, "Connecting to LDAP server {server} failed.", LdapServer);
+			Disconnect();
+			return false;
+		}
+
+		if (!_settings.AnonymousBind) {
+			try {
+				_connection.Bind(_settings.BindUser, _settings.BindPassword);
+			} catch (LdapException ex) {
+				if (ex.ResultCode == LdapException.LdapTimeout ||
+					ex.ResultCode == LdapException.TimeLimitExceeded) {
+					Log.Error(ex, "[LDAP-S: {server}] - Bind operation timed out.", LdapServer);
+					Disconnect();
+					return false;
+				}
+
+				if (ex.ResultCode == LdapException.InvalidCredentials) {
+					Log.Error(ex, "[LDAP-S: {server}] - Invalid bind credentials specified.", LdapServer);
+					Disconnect();
+					return false;
+				}
+
+				Log.Error(ex, "[LDAP-S: {server}] - Exception during bind.", LdapServer);
+				Disconnect();
+				return false;
+			}
+		}
+
+		if (!TryFindLdapInfoForLoginUsername(username, out ldapUser))
+			return false;
+
+		if (_settings.RequireGroupMembership && !ldapUser.IsMemberOf(_settings.RequiredGroupDn))
+			return false;
+
+		try {
+			_connection.Bind(ldapUser.DistinguishedName, password);
+			return _connection.Bound;
+		} catch (LdapException ex) {
+			if (ex.ResultCode == LdapException.InvalidCredentials)
+				return false;
+
+			Log.Error(ex, "[LDAP-S: {server}] - Exception during bind.", LdapServer);
+			return false;
+		} finally {
+			Disconnect();
+		}
+	}
+
+	private void Disconnect() {
+		if (_connection != null && _connection.Connected)
+			_connection.Disconnect();
+	}
+
+	public void Dispose() {
+		Disconnect();
+	}
+
+	private static string EscapeLdapSearchFilter(string input) {
+		// escape values taken from http://msdn.microsoft.com/en-us/library/aa746475.aspx
+		var escapedFilterBuilder = new StringBuilder();
+		foreach (var character in input) {
+			switch (character) {
+				case '\\':
+					escapedFilterBuilder.Append(@"\5c");
+					break;
+				case '*':
+					escapedFilterBuilder.Append(@"\2a");
+					break;
+				case '(':
+					escapedFilterBuilder.Append(@"\28");
+					break;
+				case ')':
+					escapedFilterBuilder.Append(@"\29");
+					break;
+				case '\u0000':
+					escapedFilterBuilder.Append(@"\00");
+					break;
+				case '/':
+					escapedFilterBuilder.Append(@"\2f");
+					break;
+				default:
+					escapedFilterBuilder.Append(character);
+					break;
+			}
+		}
+
+		return escapedFilterBuilder.ToString();
+	}
+}
diff --git a/src/KurrentDB.Auth.Ldaps/LdapsSettings.cs b/src/KurrentDB.Auth.Ldaps/LdapsSettings.cs
new file mode 100644
index 00000000000..1d820218775
--- /dev/null
+++ b/src/KurrentDB.Auth.Ldaps/LdapsSettings.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+
+namespace KurrentDB.Auth.Ldaps;
+
+public class LdapsSettings {
+	public string Host { get; set; }
+	public int Port { get; set; }
+	public bool ValidateServerCertificate { get; set; }
+	public bool UseSSL { get; set; }
+
+	public bool AnonymousBind { get; set; }
+	public string BindUser { get; set; }
+	public string BindPassword { get; set; }
+
+	public string BaseDn { get; set; }
+	public string ObjectClass { get; set; }
+	public string Filter { get; set; }
+	public string GroupMembershipAttribute { get; set; }
+
+	public bool RequireGroupMembership { get; set; }
+	public string RequiredGroupDn { get; set; }
+
+	public int PrincipalCacheDurationSec { get; set; }
+
+	public Dictionary<string, string> LdapGroupRoles { get; set; }
+	public int LdapOperationTimeout { get; set; }
+
+	public LdapsSettings() {
+		Port = 636;
+		ObjectClass = "organizationalPerson";
+		Filter = "sAMAccountName";
+		GroupMembershipAttribute = "memberOf";
+		PrincipalCacheDurationSec = 60;
+		UseSSL = true;
+		LdapOperationTimeout = 5000;
+	}
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled.Tests/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled.Tests.csproj b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled.Tests/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled.Tests.csproj
new file mode 100644
index 00000000000..5005a91fa10
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled.Tests/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled.Tests.csproj
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<OutputType>Library</OutputType>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<IsPackable>false</IsPackable>
+		<IsPublishable>false</IsPublishable>
+		<IsTestProject>true</IsTestProject>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="Ductus.FluentDocker.XUnit" Version="2.10.59" />
+		<PackageReference Include="EventStore.Client.Grpc.Streams" Version="23.1.0" />
+		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3">
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		  <PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.11" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+		<PackageReference Include="Polly" Version="8.2.0" />
+		<PackageReference Include="xunit" Version="2.6.6" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+		</PackageReference>
+	</ItemGroup>
+	<ItemGroup>
+	  <ProjectReference Include="..\KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled\KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled.csproj" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled.Tests/LegacyAuthorizationWithStreamAuthorizationDisabledPluginTests.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled.Tests/LegacyAuthorizationWithStreamAuthorizationDisabledPluginTests.cs
new file mode 100644
index 00000000000..fe09565ec54
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled.Tests/LegacyAuthorizationWithStreamAuthorizationDisabledPluginTests.cs
@@ -0,0 +1,125 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+using EventStore.Plugins.Licensing;
+using KurrentDB.Plugins.TestHelpers;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled.Tests;
+
+public class LegacyAuthorizationWithStreamAuthorizationDisabledPluginTests {
+	private readonly ITestOutputHelper _outputHelper;
+
+	public LegacyAuthorizationWithStreamAuthorizationDisabledPluginTests(ITestOutputHelper outputHelper) {
+		_outputHelper = outputHelper;
+	}
+
+	public static IEnumerable<object[]> TestCases() {
+		yield return new object[] { new[] { new Claim(ClaimTypes.Role, SystemRoles.Admins) } };
+		yield return new object[] { Array.Empty<Claim>() };
+	}
+
+	[Theory, MemberData(nameof(TestCases))]
+	public async Task read_all_stream(Claim[] claims) {
+		var configurationPath = Path.GetTempFileName();
+
+		try {
+			var sut = new LegacyAuthorizationWithStreamAuthorizationDisabledPlugin();
+			var provider = sut.GetAuthorizationProviderFactory(configurationPath).Build();
+
+			var result = await provider.CheckAccessAsync(
+				new ClaimsPrincipal(new ClaimsIdentity(claims)),
+				new Operation(Operations.Streams.Read).WithParameter(
+					Operations.Streams.Parameters.StreamId("$all")), CancellationToken.None);
+
+			Assert.True(result);
+		} finally {
+			File.Delete(configurationPath);
+		}
+	}
+
+	[Theory, MemberData(nameof(TestCases))]
+	public async Task write_all_stream(Claim[] claims) {
+		var configurationPath = Path.GetTempFileName();
+
+		try {
+			var sut = new LegacyAuthorizationWithStreamAuthorizationDisabledPlugin();
+			var provider = sut.GetAuthorizationProviderFactory(configurationPath).Build();
+
+			var result = await provider.CheckAccessAsync(
+				new ClaimsPrincipal(new ClaimsIdentity(claims)),
+				new Operation(Operations.Streams.Write).WithParameter(
+					Operations.Streams.Parameters.StreamId("$all")), CancellationToken.None);
+
+			Assert.False(result);
+		} finally {
+			File.Delete(configurationPath);
+		}
+	}
+
+	[Theory, MemberData(nameof(TestCases))]
+	public async Task create_user(Claim[] claims) {
+		var configurationPath = Path.GetTempFileName();
+
+		try {
+			var sut = new LegacyAuthorizationWithStreamAuthorizationDisabledPlugin();
+			var provider = sut.GetAuthorizationProviderFactory(configurationPath).Build();
+
+			var result = await provider.CheckAccessAsync(
+				new ClaimsPrincipal(new ClaimsIdentity(claims)),
+				new Operation(Operations.Users.Create), CancellationToken.None);
+
+			Assert.Equal(claims.Length > 0, result);
+		} finally {
+			File.Delete(configurationPath);
+		}
+	}
+
+	[Theory]
+	[InlineData(true, "LEGACY_AUTHORIZATION_WITH_STREAM_AUTHORIZATION_DISABLED", false)]
+	[InlineData(true, "NONE", true)]
+	[InlineData(false, "NONE", true)]
+	public void respects_license(bool licensePresent, string entitlement, bool expectedException) {
+		var configurationPath = Path.GetTempFileName();
+
+		try {
+			// given
+			var sut = new LegacyAuthorizationWithStreamAuthorizationDisabledPlugin();
+			var provider = sut.GetAuthorizationProviderFactory(configurationPath).Build();
+			var config = new ConfigurationBuilder().Build();
+			var builder = WebApplication.CreateBuilder();
+
+			var licenseService = new Fixtures.FakeLicenseService(licensePresent, entitlement);
+			builder.Services.AddSingleton<ILicenseService>(licenseService);
+
+			provider.ConfigureServices(
+				builder.Services,
+				config);
+
+			var app = builder.Build();
+
+			// when
+			provider.ConfigureApplication(app, config);
+
+			// then
+			if (expectedException) {
+				Assert.NotNull(licenseService.RejectionException);
+			} else {
+				Assert.Null(licenseService.RejectionException);
+			}
+		} finally {
+			File.Delete(configurationPath);
+		}
+	}
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/AllowAnonymousAssertion.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/AllowAnonymousAssertion.cs
new file mode 100644
index 00000000000..c22c6f238b7
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/AllowAnonymousAssertion.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Claims;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+internal class AllowAnonymousAssertion : IAssertion {
+	public Grant Grant { get; } = Grant.Allow;
+
+	public AssertionInformation Information { get; } =
+		new AssertionInformation("authenticated", "not anonymous", Grant.Unknown);
+
+	public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context) {
+		context.Add(new AssertionMatch(policy, new AssertionInformation("match", "allow anonymous", Grant.Allow)));
+		return new ValueTask<bool>(true);
+	}
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/AndAssertion.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/AndAssertion.cs
new file mode 100644
index 00000000000..61a23ba7f1a
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/AndAssertion.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+internal class AndAssertion : IAssertion {
+	private readonly ReadOnlyMemory<IAssertion> _assertions;
+	private readonly AssertionInformation _failedToMatchAllSubAssertions;
+
+	public AndAssertion(params IAssertion[] assertions) {
+		_assertions = assertions.OrderBy(x => x.Grant).ToArray();
+		_failedToMatchAllSubAssertions = new AssertionInformation("and",
+			$"({string.Join(",", _assertions.Span.ToArray().Select(x => x.ToString()))})", Grant.Deny);
+		Information = new AssertionInformation("and",
+			$"({string.Join(",", _assertions.ToArray().Select(x => x.ToString()))})", Grant.Unknown);
+	}
+
+	public AssertionInformation Information { get; }
+
+	public Grant Grant { get; } = Grant.Unknown;
+
+	public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context) {
+		var remaining = _assertions;
+		while (!remaining.IsEmpty && context.Grant != Grant.Deny) {
+			var pending = remaining.Span[0].Evaluate(cp, operation, policy, context);
+			remaining = remaining.Slice(1);
+			if (!pending.IsCompleted)
+				return EvaluateAsync(pending, remaining, cp, operation, policy, context);
+			if (!pending.Result) {
+				context.Add(new AssertionMatch(policy, _failedToMatchAllSubAssertions));
+				return new ValueTask<bool>(false);
+			}
+		}
+
+		return new ValueTask<bool>(true);
+	}
+
+	private async ValueTask<bool> EvaluateAsync(ValueTask<bool> pending, ReadOnlyMemory<IAssertion> remaining,
+		ClaimsPrincipal cp, Operation operation, PolicyInformation policy, EvaluationContext result) {
+		bool evaluated;
+		while ((evaluated = await pending.ConfigureAwait(false)) && !remaining.IsEmpty) {
+			pending = remaining.Span[0].Evaluate(cp, operation, policy, result);
+			remaining = remaining.Slice(1);
+		}
+
+		if (!evaluated)
+			result.Add(new AssertionMatch(policy, _failedToMatchAllSubAssertions));
+		return evaluated;
+	}
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/AssertionComparer.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/AssertionComparer.cs
new file mode 100644
index 00000000000..f609eaa386b
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/AssertionComparer.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+internal sealed class AssertionComparer : IComparer<IAssertion> {
+	private static readonly MethodInfo OpenTypeComparer =
+		new Func<IAssertion, IAssertion, int>(Compare<object>).Method.GetGenericMethodDefinition();
+
+	private AssertionComparer() { }
+
+	public static IComparer<IAssertion> Instance { get; } = new AssertionComparer();
+
+	public int Compare(IAssertion x, IAssertion y) {
+		var grant = x.Grant.CompareTo(y.Grant);
+		if (grant != 0)
+			return grant * -1;
+
+		var type = Comparer<Type>.Default.Compare(x.GetType(), y.GetType());
+		if (type != 0)
+			return type;
+
+		var closed = (Func<IAssertion, IAssertion, int>)OpenTypeComparer.MakeGenericMethod(x.GetType())
+			.CreateDelegate(typeof(Func<IAssertion, IAssertion, int>));
+		return closed(x, y);
+	}
+
+	private static int Compare<T>(IAssertion x, IAssertion y) {
+		if (x is IComparable<T> comparable)
+			return comparable.CompareTo((T)y);
+		throw new NotSupportedException(
+			"Assertion classes must implement IComparable<T> where T is the Assertion class");
+	}
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/AssertionInformation.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/AssertionInformation.cs
new file mode 100644
index 00000000000..89250cbac5c
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/AssertionInformation.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+public struct AssertionInformation {
+	public Grant Grant { get; }
+	private readonly string _assertion;
+
+	public AssertionInformation(string type, string assertion, Grant grant) {
+		Grant = grant;
+		_assertion = $"{type}:{assertion}:{grant}";
+	}
+
+	public override string ToString() {
+		return _assertion;
+	}
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/AssertionMatch.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/AssertionMatch.cs
new file mode 100644
index 00000000000..031dae0080f
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/AssertionMatch.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+public readonly struct AssertionMatch {
+	public readonly PolicyInformation Policy;
+	public readonly AssertionInformation Assertion;
+	public readonly IReadOnlyList<Claim> Matches;
+
+	public AssertionMatch(PolicyInformation policy, AssertionInformation assertion, params Claim[] matches) : this(
+		policy, assertion, (IReadOnlyList<Claim>)matches) {
+	}
+
+	public AssertionMatch(PolicyInformation policy, AssertionInformation assertion, IReadOnlyList<Claim> matches) {
+		Policy = policy;
+		Assertion = assertion;
+		Matches = matches;
+	}
+
+	public override string ToString() {
+		return $"{Policy} : {Assertion}, ${string.Join(Environment.NewLine + "\t", Matches)}";
+	}
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/ClaimMatchAssertion.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/ClaimMatchAssertion.cs
new file mode 100644
index 00000000000..590abb84fb1
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/ClaimMatchAssertion.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+public class ClaimMatchAssertion : IComparable<ClaimMatchAssertion>, IAssertion {
+	private readonly Claim _claim;
+
+	public ClaimMatchAssertion(Grant grant, Claim claim) {
+		_claim = claim;
+		Grant = grant;
+		Information = new AssertionInformation("equal", _claim.ToString(), grant);
+	}
+
+	public AssertionInformation Information { get; }
+
+	public Grant Grant { get; }
+
+	public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context) {
+		// ReSharper disable once PatternAlwaysOfType
+		if (cp.FindFirst(x =>
+			string.Equals(x.Type, _claim.Type, StringComparison.Ordinal) &&
+			string.Equals(x.Value, _claim.Value, StringComparison.Ordinal)) is Claim matched) {
+			context.Add(new AssertionMatch(policy, Information, matched));
+			return new ValueTask<bool>(true);
+		}
+
+		return new ValueTask<bool>(false);
+	}
+
+	public int CompareTo(ClaimMatchAssertion other) {
+		if (other == null)
+			throw new ArgumentNullException(nameof(other));
+
+		var grant = Grant.CompareTo(other.Grant);
+		if (grant != 0)
+			return grant * -1;
+		var type = string.CompareOrdinal(_claim.Type, other._claim.Type);
+		if (type != 0)
+			return type;
+		return string.CompareOrdinal(_claim.Value, other._claim.Value);
+	}
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/ClaimValueMatchesParameterValueAssertion.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/ClaimValueMatchesParameterValueAssertion.cs
new file mode 100644
index 00000000000..96dd521caba
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/ClaimValueMatchesParameterValueAssertion.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+public class ClaimValueMatchesParameterValueAssertion : IAssertion {
+	private readonly string _claimType;
+	private readonly string _parameterName;
+
+	public ClaimValueMatchesParameterValueAssertion(string claimType, string parameterName, Grant grant) {
+		_claimType = claimType;
+		_parameterName = parameterName;
+		Grant = grant;
+		Information = new AssertionInformation("match", $"{_claimType} : {_parameterName}", Grant);
+	}
+
+	public AssertionInformation Information { get; }
+	public Grant Grant { get; }
+
+	public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context) {
+		if (cp.FindFirst(_claimType) is Claim matchedClaim &&
+			operation.Parameters.Span.Contains(new Parameter(_parameterName, matchedClaim.Value))) {
+			context.Add(new AssertionMatch(policy, Information, matchedClaim));
+			return new ValueTask<bool>(true);
+		}
+
+		return new ValueTask<bool>(false);
+	}
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/EvaluationContext.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/EvaluationContext.cs
new file mode 100644
index 00000000000..6c402f3d928
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/EvaluationContext.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Threading;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+public class EvaluationContext {
+	private readonly List<AssertionMatch> _matches;
+	private readonly Operation _operation;
+
+	public EvaluationContext(Operation operation, CancellationToken cancellationToken) {
+		CancellationToken = cancellationToken;
+		_operation = operation;
+		_matches = new List<AssertionMatch>();
+		Grant = Grant.Unknown;
+	}
+
+	public CancellationToken CancellationToken { get; }
+	public Grant Grant { get; private set; }
+
+	public void Add(AssertionMatch match) {
+		if (match.Assertion.Grant > Grant)
+			Grant = match.Assertion.Grant;
+		_matches.Add(match);
+	}
+
+	public EvaluationResult ToResult() {
+		return new EvaluationResult(_operation, Grant, _matches);
+	}
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/EvaluationResult.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/EvaluationResult.cs
new file mode 100644
index 00000000000..5900b3dfc04
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/EvaluationResult.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+public readonly struct EvaluationResult {
+	public readonly Grant Grant;
+	public readonly Operation Operation;
+	public readonly IReadOnlyList<AssertionMatch> Matches;
+
+	public EvaluationResult(Operation operation, Grant grant, params AssertionMatch[] matches) : this(operation,
+		grant, (IReadOnlyList<AssertionMatch>)matches) {
+	}
+
+	public EvaluationResult(Operation operation, Grant grant, IReadOnlyList<AssertionMatch> matches) {
+		Grant = grant;
+		Matches = matches;
+		Operation = operation;
+	}
+
+	public override string ToString() {
+		return $"{Operation} {Grant} : {string.Join(Environment.NewLine, Matches)}";
+	}
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/Grant.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/Grant.cs
new file mode 100644
index 00000000000..3b02b88cad8
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/Grant.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+public enum Grant {
+	Unknown = 0,
+	Allow = 1,
+	Deny = 2
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/IAssertion.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/IAssertion.cs
new file mode 100644
index 00000000000..16e96cb1ad1
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/IAssertion.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Claims;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+internal interface IAssertion {
+	Grant Grant { get; }
+	AssertionInformation Information { get; }
+
+	ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context);
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/IPolicyEvaluator.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/IPolicyEvaluator.cs
new file mode 100644
index 00000000000..156de4754fa
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/IPolicyEvaluator.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+public interface IPolicyEvaluator {
+	ValueTask<EvaluationResult> EvaluateAsync(ClaimsPrincipal cp, Operation operation,
+		CancellationToken cancellationToken);
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled.csproj b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled.csproj
new file mode 100644
index 00000000000..23d4796b4b2
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled.csproj
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<OutputType>Library</OutputType>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
+	</PropertyGroup>
+	<PropertyGroup>
+		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+	  <DebugSymbols>true</DebugSymbols>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="EventStore.Plugins" Version="25.2.5" />
+		<PackageReference Include="System.ComponentModel.Composition" Version="8.0.0" />
+		<PackageReference Include="Serilog" Version="4.0.1" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/LegacyAuthorizationWithStreamAuthorizationDisabledPlugin.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/LegacyAuthorizationWithStreamAuthorizationDisabledPlugin.cs
new file mode 100644
index 00000000000..b1e4c49067f
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/LegacyAuthorizationWithStreamAuthorizationDisabledPlugin.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+public class LegacyAuthorizationWithStreamAuthorizationDisabledPlugin : IAuthorizationPlugin {
+	public IAuthorizationProviderFactory GetAuthorizationProviderFactory(string authorizationConfigPath) =>
+		new LegacyAuthorizationWithStreamAuthorizationDisabledProviderFactory();
+
+	public string Name { get; } = "LegacyAuthorizationWithStreamAuthorizationDisabled";
+
+	public string Version { get; } =
+		typeof(LegacyAuthorizationWithStreamAuthorizationDisabledPlugin).Assembly.GetName().Version!.ToString();
+
+	public string CommandLineName { get; } = "legacy-authorization-with-stream-authorization-disabled";
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/LegacyAuthorizationWithStreamAuthorizationDisabledProvider.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/LegacyAuthorizationWithStreamAuthorizationDisabledProvider.cs
new file mode 100644
index 00000000000..7a989dc76be
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/LegacyAuthorizationWithStreamAuthorizationDisabledProvider.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+using Serilog;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+internal class LegacyAuthorizationWithStreamAuthorizationDisabledProvider : AuthorizationProviderBase {
+	private static readonly Stopwatch sw = Stopwatch.StartNew();
+	private readonly bool _logAuthorization;
+	private readonly ILogger _logger;
+	private readonly bool _logSuccesses;
+	private readonly IPolicyEvaluator _policyEvaluator;
+
+	public LegacyAuthorizationWithStreamAuthorizationDisabledProvider(IPolicyEvaluator policyEvaluator,
+		ILogger logger, bool logAuthorization,
+		bool logSuccesses)
+		: base(
+			name: "LegacyAuthorizationWithStreamAuthorizationDisabled",
+			requiredEntitlements: ["LEGACY_AUTHORIZATION_WITH_STREAM_AUTHORIZATION_DISABLED"]) {
+
+		_policyEvaluator = policyEvaluator;
+		_logger = logger;
+		_logAuthorization = logAuthorization;
+		_logSuccesses = logSuccesses;
+	}
+
+	public override ValueTask<bool> CheckAccessAsync(ClaimsPrincipal cp, Operation operation, CancellationToken ct) {
+		cp ??= SystemAccounts.Anonymous;
+
+		try {
+			var startedAt = sw.Elapsed;
+			var evaluationTask = _policyEvaluator.EvaluateAsync(cp, operation, ct);
+			if (evaluationTask.IsCompleted)
+				return new ValueTask<bool>(LogAndCheck(startedAt, cp, evaluationTask.Result));
+
+			return CheckAccessAsync(startedAt, cp, evaluationTask);
+		} catch (Exception ex) {
+			_logger.Error(ex, "Error performing permission check for {identity}",
+				cp.FindFirst(ClaimTypes.Name)?.Value ?? "unknown");
+			return new ValueTask<bool>(false);
+		}
+	}
+
+	private async ValueTask<bool> CheckAccessAsync(TimeSpan startedAt, ClaimsPrincipal cp,
+		ValueTask<EvaluationResult> evaluationTask) {
+		try {
+			return LogAndCheck(startedAt, cp, await evaluationTask.ConfigureAwait(false));
+		} catch (Exception ex) {
+			_logger.Error(ex, "Error performing permission check for {identity}",
+				cp.FindFirst(ClaimTypes.Name)?.Value ?? "unknown");
+			return false;
+		}
+	}
+
+	private bool LogAndCheck(TimeSpan startedAt, ClaimsPrincipal cp, EvaluationResult result) {
+		if (_logAuthorization) {
+			if (result.Grant == Grant.Allow && _logSuccesses)
+				_logger.Information(
+					"Successful authorization check for {identity} in {duration} with {evaluationResult}",
+					cp.FindFirst(ClaimTypes.Name).Value, sw.Elapsed.Subtract(startedAt), result);
+			else if (result.Grant != Grant.Allow)
+				_logger.Warning("Failed authorization check for {identity} in {duration} with {evaluationResult}",
+					cp.FindFirst(ClaimTypes.Name)?.Value ?? "(anonymous)", startedAt, result);
+		}
+
+		return result.Grant == Grant.Allow;
+	}
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/LegacyAuthorizationWithStreamAuthorizationDisabledProviderFactory.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/LegacyAuthorizationWithStreamAuthorizationDisabledProviderFactory.cs
new file mode 100644
index 00000000000..3cfb55654da
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/LegacyAuthorizationWithStreamAuthorizationDisabledProviderFactory.cs
@@ -0,0 +1,116 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Security.Claims;
+using EventStore.Plugins.Authorization;
+using Serilog;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+public class LegacyAuthorizationWithStreamAuthorizationDisabledProviderFactory : IAuthorizationProviderFactory {
+	private static readonly Claim[] Admins =
+		{new Claim(ClaimTypes.Role, SystemRoles.Admins), new Claim(ClaimTypes.Name, SystemUsers.Admin)};
+
+	private static readonly Claim[] OperationsOrAdmins = {
+		new Claim(ClaimTypes.Role, SystemRoles.Admins), new Claim(ClaimTypes.Name, SystemUsers.Admin),
+		new Claim(ClaimTypes.Role, SystemRoles.Operations), new Claim(ClaimTypes.Name, SystemUsers.Operations)
+	};
+
+	public IAuthorizationProvider Build() {
+		var policy = new Policy("Legacy", 1, DateTimeOffset.MinValue);
+		var streamAssertion = new LegacyStreamPermissionAssertion();
+
+		policy.AllowAnonymous(Operations.Node.Redirect);
+		policy.AllowAnonymous(Operations.Node.StaticContent);
+		policy.AllowAnonymous(Operations.Node.Ping);
+		policy.AllowAnonymous(Operations.Node.Options);
+
+		policy.AllowAnonymous(Operations.Node.Information.Read);
+		policy.AddMatchAnyAssertion(Operations.Node.Information.Subsystems, Grant.Allow, OperationsOrAdmins);
+		policy.AddMatchAnyAssertion(Operations.Node.Information.Histogram, Grant.Allow, OperationsOrAdmins);
+		policy.AddMatchAnyAssertion(Operations.Node.Information.Options, Grant.Allow, OperationsOrAdmins);
+
+		policy.AllowAnonymous(Operations.Node.Statistics.Read);
+		policy.AllowAnonymous(Operations.Node.Statistics.Replication);
+		policy.AllowAnonymous(Operations.Node.Statistics.Tcp);
+		policy.AllowAnonymous(Operations.Node.Statistics.Custom);
+
+		var isSystem = new MultipleClaimMatchAssertion(Grant.Allow, MultipleMatchMode.All, SystemAccounts.System.Claims.ToArray());
+		policy.Add(Operations.Node.Elections.Prepare, isSystem);
+		policy.Add(Operations.Node.Elections.PrepareOk, isSystem);
+		policy.Add(Operations.Node.Elections.ViewChange, isSystem);
+		policy.Add(Operations.Node.Elections.ViewChangeProof, isSystem);
+		policy.Add(Operations.Node.Elections.Proposal, isSystem);
+		policy.Add(Operations.Node.Elections.Accept, isSystem);
+		policy.Add(Operations.Node.Elections.LeaderIsResigning, isSystem);
+		policy.Add(Operations.Node.Elections.LeaderIsResigningOk, isSystem);
+
+		policy.AllowAnonymous(Operations.Node.Gossip.Read);
+		policy.AllowAnonymous(Operations.Node.Gossip.ClientRead);
+		policy.Add(Operations.Node.Gossip.Update, isSystem);
+
+		policy.AddMatchAnyAssertion(Operations.Node.Shutdown, Grant.Allow, OperationsOrAdmins);
+		policy.AddMatchAnyAssertion(Operations.Node.MergeIndexes, Grant.Allow, OperationsOrAdmins);
+		policy.AddMatchAnyAssertion(Operations.Node.SetPriority, Grant.Allow, OperationsOrAdmins);
+		policy.AddMatchAnyAssertion(Operations.Node.Resign, Grant.Allow, OperationsOrAdmins);
+		policy.RequireAuthenticated(Operations.Node.Login);
+		policy.AddMatchAnyAssertion(Operations.Node.Scavenge.Start, Grant.Allow, OperationsOrAdmins);
+		policy.AddMatchAnyAssertion(Operations.Node.Scavenge.Stop, Grant.Allow, OperationsOrAdmins);
+
+		var subscriptionAccess =
+			new AndAssertion(
+				new RequireAuthenticatedAssertion(),
+				new RequireStreamReadAssertion(streamAssertion));
+
+		policy.RequireAuthenticated(Operations.Subscriptions.Statistics);
+		policy.AddMatchAnyAssertion(Operations.Subscriptions.Create, Grant.Allow, OperationsOrAdmins);
+		policy.AddMatchAnyAssertion(Operations.Subscriptions.Update, Grant.Allow, OperationsOrAdmins);
+		policy.AddMatchAnyAssertion(Operations.Subscriptions.Delete, Grant.Allow, OperationsOrAdmins);
+		policy.Add(Operations.Subscriptions.ProcessMessages, subscriptionAccess);
+		policy.AddMatchAnyAssertion(Operations.Subscriptions.ReplayParked, Grant.Allow, OperationsOrAdmins);
+
+		policy.Add(Operations.Streams.Read, streamAssertion);
+		policy.Add(Operations.Streams.Write, streamAssertion);
+		policy.Add(Operations.Streams.Delete, streamAssertion);
+		policy.Add(Operations.Streams.MetadataRead, streamAssertion);
+		policy.Add(Operations.Streams.MetadataWrite, streamAssertion);
+
+		var matchUsername = new ClaimValueMatchesParameterValueAssertion(ClaimTypes.Name,
+			Operations.Users.Parameters.UserParameterName, Grant.Allow);
+		var isAdmin = new MultipleClaimMatchAssertion(Grant.Allow, MultipleMatchMode.Any, Admins);
+		policy.Add(Operations.Users.List, isAdmin);
+		policy.Add(Operations.Users.Create, isAdmin);
+		policy.Add(Operations.Users.Delete, isAdmin);
+		policy.Add(Operations.Users.Update, isAdmin);
+		policy.Add(Operations.Users.Enable, isAdmin);
+		policy.Add(Operations.Users.Disable, isAdmin);
+		policy.Add(Operations.Users.ResetPassword, isAdmin);
+		policy.RequireAuthenticated(Operations.Users.CurrentUser);
+		policy.Add(Operations.Users.Read, new OrAssertion(isAdmin, matchUsername));
+		policy.Add(Operations.Users.ChangePassword, matchUsername);
+
+
+		policy.RequireAuthenticated(Operations.Projections.List);
+
+		policy.RequireAuthenticated(Operations.Projections.Abort);
+		policy.RequireAuthenticated(Operations.Projections.Create);
+		policy.RequireAuthenticated(Operations.Projections.DebugProjection);
+		policy.AddMatchAnyAssertion(Operations.Projections.Delete, Grant.Allow, OperationsOrAdmins);
+		policy.RequireAuthenticated(Operations.Projections.Disable);
+		policy.RequireAuthenticated(Operations.Projections.Enable);
+		policy.RequireAuthenticated(Operations.Projections.Read);
+		policy.AddMatchAnyAssertion(Operations.Projections.ReadConfiguration, Grant.Allow, OperationsOrAdmins);
+		policy.RequireAuthenticated(Operations.Projections.Reset);
+		policy.RequireAuthenticated(Operations.Projections.Update);
+		policy.AddMatchAnyAssertion(Operations.Projections.UpdateConfiguration, Grant.Allow, OperationsOrAdmins);
+		policy.RequireAuthenticated(Operations.Projections.State);
+		policy.RequireAuthenticated(Operations.Projections.Status);
+		policy.RequireAuthenticated(Operations.Projections.Statistics);
+		policy.AddMatchAnyAssertion(Operations.Projections.Restart, Grant.Allow, OperationsOrAdmins);
+
+		return new LegacyAuthorizationWithStreamAuthorizationDisabledProvider(new PolicyEvaluator(policy.AsReadOnly()),
+			Log.ForContext<PolicyEvaluator>(), true, false);
+	}
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/LegacyStreamPermissionAssertion.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/LegacyStreamPermissionAssertion.cs
new file mode 100644
index 00000000000..b9649ce5aeb
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/LegacyStreamPermissionAssertion.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+public class LegacyStreamPermissionAssertion : IAssertion {
+	public AssertionInformation Information { get; } =
+		new AssertionInformation("stream", "legacy acl", Grant.Unknown);
+
+	public Grant Grant { get; } = Grant.Unknown;
+
+	public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context) {
+		var streamId = FindStreamId(operation.Parameters.Span);
+
+		return CheckStreamAccess(operation, policy, context, streamId);
+	}
+
+	private ValueTask<bool> CheckStreamAccess(Operation operation, PolicyInformation policy,
+		EvaluationContext context, string streamId) {
+		if (streamId == null) {
+			context.Add(new AssertionMatch(policy,
+				new AssertionInformation("streamId", "streamId is null", Grant.Deny)));
+			return new ValueTask<bool>(true);
+		}
+
+		if ((streamId == string.Empty || streamId == "$all") &&
+			(operation == Operations.Streams.Delete || operation == Operations.Streams.Write)) {
+			context.Add(new AssertionMatch(policy,
+				new AssertionInformation("streamId", $"{operation.Action} denied on $all", Grant.Deny)));
+			return new ValueTask<bool>(true);
+		}
+
+		context.Add(new AssertionMatch(policy,
+			new AssertionInformation("stream", "public stream", Grant.Allow)));
+
+		return new ValueTask<bool>(true);
+	}
+
+	private string FindStreamId(ReadOnlySpan<Parameter> parameters) {
+		for (int i = 0; i < parameters.Length; i++) {
+			if (parameters[i].Name == "streamId")
+				return parameters[i].Value;
+		}
+
+		throw new InvalidOperationException();
+	}
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/MultipleClaimMatchAssertion.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/MultipleClaimMatchAssertion.cs
new file mode 100644
index 00000000000..58b2ba8b9b5
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/MultipleClaimMatchAssertion.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Text;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+public class MultipleClaimMatchAssertion : IComparable<MultipleClaimMatchAssertion>, IAssertion {
+	private readonly IReadOnlyList<Claim> _claims;
+	private readonly MultipleMatchMode _mode;
+
+	public MultipleClaimMatchAssertion(Grant grant, MultipleMatchMode mode, params Claim[] claims) {
+		if (claims.Length == 0)
+			throw new ArgumentException("Value cannot be an empty collection.", nameof(claims));
+
+
+		_mode = mode;
+		Grant = grant;
+		_claims = claims.OrderBy(x => x.Type).ToArray();
+		var sb = new StringBuilder();
+		foreach (var claim in _claims)
+			sb.AppendLine($"{claim.Type} {claim.Value}");
+
+		var assertion = sb.ToString();
+		Information = mode switch {
+			MultipleMatchMode.All => new AssertionInformation("all", assertion, grant),
+			MultipleMatchMode.Any => new AssertionInformation("any", assertion, Grant),
+			MultipleMatchMode.None => new AssertionInformation("none", assertion, Grant),
+			_ => throw new ArgumentOutOfRangeException(nameof(mode))
+		};
+	}
+
+	public AssertionInformation Information { get; }
+
+	public Grant Grant { get; }
+
+	public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context) {
+		var matches = new List<Claim>(_claims.Count);
+
+		foreach (var claim in _claims)
+			if (cp.FindFirst(x =>
+				string.Equals(x.Type, claim.Type, StringComparison.Ordinal) &&
+				string.Equals(x.Value, claim.Value, StringComparison.Ordinal)) is Claim matched) {
+				matches.Add(matched);
+				if (_mode != MultipleMatchMode.All)
+					break;
+			}
+
+		var matchFound = false;
+		switch (_mode) {
+			case MultipleMatchMode.All:
+				if (matches.Count == _claims.Count) {
+					context.Add(new AssertionMatch(policy, Information, matches));
+					matchFound = true;
+				}
+
+				break;
+			case MultipleMatchMode.Any:
+				if (matches.Count > 0) {
+					context.Add(new AssertionMatch(policy, Information, matches));
+					matchFound = true;
+				}
+
+				break;
+			case MultipleMatchMode.None:
+				if (matches.Count == 0) {
+					context.Add(new AssertionMatch(policy, Information, matches));
+					matchFound = true;
+				}
+
+				break;
+			default:
+				throw new ArgumentOutOfRangeException();
+		}
+
+
+		return new ValueTask<bool>(matchFound);
+	}
+
+
+	public int CompareTo(MultipleClaimMatchAssertion other) {
+		var grant = Grant.CompareTo(other.Grant);
+		if (grant != 0)
+			return grant * -1;
+		var length = Comparer<int>.Default.Compare(_claims.Count, other._claims.Count);
+		if (length != 0)
+			return length;
+		for (int i = 0; i < _claims.Count; i++) {
+			var type = string.CompareOrdinal(_claims[i].Type, other._claims[i].Type);
+			if (type != 0)
+				return type;
+			var value = string.CompareOrdinal(_claims[i].Value, other._claims[i].Value);
+			if (value != 0)
+				return value;
+		}
+
+		return 0;
+	}
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/MultipleMatchMode.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/MultipleMatchMode.cs
new file mode 100644
index 00000000000..968abcbd680
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/MultipleMatchMode.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+public enum MultipleMatchMode {
+	All,
+	Any,
+	None
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/OrAssertion.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/OrAssertion.cs
new file mode 100644
index 00000000000..4bd4a7e785c
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/OrAssertion.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+internal class OrAssertion : IAssertion {
+	private readonly ReadOnlyMemory<IAssertion> _assertions;
+
+	public OrAssertion(params IAssertion[] assertions) {
+		_assertions = assertions.OrderBy(x => x.Grant).ToArray();
+		Information = new AssertionInformation("or", $"({string.Join(",", _assertions)})", Grant.Unknown);
+	}
+
+	public AssertionInformation Information { get; }
+
+	public Grant Grant { get; } = Grant.Unknown;
+
+	public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context) {
+		var remaining = _assertions;
+		while (!remaining.IsEmpty && context.Grant != Grant.Deny) {
+			var pending = remaining.Span[0].Evaluate(cp, operation, policy, context);
+			remaining = remaining.Slice(1);
+			if (!pending.IsCompleted)
+				return EvaluateAsync(pending, remaining, cp, operation, policy, context);
+			if (pending.Result)
+				return new ValueTask<bool>(true);
+		}
+
+		return new ValueTask<bool>(false);
+	}
+
+	private async ValueTask<bool> EvaluateAsync(ValueTask<bool> pending, ReadOnlyMemory<IAssertion> remaining,
+		ClaimsPrincipal cp, Operation operation, PolicyInformation policy, EvaluationContext result) {
+		bool evaluated;
+		while (!(evaluated = await pending.ConfigureAwait(false)) && !remaining.IsEmpty) {
+			pending = remaining.Span[0].Evaluate(cp, operation, policy, result);
+			remaining = remaining.Slice(1);
+		}
+
+		return evaluated;
+	}
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/Policy.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/Policy.cs
new file mode 100644
index 00000000000..d4ac2527a4f
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/Policy.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+internal class Policy {
+	private readonly Dictionary<OperationDefinition, List<IAssertion>> _assertions;
+	private readonly long _version;
+	private bool _sealed;
+
+	public Policy(string name, long version, DateTimeOffset validFrom) {
+		_version = version;
+		Name = name;
+		ValidFrom = validFrom;
+		_assertions = new Dictionary<OperationDefinition, List<IAssertion>>();
+		_sealed = false;
+	}
+
+	public string Name { get; }
+	public DateTimeOffset ValidFrom { get; }
+
+	public void AddMatchAnyAssertion(OperationDefinition operation, Grant grant, params Claim[] claims) {
+		var assertion = new MultipleClaimMatchAssertion(grant, MultipleMatchMode.Any, claims);
+		Add(operation, assertion);
+	}
+
+	public void AddClaimMatchAssertion(OperationDefinition operation, Grant grant, Claim claim) {
+		var assertion = new ClaimMatchAssertion(grant, claim);
+		Add(operation, assertion);
+	}
+
+	public void Add(OperationDefinition operation, IAssertion assertion) {
+		if (_sealed)
+			throw new InvalidOperationException("policy has been sealed and no further changes can be made");
+		if (!_assertions.TryGetValue(operation, out var assertions))
+			_assertions[operation] = assertions = new List<IAssertion>();
+		var insertAt = assertions.BinarySearch(assertion, AssertionComparer.Instance);
+		if (insertAt >= 0)
+			throw new InvalidOperationException("Assertion already exists");
+		assertions.Insert(~insertAt, assertion);
+	}
+
+	public ReadOnlyPolicy AsReadOnly() {
+		_sealed = true;
+		return new ReadOnlyPolicy(Name, _version, ValidFrom,
+			_assertions
+				.ToDictionary<KeyValuePair<OperationDefinition, List<IAssertion>>, OperationDefinition,
+					ReadOnlyMemory<IAssertion>>(x => x.Key, x => x.Value.ToArray()));
+	}
+
+	public void AllowAnonymous(in OperationDefinition operation) {
+		Add(operation, new AllowAnonymousAssertion());
+	}
+
+	public void RequireAuthenticated(in OperationDefinition operation) {
+		Add(operation, new RequireAuthenticatedAssertion());
+	}
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/PolicyEvaluator.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/PolicyEvaluator.cs
new file mode 100644
index 00000000000..b3715900fa8
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/PolicyEvaluator.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+internal class PolicyEvaluator : IPolicyEvaluator {
+	private static readonly AssertionInformation DeniedByDefault =
+		new AssertionInformation("default", "denied by default", Grant.Deny);
+
+	private readonly ReadOnlyPolicy _policy;
+	private readonly PolicyInformation _policyInfo;
+
+	public PolicyEvaluator(ReadOnlyPolicy policy) {
+		_policy = policy;
+		_policyInfo = policy.Information;
+	}
+
+	public ValueTask<EvaluationResult>
+		EvaluateAsync(ClaimsPrincipal cp, Operation operation, CancellationToken ct) {
+		var evaluation = new EvaluationContext(operation, ct);
+
+		if (_policy.TryGetAssertions(operation, out var assertions))
+			while (!assertions.IsEmpty && evaluation.Grant != Grant.Deny) {
+				if (ct.IsCancellationRequested)
+					break;
+				var assertion = assertions.Span[0];
+				assertions = assertions.Slice(1);
+				var evaluate = assertion.Evaluate(cp, operation, _policyInfo, evaluation);
+				if (!evaluate.IsCompleted)
+					return EvaluateAsync(evaluate, cp, operation, assertions, evaluation, ct);
+			}
+
+		if (evaluation.Grant == Grant.Unknown)
+			evaluation.Add(new AssertionMatch(_policyInfo, DeniedByDefault));
+
+		return new ValueTask<EvaluationResult>(evaluation.ToResult());
+	}
+
+	private async ValueTask<EvaluationResult> EvaluateAsync(
+		ValueTask<bool> pending,
+		ClaimsPrincipal cp,
+		Operation operation,
+		ReadOnlyMemory<IAssertion> assertions,
+		EvaluationContext evaluationContext,
+		CancellationToken ct) {
+		do {
+			if (ct.IsCancellationRequested)
+				break;
+			await pending.ConfigureAwait(false);
+			if (ct.IsCancellationRequested)
+				break;
+			if (assertions.IsEmpty)
+				break;
+			pending = assertions.Span[0].Evaluate(cp, operation, _policyInfo, evaluationContext);
+			assertions = assertions.Slice(1);
+		} while (evaluationContext.Grant != Grant.Deny);
+
+		if (evaluationContext.Grant == Grant.Unknown)
+			evaluationContext.Add(new AssertionMatch(_policyInfo, DeniedByDefault));
+
+		return evaluationContext.ToResult();
+	}
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/PolicyInformation.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/PolicyInformation.cs
new file mode 100644
index 00000000000..5f0662e30cf
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/PolicyInformation.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+public class PolicyInformation {
+	public readonly DateTimeOffset Expires;
+	public readonly string Name;
+
+	public PolicyInformation(string name, long version, DateTimeOffset expires) {
+		Version = version;
+		Name = name;
+		Expires = expires;
+	}
+
+	public long Version { get; }
+
+	public override string ToString() {
+		return $"Policy : {Name} {Version} {Expires}";
+	}
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/ReadOnlyPolicy.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/ReadOnlyPolicy.cs
new file mode 100644
index 00000000000..bd254a8efec
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/ReadOnlyPolicy.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+internal class ReadOnlyPolicy {
+	private readonly IReadOnlyDictionary<OperationDefinition, ReadOnlyMemory<IAssertion>> _assertions;
+	private readonly string _name;
+	private readonly DateTimeOffset _validFrom;
+	private readonly long _version;
+
+	public ReadOnlyPolicy(string name, long version, DateTimeOffset validFrom,
+		IReadOnlyDictionary<OperationDefinition, ReadOnlyMemory<IAssertion>> assertions) {
+		_name = name;
+		_version = version;
+		_validFrom = validFrom;
+		_assertions = assertions;
+	}
+
+	public PolicyInformation Information => new PolicyInformation(_name, _version, DateTimeOffset.MaxValue);
+
+	public bool TryGetAssertions(OperationDefinition operation, out ReadOnlyMemory<IAssertion> assertions) {
+		return _assertions.TryGetValue(operation, out assertions);
+	}
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/RequireAuthenticatedAssertion.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/RequireAuthenticatedAssertion.cs
new file mode 100644
index 00000000000..65e3f7ac5ab
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/RequireAuthenticatedAssertion.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+internal class RequireAuthenticatedAssertion : IAssertion {
+	public Grant Grant { get; } = Grant.Unknown;
+
+	public AssertionInformation Information { get; } =
+		new AssertionInformation("match", "authenticated", Grant.Unknown);
+
+	public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context) {
+		if (!cp.Claims.Any() ||
+			cp.Claims.Any(x => string.Equals(x.Type, ClaimTypes.Anonymous, StringComparison.Ordinal)))
+			context.Add(new AssertionMatch(policy, new AssertionInformation("match", "authenticated", Grant.Deny)));
+		else
+			context.Add(new AssertionMatch(policy,
+				new AssertionInformation("match", "authenticated", Grant.Allow)));
+		return new ValueTask<bool>(true);
+	}
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/RequireStreamReadAssertion.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/RequireStreamReadAssertion.cs
new file mode 100644
index 00000000000..5bdc6ecc435
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/RequireStreamReadAssertion.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+public class RequireStreamReadAssertion : IAssertion {
+	private static readonly Operation StreamRead = new Operation(Operations.Streams.Read);
+	private readonly LegacyStreamPermissionAssertion _streamAssertion;
+
+	public RequireStreamReadAssertion(LegacyStreamPermissionAssertion streamAssertion) {
+		_streamAssertion = streamAssertion;
+		Information = streamAssertion.Information;
+	}
+
+	public AssertionInformation Information { get; }
+	public Grant Grant { get; } = Grant.Unknown;
+
+	public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context) {
+		if (operation == Operations.Subscriptions.ProcessMessages ||
+			operation == Operations.Subscriptions.ReplayParked) {
+			var stream = FindStreamId(operation.Parameters.Span);
+			return _streamAssertion.Evaluate(cp,
+				StreamRead.WithParameter(Operations.Streams.Parameters.StreamId(stream)), policy, context);
+		}
+
+		return new ValueTask<bool>(false);
+	}
+
+	private string FindStreamId(ReadOnlySpan<Parameter> parameters) {
+		for (int i = 0; i < parameters.Length; i++)
+			if (parameters[i].Name == "streamId")
+				return parameters[i].Value;
+
+		return null;
+	}
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/SystemAccounts.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/SystemAccounts.cs
new file mode 100644
index 00000000000..bb83cc3b9dd
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/SystemAccounts.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Security.Claims;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+public static class SystemAccounts {
+	private static readonly IReadOnlyList<Claim> Claims = new[] {
+		new Claim(ClaimTypes.Name, "system"),
+		new Claim(ClaimTypes.Role, "system"),
+		new Claim(ClaimTypes.Role, SystemRoles.Admins),
+	};
+
+	public static readonly ClaimsPrincipal System = new ClaimsPrincipal(new ClaimsIdentity(Claims, "system"));
+
+	public static readonly ClaimsPrincipal Anonymous =
+		new ClaimsPrincipal(new ClaimsIdentity(new[] { new Claim(ClaimTypes.Anonymous, ""), }));
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/SystemRoles.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/SystemRoles.cs
new file mode 100644
index 00000000000..789d8572953
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/SystemRoles.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+public static class SystemRoles {
+	public const string Admins = "$admins";
+	public const string Operations = "$ops";
+	public const string All = "$all";
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/SystemUsers.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/SystemUsers.cs
new file mode 100644
index 00000000000..9f56ebc8451
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/SystemUsers.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+public static class SystemUsers {
+	public const string Admin = "admin";
+	public const string Operations = "ops";
+}
diff --git a/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/WellKnownAssertions.cs b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/WellKnownAssertions.cs
new file mode 100644
index 00000000000..81eb6493dbd
--- /dev/null
+++ b/src/KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled/WellKnownAssertions.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Claims;
+
+namespace KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+
+internal static class WellKnownAssertions {
+	public static readonly IAssertion System = new MultipleClaimMatchAssertion(Grant.Allow, MultipleMatchMode.All,
+		new Claim(ClaimTypes.Name, "system"), new Claim(ClaimTypes.Authentication, "ES-Legacy"));
+
+	public static readonly IAssertion Admin = new MultipleClaimMatchAssertion(Grant.Allow, MultipleMatchMode.Any,
+		new Claim(ClaimTypes.Name, "admin"), new Claim(ClaimTypes.Role, SystemRoles.Admins));
+}
diff --git a/src/KurrentDB.Auth.OAuth.Tests/ContainerExtensions.cs b/src/KurrentDB.Auth.OAuth.Tests/ContainerExtensions.cs
new file mode 100644
index 00000000000..88cb937f1ec
--- /dev/null
+++ b/src/KurrentDB.Auth.OAuth.Tests/ContainerExtensions.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using Ductus.FluentDocker.Extensions;
+using Ductus.FluentDocker.Services;
+using Ductus.FluentDocker.Services.Extensions;
+using Xunit.Abstractions;
+
+namespace KurrentDB.Auth.OAuth.Tests;
+
+internal static class ContainerExtensions {
+	public static void ShipContainerLogs(this IContainerService container, ITestOutputHelper testOutputHelper) =>
+		Task.Run(() => {
+			using var logs = container.Logs(true);
+			foreach (var line in logs.ReadToEnd()) {
+				testOutputHelper.WriteLine(line);
+			}
+		});
+}
diff --git a/src/KurrentDB.Auth.OAuth.Tests/Dockerfile b/src/KurrentDB.Auth.OAuth.Tests/Dockerfile
new file mode 100644
index 00000000000..4b740b8ed3e
--- /dev/null
+++ b/src/KurrentDB.Auth.OAuth.Tests/Dockerfile
@@ -0,0 +1,23 @@
+ARG DB_IMAGE=docker.eventstore.com/eventstore-staging-ee/eventstoredb-ee:ci
+
+FROM mcr.microsoft.com/dotnet/core/sdk:8.0-jammy AS build
+
+WORKDIR /build/src
+
+COPY ./src/EventStore.CommercialHA.sln ./src/*/*.csproj ./src/Directory.Build.props ./
+
+RUN for file in $(ls *.csproj); do mkdir -p ./${file%.*}/ && mv $file ./${file%.*}/; done
+
+RUN dotnet restore --runtime=${RUNTIME}
+
+COPY ./src .
+
+RUN dotnet build --configuration=Release --runtime=${RUNTIME} --no-restore --framework=net8.0 && \
+	rm /build/bin/Release/KurrentDB.Auth.OAuth/net8.0/EventStore.Plugins.*
+
+FROM ${DB_IMAGE} as kurrentdb
+
+RUN mkdir -p /opt/kurrentdb/plugins
+
+COPY --from=build /build/bin/Release/KurrentDB.Auth.OAuth/net8.0 /opt/kurrentdb/plugins/oauth
+
diff --git a/src/KurrentDB.Auth.OAuth.Tests/FactRequiringDockerAttribute.cs b/src/KurrentDB.Auth.OAuth.Tests/FactRequiringDockerAttribute.cs
new file mode 100644
index 00000000000..2f8ac185dd6
--- /dev/null
+++ b/src/KurrentDB.Auth.OAuth.Tests/FactRequiringDockerAttribute.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using Xunit;
+
+namespace KurrentDB.Auth.OAuth.Tests;
+
+public sealed class FactRequiringDockerAttribute : FactAttribute {
+	public FactRequiringDockerAttribute() {
+		Skip = "Skipping plugin tests requiring docker as these need to be reworked";
+		if (OperatingSystem.IsWindows()) {
+			var gha = Environment.GetEnvironmentVariable("GITHUB_ACTIONS") ?? "false";
+			if (gha.Equals("true", StringComparison.InvariantCultureIgnoreCase)) {
+				Skip = "Windows machines in GitHub actions do not have access to linux docker containers.";
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Auth.OAuth.Tests/Fixture.cs b/src/KurrentDB.Auth.OAuth.Tests/Fixture.cs
new file mode 100644
index 00000000000..f3ca2b4e377
--- /dev/null
+++ b/src/KurrentDB.Auth.OAuth.Tests/Fixture.cs
@@ -0,0 +1,252 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading.Tasks;
+using Ductus.FluentDocker.Builders;
+using Ductus.FluentDocker.Model.Builders;
+using Ductus.FluentDocker.Services;
+using Polly;
+using Xunit.Abstractions;
+
+namespace KurrentDB.Auth.OAuth.Tests;
+
+internal class Fixture : IDisposable {
+	private const string PluginConfigurationPath = "/etc/kurrentdb/oauth.conf";
+
+	private const string BuildConfiguration =
+#if DEBUG
+		"Debug";
+#else
+			"Release";
+#endif
+
+	private static string CertificateDirectory => Path.Join(BuildDirectory, "testcerts");
+
+	private static string BuildDirectory => Environment.CurrentDirectory;
+
+	private static string PluginSourceDirectory {
+		get {
+			// x64 has different number of levels than AnyCPU
+			var target = "KurrentDB.Auth.OAuth";
+			var i = BuildDirectory.LastIndexOf(target) + target.Length;
+			return BuildDirectory[0..i];
+		}
+	}
+
+	private static string PluginPublishDirectory =>
+		Path.Combine(BuildDirectory, "oauth");
+
+	private static string ESImage {
+		get {
+			var imageWithTag = Environment.GetEnvironmentVariable("DB_IMAGE");
+			if (!string.IsNullOrWhiteSpace(imageWithTag))
+				return imageWithTag;
+
+			var version = Assembly.GetAssembly(typeof(OAuthAuthenticationPlugin)).GetName().Version;
+
+			var tag = (version.Major, version.Minor) switch {
+				(24, 4) => TagForMajorMinor(version),
+				(24, 6) => TagForMajorMinor(version),
+				_ => "ci"
+			};
+
+			var image = "docker.eventstore.com/eventstore-staging-ee/eventstoredb-ee";
+			return image + ":" + tag;
+		}
+	}
+
+	private static string TagForMajorMinor(Version version) =>
+		$"{version.Major}.{version.Minor}.0-nightly-x64-8.0-bookworm-slim";
+
+	private IContainerService _eventStore;
+	private readonly ITestOutputHelper _output;
+	private readonly FileInfo _pluginConfiguration;
+	private readonly string[] _containerEnv;
+	public IdpFixture IdentityServer { get; }
+
+	private Fixture(ITestOutputHelper output, params string[] env) {
+		var defaultEnv = new[] {
+			"KURRENTDB_CERTIFICATE_FILE=/opt/kurrentdb/certs/test.crt",
+			"KURRENTDB_CERTIFICATE_PRIVATE_KEY_FILE=/opt/kurrentdb/certs/test.key",
+			"KURRENTDB_TRUSTED_ROOT_CERTIFICATES_PATH=/opt/kurrentdb/certs/",
+			$"KURRENTDB_AUTHENTICATION_CONFIG={PluginConfigurationPath}",
+			"KURRENTDB_AUTHENTICATION_TYPE=oauth",
+			"KURRENTDB_LOG_FAILED_AUTHENTICATION_ATTEMPTS=true",
+			"KURRENTDB_LOG_HTTP_REQUESTS=true",
+			"KURRENTDB__LICENSING__LICENSE_KEY=test",
+			"KURRENTDB__LICENSING__BASE_URL=https://localhost:1"
+		};
+
+		_output = output;
+		_containerEnv = defaultEnv.Concat(env).ToArray();
+		_pluginConfiguration = new FileInfo(Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()));
+
+		IdentityServer = new IdpFixture(_output);
+	}
+
+	public static async ValueTask<Fixture> Create(ITestOutputHelper output, params string[] env) {
+		var fixture = new Fixture(output, env);
+		await fixture.Start();
+
+		return fixture;
+	}
+
+	private async ValueTask Start() {
+		await IdentityServer.Start();
+		await PublishPlugin(PluginSourceDirectory);
+		await WritePluginConfiguration();
+		await GenerateSelfSignedCertificateKeyPair(CertificateDirectory);
+		await Task.Delay(TimeSpan.FromSeconds(2));
+
+		var imageName = "kurrentdb-for-oauth-plugins-unit-tests";
+
+		using var x = new Builder()
+			.DefineImage(imageName)
+			// start with enterprise edition
+			.From(ESImage)
+			// remove all the plugins. if the EventStore.Plugins reference has changed the server in
+			// the nightly cannot necessarily even load the commercial HA plugins yet
+			// (these tests need to pass in order to update the commercial HA plugins)
+			.Run("mv /opt/kurrentdb/plugins /opt/kurrentdb/all-plugins")
+			// reinstate the tcp plugin
+			.Run("mkdir -p /opt/kurrentdb/plugins")
+			.Run("cp -r /opt/kurrentdb/all-plugins/KurrentDB.TcpPlugin /opt/kurrentdb/plugins/KurrentDB.TcpPlugin")
+			.Build();
+
+		_eventStore = new Builder()
+			.UseContainer()
+			.UseImage(imageName)
+			.WithEnvironment(_containerEnv)
+			.WithName("es-oauth-tests")
+			.Mount(PluginPublishDirectory, "/opt/kurrentdb/plugins/oauth", MountType.ReadOnly)
+			.Mount(CertificateDirectory, "/opt/kurrentdb/certs", MountType.ReadOnly)
+			.Mount(_pluginConfiguration.FullName, PluginConfigurationPath, MountType.ReadOnly)
+			.ExposePort(1113, 1113)
+			.ExposePort(2113, 2113)
+			.Build();
+
+		_eventStore.Start();
+		_eventStore.ShipContainerLogs(_output);
+
+		try {
+			await Policy.Handle<Exception>()
+				.WaitAndRetryAsync(5, retryCount => TimeSpan.FromSeconds(retryCount * retryCount))
+				.ExecuteAsync(async () => {
+					using var client = new HttpClient(new SocketsHttpHandler {
+						SslOptions = {
+							RemoteCertificateValidationCallback = delegate { return true; }
+						}
+					});
+					using var response = await client.GetAsync("https://localhost:2113/");
+					if (response.StatusCode >= HttpStatusCode.BadRequest) {
+						throw new Exception($"Health check failed with status code {response.StatusCode}");
+					}
+				});
+		} catch (Exception) {
+			_eventStore.Dispose();
+			IdentityServer.Dispose();
+			throw;
+		}
+	}
+
+	private async Task WritePluginConfiguration() {
+		await using (var stream = _pluginConfiguration.Create()) {
+			await using var writer = new StreamWriter(stream);
+			await writer.WriteAsync($@"---
+OAuth:
+  Issuer: {IdentityServer.Issuer}
+  Audience: eventstore
+  Insecure: true
+  DisableIssuerValidation: true");
+		}
+
+		if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
+			chmod(_pluginConfiguration.FullName, Convert.ToInt32("0755", 8));
+		}
+	}
+
+	[DllImport("libc", SetLastError = true)]
+	private static extern int chmod(string pathname, int mode);
+
+	private async Task GenerateSelfSignedCertificateKeyPair(string outputDirectory) {
+		if (Directory.Exists(outputDirectory)) {
+			Directory.Delete(outputDirectory, true);
+		}
+
+		Directory.CreateDirectory(outputDirectory);
+
+		using var rsa = RSA.Create();
+		var certReq = new CertificateRequest("CN=eventstoredb-node", rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
+		var sanBuilder = new SubjectAlternativeNameBuilder();
+		sanBuilder.AddIpAddress(IPAddress.Loopback);
+		certReq.CertificateExtensions.Add(sanBuilder.Build());
+		var certificate = certReq.CreateSelfSigned(DateTimeOffset.UtcNow.AddMonths(-1), DateTimeOffset.UtcNow.AddMonths(1));
+
+		await using (var streamWriter = new StreamWriter(Path.Join(outputDirectory, "test.crt"), false)) {
+			var certBytes = certificate.Export(X509ContentType.Cert);
+			var certString = Convert.ToBase64String(certBytes);
+
+			await streamWriter.WriteLineAsync("-----BEGIN CERTIFICATE-----");
+			for (var i = 0; i < certString.Length; i += 64) {
+				await streamWriter.WriteLineAsync(certString.Substring(i, Math.Min(i + 64, certString.Length) - i));
+			}
+			await streamWriter.WriteLineAsync("-----END CERTIFICATE-----");
+		}
+
+		await using (var streamWriter = new StreamWriter(Path.Join(outputDirectory, "test.key"), false)) {
+			var keyBytes = rsa.ExportRSAPrivateKey();
+			var keyString = Convert.ToBase64String(keyBytes);
+
+			await streamWriter.WriteLineAsync("-----BEGIN RSA PRIVATE KEY-----");
+			for (var i = 0; i < keyString.Length; i += 64) {
+				await streamWriter.WriteLineAsync(keyString.Substring(i, Math.Min(i + 64, keyString.Length) - i));
+			}
+			await streamWriter.WriteLineAsync("-----END RSA PRIVATE KEY-----");
+		}
+	}
+
+	private static async Task PublishPlugin(string pluginDirectory) {
+		var tcs = new TaskCompletionSource<bool>();
+		using var process = new Process {
+			StartInfo = new ProcessStartInfo {
+				FileName = "dotnet",
+				Arguments = $"publish --configuration {BuildConfiguration} --framework=net8.0 --output {PluginPublishDirectory}",
+				WorkingDirectory = pluginDirectory,
+				UseShellExecute = false,
+				RedirectStandardError = true,
+				RedirectStandardOutput = true
+			},
+			EnableRaisingEvents = true
+		};
+		process.Exited += (_, e) => tcs.SetResult(default);
+		process.Start();
+
+		var stdout = process.StandardOutput.ReadToEndAsync();
+		var stderr = process.StandardError.ReadToEndAsync();
+
+		await Task.WhenAll(tcs.Task, stdout, stderr);
+
+		if (process.ExitCode != 0) {
+			throw new Exception(stdout.Result);
+		}
+	}
+
+	public void Dispose() {
+		_eventStore?.Dispose();
+		IdentityServer?.Dispose();
+		_pluginConfiguration?.Delete();
+		if (Directory.Exists(CertificateDirectory)) {
+			Directory.Delete(CertificateDirectory, true);
+		}
+	}
+}
diff --git a/src/KurrentDB.Auth.OAuth.Tests/IdpFixture.cs b/src/KurrentDB.Auth.OAuth.Tests/IdpFixture.cs
new file mode 100644
index 00000000000..a3185335f0b
--- /dev/null
+++ b/src/KurrentDB.Auth.OAuth.Tests/IdpFixture.cs
@@ -0,0 +1,129 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Ductus.FluentDocker.Builders;
+using Ductus.FluentDocker.Model.Builders;
+using Ductus.FluentDocker.Services;
+using IdentityModel.Client;
+using Polly;
+using Xunit.Abstractions;
+
+namespace KurrentDB.Auth.OAuth.Tests;
+
+internal class IdpFixture : IDisposable {
+	private const int IdpPort = 5001;
+	public const string ClientId = "eventstore-tcp";
+	public const string ClientSecret = "secret";
+
+	private static string SourceDirectory =>
+		Path.GetFullPath(Path.Combine(Environment.CurrentDirectory, "../../../../src"));
+
+	private static string TestSourceDirectory => Path.Combine(SourceDirectory, "KurrentDB.Auth.OAuth.Tests");
+
+	private static string IdentityServerSourceDirectory => Path.Combine(SourceDirectory, "IdentityServer");
+
+	private static string IdentityServerConfigurationFile =>
+		Path.Combine(Environment.CurrentDirectory, "conf", "idsrv4.conf.json");
+
+	private static string IdentityServerUserConfigurationFile =>
+		Path.Combine(Environment.CurrentDirectory, "conf", "users.conf.json");
+
+	private readonly ITestOutputHelper _output;
+	private readonly IContainerService _identityServer;
+	private readonly TaskCompletionSource<DiscoveryDocumentResponse> _discoveryDocumentSource;
+	public HttpClient HttpClient { get; }
+
+	public IdpFixture(ITestOutputHelper output) {
+		_output = output;
+
+		_identityServer = new Builder()
+			.UseContainer()
+			.UseImage("ghcr.io/kurrent-io/idsrv4/idsrv4")
+			.WithName("es-oauth-tests-idsrv4")
+			.Mount(IdentityServerConfigurationFile, "/etc/idsrv4/idsrv4.conf", MountType.ReadOnly)
+			.Mount(IdentityServerUserConfigurationFile, "/etc/idsrv4/users.conf", MountType.ReadOnly)
+			.ExposePort(IdpPort, IdpPort)
+			.Build();
+
+		_identityServer.StopOnDispose = true;
+		_discoveryDocumentSource = new TaskCompletionSource<DiscoveryDocumentResponse>();
+
+		HttpClient = new HttpClient(new SocketsHttpHandler {
+			SslOptions = {
+				RemoteCertificateValidationCallback = delegate { return true; }
+			}
+		}, true) {
+			BaseAddress = new UriBuilder {
+				Scheme = Uri.UriSchemeHttps,
+				Port = IdpPort
+			}.Uri
+		};
+	}
+
+	public async Task Start() {
+		_identityServer.ShipContainerLogs(_output);
+		_identityServer.Start();
+
+		try {
+			await Policy.Handle<Exception>()
+				.WaitAndRetryAsync(5, retryCount => TimeSpan.FromSeconds(retryCount * retryCount))
+				.ExecuteAsync(async () => {
+					var discoveryDocument = await HttpClient.GetDiscoveryDocumentAsync();
+					if (discoveryDocument?.HttpResponse == null) {
+						throw new Exception("Health check not available yet");
+					}
+					if (discoveryDocument.HttpStatusCode != HttpStatusCode.OK) {
+						throw new Exception($"Health check failed with status code {discoveryDocument.HttpStatusCode}");
+					}
+					_discoveryDocumentSource.SetResult(discoveryDocument);
+				});
+		} catch (Exception) {
+			_identityServer.Dispose();
+			throw;
+		}
+	}
+
+
+	public async Task<string> GetAccessToken(string username, string password) {
+		var response = await GetTokenResponse(username, password);
+
+		return response.AccessToken;
+	}
+
+	public async Task<string> GetRefreshToken(string username, string password) {
+		var response = await GetTokenResponse(username, password);
+
+		return response.RefreshToken;
+	}
+
+	private async Task<TokenResponse> GetTokenResponse(string username, string password) {
+		var discoveryDocument = await _discoveryDocumentSource.Task;
+		var response = await HttpClient.RequestPasswordTokenAsync(new PasswordTokenRequest {
+			ClientId = ClientId,
+			ClientSecret = ClientSecret,
+			UserName = username,
+			Password = password,
+			Address = discoveryDocument.TokenEndpoint,
+			Scope = "openid streams offline_access"
+		});
+
+		if (response.Exception != null) {
+			throw response.Exception;
+		}
+
+		return response;
+	}
+
+	public string Issuer =>
+		$"https://{_identityServer.GetConfiguration().NetworkSettings.IPAddress}:{IdpPort}";
+
+
+	public void Dispose() {
+		_identityServer?.Dispose();
+	}
+}
diff --git a/src/KurrentDB.Auth.OAuth.Tests/KurrentDB.Auth.OAuth.Tests.csproj b/src/KurrentDB.Auth.OAuth.Tests/KurrentDB.Auth.OAuth.Tests.csproj
new file mode 100644
index 00000000000..bab4b39d0ea
--- /dev/null
+++ b/src/KurrentDB.Auth.OAuth.Tests/KurrentDB.Auth.OAuth.Tests.csproj
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<OutputType>Library</OutputType>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<IsPackable>false</IsPackable>
+		<IsPublishable>false</IsPublishable>
+		<IsTestProject>true</IsTestProject>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="Ductus.FluentDocker.XUnit" Version="2.10.59" />
+		<PackageReference Include="EventStore.Client" Version="22.0.0" />
+		<PackageReference Include="EventStore.Client.Grpc.Streams" Version="23.1.0" />
+		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3">
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		  <PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.11" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+		<PackageReference Include="Polly" Version="8.2.0" />
+		<PackageReference Include="xunit" Version="2.6.6" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+		</PackageReference>
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.Auth.OAuth\KurrentDB.Auth.OAuth.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+		<Content Include="conf\idsrv4.conf.json">
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+		</Content>
+		<Content Include="conf\users.conf.json">
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+		</Content>
+	</ItemGroup>
+	<ItemGroup>
+	  <None Update="conf\oauth.conf">
+	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	  </None>
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.Auth.OAuth.Tests/OAuthAuthenticationGrpcIntegrationTests.cs b/src/KurrentDB.Auth.OAuth.Tests/OAuthAuthenticationGrpcIntegrationTests.cs
new file mode 100644
index 00000000000..5e4354f0ace
--- /dev/null
+++ b/src/KurrentDB.Auth.OAuth.Tests/OAuthAuthenticationGrpcIntegrationTests.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.Client;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace KurrentDB.Auth.OAuth.Tests;
+
+public class OAuthAuthenticationGrpcIntegrationTests {
+	private readonly ITestOutputHelper _output;
+
+	public OAuthAuthenticationGrpcIntegrationTests(ITestOutputHelper output) {
+		_output = output;
+	}
+
+	[FactRequiringDocker]
+	public async Task admin() {
+		using var fixture = await Fixture.Create(_output);
+		var token = await fixture.IdentityServer.GetAccessToken("admin", "password");
+
+		using var client = GetEventStoreClient(token);
+
+		await client.AppendToStreamAsync("a-stream", StreamState.Any, new[] {
+			new EventData(Uuid.NewUuid(), "-", ReadOnlyMemory<byte>.Empty, ReadOnlyMemory<byte>.Empty),
+		});
+		await client.ReadAllAsync(Direction.Forwards, Position.Start).ToArrayAsync();
+	}
+
+	[FactRequiringDocker]
+	public async Task user() {
+		using var fixture = await Fixture.Create(_output);
+		var token = await fixture.IdentityServer.GetAccessToken("user", "password");
+
+		using var client = GetEventStoreClient(token);
+
+		await Assert.ThrowsAsync<AccessDeniedException>(() =>
+			client.ReadAllAsync(Direction.Forwards, Position.Start).ToArrayAsync()
+				.AsTask());
+	}
+
+	private EventStoreClient GetEventStoreClient(string token) {
+		var settings = EventStoreClientSettings.Create("esdb://localhost:2113/?tlsVerifyCert=false");
+		settings.DefaultCredentials = new UserCredentials(token);
+		settings.LoggerFactory = new XUnitLoggerFactory(_output);
+		return new(settings);
+	}
+}
diff --git a/src/KurrentDB.Auth.OAuth.Tests/OAuthAuthenticationHttpIntegrationTests.cs b/src/KurrentDB.Auth.OAuth.Tests/OAuthAuthenticationHttpIntegrationTests.cs
new file mode 100644
index 00000000000..46784c1d376
--- /dev/null
+++ b/src/KurrentDB.Auth.OAuth.Tests/OAuthAuthenticationHttpIntegrationTests.cs
@@ -0,0 +1,85 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace KurrentDB.Auth.OAuth.Tests;
+
+public class OAuthAuthenticationHttpIntegrationTests {
+	private static readonly string[] EnableAtomPub = {
+		"KURRENTDB_ENABLE_ATOM_PUB_OVER_HTTP=true"
+	};
+
+	private readonly ITestOutputHelper _output;
+
+	public OAuthAuthenticationHttpIntegrationTests(ITestOutputHelper output) {
+		_output = output;
+	}
+
+	private StringContent GenerateEvents() {
+		var events = new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = new { A = "1" } } };
+		return new StringContent(JsonConvert.SerializeObject(events)) {
+			Headers = { ContentType = new MediaTypeHeaderValue("application/vnd.eventstore.events+json") }
+		};
+	}
+
+	[FactRequiringDocker]
+	public async Task admin() {
+		using var fixture = await Fixture.Create(_output, EnableAtomPub);
+		var token = await fixture.IdentityServer.GetAccessToken("admin", "password");
+
+		using var client = CreateHttpClient(token);
+
+		using var writeResponse = await client.PostAsync("/streams/a-stream", GenerateEvents());
+		Assert.Equal(HttpStatusCode.Created, writeResponse.StatusCode);
+
+		using var writeSystemResponse = await client.PostAsync("/streams/$systemstream", GenerateEvents());
+		Assert.Equal(HttpStatusCode.Created, writeSystemResponse.StatusCode);
+
+		using var readResponse = await client.GetAsync("/streams/$all");
+		Assert.Equal(HttpStatusCode.OK, readResponse.StatusCode);
+	}
+
+	[FactRequiringDocker]
+	public async Task user() {
+		using var fixture = await Fixture.Create(_output, EnableAtomPub);
+		var token = await fixture.IdentityServer.GetAccessToken("user", "password");
+
+		using var client = CreateHttpClient(token);
+
+		using var writeResponse = await client.PostAsync("/streams/a-stream", GenerateEvents());
+		Assert.Equal(HttpStatusCode.Created, writeResponse.StatusCode);
+
+		using var writeSystemResponse = await client.PostAsync("/streams/$systemstream", GenerateEvents());
+		Assert.Equal(HttpStatusCode.Unauthorized, writeSystemResponse.StatusCode);
+
+		using var readResponse = await client.GetAsync("/streams/$all");
+		Assert.Equal(HttpStatusCode.Unauthorized, readResponse.StatusCode);
+	}
+
+
+	private static HttpClient CreateHttpClient(string token) {
+		var socketsHttpHandler = new SocketsHttpHandler {
+			SslOptions = {
+				RemoteCertificateValidationCallback = delegate { return true; }
+			}
+		};
+
+		return new HttpClient(socketsHttpHandler) {
+			BaseAddress = new UriBuilder {
+				Port = 2113,
+				Scheme = Uri.UriSchemeHttps
+			}.Uri,
+			DefaultRequestHeaders = {
+				Authorization = new AuthenticationHeaderValue("Bearer", token)
+			}
+		};
+	}
+}
diff --git a/src/KurrentDB.Auth.OAuth.Tests/OAuthAuthenticationPluginTests.cs b/src/KurrentDB.Auth.OAuth.Tests/OAuthAuthenticationPluginTests.cs
new file mode 100644
index 00000000000..dbb7f815be8
--- /dev/null
+++ b/src/KurrentDB.Auth.OAuth.Tests/OAuthAuthenticationPluginTests.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using EventStore.Plugins.Licensing;
+using KurrentDB.Plugins.TestHelpers;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace KurrentDB.Auth.OAuth.Tests;
+
+
+public class OAuthAuthenticationPluginTests {
+	private readonly string _configFile;
+
+	public OAuthAuthenticationPluginTests() {
+		_configFile = Path.Combine(Environment.CurrentDirectory, "conf", "oauth.conf");
+	}
+
+	[Theory]
+	[InlineData(true, "OAUTH_AUTHENTICATION", false)]
+	[InlineData(true, "NONE", true)]
+	[InlineData(false, "NONE", true)]
+	public void respects_license(bool licensePresent, string entitlement, bool expectedException) {
+		// given
+		var sut = new OAuthAuthenticationPlugin()
+			.GetAuthenticationProviderFactory(_configFile)
+			.Build(false);
+
+		var config = new ConfigurationBuilder().Build();
+		var builder = WebApplication.CreateBuilder();
+
+		var licenseService = new Fixtures.FakeLicenseService(licensePresent, entitlement);
+		builder.Services.AddSingleton<ILicenseService>(licenseService);
+
+		sut.ConfigureServices(
+			builder.Services,
+			config);
+
+		var app = builder.Build();
+
+		// when
+		sut.ConfigureApplication(app, config);
+
+		// then
+		if (expectedException) {
+			Assert.NotNull(licenseService.RejectionException);
+		} else {
+			Assert.Null(licenseService.RejectionException);
+		}
+	}
+}
diff --git a/src/KurrentDB.Auth.OAuth.Tests/OAuthAuthenticationTcpIntegrationTests.cs b/src/KurrentDB.Auth.OAuth.Tests/OAuthAuthenticationTcpIntegrationTests.cs
new file mode 100644
index 00000000000..937e2a067a8
--- /dev/null
+++ b/src/KurrentDB.Auth.OAuth.Tests/OAuthAuthenticationTcpIntegrationTests.cs
@@ -0,0 +1,85 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using EventStore.ClientAPI.SystemData;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace KurrentDB.Auth.OAuth.Tests;
+
+public class OAuthAuthenticationTcpIntegrationTests {
+	private static readonly string[] EnableTcp = {
+		"KurrentDB__TcpPlugin__EnableExternalTcp=true"
+	};
+
+	private readonly ITestOutputHelper _output;
+
+	public OAuthAuthenticationTcpIntegrationTests(ITestOutputHelper output) {
+		_output = output;
+	}
+
+	[FactRequiringDocker]
+	public async Task admin() {
+		using var fixture = await Fixture.Create(_output, EnableTcp);
+		var token = await fixture.IdentityServer.GetAccessToken("admin", "password");
+
+		using var client = await GetEventStoreConnection(token);
+
+		await client.AppendToStreamAsync("a-stream", ExpectedVersion.Any,
+			new EventData(Guid.NewGuid(), "-", false, Array.Empty<byte>(), Array.Empty<byte>()));
+
+		await client.ReadAllEventsForwardAsync(Position.Start, 100, false);
+	}
+
+	[FactRequiringDocker]
+	public async Task user() {
+		using var fixture = await Fixture.Create(_output, EnableTcp);
+		var token = await fixture.IdentityServer.GetAccessToken("user", "password");
+
+		using var client = await GetEventStoreConnection(token);
+
+		await Assert.ThrowsAsync<AccessDeniedException>(() =>
+			client.ReadAllEventsForwardAsync(Position.Start, 100, false));
+	}
+
+	private async Task<IEventStoreConnection> GetEventStoreConnection(string token) {
+		var client = EventStoreConnection.Create(
+			ConnectionSettings.Create()
+				.DisableServerCertificateValidation()
+				.SetDefaultUserCredentials(new UserCredentials(token))
+				.UseCustomLogger(new XUnitLogger(_output)),
+			new IPEndPoint(IPAddress.Loopback, 1113));
+		await client.ConnectAsync();
+		return client;
+	}
+
+	private class XUnitLogger : ILogger {
+		private readonly ITestOutputHelper _output;
+
+		public XUnitLogger(ITestOutputHelper output) {
+			_output = output;
+		}
+
+		public void Error(string format, params object[] args) => Log(nameof(Error), format, args);
+
+		public void Error(Exception ex, string format, params object[] args) =>
+			Log(nameof(Error), ex, format, args);
+
+		public void Info(string format, params object[] args) => Log(nameof(Info), format, args);
+		public void Info(Exception ex, string format, params object[] args) => Log(nameof(Info), ex, format, args);
+		public void Debug(string format, params object[] args) => Log(nameof(Debug), format, args);
+
+		public void Debug(Exception ex, string format, params object[] args) =>
+			Log(nameof(Debug), ex, format, args);
+
+		private void Log(string level, string format, params object[] args) => Log(level, null, format, args);
+
+		private void Log(string level, Exception ex, string format, params object[] args)
+			=> _output.WriteLine($"[{level}] {string.Format(format, args)}{Environment.NewLine}{ex}");
+	}
+}
diff --git a/src/KurrentDB.Auth.OAuth.Tests/Properties/AssemblyInfo.cs b/src/KurrentDB.Auth.OAuth.Tests/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000000..e159b3e9bd5
--- /dev/null
+++ b/src/KurrentDB.Auth.OAuth.Tests/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using Xunit;
+
+[assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/src/KurrentDB.Auth.OAuth.Tests/XUnitLoggerFactory.cs b/src/KurrentDB.Auth.OAuth.Tests/XUnitLoggerFactory.cs
new file mode 100644
index 00000000000..a12edf92bf6
--- /dev/null
+++ b/src/KurrentDB.Auth.OAuth.Tests/XUnitLoggerFactory.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using Microsoft.Extensions.Logging;
+using Xunit.Abstractions;
+
+namespace KurrentDB.Auth.OAuth.Tests;
+
+internal class XUnitLoggerFactory : ILoggerFactory {
+	private readonly ITestOutputHelper _output;
+
+	public XUnitLoggerFactory(ITestOutputHelper output) {
+		_output = output;
+	}
+
+	public void Dispose() {
+	}
+
+	public ILogger CreateLogger(string categoryName) => new XUnitLogger(categoryName, _output);
+
+	public void AddProvider(ILoggerProvider provider) {
+	}
+
+	private class XUnitLogger : ILogger {
+		private readonly string _categoryName;
+		private readonly ITestOutputHelper _output;
+
+		public XUnitLogger(string categoryName, ITestOutputHelper output) {
+			_categoryName = categoryName;
+			_output = output;
+		}
+
+		public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception,
+			Func<TState, Exception, string> formatter) => _output
+			.WriteLine($"[{logLevel}] [{_categoryName}] {formatter(state, exception)}");
+
+		public bool IsEnabled(LogLevel logLevel) => true;
+
+		public IDisposable BeginScope<TState>(TState state) => new NoOpDisposable();
+
+		private class NoOpDisposable : IDisposable {
+			public void Dispose() { }
+		}
+	}
+}
diff --git a/src/KurrentDB.Auth.OAuth.Tests/conf/idsrv4.conf.json b/src/KurrentDB.Auth.OAuth.Tests/conf/idsrv4.conf.json
new file mode 100644
index 00000000000..d354068412f
--- /dev/null
+++ b/src/KurrentDB.Auth.OAuth.Tests/conf/idsrv4.conf.json
@@ -0,0 +1,72 @@
+{
+	"IdentityResources": [
+		{
+			"Name": "openid",
+			"DisplayName": "Your user identifier",
+			"Required": true,
+			"UserClaims": [
+				"sub",
+				"role"
+			]
+		},
+		{
+			"Name": "profile",
+			"DisplayName": "User profile",
+			"Description": "Your user profile information (first name, last name, etc.)",
+			"Emphasize": true,
+			"UserClaims": [
+				"name",
+				"family_name",
+				"given_name",
+				"middle_name",
+				"preferred_username",
+				"profile",
+				"picture",
+				"website",
+				"gender",
+				"birthdate",
+				"zoneinfo",
+				"locale",
+				"updated_at"
+			]
+		}
+	],
+	"ApiResources": [
+		{
+			"Name": "eventstore",
+			"Scopes": ["streams"]
+		}
+	],
+	"ApiScopes": [
+		{
+			"Name": "streams",
+			"UserClaims": [
+				"http://schemas.microsoft.com/ws/2008/06/identity/claims/role",
+				"role"
+			]
+		}
+	],
+	"Clients": [
+		{
+			"ClientId": "eventstore-tcp",
+			"AllowedGrantTypes": [
+				"password"
+			],
+			"ClientSecrets": [
+				{
+					"Value": "K7gNU3sdo+OL0wNhqoVWhr3g6s1xYv72ol/pe/Unols="
+				}
+			],
+			"AllowedScopes": [
+				"streams",
+				"openid",
+				"profile"
+			],
+			"AlwaysIncludeUserClaimsInIdToken": true,
+			"RequireConsent": false,
+			"AlwaysSendClientClaims": true,
+			"AllowOfflineAccess": true,
+			"RequireClientSecret": false
+		}
+	]
+}
diff --git a/src/KurrentDB.Auth.OAuth.Tests/conf/oauth.conf b/src/KurrentDB.Auth.OAuth.Tests/conf/oauth.conf
new file mode 100644
index 00000000000..6eef1772ca2
--- /dev/null
+++ b/src/KurrentDB.Auth.OAuth.Tests/conf/oauth.conf
@@ -0,0 +1,4 @@
+---
+OAuth:
+  Audience: http://localhost/
+  Issuer: https://localhost:5001/
diff --git a/src/KurrentDB.Auth.OAuth.Tests/conf/users.conf.json b/src/KurrentDB.Auth.OAuth.Tests/conf/users.conf.json
new file mode 100644
index 00000000000..c4079b4763a
--- /dev/null
+++ b/src/KurrentDB.Auth.OAuth.Tests/conf/users.conf.json
@@ -0,0 +1,30 @@
+[
+	{
+		"subjectId": "1",
+		"username": "admin",
+		"password": "password",
+		"claims": [{
+			"type": "role",
+			"value": "$admins"
+		}, {
+			"type": "role",
+			"value": "$ops"
+		}, {
+			"type": "given_name",
+			"value": "Alice Smith"
+		}]
+	}, 	{
+		"subjectId": "2",
+		"username": "operator",
+		"password": "password",
+		"claims": [{
+			"type": "role",
+			"value": "$ops"
+		}]
+	}, 	{
+		"subjectId": "3",
+		"username": "user",
+		"password": "password",
+		"claims": []
+	}
+]
diff --git a/src/KurrentDB.Auth.OAuth/KurrentDB.Auth.OAuth.csproj b/src/KurrentDB.Auth.OAuth/KurrentDB.Auth.OAuth.csproj
new file mode 100644
index 00000000000..965f6563ca6
--- /dev/null
+++ b/src/KurrentDB.Auth.OAuth/KurrentDB.Auth.OAuth.csproj
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<OutputType>Library</OutputType>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
+	</PropertyGroup>
+	<PropertyGroup>
+		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+	  <DebugSymbols>true</DebugSymbols>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="EventStore.Plugins" Version="25.2.5" />
+		<PackageReference Include="IdentityModel" Version="7.0.0" />
+		<PackageReference Include="LruCacheNet" Version="1.2.0" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+		<PackageReference Include="System.ComponentModel.Composition" Version="8.0.0" />
+		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.0" />
+		<PackageReference Include="Serilog" Version="4.0.1" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.Auth.OAuth/OAuthAuthenticationPlugin.cs b/src/KurrentDB.Auth.OAuth/OAuthAuthenticationPlugin.cs
new file mode 100644
index 00000000000..64de05ee102
--- /dev/null
+++ b/src/KurrentDB.Auth.OAuth/OAuthAuthenticationPlugin.cs
@@ -0,0 +1,538 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#pragma warning disable CS8601 // Possible null reference assignment.
+#pragma warning disable CS8602 // Dereference of a possibly null reference.
+
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.IdentityModel.Tokens.Jwt;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Security;
+using System.Security.Claims;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading.Tasks;
+using EventStore.Plugins;
+using EventStore.Plugins.Authentication;
+using IdentityModel;
+using IdentityModel.Client;
+using LruCacheNet;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.IdentityModel.Tokens;
+using Newtonsoft.Json;
+using Serilog;
+
+namespace KurrentDB.Auth.OAuth;
+
+[Export(typeof(IAuthenticationPlugin))]
+public class OAuthAuthenticationPlugin : IAuthenticationPlugin {
+	public static readonly string[] ValidSigningAlgorithms = {
+		SecurityAlgorithms.RsaSha256Signature,
+		SecurityAlgorithms.RsaSha384Signature,
+		SecurityAlgorithms.RsaSha512Signature,
+		SecurityAlgorithms.RsaSsaPssSha256Signature,
+		SecurityAlgorithms.RsaSsaPssSha384Signature,
+		SecurityAlgorithms.RsaSsaPssSha512Signature,
+		SecurityAlgorithms.RsaSha256,
+		SecurityAlgorithms.RsaSha384,
+		SecurityAlgorithms.RsaSha512,
+		SecurityAlgorithms.RsaSsaPssSha256,
+		SecurityAlgorithms.RsaSsaPssSha384,
+		SecurityAlgorithms.RsaSsaPssSha512,
+	};
+
+	private static readonly ILogger _logger = Log.ForContext<OAuthAuthenticationPlugin>();
+	public string Name { get; } = "OAUTH";
+	public string Version { get; } = typeof(OAuthAuthenticationPlugin).Assembly.GetName().Version!.ToString();
+	public string CommandLineName { get; } = "oauth";
+
+	public IAuthenticationProviderFactory GetAuthenticationProviderFactory(string authenticationConfigPath)
+		=> new OAuthAuthenticationProviderFactory(authenticationConfigPath);
+
+	private class OAuthAuthenticationProviderFactory : IAuthenticationProviderFactory {
+		private readonly string _authenticationConfigPath;
+
+		public OAuthAuthenticationProviderFactory(string authenticationConfigPath) {
+			if (authenticationConfigPath == null) {
+				throw new ArgumentNullException(nameof(authenticationConfigPath));
+			}
+
+			if (!File.Exists(authenticationConfigPath)) {
+				throw new FileNotFoundException(null, authenticationConfigPath);
+			}
+
+			_authenticationConfigPath = authenticationConfigPath;
+		}
+
+		public IAuthenticationProvider Build(bool logFailedAuthenticationAttempts)
+			=> new OAuthAuthenticationProvider(new Options {
+				LogFailedAuthenticationAttempts = logFailedAuthenticationAttempts,
+				Settings = ConfigParser.ReadConfiguration<Settings>(_authenticationConfigPath, "OAuth")
+					?? throw new Exception("Could not read OAuth configuration")
+			});
+	}
+
+	private class OAuthAuthenticationProvider : AuthenticationProviderBase {
+		private readonly JwtSecurityTokenHandler _securityTokenHandler;
+		private readonly Options _options;
+		private AsymmetricSecurityKey[] _signingKeys;
+		private string _signingKeysUri;
+		private DateTime _signingKeysLastRefresh;
+		private readonly TimeSpan _signingKeysMinRefreshInterval = TimeSpan.FromMinutes(30);
+		private readonly object _signingKeysRefreshLock = new object();
+		private const string AuthorizationCodeResponseType = OidcConstants.ResponseTypes.Code;
+		private const string AuthorizationCodeGrantType = OidcConstants.GrantTypes.AuthorizationCode;
+		private const string SHA256CodeChallengeMethod = OidcConstants.CodeChallengeMethods.Sha256;
+		private const string CallBackUrl = "/oauth/callback";
+		private const string CodeChallengeUrl = "/oauth/codechallenge";
+		private string _authorizationEndpoint;
+		private string _tokenEndpoint;
+		private readonly HttpClient _httpClient;
+		private readonly RandomNumberGenerator _rngCsp;
+		private readonly LruCache<string, string> _codeVerifierLruCache;
+		private volatile bool _ready;
+
+		public OAuthAuthenticationProvider(Options options)
+			: base(
+				requiredEntitlements: ["OAUTH_AUTHENTICATION"]) {
+
+			_options = options;
+			_signingKeys = new AsymmetricSecurityKey[0];
+			_signingKeysUri = string.Empty;
+			_securityTokenHandler = new JwtSecurityTokenHandler();
+			_authorizationEndpoint = string.Empty;
+			_tokenEndpoint = string.Empty;
+			_httpClient = new HttpClient(new SocketsHttpHandler {
+				ConnectTimeout = TimeSpan.FromSeconds(10),
+				SslOptions = {
+					RemoteCertificateValidationCallback = _options.Settings.Insecure
+						? delegate { return true; }
+						: (RemoteCertificateValidationCallback)null!
+				}
+			});
+
+			_rngCsp = RandomNumberGenerator.Create();
+			_codeVerifierLruCache = new LruCache<string, string>(1024);
+		}
+
+		public override async Task Initialize() {
+			try {
+				_logger.Information("Obtaining auth token signing key from {idp}",
+					_options.Settings.IdpUri);
+				using var httpClient = new HttpClient(new SocketsHttpHandler {
+					SslOptions = {
+						RemoteCertificateValidationCallback = _options.Settings.Insecure
+							? delegate { return true; }
+							: (RemoteCertificateValidationCallback)null!
+					}
+				}) {
+					BaseAddress = _options.Settings.IdpUri
+				};
+
+				var request = new DiscoveryDocumentRequest {
+					Policy = new DiscoveryPolicy {
+						AdditionalEndpointBaseAddresses = _options.Settings.AdditionalEndpointBaseAddresses
+					}
+				};
+
+				var disco = await httpClient.GetDiscoveryDocumentAsync(request);
+
+				if (disco.IsError) {
+					throw new Exception(disco.Error);
+				}
+
+				_authorizationEndpoint = disco.AuthorizeEndpoint ?? throw new Exception("Authorization Endpoint is null in identity provider's discovery document.");
+				_tokenEndpoint = disco.TokenEndpoint ?? throw new Exception("Token Endpoint is null in identity provider's discovery document.");
+
+				// required field according to the specs
+				if (!disco.ResponseTypesSupported.Contains(AuthorizationCodeResponseType)) {
+					throw new Exception($"The specified identity provider does not support the '{AuthorizationCodeResponseType}' response type");
+				}
+
+				// the specs say: If omitted, the default value is ["authorization_code", "implicit"].
+				if (disco.GrantTypesSupported.Any() && !disco.GrantTypesSupported.Contains(AuthorizationCodeGrantType)) {
+					throw new Exception($"The specified identity provider does not support the '{AuthorizationCodeGrantType}' grant type");
+				}
+
+				//the specs say: If omitted, the authorization server does not support PKCE
+				if (!disco.CodeChallengeMethodsSupported.Any()) {
+					throw new Exception($"The specified identity provider does not support PKCE");
+				}
+
+				if (!disco.CodeChallengeMethodsSupported.Contains(SHA256CodeChallengeMethod)) {
+					throw new Exception($"The specified identity provider does not support the '{SHA256CodeChallengeMethod}' code challenge method");
+				}
+
+				_signingKeysUri = disco.JwksUri;
+				_signingKeys = disco.KeySet.Keys.Select(jwk =>
+					(AsymmetricSecurityKey)new RsaSecurityKey(
+						new RSAParameters {
+							Exponent = Base64Url.Decode(jwk.E),
+							Modulus = Base64Url.Decode(jwk.N)
+						}) {
+						KeyId = jwk.Kid
+					}).ToArray();
+				_signingKeysLastRefresh = DateTime.UtcNow;
+
+				var signingKeyIds = _signingKeys.Select(x => x.KeyId);
+				_logger.Information("Issuer signing keys have been retrieved. Key IDs: {signingKeyIds}", signingKeyIds);
+
+				_ready = true;
+			} catch (Exception ex) {
+				_logger.Fatal(ex, "Initialization failed.");
+				throw;
+			}
+		}
+
+		public override void Authenticate(AuthenticationRequest authenticationRequest) {
+			if (!_ready) {
+				authenticationRequest.NotReady();
+				return;
+			}
+
+			try {
+				var jwt = authenticationRequest.GetToken("jwt");
+
+				if (jwt == null) {
+					if (_options.LogFailedAuthenticationAttempts) {
+						_logger.Warning("Authentication failed for {id}: {reason}",
+							authenticationRequest.Id,
+							"No token present.");
+					}
+
+					authenticationRequest.Unauthorized();
+					return;
+				}
+
+				var jwtSecurityToken = _securityTokenHandler.ReadJwtToken(jwt);
+				if (_signingKeys.All(x => x.KeyId != jwtSecurityToken.Header.Kid)) {
+					lock (_signingKeysRefreshLock) {
+						if (DateTime.UtcNow - _signingKeysLastRefresh >= _signingKeysMinRefreshInterval) {
+							try {
+								//signing keys may have been rotated, refresh the keys before validation
+								_logger.Verbose("An authentication request with an unknown key ID has been received. Refreshing issuer signing keys.");
+								var oldKeyIds = _signingKeys.Select(x => x.KeyId).OrderBy(x => x);
+
+								_signingKeys = _httpClient
+									.GetJsonWebKeySetAsync(_signingKeysUri)
+									.GetAwaiter()
+									.GetResult()
+									.KeySet
+									.Keys.Select(jwk =>
+										(AsymmetricSecurityKey)new RsaSecurityKey(
+											new RSAParameters {
+												Exponent = Base64Url.Decode(jwk.E),
+												Modulus = Base64Url.Decode(jwk.N)
+											}) {
+											KeyId = jwk.Kid
+										}).ToArray();
+
+								var newKeyIds = _signingKeys.Select(x => x.KeyId).OrderBy(x => x);
+								if (!oldKeyIds.SequenceEqual(newKeyIds)) {
+									_logger.Information(
+										"Issuer signing keys have changed. New Key IDs: {signingKeyIds}", newKeyIds);
+								} else {
+									_logger.Verbose(
+										"Issuer signing keys have not changed. Key IDs: {signingKeyIds}", newKeyIds);
+								}
+
+								_signingKeysLastRefresh = DateTime.UtcNow;
+							} catch (Exception ex) {
+								_logger.Error(ex, "Failed to refresh issuer signing keys.");
+							}
+						} else {
+							_logger.Verbose("An authentication request with an unknown key ID has been received. Skipping refresh of issuer signing keys since the minimum refresh interval of {minRefreshInterval} minutes has not yet expired.", _signingKeysMinRefreshInterval.TotalMinutes);
+						}
+					}
+				}
+
+				ClaimsPrincipal principal = _securityTokenHandler.ValidateToken(jwt, new TokenValidationParameters {
+					ValidAudience = _options.Settings.Audience,
+					ValidIssuer = _options.Settings.Issuer,
+					ValidateAudience = true,
+					ValidateIssuer = !_options.Settings.DisableIssuerValidation,
+					ValidateLifetime = true,
+					RequireExpirationTime = true,
+					IssuerSigningKeys = _signingKeys
+				}, out _);
+
+				if (principal?.Identity == null) {
+					authenticationRequest.Unauthorized();
+					return;
+				}
+
+				if (!principal.Identity.IsAuthenticated) {
+					if (_options.LogFailedAuthenticationAttempts) {
+						_logger.Warning("Authentication failed for {id}: {reason}",
+							authenticationRequest.Id,
+							"Identity was not authenticated.");
+					}
+
+					authenticationRequest.Unauthorized();
+					return;
+				}
+
+				authenticationRequest.Authenticated(principal);
+			} catch (SecurityTokenValidationException ex) {
+				if (_options.LogFailedAuthenticationAttempts) {
+					_logger.Warning(ex, "Authentication failed for {id}: {reason}",
+						authenticationRequest.Id,
+						ex.Message);
+				}
+
+				authenticationRequest.Unauthorized();
+			} catch (Exception ex) {
+				if (_options.LogFailedAuthenticationAttempts) {
+					_logger.Warning(ex, "Authentication failed for {id}: {reason}",
+						authenticationRequest.Id,
+						ex.Message);
+				}
+
+				authenticationRequest.Error();
+			}
+		}
+
+		public override IEnumerable<KeyValuePair<string, string>> GetPublicProperties() {
+			var result = new Dictionary<string, string> {
+				{OidcConstants.Discovery.AuthorizationEndpoint, _authorizationEndpoint},
+				{OidcConstants.AuthorizeRequest.ClientId, _options.Settings.ClientId},
+				{OidcConstants.AuthorizeRequest.RedirectUri, CallBackUrl},
+				{OidcConstants.AuthorizeRequest.ResponseType, AuthorizationCodeResponseType},
+				{OidcConstants.AuthorizeRequest.Scope, OidcConstants.StandardScopes.OpenId + " " + OidcConstants.StandardScopes.Profile},
+				{"code_challenge_uri", CodeChallengeUrl},
+			};
+
+			return result;
+		}
+		public override IReadOnlyList<string> GetSupportedAuthenticationSchemes() {
+			return new[] {
+				"Bearer"
+			};
+		}
+		public override void ConfigureEndpoints(IEndpointRouteBuilder endpointRouteBuilder) {
+			endpointRouteBuilder.Map(CallBackUrl, async context => {
+				if (!_ready) {
+					context.Response.StatusCode = (int)HttpStatusCode.ServiceUnavailable;
+					return;
+				}
+
+				if (!context.Request.Query.TryGetValue(OidcConstants.AuthorizeResponse.State, out var state)) {
+					if (_options.LogFailedAuthenticationAttempts) {
+						_logger.Warning($"'{OidcConstants.AuthorizeResponse.State}' parameter was not provided in the OAuth callback URL.");
+					}
+
+					context.Response.StatusCode = (int)HttpStatusCode.BadRequest;
+					return;
+				}
+
+				var codeChallengeCorrelationId = string.Empty;
+				try {
+					var decodedBase64Bytes = Convert.FromBase64String(state!);
+					var jsonString = Encoding.UTF8.GetString(decodedBase64Bytes);
+					var dictionary = JsonConvert.DeserializeObject<Dictionary<string, string>>(jsonString);
+					if (dictionary == null || !dictionary.TryGetValue("code_challenge_correlation_id", out codeChallengeCorrelationId)) {
+						throw new ArgumentException("'code_challenge_correlation_id' is not present in the supplied JSON object");
+					}
+				} catch (Exception ex) {
+					if (_options.LogFailedAuthenticationAttempts) {
+						_logger.Warning(ex, $"Failed to parse the code challenge correlation ID from the '{OidcConstants.AuthorizeResponse.State}' parameter");
+					}
+
+					context.Response.StatusCode = (int)HttpStatusCode.BadRequest;
+					return;
+				}
+
+				if (!_codeVerifierLruCache.TryGetValue(codeChallengeCorrelationId, out var codeVerifier)) {
+					if (_options.LogFailedAuthenticationAttempts) {
+						_logger.Warning("Supplied code challenge correlation ID does not exist or may have expired.");
+					}
+
+					context.Response.StatusCode = (int)HttpStatusCode.BadRequest;
+					return;
+				}
+
+				_codeVerifierLruCache.Remove(codeChallengeCorrelationId);
+
+				if (context.Request.Query.ContainsKey(OidcConstants.AuthorizeResponse.Error)) {
+					var error = "Authorization Error: " + context.Request.Query[OidcConstants.AuthorizeResponse.Error];
+					var errorMessage = context.Request.Query.ContainsKey(OidcConstants.AuthorizeResponse.ErrorDescription)
+						? "Error Message: " + context.Request.Query[OidcConstants.AuthorizeResponse.ErrorDescription]
+						: null;
+					var stringBuilder = new StringBuilder();
+					stringBuilder.Append("<html>");
+					stringBuilder.Append("<head>");
+					stringBuilder.Append("<meta http-equiv=\"refresh\" content=\"10;url=/\" />");
+					stringBuilder.Append("</head>");
+					stringBuilder.Append("<body>");
+					stringBuilder.Append(error);
+					stringBuilder.Append("<br>");
+					if (errorMessage != null) {
+						stringBuilder.Append(errorMessage);
+						stringBuilder.Append("<br>");
+					}
+					stringBuilder.Append("</body>");
+					stringBuilder.Append("</html>");
+
+					var htmlOutput = stringBuilder.ToString();
+					await context.Response.Body.WriteAsync(UTF8Encoding.UTF8.GetBytes(htmlOutput));
+					return;
+				}
+
+				if (!context.Request.Query.ContainsKey(AuthorizationCodeResponseType)) {
+					if (_options.LogFailedAuthenticationAttempts) {
+						_logger.Warning($"'{AuthorizationCodeResponseType}' parameter was not provided in the OAuth callback URL.");
+					}
+
+					context.Response.StatusCode = (int)HttpStatusCode.BadRequest;
+					return;
+				}
+
+				try {
+					var redirectUriBuilder = new UriBuilder {
+						Scheme = context.Request.Scheme,
+						Host = context.Request.Host.Host,
+						Path = CallBackUrl
+					};
+
+					var port = context.Request.Host.Port;
+					if (port.HasValue) {
+						redirectUriBuilder.Port = port.Value;
+					}
+
+					var redirectUri = redirectUriBuilder.Uri.ToString();
+
+					var queryParams = new Dictionary<string, string> {
+						{OidcConstants.TokenRequest.GrantType, AuthorizationCodeGrantType},
+						//{OidcConstants.TokenRequest.Code, context.Request.Query[AuthorizationCodeResponseType]},
+						{OidcConstants.TokenRequest.RedirectUri, redirectUri},
+						{OidcConstants.TokenRequest.ClientId, _options.Settings.ClientId},
+						{OidcConstants.TokenRequest.CodeVerifier, codeVerifier}
+					};
+
+					if (context.Request.Query.TryGetValue(AuthorizationCodeResponseType, out var responseType)) {
+						queryParams.Add(OidcConstants.TokenRequest.Code, responseType!);
+					}
+
+					//since we're using PKCE, client secrets can be optional depending on the configuration of the Identity Provider
+					if (_options.Settings.ClientSecret != null) {
+						queryParams.Add(OidcConstants.TokenRequest.ClientSecret, _options.Settings.ClientSecret);
+					}
+
+					var tokenUri = new UriBuilder(_tokenEndpoint).Uri;
+					var result = await _httpClient.PostAsync(
+						tokenUri,
+						new FormUrlEncodedContent(queryParams.Select(
+							x => new KeyValuePair<string, string>(x.Key, x.Value))
+						)
+					);
+
+					if (result.StatusCode != HttpStatusCode.OK) {
+						context.Response.StatusCode = (int)HttpStatusCode.BadRequest;
+						if (_options.LogFailedAuthenticationAttempts) {
+							var content = await result.Content.ReadAsStringAsync();
+							_logger.Warning("Failed to retrieve access token for client ID: {clientId}. HTTP Status code: {httpStatusCode}, content: {content}", _options.Settings.ClientId, result.StatusCode, content);
+						}
+						return;
+					}
+
+					var resultString = await result.Content.ReadAsStringAsync();
+					var resultDictionary = JsonConvert.DeserializeObject<Dictionary<string, string>>(resultString) ?? new();
+
+					const string idToken = OidcConstants.TokenResponse.IdentityToken;
+					const string tokenType = OidcConstants.TokenResponse.TokenType;
+					const string bearerTokenType = OidcConstants.TokenResponse.BearerTokenType;
+
+					if (!resultDictionary.ContainsKey(idToken)) {
+						throw new Exception($"'{idToken}' is not present in token response.");
+					}
+
+					if (!resultDictionary.ContainsKey(tokenType)) {
+						throw new Exception($"'{tokenType}' is not present in token response.");
+					}
+
+					if (resultDictionary[tokenType] != bearerTokenType) {
+						throw new Exception($"'{tokenType}' is not '{bearerTokenType}' in token response. Value is : {resultDictionary[tokenType]}");
+					}
+
+					var cookieManager = context.Response.Cookies;
+					var cookieOptions = new CookieOptions {
+						MaxAge = TimeSpan.FromMinutes(1)
+					};
+
+					cookieManager.Append("oauth_id_token", resultDictionary[idToken], cookieOptions);
+					context.Response.Redirect("/web");
+				} catch (Exception ex) {
+					context.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
+					_logger.Error(ex, " Error retrieving access token from {tokenEndpoint}", _tokenEndpoint);
+				}
+			});
+
+			endpointRouteBuilder.Map(CodeChallengeUrl, async context => {
+				if (!_ready) {
+					context.Response.StatusCode = (int)HttpStatusCode.ServiceUnavailable;
+					return;
+				}
+
+				var randomBytes = new byte[32];
+				_rngCsp.GetBytes(randomBytes);
+
+				var codeVerifier = Rfc7636Base64Encode(randomBytes);
+				var codeVerifierAsciiBytes = Encoding.ASCII.GetBytes(codeVerifier);
+
+				var codeChallenge = string.Empty;
+				using (SHA256 sha256Hash = SHA256.Create()) {
+					var sha256HashBytes = sha256Hash.ComputeHash(codeVerifierAsciiBytes);
+					codeChallenge = Rfc7636Base64Encode(sha256HashBytes);
+				}
+
+				var codeChallengeCorrelationId = Guid.NewGuid().ToString();
+				_codeVerifierLruCache.Add(codeChallengeCorrelationId, codeVerifier);
+
+				var result = new Dictionary<string, string> {
+					{"code_challenge", codeChallenge},
+					{"code_challenge_method", SHA256CodeChallengeMethod},
+					{"code_challenge_correlation_id", codeChallengeCorrelationId}
+				};
+
+				context.Response.ContentType = "application/json";
+				await context.Response.Body.WriteAsync(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(result)));
+			});
+		}
+
+		private string Rfc7636Base64Encode(byte[] bytes) {
+			var s = Convert.ToBase64String(bytes);
+			s = s.Split('=')[0]; // Remove any trailing '='s
+			s = s.Replace('+', '-'); // 62nd char of encoding
+			s = s.Replace('/', '_'); // 63rd char of encoding
+			return s;
+		}
+	}
+
+	private class Options {
+		public Settings Settings { get; set; } = new Settings();
+		public bool LogFailedAuthenticationAttempts { get; set; }
+	}
+
+	private class Settings {
+		public string Audience { get; set; } = null!;
+		public string Issuer { get; set; } = null!;
+
+		public bool DisableIssuerValidation { get; set; } = false;
+		public string Idp { get; set; } = null!;
+		public bool Insecure { get; set; }
+		public Uri IdpUri => Uri.IsWellFormedUriString(Idp, UriKind.Absolute)
+			? new Uri(Idp)
+			: new Uri(Issuer);
+		public string ClientId { get; set; } = null!;
+		public string ClientSecret { get; set; } = null!;
+		public string[] AdditionalEndpointBaseAddresses { get; set; } = { };
+	}
+}
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/FakePolicyProvider.cs b/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/FakePolicyProvider.cs
new file mode 100644
index 00000000000..373f896f397
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/FakePolicyProvider.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Services;
+
+namespace KurrentDB.Auth.StreamPolicyPlugin.Tests;
+
+public class FakePolicyProvider {
+	private readonly Dictionary<string, AccessPolicy> _streamRules = new();
+	private readonly AccessPolicy _publicStreamRule;
+
+	public FakePolicyProvider(string restrictedStreamName, string restrictedStreamUser) {
+		_streamRules.Add(restrictedStreamName, new AccessPolicy(
+			[restrictedStreamUser],
+			[restrictedStreamUser],
+			[restrictedStreamUser],
+			[restrictedStreamUser],
+			[restrictedStreamUser]
+		));
+		_publicStreamRule = new(
+			[SystemRoles.All],
+			[SystemRoles.All],
+			[SystemRoles.All],
+			[SystemRoles.All],
+			[SystemRoles.All]
+		);
+	}
+
+	public void SetCustomAccessPolicy(string streamId, AccessPolicy accessPolicy) {
+		_streamRules.Add(streamId, accessPolicy);
+	}
+
+	public AccessPolicy GetAccessPolicyFor(string streamId) {
+		return _streamRules.TryGetValue(streamId, out var rule) ? rule : _publicStreamRule;
+	}
+}
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/KurrentDB.Auth.StreamPolicyPlugin.Tests.csproj b/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/KurrentDB.Auth.StreamPolicyPlugin.Tests.csproj
new file mode 100644
index 00000000000..9b996bf1e29
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/KurrentDB.Auth.StreamPolicyPlugin.Tests.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+<PropertyGroup>
+	<TargetFramework>net8.0</TargetFramework>
+	<ImplicitUsings>enable</ImplicitUsings>
+	<Nullable>enable</Nullable>
+</PropertyGroup>
+
+<ItemGroup>
+	<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+	<PackageReference Include="xunit" Version="2.8.1" />
+	<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
+		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		<PrivateAssets>all</PrivateAssets>
+	</PackageReference>
+</ItemGroup>
+
+<ItemGroup>
+	<ProjectReference Include="..\KurrentDB.Core.Tests\KurrentDB.Core.Tests.csproj" />
+	<ProjectReference Include="..\KurrentDB.Auth.StreamPolicyPlugin\KurrentDB.Auth.StreamPolicyPlugin.csproj" />
+</ItemGroup>
+
+</Project>
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/PolicySchemaTests.cs b/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/PolicySchemaTests.cs
new file mode 100644
index 00000000000..0e7d330f11c
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/PolicySchemaTests.cs
@@ -0,0 +1,116 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text.Json;
+using KurrentDB.Auth.StreamPolicyPlugin.Schema;
+using Xunit;
+
+namespace KurrentDB.Auth.StreamPolicyPlugin.Tests;
+
+public class PolicySchemaTests {
+	private static readonly JsonSerializerOptions SerializeOptions = new() {
+		PropertyNamingPolicy = JsonNamingPolicy.CamelCase
+	};
+
+	[Theory]
+	[MemberData(nameof(InvalidPolicies))]
+	public void when_deserializing_invalid_policies(string data) {
+		Assert.Throws<ArgumentNullException>(() =>
+			JsonSerializer.Deserialize<Policy>(data, SerializeOptions));
+	}
+
+	[Theory]
+	[MemberData(nameof(InvalidStreamRules))]
+	public void when_deserializing_invalid_stream_rules(string data) {
+		Assert.Throws<ArgumentNullException>(() =>
+			JsonSerializer.Deserialize<StreamRule>(data, SerializeOptions));
+	}
+
+	[Theory]
+	[MemberData(nameof(InvalidDefaultStreamRules))]
+	public void when_deserializing_invalid_default_stream_rules(string data) {
+		Assert.Throws<ArgumentNullException>(() =>
+			JsonSerializer.Deserialize<DefaultStreamRules>(data, SerializeOptions));
+	}
+
+	[Theory]
+	[MemberData(nameof(InvalidAccessPolicies))]
+	public void when_deserializing_invalid_access_policies(string data) {
+		Assert.Throws<ArgumentNullException>(() =>
+			JsonSerializer.Deserialize<Schema.AccessPolicy>(data, SerializeOptions));
+	}
+
+	public static IEnumerable<object[]> InvalidAccessPolicies() {
+		yield return ["""{"$r":null, "$w":[], "$d": [], "$mr": [], "$mw": []}"""];
+		yield return ["""{"$r": [], "$w":null, "$d": [], "$mr": [], "$mw": []}"""];
+		yield return ["""{"$r": [], "$w":[], "$d": null, "$mr": [], "$mw": []}"""];
+		yield return ["""{"$r": [], "$w":[], "$d": [], "$mr": null, "$mw": []}"""];
+		yield return ["""{"$r": [], "$w":[], "$d": [], "$mr": [], "$mw": null}"""];
+	}
+
+	public static IEnumerable<object[]> InvalidDefaultStreamRules() {
+		yield return ["""{"userStreams":null, "systemStreams":"test"}"""];
+		yield return ["""{"userStreams":"", "systemStreams":"test"}"""];
+		yield return ["""{"userStreams":"test", "systemStreams":null}"""];
+		yield return ["""{"userStreams":"test", "systemStreams":""}"""];
+	}
+
+	public static IEnumerable<object[]> InvalidStreamRules() {
+		yield return ["""{"startsWith":null, "policy":"test"}"""];
+		yield return ["""{"startsWith":"", "policy":"test"}"""];
+		yield return ["""{"startsWith":"test", "policy":null}"""];
+		yield return ["""{"startsWith":"test", "policy":""}"""];
+	}
+
+	public static IEnumerable<object[]> InvalidPolicies() {
+		yield return [
+			"""
+			{
+			  "streamPolicies": null,
+			  "streamRules": [],
+			  "defaultStreamRules": {
+			    "userStreams": null,
+			    "systemStreams": "adminsDefault"
+			  }
+			}
+			"""
+		];
+		yield return [
+			"""
+			{
+			  "streamPolicies": {
+			    "publicDefault": {
+			      "$r": ["$all"],
+			      "$w": ["$all"],
+			      "$d": ["$all"],
+			      "$mr": ["$all"],
+			      "$mw": ["$all"]
+			    }
+			  },
+			  "streamRules": null,
+			  "defaultStreamRules": {
+			    "userStreams": null,
+			    "systemStreams": "adminsDefault"
+			  }
+			}
+			"""
+		];
+		yield return [
+			"""
+			{
+			  "streamPolicies": {
+			    "publicDefault": {
+			      "$r": ["$all"],
+			      "$w": ["$all"],
+			      "$d": ["$all"],
+			      "$mr": ["$all"],
+			      "$mw": ["$all"]
+			    }
+			  },
+			  "streamRules": [],
+			  "defaultStreamRules": null
+			}
+			"""
+		];
+	}
+}
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/PolicyTestHelpers.cs b/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/PolicyTestHelpers.cs
new file mode 100644
index 00000000000..f7ab7516197
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/PolicyTestHelpers.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Claims;
+using System.Text.Json;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Auth.StreamPolicyPlugin.Schema;
+
+namespace KurrentDB.Auth.StreamPolicyPlugin.Tests;
+
+internal static class PolicyTestHelpers {
+	public static readonly string[] ValidActions = ["read", "write", "delete", "metadataRead", "metadataWrite"];
+
+	public static OperationDefinition ActionToOperationDefinition(string action) =>
+		action switch {
+			"read" => Operations.Streams.Read,
+			"write" => Operations.Streams.Write,
+			"delete" => Operations.Streams.Delete,
+			"metadataRead" => Operations.Streams.MetadataRead,
+			"metadataWrite" => Operations.Streams.MetadataWrite,
+			_ => throw new ArgumentOutOfRangeException(nameof(action), action, null)
+		};
+
+	public static ClaimsPrincipal CreateUser(string username, string[] roles) {
+		var claims = new List<Claim>();
+		if (roles.Length != 0) {
+			claims.AddRange(roles.Select(x => new Claim(ClaimTypes.Role, x)).ToList());
+		}
+		claims.Add(new Claim(ClaimTypes.Name, username));
+
+		return new(new[] {
+			new ClaimsIdentity(claims, authenticationType: "basic")
+		});
+	}
+
+	public static byte[] SerializePolicy(Policy policy) =>
+		JsonSerializer.SerializeToUtf8Bytes(policy, new JsonSerializerOptions {
+			PropertyNamingPolicy = JsonNamingPolicy.CamelCase
+		});
+
+	public static Schema.AccessPolicy CreateAccessPolicyDtoForAction(string allowedAction, string allowedUser) =>
+		allowedAction switch {
+			"read" => new Schema.AccessPolicy { Readers = [allowedUser], Writers = [], Deleters = [], MetadataReaders = [], MetadataWriters = [] },
+			"write" => new Schema.AccessPolicy { Writers = [allowedUser], Readers = [], Deleters = [], MetadataReaders = [], MetadataWriters = [] },
+			"delete" => new Schema.AccessPolicy { Deleters = [allowedUser], Readers = [], Writers = [], MetadataReaders = [], MetadataWriters = [] },
+			"metadataRead" => new Schema.AccessPolicy { MetadataReaders = [allowedUser], Readers = [], Writers = [], Deleters = [], MetadataWriters = [] },
+			"metadataWrite" => new Schema.AccessPolicy { MetadataWriters = [allowedUser], Readers = [], Writers = [], Deleters = [], MetadataReaders = [] },
+			_ => new Schema.AccessPolicy()
+		};
+
+	public static AccessPolicy CreateAccessPolicyForAction(string allowedAction, string allowedUser) {
+		var dto = CreateAccessPolicyDtoForAction(allowedAction, allowedUser);
+		return new AccessPolicy(
+			dto.Readers,
+			dto.Writers,
+			dto.Deleters,
+			dto.MetadataReaders,
+			dto.MetadataWriters
+		);
+	}
+}
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/StreamPolicyAssertionTests.cs b/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/StreamPolicyAssertionTests.cs
new file mode 100644
index 00000000000..3c277ce74fe
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/StreamPolicyAssertionTests.cs
@@ -0,0 +1,236 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Claims;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Core.Authorization;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.UserManagement;
+using Xunit;
+
+namespace KurrentDB.Auth.StreamPolicyPlugin.Tests;
+
+public class StreamPolicyAssertionTests {
+	private readonly PolicyInformation _policyInfo = new("fake", 1, DateTimeOffset.MinValue);
+	private const string _publicStream = "public-stream";
+	private const string _restrictedStream = "restricted-stream";
+	private const string _privilegedUser = "ouro";
+	private const string _nonPrivilegedUser = "test-user";
+
+	private (StreamPolicyAssertion, FakePolicyProvider) CreateSut() {
+		var policyProvider = new FakePolicyProvider(_restrictedStream, _privilegedUser);
+		return (new StreamPolicyAssertion(stream => policyProvider.GetAccessPolicyFor(stream)), policyProvider);
+	}
+
+	public static IEnumerable<object[]> ValidActionsData =>
+		PolicyTestHelpers.ValidActions.Select(x => new[] { (object)x });
+
+	[Fact]
+	public async Task unknown_action_throws_exception() {
+		var (sut, _) = CreateSut();
+		var user = SystemAccounts.System;
+
+		var operation = new Operation(new OperationDefinition("unknown", "unknown"))
+			.WithParameter(Operations.Streams.Parameters.StreamId(_publicStream));
+		var context = new EvaluationContext(operation, new CancellationToken());
+
+		await Assert.ThrowsAsync<ArgumentOutOfRangeException>(
+			async () => await sut.Evaluate(user, operation, _policyInfo, context));
+	}
+
+	[Theory]
+	[MemberData(nameof(ValidActionsData))]
+	public async Task when_operation_has_no_stream_id_access_is_denied(string action) {
+		var (sut, _) = CreateSut();
+		var user = SystemAccounts.System;
+
+		var operation = new Operation(PolicyTestHelpers.ActionToOperationDefinition(action)); // No parameters added
+		var context = new EvaluationContext(operation, new CancellationToken());
+
+		var matchFound = await sut.Evaluate(user, operation, _policyInfo, context);
+		var matchResult = context.ToResult();
+
+		Assert.True(matchFound);
+		Assert.Equal(Grant.Deny, context.Grant);
+		Assert.Contains("streamId is null", matchResult.ToString());
+	}
+
+	[Theory]
+	[InlineData("read", "", Grant.Allow)] // "" translates to "$all"
+	[InlineData("read", "$all", Grant.Allow)]
+	[InlineData("metadataWrite", "", Grant.Allow)]
+	[InlineData("metadataWrite", "$all", Grant.Allow)]
+	[InlineData("write", "$$$all", Grant.Allow)]
+	[InlineData("write", "", Grant.Deny)]
+	[InlineData("write", "$all", Grant.Deny)]
+	[InlineData("delete", "", Grant.Deny)]
+	[InlineData("delete", "$all", Grant.Deny)]
+	public async Task actions_on_all_stream_with_system_user(string action, string stream, Grant expectedGrant) {
+		var (sut, _) = CreateSut();
+		var user = SystemAccounts.System;
+
+		var operation = new Operation(PolicyTestHelpers.ActionToOperationDefinition(action))
+			.WithParameter(Operations.Streams.Parameters.StreamId(stream));
+		var context = new EvaluationContext(operation, new CancellationToken());
+
+		var matchFound = await sut.Evaluate(user, operation, _policyInfo, context);
+		var matchResult = context.ToResult();
+
+		Assert.True(matchFound);
+		Assert.Equal(expectedGrant, context.Grant);
+		if (expectedGrant is Grant.Deny)
+			Assert.Contains("denied on $all", matchResult.ToString());
+	}
+
+	[Theory]
+	[InlineData(_publicStream, SystemUsers.Admin)]
+	[InlineData(_publicStream, "customAdmin")]
+	[InlineData(_restrictedStream, SystemUsers.Admin)]
+	[InlineData(_restrictedStream, "customAdmin")]
+	public async Task admin_is_always_granted_access(string stream, string username) {
+		var (sut, _) = CreateSut();
+		var user = PolicyTestHelpers.CreateUser(username, [SystemRoles.Admins]);
+
+		foreach (var action in PolicyTestHelpers.ValidActions) {
+			var operation = new Operation(PolicyTestHelpers.ActionToOperationDefinition(action))
+				.WithParameter(Operations.Streams.Parameters.StreamId(stream));
+			var context = new EvaluationContext(operation, new CancellationToken());
+
+			var matchFound = await sut.Evaluate(user, operation, _policyInfo, context);
+
+			Assert.True(matchFound);
+			Assert.Equal(Grant.Allow, context.Grant);
+		}
+	}
+
+	[Theory]
+	[InlineData(_restrictedStream, _privilegedUser, new string[] { }, Grant.Allow)]
+	[InlineData(_restrictedStream, "test-user", new[] { _privilegedUser }, Grant.Allow)]
+	[InlineData(_publicStream, _privilegedUser, new string[] { }, Grant.Allow)]
+	[InlineData(_publicStream, "test-user", new[] { _privilegedUser }, Grant.Allow)]
+	[InlineData(_restrictedStream, "test-user", new string[] { }, Grant.Deny)]
+	[InlineData(_restrictedStream, "test-user", new[] { "test-role" }, Grant.Deny)]
+	[InlineData(_publicStream, "test-user", new string[] { }, Grant.Allow)]
+	[InlineData(_publicStream, "test-user", new[] { "test-role" }, Grant.Allow)]
+	public async Task action_on_user_streams_with_custom_user(
+		string stream, string username, string[] role, Grant expectedGrant) {
+		var (sut, _) = CreateSut();
+		var user = PolicyTestHelpers.CreateUser(username, role);
+
+		foreach (var action in PolicyTestHelpers.ValidActions) {
+			var operation = new Operation(PolicyTestHelpers.ActionToOperationDefinition(action))
+				.WithParameter(Operations.Streams.Parameters.StreamId(stream));
+			var context = new EvaluationContext(operation, new CancellationToken());
+
+			var matchFound = await sut.Evaluate(user, operation, _policyInfo, context);
+
+			Assert.True(matchFound);
+			Assert.Equal(expectedGrant, context.Grant);
+		}
+	}
+
+	[Theory]
+	[InlineData(_restrictedStream, SystemUsers.Operations, new[] { SystemRoles.Operations }, Grant.Deny)]
+	[InlineData(_restrictedStream, "customOps", new[] { SystemRoles.Operations }, Grant.Deny)]
+	[InlineData(_publicStream, SystemUsers.Operations, new[] { SystemRoles.Operations }, Grant.Deny)]
+	[InlineData(_publicStream, "customOps", new[] { SystemRoles.Operations }, Grant.Deny)]
+	[InlineData(_publicStream, "customOps", new[] { SystemRoles.Operations, "customRole" }, Grant.Allow)]
+	public async Task users_with_only_the_ops_role_are_denied_access_to_public_and_restricted_streams(
+		string stream, string username, string[] roles, Grant expectedGrant) {
+		var (sut, _) = CreateSut();
+		var user = PolicyTestHelpers.CreateUser(username, roles);
+
+		foreach (var action in PolicyTestHelpers.ValidActions) {
+			var operation = new Operation(PolicyTestHelpers.ActionToOperationDefinition(action))
+				.WithParameter(Operations.Streams.Parameters.StreamId(stream));
+			var context = new EvaluationContext(operation, new CancellationToken());
+
+			var matchFound = await sut.Evaluate(user, operation, _policyInfo, context);
+
+			Assert.True(matchFound);
+			Assert.Equal(expectedGrant, context.Grant);
+		}
+	}
+
+	[Theory]
+	[InlineData("read", "custom-stream", Grant.Deny)]
+	[InlineData("write", "custom-stream", Grant.Deny)]
+	[InlineData("delete", "custom-stream", Grant.Deny)]
+	[InlineData("delete", "$$custom-stream", Grant.Deny)]
+	[InlineData("metadataRead", "custom-stream", Grant.Allow)]
+	[InlineData("metadataWrite", "custom-stream", Grant.Allow)]
+	[InlineData("read", "$$custom-stream", Grant.Allow)]
+	[InlineData("write", "$$custom-stream", Grant.Allow)]
+	[InlineData("metadataRead", "$$custom-stream", Grant.Deny)]
+	[InlineData("metadataWrite", "$$custom-stream", Grant.Deny)]
+	public async Task user_with_meta_access_only_does_not_have_normal_access(
+		string attemptedAction, string stream, Grant expectedGrant) {
+		var (sut, policyService) = CreateSut();
+		var user = PolicyTestHelpers.CreateUser(_nonPrivilegedUser, []);
+		var accessPolicy = new AccessPolicy([], [], [], [_nonPrivilegedUser], [_nonPrivilegedUser]);
+		policyService.SetCustomAccessPolicy(stream, accessPolicy);
+
+		var operation = new Operation(PolicyTestHelpers.ActionToOperationDefinition(attemptedAction))
+			.WithParameter(Operations.Streams.Parameters.StreamId(stream));
+		var context = new EvaluationContext(operation, new CancellationToken());
+
+		var matchFound = await sut.Evaluate(user, operation, _policyInfo, context);
+
+		Assert.True(matchFound);
+		Assert.Equal(expectedGrant, context.Grant);
+	}
+
+	[Theory]
+	[MemberData(nameof(ValidActionsData))]
+	public async Task user_is_restricted_to_allowed_actions(string allowedAction) {
+		var (sut, policyService) = CreateSut();
+		string stream = "custom-stream";
+		var user = PolicyTestHelpers.CreateUser(_nonPrivilegedUser, []);
+		var accessPolicy = PolicyTestHelpers.CreateAccessPolicyForAction(allowedAction, _nonPrivilegedUser);
+
+		policyService.SetCustomAccessPolicy(stream, accessPolicy);
+
+		foreach (var action in PolicyTestHelpers.ValidActions) {
+			var operation = new Operation(PolicyTestHelpers.ActionToOperationDefinition(action))
+				.WithParameter(Operations.Streams.Parameters.StreamId(stream));
+			var context = new EvaluationContext(operation, new CancellationToken());
+
+			var matchFound = await sut.Evaluate(user, operation, _policyInfo, context);
+
+			Assert.True(matchFound);
+			Assert.Equal(action == allowedAction ? Grant.Allow : Grant.Deny, context.Grant);
+		}
+	}
+
+	public static IEnumerable<object[]> UnauthenticatedUsers =>
+		new List<object[]> {
+			new object[] { new ClaimsPrincipal() }, // No identity
+			new object[] { // Admin claim, but authentication type is not set
+				new ClaimsPrincipal(new[] {
+					new ClaimsIdentity(new[] { new Claim(ClaimTypes.Role, SystemRoles.Admins) }, "")
+				})
+			},
+			new object[] { // Anonymous claim
+				new ClaimsPrincipal(
+					new ClaimsIdentity(new[] { new Claim(ClaimTypes.Anonymous, "") }))
+			}
+		};
+
+	[Theory]
+	[MemberData(nameof(UnauthenticatedUsers))]
+	public async Task unauthenticated_users_are_denied_access(ClaimsPrincipal user) {
+		var (sut, _) = CreateSut();
+		Assert.False(user.Identity?.IsAuthenticated ?? false);
+
+		foreach (var action in PolicyTestHelpers.ValidActions) {
+			var operation = new Operation(PolicyTestHelpers.ActionToOperationDefinition(action))
+				.WithParameter(Operations.Streams.Parameters.StreamId(_publicStream));
+			var context = new EvaluationContext(operation, new CancellationToken());
+
+			var matchFound = await sut.Evaluate(user, operation, _policyInfo, context);
+
+			Assert.True(matchFound);
+			Assert.Equal(Grant.Deny, context.Grant);
+		}
+	}
+}
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/StreamPolicySelectorFactoryTests.cs b/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/StreamPolicySelectorFactoryTests.cs
new file mode 100644
index 00000000000..7483e8b8d46
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/StreamPolicySelectorFactoryTests.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Reactive.Subjects;
+using EventStore.Plugins;
+using EventStore.Plugins.Licensing;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.IdentityModel.JsonWebTokens;
+using Xunit;
+
+namespace KurrentDB.Auth.StreamPolicyPlugin.Tests;
+
+public class StreamPolicySelectorFactoryTests {
+	[Theory]
+	[InlineData(true, "STREAM_POLICY_AUTHORIZATION", true)]
+	[InlineData(false, "STREAM_POLICY_AUTHORIZATION", false)]
+	[InlineData(true, "NONE", false)]
+	[InlineData(false, "NONE", false)]
+	public void respects_license(bool licensePresent, string entitlement, bool expectedIsLicensed) {
+		// given
+		using var sut = new StreamPolicySelectorFactory();
+
+		var config = new ConfigurationBuilder().Build();
+		var builder = WebApplication.CreateBuilder();
+		var licenseService = new FakeLicenseService(licensePresent, entitlement);
+		builder.Services.AddSingleton<ILicenseService>(licenseService);
+
+		((IPlugableComponent)sut).ConfigureServices(
+			builder.Services,
+			config);
+
+		var app = builder.Build();
+
+		// when
+		((IPlugableComponent)sut).ConfigureApplication(app, config);
+
+		// then
+		Assert.True(sut.IsLicensed == expectedIsLicensed);
+		Assert.Null(licenseService.RejectionException); // plugin can disable but never rejects the license
+	}
+
+	class FakeLicenseService : ILicenseService {
+		// there is tooling in CommercialHA FakeLicenseService to generate these
+		static readonly Dictionary<string, string> HardCodedTokens = new() {
+			{ "STREAM_POLICY_AUTHORIZATION", "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJlc2RiIiwiaXNzIjoiZXNkYiIsImV4cCI6MTgyNDQ1NjgyOSwianRpIjoiMmIzMjlmOWMtNGFlZC00ZDlkLWJjOTEtYTQ4YWFkZWRiNTE0Iiwic3ViIjoiRVNEQiBUZXN0cyIsIklzVHJpYWwiOiJUcnVlIiwiSXNFeHBpcmVkIjoiRmFsc2UiLCJJc1ZhbGlkIjoiVHJ1ZSIsIklzRmxvYXRpbmciOiJUcnVlIiwiRGF5c1JlbWFpbmluZyI6IjEiLCJTdGFydERhdGUiOiIyNi8wNC8yMDI0IDAwOjAwOjAwICswMTowMCIsIlNUUkVBTV9QT0xJQ1lfQVVUSE9SSVpBVElPTiI6InRydWUiLCJpYXQiOjE3Mjk4NDg4MjksIm5iZiI6MTcyOTg0ODgyOX0.ZigSD46YoSWSiozvGQXJ7FXgtEallqyTSvfcywCO_Z_d8cRlCJRb27bzJ1q4UtrBP99SBbttN2etmzyCZhhASAH55W4oo1Vh9iEbBu3uiH8ZPdBD8_V4v83djh70Fux0JUpQWcFq8bBsscXdg7fE2MpaRU004Ei3C03P3Es8jtsXRJ6rkkFFsa0NIQtPnmj44lZfAnU5A_BgamW6_OoPHjB1vEA9LUquQ5p7ovZxK1cv2lgs0lh3drYFyflqI1sAqJof4HCmMV1oK4U-1j9UhGov6J7TWtvSfbpiRToQayGe8yKmYEqydhQhgFlNBfjvv11Z_1uWyVyItopl7W5o9g" },
+			{ "NONE", "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJlc2RiIiwiaXNzIjoiZXNkYiIsImV4cCI6MTgyNDQ1NjgyOSwianRpIjoiOTVmZTY2YzAtMDRkMi00MjExLWI1ZGQtNTAyM2MyYTAxMGFiIiwic3ViIjoiRVNEQiBUZXN0cyIsIklzVHJpYWwiOiJUcnVlIiwiSXNFeHBpcmVkIjoiRmFsc2UiLCJJc1ZhbGlkIjoiVHJ1ZSIsIklzRmxvYXRpbmciOiJUcnVlIiwiRGF5c1JlbWFpbmluZyI6IjEiLCJTdGFydERhdGUiOiIyNi8wNC8yMDI0IDAwOjAwOjAwICswMTowMCIsIk5PTkUiOiJ0cnVlIiwiaWF0IjoxNzI5ODQ4ODI5LCJuYmYiOjE3Mjk4NDg4Mjl9.R24i-ZAow3BhRaST3n25Uc_nQ184k83YRZZ0oRcWbU9B9XNLRH0Iegj0HmkyzkT50I4gcIJOIfcO6mIPp4Y959CP7aTAlt7XEnXoGF0GwsfXatAxy4iXG8Gpya7INgMoWEeN0v8eDH8_OVmnieOxeba9ex5j1oAW_FtQDMzcFjAeErpW__8zmkCsn6GzvlhdLE4e3r2wjshvrTTcS_1fvSVjQZov5ce2sVBJPegjCLO_QGiIBK9QTnpHrhe6KCYje6fSTjgty0V1Qj22bftvrXreYzQijPrnC_ek1BwV-A1JvacZugMCPIy8WvE5jE3hVYRWGGUzQZ-CibPGsjudYA" },
+		};
+
+		public FakeLicenseService(bool createLicense = true, string? entitlement = null) {
+			var license = new License(new JsonWebToken(HardCodedTokens[entitlement ?? "NONE"]));
+			SelfLicense = license;
+
+			if (createLicense) {
+				CurrentLicense = license;
+				Licenses = new BehaviorSubject<License>(license);
+			} else {
+				var licenses = new Subject<License>();
+				licenses.OnError(new Exception("no license"));
+				Licenses = licenses;
+			}
+		}
+
+		public License SelfLicense { get; }
+
+		public License? CurrentLicense { get; }
+
+		public IObservable<License> Licenses { get; }
+
+		public void RejectLicense(Exception ex) {
+			RejectionException = ex;
+		}
+
+		public Exception? RejectionException { get; private set; }
+	}
+}
+
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/StreamPolicySelectorTests.cs b/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/StreamPolicySelectorTests.cs
new file mode 100644
index 00000000000..3f54f042eca
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/StreamPolicySelectorTests.cs
@@ -0,0 +1,484 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Claims;
+using DotNext.Threading;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Auth.StreamPolicyPlugin.Schema;
+using KurrentDB.Core.Authorization;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using Xunit;
+using Policy = KurrentDB.Auth.StreamPolicyPlugin.Schema.Policy;
+
+namespace KurrentDB.Auth.StreamPolicyPlugin.Tests;
+
+public class StreamPolicySelectorTests {
+	private readonly SynchronousScheduler _bus = new("testBus");
+	private const string _userStream = "user-stream";
+	private const string _systemStream = "$system-stream";
+
+	private const string _customUser = "ouro";
+	private const string _customRole = "user-role";
+	private readonly CancellationTokenSource _cts = new();
+
+	private readonly string[] _projectionStreamPrefixes = ["$et-", "$ce-,", "$bc-", "$category-", "$streams"];
+
+	private static string _customPolicyName => StreamPolicySelector.PolicyName;
+	private static string _customPolicyFallbackName => $"{StreamPolicySelector.PolicyName}-notready";
+
+	public static IEnumerable<object[]> ValidActionsData => PolicyTestHelpers.ValidActions.Select(x => new[] { (object)x });
+
+	private Schema.AccessPolicy AdminOnly => new() {
+		Readers = [SystemRoles.Admins],
+		Writers = [SystemRoles.Admins],
+		Deleters = [SystemRoles.Admins],
+		MetadataReaders = [SystemRoles.Admins],
+		MetadataWriters = [SystemRoles.Admins]
+	};
+
+	private StreamPolicySelector CreateSut() {
+		return new StreamPolicySelector(_bus, _cts.Token);
+	}
+
+	[Theory]
+	[InlineData(_systemStream, SystemUsers.Admin, SystemRoles.Admins, Grant.Allow)]
+	[InlineData(_userStream, SystemUsers.Admin, SystemRoles.Admins, Grant.Allow)]
+	[InlineData(_systemStream, SystemUsers.Operations, SystemRoles.Operations, Grant.Deny)]
+	[InlineData(_userStream, SystemUsers.Operations, SystemRoles.Operations, Grant.Deny)]
+	[InlineData(_systemStream, _customUser, _customRole, Grant.Deny)]
+	[InlineData(_userStream, _customUser, _customRole, Grant.Deny)]
+	public async Task when_policy_selector_is_not_ready_only_admin_users_have_access(
+		string stream, string username, string role, Grant expectedGrant) {
+		var sut = CreateSut();
+		var user = PolicyTestHelpers.CreateUser(username, [role]);
+		var policy = sut.Select();
+		Assert.Equal(_customPolicyFallbackName, policy.Information.Name);
+
+		await AssertAllActionsOnPolicy(policy, user, stream, expectedGrant);
+	}
+
+	[Fact]
+	public async Task when_policy_stream_is_empty_policy_selector_uses_not_ready_policy() {
+		var tcs = new TaskCompletionSource();
+		_bus.Subscribe(new AdHocHandler<ClientMessage.ReadStreamEventsBackward>(
+			msg => {
+				msg.Envelope.ReplyWith(NoStreamResponse(msg));
+				tcs.SetResult();
+			}));
+		var sut = CreateSut();
+		await tcs.Task.WithTimeout();
+		await Task.Delay(100); // Wait for the policy to appear in the selector
+
+		var policy = sut.Select();
+		Assert.Equal(_customPolicyFallbackName, policy.Information.Name);
+	}
+
+	[Fact]
+	public async Task when_policy_stream_contains_only_invalid_policy_events_policy_selector_uses_not_ready_policy() {
+		var tcs = new TaskCompletionSource();
+		_bus.Subscribe(new AdHocHandler<ClientMessage.ReadStreamEventsBackward>(
+			msg => {
+				msg.Envelope.ReplyWith(CreateReadCompleted(msg, [
+					CreateResolvedEvent("invalid", "invalid"u8.ToArray(), 0),
+					CreateResolvedEvent(StreamPolicySelector.PolicyEventType, "invalid"u8.ToArray(), 1),
+					CreateResolvedEvent("invalid", PolicyTestHelpers.SerializePolicy(StreamPolicySelector.DefaultPolicy),
+						2)
+				]));
+				tcs.SetResult();
+			}));
+		var sut = CreateSut();
+		await tcs.Task.WithTimeout();
+		await Task.Delay(100); // Wait for the policy to appear in the selector
+
+		var policy = sut.Select();
+		Assert.Equal(_customPolicyFallbackName, policy.Information.Name);
+	}
+
+	[Fact]
+	public async Task when_parsing_policy_with_multiple_rules_the_rules_are_applied_in_order() {
+		string username = _customUser;
+		string role = _customRole;
+		var tcs = new TaskCompletionSource();
+		var existingPolicy = new Policy {
+			StreamPolicies = new Dictionary<string, Schema.AccessPolicy>{
+				{ "systemDefault", new Schema.AccessPolicy{ Readers = [], Writers = [], Deleters = [], MetadataWriters = [], MetadataReaders = []}},
+				{ "userDefault", new Schema.AccessPolicy{ Readers = [role], Writers = [role], Deleters = [role], MetadataWriters = [], MetadataReaders = []}},
+				{ "customOne", new Schema.AccessPolicy{ Readers = [role], Writers = [], Deleters = [], MetadataWriters = [], MetadataReaders = [] }},
+				{ "customTwo", new Schema.AccessPolicy{ Readers = [role], Writers = [role], Deleters = [], MetadataWriters = [], MetadataReaders = [] }},
+			},
+			DefaultStreamRules = new DefaultStreamRules { SystemStreams = "systemDefault", UserStreams = "userDefault" },
+			StreamRules = new StreamRule[] {
+				new StreamRule{ Policy = "customOne", StartsWith = "account-"},
+				new StreamRule {Policy = "customTwo", StartsWith = "account"}
+			}
+		};
+
+		var user = PolicyTestHelpers.CreateUser(username, [role]);
+
+		_bus.Subscribe(new AdHocHandler<ClientMessage.ReadStreamEventsBackward>(
+			msg => {
+				msg.Envelope.ReplyWith(CreateReadCompleted(msg, [CreateResolvedEventForPolicy(existingPolicy, 0)]));
+				tcs.SetResult();
+			}));
+		var sut = CreateSut();
+		await tcs.Task.WithTimeout();
+		await Task.Delay(100); // Wait for the policy to appear in the selector
+
+		var policy = sut.Select();
+
+		await AssertAllowedStreamActionsOnPolicy(policy, user, "account-1", ["read"]);
+		await AssertAllowedSubscriptionActionsOnPolicy(policy, user, "account-1", ["read"]);
+
+		await AssertAllowedStreamActionsOnPolicy(policy, user, "account1", ["read", "write"]);
+		await AssertAllowedSubscriptionActionsOnPolicy(policy, user, "account1", ["read", "write"]);
+
+		await AssertAllowedStreamActionsOnPolicy(policy, user, "acc-3", ["read", "write", "delete"]);
+		await AssertAllowedSubscriptionActionsOnPolicy(policy, user, "acc-3", ["read", "write", "delete"]);
+
+		await AssertAllowedStreamActionsOnPolicy(policy, user, "$account", []);
+		await AssertAllowedSubscriptionActionsOnPolicy(policy, user, "$account", []);
+	}
+
+	[Theory]
+	[InlineData(SystemUsers.Admin, SystemRoles.Admins, Grant.Allow, Grant.Allow)]
+	[InlineData(SystemUsers.Operations, SystemRoles.Operations, Grant.Deny, Grant.Deny)]
+	[InlineData(_customUser, _customRole, Grant.Allow, Grant.Deny)]
+	public async Task when_using_the_default_policy_standard_projection_streams_are_read_only(
+		string username, string role, Grant expectedReadGrant, Grant expectedWriteGrant) {
+		var tcs = new TaskCompletionSource();
+		var existingPolicy = StreamPolicySelector.DefaultPolicy;
+		var user = PolicyTestHelpers.CreateUser(username, [role]);
+
+		_bus.Subscribe(new AdHocHandler<ClientMessage.ReadStreamEventsBackward>(
+			msg => {
+				msg.Envelope.ReplyWith(CreateReadCompleted(msg, [CreateResolvedEventForPolicy(existingPolicy, 0)]));
+				tcs.SetResult();
+			}));
+		var sut = CreateSut();
+		await tcs.Task.WithTimeout();
+		await Task.Delay(100); // Wait for the policy to appear in the selector
+
+		var policy = sut.Select();
+		Assert.Equal(_customPolicyName, policy.Information.Name);
+		string[] allowedActions;
+		if (expectedReadGrant == Grant.Allow) {
+			allowedActions = expectedWriteGrant == Grant.Allow
+				? PolicyTestHelpers.ValidActions
+				: ["read", "metadataRead"];
+		} else {
+			allowedActions = [];
+		}
+
+		foreach (var prefix in _projectionStreamPrefixes) {
+			var stream = $"{prefix}test";
+			await AssertAllowedStreamActionsOnPolicy(policy, user, stream, allowedActions);
+			await AssertAllowedSubscriptionActionsOnPolicy(policy, user, stream, allowedActions);
+		}
+	}
+
+	[Theory]
+	[InlineData(_systemStream, SystemUsers.Admin, SystemRoles.Admins, Grant.Allow)]
+	[InlineData(_userStream, SystemUsers.Admin, SystemRoles.Admins, Grant.Allow)]
+	[InlineData(_systemStream, SystemUsers.Operations, SystemRoles.Operations, Grant.Deny)]
+	[InlineData(_userStream, SystemUsers.Operations, SystemRoles.Operations, Grant.Deny)]
+	[InlineData(_systemStream, _customUser, _customRole, Grant.Deny)]
+	[InlineData(_userStream, _customUser, _customRole, Grant.Allow)]
+	public async Task when_policy_stream_contains_a_valid_policy_that_policy_is_used(
+		string stream, string username, string role, Grant expectedGrant) {
+		var tcs = new TaskCompletionSource();
+		var existingPolicy = StreamPolicySelector.DefaultPolicy;
+		var user = PolicyTestHelpers.CreateUser(username, [role]);
+
+		_bus.Subscribe(new AdHocHandler<ClientMessage.ReadStreamEventsBackward>(
+			msg => {
+				msg.Envelope.ReplyWith(CreateReadCompleted(msg, [CreateResolvedEventForPolicy(existingPolicy, 0)]));
+				tcs.SetResult();
+			}));
+		var sut = CreateSut();
+		await tcs.Task.WithTimeout();
+		await Task.Delay(100); // Wait for the policy to appear in the selector
+
+		var policy = sut.Select();
+		Assert.Equal(_customPolicyName, policy.Information.Name);
+
+		await AssertAllActionsOnPolicy(policy, user, stream, expectedGrant);
+	}
+
+	[Theory]
+	[MemberData(nameof(ValidActionsData))]
+	public async Task
+		when_policy_stream_contains_multiple_policies_the_most_recent_policy_is_used(string allowedAction) {
+		var tcs = new TaskCompletionSource();
+		var user = PolicyTestHelpers.CreateUser(SystemUsers.Operations, [SystemRoles.Operations]);
+		var stream = _systemStream;
+
+		var policy1 = StreamPolicySelector.DefaultPolicy;
+		var policy2 = new Policy {
+			StreamPolicies = new Dictionary<string, Schema.AccessPolicy> {
+				{ "NewPolicy", PolicyTestHelpers.CreateAccessPolicyDtoForAction(allowedAction, SystemUsers.Operations) },
+				{ "DefaultPolicy", AdminOnly }
+			},
+			DefaultStreamRules = new DefaultStreamRules { SystemStreams = "DefaultPolicy", UserStreams = "DefaultPolicy" },
+			StreamRules = [new StreamRule { Policy = "NewPolicy", StartsWith = stream }]
+		};
+
+		_bus.Subscribe(new AdHocHandler<ClientMessage.ReadStreamEventsBackward>(
+			msg => {
+				msg.Envelope.ReplyWith(CreateReadCompleted(msg, [
+					CreateResolvedEventForPolicy(policy2, 1),
+					CreateResolvedEventForPolicy(policy1, 0)
+				]));
+				tcs.SetResult();
+			}));
+		var sut = CreateSut();
+		await tcs.Task.WithTimeout();
+		await Task.Delay(100); // Wait for the policy to appear in the selector
+
+		var policy = sut.Select();
+		Assert.Equal(_customPolicyName, policy.Information.Name);
+
+		await AssertAllowedStreamActionsOnPolicy(policy, user, stream, [allowedAction]);
+		await AssertAllowedSubscriptionActionsOnPolicy(policy, user, stream, [allowedAction]);
+	}
+
+	[Theory]
+	[MemberData(nameof(ValidActionsData))]
+	public async Task when_policy_stream_contains_an_invalid_policy_the_most_recent_valid_policy_is_used(
+		string allowedAction) {
+		var tcs = new TaskCompletionSource();
+		var user = PolicyTestHelpers.CreateUser(SystemUsers.Operations, [SystemRoles.Operations]);
+		var stream = _systemStream;
+
+		var policy1 = StreamPolicySelector.DefaultPolicy;
+		var policy2 = new Policy {
+			StreamPolicies = new Dictionary<string, Schema.AccessPolicy> {
+				{ "NewPolicy", PolicyTestHelpers.CreateAccessPolicyDtoForAction(allowedAction, SystemUsers.Operations) },
+				{ "DefaultPolicy", AdminOnly }
+			},
+			DefaultStreamRules = new DefaultStreamRules { SystemStreams = "DefaultPolicy", UserStreams = "DefaultPolicy" },
+			StreamRules = [new StreamRule { Policy = "NewPolicy", StartsWith = stream }]
+		};
+
+		_bus.Subscribe(new AdHocHandler<ClientMessage.ReadStreamEventsBackward>(
+			msg => {
+				msg.Envelope.ReplyWith(CreateReadCompleted(msg, [
+					CreateResolvedEvent("invalid", "invalid"u8.ToArray(), 2),
+					CreateResolvedEventForPolicy(policy2, 1),
+					CreateResolvedEventForPolicy(policy1, 0)
+				]));
+				tcs.SetResult();
+			}));
+		var sut = CreateSut();
+		await tcs.Task.WithTimeout();
+		await Task.Delay(100); // Wait for the policy to appear in the selector
+
+		var policy = sut.Select();
+		Assert.Equal(_customPolicyName, policy.Information.Name);
+
+		await AssertAllowedStreamActionsOnPolicy(policy, user, stream, [allowedAction]);
+		await AssertAllowedSubscriptionActionsOnPolicy(policy, user, stream, [allowedAction]);
+	}
+
+	[Theory]
+	[MemberData(nameof(ValidActionsData))]
+	public async Task when_a_new_policy_event_is_written_the_new_policy_is_applied(string allowedAction) {
+		var user = PolicyTestHelpers.CreateUser(SystemUsers.Operations, [SystemRoles.Operations]);
+		var stream = _systemStream;
+
+		var policy1 = StreamPolicySelector.DefaultPolicy;
+		var policy2 = new Policy {
+			StreamPolicies = new Dictionary<string, Schema.AccessPolicy> {
+				{ "NewPolicy", PolicyTestHelpers.CreateAccessPolicyDtoForAction(allowedAction, SystemUsers.Operations)},
+				{ "DefaultPolicy", AdminOnly }
+			},
+			DefaultStreamRules = new DefaultStreamRules { SystemStreams = "DefaultPolicy", UserStreams = "DefaultPolicy" },
+			StreamRules = [new StreamRule { Policy = "NewPolicy", StartsWith = stream }]
+		};
+
+		var subscribeSource = new TaskCompletionSource<ClientMessage.SubscribeToStream>();
+		_bus.Subscribe(new AdHocHandler<ClientMessage.SubscribeToStream>(msg => {
+			subscribeSource.TrySetResult(msg);
+		}));
+
+		var readCompletionSource = new TaskCompletionSource();
+		_bus.Subscribe(new AdHocHandler<ClientMessage.ReadStreamEventsBackward>(
+			msg => {
+				msg.Envelope.ReplyWith(CreateReadCompleted(msg, [CreateResolvedEventForPolicy(policy1, 0)]));
+				readCompletionSource.SetResult();
+			}));
+		var sut = CreateSut();
+		await readCompletionSource.Task.WithTimeout();
+		await Task.Delay(100); // Wait for the policy to appear in the selector
+
+		var initialPolicy = sut.Select();
+		Assert.Equal(_customPolicyName, initialPolicy.Information.Name);
+
+		// Test that the old policy is in effect
+		await AssertAllActionsOnPolicy(initialPolicy, user, stream, Grant.Deny);
+
+		// Write a new policy event
+		var subscribeMsg = await subscribeSource.Task.WithTimeout();
+		subscribeMsg.Envelope.ReplyWith(new ClientMessage.SubscriptionConfirmation(subscribeMsg.CorrelationId, 0, 0));
+		subscribeMsg.Envelope.ReplyWith(new ClientMessage.StreamEventAppeared(
+			subscribeMsg.CorrelationId, CreateResolvedEventForPolicy(policy2, 1)));
+		await Task.Delay(100); // Wait for the policy to appear in the selector
+
+		var newPolicy = sut.Select();
+		Assert.Equal(_customPolicyName, newPolicy.Information.Name);
+		await AssertAllowedStreamActionsOnPolicy(newPolicy, user, stream, [allowedAction]);
+		await AssertAllowedSubscriptionActionsOnPolicy(newPolicy, user, stream, [allowedAction]);
+	}
+
+	[Theory]
+	[MemberData(nameof(ValidActionsData))]
+	public async Task when_an_invalid_policy_event_is_written_the_previous_policy_is_used(string allowedAction) {
+		var user = PolicyTestHelpers.CreateUser(SystemUsers.Operations, [SystemRoles.Operations]);
+		var stream = _systemStream;
+
+		var policy1 = new Policy {
+			StreamPolicies = new Dictionary<string, Schema.AccessPolicy> {
+				{ "NewPolicy", PolicyTestHelpers.CreateAccessPolicyDtoForAction(allowedAction, SystemUsers.Operations)},
+				{ "DefaultPolicy", AdminOnly }
+			},
+			DefaultStreamRules = new DefaultStreamRules { SystemStreams = "DefaultPolicy", UserStreams = "DefaultPolicy" },
+			StreamRules = [new StreamRule { Policy = "NewPolicy", StartsWith = stream }]
+		};
+
+		var subscribeSource = new TaskCompletionSource<ClientMessage.SubscribeToStream>();
+		_bus.Subscribe(new AdHocHandler<ClientMessage.SubscribeToStream>(msg => {
+			subscribeSource.TrySetResult(msg);
+		}));
+
+		var readCompletionSource = new TaskCompletionSource();
+		_bus.Subscribe(new AdHocHandler<ClientMessage.ReadStreamEventsBackward>(
+			msg => {
+				msg.Envelope.ReplyWith(CreateReadCompleted(msg, [CreateResolvedEventForPolicy(policy1, 0)]));
+				readCompletionSource.SetResult();
+			}));
+		var sut = CreateSut();
+		await readCompletionSource.Task.WithTimeout();
+		await Task.Delay(100); // Wait for the policy to appear in the selector
+
+		var initialPolicy = sut.Select();
+		Assert.Equal(_customPolicyName, initialPolicy.Information.Name);
+
+		// Write an invalid policy event
+		var subscribeMsg = await subscribeSource.Task.WithTimeout();
+		subscribeMsg.Envelope.ReplyWith(new ClientMessage.SubscriptionConfirmation(subscribeMsg.CorrelationId, 0, 0));
+		subscribeMsg.Envelope.ReplyWith(new ClientMessage.StreamEventAppeared(
+			subscribeMsg.CorrelationId, CreateResolvedEvent("invalid", "invalid"u8.ToArray(), 1)));
+		await Task.Delay(100); // Wait for the policy to appear in the selector
+
+		var policy = sut.Select();
+		Assert.Equal(_customPolicyName, policy.Information.Name);
+
+		await AssertAllowedStreamActionsOnPolicy(policy, user, stream, [allowedAction]);
+		await AssertAllowedSubscriptionActionsOnPolicy(policy, user, stream, [allowedAction]);
+	}
+
+	[Theory]
+	[InlineData(ClientMessage.NotHandled.Types.NotHandledReason.NotReady)]
+	[InlineData(ClientMessage.NotHandled.Types.NotHandledReason.TooBusy)]
+	public async Task when_the_policy_subscription_is_not_handled_it_is_retried_when_recoverable(
+		ClientMessage.NotHandled.Types.NotHandledReason notHandledReason) {
+		var subscriptionMessages = new List<ClientMessage.SubscribeToStream>();
+		var subscribeEvent = new ManualResetEvent(false);
+		_bus.Subscribe(new AdHocHandler<ClientMessage.SubscribeToStream>(msg => {
+			subscriptionMessages.Add(msg);
+			subscribeEvent.Set();
+		}));
+		// Respond to the initial read with empty stream
+		_bus.Subscribe(new AdHocHandler<ClientMessage.ReadStreamEventsBackward>(
+			msg => {
+				msg.Envelope.ReplyWith(NoStreamResponse(msg));
+			}));
+
+		var sut = CreateSut();
+		await subscribeEvent.WaitAsync().AsTask().WithTimeout();
+		subscribeEvent.Reset();
+
+		var initialSubscription = subscriptionMessages.FirstOrDefault();
+		Assert.NotNull(initialSubscription);
+
+		// Fail the subscription attempt
+		initialSubscription.Envelope.ReplyWith(
+			new ClientMessage.NotHandled(initialSubscription.CorrelationId, notHandledReason, ""));
+
+		// It should attempt to resubscribe
+		await subscribeEvent.WaitAsync().AsTask().WithTimeout();
+		Assert.Equal(2, subscriptionMessages.Count);
+	}
+
+	private static async Task AssertAllActionsOnPolicy(
+		ReadOnlyPolicy policy, ClaimsPrincipal user, string stream, Grant expectedGrant) {
+		var allowedActions = expectedGrant == Grant.Allow ? PolicyTestHelpers.ValidActions : [];
+		await AssertAllowedStreamActionsOnPolicy(policy, user, stream, allowedActions);
+		await AssertAllowedSubscriptionActionsOnPolicy(policy, user, stream, allowedActions);
+	}
+
+	private static async Task AssertAllowedStreamActionsOnPolicy(
+		ReadOnlyPolicy policy, ClaimsPrincipal user, string stream, string[] allowedActions) {
+		foreach (var action in PolicyTestHelpers.ValidActions) {
+			var operationDefinition = PolicyTestHelpers.ActionToOperationDefinition(action);
+			var operation = new Operation(operationDefinition)
+				.WithParameter(Operations.Streams.Parameters.StreamId(stream));
+			Assert.True(policy.TryGetAssertions(operationDefinition, out var assertions));
+			Assert.Single(assertions.ToArray());
+
+			var assertion = assertions.ToArray()[0];
+			var evaluationContext = new EvaluationContext(operation, CancellationToken.None);
+			await assertion.Evaluate(user, operation, policy.Information, evaluationContext);
+			Assert.Equal(allowedActions.Contains(action) ? Grant.Allow : Grant.Deny, evaluationContext.Grant);
+		}
+	}
+
+	private static async Task AssertAllowedSubscriptionActionsOnPolicy(
+		ReadOnlyPolicy policy, ClaimsPrincipal user, string stream, string[] allowedActions) {
+		var operationDefinition = Operations.Subscriptions.ProcessMessages;
+		var operation = new Operation(operationDefinition)
+			.WithParameter(Operations.Subscriptions.Parameters.StreamId(stream));
+		Assert.True(policy.TryGetAssertions(operationDefinition, out var assertions));
+		Assert.Single(assertions.ToArray());
+
+		var assertion = assertions.ToArray()[0];
+		var evaluationContext = new EvaluationContext(operation, CancellationToken.None);
+		await assertion.Evaluate(user, operation, policy.Information, evaluationContext);
+		Assert.Equal(allowedActions.Contains("read") ? Grant.Allow : Grant.Deny, evaluationContext.Grant);
+	}
+
+	private static ClientMessage.ReadStreamEventsBackwardCompleted
+		NoStreamResponse(ClientMessage.ReadStreamEventsBackward msg) =>
+		new(
+			msg.CorrelationId, msg.EventStreamId, msg.FromEventNumber, msg.MaxCount,
+			ReadStreamResult.NoStream, [], StreamMetadata.Empty, true, "",
+			msg.FromEventNumber, msg.FromEventNumber, true, 0L);
+
+	private ResolvedEvent CreateResolvedEventForPolicy(Policy policy, long eventNumber) {
+		var data = PolicyTestHelpers.SerializePolicy(policy);
+		return CreateResolvedEvent(StreamPolicySelector.PolicyEventType, data, eventNumber);
+	}
+
+	private ResolvedEvent CreateResolvedEvent(string eventType, byte[] data, long eventNumber) {
+		var logPosition = eventNumber * 100;
+		var prepare = new PrepareLogRecord(logPosition, Guid.NewGuid(), Guid.NewGuid(),
+			transactionPosition: logPosition,
+			transactionOffset: 0,
+			StreamPolicySelector.PolicyStream,
+			eventStreamIdSize: null,
+			expectedVersion: eventNumber, DateTime.Now, PrepareFlags.Data,
+			eventType, eventTypeSize: null, data, ReadOnlyMemory<byte>.Empty);
+		var eventRecord = new EventRecord(eventNumber, prepare, StreamPolicySelector.PolicyStream, eventType);
+		return ResolvedEvent.ForUnresolvedEvent(eventRecord, logPosition);
+	}
+
+	private ClientMessage.ReadStreamEventsBackwardCompleted CreateReadCompleted(
+		ClientMessage.ReadStreamEventsBackward msg, ResolvedEvent[] events) =>
+		new(msg.CorrelationId, msg.EventStreamId, msg.FromEventNumber, msg.MaxCount,
+			ReadStreamResult.Success, events, StreamMetadata.Empty, true, "",
+			msg.FromEventNumber, msg.FromEventNumber, true, 1000L);
+}
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/StreamPolicyWriterTests.cs b/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/StreamPolicyWriterTests.cs
new file mode 100644
index 00000000000..8dc3c3cd6ed
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin.Tests/StreamPolicyWriterTests.cs
@@ -0,0 +1,153 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using DotNext.Threading;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using Xunit;
+
+namespace KurrentDB.Auth.StreamPolicyPlugin.Tests;
+
+public class StreamPolicyWriterTests {
+	private readonly SynchronousScheduler _bus = new("testBus");
+
+	private StreamPolicyWriter CreateSut() {
+		return new StreamPolicyWriter(
+			_bus,
+			StreamPolicySelector.PolicyStream,
+			StreamPolicySelector.PolicyEventType,
+			PolicyTestHelpers.SerializePolicy);
+	}
+
+	[Fact]
+	public async Task when_writing_the_default_policy() {
+		var tcs = new TaskCompletionSource<ClientMessage.WriteEvents>();
+		_bus.Subscribe(new AdHocHandler<ClientMessage.WriteEvents>(msg => {
+			tcs.TrySetResult(msg);
+		}));
+
+		var sut = CreateSut();
+		var writeRequest = sut.WriteDefaultPolicy(StreamPolicySelector.DefaultPolicy, CancellationToken.None);
+		var writeMessage = await tcs.Task.WithTimeout();
+
+		// The write succeeds
+		writeMessage.Envelope.ReplyWith(
+			new ClientMessage.WriteEventsCompleted(writeMessage.CorrelationId, 0, 0, 100, 100));
+
+		// It attempts to write an event with a known id to the start of the stream
+		Assert.Equal(StreamPolicyWriter.DefaultStreamPolicyEventId, writeMessage.Events[0].EventId.ToString());
+		Assert.Equal(ExpectedVersion.NoStream, writeMessage.ExpectedVersion);
+
+		// It does not require leader
+		Assert.False(writeMessage.RequireLeader);
+
+		// The request should complete
+		await writeRequest.WithTimeout();
+	}
+
+	[Theory]
+	[InlineData(ClientMessage.NotHandled.Types.NotHandledReason.NotReady)]
+	[InlineData(ClientMessage.NotHandled.Types.NotHandledReason.NotLeader)]
+	[InlineData(ClientMessage.NotHandled.Types.NotHandledReason.TooBusy)]
+	public async Task when_the_default_policy_write_request_is_not_handled_and_can_be_retried(
+		ClientMessage.NotHandled.Types.NotHandledReason notHandledReason) {
+		var writeMessages = new List<ClientMessage.WriteEvents>();
+		var mre = new ManualResetEvent(false);
+		_bus.Subscribe(new AdHocHandler<ClientMessage.WriteEvents>(msg => {
+			writeMessages.Add(msg);
+			mre.Set();
+		}));
+
+		var sut = CreateSut();
+		var writeRequest = sut.WriteDefaultPolicy(StreamPolicySelector.DefaultPolicy, CancellationToken.None);
+		await mre.WaitAsync().AsTask().WithTimeout();
+		mre.Reset();
+
+		Assert.Single(writeMessages);
+		writeMessages[0].Envelope.ReplyWith(new ClientMessage.NotHandled(writeMessages[0].CorrelationId, notHandledReason, ""));
+
+		await mre.WaitAsync().AsTask().WithTimeout();
+		Assert.Equal(2, writeMessages.Count);
+		writeMessages[1].Envelope.ReplyWith(CreateWriteEventsSuccessfullyCompleted(writeMessages[1]));
+
+		// The request should now complete
+		await writeRequest.WithTimeout();
+	}
+
+	[Theory]
+	[InlineData(ClientMessage.NotHandled.Types.NotHandledReason.IsReadOnly)]
+	public async Task when_the_default_policy_write_request_is_not_handled_and_cannot_be_retried(
+		ClientMessage.NotHandled.Types.NotHandledReason notHandledReason) {
+		var tcs = new TaskCompletionSource<ClientMessage.WriteEvents>();
+		_bus.Subscribe(new AdHocHandler<ClientMessage.WriteEvents>(msg => {
+			tcs.TrySetResult(msg);
+		}));
+
+		var sut = CreateSut();
+		var writeRequest = sut.WriteDefaultPolicy(StreamPolicySelector.DefaultPolicy, CancellationToken.None);
+		var writeMessage = await tcs.Task.WithTimeout();
+
+		writeMessage.Envelope.ReplyWith(new ClientMessage.NotHandled(writeMessage.CorrelationId, notHandledReason, ""));
+
+		// The request should now complete
+		await writeRequest.WithTimeout();
+	}
+
+	[Theory]
+	[InlineData(OperationResult.CommitTimeout)]
+	[InlineData(OperationResult.PrepareTimeout)]
+	[InlineData(OperationResult.ForwardTimeout)]
+	[InlineData(OperationResult.AccessDenied)]
+	[InlineData(OperationResult.InvalidTransaction)]
+	public async Task when_the_default_policy_write_request_fails_and_can_be_retried(
+		OperationResult operationResult) {
+		var writeMessages = new List<ClientMessage.WriteEvents>();
+		var mre = new ManualResetEvent(false);
+		_bus.Subscribe(new AdHocHandler<ClientMessage.WriteEvents>(msg => {
+			writeMessages.Add(msg);
+			mre.Set();
+		}));
+
+		var sut = CreateSut();
+		var writeRequest = sut.WriteDefaultPolicy(StreamPolicySelector.DefaultPolicy, CancellationToken.None);
+		await mre.WaitAsync().AsTask().WithTimeout();
+		mre.Reset();
+
+		Assert.Single(writeMessages);
+		writeMessages[0].Envelope.ReplyWith(
+			new ClientMessage.WriteEventsCompleted(writeMessages[0].CorrelationId, operationResult, ""));
+
+		await mre.WaitAsync().AsTask().WithTimeout();
+		Assert.Equal(2, writeMessages.Count);
+		writeMessages[1].Envelope.ReplyWith(CreateWriteEventsSuccessfullyCompleted(writeMessages[1]));
+
+		// The request should now complete
+		await writeRequest.WithTimeout();
+	}
+
+	[Theory]
+	[InlineData(OperationResult.WrongExpectedVersion)]
+	[InlineData(OperationResult.StreamDeleted)]
+	public async Task when_the_default_policy_write_request_fails_and_cannot_be_retried(
+		OperationResult operationResult) {
+		var tcs = new TaskCompletionSource<ClientMessage.WriteEvents>();
+		_bus.Subscribe(new AdHocHandler<ClientMessage.WriteEvents>(msg => {
+			tcs.TrySetResult(msg);
+		}));
+
+		var sut = CreateSut();
+		var writeRequest = sut.WriteDefaultPolicy(StreamPolicySelector.DefaultPolicy, CancellationToken.None);
+		var writeMessage = await tcs.Task.WithTimeout();
+
+		writeMessage.Envelope.ReplyWith(
+			new ClientMessage.WriteEventsCompleted(writeMessage.CorrelationId, operationResult, ""));
+
+		// The request should complete
+		await writeRequest.WithTimeout();
+	}
+
+	private ClientMessage.WriteEventsCompleted CreateWriteEventsSuccessfullyCompleted(ClientMessage.WriteEvents msg) =>
+		new(msg.CorrelationId, 0, 0, 1000L, 1000L);
+}
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin/AccessPolicy.cs b/src/KurrentDB.Auth.StreamPolicyPlugin/AccessPolicy.cs
new file mode 100644
index 00000000000..d9159339138
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin/AccessPolicy.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Auth.StreamPolicyPlugin;
+
+public class AccessPolicy {
+	public readonly string[] Readers;
+	public readonly string[] Writers;
+	public readonly string[] Deleters;
+	public readonly string[] MetadataReaders;
+	public readonly string[] MetadataWriters;
+
+	private AccessPolicy() {
+		Readers = [];
+		Writers = [];
+		Deleters = [];
+		MetadataReaders = [];
+		MetadataWriters = [];
+	}
+
+	public AccessPolicy(
+		string[] readers, string[] writers, string[] deleters, string[] metadataReaders, string[] metadataWriters) {
+		Readers = readers ?? [];
+		Writers = writers ?? [];
+		Deleters = deleters ?? [];
+		MetadataReaders = metadataReaders ?? [];
+		MetadataWriters = metadataWriters ?? [];
+	}
+	public static AccessPolicy None => new();
+
+	public override string ToString() {
+		return $"$r: {string.Join(',', Readers)}\n" +
+			   $"$w: {string.Join(',', Writers)}\n" +
+			   $"$d: {string.Join(',', Deleters)}\n" +
+			   $"$mr: {string.Join(',', MetadataReaders)}\n" +
+			   $"$mw: {string.Join(',', MetadataWriters)}\n";
+	}
+}
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin/KurrentDB.Auth.StreamPolicyPlugin.csproj b/src/KurrentDB.Auth.StreamPolicyPlugin/KurrentDB.Auth.StreamPolicyPlugin.csproj
new file mode 100644
index 00000000000..ddfa1695c5b
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin/KurrentDB.Auth.StreamPolicyPlugin.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.Core\KurrentDB.Core.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="EventStore.Plugins" Version="25.2.5" />
+		<PackageReference Include="System.ComponentModel.Composition" Version="8.0.0" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin/Schema/AccessPolicy.cs b/src/KurrentDB.Auth.StreamPolicyPlugin/Schema/AccessPolicy.cs
new file mode 100644
index 00000000000..f6f91642860
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin/Schema/AccessPolicy.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text.Json.Serialization;
+
+namespace KurrentDB.Auth.StreamPolicyPlugin.Schema;
+
+public class AccessPolicy : IJsonOnDeserialized {
+	[JsonRequired]
+	[JsonPropertyName("$r")]
+	public string[] Readers { get; init; } = default!;
+
+	[JsonRequired]
+	[JsonPropertyName("$w")]
+	public string[] Writers { get; init; } = default!;
+
+	[JsonRequired]
+	[JsonPropertyName("$d")]
+	public string[] Deleters { get; init; } = default!;
+
+	[JsonRequired]
+	[JsonPropertyName("$mr")]
+	public string[] MetadataReaders { get; init; } = default!;
+
+	[JsonRequired]
+	[JsonPropertyName("$mw")]
+	public string[] MetadataWriters { get; init; } = default!;
+
+	public void OnDeserialized() {
+		if (Readers is null)
+			throw new ArgumentNullException($"{nameof(Readers)} cannot be null");
+		if (Writers is null)
+			throw new ArgumentNullException($"{nameof(Writers)} cannot be null");
+		if (Deleters is null)
+			throw new ArgumentNullException($"{nameof(Deleters)} cannot be null");
+		if (MetadataReaders is null)
+			throw new ArgumentNullException($"{nameof(MetadataReaders)} cannot be null");
+		if (MetadataWriters is null)
+			throw new ArgumentNullException($"{nameof(MetadataWriters)} cannot be null");
+	}
+}
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin/Schema/DefaultStreamRules.cs b/src/KurrentDB.Auth.StreamPolicyPlugin/Schema/DefaultStreamRules.cs
new file mode 100644
index 00000000000..d88622f1d5c
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin/Schema/DefaultStreamRules.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text.Json.Serialization;
+
+namespace KurrentDB.Auth.StreamPolicyPlugin.Schema;
+
+public class DefaultStreamRules : IJsonOnDeserialized {
+	[JsonRequired]
+	public string UserStreams { get; init; } = default!;
+
+	[JsonRequired]
+	public string SystemStreams { get; init; } = default!;
+
+	public void OnDeserialized() {
+		if (string.IsNullOrEmpty(UserStreams))
+			throw new ArgumentNullException($"{nameof(UserStreams)} cannot be null or empty");
+		if (string.IsNullOrEmpty(SystemStreams))
+			throw new ArgumentNullException($"{nameof(SystemStreams)} cannot be null or empty");
+	}
+}
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin/Schema/Policy.cs b/src/KurrentDB.Auth.StreamPolicyPlugin/Schema/Policy.cs
new file mode 100644
index 00000000000..34ff302baac
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin/Schema/Policy.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text.Json.Serialization;
+
+namespace KurrentDB.Auth.StreamPolicyPlugin.Schema;
+
+public class Policy : IJsonOnDeserialized {
+	[JsonRequired]
+	public Dictionary<string, AccessPolicy> StreamPolicies { get; init; } = default!;
+
+	[JsonRequired]
+	public StreamRule[] StreamRules { get; init; } = default!;
+
+	[JsonRequired]
+	public DefaultStreamRules DefaultStreamRules { get; init; } = default!;
+
+	public void OnDeserialized() {
+		if (StreamPolicies is null)
+			throw new ArgumentNullException($"{nameof(StreamPolicies)} cannot be null");
+		if (StreamRules is null)
+			throw new ArgumentNullException($"{nameof(StreamRules)} cannot be null");
+		if (DefaultStreamRules is null)
+			throw new ArgumentNullException($"{nameof(DefaultStreamRules)} cannot be null");
+	}
+}
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin/Schema/StreamRule.cs b/src/KurrentDB.Auth.StreamPolicyPlugin/Schema/StreamRule.cs
new file mode 100644
index 00000000000..bad8c66ae3d
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin/Schema/StreamRule.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text.Json.Serialization;
+
+namespace KurrentDB.Auth.StreamPolicyPlugin.Schema;
+
+public class StreamRule : IJsonOnDeserialized {
+	[JsonRequired]
+	public string StartsWith { get; init; } = default!;
+
+	[JsonRequired]
+	public string Policy { get; init; } = default!;
+	public void OnDeserialized() {
+		if (string.IsNullOrEmpty(StartsWith))
+			throw new ArgumentNullException($"{nameof(StartsWith)} cannot be null or empty");
+		if (string.IsNullOrEmpty(Policy))
+			throw new ArgumentNullException($"{nameof(Policy)} cannot be null or empty");
+	}
+}
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin/StreamBasedPolicySelector.cs b/src/KurrentDB.Auth.StreamPolicyPlugin/StreamBasedPolicySelector.cs
new file mode 100644
index 00000000000..6342f812f99
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin/StreamBasedPolicySelector.cs
@@ -0,0 +1,145 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Claims;
+using KurrentDB.Core.Authorization;
+using KurrentDB.Core.Authorization.AuthorizationPolicies;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Enumerators;
+using Serilog;
+
+namespace KurrentDB.Auth.StreamPolicyPlugin;
+
+public delegate bool TryParsePolicy(string eventType, ReadOnlySpan<byte> eventData, out ReadOnlyPolicy policy);
+
+// TODO: use the IClient interface instead of enumerators to read streams
+public abstract class StreamBasedPolicySelector : IPolicySelector {
+	private readonly IPublisher _publisher;
+	private readonly string _stream;
+	private readonly ClaimsPrincipal _user;
+	private readonly TryParsePolicy _tryParsePolicy;
+
+	private ReadOnlyPolicy _currentPolicy;
+
+	private static readonly ILogger Logger = Log.ForContext<StreamBasedPolicySelector>();
+
+	protected StreamBasedPolicySelector(
+		IPublisher publisher,
+		string stream,
+		ClaimsPrincipal user,
+		TryParsePolicy tryParsePolicy,
+		ReadOnlyPolicy notReadyPolicy,
+		CancellationToken ct) {
+		_publisher = publisher;
+		_stream = stream;
+		_user = user;
+		_tryParsePolicy = tryParsePolicy;
+
+		_currentPolicy = notReadyPolicy;
+		Task.Factory.StartNew(() => StartAsync(ct));
+	}
+
+	private async Task StartAsync(CancellationToken ct) {
+		do {
+			try {
+				var checkpoint = await TryGetSubscriptionCheckpoint(ct);
+				await StartSubscription(checkpoint, ct);
+				return;
+			} catch (ReadResponseException.NotHandled.ServerNotReady) {
+				Logger.Verbose("Subscription to {policyStream}: server is not ready, retrying...", _stream);
+				await Task.Delay(TimeSpan.FromSeconds(3), ct);
+			} catch (ReadResponseException.NotHandled.ServerBusy) {
+				Logger.Verbose("Subscription to {policyStream}: server is too busy, retrying...", _stream);
+				await Task.Delay(TimeSpan.FromSeconds(3), ct);
+			} catch (OperationCanceledException) {
+				// ignore
+			} catch (Exception exc) {
+				Logger.Fatal(exc, "Fatal error in subscription to {policyStream}", _stream);
+				return;
+			}
+		} while (true);
+	}
+
+	private async Task StartSubscription(StreamRevision? checkpoint, CancellationToken ct) {
+		Logger.Information("Subscribing to {policyStream} at {checkpoint}", _stream, checkpoint);
+		await using var sub = new Enumerator.StreamSubscription<string>(
+			bus: _publisher,
+			expiryStrategy: new DefaultExpiryStrategy(),
+			streamName: _stream,
+			resolveLinks: false,
+			user: _user,
+			checkpoint: checkpoint,
+			requiresLeader: false,
+			cancellationToken: ct);
+
+		while (await sub.MoveNextAsync()) {
+			var response = sub.Current;
+			switch (response) {
+				case ReadResponse.EventReceived evt:
+					Logger.Information("New policy found in {policyStream} stream ({eventNumber})", _stream,
+						evt.Event.OriginalEventNumber);
+					TryApplyPolicy(evt.Event);
+					break;
+			}
+		}
+	}
+
+	private bool TryApplyPolicy(ResolvedEvent evt) {
+		if (_tryParsePolicy(evt.Event.EventType, evt.Event.Data.Span, out var policy)) {
+			_currentPolicy = policy;
+			Logger.Information("Successfully applied policy");
+			return true;
+		}
+		Logger.Error("Could not parse policy");
+		return false;
+	}
+
+	private async Task<StreamRevision?> TryGetSubscriptionCheckpoint(CancellationToken ct) {
+		Logger.Verbose("Determining subscription checkpoint for stream {policyStream}", _stream);
+		await using var enumerator = new Enumerator.ReadStreamBackwards(
+			bus: _publisher,
+			streamName: _stream,
+			startRevision: StreamRevision.End,
+			maxCount: ulong.MaxValue,
+			resolveLinks: false,
+			user: _user,
+			requiresLeader: false,
+			deadline: DateTime.MaxValue,
+			compatibility: 0,
+			cancellationToken: ct);
+
+		StreamRevision? checkpoint = null;
+		while (await enumerator.MoveNextAsync()) {
+			var response = enumerator.Current;
+			switch (response) {
+				case ReadResponse.StreamNotFound:
+					Log.Information("{policyStream} stream not found", _stream);
+					return null;
+				case ReadResponse.EventReceived evt:
+					Logger.Information("Existing policy found in {policyStream} stream ({eventNumber})", _stream, evt.Event.OriginalEventNumber);
+
+					// assign the checkpoint only for the first event we find as we want to subscribe from there
+					checkpoint ??= StreamRevision.FromInt64(evt.Event.OriginalEventNumber);
+
+					if (!TryApplyPolicy(evt.Event)) {
+						// we haven't been able to apply the policy we found since it's invalid.
+						// let's continue reading events until we find a valid one, otherwise
+						// we'll default to the not ready policy
+						continue;
+					}
+
+					return checkpoint;
+			}
+		}
+		// all the policies are invalid
+		// we subscribe anyway and remain on the not ready policy
+		Logger.Warning("No valid policy found in {policyStream} stream", _stream);
+		return checkpoint;
+	}
+
+	public ReadOnlyPolicy Select() => _currentPolicy;
+}
+
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin/StreamPolicyAssertion.cs b/src/KurrentDB.Auth.StreamPolicyPlugin/StreamPolicyAssertion.cs
new file mode 100644
index 00000000000..2b40137ee73
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin/StreamPolicyAssertion.cs
@@ -0,0 +1,139 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Claims;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Core.Authorization;
+using KurrentDB.Core.Services;
+
+namespace KurrentDB.Auth.StreamPolicyPlugin;
+
+public class StreamPolicyAssertion(Func<string, AccessPolicy> getAccessPolicyForStream) : IStreamPermissionAssertion {
+	public Grant Grant { get; } = Grant.Unknown;
+	public AssertionInformation Information { get; } = new("starts with", "stream prefix", Grant.Unknown);
+
+	public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context) {
+		var streamId = FindStreamId(operation.Parameters.Span);
+
+		return CheckStreamAccess(cp, operation, policy, context, streamId);
+	}
+
+	private async ValueTask<bool> CheckStreamAccess(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context, string? streamId) {
+		if (cp.Identity is null || !cp.Identity.IsAuthenticated) {
+			context.Add(new AssertionMatch(policy,
+				new AssertionInformation("unauthenticated", "unauthenticated/anonymous user denied access", Grant.Deny)));
+			return true;
+		}
+
+		if (streamId is null) {
+			context.Add(new AssertionMatch(policy,
+				new AssertionInformation("streamId", "streamId is null", Grant.Deny)));
+			return true;
+		}
+
+		if (streamId == string.Empty)
+			streamId = SystemStreams.AllStream;
+		if (streamId == SystemStreams.AllStream &&
+			(operation == Operations.Streams.Delete || operation == Operations.Streams.Write)) {
+			context.Add(new AssertionMatch(policy,
+				new AssertionInformation("streamId", $"{operation.Action} denied on $all", Grant.Deny)));
+			return true;
+		}
+
+		var action = operation.Action;
+		if (SystemStreams.IsMetastream(streamId)) {
+			action = operation.Action switch {
+				"read" => "metadataRead",
+				"write" => "metadataWrite",
+				_ => null
+			};
+			if (action == null)
+				return InvalidMetadataOperation(operation, policy, context);
+			streamId = SystemStreams.OriginalStreamOf(streamId);
+		}
+
+		return action switch {
+			"read" => await Check(cp, operation, action, streamId, policy, context),
+			"write" => await Check(cp, operation, action, streamId, policy, context),
+			"delete" => await Check(cp, operation, action, streamId, policy, context),
+			"metadataWrite" => await Check(cp, operation, action, streamId, policy, context),
+			"metadataRead" => await Check(cp, operation, action, streamId, policy, context),
+			_ => throw new ArgumentOutOfRangeException(nameof(operation.Action), action)
+		};
+	}
+
+	private async ValueTask<bool> Check(ClaimsPrincipal cp, Operation operation, string action,
+		string streamId, PolicyInformation policy, EvaluationContext context) {
+		if (await IsSystemOrAdmin(cp, operation, policy, context)) {
+			return true;
+		}
+
+		var permissions = getAccessPolicyForStream(streamId);
+
+		var roles = action switch {
+			"read" => permissions.Readers,
+			"write" => permissions.Writers,
+			"delete" => permissions.Deleters,
+			"metadataRead" => permissions.MetadataReaders,
+			"metadataWrite" => permissions.MetadataWriters,
+			_ => []
+		};
+
+		var isOpsUser = IsOpsUser(cp);
+		var isPublicStream = roles.Any(x => x == SystemRoles.All);
+		if (isPublicStream && !isOpsUser) {
+			context.Add(new AssertionMatch(policy, new AssertionInformation("stream prefix", "public stream", Grant.Allow)));
+			return true;
+		}
+
+		for (int i = 0; i < roles.Length; i++) {
+			var role = roles[i];
+			if (cp.FindFirst(x => (x.Type == ClaimTypes.Name || x.Type == ClaimTypes.Role) && x.Value == role)
+				is { } matched) {
+				context.Add(new AssertionMatch(policy, new AssertionInformation("role match", role, Grant.Allow),
+					matched));
+				return true;
+			}
+		}
+
+		if (isPublicStream && isOpsUser) {
+			context.Add(new AssertionMatch(policy,
+				new AssertionInformation("$ops user denied access", "public stream", Grant.Deny)));
+			return true;
+		}
+
+		context.Add(new AssertionMatch(policy, new AssertionInformation("denied access", "stream prefix", Grant.Deny)));
+		return true;
+	}
+
+	private async ValueTask<bool> IsSystemOrAdmin(ClaimsPrincipal cp, Operation operation,
+		PolicyInformation policy, EvaluationContext context) {
+		return await WellKnownAssertions.System.Evaluate(cp, operation, policy, context)
+			   || await WellKnownAssertions.Admin.Evaluate(cp, operation, policy, context);
+	}
+
+	private bool IsOpsUser(ClaimsPrincipal cp) {
+		var roles = cp.FindAll(x => x.Type == ClaimTypes.Role).ToArray();
+		return roles.Length > 0
+			   && roles.All(x => x.Value == SystemRoles.Operations);
+	}
+
+	private string? FindStreamId(ReadOnlySpan<Parameter> parameters) {
+		for (int i = 0; i < parameters.Length; i++) {
+			if (parameters[i].Name == "streamId")
+				return parameters[i].Value;
+		}
+		return null;
+	}
+
+	private bool InvalidMetadataOperation(Operation operation, PolicyInformation policy,
+		EvaluationContext result) {
+		result.Add(new AssertionMatch(policy,
+			new AssertionInformation("metadata", $"invalid metadata operation {operation.Action}",
+				Grant.Deny)));
+		return true;
+	}
+}
+
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin/StreamPolicySelector.cs b/src/KurrentDB.Auth.StreamPolicyPlugin/StreamPolicySelector.cs
new file mode 100644
index 00000000000..e785688ede6
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin/StreamPolicySelector.cs
@@ -0,0 +1,198 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text.Json;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Auth.StreamPolicyPlugin.Schema;
+using KurrentDB.Core.Authorization;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.UserManagement;
+using Serilog;
+using Policy = KurrentDB.Core.Authorization.Policy;
+
+namespace KurrentDB.Auth.StreamPolicyPlugin;
+
+public sealed class StreamPolicySelector : StreamBasedPolicySelector {
+	public const string PolicyName = "custom-stream-policy";
+	public const string PolicyStream = "$policies";
+	public const string PolicyEventType = "$policy-updated";
+	private static readonly ILogger Logger = Log.ForContext<StreamPolicySelector>();
+
+	public StreamPolicySelector(IPublisher publisher, CancellationToken ct) : base(
+		publisher: publisher,
+		stream: PolicyStream,
+		user: SystemAccounts.System,
+		tryParsePolicy: TryParsePolicy,
+		notReadyPolicy: BuildNotReadyPolicy(),
+		ct: ct) {
+	}
+
+	private static ReadOnlyPolicy BuildNotReadyPolicy() {
+		// we build a policy that denies all stream access as we don't want any stream operation to seep through while
+		// we're setting things up. note that system or admin users will still be able to get through as there are some
+		// preliminary checks prior to applying the rules.
+		var streamAssertion = new StreamPolicyAssertion(_ => AccessPolicy.None);
+		var policy = new Policy($"{PolicyName}-notready", 1, DateTimeOffset.MinValue);
+		policy.Add(Operations.Streams.Read, streamAssertion);
+		policy.Add(Operations.Streams.Write, streamAssertion);
+		policy.Add(Operations.Streams.Delete, streamAssertion);
+		policy.Add(Operations.Streams.MetadataRead, streamAssertion);
+		policy.Add(Operations.Streams.MetadataWrite, streamAssertion);
+		// Persistent Subscriptions
+		var subscriptionAccess = new RequireStreamReadAssertion(streamAssertion);
+		policy.Add(Operations.Subscriptions.ProcessMessages, subscriptionAccess);
+		return policy.AsReadOnly();
+	}
+
+	// The default policy allows:
+	// - User access to public streams
+	// - Admin only access to system streams
+	// - User read-only access to standard projection streams
+	public static Schema.Policy DefaultPolicy =
+		new() {
+			StreamPolicies = new Dictionary<string, Schema.AccessPolicy> {
+				{
+					"publicDefault", new Schema.AccessPolicy {
+						Readers = [SystemRoles.All],
+						Writers = [SystemRoles.All],
+						Deleters = [SystemRoles.All],
+						MetadataReaders = [SystemRoles.All],
+						MetadataWriters = [SystemRoles.All],
+					}
+				}, {
+					"adminsDefault", new Schema.AccessPolicy {
+						Readers = [SystemRoles.Admins],
+						Writers = [SystemRoles.Admins],
+						Deleters = [SystemRoles.Admins],
+						MetadataReaders = [SystemRoles.Admins],
+						MetadataWriters = [SystemRoles.Admins],
+					}
+				}, {
+					"projectionsDefault", new Schema.AccessPolicy {
+						Readers = [SystemRoles.All],
+						Writers = [SystemRoles.Admins],
+						Deleters = [SystemRoles.Admins],
+						MetadataReaders = [SystemRoles.All],
+						MetadataWriters = [SystemRoles.Admins],
+					}
+				}
+			},
+			DefaultStreamRules = new DefaultStreamRules {
+				SystemStreams = "adminsDefault",
+				UserStreams = "publicDefault"
+			},
+			StreamRules = [
+				new StreamRule {
+					StartsWith = "$et-",
+					Policy = "projectionsDefault",
+				},
+				new StreamRule {
+					StartsWith = "$ce-",
+					Policy = "projectionsDefault",
+				},
+				new StreamRule {
+					StartsWith = "$bc-",
+					Policy = "projectionsDefault",
+				},
+				new StreamRule {
+					StartsWith = "$category-",
+					Policy = "projectionsDefault",
+				},
+				new StreamRule {
+					StartsWith = "$streams",
+					Policy = "projectionsDefault",
+				}
+			],
+		};
+
+	private static readonly JsonSerializerOptions SerializeOptions = new() {
+		PropertyNamingPolicy = JsonNamingPolicy.CamelCase
+	};
+
+	private static bool TryParsePolicy(string eventType, ReadOnlySpan<byte> eventData, out ReadOnlyPolicy readOnlyPolicy) {
+		if (eventType != PolicyEventType) {
+			Logger.Error("Expected event type: {expectedEventType} but was {actualEventType}", PolicyEventType, eventType);
+			readOnlyPolicy = default!;
+			return false;
+		}
+
+		if (!TryParseStreamRules(eventData, out var streamRules)) {
+			readOnlyPolicy = default!;
+			return false;
+		}
+
+		var streamAssertion = new StreamPolicyAssertion(streamRules);
+		var policy = new Policy(PolicyName, 1, DateTimeOffset.MinValue);
+		// Streams
+		policy.Add(Operations.Streams.Read, streamAssertion);
+		policy.Add(Operations.Streams.Write, streamAssertion);
+		policy.Add(Operations.Streams.Delete, streamAssertion);
+		policy.Add(Operations.Streams.MetadataRead, streamAssertion);
+		policy.Add(Operations.Streams.MetadataWrite, streamAssertion);
+		// Persistent Subscriptions
+		var subscriptionAccess = new RequireStreamReadAssertion(streamAssertion);
+		policy.Add(Operations.Subscriptions.ProcessMessages, subscriptionAccess);
+		readOnlyPolicy = policy.AsReadOnly();
+		return true;
+	}
+
+	public static byte[] SerializePolicy(Schema.Policy policy) => JsonSerializer.SerializeToUtf8Bytes(policy, SerializeOptions);
+
+	private static bool TryParseStreamRules(ReadOnlySpan<byte> data, out Func<string, AccessPolicy> streamRules) {
+		streamRules = default!;
+
+		try {
+			var policy = JsonSerializer.Deserialize<Schema.Policy>(data, SerializeOptions)!;
+
+			var streamPolicies = new Dictionary<string, AccessPolicy>();
+			foreach (var (name, accessPolicy) in policy.StreamPolicies) {
+				streamPolicies[name] = new AccessPolicy(
+					readers: accessPolicy.Readers,
+					writers: accessPolicy.Writers,
+					deleters: accessPolicy.Deleters,
+					metadataReaders: accessPolicy.MetadataReaders,
+					metadataWriters: accessPolicy.MetadataWriters);
+			}
+
+			var streamPrefixRules = new List<StreamPrefixRule>();
+			foreach (var streamRule in policy.StreamRules) {
+				if (string.IsNullOrEmpty(streamRule.StartsWith)) {
+					Logger.Error("Stream rule at index: {streamRuleIndex} and referring to policy: {policy} has an empty prefix",
+						Array.IndexOf(policy.StreamRules, streamRule), streamRule.Policy);
+					return false;
+				}
+				if (!streamPolicies.TryGetValue(streamRule.Policy, out var accessPolicy)) {
+					Logger.Error("Stream rule for prefix: {streamPrefix} refers to an undefined policy: {policy}", streamRule.StartsWith, streamRule.Policy);
+					return false;
+				}
+				streamPrefixRules.Add(new StreamPrefixRule(streamRule.StartsWith, accessPolicy));
+			}
+
+			if (!streamPolicies.TryGetValue(policy.DefaultStreamRules.SystemStreams, out var systemStreamsPolicy)) {
+				Logger.Error("Default {streamType} stream rule refers to an undefined policy: {policy}", "system", policy.DefaultStreamRules.SystemStreams);
+				return false;
+			}
+
+			if (!streamPolicies.TryGetValue(policy.DefaultStreamRules.UserStreams, out var userStreamsPolicy)) {
+				Logger.Error("Default {streamType} stream rule refers to an undefined policy: {policy}", "user", policy.DefaultStreamRules.UserStreams);
+				return false;
+			}
+
+			var rules = streamPrefixRules.ToArray();
+			streamRules = streamId => {
+				foreach (var rule in rules)
+					if (rule.TryHandle(streamId, out var permissions))
+						return permissions;
+				return SystemStreams.IsSystemStream(streamId) ? systemStreamsPolicy : userStreamsPolicy;
+			};
+			return true;
+		} catch (JsonException exc) {
+			Logger.Error(exc, "Error while deserializing new policy");
+			return false;
+		} catch (ArgumentNullException exc) {
+			Logger.Error(exc, "Error while deserializing new policy");
+			return false;
+		}
+	}
+}
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin/StreamPolicySelectorFactory.cs b/src/KurrentDB.Auth.StreamPolicyPlugin/StreamPolicySelectorFactory.cs
new file mode 100644
index 00000000000..bb90f10610f
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin/StreamPolicySelectorFactory.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.ComponentModel.Composition;
+using EventStore.Plugins;
+using EventStore.Plugins.Subsystems;
+using KurrentDB.Core.Authorization.AuthorizationPolicies;
+using KurrentDB.Core.Bus;
+using Serilog;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Auth.StreamPolicyPlugin;
+
+[Export(typeof(IPolicySelectorFactory))]
+public class StreamPolicySelectorFactory : Plugin, IPolicySelectorFactory, ISubsystem {
+	public string CommandLineName => Name.Replace("Plugin", "").ToLowerInvariant();
+	private static readonly ILogger Logger = Log.ForContext<StreamPolicySelector>();
+	private IPolicySelector? _policySelector;
+	private bool _enabled;
+	private bool _licensed = true;
+	private CancellationTokenSource _cts = new();
+
+	public StreamPolicySelectorFactory()
+		: base(
+			name: "StreamPolicyPlugin",
+			requiredEntitlements: ["STREAM_POLICY_AUTHORIZATION"]) {
+	}
+
+	protected override void OnLicenseException(Exception ex, Action<Exception> shutdown) {
+		Logger.Information("Stream Policies plugin is not licensed, stream policy authorization cannot be enabled.");
+		_licensed = false;
+	}
+
+	public bool IsLicensed => _licensed; // temporary
+
+	public IPolicySelector Create(IPublisher publisher) {
+		if (!_enabled) {
+			throw new InvalidOperationException(
+				$"Cannot create a {nameof(StreamPolicySelector)} while the Stream Policies plugin is disabled.");
+		}
+		// Always try to create the default policy
+		// This should result in WrongExpectedVersion if the default policy already exists
+		var writer = new StreamPolicyWriter(publisher, StreamPolicySelector.PolicyStream,
+			StreamPolicySelector.PolicyEventType, StreamPolicySelector.SerializePolicy);
+		_ = writer?.WriteDefaultPolicy(StreamPolicySelector.DefaultPolicy, _cts.Token);
+		return _policySelector ??= new StreamPolicySelector(publisher, _cts.Token);
+	}
+
+	public Task<bool> Enable() {
+		if (_enabled)
+			return Task.FromResult(_enabled);
+
+		if (!_licensed) {
+			Logger.Error("Stream Policies plugin is not licensed, cannot enable Stream policies");
+			_enabled = false;
+		} else {
+			_enabled = true;
+			_cts = new CancellationTokenSource();
+		}
+		return Task.FromResult(_enabled);
+	}
+
+	public async Task Disable() {
+		if (_enabled) {
+			await _cts.CancelAsync();
+			_policySelector = null;
+		}
+		_enabled = false;
+	}
+
+	public Task Start() => Task.CompletedTask;
+
+	public Task Stop() => Task.CompletedTask;
+}
+
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin/StreamPolicyWriter.cs b/src/KurrentDB.Auth.StreamPolicyPlugin/StreamPolicyWriter.cs
new file mode 100644
index 00000000000..e964a9425fa
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin/StreamPolicyWriter.cs
@@ -0,0 +1,160 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Auth.StreamPolicyPlugin.Schema;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.UserManagement;
+using Serilog;
+
+namespace KurrentDB.Auth.StreamPolicyPlugin;
+
+public interface IPolicyWriter {
+	public Task WriteDefaultPolicy(Policy policy, CancellationToken ct);
+}
+
+// TODO: use the IClient interface instead to write to streams
+public class StreamPolicyWriter : IPolicyWriter {
+	private readonly IPublisher _bus;
+	private readonly string _policyStream;
+	private readonly string _policyEventType;
+	private readonly TimeSpan _retryDelay = TimeSpan.FromSeconds(2);
+
+	private static readonly ILogger Logger = Log.ForContext<StreamBasedPolicySelector>();
+	private readonly Func<Policy, byte[]> _serializePolicy;
+	public const string DefaultStreamPolicyEventId = "ff8b943c-60f5-49af-845c-ab7150be91d0";
+
+	public StreamPolicyWriter(
+		IPublisher bus, string policyStream, string policyEventType, Func<Policy, byte[]> serializePolicy) {
+		_bus = bus;
+		_policyStream = policyStream;
+		_policyEventType = policyEventType;
+		_serializePolicy = serializePolicy;
+	}
+
+	public Task WriteDefaultPolicy(Policy defaultPolicy, CancellationToken ct) {
+		var defaultId = Guid.Parse(DefaultStreamPolicyEventId);
+		return WritePolicyWithRetry(defaultPolicy, defaultId, ExpectedVersion.NoStream, ct);
+	}
+
+	private async Task WritePolicyWithRetry(Policy policy, Guid eventId, long expectedVersion, CancellationToken ct) {
+		var policyEvent = new Event(eventId, _policyEventType, isJson: true, _serializePolicy(policy), []);
+		var attempt = 0;
+		while (true) {
+			try {
+				if (attempt > 0) {
+					await Task.Delay(_retryDelay, ct);
+					Logger.Debug(
+						"Retrying to write default policy to stream {stream} with expected version {expectedVersion}. Attempt {attempt}",
+						_policyStream, expectedVersion, attempt + 1);
+				}
+
+				var result = await WriteEvents(_policyStream, [policyEvent], expectedVersion, ct);
+				if (result is RetryAction.None or RetryAction.NoRetry)
+					return;
+
+			} catch (Exception ex) {
+				Logger.Error(ex, "Failed to write default policy to stream {stream}", _policyStream);
+			}
+
+			attempt++;
+		}
+	}
+
+	private async Task<RetryAction> WriteEvents(string streamName, Event[] events, long expectedVersion,
+		CancellationToken ct) {
+		var correlationId = Guid.NewGuid();
+		var appendResponseSource =
+			new TaskCompletionSource<RetryAction>(TaskCreationOptions.RunContinuationsAsynchronously);
+		var envelope = new CallbackEnvelope(HandleWriteEventsCallback);
+
+		_bus.Publish(new ClientMessage.WriteEvents(
+			correlationId,
+			correlationId,
+			envelope,
+			requireLeader: false,
+			streamName,
+			expectedVersion,
+			events,
+			SystemAccounts.System,
+			cancellationToken: ct));
+
+		return await appendResponseSource.Task;
+
+
+		void HandleWriteEventsCallback(Message message) {
+			if (message is ClientMessage.NotHandled notHandled) {
+				appendResponseSource.TrySetResult(HandleNotHandled(notHandled));
+				return;
+			}
+
+			if (!(message is ClientMessage.WriteEventsCompleted completed)) {
+				Logger.Error("Unknown response {response}. Expected {expected}", message.GetType().Name,
+					nameof(ClientMessage.WriteEventsCompleted));
+				appendResponseSource.TrySetResult(RetryAction.Retry);
+				return;
+			}
+
+			appendResponseSource.TrySetResult(HandleWriteEventsCompleted(completed, expectedVersion));
+		}
+	}
+
+	private RetryAction HandleWriteEventsCompleted(ClientMessage.WriteEventsCompleted completed, long expectedVersion) {
+		switch (completed.Result) {
+			case OperationResult.Success:
+				Logger.Debug("Successfully wrote default policy to stream {stream}.", _policyStream);
+				return RetryAction.NoRetry;
+			case OperationResult.PrepareTimeout:
+			case OperationResult.CommitTimeout:
+			case OperationResult.ForwardTimeout:
+				Logger.Error("Timed out while writing default policy to stream {stream}", _policyStream);
+				return RetryAction.Retry;
+			case OperationResult.StreamDeleted:
+				Logger.Error(
+					"Could not write default policy to stream {stream} because it has been deleted", _policyStream);
+				return RetryAction.NoRetry;
+			case OperationResult.WrongExpectedVersion:
+				Logger.Debug(
+					"A policy event already exists in the stream {stream}. Skipping write of the default policy.",
+					_policyStream);
+				return RetryAction.NoRetry;
+			case OperationResult.AccessDenied:
+			case OperationResult.InvalidTransaction:
+			default:
+				Logger.Error("Failed to write default policy to stream {stream} because of unexpected result: {result}",
+					_policyStream, completed.Result);
+				return RetryAction.Retry;
+		}
+	}
+
+	private RetryAction HandleNotHandled(ClientMessage.NotHandled notHandled) {
+		switch (notHandled.Reason) {
+			case ClientMessage.NotHandled.Types.NotHandledReason.IsReadOnly:
+				Logger.Debug("Could not write default policy to stream {stream} as we are readonly",
+					_policyStream);
+				return RetryAction.NoRetry;
+			case ClientMessage.NotHandled.Types.NotHandledReason.NotLeader:
+				Logger.Debug("Could not write default policy to stream {stream} as we are not leader",
+					_policyStream);
+				return RetryAction.Retry;
+			case ClientMessage.NotHandled.Types.NotHandledReason.TooBusy:
+				Logger.Debug("Could not write default policy to stream {stream} as the server is too busy",
+					_policyStream);
+				return RetryAction.Retry;
+			case ClientMessage.NotHandled.Types.NotHandledReason.NotReady:
+				Logger.Debug("Could not write default policy to stream {stream} as the server is not ready",
+					_policyStream);
+				return RetryAction.Retry;
+		}
+
+		return RetryAction.None;
+	}
+
+	private enum RetryAction {
+		None = 0,
+		NoRetry = 1,
+		Retry = 2,
+	}
+}
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin/StreamPrefixRule.cs b/src/KurrentDB.Auth.StreamPolicyPlugin/StreamPrefixRule.cs
new file mode 100644
index 00000000000..f7f50ea1b8f
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin/StreamPrefixRule.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Auth.StreamPolicyPlugin;
+public class StreamPrefixRule {
+	private readonly string _startsWith;
+	private readonly AccessPolicy _streamAccessPolicy;
+
+	public StreamPrefixRule(string startsWith, AccessPolicy streamAccessPolicy) {
+		if (string.IsNullOrEmpty(startsWith))
+			throw new ArgumentNullException(nameof(startsWith));
+		_startsWith = startsWith;
+		_streamAccessPolicy = streamAccessPolicy;
+	}
+
+	public bool TryHandle(string streamId, out AccessPolicy policy) {
+		if (!streamId.StartsWith(_startsWith)) {
+			policy = default!;
+			return false;
+		}
+
+		policy = _streamAccessPolicy;
+		return true;
+	}
+}
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin/sample-requests.http b/src/KurrentDB.Auth.StreamPolicyPlugin/sample-requests.http
new file mode 100644
index 00000000000..ba6909a9a63
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin/sample-requests.http
@@ -0,0 +1,107 @@
+### Configure cluster to use stream policies
+POST https://localhost:2113/streams/$authorization-policy-settings
+Authorization: Basic admin changeit
+Content-Type: application/json
+ES-EventId: 11887e82-9fb4-4112-b937-aea895b32a4a
+ES-EventType: $authorization-policy-changed
+
+{
+    "streamAccessPolicyType": "streampolicy"
+}
+
+### Configure cluster to use acls
+POST https://localhost:2113/streams/$authorization-policy-settings
+Authorization: Basic admin changeit
+Content-Type: application/json
+ES-EventId: d07a6637-d9d0-43b7-8f48-6a9a8800af12
+ES-EventType: $authorization-policy-changed
+
+{
+    "streamAccessPolicyType": "acl"
+}
+
+### GET latest stream policy
+GET https://localhost:2113/streams/$policies/head/backward/1?embed=body
+Accept: application/json
+Authorization: Basic admin changeit
+
+### POST a new stream policy
+POST https://localhost:2113/streams/$policies
+Authorization: Basic admin changeit
+Content-Type: application/json
+ES-EventId: ae819cd9-2909-4023-af1f-9190ff042c2b
+ES-EventType: $policy-updated
+
+{
+    "streamPolicies": {
+        "customPolicy": {
+            "$r": ["$all","ouro"],
+            "$w": ["ouro"],
+            "$d": ["ouro"],
+            "$mr": ["$all","ouro"],
+            "$mw": ["ouro"]
+        },
+        "opsPolicy": {
+            "$r": ["$ops"],
+            "$w": ["$ops"],
+            "$d": ["$admins"],
+            "$mr": ["$ops"],
+            "$mw": ["$admins"]
+        },
+        "publicDefault": {
+            "$r": ["$all"],
+            "$w": ["$all"],
+            "$d": ["$all"],
+            "$mr": ["$all"],
+            "$mw": ["$all"]
+        },
+        "adminsDefault": {
+            "$r": ["$admins"],
+            "$w": ["$admins"],
+            "$d": ["$admins"],
+            "$mr": ["$admins"],
+            "$mw": ["$admins"]
+        },
+        "projectionsDefault": {
+            "$r": ["$all"],
+            "$w": ["$admins"],
+            "$d": ["$admins"],
+            "$mr": ["$all"],
+            "$mw": ["$admins"]
+        }
+    },
+    "streamRules": [
+        {
+            "startsWith": "customer-",
+            "policy": "customPolicy"
+        },
+        {
+            "startsWith": "$scavenges",
+            "policy": "opsPolicy"
+        },
+        {
+            "startsWith": "$et-",
+            "policy": "projectionsDefault"
+        },
+        {
+            "startsWith": "$ce-",
+            "policy": "projectionsDefault"
+        },
+        {
+            "startsWith": "$bc-",
+            "policy": "projectionsDefault"
+        },
+        {
+            "startsWith": "$category-",
+            "policy": "projectionsDefault"
+        },
+        {
+            "startsWith": "$streams",
+            "policy": "projectionsDefault"
+        }
+    ],
+    "defaultStreamRules": {
+        "userStreams": "publicDefault",
+        "systemStreams": "adminsDefault"
+    }
+}
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin/stream-policy-plugin-example.json b/src/KurrentDB.Auth.StreamPolicyPlugin/stream-policy-plugin-example.json
new file mode 100644
index 00000000000..7a408903919
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin/stream-policy-plugin-example.json
@@ -0,0 +1,7 @@
+{
+  "KurrentDB": {
+    "Authorization": {
+      "PolicyType": "streampolicy"
+    }
+  }
+}
diff --git a/src/KurrentDB.Auth.StreamPolicyPlugin/stream-policy-plugin-example.yaml b/src/KurrentDB.Auth.StreamPolicyPlugin/stream-policy-plugin-example.yaml
new file mode 100644
index 00000000000..96daf2649bc
--- /dev/null
+++ b/src/KurrentDB.Auth.StreamPolicyPlugin/stream-policy-plugin-example.yaml
@@ -0,0 +1,2 @@
+Authorization:
+  PolicyType: streampolicy
diff --git a/src/KurrentDB.Auth.UserCertificates.Tests/CertificateExtensionsTests.cs b/src/KurrentDB.Auth.UserCertificates.Tests/CertificateExtensionsTests.cs
new file mode 100644
index 00000000000..72995718e75
--- /dev/null
+++ b/src/KurrentDB.Auth.UserCertificates.Tests/CertificateExtensionsTests.cs
@@ -0,0 +1,112 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+using Xunit;
+
+namespace KurrentDB.Auth.UserCertificates.Tests;
+
+public class CertificateExtensionsTests {
+	private readonly Oid _serverAuth = Oid.FromOidValue("1.3.6.1.5.5.7.3.1", OidGroup.EnhancedKeyUsage);
+	private readonly Oid _clientAuth = Oid.FromOidValue("1.3.6.1.5.5.7.3.2", OidGroup.EnhancedKeyUsage);
+	private const X509KeyUsageFlags DefaultKeyUsages = X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.KeyEncipherment;
+
+	private static X509Certificate2 GenSut(X509KeyUsageFlags keyUsages, OidCollection extendedKeyUsages) {
+		using (RSA rsa = RSA.Create()) {
+			var certReq =
+				new CertificateRequest("CN=hello", rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
+
+			var keyUsageExtension = new X509KeyUsageExtension(keyUsages, false);
+			var extendedKeyUsageExtension = new X509EnhancedKeyUsageExtension(extendedKeyUsages, false);
+
+			certReq.CertificateExtensions.Add(keyUsageExtension);
+
+			if (extendedKeyUsages.Count != 0)
+				certReq.CertificateExtensions.Add(extendedKeyUsageExtension);
+
+			return certReq.CreateSelfSigned(DateTimeOffset.UtcNow.AddMonths(-1),
+				DateTimeOffset.UtcNow.AddMonths(1));
+		}
+	}
+
+	private static OidCollection GenOids(params Oid[] oids) {
+		var oidCollection = new OidCollection();
+		foreach (var oid in oids) {
+			oidCollection.Add(oid);
+		}
+
+		return oidCollection;
+	}
+
+	[Fact]
+	public void certificate_with_client_auth_eku() {
+		var sut = GenSut(
+			keyUsages: DefaultKeyUsages,
+			extendedKeyUsages: GenOids(_clientAuth));
+
+		Assert.True(sut.IsClientCertificate(out _));
+		Assert.False(sut.IsServerCertificate(out _));
+	}
+
+	[Fact]
+	public void certificate_with_client_and_server_auth_eku() {
+		var sut = GenSut(
+			keyUsages: DefaultKeyUsages,
+			extendedKeyUsages: GenOids(_clientAuth, _serverAuth));
+
+		Assert.True(sut.IsServerCertificate(out _));
+		Assert.True(sut.IsClientCertificate(out _));
+	}
+
+	[Fact]
+	public void certificate_with_server_auth_eku_only() {
+		var sut = GenSut(
+			keyUsages: DefaultKeyUsages,
+			extendedKeyUsages: GenOids(_serverAuth));
+
+		// historically, server certificates also have the clientAuth EKU
+		Assert.False(sut.IsServerCertificate(out _));
+		Assert.False(sut.IsClientCertificate(out _));
+	}
+
+	[Fact]
+	public void certificate_with_no_ekus() {
+		var sut = GenSut(
+			keyUsages: DefaultKeyUsages,
+			extendedKeyUsages: GenOids());
+
+		Assert.True(sut.IsServerCertificate(out _));
+		Assert.False(sut.IsClientCertificate(out _));
+	}
+
+	[Fact]
+	public void certificate_with_no_key_usage() {
+		var sut = GenSut(
+			keyUsages: X509KeyUsageFlags.None,
+			extendedKeyUsages: GenOids(_clientAuth, _serverAuth));
+
+		Assert.False(sut.IsClientCertificate(out _));
+		Assert.False(sut.IsServerCertificate(out _));
+	}
+
+	[Fact]
+	public void certificate_with_missing_key_usage() {
+		var sut = GenSut(
+			keyUsages: X509KeyUsageFlags.KeyEncipherment,
+			extendedKeyUsages: GenOids(_clientAuth, _serverAuth));
+
+		Assert.False(sut.IsClientCertificate(out _));
+		Assert.False(sut.IsServerCertificate(out _));
+	}
+
+	[Fact]
+	public void certificate_with_key_agreement_instead_of_key_encipherment_key_usage() {
+		var sut = GenSut(
+			keyUsages: X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.KeyAgreement,
+			extendedKeyUsages: GenOids(_clientAuth, _serverAuth));
+
+		Assert.True(sut.IsClientCertificate(out _));
+		Assert.True(sut.IsServerCertificate(out _));
+	}
+}
diff --git a/src/KurrentDB.Auth.UserCertificates.Tests/FakeAnonymousHttpAuthenticationProvider.cs b/src/KurrentDB.Auth.UserCertificates.Tests/FakeAnonymousHttpAuthenticationProvider.cs
new file mode 100644
index 00000000000..8a1544eeb5b
--- /dev/null
+++ b/src/KurrentDB.Auth.UserCertificates.Tests/FakeAnonymousHttpAuthenticationProvider.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Claims;
+using EventStore.Plugins.Authentication;
+using Microsoft.AspNetCore.Http;
+
+namespace KurrentDB.Auth.UserCertificates.Tests;
+
+// grants anonymous claims to anyone
+internal class FakeAnonymousHttpAuthenticationProvider : IHttpAuthenticationProvider {
+	public static readonly ClaimsPrincipal Anonymous = new(new ClaimsIdentity(new Claim[] { new(ClaimTypes.Anonymous, ""), }));
+	public string Name => "anonymous";
+
+	public bool Authenticate(HttpContext context, out HttpAuthenticationRequest request) {
+		request = new HttpAuthenticationRequest(context, "", "");
+		request.Authenticated(Anonymous);
+		return true;
+	}
+}
diff --git a/src/KurrentDB.Auth.UserCertificates.Tests/FakeAuthenticationHandler.cs b/src/KurrentDB.Auth.UserCertificates.Tests/FakeAuthenticationHandler.cs
new file mode 100644
index 00000000000..59b9796f6af
--- /dev/null
+++ b/src/KurrentDB.Auth.UserCertificates.Tests/FakeAuthenticationHandler.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text.Encodings.Web;
+using EventStore.Plugins.Authentication;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace KurrentDB.Auth.UserCertificates.Tests;
+
+// authenticates according to the httpAuthenticationProviders
+// similar to KurrentDB.Core.Services.Transport.Http.AuthenticationMiddleware
+public class FakeAuthenticationHandler(
+	IOptionsMonitor<AuthenticationSchemeOptions> options,
+	IReadOnlyList<IHttpAuthenticationProvider> httpAuthenticationProviders,
+	ILoggerFactory logger,
+	UrlEncoder encoder)
+	: AuthenticationHandler<AuthenticationSchemeOptions>(options, logger, encoder) {
+
+	protected override async Task<AuthenticateResult> HandleAuthenticateAsync() {
+		if (!TrySelectProvider(Context, out var authenticationRequest)) {
+			return AuthenticateResult.Fail("No provider");
+		}
+
+		var (status, principal) = await authenticationRequest!.AuthenticateAsync();
+
+		if (status != HttpAuthenticationRequestStatus.Authenticated) {
+			return AuthenticateResult.Fail("Not authenticated");
+		}
+
+		var ticket = new AuthenticationTicket(
+			principal: principal!,
+			authenticationScheme: "fake");
+
+		return AuthenticateResult.Success(ticket);
+	}
+
+	private bool TrySelectProvider(HttpContext context, out HttpAuthenticationRequest? authenticationRequest) {
+		foreach (var provider in httpAuthenticationProviders) {
+			if (provider.Authenticate(context, out authenticationRequest)) {
+				return true;
+			}
+		}
+
+		authenticationRequest = default;
+		return false;
+	}
+}
diff --git a/src/KurrentDB.Auth.UserCertificates.Tests/FakeAuthenticationProvider.cs b/src/KurrentDB.Auth.UserCertificates.Tests/FakeAuthenticationProvider.cs
new file mode 100644
index 00000000000..10a5923ed36
--- /dev/null
+++ b/src/KurrentDB.Auth.UserCertificates.Tests/FakeAuthenticationProvider.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Claims;
+using EventStore.Plugins.Authentication;
+
+namespace KurrentDB.Auth.UserCertificates.Tests;
+
+// pretends any user that the valid certificate names is in the database
+internal class FakeAuthenticationProvider(string scheme) : AuthenticationProviderBase(name: "fake") {
+	public override void Authenticate(AuthenticationRequest authenticationRequest) {
+		if (!authenticationRequest.HasValidClientCertificate) {
+			authenticationRequest.Unauthorized();
+			return;
+		}
+
+		authenticationRequest.Authenticated(new ClaimsPrincipal(new ClaimsIdentity(
+			new[] {
+				new Claim(ClaimTypes.Name, authenticationRequest.Name),
+			},
+			"fake")));
+	}
+
+	public override IReadOnlyList<string> GetSupportedAuthenticationSchemes() => [scheme];
+}
diff --git a/src/KurrentDB.Auth.UserCertificates.Tests/FakeLogger.cs b/src/KurrentDB.Auth.UserCertificates.Tests/FakeLogger.cs
new file mode 100644
index 00000000000..aec10f8ee51
--- /dev/null
+++ b/src/KurrentDB.Auth.UserCertificates.Tests/FakeLogger.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using Serilog;
+using Serilog.Events;
+
+namespace KurrentDB.Auth.UserCertificates.Tests;
+
+public class FakeLogger : ILogger {
+	public List<LogEvent> LogMessages { get; } = new();
+
+	public void Write(LogEvent logEvent) {
+		LogMessages.Add(logEvent);
+	}
+}
diff --git a/src/KurrentDB.Auth.UserCertificates.Tests/FindRootsTests.cs b/src/KurrentDB.Auth.UserCertificates.Tests/FindRootsTests.cs
new file mode 100644
index 00000000000..2e807081a66
--- /dev/null
+++ b/src/KurrentDB.Auth.UserCertificates.Tests/FindRootsTests.cs
@@ -0,0 +1,196 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+using Xunit;
+using static KurrentDB.Auth.UserCertificates.Tests.TestUtils;
+
+namespace KurrentDB.Auth.UserCertificates.Tests;
+
+public class FindRootsTests {
+	private static string[] FindRoots(X509Certificate2 leaf, X509Certificate2[]? intermediates, X509Certificate2[]? roots) {
+		var intermediatesCollection = intermediates is null ? null : new X509Certificate2Collection(intermediates);
+		var rootsCollection = roots is null ? null : new X509Certificate2Collection(roots);
+		var rootCAs = CertificateUtils
+			.FindRoots(
+				leaf,
+				intermediatesCollection,
+				rootsCollection)
+			.Select(x => x.Thumbprint)
+			.Order()
+			.ToArray();
+
+		// verify that the collections haven't changed
+		if (intermediates != null)
+			Assert.Equal(new X509Certificate2Collection(intermediates), intermediatesCollection);
+
+		if (roots != null)
+			Assert.Equal(new X509Certificate2Collection(roots), rootsCollection);
+
+		return rootCAs;
+	}
+
+	[Fact]
+	public void with_untrusted_self_signed() {
+		var someRoot = CreateCertificate(ca: true);
+		var leaf = CreateCertificate(ca: false, parent: null);
+		Assert.Empty(
+			FindRoots(leaf, null, [someRoot]));
+	}
+
+	[Fact]
+	public void with_trusted_self_signed() {
+		var someRoot = CreateCertificate(ca: true);
+		var leaf = CreateCertificate(ca: false, parent: null);
+		Assert.Equal(
+			[leaf.Thumbprint],
+			FindRoots(leaf, null, [leaf, someRoot]));
+	}
+
+	[Fact]
+	public void with_root() {
+		var root = CreateCertificate(ca: true);
+		var leaf = CreateCertificate(ca: false, parent: root);
+		Assert.Equal(
+			[root.Thumbprint],
+			FindRoots(leaf, null, [root]));
+	}
+
+	[Fact]
+	public void with_root_having_same_issuer_name_but_different_keypair() {
+		var root = CreateCertificate(ca: true, subject: "CN=root");
+		var differentRoot = CreateCertificate(ca: true, subject: "CN=root");
+		var leaf = CreateCertificate(ca: false, parent: root);
+		Assert.Equal(
+			[root.Thumbprint],
+			FindRoots(leaf, null, [root, differentRoot]));
+	}
+
+	[Fact]
+	public void with_expired_root() {
+		var root = CreateCertificate(ca: true, expired: true);
+		var leaf = CreateCertificate(ca: false, parent: root);
+		Assert.Empty(
+			FindRoots(leaf, null, [root]));
+	}
+
+	[Fact]
+	public void with_intermediate() {
+		var root = CreateCertificate(ca: true);
+		var intermediate = CreateCertificate(ca: true, parent: root);
+		var leaf = CreateCertificate(ca: false, parent: intermediate);
+		Assert.Equal(
+			[root.Thumbprint],
+			FindRoots(leaf, [intermediate], [root]));
+	}
+
+	[Fact]
+	public void with_expired_intermediate() {
+		var root = CreateCertificate(ca: true);
+		var intermediate = CreateCertificate(ca: true, parent: root, expired: true);
+		var leaf = CreateCertificate(ca: false, parent: intermediate);
+		Assert.Empty(
+			FindRoots(leaf, [intermediate], [root]));
+	}
+
+	[Fact]
+	public void with_expired_leaf() {
+		var root = CreateCertificate(ca: true);
+		var intermediate = CreateCertificate(ca: true, parent: root);
+		var leaf = CreateCertificate(ca: false, parent: intermediate, expired: true);
+		Assert.Empty(
+			FindRoots(leaf, [intermediate], [root]));
+	}
+
+	[Fact]
+	public void with_two_equivalent_roots() {
+		using var rsa = RSA.Create();
+		var root1 = CreateCertificate(ca: true, subject: "CN=root", keyPair: rsa);
+		var root2 = CreateCertificate(ca: true, subject: "CN=root", keyPair: rsa);
+		var leaf = CreateCertificate(ca: false, parent: root1);
+
+		Assert.Equal(
+			new[] { root1.Thumbprint, root2.Thumbprint }.Order(),
+			FindRoots(leaf, null, [root1, root2]));
+	}
+
+	[Fact]
+	public void with_two_equivalent_roots_and_intermediates() {
+		using var rootRsa = RSA.Create();
+		var root1 = CreateCertificate(ca: true, subject: "CN=root", keyPair: rootRsa);
+		var root2 = CreateCertificate(ca: true, subject: "CN=root", keyPair: rootRsa);
+
+		using var intermediateRsa = RSA.Create();
+		var intermediate1 = CreateCertificate(ca: true, parent: root1, subject: "CN=intermediate",
+			keyPair: intermediateRsa);
+		var intermediate2 = CreateCertificate(ca: true, parent: root2, subject: "CN=intermediate",
+			keyPair: intermediateRsa);
+
+		var leaf = CreateCertificate(ca: false, parent: intermediate1);
+
+		Assert.Equal(
+			new[] { root1.Thumbprint, root2.Thumbprint }.Order(),
+			FindRoots(leaf, [intermediate1, intermediate2], [root1, root2]));
+	}
+
+	// https://github.com/dotnet/runtime/issues/98921
+	[Fact(Skip = "failing on linux due to the above issue")]
+	public void with_two_different_roots_but_equivalent_intermediates() {
+		var root1 = CreateCertificate(ca: true, subject: "CN=root1");
+		var root2 = CreateCertificate(ca: true, subject: "CN=root2");
+
+		using var intermediateRsa = RSA.Create();
+		var intermediate1 = CreateCertificate(ca: true, parent: root1, subject: "CN=intermediate",
+			keyPair: intermediateRsa);
+		var intermediate2 = CreateCertificate(ca: true, parent: root2, subject: "CN=intermediate",
+			keyPair: intermediateRsa);
+
+		var leaf = CreateCertificate(ca: false, parent: intermediate1);
+
+		Assert.Equal(
+			new[] { root1.Thumbprint, root2.Thumbprint }.Order(),
+			FindRoots(leaf, [intermediate1, intermediate2], [root1, root2]));
+	}
+
+	[Fact]
+	public void with_cycle_between_leaf_and_root() {
+		using var rootRsa = RSA.Create();
+		using var leafRsa = RSA.Create();
+		const string leafSubject = "CN=leaf";
+
+		var root = CreateCertificate(
+			ca: true,
+			subject: GenerateSubject(),
+			keyPair: rootRsa,
+			parentInfo: (leafRsa, new X500DistinguishedName(leafSubject)),
+			expired: false);
+
+		var intermediate = CreateCertificate(ca: true, parent: root);
+		var leaf = CreateCertificate(ca: false, parent: intermediate, subject: leafSubject, keyPair: leafRsa);
+
+		Assert.Empty(
+			FindRoots(leaf, [intermediate], [root]));
+	}
+
+	[Fact]
+	public void with_cycle_between_intermediate_and_root() {
+		using var rootRsa = RSA.Create();
+		using var intermediateRsa = RSA.Create();
+		const string intermediateSubject = "CN=intermediate";
+
+		var root = CreateCertificate(
+			ca: true,
+			subject: GenerateSubject(),
+			keyPair: rootRsa,
+			parentInfo: (intermediateRsa, new X500DistinguishedName(intermediateSubject)),
+			expired: false);
+
+		var intermediate = CreateCertificate(ca: true, subject: intermediateSubject, parent: root,
+			keyPair: intermediateRsa);
+		var leaf = CreateCertificate(ca: false, parent: intermediate);
+
+		Assert.Empty(
+			FindRoots(leaf, [intermediate], [root]));
+	}
+}
diff --git a/src/KurrentDB.Auth.UserCertificates.Tests/KurrentDB.Auth.UserCertificates.Tests.csproj b/src/KurrentDB.Auth.UserCertificates.Tests/KurrentDB.Auth.UserCertificates.Tests.csproj
new file mode 100644
index 00000000000..1cd6a9b4aaf
--- /dev/null
+++ b/src/KurrentDB.Auth.UserCertificates.Tests/KurrentDB.Auth.UserCertificates.Tests.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<IsPackable>false</IsPackable>
+		<IsPublishable>false</IsPublishable>
+		<IsTestProject>true</IsTestProject>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="coverlet.collector" Version="6.0.3" />
+		<PackageReference Include="FluentAssertions" Version="6.12.2" />
+		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+		<PackageReference Include="xunit" Version="2.9.2"/>
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.Auth.UserCertificates\KurrentDB.Auth.UserCertificates.csproj" />
+	</ItemGroup>
+
+</Project>
diff --git a/src/KurrentDB.Auth.UserCertificates.Tests/ShareARootTests.cs b/src/KurrentDB.Auth.UserCertificates.Tests/ShareARootTests.cs
new file mode 100644
index 00000000000..035c7e05657
--- /dev/null
+++ b/src/KurrentDB.Auth.UserCertificates.Tests/ShareARootTests.cs
@@ -0,0 +1,185 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+using Xunit;
+using static KurrentDB.Auth.UserCertificates.Tests.TestUtils;
+
+namespace KurrentDB.Auth.UserCertificates.Tests;
+
+public class ShareARootTests {
+	private static bool ShareARoot(
+		X509Certificate2 leaf1,
+		X509Certificate2 leaf2,
+		X509Certificate2[]? intermediates,
+		X509Certificate2[]? roots) =>
+		CertificateUtils.ShareARoot(
+			leaf1,
+			leaf2,
+			intermediates is null ? null : new(intermediates),
+			roots is null ? null : new(roots),
+			out _,
+			out _);
+
+	[Fact]
+	public void with_same_root() {
+		var root = CreateCertificate(ca: true);
+		var leaf1 = CreateCertificate(ca: false, parent: root);
+		var leaf2 = CreateCertificate(ca: false, parent: root);
+		Assert.True(ShareARoot(leaf1, leaf2, null, [root]));
+	}
+
+	[Fact]
+	public void with_same_self_signed_root() {
+		var selfSignedLeaf = CreateCertificate(ca: true, parent: null);
+		var otherLeaf = CreateCertificate(ca: false, parent: selfSignedLeaf);
+		Assert.True(ShareARoot(selfSignedLeaf, otherLeaf, null, [selfSignedLeaf]));
+	}
+
+	[Fact]
+	public void with_different_root() {
+		var root1 = CreateCertificate(ca: true);
+		var root2 = CreateCertificate(ca: true);
+		var leaf1 = CreateCertificate(ca: false, parent: root1);
+		var leaf2 = CreateCertificate(ca: false, parent: root2);
+		Assert.False(ShareARoot(leaf1, leaf2, null, [root1, root2]));
+	}
+
+	[Fact]
+	public void with_expired_root() {
+		var root = CreateCertificate(ca: true, expired: true);
+		var leaf1 = CreateCertificate(ca: false, parent: root);
+		var leaf2 = CreateCertificate(ca: false, parent: root);
+		Assert.False(ShareARoot(leaf1, leaf2, null, [root]));
+	}
+
+	[Fact]
+	public void with_same_root_and_intermediate() {
+		var root = CreateCertificate(ca: true);
+		var intermediate = CreateCertificate(ca: true, parent: root);
+		var leaf1 = CreateCertificate(ca: false, parent: intermediate);
+		var leaf2 = CreateCertificate(ca: false, parent: intermediate);
+		Assert.True(ShareARoot(leaf1, leaf2, [intermediate], [root]));
+	}
+
+	[Fact]
+	public void with_same_root_and_expired_intermediate() {
+		var root = CreateCertificate(ca: true);
+		var intermediate = CreateCertificate(ca: true, parent: root, expired: true);
+		var leaf1 = CreateCertificate(ca: false, parent: intermediate);
+		var leaf2 = CreateCertificate(ca: false, parent: intermediate);
+		Assert.False(ShareARoot(leaf1, leaf2, [intermediate], [root]));
+	}
+
+	[Fact]
+	public void with_same_root_but_different_intermediate() {
+		var root = CreateCertificate(ca: true);
+		var intermediate1 = CreateCertificate(ca: true, parent: root);
+		var intermediate2 = CreateCertificate(ca: true, parent: root);
+		var leaf1 = CreateCertificate(ca: false, parent: intermediate1);
+		var leaf2 = CreateCertificate(ca: false, parent: intermediate2);
+		Assert.True(ShareARoot(leaf1, leaf2, [intermediate1, intermediate2], [root]));
+	}
+
+	[Fact]
+	public void with_equivalent_roots() {
+		using var rsa = RSA.Create();
+		var root1 = CreateCertificate(ca: true, subject: "CN=root", keyPair: rsa);
+		var root2 = CreateCertificate(ca: true, subject: "CN=root", keyPair: rsa);
+		var leaf1 = CreateCertificate(ca: false, parent: root1);
+		var leaf2 = CreateCertificate(ca: false, parent: root2);
+		Assert.True(ShareARoot(leaf1, leaf2, null, [root1, root2]));
+	}
+
+	[Fact]
+	public void with_equivalent_roots_and_intermediates() {
+		using var rootRsa = RSA.Create();
+		var root1 = CreateCertificate(ca: true, subject: "CN=root", keyPair: rootRsa);
+		var root2 = CreateCertificate(ca: true, subject: "CN=root", keyPair: rootRsa);
+
+		using var intermediateRsa = RSA.Create();
+		var intermediate1 = CreateCertificate(ca: true, parent: root1, subject: "CN=intermediate",
+			keyPair: intermediateRsa);
+		var intermediate2 = CreateCertificate(ca: true, parent: root2, subject: "CN=intermediate",
+			keyPair: intermediateRsa);
+
+		var leaf1 = CreateCertificate(ca: false, parent: intermediate1);
+		var leaf2 = CreateCertificate(ca: false, parent: intermediate2);
+
+		Assert.True(ShareARoot(leaf1, leaf2, [intermediate1, intermediate2], [root1, root2]));
+	}
+
+	[Fact]
+	public void with_equivalent_roots_and_intermediates_but_some_have_expired() {
+		using var rootRsa = RSA.Create();
+		var root1 = CreateCertificate(ca: true, subject: "CN=root", keyPair: rootRsa);
+		var root2 = CreateCertificate(ca: true, subject: "CN=root", keyPair: rootRsa, expired: true);
+
+		using var intermediateRsa = RSA.Create();
+		var intermediate1 = CreateCertificate(ca: true, parent: root1, subject: "CN=intermediate",
+			keyPair: intermediateRsa, expired: true);
+		var intermediate2 = CreateCertificate(ca: true, parent: root2, subject: "CN=intermediate",
+			keyPair: intermediateRsa);
+
+		var leaf1 = CreateCertificate(ca: false, parent: intermediate1);
+		var leaf2 = CreateCertificate(ca: false, parent: intermediate2);
+
+		Assert.True(ShareARoot(leaf1, leaf2, [intermediate1, intermediate2], [root1, root2]));
+	}
+
+	[Fact]
+	public void with_equivalent_roots_and_intermediates_but_all_have_expired() {
+		using var rootRsa = RSA.Create();
+		var root1 = CreateCertificate(ca: true, subject: "CN=root", keyPair: rootRsa, expired: true);
+		var root2 = CreateCertificate(ca: true, subject: "CN=root", keyPair: rootRsa, expired: true);
+
+		using var intermediateRsa = RSA.Create();
+		var intermediate1 = CreateCertificate(ca: true, parent: root1, subject: "CN=intermediate",
+			keyPair: intermediateRsa, expired: true);
+		var intermediate2 = CreateCertificate(ca: true, parent: root2, subject: "CN=intermediate",
+			keyPair: intermediateRsa, expired: true);
+
+		var leaf1 = CreateCertificate(ca: false, parent: intermediate1);
+		var leaf2 = CreateCertificate(ca: false, parent: intermediate2);
+
+		Assert.False(ShareARoot(leaf1, leaf2, [intermediate1, intermediate2], [root1, root2]));
+	}
+
+	[Fact]
+	public void with_a_shared_root_and_a_non_shared_root() {
+		var root1 = CreateCertificate(ca: true, subject: "CN=root1");
+		var root2 = CreateCertificate(ca: true, subject: "CN=root2");
+
+		using var intermediateRsa = RSA.Create();
+		var intermediate1a = CreateCertificate(ca: true, parent: root1, subject: "CN=intermediate1",
+			keyPair: intermediateRsa);
+		var intermediate1b = CreateCertificate(ca: true, parent: root2, subject: "CN=intermediate1",
+			keyPair: intermediateRsa);
+		var intermediate2 = CreateCertificate(ca: true, parent: root1, subject: "CN=intermediate2");
+
+		var leaf1 = CreateCertificate(ca: false, parent: intermediate1a);
+		var leaf2 = CreateCertificate(ca: false, parent: intermediate2);
+
+		Assert.True(ShareARoot(leaf1, leaf2, [intermediate1a, intermediate1b, intermediate2], [root1, root2]));
+	}
+
+
+	[Fact]
+	public void with_a_shared_root_having_an_expired_chain_and_a_non_shared_root() {
+		var root1 = CreateCertificate(ca: true, subject: "CN=root1");
+		var root2 = CreateCertificate(ca: true, subject: "CN=root2");
+
+		using var intermediateRsa = RSA.Create();
+		var intermediate1a = CreateCertificate(ca: true, parent: root1, subject: "CN=intermediate1",
+			keyPair: intermediateRsa, expired: true);
+		var intermediate1b = CreateCertificate(ca: true, parent: root2, subject: "CN=intermediate1",
+			keyPair: intermediateRsa);
+		var intermediate2 = CreateCertificate(ca: true, parent: root1, subject: "CN=intermediate2");
+
+		var leaf1 = CreateCertificate(ca: false, parent: intermediate1a);
+		var leaf2 = CreateCertificate(ca: false, parent: intermediate2);
+
+		Assert.False(ShareARoot(leaf1, leaf2, [intermediate1a, intermediate1b, intermediate2], [root1, root2]));
+	}
+}
diff --git a/src/KurrentDB.Auth.UserCertificates.Tests/TestUtils.cs b/src/KurrentDB.Auth.UserCertificates.Tests/TestUtils.cs
new file mode 100644
index 00000000000..f5bc823f8cf
--- /dev/null
+++ b/src/KurrentDB.Auth.UserCertificates.Tests/TestUtils.cs
@@ -0,0 +1,131 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+using System.Text;
+
+namespace KurrentDB.Auth.UserCertificates.Tests;
+
+public static class TestUtils {
+	private static readonly Random Random = new();
+	private static string GetCharset() {
+		var charset = "";
+		for (var c = 'a'; c <= 'z'; c++) {
+			charset += c;
+		}
+		for (var c = 'A'; c <= 'Z'; c++) {
+			charset += c;
+		}
+		for (var c = '0'; c <= '9'; c++) {
+			charset += c;
+		}
+		return charset;
+	}
+
+	public static string GenerateSubject() {
+		var charset = GetCharset();
+		string s = "";
+		for (var j = 0; j < 10; j++) {
+			s += charset[Random.Next() % charset.Length];
+		}
+
+		return $"CN={s}";
+	}
+
+	private static byte[] GenerateSerialNumber() {
+		var charset = GetCharset();
+		string s = "";
+		for (var j = 0; j < 10; j++) {
+			s += charset[Random.Next() % charset.Length];
+		}
+
+		var utf8Encoding = new UTF8Encoding(false);
+		return utf8Encoding.GetBytes(s);
+	}
+
+	public static X509Certificate2 CreateCertificate(
+		bool ca,
+		RSA keyPair,
+		string subject,
+		(RSA keyPair, X500DistinguishedName subjectName)? parentInfo,
+		bool expired,
+		bool unready,
+		bool serverAuthEKU,
+		bool clientAuthEKU) {
+
+		var certReq = new CertificateRequest(subject, keyPair, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
+
+		var now = DateTimeOffset.UtcNow;
+		now = new DateTime(now.Year, now.Month, now.Day); // round to nearest day
+		var startDate = !unready ? now.AddMonths(-1) : now.AddDays(1);
+		var endDate = !expired ? now.AddMonths(1) : now.AddDays(-1);
+
+		if (ca) {
+			certReq.CertificateExtensions.Add(new X509BasicConstraintsExtension(
+				certificateAuthority: true,
+				hasPathLengthConstraint: false,
+				pathLengthConstraint: 0,
+				critical: true));
+		}
+
+		if (serverAuthEKU || clientAuthEKU) {
+			certReq.CertificateExtensions.Add(new X509KeyUsageExtension(
+				keyUsages: X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.KeyEncipherment,
+				critical: false));
+
+			var oids = new OidCollection();
+
+			if (serverAuthEKU)
+				oids.Add(new Oid("1.3.6.1.5.5.7.3.1"));
+
+			if (clientAuthEKU)
+				oids.Add(new Oid("1.3.6.1.5.5.7.3.2"));
+
+			certReq.CertificateExtensions.Add(new X509EnhancedKeyUsageExtension(oids, critical: false));
+		}
+
+		if (parentInfo == null) {
+			return certReq.CreateSelfSigned(startDate, endDate);
+		}
+
+		var parentKey = parentInfo.Value.keyPair;
+		var signatureGenerator = X509SignatureGenerator.CreateForRSA(parentKey!, RSASignaturePadding.Pkcs1);
+		return certReq.Create(parentInfo.Value.subjectName, signatureGenerator, startDate, endDate, GenerateSerialNumber()).CopyWithPrivateKey(keyPair);
+	}
+
+	public static X509Certificate2 CreateCertificate(
+		bool ca,
+		RSA keyPair,
+		string subject,
+		(RSA keyPair, X500DistinguishedName subjectName)? parentInfo,
+		bool expired,
+		bool serverAuthEKU = false,
+		bool clientAuthEKU = false) =>
+
+		CreateCertificate(
+			ca, keyPair, subject, parentInfo, expired,
+			unready: false, serverAuthEKU: serverAuthEKU, clientAuthEKU: clientAuthEKU);
+
+	public static X509Certificate2 CreateCertificate(
+		bool ca = false,
+		X509Certificate2? parent = null,
+		bool expired = false,
+		string? subject = null,
+		RSA? keyPair = null,
+		bool serverAuthEKU = false,
+		bool clientAuthEKU = false) {
+
+		using var rsa = RSA.Create();
+		subject ??= GenerateSubject();
+
+		(RSA, X500DistinguishedName)? parentInfo = null;
+		if (parent != null) {
+			parentInfo = (parent.GetRSAPrivateKey()!, parent.SubjectName);
+		}
+
+		return CreateCertificate(ca, keyPair ?? rsa, subject, parentInfo, expired,
+			serverAuthEKU: serverAuthEKU,
+			clientAuthEKU: clientAuthEKU);
+	}
+}
diff --git a/src/KurrentDB.Auth.UserCertificates.Tests/UserCertificateAuthenticationProviderTests.cs b/src/KurrentDB.Auth.UserCertificates.Tests/UserCertificateAuthenticationProviderTests.cs
new file mode 100644
index 00000000000..41ba2999e49
--- /dev/null
+++ b/src/KurrentDB.Auth.UserCertificates.Tests/UserCertificateAuthenticationProviderTests.cs
@@ -0,0 +1,191 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+using Microsoft.AspNetCore.Connections;
+using Microsoft.AspNetCore.Connections.Features;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
+using Xunit;
+
+namespace KurrentDB.Auth.UserCertificates.Tests;
+
+public class UserCertificateAuthenticationProviderTests {
+	private readonly X509Certificate2 _root, _intermediate, _node;
+	private readonly UserCertificateAuthenticationProvider _provider;
+
+	public UserCertificateAuthenticationProviderTests() {
+		_root = CreateRoot();
+		_intermediate = CreateIntermediate(parent: _root);
+		_node = CreateNode(parent: _intermediate);
+		_provider = new UserCertificateAuthenticationProvider(
+			authenticationProvider: new FakeAuthenticationProvider("UserCertificate"),
+			getCertificates: () => (
+				Node: _node,
+				Intermediates: new X509Certificate2Collection(_intermediate),
+				Roots: new X509Certificate2Collection(_root)),
+			configuration: new ConfigurationBuilder().Build());
+	}
+
+	private static X509Certificate2 CreateCertificate(
+		bool ca = false,
+		X509Certificate2? parent = null,
+		bool expired = false,
+		bool unready = false,
+		string? subject = null,
+		bool serverAuthEKU = false,
+		bool clientAuthEKU = false) {
+		using var rsa = RSA.Create();
+		subject ??= TestUtils.GenerateSubject();
+
+		(RSA, X500DistinguishedName)? parentInfo = null;
+		if (parent != null) {
+			parentInfo = (parent.GetRSAPrivateKey()!, parent.SubjectName);
+		}
+
+		return TestUtils.CreateCertificate(ca, rsa, subject, parentInfo, expired, unready,
+			serverAuthEKU: serverAuthEKU, clientAuthEKU: clientAuthEKU);
+	}
+
+	private static X509Certificate2 CreateRoot() =>
+		CreateCertificate(ca: true, parent: null);
+
+	private static X509Certificate2 CreateIntermediate(X509Certificate2 parent) =>
+		CreateCertificate(ca: true, parent: parent);
+
+	private static X509Certificate2 CreateNode(X509Certificate2 parent) =>
+		CreateCertificate(
+			parent: parent,
+			serverAuthEKU: true,
+			clientAuthEKU: true);
+
+	private static X509Certificate2 CreateClient(X509Certificate2 parent, string userId,
+		bool expired = false, bool unready = false) =>
+
+		CreateCertificate(
+			parent: parent,
+			subject: $"CN={userId}",
+			serverAuthEKU: false,
+			clientAuthEKU: true,
+			expired: expired,
+			unready: unready);
+
+	private static X509Certificate2 CreateClientNoEKU(X509Certificate2 parent, string userId) =>
+		CreateCertificate(
+			parent: parent,
+			subject: $"CN={userId}",
+			serverAuthEKU: false,
+			clientAuthEKU: false);
+
+	[Fact]
+	public void with_no_user_certificate() {
+		Assert.False(_provider.Authenticate(new DefaultHttpContext(), out _));
+	}
+
+	[Fact]
+	public void with_proper_user_certificate() {
+		var ctx = new DefaultHttpContext {
+			Connection = {
+				ClientCertificate = CreateClient(_root, "bob")
+			}
+		};
+
+		Assert.True(_provider.Authenticate(ctx, out _));
+	}
+
+	[Fact]
+	public void with_user_certificate_having_different_root_ca_than_node() {
+		var ctx = new DefaultHttpContext {
+			Connection = {
+				ClientCertificate = CreateClient(CreateRoot(), "bob")
+			}
+		};
+
+		Assert.False(_provider.Authenticate(ctx, out _));
+	}
+
+	[Fact]
+	public void with_user_certificate_having_no_client_auth_eku() {
+		var ctx = new DefaultHttpContext {
+			Connection = {
+				ClientCertificate = CreateClientNoEKU(_root, "bob")
+			}
+		};
+
+		Assert.False(_provider.Authenticate(ctx, out _));
+	}
+
+	[Fact]
+	public void with_user_certificate_having_both_server_and_client_auth_eku() {
+		var ctx = new DefaultHttpContext {
+			Connection = {
+				ClientCertificate = CreateNode(_root)
+			}
+		};
+
+		Assert.False(_provider.Authenticate(ctx, out _));
+	}
+
+	[Fact]
+	public void with_expired_user_certificate() {
+		var ctx = new DefaultHttpContext {
+			Connection = {
+				ClientCertificate = CreateClient(_root, "bob", expired: true)
+			}
+		};
+
+		Assert.False(_provider.Authenticate(ctx, out _));
+	}
+
+	[Fact]
+	public void with_unready_user_certificate() {
+		var ctx = new DefaultHttpContext {
+			Connection = {
+				ClientCertificate = CreateClient(_root, "bob", unready: true)
+			}
+		};
+
+		Assert.False(_provider.Authenticate(ctx, out _));
+	}
+
+	[Fact]
+	public void with_proper_user_certificate_and_cache() {
+		var ctx = new DefaultHttpContext {
+			Connection = {
+				ClientCertificate = CreateClient(_root, "bob")
+			}
+		};
+		ctx.Features.Set<IConnectionItemsFeature>(new DefaultConnectionContext());
+
+		Assert.True(_provider.Authenticate(ctx, out _));
+
+		var items = ctx.Features.Get<IConnectionItemsFeature>()?.Items;
+		Assert.NotNull(items);
+		Assert.True(items.TryGetValue("UserCertificateAuthenticationStatus", out var cachedValue));
+		var (authenticated, userId) = Assert.IsType<(bool, string)>(cachedValue);
+		Assert.True(authenticated);
+		Assert.Equal("bob", userId);
+		Assert.True(_provider.Authenticate(ctx, out _));
+	}
+
+	[Fact]
+	public void with_invalid_user_certificate_and_cache() {
+		var ctx = new DefaultHttpContext {
+			Connection = {
+				ClientCertificate = CreateNode(parent: _root)
+			}
+		};
+		ctx.Features.Set<IConnectionItemsFeature>(new DefaultConnectionContext());
+
+		Assert.False(_provider.Authenticate(ctx, out _));
+
+		var items = ctx.Features.Get<IConnectionItemsFeature>()?.Items;
+		Assert.NotNull(items);
+		Assert.True(items.TryGetValue("UserCertificateAuthenticationStatus", out var cachedValue));
+		var (authenticated, userId) = Assert.IsType<(bool, string)>(cachedValue);
+		Assert.False(authenticated);
+		Assert.Null(userId);
+		Assert.False(_provider.Authenticate(ctx, out _));
+	}
+}
diff --git a/src/KurrentDB.Auth.UserCertificates.Tests/UserCertificatesPluginTests.cs b/src/KurrentDB.Auth.UserCertificates.Tests/UserCertificatesPluginTests.cs
new file mode 100644
index 00000000000..1055f9932ba
--- /dev/null
+++ b/src/KurrentDB.Auth.UserCertificates.Tests/UserCertificatesPluginTests.cs
@@ -0,0 +1,261 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net;
+using System.Security.Cryptography.X509Certificates;
+using EventStore.Plugins;
+using EventStore.Plugins.Authentication;
+using EventStore.Plugins.Diagnostics;
+using EventStore.Plugins.Licensing;
+using FluentAssertions;
+using KurrentDB.Plugins.TestHelpers;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Server.Kestrel.Https;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace KurrentDB.Auth.UserCertificates.Tests;
+
+public class UserCertificatesPluginTests {
+	private readonly FakeLogger _logger = new();
+	private readonly X509Certificate2 _rootCert;
+	private readonly X509Certificate2 _nodeCert;
+	private readonly X509Certificate2 _userCert;
+
+	public UserCertificatesPluginTests() {
+		_rootCert = TestUtils.CreateCertificate(ca: true, parent: null);
+		_nodeCert = TestUtils.CreateCertificate(ca: false, parent: _rootCert, clientAuthEKU: true, serverAuthEKU: true);
+		_userCert = TestUtils.CreateCertificate(ca: false, parent: _rootCert, clientAuthEKU: true);
+		_userCert = new X509Certificate2(_userCert.Export(X509ContentType.Pfx));
+	}
+
+	[Fact]
+	public void has_parameterless_constructor() {
+		// needed for all plugins
+		Activator.CreateInstance<UserCertificatesPlugin>();
+	}
+
+	[Fact]
+	public async Task works() {
+		await using var app = await CreateServer(
+			new Dictionary<string, string?> {
+				{ $"{KurrentConfigurationConstants.Prefix}:UserCertificates:Enabled", "true" }
+			},
+			ConfigureServicesCorrectly);
+
+		var client = CreateClient(app, _userCert);
+		var result = await client.GetAsync("/test");
+		Assert.Equal(HttpStatusCode.OK, result.StatusCode);
+
+		var log = Assert.Single(_logger.LogMessages);
+		Assert.Equal("UserCertificatesPlugin: user X.509 certificate authentication is enabled", log.RenderMessage());
+	}
+
+	[Fact]
+	public async Task disabled_by_default() {
+		using var collector = PluginDiagnosticsDataCollector.Start("UserCertificates");
+		await using var app = await CreateServer([], ConfigureServicesCorrectly);
+
+		var client = CreateClient(app, _userCert);
+		var result = await client.GetAsync("/test");
+		Assert.Equal(HttpStatusCode.Forbidden, result.StatusCode);
+
+		collector.CollectedEvents("UserCertificates").Should().ContainSingle().Which
+			.Data["enabled"].Should().Be(false);
+	}
+
+	[Fact]
+	public async Task can_be_disabled() {
+		using var collector = PluginDiagnosticsDataCollector.Start("UserCertificates");
+		await using var app = await CreateServer(
+			new Dictionary<string, string?> {
+				{ $"{KurrentConfigurationConstants.Prefix}:UserCertificates:Enabled", "false" }
+			},
+			ConfigureServicesCorrectly);
+
+		var client = CreateClient(app, _userCert);
+		var result = await client.GetAsync("/test");
+		Assert.Equal(HttpStatusCode.Forbidden, result.StatusCode);
+
+		collector.CollectedEvents("UserCertificates").Should().ContainSingle().Which
+			.Data["enabled"].Should().Be(false);
+	}
+
+	[Fact]
+	public async Task requires_user_certificate_scheme() {
+		await using var app = await CreateServer(
+			new Dictionary<string, string?> {
+				{ $"{KurrentConfigurationConstants.Prefix}:UserCertificates:Enabled", "true" }
+			},
+			services => services
+				.AddSingleton<ILicenseService>(new Fixtures.FakeLicenseService())
+				.AddSingleton<IReadOnlyList<IHttpAuthenticationProvider>>([new FakeAnonymousHttpAuthenticationProvider()])
+				.AddSingleton<IAuthenticationProvider>(new FakeAuthenticationProvider("Basic"))
+				.AddSingleton<Func<(X509Certificate2? Node, X509Certificate2Collection? Intermediates, X509Certificate2Collection? Roots)>>(
+				() => (_nodeCert, null, new(_rootCert))));
+
+		var client = CreateClient(app, _userCert);
+		var result = await client.GetAsync("/test");
+		Assert.Equal(HttpStatusCode.Forbidden, result.StatusCode);
+
+		var log = Assert.Single(_logger.LogMessages);
+		Assert.Equal("UserCertificatesPlugin is not compatible with the current authentication provider", log.RenderMessage());
+	}
+
+	[Fact]
+	public async Task requires_anonymous_http_provider() {
+		await using var app = await CreateServer(
+			new Dictionary<string, string?> {
+				{ $"{KurrentConfigurationConstants.Prefix}:UserCertificates:Enabled", "true" }
+			},
+			services => services
+				.AddSingleton<ILicenseService>(new Fixtures.FakeLicenseService())
+				.AddSingleton<IReadOnlyList<IHttpAuthenticationProvider>>([])
+				.AddSingleton<IAuthenticationProvider>(new FakeAuthenticationProvider("UserCertificate"))
+				.AddSingleton<Func<(X509Certificate2? Node, X509Certificate2Collection? Intermediates, X509Certificate2Collection? Roots)>>(
+				() => (_nodeCert, null, new(_rootCert))));
+
+		var client = CreateClient(app, _userCert);
+		var result = await client.GetAsync("/test");
+		// since there is no anonymous provider we do not get authenticated at all, hence different code
+		Assert.Equal(HttpStatusCode.Unauthorized, result.StatusCode);
+
+		var log = Assert.Single(_logger.LogMessages);
+		Assert.Equal("UserCertificatesPlugin failed to load as the conditions required to load the plugin were not met", log.RenderMessage());
+	}
+
+	private async Task<WebApplication> CreateServer(
+		Dictionary<string, string?> configuration,
+		Action<IServiceCollection>? configureServices = null) {
+
+		var builder = WebApplication.CreateBuilder();
+		builder.Configuration.AddInMemoryCollection(configuration);
+		builder.WebHost
+			.UseUrls("https://127.0.0.1:0")
+			.ConfigureKestrel(x => x
+				.ConfigureHttpsDefaults(y => {
+					y.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
+					y.ClientCertificateValidation = (certificate, chain, errors) => true;
+				}));
+		builder.Services.AddAuthorizationBuilder()
+			.SetDefaultPolicy(new AuthorizationPolicyBuilder()
+				.RequireAuthenticatedUser()
+				.Build());
+		builder.Services.AddAuthentication(o => {
+			o.AddScheme<FakeAuthenticationHandler>("fake", "fake");
+		});
+
+		configureServices?.Invoke(builder.Services);
+
+		var sut = new UserCertificatesPlugin(_logger);
+		((IPlugableComponent)sut).ConfigureServices(builder.Services, builder.Configuration);
+
+		var app = builder.Build();
+		((IPlugableComponent)sut).ConfigureApplication(app, builder.Configuration);
+
+		app.MapGet("/test", () => "Hello World!").RequireAuthorization();
+
+		await app.StartAsync();
+		return app;
+	}
+
+	void ConfigureServicesCorrectly(IServiceCollection services) => services
+			.AddSingleton<ILicenseService>(new Fixtures.FakeLicenseService())
+			.AddSingleton<IReadOnlyList<IHttpAuthenticationProvider>>([new FakeAnonymousHttpAuthenticationProvider()])
+			.AddSingleton<IAuthenticationProvider>(new FakeAuthenticationProvider("UserCertificate"))
+			.AddSingleton<Func<(X509Certificate2? Node, X509Certificate2Collection? Intermediates, X509Certificate2Collection? Roots)>>(
+				() => (_nodeCert, null, new(_rootCert)));
+
+	private static HttpClient CreateClient(WebApplication app, X509Certificate2? userCert) {
+		var handler = new HttpClientHandler {
+			ServerCertificateCustomValidationCallback = (sender, cert, chain, sslPolicyErrors) => true
+		};
+
+		if (userCert != null)
+			handler.ClientCertificates.Add(userCert);
+
+		var client = new HttpClient(handler, disposeHandler: true) {
+			BaseAddress = new Uri(app.Urls.First())
+		};
+
+		return client;
+	}
+
+	[Theory]
+	[InlineData(true)]
+	[InlineData(false)]
+	public void can_collect_telemetry(bool enabled) {
+		// given
+		using var sut = new UserCertificatesPlugin();
+		using var collector = PluginDiagnosticsDataCollector.Start(sut.DiagnosticsName);
+
+		var config = new ConfigurationBuilder()
+			.AddInMemoryCollection(new Dictionary<string, string?> {
+				{$"{KurrentConfigurationConstants.Prefix}:UserCertificates:Enabled", $"{enabled}"},
+			})
+			.Build();
+
+		var builder = WebApplication.CreateBuilder();
+		builder.Services.AddSingleton<ILicenseService>(new Fixtures.FakeLicenseService(true, "USER_CERTIFICATES"));
+		builder.Services.AddSingleton<IReadOnlyList<IHttpAuthenticationProvider>>([]);
+
+		// when
+		((IPlugableComponent)sut).ConfigureServices(
+			builder.Services,
+			config);
+
+		var app = builder.Build();
+		((IPlugableComponent)sut).ConfigureApplication(app, config);
+
+		// then
+		collector.CollectedEvents(sut.DiagnosticsName).Should().ContainSingle().Which
+			.Data["enabled"].Should().Be(enabled);
+	}
+
+	[Theory]
+	[InlineData(true, true, "USER_CERTIFICATES", false)]
+	[InlineData(true, false, "USER_CERTIFICATES", true)]
+	[InlineData(false, true, "USER_CERTIFICATES", false)]
+	[InlineData(false, false, "USER_CERTIFICATES", false)]
+	[InlineData(true, true, "NONE", true)]
+	[InlineData(true, false, "NONE", true)]
+	[InlineData(false, true, "NONE", false)]
+	[InlineData(false, false, "NONE", false)]
+	public void respects_license(bool enabled, bool licensePresent, string entitlement, bool expectedException) {
+		// given
+		using var sut = new UserCertificatesPlugin();
+
+		var config = new ConfigurationBuilder()
+			.AddInMemoryCollection(new Dictionary<string, string?> {
+				{$"{KurrentConfigurationConstants.Prefix}:UserCertificates:Enabled", $"{enabled}"},
+			})
+			.Build();
+
+		var builder = WebApplication.CreateBuilder();
+
+		if (enabled)
+			builder.Services.AddSingleton<IReadOnlyList<IHttpAuthenticationProvider>>([]);
+
+		var licenseService = new Fixtures.FakeLicenseService(licensePresent, entitlement);
+		builder.Services.AddSingleton<ILicenseService>(licenseService);
+
+		((IPlugableComponent)sut).ConfigureServices(
+			builder.Services,
+			config);
+
+		var app = builder.Build();
+
+		// when
+		((IPlugableComponent)sut).ConfigureApplication(app, config);
+
+		// then
+		if (expectedException) {
+			Assert.NotNull(licenseService.RejectionException);
+		} else {
+			Assert.Null(licenseService.RejectionException);
+		}
+	}
+}
diff --git a/src/KurrentDB.Auth.UserCertificates/CertificateExtensions.cs b/src/KurrentDB.Auth.UserCertificates/CertificateExtensions.cs
new file mode 100644
index 00000000000..eb1207f48f1
--- /dev/null
+++ b/src/KurrentDB.Auth.UserCertificates/CertificateExtensions.cs
@@ -0,0 +1,127 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+
+namespace KurrentDB.Auth.UserCertificates;
+
+public static class CertificateExtensions {
+	private static bool TryGetKeyUsages(
+		this X509Certificate2 certificate,
+		out X509KeyUsageFlags keyUsages,
+		out bool hasExtendedKeyUsage,
+		out Oid[] extKeyUsages,
+		out string failReason) {
+
+		keyUsages = X509KeyUsageFlags.None;
+		hasExtendedKeyUsage = false;
+		extKeyUsages = [];
+		failReason = "";
+
+		X509ExtensionCollection extensions;
+		try {
+			extensions = certificate.Extensions;
+		} catch (CryptographicException ex) {
+			failReason = ex.Message;
+			return false;
+		}
+
+		foreach (var extension in extensions) {
+			switch (extension.Oid?.Value) {
+				case "2.5.29.15": // Oid for Key Usage extension
+					var keyUsageExt = (X509KeyUsageExtension)extension;
+					keyUsages |= keyUsageExt.KeyUsages;
+					break;
+				case "2.5.29.37": // Oid for Extended Key Usage extension
+					hasExtendedKeyUsage = true;
+					var enhancedKeyUsageExt = (X509EnhancedKeyUsageExtension)extension;
+					extKeyUsages = new Oid[enhancedKeyUsageExt.EnhancedKeyUsages.Count];
+					if (extKeyUsages.Length > 0)
+						enhancedKeyUsageExt.EnhancedKeyUsages.CopyTo(extKeyUsages, 0);
+					break;
+			}
+		}
+
+		return true;
+	}
+
+	private static bool HasCorrectKeyUsages(X509KeyUsageFlags keyUsageFlags, out string failReason) {
+		if (!keyUsageFlags.HasFlag(X509KeyUsageFlags.DigitalSignature)) {
+			failReason = "Missing key usage: Digital Signature";
+			return false;
+		}
+
+		if (!keyUsageFlags.HasFlag(X509KeyUsageFlags.KeyEncipherment) &&
+			!keyUsageFlags.HasFlag(X509KeyUsageFlags.KeyAgreement)) {
+			failReason = "Missing key usage: Key Encipherment and/or Key Agreement";
+			return false;
+		}
+
+		failReason = string.Empty;
+		return true;
+	}
+
+	private static bool HasServerAuthExtendedKeyUsage(IEnumerable<Oid> extendedKeyUsages, out string failReason) {
+		if (extendedKeyUsages.All(oid => oid.Value != "1.3.6.1.5.5.7.3.1")) { // serverAuth
+			failReason = "Missing extended key usage: Server Authentication";
+			return false;
+		}
+
+		failReason = string.Empty;
+		return true;
+	}
+
+	private static bool HasClientAuthExtendedKeyUsage(IEnumerable<Oid> extendedKeyUsages, out string failReason) {
+		if (extendedKeyUsages.All(oid => oid.Value != "1.3.6.1.5.5.7.3.2")) { // clientAuth
+			failReason = "Missing extended key usage: Client Authentication";
+			return false;
+		}
+
+		failReason = string.Empty;
+		return true;
+	}
+
+	public static bool IsServerCertificate(this X509Certificate2 certificate, out string failReason) {
+		if (!certificate.TryGetKeyUsages(out var keyUsages, out var hasExtKeyUsagesExtension, out var extKeyUsages, out failReason))
+			return false;
+
+		if (!HasCorrectKeyUsages(keyUsages, out failReason))
+			return false;
+
+		// rfc5280 section-4.2.1.12: extended key usages (EKUs) only have to be enforced
+		// if the extension is present at all. here, we don't enforce them for server
+		// certificates for backwards compatibility. however, this also implies that we
+		// _need_ the EKUs to be present for other types of certificates (e.g user certificates)
+		// as otherwise it would cause ambiguity when trying to determine the certificate type.
+		if (hasExtKeyUsagesExtension) {
+			if (!HasServerAuthExtendedKeyUsage(extKeyUsages, out failReason))
+				return false;
+
+			// historically, server certificates also have the clientAuth EKU
+			if (!HasClientAuthExtendedKeyUsage(extKeyUsages, out failReason))
+				return false;
+		}
+
+		failReason = string.Empty;
+		return true;
+	}
+
+	public static bool IsClientCertificate(this X509Certificate2 certificate, out string failReason) {
+		if (!certificate.TryGetKeyUsages(out var keyUsages, out _, out var extKeyUsages, out failReason))
+			return false;
+
+		if (!HasCorrectKeyUsages(keyUsages, out failReason))
+			return false;
+
+		if (!HasClientAuthExtendedKeyUsage(extKeyUsages, out failReason))
+			return false;
+
+		failReason = string.Empty;
+		return true;
+	}
+
+	public static string GetCommonName(this X509Certificate2 certificate) => certificate.GetNameInfo(X509NameType.SimpleName, false);
+}
diff --git a/src/KurrentDB.Auth.UserCertificates/CertificateUtils.cs b/src/KurrentDB.Auth.UserCertificates/CertificateUtils.cs
new file mode 100644
index 00000000000..2a9c338cdee
--- /dev/null
+++ b/src/KurrentDB.Auth.UserCertificates/CertificateUtils.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Cryptography.X509Certificates;
+
+namespace KurrentDB.Auth.UserCertificates;
+
+public static class CertificateUtils {
+	// returns true iff there exists a root in `roots` that begins a valid chain of
+	// trust to both `certificate1` and `certificate2`.
+	public static bool ShareARoot(
+		X509Certificate2 certificate1,
+		X509Certificate2 certificate2,
+		X509Certificate2Collection intermediates,
+		X509Certificate2Collection roots,
+		out string[] certificate1Roots,
+		out string[] certificate2Roots) {
+
+		certificate1Roots = FindRoots(certificate1, intermediates, roots).Select(x => x.Thumbprint).ToArray();
+		certificate2Roots = FindRoots(certificate2, intermediates, roots).Select(x => x.Thumbprint).ToArray();
+
+		return certificate1Roots.Intersect(certificate2Roots).Any();
+	}
+
+	// finds every root in `roots` that begins a valid chain of trust to `leaf`
+	public static X509Certificate2[] FindRoots(
+		X509Certificate2 leaf,
+		X509Certificate2Collection intermediates,
+		X509Certificate2Collection roots) {
+
+		var candidateRoots = new HashSet<X509Certificate2>();
+		FindCandidateRoots(leaf, intermediates, roots, visited: [], candidateRoots);
+
+		return candidateRoots
+			.Where(root => IsValidRoot(leaf, intermediates, root))
+			.ToArray();
+	}
+
+	// returns true iff there is a valid chain from the root to the leaf
+	private static bool IsValidRoot(X509Certificate2 leaf, X509Certificate2Collection intermediates, X509Certificate2 root) {
+		var chain = new X509Chain {
+			ChainPolicy = {
+				TrustMode = X509ChainTrustMode.CustomRootTrust,
+				RevocationMode = X509RevocationMode.NoCheck,
+				DisableCertificateDownloads = true
+			}
+		};
+
+		if (intermediates != null)
+			foreach (var intermediate in intermediates)
+				chain.ChainPolicy.ExtraStore.Add(intermediate);
+
+		chain.ChainPolicy.CustomTrustStore.Add(root);
+
+		return chain.Build(leaf);
+	}
+
+	// DFS. finds every root in `roots` with a issuer/subject chain down to `certificate`
+	private static void FindCandidateRoots(
+		X509Certificate2 certificate,
+		X509Certificate2Collection intermediates,
+		X509Certificate2Collection roots,
+		HashSet<string> visited,
+		HashSet<X509Certificate2> results) {
+
+		if (!visited.Add(certificate.Thumbprint))
+			return;
+
+		if (certificate.Issuer == certificate.Subject) {
+			// we've reached a root certificate - check if it's a trusted root
+			if (roots.Contains(certificate))
+				results.Add(certificate);
+		}
+
+		if (intermediates != null)
+			foreach (var intermediate in intermediates)
+				if (certificate.Issuer == intermediate.Subject)
+					FindCandidateRoots(intermediate, intermediates, roots, visited, results);
+
+		if (roots != null)
+			foreach (var root in roots)
+				if (certificate.Issuer == root.Subject)
+					FindCandidateRoots(root, intermediates, roots, visited, results);
+	}
+}
diff --git a/src/KurrentDB.Auth.UserCertificates/KurrentDB.Auth.UserCertificates.csproj b/src/KurrentDB.Auth.UserCertificates/KurrentDB.Auth.UserCertificates.csproj
new file mode 100644
index 00000000000..e5f347b0e6a
--- /dev/null
+++ b/src/KurrentDB.Auth.UserCertificates/KurrentDB.Auth.UserCertificates.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<OutputType>Library</OutputType>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
+	</PropertyGroup>
+	<PropertyGroup>
+		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="EventStore.Plugins" Version="25.2.5" />
+		<PackageReference Include="Scrutor" Version="5.0.2" />
+		<PackageReference Include="Serilog" Version="4.0.1" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Update="user-certificates-plugin-example.yaml">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Update="user-certificates-plugin-example.json">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.Auth.UserCertificates/UserCertificateAuthenticationProvider.cs b/src/KurrentDB.Auth.UserCertificates/UserCertificateAuthenticationProvider.cs
new file mode 100644
index 00000000000..3ea144e8d69
--- /dev/null
+++ b/src/KurrentDB.Auth.UserCertificates/UserCertificateAuthenticationProvider.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Cryptography.X509Certificates;
+using EventStore.Plugins.Authentication;
+using Microsoft.AspNetCore.Connections.Features;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
+using Serilog;
+
+namespace KurrentDB.Auth.UserCertificates;
+
+public class UserCertificateAuthenticationProvider(
+	IAuthenticationProvider authenticationProvider,
+	Func<(X509Certificate2 Node, X509Certificate2Collection Intermediates, X509Certificate2Collection Roots)> getCertificates,
+	IConfiguration configuration) :
+	IHttpAuthenticationProvider {
+
+	private static readonly ILogger Logger = Log.ForContext<UserCertificateAuthenticationProvider>();
+	private readonly bool _logFailedAuthenticationAttempts = configuration.GetValue<bool>(
+		$"{UserCertificatesPlugin.KurrentConfigurationPrefix}:LogFailedAuthenticationAttempts");
+
+	public string Name => "user-certificate";
+
+	public bool Authenticate(HttpContext context, out HttpAuthenticationRequest request) {
+		return AuthenticateCached(context, out request);
+	}
+
+	private bool AuthenticateCached(HttpContext context, out HttpAuthenticationRequest request) {
+		// we cache the authentication result as the same TLS connection may be used for multiple HTTP requests.
+		// performance aside, the cache also ensures that authentication requests that were successful in the past
+		// will succeed in the future for the same TLS connection even if certificates are rotated.
+
+		request = null;
+
+		// if the connection doesn't have a client certificate, take a shortcut
+		var clientCertificate = context.Connection.ClientCertificate;
+		if (clientCertificate is null)
+			return false;
+
+		bool authenticated;
+		string userId;
+
+		var connectionItems = context.Features.Get<IConnectionItemsFeature>()?.Items;
+		const string connectionItemsKey = "UserCertificateAuthenticationStatus";
+		if (TryGetDictionaryValue(connectionItems, connectionItemsKey, out var cached)) {
+			(authenticated, userId) = ((bool, string))cached;
+		} else {
+			authenticated = AuthenticateUncached(context, clientCertificate, out userId);
+			TrySetDictionaryValue(connectionItems, connectionItemsKey, (authenticated, userId));
+		}
+
+		// todo: consider not falling through if we have a cert but fail to authenticate it
+		if (!authenticated)
+			return false;
+
+		if (!IsTimeValid(clientCertificate, userId))
+			return false;
+
+		request = HttpAuthenticationRequest.CreateWithValidCertificate(context, userId, clientCertificate);
+		authenticationProvider.Authenticate(request);
+
+		return true;
+	}
+
+	private bool IsTimeValid(X509Certificate2 clientCertificate, string userId) {
+		var now = DateTime.Now;
+
+		if (now < clientCertificate.NotBefore) {
+			if (_logFailedAuthenticationAttempts)
+				Logger.Warning("Connection from user: {user} was denied because its certificate's effective start time hasn't been reached yet.", userId);
+			return false;
+		}
+
+		if (now > clientCertificate.NotAfter) {
+			if (_logFailedAuthenticationAttempts)
+				Logger.Warning("Connection from user: {user} was denied because its certificate has expired.", userId);
+			return false;
+		}
+
+		return true;
+	}
+
+	private static bool TryGetDictionaryValue(IDictionary<object, object> dictionary, string key, out object value) {
+		if (dictionary == null) {
+			value = null;
+			return false;
+		}
+
+		lock (dictionary) {
+			return dictionary.TryGetValue(key, out value);
+		}
+	}
+
+	private static bool TrySetDictionaryValue(IDictionary<object, object> dictionary, string key, object value) {
+		if (dictionary == null)
+			return false;
+
+		lock (dictionary) {
+			return dictionary.TryAdd(key, value);
+		}
+	}
+
+	private bool AuthenticateUncached(HttpContext context, X509Certificate2 clientCertificate, out string userId) {
+		userId = null;
+
+		if (!clientCertificate.IsClientCertificate(out _))
+			return false;
+
+		if (clientCertificate.IsServerCertificate(out _))
+			return false;
+
+		userId = clientCertificate.GetCommonName();
+
+		// currently, we restrict user certificates to have the same root CA as the node certificate
+		// however, this may not suit all use cases and can be expanded later based on feedback from users.
+		if (!HasSameRootAsNodeCertificate(clientCertificate)) {
+			if (_logFailedAuthenticationAttempts)
+				Logger.Warning("Connection from user: {user} was denied because its certificate's root CA does not match with the node's certificate's root CA", userId);
+			return false;
+		}
+
+		return true;
+	}
+
+	private bool HasSameRootAsNodeCertificate(X509Certificate2 user) {
+		var (node, intermediates, roots) = getCertificates();
+		var shareARoot = CertificateUtils.ShareARoot(
+			certificate1: user,
+			certificate2: node,
+			intermediates: intermediates,
+			roots: roots,
+			out var userRoots,
+			out var nodeRoots);
+
+		Logger.Verbose("User certificate's root CA thumbprint(s): {roots}", string.Join(",", userRoots));
+		Logger.Verbose("Node certificate's root CA thumbprint(s): {roots}", string.Join(",", nodeRoots));
+
+		return shareARoot;
+	}
+}
diff --git a/src/KurrentDB.Auth.UserCertificates/UserCertificatesPlugin.cs b/src/KurrentDB.Auth.UserCertificates/UserCertificatesPlugin.cs
new file mode 100644
index 00000000000..684080b81fa
--- /dev/null
+++ b/src/KurrentDB.Auth.UserCertificates/UserCertificatesPlugin.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using EventStore.Plugins;
+using EventStore.Plugins.Authentication;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Serilog;
+
+namespace KurrentDB.Auth.UserCertificates;
+
+public class UserCertificatesPlugin : SubsystemsPlugin {
+	public const string KurrentConfigurationPrefix = "KurrentDB";
+	private static readonly ILogger _staticLogger = Log.ForContext<UserCertificatesPlugin>();
+	private readonly ILogger _logger;
+
+	private const string AnonymousProvider = "anonymous";
+
+	public UserCertificatesPlugin() : this(_staticLogger) {
+	}
+
+	public UserCertificatesPlugin(ILogger logger)
+		: base(
+			requiredEntitlements: ["USER_CERTIFICATES"]) {
+
+		_logger = logger;
+	}
+
+	public override (bool Enabled, string EnableInstructions) IsEnabled(IConfiguration configuration) {
+		var enabled = configuration.GetValue($"{KurrentConfigurationPrefix}:UserCertificates:Enabled", defaultValue: false);
+		return (enabled, $"Set '{KurrentConfigurationPrefix}:UserCertificates:Enabled' to 'true' to enable user X.509 certificate authentication");
+	}
+
+	public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) {
+		services
+			.AddSingleton<UserCertificateAuthenticationProvider>()
+			.Decorate<IReadOnlyList<IHttpAuthenticationProvider>>(Decorate);
+	}
+
+	// inject the user certificate authentication provider just before the anonymous provider -
+	// its order w.r.t the node certificate authentication provider is unimportant because they accept disjoint sets of certificates
+	private IReadOnlyList<IHttpAuthenticationProvider> Decorate(
+		IReadOnlyList<IHttpAuthenticationProvider> authProviders,
+		IServiceProvider serviceProvider) {
+
+		var authenticationProvider = serviceProvider.GetRequiredService<IAuthenticationProvider>();
+		if (!authenticationProvider.GetSupportedAuthenticationSchemes().Contains("UserCertificate")) {
+			_logger.Information($"{nameof(UserCertificatesPlugin)} is not compatible with the current authentication provider");
+			return authProviders;
+		}
+
+		var newAuthProviders = authProviders.ToList();
+		var anonymousProviderIndex = newAuthProviders.FindIndex(x => x.Name == AnonymousProvider);
+
+		if (anonymousProviderIndex == -1) {
+			_logger.Error($"{nameof(UserCertificatesPlugin)} failed to load as the conditions required to load the plugin were not met");
+			return authProviders;
+		}
+
+		var userCertAuthProvider = serviceProvider.GetService<UserCertificateAuthenticationProvider>();
+		newAuthProviders.Insert(anonymousProviderIndex, userCertAuthProvider);
+
+		_logger.Information($"{nameof(UserCertificatesPlugin)}: user X.509 certificate authentication is enabled");
+		return newAuthProviders;
+	}
+}
diff --git a/src/KurrentDB.Auth.UserCertificates/user-certificates-plugin-example.json b/src/KurrentDB.Auth.UserCertificates/user-certificates-plugin-example.json
new file mode 100644
index 00000000000..0d9b1bfeb86
--- /dev/null
+++ b/src/KurrentDB.Auth.UserCertificates/user-certificates-plugin-example.json
@@ -0,0 +1,7 @@
+{
+  "KurrentDB": {
+    "UserCertificates": {
+      "Enabled": true
+    }
+  }
+}
diff --git a/src/KurrentDB.Auth.UserCertificates/user-certificates-plugin-example.yaml b/src/KurrentDB.Auth.UserCertificates/user-certificates-plugin-example.yaml
new file mode 100644
index 00000000000..31fd3069c1c
--- /dev/null
+++ b/src/KurrentDB.Auth.UserCertificates/user-certificates-plugin-example.yaml
@@ -0,0 +1,2 @@
+UserCertificates:
+  Enabled: true
diff --git a/src/KurrentDB.AutoScavenge.Tests/ClusterFixtures.cs b/src/KurrentDB.AutoScavenge.Tests/ClusterFixtures.cs
new file mode 100644
index 00000000000..2176d131781
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/ClusterFixtures.cs
@@ -0,0 +1,98 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using Bogus;
+using KurrentDB.AutoScavenge.Domain;
+
+namespace KurrentDB.AutoScavenge.Tests;
+
+public class ClusterFixtures {
+	public static readonly Faker<ClusterMember> ClusterMembers =
+		new Faker<ClusterMember>()
+			.RuleFor(m => m.InstanceId, f => f.Random.Guid())
+			.RuleFor(m => m.State, _ => "Follower")
+			.RuleFor(m => m.InternalHttpEndPointIp, f => f.Internet.Ip())
+			.RuleFor(m => m.InternalHttpEndPointPort, f => f.Random.Int(1_024, 65_535))
+			.RuleFor(m => m.IsAlive, f => f.Random.Bool())
+			.RuleFor(m => m.WriterCheckpoint, f => f.Random.Long(0, 8_192));
+
+	public static Dictionary<Guid, ClusterMember> Generate3NodesCluster() {
+		var members = ClusterMembers.Generate(3);
+
+		long maxWriterCheckpoint = 0;
+		ClusterMember? leader = null;
+
+		foreach (var member in members) {
+			if (member.WriterCheckpoint <= maxWriterCheckpoint)
+				continue;
+
+			leader = member;
+			maxWriterCheckpoint = member.WriterCheckpoint;
+		}
+
+		leader!.State = "Leader";
+
+		Assert.Single(members.Where(m => m.State == "Leader"));
+		Assert.Equal(leader.WriterCheckpoint, members.Max(m => m.WriterCheckpoint));
+
+		return members.ToDictionary(m => m.InstanceId);
+	}
+
+	public static Dictionary<Guid, ClusterMember> Generate3NodesClusterWith2RoRs() {
+		var members = ClusterMembers.Generate(5);
+
+		long maxWriterCheckpoint = 0;
+		ClusterMember? leader = null;
+
+		foreach (var member in members) {
+			if (member.WriterCheckpoint <= maxWriterCheckpoint)
+				continue;
+
+			leader = member;
+			maxWriterCheckpoint = member.WriterCheckpoint;
+		}
+
+		leader!.State = "Leader";
+
+		var rorCount = 0;
+		foreach (var member in members) {
+			if (member.InstanceId == leader.InstanceId)
+				continue;
+
+			member.IsReadOnlyReplica = true;
+			rorCount++;
+			if (rorCount >= 2)
+				break;
+		}
+
+		Assert.Equal(2, members.Count(m => m.IsReadOnlyReplica));
+		Assert.Single(members.Where(m => m.State == "Leader"));
+		Assert.Equal(leader.WriterCheckpoint, members.Max(m => m.WriterCheckpoint));
+
+		return members.ToDictionary(m => m.InstanceId);
+	}
+
+	public static NodeId GenerateNodeId(int nodeNumber) =>
+		new($"https://node{nodeNumber}", 2113);
+
+	public static ClusterMember GenerateSingleNode() {
+		var node = ClusterMembers.Generate(1).Single()!;
+		node.State = "Leader";
+		return node;
+	}
+
+	public static ClusterMember GetLeader(IEnumerable<ClusterMember> members) {
+		return members.Single(m => m.State == "Leader");
+	}
+
+	// Returns the first follower we found in the cluster.
+	public static ClusterMember GetFollower(IEnumerable<ClusterMember> members) {
+		return members.First(m => m.State == "Follower");
+	}
+
+	// FIXME: This approach won't work if another node is on part with the leader. We ought to prioritize the follower
+	// node in that case.
+	public static ClusterMember GetFarthestNodeInReplication(IEnumerable<ClusterMember> members) {
+		return members.OrderBy(m => m.WriterCheckpoint).First();
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/Command.cs b/src/KurrentDB.AutoScavenge.Tests/Command.cs
new file mode 100644
index 00000000000..ae2301db1f9
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/Command.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.AutoScavenge.Domain;
+using NCrontab;
+
+namespace KurrentDB.AutoScavenge.Tests;
+
+public static class Command {
+	public static ICommand FastForward(TimeSpan time) => new SimulatorCommands.FastForward(time);
+	public static ICommand ReceiveGossip(Guid nodeId, List<ClusterMember> members) =>
+		new Commands.ReceiveGossip(new GossipMessage { NodeId = nodeId, Members = members });
+
+	public static ICommand Configure(CrontabSchedule schedule, Action<Response<Unit>>? callback = null) =>
+		new Commands.Configure(schedule, resp => callback?.Invoke(resp));
+
+	public static ICommand Suspend { get; } = new SimulatorCommands.Suspend();
+
+	public static ICommand PauseProcess(Action<Response<Unit>> callback) =>
+		new Commands.PauseProcess(callback);
+
+	public static ICommand ResumeProcess(Action<Response<Unit>> callback) =>
+		new Commands.ResumeProcess(callback);
+
+	public static ICommand GetStatus(TaskCompletionSource<Response<AutoScavengeStatusResponse>> source) =>
+		new Commands.GetStatus(source.SetResult);
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/ConfigurationTests.cs b/src/KurrentDB.AutoScavenge.Tests/ConfigurationTests.cs
new file mode 100644
index 00000000000..84c24935895
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/ConfigurationTests.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Configuration.Sources;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
+
+namespace KurrentDB.AutoScavenge.Tests;
+
+public class ConfigurationTests {
+	public enum EnabledStatus {
+		True,
+		False,
+		Exception,
+	}
+
+	[Theory]
+	[InlineData("true", "true", EnabledStatus.Exception)]
+	[InlineData("true", "false", EnabledStatus.True)]
+	[InlineData("", "true", EnabledStatus.False)]
+	[InlineData("", "false", EnabledStatus.True)]
+	[InlineData("false", "true", EnabledStatus.False)]
+	[InlineData("false", "false", EnabledStatus.False)]
+	public void enables_correctly_according_to_configuration(string enabledValue, string devModeValue, EnabledStatus expected) {
+		var startup = new DummyStartup(
+			new ConfigurationBuilder()
+				.AddInMemoryCollection([
+					new($"{KurrentConfigurationKeys.Prefix}:AutoScavenge:Enabled", enabledValue),
+					new($"{KurrentConfigurationKeys.Prefix}:Dev", devModeValue),
+				])
+				.Build());
+
+		var sut = startup.AutoScavengePlugin;
+
+		var builder = WebApplication.CreateBuilder();
+
+		void When() {
+			startup.ConfigureServices(builder.Services);
+			startup.Configure(builder.Build());
+		}
+
+		if (expected == EnabledStatus.Exception) {
+			Assert.Throws<Exception>(When);
+		} else {
+			When();
+
+			if (expected == EnabledStatus.True) {
+				Assert.True(sut.Enabled);
+			} else if (expected == EnabledStatus.False) {
+				Assert.False(sut.Enabled);
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/CrashTests.cs b/src/KurrentDB.AutoScavenge.Tests/CrashTests.cs
new file mode 100644
index 00000000000..b4052463f80
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/CrashTests.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net;
+using System.Net.Http.Headers;
+using System.Net.Http.Json;
+using System.Text.Json.Nodes;
+using KurrentDB.POC.IO.Core;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace KurrentDB.AutoScavenge.Tests;
+
+public class CrashTests : IClassFixture<DummyWebApplicationFactory> {
+	private readonly HttpClient _client;
+
+	public CrashTests(DummyWebApplicationFactory factory) {
+		_client = factory.CreateClient();
+		((DummyClient)factory.Services.GetRequiredService<IClient>()).BeNaughty = true;
+	}
+
+	[Fact]
+	public async Task ShouldReturnResponseEvenWhenCrashing() {
+		var attempt = 0;
+		HttpResponseMessage resp;
+		HttpRequestMessage msg;
+
+		// We make sure the server is ready to accept configure request first.
+		do {
+			msg = new HttpRequestMessage(HttpMethod.Get, "/auto-scavenge/status");
+			msg.Headers.Authorization =
+				new AuthenticationHeaderValue("dummy", Convert.ToBase64String("ouro:changeit"u8.ToArray()));
+			resp = await _client.SendAsync(msg);
+			attempt++;
+
+			var code = (int)resp.StatusCode;
+			if (code < 500)
+				break;
+			await Task.Delay(TimeSpan.FromSeconds(1));
+		} while (attempt < 30);
+
+		resp.EnsureSuccessStatusCode();
+
+		msg = new HttpRequestMessage(HttpMethod.Post, "/auto-scavenge/configure");
+		msg.Headers.Authorization =
+			new AuthenticationHeaderValue("dummy", Convert.ToBase64String("ouro:changeit"u8.ToArray()));
+		msg.Content = JsonContent.Create(new JsonObject {
+			["schedule"] = "* * * * 1",
+		});
+
+
+		resp = await _client.SendAsync(msg);
+		Assert.Equal(HttpStatusCode.InternalServerError, resp.StatusCode);
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/DummyAuthHandler.cs b/src/KurrentDB.AutoScavenge.Tests/DummyAuthHandler.cs
new file mode 100644
index 00000000000..8543af13980
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/DummyAuthHandler.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net.Http.Headers;
+using System.Security.Claims;
+using System.Text;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace KurrentDB.AutoScavenge.Tests;
+
+public class DummyAuthHandler : AuthenticationHandler<AuthenticationSchemeOptions> {
+	private static readonly Claim[] AdminClaims = new[] {
+		new Claim(ClaimTypes.Name, "ouro"),
+		new Claim(ClaimTypes.Role, "$admins")
+	};
+
+	private static readonly Claim[] UserClaims = new[] {
+		new Claim(ClaimTypes.Name, "johndoe"),
+	};
+
+	public DummyAuthHandler(IOptionsMonitor<AuthenticationSchemeOptions> options, ILoggerFactory logger,
+		UrlEncoder encoder) : base(options, logger, encoder) {
+	}
+
+	protected override Task<AuthenticateResult> HandleAuthenticateAsync() {
+		try {
+			if (!Request.Headers.TryGetValue("Authorization", out var authHeader))
+				return Task.FromResult(AuthenticateResult.Fail("Missing Authorization Header"));
+
+			var authHeaderVal = AuthenticationHeaderValue.Parse(authHeader!);
+
+			if (authHeaderVal.Scheme.Equals("dummy", StringComparison.OrdinalIgnoreCase)) {
+				var credentials = Encoding.UTF8
+					.GetString(Convert.FromBase64String(authHeaderVal.Parameter!))
+					.Split(':');
+
+				if (credentials.Length == 2) {
+					var username = credentials[0];
+					var password = credentials[1];
+
+					if (username == "ouro" && password == "changeit") {
+						var identity = new ClaimsIdentity(AdminClaims, Scheme.Name);
+						var principal = new ClaimsPrincipal(identity);
+						var ticket = new AuthenticationTicket(principal, Scheme.Name);
+
+						return Task.FromResult(AuthenticateResult.Success(ticket));
+					}
+
+					if (username == "johndoe" && password == "1234") {
+						var identity = new ClaimsIdentity(UserClaims, Scheme.Name);
+						var principal = new ClaimsPrincipal(identity);
+						var ticket = new AuthenticationTicket(principal, Scheme.Name);
+
+						return Task.FromResult(AuthenticateResult.Success(ticket));
+					}
+				}
+			}
+		} catch {
+			return Task.FromResult(AuthenticateResult.Fail("invalid authorization header"));
+		}
+
+		return Task.FromResult(AuthenticateResult.Fail("invalid username or password"));
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/DummyClient.cs b/src/KurrentDB.AutoScavenge.Tests/DummyClient.cs
new file mode 100644
index 00000000000..27a3b141c54
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/DummyClient.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text.Json;
+using KurrentDB.POC.IO.Core;
+
+namespace KurrentDB.AutoScavenge.Tests;
+
+public class DummyClient : IClient {
+	private long _count;
+	public bool BeNaughty { get; set; }
+
+	public Task WriteMetaDataMaxCountAsync(string stream, CancellationToken cancellationToken) {
+		return Task.CompletedTask;
+	}
+
+	public Task<long> WriteAsync(string stream, EventToWrite[] events, long expectedVersion, CancellationToken cancellationToken) {
+		if (BeNaughty)
+			throw new Exception("CrowdStrike !");
+
+		return Task.FromResult(_count++);
+	}
+
+	public IAsyncEnumerable<Event> SubscribeToAll(FromAll start, CancellationToken cancellationToken) {
+		return AsyncEnumerable.Empty<Event>();
+	}
+
+	public IAsyncEnumerable<Event> SubscribeToStream(string stream, CancellationToken cancellationToken) {
+		if (stream != "$mem-gossip")
+			return AsyncEnumerable.Empty<Event>();
+
+		var id = Guid.NewGuid();
+		var gossip = new GossipMessage {
+			NodeId = id,
+			Members = [ new ClusterMember {
+					InstanceId = id,
+					State = "Leader",
+					IsAlive = true,
+					InternalHttpEndPointIp = "foobar",
+					InternalHttpEndPointPort = 42,
+					WriterCheckpoint = 0,
+					IsReadOnlyReplica = false
+				}
+			]
+		};
+
+		return AsyncEnumerable.ToAsyncEnumerable([
+			new Event(Guid.NewGuid(), DateTime.Now, "$mem-gossip", 0, "$gossip", "application/json", 0, 0, false,
+				JsonSerializer.SerializeToUtf8Bytes(gossip), Array.Empty<byte>())
+		]);
+	}
+
+	public IAsyncEnumerable<Event> ReadStreamForwards(string stream, long maxCount, CancellationToken cancellationToken) {
+		return AsyncEnumerable.Empty<Event>();
+	}
+
+	public IAsyncEnumerable<Event> ReadStreamBackwards(string stream, long maxCount, CancellationToken cancellationToken) {
+		return AsyncEnumerable.Empty<Event>();
+	}
+
+	public IAsyncEnumerable<Event> ReadAllBackwardsAsync(Position position, long maxCount, CancellationToken cancellationToken) {
+		throw new NotImplementedException();
+	}
+
+	public Task DeleteStreamAsync(string stream, long expectedVersion, CancellationToken cancellationToken) {
+		throw new NotImplementedException();
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/DummyNodeHttpClientFactory.cs b/src/KurrentDB.AutoScavenge.Tests/DummyNodeHttpClientFactory.cs
new file mode 100644
index 00000000000..352a1e76335
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/DummyNodeHttpClientFactory.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Services.Transport.Http.NodeHttpClientFactory;
+
+namespace KurrentDB.AutoScavenge.Tests;
+
+public class DummyNodeHttpClientFactory : INodeHttpClientFactory {
+	public HttpClient CreateHttpClient(string[] additionalCertificateNames) => new();
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/DummyOperationClient.cs b/src/KurrentDB.AutoScavenge.Tests/DummyOperationClient.cs
new file mode 100644
index 00000000000..9d03ace67f1
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/DummyOperationClient.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.POC.IO.Core;
+
+namespace KurrentDB.AutoScavenge.Tests;
+
+public class DummyOperationClient : IOperationsClient {
+	public void Resign() {
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/DummyStartup.cs b/src/KurrentDB.AutoScavenge.Tests/DummyStartup.cs
new file mode 100644
index 00000000000..05bccde1a4e
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/DummyStartup.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Reactive.Subjects;
+using EventStore.Plugins;
+using EventStore.Plugins.Licensing;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Http.NodeHttpClientFactory;
+using KurrentDB.POC.ConnectedSubsystemsPlugin;
+using KurrentDB.POC.IO.Core;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace KurrentDB.AutoScavenge.Tests;
+
+public class DummyStartup {
+	private const string LicenseToken = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJlc2RiIiwiaXNzIjoiZXNkYiIsImV4cCI6MTgyNDQ1NjgyOCwianRpIjoiMTU3NDk2N2MtMmVkNC00OGZhLWIyNjItYTdhMGQzYTA1NTczIiwic3ViIjoiRVNEQiBUZXN0cyIsIklzVHJpYWwiOiJUcnVlIiwiSXNFeHBpcmVkIjoiRmFsc2UiLCJJc1ZhbGlkIjoiVHJ1ZSIsIklzRmxvYXRpbmciOiJUcnVlIiwiRGF5c1JlbWFpbmluZyI6IjEiLCJTdGFydERhdGUiOiIyNi8wNC8yMDI0IDAwOjAwOjAwICswMTowMCIsIkFVVE9fU0NBVkVOR0UiOiJ0cnVlIiwiaWF0IjoxNzI5ODQ4ODI4LCJuYmYiOjE3Mjk4NDg4Mjh9.jaQ58MxlqM2oORJw9bWJzvdTzwWxFeo-624SMN52Rm2j6HLvWsT2_jFTb_Xi-rXmP1C7KlJCQEMhksV_5QdsiRi37oao1fcxfywOBHQkPMqx2Hd1CMWq1_DAY0az12fRSrR9h3L_yIiez2coRNFKkc5mZSq2KHoZre0WWXbMUDL1RheG1KNTxL2qBelyYVMYRZ7lXfsUpgzahOTR36QTtWYETBbtzik8ZujINhYGUhqbGLtGO3Ad3kTqPQVB6MMDNgE6F-ZHLMrXPR08fJNYrkxcB8WoSbelzPduPN6tMJeyn1e6jYO3oOUBZZsD2tdX_Pai1qw4fiZlZlPycbYOBQ";
+	public ConnectedSubsystemsPlugin ConnectedPlugin { get; init; } = new();
+	public AutoScavengePlugin AutoScavengePlugin { get; init; } = new();
+	public FakeLicenseService LicenseService { get; init; } = new FakeLicenseService(LicenseToken);
+
+	public DummyStartup(IConfiguration configuration) {
+		Configuration = configuration;
+	}
+
+	public IConfiguration Configuration { get; }
+
+	public void ConfigureServices(IServiceCollection services) {
+		services.AddControllers();
+		services.AddAuthentication("dummy")
+			.AddScheme<AuthenticationSchemeOptions, DummyAuthHandler>("dummy", null);
+
+		services.AddSingleton<ILicenseService>(LicenseService);
+		services.AddSingleton<INodeHttpClientFactory, DummyNodeHttpClientFactory>();
+		services.AddSingleton<IClient, DummyClient>();
+		services.AddSingleton<IOperationsClient, DummyOperationClient>();
+		((IPlugableComponent)AutoScavengePlugin).ConfigureServices(services, Configuration);
+		services.AddSingleton(AutoScavengePlugin);
+	}
+
+	public void Configure(IApplicationBuilder app) {
+		app.UseRouting();
+		app.UseAuthentication();
+		app.UseAuthorization();
+
+		ConnectedPlugin.ConfigureApplication(app, Configuration);
+		((IPlugableComponent)AutoScavengePlugin).ConfigureApplication(app, Configuration);
+	}
+
+	class FakePublisher : IPublisher {
+		public void Publish(Message message) {
+			// No-op
+		}
+	}
+
+	public class FakeLicenseService : ILicenseService {
+		readonly BehaviorSubject<License> _licenseSubject;
+
+		public FakeLicenseService(string token) {
+			SelfLicense = new License(new(token));
+			CurrentLicense = SelfLicense; // they wouldn't normally be the same
+			_licenseSubject = new BehaviorSubject<License>(CurrentLicense);
+		}
+
+		public License SelfLicense { get; }
+
+		public License? CurrentLicense { get; }
+
+		public IObservable<License> Licenses => _licenseSubject;
+
+		public void RejectLicense(Exception ex) {
+		}
+
+		public void EmitLicense(License x) {
+			_licenseSubject.OnNext(x);
+		}
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/DummyWebApplicationFactory.cs b/src/KurrentDB.AutoScavenge.Tests/DummyWebApplicationFactory.cs
new file mode 100644
index 00000000000..2de358b9503
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/DummyWebApplicationFactory.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Configuration.Sources;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+namespace KurrentDB.AutoScavenge.Tests;
+
+public class DummyWebApplicationFactory : WebApplicationFactory<DummyStartup>, IAsyncLifetime {
+	protected override void ConfigureWebHost(IWebHostBuilder builder) {
+		builder.UseContentRoot(Directory.GetCurrentDirectory());
+		builder.ConfigureAppConfiguration((_, config) => {
+			config.AddInMemoryCollection(new Dictionary<string, string?> {
+				{ $"{KurrentConfigurationKeys.Prefix}:AutoScavenge:Enabled", "true" },
+				{ $"{KurrentConfigurationKeys.Prefix}:ClusterSize", "1" },
+				{ $"{KurrentConfigurationKeys.Prefix}:Insecure", "true" },
+			});
+		});
+	}
+
+	protected override IHostBuilder CreateHostBuilder() {
+		return Host.CreateDefaultBuilder()
+			.ConfigureWebHostDefaults(builder => {
+				builder.UseStartup<DummyStartup>();
+			});
+	}
+
+	public async Task InitializeAsync() {
+		await Services.GetRequiredService<AutoScavengePlugin>().Start();
+	}
+
+	async Task IAsyncLifetime.DisposeAsync() {
+		await Services.GetRequiredService<AutoScavengePlugin>().Stop();
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/FakeAutoScavengeClient.cs b/src/KurrentDB.AutoScavenge.Tests/FakeAutoScavengeClient.cs
new file mode 100644
index 00000000000..a883215a9ab
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/FakeAutoScavengeClient.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.AutoScavenge.Clients;
+using KurrentDB.AutoScavenge.Domain;
+using NCrontab;
+
+namespace KurrentDB.AutoScavenge.Tests;
+
+public class FakeAutoScavengeClient : IAutoScavengeClient {
+	public ICommand? Command { get; private set; }
+
+	public Task<Response<AutoScavengeStatusResponse>> GetStatus(CancellationToken token) {
+		Command = new Commands.GetStatus(_ => { });
+		return Task.FromResult(Response.Successful(new AutoScavengeStatusResponse(AutoScavengeStatusResponse.Status.NotConfigured, null, null)));
+	}
+
+	public Task<Response<Unit>> Pause(CancellationToken token) {
+		Command = new Commands.PauseProcess(_ => { });
+		return Task.FromResult(Response.Accepted());
+	}
+
+	public Task<Response<Unit>> Resume(CancellationToken token) {
+		Command = new Commands.ResumeProcess(_ => { });
+		return Task.FromResult(Response.Accepted());
+	}
+
+	public Task<Response<Unit>> Configure(CrontabSchedule schedule, CancellationToken token) {
+		Command = new Commands.Configure(schedule, _ => { });
+		return Task.FromResult(Response.Accepted());
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/FakeClient.cs b/src/KurrentDB.AutoScavenge.Tests/FakeClient.cs
new file mode 100644
index 00000000000..479f1be2714
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/FakeClient.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Runtime.CompilerServices;
+using KurrentDB.POC.IO.Core;
+
+namespace KurrentDB.AutoScavenge.Tests;
+
+public class FakeClient : IClient {
+	private readonly Dictionary<string, List<Event>> _streams = new();
+
+	public async IAsyncEnumerable<Event> ReadStreamForwards(string stream, long maxCount, [EnumeratorCancellation] CancellationToken ct) {
+		if (!_streams.TryGetValue(stream, out var events))
+			yield break;
+
+		var count = 0L;
+		for (var i = 0; i < events.Count; i++) {
+			ct.ThrowIfCancellationRequested();
+			yield return events[i];
+			count++;
+
+			if (count >= maxCount)
+				break;
+		}
+
+		await Task.Delay(TimeSpan.Zero, ct);
+	}
+
+	public async IAsyncEnumerable<Event> ReadStreamBackwards(string stream, long maxCount, [EnumeratorCancellation] CancellationToken ct) {
+		if (!_streams.TryGetValue(stream, out var events))
+			yield break;
+
+		var count = 0L;
+		for (var i = events.Count - 1; i >= 0; i--) {
+			ct.ThrowIfCancellationRequested();
+			yield return events[i];
+			count++;
+
+			if (count >= maxCount)
+				break;
+		}
+
+		await Task.Delay(TimeSpan.Zero, ct);
+	}
+
+	public void AddEvent(string stream, IEvent @event, ReadOnlyMemory<byte> data) {
+		if (!_streams.TryGetValue(stream, out var events)) {
+			events = new List<Event>();
+			_streams[stream] = events;
+		}
+
+		events.Add(new Event(
+			eventId: Guid.Empty,
+			created: DateTime.Now,
+			stream: stream,
+			eventNumber: 0,
+			eventType: @event.Type,
+			contentType: string.Empty,
+			commitPosition: 0,
+			preparePosition: 0,
+			isRedacted: false,
+			data: data,
+			metadata: Array.Empty<byte>()));
+	}
+
+	public Task WriteMetaDataMaxCountAsync(string stream, CancellationToken cancellationToken) =>
+		throw new NotSupportedException();
+
+	public Task<long> WriteAsync(string stream, EventToWrite[] events, long expectedVersion, CancellationToken cancellationToken) =>
+		throw new NotSupportedException();
+
+	public IAsyncEnumerable<Event> SubscribeToAll(FromAll start, CancellationToken cancellationToken) =>
+		throw new NotSupportedException();
+
+	public IAsyncEnumerable<Event> ReadAllBackwardsAsync(Position position, long maxCount, CancellationToken cancellationToken) =>
+		throw new NotSupportedException();
+
+	public Task DeleteStreamAsync(string stream, long expectedVersion, CancellationToken cancellationToken) =>
+		throw new NotSupportedException();
+
+	public IAsyncEnumerable<Event> SubscribeToStream(string stream, CancellationToken cancellationToken) =>
+		throw new NotSupportedException();
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/FakeOperationsClient.cs b/src/KurrentDB.AutoScavenge.Tests/FakeOperationsClient.cs
new file mode 100644
index 00000000000..f037dafc5ee
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/FakeOperationsClient.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.POC.IO.Core;
+
+namespace KurrentDB.AutoScavenge.Tests;
+
+public class FakeOperationsClient : IOperationsClient {
+	public bool ResignationIssued { get; private set; }
+	public void Resign() {
+		ResignationIssued = true;
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/FakeScavenger.cs b/src/KurrentDB.AutoScavenge.Tests/FakeScavenger.cs
new file mode 100644
index 00000000000..2e003bc2eb2
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/FakeScavenger.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.AutoScavenge.Scavengers;
+
+namespace KurrentDB.AutoScavenge.Tests;
+
+public class FakeScavenger : INodeScavenger {
+	public Dictionary<Guid, ScavengingNode> Scavenges { get; } = new();
+
+	public bool Enabled { get; set; } = true;
+	public bool Pausable { get; set; } = true;
+
+	public Task<Guid?> TryStartScavengeAsync(string host, int port, CancellationToken token) {
+		if (!Enabled)
+			return Task.FromResult<Guid?>(null);
+
+		var scavengeId = Guid.NewGuid();
+
+		Scavenges.Add(scavengeId, new ScavengingNode {
+			ScavengeId = scavengeId,
+			Host = host,
+			Port = port,
+		});
+
+		return Task.FromResult((Guid?)scavengeId);
+	}
+
+	public Task<ScavengeStatus> TryGetScavengeAsync(string host, int port, Guid scavengeId, CancellationToken token) {
+		return Task.FromResult(Scavenges[scavengeId].Status);
+	}
+
+	public Task<bool> TryPauseScavengeAsync(string host, int port, Guid? scavengeId, CancellationToken token) {
+		if (!Pausable)
+			return Task.FromResult(false);
+
+		if (scavengeId is null) {
+			if (Scavenges.Count == 1) {
+				scavengeId = Scavenges.Single().Key;
+			} else {
+				return Task.FromResult(true);
+			}
+		}
+
+		Scavenges[scavengeId.Value].Status = ScavengeStatus.Stopped;
+		return Task.FromResult(true);
+	}
+
+	public void SetScavengeStatus(Guid scavengeId, ScavengeStatus status) {
+		Scavenges[scavengeId].Status = status;
+	}
+
+	public void RegisterScavengeFor(Guid scavengeId, ClusterMember member, ScavengeStatus status) {
+		Scavenges.Add(scavengeId, new ScavengingNode {
+			ScavengeId = scavengeId,
+			Host = member.InternalHttpEndPointIp,
+			Port = member.InternalHttpEndPointPort,
+			Status = status,
+		});
+	}
+
+	public class ScavengingNode {
+		public Guid ScavengeId { get; init; } = Guid.Empty;
+		public string Host { get; init; } = string.Empty;
+		public int Port { get; init; }
+		public ScavengeStatus Status { get; set; }
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/FakeSource.cs b/src/KurrentDB.AutoScavenge.Tests/FakeSource.cs
new file mode 100644
index 00000000000..38e46e72ce2
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/FakeSource.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text;
+using System.Text.Json;
+using KurrentDB.AutoScavenge.Converters;
+using KurrentDB.AutoScavenge.Sources;
+
+namespace KurrentDB.AutoScavenge.Tests;
+
+public class FakeSource : ISource {
+	private readonly FakeClient _fakeClient;
+	private readonly ClientSource _clientSource;
+
+	public FakeSource() {
+		_fakeClient = new FakeClient();
+		_clientSource = new ClientSource(_fakeClient);
+	}
+
+	public Task<Events.ConfigurationUpdated?> ReadConfigurationEvent(CancellationToken token) => _clientSource.ReadConfigurationEvent(token);
+
+	public IAsyncEnumerable<IEvent> ReadAutoScavengeEvents(CancellationToken token) => _clientSource.ReadAutoScavengeEvents(token);
+
+	public void AddConfigurationEvent(Events.ConfigurationUpdated @event) {
+		var serializerOptions = new JsonSerializerOptions() {
+			PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+			Converters = { new CrontableScheduleJsonConverter() }
+		};
+
+		var data = JsonSerializer.Serialize(@event, serializerOptions);
+		_fakeClient.AddEvent(StreamNames.AutoScavengeConfiguration, @event, Encoding.UTF8.GetBytes(data));
+	}
+
+	public void AddScavengeEvent(IEvent @event) {
+		var serializerOptions = new JsonSerializerOptions() {
+			PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+			Converters = { new EventJsonConverter() }
+		};
+
+		var data = JsonSerializer.Serialize(@event, serializerOptions);
+		_fakeClient.AddEvent(StreamNames.AutoScavenges, @event, Encoding.UTF8.GetBytes(data));
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/KurrentDB.AutoScavenge.Tests.csproj b/src/KurrentDB.AutoScavenge.Tests/KurrentDB.AutoScavenge.Tests.csproj
new file mode 100644
index 00000000000..8294189d829
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/KurrentDB.AutoScavenge.Tests.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+
+		<IsPackable>false</IsPackable>
+		<IsTestProject>true</IsTestProject>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
+		<PackageReference Include="Bogus" Version="35.5.1" />
+		<PackageReference Include="coverlet.collector" Version="6.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.7" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+		<PackageReference Include="xunit" Version="2.5.3" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Using Include="Xunit" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.AutoScavenge\KurrentDB.AutoScavenge.csproj" />
+	</ItemGroup>
+
+</Project>
diff --git a/src/KurrentDB.AutoScavenge.Tests/LicenseTests.cs b/src/KurrentDB.AutoScavenge.Tests/LicenseTests.cs
new file mode 100644
index 00000000000..3efe1ee25b4
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/LicenseTests.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Licensing;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
+
+namespace KurrentDB.AutoScavenge.Tests;
+
+public class LicenseTests {
+	[Fact]
+	public void when_invalid_license_disable() {
+		var startup = new DummyStartup(new ConfigurationBuilder().Build());
+		var sut = startup.AutoScavengePlugin;
+
+		var builder = WebApplication.CreateBuilder();
+
+		startup.ConfigureServices(builder.Services);
+		startup.Configure(builder.Build());
+		Assert.True(sut.Enabled);
+
+		var tokenWithoutEntitlement = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJlc2RiIiwiaXNzIjoiZXNkYiIsImV4cCI6MTgyNDQ1NjgyOSwianRpIjoiOTVmZTY2YzAtMDRkMi00MjExLWI1ZGQtNTAyM2MyYTAxMGFiIiwic3ViIjoiRVNEQiBUZXN0cyIsIklzVHJpYWwiOiJUcnVlIiwiSXNFeHBpcmVkIjoiRmFsc2UiLCJJc1ZhbGlkIjoiVHJ1ZSIsIklzRmxvYXRpbmciOiJUcnVlIiwiRGF5c1JlbWFpbmluZyI6IjEiLCJTdGFydERhdGUiOiIyNi8wNC8yMDI0IDAwOjAwOjAwICswMTowMCIsIk5PTkUiOiJ0cnVlIiwiaWF0IjoxNzI5ODQ4ODI5LCJuYmYiOjE3Mjk4NDg4Mjl9.R24i-ZAow3BhRaST3n25Uc_nQ184k83YRZZ0oRcWbU9B9XNLRH0Iegj0HmkyzkT50I4gcIJOIfcO6mIPp4Y959CP7aTAlt7XEnXoGF0GwsfXatAxy4iXG8Gpya7INgMoWEeN0v8eDH8_OVmnieOxeba9ex5j1oAW_FtQDMzcFjAeErpW__8zmkCsn6GzvlhdLE4e3r2wjshvrTTcS_1fvSVjQZov5ce2sVBJPegjCLO_QGiIBK9QTnpHrhe6KCYje6fSTjgty0V1Qj22bftvrXreYzQijPrnC_ek1BwV-A1JvacZugMCPIy8WvE5jE3hVYRWGGUzQZ-CibPGsjudYA";
+		startup.LicenseService.EmitLicense(new License(new(tokenWithoutEntitlement)));
+		Assert.False(sut.Enabled);
+	}
+
+	[Fact]
+	public void when_valid_license_stay_enabled() {
+		var startup = new DummyStartup(new ConfigurationBuilder().Build());
+		var sut = startup.AutoScavengePlugin;
+
+		var builder = WebApplication.CreateBuilder();
+
+		startup.ConfigureServices(builder.Services);
+		startup.Configure(builder.Build());
+		Assert.True(sut.Enabled);
+
+		startup.LicenseService.EmitLicense(startup.LicenseService.CurrentLicense!);
+		Assert.True(sut.Enabled);
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/PluginTests.cs b/src/KurrentDB.AutoScavenge.Tests/PluginTests.cs
new file mode 100644
index 00000000000..b2feb1d03ba
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/PluginTests.cs
@@ -0,0 +1,176 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net.Http.Headers;
+using System.Net.Http.Json;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using KurrentDB.AutoScavenge.Converters;
+using KurrentDB.AutoScavenge.Domain;
+using KurrentDB.POC.IO.Core.Serialization;
+using HttpMethod = System.Net.Http.HttpMethod;
+using HttpStatusCode = System.Net.HttpStatusCode;
+
+namespace KurrentDB.AutoScavenge.Tests;
+
+public class PluginTests : IClassFixture<DummyWebApplicationFactory> {
+	private static readonly JsonSerializerOptions JsonSerializerOptions = new() {
+		PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+		Converters = {
+			new EnumConverterWithDefault<AutoScavengeStatus>(),
+			new EnumConverterWithDefault<AutoScavengeStatusResponse.Status>(),
+			new CrontableScheduleJsonConverter(),
+		},
+	};
+
+	private readonly HttpClient _client;
+
+	public PluginTests(DummyWebApplicationFactory factory) {
+		_client = factory.CreateClient();
+	}
+
+	[Fact]
+	public async Task ShouldDenyAccessToEnabledEndpoint() {
+		var resp = await _client.GetAsync("/auto-scavenge/enabled");
+		Assert.Equal(HttpStatusCode.Unauthorized, resp.StatusCode);
+	}
+
+	[Fact]
+	public async Task ShouldDenyAccessToStatusEndpoint() {
+		var resp = await _client.GetAsync("/auto-scavenge/status");
+		Assert.Equal(HttpStatusCode.Unauthorized, resp.StatusCode);
+	}
+
+	[Fact]
+	public async Task ShouldDenyAccessToConfigureEndpointAuthenticatedWrongRole() {
+		var msg = new HttpRequestMessage(HttpMethod.Post, "/auto-scavenge/configure");
+		msg.Headers.Authorization = new AuthenticationHeaderValue("dummy", Convert.ToBase64String("johndoe:1234"u8.ToArray()));
+		var resp = await _client.SendAsync(msg);
+
+		Assert.Equal(HttpStatusCode.Forbidden, resp.StatusCode);
+	}
+
+	[Fact]
+	public async Task ShouldDenyAccessToPauseEndpointAuthenticatedWrongRole() {
+		var msg = new HttpRequestMessage(HttpMethod.Post, "/auto-scavenge/pause");
+		msg.Headers.Authorization = new AuthenticationHeaderValue("dummy", Convert.ToBase64String("johndoe:1234"u8.ToArray()));
+		var resp = await _client.SendAsync(msg);
+
+		Assert.Equal(HttpStatusCode.Forbidden, resp.StatusCode);
+	}
+
+	[Fact]
+	public async Task ShouldDenyAccessToResumeEndpointAuthenticatedWrongRole() {
+		var msg = new HttpRequestMessage(HttpMethod.Post, "/auto-scavenge/resume");
+		msg.Headers.Authorization = new AuthenticationHeaderValue("dummy", Convert.ToBase64String("johndoe:1234"u8.ToArray()));
+		var resp = await _client.SendAsync(msg);
+
+		Assert.Equal(HttpStatusCode.Forbidden, resp.StatusCode);
+	}
+
+	[Fact]
+	public async Task ShouldAccessEnabledEndpointAuthenticated() {
+		var msg = new HttpRequestMessage(HttpMethod.Get, "/auto-scavenge/enabled");
+		msg.Headers.Authorization = new AuthenticationHeaderValue("dummy", Convert.ToBase64String("ouro:changeit"u8.ToArray()));
+		var resp = await _client.SendAsync(msg);
+
+		resp.EnsureSuccessStatusCode();
+
+		var payload = await resp.Content.ReadFromJsonAsync<Dictionary<string, bool>>();
+		Assert.True(payload!["enabled"]!);
+	}
+
+	[Fact]
+	public async Task ShouldAccessStatusEndpoint() {
+		var attempt = 0;
+		HttpResponseMessage resp;
+
+		do {
+			var msg = new HttpRequestMessage(HttpMethod.Get, "/auto-scavenge/status");
+			msg.Headers.Authorization = new AuthenticationHeaderValue("dummy", Convert.ToBase64String("ouro:changeit"u8.ToArray()));
+			resp = await _client.SendAsync(msg);
+			attempt++;
+
+			var code = (int)resp.StatusCode;
+			if (code < 500)
+				break;
+			await Task.Delay(TimeSpan.FromSeconds(1));
+		} while (attempt < 30);
+
+		resp.EnsureSuccessStatusCode();
+		var payload = await resp.Content.ReadFromJsonAsync<AutoScavengeStatusResponse>(JsonSerializerOptions);
+
+		Assert.True(payload != null);
+
+		if (payload.Schedule != null) {
+			Assert.True(payload.State is AutoScavengeStatusResponse.Status.Waiting or AutoScavengeStatusResponse.Status.Paused);
+			Assert.NotNull(payload.TimeUntilNextCycle);
+		} else {
+			Assert.Equal(AutoScavengeStatusResponse.Status.NotConfigured, payload.State);
+			Assert.Null(payload.TimeUntilNextCycle);
+		}
+	}
+
+	[Fact]
+	public async Task ShouldAccessConfigureEndpoint() {
+		var attempt = 0;
+		HttpResponseMessage resp;
+
+		do {
+			var msg = new HttpRequestMessage(HttpMethod.Post, "/auto-scavenge/configure");
+			msg.Headers.Authorization = new AuthenticationHeaderValue("dummy", Convert.ToBase64String("ouro:changeit"u8.ToArray()));
+			msg.Content = JsonContent.Create(new JsonObject {
+				["schedule"] = "* * * * 1",
+			});
+			resp = await _client.SendAsync(msg);
+			attempt++;
+
+			var code = (int)resp.StatusCode;
+			if (code < 500)
+				break;
+			await Task.Delay(TimeSpan.FromSeconds(1));
+		} while (attempt < 30);
+
+		resp.EnsureSuccessStatusCode();
+	}
+
+	[Fact]
+	public async Task ShouldAccessPauseEndpoint() {
+		var attempt = 0;
+		HttpResponseMessage resp;
+
+		do {
+			var msg = new HttpRequestMessage(HttpMethod.Post, "/auto-scavenge/pause");
+			msg.Headers.Authorization = new AuthenticationHeaderValue("dummy", Convert.ToBase64String("ouro:changeit"u8.ToArray()));
+			resp = await _client.SendAsync(msg);
+			attempt++;
+
+			var code = (int)resp.StatusCode;
+			if (code < 500)
+				break;
+			await Task.Delay(TimeSpan.FromSeconds(1));
+		} while (attempt < 30);
+
+		resp.EnsureSuccessStatusCode();
+	}
+
+	[Fact]
+	public async Task ShouldAccessResumeEndpoint() {
+		var attempt = 0;
+		HttpResponseMessage resp;
+
+		do {
+			var msg = new HttpRequestMessage(HttpMethod.Post, "/auto-scavenge/resume");
+			msg.Headers.Authorization = new AuthenticationHeaderValue("dummy", Convert.ToBase64String("ouro:changeit"u8.ToArray()));
+			resp = await _client.SendAsync(msg);
+			attempt++;
+
+			var code = (int)resp.StatusCode;
+			if (code < 500)
+				break;
+			await Task.Delay(TimeSpan.FromSeconds(1));
+		} while (attempt < 30);
+
+		resp.EnsureSuccessStatusCode();
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/Schedule.cs b/src/KurrentDB.AutoScavenge.Tests/Schedule.cs
new file mode 100644
index 00000000000..940a5a2a8e8
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/Schedule.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using NCrontab;
+
+namespace KurrentDB.AutoScavenge.Tests;
+
+public static class Schedule {
+	public static CrontabSchedule EveryHour => CrontabSchedule.Parse("0 * * * *");
+	public static CrontabSchedule EveryDay => CrontabSchedule.Parse("0 0 * * *");
+	public static CrontabSchedule EveryWeek => CrontabSchedule.Parse("0 0 * * 0");
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/Simulator.cs b/src/KurrentDB.AutoScavenge.Tests/Simulator.cs
new file mode 100644
index 00000000000..954a1a5df8b
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/Simulator.cs
@@ -0,0 +1,176 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.AutoScavenge.Domain;
+using KurrentDB.AutoScavenge.Tests.TimeProviders;
+
+namespace KurrentDB.AutoScavenge.Tests;
+
+/// <summary>
+/// Utility object that helps auto scavenge state machine testing.
+/// </summary>
+public class Simulator {
+	private readonly FakeSource _source = new();
+	private readonly AutoScavengeProcessManager _machine;
+	private readonly Queue<ICommand> _queue = new();
+	private readonly List<ReactEvent> _reactsEvents = new();
+	private readonly List<ReactCommand> _reactsCommands = new();
+
+	/// <summary>
+	/// Holds all events and state updates that happened during the simulation.
+	/// </summary>
+	private readonly List<Snapshot> _snapshots = [];
+
+	/// <summary>
+	/// Holds all state transitions that happened during the simulation.
+	/// </summary>
+	private readonly List<ICommand> _transitions = [];
+
+	public DateTime Now => Time.Now;
+
+	public FakeScavenger Scavenger { get; } = new();
+
+	public FakeOperationsClient OperationsClient { get; } = new();
+
+	public FakeTimeProvider Time { get; } = new();
+
+
+	public Simulator(int clusterSize) {
+		_machine = new AutoScavengeProcessManager(clusterSize, Time, _source, OperationsClient, Scavenger);
+	}
+
+	/// <summary>
+	/// Feeds the simulator with a list of commands to be executed. The simulator handles commands in a FIFO order.
+	/// </summary>
+	/// <param name="inputs"></param>
+	public void EnqueueCommands(params ICommand[] inputs) {
+		foreach (var command in inputs)
+			_queue.Enqueue(command);
+	}
+
+	/// <summary>
+	/// Add events to the source of the simulator. Those events are not applied to the state machine but will be
+	/// available for the state machine to consume if it decides to load them.
+	/// </summary>
+	/// <param name="events"></param>
+	public void AddEventsToStorage(params IEvent[] events) {
+		foreach (var @event in events) {
+			if (@event is Events.ConfigurationUpdated update)
+				_source.AddConfigurationEvent(update);
+			else
+				_source.AddScavengeEvent(@event);
+		}
+	}
+
+	/// <summary>
+	/// Defines a list of actions to be executed if a specific event is emitted.
+	/// </summary>
+	/// <param name="reacts"></param>
+	public void Reacts(params ReactEvent[] reacts) {
+		foreach (var react in reacts)
+			_reactsEvents.Add(react);
+	}
+
+	/// <summary>
+	/// Defines a list of actions to be executed if the state machine moves do a specific command.
+	/// </summary>
+	/// <param name="reacts"></param>
+	public void Reacts(params ReactCommand[] reacts) {
+		foreach (var react in reacts)
+			_reactsCommands.Add(react);
+	}
+
+	/// <summary>
+	/// Runs the simulation until the command queue is empty or a <see cref="Suspend" /> command is found.
+	/// </summary>
+	/// <param name="token"></param>
+	public async Task Run(CancellationToken token) {
+		while (_queue.TryDequeue(out var command)) {
+			token.ThrowIfCancellationRequested();
+
+			if (command is SimulatorCommands.FastForward advance)
+				Time.FastForward(advance.Time);
+
+			if (command is SimulatorCommands.Suspend)
+				break;
+
+			while (command is not null)
+				command = await ProcessCommand(command);
+		}
+
+		async Task<ICommand?> ProcessCommand(ICommand command) {
+			var transition = await _machine.RunAsync(command, token);
+
+			// So far we only support reacting after a command is processed but we can add more as the need arises.
+			foreach (var react in _reactsCommands)
+				if (react.Type == command.GetType())
+					react.Fun(command);
+
+			if (transition.NextCommand != null) {
+				_queue.Enqueue(transition.NextCommand);
+				_transitions.Add(transition.NextCommand);
+			}
+
+			foreach (var @event in transition.Events) {
+				// When an event is emitted, we clone the both manager and configuration transient states before and after
+				// the event is applied. This allows us deeply state transition between snapshots.
+				var prevState = _machine.State.Clone();
+				_machine.Apply(@event);
+				_snapshots.Add(new Snapshot(
+					@event,
+					prevState,
+					_machine.State.Clone(),
+					Time.Now));
+
+				// We run event reacts after the event is applied to the state machine.
+				foreach (var react in _reactsEvents)
+					if (react.Type == @event.GetType())
+						react.Fun(@event);
+			}
+
+			command.OnSavedEvents();
+			return transition.NextCommand;
+		}
+	}
+
+	/// <summary>
+	/// Asserts that there are as many matches as we got snapshots. The order of each match should also have the same
+	/// type as the emitted event of that time.  A snapshot is taken every time an event is emitted
+	/// and applied to the state machine.
+	/// </summary>
+	/// <param name="matches"></param>
+	public void AssertSnapshots(List<Match> matches) {
+		Assert.Equal(matches.Count, _snapshots.Count);
+
+		for (var i = 0; i < matches.Count; i++) {
+			var (type, fun) = matches[i];
+			var snapshot = _snapshots[i];
+
+			Assert.IsType(type, snapshot.Event);
+
+			fun(snapshot.Event, snapshot);
+		}
+	}
+
+	public void ClearSnapshots() => _snapshots.Clear();
+}
+
+public record Match(Type Type, Action<IEvent, Snapshot> Fun);
+public record ReactEvent(Type Type, Action<IEvent> Fun);
+public record ReactCommand(Type Type, Action<ICommand> Fun);
+
+public static class Matches {
+	public static Match MatchEvent<T>(Action<T, Snapshot> fun) =>
+		new(typeof(T), (e, s) => fun((T)e, s));
+
+	public static Match MatchEvent<T>() =>
+		new(typeof(T), (_, _) => { });
+}
+
+public static class Reacts {
+	public static ReactEvent OnEvent<T>(Action<T> fun) =>
+		new(typeof(T), e => fun((T)e));
+
+	public static ReactCommand After<T>(Action<T> fun) =>
+		new(typeof(T), e => fun((T)e));
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/SimulatorCommands.cs b/src/KurrentDB.AutoScavenge.Tests/SimulatorCommands.cs
new file mode 100644
index 00000000000..4b8b4b1d304
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/SimulatorCommands.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.AutoScavenge.Tests;
+
+public class SimulatorCommands {
+	public record FastForward(TimeSpan Time) : Command<Unit>(_ => { });
+
+	public record Suspend() : Command<Unit>(_ => { });
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/Snapshot.cs b/src/KurrentDB.AutoScavenge.Tests/Snapshot.cs
new file mode 100644
index 00000000000..f74f3fa007d
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/Snapshot.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.AutoScavenge.Domain;
+
+namespace KurrentDB.AutoScavenge.Tests;
+
+public record Snapshot(
+	IEvent Event,
+	AutoScavengeState PrevState,
+	AutoScavengeState NewState,
+	DateTime Time);
+
diff --git a/src/KurrentDB.AutoScavenge.Tests/StateMachine/CompleteProcessTests.cs b/src/KurrentDB.AutoScavenge.Tests/StateMachine/CompleteProcessTests.cs
new file mode 100644
index 00000000000..e408565ddbf
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/StateMachine/CompleteProcessTests.cs
@@ -0,0 +1,463 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.AutoScavenge.Domain;
+using KurrentDB.AutoScavenge.Scavengers;
+
+namespace KurrentDB.AutoScavenge.Tests.StateMachine;
+
+public class CompleteProcessTests {
+
+	/// This test verifies that with a pre-existing configuration, the state machine detects that an auto
+	/// scavenge process is due. In this scenario, everything goes well like remote node scavenges for
+	/// example. The test should end with the leader node resigning because it's the only node left that needs to be
+	/// scavenged at the end of the process. That test simulates a 3 node cluster.
+	[Fact]
+	public async Task ShouldCompleteAutoScavengeProcessToLeaderResignation() {
+		var tokenSource = new CancellationTokenSource();
+		var simulator = new Simulator(3);
+		var clusterMembers = ClusterFixtures.Generate3NodesCluster();
+		var activeNodes = clusterMembers.Values.Select(m => m.ToNodeId()).ToHashSet();
+		var leader = ClusterFixtures.GetLeader(clusterMembers.Values);
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(leader.InstanceId, clusterMembers.Values.ToList()),
+			Command.FastForward(TimeSpan.FromHours(1)),
+		]);
+
+		// Sets an auto scavenge configuration event for when the state machine will reload its configuration.
+		simulator.AddEventsToStorage(new Events.ConfigurationUpdated {
+			Schedule = Schedule.EveryHour,
+			UpdatedAt = simulator.Now,
+		});
+
+		simulator.Reacts(
+			Reacts.OnEvent<Events.NodeScavengeStarted>(@event => {
+				simulator.Scavenger.SetScavengeStatus(@event.ScavengeId, ScavengeStatus.Success);
+				simulator.EnqueueCommands(Command.ReceiveGossip(leader.InstanceId, clusterMembers.Values.ToList()));
+			}));
+
+		await simulator.Run(tokenSource.Token);
+
+		simulator.AssertSnapshots([
+			Matches.MatchEvent<Events.ClusterScavengeStarted>((@event, snapshot) => {
+				Assert.NotEqual(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.Equal(@event.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.Equal(@event.Members, snapshot.NewState.ClusterMembers);
+				Assert.Equal(@event.StartedAt, snapshot.Time);
+				Assert.Equal(AutoScavengeStatus.ContinuingClusterScavenge, snapshot.NewState.Status);
+
+				var needingScavenge = snapshot.NewState.NodesToScavenge.ToHashSet();
+				Assert.Equal(activeNodes, needingScavenge);
+				Assert.Equal(3, needingScavenge.Count);
+			}),
+
+			Matches.MatchEvent<Events.NodeDesignated>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.Equal(@event.NodeId, snapshot.NewState.DesignatedNode);
+				Assert.NotEqual(snapshot.PrevState.DesignatedNode, snapshot.NewState.DesignatedNode);
+				Assert.Equal(@event.DesignatedAt, snapshot.Time);
+
+				var needingScavenge = snapshot.PrevState.NodesToScavenge.ToHashSet();
+				var node = ClusterFixtures.GetFarthestNodeInReplication(
+					clusterMembers.Values.Where(m => needingScavenge.Contains(m.ToNodeId())));
+				Assert.Equal(snapshot.NewState.DesignatedNode, node.ToNodeId());
+			}),
+
+			Matches.MatchEvent<Events.NodeScavengeStarted>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.NotEqual(snapshot.PrevState.NodeScavengeId, snapshot.NewState.NodeScavengeId);
+				Assert.Equal(@event.ScavengeId, snapshot.NewState.NodeScavengeId);
+				Assert.Equal(@event.NodeId, snapshot.NewState.DesignatedNode);
+				Assert.Equal(@event.StartedAt, snapshot.Time);
+				Assert.Equal(snapshot.PrevState.DesignatedNode, snapshot.NewState.DesignatedNode);
+
+				var scavengingNode = simulator.Scavenger.Scavenges[@event.ScavengeId];
+
+				Assert.Equal(scavengingNode.Host, @event.NodeId.Address);
+				Assert.Equal(scavengingNode.Port, @event.NodeId.Port);
+			}),
+
+			Matches.MatchEvent<Events.NodeScavengeCompleted>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.Equal(@event.NodeId, snapshot.PrevState.DesignatedNode);
+				Assert.Equal(@event.CompletedAt, snapshot.Time);
+				Assert.Null(snapshot.NewState.DesignatedNode);
+				Assert.Equal(2, snapshot.NewState.NodesToScavenge.Count());
+			}),
+
+			Matches.MatchEvent<Events.NodeDesignated>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.Equal(@event.NodeId, snapshot.NewState.DesignatedNode);
+				Assert.NotEqual(snapshot.PrevState.DesignatedNode, snapshot.NewState.DesignatedNode);
+				Assert.Equal(@event.DesignatedAt, snapshot.Time);
+
+				var needingScavenge = snapshot.PrevState.NodesToScavenge.ToHashSet();
+				var node = ClusterFixtures.GetFarthestNodeInReplication(
+					clusterMembers.Values.Where(m => needingScavenge.Contains(m.ToNodeId())));
+				Assert.Equal(snapshot.NewState.DesignatedNode, node.ToNodeId());
+			}),
+
+			Matches.MatchEvent<Events.NodeScavengeStarted>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.NotEqual(snapshot.PrevState.NodeScavengeId, snapshot.NewState.NodeScavengeId);
+				Assert.Equal(@event.ScavengeId, snapshot.NewState.NodeScavengeId);
+				Assert.Equal(@event.NodeId, snapshot.NewState.DesignatedNode);
+				Assert.Equal(@event.StartedAt, snapshot.Time);
+				Assert.Equal(snapshot.PrevState.DesignatedNode, snapshot.NewState.DesignatedNode);
+
+				var scavengingNode = simulator.Scavenger.Scavenges[@event.ScavengeId];
+
+				Assert.Equal(scavengingNode.Host, @event.NodeId.Address);
+				Assert.Equal(scavengingNode.Port, @event.NodeId.Port);
+			}),
+
+			Matches.MatchEvent<Events.NodeScavengeCompleted>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.Equal(@event.NodeId, snapshot.PrevState.DesignatedNode);
+				Assert.Equal(@event.CompletedAt, snapshot.Time);
+				Assert.Null(snapshot.NewState.DesignatedNode);
+				Assert.Single(snapshot.NewState.NodesToScavenge);
+			}),
+
+			Matches.MatchEvent<Events.NodeDesignated>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.Equal(@event.NodeId, snapshot.NewState.DesignatedNode);
+				Assert.NotEqual(snapshot.PrevState.DesignatedNode, snapshot.NewState.DesignatedNode);
+				Assert.Equal(@event.DesignatedAt, snapshot.Time);
+
+				var needingScavenge = snapshot.PrevState.NodesToScavenge.ToHashSet();
+				Assert.Single(needingScavenge);
+				Assert.Equal(snapshot.NewState.DesignatedNode, leader.ToNodeId());
+			}),
+		]);
+
+		Assert.True(simulator.OperationsClient.ResignationIssued);
+	}
+
+	/// The test configures the simulator so the state machine detects there is only one node left that needs to be
+	/// scavenged. The test should end with that last node scavenged and the process marked as completed.
+	[Fact]
+	public async Task ShouldDetectThereIsOneNodeLeftThatNeedsScavengeThenCompleteTheProcess() {
+		var simulator = new Simulator(3);
+		var tokenSource = new CancellationTokenSource();
+		var clusterMembers = ClusterFixtures.Generate3NodesCluster();
+		var clusterMembersByNodeId = clusterMembers.ToDictionary(
+			x => x.Value.ToNodeId(),
+			x => x.Value);
+		var leader = ClusterFixtures.GetLeader(clusterMembers.Values);
+		var clusterScavengeId = Guid.NewGuid();
+		var followers = clusterMembersByNodeId.Keys.Except([leader.ToNodeId()]).ToList();
+
+		simulator.AddEventsToStorage([
+			new Events.ConfigurationUpdated {
+				Schedule = Schedule.EveryHour,
+				UpdatedAt = simulator.Now,
+			},
+
+			new Events.ClusterScavengeStarted {
+				ClusterScavengeId = clusterScavengeId,
+				Members = clusterMembersByNodeId.Keys.ToList(),
+				StartedAt = simulator.Now,
+			},
+
+			new Events.NodeDesignated {
+				NodeId = followers[0],
+				DesignatedAt = simulator.Now,
+			},
+
+			new Events.NodeScavengeStarted {
+				NodeId = followers[0],
+				ScavengeId = Guid.Parse("5cabeeee-0000-0000-0000-000000000001"),
+				StartedAt = simulator.Now,
+			},
+
+			new Events.NodeScavengeCompleted {
+				NodeId = followers[0],
+				CompletedAt = simulator.Now,
+				Result = "Success"
+			},
+
+			new Events.NodeDesignated {
+				NodeId = followers[1],
+				DesignatedAt = simulator.Now,
+			},
+
+			new Events.NodeScavengeStarted {
+				NodeId = followers[1],
+				ScavengeId = Guid.Parse("5cabeeee-0000-0000-0000-000000000002"),
+				StartedAt = simulator.Now,
+			},
+
+			new Events.NodeScavengeCompleted {
+				NodeId = followers[1],
+				CompletedAt = simulator.Now,
+				Result = "Success"
+			},
+
+			new Events.NodeDesignated {
+				NodeId = leader.ToNodeId(),
+				DesignatedAt = simulator.Now,
+			},
+		]);
+
+		leader.State = "Follower";
+		clusterMembersByNodeId[followers[0]].State = "Leader";
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(clusterMembersByNodeId[followers[0]].InstanceId, clusterMembers.Values.ToList())
+		]);
+
+		simulator.Reacts(
+			Reacts.OnEvent<Events.NodeScavengeStarted>(@event => {
+				simulator.Scavenger.SetScavengeStatus(@event.ScavengeId, ScavengeStatus.Success);
+				simulator.EnqueueCommands(Command.ReceiveGossip(clusterMembersByNodeId[followers[0]].InstanceId, clusterMembers.Values.ToList()));
+			}));
+
+		await simulator.Run(tokenSource.Token);
+
+		var previousLeader = leader;
+
+		simulator.AssertSnapshots([
+			Matches.MatchEvent<Events.NodeScavengeStarted>((@event, _) => {
+				Assert.Equal(@event.NodeId, previousLeader.ToNodeId());
+			}),
+
+			Matches.MatchEvent<Events.NodeScavengeCompleted>((@event, _) => {
+				Assert.Equal(@event.NodeId, previousLeader.ToNodeId());
+			}),
+
+			Matches.MatchEvent<Events.ClusterScavengeCompleted>((@event, _) => {
+				Assert.Equal(@event.ClusterScavengeId, clusterScavengeId);
+				Assert.Equal(@event.Members, clusterMembersByNodeId.Keys.ToList());
+			})
+		]);
+	}
+
+	/// The test verifies that a single node database is able to complete an auto scavenge process successfully.
+	[Fact]
+	public async Task ShouldCompleteAutoScavengeProcessOnASingleNodeSetUp() {
+		var simulator = new Simulator(1);
+		var tokenSource = new CancellationTokenSource();
+		var singleNode = ClusterFixtures.GenerateSingleNode();
+
+		simulator.AddEventsToStorage(new Events.ConfigurationUpdated {
+			Schedule = Schedule.EveryHour,
+			UpdatedAt = simulator.Now,
+		});
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(singleNode.InstanceId, [singleNode]),
+			Command.FastForward(TimeSpan.FromHours(1))
+		]);
+
+		simulator.Reacts(
+			Reacts.OnEvent<Events.NodeScavengeStarted>(@event => {
+				simulator.Scavenger.SetScavengeStatus(@event.ScavengeId, ScavengeStatus.Success);
+				simulator.EnqueueCommands(Command.ReceiveGossip(singleNode.InstanceId, [singleNode]));
+			}));
+
+		await simulator.Run(tokenSource.Token).WaitAsync(TimeSpan.FromSeconds(2));
+
+		simulator.AssertSnapshots([
+			Matches.MatchEvent<Events.ClusterScavengeStarted>((_, snapshot) => {
+				Assert.Equal(AutoScavengeStatus.ContinuingClusterScavenge, snapshot.NewState.Status);
+			}),
+			Matches.MatchEvent<Events.NodeDesignated>(),
+			Matches.MatchEvent<Events.NodeScavengeStarted>(),
+			Matches.MatchEvent<Events.NodeScavengeCompleted>(),
+			Matches.MatchEvent<Events.ClusterScavengeCompleted>(),
+		]);
+	}
+
+	[Fact]
+	public async Task ShouldCompleteAutoScavengeProcessToLeaderResignationWithRoR() {
+		var tokenSource = new CancellationTokenSource();
+		var simulator = new Simulator(3);
+		var clusterMembers = ClusterFixtures.Generate3NodesClusterWith2RoRs();
+		var activeNodes = clusterMembers.Values.Select(m => m.ToNodeId()).ToHashSet();
+		var leader = ClusterFixtures.GetLeader(clusterMembers.Values);
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(leader.InstanceId, clusterMembers.Values.ToList()),
+			Command.FastForward(TimeSpan.FromHours(1)),
+		]);
+
+		// Sets an auto scavenge configuration event for when the state machine will reload its configuration.
+		simulator.AddEventsToStorage(new Events.ConfigurationUpdated {
+			Schedule = Schedule.EveryHour,
+			UpdatedAt = simulator.Now,
+		});
+
+		simulator.Reacts(
+			Reacts.OnEvent<Events.NodeScavengeStarted>(@event => {
+				simulator.Scavenger.SetScavengeStatus(@event.ScavengeId, ScavengeStatus.Success);
+				simulator.EnqueueCommands(Command.ReceiveGossip(leader.InstanceId, clusterMembers.Values.ToList()));
+			}));
+
+		await simulator.Run(tokenSource.Token);
+
+		simulator.AssertSnapshots([
+			Matches.MatchEvent<Events.ClusterScavengeStarted>((@event, snapshot) => {
+				Assert.NotEqual(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.Equal(@event.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.Equal(@event.Members, snapshot.NewState.ClusterMembers);
+				Assert.Equal(@event.StartedAt, snapshot.Time);
+				Assert.Equal(AutoScavengeStatus.ContinuingClusterScavenge, snapshot.NewState.Status);
+
+				var needingScavenge = snapshot.NewState.NodesToScavenge.ToHashSet();
+				Assert.Equal(activeNodes, needingScavenge);
+				Assert.Equal(5, needingScavenge.Count);
+			}),
+
+			Matches.MatchEvent<Events.NodeDesignated>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.Equal(@event.NodeId, snapshot.NewState.DesignatedNode);
+				Assert.NotEqual(snapshot.PrevState.DesignatedNode, snapshot.NewState.DesignatedNode);
+				Assert.Equal(@event.DesignatedAt, snapshot.Time);
+
+				var needingScavenge = snapshot.PrevState.NodesToScavenge.ToHashSet();
+				var node = ClusterFixtures.GetFarthestNodeInReplication(
+					clusterMembers.Values.Where(m => needingScavenge.Contains(m.ToNodeId())));
+				Assert.Equal(snapshot.NewState.DesignatedNode, node.ToNodeId());
+			}),
+
+			Matches.MatchEvent<Events.NodeScavengeStarted>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.NotEqual(snapshot.PrevState.NodeScavengeId, snapshot.NewState.NodeScavengeId);
+				Assert.Equal(@event.ScavengeId, snapshot.NewState.NodeScavengeId);
+				Assert.Equal(@event.NodeId, snapshot.NewState.DesignatedNode);
+				Assert.Equal(@event.StartedAt, snapshot.Time);
+				Assert.Equal(snapshot.PrevState.DesignatedNode, snapshot.NewState.DesignatedNode);
+
+				var scavengingNode = simulator.Scavenger.Scavenges[@event.ScavengeId];
+
+				Assert.Equal(scavengingNode.Host, @event.NodeId.Address);
+				Assert.Equal(scavengingNode.Port, @event.NodeId.Port);
+			}),
+
+			Matches.MatchEvent<Events.NodeScavengeCompleted>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.Equal(@event.NodeId, snapshot.PrevState.DesignatedNode);
+				Assert.Equal(@event.CompletedAt, snapshot.Time);
+				Assert.Null(snapshot.NewState.DesignatedNode);
+				Assert.Equal(4, snapshot.NewState.NodesToScavenge.Count());
+			}),
+
+			Matches.MatchEvent<Events.NodeDesignated>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.Equal(@event.NodeId, snapshot.NewState.DesignatedNode);
+				Assert.NotEqual(snapshot.PrevState.DesignatedNode, snapshot.NewState.DesignatedNode);
+				Assert.Equal(@event.DesignatedAt, snapshot.Time);
+
+				var needingScavenge = snapshot.PrevState.NodesToScavenge.ToHashSet();
+				var node = ClusterFixtures.GetFarthestNodeInReplication(
+					clusterMembers.Values.Where(m => needingScavenge.Contains(m.ToNodeId())));
+				Assert.Equal(snapshot.NewState.DesignatedNode, node.ToNodeId());
+			}),
+
+			Matches.MatchEvent<Events.NodeScavengeStarted>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.NotEqual(snapshot.PrevState.NodeScavengeId, snapshot.NewState.NodeScavengeId);
+				Assert.Equal(@event.ScavengeId, snapshot.NewState.NodeScavengeId);
+				Assert.Equal(@event.NodeId, snapshot.NewState.DesignatedNode);
+				Assert.Equal(@event.StartedAt, snapshot.Time);
+				Assert.Equal(snapshot.PrevState.DesignatedNode, snapshot.NewState.DesignatedNode);
+
+				var scavengingNode = simulator.Scavenger.Scavenges[@event.ScavengeId];
+
+				Assert.Equal(scavengingNode.Host, @event.NodeId.Address);
+				Assert.Equal(scavengingNode.Port, @event.NodeId.Port);
+			}),
+
+			Matches.MatchEvent<Events.NodeScavengeCompleted>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.Equal(@event.NodeId, snapshot.PrevState.DesignatedNode);
+				Assert.Equal(@event.CompletedAt, snapshot.Time);
+				Assert.Null(snapshot.NewState.DesignatedNode);
+				Assert.Equal(3, snapshot.NewState.NodesToScavenge.Count());
+			}),
+
+			Matches.MatchEvent<Events.NodeDesignated>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.Equal(@event.NodeId, snapshot.NewState.DesignatedNode);
+				Assert.NotEqual(snapshot.PrevState.DesignatedNode, snapshot.NewState.DesignatedNode);
+				Assert.Equal(@event.DesignatedAt, snapshot.Time);
+
+				var needingScavenge = snapshot.PrevState.NodesToScavenge.ToHashSet();
+				var node = ClusterFixtures.GetFarthestNodeInReplication(
+					clusterMembers.Values.Where(m => needingScavenge.Contains(m.ToNodeId())));
+				Assert.Equal(snapshot.NewState.DesignatedNode, node.ToNodeId());
+			}),
+
+			Matches.MatchEvent<Events.NodeScavengeStarted>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.NotEqual(snapshot.PrevState.NodeScavengeId, snapshot.NewState.NodeScavengeId);
+				Assert.Equal(@event.ScavengeId, snapshot.NewState.NodeScavengeId);
+				Assert.Equal(@event.NodeId, snapshot.NewState.DesignatedNode);
+				Assert.Equal(@event.StartedAt, snapshot.Time);
+				Assert.Equal(snapshot.PrevState.DesignatedNode, snapshot.NewState.DesignatedNode);
+
+				var scavengingNode = simulator.Scavenger.Scavenges[@event.ScavengeId];
+
+				Assert.Equal(scavengingNode.Host, @event.NodeId.Address);
+				Assert.Equal(scavengingNode.Port, @event.NodeId.Port);
+			}),
+
+			Matches.MatchEvent<Events.NodeScavengeCompleted>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.Equal(@event.NodeId, snapshot.PrevState.DesignatedNode);
+				Assert.Equal(@event.CompletedAt, snapshot.Time);
+				Assert.Null(snapshot.NewState.DesignatedNode);
+				Assert.Equal(2, snapshot.NewState.NodesToScavenge.Count());
+			}),
+
+			Matches.MatchEvent<Events.NodeDesignated>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.Equal(@event.NodeId, snapshot.NewState.DesignatedNode);
+				Assert.NotEqual(snapshot.PrevState.DesignatedNode, snapshot.NewState.DesignatedNode);
+				Assert.Equal(@event.DesignatedAt, snapshot.Time);
+
+				var needingScavenge = snapshot.PrevState.NodesToScavenge.ToHashSet();
+				var node = ClusterFixtures.GetFarthestNodeInReplication(
+					clusterMembers.Values.Where(m => needingScavenge.Contains(m.ToNodeId())));
+				Assert.Equal(snapshot.NewState.DesignatedNode, node.ToNodeId());
+			}),
+
+			Matches.MatchEvent<Events.NodeScavengeStarted>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.NotEqual(snapshot.PrevState.NodeScavengeId, snapshot.NewState.NodeScavengeId);
+				Assert.Equal(@event.ScavengeId, snapshot.NewState.NodeScavengeId);
+				Assert.Equal(@event.NodeId, snapshot.NewState.DesignatedNode);
+				Assert.Equal(@event.StartedAt, snapshot.Time);
+				Assert.Equal(snapshot.PrevState.DesignatedNode, snapshot.NewState.DesignatedNode);
+
+				var scavengingNode = simulator.Scavenger.Scavenges[@event.ScavengeId];
+
+				Assert.Equal(scavengingNode.Host, @event.NodeId.Address);
+				Assert.Equal(scavengingNode.Port, @event.NodeId.Port);
+			}),
+
+			Matches.MatchEvent<Events.NodeScavengeCompleted>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.Equal(@event.NodeId, snapshot.PrevState.DesignatedNode);
+				Assert.Equal(@event.CompletedAt, snapshot.Time);
+				Assert.Null(snapshot.NewState.DesignatedNode);
+				Assert.Single(snapshot.NewState.NodesToScavenge);
+			}),
+
+			Matches.MatchEvent<Events.NodeDesignated>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.Equal(@event.NodeId, snapshot.NewState.DesignatedNode);
+				Assert.NotEqual(snapshot.PrevState.DesignatedNode, snapshot.NewState.DesignatedNode);
+				Assert.Equal(@event.DesignatedAt, snapshot.Time);
+
+				var needingScavenge = snapshot.PrevState.NodesToScavenge.ToHashSet();
+				Assert.Single(needingScavenge);
+				Assert.Equal(snapshot.NewState.DesignatedNode, leader.ToNodeId());
+			}),
+		]);
+
+		Assert.True(simulator.OperationsClient.ResignationIssued);
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/StateMachine/ConfigurationTests.cs b/src/KurrentDB.AutoScavenge.Tests/StateMachine/ConfigurationTests.cs
new file mode 100644
index 00000000000..2b59638f2a2
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/StateMachine/ConfigurationTests.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.AutoScavenge.Tests.StateMachine;
+
+public class ConfigurationTests {
+
+	/// We check that a user can set up the auto scavenge process when there is no pre-existing configuration. The
+	/// state machine must be updated accordingly and the configuration persisted.
+	[Fact]
+	public async Task ShouldBeConfiguredWithNoConfigurationHistory() {
+		var simulator = new Simulator(1);
+		var tokenSource = new CancellationTokenSource();
+		var schedule = Schedule.EveryDay;
+		var singleNode = ClusterFixtures.GenerateSingleNode();
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(singleNode.InstanceId, [singleNode]),
+			Command.Configure(schedule),
+		]);
+
+		await simulator.Run(tokenSource.Token);
+
+		simulator.AssertSnapshots([
+			Matches.MatchEvent<Events.ConfigurationUpdated>((@event, snapshot) => {
+				Assert.False(snapshot.PrevState.Configuration.IsConfigured);
+				Assert.True(snapshot.NewState.Configuration.IsConfigured);
+				Assert.Equal(@event.Schedule, schedule);
+				Assert.Equal(@event.UpdatedAt, snapshot.Time);
+				Assert.Equal(@event.UpdatedAt, snapshot.NewState.Configuration.StartingPoint);
+				Assert.Equal(@event.Schedule, snapshot.NewState.Configuration.Schedule);
+			})
+		]);
+	}
+
+	/// We check that when a user updates the auto scavenge process with a pre-existing configuration, that the state
+	/// machine is updated accordingly and the configuration persisted.
+	[Fact]
+	public async Task ShouldOverrideExistingConfiguration() {
+		var simulator = new Simulator(1);
+		var tokenSource = new CancellationTokenSource();
+		var previousSchedule = Schedule.EveryDay;
+		var newSchedule = Schedule.EveryWeek;
+		var previousUpdateTime = simulator.Now;
+		var singleNode = ClusterFixtures.GenerateSingleNode();
+
+		simulator.AddEventsToStorage(new Events.ConfigurationUpdated {
+			Schedule = previousSchedule,
+			UpdatedAt = previousUpdateTime,
+		});
+
+		var taskSource = new TaskCompletionSource<Response<Unit>>();
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(singleNode.InstanceId, [singleNode]),
+		]);
+
+		await simulator.Run(tokenSource.Token).WaitAsync(TimeSpan.FromSeconds(2));
+
+		// At this point the simulator has been initialized with the previous configuration.
+		simulator.EnqueueCommands([
+			Command.FastForward(TimeSpan.FromHours(2)),
+			Command.Configure(newSchedule, taskSource.SetResult),
+		]);
+
+		await simulator.Run(tokenSource.Token).WaitAsync(TimeSpan.FromSeconds(2));
+
+		simulator.AssertSnapshots([
+			Matches.MatchEvent<Events.ConfigurationUpdated>((@event, snapshot) => {
+				Assert.True(snapshot.PrevState.Configuration.IsConfigured);
+				Assert.Equal(snapshot.PrevState.Configuration.Schedule?.ToString(), previousSchedule.ToString());
+				Assert.Equal(snapshot.PrevState.Configuration.StartingPoint, previousUpdateTime);
+				Assert.True(snapshot.NewState.Configuration.IsConfigured);
+				Assert.Equal(@event.Schedule.ToString(), newSchedule.ToString());
+				Assert.Equal(@event.UpdatedAt, snapshot.Time);
+				Assert.Equal(@event.UpdatedAt, snapshot.NewState.Configuration.StartingPoint);
+				Assert.Equal(@event.Schedule.ToString(), snapshot.NewState.Configuration.Schedule?.ToString());
+			})
+		]);
+
+		var resp = await taskSource.Task.WaitAsync(TimeSpan.FromSeconds(2));
+		Assert.True(resp.IsSuccessful(out _));
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/StateMachine/ControlTests.cs b/src/KurrentDB.AutoScavenge.Tests/StateMachine/ControlTests.cs
new file mode 100644
index 00000000000..e5025f0d0db
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/StateMachine/ControlTests.cs
@@ -0,0 +1,391 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.AutoScavenge.Scavengers;
+
+namespace KurrentDB.AutoScavenge.Tests.StateMachine;
+
+// Home of tests related to pause/resume commands of the auto scavenge process.
+public class ControlTests {
+	/// The test verifies that we are able to stop an auto scavenge process in normal condition. The test is a success
+	/// if the simulator ends up emitting an auto scavenge process paused event.
+	[Fact]
+	public async Task ShouldPauseTheAutoScavengeProcessWhenScavengingNode() {
+		var simulator = new Simulator(3);
+		var tokenSource = new CancellationTokenSource();
+		var clusterMembers = ClusterFixtures.Generate3NodesCluster();
+		var clusterMembersByNodeId = clusterMembers.ToDictionary(
+			x => x.Value.ToNodeId(),
+			x => x.Value);
+		var activeNodes = clusterMembers.Values.Select(m => m.ToNodeId())
+			.ToHashSet();
+		var leader = ClusterFixtures.GetLeader(clusterMembers.Values);
+		var clusterScavengeId = Guid.NewGuid();
+		var followers = activeNodes.Except([leader.ToNodeId()]).ToList();
+
+		simulator.AddEventsToStorage([
+			new Events.ConfigurationUpdated {
+				Schedule = Schedule.EveryHour,
+				UpdatedAt = simulator.Now,
+			},
+
+			new Events.ClusterScavengeStarted {
+				ClusterScavengeId = clusterScavengeId,
+				Members = activeNodes.ToList(),
+				StartedAt = simulator.Now,
+			},
+
+			new Events.NodeDesignated {
+				NodeId = followers[0],
+				DesignatedAt = simulator.Now,
+			},
+
+			new Events.NodeScavengeStarted {
+				NodeId = followers[0],
+				ScavengeId = Guid.Parse("5cabeeee-0000-0000-0000-000000000001"),
+				StartedAt = simulator.Now,
+			},
+		]);
+
+		simulator.Scavenger.RegisterScavengeFor(Guid.Parse("5cabeeee-0000-0000-0000-000000000001"), clusterMembersByNodeId[followers[0]], ScavengeStatus.InProgress);
+
+		var pauseProcessTask = new TaskCompletionSource<Response<Unit>>();
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(leader.InstanceId, clusterMembers.Values.ToList()),
+			Command.PauseProcess(resp => pauseProcessTask.SetResult(resp)),
+		]);
+
+		await simulator.Run(tokenSource.Token);
+
+		simulator.AssertSnapshots([
+			Matches.MatchEvent<Events.PauseRequested>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+			}),
+
+			Matches.MatchEvent<Events.Paused>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+			}),
+		]);
+
+		var response = await pauseProcessTask.Task;
+
+		Assert.True(response.IsAccepted(out _));
+	}
+
+	[Fact]
+	public async Task ShouldPauseTheAutoScavengeProcessWhenNotScavengingNode() {
+		var simulator = new Simulator(3);
+		var tokenSource = new CancellationTokenSource();
+		var clusterMembers = ClusterFixtures.Generate3NodesCluster();
+		var activeNodes = clusterMembers.Values.Select(m => m.InstanceId)
+			.ToHashSet();
+		var leader = ClusterFixtures.GetLeader(clusterMembers.Values);
+		var clusterScavengeId = Guid.NewGuid();
+		var followers = activeNodes.Except([leader.InstanceId]).ToList();
+
+		simulator.AddEventsToStorage([
+			new Events.ConfigurationUpdated {
+				Schedule = Schedule.EveryHour,
+				UpdatedAt = simulator.Now,
+			},
+		]);
+
+		simulator.Scavenger.RegisterScavengeFor(Guid.Parse("5cabeeee-0000-0000-0000-000000000001"), clusterMembers[followers[0]], ScavengeStatus.InProgress);
+
+		var pauseProcessTask = new TaskCompletionSource<Response<Unit>>();
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(leader.InstanceId, clusterMembers.Values.ToList()),
+			Command.PauseProcess(resp => pauseProcessTask.SetResult(resp)),
+		]);
+
+		await simulator.Run(tokenSource.Token);
+
+		simulator.AssertSnapshots([
+			Matches.MatchEvent<Events.Paused>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+			}),
+		]);
+
+		var response = await pauseProcessTask.Task;
+
+		Assert.True(response.IsSuccessful(out _));
+	}
+
+	[Fact]
+	public async Task ShouldPauseTheAutoScavengeProcessWhenPossiblyScavengingNode() {
+		var simulator = new Simulator(3);
+		var tokenSource = new CancellationTokenSource();
+		var clusterMembers = ClusterFixtures.Generate3NodesCluster();
+		var activeNodes = clusterMembers.Values.Select(m => m.ToNodeId())
+			.ToHashSet();
+		var leader = ClusterFixtures.GetLeader(clusterMembers.Values);
+		var clusterScavengeId = Guid.NewGuid();
+		var followers = activeNodes.Except([leader.ToNodeId()]).ToList();
+
+		simulator.AddEventsToStorage([
+			new Events.ConfigurationUpdated {
+				Schedule = Schedule.EveryHour,
+				UpdatedAt = simulator.Now,
+			},
+
+			new Events.ClusterScavengeStarted {
+				ClusterScavengeId = clusterScavengeId,
+				Members = activeNodes.ToList(),
+				StartedAt = simulator.Now,
+			},
+
+			new Events.NodeDesignated {
+				NodeId = followers[0],
+				DesignatedAt = simulator.Now,
+			},
+		]);
+
+		simulator.Scavenger.Enabled = false;
+
+		var pauseProcessTask = new TaskCompletionSource<Response<Unit>>();
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(leader.InstanceId, clusterMembers.Values.ToList()),
+			Command.PauseProcess(resp => pauseProcessTask.SetResult(resp)),
+		]);
+
+		await simulator.Run(tokenSource.Token);
+
+		simulator.AssertSnapshots([
+			Matches.MatchEvent<Events.PauseRequested>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+			}),
+
+			Matches.MatchEvent<Events.Paused>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+			}),
+		]);
+
+		var response = await pauseProcessTask.Task;
+
+		Assert.True(response.IsAccepted(out _));
+	}
+
+	/// The test verifies that we are able to resume a paused auto scavenge process in normal condition. The test is
+	/// a success if the simulator ends up emitting an auto scavenge process resumed event.
+	[Fact]
+	public async Task ShouldResumePausedAutoScavengeProcess() {
+		var simulator = new Simulator(3);
+		var tokenSource = new CancellationTokenSource();
+		var clusterMembers = ClusterFixtures.Generate3NodesCluster();
+		var activeNodes = clusterMembers.Values.Select(m => m.ToNodeId())
+			.ToHashSet();
+		var leader = ClusterFixtures.GetLeader(clusterMembers.Values);
+		var clusterScavengeId = Guid.NewGuid();
+		var followers = activeNodes.Except([leader.ToNodeId()]).ToList();
+
+		simulator.AddEventsToStorage([
+			new Events.ConfigurationUpdated {
+				Schedule = Schedule.EveryHour,
+				UpdatedAt = simulator.Now,
+			},
+
+			new Events.ClusterScavengeStarted {
+				ClusterScavengeId = clusterScavengeId,
+				Members = activeNodes.ToList(),
+				StartedAt = simulator.Now,
+			},
+
+			new Events.NodeDesignated {
+				NodeId = followers[0],
+				DesignatedAt = simulator.Now,
+			},
+
+			new Events.Paused() {
+				PausedAt = simulator.Now,
+			},
+		]);
+
+		simulator.Reacts([
+			Reacts.OnEvent<Events.NodeScavengeStarted>(_ => simulator.EnqueueCommands(Command.Suspend)),
+		]);
+
+		var pauseProcessTask = new TaskCompletionSource<Response<Unit>>();
+
+		simulator.EnqueueCommands(
+			Command.ReceiveGossip(leader.InstanceId, clusterMembers.Values.ToList()),
+			Command.ResumeProcess(pauseProcessTask.SetResult)
+		);
+		await simulator.Run(tokenSource.Token);
+
+		simulator.AssertSnapshots([
+			Matches.MatchEvent<Events.Resumed>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+			}),
+
+			Matches.MatchEvent<Events.NodeDesignated>(),
+
+			// Testament that the auto scavenge process started a node scavenge on the designated node.
+			Matches.MatchEvent<Events.NodeScavengeStarted>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.DesignatedNode, snapshot.NewState.DesignatedNode);
+				Assert.Equal(@event.NodeId, snapshot.NewState.DesignatedNode);
+				Assert.True(simulator.Scavenger.Scavenges.ContainsKey(@event.ScavengeId));
+			}),
+		]);
+
+		var response = await pauseProcessTask.Task.WaitAsync(TimeSpan.FromSeconds(2));
+
+		Assert.True(response.IsSuccessful(out _));
+	}
+
+	/// The test verifies that we are able to pause an auto scavenge process when the node being scavenged becomes
+	/// temporarily unavailable
+	[Fact]
+	public async Task ShouldPauseTheAutoScavengeProcessWhenNodeBeingScavengedIsTemporarilyUnavailable() {
+		var simulator = new Simulator(3);
+		var tokenSource = new CancellationTokenSource();
+		var clusterMembers = ClusterFixtures.Generate3NodesCluster();
+		var clusterMembersByNodeId = clusterMembers.ToDictionary(
+			x => x.Value.ToNodeId(),
+			x => x.Value);
+		var activeNodes = clusterMembers.Values.Select(m => m.ToNodeId())
+			.ToHashSet();
+		var leader = ClusterFixtures.GetLeader(clusterMembers.Values);
+		var clusterScavengeId = Guid.NewGuid();
+		var followers = activeNodes.Except([leader.ToNodeId()]).ToList();
+
+		simulator.AddEventsToStorage([
+			new Events.ConfigurationUpdated {
+				Schedule = Schedule.EveryHour,
+				UpdatedAt = simulator.Now,
+			},
+
+			new Events.ClusterScavengeStarted {
+				ClusterScavengeId = clusterScavengeId,
+				Members = activeNodes.ToList(),
+				StartedAt = simulator.Now,
+			},
+
+			new Events.NodeDesignated {
+				NodeId = followers[0],
+				DesignatedAt = simulator.Now,
+			},
+
+			new Events.NodeScavengeStarted {
+				NodeId = followers[0],
+				ScavengeId = Guid.Parse("5cabeeee-0000-0000-0000-000000000001"),
+				StartedAt = simulator.Now,
+			}
+		]);
+
+		simulator.Scavenger.RegisterScavengeFor(Guid.Parse("5cabeeee-0000-0000-0000-000000000001"), clusterMembersByNodeId[followers[0]], ScavengeStatus.InProgress);
+		simulator.Scavenger.Pausable = false;
+
+		var pauseProcessTask = new TaskCompletionSource<Response<Unit>>();
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(leader.InstanceId, clusterMembers.Values.ToList()),
+			Command.PauseProcess(resp => pauseProcessTask.SetResult(resp)),
+			Command.ReceiveGossip(leader.InstanceId, clusterMembers.Values.ToList()),
+			Command.ReceiveGossip(leader.InstanceId, clusterMembers.Values.ToList())
+		]);
+
+		var gossipCount = 0;
+		simulator.Reacts(
+			Reacts.After<Commands.ReceiveGossip>(@event => {
+				if (++gossipCount == 3)
+					simulator.Scavenger.Pausable = true;
+			}));
+
+		await simulator.Run(tokenSource.Token);
+
+		simulator.AssertSnapshots([
+			Matches.MatchEvent<Events.PauseRequested>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+			}),
+			Matches.MatchEvent<Events.Paused>()
+		]);
+
+		var response = await pauseProcessTask.Task;
+
+		Assert.True(response.IsAccepted(out _));
+	}
+
+	/// The test verifies that we are able to pause an auto scavenge process when the node being scavenged is removed
+	/// from gossip, then replaced by a new node.
+	[Fact]
+	public async Task ShouldPauseTheAutoScavengeProcessWhenNodeBeingScavengedIsReplacedInGossip() {
+		var simulator = new Simulator(3);
+		var tokenSource = new CancellationTokenSource();
+		var clusterMembers = ClusterFixtures.Generate3NodesCluster();
+		var clusterMembersByNodeId = clusterMembers.ToDictionary(
+			x => x.Value.ToNodeId(),
+			x => x.Value);
+		var activeNodes = clusterMembers.Values.Select(m => m.ToNodeId())
+			.ToHashSet();
+		var leader = ClusterFixtures.GetLeader(clusterMembers.Values);
+		var clusterScavengeId = Guid.NewGuid();
+		var followers = activeNodes.Except([leader.ToNodeId()]).ToList();
+
+		simulator.AddEventsToStorage([
+			new Events.ConfigurationUpdated {
+				Schedule = Schedule.EveryHour,
+				UpdatedAt = simulator.Now,
+			},
+
+			new Events.ClusterScavengeStarted {
+				ClusterScavengeId = clusterScavengeId,
+				Members = activeNodes.ToList(),
+				StartedAt = simulator.Now,
+			},
+
+			new Events.NodeDesignated {
+				NodeId = followers[0],
+				DesignatedAt = simulator.Now,
+			},
+
+			new Events.NodeScavengeStarted {
+				NodeId = followers[0],
+				ScavengeId = Guid.Parse("5cabeeee-0000-0000-0000-000000000001"),
+				StartedAt = simulator.Now,
+			}
+		]);
+
+		simulator.Scavenger.RegisterScavengeFor(Guid.Parse("5cabeeee-0000-0000-0000-000000000001"), clusterMembersByNodeId[followers[0]], ScavengeStatus.InProgress);
+		simulator.Scavenger.Pausable = false;
+
+		var pauseProcessTask = new TaskCompletionSource<Response<Unit>>();
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(leader.InstanceId, clusterMembers.Values.ToList()),
+			Command.PauseProcess(resp => pauseProcessTask.SetResult(resp)),
+		]);
+
+		// remove the node being scavenged from the list of cluster members
+		var scavengingNode = clusterMembers.Values.First(x => x.ToNodeId() == followers[0]);
+		clusterMembers.Remove(scavengingNode.InstanceId);
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(leader.InstanceId, clusterMembers.Values.ToList()),
+		]);
+
+		// replace the node that was being scavenged by a new node
+		var newNode = ClusterFixtures.ClusterMembers.Generate(1).First();
+		clusterMembers.Add(newNode.InstanceId, newNode);
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(leader.InstanceId, clusterMembers.Values.ToList()),
+		]);
+
+		await simulator.Run(tokenSource.Token);
+
+		simulator.AssertSnapshots([
+			Matches.MatchEvent<Events.PauseRequested>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.ClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+			}),
+			Matches.MatchEvent<Events.ClusterMembersChanged>(),
+			Matches.MatchEvent<Events.Paused>()
+		]);
+
+		var response = await pauseProcessTask.Task;
+
+		Assert.True(response.IsAccepted(out _));
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/StateMachine/DetectionTests.cs b/src/KurrentDB.AutoScavenge.Tests/StateMachine/DetectionTests.cs
new file mode 100644
index 00000000000..1aeeaa4ae47
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/StateMachine/DetectionTests.cs
@@ -0,0 +1,314 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.AutoScavenge.Scavengers;
+
+namespace KurrentDB.AutoScavenge.Tests.StateMachine;
+
+public class DetectionTests {
+	/// This test verifies that the state machine can detect that there has been enough time between the last auto
+	/// scavenge process to start a new one.
+	[Fact]
+	public async Task ShouldDetectAutoScavengeProcessIsDueFromPreviousRun() {
+		var simulator = new Simulator(3);
+		var tokenSource = new CancellationTokenSource();
+		var clusterMembers = ClusterFixtures.Generate3NodesCluster();
+		var leader = ClusterFixtures.GetLeader(clusterMembers.Values);
+		var clusterScavengeId = Guid.NewGuid();
+
+		simulator.AddEventsToStorage([
+			new Events.ConfigurationUpdated {
+				Schedule = Schedule.EveryDay,
+				UpdatedAt = simulator.Time.NowThenFastForward(TimeSpan.FromHours(1)),
+			},
+
+			new Events.ClusterScavengeStarted {
+				ClusterScavengeId = clusterScavengeId,
+				Members = clusterMembers.Values.Select(x => x.ToNodeId()).ToList(),
+				StartedAt = simulator.Time.NowThenFastForward(TimeSpan.FromHours(1)),
+			},
+
+			new Events.ClusterScavengeCompleted {
+				ClusterScavengeId = clusterScavengeId,
+				Members = clusterMembers.Values.Select(x => x.ToNodeId()).ToList(),
+				CompletedAt = simulator.Time.Now
+			}
+		]);
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(leader.InstanceId, clusterMembers.Values.ToList()),
+			Command.FastForward(TimeSpan.FromHours(22))
+		]);
+
+		await simulator.Run(tokenSource.Token);
+
+		simulator.AssertSnapshots([
+			Matches.MatchEvent<Events.ClusterScavengeStarted>(),
+			Matches.MatchEvent<Events.NodeDesignated>(),
+			Matches.MatchEvent<Events.NodeScavengeStarted>()
+		]);
+	}
+
+	/// Makes sure that the state machine does not start a new scavenge process if the node is not configured for
+	/// auto scavenge process.
+	[Fact]
+	public async Task ShouldNotStartScavengeProcessIfNodeIsNotConfigured() {
+		var simulator = new Simulator(1);
+		var tokenSource = new CancellationTokenSource();
+		var singleNode = ClusterFixtures.GenerateSingleNode();
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(singleNode.InstanceId, [singleNode]),
+		]);
+
+		await simulator.Run(tokenSource.Token);
+
+		simulator.AssertSnapshots([]);
+	}
+
+	/// Makes sure that the state machine does not start a new scavenge process immediately after the node is configured
+	/// for auto scavenge process.
+	[Fact]
+	public async Task ShouldNotStartScavengeProcessImmediatelyAfterNodeIsConfigured() {
+		var simulator = new Simulator(1);
+		var tokenSource = new CancellationTokenSource();
+		var singleNode = ClusterFixtures.GenerateSingleNode();
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(singleNode.InstanceId, [singleNode]),
+			Command.FastForward(TimeSpan.FromHours(1)),
+			Command.Configure(Schedule.EveryHour)
+		]);
+
+		await simulator.Run(tokenSource.Token);
+
+		simulator.AssertSnapshots([
+			Matches.MatchEvent<Events.ConfigurationUpdated>()
+		]);
+	}
+
+	/// Makes sure that the state machine does not start a new scavenge process immediately after the node is re-configured
+	/// for auto scavenge process.
+	[Fact]
+	public async Task ShouldNotStartScavengeProcessImmediatelyAfterNodeIsReconfigured() {
+		var simulator = new Simulator(1);
+		var tokenSource = new CancellationTokenSource();
+		var singleNode = ClusterFixtures.GenerateSingleNode();
+
+		simulator.AddEventsToStorage([
+			new Events.ConfigurationUpdated {
+				Schedule = Schedule.EveryDay,
+				UpdatedAt = simulator.Time.Now
+			}
+		]);
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(singleNode.InstanceId, [singleNode]),
+			Command.FastForward(TimeSpan.FromDays(1)),
+			Command.ReceiveGossip(singleNode.InstanceId, [singleNode]),
+			Command.FastForward(TimeSpan.FromHours(3)),
+			Command.Configure(Schedule.EveryHour),
+		]);
+
+		simulator.Reacts(
+			Reacts.OnEvent<Events.NodeScavengeStarted>(@event => {
+				simulator.Scavenger.SetScavengeStatus(@event.ScavengeId, ScavengeStatus.Success);
+			}));
+
+		await simulator.Run(tokenSource.Token);
+
+		simulator.AssertSnapshots([
+			Matches.MatchEvent<Events.ClusterScavengeStarted>(),
+			Matches.MatchEvent<Events.NodeDesignated>(),
+			Matches.MatchEvent<Events.NodeScavengeStarted>(),
+			Matches.MatchEvent<Events.NodeScavengeCompleted>(),
+			Matches.MatchEvent<Events.ClusterScavengeCompleted>(),
+			Matches.MatchEvent<Events.ConfigurationUpdated>()
+		]);
+	}
+
+	/// When in a single node configuration, the test verifies that if we already started a node scavenge and the
+	/// node reboot, we should start a new one because node id changed after reboot.
+	[Fact]
+	public async Task ShouldDetectInSingleNodeThatNodeIdChangedAfterRestart() {
+		var simulator = new Simulator(1);
+		var tokenSource = new CancellationTokenSource();
+		var singleNode = ClusterFixtures.GenerateSingleNode();
+		var previousClusterScavengeId = Guid.NewGuid();
+		var previousScavengeId = Guid.NewGuid();
+		var previousNodeId = ClusterFixtures.GenerateNodeId(1);
+
+		simulator.AddEventsToStorage([
+			new Events.ConfigurationUpdated {
+				Schedule = Schedule.EveryHour,
+				UpdatedAt = simulator.Now,
+			},
+
+			new Events.ClusterScavengeStarted {
+				ClusterScavengeId = previousClusterScavengeId,
+				Members = [previousNodeId],
+				StartedAt = simulator.Now,
+			},
+
+			new Events.NodeDesignated {
+				NodeId = previousNodeId,
+				DesignatedAt = simulator.Now,
+			},
+
+			new Events.NodeScavengeStarted {
+				NodeId = previousNodeId,
+				ScavengeId = previousScavengeId,
+				StartedAt = simulator.Now,
+			}
+		]);
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(singleNode.InstanceId, [singleNode]), // Leads to detect the topology has changed.
+		]);
+
+		await simulator.Run(tokenSource.Token);
+
+		simulator.AssertSnapshots([
+			Matches.MatchEvent<Events.ClusterMembersChanged>((@event, snapshot) => {
+				Assert.Equal(snapshot.PrevState.DesignatedNode, previousNodeId);
+				Assert.Equal(previousClusterScavengeId, snapshot.PrevState.ClusterScavengeId);
+				Assert.Equal(previousClusterScavengeId, snapshot.NewState.ClusterScavengeId);
+				Assert.Equal([singleNode.ToNodeId()], @event.Added);
+				Assert.Equal([previousNodeId], @event.Removed);
+			}),
+
+			Matches.MatchEvent<Events.NodeDesignated>((@event, snapshot) => {
+				Assert.Equal(@event.NodeId, singleNode.ToNodeId());
+			}),
+
+			Matches.MatchEvent<Events.NodeScavengeStarted>((@event, snapshot) => {
+				Assert.Equal(@event.NodeId, singleNode.ToNodeId());
+				Assert.NotEqual(@event.ScavengeId, previousScavengeId);
+			})
+		]);
+	}
+
+	/// This test verifies that the state machine can detect that a cluster was offline during a certain period of time
+	/// and that a scavenge process must not be started if one or more cycles were missed while the cluster was offline.
+	[Fact]
+	public async Task ShouldSkipAutoScavengeIfCycleWasMissed() {
+		var simulator = new Simulator(3);
+		var tokenSource = new CancellationTokenSource();
+		var clusterMembers = ClusterFixtures.Generate3NodesCluster();
+		var leader = ClusterFixtures.GetLeader(clusterMembers.Values);
+
+		simulator.AddEventsToStorage([
+			new Events.ConfigurationUpdated {
+				Schedule = Schedule.EveryDay,
+				UpdatedAt = simulator.Time.NowThenFastForward(TimeSpan.FromDays(3)),
+			}
+		]);
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(leader.InstanceId, clusterMembers.Values.ToList()),
+			Command.FastForward(TimeSpan.FromHours(1))
+		]);
+
+		await simulator.Run(tokenSource.Token);
+
+		simulator.AssertSnapshots([]);
+	}
+
+	/// This test verifies that the state machine can detect that a cluster was offline during a certain period of time
+	/// and that a scavenge process must be resumed if there was already an ongoing one even though one or more cycles
+	/// were missed while the cluster was offline.
+	[Fact]
+	public async Task ShouldResumeAutoScavengeEvenIfCycleWasMissed() {
+		var simulator = new Simulator(3);
+		var tokenSource = new CancellationTokenSource();
+		var clusterMembers = ClusterFixtures.Generate3NodesCluster();
+		var leader = ClusterFixtures.GetLeader(clusterMembers.Values);
+
+		var clusterScavengeId = Guid.NewGuid();
+		var activeNodes = clusterMembers.Values.Select(m => m.ToNodeId())
+			.ToHashSet();
+
+		simulator.AddEventsToStorage([
+			new Events.ConfigurationUpdated {
+				Schedule = Schedule.EveryDay,
+				UpdatedAt = simulator.Time.NowThenFastForward(TimeSpan.FromDays(3)),
+			},
+			new Events.ClusterScavengeStarted {
+				ClusterScavengeId = clusterScavengeId,
+				Members = activeNodes.ToList(),
+				StartedAt = simulator.Now,
+			}
+		]);
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(leader.InstanceId, clusterMembers.Values.ToList()),
+			Command.FastForward(TimeSpan.FromHours(1))
+		]);
+
+		await simulator.Run(tokenSource.Token);
+
+		simulator.AssertSnapshots([
+			Matches.MatchEvent<Events.NodeDesignated>(),
+			Matches.MatchEvent<Events.NodeScavengeStarted>()
+		]);
+	}
+
+	/// This test verifies that the state machine can detect that a cluster was offline during a certain period of time
+	/// and that a scavenge process must be started if the next cycle was not missed while the cluster was offline.
+	[Fact]
+	public async Task ShouldStartAutoScavengeIfCycleWasNotMissed() {
+		var simulator = new Simulator(3);
+		var tokenSource = new CancellationTokenSource();
+		var clusterMembers = ClusterFixtures.Generate3NodesCluster();
+		var leader = ClusterFixtures.GetLeader(clusterMembers.Values);
+
+		simulator.AddEventsToStorage([
+			new Events.ConfigurationUpdated {
+				Schedule = Schedule.EveryDay,
+				UpdatedAt = simulator.Time.NowThenFastForward(TimeSpan.FromHours(23)),
+			}
+		]);
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(leader.InstanceId, clusterMembers.Values.ToList()),
+			Command.FastForward(TimeSpan.FromHours(1))
+		]);
+
+		await simulator.Run(tokenSource.Token);
+
+		simulator.AssertSnapshots([
+			Matches.MatchEvent<Events.ClusterScavengeStarted>(),
+			Matches.MatchEvent<Events.NodeDesignated>(),
+			Matches.MatchEvent<Events.NodeScavengeStarted>()
+		]);
+	}
+
+	/// This test verifies that the state machine can detect that a cluster was offline during a certain period of time
+	/// and that a scavenge process must not be started even if the next cycle was not missed as auto-scavenge was paused.
+	[Fact]
+	public async Task ShouldSkipAutoScavengeIfPausedAndCycleWasNotMissed() {
+		var simulator = new Simulator(3);
+		var tokenSource = new CancellationTokenSource();
+		var clusterMembers = ClusterFixtures.Generate3NodesCluster();
+		var leader = ClusterFixtures.GetLeader(clusterMembers.Values);
+
+		simulator.AddEventsToStorage([
+			new Events.ConfigurationUpdated {
+				Schedule = Schedule.EveryDay,
+				UpdatedAt = simulator.Time.Now,
+			},
+			new Events.Paused {
+				PausedAt = simulator.Time.NowThenFastForward(TimeSpan.FromHours(23))
+			}
+		]);
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(leader.InstanceId, clusterMembers.Values.ToList()),
+			Command.FastForward(TimeSpan.FromHours(1))
+		]);
+
+		await simulator.Run(tokenSource.Token);
+
+		simulator.AssertSnapshots([]);
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/StateMachine/StatusTests.cs b/src/KurrentDB.AutoScavenge.Tests/StateMachine/StatusTests.cs
new file mode 100644
index 00000000000..1c5afbfb54c
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/StateMachine/StatusTests.cs
@@ -0,0 +1,168 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.AutoScavenge.Domain;
+
+namespace KurrentDB.AutoScavenge.Tests.StateMachine;
+
+/// <summary>
+/// Home of the get-status command tests.
+/// </summary>
+public class StatusTests {
+	/// Verifies that the status is retrieved when the state machine is already loaded.
+	[Fact]
+	public async Task ShouldRetrieveStatusWhenLoaded() {
+		var simulator = new Simulator(3);
+		var tokenSource = new CancellationTokenSource();
+		var clusterMembers = ClusterFixtures.Generate3NodesCluster();
+		var leader = ClusterFixtures.GetLeader(clusterMembers.Values);
+
+		simulator.AddEventsToStorage([
+			new Events.ConfigurationUpdated {
+				Schedule = Schedule.EveryHour,
+				UpdatedAt = simulator.Now,
+			},
+		]);
+
+		var statusTask = new TaskCompletionSource<Response<AutoScavengeStatusResponse>>();
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(leader.InstanceId, clusterMembers.Values.ToList()),
+			Command.GetStatus(statusTask),
+		]);
+
+		await simulator.Run(tokenSource.Token);
+
+		var response = await statusTask.Task;
+
+		Assert.True(response.IsSuccessful(out var result));
+		Assert.Equal(AutoScavengeStatusResponse.Status.Waiting, result.State);
+		Assert.Equal(Schedule.EveryHour.ToString(), result.Schedule!.ToString());
+		Assert.Equal(TimeSpan.FromHours(1), result.TimeUntilNextCycle);
+	}
+
+	/// Verifies that the status is retrieved when the state machine is not loaded nor configured
+	[Fact]
+	public async Task ShouldRetrieveStatusWhenNotLoadedNorConfigured() {
+		var simulator = new Simulator(1);
+		var singleNode = ClusterFixtures.GenerateSingleNode();
+		var tokenSource = new CancellationTokenSource();
+		var statusTask = new TaskCompletionSource<Response<AutoScavengeStatusResponse>>();
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(singleNode.InstanceId, [singleNode]),
+			Command.GetStatus(statusTask),
+		]);
+
+		await simulator.Run(tokenSource.Token);
+
+		simulator.AssertSnapshots([]);
+		var response = await statusTask.Task;
+
+		Assert.True(response.IsSuccessful(out var result));
+		Assert.Equal(AutoScavengeStatusResponse.Status.NotConfigured, result.State);
+		Assert.Null(result.Schedule);
+		Assert.Null(result.TimeUntilNextCycle);
+	}
+
+	/// Verifies that the status is retrieved when the state machine tried to load its configuration once but didn't
+	/// find anything.
+	[Fact]
+	public async Task ShouldRetrieveStatusWhenLoadedButNotConfigured() {
+		var simulator = new Simulator(1);
+		var singleNode = ClusterFixtures.GenerateSingleNode();
+		var tokenSource = new CancellationTokenSource();
+		var statusTask = new TaskCompletionSource<Response<AutoScavengeStatusResponse>>();
+
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(singleNode.InstanceId, [singleNode]),
+			Command.GetStatus(statusTask),
+		]);
+
+		await simulator.Run(tokenSource.Token);
+
+		simulator.AssertSnapshots([]);
+		var response = await statusTask.Task;
+
+		Assert.True(response.IsSuccessful(out var result));
+		Assert.Equal(AutoScavengeStatusResponse.Status.NotConfigured, result.State);
+		Assert.Null(result.Schedule);
+		Assert.Null(result.TimeUntilNextCycle);
+	}
+
+	[Fact]
+	public async Task when_paused_while_idle_next_cycle_is_schedule_from_now() {
+		var simulator = new Simulator(clusterSize: 1);
+		var singleNode = ClusterFixtures.GenerateSingleNode();
+		var tokenSource = new CancellationTokenSource();
+		var statusTask = new TaskCompletionSource<Response<AutoScavengeStatusResponse>>();
+
+		simulator.AddEventsToStorage([
+			new Events.ConfigurationUpdated {
+				Schedule = Schedule.EveryHour,
+				UpdatedAt = simulator.Now,
+			},
+			new Events.Paused() {
+				PausedAt = simulator.Now,
+			},
+		]);
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(singleNode.InstanceId, [singleNode]),
+			Command.FastForward(TimeSpan.FromMinutes(65)),
+			Command.GetStatus(statusTask),
+		]);
+
+		await simulator.Run(tokenSource.Token);
+
+		simulator.AssertSnapshots([]);
+		var response = await statusTask.Task;
+
+		Assert.True(response.IsSuccessful(out var result));
+		Assert.Equal(AutoScavengeStatusResponse.Status.Paused, result.State);
+		Assert.Equal(Schedule.EveryHour.ToString(), result.Schedule!.ToString());
+		Assert.Equal(TimeSpan.FromMinutes(55), result.TimeUntilNextCycle);
+	}
+
+	[Fact]
+	public async Task when_paused_while_scavenging_next_cycle_is_immediate() {
+		var simulator = new Simulator(clusterSize: 1);
+		var singleNode = ClusterFixtures.GenerateSingleNode();
+		var tokenSource = new CancellationTokenSource();
+		var statusTask = new TaskCompletionSource<Response<AutoScavengeStatusResponse>>();
+
+		simulator.AddEventsToStorage([
+			new Events.ConfigurationUpdated {
+				Schedule = Schedule.EveryHour,
+				UpdatedAt = simulator.Now,
+			},
+			new Events.ClusterScavengeStarted {
+				ClusterScavengeId = Guid.NewGuid(),
+				Members = [
+					singleNode.ToNodeId(),
+				],
+				StartedAt = simulator.Now,
+			},
+			new Events.Paused() {
+				PausedAt = simulator.Now,
+			},
+		]);
+		simulator.EnqueueCommands([
+			Command.ReceiveGossip(singleNode.InstanceId, [singleNode]),
+			Command.FastForward(TimeSpan.FromMinutes(65)),
+			Command.GetStatus(statusTask),
+		]);
+
+		simulator.Time.FastForward(TimeSpan.FromMinutes(65));
+		await simulator.Run(tokenSource.Token);
+
+		simulator.AssertSnapshots([]);
+		var response = await statusTask.Task;
+
+		Assert.True(response.IsSuccessful(out var result));
+		Assert.Equal(AutoScavengeStatusResponse.Status.Paused, result.State);
+		Assert.Equal(Schedule.EveryHour.ToString(), result.Schedule!.ToString());
+		Assert.Equal(TimeSpan.Zero, result.TimeUntilNextCycle);
+	}
+
+	// TODO - We also probably need to check the state transitions to ascertain we are moving the way we expect.
+}
diff --git a/src/KurrentDB.AutoScavenge.Tests/TimeProviders/FakeTimeProvider.cs b/src/KurrentDB.AutoScavenge.Tests/TimeProviders/FakeTimeProvider.cs
new file mode 100644
index 00000000000..b7a5172d270
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge.Tests/TimeProviders/FakeTimeProvider.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.AutoScavenge.TimeProviders;
+
+namespace KurrentDB.AutoScavenge.Tests.TimeProviders;
+
+public class FakeTimeProvider : ITimeProvider {
+	private DateTime _inner = DateTime.Now.Date;
+
+	public DateTime Now => _inner;
+
+	public void FastForward(TimeSpan timeSpan) {
+		_inner = _inner.Add(timeSpan);
+	}
+
+	public DateTime NowThenFastForward(TimeSpan timeSpan) {
+		var now = _inner;
+		_inner = _inner.Add(timeSpan);
+		return now;
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge/AutoScavengePlugin.cs b/src/KurrentDB.AutoScavenge/AutoScavengePlugin.cs
new file mode 100644
index 00000000000..24d79e72894
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/AutoScavengePlugin.cs
@@ -0,0 +1,233 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text.Json;
+using System.Threading.Channels;
+using EventStore.Plugins;
+using EventStore.Plugins.Diagnostics;
+using KurrentDB.AutoScavenge.Clients;
+using KurrentDB.AutoScavenge.Converters;
+using KurrentDB.AutoScavenge.Domain;
+using KurrentDB.AutoScavenge.Scavengers;
+using KurrentDB.Core.Configuration.Sources;
+using KurrentDB.Core.Services.Transport.Http.NodeHttpClientFactory;
+using KurrentDB.POC.IO.Core;
+using KurrentDB.POC.IO.Core.Serialization;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using NCrontab;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.AutoScavenge;
+
+public class AutoScavengePlugin() : SubsystemsPlugin(name: "auto-scavenge", requiredEntitlements: ["AUTO_SCAVENGE"]), IConnectedSubsystemsPlugin {
+	private static readonly ILogger Log = Serilog.Log.ForContext<AutoScavengePlugin>();
+	private readonly CancellationTokenSource _cts = new();
+	private AutoScavengeService? _autoScavengeService;
+
+	private static readonly JsonSerializerOptions JsonSerializerOptions = new() {
+		PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+		Converters = {
+			new EnumConverterWithDefault<AutoScavengeStatus>(),
+			new EnumConverterWithDefault<AutoScavengeStatusResponse.Status>(),
+			new CrontableScheduleJsonConverter(),
+		},
+	};
+
+	private readonly Channel<ICommand> _commands = Channel.CreateBounded<ICommand>(
+		new BoundedChannelOptions(capacity: 32) {
+			SingleReader = true,
+			SingleWriter = false,
+		});
+
+	private IAutoScavengeClient _dispatcher = IAutoScavengeClient.None;
+	private EventStoreOptions _options = new();
+
+	public override (bool Enabled, string EnableInstructions) IsEnabled(IConfiguration configuration) {
+		var enabledOption = configuration.GetValue<bool?>($"{KurrentConfigurationKeys.Prefix}:AutoScavenge:Enabled");
+		var devMode = configuration.GetValue($"{KurrentConfigurationKeys.Prefix}:Dev", defaultValue: false);
+		var memDb = configuration.GetValue($"{KurrentConfigurationKeys.Prefix}:MemDb", defaultValue: false);
+
+		// enabled by default
+		bool enabled = enabledOption ?? true;
+
+		if (!enabled)
+			return (false, $"To enable AutoScavenge: Do not set '{KurrentConfigurationKeys.Prefix}:AutoScavenge:Enabled' to 'false'");
+
+		// not compatible with dev mode or memdb
+		if (devMode || memDb) {
+			var msg = "AutoScavenge is not compatible with " + (devMode ? "dev mode" : "mem-db");
+
+			if (enabledOption.HasValue && enabledOption.Value) {
+				// user has explicitly enabled both
+				throw new Exception(msg);
+			}
+
+			// auto scavenge is not explicitly enabled, just disable it.
+			return (false, msg);
+		}
+
+		return (true, "");
+	}
+
+	public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) {
+		_options = configuration.GetSection(KurrentConfigurationKeys.Prefix).Get<EventStoreOptions>() ?? _options;
+
+		services.AddSingleton(provider => {
+			var nodeHttpClientFactory = provider.GetRequiredService<INodeHttpClientFactory>();
+			return new HttpClientWrapper(_options, nodeHttpClientFactory);
+		});
+		services.AddSingleton<AutoScavengeClientDispatcher>(provider => {
+			var wrapper = provider.GetRequiredService<HttpClientWrapper>();
+			var internalClient = new InternalAutoScavengeClient(_commands.Writer);
+			var proxyClient = new ProxyAutoScavengeClient(wrapper);
+			var dispatcher = new AutoScavengeClientDispatcher(internalClient, proxyClient);
+			_dispatcher = dispatcher;
+			return dispatcher;
+		});
+		services.AddSingleton<AutoScavengeService>(provider => {
+			var client = provider.GetRequiredService<IClient>();
+			var wrapper = provider.GetRequiredService<HttpClientWrapper>();
+			var dispatcher = provider.GetRequiredService<AutoScavengeClientDispatcher>();
+			return new AutoScavengeService(
+				options: _options,
+				client: client,
+				operationsClient: provider.GetRequiredService<IOperationsClient>(),
+				commands: _commands,
+				scavenger: new HttpNodeScavenger(wrapper, client),
+				dispatcher,
+				cts: _cts);
+		});
+	}
+
+	protected override void OnLicenseException(Exception ex, Action<Exception> shutdown) {
+		var msg = "AutoScavenge is not licensed, stopping.";
+		Log.Information(msg);
+		Disable(msg);
+		PublishDiagnosticsData(
+			new Dictionary<string, object?>() { ["enabled"] = Enabled },
+			PluginDiagnosticsDataCollectionMode.Partial);
+		_ = Stop();
+	}
+
+	public override void ConfigureApplication(IApplicationBuilder builder, IConfiguration configuration) {
+		_autoScavengeService = builder.ApplicationServices.GetRequiredService<AutoScavengeService>();
+
+		builder.UseEndpoints(endpoints => {
+			var anyUserGroup = endpoints.MapGroup("/auto-scavenge");
+			anyUserGroup.MapGet("/enabled", OnGetEnabled);
+			anyUserGroup.MapGet("/status", (Delegate)OnGetStatus);
+			anyUserGroup.RequireAuthorization();
+
+			var opsGroup = endpoints.MapGroup("/auto-scavenge");
+			opsGroup.MapPost("/resume", (Delegate)OnPostResume);
+			opsGroup.MapPost("/pause", (Delegate)OnPostPause);
+			opsGroup.MapPost("/configure", (Delegate)OnPostConfigure);
+			opsGroup.RequireAuthorization(policy => policy.RequireRole("$admins", "$ops"));
+		});
+	}
+
+	public override Task Start() {
+		return _autoScavengeService?.StartAsync() ?? Task.CompletedTask;
+	}
+
+	public override async Task Stop() {
+		await _cts.CancelAsync();
+	}
+
+	/// <summary>
+	/// Handles the POST request to configure the auto scavenge process. It disallows anonymous users from
+	/// configuring the auto scavenge process. The state machine could also deny the request if the node is no
+	/// longer the cluster's leader.
+	/// </summary>
+	private Task<IResult> OnPostConfigure(HttpContext context) =>
+		ExecuteCommand(context, Run.WithPayload<AutoScavengeConfigurationPayload, Unit>(
+			(conf) => _dispatcher.Configure(conf.Schedule, _cts.Token)));
+
+	/// <summary>
+	/// Handles the GET request to check if the auto scavenge plugin is enabled.
+	/// </summary>
+	private IResult OnGetEnabled() =>
+		Results.Json(new GetAutoScavengeEnabledResult(
+			Enabled: Enabled));
+
+	/// <summary>
+	/// Handles the POST request to resume the auto scavenge process.
+	/// </summary>
+	private Task<IResult> OnPostResume(HttpContext context) =>
+		ExecuteCommand(context, Run.WithoutPayload(() => _dispatcher.Resume(_cts.Token)));
+
+	/// <summary>
+	/// Handles the POST request to pause the auto scavenge process.
+	/// </summary>
+	private Task<IResult> OnPostPause(HttpContext context) =>
+		ExecuteCommand(context, Run.WithoutPayload(() => _dispatcher.Pause(_cts.Token)));
+
+	/// <summary>
+	/// Handles the GET request to get the status of the auto scavenge process. That status includes but not only
+	/// the current schedule, the state of the process and when next scavenge is expected.
+	/// </summary>
+	private Task<IResult> OnGetStatus(HttpContext context) =>
+		ExecuteCommand(context, Run.WithoutPayload(() => _dispatcher.GetStatus(_cts.Token)));
+
+	/// <summary>
+	/// Common implementation to execute an auto scavenge process state machine command.
+	/// </summary>
+	/// <param name="runner">A command to execute on the state machine</param>
+	/// <typeparam name="TParam">Type of the command's parameter</typeparam>
+	/// <typeparam name="TResp">Type of the command response</typeparam>
+	private async Task<IResult> ExecuteCommand<TParam, TResp>(
+		HttpContext context, RunCommand<TParam, TResp> runner) {
+
+		TParam? param = default;
+
+		if (!Enabled)
+			return Results.Problem("AutoScavenge is not enabled", statusCode: 503);
+
+		if (runner.ParsePayload) {
+			try {
+				param = await context.Request.ReadFromJsonAsync<TParam>(JsonSerializerOptions);
+				if (param is null)
+					return Results.BadRequest("Invalid payload");
+			} catch (JsonException ex) {
+				return Results.BadRequest(ex.Message);
+			}
+		}
+
+		Response<TResp> resp;
+
+		try {
+			resp = await runner.Run(param);
+		} catch (TaskCanceledException) {
+			return Results.Problem("AutoScavenge is no longer running", statusCode: 500);
+		}
+
+		return resp.Visit(
+			onSuccessful: static result => Results.Json(result, JsonSerializerOptions),
+			onAccepted: static () => Results.Accepted(),
+			onRejected: static rejectedReason => Results.BadRequest(rejectedReason),
+			onServerError: static serverError => Results.Problem(serverError, statusCode: 500));
+	}
+
+	private record RunCommand<TParam, TResp>(Func<TParam?, Task<Response<TResp>>> Run, bool ParsePayload);
+
+	private static class Run {
+		public static RunCommand<Unit, TResp> WithoutPayload<TResp>(Func<Task<Response<TResp>>> run) =>
+			new((_) => run(), false);
+
+		public static RunCommand<TParam, TResp> WithPayload<TParam, TResp>(Func<TParam, Task<Response<TResp>>> run) =>
+			new((p) => run(p!), true);
+	}
+
+	/// <summary>
+	/// JSON Payload for configuring the auto scavenge process.
+	/// </summary>
+	private class AutoScavengeConfigurationPayload {
+		public required CrontabSchedule Schedule { get; init; }
+	}
+
+	record struct GetAutoScavengeEnabledResult(bool Enabled);
+
+}
diff --git a/src/KurrentDB.AutoScavenge/AutoScavengeService.cs b/src/KurrentDB.AutoScavenge/AutoScavengeService.cs
new file mode 100644
index 00000000000..67dc99537ce
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/AutoScavengeService.cs
@@ -0,0 +1,180 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text.Json;
+using System.Threading.Channels;
+using KurrentDB.AutoScavenge.Clients;
+using KurrentDB.AutoScavenge.Converters;
+using KurrentDB.AutoScavenge.Domain;
+using KurrentDB.AutoScavenge.Scavengers;
+using KurrentDB.AutoScavenge.Sources;
+using KurrentDB.POC.IO.Core;
+using Serilog;
+using TimeProvider = KurrentDB.AutoScavenge.TimeProviders.TimeProvider;
+
+namespace KurrentDB.AutoScavenge;
+
+using TimeProvider = TimeProvider;
+
+internal class AutoScavengeService : IDisposable {
+	private static readonly ILogger Log = Serilog.Log.ForContext<AutoScavengeService>();
+
+	private static readonly JsonSerializerOptions JsonSerializerOptions = new() {
+		PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+		Converters = { new EventJsonConverter(), new CrontableScheduleJsonConverter() }
+	};
+
+	private readonly CancellationTokenSource _cts;
+	private readonly EventStoreOptions _options;
+	private readonly IClient _client;
+	private readonly IOperationsClient _operationsClient;
+	private readonly Channel<ICommand> _commands;
+	private readonly INodeScavenger _scavenger;
+	private readonly IGossipAware _gossipHandler;
+
+	public AutoScavengeService(
+		EventStoreOptions options,
+		IClient client,
+		IOperationsClient operationsClient,
+		Channel<ICommand> commands,
+		INodeScavenger scavenger,
+		IGossipAware gossipHandler,
+		CancellationTokenSource cts) {
+
+		_options = options;
+		_client = client;
+		_operationsClient = operationsClient;
+		_commands = commands;
+		_scavenger = scavenger;
+		_gossipHandler = gossipHandler;
+		_cts = cts;
+	}
+
+	public Task StartAsync() {
+		// todo We might consider bulletproofing subscription tasks
+		var sub2 = Task.Run(() => SubscribeToGossip(_cts.Token), _cts.Token).WarnOnCompletion("AUTO SCAVENGE GOSSIP MONITOR STOPPED");
+		var process = Process(_cts.Token).WarnOnCompletion("AUTO SCAVENGE PROCESS MANAGER STOPPED");
+		return Task.CompletedTask;
+	}
+
+	public void Dispose() {
+		_cts.Cancel();
+	}
+
+	private async Task Process(CancellationToken token) {
+		var source = new ClientSource(_client);
+		var machine = new AutoScavengeProcessManager(_options.ClusterSize, new TimeProvider(), source, _operationsClient, _scavenger);
+
+		await foreach (var commandFromChannel in _commands.Reader.ReadAllAsync(token)) {
+			// if an additional command was yielded execute it now, do not queue it to the channel.
+			// this allows us to make the channel bounded without risk of deadlock.
+			var command = commandFromChannel;
+			while (command is not null) {
+				Log.Verbose("Autoscavenge processing command {Command}. Queue {Count}", command, _commands.Reader.Count);
+				command = await ProcessCommand(command);
+			}
+		}
+
+		async Task<ICommand?> ProcessCommand(ICommand command) {
+			try {
+				var transition = await machine.RunAsync(command, token);
+
+				foreach (var @event in transition.Events) {
+					if (@event is Events.ConfigurationUpdated)
+						await _client.WriteAsyncRetry(
+							StreamNames.AutoScavengeConfiguration,
+							[Serialize(@event)],
+							-2, // Any
+							token);
+					else
+						source.AutoScavengeStreamExpectedRevision = await _client.WriteAsyncRetry(
+							StreamNames.AutoScavenges,
+							[Serialize(@event)],
+							source.AutoScavengeStreamExpectedRevision,
+							token);
+
+					// We only update the machine's state if persisting the event was successful
+					machine.Apply(@event);
+				}
+
+				// events if any are successfully saved, we can now send the response
+				command.OnSavedEvents();
+
+				return transition.NextCommand;
+
+			} catch (ResponseException.NotLeader) {
+				Log.Information(
+					"Node is no longer a leader and stopped driving the automatic scavenge process");
+				command.OnServerError("Not leader");
+				return null;
+
+			} catch (Exception ex) {
+				Log.Error(ex, "Unexpected exception in auto-scavenge plugin");
+				await _cts.CancelAsync();
+				command.OnServerError(ex.Message);
+				return null;
+			}
+		}
+
+		if (_cts.Token.IsCancellationRequested) {
+			while (_commands.Reader.TryRead(out var command)) {
+				switch (command) {
+					case Commands.PauseProcess cmd:
+						cmd.Callback(Response.ServerError("auto-scavenge errored"));
+						break;
+					case Commands.ResumeProcess cmd:
+						cmd.Callback(Response.ServerError("auto-scavenge errored"));
+						break;
+					case Commands.GetStatus cmd:
+						cmd.Callback(Response.ServerError<AutoScavengeStatusResponse>("auto-scavenge errored"));
+						break;
+				}
+			}
+		}
+	}
+
+	private async Task SubscribeToGossip(CancellationToken cancellationToken) {
+		GossipMessage? lastGossip = null;
+		var singleNode = false;
+
+		await foreach (var @event in _client.SubscribeToStream("$mem-gossip", cancellationToken)) {
+			try {
+				var msg = JsonSerializer.Deserialize<GossipMessage>(@event.Data.Span)!;
+				_gossipHandler.ReceiveGossipMessage(msg);
+				await _commands.Writer.WriteAsync(new Commands.ReceiveGossip(msg), cancellationToken);
+
+				// If we are running in a single-node configuration, we will only receive one gossip message for
+				// the entirety of the node's lifetime.
+				if (msg.Members.Count != 1 || msg.Members[0].State != "Leader")
+					continue;
+
+				singleNode = true;
+				lastGossip = msg;
+				break;
+			} catch (JsonException ex) {
+				Log.Fatal(ex, "Failed to deserialize gossip message");
+				// TODO - Do we really want to break here? What about restarting the subscription?
+				break;
+			}
+		}
+
+		// If we are running in a single-node configuration, we simulate the reception of a gossip message to the
+		// auto scavenge state machine because gossip messages act as a metronome to the auto scavenge process.
+		// We don't update the proxy client because we won't ever need to proxy request in single-node mode.
+		if (singleNode) {
+			while (!cancellationToken.IsCancellationRequested) {
+				await Task.Delay(TimeSpan.FromSeconds(5), cancellationToken);
+				await _commands.Writer.WriteAsync(new Commands.ReceiveGossip(lastGossip!), cancellationToken);
+			}
+		}
+	}
+
+	private static EventToWrite Serialize(IEvent @event) {
+		return new EventToWrite(
+			Guid.NewGuid(),
+			@event.Type,
+			"application/json",
+			JsonSerializer.SerializeToUtf8Bytes(@event, JsonSerializerOptions),
+			Array.Empty<byte>());
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge/Clients/AutoScavengeClientDispatcher.cs b/src/KurrentDB.AutoScavenge/Clients/AutoScavengeClientDispatcher.cs
new file mode 100644
index 00000000000..87ff28abb44
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Clients/AutoScavengeClientDispatcher.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.AutoScavenge.Domain;
+using NCrontab;
+
+namespace KurrentDB.AutoScavenge.Clients;
+
+// Manages the autoscavenge locally or remotely depending on whether we are leader
+public class AutoScavengeClientDispatcher(
+	InternalAutoScavengeClient internalClient,
+	ProxyAutoScavengeClient proxyClient) : IGossipAware, IAutoScavengeClient {
+
+	public Task<Response<AutoScavengeStatusResponse>> GetStatus(CancellationToken token) {
+		return Target.GetStatus(token);
+	}
+
+	public Task<Response<Unit>> Pause(CancellationToken token) {
+		return Target.Pause(token);
+	}
+
+	public Task<Response<Unit>> Resume(CancellationToken token) {
+		return Target.Resume(token);
+	}
+
+	public Task<Response<Unit>> Configure(CrontabSchedule schedule, CancellationToken token) {
+		return Target.Configure(schedule, token);
+	}
+
+	public void ReceiveGossipMessage(GossipMessage msg) {
+		proxyClient.ReceiveGossipMessage(msg);
+	}
+
+	private bool IsLeader() {
+		return proxyClient.TryGetCurrentLeader(out _, out var isSelf) && isSelf;
+	}
+
+	private IAutoScavengeClient Target => IsLeader() ? internalClient : proxyClient;
+}
diff --git a/src/KurrentDB.AutoScavenge/Clients/GossipAwareBase.cs b/src/KurrentDB.AutoScavenge/Clients/GossipAwareBase.cs
new file mode 100644
index 00000000000..ad537f4ce62
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Clients/GossipAwareBase.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.AutoScavenge.Clients;
+
+public abstract class GossipAwareBase : IGossipAware {
+	private readonly object _lock = new();
+	private NodeEndpoint? _leaderNode;
+	private bool _isLeader;
+
+	public void ReceiveGossipMessage(GossipMessage msg) {
+		lock (_lock) {
+			_leaderNode = null;
+			_isLeader = false;
+			foreach (var member in msg.Members) {
+				if (member.State == "Leader") {
+					_leaderNode = new NodeEndpoint {
+						Host = member.InternalHttpEndPointIp,
+						Port = member.InternalHttpEndPointPort,
+					};
+
+					_isLeader = member.InstanceId == msg.NodeId;
+					return;
+				}
+			}
+		}
+	}
+
+	public bool TryGetCurrentLeader(out NodeEndpoint leader, out bool isSelf) {
+		lock (_lock) {
+			isSelf = _isLeader;
+			leader = _leaderNode ?? default;
+			return _leaderNode is not null;
+		}
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge/Clients/IAutoScavengeClient.cs b/src/KurrentDB.AutoScavenge/Clients/IAutoScavengeClient.cs
new file mode 100644
index 00000000000..050c97dbe43
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Clients/IAutoScavengeClient.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.AutoScavenge.Domain;
+using NCrontab;
+
+namespace KurrentDB.AutoScavenge.Clients;
+
+// Interface to manage the auto scavenge.
+public interface IAutoScavengeClient {
+	Task<Response<AutoScavengeStatusResponse>> GetStatus(CancellationToken token);
+	Task<Response<Unit>> Pause(CancellationToken token);
+	Task<Response<Unit>> Resume(CancellationToken token);
+	Task<Response<Unit>> Configure(CrontabSchedule schedule, CancellationToken token);
+
+	public static IAutoScavengeClient None => NoAutoScavengeClient.Instance;
+}
+
+file class NoAutoScavengeClient : IAutoScavengeClient {
+	public static NoAutoScavengeClient Instance { get; } = new NoAutoScavengeClient();
+
+	private const string Error = "No auto scavenge client";
+
+	readonly Task<Response<AutoScavengeStatusResponse>> _statusResponse =
+		Task.FromResult(Response.ServerError<AutoScavengeStatusResponse>(Error));
+
+	readonly Task<Response<Unit>> _unitResponse =
+		Task.FromResult(Response.ServerError(Error));
+
+	public Task<Response<Unit>> Configure(CrontabSchedule schedule, CancellationToken token) =>
+		_unitResponse;
+
+	public Task<Response<AutoScavengeStatusResponse>> GetStatus(CancellationToken token) =>
+		_statusResponse;
+
+	public Task<Response<Unit>> Pause(CancellationToken token) =>
+		_unitResponse;
+
+	public Task<Response<Unit>> Resume(CancellationToken token) =>
+		_unitResponse;
+}
diff --git a/src/KurrentDB.AutoScavenge/Clients/IGossipAware.cs b/src/KurrentDB.AutoScavenge/Clients/IGossipAware.cs
new file mode 100644
index 00000000000..d009e0aa6f7
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Clients/IGossipAware.cs
@@ -0,0 +1,8 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.AutoScavenge.Clients;
+
+public interface IGossipAware {
+	public void ReceiveGossipMessage(GossipMessage msg);
+}
diff --git a/src/KurrentDB.AutoScavenge/Clients/InternalAutoScavengeClient.cs b/src/KurrentDB.AutoScavenge/Clients/InternalAutoScavengeClient.cs
new file mode 100644
index 00000000000..6dd94425fe8
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Clients/InternalAutoScavengeClient.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Channels;
+using KurrentDB.AutoScavenge.Domain;
+using NCrontab;
+
+namespace KurrentDB.AutoScavenge.Clients;
+
+// Manages the local auto scavenge by putting commands on the channel
+public class InternalAutoScavengeClient(ChannelWriter<ICommand> channel) : IAutoScavengeClient {
+	public Task<Response<AutoScavengeStatusResponse>> GetStatus(CancellationToken token) =>
+		Execute<AutoScavengeStatusResponse>(r => new Commands.GetStatus(r), token);
+
+	public Task<Response<Unit>> Pause(CancellationToken token) =>
+		Execute<Unit>(r => new Commands.PauseProcess(r), token);
+
+	public Task<Response<Unit>> Resume(CancellationToken token) =>
+		Execute<Unit>(r => new Commands.ResumeProcess(r), token);
+
+	public Task<Response<Unit>> Configure(CrontabSchedule schedule, CancellationToken token) =>
+		Execute<Unit>(r => new Commands.Configure(schedule, r), token);
+
+	private async Task<Response<TResp>> Execute<TResp>(Func<Action<Response<TResp>>, ICommand> make, CancellationToken token) {
+		var source = new TaskCompletionSource<Response<TResp>>();
+
+		await using var _ = token.Register(() => source.TrySetCanceled(token));
+		var command = make(source.SetResult);
+		if (!channel.TryWrite(command))
+			return Response.ServerError<TResp>("AutoScavenge queue is full");
+
+		return await source.Task;
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge/Clients/ProxyAutoScavengeClient.cs b/src/KurrentDB.AutoScavenge/Clients/ProxyAutoScavengeClient.cs
new file mode 100644
index 00000000000..687f9c4e6b1
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Clients/ProxyAutoScavengeClient.cs
@@ -0,0 +1,123 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net;
+using System.Net.Http.Json;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using KurrentDB.AutoScavenge.Converters;
+using KurrentDB.AutoScavenge.Domain;
+using KurrentDB.POC.IO.Core.Serialization;
+using NCrontab;
+using Serilog;
+
+namespace KurrentDB.AutoScavenge.Clients;
+
+// Allows users to manage the autoscavenge from any node. Proxies the request on to the leader.
+public class ProxyAutoScavengeClient(HttpClientWrapper wrapper) : GossipAwareBase, IAutoScavengeClient {
+	private static readonly ILogger Log = Serilog.Log.ForContext<ProxyAutoScavengeClient>();
+
+	private static readonly JsonSerializerOptions JsonSerializerOptions = new() {
+		PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+		Converters = {
+			new EnumConverterWithDefault<AutoScavengeStatus>(),
+			new EnumConverterWithDefault<AutoScavengeStatusResponse.Status>(),
+			new CrontableScheduleJsonConverter(),
+		},
+	};
+
+	public async Task<Response<AutoScavengeStatusResponse>> GetStatus(CancellationToken token) {
+		try {
+			var baseUrl = GetLeaderBaseUrl(nameof(GetStatus));
+			if (baseUrl is null)
+				return Response.ServerError<AutoScavengeStatusResponse>("No leader node was found in the cluster");
+
+			var resp = await wrapper.HttpClient.GetFromJsonAsync<AutoScavengeStatusResponse>(
+				$"{baseUrl}/auto-scavenge/status", JsonSerializerOptions, token);
+
+			return Response.Successful(resp!);
+		} catch (HttpRequestException ex) {
+			var code = (int)(ex.StatusCode ?? HttpStatusCode.ServiceUnavailable);
+			return code is >= 400 and < 500
+				? Response.Rejected<AutoScavengeStatusResponse>(ex.Message)
+				: Response.ServerError<AutoScavengeStatusResponse>(ex.Message);
+		} catch (JsonException ex) {
+			return Response.ServerError<AutoScavengeStatusResponse>($"error when proxying request: {ex.Message}");
+		} catch (Exception ex) {
+			return Response.ServerError<AutoScavengeStatusResponse>(ex.Message);
+		}
+	}
+
+	public async Task<Response<Unit>> Pause(CancellationToken token) {
+		try {
+			var baseUrl = GetLeaderBaseUrl(nameof(Pause));
+			if (baseUrl is null)
+				return Response.ServerError<Unit>("No leader node was found in the cluster");
+
+			var resp = await wrapper.HttpClient.PostAsync($"{baseUrl}/auto-scavenge/pause", null, token);
+			resp.EnsureSuccessStatusCode();
+
+			return Response.Accepted();
+		} catch (HttpRequestException ex) {
+			var code = (int)(ex.StatusCode ?? HttpStatusCode.ServiceUnavailable);
+			return code is >= 400 and < 500
+				? Response.Rejected<Unit>(ex.Message)
+				: Response.ServerError<Unit>(ex.Message);
+		} catch (Exception ex) {
+			return Response.ServerError(ex.Message);
+		}
+	}
+
+	public async Task<Response<Unit>> Resume(CancellationToken token) {
+		try {
+			var baseUrl = GetLeaderBaseUrl(nameof(Resume));
+			if (baseUrl is null)
+				return Response.ServerError<Unit>("No leader node was found in the cluster");
+
+			var resp = await wrapper.HttpClient.PostAsync($"{baseUrl}/auto-scavenge/resume", null, token);
+			resp.EnsureSuccessStatusCode();
+
+			return Response.Accepted();
+		} catch (HttpRequestException ex) {
+			var code = (int)(ex.StatusCode ?? HttpStatusCode.ServiceUnavailable);
+			return code is >= 400 and < 500
+				? Response.Rejected<Unit>(ex.Message)
+				: Response.ServerError<Unit>(ex.Message);
+		} catch (Exception ex) {
+			return Response.ServerError(ex.Message);
+		}
+	}
+
+	public async Task<Response<Unit>> Configure(CrontabSchedule schedule, CancellationToken token) {
+		try {
+			var baseUrl = GetLeaderBaseUrl(nameof(Configure));
+			if (baseUrl is null)
+				return Response.ServerError<Unit>("No leader node was found in the cluster");
+
+			var content = JsonContent.Create(new JsonObject {
+				["schedule"] = schedule.ToString(),
+			});
+
+			var resp = await wrapper.HttpClient.PostAsync($"{baseUrl}/auto-scavenge/configure", content, token);
+			resp.EnsureSuccessStatusCode();
+
+			return Response.Accepted();
+		} catch (HttpRequestException ex) {
+			var code = (int)(ex.StatusCode ?? HttpStatusCode.ServiceUnavailable);
+			return code is >= 400 and < 500
+				? Response.Rejected<Unit>(ex.Message)
+				: Response.ServerError<Unit>(ex.Message);
+		} catch (Exception ex) {
+			return Response.ServerError(ex.Message);
+		}
+	}
+
+	private string? GetLeaderBaseUrl(string request) {
+		if (!TryGetCurrentLeader(out var leaderNode, out var isSelf) || isSelf)
+			return null;
+
+		var leaderBase = $"{wrapper.Protocol}://{leaderNode.Host}:{leaderNode.Port}";
+		Log.Debug("Forwarding AutoScavenge request \"{Request}\" to leader at {LeaderBase}", request, leaderBase);
+		return leaderBase;
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge/ClusterMember.cs b/src/KurrentDB.AutoScavenge/ClusterMember.cs
new file mode 100644
index 00000000000..d956f475891
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/ClusterMember.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.AutoScavenge.Domain;
+
+namespace KurrentDB.AutoScavenge;
+
+public class ClusterMember {
+	public Guid InstanceId { get; set; } = default;
+	public string State { get; set; } = string.Empty;
+	public bool IsAlive { get; set; }
+	public string InternalHttpEndPointIp { get; set; } = string.Empty;
+	public int InternalHttpEndPointPort { get; set; }
+	public long WriterCheckpoint { get; set; }
+	public bool IsReadOnlyReplica { get; set; }
+}
+
+public static class ClusterMemberExtensions {
+	public static NodeId ToNodeId(this ClusterMember m) =>
+		new(m.InternalHttpEndPointIp, m.InternalHttpEndPointPort);
+}
diff --git a/src/KurrentDB.AutoScavenge/Commands.cs b/src/KurrentDB.AutoScavenge/Commands.cs
new file mode 100644
index 00000000000..89d754fe94e
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Commands.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.AutoScavenge.Domain;
+using NCrontab;
+
+namespace KurrentDB.AutoScavenge;
+
+public class Commands {
+	public record Assess() : Command<Unit>(_ => { }) {
+		public static Assess Instance { get; } = new();
+	}
+
+	public record Configure(CrontabSchedule Schedule, Action<Response<Unit>> Callback) : Command<Unit>(Callback);
+
+	public record GetStatus(Action<Response<AutoScavengeStatusResponse>> Callback) : Command<AutoScavengeStatusResponse>(Callback);
+
+	public record PauseProcess(Action<Response<Unit>> Callback) : Command<Unit>(Callback);
+
+	public record ResumeProcess(Action<Response<Unit>> Callback) : Command<Unit>(Callback);
+
+	public record ReceiveGossip(GossipMessage Msg) : Command<Unit>(_ => { });
+}
diff --git a/src/KurrentDB.AutoScavenge/Converters/CrontableScheduleJsonConverter.cs b/src/KurrentDB.AutoScavenge/Converters/CrontableScheduleJsonConverter.cs
new file mode 100644
index 00000000000..aabe1c17272
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Converters/CrontableScheduleJsonConverter.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using NCrontab;
+
+namespace KurrentDB.AutoScavenge.Converters;
+
+public class CrontableScheduleJsonConverter : JsonConverter<CrontabSchedule> {
+	public override CrontabSchedule Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+		if (reader.TokenType != JsonTokenType.String)
+			throw new JsonException("CRON expression can only be a string");
+
+		try {
+			return CrontabSchedule.Parse(reader.GetString());
+		} catch (Exception ex) {
+			throw new JsonException("Invalid CRON expression", ex);
+		}
+	}
+
+	public override void Write(Utf8JsonWriter writer, CrontabSchedule value, JsonSerializerOptions options) {
+		JsonSerializer.Serialize(writer, value.ToString(), options);
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge/Converters/EventJsonConverter.cs b/src/KurrentDB.AutoScavenge/Converters/EventJsonConverter.cs
new file mode 100644
index 00000000000..da89815eb93
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Converters/EventJsonConverter.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace KurrentDB.AutoScavenge.Converters;
+
+public class EventJsonConverter : JsonConverter<IEvent> {
+	public override IEvent? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+		throw new NotImplementedException();
+	}
+
+	public override void Write(Utf8JsonWriter writer, IEvent value, JsonSerializerOptions options) {
+		JsonSerializer.Serialize(writer, value, value.GetType(), options);
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge/Domain/AutoScavengeConfiguration.cs b/src/KurrentDB.AutoScavenge/Domain/AutoScavengeConfiguration.cs
new file mode 100644
index 00000000000..d94848a531c
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Domain/AutoScavengeConfiguration.cs
@@ -0,0 +1,62 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using NCrontab;
+
+namespace KurrentDB.AutoScavenge.Domain;
+
+/// <summary>
+/// Auto scavenge configuration transient state.
+/// </summary>
+public class AutoScavengeConfiguration {
+
+	/// <summary>
+	/// Interval between two auto scavenge processes.
+	/// </summary>
+	public CrontabSchedule? Schedule { get; private set; }
+
+	/// <summary>
+	/// If configured at least once, when was the last time the auto scavenge process configuration was updated.
+	/// </summary>
+	public DateTime? StartingPoint { get; private set; }
+
+
+	/// <summary>
+	/// If the auto scavenge process is configured.
+	/// </summary>
+	public bool IsConfigured => StartingPoint != null;
+
+	/// <summary>
+	/// Deep instance copy, useful for testing purposes
+	/// </summary>
+	public AutoScavengeConfiguration Clone() {
+		return new AutoScavengeConfiguration {
+			Schedule = Schedule,
+			StartingPoint = StartingPoint,
+		};
+	}
+
+	/// <summary>
+	/// Resets internal state to default values.
+	/// </summary>
+	public void Clear() {
+		Schedule = null;
+		StartingPoint = null;
+	}
+
+	/// <summary>
+	/// Apply an event to the current state.
+	/// </summary>
+	/// <param name="event"></param>
+	public void Apply(IEvent @event) {
+		if (@event is not Events.ConfigurationUpdated msg)
+			return;
+
+		Handle(msg);
+	}
+
+	private void Handle(Events.ConfigurationUpdated msg) {
+		Schedule = msg.Schedule;
+		StartingPoint = msg.UpdatedAt;
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge/Domain/AutoScavengeProcessManager.cs b/src/KurrentDB.AutoScavenge/Domain/AutoScavengeProcessManager.cs
new file mode 100644
index 00000000000..285d2796461
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Domain/AutoScavengeProcessManager.cs
@@ -0,0 +1,572 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.AutoScavenge.Scavengers;
+using KurrentDB.AutoScavenge.Sources;
+using KurrentDB.AutoScavenge.TimeProviders;
+using KurrentDB.POC.IO.Core;
+using NCrontab;
+using Serilog;
+using Serilog.Events;
+
+namespace KurrentDB.AutoScavenge.Domain;
+
+/// <summary>
+/// Responsible for managing the state transitions and operations related to the auto scavenge process in an Event Store
+/// cluster.
+/// </summary>
+/// <param name="timeProvider">
+/// Used when dealing with time-sensitive operations like when should the next auto scavenge process start.
+/// </param>
+/// <param name="source">
+/// Accesses the configuration and events related to the auto scavenge process.
+/// </param>
+public class AutoScavengeProcessManager {
+	private static readonly ILogger Log = Serilog.Log.ForContext<AutoScavengeProcessManager>();
+
+	readonly ITimeProvider _timeProvider;
+	readonly ISource _source;
+	readonly IOperationsClient _operationClient;
+	readonly INodeScavenger _scavenger;
+	readonly int _clusterSize;
+
+	readonly Queue<IEvent> _uncommittedEvents = [];
+
+	NodeId _nodeId = new() { Address = "", Port = 0 };
+
+	NodeState _nodeState = NodeState.NotLeader;
+
+	List<ClusterMember> _gossip = [];
+	bool _isHealthyCluster;
+
+	// EventSourced state
+	public AutoScavengeState State { get; } = new();
+
+	public AutoScavengeProcessManager(
+		int clusterSize,
+		ITimeProvider timeProvider,
+		ISource source,
+		IOperationsClient operationsClient,
+		INodeScavenger scavenger) {
+
+		_timeProvider = timeProvider;
+		_source = source;
+		_operationClient = operationsClient;
+		_scavenger = scavenger;
+		_clusterSize = clusterSize;
+	}
+
+	/// <summary>
+	/// This is the entry point for the state machine. It operates one step at a time, requiring a command to progress.
+	/// </summary>
+	/// <remarks>
+	/// The state machine can generate another command, an event, or both. Here's the distinction:
+	/// - A command instructs the state machine to perform an action.
+	/// - An event notifies that a decision has been made.
+	///
+	/// It's expected that an event is persisted and should be retrievable using <see cref="ISource" />.
+	/// Only an event can modify the transient state of the state machine, which is done when <see cref="Apply"/> is called.
+	/// </remarks>
+	/// <returns>Events to persist and optionally a command to process afterward</returns>
+	public async ValueTask<Transition> RunAsync(ICommand command, CancellationToken token) {
+		switch (command) {
+			case Commands.ReceiveGossip gossip:
+				await ReceiveGossipAsync(gossip.Msg, token);
+				break;
+			case Commands.Configure configure:
+				configure.SetConditionalResponse(Configure(configure));
+				break;
+			case Commands.GetStatus status:
+				status.SetConditionalResponse(GetStatus());
+				break;
+			case Commands.PauseProcess pause:
+				pause.SetConditionalResponse(PauseProcess());
+				break;
+			case Commands.ResumeProcess resume:
+				resume.SetConditionalResponse(ResumeProcess());
+				break;
+			case Commands.Assess:
+				await AssessAsync(token);
+				break;
+			default:
+				return Transition.Noop;
+		}
+
+		// if we produced any events, commit them and reassess immediately
+		if (_uncommittedEvents.Count > 0) {
+			var events = _uncommittedEvents.ToArray();
+			_uncommittedEvents.Clear();
+			return new Transition(events, Commands.Assess.Instance);
+		}
+
+		if (command is Commands.Assess)
+			return Transition.Noop;
+
+		return new Transition([], Commands.Assess.Instance);
+	}
+
+	/// <summary>
+	/// Updates the transient state of the state machine.
+	/// </summary>
+	public void Apply(IEvent @event) {
+		State.Apply(@event);
+	}
+
+	/// <summary>
+	/// Resets the transient state of the state machine.
+	/// </summary>
+	private void Clear() {
+		State.Clear();
+		_uncommittedEvents.Clear();
+	}
+
+	// Cluster is healthy if all cluster nodes (not readonly replicas) are present
+	// todo: we may want to consider the statuses and the checkpoints
+	private bool IsHealthyCluster() {
+		var clusterMembers = 0;
+
+		foreach (var member in _gossip) {
+			if (member.InstanceId != Guid.Empty && !member.IsReadOnlyReplica)
+				clusterMembers++;
+		}
+
+		return clusterMembers == _clusterSize;
+	}
+
+	/// <summary>
+	/// Handles a gossip message from the cluster.
+	/// </summary>
+	/// <remarks>
+	/// This command serves as a central point in the state machine. It is triggered by frequent gossip messages,
+	/// which also act as a trigger mechanism to track the progress of operations such as the start of a new auto
+	/// scavenge process, completion or retry of a node scavenge. This command also detects changes in the cluster
+	/// topology.
+	///
+	/// It also tracks the node state this way. If it is no longer leader it resets all its transient state.
+	/// </remarks>
+	private async ValueTask ReceiveGossipAsync(GossipMessage msg, CancellationToken token) {
+		_gossip = msg.Members;
+		_isHealthyCluster = IsHealthyCluster();
+
+		var previousStatus = _nodeState;
+
+		foreach (var member in _gossip) {
+			if (member.InstanceId != msg.NodeId)
+				continue;
+
+			// member is this node
+			_nodeId = member.ToNodeId();
+
+			_nodeState = member.State == "Leader"
+				? NodeState.Leader
+				: NodeState.NotLeader;
+		}
+
+		if (_nodeState == NodeState.Leader) {
+			if (previousStatus != NodeState.Leader) {
+				// became the leader
+				await LoadConfigurationAsync(token);
+				await LoadStateAsync(token);
+			}
+		} else {
+			if (previousStatus == NodeState.Leader) {
+				// no longer the leader
+				Clear();
+			}
+			return;
+		}
+
+		// we are the leader
+		if (!_isHealthyCluster)
+			return;
+
+		if (!State.HasOngoingClusterScavenge(out _))
+			return;
+
+		// A cluster scavenge is in progress (even if paused), it may be affected by the new gossip.
+		var gossipNodeIds = _gossip.Select(x => x.ToNodeId()).ToList();
+		var newMembers = gossipNodeIds.Except(State.ClusterMembers).ToList();
+		var removedMembers = State.ClusterMembers.Except(gossipNodeIds).ToList();
+
+		if (newMembers.Count == 0 && removedMembers.Count == 0)
+			return;
+
+		_uncommittedEvents.Enqueue(new Events.ClusterMembersChanged {
+			Added = newMembers,
+			Removed = removedMembers,
+		});
+	}
+
+	/// <summary>
+	/// Handles auto scavenge configuration request.
+	/// </summary>
+	/// <remarks>
+	/// Because we always take the latest configuration, we don't need to reload passed configuration events. Updating
+	/// an auto scavenge process configuration must have no impact on an ongoing auto scavenge process.
+	/// </remarks>
+	private Response<Unit> Configure(Commands.Configure command) {
+		if (_nodeState != NodeState.Leader)
+			return Response.Rejected<Unit>("Node is not the leader");
+
+		_uncommittedEvents.Enqueue(new Events.ConfigurationUpdated {
+			Schedule = command.Schedule,
+			UpdatedAt = _timeProvider.Now,
+		});
+
+		return Response.Successful();
+	}
+
+	private async ValueTask LoadConfigurationAsync(CancellationToken token) {
+		Log.Information("Loading auto scavenge configuration...");
+
+		var @event = await _source.ReadConfigurationEvent(token);
+
+		if (@event != null)
+			Apply(@event);
+
+		Log.Information("Loaded auto scavenge configuration");
+	}
+
+	private async ValueTask LoadStateAsync(CancellationToken token) {
+		Log.Information("Loading auto scavenge state...");
+
+		await foreach (var @event in _source.ReadAutoScavengeEvents(token))
+			Apply(@event);
+
+		Apply(new Events.Initialized {
+			InitializedAt = _timeProvider.Now
+		});
+
+		Log.Information("Loaded auto scavenge state");
+	}
+
+	/// <summary>
+	///  Handles auto scavenge process assessment.
+	/// </summary>
+	/// <remarks>
+	/// During assessment, the state machine checks holistically the auto scavenge process current state:
+	/// <list type="bullet">
+	/// <item>
+	/// If enough time has passed since the last auto scavenge process, the state machine will start a new one.
+	/// </item>
+	/// <item>
+	/// If a node has been designated for scavenge, the state machine will issue a remote scavenge request to that
+	/// node.
+	/// </item>
+	/// <item>
+	/// If a node is scavenging, the state machine checks the status of that scavenge.
+	/// </item>
+	/// </list>
+	/// </remarks>
+	private async ValueTask AssessAsync(CancellationToken token) {
+		if (_nodeState != NodeState.Leader)
+			return;
+
+		// todo: consider reducing allocations here by passing a visitor object (nested struct? be careful not to box)
+		// this is called once every ~5s, so not often, and the allocations will usually be gen1
+		await State.Visit(
+			onNotConfigured: DoNothingAsync,
+			onPausedWhileIdle: DoNothingAsync,
+			onPausedWhileScavengingCluster: DoNothingAsync,
+			onPausing: TryToPause,
+			onContinuingClusterScavenge: PickANode,
+			onStartingNodeScavenge: StartNodeScavenge,
+			onMonitoringNodeScavenge: CheckOnTheNodeScavenge,
+			onWaiting: CheckTheSchedule);
+
+		static ValueTask DoNothingAsync() => ValueTask.CompletedTask;
+
+		async ValueTask TryToPause(NodeId? designatedNode, Guid? nodeScavengeId) {
+			if (designatedNode is null) {
+				_uncommittedEvents.Enqueue(new Events.Paused {
+					PausedAt = _timeProvider.Now,
+				});
+				return;
+			}
+
+			var success = await _scavenger.TryPauseScavengeAsync(
+				designatedNode.Value.Address,
+				designatedNode.Value.Port,
+				nodeScavengeId, token);
+
+			// If pausing the node scavenged failed, it will be retried on the next gossip message we got from
+			// the cluster.
+			if (!success)
+				return;
+
+			_uncommittedEvents.Enqueue(new Events.Paused {
+				PausedAt = _timeProvider.Now,
+			});
+		}
+
+		async ValueTask CheckOnTheNodeScavenge(NodeId designatedNode, Guid nodeScavengeId) {
+			ScavengeStatus status;
+
+			status = await _scavenger.TryGetScavengeAsync(
+				designatedNode.Address,
+				designatedNode.Port,
+				nodeScavengeId,
+				token);
+
+			if (status is ScavengeStatus.Unknown) {
+				Log.Information("Node scavenge on {NodeId} has Unknown status. Will retry.", designatedNode);
+				// retry will be triggered by next gossip
+				return;
+			}
+
+			if (status is ScavengeStatus.InProgress) {
+				Log.Verbose("Node Scavenge on {NodeId} is still in progress", designatedNode);
+				return;
+			}
+
+			if (status is ScavengeStatus.NotRunningUnknown) {
+				Log.Information("Node scavenge on {NodeId} is not running for an unknown reason. Restarting it.",
+					designatedNode);
+
+				_uncommittedEvents.Enqueue(new Events.NodeDesignated {
+					NodeId = designatedNode,
+					DesignatedAt = _timeProvider.Now,
+				});
+
+				return;
+			}
+
+			Log.Write(
+				status == ScavengeStatus.Success
+					? LogEventLevel.Information
+					: LogEventLevel.Warning,
+				"Node scavenge on {NodeId} has status: {Status}. Marking it as completed",
+				designatedNode, status);
+
+			_uncommittedEvents.Enqueue(new Events.NodeScavengeCompleted {
+				NodeId = designatedNode,
+				CompletedAt = _timeProvider.Now,
+				Result = status.ToString()
+			});
+		}
+
+		async ValueTask StartNodeScavenge(NodeId designatedNode) {
+			if (designatedNode == _nodeId && _clusterSize > 1) {
+				Log.Information(
+					"The leader {NodeId} is the last node to scavenge. We are resigning from leadership",
+					_nodeId);
+
+				_operationClient.Resign();
+				return;
+			}
+
+			var scavengeId = await _scavenger.TryStartScavengeAsync(designatedNode.Address, designatedNode.Port, token);
+
+			if (scavengeId == null)
+				// The idea is to let another gossip message come in and trigger the assessment again.
+				return;
+
+			_uncommittedEvents.Enqueue(new Events.NodeScavengeStarted {
+				NodeId = designatedNode,
+				ScavengeId = scavengeId.Value,
+				StartedAt = _timeProvider.Now,
+			});
+		}
+
+		ValueTask PickANode(Guid clusterScavengeId) {
+			DetermineBestCandidate(clusterScavengeId);
+			return ValueTask.CompletedTask;
+		}
+
+		ValueTask CheckTheSchedule(CrontabSchedule schedule, DateTime nextOccurence) {
+			// We are active but not currently scavenging the cluster. Maybe it's time to start!
+			if (_timeProvider.Now < nextOccurence)
+				return ValueTask.CompletedTask;
+
+			if (!_isHealthyCluster) {
+				Log.Information("Autoscavenge is due. Waiting for a healthy cluster");
+				return ValueTask.CompletedTask;
+			}
+
+			// We are due for a new auto scavenge process.
+			var activeMembers = _gossip.Select(x => x.ToNodeId());
+
+			_uncommittedEvents.Enqueue(new Events.ClusterScavengeStarted {
+				ClusterScavengeId = Guid.NewGuid(),
+				Members = activeMembers.ToList(),
+				StartedAt = _timeProvider.Now,
+			});
+
+			return ValueTask.CompletedTask;
+		}
+	}
+
+	/// <summary>
+	/// Determines the next best candidate for the auto scavenge process.
+	/// </summary>
+	/// <remarks>
+	/// This stage also handles the completion of the auto scavenge process when there are no more nodes to scavenge.
+	/// </remarks>
+	private void DetermineBestCandidate(Guid clusterScavengeId) {
+		if (!_isHealthyCluster) {
+			Log.Information("Waiting for a healthy cluster before picking a node to scavenge");
+			return;
+		}
+
+		var targets = State.NodesToScavenge.ToList();
+
+		// We detect if there is no longer any node to scavenge left.
+		if (targets.Count == 0) {
+			_uncommittedEvents.Enqueue(new Events.ClusterScavengeCompleted {
+				ClusterScavengeId = clusterScavengeId,
+				Members = State.ClusterMembers.ToList(),
+				CompletedAt = _timeProvider.Now,
+			});
+
+			Log.Information("Auto scavenge process {ClusterScavengeId} completed", clusterScavengeId);
+			return;
+		}
+
+		var candidate = targets[0];
+		var minWriterCheckpoint = long.MaxValue;
+
+		// We choose the node that is the farthest behind in its replication process.
+		foreach (var target in targets) {
+			var targetWriterCheckpoint = _gossip.Find(m => m.ToNodeId() == target)!.WriterCheckpoint;
+
+			if (targetWriterCheckpoint > minWriterCheckpoint)
+				continue;
+
+			if (target == _nodeId)
+				continue;
+
+			// In case a follower node is up-to-date, we will always choose it over the leader.
+			if (targetWriterCheckpoint == minWriterCheckpoint && candidate == _nodeId) {
+				candidate = target;
+				continue;
+			}
+
+			minWriterCheckpoint = targetWriterCheckpoint;
+			candidate = target;
+		}
+
+		Log.Information("Node {NodeId} is the next best candidate for scavenge", candidate);
+		_uncommittedEvents.Enqueue(new Events.NodeDesignated {
+			NodeId = candidate,
+			DesignatedAt = _timeProvider.Now,
+		});
+	}
+
+	/// <summary>
+	/// Pauses the auto scavenge process.
+	/// </summary>
+	private Response<Unit> PauseProcess() {
+		if (_nodeState != NodeState.Leader)
+			return Response.Rejected<Unit>("Node is not the leader");
+
+		switch (State.Status) {
+			case AutoScavengeStatus.PausedWhileIdle:
+			case AutoScavengeStatus.PausedWhileScavengingCluster:
+				return Response.Successful();
+
+			case AutoScavengeStatus.Pausing:
+				return Response.Accepted();
+
+			case AutoScavengeStatus.NotConfigured:
+			case AutoScavengeStatus.ContinuingClusterScavenge:
+			case AutoScavengeStatus.Waiting:
+				_uncommittedEvents.Enqueue(new Events.Paused {
+					PausedAt = _timeProvider.Now
+				});
+				return Response.Successful();
+
+			case AutoScavengeStatus.StartingNodeScavenge:
+			case AutoScavengeStatus.MonitoringNodeScavenge:
+				_uncommittedEvents.Enqueue(new Events.PauseRequested {
+					RequestedAt = _timeProvider.Now
+				});
+				return Response.Accepted();
+			default:
+				throw new InvalidOperationException();
+		}
+	}
+
+	/// <summary>
+	/// Resumes the auto scavenge process.
+	/// </summary>
+	private Response<Unit> ResumeProcess() {
+		if (_nodeState != NodeState.Leader)
+			return Response.Rejected<Unit>("Node is not the leader");
+
+		switch (State.Status) {
+			case AutoScavengeStatus.PausedWhileIdle:
+			case AutoScavengeStatus.PausedWhileScavengingCluster:
+				_uncommittedEvents.Enqueue(new Events.Resumed {
+					ResumedAt = _timeProvider.Now,
+				});
+				return Response.Successful();
+
+			case AutoScavengeStatus.Pausing:
+				return Response.Rejected("Auto scavenge process is currently pausing");
+
+			case AutoScavengeStatus.NotConfigured:
+			case AutoScavengeStatus.ContinuingClusterScavenge:
+			case AutoScavengeStatus.StartingNodeScavenge:
+			case AutoScavengeStatus.MonitoringNodeScavenge:
+			case AutoScavengeStatus.Waiting:
+				return Response.Successful();
+			default:
+				throw new InvalidOperationException();
+		}
+	}
+
+	/// <summary>
+	/// Produces the status breakdown of the auto scavenge process. If the auto scavenge process transient states
+	/// are loaded from the persistent storage, We produce the breakdown on the spot. If the state machine hasn't
+	/// loaded, we load it first then we produce the status breakdown.
+	/// </summary>
+	private Response<AutoScavengeStatusResponse> GetStatus() {
+		if (_nodeState != NodeState.Leader)
+			return Response.Rejected<AutoScavengeStatusResponse>("Node is not the leader");
+
+		State.HasSchedule(out var schedule, out var nextOccurence);
+
+		TimeSpan? nextCycle;
+
+		if (State.HasOngoingClusterScavenge(out _)) {
+			// cycle is happening right now
+			nextCycle = TimeSpan.Zero;
+		} else if (schedule is null) {
+			// not configured, there is no next cycle
+			nextCycle = null;
+		} else if (State.Status is AutoScavengeStatus.PausedWhileIdle) {
+			// we are paused while idle, show the time of the next cycle if we resumed now
+			nextCycle = schedule.GetNextOccurrence(_timeProvider.Now) - _timeProvider.Now;
+		} else {
+			// waiting
+			nextCycle = nextOccurence - _timeProvider.Now;
+		}
+
+		if (nextCycle < TimeSpan.Zero)
+			nextCycle = TimeSpan.Zero;
+
+		var state = State.Status switch {
+			AutoScavengeStatus.NotConfigured =>
+				AutoScavengeStatusResponse.Status.NotConfigured,
+
+			AutoScavengeStatus.Waiting =>
+				AutoScavengeStatusResponse.Status.Waiting,
+
+			AutoScavengeStatus.ContinuingClusterScavenge or
+			AutoScavengeStatus.MonitoringNodeScavenge or
+			AutoScavengeStatus.StartingNodeScavenge =>
+				AutoScavengeStatusResponse.Status.InProgress,
+
+			AutoScavengeStatus.Pausing =>
+				AutoScavengeStatusResponse.Status.Pausing,
+
+			AutoScavengeStatus.PausedWhileIdle or
+			AutoScavengeStatus.PausedWhileScavengingCluster =>
+				AutoScavengeStatusResponse.Status.Paused,
+
+			_ => throw new InvalidOperationException(),
+		};
+
+		return Response.Successful(new AutoScavengeStatusResponse(state, schedule, nextCycle));
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge/Domain/AutoScavengeState.cs b/src/KurrentDB.AutoScavenge/Domain/AutoScavengeState.cs
new file mode 100644
index 00000000000..febc9e8881f
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Domain/AutoScavengeState.cs
@@ -0,0 +1,350 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Diagnostics.CodeAnalysis;
+using NCrontab;
+using Serilog;
+
+namespace KurrentDB.AutoScavenge.Domain;
+
+/// <summary>
+/// Auto scavenge process transient state.
+/// </summary>
+public class AutoScavengeState {
+	private static readonly ILogger Log = Serilog.Log.ForContext<AutoScavengeState>();
+
+	/// <summary>
+	/// Nodes that have been scavenged in the current process cycle.
+	/// </summary>
+	private HashSet<NodeId> _scavengedNodes = [];
+
+	/// <summary>
+	/// Id of the current cluster scavenge, if any.
+	/// </summary>
+	// todo: only used by this and tests, make private
+	public Guid ClusterScavengeId { get; private set; } = Guid.Empty;
+
+	/// <summary>
+	/// Id of the current node scavenge, if any.
+	/// </summary>
+	// todo: only used by this and tests, make private
+	public Guid NodeScavengeId { get; private set; } = Guid.Empty;
+
+	/// <summary>
+	/// Current node that is designated for scavenging.
+	/// </summary>
+	// NodeScavengeId == Guid.Empty => a scavenge may have been started on the DesignatedNode
+	// NodeScavengeId != Guid.Empty => a scavenge has been started on the DesignatedNode
+	// todo: only used by this and tests, make private
+	public NodeId? DesignatedNode { get; private set; } = null;
+
+	/// <summary>
+	/// Current list of cluster members.
+	/// </summary>
+	public HashSet<NodeId> ClusterMembers { get; private set; } = [];
+
+	/// <summary>
+	/// Last time a cluster scavenge was completed successfully or resume. Changing the anchor date when a cluster
+	/// scavenge was resumed is for consistency’s sake. For example if a schedule is set for once every week on Sundays,
+	/// if the process is paused for a whole week and resumed on the next Tuesday, the process will start on the next
+	/// Sunday, instead of starting right away.
+	/// </summary>
+	public DateTime? LastClusterAnchorDateTime { get; private set; }
+
+	/// <summary>
+	/// Nodes remaining to be scavenged in the current cluster scavenge.
+	/// </summary>
+	public IEnumerable<NodeId> NodesToScavenge => ClusterMembers.Except(_scavengedNodes);
+
+	public AutoScavengeConfiguration Configuration { get; init; } = new();
+
+	/// <summary>
+	/// Is there an ongoing auto scavenge process? By process, we mean if we have started a new cycle of node scavenges.
+	/// </summary>
+	public bool HasOngoingClusterScavenge(out Guid clusterScavengeId) {
+		clusterScavengeId = ClusterScavengeId;
+		return clusterScavengeId != Guid.Empty;
+	}
+
+	public bool HasSchedule(
+		[MaybeNullWhen(returnValue: false)] out CrontabSchedule schedule,
+		out DateTime nextOccurence) {
+
+		var since = LastClusterAnchorDateTime ?? Configuration.StartingPoint;
+
+		if (since is null || Configuration.Schedule is null) {
+			schedule = default;
+			nextOccurence = default;
+			return false;
+		}
+
+		schedule = Configuration.Schedule;
+		nextOccurence = schedule.GetNextOccurrence(since.Value);
+		return true;
+	}
+
+	public T Visit<T>(
+		Func<T> onNotConfigured,
+		Func<Guid, T> onContinuingClusterScavenge,
+		Func<NodeId, Guid, T> onMonitoringNodeScavenge,
+		Func<NodeId?, Guid?, T> onPausing,
+		Func<T> onPausedWhileIdle,
+		Func<T> onPausedWhileScavengingCluster,
+		Func<NodeId, T> onStartingNodeScavenge,
+		Func<CrontabSchedule, DateTime, T> onWaiting) {
+		switch (Status) {
+			case AutoScavengeStatus.NotConfigured:
+				return onNotConfigured();
+
+			case AutoScavengeStatus.ContinuingClusterScavenge:
+				return onContinuingClusterScavenge(ClusterScavengeId);
+
+			case AutoScavengeStatus.MonitoringNodeScavenge:
+				return onMonitoringNodeScavenge(DesignatedNode!.Value, NodeScavengeId);
+
+			case AutoScavengeStatus.Pausing:
+				return onPausing(DesignatedNode, NodeScavengeId == Guid.Empty ? null : NodeScavengeId);
+
+			case AutoScavengeStatus.PausedWhileIdle:
+				return onPausedWhileIdle();
+
+			case AutoScavengeStatus.PausedWhileScavengingCluster:
+				return onPausedWhileScavengingCluster();
+
+			case AutoScavengeStatus.StartingNodeScavenge:
+				return onStartingNodeScavenge(DesignatedNode!.Value);
+
+			case AutoScavengeStatus.Waiting:
+				if (!HasSchedule(out var schedule, out var nextOccurence))
+					throw new Exception("Invalid state");
+				return onWaiting(schedule, nextOccurence);
+
+			default:
+				throw new Exception("Unexpected Status");
+		}
+	}
+
+	/// <summary>
+	/// Auto scavenge process status
+	/// </summary>
+	/// Checks that the invariants are maintained when changing status
+	AutoScavengeStatus _status = AutoScavengeStatus.NotConfigured;
+	public AutoScavengeStatus Status {
+		get {
+			return _status;
+		}
+		private set {
+			switch (value) {
+				// in these states we do not have an ongoing cluster scavenge
+				case AutoScavengeStatus.NotConfigured:
+				case AutoScavengeStatus.Waiting:
+				case AutoScavengeStatus.PausedWhileIdle:
+					if (HasOngoingClusterScavenge(out _))
+						throw new InvalidOperationException($"Cannot transition to {value}. There is an ongoing cluster scavenge.");
+					break;
+
+				// in these states we do have an ongoing cluster scavenge
+				case AutoScavengeStatus.ContinuingClusterScavenge:
+				case AutoScavengeStatus.PausedWhileScavengingCluster:
+				case AutoScavengeStatus.Pausing:
+					if (!HasOngoingClusterScavenge(out _))
+						throw new InvalidOperationException($"Cannot transition to {value}. There is no ongoing cluster scavenge.");
+					break;
+
+				// in these states it's possible that a node scavenge is running
+				case AutoScavengeStatus.StartingNodeScavenge:
+					if (!HasOngoingClusterScavenge(out _))
+						throw new InvalidOperationException($"Cannot transition to {value}. There is no ongoing cluster scavenge.");
+					if (DesignatedNode is null)
+						throw new InvalidOperationException($"Cannot transition to {value}. There is no designated node.");
+					break;
+
+				// in these states we have an ongoing node scavenge
+				case AutoScavengeStatus.MonitoringNodeScavenge:
+					if (!HasOngoingClusterScavenge(out _))
+						throw new InvalidOperationException($"Cannot transition to {value}. There is no ongoing cluster scavenge.");
+					if (DesignatedNode is null || NodeScavengeId == Guid.Empty)
+						throw new InvalidOperationException($"Cannot transition to {value}. There is no ongoing node scavenge.");
+					break;
+				default:
+					throw new InvalidOperationException($"Cannot transition to {value}. It is an unknown state.");
+			}
+			_status = value;
+		}
+	}
+
+	/// <summary>
+	/// Deep instance copy, useful for testing purposes
+	/// </summary>
+	public AutoScavengeState Clone() {
+		return new AutoScavengeState {
+			ClusterScavengeId = ClusterScavengeId,
+			ClusterMembers = ClusterMembers.ToHashSet(),
+			DesignatedNode = DesignatedNode,
+			LastClusterAnchorDateTime = LastClusterAnchorDateTime,
+			_scavengedNodes = _scavengedNodes.ToHashSet(),
+			NodeScavengeId = NodeScavengeId,
+			Configuration = Configuration.Clone(),
+			Status = Status,
+		};
+	}
+
+	/// <summary>
+	/// Resets internal state to default values.
+	/// </summary>
+	public void Clear() {
+		ClusterScavengeId = Guid.Empty;
+		DesignatedNode = null;
+		_scavengedNodes.Clear();
+		ClusterMembers.Clear();
+		Configuration.Clear();
+		LastClusterAnchorDateTime = null;
+		Status = AutoScavengeStatus.NotConfigured;
+	}
+
+	/// <summary>
+	/// Apply an event to the current state.
+	/// </summary>
+	/// <param name="event"></param>
+	public void Apply(IEvent @event) {
+		switch (@event) {
+			case Events.ClusterScavengeStarted msg:
+				Handle(msg);
+				break;
+			case Events.ClusterScavengeCompleted msg:
+				Handle(msg);
+				break;
+			case Events.NodeScavengeStarted msg:
+				Handle(msg);
+				break;
+			case Events.NodeScavengeCompleted msg:
+				Handle(msg);
+				break;
+			case Events.NodeDesignated msg:
+				Handle(msg);
+				break;
+			case Events.ClusterMembersChanged msg:
+				Handle(msg);
+				break;
+			case Events.Initialized msg:
+				Handle(msg);
+				break;
+			case Events.PauseRequested msg:
+				Handle(msg);
+				break;
+			case Events.Paused msg:
+				Handle(msg);
+				break;
+			case Events.Resumed msg:
+				Handle(msg);
+				break;
+			case Events.ConfigurationUpdated msg:
+				Handle(msg);
+				break;
+		}
+	}
+
+	private void Handle(Events.ClusterScavengeStarted msg) {
+		ClusterScavengeId = msg.ClusterScavengeId;
+		_scavengedNodes.Clear();
+		ClusterMembers = msg.Members.ToHashSet();
+		Status = AutoScavengeStatus.ContinuingClusterScavenge;
+	}
+
+	private void Handle(Events.ClusterScavengeCompleted msg) {
+		if (ClusterScavengeId != msg.ClusterScavengeId) {
+			Log.Warning("Ignoring uncorrelated {EventType} event", msg.Type);
+			return;
+		}
+
+		ClusterMembers = msg.Members.ToHashSet();
+		LastClusterAnchorDateTime = msg.CompletedAt;
+		ClusterScavengeId = Guid.Empty;
+		Status = AutoScavengeStatus.Waiting;
+	}
+
+	private void Handle(Events.NodeScavengeStarted msg) {
+		if (DesignatedNode != msg.NodeId) {
+			Log.Warning("Found out of order {EventType} event. Skipping it", msg.Type);
+			return;
+		}
+
+		NodeScavengeId = msg.ScavengeId;
+		Status = AutoScavengeStatus.MonitoringNodeScavenge;
+	}
+
+	private void Handle(Events.NodeScavengeCompleted msg) {
+		if (DesignatedNode != msg.NodeId) {
+			Log.Warning("Found out of order {EventType} event. Skipping it", msg.Type);
+			return;
+		}
+
+		DesignatedNode = null;
+		NodeScavengeId = Guid.Empty;
+		_scavengedNodes.Add(msg.NodeId);
+		Status = AutoScavengeStatus.ContinuingClusterScavenge;
+	}
+
+	private void Handle(Events.NodeDesignated msg) {
+		DesignatedNode = msg.NodeId;
+		Status = AutoScavengeStatus.StartingNodeScavenge;
+	}
+
+	private void Handle(Events.ClusterMembersChanged msg) {
+		foreach (var nodeId in msg.Added)
+			ClusterMembers.Add(nodeId);
+
+		foreach (var nodeId in msg.Removed) {
+			ClusterMembers.Remove(nodeId);
+			_scavengedNodes.Remove(nodeId);
+
+			if (DesignatedNode == nodeId) {
+				Log.Information("Node {NodeId} was designated to scavenge but has been removed from the cluster", nodeId);
+				DesignatedNode = null;
+				NodeScavengeId = Guid.Empty;
+
+				if (Status != AutoScavengeStatus.Pausing) {
+					Status = AutoScavengeStatus.ContinuingClusterScavenge;
+				} else {
+					// we are pausing but the designated node has left the cluster
+					// we remain in the pausing state, the manager will transition us to paused.
+				}
+			}
+		}
+	}
+
+	private void Handle(Events.Initialized msg) {
+		if (Configuration.IsConfigured)
+			LastClusterAnchorDateTime = msg.InitializedAt;
+	}
+
+	private void Handle(Events.PauseRequested msg) {
+		Status = AutoScavengeStatus.Pausing;
+	}
+
+	private void Handle(Events.Paused msg) {
+		DesignatedNode = null;
+
+		Status = ClusterScavengeId == Guid.Empty
+			? AutoScavengeStatus.PausedWhileIdle
+			: AutoScavengeStatus.PausedWhileScavengingCluster;
+	}
+
+	private void Handle(Events.Resumed msg) {
+		Status =
+			ClusterScavengeId != Guid.Empty ? AutoScavengeStatus.ContinuingClusterScavenge :
+			Configuration.IsConfigured ? AutoScavengeStatus.Waiting :
+			AutoScavengeStatus.NotConfigured;
+
+		if (Configuration.IsConfigured)
+			LastClusterAnchorDateTime = msg.ResumedAt;
+	}
+
+	private void Handle(Events.ConfigurationUpdated msg) {
+		Configuration.Apply(msg);
+		LastClusterAnchorDateTime = msg.UpdatedAt;
+
+		if (Status == AutoScavengeStatus.NotConfigured)
+			Status = AutoScavengeStatus.Waiting;
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge/Domain/AutoScavengeStatus.cs b/src/KurrentDB.AutoScavenge/Domain/AutoScavengeStatus.cs
new file mode 100644
index 00000000000..0a4e59a90f0
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Domain/AutoScavengeStatus.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.AutoScavenge.Domain;
+
+// Names are serialized on the status endpoint
+public enum AutoScavengeStatus {
+	// No schedule, do nothing
+	NotConfigured,
+
+	// Evaluating whether there are more nodes to scavenge this cycle.
+	ContinuingClusterScavenge,
+
+	// A node scavenge is under way and we are waiting for it.
+	MonitoringNodeScavenge,
+
+	// A node scavenge is under way and we are trying to stop it.
+	Pausing,
+
+	// Paused. No cluster scavenge is under way.
+	PausedWhileIdle,
+
+	// Paused. A cluster scavenge is ready to resume.
+	PausedWhileScavengingCluster,
+
+	// A node is designated, we are starting a nodescavenge on it.
+	StartingNodeScavenge,
+
+	// Waiting for the schedule to begin the next cycle.
+	Waiting,
+}
diff --git a/src/KurrentDB.AutoScavenge/Domain/AutoScavengeStatusResponse.cs b/src/KurrentDB.AutoScavenge/Domain/AutoScavengeStatusResponse.cs
new file mode 100644
index 00000000000..cb61ecaa5ec
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Domain/AutoScavengeStatusResponse.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using NCrontab;
+
+namespace KurrentDB.AutoScavenge.Domain;
+
+public record AutoScavengeStatusResponse(
+	AutoScavengeStatusResponse.Status State,
+	CrontabSchedule? Schedule,
+	TimeSpan? TimeUntilNextCycle) {
+
+	public enum Status {
+		NotConfigured,
+		Waiting,
+		InProgress,
+		Pausing,
+		Paused,
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge/Domain/NodeId.cs b/src/KurrentDB.AutoScavenge/Domain/NodeId.cs
new file mode 100644
index 00000000000..c070573bceb
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Domain/NodeId.cs
@@ -0,0 +1,6 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.AutoScavenge.Domain;
+
+public readonly record struct NodeId(string Address, int Port);
diff --git a/src/KurrentDB.AutoScavenge/EventStoreOptions.cs b/src/KurrentDB.AutoScavenge/EventStoreOptions.cs
new file mode 100644
index 00000000000..e981f165b2d
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/EventStoreOptions.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.AutoScavenge;
+
+public class EventStoreOptions {
+	public bool Insecure { get; init; }
+	public bool DiscoverViaDns { get; init; }
+	public string? ClusterDns { get; init; }
+	public int ClusterSize { get; init; }
+}
diff --git a/src/KurrentDB.AutoScavenge/Events.cs b/src/KurrentDB.AutoScavenge/Events.cs
new file mode 100644
index 00000000000..58a963128dd
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Events.cs
@@ -0,0 +1,98 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text.Json.Serialization;
+using KurrentDB.AutoScavenge.Domain;
+using NCrontab;
+
+namespace KurrentDB.AutoScavenge;
+
+public class Events {
+	public class ConfigurationUpdated : IEvent {
+		public required CrontabSchedule Schedule { get; init; }
+		public required DateTime UpdatedAt { get; init; }
+
+		[JsonIgnore]
+		public string Type => EventTypes.ConfigurationUpdated;
+	}
+
+	public class ClusterMembersChanged : IEvent {
+		public required List<NodeId> Added { get; init; }
+		public required List<NodeId> Removed { get; init; }
+
+		[JsonIgnore]
+		public string Type => EventTypes.ClusterMembersChanged;
+	}
+
+	public class ClusterScavengeStarted : IEvent {
+		public required Guid ClusterScavengeId { get; init; }
+		public required List<NodeId> Members { get; init; }
+		public required DateTime StartedAt { get; init; }
+
+		[JsonIgnore]
+		public string Type => EventTypes.ClusterScavengeStarted;
+	}
+
+	public class ClusterScavengeCompleted : IEvent {
+		public required Guid ClusterScavengeId { get; init; }
+		public required List<NodeId> Members { get; init; }
+		public required DateTime CompletedAt { get; init; }
+
+		[JsonIgnore]
+		public string Type => EventTypes.ClusterScavengeCompleted;
+	}
+
+	public class NodeDesignated : IEvent {
+		public required NodeId NodeId { get; init; }
+		public required DateTime DesignatedAt { get; init; }
+
+		[JsonIgnore]
+		public string Type => EventTypes.NodeDesignated;
+	}
+
+	public class NodeScavengeStarted : IEvent {
+		public required NodeId NodeId { get; init; }
+		public required Guid ScavengeId { get; init; }
+		public required DateTime StartedAt { get; init; }
+
+		[JsonIgnore]
+		public string Type => EventTypes.NodeScavengeStarted;
+	}
+
+	public class NodeScavengeCompleted : IEvent {
+		public required NodeId NodeId { get; init; }
+		public required DateTime CompletedAt { get; init; }
+		public required string Result { get; init; }
+
+		[JsonIgnore]
+		public string Type => EventTypes.NodeScavengeCompleted;
+	}
+
+	public class Initialized : IEvent {
+		public required DateTime InitializedAt { get; init; }
+
+		[JsonIgnore]
+		public string Type => EventTypes.Initialized;
+	}
+
+	public class PauseRequested : IEvent {
+		public required DateTime RequestedAt { get; init; }
+
+		[JsonIgnore]
+		public string Type => EventTypes.PauseRequested;
+	}
+
+	public class Paused : IEvent {
+		public required DateTime PausedAt { get; init; }
+
+		[JsonIgnore]
+		public string Type => EventTypes.Paused;
+	}
+
+	public class Resumed : IEvent {
+		public required DateTime ResumedAt { get; init; }
+
+		[JsonIgnore]
+		public string Type => EventTypes.Resumed;
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge/GossipMessage.cs b/src/KurrentDB.AutoScavenge/GossipMessage.cs
new file mode 100644
index 00000000000..2b9f082ca27
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/GossipMessage.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.AutoScavenge;
+
+public class GossipMessage {
+	public Guid NodeId { get; init; } = default;
+	public List<ClusterMember> Members { get; init; } = new();
+}
diff --git a/src/KurrentDB.AutoScavenge/HttpClientWrapper.cs b/src/KurrentDB.AutoScavenge/HttpClientWrapper.cs
new file mode 100644
index 00000000000..8a59bf52e9c
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/HttpClientWrapper.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Services.Transport.Http.NodeHttpClientFactory;
+
+namespace KurrentDB.AutoScavenge;
+
+// An HttpClient with additional context
+public class HttpClientWrapper {
+	public HttpClient HttpClient { get; }
+	public string Protocol { get; }
+
+	public HttpClientWrapper(EventStoreOptions options, INodeHttpClientFactory nodeHttpClientFactory) {
+		var nodeHttpClient =
+			nodeHttpClientFactory.CreateHttpClient(options.DiscoverViaDns ? [options.ClusterDns] : null);
+
+		Protocol = options.Insecure ? "http" : "https";
+
+		HttpClient = nodeHttpClient;
+		HttpClient.DefaultRequestHeaders.Accept.Add(new("application/json"));
+		HttpClient.Timeout = TimeSpan.FromSeconds(1);
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge/ICommand.cs b/src/KurrentDB.AutoScavenge/ICommand.cs
new file mode 100644
index 00000000000..ce776dd5ea8
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/ICommand.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.AutoScavenge;
+
+public interface ICommand {
+	public void OnSavedEvents();
+	public void OnServerError(string message);
+}
+
+public interface ICommand<T> : ICommand {
+	// conditional upon writing the events (if any).
+	public void SetConditionalResponse(Response<T> response);
+}
+
+public record Command<T> : ICommand<T> {
+	readonly Action<Response<T>> _callback;
+	Response<T> _conditionalResponse;
+
+	public Command(Action<Response<T>> callback) {
+		_callback = callback;
+	}
+
+	// This response will be sent if the associated events (if any) are persisted
+	public void SetConditionalResponse(Response<T> response) {
+		_conditionalResponse = response;
+	}
+
+	public void OnSavedEvents() {
+		_callback(_conditionalResponse);
+	}
+
+	public void OnServerError(string message) {
+		_callback(Response<T>.ServerError(message));
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge/IEvent.cs b/src/KurrentDB.AutoScavenge/IEvent.cs
new file mode 100644
index 00000000000..50ad4e02a71
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/IEvent.cs
@@ -0,0 +1,8 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.AutoScavenge;
+
+public interface IEvent {
+	string Type { get; }
+}
diff --git a/src/KurrentDB.AutoScavenge/KurrentDB.AutoScavenge.csproj b/src/KurrentDB.AutoScavenge/KurrentDB.AutoScavenge.csproj
new file mode 100644
index 00000000000..ca271603910
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/KurrentDB.AutoScavenge.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<EnableDynamicLoading>true</EnableDynamicLoading>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.POC.ConnectedSubsystemsPlugin\KurrentDB.POC.ConnectedSubsystemsPlugin.csproj" />
+		<ProjectReference Include="..\KurrentDB.POC.IO.Core\KurrentDB.POC.IO.Core.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <PackageReference Include="NCrontab" Version="3.3.3" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.AutoScavenge/NodeEndpoint.cs b/src/KurrentDB.AutoScavenge/NodeEndpoint.cs
new file mode 100644
index 00000000000..775a8bb48a1
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/NodeEndpoint.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.AutoScavenge;
+
+public readonly record struct NodeEndpoint {
+	public string Host { get; init; }
+	public int Port { get; init; }
+}
diff --git a/src/KurrentDB.AutoScavenge/NodeState.cs b/src/KurrentDB.AutoScavenge/NodeState.cs
new file mode 100644
index 00000000000..3007fcf48da
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/NodeState.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.AutoScavenge;
+
+public enum NodeState {
+	NotLeader,
+	Leader,
+}
diff --git a/src/KurrentDB.AutoScavenge/Response.cs b/src/KurrentDB.AutoScavenge/Response.cs
new file mode 100644
index 00000000000..d73ac4b5fa7
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Response.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.AutoScavenge;
+
+public static class Response {
+	public static Response<T> Successful<T>(T value) => Response<T>.Successful(value);
+	public static Response<T> Accepted<T>() => Response<T>.Accepted();
+	public static Response<T> Rejected<T>(string message) => Response<T>.Rejected(message);
+	public static Response<T> ServerError<T>(string message) => Response<T>.ServerError(message);
+
+	public static Response<Unit> Successful() => Response<Unit>.Successful(Unit.Instance);
+	public static Response<Unit> Accepted() => Response<Unit>.Accepted();
+	public static Response<Unit> Rejected(string message) => Response<Unit>.Rejected(message);
+	public static Response<Unit> ServerError(string message) => Response<Unit>.ServerError(message);
+}
+
+public readonly struct Response<T> {
+	public enum State {
+		ServerError,
+		Rejected,
+
+		// Command has been accepted by the server but processing of it has not complete,
+		// it may yet succeed or fail.
+		Accepted,
+		Successful,
+	};
+
+	private readonly State _state;
+	private readonly T? _value;
+	private readonly string? _message = "default response";
+
+	private Response(State state, T? value = default, string? message = null) {
+		_state = state;
+		_value = value;
+		_message = message;
+	}
+
+	public static Response<T> Successful(T value) => new(State.Successful, value);
+	public static Response<T> Accepted() => new(State.Accepted);
+	public static Response<T> Rejected(string message) => new(State.Rejected, message: message);
+	public static Response<T> ServerError(string message) => new(State.ServerError, message: message);
+
+	public U Visit<U>(
+		Func<T, U> onSuccessful,
+		Func<U> onAccepted,
+		Func<string, U> onRejected,
+		Func<string, U> onServerError) =>
+
+		_state switch {
+			State.Successful => onSuccessful(_value!),
+			State.Accepted => onAccepted(),
+			State.Rejected => onRejected(_message!),
+			State.ServerError => onServerError(_message!),
+			_ => onServerError("Unexpected state"),
+		};
+
+	public readonly bool IsSuccessful(out T value) {
+		value = _value!;
+		return _state == State.Successful;
+	}
+
+	public readonly bool IsAccepted(out string message) {
+		message = _message!;
+		return _state == State.Accepted;
+	}
+
+	public readonly bool IsRejected(out string message) {
+		message = _message!;
+		return _state == State.Rejected;
+	}
+
+	public readonly bool IsServerError(out string message) {
+		message = _message!;
+		return _state == State.ServerError;
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge/Scavengers/HttpNodeScavenger.cs b/src/KurrentDB.AutoScavenge/Scavengers/HttpNodeScavenger.cs
new file mode 100644
index 00000000000..f63eb6d0d85
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Scavengers/HttpNodeScavenger.cs
@@ -0,0 +1,195 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net;
+using System.Net.Http.Json;
+using System.Text.Json;
+using KurrentDB.POC.IO.Core;
+using KurrentDB.POC.IO.Core.Serialization;
+using Serilog;
+
+namespace KurrentDB.AutoScavenge.Scavengers;
+
+/// Performs remote node scavenge operations.
+public class HttpNodeScavenger : INodeScavenger {
+	private static readonly ILogger Log = Serilog.Log.ForContext<HttpNodeScavenger>();
+
+	private readonly HttpClientWrapper _wrapper;
+	private readonly IClient _client;
+
+	public HttpNodeScavenger(HttpClientWrapper wrapper, IClient client) {
+		_wrapper = wrapper;
+		_client = client;
+	}
+
+	private static readonly JsonSerializerOptions JsonSerializerOptions = new() {
+		PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+		Converters = {
+			new EnumConverterWithDefault<ScavengeResult>(),
+			new EnumConverterWithDefault<LastScavengeStatus>(),
+		},
+	};
+
+	public async Task<Guid?> TryStartScavengeAsync(string host, int port, CancellationToken token) {
+		Log.Information("Starting node scavenge on node {Host}:{Port}...", host, port);
+
+		try {
+			var resp = await _wrapper.HttpClient.PostAsync($"{_wrapper.Protocol}://{host}:{port}/admin/scavenge", null, token);
+			resp.EnsureSuccessStatusCode();
+			var record = await resp.Content.ReadFromJsonAsync<ScavengeRecord>(JsonSerializerOptions, token);
+			var scavengeId = record?.ScavengeId;
+			Log.Information("Started node scavenge on node {Host}:{Port}. ScavengeId: {ScavengeId}", host, port, scavengeId);
+			return scavengeId;
+
+		} catch (Exception ex) {
+			Log.Information(ex, "Failed to start scavenge on node {Host}:{Port}", host, port);
+			return null;
+		}
+	}
+
+	public async Task<ScavengeStatus> TryGetScavengeAsync(string host, int port, Guid scavengeId, CancellationToken token) {
+		Log.Verbose("Getting node scavenge status from node {Host}:{Port}...", host, port);
+
+		try {
+			var httpResponse = await _wrapper.HttpClient.GetAsync($"{_wrapper.Protocol}://{host}:{port}/admin/scavenge/last",
+				token);
+
+			httpResponse.EnsureSuccessStatusCode();
+			var response = (await httpResponse.Content.ReadFromJsonAsync<LastScavengeStatusResponse>(JsonSerializerOptions, token))!;
+
+			if (response.ScavengeResult == LastScavengeStatus.Unknown) {
+				// the node was restarted. we don't know if our scavenge completed successfully, so we try to read its
+				// stream from the scavenge log.
+				var streamResult = await GetScavengeStatusFromStream(scavengeId, token);
+				Log.Verbose("Got node scavenge status for {Host}:{Port} from stream: {Result}", host, port, streamResult);
+				return streamResult;
+			}
+
+			if (response.ScavengeId != scavengeId) {
+				// the scavenge ids do not match. this means that a new scavenge was launched, presumably by the user,
+				// definitely after the one we started. we just log a warning and continue normally, pretending that
+				// this scavenge is the one we started.
+				Log.Warning("The last scavenge ID: {lastScavengeId} does not match with the expected scavenge ID: {expectedScavengeId}.",
+					response.ScavengeId, scavengeId);
+			}
+
+			var result = response.ScavengeResult switch {
+				LastScavengeStatus.InProgress => ScavengeStatus.InProgress,
+				LastScavengeStatus.Success => ScavengeStatus.Success,
+				LastScavengeStatus.Errored => ScavengeStatus.Errored,
+				LastScavengeStatus.Stopped => ScavengeStatus.Stopped,
+				_ => ScavengeStatus.Unknown,
+			};
+
+			Log.Verbose("Got node scavenge status from node {Host}:{Port}: {Result}", host, port, result);
+			return result;
+
+		} catch (Exception ex) {
+			Log.Information(ex, "Failed to get scavenge status on node {Host}:{Port}", host, port);
+			return ScavengeStatus.Unknown;
+		}
+	}
+
+	public async Task<bool> TryPauseScavengeAsync(string host, int port, Guid? scavengeId, CancellationToken token) {
+		Log.Information("Stopping node scavenge {ScavengeId} on node {Host}:{Port}...", scavengeId, host, port);
+
+		try {
+			var scavengeIdString = scavengeId?.ToString() ?? "current";
+			var resp = await _wrapper.HttpClient.DeleteAsync($"{_wrapper.Protocol}://{host}:{port}/admin/scavenge/{scavengeIdString}", token);
+			resp.EnsureSuccessStatusCode();
+			Log.Information("Stopped node scavenge on node {Host}:{Port}", host, port);
+			return true;
+
+		} catch (HttpRequestException ex) {
+			if (ex.StatusCode == HttpStatusCode.NotFound) {
+				// Valid case of the scavenge successfully paused because by not being found, it means the scavenge has
+				// completed. Whether the scavenge completed with an error or a success is not important in that case.
+				Log.Information("Node scavenge {ScavengeId} on node {Host}:{Port} was already stopped", scavengeId, host, port);
+				return true;
+			} else {
+				Log.Information(ex, "Failed to stop scavenge on node {Host}:{Port} > {Status}", host, port, ex.StatusCode);
+				return false;
+			}
+
+		} catch (Exception ex) {
+			Log.Information(ex, "Failed to stop scavenge on node {Host}:{Port}", host, port);
+			return false;
+		}
+	}
+
+	// this is only called if the node reported that it is not currently scavenging and has not scavenged since startup
+	private async Task<ScavengeStatus> GetScavengeStatusFromStream(Guid scavengeId, CancellationToken token) {
+		// it's possible that the `$scavengeCompleted` event is not the last event in the stream as in some cases the
+		// events may be out of order. so, we read more than one event to increase the chance of finding it if it is there.
+		var events = _client
+			.ReadStreamBackwards($"$scavenges-{scavengeId}", maxCount: 20, token)
+			.HandleStreamNotFound();
+
+		await foreach (var @event in events) {
+			if (@event.EventType != "$scavengeCompleted")
+				continue;
+
+			var completed =
+				JsonSerializer.Deserialize<ScavengeRecordCompleted>(@event.Data.Span, JsonSerializerOptions)!;
+
+			if (completed.ScavengeId != scavengeId) {
+				// ignore, malformed entry
+				continue;
+			}
+
+			switch (completed.Result) {
+				case ScavengeResult.Unknown:
+					return ScavengeStatus.NotRunningUnknown;
+				case ScavengeResult.Success:
+					return ScavengeStatus.Success;
+				case ScavengeResult.Stopped:
+					return ScavengeStatus.Stopped;
+				case ScavengeResult.Errored:
+					return ScavengeStatus.Errored;
+				case ScavengeResult.Interrupted:
+					return ScavengeStatus.NotRunningUnknown;
+			}
+		}
+
+		// at this point, we cannot know the status of the scavenge for sure:
+		// entries may be missing from the scavenge log even if a scavenge had completed, for example:
+		// i)   a cluster loses its leader after a scavenge has started on a node. the scavenge continues but
+		//      events can no longer be written to the scavenge log.
+		// ii)  a network partition separates a node from the cluster after a scavenge started on that node. the node
+		//      won't be able to forward scavenge log events to the leader.
+
+		return ScavengeStatus.NotRunningUnknown;
+	}
+
+	// Names match the status in the $scavengeCompleted event from the server (apart from Unknown)
+	private enum ScavengeResult {
+		Unknown,
+		Success,
+		Stopped,
+		Errored,
+		Interrupted,
+	}
+
+	private class ScavengeRecord {
+		public Guid? ScavengeId { get; init; }
+	}
+
+	private class ScavengeRecordCompleted {
+		public required Guid ScavengeId { get; init; }
+		public required ScavengeResult Result { get; init; }
+	}
+
+	// Names match the result from the server
+	private enum LastScavengeStatus {
+		Unknown,
+		InProgress,
+		Success,
+		Stopped,
+		Errored,
+	}
+
+	private class LastScavengeStatusResponse {
+		public Guid? ScavengeId { get; init; }
+		public required LastScavengeStatus ScavengeResult { get; init; }
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge/Scavengers/INodeScavenger.cs b/src/KurrentDB.AutoScavenge/Scavengers/INodeScavenger.cs
new file mode 100644
index 00000000000..43be1e792d6
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Scavengers/INodeScavenger.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.AutoScavenge.Scavengers;
+
+public interface INodeScavenger {
+	/// <returns>Returns a scavenge id if it was successful, null otherwise</returns>
+	Task<Guid?> TryStartScavengeAsync(string host, int port, CancellationToken token);
+
+	Task<ScavengeStatus> TryGetScavengeAsync(string host, int port, Guid scavengeId, CancellationToken token);
+
+	Task<bool> TryPauseScavengeAsync(string host, int port, Guid? scavengeId, CancellationToken token);
+}
diff --git a/src/KurrentDB.AutoScavenge/Scavengers/ScavengeStatus.cs b/src/KurrentDB.AutoScavenge/Scavengers/ScavengeStatus.cs
new file mode 100644
index 00000000000..6058d0a735d
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Scavengers/ScavengeStatus.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.AutoScavenge.Scavengers;
+
+public enum ScavengeStatus {
+	Unknown, // couldn't get the status
+	InProgress,
+	Success, // completed successfuly
+	Stopped, // intentionally stopped
+	Errored, // completed with an error
+	NotRunningUnknown, // not running but don't know if it completed/stopped/errored/interrupted
+}
diff --git a/src/KurrentDB.AutoScavenge/Sources/ClientSource.cs b/src/KurrentDB.AutoScavenge/Sources/ClientSource.cs
new file mode 100644
index 00000000000..91827c214c3
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Sources/ClientSource.cs
@@ -0,0 +1,95 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Runtime.CompilerServices;
+using System.Text.Json;
+using KurrentDB.AutoScavenge.Converters;
+using KurrentDB.POC.IO.Core;
+
+namespace KurrentDB.AutoScavenge.Sources;
+
+public class ClientSource : ISource {
+	// todo - We should probably use the same serialization options across the board.
+	private static readonly JsonSerializerOptions JsonSerializerOptions = new() {
+		PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+		Converters = { new CrontableScheduleJsonConverter() }
+	};
+
+	private readonly IClient _client;
+
+	public ClientSource(IClient client) {
+		_client = client;
+	}
+
+	public long AutoScavengeStreamExpectedRevision { get; set; } = -1;
+
+	public async Task<Events.ConfigurationUpdated?> ReadConfigurationEvent(CancellationToken token) {
+		var events = _client
+			.ReadStreamBackwards(
+				StreamNames.AutoScavengeConfiguration,
+				maxCount: 1,
+				token)
+			.HandleStreamNotFound();
+
+		await foreach (var @event in events) {
+			if (@event.EventType != EventTypes.ConfigurationUpdated)
+				throw new Exception($"Expected to find event of type {EventTypes.ConfigurationUpdated} but found {@event.EventType}");
+
+			var configurationUpdated =
+				JsonSerializer.Deserialize<Events.ConfigurationUpdated>(
+					@event.Data.Span,
+					JsonSerializerOptions);
+
+			return configurationUpdated!;
+		}
+
+		return null;
+	}
+
+	public async IAsyncEnumerable<IEvent> ReadAutoScavengeEvents([EnumeratorCancellation] CancellationToken token) {
+		AutoScavengeStreamExpectedRevision = -1;
+
+		var events = _client
+			.ReadStreamBackwards(
+				StreamNames.AutoScavenges,
+				maxCount: long.MaxValue,
+				token)
+			.HandleStreamNotFound();
+
+		// in practice, there should not be too many events until we reach a `ClusterScavengeCompleted` event or the
+		// beginning of the stream, so we can keep the events in memory.
+		var requiredEvents = new List<IEvent>();
+		var isLatestEvent = true;
+
+		await foreach (var @event in events) {
+			if (isLatestEvent) {
+				AutoScavengeStreamExpectedRevision = (long)@event.EventNumber;
+				isLatestEvent = false;
+			}
+
+			// after completing a cluster scavenge, auto-scavenge is always in an idle state, so we can always rehydrate
+			// the auto-scavenge state machine from the next event onwards.
+			if (@event.EventType is EventTypes.ClusterScavengeCompleted)
+				break;
+
+			IEvent? deserialized = @event.EventType switch {
+				EventTypes.ClusterMembersChanged => JsonSerializer.Deserialize<Events.ClusterMembersChanged>(@event.Data.Span, JsonSerializerOptions),
+				EventTypes.ClusterScavengeStarted => JsonSerializer.Deserialize<Events.ClusterScavengeStarted>(@event.Data.Span, JsonSerializerOptions),
+				EventTypes.ClusterScavengeCompleted => JsonSerializer.Deserialize<Events.ClusterScavengeCompleted>(@event.Data.Span, JsonSerializerOptions),
+				EventTypes.NodeDesignated => JsonSerializer.Deserialize<Events.NodeDesignated>(@event.Data.Span, JsonSerializerOptions),
+				EventTypes.NodeScavengeStarted => JsonSerializer.Deserialize<Events.NodeScavengeStarted>(@event.Data.Span, JsonSerializerOptions),
+				EventTypes.NodeScavengeCompleted => JsonSerializer.Deserialize<Events.NodeScavengeCompleted>(@event.Data.Span, JsonSerializerOptions),
+				EventTypes.PauseRequested => JsonSerializer.Deserialize<Events.PauseRequested>(@event.Data.Span, JsonSerializerOptions),
+				EventTypes.Paused => JsonSerializer.Deserialize<Events.Paused>(@event.Data.Span, JsonSerializerOptions),
+				EventTypes.Resumed => JsonSerializer.Deserialize<Events.Resumed>(@event.Data.Span, JsonSerializerOptions),
+				_ => null,
+			};
+
+			if (deserialized is not null)
+				requiredEvents.Add(deserialized);
+		}
+
+		for (var i = requiredEvents.Count - 1; i >= 0; i--)
+			yield return requiredEvents[i];
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge/Sources/ISource.cs b/src/KurrentDB.AutoScavenge/Sources/ISource.cs
new file mode 100644
index 00000000000..528373b958f
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Sources/ISource.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.AutoScavenge.Sources;
+
+/// <summary>
+/// Event provider abstraction use to source events to the auto scavenge state machine.
+/// </summary>
+public interface ISource {
+	/// <summary>
+	/// Reads the last auto scavenge configuration event.
+	/// </summary>
+	/// <param name="token"></param>
+	/// <returns></returns>
+	Task<Events.ConfigurationUpdated?> ReadConfigurationEvent(CancellationToken token);
+
+	/// <summary>
+	/// Reads the events necessary to initialize the auto scavenge state machine.
+	/// </summary>
+	/// <param name="token"></param>
+	/// <returns>Ascending ordered collection of events related to the auto scavenge process</returns>
+	IAsyncEnumerable<IEvent> ReadAutoScavengeEvents(CancellationToken token);
+}
diff --git a/src/KurrentDB.AutoScavenge/SystemNames.cs b/src/KurrentDB.AutoScavenge/SystemNames.cs
new file mode 100644
index 00000000000..522c09f39af
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/SystemNames.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.AutoScavenge;
+
+public static class StreamNames {
+	public const string AutoScavenges = "$auto-scavenges";
+	public const string AutoScavengeConfiguration = "$auto-scavenge-configuration";
+}
+
+public static class EventTypes {
+	public const string ConfigurationUpdated = "$configuration-updated";
+	public const string ClusterMembersChanged = "$cluster-members-changed";
+
+	public const string ClusterScavengeStarted = "$cluster-scavenge-started";
+	public const string ClusterScavengeCompleted = "$cluster-scavenge-completed";
+
+	public const string NodeDesignated = "$node-designated";
+
+	public const string NodeScavengeStarted = "$node-scavenge-started";
+	public const string NodeScavengeCompleted = "$node-scavenge-completed";
+
+	public const string Initialized = "$initialized";
+	public const string PauseRequested = "$pause-requested";
+	public const string Paused = "$paused";
+	public const string ResumeRequested = "$resume-requested";
+	public const string Resumed = "$resumed";
+}
diff --git a/src/KurrentDB.AutoScavenge/TaskExtensions.cs b/src/KurrentDB.AutoScavenge/TaskExtensions.cs
new file mode 100644
index 00000000000..918648031da
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/TaskExtensions.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using Serilog;
+
+namespace KurrentDB.AutoScavenge;
+
+public static class TaskExtensions {
+	public static Task WarnOnCompletion(this Task task, string warning) {
+		return task.ContinueWith(t => {
+			if (t.Exception is null)
+				return;
+			Log.Warning(t.Exception, warning);
+		});
+	}
+}
diff --git a/src/KurrentDB.AutoScavenge/TimeProviders/ITimeProvider.cs b/src/KurrentDB.AutoScavenge/TimeProviders/ITimeProvider.cs
new file mode 100644
index 00000000000..83ce74c9875
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/TimeProviders/ITimeProvider.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.AutoScavenge.TimeProviders;
+
+/// <summary>
+/// Time abstraction providing the current date.
+/// </summary>
+public interface ITimeProvider {
+	DateTime Now { get; }
+}
diff --git a/src/KurrentDB.AutoScavenge/TimeProviders/TimeProvider.cs b/src/KurrentDB.AutoScavenge/TimeProviders/TimeProvider.cs
new file mode 100644
index 00000000000..59c2fac16dc
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/TimeProviders/TimeProvider.cs
@@ -0,0 +1,8 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.AutoScavenge.TimeProviders;
+
+public class TimeProvider : ITimeProvider {
+	public DateTime Now => DateTime.Now;
+}
diff --git a/src/KurrentDB.AutoScavenge/Transition.cs b/src/KurrentDB.AutoScavenge/Transition.cs
new file mode 100644
index 00000000000..b7045e0840a
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Transition.cs
@@ -0,0 +1,8 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.AutoScavenge;
+
+public record struct Transition(IEvent[] Events, ICommand? NextCommand) {
+	public static readonly Transition Noop = new([], null);
+}
diff --git a/src/KurrentDB.AutoScavenge/Unit.cs b/src/KurrentDB.AutoScavenge/Unit.cs
new file mode 100644
index 00000000000..76bb2c9bc4a
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/Unit.cs
@@ -0,0 +1,8 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.AutoScavenge;
+
+public readonly record struct Unit {
+	public static Unit Instance { get; } = new();
+}
diff --git a/src/KurrentDB.AutoScavenge/auto-scavenge-plugin-example.json b/src/KurrentDB.AutoScavenge/auto-scavenge-plugin-example.json
new file mode 100644
index 00000000000..3f2cb61802f
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/auto-scavenge-plugin-example.json
@@ -0,0 +1,7 @@
+{
+  "KurrentDB": {
+    "AutoScavenge": {
+      "Enabled": true
+    }
+  }
+}
diff --git a/src/KurrentDB.AutoScavenge/auto-scavenge-plugin-example.yaml b/src/KurrentDB.AutoScavenge/auto-scavenge-plugin-example.yaml
new file mode 100644
index 00000000000..b6040d327f0
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/auto-scavenge-plugin-example.yaml
@@ -0,0 +1,2 @@
+AutoScavenge:
+  Enabled: true
diff --git a/src/KurrentDB.AutoScavenge/sample-requests.http b/src/KurrentDB.AutoScavenge/sample-requests.http
new file mode 100644
index 00000000000..528386ab51e
--- /dev/null
+++ b/src/KurrentDB.AutoScavenge/sample-requests.http
@@ -0,0 +1,46 @@
+### enabled
+GET https://127.0.0.1:2113/auto-scavenge/enabled
+Authorization: Basic admin:changeit
+
+### status
+GET https://127.0.0.1:2113/auto-scavenge/status
+Authorization: Basic admin:changeit
+
+### pause
+POST https://127.0.0.1:2113/auto-scavenge/pause
+Authorization: Basic ops:changeit
+
+###
+POST https://127.0.0.1:2113/auto-scavenge/resume
+Authorization: Basic ops:changeit
+
+
+### configure to scavenge every 5 mins
+POST https://127.0.0.1:2113/auto-scavenge/configure
+Content-Type: application/json
+Authorization: Basic admin:changeit
+
+{
+    "schedule": "* * * * *"
+}
+
+
+
+#
+# manual scavenge controls
+#
+
+### Start a scavenge
+POST https://127.0.0.1:2113/admin/scavenge
+Authorization: Basic admin:changeit
+Accept: application/json
+
+### Get current scavenge
+GET https://127.0.0.1:2113/admin/scavenge/current
+Authorization: Basic admin:changeit
+Accept: application/json
+
+### Stop current scavenge
+DELETE https://127.0.0.1:2113/admin/scavenge/current
+Authorization: Basic admin:changeit
+Accept: application/json
diff --git a/src/KurrentDB.BufferManagement.Tests/BufferManagerTests.cs b/src/KurrentDB.BufferManagement.Tests/BufferManagerTests.cs
new file mode 100644
index 00000000000..cc32e9a97ce
--- /dev/null
+++ b/src/KurrentDB.BufferManagement.Tests/BufferManagerTests.cs
@@ -0,0 +1,109 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+
+namespace KurrentDB.BufferManagement.Tests;
+
+[TestFixture]
+public class when_creating_a_buffer_manager {
+	[Test]
+	public void a_zero_chunk_size_causes_an_argumentexception() {
+		Assert.Throws<ArgumentException>(() => new BufferManager(1024, 0, 1024));
+	}
+
+	[Test]
+	public void a_negative_chunk_size_causes_an_argumentexception() {
+		Assert.Throws<ArgumentException>(() => new BufferManager(200, -1, 200));
+	}
+
+	[Test]
+	public void a_negative_chunks_per_segment_causes_an_argumentexception() {
+		Assert.Throws<ArgumentException>(() => new BufferManager(-1, 1024, 8));
+	}
+
+	[Test]
+	public void a_zero_chunks_per_segment_causes_an_argumentexception() {
+		Assert.Throws<ArgumentException>(() => new BufferManager(0, 1024, 8));
+	}
+
+	[Test]
+	public void a_negative_number_of_segments_causes_an_argumentexception() {
+		Assert.Throws<ArgumentException>(() => new BufferManager(1024, 1024, -1));
+	}
+
+	[Test]
+	public void can_create_a_manager_with_zero_inital_segments() {
+		Assert.DoesNotThrow(() => new BufferManager(1024, 1024, 0));
+	}
+}
+
+[TestFixture]
+public class when_checking_out_a_buffer {
+	[Test]
+	public void should_return_a_valid_buffer_when_available() {
+		BufferManager manager = new BufferManager(1, 1000, 1);
+		ArraySegment<byte> buffer = manager.CheckOut();
+		Assert.AreEqual(1000, buffer.Count);
+	}
+
+	[Test]
+	public void should_decrement_available_buffers() {
+		BufferManager manager = new BufferManager(1, 1000, 1);
+		manager.CheckOut();
+		Assert.AreEqual(0, manager.AvailableBuffers);
+	}
+
+	[Test]
+	public void should_create_a_segment_if_none_are_availabke() {
+		BufferManager manager = new BufferManager(10, 1000, 0);
+		manager.CheckOut();
+		Assert.AreEqual(9, manager.AvailableBuffers);
+	}
+
+	[Test]
+	public void should_throw_an_unabletocreatememoryexception_if_acquiring_memory_is_disabled_and_out_of_memory() {
+		BufferManager manager = new BufferManager(1, 1000, 1, false);
+		manager.CheckOut();
+		//should be none left, boom
+		Assert.Throws<UnableToCreateMemoryException>(() => manager.CheckOut());
+	}
+
+	[Test]
+	public void should_release_acquired_buffers_if_size_requirement_cant_be_satisfied() {
+		BufferManager manager = new BufferManager(1, 1000, 1, false);
+		Assert.Throws(Is.InstanceOf(typeof(Exception)), () => manager.CheckOut(2));
+		Assert.AreEqual(1, manager.AvailableBuffers);
+	}
+}
+
+[TestFixture]
+public class when_checking_in_a_buffer {
+	[Test]
+	public void should_accept_a_checked_out_buffer() {
+		BufferManager manager = new BufferManager(10, 1000, 0);
+		manager.CheckIn(manager.CheckOut());
+	}
+
+	[Test]
+	public void should_increment_available_buffers() {
+		BufferManager manager = new BufferManager(10, 1000, 0);
+		manager.CheckIn(manager.CheckOut());
+		Assert.AreEqual(10, manager.AvailableBuffers);
+	}
+
+	[Test]
+	public void should_throw_argumentnullexception_if_null_buffer() {
+		BufferManager manager = new BufferManager(10, 1000, 0);
+		Assert.Throws<ArgumentNullException>(() => { manager.CheckIn((IEnumerable<ArraySegment<byte>>)null); });
+	}
+
+	[Test]
+	public void should_throw_argumentexception_if_buffer_wrong_size() {
+		BufferManager manager = new BufferManager(10, 1000, 0);
+		byte[] data = new byte[10000];
+		Assert.Throws<ArgumentException>(() => { manager.CheckIn(new ArraySegment<byte>(data)); });
+	}
+}
diff --git a/src/KurrentDB.BufferManagement.Tests/BufferPoolStreamTests.cs b/src/KurrentDB.BufferManagement.Tests/BufferPoolStreamTests.cs
new file mode 100644
index 00000000000..24a3b074127
--- /dev/null
+++ b/src/KurrentDB.BufferManagement.Tests/BufferPoolStreamTests.cs
@@ -0,0 +1,119 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using NUnit.Framework;
+
+namespace KurrentDB.BufferManagement.Tests;
+
+public abstract class has_buffer_pool_fixture : has_buffer_manager_fixture {
+	protected BufferPool BufferPool;
+
+	[SetUp]
+	public override void Setup() {
+		base.Setup();
+		BufferPool = new BufferPool(10, BufferManager);
+	}
+}
+
+[TestFixture]
+public class when_insantiating_a_buffer_pool_stream : has_buffer_pool_fixture {
+	[Test]
+	public void a_null_buffer_pool_throws_an_argumentnullexception() {
+		Assert.Throws<ArgumentNullException>(() => new BufferPoolStream(null));
+	}
+
+	[Test]
+	public void the_internal_buffer_pool_is_set() {
+		using BufferPoolStream stream = new BufferPoolStream(BufferPool);
+		Assert.AreEqual(BufferPool, stream.BufferPool);
+	}
+}
+
+[TestFixture]
+public class when_reading_from_the_stream : has_buffer_pool_fixture {
+	[Test]
+	public void position_is_incremented() {
+		using BufferPoolStream stream = new BufferPoolStream(BufferPool);
+		stream.Write(new byte[500], 0, 500);
+		stream.Seek(0, SeekOrigin.Begin);
+		Assert.AreEqual(0, stream.Position);
+		stream.Read(new byte[50], 0, 50);
+		Assert.AreEqual(50, stream.Position);
+	}
+
+	[Test]
+	public void a_read_past_the_end_of_the_stream_returns_zero() {
+		using BufferPoolStream stream = new BufferPoolStream(BufferPool);
+		stream.Write(new byte[500], 0, 500);
+		stream.Position = 0;
+		int read = stream.Read(new byte[500], 0, 500);
+		Assert.AreEqual(500, read);
+		read = stream.Read(new byte[500], 0, 500);
+		Assert.AreEqual(0, read);
+	}
+
+	[Test]
+	public void reading_from_the_stream_with_StreamCopyTo_returns_all_data() {
+		using BufferPoolStream stream = new BufferPoolStream(BufferPool);
+		int size = 20123;
+		stream.Write(new byte[size], 0, size);
+		stream.Position = 0;
+
+		using var destination = new MemoryStream();
+		stream.CopyTo(destination);
+		Assert.AreEqual(destination.Length, size);
+	}
+}
+
+[TestFixture]
+public class when_writing_to_the_stream : has_buffer_pool_fixture {
+	[Test]
+	public void position_is_incremented() {
+		using BufferPoolStream stream = new BufferPoolStream(BufferPool);
+		stream.Write(new byte[500], 0, 500);
+		Assert.AreEqual(500, stream.Position);
+	}
+}
+
+[TestFixture]
+public class when_seeking_in_the_stream : has_buffer_pool_fixture {
+	[Test]
+	public void from_begin_sets_relative_to_beginning() {
+		using BufferPoolStream stream = new BufferPoolStream(BufferPool);
+		stream.Write(new byte[500], 0, 500);
+		stream.Seek(22, SeekOrigin.Begin);
+		Assert.AreEqual(22, stream.Position);
+	}
+
+	[Test]
+	public void from_end_sets_relative_to_end() {
+		using BufferPoolStream stream = new BufferPoolStream(BufferPool);
+		stream.Write(new byte[500], 0, 500);
+		stream.Seek(-100, SeekOrigin.End);
+		Assert.AreEqual(400, stream.Position);
+	}
+
+	[Test]
+	public void from_current_sets_relative_to_current() {
+		using BufferPoolStream stream = new BufferPoolStream(BufferPool);
+		stream.Write(new byte[500], 0, 500);
+		stream.Seek(-2, SeekOrigin.Current);
+		stream.Seek(1, SeekOrigin.Current);
+		Assert.AreEqual(499, stream.Position);
+	}
+
+	[Test]
+	public void a_negative_position_throws_an_argumentexception() {
+		using BufferPoolStream stream = new BufferPoolStream(BufferPool);
+		Assert.Throws<ArgumentOutOfRangeException>(() => { stream.Seek(-1, SeekOrigin.Begin); });
+	}
+
+	[Test]
+	public void seeking_past_end_of_stream_throws_an_argumentexception() {
+		using BufferPoolStream stream = new BufferPoolStream(BufferPool);
+		stream.Write(new byte[500], 0, 500);
+		Assert.Throws<ArgumentOutOfRangeException>(() => { stream.Seek(501, SeekOrigin.Begin); });
+	}
+}
diff --git a/src/KurrentDB.BufferManagement.Tests/BufferPoolTests.cs b/src/KurrentDB.BufferManagement.Tests/BufferPoolTests.cs
new file mode 100644
index 00000000000..c0a08cc2573
--- /dev/null
+++ b/src/KurrentDB.BufferManagement.Tests/BufferPoolTests.cs
@@ -0,0 +1,469 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+
+namespace KurrentDB.BufferManagement.Tests;
+
+public class has_buffer_manager_fixture {
+	protected BufferManager BufferManager;
+
+	[SetUp]
+	public virtual void Setup() {
+		BufferManager = new BufferManager(128, 1024, 1);
+	}
+}
+
+[TestFixture]
+public class when_instantiating_a_bufferpool : has_buffer_manager_fixture {
+	[Test]
+	public void a_negative_initial_buffers_throws_an_argumentexception() {
+		Assert.Throws<ArgumentException>(() => new BufferPool(-1, BufferManager));
+	}
+
+	[Test]
+	public void a_null_buffer_manager_throws_an_argumentnullexception() {
+		Assert.Throws<ArgumentNullException>(() => new BufferPool(12, null));
+	}
+
+	[Test]
+	public void an_empty_buffer_has_a_length_of_zero() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		Assert.AreEqual(0, pool.Length);
+	}
+
+	[Test]
+	public void the_requested_buffers_should_be_removed_from_the_buffer_manager() {
+		int initialBuffers = BufferManager.AvailableBuffers;
+		new BufferPool(10, BufferManager);
+		Assert.AreEqual(initialBuffers - 10, BufferManager.AvailableBuffers);
+	}
+}
+
+[TestFixture]
+public class when_changing_data_in_a_bufferpool_via_indexer : has_buffer_manager_fixture {
+	[Test]
+	public void an_index_under_zero_throws_an_argument_exception() {
+		BufferPool pool = new BufferPool(12, BufferManager);
+		Assert.Throws<ArgumentException>(() => pool[-1] = 4);
+	}
+
+	[Test]
+	public void data_that_has_been_set_can_read() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		pool[3] = 5;
+		Assert.AreEqual(5, pool[3]);
+	}
+
+	[Test]
+	public void length_is_updated_when_index_higher_than_count_set() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		Assert.AreEqual(0, pool.Length);
+		pool[3] = 5;
+		Assert.AreEqual(4, pool.Length);
+	}
+
+	[Test]
+	public void a_write_will_automatically_grow_the_buffer_pool() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		int initialCapacity = pool.Capacity;
+		pool[initialCapacity + 14] = 5;
+		Assert.AreEqual(initialCapacity * 2, pool.Capacity);
+	}
+
+	[Test]
+	public void a_write_past_end_will_check_out_a_buffer_from_the_buffer_pool() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		int initial = BufferManager.AvailableBuffers;
+		pool[pool.Capacity + 14] = 5;
+		Assert.AreEqual(initial - 1, BufferManager.AvailableBuffers);
+	}
+}
+
+[TestFixture]
+public class when_converting_to_a_byte_array : has_buffer_manager_fixture {
+	[Test]
+	public void the_byte_array_should_be_the_same_length_as_the_pool_with_data() {
+		BufferPool pool = new BufferPool(5, BufferManager);
+		for (int i = 0; i < 500; i++) {
+			pool[i] = 12;
+		}
+
+		Assert.AreEqual(500, pool.ToByteArray().Length);
+	}
+
+	[Test]
+	public void the_byte_array_should_have_the_same_data_as_the_pool_with_multiple_buffers() {
+		BufferPool pool = new BufferPool(5, BufferManager);
+		for (int i = 0; i < 5000; i++) {
+			pool[i] = (byte)(i % 255);
+		}
+
+		byte[] data = pool.ToByteArray();
+		for (int i = 0; i < 5000; i++) {
+			Assert.AreEqual((byte)(i % 255), data[i]);
+		}
+	}
+
+	[Test]
+	public void the_byte_array_should_have_the_same_data_as_the_pool_with_a_single_buffer() {
+		BufferPool pool = new BufferPool(5, BufferManager);
+		for (int i = 0; i < 5; i++) {
+			pool[i] = (byte)(i % 255);
+		}
+
+		byte[] data = pool.ToByteArray();
+		for (int i = 0; i < 5; i++) {
+			Assert.AreEqual((byte)(i % 255), data[i]);
+		}
+	}
+
+
+	[Test]
+	public void an_empty_pool_should_return_an_empty_array() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		byte[] arr = pool.ToByteArray();
+		Assert.AreEqual(0, arr.Length);
+	}
+}
+
+[TestFixture]
+public class when_converting_to_an_effective_IEnumerable_of_arraysegments : has_buffer_manager_fixture {
+	[Test]
+	public void empty_returns_no_results() {
+		BufferPool pool = new BufferPool(10, BufferManager);
+		foreach (ArraySegment<byte> effectiveBuffer in pool.EffectiveBuffers) {
+			Assert.Fail("should not have been buffers");
+		}
+	}
+
+	[Test]
+	public void a_single_partial_segment_can_be_returned() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		for (byte i = 0; i < 10; i++) {
+			pool[i] = i;
+		}
+
+		List<ArraySegment<byte>> buffers = new List<ArraySegment<byte>>(pool.EffectiveBuffers);
+		Assert.IsTrue(buffers.Count == 1);
+		for (byte i = 0; i < 10; i++) {
+			Assert.IsTrue(buffers[0].Array[buffers[0].Offset + i] == i);
+		}
+	}
+
+	[Test]
+	public void multiple_segments_can_be_returned() {
+		BufferManager manager = new BufferManager(3, 1000, 1);
+		BufferPool pool = new BufferPool(10, manager);
+		for (int i = 0; i < 2500; i++) {
+			pool[i] = (byte)(i % 255);
+		}
+
+		List<ArraySegment<byte>> buffers = new List<ArraySegment<byte>>(pool.EffectiveBuffers);
+		Assert.IsTrue(buffers.Count == 3);
+		Assert.IsTrue(buffers[0].Count == 1000);
+		Assert.IsTrue(buffers[1].Count == 1000);
+		Assert.IsTrue(buffers[2].Count == 500);
+	}
+}
+
+[TestFixture]
+public class when_reading_data_in_a_bufferpool_via_indexer : has_buffer_manager_fixture {
+	[Test]
+	public void if_the_index_is_past_the_length_an_argumentoutofrangeexception_is_thrown() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		Assert.Throws<ArgumentOutOfRangeException>(() => {
+			var b = pool[3];
+		});
+	}
+}
+
+
+[TestFixture]
+public class when_disposing_a_buffer_pool : has_buffer_manager_fixture {
+	[Test]
+	public void buffers_are_released_back_to_the_buffer_pool() {
+		int initial = BufferManager.AvailableBuffers;
+		using (new BufferPool(20, BufferManager)) {
+			//sanity check (make sure they are actually gone)
+			Assert.AreEqual(initial - 20, BufferManager.AvailableBuffers);
+		}
+
+		Assert.AreEqual(initial, BufferManager.AvailableBuffers);
+	}
+}
+
+[TestFixture]
+public class when_reading_multiple_bytes : has_buffer_manager_fixture {
+	[Test]
+	public void a_null_read_buffer_throws_an_argumentnullexception() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		Assert.Throws<ArgumentNullException>(() => { pool.ReadFrom(0, null, 0, 0); });
+	}
+
+	[Test]
+	public void an_offset_larger_than_the_buffer_throws_an_argumentoutofrangeexception() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		Assert.Throws<ArgumentOutOfRangeException>(() => { pool.ReadFrom(0, new byte[5], 8, 3); });
+	}
+
+	[Test]
+	public void a_count_larger_than_the_buffer_throws_an_argumentoutofrangeexception() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		Assert.Throws<ArgumentOutOfRangeException>(() => { pool.ReadFrom(0, new byte[5], 3, 5); });
+	}
+
+	[Test]
+	public void a_negative_count_throws_an_argumentoutofrangeexception() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		Assert.Throws<ArgumentOutOfRangeException>(() => { pool.ReadFrom(0, new byte[5], 3, -1); });
+	}
+
+	[Test]
+	public void a_negative_offset_throws_an_argumentoutofrangeexception() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		Assert.Throws<ArgumentOutOfRangeException>(() => { pool.ReadFrom(0, new byte[5], -1, 1); });
+	}
+
+	[Test]
+	public void count_and_offset_together_lerger_than_buffer_throws_an_argumentoutofrangeexception() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		Assert.Throws<ArgumentOutOfRangeException>(() => { pool.ReadFrom(0, new byte[5], 4, 2); });
+	}
+
+	[Test]
+	public void reading_from_a_position_bigger_than_buffer_length_reads_nothing() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		pool[0] = 12;
+		pool[1] = 13;
+		int read = pool.ReadFrom(3, new byte[5], 0, 5);
+		Assert.AreEqual(read, 0);
+	}
+
+	[Test]
+	public void reading_from_a_position_plus_count_bigger_than_buffer_length_reads_the_right_amount() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		pool[0] = 12;
+		pool[1] = 13;
+		int read = pool.ReadFrom(0, new byte[5], 0, 5);
+		Assert.AreEqual(read, 2);
+	}
+
+	[Test]
+	public void can_read_within_a_single_buffer_with_no_offset() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		for (int i = 0; i < 255; i++) {
+			pool[i] = (byte)i;
+		}
+
+		byte[] buffer = new byte[255];
+		pool.ReadFrom(0, buffer, 0, 255);
+		for (int i = 0; i < 255; i++) {
+			Assert.AreEqual((byte)i, buffer[i]);
+		}
+	}
+
+	[Test]
+	public void can_read_from_multiple_buffers() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		for (int i = 0; i < 5000; i++) {
+			pool[i] = (byte)(i % 255);
+		}
+
+		byte[] buffer = new byte[5000];
+		pool.ReadFrom(0, buffer, 0, 5000);
+		for (int i = 0; i < 5000; i++) {
+			Assert.AreEqual((byte)(i % 255), buffer[i]);
+		}
+	}
+
+	[Test]
+	public void can_read_using_an_offset() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		for (int i = 5; i < 260; i++) {
+			pool[i] = (byte)(i - 5);
+		}
+
+		byte[] buffer = new byte[255];
+		pool.ReadFrom(5, buffer, 0, 255);
+		for (int i = 0; i < 255; i++) {
+			Assert.AreEqual((byte)i, buffer[i]);
+		}
+	}
+}
+
+[TestFixture]
+public class when_writing_multiple_bytes : has_buffer_manager_fixture {
+	[Test]
+	public void a_null_byte_array_throws_an_argumentnullexception() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		Assert.Throws<ArgumentNullException>(() => { pool.Append(null); });
+	}
+
+	[Test]
+	public void an_offset_larger_than_the_buffer_throws_an_argumentoutofrangeexception() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		Assert.Throws<ArgumentOutOfRangeException>(() => { pool.Write(0, new byte[5], 8, 3); });
+	}
+
+	[Test]
+	public void a_count_larger_than_the_buffer_throws_an_argumentoutofrangeexception() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		Assert.Throws<ArgumentOutOfRangeException>(() => { pool.Write(0, new byte[5], 3, 5); });
+	}
+
+	[Test]
+	public void a_negative_count_throws_an_argumentoutofrangeexception() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		Assert.Throws<ArgumentOutOfRangeException>(() => { pool.Write(0, new byte[5], 3, -1); });
+	}
+
+	[Test]
+	public void a_negative_offset_throws_an_argumentoutofrangeexception() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		Assert.Throws<ArgumentOutOfRangeException>(() => { pool.Write(0, new byte[5], -1, 1); });
+	}
+
+	[Test]
+	public void length_is_updated_to_include_bytes_written() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		byte[] data = { 1, 2, 3, 4, 5 };
+		pool.Append(data);
+		Assert.IsTrue(pool.Length == 5);
+	}
+
+	[Test]
+	public void data_is_written_to_the_internal_buffer() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		byte[] data = { 1, 2, 3, 4, 5 };
+		pool.Append(data);
+		for (byte i = 0; i < 5; i++) {
+			Assert.AreEqual(i + 1, pool[i]);
+		}
+	}
+
+	[Test]
+	public void pool_can_expand_capacity() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		int initialCapacity = pool.Capacity;
+		byte[] data = new byte[initialCapacity + 25];
+		pool.Append(data);
+		Assert.AreEqual(initialCapacity * 2, pool.Capacity);
+	}
+
+	[Test]
+	public void can_write_given_a_self_offset() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		byte[] data = { 1, 2, 3, 4, 5 };
+		pool.Write(4, data, 0, 5); //start at position 4
+		for (byte i = 4; i < 9; i++) {
+			Assert.AreEqual(i - 3, pool[i]);
+		}
+	}
+
+	[Test]
+	public void can_write_given_a_source_offset() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		byte[] data = { 1, 2, 3, 4, 5 };
+		pool.Write(0, data, 3, 2);
+		Assert.AreEqual(pool[0], 4);
+		Assert.AreEqual(pool[1], 5);
+	}
+}
+
+[TestFixture]
+public class when_setting_the_length_of_the_pool : has_buffer_manager_fixture {
+	[Test]
+	public void a_negative_length_throws_an_argumentexception() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		Assert.Throws<ArgumentException>(() => { pool.SetLength(-1, false); });
+	}
+
+	[Test]
+	public void a_larger_length_makes_capacity_larger() {
+		BufferManager manager = new BufferManager(10, 1000, 1);
+		BufferPool pool = new BufferPool(1, manager);
+		pool.SetLength(5000);
+		Assert.AreNotEqual(5000, pool.Capacity);
+	}
+
+	[Test]
+	public void length_is_set_when_setting_length() {
+		BufferPool pool = new BufferPool(1, BufferManager);
+		pool.SetLength(5000, false);
+		Assert.AreEqual(5000, pool.Length);
+	}
+
+	[Test]
+	public void a_smaller_length_lowers_capacity() {
+		BufferManager manager = new BufferManager(10, 1000, 1);
+		BufferPool pool = new BufferPool(5, manager);
+		pool.SetLength(1);
+		Assert.AreEqual(9, manager.AvailableBuffers);
+	}
+
+	[Test]
+	public void a_smaller_length_checks_buffers_back_in_when_allowed() {
+		BufferManager manager = new BufferManager(10, 1000, 1);
+		BufferPool pool = new BufferPool(5, manager);
+		pool.SetLength(1, true);
+		Assert.AreEqual(9, manager.AvailableBuffers);
+	}
+
+	[Test]
+	public void a_smaller_length_checks_buffers_back_in_when_not_allowed() {
+		BufferManager manager = new BufferManager(10, 1000, 1);
+		BufferPool pool = new BufferPool(5, manager);
+		pool.SetLength(1, false);
+		Assert.AreEqual(5, manager.AvailableBuffers);
+	}
+}
+
+[TestFixture]
+public class when_a_buffer_pool_has_been_disposed : has_buffer_manager_fixture {
+	private BufferPool m_DisposedPool;
+
+	public override void Setup() {
+		base.Setup();
+		m_DisposedPool = new BufferPool(10, BufferManager);
+		m_DisposedPool.Dispose();
+	}
+
+	[Test]
+	public void reading_indexer_throws_objectdisposedexception() {
+		Assert.Throws<ObjectDisposedException>(() => {
+			byte b = m_DisposedPool[0];
+		});
+	}
+
+	[Test]
+	public void writing_indexer_throws_objectdisposedexception() {
+		Assert.Throws<ObjectDisposedException>(() => { m_DisposedPool[0] = 5; });
+	}
+
+	[Test]
+	public void writing_multiple_bytes_throws_objectdisposedexception() {
+		Assert.Throws<ObjectDisposedException>(() => { m_DisposedPool.Append(new byte[] { 1, 2, 3, 4 }); });
+	}
+
+
+	[Test]
+	public void effective_enumerator_throws_objectdisposedexception() {
+		Assert.Throws<ObjectDisposedException>(() => {
+			foreach (ArraySegment<byte> segment in m_DisposedPool.EffectiveBuffers) {
+			}
+		});
+	}
+
+	[Test]
+	public void setting_length_throws_objectdisposedexception() {
+		Assert.Throws<ObjectDisposedException>(() => { m_DisposedPool.SetLength(200); });
+	}
+
+	[Test]
+	public void converting_to_a_byte_array_throws_objectdisposedexception() {
+		Assert.Throws<ObjectDisposedException>(() => { m_DisposedPool.ToByteArray(); });
+	}
+}
diff --git a/src/KurrentDB.BufferManagement.Tests/KurrentDB.BufferManagement.Tests.csproj b/src/KurrentDB.BufferManagement.Tests/KurrentDB.BufferManagement.Tests.csproj
new file mode 100644
index 00000000000..e0529a893ae
--- /dev/null
+++ b/src/KurrentDB.BufferManagement.Tests/KurrentDB.BufferManagement.Tests.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<DebugSymbols>true</DebugSymbols>
+	</PropertyGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.BufferManagement\KurrentDB.BufferManagement.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+		<PackageReference Include="NUnit" Version="3.14.0" />
+		<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.BufferManagement/BufferManager.cs b/src/KurrentDB.BufferManagement/BufferManager.cs
new file mode 100644
index 00000000000..7d682262eb5
--- /dev/null
+++ b/src/KurrentDB.BufferManagement/BufferManager.cs
@@ -0,0 +1,263 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using Serilog;
+
+namespace KurrentDB.BufferManagement;
+
+/// <summary>
+/// A manager to handle buffers for the socket connections
+/// </summary>
+/// <remarks>
+/// When used in an async call a buffer is pinned. Large numbers of pinned buffers
+/// cause problem with the GC (in particular it causes heap fragmentation).
+/// This class maintains a set of large segments and gives clients pieces of these
+/// segments that they can use for their buffers. The alternative to this would be to
+/// create many small arrays which it then maintained. This methodology should be slightly
+/// better than the many small array methodology because in creating only a few very
+/// large objects it will force these objects to be placed on the LOH. Since the
+/// objects are on the LOH they are at this time not subject to compacting which would
+/// require an update of all GC roots as would be the case with lots of smaller arrays
+/// that were in the normal heap.
+/// </remarks>
+public class BufferManager {
+	private static readonly ILogger Logger = Log.ForContext<BufferManager>();
+
+	private const int TrialsCount = 100;
+
+	private static BufferManager _defaultBufferManager;
+
+	private readonly int _segmentChunks;
+	private readonly int _chunkSize;
+	private readonly int _segmentSize;
+	private readonly bool _allowedToCreateMemory;
+
+	private readonly ConcurrentStack<ArraySegment<byte>> _buffers = new ConcurrentStack<ArraySegment<byte>>();
+
+	private readonly List<byte[]> _segments;
+	private readonly object _creatingNewSegmentLock = new object();
+
+
+	/// <summary>
+	/// Gets the default buffer manager
+	/// </summary>
+	/// <remarks>You should only be using this method if you don't want to manage buffers on your own.</remarks>
+	/// <value>The default buffer manager.</value>
+	public static BufferManager Default {
+		get {
+			//default to 1024 1kb buffers if people don't want to manage it on their own;
+			if (_defaultBufferManager == null)
+				_defaultBufferManager = new BufferManager(1024, 1024, 1);
+			return _defaultBufferManager;
+		}
+	}
+
+	/// <summary>
+	/// Sets the default buffer manager.
+	/// </summary>
+	/// <param name="manager">The new default buffer manager.</param>
+	public static void SetDefaultBufferManager(BufferManager manager) {
+		if (manager == null)
+			throw new ArgumentNullException("manager");
+		_defaultBufferManager = manager;
+	}
+
+	public int ChunkSize {
+		get { return _chunkSize; }
+	}
+
+	public int SegmentsCount {
+		get { return _segments.Count; }
+	}
+
+	public int SegmentChunksCount {
+		get { return _segmentChunks; }
+	}
+
+	/// <summary>
+	/// The current number of buffers available
+	/// </summary>
+	public int AvailableBuffers {
+		get { return _buffers.Count; } //do we really care about volatility here?
+	}
+
+	/// <summary>
+	/// The total size of all buffers
+	/// </summary>
+	public int TotalBufferSize {
+		get { return _segments.Count * _segmentSize; } //do we really care about volatility here?
+	}
+
+	/// <summary>
+	/// Constructs a new <see cref="BufferManager"></see> object
+	/// </summary>
+	/// <param name="segmentChunks">The number of chunks to create per segment</param>
+	/// <param name="chunkSize">The size of a chunk in bytes</param>
+	public BufferManager(int segmentChunks, int chunkSize)
+		: this(segmentChunks, chunkSize, 1) {
+	}
+
+	/// <summary>
+	/// Constructs a new <see cref="BufferManager"></see> object
+	/// </summary>
+	/// <param name="segmentChunks">The number of chunks to create per segment</param>
+	/// <param name="chunkSize">The size of a chunk in bytes</param>
+	/// <param name="initialSegments">The initial number of segments to create</param>
+	public BufferManager(int segmentChunks, int chunkSize, int initialSegments)
+		: this(segmentChunks, chunkSize, initialSegments, true) {
+	}
+
+	/// <summary>
+	/// Constructs a new <see cref="BufferManager"></see> object
+	/// </summary>
+	/// <param name="segmentChunks">The number of chunks to create per segment</param>
+	/// <param name="chunkSize">The size of a chunk in bytes</param>
+	/// <param name="initialSegments">The initial number of segments to create</param>
+	/// <param name="allowedToCreateMemory">If false when empty and checkout is called an exception will be thrown</param>
+	public BufferManager(int segmentChunks, int chunkSize, int initialSegments, bool allowedToCreateMemory) {
+		if (segmentChunks <= 0)
+			throw new ArgumentException("segmentChunks");
+		if (chunkSize <= 0)
+			throw new ArgumentException("chunkSize");
+		if (initialSegments < 0)
+			throw new ArgumentException("initialSegments");
+
+		_segmentChunks = segmentChunks;
+		_chunkSize = chunkSize;
+		_segmentSize = _segmentChunks * _chunkSize;
+
+		_segments = new List<byte[]>();
+
+		_allowedToCreateMemory = true;
+		for (int i = 0; i < initialSegments; i++) {
+			CreateNewSegment(true);
+		}
+
+		_allowedToCreateMemory = allowedToCreateMemory;
+	}
+
+	/// <summary>
+	/// Creates a new segment, makes buffers available
+	/// </summary>
+	private void CreateNewSegment(bool forceCreation) {
+		if (!_allowedToCreateMemory)
+			throw new UnableToCreateMemoryException();
+		lock (_creatingNewSegmentLock) {
+			if (!forceCreation && _buffers.Count > _segmentChunks / 2)
+				return;
+
+			var bytes = new byte[_segmentSize];
+			_segments.Add(bytes);
+			for (int i = 0; i < _segmentChunks; i++) {
+				var chunk = new ArraySegment<byte>(bytes, i * _chunkSize, _chunkSize);
+				_buffers.Push(chunk);
+			}
+
+			Logger.Debug(
+					"Segments count: {segments}, buffers count: {buffers}, should be when full: {full}",
+				_segments.Count, _buffers.Count, _segments.Count * _segmentChunks
+				);
+		}
+	}
+
+	/// <summary>
+	/// Checks out a buffer from the manager
+	/// </summary>
+	/// <remarks>
+	/// It is the client's responsibility to return the buffer to the manager by
+	/// calling <see cref="CheckIn(ArraySegment{byte})"></see> on the buffer
+	/// </remarks>
+	/// <returns>A <see cref="ArraySegment{T}"></see> that can be used as a buffer</returns>
+	public ArraySegment<byte> CheckOut() {
+		int trial = 0;
+		while (trial < TrialsCount) {
+			ArraySegment<byte> result;
+			if (_buffers.TryPop(out result))
+				return result;
+			CreateNewSegment(false);
+			trial++;
+		}
+
+		throw new UnableToAllocateBufferException();
+	}
+
+	/// <summary>
+	/// Checks out a buffer from the manager
+	/// </summary>
+	/// <remarks>
+	/// It is the client's responsibility to return the buffer to the manger by
+	/// calling <see cref="CheckIn(IEnumerable{ArraySegment{byte}})"></see> on the buffer
+	/// </remarks>
+	/// <returns>A <see cref="ArraySegment{T}"></see> that can be used as a buffer</returns>
+	public IEnumerable<ArraySegment<byte>> CheckOut(int toGet) {
+		var result = new ArraySegment<byte>[toGet];
+		var count = 0;
+		var totalReceived = 0;
+
+		try {
+			while (count < TrialsCount) {
+				ArraySegment<byte> piece;
+				while (totalReceived < toGet) {
+					if (!_buffers.TryPop(out piece))
+						break;
+					result[totalReceived] = piece;
+					++totalReceived;
+				}
+
+				if (totalReceived == toGet)
+					return result;
+				CreateNewSegment(false);
+				count++;
+			}
+
+			throw new UnableToAllocateBufferException();
+		} catch {
+			if (totalReceived > 0)
+				CheckIn(result.Take(totalReceived));
+			throw;
+		}
+	}
+
+	/// <summary>
+	/// Returns a buffer to the control of the manager
+	/// </summary>
+	/// <remarks>
+	/// It is the client's responsibility to return the buffer to the manger by
+	/// calling <see cref="CheckIn(ArraySegment{byte})"></see> on the buffer
+	/// </remarks>
+	/// <param name="buffer">The <see cref="ArraySegment{T}"></see> to return to the cache</param>
+	public void CheckIn(ArraySegment<byte> buffer) {
+		CheckBuffer(buffer);
+		_buffers.Push(buffer);
+	}
+
+	/// <summary>
+	/// Returns a set of buffers to the control of the manager
+	/// </summary>
+	/// <remarks>
+	/// It is the client's responsibility to return the buffer to the manger by
+	/// calling <see cref="CheckIn(IEnumerable{ArraySegment{byte}})"></see> on the buffer
+	/// </remarks>
+	/// <param name="buffersToReturn">The <see cref="ArraySegment{T}"></see> to return to the cache</param>
+	public void CheckIn(IEnumerable<ArraySegment<byte>> buffersToReturn) {
+		if (buffersToReturn == null)
+			throw new ArgumentNullException("buffersToReturn");
+
+		foreach (var buf in buffersToReturn) {
+			CheckBuffer(buf);
+			_buffers.Push(buf);
+		}
+	}
+
+	//[Conditional("DEBUG")]
+	private void CheckBuffer(ArraySegment<byte> buffer) {
+		if (buffer.Array == null || buffer.Count == 0 || buffer.Array.Length < buffer.Offset + buffer.Count)
+			throw new Exception("Attempt to check in invalid buffer");
+		if (buffer.Count != _chunkSize)
+			throw new ArgumentException("Buffer was not of the same chunk size as the buffer manager", "buffer");
+	}
+}
diff --git a/src/KurrentDB.BufferManagement/BufferPool.cs b/src/KurrentDB.BufferManagement/BufferPool.cs
new file mode 100644
index 00000000000..dd5ce428ee5
--- /dev/null
+++ b/src/KurrentDB.BufferManagement/BufferPool.cs
@@ -0,0 +1,330 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+
+namespace KurrentDB.BufferManagement;
+
+public class BufferPool : IDisposable {
+	private List<ArraySegment<byte>> _buffers;
+	private readonly BufferManager _bufferManager;
+	private readonly int _chunkSize;
+	private int _length;
+	private bool _disposed;
+
+	/// <summary>
+	/// Structure to represent an index and an offset into the list of buffers allowing for quick access to a position
+	/// </summary>
+	private struct Position {
+		public readonly int Index;
+		public readonly int Offset;
+
+		public Position(int index, int offset) {
+			Index = index;
+			Offset = offset;
+		}
+	}
+
+	/// <summary>
+	/// Gets the capacity of the <see cref="BufferPool"></see>
+	/// </summary>
+	/// <value>The capacity.</value>
+	public int Capacity {
+		get {
+			CheckDisposed();
+			return _chunkSize * _buffers.Count;
+		}
+	}
+
+	/// <summary>
+	/// Gets the current length of the <see cref="BufferPool"></see>
+	/// </summary>
+	/// <value>The length.</value>
+	public int Length {
+		get { return _length; }
+	}
+
+	/// <summary>
+	/// Gets the effective buffers contained in this <see cref="BufferPool"></see>
+	/// </summary>
+	/// <value>The effective buffers.</value>
+	public IEnumerable<ArraySegment<byte>> EffectiveBuffers {
+		get {
+			CheckDisposed();
+			if (_length > 0) {
+				Position l = GetPositionFor(_length);
+				//send full buffers
+				for (int i = 0; i < l.Index; i++) {
+					yield return _buffers[i];
+				}
+
+				//send partial buffer
+				ArraySegment<byte> last = _buffers[l.Index];
+				yield return new ArraySegment<byte>(last.Array, last.Offset, l.Offset);
+			}
+		}
+	}
+
+	/// <summary>
+	/// Gets or sets the <see cref="System.Byte"/> with the specified index.
+	/// </summary>
+	public byte this[int index] {
+		get {
+			CheckDisposed();
+			if (index < 0 || index > _length)
+				throw new ArgumentOutOfRangeException("index");
+			Position l = GetPositionFor(index);
+			ArraySegment<byte> buffer = _buffers[l.Index];
+			return buffer.Array[buffer.Offset + l.Offset];
+		}
+		set {
+			CheckDisposed();
+			if (index < 0)
+				throw new ArgumentException("_Index");
+			Position l = GetPositionFor(index);
+			EnsureCapacity(l);
+			ArraySegment<byte> buffer = _buffers[l.Index];
+			buffer.Array[buffer.Offset + l.Offset] = value;
+			if (_length <= index)
+				_length = index + 1;
+		}
+	}
+
+	/// <summary>
+	/// Initializes a new instance of the <see cref="BufferPool"/> class.
+	/// </summary>
+	public BufferPool() : this(1, BufferManager.Default) {
+	}
+
+	/// <summary>
+	/// Initializes a new instance of the <see cref="BufferPool"/> class.
+	/// </summary>
+	/// <param name="bufferManager">The buffer manager.</param>
+	public BufferPool(BufferManager bufferManager) : this(1, bufferManager) {
+	}
+
+	/// <summary>
+	/// Initializes a new instance of the <see cref="BufferPool"/> class.
+	/// </summary>
+	/// <param name="initialBufferCount">The number of initial buffers.</param>
+	/// <param name="bufferManager">The buffer manager.</param>
+	public BufferPool(int initialBufferCount, BufferManager bufferManager) {
+		if (initialBufferCount <= 0)
+			throw new ArgumentException("initialBufferCount");
+		if (bufferManager == null)
+			throw new ArgumentNullException("bufferManager");
+		_length = 0;
+		_buffers = new List<ArraySegment<byte>>(bufferManager.CheckOut(initialBufferCount));
+		// must have 1 buffer
+		_chunkSize = _buffers[0].Count;
+		_bufferManager = bufferManager;
+		_disposed = false;
+	}
+
+	/// <summary>
+	/// Appends the specified data.
+	/// </summary>
+	/// <param name="data">The data to write.</param>
+	public void Append(byte[] data) {
+		if (data == null)
+			throw new ArgumentNullException("data");
+		Write(_length, data, 0, data.Length);
+	}
+
+	/// <summary>
+	/// Appends the specified data.
+	/// </summary>
+	/// <param name="data">The data.</param>
+	/// <param name="offset">The offset.</param>
+	/// <param name="count">The count.</param>
+	public void Append(byte[] data, int offset, int count) {
+		Write(_length, data, offset, count);
+	}
+
+	/// <summary>
+	/// Writes data to the specified position.
+	/// </summary>
+	/// <param name="position">The position to write at.</param>
+	/// <param name="data">The data.</param>
+	/// <param name="offset">The offset.</param>
+	/// <param name="count">The count.</param>
+	public void Write(int position, byte[] data, int offset, int count) {
+		if (data == null)
+			throw new ArgumentNullException("data");
+		if (offset < 0 || offset > data.Length)
+			throw new ArgumentOutOfRangeException("offset");
+		if (count < 0 || count + offset > data.Length)
+			throw new ArgumentOutOfRangeException("count");
+		Write(position, new ArraySegment<byte>(data, offset, count));
+	}
+
+	/// <summary>
+	/// Writes data to the specified position.
+	/// </summary>
+	/// <param name="position">The position to write at.</param>
+	/// <param name="data">The data.</param>
+	public void Write(int position, ArraySegment<byte> data) {
+		CheckDisposed();
+		int written = 0;
+		int tmpLength = position;
+		do {
+			Position loc = GetPositionFor(tmpLength);
+			EnsureCapacity(loc);
+			ArraySegment<byte> current = _buffers[loc.Index];
+			int canWrite = data.Count - written;
+			int available = current.Count - loc.Offset;
+			canWrite = canWrite > available ? available : canWrite;
+			if (canWrite > 0)
+				Buffer.BlockCopy(data.Array, written + data.Offset, current.Array, current.Offset + loc.Offset,
+					canWrite);
+			written += canWrite;
+			tmpLength += canWrite;
+		} while (written < data.Count);
+
+		_length = tmpLength > _length ? tmpLength : _length;
+	}
+
+	/// <summary>
+	/// Reads data from a given position
+	/// </summary>
+	/// <param name="position">The position to read from.</param>
+	/// <param name="data">Where to read the data to.</param>
+	/// <param name="offset">The offset to start reading into.</param>
+	/// <param name="count">The number of bytes to read.</param>
+	/// <returns></returns>
+	public int ReadFrom(int position, byte[] data, int offset, int count) {
+		if (data == null)
+			throw new ArgumentNullException("data");
+		if (offset < 0 || offset > data.Length)
+			throw new ArgumentOutOfRangeException("offset");
+		if (count < 0 || count + offset > data.Length)
+			throw new ArgumentOutOfRangeException("count");
+		return ReadFrom(position, new ArraySegment<byte>(data, offset, count));
+	}
+
+	/// <summary>
+	/// Reads data from a given position.
+	/// </summary>
+	/// <param name="position">The position to read from.</param>
+	/// <param name="data">Where to read the data to.</param>
+	/// <returns></returns>
+	public int ReadFrom(int position, ArraySegment<byte> data) {
+		CheckDisposed();
+		if (position >= _length)
+			return 0;
+		int copied = 0;
+		int left = Math.Min(data.Count, _length - position);
+		int currentLocation = position;
+		while (left > 0) {
+			Position l = GetPositionFor(currentLocation);
+			ArraySegment<byte> current = _buffers[l.Index];
+			int bytesToRead = Math.Min(_chunkSize - l.Offset, left);
+			if (bytesToRead > 0) {
+				Buffer.BlockCopy(current.Array, current.Offset + l.Offset, data.Array, data.Offset + copied,
+					bytesToRead);
+				copied += bytesToRead;
+				left -= bytesToRead;
+				currentLocation += bytesToRead;
+			}
+		}
+
+		return copied;
+	}
+
+	/// <summary>
+	/// Sets the length of the <see cref="BufferPool"></see>
+	/// </summary>
+	/// <param name="newLength">The new length.</param>
+	public void SetLength(int newLength) {
+		SetLength(newLength, true);
+	}
+
+	/// <summary>
+	/// Sets the length of the <see cref="BufferPool"></see>
+	/// </summary>
+	/// <param name="newLength">The new length</param>
+	/// <param name="releaseMemory">if set to <c>true</c> any memory no longer used will be released.</param>
+	public void SetLength(int newLength, bool releaseMemory) {
+		CheckDisposed();
+		if (newLength < 0)
+			throw new ArgumentException("newLength must be greater than 0");
+		int oldCapacity = Capacity;
+		_length = newLength;
+
+		if (_length < oldCapacity && releaseMemory)
+			RemoveCapacity(GetPositionFor(_length));
+		else if (_length > oldCapacity)
+			EnsureCapacity(GetPositionFor(_length));
+	}
+
+	private void RemoveCapacity(Position position) {
+		while (_buffers.Count > position.Index + 1) {
+			_bufferManager.CheckIn(_buffers[_buffers.Count - 1]);
+			_buffers.RemoveAt(_buffers.Count - 1);
+		}
+	}
+
+	private void EnsureCapacity(Position position) {
+		if (position.Index >= _buffers.Count) {
+			foreach (ArraySegment<byte> buffer in _bufferManager.CheckOut(position.Index + 1 - _buffers.Count)) {
+				if (buffer.Count != _chunkSize)
+					throw new Exception("Received a buffer of the wrong size: this should never happen.");
+				_buffers.Add(buffer);
+			}
+		}
+	}
+
+	/// <summary>
+	/// Converts this <see cref="BufferPool"></see> to a byte array.
+	/// </summary>
+	/// <returns></returns>
+	public byte[] ToByteArray() {
+		CheckDisposed();
+		Position l = GetPositionFor(_length);
+		var result = new byte[_length];
+		for (int i = 0; i < l.Index; i++) {
+			ArraySegment<byte> current = _buffers[i];
+			//copy full buffers
+			Buffer.BlockCopy(current.Array, current.Offset, result, i * _chunkSize, _chunkSize);
+		}
+
+		//copy last partial buffer
+		if (l.Index < _buffers.Count) {
+			ArraySegment<byte> last = _buffers[l.Index];
+			Buffer.BlockCopy(last.Array, last.Offset, result, l.Index * _chunkSize, l.Offset);
+		}
+
+		return result;
+	}
+
+	private Position GetPositionFor(int index) {
+		//we could do this much faster if we restricted buffer sizes to powers of 2
+		var l = new Position(index / _chunkSize, index % _chunkSize);
+		return l;
+	}
+
+	/// <summary>
+	/// Returns any memory used buy this <see cref="BufferPool"></see> to the <see cref="BufferManager"></see>
+	/// </summary>
+	public void Dispose() {
+		DisposeInternal();
+		GC.SuppressFinalize(this);
+	}
+
+	~BufferPool() {
+		DisposeInternal();
+	}
+
+	protected virtual void DisposeInternal() {
+		if (_buffers != null)
+			_bufferManager.CheckIn(_buffers);
+		_disposed = true;
+		_buffers = null;
+	}
+
+	private void CheckDisposed() {
+		if (_disposed)
+			throw new ObjectDisposedException("Object has been disposed.");
+	}
+}
diff --git a/src/KurrentDB.BufferManagement/BufferPoolStream.cs b/src/KurrentDB.BufferManagement/BufferPoolStream.cs
new file mode 100644
index 00000000000..90891fabc11
--- /dev/null
+++ b/src/KurrentDB.BufferManagement/BufferPoolStream.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+
+namespace KurrentDB.BufferManagement;
+
+public class BufferPoolStream : Stream {
+	private readonly BufferPool _bufferPool;
+	private long _position;
+
+	public BufferPool BufferPool {
+		get { return _bufferPool; }
+	}
+
+	public override bool CanRead {
+		get { return true; }
+	}
+
+	public override bool CanSeek {
+		get { return true; }
+	}
+
+	public override bool CanWrite {
+		get { return true; }
+	}
+
+	public override long Length {
+		get { return _bufferPool.Length; }
+	}
+
+	public int Capacity {
+		get { return _bufferPool.Capacity; }
+	}
+
+	public override long Position {
+		get { return _position; }
+		set {
+			if (value < 0 || value > _bufferPool.Length)
+				throw new ArgumentOutOfRangeException("value");
+			_position = value;
+		}
+	}
+
+	/// <summary>
+	/// Initializes a new instance of the <see cref="BufferPoolStream"/> class.
+	/// </summary>
+	/// <param name="bufferPool">The buffer pool used as underlying storage.</param>
+	public BufferPoolStream(BufferPool bufferPool) {
+		if (bufferPool == null)
+			throw new ArgumentNullException("bufferPool");
+		_bufferPool = bufferPool;
+	}
+
+	public override void Flush() {
+		//noop
+	}
+
+	public override long Seek(long offset, SeekOrigin origin) {
+		switch (origin) {
+			case SeekOrigin.Begin:
+				Position = offset;
+				break;
+			case SeekOrigin.End:
+				Position = _bufferPool.Length + offset;
+				break;
+			case SeekOrigin.Current:
+				Position = _position + offset;
+				break;
+			default:
+				throw new Exception("Unknown SeekOrigin: " + origin.ToString());
+		}
+
+		return Position;
+	}
+
+	public override void SetLength(long value) {
+		_bufferPool.SetLength((int)value);
+		if (_position > value)
+			_position = value;
+	}
+
+	public override int Read(byte[] buffer, int offset, int count) {
+		if (_position >= _bufferPool.Length)
+			return 0;
+		int ret = _bufferPool.ReadFrom((int)_position, buffer, offset, count);
+		_position += ret;
+		return ret;
+	}
+
+	public override void Write(byte[] buffer, int offset, int count) {
+		_bufferPool.Write((int)_position, buffer, offset, count);
+		_position += count;
+	}
+
+	protected override void Dispose(bool disposing) {
+		if (disposing)
+			_bufferPool.Dispose();
+		base.Dispose(disposing);
+	}
+
+	public byte[] ToArray() {
+		return _bufferPool.ToByteArray();
+	}
+}
diff --git a/src/EventStore.BufferManagement/EventStore.BufferManagement.csproj b/src/KurrentDB.BufferManagement/KurrentDB.BufferManagement.csproj
similarity index 100%
rename from src/EventStore.BufferManagement/EventStore.BufferManagement.csproj
rename to src/KurrentDB.BufferManagement/KurrentDB.BufferManagement.csproj
diff --git a/src/KurrentDB.BufferManagement/UnableToAllocateBufferException.cs b/src/KurrentDB.BufferManagement/UnableToAllocateBufferException.cs
new file mode 100644
index 00000000000..d848d906189
--- /dev/null
+++ b/src/KurrentDB.BufferManagement/UnableToAllocateBufferException.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.BufferManagement;
+
+public class UnableToAllocateBufferException : Exception {
+	public UnableToAllocateBufferException()
+		: base("Cannot allocate buffer after few trials.") {
+	}
+}
diff --git a/src/KurrentDB.BufferManagement/UnableToCreateMemoryException.cs b/src/KurrentDB.BufferManagement/UnableToCreateMemoryException.cs
new file mode 100644
index 00000000000..51ae6bd7798
--- /dev/null
+++ b/src/KurrentDB.BufferManagement/UnableToCreateMemoryException.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.BufferManagement;
+
+public class UnableToCreateMemoryException : Exception {
+	public UnableToCreateMemoryException()
+		: base("All buffers were in use and acquiring more memory has been disabled.") {
+	}
+}
diff --git a/src/KurrentDB.ClusterNode.Web/KurrentDB.ClusterNode.Web.csproj b/src/KurrentDB.ClusterNode.Web/KurrentDB.ClusterNode.Web.csproj
new file mode 100644
index 00000000000..637da7e5992
--- /dev/null
+++ b/src/KurrentDB.ClusterNode.Web/KurrentDB.ClusterNode.Web.csproj
@@ -0,0 +1,54 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+	</PropertyGroup>
+	<ItemGroup>
+		<Content Include="projections\es.projections.environment.js">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="clusternode-web\apple-touch-icon.png">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Include="clusternode-web\favicon.png">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Include="clusternode-web\fonts\**\*">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Include="clusternode-web\index.html">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Include="clusternode-web\css\main.min.css">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Include="clusternode-web\images\logo.svg">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Include="clusternode-web\js\app.min.js">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Include="clusternode-web\js\requirejs.min.js">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Include="clusternode-web\js\ace\ace.js">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Include="clusternode-web\js\ace\mode-javascript.js">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Include="clusternode-web\js\ace\mode-json.js">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Include="clusternode-web\js\ace\theme-monokai.js">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Include="clusternode-web\js\ace\worker-javascript.js">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Include="clusternode-web\js\ace\worker-json.js">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/NOTICE.html b/src/KurrentDB.ClusterNode.Web/clusternode-web/NOTICE.html
new file mode 100644
index 00000000000..ac97df02aba
--- /dev/null
+++ b/src/KurrentDB.ClusterNode.Web/clusternode-web/NOTICE.html
@@ -0,0 +1,343 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>Third-party dependencies export - Qodana PROJECT AUDIT</title>
+    <style>table{border-collapse: collapse;}
+td { border: 1px solid; padding: 10px; vertical-align:top;}</style>
+  </head>
+  <body bgcolor="#ffffff">
+    <h1>Third-party software list</h1>
+    <table>
+      <thead>
+        <tr>
+          <td width="25%">Dependency</td><td width="25%">Version</td><td width="25%">License</td><td width="25%">Copyright</td>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td><a href="https://github.com/jonschlinkert/ansi-cyan">ansi-cyan</a></td><td>0.1.1</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/jonschlinkert/ansi-gray">ansi-gray</a></td><td>0.1.1</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/jonschlinkert/ansi-red">ansi-red</a></td><td>0.1.1</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/chalk/ansi-regex#readme">ansi-regex</a></td><td>2.1.1</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/chalk/ansi-styles#readme">ansi-styles</a></td><td>2.2.1</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/jonschlinkert/ansi-wrap">ansi-wrap</a></td><td>0.1.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/jonschlinkert/arr-diff">arr-diff</a></td><td>1.1.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/jonschlinkert/arr-flatten">arr-flatten</a></td><td>1.1.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/jonschlinkert/arr-union">arr-union</a></td><td>2.1.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/jonschlinkert/array-slice">array-slice</a></td><td>0.2.3</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/chalk/chalk#readme">chalk</a></td><td>1.1.3</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/isaacs/color-support#readme">color-support</a></td><td>1.1.3</td><td>
+            <div>
+              <a href="https://www.isc.org/licenses/">ISC</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/tj/commander.js#readme">commander</a></td><td>2.17.1</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/isaacs/core-util-is#readme">core-util-is</a></td><td>1.0.2</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/sindresorhus/escape-string-regexp#readme">escape-string-regexp</a></td><td>1.0.5</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/jonschlinkert/extend-shallow">extend-shallow</a></td><td>1.1.4</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/js-cli/fancy-log#readme">fancy-log</a></td><td>1.3.2</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/js-cli/glogg#readme">glogg</a></td><td>1.0.1</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/terinjokes/gulp-uglify/">gulp-uglify</a></td><td>3.0.1</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/gulpjs/gulplog#readme">gulplog</a></td><td>1.0.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/sindresorhus/has-ansi#readme">has-ansi</a></td><td>2.0.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/gulpjs/has-gulplog#readme">has-gulplog</a></td><td>0.1.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/isaacs/inherits#readme">inherits</a></td><td>2.0.3</td><td>
+            <div>
+              <a href="https://www.isc.org/licenses/">ISC</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/juliangruber/isarray">isarray</a></td><td>1.0.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/jonschlinkert/kind-of">kind-of</a></td><td>1.1.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://lodash.com/">lodash</a></td><td>4.17.15</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/blakeembrey/make-error-cause">make-error-cause</a></td><td>1.2.2</td><td>
+            <div>
+              <a href="http://www.apache.org/licenses/">Apache-2.0</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/JsCommunity/make-error">make-error</a></td><td>1.3.5</td><td>
+            <div>
+              <a href="https://www.isc.org/licenses/">ISC</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/jonschlinkert/plugin-error">plugin-error</a></td><td>0.1.2</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/calvinmetcalf/process-nextick-args">process-nextick-args</a></td><td>1.0.7</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/nodejs/readable-stream#readme">readable-stream</a></td><td>2.3.3</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/OverZealous/run-sequence">run-sequence</a></td><td>2.2.1</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/feross/safe-buffer">safe-buffer</a></td><td>5.1.1</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/feross/safe-buffer">safe-buffer</a></td><td>5.1.2</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/mozilla/source-map">source-map</a></td><td>0.5.7</td><td>
+            <div>
+              <a href="http://www.opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/mozilla/source-map">source-map</a></td><td>0.6.1</td><td>
+            <div>
+              <a href="http://www.opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/gulpjs/sparkles#readme">sparkles</a></td><td>1.0.1</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/rvagg/string_decoder">string_decoder</a></td><td>1.0.3</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/chalk/strip-ansi#readme">strip-ansi</a></td><td>3.0.1</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/chalk/supports-color#readme">supports-color</a></td><td>2.0.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/rvagg/through2#readme">through2</a></td><td>2.0.3</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/jonschlinkert/time-stamp">time-stamp</a></td><td>1.1.0</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/mishoo/UglifyJS2#readme">uglify-js</a></td><td>3.4.8</td><td>
+            <div>
+              <a href="http://www.opensource.org/licenses/BSD-2-Clause">BSD-2-Clause</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/TooTallNate/util-deprecate">util-deprecate</a></td><td>1.0.2</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="http://github.com/floridoo/vinyl-sourcemaps-apply">vinyl-sourcemaps-apply</a></td><td>0.2.1</td><td>
+            <div>
+              <a href="https://www.isc.org/licenses/">ISC</a>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr>
+          <td><a href="https://github.com/Raynos/xtend">xtend</a></td><td>4.0.1</td><td>
+            <div>
+              <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
+            </div>
+          </td><td></td>
+        </tr>
+      </tbody>
+    </table>
+  </body>
+</html>
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/apple-touch-icon.png b/src/KurrentDB.ClusterNode.Web/clusternode-web/apple-touch-icon.png
new file mode 100644
index 00000000000..0b03bd43a54
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/apple-touch-icon.png differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/css/main.min.css b/src/KurrentDB.ClusterNode.Web/clusternode-web/css/main.min.css
new file mode 100644
index 00000000000..4c6c55aba03
--- /dev/null
+++ b/src/KurrentDB.ClusterNode.Web/clusternode-web/css/main.min.css
@@ -0,0 +1,6 @@
+.toast-title{font-weight:500}.toast-message{word-wrap:break-word}.toast-message a,.toast-message label{color:#000}.toast-message a:hover{color:#999;text-decoration:none}.toast-close-button{position:relative;right:-.3em;top:-.3em;float:right;font-size:20px;font-weight:700;color:#000;opacity:.8}.toast-close-button:focus,.toast-close-button:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.4}button.toast-close-button{padding:0;cursor:pointer;background:0 0;border:0;-webkit-appearance:none}.toast-top-full-width{top:0;right:0;width:100%}.toast-bottom-full-width{bottom:0;right:0;width:100%}.toast-top-left{top:12px;left:12px}.toast-top-right{top:12px;right:12px}.toast-bottom-right{right:12px;bottom:12px}.toast-bottom-left{bottom:12px;left:12px}#toast-container{position:fixed;z-index:999999}#toast-container *{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}#toast-container>div{margin:0 0 6px;padding:15px 15px 15px 50px;width:300px;-moz-border-radius:3px;-webkit-border-radius:3px 3px 3px 3px;border-radius:3px;background-position:15px center;background-repeat:no-repeat;color:#000;opacity:.8}#toast-container>:hover{-moz-box-shadow:0 0 12px #999;-webkit-box-shadow:0 0 12px #999;box-shadow:0 0 12px #999;opacity:1;cursor:pointer}#toast-container>.toast-info{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAADZSURBVHgB3ZXvDYIwEMUfTMAIOIEruIEdoSOwAWwAm+gKToAbVCdwBG1jz1RSuP77xC95QC7X9xoaDmDvNFqd1kVLab2tZluTyEBovRzTNamUoDHAeKk+1LxPMCeNnLnMMCeJrQDFLCa2esy5Nam7Dwkw6qixdhadwbMMWuPkC2hRjiM9VE4xZGcHe1cBvdXvEhFQxfa6r+iBctzpofYVC/D0BdxQjquvaD4Obri1VtzwW0Ugf1RIMEwZ5gMCGRLMJ0QiwQ8/Gm4CGUh8f48z/g/S1MxQa7BrPow7tmNYMOo2AAAAAElFTkSuQmCC)!important}#toast-container>.toast-error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAEXSURBVHgB3ZThEcIgDIXfOUFHYARWcANGYAPdwG7QblI3YIS6gTpBR1Bow5laCpT+67t7xx0JH4mVAEdXZX217qyf1h9yT3saO6SsBwZd87PkooYBDKYuBItLgvKubsjUjQ4MBE6pZpc0qWTN4BJpCcy7cFaxAz45p3LB8t3asuKq0AHNkrfCBe2bWIEdBTXK4CCw27+HDvYUlIVwH1/9FfxHKoUnObELRCY8yvEAsQMu8Rslo04s+KBV/cENrS/rM62xC5zeoaD/Bxhsr9zL5+tQ0D0OP9yaAvgFGe9IYTkpBdKSrDidSm7ZBTXSujB4Tv6oGst5zx+gwPTNDMtrsVEay0kZsqteYYc0pjnVY95VR11UOLS+/IyQP8k1+80AAAAASUVORK5CYII=)!important}#toast-container>.toast-success{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAABkSURBVHgB7ZLBCYAwDEU/uIgjuUE7ghuY0Ty6kif9goUg9OTPqXnwjn2BJkCS/GWCjkJ3etIDYp749VohxscNYgaNb3SJis/ucVHHG9YZIv1z+wwJWai5aNi1WGS8UemKJOlxAxRXLlnGEB7RAAAAAElFTkSuQmCC)!important}#toast-container>.toast-warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAEJSURBVHgB3ZXtEYIwDIbf8xyAERiBTXSEbkA3QCeATTwnYATdoDoBI2jB5Bq9fkDxF89drndNmjRpmwJbp7CirVysGCsvkhvNKaxAWRmE05AYZARqhYMenyxKoa/IqcyqwUwaWjCQ4xQaLtM2ZayE8wrzqUSQY8yQU9YRvQnotNhc4TNQcIcWgusdoie94omdUB5oPCOfK43eMnF5YrVPZVAiUoXU4iybPZbxwAq4RCXyqeBayYQ85DuNR+TD5/f0Kfke9xEHqTPgKiifcnwc/Bp1RoAa6Xf0l1ahUsYdljW7Wjg/YSYcRPZ7mVFJwXth12EhCt/9PiTj7tfcvCnQ75dp4L7MApvmDcdsdNHyHwgsAAAAAElFTkSuQmCC)!important}#toast-container.toast-bottom-full-width>div,#toast-container.toast-top-full-width>div{width:96%;margin:auto}.toast{background-color:#030303;opacity:1!important}.toast-success{background-color:#DBF9EE}.toast-error{background-color:#DBABC0}.toast-info{background-color:#DED9FF}.toast-warning{background-color:#FCF29B}.toast.ng-enter{opacity:0!important;transition:opacity .3s linear}.toast.ng-enter.ng-enter-active{opacity:1!important}.toast.ng-leave{opacity:1;transition:opacity .3s linear}.toast.ng-leave.ng-leave-active{opacity:0!important}@media all and (max-width:240px){#toast-container>div{padding:8px 8px 8px 50px;width:11em}#toast-container .toast-close-button{right:-.2em;top:-.2em}}@media all and (min-width:241px) and (max-width:480px){#toast-container>div{padding:8px 8px 8px 50px;width:18em}#toast-container .toast-close-button{right:-.2em;top:-.2em}}@media all and (min-width:481px) and (max-width:768px){#toast-container>div{padding:15px 15px 15px 50px;width:25em}}
+/*!
+ * Font Awesome Free 5.0.13 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ */.fa,.fab,.fal,.far,.fas{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x,.fa-stack-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:.08em solid #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fab.fa-pull-left,.fal.fa-pull-left,.far.fa-pull-left,.fas.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fab.fa-pull-right,.fal.fa-pull-right,.far.fa-pull-right,.fas.fa-pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1,1);transform:scale(-1,1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1,-1);transform:scale(1,-1)}.fa-flip-horizontal.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(-1,-1);transform:scale(-1,-1)}:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-rotate-90{-webkit-filter:none;filter:none}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%}.fa-stack-1x{line-height:inherit}.fa-inverse{color:#fff}.fa-500px:before{content:"\f26e"}.fa-accessible-icon:before{content:"\f368"}.fa-accusoft:before{content:"\f369"}.fa-address-book:before{content:"\f2b9"}.fa-address-card:before{content:"\f2bb"}.fa-adjust:before{content:"\f042"}.fa-adn:before{content:"\f170"}.fa-adversal:before{content:"\f36a"}.fa-affiliatetheme:before{content:"\f36b"}.fa-algolia:before{content:"\f36c"}.fa-align-center:before{content:"\f037"}.fa-align-justify:before{content:"\f039"}.fa-align-left:before{content:"\f036"}.fa-align-right:before{content:"\f038"}.fa-allergies:before{content:"\f461"}.fa-amazon:before{content:"\f270"}.fa-amazon-pay:before{content:"\f42c"}.fa-ambulance:before{content:"\f0f9"}.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-amilia:before{content:"\f36d"}.fa-anchor:before{content:"\f13d"}.fa-android:before{content:"\f17b"}.fa-angellist:before{content:"\f209"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-down:before{content:"\f107"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angrycreative:before{content:"\f36e"}.fa-angular:before{content:"\f420"}.fa-app-store:before{content:"\f36f"}.fa-app-store-ios:before{content:"\f370"}.fa-apper:before{content:"\f371"}.fa-apple:before{content:"\f179"}.fa-apple-pay:before{content:"\f415"}.fa-archive:before{content:"\f187"}.fa-arrow-alt-circle-down:before{content:"\f358"}.fa-arrow-alt-circle-left:before{content:"\f359"}.fa-arrow-alt-circle-right:before{content:"\f35a"}.fa-arrow-alt-circle-up:before{content:"\f35b"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-down:before{content:"\f063"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrows-alt:before{content:"\f0b2"}.fa-arrows-alt-h:before{content:"\f337"}.fa-arrows-alt-v:before{content:"\f338"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asterisk:before{content:"\f069"}.fa-asymmetrik:before{content:"\f372"}.fa-at:before{content:"\f1fa"}.fa-audible:before{content:"\f373"}.fa-audio-description:before{content:"\f29e"}.fa-autoprefixer:before{content:"\f41c"}.fa-avianex:before{content:"\f374"}.fa-aviato:before{content:"\f421"}.fa-aws:before{content:"\f375"}.fa-backward:before{content:"\f04a"}.fa-balance-scale:before{content:"\f24e"}.fa-ban:before{content:"\f05e"}.fa-band-aid:before{content:"\f462"}.fa-bandcamp:before{content:"\f2d5"}.fa-barcode:before{content:"\f02a"}.fa-bars:before{content:"\f0c9"}.fa-baseball-ball:before{content:"\f433"}.fa-basketball-ball:before{content:"\f434"}.fa-bath:before{content:"\f2cd"}.fa-battery-empty:before{content:"\f244"}.fa-battery-full:before{content:"\f240"}.fa-battery-half:before{content:"\f242"}.fa-battery-quarter:before{content:"\f243"}.fa-battery-three-quarters:before{content:"\f241"}.fa-bed:before{content:"\f236"}.fa-beer:before{content:"\f0fc"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-bell:before{content:"\f0f3"}.fa-bell-slash:before{content:"\f1f6"}.fa-bicycle:before{content:"\f206"}.fa-bimobject:before{content:"\f378"}.fa-binoculars:before{content:"\f1e5"}.fa-birthday-cake:before{content:"\f1fd"}.fa-bitbucket:before{content:"\f171"}.fa-bitcoin:before{content:"\f379"}.fa-bity:before{content:"\f37a"}.fa-black-tie:before{content:"\f27e"}.fa-blackberry:before{content:"\f37b"}.fa-blender:before{content:"\f517"}.fa-blind:before{content:"\f29d"}.fa-blogger:before{content:"\f37c"}.fa-blogger-b:before{content:"\f37d"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-bold:before{content:"\f032"}.fa-bolt:before{content:"\f0e7"}.fa-bomb:before{content:"\f1e2"}.fa-book:before{content:"\f02d"}.fa-book-open:before{content:"\f518"}.fa-bookmark:before{content:"\f02e"}.fa-bowling-ball:before{content:"\f436"}.fa-box:before{content:"\f466"}.fa-box-open:before{content:"\f49e"}.fa-boxes:before{content:"\f468"}.fa-braille:before{content:"\f2a1"}.fa-briefcase:before{content:"\f0b1"}.fa-briefcase-medical:before{content:"\f469"}.fa-broadcast-tower:before{content:"\f519"}.fa-broom:before{content:"\f51a"}.fa-btc:before{content:"\f15a"}.fa-bug:before{content:"\f188"}.fa-building:before{content:"\f1ad"}.fa-bullhorn:before{content:"\f0a1"}.fa-bullseye:before{content:"\f140"}.fa-burn:before{content:"\f46a"}.fa-buromobelexperte:before{content:"\f37f"}.fa-bus:before{content:"\f207"}.fa-buysellads:before{content:"\f20d"}.fa-calculator:before{content:"\f1ec"}.fa-calendar:before{content:"\f133"}.fa-calendar-alt:before{content:"\f073"}.fa-calendar-check:before{content:"\f274"}.fa-calendar-minus:before{content:"\f272"}.fa-calendar-plus:before{content:"\f271"}.fa-calendar-times:before{content:"\f273"}.fa-camera:before{content:"\f030"}.fa-camera-retro:before{content:"\f083"}.fa-capsules:before{content:"\f46b"}.fa-car:before{content:"\f1b9"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-caret-square-down:before{content:"\f150"}.fa-caret-square-left:before{content:"\f191"}.fa-caret-square-right:before{content:"\f152"}.fa-caret-square-up:before{content:"\f151"}.fa-caret-up:before{content:"\f0d8"}.fa-cart-arrow-down:before{content:"\f218"}.fa-cart-plus:before{content:"\f217"}.fa-cc-amazon-pay:before{content:"\f42d"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-apple-pay:before{content:"\f416"}.fa-cc-diners-club:before{content:"\f24c"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-cc-visa:before{content:"\f1f0"}.fa-centercode:before{content:"\f380"}.fa-certificate:before{content:"\f0a3"}.fa-chalkboard:before{content:"\f51b"}.fa-chalkboard-teacher:before{content:"\f51c"}.fa-chart-area:before{content:"\f1fe"}.fa-chart-bar:before{content:"\f080"}.fa-chart-line:before{content:"\f201"}.fa-chart-pie:before{content:"\f200"}.fa-check:before{content:"\f00c"}.fa-check-circle:before{content:"\f058"}.fa-check-square:before{content:"\f14a"}.fa-chess:before{content:"\f439"}.fa-chess-bishop:before{content:"\f43a"}.fa-chess-board:before{content:"\f43c"}.fa-chess-king:before{content:"\f43f"}.fa-chess-knight:before{content:"\f441"}.fa-chess-pawn:before{content:"\f443"}.fa-chess-queen:before{content:"\f445"}.fa-chess-rook:before{content:"\f447"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-down:before{content:"\f078"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-chevron-up:before{content:"\f077"}.fa-child:before{content:"\f1ae"}.fa-chrome:before{content:"\f268"}.fa-church:before{content:"\f51d"}.fa-circle:before{content:"\f111"}.fa-circle-notch:before{content:"\f1ce"}.fa-clipboard:before{content:"\f328"}.fa-clipboard-check:before{content:"\f46c"}.fa-clipboard-list:before{content:"\f46d"}.fa-clock:before{content:"\f017"}.fa-clone:before{content:"\f24d"}.fa-closed-captioning:before{content:"\f20a"}.fa-cloud:before{content:"\f0c2"}.fa-cloud-download-alt:before{content:"\f381"}.fa-cloud-upload-alt:before{content:"\f382"}.fa-cloudscale:before{content:"\f383"}.fa-cloudsmith:before{content:"\f384"}.fa-cloudversify:before{content:"\f385"}.fa-code:before{content:"\f121"}.fa-code-branch:before{content:"\f126"}.fa-codepen:before{content:"\f1cb"}.fa-codiepie:before{content:"\f284"}.fa-coffee:before{content:"\f0f4"}.fa-cog:before{content:"\f013"}.fa-cogs:before{content:"\f085"}.fa-coins:before{content:"\f51e"}.fa-columns:before{content:"\f0db"}.fa-comment:before{content:"\f075"}.fa-comment-alt:before{content:"\f27a"}.fa-comment-dots:before{content:"\f4ad"}.fa-comment-slash:before{content:"\f4b3"}.fa-comments:before{content:"\f086"}.fa-compact-disc:before{content:"\f51f"}.fa-compass:before{content:"\f14e"}.fa-compress:before{content:"\f066"}.fa-connectdevelop:before{content:"\f20e"}.fa-contao:before{content:"\f26d"}.fa-copy:before{content:"\f0c5"}.fa-copyright:before{content:"\f1f9"}.fa-couch:before{content:"\f4b8"}.fa-cpanel:before{content:"\f388"}.fa-creative-commons:before{content:"\f25e"}.fa-creative-commons-by:before{content:"\f4e7"}.fa-creative-commons-nc:before{content:"\f4e8"}.fa-creative-commons-nc-eu:before{content:"\f4e9"}.fa-creative-commons-nc-jp:before{content:"\f4ea"}.fa-creative-commons-nd:before{content:"\f4eb"}.fa-creative-commons-pd:before{content:"\f4ec"}.fa-creative-commons-pd-alt:before{content:"\f4ed"}.fa-creative-commons-remix:before{content:"\f4ee"}.fa-creative-commons-sa:before{content:"\f4ef"}.fa-creative-commons-sampling:before{content:"\f4f0"}.fa-creative-commons-sampling-plus:before{content:"\f4f1"}.fa-creative-commons-share:before{content:"\f4f2"}.fa-credit-card:before{content:"\f09d"}.fa-crop:before{content:"\f125"}.fa-crosshairs:before{content:"\f05b"}.fa-crow:before{content:"\f520"}.fa-crown:before{content:"\f521"}.fa-css3:before{content:"\f13c"}.fa-css3-alt:before{content:"\f38b"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-cut:before{content:"\f0c4"}.fa-cuttlefish:before{content:"\f38c"}.fa-d-and-d:before{content:"\f38d"}.fa-dashcube:before{content:"\f210"}.fa-database:before{content:"\f1c0"}.fa-deaf:before{content:"\f2a4"}.fa-delicious:before{content:"\f1a5"}.fa-deploydog:before{content:"\f38e"}.fa-deskpro:before{content:"\f38f"}.fa-desktop:before{content:"\f108"}.fa-deviantart:before{content:"\f1bd"}.fa-diagnoses:before{content:"\f470"}.fa-dice:before{content:"\f522"}.fa-dice-five:before{content:"\f523"}.fa-dice-four:before{content:"\f524"}.fa-dice-one:before{content:"\f525"}.fa-dice-six:before{content:"\f526"}.fa-dice-three:before{content:"\f527"}.fa-dice-two:before{content:"\f528"}.fa-digg:before{content:"\f1a6"}.fa-digital-ocean:before{content:"\f391"}.fa-discord:before{content:"\f392"}.fa-discourse:before{content:"\f393"}.fa-divide:before{content:"\f529"}.fa-dna:before{content:"\f471"}.fa-dochub:before{content:"\f394"}.fa-docker:before{content:"\f395"}.fa-dollar-sign:before{content:"\f155"}.fa-dolly:before{content:"\f472"}.fa-dolly-flatbed:before{content:"\f474"}.fa-donate:before{content:"\f4b9"}.fa-door-closed:before{content:"\f52a"}.fa-door-open:before{content:"\f52b"}.fa-dot-circle:before{content:"\f192"}.fa-dove:before{content:"\f4ba"}.fa-download:before{content:"\f019"}.fa-draft2digital:before{content:"\f396"}.fa-dribbble:before{content:"\f17d"}.fa-dribbble-square:before{content:"\f397"}.fa-dropbox:before{content:"\f16b"}.fa-drupal:before{content:"\f1a9"}.fa-dumbbell:before{content:"\f44b"}.fa-dyalog:before{content:"\f399"}.fa-earlybirds:before{content:"\f39a"}.fa-ebay:before{content:"\f4f4"}.fa-edge:before{content:"\f282"}.fa-edit:before{content:"\f044"}.fa-eject:before{content:"\f052"}.fa-elementor:before{content:"\f430"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-ember:before{content:"\f423"}.fa-empire:before{content:"\f1d1"}.fa-envelope:before{content:"\f0e0"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-square:before{content:"\f199"}.fa-envira:before{content:"\f299"}.fa-equals:before{content:"\f52c"}.fa-eraser:before{content:"\f12d"}.fa-erlang:before{content:"\f39d"}.fa-ethereum:before{content:"\f42e"}.fa-etsy:before{content:"\f2d7"}.fa-euro-sign:before{content:"\f153"}.fa-exchange-alt:before{content:"\f362"}.fa-exclamation:before{content:"\f12a"}.fa-exclamation-circle:before{content:"\f06a"}.fa-exclamation-triangle:before{content:"\f071"}.fa-expand:before{content:"\f065"}.fa-expand-arrows-alt:before{content:"\f31e"}.fa-expeditedssl:before{content:"\f23e"}.fa-external-link-alt:before{content:"\f35d"}.fa-external-link-square-alt:before{content:"\f360"}.fa-eye:before{content:"\f06e"}.fa-eye-dropper:before{content:"\f1fb"}.fa-eye-slash:before{content:"\f070"}.fa-facebook:before{content:"\f09a"}.fa-facebook-f:before{content:"\f39e"}.fa-facebook-messenger:before{content:"\f39f"}.fa-facebook-square:before{content:"\f082"}.fa-fast-backward:before{content:"\f049"}.fa-fast-forward:before{content:"\f050"}.fa-fax:before{content:"\f1ac"}.fa-feather:before{content:"\f52d"}.fa-female:before{content:"\f182"}.fa-fighter-jet:before{content:"\f0fb"}.fa-file:before{content:"\f15b"}.fa-file-alt:before{content:"\f15c"}.fa-file-archive:before{content:"\f1c6"}.fa-file-audio:before{content:"\f1c7"}.fa-file-code:before{content:"\f1c9"}.fa-file-excel:before{content:"\f1c3"}.fa-file-image:before{content:"\f1c5"}.fa-file-medical:before{content:"\f477"}.fa-file-medical-alt:before{content:"\f478"}.fa-file-pdf:before{content:"\f1c1"}.fa-file-powerpoint:before{content:"\f1c4"}.fa-file-video:before{content:"\f1c8"}.fa-file-word:before{content:"\f1c2"}.fa-film:before{content:"\f008"}.fa-filter:before{content:"\f0b0"}.fa-fire:before{content:"\f06d"}.fa-fire-extinguisher:before{content:"\f134"}.fa-firefox:before{content:"\f269"}.fa-first-aid:before{content:"\f479"}.fa-first-order:before{content:"\f2b0"}.fa-first-order-alt:before{content:"\f50a"}.fa-firstdraft:before{content:"\f3a1"}.fa-flag:before{content:"\f024"}.fa-flag-checkered:before{content:"\f11e"}.fa-flask:before{content:"\f0c3"}.fa-flickr:before{content:"\f16e"}.fa-flipboard:before{content:"\f44d"}.fa-fly:before{content:"\f417"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-font:before{content:"\f031"}.fa-font-awesome:before{content:"\f2b4"}.fa-font-awesome-alt:before{content:"\f35c"}.fa-font-awesome-flag:before{content:"\f425"}.fa-font-awesome-logo-full:before{content:"\f4e6"}.fa-fonticons:before{content:"\f280"}.fa-fonticons-fi:before{content:"\f3a2"}.fa-football-ball:before{content:"\f44e"}.fa-fort-awesome:before{content:"\f286"}.fa-fort-awesome-alt:before{content:"\f3a3"}.fa-forumbee:before{content:"\f211"}.fa-forward:before{content:"\f04e"}.fa-foursquare:before{content:"\f180"}.fa-free-code-camp:before{content:"\f2c5"}.fa-freebsd:before{content:"\f3a4"}.fa-frog:before{content:"\f52e"}.fa-frown:before{content:"\f119"}.fa-fulcrum:before{content:"\f50b"}.fa-futbol:before{content:"\f1e3"}.fa-galactic-republic:before{content:"\f50c"}.fa-galactic-senate:before{content:"\f50d"}.fa-gamepad:before{content:"\f11b"}.fa-gas-pump:before{content:"\f52f"}.fa-gavel:before{content:"\f0e3"}.fa-gem:before{content:"\f3a5"}.fa-genderless:before{content:"\f22d"}.fa-get-pocket:before{content:"\f265"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-gift:before{content:"\f06b"}.fa-git:before{content:"\f1d3"}.fa-git-square:before{content:"\f1d2"}.fa-github:before{content:"\f09b"}.fa-github-alt:before{content:"\f113"}.fa-github-square:before{content:"\f092"}.fa-gitkraken:before{content:"\f3a6"}.fa-gitlab:before{content:"\f296"}.fa-gitter:before{content:"\f426"}.fa-glass-martini:before{content:"\f000"}.fa-glasses:before{content:"\f530"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-globe:before{content:"\f0ac"}.fa-gofore:before{content:"\f3a7"}.fa-golf-ball:before{content:"\f450"}.fa-goodreads:before{content:"\f3a8"}.fa-goodreads-g:before{content:"\f3a9"}.fa-google:before{content:"\f1a0"}.fa-google-drive:before{content:"\f3aa"}.fa-google-play:before{content:"\f3ab"}.fa-google-plus:before{content:"\f2b3"}.fa-google-plus-g:before{content:"\f0d5"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-wallet:before{content:"\f1ee"}.fa-graduation-cap:before{content:"\f19d"}.fa-gratipay:before{content:"\f184"}.fa-grav:before{content:"\f2d6"}.fa-greater-than:before{content:"\f531"}.fa-greater-than-equal:before{content:"\f532"}.fa-gripfire:before{content:"\f3ac"}.fa-grunt:before{content:"\f3ad"}.fa-gulp:before{content:"\f3ae"}.fa-h-square:before{content:"\f0fd"}.fa-hacker-news:before{content:"\f1d4"}.fa-hacker-news-square:before{content:"\f3af"}.fa-hand-holding:before{content:"\f4bd"}.fa-hand-holding-heart:before{content:"\f4be"}.fa-hand-holding-usd:before{content:"\f4c0"}.fa-hand-lizard:before{content:"\f258"}.fa-hand-paper:before{content:"\f256"}.fa-hand-peace:before{content:"\f25b"}.fa-hand-point-down:before{content:"\f0a7"}.fa-hand-point-left:before{content:"\f0a5"}.fa-hand-point-right:before{content:"\f0a4"}.fa-hand-point-up:before{content:"\f0a6"}.fa-hand-pointer:before{content:"\f25a"}.fa-hand-rock:before{content:"\f255"}.fa-hand-scissors:before{content:"\f257"}.fa-hand-spock:before{content:"\f259"}.fa-hands:before{content:"\f4c2"}.fa-hands-helping:before{content:"\f4c4"}.fa-handshake:before{content:"\f2b5"}.fa-hashtag:before{content:"\f292"}.fa-hdd:before{content:"\f0a0"}.fa-heading:before{content:"\f1dc"}.fa-headphones:before{content:"\f025"}.fa-heart:before{content:"\f004"}.fa-heartbeat:before{content:"\f21e"}.fa-helicopter:before{content:"\f533"}.fa-hips:before{content:"\f452"}.fa-hire-a-helper:before{content:"\f3b0"}.fa-history:before{content:"\f1da"}.fa-hockey-puck:before{content:"\f453"}.fa-home:before{content:"\f015"}.fa-hooli:before{content:"\f427"}.fa-hospital:before{content:"\f0f8"}.fa-hospital-alt:before{content:"\f47d"}.fa-hospital-symbol:before{content:"\f47e"}.fa-hotjar:before{content:"\f3b1"}.fa-hourglass:before{content:"\f254"}.fa-hourglass-end:before{content:"\f253"}.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-start:before{content:"\f251"}.fa-houzz:before{content:"\f27c"}.fa-html5:before{content:"\f13b"}.fa-hubspot:before{content:"\f3b2"}.fa-i-cursor:before{content:"\f246"}.fa-id-badge:before{content:"\f2c1"}.fa-id-card:before{content:"\f2c2"}.fa-id-card-alt:before{content:"\f47f"}.fa-image:before{content:"\f03e"}.fa-images:before{content:"\f302"}.fa-imdb:before{content:"\f2d8"}.fa-inbox:before{content:"\f01c"}.fa-indent:before{content:"\f03c"}.fa-industry:before{content:"\f275"}.fa-infinity:before{content:"\f534"}.fa-info:before{content:"\f129"}.fa-info-circle:before{content:"\f05a"}.fa-instagram:before{content:"\f16d"}.fa-internet-explorer:before{content:"\f26b"}.fa-ioxhost:before{content:"\f208"}.fa-italic:before{content:"\f033"}.fa-itunes:before{content:"\f3b4"}.fa-itunes-note:before{content:"\f3b5"}.fa-java:before{content:"\f4e4"}.fa-jedi-order:before{content:"\f50e"}.fa-jenkins:before{content:"\f3b6"}.fa-joget:before{content:"\f3b7"}.fa-joomla:before{content:"\f1aa"}.fa-js:before{content:"\f3b8"}.fa-js-square:before{content:"\f3b9"}.fa-jsfiddle:before{content:"\f1cc"}.fa-key:before{content:"\f084"}.fa-keybase:before{content:"\f4f5"}.fa-keyboard:before{content:"\f11c"}.fa-keycdn:before{content:"\f3ba"}.fa-kickstarter:before{content:"\f3bb"}.fa-kickstarter-k:before{content:"\f3bc"}.fa-kiwi-bird:before{content:"\f535"}.fa-korvue:before{content:"\f42f"}.fa-language:before{content:"\f1ab"}.fa-laptop:before{content:"\f109"}.fa-laravel:before{content:"\f3bd"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-leaf:before{content:"\f06c"}.fa-leanpub:before{content:"\f212"}.fa-lemon:before{content:"\f094"}.fa-less:before{content:"\f41d"}.fa-less-than:before{content:"\f536"}.fa-less-than-equal:before{content:"\f537"}.fa-level-down-alt:before{content:"\f3be"}.fa-level-up-alt:before{content:"\f3bf"}.fa-life-ring:before{content:"\f1cd"}.fa-lightbulb:before{content:"\f0eb"}.fa-line:before{content:"\f3c0"}.fa-link:before{content:"\f0c1"}.fa-linkedin:before{content:"\f08c"}.fa-linkedin-in:before{content:"\f0e1"}.fa-linode:before{content:"\f2b8"}.fa-linux:before{content:"\f17c"}.fa-lira-sign:before{content:"\f195"}.fa-list:before{content:"\f03a"}.fa-list-alt:before{content:"\f022"}.fa-list-ol:before{content:"\f0cb"}.fa-list-ul:before{content:"\f0ca"}.fa-location-arrow:before{content:"\f124"}.fa-lock:before{content:"\f023"}.fa-lock-open:before{content:"\f3c1"}.fa-long-arrow-alt-down:before{content:"\f309"}.fa-long-arrow-alt-left:before{content:"\f30a"}.fa-long-arrow-alt-right:before{content:"\f30b"}.fa-long-arrow-alt-up:before{content:"\f30c"}.fa-low-vision:before{content:"\f2a8"}.fa-lyft:before{content:"\f3c3"}.fa-magento:before{content:"\f3c4"}.fa-magic:before{content:"\f0d0"}.fa-magnet:before{content:"\f076"}.fa-male:before{content:"\f183"}.fa-mandalorian:before{content:"\f50f"}.fa-map:before{content:"\f279"}.fa-map-marker:before{content:"\f041"}.fa-map-marker-alt:before{content:"\f3c5"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-mars:before{content:"\f222"}.fa-mars-double:before{content:"\f227"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mastodon:before{content:"\f4f6"}.fa-maxcdn:before{content:"\f136"}.fa-medapps:before{content:"\f3c6"}.fa-medium:before{content:"\f23a"}.fa-medium-m:before{content:"\f3c7"}.fa-medkit:before{content:"\f0fa"}.fa-medrt:before{content:"\f3c8"}.fa-meetup:before{content:"\f2e0"}.fa-meh:before{content:"\f11a"}.fa-memory:before{content:"\f538"}.fa-mercury:before{content:"\f223"}.fa-microchip:before{content:"\f2db"}.fa-microphone:before{content:"\f130"}.fa-microphone-alt:before{content:"\f3c9"}.fa-microphone-alt-slash:before{content:"\f539"}.fa-microphone-slash:before{content:"\f131"}.fa-microsoft:before{content:"\f3ca"}.fa-minus:before{content:"\f068"}.fa-minus-circle:before{content:"\f056"}.fa-minus-square:before{content:"\f146"}.fa-mix:before{content:"\f3cb"}.fa-mixcloud:before{content:"\f289"}.fa-mizuni:before{content:"\f3cc"}.fa-mobile:before{content:"\f10b"}.fa-mobile-alt:before{content:"\f3cd"}.fa-modx:before{content:"\f285"}.fa-monero:before{content:"\f3d0"}.fa-money-bill:before{content:"\f0d6"}.fa-money-bill-alt:before{content:"\f3d1"}.fa-money-bill-wave:before{content:"\f53a"}.fa-money-bill-wave-alt:before{content:"\f53b"}.fa-money-check:before{content:"\f53c"}.fa-money-check-alt:before{content:"\f53d"}.fa-moon:before{content:"\f186"}.fa-motorcycle:before{content:"\f21c"}.fa-mouse-pointer:before{content:"\f245"}.fa-music:before{content:"\f001"}.fa-napster:before{content:"\f3d2"}.fa-neuter:before{content:"\f22c"}.fa-newspaper:before{content:"\f1ea"}.fa-nintendo-switch:before{content:"\f418"}.fa-node:before{content:"\f419"}.fa-node-js:before{content:"\f3d3"}.fa-not-equal:before{content:"\f53e"}.fa-notes-medical:before{content:"\f481"}.fa-npm:before{content:"\f3d4"}.fa-ns8:before{content:"\f3d5"}.fa-nutritionix:before{content:"\f3d6"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-old-republic:before{content:"\f510"}.fa-opencart:before{content:"\f23d"}.fa-openid:before{content:"\f19b"}.fa-opera:before{content:"\f26a"}.fa-optin-monster:before{content:"\f23c"}.fa-osi:before{content:"\f41a"}.fa-outdent:before{content:"\f03b"}.fa-page4:before{content:"\f3d7"}.fa-pagelines:before{content:"\f18c"}.fa-paint-brush:before{content:"\f1fc"}.fa-palette:before{content:"\f53f"}.fa-palfed:before{content:"\f3d8"}.fa-pallet:before{content:"\f482"}.fa-paper-plane:before{content:"\f1d8"}.fa-paperclip:before{content:"\f0c6"}.fa-parachute-box:before{content:"\f4cd"}.fa-paragraph:before{content:"\f1dd"}.fa-parking:before{content:"\f540"}.fa-paste:before{content:"\f0ea"}.fa-patreon:before{content:"\f3d9"}.fa-pause:before{content:"\f04c"}.fa-pause-circle:before{content:"\f28b"}.fa-paw:before{content:"\f1b0"}.fa-paypal:before{content:"\f1ed"}.fa-pen-square:before{content:"\f14b"}.fa-pencil-alt:before{content:"\f303"}.fa-people-carry:before{content:"\f4ce"}.fa-percent:before{content:"\f295"}.fa-percentage:before{content:"\f541"}.fa-periscope:before{content:"\f3da"}.fa-phabricator:before{content:"\f3db"}.fa-phoenix-framework:before{content:"\f3dc"}.fa-phoenix-squadron:before{content:"\f511"}.fa-phone:before{content:"\f095"}.fa-phone-slash:before{content:"\f3dd"}.fa-phone-square:before{content:"\f098"}.fa-phone-volume:before{content:"\f2a0"}.fa-php:before{content:"\f457"}.fa-pied-piper:before{content:"\f2ae"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-pied-piper-hat:before{content:"\f4e5"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-piggy-bank:before{content:"\f4d3"}.fa-pills:before{content:"\f484"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-p:before{content:"\f231"}.fa-pinterest-square:before{content:"\f0d3"}.fa-plane:before{content:"\f072"}.fa-play:before{content:"\f04b"}.fa-play-circle:before{content:"\f144"}.fa-playstation:before{content:"\f3df"}.fa-plug:before{content:"\f1e6"}.fa-plus:before{content:"\f067"}.fa-plus-circle:before{content:"\f055"}.fa-plus-square:before{content:"\f0fe"}.fa-podcast:before{content:"\f2ce"}.fa-poo:before{content:"\f2fe"}.fa-portrait:before{content:"\f3e0"}.fa-pound-sign:before{content:"\f154"}.fa-power-off:before{content:"\f011"}.fa-prescription-bottle:before{content:"\f485"}.fa-prescription-bottle-alt:before{content:"\f486"}.fa-print:before{content:"\f02f"}.fa-procedures:before{content:"\f487"}.fa-product-hunt:before{content:"\f288"}.fa-project-diagram:before{content:"\f542"}.fa-pushed:before{content:"\f3e1"}.fa-puzzle-piece:before{content:"\f12e"}.fa-python:before{content:"\f3e2"}.fa-qq:before{content:"\f1d6"}.fa-qrcode:before{content:"\f029"}.fa-question:before{content:"\f128"}.fa-question-circle:before{content:"\f059"}.fa-quidditch:before{content:"\f458"}.fa-quinscape:before{content:"\f459"}.fa-quora:before{content:"\f2c4"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-r-project:before{content:"\f4f7"}.fa-random:before{content:"\f074"}.fa-ravelry:before{content:"\f2d9"}.fa-react:before{content:"\f41b"}.fa-readme:before{content:"\f4d5"}.fa-rebel:before{content:"\f1d0"}.fa-receipt:before{content:"\f543"}.fa-recycle:before{content:"\f1b8"}.fa-red-river:before{content:"\f3e3"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-alien:before{content:"\f281"}.fa-reddit-square:before{content:"\f1a2"}.fa-redo:before{content:"\f01e"}.fa-redo-alt:before{content:"\f2f9"}.fa-registered:before{content:"\f25d"}.fa-rendact:before{content:"\f3e4"}.fa-renren:before{content:"\f18b"}.fa-reply:before{content:"\f3e5"}.fa-reply-all:before{content:"\f122"}.fa-replyd:before{content:"\f3e6"}.fa-researchgate:before{content:"\f4f8"}.fa-resolving:before{content:"\f3e7"}.fa-retweet:before{content:"\f079"}.fa-ribbon:before{content:"\f4d6"}.fa-road:before{content:"\f018"}.fa-robot:before{content:"\f544"}.fa-rocket:before{content:"\f135"}.fa-rocketchat:before{content:"\f3e8"}.fa-rockrms:before{content:"\f3e9"}.fa-rss:before{content:"\f09e"}.fa-rss-square:before{content:"\f143"}.fa-ruble-sign:before{content:"\f158"}.fa-ruler:before{content:"\f545"}.fa-ruler-combined:before{content:"\f546"}.fa-ruler-horizontal:before{content:"\f547"}.fa-ruler-vertical:before{content:"\f548"}.fa-rupee-sign:before{content:"\f156"}.fa-safari:before{content:"\f267"}.fa-sass:before{content:"\f41e"}.fa-save:before{content:"\f0c7"}.fa-schlix:before{content:"\f3ea"}.fa-school:before{content:"\f549"}.fa-screwdriver:before{content:"\f54a"}.fa-scribd:before{content:"\f28a"}.fa-search:before{content:"\f002"}.fa-search-minus:before{content:"\f010"}.fa-search-plus:before{content:"\f00e"}.fa-searchengin:before{content:"\f3eb"}.fa-seedling:before{content:"\f4d8"}.fa-sellcast:before{content:"\f2da"}.fa-sellsy:before{content:"\f213"}.fa-server:before{content:"\f233"}.fa-servicestack:before{content:"\f3ec"}.fa-share:before{content:"\f064"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-share-square:before{content:"\f14d"}.fa-shekel-sign:before{content:"\f20b"}.fa-shield-alt:before{content:"\f3ed"}.fa-ship:before{content:"\f21a"}.fa-shipping-fast:before{content:"\f48b"}.fa-shirtsinbulk:before{content:"\f214"}.fa-shoe-prints:before{content:"\f54b"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-shopping-cart:before{content:"\f07a"}.fa-shower:before{content:"\f2cc"}.fa-sign:before{content:"\f4d9"}.fa-sign-in-alt:before{content:"\f2f6"}.fa-sign-language:before{content:"\f2a7"}.fa-sign-out-alt:before{content:"\f2f5"}.fa-signal:before{content:"\f012"}.fa-simplybuilt:before{content:"\f215"}.fa-sistrix:before{content:"\f3ee"}.fa-sitemap:before{content:"\f0e8"}.fa-sith:before{content:"\f512"}.fa-skull:before{content:"\f54c"}.fa-skyatlas:before{content:"\f216"}.fa-skype:before{content:"\f17e"}.fa-slack:before{content:"\f198"}.fa-slack-hash:before{content:"\f3ef"}.fa-sliders-h:before{content:"\f1de"}.fa-slideshare:before{content:"\f1e7"}.fa-smile:before{content:"\f118"}.fa-smoking:before{content:"\f48d"}.fa-smoking-ban:before{content:"\f54d"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-snowflake:before{content:"\f2dc"}.fa-sort:before{content:"\f0dc"}.fa-sort-alpha-down:before{content:"\f15d"}.fa-sort-alpha-up:before{content:"\f15e"}.fa-sort-amount-down:before{content:"\f160"}.fa-sort-amount-up:before{content:"\f161"}.fa-sort-down:before{content:"\f0dd"}.fa-sort-numeric-down:before{content:"\f162"}.fa-sort-numeric-up:before{content:"\f163"}.fa-sort-up:before{content:"\f0de"}.fa-soundcloud:before{content:"\f1be"}.fa-space-shuttle:before{content:"\f197"}.fa-speakap:before{content:"\f3f3"}.fa-spinner:before{content:"\f110"}.fa-spotify:before{content:"\f1bc"}.fa-square:before{content:"\f0c8"}.fa-square-full:before{content:"\f45c"}.fa-stack-exchange:before{content:"\f18d"}.fa-stack-overflow:before{content:"\f16c"}.fa-star:before{content:"\f005"}.fa-star-half:before{content:"\f089"}.fa-staylinked:before{content:"\f3f5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-steam-symbol:before{content:"\f3f6"}.fa-step-backward:before{content:"\f048"}.fa-step-forward:before{content:"\f051"}.fa-stethoscope:before{content:"\f0f1"}.fa-sticker-mule:before{content:"\f3f7"}.fa-sticky-note:before{content:"\f249"}.fa-stop:before{content:"\f04d"}.fa-stop-circle:before{content:"\f28d"}.fa-stopwatch:before{content:"\f2f2"}.fa-store:before{content:"\f54e"}.fa-store-alt:before{content:"\f54f"}.fa-strava:before{content:"\f428"}.fa-stream:before{content:"\f550"}.fa-street-view:before{content:"\f21d"}.fa-strikethrough:before{content:"\f0cc"}.fa-stripe:before{content:"\f429"}.fa-stripe-s:before{content:"\f42a"}.fa-stroopwafel:before{content:"\f551"}.fa-studiovinari:before{content:"\f3f8"}.fa-stumbleupon:before{content:"\f1a4"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-subscript:before{content:"\f12c"}.fa-subway:before{content:"\f239"}.fa-suitcase:before{content:"\f0f2"}.fa-sun:before{content:"\f185"}.fa-superpowers:before{content:"\f2dd"}.fa-superscript:before{content:"\f12b"}.fa-supple:before{content:"\f3f9"}.fa-sync:before{content:"\f021"}.fa-sync-alt:before{content:"\f2f1"}.fa-syringe:before{content:"\f48e"}.fa-table:before{content:"\f0ce"}.fa-table-tennis:before{content:"\f45d"}.fa-tablet:before{content:"\f10a"}.fa-tablet-alt:before{content:"\f3fa"}.fa-tablets:before{content:"\f490"}.fa-tachometer-alt:before{content:"\f3fd"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-tape:before{content:"\f4db"}.fa-tasks:before{content:"\f0ae"}.fa-taxi:before{content:"\f1ba"}.fa-teamspeak:before{content:"\f4f9"}.fa-telegram:before{content:"\f2c6"}.fa-telegram-plane:before{content:"\f3fe"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-terminal:before{content:"\f120"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-th:before{content:"\f00a"}.fa-th-large:before{content:"\f009"}.fa-th-list:before{content:"\f00b"}.fa-themeisle:before{content:"\f2b2"}.fa-thermometer:before{content:"\f491"}.fa-thermometer-empty:before{content:"\f2cb"}.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thumbs-down:before{content:"\f165"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbtack:before{content:"\f08d"}.fa-ticket-alt:before{content:"\f3ff"}.fa-times:before{content:"\f00d"}.fa-times-circle:before{content:"\f057"}.fa-tint:before{content:"\f043"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-toolbox:before{content:"\f552"}.fa-trade-federation:before{content:"\f513"}.fa-trademark:before{content:"\f25c"}.fa-train:before{content:"\f238"}.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-trash:before{content:"\f1f8"}.fa-trash-alt:before{content:"\f2ed"}.fa-tree:before{content:"\f1bb"}.fa-trello:before{content:"\f181"}.fa-tripadvisor:before{content:"\f262"}.fa-trophy:before{content:"\f091"}.fa-truck:before{content:"\f0d1"}.fa-truck-loading:before{content:"\f4de"}.fa-truck-moving:before{content:"\f4df"}.fa-tshirt:before{content:"\f553"}.fa-tty:before{content:"\f1e4"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-tv:before{content:"\f26c"}.fa-twitch:before{content:"\f1e8"}.fa-twitter:before{content:"\f099"}.fa-twitter-square:before{content:"\f081"}.fa-typo3:before{content:"\f42b"}.fa-uber:before{content:"\f402"}.fa-uikit:before{content:"\f403"}.fa-umbrella:before{content:"\f0e9"}.fa-underline:before{content:"\f0cd"}.fa-undo:before{content:"\f0e2"}.fa-undo-alt:before{content:"\f2ea"}.fa-uniregistry:before{content:"\f404"}.fa-universal-access:before{content:"\f29a"}.fa-university:before{content:"\f19c"}.fa-unlink:before{content:"\f127"}.fa-unlock:before{content:"\f09c"}.fa-unlock-alt:before{content:"\f13e"}.fa-untappd:before{content:"\f405"}.fa-upload:before{content:"\f093"}.fa-usb:before{content:"\f287"}.fa-user:before{content:"\f007"}.fa-user-alt:before{content:"\f406"}.fa-user-alt-slash:before{content:"\f4fa"}.fa-user-astronaut:before{content:"\f4fb"}.fa-user-check:before{content:"\f4fc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-clock:before{content:"\f4fd"}.fa-user-cog:before{content:"\f4fe"}.fa-user-edit:before{content:"\f4ff"}.fa-user-friends:before{content:"\f500"}.fa-user-graduate:before{content:"\f501"}.fa-user-lock:before{content:"\f502"}.fa-user-md:before{content:"\f0f0"}.fa-user-minus:before{content:"\f503"}.fa-user-ninja:before{content:"\f504"}.fa-user-plus:before{content:"\f234"}.fa-user-secret:before{content:"\f21b"}.fa-user-shield:before{content:"\f505"}.fa-user-slash:before{content:"\f506"}.fa-user-tag:before{content:"\f507"}.fa-user-tie:before{content:"\f508"}.fa-user-times:before{content:"\f235"}.fa-users:before{content:"\f0c0"}.fa-users-cog:before{content:"\f509"}.fa-ussunnah:before{content:"\f407"}.fa-utensil-spoon:before{content:"\f2e5"}.fa-utensils:before{content:"\f2e7"}.fa-vaadin:before{content:"\f408"}.fa-venus:before{content:"\f221"}.fa-venus-double:before{content:"\f226"}.fa-venus-mars:before{content:"\f228"}.fa-viacoin:before{content:"\f237"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-vial:before{content:"\f492"}.fa-vials:before{content:"\f493"}.fa-viber:before{content:"\f409"}.fa-video:before{content:"\f03d"}.fa-video-slash:before{content:"\f4e2"}.fa-vimeo:before{content:"\f40a"}.fa-vimeo-square:before{content:"\f194"}.fa-vimeo-v:before{content:"\f27d"}.fa-vine:before{content:"\f1ca"}.fa-vk:before{content:"\f189"}.fa-vnv:before{content:"\f40b"}.fa-volleyball-ball:before{content:"\f45f"}.fa-volume-down:before{content:"\f027"}.fa-volume-off:before{content:"\f026"}.fa-volume-up:before{content:"\f028"}.fa-vuejs:before{content:"\f41f"}.fa-walking:before{content:"\f554"}.fa-wallet:before{content:"\f555"}.fa-warehouse:before{content:"\f494"}.fa-weibo:before{content:"\f18a"}.fa-weight:before{content:"\f496"}.fa-weixin:before{content:"\f1d7"}.fa-whatsapp:before{content:"\f232"}.fa-whatsapp-square:before{content:"\f40c"}.fa-wheelchair:before{content:"\f193"}.fa-whmcs:before{content:"\f40d"}.fa-wifi:before{content:"\f1eb"}.fa-wikipedia-w:before{content:"\f266"}.fa-window-close:before{content:"\f410"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-windows:before{content:"\f17a"}.fa-wine-glass:before{content:"\f4e3"}.fa-wolf-pack-battalion:before{content:"\f514"}.fa-won-sign:before{content:"\f159"}.fa-wordpress:before{content:"\f19a"}.fa-wordpress-simple:before{content:"\f411"}.fa-wpbeginner:before{content:"\f297"}.fa-wpexplorer:before{content:"\f2de"}.fa-wpforms:before{content:"\f298"}.fa-wrench:before{content:"\f0ad"}.fa-x-ray:before{content:"\f497"}.fa-xbox:before{content:"\f412"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-y-combinator:before{content:"\f23b"}.fa-yahoo:before{content:"\f19e"}.fa-yandex:before{content:"\f413"}.fa-yandex-international:before{content:"\f414"}.fa-yelp:before{content:"\f1e9"}.fa-yen-sign:before{content:"\f157"}.fa-yoast:before{content:"\f2b1"}.fa-youtube:before{content:"\f167"}.fa-youtube-square:before{content:"\f431"}.sr-only{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}@font-face{font-family:'Font Awesome 5 Brands';font-style:normal;font-weight:400;src:url(../fonts/font-awesome/webfonts/fa-brands-400.eot);src:url(../fonts/font-awesome/webfonts/fa-brands-400.eot?#iefix) format("embedded-opentype"),url(../fonts/font-awesome/webfonts/fa-brands-400.woff2) format("woff2"),url(../fonts/font-awesome/webfonts/fa-brands-400.woff) format("woff"),url(../fonts/font-awesome/webfonts/fa-brands-400.ttf) format("truetype"),url(../fonts/font-awesome/webfonts/fa-brands-400.svg#fontawesome) format("svg")}.fab{font-family:'Font Awesome 5 Brands'}.fa,.far,.fas{font-family:'Font Awesome 5 Free'}@font-face{font-family:'Font Awesome 5 Free';font-style:normal;font-weight:400;src:url(../fonts/font-awesome/webfonts/fa-regular-400.eot);src:url(../fonts/font-awesome/webfonts/fa-regular-400.eot?#iefix) format("embedded-opentype"),url(../fonts/font-awesome/webfonts/fa-regular-400.woff2) format("woff2"),url(../fonts/font-awesome/webfonts/fa-regular-400.woff) format("woff"),url(../fonts/font-awesome/webfonts/fa-regular-400.ttf) format("truetype"),url(../fonts/font-awesome/webfonts/fa-regular-400.svg#fontawesome) format("svg")}.far{font-weight:400}@font-face{font-family:'Font Awesome 5 Free';font-style:normal;font-weight:900;src:url(../fonts/font-awesome/webfonts/fa-solid-900.eot);src:url(../fonts/font-awesome/webfonts/fa-solid-900.eot?#iefix) format("embedded-opentype"),url(../fonts/font-awesome/webfonts/fa-solid-900.woff2) format("woff2"),url(../fonts/font-awesome/webfonts/fa-solid-900.woff) format("woff"),url(../fonts/font-awesome/webfonts/fa-solid-900.ttf) format("truetype"),url(../fonts/font-awesome/webfonts/fa-solid-900.svg#fontawesome) format("svg")}.fa,.fas{font-weight:900}
+body,h3,ol{margin:0}tbody td,thead{border-top:1px solid #E2E4E0}tbody td,th{border-right:1px solid #E2E4E0}.note,.note--warning,textarea{-moz-box-sizing:border-box;display:block}table,textarea{width:100%;border-collapse:collapse}kbd,th{background:#F2F4F0}kbd,textarea{border:1px solid #E2E4E0}.form-table,.note,.note--warning,main,textarea{display:block}.page-logon,body,html{height:100%}.logon-container button,body{-webkit-font-smoothing:antialiased}@font-face{font-family:Solina;src:url(../fonts/Solina-Regular.woff2) format("woff2"),url(../fonts/Solina-Regular.woff2) format("woff");font-weight:400;font-style:normal}@font-face{font-family:Solina;src:url(../fonts/Solina-Medium.woff2) format("woff2"),url(../fonts/Solina-Medium.woff) format("woff");font-weight:500;font-style:normal}@font-face{font-family:Solina;src:url(../fonts/Solina-Bold.woff2) format("woff2"),url(../fonts/Solina-Bold.woff) format("woff");font-weight:700;font-style:normal}@font-face{font-family:Solina;src:url(../fonts/Solina-Bold.woff2) format("woff2"),url(../fonts/Solina-Bold.woff) format("woff");font-weight:700;font-style:italic}@font-face{font-family:Solina;src:url(../fonts/Solina-Regular.woff2) format("woff2"),url(../fonts/Solina-Regular.woff) format("woff");font-weight:400;font-style:italic}@font-face{font-family:"Spline Sans Mono";src:url(../fonts/SplineSansMono-Bold.ttf) format("truetype");font-weight:700;font-style:normal}@font-face{font-family:"Spline Sans Mono";src:url(../fonts/SplineSansMono-Regular.ttf) format("truetype");font-weight:400;font-style:normal}::-moz-selection{background:#525450;color:#FFF}::selection{background:#525450;color:#FFF}:focus{outline:0}html{font-size:13px}body{min-width:1000px;background:#FFF;color:#435261;font-family:Solina,sans-serif;font-weight:400;line-height:1.5;text-rendering:optimizeLegibility;-moz-osx-font-smoothing:grayscale}code,textarea{font-family:"Spline Sans Mono",monospace}h2,h3,th{font-weight:500}a{color:#631B3A;text-decoration:none}a:focus,a:hover{color:#B75781}h1{margin:1rem 0;font-size:2.25rem;line-height:3rem}h2{font-size:1.5rem;line-height:2rem}h3{font-size:1rem}ol{padding:0}table{border-left:1px solid #E2E4E0;border-bottom:1px solid #E2E4E0}td,th{padding:.5rem;text-align:left}thead{border-bottom:2px solid #E2E4E0}textarea{box-sizing:border-box;padding:.5rem}kbd{padding:0 .25rem;color:#727470;border-radius:.25rem;font-family:Solina,sans-serif;font-weight:700;font-size:.9rem}.note,.note--warning{box-sizing:border-box;margin:1.5rem 0;padding:1.5rem;background:#EEF3FF;color:#00216F;border-left:.75rem solid #BBCFFF;font-style:italic}.note--warning{background:#FFF6CA;color:#4B3E00;border-left:.75rem solid #FCF29B}.page-logon{display:-webkit-flex;display:-ms-flex;display:flex;-webkit-align-items:center;-ms-align-items:center;align-items:center;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-justify-content:center;-ms-justify-content:center;justify-content:center;background:#F2F4F0}.logon-container{width:22rem;margin:0 auto;padding:2.25rem;background:#631B3A;background-image:linear-gradient(45deg,rgba(99,27,58,.5) 0,rgba(99,27,58,.5) 50%,rgba(183,87,129,.5) 50%,rgba(183,87,129,.5) 100%),linear-gradient(135deg,rgba(99,27,58,.5) 0,rgba(99,27,58,.5) 50%,rgba(183,87,129,.5) 50%,rgba(183,87,129,.5) 100%);border-radius:.25rem;box-shadow:0 .5rem 3.375rem #A2A4A0}.logon-container .site-title{margin:0 0 1rem;text-align:center}.logon-container button,.logon-container input{margin:1rem 0 0;-moz-box-sizing:border-box;font-family:inherit;width:100%}.logon-container .login-form,.table-queues td,.table-queues th{text-align:right}.logon-container .site-footer,.logon-container .site-footer a{color:#FFF}.logon-container label{display:none}.logon-container input{box-sizing:border-box;padding:.5rem;border:none;border-radius:.25rem;font-size:1rem}.logon-container button{box-sizing:border-box;padding:.75rem;border:none;border-radius:.25rem;background:#B75781;color:#FFF;font-size:inherit;font-weight:700;-mox-osx-font-smoothing:grayscale}.site-header{display:-webkit-flex;display:-ms-flex;display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-align-items:center;-ms-align-items:center;align-items:center;-webkit-justify-content:space-between;-ms-justify-content:space-between;justify-content:space-between;padding:0 3rem;background:#631B3A;font-weight:500}.license-header,.navigator-banner-header{display:-webkit-flex;display:-ms-flex;-webkit-flex-direction:row;padding:0 3rem}.license-header.invalid-license a b,.navigator-banner-header a b{font-weight:700}.navigator-banner-header{display:flex;-ms-flex-direction:row;flex-direction:row;-webkit-align-items:center;-ms-align-items:center;align-items:center;-webkit-justify-content:space-between;-ms-justify-content:space-between;justify-content:space-between;margin-bottom:.1rem;background:#FCF29B}.license-header.invalid-license a,.license-header.valid-license a,.navigator-banner-header a{margin:1rem .5rem;font-size:1rem;line-height:1rem}.navigator-banner-header a{color:#525450}.license-header{display:flex;-ms-flex-direction:row;flex-direction:row;-webkit-align-items:center;-ms-align-items:center;align-items:center;-webkit-justify-content:space-between;-ms-justify-content:space-between;justify-content:space-between}.container,.site-nav{display:-webkit-flex;display:-ms-flex}.license-header.valid-license{background:0 0}.license-header.invalid-license{background:#FCF29B}.license-header.invalid-license a{color:#525450}.site-title{margin:0 0 0 .5rem;font-size:1rem;line-height:1rem;text-transform:uppercase}.site-title a{color:#FFF;text-decoration:none}.site-nav{display:flex;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;margin:0;padding:0;list-style:none}.site-nav__item a,.site-nav__item--active a{display:inline-block;margin:1rem .25rem;padding:.5rem;color:#F2F4F0;text-decoration:none;border-radius:.25rem}.site-nav__item a:focus,.site-nav__item a:hover,.site-nav__item--active a:focus,.site-nav__item--active a:hover{background:#DED9FF;color:#631B3A}.site-nav__item a.disabled,.site-nav__item--active a.disabled{color:#B75781;pointer-events:none;cursor:default}.site-nav__item--active a,.site-nav__item--active a.disabled,.site-nav__item--active a:focus,.site-nav__item--active a:hover{background:#DED9FF;color:#631B3A}::-webkit-input-placeholder{color:#A2A4A0}:-moz-placeholder{color:#A2A4A0}::-moz-placeholder{color:#A2A4A0}:-ms-input-placeholder{color:#A2A4A0}.container{clear:both;display:flex;-webkit-align-items:top;-ms-align-items:top;align-items:top;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-justify-content:space-between;-ms-justify-content:space-between;justify-content:space-between}.page-nav+.container{padding-top:1.5rem}.container-left{-moz-box-sizing:border-box;box-sizing:border-box;width:50%;padding:0 .75rem 0 0}.container-right{-moz-box-sizing:border-box;box-sizing:border-box;width:50%;padding:0 0 0 .75rem}.container-narrow{clear:both;width:600px;margin:0 auto}.block{margin:0 0 0 .5rem}.block .block-title{margin-left:0}.site-main{padding:1rem 3rem}.page-header{display:-webkit-flex;display:-ms-flex;display:flex;-webkit-align-items:center;-ms-align-items:center;align-items:center;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row;-webkit-justify-content:space-between;-ms-justify-content:space-between;justify-content:space-between;margin:0 0 1.5rem}.page-nav{margin:0;padding:1.5rem .5rem 1.5rem 0;list-style:none}.page-nav__item,.page-title{margin:0 0 0 .5rem}.page-header .page-nav{padding-top:0;padding-bottom:0}.page-nav__item{float:left}.page-nav__item a,.page-nav__item button,.page-nav__item input[type=submit]{display:inline-block;padding:.5rem;background:#FFF;color:#631B3A;border:1px solid #631B3A;border-radius:.25rem;cursor:pointer}.page-nav__item a:active,.page-nav__item button:active,.page-nav__item input[type=submit]:active{background:#631B3A;color:#FFF}.page-nav__item a.disabled,.page-nav__item a[disabled],.page-nav__item button.disabled,.page-nav__item button[disabled],.page-nav__item input[type=submit].disabled,.page-nav__item input[type=submit][disabled]{background:#F2F4F0;border-color:#E2E4E0;color:#E2E4E0;cursor:default}.page-nav__item a.highlight{background:#631B3A;color:#F2F4F0}.page-nav__item form{margin:0;padding:0}.page-nav__item input[type=text]{padding:.5rem;margin:0;background:#FFF;color:#525450;border:1px solid #E2E4E0;border-radius:.25rem;font-family:inherit;font-size:inherit;line-height:inherit}.code-read-only,tbody .table-subheading{background:#F2F4F0}.page-nav__item button{height:34px}.page-nav__item p{height:34px;margin-top:.5rem}.ace_editor,.login-height{height:100%}.table-subheading{color:#727470;font-weight:500}thead .table-subheading{border-top:1px solid #E2E4E0;font-style:italic}.table-indentedrow td:first-child{padding-left:1.5rem}.table-highlightred{color:#FF4A80}.table-queues td:first-child,.table-queues td:last-child,.table-queues th:first-child,.table-queues th:last-child{text-align:left}.table-projections td,.table-projections th{text-align:right}.table-projections td:first-child,.table-projections td:nth-child(2),.table-projections td:nth-child(3),.table-projections th:first-child,.table-projections th:nth-child(2),.table-projections th:nth-child(3){text-align:left}.table-collapsetoggle{float:right;font-weight:700}.table-meta{margin-bottom:1.5rem}.block-title{margin:.5rem 0 .5rem .5rem}.block-title:first-child{margin-top:0}.code-full{min-height:35rem}.code-half{min-height:16.333rem}.code-console{background:#435261;color:#F2F4F0;border:1px solid #435261}.form-table{width:100%;margin:-.5rem;padding:.5rem;background:#FCFCCF;border:none;font:inherit}.form-table--error{background:#FF4A80;color:#FFF}.new-projection-form tr td:first-child{width:15em}.edit-projection.maximized{width:100%}.ace_editor{min-height:400px;font-size:14px!important}.status{position:relative;top:2px;margin-right:5px;float:left;width:12px;height:12px;border-radius:12px;border:1px solid #000}.toast-container-modal{width:100%;height:100%;background:rgba(0,0,0,.4)}#toast-container.toast-container-modal.toast-bottom-full-width>div{position:absolute;bottom:35px;width:96%;left:2%}#toast-container.toast-bottom-full-width>div{position:relative;bottom:35px}li.page-nav__item.copy-icon-right{float:right;list-style:none;font-size:1.2rem;cursor:pointer}li.page-nav__item.copy-icon-right a{padding:0 .2rem}li.page-nav__item.copy-icon-right a.copied{color:#fff;background-color:#631B3A}.site-footer{padding:1.5rem 3rem 3rem;text-align:center}.site-footer p{margin:0}
\ No newline at end of file
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/favicon.png b/src/KurrentDB.ClusterNode.Web/clusternode-web/favicon.png
new file mode 100644
index 00000000000..0b03bd43a54
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/favicon.png differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/OFL.txt b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/OFL.txt
new file mode 100644
index 00000000000..4c90ac58685
--- /dev/null
+++ b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2022 The Spline Sans Mono Project Authors (https://github.com/SorkinType/SplineSansMono)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/fonts/SIL Open Font License.txt b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/SIL Open Font License.txt
similarity index 100%
rename from src/EventStore.ClusterNode.Web/clusternode-web/fonts/SIL Open Font License.txt
rename to src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/SIL Open Font License.txt
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/Solina-Bold.woff b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/Solina-Bold.woff
new file mode 100644
index 00000000000..83746eecdd1
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/Solina-Bold.woff differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/Solina-Bold.woff2 b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/Solina-Bold.woff2
new file mode 100644
index 00000000000..813770ef1b2
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/Solina-Bold.woff2 differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/Solina-Medium.woff b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/Solina-Medium.woff
new file mode 100644
index 00000000000..e9d8fc9b33e
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/Solina-Medium.woff differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/Solina-Medium.woff2 b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/Solina-Medium.woff2
new file mode 100644
index 00000000000..8598d1216ef
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/Solina-Medium.woff2 differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/Solina-Regular.woff b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/Solina-Regular.woff
new file mode 100644
index 00000000000..2753ec2fd2d
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/Solina-Regular.woff differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/Solina-Regular.woff2 b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/Solina-Regular.woff2
new file mode 100644
index 00000000000..29565392eed
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/Solina-Regular.woff2 differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/SplineSansMono-Bold.ttf b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/SplineSansMono-Bold.ttf
new file mode 100644
index 00000000000..63c5701557f
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/SplineSansMono-Bold.ttf differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/SplineSansMono-Regular.ttf b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/SplineSansMono-Regular.ttf
new file mode 100644
index 00000000000..8d76e4d5b8e
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/SplineSansMono-Regular.ttf differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-brands-400.eot b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-brands-400.eot
new file mode 100644
index 00000000000..41b4e1d531f
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-brands-400.eot differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-brands-400.svg b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-brands-400.svg
new file mode 100644
index 00000000000..039c2b88186
--- /dev/null
+++ b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-brands-400.svg
@@ -0,0 +1,1104 @@
+<?xml version="1.0" standalone="no"?> 
+<!--
+Font Awesome Free 5.0.13 by @fontawesome - https://fontawesome.com
+License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+-->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<defs>
+  <font id="fontawesome-free" horiz-adv-x="640.4">
+    <font-face font-family="Font Awesome 5 Brands"
+      units-per-em="512" ascent="448"
+      descent="64"
+      font-weight="400"
+      font-style="Regular" />
+    <missing-glyph horiz-adv-x="0" />
+    <glyph glyph-name="500px"
+      unicode="&#xF26E;"
+      horiz-adv-x="448" d=" M103.3 103.7C96.8 117.9 96.4 122 110.7 126.8C136.3 134.8 118.7 117.6 153.9 77.6H154.2V171.5C155.4 221.7 198.2 263.7 251.9000000000001 263.7C305.8 263.7 349.6 220.2 349.6 166.9C349.6 103.5 288.8 53.7 221.1 73.6C210.6 77.8 219 105.3 229.6 102.2C282.6 102.2 319 112.3 319 166.6C319 227.6 241.9 256.2000000000001 202.1 211.2C178.6 184.8 184.5 169.1 184.5 53.6C235.2 22.6 302.8 31.6 344.9 73.7000000000001C369.7 98.5000000000001 383.4 131.7000000000001 383.4 166.7000000000001C383.4 201.9 369.6 234.9000000000001 344.6 260.0000000000001C319.8 284.8000000000001 286.8 298.5000000000001 251.3 298.5000000000001S182.5 284.7000000000001 157.8 260.0000000000001C157.5 259.7000000000001 141.8 243.5000000000001 136.6 236.1000000000001L136.1 235.5000000000001C132.8 230.8000000000001 129.8 226.4000000000001 116 229.4000000000001C109.1 231.1000000000001 101.7 235.2000000000001 101.7 241.2000000000001V428C101.7 433 105.6 438.5 112.2 438.5H353.5C361.8 438.5 361.8 426.9 361.8 423.4C361.8 419.5 361.8 408.3 353.5 408.3H130.3V275.4H130.6C234.8 385.2 413.4000000000001 311.4 413.4000000000001 166.5C413.4000000000001 -11.6 168.6 -53.8 103.3 103.7zM166.6 364.5C166.1 360.3 171.2 340 181.2 343.9C306 391.4 384 303.5 390.6 303.5C395.4000000000001 303.5 413.4000000000001 318.8 404.9000000000001 326.3C311.7000000000001 415.3 170.4 383.3 166.6 364.5zM393 33.3C283 -76.6 94 -27.5 61 137.5C61 149.7 30.6 144.9 32.1 134.2C56.1 -39.2 278.1 -122.7 413.7000000000001 12.9C420.6 20.7 401.1 41.3 393.0000000000001 33.3zM213.6 141.4C213.6 137.4 217.9 134.1 219.1 132.9C222.1 129.9 225.2 128.5 227.6 128.5C231.4 128.5 230.2 128.3 249.9 148C269.5 128.7 269 128.5 272.2 128.5C277.6 128.5 290.7 138.9 282.9 146.7L265.6 164L283.8 182.2C290.1 189 273.7 204 267.6 197.9L249.7 180C231.1 198.8 231.3 199.5 228.2 199.5C223.2 199.5 210.2 187.8 215.8 182.2L234 164C215.9 146.1 213.6 144.8 213.6 141.4z" />
+    <glyph glyph-name="accessible-icon"
+      unicode="&#xF368;"
+      horiz-adv-x="448" d=" M423.9 192.2L411 34.9C407.7 -5.8 347.1 -0.2 350.4 39.8L360.4 162.3L319.3 160C329.4 139.3 335.1 116.1 335.1 91.4999999999999C335.1 50.3 319 12.8 292.8 -15.0000000000001L253.5 24.3C311.3999999999999 87.9999999999999 266.6 191.5 179.5 191.5C153.5999999999999 191.5 130 181.6 112.2999999999999 165.5L73 204.8C95 225.5 123.1 239.9 154.4 245L229.7 330.7L187.1 355.5L135.5 309.5C105.5 282.7 64.9 328 95 354.9L163 415.6C172.8 424.4000000000001 187.1 425.8 198.5 419.2C198.5 419.2 337.8 338.3 338 338.1C354.2 328 358.7 302.1 344.1 285.5L285.7 219L391.8 224.9C410.3 226 425.4 210.5 423.9 192.2zM359 346.2C387.1 346.2 409.9 369 409.9 397.1C409.9 425.2 387.1 448 359 448C330.9 448 308.1 425.2 308.1 397.1C308.1 369 330.9000000000001 346.2 359 346.2zM179.6 -8.5C99 -8.5 52.2 82.1 96.9 147.6L57.2 187.3C36.4 161 24 127.7 24 91.6C24 -39.1 174.7 -109.7999999999999 275.4 -30.9L235.7 8.8C219.7 -2.1 200.4 -8.5 179.6 -8.5z" />
+    <glyph glyph-name="accusoft"
+      unicode="&#xF369;"
+      horiz-adv-x="640" d=" M482.2 75.9C476.5 82.8 250 373 242.3 382.5C228.6 399.7 242.3 399.3 261.5 399.4C271.2 399.5 367.8 400 378 400C402.1 400.1 406.7 399.4 416.4 387.2C418.5 384.5 621.5 141.4 623.5999999999999 138.9C629.0999999999999 132.2 638.8 119.8 630.8 115.5C628.4 114.2 516.1999999999999 67.8 513 66.6C502.9 62.6 495.5 59.8 482.2 75.9M596.9 81.5000000000001S481.9 31.1000000000001 479.4 29.9C463.4 22.6 452.5 33.1 442.7 44.5000000000001L385.6 118.5000000000001C380.2 119.4 325.2 128.1000000000001 320.3 127.8000000000001C317.2 127.6000000000001 310.7 127.0000000000001 305.9 124.9000000000001C301 122.8000000000001 160.7 72.1000000000001 155.7 70.2000000000001C150.6 68.2000000000001 144.3 66.6000000000001 144.6 62.6000000000001C144.8 60.1000000000001 146.6 60.0000000000001 149.2 59.1000000000001C151.9 58.3000000000001 450.1 -8.4999999999999 457.2 -9.9999999999999C472.8 -13.2999999999999 495.7 -20.4999999999999 510.8 -11.6999999999999C512.9 -10.4999999999999 634.6 64.7000000000002 636.6 66.1000000000001C642 70.1000000000001 640.9 72.9000000000002 634.9 74.3000000000001C632.6 74.6000000000001 610.3 79.0000000000001 596.9 81.5000000000001M270.9 262.8000000000002S258.9 261.2000000000002 245.9 247.7000000000002C236.9 238.4000000000001 3.8 8.6000000000001 2.5 6.8000000000001C-4.5 -3.1999999999999 4.1 1e-13 18.2 5.1000000000001C19 5.1000000000001 132.7 41.7000000000002 132.7 41.7000000000002C133.2 42.3000000000002 132.6 41.8000000000002 133.3 42.3000000000002C132.9 47.4000000000002 132.5 68.5000000000002 132.3 70.0000000000002C131.7 75.2000000000002 134.5 76.9000000000002 139.3 78.9000000000002L231.9 112.7000000000002C232.5 113.5000000000002 320.4 194.4000000000002 322.1 196.0000000000002V197.0000000000002L270.9 262.8000000000002" />
+    <glyph glyph-name="adn"
+      unicode="&#xF170;"
+      horiz-adv-x="496" d=" M248 280.5L312.9 181.7H183.1L248 280.5zM496 192C496 55.1 384.9 -56 248 -56S0 55.1 0 192S111.1 440 248 440S496 328.9 496 192zM396.2 109.3L248 332.5L99.8 109.3H130.2L163.8 161H332.4L366 109.3H396.2z" />
+    <glyph glyph-name="adversal"
+      unicode="&#xF36A;"
+      horiz-adv-x="512" d=" M482.1 416H28.7C5.8 416 0 410.1 0 387.1V-3.1C0 -26.4 5.8 -32 28.7 -32H482.1C506.4999999999999 -32 511.9999999999999 -26.8 511.9999999999999 -2.3V385.8C511.9999999999999 410.4 506.6 416 482.1 416zM178.4 227.7C150.9 247.9 106.3 236.4 94.2 204.3C89.9 193.2 84.9 194.8 76.7 196C67 197.5 59.5 199.2 54.2 201.5C25.4 212.9 62.8 256.8 79.1 265.8C120.2 287.2 162.5 288 204.4 270.6C245.3 253.8 238.9 211.4 238.9 142.1C241.6 116.3 234.6 83.8 248.2 53.3C250.1 48.9 248.6 45.4 245.5 42.6C237.1 35.9 206.2 40.4 198.9 49.9999999999999C197 52.1999999999999 197.1 53.6 195 56.1999999999999C191.4 60.0999999999999 187.7 58.3999999999999 183.1 55.1999999999999C125.7 18.8 42.8 33.8 36.1 98.4999999999999C33 127.8 48.5 155.6 75.7 169.5C113.9 189 187.9 181.3 189.7 200.4C190.8 210.5999999999999 187.8 220.5 178.4 227.7zM465.1 5.7C465.1 -9.4 454 -4.2 447.3 -4.2H52.4C45 -4.2 34.2 -9 34.6 6.5C35 20.4 45.1 15.6 51.7 15.6C184 16 316.2 16 448.5 15.6C455.3 15.6 465.1 20 465.1 5.7zM468.9 346.2V55.2C468.9 49.5 468.2 41.3 460.8 41.3C448.4000000000001 41.7 433.3 34.2 424.7 46.9C418.9 55.6 416.9 50.9 412.3 48.1C358.9000000000001 18.4 284.2000000000001 41 267.9 133.3C261.8 166.7 267.2 200.4 283.6 233.3C295.4 257.2000000000001 340.5 309.4 419.7 263.8V334.8C419.7 361 419.5999999999999 361 445.7 361C448.8 361 452.3 360.6 455.3999999999999 361C465.4999999999999 361.8 468.9999999999999 356.6 468.9999999999999 346.7000000000001C468.8999999999999 346.5 468.8999999999999 346.4000000000001 468.8999999999999 346.2000000000001zM417.4000000000001 113.9C397.9000000000001 66.3 344.5 70.6 327.4000000000001 108.7C312.3 142 311.9000000000001 176.9 327.8 210.2C344.1 244.3 387.5 245.9 409.3 215C429.9000000000001 186.2 424.2 130.4 417.4000000000001 113.9zM122.6 78.6C115.1 79.9 89.6 81.9 88.9 106.4C88.5 120.3 96.7 129.4 108.7 132.2C133.1 138.1 158 142.1 182.4 146.9C191.3000000000001 148.9 189.8000000000001 142.5 190.2000000000001 137.4C191.6000000000001 104.4 164.1000000000001 78.2 122.6000000000001 78.6z" />
+    <glyph glyph-name="affiliatetheme"
+      unicode="&#xF36B;"
+      horiz-adv-x="512" d=" M159.7 210.6C108.4 139.7 43.1 99.8 14 121.4C-15.2 143.1 2.8 218 54.2 288.9C105.5 359.8 170.8 399.7 199.9 378.1C229 356.5 211 281.5 159.7 210.6zM510.9 267.9C437.1 144.5 319 80.2 246.4 124.3C221.4 139.5 205.1 165.5 197.4 198.1C163.8 133.3 104.6 84.3 33.3 64.9C83.1 5.6 157.4 -32 240.3 -32C390.3 -32 511.9 91.1 511.9 242.9C512 251.4 511.6 259.7 510.9 267.9z" />
+    <glyph glyph-name="algolia"
+      unicode="&#xF36C;"
+      horiz-adv-x="448" d=" M229.3 265.4C180 265.4 140.1 225.5 140.1 176.2C140.1 126.9 180 87 229.3 87S318.5 126.9 318.5 176.2C318.5 225.5 278.5 265.4 229.3 265.4zM292 208.8L233.1 178.2C231.3 177.3 229.3 178.6 229.3 180.5V247C229.3 248.5 230.6 249.7 232 249.6C258.2 248.6 280.9 233.9 293.1 212.5C293.8 211.2 293.3 209.5 292 208.8zM389.1 416H58.9C26.4 416 0 389.6 0 357.1V27C0 -5.6 26.4 -32 58.9 -32H389C421.6 -32 447.9 -5.6 447.9 26.9V357.1C448 389.6 421.6 416 389.1 416zM186.5 331.3C186.5 342.1 195.2 350.8 206 350.8H251.3C262.1 350.8 270.8 342.1 270.8 331.3V315.9C270.8 314.1 269.1 312.9 267.5 313.4C255.2 316.8 242.4 318.5 229.4 318.5C215.9 318.5 202.7 316.7 190 313C188.3 312.5 186.6 313.8 186.6 315.5V331.3zM102.1 294.3L111.3 303.5C118.9 311.1 131.2 311.1 138.8 303.5L146.5 295.8C147.6 294.7000000000001 147.5 292.8 146.2 291.8C140 287.3 134.1 282.4 128.6 276.9C123.2 271.5 118.2 265.6 113.8 259.5C112.8 258.2 110.9 258 109.8 259.2L102.1 266.9C94.5 274.4 94.5 286.7 102.1 294.3zM229.3 49.5C159.3 49.5 102.7 106.2 102.7 176.1S159.4 302.7000000000001 229.3 302.7000000000001C299.3 302.7000000000001 355.9 246.1 355.9 176.1C355.9 106.3 299.2 49.5 229.3 49.5z" />
+    <glyph glyph-name="amazon-pay"
+      unicode="&#xF42C;"
+      horiz-adv-x="611.2" d=" M0 122.8C2.3 127 5.2 127.7 9.7 125.3C20.1 119.7 30.3 113.9 40.9 108.6C81.6 88.2000000000001 124.1 73 168.3 62.3C189.2 57.3 210.2 53.3 231.5 50.5C263 46.3 294.7 44.5 326.5 45.3C343.9 45.7 361.3 47.1 378.6 49.1C435 55.8 489.5 69.9 541.9000000000001 91.9C544.8000000000001 93.1 547.8000000000001 93.9 551.0000000000001 93.1C557.7000000000002 91.3 560.0000000000001 84.1 555.1000000000001 79.2000000000001C552.3000000000002 76.4 548.8000000000002 74.1 545.5000000000001 71.8000000000001C514.8000000000001 50.7 481.3000000000001 35.4000000000001 445.9000000000001 23.9000000000001C421.3000000000001 16.0000000000001 396.3000000000001 10.1000000000001 370.8000000000001 6.3000000000001C353.2000000000001 3.7 335.4000000000001 1.9000000000001 317.6000000000001 1.5000000000001C316.8000000000001 1.5000000000001 315.9000000000001 1.3000000000001 315.1000000000001 1.2H294C293.2 1.3000000000001 292.3 1.5000000000001 291.5 1.5000000000001C287.9 1.7 284.3 1.8000000000001 280.8 1.9C263.9000000000001 2.6 247.1 4.5000000000001 230.4 7.2C203 11.7 176.2 18.6 150 28.1C95.9 47.7 47.4 76.7000000000001 4.4 115.1C2.6 116.7000000000001 1.4 118.9 0 120.8V122.8zM158 383C156.6 382.8 155.1 382.6 153.7 382.4C139.7 380.7 127.1 375.5 115.7 367.3C113.3 365.6 111.1 363.8 108.6 361.9C108.4 362.4 108.2 362.9 108.2 363.3C107.8 366 107.4 368.8 106.9 371.5C106.2 376.1 103.9 378.1 99.3 378.1H87.8C80.9 378.1 79.6 376.8 79.6 369.9V160.6C79.6 159.6 79.6 158.6 79.7 157.6C79.9 154.6 81.7 152.7000000000001 84.6 152.6C91.6 152.5 98.7 152.5 105.7 152.6C108.6 152.6 110.4 154.6 110.7 157.6C110.8 158.6 110.8 159.6 110.8 160.6V233C111.9 232.1 112.5 231.6 113 231.1C130.9 216.2 151.5 211.3 174 215.7C194.4 219.7 208.6 232.2 217.8 250.6C224.8 264.5 227.7 279.3 228.1 294.7C228.6 311.8 226.9000000000001 328.6 220 344.5C211.5 364.1 197.4 377 176.1 381.4C172.9 382.1 169.6 382.4 166.3 382.9C163.5 383 160.8 383 158 383zM110.6 341.1C110.6 342.6 111 343.5 112.3 344.4C126 353.9 141.1 358.9 157.9 357.6C172.8 356.5 185 349.2 191.4 331.7C195.3 321 196.3 309.9 196.3 298.7C196.3 288.3 195.5 278.1 192.3 268.1C185.5 246.8 169.9 238.7 149.7 239.6C135.7 240.2 123.5 245.6 112.3 253.5C111.1 254.4 110.6 255.2 110.6 256.8C110.7 270.9 110.6 284.9 110.6 299C110.6 313 110.7 327 110.6 341.1zM316.3 383C315.3 382.9 314.3 382.7 313.4000000000001 382.6C303.6 382.1 294.0000000000001 380.9 284.5000000000001 378.5C278.4000000000001 376.9 272.5000000000001 374.7 266.6000000000001 372.7C263.0000000000001 371.5 261.2000000000001 368.9 261.3000000000001 365C261.4000000000001 361.7 261.2000000000001 358.4 261.3000000000001 355.1C261.4000000000001 350.3 263.4000000000001 349 268.1000000000001 350.2C275.9000000000001 352.2 283.7000000000001 354.4 291.6000000000001 355.9C303.9000000000001 358.2 316.3000000000001 359.2 328.8000000000001 357.3C335.3000000000001 356.3 341.4000000000001 354.4 345.6000000000001 348.9C349.3000000000001 344.1 350.7000000000001 338.4 350.9000000000001 332.5C351.2000000000001 324.2 351.1000000000001 315.9 351.2000000000001 307.6C351.2000000000001 307.2 351.1000000000001 306.7 351.0000000000001 306.2C350.5000000000001 306.3 350.1000000000002 306.2 349.7000000000001 306.3C339.2000000000001 308.8 328.6000000000001 310.6 317.7000000000001 311.2C306.4000000000001 311.8 295.2000000000001 311.1 284.4000000000001 307.3C271.5000000000001 302.8 261.1000000000001 295 255.0000000000001 282.4C250.3000000000001 272.6 249.6000000000001 262.2 251.1000000000001 251.7C253.1000000000001 237.7 260.1000000000001 226.9 272.5000000000001 220C284.4000000000001 213.4 297.3000000000001 212.6 310.4000000000001 214.6C325.5000000000001 216.9 338.9000000000001 223.3 350.7000000000001 233C351.1 233.4 351.6 233.7 352.3000000000001 234.1C352.9000000000001 230.3 353.4000000000001 226.7 354.1000000000001 223.1C354.7000000000001 220 356.6000000000001 218 359.5000000000001 217.9C364.9000000000001 217.8 370.4000000000001 217.8 375.8000000000001 217.9C378.5000000000001 218 380.3000000000001 219.8 380.6000000000001 222.6C380.7000000000001 223.5 380.7000000000001 224.5 380.7000000000001 225.4V331.4C380.7000000000001 335.7 380.5000000000001 340 379.8000000000002 344.3C377.9000000000002 357.2000000000001 372.4000000000002 367.8 360.8000000000002 374.7000000000001C354.1000000000002 378.7000000000001 346.7000000000001 380.7000000000001 339.0000000000001 381.8C335.4000000000001 382.3 331.8000000000002 382.6 328.2000000000001 383.1C324.3000000000002 383 320.3000000000002 383 316.3000000000002 383zM351.3 255.3C351.3 254 350.9000000000001 253.1 349.8 252.3C338.6 244.2 326.3 238.8 312.4000000000001 237.4C306.7000000000001 236.8 301.0000000000001 237 295.6 239.2C289.3 241.7 285.2000000000001 246.1 283.2000000000001 252.5000000000001S281.2000000000001 265.5 283.1 271.9000000000001C285.6 280.2000000000001 291.5 284.9000000000001 299.5 287.5C307.6 290.1 316 290.5 324.3 289.7000000000001C332.7 289 340.9000000000001 287.4 349.3 286.3C350.9000000000001 286.1 351.4000000000001 285.3 351.4000000000001 283.7000000000001C351.3 278.9 351.4000000000001 274.2000000000001 351.4000000000001 269.4C351.3 264.7000000000001 351.2000000000001 260 351.3 255.3zM611.2 125.9C610.2 130.9 606.4000000000001 132.8 602.1 134.2C595.3000000000001 136.5 588.2 137.5 581.1 138.1C568 139.2 554.9 138.6 541.9 136.2C527.6 133.5 514 128.9 501.9 120.6C500.5 119.6 499.1 118.5 498.2 117.1C497.5 116 497.3 114.3 497.7 113.1C498.1 111.6 499.8 111.2 501.3 111.3C502 111.3 502.8 111.3 503.5 111.4C511.3 112.2 519 113.1 526.8 113.9C538.1999999999999 115 549.6999999999999 115.7 561.0999999999999 114.8C565.8999999999999 114.5 570.8 113.4 575.4999999999999 112.1C580.5999999999999 110.7 582.8999999999999 106.9 583.0999999999999 101.7C583.4999999999999 93.7 581.6999999999999 86 579.5999999999999 78.4C575.4999999999999 63 569.5999999999999 48.1 563.8 33.3C563.4 32.3 563 31.3 562.8 30.3C562.3 27.4 564 25.4999999999999 566.9 26.1999999999999C568.6 26.5999999999999 570.5 27.4999999999999 571.6999999999999 28.6999999999999C576.0999999999999 32.9999999999999 580.5999999999999 37.3 584.4 42.0999999999999C597.1999999999999 58.4999999999999 604.6999999999999 77.3999999999999 609.1 97.6999999999999C609.9 101.3 610.5 104.9999999999999 611.2 108.5999999999999V125.8999999999999zM479.1 249.1C466.2 284.8 453.3 320.6 440.4000000000001 356.3C438.4000000000001 362 436.2000000000001 367.6 434.1 373.2C433 376.1 430.9000000000001 378 427.7000000000001 378C420.1 378.1 412.5000000000001 378.2 404.8000000000001 378.1C402.3000000000001 378.1 401.1000000000001 376.1 401.6000000000001 373.6C402.1000000000001 371.5 402.7000000000001 369.5 403.5000000000001 367.5C423.1000000000001 319 442.8000000000001 270.4 462.6000000000001 222C464.3000000000001 217.9 464.7000000000001 214.4 462.8000000000001 210.2C459.5000000000001 202.9 456.9000000000001 195.2 453.5000000000001 187.9C450.5000000000001 181.4 445.5000000000001 176.5 438.3000000000001 174.6C433.2000000000001 173.2 428.1000000000001 173 422.9000000000001 173.5C420.4000000000001 173.6999999999999 417.9000000000001 174.3 415.4000000000001 174.5C412.0000000000001 174.6999999999999 410.3000000000001 173.1999999999999 410.2000000000001 169.6999999999999C410.1000000000001 166.3999999999999 410.1000000000001 163.0999999999999 410.2000000000001 159.8C410.3000000000002 154.3 412.2000000000001 151.8 417.6000000000001 150.9C423.2000000000001 149.9 428.9000000000001 149 434.5000000000001 148.9C451.6000000000001 148.5 465.2 155.4 474.0000000000001 170.3C477.5000000000001 176.1999999999999 480.7 182.4 483.2 188.6999999999999C506.9 248.5 530.3000000000001 308.3999999999999 553.8000000000001 368.3C554.5000000000001 370.0999999999999 555.1 371.8999999999999 555.4000000000001 373.8C555.8000000000001 376.5999999999999 554.5000000000001 378.2 551.7 378.2C545.1 378.3 538.4000000000001 378.2 531.8000000000001 378.2C528.1 378.2 525.5000000000001 376.5999999999999 524.1 373C523.6 371.5999999999999 523 370.3 522.5 368.8999999999999C510.9 335.5999999999999 499.3 302.3 487.7 268.8999999999999C485.2 261.7 482.6 254.3999999999999 480 246.7C479.6 247.8 479.4 248.3999999999999 479.1 249.1z" />
+    <glyph glyph-name="amazon"
+      unicode="&#xF270;"
+      horiz-adv-x="448" d=" M257.2 285.3C208.5 283.5 87.7 269.8 87.7 167.8C87.7 58.3 226 53.8 271.2 124.6C277.7 114.4 306.6 87.1 316.5 77.8L373.3 133.8S341 159.1 341 186.6V333.7C341 359 316.5 416 228.7 416C140.7 416 94 361 94 311.7L167.5 304.9C183.8 354.4 221.7 354.4 221.7 354.4C262.4 354.5 257.2 324.6 257.2 285.3zM257.2 198.5C257.2 118.5 173 130.5 173 181.3C173 228.5 223.5 238 257.2 239.1V198.5zM393.2 35C385.5 25 323.2 -32 218.7 -32S34.2 39.5 9.7 69C2.9 76.7 10.7 80.3 15.2 77.3C88.5 32.8 203 -40.5 387.7 47C395.2 50.7 401 45 393.2 35zM433 32.8C426.5 17 417 6 411.8 1.8C406.3 -2.7 402.3 -0.9 405.3 5.6S424.6 52.1 418 60.6C411.5 68.9 381 64.9 370 63.8C359.2 62.8 357 61.8 356 64.1C353.7 69.8 377.7 79.6 393.5 81.6C409.2 83.4 434.5 82.4 439.5 75.9C443.2 70.8 439.5 48.8 433 32.8z" />
+    <glyph glyph-name="amilia"
+      unicode="&#xF36D;"
+      horiz-adv-x="448" d=" M240.1 416C178.2 416 108.6 399.1 55.9 360.6C50.8 357.5 46.8 351.4 48.7 341.2C49.8 336.1 53.8 313.8 58.9 301.6C63 291.4 73.1 291.4 79.2 295.5C111.7 317.8 175.7 343.2 231.5 343.2C289.4 343.2 290.4 314.8 290.4 270.1V231.6C203 220.3 78.2 197 46.7 183.8C11.2 167.5 16.3 90.3 16.3 72S31.5 -32 141.2 -32C189 -32 254.9000000000001 -11.3 294.5 10.1V-15.3C294.5 -18.3 296.6 -23.4999999999999 300.6 -24.4C303.7000000000001 -25.4 351.3 -26.4 360.5 -26.4S423 -26.7 427 -25.7C431.1 -24.7 432.1 -19.6 432.1 -16.6V280C432 360.3 374.2000000000001 416 240.1 416zM152.2 88.3C152.2 100.5 149.2 131 170.5 141.2C194.8 154.4 245.6 170.6 290.3 174.7V68C268.9000000000001 54.8 241.6 43.6 211.2 43.6C158.4 43.6 152.3 77.1 152.2 88.3" />
+    <glyph glyph-name="android"
+      unicode="&#xF17B;"
+      horiz-adv-x="448" d=" M89.6 243.5V127.7C89.6 112.3 77.5 100 62.1 100C46.8 100 32 112.4 32 127.7V243.5C32 258.6 46.8 271 62.1 271C77.2 271 89.6 258.6 89.6 243.5zM100.4 86.5C100.4 70.1 113.6 56.9 130 56.9H149.9L150.2 -4.2C150.2 -41.1 205.4 -40.8000000000001 205.4 -4.2V56.9H242.6V-4.2C242.6 -40.9 298.1 -41.0000000000001 298.1 -4.2V56.9H318.3C334.5 56.9 347.7 70.1 347.7 86.5V265.9H100.4V86.5zM348.4 275.6H99.3C99.3 318.4 124.9 355.6 162.9 375L143.8 410.3C141 415.2 148.1 418.3 150.5 414.1L169.9 378.5C204.8 394 244.9 393.2 278.2 378.5L297.5 414C300 418.3 307 415.1 304.2 410.2L285.1 375C322.8 355.6 348.4000000000001 318.4 348.4000000000001 275.6zM177.7 331.1C177.7 336.8 173.1 341.6 167.2 341.6C161.5 341.6 157 336.8 157 331.1S161.6 320.6 167.2 320.6C173.1 320.6 177.7 325.4 177.7 331.1zM291.1 331.1C291.1 336.8 286.5 341.6 280.9000000000001 341.6C275.0000000000001 341.6 270.4000000000001 336.8 270.4000000000001 331.1S275.0000000000001 320.6 280.9000000000001 320.6C286.5000000000001 320.6 291.1 325.4 291.1 331.1zM385.9000000000001 271C370.8 271 358.4000000000001 258.9 358.4000000000001 243.5V127.7C358.4000000000001 112.3 370.8 100 385.9000000000001 100C401.3 100 416.0000000000001 112.4 416.0000000000001 127.7V243.5C416.0000000000001 258.9 401.2000000000001 271 385.9000000000001 271z" />
+    <glyph glyph-name="angellist"
+      unicode="&#xF209;"
+      horiz-adv-x="448" d=" M347.1 232.6C358.8 265.2 392.5 359.5 392.5 389.7C392.5 416.3 376.8 438.6 348.8 438.6C304.2 438.6 264.2000000000001 306.9 251.7 275.5C242 304 196.6 448 156.6 448C125.5 448 110.9 425.1 110.9 396.3C110.9 361 145.1 269.5 157.5 234.3C151.2 236.6 144.4 238.6 137.5 238.6C114.1 238.6 89.2 209.5 89.2 186C89.2 177.1 94.1 164.6 97.2 156.3C60.3 146.3 46.1 121.7 46.1 84.6C46 12.4 114.4 -64 210.6 -64C328.6 -64 402 24.6 402 138.9C402 182 395.1 220.9 347.1 232.6zM311.7 340C315.7 352.3 332.8 404.3 348.8 404.3C357.4000000000001 404.3 359.7 395.4 359.7 388.3C359.7 369.2 321.1 263.7 312.6 240.3L278.6 246.3L311.7 340zM142.3 399.7C142.3 411.6 156.8 445.4 188.6 352.6L223.2 252.3C207.6 253.6 195.5 255.3 187.8 250.9C176.9 279.7000000000001 142.3 370.6 142.3 399.7000000000001zM140 204C169.3 204 207.1 109.4 207.1 96.6C207.1 91.5 202.2 85.2000000000001 196.5 85.2000000000001C175.6 85.2000000000001 119.6 162.1 119.6 182.9C119.7 190.6 132.3 204 140 204zM324.3 17.7C295.2 -14.3 258 -30.9 214.6 -30.9C155.2 -30.9 108.3 1.7 85.7 57.4C68.6 100.8 89.5 125.7 106.3 125.7C117.7 125.7 160.6 65.4 160.6 52.6C160.6 47.7 152.9 44.3 148.9 44.3C132.8000000000001 44.3 126.5 59.8 97.8 95.7C68.1 66 118.3000000000001 8.8 156.1 8.8C182.2 8.8 199.2 32.9999999999999 194.1 50.8C197.8 50.8 202.4 50.4999999999999 205.8 51.4C206.9 24.3 214.9 -8 247.5 -10.3C247.5 -9.4 249.5 -3.2 249.5 -2.9C249.5 14.4999999999999 238.9 29.7 238.9 47.4C238.9 75.7 260.6 103.1 282.6 119.1C290.6 125.1 300.3 128.8 309.7000000000001 132.2C319.4000000000001 135.9 329.7000000000001 140.2 337.1 147.6C336 158.8 331.4000000000001 168.7 320.2000000000001 168.7C292.5000000000001 168.7 199.6000000000001 164.7 199.6000000000001 208.4C199.6000000000001 215.1 199.7000000000001 221.5 217.0000000000001 221.5C249.3000000000001 221.5 331.3000000000001 213.5 355.3000000000001 192.4C373.4000000000001 176.3 379.6000000000001 79.2 324.3000000000001 17.7zM225.7 143.7C235.4 140.6 245.4 139.7 255.4 137.7C248 132.3 241.4 125.7 235.1 118.6C232.3 127.1 228.9 135.4 225.7 143.7z" />
+    <glyph glyph-name="angrycreative"
+      unicode="&#xF36E;"
+      horiz-adv-x="640" d=" M640 209.8L636.8 181.6L602.3 179.3L600.3 161.2L634.8 163.5L631.5999999999999 135.3L597.1999999999999 133.1L594.9 113L629.3 115.2L626.3 89.1L561.5999999999999 84.9999999999999L574.3 198.1999999999999L527 82.8L495.1 80.8L471.3 198.6L501.6 200.6L515.2 121.2000000000001L546.9000000000001 203.6000000000001L640.0000000000001 209.8000000000001zM426.8 76.5L455.1 78.3L468 198.4L439.6 196.5L426.8 76.5zM162 59.9L142.6 95.9L139.1 58.5L110.9 56.8L113.6 85.9C102.6 67.9 81.6 51.6 56.7 50.1C23.9 48.1 -3 71 0.3 108.3C2.9 137.6 27 171.1 67.8 173.7000000000001C105.5 176.1 115.4 150.5000000000001 119.1 144.9L121.9 175.7000000000001L160.8 178.2000000000001C180.9 179.5000000000001 199.5 174.5000000000001 203.3 154.5000000000001L205.9 181.1000000000001L270.7 185.3000000000001L268 157.4000000000001L231.6 155.0000000000001L229.9 137.1000000000001L266.3 139.4000000000002L263.6 111.5000000000002L227.2 109.2000000000002L225.3 89.3000000000002L261.6 91.6000000000002L259.5 70.8000000000002L314.5 188.0000000000002L338.3 189.6000000000002L370.4 79L379.3 164.6L357 163.2000000000001L359.8999999999999 191.1L434.8999999999999 196L431.8999999999999 168L407.5999999999999 166.4L397.8999999999999 74.5L339.8999999999999 70.8L335.5999999999999 86.4L296.2 83.9L288.2 67.6L162 59.9zM117.7 130.1L91.3 128.4C84.6 140.8 76.9 145 65 144.2C46 143 31.7 126.7 30.4 110.9C29 94.9 37.7 78.4 59.1 79.7C71.9 80.5 80.4 88.3 88 98.6L115 100.3L117.7 130.1zM173.8 137.8C175 150.6999999999999 166.2 151.4 147.7 150.1999999999999L145 121.6999999999999C159.2 122.5999999999999 172.5 123.8 173.8000000000001 137.8zM194.9 66.9999999999999L200.7 127C195.7 113.5 186 105.8999999999999 172.8 100.3999999999999L194.9 66.9999999999999zM330.3 111.9999999999999L322.4000000000001 149.8L306.6 110.4999999999999L330.3 111.9999999999999zM160.2 186.5999999999999L155.9 204.0999999999999L116.3 201.4999999999999L108.2 183.2999999999999L76.3 181.1999999999999L133.3 303.0999999999999L157.2 304.6999999999999L187.9 202.6999999999999L197.8 307.3999999999999L224.8 309.1999999999999L262.6 245.5999999999999L269.1 312.1999999999999L297.6 314.0999999999999L293.6 272.8999999999999C301 286.3999999999999 316.5 317.5999999999999 357.2000000000001 320.3999999999999C397.7000000000001 323.1999999999999 409.6 291.0999999999999 410.6 290.0999999999999L413.9000000000001 322.0999999999999L453.2 324.7999999999999C465.9 325.6999999999999 481.0000000000001 324.4999999999999 489.5000000000001 315.0999999999999L485.1000000000001 326.9999999999999L517.3000000000001 329.1999999999999L530.2 285.9999999999999L553.2 331.6999999999999L584.2 333.8999999999999L540.6 255.4999999999999L535.8000000000001 211.1999999999999L507.4000000000001 209.2999999999999L512.2 253.5999999999999L496.4 296.5999999999999C497.4 274.2999999999999 487.2 256.4999999999999 464.4 246.9999999999999L489.6 208.1999999999999L453.2 205.7999999999999L434.0000000000001 242.5999999999999L430.0000000000001 204.2999999999999L401.6000000000001 202.3999999999998L404.9000000000001 233.8999999999999C398.2000000000001 224.5999999999998 385.2000000000001 198.4999999999998 345.3000000000001 195.8999999999998C319.1000000000001 194.1999999999999 299.7000000000001 206.1999999999999 289.9000000000001 235.0999999999999L285.9000000000001 194.7999999999999L260.9000000000001 193.1999999999999L223.3000000000001 256.4999999999999L217.0000000000001 190.2999999999999L160.2000000000001 186.5999999999999zM436.8000000000001 268.7C447.0000000000001 269.3999999999999 454.3000000000001 270.7999999999999 458.4000000000001 272.9999999999999C462.9000000000001 275.3999999999999 465.4000000000001 279.3999999999999 466.0000000000001 285.0999999999999C466.6000000000001 290.3999999999999 465.4000000000001 293.8999999999999 462.6000000000001 295.4999999999999C459.0000000000001 297.5999999999999 452.0000000000001 298.3 439.7000000000002 297.4999999999999L436.8000000000002 268.7zM327.7 234C333.3 228.1 340.4 225.5 349 226.1C353.7 226.4 358.1 227.9 362.3 230.2C367.8 233.2 372.9000000000001 238.2 377.4000000000001 244.5L343.2000000000001 242.2L345.6 266.1L408.7000000000001 270.4L409.9000000000001 282.4L378.7000000000001 280.3C374.6 284 370.9000000000001 286.9 367.6 288.4C363.6 290.1 359.5 291.2000000000001 355.4000000000001 290.9C347.4000000000001 290.4 340.1 287.3 333.4000000000001 281.7000000000001C325.7000000000001 275.3 321.4000000000001 267.2000000000001 320.5000000000001 257.3C319.4000000000001 247.7 321.9000000000001 240 327.7000000000001 234zM126.4 225.8L150.2 227.4L141.9 265L126.4 225.8z" />
+    <glyph glyph-name="angular"
+      unicode="&#xF420;"
+      horiz-adv-x="415.6" d=" M169.7 179.9H245.9L207.8 271.5L169.7 179.9zM207.8 416L0 341.6L31.8 65.9L207.8 -32L383.8 65.9L415.6 341.6L207.8 416zM338 74.2H289.4L263.2 139.6H152.6L126.4 74.2000000000001H77.7L207.8 366.5L338 74.2z" />
+    <glyph glyph-name="app-store-ios"
+      unicode="&#xF370;"
+      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM127 63.5C121.5 53.9 109.2 50.7 99.7 56.2C90.1 61.7 86.9 74 92.4 83.5L106.7 108.2C122.8 113.1 136 109.3 146.3 96.8L127 63.5zM265.9 117.4H84C73 117.4 64 126.4 64 137.4S73 157.4 84 157.4H135L200.4 270.6L179.9 306C174.4 315.6 177.7 327.8 187.2 333.3C196.8 338.8 209 335.5 214.5 326L223.4 310.6L232.3000000000001 326C237.8000000000001 335.6 250.1000000000001 338.8 259.6 333.3C269.2000000000001 327.8 272.4000000000001 315.5 266.9000000000001 306L181.1 157.4H243.2C263.4000000000001 157.4 274.7000000000001 133.7 265.9000000000001 117.4zM364 117.4H335L354.6 83.5C360.1 73.9 356.8 61.7 347.3 56.2C337.7 50.7 325.5 54 320 63.5C287.1 120.4 262.5 163.2 246 191.6C229.3 220.6 241.2 249.6 253.1 259.4000000000001C266.2 236.7000000000001 285.8 202.7000000000001 312 157.4H364C375 157.4 384 148.4 384 137.4C384 126.3 375 117.4 364 117.4z" />
+    <glyph glyph-name="app-store"
+      unicode="&#xF36F;"
+      horiz-adv-x="512" d=" M255.9 327.1L265 342.8C270.6 352.6 283.1 355.9 292.9 350.3C302.7 344.7 306 332.2 300.4 322.4L212.9 170.9H276.2C296.7 170.9 308.2 146.8 299.3 130.1H113.8C102.5 130.1 93.4 139.2 93.4 150.5C93.4 161.8 102.5 170.8999999999999 113.8 170.8999999999999H165.8L232.4 286.3L211.6 322.3999999999999C206 332.2 209.3 344.5999999999999 219.1 350.3C228.9 355.8999999999999 241.3 352.5999999999999 247 342.8L255.9 327.0999999999999zM177.2 109.1L157.6 75.1C152 65.3 139.5 62 129.7 67.6C119.9 73.2000000000001 116.6 85.7000000000001 122.2 95.5L136.8 120.7C153.2 125.8 166.6 121.9 177.2 109.1zM346.1 170.8H399.2000000000001C410.5000000000001 170.8 419.6 161.7 419.6 150.4C419.6 139.1 410.5 130.0000000000001 399.2000000000001 130.0000000000001H369.7000000000001L389.6 95.5000000000001C395.2000000000001 85.7000000000001 391.9000000000001 73.3000000000001 382.1 67.6000000000001C372.3 62.0000000000001 359.9000000000001 65.3000000000001 354.2000000000001 75.1000000000001C320.7000000000001 133.2000000000001 295.5000000000001 176.7000000000001 278.8000000000001 205.7000000000001C261.7000000000001 235.2000000000001 273.9000000000001 264.8000000000001 286.0000000000001 274.8000000000001C299.4000000000001 251.8000000000001 319.4000000000001 217.1000000000001 346.1000000000001 170.8000000000001zM256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM472 192C472 73.3 375.9 -24 256 -24C137.3 -24 40 72.1 40 192C40 310.7 136.1 408 256 408C374.7 408 472 311.9 472 192z" />
+    <glyph glyph-name="apper"
+      unicode="&#xF371;"
+      horiz-adv-x="640" d=" M42.1 208.9C64.3 208.9 71.1 206.1 75.6 194.3H76.4V217.2C76.4 228.5000000000001 71.6 232.6 58.5 232.6C47.2 232.6 44.1 230.1 43.4 219.8H4.8C5.1 233.7 6.3 238.9 10.6 244.2C17.9 253 29.5 256 56.7 256C89.7 256 103.8 251 110.6 237.1C112.6 232.8 114.6 221.5 114.6 213.4V137.1H76.3L77.6 156.2000000000001H76.6C71.3 140.6 63 135.8000000000001 41.1 135.8000000000001C10.8 135.8000000000001 0 145.9000000000001 0 173.1000000000001C0 198.3000000000001 12.3 208.9000000000001 42.1 208.9000000000001zM59.2 160.8C72.3 160.8 76.1 163.8 76.1 174.2C76.1 183.3 71.8 185.8 56.5 185.8C43.4 185.8 38.6 182.8 38.6 173.7C38.5 163.3 42.3 160.8 59.2 160.8zM137 255.7H175.3L173.8 235.1H174.6C183.7 252.2 190.5 256 212.1 256C226.5000000000001 256 236.8 253.0000000000001 243.6 246.9000000000001C253.4000000000001 238.3000000000001 256.4000000000001 226.5000000000001 256.4000000000001 198.8000000000001C256.4000000000001 168.8000000000001 253.4000000000001 155.7000000000001 244.3000000000001 145.9C237.5000000000001 138.6 227.9000000000001 135.8 211.1 135.8C190.7 135.8 181.9 141.3 177.3 157H176.5V86.7H137V255.7zM217.9 195C217.9 222.5 214.6 227.5 197.2 227.5C180.3 227.5 176.5 222.5 176.5 198.8C176.5 170.8 180 165.3 197.7 165.3C214.1 165.3 217.9 170.9 217.9 195zM275.8 255.7H314.1L312.6 235.1H313.4000000000001C322.5000000000001 252.2 329.3 256 350.9000000000001 256C365.3 256 375.6 253 382.4000000000001 246.9C392.2000000000001 238.3 395.2000000000001 226.5 395.2000000000001 198.8C395.2000000000001 168.8 392.2000000000001 155.7 383.1 145.9C376.3 138.6 366.7000000000001 135.8 349.8 135.8C329.4000000000001 135.8 320.6 141.3 316 157H315.2V86.7H275.7V255.7zM356.7000000000001 195C356.7000000000001 222.5 353.4000000000001 227.5 336.0000000000001 227.5C319.1000000000001 227.5 315.3000000000001 222.5 315.3000000000001 198.8C315.3000000000001 170.8 318.8000000000001 165.3 336.5000000000001 165.3C352.9000000000001 165.3 356.7000000000001 170.9 356.7000000000001 195zM410.5000000000001 198.8C410.5000000000001 224.2 413.8000000000001 236.6 422.8000000000001 244.6C431.6000000000001 252.7 445.0000000000001 255.9000000000001 467.9000000000001 255.9000000000001C510.7000000000001 255.9000000000001 523.6000000000001 243.1 523.6000000000001 200.2000000000001V189.1H448.3000000000002C448.0000000000001 187.1 448.0000000000001 185.1 448.0000000000001 184.3C448.0000000000001 167.4 452.5000000000001 162.4 468.1000000000001 162.4C482.0000000000001 162.4 486.0000000000001 165.4 486.0000000000001 176.3H523.5000000000001V174C523.5000000000001 164.2 521.0000000000001 155.1 516.7000000000002 149.3C509.4000000000001 139.5 497.1000000000001 135.7 472.4000000000001 135.7C444.9000000000002 135.7 430.8000000000002 139 421.8000000000002 148C413.3000000000002 156.5 410.5000000000001 169.3 410.5000000000001 198.8zM486.9000000000001 210.4C486.6000000000001 212.2 486.6000000000001 213.7 486.6000000000001 214.2C486.6000000000001 226.5000000000001 483.3000000000001 228.8 467.0000000000001 228.8C452.6000000000001 228.8 449.9000000000001 225.8 448.9000000000001 213.7L448.6 210.4H486.9zM542.5000000000001 255.7H580.8000000000001L579.0000000000001 235.8H579.7000000000002C586.5000000000001 250.7 594.1000000000001 256 609.4000000000002 256C620.2000000000002 256 628.5000000000002 252.7 632.8000000000002 246.7C638.1000000000001 239.4 639.6000000000001 232.3 639.6000000000001 212.7C639.6000000000001 211.2 639.6000000000001 207.7 639.8000000000002 203.4H604.8000000000002C605.1000000000001 205.2 605.1000000000001 206.7 605.1000000000001 207.4C605.1000000000001 222.8 603.1000000000001 226.8 594.8000000000002 226.8C588.5000000000002 226.8 584.0000000000002 223.5 581.7000000000002 217.5C580.7000000000002 214.5 580.7000000000002 213.1999999999999 580.7000000000002 205.1999999999999V137.1999999999999H542.4000000000002V255.7z" />
+    <glyph glyph-name="apple-pay"
+      unicode="&#xF415;"
+      horiz-adv-x="640" d=" M116.9 289.5C109.4 280.6 97.4 273.6 85.4 274.6C83.9 286.6 89.8 299.4 96.7 307.2C104.2 316.3 117.3 322.8 128 323.3C129.2 310.9 124.3 298.6 116.9 289.5M127.8 272.3C110.4 273.3 95.5 262.4 87.3 262.4C78.9 262.4 66.3 271.8 52.5 271.5C34.6 271.2 18 261.1 8.9 245C-9.9 212.7 4 165 22.2 138.7C31.1 125.7 41.7 111.4 55.7 111.9C69 112.4 74.2 120.5 90.2 120.5C106.3 120.5 111 111.9 125 112.1C139.5 112.4 148.6 125.1 157.5 138.1C167.6 152.9 171.8 167.2000000000001 172 168C171.7 168.3 144 178.9 143.7 210.9C143.4 237.7 165.6 250.4 166.6 251.2C154.1 269.8 134.6 271.8 127.8 272.3M228.2 308.5V113.6H258.5V180.2000000000001H300.4C338.7 180.2000000000001 365.5 206.5000000000001 365.5 244.5000000000001S339.1 308.5000000000001 301.4 308.5000000000001H228.2zM258.5 283H293.4C319.7 283 334.7 269 334.7 244.4S319.7 205.6 293.3 205.6H258.5V283zM420.7 112.1C439.7 112.1 457.3 121.7000000000001 465.3 137H465.9V113.6H493.9V210.6C493.9 238.7 471.4 256.9000000000001 436.8 256.9000000000001C404.7 256.9000000000001 380.9000000000001 238.5000000000001 380 213.3000000000001H407.3C409.6 225.3000000000001 420.7 233.2000000000001 435.9000000000001 233.2000000000001C454.4 233.2000000000001 464.8 224.6000000000001 464.8 208.7000000000001V197.9L427 195.6C391.9 193.5 372.9 179.1 372.9 154.1C373 128.9 392.6 112.1 420.7 112.1zM428.9 135.2000000000001C412.8 135.2000000000001 402.5 143.0000000000001 402.5 154.8000000000001C402.5 167.1000000000001 412.4 174.2000000000001 431.3 175.3000000000001L464.9 177.4000000000001V166.4000000000001C464.9 148.2000000000001 449.4000000000001 135.2000000000001 428.9000000000001 135.2000000000001zM531.4 60.6C560.9 60.6 574.8 71.9 586.9 106L640 255H609.2L573.6 139.9H573L537.4 255H505.8L557 113.1L554.2 104.5C549.6 89.9 542.1 84.2 528.7 84.2C526.3000000000001 84.2 521.7 84.5 519.8000000000001 84.7V61.3C521.6 60.9 529.1 60.6 531.4000000000001 60.6z" />
+    <glyph glyph-name="apple"
+      unicode="&#xF179;"
+      horiz-adv-x="376.5" d=" M314.7 179.3C314.5 216 331.1 243.7 364.7 264.1C345.9 291 317.5 305.8 280 308.7000000000001C244.5 311.5 205.7 288 191.5 288C176.5 288 142.1 307.7000000000001 115.1 307.7000000000001C59.3 306.8 0 263.2 0 174.5C0 148.3 4.8 121.2 14.4 93.3C27.2 56.6 73.4 -33.4 121.6 -31.9C146.8 -31.3 164.6 -14 197.4 -14C229.2 -14 245.7 -31.9 273.8 -31.9C322.4000000000001 -31.2 364.2000000000001 50.6 376.4 87.4C311.2 118.1 314.7 177.4 314.7 179.3000000000001zM258.1 343.5C285.4 375.9 282.9 405.4 282.1 416C258 414.6 230.1 399.6 214.2 381.1C196.7 361.3 186.4 336.8 188.6 309.2C214.7 307.2 238.5 320.6 258.1 343.5z" />
+    <glyph glyph-name="asymmetrik"
+      unicode="&#xF372;"
+      horiz-adv-x="576" d=" M517.5 138.8C556.3 178.8 575.6 218.8 576 254.9C576.8 320.4 516.6 373.1 406.6 389.9C277.9 409.6 118.1 374.4 0 307.5C52 334 110.6 355.7 170.7 365.7C245.2 386.2 323.7 391.1 392 380.5C544.5 356.7 588.8 253 490.8 148.8C480.6 138 468.8 127.7 455.8 118.2L304.9 344.6L114.7 59.1C49.1 88.5 38.2 149.3 95.6 210.3C116.4 232.5 143.9 252.2 175.1 268.4C195.1 280.6 214.8 291 237.1 299.1C172 278.8 114.4 246.2 75.5 206.2C47.8 177.6 34.1 149.1 33.8 123.3C33.3 88.1999999999999 57.2 58.1999999999999 102.2 40.3L67.7 -11.4H169.3L191.3 22.9999999999999C213.5 21.9999999999999 236.6 22.9999999999999 259.9 25.6999999999999L237.1 -11.4000000000001H372.6L340 41.7C358.6 47 376.9 53.2 394.5 60.4L440.4 -11.4H542L468.6 99C487.1 111.1 503.6 124.5 517.5 138.8zM329.9 58.3L304.9 98.9L272.2 45.6C248.8 42.1 225.5 40.5 203 41.2L304.9 200.5000000000001L383.6 77.5000000000001C366.4 70.1000000000001 348.3 63.6000000000001 329.9 58.3000000000001z" />
+    <glyph glyph-name="audible"
+      unicode="&#xF373;"
+      horiz-adv-x="640" d=" M640 248.1V194.1L320 -5.9L0 194V248L320 48L640 248.1zM445.5 176.1L492.6 205.5C455.4 261.3 391.9000000000001 298.1 319.9000000000001 298.1C247.9000000000001 298.1 184.4 261.4000000000001 147.3000000000001 205.7H147.6000000000001C150.1000000000001 208 152.7000000000001 210.2 155.3000000000001 212.4C245.0000000000001 286.8 374.7000000000001 270.5 445.5 176.1zM225.4 157.3C242.3 169.2 261.9 176 282.8 176C317.2 176 348 157.6 369.2000000000001 128.4L414.6 156.8C393.7000000000001 186.6999999999999 359 206.3 319.8 206.3C280.9000000000001 206.3 246.4 186.9 225.4 157.3zM103.6 286.9C235.4 391.2 421.8 363.3 521.1 224.8L521.8000000000001 223.8L570.6 254.2C517.1 335.9 424.8 389.9 319.9 389.9C216.4 389.9 123.3 336.4 69.4 254.3C79.3 264.8 92.1 277.8 103.6 286.9zM570.6 254.2z" />
+    <glyph glyph-name="autoprefixer"
+      unicode="&#xF41C;"
+      horiz-adv-x="640" d=" M318.4 432L157.4 -48H234.9L260.3 33.4H379.8L405 -48H482.5L318.4 432zM278.1 90.1L319.3 220.5H320.8L361.7 90.1H278.0999999999999zM640 43L630 74.4L462.1 90L481.5 33.5L640 43zM177.9 90L10 74.3L0 43L158.5 33.6L177.9 90z" />
+    <glyph glyph-name="avianex"
+      unicode="&#xF374;"
+      horiz-adv-x="512" d=" M453.1 416H141.1C102.2 416 64.9 384.8 57.8 346.3L1.2 37.7C-5.9 -0.8 19.9 -32 58.9 -32H370.9C409.8 -32 447.1 -0.8 454.2 37.7L510.9 346.2C517.9 384.8 492.1 416 453.1 416zM394.9000000000001 68.7L362.9000000000001 55.2L247.5000000000001 165.2C232.8000000000001 155.2 218.3000000000001 145.7 205.8 138.1L227.9 73.9L210 61.2L169.4 122.2L117 170.3L132.7 185.7L190.7 154.6C200 165.1 211.5 177.2 223.5 189.5L203 219.1L134.2 318.9L153 347.8L161.9 352.6L265 240.2L269.9 235.7C289.3 254.5 303.7 268.1 303.7 268.1C311.4 274.6 325.2 271 334.4 260.2C343.4 249.7 345 235.5 337.1 228.9C335.3 227.6 321.6 217.5 301.8 203.3L306.3 196L401.2 76.6L394.8999999999999 68.7z" />
+    <glyph glyph-name="aviato"
+      unicode="&#xF421;"
+      horiz-adv-x="640" d=" M107.2 164.5L88.2 206.3H36.1L17.1 164.5H0L62.2 295.9L124.4 164.5H107.2zM62.2 262.6L42.6 220.1H81.8L62.2 262.6zM174.9 160.2L112.7 291.6H129.8L174.9 195.6L220 291.6H237L174.9 160.2zM255.5 164.5V291.6H271V164.5H255.5zM464.6 280.1V164.5H447.3V280.1H406.1V291.6H505.7V280.1H464.6zM640 229.2C640 220 638.3 211.4 634.9 203.4C631.5 195.4 626.6999999999999 188.3 620.6999999999999 182.3C614.6999999999999 176.3 607.5999999999999 171.5 599.5999999999999 168.1C591.5999999999999 164.7 582.9999999999999 163 573.8 163S556 164.6999999999999 548 168.1C540 171.5 532.9 176.3 526.9 182.3C520.9 188.3 516.1 195.3 512.6999999999999 203.4C509.3 211.4 507.5999999999999 220 507.5999999999999 229.2S509.2999999999999 247 512.6999999999999 255C516.0999999999999 263 520.9 270.1 526.9 276.1C532.9 282.1 539.9 284.5 548 288C556 291.4 564.6 293.1 573.8 293.1S591.5999999999999 291.4 599.5999999999999 288C607.5999999999999 284.6 614.6999999999999 282.2 620.6999999999999 276.1C626.6999999999999 270.1 631.4 263 634.9 255C638.3 247 640 238.4 640 229.2zM624.5 229.2C624.5 236.5 623.2 243.2 620.6 249.5C618 255.8 614.4 261.2 609.8000000000001 265.8C605.2 270.4 599.8000000000001 274 593.6 276.7000000000001C587.4 279.4 580.8000000000001 280.7000000000001 573.8000000000001 280.7000000000001S560.2 279.4 554.0000000000001 276.7000000000001C547.8000000000001 274 542.4000000000001 270.4 537.8000000000001 265.8C533.2 261.2000000000001 529.6 255.8 527.0000000000001 249.5C524.4000000000001 243.2 523.1000000000001 236.4 523.1000000000001 229.2C523.1000000000001 221.9 524.4000000000001 215.2 527.0000000000001 208.9C529.6000000000001 202.6 533.2000000000002 197.2 537.8000000000001 192.6C542.4000000000001 188 547.8000000000001 184.4 554.0000000000001 181.7C560.2000000000002 179 566.8000000000001 177.7 573.8000000000001 177.7S587.4000000000001 179 593.6 181.7C599.8000000000001 184.4 605.2 188 609.8000000000001 192.6C614.4000000000001 197.2 618.0000000000001 202.6 620.6 208.9C623.2 215.2 624.5 222 624.5 229.2zM529.7 132.5V138.8L618.6 148.8L375.7000000000001 135.4C376.3000000000001 137.6 376.8000000000001 140.0000000000001 377.1 142.6C377.4000000000001 144.6 377.6 146.8 377.7000000000001 149.1L442.5000000000001 157.2000000000001L377.6 155.3000000000001C377.6 155.7000000000001 377.5 156.0000000000001 377.5 156.4000000000001C374.7 173.6000000000001 352 180.1000000000001 352 180.1000000000001L350.9 206.4000000000001H374.7L393.7 164.6000000000001H410.8L348.6 296L286.4000000000001 164.6H303.5000000000001L322.5000000000001 206.4H346.1000000000001L345 180S322.3 173.5 319.5 156.3C319.4 156 319.4 155.6 319.4 155.2L254.5 157.1L319.3 149C319.4 146.6999999999999 319.6 144.6 319.9 142.5C320.2 139.8999999999999 320.7 137.5 321.3 135.3L78.4 148.8L167.3 138.8V132.5C161.4 131.6 156.8 126.5 156.8 120.3C156.8 113.5 162.4 107.9 169.2 107.9C176 107.9 181.6 113.5000000000001 181.6 120.3C181.6 126.5 177 131.6 171.1 132.5V138.3L251.4000000000001 129.3V123.9C245.7000000000001 122.8 241.5000000000001 117.7000000000001 241.5000000000001 111.8C241.5000000000001 105 247.1 101.6 253.9000000000001 101.6C260.7000000000001 101.6 266.3 105 266.3 111.8C266.3 117.8 262 122.8 256.4000000000001 123.9V128.8L284.8 125.6V101.9H278.9000000000001V88H284.8V94.6H289.8V88H295.7V101.8H289.8V125L328.1 120.7C336.2000000000001 109.3 347.1 107.1 347.1 107.1L347 100.4L341.9 100.2L341.8 88.1H345.9L346 93.1H351.2L351.3 88.1H355.4000000000001L355.3 100.2L350.2 100.4L350.1 107.1S361 109.2 369.1 120.7L407.4 125V101.8H401.5V88H407.4V94.6H412.4V88H418.3V101.8H412.4V125.5L440.8 128.7V123.8C435.1 122.7 430.9 117.6 430.9 111.7C430.9 104.9 436.5 101.5 443.3 101.5C450.1 101.5 455.6999999999999 104.9 455.6999999999999 111.7C455.6999999999999 117.7 451.3999999999999 122.7 445.8 123.8V129.2L526.0999999999999 138.2V132.4C520.1999999999999 131.5 515.5999999999999 126.4 515.5999999999999 120.2C515.5999999999999 113.4 521.1999999999999 107.8 527.9999999999999 107.8C534.7999999999998 107.8 540.3999999999999 113.4 540.3999999999999 120.2C540.1999999999998 126.5 535.6999999999998 131.6 529.6999999999998 132.5zM328.9000000000001 220.1L348.5000000000001 262.6L368.1000000000001 220.1H350.2000000000001L348.5000000000001 260.4L346.8000000000002 220.1H328.9000000000002z" />
+    <glyph glyph-name="aws"
+      unicode="&#xF375;"
+      horiz-adv-x="512" d=" M261.2 311.9C247.2 254.4 248.1 257.5 235.4 204.9C233.8 198.4 231.3 196.5 224.7 196.4H210.3C204.5 196.5 202.1 198 200.4 203.7C188.1 243.1 171.6 297.8 160.5 334.4C156.4 347.9 159.1 347.6 169.8 347.3C173.5 347.2000000000001 177.1 347.3 180.8 347.3C185.9 347.2000000000001 188.5 345.3 189.9 340.2000000000001C193.5 327.3 195.9 317.4 216.5 236.1C216.9 234.5000000000001 217.4 233.0000000000001 217.9 231.5000000000001H219C219.5 233.5000000000001 220.1 235.4000000000001 220.6 237.4000000000001C228.4 270.3000000000001 236.1 303.3000000000001 243.9 336.2000000000001C246.3 346.4000000000001 250.6 347.4000000000001 260.9 347.4000000000001H268.5C275.4 347.3000000000001 277.5 345.9000000000001 279.2 339.1C285.2 315.7000000000001 302.7 237.3000000000001 305.9 228.7000000000001C311 247.0000000000001 304.1 220.8000000000001 334.4 337.7000000000001C336.5 345.8000000000001 338.5 347.4000000000001 346.7 347.4000000000001H359.4C364.8 347.3000000000001 366.4 345.6 365.1 340.3000000000001C362.7 330.8000000000001 362.2 330.4000000000001 323.8 207.4C320.7 197.5 319.6 196.6 309.2 196.6H298.5999999999999C291.2999999999999 196.6 289.3999999999999 197.9 287.5999999999999 205C283.2999999999999 221.2 264.2999999999999 300.7000000000001 261.2 311.9000000000001zM125.4 200.7C129.6 194.9 133.5 194.4 139.5 198.3L145.8 202.5C152.6 207 153.1 208.8 149.4 216C145.1 224.4 143 233.3 143.1 242.9C143.1 246 143.7 298.6 142.2 309.7C139.5 329 129.7 342.5 110.5 348.4C99.8 351.8 88.8 351.7 77.8 351.4C62.7 351 48.4 346.8 35 340C33.2 339.1 31.3 336.9 30.9 335.1C30.1 331.2 29.8 327 30.2 323C30.8 317.1 32.8 316 38.4 317.9C43.5 319.6 48.4 321.8 53.5 323.3C68 327.7 82.7 329.7 97.6 325C104.7 322.8 109.3 318.1 111.9 311.2C114.9 303.3 114.3 295.1 114.3 287C114.3 281.5 114.2 281.5 108.8 282.5C94.9 285.1 81.1 287.5 66.9 285.6C51.7 283.5 38.3 278.3 28.7 265.6C19.6 253.6 18.7 240 21.3 226.1C24.1 211.1 33.1 200.4 47.7 195.7C68.3 189 87.8 192.4 105.4 205.2C109.2 208 112.6 211.4 116.5 214.7C119.6 209.7 122.3 205 125.4 200.7zM110.1 262.3C113.1 261.9 114.6 260.4 114.4 257.2C114.2 253.4 114.5 249.6 114.1 245.8C112.9 234.1 106.4 226.1 96.2 220.9C88 216.7 79.3 215.1 70.1 215.9C54.9 217.2 49.1 229 50.5 242.2C51.8 254.8 59 261.8 72 264C85.8 266.4 88 265.1 110.1 262.3zM458.9 197.2C480.2 205.8 491.8 223.4 488.1 247.2C485.9 261.8 476.3 271.4 462.9 276.7C448.2000000000001 282.6 429.1 287 414.8 294.9C410.4000000000001 297.3 407.4000000000001 301.2 407.2 306.8C406.8 317.9 411.4 324 422.6 326.6C431.9 328.7 441.4 328.8 450.7 327C458 325.6 465 322.8 472.1 320.7C474.9 319.8 477.9999999999999 318.6 479.9 322.3C483.7 329.6 480.3 341 472.6 344.1C450.1 353.1 427.1 355.7 404.4 345.7C389.8 339.3 379.8 328.3 378.4 311.5C376.8 292.2 385.3 278.1 402.5 269.8C410.2 266.1 418.6 263.9 426.7 260.9C434.8 257.9 442.9 255.1 450.8 251.8C463.1 246.5 462.4 227.6 452 221.8C424.3 206.5 387.1 224.2 382.8 225.6C379.5 226.7 377.5 225.4 376.5 221.9C373.5 210.6 377.2 203.1 388.1 199.2C409.8 191.3 437.7000000000001 188.7 458.9 197.2zM296 34.5C346.8 40.3 394.7 55.3 438.7 81.5C446.7 86.2 454.2 91.8 461.8 97.2C469.1 102.4 465 115.6 450.5 109.4C396.1 86.2 339.3 73.3 280.3 70.5C249.8 69 219.5 70.8 189.2 75.2C126.1 84.4 66.8 104.4 11.6 136.4C9.5 137.6 7.4 138.9 5.1 139.4C0.2 140.5 -2.6 134.7 2.7 129.7C26.7 107.6 53 88.9 81.8 74C135.5 46.3 192.3 31.3 253 32C267.4 32.8 281.8 32.9 296 34.5zM470.7 126.7C485.5 125.9 490.1 120.8 486.4 106.5C482.6 91.7 477.1 77.3 472.5 62.7C471.6 59.8 468.3 56.4 471.7 53.9C475.4 51.3 478.2 54.9 480.7 57.2C490.9 66.7 498.1 78.2 503.2 91C508.6 104.4 512.5 118.2 511.9 132.9C511.7 139.1 510.1 141.7 504.1 143.4C498.7 144.9 493.1 146.2 487.6 146.6C465.9999999999999 148.4 445.1 146.1 425.6 136C422.5 134.3999999999999 419.6 132.3 416.9 130.1C415.8 129.2 413.7 124.8 419.3 124C421.2 123.6999999999999 423.2 124.1 425.2 124.3C442.0999999999999 125.9 453.8 127.6 470.6999999999999 126.6999999999999z" />
+    <glyph glyph-name="bandcamp"
+      unicode="&#xF2D5;"
+      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM296.2 113.9H115.2L199.9 270H380.9L296.2 113.9z" />
+    <glyph glyph-name="behance-square"
+      unicode="&#xF1B5;"
+      horiz-adv-x="448" d=" M186.5 155C186.5 135.7 172.5 129.6 155.3 129.6H110.2V182.5H156.2C174.8 182.4 186.5 174.7 186.5 155zM178.8 237.3C178.8 255 165.1 259.2000000000001 149.9 259.2000000000001H110.3V214.4H153C168.1 214.4 178.8 221 178.8 237.3000000000001zM311.1 214.1C292.8 214.1 280.6 202.7 279.4000000000001 184.4H341.6C339.9000000000001 202.9 330.3 214.1 311.1 214.1zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM271.7 263H349.5V281.9H271.7V263zM228.7 152.7C228.7 176.8 217.3 197.6 193.7 204.3C210.9 212.5 219.9 222 219.9 241.3C219.9 279.5 191.4 288.8 158.5 288.8H68V96.8H161.1C196 96.9999999999999 228.7 113.6999999999999 228.7 152.6999999999999zM380 167.5C380 208.6 355.9 242.9 312.4 242.9C270 242.9 241.3 211.1 241.3 169.3C241.3 126 268.6 96.3 312.4 96.3C345.6 96.3 367.1 111.2 377.5 143.1H343.8C340.1 131.2000000000001 325.2 125 313.6 125C291.2000000000001 125 279.5 138.1 279.5 160.3H379.7C379.8 162.6 380 165.1 380 167.5z" />
+    <glyph glyph-name="behance"
+      unicode="&#xF1B4;"
+      horiz-adv-x="576" d=" M232 210.8C263.8 226 280.4 249 280.4 284.8C280.4 355.4 227.8 372.6 167.1 372.6H0V18.2H171.8C236.2 18.2 296.7000000000001 49.1 296.7000000000001 121.1C296.7000000000001 165.6 275.6 198.5 232.0000000000001 210.8zM77.9 312.1H151C179.1 312.1 204.4 304.2 204.4 271.6C204.4 241.5 184.7 229.4 156.9 229.4H77.9V312.1zM161.2 78.4H77.9V176H162.8C197.1 176 218.8 161.7 218.8 125.4C218.8 89.6 192.9 78.4 161.2 78.4zM519.7 319.1H376V354H519.7V319.1zM576 142.8C576 218.7 531.6 282 451.1 282C372.9000000000001 282 319.8 223.2 319.8 146.2C319.8 66.3 370.1 11.5 451.1 11.5C512.4 11.5 552.1 39.1 571.2 97.8H509C502.3 75.9 474.7 64.3 453.3 64.3C412 64.3 390.3 88.5 390.3 129.6H575.4C575.6999999999999 133.8 576 138.3 576 142.8zM390.4 174C392.7 207.7 415.1 228.8 448.9 228.8C484.3 228.8 502.1 208 505.1 174H390.4z" />
+    <glyph glyph-name="bimobject"
+      unicode="&#xF378;"
+      horiz-adv-x="448" d=" M416 416H32C14.4 416 0 401.6 0 384V0C0 -17.6 14.4 -32 32 -32H416C433.6 -32 448 -17.6 448 0V384C448 401.6 433.6 416 416 416zM352 158.6C352 109.2000000000001 340.6 76 248.2 76H231.3C187.2 76 168.9 90.9 160.9 114.8H160V80H96V312H160V237.3H161.1C165.7 267.8 200.8 276.1 230.8 276.1H248.1C340.5 276.1 351.9000000000001 243.0000000000001 351.9000000000001 193.6V158.6zM288 187.5V164.6C288 142.9 284.6 130.8 249.6 130.8H204.3C175.4 130.8 160.2 137.3 160.2 166.5V185.5C160.2 214.8 175.4 221.2 204.3 221.2H249.6C284.6 221.4 288 209.2 288 187.5z" />
+    <glyph glyph-name="bitbucket"
+      unicode="&#xF171;"
+      horiz-adv-x="512" d=" M23.1 416C14.2 416.1 7 409.1 6.9 400.2C6.9 399.3 7 398.4 7.1 397.4L74.9 -14C76.6 -24.4 85.6 -32 96.1 -32.1H421.2000000000001C429.1 -32.2 435.9000000000001 -26.5 437.2000000000001 -18.7L505.0000000000001 397.3C506.4 406 500.5000000000001 414.2 491.8000000000001 415.6C490.9000000000001 415.7 490.0000000000001 415.8 489.0000000000001 415.8L23.1 416zM308.4000000000001 118.7H204.6L176.5 265.5H333.5L308.4 118.7z" />
+    <glyph glyph-name="bitcoin"
+      unicode="&#xF379;"
+      horiz-adv-x="512" d=" M504 192C504 55.033 392.967 -56 256 -56S8 55.033 8 192S119.033 440 256 440S504 328.967 504 192zM362.349 227.33C367.286 260.329 342.158 278.069 307.799 289.903L318.945 334.605L291.732 341.386L280.881 297.862C273.727 299.645 266.379 301.326 259.078 302.992L270.007 346.802L242.809 353.583L231.656 308.897C225.734 310.246 219.9209999999999 311.579 214.279 312.981L214.31 313.121L176.78 322.491L169.541 293.429S189.732 288.802 189.3059999999999 288.516C200.3279999999999 285.765 202.3199999999999 278.472 201.9859999999999 272.691L189.2899999999999 221.766C190.0499999999999 221.572 191.0339999999999 221.293 192.119 220.859C191.2119999999999 221.084 190.243 221.332 189.243 221.572L171.447 150.2339999999999C170.098 146.8859999999999 166.68 141.8639999999999 158.976 143.7699999999999C159.2469999999999 143.375 139.196 148.7069999999999 139.196 148.7069999999999L125.6859999999999 117.56L161.0999999999999 108.733C167.6879999999999 107.0819999999999 174.1449999999999 105.3539999999999 180.5 103.727L169.238 58.514L196.4199999999999 51.733L207.5729999999999 96.466A1038.209 1038.209 0 0 1 229.26 90.8389999999999L218.1449999999999 46.3159999999999L245.3579999999999 39.5349999999999L256.6199999999999 84.6629999999999C303.0239999999999 75.8819999999999 337.9189999999999 79.4239999999999 352.6059999999999 121.3899999999999C364.4419999999999 155.1799999999999 352.0169999999999 174.6709999999999 327.6019999999999 187.3809999999999C345.3819999999999 191.4789999999999 358.7759999999999 203.1729999999999 362.3489999999999 227.3299999999999zM300.172 140.151C291.762 106.3609999999999 234.864 124.6279999999999 216.417 129.208L231.361 189.107C249.807 184.504 308.961 175.39 300.172 140.151zM308.589 227.818C300.916 197.082 253.558 212.698 238.196 216.526L251.744 270.853C267.107 267.025 316.58 259.88 308.589 227.818z" />
+    <glyph glyph-name="bity"
+      unicode="&#xF37A;"
+      horiz-adv-x="496" d=" M78.4 380.8C173.8 470 324.5 472 421.5 377C435.8 362.9 415.1 339.9 399.1 355.5C314.3 437.9 183.3 435.8 100.2000000000001 358.7C83.9000000000001 343.6 63.7000000000001 367 78.4000000000001 380.8zM177.3 -37.8C196.6 -43.5 206.6 -14.2 185.2 -7.8C73 26.1 9.4 141.9 37.7 253.2C42.7 272.8 12.8 281.3 7.5 260.3C-24.6 132.9 48.6 0.5 177.3 -37.8000000000001zM325.4 -35.8C447.3 4.4 518.3 131.1 489.8 255.2C485.3 274.9 454.9 269 459.8 247.3C483.9999999999999 139.6 422.7 29.4 316.6 -6.1C295.4 -13.1 306.2 -42.1 325.4 -35.8zM262.5 43.2L262.7 115C262.7 123.2 256.1 129.8 247.9 129.8C239.7 129.8 233.1 123.1 233.1 115L232.9 43.2C232.9 35 239.5 28.4 247.7 28.4S262.5 35 262.5 43.2zM333.5 312.2C335.6 221.3 338.2 180.3 248 179.7C155.5 180.4 161.1 224 162.5 312.2C162.5 334 130 331.8 130 312.2V240.6C130 171.3 190.7 149.7 248 150.5C305.3 149.7 366 171.3 366 240.6V312.2C366 331.8 333.5 334 333.5 312.2z" />
+    <glyph glyph-name="black-tie"
+      unicode="&#xF27E;"
+      horiz-adv-x="448" d=" M0 416V-32H448V416H0zM316.5 90.8L224 2.1L131.5 90.8L196 274.8L131.5 361.4H316.4L252 274.8L316.5 90.8z" />
+    <glyph glyph-name="blackberry"
+      unicode="&#xF37B;"
+      horiz-adv-x="512" d=" M166 331.1C166 307.7 149.6 282 93.5 282H23.4L44.4 370.8H112.2C154.3 370.8 166 347.5 166 331.1zM292.2 370.8H224.4L205.7 282H275.8C329.6 282 345.9 307.7 345.9 331.1C346 347.5 334.3 370.8 292.2 370.8zM88.8 239.9H21L0 151.1H70.1C126.2 151.1 142.6 174.5 142.6 200.2C142.6 216.5 130.9 239.9000000000001 88.8 239.9000000000001zM268.9 239.9H201.1L182.4 151.1H252.5C306.3 151.1 322.6 174.5 322.6 200.2C322.6 216.5 310.9 239.9000000000001 268.9 239.9000000000001zM458.2 293.7H390.4L371.7 204.9H441.8C495.6 204.9 511.9 228.3 511.9 254C512 270.3 500.3 293.7 458.2 293.7zM430.2 155.8H362.4L343.7 67H413.8C469.9 67 483.9 90.4 483.9 116.1C483.9 132.4 472.3 155.8 430.2 155.8zM240.8 102H173L154.3 13.2H224.4C280.5 13.2 294.5 38.9 294.5 62.3C294.6 78.6 282.9 102 240.8 102z" />
+    <glyph glyph-name="blogger-b"
+      unicode="&#xF37D;"
+      horiz-adv-x="448" d=" M446.6 225.3C444.8 233.3 439.8 240.7 434.1 243.8C432.3 244.8 421.1 246 409.1 246.5C389 247.4 386.8 247.8 380.4000000000001 251.5C370.3 257.4 367.6 263.8 367.5000000000001 281C367.4000000000001 314 353.7000000000001 344.7 326.6000000000001 372.3C307.3000000000001 392 285.7000000000001 405.3 261.1000000000001 412.8C255.2000000000001 414.6 242.0000000000001 415.2 197.8000000000001 415.7C128.4000000000001 416.5 113.0000000000001 415.1 89.4000000000001 405.7C45.9 388.5 14.7 351.9 3.3 305.1C1.2 296.3 0.7 282.2 0.2 201.2C-0.4 99.7 0.3 84.8 6.6 64.7C22.2 15.1 66.5 -21.6 111 -29.6C125.8 -32.3 308.3 -32.9 327 -30.4C359.5 -26.0000000000001 385 -12.9 408.9 11.4999999999999C426.2 29.1999999999999 437 48.3 444.1 73.6C449 91.2 448.6 216.4 446.6 225.3zM124.5 288.9C132.3 296.8 134.5 297.1 183.3 297.1C227.2 297.1 228.7 297 235.1 293.7C244.4000000000001 289 248.5000000000001 282.4 248.5000000000001 271.8C248.5000000000001 262.3 244.7 255.6 236.2 250.2C231.6 247.3 228.9 247.1 185.9 246.9C159.4 246.7 138.2000000000001 247.3 135.1 248.1C118.5 252.8 112.3 276.6 124.5 288.9zM316.3 89.1L301.4000000000001 86.7000000000001L223.9 85.8000000000001C155.8000000000001 85.0000000000001 136.6 86.2000000000001 133 87.8000000000001C125.9 90.9000000000001 119.2 99.5000000000001 118.1 107.2000000000001C117 114.5000000000001 120.7 124.5000000000001 126.3 129.6C133.4 136 136.5 136.2000000000001 223.6 136.3C313.2000000000001 136.4 312.7000000000001 136.4 321.2000000000001 128.5C333.3000000000001 117.2 330.7000000000001 97.3 316.3000000000001 89.1z" />
+    <glyph glyph-name="blogger"
+      unicode="&#xF37C;"
+      horiz-adv-x="448" d=" M162.4 252C167.2 256.9 168.6 257.1 198.8 257.1C226 257.1 226.9 257 230.9 255C236.7 252.1 239.2 248 239.2 241.4C239.2 235.5 236.8 231.4 231.6 228C228.8 226.2 227.1 226.1 200.5 225.9C184.1 225.8 171 226.1 169 226.7C158.7 229.6 154.9 244.4 162.4 252.0000000000001zM223.8 157.5C169.9 157.5 168 157.3 163.6 153.4C160.1 150.3 157.9 144 158.5 139.5C159.2 134.8 163.3000000000001 129.4 167.7 127.5C169.9 126.5 181.8 125.8 224 126.3L271.9 126.9L281.1 128.4C290.1 133.5000000000001 291.6 145.8 284.2 152.8C278.9 157.5 279.2 157.5 223.8 157.5zM447.2000000000001 27.4C443.7000000000001 -1 424.2000000000001 -23 396.1 -30.1C388.9000000000001 -31.9 386.4000000000001 -32 223.2 -31.9C65.4 -31.9 57.3 -31.8 51.2 -30.1C42.8 -27.9 35.6 -24.6 28.9 -20.1C23.3 -16.3 15 -8.3 11.9 -3.7C8.1 1.9 3.7 11.6 1.9 18.3C0.1 25 0 27.7 0 191.7C0 354.8 0 358.3 1.8 365.4C8.1 390.1 27.7 409 53 414.6C60.3 416.2 385.1 416.5 393 414.9C414.2 410.6 430.9 397.8 440.6 378.5C448.3 363.2 447.6 380 447.9000000000001 197.9C448.1 82.1 447.9000000000001 33.4 447.2000000000001 27.4zM361.8000000000001 212.6C360.7000000000001 217.6 357.6000000000001 222.2 354.1000000000001 224.1C353.0000000000001 224.7 346.1000000000001 225.4 338.6000000000001 225.8C326.2000000000001 226.4 324.8000000000001 226.6 320.8000000000001 228.9C314.6000000000001 232.5 312.9000000000001 236.5 312.8000000000001 247.2C312.8000000000001 267.6 304.3000000000001 286.6 287.5000000000001 303.7C275.5000000000001 315.9 262.2000000000001 324.2 246.9000000000001 328.8C243.3000000000001 329.9 235.1000000000001 330.3 207.7000000000001 330.6C164.8000000000001 331.1 155.2000000000001 330.2 140.6000000000001 324.4C113.6000000000001 313.7 94.3000000000001 291 87.2000000000001 262C85.9000000000001 256.5999999999999 85.6000000000001 247.8 85.3 197.6999999999999C84.9 134.8999999999999 85.3 125.5999999999999 89.3 113.1999999999999C99 82.4999999999999 126.4 59.8 153.9 54.8C163.1 53.1 276.1 52.6999999999999 287.6 54.3C307.7000000000001 56.9999999999999 323.5 65.1 338.3 80.1999999999999C349 91.0999999999999 355.7 102.9999999999999 360.1 118.6999999999999C363.3 129.5999999999999 363 207.0999999999999 361.8 212.5999999999999z" />
+    <glyph glyph-name="bluetooth-b"
+      unicode="&#xF294;"
+      horiz-adv-x="320" d=" M196.48 187.977L289.106 291.31L143.125 448V241.67L57.014 327.781L25.608 296.376L133.669 187.977L25.608 79.578L57.014 48.173L143.125 134.284L145.84 -64L294.392 84.644L196.48 187.977zM237.34 290.973L187.363 240.995L187.025 341.29L237.34 290.973zM187.363 134.96L237.34 84.982L187.025 34.6659999999999L187.363 134.9599999999999z" />
+    <glyph glyph-name="bluetooth"
+      unicode="&#xF293;"
+      horiz-adv-x="448" d=" M292.6 276.9L249.7 234L249.4 320L292.6 276.9M249.4 57.1L292.5 100.2000000000001L249.6 143.1L249.4 57.1zM416 188.6C416 -17 344.1 -64 230.9 -64S32 -17 32 188.6S115.4 448 228.6 448S416 394.1 416 188.6zM257.5 188.6L336.9 277.2000000000001L211.8 411.5V234.6L138 308.4L111 281.5L203.7 188.5L111 95.5L137.9 68.6L211.7 142.4L214 -27.6L341.4 99.9L257.5 188.6z" />
+    <glyph glyph-name="btc"
+      unicode="&#xF15A;"
+      horiz-adv-x="384" d=" M310.204 205.362C337.9340000000001 219.542 355.581 244.752 351.4840000000001 286.662C346.1260000000001 344.013 299.0260000000001 363.235 236.6340000000001 368.591V448H188.1060000000001V370.7970000000001C175.5010000000001 370.7970000000001 162.5810000000001 370.482 149.662 370.1670000000001V448H101.134V368.591C83.2920000000001 368.052 62.512 368.315 3.764 368.591V316.913C42.078 317.591 62.181 320.053 66.787 295.486V78.057C63.862 58.565 48.263 61.372 13.532 61.986L3.765 4.32C92.246 4.32 101.135 4.005 101.135 4.005V-64H149.663V3.06C162.897 2.745 175.817 2.745 188.107 2.745V-64H236.635V4.005C317.9340000000001 8.417 372.2820000000001 28.899 379.5300000000001 105.472C385.201 166.918 356.2100000000001 194.334 310.2040000000001 205.362zM150.608 313.447C178.023 313.447 263.7340000000001 321.954 263.7340000000001 264.919C263.7340000000001 210.404 178.0240000000001 216.707 150.608 216.707V313.447zM150.608 61.671V168.179C183.38 168.179 283.735 177.317 283.735 114.924C283.7340000000001 54.738 183.38 61.671 150.608 61.671z" />
+    <glyph glyph-name="buromobelexperte"
+      unicode="&#xF37F;"
+      horiz-adv-x="448" d=" M0 416V288H128V416H0zM120 296H8V408H120V296zM160 416V288H288V416H160zM280 296H168V408H280V296zM320 416V288H448V416H320zM440 296H328V408H440V296zM0 256V128H128V256H0zM120 136H8V248H120V136zM160 256V128H288V256H160zM280 136H168V248H280V136zM320 256V128H448V256H320zM440 136H328V248H440V136zM0 96V-32H128V96H0zM120 -24H8V88H120V-24zM160 96V-32H288V96H160zM280 -24H168V88H280V-24zM320 96V-32H448V96H320z" />
+    <glyph glyph-name="buysellads"
+      unicode="&#xF20D;"
+      horiz-adv-x="448" d=" M224 297.3L266.9 136.6H181.1L224 297.3zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM382.7 42.7L288.2 341.4H159.8L65.3 42.7H156L267.7 134.3L291.9 42.6999999999999H382.7z" />
+    <glyph glyph-name="cc-amazon-pay"
+      unicode="&#xF42D;"
+      horiz-adv-x="576" d=" M124.7 246.2C124.8 258 124.7 269.7 124.7 281.5V316.8C124.7 318.1 125.1 318.8 126.1 319.5C137.6 327.5 150.2 331.6 164.3 330.6C176.8 329.7 187 323.6 192.4 308.9C195.7 300 196.5 290.7000000000001 196.5 281.2000000000001C196.5 272.5 195.8 263.9 193.1 255.6C187.4 237.8 174.4 230.9000000000001 157.4 231.7C145.7 232.2 135.5 236.7 126 243.4C125.1 244.2 124.6 245 124.7 246.2zM279.6 231.6C284.2000000000001 229.8 288.9000000000001 229.6 293.7000000000001 230.1C305.3000000000001 231.3 315.6 235.8 325.0000000000001 242.6C325.9000000000001 243.2 326.3000000000001 243.9 326.3000000000001 245.1C326.2000000000001 249 326.3000000000001 253 326.3000000000001 256.9C326.3000000000001 260.9 326.2000000000001 264.9 326.3000000000001 268.9C326.3000000000001 270.3 325.9000000000001 270.9 324.5000000000001 271.1C317.5000000000001 272 310.6000000000001 273.3 303.6000000000001 274C296.6000000000001 274.6 289.6000000000001 274.3 282.8000000000001 272.1C276.1000000000001 269.9 271.1000000000001 265.9 269.1000000000001 259C267.5000000000001 253.6 267.5000000000001 248.2 269.2000000000001 242.8C270.8000000000002 237.3 274.4000000000001 233.6 279.6000000000001 231.6zM576 368V16C576 -10.5 554.5 -32 528 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H528C554.5 416 576 394.5 576 368zM368.5 344.1C368.9 342.4 369.4 340.7 370.1 339C386.6 298.4 403 257.7 419.6 217.1C421 213.6 421.3 210.7 419.8 207.2C417 201 414.9000000000001 194.6 412 188.5C409.4 183 405.3 179 399.3 177.3C395.1 176.2 390.8 176 386.4000000000001 176.4C384.3 176.6 382.2000000000001 177.1 380.1 177.2000000000001C377.3 177.4 375.9000000000001 176.1 375.8 173.2000000000001C375.7 170.4 375.7 167.6 375.8 164.9C375.9000000000001 160.3 377.4000000000001 158.2000000000001 382 157.4C386.7 156.6 391.4 155.8 396.2 155.7000000000001C410.5 155.4 421.9 161.1 429.3 173.6C432.2 178.5 434.9000000000001 183.7000000000001 437 189C456.8 239.1 476.5 289.3 496.2 339.5C496.8 341 497.3 342.5 497.5 344.1C497.9 346.5 496.8 347.7 494.4 347.8C488.8 347.9 483.3 347.8 477.7 347.8C474.6 347.8 472.4 346.4 471.3 343.5C470.9 342.4 470.4 341.2 470 340.1L440.9 256.4C438.8 250.3 436.7 244.3 434.4 237.8C434 238.7 433.8 239.2 433.6 239.7C422.8 269.6 412 299.6 401.2 329.5C399.5 334.2 397.7 339 395.9 343.7C395 346.2 393.2 347.7 390.5 347.7C384.1 347.8 377.7 347.9 371.3 347.8C369.1 347.8 368 346.2 368.5 344.1zM242.4 242C244.1 230.3 250 221.2 260.4 215.4C270.3 209.9 281.1 209.2 292.1 210.8C304.8 212.7 316 218.1 325.9 226.3C326.3 226.6 326.7 226.9 327.3 227.3C327.8 224.1 328.2 221.1 328.8 218.1C329.3 215.5 330.9 213.8 333.3 213.7C337.9 213.6 342.4 213.6 347 213.7C349.3 213.8 350.8 215.3 351 217.6C351.1 218.4 351.1 219.2 351.1 219.9V308.7000000000001C351.1 312.3000000000001 350.9 315.9000000000001 350.4 319.5000000000001C348.8 330.3000000000001 344.2 339.2000000000001 334.5 344.9000000000001C328.9 348.2000000000001 322.7 349.9000000000001 316.3 350.8000000000001C313.3 351.2000000000001 310.3 351.5000000000001 307.2 351.9000000000001H297.2C296.4 351.8000000000001 295.6 351.6000000000001 294.7 351.6000000000001C286.5 351.2000000000001 278.4 350.2000000000001 270.5 348.1000000000001C265.4 346.8000000000001 260.5 344.9000000000001 255.5 343.2000000000001C252.5 342.2000000000001 251 340.0000000000001 251.1 336.7000000000001C251.2 333.9000000000001 251 331.1000000000001 251.1 328.4000000000001C251.2 324.3000000000001 252.9 323.2000000000001 256.8 324.3000000000001C263.3 326.0000000000001 269.9000000000001 327.8000000000001 276.5 329.1000000000001C286.8 331.0000000000001 297.2 331.8000000000001 307.6 330.3000000000001C313 329.5000000000001 318.1 327.9000000000001 321.7000000000001 323.3000000000001C324.8000000000001 319.3000000000001 325.9000000000001 314.5000000000001 326.1 309.6000000000001C326.4000000000001 302.7000000000001 326.3 295.7000000000001 326.4000000000001 288.8000000000001C326.4000000000001 288.4000000000001 326.3 288.1000000000001 326.2000000000001 287.6000000000001C325.8000000000001 287.6000000000001 325.4000000000001 287.6000000000001 325.1 287.7000000000001C316.3 289.8000000000001 307.4000000000001 291.3000000000001 298.3 291.8000000000001C288.8 292.3000000000001 279.4000000000001 291.7000000000001 270.4000000000001 288.6000000000001C259.6 284.8000000000001 250.9000000000001 278.3000000000001 245.8000000000001 267.8000000000001C241.7000000000001 259.5000000000001 241.2000000000001 250.8000000000001 242.4000000000001 242.0000000000001zM98.7 341.1V165.8C98.7 165 98.7 164.1 98.8 163.3C99 160.8 100.5 159.1999999999999 102.9 159.1C108.8 159 114.7 159 120.6 159.1C123.1 159.1 124.6 160.8 124.7 163.2C124.8 164 124.8 164.9 124.8 165.7V226.4C125.7 225.7 126.2 225.2 126.7 224.8C141.7 212.3 158.9 208.2 177.8 211.9C194.9 215.3 206.7 225.8 214.5 241.1C220.3 252.7 222.8 265.2 223.2 278.1C223.7 292.4 222.2 306.5 216.4 319.8C209.3 336.2 197.5 347.1 179.7 350.7C177 351.3 174.2 351.5 171.5 351.9H164.5C163.3 351.7 162.1 351.6 160.9 351.4C149.2 350 138.6 345.6 129.1 338.7C127.1 337.3 125.2 335.7 123.2 334.2C123.1 334.7 122.9 335 122.8 335.4C122.4 337.7 122.1 340 121.7 342.3C121.1 346.2 119.2 347.8 115.3 347.9H105.6C99.7 348 98.7 346.9 98.7 341.1zM493.6 109C490.9 109.7 488.5 109 486 108C442.1 89.6 396.5 77.8 349.2 72.2C334.7 70.5 320.1 69.4 305.5 69C278.9 68.3 252.3 69.8 225.9 73.3C208.1 75.7 190.4 79 172.9 83.2C135.9 92.1 100.2 104.9 66.2 122C57.4 126.4 48.8 131.3 40.1 136C36.3 138.1 33.9 137.5 31.9 133.9V132.2C33.1 130.6 34.1 128.8 35.6 127.4C71.6 95.2 112.2 70.9 157.6 54.5C179.5 46.6 202 40.8 224.9 37C238.9 34.7 252.9 33.2 267.1 32.5C270.1 32.4 273.1 32.3 276.1 32.1C276.8 32.1 277.5 31.9 278.2 31.8H295.9C296.6 31.9 297.3 32.1 298 32.1C312.9 32.5 327.8 33.9 342.6 36.1C364 39.3 385 44.2 405.5 50.8C435.1 60.4 463.2 73.2 488.9 90.9C491.7 92.8 494.6 94.7000000000001 496.9 97.1C501.2 101.5 499.2 107.5 493.6 109zM544 136.7C543.2 140.9 540 142.5 536.4 143.7C530.6999999999999 145.6 524.8 146.5 518.8 147C507.8 147.9 496.8 147.4 485.9999999999999 145.4C473.9999999999999 143.2 462.6 139.3 452.4999999999999 132.3C451.3 131.5 450.1 130.5 449.3999999999999 129.3C448.7999999999999 128.4 448.7 127 448.8999999999999 125.9C449.2 124.6 450.5999999999999 124.3 451.8999999999999 124.4C452.4999999999999 124.4 453.0999999999999 124.4 453.6999999999999 124.5L473.1999999999999 126.6C482.8 127.5 492.3999999999999 128.1 501.9999999999999 127.4C506.1 127.1 510.1 126.2000000000001 514 125.2000000000001C518.3 124.1 520.2 120.8000000000001 520.4 116.5000000000001C520.6999999999999 109.8000000000001 519.1999999999999 103.4 517.5 97.0000000000001C514 84.1000000000001 509.2 71.6000000000001 504.2 59.2000000000001C503.9 58.4 503.5 57.5000000000001 503.4 56.7000000000001C503 54.2 504.4 52.7 506.8 53.2C508.1999999999999 53.5000000000001 509.8 54.3000000000001 510.8 55.3000000000001C514.5 58.9000000000001 518.3 62.5000000000001 521.4 66.5000000000001C532.1 80.3000000000001 538.4 96.1000000000001 542.1 113.1000000000001C542.8000000000001 116.1000000000001 543.3000000000001 119.2000000000001 543.8000000000001 122.2000000000001C544.0000000000001 126.9000000000001 544.0000000000001 131.8000000000001 544.0000000000001 136.7000000000001z" />
+    <glyph glyph-name="cc-amex"
+      unicode="&#xF1F3;"
+      horiz-adv-x="576" d=" M576 192.6C538.1 192.8 531.8 193.5 521.5 187.6V192.6C476.2 192.6 468 194.3 456.6 187.4V192.6H378.4000000000001V187.5C367.0000000000001 194 357.0000000000001 192.6 302.7000000000001 192.6V187C296.4000000000001 190.7 288.2000000000001 192.6 278.4000000000001 192.6H220.4C216.9 188.8 207.9 178.9 204.7000000000001 175.4C192.0000000000001 189.5 194.2000000000001 187 189.2000000000001 192.6H106.1000000000001V100.3H188.1000000000001C191.4000000000001 103.8 201.0000000000001 114.1999999999999 204.2000000000001 117.6999999999999C216.9 103.3999999999999 214.5000000000001 105.9999999999999 219.6000000000001 100.3H268.5000000000001C268.5000000000001 115 268.6000000000001 108.6 268.6000000000001 123.3C280.1000000000001 123.1 292.9000000000001 123.5 302.9000000000001 129.5C302.9000000000001 115.6 302.8000000000001 112.3999999999999 302.8000000000001 100.3H342.4000000000001C342.4000000000001 118.8 342.5000000000001 107.6999999999999 342.5000000000001 125.6C348.7000000000001 125.6 350.2000000000001 125.6 351.9000000000001 125.5C352.0000000000001 124.1999999999999 351.9000000000001 125.5 351.9000000000001 100.3C504.7000000000001 100.3 497.8000000000001 99.1999999999999 508.6000000000001 104.8V100.3C543.4000000000001 100.3 563.4000000000001 98.1 576.1000000000001 106.4V16C576.1000000000001 -10.5 554.6000000000001 -32 528.1000000000001 -32H48C21.5 -32 0 -10.5 0 16V219.7H26.6C30.8 229.8 28.8 225 33 235H52.2C56.4 225 54.4 229.8 58.6 219.7H111.5V231.1C113.7 226.1 112.6 228.6 116.6 219.7H146.1C148.5 225.2 148.7 225.5 151.2 231.1V219.7H286.7V244.8C293.1 244.8 294.7 244.9 296.5 244.6C296.5 244.6 296.3 233.7 296.6 219.8H363.1V228.7C370.5 222.8 380.5 219.8 392.8 219.8H419.6C423.8 229.9 421.8 225.1 426 235.1H445C451.5 220.1 445.2 234.6 451.6 219.8H504.4V241.7C516.2 222 512.2 228.8 517.6 219.8H559.2V311.8H519.3000000000001V293.4C507.1000000000001 313.6 513.0000000000001 303.8 508.1000000000001 311.8H464.8000000000001V291.2C458.6000000000001 305.8 460.2 302 456.0000000000001 311.8H423.6000000000001C423.2000000000001 311.8 421.3000000000001 311.6 421.3000000000001 312.1H393.7000000000001C380.9000000000001 312.1 370.6 308.9 363.0000000000001 302.8V312.1H323.1000000000001V306.8C312.3000000000001 312.9 302.4000000000001 311.9 258.7000000000001 312.1C258.6 312.1 247.1000000000001 312.2 247.1000000000001 312.1H144.1000000000001C141.6000000000001 306 137.3000000000001 295.7 131.5000000000001 282.1C128.7000000000001 288.1 120.5000000000001 305.9 117.6000000000001 312.1H71.6000000000001V291C64.2000000000001 308.4 66.9000000000001 302 62.6000000000001 312.1H22.9C19.5 304.2 9.2 280.1 -0.2 258.2V368C-0.2 394.5 21.3 416 47.8 416H527.8C554.3 416 575.8 394.5 575.8 368V192.6zM389.4 273.2C389.1 273 388 271 388 265.6C388 259.6 388.9 257.9 389.1 257.7C389.3 257.6 390.2000000000001 257.2 392.5 257.2L399.8 274.1C398.7 274.1 397.7 274.2 396.7 274.2C391.1 274.2 389.7 273.5 389.4 273.2zM369.5 142.3C378.7 139 380.5 132.8 380.5 123.9L380.4 110.1H363.8L363.9 121.6C363.9 133.4 360.1 135.4 349.1 135.4H331.5L331.3999999999999 110.1H314.7999999999999L314.8999999999999 179.4H354.2999999999999C367.2999999999999 179.4 381.3999999999999 177.1 381.3999999999999 160.7C381.2999999999999 153.1 377.2 145.4 369.5 142.3zM363.2 157.6999999999999C363.2 164.0999999999999 357.6 165.0999999999999 352.5 165.0999999999999H331.5V149.4999999999999H352.2C357.8 149.4999999999999 363.2 150.7999999999999 363.2 157.6999999999999zM544.9 164.8H575V179.4H542.1C529.3000000000001 179.4 518.3000000000001 172.8 518.3000000000001 158.7C518.3000000000001 125.7 561.0000000000001 145.9 561.0000000000001 131.3C561.0000000000001 126.2 556.7000000000002 124.9 552.6000000000001 124.9H520.6000000000001L520.5000000000001 110.1H552.5000000000001C560.9000000000001 110.1 570.1000000000001 111.9 575.0000000000001 119V144.8C564.5000000000001 158.6 535.7000000000002 146.1 535.7000000000002 158.3C535.7000000000002 164.1 540.3000000000002 164.8 544.9000000000002 164.8zM445.7 165.1V179.4H390.5L390.4 110.1H445.6L445.7 124.4L407.1 124.7V138.5H445V152.6H407.2V165.1H445.7zM487.9 125H455.7L455.6 110.1999999999999H487.8C502.6 110.1999999999999 514 115.8 514 132.1999999999999C514 165.3999999999999 471.1 143.3999999999999 471.1 158.5C471.1 164.1 476 164.8999999999999 480.3 164.8999999999999H510.7V179.5H477.5C464.7 179.5 454 172.8999999999999 454 158.8C454 125.8 496.7 146.3 496.7 131.4C496.6 126 492 125 487.9 125zM409.8 283.7C392.4 284 376.6 287.8 376.6 264C376.6 252.2 379.4 244.1 392.7 244.1H400.1L423.6 298.5999999999999H448.4L476.3 233.2V298.5999999999999H501.6L530.6999999999999 250.5V298.5999999999999H547.5999999999999V229.6H524L492.8 281.5V229.6H459.1L452.5 244.9H418.2L411.8 229.6H392.6C369.8 229.6 359.6 241.4 359.6 263.5999999999999C359.6 286.9 370.1 298.8999999999999 393.6 298.8999999999999H409.7000000000001V283.7zM424.1 259.2H446.9L435.7 286.8L424.1 259.2zM351.5 298.8H334.6V229.5H351.5V298.8zM313.4 261.5C322.9 258.2 324.4 252.3 324.4 243.1V229.6H307.8C307.5 244.4 311.4 254.7 293 254.7H275V229.6H258.6V298.8999999999999L297.7 298.5999999999999C311 298.5999999999999 325.1 296.5999999999999 325.1 280.2C325.2 272.2 320.8 264.4999999999999 313.4 261.4999999999999zM306.7 276.8C306.7 283.2 301.1 284.2 296 284.2H275V268.9H295.7C301.4 268.9 306.7 270.2 306.7 276.8zM247.2 284.2V298.8H191.7V229.5H247.2V243.8H208.3V257.6H246.1V271.7H208.3V284.2H247.2zM162.6 229.5V283.7L138.6 229.5H124L100 283.7V229.5H66.2L59.8 244.8H25.3L18.9 229.5H1L30.7 298.8H55.2L83.3 233.1V298.8H110.4L132.1 251.8L151.8 298.8H179.4V229.5H162.6zM53.9 259.2L42.4 286.8L31.2 259.2H53.9zM306.9 156.7C306.9 128.8 276.5 133.4 257.6 133.4L257.5 110.1H225.3L204.9 133.1L183.5999999999999 110.1H118.1999999999999L118.2999999999999 179.4H184.7999999999999L205.2999999999999 156.6L226.3 179.4H279C294.6 179.4 306.9 174 306.9 156.7zM194.2 144.9L176.3 165.1H134.6V152.6H170.9V138.5H134.6V124.6999999999999H175.2L194.2 144.8999999999999zM241 172L215.7 144.6L241 116.5V172zM289.3 156.7C289.3 162.8 284.7 165.1 279.1 165.1H257.6V147.5H278.8C284.7 147.5 289.3 150.3 289.3 156.6999999999999z" />
+    <glyph glyph-name="cc-apple-pay"
+      unicode="&#xF416;"
+      horiz-adv-x="576" d=" M302.2 229.6C302.2 212.4 291.7 202.5 273.2 202.5H248.9V256.7H273.3C291.7 256.7 302.2 246.9 302.2 229.6zM349.7 167C349.7 158.7 356.9 153.3 368.2 153.3C382.6 153.3 393.4 162.4 393.4 175.2V182.9L369.9 181.4C356.6 180.5 349.7 175.6 349.7 167zM576 369V17C576 -9.5 554.5 -31 528 -31H48C21.5 -31 0 -9.5 0 17V369C0 395.5 21.5 417 48 417H528C554.5 417 576 395.5 576 369zM127.8 250.8C136.2 250.1 144.6 255 149.9 261.2000000000001C155.1 267.6 158.5 276.2000000000001 157.6 284.9C150.2 284.6 141 280 135.7 273.6C130.9 268.1 126.8 259.2 127.8 250.8zM188.4 176.3C188.2 176.5 168.8 183.9 168.6 206.3C168.4 225 183.9 234 184.6 234.5C175.8 247.5 162.2 248.9 157.5 249.2C145.3 249.9 134.9 242.3 129.1 242.3C123.2 242.3 114.4 248.9 104.8 248.7C92.3 248.5 80.6 241.4 74.3 230.1C61.2 207.5 70.9 174.1 83.6 155.7C89.8 146.6 97.3 136.6 107.1 137C116.4 137.4 120.1 143 131.3 143C142.6 143 145.8 137 155.6 137.1C165.8 137.3 172.1 146.2000000000001 178.4 155.3C185.3 165.7 188.2 175.7 188.4 176.3zM323.8 229.7C323.8 256.3 305.3 274.5 278.9000000000001 274.5H227.7000000000001V138.1H248.9000000000001V184.7000000000001H278.2000000000001C305.0000000000001 184.7000000000001 323.8000000000001 203.1000000000001 323.8000000000001 229.7000000000001zM413.8 206C413.8 225.7 398 238.4000000000001 373.8 238.4000000000001C351.3 238.4000000000001 334.7 225.5000000000001 334.1 207.9H353.2000000000001C354.8000000000001 216.3000000000001 362.6 221.8000000000001 373.2000000000001 221.8000000000001C386.2000000000001 221.8000000000001 393.4000000000001 215.8000000000001 393.4000000000001 204.6000000000001V197.1000000000001L367.0000000000001 195.5000000000001C342.4000000000001 194.0000000000001 329.1000000000001 183.9 329.1000000000001 166.4C329.1000000000001 148.7000000000001 342.8000000000001 137.0000000000001 362.5000000000001 137.0000000000001C375.8000000000001 137.0000000000001 388.1000000000001 143.7000000000001 393.7000000000001 154.4H394.1V138H413.7000000000001V206zM516 237.1H494.5L469.6 156.5H469.2L444.3000000000001 237.1H422L457.9 137.8L456 131.8C452.8 121.6 447.5 117.6 438.1 117.6C436.4000000000001 117.6 433.2000000000001 117.8 431.9000000000001 117.9V101.5000000000001C433.1 101.1000000000001 438.4000000000001 101.0000000000001 440.0000000000001 101.0000000000001C460.7 101.0000000000001 470.4 108.9 478.9 132.8000000000001L516 237.1z" />
+    <glyph glyph-name="cc-diners-club"
+      unicode="&#xF24C;"
+      horiz-adv-x="576" d=" M239.7 368.1C142.8 368.1 63.9 289.5 63.9 192.3C63.9 95.4 142.8 16.5 239.7 16.5C336.9 16.5 415.5 95.4 415.5 192.3C415.5 289.5 336.9 368.1 239.7 368.1zM199.8 88.5C158.1 104.4 128.4 144.9 128.4 192.3S158.1 280.2000000000001 199.8 296.4V88.5zM279.6 88.2V296.4C321.3 280.2000000000001 351 239.7 351 192.3S321.3 104.4 279.6 88.2000000000001zM528 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H528C554.5 -32 576 -10.5 576 16V368C576 394.5 554.5 416 528 416zM329.7 0H239.4C133.2 0 45.6 85.5 45.6 190.2C45.6 304.8 133.2 384 239.4 384H329.7C434.7 384 530.4 304.8 530.4 190.2C530.4 85.5 434.7 0 329.7 0z" />
+    <glyph glyph-name="cc-discover"
+      unicode="&#xF1F2;"
+      horiz-adv-x="576" d=" M83 235.9C83 228 79.8 220.4 74.1 215.2C69.2 210.8 62.5 208.8 52.2 208.8H48V263H52.2C62.5 263 68.9 261.3 74.1 256.4C79.8 251.4 83 243.8 83 235.9zM504.8 264H499.9V239.1H504.6C514.9 239.1 520.4 243.5 520.4 251.9C520.4 259.8 514.9 264 504.8 264zM576 368V16C576 -10.5 554.5 -32 528 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H528C554.5 416 576 394.5 576 368zM428 195H473.3V208.8H444V231H472.3V244.8H444V263H473.3V277H428V195zM341.8 277L376.8 192.8H385.4000000000001L420.9000000000001 277H403.4000000000001L381.2000000000001 221.8L359.3000000000001 277H341.8000000000001zM258.8 235.4C258.8 210.8 278.7 190.8 303.4000000000001 190.8C328.0000000000001 190.8 348.0000000000001 210.7 348.0000000000001 235.4C348.0000000000001 260 328.1000000000001 280 303.4000000000001 280C278.8 280 258.8 260.1 258.8 235.4zM190.8 235.9C190.8 203.4 224.4 183.4 254.1 197.7V216.7C234.8 197.4 207.3 210.9 207.3 235.9C207.3 259.6 234 275 254.1 254.9V273.9C223.9 288.9 190.8 267.1 190.8 235.9zM156.9 207.6C149.3 207.6 143.1 211.3 139.4 218.4L129.1 208.5C146.9 182.4 185.7 190.3 185.7 219.8C185.7 232.9 180.3 238.8 162.1 245.4C152.5 248.8 149.8 251.3 149.8 255.7C149.8 264.4 164.3 269.8 174.7 258.2000000000001L183.1 269C164 286.1 133.4 277.9000000000001 133.4 254.7C133.4 243.4 138.6 237.5000000000001 153.6 232.0000000000001C179.3 222.9 168.3 207.6 156.9 207.6zM99.5 235.9C99.5 260 81.5 277 55.4 277H32V195H55.4C86.3 195 99.5 217.4 99.5 235.9zM122.9 277H106.9V195H122.9V277zM544 160C510.7 139.2 317.6 35.6 128 0H529C537.2 0 544 6.8 544 15V160zM544 195L518.1 229.5C530.2 232 536.8000000000001 240.1 536.8000000000001 252.7C536.8000000000001 281.2 506.5000000000001 277.1 483.9000000000001 277.1V195.1H499.9000000000001V227.9H502.1000000000001L524.3000000000001 195.1H544z" />
+    <glyph glyph-name="cc-jcb"
+      unicode="&#xF24B;"
+      horiz-adv-x="576" d=" M431.5 203.7V236C472.7 236 470 235.8 470 235.8C477.3 234.5 483.3 228.5 483.3 219.8C483.3 211 477.3 205.3 470 204C468.8 203.6 466.7 203.7 431.5 203.7zM474.3 183.5C471.5 184.2 471 184 431.5 184V149C471.1 149 471.5 148.8 474.3 149.5C481.8 151 487.8 157.5 487.8 166.5C487.8 175.2 481.8 182 474.3 183.5zM576 368V16C576 -10.5 554.5 -32 528 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H528C554.5 416 576 394.5 576 368zM182 255.7H125C125 188.6 135.7 146 89.2 146C69.7 146 50.4 151.7 32 160.8V132.8C62 124.5 100 124.5 100 124.5C197.9 124.5 182 172.2 182 255.7zM360.5 251.2C297.1 267.2 195.5 266.1 195.5 191.9C195.5 114.8 303.7 118.3 360.5 132.7V161C312.9 136.3 253 139 253 192S312.8 247.6 360.5 223.2V251.2zM544 161.5C544 180 527.5 192 506 193.5V194.3C525.5 197 536.3 209.8 536.3 224.5C536.3 243.5 520.5999999999999 254.5 499.3 255.5C499.3 255.5 505.6 255.8 379 255.8V128.3H501.6999999999999C525.9999999999999 128.2 543.9999999999999 141.2 543.9999999999999 161.5z" />
+    <glyph glyph-name="cc-mastercard"
+      unicode="&#xF1F1;"
+      horiz-adv-x="576" d=" M482.9 37.7C482.9 30.9 478.3 26 471.7 26C464.9 26 460.5 31.2 460.5 37.7C460.5 44.2 464.9 49.4 471.7 49.4C478.3 49.4 482.9 44.2 482.9 37.7zM172.1 49.4C165 49.4 160.9 44.2 160.9 37.7C160.9 31.2 165 26 172.1 26C178.6 26 183 30.9 183 37.7C182.9 44.2 178.6 49.4 172.1 49.4zM289.6 49.7C284.2 49.7 280.9 46.2 280.1 41H299.2C298.3 46.7 294.8 49.7 289.6 49.7zM397.4 49.4C390.6 49.4 386.5 44.2 386.5 37.7C386.5 31.2 390.6 26 397.4 26C404.2 26 408.6 30.9 408.6 37.7C408.6 44.2 404.2 49.4 397.4 49.4zM503.3 23.3C503.3 22.9999999999999 503.6 22.8 503.6 22.1999999999999C503.6 21.8999999999999 503.3 21.6999999999999 503.3 21.0999999999999C502.9999999999999 20.7999999999999 502.9999999999999 20.5999999999999 502.8 20.2999999999999C502.4999999999999 19.9999999999999 502.3 19.7999999999999 501.6999999999999 19.7999999999999C501.3999999999999 19.4999999999999 501.1999999999999 19.4999999999999 500.5999999999999 19.4999999999999C500.2999999999999 19.4999999999999 500.0999999999999 19.4999999999999 499.4999999999999 19.7999999999999C499.1999999999999 19.7999999999999 498.9999999999999 20.0999999999999 498.6999999999999 20.2999999999999C498.3999999999999 20.5999999999999 498.1999999999999 20.7999999999999 498.1999999999999 21.0999999999999C497.8999999999999 21.5999999999999 497.8999999999999 21.8999999999999 497.8999999999999 22.1999999999999C497.8999999999999 22.6999999999999 497.8999999999999 22.9999999999999 498.1999999999999 23.3C498.1999999999999 23.8 498.4999999999999 24.1 498.6999999999999 24.4C498.9999999999999 24.7 499.1999999999999 24.7 499.4999999999999 24.9C499.9999999999999 25.2 500.2999999999999 25.2 500.5999999999999 25.2C501.0999999999999 25.2 501.3999999999999 25.2 501.6999999999999 24.9C502.1999999999999 24.6 502.4999999999999 24.6 502.8 24.4S502.9999999999999 23.8 503.3 23.3zM501.1 21.9C501.6 21.9 501.6 22.2 501.9 22.2C502.2 22.5 502.2 22.7 502.2 23C502.2 23.3 502.2 23.5 501.9 23.8C501.6 23.8 501.4 24.1 500.8 24.1H499.1999999999999V20.6H499.9999999999999V22H500.3L501.4 20.6H502.2L501.1 21.9zM576 367V15C576 -11.5 554.5 -33 528 -33H48C21.5 -33 0 -11.5 0 15V367C0 393.5 21.5 415 48 415H528C554.5 415 576 393.5 576 367zM64 227.4C64 150.9 126.1 88.9 202.5 88.9C229.7 88.9 256.4 97.1 279 112C206.1 171.3 206.6 283.2 279 342.5C256.4 357.5 229.7 365.6 202.5 365.6C126.1 365.7 64 303.6 64 227.4zM288 118.6C358.5 173.6 358.2 280.8 288 336.1C217.8 280.8 217.5 173.5 288 118.6zM145.7 42.3C145.7 51 140 56.7 131 57C126.4 57 121.5 55.6 118.2 50.5C115.8 54.6 111.7 57 106 57C102.2 57 98.4 55.6 95.4 51.6V56H87.2V19.3H95.4C95.4 38.2 92.9 49.5 104.4 49.5C114.6 49.5 112.6 39.3 112.6 19.3H120.5C120.5 37.6 118 49.5 129.5 49.5C139.7 49.5 137.7 39.5 137.7 19.3H145.9V42.3zM190.6 56H182.7V51.6C180 54.9 176.2 57 171 57C160.7 57 152.8 48.8 152.8 37.7C152.8 26.5 160.7 18.4 171 18.4C176.2 18.4 180 20.3 182.7 23.8V19.1999999999999H190.6V56zM231.1 30.4C231.1 45.4 208.2 38.6 208.2 45.6C208.2 51.3 220.1 50.4 226.7 46.7L230 53.2C220.6 59.3 199.8 59.2 199.8 45C199.8 30.7 222.7 36.7 222.7 30C222.7 23.7 209.2 24.2 202 29.2L198.5 22.9C209.7 15.3 231.1 16.9 231.1 30.4zM266.5 21.1L264.3 27.9C260.5 25.8 252.1 23.5 252.1 32V48.6H265.2000000000001V56H252.1000000000001V67.2H243.9000000000001V56H236.3000000000001V48.7H243.9000000000001V32C243.9000000000001 14.4 261.2000000000001 17.6 266.5000000000001 21.1zM279.8 34.4999999999999H307.3C307.3 50.6999999999999 299.9000000000001 57.1 289.9000000000001 57.1C279.3 57.1 271.7000000000001 49.2 271.7000000000001 37.8C271.7000000000001 17.3 294.3000000000001 13.9 305.5000000000001 23.6L301.7000000000001 29.6C293.9000000000001 23.2 282.1 23.8 279.8000000000001 34.4999999999999zM338.9000000000001 55.9999999999999C334.3 57.9999999999999 327.3 57.8 323.7000000000001 51.6V56H315.5000000000001V19.3H323.7000000000001V40C323.7000000000001 51.6 333.2000000000001 50.1 336.5000000000001 48.4L338.9000000000001 56zM349.5000000000001 37.6999999999999C349.5000000000001 49.0999999999999 361.1000000000001 52.8 370.2000000000001 46.0999999999999L374.0000000000001 52.5999999999999C362.4000000000001 61.6999999999999 341.3000000000001 56.6999999999999 341.3000000000001 37.5999999999999C341.3000000000001 17.7999999999999 363.7000000000001 13.7999999999999 374.0000000000001 22.5999999999999L370.2000000000001 29.0999999999999C361.0000000000001 22.5999999999999 349.5000000000001 26.4999999999999 349.5000000000001 37.6999999999999zM416.2000000000001 55.9999999999999H408V51.6C399.7 62.6 378.1 56.4 378.1 37.7C378.1 18.5 400.5 13 408 23.8V19.2H416.2V56zM449.9000000000001 55.9999999999999C447.5000000000001 57.1999999999999 438.9000000000001 58.8999999999999 434.7000000000001 51.6V56H426.8000000000001V19.3H434.7000000000001V40C434.7000000000001 51 443.7000000000001 50.3 447.5000000000001 48.4L449.9000000000001 56zM490.2 70.8999999999999H482.3000000000001V51.5999999999999C474.1000000000001 62.4999999999999 452.4000000000001 56.6999999999999 452.4000000000001 37.6999999999999C452.4000000000001 18.3 474.9000000000001 13.0999999999999 482.3000000000001 23.8V19.1999999999999H490.2V70.8999999999999zM497.8000000000001 145.9999999999999V141.3999999999999H498.6000000000001V146H500.5000000000001V146.8H495.9V146H497.8zM504.4000000000001 22.1999999999999C504.4000000000001 22.6999999999999 504.4000000000001 23.2999999999999 504.1000000000001 23.7999999999999C503.8000000000001 24.0999999999999 503.6000000000001 24.5999999999999 503.3000000000001 24.8999999999999C503.0000000000001 25.1999999999999 502.5000000000001 25.3999999999999 502.2 25.6999999999999C501.7 25.6999999999999 501.1 25.9999999999999 500.6 25.9999999999999C500.3 25.9999999999999 499.8 25.6999999999999 499.2 25.6999999999999C498.7 25.3999999999999 498.4 25.1999999999999 498.1 24.8999999999999C497.6 24.5999999999999 497.3 24.0999999999999 497.3 23.7999999999999C497 23.2999999999999 497 22.6999999999999 497 22.1999999999999C497 21.8999999999999 497 21.3999999999999 497.3 20.7999999999999C497.3 20.4999999999999 497.6 19.9999999999999 498.1 19.6999999999999C498.4 19.3999999999999 498.6 19.1999999999999 499.2 18.8999999999999C499.7 18.5999999999999 500.3000000000001 18.5999999999999 500.6 18.5999999999999C501.1 18.5999999999999 501.7 18.5999999999999 502.2 18.8999999999999C502.5000000000001 19.1999999999999 503.0000000000001 19.3999999999999 503.3000000000001 19.6999999999999C503.6000000000001 19.9999999999999 503.8000000000001 20.4999999999999 504.1000000000001 20.7999999999999C504.4000000000001 21.3999999999999 504.4000000000001 21.8999999999999 504.4000000000001 22.1999999999999zM507.6000000000001 146.8999999999999H506.2000000000001L504.6000000000001 143.3999999999999L503.0000000000001 146.8999999999999H501.6000000000001V141.4999999999999H502.4000000000001V145.5999999999999L504.0000000000001 142.0999999999999H505.1000000000001L506.5000000000001 145.5999999999999V141.4999999999999H507.6000000000001V146.8999999999999zM512.0000000000001 227.3999999999999C512.0000000000001 303.5999999999999 449.9000000000001 365.6999999999999 373.5000000000001 365.6999999999999C346.3000000000002 365.6999999999999 319.6000000000002 357.4999999999999 297.0000000000001 342.5999999999999C369.1000000000002 283.2999999999999 370.2000000000001 171.0999999999999 297.0000000000001 112.0999999999999C319.6000000000002 97.0999999999999 346.5000000000001 88.9999999999999 373.5000000000001 88.9999999999999C449.9000000000001 88.8999999999999 512.0000000000001 150.8999999999999 512.0000000000001 227.3999999999999z" />
+    <glyph glyph-name="cc-paypal"
+      unicode="&#xF1F4;"
+      horiz-adv-x="576" d=" M186.3 189.8C186.3 177.6 176.6 168.3 164.3 168.3C155.1 168.3 148.3 173.5 148.3 183.3C148.3 195.5 157.8 205.3 170 205.3C179.3 205.3 186.3 199.6 186.3 189.8zM80.5 238.3H75.8C74.3 238.3 72.8 237.3 72.6 235.6L68.3 208.9L76.5 209.2000000000001C87.5 209.2000000000001 96 210.7000000000001 98 223.4C100.3 236.8000000000001 91.8 238.3000000000001 80.5 238.3000000000001zM364.5 238.3H360C358.2 238.3 357 237.3 356.8 235.6L352.6 208.9L360.6 209.2000000000001C373.6 209.2000000000001 382.6 212.2000000000001 382.6 227.2000000000001C382.5 237.8000000000001 373 238.3000000000001 364.5 238.3000000000001zM576 368V16C576 -10.5 554.5 -32 528 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H528C554.5 416 576 394.5 576 368zM128.3 232.6C128.3 253.6 112.1 260.6 93.6 260.6H53.6C51.1 260.6 48.6 258.6 48.4 255.9L32 153.8C31.7 151.8 33.2 149.8 35.2 149.8H54.2C56.9 149.8 59.4 152.7 59.7 155.5L64.2 182.1C65.2 189.3 77.4 186.8 82.2 186.8C110.8 186.8 128.3 203.8 128.3 232.6zM212.5 223.8H193.5C189.7 223.8 189.5 218.3 189.3 215.6C183.5 224.1 175.1 225.6 165.6 225.6C141.1 225.6 122.4 204.1 122.4 180.4C122.4 160.9 134.6 148.2 154.1 148.2C163.1 148.2 174.3 153.1 180.6 160.1C180.1 158.6 179.6 155.4 179.6 153.9C179.6 151.6 180.6 149.9 182.8 149.9H200C202.7 149.9 205 152.8 205.5 155.6L215.7 219.9C216 221.8 214.5 223.8 212.5 223.8zM253 125.9L316.7 218.5C317.2 219 317.2 219.5 317.2 220.2C317.2 221.9 315.7 223.7 314 223.7H294.8C293.1 223.7 291.3 222.7 290.3 221.2L263.8 182.1999999999999L252.8 219.6999999999999C252 221.8999999999999 249.8 223.6999999999999 247.3 223.6999999999999H228.6C226.9000000000001 223.6999999999999 225.4000000000001 221.8999999999999 225.4000000000001 220.1999999999999C225.4000000000001 219 244.9000000000001 163.3999999999999 246.6 158.0999999999999C243.9000000000001 154.2999999999999 226.1 129.4999999999999 226.1 126.4999999999999C226.1 124.6999999999999 227.6 123.2999999999999 229.3 123.2999999999999H248.5C250.3 123.3999999999999 252 124.3999999999999 253 125.8999999999999zM412.3 232.6C412.3 253.6 396.1 260.6 377.6 260.6H337.9000000000001C335.2000000000001 260.6 332.7000000000001 258.6 332.4000000000001 255.9L316.2000000000001 153.9C316.0000000000001 151.9 317.5000000000001 149.9 319.4000000000001 149.9H339.9000000000001C341.9000000000001 149.9 343.4000000000001 151.4 343.9000000000001 153.1L348.4000000000001 182.1C349.4000000000001 189.3 361.6 186.8 366.4000000000001 186.8C394.8 186.8 412.3 203.8 412.3 232.6zM496.5 223.8H477.5C473.7 223.8 473.5 218.3 473.2 215.6C467.7 224.1 459.2 225.6 449.5 225.6C425 225.6 406.3 204.1 406.3 180.4C406.3 160.9 418.5 148.2 438 148.2C447.3 148.2 458.5 153.1 464.5 160.1C464.2 158.6 463.5 155.4 463.5 153.9C463.5 151.6 464.5 149.9 466.7 149.9H484C486.7 149.9 489 152.8 489.5 155.6L499.7 219.9C500 221.8 498.5 223.8 496.5 223.8zM544 257.1C544 259.1 542.5 260.6 540.8 260.6H522.3C520.8 260.6 519.3 259.4 519.0999999999999 257.9L502.8999999999999 153.9L502.5999999999999 153.4C502.5999999999999 151.6 504.0999999999999 149.9 506.0999999999999 149.9H522.5999999999999C525.0999999999999 149.9 527.5999999999999 152.8 527.8 155.6L544 256.8V257.1zM454 205.3C441.8 205.3 432.3 195.6 432.3 183.3C432.3 173.6 439.3 168.3 448.5 168.3C460.5 168.3 470.2 177.5 470.2 189.8C470.3 199.6 463.3 205.3 454 205.3z" />
+    <glyph glyph-name="cc-stripe"
+      unicode="&#xF1F5;"
+      horiz-adv-x="576" d=" M396.9 191.5C396.9 172.4 388.1 158.1 375 158.1C366.7 158.1 361.7 161.1 358.2 164.8L358 217.6C361.7 221.7 366.8 224.6 375 224.6C387.9 224.7 396.9 210.1 396.9 191.5zM576 368V16C576 -10.5 554.5 -32 528 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H528C554.5 416 576 394.5 576 368zM122.2 166.9C122.2 209.2 67.9 201.6 67.9 217.6C67.9 223.1 72.5 225.3 80 225.3C90.8 225.3 104.5 222 115.3 216.2V249.6C103.5 254.3 91.8 256.1 80 256.1C51.2 256.1 32 241.1 32 215.9C32 176.6 86 183 86 166C86 159.4 80.3 157.3 72.4 157.3C60.6 157.3 45.5 162.2 33.5 168.6V134.7000000000001C46.7 129.0000000000001 60.1 126.6 72.3 126.6C101.9 126.8 122.2 141.3 122.2 166.9zM191.1 253.8H164.1V284.6L129.4 277.2L129.2000000000001 163.3C129.2000000000001 142.3 145.0000000000001 126.8 166.1000000000001 126.8C177.7000000000001 126.8 186.3000000000001 128.9 191.0000000000001 131.5V160.3999999999999C186.5000000000001 158.5999999999999 164.0000000000001 152.0999999999999 164.0000000000001 173V223.5H191.0000000000001V253.8zM264.9000000000001 253.8C260.2000000000001 255.5 243.6 258.6 235.3000000000001 243.3L233.1000000000001 253.8H202.4000000000001V129.3H237.9000000000001V213.7C246.3000000000001 224.7 260.5000000000001 222.6 265.0000000000001 221.1V253.8zM309.1 253.8H273.4000000000001V129.3H309.1V253.8zM309.1 301.1L273.4000000000001 293.5V264.6L309.1 272.2V301.1zM431.8 192.3C431.8 233.6 408.3 256.1 383.4000000000001 256.1C369.5000000000001 256.1 360.5000000000001 249.5 355.6 245L353.8 253.8H322.5V88L358 95.5L358.1 135.7C363.2000000000001 132 370.8 126.7 383.2000000000001 126.7C408.6 126.8 431.8000000000001 147.2 431.8000000000001 192.3zM544 191.1C544 227.5 526.4 256.2 492.7 256.2C458.9 256.2 438.4 227.5 438.4 191.3C438.4 148.5 462.6 126.8 497.2 126.8C514.2 126.8 526.9 130.6999999999999 536.6 136V164.6C526.9 159.7 515.8000000000001 156.7 501.7 156.7C487.9 156.7 475.7 161.6 474.1 178.2H543.6C543.7 180.2 544 187.6 544 191.1zM492.4 227.2C483.5 227.2 473.7 220.5 473.7 204.5H510.4C510.4 220.5 501.1 227.2 492.4 227.2z" />
+    <glyph glyph-name="cc-visa"
+      unicode="&#xF1F0;"
+      horiz-adv-x="576" d=" M470.1 216.7S477.7 179.5 479.4 171.7H446C449.3 180.6 462 215.2 462 215.2C461.8 214.9 465.3 224.3 467.3 230.1L470.1 216.7zM576 368V16C576 -10.5 554.5 -32 528 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H528C554.5 416 576 394.5 576 368zM152.5 116.8L215.7 272H173.2L133.9 166L129.6 187.5L115.6 258.9C113.3 268.8 106.2 271.6 97.4 272H32.7L32 268.9C47.8 264.9 61.9 259.1 74.2 251.8L110 116.8H152.5zM246.9 116.6L272.1 272H231.9000000000001L206.8000000000001 116.6H246.9000000000001zM386.8 167.4C387 185.1 376.2 198.6 353.1 209.7000000000001C339 216.8000000000001 330.4000000000001 221.6000000000001 330.4000000000001 228.9000000000001C330.6 235.5000000000001 337.7000000000001 242.3000000000001 353.5000000000001 242.3000000000001C366.6000000000001 242.6000000000001 376.2000000000001 239.5000000000001 383.4000000000001 236.4000000000001L387.0000000000001 234.7000000000001L392.5000000000001 268.3000000000001C384.6000000000001 271.4000000000001 372.0000000000001 274.9000000000001 356.5000000000001 274.9000000000001C316.8000000000001 274.9000000000001 288.9000000000001 253.7000000000001 288.7000000000001 223.5C288.4000000000001 201.2 308.7000000000001 188.8 323.9000000000001 181.3C339.4000000000001 173.7 344.7000000000001 168.7 344.7000000000001 162C344.5000000000001 151.6 332.1 146.8 320.6 146.8C304.6 146.8 296 149.3 282.9000000000001 155.1L277.6 157.6L272 122.7000000000001C281.4 118.4 298.8 114.6 316.8 114.4C359 114.3 386.5 135.2000000000001 386.8 167.4zM528 116.6L495.6 272H464.5C454.9 272 447.6 269.2 443.5 259.1L383.8 116.6H426S432.9 135.8 434.4 139.9H486C487.2 134.4 490.8 116.6 490.8 116.6H528z" />
+    <glyph glyph-name="centercode"
+      unicode="&#xF380;"
+      horiz-adv-x="512" d=" M329.2 179.4C325.4 144.2 293.8 118.8 258.6 122.6C223.4 126.4 198 158 201.8 193.2C205.6 228.4 237.2 253.8 272.4 250C307.5 246.2 333 214.5999999999999 329.2 179.4zM243.4 -55.7C96.7 -48 -8.2 82.5 10.1 223.7C21.3 310.3 75.9 380.6 149.2 415.7C310.2 492.8 498.9 378.3 503.9 199.1C508 52.1 385.5 -63.1 243.4 -55.7zM423.3 124.3C451.1999999999999 242.3 262.8 330.2 186.1 358.5C128.6 302.2 117 169.9 152.3 14.1C221.1 -1.7 321.4 40.4999999999999 423.3 124.3z" />
+    <glyph glyph-name="chrome"
+      unicode="&#xF268;"
+      horiz-adv-x="496" d=" M131.5 230.5L55.1 347.9C102.7 407.1 174.1 439.7 247.1 440C289.4 440.3 332.6 429.5 371.9 406.8C415.3 381.6 448.3 345.4 469.3 303.8L264 314.6C205.9 318 150.6 285.3 131.5 230.5zM164.4 192C164.4 145.8 201.8 108.4 248 108.4S331.6 145.8 331.6 192S294.2000000000001 275.6 248.0000000000001 275.6S164.4 238.3 164.4 192zM479.3 281.2L339.6 274C377.5 229.7 378.1 165.8 346.2000000000001 116.8L234.1 -55.6C280.6 -58.1 328.5 -47.9 371.9 -22.7C479.3 39.3 522.8 169.3 479.3 281.2zM133.7 144.4L40.4 327.9C14.9 288.9 0 242.1 0 192C0 68 90.8 -34.7 209.5 -52.9L273.2 71.9C215.6 61.1 160 92.7000000000001 133.7 144.4z" />
+    <glyph glyph-name="cloudscale"
+      unicode="&#xF383;"
+      horiz-adv-x="448" d=" M318.1 294L308.7000000000001 286.4C286.2000000000001 305.7000000000001 257.2000000000001 320 225.4000000000001 320C153.8 320 96 259.2 96 187.7C96 181.1 96.4 174.6 97.4 168.3C95.4 224.3 139.2 265.7000000000001 190 265.7000000000001C214.2 265.7000000000001 236.2 256.3 252.6 241.0000000000001L227.4 220.6C219.1 221.5 210.6 218.8 204.3 212.5C193.2 201.5 193.2 183.6 204.3 172.5C215.4 161.5 233.2 161.5 244.3 172.5C250.6 178.8 253.3 187.4 252.4 195.6L327.6 284.4C333.9000000000001 290.9 324.3 300.3 318.1 294zM234.3 182.5C228.7 177 219.7 177 214.1 182.5C208.5 188.1 208.5 197.1 214.1 202.7S228.7 208.3 234.3 202.7S239.9 188 234.3 182.5zM224 416C100.5 416 0 315.5 0 192S100.5 -32 224 -32S448 68.5 448 192S347.5 416 224 416zM224 32C135.8 32 64 103.8 64 192S135.8 352 224 352S384 280.2 384 192S312.2 32 224 32z" />
+    <glyph glyph-name="cloudsmith"
+      unicode="&#xF384;"
+      horiz-adv-x="332" d=" M332.5 28.1C332.5 -18.3 294.9 -56 248.5 -56S164.5 -18.3 164.5 28.1S202.1 112.1 248.5 112.1S332.5 74.5 332.5 28.1zM248.5 272C294.9 272 328.5 309.6 328.5 356S294.9 440 248.5 440S160.5 402.4000000000001 160.5 356S130.9 280 84.5 280S0.5 238.4000000000001 0.5 192S38.1 112 84.5 112S168.5 145.6 168.5 192S202.1 272 248.5 272z" />
+    <glyph glyph-name="cloudversify"
+      unicode="&#xF385;"
+      horiz-adv-x="616" d=" M148.6 144C156.8 75.5 216 28.5 294.6 32.7C345.8 -10.6 431.4000000000001 -13.1 481 38.3C550.2 37.2 599.5 82.9 612.5 137.8C627.3 200.3 594.3 270.3 520.4 292.9C487.4 381 389 394.4 333.9 377.9C276.6 360.6 249.6 324.7 234.6 268.2C226.8 265.5 208.1 259.3 189.6 244.1C201.3 244.1 204.8 235.2 204.8 224.6V204.2C204.8 193.5 196.1 184.7 185.3 184.7H165.1C154.4 184.7 145.6 190.7 145.6 201.4V208H98.8C95 208 88 203.7 88 196.1V155.7C88 149.3 93.3 143.9 99.7 143.9H148.6zM376 136C365.3 89.7 397.7 63.6 431.3 49.2C324.1 15.4 259.7 100 296 160C262.8 138.4 262.3 88.8 266.8 67.1C248.9 79.5 213 99.5 209.4 146.9C206.4 186.8 230.9 222.6 266.4 240.8000000000001C297 256.6 369.9 249.3 400 200C385.9 248 346.2 270.1 298.2 274.8C329.1 305.5 362.6 325.1 412.4 318.5C482.2 309.2 545.5999999999999 235.7 480.1 168C515.0999999999999 184.3 528.8 222.4 527.5999999999999 244.9L538.0999999999999 225.3C549.8999999999999 203.3 553.3 177.7 547.4999999999999 153.3C538.2999999999998 114.3 506.8999999999999 84.5 467.7999999999999 76.8C435.6999999999999 70.5 384.7 81.9 375.9999999999999 136zM128 240H88.2C79.3 240 72 247.3 72 256.2V295.8C72 304.7 79.3 312 88.2 312H128C136.9 312 144.2 304.7 144.2 295.8V256.2C144.2 247.3 136.9 240 128 240zM10.1 280C4.5 280 0 284.5 0 290.1V317.9C0 323.5 4.5 328 10.1 328H37.8C43.3 328 47.9 323.5 47.9 317.9V290.1C47.9 284.5 43.4 280 37.8 280H10.1zM168 305.3V326.7000000000001C168 331.8 172.2 336 177.3 336H198.7C203.8 336 208 331.8 208 326.7000000000001V305.3C208 300.2000000000001 203.8000000000001 296 198.7 296H177.3C172.2 296 168 300.2 168 305.3zM56 212.5V187.5C56 181.2 50.9 176 44.6 176H19.4C13.1 176 8 181.2 8 187.5V212.5C8 218.8 13.1 224 19.4 224H44.5C50.9 224 56 218.8 56 212.5z" />
+    <glyph glyph-name="codepen"
+      unicode="&#xF1CB;"
+      horiz-adv-x="512" d=" M502.285 288.296L268.2850000000001 444.296C260.298 449.211 251.7740000000001 449.256 243.7140000000001 444.296L9.714 288.296C3.714 284.2970000000001 0 277.153 0 270.011V114.012C0 106.869 3.714 99.726 9.715 95.726L243.715 -60.296C251.702 -65.211 260.226 -65.256 268.286 -60.296L502.286 95.726C508.286 99.725 512.001 106.869 512.001 114.012V270.011C512 277.153 508.286 284.2970000000001 502.285 288.296zM278 384.8690000000001L450.286 270.011L373.429 218.582L278 282.2970000000001V384.8690000000001zM234 384.8690000000001V282.2970000000001L138.571 218.582L61.714 270.011L234 384.8690000000001zM44 228.868L99.143 192.011L44 155.154V228.868zM234 -0.847L61.714 114.011L138.571 165.4400000000001L234 101.725V-0.847zM256 140.011L178.285 192.011L256 244.011L333.7150000000001 192.011L256 140.011zM278 -0.847V101.725L373.429 165.4400000000001L450.286 114.0110000000001L278 -0.847zM468 155.154L412.857 192.011L468 228.868V155.154z" />
+    <glyph glyph-name="codiepie"
+      unicode="&#xF284;"
+      horiz-adv-x="472" d=" M422.5 245.1C453.2 245.1 456 192 422.2 192H411.4V147.7H384.8V245.1H422.5zM472 95.4C429.9 3.5 350.4 -56 248 -56C111 -56 0 55 0 192S111 440 248 440C345.4 440 420.8 386.3 466.2 301.6L280.2 192.8L472 95.4zM433.5 82.9L373.2 113.6C346.1 69.3 302.8 42.1999999999999 250.8 42.1999999999999C168.3 42.1999999999999 101.6 108.8999999999999 101.6 191.0999999999999C101.6 273.5999999999999 168.3 340.2999999999999 250.8 340.2999999999999C299.2 340.2999999999999 339.7 316.7999999999999 367.7 276.8999999999999L427.2 311.4999999999999C386.5 374.0999999999999 322.5 411.4999999999999 248 411.4999999999999C126.8 411.4999999999999 28.5 313.1999999999999 28.5 191.9999999999999S126.8 -27.5 248 -27.5C326.6 -27.5 394.5 14.6 433.5 82.9z" />
+    <glyph glyph-name="connectdevelop"
+      unicode="&#xF20E;"
+      horiz-adv-x="576" d=" M550.5 207L500.411 293.786C501.482 295.928 502.286 298.339 502.286 301.0180000000001C502.286 309.054 495.59 315.751 487.554 316.019L432.107 411.9120000000001C432.643 413.519 433.178 415.126 433.178 416.733C433.178 425.304 426.214 432.001 417.91 432.001C413.089 432.001 409.071 429.858 406.124 426.376H299.518C296.839 429.857 292.8210000000001 432 288 432S279.161 429.857 276.482 426.375H170.411C167.464 429.857 163.447 432 158.625 432C150.322 432 143.357 425.304 143.357 416.732C143.357 415.125 143.893 413.25 144.429 411.911L88.446 314.678C83.09 312.2680000000001 79.339 307.178 79.339 301.017C79.339 300.482 79.607 299.9460000000001 79.607 299.41L26.303 207.267C19.071 205.928 13.713 199.767 13.713 192.267C13.713 185.035 18.802 178.874 25.767 177.267L80.946 81.909C80.41 80.302 80.142 78.963 80.142 77.088C80.142 69.8559999999999 85.231 63.6949999999999 92.196 62.356L143.893 -27.376C143.357 -28.983 142.822 -30.858 142.822 -32.733C142.822 -41.304 149.786 -48.001 158.09 -48.001C162.911 -48.001 166.929 -45.858 169.608 -42.6439999999999H276.483C279.161 -45.857 283.447 -48 288 -48S296.839 -45.857 299.5180000000001 -42.643H406.6610000000001C409.3390000000001 -45.589 413.3570000000001 -47.464 417.6430000000001 -47.464C426.2140000000001 -47.464 432.9110000000001 -40.5 432.9110000000001 -32.196C432.9110000000001 -30.589 432.6440000000001 -29.25 432.1080000000001 -27.911L483.8050000000001 62.357C490.7690000000001 63.696 495.859 69.857 495.859 77.0889999999999C495.859 78.696 495.5910000000001 80.3029999999999 495.0550000000001 81.91L549.9660000000001 177.268C556.9300000000002 178.607 562.2880000000001 184.768 562.2880000000001 192.268C562.2860000000002 199.5 557.1960000000001 205.661 550.5000000000001 207zM153.535 -2.732L109.875 73.071H153.535V-2.732zM153.535 81.107H109.875C109.607 82.178 109.071 83.249 108.536 84.321L153.535 131.731V81.107zM153.535 143.518L103.178 90.2139999999999C101.839 90.7499999999999 100.499 91.5539999999999 99.16 91.821L43.447 188.25C43.982 189.589 43.982 190.929 43.982 192.268S43.982 194.678 43.714 195.75L95.679 285.75C98.358 286.0180000000001 101.036 286.822 103.447 288.429L153.536 236.464V143.518zM153.535 245.84L107.732 293.25C109.071 295.393 109.875 298.071 109.875 301.017C109.875 301.285 109.607 301.821 109.607 302.089L153.535 317.893V245.84zM153.535 326.465L109.875 310.661L153.535 386.197V326.465zM480.054 287.357L480.8579999999999 286.018L445.5 118.875L381.75 186.107L479.786 287.625L480.054 287.357zM291.75 92.893L303.2680000000001 81.107H280.5L291.75 92.893zM291.4820000000001 104.143L208.179 189.589L287.7320000000001 273.964L370.7680000000001 186.375L291.4820000000001 104.1429999999999zM296.8390000000001 98.25L376.1250000000001 180.482L443.6250000000001 109.232L437.7330000000001 81.107H313.714L296.839 98.25zM410.411 403.607C411.4820000000001 403.0710000000001 412.553 402.535 413.8930000000001 402.267L471.75 301.553V301.017C471.75 298.0710000000001 472.553 295.3930000000001 473.893 293.25L376.393 192L293.358 279.589L410.411 403.607zM401.304 405.75L287.7320000000001 285.482L230.6780000000001 345.75L397.0170000000001 405.75H401.3040000000001zM277.821 405.75C280.499 403.072 283.981 401.4650000000001 288 401.4650000000001S295.5 403.072 298.1789999999999 405.75H373.1789999999999L224.786 352.179L173.893 405.75H277.8210000000001zM161.572 400.125L162.643 402.267A33.834 33.834 0 0 1 165.322 403.0710000000001L216.483 349.231L161.572 329.41V400.125zM161.572 320.839L222.375 342.803L282.107 279.589L202.554 195.482L161.572 237.535V320.839zM161.572 228.161L198 190.393L161.572 152.089V228.161zM161.572 140.303L203.625 184.767L286.393 98.785L269.25 81.107H161.572V140.303zM168.536 -21.75C166.929 -20.143 165.054 -19.072 162.643 -18.268L161.572 -16.6609999999999V73.071H261.482L169.875 -21.75H168.536zM298.447 -21.75C295.7680000000001 -19.34 292.019 -17.465 288 -17.465S280.233 -19.34 277.553 -21.75H181.124L272.731 73.071H311.035L402.642 -21.75H298.447zM418.447 -9.964L414.161 -17.464C412.822 -17.732 411.751 -18.267 410.679 -18.803L321.483 73.072H435.8589999999999L418.447 -9.964zM431.303 12.268L444.161 73.071H466.125L431.303 12.268zM466.125 81.107H445.7680000000001L450.3210000000001 102.2670000000001L467.4640000000001 84.0530000000001C466.929 83.2500000000001 466.393 82.179 466.1250000000001 81.107zM532.2860000000001 188.518L476.8390000000001 91.821C475.5000000000001 91.286 474.1600000000001 90.75 472.8210000000001 89.947L452.1960000000001 111.911L486.7500000000001 275.839L532.5530000000001 196.553C532.2860000000001 195.214 531.7500000000001 193.875 531.7500000000001 192.268C531.7500000000001 190.929 532.0180000000001 189.857 532.2860000000001 188.518z" />
+    <glyph glyph-name="contao"
+      unicode="&#xF26D;"
+      horiz-adv-x="512" d=" M45.4 143C59.8 75.9 71.8 14 113.6 -32H34C15.3 -32 0 -16.8 0 2V382C0 400.7 15.2 416 34 416H91.7C77.9 403.4 65.6 388.8 54.8 372.4C9.4 302.4 27.8 225.6 45.4 143zM478 416H387.8C409.2 394.6 427 366.5 440.5 331.9L303.4 302.6C288.5 331.6 265.6 355.9 220.8 346.5C196.2 341.2 179.8 327.2 172.5 311.9C163.7 293.2000000000001 159.3 272.1 180.7 171.6C201.8 71.4 214.4 53.9 230.2 40.4C243.1 29.3 263.6 23.4 288.5 28.7C333 38.1 344.2 69.4 345.9 101.9L483.3 131.5000000000001C486.4999999999999 60.0000000000001 464.6 6.3000000000001 425.9 -32.0999999999999H478C496.7 -32.0999999999999 512 -16.8999999999999 512 1.9000000000001V382C512 400.8 496.8 416 478 416z" />
+    <glyph glyph-name="cpanel"
+      unicode="&#xF388;"
+      horiz-adv-x="640" d=" M52.9 234.3H92.9L86.7 210.7C84.8 204.2 79.3 199.8 72.4 199.8H53.8C28.9 199.8 29.1 162.4 53.8 162.4H65.1C69.3 162.4 72.7 158.5000000000001 71.5 154.1L64.4 128H52C18.5 128 -7 159.4 1.7 193.2C9 220.2 30 234.3 52.9 234.3M73.1 128L108 258.1C109.8 264.5 115.2 269 122.3 269H159.3C183.4 269 204.7 252.6 210.3 227.8C216.9 198.7 195.8 162.5 158.6 162.5H126.6L133 186.3C134.8000000000001 192.5 140.3000000000001 197.1 147.3000000000001 197.1H157.6000000000001C170.0000000000001 197.1 178.4000000000001 208.8 175.9000000000001 219.7C173.8000000000001 228.9 166.0000000000001 234.5000000000001 157.6000000000001 234.5000000000001H137.8000000000001L112 138.8C110.1 132.6 104.6 128.1 97.8 128.1L73.1 128M293.7 197.4C294 198.4 295.6 202.7 291.6 202.7H234.1C224.4 202.7 217.5 211.6 219.9 221.2L223.4 234.6H301.3C320.1 234.6 334.6 217 329.8 197.8L315.8 146C313 135.4 303.6 128.2 292.4 128.2L234.9 128.4C192 128.4 196.4 192.2 235.6 192.2H284L280.5 179C278.6 172.8 273.1 168.2 266.3 168.2H244.7C239.4 168.2 239.4 160.3 244.7 160.3H279.6C284.2000000000001 160.3 284.7000000000001 164.2 285.1 165.6L293.7000000000001 197.4M396.8000000000001 234.3000000000001C431.2000000000001 234.3000000000001 456.1000000000001 202.0000000000001 447.1000000000001 168.9L438.3000000000001 135.8C437.1000000000001 130.9 432.6000000000001 128 428.0000000000001 128H408.9000000000001C404.4000000000001 128 401.3 132 402.5000000000001 136.3L413.1000000000001 176.3C416.4000000000001 187.9 407.5000000000001 199.7 395.0000000000001 199.7H375.2000000000001L358.0000000000001 135.7000000000001C356.8000000000001 130.9 352.4000000000001 127.9 347.6000000000001 127.9H328.7000000000001C324.5000000000001 127.9 321.1000000000001 131.8 322.3000000000002 136.2000000000001L348.5000000000001 234.2000000000001H396.8000000000002M498 196.4L490 166.4C489.1 163.1 491.5 159.7 495.1 159.7H568.4L562.6999999999999 138.7C560.8 132.5 555.3 128 548.4999999999999 128H481.7999999999999C461.7999999999999 128 448.4999999999999 147 453.4999999999999 164.7L464.2999999999999 204.7C469.0999999999999 222.3 484.9999999999999 234.3 502.8999999999999 234.3H550.1999999999999C569.1999999999999 234.3 583.4 216.6 578.4999999999999 197.5L575.2999999999998 185.5C572.3999999999999 174.5 562.5999999999998 167.9 552.0999999999998 167.9H498.6999999999998L502.1999999999998 180.9C503.7999999999998 187.1 509.3999999999998 191.7 516.3999999999999 191.7H538C540 191.7 541.3 192.7 541.9 194.7L542.6 197.3C543.3000000000001 200 541.3000000000001 202.4 538.7 202.4H505.8000000000001C501.7 202.4 498.9000000000001 200.3 498.0000000000001 196.4zM568.2 128L603.8000000000001 261.1C605.0000000000001 265.8 609.3000000000001 269 614.2 269H633.1C637.6 269 640.8000000000001 265 639.6 260.7L613.1 162.5C608 141.8 588.9 128 568.2 128" />
+    <glyph glyph-name="creative-commons-by"
+      unicode="&#xF4E7;"
+      horiz-adv-x="496" d=" M314.9 253.6V152.2H286.6V31.7H209.5V152.1H181.2V253.6C181.2 258 182.8 261.8 185.8 264.9C188.9 268 192.7 269.6 197.1 269.6H299C303.1 269.6 306.8 268 310.1 264.9C313.2000000000001 261.7000000000001 314.9000000000001 258 314.9000000000001 253.6zM213.4 317.3C213.4 340.6 224.9 352.3 247.9 352.3S282.4 340.6 282.4 317.3C282.4 294.3 270.9 282.8 247.9 282.8S213.4 294.3 213.4 317.3zM247.6 440C389.4 440 496 329.9 496 192C496 44.9 377.5 -56 247.6 -56C113.6 -56 0 53.5 0 192C0 324.9 104.7 440 247.6 440zM248.4 395.3C130.2 395.3 44.7 297.4 44.7 192C44.7 82.2 135.9 -10.8 248.4 -10.8C351.6 -10.8 451.2 70.3 451.2 192C451.3 305.8 361 395.3 248.4 395.3z" />
+    <glyph glyph-name="creative-commons-nc-eu"
+      unicode="&#xF4E9;"
+      horiz-adv-x="496" d=" M247.7 440C103.6 440 0 323.2 0 192C0 55.7 111.7 -56 247.7 -56C377.9 -56 496 44.9 496 192C496 331 388.4 440 247.7 440zM248.3 -10.7C136.3 -10.7 44.7 81.8 44.7 192C44.7 215.2 48.4 237.2 55.6 258L121.3 228.9H116.6V199.4H139.9C139.9 193.2 139.5 196.2 139.5 179.9H116.7V150.4H143.7C155.1 83.4 210.9 49.1 268.3 49.1C294.9 49.1 318.9 56.9999999999999 333.1 64.9L323.1 111C314.4 106.4 294.9 100.2 275.8 100.2C247.6 100.2 217.7 111.1 208.5 150.4H298.8L427.1 93.6C425.6 91.4999999999999 370.9 -10.7 248.3 -10.7zM231.6 179.9L231.1 180.3L232 179.9H231.6zM308.8 199.4H312.5V228.9H242.2L213.6 241.5C216.1 247 219 252 222.4 255.8C235.3 271.6 253.5 278.2 273.5 278.2C291.8 278.2 308.8 272.8 319.6 268.2L331.2000000000001 315.5C316.2000000000001 322.1 294.2000000000001 327.9 268.9000000000001 327.9C229.9000000000001 327.9 196.7000000000001 312.1 173 285.6C167.7 279.5 163.2 272.7000000000001 159.1 265.5L77.5 301.6C142.1 398.4000000000001 235.2 395.2000000000001 248.2 395.2000000000001C361.2000000000001 395.2000000000001 451.2 305 451.2 191.8C451.2 173.1 449.1 155.5 444.9000000000001 138.9L308.8000000000001 199.4z" />
+    <glyph glyph-name="creative-commons-nc-jp"
+      unicode="&#xF4EA;"
+      horiz-adv-x="496" d=" M247.7 440C103.6 440 0 323.2 0 192C0 55.6 111.8 -56 247.7 -56C377.9 -56 496 44.8 496 192C496 330.8 388.5 440 247.7 440zM248.3 -10.7C136.3 -10.7 44.7 81.8 44.7 192C44.7 213.1 47.7 233.2 53.7 252.3L180.7 195.8H152.8V157.2H210.9L216.6 145.4V126.7H152.8V88H216.6V32H278.3V88H342.5V123.7L423.5 87.6C422 85.4 366.3999999999999 -10.7 248.3 -10.7zM335.9 126.6H278.3V145.3L281.2 150.9L335.8999999999999 126.6zM342.4 178V195.8H303.8L366.8 311.8H301L257.6 215.8L234.6 226L195 311.7H129.2000000000001L156.5000000000001 260.7L74.6000000000001 297.2C102.4000000000001 341.3 157.2000000000001 395.3 248.3000000000001 395.3C361.1 395.3 451.3000000000001 305.3 451.3000000000001 191.9C451.3000000000001 170.9 448.6000000000001 151.3 443.4000000000001 132.9L342.4000000000001 178z" />
+    <glyph glyph-name="creative-commons-nc"
+      unicode="&#xF4E8;"
+      horiz-adv-x="496" d=" M247.6 440C387.4 440 496 332.1 496 192C496 44.8 377.5 -56 247.6 -56C113.1 -56 0 54.8 0 192C0 324.9 104.7 440 247.6 440zM55.8 258.9C48.4 238.5 44.7 216.2 44.7 192C44.7 81.1 136.8 -10.4 248.4 -10.4C370.8 -10.4 425.6 91.4 426.9 93.7000000000001L333.5 135.3000000000001C325.8 98.2000000000001 292.3 82.3000000000001 265.3 79.9000000000001V41.8000000000001H236.5V80C209 80.3 183.9 90.2 161.2 109.7L195.3 144.2C227 114.8 281.7 112.4 281.7 146.4C281.7 152.6 279.5 157.6 275.1 161.5C260.9 167.5 273.3 161.6 55.8 258.9zM248.4 395.7C210 395.7 136 387 77.9 302.7L172.7 260.2C182.7 291.5 213.1 303.1 236.5 304.5V342.6H265.3V304.5C288 303.3 308.7 295.6 327.3 281.5L295 248.3C252.3 278.2000000000001 211.5 256.3 225 237.2C278.4 213.1 268.8 217.4 318 195.6L445.1 138.9C449.2000000000001 156.3 451.3 174.0000000000001 451.3 192C451.3 249.0000000000001 431.5 297 392 335.9000000000001C352.7 375.8000000000001 304.8 395.7000000000001 248.4 395.7000000000001z" />
+    <glyph glyph-name="creative-commons-nd"
+      unicode="&#xF4EB;"
+      horiz-adv-x="496" d=" M247.6 440C389.4 440 496 329.9 496 192C496 44.9 377.5 -56 247.6 -56C113.6 -56 0 53.5 0 192C0 324.9 104.7 440 247.6 440zM248.4 395.3C130.2 395.3 44.7 297.4 44.7 192C44.7 82.2 135.9 -10.8 248.4 -10.8C351.6 -10.8 451.2 70.3 451.2 192C451.3 305.8 361 395.3 248.4 395.3zM342.4 251V208.5H162.1V251H342.4zM342.4 171.2V128.7H162.1V171.2H342.4z" />
+    <glyph glyph-name="creative-commons-pd-alt"
+      unicode="&#xF4ED;"
+      horiz-adv-x="496" d=" M247.6 440C389.4 440 496 329.9 496 192C496 44.9 377.5 -56 247.6 -56C113.6 -56 0 53.5 0 192C0 324.9 104.7 440 247.6 440zM248.4 395.3C130.2 395.3 44.7 297.4 44.7 192C44.7 82.2 135.9 -10.8 248.4 -10.8C351.6 -10.8 451.2 70.3 451.2 192C451.3 305.8 361 395.3 248.4 395.3zM135.5 124.7V262H203.7C237.4 262 254.2 246.5 254.2 215.5C254.2 206.5 251.2 169 197.1 169H170.1V124.7H135.5zM169.6 236.3V194.7H198.8C226.7 194.7 228.8 236.3 197.9 236.3H169.6zM263.5 124.7V262H316.7C338.1 262 386.7 256.8 386.7 193.4C386.7 129.9 338.1 124.8 316.7 124.8H263.5zM297.6 233.2V153.5H317.5C341.5 153.5 352 168.8 352 193.4C352 235.4 320.8 233.3 317 233.3L297.6 233.2z" />
+    <glyph glyph-name="creative-commons-pd"
+      unicode="&#xF4EC;"
+      horiz-adv-x="496" d=" M248 440C111 440 0 328.9 0 192C0 55 111 -56 248 -56S496 55 496 192C496 328.9 385 440 248 440zM248 -9.5C108.8 -9.5 12.2 128.5 57.8 258.4L136.6 223.3C134.5 212.8 133.3 201.8 133.3 190.4C133.3 91.4 207.2 63.5 253.7 63.5C276.6 63.5 307.2000000000001 70.2 333.1 93L297 136.9C291.5 130.6 279.4 120.2 260.7 120.2C222.9 120.2 207 160.1 206.8 192.1C437.2 89.5 423.3 95.6 424.7 95.3C390.4 32.9 324.1 -9.5 248 -9.5zM442.2 140.5L218.2 240.5C237 274.5 273.1 271.2 292.9 251.5L333.3 293.1C306.2 316.4 275.3 320.6 255.2 320.6C207.8 320.6 174.3 300.1 154.5 269L79.5999999999999 302.4C115.6999999999999 357.3 177.6999999999999 393.6 248.1 393.6C359.2 393.6 449.5999999999999 303.2 449.5999999999999 192.1C449.5999999999999 174.1 447.2 156.7000000000001 442.7999999999999 140.1C442.4999999999999 140.2000000000001 442.3999999999999 140.3 442.1999999999999 140.5z" />
+    <glyph glyph-name="creative-commons-remix"
+      unicode="&#xF4EE;"
+      horiz-adv-x="496" d=" M247.6 440C389.4 440 496 329.9 496 192C496 44.9 377.5 -56 247.6 -56C113.6 -56 0 53.5 0 192C0 324.9 104.7 440 247.6 440zM248.4 395.3C130.2 395.3 44.7 297.4 44.7 192C44.7 82.2 135.9 -10.8 248.4 -10.8C351.6 -10.8 451.2 70.3 451.2 192C451.3 305.8 361 395.3 248.4 395.3zM410.1 187.6L415 185.4V115.4C407.8 111.8 351.6 87.9 347.7 86.6C341.2 88.4 234 133.4 210.4 142.8L146.2 116.2L82.9 143.7V207.5L142.2 232.3C141.5 233 141.8 227.3 141.8 302.7000000000001L209.1 332.4000000000001L361 269.5V207.9L410.1 187.6zM339.7000000000001 106.1V149.9H339.3000000000001V151.7000000000001L225.5000000000001 198.2000000000001V153L339.3000000000001 106.1V106.5L339.7000000000001 106.1zM347.2000000000001 163.7000000000001L387.1 180.1L350.3 195.6L311.3 179.2000000000001L347.2 163.7000000000001zM399.5000000000001 125.6V168.6L355.2 150V106.6L399.5 125.6z" />
+    <glyph glyph-name="creative-commons-sa"
+      unicode="&#xF4EF;"
+      horiz-adv-x="496" d=" M247.6 440C389.4 440 496 329.9 496 192C496 44.9 377.5 -56 247.6 -56C113.6 -56 0 53.5 0 192C0 324.9 104.7 440 247.6 440zM248.4 395.3C130.2 395.3 44.7 297.4 44.7 192C44.7 82.2 135.9 -10.8 248.4 -10.8C351.6 -10.8 451.2 70.3 451.2 192C451.3 305.8 361 395.3 248.4 395.3zM137.7 227C150.7 310.9 218.2 322.7 246.6 322.7C346.4 322.7 374.1 240.2 374.1 188.5C374.1 124.9 333.1 55.6 245.2 55.6C206.3 55.6 146.1 75.6 135.8 152.6H198.3C199.8 122.5 217.9 107.4 252.8 107.4C276.1 107.4 310.8 125.6 310.8 190.2000000000001C310.8 272.7000000000001 261.7 270.8000000000001 254.1 270.8000000000001C221 270.8000000000001 202.4 256.2000000000001 198.3 227.0000000000001H216.5L167.3 177.8000000000001L118.3 227.0000000000001H137.7z" />
+    <glyph glyph-name="creative-commons-sampling-plus"
+      unicode="&#xF4F1;"
+      horiz-adv-x="496" d=" M247.6 440C389.4 440 496 329.9 496 192C496 44.9 377.5 -56 247.6 -56C113.6 -56 0 53.5 0 192C0 324.9 104.7 440 247.6 440zM248.4 395.3C130.2 395.3 44.7 297.4 44.7 192C44.7 82.2 135.9 -10.8 248.4 -10.8C351.6 -10.8 451.2 70.3 451.2 192C451.3 305.8 361 395.3 248.4 395.3zM355.4 189.7C350.7 189.7 346.4 186.9 344.7 182.5L340.7 173L329.7 265.8C328 279.7000000000001 307.7 279.2000000000001 306.6 265.4L302.3 214L297.1 282.8C296 297.1 275 297 273.9 282.8L270.4 237.9L264.5 332.2C263.6 346.7 242.2 346.6 241.3 332.2L236.2 248.5L231.9 314.8C231 329.2000000000001 209.7 329.2000000000001 208.7 314.8L203.4 234.6L199.3 291.6C198.2 305.9000000000001 177.3 305.9000000000001 176.1 291.8L168.4 202L166.6 214.2C164.9 225.6 149.5 227.8 144.6 217.5L131.4 189.8H87.5V166.6H138.8C143.2 166.6 147.2 169.1 149.2 173L159.9 99.9C161.9 86.4 181.8 86.9 183 100.6L186.8 144.2L192.5 65.9C193.6 51.5 214.8 51.7 215.7 66L220.3 136.4L225.1 63.1C226 48.7 247.4 48.7 248.3 63.2L253.2 143.7L257.7 71.9C258.6 57.6 279.8 57.4 280.9 71.7L285.5 130.3L290.4 65.9C291.5 51.6 312.4 51.7 313.5 65.8L320.3 148.8L323 126.5C324.4 114.6999999999999 340.7 112.3999999999999 345.3 123.3999999999999L363.3 166.7999999999999H413.8V190L355.4000000000001 189.7zM277.4 184.5H255.5V162.6C255.5 158.5 252.2 155.1 248 155.1C243.9 155.1 240.5 158.4 240.5 162.6V184.5H218.6C214.5 184.5 211.1 187.8 211.1 192C211.1 196.1 214.5 199.5 218.6 199.5H240.5V221.4C240.5 225.5 243.9 228.9 248 228.9S255.5 225.6 255.5 221.4V199.5H277.4C281.5 199.5 284.9 196.2 284.9 192C284.9 187.9 281.5 184.5 277.4 184.5z" />
+    <glyph glyph-name="creative-commons-sampling"
+      unicode="&#xF4F0;"
+      horiz-adv-x="496" d=" M247.6 440C389.4 440 496 329.9 496 192C496 44.9 377.5 -56 247.6 -56C113.6 -56 0 53.5 0 192C0 324.9 104.7 440 247.6 440zM248.4 395.3C130.2 395.3 44.7 297.4 44.7 192C44.7 82.2 135.9 -10.8 248.4 -10.8C351.6 -10.8 451.2 70.3 451.2 192C451.3 305.8 361 395.3 248.4 395.3zM252 342.1C254.8 342.4 263.5 341.1 263.5 330.6L270.1 223.4L275 282.7C275 288.7 279.7 293.3 285.6 293.3C291.5 293.3 296.2000000000001 288.6 296.2000000000001 282.7C296.2000000000001 280.2 295.7000000000001 288.4 301.9000000000001 201.2L307.7000000000001 265.4C308.0000000000001 268.3 310.6 274.7 317.9000000000001 274.7C321.7000000000001 274.7 327.8 272.4 328.5000000000001 265.8L340.0000000000001 169.3L345.3000000000001 182.1C347.1000000000001 186.5 350.5000000000001 188.7 355.5000000000001 188.7H413.5000000000001V167.4H362.6000000000001L344.4000000000001 123.1C340.5000000000001 113.2 324.9000000000001 114 323.6000000000001 126.2L319.6000000000001 158.1L312.1000000000001 65.5C311.8000000000001 62.5 309.1000000000001 56.2 301.9000000000001 56.2C298.9000000000001 56.2 292.1000000000001 58.3 291.3000000000001 65.5C291.3000000000001 67.4 291.9000000000001 59.7 285.1000000000001 143.4L279.8000000000001 71.2C278.7000000000001 66.4 275.0000000000001 61.9 269.2000000000001 61.9C266.3000000000001 61.9 259.4000000000001 63.9 258.6 71.2C258.6 73.1 259.1 64.5 252.8 158.9L247 64.1C247 57.8 243.4 51.7 236.4 51.7C231.2 51.7 225.8 55.8 225.8 63.7L220 151.4C214.2 58.9 214.7 67.4 214.7 65.5C213.6 60.7 209.9 56.2 204.1 56.2C201.1 56.2 194.3 58.3 193.5 65.5C193.5 66.2 193.1 66.6 193.1 68.1L186.9 156.7000000000001L182 100C181.3 93.5 175.3 90.7 171.4 90.7C165.6 90.7 161.8 94.8 160.8 99.6L149.7 176C147.7 172 146.2 167.6 138.6 167.6H87.2V188.9H132L145.7 216.8000000000001C150.1 226.7000000000001 163.9 224 165.6 214.1000000000001L168.7 193.7000000000001L177.1 291.6C177.1 297.6 181.9 302.2000000000001 187.7 302.2000000000001C188.2 302.2000000000001 198.3 302.4000000000001 198.3 289.8000000000001L203.2 220.7000000000001L209.8 313.3000000000001C209.8 323.4000000000001 219.3 323.9000000000001 220 323.9000000000001C220.6 323.9000000000001 230.6 323.2000000000001 230.6 313.3000000000001L235.9 232.7000000000001L242.1 330.6C242.2 331.7000000000001 241.5 340.9000000000001 252 342.1z" />
+    <glyph glyph-name="creative-commons-share"
+      unicode="&#xF4F2;"
+      horiz-adv-x="496" d=" M247.6 440C389.4 440 496 329.9 496 192C496 44.9 377.5 -56 247.6 -56C113.6 -56 0 53.5 0 192C0 324.9 104.7 440 247.6 440zM248.4 395.3C130.2 395.3 44.7 297.4 44.7 192C44.7 82.2 135.9 -10.8 248.4 -10.8C351.6 -10.8 451.2 70.3 451.2 192C451.3 305.8 361 395.3 248.4 395.3zM349.4 262.9C357.2 262.9 363.1 256.8 363.1 249.2V66.7C363.1 59 357 53 349.4 53H214.3C206.6 53 200.6 59 200.6 66.7V120.7H146.6C138.8 120.7 132.9 126.7 132.9 134.4V316.9C132.9 325.1 139.5 329.6 145.3000000000001 330.6H281.7000000000001C289.4000000000001 330.6 295.4000000000001 324.6 295.4000000000001 316.9V262.9H349.4000000000001zM159.9 147.7H200.6V249.1C200.6 256.5 206.4 261.7 212.6 262.8H268.4000000000001V303.1H159.9V147.6999999999999zM336.1 235.8H227.6V80.4H336.1V235.8z" />
+    <glyph glyph-name="creative-commons"
+      unicode="&#xF25E;"
+      horiz-adv-x="496" d=" M254.8 233.2L221.6 215.9C212.2 235.5 196.4 235.8 194.1 235.8C172 235.8 160.9 221.2 160.9 192C160.9 168.4 170.1 148.2 194.1 148.2C208.6 148.2 218.8 155.3 224.7 169.5L255.3 154C249.1 142.5 229.6 115 190.2 115C167.6 115 116.2 125.3 116.2 192.1C116.2 250.8 159.2 269.2 188.8 269.2C219.6 269 241.5 257.1 254.8 233.2zM397.9 233.2L365.1 215.9C355.6 235.7 339.4 235.8 337.2 235.8C315.1 235.8 304 221.2 304 192C304 168.4 313.2 148.2 337.2 148.2C351.7 148.2 361.8 155.3 367.7 169.5L398.7 154C396.6 150.3 377.3 115 333.6 115C310.9000000000001 115 259.6 124.9 259.6 192.1C259.6 250.8 302.6 269.2 332.2000000000001 269.2C363.0000000000001 269 384.9000000000001 257.1 397.9000000000001 233.2zM247.6 440C389.4 440 496 329.9 496 192C496 44.9 377.5 -56 247.6 -56C113.6 -56 0 53.5 0 192C0 324.9 104.7 440 247.6 440zM248.4 395.3C130.2 395.3 44.7 297.4 44.7 192C44.7 82.2 135.9 -10.8 248.4 -10.8C351.6 -10.8 451.2 70.3 451.2 192C451.3 305.8 361 395.3 248.4 395.3z" />
+    <glyph glyph-name="css3-alt"
+      unicode="&#xF38B;"
+      horiz-adv-x="384" d=" M0 416L34.9 20.2L192 -32L349.1 20.2L384 416H0zM313.1 336L308.3 288.7L193 239.4L192.7 239.3H304.2L291.4 92.7000000000001L193.2 64.0000000000001L94.4 93.2000000000001L88 167.1H136.9L140.1 128.8L192.7 115.5L247.4 130.9L251.1 192.5L84.8 193V193.1L84.6 193L81 239.3L193.1 286L199.6 288.7H76.7L70.9 336H313.1z" />
+    <glyph glyph-name="css3"
+      unicode="&#xF13C;"
+      horiz-adv-x="512" d=" M480 416L416 48L192.7 -32L0 48L19.6 142.8H101.6L93.6 102.2L210 57.8L344.1 102.2L362.9000000000001 199.3H29.5L45.5 281.3H379.2L389.7 334H56.3L72.6 416H480z" />
+    <glyph glyph-name="cuttlefish"
+      unicode="&#xF38C;"
+      horiz-adv-x="440" d=" M344 142.5C326.5 110.9 286.6 88 248 88C191.4 88 144 135.4 144 192S191.4 296 248 296C286.6 296 326.5 273.1 344 241.5C357.7 292.4 385.7 334.8 431 359.3C385.7 408.9 320.5 440 248 440C111 440 0 329 0 192S111 -56 248 -56C320.5 -56 385.7 -24.9 431 24.7C385.7 49.2 357.7 91.6 344 142.5z" />
+    <glyph glyph-name="d-and-d"
+      unicode="&#xF38D;"
+      horiz-adv-x="576" d=" M82.5 349.1C81.9 366.3 84.5 382.9 95.2 397.3C95.5 389.9 96.4 382.8 99.4 375.7C105.3 403.2 119.1 425 141.7 441.2C139.8 435.3 138.2 429.4 138.7 423.5C147.4 430.9 157.5 441.3 183.1 446.2C197.8 449 212.8 448.2 225.2 445.2C263.7 435.9 286.2 410.9 294.9 372.9C300.2 349.8 295.6 327.9 286.6 306.5C281.4 294.1 274.6 282.1 265.9 271.4C263.9 273.3 262 275.2000000000001 260.1 277C217.3 317.8 233.3 302.2 222.7 314.4C221.6 315.6 221.7 316.6 222.6 318C230.9 331.5 234.4 346.2 232.6 362C231.5 371.8 228.3 380.9 221.3 388.2C206.8 403.5 182.1 403.2 167.8 387.6C156.4 375.1 153.7 360.2 156.9 344C157.0999999999999 342.7 157.3 341.3 156.9 340.1C153.5 326.4 152.3 312.5 154.4 298.5C154.5 298 154.5 297.4 154.5 296.9C154.5 296.6 154.4 296.4 154.3 295.8C132.5 306.8 118.3 324.1 111.1 348C102.8 330.2000000000001 100 312.5 104.5 293.9C88.9 309.1 83.2 328.2 82.5 349.1zM552.1 225.9C540.5 237.5 527.1 246.3 512 252.5C499.2 257.7 486 260.4 472.1 259.6C462.1 259 452.5 256.5 443.1 253.2C440.6 252.3 438 251.6 435.4000000000001 251C430.5000000000001 249.8 428.1 254.1 430.7000000000001 257.8C433.9000000000001 262.4 434.1 262 445.7000000000001 269.8C446.3000000000001 270.2 446.9000000000001 270.6 447.9000000000001 271.3H445.4000000000001C444.8 271.3 444.2000000000001 271.1 443.5000000000001 271C424.2000000000001 267.7 412.8000000000001 255.5 394.6000000000001 241.4C384.2000000000001 233.3 380.8000000000001 237.6 382.6000000000001 241.9C384.0000000000001 245.4 385.9000000000001 248.6 387.7000000000001 251.9C388.7000000000001 253.7 390.0000000000001 255.3 391.2000000000001 257C391.0000000000001 257.2 390.7000000000001 257.3 390.5000000000001 257.5C363.5000000000001 239.2 343.8000000000002 215.1 332.8000000000002 184.2C333.1000000000002 183.9 333.5000000000001 183.6 333.8000000000002 183.3C334.1000000000002 183.9 334.3000000000002 184.5 334.7000000000001 185C345.1000000000001 197.1 357.5000000000001 206.8 371.3000000000002 214.8C389.5000000000001 225.4 408.8000000000002 233.1 430.0000000000001 235C434.3000000000002 235.4 438.7000000000001 235.1 443.1000000000002 235.1C441.3000000000002 234.4 439.6000000000002 234.2 437.8000000000002 234C419.3000000000002 231.6 402.3000000000002 225 386.3000000000002 215.5C356.1000000000002 197.6 331.8000000000002 173.3 311.2000000000002 145.1C310.9000000000002 144.7000000000001 310.8000000000002 144.2000000000001 310.5000000000002 143.8C325.0000000000002 138.5 334.5000000000002 126.5 346.6000000000002 118.2C346.8000000000002 118.3 346.9000000000002 118.4 347.0000000000002 118.6L348.2000000000002 121.3C360.4000000000002 148.1999999999999 375.2000000000002 173.6 394.9000000000002 195.8C411.6000000000002 214.6 432.9000000000002 221.1 457.4000000000001 215.8C463.3000000000001 214.5 468.8000000000001 211.4 474.6000000000001 209C476.9000000000001 210.4 479.7000000000002 212.1999999999999 482.6000000000001 213.6999999999999C491.0000000000001 218 500.0000000000001 220.6999999999999 509.3000000000001 222.6999999999999C524.0000000000001 225.8 538.8000000000002 227.6 553.8000000000002 224V224.5C553.3000000000002 224.9 552.6000000000001 225.3 552.1000000000001 225.9zM316.7 50.4C277.3 83.4 293.9 69.9 274 86C273.2 85.1 274 86.2 272.1 83C260.9000000000001 63.9 246.6 47.7 228.1 35.4C217.8 28.6 206.6 23.6 194 23.6C172.4 23.6 155.8 33.1 144.6 51.4C132.6 70.9 131.3 92.1 136.4 114C144.2000000000001 147.8 166.5 169.2 175 178.3C156.3000000000001 184.5 142 176.6 128.6 164.4C129.4 178.3 132.9 190.6 140.4 201.7000000000001C116.1 191.1 94.5 176.7000000000001 75.6 157.8000000000001C75.3 163.6000000000001 81 201.5000000000001 81.2 202.5000000000001C81.5 205.2000000000001 80.6 207.8000000000001 78.2 209.9000000000001C54 185.2000000000001 33.7 158.1000000000001 22.1 125.3000000000001C29.5 131.2000000000001 37 136.7000000000001 45.7 141.5000000000001C37.4 119.2000000000001 26.1 88.7000000000001 37.9 40.4000000000001C42.5 21.4000000000001 49.8 3.6000000000001 62 -11.8999999999999C64.9 -15.5999999999999 68.3 -18.7999999999999 71.5 -22.1999999999999C71.7 -21.9999999999999 71.9 -21.8999999999999 72.1 -21.6999999999999C70.7 -14.6999999999999 69.9 -7.5999999999999 70.6 0.2C72.8 -2.9999999999999 74.5 -5.8 76.5 -8.4C89.1 -24.4 105.2 -35.8 123.7 -44C148.7000000000001 -55.3 174.8000000000001 -57.3 201.6 -52.6C256.5 -42.9 292.3 -4 317.6 46.2C318.6 48 318.2000000000001 49.1 316.7000000000001 50.4zM488.7 96.8C479.2 99.9 466.5 100.9999999999999 460 99.6999999999999C469.9 95.6999999999999 474.1 93.0999999999999 478.8 87.6999999999999C491.4 73.3 489.2 52.9999999999999 473.4 42.0999999999999C461.7 33.9999999999999 448.5000000000001 31.5999999999999 434.5000000000001 32.9999999999999C433.3000000000001 33.0999999999999 432.2000000000001 33.3999999999999 431.5000000000001 33.5999999999999C434.3000000000001 37.2999999999999 437.5000000000001 40.5999999999999 439.6000000000001 44.3999999999999C449.0000000000001 61.1999999999999 445.0000000000001 86.4999999999999 430.9000000000001 100.4999999999999C428.8000000000001 102.6 426.3000000000001 104.3999999999999 423.9000000000001 106.3999999999999C423.6000000000001 105.0999999999999 423.8000000000001 104.2999999999999 424.0000000000001 103.5999999999999C428.2000000000001 86.9999999999999 415.9000000000001 71.1999999999999 399.2000000000001 71.7999999999999C391.6000000000001 72.0999999999999 385.3000000000002 75.5999999999999 379.6000000000001 80.2999999999999C360.1000000000001 96.3999999999999 340.5000000000001 112.3999999999999 321.1000000000001 128.5999999999999C315.2000000000001 133.4999999999999 308.6000000000001 136.6999999999999 301.0000000000001 137.2999999999999C296.4000000000001 137.6999999999999 291.7000000000001 137.8999999999999 287.1000000000001 138.1999999999999C281.2000000000001 138.5999999999999 278.3000000000001 140.9999999999999 276.7000000000001 146.5999999999999C275.8000000000002 149.9999999999998 275.2000000000001 153.3999999999999 274.5000000000001 156.7999999999999C273.0000000000001 164.8999999999999 268.3000000000002 169.7999999999999 260.2000000000001 170.9999999999998C255.8000000000001 171.6999999999998 251.3000000000001 171.9999999999998 246.9000000000001 172.4999999999998C233.9000000000001 173.8999999999998 227.1000000000001 179.8999999999998 224.3000000000001 192.7999999999999C219.3000000000001 181.7999999999999 222.7000000000001 170.3999999999999 231.6000000000001 162.8999999999999C236.1000000000001 159.0999999999999 240.9000000000001 155.5999999999999 245.4000000000001 151.6999999999999C250.0000000000001 147.8999999999999 252.8000000000002 142.9999999999999 253.3000000000002 136.8999999999999C253.7000000000002 132.1999999999999 254.1000000000002 127.3999999999999 255.1000000000002 122.7999999999999C257.3000000000002 112.1999999999998 264.0000000000001 104.3999999999999 272.1000000000002 97.6999999999998C288.6000000000002 83.9999999999998 305.1000000000002 70.3999999999998 321.6000000000002 56.5999999999998C339.5000000000001 41.5999999999998 335.5000000000001 23.7999999999998 334.6000000000002 0.5999999999998C333.7000000000002 -22.3000000000002 346.8000000000002 -42.3000000000002 368.1000000000002 -50.6000000000002C369.1000000000002 -51.0000000000002 370.1000000000002 -51.2000000000002 371.7000000000002 -51.7000000000002C356.0000000000002 -33.5000000000002 361.6000000000002 -7.6000000000002 372.4000000000002 0.5999999999998C372.7000000000002 -1.6000000000002 372.8000000000002 -3.7000000000002 373.3000000000002 -5.8000000000002C382.7000000000001 -49.9000000000002 418.7000000000001 -70.0000000000002 458.3000000000001 -62.7000000000002C474.3000000000001 -59.8000000000002 488.9000000000001 -53.8000000000002 501.2000000000001 -42.9000000000001C503.2000000000001 -41.1000000000001 504.9000000000001 -38.8000000000001 507.1000000000001 -36.4000000000001C487.8000000000001 -41.0000000000002 471.3000000000001 -36.5000000000002 456.2000000000001 -25.8000000000001C456.9000000000001 -25.5000000000001 457.5000000000001 -25.5000000000001 458.1000000000001 -25.5000000000001C479.4000000000001 -27.3000000000001 498.7000000000001 -22.1000000000001 515.1000000000001 -8.1000000000001C534.6000000000001 8.4999999999999 541.7000000000002 34.7999999999998 532.5000000000001 57.8999999999999C524.2000000000002 77.9999999999999 508.9000000000001 90.1999999999999 488.7000000000001 96.7999999999998zM99.4 268.7C94.1 277.9 86.2 284.3 77.3 290C91 290.5 103.9 289.8 116.9 286.3C109.9 298.5 108.4 311 111.9 325C117.2 313.1 125.6 304.9 135.5 298.2000000000001C155.2 285 171.2 278.6 182.2 268C185.6 264.7000000000001 188.5 260.9000000000001 191.8 257.1C191 259.2000000000001 190.4 261.2000000000001 189.6 263.1C184.6 273.7000000000001 176.6 281.7000000000001 167 288.1C165.2 289.3 164.2 290.6 163.6 292.6C160.3 305.1 160.6 317.7000000000001 162.9 330.2000000000001C163.9 335.7000000000001 165.7 341.1 167.4 346.5C168.2 348.9000000000001 169.7 351.1 171.4 353.1C172 346.2 171.4 327.6 191 307.1C201.8 295.8 213.4 285.2000000000001 224.9 274.4000000000001C233.9 265.9000000000001 243.2 257.7000000000001 250.4 247.6C251.5 246.0000000000001 252.6 244.3 254.2 242.9000000000001C249.2 255.9000000000001 240.0000000000001 267 230.0000000000001 276.7000000000001C220.4 286.0000000000001 210.6 295.1 200.8000000000001 304.1C197.5 307.1 196.2000000000001 310.8000000000001 195.7000000000001 315.0000000000001C194.5000000000001 325.4000000000001 195.7000000000001 335.6 200.0000000000001 345.2000000000001C200.5000000000001 346.2000000000001 201.1000000000001 347.2000000000001 201.9000000000001 348.5000000000001C202.4000000000001 344.3000000000001 202.5000000000001 340.6 203.3000000000001 336.9000000000001C208.1000000000001 313.8000000000001 223.7000000000001 300.6000000000001 252.6000000000001 273.4000000000001C262.6000000000001 264.0000000000001 271.9000000000001 254.2000000000001 278.2000000000001 241.8000000000001C283.0000000000001 232.5000000000001 285.5000000000001 222.8000000000001 283.9000000000001 212.2000000000001C283.8000000000001 211.6000000000001 284.4000000000001 210.5000000000001 285.0000000000001 210.2000000000001C291.2000000000001 207.6000000000001 295.0000000000001 203.3000000000001 294.7000000000001 195.9000000000001C302.4000000000001 198.5000000000001 307.2000000000001 203.9000000000001 311.1000000000001 210.4000000000001C315.3000000000001 190.2000000000001 302.0000000000001 160.1000000000001 283.9000000000001 151.7000000000001C284.3000000000001 156.2000000000001 288.9000000000001 175.1 267.4000000000001 179.4C260.6000000000001 180.7000000000001 254.6000000000001 180.7000000000001 244.5000000000001 181.5000000000001C249.2000000000001 190.5000000000001 254.9000000000001 202.1000000000001 245.0000000000001 203.9000000000001C220.1000000000001 208.5000000000001 192.2000000000001 202.0000000000001 187.2000000000001 199.3000000000001C195.4000000000001 198.9000000000001 203.5000000000001 198.3000000000001 210.7000000000001 196.0000000000001C208.7000000000001 189.5000000000001 206.7000000000001 183.3000000000001 204.9000000000001 177.1000000000001C203.0000000000001 170.6000000000001 207.0000000000001 162.5000000000001 214.2000000000001 167.5000000000001C215.4000000000001 168.4 216.5000000000001 169.4 217.5000000000001 170.2000000000001C214.4000000000001 152.3000000000001 214.6000000000001 154.3000000000001 214.7000000000001 151.9C215.0000000000001 141.7000000000001 224.2000000000001 144.1 230.4000000000001 144.6C227.9000000000001 132.8 200.9000000000001 117.3 185.0000000000001 118.8C192.0000000000001 123.5 197.7000000000001 129.1 200.9000000000001 136.7C194.4000000000001 135.9 188.0000000000001 135.1 181.7000000000001 134.3L181.4000000000001 135.2C186.1000000000001 138.6 189.4000000000001 143 191.6000000000001 148.3C200.3000000000001 169.4 188.0000000000001 186.3 166.6000000000001 188.2C157.5000000000001 189 148.8000000000001 187.4 140.7000000000001 182.7C146.9000000000001 198.3 157.9000000000001 209.3 173.3000000000001 217.2C158.1000000000001 221.5 164.4000000000001 219.9 148.7000000000001 223.5C163.3000000000001 232.8 178.9000000000001 236.7 195.2000000000001 238.1C190.0000000000001 241.3 147.1000000000001 241.7 125.0000000000001 217.2C132.9000000000001 215.8 140.5000000000001 214.4 148.2000000000001 213C124.4000000000001 206 104.2000000000001 193.3 85.8000000000001 177.4C86.9000000000001 182.2 88.5000000000001 186.9 89.1000000000001 191.7C89.7000000000001 196.2 89.9000000000001 200.9 89.2000000000001 205.3C87.7000000000001 214.7 80.3000000000001 220.4 69.5000000000001 221.6C61.6000000000001 222.5 53.9000000000001 221.5 46.2000000000001 220.3C45.3000000000001 220.2 44.5000000000001 220 43.3000000000001 220.3C59.1000000000001 235.1 79.3000000000001 242 96.4000000000001 253.8C102.4000000000001 258.3 103.2000000000001 262 99.4000000000001 268.7zM227.8 241.9C231.1 225.9 240.4 216.4 251.6 217.6C247.0000000000001 228.9 239.5000000000001 237.1 227.8 241.9z" />
+    <glyph glyph-name="dashcube"
+      unicode="&#xF210;"
+      horiz-adv-x="448" d=" M326.6 344H110.4C59.3 344 19.2 300.7 19.2 250.5V21C19.2 -29.5 59.3 -64 110.4 -64H337.6C388.7000000000001 -64 428.8 -29.5 428.8 21V448L326.6 344zM153.9 31.5C136.2 31.5 121.5 46.6 121.5 64.3V207.2C121.5 224.9 136.2 239.7 153.9 239.7H294.6C312.3 239.7 326.6 224.9 326.6 207.2V83.7L377.7000000000001 31.4H153.9z" />
+    <glyph glyph-name="delicious"
+      unicode="&#xF1A5;"
+      horiz-adv-x="448" d=" M446.5 380C446.1 381.5 445.6 383 445.1 384.5C444.2000000000001 387 443.1 389.3 441.8 391.6C440.4000000000001 394 438.8 396.4 437.1 398.5C435 401 432.7000000000001 403.3 430.2000000000001 405.3C429.1 406.2 428.0000000000001 407 426.9000000000001 407.8C425.6 408.7 424.3 409.5 422.9000000000001 410.2C421.1 411.2 419.3 412 417.4000000000001 412.7C415.7000000000001 413.4 413.9000000000001 414 412.0000000000001 414.4C408.2000000000001 415.4 404.1000000000001 415.9 400.0000000000001 415.9H48C21.5 416 0 394.5 0 368V16C0 11.9 0.5 7.8 1.5 4C3.5 -3.7 7.3 -10.6 12.5 -16.3C13.5 -17.4 14.6 -18.5 15.8 -19.6C21.5 -24.8 28.4 -28.6 36.1 -30.6C39.9 -31.6 44 -32.1 48.1 -32.1H400.1C426.6 -32.1 448.1 -10.6 448.1 15.9V368C448 372.1 447.5 376.2 446.5 380zM416 16C416 7.2 408.8 0 400 0H224V192H32V368C32 376.8 39.2 384 48 384H224V192H416V16z" />
+    <glyph glyph-name="deploydog"
+      unicode="&#xF38E;"
+      horiz-adv-x="512" d=" M382.2 312H433.9V72.4H382.2V93.1C362.4 68.3 329.4 68.9999999999999 308.4 78.4C282.2 90.1 264.1 116.5 264.1 150.2C264.1 180 278.9 208.1 307.4 221C327.6 230.1 360.1 231.6 382.2 208.1V312zM317.5 150.2C317.5 132 331.1 116.7 350.7 116.7C370.5 116.7 383.9 133.1 383.9 149.6C383.9 166.7 370.2 182.8 350.7 182.8C331.1 182.8 317.5 166.4 317.5 150.1999999999999zM188.5 312H240.2V72.4H188.5V93.1C168.7 68.3 135.7 68.9999999999999 114.7 78.4C88.5 90.1 70.4 116.5 70.4 150.2C70.4 180 85.2 208.1 113.7 221C133.9 230.1 166.4 231.6 188.5 208.1V312zM123.8 150.2C123.8 132 137.4 116.7 157 116.7C176.8 116.7 190.2 133.1 190.2 149.6C190.2 166.7 176.5 182.8 157 182.8C137.3 182.8 123.8 166.4 123.8 150.1999999999999zM448 352C465.5 352 480 337.6 480 320V64C480 46.5 465.6 32 448 32H64C46.5 32 32 46.4 32 64V320C32 337.5 46.4 352 64 352H448M448 384H64C28.8 384 0 355.2 0 320V64C0 28.8 28.8 0 64 0H448C483.2 0 512 28.8 512 64V320C512 355.2 483.2 384 448 384z" />
+    <glyph glyph-name="deskpro"
+      unicode="&#xF38F;"
+      horiz-adv-x="480" d=" M205.9 -64L237 -25.6C249.3 -25.4 262.6 -24.2 273.5 -19C312.4 -0.4 311.9 42.9 311.8 44.8C311.7 49.8 311 49.2 282.9000000000001 82.2H362C361.8 32.1 354.7 13.7 351.8 6.5C342.4000000000001 -17.2 307.9000000000001 -56.3 256.6 -62.9C247.9000000000001 -64 223.8 -64.1 205.9 -64zM406.3 103.7C444.9000000000001 103.7 464.8 117.3 480 134.6L304.5 134.9L287.1 103.6L406.3 103.7zM362.7 327.6V159.3H289.2L256.5 103.8H250C197.7 103.8 191.9 160.3 191.7 162.6999999999999C190.5 175.8999999999999 170.4 174.3 171.6 160.8999999999999C173 145.0999999999999 180.4 120.8999999999999 198 103.7999999999999H107C81.5 103.7999999999999 -3.8 130.5999999999999 0 217.7999999999999V431.1C0 447.1 9.7 447.7 15 447.9H97C97.2 447.9 97.3 447.8 97.5 447.8C101.8 448.2 147.6 449.9 147.6 404.1C147.6 390.8 167.8 390.7 167.8 404.1C167.8 422.3 162.3 436.9 152 447.8H236.2C344.9 448.2 362.7 368.4 362.7 327.6zM230.2 271.6L294.2 242.3C307.5 287.8 252 314 230.2 271.6z" />
+    <glyph glyph-name="deviantart"
+      unicode="&#xF1BD;"
+      horiz-adv-x="320" d=" M320 354.8L221.8 175.7L229.2 166.2H320V38.5H159.1L145.6 29.3L101.9 -54.7C101.6 -54.7 93.3 -63.3 92.7 -63.9H0V29.3L93.2 208.7L85.8 217.9H0V345.5H156L169.5 354.7L213.2 438.7C213.5 438.7 221.8 447.3 222.4 447.9H320V354.8z" />
+    <glyph glyph-name="digg"
+      unicode="&#xF1A6;"
+      horiz-adv-x="512" d=" M81.7 275.7H0V101.3H132.7V352H81.7V275.7zM81.7 142.3H50.9V234.6H81.7V142.3zM378.9 275.7V101.3H460.7V72.8H378.9V32H512V275.7H378.9zM460.7 142.3H429.9V234.6H460.7V142.3zM225.1 101.3H307.2V72.8H225.1V32H358.4V275.7H225.1V101.3zM276.3 234.6H307.1V142.3H276.3V234.6zM153.3 352H204.6V301H153.3V352zM153.3 275.7H204.6V101.3H153.3V275.7z" />
+    <glyph glyph-name="digital-ocean"
+      unicode="&#xF391;"
+      horiz-adv-x="512" d=" M256 -56V40.1C357.8 40.1 436.8 141 397.7 248.1C383.4 287.7000000000001 351.6 319.5 311.9 333.8C204.8 372.6 103.8 293.9000000000001 103.8 192.1H8C8 354.3 164.9 480.8 335 427.7C409.2 404.4 468.6 345.3 491.6 271.1C544.8 100.8 418.6 -56 256 -56zM256.3 135.4H160.7V39.8H256.3V135.4zM160.7 39.8H87V-33.8000000000001H160.7V39.8zM87 101.4H25.4V39.8H87V101.4z" />
+    <glyph glyph-name="discord"
+      unicode="&#xF392;"
+      horiz-adv-x="448" d=" M297.216 204.8C297.216 189.184 285.6960000000001 176.384 271.104 176.384C256.768 176.384 244.992 189.184 244.992 204.8S256.512 233.216 271.104 233.216C285.696 233.216 297.216 220.416 297.216 204.8zM177.664 233.216C163.072 233.216 151.552 220.416 151.552 204.8S163.328 176.384 177.664 176.384C192.256 176.384 203.776 189.184 203.776 204.8C204.032 220.416 192.256 233.216 177.664 233.216zM448 395.264V-64C383.506 -7.006 404.132 -25.872 329.216 43.776L342.784 -3.584H52.48C23.552 -3.584 0 19.968 0 49.152V395.264C0 424.448 23.552 448 52.48 448H395.5200000000001C424.448 448 448 424.448 448 395.264zM375.04 152.576C375.04 235.0080000000001 338.1760000000001 301.824 338.1760000000001 301.824C301.3120000000001 329.472 266.24 328.704 266.24 328.704L262.656 324.608C306.176 311.296 326.4 292.096 326.4 292.096C265.589 325.425 194.156 325.4310000000001 135.168 299.52C125.696 295.168 120.064 292.096 120.064 292.096S141.312 312.32 187.392 325.632L184.832 328.704S149.76 329.472 112.896 301.824C112.896 301.824 76.032 235.008 76.032 152.576C76.032 152.576 97.536 115.456 154.112 113.6640000000001C154.112 113.6640000000001 163.584 125.184 171.264 134.912C138.752 144.6400000000001 126.464 165.12 126.464 165.12C130.23 162.484 136.44 159.067 136.96 158.72C180.17 134.5220000000001 241.548 126.5940000000001 296.704 149.7600000000001C305.664 153.088 315.648 157.9520000000001 326.144 164.864C326.144 164.864 313.344 143.872 279.808 134.4C287.488 124.672 296.704 113.6640000000001 296.704 113.6640000000001C353.28 115.456 375.04 152.576 375.04 152.576z" />
+    <glyph glyph-name="discourse"
+      unicode="&#xF393;"
+      horiz-adv-x="448" d=" M225.9 416C103.3 416 0 317.5 0 195.9C0 192 0.1 -32 0.1 -32L225.9 -31.8C348.6 -31.8 448 70.5 448 192.1C448 313.7 348.6 416 225.9 416zM224 64C204.6 64 186.1 68.3 169.6 76.1L88.5 56L111.4 131C101.6 149.1 96 169.9 96 192C96 262.7 153.3 320 224 320S352 262.7 352 192S294.7 64 224 64z" />
+    <glyph glyph-name="dochub"
+      unicode="&#xF394;"
+      horiz-adv-x="416" d=" M397.9 288H256V428.4L397.9 288zM304 256V126C304 59.2 267.5 25.9 190.7 25.9H96V363.2H190.7C202.7 363.2 213.8 362.4 223.8 360.7V444.7C212.9 446.9 201.4 448 189.2 448H0V-64H189.2C329.7 -64 400 0.6 400 129.9V256H304z" />
+    <glyph glyph-name="docker"
+      unicode="&#xF395;"
+      horiz-adv-x="640" d=" M349.9 211.7H283.8V271.1H349.9V211.7zM349.9 416H283.8V355.3H349.9V416zM428.1 271.2H362V211.8H428.1V271.2zM271.8 343.3H205.7V283.2H271.8V343.3zM349.9 343.3H283.8V283.2H349.9V343.3zM626.7 243.3C612.3000000000001 253 579.1 256.5 553.6 251.7C550.3000000000001 275.7 536.9 296.6 512.5 315.4L498.5 324.7L489.2 310.7C470.8 282.9 465.8 237.1 485.5 206.9C476.8 202.2 459.7 195.8 437.1 196.2H2.4C-6.3 145.4 8.2 79.4 46.4 34.1C83.5 -9.8 139.1 -32.1 211.8 -32.1C369.2000000000001 -32.1 485.7 40.4 540.2 172.1C561.6 171.7000000000001 607.8000000000001 172 631.5 217.3C633 219.8 638.1 230.5 640 234.4L626.7 243.3zM115.6 271.2H49.6V211.8H115.7V271.2zM193.7 271.2H127.6V211.8H193.7V271.2zM271.8 271.2H205.7V211.8H271.8V271.2zM193.7 343.3H127.6V283.2H193.7V343.3z" />
+    <glyph glyph-name="draft2digital"
+      unicode="&#xF396;"
+      horiz-adv-x="480" d=" M369.9 22.6V77L417 49.8L369.9 22.6zM82.4 67.4C107.9 94.7 180.1 172.1 233.3 237.4C268.4000000000001 280.5 273.6 319.8 261.7 350.1C254.3 368.9 244.2 380.3 237.4 385.8C282.7 383.7 305.4 362.4 319.6 347.5C319.6 347.5 362 299.3 325.4 234.2C288.4 168.3 214.5 86.7 196.9 67.5H82.4zM134.2 286.6C134.2 274.2 124.2 264.2 111.8 264.2C99.4 264.2 89.4 274.2 89.4 286.6C89.4 299 99.4 309 111.8 309C124.2 309 134.2 298.9 134.2 286.6M336 132.1V67.4H244.7C275.5 102.4 326.5 163.3000000000001 356.5 216.7000000000001C391.7 279.3000000000001 372.6 340.1 343.7 370.0000000000001C339.3 374.6 281.5 432.9000000000001 177.7 411.2000000000001C118.6 398.8000000000001 88.3 367.8000000000001 73.4 343.9000000000001C60.3 323.0000000000001 56.4 304.1000000000001 55.2 296.2000000000001C49.7 263.2000000000001 74.6 229.1000000000001 111.9 229.1000000000001C143.6 229.1000000000001 169.2 254.8000000000001 169.2 286.5000000000001C169.2 313.6 149.5 338.6 121.2 343.3000000000001C123 350.6 138.9 364.4000000000001 147.5 368.0000000000001C188.6 385.3000000000001 225.5 362.8000000000001 230.8 334.5000000000001C239.1 290.2000000000001 193.7 244.1000000000001 161.1 206.9000000000001C84.5 119.9 18.3 51.2 0 32.1L336 32.2V-32L480 49.9L336 132.1z" />
+    <glyph glyph-name="dribbble-square"
+      unicode="&#xF397;"
+      horiz-adv-x="448" d=" M90.2 219.8C99.1 262.2000000000001 127.6 297.5 165.9 315.5C169.5 310.6 193.9 276.7 216.6 236.5C152.6 219.5 96.3 219.7 90.2 219.8zM314.6 294C281 323.8 235.3 335.1 192 324.6C195.8000000000001 319.5 220.6 285.7 243.0000000000001 244.6C291.6 262.9 312.1 290.5 314.6 294zM140.1 84C180.6 52.4 233.4 47.3 277.4 66C275.4 78 267.4 119.8 248.2 169.6C193.1 150.8 154.4 113.2000000000001 140.1 84zM238.9 192.2C235.5 200 231.7 207.7 227.8 215.4C159.6 195 93.4 195.8 87.4 196C87.4 194.6 87.3 193.2 87.3 191.8C87.3 156.7 100.6 124.7000000000001 122.4 100.4C144.6 138.3 189.5 178.3 238.9 192.2zM273.8 175.9C291.7 126.8 298.9 86.8 300.3 78.5C331 99.2 352.8 132.1 358.9 170.1C354.3 171.6 316.6 182.8 273.8 175.9zM253.5 224.3C258.3 214.5 261.8 206.5 265.5 197.5C311 203.2 356.2 194.1 360.7 193.1C360.3999999999999 225.4 348.8999999999999 255 329.8 278.2C326.9 274.3 304 245 253.5 224.3zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM384 192C384 280.2 312.2 352 224 352S64 280.2 64 192S135.8 32 224 32S384 103.8 384 192z" />
+    <glyph glyph-name="dribbble"
+      unicode="&#xF17D;"
+      horiz-adv-x="512" d=" M256 440C119.252 440 8 328.748 8 192S119.252 -56 256 -56S504 55.252 504 192S392.748 440 256 440zM419.9700000000001 325.634C449.473 289.588 467.3390000000001 243.677 467.805 193.679C460.821 195.156 390.7870000000001 209.361 320.303 200.497C314.551 214.538 309.122 226.89 301.686 242.111C380.007 274.088 415.504 319.593 419.97 325.634zM396.421 350.13C392.611 344.703 360.724 301.844 285.4 273.611C250.688 337.387 212.215 389.779 206.36 397.619C273.536 413.812 344.326 396.349 396.421 350.13zM165.941 383.38C171.526 375.721 209.379 323.264 244.478 260.871C145.391 234.558 58.118 234.937 48.644 235.062C62.38 300.795 106.678 355.427 165.941 383.38zM44.17 191.677C44.17 193.843 44.213 195.999 44.278 198.15C53.546 197.96 156.198 196.637 261.984 228.2960000000001C268.048 216.4280000000001 273.841 204.3810000000001 279.158 192.347C202.559 170.7720000000001 132.964 108.8200000000001 98.627 50.0410000000001C64.794 87.595 44.17 137.27 44.17 191.677zM125.977 24.564C148.104 69.797 208.155 128.186 293.5560000000001 157.3200000000001C323.2960000000001 80.037 335.5950000000001 15.2670000000001 338.7450000000001 -3.318C270.6330000000001 -32.331 188.7300000000001 -24.371 125.9770000000001 24.564zM374.357 16.075C372.186 28.9610000000001 360.911 90.972 333.205 167.1080000000001C399.585 177.734 457.905 160.3400000000001 465.152 158.0530000000001C455.71 99.1120000000001 421.879 48.2090000000001 374.357 16.075z" />
+    <glyph glyph-name="dropbox"
+      unicode="&#xF16B;"
+      horiz-adv-x="528" d=" M264.4 331.7L132.4 247.4L264.4 163.1L132.4 78.8L0 163.9L132.3 248.2L0 331.7L132.3 416L264.4 331.7zM131.6 52.3L263.6 136.6L395.6 52.3L263.6 -32L131.6 52.3zM264.4 163.9L396.4 248.2L264.4 331.8L395.7 416L528 331.7L395.7 247.4L528 163.2L395.7 78.9L264.4 163.9z" />
+    <glyph glyph-name="drupal"
+      unicode="&#xF1A9;"
+      horiz-adv-x="448" d=" M319.5 333.3C297.3 347.3 276 352.8 254.8 366.8C241.8 375.6 223.5 396.8 208.3 415.1C205.6 385.8 196.8 373.9 186.3 365.6C165 348.6 151.5 343.4 132.8 333.3C117 325 32 266.5 32 157.5C32 48.3 123.8 -32 225.8 -32C327.5 -32 416 42 416 154C416 266.3 333 325 319.5 333.3zM322 7.7C301.9 -12.4 231.9 -21 205.3 3.5C200.5 8.3 205.6 15.5 211.8 15.5C211.8 15.5 228.8 2.2 263.3 2.2C290.3 2.2 309.3 9.9 317.8 16.2C323.9000000000001 20.8 326.2 11.9 322 7.7zM267.5 60.3C276.2 63.9 296.5 64.1 304.3 59C308.4000000000001 56.2 320.4000000000001 40.2 310.5 35.3C302.1 31.1 309.3 51 284 51C269.3 51 264.5 45.8 257.3 40C250.3 34 247.5 32 245.1 35.3C239.1 43.5 261 57.6 267.5 60.3zM360 43C344.8 44 314.5 91.8 295 92.5C264.1 93.4 190.9 11.8 133.7 50.5C94.9 77.1 119.1 155.3 185.5 155.7C235 156.2 269.3 106.7 294 107.2C315.3 107.5 355.8 149 375.8 149C424.5 149 399.1 39.7 360 43z" />
+    <glyph glyph-name="dyalog"
+      unicode="&#xF399;"
+      horiz-adv-x="416" d=" M0 416V296.8H64V352H171.2C284.6 352 352 271.8 352 192.1C352 116 293.4 32 171.2 32H0V-32H171.2C331.9 -32 416 80.7 416 192.1C416 250.8 393.9 305.5 353.7 346.4C308.9 392 245.7 416 171.2 416H0z" />
+    <glyph glyph-name="earlybirds"
+      unicode="&#xF39A;"
+      horiz-adv-x="480" d=" M313.2 400.5C314.4 413.5 334.5 414.5 349.8 409.2C350.7 408.9 376 399.5 368.8 394C340.9000000000001 401.4 312.4000000000001 375.8 313.2 400.5zM112.2 393.6C142.9 401.7 174.2 373.6 173.3 400.7C172 414.9 149.9 416 133.1 410.3C132.1 410 104.4 399.8 112.2 393.6zM319.4 288C310.6 288 303.4 280.8 303.4 272S310.6 256 319.4 256S335.4 263.2 335.4 272S328.2 288 319.4 288zM159.7 288C150.9 288 143.7 280.8 143.7 272S150.9 256 159.7 256S175.7 263.2 175.7 272S168.5 288 159.7 288zM478.2 124.8C468.3 100.8 437.5 113.8 414.3 126C400.8 56.9 356.2 14.6 288 1.8C288.3 0.9 286 1.9 312 0.8C345.6 -0.6 375.8 3.9 409.4 8.8C389.6 22.6 398 45.9 399.6 46.9C401 47.8 414.3 45.2 421.2 35.4C429.8 47.9 449.6 50.2 451.4 49.0000000000001C453 47.9 458 28.1000000000001 444.5 14.4C449.2 15.3 452.7 16.0000000000001 454.3 16.5000000000001C456.9 17.3000000000001 472 5.2 457.4 3.2C443.1 0.9 434.8 -1.9 410.3 -7.6C364.4000000000001 -18.3 324.4 -19.4 292.6 -20.4L293.6 -32C297.4000000000001 -50.1 270.2000000000001 -56.3 266 -38.2C266.8 -56.1 238.9 -60 237.6 -37.2L237.1 -42.5C236.4 -60.9 208.7 -60.4 208.8 -41.9C201.3 -55.4 180.7 -48.7 182.4 -33.4L183.6 -21C146.9 -21.9 123.9 -24.1 121.8 -24.1C100.9 -24.1 100.9 7.5 121.8 7.5C124.2 7.5 149.5 6.2 185 4.7C123.9 20.2 81.3 59.7 70.1 122.9C45.1 110.1 12.6 96.1 1.9 122.1C-8.6 147.5 23.4 164.7 68.7 195.5C69.4 202.1 70.3 208.8 71.4 215.3C57 234.9 59.8 251.6 55.3 275.7C38.5 273.3 32.1 284.8 31.7 298.8C32 306.1 33.8 313.7 34.1 314.2C35.2 316 44.2 316.2 46.8 316.8C52.8 348.5 97.4 350 137.7 351.3C157.4 373.1 182.9 392.8 218.6 399.6C203.3 419 215.2 439.5 216.2 440C217.9 440.8 237.4 435.7 242.5 416.8C247.7 425.6 260.8 428.2 262.1 427.5C263.2000000000001 426.9 268.5 412.5 257.2000000000001 401.6C297.5000000000001 398.1 329.4000000000001 376.9 353.2000000000001 350.9C389.3000000000001 349.4 425.0000000000001 345 430.3000000000001 316.9C433.0000000000001 316.3 441.9000000000001 316.1 443.0000000000001 314.3C443.3000000000001 313.8 445.1000000000001 306.2000000000001 445.4000000000001 298.9C444.9000000000001 285 438.6 273.5 421.8 275.8C418.6 258.5 419.1 242.9 413.1 228.1C415.5 216.4 417.1 204.3 417.9000000000001 191.7000000000001C454.9 166.3000000000001 488.2 149.2000000000001 478.2 124.8000000000001zM207.4 288.1C208.3 332.1 169.5 330.3 128.8 328.4C107.1 327.4 89.9 326.5 83.3 314.5C71.9 293.6 89.2 221.6 106.5 213.3C116.3 208.6 179.9 205.4 192.8 220.4C201 229.8 207.8 269.8 207.4 288.1zM259.4 229.8C255.1 242.2 253.4 259.9 244.1 262.5C242.1 263 235.1 263 233.1 262.5C223.1 259.7 222.3 240.4 216.1 225.3C231.5 225.3 235.4 215.6 239.8 215.6C244.1 215.6 246.1 226.9000000000001 259.4 229.8zM395.1 314.5C388.5 326.6 370.3 327.4 348.6 328.4C308.4 330.3 270.4 332.2 271.3 288.1C270.8 269.8 276.3 229.8 284.5 220.3C297.5 205.4 361.0999999999999 208.5 370.8 213.2C386.6 220.8 407.3 292.1 395.1 314.5z" />
+    <glyph glyph-name="ebay"
+      unicode="&#xF4F4;"
+      horiz-adv-x="640" d=" M405.2 184.2C376.1 183.3 358 178 358 158.9C358 146.5 367.9 133.1 393 133.1C426.7 133.1 444.6 151.5 444.6 181.5V184.8C432.8 184.8 418.3 184.6999999999999 405.2000000000001 184.1999999999999M476.7 144.5C476.7 135.1999999999999 477.0000000000001 125.8999999999999 477.7 117.6999999999999H447.9000000000001C447.1 124.5999999999999 446.8 131.3 446.8 137.8999999999999C430.7 118.0999999999999 411.5 112.3999999999999 384.9000000000001 112.3999999999999C345.4000000000001 112.3999999999999 324.3 133.2999999999999 324.3 157.3999999999999C324.3 192.3999999999999 353.1 204.6999999999999 402.9 205.7999999999999C416.6 206.0999999999999 431.9 206.1999999999999 444.6 206.1999999999999V209.5999999999999C444.6 233 429.6 242.6 403.6 242.6C384.3 242.6 370 234.6 368.6 220.7999999999999H334.9C338.5 255.2 374.6 263.8999999999999 406.4 263.8999999999999C444.5 263.8999999999999 476.7 250.3999999999999 476.7 210.0999999999999V144.4999999999999zM127.7000000000001 201.3C125.4000000000001 256 40.2 257.9 33.3 201.3H127.7000000000001zM32.7 179.9C36.2 121.6 111.9000000000001 122.5 123.9000000000001 158.3H157C150.6 123.9 114 112.1999999999999 82.6 112.1999999999999C25.4 112.1999999999999 0.1 143.6999999999999 0.1 186.1999999999999C0.1 233 26.3 263.8 83.1 263.8C128.4 263.8 161.5 240.1 161.5 188.3999999999999V179.8999999999999H32.7zM243.7000000000001 134.2C273.5000000000001 134.2 293.9000000000001 155.7 293.9000000000001 188C293.9000000000001 220.4 273.5000000000001 241.8 243.7000000000001 241.8C214.1000000000001 241.8 193.5000000000001 220.4 193.5000000000001 188C193.5000000000001 155.7 214.1000000000001 134.2 243.7000000000001 134.2M161.5000000000001 320.2H193.6000000000001V239.6C209.3000000000001 258.3 231.0000000000001 263.8 252.3000000000001 263.8C288.0000000000001 263.8 327.7000000000001 239.7 327.7000000000001 187.6C327.7000000000001 144 296.2000000000001 112.1999999999999 251.7000000000001 112.1999999999999C228.4000000000001 112.1999999999999 206.6000000000001 120.5 193.0000000000001 137.0999999999999C193.0000000000001 130.4999999999999 192.6000000000001 123.8999999999999 191.9000000000001 117.5999999999999H160.4000000000001C160.9000000000001 127.7999999999999 161.5000000000001 140.3999999999999 161.5000000000001 150.6999999999999V320.2zM640 258.5L540.8 63.7H504.9L533.4 117.8L458.8 258.5H496.3L551.1999999999999 148.6L606 258.5H640z" />
+    <glyph glyph-name="edge"
+      unicode="&#xF282;"
+      horiz-adv-x="512" d=" M25.714 219.837C25.825 219.999 25.944 220.16 26.056 220.322C26.035 220.16 26.011 219.999 25.991 219.837H25.714zM486.286 204.329C486.286 248.361 478.532 288.794 457.485 326.734C416.498 400.121 343.912 439.999 258.893 439.999C118.962 440.276 40.617 334.786 26.056 220.321C68.485 281.633 143.129 341.697 246.431 345.287C246.431 345.287 356.097 345.287 345.85 240.33H169.997C176.366 277.716 188.551 299.316 204.336 319.256C129.288 284.363 82.486 223.16 83.594 130.941C84.424 59.493 133.718 -13.895 204.337 -41.035C287.694 -72.8820000000001 397.113 -48.235 444.469 -19.711V84.693C363.605 28.199 173.598 23.768 172.214 152.265H486.287V204.329z" />
+    <glyph glyph-name="elementor"
+      unicode="&#xF430;"
+      horiz-adv-x="448" d=" M425.6 416H22.4C10 416 0 406 0 393.6V-9.6C0 -22 10 -32 22.4 -32H425.6C438 -32 448 -22 448 -9.6V393.6C448 406 438 416 425.6 416M164.3 92.5H124.5V291.5H164.3V92.5zM323.6 92.5H204.1V132.3H323.6V92.5zM323.6 172.1H204.1V211.9H323.6V172.1zM323.6 251.8H204.1V291.6H323.6V251.8z" />
+    <glyph glyph-name="ember"
+      unicode="&#xF423;"
+      horiz-adv-x="640" d=" M639.9 193.4C638.8 204.1 629.1999999999999 200.2 629.1999999999999 200.2S613.5999999999999 188.1 599.9 189.5C586.1999999999999 190.8 590.5 221.5 590.5 221.5S593.5 249.6 585.4 251.9C577.3 254.3 567.4 244.6 567.4 244.6S555 230.9 549.1 213.4L547.5 212.9S549.4 243.5 547.2 250.5C545.6 254 530.8000000000001 253.7 528.4000000000001 247.5S514.2 198.3 513.4000000000001 180.3C513.4000000000001 180.3 490.3000000000001 160.7 470.1000000000001 157.5S445.1000000000001 166.9 445.1000000000001 166.9S499.9000000000001 182.2 498.0000000000001 226C496.1000000000001 269.8 453.8000000000001 253.6 449.0000000000001 250C444.4000000000001 246.5 419.6000000000001 231.6 412.4000000000001 190.3C412.2000000000001 188.9 411.7000000000001 182.8 411.7000000000001 182.8S390.5000000000001 168.6 378.7000000000001 164.8C378.7000000000001 164.8 411.7000000000001 220.4 371.4000000000001 245.7C353.1 256.7 338.6 233.6 338.6 233.6S393.1 294.3 381.1 345.6C375.3 370 363.1 372.7 351.9000000000001 368.7C334.9000000000001 362 328.4000000000001 352 328.4000000000001 352S306.4000000000001 320 301.3 272.5S288.7 167.4 288.7 167.4S278.2 157.2 268.5 156.7S263.1 185.4 263.1 185.4S270.6 230 270.1 237.5S269 249.1 260.2000000000001 251.7C251.3000000000001 254.4 241.7000000000001 243.1 241.7000000000001 243.1S216.2000000000001 204.4 214.0000000000001 198.5L212.7000000000001 196.1L211.4 197.7S229.4000000000001 250.4 212.2000000000001 251.2C195.0000000000001 252 183.7000000000001 232.4 183.7000000000001 232.4S164.1000000000001 199.6 163.3000000000001 195.9L162 197.5S170.1 235.7 168.4 245.1C166.8000000000001 254.5 157.9 252.6 157.9 252.6S146.6 253.9 143.7000000000001 246.7S130.0000000000001 191.3999999999999 128.7000000000001 176C128.7000000000001 176 100.5 155.8 81.9000000000001 155.6C63.4000000000001 155.3 65.2000000000001 167.4 65.2000000000001 167.4S133.2000000000001 190.7 114.6000000000001 236.6C106.3000000000001 248.4 96.6000000000001 252.1 82.9000000000001 251.9C69.2000000000001 251.6 52.6000000000001 243.3 41.6000000000001 218.6C36.3000000000001 206.8 34.8000000000001 195.6 33.8000000000001 187.1C33.8000000000001 187.1 21.5000000000001 184.7 15.0000000000001 190S5.0000000000001 190 5.0000000000001 190S-6.1999999999999 176 4.9000000000001 171.6999999999999S33.0000000000001 165.5999999999999 33.0000000000001 165.5999999999999C34.6000000000001 158.0999999999999 39.2000000000001 146.0999999999999 52.6000000000001 135.8999999999999C72.8000000000001 120.5999999999999 111.4000000000001 137.1999999999999 111.4000000000001 137.1999999999999L127.3000000000001 146S127.8000000000001 131.3999999999999 139.4000000000001 129.3C151.0000000000001 127.1999999999999 155.8000000000001 128.3 175.9000000000001 177.1999999999999C187.7000000000001 202.1999999999999 188.5000000000001 200.7999999999999 188.5000000000001 200.7999999999999L189.8000000000001 201.0999999999999S180.7000000000001 154.3 184.2000000000001 141.3999999999999C187.7 128.6 203 130 203 130S211.3 127.6 218 151.2C224.7 174.8 237.6 201.1 237.6 201.1H239.2S233.6 153 242.2 137.4C250.8 121.8 273.1 132.1 273.1 132.1S288.7 139.9 291.1 142.3C291.1 142.3 309.6 126.5 335.7 129.4C394 140.9 414.8 155.3 414.8 155.3S424.8 130.9 455.9 128.6C491.4 125.9 510.7 147.2 510.7 147.2S510.4 133.7 522.8 128.6C535.1999999999999 123.5 543.5 151.4 543.5 151.4L564.2 208.6H566.1S567.2 171.3 587.6 165.4S634.6 179.1 634.6 179.1S641 182.6 639.9 193.4zM61.9 188.1C62.7 220.1 83.7 234.0000000000001 90.9 227.1C98.2 220.1 95.5 205.1 81.8 195.7C68.1 186.2000000000001 61.9 188.1 61.9 188.1zM334.7 311.9000000000001S353.8 361.6 358.3 337.4000000000001S318.3 241.2000000000001 318.3 241.2000000000001C318.8 257.4000000000001 334.7 311.9000000000001 334.7 311.9000000000001zM357.5 173.5C344.9 140.5 314.2 153.9 314.2 153.9S310.7 165.7 320.6 198.8S353.9 219 353.9 219S370.1 206.6 357.5 173.5zM442.1 188.1S439.1 198.6 450.2000000000001 218.7C461.2 238.9 469.8000000000001 227.8 469.8000000000001 227.8S479.2 217.6 468.5000000000001 202.3S442.1000000000001 188.1 442.1000000000001 188.1z" />
+    <glyph glyph-name="empire"
+      unicode="&#xF1D1;"
+      horiz-adv-x="496" d=" M287.6 393.8C276.8 396 265.5 397.1 254.1 397.4V415.6C332.2000000000001 413.4 400.2000000000001 371.6 438.7000000000001 309L422.9000000000001 299.9C416.8 309.6 410.2000000000001 318.7000000000001 402.7000000000001 327L384.7000000000001 311.5C358.7000000000001 341.1 323.3000000000001 362.2 282.8000000000001 369.9L287.6000000000001 393.8zM53.4 125.6L76.4 133.3C70 151.6 66.4 171.5 66.4 192S69.7 232.4 76.1 250.7L53.4 258.4C57 269.2 61.7 279.7 67 289.4L51.2 298.5C34 267 24.1 230.5 24.1 192S34.1 117 51.2 85.4L67 94.5C61.7 104.5 57.3 114.8 53.4 125.6zM213.1 14C172.7 22 137.3 43.1 111.2 72.7L93.2 56.9C85.7 65.5 78.8 74.6 73 84.3L57 74.9C95.5 12.6 163.8 -29.4 241.9 -31.7V-13.4C230.6 -13.1 219.2 -11.7 208.4 -9.8L213.1 14zM93.3 327.1L111.3 311.6C137.3 341.2 172.7 362.3 213.2 370L208.5 393.8C219.3 396 230.6 397.1 242 397.4V415.6C163.9 413.4 95.9 371.6 57.4 309L73.2 299.9C79.2 309.6 85.8 318.8 93.3 327.1zM402.7 56.9L384.7 72.7C358.7 43.1 323.3 22 282.8 14L287.5 -9.8C276.7 -11.7 265.3999999999999 -13.1 254 -13.4V-31.7C332.0999999999999 -29.5000000000001 400.4 12.6 438.9 74.9L422.8 84.3C417.1 74.6 410.2 65.4999999999999 402.7 56.9zM496 192C496 55 385 -56 248 -56S0 55 0 192S111 440 248 440S496 329 496 192zM483.8 192C483.8 322.1 378.1 427.8 248 427.8S12.2 322.1 12.2 192S117.9 -43.8 248 -43.8S483.8 61.9 483.8 192zM444.8 298.6L429 289.5C434.3 279.8 439 269.3 442.6 258.5L419.9000000000001 250.8C426.3 232.5 429.6 212.6 429.6 192.1S426 151.7000000000001 419.6 133.4L442.6 125.7000000000001C438.7000000000001 114.9 434.3 104.7000000000001 429 94.7000000000001L444.8 85.6C462 117 471.9 153.5 471.9 192S462 267 444.8 298.6zM261.8 120.9C278.1 124.2 292.2 132.5 302.5 144.4L353.7 99.6C365.6 113.2 375 128.9 380.8 146.4L316.6 168.5C319.1 176 320.5 183.7 320.5 192S319.1 208.1 316.6 215.5L381.1 237.6C375 255 365.6 270.8 353.7000000000001 284.4L302.5000000000001 239.6C292.3000000000001 251.5 278.1000000000001 260.1 261.8000000000001 263.4L275.1000000000001 329.8C266.5000000000001 331.7 257.4000000000001 332.6 248.0000000000001 332.6C238.6000000000001 332.6 229.5000000000001 331.8 220.9000000000001 329.8L234.2000000000001 263.4C217.9000000000001 260.1 203.8000000000001 251.5 193.5000000000001 239.6L142.3000000000001 284.4C130.4000000000001 270.8 121.0000000000001 255.1 114.9000000000001 237.6L179.4000000000001 215.5C176.9000000000001 208 175.5000000000001 200.3 175.5000000000001 192S176.9000000000001 175.9 179.4000000000001 168.5L115.2000000000001 146.4C121.0000000000001 129 130.4000000000001 113.2 142.3000000000001 99.6L193.5000000000001 144.4C203.7000000000001 132.5 217.9000000000001 124.2 234.2000000000001 120.9L220.9000000000001 54.2C229.5000000000001 52.5 238.6000000000001 51.4 248.0000000000001 51.4C257.4000000000001 51.4 266.5000000000001 52.5 275.1000000000001 54.2L261.8000000000001 120.9z" />
+    <glyph glyph-name="envira"
+      unicode="&#xF299;"
+      horiz-adv-x="448" d=" M0 416C477.6 416 366.6 98.7 367.1 49.7L448 -32H422L351.6 39.2C312.6 35 227.2 4.7 137.2 76.2C47 147.7 52 233.3 0 416zM79.7 370C30 393.5 74.5 360.8 74.5 360.8C119.7 329.6 140.5 287.1 164.7 240.9C196.2 180.7 243.7 101.2 308.9 73.2C373.9 45.2 343.1 60.7 314.9 81.7C286.7 102.9 246.7 168.7 223.9 211.9C192.2 271.9 162.9 330.5 79.7 370z" />
+    <glyph glyph-name="erlang"
+      unicode="&#xF39D;"
+      horiz-adv-x="640" d=" M21.7 201.6C21.6 114.8 50.7 42.1 100.4 -10.5H0V394.5H87.2C45.7 344.3 21.6 278.3 21.7 201.6zM640 394.4H556.4C587.8 351.7 605.1 296.9 602.6 231.7C603.1 225.7 603.1 220 602.6 207.6H230.2C230 97.9 269.1 12.7 368.8 12.3C437.3 12.6 486.8 63.3 520.6999999999999 118.4L617.0999999999999 70.2C599.6999999999999 39.3 580.5999999999999 12.4 559.1999999999999 -10.6H640V394.4zM559.2 -10.6S559.2 -10.5 559.2 -10.6H559H559.2zM556.1 394.4H556.4L556.3 394.5L556.0999999999999 394.4zM325.4000000000001 384.8C279.5000000000001 384.7 240.3000000000001 351.3 236.2000000000001 301.6H406.1C405 351.3 371.6 384.7 325.4000000000001 384.8z" />
+    <glyph glyph-name="ethereum"
+      unicode="&#xF42E;"
+      horiz-adv-x="320" d=" M311.9 187.2L160 94.4L8 187.2L160 448L311.9 187.2zM160 64.6L8 157.4L160 -64L312 157.4L160 64.6z" />
+    <glyph glyph-name="etsy"
+      unicode="&#xF2D7;"
+      horiz-adv-x="384" d=" M384 100C382.25 89.25 370.25 -10 368.5 -32C250.621 -27.701 148.605 -27.257 0 -32V-6.5C45.457 2.448 60.627 1.519 61 28.75C62.793 101.072 64.524 272.8930000000001 61 350.75C59.971 379.2100000000001 48.87 377.515 0 386.75V412.25C73.886 409.892 255.933 403.699 362.999 416C359.499 377.75 355.249 289.5 355.249 289.5H332C320.947 332.335 313.241 380 277.25 380H140.25C130 380 129.5 376.5 129.5 370.25V206.5C187.5 206 218 209 218 209C247.77 209.951 245.56 217.502 258.75 274.251H284.5C280.093 172.9 280.59 212.422 282.75 114.001H257C247.845 154.087 247.935 175.046 217.499 175.501C217.499 175.501 195.999 177.501 129.499 177.501V38.501C129.499 12.501 143.749 0.251 173.749 0.251H263C326.636 0.251 329.564 25.247 361.751 100.001H384z" />
+    <glyph glyph-name="expeditedssl"
+      unicode="&#xF23E;"
+      horiz-adv-x="496" d=" M248 404.6C130.6 404.6 35.4 309.4 35.4 192S130.6 -20.6 248 -20.6S460.6 74.6 460.6 192S365.4 404.6 248 404.6zM150.6 271.7C150.6 325.4 194.3 369.1 248 369.1S345.4 325.4 345.4 271.7V245.1C345.4 240.1 341.5 236.2 336.5 236.2H318.8C313.8 236.2 309.9000000000001 240.1 309.9000000000001 245.1V271.7C309.9000000000001 353.8 185.9 353.8 185.9 271.7V245.1C185.9 240.1 182 236.2 177 236.2H159.3000000000001C154.3000000000001 236.2 150.4 240.1 150.4 245.1V271.7zM389.7 68C389.7 58.3 381.7 50.3 372 50.3H124C114.3 50.3 106.3 58.3 106.3 68V209.7C106.3 219.4 114.3 227.4 124 227.4H372C381.7 227.4 389.7 219.4 389.7 209.7V68zM141.7 205.3V72.4C141.7 69.9 139.8 68 137.3 68H128.4C125.9 68 124 69.9 124 72.4V205.3C124 207.8 125.9 209.7 128.4 209.7H137.3C139.8 209.7 141.7 207.8 141.7 205.3zM283.4 156.6C283.4 143.6 276.2 132.2000000000001 265.7 126.2000000000001V94.6C265.7 89.6 261.8 85.7000000000001 256.8 85.7000000000001H239.1C234.1 85.7000000000001 230.2 89.6 230.2 94.6V126.2000000000001C219.7 132.3000000000001 212.5 143.6 212.5 156.6C212.5 176.3 228.3000000000001 192 247.9000000000001 192S283.4000000000001 176.2000000000001 283.4000000000001 156.6zM248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -38.3C121 -38.3 17.7 65 17.7 192S121 422.3 248 422.3S478.3 319 478.3 192S375 -38.3 248 -38.3z" />
+    <glyph glyph-name="facebook-f"
+      unicode="&#xF39E;"
+      horiz-adv-x="264" d=" M76.7 -64V165H0V256H76.7V327.7C76.7 405.6 124.3 448 193.8 448C227.1 448 255.7 445.5 264 444.4V363H215.8C178 363 170.7 345 170.7 318.7V256H256L244.3 165H170.7V-64" />
+    <glyph glyph-name="facebook-messenger"
+      unicode="&#xF39F;"
+      horiz-adv-x="448" d=" M224 416C15.9 416 -77.5 170 84.6 47.4V-32L160.3 10C302.5 -29.8 445.7 69.9 445.7 208.7C445.8 323.2 346.5 416 224 416zM247.4 137.9L190 197.5L79.6 136.4L200.7 264.9L258.1 205.3L368.5 266.4L247.4 137.9z" />
+    <glyph glyph-name="facebook-square"
+      unicode="&#xF082;"
+      horiz-adv-x="448" d=" M448 368V16C448 -10.5 426.5 -32 400 -32H314.7V145.2H375.3L384 212.8H314.7V256C314.7 275.6 320.1 288.9 348.2 288.9H384V349.3C377.8 350.1 356.6 352 331.8 352C280.2 352 244.8 320.5 244.8 262.6V212.7H184V145.1H244.9V-32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368z" />
+    <glyph glyph-name="facebook"
+      unicode="&#xF09A;"
+      horiz-adv-x="448" d=" M448 391.3V-7.2C448 -20.9 436.9 -31.9 423.3 -31.9H309.1V141.5H367.3L376 209.1H309V252.3C309 271.9 314.4 285.2000000000001 342.5 285.2000000000001H378.3V345.7000000000001C372.1 346.5 350.9000000000001 348.4000000000001 326.1 348.4000000000001C274.5 348.4000000000001 239.1 316.9000000000001 239.1 259V209.1H180.7V141.5H239.1V-32H24.7C11.1 -32 0 -20.9 0 -7.3V391.3C0 404.9 11.1 416 24.7 416H423.2C436.9 416 448 404.9 448 391.3z" />
+    <glyph glyph-name="firefox"
+      unicode="&#xF269;"
+      horiz-adv-x="480" d=" M478.1 212.7C477.4 217.2 476.7 219.8 476.7 219.8S474.9 217.8 472.0000000000001 213.9C471.1000000000001 224.6 469.2 235.1 466.2 245.5C462.5000000000001 258.4 457.7 270.9 451.7 282.9C447.9000000000001 290.9 443.5000000000001 298.5 438.4000000000001 305.7C436.6 308.4 434.7000000000001 311.1 432.8 313.6C424 328 413.8 336.9 402.1 353.6C394.5 366.4 389.2000000000001 380.5 386.7000000000001 395.2C383.5000000000001 386.3 381.0000000000001 377.2 379.3000000000001 367.9C367.2000000000001 380.1 356.8000000000001 388.7 350.4000000000001 394.6C319.4 423.8 323 438.9 323 438.9S264.7 373.8 289.9 306C298.6 283 313.7 262.9 333.3 248.1C357.7 227.9 384.1 212.1 398 171.5C386.8 192.8 369.8999999999999 210.7 349.2 223C355.3999999999999 208.3 358.5999999999999 192.4 358.5 176.5C358.5 115.5 308.8999999999999 66 247.9 66.1C239.6 66.1 231.4 67 223.4 68.9C213.9 70.7000000000001 204.7 73.8 196 78.2000000000001C183.0999999999999 86.0000000000001 172 96.3000000000001 163.1999999999999 108.5000000000001L163 108.8000000000001L165 108.1000000000001C169.5999999999999 106.5000000000001 174.1999999999999 105.3000000000001 179 104.4000000000001C197.6999999999999 100.4000000000001 217.3 102.7000000000001 234.6 111.0000000000001C252.1 120.7000000000001 262.5999999999999 127.9000000000001 271.2 125.0000000000001H271.3999999999999C279.7999999999999 122.3000000000001 286.3999999999999 130.5000000000001 280.3999999999999 139.0000000000001C270 152.4000000000001 252.9999999999999 159.0000000000001 236.2 156.0000000000001C218.6999999999999 153.5000000000001 202.6999999999999 141.0000000000001 179.7999999999999 153.1000000000001C178.2999999999999 153.9000000000002 176.8999999999999 154.7000000000002 175.4999999999999 155.6000000000001C173.8999999999999 156.5000000000001 180.3999999999999 154.3000000000001 178.8999999999999 155.3000000000001C173.8999999999999 157.8000000000001 169.0999999999999 160.7000000000001 164.4999999999999 163.9000000000002C164.1999999999999 164.2000000000002 167.9999999999999 162.8000000000001 167.5999999999999 163.1000000000001C161.6999999999999 167.1000000000001 156.5999999999999 172.3000000000001 152.5999999999999 178.3000000000001C148.4999999999999 185.7000000000001 148.0999999999999 194.7000000000001 151.5999999999999 202.4000000000001C153.6999999999999 206.2000000000001 156.9999999999999 209.3000000000001 160.8999999999999 211.1000000000001C163.8999999999999 209.6000000000001 165.6999999999999 208.5000000000001 165.6999999999999 208.5000000000001S164.3999999999999 211.0000000000001 163.5999999999999 212.3000000000001C163.9 212.4000000000001 164.0999999999999 212.3000000000001 164.4 212.5000000000001C167 211.4000000000001 172.7 208.5000000000001 175.8 206.7000000000001C177.9 205.6000000000001 179.6 204.0000000000001 181 202.0000000000001C181 202.0000000000001 182 202.5000000000001 181.3 204.7000000000001C180.2 207.4000000000001 178.4 209.7000000000001 175.9 211.3000000000001H176.0999999999999C178.4 210.1000000000001 180.5999999999999 208.7000000000001 182.6999999999999 207.2000000000001C184.5999999999999 211.6000000000001 185.5 216.4000000000001 185.2999999999999 221.2000000000001C185.4999999999999 223.8000000000001 185.0999999999999 226.5000000000001 184.1999999999999 229.0000000000001C183.3999999999999 230.6000000000001 184.6999999999999 231.2000000000001 186.0999999999999 229.5000000000001C185.9 230.8000000000002 185.4 232.0000000000001 184.9 233.2000000000001V233.3000000000001S185.7 234.4000000000001 186.0999999999999 234.8000000000001C187.0999999999999 235.8000000000001 188.1999999999999 236.7000000000001 189.5 237.5000000000001C196.6999999999999 242.0000000000001 204.3 245.9000000000001 212.1999999999999 249.1000000000001C218.5999999999999 251.9000000000001 223.8999999999999 254.0000000000001 225 254.7000000000001C226.6 255.7000000000001 228.1 256.9000000000001 229.5 258.2000000000001C234.8 262.7000000000001 238.5 269.0000000000001 239.7 275.9000000000001C239.8 276.8000000000001 239.8999999999999 277.7000000000001 240 278.7000000000001V280.2000000000001C239.1 283.7000000000001 233.1 286.3000000000001 201.5999999999999 289.3000000000001C190.5 291.1000000000001 181.5999999999999 299.4000000000001 179.0999999999999 310.4000000000001V310.3000000000001C178.6999999999999 309.2000000000001 178.1999999999999 308.0000000000001 177.7999999999999 306.8000000000001C178.1999999999999 308.0000000000001 178.5999999999999 309.1000000000001 179.0999999999999 310.3000000000001V310.5000000000001C185.0999999999999 326.2000000000001 195.9 339.6 209.9 348.8000000000001C210.7 349.5000000000001 206.7 348.6 207.5 349.3000000000001C210.1999999999999 350.6 212.9 351.8000000000001 215.6999999999999 352.8000000000001C217.0999999999999 353.4000000000001 209.6999999999999 356.2000000000001 203.0999999999999 355.5000000000001C199.0999999999999 355.3000000000001 195.0999999999999 354.3000000000001 191.4 352.7000000000001C193 354.0000000000001 197.5999999999999 355.8000000000001 196.5 355.8000000000001C188.0999999999999 354.2000000000001 180 351.1 172.5999999999999 346.8000000000001C172.5999999999999 347.6 172.6999999999999 348.3000000000001 173.0999999999999 349.0000000000001C167.1999999999999 346.5000000000001 162.0999999999999 342.5000000000001 158.0999999999999 337.5000000000001C158.1999999999999 338.4000000000001 158.2999999999999 339.3000000000001 158.2999999999999 340.2000000000001C155.5999999999999 338.2000000000001 153.0999999999999 335.9000000000001 150.9999999999999 333.3000000000001L150.8999999999999 333.2000000000001C133.4999999999999 339.9000000000001 114.5999999999999 341.5000000000001 96.2999999999999 337.9000000000001L96.0999999999999 338.0000000000001H96.2999999999999C92.4999999999999 341.1 89.1999999999999 344.7000000000001 86.5999999999999 348.9000000000001L86.3999999999999 348.8000000000001L85.9999999999999 349.0000000000001C84.7999999999999 350.8000000000001 83.5999999999999 352.8000000000001 82.2999999999999 355.0000000000001C81.3999999999999 356.6000000000001 80.4999999999999 358.4000000000001 79.5999999999999 360.2000000000001C79.5999999999999 360.3000000000001 79.4999999999999 360.4000000000001 79.3999999999999 360.4000000000001C78.9999999999999 360.4000000000001 78.7999999999999 358.7000000000001 78.4999999999999 359.1000000000001V359.2000000000001C75.2999999999999 367.5000000000001 73.7999999999999 376.4000000000001 74.0999999999999 385.4000000000001L73.8999999999999 385.3000000000001C68.7999999999999 381.8000000000001 64.8999999999999 376.7000000000001 62.7999999999999 370.8000000000001C61.8999999999999 368.7000000000001 61.1999999999999 367.5000000000001 60.5999999999999 366.3000000000001V366.8000000000001C60.6999999999999 367.9000000000001 61.1999999999999 370.1000000000001 61.0999999999999 369.9000000000001C60.9999999999999 369.7000000000001 60.8999999999999 369.6000000000001 60.7999999999999 369.5000000000001C59.2999999999999 367.8000000000001 57.8999999999999 365.8000000000001 56.8999999999999 363.7000000000001C55.9999999999999 361.8000000000001 55.1999999999999 359.8000000000001 54.5999999999999 357.8000000000001C54.4999999999999 357.5000000000001 54.5999999999999 358.1 54.5999999999999 358.8000000000001S54.6999999999999 360.8000000000001 54.5999999999999 360.5000000000001L54.2999999999999 359.8000000000001C47.5999999999999 344.9000000000001 43.3999999999999 329.0000000000001 41.8999999999999 312.7000000000001C41.4999999999999 309.9000000000001 41.2999999999999 307.1 41.3999999999999 304.4000000000001V304.2000000000001C36.5999999999999 299.0000000000001 32.3999999999999 293.2000000000001 28.6999999999999 287.1C16.5999999999999 266.7000000000001 7.5999999999999 244.6000000000001 1.8999999999999 221.5000000000001C5.8999999999999 230.3000000000001 10.6999999999999 238.7000000000001 16.1999999999999 246.6000000000001C5.5 219.5 0 190.6 0 161.4C1.8 170 4.2 178.4 7 186.7C5.3 152.2 11.9 117.8 26.4 86.4C45.8 42.9 78 6.4 118.7 -18.3C135.3 -29.5 153.4 -38.2 172.5 -44.1C175 -45 177.6 -45.9 180.2 -46.8C179.4 -46.5 178.6 -46.1 177.8 -45.8C200.4 -52.6 224 -56.1 247.6 -56.1C331.3 -56.1 358.9 -24.2 361.4 -21.1C365.5 -17.4 368.9 -12.9 371.3 -7.8C372.9 -7.1 374.5 -6.4 376.2 -5.7L377.2 -5.2L379.0999999999999 -4.3C391.7 1.6 403.5999999999999 9.1 414.3999999999999 17.8C430.7 29.5 442.2999999999999 46.5 447.2999999999999 65.9C450.2999999999999 73.0000000000001 450.3999999999999 80.9 447.6999999999999 88.1C448.5999999999999 89.5 449.3999999999999 90.9 450.3999999999999 92.4C468.3999999999999 121.3 478.5999999999999 154.3 479.9999999999999 188.3000000000001V191.1000000000001C479.9999999999999 198.4000000000001 479.3999999999999 205.6000000000001 478.0999999999999 212.7000000000001z" />
+    <glyph glyph-name="first-order-alt"
+      unicode="&#xF50A;"
+      horiz-adv-x="496" d=" M248 440C111.03 440 0 328.9700000000001 0 192S111.03 -56 248 -56S496 55.03 496 192S384.9700000000001 440 248 440zM248 -48.21C115.34 -48.21 7.79 59.34 7.79 192S115.34 432.21 248 432.21S488.21 324.66 488.21 192S380.6600000000001 -48.21 248 -48.21zM248 411.7100000000001C126.66 411.71 28.29 313.3400000000001 28.29 192S126.66 -27.71 248 -27.71S467.71 70.66 467.71 192S369.34 411.71 248 411.71zM248 -19.51C131.19 -19.51 36.49 75.18 36.49 192S131.19 403.51 248 403.51S459.51 308.81 459.51 192S364.81 -19.51 248 -19.51zM434.23 143.47A191.613 191.613 0 0 0 414.1 94.78L339.9700000000001 130.66L401.4500000000001 75.84A193.515 193.515 0 0 0 364.2500000000001 38.55L309.4500000000001 100.12L345.3300000000001 25.85A190.94399999999996 190.94399999999996 0 0 0 296.7000000000001 5.62L269.4100000000001 84.09L274.2000000000001 1.16C265.5900000000001 -0.02 256.8000000000001 -0.64 247.8700000000001 -0.64S230.1500000000001 -0.02 221.5400000000001 1.16L226.3000000000001 83.62L199.1500000000001 5.59A191.365 191.365 0 0 0 150.5000000000001 25.79L186.4300000000001 100.13L131.5600000000001 38.49A193.85 193.85 0 0 0 94.3400000000001 75.77L155.9300000000001 130.67L81.6700000000001 94.74A191.638 191.638 0 0 0 61.5300000000001 143.43L139.3700000000001 170.54L57.1400000000001 165.78C55.9800000000001 174.35 55.3600000000001 183.1 55.3600000000001 191.99C55.3600000000001 200.99 55.9900000000001 209.83 57.1800000000001 218.5L139.5600000000001 213.7299999999999L61.6200000000001 240.89A191.726 191.726 0 0 0 81.8500000000001 289.56L156.0700000000001 253.64L94.55 308.5A193.85 193.85 0 0 0 131.8300000000001 345.7199999999999L186.59 284.19L150.7600000000001 358.36A191.48999999999998 191.48999999999998 0 0 0 199.4100000000001 378.49L226.2800000000001 301.24L221.5700000000001 382.85C230.1800000000001 384.03 238.9600000000001 384.65 247.8900000000001 384.65S265.6 384.03 274.2100000000001 382.85L269.4700000000001 300.69L296.5200000000001 378.45C313.79 373.95 330.1200000000001 367.1 345.1500000000001 358.28L309.3300000000001 284.16L364.0500000000001 345.63A193.12999999999997 193.12999999999997 0 0 0 401.2900000000001 308.4L339.8400000000001 253.63L413.9600000000001 289.49A191.51499999999996 191.51499999999996 0 0 0 434.1600000000001 240.84L356.3500000000001 213.74L438.5900000000001 218.49C439.7800000000001 209.83 440.4100000000001 200.99 440.4100000000001 192C440.4100000000001 183.12 439.8000000000001 174.37 438.6300000000001 165.81L356.5100000000001 170.56L434.2300000000002 143.47z" />
+    <glyph glyph-name="first-order"
+      unicode="&#xF2B0;"
+      horiz-adv-x="448" d=" M12.9 218.8C13 218.9 13.1 219.1 13.2 219.2C13.2 219.1 13.2 218.9 13.1 218.8H12.9zM224 351.4C216.9 351.4 209.4 350.8 202.6 349.7L206.3 282.3L184.3 346.3C170 342.6 156.6 336.9 144.3 329.7000000000001L173.7 268.3L128.6 319.2000000000001C117.2 310.3 106.9 300.1 98 288.3L148.6 242.9L87.5 272.6C80.4 260.3 74.6 246.9 70.9 232.6L135.2 210L67.2 214C66.3 206.9 65.8 199.4 65.8 192S66.4 177.4 67.2 170.3L134.9 174.3L70.9 151.7C74.6 137.4 80.3 124 87.5 111.4L148.6 141.1L97.7 96C106.6 84.3 116.8 73.7 128.6 65.1L173.5 116L144 54.6C156.3 47.2 169.7 41.5 184 37.7L206.3 102.3000000000001L202.3 34.3000000000001C209.4 33.2 216.9 32.6000000000001 224 32.6000000000001C231.4 32.6000000000001 238.6 33.2000000000001 245.7 34.3000000000001L241.7 102.9000000000001L264.3 37.8000000000001C278.6 41.8000000000001 292 47.2 304.3 54.7L274.9 116L319.8 65.1C331.5 74 341.8 84.2000000000001 350.4 96L299.8 141.1L360.9 111.7000000000001C368 124.0000000000001 373.8 137.4 377.5 152.0000000000001L313.5 174.3000000000001L380.9 170.3000000000001C382 177.4000000000001 382.3 184.6000000000001 382.3 192.0000000000001S382 206.9000000000001 380.9 214.0000000000001L313.2 210.0000000000001L377.2 232.3000000000001C373.5 246.6000000000001 368.1 260.3000000000001 360.6 272.6000000000001L299.7 242.9000000000001L350.3 288.3000000000001C341.4000000000001 300.0000000000001 331.2 310.3000000000001 319.7 319.2000000000001L274.6 268.3000000000001L304 329.4000000000001C291.7 336.8000000000001 278.3 342.5000000000001 264 346.3000000000001L241.7 282L245.7 349.7C238.6 350.9 231.4 351.4 224 351.4zM443.4 320V64L224 -64L4.6 64V320L224 448L443.4 320zM426.3 309.7L224 427.1L21.7 309.7V74.6L224 -43.1L426.3 74.6V309.7zM224 410.9L411.7 301.5V82.6L224 -26.9L36.3 82.6V301.4L224 410.9zM224 360C131.7 360 57.1 284.9 57.1 192C57.1 99.4 131.7 24.3 224 24.3C316 24.3 390.9 99.4 390.9 192C390.9 284.9 316 360 224 360z" />
+    <glyph glyph-name="firstdraft"
+      unicode="&#xF3A1;"
+      horiz-adv-x="384" d=" M384 256H320V128H192V0H0V25.6H166.4V153.6H294.4V281.6H384V256zM358.4 217.6V89.6H230.4V-38.4H64V-64H256V64H384V217.6H358.4zM384 25.6H294.4V-64H320V0H384V25.6zM0 448V64H128V192H256V320H384V448H0z" />
+    <glyph glyph-name="flickr"
+      unicode="&#xF16E;"
+      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM144.5 129C109.4 129 81 157.4 81 192.5S109.4 256 144.5 256S208 227.6 208 192.5S179.6 129 144.5 129zM303.5 129C268.4 129 240 157.4 240 192.5S268.4 256 303.5 256S367 227.6 367 192.5S338.6 129 303.5 129z" />
+    <glyph glyph-name="flipboard"
+      unicode="&#xF44D;"
+      horiz-adv-x="448" d=" M0 416V-32H448V416H0zM358.4 236.8H268.8V147.2000000000001H179.2V57.6H89.6V326.4H358.4V236.8z" />
+    <glyph glyph-name="fly"
+      unicode="&#xF417;"
+      horiz-adv-x="384" d=" M197.8 20.2C210.7 8.5 231.5 -13.1 231 -30.5C231 -31.3 230.9 -32.1 230.9 -33C229.1 -52.8 212.1 -64.1 191.8 -64C166.8 -63.9 151.9 -47.2 153.1 -28.2C154.1 -12 173.6 8.5 185.5 19.4C187.8000000000001 21.5000000000001 188.2 22.1 191.1 23.0000000000001C194.5 23.0000000000001 195 22.7 197.8 20.2zM331.9 380.7C315.6 406.4 293.3 421.3 268.6 432.8C243.1 443.5 214 448.2 192 448C147.9 448 120.8 434.8 110.9 430.7C57.3 402.8 26.5 360.8 28 289.4C35.1 207.2 125 113.4 183.8 55.6C185.5 54 188.3 51.1 190 50.5L193.3 50.4C195.4 51.1 195.1 50.9 196.8 52.5C249.1 101.7 337.5 198.3 352.7000000000001 268.2C359.7000000000001 307.4 355.8000000000001 340.7 331.9000000000001 380.7zM186.8 96.1C158.8 147.2000000000001 121.6 226.8 117.5 285.1C114.1 332.6 128.9 416.3 186.8 421.8V96.1zM328.7 268C312.3 211.2 251.4 140 209.8 97.7C237.6 149.6 275 231 277 289.6C278.6 335.5 267.2 395.4 229 421C317.8 402.7 344.5 322.9 328.7 268z" />
+    <glyph glyph-name="font-awesome-alt"
+      unicode="&#xF35C;"
+      horiz-adv-x="448" d=" M397.8 380.2C405.6 380.2 412.1 373.6 412.1 365.9V18.3C412.1 10.4999999999999 405.5 3.9999999999999 397.8 3.9999999999999H50.2C42.4 3.9999999999999 35.9 10.6 35.9 18.3V365.8C35.9 373.6 42.5 380.1 50.2 380.1H397.8M397.8 416H50.2C22.7 416 0 393.3 0 365.8V18.2C0 -9.3 22.7 -32 50.2 -32H397.8C425.3 -32 448 -9.3 448 18.2V365.8C448 393.3 425.3 416 397.8 416zM339.3 276.8C333.3 276.8 309.4000000000001 261.3 286.7 261.3C282.5 261.3 278.3 261.9 274.2 263.7000000000001C254.5 271.5 237.2 277.4 215.1 277.4C194.8 277.4 173.3 270.8 155.4 263.7000000000001C153.6 263.1 151.8 262.5 150.6 261.9V279.8C158.4 285.8 163.1 294.7000000000001 163.1 305.5C163.1 323.4 148.8 337.8 130.8 337.8S98.5 323.5 98.5 305.5C98.5 295.3 103.3 285.8 111 279.8V67.7000000000001C111 56.9 120 48.0000000000001 130.7 48.0000000000001C139.7 48.0000000000001 146.8 54.0000000000001 149.2 61.7000000000001V63C149.8 64.8 149.8 66 149.8 67.8V112C151 112 152.2 112.6 152.8 113.2C172.5 121.6 195.8 129.9 218.5 129.9C249.6 129.9 261.5 113.8 287.8 113.8C306.3 113.8 324.2 120.4 339.8 127.5C344 129.3 347 131.1 347 135.3V269.7C348.8 273.8 344.7 276.8 339.3 276.8z" />
+    <glyph glyph-name="font-awesome-flag"
+      unicode="&#xF425;"
+      horiz-adv-x="448" d=" M444.373 88.576C444.373 81.408 438.229 78.336 431.061 75.264C402.389 62.976 371.669 51.712 338.901 51.712C292.821 51.712 271.317 80.384 216.021 80.384C176.085 80.384 134.101 66.048 100.309 50.688C98.261 49.664 96.213 49.664 94.165 48.64V-29.184C94.165 -50.5890000000001 78.043 -64 60.373 -64C40.9169999999999 -64 25.5569999999999 -48.64 25.5569999999999 -29.184V345.6C12.245 355.8400000000001 3.029 372.224 3.029 390.656C3.029 422.4 28.629 448 60.373 448S117.717 422.4 117.717 390.656C117.717 372.224 109.525 355.8400000000001 95.189 345.6V313.856C99.313 315.23 153.957 342.528 209.877 342.528C275.147 342.528 307.553 314.88 336.853 314.88C375.765 314.88 418.773 342.528 429.0130000000001 342.528C437.2050000000001 342.528 444.3730000000001 336.384 444.3730000000001 329.216V88.576z" />
+    <glyph glyph-name="font-awesome"
+      unicode="&#xF2B4;"
+      horiz-adv-x="448" d=" M397.8 416H50.2C22.7 416 0 393.3 0 365.8V18.2C0 -9.3 22.7 -32 50.2 -32H397.8C425.3 -32 448 -9.3 448 18.2V365.8C448 393.3 425.3 416 397.8 416zM352.4000000000001 131.7C352.4000000000001 127.5 348.8 125.7 344.6 123.9C327.9000000000001 116.7 310 110.2 290.8 110.2C263.9000000000001 110.2 251.4 126.9 219.1 126.9C195.8 126.9 171.3 118.5 151.6 109.6C150.4 108.9999999999999 149.2 108.9999999999999 148 108.4V63C148 61.2 148 59.4 147.4 58.2V57C145 48.6 137.2000000000001 42.7 128.3000000000001 42.7C117.0000000000001 42.7 108 51.7 108 63V281.6C100.2000000000001 287.6 94.9000000000001 297.1 94.9000000000001 307.9C94.9000000000001 326.4 109.8000000000001 341.4 128.4 341.4C146.9 341.4 161.9 326.5 161.9 307.9C161.9 297.1 157.1 287.6 148.8000000000001 281.6V263.1C150.6000000000001 263.7 152.4 264.3 154.2000000000001 265.5C172.7000000000001 273.3 194.8000000000001 279.8 215.7000000000001 279.8C238.4000000000001 279.8 256.3000000000001 273.8 276.6 266.1C280.8 264.3 285 263.7000000000001 289.7000000000001 263.7000000000001C312.4000000000001 263.7000000000001 337.5000000000001 279.8 343.5000000000001 279.8C348.3000000000001 279.8 352.5000000000001 276.2000000000001 352.5000000000001 272V131.7z" />
+    <glyph glyph-name="fonticons-fi"
+      unicode="&#xF3A2;"
+      horiz-adv-x="384" d=" M114.4 224H206.8L191.6 172.8H115.2V15C115.2 7 112.4 5.8 119.6 5L179.2 -0.6V-35H0V0.2L29.2 3C36.4 3.8 38.4 6.2 38.4 13.8V169.6C38.4 172.8 34.4 172.8 30.4 172.8H0V224H38.4V252.8C38.4 320.8 74.8 348.8 144.4 348.8C191.2 348.8 233.2 337.6 233.2 276.4L163.6 268C164 293.6 157.6 299.6 141.2 299.6C116 299.6 115.2 286 115.2 262V230C115.2 226.8 110.4 224 114.4 224zM384 -35H243.2V-0.6L271.2 3C278.4 3.8 281.6 5.4 281.6 13V161C281.6 166.6 277.6 170.2 272.4 171.8L239.2 180.6L248.4 221H358.4V13C358.4 5 354.8 4.2 362.4 3L384 -0.6V-35zM354 312.2L366.4 266.6L356.4 256.6L313.6 279.4L270.8 256.6L260.8 266.6L273.2 312.2L243.2 348.6L248 358.6H286L307.2 397H320L341.2 358.6H379.2L384 345.4L354 312.2z" />
+    <glyph glyph-name="fonticons"
+      unicode="&#xF280;"
+      horiz-adv-x="448" d=" M0 416V-32H448V416H0zM167.4 220H234.8L223.7 182.7H168V69.8C168 63.9999999999999 166 63.1 171.2 62.4999999999999L214.7 58.3999999999999V33.2999999999999H84V59L105.3 61C110.5 61.6 112 63.3 112 68.9V180.3C112 182.6 109.1 182.6 106.2 182.6H84V220H112V241C112 290.6 138.5 311 189.3 311C223.4 311 254 302.8 254 258.2L203.3 252.1C203.6 270.8 198.9 275.1 187 275.1C168.6 275.1 168 265.2 168 247.7V224.4C168 222 164.5 220 167.4 220zM364 33.3H261.3V58.4L281.7 61.0000000000001C286.9 61.6000000000001 289.3 62.7000000000001 289.3 68.3000000000001V176.2C289.3 180.3 286.4000000000001 182.9 282.6 184.1L258.4000000000001 190.5L265.1 220H345.3V68.3C345.3 62.4999999999999 342.7 61.9 348.2 60.9999999999999L363.9 58.3999999999999V33.2999999999999zM342.1 288.8L351.1 255.6L343.8 248.3L312.6 264.9L281.4000000000001 248.3L274.1 255.6L283.1 288.8L261.3 313L264.8 322.6H292.5L308 350.6H317.3L332.8 322.6H360.5L364 313L342.1 288.8z" />
+    <glyph glyph-name="fort-awesome-alt"
+      unicode="&#xF3A3;"
+      horiz-adv-x="512" d=" M211.7 206.9V155.2C211.7 153.1 210.1 151.5 208 151.5H185.8C183.7 151.5 182.1 153.1 182.1 155.2V206.9C182.1 209 183.7 210.6 185.8 210.6H208C210.1 210.6 211.7 209 211.7 206.9zM326.2 210.6H304C301.9 210.6 300.3 209 300.3 206.9V155.2C300.3 153.1 301.9000000000001 151.5 304 151.5H326.2C328.3 151.5 329.9 153.1 329.9 155.2V206.9C329.8 209 328.2 210.6 326.2 210.6zM297.1 -52.6C296.2 -52.7 295.4 -52.9 294.5 -53C293.5 -53.2 292.3999999999999 -53.3 291.3999999999999 -53.5C290.5 -53.6 289.5999999999999 -53.8 288.5999999999999 -53.9C287.5999999999999 -54 286.5999999999999 -54.2 285.5999999999999 -54.3C284.5999999999999 -54.4 283.5999999999999 -54.4999999999999 282.7 -54.6C281.7 -54.7 280.8 -54.8 279.8 -54.9C278.8 -55 277.7 -55.1 276.7 -55.2C275.8 -55.3 274.8999999999999 -55.4 274 -55.4C272.8999999999999 -55.5 271.7 -55.5 270.6 -55.6C269.8 -55.6 268.9 -55.7 268.1 -55.7C266.8 -55.8 265.5 -55.8 264.2 -55.8C263.5 -55.8 262.8 -55.9 262.1 -55.9C260.1 -55.9 258.1 -56.0000000000001 256.1 -56.0000000000001S252.1 -56.0000000000001 250.1 -55.9C249.4 -55.9 248.7 -55.9 248 -55.8C246.7 -55.8 245.4 -55.7 244.1 -55.7C243.3 -55.7 242.4 -55.6 241.6 -55.6C240.5 -55.4999999999999 239.3 -55.4999999999999 238.2 -55.4C237.3 -55.3 236.4 -55.3 235.5 -55.2C234.5 -55.1 233.4 -55 232.4 -54.9C231.4 -54.8 230.5 -54.7 229.5 -54.6C228.5 -54.4999999999999 227.5 -54.4 226.6 -54.3C225.6 -54.1999999999999 224.6 -54.1 223.6 -53.9C222.7 -53.8 221.8 -53.6 220.8 -53.5C219.8 -53.4 218.7 -53.2 217.7 -53C216.8 -52.9 216 -52.7 215.1 -52.6C149.5 -41.7 92.6 -4.9 55.1 46.8C54.9 46.9999999999999 54.8 47.3 54.6 47.4999999999999C53.8 48.6 53 49.6999999999999 52.3 50.8C52 51.1999999999999 51.7 51.6 51.5 51.9999999999999C50.8 53.1 50.1 54.1 49.4 55.1999999999999C49.1 55.6999999999999 48.8 56.0999999999999 48.5 56.5999999999999C47.8 57.6999999999999 47.1 58.6999999999999 46.5 59.7999999999999C46.2 60.2999999999999 45.9 60.6999999999999 45.6 61.1999999999999C44.9 62.2999999999999 44.3 63.3999999999999 43.6 64.4999999999999C43.4 64.8999999999999 43.1 65.2999999999999 42.9 65.6999999999999C40.5 69.6999999999999 38.3 73.7999999999999 36.1 77.8999999999999C36 78.0999999999999 35.9 78.1999999999999 35.8 78.3999999999999C35.2 79.4999999999999 34.7 80.5999999999999 34.1 81.6999999999999C33.8 82.2999999999999 33.5 82.7999999999999 33.3 83.3999999999999C32.8 84.3999999999999 32.3 85.4999999999999 31.8 86.4999999999999C31.5 87.1999999999999 31.2 87.7999999999999 30.9 88.4999999999999C30.4 89.4999999999999 30 90.4999999999999 29.5 91.4999999999999L28.6 93.5999999999999C28.2 94.5999999999999 27.7 95.5999999999999 27.3 96.5999999999999C27 97.2999999999999 26.7 98.0999999999999 26.4 98.7999999999999L25.2 101.7999999999999C24.9 102.5999999999999 24.6 103.2999999999999 24.3 104.0999999999999C23.9 105.0999999999999 23.5 106.0999999999999 23.2 107.0999999999999C22.9 107.9999999999999 22.6 108.8999999999999 22.2 109.8999999999999C21.6 111.4999999999999 21.1 113.1999999999999 20.5 114.7999999999999C20.2 115.6999999999999 19.9 116.5999999999999 19.6 117.5999999999999C19.3 118.4999999999999 19.1 119.3999999999999 18.8 120.2999999999999C18.5 121.1999999999999 18.2 122.1999999999999 18 123.0999999999999C17.7 123.9999999999999 17.5 124.8999999999999 17.2 125.7999999999999C16.9 126.7999999999999 16.7 127.6999999999999 16.4 128.6999999999999C16.2 129.5999999999999 15.9 130.4999999999999 15.7 131.3999999999999C15.4 132.3999999999999 15.2 133.3999999999999 15 134.3999999999999C14.8 135.2999999999999 14.6 136.0999999999999 14.4 136.9999999999999C14.2 138.0999999999999 13.9 139.1999999999999 13.7 140.1999999999999C13.5 140.9999999999999 13.4 141.7999999999999 13.2 142.5999999999999C12.9 143.8999999999999 12.7 145.2999999999999 12.4 146.5999999999999C12.3 147.1999999999999 12.2 147.6999999999999 12.1 148.2999999999999L11.2 153.9999999999998C11.1 154.5999999999999 11 155.2999999999999 10.9 155.8999999999998C10.7 157.1999999999998 10.5 158.4999999999998 10.4 159.7999999999998C10.3 160.5999999999998 10.2 161.2999999999998 10.1 162.0999999999998C10 163.2999999999998 9.8 164.4999999999998 9.7 165.6999999999998C9.6 166.4999999999998 9.5 167.2999999999999 9.5 168.0999999999998C9.4 169.2999999999998 9.3 170.4999999999998 9.2 171.5999999999998C9.1 172.3999999999998 9.1 173.1999999999998 9 173.9999999999998C8.9 175.1999999999998 8.8 176.3999999999998 8.8 177.6999999999998C8.8 178.4999999999998 8.7 179.1999999999998 8.7 179.9999999999998C8.6 181.2999999999998 8.6 182.6999999999998 8.5 183.9999999999998C8.5 184.6999999999998 8.5 185.2999999999998 8.4 185.9999999999998C8.4 187.9999999999998 8.3 189.9999999999998 8.3 191.9999999999998C8.3 245.4999999999998 25.2 294.9999999999998 54.1 335.5999999999998C56.4 338.7999999999998 58.8 341.9999999999998 61.2 345.0999999999998C66.1 351.2999999999998 71.3 357.3999999999998 76.8 363.0999999999998C79.5 365.9999999999998 82.3 368.7999999999998 85.2 371.4999999999998C88.1 374.1999999999998 91 376.8999999999998 94 379.4999999999998C98.5 383.3999999999998 103.1 387.0999999999998 107.9 390.6999999999998C109.5 391.8999999999998 111.1 393.0999999999998 112.7 394.1999999999998C140 413.8 171.7 427.9 206 435C222.1 438.3 238.9 440 256 440S289.8 438.3 306 435C340.3 428 372 413.9 399.6 394.3C401.2000000000001 393.1 402.8 392 404.4000000000001 390.8C409.2000000000001 387.2 413.8 383.5 418.3 379.6C430.3 369.2 441.3 357.7 451.1 345.2C453.6 342.1 455.9 338.9 458.2 335.7C487.1 295 504 245.5 504 192C504 190 504 188 503.9 186C503.9 185.3 503.9 184.7 503.8 184C503.8 182.7 503.6999999999999 181.3 503.6 180C503.6 179.2 503.4999999999999 178.5 503.4999999999999 177.7C503.3999999999999 176.5 503.3999999999999 175.3 503.3 177C503.1999999999999 176.2 503.1999999999999 175.4 503.1 174.6C502.9999999999999 173.4 502.9 172.2000000000001 502.8 171.1C502.6999999999999 170.3 502.6 169.5 502.6 168.7000000000001C502.4999999999999 167.5000000000001 502.3 166.3000000000001 502.2 165.1C502.1 164.3 502 163.6 501.9 162.8C501.7 161.5 501.5 160.2 501.4 158.9C501.3 158.3 501.2 157.6 501.1 157.0000000000001L500.2 151.3000000000001C500.1 150.7000000000001 500 150.2000000000001 499.9 149.6000000000001C499.7 148.3000000000001 499.4 146.9000000000001 499.1 145.6000000000001C498.9 144.8000000000001 498.8 144.0000000000001 498.6 143.2000000000001C498.4 142.1000000000001 498.1 141.0000000000001 497.9 140.0000000000001C497.7 139.1000000000001 497.5 138.3000000000001 497.3 137.4000000000001C497.1 136.4000000000001 496.8 135.4000000000001 496.6 134.4000000000001C496.4 133.5000000000001 496.1 132.6000000000001 495.9 131.7000000000001C495.6 130.7000000000001 495.4 129.8000000000001 495.1 128.8000000000001C494.9 127.9000000000002 494.6 127.0000000000001 494.3 126.1000000000001C493.9999999999999 125.2000000000002 493.6999999999999 124.2000000000002 493.4999999999999 123.3000000000001C493.1999999999999 122.4000000000002 492.9999999999999 121.5000000000001 492.6999999999999 120.6000000000001C492.3999999999999 119.7000000000002 492.0999999999999 118.8000000000001 491.8 117.8000000000001C491.3 116.2000000000001 490.6999999999999 114.5000000000001 490.1 112.9000000000002C489.8 112.0000000000002 489.4999999999999 111.1000000000001 489.1 110.1000000000001C488.7 109.1000000000001 488.4 108.1000000000001 487.9999999999999 107.1000000000001C487.6999999999999 106.3000000000001 487.3999999999999 105.6000000000001 487.1 104.8000000000001L485.9 101.8000000000001C485.6 101.1000000000001 485.3 100.3000000000001 485 99.6000000000001C484.6 98.6000000000001 484.2 97.6000000000001 483.7 96.6000000000001L482.8 94.5000000000001C482.4 93.5000000000001 481.9 92.5000000000001 481.4 91.5000000000001C481.1 90.8000000000001 480.8 90.2000000000001 480.5000000000001 89.5000000000001C480.0000000000001 88.5000000000001 479.5000000000001 87.4000000000001 479.0000000000001 86.4000000000001C478.7 85.8000000000001 478.4 85.3000000000001 478.2 84.7000000000001C477.6 83.6000000000001 477.1 82.5000000000001 476.5000000000001 81.4000000000001C476.4 81.2000000000001 476.3000000000001 81.1000000000001 476.2 80.9000000000001C474.0000000000001 76.8000000000001 471.8000000000001 72.7000000000001 469.4 68.7000000000001C469.2 68.3000000000001 468.9 67.9000000000001 468.7 67.5000000000001C468.0000000000001 66.4000000000001 467.4 65.3000000000001 466.7 64.2000000000001C466.4 63.7000000000001 466.1 63.3000000000001 465.8000000000001 62.8000000000001C465.1000000000001 61.7000000000001 464.4000000000001 60.7000000000001 463.8000000000001 59.6000000000001C463.5000000000001 59.1000000000001 463.2 58.7000000000002 462.9000000000001 58.2000000000002C462.2000000000001 57.1000000000001 461.5000000000001 56.1000000000001 460.8000000000001 55.0000000000002C460.5000000000001 54.6000000000002 460.2 54.2000000000002 460.0000000000001 53.8000000000002C459.2 52.7000000000002 458.5000000000001 51.6000000000002 457.7 50.5000000000002C457.5000000000001 50.3000000000002 457.4 50.0000000000002 457.2 49.8000000000002C419.6 -4.8999999999998 362.7000000000001 -41.5999999999998 297.1 -52.5999999999998zM414.4 33.6C427.4 46.6 438.6 60.9999999999999 448 76.4999999999999V147.8C448 149.9 446.4 151.5 444.3 151.5H422.1C420 151.5 418.4000000000001 149.8999999999999 418.4000000000001 147.8V122H388.9000000000001V266C388.9000000000001 268.1 387.3 269.7 385.2000000000001 269.7H363.1C361 269.7 359.4000000000001 268.1 359.4000000000001 266V240.1H329.9000000000001V266C329.9000000000001 268.1 328.3 269.7 326.2000000000001 269.7H304C301.9 269.7 300.3 268.1 300.3 266V240.1H270.8V266C270.8 270.8 264.3 269.7 261.3 269.7V300.4C268 302 275.1 303.2 282.1 303.2C290.9000000000001 303.2 298.9000000000001 299.7 307.5 299.7C311.2 299.7 329.9 300.6 329.9 306.2V354.6C329.9 356.7 328.3 358.3 326.2 358.3C322 358.3 314 354.8 306.8 354.8C298.9000000000001 354.8 289.9000000000001 358.3 280.5 358.3C274 358.3 267.6 357.4 261.3 356V359.9C265.7 362 268.7 366.6 268.7 371.4C268.7 388.2 243.3 388.2 243.3 371.4C243.3 366.6 246.3 361.9 250.7 359.9V269.7C247.7 269.7 241.2 270.8 241.2 266V240.1H211.7V266C211.7 268.1 210.1 269.7 208 269.7H185.8C183.7 269.7 182.1 268.1 182.1 266V240.1H152.6V266C152.6 268.1 151 269.7 148.9 269.7H126.8000000000001C124.7000000000001 269.7 123.1 268.1 123.1 266V122H93.5V147.8C93.5 149.9 91.9 151.5 89.8 151.5H67.7C65.6 151.5 64 149.9 64 147.8V76.5C73.4 61 84.6 46.6 97.6 33.6C118.2 13 142.1 -3.1 168.8 -14.4C182.7 -20.3 197 -24.7 211.7 -27.6V48.2C211.7 106.8000000000001 300.3 106.8000000000001 300.3 48.2V-27.6C315 -24.7 329.3 -20.2 343.2 -14.4C369.9 -3.1 393.8 13 414.4 33.6" />
+    <glyph glyph-name="fort-awesome"
+      unicode="&#xF286;"
+      horiz-adv-x="512" d=" M489.2 160.1H461.8C459.2 160.1 457.2 158.1 457.2 155.5V123.5H420.6V301.8C420.6 304.4 418.6 306.4 416 306.4H388.6C386 306.4 384 304.4 384 301.8V269.8H347.3999999999999V301.8C347.3999999999999 304.4 345.3999999999999 306.4 342.7999999999999 306.4H315.3999999999999C312.7999999999999 306.4 310.7999999999999 304.4 310.7999999999999 301.8V269.8H274.1999999999999V301.8C274.1999999999999 307.8 266.1999999999999 306.4 262.4999999999999 306.4V344.4C270.7999999999999 346.4 279.5999999999999 347.8 288.1999999999999 347.8C299.0999999999999 347.8 309.0999999999999 343.5 319.5999999999999 343.5C324.1999999999999 343.5 347.2999999999999 344.6 347.2999999999999 351.5V411.5C347.2999999999999 414.1 345.2999999999999 416.1 342.6999999999998 416.1C337.5999999999998 416.1 327.5999999999998 411.8 318.6999999999998 411.8C308.9999999999999 411.8 297.7999999999999 416.1 286.0999999999998 416.1C278.0999999999998 416.1 270.0999999999998 415 262.3999999999998 413.2000000000001V418.1C267.7999999999998 420.7000000000001 271.4999999999999 426.4000000000001 271.4999999999999 432.4000000000001C271.4999999999999 453.1 240.0999999999998 453.2 240.0999999999998 432.4000000000001C240.0999999999998 426.4000000000001 243.7999999999998 420.7000000000001 249.1999999999998 418.1V306.4C245.4999999999999 306.4 237.4999999999999 307.8 237.4999999999999 301.8V269.8H200.8999999999998V301.8C200.8999999999998 304.4 198.8999999999998 306.4 196.2999999999999 306.4H168.8999999999998C166.2999999999999 306.4 164.2999999999999 304.4 164.2999999999999 301.8V269.8H128V301.8C128 304.4 126 306.4 123.4 306.4H96C93.4 306.4 91.4 304.4 91.4 301.8V123.5H54.8V155.5C54.8 158.1 52.8 160.1 50.2 160.1H22.8C20.2 160.1 18.2 158.1 18.2 155.5V-64H201.1V32C201.1 104.6 310.8 104.6 310.8 32V-64H493.7V155.5C493.8000000000001 158.1 491.8000000000001 160.1 489.2 160.1zM201.1 164.6C201.1 162 199.1 160 196.5 160H169.1C166.5 160 164.5 162 164.5 164.6V228.6C164.5 231.2 166.5 233.2 169.1 233.2H196.5C199.1 233.2 201.1 231.2 201.1 228.6V164.6zM347.5 164.6C347.5 162 345.5 160 342.9 160H315.5C312.9 160 310.9 162 310.9 164.6V228.6C310.9 231.2 312.9 233.2 315.5 233.2H342.9C345.5 233.2 347.5 231.2 347.5 228.6V164.6z" />
+    <glyph glyph-name="forumbee"
+      unicode="&#xF211;"
+      horiz-adv-x="448" d=" M5.8 138.3C2 155.3 0 172.5 0 189.7C0 313 99.8 413 223.1 413C239.7 413 256.4 411 272.4 407.5C149 360.5 51.9 262 5.8 138.3zM398.7 327.5C385 345 369 360.2 350.9 372.8C201.3 328.5 84.6 210.7 41.2 60.8C53.7 42.7 69.2 25.2 86.4 11.8C129.5 163.1 247.6 283.5 398.7 327.5zM414.5 74.8C429.7 99.9 439.9 128.5 444 157.6C364.6 114.7000000000001 299 47 256.4 -32.7C286.4 -28.3 315.3 -17.4 341 -1.4C376 -14.5 411.9 -25.7 448 -35C438.7 1.5 427.6 39.5 414.5 74.8zM444.2 220.3C441.6 239.8 436.3 259 428.4 277.1C290.5 231.3 182 120.5 137.1 -18C155.2 -25.6 174.1 -30.5 193.7 -33.2C240 80.9 330.5 173.6 444.2 220.3z" />
+    <glyph glyph-name="foursquare"
+      unicode="&#xF180;"
+      horiz-adv-x="368" d=" M323.1 445H49.9C12.4 445 0 416.7 0 398.9V-34.9C0 -55.2 12.1 -62.6 18.2 -65C24.4 -67.5 41 -69.6 51.1 -57.9C180 91.5 182.2 94 182.2 94C185.3 97.4 185.6 97.1 189 97.1H272.4C307.5 97.1 313 122.3 316.7 136.8L365.3 379.8C373.8 422.2 363.1 445 323.1 445zM306.8 371.2L295.4000000000001 311.5C294.2000000000001 305 285.9000000000001 298.3 278.5000000000001 298.3H172.1C160.1 298.3 151.5 290 151.5 278V265C151.5 253 160.1 244.4 172.1 244.4H262.5C270.8 244.4 279.1 235.2 277.3 226.2C275.5 217.3 266.8 172.4 265.9000000000001 167.4C265.0000000000001 162.5000000000001 259.1 153.9 249.0000000000001 153.9H175.5C162 153.9 158.3000000000001 152.1 149 141.3C149 141.3 140.1 129.9 59.5 33C58.6 32.1 57.7 32.4 57.7 33.3V372.1C57.7 379.8 64.5 388.7 74.3 388.7H293.3000000000001C301.5000000000001 388.7 308.9000000000001 381 306.8000000000001 371.2z" />
+    <glyph glyph-name="free-code-camp"
+      unicode="&#xF2C5;"
+      horiz-adv-x="576" d=" M69.3 303.5C28.3 235 32.9 140.5 70.3 76.5C92.5 38.3 120 24.1 120 10C120 3.2 114 -3 107.2 -3C87.7 -3 8 72.5 8 194.8C8 306.3 86 380.8 105.1 380.8C111.1 380.8 120 376 120 369.7000000000001C120 357 91.7 341.1 69.3 303.5zM265.1 89.7C269.6 87.9 277.4000000000001 84.5 277.4000000000001 90.9C277.4000000000001 93.6 275.2000000000001 93.8 273.1 94.5C264.6 97.9 259.1 102.2 254.0000000000001 109.7C245.8000000000001 121.8 243.9000000000001 133.9 243.9000000000001 148.3C243.9000000000001 180.4 288.1 186.2 288.1 218.3C288.1 230.6 280.4000000000001 234.2 280.4000000000001 237.6C280.4000000000001 239.8 281.1 239.8 283.3 239.8C291.3 239.8 302.4000000000001 226.5 305.8 220C308 215.4 308.2 214 308.2 208.9C308.2 201.9 307.5 194.7 307.5 187.6C307.5 160.6 339.4 167.8 339.4 180.8C339.4 186.8 335.8 192.4 335.8 198.2C335.8 198.9 335.8 199.4 336.5 199.4C339.8999999999999 199.4 345.8999999999999 191.7 347.6 189.3C353.4 180.4 356.1 168.5 356.1 157.9C356.1 125.5000000000001 326.6 108.9 326.6 101.9C326.6 100.9 329.5 94.2000000000001 338.7 100.0000000000001C368.4 115.1000000000001 391.8 147.6000000000001 391.8 189.8000000000001C391.8 223.4000000000001 383.1 247.5000000000001 359.7 272.4000000000001C355.8 276.5000000000001 343.3 289.3000000000001 337.2 289.3000000000001C329 289.3000000000001 344.4 270.7000000000001 344.4 258.1000000000001C344.4 250.9000000000001 339.6 245.8000000000001 332.1 245.8000000000001C320.5 245.8000000000001 317.6 271.2000000000001 316.2 279.1000000000001C310.4 312.9000000000001 303.4 337.3000000000001 269.8 353.2000000000001C259.4000000000001 358.2000000000001 233.3 365.0000000000001 233.3 355.4000000000001C233.3 353.0000000000001 236 351.3000000000001 237.9 350.3000000000001C247.1 344.7000000000001 257.5 328.9000000000001 257.5 312.1000000000001C257.5 266.0000000000001 199.8 223.9000000000001 199.8 175.9000000000001C199.6 135.6000000000001 227.9 103.3000000000001 265.1 89.7000000000001zM470.4 381C464.4 381 456 374.5 456 368.4C456 359.7 468.1 348.8 473.6 343C555.2 257.9 552.2 128.7 491.2 52C484.2 43.1 455.9 16.7 455.9 8.5C455.9 3.4 464.1 -2.9 469.1 -2.9C494.5 -2.9 567.9 77.9 567.9 182.8C568 302.1 491.8 381 470.4 381zM428.1 57.9H167C157.6 57.9 151.5 50.4 151.5 41.5C151.5 33 158.5 26 167 26H428.1C437.5 26 440 33.5 440 42.4C440 50.9 436.5 57.9 428.1 57.9z" />
+    <glyph glyph-name="freebsd"
+      unicode="&#xF3A4;"
+      horiz-adv-x="448" d=" M303.7 351.8C314.8 362.9 419.2 428.8 442.9 405C466.6 381.3 400.8 276.9 389.7 265.8C378.6 254.7 350.3 264.9 326.6 288.7000000000001C302.8 312.4 292.5 340.7000000000001 303.7 351.8zM109.9 379.9C73.6 400.5 22 423.4 5.6 406.9C-11 390.3 12.7 337.5 33.5 301.2C52 333.4 78.3 360.5 109.9 379.9zM406.7 274C410 262.7 409.4 253.3 404 247.9C383.7 227.6 316.5 274.9 294.7 318C276.7 350.3 283.6 371.4 309.6 366.7C315.3 370.3 321.9 374.3 329.2 378.3C299.4 393.8 265.6 402.6 229.7 402.6C110.6 402.6 14.1 306.1 14.1 187C14.1 68 110.6 -28.6 229.7 -28.6S445.3 67.9 445.3 187C445.3 225.4 435.2 261.5 417.6 292.8C413.7000000000001 285.8 410 279.5 406.7000000000001 274z" />
+    <glyph glyph-name="fulcrum"
+      unicode="&#xF50B;"
+      horiz-adv-x="269.66" d=" M70.75 283.86L35.37 240.31L0 283.86L35.38 327.4100000000001L70.75 283.86zM119.23 448L98.69 249.82L47.72 192L98.7 134.18L119.23 -64V147.11L78.15 192L119.23 236.89V448zM198.9 283.86L234.28 240.31L269.6600000000001 283.86L234.2800000000001 327.4100000000001L198.9 283.86zM150.42 236.89L191.5 192L150.42 147.11V-64L170.96 134.18L221.94 192L170.96 249.82L150.42 448V236.89z" />
+    <glyph glyph-name="galactic-republic"
+      unicode="&#xF50C;"
+      horiz-adv-x="496" d=" M248 -56C111.25 -56 0 55.25 0 192S111.25 440 248 440S496 328.75 496 192S384.75 -56 248 -56zM248 423.4700000000001C120.37 423.4700000000001 16.53 319.63 16.53 192S120.37 -39.47 248 -39.47S479.47 64.37 479.47 192S375.63 423.4700000000001 248 423.4700000000001zM275.62 401.6600000000001V377.04A185.933 185.933 0 0 0 359.19 342.5L376.58 359.86C347.83 381.92 313.28 396.75 275.62 401.6600000000001zM220.25 401.5900000000001C182.61 396.6500000000001 148.09 381.79 119.37 359.74L136.65 342.38H136.73C160.8 360.2200000000001 189.28 372.4400000000001 220.25 377.05V401.5900000000001zM232.5 351.42V268.55C222.46 266.52 213.08 262.61 204.83 257.13L146.21 315.7200000000001L124.28 293.79L182.95 235.12C177.48 226.89 173.5 217.53 171.48 207.5H88.58V176.5H171.48C173.5 166.48 177.49 157.19 182.95 148.96L124.28 90.27L146.21 68.34L204.83 126.96A77.873 77.873 0 0 1 232.5 115.49V32.5899999999999H263.5V115.4899999999999C273.55 117.5199999999999 282.87 121.5499999999999 291.12 127.0399999999999L349.79 68.3499999999999L371.7200000000001 90.2799999999999L313.05 148.9699999999999C318.51 157.1999999999999 322.5200000000001 166.4899999999999 324.55 176.5099999999999H407.42V207.5099999999999H324.55C322.5300000000001 217.53 318.5200000000001 226.89 313.05 235.13L371.7200000000001 293.8L349.79 315.73L291.12 257.06C282.87 262.55 273.55 266.53 263.5 268.56V351.42H232.5zM415.74 320.7000000000001L398.38 303.3400000000001A186.337 186.337 0 0 0 433.05 219.67H457.67C452.72 257.36 437.8400000000001 291.9600000000001 415.74 320.7000000000001zM80.19 320.5700000000001C58.13 291.85 43.28 257.3100000000001 38.34 219.66H62.99C67.59 250.6200000000001 79.75 279.11 97.58 303.18L80.19 320.57zM38.34 164.33C43.26 126.69 58.09 92.15 80.14 63.43L97.5 80.8199999999999C79.69 104.8899999999999 67.58 133.3899999999999 62.99 164.3399999999999H38.34zM433.04 164.33C428.43 133.34 416.24 104.83 398.37 80.73L415.73 63.37C437.81 92.11 452.71 126.66 457.66 164.33H433.04zM136.66 41.62L119.3 24.26C148.03 2.17 182.6 -12.72 220.26 -17.67V6.97C189.27 11.6 160.73 23.76 136.66 41.62zM359.19 41.57C335.1 23.73 306.61 11.49 275.62 6.9V-17.67C313.29 -12.75 347.83 2.12 376.58 24.18L359.27 41.57H359.19z" />
+    <glyph glyph-name="galactic-senate"
+      unicode="&#xF50D;"
+      horiz-adv-x="512" d=" M249.86 414.52V388.45C236.28 367.83 226 279.86 225.39 173.1C237.13 188.72 244.52 206.43 244.52 221.34V238.2200000000001C244.49 243.54 245.27 248.7500000000001 246.71 253.8700000000001C247.36 256.01 248.1 257.9500000000001 249.33 259.6900000000001C250.56 261.4400000000001 252.76 263.48 256.01 263.48C259.25 263.48 261.46 261.43 262.69 259.6900000000001C263.92 257.9400000000001 264.6600000000001 256.01 265.31 253.8700000000001C266.75 248.7500000000001 267.5300000000001 243.54 267.5 238.2200000000001V221.34C267.5 206.43 274.89 188.72 286.63 173.1C286 279.86 275.72 367.8300000000001 262.14 388.4500000000001V414.52H249.86zM223.52 266.75C214 264.6 204.82 261.56 196.06 257.67C204.96 241.55 205.82 225.03 197.77 220.38C189.77 215.76 175.92 224.61 166.41 240.2C154.83 231.41 144.53 220.88 135.85 209.11C150.58 199.49 158.74 186.19 154.17 178.45C149.63 170.75 134.14 171.31 118.7 179.41C112.92 166.16 108.95 151.9 107.05 136.99C116.73 136.81 125.72 134.61 133.23 130.9499999999999C151.01 131.25 166 132.9099999999999 173.72 135.17C179.2700000000001 161.52 196.7400000000001 183.4 220.04 194.68C220.77 220.23 221.92 244.35 223.52 266.75zM288.48 266.75C290.07 244.35 291.23 220.23 291.9500000000001 194.68C315.2400000000001 183.4 332.7200000000001 161.52 338.2700000000001 135.17C345.9900000000001 132.91 360.98 131.25 378.7600000000001 130.95C386.2700000000001 134.61 395.2600000000001 136.8 404.9400000000001 136.99C403.0400000000001 151.9 399.0800000000001 166.16 393.2900000000001 179.41C377.8500000000001 171.31 362.3600000000001 170.75 357.8200000000001 178.4500000000001C353.2500000000001 186.1900000000001 361.4200000000001 199.5000000000001 376.1400000000001 209.1100000000001C367.4600000000001 220.8800000000001 357.1600000000001 231.4100000000001 345.5800000000001 240.2000000000001C336.0700000000001 224.6100000000001 322.2200000000001 215.7600000000001 314.2200000000001 220.3800000000001C306.17 225.0300000000001 307.0300000000001 241.5400000000001 315.93 257.6700000000001A147.49 147.49 0 0 1 288.48 266.7500000000001zM256 258.15C252.77 258.15 250.14 249.34 249.91 238.22H249.86V221.34C249.86 179.92 200.85 126.3 156.37 126.3C104.37 126.3 33.62 127.75 0 97.13V94.62C9.42 77.5 20.58 61.45 33.18 46.65C45.7 67.74 84.77 87.6 141.2 88C186.88 86.98 220.23 67.67 231.96 47.13C231.97 47.12 231.95 47.09 231.96 47.08C239.63 44.94 247.81 43.85 256 43.87C264.19 43.85 272.37 44.94 280.04 47.08C280.05 47.09 280.03 47.12 280.04 47.13C291.78 67.67 325.12 86.98 370.8 88C427.23 87.61 466.29 67.74 478.8199999999999 46.65C491.42 61.45 502.5799999999999 77.51 511.9999999999999 94.62V97.13C478.3899999999999 127.75 407.63 126.3 355.63 126.3C311.1499999999999 126.3 262.14 179.92 262.14 221.34V238.2200000000001H262.0899999999999C261.8599999999999 249.3400000000001 259.2299999999999 258.1500000000001 255.9999999999999 258.1500000000001zM256 161.56C278.42 161.56 296.6 143.38 296.6 120.96S278.42 80.31 256 80.31S215.4 98.54 215.4 120.96C215.4 143.38 233.58 161.56 256 161.56zM256 153.92C237.81 153.92 223.04 139.15 223.04 120.96S237.81 88 256 88S288.96 102.77 288.96 120.96S274.19 153.92 256 153.92zM256 147.78C270.81 147.78 282.82 135.7700000000001 282.82 120.96S270.81 94.14 256 94.14S229.18 106.15 229.18 120.96S241.19 147.78 256 147.78zM141.2 81.11C131.01 81.04 119.6 80.75 110.7 79.45C111.13 75.03 112.21 60.82 117.81 49.69C126.92 52.25 136.17 53.59 145.43 53.59C186.71 52.65 216.91 19.24 223.69 -20.88L223.8 -25.58C234.2 -27.49 244.99 -28.52 256.01 -28.52C267.04 -28.52 277.82 -27.5 288.22 -25.58L288.33 -20.88C295.11 19.24 325.31 52.65 366.59 53.59C375.85 53.59 385.1 52.2500000000001 394.21 49.6900000000001C399.81 60.8200000000001 400.89 75.03 401.32 79.4500000000001C392.42 80.7500000000001 381 81.03 370.82 81.1100000000001C352.06 80.6900000000001 335.63 76.9400000000001 322.21 71.4400000000001C309.67 55.4100000000001 293.05 41.4100000000001 272.63 38.3700000000001C272.54 38.3500000000001 272.46 38.33 272.36 38.3200000000001C272.31 38.3100000000001 272.25 38.28 272.2 38.27C266.96 37.2 261.57 36.67 256.01 36.67C250.46 36.67 245.06 37.2 239.82 38.27C239.77 38.28 239.71 38.3100000000001 239.66 38.3200000000001C239.56 38.34 239.49 38.3600000000001 239.39 38.3700000000001C218.97 41.4 202.36 55.4100000000001 189.81 71.4400000000001C176.39 76.9300000000001 159.95 80.6900000000001 141.2 81.1100000000001z" />
+    <glyph glyph-name="get-pocket"
+      unicode="&#xF265;"
+      horiz-adv-x="448" d=" M407.6 384H40.6C18.5 384 0 365.5 0 343.4V208.2C0 83.5 99.7 -16 224.2 -16C348.2 -16 448 83.5 448 208.2V343.4C448 365.8 430.3 384 407.6 384zM245.6 115.5C233.2 103.7 214.2 104.4 203.2 115.5C89.5 224.4 88.3 220.6 88.3 238.7C88.3 255.6 102.1 269.4 119 269.4C136 269.4 135.1 265.6 224.2 180.1C314.8 267 312.8 269.4 329.7 269.4C346.6 269.4 360.4 255.6 360.4 238.7C360.4 220.9 357.5 223 245.6 115.5z" />
+    <glyph glyph-name="gg-circle"
+      unicode="&#xF261;"
+      horiz-adv-x="512" d=" M257 440C120 440 9 329 9 192S120 -56 257 -56S505 55 505 192S394 440 257 440zM207.5 65.2L81.8 190.9L207.5 316.6L242.7 281.2L218.5 257L207.4 268.1L130.2 190.9L207.4 113.7L234 140.3L180.9 193.2L205.3 217.6L282.5 140.4L207.5 65.2000000000001zM306.5 67.4L271.3 102.6L295.4000000000001 127L306.5000000000001 115.8999999999999L383.7000000000001 193.0999999999999L306.5000000000001 270.2999999999999L280.0000000000001 243.7999999999999L333.1000000000001 190.8999999999999L308.7000000000001 166.5L231.5000000000001 243.7L306.5000000000001 318.7L432.2 193L306.5 67.4z" />
+    <glyph glyph-name="gg"
+      unicode="&#xF260;"
+      horiz-adv-x="512" d=" M179.2 217.6L281.6 115.2L179.2 12.8L0 192L179.2 371.2L224 326.4L198.4 300.8L179.2 320L51.2 192L179.2 64L230.7 115.5L153.6 192L179.2 217.6zM332.8 371.2L230.4 268.8L332.8 166.4L358.4000000000001 192L281.3000000000001 268.5L332.8000000000001 320L460.8000000000001 192L332.8000000000001 64L313.6000000000001 83.2L288.0000000000001 57.6L332.8000000000001 12.8L512 192L332.8 371.2z" />
+    <glyph glyph-name="git-square"
+      unicode="&#xF1D2;"
+      horiz-adv-x="448" d=" M140.1 99.5C152.2 99.5 169.6 97.4 169.6 81.6C169.6 66.1 155.7 62.8 142.6 62.8C130.3 62.8 111.7 64.8 111.7 80.8S127.4 99.5 140.1 99.5zM115.4 216.1C115.4 201.3 122 192 137.7 192C153.2 192 158.9 202 158.9 216.5C159 250.9 115.4 251.3 115.4 216.1zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM207 274.3C194.7 269.5 181.5 265.9 168.1 265.9C129.6 288 77.4 265 77.4 216.4C77.4 198.4 89 173.5 107 167.5V166.8C93.6 160.9 89.9 130.7 107.7 119.8V119.1C88.2 112.7000000000001 75.4 100.3 75.4 78.9C75.4 42.1 110.2 31.9 140.8 31.9C177.9 31.9 205.6 45.3 205.6 86.2000000000001C205.6 136.6 133.5 118.0000000000001 133.5 145.3000000000001C133.5 154.9000000000001 138.7 158.7000000000001 147.6 160.5000000000001C177.2 166.0000000000001 195.8 189.1000000000001 195.8 219.2000000000001C195.8 224.4 194.7 229.4000000000001 192.9 234.2000000000001C197.7 235.3000000000001 202.4 236.5000000000001 207 238.1000000000001V274.3000000000001zM263.8 272.5H224.2C225.5000000000001 261.9 225.3 129.9 224.2 117H263.8C262.7 129.8 262.6 262.1 263.8 272.5zM268.3 325.8C268.3 339.2 258.3 352 244.2 352C229.9 352 219.6 339.5 219.6 325.8C219.6 312.2 230.1 299.9 244.2 299.9C257.9000000000001 299.9 268.3 312.4 268.3 325.8zM372.6 272.5H336.2000000000001C336.2000000000001 282.3 335.8000000000001 292.1 337.3000000000001 302H296.8000000000001C298.1000000000001 294.7 297.9000000000001 288.4 297.9000000000001 272.5H280.8000000000001V238.6C292.7000000000001 240.5 292.9000000000001 239.3 297.9000000000001 239.3V238.6H297.5000000000001V175.9C297.5000000000001 144.8 302.0000000000001 114.7 340.2000000000001 114.7C350.9000000000001 114.7 363.2000000000001 116.5 372.7000000000001 121.7V156.7C367.0000000000001 152.8 358.8000000000002 150.8 351.8000000000002 150.8C338.6000000000002 150.8 336.3000000000002 163.7 336.3000000000002 174.2V239.4C359.0000000000001 239.4 372.7000000000001 238.7 372.7000000000001 238.7V272.5z" />
+    <glyph glyph-name="git"
+      unicode="&#xF1D3;"
+      horiz-adv-x="448" d=" M18.8 226.3C18.8 201 35 166.3 60.3 157.8V156.8C41.5 148.5 36.3 106.2 61.3 91V90C34 81 16 63.7 16 33.8C16 -17.7 64.8 -32 107.5 -32C159.5 -32 198.2 -13.3 198.2 44C198.2 114.5 97.2 88.5 97.2 126.8C97.2 140.3 104.4 145.5 116.9 148.1C158.4 155.8 184.4 188.1 184.4 230.3C184.4 237.6 182.9 244.5 180.4 251.3C187.1 252.8 193.6 254.6 200.1 256.8V307.3C182.9 300.5 164.4 295.5 145.6 295.5C91.8 326.5 18.8 294.2 18.8 226.3zM106.5 62.5C123.5 62.5 147.7 59.5 147.7 37.5C147.7 15.7 128.2 11.2 110 11.2C92.7 11.2 66.7 13.9 66.7 36.4C66.8 58.7 88.8 62.5 106.5 62.5zM103.3 192C81.3 192 72 205 72 225.8C72 275.1 133 274.6 133 226.3C133 206 125 192 103.3 192zM432 142.5V93.5C418.7 86.2 401.5 83.7 386.5 83.7C333 83.7 326.7 125.9 326.7 169.4V257.1H327.2V258.1C320.2 258.1 319.9 259.7 303.2 257.1V304.6H327.2C327.2 326.9 327.5 335.6 325.7 345.8H382.4C380.4 332 380.9 318.3 380.9 304.6H431.9V257.1S412.6 258.1 380.9 258.1V167C380.9 152.2 384.2 134.2 402.7 134.2C412.5 134.2 424 137 432 142.5zM286 379.3C286 360.6 271.5 343.1 252.2 343.1C232.4 343.1 217.7 360.3 217.7 379.3C217.7 398.6 232.2 416 252.2 416C272 416 286 398 286 379.3zM279.8 304.8C278 290.2000000000001 278.2 105 279.8 87H224.3C225.9 105.1 226.1 290 224.3 304.8H279.8z" />
+    <glyph glyph-name="github-alt"
+      unicode="&#xF113;"
+      horiz-adv-x="480" d=" M186.1 119.3C186.1 98.4 175.2 64.2 149.4 64.2S112.7 98.4 112.7 119.3S123.6 174.4 149.4 174.4S186.1 140.2000000000001 186.1 119.3zM480 169.8C480 137.9 476.8 104.1 462.5 74.8C424.6 -1.8 320.4 0 245.8 0C170 0 59.6 -2.7 20.2 74.8C5.6 103.8 0 137.9 0 169.8C0 211.7 13.9 251.3 41.5 283.4C36.3 299.2000000000001 33.8 315.8 33.8 332.2C33.8 353.7 38.7 364.5 48.4 384C93.7 384 122.7 375 157.2 348C186.2 354.9 216 358 245.9000000000001 358C272.9000000000001 358 300.1 355.1 326.3000000000001 348.8C360.3000000000001 375.5 389.3000000000001 384 434.1000000000001 384C443.9000000000001 364.5 448.7000000000001 353.7 448.7000000000001 332.2C448.7000000000001 315.8 446.1000000000001 299.5 441.0000000000001 284C468.5000000000001 251.6 480.0000000000001 211.7 480.0000000000001 169.8zM415.7 119.3C415.7 163.2 389 201.9 342.2 201.9C323.3 201.9 305.2 198.5 286.2 195.9C271.3 193.6 256.4 192.7 241.1 192.7C225.9 192.7 211 193.6 196 195.9C177.3 198.5 159 201.9 140 201.9C93.2 201.9 66.5 163.2 66.5 119.3C66.5 31.5 146.9 18 216.9 18H265.1C335.4000000000001 18 415.7000000000001 31.4 415.7000000000001 119.3zM333.1 174.4C307.3 174.4 296.4000000000001 140.2000000000001 296.4000000000001 119.3S307.3 64.2 333.1 64.2S369.8 98.4 369.8 119.3S358.9000000000001 174.4 333.1 174.4z" />
+    <glyph glyph-name="github-square"
+      unicode="&#xF092;"
+      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM277.3 32.3C268.9000000000001 30.8 265.8 36 265.8 40.3C265.8 45.7 266 73.3 266 95.6C266 111.2000000000001 260.8 121.1 254.7 126.3C291.7 130.4 330.7 135.5 330.7 199.4C330.7 217.6 324.2 226.7 313.6 238.4C315.3 242.7 321 260.4 311.9 283.4C298 287.7000000000001 266.2 265.5 266.2 265.5C253 269.2 238.7 271.1 224.6 271.1C210.5 271.1 196.2 269.2 183 265.5C183 265.5 151.2 287.7 137.3 283.4C128.2 260.5 133.8 242.8 135.6 238.4C125 226.7 120 217.6 120 199.4C120 135.8 157.3 130.4 194.3 126.3C189.5 122 185.2 114.6 183.7 104C174.2 99.7 149.9 92.3 135.4 117.9C126.3000000000001 133.7 109.9 135 109.9 135C93.7 135.2 108.8 124.8 108.8 124.8C119.6 119.8 127.2000000000001 100.6 127.2000000000001 100.6C136.9 70.9 183.3000000000001 80.9 183.3000000000001 80.9C183.3000000000001 67.0000000000001 183.5 44.4 183.5 40.3C183.5 36 180.5 30.8 172 32.3C106 54.4 59.8 117.2000000000001 59.8 190.6C59.8 282.4000000000001 130 352.1 221.8 352.1S388 282.4 388 190.6C388.1 117.2000000000001 343.3 54.3 277.3 32.3zM179.2 93.4C177.3 93.0000000000001 175.5 93.8 175.3 95.1C175.1 96.6 176.4 97.9 178.3 98.3C180.2 98.5 182 97.7 182.2 96.4C182.5 95.1 181.2 93.8 179.2 93.4zM169.7 94.3C169.7 93 168.2 91.9 166.2 91.9C164 91.7000000000001 162.5 92.8 162.5 94.3C162.5 95.6 164 96.7 166 96.7C167.9 96.9 169.7 95.8 169.7 94.3zM156 95.4C155.6 94.1 153.6 93.5000000000001 151.9 94.1C150 94.5 148.7000000000001 96 149.1 97.3C149.5 98.6 151.5 99.2 153.2 98.8C155.2 98.2 156.5 96.7 156 95.4zM143.7 100.8C142.8 99.7 140.9 99.9 139.4 101.4C137.9 102.7000000000001 137.5 104.6 138.5 105.5000000000001C139.4 106.6000000000001 141.3 106.4 142.8 104.9C144.1 103.6 144.6 101.6 143.7 100.8zM134.6 109.9C133.7 109.3 132 109.9 130.9 111.4S129.8000000000001 114.6 130.9 115.3C132 116.2 133.7000000000001 115.5 134.6 114C135.7 112.5 135.7 110.7 134.6 109.9zM128.1 119.6C127.2 118.7000000000001 125.7 119.2000000000001 124.6 120.2000000000001C123.5 121.5000000000001 123.3 123.0000000000001 124.2 123.7000000000001C125.1 124.6 126.6 124.1 127.7 123.1C128.8 121.8 129 120.3 128.1 119.6zM121.4 127C121 126.1 119.7 125.9 118.6 126.6C117.3 127.2000000000001 116.7 128.3 117.1 129.2000000000001C117.5 129.8000000000001 118.6 130.1 119.9 129.6C121.2 128.9 121.8 127.8 121.4 127z" />
+    <glyph glyph-name="github"
+      unicode="&#xF09B;"
+      horiz-adv-x="496" d=" M165.9 50.6C165.9 48.6 163.6 47 160.7 47C157.4 46.7 155.1 48.3 155.1 50.6C155.1 52.6 157.4 54.2 160.3 54.2C163.3 54.5000000000001 165.9 52.9 165.9 50.6zM134.8 55.1C134.1 53.1 136.1 50.8 139.1 50.2C141.7 49.2 144.7 50.2 145.3 52.2S144 56.5000000000001 141 57.4C138.4 58.1 135.5 57.1 134.8 55.1zM179 56.8C176.1 56.1 174.1 54.2 174.4 51.9C174.7 49.9 177.3 48.6 180.3 49.3C183.2 50 185.2 51.9 184.9 53.9C184.6 55.8 181.9 57.1 179 56.8zM244.8 440C106.1 440 0 334.7 0 196C0 85.1 69.8 -9.8 169.5 -43.2C182.3 -45.5 186.8 -37.6 186.8 -31.1C186.8 -24.9 186.5 9.3 186.5 30.3C186.5 30.3 116.5 15.3 101.8 60.1C101.8 60.1 90.4 89.2000000000001 74 96.7000000000001C74 96.7000000000001 51.1 112.4 75.6 112.1C75.6 112.1 100.5 110.1 114.2 86.3C136.1 47.7 172.8 58.8 187.1 65.4C189.4 81.4 195.9 92.5000000000001 203.1 99.1C147.2 105.3 90.8 113.4 90.8 209.6C90.8 237.1 98.4 250.9000000000001 114.4 268.5C111.8 275 103.3 301.8 117 336.4000000000001C137.9 342.9000000000001 186 309.4000000000001 186 309.4000000000001C206 315 227.5 317.9000000000001 248.8 317.9000000000001S291.6 315 311.6 309.4000000000001C311.6 309.4000000000001 359.7000000000001 343 380.6 336.4000000000001C394.3 301.7000000000001 385.8 275 383.2000000000001 268.5C399.2000000000001 250.8000000000001 409.0000000000001 237.0000000000001 409.0000000000001 209.6C409.0000000000001 113.1 350.1000000000001 105.4 294.2000000000001 99.1C303.4000000000001 91.2000000000001 311.2000000000001 76.2000000000001 311.2000000000001 52.7C311.2000000000001 19.0000000000001 310.9000000000001 -22.6999999999999 310.9000000000001 -30.9C310.9000000000001 -37.4 315.5000000000001 -45.3 328.2000000000001 -43C428.2 -9.8 496 85.1 496 196C496 334.7 383.5 440 244.8 440zM97.2 95.1C95.9 94.1 96.2 91.8 97.9 89.9C99.5 88.3 101.8 87.6 103.1 88.9C104.4 89.9 104.1 92.2000000000001 102.4 94.1C100.8 95.7000000000001 98.5 96.4 97.2 95.1zM86.4 103.2000000000001C85.7 101.9 86.7 100.3000000000001 88.7 99.3000000000001C90.3 98.3000000000001 92.3 98.6000000000001 93 100.0000000000001C93.7 101.3000000000001 92.7 102.9 90.7 103.9C88.7 104.5000000000001 87.1 104.2000000000001 86.4 103.2000000000001zM118.8 67.6C117.2 66.3 117.8 63.3 120.1 61.4C122.4 59.1 125.3 58.8 126.6 60.4C127.9 61.7000000000001 127.3 64.7000000000001 125.3 66.6C123.1 68.9 120.1 69.2000000000001 118.8 67.6zM107.4 82.3C105.8 81.3 105.8 78.7 107.4 76.4C109 74.1 111.7 73.1 113 74.1C114.6 75.4 114.6 78 113 80.3C111.6 82.6 109 83.6 107.4 82.3z" />
+    <glyph glyph-name="gitkraken"
+      unicode="&#xF3A6;"
+      horiz-adv-x="592" d=" M565.7 329.9C563.4000000000001 336 556.4000000000001 339.1 550.4000000000001 336.5C544.7 334.1 541.9000000000001 327.6 544.1000000000001 321.9C555.0000000000001 292.9 561.0000000000001 261.4 561.0000000000001 228.6C561.0000000000001 94 460.7000000000001 -17.1 330.8000000000002 -34.1V89.6C338.7000000000001 91.1 346.3000000000002 93.2000000000001 353.8000000000002 95.8V-8.2C460.5000000000001 17.7 539.7000000000002 113.9 539.7000000000002 228.6C539.7000000000002 320.4000000000001 488.9000000000001 400.4000000000001 413.9000000000002 441.9000000000001C408.2000000000002 445.1 400.9000000000002 442.8 398.0000000000002 436.9000000000001C395.3000000000002 431.4000000000001 397.4000000000002 424.7000000000001 402.7000000000002 421.8C470.6000000000001 384.2000000000001 516.6000000000001 311.8000000000001 516.6000000000001 228.6000000000001C516.6000000000001 135.3000000000001 458.7000000000002 55.5000000000001 376.8000000000002 23.2V115.4C391.0000000000001 119.9 401.7000000000001 133.1 401.7000000000001 148.9C401.7000000000001 162.0000000000001 394.9000000000001 173.3 384.4000000000001 179.4C392.7000000000001 258.9000000000001 428.9000000000001 238.0000000000001 428.9000000000001 263.3000000000001V278C428.9000000000001 316 341.0000000000001 439.8 299.9000000000001 442.7C297.4000000000001 442.9 294.9000000000001 442.9 292.3000000000001 442.7C251.1 439.7 163.2 316 163.2 278V263.2C163.2 237.9 199.5 258.9 207.7 179.3C197.1 173.1999999999999 190.4 161.9 190.4 148.8C190.4 133 201 119.8 215.2 115.3V23.1C133.3 55.3 75.4 135.1 75.4 228.5C75.4 311.6 121.4 384 189.3 421.7C194.7 424.7 196.7 431.3 194 436.8C191.1 442.7 183.9 445 178.1 441.8C103.1 400.3 52.3 320.3 52.3 228.5C52.3 113.8 131.5 17.6999999999999 238.2 -8.3000000000001V95.6999999999999C245.8 93.1999999999999 253.3 91.0999999999999 261.2 89.4999999999999V-34.2C131.4 -17.2 31 93.9 31 228.5C31 261.3 37 292.8 47.9 321.8C50.1 327.6 47.3 334 41.6 336.4C35.6 339 28.6 336 26.3 329.8C14.5 298.3 8 264.2 8 228.5C8 73.4 130.6 -53.1 284.3 -59.3V86.6C291.1 86.2000000000001 299.3 86.1 307.7 86.6V-59.2C461.4 -53.1 584 73.4 584 228.5C584 264.2 577.5 298.3 565.7 329.9zM365.9 172.5C378.9 172.5 389.6 162 389.6 148.8C389.6 135.7 379 125.1 365.9 125.1C352.9 125.1 342.2 135.6 342.2 148.8C342.2 161.9 352.8 172.5 365.9 172.5zM226.1 125.2C212.9 125.2 202.4 135.9 202.4 148.9S212.9 172.6 226.1 172.6C239.2 172.6 249.8 162 249.8 148.9C249.8 135.9 239.3 125.2 226.1 125.2z" />
+    <glyph glyph-name="gitlab"
+      unicode="&#xF296;"
+      horiz-adv-x="512" d=" M29.782 248.268L256 -45.714L8.074 138.301C1.218 143.443 -1.638 152.297 0.933 160.294L29.782 248.268zM105.187 423.074C102.045 431.928 89.478 431.928 86.336 423.074L29.782 248.268H161.743L105.187 423.074zM161.743 248.268L256 -45.714L350.257 248.2680000000001H161.743zM511.067 160.294L482.218 248.268L256 -45.714L503.926 138.301C510.781 143.443 513.637 152.297 511.067 160.294zM425.663 423.074C422.521 431.928 409.954 431.928 406.812 423.074L350.257 248.268H482.218L425.663 423.074z" />
+    <glyph glyph-name="gitter"
+      unicode="&#xF426;"
+      horiz-adv-x="384" d=" M66.4 125.5H16V448H66.4V125.5zM166.9 371.9H116.5V-64H166.9V371.9zM267.5 371.9H217.1V-64H267.5V371.9zM368 372H317.6V125H368V372z" />
+    <glyph glyph-name="glide-g"
+      unicode="&#xF2A6;"
+      horiz-adv-x="448" d=" M407.1 236.8C403.6 238.2 395.5 240.6 391.7000000000001 240.6C354.6 240.6 329.5000000000001 223.8 298.2000000000001 206.1L297.3000000000001 207C304.3000000000001 254.3 320.8000000000001 298.9000000000001 320.8000000000001 347.4000000000001C320.8 418.9 282.6 448 212.4 448C97.3 448 39 334.3 39 249.6C39 161.7 90.3 113 177.6 113C189.6 113 188.6 114 188.6 109.2C171.7 -19.7 97.8 -23.9 97.8 14.6C97.8 53.8 142.8 73.2000000000001 143.3 75.6C143 87.8 96.3 103.2000000000001 84.4 103.2000000000001C50.5 103.1 32 52.0000000000001 32 23.9C32 -28 64.8 -64 117.5 -64C194.9 -64 251.5 13.8 268.9 81.4C284 141.9 280.1 144.7 288.6 149C320.8 165.2 346.1 176 382.4 176C400.2 176 412.9 172.3 441.3 167.6C444.2 167.6 448 170.5 448 173.4C448 181.4 414.6 233.9000000000001 407.1 236.8000000000001zM231.8 321.2000000000001C222.5 276.5 213.2 231.6 204 186.9C201.7 176.7 190.7 179.1 182 179.1C143.7 179.1 133 220.9 133 252.2C133 299.2 151 361.5 194.8 385.6C201.8 389.7 209.6 392.3 217.4 392.3C236 392.3 237.4 379 237.4 363.6C237.3 349.3 234.7 335.1 231.8 321.2z" />
+    <glyph glyph-name="glide"
+      unicode="&#xF2A5;"
+      horiz-adv-x="448" d=" M252.8 299.4C252.8 290.6 251.2 281.7000000000001 249.4 273C243.6 245.2 237.8 217.2 232.1 189.4C230.7 183.1 223.8 184.5 218.4 184.5C194.6 184.5 187.9 210.5 187.9 230C187.9 259.3 199.1 298.1 226.4 313.1C230.7 315.6 235.6 317.3 240.5 317.3C251.9 317.3 252.8 309 252.8 299.4zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM384 181C384 186.1 363.2 218.7 358.5 220.5C356.3 221.4 351.3 222.8 348.9 222.8C325.8 222.8 310.2 212.3 290.7 201.3L290.2 201.8C294.5 231.2 304.8 259 304.8 289.2000000000001C304.8 333.8 281 351.9000000000001 237.3 351.9000000000001C165.6 351.9000000000001 129.3 281.1 129.3 228.4000000000001C129.3 173.7000000000001 161.3 143.4 215.6 143.4C223.1 143.4 222.5 144.0000000000001 222.5 141.1C212 60.8 166 58.2000000000001 166 82.2000000000001C166 106.6 194 118.7000000000001 194.3000000000001 120.2000000000001C194.1000000000001 127.8000000000001 165 137.4 157.6 137.4C136.5 137.4 124.9 104.4 124.9 86.8C124.9 54.5 145.3 32.1 178.2 32.1C226.4000000000001 32.1 261.6 81.8 272.5 123.8C281.9 161.5 279.5 163.2 284.8 165.9C304.8 176.0000000000001 320.6 182.7000000000001 343.2 182.7000000000001C354.3 182.7000000000001 362.2 180.4 379.9 177.5000000000001C381.7 177.4 384 179.2000000000001 384 181.0000000000001z" />
+    <glyph glyph-name="gofore"
+      unicode="&#xF3A7;"
+      horiz-adv-x="400" d=" M324 128.2H310.8V93.5C286.3 70.4 254.5 57.7 220.9 57.7C147.7 57.7 88.5 117.9 88.5 192.1C88.5 266.2 147.7 326.5 220.9 326.5C256.2 326.5 289.5 312.5 314.5 287.1L376.8 350.4C335 392.7 279.7 416 220.7 416C98 416 0 315.4 0 192C0 69.5 97 -32 220.7 -32C283.9 -32 345.2 -5.8 391.7 50.5C389.7 78.1 378.3 128.2 324 128.2zM311.9 240.7H205.6V151.7H324C357.5 151.7 384.5 136.6 400 109.9V140.5C400 205.7 359.6 240.7 311.9 240.7z" />
+    <glyph glyph-name="goodreads-g"
+      unicode="&#xF3A9;"
+      horiz-adv-x="384" d=" M42.6 44.7H45.4C58.1 44.7 70.9 44.7 83.6 44.6C85.2 44.6 86.7 44.9999999999999 87.2 42.4999999999999C94.3 7.6 117.2 -12.1000000000001 150.1 -21.4C177 -29.0000000000001 204.2 -29.2 231.4 -23.2C265.2 -15.8000000000001 287.4 5.1 299.4 37.1999999999999C307.4 58.6999999999999 310.1 80.9999999999999 310.4 103.6999999999999C310.5 109.4999999999999 310.7 150.6999999999999 310.2 156.5L309.3 156.8C308.5 155.3 307.6 153.9 306.8 152.4C284.7 109.3 245.5 85 201.4 83.3C98.4 79.3 32 140.3 29.4 259.5C28.9 283.2 31.2 306.4 37.7 329.2C58.3 400.3 112.3 447.4 191.6 448C252.9 448.4 293.1 409.3 307.8 377.7C308.3 376.6 309.1 375.4 310.2 375.8V437.4H354.5C354.5 157.1 354.6 105.2 354.6 105.2C354.5 26.7 327.9000000000001 -38.5 251.6 -57C182.1 -73.9 92.6 -61.8 55.6 0.2C47.6 13.7 43.8 28.5 42.6 44.7zM188.9 411.5C136.4 412 80.4 370.8 73.9 277.7C69.8 218.7 88.7 155.5 145.4 129.1C173 116.2000000000001 219.7 114.1 253.7 137.8C301.3 171 316.4 234.8 308.5 291.8C298.8 362.9 260.7 411.8 188.9 411.5z" />
+    <glyph glyph-name="goodreads"
+      unicode="&#xF3A8;"
+      horiz-adv-x="448" d=" M299.9 256.8C305 219.5 295.2 177.8 264 156.1C241.7 140.6 211.2 142 193.2 150.4C156.1 167.7000000000001 143.7 209 146.4 247.6C150.7 308.5 187.3 335.5 221.7 335.1C268.6 335.3 293.5 303.3 299.9 256.8zM448 360V24C448 -6.9 422.9 -32 392 -32H56C25.1 -32 0 -6.9 0 24V360C0 390.9 25.1 416 56 416H392C422.9 416 448 390.9 448 360zM330 134.8S329.9 168.8 329.9 352.1H300.9V311.8C300.1 311.5 299.7 312.3 299.3 313C289.7 333.7 263.4 359.3 223.3 359C171.4 358.6 136.1 327.8 122.7 281.2C118.4 266.3 116.9 251.1 117.2 235.6C118.9 157.7 162.3 117.8 229.6 120.4C258.5 121.5 284.1 137.4 298.6 165.6C299.1 166.6 299.7 167.5 300.3 168.5C300.5 168.3999999999999 300.7 168.3999999999999 300.9 168.3C301.2 164.5 301.1 137.6 301 133.8C300.8 119 299 104.3 293.8 90.3C286 69.3 271.5 55.6 249.3 50.8C231.5 46.9 213.7 46.9999999999999 196.1 51.9999999999999C174.6 58.1 159.6 70.9999999999999 155 93.8C154.7 95.4 153.7 95.1 152.7 95.1H125.9C126.7 84.4999999999999 129.1 74.8 134.4 65.9C158.6 25.4 217.1 17.4 262.6 28.5C312.5 40.8 329.9000000000001 83.4 330 134.8z" />
+    <glyph glyph-name="google-drive"
+      unicode="&#xF3AA;"
+      horiz-adv-x="512" d=" M339 133.1L175.4 416H336.6L500.2 133.1H339zM201.5 109.5L120.9 -32H431.4L512 109.5H201.5zM154.1 380.6L0 109.5L80.6 -32L237 239.2L154.1 380.6z" />
+    <glyph glyph-name="google-play"
+      unicode="&#xF3AB;"
+      horiz-adv-x="512" d=" M325.3 213.7L104.6 435L385.4 273.8L325.3 213.7zM47 448C34 441.2 25.3 428.8 25.3 412.7V-28.6C25.3 -44.7 34 -57.1 47 -63.9L303.6 192.1L47 448zM472.2 222.4L413.3 256.5L347.6 192L413.3 127.5L473.4 161.6C491.4 175.9 491.4 208.1 472.2 222.4zM104.6 -51L385.4 110.2L325.3 170.3L104.6 -51z" />
+    <glyph glyph-name="google-plus-g"
+      unicode="&#xF0D5;"
+      horiz-adv-x="640" d=" M386.061 219.504C387.895 209.812 389.204 200.12 389.204 187.548C389.204 77.795 315.599 0 204.8 0C98.716 0 12.8 85.915 12.8 192S98.716 384 204.8 384C256.664 384 299.8830000000001 365.141 333.411 333.708L281.2850000000001 283.678C267.1400000000001 297.299 242.2570000000001 313.277 204.8 313.277C139.316 313.277 85.88 259.056 85.88 192C85.88 124.944 139.316 70.723 204.8 70.723C280.761 70.723 309.313 125.468 313.765 153.496H204.8V219.505H386.0610000000001zM571.467 213.067V268.8H515.466V213.067H459.733V157.066H515.466V101.333H571.467V157.066H627.2V213.067H571.4670000000001z" />
+    <glyph glyph-name="google-plus-square"
+      unicode="&#xF0D4;"
+      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM164 92C108.7 92 64 136.7 64 192S108.7 292 164 292C191 292 213.5 282.2 231 265.8L203.9 239.7C196.5 246.8 183.6 255.1 164.1 255.1C130 255.1 102.2 226.9000000000001 102.2 191.9C102.2 157.0000000000001 130 128.7000000000001 164.1 128.7000000000001C203.7 128.7000000000001 218.5 157.2000000000001 220.9 171.8000000000001H164V206.2000000000001H258.4C259.4 201.2000000000001 260 196.1000000000001 260 189.6000000000001C260 132.5000000000001 221.7 92.0000000000001 164 92.0000000000001zM384 173.8H355V144.8H325.8V173.8H296.8V203H325.8V232H355V203H384V173.8z" />
+    <glyph glyph-name="google-plus"
+      unicode="&#xF2B3;"
+      horiz-adv-x="496" d=" M248 440C111.1 440 0 328.9 0 192S111.1 -56 248 -56S496 55.1 496 192S384.9 440 248 440zM177.3 68C108.5 68 53.3 123.5 53.3 192S108.5 316 177.3 316C208.6 316 237.4 305 260.3 283.7L226.7 251.1C213.5 264 195.4 270.2 177.3 270.2C134.4 270.2 100.1 234.7 100.1 192.1S134.3 114 177.3 114C209.9 114 242.2 133.1 247.4 167.3H177.3V209.9H294.2000000000001C295.5000000000001 203.1 296.1 196.3 296.1 189.2C296.1 118.4 248.6 68 177.3 68zM407.5 174.2V138.7H372V174.2H336.5V209.7H372V245.2H407.5V209.7H442.7V174.2H407.5z" />
+    <glyph glyph-name="google-wallet"
+      unicode="&#xF1EE;"
+      horiz-adv-x="448" d=" M156.8 321.2C194.4 260.6 221 208.1 241.1 158.7C232.8 124.9 222.3 92.2 209.8 60.4C196.6 112.7 183.3 161.7 153.8 208.9C160.3 245.3 156.1 282.5 156.8 321.2zM109.3 248H16.1C9.6 248 5.6 240.5 9.6 235.3C51.8 181 81.3 117.5 101.3 48H204.8C188.6 117.7 166.1 181.7 122.3 241.5C119.3 245.5 114.3 248 109.3 248zM157.1 336C225.6 228 287.1 101.5 295.3 -32H409C397 106 340.6 233 265.8 336H157.1zM408.9 404.5C407.1 411.3 400.7 416 393.7 416H305.4C300.1 416 296.4 411 297.6 405.7C310.8 359.2 319.9 310.2 324.1 259.7C372.3 173.5 403.8 81.4 414.7 -11.1C430.5 49.4 440 122.4 440 191.9C440 265.5 427.8999999999999 337 408.8999999999999 404.5z" />
+    <glyph glyph-name="google"
+      unicode="&#xF1A0;"
+      horiz-adv-x="488" d=" M488 186.2C488 44.7 391.1 -56 248 -56C110.8 -56 0 54.8 0 192S110.8 440 248 440C314.8 440 371 415.5 414.3 375.1L346.8 310.2C258.5 395.4 94.3 331.4 94.3 192C94.3 105.5 163.4 35.4 248 35.4C346.2 35.4 383 105.8 388.8 142.3H248V227.6H484.1C486.4 214.9 488 202.7 488 186.2z" />
+    <glyph glyph-name="gratipay"
+      unicode="&#xF184;"
+      horiz-adv-x="496" d=" M248 440C111.1 440 0 328.9 0 192S111.1 -56 248 -56S496 55.1 496 192S384.9 440 248 440zM362.6 213.6L249.6 60.9L136.9 213.6C128.2000000000001 225.5 117.8000000000001 264 150.5 285.6C178.6 303.7 205.1 289.8 219 273.7C234.9000000000001 255.8 265.6 256.8 280.7000000000001 273.7C294.6 289.8 321.1 303.7 348.8000000000001 285.6C381.7000000000001 264 371.4000000000001 225.6 362.6000000000001 213.6z" />
+    <glyph glyph-name="grav"
+      unicode="&#xF2D6;"
+      horiz-adv-x="512" d=" M301.1 236C305.5 231.6 305.5 224.1 301.1 219.7L291.4000000000001 210C287.0000000000001 205.3 279.5000000000001 205.3 274.8 210L264.3 220.5C259.9000000000001 225.2 259.9000000000001 232.4 264.3 237.1L274 246.8C278.4 251.2 285.9 251.2 290.6 246.8L301.1 236zM270.9000000000001 255.7C273.9000000000001 258.7 273.9000000000001 263.5 270.9000000000001 266.2C268.1 269.2 263.4000000000001 269.2 260.4000000000001 266.2C257.6 263.4 257.6 258.7 260.4000000000001 255.7C263.5000000000001 252.9 268.2000000000001 252.9 270.9000000000001 255.7zM244.9000000000001 250.4C241.9000000000001 247.6 241.9000000000001 242.9 244.9000000000001 240.2C247.7000000000001 237.2 252.4000000000001 237.2 255.4000000000001 240.2C258.2000000000001 243 258.2000000000001 247.7 255.4000000000001 250.4C252.4000000000001 253.4 247.7000000000001 253.4 244.9000000000001 250.4zM317.4000000000001 263.7C297.5000000000001 278.1 283.6 306.9 305.5000000000001 331.8C327.1000000000001 356.7 346.2000000000001 349 365.3000000000001 331C377.2000000000001 319.7 394.6000000000001 306.1 382.5000000000001 282.8C370.0000000000001 259.3 337.4000000000001 249.6 317.4000000000001 263.7zM365.1 308.2C356.2000000000001 318.2 341.8 301.3 349.6 292.1C357 283.1 381.7000000000001 289.7 365.1 308.2zM504 192C504 55 393 -56 256 -56S8 55 8 192S119 440 256 440S504 329 504 192zM437.8 149.4C440.3 165.5 417.6 166 412.6 175.1C399 199.2 384.9000000000001 211.9 358.1 205.5C369.7000000000001 213.5 381.6 211.6 381.6 211.6C381.9000000000001 218 381.6 224.6 372.2000000000001 236.5C376.1 249 372.5000000000001 258.9 372.5000000000001 258.9C388.0000000000001 267.5 399.3000000000001 283.3 401.6000000000001 302.1C405.2000000000001 333.1 382.8000000000001 361.3 351.8000000000001 364.9C329.7000000000001 367.4 308.1000000000001 357.2 297.5000000000001 339.2C274.3000000000001 299.1 298.9000000000001 268.3 319.9000000000001 257.8C305.5000000000001 259.2 285.6 269.7 279.8 292.1C273.2 317.8 282.6 341.9 288.7 353.5C288.7 353.5 284.3 359.3 280.7 362.4C280.7 362.4 266.9 362.4 256.1 357.1C268 372.3 281.3 371.5 281.3 371.5C281.3 377.9 280.7 386.4 277.7 393.1C272.3 404.1 253.8999999999999 406 246 390.3C246.1 390.5 246.3 390.7 246.4 390.8C241.4 378.9 245.3 334.9 263.3 303.6C260.8 302.2 254.2 297.5 250.3 293.6C228.7 283.9 194.1 233.3 194.1 233.3C165.9 222.5 116.9 182.4 123.5 153.6C123.8 150.6 124.9 148.1 126.5 146.1C123.7 143.9 121 141.1 118.2 137.8C106.3 124 112.9 102.6 135.9 113.4C151.7 120.6 165.5 133.6 172.2 143.8C172.2 143.8 166.7 148.8 155.9 148.2C183.6 154.8 190.2 157.6 202.1 157.3C210.1 153.4 210.1 191.6 210.1 191.6C210.1 206.3 207.9 222.6 199 233.1C211.5 220.9 228.1 200.4 227 172.5C226.2 154.2 211.8 149.5 211.8 149.5C202.7 132.9 168.6 83.6 181.4 43.5C181.4 43.5 171.7 58.4 171.2 65.6C153.8 46.2 124.7 13.3 146.6 1.1C173.2 -13.6 255.4 89.7000000000001 272.8 143.4C307.4000000000001 164.2000000000001 328.2 190.7000000000001 336.7 208.4C358.7 164.9 432 113.9 437.8 149.4z" />
+    <glyph glyph-name="gripfire"
+      unicode="&#xF3AC;"
+      horiz-adv-x="384" d=" M171.8 -55.8C171.8 -50.5 176.6 -43.6 176.6 -33.5C176.6 -18.3 163.6 6.4 98.5 53.1C64.2 82.2 32 111.6 32 161.4C32 276.1 179.1 337.9 179.1 430C179.1 433.3 178.9 436.7 178.5 440C183.6 437.6 217.6 396.7 217.6 349.6C217.6 269.1 112.5 220.4 112.5 146.6C112.5 119.7000000000001 129.1 99.4 145.1 77.1C167.6 46.9 189.3 20.2 189.3 -9.4C189.2 -23.9 184.9 -39.1 171.8 -55.8zM317.8 185.6C319.3 177.2000000000001 320 169 320 161C320 109.2 290.6 63.5 252.7 24.2C251.7 23.2 250.5 21.8 249.5 21.8C245.9 21.8 214 63.4 214 75C214 75 255.8 130.7 255.8 171.9C255.8 182.7 253.1 193.6 246.7 205.3C245.2 173 191 117.6 188.6 117.6C185.9 117.6 170.7 139.6 170.7 159.7C170.7 165 171.7 170.4 173.9 175.5C176.3 181 230.5 247.5 230.5 292.2C230.5 298.4 229.5 304.2 227.1 309.3L223.1 316.5C239.8 310 305.7 252.4 317.8 185.6" />
+    <glyph glyph-name="grunt"
+      unicode="&#xF3AD;"
+      horiz-adv-x="384" d=" M61.3 258.7C60.2 248.7 66.5 239.6 66.5 239.6C67.2 247.1 68.7 252.4 70.5 256.2C70.9 245.9 73.7 232.7 83.3 222.1C90.2 214.5 118.9 198.8 138.2 216C139.2 213.6 140.3 210.7 141.2 207.5C144.1 197.2 138.5 182.2 138.5 182.2S153.6 199.3 152.4 214.7C163.2 215.2 173.8 223.1 173.5 234.2C173.5 234.2 154.6 223.8 138 243C128.3 254.2 97.1 285 54.9 274.8C59.2 273.8 63.8 272.4 68.4 270.7000000000001H68.3C64.1 268.7000000000001 61.8 263.6 61.3 258.7000000000001zM89.6 260.5C109.1 249.5 127 234.8 134.5 223.5C128.8 220.2 112.8 213.1 96.5 225.2C86.2 232.8 86.7 251.4 89.6 260.5zM168.8 26.8C171 24.5 170.3 21.5 169.7 20C168.6 17.3 164.2 8.4 156.7 0.2C154 -2.7 150.1 -4.4 145.7 -4.4C141.4 -4.4 137 -2.8 133.9 -0.1C131.6 2 123.7 9.4 120.2 18.5C118.9 21.9 119.2 24.6 121.1 26.6C122.4 27.9 125.1 29.5 130.6 29.5H160C164.1 29.5 167 28.6 168.8 26.8zM231.7 214.7C230.5000000000001 199.2 245.6 182.2000000000001 245.6 182.2000000000001S240.0000000000001 197.2000000000001 242.9000000000001 207.5000000000001C243.8000000000001 210.7000000000001 244.9000000000001 213.5000000000001 245.9000000000001 216.0000000000001C265.2000000000001 198.7000000000001 293.9000000000001 214.5000000000001 300.7000000000001 222.1000000000001C310.3000000000001 232.7000000000001 313.0000000000001 245.9000000000001 313.5000000000001 256.2000000000001C315.3000000000001 252.4000000000001 316.9000000000001 247.1000000000001 317.5000000000001 239.6000000000001C317.5000000000001 239.6000000000001 323.9000000000001 248.7000000000001 322.7000000000001 258.7000000000001C322.1 263.7000000000001 319.8000000000001 268.7000000000001 315.7000000000001 270.5000000000001H315.6C320.2000000000001 272.3000000000001 324.8 273.7000000000001 329.1 274.6C286.8 284.8000000000001 255.7 254.0000000000001 246.0000000000001 242.8000000000001C229.3000000000001 223.6000000000001 210.5 234.0000000000001 210.5 234.0000000000001C210.3000000000001 223.1 220.9 215.1 231.7 214.7zM249.5000000000001 223.5C257 234.9000000000001 274.9000000000001 249.5000000000001 294.4000000000001 260.5C297.4000000000001 251.4000000000001 297.8 232.8000000000001 287.4000000000001 225.1C271.1 213 255.2000000000001 220.1 249.5000000000001 223.5C249.4000000000001 223.4 249.5000000000001 223.5 249.5000000000001 223.5zM263 26.6C264.9 24.7 265.2 22 263.9 18.7C260.4 9.8000000000001 252.5 2.6 250.2 0.6C247.1 -2 242.8 -3.6 238.4 -3.6S230.1 -1.9999999999999 227.4 0.9C219.9 8.9 215.4 17.6 214.4 20.2C213.8 21.7 213.1 24.6 215.3 26.9C217 28.7 220 29.6 224.2 29.6H253.6C259 29.5 261.7 27.9 263 26.6zM164.7 278.1C174.6 272.1 183.5 270 192 269.8C200.5 270 209.4 272.1 219.3 278.1C219.3 278.1 204.8 260.4000000000001 192.1 260.3H191.9C179.2000000000001 260.5 164.7000000000001 278.1 164.7000000000001 278.1zM349.2 130.7000000000001C346.8 112.8000000000001 336.2 96.9 324.6 87.0000000000001C321.5 109.7000000000001 320.9 142.5000000000001 320.9 149.4C320.9 164.1 330.4 173.9 333.1 175.5000000000001C335.6 177.0000000000001 338.5 178.5000000000001 341.4 180.1000000000001C359.4 189.7000000000001 381.8 201.7000000000001 381.8 223.8000000000001C381.8 240.0000000000001 372.5 247.0000000000001 366.4 251.6000000000001C365.6 252.2000000000001 364.9 252.7000000000001 364.2 253.3000000000001C362.1 255.0000000000001 360.5 256.3000000000001 359.9 257.7000000000001C355.5 267.5000000000001 356.3 291.9000000000001 358.2 295.3000000000001C358.8 295.9000000000001 374.9 316.2000000000001 370 334.5000000000001C368 341.9000000000001 363.1 347.8000000000001 355.9 351.5000000000001C350.6 354.2000000000001 344 355.7000000000001 336.4 356.0000000000001C336.3 358.0000000000001 335.9 359.9000000000001 335.5 361.9000000000001C334.9 364.5000000000001 334.4 367.2000000000001 334.6 370.0000000000001C335 374.7000000000001 335.4000000000001 379.0000000000001 336.8 381.3000000000001C345.2 394.6000000000001 365.6 398.9000000000001 365.8 398.9000000000001L378.1 401.3000000000001L370 410.8000000000001C369.9 411.0000000000001 352.7 428.3000000000001 323.7 428.3000000000001C315.8 428.3000000000001 307.7 427.0000000000001 299.6 424.4000000000001C275.4 416.6000000000001 256.7 393.9000000000001 250.2 385.1000000000001C247.1 386.1000000000001 243.9 387.0000000000001 240.6 387.8000000000001C236.4 403.6000000000001 249.6 426.3000000000001 249.6 426.3000000000001S236 429.3000000000001 215.9 411.1000000000001C213.3 417.6000000000001 207.8 431.6000000000001 214.1 448.3000000000001C184.6 437.9 177.2 422 175 407.6C167.4 413 168.3 430.7 167.8 435.2C160.3 434.3 138.6 413.3 139.6 386.9C137.6 386.4 135.7 385.8 133.7 385.2C127.2 394 108.6 416.7 84.3 424.5C76.4 426.7 68.3 428 60.4 428C31.4 428 14.3 410.7 14.1 410.5L6 401.1L18.3 398.7C18.5 398.7 38.9 394.4 47.3 381.1C48.7 378.9 49.1 374.5 49.5 369.8C49.7 367 49.1 364.3 48.6 361.7C48.2 359.8 47.8 357.8 47.7 355.8C40 355.5 33.5 354 28.2 351.3C21 347.6 16.1 341.7 14.1 334.3C9.1 316.1 25.3 295.8 25.9 295.1C27.8 291.7 28.6 267.3 24.2 257.5C23.6 256.1 22 254.8 19.9 253.1C19.2 252.6 18.5 252 17.7 251.4C11.6 246.8 2.3 239.7 2.3 223.6C2.3 201.5 24.7 189.5 42.7 179.9C45.7 178.3 48.5 176.8 51 175.3C53.7 173.6999999999999 63.2 163.9 63.2 149.1999999999999C63.2 142.3 62.6 109.4999999999999 59.5 86.8C47.9 96.6999999999999 37.3 112.6999999999999 34.9 130.6C34.9 130.6 5.7 107.9999999999999 14.3 59.8C19.5 30.3 37.5 13.6999999999999 61.3 5.1C70.1 -14.0000000000001 90.7 -40.6 128.6 -44.5000000000001C143 -56.3 163 -64 192.2 -64H192.4C221.5 -64 241.5 -56.3 256 -44.5C293.9 -40.6 314.5 -14 323.3 5.1C347.1 13.8 365 30.3 370.3 59.8C378.5 108.2 349.2 130.7000000000001 349.2 130.7000000000001zM305.7 410.3C311.3 412.1 317.3 413 323.4 413C334.4 413 343.3 410 348.1 408C345 406.6 341.7 404.8 338.4 402.7C336 403.1 332.8 403.5 329.2 403.5C318.7 403.5 308.7 400.4 300.5 394.6C288.2 385.9 282.5 377.7 279.8 372.2C277.6 373.5 275.3 374.7 272.7 375.9C271.1 376.7 269.6 377.4 268 378.1C274.1 387.2 287.9 404.6 305.7 410.3zM326.7 392.1C325.9 391.1 325.1 390 324.4 388.9C321.1 383.7 320.5 377.3 320 371.1C319.5 364.7 318.9 358.6 315.6 354.1C311.4000000000001 353.3 307.5 352.4 304.1 351.4C301.8 354.5 298.5 358.4 293.6 362.6C295 367.4 299.1 378.7 307.1 385.1C312.7000000000001 389.4 319.3 391.8 326.7000000000001 392.1zM45.6 402.7C42.3 404.9 39 406.7 35.9 408C40.7 410 49.6 413 60.6 413C66.7 413 72.6 412.1 78.3 410.3C96.1 404.5 109.9 387.1 116 378.2C114.4 377.5 112.8 376.8 111.2 376C108.7 374.8 106.3 373.5 104.1 372.3C101.5 377.7 95.8 386 83.4 394.7C75.1 400.5 65.2 403.6 54.6 403.6C51.2 403.5 48 403.1 45.6 402.7zM90.3 362.6C85.4 358.4 82 354.6 79.8 351.4C76.4 352.3 72.5 353.3 68.3 354.1C65 358.5 64.5 364.6 64 371C63.5 377.2 62.9 383.6 59.6 388.8C58.9 389.9 58.1 391 57.3 392C64.7 391.7 71.3 389.4 76.8 385C84.8 378.7 88.9 367.4 90.3 362.6zM58.1 188.1C55.4 189.7000000000001 52.5 191.2000000000001 49.7 192.7C34.8 200.7 19.5 209 19.5 223.2C19.5 234.3 23.8 237.8 28.4 241.4L28.9 241.8C29.6 242.4 30.3 243 31.1 243.6C30.2 236.4000000000001 29.2 230.3 28.4 228.7C28.4 228.7 40.5 243.7 44.1 273C45.5 284.5 43 307.3 39 316C39.2 311.1 39 306.2 38.7 301.6C38.3 302.4 37.9 303.2 37.4 303.8C34.2 307.8 25.6 321.3 28 330.4C28.9 333.9 31.1 336.4 34.7 338.2C38.5 340.1 43.5 341.1 49.8 341.1C62.1 341.1 75.7 337.4 82.7 335.1C107.8 327.1 138.1 304.2 146.8 297.4C147 297.2 147.2 297.1 147.2 297.1L152.8 293.2L149.3 299C149.1 299.3 130.2 330.4 96.1 345.5C98.1 348.4 103.5 353.6 117.7 360.6C139.1 371.1 164.2 376.4 192 376.4C219.9 376.4 244.9 371.1 266.3 360.6C280.5 353.7 285.9000000000001 348.4 287.9000000000001 345.5C253.9000000000001 330.4 235.0000000000001 299.3 234.8000000000001 299L231.3000000000001 293.2L236.9000000000001 297.1S237.1 297.2 237.3000000000001 297.4C246.0000000000001 304.2 276.3000000000001 327.2 301.4000000000001 335.1C308.4000000000001 337.3 322.0000000000001 341.1 334.3 341.1C340.6 341.1 345.6 340.1 349.4000000000001 338.2C352.9000000000001 336.4 355.1 333.8 356.1 330.4C358.6 321.3 350 307.8 346.7000000000001 303.8C346.2000000000001 303.2 345.8000000000001 302.5 345.4000000000001 301.6C345.1 306.2 344.9000000000001 311.1 345.1 316C341.1 307.2 338.6 284.5 340 273C343.6 243.7 355.7 228.7 355.7 228.7C354.9 230.3 353.9 236.4 353 243.6C353.7 243 354.5 242.4 355.2 241.8L355.7 241.4C360.3 237.7 364.6 234.3 364.6 223.2C364.6 209 349.2 200.7 334.4 192.7C331.5 191.2 328.7 189.6 326 188.1C317.3 183.1 308 171.4 306.9 153.9C306 139.3 307.8 104 310.3 78C297.9 73.2 283.6 71.6 270.6 71.2C268.6 75.3 266.7 79.7 265.1 84.3C264.4 86.3 245.5 135.4 238.7 146.5C244.2 107.5 256.2 72.8 262.2 56.9C258.7 57.4 254.8999999999999 57.6 250.5 57.6H133.5C129.0999999999999 57.6 125.2 57.3 121.8 56.9C127.8 72.8 139.9 107.5 145.3 146.5C138.5 135.3 119.6 86.2 118.9 84.3C117.3 79.7 115.4 75.3 113.4 71.2C100.4 71.6 86.2 73.2 73.7 78C76.2 104 77.9999999999999 139.2 77.1 153.9C76.2 171.3 66.8 183.1 58.1 188.1zM34.8 43.4C22.7 63.4 26.1 97.5 31.1 102.5C42 68.1 78.3 58.2 105.5 57.1C102.8 52.9 100.3 49.5 98.5 47.1L97.1 45.7C89.9 37.9 88.5 27.2 93 13.9C70.3 14.0000000000001 46.7 23.7 34.8 43.4zM80.5 -0.1C86.5 -1.2 92.7 -2 99.1 -2.5C102.6 -10.5 106.5 -18.4 111.4 -25.6C97 -19.7 87 -9.6 80.5 -0.1zM192 -50.2C131.4 -50.1 113.7 -4.4 107.1 14.5C103.4 25 103.7 32.7 108 37.6C110.9 40.9 117.5 44.8 132.6 44.8H251.4C266.5 44.8 273.2 40.9 276 37.6C280.2 32.8 280.5 25 276.9 14.5C270.3 -4.3 252.6 -50.1 192 -50.2zM272.6 -25.6C277.5 -18.4 281.4000000000001 -10.4999999999999 284.9000000000001 -2.4999999999999C291.3 -1.9999999999999 297.5000000000001 -1.1999999999999 303.5000000000001 -0.1C297.0000000000001 -9.6 287.0000000000001 -19.7 272.6000000000001 -25.6zM349.2000000000001 43.4C337.2000000000001 23.7 313.6 14.1 291.1 13.7C295.6 27.0000000000001 294.2000000000001 37.8000000000001 287 45.5000000000001C286.6 46.0000000000001 286.1 46.5000000000001 285.6 47.0000000000001C283.8 49.4 281.3 52.8000000000001 278.6 57.0000000000001C305.8 58.2000000000001 342.1 68.0000000000001 353 102.4C358 97.4 361.4 63.3 349.2 43.4z" />
+    <glyph glyph-name="gulp"
+      unicode="&#xF3AE;"
+      horiz-adv-x="256" d=" M209.8 56.9L195.7 32.3L191.1 -47.9C191.1 -56.8 162.8 -64 128 -64S64.9 -56.8 64.9 -47.9L59.1 31.5L44.2 56.9C85.4 39.6 170.2000000000001 40.2 209.8000000000001 56.9zM13.8 310.2L27.4 184.7C33.3 204.7 48.2 231.7 67.4 239.9C73.7 242.6 80.1 242.6 86.1 239C91.3 236 95.7 229.7 96.2 227.2C97.4 220.7 94.2 218.1 91.7 218.1C88.7 218.1 86.4 222.7 84.9 225.4C80.8 232.7 74.6 233 68 228.2C61.1 223.2 55.1 214.8 50.9 207.5C45.8 198.7 41.5 189 38.9 179.3C37.4 173.7 36 164.7 38.3 159.4C39.3 157.2000000000001 40.8 155.8 43.2 155.8C48.2 155.8 55.5 162.4 59 165.9C63.5 170.4 69.3 177.4 71.5 181.9L76.7 197.4C79.3 204.2000000000001 86.6 203 86.6 197.4C86.6 187.2000000000001 82.9 183.8 76.6 162.7000000000001C70.8 143.2000000000001 69 136.9 69 136.9C68.3 134.1 65.6 129.4 62.7 129.4C61.5 129.4 60.6 129.8 60.1 130.6C59.1 132 59.2 135.9 59.3 136.9C59.5 140.1 65.6 159.1 66.6 162.1C64.6 159.9 62.5 157.7000000000001 60.2 155.5C54.8 150.4 46.1 143.7 38.7 143.7C35.3 143.7 33.1 144.6 31 146.1L38.6 66.5C40.6 61.5 77.8 49.4 126.8 49.4C175.9 49.4 213.1 61.6 215 66.5L225.9000000000001 161.1C220.2000000000001 155.9 213.6 149.5 206.3000000000001 146.3C200.9 144 188.9 142.5 188.9 152C188.9 157.2 198 166.8 203.3000000000001 173.5C204.7000000000001 175.2 208 179.4 208 181.6C208 184.5 202 183.8 196.3000000000001 179.1C193.1000000000001 176.4 190.1000000000001 172.8 187.6000000000001 169.4C183.3000000000001 163.4 181.0000000000001 158.2000000000001 179.1000000000001 153.9C172.9000000000001 139.7000000000001 175.0000000000001 145.3 170.0000000000001 131.9C165.0000000000001 118.6 165.8000000000001 120.1 164.8000000000001 117.9C163.9000000000001 116.0000000000001 162.6000000000001 114.4 160.8000000000001 113.4C158.9000000000001 112.4 156.3000000000001 112.5000000000001 154.7000000000001 113.7000000000001C153.8000000000001 114.3000000000001 153.4000000000001 115.6 153.4000000000001 117.4C153.4000000000001 118.3 153.5000000000001 119.2000000000001 153.7000000000001 120.1C155.2000000000001 126.2000000000001 161.5000000000001 138.2000000000001 168.7000000000001 154.4C170.3000000000001 158.1 169.7000000000001 157.0000000000001 169.5000000000001 156.7000000000001C163.3000000000001 150.7000000000001 158.6000000000001 147.8000000000001 155.1000000000001 146.2000000000001C149.3000000000001 143.6 142.1000000000001 143.6 140.6000000000001 150.3000000000001C140.5000000000001 150.7000000000001 140.5000000000001 151.1000000000001 140.4000000000001 151.5000000000001C128.6000000000001 142.3000000000001 116.1000000000001 139.8000000000001 120.4000000000001 159.6000000000001C115.8000000000001 151.4000000000001 107.8000000000001 144.7000000000001 98.0000000000001 144.7000000000001C93.9000000000001 144.7000000000001 90.9000000000001 146.1000000000001 89.4000000000001 149.8000000000001C87.1000000000001 155.3000000000001 90.7000000000001 164.7000000000001 94.0000000000001 173.6000000000001C95.7000000000001 178.1000000000001 98.0000000000001 183.5000000000001 101.1000000000001 189.8000000000001C102.7000000000001 193.2000000000001 105.3000000000001 195.2000000000001 108.7000000000001 194.3000000000001C109.3000000000001 194.1000000000001 109.8000000000001 193.9000000000001 110.3000000000001 193.6000000000001C112.9000000000001 191.8000000000001 111.9000000000001 189.1000000000001 110.6000000000001 186.4000000000002C106.8000000000001 178.9000000000002 103.5000000000001 173.4000000000002 101.3000000000001 165.6000000000001C100.4000000000001 162.3000000000001 99.3000000000001 156.6000000000001 102.8000000000001 156.6000000000001C105.2000000000001 156.6000000000001 107.5000000000001 157.4000000000002 109.7000000000001 159.0000000000001C114.3000000000001 162.4000000000001 118.0000000000001 167.5000000000001 120.8000000000001 172.5000000000001C122.8000000000001 176.1000000000001 125.2000000000001 180.8000000000001 126.4000000000001 184.8000000000001C126.9000000000001 186.5000000000001 127.5000000000001 188.1000000000001 128.2000000000001 189.6000000000001C129.3000000000001 192.1000000000001 130.8000000000001 194.7000000000001 133.4000000000001 194.7000000000001C134.7000000000001 194.7000000000001 135.8000000000001 194.2000000000001 136.6000000000001 193.2000000000001C138.3000000000001 191.0000000000001 137.9000000000001 188.7000000000002 137.0000000000001 186.3000000000001C135.0000000000001 180.7000000000001 132.3000000000001 175.7000000000001 130.1000000000001 169.6000000000001C128.8000000000001 166.1000000000001 127.4000000000001 161.6000000000001 127.4000000000001 157.9000000000002C127.4000000000001 154.5000000000002 131.1000000000001 155.3000000000001 134.2000000000001 156.7000000000002C136.6000000000001 157.8000000000002 139.0000000000001 159.5000000000002 141.0000000000001 161.2000000000002C142.2000000000001 166.1000000000001 141.9000000000001 165.0000000000002 167.4000000000001 229.4000000000002C168.7000000000001 232.7000000000002 171.1000000000001 234.1000000000002 173.5000000000001 234.1000000000002C174.7000000000001 234.1000000000002 175.7000000000001 233.7000000000002 176.7000000000001 233.0000000000002C178.4 231.7000000000002 178.4 228.9000000000002 177.7000000000001 226.8000000000002C177.0000000000001 224.9000000000002 177.1000000000001 225.5000000000002 173.2000000000001 216.3000000000002C168.0000000000001 204.2000000000002 164.6000000000001 195.5000000000002 160.0000000000001 184.4000000000002C158.1000000000001 179.8000000000001 152.3000000000001 165.5000000000002 151.3000000000001 162.1000000000001C150.7000000000001 159.9000000000002 150.0000000000001 156.3000000000001 152.3000000000001 156.3000000000001C157.7000000000001 156.3000000000001 171.6000000000001 169.4000000000002 175.4000000000001 173.3000000000001C175.6000000000001 173.6000000000001 175.9000000000001 173.7000000000001 176.3000000000001 173.9000000000002C176.9000000000001 175.8000000000001 177.5000000000001 177.6000000000001 178.0000000000001 179.4000000000002C179.4000000000001 183.2000000000002 180.7000000000001 187.6000000000001 183.3000000000001 190.7000000000002C184.1000000000001 191.7000000000002 185.0000000000001 192.3000000000002 186.0000000000001 192.3000000000002C188.8000000000001 192.3000000000002 190.2000000000001 191.1000000000001 190.2000000000001 188.3000000000002C190.2000000000001 187.2000000000002 189.5000000000001 183.2000000000002 189.1000000000001 182.1000000000002C190.5000000000001 183.6000000000002 192.0000000000001 185.1000000000002 193.6000000000001 186.6000000000002C208.6000000000001 200.5000000000002 219.3000000000001 193.4000000000002 219.3000000000001 186.4000000000002C219.3000000000001 179.0000000000002 210.4 168.7000000000002 205.5 163.0000000000002C203.9 161.1000000000003 200.6 157.6000000000003 200.5 156.6000000000003C200.5 155.3000000000003 201.4 154.8000000000003 202.7 154.8000000000003C204.7 154.8000000000003 209.1 158.3000000000003 210.7 159.5000000000002C215.7 163.4000000000002 222.5 169.4000000000002 227.3 173.6000000000003L242.1 310.4000000000003C211.6 293.3000000000003 44.5 293.2000000000003 13.8 310.2000000000003zM243.5 318.7C243.5 297.7 12.3 297.7 12.3 318.7C12.3 327.5 64.1 334.6 127.9 334.6C136.9 334.6 145.7 334.5 154.2 334.2L166.8 382.9L228.1 447.4C229.5 448.8 233.9 447.6 238 443.9S244.6 436 243.3 434.6L243.2 434.5L185.9 374L175.9 333.3C215.8 330.7 243.5 325.2 243.5 318.7zM174.1 314.1C174.1 314.9 173.2 315.6 171.6 316.2L171.4 315.4C171.4 314.1 166.4 313 160.3 313S149.2 314.1 149.2 315.4C149.2 315.5 149.2 315.6 149.3 315.7L149.5 316.4C147.7 315.8 146.5 315 146.5 314.1C146.5 312 152.7 310.4 160.2 310.4C167.9 310.3 174.1 312 174.1 314.1z" />
+    <glyph glyph-name="hacker-news-square"
+      unicode="&#xF3AF;"
+      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM21.2 218.8H21C21.1 218.9 21.2 219.1 21.3 219.2C21.3 219.1 21.3 218.9 21.2 218.8zM239.2 164.9V64H207.8V166.7L128 320H165.3C217.8 221.7 214.5 218.8 224.6 194.4C236.9000000000001 221.4 230.4000000000001 218.8 285.2000000000001 320H320L239.2 164.9z" />
+    <glyph glyph-name="hacker-news"
+      unicode="&#xF1D4;"
+      horiz-adv-x="448" d=" M0 416V-32H448V416H0zM21.2 218.8H21C21.1 218.9 21.2 219.1 21.3 219.2C21.3 219.1 21.3 218.9 21.2 218.8zM239.2 164.9V64H207.8V166.7L128 320H165.3C217.8 221.7 214.5 218.8 224.6 194.4C236.9000000000001 221.4 230.4000000000001 218.8 285.2000000000001 320H320L239.2 164.9z" />
+    <glyph glyph-name="hips"
+      unicode="&#xF452;"
+      horiz-adv-x="640" d=" M0 367.8C0 369.6 0.9 370.5 2.7 370.5H43.6C45.5 370.5 46.4 369.6 46.4 367.8V286.6C61.6 294.3 78.1 298.1 96.2 298C120.2 297.9 140.4 291.8 156.5 280C175.2 266.5 184.5 248.1 184.5 224.7V88.6C184.5 86.7000000000001 183.6 85.8 181.8 85.8H154.5C145.4 85.8 138.1 93.1 138.1 102.1V224.7C138.1 225.6 140.8 251.7 92.3 251.7C43.7 251.7 46.5 225.5 46.5 224.7V88.6C46.5 86.7000000000001 45.6 85.8 43.7 85.8H2.7C0.9 85.8 0 86.7 0 88.6V367.8zM497.7 146.3C511.4 136.1 531.8 127.2 556.1 127.2C579.4 127.2 588.9 131.7 592.6 140.8C595.6 148.7 592 156.9 580.4 162L526.8 185.5C505.4 194.9 492.9999999999999 209.5 489.6 229.1C483.9 262.8 511.8 282.4 512.3 282.8C525.5 292.4 544.3 298.2000000000001 570.8 298.2000000000001C589.8 298.2000000000001 608.1999999999999 294.9 625.9 288.3C627.1999999999999 287.8 627.8 287 627.8 285.7000000000001V241C627.8 238.9 625.5 237.6 623.8 238.6C584.0999999999999 259.3 547.1999999999999 250.9 539.8 245.4C533.1999999999999 240.5 533.8 232.9 542.4 229.3L600 204C616.5 196.9 628.1 185.6 634.9 169.9C640.4 157.3 641.5 144.3 638 130.8C628.4 93.9 593.1 85.3 592.4 84.9999999999999C581.9 81.8999999999999 568.8 80.6999999999999 556.1 80.6999999999999C539.5 80.6999999999999 523.5 83.3999999999999 507.9 88.8999999999999C498.2 92.2999999999999 493.3 99.1999999999999 493.3 109.5999999999999V144C493.3 146.1 495.6 147.7 497.7 146.3zM376.2 298.2C344.5 298.2 272 278.1 272 194.7V11.2C272 10.4 272.6 8.5 274.7 8.5H315.6C317.5 8.5 318.4 9.4 318.4 11.2V100C334.9 87.3 354.2 80.9 376.1 80.9C436.6 80.9 484.8 129.4 484.8 189.6C484.9 249.9 436.6 298.2 376.2 298.2zM376.2 127.3C359 127.3 344.3 133.4 332.2 145.5C320 157.6999999999999 314 172.3 314 189.5C314 224 341.6 251.7 376.2 251.7C410.7 251.7 438.4 224.0999999999999 438.4 189.5C438.5 155.1999999999999 411.1 127.3 376.2 127.3zM251.6 88.6C251.6 86.7 250.7 85.8 248.8 85.8H207.9C206.3 85.8 205.2 87.1999999999999 205.2 88.6V290.4C205.2 291.8 206.3 293.2000000000001 207.9 293.2000000000001H248.8C250.7 293.2000000000001 251.6 292.3 251.6 290.4V88.6M228.3 375.5C244.2 375.5 257.2 362.8 257.2 346.6C257.2 330.8 244.5 317.7 228.3 317.7S199.4 331 199.4 346.6C199.5 362.6 212.4 375.5 228.3 375.5" />
+    <glyph glyph-name="hire-a-helper"
+      unicode="&#xF3B0;"
+      horiz-adv-x="512" d=" M443.1 448H71.9C67.9 410.7 37.4 380.2 0 376.3V4.8C37.4 -0.1 66 -27.6 71.9 -64H444.1C447.1 -27.6 476.6 1.8 512 5.8V376.3C475.6 382.2 447 411.6 443.1 448zM406.1 43.1C369.8 43.1 387.3 45.1 351 45.1C315.2 45.1 330 43.1 294.9 43.1C289 43.1 290 51.3 294.9 52.9C317.7 60.5000000000001 317.8 63.1 319.5 65.7000000000001C329.9 81.3000000000001 325.4 148.7000000000001 325.4 178.7000000000001C325.4 184.0000000000001 319 191.5000000000001 311.6 191.5000000000001H200.4C193 191.5000000000001 186.6 184.0000000000001 186.6 178.7000000000001C186.6 148.7000000000001 182.1 81.3000000000001 192.5 65.7000000000001C194.2 63.2000000000001 194.3 60.5000000000001 217.1 52.9C222 51.3 223.1 43.1 217.1 43.1C182 43.1 196.8 45.1 161 45.1C124.7 45.1 142.2 43.1 105.9 43.1C98 43.1 100.1 53.9 105.9 53.9C116.1 57.3 119.4 57.4 127.6 67.7000000000001C135.3 80.6 135.5 112.1 135.5 195.5000000000001V296.7C135.5 318.9 123.3 325 106.9 329.1C98.1 331.3 102.9 340.9 107.9 340.9C144.4 340.9 128.5 338.9 165 338.9C197.7 338.9 181.5 340.9 214.2 340.9C217.5 340.9 222.7 332.6 215.2 330.1C210.3 328.5 187.6 326.4 187.6 290.8C187.6 245.2 187.4 235 188.6 222C188.6 220.7 190.9 209.2 201.4 209.2H310.6C321.1 209.2 323.4000000000001 220.7 323.4000000000001 222C324.6 235 324.4000000000001 245.2 324.4000000000001 290.8C324.4000000000001 326.4 301.7000000000001 328.5 296.8 330.1C289.3 332.6 294.5 340.9 297.8 340.9C330.5 340.9 314.3 338.9 347 338.9C383.5 338.9 367.6 340.9 404.1 340.9C409 340.9 414 331.3 405.1 329.1C388.7000000000001 325 376.5 318.8 376.5 296.7000000000001V195.5C376.5 112.1 376.6 80.6 384.4 67.7C392.6 57.5 395.8 57.3 406.1 53.9C411.9 53.9 413.9 43.1 406.1 43.1z" />
+    <glyph glyph-name="hooli"
+      unicode="&#xF427;"
+      horiz-adv-x="640" d=" M508.4 96H566.3V291.3L508.4 264V96zM582.1 206.5V96H640V206.5H582.1zM331.4000000000001 215.4C313.2000000000001 233.6 281.0000000000001 232.5 281.0000000000001 232.5S248.8000000000001 233.6 230.6000000000001 215.4C228.7000000000001 213.5 226.9000000000001 211.5 225.3000000000001 209.4C187.1 239 152.8000000000001 255.9 123.2000000000001 270.5V291.2L100.7000000000001 280.6C46.3000000000001 302.7 11.7 298.8 3.4 280.5C3.4 280.5 -21.4999999999999 247.7 65.3 169.6V200.6C16.5 255.2 26.3 276.7000000000001 30 279.8C43.5 291.2000000000001 67.5 287.8 94.4000000000001 277.7000000000001L65.2 264V200.7C78.3 186 95.7 169.2 118.7 150.3L123.2 146.7V176.5C123.2 183.4 124.9 194.7 134 194.7S144.6 187.8 144.6 179.7V131C162.6 118.8 181.9 108.9 202.3 101.4V195.3C202.3 214 188.9 232.7 161.7 232.7C145.9 232.8 131.2 224.5 123.2 210.8V265.1C165.1 244.2 207.1 218.6 223.1 206.8C212.9 192.2 213.8 178.6999999999999 213.8 163.1C213.8 144.4 212.4 128.8 230.6 110.6C248.8 92.4 281 93.4999999999999 281 93.4999999999999S313.3 92.3999999999999 331.4 110.6C349.6 128.8 348.1 144.4 348.1 163.1C348.1 181.6 349.6 197.3 331.4 215.4zM291.7000000000001 143.5C291.7000000000001 139.9 289.9000000000001 131 281.0000000000001 131C272.1000000000001 131 270.3000000000001 139.9 270.3000000000001 143.5V183.9C270.3000000000001 192.6 277.6000000000001 194.8 281.0000000000001 194.8C284.4000000000001 194.8 291.7000000000001 192.7 291.7000000000001 183.9V143.5zM477.4 215.4C459.2 233.6 427.0000000000001 232.5 427.0000000000001 232.5S394.7000000000001 233.6 376.6000000000001 215.4C358.4000000000001 197.2 359.8000000000001 181.5 359.8000000000001 162.8C359.8000000000001 144.1 358.4000000000001 128.5 376.6000000000001 110.3C394.8000000000001 92.1 427.0000000000001 93.2 427.0000000000001 93.2S459.3000000000001 92.1 477.4 110.3C495.6 128.5 494.2 144.1 494.2 162.8C494.1 181.6 495.5000000000001 197.3 477.4 215.4zM437.6 143.5C437.6 139.9 435.8 131 426.9000000000001 131C418.0000000000001 131 416.2000000000001 139.9 416.2000000000001 143.5V183.9C416.2000000000001 192.6 423.5000000000001 194.8 426.9000000000001 194.8C430.3 194.8 437.6 192.7 437.6 183.9V143.5zM611.1 216.5C627 216.5 640 229.4 640 245.4S627.1 269.9 611.1 269.9C595.2 269.9 582.2 261.3 582.2 245.4S595.1 216.5 611.1 216.5zM144.5 96L182.8 95.2C169.6 99.8 156.8 105.4 144.5 112V96zM123.1 96V124.6C116.6 128.8 110.1 133.3 103.7 138.2000000000001C88.9 149.4 76.2 159.9 65.2 169.7000000000001V96H123.1zM182.8 95.2C219.3 82.7 252.7 81 277.5 88C257.6 87.8 231.7 90.6 202.2 101.3V96L182.8 95.2z" />
+    <glyph glyph-name="hotjar"
+      unicode="&#xF3B1;"
+      horiz-adv-x="448" d=" M414.9 286.5C340.2 419 121.1 448 121.1 448S222.2 337.6 93 250.3C11.3 195.2 -21 123.6 14 45.4C40.8 -14.5 97.5 -38.9 158.6 -48C129.4 7.1 152 74.4 154.5 81.6C211.6 -4.8 319.5 81.6 265.3 175.5C336.3 160.1 346.9 36.9 292.4000000000001 -40C372.9000000000001 -14.7 426.5 48.9 441.2000000000001 105.6C456.7 164.9 444.9000000000001 233.5000000000001 414.9000000000001 286.5z" />
+    <glyph glyph-name="houzz"
+      unicode="&#xF27C;"
+      horiz-adv-x="414.6" d=" M258.9 117.3H154.3V-32H0V416H109.5V311.5L414.6 225.9V-32H258.9V117.3z" />
+    <glyph glyph-name="html5"
+      unicode="&#xF13B;"
+      horiz-adv-x="384" d=" M0 416L34.9 20.2L191.5 -32L349.1 20.2L384 416H0zM308.2 288.1H124.4L128.5 238.7H304.1L290.5 90.3L192.6 63.3V62.9999999999999H191.5L92.8 90.3L86.8 166.1H134.5L138 128L191.5 113.5L245.2 128L251.2 190.2H84.3L71.5 335.8H312.6L308.2000000000001 288.1z" />
+    <glyph glyph-name="hubspot"
+      unicode="&#xF3B2;"
+      horiz-adv-x="512" d=" M267.4 236.4C242.3 212.7 226.6 179.1 226.6 141.8C226.6 112.5 236.3 85.5 252.6 63.8L203.1 14C198.7 15.6 194 16.5 189.1 16.5C178.3 16.5 168.2 12.3 160.6 4.7C153 -2.9 148.8 -13.1 148.8 -23.9S153 -44.8 160.6 -52.4C168.2 -60.0000000000001 178.4 -64 189.1 -64C199.9 -64 210 -60.1 217.7 -52.4C225.3 -44.8 229.5 -34.6 229.5 -23.9C229.5 -19.7 228.9 -15.7 227.6 -11.8L277.6 38.4C299.6 21.5000000000001 327 11.5000000000001 356.9000000000001 11.5000000000001C428.8000000000001 11.5000000000001 486.9 69.8000000000001 486.9 141.7000000000001C486.9 206.9 439.2000000000001 260.9000000000001 376.7000000000001 270.4000000000001V332C394.2000000000001 339.4 404.9000000000001 355.8 404.9000000000001 374.9C404.9000000000001 401 384.0000000000001 422.8 357.9000000000001 422.8S311.2 401 311.2 374.9C311.2 355.8 321.9 339.4 339.4 332V270.8C324.2 268.7000000000001 309.8 264.1 296.7 257.2000000000001C269.1 278.1 179.2 342.9000000000001 127.8 382C129 386.4000000000001 129.8 391 129.8 395.8C129.8 424.6 106.3 448 77.4 448C48.6 448 25.2 424.6 25.2 395.8C25.2 366.9 48.6 343.5 77.4 343.5C87.2 343.5 96.3 346.4 104.2 351.1L267.4 236.4zM356.9 72.8C318.8 72.8 287.9 103.7 287.9 141.8S318.8 210.8 356.9 210.8S425.9 179.9 425.9 141.8S395 72.8 356.9 72.8z" />
+    <glyph glyph-name="imdb"
+      unicode="&#xF2D8;"
+      horiz-adv-x="448" d=" M350.5 159.3C350.5 153.9 352.1 144.9 344.3 144.9C342.7 144.9 341.3 145.7000000000001 340.5 147.3C338.3 152.4 339.4 191.4 339.4 192C339.4 195.8 338.3 204.7 344.3 204.7C351.6 204.7 350.5 197.4 350.5 192V159.3zM265 218.1C265 227.8 266.6 234.1 254.7 234.1V150.4C266.9 150.1 265 159.1 265 168.8V218.1zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM21.3 219.2C21.2 219.1 21.1 218.9 21 218.8H21.3V219.2zM97 256H64V128.2H97V256zM210.3 256H167.2L159.6 196.1C156.9 216.1 154.2 236.2 150.9 256H108.1V128.2H137.1V212.7L149.3 128.2H169.9L181.5 214.6V128.2H210.2V256zM296.6 210.7C296.6 218.8 296.9000000000001 227.5 295.2000000000001 235.1C290.9000000000001 257.6 263.8000000000001 256 246.2000000000001 256H221.6000000000001V128.2C307.7000000000001 128.1 296.6 122.2 296.6 210.7zM382.5 193.4C382.5 210.7 381.7 223.5 360.3 223.5C351.4000000000001 223.5 345.4000000000001 220.8 339.4000000000001 214.3V256H307.7000000000001V128.2H337.5000000000001L339.4000000000001 136.3C345.1 129.5 351.3 126.5 360.3 126.5C380.1 126.5 382.5 141.7 382.5 157.4V193.4z" />
+    <glyph glyph-name="instagram"
+      unicode="&#xF16D;"
+      horiz-adv-x="448" d=" M224.1 307C160.5 307 109.2 255.7 109.2 192.1S160.5 77.2 224.1 77.2S339 128.5 339 192.1S287.7 307 224.1 307zM224.1 117.4C183 117.4 149.4 150.9 149.4 192.1S182.9 266.8 224.1 266.8S298.8 233.3 298.8 192.1S265.2 117.4 224.1 117.4zM370.5 311.7C370.5 296.8 358.5 284.9 343.7 284.9C328.8 284.9 316.9 296.9 316.9 311.7S328.9 338.5 343.7 338.5S370.5 326.5 370.5 311.7zM446.6 284.5C444.9000000000001 320.4 436.7000000000001 352.2 410.4000000000001 378.4C384.2000000000001 404.6 352.4000000000001 412.8 316.5 414.6C279.5 416.7 168.6 416.7 131.6 414.6C95.8 412.9 64 404.7 37.7 378.5S3.3 320.5 1.5 284.6C-0.6 247.6 -0.6 136.7 1.5 99.7C3.2 63.8 11.4 32 37.7 5.8S95.7 -28.6 131.6 -30.4C168.6 -32.5000000000001 279.5 -32.5000000000001 316.5 -30.4C352.4 -28.7 384.2 -20.5000000000001 410.4 5.8C436.6 31.9999999999999 444.8 63.8 446.6 99.6999999999999C448.7 136.6999999999999 448.7 247.5 446.6 284.5zM398.8 60C391 40.4 375.9000000000001 25.3 356.2 17.4C326.7 5.7 256.7 8.4 224.1 8.4S121.4 5.8 92 17.4C72.4 25.2 57.3 40.3 49.4 60C37.7 89.5 40.4 159.5 40.4 192.1S37.8 294.8 49.4 324.2C57.2 343.8 72.3 358.9 92 366.8C121.5 378.5 191.5 375.8 224.1 375.8S326.8 378.4 356.2 366.8C375.8 359 390.9 343.9 398.8 324.2C410.5 294.7 407.8 224.7 407.8 192.1S410.5 89.4 398.8 60z" />
+    <glyph glyph-name="internet-explorer"
+      unicode="&#xF26B;"
+      horiz-adv-x="512" d=" M483.049 288.294C493.904 312.8690000000001 504.473 348.7320000000001 504.473 376.165C504.473 448.887 424.832 474.536 294.8 414.742C187.168 421.923 83.579 341.072 57.7019999999999 228.2850000000001C88.554 263.1470000000001 135.973 310.5830000000001 179.679 329.4430000000001C125.404 281.15 79.128 219.998 43.992 156.275C23.246 118.349 0 57.06 0 11.253C0 -87.322 92.854 -75.2470000000001 180.251 -30.753C211.674 -46.183 246.81 -46.326 281.9460000000001 -46.326C379.0700000000001 -46.326 466.1950000000001 7.968 498.76 99.696H377.927C325.418 11.103 181.108 46.7 181.108 147.132H509.9C516.307 190.713 508.245 242.847 483.049 288.294zM64.559 101.123C82.27 49.973 118.262 5.252 164.825 -22.181C76.084 -71.1210000000001 -8.442 -51.277 64.559 101.1229999999999zM180.536 209.996C182.536 265.147 230.812 304.867 284.516 304.867C337.9340000000001 304.867 386.497 265.147 388.497 209.996H180.536zM365.072 397.596C386.497 407.883 413.635 419.599 437.63 419.599C469.052 419.599 491.904 397.882 491.904 365.877C491.904 345.874 484.477 316.87 477.335 298.01C451.0549999999999 340.302 411.349 379.594 365.072 397.596z" />
+    <glyph glyph-name="ioxhost"
+      unicode="&#xF208;"
+      horiz-adv-x="640" d=" M616 288H548.7C511.2 377.3 422.9 440 320 440C183 440 72 329 72 192C72 175.6 73.6 159.5 76.7 144H24C10.7 144 0 133.2 0 120C0 106.7 10.7 96 24 96H91.3C128.8 6.7 217.1 -56 320 -56C457 -56 568 55 568 192C568 208.4 566.4 224.5 563.3 240H616C629.3 240 640 250.8 640 264C640 277.3 629.3 288 616 288zM520 192C520 81.5 430.5 -8 320 -8C244.3 -8 178.4 34 144.5 96H424C437.3 96 448 106.8 448 120C448 133.3 437.3 144 424 144H125.8C122 159.4 120 175.4 120 192C120 302.5 209.5 392 320 392C395.7 392 461.6 350 495.5 288H216C202.7 288 192 277.2 192 264C192 250.7 202.7 240 216 240H514.2C518 224.6 520 208.6 520 192zM216 216H424C437.3 216 448 205.3 448 192C448 178.8 437.3 168 424 168H216C202.7 168 192 178.7 192 192C192 205.2 202.7 216 216 216z" />
+    <glyph glyph-name="itunes-note"
+      unicode="&#xF3B5;"
+      horiz-adv-x="384" d=" M381.9 59.8C375.5 32.4 354.7 17 326.8 11.8C302.3 7.3 281.9 6.2 262.3 22C238.4 42.1 238.1 75.4 259.6 96.4C276.6 112.6 300.5 115.9 336.4 122.2C342.4 123.3 347.6 124.7 352 129.6C358.4 136.8 356.4 133.7 356.4 292.8C356.4 304 350.9 307.1 339.4 305.1C331.2 303.7 153.7 270.5 153.7 270.5C143.5 268.3 140.3 265.3 140.3 253.8C140.3 19.1 141.4 29.9 137.8 14.3C133.6 -3.9 122.4 -17.6 107.6 -25.2C90.8 -34.5000000000001 60.4 -38.6 44.2 -35.6C1 -27.5 -14.2 22.4 15.1 51C32.1 67.2 56 70.5 91.9 76.8C97.9 77.9 103.1 79.3 107.5 84.2C117.6 95.7 109.3 340.8 112.7 354.4C113.5 359.6 115.7 364 119.8 367.3C124 370.8 131.6 372.8 133.2 372.8C337.2 411 362.1 415.9 365.6 415.9C377.1 416.7 383.7 409.9 383.7 398.3C383.9 53.8 384.8 72.3 381.9 59.8z" />
+    <glyph glyph-name="itunes"
+      unicode="&#xF3B4;"
+      horiz-adv-x="448" d=" M223.6 367.7C129 367.7 52.5 291 52.5 196.5S129 25.2 223.6 25.2S394.8 101.9 394.8 196.4C394.8 291 318.1 367.7 223.6 367.7zM303 127.7C299.8 114.1 289.5 106.5 275.7 103.9C263.6 101.7 253.5 101.1 243.8 108.9C232 118.9 231.8 135.3 242.4 145.7C250.8 153.7 262.7 155.3 280.4 158.5C283.4 159 286 159.7 288.1 162.2C291.3 165.8 290.3 164.2 290.3 243C290.3 248.6 287.6 250.1 281.9 249.1C277.9 248.4 190 232 190 232C185 230.9 183.3 229.4 183.3 223.7C183.3 107.6 183.8 112.9 182.1 105.2C180 96.2 174.5 89.4 167.2 85.6C158.9 80.9999999999999 143.8 78.9999999999999 135.8 80.4C114.4 84.4 106.9 109.1 121.4 123.3C129.8 131.3 141.7 132.9 159.4 136.1C162.4 136.6 165 137.3 167.1 139.8C172.1 145.5 168 266.8 169.7 273.5C170.1 276.0999999999999 171.2 278.3 173.2 279.9C175.3 281.5999999999999 179 282.5999999999999 179.9 282.5999999999999C280.9 301.5999999999999 293.2 304 295 304C300.7 304.4 304 301 304 295.3C303.8999999999999 124.6999999999999 304.3999999999999 133.9 303 127.6999999999999zM345.2 416H102.8C45.9 416 0 370.1 0 313.2V70.8C0 13.9 45.9 -32 102.8 -32H345.2C402.2 -32 448 13.9 448 70.8V313.2C448 370.1 402.1 416 345.2 416zM223.6 4C117.3 4 31.1 90.2 31.1 196.5S117.3 389 223.6 389S416.1 302.8 416.1 196.5S329.9 4 223.6 4z" />
+    <glyph glyph-name="java"
+      unicode="&#xF4E4;"
+      horiz-adv-x="377.6" d=" M121.6 52S102 40.6 135.5 36.8C176.1 32.2 196.8 32.8 241.5 41.3C241.5 41.3 253.3 33.9 269.7 27.5C169.5 -15.4 42.9 30 121.6 52M109.4 108.1S87.5 91.9 121 88.4C164.3 83.9 198.6 83.6 257.8 95.0000000000001C257.8 95.0000000000001 266 86.7000000000001 278.9000000000001 82.2000000000001C157.6 46.7 22.6 79.3000000000001 109.4 108.1M212.6 203.2C237.3 174.8 206.1 149.2000000000001 206.1 149.2000000000001S268.8 181.6 240.0000000000001 222.1000000000001C213.1 259.9000000000001 192.5 278.7000000000001 304.1 343.4000000000001C304.2000000000001 343.4000000000001 128.9 299.6 212.6 203.2000000000001M345.2000000000001 10.6S359.7000000000001 -1.3 329.3000000000001 -10.6C271.4000000000001 -28.1 88.5000000000001 -33.4 37.7 -11.3C19.4 -3.4 53.7 7.7 64.5 10.0000000000001C75.7000000000001 12.4 82.2000000000001 12.0000000000001 82.2000000000001 12.0000000000001C61.9000000000001 26.3000000000001 -49.1 -16.1 25.8 -28.1999999999999C230.0000000000001 -61.3999999999999 398.2000000000001 -13.3 345.2000000000001 10.6000000000001M131 166.2S37.9 144.1 98 136.1C123.4 132.7 174 133.5 221.1 137.4C259.6 140.6 298.3 147.6 298.3 147.6S284.7 141.8 274.9000000000001 135.1C180.4 110.2 -2.1 121.8 50.4 147.2C94.9 168.6 131 166.2 131 166.2M298 72.9C394.1 122.8 349.6 170.8 318.6 164.3C311 162.6999999999999 307.6 161.3 307.6 161.3S310.4000000000001 165.6999999999999 315.8 167.6C377.1 189.2 424.3 103.9999999999999 296 70.3C296 70.4 297.5 71.6999999999999 298 72.9M240 448S293.2 394.8 189.5 313C106.4 247.4 170.5 209.9 189.5 167.2C141 211 105.4 249.5 129.3 285.4C164.4 337.9 261.5 363.5 240 448M140.5 -62.4C232.7 -68.2999999999999 374.3 -59.1 377.6 -15.5C377.6 -15.5 371.2000000000001 -32 301.4000000000001 -45.2C222.7000000000001 -60 125.6 -58.3 68.1 -48.8C68.1 -48.7 79.9 -58.5 140.5 -62.4" />
+    <glyph glyph-name="jedi-order"
+      unicode="&#xF50E;"
+      horiz-adv-x="448" d=" M231.89 112.28L263.33 158.17L243.15 102.67L305.71 93.58L243.15 84.5L267.37 37.07S237.15 68.84 232.88 73.32C234.64 4.54 235.07 -12.38 235.07 -12.38S389.4700000000001 59.27 303.69 217.71C303.69 217.71 410.66 335.78 313.78 408.44C313.78 408.44 479.28 308.53 374.33 136.98C374.33 136.98 461.11 221.75 415.7 307.52C415.7 307.52 494.41 196.51 398.54 74.41C398.54 74.41 424.78 90.56 447.99 152.12C447.99 152.12 431.06 -31.14 226.03 -33.5400000000001V-33.5600000000001H221.9499999999999V-33.5400000000001C16.93 -31.14 0 152.12 0 152.12C23.21 90.56 49.44 74.41 49.44 74.41C-46.43 196.5200000000001 32.29 307.5200000000001 32.29 307.5200000000001C-13.12 221.7400000000001 73.67 136.98 73.67 136.98C-31.28 308.54 134.21 408.44 134.21 408.44C37.33 335.78 144.3 217.71 144.3 217.71C58.52 59.27 212.92 -12.38 212.92 -12.38S213.35 4.55 215.11 73.32L180.63 37.07L204.85 84.5L142.29 93.58L204.85 102.67L184.67 158.17L216.11 112.28C218.36 200.13 223.93 418.1 223.96 419.13L223.97 421.56L223.99 420.56L224.02 421.56L224.03 419.13C224.08 417.41 229.64 199.93 231.89 112.28z" />
+    <glyph glyph-name="jenkins"
+      unicode="&#xF3B6;"
+      horiz-adv-x="512" d=" M487.1 23C485.7 34.2 468.1 46.1 458.9 54.9C453.8 59.9 429.9000000000001 78 428.5000000000001 84.8C427.1000000000001 91.4 438.2000000000001 106.3 441.8000000000001 113.6999999999999C446.9000000000001 124.3999999999999 450.6000000000001 137.3999999999999 453.1000000000001 146.3C471.9000000000001 212.4 473.8000000000001 303.2 446.9000000000001 357.5C436.7000000000001 378.0999999999999 408.3000000000001 406.5 390.5000000000001 420C348.5000000000001 451.6999999999999 270.9000000000001 455.3 220.4000000000001 436.6C206.3000000000001 431.3999999999999 192.6000000000001 426.8 180.3000000000001 419.5C147.2000000000001 400.1 112.0000000000001 387 102.2000000000001 347.9C78.0000000000001 337.1 70.7000000000001 306.1 71.9000000000001 270.1C72.1000000000001 263.1 76.0000000000001 254.3 74.6000000000001 247.7C73.9000000000001 244.4 69.4000000000001 240.1 68.5000000000001 237.9C56.9000000000001 210.2 66.2000000000002 173.9 79.6000000000001 154.1999999999999C87.7000000000001 142.3 101.1000000000001 131.8 118.8000000000002 129C119.5000000000002 118.3999999999999 122.1000000000001 109.3 127.0000000000002 98.6C130.1000000000001 91.8 141.7000000000001 79.6 137.4000000000002 70.9C135.2000000000002 66.5 116.4000000000002 57.1 110.1000000000002 53.3C89 40.8 73.7 33 54.2 19C41.6 10 21.9 8.8 25 -12.1C27.1 -26.2 35.1 -43.7 39.7 -57.9C40.4 -59.9 41.1 -62.0000000000001 41.8 -63.9H463.8C468.7 -48.6 473.5 -33.0000000000001 478.4 -16.7C481.8 -5.3000000000001 488.6 11.1 487.1 22.9999999999999zM205.9 414.3C207.7 414.8 209.3 413.6 210.8 411.9C210.6 406.7 205.4 406.8 201.9 405.1C196.5 398.4 188.5 395.3 181.9 387.9C175.1 380.4 167.5 360.2 158.5 357.9C154 356.8 148.8 358.7 144.9 358.4C134.5 357.7 127.2 352.4 116.6 350.9C130.2 380.8 172.7 404.9 205.9 414.3zM101.1 320.7C114.6 335.6 133.2 344.8 155.9 346.6C167.6 316.9 147.5 281.6 155 249C157.3 239.1 165.2 223.6 152.6 223.3C152.9 251.6 117.8 269.6 91.3 252.9C89.5 274.4 86.4 304.6 101.1 320.7zM137.8 120.5C136.8 124.6 135.1 133.4 135.5 135.6C137.1 144.3 152.6 148.1 146.5 160.3C135.2 160.4 132.7 150.1 122.4 149C95.7 146.4 76.8 184.4 78 207.4C79 226.9 95.6 245.6 118.1 243.2C134.1 241.4 139.5 224 142.6 208.5C151.8 208 165.1 208.9 169.5 216.1C168.9 233.6 160.7 247.7 161.3 263.8C162.3 294.1 178.8 321.4 166.1 351.2000000000001C179.7 382.1 219.6 406.5 249.2 421.2000000000001C285.8 439.5 344.1 424.9000000000001 378.5 405.4000000000001C398.2 394.3 412.9 372.7000000000001 426.8 354.7000000000001C407.3 360.5 390.7 350.5 393.7 334.4000000000001C410 349.3 437.9 334.6 446.2 318C454.1 302.2000000000001 454 278.7000000000001 455.2 255.2000000000001C458.1 198.2000000000001 444.8 139.3000000000001 416.1 98.1C408.4 87.1 402 75.1 391.2 67.5C365.2 49.3 325.8 32.8 292 44.1C247.3 59.1 227 88.9 202.5 122.9C203.2 104.2000000000001 216.3 88.8 229.3 74.5000000000001C240.6 62.0000000000001 254.3 47.9 269 42.1000000000001C256.7 45.0000000000001 237.9 45.9000000000001 232.8 34.9000000000001C204.2 36.8000000000001 177.7 39.7000000000001 164.1 59.1000000000001C153.5 74.5000000000001 142.7 100.5000000000001 137.8 120.5000000000001zM359.8 -3.6C363.9000000000001 -0.6 370.9000000000001 -0.7 377.2 0C371.8 2.7 364.2 3.7 357.9 2.2C357.8 6.4 355.9 9 354.7 12.4C365.3 16.2 390.2 40.9 404.3 32.7C411 28.8 413.8 6.5 414.4000000000001 -4.3C414.8 -13.3 413.6 -22.3 409.9000000000001 -27.1C391.1 -26.5 374.1 -24.3 359.2000000000001 -20.1C360.1 -14 358.2000000000001 -8 359.8000000000001 -3.6zM342.6 16.4C325.8 15.6 316.6 17.6 304.3 27.2C304.5 28 305.7 27.7 305.8 28.6C323.8 20.6 346.6 31.9 364.8 33.4999999999999C356.9000000000001 28.3999999999999 350.2 21.8999999999999 342.6 16.3999999999999zM330.5 -16.8C328.9 -7.4 327 -4.8 327.7 3.4C352.7 20 357.4 -25.2 330.5 -16.8zM226 9.4C214.4 10.1 177.9 23.4 187.5 33.1C196.9 26.6 215 28.2 228.8 25.8C229.6 21.4 226 15.6 226 9.4zM57.7 -49.1C53.4 -36.4 48.5 -24 42.9 -12.2C73.7 11.6 108.2 36.6999999999999 145.1 51.3C147.9 52.4 168.3 25.9 171.3 23.6999999999999C187.8 11.9999999999999 208.3 2.6999999999999 227.5 -6.5000000000001C228.7 -15.3000000000001 231.4 -26.7 236.2 -42.0000000000001C236.9 -44.3000000000001 237.6 -46.7 238.4 -49.2H57.7zM298.3 -54.8H297.5C297.8 -54.6 298 -54.4 298.3 -54.3V-54.8zM305.8 -49.1C307.9000000000001 -47.7 310.1 -46.3 312.2 -44.8C313.3 -46.2 314.4 -47.6 315.4 -49.1H305.8zM320.9000000000001 -24.4C310.1 -31.7 300.3 -42.7 287.6 -49.6C281.6 -52.9 260.6 -61.3 254.2 -59.8C250.6 -59 250.3 -54.5 248.8 -50.3C245.7 -41.3 238.7 -26.9 238 -13.3C237.2 3.9 235.5 32.7 254 29.1C268.9 26.2 286.3 19.4 297.9 12.9999999999999C305 9.1 309 4.3999999999999 319.8 3.4999999999999C319.7 2.1 319.7 0.6999999999999 319.6 -0.8000000000001C313.7 -4.7 304.3 -4.6000000000001 297.8 -7.9000000000001C307.3 -8.3000000000001 314.8 -10.6000000000001 321.3 -13.8000000000001C321.2 -17.2 321 -20.8000000000001 320.9 -24.4000000000001zM374.3 -49.1H360.3C360.2 -45.9 357.5 -43.3 354.2 -43.3S348.3 -45.9 348.1 -49.1H330.7C327.9 -44.7 325 -40.5 321.8 -36.6C323.9000000000001 -34.4 325.8 -31.9 327.8 -29.7C336.8 -33.4 342.6 -24.8000000000001 349.5 -25.5000000000001C357.4 -26.3000000000001 363.7 -37.2 374.9 -36.5000000000001L374.3 -49.1000000000001zM383 -49.1C383.2 -45.1 383.4 -41.3 383.6 -37.6C399.2000000000001 -30.3 412.6 -38.9 419.3 -49.1H383zM466.4 -12.1C464.1 -23.3 460.6 -36.1 456.5 -49.2C456.3 -49.1 456.1 -49.1 455.9 -49.1H428C428.6 -48 429.2 -46.9 429.9 -45.8C427.3 -39.7 420.9 -37.1 419 -30.3C431.1 -7.6 425.5 63.1 394.8 48.2C399.1 54.5 410.4000000000001 59.7 415.6 67.5C428.6 57.1 436.4000000000001 47.2 448.8 36.1C455.6 30.1 468.8 22.8 470.2 13C471 7.5 467.6 -5.9 466.4 -12.1zM222.2 317.5C227.6 332.4 249.4 352.2 267.2 349.5C274.9 348.3 285.2 341.3 279.4 331.8C249.2 338.8 234.2 319.2 225 298.7C216.9 300.7 220.1 311.8 222.2 317.5zM406.3 254.4C414.5 258 428.7 255.1 435.9 259.7000000000001C431.7 271.2000000000001 425.6 281.1 426.6 297.4000000000001C427.1 297.4000000000001 427.6 297.4000000000001 428 297.3000000000001C434.8 283.1 440.7 268.1 449.3999999999999 255.6C443.7 242.1 405.7999999999999 230.2 406.2999999999999 254.4000000000001zM426.7 297.4zM309.5 251.7C302.7 262.6 290.5 284.2 295 297C301.5 285.1 303.6 272.6 312.8 263.7C316.9 259.7 325 254.7 321 243.5C320.1 240.8 313.2 234.9 309.3 233.8C294.9 229.5 261.4 232.9 272.7 250.9C284.5999999999999 250.2 300.5999999999999 243.1 309.5 251.7zM336.8 181.7C340.6 175.1 338.2 163 348.9 161.1C369.1 157.7 392.5 173.4 407 178.9C416 194.1 406.2 199.6 398.1 209.4C381.5 229.4 359.3 254.2 360.1 284.1C366.8 289 367.4000000000001 276.7 368.3 274.4C377 254.1 398.7 228.2 414.6 210.9C418.5 206.6 424.9000000000001 202.5 425.6 199.7C427.7000000000001 191.5 420.2000000000001 181.7 421.1 176.2C399.4000000000001 162.3 375.3 147.1 339.7000000000001 150.6C332.3000000000001 157.3 329.4000000000001 172 336.8000000000001 181.7zM135.5 190.9C128.6999999999999 194.8 127.0999999999999 211.9 119.0999999999999 212.3C107.6999999999999 213 109.7999999999999 190.1 109.7999999999999 176.8C101.9999999999999 183.9 100.5999999999999 205.9 106.2999999999999 217.1C99.7 220.3 96.7999999999999 213.5 93.2 211.2C97.9 245.3 143 227 135.5 190.9zM435.1 162.1C425 142.9 410.7 121.7 381.1 121.1C380.5 127.3 380 136.7 381.1 140.5C403.8 142.6999999999999 417.7 154.1999999999999 435.1 162.1zM293.2 149.7C312.0999999999999 139.8 346.8 138.7 372.5 139.5C373.8999999999999 133.9 373.8 126.9 373.8999999999999 120.1C340.8999999999999 118.3 301.8999999999999 126.5 293.2 149.7000000000001zM385.3999999999999 103C383.7 98.7 380.0999999999999 93.7 375.5999999999999 91.9C363.4999999999999 87 329.9999999999999 83.2 313.2 92.2C302.5 97.9 295.7 110.7 289.8 118.2C287 121.8 272.9 131.1 289.6 131.1C302.7 98.4 347.6 102.1 385.4 102.9999999999999z" />
+    <glyph glyph-name="joget"
+      unicode="&#xF3B7;"
+      horiz-adv-x="496" d=" M227.5 -20.7C218.5 -7.1 207.6 12.6 203.8 21.7C198.1 35.4 176.6 67.3 235 88.8C286.7 107.9 411.7 105.3 443.8 106.4C439.8 97.4 435.2 88.5 429.9000000000001 79.8C389.5000000000001 14.3 319.5 -21.7 247.9000000000001 -21.7C241.1 -21.7 234.3000000000001 -21.3000000000001 227.5000000000001 -20.7M66.1 304.1C128 404.6 259.6 435.8 360.1 373.9C434.9000000000001 327.8 471.3 243 459.4 161.2000000000001C434.5000000000001 161.7000000000001 280.1 164.8000000000001 229.1 166.1C173.6 167.5 147.4 186.9 170.6 214.3C193.8 241.7 221.7 255 239.5000000000001 265.5C257.4000000000001 276 266.8 299.2 215.9 295.2C87.3 286.5 48.6 195.9 37.6 155C28.8 204.7 37.5 257.7 66.1 304.1M36.9 322.1C-35 205.5 1.3 52.8 117.9 -19.1C234.5 -91 387.2 -54.7 459.1 61.8C531 178.4 494.7 331.2 378.1 403C337.6 428.1 292.6 440 248.2 440C165 440 83.8 398.1 36.9 322.1M281.3 211.7C249.8 191.2 216 180.4 216 180.4L385.5 182L432 205.4S435.6 214.9 412.9 220.9C390.2 226.9 355.9 209.6 326.2 193.7C296.5 177.9 295.1 185.5 295.1 185.5S335.3 213.6 345.8 220C356.3 226.4 377.7 234 359.2 244.6C356 246.4 352.5 247.3 348.8 247.3C331 247.3 307.3 228.6 281.3 211.7" />
+    <glyph glyph-name="joomla"
+      unicode="&#xF1AA;"
+      horiz-adv-x="448" d=" M0.6 355.9C0.6 389.2 27.4 416 60.4 416C90.4 416 114.9 394.1 119.6 365.8C152.2 373.4 186.7 365.2 216.1 335.8L171.8 291.5C151.3 312 129.2 307.8 116.4 295C102.1 280.7 102.1 257.1 116.4 242.8L215.9 143.3L171.9 99C84.2 186.2 122.2 148.7 72.1 198.7C45.3 225.2 37.1 263.5 47.3 297.6C20.4 303.4 0.6 327.3 0.6 355.9zM130.1 239.5L174.4 195.2C184.4 205.2 264.1 284.9 274.1 295C288.4 309.3 311.7 309.3 326 295C338.8 282.2 343 260 322.5 239.6L366.5 195.3C397.7 226.5 405 262.9 395.3999999999999 296.5C424.5999999999999 300.6 447.2999999999999 325.7 447.2999999999999 356C447.2999999999999 389.2 420.4999999999999 416.1 387.4999999999999 416.1C357.1999999999999 416.1 332.0999999999999 393.6 327.9999999999999 364.5C294.1999999999999 374.4 256.2999999999999 366 229.6999999999999 339.4C211.3999999999999 320.3 158.5999999999999 267.9 130.0999999999999 239.5zM396.4 87.3C404.6 120 395.5 155.8 370.1 181.2000000000001C358.3 193.4 375.1 176.5000000000001 270.6 280.9000000000001L226.3 236.6L326 136.9C340.3 122.6 340.3 99.3 326 85.0000000000001C313.2 72.2000000000001 291 68.0000000000001 270.6 88.5000000000001L226.6 44.2C254.2 14.0000000000001 294.6 5.4 329.3 16.2C334.8 -11.1999999999999 359 -31.9 388.2 -31.9C421.2 -31.9 448 -5.1 448 28.2C448 58.4 425.5 83.2000000000001 396.3999999999999 87.3000000000001zM312.1 140.4L268.1 184.7000000000001C181.1 98.3000000000001 217.7 134.3000000000001 168.4 84.9C154.1 70.6 130.8 70.6 116.5 84.9C103.4 98.3 99.6 120.2000000000001 119.7 140.3L75.7 184.6C45.5 154.4 37.7 119.4 46.2 86.3C19.5 80.3 0 56.4 0 28.1C0 -5.2 26.8 -32 59.8 -32C88.4 -32 112.3 -12.2 118.4 14.7C151.1 6.5 186.9 15.3 212.6 40.7C244.7 72.7 224.8 53.1 312.1 140.4z" />
+    <glyph glyph-name="js-square"
+      unicode="&#xF3B9;"
+      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM243.8 66.6C243.8 23 218.2 3.1 180.9 3.1C147.2 3.1 127.7 20.5 117.7 41.6L152 62.3C158.6 50.6 164.6 40.7 179.1 40.7C192.9 40.7 201.7 46.1 201.7 67.2V210.3H243.8V66.6zM343.4 3.1C304.3 3.1 279 21.7 266.7 46.1L301 65.9C310 51.2 321.8 40.3 342.5 40.3C359.9 40.3 371.1 49 371.1 61.1C371.1 75.5 359.7000000000001 80.6 340.4000000000001 89.1L329.9000000000001 93.6C299.5000000000001 106.5 279.4000000000001 122.8 279.4000000000001 157.1C279.4000000000001 188.7000000000001 303.5000000000001 212.7 341.0000000000001 212.7C367.8000000000001 212.7 387.0000000000001 203.4 400.8000000000001 179L368 158C360.8 170.9 353 176 340.9 176C328.6 176 320.8 168.2 320.8 158C320.8 145.4 328.6 140.3 346.7 132.4L357.2 127.9C393 112.6 413.0999999999999 96.9 413.0999999999999 61.7C413.0999999999999 23.9 383.2999999999999 3.1 343.3999999999999 3.1z" />
+    <glyph glyph-name="js"
+      unicode="&#xF3B8;"
+      horiz-adv-x="448" d=" M0 416V-32H448V416H0zM243.8 66.6C243.8 23 218.2 3.1 180.9 3.1C147.2 3.1 127.7 20.5 117.7 41.6L152 62.3C158.6 50.6 164.6 40.7 179.1 40.7C192.9 40.7 201.7 46.1 201.7 67.2V210.3H243.8V66.6zM343.4 3.1C304.3 3.1 279 21.7 266.7 46.1L301 65.9C310 51.2 321.8 40.3 342.5 40.3C359.9 40.3 371.1 49 371.1 61.1C371.1 75.5 359.7000000000001 80.6 340.4000000000001 89.1L329.9000000000001 93.6C299.5000000000001 106.5 279.4000000000001 122.8 279.4000000000001 157.1C279.4000000000001 188.7000000000001 303.5000000000001 212.7 341.0000000000001 212.7C367.8000000000001 212.7 387.0000000000001 203.4 400.8000000000001 179L368 158C360.8 170.9 353 176 340.9 176C328.6 176 320.8 168.2 320.8 158C320.8 145.4 328.6 140.3 346.7 132.4L357.2 127.9C393 112.6 413.0999999999999 96.9 413.0999999999999 61.7C413.0999999999999 23.9 383.2999999999999 3.1 343.3999999999999 3.1z" />
+    <glyph glyph-name="jsfiddle"
+      unicode="&#xF1CC;"
+      horiz-adv-x="576" d=" M510.634 210.538C505.907 213.159 504.97 216.286 504.253 221.314C501.9010000000001 237.802 500.7140000000001 254.933 495.1560000000001 270.409C459.2610000000001 370.366 341.1660000000001 413.795 248.3070000000001 362.055C220.9370000000001 346.805 199.3360000000001 325.6860000000001 182.8140000000001 298.1520000000001C179.6300000000001 299.6600000000001 177.3560000000001 300.862 174.9900000000001 301.838C144.8880000000001 314.259 115.9410000000001 311.9590000000001 89.6590000000001 292.6710000000001C64.1280000000001 273.9340000000001 53.2370000000001 248.123 56.9830000000001 216.263C57.3380000000001 213.238 55.0160000000001 208.642 52.4690000000001 206.7180000000001C12.7570000000001 176.7260000000001 -3.5619999999999 128.653 10.5670000000001 82.1030000000001C24.3980000000001 36.5340000000001 68.0810000000001 2.3070000000001 116.1750000000001 0.6700000000001C146.4660000000001 -0.3609999999999 176.8120000000001 0.1240000000001 207.1340000000001 0.1310000000001C291.1750000000001 0.1520000000001 375.2240000000001 -0.3999999999999 459.2540000000001 0.6110000000001C511.9180000000001 1.2450000000001 555.3620000000001 37.4840000000001 567.4660000000001 87.9040000000001C579.0060000000001 135.9780000000001 556.3220000000001 185.2040000000001 510.6340000000001 210.5380000000001zM531.741 53.658C513.511 31.226 489.398 18.405 460.461 18.008C403.587 17.227 346.694 17.778 289.8090000000001 17.778C289.8090000000001 17.078 126.781 17.619 126.081 17.624C82.22 17.956 49.342 37.39 30.906 77.619C12.004 118.864 26.902 168.4670000000001 65.092 193.725C74.274 199.798 77.597 205.291 75.188 216.861C69.698 243.222 79.641 264.817 101.608 279.842C124.595 295.5650000000001 149.03 295.988 173.642 282.925C183.911 277.475 188.249 271.361 195.84 285.452C210.0620000000001 311.851 230.3970000000001 332.179 256.511 346.746C353.971 401.112 484.881 339.178 486.751 214.049C486.873 205.899 489.163 201.621 496.599 198.155C554.1590000000001 171.326 571.0550000000001 102.033 531.7410000000001 53.658zM443.952 134.1570000000001C438.104 103.0000000000001 409.33 79.061 377.286 79.062C360.3330000000001 79.063 345.228 85.607 333.207 96.767C305.51 122.48 262.066 171.747 237.27 190.154C217.214 205.042 195.28 202.487 176.998 186.372C127.002 142.3010000000001 192.857 64.597 244.061 109.184C248.609 113.144 251.901 118.727 256.805 122.028C264.989 127.537 277.571 122.912 269.973 111.406C252.615 85.122 220.643 73.209 191.11 82.105C162.213 90.809 142.27 118.073 142.484 152.284C143.709 174.769 154.848 195.344 177.898 208.249C200.473 220.887 224.267 221.395 244.889 205.775C295.68 167.3 320.467 124.03 352.185 104.53C376.743 89.431 406.439 97.167 421.008 122.036C449.838 171.245 386.416 227.052 342.14 185.4959999999999C338.151 181.7519999999999 335.223 176.5639999999999 330.73 173.7759999999999C319.755 166.9649999999999 313.397 177.8889999999999 317.921 184.1289999999999C338.6239999999999 212.6829999999999 368.385 224.5689999999999 401.192 212.3429999999999C432.6209999999999 200.6289999999999 450.3 167.9769999999999 443.952 134.1569999999999z" />
+    <glyph glyph-name="keybase"
+      unicode="&#xF4F5;"
+      horiz-adv-x="412.3" d=" M177.2 17.1C177.2 7.3 169.2 -0.7 159.4 -0.7S141.6 7.3 141.6 17.1S149.6 34.9 159.4 34.9C169.2 35.0000000000001 177.2 27.0000000000001 177.2 17.1zM270 35C260.2 35 252.2 27 252.2 17.2S260.2 -0.6 270 -0.6S287.8 7.4 287.8 17.2S279.8 35 270 35zM412.3 71C412.3 32.1 404.7 -2.9 390.1 -32H362.8C386.3 6.7 393.3 62.8 385.2 102.3C369.1 72.8 333.1 63.7 299.3 73.5C171.5 111 106.8 53.8 64.7 23.2L83.6 82.5L43.7 40.2C48.5 13.5 59.4 -11.1 74.9 -32.1H46.1C36.4 -16.3 28.9 0.9 23.9 19.2L0.1 -6C0.1 68.9 -5.4 141.6 61.6 209.2C81.8 229.6 105.3 245.4 130.7 255.9C123.9 269.4 121.2 285.1 122.9 301.9L103 303.1C85.1 304.2 71.4 319.6 72.4 337.5V337.6L74 363.8C75.1 380.9 89.4 394.4 106.5 394.4C107.8 394.4 106.2 394.5 134.7 392.7C148.6 391.9 156.2 382.9 157.5 381.3C164.6 391.7 172 401.8 182.1 415.8L202.7 403.7C189.1 374.7 193.6 367.5 193.7 367.4C197.6 367.4 207.6 367.9 226.1 361.7C246 355.1 262 341 271 322C271.4 321.1 286.5 293 272.2 259.4C291.2 253.3 323.5 239.5 354.6 207.6C391.2000000000001 170 412.3 120.2000000000001 412.3 71zM128 325.7C131.2 335.7 135.7 345.4 141.1 355.1C141.2 357.1 143.3 368.2 133.3 368.9C104.8 370.7 107 370.5 106.6 370.5C102 370.5 98.3 367 98 362.4L96.4 336.2C96.1 331.5 99.8 327.4 104.5 327.1L128 325.7zM153.8 263.9C159.4 254.5 167.9 247.8 176.1 243.9C176.1 265.1 204.6 285.8 228.9000000000001 261.4L237.3000000000001 251.1C258.1 269.9 256.7000000000001 296.4 249.4000000000001 312C235.6 341.1 202.5 344 195.1 343.7C184.8 343.3 175.4 349.1 171.4 359C157.7000000000001 337.8 134.2000000000001 296.5 153.8000000000001 263.9zM236.7 195.5L217 179.4C215.1 177.8 214.8 175 216.4 173.1L225.3 162.2C226.3 161 229.1 159.5 231.6 161.6L251.2 177.6L256.7000000000001 170.8C261.6 164.8 270.5000000000001 172.1999999999999 265.7000000000001 178.1C202.1000000000001 256.4 224.2000000000001 229.2 210.4 246.2C205.7000000000001 252.2 196.5 244.8 201.4 238.9C203.3000000000001 236.6 219.8000000000001 216.3 221.2000000000001 214.5999999999999L211.6000000000001 206.6999999999999C207.0000000000001 202.8999999999999 214.2000000000001 193.3999999999999 219.0000000000001 197.2999999999999L228.7000000000001 205.2999999999999L236.7000000000001 195.4999999999999zM355.1 169.8C338.2000000000001 193.5 312.5 216.5 281.7000000000001 230.2C273.8000000000001 233.7 266.7000000000001 236.3 258.8000000000001 238.8C256.8000000000001 236.6 254.7000000000001 234.5 252.4000000000001 232.6L284.3000000000001 193.4C294.7000000000001 180.7000000000001 292.8000000000001 161.9 280.1000000000001 151.5000000000001C278.8000000000001 150.4 267.0000000000001 140.8000000000001 251.1000000000001 146.6000000000001C248.2000000000001 144.3000000000001 241.0000000000001 136.7000000000001 228.9000000000001 136.7000000000001C220.3000000000001 136.7000000000001 212.3000000000001 140.5000000000001 206.8000000000001 147.2000000000001L197.9000000000001 158.1000000000001C191.6000000000001 165.9000000000001 190.0000000000001 176.0000000000001 192.9000000000001 184.9000000000001C184.7000000000001 194.8000000000001 184.6000000000001 206.2000000000001 188.3000000000001 214.9000000000001C181.1000000000001 216.2000000000001 161.6000000000001 221.1000000000001 145.6000000000001 236.3000000000001C89.8000000000001 215.6000000000001 57.6000000000001 171.9000000000001 44.3000000000001 145.1000000000001C29.4000000000001 114.9000000000001 25.5000000000001 84.2000000000001 24.4000000000001 54.9000000000001C32.6000000000001 63.6000000000001 20.5000000000001 50.8000000000001 138.4000000000001 175.8000000000001L108.5000000000001 82.2000000000001C166.3000000000001 113.3000000000001 232.5000000000001 118.2000000000001 305.9000000000001 96.6C329.5000000000001 89.7000000000001 351.0000000000001 95 361.9000000000001 110.5C373.0000000000001 126.1 370.4000000000001 148.2 355.1000000000001 169.8zM110.6 340.7L126.2 339.7L127.2 355.3L111.6 356.3L110.6 340.7z" />
+    <glyph glyph-name="keycdn"
+      unicode="&#xF3BA;"
+      horiz-adv-x="512" d=" M63.8 38.7L124.3 97.7C156.4 54.9 195.4 31.7 250.9 30.3C281.4 29.6 311.2 37.3 337.3 52.6999999999999C342.4 47.3999999999999 355.8 33.1999999999999 358.2 30.6999999999999C326 9.9999999999999 288.5999999999999 -0.4000000000001 250.1 0.4999999999999C206.8 1.6 165.5 17.1999999999999 132.3999999999999 44.8999999999999C132.6999999999999 45.4999999999999 94.1999999999999 7.3999999999999 93.7999999999999 6.9999999999999C103.2999999999999 -22.8000000000001 80.6999999999999 -55.4 47.4999999999999 -55.4C20.7 -55.3 0 -33.7 0 -6.9C0 27.4 33.1 49.7 63.8 38.7zM418.7 291.1C437.8 259.8 448.3 223.7 447.4 187.1C446.3 142.3 428.4 99.6 398.8 66.1C399.1 65.8 422.6 40.9 422.9 40.6C432.5 41.9 442.1 38.6 448.8 31.5C460.1 19.5 459.6999999999999 0.6 447.7 -10.9C435.7 -22.2 416.8 -21.8 405.3 -9.8C398.6 -2.8 395.9 7.0000000000001 397.7 16.5000000000001C372.8 43.1000000000001 353.3 63.7000000000001 353.3 63.7000000000001C396 97.8000000000001 416.6 143.3000000000001 417.7 187.9C418.3999999999999 216.8000000000001 410.5 245.1 396.5999999999999 270.1L418.7 291.1zM104 394.9C110.7 387.9 113.4 378.1 111.6 368.6L157.5 320.5C152.8 316.7 144.2 310.1 134.7 299.2C109.3 270.7 95.1 234.4 94 196.3C93.3 167.4 100.1 139.1 114 113.9L92 92.4C72.7 124 63.1 160.1 64.2 197.1C65.2 241.7 82.5 284.7 111.7 318.2L86.4 344.6C76.8 343.3 67.2 346.6 60.5 353.7C49.2 365.7 49.6 384.6 61.6 396.1C73.5 407.3 92.2 407 104 394.9zM464.9 440C490.9 440 512 417.6 512 391.7S490.9 344 464.9 344C458.6 343.9 450.9 345.1 449 345.8L386.1 286.1C353.4000000000001 329.7 309.4000000000001 352 259.2000000000001 353.3C228.7000000000001 354 198.9 346.5 173.0000000000001 330.9L151.9000000000001 352.9C184.1 373.7 221.5 384 260 383.1C303.3 382 344.6 366.4 377.7 338.5L418.8 377.1C417.3 381.8 416.6 386.7 416.6 391.6C416.5 418.3 438.9 440 464.9 440zM256.7 334.6C262.2 334.6 267.6 334.2 273.1 333.5C351.2 323.7 406.5 252.4 396.9 174.4C387.1 96.3 315.8 41 237.8 50.6C159.7 60.4 104.4 131.6999999999999 114 209.8C123.3 282.2 184.1 334.4 256.7 334.6zM197.7 215.2C198.3 192.5 209.9 173.4 230.1 163L219.1 111.3H292.8L281.8 163C301.9000000000001 173.9 313.9000000000001 192 314.2 215.2C313.8 248 288.4 272.7 255.9 273.5C223.8 272.7 198.6 248.7 197.7 215.2zM256 288" />
+    <glyph glyph-name="kickstarter-k"
+      unicode="&#xF3BC;"
+      horiz-adv-x="384" d=" M147.3 333.6C147.3 389.8 114.8 416 73.9 416C26.2 416 0 379.8 0 334.6V51.6C0 4.3 25.3 -31.8 74.9 -31.8C114.7 -31.8 147.3 -6.1999999999999 147.3 51.6V128.1L259.4 -10.2C282.1 -37.4 331.5 -40.9 362.6 -10.2C389.6 17.4 389.9 57.2000000000001 370 82L279.2 196.8L354.0999999999999 304.2000000000001C371.4999999999999 328.9000000000001 371.5999999999999 367.3 343.7 394C313.3999999999999 423 261.3 425.6 230.1 381.2000000000001L147.3 263V333.6z" />
+    <glyph glyph-name="kickstarter"
+      unicode="&#xF3BB;"
+      horiz-adv-x="448" d=" M400 -32H48C21.6 -32 0 -10.4 0 16V368C0 394.4 21.6 416 48 416H400C426.4 416 448 394.4 448 368V16C448 -10.4 426.4 -32 400 -32zM199.6 269.5C199.6 300.2 182 314.6 159.9 314.6C134.1 314.6 119.9 294.8 119.9 270.1V115.3C119.9 89.4999999999999 133.6 69.6999999999999 160.4 69.6999999999999C181.9 69.6999999999999 199.6 83.6999999999999 199.6 115.3V157.1L260.2 81.4C272.5 66.5 299.2 64.6 316 81.4C330.6 96.5 330.8 118.2 320 131.8L270.9 194.6L311.4 253.3C320.8 266.8 320.9 287.8 305.8 302.4C289.4 318.3 261.2 319.7 244.4 295.4L199.6 230.7V269.5z" />
+    <glyph glyph-name="korvue"
+      unicode="&#xF42F;"
+      horiz-adv-x="446" d=" M386.5 414H59.5C26.8 414 0 387.2 0 354.5V27.4C0 -5.2 26.8 -32 59.5 -32H386.6C419.6 -32 446.1 -5.2 446.1 27.5V354.5C446 387.2 419.2 414 386.5 414zM87.1 327.2H183.1V211.2L244.9 327.2H355.8L274.6 195.2H87.1V327.2zM248.9 55.1L183.2 168.6999999999999V55.0999999999999H87.2V185.9H278.7L367.3 55.1H248.9z" />
+    <glyph glyph-name="laravel"
+      unicode="&#xF3BD;"
+      horiz-adv-x="640" d=" M637.5 206.4C633.3 211.2 574.7 284.5 564.4 296.9C554.1 309.3 549 307.1 542.6999999999999 306.2000000000001C536.3 305.3 462.1999999999999 292.8 453.5999999999999 291.4C444.9999999999999 289.9 439.5999999999999 286.5 444.8999999999999 279.1C449.5999999999999 272.5 498.2999999999999 203.4 509.0999999999999 188.2L315.3999999999999 141.8L161.2 399.3C155.1 408.4 153.8 411.6 139.8 410.9C125.8 410.3 18.9 401.4 11.3 400.7C3.7 400.1 -4.7 396.7 2.9 378.7S131.9 99.1 135.3 91.5C138.7 83.9 147.5 71.5 168.1 76.5C189.2 81.6 262.4 100.7 302.4 111.2C323.5 72.9 366.6 -4.7 374.6 -15.8C385.2 -30.7 392.6 -28.2 408.9 -23.2C421.7 -19.3 608.5 47.9 616.9 51.3C625.3 54.8 630.5 57.2 624.8 65.7C620.5999999999999 71.9 571.3 137.9 545.5 172.5C563.2 177.2 626.1 193.9 632.8 195.8C640.6999999999999 197.8 641.8 201.6 637.5 206.4zM285.3 134.4C283 133.9 174.5 107.9 168.7 106.6C162.9 105.3 162.9 105.9 162.2 107.9C161.5 109.9 33.2 374.6 31.4 377.9C29.6 381.2 29.7 383.8 31.4 383.8S133.9 392.8 137.4 393C141 393.2 140.6 392.4 141.9 390.2C141.9 390.2 284.1 144.8 286.5 140.5C289.1 136.2 287.6 134.9 285.3 134.4zM591.3 77C593 74.3 594.8 72.5 589.3 70.6C583.9 68.6 405.6 8.5 402.2 7C398.7 5.5 396 5 391.5999999999999 11.5S329.2 118.3 329.2 118.3L518 167.4C522.7 168.9 524.2 169.9 527.2 165.2C530.1 160.4 589.6 79.7 591.3000000000001 77zM603.4 211.1C599.1999999999999 210.2 529.8 193 529.8 193L473.1 270.8C471.4999999999999 273.1 470.2 275.3 474.2 275.8S542.6 288 545.5 288.6C548.4 289.3 550.9 290.1 554.5 285.2000000000001C558.1 280.3 607.1 218.2 609 215.8C610.8 213.5 607.6 212.1 603.4 211.1z" />
+    <glyph glyph-name="lastfm-square"
+      unicode="&#xF203;"
+      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM307.8 103.1C244.4 103.1 222.4 131.7000000000001 210.7 167.2000000000001C194.4 218.2000000000001 189.2 251.5000000000001 147.7 251.5000000000001C125.3 251.5000000000001 102.6 235.4000000000001 102.6 190.3000000000001C102.6 155.1000000000001 120.6 133.1000000000001 145.9 133.1000000000001C174.5 133.1000000000001 193.5 154.4000000000001 193.5 154.4000000000001L205.2 122.5000000000001S185.4 103.1000000000001 144 103.1000000000001C92.7 103.1000000000001 64.1 133.2000000000002 64.1 188.9000000000002C64.1 246.8000000000002 92.7 280.9000000000002 146.6 280.9000000000002C220.1 280.9000000000002 227.4 239.5000000000002 247.4 179.0000000000001C256.2 152.2000000000001 271.6 132.8000000000001 308.6 132.8000000000001C333.5 132.8000000000001 346.7 138.3000000000001 346.7 151.9000000000002C346.7 171.8000000000001 324.9 173.9000000000002 296.8 180.5000000000002C266.4000000000001 187.8000000000002 254.3 203.6000000000002 254.3 228.5000000000002C254.3 268.5000000000002 286.6 280.9000000000002 319.5 280.9000000000002C356.9 280.9000000000002 379.6 267.3000000000002 382.5 234.3000000000002L345.8 229.9000000000002C344.3 245.7000000000002 334.8 252.3000000000002 317.2 252.3000000000002C301.1 252.3000000000002 291.2 245.0000000000002 291.2 232.5000000000002C291.2 221.5000000000002 296 214.9000000000002 312.1 211.2000000000002C344.8 204.1000000000002 383.9 199.2000000000002 383.9 153.7000000000002C384 117.0000000000002 353.2 103.1000000000001 307.8 103.1000000000001z" />
+    <glyph glyph-name="lastfm"
+      unicode="&#xF202;"
+      horiz-adv-x="512" d=" M225.8 80.9L207 131.9S176.5 97.9 130.8 97.9C90.3 97.9 61.6 133.1 61.6 189.4C61.6 261.5 98 287.3 133.7 287.3C200.2 287.3 208.5 234 234.6 152.4C253.4 95.5 288.6 49.8 390 49.8C462.7 49.8 512 72.1 512 130.6999999999999C512 203.5999999999999 449.3 211.2999999999999 397 222.7999999999999C371.2 228.7 363.6 239.2 363.6 256.8C363.6 276.7 379.4000000000001 288.4999999999999 405.2000000000001 288.4999999999999C433.4000000000001 288.4999999999999 448.6 277.8999999999999 450.9 252.7L509.5000000000001 259.7C504.8000000000001 312.5 468.4 334.2 408.6 334.2C355.8 334.2 304.2000000000001 314.3 304.2000000000001 250.3C304.2000000000001 210.3999999999999 323.6 185.1999999999999 372.2000000000001 173.5C417.1 162.8999999999999 452.0000000000001 159.6999999999999 452.0000000000001 127.8C452.0000000000001 106.1 430.9000000000001 97.3 391.0000000000001 97.3C331.8000000000001 97.3 307.1 128.4 293.1 171.1999999999999C261.1 268 249.5000000000001 334.2 131.8 334.2C45.7 334.2 0 279.7 0 187C0 97.9 45.7 49.8 127.9 49.8C194.1 49.8 225.8 80.9 225.8 80.9z" />
+    <glyph glyph-name="leanpub"
+      unicode="&#xF212;"
+      horiz-adv-x="576" d=" M386.539 336.515L401.635 87.56L390.656 87.835C354.424 88.659 319.016 79.052 287.999 59.838C256.983 79.052 221.575 87.835 185.3420000000001 87.835C139.7780000000001 87.835 103.2720000000001 77.13 61.826 60.112L93.117 318.4C121.663 330.203 154.601 336.515 185.343 336.515C226.516 336.515 259.1790000000001 323.3400000000001 288 293.971C315.723 322.242 347.013 335.692 386.539 336.515zM569.07 0C543.5440000000001 0 521.585 5.215 498.528 15.645C464.218 31.29 428.5350000000001 40.623 390.6570000000001 40.623C351.6800000000001 40.623 315.7230000000001 27.722 288.0000000000001 0C260.2770000000001 27.723 224.3200000000001 40.623 185.3430000000001 40.623C147.4650000000001 40.623 111.7820000000001 31.29 77.4720000000001 15.645C55.239 5.764 32.731 0 8.303 0H6.93L49.475 349.141C88.726 371.374 136.486 384 181.775 384C218.83 384 256.984 376.315 288 354.905C319.016 376.315 357.17 384 394.225 384C439.514 384 487.274 371.374 526.5250000000001 349.141L569.07 0zM525.702 44.741L491.666 324.987C460.924 338.986 424.418 346.397 390.657 346.397C352.229 346.397 316.272 334.32 288 307.695C259.728 334.32 223.772 346.397 185.343 346.397C151.582 346.397 115.076 338.986 84.334 324.987L50.298 44.741C97.509 64.228 133.192 78.227 185.343 78.227C222.947 78.227 256.16 68.621 288 48.583C319.84 68.621 353.052 78.227 390.657 78.227C442.808 78.227 478.491 64.228 525.702 44.741z" />
+    <glyph glyph-name="less"
+      unicode="&#xF41D;"
+      horiz-adv-x="640" d=" M612.7 229C612.7 249.5 615.9000000000001 261.6 615.9000000000001 283.6C615.9000000000001 317.8 603.3000000000001 328.8 575.4000000000001 328.8H554.9000000000001V304.6H561.2C575.4000000000001 304.6 578.5 299.9 578.5 282.5C578.5 266.2 576.9 249.9 576.9 231C576.9 206.8 584.8 197.4 600.5 193.7V192.1C584.7 188.4 576.9 179 576.9 154.8C576.9 135.9 578.5 120.6 578.5 103.3C578.5 85.4 574.8 80.7 561.2 80.7V80.2H554.9000000000001V55H575.4000000000001C603.2 55 615.9000000000001 66 615.9000000000001 100.2C615.9000000000001 122.8 612.7 134.4 612.7 154.8C612.7 165.8 619.5 177.4 640 178.4V205.7000000000001C619.5 206.4 612.7 218.0000000000001 612.7 229.0000000000001zM507.1 197C491.3 203.3 476.6 207 476.6 217.5C476.6 225.4 482.9 230.1 494.5 230.1S516.6 225.4 528.1 217L549.1 244.8C536 254.8 518.1 265.3 493.9 265.3C458.2 265.3 434.0000000000001 244.8 434.0000000000001 215.9C434.0000000000001 190.2 456.6000000000001 177 475.5000000000001 169.7C491.8000000000001 163.4 507.6000000000001 158.1 507.6000000000001 147.6C507.6000000000001 139.7 501.3000000000001 134.5 487.1000000000001 134.5C474.0000000000001 134.5 460.8000000000001 139.8 446.6000000000001 150.8L425.6000000000001 120.3C441.4000000000001 107.1999999999999 465.5000000000001 98.1999999999999 485.5000000000001 98.1999999999999C527.5 98.1999999999999 550.1 120.3 550.1 149.1999999999999S527.6 190.1999999999999 507.1 197zM148.2000000000001 137.6C144.5000000000001 137.6 139.8000000000001 140.8 139.8000000000001 150.7000000000001V328.9H65.2C36.8 328.9 24.2 317.9 24.2 283.7C24.2 261.1 27.4 248.5 27.4 229.1C27.4 218.1 20.6 206.5 0.1 205.5V178.2C20.6 177.7 27.4 166.1 27.4 155.1C27.4 135.7 24.2 124.1 24.2 101.4999999999999C24.2 67.3 36.8 56.3 64.7 56.3H85.2V80.4999999999999H78.9C65.8 80.4999999999999 61.6 85.8 61.6 103.1S63.2 135.2 63.2 154.6C63.2 178.8 55.3 188.2 39.6 191.9V193.5C55.4 197.2 63.2 206.6 63.2 230.8C63.2 249.7 61.6 265 61.6 282.3S65.3 304.4 78.9 304.4H93V153.5999999999999C93 121.4999999999999 104 100.4999999999999 136.1 100.4999999999999C146.1 100.4999999999999 154 102.0999999999999 159.7 104.1999999999999L154.4 138.3999999999999C151.3 137.5999999999999 149.8 137.5999999999999 148.2 137.5999999999999zM379.9 197C363.6 203.3 348.9 207 348.9 217.5C348.9 225.4 355.2 230.1 366.8 230.1C378.4 230.1 388.9 225.4 400.4 217L421.4 244.8C408.3 254.8 390.4 265.3 366.2 265.3C330.5 265.3 306.3 244.8 306.3 215.9C306.3 190.2 328.9000000000001 177 347.8 169.7C364.1 163.4 379.9000000000001 158.1 379.9000000000001 147.6C379.9000000000001 139.7 373.6 134.5 359.4000000000001 134.5C346.3 134.5 333.1 139.8 318.9000000000001 150.8L298.4000000000001 120.3C314.2000000000001 107.1999999999999 338.3 98.1999999999999 358.3 98.1999999999999C400.3 98.1999999999999 422.9 120.3 422.9 149.1999999999999C423 178.0999999999999 400.4 190.1999999999999 379.9 197zM224.9 265.8C186.5 265.8 149.8 233.7 150.8 183.3C150.8 131.3 185 100.8 230.1 100.8C249 100.8 270 107.6 286.3 118.7L270.5 146.5C258.8999999999999 139.7 247.9 136.5 236.3 136.5C215.3 136.5 199 146.5 194.8 170.7H290C290.5 174.4 291.6 181.7 291.6 190.1C292.2000000000001 232.7 269 265.8 224.9 265.8zM194.9 199.6C198.1 220.6 210.7 230.6 225.4 230.6C244.3 230.6 251.7 217.5 251.7 199.6H194.9z" />
+    <glyph glyph-name="line"
+      unicode="&#xF3C0;"
+      horiz-adv-x="448" d=" M272.1 243.8V172.7000000000001C272.1 170.9 270.7000000000001 169.5000000000001 268.9000000000001 169.5000000000001H257.5000000000001C256.4000000000001 169.5000000000001 255.4000000000001 170.1000000000001 254.9000000000001 170.8000000000001L222.3000000000001 214.8000000000001V172.6000000000001C222.3000000000001 170.8000000000001 220.9000000000001 169.4000000000001 219.1000000000001 169.4000000000001H207.7000000000001C205.9000000000001 169.4000000000001 204.5000000000001 170.8000000000001 204.5000000000001 172.6000000000001V243.7000000000001C204.5000000000001 245.5000000000001 205.9000000000001 246.9000000000001 207.7000000000001 246.9000000000001H219C220 246.9000000000001 221.1 246.4000000000001 221.6 245.5000000000001L254.2 201.5000000000001V243.7000000000001C254.2 245.5000000000001 255.6 246.9000000000001 257.4 246.9000000000001H268.8C270.6 247.0000000000001 272.1 245.5000000000001 272.1 243.8000000000001zM190.1 247H178.7C176.9 247 175.5 245.6 175.5 243.8V172.7000000000001C175.5 170.9 176.9 169.5000000000001 178.7 169.5000000000001H190.1C191.9 169.5000000000001 193.3 170.9 193.3 172.7000000000001V243.8000000000001C193.3 245.5000000000001 191.9 247.0000000000001 190.1 247.0000000000001zM162.6 187.4H131.5V243.8C131.5 245.6 130.1 247 128.3000000000001 247H116.9C115.1 247 113.7 245.6 113.7 243.8V172.7C113.7 171.8 114 171.1 114.6 170.5C115.2 170 115.9 169.6 116.8000000000001 169.6H162.5000000000001C164.3000000000001 169.6 165.7000000000001 171 165.7000000000001 172.8V184.2C165.7000000000001 185.9 164.3000000000001 187.4 162.6000000000001 187.4zM332.1 247H286.4000000000001C284.7000000000001 247 283.2000000000001 245.6 283.2000000000001 243.8V172.7000000000001C283.2000000000001 171.0000000000001 284.6 169.5000000000001 286.4000000000001 169.5000000000001H332.1C333.9000000000001 169.5000000000001 335.3 170.9 335.3 172.7000000000001V184.1C335.3 185.9 333.9000000000001 187.3 332.1 187.3H301V199.3H332.1C333.9000000000001 199.3 335.3 200.7 335.3 202.5V214C335.3 215.8 333.9000000000001 217.2 332.1 217.2H301V229.2H332.1C333.9000000000001 229.2 335.3 230.6 335.3 232.4V243.8C335.2 245.5 333.8 247 332.1 247zM448 334.3V49C447.9 4.2 411.2 -32.1 366.3 -32H81C36.2 -31.9 -0.1 4.9 0 49.7V335C0.1 379.8 36.9 416.1 81.7 416H367C411.8 415.9 448.1 379.2 448 334.3zM386.4 211.7C386.4 284.7 313.2 344.1 223.3 344.1C133.4 344.1 60.2 284.7 60.2 211.7C60.2 146.3 118.2 91.5 196.6 81.1C215.7 77 213.5 70 209.2 44.3C208.5 40.2 205.9 28.2 223.3 35.5C240.7 42.8 317.2 90.8 351.5 130.2C375.1 156.2 386.4 182.5 386.4 211.7z" />
+    <glyph glyph-name="linkedin-in"
+      unicode="&#xF0E1;"
+      horiz-adv-x="448" d=" M100.3 -32H7.4V267.1H100.3V-32zM53.8 307.9C24.1 307.9 0 332.5 0 362.2C0 391.9 24.1 416 53.8 416C83.5 416 107.6 391.9 107.6 362.2C107.6 332.5 83.5 307.9 53.8 307.9zM448 -32H355.3V113.6C355.3 148.3 354.6 192.8 307 192.8C258.7 192.8 251.3 155.1 251.3 116.1V-32H158.5V267.1H247.6V226.3H248.9C261.3 249.8 291.6 274.6 336.8 274.6C430.8 274.6 448.1 212.7 448.1 132.3V-32z" />
+    <glyph glyph-name="linkedin"
+      unicode="&#xF08C;"
+      horiz-adv-x="448" d=" M416 416H31.9C14.3 416 0 401.5 0 383.7V0.3C0 -17.5 14.3 -32 31.9 -32H416C433.6 -32 448 -17.5 448 0.3V383.7C448 401.5 433.6 416 416 416zM135.4 32H69V245.8H135.5V32zM102.2 275C80.9 275 63.7 292.3 63.7 313.5S80.9 352 102.2 352C123.4 352 140.7 334.7 140.7 313.5C140.7 292.2 123.5 275 102.2 275zM384.3 32H317.9V136C317.9 160.8 317.4 192.7 283.4 192.7C248.8 192.7 243.5 165.7 243.5 137.8V32H177.1V245.8H240.8V216.6H241.7C250.6 233.4000000000001 272.3 251.1 304.6 251.1C371.8 251.1 384.3 206.8 384.3 149.2000000000001V32z" />
+    <glyph glyph-name="linode"
+      unicode="&#xF2B8;"
+      horiz-adv-x="448" d=" M437.4 221.7C437.1 222.6 436.5 223.1 436 223.7L366 262.3C365.1 262.9 364 262.9 362.9 262.3L304 226.3C303.1 225.7 302.6 224.6 302.6 223.7L301.7000000000001 192.3L277.7000000000001 208.3C276.8000000000001 208.9 275.4000000000001 208.9 274.6 208.3L240 187.1L238.6 222.2C238.6 223.1 238 224.2 237.2 224.5L201.2 248.8000000000001L234.9 266.2000000000001C236 266.8000000000001 236.6 267.9000000000001 236.6 269.1L230.9 401.4000000000001C230.9 402.3000000000001 230 403.4000000000001 229.2 404.0000000000001L138.6 447.7C137.7 448 136.9 448 136.3 448L12.6 409.4C11.2 408.8 10.3 407.4 10.6 405.7L38 272.6C38.9 269.2 72 245.2 76.6 241.7L49.7 228.8C48.3 227.9 47.7 226.5 48 225.4L68.6 125.1C69.2 122.2 92.3 101.9999999999999 95.7 98.8L78.3 88.1999999999999C77.4 87.5999999999999 76.6 86.1999999999999 76.9 85.0999999999999C78.3 77.9999999999999 92.3 7.3999999999999 93.8 5.9999999999999L158.9 -63.1000000000001C159.5 -63.7000000000002 160.3 -63.7000000000002 161.2 -64.0000000000001C161.8 -64.0000000000001 162.3 -63.7000000000001 162.9 -63.4000000000001L246.6 3.4999999999999C247.5 4.0999999999999 247.7 4.8999999999999 247.7 5.7999999999999L245.7 51.7999999999999L273.7 28.0999999999999C274.8 27.1999999999999 276.5999999999999 27.1999999999999 277.7 28.0999999999999L344.5999999999999 81.4999999999999C345.4999999999999 82.0999999999999 345.7 82.8999999999999 345.7 83.7999999999999L348 117.1999999999999L368.3 103.1999999999999C369.4 102.2999999999999 370.9 102.2999999999999 372 103.1999999999999L426.6 146.8999999999999C427.2 147.1999999999999 427.7 147.9999999999999 427.7 148.8999999999999C428.6 155.3999999999999 438 219.6999999999999 437.4 221.6999999999999zM232.6 216.9L236.6 124.3L146 63.1L132 159.6999999999999L232.6 216.8999999999999zM224.9 396.9L230.3 270.9L123.7 215.5L104 350.3L224.9 396.9zM44 274.9L18 400L97.7 350.6L117.1 217.7L44 274.9zM74.6 127.1L55.7 218L125.7 159.7L139.4 66.3L74.6 127.1zM98.9 9.4L85.2 76.5L146.9 15.6L156.6 -51.8L98.9 9.4zM163.4 -55.1L152.8 15.8000000000001L238.5 77.2000000000001L241.6 7.2L163.4 -55.1zM245.4 60C245.4 63.4 246.3 82.9 243.4 85.1L219.1 105.1L241.4 120C243.7 121.7 242.5 125.7 242.5 128L271.9 105.4L272.5 37.1L245.4 59.9999999999999zM339.7 85.4L278.8 36.8L278.2 105.4L343.9 152.3L339.7 85.4zM367.4 111.1L348.3 124.5L350.3 158.5C350.6 159.3999999999999 350 160.5 349.2 161.1L308 188.3L308.6 218.3L373.2000000000001 177.7L367.4000000000001 111.1zM422 150.9L373.7 112.6L379.4 177.6999999999999L430.5 214.2999999999999L422 150.8999999999999z" />
+    <glyph glyph-name="linux"
+      unicode="&#xF17C;"
+      horiz-adv-x="448" d=" M196.1 324.4C195.9 325.8 198 326.7 199.3 327.3C201 328 203.2 328.3 204.8 327.4C205.2 327.2 205.6 326.7 205.4 326.3C205 325.1 203 325.3 201.9 324.7000000000001C200.9 324.2000000000001 200.1 323 198.9 323C197.9 322.9000000000001 196.2 323.4000000000001 196.1 324.4000000000001zM220.8 324.7C221.8 324.2 222.6 323 223.8 323C224.9 323 226.6 323.4 226.7 324.5C226.9 325.9 224.8 326.8 223.5 327.4C221.8 328.1 219.6 328.4 218 327.5C217.6 327.3 217.2 326.8 217.4 326.4C217.7 325.1 219.7 325.3 220.8 324.7zM435.5 14.5C435 6.3 429 0.7 421.6 -3.8C406.7000000000001 -12.8 384.3 -19.6 370.7000000000001 -36L368.1 -33.8L370.7000000000001 -36C356.5000000000001 -52.9 339.0000000000001 -62.6 322.4000000000001 -63.9C305.9000000000001 -65.1999999999999 290.4000000000001 -57.6 282.1 -40.9V-40.8C281 -38.6999999999999 280.2000000000001 -36.4 279.6 -34.1C258.1 -35.3 239.4000000000001 -28.8 224.5 -29.9999999999999C202.5 -31.1999999999999 188.7000000000001 -36.4999999999999 176.2000000000001 -36.6C171.4 -47.2 161.9 -54.2 150.3000000000001 -56.7999999999999C134.3000000000001 -60.4999999999999 114.2000000000001 -56.7999999999999 94.4 -46.4L96 -43.4L94.4 -46.4C75.9 -36.6 52.4 -37.5 35.1 -33.9C26.4 -32.1 18.8 -28.9 15 -21.6C11.3 -14.3 12 -4.3 17.2 10.1C18.9 15.2 17.6 22.8 16.4 30.9C15.8 34.8 15.2 38.8 15.2 42.7C15.2 47.0000000000001 15.9 51.2 18 55.1C22.5 63.6 29.8 67.2000000000001 36.5 69.6C43.2 72 49.3 73.6 53.5 77.9C58.7 83.4 63.6 92.3 70.1 98.1C67.5 115.3 70.3 133.5 76.3 151.4C88.9 189.3 115.5000000000001 225.6 134.4 248.1C150.5 271 155.2000000000001 289.4000000000001 156.9 312.8C158 344.6 132.4 448.2 234.8 448C315.7000000000001 447.9 311.1 362.6 310.6 316.7C310.3 286.6 326.9000000000001 266.2 344 244.7C359.2 226.7 379.1 200.4 390.5 170.3C399.8 145.6999999999999 403.4 118.5 394.2 91.1999999999999C395.6 90.6999999999999 397 89.9999999999999 398.3 89.1999999999999C399.7 88.3999999999999 401 87.3999999999999 402.3 86.3C408.9000000000001 80.6999999999999 411 71.9999999999999 412.8 63.9C414.7 55.8 416.4000000000001 48.2 420 44.2C431.1 31.8 435.9 22.7 435.5 14.5zM220.8 338.9C224.4 338 229.7 336.5 233.8 334.5C231.7 346.7 238.3 358 245.6 357.5C254.5000000000001 357.2 259.5 342 254.7 330.2C253.9 328.3 251.9 326.8 250.8 325.6C257.5 323.3 261.8 321.5 263.4000000000001 320.7C271.3 330.2 274.2000000000001 346.9 267.7000000000001 361.1C257.9000000000001 382.5 233.5000000000001 382.9 223.7000000000001 360.7C220.5000000000001 353.5 219.8000000000001 345.8 220.8000000000001 338.9zM174.6 320.1C182.4 325.8 181.5 324.8 180.5 325.6C172.5 332.5 173.9 353 182.3000000000001 353.7000000000001C188.6000000000001 354.2000000000001 193.1000000000001 343 191.9 334.1C195 336.2000000000001 198.6 337.7000000000001 202.1 338.7000000000001C203.8 358 193.1 372.2000000000001 183 372.2000000000001C164.1 372.2000000000001 159 334.7000000000001 174.6 320.1zM165.2 299.2000000000001C166.7 294.3 171.3 288.7000000000001 179.9 283.9C187.7 279.3 191.9 272.4 199.9 268.9C202.5 267.8 205.6 267 209.5 266.8C227.9 265.7000000000001 236.6 278.1 247.7 281.7000000000001C259.4 285.4 267.8 292.7000000000001 270.4 299.8C273.6 308.3 268.3 314.5 259.9 318C248.6 322.9 243.6 323.2 237.3 327.3C227 333.9 218.5 336.2 211.4 336.2C197 336.2 188.2 326.4 183.5 322C183 321.5 175.6 316.1 169.4 311.5C165.2 308.2 163.8 304.1 165.2 299.2zM131.7 46.4L112.1 82C105.3 91.2 98.3 96.8 90.2 98C82.5 99.2 77.6 96.6 72.5 91.1C67.7 86 63.7 78.8 58.2 73.1C50.4 66.6 48.9 66.9 38.6 63.2000000000001C32.3 61.0000000000001 27.3 58.6 23.8 51.9C21.1 46.9 21.7 39.7 22.9 31.9C24.1 24.0000000000001 25.9 15.6 23.5 8.0000000000001V7.8000000000001C18.5 -5.8999999999999 18.5 -13.8999999999999 20.9 -18.5999999999999C28.8 -33.9999999999999 67.5 -24.6999999999999 97.4 -40.4999999999999C128.8 -56.8999999999999 170 -57.5999999999999 172.7 -22.4999999999999C174.8 -1.9999999999999 141.2 26.5000000000001 131.7 46.4000000000001zM285.6 10.6C288.8 21.6 291.9000000000001 31.9 292.4000000000001 39.6C293.2000000000001 54.8 294.0000000000001 68.3 296.8 79.4999999999999C299.9000000000001 92.1 306.1 102.6 318.2 106.8C320.5 127.9 336.9 127.9 356.5 119.3C375.4 110.8 382.5 103.3 379.3 93.1999999999999C380.3 93.1999999999999 381.3 93.3 383.5 93.1999999999999C388.7 110.0999999999999 369.2 121.1999999999999 352.8 128C355.7 140 355.2 152.1 352.4000000000001 163.6999999999999C346.4000000000001 189 329.8 211.5 317.2000000000001 222.6999999999999C314.9000000000001 222.7999999999999 315.1 220.7999999999999 319.8000000000001 216.1999999999999C331.4000000000001 205.5 356.9000000000001 167 343.1000000000001 131.3C339.2000000000001 132.3 335.5000000000001 132.8 332.2000000000001 132.6999999999999C326.9000000000001 161.8 314.7000000000001 185.8999999999999 308.6000000000001 197.2999999999999C297.1000000000001 218.6999999999999 279.1000000000001 262.5999999999999 271.4000000000001 293C266.9000000000001 286.5999999999999 259.0000000000001 281.0999999999999 249.1000000000001 278C244.4000000000001 276.5 239.4000000000001 272.5 233.2000000000001 269C219.3000000000001 261 203.2000000000001 260.2 190.8000000000001 270.2C186.3000000000001 273.8 182.8000000000001 277.8 178.2000000000001 280.5C176.6000000000001 281.4 173.1000000000001 283.8 172.0000000000001 284.5999999999999C170.0000000000001 246.8 144.7000000000001 199.3 132.7000000000001 171.8999999999999C124.4000000000001 152.1999999999999 119.5000000000001 131.0999999999999 118.9000000000001 110.3999999999999C97.1000000000001 139.5 113.0000000000001 176.6999999999999 121.5000000000001 192.7999999999999C131.0000000000001 210.3999999999999 132.5000000000001 215.2999999999999 130.2000000000001 213.5999999999999C121.6000000000001 199.5999999999999 108.2000000000001 177.3 103.0000000000001 154.3999999999999C100.3000000000001 142.5 99.8000000000001 130.3999999999999 103.3000000000001 119.1999999999999C106.8000000000001 107.9999999999999 114.4000000000001 97.6999999999999 127.9000000000001 89.3C127.9000000000001 89.3 152.7000000000001 74.9999999999999 166.2000000000001 56.8C173.6000000000001 46.8 175.9000000000001 38.1 173.6000000000001 31.9C171.1000000000001 25.2 164.0000000000001 23 156.9000000000001 23C161.7000000000001 17 167.2000000000001 10 171.3000000000001 3.4C208.9000000000001 -22.3 253.5000000000001 -12.3 285.6000000000002 10.6zM415 39.5C405 50.8 407.8 72.6 397.9 81.1C391 87.1 384.3 86.5 375.3 86.2000000000001C367.6 77.4 349.5 66.6 336.9 69.9C325.4 72.8 318.9 86.2000000000001 318.1 99.4C317.8 99.2000000000001 317.4 99.1 317.1 98.9C310 95.0000000000001 306 88.1 303.4 77.8C300.9 67.6 300 54.3 299.2 39.1C298.5 27.3 293 12.7 289.3 -1.5C285.8 -14.7 283.5 -26.7 288.2 -37.8C295.4 -52.3 307.7 -58.2 321.9 -57.1C336.1 -56 352.3 -47.3 365.5 -31.6C387.5 -5 427.8 -1.9 428.7 14.9C429 20 425.6 27.9 415 39.5zM173.3 299.3C175.3 297.4 178 294.8 181.3 292.2000000000001C187.9 287 197.1 281.6 208.6 281.6C220.2 281.6 231.1 287.5 240.4000000000001 292.4000000000001C245.3000000000001 295 251.3000000000001 299.4000000000001 255.2000000000001 302.8000000000001C259.1 306.2000000000001 261.1 309.1 258.3000000000001 309.4000000000001C255.5000000000001 309.7000000000001 255.7000000000001 306.8000000000001 252.3000000000001 304.3000000000001C247.9000000000001 301.1 242.6000000000001 296.9000000000001 238.4000000000001 294.5C231.0000000000001 290.3000000000001 218.9000000000001 284.3000000000001 208.5000000000001 284.3000000000001C198.1000000000001 284.3000000000001 189.8000000000001 289.1 183.6000000000001 294C180.5000000000001 296.5 177.9000000000001 299 175.9000000000001 300.9000000000001C174.4000000000001 302.3000000000001 174.0000000000001 305.5 171.6000000000001 305.8000000000001C170.2000000000001 305.9000000000001 169.8000000000001 302.1 173.3000000000001 299.3000000000001z" />
+    <glyph glyph-name="lyft"
+      unicode="&#xF3C3;"
+      horiz-adv-x="512" d=" M0 366.9H77.8V158.2000000000001C77.8 125.1 92.8 105.4 105 97.2000000000001C92.3 86.1 53.8 76.3000000000001 24.8 100.0000000000001C7.8 114 0 137.3 0 159V366.9zM485.9 193.4V215.4H509.7V292.2H483.6C473.4999999999999 338.5 432.4 372.9 383.3 372.9C326.7 372.9 280.6 326.9 280.6 270.2V91C296.6 88.7 316 91.3 332.3 105C349.4 119 357.1 142.2 357.1 164V170.7H395.9V247.5H357.1V270.8C357.1 305.4 409.3 305.4 409.3 270.8V193.7C409.3 137.1 455.3 91 511.9999999999999 91V167.5C497.4999999999999 167.5 485.8999999999999 179.2 485.8999999999999 193.4zM191.6 292.4V179.4C191.6 164 167.8 164 167.8 179.4V292.4H91V159.7C91 135.9 99 105.7 136 95.8C173 86 194.2 106.4 194.2 106.4C192.1 93.0000000000001 179.7 83.1 159.3 81.1C143.8 79.5 124.1 84.7000000000001 114.3 88.9V18.6C139.4 11.1 165.8 8.8 191.9 13.9C239 23.0000000000001 268.7 62.3 268.7 114.7000000000001V292.9H191.6V292.4z" />
+    <glyph glyph-name="magento"
+      unicode="&#xF3C4;"
+      horiz-adv-x="448" d=" M445.7 320.1V64L382.3 27.5V283.3L223.8 374.9L65.2 283.3L65.6 27.4L2.3 64V319.9L224.2 448L445.7 320.1zM255.6 27.5L224 9.1L192.2 27.3V283.3L128.9 246.7L129 -9.2L223.9 -64.1L319 -9.2V246.8L255.6 283.4V27.4999999999999z" />
+    <glyph glyph-name="mandalorian"
+      unicode="&#xF50F;"
+      horiz-adv-x="390.88" d=" M203.28 -63.89C202.3 -60.63 201.59 -48.06 201.89 -39.31C202.44 -23.42 202.87 -14.59 203.29 -10.55C203.93 -4.35 206.16 10.17 206.57 10.83C207.17 11.79 206.97 38.7 206.33 43.96C206.02 46.54 205.7 55.86 205.64 64.69C205.51 81.16 205.11 84.81 202.91 89.45C201.81 91.77 201.68 93.29 201.92 100.88C202.08 105.69 201.92 111.41 201.58 113.59C199.53 126.56 198.12 141.29 198.33 147.49C198.54 153.61 198.76 154.6399999999999 200.39 157.16C203.44 161.87 206.9 171.2 209.01 180.43C211.27 190.29 212.89 197.61 213.6 201.17C214.49 205.59 216.03 210.89 217.96 216.22C220.2300000000001 222.47 220.4500000000001 231.61 218.3300000000001 231.61C218.03 231.61 216.9500000000001 230.39 215.9200000000001 228.9C214.8900000000001 227.41 211.1600000000001 224.0999999999999 207.6300000000001 221.5399999999999C199.2600000000001 215.4599999999999 195.9300000000001 212.1499999999999 194.9700000000001 208.9599999999999C194.0400000000001 205.8499999999999 193.9500000000001 201.7299999999999 194.8100000000001 201.1999999999999C195.1500000000001 200.9899999999999 196.1000000000001 198.7999999999999 196.9200000000001 196.3199999999999C198.5400000000001 191.44 198.7900000000001 186.1999999999999 197.6400000000001 180.9599999999999C197.2500000000001 179.19 196.5900000000001 175.4899999999999 196.1800000000001 172.7299999999999C195.7700000000001 169.9699999999999 195.2000000000001 166.2699999999999 194.9300000000001 164.5099999999999C194.6500000000001 162.7499999999999 193.9600000000001 160.8299999999999 193.3800000000001 160.2499999999999C192.4200000000001 159.2899999999999 192.2400000000001 159.3399999999999 191.3300000000001 160.7799999999999C190.78 161.6499999999999 190.1300000000001 163.7899999999999 189.8900000000001 165.5299999999999C189.6400000000001 167.2699999999999 188.2600000000001 172.6399999999999 186.81 177.4599999999999C183.53 188.3599999999999 183.29 193.6099999999999 185.85 198.4199999999999C186.77 200.1499999999999 187.52 202.2299999999999 187.52 203.0299999999999C187.52 205.4199999999999 185.32 208.3499999999999 180.11 212.9199999999999C173.06 219.0999999999999 171.48 220.8399999999999 169.88 224.2199999999999C168.17 227.8199999999999 166.82 228.2799999999999 165.34 225.7599999999999C163.56 222.7499999999999 162.7400000000001 216.6499999999999 162.37 203.7399999999999L162.0200000000001 191.6099999999999L163.97 189.3599999999999C167.18 185.6599999999999 176.04 172.9099999999999 177.75 169.5299999999999C181.16 162.7899999999999 182.09 157.8399999999999 182.16 145.9699999999999C182.23 134.13 183.11 123.2199999999999 184.16 121.2599999999999C184.5200000000001 120.5999999999999 184.67 119.9099999999999 184.5 119.74C184.3300000000001 119.5699999999999 184.91 117.65 185.79 115.47C186.67 113.29 187.6 109.2499999999999 187.85 106.49C188.1 103.73 188.87 99.06 189.56 96.12C191.79 86.56 192.3300000000001 82.04 191.95 75.98C191.75 72.71 191.42 64.91 191.22 58.66C189.91 16.9 189.37 0.68 189.18 -2.55C189.06 -4.57 188.7900000000001 -14.06 188.5800000000001 -23.62C188.22 -39.92 187.28 -50.99 186.1600000000001 -52.27C185.5200000000001 -53 178.0900000000001 -47.36 173.6400000000001 -42.78C169.8900000000001 -38.91 169.62 -37.9899999999999 170.81 -32.83C171.51 -29.82 173.07 -14.54 174.1400000000001 -0.21C174.5000000000001 4.57 174.9500000000001 10.29 175.15 12.5C175.9800000000001 21.87 176.81 32.85 177.7600000000001 47.28C178.3200000000001 55.74 179.0900000000001 63.72 179.4800000000001 65.01C179.8600000000001 66.3 180.37 74.9 180.6100000000001 84.12L181.0400000000001 100.89L178.7800000000001 105.19C177.0600000000001 108.47 173.9100000000001 112.13 165.5600000000001 120.53C159.5300000000001 126.6 153.7200000000001 132.83 152.6500000000001 134.38L150.7000000000001 137.19L151.4500000000001 148.09C152.5400000000001 163.8 152.5500000000001 196.66 151.4700000000001 207.15L150.5800000000001 215.85L147.3000000000001 220.37C141.4400000000001 228.45 141.5000000000001 228.12 141.0800000000001 253.64C140.9800000000001 259.71 140.7000000000001 265.14 140.4500000000001 265.7C139.6200000000001 267.57 137.4000000000001 268.36 131.9100000000001 268.75C123.0500000000001 269.37 120.9500000000001 270.65 108.0600000000001 283.3C101.9100000000001 289.3400000000001 95.7200000000001 295.27 94.3100000000001 296.49C91.5000000000001 298.91 91.5200000000001 298.48 93.7500000000001 306.12L95.1000000000001 310.77L93.4100000000001 313.81C92.4800000000001 315.48 91.3200000000001 317.32 90.8200000000001 317.88C89.4900000000001 319.39 85.3200000000001 328.77 84.8300000000001 331.37C84.5200000000001 333.03 84.7400000000001 334.04 85.7000000000001 335.27C87.9300000000001 338.13 89.1000000000001 340.95 90.1500000000001 346C92.4800000000001 357.19 97.8900000000001 372.0900000000001 100.7500000000001 375.2200000000001C103.9300000000001 378.69 108.4500000000001 376.27 110.1600000000001 370.19C111.5000000000001 365.4 111.5300000000001 360.4 110.2600000000001 351.64C109.7300000000001 347.96 109.2800000000001 342.9600000000001 109.2700000000001 340.53C109.2500000000001 336.52 109.4600000000001 335.8400000000001 111.5200000000001 333.14C114.8500000000001 328.77 119.2500000000001 325.73 126.7200000000001 322.62C128.4200000000001 321.9100000000001 130.5400000000001 320.63 131.4400000000001 319.77C142.6100000000001 309.05 150.0600000000001 303.5900000000001 154.3900000000001 302.92C159.5700000000001 302.12 162.3700000000001 298.38 164.4300000000001 289.5300000000001C165.7400000000001 283.88 168.4300000000001 278.3900000000001 169.8900000000001 278.3900000000001C170.4800000000001 278.3900000000001 171.9800000000001 279.0200000000001 173.2200000000001 279.7800000000001C175.2000000000001 281 175.4700000000001 281.51 175.4700000000001 283.9600000000001C175.4600000000001 287.6700000000001 174.3000000000001 298.0400000000001 173.4700000000001 301.8000000000001C173.1000000000001 303.4600000000001 172.6900000000001 305.86 172.5400000000001 307.1500000000001C172.4000000000001 308.4400000000001 171.9300000000001 311 171.5100000000001 312.8400000000001C168.9600000000001 324 167.8600000000001 328.3000000000001 167.4100000000001 328.8900000000001C165.8600000000001 330.9100000000001 163.3300000000001 339.0900000000001 162.4800000000001 344.8100000000001C160.8400000000001 355.92 158.5200000000001 359.04 149.5700000000001 362.2000000000001C144.9300000000001 363.8400000000001 140.6800000000001 366.3200000000001 136.2500000000001 369.98C135.1000000000001 370.9300000000001 132.2400000000001 373.2000000000001 129.9000000000001 375.04C127.5500000000001 376.87 125.4900000000001 378.5700000000001 125.3000000000001 378.8000000000001C125.1200000000001 379.0300000000001 123.9100000000001 379.9400000000001 122.6100000000001 380.8200000000001C116.3700000000001 385.04 113.7700000000001 387.8000000000001 111.3500000000001 392.7800000000001L108.9100000000001 397.8000000000001L108.6900000000001 410.7800000000001L108.4700000000001 423.7600000000001L115.3800000000001 430.3100000000001C119.3300000000001 434.0600000000001 123.8600000000001 437.6600000000001 125.9700000000001 438.7400000000001C129.2800000000001 440.4300000000001 130.4200000000001 440.6300000000001 137.3400000000001 440.79C145.8700000000001 440.98 147.4600000000001 440.7700000000001 149.0000000000001 439.23C150.5300000000001 437.7000000000001 150.3600000000001 432.8300000000001 148.7100000000001 430.73C147.9700000000001 429.79 147.3700000000001 428.7500000000001 147.3700000000001 428.4100000000001C147.3700000000001 427.8300000000001 144.7600000000001 423.5000000000001 141.9500000000001 419.4200000000001C141.2700000000001 418.4300000000001 139.8200000000001 414.0700000000001 139.5800000000001 412.6C160.0200000000001 399.2100000000001 161.1300000000002 408.8300000000001 153.6500000000001 383.6200000000001L165.0500000000001 381.0800000000001C168.1600000000002 389.74 171.5200000000001 398.3400000000001 173.6600000000002 407.3000000000001C173.9500000000001 414.9300000000001 161.6800000000002 411.49 158.2600000000001 415.98C155.9300000000001 421.9100000000001 161.3900000000001 430.1600000000001 164.3200000000001 435.1800000000001C165.9200000000001 437.5200000000001 170.9400000000002 439.8800000000001 173.1400000000001 439.3300000000001C174.0200000000001 439.11 177.3000000000001 439.6800000000001 180.5100000000001 440.61C183.6900000000002 441.5300000000001 187.0900000000002 442.29 188.0600000000002 442.29C189.0300000000002 442.29 191.7200000000002 442.8700000000001 194.0400000000001 443.5800000000001C197.6900000000002 444.6900000000001 198.5400000000001 444.7500000000001 200.3900000000001 443.98C201.5600000000001 443.5000000000001 204.1800000000001 442.8900000000001 206.2100000000001 442.6200000000001C208.2300000000001 442.36 210.9300000000001 441.5000000000001 212.2100000000001 440.7100000000001C213.4900000000001 439.92 215.7400000000001 438.9400000000001 217.2300000000001 438.54C219.7400000000001 437.86 220.2300000000001 437.9700000000001 224.2800000000002 440.2100000000001L228.6300000000002 442.61L239.3300000000002 443.0200000000001C249.7700000000001 443.42 250.1400000000002 443.4900000000001 254.5900000000001 445.7000000000001L259.1700000000002 448.0000000000001L261.6300000000001 446.5700000000001C263.3900000000001 445.55 264.7700000000001 443.8400000000001 266.4800000000002 440.5900000000001C268.8400000000002 436.0800000000001 268.8600000000002 436.0100000000001 267.8500000000002 433.2200000000001C266.9700000000002 430.7800000000001 266.9600000000002 429.92 267.7500000000001 426.8300000000001C268.2500000000001 424.8700000000001 269.2000000000001 422.2100000000001 269.8500000000002 420.92C270.5000000000001 419.6300000000001 271.0900000000002 417.8300000000001 271.1600000000002 416.9100000000001C271.4700000000002 412.5800000000001 271.1300000000002 411.61 268.7500000000001 409.99C266.5800000000001 408.5200000000001 261.7700000000001 402.0800000000001 261.7700000000001 400.6500000000001C261.7700000000001 400.3300000000001 261.2900000000001 398.9600000000001 260.7000000000001 397.62C255.6600000000001 386.11 253.9400000000001 384.0600000000001 246.4400000000001 380.6400000000001C237.2400000000001 376.4400000000001 234.1400000000001 375.4500000000001 230.2300000000001 375.4500000000001C227.1300000000001 375.4500000000001 226.2300000000001 375.2000000000001 225.6900000000001 374.1900000000001C225.3200000000001 373.5 223.4800000000001 371.8200000000001 221.6000000000001 370.48C219.5600000000001 369.0100000000001 217.8000000000001 367.1 217.2200000000001 365.7000000000001C216.6800000000001 364.42 215.5600000000001 363.11 214.7300000000001 362.79C213.9000000000001 362.4700000000001 212.7900000000001 361.7100000000001 212.2800000000001 361.0800000000001C211.7600000000001 360.4600000000001 208.6200000000001 358.04 205.2800000000001 355.7000000000001C201.9500000000001 353.36 198.4100000000001 350.6800000000001 197.4100000000001 349.7400000000001C196.4100000000001 348.8000000000001 195.3400000000001 348.0300000000001 195.0200000000001 348.0300000000001S193.7400000000001 347.2900000000001 192.8900000000001 346.3800000000001C191.5800000000001 344.9900000000001 191.4000000000001 344.2700000000001 191.7500000000002 341.7800000000001C191.9700000000002 340.1500000000001 192.6100000000002 337.5100000000001 193.1700000000001 335.9000000000001C194.4900000000001 332.1000000000001 194.4800000000001 328.0400000000001 193.1200000000001 325.3300000000001C191.6900000000001 322.4700000000001 192.2300000000001 318.6800000000001 194.4700000000001 315.7400000000001C196.4800000000001 313.1100000000001 196.6300000000001 311.1800000000001 195.1800000000001 306.9000000000001C194.5700000000001 305.1 194.1300000000001 301.4500000000001 194.1200000000001 297.9900000000001C194.1000000000001 293.1100000000001 194.3400000000001 291.7100000000001 195.5800000000001 289.6100000000001C196.7800000000001 287.5700000000001 197.4000000000001 287.1300000000001 198.8200000000001 287.2900000000001C200.8000000000001 287.5200000000001 201.1200000000002 288.3400000000001 203.5300000000002 299.4100000000001C205.7100000000002 309.4400000000001 207.2400000000002 311.3300000000001 217.2900000000001 316.4900000000001C220.2300000000001 318.0000000000001 224.7500000000002 320.4500000000001 227.3200000000002 321.9300000000001C229.9000000000002 323.4100000000001 234.1100000000002 325.6200000000001 236.6900000000002 326.8400000000001C243.3600000000002 330.0000000000001 247.7400000000002 333.3600000000001 251.9100000000002 338.5100000000001C259.0200000000002 347.3000000000001 261.8900000000002 354.7300000000001 264.7600000000002 371.8100000000001C265.3100000000002 375.0900000000001 266.1900000000002 377.4600000000001 267.6200000000002 379.5400000000001C268.9100000000002 381.4100000000001 269.9900000000002 384.1600000000001 270.5100000000002 386.8500000000001C271.5300000000002 392.1500000000001 273.3600000000002 395.9300000000001 276.0900000000002 398.3600000000001C280.7900000000002 402.5400000000001 282.0900000000002 399.4500000000001 280.6800000000001 387.4900000000001C280.2200000000002 383.6300000000001 279.5800000000001 377.1600000000001 279.2400000000001 373.1100000000001L278.6300000000001 365.7500000000001L283.0800000000001 361.6600000000001L287.5300000000001 357.5700000000001L287.6400000000001 349.1500000000001C287.7000000000001 344.5200000000001 288.1100000000002 339.6200000000001 288.5600000000001 338.2600000000001L289.3800000000001 335.7900000000001L282.9500000000001 329.5100000000001C274.4100000000001 321.1800000000001 270.0700000000001 315.5800000000001 266.1900000000001 307.9000000000001C264.4200000000002 304.4100000000001 262.4500000000001 300.7900000000001 261.8100000000001 299.8700000000001C259.6300000000001 296.7600000000001 255.3500000000001 286.8600000000001 253.0500000000002 279.6100000000001L250.7600000000002 272.3900000000001L243.7900000000002 265.9000000000001C239.9600000000001 262.3300000000001 235.8300000000002 258.6500000000001 234.6200000000002 257.7300000000001C231.5700000000002 255.4100000000001 230.3600000000002 252.5800000000001 230.3600000000002 247.7400000000001C230.3600000000002 244.7600000000001 230.7900000000002 242.7800000000001 231.9500000000002 240.4800000000001C232.8200000000002 238.7400000000001 233.7600000000002 236.5700000000001 234.0400000000002 235.6500000000001C234.3200000000002 234.7300000000001 235.0200000000002 233.4300000000001 235.6100000000002 232.7600000000001C237.0100000000002 231.1700000000001 237.5300000000002 216.6400000000001 236.4400000000002 209.5400000000001C235.7600000000002 205.0600000000001 232.8100000000002 197.5200000000001 231.7400000000002 197.5200000000001C229.9500000000002 197.5200000000001 227.6800000000002 188.2500000000001 226.6700000000002 176.7800000000001C226.4900000000002 174.7600000000001 226.0500000000002 170.8400000000001 225.6900000000002 168.0800000000001C225.3300000000002 165.3200000000001 224.7300000000002 158.1000000000001 224.3400000000002 152.0300000000001C223.5700000000002 139.8100000000001 224.1500000000002 133.2600000000001 226.3900000000002 128.8800000000001C229.8000000000002 122.1900000000001 226.9100000000002 116.1900000000001 215.3600000000002 106.0400000000001L211.3900000000002 102.5500000000001L211.4600000000002 97.3600000000001C211.5000000000002 94.5000000000001 212.0100000000002 90.5100000000001 212.6000000000002 88.4900000000001C217.2100000000002 72.5100000000001 217.3300000000002 71.5700000000001 216.9800000000002 51.3600000000001C216.5200000000002 24.9600000000002 216.7200000000002 11.0900000000001 217.6100000000002 7.2100000000002C218.0300000000002 5.3700000000002 218.5200000000002 2.2100000000002 218.6900000000002 0.1900000000002C218.8600000000002 -1.8299999999998 219.3500000000002 -5.1399999999998 219.7700000000002 -7.1699999999998C220.2400000000002 -9.4299999999998 220.5500000000002 -18.1899999999998 220.5600000000002 -29.9099999999999L220.5800000000002 -48.9699999999999L218.7700000000002 -51.5999999999998C216.0600000000002 -55.5099999999999 203.6600000000002 -65.1399999999999 203.2800000000002 -63.8899999999999zM232.81 -18.78C232.63 -18.48 232.48 -11.91 232.48 -4.19C232.48 9.87 231.59 23.35 230.22 30.26C229.82 32.28 229.41 39.96 229.32 47.32C229.17 59.25 227.92 71.69 226.68 73.7C226.02 74.77 223.66 91.36 223.65 95C223.64 99.23 224.67 101 228.93 104.13C233.07 107.17 233.79 107.27 234.41 104.85C234.69 103.75 235.86 99.23 237.01 94.8200000000001C240.94 79.7000000000001 241.15 78.5500000000001 241.06 73.08C240.96 67.3000000000001 240.93 66.9500000000001 239.32 55.35C238.34 48.28 238.15 42.96 238.28 26.92C238.45 7.52 237.64 -8.81 236.24 -14.35C235.53 -17.1299999999999 233.44 -19.83 232.81 -18.78zM161.82 18.8C161.58 19.18 160.81 24.04 160.09 29.59C159.37 35.15 158.6 40.0000000000001 158.36 40.3800000000001C158.13 40.7600000000001 157.68 43.6800000000001 157.37 46.8700000000001C157.06 50.0600000000001 156.46 54.33 156.04 56.3500000000001C155.05 61.1400000000001 152.69 75.7000000000001 152.62 77.4200000000001C152.59 78.1600000000001 152.28 81.4700000000001 151.92 84.7800000000001C151.25 90.9900000000001 151.08 112.4500000000001 151.7 113.0700000000001C152.66 114.0300000000001 158.33 110.3100000000001 163.03 105.6400000000001L168.31 100.3900000000001L167.8600000000001 93.9200000000001C167.6100000000001 90.3600000000001 167.2600000000001 83.6900000000001 167.0800000000001 79.0900000000001C166.9 74.4900000000001 166.59 69.2200000000001 166.4100000000001 67.3800000000001C166.2300000000001 65.5400000000001 165.8000000000001 58.0200000000001 165.4700000000001 50.6600000000001C164.6800000000001 33.2500000000001 163.5300000000001 19.3700000000001 162.8200000000001 18.6600000000001C162.5000000000001 18.3600000000001 162.0600000000001 18.4200000000001 161.8200000000001 18.8000000000001zM74.63 285.39C95.7 272.6 92.47 271.24 103.12 267.73C116.13 263.44 121.99 260.6 126.27 250.86C82.61 214.72 57.26 192.96 49.56 180.04C18.54 128.03 43.57 78.4499999999999 112.31 92.83C98.13 63.6 34.34 64.2 13.63 97.73C-11.05 137.68 -8.46 216.03 74.63 285.39zM285.42 106.37C342.08 99.49 367.74 144.11 331.96 195.6C331.96 195.6 305.09 224.94 267.68 263.56C270.66 279.01 277.17 295.68 298.25 317.38C387.45 253.87 390.25 175.77 390.7099999999999 168.02C394.9799999999999 97.44 312.05 76.9 285.4199999999999 106.37z" />
+    <glyph glyph-name="mastodon"
+      unicode="&#xF4F6;"
+      horiz-adv-x="417.8" d=" M417.8 268.9C417.8 366.1 354.1 394.6 354.1 394.6C291.6 423.3 125.6 423 63.7000000000001 394.6C63.7000000000001 394.6 0 366.1 0 268.9C0 153.2 -6.6 9.5 105.6 -20.2C146.1 -30.9 180.9 -33.2 208.9 -31.6C259.7000000000001 -28.8 288.2000000000001 -13.5 288.2000000000001 -13.5L286.5000000000001 23.4S250.2000000000001 12 209.4000000000001 13.3C169.0000000000001 14.6999999999999 126.4000000000001 17.6999999999999 119.8000000000001 67.3C119.2000000000001 71.6999999999999 118.9000000000001 76.3 118.9000000000001 81.1999999999999C204.5000000000001 60.3 277.5000000000001 72.0999999999999 297.6 74.4999999999999C353.7000000000001 81.1999999999999 402.6 115.8 408.8 147.4C418.6 197.2 417.8 268.9 417.8 268.9zM342.7000000000001 143.7H296.1V257.9C296.1 307.6 232.1 309.5 232.1 251V188.5H185.8V251C185.8 309.5 121.8 307.6 121.8 257.9V143.7H75.1C75.1 265.8 69.9 291.6 93.5 318.7C119.4 347.6 173.3 349.5 197.3 312.6L208.9 293.1L220.5 312.6C244.6 349.7 298.6 347.4 324.3 318.7C348 291.4 342.7 265.7 342.7 143.7z" />
+    <glyph glyph-name="maxcdn"
+      unicode="&#xF136;"
+      horiz-adv-x="512" d=" M461.1 5.3H363.7000000000001L415.6 248C417.9000000000001 258.2 416.5 267.5 411.2000000000001 273.7C406.2000000000001 279.8 397.5000000000001 283.3 387.0000000000001 283.3H337.7000000000001L278.2000000000001 5.3H180.8000000000001L240.3000000000001 283.3H156.9L97.4 5.3H0L59.5 283.3L14.9 378.7H387C426.4 378.7 462.3 362.4 485.3 333.8C508.6 305.2 517.1 266.4 508.9 227.9L461.1 5.3z" />
+    <glyph glyph-name="medapps"
+      unicode="&#xF3C6;"
+      horiz-adv-x="320" d=" M118.3 209.6C121.8 222.1 125.2 243.2 131.5 243.2C139.8 241.4 141.1 219.8 150.1 206.6C154.7 230.1 155.4 291.7 164.2 293.3C173.2 294 183.9 226.8 186.2 215.8C196.1 211.7 235.1 209.2 235.1 209.2C237 201.9 211.1 201.6 195.1 201.4C190.5 186.6 189.7 173.7 183.7 173.4C179 173.2 175.5 202.2 166.2 223L156.8 157.5C152.4 144.5 141.3 180 134.9 196.8C131.6 196.9 72.5 198.4 87.3 204.6L118.3 209.6zM228 0C249.2 0 249.2 32 228 32H92C70.8 32 70.8 0 92 0H228zM204 -64C225.2 -64 225.2 -32 204 -32H116C94.8 -32 94.8 -64 116 -64H204zM238.2 77.5C241.4 96.4 243.4 113.9 250.1 126.3C258 141 266.2 154.4 274.1 167.3C298.7000000000001 207.7 320 242.5 320 292.8C320 378.4 248.2 448 160 448S0 378.4 0 292.8C0 242.6 21.3 207.7 45.9 167.3C53.8 154.4 61.9 141 69.9 126.3C76.6 113.8 78.6 96.5 81.8 77.4C85.3 56.4 117.9 61.7000000000001 114.4 82.5000000000001C110.8 104.2000000000001 108.8 123.2000000000001 99.1 141.1000000000001C66.5 201.5 33 236.7 33 292.8C33 360.7 90 416 160 416S287 360.7 287 292.8C287 236.7 253.5 201.5 220.9 141.2000000000001C211.2 123.2000000000001 209.2 103.8000000000001 205.6 82.6C202.2 62 234.6 56.2 238.2 77.5z" />
+    <glyph glyph-name="medium-m"
+      unicode="&#xF3C7;"
+      horiz-adv-x="512" d=" M71.5 305.7C72.1 311.6 69.8 317.5 65.4 321.5L20.3 375.9V384H160.5L268.9 146.3L364.2 384H497.9V375.9L459.3 338.9C455.9999999999999 336.4 454.3 332.2 454.9999999999999 328.1V56.1C454.3 52 455.9999999999999 47.8 459.3 45.3L496.9999999999999 8.3V0.2H307.3V8.3L346.4000000000001 46.2C350.2000000000001 50 350.2000000000001 51.2 350.2000000000001 57V276.8L241.5 0.9H226.8L100.4 276.8V91.9C99.3 84.1 101.9 76.3 107.4 70.7L158.2 9.1V0.9999999999999H14.2V8.9999999999999L65 70.7C70.4 76.3 72.9 84.2 71.5 91.9V305.7z" />
+    <glyph glyph-name="medium"
+      unicode="&#xF23A;"
+      horiz-adv-x="448" d=" M0 416V-32H448V416H0zM372.2 309.9L348.2 286.9C346.1 285.3 345.1 282.7000000000001 345.5 280.2000000000001V110.9C345.1 108.3 346.1 105.7 348.2 104.2L371.7 81.2V76.1H253.7V81L278 104.6C280.4 107 280.4 107.7000000000001 280.4 111.3V248.2L212.8 76.6H203.7L125 248.2V133.2C124.3 128.4 126 123.5 129.4 120L161 81.7V76.6H71.2V81.7L102.8 120C106.2 123.5 107.7 128.4 106.9 133.2V266.2C107.3 269.9 105.9 273.5 103.1 276L75 309.9V315H162.3L229.7 167L289 314.9H372.2V309.9z" />
+    <glyph glyph-name="medrt"
+      unicode="&#xF3C8;"
+      horiz-adv-x="544" d=" M113.7 192C113.7 70.2 197.6 -30.8 307.2 -49.1C288.5 -53.6 269 -56 249 -56C111.4 -56 0 55 0 192S111.4 440 248.9 440C269 440 288.5 437.6 307.1 433.1C197.5 414.8 113.7 313.8 113.7 192M411.1 91.7C333.4 36.3 231.5 44.2 170.7 106.3C176.2 92.2 183.4 78.6 192.4 65.8C254 -22.4 374.8 -43.5 462.0999999999999 18.8C549.3999999999999 81.1 570.1999999999999 203.1 508.5999999999999 291.4000000000001C499.5999999999999 304.3000000000001 489.2999999999999 315.7000000000001 478.0999999999999 325.6C515.4999999999999 246.8000000000001 488.7999999999999 147.1 411.0999999999999 91.7000000000001M192.2999999999999 335.7000000000001C190.8999999999999 334.7000000000001 189.5999999999999 333.6 188.2999999999999 332.6C252.5999999999999 350.4000000000001 324.2 328.6 367.2 272.1C402.8999999999999 225.1000000000001 410.0999999999999 165.5000000000001 391.5999999999999 114.1C448.2999999999999 170.3 459.1999999999999 256.2000000000001 413.8999999999999 315.9000000000001C363.8999999999999 381.4000000000001 264.8 390.3000000000001 192.2999999999999 335.7000000000001M296 224C291.6 224 288 227.6 288 232V272C288 276.4 284.4 280 280 280H232C227.6 280 224 276.4 224 272V232C224 227.6 220.4 224 216 224H176C171.6 224 168 220.4 168 216V168C168 163.6 171.6 160 176 160H216C220.4 160 224 156.4 224 152V112C224 107.6 227.6 104 232 104H280C284.4 104 288 107.6 288 112V152C288 156.4 291.6 160 296 160H336C340.4 160 344 163.6 344 168V216C344 220.4 340.4 224 336 224H296z" />
+    <glyph glyph-name="meetup"
+      unicode="&#xF2E0;"
+      horiz-adv-x="512" d=" M99 33.7C100.1 28 96.7 22.6 91 21.4C85.6 20.3 80.1 23.7 79 29.4C77.9 34.8 81.3 40.5 86.7 41.7C92.1 42.9 97.8 39.4 99 33.7zM242.1 -37.7C235.8 -42.3000000000001 234.1 -51.1 238.4 -57.7C243 -64.3000000000001 251.8 -66 258.4 -61.4C264.7 -56.8 266.4 -48.0000000000001 261.8 -41.4C257.6 -34.9 248.7 -33.1 242.1 -37.7zM156.1 424.6C162.4 426 166.4 432.3 165 438.6C163.9 445.2 157.6 449.2 151.3 447.7C145 446.3 141 440 142.2 433.7C143.6 427.1 149.8 423.1 156.1 424.6zM34.4 221.7C24.4 228.6 10.7 226 3.8 215.7C-3.1 205.7 -0.5 191.7 9.5 184.8C19.5 177.7 33.2 180.2 40.1 190.5C47 200.9 44.4 214.6 34.4 221.7zM306.4 392.6C317 398.9 320.1 412.6 314.1 422.9C307.8 433.5 294.4 436.9 284.1 430.6S270.4 410.6 276.7 400C282.7 389.7 296.1 386.3 306.4 392.6zM115.3 334.6C123 340 124.7 350.6 119.6 358.3S103.9 367.7 96.5 362.6C88.8 357.2 87.1 346.6 92.2 338.9C97.3 331.1 107.8 329.4 115.3 334.6zM487.6 178.6C480.2 176.9 475.3 169.5 477 161.7000000000001C478.4 154.3000000000001 485.9 149.4 493.3 151.1C500.7 152.5 505.6 160 503.9 167.7000000000001C502.4 175.1 495.0000000000001 180.0000000000001 487.6 178.6zM527.3000000000001 235.4000000000001C526.2 241.1 520.7 244.5000000000001 515.3000000000001 243.4000000000001C509.6000000000001 242.3000000000001 506.2 236.5000000000001 507.3000000000001 230.8000000000001C508.4000000000001 225.4000000000001 513.9000000000001 221.7000000000001 519.6 222.8000000000001C525 224.3000000000001 528.7 229.7000000000001 527.3000000000001 235.4000000000001zM447 309.1C438.4 303.1 436.4 291.4 442.1 282.8C447.8 274.2 459.5 272.2 468.1 277.9C476.4 283.9 478.4 295.6 472.7 304.2C467.0000000000001 312.9 455.3000000000001 315.1 447.0000000000001 309.1zM440.7 169.7C467 126.6 455.8 69.7 414.4 40.6C397 28.3 377.3 22.9 357.5 23.5C345.5 -23.6 288.1 -41.1 252.4 -9.1C251.3 -10 249.8 -10.8 248.7 -12C209.6 -39.1 156.4 -29.4 129.3 10.3C119.6 24.6 114.7 40.9 114.2 57.2C48.8 68.1 24.2 151.2 73.1 196.9C44.8 243.8 73.7 304.3 126.5 311.8C151.6 378 234.1 409.4 290.1 366C357.5 388.3 426.4000000000001 336.6 421 264.9C462.1 252.3 473.8 198 440.7 169.7zM370.7 95.4C367.6 116 329.8 100 327.6 122.5C324.5 154.5 371.3 223.6 367.6 250.5C364.2 274.5 348.2 279.6 334.2 279.9C320.8 280.2000000000001 317.3 277.9 312.8 275.3C309.9000000000001 273.6 306.2 270.4 301.1 275.6C294.8 281.6 290 287.3 281.7000000000001 288.5C269.4000000000001 290.5 264.0000000000001 286.5 255.1000000000001 278.8000000000001C251.7000000000001 275.9000000000001 243.1000000000001 265.9000000000001 235.1000000000001 269.7000000000001C231.7000000000001 271.4000000000001 219.7000000000001 277.4000000000001 211.1000000000001 281.1C194.8000000000001 288.2000000000001 171.1000000000001 276.5000000000001 162.5000000000001 261.1C149.6000000000001 238.2000000000001 124.5000000000001 148.0000000000001 120.8000000000001 136.0000000000001C112.2000000000001 109.4 131.7000000000001 87.4 157.7000000000001 88.9C168.8000000000001 89.5000000000001 176.0000000000001 93.5000000000001 183.1000000000001 106.3C187.1000000000001 113.7 224.8000000000001 214 227.7000000000001 218.9C229.7000000000001 222.3 236.6000000000001 226.9 242.3000000000001 224C248.0000000000001 220.9 249.2000000000001 214.6 248.3000000000001 208.9C247.2000000000001 199.2 220.3000000000001 138 219.4 131.2C216 108.3 246.3000000000001 104.6 258.0000000000001 127.2C261.7000000000001 134.3 303.7000000000001 219.8 307.4000000000001 225.5C311.7000000000001 231.8 314.8 233.8 319.1 233.5C322.2000000000001 233.5 327.4000000000001 232.6 326.2000000000001 222.6C324.8000000000001 213.2 291.1 150.3 287.3000000000001 134.9C282.7000000000001 114.3 293.9000000000001 93.5 312.2000000000001 84.3C323.6 78.6 374.7000000000001 68.6 370.7000000000001 95.4zM376.4 3.1C366.1 -4.3 363.5 -18.9 370.7 -29.5000000000001C377.8 -40.1000000000001 392.1 -42.6000000000001 402.7 -35.5000000000001C413.3 -28.1000000000001 415.8 -13.5000000000001 408.7 -2.9C401.3 7.7 387 10.6 376.4 3.1z" />
+    <glyph glyph-name="microsoft"
+      unicode="&#xF3CA;"
+      horiz-adv-x="448" d=" M0 416H214.6V201.4H0V416zM233.4 416H448V201.4H233.4V416zM0 182.6H214.6V-32H0V182.6zM233.4 182.6H448V-32H233.4V182.6z" />
+    <glyph glyph-name="mix"
+      unicode="&#xF3CB;"
+      horiz-adv-x="448" d=" M0 384V35.1C0 -21.1 88 -23 88 35.1V273.7C95.9 326.6 176 324.1 176 267.2V91.9C176 34 272 33.9 272 91.9V208C277.3 262.7 360 260.5 360 203.7V179.9C360 120 448 123.3 448 179.9V384H0z" />
+    <glyph glyph-name="mixcloud"
+      unicode="&#xF289;"
+      horiz-adv-x="640" d=" M424.43 228.271C416.124 313.273 344.135 380 256.919 380C184.653 380 120.695 333.4840000000001 97.714 265.926C43.169 257.897 1.084 211.104 1.084 154.344C1.084 92.046 51.752 41.378 114.327 41.378H403.9409999999999C456.2699999999999 41.378 498.9099999999999 83.74 498.9099999999999 136.071C498.9099999999999 181.202 466.7919999999999 219.134 424.4299999999999 228.271zM403.9410000000001 83.741H114.327C75.287 83.741 43.446 115.305 43.446 154.345S75.287 224.949 114.327 224.949C133.154 224.949 150.875 217.474 164.165 204.183C184.128 184.22 214.298 214.41 194.345 234.363C179.67 248.761 161.673 258.728 142.292 263.712C162.227 308.012 207.082 337.638 256.92 337.638C326.416 337.638 382.899 281.155 382.899 211.936C382.899 198.368 380.6840000000001 185.079 376.53 172.342C367.587 144.825 408.663 133.403 416.677 159.052C419.446 167.358 421.661 175.941 423.046 184.524C442.4269999999999 177.048 456.5479999999999 158.221 456.5479999999999 136.0709999999999C456.5479999999999 107.2759999999999 433.0129999999999 83.7409999999999 403.9409999999999 83.7409999999999zM639.01 136.071C639.01 92.047 626.273 49.6849999999999 601.908 13.414C597.755 7.322 591.11 4 584.188 4C567.871 4 557.061 22.826 566.745 36.949C586.126 66.298 596.648 100.631 596.648 136.071S586.1270000000001 205.844 566.745 234.9160000000001C551.09 257.747 586.106 282.1560000000001 601.908 258.4500000000001C626.274 222.457 639.01 180.0940000000001 639.01 136.071zM568.13 136.071C568.13 104.506 558.9929999999999 74.05 541.273 47.746C537.12 41.655 530.475 38.61 523.553 38.61C506.352 38.61 496.531 57.5889999999999 506.11 71.5579999999999C519.123 90.6619999999999 525.768 112.8129999999999 525.768 136.0709999999999C525.768 159.0519999999999 519.123 181.4789999999999 506.11 200.5829999999999C490.349 223.5689999999999 525.118 247.6779999999999 541.273 224.1179999999999C558.9920000000001 198.0919999999999 568.13 167.6349999999999 568.13 136.0709999999999z" />
+    <glyph glyph-name="mizuni"
+      unicode="&#xF3CC;"
+      horiz-adv-x="496" d=" M248 440C111 440 0 328.9 0 192C0 55 111 -56 248 -56S496 55 496 192C496 328.9 385 440 248 440zM168 88.1C136.6 77.5 109.2 60.8 88 39.9V312C88 334.1 105.9 352 128 352S168 334.1 168 312V88.1zM288 98C275.1 100 261.8 101.1 248.2 101.1C234.4 101.1 221 100 208 98V312C208 334.1 225.9 352 248 352S288 334.1 288 312V98zM408 40.3C386.8 61.1 359.4 77.7 328 88.3V312C328 334.1 345.9 352 368 352S408 334.1 408 312V40.3z" />
+    <glyph glyph-name="modx"
+      unicode="&#xF285;"
+      horiz-adv-x="448" d=" M356 206.2L392.7 182.5V-32L259.7 51.8L356 206.2zM440 373H226.3L203.3 335.2L356.8 238.7L440 373zM351 230.2L55.2 416V201.5L101.2 172.5L351 230.2zM97 153.8L8 11H221.7L346.7 211.5L97 153.8z" />
+    <glyph glyph-name="monero"
+      unicode="&#xF3D0;"
+      horiz-adv-x="496" d=" M352 64H460.4C417 -7.9 338.1 -56 248 -56S79 -7.9 35.6 64H144V191.8L248 87L352 192V64zM88 112V320L247.4 160.6L408 320V112H482.8C491.3 137.1 496 164 496 192C496 329 385 440 248 440S0 329 0 192C0 164 4.6 137.1 13.2 112H88z" />
+    <glyph glyph-name="napster"
+      unicode="&#xF3D2;"
+      horiz-adv-x="496" d=" M298.3 74.4C284.1 60.8 267 50.3 247.9 43.9C228.9 50.3 211.7 60.8 197.6 74.4H298.3zM342.3 274C362.3 290.9 385.9000000000001 303.2 411.9 310.2V149C411.9 -70.4 83.9 -68.6 83.9 148.7V310.3C109.8 303.4 133.5 290.7000000000001 153.4 273.9C210.2 313.9 285.9 313.8 342.3 274zM133.5 332.5C197.9 392.5 297.8 392.6 362.4 332.7C355.3 329.2 348.5 325.4 341.8 321.2C283.1 351.7 212.6 351.6 153.9 321.1C147.5999999999999 325.1 140 329.3 133.5 332.5zM43.8 354.8V285.5C-14.6 249 -14.6 164.4 43.9 127.2C70.3 -117.9 425.6 -113.1 451.5 125.7L451.8 127.4C510.5 163.7 510.7 249.1 452 285.6V354.8C434.7 354.3 418 351.8 401.9 347.4C319.9 438.9 176.4 438.9 94.4 347.3C78.1 351.7 61.3 354.3 43.8 354.8zM259.2 96S295.2 96.3 320.5 97.5C330.7 98 341.6 101.5 346 104C372.3 119.1 371.4 143.2 372.2 151.4C292.7 152 272.3 155.3 259.2 96zM123.7 151.3C124.5 143.1 123.6 119 149.9 103.9C154.3 101.4 165.1 97.9 175.4 97.4C200.7 96.3 236.7 95.9 236.7 95.9C223.5 155.3 203 152.0000000000001 123.7 151.3zM292.8 27.9C289.6 33.2 285.9 35.2 285.9 35.2C261.1 27.9 233.7 28.3 210 35.2C210 35.2 207.1 33.7 203.6 28.6C200.8 24.4999999999999 199.9 18.9999999999999 199.9 18.9999999999999C229 1.3999999999999 267 1.3999999999999 296.1 18.9999999999999C296 19.1 295.8 22.9999999999999 292.8 27.8999999999999z" />
+    <glyph glyph-name="nintendo-switch"
+      unicode="&#xF418;"
+      horiz-adv-x="448" d=" M95.9 414.5C51.3 406.5 15.4 373.5 4.1 330.1C0 314.4 -0.3 305.2 0.2 183.6C0.4 72 0.5 69.4 2.4 60.7C12.7 14.2 45.7 -18.9 92.7 -29.8C98.8 -31.2 106.6 -31.5 156.8 -31.7C208.7 -32.1 214.1 -32 215.5 -30.6C216.9 -29.2 217 -11.3 217 191.6C217 342.1 216.7 412.9000000000001 216.1 414.2000000000001C215.2 415.9000000000001 213.6 416 159.2 415.9000000000001C115 415.8 101.7 415.5 95.9 414.5zM179.8 191.9V4L142 4.5C107.2 4.9 103.5 5.1 96.5 6.8C66.6 14.5 44.5 37.5 38.2 67.5C36.2 76.9 36.2 307.6 38.1 316.8C43.7 342.9 61.8 364.5 86.1 374.2000000000001C98.3 379.1 104 379.7000000000001 143.7 379.8L179.6 379.9V191.9zM103.9 323.1C98.1 322 89.2 317.5 84.4 313.4C74.7 305 69.8 293 70.6 278.9C71 271.6 71.4 269.6 74.4 263.7C78.8 254.7 85.3 248.1 94.3 243.7C100.5 240.6 102.1 240.3 110.2 240C117.5 239.7 120.1 240 125 241.7C145.1 248.5 157.3 268 153.8 288.1C149.9 311.8 127.2 327.8 103.9 323.1zM262.1 415.4C261.7000000000001 415.1 261.5 314.6 261.5 191.9C261.5 -10.4 261.6 -30.9 263 -31.5C265.5 -32.4 337.5 -32.1 346.4 -31.1C384.1 -26.8 417.4 -3.9 435.4 30.1C437.7 34.4999999999999 440.8 41.8 442.4 46.3C448.2 63.6999999999999 448.1 59.1 448.1 192.4C448.1 298.8 447.9 314.7 446.6 321.4C437.4 369.7 400.5 406.2 352.1 414.5C345.6 415.6 335.6 415.8999999999999 303.3 415.8999999999999C280.9 416 262.4 415.7 262.1 415.3999999999999zM361.2000000000001 213.3C375.7000000000001 209.5 387.5000000000001 198.5 392.4000000000001 184.4C395.5000000000001 175.7 395.4000000000001 162.9 392.3 154.9C386.6 140.2 375.5 129.9 361.2 126.1C338 120.1 313.3 134.1 306.6 157.1C304.6 164.1 304.7 176 307 183.3C313.8999999999999 206 338 219.4 361.2 213.3z" />
+    <glyph glyph-name="node-js"
+      unicode="&#xF3D3;"
+      horiz-adv-x="448" d=" M224 -60C217.3 -60 210.5 -58.2 204.6 -54.8L142.9 -18.3C133.7 -13.1 138.2 -11.3 141.2 -10.3C153.5 -6 156 -5.1 169.1 2.4C170.5 3.2 172.3 2.9 173.7 2L221.1 -26.1C222.8 -27.1 225.2 -27.1 226.8 -26.1L411.5 80.5C413.2 81.5 414.3 83.5 414.3 85.5V298.7C414.3 300.8 413.2 302.7 411.4000000000001 303.8L226.8 410.3C225.1 411.3 222.8 411.3 221.1 410.3L36.6 303.7C34.8 302.7 33.7 300.7 33.7 298.6V85.5C33.7 83.5 34.8 81.5 36.6 80.6L87.2 51.4C114.7 37.7 131.5 53.8 131.5 70.1V280.5C131.5 283.5 133.9 285.8 136.9 285.8H160.3C163.2 285.8 165.7 283.5 165.7 280.5V70C165.7 33.4 145.7 12.4 111 12.4C100.3 12.4 91.9 12.4 68.5 24L20.1 51.9C8.1 58.8 0.7 71.7 0.7 85.6V298.7C0.7 312.5 8.1 325.5 20.1 332.4L204.6 439C216.3 445.6 231.8 445.6 243.4 439L428.1 332.3C440.1 325.4 447.5 312.5 447.5 298.6V85.5C447.5 71.7 440.1 58.8 428.1 51.8L243.4 -54.8C237.5 -58.2 230.8 -60 224 -60zM373.1 150.1C373.1 190 346.1 200.6 289.4000000000001 208.1C232.0000000000001 215.7 226.2000000000001 219.6 226.2000000000001 233.0000000000001C226.2000000000001 244.1 231.1000000000001 258.9000000000001 273.6 258.9000000000001C311.5 258.9000000000001 325.5 250.7000000000001 331.3 225.1C331.8 222.7 334 220.9 336.5 220.9H360.5C362 220.9 363.4 221.5 364.4 222.6S365.9 225.2 365.8 226.7C362.1 270.8 332.8 291.3 273.6 291.3C220.9 291.3 189.5 269.1 189.5 231.8C189.5 191.4 220.8 180.2 271.3 175.2C331.8 169.3 336.5 160.4 336.5 148.5C336.5 127.9 319.8999999999999 119.1 281 119.1C232.1 119.1 221.4 131.4 217.8 155.7000000000001C217.4 158.3000000000001 215.2 160.2000000000001 212.5 160.2000000000001H188.5999999999999C185.5999999999999 160.2000000000001 183.2999999999999 157.8000000000001 183.2999999999999 154.9C183.2999999999999 123.8 200.1999999999999 86.7000000000001 281.0999999999999 86.7000000000001C339.4999999999999 86.8000000000001 373.0999999999999 109.9 373.0999999999999 150.1z" />
+    <glyph glyph-name="node"
+      unicode="&#xF419;"
+      horiz-adv-x="640" d=" M316.3 -4C314.2 -4 312.1 -3.4 310.2 -2.4L291 9C288.1 10.6 289.5 11.2 290.5 11.5C294.3 12.8 295.1 13.1 299.2 15.5C299.6 15.7 300.2 15.6 300.6 15.4L315.4 6.6C315.9 6.3 316.7 6.3 317.2 6.6L375 40C375.5 40.3 375.9 40.9 375.9 41.6V108.3C375.9 109 375.6 109.6 375 109.9L317.2 143.2000000000001C316.7 143.5000000000001 316 143.5000000000001 315.4 143.2000000000001L257.6 109.9C257 109.6 256.7 108.9 256.7 108.3V41.6C256.7 41 257.1 40.4 257.6 40.1L273.4 31C282 26.7 287.3 31.8 287.3 36.8V102.7000000000001C287.3 103.6 288 104.4 289 104.4H296.3C297.2 104.4 298 103.7000000000001 298 102.7000000000001V36.8000000000001C298 25.3000000000001 291.8 18.8000000000001 280.8999999999999 18.8000000000001C277.5999999999999 18.8000000000001 274.8999999999999 18.8000000000001 267.5999999999999 22.4000000000001L252.3999999999999 31.1000000000001C248.7 33.3000000000001 246.3 37.3000000000001 246.3 41.6000000000001V108.3000000000001C246.3 112.6000000000001 248.6 116.7000000000001 252.3999999999999 118.8000000000001L310.2 152.2000000000001C313.8999999999999 154.3000000000001 318.7 154.3000000000001 322.3 152.2000000000001L380.1 118.8000000000001C383.8 116.6000000000001 386.2 112.6000000000001 386.2 108.3000000000001V41.6000000000001C386.2 37.3000000000001 383.9 33.2000000000001 380.1 31.1000000000001L322.3 -2.2999999999999C320.6 -3.3999999999999 318.5 -3.9999999999999 316.3 -3.9999999999999zM363 61.8C363 74.3 354.6 77.6 336.8 80C318.8 82.4 317 83.6 317 87.8C317 91.3 318.5 95.9 331.8 95.9C343.7 95.9 348.1 93.3 349.9000000000001 85.3C350.1 84.5 350.7000000000001 84 351.5000000000001 84H359.0000000000001C359.5000000000001 84 359.9000000000001 84.2 360.2000000000001 84.5C360.5000000000001 84.9 360.7000000000001 85.3 360.6 85.8C359.4000000000001 99.6 350.3 106 331.8 106C315.3 106 305.5 99 305.5 87.4C305.5 74.7 315.3 71.3 331.1 69.7C350 67.8 351.5 65.1 351.5 61.4C351.5 54.9 346.3 52.2 334.1 52.2C318.8 52.2 315.4000000000001 56 314.3 63.6C314.2 64.4 313.5 64.9999999999999 312.6 64.9999999999999H305.1C304.2000000000001 64.9999999999999 303.4000000000001 64.3 303.4000000000001 63.3C303.4000000000001 53.6 308.7000000000001 41.9999999999999 334.0000000000001 41.9999999999999C352.5000000000001 41.9999999999999 363.0000000000001 49.1999999999999 363.0000000000001 61.8zM417.5 111.9C417.5 105.8 412.5 100.8 406.4 100.8S395.3 105.8 395.3 111.9C395.3 118.2000000000001 400.5 123.0000000000001 406.4 123.0000000000001C412.4 123.1000000000001 417.5 118.2000000000001 417.5 111.9zM415.7 111.9C415.7 117.1 411.5 121.2000000000001 406.3 121.2000000000001C401.2 121.2000000000001 397 117.1 397 111.9C397 106.7000000000001 401.2 102.5000000000001 406.3 102.5000000000001C411.5 102.6000000000001 415.7 106.8000000000001 415.7 111.9zM411.2 105.7000000000001H408.6C408.5 106.3000000000001 408.1 109.5000000000001 408.1 109.6C407.9 110.3 407.7 110.7000000000001 406.8 110.7000000000001H404.6V105.7000000000001H402.2V118.2000000000001H406.5C408 118.2000000000001 410.9 118.2000000000001 410.9 114.9C410.9 112.6 409.4 112.1 408.5 111.8C410.2 111.7 410.3 110.6 410.6 109C410.7000000000001 108 410.9000000000001 106.3 411.2000000000001 105.7zM408.4 114.5000000000001C408.4 116.2000000000001 407.2 116.2000000000001 406.6 116.2000000000001H404.6V112.7000000000001H406.5C408.1 112.7000000000001 408.3999999999999 113.8000000000001 408.3999999999999 114.5000000000001zM137.3 257C137.3 259.7 135.9 262.1 133.6 263.4L72.3 298.7C71.3 299.3 70.1 299.6 68.9 299.7H68.3C67.1 299.7 66 299.3 64.9 298.7L3.7 263.4C1.4 262.1 0 259.6 0 257L0.1 162C0.1 160.7 0.8 159.5 1.9 158.8C3 158.1 4.4 158.1 5.6 158.8L42 179.7C44.3 181.1 45.7 183.5 45.7 186.1V230.5C45.7 233.1 47.1 235.6 49.4 236.9L64.9 245.8C66.1 246.5 67.3 246.8 68.6 246.8C69.9 246.8 71.2 246.5 72.3 245.8L87.8 236.9C90.1 235.6 91.5 233.1 91.5 230.5V186.1C91.5 183.5 92.9 181 95.2 179.7L131.6 158.8C132.7 158.1 134.2 158.1 135.3 158.8C136.4 159.4 137.1 160.7 137.1 162L137.3 257zM472.5 360.7V184.3C472.5 181.7 471.1 179.2 468.8 177.9L407.5 142.5000000000001C405.2 141.2000000000001 402.4 141.2000000000001 400.1 142.5000000000001L338.8 177.9C336.5 179.2000000000001 335.1 181.7000000000001 335.1 184.3V255.1C335.1 257.7000000000001 336.5 260.2000000000001 338.8 261.5L400.1 296.9000000000001C402.4000000000001 298.2000000000001 405.2000000000001 298.2000000000001 407.5 296.9000000000001L422.8 288.1C424.5 287.1 426.7 288.4000000000001 426.7 290.3V384.3C426.7 387.1 429.7 388.9000000000001 432.2 387.5L468.7 367.1C471 365.9000000000001 472.5 363.4000000000001 472.5 360.7000000000001zM426.5 231.8C426.5 232.5 426.1 233.1 425.6 233.4L404.6 245.6C404 245.9 403.3 245.9 402.7000000000001 245.6L381.7000000000001 233.4C381.1 233.1 380.8000000000001 232.5 380.8000000000001 231.8V207.5C380.8000000000001 206.8 381.2000000000001 206.2 381.7000000000001 205.9L402.7000000000001 193.8C403.3000000000001 193.5 404.0000000000001 193.5 404.5000000000001 193.8L425.5000000000001 205.9C426.1000000000001 206.2 426.4000000000001 206.8 426.4000000000001 207.5V231.8zM636.3 232.5C638.5999999999999 233.8 640 236.3 640 238.9V256C640 258.6 638.6 261.1 636.3 262.4L575.4 297.8C573.1 299.1 570.3 299.1 568 297.8L506.7 262.4C504.4 261.1 503 258.6 503 256V185.2C503 182.5 504.4 180.1 506.7 178.8L567.6 144.1C569.8000000000001 142.8 572.6 142.8 574.9 144.1L611.6999999999999 164.6C614.1999999999999 166 614.1999999999999 169.6 611.6999999999999 171L550 206.4C548.8 207.1 548.1 208.3 548.1 209.6V231.8C548.1 233.1 548.8000000000001 234.3 550 235L569.2 246.1C570.3000000000001 246.8 571.8000000000001 246.8 572.9000000000001 246.1L592.1000000000001 235C593.2000000000002 234.3 594.0000000000001 233.1 594.0000000000001 231.8V214.4C594.0000000000001 211.6 597.1000000000001 209.8 599.6000000000001 211.2L636.3000000000002 232.5zM559 229C558.6 228.7 558.3 228.3 558.3 227.8V214.2C558.3 213.7 558.5999999999999 213.2 559 213L570.8 206.2C571.1999999999999 205.9 571.8 205.9 572.1999999999999 206.2L584 213C584.4 213.3 584.7 213.7 584.7 214.2V227.8C584.7 228.3 584.4000000000001 228.8 584 229L572.2 235.8C571.8000000000001 236.1 571.2 236.1 570.8000000000001 235.8L559 229zM304.8 185.5V255.9C304.8 258.5 303.2 261 300.9000000000001 262.3L239.8000000000001 297.5C237.7000000000001 298.7 234.8000000000001 298.9 232.4000000000001 297.5L171.3000000000001 262.3C169 261 167.4 258.6 167.4 255.9V185.5C167.4 182.7 169.3000000000001 180.3 171.4 179.1L232.6 143.9C235.0000000000001 142.5000000000001 237.8 142.6 240.0000000000001 143.9L301 179.1C302.8 180.1 304.1 181.8 304.6 183.8C304.7000000000001 184.3 304.8 184.9 304.8 185.5zM230.5 310.4L229.7 309.9H230.8L230.5 310.4zM306.7 180.2000000000001L306.3 180.9V180.0000000000001L306.7 180.2000000000001z" />
+    <glyph glyph-name="npm"
+      unicode="&#xF3D4;"
+      horiz-adv-x="576" d=" M288 160H256V224H288V160zM576 288V96H288V64H160V96H0V288H576zM160 256H32V128H96V224H128V128H160V256zM320 256H192V96H256V128H320V256zM544 256H352V128H416V224H448V128H480V224H512V128H544V256z" />
+    <glyph glyph-name="ns8"
+      unicode="&#xF3D5;"
+      horiz-adv-x="640" d=" M187.1 288.1L152.9 174.4L98.4 288.1H49L0 128H44.9L76 234.5L126.6 128H183.5L232 288.1H187.1zM639.6 289C636.7 307 615.7 317.1 597.5 320.3C552.9 328.1 495.6 304 509 261.5V261.4C465.2 252.7 434.7 234.6 414.8 213.2C411.8 223 401.2 229.8 380.8 229.8H293.2000000000001C283.9000000000001 229.8 280.3000000000001 232.1 281.7000000000001 237.2C283.3000000000001 242.7 283.6 244 285.4000000000001 249.4C287.5000000000001 255.8 293.2000000000001 256.5 298.7000000000001 256.5H432.2000000000001L441.9000000000001 288C302.2000000000001 288 297.4000000000001 288.5 281.8000000000001 286.8C269.5000000000001 285.5 258.3000000000001 282 251.2000000000001 271.8C244.4000000000001 261.9 236.8000000000001 236.2 233.6000000000001 224.7C228.2000000000001 205.3 233.0000000000001 196.1 266.4000000000001 196.1H353.7000000000001C361.5000000000001 196.1 362.5000000000001 193.4 361.4000000000001 189.5C360.3000000000001 185.1 358.6000000000001 179.5 356.9000000000001 174.9C355.3000000000001 170.7 352.2000000000001 167.5 343.1000000000001 167.5H216.3L204.7 128C344.6 128 350 128.6 365.6 130.3C372.2000000000001 131 378.6 132.4 384.1 135.2C384.3 131.5 384.6 127.9 385.3 124.4C390.7 93.9 412.7 72.1 442.1 64.9C490.7 53 550.8000000000001 81.7 577.2 132.9C595.9000000000001 169.1 591.3000000000001 209.1 573.8000000000001 238.4H573.9000000000001C603.5000000000001 244.3 644.2 260.4 639.6000000000001 289zM530.7 184.3C524.8000000000001 154.8 494.1 136.5 469.1 140.4C438.2000000000001 145.2000000000001 430.6 179.9 455 205.2000000000001C471.2 222.0000000000001 500.2 229.2000000000001 523.5 232.1000000000001C530.2 218.0000000000001 533.8 200.1000000000001 530.7 184.3000000000001zM552.5 267.4C548.3 273.4 542.7 285.9 550 293.7000000000001C556.7 300.9 570.9 303.8 581.8 301.4C597.0999999999999 298 601.5 285.5 586.6999999999999 277C575.9999999999999 270.9 563.0999999999999 268.9 552.4999999999999 267.4z" />
+    <glyph glyph-name="nutritionix"
+      unicode="&#xF3D6;"
+      horiz-adv-x="400" d=" M88 439.9S221.4 448.1 209 335.5C209 335.5 228.1 410.4 312 376.1C312 376.1 294.3 302.1 224 320.1C224 320.1 238.6 374.7 290.1 376.7C290.1 376.7 250.2 387 208 327.9C208 327.9 188.2 422.4 114.4 427.6C114.4 427.6 189.6 408.2 192 320.1C192 320 85.6 313.1 88 439.9zM400 124.3C400 75.8 390.3 28.9999999999999 368 -8.0000000000001C325.8 -38.9 263 -56.0000000000001 200 -56.0000000000001C137.1 -56.0000000000001 74.2 -38.9 32 -8.0000000000001C9.7 29 0 75.8 0 124.3C0 172.7 17.7 219 40 256C82.2 286.9 137.1 304.6 200 304.6C263 304.6 317.8 287 360 256C382.3 219 400 172.7 400 124.3zM120 20C120 35.5 107.5 48 92 48S64 35.5 64 20S76.5 -8 92 -8S120 4.5 120 20zM120 86.2C120 101.7 107.5 114.2 92 114.2S64 101.7 64 86.2S76.5 58.2 92 58.2S120 70.7 120 86.2zM120 152.4C120 167.9 107.5 180.4 92 180.4S64 167.9 64 152.4S76.5 124.4 92 124.4S120 136.9 120 152.4zM192 20C192 35.5 179.5 48 164 48S136 35.5 136 20S148.5 -8 164 -8S192 4.5 192 20zM192 86.2C192 101.7 179.5 114.2 164 114.2S136 101.7 136 86.2S148.5 58.2 164 58.2S192 70.7 192 86.2zM192 152.4C192 167.9 179.5 180.4 164 180.4S136 167.9 136 152.4S148.5 124.4 164 124.4S192 136.9 192 152.4zM264 20C264 35.5 251.5 48 236 48S208 35.5 208 20S220.5 -8 236 -8S264 4.5 264 20zM264 86.2C264 101.7 251.5 114.2 236 114.2S208 101.7 208 86.2S220.5 58.2 236 58.2S264 70.7 264 86.2zM264 152.4C264 167.9 251.5 180.4 236 180.4S208 167.9 208 152.4S220.5 124.4 236 124.4S264 136.9 264 152.4zM336 20C336 35.5 323.5 48 308 48S280 35.5 280 20S292.5 -8 308 -8S336 4.5 336 20zM336 86.2C336 101.7 323.5 114.2 308 114.2S280 101.7 280 86.2S292.5 58.2 308 58.2S336 70.7 336 86.2zM336 152.4C336 167.9 323.5 180.4 308 180.4S280 167.9 280 152.4S292.5 124.4 308 124.4S336 136.9 336 152.4zM360 192C355.2 214.3 352.6 228.9 344 248C305.2 267.9 253.5 280 200 280S94.8 267.9 56 248C47.2 228.5 44.8 214.1 40 192C82.2 199.9 138.7 206.8 200 206.8S317.8 199.9 360 192z" />
+    <glyph glyph-name="odnoklassniki-square"
+      unicode="&#xF264;"
+      horiz-adv-x="448" d=" M184.2 270.9C184.2 293 202.1 310.9 224 310.9S263.8 293 263.8 270.9C263.8 248.9 245.9 231.1 224 231.1S184.2 249.0000000000001 184.2 270.9000000000001zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM142.9 270.9C142.9 226.3 179.3 190 224 190S305.1 226.2 305.1 270.9C305.1 315.7 268.7 352 224 352S142.9 315.8 142.9 270.9zM317.4 180.2C312.8 189.3 300.1 197 283.3 183.8C283.3 183.8 260.6 165.8 224 165.8S164.6999999999999 183.8 164.6999999999999 183.8C147.8999999999999 197 135.1999999999999 189.3 130.5999999999999 180.2C122.6999999999999 164.1 131.6999999999999 156.5 152 143.2C169.3 132.1 193.1999999999999 128 208.5999999999999 126.4L195.6999999999999 113.5C177.5 95.5 160.1999999999999 78 148 65.8C130.4 48.2 158.6999999999999 20 176.4 37.2L224.1 85.1C242.3 66.9 259.8 49.4 271.8 37.2C289.4 20 317.8 47.9 300.4 65.8L252.7 113.5L239.7 126.4C255.2 128 278.8 132.3 295.9 143.2C316.3 156.5 325.2 164.2 317.4 180.2z" />
+    <glyph glyph-name="odnoklassniki"
+      unicode="&#xF263;"
+      horiz-adv-x="320" d=" M275.1 114C247.7 96.6 210 89.7 185.1 87.1L206 66.5L282.3 -9.8C310.2 -38.4 264.8 -83.1 236.6 -55.5C217.5 -36.1 189.5 -8.1 160.3 21.1L84 -55.4C55.8 -82.9 10.4 -37.8 38.6 -9.7C58 9.7 85.7 37.7 114.9 66.6L135.5 87.2000000000001C110.9 89.8000000000001 72.6 96.3000000000001 44.9 114.1C12.3 135.1 -2 147.4 10.6 173.1C18 187.7000000000001 38.3 200 65.2 178.8C65.2 178.8 101.5 149.9 160.1 149.9S255.0000000000001 178.8 255.0000000000001 178.8C281.9000000000001 199.9 302.1 187.7 309.6 173.1C322 147.4 307.7000000000001 135.1 275.1 114zM30.3 318.3C30.3 390 88.6 448 160 448S289.7 390 289.7 318.3C289.7 246.9 231.4 188.9 160 188.9S30.3 246.9 30.3 318.3zM96.3 318.3C96.3 283.2000000000001 124.9 254.6 160 254.6S223.7 283.2000000000001 223.7 318.3C223.7 353.7000000000001 195.1 382.3 160 382.3S96.3 353.7000000000001 96.3 318.3z" />
+    <glyph glyph-name="old-republic"
+      unicode="&#xF510;"
+      horiz-adv-x="496" d=" M235.76 437.77C243.26 438.08 250.76 438.05 258.26 437.86C261.87 437.7200000000001 265.46 437.46 269.05 437.13C273.9700000000001 436.86 278.8400000000001 436.1 283.7200000000001 435.51C286.6500000000001 435.08 289.55 434.53 292.4700000000001 434.05C300.37 432.72 308.1400000000001 430.77 315.86 428.65C328.1 425.18 340.05 420.73 351.62 415.44C378.18 403.2 402.56 386.23 423.25 365.56C443.28 345.4700000000001 459.97 322.01 472.14 296.37C473.27 293.78 474.58 291.27 475.61 288.63C478.42 282.2 481 275.66 483.19 269C487.33 256.67 490.53 244.01 492.61 231.17C493.18 228.0300000000001 493.65 224.87 494.01 221.7C494.56 217.87 494.95 214.01 495.19 210.14C496.02 201.8 496.03 193.41 495.96 185.04C495.89 180.07 495.7 175.1 495.21 170.15C494.97 166.7700000000001 494.7 163.3900000000001 494.23 160.03C493.84 157.31 493.6 154.5700000000001 493.1199999999999 151.86C492.22 146.71 491.42 141.55 490.2499999999999 136.45C486.1499999999999 117.95 479.9499999999999 99.9 471.74 82.82C455.97 49.99 432.91 20.65 404.62 -2.3A246.503 246.503 0 0 0 347.7099999999999 -37.16C341.5 -39.84 335.25 -42.41 328.8399999999999 -44.57C325.33 -45.7300000000001 321.83 -46.95 318.2699999999999 -47.96C311.6499999999999 -49.84 304.9799999999999 -51.6 298.2299999999999 -52.96C293.5699999999999 -53.8700000000001 288.89 -54.6900000000001 284.2 -55.4400000000001C278.95 -56.1000000000001 273.7 -56.88 268.4099999999999 -57.1800000000001C261.7199999999999 -57.8400000000001 254.9999999999999 -58.02 248.2899999999999 -57.9900000000001C241.4699999999999 -58.02 234.6399999999999 -57.8700000000001 227.8399999999999 -57.2C224.5499999999999 -56.97 221.2699999999999 -56.7 218.0099999999999 -56.2500000000001C215.2899999999999 -55.8600000000001 212.5499999999999 -55.6200000000001 209.8399999999999 -55.14C205.7199999999999 -54.42 201.5899999999999 -53.77 197.4899999999999 -52.92C193.2399999999999 -51.98 188.9999999999999 -51.03 184.7999999999999 -49.9C176.1699999999999 -47.73 167.7199999999999 -44.89 159.3899999999999 -41.77C148.8999999999999 -37.65 138.5999999999999 -33.02 128.75 -27.52C126.61 -26.3700000000001 124.47 -25.23 122.4 -23.95C111.18 -17.3700000000001 100.54 -9.85 90.48 -1.6100000000001C55.8 26.8 29.07 64.8199999999999 14.13 107.0899999999999C11.04 115.8299999999999 8.42 124.7399999999999 6.33 133.7699999999999C4.85 139.93 3.81 146.19 2.75 152.43C2.35 154.78 2.14 157.16 1.8 159.5199999999999C1.2 163.4799999999999 1.05 167.4799999999999 0.63 171.4599999999999C-0.17 180.93 -0.08 190.4499999999999 0.12 199.9499999999999C0.26 203.4599999999999 0.46 206.9599999999999 0.82 210.4599999999999C1.13 213.6299999999999 1.28 216.8299999999999 1.74 219.9799999999999C2.15 222.7899999999999 2.39 225.63 2.9 228.42C3.6 232.36 4.2 236.32 5.02 240.2399999999999C8.45 256.76 13.49 272.9699999999999 20.28 288.42C21.43 291.3399999999999 22.87 294.14 24.14 297.01C32.19 313.7199999999999 42.04 329.57 53.63 344.07C73.63 369.45 98.73 390.75 126.9 406.54C134.4 410.69 142.06 414.5899999999999 149.97 417.9099999999999C165.7899999999999 424.7899999999999 182.38 429.86 199.28 433.2899999999999C202.7899999999999 433.9599999999999 206.3199999999999 434.5299999999999 209.84 435.14C212.46 435.61 215.12 435.8399999999999 217.75 436.2199999999999C221.28 436.75 224.8499999999999 436.8999999999999 228.4 437.26C230.86 437.5 233.31 437.62 235.76 437.7699999999999M244.4 413.36C235.17 413.26 225.97 412.37 216.83 411.13C209.53 410.05 202.3 408.5299999999999 195.12 406.83C181.21 403.33 167.64 398.49 154.66 392.41C144.2 387.42 134.07 381.7099999999999 124.48 375.19C120.3 372.2699999999999 116.08 369.39 112.14 366.16C107.06 362.19 102.16 357.99 97.46 353.57C94.95 351.33 92.65 348.87 90.24 346.51C62.02 317.7199999999999 41.8 281.12 32.74 241.82C30.7 233.38 29.2 224.7999999999999 28.3 216.1699999999999C27.2 207.2799999999999 26.86 198.3199999999999 26.89 189.37C27 182.23 27.27 175.09 28.11 168C28.73 160.88 29.98 153.8399999999999 31.31 146.8199999999999C32.3799999999999 142.17 33.3399999999999 137.5 34.64 132.9099999999999C40.93 109.5299999999999 51.14 87.2099999999999 64.71 67.1599999999999C73.35 54.1799999999999 83.49 42.2299999999999 94.69 31.3899999999999C110.97 15.5699999999999 129.74 2.3499999999999 150.03 -7.83C157.31 -11.35 164.69 -14.7 172.3 -17.46C177.34 -19.22 182.36 -21.03 187.52 -22.4400000000001C198.78 -25.6700000000001 210.29 -28.0400000000001 221.91 -29.5000000000001C224.82 -29.7900000000001 227.72 -30.1100000000001 230.63 -30.4C244.45 -31.48 258.37 -31.4 272.17 -29.97C276.62 -29.37 281.09 -28.98 285.52 -28.1900000000001C289.15 -27.52 292.8 -26.9400000000001 296.39 -26.09C300.52 -25.11 304.67 -24.18 308.75 -23.02C335.25 -15.6800000000001 360.33 -3.3100000000001 382.33 13.18C398.11 24.9999999999999 412.29 38.9399999999999 424.45 54.4599999999999C427.71 58.4799999999999 430.62 62.7699999999999 433.58 67.0099999999999C436.97 72.0699999999999 440.16 77.2599999999999 443.18 82.55C445.58 86.99 447.92 91.46 450.13 95.9999999999999C455.82 108.05 460.41 120.62 463.88 133.49C466.47 143.5 468.63 153.65 469.78 163.94C471.55 177.41 471.72 191.04 471.07 204.59C470.78 208.4799999999999 470.4 212.36 470.07 216.25C467.84 235.33 463.28 254.16 456.25 272.05C450.3 287.18 442.7200000000001 301.68 433.64 315.18C420.95 333.98 405.4 350.86 387.67 365.01C362.62 385.01 333.2 399.56 302.02 407.0899999999999C294.24 409.0199999999999 286.33 410.43 278.39 411.54C274.48 412.13 270.54 412.36 266.62 412.78C259.23 413.35 251.81 413.5 244.4 413.36zM139.26 364.4700000000001C152.56 373.36 167.34 379.85 182.56 384.65C179.39 382.88 176.12 381.27 173.03 379.36C161.82 372.68 151.51 364.46 142.65 354.87C135.85 347.44 129.89 339.14 125.64 329.98C122.35 323.12 120 315.79 118.78 308.27C117.85 303.42 117.48 298.4600000000001 117.61 293.52C117.74 279.86 122.05 266.44 128.9 254.7C134.82 244.48 142.53 235.37 151.26 227.4400000000001C156.11 223.08 161.5 219.35 166.21 214.84C168.47 212.65 170.7 210.4200000000001 172.64 207.93C175.26 204.62 177.53 200.94 178.63 196.8300000000001C179.53 193.81 179.29 190.6300000000001 179.32 187.5200000000001C179.34 183.42 179.28 179.3200000000001 179.35 175.22C179.49 171.68 179.33 168.1300000000001 179.46 164.59C179.54 162.21 179.48 159.8300000000001 179.51 157.4500000000001C179.67 151.6800000000001 179.57 145.9200000000001 179.66 140.15C179.7700000000001 137.24 179.68 134.3300000000001 179.79 131.41C179.82 129.78 179.92 128.1300000000001 179.76 126.5C178.85 126.38 177.94 126.32 177.03 126.34C166.04 126.34 155.15 128.97 145.0800000000001 133.27C139.0800000000001 135.97 133.2700000000001 139.16 127.9900000000001 143.1C122.2400000000001 147.29 116.9 152.06 112.2000000000001 157.41C105.6700000000001 164.65 100.22 172.8 95.58 181.36C94.5100000000001 183.3899999999999 93.3400000000001 185.38 92.4 187.48C91.24 190.12 89.78 192.62 88.73 195.3C84.68 204.98 82.16 215.24 80.65 225.61C80.16 230.05 79.56 234.49 79.45 238.96C78.75 254.69 80.29 270.51 84.12 285.78C86.24 293.93 88.89 301.9599999999999 92.43 309.61C98.75 323.81 107.77 336.79 118.73 347.8C125.01 354 131.8600000000001 359.64 139.2600000000001 364.47zM314.63 384.5900000000001C317.37 383.85 320.04 382.85 322.72 381.91C329.08 379.58 335.4 377.07 341.43 373.95C354.54 367.51 366.74 359.14 377.25 348.98C387.45 339.03 395.99 327.38 402.39 314.64C403.6699999999999 311.89 405.0299999999999 309.18 406.2 306.38C412.51 291.28 416.2 275.12 417.43 258.81C417.84 254.27 417.87 249.72 417.88 245.17C417.95 233.5300000000001 416.39 221.92 413.58 210.64C411.6099999999999 203.37 409.2299999999999 196.15 405.7199999999999 189.46C402.5399999999999 182.8200000000001 399.0399999999999 176.3 394.88 170.22C387.94 159.75 379.2799999999999 150.35 369.06 143C358.58 135.36 346.42 129.98 333.66 127.62C330.15 126.93 326.58 126.54 323 126.41C321.1499999999999 126.35 319.2799999999999 126.25 317.44 126.5100000000001C317.16 128.66 317.44 130.8200000000001 317.43 132.97C317.4 136.7000000000001 317.57 140.42 317.53 144.1400000000001C317.72 151.16 317.55 158.1900000000001 317.74 165.21C317.7699999999999 167.59 317.71 169.97 317.7699999999999 172.35C317.94 177.42 317.7299999999999 182.49 317.9099999999999 187.56C318.01 190.55 317.6699999999999 193.6 318.4199999999999 196.52C319.08 199.02 320.1999999999999 201.38 321.5099999999999 203.6C325.9699999999999 210.91 332.5699999999999 216.56 339.1899999999999 221.86C344.5699999999999 226.04 349.6599999999999 230.63 354.2099999999999 235.7C361.8899999999999 244.07 368.3799999999999 253.58 372.9899999999999 263.9700000000001C375.4899999999999 269.9000000000001 377.5099999999999 276.0700000000001 378.5399999999999 282.4300000000001C379.3999999999999 286.8000000000001 379.5999999999999 291.2600000000001 379.5499999999999 295.7000000000001C379.5299999999999 303.5500000000001 378.1499999999999 311.35 375.9099999999999 318.8700000000001C374.1599999999999 324.6000000000001 371.64 330.0500000000001 368.82 335.3200000000001C364.95 342.2500000000001 360.17 348.6300000000001 354.86 354.5200000000001C344.92 365.3700000000001 333.11 374.4600000000001 320.26 381.6200000000001C318.4099999999999 382.6400000000001 316.42 383.4400000000001 314.63 384.5900000000001zM213.83 326.14C214.81 327.32 215.82 328.4700000000001 216.95 329.52C216.34 328.59 215.68 327.71 215 326.84C211.9 322.96 209.46 318.53 207.97 313.78C207.1 310.51 206.29 307.18 206.24 303.78C206.17 301.26 206.16 298.7100000000001 206.56 296.2100000000001C207.69 288.5800000000001 210.89 281.36 215.33 275.0900000000001C217.33 272.39 219.58 269.82 222.25 267.76C223.87 266.49 225.78 265.67 227.59 264.71C230.7 263.03 233.91 261.48 236.66 259.23C239.33 257.14 241.21 253.9 241.06 250.44C241.05 176.77 241.06 103.1 241.05 29.42C241.05 28.0699999999999 240.97 26.72 241.09 25.3799999999999C241.22 23.8999999999999 241.91 22.55 242.56 21.23C243.42 19.5699999999999 244.34 17.89 245.74 16.61C246.59 15.84 247.71 15.21 248.89 15.3699999999999C250.39 15.5699999999999 251.55 16.72 252.34 17.9399999999999C253.3 19.4499999999999 254.02 21.1 254.62 22.79C255.38 24.92 255.06 27.21 255.16 29.42C255.3 33.4499999999999 255.14 37.48 255.3 41.5099999999999C255.33 47.3999999999999 255.33 53.2799999999999 255.36 59.17C255.5 62.79 255.39 66.41 255.47 70.03C255.62 74.06 255.45 78.09 255.61 82.12C255.64 88.11 255.64 94.1 255.68 100.0899999999999C255.82 103.7099999999999 255.7 107.3299999999999 255.79 110.9499999999999C255.93 114.88 255.77 118.81 255.93 122.7299999999999C255.96 128.7199999999999 255.96 134.7099999999999 255.99 140.6999999999999C256.15 144.6399999999999 255.98 148.5799999999999 256.18 152.5199999999999C256.4700000000001 151.0799999999999 256.31 149.5999999999999 256.4000000000001 148.1399999999999C256.5900000000001 144.5299999999999 256.8200000000001 140.9099999999999 257.1600000000001 137.3C257.48 133.86 257.6 130.41 258.0200000000001 126.98C258.3900000000001 123.88 258.5300000000001 120.7599999999999 258.9700000000001 117.67C259.54 113.58 259.8400000000001 109.46 260.5100000000001 105.3799999999999C261.9700000000001 96.3399999999999 263.3400000000001 87.2699999999999 265.6 78.3899999999999C266.73 73.5699999999999 268 68.7799999999999 269.6 64.0899999999999C272.1400000000001 56.1899999999999 275.3200000000001 48.4199999999999 279.9100000000001 41.4699999999999C281.6400000000001 38.8299999999999 283.7800000000001 36.4899999999999 286.0100000000001 34.2599999999999C286.2800000000001 34.0099999999999 286.5600000000001 33.7499999999999 286.8900000000001 33.55C287.4900000000001 33.3 288.2000000000001 33.62 288.5900000000001 34.12C289.3 34.9999999999999 289.7600000000001 36.0599999999999 290.29 37.05C294.3400000000001 44.85 298.4700000000001 52.61 302.63 60.36C303.33 61.67 304.07 62.98 305.19 63.97C306.94 65.54 309.03 66.66 311.17 67.6C314.05 68.82 317.07 69.79 320.2 70.02C326.78 70.64 333.31 69.27 339.76 68.17C343.45 67.59 347.16 66.9999999999999 350.89 66.7599999999999C354.63 66.6599999999999 358.37 66.7099999999999 362.1 67.0399999999999C370.65 67.9599999999999 379.09 69.9999999999999 387.04 73.2899999999999C392.34 75.5299999999999 397.5 78.1199999999999 402.35 81.2199999999999C413.81 88.4299999999999 423.81 97.7899999999999 432.39 108.2299999999999C433.56 109.6499999999999 434.64 111.1299999999999 435.85 112.5099999999999C434.65 109.2699999999999 433.18 106.1399999999999 431.69 103.0299999999999C430.44 100.1299999999999 428.85 97.4199999999999 427.42 94.6099999999998C422.26 84.9799999999999 416.4 75.6999999999998 409.67 67.0899999999999C405.64 61.8799999999999 401.14 57.0399999999999 396.34 52.5199999999999C389.7 46.4699999999999 382.27 41.1499999999999 373.91 37.7599999999999C365.7 34.3899999999999 356.6 33.1299999999999 347.82 34.4699999999999C344.26 35.0499999999998 340.81 36.1599999999999 337.41 37.3499999999999C334.62 38.3199999999999 332.02 39.7299999999999 329.38 41.0399999999999C325.95 42.7499999999998 322.74 44.8499999999999 319.67 47.1199999999998C322.38 44.0599999999998 325.36 41.2599999999998 328.37 38.5099999999998C332.64 34.7499999999998 337.11 31.1999999999998 342 28.2799999999998C345.98 25.8299999999998 350.29 23.8799999999998 354.84 22.7699999999998C356.3 22.3999999999998 357.8 22.3099999999998 359.29 22.1699999999998C358.04 21.0699999999998 356.66 20.1299999999998 355.3 19.1899999999998C345.69 12.6499999999998 335.29 7.3299999999998 324.61 2.7599999999998C303.75 -5.9400000000002 281.44 -11.2100000000003 258.87 -12.5800000000002C254.21 -12.8200000000002 249.55 -12.9400000000002 244.89 -12.9400000000002C239.91 -12.8300000000002 234.92 -12.8100000000002 229.97 -12.2900000000002C218.77 -11.5300000000003 207.68 -9.5600000000002 196.8 -6.8600000000002C186.45 -4.1500000000003 176.25 -0.7400000000002 166.5 3.6899999999998C157.7899999999999 7.5499999999998 149.38 12.1099999999998 141.5099999999999 17.4799999999998C139.6799999999999 18.7899999999998 137.7699999999999 20.0099999999998 136.1399999999999 21.5599999999998C142.7399999999999 22.7499999999998 149.1699999999999 24.9499999999998 155.13 28.0399999999998C160.87 30.8999999999998 166.12 34.6999999999998 170.7599999999999 39.1099999999998C173 41.2999999999998 175.0499999999999 43.6999999999998 176.9499999999999 46.1999999999998C173.5199999999999 44.0699999999998 170.0199999999999 42.0499999999998 166.3299999999999 40.4199999999998C161.9199999999999 38.2599999999998 157.2599999999999 36.6499999999998 152.5199999999999 35.3999999999998C146.7899999999999 33.8799999999998 140.7799999999999 33.6699999999998 134.9099999999999 34.2599999999998C126.7799999999999 35.2099999999998 119.0499999999999 38.5299999999998 112.3999999999999 43.2399999999998C108.0799999999999 46.1799999999998 104.1799999999999 49.6699999999998 100.4399999999999 53.2999999999998C90.5099999999999 63.4599999999999 82.2399999999999 75.1099999999998 74.7799999999999 87.1599999999999C70.8399999999999 93.4299999999998 67.2499999999999 99.9099999999999 63.6599999999999 106.3799999999999C62.6099999999999 108.4199999999999 61.5099999999999 110.4299999999999 60.4799999999999 112.4799999999999C63.3299999999999 109.5599999999999 66.0499999999999 106.5099999999999 68.9099999999999 103.5999999999999C77.8999999999999 94.6299999999999 87.4699999999999 86.1599999999999 98.0699999999999 79.1199999999999C105.6199999999999 74.2199999999999 113.7399999999999 69.8899999999999 122.6299999999999 68.0899999999999C125.7399999999999 67.3599999999999 128.9499999999999 67.6199999999999 132.0999999999999 67.2799999999999C134.8699999999999 66.9999999999999 137.6599999999999 67.0799999999999 140.4399999999999 66.9799999999999C145.4899999999999 66.9199999999999 150.5499999999999 66.9399999999999 155.5999999999999 67.1399999999999C159.2499999999999 67.3 162.8699999999999 67.8 166.4899999999999 68.2299999999999C168.5599999999999 68.4799999999999 170.5999999999999 68.9399999999999 172.6299999999999 69.4299999999999C176.5099999999999 70.3799999999999 180.7399999999999 70.3899999999999 184.4599999999999 68.8199999999999C189.2199999999999 66.9699999999999 192.8999999999999 63.1799999999999 195.8399999999999 59.1099999999999C197.9999999999999 56.0899999999999 199.8999999999999 52.8899999999999 201.4999999999999 49.5299999999999C202.6599999999999 47.0999999999999 203.9599999999999 44.7399999999999 205.0499999999999 42.2699999999999C206.0499999999999 40.0299999999999 207.1999999999999 37.8499999999999 208.4699999999999 35.7499999999999C209.1399999999999 34.73 209.8699999999999 33.6 211.0899999999999 33.1999999999999C212.1499999999999 33.9499999999999 212.7999999999999 35.11 213.3699999999999 36.2299999999999C215.4699999999999 40.3899999999999 216.7899999999999 44.8799999999999 218.2599999999999 49.2799999999999C220.2799999999999 55.8699999999999 222.0399999999999 62.5499999999999 223.4499999999999 69.2999999999999C225.6599999999999 78.5499999999999 226.6999999999999 88.0199999999999 227.9899999999999 97.4299999999999C228.5499999999999 101.4099999999999 228.8199999999999 105.4199999999999 229.2999999999999 109.3999999999999C230.1699999999999 120.0399999999999 231.1999999999999 130.6699999999999 231.5399999999999 141.3399999999999C231.6199999999999 143.1999999999999 231.7799999999999 145.0499999999999 231.7899999999999 146.9099999999999C231.7999999999999 151.2599999999999 232.0399999999999 155.5999999999999 232.0099999999999 159.9399999999999C231.9999999999999 162.3199999999999 231.9999999999999 164.6999999999999 232.0099999999999 167.0699999999999C232.0599999999999 172.1399999999999 231.8099999999999 177.2099999999999 231.7899999999999 182.2799999999999C231.5899999999999 188.8899999999999 231.0799999999999 195.4799999999999 230.4999999999999 202.0599999999999C229.7699999999999 207.9399999999999 228.9499999999999 213.8399999999999 227.3799999999999 219.5699999999999C225.3299999999999 227.3199999999999 221.7899999999999 234.5999999999999 217.5799999999999 241.3899999999999C214.4199999999999 246.4599999999999 210.7899999999999 251.2699999999999 206.4899999999999 255.4199999999999C202.6099999999999 259.2799999999999 197.9099999999999 262.4999999999999 192.5499999999999 263.8699999999999C191.0499999999999 264.2799999999999 189.4899999999999 264.3199999999998 187.9599999999999 264.5099999999998C188.0299999999999 267.4999999999999 188.6599999999999 270.4399999999999 189.2199999999999 273.3599999999998C190.8099999999999 281.0699999999998 193.0199999999999 288.6599999999999 195.9799999999999 295.9599999999998C197.4999999999999 299.9899999999998 199.3899999999999 303.8599999999998 201.3699999999998 307.6799999999999C204.8199999999998 314.2399999999998 208.9899999999999 320.4699999999998 213.8299999999999 326.1399999999998zM245.1 324.44C245.45 324.5 245.81 324.56 246.17 324.63C246.36 322.84 246.26 321.05 246.27 319.26V281.13C246.26 279.39 246.4 277.64 246.12 275.91C245.76 275.94 245.41 275.9600000000001 245.06 275.9600000000001C244.11 279.7100000000001 243.34 283.51 242.44 287.27C242.06 288.8 241.86 290.36 241.37 291.86C239.67 292.1 237.94 292.03 236.22 292.06C231.16 292.07 226.09 292.06 221.03 292.07C219.37 292.08 217.71 291.98 216.05 292.1C216.02 292.49 215.79 293.01 216.21 293.28C217.49 293.93 218.93 294.16 220.27 294.63C223.7 295.77 227.15 296.79 230.58 297.94C231.97 298.42 233.48 298.66 234.74 299.48C234.78 300.04 234.76 300.61 234.69 301.16C233.46 301.7100000000001 232.16 302.03 230.88 302.44C227.75 303.4700000000001 224.59 304.4 221.47 305.4600000000001C219.68 306.0800000000001 217.8 306.4600000000001 216.06 307.25C216.03 307.62 215.99 307.98 215.95 308.3400000000001C221.04 308.53 226.15 308.28 231.25 308.4600000000001C234.61 308.5900000000001 237.98 308.38 241.34 308.53C241.46 308.92 241.6 309.3 241.71 309.69C242.79 314.63 244.04 319.52 245.1 324.44zM251.07 324.64C251.43 324.5900000000001 251.79 324.52 252.15 324.44C253.13 320.5900000000001 253.88 316.68 254.86 312.83C255.2200000000001 311.41 255.42 309.95 255.89 308.56C258.42 308.38 260.9600000000001 308.57 263.5 308.51C268.6600000000001 308.39 273.83 308.39 278.99 308.44C279.75 308.45 280.51 308.41 281.27 308.36C281.23 308 281.2 307.64 281.17 307.28C279.35 306.45 277.39 306.03 275.5 305.39C271.7699999999999 304.16 268.0199999999999 303 264.2799999999999 301.82C263.7099999999999 301.65 263.1599999999999 301.4 262.6099999999999 301.18C262.4599999999999 300.63 262.4299999999999 300.06 262.4899999999999 299.49C263.3599999999999 299.01 264.3099999999999 298.68 265.2599999999999 298.4C270.1399999999999 296.88 274.9899999999999 295.26 279.8899999999999 293.8C280.2699999999999 293.67 280.6699999999999 293.53 281.0199999999999 293.31C281.4199999999999 293.04 281.2499999999999 292.52 281.1699999999999 292.13C279.5099999999998 292 277.8599999999999 292.1 276.1999999999998 292.09C271.0299999999998 292.08 265.8699999999999 292.1 260.6999999999998 292.08C259.0899999999998 292.05 257.4799999999998 292.1 255.8799999999998 291.87C255.3599999999998 290.2 255.1599999999999 288.45 254.7099999999999 286.76C253.7699999999999 283.19 253.1899999999999 279.52 252.1699999999999 275.98C251.8099999999999 275.97 251.4599999999999 275.9599999999999 251.1099999999999 275.92C250.8199999999999 277.65 250.9599999999999 279.4 250.9599999999999 281.14V319.27C250.9799999999999 321.05 250.8799999999998 322.85 251.0699999999999 324.64zM65.05 279.67C66.17 281.82 67.13 284.07 68.42 286.13C66.6 278.57 65.51 270.86 64.8 263.13C64 255.42 63.95 247.64 64.26 239.9C65.31 219.96 69.8 200.07 78.49 182.02C81.48 176.03 84.84 170.19 88.99 164.91C95.11 157.44 101.52 150.15 108.83 143.82C113.63 139.72 118.82 136.04 124.37 133.02C127.64 131.37 130.88 129.63 134.31 128.34C139.32 126.31 144.5 124.73 149.73 123.4C153.56 122.44 157.51 121.99 161.25 120.69C166.25 119.12 170.72 116.08 174.28 112.26C179.21 107.03 182.37 100.39 184.48 93.59C185.47 90.69 186.07 87.68 186.65 84.67C186.8 83.92 186.87 83.15 186.81 82.3799999999999C180.31 79.6 173.55 77.3199999999999 166.55 76.1999999999999C162.44 75.42 158.26 75.2099999999999 154.09 75.12C143.84 74.8799999999999 133.62 76.8799999999999 123.97 80.24C120.23 81.66 116.48 83.09 112.94 84.96C104.88 88.8 97.3 93.66 90.48 99.42C87.56 101.97 84.65 104.55 82.08 107.4499999999999C72.92 117.2799999999999 65.78 128.86 60.29 141.0999999999999C57.9 146.6499999999999 55.68 152.2799999999999 53.92 158.0599999999999C52.75 161.9999999999999 51.56 165.9499999999999 50.66 169.9699999999999C49.91 172.9099999999999 49.44 175.9199999999999 48.79 178.8899999999999C48.33 181.0299999999999 48.1 183.2099999999999 47.76 185.37C46.91 190.8 46.48 196.3 46.43 201.8C46.54 207.98 46.68 214.17 47.5 220.3C47.9 223.16 48.17 226.04 48.65 228.9C49.63 234.6 50.79 240.27 52.36 245.83C55.45 257.48 59.84 268.78 65.05 279.67zM428.7800000000001 286.11C429.8800000000001 284.45 430.6900000000001 282.63 431.56 280.85C433.6600000000001 276.4 435.8 271.95 437.58 267.36C445.19 248.6 449.88 228.57 450.62 208.31C450.64 206.55 450.69 204.79 450.73 203.02C450.86 193.45 449.4600000000001 183.93 447.55 174.57C446.82 170.98 446.01 167.4 444.9700000000001 163.88C440.93 149.16 434.9700000000001 134.88 426.56 122.1C418.35 109.53 407.55 98.55 394.7200000000001 90.69C388.99 87.1 382.93 84.05 376.67 81.5C370.8900000000001 79.31 364.9600000000001 77.47 358.87 76.39C352.4700000000001 75.34 345.96 74.87 339.4700000000001 75.16C331.55 75.64 323.6900000000001 77.23 316.2600000000001 80.01C314.3200000000001 80.81 312.3200000000001 81.47 310.4200000000001 82.34C310.2100000000001 83.85 310.6700000000001 85.33 310.9500000000001 86.8C312.1100000000001 92.54 313.98 98.16 316.6500000000001 103.3799999999999C319.0200000000001 107.8899999999999 322.17 112.0299999999999 326.11 115.2799999999999C328.54 117.3299999999999 331.35 118.8899999999999 334.2700000000001 120.1099999999999C337.85 121.6099999999999 341.7400000000001 122.0799999999999 345.5100000000001 122.9399999999999C352.7400000000001 124.6499999999999 359.8800000000001 126.8699999999999 366.6600000000001 129.9399999999999C377.0100000000001 134.5899999999999 386.37 141.3199999999999 394.31 149.3999999999999C395.9 151.0099999999999 397.54 152.5799999999999 399.05 154.2699999999999C402.42 158.0299999999999 405.76 161.8399999999999 408.9000000000001 165.7999999999999C416.3800000000001 175.8699999999998 421.7200000000001 187.3899999999998 425.61 199.2799999999998C427.19 204.5799999999999 428.82 209.8799999999998 429.82 215.3299999999999C430.45 218.1999999999999 430.86 221.1099999999999 431.34 224.0099999999999C432.21 230.0999999999999 432.93 236.2299999999999 433.02 242.3899999999999C433.14 249.0399999999999 433.16 255.7099999999999 432.49 262.3299999999998C431.76 270.3199999999998 430.62 278.2899999999999 428.7800000000001 286.1099999999999z" />
+    <glyph glyph-name="opencart"
+      unicode="&#xF23D;"
+      horiz-adv-x="640" d=" M423.3 7.3C423.3 -18 403 -38.3 377.7 -38.3S331.9 -18 331.9 7.3S352.5 53.1 377.7 53.1C403.1 53.1 423.3 32.6 423.3 7.3zM169.4 53.1C144.1 53.1 123.8 32.5 123.8 7.3S144.1 -38.3 169.4 -38.3S215.2 -18 215.2 7.3S194.7 53.1 169.4 53.1zM461.1 323.1C158.9 323.1 81.9 335.9 0 422.3C34.4 370.6 53.3 273.4 373.1 278.1C706.4000000000001 283.1 503.1 192 443.9000000000001 89.2000000000001C630.6 255.9000000000001 763.3 323.1 461.1 323.1z" />
+    <glyph glyph-name="openid"
+      unicode="&#xF19B;"
+      horiz-adv-x="448" d=" M271.5 16L203.5 -16C88.5 -5.7 0 55.5 0 129.8C0 201.3 82.5 260.8 191.7 274.1V231.1C120.2 218.6 67.7 178.1 67.7 129.8C67.7 78.8 126.2 36.5 203.4 26.8V366.8L271.4 400V16zM448 157L316.7 185.5L353.5 206.2C334 217.7 310 226.2 283.5 231V274C329.7 268.5 371.2 254.5 403.8 234.7L438.8 254.5L448 157z" />
+    <glyph glyph-name="opera"
+      unicode="&#xF26A;"
+      horiz-adv-x="496" d=" M313.9 415.3C143.7 415.3 61.3 191.5 166.4 60.2C202.9 14.8 255 -15.4 313.9 -15.4C350.2 -15.4 384.2 -4.3 413.3 15C369.5 -24.2 311.4 -48 248 -48C244.1 -48 240 -48 236.1 -47.7C104.6 -41.6 0 66.9 0 200C0 337 111 448 248 448H248.8C311.9000000000001 447.7 369.5 423.9 413.2000000000001 384.9C384.2000000000001 404.3 350.1 415.3 313.9000000000001 415.3zM415.7 17.6C374.8 -7.1 325 -6 283.7 23.4C339.9 43.9 381.4 115 381.4 200C381.4 284.7000000000001 340.2 355.8000000000001 284 376.6C325.8 405.8 375.2 406.9000000000001 416.9 381.6C522.8 282.9000000000001 522.4 115.9 415.7 17.6z" />
+    <glyph glyph-name="optin-monster"
+      unicode="&#xF23C;"
+      horiz-adv-x="576" d=" M550.671 -2.303C550.671 -13.923 534.998 -21.76 518.513 -17.166C506.353 -13.923 487.167 0.399 482.302 10.128C476.628 21.748 486.356 42.826 501.218 40.934C516.892 39.313 550.671 15.533 550.671 -2.3030000000001zM372.86 372.777C369.077 444.928 272.064 452.495 246.932 396.2870000000001C291.5200000000001 420.608 337.189 411.9600000000001 372.86 372.777zM74.795 40.934C59.122 39.313 25.343 15.533 25.343 -2.303C25.343 -13.923 41.016 -21.76 57.5 -17.166C69.66 -13.923 88.576 0.399 93.44 10.128C99.386 21.748 89.658 42.826 74.795 40.934zM572.56 26.612C573.641 23.099 574.452 19.586 574.452 15.803C575.262 -15.813 530.135 -48.242 500.949 -49.322C483.654 -50.132 466.359 -40.945 458.253 -25.812C344.7560000000001 -29.865 231.2590000000001 -30.676 118.033 -25.812C109.656 -40.945 92.361 -49.862 75.066 -49.322C46.151 -48.241 1.023 -15.813 1.563 15.803C1.833 19.586 2.374 23.099 3.455 26.612C-2.111 36.075 -1.39 41.894 8.86 38.232C12.103 43.366 15.886 47.6900000000001 19.94 52.014C17.37 62.931 21.21 66.108 31.019 61.202C35.613 64.445 41.017 67.687 46.963 70.39C46.963 86.147 58.802 81.521 64.258 76.065C76.725 77.845 84.387 75.356 91.011 70.39V90.116C78.024 90.116 50.37 101.491 45.071 126.328C40.097 147.053 47.678 164.403 70.203 173.888C71.013 179.833 78.31 187.94 85.065 189.832C92.632 191.724 97.496 185.238 99.117 179.563C106.542 179.563 116.874 178.098 120.195 171.456C125.6 171.997 131.274 172.808 136.679 173.348C134.2470000000001 175.24 131.545 176.861 128.572 177.942C123.438 186.859 114.79 189.021 103.981 189.562C103.981 190.372 103.981 191.183 104.251 192.264C84.524 192.805 60.203 197.939 49.394 210.099C28.073 233.737 33.459 293.6760000000001 61.554 313.5970000000001C69.931 319.2720000000001 83.172 314.408 84.253 303.8690000000001C86.678 283.271 84.652 277.0360000000001 110.465 277.927C118.572 285.7630000000001 127.22 292.519 136.948 297.9240000000001C122.086 299.2760000000001 108.034 296.303 93.17 294.1410000000001C105.922 306.6210000000001 117.123 319.5830000000001 149.918 336.5680000000001C173.429 348.4580000000001 199.911 357.3760000000001 226.123 359.807C207.477 367.6440000000001 186.13 371.6980000000001 166.402 376.2910000000001C242.877 392.5050000000001 340.971 398.4500000000001 410.691 338.7290000000001C428.796 323.326 443.118 302.5180000000001 453.3869999999999 278.7370000000001C493.1859999999999 273.884 489.857 284.3180000000001 492.03 303.8690000000001C493.111 314.1380000000001 506.352 319.2720000000001 514.7289999999999 313.3270000000001C529.5909999999999 302.7880000000001 536.8879999999999 282.5210000000001 539.319 265.2260000000001C541.481 247.3910000000001 539.5889999999999 223.8810000000001 526.889 210.0990000000001C516.08 197.9390000000001 492.569 192.5340000000001 473.113 191.994V189.2910000000001C462.033 189.0210000000001 452.845 186.859 447.44 177.6710000000001C444.468 176.59 441.766 174.9680000000001 439.063 173.0770000000001C444.738 172.537 450.413 171.7260000000001 455.818 171.186C457.687 176.8050000000001 468.353 179.5630000000001 476.895 179.5630000000001C478.516 184.968 483.651 191.453 490.947 189.8320000000001S504.999 179.8340000000001 505.81 173.888C516.619 169.564 527.969 161.728 530.941 148.216C532.8330000000001 140.109 532.562 133.083 531.211 126.328C525.485 101.066 497.85 90.116 485.272 90.116C485.272 83.36 485.272 76.8750000000001 485.002 70.39C493.012 76.3960000000001 501.369 77.5480000000001 511.754 76.0650000000001C517.673 81.984 529.3190000000001 85.4750000000001 529.3190000000001 70.39C534.994 67.6870000000001 540.6680000000001 64.4450000000001 545.263 61.2020000000001C555.363 66.253 558.932 61.741 556.072 52.0140000000001C560.125 47.6910000000001 564.179 43.0970000000001 567.151 38.2320000000001C577.2869999999999 41.8520000000001 578.1719999999999 36.1540000000001 572.56 26.6120000000001zM498.7869999999999 280.6280000000001C516.0819999999999 273.872 524.9989999999999 258.4690000000001 529.0519999999999 244.9580000000001C530.1329999999999 255.497 526.3499999999999 284.4110000000001 515.2699999999999 296.0310000000001C507.9739999999999 303.327 501.2179999999998 301.165 501.2179999999998 295.221C501.2189999999998 289.005 499.8679999999998 283.601 498.7869999999999 280.6280000000001zM480.1409999999999 268.198C493.1119999999999 252.525 497.1649999999999 226.583 492.8409999999999 205.235C503.6499999999999 207.397 513.3779999999999 211.45 519.0529999999999 217.395C520.9449999999999 219.557 522.8359999999999 222.259 523.9169999999999 224.961C522.8359999999999 246.3090000000001 513.6479999999999 267.658 494.1919999999999 273.8730000000001C490.9499999999999 270.63 485.0049999999999 269.009 480.1409999999999 268.198zM458.2519999999999 267.387C465.8189999999999 246.85 470.6829999999999 224.691 472.5739999999999 202.802C476.0869999999999 202.802 480.1409999999999 203.072 484.1939999999999 203.613C490.1389999999999 227.9340000000001 483.9239999999999 255.2270000000001 470.1419999999999 267.117C466.3589999999999 267.117 462.0349999999999 267.117 458.2519999999999 267.3870000000001zM77.768 280.628C76.687 283.601 75.336 289.005 75.336 295.221C75.336 301.166 68.31 303.328 61.284 296.031C49.934 284.411 46.421 255.497 47.502 244.958C51.555 258.47 60.473 273.873 77.768 280.628zM83.443 205.234C79.119 226.582 83.173 252.525 96.144 268.197C91.279 269.008 85.335 270.629 82.092 273.872C62.635 267.657 53.717 246.309 52.366 224.96C53.717 222.258 55.338 219.556 57.23 217.394C62.905 211.179 72.633 207.396 83.443 205.234zM124.788 266.307C119.654 265.226 114.79 263.334 109.926 261.442L97.766 256.308V256.578C90.47 242.526 87.767 222.259 92.361 203.613C96.955 203.072 101.008 202.802 105.061 202.802C107.493 224.961 114.249 246.58 124.788 266.307zM212.883 289.546C212.883 247.391 247.202 213.341 289.088 213.341S365.293 247.391 365.293 289.546C365.293 331.432 330.974 365.481 289.088 365.481S212.883 331.432 212.883 289.546zM365.293 192.263C375.262 141.655 368.592 127.571 381.777 134.164C397.721 142.271 404.476 173.347 404.747 191.183C391.776 191.993 378.534 191.993 365.293 192.263zM293.682 192.804V193.074C293.4120000000001 187.94 293.952 154.971 298.0060000000001 151.999C309.0850000000001 146.594 337.4590000000001 147.405 349.079 150.918C354.484 152.5389999999999 351.511 187.94 350.7 192.804C331.784 193.074 312.598 193.074 293.682 192.804zM279.629 192.804V193.074C260.173 192.804 240.987 192.804 221.8 192.263C219.908 183.076 217.206 143.352 223.692 140.649C236.663 134.974 265.308 135.515 278.278 139.028C282.8730000000001 141.46 280.711 184.427 279.629 192.804zM193.967 135.244C199.372 132.812 202.614 132.812 203.695 139.568C205.587 148.215 206.127 176.32 208.56 191.723C196.4 191.453 183.969 190.912 171.808 190.102C166.403 170.375 172.078 144.973 193.967 135.244zM128.301 146.324C172.079 99.304 220.99 60.661 284.2240000000001 39.8539999999999C351.7820000000001 59.0399999999999 399.8830000000001 99.8449999999999 447.4430000000001 146.8649999999999C436.348 151.1799999999999 439.7280000000001 157.2279999999999 440.1470000000001 158.4849999999999C431.2290000000001 159.2949999999999 422.3120000000001 160.3769999999999 413.6640000000001 161.1869999999999C404.206 128.2189999999999 377.7240000000001 108.2219999999999 366.9140000000001 129.5709999999999C364.2120000000001 134.7049999999999 363.4010000000001 141.1909999999999 362.3200000000001 146.3249999999999C358.5370000000001 137.9479999999999 349.0780000000001 138.218 337.7290000000001 137.4069999999999C324.4880000000001 136.3259999999999 306.112 136.0559999999999 293.6810000000001 140.3789999999999C290.7090000000001 127.4079999999999 282.6020000000001 127.4079999999999 266.9290000000001 126.0569999999999C252.8770000000001 124.7049999999999 218.287 122.0029999999999 212.072 136.8659999999999C210.9910000000001 108.2219999999999 176.942 126.868 166.9430000000001 143.892C163.7000000000001 149.567 161.5380000000001 155.242 159.917 161.4569999999999C152.0800000000001 160.6469999999999 144.244 159.836 136.406 158.755C138.8490000000001 155.0919999999999 137.9550000000001 149.7029999999999 128.3010000000001 146.324zM115.6 -5.545C109.926 17.694 96.954 44.177 82.092 48.501C59.663 55.257 13.183 24.991 15.885 -6.085C28.586 -25.542 55.879 -41.755 75.066 -42.566C92.901 -43.376 111.006 -31.486 114.79 -13.652C115.329 -11.22 115.6 -8.518 115.6 -5.5450000000001zM122.896 0.399C156.405 19.856 192.075 36.07 228.827 47.419C190.184 67.956 160.729 95.25 131.544 124.435C129.382 123.083 126.41 122.003 123.708 120.922C122.071 116.012 132.426 115.5920000000001 129.113 108.491C126.951 104.4370000000001 120.465 100.924 113.98 99.3030000000001C111.819 96.6010000000001 108.846 94.4390000000001 106.144 92.818H105.874C105.604 79.307 105.604 65.794 106.144 52.283C115.083 36.319 121.57 18.969 122.896 0.399zM443.6600000000001 -12.301C406.908 9.047 369.6160000000001 29.044 328.0010000000001 40.664C314.2190000000001 34.449 300.168 29.315 285.846 25.261C283.6840000000001 24.45 283.6840000000001 24.45 281.522 25.261C269.632 29.044 258.283 33.3679999999999 246.663 38.502C206.398 26.8819999999999 169.377 9.317 134.247 -12.301H133.977V-12.571C134.247 -12.571 134.247 -12.571 134.247 -12.301C237.474 -16.355 340.702 -15.814 443.66 -12.301zM470.683 51.744L470.4130000000001 51.474C470.9540000000001 65.256 471.224 79.037 471.224 92.8190000000001C468.251 94.4400000000001 465.549 96.8730000000001 463.1170000000001 99.5750000000001C456.6320000000001 100.9260000000001 450.1460000000001 104.7090000000001 447.9840000000001 108.4930000000001C446.0920000000001 112.5460000000001 449.3350000000001 116.059 453.9290000000001 118.7620000000001C453.6590000000001 119.3030000000001 453.3880000000001 120.3830000000001 453.3880000000001 121.1940000000001C450.4160000000001 122.0050000000001 447.9830000000001 123.0860000000001 445.8210000000001 124.4370000000001C414.2050000000001 94.9820000000001 380.4250000000001 67.6880000000001 342.3230000000001 47.6910000000001C381.2370000000001 36.0710000000001 418.2580000000001 19.5870000000001 454.1980000000001 0.1300000000001C455.2480000000001 14.8220000000001 461.4290000000001 35.8790000000001 470.6830000000001 51.7440000000001zM493.9230000000001 48.5C479.33 44.177 466.0890000000001 17.694 460.414 -5.546C460.414 -29.372 481.6920000000001 -43.443 500.948 -42.568C520.134 -41.757 547.428 -25.544 560.129 -6.087C563.102 24.99 516.6220000000001 55.257 493.923 48.5zM290.709 313.867C290.754 313.867 290.798 313.8640000000001 290.843 313.8640000000001C290.889 313.8640000000001 290.933 313.867 290.9790000000001 313.867H290.7090000000001zM290.709 217.124C319.354 217.124 342.593 238.742 342.593 265.495C342.593 301.587 302.086 323.574 270.442 309.813C279.9000000000001 306.841 286.926 298.193 286.926 288.195C286.926 264.938 253.635 256.24 240.446 276.8450000000001C233.149 242.778 259.814 217.124 290.709 217.124zM68.039 -26.083C68.579 -32.569 80.199 -38.784 89.657 -35.5410000000001C96.413 -32.8380000000001 104.25 -25.0020000000001 106.952 -19.3270000000001C109.925 -12.301 105.871 0.67 97.224 -0.9520000000001C88.307 -2.573 67.499 -17.7060000000001 68.039 -26.0830000000001zM478.789 -0.952C470.412 0.669 466.358 -12.301 469.331 -19.327C471.763 -25.002 479.6 -32.838 486.626 -35.541C495.813 -38.784 507.704 -32.569 507.974 -26.083C508.785 -17.706 487.707 -2.573 478.789 -0.952z" />
+    <glyph glyph-name="osi"
+      unicode="&#xF41A;"
+      horiz-adv-x="495.8" d=" M0 188.8C2.3 324.6 97.4 421.2 213.8 436.9C352.6 455.5 469.4 361.1 491.8 235.8C513.1 117 447.8 5.8 340.2000000000001 -38.2C330.9000000000001 -42 325.8000000000001 -39.9 322.2000000000001 -30.5C304.4000000000001 15.8 286.6 62.2 268.8000000000001 108.5C265.7000000000001 116.6 267.8000000000001 121.7 275.8000000000001 125.3C300.0000000000001 136.3 315.1000000000001 154.7 319.1000000000001 181.1C325.5000000000001 223.5 294.6000000000001 259.8 254.6000000000001 263.3C215.6000000000001 266.7000000000001 182.8000000000001 239.6 177.1000000000001 203.6C171.9000000000001 170.6 188.2000000000001 139.9 219.0000000000001 125.9C228.6000000000001 121.5000000000001 230.5000000000001 117.3 226.8000000000001 107.5000000000001C208.9000000000001 60.9 191.0000000000001 14.3000000000001 173.1000000000001 -32.4C170.5000000000001 -39.3 164.8000000000001 -41.7 157.6000000000001 -38.9C105.0000000000001 -18.6 56.2000000000001 22.1 26.8000000000001 80.1C1.9 129.3 1.6 167.8 0 188.8zM20.9 190.7C21.3 184.1 21.5 176.4 22.2 168.6C28.5 96.6999999999999 71.8 25.1 153.2 -14.5C156.4 -16 157.6 -15.3 158.8 -12.2C173.7 26.9 188.7 66 203.8 105.1C205.1 108.4 204.4 109.9 201.4 111.8C169.8 131.7 154.1 160.3 155.8 197.8C156.8 219.4 165.1 238.3 179.6 254.1C209.6 286.8 256.6 293.9000000000001 295.1 271.7000000000001C327 253.3 344.6 217.9 340.3 181.3C336.7 150.7 321 127.4 294.6 111.5C291.9000000000001 109.9 291.1 108.6 292.3 105.5C307.5 66.3 322.5 27.1 337.5 -12.2C338.7 -15.3 339.9 -16 343.1 -14.5C378.6 2.1 408.3 25.8 431.2000000000001 57.5C466.0000000000001 105.7 480.3000000000001 159.4 473.5000000000001 218.5C459.8 336 354.1 433.3 218 416.5C111.9 403.5 22.7 314 20.9 190.7z" />
+    <glyph glyph-name="page4"
+      unicode="&#xF3D7;"
+      horiz-adv-x="496" d=" M248 -56C111 -56 0 55 0 192S111 440 248 440C268.9 440 289.3 437.4 308.7 432.5L42.3 56H248V-56zM248 87.6V301.2L98.6 87.6H248zM344 56V-36.7C389.7 -17.5 428.5 15 455.4 56H344zM401.4 194.2L380.2 185.8L401.4 177.5V194.2zM381.1 139.7C374.4 139.7 373.1 133.4 373.1 126.8V119.1H389.3V129.1C389.3 135 387 139.7000000000001 381.1 139.7000000000001zM496 192C496 154.7 487.8 119.3 473 87.6H344V420.7C433.3 383.2 496 294.9 496 192zM360.4 304.4H428.6V352H414.7V319.4H400.8V349H386.9000000000001V319.4H374.2000000000001V352H360.3000000000001V304.4zM428.5 119.1H402V130.1C402 145.5 396.4 155.3 381.1 155.3C365.7000000000001 155.3 360.4000000000001 144.7 360.4000000000001 129.4V104.1H428.6V119.1zM428.5 222.1L360.3 192.4V180L428.5 150.5V167.1L414.1 172.8V199.3L428.5 205.2V222.1zM423.7 290.6H388.1V264H402V276.2H413C421.6 260.4 414.3 240.9 394.4 240.9C371.9 240.9 366.1 266.2 378.9 278.6L367.3 289.2C351.1 271.7 355.1 225.3 394.4 225.3C428.4 225.3 439.1 261.2 423.7 290.6z" />
+    <glyph glyph-name="pagelines"
+      unicode="&#xF18C;"
+      horiz-adv-x="384" d=" M384 135.3C328.9 -1.4 196.9 81.3 196.9 81.3C156.4 -0.5 89.5 -53.1 12.3 -53.4C-3.8 -53.4 -4.3 -29 12.3 -29C76.7 -28.7 132.8 13.7 169.5 81.1C128.4 65.2000000000001 50.9 53.2 7.9 163.3C116.9 208.2 167 152.1 186.2 117.8C196.1 142.2 203.2 168.7 207.8 197.5C207.8 197.5 68.1 175.6 58.3 295.6C177.4 343.5 210.9 218.9 210.9 218.9C212.5 235.6 214.2 271.5 214.2 272.3C214.2 272.3 107.9 346 176.1 437.5C300.7000000000001 394.5 237.5000000000001 275.1 237.5000000000001 275.1C238.0000000000001 273.5 238.0000000000001 251.3 237.5000000000001 241.7C237.5000000000001 241.7 282.7000000000001 330.7 373.9000000000001 299.2C369.7000000000001 165.1999999999999 232.0000000000001 192.8 232.0000000000001 192.8C227.6 165.4 220.8000000000001 139.4 212 115.3C212 115.3 295 207.1 384 135.3z" />
+    <glyph glyph-name="palfed"
+      unicode="&#xF3D8;"
+      horiz-adv-x="576" d=" M384.9 254.1C384.9 301.5 329.7 298.3 289.5 283.9C288.2 244.5 287 203.2 286.5 164.1C287.2 161.3 289.1 157.9 301.6 157.9C338.4000000000001 157.9 385 200.7000000000001 384.9000000000001 254.1zM190.4 181.9C190.6 181.9 196.9 184.6 201.6 184.6C228.2 184.6 222.3 140.5 187.2 140.5C165.7 140.5 150.1 158.6 150.1 183.5C150.1 225.5 193 279.0999999999999 250.8 310C251.8 322.4 253.8 332 261.3 338.2C272.5 347.2 287.9 341.7 290.8 327.1C363 349.3 426 326.1 426 255.1C426 177.1999999999999 346.7 102.5 285.9 116.9C285.8 77.5 286.8 42.5 288.6 16.9V16.7C288.8 13.3 289.2 4.2 283.3 -2.4C273.7 -13.0000000000001 249.9 -12.4 246.9 19.9C242.8 64.3 247.1 226 248.3 262.4C226.8 247.4 189.8 212.1 189.8 186.5C190 184 190.2 182.5 190.4 181.9zM8 266.9S7.9 229.5 46.4 229.5H76.4L98.8 12.3S98.8 -32 143.5 -32H432.4S477.1 -31.6 477.1 12.3L499.4999999999999 229.5H529.5S567.9 228.3 567.9 266.9C567.9 266.9 568 304.3 529.5 304.3H499.4C492.1 329.9 469.2 378.6 380 378.6H352V397.7S349.3 416.1 330.9 416.1H245.1S224 416.1 224 397.7V378.6H195.9S90.9 374.4 75.4 304.3H46.4S8 305.5 8 266.9z" />
+    <glyph glyph-name="patreon"
+      unicode="&#xF3D9;"
+      horiz-adv-x="512" d=" M512 253.2C512 151.9 429.6 69.4 328.2 69.4C226.5 69.4 143.8 151.8 143.8 253.2C143.8 354.8 226.5 437.5 328.2 437.5C429.6 437.5 512 354.8 512 253.2zM0 -53.5H90V437.5H0V-53.5z" />
+    <glyph glyph-name="paypal"
+      unicode="&#xF1ED;"
+      horiz-adv-x="384" d=" M111.4 152.1C107.9 132.9 94 43.4 89.9 18.1C89.6 16.3 88.9 15.6 86.9 15.6H12.3C4.7 15.6 -0.8 22.2 0.2 29.5L58.8 401.4C60.3 411 68.9 418.3 78.8 418.3C231.1 418.3 243.9 422 282.8 406.9C342.9000000000001 383.6 348.4 327.4 326.8 266.6C305.3 204 254.3 177.1 186.7 176.3C143.3 175.6 117.2 183.3 111.4 152.1zM357.1 296C355.3 297.3 354.6 297.8 354.1 294.7C352.1 283.3 349 272.2 345.3 261.1C305.4000000000001 147.3 194.8 157.2 140.8 157.2C134.7 157.2 130.7 153.9 129.9 147.8C107.3 7.4 102.8 -21.9 102.8 -21.9C101.8 -29 106.3 -34.8 113.4 -34.8H176.9C185.5 -34.8 192.6 -28.4999999999999 194.3 -19.9C195 -14.5 193.2 -26 208.7 71.4C213.3 93.4 223 91.1 238.0000000000001 91.1C309 91.1 364.4000000000001 119.9 380.9000000000001 203.4C387.4000000000001 238.2000000000001 385.5000000000001 274.8000000000001 357.1 296z" />
+    <glyph glyph-name="periscope"
+      unicode="&#xF3DA;"
+      horiz-adv-x="448" d=" M370 384.4C331.4 425.4 280.5 448 226.6 448C111.9 448 18.5 351.8 18.5 233.6C18.5 158.5 76.3 73.8 101.2 40.9C137.8 -7.5 192.6 -64 226.6 -64C268.2 -64 339.5 30.2 347.5 41C372.1 74.1 429.5 159.3 429.5 233.6C429.5 290.1 408.4 343.7 370 384.4zM226.6 -45.9C184.1 -45.9 36.6 121.4 36.6 233.5C36.6 340.9 120.5 429.8 226.6 429.8C327.4 429.8 411.3 340.8 411.3 233.5C411.4 121.4 263.9 -45.9 226.6 -45.9zM338 241.2C338 182.1 286.9 131.5 227.2 131.5C126.6 131.5 76.5 239.7 134.3 313.3V312.9C134.3 288.4 154.4 268.5 179.1 268.5C203.8 268.5 223.9 288.4 223.9 312.9C223.9 331.1 212.8 346.7 197 353.6C273.6 372.8 338 314.3 338 241.2z" />
+    <glyph glyph-name="phabricator"
+      unicode="&#xF3DB;"
+      horiz-adv-x="496" d=" M323 185.9L322.9 198.9S344.6 218.7 344 220.1L334.5 240.1C333.9 241.5 305 240.6 305 240.6L295.6 249.9S295.8 278.4 294.4000000000001 279L274.3 288.2C272.9000000000001 288.8 253.6 267.2 253.6 267.2L240.5000000000001 267.4S220 288.8 218.6 288.2L198.6 279.9C197.2 279.4 198.8 251 198.8 251L189.7 241.9S160.5 242.8 160 241.5L151.9 221.6999999999999C151.3000000000001 220.2999999999999 172.9 200.6999999999999 172.9 200.6999999999999L173 187.8S151.3000000000001 168 151.9 166.6L161.4 146.6C162 145.2 190.9 146.1 190.9 146.1L200.3000000000001 136.8S200.1000000000001 104.9999999999999 201.5 104.4999999999999L221.6 96.1999999999999C223 95.5999999999999 242.3 119.6999999999999 242.3 119.6999999999999L255.4 119.5S275.9 95.6999999999999 277.2 96.1999999999999L297.2 103.6999999999999C298.6 104.3 297 135.8 297 135.8L306.1 144.9S335.3 144 335.8 145.4L343.9000000000001 165.2C344.6 166.3 323.0000000000001 185.9 323.0000000000001 185.9zM278.1 194.6C278.8 177.5 265.3 163 248.0000000000001 162.2C230.7 161.4 215.9 174.7 215.2000000000001 191.8C214.5000000000001 208.9 228.0000000000001 223.4 245.3000000000001 224.1C262.6 224.9 277.4000000000001 211.6 278.1 194.6zM479.3 232.5L382.3 329.5L382.2 329.4C307.1 402.7 186.8 402.2 112.4 327.8C61.5 276.8 84.6 299.9 16.7 232.5C-5.6 210.2 -5.6 173.8 16.7 151.5C86.6 82.1 63.1 105.5 114.1 54.5L114.2 54.6C189.3 -18.7 309.6 -18.3 384 56.2C435 107.1 411.9 84.1 479.3 151.5000000000001C501.6 173.8000000000001 501.6 210.2000000000001 479.3 232.5000000000001zM140.4 84.2C80.8 143.7 80.8 240.2 140.4 299.7C199.9 359.3 296.4 359.2 356 299.7C415.5 240.2 415.6 143.7 356 84.1C296.4 24.6 200 24.7 140.4 84.2000000000001z" />
+    <glyph glyph-name="phoenix-framework"
+      unicode="&#xF3DC;"
+      horiz-adv-x="640" d=" M212.9 103.7C216.7 103.8 235.7 105.1 238.5 105.9C236.1 108.5 194.9 106.9 170.5 155.5C166.2 164.1 163 173.1 164.1 183.1C167 208.6 197 213.1 216.1 201.6C252.1 180 279.4 110.3 329.8 104.1C366.8 99.6 414.4 121.1 438 149.5C437.4 149.6 437.2 149.7 437 149.6C436.6 149.5 436.2 149.4 435.9 149.3C402.6 137.2 341.6 139.6 301.2 164.1C263.6 186.9 248.1 222.8 249.4 238.7C251.2 260 272.3 261.9 285.3 258.3C299.7 254.4 309.7 240.7 324.2 230.9C339.8 220.5 357.0999999999999 217.2 375.5 220.6C390.3999999999999 223.3 409.8999999999999 232.9 412 235.1C410.8999999999999 235.2 410.2 235.2 409.5 235.3C403.3 235.9 397.1 236.1 391 237C279.8 253.5 262.1 400.6 138.5 410.1C94.2 413.5 39.1 402 2.2 375.1C1.4 374.5 0.7 373.9 0 373.3C0.1 373.1 0.1 373 0.2 372.8C1 372.8 1.8 372.9 2.6 373C8.9 374 15.1 373.8 21.3 372.7C45.1 368.4 69 349.6 77.2 296.2C82.5 261.9 76.5 245.4 85.2 210.1C104.2 133 176.2 102.5 212.9 103.7zM75.3 383.1C74.4 384.1 74.4 384.3 74 385.1C86.1 387.7 98.2 389.2 110.6 389.9C109.5 375.2 88.4 368.6 75.3 383.1zM272.2 32.6C229.4 31.4 180.2 59.3 148.7 94C144.1 99 131.9 114.2 130.1 117.4L130.5 117.8C137.1 113.6999999999999 156.2 99.1999999999999 185.3 90.8C209.5 83.8 233.4 84.4999999999999 256.9 94.1C279.6 103.4 297.9 94.6 300 91.2C281.5 87.4 279.9 86.8 276 83.3C270.9 78.9 271.4 71.6 283 66.1C309.2 53.7 346 68.9 380.2 40.7C382.6 38.7 388.3 32.9 390.3 30.0000000000001C390.2 29.8000000000001 390 29.7 389.9000000000001 29.5000000000001C385.1 31.0000000000001 373.5000000000001 37.0000000000001 349.7000000000001 38.8000000000001C325.0000000000001 40.8000000000001 303.4000000000001 33.5000000000001 272.2000000000001 32.6000000000001zM447 284.6C463.4 289.8 488.3 298 513.5 287.9000000000001C529.6 281.4000000000001 539.7 269.2000000000001 545.6 253.3000000000001C549.1 243.9000000000001 550.7 233.6000000000001 550.7 224.6000000000001C550.5 224.6000000000001 550.3000000000001 224.6000000000001 550.1 224.5000000000001C549.9 224.9000000000001 549.7 225.4000000000001 549.6 225.8000000000001C544.6 247.8000000000001 519.7 269.6000000000001 482 255.7000000000001C431.8 237.1000000000001 351.6 246.0000000000001 305.1 303.7000000000001C304.4000000000001 304.6000000000001 302.7000000000001 305.4000000000001 303.8 306.9000000000001C303.9000000000001 307.1 305.9000000000001 306.3000000000001 306.8 305.6C324.9000000000001 292.2000000000001 345.1 283.7000000000001 367.1 279.4000000000001C397.6 273.3000000000001 421.7000000000001 276.5000000000001 447 284.6zM549.7 167.1C517.3000000000001 166.9 515.9000000000001 117 446.1 102.7000000000001C427.9000000000001 99.0000000000001 407.4000000000001 98.1 401.2000000000001 98.5000000000001V98.9C404.0000000000001 100.4 415.9000000000001 101.5000000000001 430.9000000000001 115.5000000000001C438.8 122.8000000000001 446.2000000000001 130.6000000000001 453.7 138.4C473.2 158.6 495.1 180.6 535.6 177.4C558.7 175.6 564.9 169.2000000000001 571.7 164.7000000000001C572 164.5000000000001 572.1 164.2000000000001 572.4000000000001 163.8000000000001C571.9000000000001 163.8000000000001 571.7 163.7000000000001 571.5000000000001 163.8000000000001C564.5000000000001 166.5000000000001 557.2000000000002 167.1000000000001 549.7000000000002 167.1000000000001zM537.4000000000001 191.2000000000001C537.3000000000001 191.0000000000001 537.3000000000001 190.8000000000001 537.2 190.6C508.3000000000001 195 489.2 198.5 468.7 186.6C451.7 176.7000000000001 437.3000000000001 166.1 406.7000000000001 162.2000000000001C379.6 158.8000000000001 361.6 159.8000000000001 340.6 170.2000000000001C340.3 170.4 340 170.6 339.6 170.8000000000001C339.6 171.0000000000001 339.7000000000001 171.1000000000001 339.7000000000001 171.3000000000001C364.6 167.5000000000001 376.1 166.2000000000001 395.2000000000001 177.1000000000001C417.5000000000001 190.0000000000001 435.3000000000001 203.7000000000001 466.5000000000001 208.1000000000001C496.1000000000001 212.2000000000001 517.8000000000001 205.6000000000001 537.4000000000001 191.2000000000001zM268.6 350.7C268 351.3 267.5 351.9 266.5 353C274.1 353 296.2 354.2 319.9 344.6C339.6 336.6 352.1 323.6 370.1 311.7C381.2 304.4 393.5 302.4 406.5 303.6C410.8 304 415 304.8 419.3 305.3C419.7 305.4 420.2 305.3 420.8 305C420.2 304.6 419.6 304.1 419 303.8C410.8999999999999 299.8 402.3 297.5 393.3999999999999 296.7C367.2999999999999 294.1 343.0999999999999 300.4 319.9999999999999 312.1C300.6999999999999 322 283.5999999999999 335 268.5999999999999 350.7zM640 112.3C636.5 109.2 617.3 100.7 597.3 107C585 110.9 577.8 121.9 565.6999999999999 131.1C555.6999999999999 138.7000000000001 544.8 139 537.5999999999999 139.5C538.1999999999999 140.3 538.4999999999999 140.7 538.8 140.9C553.5999999999999 150.1 569.3 153.1 586.0999999999999 147.4C598.5999999999999 143.2 605.3 133.9 616.4999999999999 123.2C627.2999999999998 112.8 637.4999999999999 113.3 639.5999999999999 112.7C639.6999999999999 112.8 639.8 112.7 639.9999999999999 112.3zM427.5 -24.7C429.7 -25.9 429.1 -26.2 429 -26.7C410.5 -25.3 395.1 -19.1 382.2 -4.5C360.4 20.2 340.5 23.4 333.6 25.2C334.1 25.4 334.4 25.6 334.7 25.6C347.8 25.4999999999999 360.8 24.9 373.6 21.7C398.9 15.3 408.6 -3.7 415.2 -13.6C418.4 -18.4 422.5 -21.9 427.5 -24.7z" />
+    <glyph glyph-name="phoenix-squadron"
+      unicode="&#xF511;"
+      horiz-adv-x="513.52" d=" M96.24 385.19C142.91 421.43 202.15 441.43 261.28 439.92C290.95 440.3 320.57 434.54 348.45 424.55C324.25 429.19 299.27 430.9 274.85 427C231.85 421.65 191.59 399.77 162.69 367.65C168.38 368.64 173.5 371.3300000000001 178.76 373.53C196.95 381.42 216.36 386.82 236.1600000000001 388.4C255.9600000000001 390.54 275.9100000000001 388.83 295.61 386.4700000000001C281.1500000000001 383.68 266.4100000000001 381.89 252.5 376.86C217.97 365.75 187.04 343.6 165.95 314.04C152.11 294.27 142.25 271.05 141.21 246.71C140.86 230.17 146.44 211.8 161.1 202.54C172.23 195.88 185.95 193.15 198.73 195.78C214.22 198.25 228.89 204.45 242.46 212.16C254.01 219 265.19 226.75 274.51 236.48C278.31 239.71 277.05 244.96 277.14 249.31C275.01 249.65 272.74 250.42 270.82 249.01A203.975 203.975 0 0 0 234.89 233.59C214.8199999999999 227.4 192.6099999999999 225.11 172.6099999999999 232.81C185.44 231.08 198.75 232.5 210.4599999999999 238.27C230.7499999999999 248.02 247.38 263.54 265.06 277.15C292.8999999999999 298.44 322.7 317.26 354.23 332.62C380.01 344.63 407.32 355.47 436.04 356.82C420.36 343.06 403.79 330.22 389.12 315.31C374.57 301.27 361.58 285.73 348.89 270C345.36 265.39 339.9099999999999 263.04 335.2699999999999 259.81C313.0299999999999 244.78 294.6699999999999 223.85 283.2299999999999 199.53C273.8699999999999 179.79 268.6799999999999 157.56 271.4199999999999 135.69C273.3699999999999 121.9599999999999 280.1599999999999 108.0199999999999 292.3799999999999 100.68C305.3199999999999 92.6899999999999 321.5199999999999 92.59 335.9899999999999 95.5699999999999C368.8899999999999 103.04 397.5999999999999 124.54 417.2699999999999 151.5699999999999C437.7699999999999 179.17 447.8799999999999 213.9499999999999 446.5199999999999 248.2099999999999C445.9999999999999 255.73 444.9399999999999 263.2099999999999 444.8499999999999 270.76C452.8699999999998 251.22 459.7199999999999 230.93 461.5499999999998 209.75C463.5599999999998 195.43 462.2999999999998 180.91 459.9299999999998 166.73C458.0099999999998 155.71 454.2399999999998 145.15 452.1199999999998 134.1999999999999C472.4799999999998 156.93 486.2899999999998 185.44 491.5799999999998 215.5099999999999C497.2999999999998 250.88 492.1599999999998 287.87 477.3299999999998 320.4599999999999C498.1699999999998 288.3399999999999 509.7599999999998 250.67 513.1399999999999 212.66C513.6399999999999 199.8899999999999 513.6399999999999 187.0799999999999 513.1399999999999 174.3199999999999C510.2299999999998 140.06 500.1699999999998 106.37 483.3799999999999 76.3199999999999C457.1799999999999 28.8399999999999 415.1799999999999 -9.57 365.8399999999999 -32.0000000000001C287.3199999999999 -68.34 190.6399999999999 -63.4100000000001 117.1199999999999 -17.28C78.2799999999999 6.5 46.0599999999999 41.04 25.4399999999999 81.68C10.72 110.57 2.04 142.5 0 174.87V206.3C3.94 276.27 40.99 342.62 96.24 385.19M318.89 304.62C324.4 305.42 329.71 307.19 334.91 309.12C339.9 310.89 344.18 315.07 345.26 320.37C336.35 315.37 327.31 310.42 318.89 304.62z" />
+    <glyph glyph-name="php"
+      unicode="&#xF457;"
+      horiz-adv-x="640" d=" M320 343.5C491.4 343.5 623.2 271.3 623.2 192S491.3 40.5 320 40.5C148.6 40.5 16.8 112.7 16.8 192S148.7 343.5 320 343.5M320 360.3C143.3 360.3 0 285 0 192S143.3 23.7 320 23.7S640 99 640 192S496.7 360.3 320 360.3zM218.2 205.5C210.3 165 182.4 169.2 148.1 169.2L161.8 239.8C199.8 239.8 225.6 243.9 218.2 205.5zM97.4 97.7H134.1L142.8 142.5C183.9 142.5 209.4 139.5 233 161.6C259.1 185.6 265.9 228.3 247.3 249.7C237.6 260.9 222 266.4 200.8 266.4H130.1L97.4 97.7zM283.1 311.3H319.6L310.9000000000001 266.5C342.4000000000001 266.5 371.6 268.8 385.7000000000001 255.8C400.5000000000001 242.2 393.4000000000001 224.8 377.4000000000001 142.7000000000001H340.4000000000001C355.8 222.1000000000001 358.7000000000001 228.7000000000001 353.1 234.7000000000001C347.7000000000001 240.5000000000001 335.4000000000001 239.3000000000001 305.7000000000001 239.3000000000001L286.9000000000001 142.7000000000001H250.4000000000001L283.1 311.3000000000001zM505 205.5C497 164.4 468.3 169.2 434.9 169.2L448.6 239.8C486.8 239.8 512.4 243.9 504.9999999999999 205.5zM384.2 97.7H421L429.7 142.5C472.9 142.5 496.8 140 519.9 161.6C546 185.6 552.8 228.3 534.1999999999999 249.7C524.4999999999999 260.9 508.8999999999999 266.4 487.6999999999999 266.4H417L384.2 97.7000000000001z" />
+    <glyph glyph-name="pied-piper-alt"
+      unicode="&#xF1A8;"
+      horiz-adv-x="576" d=" M242 261C248.3 272.8 255.2 278 267.9 282.8C295.2 293.1 308.1 313.3 326.8 333.9C338.7 325.5 338.8 309.3 358.4 310.9V289.1L364.7 288.8C402.1 303.2 439.4 319 471.3 343.4C519.5999999999999 380.2 524.1999999999999 393.4 552.5999999999999 443.4L554.5999999999999 446C553.9999999999999 431.9 548.3 418.7 542.1999999999999 406.1C511.6999999999999 342.3 463.4999999999999 305.8 395.3999999999999 289.4C383 286.5 369 286.2 357.7999999999999 280.5C359.1999999999999 270.7 370.9999999999999 262.4 370.9999999999999 257.5C370.9999999999999 254.1 365.4999999999999 250.3 363.4999999999999 248.9C352.2999999999999 261.8 347.3999999999999 268.2 340.7999999999999 271C333.1999999999999 274.5 276.8999999999999 277.4 241.9999999999999 261zM379.9 4.1C360.9 4.1 315.8 -5.4 300 -15.7L306.9 -60.8C342.6 -66.9 377 -64.4 412.9 -51C408.1 -41 389.4 4.1 379.9 4.1zM244 202C240.8 204 237.7 204.9 233.9 204.9C227.3 204.9 221.3 201.7 214.6 201.2L216.3 196.3L244 202zM231.4 170.2L255.5 109L276.5 122.8L245.2 173.7L231.4 170.2zM555.5 448L554.9 446.9L554.6 446L555.2 446.6L555.5 448zM496.3 65.9C462.4 122.8 421 184.3 346.3 181.4L346 187.4C344.9 200.9 378.8 184.2 381.1 218.4L366.7000000000001 211.2C346.9000000000001 256.9 358.1 265.5 301.2000000000001 265.5C286.5000000000001 265.5 274.5000000000001 263.8 259.8000000000001 260.9C262.7000000000001 242.3 262.0000000000001 224.2 248.9000000000001 210.6L268.4000000000001 205.1C266.7000000000001 201.9 265.5000000000001 198.8 265.5000000000001 195.3C265.5000000000001 174.3 308.3000000000002 192.4 308.3000000000002 161.7C308.3000000000002 143.3 271.5000000000001 101.6 253.4000000000001 101.6C245.4000000000001 101.6 199.7000000000001 151.6 200.0000000000001 161.7L200.3000000000001 166.3L252.6000000000002 177.8C265.6000000000002 180.4 264.9000000000002 200.5 249.7000000000002 200.5C246.0000000000002 200.5 206.6000000000001 191.3 200.3000000000001 189.9C198.3000000000001 195.1 192.8000000000001 204 186.5000000000001 204C183.3000000000001 204 180.2000000000001 200.8 177.0000000000001 200C167.8000000000001 197.4 146.0000000000001 197.1 155.5000000000001 179.9L15.9 149.5C10.4 148.4 7 143.2 7 137.7C7 131.7 12.5 126.8 18.5 126.8C26.5 126.8 149.8 155.2 165.9 159C168.5 155.8 170.5 152.7 173.7 150.4C193.8 136 233.5 64.5 250.1 64.5C274.2000000000001 64.5 308.1 86.9 321.4000000000001 106.4C324.6 110.7 328.3 113.9 333.8 113.3C334.4000000000001 99.4999999999999 302.2 79.1 300.8 69.6C299.4000000000001 59.4 299.8 34.4 300.5 28.4999999999999C327.2 20.3999999999999 352.5 32.1 378.4 31.3999999999999C382.7 52.3999999999999 389 73.2999999999999 388.2 94.8999999999999L387.9 104.3999999999999C386.5 138.5999999999999 377 142.8999999999999 353.1 163C352 164.1 350.5 165.6 349.4 167C351.6 168.3999999999999 350.5 168 354 168.6999999999999C442.5 168.6999999999999 410.3 -14.9000000000001 465.5 -61.2C498.6 -46.2 538 -33.3000000000001 569 -14.0000000000001C540 11.6 516.4 31.6999999999999 496.3 65.9zM300.1 19.9V-7.4L311.9000000000001 -4.0000000000001L309.0000000000001 19.8H300.1000000000001zM376.2000000000001 17C376.2000000000001 18.4 375.6 20.2 375.3000000000001 21.6C348.5000000000001 21.6 338.4000000000001 17.8 315.8000000000001 15.3L317.8000000000001 2.9C326.8000000000001 4.4 376.2000000000001 9.5000000000001 376.2000000000001 17.0000000000001z" />
+    <glyph glyph-name="pied-piper-hat"
+      unicode="&#xF4E5;"
+      horiz-adv-x="640" d=" M640 423.1C559.2 369.5 550.6 330.6 543.6 318.7C536.9 306.5 531.9 258.4 520.3000000000001 235.1C508.6000000000001 211.5 466.1000000000001 192.9 454.2 185.1C442.5000000000001 177.3 425.9000000000001 147 412.3000000000001 120.9C304.2000000000001 125.3 244.9000000000001 82.1 153.1000000000001 27.3000000000001C182.5000000000001 37.0000000000001 196.4000000000001 44.0000000000001 196.4000000000001 44.0000000000001C290.6000000000001 80.0000000000001 335.7000000000001 112.3000000000001 477.5000000000001 93.2000000000001C478.6000000000001 93.2000000000001 479.4000000000001 92.6 480.3000000000001 92.4C484.2000000000001 90.2000000000001 485.6000000000001 85.5000000000001 483.4000000000001 81.6L429.5000000000002 -14.2C427.0000000000002 -18.9 421.7000000000002 -21.4 416.4000000000002 -20.3C289.6000000000002 3.5 189.5000000000002 -37.6 97.5000000000002 -38.9C24.1 -40 0 -5.4 0 -3.8C0 -2.7 0.6 -2.1 1.7 -2.1C1.7 -2.1 40 -2.1 104.8 13.2C178.4 153.5 244 202.6 315.4 202.6C315.4 202.6 387.1 202.6 406 140.7C428.8 180.4 434.3 189.9 434.3 189.9C439.6 199.3 469.3 267.1 520.7 331.3C572.2 395.3 611.1 411.2 640 423.1z" />
+    <glyph glyph-name="pied-piper-pp"
+      unicode="&#xF1A7;"
+      horiz-adv-x="448" d=" M205.3 273.4C205.3 252.3 191.1 235.3 173.6 235.3C166.5 235.3 160.8 236.5 156.4 239V307C160.8000000000001 309.7 166.5 311.2 173.6 311.2C191.1 311.2 205.3 294.3 205.3 273.4zM257.9000000000001 206.4C250.8000000000001 206.4 245.1 204.9 240.7000000000001 202.2V134.2000000000001C245.1000000000001 131.7000000000001 250.8000000000001 130.5000000000001 257.9000000000001 130.5000000000001C275.3 130.5000000000001 289.6 147.4 289.6 168.3000000000001C289.6 189.4000000000001 275.3 206.4000000000001 257.9000000000001 206.4000000000001zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM185 192.9C226 192.9 259.2 228.5 259.2 272.5C259.2 316.5 226 352.1 185 352.1C173 352.1 160.9 348.9 150.4 343.3H104.7V137L156.5 147.1V197.7C165.1 194.6 174.6 192.9 185 192.9zM343.4 167.6C343.4 211.6 310.2 247.2 269.5 247.2C266.3 247.2 263.1 247.0000000000001 259.9 246.5000000000001C256.2 234.0000000000001 249.8 222.7 240.7 213.1C226.9 198.1 208.5 189.3 188.9 188.3V32L240.7 42.1V92.7000000000001C249.3 89.5000000000001 258.9 88.0000000000001 269.4 88.0000000000001C310.2 88.0000000000001 343.4 123.6000000000001 343.4 167.6z" />
+    <glyph glyph-name="pied-piper"
+      unicode="&#xF2AE;"
+      horiz-adv-x="448" d=" M32 29L0 -31.2L0.8 296.8C0.8 362.7 54 416 120 416H447.2C354.2 387.1 257.3 321.8 193.3 247.4C122.7 166 82.6 110 32 29M448 416S305.2 349.2 261.6 248.9C238.4000000000001 195.3 232.7 130.8 190.6 90.3C161.7 62.5 120.8 52.1 85.3 34C62.1 22 18.9 -6.5 0.4 -32H328.8C394.8 -32 448.1 21.3 448.1 87.2C448 87.2 448 416 448 416z" />
+    <glyph glyph-name="pinterest-p"
+      unicode="&#xF231;"
+      horiz-adv-x="384" d=" M204 441.5C101.4 441.5 0 373.1 0 262.4C0 192 39.6 152 63.6 152C73.5 152 79.2 179.6 79.2 187.4C79.2 196.7 55.5 216.5 55.5 255.2C55.5 335.6 116.7 392.6 195.9 392.6C264 392.6 314.4 353.9 314.4 282.8C314.4 229.7 293.1 130.1 224.1 130.1C199.2 130.1 177.9 148.1 177.9 173.9C177.9 211.7000000000001 204.3 248.3000000000001 204.3 287.3000000000001C204.3 353.5000000000001 110.4 341.5000000000001 110.4 261.5C110.4 244.7 112.5 226.1 120 210.8C106.2 151.4 78 62.9 78 1.7C78 -17.1999999999999 80.7 -35.8 82.5 -54.6999999999999C85.9 -58.4999999999999 84.2 -58.0999999999999 89.4 -56.1999999999999C139.8 12.8000000000001 138 26.3000000000001 160.8 116.6000000000001C173.1 93.2000000000001 204.9 80.6000000000001 230.1 80.6000000000001C336.3 80.6000000000001 384 184.1000000000001 384 277.4000000000001C384 376.7 298.2 441.5 204 441.5z" />
+    <glyph glyph-name="pinterest-square"
+      unicode="&#xF0D3;"
+      horiz-adv-x="448" d=" M448 368V16C448 -10.5 426.5 -32 400 -32H154.4C164.2 -15.6 176.8 8 181.8 27.3C184.8 38.8 197.1 85.7 197.1 85.7C205.1 70.4 228.5000000000001 57.5 253.4000000000001 57.5C327.5 57.5 380.8000000000001 125.6 380.8000000000001 210.2C380.8000000000001 291.3 314.6000000000001 352 229.4000000000001 352C123.4000000000001 352 67.2000000000001 280.9 67.2000000000001 203.4C67.2000000000001 167.4 86.4000000000001 122.6 117.0000000000001 108.3C121.7000000000001 106.1 124.1000000000001 107.1 125.2000000000001 111.6C126.0000000000001 115 130.2000000000001 131.7000000000001 132.0000000000001 139.4C132.6000000000001 141.9 132.3000000000001 144.0000000000001 130.3000000000001 146.4C120.2000000000001 158.7000000000001 112.0000000000001 181.3 112.0000000000001 202.4C112.0000000000001 256.6 153.0000000000001 309 222.9000000000001 309C283.2000000000001 309 325.5000000000001 267.9000000000001 325.5000000000001 209.1C325.5000000000001 142.7000000000001 292.0000000000001 96.7000000000001 248.3000000000002 96.7000000000001C224.2000000000001 96.7000000000001 206.2000000000001 116.6 211.9000000000001 141.1C218.8000000000001 170.3 232.2000000000002 201.8 232.2000000000002 222.9C232.2000000000002 275.9000000000001 156.7000000000001 268.6 156.7000000000001 197.9C156.7000000000001 176.2000000000001 164.0000000000002 161.4 164.0000000000002 161.4C132.6000000000001 28.6 127.9000000000002 26.9 134.4000000000002 -31.1999999999999L136.6000000000001 -31.9999999999999H48C21.5 -31.9999999999999 0 -10.4999999999999 0 16.0000000000001V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368z" />
+    <glyph glyph-name="pinterest"
+      unicode="&#xF0D2;"
+      horiz-adv-x="496" d=" M496 192C496 55 385 -56 248 -56C222.4 -56 197.8 -52.1 174.6 -44.9C184.7 -28.4 199.8 -1.4 205.4 20.1C208.4 31.7 220.8 79.1 220.8 79.1C228.9 63.7000000000001 252.5 50.6 277.6 50.6C352.4000000000001 50.6 406.3 119.4 406.3 204.9C406.3 286.8000000000001 339.4 348.1 253.4 348.1C146.4 348.1 89.5 276.3 89.5 198C89.5 161.6 108.9 116.3 139.8 101.9C144.5 99.7000000000001 147 100.7000000000001 148.1 105.2000000000001C148.9 108.6 153.1 125.5000000000001 155 133.3000000000001C155.6 135.8000000000001 155.3000000000001 138.0000000000001 153.3000000000001 140.4000000000001C143.2000000000001 152.9000000000001 135 175.7000000000001 135 197.0000000000001C135 251.7000000000001 176.4 304.6000000000001 247.0000000000001 304.6000000000001C307.9000000000001 304.6000000000001 350.6 263.1000000000001 350.6 203.7000000000001C350.6 136.6000000000001 316.7000000000001 90.1000000000001 272.6 90.1000000000001C248.3 90.1000000000001 230.0000000000001 110.2000000000001 235.9000000000001 134.9000000000001C242.9000000000001 164.4000000000001 256.4000000000001 196.2000000000001 256.4000000000001 217.5000000000001C256.4000000000001 236.5000000000001 246.2000000000001 252.4000000000001 225 252.4000000000001C200.1 252.4000000000001 180.1 226.7000000000001 180.1 192.2000000000001C180.1 170.2000000000001 187.5 155.4000000000001 187.5 155.4000000000001S163 51.6000000000001 158.5 32.2000000000001C153.5 10.8000000000001 155.5 -19.3999999999999 157.6 -38.9999999999999C65.4 -2.9 0 86.9 0 192C0 329 111 440 248 440S496 329 496 192z" />
+    <glyph glyph-name="playstation"
+      unicode="&#xF3DF;"
+      horiz-adv-x="576" d=" M570.9 75.7C559.6 61.5 532.1 51.4 532.1 51.4L327 -22.2V32.1L477.9 85.9C495 92.0000000000001 497.7 100.7000000000001 483.7 105.3C469.8 109.9 444.6 108.6 427.5 102.4L327 66.9V123.3C350.2 131.1 374.1 136.9 402.7 140.1C443.6 144.6 493.6 139.5 532.9 124.6C577.1 110.6 582.1 89.9 570.9 75.7zM346.5 168.2V307.2C346.5 323.5 343.5 338.5 328.2 342.8C316.5 346.6 309.2 335.7 309.2 319.4V-28.5L215.4 1.3V416C255.3 408.6 313.4 391.1 344.6 380.6C424.1 353.3 451 319.3 451 242.8C451 168.3 405 140 346.5 168.2000000000001zM43.2 37.8C-2.2 50.6 -9.8 77.3 10.9 92.6C30 106.8 62.6 117.5 62.6 117.5L197.1 165.3V110.8L100.3 76.2C83.2 70.1 80.6 61.4 94.5 56.8C108.4 52.2 133.6 53.5 150.7000000000001 59.7L197.1000000000001 76.6V27.8C145.5000000000001 18.4999999999999 95.7000000000001 20.4999999999999 43.2 37.8z" />
+    <glyph glyph-name="product-hunt"
+      unicode="&#xF288;"
+      horiz-adv-x="512" d=" M326.3 229.2C326.3 208.7 309.6 192 289.1 192H218.8V266.4H289.1C309.6 266.4 326.3 249.7 326.3 229.2zM504 192C504 55 393 -56 256 -56S8 55 8 192S119 440 256 440S504 329 504 192zM375.9 229.2C375.9 277.1 337 316 289.1 316H169.2V68H218.8V142.4H289.1C337 142.4 375.9 181.3 375.9 229.2z" />
+    <glyph glyph-name="pushed"
+      unicode="&#xF3E1;"
+      horiz-adv-x="432" d=" M407 336.1L308.5 345.1L322.5 378.5C332.9 402 311.7 418.9 293.8 415.5L22.5 371.1C7.4 368.4 -3.5 352.8 1.1 334.5L106.2 -13.8C112.7 -35.1 142.9 -38 153.9 -20.8L189.2 60L424.4 291.3C440.8 308.1 428.7 334.2000000000001 407 336.1zM297.6 394.4C302.7000000000001 395.1 305.1 391.9 302.8 387L286 347.1L108.6 363.4L297.6 394.4zM22.7 340.1C19.6 345.2 23.7 350.1 28.8 349.2L277.5 326.5L180.6 95.8L22.7 340.1zM136 -8.4C133.4 -12.4 128.1 -11.5 126.6 -7.2L43.5 268.3L171.2 70.7000000000001C164.2 55.7 136 -8.4 136 -8.4zM408.8 306.1L210.1 110.7L299.8 324.4L406.2000000000001 314.7C410.2000000000001 313.6 411.9000000000001 309.4 408.8000000000001 306.1z" />
+    <glyph glyph-name="python"
+      unicode="&#xF3E2;"
+      horiz-adv-x="448" d=" M167.8 411.6C122.6 403.6 114.4 386.9 114.4 356V315.3H221.3V301.7000000000001H74.3C43.2 301.7000000000001 16 283 7.5 247.5C-2.3 206.8 -2.7 181.4 7.5 138.9C15.1 107.3 33.2 84.7 64.3 84.7H101V133.5C101 168.8 131.5 199.9 167.8 199.9H274.6C304.3 199.9 328 224.4 328 254.2V356.1C328 385.1 303.6 406.8 274.6 411.7C238.8 417.6 199.9 417.3 167.8 411.6zM161.1 383.2C172.1 383.2 181.2 374 181.2 362.8S172.2 342.5 161.1 342.5C150 342.5 141 351.6 141 362.8C141.1 374.1 150 383.2000000000001 161.1 383.2000000000001zM346.3 301.8V254.3C346.3 217.5 315.1 186.5 279.5 186.5H172.7C143.5 186.5 119.3 161.5 119.3 132.2V30.4C119.3 1.4 144.5 -15.6 172.7 -23.9C206.5 -33.8 239 -35.6 279.5 -23.9C306.4 -16.1 332.9 -0.4 332.9 30.4V71.1H226.2V84.7H386.4C417.5 84.7 429 106.4 439.8 138.9C450.9999999999999 172.4 450.4999999999999 204.6 439.8 247.5C432.1 278.4 417.5 301.7 386.4 301.7H346.3zM286.2 44C297.3 44 306.3 34.9 306.3 23.7C306.3 12.4 297.3 3.3 286.2 3.3C275.2 3.3 266.1 12.5 266.1 23.7C266.2 35 275.2 44 286.2 44z" />
+    <glyph glyph-name="qq"
+      unicode="&#xF1D6;"
+      horiz-adv-x="448" d=" M433.754 27.555C422.228 26.162 388.894 80.296 388.894 80.296C388.894 48.951 372.758 8.049 337.843 -21.49C354.685 -26.682 392.6860000000001 -40.657 383.646 -55.911C376.3300000000001 -68.254 258.136 -63.792 224.014 -59.948C189.892 -63.792 71.698 -68.254 64.382 -55.911C55.337 -40.661 93.3 -26.697 110.165 -21.496C75.245 8.043 59.106 48.949 59.106 80.2960000000001C59.106 80.2960000000001 25.772 26.162 14.247 27.5550000000001C8.877 28.205 1.823 57.1990000000001 23.594 127.2590000000001C33.855 160.2830000000001 45.589 187.7370000000001 63.738 233.0380000000001C60.683 349.937 108.982 447.9940000000001 224 448C337.737 447.9940000000001 387.156 351.867 384.264 233.037C402.382 187.814 414.176 160.187 424.408 127.259C446.1760000000001 57.199 439.124 28.206 433.754 27.555z" />
+    <glyph glyph-name="quinscape"
+      unicode="&#xF459;"
+      horiz-adv-x="489.1" d=" M301.9 -26.6H300.6C213.3 -26.6 142.5 44.2 142.5 131.5S213.3 289.6 300.6 289.6C395.5 289.6 468.8 206.5 457.6 113C461.6 107.9 465.8 103.4 468.8 97.7C482.1999999999999 128 489.1 160.1 489.1 195.4C489.1 330.5 379.6 440 244.5 440C109.5 440 0 330.5 0 195.4S109.5 -49.2 244.5 -49.2C269.3 -49.2 292.3 -46 314.9 -39.1C309.7 -35.6 305.9 -30.9 301.5 -26.4999999999999L301.9 -26.6zM280.7 43.2C280.7 98 325.1 142.4 379.9 142.4C434.7 142.4 479.1 98 479.1 43.2C479.1 -11.6 434.7 -56 379.9 -56C325.1 -56 280.7 -11.6 280.7 43.2" />
+    <glyph glyph-name="quora"
+      unicode="&#xF2C4;"
+      horiz-adv-x="448" d=" M440.5 61.3H411.2C409.7 47.8 400.7 30.5 378.2 30.5C357.7 30.5 342.9 44.7 328.7 66.3C372.9 100.5 403.4 153.8 403.4 219.3C403.5 336.8 306.8 416 205 416C105.3 416 7.3 336.3 7.3 219.3C7.3 85.2000000000001 138.6 -2.3 256.3 30.3C276 -3.3 302 -32 351.5 -32C433.3 -32 442.3 43.3 440.5 61.3zM297 118.8C277.5 148 253.3 171 205.5 171C175 171 151.2 161 136.5 148.2L148.7 123.9C154.9 126.9 161.7 127.9 168.5 127.9C204 127.9 222.2 97.1 237.7 66.6C227.7 63.6 217 62.4 205 62.4C130 62.4 97.5 115.4 97.5 219.1C97.5 323.5 130 377 205 377C281.2 377 313.7 323.5 313.7 219.3C313.8 177.5 308.3 143.7000000000001 297 118.8z" />
+    <glyph glyph-name="r-project"
+      unicode="&#xF4F7;"
+      horiz-adv-x="581" d=" M581 221.4C581 328.9 450.9 416 290.5 416S0 328.9 0 221.4C0 125.6 103.3 46 239.4 29.9V-32H338.5V29.5C362.8 32.2 386.1 36.9 407.9 43.4L448 -32H560L492.6 81.7C547.1 117.1 581 166.6 581 221.4zM114.2 206.9C114.2 280.4 213.1 339.9 335 339.9S546.9 299.2 546.9 206.9C546.9 156.8 520.4 121.9 476.6 100.5C474.2 102.1 471.9 103.4 470.2 104.2C460 109.4 442.4 114.7 442.4 114.7S529 121.1 529 207.4S438.4 295.3 438.4 295.3H239.4V87C165.3 108.5 114.2 154.1 114.2 206.9zM339.3 168.6V224.2C397.1 224.2 427.1 231.0000000000001 427.1 196.9C427.1 160.4 388.9 168.6 339.3 168.6zM338.4 96.1H365C375.8 96.1 383.9 84.4 389 76.9C372.9 75.0000000000001 356 74.1 338.4 74.0000000000001V96.1000000000001z" />
+    <glyph glyph-name="ravelry"
+      unicode="&#xF2D9;"
+      horiz-adv-x="512" d=" M407.4 386.5C331.6 425.9 257.8 417 182.9 382C171.6 376.8 167.4 371.4 163 363C152.7 343.8 146.8 325.6 143.1 310.3C121.9 284.7000000000001 106.7 254.2 99.8 220.4C89.2 202.4 78.9 179 76.7 149C76.7 149 76 141.4 76.2 141.1C40.9 145.7000000000001 0 168.1 0 168.1C9.1 153.6 61.3 135.8 76.3 130.2000000000001C76.3 130.2000000000001 78 32.2 140.8 -0.9999999999999C129.5 16.2 127.5 19.2 127.5 19.2S94.8 79 100.4 123.3C101.1 123.3 101.9 123.1 102.6 123.1C126.5 35.7 205.8 -28.3 299.5 -28.3C305.7 -28.3 311.6 -28.1 317.5 -27.6C331.5 -29.1 345.1 -28.1 357.6 -23.7C364.5 -21.5 371.4000000000001 -17.3 377.8 -12.9C448 26.2 478.7 69.1 500.9 134.8C506.3 150.8 509 170.3 510.7 187C519.4 269.3 480.1 348.6 407.4 386.5zM138.8 284.8S137.6 272.5 138.1 265.1C134.7 262.6 128 257 119.9 248.4000000000001C125.1 261.2000000000001 131.2 273.5 138.8 284.8000000000001zM107.6 162.9C112 180.1 120.9 202 137.4 218C137.4 218 139.1 170 153.2 127.9L111.8 134.8C109.6 144 108.3 153.3 107.6 162.9zM115.5 120.1C130.3 116.9 149.5 112.4999999999999 158.6 110.9999999999999C185.9 34.1999999999999 266.9000000000001 -13.3000000000001 266.9000000000001 -13.3000000000001C267.9000000000001 -13.8000000000001 268.6 -14.0000000000001 269.6 -14.3000000000001C196.5 -2.7 136.9 50.3999999999999 115.5 120.0999999999999zM386 3.9C371.5 -0.8 349.8 -4.5 321.3 0.2C321.3 0.2 230.2 23.3 193.8 108C232 107.3 246.2 108.2 271.8 111.9C311.2 117.6 350.8 128.1 386.8 144.9C398.6 150.3 397.9000000000001 164.3 396.4000000000001 174.7C394.4000000000001 187.5 385.3 186.8 375.0000000000001 179.4C375.0000000000001 179.4 293.0000000000001 120.8 185.2000000000001 125.7C166.5000000000001 157.7 158.4 236.5 158.4 236.5C199.8000000000001 271.7 241.6 296.1 326.8000000000001 288.9C327.0000000000001 295.3 329.8000000000001 316 306.4000000000001 317C306.4000000000001 317 212.9000000000001 328.1 160.4000000000001 283.5C162.9000000000001 300 166.3000000000001 312.8 171.5000000000001 322.9C205.7000000000001 353.7 250.5000000000001 372.4 299.8000000000001 372.4C406.2000000000001 372.4 492.8000000000001 285.3 492.8000000000001 177.9C492.6000000000001 101.9 449.0000000000001 35.9 386.0000000000001 3.9z" />
+    <glyph glyph-name="react"
+      unicode="&#xF41B;"
+      horiz-adv-x="512" d=" M418.2 270.8C412.8 272.6 407.4 274.3 402 275.9C402.9 279.6 403.7 283.3 404.5 287C416.8 346.6 408.7 394.5 381.4 410.3C355.1 425.4 312.2 409.7 268.8 371.9C264.5 368.2 260.3 364.3 256.3 360.4C253.6 363 250.8 365.6 248 368.1C202.5 408.5 156.9 425.5 129.5999999999999 409.6C103.3999999999999 394.4 95.5999999999999 349.3 106.5999999999999 292.9C107.6999999999999 287.3 108.8999999999999 281.8 110.2999999999999 276.2000000000001C103.8999999999999 274.4 97.5999999999999 272.4 91.6999999999999 270.3C38.3 251.8 0 222.6 0 192.4C0 161.2 40.8 129.9 96.3 110.9C100.8 109.4 105.3 107.9 109.9 106.6C108.4 100.6 107.1 94.7 105.9 88.6C95.4 33.1 103.6 -10.9 129.8 -26C156.8 -41.6 202.2 -25.6 246.4 13.1C249.9 16.2 253.4 19.4 256.9 22.8C261.3 18.5 265.9 14.4 270.5 10.4C313.3 -26.4 355.6 -41.3 381.7 -26.2C408.7 -10.6 417.5 36.7 406.1 94.3C405.2 98.7 404.2 103.2 403.1 107.8C406.3 108.7 409.4 109.7 412.5 110.7C470.1999999999999 129.8 511.9999999999999 160.7 511.9999999999999 192.4C511.9999999999999 222.7 472.6 252.1 418.2 270.8zM282.9 355.7C320.1 388.1 354.8 400.8 370.6 391.7C387.5 382 394 342.8 383.4 291.3C382.7 287.9 382 284.6 381.1 281.3C358.9 286.3 336.4 289.9 313.8 291.9C300.8 310.5 286.6 328.3 271.2 345C275.0999999999999 348.7 278.8999999999999 352.2 282.8999999999999 355.7zM152.9 166.6C157.5 157.8 162.2 149.1 167.2 140.5C172.3 131.8 177.5 123.1 183 114.6C167.4 116.3 151.9 118.8 136.6 122.1C141 136.5 146.5 151.4 152.9 166.6zM152.9 217.2C146.6 232.1 141.3 246.7 136.9 260.8C151.3 264 166.6 266.6 182.5 268.6C177.2 260.3 172 251.8 167.1 243.2C162.2 234.7 157.4 226.0000000000001 152.9 217.2zM164.3 191.9C170.9 205.7000000000001 178.1 219.2000000000001 185.7 232.5000000000001C193.3 245.8000000000001 201.5 258.7000000000001 210.1 271.4000000000001C225.1 272.5 240.4 273.1 256 273.1C271.6 273.1 287 272.5 301.9 271.4000000000001C310.4 258.8000000000001 318.5 245.9000000000001 326.2 232.7000000000001C333.9 219.5000000000001 341.1 206.0000000000001 347.9 192.3000000000001C341.2 178.5000000000001 334 164.9 326.3 151.5000000000001C318.7 138.2000000000001 310.6 125.3000000000001 302.1 112.5000000000001C287.2 111.4 271.7 110.9 256 110.9C240.3 110.9 225.1 111.4 210.4 112.3C201.7 125 193.5 138 185.8 151.3C178.1 164.6 171 178.1 164.3 191.9zM344.9 140.7000000000001C350 149.5000000000001 354.8 158.4 359.5 167.4C365.9 152.9 371.5 138.2000000000001 376.4 123.1C360.9 119.6 345.2 116.9 329.4 115.1C334.8 123.5 339.9 132.1 344.9 140.7000000000001zM359.3 217.2000000000001C354.6 226.0000000000001 349.8 234.8000000000001 344.8 243.4000000000001C339.9 251.9000000000001 334.8 260.3000000000001 329.5 268.6C345.6 266.6 361 263.9000000000001 375.3999999999999 260.6C370.7999999999999 245.8 365.3999999999999 231.4000000000001 359.2999999999999 217.2zM256.2 329.7C266.7 318.3 276.6 306.3 285.8 293.9C266 294.8 246.1 294.8 226.3 293.9C236.1 306.8 246.2 318.8 256.2 329.7zM140.2 391C157 400.8 194.3 386.8 233.6 352C236.1 349.8 238.6 347.4 241.2 345C225.7 328.3 211.4 310.5 198.3 291.9C175.7 289.9 153.3 286.4 131.1 281.5C129.8 286.6 128.7 291.8 127.6 297C118.2 345.4 124.4 381.9 140.2 391zM115.7 127.4C111.5 128.6 107.4 129.9 103.3 131.3C82 138 57.8 148.6 40.3 162.5C30.2 169.5 23.4 180.3 21.5 192.4C21.5 210.7 53.1 234.1 98.7 250C104.4 252 110.2 253.8 116 255.5C122.8 233.8 131 212.5 140.5 191.8999999999999C130.9 171 122.6 149.3999999999999 115.7 127.3999999999999zM232.3 29.4C215.8 14.3 196.7 2.3 175.9 -5.9C164.8 -11.2 152 -11.7 140.6 -7.2C124.7 1.9999999999999 118.1 37.3 127.1 84.8C128.2 90.4 129.4 95.9999999999999 130.8 101.4999999999999C153.2 96.6999999999999 175.8 93.3999999999999 198.7 91.6999999999999C211.9 72.9999999999999 226.4 55.0999999999999 241.9 38.3C238.7 35.1999999999999 235.5 32.1999999999999 232.3 29.4zM256.8 53.7C246.6 64.7 236.4 76.9 226.5 90C236.1 89.6 246 89.4 256 89.4C266.3 89.4 276.3999999999999 89.6 286.3999999999999 90.1C277.2 77.4 267.2999999999999 65.3 256.7999999999999 53.7zM387.5 23.7C386.6 11.5 380.6 0.1 371 -7.6C355.1 -16.8 321.2 -4.8 284.5999999999999 26.6C280.3999999999999 30.2 276.2 34.1 271.8999999999999 38.1C287.2 54.9999999999999 301.2999999999999 72.9 314.0999999999999 91.7C336.9999999999999 93.6 359.7999999999999 97.1 382.2999999999999 102.2C383.2999999999999 98.1 384.1999999999999 94 384.9999999999999 90C389.8999999999999 68.4 390.6999999999999 45.9 387.4999999999999 23.7zM405.7 131.2C402.8999999999999 130.3 400.0999999999999 129.4 397.2 128.6C390.2 150.4 381.5999999999999 171.7 371.7 192.4C381.3 212.8 389.3999999999999 233.8 396.2 255.3C401.3999999999999 253.8 406.3999999999999 252.2 411.2 250.6C457.8 234.6 490.4999999999999 210.8 490.4999999999999 192.6C490.4999999999999 173 455.6 147.7 405.7 131.2zM256 237.8C281.3 237.8 301.8 217.3 301.8 192C301.8 166.7 281.3 146.2 256 146.2C230.7 146.2 210.2 166.7 210.2 192C210.2 217.3 230.7 237.8 256 237.8" />
+    <glyph glyph-name="readme"
+      unicode="&#xF4D5;"
+      horiz-adv-x="576" d=" M528.3 401.5H388.5C340.4 401.5 298.6 368.2 288.1 321.2C277.5 368.2 235.8 401.5 187.7 401.5H48C21.5 401.5 0 380 0 353.5V107.7C0 81.2 21.5 59.7 48 59.7H137.7C239.9 59.7 270.4 35.3 285 -15.3C285.7 -18.1 290.2 -18.1 291 -15.3C305.7 35.3 336.2 59.7 438.3 59.7H528C554.5 59.7 576 81.2 576 107.7V353.4C576 379.8 554.7 401.3 528.3 401.5zM242 136.1C242 134.2000000000001 240.5 132.6 238.5 132.6H78.2C76.3 132.6 74.7 134.1 74.7 136.1V159C74.7 160.9 76.2 162.5 78.2 162.5H238.6C240.5000000000001 162.5 242.1 161 242.1 159V136.1zM242 197C242 195.1 240.5 193.5 238.5 193.5H78.2C76.3 193.5 74.7 195 74.7 197V219.9C74.7 221.8000000000001 76.2 223.4 78.2 223.4H238.6C240.5000000000001 223.4 242.1 221.9 242.1 219.9V197zM242 257.9000000000001C242 256 240.5 254.4000000000001 238.5 254.4000000000001H78.2C76.3 254.4000000000001 74.7 255.9000000000001 74.7 257.9000000000001V280.8000000000001C74.7 282.7000000000001 76.2 284.3000000000001 78.2 284.3000000000001H238.6C240.5000000000001 284.3000000000001 242.1 282.8000000000001 242.1 280.8000000000001V257.9000000000001zM501.3 136.2000000000001C501.3 134.3000000000001 499.8 132.7000000000001 497.8 132.7000000000001H337.5C335.6 132.7000000000001 334 134.2000000000001 334 136.2000000000001V159.1C334 161 335.5 162.6 337.5 162.6H497.9C499.8 162.6 501.4 161.1 501.4 159.1V136.2000000000001zM501.3 197.1000000000001C501.3 195.2000000000001 499.8 193.6000000000001 497.8 193.6000000000001H337.5C335.6 193.6000000000001 334 195.1000000000001 334 197.1000000000001V220C334 221.9 335.5 223.5 337.5 223.5H497.9C499.8 223.5 501.4 222 501.4 220V197.1zM501.3 258.0000000000001C501.3 256.1 499.8 254.5000000000001 497.8 254.5000000000001H337.5C335.6 254.5000000000001 334 256.0000000000001 334 258.0000000000001V280.8000000000001C334 282.7000000000001 335.5 284.3000000000001 337.5 284.3000000000001H497.9C499.8 284.3000000000001 501.4 282.8000000000001 501.4 280.8000000000001V258z" />
+    <glyph glyph-name="rebel"
+      unicode="&#xF1D0;"
+      horiz-adv-x="512" d=" M256.5 -56C117.2 -56 9 60.2 13.2 198.1C16 277.3 56.4 350.3 129.7 398.5C130 398.5 131.6 399.1 130.8 397.7C125 392.2 19.5 267.9 116.7 171.3C166.5 121.8 206.7 168.8 206.7 168.8C245.2 218.9 206.1 294.7000000000001 206.1 294.7000000000001C196.1 319.6 160.4 334.8 160.4 334.8L189.2 366.6C213.6 356.1 232.4 327.9 232.4 327.9C233.2 357.5 210.5 389.3 210.5 389.3L255.1 440L299.4 389.9C278.9 361.1 277.5 327.3 277.5 327.3C291.3 350.3 321 366.6 321 366.6L349.5 334.8C322.1 325.9 304.1 294.9 304.1 294.9C288.3 266.4 277 205.5 304.7000000000001 167.6C337.1 123 392.4000000000001 170.4 392.4000000000001 170.4C495.1 262.3000000000001 381.9000000000001 395.4000000000001 381.9000000000001 395.4000000000001C375.8 400.9000000000001 382.7000000000001 398.2000000000001 382.7000000000001 398.2000000000001C432.8000000000001 361.7000000000001 497.3000000000001 313.8 498.9 193.4C500.9 47.8 399 -56 256.5 -56z" />
+    <glyph glyph-name="red-river"
+      unicode="&#xF3E3;"
+      horiz-adv-x="448" d=" M353.2 416H94.8C42.4 416 0 373.6 0 321.2V62.8C0 10.4 42.4 -32 94.8 -32H353.2C405.6 -32 448 10.4 448 62.8V321.2C448 373.6 405.6 416 353.2 416zM144.9 247.1V190.8C144.9 163.8 123 141.9 96 141.9V296.1C96 309.3 106.7 320 119.9 320H274.1C274.1 293 252.2 271.1 225.2 271.1H168.9C156.6 271.7 144.3000000000001 259.5 144.9 247.1zM321.2000000000001 175.1H264.9000000000001C252.6 175.7000000000001 240.3000000000001 163.5 240.9000000000001 151.1V94.8C240.9000000000001 67.8 219 45.9 192 45.9V200.1C192 213.3 202.7 224 215.9 224H370.1C370.1 197 348.2000000000001 175.1 321.2000000000001 175.1z" />
+    <glyph glyph-name="reddit-alien"
+      unicode="&#xF281;"
+      horiz-adv-x="512" d=" M440.3 244.5C425.3 244.5 412.1 238.3 402.4000000000001 228.6C366.7000000000001 253.3 318.6 269.2 265.3000000000001 270.9L293 395.7L381.2 375.9C381.2 354.3 398.8 336.7 420.4 336.7C442.4 336.7 460.1 354.8 460.1 376.4S442.5 416.1 420.4 416.1C405 416.1 391.7 406.8 385.1 394.1L287.7 415.7C282.8 417 278 413.5 276.7 408.6L246.3 271C193.4 268.8 145.8 252.9 110 228.2C100.3 238.3 86.6 244.5 71.6 244.5C16 244.5 -2.2 169.9 48.7 144.4C46.9 136.5 46.1 128.1 46.1 119.7C46.1 35.9 140.5 -32 256.4 -32C372.8 -32 467.2 35.9 467.2 119.7C467.2 128.1 466.3 136.9 464.1 144.8C514 170.4 495.6 244.5 440.3 244.5zM129.4 139.1C129.4 161.1 147 178.8 169.1 178.8C190.7 178.8 208.3 161.2 208.3 139.1C208.3 117.5 190.7 99.9 169.1 99.9C147.1 99.8 129.4 117.5000000000001 129.4 139.1zM343.7000000000001 45.6C307.3000000000001 9.2 204.6000000000001 9.2 168.2000000000001 45.6C164.2000000000001 49.1 164.2000000000001 55.3 168.2000000000001 59.3C171.7000000000001 62.8 177.9 62.8 181.4 59.3C209.2000000000001 30.8 301.4000000000001 30.3 330.4000000000001 59.3C333.9000000000001 62.8 340.1 62.8 343.6 59.3C347.7000000000001 55.3 347.7000000000001 49.1 343.7000000000001 45.6zM342.9000000000001 99.8C321.3 99.8 303.7000000000001 117.4 303.7000000000001 139C303.7000000000001 161 321.3000000000001 178.7 342.9000000000001 178.7C364.9000000000001 178.7 382.6 161.1 382.6 139C382.5 117.5 364.9000000000001 99.8 342.9000000000001 99.8z" />
+    <glyph glyph-name="reddit-square"
+      unicode="&#xF1A2;"
+      horiz-adv-x="448" d=" M283.2 102.5C285.9 99.8 285.9 95.7 283.2 93.3C258.7 68.8 189.4 68.7 164.8 93.3C162.1 95.7 162.1 99.8 164.8 102.5C167.2 104.9 171.3 104.9 173.7 102.5C192.4 83.3 254.7 82.9 274.2 102.5C276.6 104.8 280.8 104.8 283.2 102.5zM191.9 156.3C191.9 171.2 180 183.1 165.4 183.1C150.5 183.1 138.6 171.2000000000001 138.6 156.3C138.6 141.7 150.5 129.8 165.4 129.8C180 129.8 191.9 141.7 191.9 156.3zM282.6 183.1C268 183.1 256.1 171.2000000000001 256.1 156.3C256.1 141.7 268 129.8 282.6 129.8C297.5 129.8 309.4 141.7 309.4 156.3C309.4 171.2 297.5 183.1 282.6 183.1zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM348.3 227.4C338.2 227.4 329.3 223.2 322.7 216.7C298.6 233.4 266.2 244.1 230.2 245.3L248.9 329.5L308.4 316.1C308.4 301.5 320.3 289.6 334.9 289.6C349.8 289.6 361.7 301.8 361.7 316.4000000000001C361.7 331 349.8 343.2000000000001 334.9 343.2000000000001C324.5 343.2000000000001 315.6 337 311.1 328.3L245.4 342.9000000000001C242.1 343.8 238.9 341.4000000000001 238 338.1L217.5 245.3C181.8 243.8 149.7 233.1 125.6 216.4C119.1 223.2 109.8 227.4 99.7 227.4C62.2 227.4 49.9 177 84.2 159.9C83 154.5 82.4 148.9 82.4 143.2C82.4 86.7 146.1 40.9 224.3 40.9C302.8 40.9 366.5 86.7 366.5 143.2C366.5 148.9 365.8999999999999 154.8 364.3999999999999 160.2C398 177.4 385.5999999999999 227.4 348.2999999999999 227.4z" />
+    <glyph glyph-name="reddit"
+      unicode="&#xF1A1;"
+      horiz-adv-x="512" d=" M201.5 142.5C187.7 142.5 176.6 153.6 176.6 167.1C176.6 180.9 187.7 192 201.5 192C215.1 192 226.1 180.9 226.1 167.1C226.1 153.5 215 142.5 201.5 142.5zM504 192C504 55 393 -56 256 -56S8 55 8 192S119 440 256 440S504 329 504 192zM371.7 233.2C362.3 233.2 354 229.3 347.9 223.2C325.5 238.7 295.3 248.7 261.8 249.8L279.2 328.1L334.5999999999999 315.6C334.5999999999999 302 345.7 291 359.2 291C373 291 384.0999999999999 302.3 384.0999999999999 315.9S372.9999999999999 340.8 359.2 340.8C349.5 340.8 341.2 335 337.0999999999999 327L275.8999999999999 340.6C272.8999999999999 341.4 269.7999999999999 339.2 269 336.2L249.9 249.8C216.6999999999999 248.4 186.8 238.5 164.4 223C158.3 229.4 149.7 233.2 140.3 233.2C105.4 233.2 94 186.3 125.9 170.3999999999999C124.8 165.3999999999999 124.2 160.1999999999999 124.2 154.8999999999999C124.2 102.2999999999999 183.4 59.6999999999999 256.2 59.6999999999999C329.3 59.6999999999999 388.5 102.3 388.5 154.8999999999999C388.5 160.1999999999999 387.8999999999999 165.6999999999999 386.6 170.6999999999999C417.9 186.6999999999999 406.4 233.2 371.7 233.2zM302.8 117C284.6 98.8 226.7 99.1 209.2 117C207 119.2 203.1 119.2 200.9 117C198.4 114.5 198.4 110.6 200.9 108.4C223.7 85.6 288.2 85.6 311.1 108.4C313.6 110.6 313.6 114.5 311.1 117C308.9000000000001 119.2 305 119.2 302.8 117zM310.5 192C296.9 192 285.9 180.9 285.9 167.1C285.9 153.5 297 142.5 310.5 142.5C324.3 142.5 335.4 153.6 335.4 167.1C335.4 180.9 324.4 192 310.5 192z" />
+    <glyph glyph-name="rendact"
+      unicode="&#xF3E4;"
+      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56C266.6 -56 284.7 -53.9 302.1 -50.1C296.5 -42.7 291.3 -35.7 286.2000000000001 -28.8C273.8000000000001 -30.9 261.0000000000001 -32.1 247.9000000000001 -32.1C124.3 -32 24 68.3 24 192S124.3 416 248 416S472 315.7 472 192C472 121 439 57.8 387.5 16.7C361.6 -2.1 348.4 -4.7 304 60.9C225.3 173.8 256 132 230.3 169.2C303.1 160.3 458.8 241.2 398.9 337.8C314 474.8 15 354.2 59.7 221.6C62.9 211.8 74.1 183 105.3 183C107.3 183 107.9 183.6 107.3 184.7C102.9 193.4 87.2 194.5 87.2 222.1C87.2 262.6 127.7 311.7 187.5 342.1C253.6 374.4 319.4 372.3 345.7 336.7C372.9 298.4 324.8 217.5 225.3 199.8C232.8 209.2 282.3 275 288.1 283.8C310.8 318.4 311.7 332.8 302.1 343C286.6 359.9 272.6 353.3 251.4 354.7C240.6 355.6 137.7 173.5 115 137.8C109.1 128.8 93.8 103.6999999999999 93.8 86.9C93.8 65.6 96.6 35.5 114.4 35.5C125 35.5 122.4 54.2 122.4 62.1C122.4 75 149.8 111.5 197.2 166.7000000000001C217.6 130.6 254.9 52.4 327.4 -42.9999999999999C425.4 -9.8999999999999 495.9 82.8000000000001 495.9 192.0000000000001C496 329 385 440 248 440z" />
+    <glyph glyph-name="renren"
+      unicode="&#xF18B;"
+      horiz-adv-x="512" d=" M214 278.9C214 168.5 153 73.5 66.4 31.5C30 74.8 8 130.3 8 191.4C8 314.1 97.1 415.8 214 435.5V278.9zM255 -56C212.1 -56 171.7 -45 136.5 -25.6C193.7 10.5 239.9 65.1 255 129C270.5 65.1 316.7 10.5 373.8 -25.7C338.7 -45 298.3 -56 255 -56zM445.6 31.5C359 73.5 298 168.4 298 278.9V435.5C414.9 415.8 504 314.1 504 191.4C504 130.3 482 74.8 445.6 31.5z" />
+    <glyph glyph-name="replyd"
+      unicode="&#xF3E6;"
+      horiz-adv-x="448" d=" M320 -32H128C57.6 -32 0 25.6 0 96V288C0 358.4 57.6 416 128 416H320C390.4 416 448 358.4 448 288V96C448 25.6 390.4 -32 320 -32zM193.4 174.8C187.3 176.8 181.8 177.9 177 177.9C169.8 177.9 163.5 176.0000000000001 158.1 172.3C152.7 168.6 148.5 163.3 145.3 156.5H144.2L140 174.8H112V35.9H148.1V125.6C149.6 131 152.5 135.4 156.8 138.8C161.1 142.1999999999999 166.6 143.9 173 143.9C177.6 143.9 182.8 142.9 188.6 140.8L193.4 174.8zM308.6 71.4C305.4000000000001 69 300.9000000000001 66.6 294.9000000000001 64.3C288.9000000000001 61.9999999999999 282.1 60.8 274.5000000000001 60.8C262.3000000000001 60.8 253.4000000000001 63.8 248.0000000000001 69.6999999999999C242.5000000000001 75.5999999999999 239.5000000000001 84.3999999999999 239.0000000000001 96.0999999999999H322.3000000000001C323.2000000000001 100.8999999999999 323.9000000000001 105.4999999999999 324.4000000000001 109.9999999999999C324.9000000000001 114.3999999999999 325.1000000000001 118.5999999999999 325.1000000000001 122.4999999999999C325.1000000000001 133.1999999999999 323.5000000000001 142.1999999999999 320.4000000000001 149.3999999999999C317.2000000000001 156.5999999999999 313.1000000000001 162.3999999999999 307.9000000000001 166.5999999999999C302.7000000000001 170.8999999999999 296.8000000000001 173.8999999999999 290.1000000000001 175.7999999999999C283.4000000000001 177.5999999999999 276.6000000000001 178.5999999999999 269.5000000000001 178.5999999999999C248.4000000000001 178.5999999999999 232.0000000000001 172.4999999999998 220.3000000000001 160.2999999999999S202.8000000000001 129.7999999999999 202.8000000000001 105.2999999999998C202.8000000000001 82.4999999999998 208.0000000000001 64.5999999999999 218.4000000000001 51.5999999999999C228.8000000000001 38.4999999999998 245.2000000000001 31.9999999999998 267.6000000000001 31.9999999999998C278.3000000000001 31.9999999999998 288.5000000000001 33.4999999999998 298.0000000000001 36.5999999999999C307.5000000000001 39.6999999999999 315.1000000000001 43.3999999999999 320.6000000000001 47.7999999999998L308.6000000000001 71.3999999999999zM286.8 141.7C290.6 136.3 292.1 128.6 291.4000000000001 118.6H239.7000000000001C240.6000000000001 128 243.4000000000001 135.6 247.9000000000001 141.2C252.4000000000001 146.8 259.4000000000001 149.7 268.9000000000001 149.7C277.1 149.8 283.0000000000001 147.1 286.8 141.7zM366.7000000000001 139.2C370.8000000000001 135.3 376.1 133.4 382.8000000000001 133.4C389.8000000000001 133.4 395.4000000000001 135.3 399.5000000000001 139.2S405.6000000000001 148.3 405.6000000000001 154.8S403.6000000000001 166.4 399.5000000000001 170.2C395.4000000000001 174 389.9000000000001 175.9 382.8000000000001 175.9C376.1000000000001 175.9 370.8000000000001 174 366.7000000000001 170.2C362.6 166.4 360.6 161.3 360.6 154.8S362.6 143.1 366.7000000000001 139.2zM366.7000000000001 38.7C370.8000000000001 34.8 376.1 32.9 382.8000000000001 32.9C389.8000000000001 32.9 395.4000000000001 34.8 399.5000000000001 38.7S405.6000000000001 47.8 405.6000000000001 54.3S403.6000000000001 65.9 399.5000000000001 69.7C395.4000000000001 73.5 389.9000000000001 75.4 382.8000000000001 75.4C376.1000000000001 75.4 370.8000000000001 73.5 366.7000000000001 69.7C362.6 65.9 360.6 60.8 360.6 54.3C360.6 47.7 362.6 42.6 366.7000000000001 38.7z" />
+    <glyph glyph-name="researchgate"
+      unicode="&#xF4F8;"
+      horiz-adv-x="448" d=" M0 416V-32H448V416H0zM262.2 81.6C255.6 78.6 229 75.6 212.2 95.8C203 106.4 186.9 129.1 170 159.4C161.1 159.4 155.3 159.4 148.6 160.0000000000001V113.6000000000001C148.6 90.1000000000001 154.6 92.4000000000001 174.4 89.7000000000001V81.6000000000001C167.5 81.9000000000001 151.3 82.4000000000001 138.8 82.4000000000001C125.7 82.4000000000001 112.7 81.8000000000001 105.2 81.6000000000001V89.7000000000001C120.7 92.6000000000001 127.2 91.0000000000001 127.2 113.6000000000001V223C127.2 245.6 120.8 244 105.2 246.9V255C131 254 158.3 255.6 176.1 255.6C207.8 255.6 232.0000000000001 241.2 232.0000000000001 210C232.0000000000001 188.9 215.3000000000001 167.8 192.8 162.5C206.4 138.3 222.8 116.9 235 103.6C242.2 95.8 252.2 88.9 262.2 88.9V81.6zM285.1 216.6C261.8 216.6 252.9 232.3 252.9 248.8V281C252.9 293.2 261.7 311.4 286.9 311.4S317.3 293.5 317.3 293.5L306.6 286.3S301.1 298.8 286.9 298.8C279 298.8 267.2 291.5 267.2 279.1V252.3C267.2 238.9 273.8 229 285.1 229C299.2 229 306.6 239.9 306.6 255.8H288.7V266.5H319.1C319.1 246 323.8 216.6 285.1 216.6zM168.6 171.9C159.2 171.9 155 172.2000000000001 148.6 172.7000000000001V242.4000000000001C155 243.0000000000001 163.6 243.0000000000001 171.1 243.0000000000001C194.4 243.0000000000001 208.3 230.8000000000001 208.3 208.5C208.3 186.6 193.3 171.9 168.6 171.9z" />
+    <glyph glyph-name="resolving"
+      unicode="&#xF3E7;"
+      horiz-adv-x="496" d=" M281.2 169.8C327.2 183.1 330.8 193.3 325.2 213.2L314 252.5C307.9 273.4 295.6 280.6 242.9 265.3L54.7 211.2L83.3 112.6L281.2000000000001 169.8zM248.5 440C131.4 440 33.2 359.3 7.2 250.5L229.1 314.4C263.9 324.6 283.3 326.1 308.4 322.6C344.7 316.5 361.1 297.6 369.8 267.4L380.5 229.6C388.7 201.5 381.5 179 357 156C337.6 138.6 325.8 131.5 295.6 122.8L203 96.2L423.4 69.1L433.1 34.9L385 21.6L98.1999999999999 58.9L121.1999999999999 -21.3C158 -43.3 201.5 -56 247.5 -56C384.5 -56 495.9999999999999 55.4 495.9999999999999 192.3C497 328.6 385.5 440 248.5 440zM38.3 59.4L0 191.2C0 142.7 14.3 97.8 38.3 59.4z" />
+    <glyph glyph-name="rocketchat"
+      unicode="&#xF3E8;"
+      horiz-adv-x="448" d=" M448 191.8C448 279 348.4 345.1 228.2 345.1C209.4 345.1 190.9 343.5 172.9 340.3C161.8 350.8 148.7 360.3 134.9 367.7000000000001C61.2 403.8 0 368.6 0 368.6S56.9 321.5 47.6 280.3C-4.7 228 -4.9 156.2000000000001 47.6 103.7000000000001C56.9 62.4 0 15.4 0 15.4S61.2 -19.8 134.9 16.2C148.7 23.7 161.8 33.1 172.9 43.6C190.9 40.4 209.4 38.8 228.2 38.8C348.5 38.9 448 104.6 448 191.8zM228.3 67.8C204.6 67.8 182 70.6 161 75.6C139.7 49.8 92.9 13.9 47.4 25.5C62.2 41.5 84.1 68.6 79.4 113.1C52.1 134.5 35.8 161.8 35.8 191.6C35.8 260 122 315.5 228.3 315.5S420.8 260 420.8 191.6C420.8 123.3 334.6 67.8 228.3 67.8zM253.9 191.7000000000001C253.9 177.5000000000001 242.4 165.9 228.3 165.9C214.2 165.9 202.7 177.4 202.7 191.7000000000001C202.7 205.9 214.2 217.5000000000001 228.3 217.5000000000001C242.4 217.5000000000001 253.9 205.9000000000001 253.9 191.7000000000001zM342.8 191.7000000000001C342.8 177.5000000000001 331.4000000000001 165.9 317.2 165.9C303.1 165.9 291.6 177.4 291.6 191.7000000000001C291.6 205.9 303 217.5000000000001 317.2 217.5000000000001C331.3 217.5000000000001 342.8 205.9000000000001 342.8 191.7000000000001zM164.9 191.7000000000001C164.9 177.5000000000001 153.5 165.9 139.3 165.9C125.2 165.9 113.7 177.4 113.7 191.7000000000001C113.7 205.9 125.1 217.5000000000001 139.3 217.5000000000001C153.5 217.5000000000001 164.9 205.9000000000001 164.9 191.7000000000001z" />
+    <glyph glyph-name="rockrms"
+      unicode="&#xF3E9;"
+      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM405.4 20.5H315.4L203.4 151.8C185.5 172.2 199.5 207.9 230 207.9H305.3L220.7 307.2L136.4 208.3H46.4L193.5 380.8C207.9 399.2 234.8 398.1 248 380.8L405.7 195.7C424.7 172.9 407.7 138.5 378.1 139.6C377.5 139.6 303.9 139.4 303.9 139.4L405.4 20.5z" />
+    <glyph glyph-name="safari"
+      unicode="&#xF267;"
+      horiz-adv-x="512" d=" M236.9 191.2C236.9 200.3 243.5 208.9 253.2 208.9C262.1 208.9 270.6 202.5 270.6 192.8C270.6 183.7 264.2000000000001 175.1 254.5000000000001 175.1C245.5000000000001 175.1 236.9000000000001 181.8 236.9000000000001 191.2zM504 192C504 55 393 -56 256 -56S8 55 8 192S119 440 256 440S504 329 504 192zM477.4 192C477.4 314.3 378.3 413.4 256 413.4S34.6 314.3 34.6 192S133.7 -29.4 256 -29.4S477.4 69.7 477.4 192zM404.9 95.4C404.9 91.8 417.9 85.2 421.2 83.2C393.8 41.7 351.4 11.8 303.3 -0.1L298.9 18.4C298.6 20.9 297 21.2 294.7 21.2C292.8 21.2 291.7 18.4 291.9 17L296.3 -1.8C283 -4.6 269.5 -6 255.9 -6C219.6 -6 183.9 4.2 152.9 23.1C154.5999999999999 25.9 165.0999999999999 41.1 165.0999999999999 43.3C165.0999999999999 45.2 163.4 46.9 161.5 46.9C157.5999999999999 46.9 149.3 30.3 146.8 27.0000000000001C105 54.7 74.8 97.6 63.2 146.6L82.3 150.8C84.5 151.4 85.1 153 85.1 155C85.1 156.9 82.3 158 80.7 157.8L62 153.5C59.5 166.2 58.1 179 58.1 192C58.1 229.1 68.6 265.6 88.3 296.9C91.1 295.2000000000001 104.4 286.1 106.6 286.1C108.5 286.1 110.2 287.5 110.2 289.4C110.2 293.3 95.5 300.7000000000001 92.2 303C120.4 344.2 163.3 373.9 212 384.9L216.2 366.4C216.8 364.2 218.4 363.6 220.4 363.6S223.4 366.4 223.2 368L219 386.3C231.2 388.5 243.6 389.9 256.1 389.9C293.2000000000001 389.9 329.4000000000001 379.4 361 359.7C359.1 356.9 350.2 343.9 350.2 341.7C350.2 339.8 351.6 338.1 353.5 338.1C357.4 338.1 364.8 352.5 366.8 355.8C407.8 328.1 437.1 285.8 448.5 237.6L433 234.3C430.5 233.7 430.2 232.1 430.2 229.9C430.2 228 433 226.9 434.4 227.1L450.2 230.7C452.7 218 454.1 205 454.1 192C454.1 155.7 444.1 120 425.3 89.3C422.5 90.7 410.9 99 408.7 99C406.5999999999999 99 404.8999999999999 97.3 404.8999999999999 95.4zM371.7 337.6C358.7 325.4 237.5 213.9 234.1 208.1L137.5 47.6C150.2 59.4999999999999 271.7 171.6 274.8 176.9L371.7000000000001 337.6z" />
+    <glyph glyph-name="sass"
+      unicode="&#xF41E;"
+      horiz-adv-x="640.4" d=" M551.1 156.1C528.7 156 509.3 150.6 493.1 142.6C487.2 154.5 481.1 164.9 480.1 172.7000000000001C478.9 181.8000000000001 477.6 187.2000000000001 479 198.0000000000001S486.7 224.1000000000001 486.6 225.2000000000001C486.5 226.3000000000001 485.2 231.8000000000001 472.3 231.9000000000001C459.4 232.0000000000001 448.3 229.4000000000001 447 226.0000000000001C445.7 222.6 443.2 214.9 441.7 206.9C439.4 195.2000000000001 415.9 153.4 402.6 131.6C398.2 140.1 394.5 147.6 393.7 153.6C392.5 162.7000000000001 391.2 168.1 392.6 178.9S400.3 205 400.2 206.1C400.1 207.2 398.8 212.7 385.9 212.8C373 212.9 361.9 210.3 360.6 206.9C359.3 203.5 357.9 195.5 355.3 187.8C352.7 180.1 321.4 110.5 313.2 92.4C309 83.2 305.3999999999999 75.8 302.8 70.8S302.6 70.4999999999999 302.4 69.9C300.2 65.6 298.9 63.2 298.9 63.2V63.1C297.2 59.9 295.3 56.9999999999999 294.4 56.9999999999999C293.8 56.9999999999999 292.5 65.3999999999999 294.7 76.8999999999999C299.4 101.0999999999999 310.5 138.6999999999999 310.4 140C310.3 140.6999999999999 312.5 147.1999999999999 303.1 150.6999999999999C294 154 290.7 148.5 289.9 148.5C289.1 148.5 288.5 146.5 288.5 146.5S298.6 188.8999999999999 269.1 188.8999999999999C250.7 188.8999999999999 225.1 168.6999999999999 212.5 150.3999999999999C204.6 146.0999999999999 187.5 136.7999999999999 169.5 126.8999999999999C162.6 123.0999999999999 155.5 119.1999999999999 148.8000000000001 115.5C148.3000000000001 116 147.9 116.5 147.4 117C111.6 155.1999999999999 45.5 182.1999999999999 48.3 233.5C49.3 252.2 55.8 301.3 175.4 360.9C273.4000000000001 409.7 351.8000000000001 396.3 365.3000000000001 366.5C384.7000000000001 324 323.4000000000001 244.9 221.6000000000001 233.5C182.8000000000001 229.2 162.4000000000001 244.2 157.3000000000001 249.8C152.0000000000001 255.7 151.2000000000001 256 149.2000000000001 254.9C145.9000000000001 253.1 148.0000000000001 247.9 149.2000000000001 244.8C152.2000000000001 236.9 164.7000000000001 222.9 186.0000000000001 215.9C204.7000000000001 209.8 250.2000000000001 206.4 305.2000000000001 227.7C367 251.5 415.1 317.8 401 373.3C386.6 429.7 293.1 448.2 204.6 416.8C151.9 398.1 94.9 368.7 53.9 330.4C5.2 284.8 -2.6 245.1 0.6 228.5C12 169.6 93.2 131.2 125.7 102.8C124.1 101.9 122.6 101.1 121.2 100.3C104.9 92.2 43 59.8 27.5 25.6C10 -13.2 30.4 -41 43.8 -44.8C85.6 -56.4 128.4 -35.4999999999999 151.4 -1.1999999999999S171.6 77.9000000000001 161 98.3000000000001C160.9 98.6000000000001 160.7 98.8000000000001 160.6 99.1000000000001C164.8 101.6000000000001 169.1 104.1000000000001 173.4 106.6000000000001C181.7 111.5000000000001 189.8 116.0000000000001 196.9 119.9000000000001C192.9 109.1000000000001 190 96.1000000000001 188.5 77.3000000000001C186.7 55.3000000000001 195.8 26.8000000000001 207.6 15.6000000000001C212.8 10.7000000000001 219.1 10.6000000000001 223 10.6000000000001C236.8 10.6000000000001 243 22.0000000000001 249.9 35.6000000000001C258.4 52.2000000000001 265.9 71.5000000000001 265.9 71.5000000000001S256.5 19.3000000000001 282.2 19.3000000000001C291.6 19.3000000000001 301 31.4000000000001 305.2 37.6000000000001V37.5000000000001S305.4 37.9 305.9 38.7C306.9 40.2 307.4 41.1 307.4 41.1V41.4C311.2 47.9 319.5 62.8 332 87.4C348.2 119.2000000000001 363.7 158.9 363.7 158.9S365.1 149.2000000000001 369.9 133.1C372.7 123.6 378.6 113.2000000000001 383.3 103.1C379.5 97.9 377.2 94.9 377.2 94.9S377.2 94.8 377.3 94.7000000000001C374.3 90.7000000000001 370.9 86.4 367.4 82.2000000000001C354.6 67.0000000000001 339.4 49.6 337.4 44.6C335 38.7 335.6 34.3 340.2 30.9C343.6 28.3 349.6 27.9 355.9 28.4C367.4 29.2 375.5 32.0000000000001 379.4 33.8C385.6 36 392.8 39.5 399.6 44.4C412.1 53.6 419.7 66.8 419 84.2000000000001C418.6 93.8000000000001 415.5 103.4 411.7 112.4C412.8 114.0000000000001 414 115.7000000000001 415.0999999999999 117.4C434.8999999999999 146.3 450.2 178.0000000000001 450.2 178.0000000000001S451.5999999999999 168.3000000000001 456.3999999999999 152.2000000000001C458.7999999999999 144.1 463.4999999999999 135.2000000000001 467.7999999999999 126.5000000000001C449.1999999999999 111.4 437.6999999999999 93.9 433.6999999999999 82.4C426.2999999999999 61.1 432.0999999999999 51.5000000000001 442.9999999999999 49.3C447.8999999999999 48.3 454.8999999999999 50.6 460.0999999999999 52.8C466.5999999999999 55 474.3999999999999 58.5 481.6999999999999 63.9C494.1999999999999 73.1 506.3 86.0000000000001 505.4999999999999 103.5000000000001C505.1999999999999 111.4 502.9999999999999 119.3000000000001 500.1 126.9C515.8 133.5000000000001 536.1999999999999 137.1 562.1999999999999 134.1C617.9 127.6 628.8 92.8 626.6999999999999 78.3C624.5999999999999 63.7 612.9 55.7 608.9999999999999 53.3C605.0999999999999 50.9 603.8999999999999 50 604.1999999999999 48.2C604.6999999999999 45.6 606.4999999999999 45.7 609.8 46.3C614.4 47.1 639 58.1 640.0999999999999 85C641.6999999999999 119 608.9999999999999 156.4 551.0999999999999 156.1zM121.8 11.4C103.4 -8.7 77.6 -16.3 66.5 -9.9C54.6 -3 59.3 26.6 82 48C95.8 61 113.6 73 125.4 80.4C128.1 82 132 84.4 136.8 87.3C137.6 87.8 138 87.9999999999999 138 87.9999999999999C138.9 88.6 139.9 89.1 140.9 89.6999999999999C149.2 59.3 141.2 32.4999999999999 121.8 11.3999999999999zM256.2 102.8C249.8 87.1 236.3 47.1 228.1 49.1999999999999C221.1 50.9999999999999 216.8 81.4999999999999 226.7 111.4999999999999C231.7 126.6 242.3 144.6 248.6 151.6C258.7 162.9 269.8 166.5 272.4 162C275.9 156.1 260.2 112.6 256.2 102.8zM367.2 49.8C364.5 48.4 362 47.4999999999999 360.8 48.1999999999999C359.9000000000001 48.6999999999999 361.9000000000001 50.5999999999999 361.9000000000001 50.5999999999999S375.8 65.4999999999999 381.3 72.2999999999999C384.5 76.2999999999999 388.2 80.9999999999999 392.2 86.1999999999999C392.2 85.6999999999999 392.3 85.1999999999999 392.3 84.5999999999999C392.2 66.6999999999999 375 54.5999999999999 367.2 49.7999999999998zM452.8 69.3C450.8 70.6999999999999 451.1 75.4 457.8 89.9999999999999C460.4 95.6999999999999 466.4 105.3 476.8 114.5C477.9999999999999 110.6999999999999 478.6999999999999 107.1 478.6999999999999 103.6999999999999C478.5999999999999 81.1999999999999 462.4999999999999 72.8 452.8 69.3z" />
+    <glyph glyph-name="schlix"
+      unicode="&#xF3EA;"
+      horiz-adv-x="448" d=" M350.5 290.3L296.3 336.4L369.7000000000001 375.4L448.0000000000001 331.2L350.5000000000001 290.3zM192 325.9L237.7 354.1L272.4 319.5L217 290.5L192 325.9zM126.9 319.3L158.8 341.4L176 313L139.3 290.5L126.9 319.3zM103.6 231.1L94.8 265.9000000000001L124.4 284.2000000000001L137.5 248.9000000000001L103.6 231.1zM82.4 314.8L106.3 332.9L115.2 308.9L88.5 290.6L82.4 314.8zM59 241.5L55.4 269.9L77.7 285.4L83.8 256.7000000000001L59 241.5zM28.4 224.9L49.2 237.7L52.5 204.3L29.6 192.3L28.4 224.9zM1.4 180L20.6 190.2L21 152L0 143.2L1.4 180zM60.5 120.7L32.2 112.4L30.6 159.2L55.7 169.9L60.5 120.7zM99 184.8L67.9 171.8L62.7 212.6L90.1 227L99 184.8zM123.2 71L81.6 65.1L73.5 128.6L108.7 139.4L123.2 71zM151.7 210.9L172.9 153.8L126.7 140.2L113 194.3L151.7 210.9zM237.4 -19.6L166.5 -16.3L142.2 79.5L197.4 88.1L237.4 -19.6zM152.5 260.1L194.7 282.5L222.7 236.6L171.9 215.3L152.5 260.1zM193.5 165.1999999999999L254.8 183.8999999999999L307.6 97.3L227.8 85.9999999999999L193.5 165.1999999999999zM244.9 250.8L312.2 279.5999999999999L377.7 214.1999999999999L289.1 188L244.9000000000001 250.8z" />
+    <glyph glyph-name="scribd"
+      unicode="&#xF28A;"
+      horiz-adv-x="384" d=" M42.3 195.3C26.2 214.3 17.6 241.2 17.5 275.2000000000001C17.5 375.6 92.7 428.3 184.7 428.3C283.3 429.9000000000001 341.5 379.3 369 357.7000000000001L318.5 285.6L281.2 310.2000000000001L308.1 348.8C271.6 372.8 228.7 385.3 185.1 384.6C134.4 385.4 73.4 357.4 73.4 308.4C73.4 289.7000000000001 84.6 287.7000000000001 102 292.8C125.3 298.1 143.9 292.2000000000001 157.8 278.8C184.2 254.5 181 211.2 157.1 186.9C127.9 157.4 71.9 159.6 42.3 195.3zM360 189.4C344.5 208.2000000000001 321.1 218.8000000000001 296.8 218C258.7 220 225.7 190 226.3 150.8C225.6 134 232.3 117.8 244.7 106.5C258.8 92.6 277.7000000000001 86.8 301 92.1C318.4 97.2000000000001 329.6 95.2000000000001 329.6 76.5C329.6 72.2 329.1 68 328.2000000000001 63.8C311.5000000000001 22.9 268.7000000000001 -0.6 206.8000000000001 -0.6C154.9 -0.8 104.4 15.8 62.7000000000001 46.7L96.4000000000001 86.1L60.8000000000001 113.5L0 41.7L15.4 27.9C67.9 -18.9 135.8 -44.6 206.1 -44.3C257.5 -44.3 300.5 -33.8 339.7 -0.2C396.8 51.2 393.9 149 360 189.4z" />
+    <glyph glyph-name="searchengin"
+      unicode="&#xF3EB;"
+      horiz-adv-x="460" d=" M220.6 317.7L153.4 289.5V404.8L98.7 214.5L153.4 238.7V108.4L220.6 317.7zM137.4 414.4L136.1 409.7L120.9 356.8C80.6 341.3 52 302.2 52 256.5C52 204.2 86.3 160.6 135.4 151V97.4C57.5 107.9 0 175.6 0 256.4C0 336.9 59.8 403.6 137.4 414.4zM448.8 -32.8C437.6 -44 425.7 -45.1 420.2 -43.3C414.8 -41.5 393.0999999999999 -23.4 359.8 1.1C326.5 25.7 326.2 36.8 316.8 57.8C307.4 78.6999999999999 286.4 100.4 259.3 110.1999999999999L249.6 124.8999999999999C224.9 107.9999999999999 196.6 97.9999999999999 168.3 96.1999999999999L170.4 102.8L186.3 152.3C232.8 164.1999999999999 267.2 206.3 267.2 256.5C267.2 311 228.8 358.5999999999999 171.1999999999999 363.5999999999999V415.7C254.4 410.6 320 341.2 320 256.4C320 222.8 308.8 191.7 291 166L305.6 156.4C315.4000000000001 129.3 337.1 108.4 358 99S390.2 89.3 414.8 56C439.4000000000001 22.8 457.5 1.1 459.3 -4.3S460 -21.6 448.8 -32.8zM438.9 -14.9C438.9 -10.5000000000001 435.3 -6.9 430.9 -6.9S422.9 -10.5000000000001 422.9 -14.9S426.5 -22.9 430.9 -22.9S438.9 -19.3 438.9 -14.9z" />
+    <glyph glyph-name="sellcast"
+      unicode="&#xF2DA;"
+      horiz-adv-x="448" d=" M353.4 416H94.7C42.6 416 0 373.4 0 321.4V62.7000000000001C0 10.6 42.6 -32 94.7 -32H353.4C405.5 -32 448.1 10.6 448.1 62.6V321.4C448.1 373.4 405.5 416 353.4 416zM303.4 99.6C275.5 51.4 213.5 34.7 165.2 62.4C142.3 22.6 110.3 53.8 122.9 75.6L138.6 102.8C144.5 113.1 157.8 116.7 168.1 110.7C186.7 99.9 168 110.8 186.6 100C214.2 84.1 250 93.7 266 121.3C281.9 148.9 272.3 184.7 244.7 200.7C226.9 210.9 244.1 201.1 226.1 211.3C201.5 225.5 222.7 263.2000000000001 247.7 248.8C266.3 238 247.6 248.9 266.2 238.1C314.6 210.1 331.3 147.8 303.4 99.6zM325.2 308.4000000000001C308.2 278.9000000000001 308.9 279.6 306.2 276.9000000000001C299.7 270.4000000000001 289.9 268.2000000000001 279.7 273.3000000000001C261.1 284.1 279.8 273.2000000000001 261.2 284C233.6 299.9000000000001 197.8 290.3000000000001 181.8 262.7000000000001S175.5 199.3 203.1 183.3C203.1 183.3 221.6 172.7 221.7 172.7C246.3 158.5 225.1 120.8 200.1 135.2C181.5 146 200.2 135.1 181.6 145.9C133.4 173.7 116.7 236 144.5 284.3C172.4 332.5 234.4 349.2 282.7 321.5L287.5 329.9C301.8 354.8 339.5 333.2 325.2 308.4z" />
+    <glyph glyph-name="sellsy"
+      unicode="&#xF213;"
+      horiz-adv-x="640" d=" M539.71 210.692C542.774 222.949 544 235.513 544 248.076C544 340.618 468.618 416 376.076 416C298.856 416 231.4420000000001 362.988 213.056 288.219C197.734 301.395 178.122 308.749 157.899 308.749C111.628 308.749 73.937 271.059 73.937 224.788C73.937 217.434 74.857 209.773 77.002 202.419C34.102 182.194 6.217 138.6810000000001 6.217 91.185C6.216 23.157 61.68 -32 129.401 -32H510.599C578.319 -32 633.783 23.157 633.783 91.184C633.784 147.568 594.867 197.209 539.71 210.692zM199.88 46.446C199.88 38.172 192.832 31.125 184.559 31.125H153.61C145.336 31.125 138.289 38.173 138.289 46.446V157.374C138.289 165.6470000000001 145.337 172.6950000000001 153.61 172.6950000000001H184.559C192.833 172.6950000000001 199.88 165.6470000000001 199.88 157.374V46.446zM289.357 46.446C289.357 38.172 282.309 31.125 274.035 31.125H243.086C234.812 31.125 227.765 38.173 227.765 46.446V177.904C227.765 186.178 234.813 193.225 243.086 193.225H274.035C282.309 193.225 289.357 186.177 289.357 177.904V46.446zM378.834 46.446C378.834 38.172 371.7869999999999 31.125 363.5129999999999 31.125H332.5639999999999C324.2899999999999 31.125 317.2419999999999 38.173 317.2419999999999 46.446V209.16C317.2419999999999 217.434 324.2899999999999 224.481 332.5639999999999 224.481H363.5129999999999C371.7869999999999 224.481 378.834 217.433 378.834 209.16V46.446zM465.8609999999999 46.446C465.8609999999999 38.172 458.8129999999999 31.125 450.5389999999999 31.125H422.0419999999999C413.7679999999999 31.125 406.7209999999999 38.173 406.7209999999999 46.446V271.059C406.7209999999999 279.6380000000001 413.7679999999999 286.687 422.0419999999999 286.687H450.5389999999999C458.8129999999999 286.687 465.8609999999999 279.639 465.8609999999999 271.0590000000001V46.446z" />
+    <glyph glyph-name="servicestack"
+      unicode="&#xF3EC;"
+      horiz-adv-x="496" d=" M88 232C169.7 221.8 361.7 129.7 392 0H0C99.5 8.1 184.5 137 88 232zM120 384C152.3 348.4 167.7 300.1 166.4 250.4C249.3 216.7 373.7 126.7 400 0H496C455.3 216.1 222.8 368.5 120 384z" />
+    <glyph glyph-name="shirtsinbulk"
+      unicode="&#xF214;"
+      horiz-adv-x="448" d=" M395.2080000000001 226.417H406V192.875H395.2080000000001V226.417zM395.2080000000001 236.042H406V269.584H395.2080000000001V236.042zM395.2080000000001 149.709H406V183.25H395.2080000000001V149.709zM358.75 312.75H325.208V302.25H358.75V312.75zM395.208 106.542H406V140.0840000000001H395.2080000000001V106.542zM311.5 312.75H277.958V302.25H311.5V312.75zM264.25 312.75H231V302.25H264.25V312.75zM217 312.75H183.75V302.25H217V312.75zM395.208 279.208H406V312.75H372.458V302.25H395.208V279.208zM139.416 20.208L170.041 6.791L174.416 16.708L143.791 30.1249999999999L139.416 20.208zM179.083 3L209.417 -10.708L213.791 -0.792L183.458 12.6249999999999L179.083 2.9999999999999zM395.208 63.375H406V96.917H395.2080000000001V63.375zM60.3749999999999 55.208L91 41.792L95.375 51.416L64.75 65.125L60.375 55.208zM100.0409999999999 37.709L130.666 24.292L135.041 34.209L104.4159999999999 47.625L100.0409999999999 37.709zM232.458 -0.792L236.833 -10.708L267.459 3L263.084 12.625L232.458 -0.792zM350.875 51.4160000000001L355.25 41.792L385.874 55.208L381.5 65.125L350.875 51.416zM311.5 34.209L315.875 24.292L346.5 37.709L342.126 47.625L311.5 34.209zM271.833 16.708L276.208 6.7910000000001L306.833 20.208L302.458 30.125L271.833 16.708zM311.5 401.4170000000001H277.958V390.9170000000001H311.5V401.4170000000001zM405.709 401.4170000000001H372.4580000000001V390.9170000000001H405.709V401.4170000000001zM217 401.4170000000001H183.75V390.9170000000001H217V401.4170000000001zM358.75 401.4170000000001H325.208V390.9170000000001H358.75V401.4170000000001zM264.25 401.4170000000001H231V390.9170000000001H264.25V401.4170000000001zM448 444.292V38.292L221.666 -60.292L0 38.292V444.292H448zM418.834 327.334H29.166V57.25L221.958 -28.5L418.833 57.25V327.334zM418.834 415.125H29.166V356.5H418.833V415.125zM75.542 401.4170000000001H42.291V390.9170000000001H75.542V401.4170000000001zM170.042 401.4170000000001H136.5V390.9170000000001H170.042V401.4170000000001zM122.791 401.4170000000001H89.25V390.9170000000001H122.792V401.4170000000001zM130.375 164.875C130.375 215.042 171.5 256.1670000000001 221.667 256.1670000000001C272.125 256.1670000000001 312.959 215.042 312.959 164.875C312.959 114.417 272.126 73.583 221.667 73.583C171.5 73.584 130.375 114.417 130.375 164.875zM251.125 146.791C251.125 133.666 227.208 132.5 218.459 132.5C206.209 132.5 188.709 135.125 182.584 147.375H181.709L172.666 129C187.542 119.667 201.833 116.75 219.916 116.75C239.458 116.75 270.958 122.583 270.958 147.959C270.958 196.084 192.5 164.292 192.5 185.875C192.5 199 213.208 200.75 222.25 200.75C233.041 200.75 251.416 197.542 257.833 187.626H258.708L267.459 204.542C252.292 210.667 240.042 216.501 223.125 216.501C203 216.501 173.542 210.084 173.542 184.709C173.542 140.375 251.125 172.75 251.125 146.791zM122.791 312.75H89.25V302.25H122.792V312.75zM52.792 302.25H75.542V312.75H42V279.208H52.792V302.25zM52.792 269.584H42V236.042H52.792V269.584zM170.042 312.75H136.5V302.25H170.042V312.75zM52.792 226.417H42V192.875H52.792V226.417zM52.792 140.083H42V106.5409999999999H52.792V140.083zM52.792 183.25H42V149.708H52.792V183.25zM52.792 96.917H42V63.375H52.792V96.917z" />
+    <glyph glyph-name="simplybuilt"
+      unicode="&#xF215;"
+      horiz-adv-x="512" d=" M481.2 384H375.2C360.7 384 348.6 372.2 348.6 357.7V318.1H163.3V357.7C163.3 372.2 151.3 384 136.7 384H30.7C16.1 384 4.3 372.2 4.3 357.7V26.3C4.3 11.8 16.1 0 30.9 0H481.3C496.1 0 507.9 11.8 507.9 26.3V357.7C507.7 372.2 495.9 384 481.2 384zM149.8 92.2C113.2 92.2 83.4 121.9 83.4 158.6C83.4 195.5 113.1 225.2 149.8 225.2C186.7 225.2 216.4 195.5 216.4 158.6C216.4 121.9 186.7 92.2000000000001 149.8 92.2000000000001zM362.2000000000001 92.2C325.3000000000001 92.2 295.6 121.9 295.6 158.8C295.6 195.4 325.3 225.2 362.2000000000001 225.2C398.8000000000001 225.2 428.6 195.5 428.6 158.8C428.6 121.9 398.8 92.1999999999999 362.2000000000001 92.1999999999999z" />
+    <glyph glyph-name="sistrix"
+      unicode="&#xF3EE;"
+      horiz-adv-x="448" d=" M448 -1L301.2 147.8C321.2 175.7 333.1 210 333.1 247C333.1 340.1 258.4 415.9 166.6 415.9C74.7 416 0 340.2 0 247.1S74.7 78.2 166.5 78.2C206.3 78.2 242.8 92.4 271.5 116.1L417.5 -32L448 -1zM166.5 117.2C95.9 117.2 38.4 175.5 38.4 247.1S95.9 377 166.5 377S294.6 318.7 294.6 247.1S237.2 117.2 166.5 117.2z" />
+    <glyph glyph-name="sith"
+      unicode="&#xF512;"
+      horiz-adv-x="448" d=" M0 416L69.71 297.25L10.85 308.77L80.69 217.74A146.741 146.741 0 0 1 80.69 166.29L10.85 75.26L69.71 86.78L0 -32L118.75 37.71L107.23 -21.15L198.26 48.6899999999999C215.28 45.6499999999999 232.73 45.6499999999999 249.74 48.6899999999999L340.77 -21.1500000000001L329.25 37.7099999999999L448 -32L378.29 86.78L437.1500000000001 75.26L367.3100000000001 166.29C370.3400000000001 183.3 370.3500000000001 200.73 367.3100000000001 217.74L437.1500000000001 308.77L378.2900000000001 297.25L448 416L329.25 346.29L340.77 405.19L249.71 335.32C241.21 336.84 232.61 337.61 224 337.61S206.79 336.83 198.29 335.32L107.23 405.19L118.75 346.29L0 416zM224 316.2200000000001C255.8 316.2200000000001 287.6 304.1 311.85 279.85C360.35 231.35 360.3400000000001 152.64 311.85 104.15S184.65 55.69 136.15 104.18C87.65 152.68 87.66 231.39 136.15 279.88C160.3900000000001 304.13 192.2000000000001 316.2199999999999 224 316.2199999999999zM224 279.56C201.58 279.56 179.17 271.04 162.08 253.95C127.9 219.77 127.89 164.27 162.08 130.08S251.73 95.9 285.92 130.08C320.1 164.26 320.11 219.76 285.92 253.95C268.83 271.04 246.42 279.56 224 279.56z" />
+    <glyph glyph-name="skyatlas"
+      unicode="&#xF216;"
+      horiz-adv-x="640" d=" M640 118.7C640 52.8 587.5 4.3 522.5 4.3C356.6 4.3 325.9 254 162.8 254C15.9 254 15.7 41.8 168.4 41.8C210.9 41.8 259.3 59.6 293.7 84.3C299.3 88.4 310.6 100.6 316.5 100.6S327.4 95.6 327.4 89.7C327.4 81.9 314.3 70.6 308.7 65.6C267.8 29.9999999999999 208.4 4.4 154 4.4C70.6 4.3 0 63.4 0 149.3S67.5 298.4 152.8 298.4C338.1 298.4 375.3 52.4999999999999 514.7 52.4999999999999C614.6 52.4999999999999 609.5 192.1999999999999 518.1 192.1999999999999C500.6 192.1999999999999 483.1 180.5999999999999 471.2 180.5999999999999C462.8000000000001 180.5999999999999 455.3000000000001 187.7999999999999 455.3000000000001 196.1999999999999C455.3000000000001 207.7999999999999 460.6000000000001 219.8999999999999 460.6000000000001 232.4999999999999C460.6000000000001 299.0999999999999 409.7000000000001 347.1999999999999 343.7000000000001 347.1999999999999C290.6 347.1999999999999 263.7000000000001 310.2999999999999 254.9000000000001 310.2999999999999C248.7000000000001 310.2999999999999 243.7000000000001 315.2999999999999 243.7000000000001 321.4999999999999C243.7000000000001 327.0999999999999 247.8000000000001 331.7999999999999 251.5000000000001 335.8999999999999C276.8000000000001 364.7 316.2000000000001 379.5999999999999 354.3000000000001 379.5999999999999C433.7000000000001 379.5999999999999 493.4000000000001 321.2 493.4000000000001 241.7999999999999C493.4000000000001 234.8999999999999 493.1000000000001 228.0999999999999 492.2000000000001 221.1999999999999C504.1000000000001 224.2999999999999 516.3000000000001 225.8999999999999 528.1000000000001 225.8999999999999C588.8000000000002 225.8999999999999 640.0000000000001 180.5999999999999 640.0000000000001 118.6999999999999z" />
+    <glyph glyph-name="skype"
+      unicode="&#xF17E;"
+      horiz-adv-x="448" d=" M424.7 148.2C427.6 162.2 429.4 177.1 429.4 192C429.4 305.5 337.5 397.3 224.1 397.3C209.2 397.3 194.4 395.6 180.3 392.6C161.3 407.3 137.7 416 112 416C50.2 416 0 365.8 0 304C0 278.3 8.7 254.7 23.3 235.8C20.4 221.8 18.6 206.9 18.6 192C18.6 78.5 110.5 -13.3 223.9 -13.3C238.8 -13.3 253.6 -11.6 267.7 -8.6C286.7 -23.2 310.3 -31.9 335.9 -31.9C397.7 -31.9 447.9 18.3 447.9 80.1C448 105.7 439.3 129.3 424.7 148.1999999999999zM230.1 56.7C164.5 56.7 109.6 85.9 109.6 121.7C109.6 137.7 118.6 152.3 139.1 152.3C170.3 152.3 173.2 107.4 227.2 107.4C252.9 107.4 269.5 118.8 269.5 133.7000000000001C269.5 152.4 253.5 155.3000000000001 227.5 161.7000000000001C165 177.1 109.7 183.7000000000001 109.7 248.9000000000001C109.7 308.1 168.3 330 218.8 330C273.9000000000001 330 329.6 308.1 329.6 274.6C329.6 257.7000000000001 318.2000000000001 242.8 299.3 242.8C271 242.8 270.1 276.3 224.3 276.3C198.6 276.3 182.3 269.3 182.3 253.8C182.3 234 203.1 232 251.4 220.8C292.8 211.5 342.1 194 342.1 143.2000000000001C342.1 84.1 285 56.7000000000001 230.1 56.7000000000001z" />
+    <glyph glyph-name="slack-hash"
+      unicode="&#xF3EF;"
+      horiz-adv-x="448" d=" M446.2 177.6C440 196.6 419.3 206.7 400.2 200.5L354.8 185.4L324.5 275.4000000000001L369.9 290.5C389 296.7000000000001 399 317.3000000000001 392.9 336.4000000000001C386.7 355.4000000000001 366 365.5 346.9 359.3000000000001L301.5 344.2000000000001L285.8 391.2000000000001C279.6 410.2000000000001 258.9000000000001 420.3000000000001 239.8 414.1C220.7 407.9000000000001 210.7 387.3000000000001 216.8 368.2000000000001L232.5 321.2000000000001L139.1 290.0000000000001L123.4 337.0000000000001C117.2 356.0000000000001 96.5 366.1 77.4 359.9000000000001C58.3 353.7000000000001 48.3 333.1000000000001 54.4 314.0000000000001L70.1 267.0000000000001L24.8 252.0000000000001C5.7 245.8000000000001 -4.3 225.2000000000001 1.8 206.1000000000001C6.8 191.6 20.9 182.1 35.4 181.5000000000001C42.2 180.5000000000001 47.4 183.1000000000001 93.1 198.3000000000001L123.4 108.3000000000001L78 93.2C59 87 48.9 66.3 55 47.3C60 32.8 74.1 23.3 88.6 22.7C95.4 21.7 100.6 24.3 146.3 39.5L162 -7.5C167.9 -24.4 186.7 -36.5 208 -30.4C227.1 -24.2 237.1 -3.6 231 15.5L215.3 62.5L308.9 93.8L324.6 46.8C330.5 29.9 349.3 17.8 370.6 23.9C389.7 30.1 399.7 50.7 393.6 69.8L377.9 116.8L423.3 131.9C442.3 137.9 452.4 158.6 446.2 177.6zM192.1 130.4L161.8 220.6L255.3 251.9000000000001L285.6 161.7000000000001L192.1 130.4z" />
+    <glyph glyph-name="slack"
+      unicode="&#xF198;"
+      horiz-adv-x="448" d=" M244.2 230.5L263.5 172.8L203.7 152.8L184.4 210.5L244.2 230.5zM285.6 -13.2C131.6 -59.4 65 -23.6 18.8 130.4S8.4 351 162.4 397.2C316.4 443.4 383 407.6 429.2 253.6C475.4 99.6 439.6 33 285.6 -13.2zM366.2 183C362.3 195.2 349 201.6 336.8 197.7L307.8 188L288.5 245.7L317.5 255.4C329.7 259.3 336.1 272.6 332.2 284.8C328.3 297 315 303.4 302.8 299.5L273.8 289.8L263.8 319.9C259.9000000000001 332.1 246.6 338.5 234.4 334.6C222.2 330.7 215.8 317.4 219.7 305.2L229.7 275.1L169.9 255L159.9 285.1C156 297.3 142.7000000000001 303.7 130.5 299.8C118.3 295.9 111.9 282.6 115.8 270.4L125.8 240.3L96.8 230.6C84.6 226.7 78.2 213.4 82.1 201.2C85.3 191.9 94.3 185.8 103.6 185.4C107.9 184.8 111.3 186.4 140.5 196.1L159.8000000000001 138.4L130.8000000000001 128.7C118.6 124.8 112.2000000000001 111.5 116.1 99.3C119.3000000000001 90 128.3000000000001 83.9 137.6 83.5C141.9 82.9 145.3 84.5 174.5 94.2L184.5 64.1C188.2 53.3 200.3000000000001 45.4999999999999 213.9 49.4C226.1 53.3 232.5000000000001 66.6 228.6 78.8L218.6 108.9L278.4000000000001 129L288.4000000000001 98.9C292.1 88.1 304.2000000000001 80.3 317.8 84.2C330 88.1 336.4000000000001 101.4 332.5 113.6L322.5 143.7L351.5 153.4C363.7 157.6 370.1 170.9 366.2 183z" />
+    <glyph glyph-name="slideshare"
+      unicode="&#xF1E7;"
+      horiz-adv-x="512" d=" M249.429 236.564C249.429 204.848 221.714 178.847 187.712 178.847C153.711 178.847 125.996 204.848 125.996 236.564C125.996 268.565 153.711 294.28 187.712 294.28C221.713 294.28 249.429 268.565 249.429 236.564zM503.723 186.562C485.437 163.989 450.579 136.274 397.4340000000001 114.559C453.722 -77.163 260 -107.735 263.143 -9.446C263.143 -11.16 262.857 43.413 262.857 83.986C258.572 84.844 254.286 85.986 249.143 87.129C249.143 46.271 248.857 -11.16 248.857 -9.446C252 -107.735 58.278 -77.163 114.566 114.559C61.421 136.274 26.563 163.989 8.276 186.562C-0.867 200.276 9.134 214.849 24.277 204.277C26.277 202.849 28.562 201.42 30.562 199.992V398.284C30.563 425.713 51.135 448 76.565 448H435.722C461.151 448 481.724 425.713 481.724 398.284V199.991L487.724 204.276C502.867 214.849 512.867 200.276 503.723 186.562zM457.151 375.712C457.151 408.57 446.579 421.428 416.2920000000001 421.428H98.566C66.85 421.428 57.993 410.5700000000001 57.993 375.712V183.419C125.71 147.989 183.713 154.275 215.428 155.418C228.857 155.704 237.429 153.132 242.572 147.703C244.261 146.016 252.595 138.257 262.859 130.5600000000001C264.002 146.275 272.86 156.275 296.575 155.4180000000001C328.862 153.9900000000001 388.293 147.7030000000001 457.152 185.1340000000001V375.712zM331.146 294.28C297.144 294.28 269.43 268.565 269.43 236.564C269.43 204.848 297.145 178.847 331.146 178.847C365.433 178.847 392.862 204.848 392.862 236.564C392.862 268.565 365.4330000000001 294.28 331.146 294.28z" />
+    <glyph glyph-name="snapchat-ghost"
+      unicode="&#xF2AC;"
+      horiz-adv-x="512" d=" M510.846 55.327C505.635 43.17 483.607 34.238 443.486 28.009C441.422 25.223 439.711 13.323 436.979 4.053C435.354 -1.513 431.356 -4.816 424.851 -4.816L424.554 -4.811C415.159 -4.811 405.351 -0.4880000000001 385.702 -0.4880000000001C359.181 -0.4880000000001 350.04 -6.5310000000001 329.448 -21.0760000000001C307.616 -36.5140000000001 286.677 -49.8400000000001 255.421 -48.4750000000001C223.775 -50.8090000000001 197.396 -31.5670000000001 182.55 -21.0710000000001C161.836 -6.4280000000001 152.722 -0.4890000000001 126.309 -0.4890000000001C107.445 -0.4890000000001 95.573 -5.2090000000001 87.457 -5.2090000000001C79.384 -5.2090000000001 76.244 -0.2870000000001 75.035 3.8309999999999C72.332 13.0199999999999 70.631 25.0939999999999 68.512 27.9609999999999C47.833 31.1699999999999 1.202 39.3049999999999 0.014 60.1109999999999A10.627 10.627 0 0 0 8.891 71.1799999999999C78.474 82.6349999999999 109.815 154.0809999999999 111.118 157.1139999999999C111.192 157.2899999999999 111.273 157.4579999999999 111.355 157.6289999999999C115.068 165.1659999999999 115.899 171.4779999999999 113.818 176.3819999999999C108.768 188.2779999999999 86.946 192.5459999999999 77.765 196.1779999999999C54.05 205.5439999999999 50.75 216.3059999999999 52.153 223.6819999999999C54.59 236.5179999999999 73.878 244.4169999999999 85.155 239.1349999999999C94.074 234.9539999999999 101.998 232.8379999999999 108.702 232.8379999999999C113.724 232.8379999999999 116.914 234.0419999999999 118.662 235.0089999999999C116.619 270.9449999999999 111.561 322.2989999999999 124.349 350.9779999999999C158.122 426.6960000000001 229.705 432.58 250.826 432.58C251.77 432.58 259.967 432.669 260.936 432.669C313.084 432.669 363.19 405.889 387.659 351.026C400.436 322.376 395.408 271.234 393.354 235.017C394.936 234.145 397.711 233.075 401.953 232.878C408.35 233.164 415.768 235.267 424.022 239.135C430.107 241.981 438.428 241.596 444.502 239.077L444.531 239.067C454.007 235.682 459.97 228.852 460.12 221.197C460.304 211.45 451.598 203.032 434.242 196.179C432.124 195.344 429.548 194.524 426.808 193.654C417.011 190.548 402.208 185.849 398.192 176.383C396.113 171.479 396.9360000000001 165.172 400.652 157.635C400.739 157.467 400.818 157.293 400.891 157.12C402.192 154.09 433.506 82.66 503.121 71.186C509.548 70.128 514.284 63.309 510.846 55.3270000000001z" />
+    <glyph glyph-name="snapchat-square"
+      unicode="&#xF2AD;"
+      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM393.5 101.1C390 93 375.4 87.1 348.7 82.9C347.3 81.0000000000001 346.2 73.1 344.4 67.0000000000001C343.3 63.3000000000001 340.7 61.1000000000001 336.3 61.1000000000001H336.1C329.9 61.1000000000001 323.3 64.0000000000001 310.3 64.0000000000001C292.7 64.0000000000001 286.6 60.0000000000001 272.9 50.3000000000001C258.4 40.0000000000001 244.5 31.2 223.7 32.1000000000001C202.7 30.5000000000001 185.1 43.3000000000001 175.2 50.3000000000001C161.4 60.0000000000001 155.4 64.0000000000001 137.8 64.0000000000001C125.3 64.0000000000001 117.4 60.9 112 60.9C106.6 60.9 104.5 64.2000000000001 103.7 66.9C101.9 73.0000000000001 100.8 81.0000000000001 99.4 82.9C85.6 85.0000000000001 54.6 90.4 53.9 104.3C53.7 107.9 56.2 111.1 59.8 111.7C106.1 119.3 126.9 166.8 127.8 168.8C127.8 168.9 127.9 169 128 169.1C130.5 174.1 131 178.3 129.6 181.6C126.2 189.5 111.7 192.3 105.6 194.8C89.8 201 87.6 208.2 88.6 213.1C90.2 221.6 103 226.9000000000001 110.5 223.4C116.4 220.6 121.7 219.2000000000001 126.2 219.2000000000001C129.5 219.2000000000001 131.7 220.0000000000001 132.8 220.6000000000001C131.4 244.5000000000001 128.1 278.6 136.6 297.7000000000001C159.1 348 206.7 352 220.7 352C221.3 352 226.8 352.1 227.4 352.1C262.1 352.1 295.4 334.3 311.7 297.8C320.2 278.7000000000001 316.9 244.7 315.5 220.7C316.6 220.1 318.4 219.4 321.2 219.3C325.5 219.5 330.4 220.9 335.9 223.5C339.9 225.4 345.5 225.1 349.5 223.5C355.8 221.2 359.8 216.7 359.9 211.6C360 205.1 354.2 199.5 342.7 195C341.3 194.4 339.6 193.9 337.8 193.3C331.3 191.2 321.4000000000001 188.1 318.8 181.8C317.4000000000001 178.5 318 174.3 320.4000000000001 169.3C320.5000000000001 169.2 320.5000000000001 169.1 320.6 169C321.5 167 342.3 119.5 388.6 111.9C392.6 110.9 395.7000000000001 106.4 393.5 101.1z" />
+    <glyph glyph-name="snapchat"
+      unicode="&#xF2AB;"
+      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM417.5 101.1C414 93 399.4 87.1 372.7 82.9C371.3 81.0000000000001 370.2 73.1 368.4 67.0000000000001C367.3 63.3000000000001 364.7 61.1000000000001 360.3 61.1000000000001H360.1C353.9 61.1000000000001 347.3 64.0000000000001 334.3 64.0000000000001C316.7 64.0000000000001 310.6 60.0000000000001 296.9 50.3000000000001C282.4 40.0000000000001 268.5 31.2 247.7 32.1000000000001C226.7 30.5000000000001 209.1 43.3000000000001 199.2 50.3000000000001C185.4 60.0000000000001 179.4 64.0000000000001 161.8 64.0000000000001C149.3 64.0000000000001 141.4 60.9 136 60.9C130.6 60.9 128.5 64.2000000000001 127.7 66.9C125.9 73.0000000000001 124.8 81.0000000000001 123.4 82.9C109.6 85.0000000000001 78.6 90.4 77.9 104.3C77.7 107.9 80.2 111.1 83.8 111.7C130.1 119.3 150.9 166.8 151.8 168.8C151.8 168.9 151.9 169 152 169.1C154.5 174.1 155 178.3 153.6 181.6C150.2 189.5 135.7 192.3 129.6 194.8C113.8 201 111.6 208.2 112.6 213.1C114.2 221.6 127 226.9000000000001 134.5 223.4C140.4 220.6 145.7 219.2000000000001 150.2 219.2000000000001C153.5 219.2000000000001 155.7 220.0000000000001 156.8 220.6000000000001C155.4 244.5000000000001 152.1 278.6 160.6 297.7000000000001C183.1 348 230.7 352 244.7 352C245.3 352 250.8 352.1 251.4 352.1C286.1 352.1 319.4 334.3 335.7 297.8C344.2 278.7000000000001 340.9 244.7 339.5 220.7C340.6 220.1 342.4 219.4 345.2 219.3C349.5 219.5 354.4 220.9 359.9 223.5C363.9 225.4 369.5 225.1 373.5 223.5C379.8 221.2 383.8 216.7 383.9 211.6C384 205.1 378.2 199.5 366.7 195C365.3 194.4 363.6 193.9 361.8 193.3C355.3 191.2 345.4000000000001 188.1 342.8 181.8C341.4000000000001 178.5 342 174.3 344.4000000000001 169.3C344.5000000000001 169.2 344.5000000000001 169.1 344.6 169C345.5 167 366.3 119.5 412.6 111.9C416.6 110.9 419.7000000000001 106.4 417.5 101.1z" />
+    <glyph glyph-name="soundcloud"
+      unicode="&#xF1BE;"
+      horiz-adv-x="640" d=" M111.4 191.7L117.2 126.7L111.4 58.4C111.1 55.9 109.2 54 107 54S102.8 55.9 102.8 58.4L97.2 126.7L102.8 191.7C102.8 193.9 104.7 195.9 107 195.9C109.2 195.9 111.1 193.9 111.4 191.7zM132.8 237.3C130 237.3 128.1 235.1 127.8 232.3L122.8 126.7L127.8 58.4C128.1 55.6 130 53.4 132.8 53.4C135.3 53.4 137.5 55.6 137.5 58.4L143.3 126.7L137.5 232.3C137.5 235.1 135.3 237.3 132.8 237.3zM158.3 261.4C155.2 261.4 153 259.2 152.7 256.1L148.3 126.1L152.7 58.3C153 55.1999999999999 155.2 52.9999999999999 158.3 52.9999999999999C161.1 52.9999999999999 163.6 55.1999999999999 163.6 58.3L168.9 126.1L163.6 256.1C163.6 259.2 161.1 261.4 158.3 261.4zM7.2 164.8C5.8 164.8 5 163.7 4.7 162.3L0 126.7L4.7 91.7C5 90.3 5.8 89.2 7.2 89.2S9.4 90.3 9.7 91.7L15.3 126.7L9.7 162.3C9.4 163.7 8.6 164.8 7.2 164.8zM30.8 186.7C29.4 186.7 28.3 185.6 28.3 184.2L21.9 126.7L28.3 70.6C28.3 68.9 29.4 67.8 30.8 67.8S33.3 68.9 33.6 70.3L40.8 126.6999999999999L33.6 184.1999999999999C33.3 185.5999999999999 32.2 186.6999999999999 30.8 186.6999999999999zM56.1 198.1C54.4 198.1 53 196.7 52.8 194.8L47 126.7L52.8 60.9C53.1 59.2 54.5 57.8 56.1 57.8C57.8 57.8 59.2 59.1999999999999 59.2 60.9L66.1 126.7L59.2 194.8C59.2 196.7 57.8 198.1 56.1 198.1zM81.4 200.3C79.5 200.3 77.8 198.9 77.8 196.7L72 126.7L77.8 58.9C77.8 56.7 79.5 55.3 81.4 55.3S85 56.6999999999999 85.3 58.9L91.7 126.7L85.3 196.7C85 198.9 83.3 200.3 81.4 200.3zM322.8 311.2C321.7 312 320 312.6 318.6 312.6C316.4000000000001 312.6 314.4000000000001 311.8 313 310.7C311.1 309 309.9 306.5 309.7 304V303.2L306.4 126.5L308.1 94L309.8 62.3C310.1 57.6 314 53.7 318.7 53.7S327.3 57.6 327.3 62.3L331.2 126.5L327.3 304C326.9 307 325.3 309.8 322.8 311.2zM296.1 295.9C294.7000000000001 296.7 293.3 297.3 291.7000000000001 297.3S288.6 296.7 287.3000000000001 295.9C285.1000000000001 294.5 283.7000000000001 292 283.7000000000001 289.2L283.4000000000001 287.5L280.6 126.7S280.6 126.4 283.7000000000001 61.1V60.8C283.7000000000001 59.1 284.3000000000001 57.5 285.4000000000001 56.1C287.1 54.2 289.3 53 291.8 53C294 53 296 54.1 297.4000000000001 55.5C299.1 56.9 299.9000000000001 58.8 299.9000000000001 61.1L300.2000000000001 67.8L303.3000000000001 126.4L300.0000000000001 289.2000000000001C299.7000000000001 292.0000000000001 298.3000000000001 294.5000000000001 296.1000000000001 295.9000000000001zM184.7 273.4C181.6 273.4 178.9 270.6 178.9 267.3L174.5 126.7L178.9 59.5C179.2 56.2 181.7 53.7 184.7 53.7C188 53.7 190.5 56.2 190.8 59.5L195.8 126.7L190.8 267.3C190.6 270.6 188.1 273.4 184.7 273.4zM561.4 210.6C550.6 210.6 540.3 208.4 530.8 204.5C524.4 275.3 464.9999999999999 330.9 392.5 330.9C374.7 330.9 357.5 327.6 342.2 321.5C336.0999999999999 319.3 334.3999999999999 317.1 334.3999999999999 312.3V62.6C334.3999999999999 57.6 338.2999999999999 54 343 53.4H561.3C604.5999999999999 53.4 639.9 88.4 639.9 131.7000000000001C640 175.3000000000001 604.6999999999999 210.6000000000001 561.4 210.6000000000001zM264.7 270.9C260.5 270.9 257.2 267.6 256.9 263.1L253.6 126.4L256.9 60.8C257.2 56.6 260.5 53.3 264.7 53.3C268.9 53.3 272.2 56.6 272.2 60.8L276.1 126.4L272.2 263.1C271.9 267.6 268.9 270.9 264.7 270.9zM211.1 278.7C207.8 278.7 204.7 275.6 204.7 272L200.8 126.7L204.7 59.8C205 56.1999999999999 207.8 53.4 211.1 53.4C214.7 53.4 217.5 56.2 217.8 59.8L222.2 126.6999999999999L217.8 272C217.5 275.5999999999999 214.7 278.7 211.1 278.7zM237.8 275.3C233.9 275.3 230.9 272.2 230.9 268.4L227 126.7L230.9 60.3C231.2 56.4 234 53.4 237.8 53.4S244.7 56.5 244.7 60.3L248.9 126.6999999999999L244.7 268.3999999999999C244.7 272.3 241.7 275.3 237.8 275.3z" />
+    <glyph glyph-name="speakap"
+      unicode="&#xF3F3;"
+      horiz-adv-x="448" d=" M352 416H96C43.2 416 0 372.8 0 320V64C0 11.2 43.2 -32 96 -32H352C404.8 -32 448 11.2 448 64V320C448 372.8 404.8 416 352 416zM221 65.1C181.4 65.1 139.1 82.9 139.1 118.8V146H179V128.2C179 113.1 198.5 103.7 220.9 103.7C245.1 103.7 262.2 114.1 262.2 133.2C262.2 157 235 165.1 207.5 175.8C175.6 188.2 144.4 202 144.4 244.9C144.4 292.9 183 311.3 224.3 311.3C261.9000000000001 311.3 299.8 297.2000000000001 299.8 269.4V238.2H259.9000000000001V254.3C259.9000000000001 266.4 242.1 272.8 224.3000000000001 272.8C204.8000000000001 272.8 188.7000000000001 264.7000000000001 188.7000000000001 246.6C188.7000000000001 224.5 211.2000000000001 217.4 235.7000000000001 207.7C271.6 195.3 306.8000000000001 180.5 306.8000000000001 136.2000000000001C306.9000000000001 87.6 266.0000000000001 65.1 221.0000000000001 65.1z" />
+    <glyph glyph-name="spotify"
+      unicode="&#xF1BC;"
+      horiz-adv-x="496" d=" M248 440C111.1 440 0 328.9 0 192S111.1 -56 248 -56S496 55.1 496 192S384.9 440 248 440zM348.7 75.1C344.5 75.1 341.9 76.4 338 78.7000000000001C275.6 116.3000000000001 203 117.9 131.3 103.2000000000001C127.4 102.2000000000001 122.3 100.6 119.4 100.6C109.7 100.6 103.6 108.3 103.6 116.4C103.6 126.7000000000001 109.7 131.6 117.2 133.2000000000001C199.1 151.3000000000001 282.8 149.7000000000001 354.2 107.0000000000001C360.3 103.1000000000001 363.9 99.6000000000001 363.9 90.5000000000001S356.8 75.1000000000001 348.7 75.1000000000001zM375.6 140.7000000000001C370.4 140.7000000000001 366.9 143.0000000000001 363.3 144.9C300.8 181.9 207.6 196.8000000000001 124.7 174.3C119.9 173 117.3 171.7 112.8 171.7C102.1 171.7 93.4 180.4 93.4 191.1S98.6 208.9 108.9 211.8C136.7 219.6 165.1 225.4 206.6999999999999 225.4C271.5999999999999 225.4 334.3 209.3 383.7 179.9C391.8 175.1 395 168.9 395 160.2C394.8999999999999 149.4 386.5 140.7 375.6 140.7zM406.6 216.9C401.4 216.9 398.2 218.2000000000001 393.7 220.8000000000001C322.5 263.3000000000001 195.2 273.5000000000001 112.8 250.5000000000001C109.2 249.5000000000001 104.7 247.9000000000001 99.9 247.9000000000001C86.7 247.9000000000001 76.6 258.2000000000001 76.6 271.5C76.6 285.1 85 292.8000000000001 94 295.4000000000001C129.2 305.7000000000001 168.6 310.6 211.5 310.6C284.5 310.6 361 295.4000000000001 416.9 262.8C424.7 258.3 429.8 252.1 429.8 240.2C429.8 226.6 418.8 216.9 406.6 216.9z" />
+    <glyph glyph-name="stack-exchange"
+      unicode="&#xF18D;"
+      horiz-adv-x="448" d=" M17.7 115.7H430.4V93.7C430.4 56 401.1 25.7 365.1 25.7H346.1L259.3 -64V25.7H83C47 25.7 17.7 56 17.7 93.7V115.7zM17.7 139.3H430.4V224.3H17.7V139.3zM17.7 248.7H430.4V333.7000000000001H17.7V248.7zM365 448H83C47 448 17.7 417.7 17.7 380.3V358H430.4V380.3C430.3 417.7 401 448 365 448z" />
+    <glyph glyph-name="stack-overflow"
+      unicode="&#xF16C;"
+      horiz-adv-x="384" d=" M293.7 148L112.5 232.5L129.2 269L310.5 184.3L293.7 148zM341.7 224L188.2 352.3L162.7 321.5L316.2 193.2L341.7 224zM381.3 255.7L262 416L230 392L349.3 231.7L381.3 255.7zM290.7 137L95 178.3L86.8 139L282.5 98L290.7 137zM322.3 8H42.7V128H2.7V-32H362.2V128H322.2V8zM282.5 88H82.5V48.3H282.5V88z" />
+    <glyph glyph-name="staylinked"
+      unicode="&#xF3F5;"
+      horiz-adv-x="440" d=" M201.6 320.6C205.7 323.8 211.9 323.6 215.4 320.1L385.4 152.8L382.7 155.5L427 114.1999999999999C430.7 110.6999999999999 430.3 105.1999999999999 426.3 101.9999999999999L228.3 -61.9000000000001C218.4 -69.5000000000001 211 -62.7000000000001 211 -62.7000000000001L2.3 133.4C-1.2 136.9 -0.7 142.4 3.5 145.6L49.3 180.5C53.5 183.6999999999999 59.7 183.5 63.2 180L215.1 32.4999999999999C218.8 28.9999999999999 225.1 28.8 229.3 32.1L322.5 106.1C326.6 109.3 327 114.8 323.4 118.3L239.4 199.6C235.8 203.1 229.5 203.3 225.4 200.1L225.3 200C221.2 196.8 214.9 197 211.3 200.5L143.2 264.8C139.7 268.3 140.1 273.8 144.3 277L201.6 320.5999999999999M216.4 63.3C220.1 59.8 226.5 59.6 230.7 62.9L280.9 101.7L280.6 102L288.3 108C292.5 111.2 292.9 116.7 289.2 120.2L232.1 174.6C228.5 178.1 222.0999999999999 178.3 217.9 175.1L217.8 175C213.6 171.8 207.3 171.8999999999999 203.6 175.3999999999999L109 267.2C105.4 270.7 105.9 276.1 110.1 279.4L202.3 350.9C206.4 354.1 212.6 353.9 216.2 350.4L376.6 191.4C380.3 187.9 386.6 187.7 390.7000000000001 190.9L436.5000000000001 226.7C440.6000000000001 229.9 440.9000000000001 235.4 437.2000000000001 238.9L226.7 445.5C225.2 446.7 218.7 451 210.4 444.4L3.6 282.3C-0.6 279.1 -1.2 273.6 2.4 270.1L44.7 228.4000000000001" />
+    <glyph glyph-name="steam-square"
+      unicode="&#xF1B7;"
+      horiz-adv-x="448" d=" M185.2 91.5C192.9 110 184.2 131.2 165.6 138.9L136.1 151.1C147.5 155.4 160.4 155.6 172.5 150.6C184.7 145.5 194.1 136 199.2 123.9C204.2 111.7 204.2 98.3 199.1 86.2C188.6 61.1 159.7 49.2 134.5 59.7C122.9 64.5 114.1 73.3 109.1 83.9L137.6 72.1C156.2 64.3 177.5 72.9999999999999 185.2 91.4999999999999zM400 416H48C21.5 416 0 394.5 0 368V207.3L116.6 159.2C128.6 167.4 142.8 171.3 157.3 170.5L212.7 250.7V251.8C212.7 300 252 339.3 300.3 339.3S387.9 300 387.9 251.8C387.9 202.6 347 163.1 298.3 164.3L219.3 107.9999999999999C220.9 69.4999999999999 190.2 39.1999999999999 153.6 39.1999999999999C121.8 39.1999999999999 95.1 61.8999999999999 89.1 91.8999999999999L0 128.8V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM300.3 193.5C268.1 193.5 241.9 219.6 241.9 251.8S268.1 310.1 300.3 310.1S358.7 283.9000000000001 358.7 251.8S332.5 193.5 300.3 193.5zM300.4000000000001 208.1C324.6 208.1 344.3 227.7 344.3 251.9C344.3 276.1 324.7 295.7 300.4000000000001 295.7C276.2000000000001 295.7 256.5000000000001 276.1 256.5000000000001 251.9C256.5000000000001 227.7 276.2000000000001 208.1 300.4000000000001 208.1z" />
+    <glyph glyph-name="steam-symbol"
+      unicode="&#xF3F6;"
+      horiz-adv-x="448" d=" M395.5 270.5C395.5 236.7 368 209.5 334.5 209.5C300.7 209.5 273.5 236.8 273.5 270.5S300.8 331.5 334.5 331.5C368 331.5 395.5 304.3 395.5 270.5zM448 270.3C448 207.3 397 156.5 334.3 156.5L225 76.7C221 33.7 184.5 -0.1 140.5 -0.1C100 -0.1 65.8 28.7 57.5 66.9L0 90V197.3L97.2 158C112.3 167.2 129.4 171.3 149.2 169.5L220.2 271.2C220.7 333.5 271.7 384 334.2 384C397 384 448 333 448 270.3zM203 85C203 119.7 175.2 147.5 140.5 147.5C136 147.5 131.5 147 127 146L153 135.5C178.5 125.3 191 96.5 180.7 71C170.5 45.5 141.5 33 116 43.5C105.8 47.5 95.5 51.8 85.3 55.7C95.8 36 116.5 22.5 140.5 22.5C175.2 22.5 203 50.3 203 85zM410.5 270.3C410.5 312.3 376.2 346.5 334.3 346.5C292 346.5 257.8 312.3 257.8 270.3C257.8 228.1 292.1 194.1 334.3 194.1C376.2 194 410.5 228.0000000000001 410.5 270.3z" />
+    <glyph glyph-name="steam"
+      unicode="&#xF1B6;"
+      horiz-adv-x="496" d=" M496 192C496 55 384.8 -56 247.6 -56C133.8 -56 38 20.3 8.6 124.4L103.8 85.1C110.2 52.9999999999999 138.7 28.7 172.7 28.7C211.9 28.7 244.6 61.1 242.9 102.2L327.4 162.4C379.5 161.1 423.2 203.3 423.2 255.9C423.2 307.5 381.2 349.4 329.5 349.4S235.8 307.4 235.8 255.9V254.7L176.6 169C161.1 169.9 145.9 165.6 133.1 156.9L0 211.9C10.2 339.6 117.1 440 247.6 440C384.8 440 496 329 496 192zM155.7 63.7L125.2 76.3A52.79 52.79 0 0 1 152.4 50.5C179.3 39.3 210.2 52.1 221.4 78.9C226.8 91.9 226.9 106.2 221.5 119.2C216.1 132.2 206 142.4 193 147.8C180.1 153.2 166.3 153 154.1 148.4L185.6 135.4C205.4 127.2000000000001 214.8 104.5000000000001 206.5 84.7000000000001C198.2 64.8000000000001 175.5 55.5000000000001 155.7 63.7000000000001zM329.5 193.6C295.1 193.6 267.1 221.6 267.1 255.9S295.1 318.2 329.5 318.2S391.9 290.2 391.9 255.9S364 193.6 329.5 193.6zM329.6 209.2C355.5 209.2 376.5 230.2 376.5 256C376.5 281.9 355.5 302.8 329.6 302.8S282.7000000000001 281.8 282.7000000000001 256C282.8000000000001 230.2 303.8000000000001 209.2 329.6 209.2z" />
+    <glyph glyph-name="sticker-mule"
+      unicode="&#xF3F7;"
+      horiz-adv-x="576" d=" M353.1 -61.8C347.2000000000001 -64.7 321 -65 316.6 -61.3C312.5 -58.3 314.4000000000001 -49.4 315.1 -46.3C317.3 -31.3 312.6 -38.4 305.3 -34.8C302.2 -33.3 301.2 -29.3 300.7 -24.8C300.2 -23.3 299.7 -22.3 299.2 -21.3C297.5 -10.6 306 12.3 307.4 22.1C312.3 45.8 306.7 59.3 308.9 68.9999999999999C312.6 85.1999999999999 313 72.4999999999999 313 98.8999999999999C311.6 124.7999999999999 316.3 135.7999999999999 313.5 137.7999999999999C298.7 137.7999999999999 249.2 127.0999999999999 201.3 135.7999999999999C155.2 144.6999999999999 141.9 164.7999999999999 135.9 166.6999999999999C125.6 171.1999999999999 112.7 166.1999999999999 108.6 159.6999999999999C108.5 159.5999999999999 73.6 89.0999999999999 69 71.8999999999999C62.8 51.3999999999999 68.5 24.4999999999999 73.1 5.0999999999999C73.1 4.9999999999998 77.6 -9.5000000000002 83.4 -14.4000000000001C85.5 -15.9000000000001 88.5 -16.9000000000001 90.6 -18.9000000000001C93.4 -21.6000000000001 100 -34.1000000000001 100.4 -34.9000000000001C103 -39.4000000000001 104 -42.9000000000001 98.9 -45.4000000000001C95.3 -47.4000000000001 89.6 -47.9000000000001 84.5 -47.9000000000001C81.9 -48.4000000000001 83 -51.4000000000001 81.4 -52.9000000000001C78.5 -55.7000000000002 60.7 -59.0000000000002 51.5 -55.4000000000001C48.9 -54.4000000000001 45.8 -52.4000000000001 45.3 -50.4000000000001C43.8 -46.4000000000001 47.4 -41.4000000000001 44.3 -37.9000000000001C39.8 -35.0000000000002 31.2 -35.9000000000001 27.3 -25.9000000000001C25.1 -20.5000000000002 24.7 -18.3000000000001 24.7 23.4999999999998C24.7 33.1999999999998 18.8 62.1999999999998 16.5 70.3999999999998C15 75.8999999999998 15 81.8999999999998 16.5 86.3999999999998C16.8 87.2999999999998 20.6 90.9999999999998 20.6 99.3999999999998C19.6 100.8999999999998 16 99.8999999999998 15.5 100.8999999999998C5.1 181.4999999999998 9.6 179.8999999999998 7.8 199.1999999999998C6.3 215.1999999999998 -3.1 243.0999999999998 1.1 263.4999999999999C1.6 265.8999999999999 4.5 284.4999999999999 25.3 302.3999999999999C56.3 329.0999999999999 73.7 340.6999999999998 184.3 313.8999999999999C185.4 313.4999999999999 250.6 292.7999999999999 295 322.8999999999999C310.5 334.1999999999998 323.8 334.1999999999998 330.5 338.8999999999999C330.6 338.9999999999999 392.2 390.9999999999999 417.5 404.1999999999998C464.7 433.5999999999999 487.4 420.8999999999998 492.6 422.1999999999998C497.3 423.1999999999998 506 447.9999999999999 509.6 447.9999999999999C515.1 447.9999999999999 511.2 427.7999999999999 513.2 422.0999999999999C513.7 420.0999999999999 516.8000000000001 417.0999999999999 519.4000000000001 417.0999999999999C521.7 417.0999999999999 521.1000000000001 417.8999999999999 529.7 422.0999999999999C538.1 427.4999999999999 544.6 439.6999999999998 550.3000000000001 439.0999999999999C562.0000000000001 437.4999999999999 531.3000000000001 397.4999999999999 531.3000000000001 392.1999999999998C531.3000000000001 390.1999999999998 531.5000000000001 391.3999999999999 535.9000000000001 382.6999999999998C538.5000000000001 377.1999999999998 540.5000000000001 369.1999999999998 542.1000000000001 362.6999999999998C550.4000000000001 332.9999999999999 547.8000000000002 348.0999999999999 555.5000000000001 325.7999999999999C575.7000000000002 275.6999999999998 576.1000000000001 280.5999999999999 576.1000000000001 272.8999999999999C576.1000000000001 265.3999999999999 572.0000000000001 261.8999999999999 568.9000000000001 256.3999999999999C567.4000000000001 253.3999999999999 564.3000000000001 248.8999999999999 561.7 248.3999999999999C559 247.6999999999999 568.7 249.8999999999999 548.3000000000001 245.8999999999999C541.1 244.8999999999999 534.9000000000001 250.3999999999999 533.4000000000001 255.3999999999999C531.8000000000001 260.0999999999998 536.2 265.4999999999999 521.6000000000001 278.2999999999999C511.3000000000001 288.2999999999999 500.5000000000001 289.5999999999999 489.7000000000002 295.2999999999999C479.9000000000001 300.9999999999999 477.8000000000002 294.2999999999999 471.7000000000002 287.2999999999999C453.7000000000002 264.3999999999999 437.7000000000002 240.3999999999999 419.7000000000002 217.4999999999998C407.9000000000002 202.4999999999998 395.5000000000002 187.0999999999999 386.2000000000002 170.0999999999999C382.3000000000002 163.2999999999999 376.7000000000002 141.9999999999998 375.9000000000002 140.1999999999999C369.7000000000002 122.4999999999999 370.4000000000002 114.3999999999999 359.4000000000002 71.8999999999999C356.3000000000002 61.8999999999999 353.7000000000002 50.4999999999999 350.7000000000002 39.4999999999999C348.5000000000002 32.6999999999999 343.3000000000002 -9.8000000000001 350.2000000000002 -19.9000000000001C352.3000000000002 -23.4000000000001 358.9000000000002 -24.4000000000001 361.5000000000002 -27.9000000000001C361.6000000000002 -28.0000000000001 371.1000000000002 -46.1000000000001 370.8000000000002 -47.9000000000001C370.8000000000002 -54.0000000000001 361.4000000000002 -53.5000000000001 359.5000000000002 -54.4000000000001C354.7000000000002 -57.3000000000001 355.7000000000002 -60.3000000000001 353.1000000000002 -61.8000000000001" />
+    <glyph glyph-name="strava"
+      unicode="&#xF428;"
+      horiz-adv-x="369.2" d=" M301.6 156L257.7000000000001 67.8L213.1000000000001 156H145.5000000000001L257.7000000000001 -64L369.2000000000001 156H301.6zM151.4 448L0 156H89.2L151.4 272.1L213.1 156H301.6L151.4 448z" />
+    <glyph glyph-name="stripe-s"
+      unicode="&#xF42A;"
+      horiz-adv-x="362.3" d=" M144.3 293.4C144.3 315.7000000000001 162.9 324.3 192.7 324.3C236.1 324.3 291.2000000000001 311 334.6 287.6V421.9C287.3 440.8 240.1 448 192.8 448C77.1 448 0 387.6 0 286.6C0 128.7 216.8 154.3 216.8 86.2C216.8 59.8 193.9 51.3 162.1 51.3C114.9 51.3 53.9 70.8 6 96.8V-31.7C59 -54.5 112.8 -64.1 162 -64.1C280.6 -64.1 362.3000000000001 -13.1 362.3000000000001 89.5C362.3000000000001 259.7 144.3000000000001 229.2 144.3000000000001 293.4" />
+    <glyph glyph-name="stripe"
+      unicode="&#xF429;"
+      horiz-adv-x="640" d=" M640 186.4C640 231.9 618 267.8 575.8 267.8S507.9 231.9 507.9 186.7C507.9 133.2 538.1999999999999 108.5 581.4 108.5C602.6 108.5 618.5 113.3 630.6 120V153.4C618.5 147.3 604.6 143.6 587 143.6C569.7 143.6 554.5 149.7 552.5 170.5H639.4C639.6 172.8 640 182.1 640 186.3999999999999M552.1 203.1999999999999C552.1 223.1999999999999 564.4 231.6 575.5 231.6C586.4 231.6 598 223.1999999999999 598 203.1999999999999H552.1zM439.2000000000001 267.8C421.8000000000001 267.8 410.6 259.5999999999999 404.4000000000001 253.8999999999999L402.1 264.8999999999999H363V60.0999999999999L407.4 69.4999999999999L407.5 119.6999999999999C413.9 114.9999999999999 423.4 108.4999999999999 438.9 108.4999999999999C470.7 108.4999999999999 499.7 131.6999999999999 499.7 188.0999999999999C499.8 239.6999999999999 470.4 267.7999999999999 439.2 267.7999999999999M428.6 145.2999999999999C418.2 145.2999999999999 412 149.0999999999999 407.7 153.6999999999999L407.4 219.6999999999999C412 224.7999999999999 418.4 228.4999999999999 428.6 228.4999999999999C444.8 228.4999999999999 455.9999999999999 210.2999999999999 455.9999999999999 187.0999999999999C456.1 163.1999999999999 445.1 145.2999999999999 428.6 145.2999999999999M346.4 324V287.8L301.8 278.3V314.5L346.4 324M301.9 264.8H346.5V111.6H301.9V264.8zM254.1 251.7C264.5 270.8 285.2 266.9 291.2 264.8V224C285.5 225.8 267.8 228.5 257.3 214.7V111.6H213V264.8H251.4L254.1 251.7M165.1 264.8H198.8V227H165.1V163.8C165.1 137.6 193.1 145.8 198.8 148.1V114.3C192.9 111.1 182.2 108.4 167.6 108.4C141.3 108.4 121.5 125.4 121.5 151.7000000000001L121.7 294.1L165 303.3000000000001L165.1 264.8000000000001zM44.9 219.7C44.9 199.7 112.8 209.2 112.8 156.3C112.8 124.3 87.4 108.5 50.5 108.5C35.2 108.5 18.5 111.5 2 118.6V158.6C16.9 150.5 35.9 144.4 50.6 144.4C60.5 144.4 67.6 147.1 67.6 155.3C67.6 176.5 0.1 168.5 0.1 217.7C0.1 249.1 24.1 267.9000000000001 60.1 267.9000000000001C74.8 267.9000000000001 89.5 265.6 104.2 259.8000000000001V218C90.7 225.3 73.5 229.4 60 229.4C50.7 229.3 44.9 226.6 44.9 219.7" />
+    <glyph glyph-name="studiovinari"
+      unicode="&#xF3F8;"
+      horiz-adv-x="512" d=" M480.3 260.3L484.5 232.3V204.3L459.4 160.2L419.6 81.8L363.5 14.3L284.4 -23.5000000000001L266.7 -48.0000000000001L259 -60.0000000000001L249.4 -64S266.7 -0.4 268.8 -0.4C270.9000000000001 -0.4 289.1 -1.1 289.1 -1.1L355.8 37.5000000000001L263.3 11.4L207.4 -25.4L184.6 -53.4L178 -54.8L198.8 18.8000000000001L205.7 24.3000000000001L226.4 11.4000000000001L314.7 56.6000000000001L371.5 108.1000000000001L386.3 176.5000000000001L260.9 153.2000000000001L276.1 171.4000000000001L102.7 224.7000000000001L184.6 235.2000000000001L18.6 358.1000000000002L133.5 340L32.2 448L285.1 321.4L253.6 359.4L378 285L234.7 384L253.4 345.6L203.8 363.7L158.3 448L352.9 326L310 381.8L418 285.4L430 294.3L409 310.7L413.2 348.5L451 358.9L480.2 334.2L491.7 330L484.7 323.8L493.2 311.8L480.1 304.4L469.8 284.2000000000001L480.3 260.3z" />
+    <glyph glyph-name="stumbleupon-circle"
+      unicode="&#xF1A3;"
+      horiz-adv-x="496" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM256 262.5C246.2 262.5 238.2 254.5 238.2 244.7V137.8C238.2 96.9 204.3 63.9 163.3 63.9C121.9 63.9 88.4 97.4 88.4 138.8V185.3H145.7V139.5C145.7 129.5 153.7 121.6999999999999 163.5 121.6999999999999S181.3 129.5999999999999 181.3 139.5V247.9C181.3 287.9 215.5 320 256 320C296.7 320 330.7 287.7 330.7 247.4V223.7L296.6 213.6L273.7 224.3V244.9C273.8 254.5 265.8 262.5 256 262.5zM423.6 138.9C423.6 97.5 390.1 64 348.7000000000001 64C307.5000000000001 64 273.8000000000001 97.2 273.8000000000001 138.2V185L296.7000000000001 174.3L330.8000000000001 184.4V137.3C330.8000000000001 127.5 338.8000000000001 119.7 348.6000000000001 119.7S366.4000000000001 127.6 366.4000000000001 137.3V185.3H423.7000000000001C423.6000000000001 139.4 423.6000000000001 138.9 423.6000000000001 138.9z" />
+    <glyph glyph-name="stumbleupon"
+      unicode="&#xF1A4;"
+      horiz-adv-x="512" d=" M502.9 182V112.3C502.9 50.2 452.6 -0.1 390.5 -0.1C328.7 -0.1 278.1 49.7 278.1 111.2V181.4L312.4000000000001 165.4L363.5000000000001 180.6V110C363.5000000000001 95.3 375.5000000000001 83.5 390.2000000000001 83.5S417 95.3 417 110V182H502.9zM278.2 240.2L312.5 224.2L363.6 239.4V275C363.6 335.5 312.5 384 251.5000000000001 384C190.7000000000001 384 139.4 335.8 139.4 275.8V113.4C139.4 98.5 127.4 86.7 112.7 86.7S86 98.5 86 113.4V182H0V112.3C0 50.3 50.3 0 112.4 0C174 0 224.8 49.5 224.8 110.8V271.1C224.8 285.8 236.8 297.8 251.5 297.8S278.2 285.8 278.2 271.1V240.2z" />
+    <glyph glyph-name="superpowers"
+      unicode="&#xF2DD;"
+      horiz-adv-x="448" d=" M448 416C364.7 405 281.2 394 198 383C106 370.5 34.7 296.3 29 203C25.7 147.5 47 93.5 86.8 54.8L0 -32C83.3 -21 166.5 -10 249.8 1C341.6 13.5 413.1 87.8 418.5 180.8C422 236.3 400.5 290.3 360.8 329L448 416zM368.3 183.7C364.1 104.2 294.3 44.5 215.5 49.2C136 53.9 74.8 120.2 79.2 200.2C83.7 279.4 153.5 339.5 232.2 334.7C311.5 330 372.7 263.7 368.3 183.7z" />
+    <glyph glyph-name="supple"
+      unicode="&#xF3F9;"
+      horiz-adv-x="640" d=" M640 185.5C640 121.4 531 69.4 396.5 69.4C371.7 69.4 347.9 71.2 325.4 74.4C333.1 74 340.9 73.8 348.8 73.8C483.3 73.8 592.3 130.6999999999999 592.3 200.9C592.3 230.3 573.1999999999999 257.3 541.0999999999999 278.9C601.0999999999999 257.8 639.9999999999999 223.8 639.9999999999999 185.5zM47.7 220.1C47.6 290.3 156.5 347.4 291 347.7C298.9 347.7 306.6 347.5 314.3 347.2C291.8 350.4 268 352.1 243.3 352.1C108.8 351.7 -0.1 299.5 0 235.4C0.1 197.1 39.1 163.1 99.3 142.1C67 163.6 47.8 190.7000000000001 47.7 220.1zM107.9 180.2S118.4 167 137.2 167C155.1 167 165.6 178.5 165.6 192.1C165.6 220.1 125.4 217.2 125.4 231.8C125.4 237.2 130.7 240.9 137.9 240.9C143.6 240.9 149.2000000000001 238.3 149.2000000000001 234.3V230.4H163.4V238.3C163.4 250.4 148 255.1 138 255.1C121.5 255.1 109.5 244.9000000000001 109.5 231.0000000000001C109.5 204.4 149.7000000000001 205.6 149.7000000000001 191.1C149.7000000000001 184.5 143.9 181 137.4 181C125.5 181 116.7 191.1 116.7 191.1L107.9 180.2000000000001zM228.7 253.8V199.4C228.7 188.1 221.6 181.6 210.9 181.6C200.2 181.6 193.1 188.1 193.1 199.3V253.8H177.3V198.8C177.3 179.9 190.7 166.9 211 166.9C231.1 166.9 244.4 179.9 244.4 198.8V253.8H228.7zM263.1 168.4H278.9V197.9H294.4C310.4 197.9 321.6 209.4 321.6 226S310.4 253.8 294.4 253.8H255.3V240.4H263.1V168.4zM278.9 211.4V240.5H291.8C300.5 240.5 305.5 234.8 305.5 226.1C305.5 217.2 300.3999999999999 211.4 291.5 211.4H278.8999999999999zM335.9 168.4H351.7V197.9H367.2C383.2 197.9 394.4 209.4 394.4 226S383.2 253.8 367.2 253.8H328.1V240.4H335.9V168.4zM351.6 211.4V240.5H364.5C373.2 240.5 378.2 234.8 378.2 226.1C378.2 217.2 373.2 211.4 364.2 211.4H351.5999999999999zM408.7 176.6C408.7 170.8 411.1 168.4 416.9 168.4H454.5C460.3 168.4 462.7 170.8 462.7 176.6V189.6H448.4V184.4C448.4 182.7 447.4 181.8 445.8 181.8H427.2C425.5 181.8 424.5999999999999 182.8 424.5999999999999 184.4V245.6C424.5999999999999 251.3 422.2 253.8 416.3999999999999 253.8H401V240.4H406.2C407.9 240.4 408.8 239.4 408.8 237.8V176.6zM472.1 176.6C472.1 170.8 474.4999999999999 168.4 480.3 168.4H519C524.7 168.4 527.2 170.8 527.2 176.6V189.6H512.9000000000001V184.4C512.9000000000001 182.7 511.9000000000001 181.8 510.3000000000001 181.8H490.6000000000001C488.9000000000001 181.8 488.0000000000001 182.8 488.0000000000001 184.4V204.7H515.7V218.1H488V240.5H507.2C508.9 240.5 509.8 239.5 509.8 237.9V232.7H524V245.7C524 251.4 521.5 253.9 515.8 253.9H464.1999999999999V240.5H471.9999999999999V176.6zM531 252.6V246.7H532.6V252.6H535.3000000000001V253.8H528.3000000000001V252.6H531.0000000000001zM536.7 253.8V246.7H538.2V252.4L540.5 246.7H541.8L544.0999999999999 252.4V246.7H545.5999999999999V253.8H543.3L541.1999999999999 248.7L539.0999999999999 253.8H536.6999999999999z" />
+    <glyph glyph-name="teamspeak"
+      unicode="&#xF4F9;"
+      horiz-adv-x="453.6" d=" M203.4 382.2C193.1 384.2 161.3 385.9 151.1 385.9C142.7 385.9 144.2 383.9 144.2 383.9C207.9 333.8 219.6 262.8 219.8 261.8C221.7 246.2 216.7 238.9 211.1 230.5C209.7 228.7 208.4 225.5 211.4 221.6L240.3000000000001 182.2H240.0000000000001C249.4000000000001 168.1 268.1 150 234.6 142.3C226.9000000000001 140.4 215.9 136 223.4 126.5C225.6 123.6 232.2000000000001 117 225.2000000000001 110C217.7000000000001 105.2 222.5000000000001 102.1 223.4 99.6C225.2000000000001 93 220.8000000000001 88.4 219.1 86.9C214.9 83.7000000000001 215.4 79.1 216.5 76.8V76.7C219.6 63.6 214.8000000000001 49.6 212.6 41.8L212.7 41.9C211.3 38.7 234.7 44.5000000000001 234.8 44.5000000000001C322.3 67.5000000000001 385.4 133.0000000000001 385.4 210.2000000000001C385.3 296.5000000000001 306.7 368.1 203.4 382.2000000000001M442.8 255.5000000000001C429.9 290.9000000000001 408.3 317.8000000000001 383.9 340.9000000000001C308.1 412.6000000000001 208.3 417.5000000000001 169.9 415.7000000000001C133 414 79.5 404.3 67.1 388.6C62.5 382.8 63.1 382.4 42.7 285.4C36.7 283 0 266.7 0 222.1C-0.3 133.4 133.8 132.8 133.8 222.4C133.8 247 120.8 268.5 101.3 280.4V398.8C113.3 401.8 221 427.6 324.9 361.5C354.7 342.5 429.2 284.6 421.8 178.7C420.3 157.5 416.1 137.9 408.2 122.3C351.2 8.8 237.5 -11.5 195.3999999999999 -15.6C127.0999999999999 -22.2 72.8999999999999 -1.5 71.3999999999999 -1.6C68.6999999999999 -1.7 59.3999999999999 -8.7 59.6999999999999 -9C96.2999999999999 -21.1 133.9999999999999 -32 180.6999999999999 -32C228.7 -32 265 -23.8 298.7 -10.4C401.8 30.7 453.6 108 453.6 194.3C453.6 217.2 449.3 237.5 442.8 255.5M196.5 221.9C188 237.5 197 237.8 201.3 245.3C206.8 254.9 203 267.4 199.6 277.5C190 306 165.8 362 116.6 381.1V281.1C121.1 276.6 170.7 247.6 174.8 164.3C178.9 81.6 122.8 42.7 123.1 41C145.9 36.5 189.1 30.3 199.8 49.6C205.5 59.8 198.3 77.7000000000001 198.9 77.7000000000001C195.3 91.9 206.7 97.1 206.7 99.5000000000001C206.7 100.9 199.5 102.6000000000001 199.5 107.6000000000001C199.5 113.5000000000001 208 113.8000000000001 208.9 118.3000000000001C209.8000000000001 122.8000000000001 205.8000000000001 126.1000000000001 203.8000000000001 134.9000000000001C200.3000000000001 153.9000000000001 231.7000000000001 150.9000000000001 234.6000000000001 158.0000000000001C236.0000000000001 161.3000000000001 233.2000000000001 165.8000000000001 231.2000000000001 168.7000000000001" />
+    <glyph glyph-name="telegram-plane"
+      unicode="&#xF3FE;"
+      horiz-adv-x="448" d=" M446.7 349.4L379.1 30.6C374 8.1 360.7000000000001 2.5 341.8 13.1L238.8 89L189.1 41.2C183.6 35.7 179 31.1 168.4 31.1L175.8000000000001 136L366.7000000000001 308.5C375.0000000000001 315.9 364.9000000000001 320 353.8000000000001 312.6L117.8 164L16.2 195.8C-5.9 202.7 -6.3 217.9 20.8 228.5L418.2 381.6C436.6 388.5 452.7 377.5 446.7 349.4z" />
+    <glyph glyph-name="telegram"
+      unicode="&#xF2C6;"
+      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM369.8 270.1L329.1 78.3C326.1 64.6999999999999 318 61.4 306.7000000000001 67.8L244.7000000000001 113.5L214.8000000000001 84.6999999999999C211.5 81.3999999999999 208.7000000000001 78.5999999999999 202.3000000000001 78.5999999999999L206.7000000000001 141.6999999999999L321.6 245.5C326.6 249.9 320.5 252.4 313.9000000000001 248L171.9 158.5999999999999L110.7 177.6999999999999C97.4 181.8999999999999 97.1 191 113.5 197.3999999999999L352.6 289.5999999999999C363.7000000000001 293.5999999999999 373.4000000000001 286.8999999999999 369.8 270.0999999999999z" />
+    <glyph glyph-name="tencent-weibo"
+      unicode="&#xF1D5;"
+      horiz-adv-x="384" d=" M72.3 -47.8C73.7 -67.7 44.7 -70 42.6 -50.7C31 79.2 73.7 188.8 144 262.5C128.4 296.5 153.2 339.6 194.6 339.6C224.9 339.6 249.7 315 249.7 284.5C249.7 240.5 200.2 213.7 162.8 239.4C97.1 168.1 61.4 69.6 72.3 -47.8zM192 447.9C66.1 447.9 -12.3 313.7 43.7 205.6C52.4 188.2 79 201.1 70 219C23.7 311.6 91 418.2 192 418.2C267.4 418.2 328.9 356.8 328.9 281.3C328.9 190.5 242 127.4 161.2 148.2C142.1 152.3 135.6 123.8 154.6 119.1C265.3 95.9 358.6 179.1 358.6 281.4C358.6 373.3 284 447.9 192 447.9z" />
+    <glyph glyph-name="themeisle"
+      unicode="&#xF2B2;"
+      horiz-adv-x="512" d=" M208 359.714C208 369.714 214.286 381.428 225.715 381.428C236.857 381.428 243.429 369.714 243.429 359.714C243.429 349.429 236.857 338 225.715 338C214.286 338 208 349.429 208 359.714zM512 199.714C512 163.713 500.571 97.428 475.714 70C452.856 45.142 388.286 8.857 354.857 -0.572L353.714 -0.858V-33.429C353.714 -49.715 341.142 -64 324.5710000000001 -64C314.5710000000001 -64 305.1420000000001 -58.286 299.999 -49.714C294.572 -58.286 285.1430000000001 -64 275.1430000000001 -64C265.1430000000001 -64 255.7140000000001 -58.286 250.2850000000001 -49.714C245.1430000000001 -58.286 235.7140000000001 -64 225.7150000000001 -64C215.429 -64 206.286 -58.286 200.857 -49.714C195.714 -58.286 186.286 -64 176.286 -64C157.429 -64 146.857 -48.286 146.857 -31.143C130.571 -43.4280000000001 111.142 -50.571 90.286 -50.571C68.286 -50.571 46.857 -42.286 30 -27.7140000000001C40.285 -27.4280000000001 50.571 -25.4280000000001 60.285 -22.0000000000001C39.428 -16.2860000000001 20.857 -3.143 8.285 14.2859999999999C29.655 9.641 54.494 12.6129999999999 75.428 25.429C53.428 47.429 18.857 84.286 6.856 112.857C1.143 126.286 0 144.286 0 158.571C0 208.285 20.286 318.5710000000001 86.286 318.5710000000001C96.857 318.5710000000001 105.143 313.713 109.429 303.7140000000001A158.792 158.792 0 0 0 121.429 319.1420000000001C123.429 321.7140000000001 127.143 324.5710000000001 128.572 327.428C136.571 339.999 140.286 348.5700000000001 150.286 361.428C182.571 402.572 232 430.857 285.143 430.857C291.143 430.857 297.143 430.572 302.857 429.714C313.714 441.429 328.8570000000001 448 344.572 448C359.1430000000001 448 374.286 442 384.572 431.714C385.4290000000001 430.856 386 429.428 386 428.286C386 424.572 375.715 414.857 373.1430000000001 412C377.4290000000001 410.5710000000001 388.8570000000001 405.142 388.8570000000001 400C388.8570000000001 397.1430000000001 386 394.857 384.286 392.857C415.715 365.1430000000001 433.7150000000001 325.714 440.572 284.857C444.858 290 450.857 293.429 457.715 293.429C468.2860000000001 293.429 478.572 286.285 486.2860000000001 279.428C507.143 260.857 512 226.286 512 199.714zM188 358.572C188 340.286 200.571 321.429 220.286 321.429C240 321.429 252.571 340.286 252.571 358.572C252.571 376.572 240 395.429 220.286 395.429C200.571 395.429 188 376.5710000000001 188 358.572zM237.714 254C237.714 273.714 241.428 293.1430000000001 246.285 312.286C194.246 232.752 232.754 127.715 315.1430000000001 127.715C336.5710000000001 127.715 357.7140000000001 135.429 375.1430000000001 147.715C377.1430000000001 155.144 378.8570000000001 162.572 378.8570000000001 170.287C378.8570000000001 184.573 372.5710000000001 191.715 358.2850000000001 191.715C353.714 191.715 349.1420000000001 190.858 344.8560000000001 190.001C281.5130000000001 177.333 237.7140000000001 186.3320000000001 237.7140000000001 254.0000000000001zM196.572 -0.858C196.572 10.285 187.714 19.999 176.286 19.999C164.857 19.999 156.286 10.284 156.286 -0.8579999999999V-33.429C156.286 -44.572 164.857 -54.571 176.286 -54.571C187.714 -54.571 196.572 -44.856 196.572 -33.429V-0.8579999999999zM245.715 -0.858C245.715 10.285 237.143 19.999 225.715 19.999C214.286 19.999 205.429 10.284 205.429 -0.8579999999999V-33.429C205.429 -44.572 214.286 -54.571 225.715 -54.571C237.143 -54.571 245.715 -44.571 245.715 -33.429V-0.8579999999999zM295.428 -0.858C295.428 10.285 286.5710000000001 19.999 275.143 19.999C263.714 19.999 254.857 10.284 254.857 -0.8579999999999V-33.429C254.857 -44.572 263.714 -54.571 275.143 -54.571C286.571 -54.571 295.428 -44.856 295.428 -33.429V-0.8579999999999zM345.1430000000001 -0.858C345.1430000000001 10.285 336.2860000000001 19.999 324.8570000000001 19.999C313.4290000000001 19.999 304.5710000000001 10.284 304.5710000000001 -0.8579999999999V-33.429C304.5710000000001 -44.572 313.4290000000001 -54.571 324.8570000000001 -54.571C336.286 -54.571 345.1430000000001 -44.571 345.1430000000001 -33.429V-0.8579999999999zM421.714 162C390.857 102.858 331.429 59.428 263.1430000000001 59.428C166.572 59.428 102.572 144 102.572 236C102.572 252.857 104.572 269.429 108.572 285.714C88.572 251.999 78.858 213.142 78.858 174.285C78.858 113.999 103.715 52.5699999999999 150.287 13.428C155.43 23.142 165.144 29.714 176.287 29.714C186.287 29.714 195.715 24 200.858 15.428C206.287 23.999 215.429 29.714 225.7160000000001 29.714C235.7160000000001 29.714 245.1440000000001 24 250.2870000000001 15.428C255.7160000000001 23.999 265.144 29.714 275.1450000000001 29.714C285.1450000000001 29.714 294.5730000000001 24 300.0020000000001 15.428C305.1450000000001 23.999 314.5730000000001 29.714 324.5740000000001 29.714C335.4310000000001 29.714 345.4310000000001 23.142 350.2880000000001 13.714C393.7150000000001 50 418.8570000000001 105.714 421.7140000000001 162zM432.286 261.714C432.286 315.428 397.7150000000001 367.428 339.714 367.428C309.429 367.428 281.1430000000001 352.285 260.857 330.5710000000001C240.862 264.188 233.41 194 302.286 194C331.091 194 399.6430000000001 222.538 386.572 157.143C415.429 183.143 432.286 222.857 432.286 261.7140000000001z" />
+    <glyph glyph-name="trade-federation"
+      unicode="&#xF513;"
+      horiz-adv-x="496" d=" M202.45 339.58V257.9700000000001H38.94L87.16 196.06H201.89V-0.69H266.5V195.04H349.77V257.73H266.59V276.9H412.21V339.5800000000001H202.45zM207.31 333.58H405.0800000000001V282.9H259.44V251.97H342.62V201.04H259.36V5.31H206.63V202.06H89.86L49.91 251.97H207.31V333.58zM247.99 439.2C111.03 439.2 0 328.17 0 191.2S111.03 -56.8 247.99 -56.8S496 54.24 496 191.2S384.96 439.2 247.99 439.2zM248.01 425.96C377.67 425.96 482.77 320.8400000000001 482.77 191.18S377.67 -43.58 248.01 -43.58S13.23 61.53 13.23 191.19S118.35 425.96 248.01 425.96zM248.01 418.07C122.71 418.07 21.12 316.5 21.12 191.2S122.71 -35.69 248.01 -35.69S474.88 65.9 474.88 191.2S373.31 418.07 248.01 418.07zM247.99 404.77C365.94 404.77 461.55 309.15 461.55 191.21S365.93 -22.35 247.99 -22.35S34.43 73.25 34.43 191.2S130.04 404.77 247.99 404.77zM174.67 299.9700000000001L190.33 281.92L168.17 291.37L155.84 270.9L157.99 294.89L134.71 300.29L158.19 305.66L156.13 329.4700000000001L168.5 308.8L190.51 318.12L174.67 299.9700000000001zM127.53 346.51L135.54 334.11L148.23 339.97L138.91 328.52L148.41 318.27L134.64 323.59L127.82 311.39L128.63 326.13L114.92 328.84L129.19 332.62L127.53 346.51zM378.3 270.92L390.29 251.36L411.17 260.47L396.2700000000001 243.02L411.3800000000001 225.98L390.1800000000001 234.76L378.6400000000001 215.12L380.4400000000001 237.99L358.2000000000001 242.89L380.5100000000001 248.2500000000001L378.3000000000001 270.92zM271.25 172.47L285.11 175.69L283.8300000000001 189.86L291.1800000000001 177.68L304.2600000000001 183.27L294.9500000000001 172.52L304.3100000000001 161.81L291.2100000000001 167.35L283.92 155.1400000000001L285.1400000000001 169.3100000000001L271.2500000000001 172.4700000000001zM145.82 165.97L169.55 169.84L167.82 194.37L178.83 172.99L201.62 182.21L184.69 165.13L200.5 146.3L179.03 157.12L166.01 136.26L169.67 160.03L145.82 165.97zM209.26 331.63V250.02H54.16L90.88 204.01H208.58V7.26H257.4V202.99H340.67V250.02H257.4V284.85H403.13V331.63H209.26zM220.12 320.43H391.92V296.07H246.88V239.84H329.81V215.9H246.88V18.48H220.12V215.9H96.31L76.22 239.84H220.12V320.43z" />
+    <glyph glyph-name="trello"
+      unicode="&#xF181;"
+      horiz-adv-x="448" d=" M392 416H56C25.1 416 0 390.9 0 360V24C0 -6.9 25.1 -32 56 -32H392C422.9 -32 448 -6.9 448 24V360C448 390.9 422.9 416 392 416zM194.9 76.6C194.9 61.8 182.9 49.7 168 49.7H85.1C70.3 49.7 58.2 61.7000000000001 58.2 76.6V330.9C58.2 345.7 70.2 357.8 85.1 357.8H168C182.8 357.8 194.9 345.8 194.9 330.9V76.6zM389.8 188.6C389.8 173.8 377.8 161.7000000000001 362.9000000000001 161.7000000000001H280C265.2 161.7000000000001 253.1 173.7000000000001 253.1 188.6V330.9C253.1 345.7 265.1 357.8 280 357.8H362.9C377.7 357.8 389.8 345.8 389.8 330.9V188.6z" />
+    <glyph glyph-name="tripadvisor"
+      unicode="&#xF262;"
+      horiz-adv-x="576" d=" M166.4 167.479C166.4 154.243 155.67 143.513 142.434 143.513S118.468 154.243 118.468 167.479S129.198 191.445 142.434 191.445S166.4 180.716 166.4 167.479zM431.362 191.435C418.132 191.435 407.406 180.71 407.406 167.479C407.406 154.249 418.131 143.523 431.362 143.523C444.592 143.523 455.318 154.248 455.318 167.479C455.317 180.71 444.592 191.435 431.362 191.435zM520.75 51.945C458.083 2.841 367.474 13.836 318.371 76.504L287.392 30.179L256.709 76.1180000000001C208.432 15.7280000000001 121.087 4.227 58.824 50.063C-5.234 97.2210000000001 -18.935 187.379 28.223 251.4370000000001A186.76199999999997 186.76199999999997 0 0 1 0 308.584L90.286 308.634A358.48 358.48 0 0 0 287.351 362.664A350.382 350.382 0 0 0 479.532 309.3150000000001L575.75 309.241A185.71300000000002 185.71300000000002 0 0 1 547.398 251.592C594.191 188.845 582.3620000000001 100.222 520.75 51.9450000000001zM259.366 166.239C259.359 229.796 207.831 281.314 144.274 281.307C80.717 281.3 29.2 229.772 29.206 166.215C29.213 102.658 80.741 51.14 144.298 51.147C207.811 51.222 259.282 102.686 259.366 166.199V166.239zM287.957 176.694C293.39 250.134 353.467 307.578 427.077 309.716A339.146 339.146 0 0 1 287.35 337.528A356.31 356.31 0 0 1 147.186 310.275C221.53 308.693 282.485 250.851 287.957 176.694zM539.663 205.461C517.671 265.095 451.501 295.6089999999999 391.8680000000001 273.618C332.2340000000001 251.626 301.7200000000001 185.4559999999999 323.7110000000001 125.823V125.791C345.7490000000001 66.184 411.9090000000001 35.7 471.5380000000001 57.678C531.153 79.682 561.6510000000001 145.84 539.663 205.461zM213.624 167.4859999999999V167.3709999999999C213.567 128.0429999999999 181.638 96.2079999999999 142.31 96.2649999999999C102.982 96.322 71.147 128.2509999999999 71.204 167.579C71.261 206.907 103.19 238.742 142.518 238.685C181.7770000000001 238.569 213.56 206.745 213.624 167.4859999999999zM189.112 167.4859999999999V167.5699999999999C189.061 193.3539999999999 168.118 214.215 142.334 214.1639999999999C116.5500000000001 214.113 95.689 193.1699999999999 95.74 167.387C95.791 141.603 116.734 120.742 142.5170000000001 120.793C168.2430000000001 120.906 189.0540000000001 141.761 189.1120000000001 167.4859999999999zM502.535 167.4859999999999V167.4379999999999C502.515 128.1099999999999 470.617 96.2439999999999 431.288 96.2649999999999S360.094 128.1829999999999 360.115 167.512C360.135 206.84 392.033 238.706 431.362 238.685C470.652 238.619 502.483 206.776 502.535 167.4859999999999zM478.031 167.4939999999999C478.022 193.2779999999999 457.113 214.1729999999999 431.329 214.1639999999999C405.545 214.155 384.65 193.2459999999999 384.659 167.4619999999999C384.668 141.678 405.577 120.7839999999999 431.361 120.7919999999999C457.126 120.8379999999999 477.997 141.7199999999999 478.031 167.4849999999999V167.4939999999999z" />
+    <glyph glyph-name="tumblr-square"
+      unicode="&#xF174;"
+      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM317.7 51.8C309.2 42.7 286.5 32 256.8 32C181.3 32 164.9 87.5 164.9 119.9V209.9H135.2C131.8 209.9 129 212.7 129 216.1V258.6C129 263.1 131.8000000000001 267.1 136.1 268.6C174.9 282.3 187 316.1 188.8 341.8C189.3 348.7 192.9 352 198.8 352H243.1C246.5000000000001 352 249.3 349.2 249.3 345.8V273.8H301.2C304.6 273.8 307.4 271 307.4 267.6V216.5C307.4 213.1 304.6 210.3 301.2 210.3H249.1V127C249.1 105.6 263.9 93.5 291.6 104.6C294.6 105.8 297.2000000000001 106.6 299.6 106C301.8 105.5 303.2000000000001 103.9 304.2000000000001 101.1L318.0000000000001 60.9C319.0000000000001 57.7000000000001 320.0000000000001 54.2 317.7000000000001 51.8z" />
+    <glyph glyph-name="tumblr"
+      unicode="&#xF173;"
+      horiz-adv-x="320" d=" M309.8 -32.3C296.2 -46.8 259.8 -64 212.4 -64C91.6 -64 65.4 24.8 65.4 76.6V220.6H17.9C12.4 220.6 7.9 225.1 7.9 230.6V298.6C7.9 305.8 12.4 312.2000000000001 19.2 314.6C81.2 336.4000000000001 100.7 390.6 103.5 431.7000000000001C104.3 442.7000000000001 110 448 119.6 448H190.5C196 448 200.5 443.5 200.5 438V322.8H283.5C289 322.8 293.5 318.4 293.5 312.9V231.2C293.5 225.7 289 221.2 283.5 221.2H200.1V88C200.1 53.8 223.8 34.4 268.1 52.2C272.9000000000001 54.1 277.1 55.4 280.8 54.4C284.3 53.5 286.6 51 288.2 46.5L310.2 -17.8C312 -22.8 313.5 -28.4 309.8 -32.3z" />
+    <glyph glyph-name="twitch"
+      unicode="&#xF1E8;"
+      horiz-adv-x="448" d=" M40.1 416L10 339.1V24.8H117V-32H177.2L234 24.8H321L438 141.8V416H40.1zM397.9000000000001 161.9L331 95H224L167.2 38.2V95H76.9V375.9H397.9V161.9zM331 299V182.1H290.9V299H331zM224 299V182.1H183.9V299H224z" />
+    <glyph glyph-name="twitter-square"
+      unicode="&#xF081;"
+      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM351.1 257.2C351.3 254.4 351.3 251.5 351.3 248.7C351.3 162 285.3 62.1 164.7 62.1C127.5 62.1 93 72.9 64 91.5C69.3 90.9 74.4 90.7 79.8 90.7C110.5 90.7 138.7 101.1 161.2 118.7C132.4 119.3 108.2 138.2 99.9 164.2C110 162.7 119.1 162.7 129.5 165.4C99.5 171.5 77 197.9 77 229.8V230.6C85.7 225.7 95.9 222.7 106.6 222.3A65.447 65.447 0 0 0 77.4 276.9C77.4 289.1 80.6 300.3 86.3 310C118.6 270.2 167.1 244.2 221.5 241.4C212.2 285.9 245.5 322 285.5 322C304.4 322 321.4 314.1 333.4 301.3C348.2 304.1 362.4 309.6 375 317.1C370.1 301.9 359.8 289.1 346.2 281C359.4 282.4 372.2 286.1 384 291.2C375.1 278.1 363.9 266.5 351.1 257.2z" />
+    <glyph glyph-name="twitter"
+      unicode="&#xF099;"
+      horiz-adv-x="512" d=" M459.37 296.284C459.695 291.736 459.695 287.187 459.695 282.639C459.695 143.919 354.112 -15.919 161.137 -15.919C101.685 -15.919 46.457 1.3 0 31.187C8.447 30.213 16.568 29.888 25.34 29.888C74.395 29.888 119.553 46.456 155.614 74.72C109.482 75.6950000000001 70.822 105.908 57.502 147.492C64 146.518 70.497 145.868 77.32 145.868C86.741 145.868 96.163 147.168 104.934 149.441C56.853 159.188 20.791 201.421 20.791 252.426V253.725C34.76 245.928 51.005 241.055 68.222 240.406C39.958 259.249 21.441 291.411 21.441 327.7970000000001C21.441 347.289 26.638 365.1570000000001 35.735 380.751C87.39 317.076 165.035 275.493 252.1 270.944C250.4760000000001 278.741 249.5010000000001 286.862 249.5010000000001 294.9840000000001C249.5010000000001 352.812 296.283 399.918 354.4350000000001 399.918C384.6480000000001 399.918 411.9370000000001 387.248 431.1050000000001 366.781C454.8200000000001 371.329 477.5610000000001 380.101 497.7040000000001 392.121C489.9060000000001 367.755 473.3380000000001 347.288 451.5720000000001 334.294C472.6890000000001 336.567 493.1560000000001 342.416 511.998 350.5370000000001C497.7060000000001 329.746 479.837 311.2290000000001 459.3700000000001 296.284z" />
+    <glyph glyph-name="typo3"
+      unicode="&#xF42B;"
+      horiz-adv-x="433.3" d=" M330.8 107C323.8 104.7 319.2 104.7 312.3 104.7C255.1 104.7 171.7 303.2 171.7 369.6C171.7 394.3 177.1 402 185.6 409C116.1 400.5 36.3 375 9.3 342.6C3.9 334.9 0 321.8 0 305.5C0 202 106.8 -32 184.1 -32C220.4 -32 281.4 27.5 330.8 107M294.5 416C366.3 416 433.3 404.4 433.3 363.5C433.3 280.9 380.8 181.2 354.5 181.2C306.6 181.2 252.8 313.3 252.8 379.7C252.8 410.6 264.4000000000001 416 294.5 416" />
+    <glyph glyph-name="uber"
+      unicode="&#xF402;"
+      horiz-adv-x="448" d=" M414.1 416H33.9C15.2 416 0 400.8 0 382.1V2C0 -16.8 15.2 -32 33.9 -32H414C432.7 -32 447.9 -16.8 447.9 1.9V382.1C448 400.8 432.8 416 414.1 416zM237.6 56.9C163 49.4 96.4 103.8 88.9 178.4H183.3V158C183.3 154.3 186.3 151.2 190.1 151.2H258C261.7 151.2 264.8 154.2 264.8 158V225.9C264.8 229.6 261.8 232.7 258 232.7H190.1C186.4 232.7 183.3 229.7 183.3 225.9V205.5H88.9C95.9 274.9 154.3 327.7 224 327.7C293.7 327.7 352.1 274.9 359.1 205.5C366.6 131 312.2000000000001 64.4 237.6 56.9z" />
+    <glyph glyph-name="uikit"
+      unicode="&#xF403;"
+      horiz-adv-x="448" d=" M443.9 320V64L218 -64L0 64V278.3L87.6 233.2V116.2000000000001L221.1 40.7L356.9 116.2000000000001V267.2000000000001L255.8 324.8000000000001L343.4 377.9000000000001L443.9 320zM308.6 398.9L223.8 448L135.2 393.2L221.2 345.9L308.6 398.9z" />
+    <glyph glyph-name="uniregistry"
+      unicode="&#xF404;"
+      horiz-adv-x="384" d=" M281.1 227.9H384V242.7H281.1V227.9zM281.1 265H384V277.4H281.1V265zM281.1 190.8H384V208.1H281.1V190.8zM123.4 104.1H8.5C11.1 95.6 14.3 87.3 18.1 79.3H156.4C143.5 85 132.3 93.5 123.4 104.1M269.1 116.5H378.8C380.6 123.8 381.9000000000001 131.2 382.7 138.8H278.3C276.2 130.9 273.1 123.4 269.1 116.5M227.6 79.4H367C370.7 87.4 372.8 95.6 375.5 104.2H260.5C251.7 93.5 240.4 85 227.6 79.4M384 416H281.1V413.5H384V416zM192 -32C231.5 -32 268.2 -20.2 298.8 0.2H85.3C115.8 -20.2 152.5 -32 192 -32M281.1 302.2H384V312H281.1V302.2zM281.1 339.3H384V346.7H281.1V339.3zM281.1 376.4H384V381.3H281.1V376.4zM102.9 277.4H0V265H102.9V277.4zM38.8 42.3H344.1C350.8 50.8 356.7000000000001 59.9 361.9000000000001 69.5H23C28.2 59.9 32.2 50.8 38.8 42.3M102.9 161.1V173.5H0V161.1C0 158.6 0 156.1 0.1 153.7000000000001H103.2C103 156.1 102.9 158.6 102.9 161.1M281.1 161.1C281.1 158.6 281 156.1 280.7 153.7000000000001H383.8C383.9 156.2000000000001 384 158.6 384 161.1V173.5H281.1V161.1zM78.1 5.1H305.8C317.6 13.8 328.5 23.7 338 34.8H44.9C54.5 23.8 66.3 13.8 78.1 5.1M102.9 381.3H0V376.4H102.9V381.3zM102.9 416H0V413.5H102.9V416zM102.9 242.7H0V227.9H102.9V242.7zM102.9 208.1H0V190.8H102.9V208.1zM102.9 312H0V302.1H102.9V312zM102.9 346.7H0V339.3H102.9V346.7zM105.7 138.8H1.3C2.2 131.2 3.5 123.8 5.2 116.5H114.9C110.9 123.4 107.7 130.9 105.7 138.8" />
+    <glyph glyph-name="untappd"
+      unicode="&#xF405;"
+      horiz-adv-x="640" d=" M401.3 398.1C321.5 238 316.7000000000001 245.6 313.4 224.9L308.2 192.1C306.3 180.1 301.6 168.6 294.5 158.7000000000001L145.6 -49.1C138 -59.7 125.2 -65.3000000000001 112.2 -63.7C71.9 -58.7 34.4 -31.5000000000001 16.9 4.8C11.2 16.6 12.4 30.6 20 41.1999999999999L168.9 249.1C176 259 185.3 267.0999999999999 196.1 272.8L225.4 288.3C243.9 298.0999999999999 235.1 300.2 361 427.2C362 432 362 434.5 364.6 435.2C367.6 435.8999999999999 371.2000000000001 436.2 370.9000000000001 439.8L370.5000000000001 444.3999999999999C370.3000000000001 446.3 371.8000000000001 448 373.7000000000001 448C378.2000000000001 448.0999999999999 386.9000000000001 446.8 399.3000000000001 438C411.6000000000001 429.0999999999999 415.7000000000001 421.2 417.0000000000001 416.8999999999999C417.6000000000001 415.0999999999999 416.4000000000001 413.2 414.6000000000001 412.7L410.1000000000001 411.5999999999999C406.7000000000001 410.7 407.6000000000001 407.2 407.8000000000001 404.2C407.9000000000001 401.3999999999999 405.5000000000001 400.5999999999999 401.3000000000001 398.0999999999999zM230.1 411.6C233.5 410.7 232.6 407.2 232.4 404.2C232.2 401.5 234.5 400.7 238.8 398.2C246.7 382.3 254.1 367.7 261 354.2C261.7 352.9 263.3 352.7 264.3 353.7C275.5 365.7 288.9000000000001 379.9 304.8 396.3C306.1 397.7 306.2 399.8 304.9000000000001 401.2C296.9000000000001 409.4 288.4000000000001 418.1 279.3 427.3C278.3 432 278.3 434.6 275.7 435.3C272.7 436.1 269.1 436.3 269.4 439.9C269.7 443.2 270.8 448 266.6 448.1C262.1 448.2 253.4 447 241 438.1C228.7 429.2 224.6 421.3 223.3 417C221.9 412.8 226.9 412.4 230.1 411.6zM620 41.3L471.2 249.2C458 267.7 444.6 272.6 414.8 288.3C403.6 294.2 400.6 299.2 384.3 317.2C383.3 318.3 381.4000000000001 318.1 380.7 316.7C334.4 227.9 333.6 233.9 331.7 221.9C330 211.2 330.4 201.9 332 192.1C333.9 180.1 338.6 168.6 345.7 158.7L494.6 -49.2C502.2 -59.8000000000001 514.8000000000001 -65.4000000000001 527.7 -63.9C568 -59.0000000000001 605.7 -31.9 623.4000000000001 4.6999999999999C628.8000000000001 16.5999999999999 627.7 30.5999999999999 620.0000000000001 41.3z" />
+    <glyph glyph-name="usb"
+      unicode="&#xF287;"
+      horiz-adv-x="640" d=" M641.5 192C641.5 188.9 639.8 185.9 637 184.5L547.9 131C546.5 130.2 545.1 129.6 543.4 129.6C542 129.6 540.3 129.9 538.9 130.7000000000001C536.1 132.4 534.4 135.2000000000001 534.4 138.5000000000001V174.1000000000001H295.7C321 134.5000000000001 336.2 67.2000000000001 365.3 67.2000000000001H392V94C392 99 395.9 102.9 400.9 102.9H490C495 102.9 498.9 99 498.9 94V4.9C498.9 -0.1 495 -4 490 -4H400.9C395.9 -4 392 -0.1 392 4.9V31.6H365.3C289.9 31.6 284.2000000000001 174.1 240.6 174.1H140.3C132.2 143.5 104.4 120.6 71.3 120.6C32 120.7 0 152.7 0 192S32 263.3 71.3 263.3C104.4 263.3 132.3 240.5 140.3 209.8C179.4 209.8 184.2 200.3 214.9 270.2000000000001C255 359.3 273 352.3 323.8 352.3C331.3 373.2 350.8 387.9 374.2 387.9C403.7 387.9 427.7 364 427.7 334.4S403.8 280.9 374.2 280.9C350.8 280.9 331.3 295.7000000000001 323.8 316.5H294C264.9 316.5 249.7 249.1 224.4 209.6H534.5V245.2C534.5 248.5 536.2 251.3 539 253C541.8 254.7 545.4 254.4 547.9 252.7L637 199.2C639.8 198.1 641.5 195.1 641.5 192z" />
+    <glyph glyph-name="ussunnah"
+      unicode="&#xF407;"
+      horiz-adv-x="512" d=" M156.8 162.9L162.5 148.5H154.3C153 151.7 151.2 156.2 150.5 158C148 164.3 149.4 166.4 150.5 168C152.4 170.7 153.7 172.4 154.1 173.2C154.1 171 154.9 167.5 156.8 162.9zM454.1 144.1C452 130.3 448.4000000000001 117 443.6 104.4L486.6 81L441.8 99.8C436.5 86.6 429.8 74.2 421.9000000000001 62.6L456.1 32.4L419.3 58.8C410.9000000000001 47 401.3 36.2 390.6 26.5L415.5 -8.2L387.4 23.6C376.4 14 364.3 5.6 351.3 -1.5L367 -38.7L347.7 -3.4C334.5999999999999 -10.2 320.7 -15.5 306.0999999999999 -19.3L312.7999999999999 -57.6999999999999L302.2999999999999 -20.3C287.9999999999999 -23.6999999999999 273.0999999999999 -25.6 257.7999999999999 -25.6999999999999L256 -64L254.1 -25.6C238.8 -25.5 223.9 -23.6 209.6 -20.3L199 -57.6L205.7 -19.4C191.1 -15.7 177.1 -10.3 164 -3.6L144.8 -38.7L160.4 -1.7C147.4 5.3 135.2 13.6999999999999 124.2 23.4L96.3 -8.2L121 26.1999999999999C110.3 35.8999999999999 100.6 46.6999999999999 92.2 58.4999999999999L55.7 32.3L89.6 62.1999999999999C81.7 73.8 75 86.3 69.6 99.4999999999999L25.2 80.8L67.8 104C63 116.7 59.4 130.1 57.3 143.9L6.3 134.9L56.6 149.1C55.5 157.6 54.9 166.2 54.9 175C54.9 179.6999999999999 55.1 184.3999999999999 55.4 189.1L0 192L56 194.8C57.3 207.9 59.8 220.6 63.5 232.9L6.4 249L65.3 238.6C69.3 250.6 74.4 262.1 80.5 273L25.4 303L83.7 278.4C90 289 97.2 298.8 105.3 308L55.8 351.6L109.7 312.9C117.8 321.5 126.7 329.4 136.3 336.5L96.3 392.1L141.9 340.5C151.4 347.1 161.6 352.8 172.2 357.7L144.9 422.6L178.7 360.5C189.2 364.9 200.1 368.4 211.4 370.9L199 441.6L218.5 372.4C229.5 374.5 240.8 375.6 252.3 375.8L256 448L259.6 375.8C271.1 375.6 282.4000000000001 374.4 293.4000000000001 372.3L313 441.6L300.6 370.9C311.9000000000001 368.3 322.8 364.8 333.2000000000001 360.4L367.1 422.6L339.7000000000001 357.5C350.3000000000001 352.6 360.4000000000001 346.8 369.9000000000001 340.3L415.7000000000001 392.1L375.6 336.2C385.1 329.1 394 321.2 402.1 312.6L456.3 351.5L406.6 307.6C414.6 298.5 421.8 288.7 428.1 278.2L486.8 302.9L431.3 272.7C437.4000000000001 261.8 442.4000000000001 250.4 446.4000000000001 238.4L505.7 248.8L448.2000000000001 232.6C451.9 220.4 454.4 207.7 455.7 194.7L512 192L456 189.2C456.3 184.6 456.5 179.9 456.5 175.1C456.5 166.4 455.9 157.8 454.9 149.3L505.6 135L454.1 144.1zM432.3 175.1C432.3 272.6 353.3 351.6 255.8 351.6S79.3 272.6 79.3 175.1S158.3 -1.4 255.8 -1.4S432.3 77.6 432.3 175.1zM408.3 175.1C408.3 90.8 340 22.5 255.7 22.5S103.1 90.8 103.1 175.1S171.4 327.7000000000001 255.7 327.7000000000001S408.3 259.4000000000001 408.3 175.1zM195 207C195 204.9 196.3 203.2 198.6 201.9C201.9 200 204.8 197.3 206.8 193.7C209.6 199.4 211.1 203.2 211.1 204.9C211.1 207.1 210 209.3 207.9 211.9C205.8 214.4 204.7 217.1 204.6 219.6C198.1 212.8 195 208.7 195 207zM154.3 226C154.3 223.9 155.6 222.2 157.9 220.9C161.4 219 164.1 216.3 166.1 212.7C168.9 218.4 170.4 222.2 170.4 223.9C170.4 226.1 169.3 228.3 167.2 230.9C165.1 233.4 164 236.1 163.9 238.6C157.4 231.8 154.3 227.7 154.3 226zM135.3 226C135.3 223.9 136.6 222.2 138.9 220.9C142.2 219 145.1 216.3 147.1 212.7C149.9 218.4 151.4 222.2 151.4 223.9C151.4 226.1 150.3 228.3 148.2 230.9C146.1 233.4 145 236.1 144.9 238.6C138.5 231.8 135.3 227.7 135.3 226zM340.2000000000001 138.1C331.8000000000001 141.1 331.5000000000001 144.9 331.5000000000001 153.7000000000001V266C323.3000000000001 253.5 317.3000000000001 247.4 313.5000000000001 247.4C319.8000000000001 233 323.0000000000001 223.5 323.0000000000001 219.1V154.8C323.0000000000001 152.6 320.8000000000001 148.3 318.3000000000001 148.3H300.3000000000001C297.5000000000001 155.8 290.1000000000001 175.2 285.0000000000001 188.6C283.0000000000001 186.1 277.8000000000001 179.4 274.3000000000001 174.9C276.7000000000001 173.3 278.4000000000001 171.3 279.5000000000001 168.6C282.1000000000001 161.9 285.9000000000001 152.1 287.4000000000001 148.4H278.2000000000001C274.3000000000001 158.8 268.6 173.8 266.4000000000001 179.5000000000001C264.4000000000001 177.0000000000001 259.2000000000001 170.3000000000001 255.7000000000001 165.8000000000001C258.1 164.2000000000001 259.8000000000001 162.2000000000001 260.9000000000001 159.5000000000001C261.7000000000001 157.5000000000001 263.7000000000001 152.2000000000001 265.2000000000001 148.6000000000001H256C254.5 152.7000000000001 250.4 163.2000000000001 247.6 170.6000000000001C245.6 168.1000000000001 240.4 161.4000000000001 236.9 156.9000000000001C239.4 155.3000000000001 241.2 153.3000000000001 242.1 150.6000000000001C242.3 150.0000000000001 242.6 149.2000000000001 242.7 148.9000000000001H225C220.4 162.8000000000001 213.6 176.6000000000001 213.6 183.0000000000001C213.6 185.2000000000001 213.9 188.1000000000001 214.7 191.2000000000001C205.9 180.4000000000001 200.7 175.3000000000001 200.7 166.2000000000001C200.7 158.7000000000001 211.1 137.9000000000001 211.1 132.9000000000001C211.1 131.2000000000001 210.6 129.6000000000001 209.7 128.0000000000001C200.1 140.7000000000001 194.2 148.7000000000001 190.9 148.7000000000001H178.9L167.7 176.7000000000001C163.9 186.3000000000001 162 192.7000000000001 162 195.5000000000001C162 199.3000000000001 162.5 203.2000000000001 163.7 207.7000000000001C162.7 206.4000000000001 160 203.0000000000001 158.2 200.6000000000001C157.4 202.7000000000001 155.1 208.3000000000001 153.6 212.1000000000001C151.5 209.6000000000001 146.1 203.0000000000001 142.4 198.5000000000001C143.3 196.2000000000001 145.7 190.4000000000001 147.3 186.3000000000001C144.8 183.0000000000001 138.2 174.5000000000001 133.7 168.6000000000001C129.7 163.3000000000001 127.9 155.3000000000001 131 146.8000000000001C133.5 140.1000000000001 133 138.9000000000002 129.3000000000001 132.7000000000001H191C196.5 132.7000000000001 205.3 118.7000000000001 206.5 110.7000000000001C219.7 126.7000000000001 221.9 130.3000000000001 223.3 132.3000000000001H330.3C334.2 132.3000000000001 337.5 134.2000000000001 340.2 138.1000000000001zM360.3000000000001 164.7000000000001V266.3C351.3000000000001 253.8 344.4000000000001 247.7 339.6000000000001 247.7C346.7000000000001 233.3 350.3000000000001 223.8 350.3000000000001 219.4V153.1C350.3000000000001 135.6 358.9000000000001 132.7000000000001 374.3000000000001 132.7000000000001C382.4000000000001 132.7000000000001 386.8000000000001 133.5000000000001 388.0000000000001 135.4C383.7000000000001 137.0000000000001 380.4000000000001 137.9 378.1000000000001 138.7000000000001C370.0000000000001 141.9 360.3000000000001 146.1 360.3000000000001 164.7000000000001z" />
+    <glyph glyph-name="vaadin"
+      unicode="&#xF408;"
+      horiz-adv-x="448" d=" M224.5 307.3C226 324.9 229.4 360 274.3 360H372.9C393.6 360 405 367.8 405 381.6V393.9C405 406.1 414.3 416 426.5 416S448 406.1 448 393.9V357.4C448 314.5 426.5 295.4 381.2 295.4H280.7C250.6 295.4 247.7 280.7000000000001 247.7 268.3C247.7 267 247.6 265.8 247.5 264.6C246.8 252.3 236.6 242.4000000000001 224.1 242.4000000000001S201.4 252.2000000000001 200.7 264.6C200.6 265.8 200.5 267 200.5 268.3C200.5 280.6 197.5 295.4 167.5 295.4H66.8C21.5 295.4 0 314.5 0 357.4V393.9C0 406.1 9.4 416 21.6 416S43.1 406.1 43.1 393.9V381.6C43.1 367.8 54.5 360 75.2 360H173.8C218.6 360 222.1 324.9 223.6 307.3H224.5zM224 -8C235.5 -8 245.4 -1 249.7 8.3C250.8 10.1 346.8 177.9 347.9 179.7000000000001C359.8 199.3000000000001 344.7 224.0000000000001 320.7 224.0000000000001C306.8 224.0000000000001 297.4 217.6000000000001 290.9 203.7000000000001L224 86L157.1 203.7C150.7 217.6 141.2 224 127.3 224C103.3 224 88.2 199.4 100.1 179.7C101.2 177.8 197.2 10.1 198.3 8.3C202.6 -1.0000000000001 212.5 -8.0000000000001 224 -8.0000000000001z" />
+    <glyph glyph-name="viacoin"
+      unicode="&#xF237;"
+      horiz-adv-x="384" d=" M384 416H320L239.3 224H144.8L64 416H0L48 304H0V256H68.5L82.3 224H0V176H102.8L192 -32L281.2 176H384V224H301.7L315.5 256H384V304H336L384 416zM192 112L165 176H219L192 112z" />
+    <glyph glyph-name="viadeo-square"
+      unicode="&#xF2AA;"
+      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM280.7 66.8C238.3 20.6 160.7 20.2 118.3 66.8C50.3 140.4 98.5 262.9 199.5 262.9C212.8 262.9 226.1 260.8 238.6 256.2000000000001C234.3 247.8 231.3 238.6 230.2 229.1C220.5 233.2 210 235.1 199.5 235.1C150.7 235.1 114.9 193.4 114.9 146.2000000000001C114.9 103.2000000000001 143.4 67.5000000000001 184.4 60.3000000000001C245.9 84.3000000000001 257.3 177.9000000000001 257.3 235.3000000000001C257.3 242.6000000000001 257.3 250.1000000000001 256.7 257.4000000000001C245.5 290.3000000000001 230.1 322.0000000000001 212.5 351.9000000000001C239.6 333.6000000000001 254.4 289.4000000000001 256.7 257.8000000000001V257.4000000000001C264.4 234.9000000000001 268.5 211.2000000000001 268.5 187.4000000000001C268.5 133.3000000000001 246.6 88.4000000000001 200.2 59.2000000000001L197.8 59.0000000000001C247.8 58.0000000000001 284 97.6000000000001 284 146.2000000000001C284 158.4000000000001 281.9 170.5000000000001 277.1 181.9000000000001C286.6 183.8000000000001 295.6 187.5000000000001 303.5 192.4000000000001C318.8 155.8000000000001 316.1 105.1000000000001 280.7 66.8000000000001zM309 214.3C295.7 214.3 283.9 221.4 274.6 230.4C296.5 242.4 324.2000000000001 261.1 336.9000000000001 283.4C338.4000000000001 286.4 341.0000000000001 292 341.4000000000001 295.4C328.9000000000001 267.5 297.2000000000001 245.6 267.5 238.7C262.8 246 260 254.2 260 263C260 273.3 265.2 287.1 272.9 294.6C294.5 315.1 325.9 303.1 345.3 344.6C377.8 298.4 358.4 214.3 309 214.3z" />
+    <glyph glyph-name="viadeo"
+      unicode="&#xF2A9;"
+      horiz-adv-x="448" d=" M276.2 297.5V296.8C258.3 349.4 233.6 400.2 205.4 448C248.7 418.8 272.4 348 276.2 297.5zM308.9 175.8C316.5 157.6 319.9 138.3 319.9 118.8C319.9 41.1 262.1 -22.2 182.1 -20.6L185.9 -20.3C260.1 26.4 295.2 98.3 295.2 184.8C295.2 222.9 288.7 260.7 276.3 296.8C277.3 285.1 277.3 273.1 277.3 261.4C277.3 169.6 259.2 19.8 160.7 -18.6C95 -7.2 49.4 50 49.4 118.8C49.4 194.4 106.8 261.1 184.8 261.1C201.6 261.1 218.5 258 233.9 251.5000000000001C235.6 266.6 240.4 281.4000000000001 247.3 294.8C227.4 302 206.1 305.5 184.8 305.5C23.3 305.5 -53.9 109.6 54.9 -8.2C122.8 -82.7999999999999 246.9 -82.1 314.7000000000001 -8.2C371.3000000000001 53.1 375.6 134.2000000000001 351.1 192.8C338.4000000000001 184.8 324 178.9 308.9000000000001 175.8zM418.1 436.3C387.1 369.8 336.8 389.1 302.3 356.2C289.9000000000001 344.2 281.7 322.2 281.7 305.7C281.7 291.6 286.2 278.6 293.7 266.9C341.1 277.9 392 312.9 411.9 357.6C411.2 352.1 407.1 343.2 404.7 338.4C384.4 302.7 340.1 272.8 305 253.5C319.8 239.1 338.7 227.7 360 227.7C439 227.7 470.1 362.3 418.1 436.3z" />
+    <glyph glyph-name="viber"
+      unicode="&#xF409;"
+      horiz-adv-x="512" d=" M444 398.1C431.3 409.8 379.9 447.1 265.3 447.6C265.3 447.6 130.2 455.7 64.4 395.3C27.8 358.7 14.9 305 13.5 238.5C12.1 172 10.4 47.4 130.5 13.6H130.6L130.5 -38S129.7 -58.9 143.5 -63.1C160.1 -68.3000000000001 169.9 -52.4 185.8 -35.3C194.5 -25.9 206.5 -12.1 215.6 -1.6C297.8 -8.5 360.9000000000001 7.3 368.1 9.6C384.7000000000001 14.9999999999999 478.6 26.9999999999999 493.8 151.6C509.6 280.2 486.2 361.4 444 398.1zM457.9 161C445 57 368.9 50.4 354.9 45.9C348.9 44 293.4 30.2 223.7 34.7C223.7 34.7 171.7 -28 155.5 -44.3C150.2 -49.6 144.4 -49.1 144.5 -38.6C144.5 -31.7 144.9 47.1 144.9 47.1C144.8 47.1 144.8 47.1 144.9 47.1C43.1 75.3 49.1 181.4 50.2 236.9C51.3 292.4 61.8 337.9 92.8 368.5C148.5 419 263.2000000000001 411.5 263.2000000000001 411.5C360.1 411.1 406.5000000000001 381.9 417.3000000000001 372.1C453.0000000000001 341.5 471.2 268.3 457.9000000000001 161zM318.9 241.8C319.3 233.2 306.4 232.6 306 241.2C304.9 263.2000000000001 294.6 273.9000000000001 273.4 275.1C264.8 275.6 265.6 288.5 274.1 288C302 286.5 317.5 270.5 318.9 241.8zM339.2 230.5C340.2 272.9 313.7 306.1 263.4 309.8C254.9 310.4 255.8 323.3 264.3 322.7000000000001C322.3 318.5 353.2 278.6 352.1 230.2C352 221.6 339 222 339.2 230.5000000000001zM386.2 217.1C386.3 208.5 373.3 208.4 373.3 217C372.7 298.5 318.4000000000001 342.9 252.5 343.4C244 343.5 244 356.3 252.5 356.3C326.2 355.8 385.5 304.9 386.2 217.1zM374.9 119V118.8C364.1 99.8 343.9 78.8 323.1 85.5L322.9 85.8C301.8 91.7 252.1 117.3 220.7 142.3C204.5 155.1 189.7 170.2 178.3 184.7C168 197.6 157.6 212.9 147.5 231.3C126.2 269.8 121.5 287 121.5 287C114.8 307.8 135.7 328 154.8 338.8H155C164.1999999999999 343.6 173 342 178.9 334.9C178.9 334.9 191.3 320.1 196.5999999999999 312.8C201.5999999999999 306 208.2999999999999 295.1 211.7999999999999 289C217.8999999999999 278.1 214.0999999999999 267 208.0999999999999 262.4L196.0999999999999 252.8C190 247.9 190.7999999999999 238.8 190.7999999999999 238.8S208.5999999999999 171.5 275.0999999999999 154.5C275.0999999999999 154.5 284.2 153.7 289.0999999999999 159.8L298.7 171.8C303.3 177.8 314.3999999999999 181.6 325.3 175.5C340 167.2 358.7 154.3 371.1 142.6C378.1 136.9 379.7 128.2000000000001 374.9 119z" />
+    <glyph glyph-name="vimeo-square"
+      unicode="&#xF194;"
+      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM383.8 266.4C382.4000000000001 235.3 360.6 192.6 318.5 138.5C275 82 238.2 53.7 208.1 53.7C189.4 53.7 173.7 70.9 160.8 105.3C135.6 197.6 124.9 251.7 104.1 251.7C101.7 251.7 93.3 246.7 79 236.6L64 256C100.9 288.4 136.1 324.4 158.1 326.4C183 328.8 198.3 311.8 204.1 275.3C224.6 145.7000000000001 233.7 126.1 270.9 184.8C284.3 206 291.5 222 292.4 233.1C295.8 265.9000000000001 266.8 263.7000000000001 247.2 255.3C262.9 306.8 293 331.8 337.3 330.4C370.2 329.4 385.7 308 383.8 266.4z" />
+    <glyph glyph-name="vimeo-v"
+      unicode="&#xF27D;"
+      horiz-adv-x="448" d=" M447.8 294.4C445.8 250.8 415.4000000000001 191.1 356.4 115.3C295.5 36.1 244 -3.5 201.8 -3.5C175.7 -3.5 153.6 20.6 135.5 68.8C100.3 198 85.3 273.7 56.2 273.7C52.8 273.7 41.1 266.6 21 252.6L0 279.8C51.6 325.1 100.9 375.5 131.8 378.3C166.7 381.7000000000001 188.1 357.8 196.2 306.8C224.9 125.3 237.6 97.9 289.8 180.1C308.5 209.7 318.6 232.2 320 247.7C324.8 293.6 284.2 290.5 256.7 278.7000000000001C278.7 350.8 320.8 385.8 382.9 383.8C428.7 382.6 450.4 352.7000000000001 447.8 294.4z" />
+    <glyph glyph-name="vimeo"
+      unicode="&#xF40A;"
+      horiz-adv-x="448" d=" M403.2 416H44.8C20.1 416 0 395.9 0 371.2V12.8C0 -11.9 20.1 -32 44.8 -32H403.2C427.9 -32 448 -11.9 448 12.8V371.2C448 395.9 427.9 416 403.2 416zM377 267.2C375.6 235.7 353.6 192.5 311 137.8C267 80.6 229.7 51.9999999999999 199.3 51.9999999999999C180.4 51.9999999999999 164.5 69.3999999999999 151.4 104.3C125.9 197.6 115 252.3 94 252.3C91.6 252.3 83.1 247.2 68.6 237.1L53.4 256.7C90.7 289.5 126.3 325.9 148.6 327.9C173.8 330.3 189.3 313.1 195.1 276.2C215.8 145 225 125.1999999999999 262.7 184.6C276.2 206 283.5 222.3 284.5 233.5C288 266.7 258.6 264.4 238.7 255.9C254.6 308 285 333.3 329.9 331.9C363.2 331 378.9 309.4 377 267.2z" />
+    <glyph glyph-name="vine"
+      unicode="&#xF1CA;"
+      horiz-adv-x="384" d=" M384 193.3V141.2C365.6 137 347.1 135.1 331.9 135.1C295 57.6999999999999 228.9 -8.7 206.8 -21.1C192.8 -29 179.7 -29.5 164.1 -20.3C137 -4 34.2 80.3 0 345.3H74.5C93.2 186.2 139 104.6 189.3 43.5C217.2 71.4 244.1 108.6 264.9 150.4C215.1 175.7 184.8 231.3 184.8 296C184.8 361.6 222.5 411.1 287 411.1C401.9 411.1 393.2 283.2 368.6 229.6C368.6 229.6 322.2000000000001 220.4 305.1 250.1C308.5 261.4 313.3 280.9 313.3 298.6C313.3 329.9 302 345.2 284.9000000000001 345.2C266.7000000000001 345.2 254.1 328.1 254.1 295.2C254.2 216 313.5 176.5 384 193.3z" />
+    <glyph glyph-name="vk"
+      unicode="&#xF189;"
+      horiz-adv-x="576" d=" M545 330.3C548.7 342.8 545 352 527.2 352H468.3000000000001C453.3000000000001 352 446.4000000000001 344.1 442.7000000000001 335.3C442.7000000000001 335.3 412.7000000000001 262.2 370.3000000000001 214.8C356.6000000000001 201.1 350.3000000000001 196.7 342.8000000000001 196.7C339.1000000000001 196.7 333.4000000000001 201.1 333.4000000000001 213.6V330.3C333.4000000000001 345.3 329.2000000000001 352 316.8000000000001 352H224.2000000000001C214.8000000000001 352 209.2000000000001 345 209.2000000000001 338.5C209.2000000000001 324.3 230.4000000000001 321 232.6000000000001 281V194.2C232.6000000000001 175.2 229.2000000000001 171.7 221.7000000000001 171.7C201.7000000000001 171.7 153.1000000000001 245.1 124.3000000000001 329.1C118.5000000000001 345.4 112.8000000000001 352 97.7000000000001 352H38.8C22 352 18.6 344.1 18.6 335.3C18.6 319.7 38.6 242.2 111.7 139.8C160.4 69.9 229 32 291.4 32C328.9 32 333.5 40.4 333.5 54.9C333.5 121.7 330.1 128 348.9 128C357.6 128 372.6 123.6 407.6 89.9C447.6 49.9 454.2 32 476.6 32H535.5C552.3 32 560.8 40.4 555.9 57C544.6999999999999 91.9 469 163.7 465.6 168.5C456.9 179.7 459.4 184.7 465.6 194.7C465.7 194.8 537.5999999999999 296 545 330.3z" />
+    <glyph glyph-name="vnv"
+      unicode="&#xF40B;"
+      horiz-adv-x="640" d=" M104.9 96C70.8 96 58.5 126.4 58.5 126.4L2.6 237.9S-7.8 256 13 256H45.8C56.2 256 59 247.3 64.6 237.9L101.3 163.4S106.5 150.3 122.4 150.3S143.5 163.4 143.5 163.4L180.2 237.9C185.8 247.4 188.6 256 199 256H231.8C252.6 256 242.2 237.9 242.2 237.9L186.4 126.4S174.2 96 140 96H104.9zM499.9 96C465.8 96 453.5 126.4 453.5 126.4L397.6 237.9S387.2 256 408 256H440.8C451.2 256 454 247.3 459.6 237.9L496.3 163.4S501.5 150.3 517.4 150.3S538.5 163.4 538.5 163.4L575.3 237.9C580.9 247.4 583.6999999999999 256 594.0999999999999 256H627C647.8 256 637.4 237.9 637.4 237.9L581.5 126.4S569.3 96 535.1 96H499.9zM337.6 256C371.7000000000001 256 384 225.6 384 225.6L439.9 114.1S450.3 96 429.5 96H396.7C386.3 96 383.5 104.7 377.9 114.1L341.2 188.6S336 201.7 320.1 201.7C304.2 201.7 299 188.6 299 188.6L262.3 114.1C256.7 104.7000000000001 253.9 96 243.5 96H210.5999999999999C189.7999999999999 96 200.1999999999999 114.1 200.1999999999999 114.1L256.0999999999999 225.6S268.2999999999999 256 302.4999999999999 256H337.5999999999999z" />
+    <glyph glyph-name="vuejs"
+      unicode="&#xF41F;"
+      horiz-adv-x="448" d=" M356.9 383.7H280L224 295.1L176 383.7000000000001H0L224 0L448 383.7H356.9zM55.7 351.7H109.5L224 153.5L338.4 351.7H392.2L224 63.5L55.7 351.7z" />
+    <glyph glyph-name="weibo"
+      unicode="&#xF18A;"
+      horiz-adv-x="512" d=" M407 270.4C414.6 294.4 393.6 317.2 369.6 312.1C347.6 307.3 340.8 340.2000000000001 362.5 344.9000000000001C412.6 355.8 454.8 307.8 439 260.1C432.2 238.9000000000001 400.2 249.3 407 270.4000000000001zM214.8 1.3C108.5 1.3 0 52.7 0 137.6C0 181.9 28 233.0000000000001 76.3 281.3C176 381 279.5 382.2 249.9 287C245.9 273.9 262.2 281.3 262.2 281C341.7 314.6 402.7 297.8 376.2 229.6C372.5 220.2 377.3 218.7 384.5 216.5C520.2 174.2 419.3 1.3 214.8 1.3zM358.5 147.6C353.1 203.3 280 241.6 195.1 233.3C110.3 224.7 46.3 173 51.7 117.3S130.2 23.3 215.1 31.6C299.9 40.2 363.9 91.9 358.5 147.6zM347.9 412.9C322 407.3 331.1 369.2 356.2 374.6C428.5 389.8 491 321.8 467.9 250.6C460.5 226.4 497 213.6 505.3 238.6C537.1999999999999 338.4 450.2 434.5 347.9 412.9zM269.4 101.9C252.3 63.1 202.6 41.9 160.3 55.6C119.5 68.7 102.3 108.9999999999999 120 145.3C137.7 180.6999999999999 183.1 200.7 223.4 190.4C265.4 179.6 286.5 140.2 269.4 101.9zM183.1 131.9C170.2 137.3 153.1 131.6 145.1 119C136.8 106.1 140.8 91 153.7 85C166.8 79 184.5 84.7 192.8 97.9C200.8 111 196.5 126.2 183.1 131.9zM215.7 145.3C210.6 147 204.3 144.6999999999999 201.4 139.9C198.5 134.8 200 129.3 205.0999999999999 127C210.1999999999999 125 216.7999999999999 127.3 219.6999999999999 132.4C222.5 137.6 220.7999999999999 143.3 215.6999999999999 145.3z" />
+    <glyph glyph-name="weixin"
+      unicode="&#xF1D7;"
+      horiz-adv-x="576" d=" M385.2 280.4C391.6 280.4 397.8 280.1 404 279.3C387.4 357.7 303.3 416 207.7 416C100.5 416 13 343.2 13 250.6C13 197.2 42.3 153.1 90.9 119L71.6 60.4L139.6 94.5C164 89.7 183.4 84.8 207.8 84.8C214 84.8 219.9 85.1 226.1 85.6C222.1 98.5 219.9 112.2000000000001 219.9 126.4C219.8000000000001 211.3000000000001 292.8000000000001 280.4000000000001 385.2000000000001 280.4000000000001zM280.7 333.3C295.2 333.3 304.9 323.6 304.9 308.9C304.9 294.4 295.2 284.7000000000001 280.7 284.7000000000001C265.9 284.7000000000001 251.4 294.4 251.4 308.9C251.5 323.6 266 333.3 280.7 333.3zM144.3 284.7000000000001C129.8 284.7000000000001 115 294.4 115 308.9C115 323.7 129.8 333.3 144.3 333.3C159.1 333.3 168.7 323.6 168.7 308.9C168.7 294.3 159.1 284.7000000000001 144.3 284.7000000000001zM563 128.6C563 206.5 485.1 269.9000000000001 397.6 269.9000000000001C304.9000000000001 269.9000000000001 232.2 206.5 232.2 128.6S305 -12.7 397.6 -12.7C416.9000000000001 -12.7 436.5 -7.6 456.2 -2.8L509.6 -32.1L494.8 16.5C534 45.9 563 84.8 563 128.6zM343.9 153.1C334.2 153.1 324.6 162.8 324.6 172.7000000000001C324.6 182.4 334.3 192.0000000000001 343.9 192.0000000000001C358.7 192.0000000000001 368.3 182.3000000000001 368.3 172.7000000000001C368.3 162.7000000000001 358.6 153.1 343.9 153.1zM451 153.1C441.3 153.1 431.7 162.8 431.7 172.7000000000001C431.7 182.4 441.4 192.0000000000001 451 192.0000000000001C465.5 192.0000000000001 475.4 182.3000000000001 475.4 172.7000000000001C475.5 162.7000000000001 465.5 153.1 451 153.1z" />
+    <glyph glyph-name="whatsapp-square"
+      unicode="&#xF40C;"
+      horiz-adv-x="448" d=" M224 325.2C151.3 325.2 92.2 266.1 92.1 193.4C92.1 168.5 99.1 144.2 112.3 123.3L115.4 118.3L102.1 69.6999999999999L152 82.8L156.8 79.9C177 67.9 200.2 61.5 223.9 61.5H224C296.6 61.5 357.3 120.6 357.3 193.3C357.3 228.5 342.1 261.6 317.2 286.5C292.2 311.5 259.2 325.2 224 325.2zM301.5 136.8C298.2 127.5 282.4 119.1 274.8 118C262.2 116.1 252.4 117.1 227.3 127.9C187.6 145.1 161.6 185.1 159.6 187.7C157.6 190.3 143.4 209.2 143.4 228.7S153.6 257.8 157.3000000000001 261.8C160.9 265.8 165.2000000000001 266.8 167.9 266.8C170.5 266.8 173.2000000000001 266.8 175.5 266.7C177.9 266.6 181.2 267.6 184.4 259.9C187.7000000000001 252 195.6 232.5 196.6 230.5S198.3 226.2 196.9 223.6C189.3000000000001 208.4 181.2000000000001 209 185.3000000000001 202C200.6000000000001 175.7 215.9 166.6 239.2000000000001 154.9C243.2000000000001 152.9 245.5000000000001 153.2 247.8000000000001 155.9C250.1000000000001 158.5 257.7000000000001 167.5 260.3000000000001 171.4C262.9000000000001 175.4 265.6000000000001 174.7 269.2000000000001 173.4C272.8000000000001 172.1 292.3000000000001 162.5 296.3000000000001 160.5S302.9000000000001 157.5 303.9000000000001 155.9C304.8000000000001 154 304.8000000000001 146 301.5000000000001 136.8zM400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM223.9 34.8C197.3 34.8 171.2 41.5 148.1 54.1L64 32L86.5 114.2C72.6 138.2 65.3 165.5 65.3 193.5C65.4 280.9 136.5 352 223.9 352C266.3 352 306.1 335.5 336.1 305.5C366 275.5 384 235.7 384 193.3C384 105.9 311.3 34.8 223.9 34.8z" />
+    <glyph glyph-name="whatsapp"
+      unicode="&#xF232;"
+      horiz-adv-x="448" d=" M380.9 350.9C339 392.9 283.2 416 223.9 416C101.5 416 1.9 316.4 1.9 194C1.9 154.9 12.1 116.7 31.5 83L0 -32L117.7 -1.1C150.1 -18.8 186.6 -28.1 223.8 -28.1H223.9C346.2 -28.1 448 71.5 448 193.9C448 253.2 422.8 308.9 380.9 350.9zM223.9 9.3C190.7 9.3 158.2 18.1999999999999 129.9 34.9999999999999L123.2 38.9999999999999L53.4 20.6999999999999L72 88.8L67.6 95.8C49.1 125.2 39.4 159.1 39.4 194C39.4 295.7 122.2 378.5 224 378.5C273.3 378.5 319.6 359.3 354.4 324.4C389.2 289.5 410.6 243.2 410.5 193.9C410.5 92.1 325.6 9.3 223.9 9.3zM325.1 147.5C319.6 150.3 292.3 163.6999999999999 287.2 165.5C282.1 167.3999999999999 278.4 168.3 274.7 162.6999999999999C271 157.0999999999999 260.4 144.6999999999999 257.1 140.8999999999999C253.9 137.1999999999999 250.6 136.6999999999999 245.1 139.5C212.5 155.8 191.1 168.6 169.6 205.5C163.9 215.3 175.3 214.5999999999999 185.9 235.8C187.7 239.5 186.8 242.7 185.4 245.5C184 248.3 172.9 275.5999999999999 168.3 286.7C163.8 297.5 159.2 296 155.8 296.2C152.6 296.3999999999999 148.9 296.3999999999999 145.2 296.3999999999999C141.5 296.3999999999999 135.5 294.9999999999999 130.4 289.4999999999999C125.3 283.8999999999999 111 270.4999999999999 111 243.2C111 215.8999999999999 130.9 189.5 133.6 185.8C136.4 182.1 172.7 126.1 228.4 101.9999999999999C263.6 86.8 277.4 85.4999999999999 295 88.1C305.7 89.7 327.8 101.4999999999999 332.4 114.5C337 127.5 337 138.6 335.6 140.8999999999999C334.3 143.3999999999999 330.6 144.7999999999999 325.1 147.5z" />
+    <glyph glyph-name="whmcs"
+      unicode="&#xF40D;"
+      horiz-adv-x="448" d=" M448 287V308.3L419.5 317.1L417.3 327.5L437.4000000000001 348.2000000000001L427 367.6L398 360.1L390.8 367.6L398.3 395.8L379.2 407.4L357.9 386.4L347.2 389.6L340.2 416H317.6L311.4 389.6L299.3 386.4L279.6 407.4L260.2 396.4L268.3 368.7L260.2 360.3L231.7 367.8L220.7 348.7L241.4 327.7L238.5 317.3L210 309.5L209.7 287.8L238.5 280.3L240.9 268.2L220.8 248.3L231.2 229.8L260.8 237.3L268 228.7L259.9 201.8L279.8 190.2L299.2 210.6L310.8 207.7L317.5 179.2L340.1 178.9L346.8 207.7L358.4 211.2L379.1 189.6L399.5 201.7L390.7 229.7L398.5 237.8L427.3 229L437.6 249.1L416.7 267.9L418.9 280L448 287zM328.8 241.8C297.5 241.8 272 267.2000000000001 272 298.6S297.4 355.4000000000001 328.8 355.4000000000001S385.6 330 385.6 298.6C385.6 267.1 360.2000000000001 241.8 328.8 241.8zM401.1 225.4L448 210.9V171L392.9 157.6L388.8 134.9L427.7 99.6L408.5 61.7000000000001L354.5 78.4L339.8999999999999 63.2000000000001L356.5999999999999 10.7L318.2999999999999 -11.9999999999999L279.3999999999999 28.5000000000001L257.7 21.9L245.1 -32.1L202.6999999999999 -31.6L190.0999999999999 22.0000000000001L168.4 27.6000000000001L132 -10.7999999999999L94.5999999999999 10.9000000000001L109.7999999999999 61.4000000000001L96.0999999999999 77.5000000000001L40.5999999999999 63.4000000000001L20.8999999999999 98.2000000000001L58.7999999999999 135.6000000000001L53.9999999999999 158.4000000000001L-1e-13 172.5000000000001L0.4999999999999 213.4000000000001L54 228.1L59.7 247.8L20.8 287.2L41.5 323L95.1 308.9L110.3 324.6L95.1 376.6L131.5 397.3L168.3 357.9L191 364L202.6 416H245L256.6 370.1L234 376L227.7 377.7L224.4 372L213.4 352.9L210.1 347.3L214.7 342.7000000000001L231.9 325.3L231.6 324.3L207.7999999999999 317.8L201.5999999999999 316.1L201.5 309.7000000000001L201.3 296.8C153.8 286.4 118 244 118 193.3C118 135 165.3 87.6 223.7 87.6C274.2 87.6 316.4 123 326.9 170.4L340.1 170.2000000000001L347 170.1L348.6 176.8L354.2 200.8L356.1 201.4L373.2 183.6L377.9 178.7000000000001L383.7 182.1L404.1 194.2L409.9 197.7L407.9 204.2L401.1 225.4z" />
+    <glyph glyph-name="wikipedia-w"
+      unicode="&#xF266;"
+      horiz-adv-x="640" d=" M640 396.8L639.7 384.6C611.6 383.8 594.7 368.8 583.9000000000001 344.3C558.9000000000001 286.5 480.6000000000001 104.3 428.6000000000001 -14.3H415L333.1 178.8C300.6 115.1999999999999 264.8 48.8 233.9000000000001 -14.3000000000001C233.6 -14.6000000000001 218.9 -14.3000000000001 218.9 -14.0000000000001C172 95.7 122.8 204.6 75.8 314.6C64.4 341.3 26.4 384.6 0.2 384.3C0.2 387.4 -0.1 394.3 -0.1 398.5H161.8V384.6C142.6 383.5 109 371.3 118.5 350.4C140.4 300.7 222.1 110.1 244.1 61.8C259.1 91.4999999999999 301.9000000000001 171 319.4000000000001 204.6C305.5000000000001 232.9 260.8 338.5 246.6 364.6C236.9000000000001 382.4 210.5 384 190.8 384.3V398.2L333.3 397.9V384.8C313.9000000000001 384.2 295.2 377 303.9000000000001 358.7C322.8 318.7 334.5000000000001 290.6 352.0000000000001 254C357.6000000000001 264.8 386.7000000000001 323.4 400.1000000000001 354.8C409.0000000000001 375.4 396.2000000000001 383.4 361.5000000000001 384.2C361.8000000000001 387.8 361.5000000000001 394.5 361.8000000000001 397.8C406.2000000000001 398.1 472.9000000000001 398.1 484.9000000000001 398.4V384.8C462.4000000000001 384 439.1000000000001 372 426.8000000000001 353.1L367.6000000000001 230.3C374.0000000000001 214.2 430.9000000000001 87.5 436.8000000000001 73.6L559.2 356.2C550.6 379.3 522.8000000000001 384.3 512 384.5V398.4L639.8 397.3L640 396.8z" />
+    <glyph glyph-name="windows"
+      unicode="&#xF17A;"
+      horiz-adv-x="448" d=" M0 354.3L183.6 379.6V202.2H0V354.3zM0 29.7L183.6 4.4V179.6H0V29.7zM203.8 1.7L448 -32V179.6H203.8V1.7zM203.8 382.3V202.2H448V416L203.8 382.3z" />
+    <glyph glyph-name="wolf-pack-battalion"
+      unicode="&#xF514;"
+      horiz-adv-x="456.58" d=" M239.73 -23.53L250.29 -39.3699999999999L255.57 -27.05L260.85 -34.09V-64C281.91 -56.08 281.96 2.86 286.36 33.21C290.98 65.1 285.48 126.02 367.73 182.32C358.85 205.93 355.73 231.75 365.09 262.37C392.96 259.03 419.03 251.79 428.43 208.27L398.08 199.91C409.2299999999999 176.87 415.0899999999999 153.15 411.2799999999999 127.7700000000001L384 134.82L377.84 101.39L359.37 108.43L350.57 75L331.22 82.04L357.61 60.93L366.41 89.08L391.04 83.8L398.08 119.43L424.47 104.91C424.72 124.93 431.44 162.97 415.67 189.36L442.06 184.0800000000001C446.05 206.15 439.68 223.2900000000001 434.14 240.8200000000001L456.5699999999999 231.1400000000001C456.1299999999999 256.2100000000001 426.63 287.9300000000001 394.99 289.6400000000001C374.77 290.73 338.25 314.8100000000001 340.89 341.5400000000001C342.8499999999999 361.4100000000001 358.3399999999999 384.1600000000001 384 391.2400000000001C340.01 354.73 374.32 323.9400000000001 389.2799999999999 317.7800000000001C393.6799999999999 329.2200000000001 406.82 386.8600000000001 389.2799999999999 447.98C348.81 425.1100000000001 299.5499999999999 382.8800000000001 296.0299999999999 300.1900000000001L237.9699999999999 261.48L234.4499999999999 168.23L341.7799999999999 228.05L348.82 221.01L331.23 217.49L287.24 178.78L271.4 184.06L243.25 134.8L239.73 15.16L260.84 -0.6799999999999L228.29 -16.5199999999999L195.74 -0.6799999999999L216.85 15.16L213.33 134.8L185.18 184.06L169.34 178.78L125.3499999999999 217.4900000000001L107.7599999999999 221.0100000000001L114.8 228.0500000000001L222.13 168.23L218.6099999999999 261.48L160.5499999999999 300.1900000000001C157.03 382.9 107.77 425.13 67.3 448C49.76 386.88 62.9 329.24 67.3 317.8C82.26 323.9600000000001 116.56 354.75 72.58 391.26C98.24 384.18 113.73 361.43 115.69 341.56C118.32 314.82 81.81 290.75 61.59 289.66C29.94 287.94 0.44 256.2200000000001 0 231.15L22.43 240.83C16.89 223.3 10.52 206.16 14.51 184.09L40.9 189.37C25.14 162.98 31.85 124.94 32.1 104.92L58.49 119.44L65.53 83.81L90.16 89.09L98.96 60.94L125.35 82.05L106.01 75L97.21 108.43L78.74 101.39L72.58 134.82L45.31 127.78C41.49 153.16 47.36 176.88 58.51 199.92L28.16 208.28C37.56 251.8 63.63 259.05 91.5 262.38C100.86 231.76 97.74 205.93 88.86 182.33C171.11 126.03 165.61 65.1 170.23 33.22C174.63 2.8699999999999 174.68 -56.07 195.74 -63.99V-34.08L201.02 -27.04L206.3 -39.36L216.86 -23.52L228.3 -44.63L239.73 -23.53zM318.9 71.48L303.06 82.04C310.5300000000001 86.4 316.82 90.46 322.4100000000001 94.36C321.81 87.1 322.1400000000001 80.48 318.9000000000001 71.48zM347.05 120.74C346.65 109.8 346.15 99.08 345.29 89.07C337.44 90.93 329.72 92.87 324.18 96.11C332.42 104.01 339.73 112.38 347.05 120.74zM371.68 115.46C371.66 128.8900000000001 369.63 139.67 366.4 148.8900000000001C361.02 139.8000000000001 355.17 130.71 347.93 121.6200000000001L371.68 115.46zM375.2 196.4C394.64 183.59 403 162.74 405.11 140.1C392.79 144.63 380.48 149.41 368.16 150.66C373.22 162.65 374.81 178.8 375.2 196.4zM373.44 242.1400000000001C374.25 227.8400000000001 375.2799999999999 213.3200000000001 375.2 199.9100000000001C394.42 208.0200000000001 404.9799999999999 209.6300000000001 419.19 213.9900000000001C408.5899999999999 232.9400000000001 391.9699999999999 239.5100000000001 373.44 242.1400000000001zM137.68 71.48L153.52 82.04C146.05 86.4 139.76 90.46 134.17 94.36C134.77 87.1 134.44 80.48 137.68 71.48zM109.53 120.74C109.93 109.8 110.43 99.08 111.29 89.07C119.14 90.93 126.86 92.87 132.4 96.11C124.16 104.01 116.85 112.38 109.53 120.74zM84.89 115.46C84.91 128.8900000000001 86.94 139.67 90.17 148.8900000000001C95.55 139.8000000000001 101.4 130.71 108.64 121.6200000000001L84.89 115.46zM81.37 196.4C61.93 183.59 53.57 162.74 51.46 140.1C63.78 144.63 76.09 149.41 88.41 150.66C83.36 162.65 81.76 178.8 81.37 196.4zM83.13 242.1400000000001C82.32 227.8400000000001 81.29 213.3200000000001 81.37 199.9100000000001C62.15 208.0200000000001 51.59 209.6300000000001 37.38 213.9900000000001C47.99 232.9400000000001 64.6 239.5100000000001 83.13 242.1400000000001z" />
+    <glyph glyph-name="wordpress-simple"
+      unicode="&#xF411;"
+      horiz-adv-x="512" d=" M256 440C119.3 440 8 328.8 8 192C8 55.3 119.3 -56 256 -56S504 55.3 504 192C504 328.8 392.7 440 256 440zM33 192C33 224.3 39.9 255 52.3 282.7L158.7 -8.7C84.3 27.5 33 103.8 33 192zM256 -31C234.1 -31 213 -27.8 193 -21.9L259.9 172.5L328.4 -15.3C328.9 -16.4 329.4 -17.4 330 -18.4C306.9 -26.5000000000001 282 -31.0000000000001 256 -31.0000000000001zM286.7 296.5C300.1 297.2 312.2 298.6 312.2 298.6C324.2 300 322.8 317.7 310.8 317C310.8 317 274.7 314.2 251.4 314.2C229.5 314.2 192.7 317 192.7 317C180.7 317.7 179.3 299.3 191.3 298.6C191.3 298.6 202.7 297.2 214.7 296.5L249.4 201.3L200.6 55L119.4 296.5C132.8 297.2 144.9 298.6 144.9 298.6C156.9 300 155.5 317.7 143.5 317C143.5 317 107.4 314.2 84.1 314.2C79.9 314.2 75 314.3 69.7 314.5C109.6 375 178.1 415 256 415C314 415 366.9 392.8 406.6 356.5C405.6 356.6 404.7000000000001 356.7 403.7000000000001 356.7C381.8000000000001 356.7 366.3000000000001 337.6 366.3000000000001 317.1C366.3000000000001 298.7 376.9000000000001 283.2 388.2000000000001 264.8C396.7000000000001 250 406.6 230.9 406.6 203.3C406.6 184.2 399.3 162.1 389.6 131.2000000000001L367.4000000000001 56.9L286.7000000000001 296.5zM368.1 -0.7L436.2000000000001 196.2C448.9000000000001 228.0000000000001 453.2 253.4000000000001 453.2 276.1C453.2 284.3 452.7 291.9000000000001 451.7 299C469.1 267.2000000000001 479.0000000000001 230.8 479.0000000000001 192C479.0000000000001 109.7000000000001 434.4000000000001 37.9 368.1 -0.6999999999999z" />
+    <glyph glyph-name="wordpress"
+      unicode="&#xF19A;"
+      horiz-adv-x="512" d=" M61.7 278.6L163.2 0.6C92.2 35 43.3 107.8 43.3 192C43.3 222.9 49.9 252.1 61.7 278.6zM399.6 202.7C399.6 229 390.2 247.2 382.1 261.4C371.3 278.9 361.2 293.8 361.2 311.3C361.2 330.9 376 349.1 396.9 349.1C397.8 349.1 398.7 349 399.7 348.9C361.8 383.6 311.4 404.8 256 404.8C181.7 404.8 116.3 366.7 78.2 308.9C83.2 308.7 87.9 308.6 91.9 308.6C114.1 308.6 148.6 311.3 148.6 311.3C160.1 312 161.4 295.1 150 293.8C150 293.8 138.5 292.5 125.7 291.8L203.2 61.4L249.8 201L216.7 291.8C205.2 292.5 194.4 293.8 194.4 293.8C182.9 294.5 184.3 312 195.7 311.3C195.7 311.3 230.8 308.6 251.7 308.6C273.9000000000001 308.6 308.4000000000001 311.3 308.4000000000001 311.3C319.9000000000001 312 321.2000000000001 295.1 309.8 293.8C309.8 293.8 298.3 292.5 285.5 291.8L362.4 63.1L383.6 134C392.6 163.4 399.6 184.5 399.6 202.7zM259.7 173.4L195.8999999999999 -12.1C214.9999999999999 -17.7 235.0999999999999 -20.8 255.9999999999999 -20.8C280.7999999999999 -20.8 304.4999999999999 -16.5 326.5999999999999 -8.7C325.9999999999999 -7.8 325.4999999999999 -6.8 325.0999999999999 -5.8L259.7 173.4zM442.7 294.1C443.5999999999999 287.3 444.0999999999999 280.1 444.0999999999999 272.2C444.0999999999999 250.6 440.0999999999999 226.4 427.8999999999999 196L362.8999999999999 8.0999999999999C426.2 45 468.7 113.5 468.7 192C468.7 229 459.3 263.8 442.7 294.1zM504 192C504 55.2 392.7 -56 256 -56C119.2 -56 8 55.3 8 192C8 328.8 119.2 440 256 440C392.7 440 504 328.8 504 192zM492.6 192C492.6 322.5 386.4000000000001 428.6 256 428.6C125.5 428.6 19.4 322.5 19.4 192S125.6 -44.6 256 -44.6C386.5 -44.6 492.6 61.5 492.6 192z" />
+    <glyph glyph-name="wpbeginner"
+      unicode="&#xF297;"
+      horiz-adv-x="512" d=" M462.799 125.626C519.01 61.318 466.961 -32 370.944 -32C331.3420000000001 -32 292.12 -14.313 270.802 18.04C263.915 17.684 248.1 17.684 241.212 18.04C219.848 -14.381 180.588 -32 141.069 -32C45.579 -32 -7.279 60.996 49.214 125.626C-29.925 257.477 80.479 416 256.006 416C431.638 416 541.876 257.374 462.799 125.626zM123.152 208.598H164.681V266.673H123.152V208.598zM340.332 122.526V146.365C279.826 125.4499999999999 207.977 137.167 152.743 180.336L152.989 155.439C204.09 109.072 284.735 97.564 340.332 122.526zM189.579 208.598H355.637V266.673H189.579V208.598z" />
+    <glyph glyph-name="wpexplorer"
+      unicode="&#xF2DE;"
+      horiz-adv-x="512" d=" M512 192C512 50.8 397.3 -64 256 -64C114.8 -64 0 50.7 0 192S114.7 448 256 448S512 333.3 512 192zM480 192C480 315.2 379.7 416 256 416C132.5 416 32 315.5 32 192S132.5 -32 256 -32S480 68.5 480 192zM160.9 323.4L247.8 286.3L210.7 199.4L123.8 236.5L160.9 323.4zM270.9 154.3L317.5 60.3H302.9L252.9 160.3L204 60.3H190L241.1 167.2000000000001L218.8 176.6L224.8 190.6L293.4 161.5L287.4 147.2L270.9 154.3zM259.1 270.6L327.7 241.2L298.3 172.9L230 202L259.1 270.6zM339.4 227.7L394 204.6L370.6 150.3L316.3 173.4L339.4000000000001 227.7000000000001z" />
+    <glyph glyph-name="wpforms"
+      unicode="&#xF298;"
+      horiz-adv-x="448" d=" M448 372.8V11.1C448 -13.2 429 -32.1 404.8 -32.1H43.2C19.3 -32 0 -13.4 0 11.2V372.8C0 396.9 18.8 416 43.2 416H404.9C428.9 416 448 397.2 448 372.8zM410.7 11.2V372.8C410.7 375.8 408.1 378.6 404.9 378.6H395.6L285.3 304L224 353.9L162.8 304L52.5 378.7H43.2C40 378.7 37.4 375.9 37.4 372.9V11.2C37.4 8.2 40 5.4 43.2 5.4H404.9C408.1 5.3 410.7 8.1 410.7 11.2zM150.2 262V225H76.7V262H150.2zM150.2 187.6V150.3H76.7V187.6H150.2zM161.3 334.9000000000001L215.3 378.6H96.8L161.3 334.9000000000001zM371.3 262V225H175.3V262H371.3zM371.3 187.6V150.3H175.3V187.6H371.3zM286.7 334.9000000000001L351.2 378.6H232.8L286.7 334.9000000000001zM371.3 113V75.7H271.9V113H371.3z" />
+    <glyph glyph-name="xbox"
+      unicode="&#xF412;"
+      horiz-adv-x="512" d=" M369.9 129.8C414.2 75.5 434.6 31 424.3 11.1C416.4 -4 367.6 -33.5 331.7 -44.8C302.0999999999999 -54.1 263.3 -58.1 231.3 -54.9999999999999C193.0999999999999 -51.3 154.3999999999999 -37.6 121.1999999999999 -15.9999999999999C93.3 2.2 87 9.7 87 24.6C87 54.5 119.9 106.9 176.2 166.7000000000001C208.2 200.6000000000001 252.7 240.4000000000001 257.6 239.3000000000001C267 237.2000000000001 341.9000000000001 164.2000000000001 369.9000000000001 129.8000000000001zM188.6 304.2C158.9 331.1 130.5 358.1 102.2 367.6C87 372.7 85.9 372.4 73.5 359.5C44.3 329.1 20 279.8 13.2 237.1C7.8 202.9 7.1 193.3 9 176.6C14.6 126.1 26.3 91.2000000000001 49.5 55.7C59 41.1 61.6 38.4 58.8 45.8000000000001C54.6 56.8000000000001 58.5 83.3000000000001 68.3 109.8000000000001C82.6 148.8000000000001 122.2 222.7000000000001 188.6 304.2000000000001zM500.2 240.7C483.3 320.7 432.7 371 425.6 371C418.3 371 401.4000000000001 364.5 389.6 357.1C366.3 342.6 348.6 325.7 325.3 304.3C367.7 251 427.5 164.9 448.2 102C455 81.3 457.9 60.9 455.6 49.7C453.9 41.2 453.9 41.2 456.9999999999999 45.1C463.1 52.8 476.8999999999999 76.4 482.3999999999999 88.6C489.7999999999999 104.8 497.3999999999999 128.8 500.9999999999999 147.3C505.3 169.8 504.8999999999999 218.1 500.1999999999999 240.7zM141.3 405C189 407.5 251 370.5 255.6 369.6C256.3 369.5 266 373.8 277.2 379.3C341.1 410.4 371.2 405.1 384.6 404.5C320.7000000000001 443.8 231.9000000000001 454.5 150.7 416.2C127.3 405.1 126.7 404.3 141.3 405z" />
+    <glyph glyph-name="xing-square"
+      unicode="&#xF169;"
+      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM140.4 127.8H93.8C88.3 127.8 85.1 133.1 87.8 138.1L137.1 224.8C137.2 224.8 137.2 224.9 137.1 225L105.7 279C102.7 284.6 105.9 289.1 111.7 289.1H158.3C163.5 289.1 167.8 286.2 171.2 280.4L203.1 225.1C201.8 222.8 185.1 193.4 153 136.9C149.5 130.7000000000001 145.3 127.8 140.4 127.8zM360.1 341.9L257.3 161.2V161L322.8 42C325.6 36.9 322.9000000000001 31.9 316.8 31.9H270.2C264.7 31.9 260.5 34.8 257.3 40.6L191.3 160.9C193.6 165 228.1 225.8 294.7000000000001 343.2C298.0000000000001 349 302.1 351.9 307.2000000000001 351.9H354.1C359.8 352 362.9000000000001 347.2 360.1 341.9z" />
+    <glyph glyph-name="xing"
+      unicode="&#xF168;"
+      horiz-adv-x="384" d=" M162.7 238C160.9 234.7 137.5 193.6 92.6 114.5C87.7 106.2 81.8 102 74.9 102H9.8C2.1 102 -2.3 109.5 1.3 116.4L70.3 237.7C70.5 237.7 70.5 237.8 70.3 238L26.4 313.6C22.1 321.4 26.7 327.7 34.9 327.7H100C107.3 327.7 113.3 323.6 118 315.5L162.7 238zM382.6 401.9L238.6 148.9V148.6L330.2 -18C334.1 -25.1 330.4 -32.1 321.7 -32.1H256.5C248.9 -32.1 242.9 -28.1 238.5 -19.9L146.1 148.6C149.4 154.4 197.6 239.4 290.9 403.8C295.5 411.9 301.3 416 308.4 416H374.1C382.1 416 386.4 409.3 382.6 401.9z" />
+    <glyph glyph-name="y-combinator"
+      unicode="&#xF23B;"
+      horiz-adv-x="448" d=" M448 416V-32H0V416H448zM236 160.5L313.5 306H280.8L235 215C230.3 205.7 226 196.7 222.2 188.2L210 215L164.8 306H129.8L206.5 162.2V67.7H236V160.5z" />
+    <glyph glyph-name="yahoo"
+      unicode="&#xF19E;"
+      horiz-adv-x="448" d=" M252 156L256 -64C243.3 -61.8 232.5 -60.1 223.7 -60.1C215.3 -60.1 204.5 -61.8 191.4 -64L195.4 156C140.4 250.8 85 352.8 21.4 448C33.3 444.9 44.4 444.1 54.6 444.1C63.6 444.1 75 444.9 88.7 448C129.6 375.8 170.8 309.3 223.7 222.5C261 284.1 314.8 366.6 358.6 448C369.7000000000001 445.1 380.6 444.1 391.5 444.1C403 444.1 414.7 445.1 426.5 448C392.1 400.1 294.9 231.1 252 156z" />
+    <glyph glyph-name="yandex-international"
+      unicode="&#xF414;"
+      horiz-adv-x="320" d=" M129.5 -64V102.1L18.5 400H74.3L156.1 170.3L250.2 448H301.5L180.8 100.2V-64H129.5z" />
+    <glyph glyph-name="yandex"
+      unicode="&#xF413;"
+      horiz-adv-x="256" d=" M153.1 132.2L65.7 -64H2L98 145.8C52.9 168.7 22.8 210.2 22.8 286.9C22.7 394.3 90.8 448 171.7 448H254V-64H198.9V132.2H153.1zM198.9 401.5H169.5C125.1 401.5 82.1 372.1 82.1 286.9C82.1 204.6 121.5 178.1 169.5 178.1H198.9V401.5z" />
+    <glyph glyph-name="yelp"
+      unicode="&#xF1E9;"
+      horiz-adv-x="384" d=" M136.9 120C135.9 119.7 27.7 84.3 21.1 84.3C5.9 85.2 2.6 100.5 1.2 115.5C-0.3 129.7 -0.2 145.3 1.5 162.3C3.4 181.1 7 207.4 25.7 206.3C30.5 206.3 92.8 180.4 138.4 161.9C155.5 155.1 157 126.1 136.9 120.0000000000001zM194.8 233.9C196.6 195.7 169.3 185.4 147.6 219.6L41.3 387.6C39.8 394.2 41.6 400 46.6 405C62.2 421.5 146 444.8 168.1 439.1C175.6 437.2 180.2 433 181.9 426.5C183.2 418.2 193.4 259.1 194.8 233.9zM193.4 69.1C193.4 64.5 193.6 -47.3 191.7 -52.4C189.4 -58.4 184.7 -62.1 177.4 -63.6C167.3 -65.2999999999999 150.3 -61.7 126.4 -52.9C104.4 -44.8 69.7 -31.4 77.1 -10.4C79.9 -3.5 128.5 52.4 154.4 83.2000000000001C166.4 98.4 194.2 88.7000000000001 193.4 69.1zM373.6 186.9C368 183.2000000000001 262.8 158.7000000000001 255.5000000000001 156.3L255.8000000000001 156.9C237.7000000000001 152.2000000000001 220.4 175.4 232.5000000000001 191.5000000000001C236.2 195.2000000000001 298.4000000000001 283.9000000000001 305.3 288.5000000000001C310.5 292.1 316.6 292.3000000000001 323.6 289.1C342 280.3000000000001 378.7000000000001 226.0000000000001 381 204.5000000000001C380.9 201.6000000000001 382.2 192.8000000000001 373.6 186.9zM383.7000000000001 56.2C381.0000000000001 35.6 339.2000000000001 -17.1999999999999 319.9000000000001 -24.8C313.0000000000001 -27.4 307.0000000000001 -26.8 302.2000000000001 -22.8C297.2000000000001 -19.3 240.4000000000001 74.3000000000001 237.3000000000001 79.5000000000001C226.4000000000001 95.7000000000001 244.1000000000001 119.3000000000001 262.9000000000001 112.7000000000001C262.9000000000001 112.7000000000001 373.4000000000001 77.0000000000001 377.6 73.3000000000001C382.8 69.2000000000001 384.8 63.5000000000001 383.7000000000001 56.2z" />
+    <glyph glyph-name="yoast"
+      unicode="&#xF2B1;"
+      horiz-adv-x="448" d=" M91.3 372H277.3L270.3 353.1H91.3C51.6 353.1 19.4 321.5 19.4 282.8V77.4C19.4 42 44.3 7.1 103.4 7.1V-12H91.3C41.2 -12 0 28.2 0 77.5V282.8C0 332.1 40.7 372 91.3 372zM320.4 428H386.9C243.1 49.9 241.2 29.1 202.2 -11.3C181.4 -32.9 152.9 -43 123.9 -44V7.1C173.1 14.8 188.5 57 188.5 82.4C188.5 102.5000000000001 189.1 95.0000000000001 106.4 305.6H167.8L218.2 149L320.4 428zM448 286.5V-12H234C240.6 -2.4 244.7 4.3 246.1 7.4H428.6V286.5C428.6 319 411.5 338.4 380.4000000000001 349.4L387.1 367C428.8 353.4 448 323.9 448 286.5z" />
+    <glyph glyph-name="youtube-square"
+      unicode="&#xF431;"
+      horiz-adv-x="448" d=" M186.8 245.9L282 191.8L186.8 137.7V245.9zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM406 191.7S406 251.3 398.4 279.9C394.2 295.7 381.9 308.1 366.2 312.3C337.9 320 224 320 224 320S110.1 320 81.8 312.3C66.1 308.1 53.8 295.7000000000001 49.6 279.9C42 251.4 42 191.7 42 191.7S42 132.1 49.6 103.5C53.8 87.7 66.1 75.8 81.8 71.6C110.1 64 224 64 224 64S337.9 64 366.2 71.7C381.9 75.9 394.2 87.8 398.4 103.6C406 132.1 406 191.6999999999999 406 191.6999999999999z" />
+    <glyph glyph-name="youtube"
+      unicode="&#xF167;"
+      horiz-adv-x="576" d=" M549.655 323.9170000000001C543.374 347.567 524.8679999999999 366.193 501.371 372.514C458.781 384 288 384 288 384S117.22 384 74.629 372.514C51.132 366.192 32.626 347.567 26.345 323.9170000000001C14.933 281.05 14.933 191.612 14.933 191.612S14.933 102.174 26.345 59.307C32.626 35.657 51.132 17.807 74.629 11.486C117.22 0 288 0 288 0S458.78 0 501.371 11.486C524.8679999999999 17.807 543.374 35.657 549.655 59.307C561.067 102.174 561.067 191.612 561.067 191.612S561.067 281.05 549.655 323.9170000000001zM232.145 110.409V272.815L374.884 191.61L232.145 110.409z" />
+  </font>
+</defs>
+</svg>
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-brands-400.ttf b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-brands-400.ttf
new file mode 100644
index 00000000000..357b16bf134
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-brands-400.ttf differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-brands-400.woff b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-brands-400.woff
new file mode 100644
index 00000000000..d6b25709475
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-brands-400.woff differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-brands-400.woff2 b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-brands-400.woff2
new file mode 100644
index 00000000000..4661a5eed64
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-brands-400.woff2 differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-regular-400.eot b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-regular-400.eot
new file mode 100644
index 00000000000..91f58996713
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-regular-400.eot differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-regular-400.svg b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-regular-400.svg
new file mode 100644
index 00000000000..1bde3481e91
--- /dev/null
+++ b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-regular-400.svg
@@ -0,0 +1,372 @@
+<?xml version="1.0" standalone="no"?> 
+<!--
+Font Awesome Free 5.0.13 by @fontawesome - https://fontawesome.com
+License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+-->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<defs>
+  <font id="fontawesome-free" horiz-adv-x="640">
+    <font-face font-family="Font Awesome 5 Free"
+      units-per-em="512" ascent="448"
+      descent="64"
+      font-weight="400"
+      font-style="Regular" />
+    <missing-glyph horiz-adv-x="0" />
+    <glyph glyph-name="address-book"
+      unicode="&#xF2B9;"
+      horiz-adv-x="448" d=" M436 288C442.6 288 448 293.4 448 300V340C448 346.6 442.6 352 436 352H416V400C416 426.5 394.5 448 368 448H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H368C394.5 -64 416 -42.5 416 -16V32H436C442.6 32 448 37.4 448 44V84C448 90.6 442.6 96 436 96H416V160H436C442.6 160 448 165.4 448 172V212C448 218.6 442.6 224 436 224H416V288H436zM368 -16H48V400H368V-16zM208 192C243.3 192 272 220.7 272 256S243.3 320 208 320S144 291.3 144 256S172.7 192 208 192zM118.4 64H297.6C310 64 320 72.6 320 83.2V102.4C320 134.2 289.9 160 252.8 160C242 160 234.1 152 208 152C181.1 152 174.6 160 163.2 160C126.1 160 96 134.2 96 102.4V83.2C96 72.6 106 64 118.4 64z" />
+    <glyph glyph-name="address-card"
+      unicode="&#xF2BB;"
+      horiz-adv-x="576" d=" M528 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H528C554.5 -32 576 -10.5 576 16V368C576 394.5 554.5 416 528 416zM528 16H48V368H528V16zM208 192C243.3 192 272 220.7 272 256S243.3 320 208 320S144 291.3 144 256S172.7 192 208 192zM118.4 64H297.6C310 64 320 72.6 320 83.2V102.4C320 134.2 289.9 160 252.8 160C242 160 234.1 152 208 152C181.1 152 174.6 160 163.2 160C126.1 160 96 134.2 96 102.4V83.2C96 72.6 106 64 118.4 64zM360 128H472C476.4 128 480 131.6 480 136V152C480 156.4 476.4 160 472 160H360C355.6 160 352 156.4 352 152V136C352 131.6 355.6 128 360 128zM360 192H472C476.4 192 480 195.6 480 200V216C480 220.4 476.4 224 472 224H360C355.6 224 352 220.4 352 216V200C352 195.6 355.6 192 360 192zM360 256H472C476.4 256 480 259.6 480 264V280C480 284.4 476.4 288 472 288H360C355.6 288 352 284.4 352 280V264C352 259.6 355.6 256 360 256z" />
+    <glyph glyph-name="arrow-alt-circle-down"
+      unicode="&#xF358;"
+      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM256 -8C145.5 -8 56 81.5 56 192S145.5 392 256 392S456 302.5 456 192S366.5 -8 256 -8zM224 308V192H157C146.3 192 141 179.1 148.5 171.5L247.5 72.5C252.2 67.8 259.8 67.8 264.5 72.5L363.5 171.5C371.1 179.1 365.7 192 355 192H288V308C288 314.6 282.6 320 276 320H236C229.4 320 224 314.6 224 308z" />
+    <glyph glyph-name="arrow-alt-circle-left"
+      unicode="&#xF359;"
+      horiz-adv-x="512" d=" M8 192C8 55 119 -56 256 -56S504 55 504 192S393 440 256 440S8 329 8 192zM456 192C456 81.5 366.5 -8 256 -8S56 81.5 56 192S145.5 392 256 392S456 302.5 456 192zM384 212V172C384 165.4 378.6 160 372 160H256V93C256 82.3 243.1 77 235.5 84.5L136.5 183.5C131.8 188.2 131.8 195.8 136.5 200.5L235.5 299.5C243.1 307.1 256 301.7 256 291V224H372C378.6 224 384 218.6 384 212z" />
+    <glyph glyph-name="arrow-alt-circle-right"
+      unicode="&#xF35A;"
+      horiz-adv-x="512" d=" M504 192C504 329 393 440 256 440S8 329 8 192S119 -56 256 -56S504 55 504 192zM56 192C56 302.5 145.5 392 256 392S456 302.5 456 192S366.5 -8 256 -8S56 81.5 56 192zM128 172V212C128 218.6 133.4 224 140 224H256V291C256 301.7 268.9 307 276.5 299.5L375.5 200.5C380.2 195.8 380.2 188.2 375.5 183.5L276.5 84.5C268.9 76.9 256 82.3 256 93V160H140C133.4 160 128 165.4 128 172z" />
+    <glyph glyph-name="arrow-alt-circle-up"
+      unicode="&#xF35B;"
+      horiz-adv-x="512" d=" M256 -56C393 -56 504 55 504 192S393 440 256 440S8 329 8 192S119 -56 256 -56zM256 392C366.5 392 456 302.5 456 192S366.5 -8 256 -8S56 81.5 56 192S145.5 392 256 392zM276 64H236C229.4 64 224 69.4 224 76V192H157C146.3 192 141 204.9 148.5 212.5L247.5 311.5C252.2 316.2 259.8 316.2 264.5 311.5L363.5 212.5C371.1 204.9 365.7 192 355 192H288V76C288 69.4 282.6 64 276 64z" />
+    <glyph glyph-name="bell-slash"
+      unicode="&#xF1F6;"
+      horiz-adv-x="576" d=" M130.9 48C114.138 48 105.765 68.39 117.566 80.191C142.792 105.417 163.66 129.5290000000001 168.215 201.6710000000001L121.438 242.9450000000001A168.48 168.48 0 0 1 121.142 233.1430000000001C121.142 151.21 103.591 133.8510000000001 86.599 117.0650000000001C38.504 69.559 73.726 0 130.919 0H224C224 -35.346 252.654 -64 288 -64S352 -35.346 352 0H396.777L342.377 48H130.9zM288 -24C274.766 -24 264 -13.234 264 0H312C312 -13.234 301.234 -24 288 -24zM571.867 -24.553L503.936 35.018C517.04 59.136 515.4599999999999 91.336 489.404 117.0600000000001C472.415 133.8450000000001 454.858 151.2030000000001 454.858 233.1430000000001C454.858 316.1690000000001 393.9 385.2170000000001 314.391 397.9050000000001A31.848 31.848 0 0 1 320 416C320 433.673 305.673 448 288 448S256 433.673 256 416A31.848 31.848 0 0 1 261.609 397.905C220.138 391.287 183.718 369.334 158.36 338.064L36.459 444.963C31.401 449.399 23.682 448.919 19.219 443.892L3.056 425.687C-1.407 420.6600000000001 -0.925 412.988 4.134 408.553L539.542 -60.963C544.6 -65.399 552.3190000000001 -64.919 556.782 -59.892L572.945 -41.687C577.407 -36.66 576.9250000000001 -28.988 571.8670000000001 -24.553zM288 352C353.538 352 406.857 298.681 406.857 233.143C406.857 135.493 430.078 108.569 458.425 80.191C461.333 77.283 462.9979999999999 73.8630000000001 463.634 70.359L194.482 306.3880000000001C216.258 334.133 250.075 352 288 352z" />
+    <glyph glyph-name="bell"
+      unicode="&#xF0F3;"
+      horiz-adv-x="448" d=" M425.403 117.061C408.4140000000001 133.846 390.8570000000001 151.204 390.8570000000001 233.144C390.8570000000001 316.17 329.899 385.218 250.39 397.906A31.842999999999996 31.842999999999996 0 0 1 256 416C256 433.673 241.673 448 224 448S192 433.673 192 416A31.848 31.848 0 0 1 197.609 397.905C118.101 385.217 57.143 316.169 57.143 233.143C57.143 151.21 39.592 133.851 22.6 117.065C-25.496 69.559 9.726 0 66.919 0H160C160 -35.346 188.654 -64 224 -64C259.346 -64 288 -35.346 288 0H381.08C438.27 0 473.495 69.583 425.403 117.061zM224 -24C210.766 -24 200 -13.234 200 0H248C248 -13.234 237.234 -24 224 -24zM381.092 48H66.9C50.138 48 41.765 68.39 53.566 80.191C82.151 108.776 105.143 135.915 105.143 233.1430000000001C105.143 298.6810000000001 158.462 352 224 352S342.857 298.681 342.857 233.143C342.857 135.493 366.078 108.569 394.425 80.191C406.278 68.339 397.783 48 381.092 48z" />
+    <glyph glyph-name="bookmark"
+      unicode="&#xF02E;"
+      horiz-adv-x="384" d=" M336 448H48C21.49 448 0 426.51 0 400V-64L192 48L384 -64V400C384 426.51 362.51 448 336 448zM336 19.57L192 103.57L48 19.57V394A6 6 0 0 0 54 400H330C333.314 400 336 397.317 336 394.004V19.57z" />
+    <glyph glyph-name="building"
+      unicode="&#xF1AD;"
+      horiz-adv-x="448" d=" M128 300V340C128 346.6 133.4 352 140 352H180C186.6 352 192 346.6 192 340V300C192 293.4 186.6 288 180 288H140C133.4 288 128 293.4 128 300zM268 288H308C314.6 288 320 293.4 320 300V340C320 346.6 314.6 352 308 352H268C261.4 352 256 346.6 256 340V300C256 293.4 261.4 288 268 288zM140 192H180C186.6 192 192 197.4 192 204V244C192 250.6 186.6 256 180 256H140C133.4 256 128 250.6 128 244V204C128 197.4 133.4 192 140 192zM268 192H308C314.6 192 320 197.4 320 204V244C320 250.6 314.6 256 308 256H268C261.4 256 256 250.6 256 244V204C256 197.4 261.4 192 268 192zM192 108V148C192 154.6 186.6 160 180 160H140C133.4 160 128 154.6 128 148V108C128 101.4 133.4 96 140 96H180C186.6 96 192 101.4 192 108zM268 96H308C314.6 96 320 101.4 320 108V148C320 154.6 314.6 160 308 160H268C261.4 160 256 154.6 256 148V108C256 101.4 261.4 96 268 96zM448 -28V-64H0V-28C0 -21.4 5.4 -16 12 -16H31.5V424C31.5 437.3 42.2 448 55.5 448H392.5C405.8 448 416.5 437.3 416.5 424V-16H436C442.6 -16 448 -21.4 448 -28zM79.5 -15H192V52C192 58.6 197.4 64 204 64H244C250.6 64 256 58.6 256 52V-15H368.5V399L80 400L79.5 -15z" />
+    <glyph glyph-name="calendar-alt"
+      unicode="&#xF073;"
+      horiz-adv-x="448" d=" M148 160H108C101.4 160 96 165.4 96 172V212C96 218.6 101.4 224 108 224H148C154.6 224 160 218.6 160 212V172C160 165.4 154.6 160 148 160zM256 172V212C256 218.6 250.6 224 244 224H204C197.4 224 192 218.6 192 212V172C192 165.4 197.4 160 204 160H244C250.6 160 256 165.4 256 172zM352 172V212C352 218.6 346.6 224 340 224H300C293.4 224 288 218.6 288 212V172C288 165.4 293.4 160 300 160H340C346.6 160 352 165.4 352 172zM256 76V116C256 122.6 250.6 128 244 128H204C197.4 128 192 122.6 192 116V76C192 69.4 197.4 64 204 64H244C250.6 64 256 69.4 256 76zM160 76V116C160 122.6 154.6 128 148 128H108C101.4 128 96 122.6 96 116V76C96 69.4 101.4 64 108 64H148C154.6 64 160 69.4 160 76zM352 76V116C352 122.6 346.6 128 340 128H300C293.4 128 288 122.6 288 116V76C288 69.4 293.4 64 300 64H340C346.6 64 352 69.4 352 76zM448 336V-16C448 -42.5 426.5 -64 400 -64H48C21.5 -64 0 -42.5 0 -16V336C0 362.5 21.5 384 48 384H96V436C96 442.6 101.4 448 108 448H148C154.6 448 160 442.6 160 436V384H288V436C288 442.6 293.4 448 300 448H340C346.6 448 352 442.6 352 436V384H400C426.5 384 448 362.5 448 336zM400 -10V288H48V-10C48 -13.3 50.7 -16 54 -16H394C397.3 -16 400 -13.3 400 -10z" />
+    <glyph glyph-name="calendar-check"
+      unicode="&#xF274;"
+      horiz-adv-x="448" d=" M400 384H352V436C352 442.627 346.627 448 340 448H300C293.373 448 288 442.627 288 436V384H160V436C160 442.627 154.627 448 148 448H108C101.373 448 96 442.627 96 436V384H48C21.49 384 0 362.51 0 336V-16C0 -42.51 21.49 -64 48 -64H400C426.51 -64 448 -42.51 448 -16V336C448 362.51 426.51 384 400 384zM394 -16H54A6 6 0 0 0 48 -10V288H400V-10A6 6 0 0 0 394 -16zM341.151 184.65L198.842 43.481C194.137 38.814 186.539 38.844 181.871 43.549L106.78 119.248C102.113 123.953 102.143 131.551 106.848 136.219L129.567 158.755C134.272 163.422 141.87 163.392 146.537 158.686L190.641 114.225L301.713 224.406C306.418 229.073 314.016 229.043 318.6840000000001 224.3379999999999L341.2200000000001 201.62C345.887 196.9149999999999 345.8560000000001 189.317 341.151 184.65z" />
+    <glyph glyph-name="calendar-minus"
+      unicode="&#xF272;"
+      horiz-adv-x="448" d=" M124 120C117.4 120 112 125.4 112 132V156C112 162.6 117.4 168 124 168H324C330.6 168 336 162.6 336 156V132C336 125.4 330.6 120 324 120H124zM448 336V-16C448 -42.5 426.5 -64 400 -64H48C21.5 -64 0 -42.5 0 -16V336C0 362.5 21.5 384 48 384H96V436C96 442.6 101.4 448 108 448H148C154.6 448 160 442.6 160 436V384H288V436C288 442.6 293.4 448 300 448H340C346.6 448 352 442.6 352 436V384H400C426.5 384 448 362.5 448 336zM400 -10V288H48V-10C48 -13.3 50.7 -16 54 -16H394C397.3 -16 400 -13.3 400 -10z" />
+    <glyph glyph-name="calendar-plus"
+      unicode="&#xF271;"
+      horiz-adv-x="448" d=" M336 156V132C336 125.4 330.6 120 324 120H248V44C248 37.4 242.6 32 236 32H212C205.4 32 200 37.4 200 44V120H124C117.4 120 112 125.4 112 132V156C112 162.6 117.4 168 124 168H200V244C200 250.6 205.4 256 212 256H236C242.6 256 248 250.6 248 244V168H324C330.6 168 336 162.6 336 156zM448 336V-16C448 -42.5 426.5 -64 400 -64H48C21.5 -64 0 -42.5 0 -16V336C0 362.5 21.5 384 48 384H96V436C96 442.6 101.4 448 108 448H148C154.6 448 160 442.6 160 436V384H288V436C288 442.6 293.4 448 300 448H340C346.6 448 352 442.6 352 436V384H400C426.5 384 448 362.5 448 336zM400 -10V288H48V-10C48 -13.3 50.7 -16 54 -16H394C397.3 -16 400 -13.3 400 -10z" />
+    <glyph glyph-name="calendar-times"
+      unicode="&#xF273;"
+      horiz-adv-x="448" d=" M311.7 73.3L294.7 56.3C290 51.6 282.4 51.6 277.7 56.3L224 110.1L170.3 56.4C165.6 51.7 158 51.7 153.3 56.4L136.3 73.4C131.6 78.1 131.6 85.7000000000001 136.3 90.4L190 144.1L136.3 197.8C131.6 202.5 131.6 210.1 136.3 214.8L153.3 231.8C158 236.5 165.6 236.5 170.3 231.8L224 178.1L277.7 231.8C282.4 236.5 290 236.5 294.7 231.8L311.7 214.8C316.4 210.1 316.4 202.5 311.7 197.8L257.9 144L311.6 90.3C316.4 85.6 316.4 78 311.7 73.3zM448 336V-16C448 -42.5 426.5 -64 400 -64H48C21.5 -64 0 -42.5 0 -16V336C0 362.5 21.5 384 48 384H96V436C96 442.6 101.4 448 108 448H148C154.6 448 160 442.6 160 436V384H288V436C288 442.6 293.4 448 300 448H340C346.6 448 352 442.6 352 436V384H400C426.5 384 448 362.5 448 336zM400 -10V288H48V-10C48 -13.3 50.7 -16 54 -16H394C397.3 -16 400 -13.3 400 -10z" />
+    <glyph glyph-name="calendar"
+      unicode="&#xF133;"
+      horiz-adv-x="448" d=" M400 384H352V436C352 442.6 346.6 448 340 448H300C293.4 448 288 442.6 288 436V384H160V436C160 442.6 154.6 448 148 448H108C101.4 448 96 442.6 96 436V384H48C21.5 384 0 362.5 0 336V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V336C448 362.5 426.5 384 400 384zM394 -16H54C50.7 -16 48 -13.3 48 -10V288H400V-10C400 -13.3 397.3 -16 394 -16z" />
+    <glyph glyph-name="caret-square-down"
+      unicode="&#xF150;"
+      horiz-adv-x="448" d=" M125.1 240H322.9C333.6 240 339 227 331.4 219.5L232.5 121.2C227.8 116.5 220.3 116.5 215.6 121.2L116.7 219.5C109 227 114.4 240 125.1 240zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM400 22V362C400 365.3 397.3 368 394 368H54C50.7 368 48 365.3 48 362V22C48 18.7 50.7 16 54 16H394C397.3 16 400 18.7 400 22z" />
+    <glyph glyph-name="caret-square-left"
+      unicode="&#xF191;"
+      horiz-adv-x="448" d=" M272 290.9V93.1C272 82.4 259 77 251.5 84.6L153.2 183.5C148.5 188.2 148.5 195.7 153.2 200.4L251.5 299.3C259 307 272 301.6 272 290.9zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM400 22V362C400 365.3 397.3 368 394 368H54C50.7 368 48 365.3 48 362V22C48 18.7 50.7 16 54 16H394C397.3 16 400 18.7 400 22z" />
+    <glyph glyph-name="caret-square-right"
+      unicode="&#xF152;"
+      horiz-adv-x="448" d=" M176 93.1V290.9C176 301.6 189 307 196.5 299.4L294.8 200.5C299.5 195.8 299.5 188.3 294.8 183.6L196.5 84.7000000000001C189 77.0000000000001 176 82.4 176 93.1zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM400 22V362C400 365.3 397.3 368 394 368H54C50.7 368 48 365.3 48 362V22C48 18.7 50.7 16 54 16H394C397.3 16 400 18.7 400 22z" />
+    <glyph glyph-name="caret-square-up"
+      unicode="&#xF151;"
+      horiz-adv-x="448" d=" M322.9 144H125.1C114.4 144 109 157 116.6 164.5L215.5 262.8C220.2 267.5 227.7 267.5 232.4 262.8L331.3 164.5C339 157 333.6 144 322.9000000000001 144zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM400 22V362C400 365.3 397.3 368 394 368H54C50.7 368 48 365.3 48 362V22C48 18.7 50.7 16 54 16H394C397.3 16 400 18.7 400 22z" />
+    <glyph glyph-name="chart-bar"
+      unicode="&#xF080;"
+      horiz-adv-x="512" d=" M500 48C506.6 48 512 42.6 512 36V12C512 5.4 506.6 0 500 0H12C5.4 0 0 5.4 0 12V372C0 378.6 5.4 384 12 384H36C42.6 384 48 378.6 48 372V48H500zM144 108V180C144 186.6 138.6 192 132 192H108C101.4 192 96 186.6 96 180V108C96 101.4 101.4 96 108 96H132C138.6 96 144 101.4 144 108zM240 108V308C240 314.6 234.6 320 228 320H204C197.4 320 192 314.6 192 308V108C192 101.4 197.4 96 204 96H228C234.6 96 240 101.4 240 108zM336 108V244C336 250.6 330.6 256 324 256H300C293.4 256 288 250.6 288 244V108C288 101.4 293.4 96 300 96H324C330.6 96 336 101.4 336 108zM432 108V340C432 346.6 426.6 352 420 352H396C389.4 352 384 346.6 384 340V108C384 101.4 389.4 96 396 96H420C426.6 96 432 101.4 432 108z" />
+    <glyph glyph-name="check-circle"
+      unicode="&#xF058;"
+      horiz-adv-x="512" d=" M256 440C119.033 440 8 328.967 8 192S119.033 -56 256 -56S504 55.033 504 192S392.967 440 256 440zM256 392C366.532 392 456 302.549 456 192C456 81.468 366.549 -8 256 -8C145.468 -8 56 81.451 56 192C56 302.532 145.451 392 256 392M396.204 261.733L373.668 284.451C369.0010000000001 289.156 361.403 289.187 356.698 284.519L215.346 144.303L155.554 204.58C150.887 209.285 143.289 209.316 138.584 204.649L115.865 182.113C111.16 177.446 111.129 169.848 115.797 165.142L206.578 73.6259999999999C211.245 68.9209999999999 218.843 68.8899999999999 223.548 73.5579999999999L396.1370000000001 244.762C400.8410000000001 249.43 400.8710000000001 257.0279999999999 396.2040000000001 261.733z" />
+    <glyph glyph-name="check-square"
+      unicode="&#xF14A;"
+      horiz-adv-x="448" d=" M400 416H48C21.49 416 0 394.51 0 368V16C0 -10.51 21.49 -32 48 -32H400C426.51 -32 448 -10.51 448 16V368C448 394.51 426.51 416 400 416zM400 16H48V368H400V16zM364.136 257.724L191.547 86.52C186.842 81.853 179.244 81.883 174.577 86.588L83.796 178.104C79.129 182.809 79.159 190.407 83.865 195.075L106.584 217.611C111.289 222.278 118.887 222.248 123.554 217.542L183.346 157.265L324.698 297.481C329.403 302.148 337.001 302.118 341.668 297.413L364.204 274.695C368.871 269.9890000000001 368.841 262.391 364.136 257.724z" />
+    <glyph glyph-name="circle"
+      unicode="&#xF111;"
+      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM256 -8C145.5 -8 56 81.5 56 192S145.5 392 256 392S456 302.5 456 192S366.5 -8 256 -8z" />
+    <glyph glyph-name="clipboard"
+      unicode="&#xF328;"
+      horiz-adv-x="384" d=" M336 384H256C256 419.29 227.29 448 192 448S128 419.29 128 384H48C21.49 384 0 362.51 0 336V-16C0 -42.51 21.49 -64 48 -64H336C362.51 -64 384 -42.51 384 -16V336C384 362.51 362.51 384 336 384zM330 -16H54A6 6 0 0 0 48 -10V330A6 6 0 0 0 54 336H96V300C96 293.373 101.373 288 108 288H276C282.627 288 288 293.373 288 300V336H330A6 6 0 0 0 336 330V-10A6 6 0 0 0 330 -16zM192 408C205.255 408 216 397.255 216 384S205.255 360 192 360S168 370.745 168 384S178.745 408 192 408" />
+    <glyph glyph-name="clock"
+      unicode="&#xF017;"
+      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM256 -8C145.5 -8 56 81.5 56 192S145.5 392 256 392S456 302.5 456 192S366.5 -8 256 -8zM317.8 96.4L232.9 158.1C229.8 160.4 228 164 228 167.8V332C228 338.6 233.4 344 240 344H272C278.6 344 284 338.6 284 332V190.3L350.8 141.7C356.2 137.8 357.3 130.3 353.4000000000001 124.9L334.6 99C330.7000000000001 93.7 323.2000000000001 92.5 317.8 96.4z" />
+    <glyph glyph-name="clone"
+      unicode="&#xF24D;"
+      horiz-adv-x="512" d=" M464 448H144C117.49 448 96 426.51 96 400V352H48C21.49 352 0 330.51 0 304V-16C0 -42.51 21.49 -64 48 -64H368C394.51 -64 416 -42.51 416 -16V32H464C490.51 32 512 53.49 512 80V400C512 426.51 490.51 448 464 448zM362 -16H54A6 6 0 0 0 48 -10V298A6 6 0 0 0 54 304H96V80C96 53.49 117.49 32 144 32H368V-10A6 6 0 0 0 362 -16zM458 80H150A6 6 0 0 0 144 86V394A6 6 0 0 0 150 400H458A6 6 0 0 0 464 394V86A6 6 0 0 0 458 80z" />
+    <glyph glyph-name="closed-captioning"
+      unicode="&#xF20A;"
+      horiz-adv-x="512" d=" M464 384H48C21.5 384 0 362.5 0 336V48C0 21.5 21.5 0 48 0H464C490.5 0 512 21.5 512 48V336C512 362.5 490.5 384 464 384zM458 48H54C50.7 48 48 50.7 48 54V330C48 333.3 50.7 336 54 336H458C461.3 336 464 333.3 464 330V54C464 50.7 461.3 48 458 48zM246.9 133.7C248.6 131.3 248.4 128.1 246.4 126C192.8 69.2 73.6 93.9 73.6 193.9C73.6 291.2 195.3 313.4 246.1 264C248.2 262 248.6 260.8 247.1 258.3L229.6 227.8C227.7 224.7 223.4 223.8 220.5 226.1C179.7 258.1 125.9 241.0000000000001 125.9 194.9C125.9 146.9 176.9 124.4 218.1 162.3C220.9 164.8 225.2 164.4 227.3 161.4L246.9 133.7000000000001zM437.3 133.7C439 131.3 438.8 128.1 436.8 126C383.2 69.1 264 93.9 264 193.9C264 291.2 385.7 313.4 436.5 264C438.6 262 439 260.8 437.5 258.3L420 227.8C418.1 224.7 413.8 223.8 410.9 226.1C370.1 258.1 316.3 241.0000000000001 316.3 194.9C316.3 146.9 367.3 124.4 408.5 162.3C411.3 164.8 415.6 164.4 417.7 161.4L437.3 133.7000000000001z" />
+    <glyph glyph-name="comment-alt"
+      unicode="&#xF27A;"
+      horiz-adv-x="512" d=" M448 448H64C28.7 448 0 419.3 0 384V96C0 60.7 28.7 32 64 32H160V-52C160 -59.1 165.8 -64 172 -64C174.4 -64 176.9 -63.3 179.1 -61.6L304 32H448C483.3 32 512 60.7 512 96V384C512 419.3 483.3 448 448 448zM464 96C464 87.2 456.8 80 448 80H288L275.2 70.4L208 20V80H64C55.2 80 48 87.2 48 96V384C48 392.8 55.2 400 64 400H448C456.8 400 464 392.8 464 384V96z" />
+    <glyph glyph-name="comment-dots"
+      unicode="&#xF4AD;"
+      horiz-adv-x="512" d=" M144 240C126.3 240 112 225.7 112 208S126.3 176 144 176S176 190.3 176 208S161.7 240 144 240zM256 240C238.3 240 224 225.7 224 208S238.3 176 256 176S288 190.3 288 208S273.7 240 256 240zM368 240C350.3 240 336 225.7 336 208S350.3 176 368 176S400 190.3 400 208S385.7 240 368 240zM256 416C114.6 416 0 322.9 0 208C0 160.4 19.9 116.8 52.9 81.7C38 42.3 7 8.9 6.5 8.5C-0.1 1.5 -1.9 -8.7 1.9 -17.5S14.4 -32 24 -32C85.5 -32 134 -6.3 163.1 14.3C192 5.2 223.2 0 256 0C397.4 0 512 93.1 512 208S397.4 416 256 416zM256 48C229.3 48 202.9 52.1 177.6 60.1L154.9 67.3L135.4 53.5C121.1 43.4 101.5 32.1 77.9 24.5C85.2 36.6 92.3 50.2 97.8 64.7L108.4 92.8L87.8 114.6C69.7 133.9 48 165.8 48 208C48 296.2 141.3 368 256 368S464 296.2 464 208S370.7 48 256 48z" />
+    <glyph glyph-name="comment"
+      unicode="&#xF075;"
+      horiz-adv-x="512" d=" M256 416C114.6 416 0 322.9 0 208C0 160.4 19.9 116.8 52.9 81.7C38 42.3 7 8.9 6.5 8.5C-0.1 1.5 -1.9 -8.7 1.9 -17.5S14.4 -32 24 -32C85.5 -32 134 -6.3 163.1 14.3C192 5.2 223.2 0 256 0C397.4 0 512 93.1 512 208S397.4 416 256 416zM256 48C229.3 48 202.9 52.1 177.6 60.1L154.9 67.3L135.4 53.5C121.1 43.4 101.5 32.1 77.9 24.5C85.2 36.6 92.3 50.2 97.8 64.7L108.4 92.8L87.8 114.6C69.7 133.9 48 165.8 48 208C48 296.2 141.3 368 256 368S464 296.2 464 208S370.7 48 256 48z" />
+    <glyph glyph-name="comments"
+      unicode="&#xF086;"
+      horiz-adv-x="576" d=" M532 61.8C559.5 88.9 576 122.9 576 160C576 240 499.5 306.1 399.8 317.9C368.3 375.5 294.3 416 208 416C93.1 416 0 344.4 0 256C0 219 16.5 185 44 157.8C28.7 127.1 6.7 103.3 6.3 102.9C0 96.2000000000001 -1.8 86.4 1.9 77.9C5.5 69.4 13.9 63.9 23.1 63.9C76.6 63.9 119.8 84.1 148.3 102.7000000000001C157.5 100.6 167 99.0000000000001 176.7 97.8000000000001C208.1 40.4 281.8 0 368 0C388.8 0 408.8 2.4 427.8 6.8C456.3 -11.7 499.4 -32 553 -32C562.2 -32 570.5 -26.5 574.2 -18C577.8000000000001 -9.5 576.1 0.3 569.8000000000001 7C569.4000000000001 7.3 547.3000000000001 31.1 532.0000000000001 61.8zM139.2 154.1L122.1 143C108 133.9 93.6 126.7 79 121.6C81.7 126.3 84.4 131.3 87 136.4L102.5 167.5000000000001L77.7 192C64.2 205.4 48 227.3 48 256C48 316.7 121.3 368 208 368S368 316.7 368 256S294.7 144 208 144C191.5 144 175 145.9 159 149.6L139.2 154.1zM498.3 96L473.6 71.6L489.1 40.5C491.7 35.4 494.4 30.4 497.1 25.7C482.5 30.8 468.1 38 454 47.1L436.9 58.2L417 53.6C401 49.9 384.5 47.9999999999999 368 47.9999999999999C314 47.9999999999999 265.8 68.1 236.7 97.6999999999999C338 108.5 416 175.1 416 256C416 259.4 415.6 262.7 415.3 266C479.7 251.5 528 209.2 528 160C528 131.3 511.8 109.4 498.3 96z" />
+    <glyph glyph-name="compass"
+      unicode="&#xF14E;"
+      horiz-adv-x="512" d=" M256 440C119.033 440 8 328.967 8 192S119.033 -56 256 -56S504 55.033 504 192S392.967 440 256 440zM256 -8C145.468 -8 56 81.451 56 192C56 302.531 145.451 392 256 392C366.532 392 456 302.549 456 192C456 81.468 366.549 -8 256 -8zM347.326 304.131L313.9670000000001 166.352A24.005 24.005 0 0 0 307.1950000000001 154.623L204.5550000000001 56.844C187.4510000000001 40.551 158.9950000000001 56.41 164.6750000000001 79.868L198.0340000000001 217.647A23.997 23.997 0 0 0 204.8060000000001 229.376L307.4480000000001 327.155C324.7330000000001 343.625 352.9420000000001 327.33 347.3260000000001 304.131zM256 224C238.327 224 224 209.673 224 192S238.327 160 256 160S288 174.327 288 192S273.673 224 256 224z" />
+    <glyph glyph-name="copy"
+      unicode="&#xF0C5;"
+      horiz-adv-x="448" d=" M433.941 382.059L382.059 433.941A48 48 0 0 1 348.118 448H176C149.49 448 128 426.51 128 400V352H48C21.49 352 0 330.51 0 304V-16C0 -42.51 21.49 -64 48 -64H272C298.51 -64 320 -42.51 320 -16V32H400C426.51 32 448 53.49 448 80V348.118A48 48 0 0 1 433.941 382.059zM266 -16H54A6 6 0 0 0 48 -10V298A6 6 0 0 0 54 304H128V80C128 53.49 149.49 32 176 32H272V-10A6 6 0 0 0 266 -16zM394 80H182A6 6 0 0 0 176 86V394A6 6 0 0 0 182 400H288V312C288 298.745 298.745 288 312 288H400V86A6 6 0 0 0 394 80zM400 336H336V400H345.632C347.223 400 348.749 399.368 349.875 398.243L398.243 349.875A6 6 0 0 0 400 345.632V336z" />
+    <glyph glyph-name="copyright"
+      unicode="&#xF1F9;"
+      horiz-adv-x="512" d=" M256 440C119.033 440 8 328.967 8 192S119.033 -56 256 -56S504 55.033 504 192S392.967 440 256 440zM256 -8C145.468 -8 56 81.451 56 192C56 302.531 145.451 392 256 392C366.532 392 456 302.549 456 192C456 81.468 366.549 -8 256 -8zM363.351 93.064C353.737 83.352 317.8210000000001 51.668 259.286 51.668C176.856 51.668 118.802 113.093 118.802 193.235C118.802 272.387 179.077 332.636 258.564 332.636C314.095 332.636 347.302 306.016 356.157 297.857A11.965 11.965 0 0 0 358.093 282.535L339.938 254.422C336.097 248.472 327.972 247.14 322.439 251.501C313.844 258.277 290.625 274.039 260.731 274.039C212.428 274.039 182.815 238.709 182.815 193.957C182.815 152.368 209.703 110.265 261.092 110.265C293.749 110.265 317.935 129.304 326.818 137.49C332.088 142.347 340.414 141.529 344.638 135.752L364.503 108.582A11.947000000000001 11.947000000000001 0 0 0 363.351 93.064z" />
+    <glyph glyph-name="credit-card"
+      unicode="&#xF09D;"
+      horiz-adv-x="576" d=" M527.9 416H48.1C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48.1 -32H527.9C554.5 -32 576 -10.5 576 16V368C576 394.5 554.5 416 527.9 416zM54.1 368H521.9C525.1999999999999 368 527.9 365.3 527.9 362V320H48.1V362C48.1 365.3 50.8 368 54.1 368zM521.9 16H54.1C50.8 16 48.1 18.7 48.1 22V192H527.9V22C527.9 18.7 525.1999999999999 16 521.9 16zM192 116V76C192 69.4 186.6 64 180 64H108C101.4 64 96 69.4 96 76V116C96 122.6 101.4 128 108 128H180C186.6 128 192 122.6 192 116zM384 116V76C384 69.4 378.6 64 372 64H236C229.4 64 224 69.4 224 76V116C224 122.6 229.4 128 236 128H372C378.6 128 384 122.6 384 116z" />
+    <glyph glyph-name="dot-circle"
+      unicode="&#xF192;"
+      horiz-adv-x="512" d=" M256 392C366.532 392 456 302.549 456 192C456 81.468 366.549 -8 256 -8C145.468 -8 56 81.451 56 192C56 302.532 145.451 392 256 392M256 440C119.033 440 8 328.967 8 192S119.033 -56 256 -56S504 55.033 504 192S392.967 440 256 440zM256 272C211.817 272 176 236.183 176 192S211.817 112 256 112S336 147.817 336 192S300.183 272 256 272z" />
+    <glyph glyph-name="edit"
+      unicode="&#xF044;"
+      horiz-adv-x="576" d=" M402.3 103.1L434.3 135.1C439.3 140.1 448 136.6 448 129.4V-16C448 -42.5 426.5 -64 400 -64H48C21.5 -64 0 -42.5 0 -16V336C0 362.5 21.5 384 48 384H321.5C328.6 384 332.2 375.4 327.2 370.3L295.2 338.3C293.7 336.8 291.7 336 289.5 336H48V-16H400V97.5C400 99.6 400.8 101.6 402.3 103.1zM558.9 304.9000000000001L296.3 42.3L205.9 32.3C179.7 29.4 157.4 51.5 160.3 77.9L170.3 168.3000000000001L432.9 430.9C455.8 453.8 492.8 453.8 515.6 430.9L558.8000000000001 387.7C581.7 364.8 581.7 327.7 558.9000000000001 304.9zM460.1 274L402 332.1L216.2 146.2L208.9 80.9L274.2 88.2L460.1 274zM524.9 353.7L481.7 396.9C477.6 401 470.9 401 466.9 396.9L436 366L494.1 307.9L525 338.8C529 343 529 349.6 524.9 353.7000000000001z" />
+    <glyph glyph-name="envelope-open"
+      unicode="&#xF2B6;"
+      horiz-adv-x="512" d=" M494.586 283.4840000000001C489.889 287.367 382.863 373.4340000000001 359.3350000000001 392.141C337.231 409.809 299.437 448 256 448C212.795 448 175.364 410.283 152.665 392.141C128.202 372.6910000000001 21.595 286.9460000000001 17.515 283.592A48.004000000000005 48.004000000000005 0 0 1 0 246.515V-16C0 -42.51 21.49 -64 48 -64H464C490.51 -64 512 -42.51 512 -16V246.491A48 48 0 0 1 494.586 283.4840000000001zM464 -10A6 6 0 0 0 458 -16H54A6 6 0 0 0 48 -10V243.653C48 245.466 48.816 247.179 50.226 248.318C66.096 261.132 159.019 335.872 182.59 354.611C200.755 369.12 232.398 400 256 400C279.693 400 311.857 368.631 329.41 354.611C352.983 335.87 445.913 261.118 461.776 248.295A5.99 5.99 0 0 0 463.9999999999999 243.632V-10zM432.009 177.704C436.2580000000001 172.545 435.474 164.909 430.264 160.723C401.289 137.44 370.99 113.126 359.3350000000001 103.86C336.636 85.717 299.205 48 256 48C212.548 48 174.713 86.237 152.665 103.86C141.386 112.827 110.921 137.273 81.738 160.725C76.528 164.912 75.745 172.547 79.993 177.706L95.251 196.234C99.429 201.307 106.908 202.077 112.03 197.96C140.648 174.959 170.596 150.925 182.59 141.389C200.143 127.369 232.307 96 256 96C279.602 96 311.246 126.88 329.41 141.389C341.404 150.924 371.354 174.959 399.973 197.957C405.095 202.073 412.574 201.303 416.751 196.23L432.009 177.704z" />
+    <glyph glyph-name="envelope"
+      unicode="&#xF0E0;"
+      horiz-adv-x="512" d=" M464 384H48C21.49 384 0 362.51 0 336V48C0 21.49 21.49 0 48 0H464C490.51 0 512 21.49 512 48V336C512 362.51 490.51 384 464 384zM464 336V295.195C441.578 276.936 405.832 248.544 329.413 188.705C312.572 175.458 279.212 143.633 256 144.004C232.792 143.629 199.421 175.463 182.587 188.705C106.18 248.535 70.425 276.933 48 295.195V336H464zM48 48V233.602C70.914 215.351 103.409 189.74 152.938 150.956C174.795 133.751 213.072 95.77 256 96.001C298.717 95.77 336.509 133.2000000000001 359.053 150.948C408.581 189.7310000000001 441.085 215.3490000000001 464 233.6010000000001V48H48z" />
+    <glyph glyph-name="eye-slash"
+      unicode="&#xF070;"
+      horiz-adv-x="576" d=" M272.702 88.861C192.219 97.872 136.49 175.747 155.772 255.903L272.702 88.861zM288 56C185.444 56 95.908 110.701 48 192C69.755 228.917 100.1 260.342 136.344 283.658L108.803 323.0010000000001C67.001 295.766 31.921 259.259 6.646 216.369A47.999 47.999 0 0 1 6.646 167.63C63.004 71.994 168.14 8 288 8A332.89 332.89 0 0 1 327.648 10.367L295.627 56.111A284.16 284.16 0 0 0 288 56zM569.354 167.631C536.1220000000001 111.237 485.933 65.889 425.8000000000001 38.139L473.9160000000001 -30.601C477.717 -36.03 476.3960000000001 -43.513 470.967 -47.313L450.23 -61.83C444.8010000000001 -65.631 437.3180000000001 -64.3099999999999 433.5180000000001 -58.881L102.084 414.601C98.283 420.03 99.604 427.513 105.033 431.313L125.77 445.83C131.199 449.631 138.682 448.31 142.482 442.881L198.008 363.556C226.612 371.657 256.808 376 288 376C407.86 376 512.996 312.006 569.354 216.369A48.00200000000001 48.00200000000001 0 0 0 569.354 167.631zM528 192C483.843 266.933 404.323 319.27 311.838 327.007C302.042 316.9220000000001 296 303.17 296 288C296 257.072 321.072 232 352 232S408 257.072 408 288L407.999 288.0420000000001C438.6310000000001 230.765 424.738 157.7820000000001 371.0710000000001 116.323L397.766 78.188C452.626 101.449 498.308 141.614 528 192z" />
+    <glyph glyph-name="eye"
+      unicode="&#xF06E;"
+      horiz-adv-x="576" d=" M569.354 216.369C512.97 312.051 407.81 376 288 376C168.14 376 63.004 312.006 6.646 216.369A47.999 47.999 0 0 1 6.646 167.63C63.031 71.949 168.19 8 288 8C407.86 8 512.996 71.994 569.354 167.631A47.997 47.997 0 0 1 569.354 216.369zM288 56C185.444 56 95.909 110.701 48 192C92.157 266.933 171.677 319.27 264.1620000000001 327.007C273.9580000000001 316.9220000000001 280 303.17 280 288C280 257.072 254.928 232 224 232S168 257.072 168 288L168.001 288.0420000000001C157.794 268.957 152 247.156 152 224C152 148.889 212.889 88 288 88S424 148.889 424 224C424 255.031 413.6 283.629 396.105 306.515C451.704 283.362 498.009 242.894 528 192C480.092 110.701 390.5560000000001 56 288 56z" />
+    <glyph glyph-name="file-alt"
+      unicode="&#xF15C;"
+      horiz-adv-x="384" d=" M288 200V172C288 165.4 282.6 160 276 160H108C101.4 160 96 165.4 96 172V200C96 206.6 101.4 212 108 212H276C282.6 212 288 206.6 288 200zM276 128H108C101.4 128 96 122.6 96 116V88C96 81.4 101.4 76 108 76H276C282.6 76 288 81.4 288 88V116C288 122.6 282.6 128 276 128zM384 316.1V-16C384 -42.5 362.5 -64 336 -64H48C21.5 -64 0 -42.5 0 -16V400C0 426.5 21.5 448 48 448H252.1C264.8 448 277 442.9 286 433.9L369.9 350C378.9 341.1 384 328.8 384 316.1zM256 396.1V320H332.1L256 396.1zM336 -16V272H232C218.7 272 208 282.7 208 296V400H48V-16H336z" />
+    <glyph glyph-name="file-archive"
+      unicode="&#xF1C6;"
+      horiz-adv-x="384" d=" M369.941 350.059L286.059 433.9410000000001A48 48 0 0 1 252.118 448H48C21.49 448 0 426.51 0 400V-16C0 -42.51 21.49 -64 48 -64H336C362.51 -64 384 -42.51 384 -16V316.118A48 48 0 0 1 369.941 350.059zM256 396.118L332.118 320H256V396.118zM336 -16H48V400H127.714V384H159.714V400H208V296C208 282.745 218.745 272 232 272H336V-16zM192.27 352H160.27V384H192.27V352zM160.27 352V320H128.27V352H160.27zM160.27 288V256H128.27V288H160.27zM192.27 288H160.27V320H192.27V288zM194.179 182.322A12 12 0 0 1 182.406 192H160.27V224H128.27V192L108.58 94.894C101.989 62.389 126.834 32 160 32C193.052 32 217.871 62.192 211.476 94.62L194.179 182.322zM160.27 57.927C142.352 57.927 127.826 70.032 127.826 84.963C127.826 99.895 142.351 111.999 160.27 111.999S192.714 99.894 192.714 84.963C192.714 70.032 178.188 57.927 160.27 57.927zM192.27 224H160.27V256H192.27V224z" />
+    <glyph glyph-name="file-audio"
+      unicode="&#xF1C7;"
+      horiz-adv-x="384" d=" M369.941 350.059L286.059 433.9410000000001A48 48 0 0 1 252.118 448H48C21.49 448 0 426.51 0 400V-16C0 -42.51 21.49 -64 48 -64H336C362.51 -64 384 -42.51 384 -16V316.118A48 48 0 0 1 369.941 350.059zM332.118 320H256V396.118L332.118 320zM48 -16V400H208V296C208 282.745 218.745 272 232 272H336V-16H48zM192 60.024C192 49.333 179.074 43.979 171.515 51.539L136 87.514H108C101.373 87.514 96 92.887 96 99.514V155.514C96 162.141 101.373 167.514 108 167.514H136L171.515 204.461C179.075 212.021 192 206.667 192 195.976V60.024zM233.201 107.154C242.252 116.451 242.261 131.287 233.202 140.593C211.053 163.345 245.437 196.839 267.597 174.074C294.795 146.134 294.809 101.63 267.598 73.673C245.805 51.287 210.651 83.988 233.201 107.154z" />
+    <glyph glyph-name="file-code"
+      unicode="&#xF1C9;"
+      horiz-adv-x="384" d=" M369.941 350.059L286.059 433.9410000000001A48 48 0 0 1 252.118 448H48C21.49 448 0 426.51 0 400V-16C0 -42.51 21.49 -64 48 -64H336C362.51 -64 384 -42.51 384 -16V316.118A48 48 0 0 1 369.941 350.059zM332.118 320H256V396.118L332.118 320zM48 -16V400H208V296C208 282.745 218.745 272 232 272H336V-16H48zM149.677 99.115L116.854 128L149.676 156.885A8.793 8.793 0 0 1 150.281 169.509L132.878 188.073C129.494 191.686 123.914 191.735 120.44 188.4740000000001L62.78 134.42C59.077 130.946 59.076 125.053 62.781 121.5800000000001L120.44 67.525A8.738 8.738 0 0 1 126.452 65.1440000000001A8.746 8.746 0 0 1 132.879 67.9260000000001L150.282 86.489A8.795 8.795 0 0 1 149.677 99.115zM233.961 226.965L209.56 234.049A8.796 8.796 0 0 1 198.655 228.051L144.04 39.939C142.687 35.279 145.378 30.387 150.038 29.0340000000001L174.441 21.95C179.121 20.595 183.998 23.304 185.346 27.948L239.958 216.06C241.312 220.72 238.621 225.612 233.961 226.9650000000001zM321.219 134.42L263.561 188.475C260.035 191.7820000000001 254.462 191.6400000000001 251.122 188.074L233.719 169.511A8.795 8.795 0 0 1 234.324 156.886L267.146 128L234.324 99.115A8.793 8.793 0 0 1 233.719 86.491L251.122 67.927A8.797 8.797 0 0 1 263.5610000000001 67.526H263.5600000000001L321.2200000000001 121.581C324.923 125.054 324.923 130.947 321.2190000000001 134.42z" />
+    <glyph glyph-name="file-excel"
+      unicode="&#xF1C3;"
+      horiz-adv-x="384" d=" M369.9 350.1L286 434C277 443 264.8 448.1 252.1 448.1H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V316.1C384 328.8 378.9 341.1 369.9 350.1zM332.1 320H256V396.1L332.1 320zM48 -16V400H208V296C208 282.7 218.7 272 232 272H336V-16H48zM260 224H231.2C226.8 224 222.8 221.6 220.7 217.7C202.7 184.6 198.5 175.3 192.1 160C178.2 189.1 185.2 177.3 163.5 217.7C161.4 221.6 157.3 224 152.9 224H124C114.7 224 109 214 113.6 206L159.9 128L113.6 50C108.9 42 114.7 32 124 32H152.9C157.3 32 161.3 34.4 163.4 38.3C185.1 78.3 186.4 83.3 192 96C206.9 65.8 197.9 80.1 220.6 38.3C222.7 34.4 226.8 32 231.2 32H260C269.3 32 275 42 270.4 50L224 128C224.7 129.1 254.3 178.5 270.3 206C275 214 269.2 224 260 224z" />
+    <glyph glyph-name="file-image"
+      unicode="&#xF1C5;"
+      horiz-adv-x="384" d=" M369.9 350.1L286 434C277 443 264.8 448.1 252.1 448.1H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V316.1C384 328.8 378.9 341.1 369.9 350.1zM332.1 320H256V396.1L332.1 320zM48 -16V400H208V296C208 282.7 218.7 272 232 272H336V-16H48zM80 32H304V160L280.5 183.5C275.8 188.2 268.2 188.2 263.5 183.5L176 96L136.5 135.5C131.8 140.2 124.2 140.2 119.5 135.5L80 96V32zM128 272C101.5 272 80 250.5 80 224S101.5 176 128 176S176 197.5 176 224S154.5 272 128 272z" />
+    <glyph glyph-name="file-pdf"
+      unicode="&#xF1C1;"
+      horiz-adv-x="384" d=" M369.9 350.1L286 434C277 443 264.8 448.1 252.1 448.1H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V316.1C384 328.8 378.9 341.1 369.9 350.1zM332.1 320H256V396.1L332.1 320zM48 -16V400H208V296C208 282.7 218.7 272 232 272H336V-16H48zM298.2 127.7C286 139.7 251.2 136.4 233.8 134.2C216.6 144.7 205.1 159.2 197 180.5C200.9 196.6 207.1 221.1 202.4 236.5C198.2 262.7 164.6 260.1 159.8 242.4C155.4 226.3 159.4 203.9 166.8 175.3C156.8 151.4 141.9 119.3 131.4 100.9C111.4 90.6 84.4 74.7 80.4 54.7C77.1 38.9 106.4 -0.5 156.5 85.9C178.9 93.3 203.3 102.4 224.9 106C243.8 95.8 265.9 89 280.7 89C306.2 89 308.7 117.2 298.2 127.7zM100.1 49.9C105.2 63.6 124.6 79.4 130.5 84.9C111.5 54.6 100.1 49.2 100.1 49.9zM181.7 240.5C189.1 240.5 188.4 208.4 183.5 199.7C179.1 213.6 179.2 240.5 181.7 240.5zM157.3 103.9C167 120.8 175.3 140.9 182 158.6C190.3 143.5 200.9 131.4 212.1 123.1C191.3 118.8 173.2 109.9999999999999 157.3 103.9zM288.9 108.9S283.9 102.9 251.6 116.7C286.7 119.3 292.5 111.3 288.9 108.9z" />
+    <glyph glyph-name="file-powerpoint"
+      unicode="&#xF1C4;"
+      horiz-adv-x="384" d=" M369.9 350.1L286 434C277 443 264.8 448.1 252.1 448.1H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V316.1C384 328.8 378.9 341.1 369.9 350.1zM332.1 320H256V396.1L332.1 320zM48 -16V400H208V296C208 282.7 218.7 272 232 272H336V-16H48zM120 44V212C120 218.6 125.4 224 132 224H201.2C237.9 224 264 197 264 157.7C264 83.4 195.3 91.2 168.5 91.2V44C168.5 37.4 163.1 32 156.5 32H132C125.4 32 120 37.4 120 44zM168.5 131.4H191.5C199.4 131.4 205.4 133.8 209.6 138.6C218.1 148.4 218 167.1 209.7 176.4C205.6 181 199.8 183.4 192.3 183.4H168.4V131.4z" />
+    <glyph glyph-name="file-video"
+      unicode="&#xF1C8;"
+      horiz-adv-x="384" d=" M369.941 350.059L286.059 433.9410000000001A48 48 0 0 1 252.118 448H48C21.49 448 0 426.51 0 400V-16C0 -42.51 21.49 -64 48 -64H336C362.51 -64 384 -42.51 384 -16V316.118A48 48 0 0 1 369.941 350.059zM332.118 320H256V396.118L332.118 320zM48 -16V400H208V296C208 282.745 218.745 272 232 272H336V-16H48zM276.687 195.303L224 142.626V180C224 191.046 215.046 200 204 200H100C88.954 200 80 191.046 80 180V76C80 64.954 88.954 56 100 56H204C215.046 56 224 64.954 224 76V113.374L276.687 60.7000000000001C286.704 50.682 304 57.72 304 72.014V183.989C304 198.3 286.691 205.308 276.687 195.303z" />
+    <glyph glyph-name="file-word"
+      unicode="&#xF1C2;"
+      horiz-adv-x="384" d=" M369.9 350.1L286 434C277 443 264.8 448.1 252.1 448.1H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V316.1C384 328.8 378.9 341.1 369.9 350.1zM332.1 320H256V396.1L332.1 320zM48 -16V400H208V296C208 282.7 218.7 272 232 272H336V-16H48zM268.1 192C262.4000000000001 192 257.5 188 256.4000000000001 182.5C235.8000000000001 84.8 236.0000000000001 87.1 235.4000000000001 79C235.2000000000001 80.2 235.0000000000001 81.6 234.7000000000001 83.3C233.9000000000001 88.4 235.0000000000001 83.1 211.1000000000001 182.8C209.8000000000001 188.2 205.0000000000001 192 199.4000000000001 192H186.1000000000001C180.6000000000001 192 175.8000000000001 188.2 174.4000000000001 182.9C150.0000000000001 83.9 150.4000000000001 86.7 149.6000000000001 79.2C149.5000000000001 80.3 149.4000000000001 81.7 149.1000000000001 83.4C148.4000000000001 88.6 135.0000000000001 156.7 130.0000000000001 182.4C128.9000000000001 188 124.0000000000001 192.1 118.2000000000001 192.1H101.4000000000001C93.6000000000001 192.1 87.9000000000001 184.8 89.7000000000001 177.3C97.7000000000001 144.6999999999999 116.4000000000001 67.8 122.9000000000001 41.3C124.2000000000001 35.9 129.0000000000001 32.1999999999999 134.6000000000001 32.1999999999999H159.8000000000001C165.3000000000001 32.1999999999999 170.1000000000001 35.8999999999999 171.4 41.3L189.3000000000001 112.6999999999999C190.8000000000001 118.8999999999999 191.8000000000001 124.6999999999999 192.3000000000001 130L195.2000000000001 112.6999999999999C195.3000000000001 112.3 207.8000000000001 62.1999999999999 213.1000000000001 41.3C214.4000000000001 35.9999999999999 219.2000000000001 32.1999999999999 224.7000000000001 32.1999999999999H249.4000000000001C254.9000000000001 32.1999999999999 259.7000000000001 35.8999999999999 261.0000000000001 41.3C281.8000000000001 123.1999999999999 291.2000000000001 160.3 295.5000000000001 177.3C297.4000000000001 184.9 291.7000000000001 192.2 283.9000000000001 192.2H268.1z" />
+    <glyph glyph-name="file"
+      unicode="&#xF15B;"
+      horiz-adv-x="384" d=" M369.9 350.1L286 434C277 443 264.8 448.1 252.1 448.1H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V316.1C384 328.8 378.9 341.1 369.9 350.1zM332.1 320H256V396.1L332.1 320zM48 -16V400H208V296C208 282.7 218.7 272 232 272H336V-16H48z" />
+    <glyph glyph-name="flag"
+      unicode="&#xF024;"
+      horiz-adv-x="512" d=" M336.174 368C287.042 368 242.869 400 174.261 400C142.96 400 115.958 393.5180000000001 93.54 384.832A48.04 48.04 0 0 1 95.682 405.559C93.067 428.425 74.167 446.406 51.201 447.896C23.242 449.71 0 427.569 0 400C0 382.236 9.657 366.738 24 358.438V-48C24 -56.837 31.163 -64 40 -64H56C64.837 -64 72 -56.837 72 -48V35.443C109.869 52.72 143.259 64 199.826 64C248.958 64 293.131 32 361.7390000000001 32C420.218 32 463.711 54.617 490.287 71.981C503.846 80.839 512 95.949 512 112.145V352.063C512 386.522 476.736 409.831 445.096 396.18C409.193 380.6910000000001 371.641 368 336.174 368zM464 112C442.217 96.588 403.176 80 361.7390000000001 80C301.7940000000001 80 259.737 112 199.826 112C156.465 112 103.447 102.597 72 88V320C93.784 335.4120000000001 132.824 352 174.261 352C234.206 352 276.2630000000001 320 336.1740000000001 320C379.4450000000001 320 432.4940000000001 337.366 464 352V112z" />
+    <glyph glyph-name="folder-open"
+      unicode="&#xF07C;"
+      horiz-adv-x="576" d=" M527.943 224H480V272C480 298.51 458.51 320 432 320H272L208 384H48C21.49 384 0 362.51 0 336V48C0 21.49 21.49 0 48 0H448A48.001 48.001 0 0 1 488.704 22.56L568.646 150.56C588.5939999999999 182.477 565.608 224 527.943 224zM54 336H188.118L252.118 272H426A6 6 0 0 0 432 266V224H152A48 48 0 0 1 110.902 200.798L48 96.551V330.007A5.993 5.993 0 0 0 54 336zM448 48H72L149.234 176H528L448 48z" />
+    <glyph glyph-name="folder"
+      unicode="&#xF07B;"
+      horiz-adv-x="512" d=" M464 320H272L208 384H48C21.49 384 0 362.51 0 336V48C0 21.49 21.49 0 48 0H464C490.51 0 512 21.49 512 48V272C512 298.51 490.51 320 464 320zM458 48H54C50.686 48 48 50.678 48 53.992V330.008A5.993 5.993 0 0 0 54 336H188.118L252.118 272H458A6 6 0 0 0 464 266V54A6 6 0 0 0 458 48z" />
+    <glyph glyph-name="frown"
+      unicode="&#xF119;"
+      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM168 208C185.7 208 200 222.3 200 240S185.7 272 168 272S136 257.7 136 240S150.3 208 168 208zM328 272C310.3 272 296 257.7 296 240S310.3 208 328 208S360 222.3 360 240S345.7 272 328 272zM248 144C207.8 144 170 126.3 144.2 95.4C135.7 85.2 137.1 70.1 147.3 61.6C157.5 53.1 172.6 54.4999999999999 181.1 64.7C197.7 84.6 222.1 96.1 248 96.1S298.3 84.7 314.9 64.7C319.7 59 326.5 56.1 333.4 56.1C338.8 56.1 344.3 57.9 348.8 61.7C359 70.2 360.3 85.3 351.9 95.5C326 126.3 288.2 144 248 144z" />
+    <glyph glyph-name="futbol"
+      unicode="&#xF1E3;"
+      horiz-adv-x="496" d=" M483.8 268.6C449.8 373.4 352.6 440 248.1 440C222.7 440 196.9 436.1 171.4 427.8C41.2 385.5 -30.1 245.6 12.2 115.4C46.2 10.6 143.4 -56 247.9 -56C273.3 -56 299.1 -52.1 324.6 -43.8C454.8 -1.5 526.1 138.4 483.8 268.6zM409.3 74.9L357.1 68.5L313.4000000000001 129.4L337.8 204.6L408.9 226.7L447.8 190.3C447.6 159.6 440.4 129.1999999999999 426.1 101.1C421.4 91.8 415.4 83.3 409.3 74.9zM409.3 310.3L398.9000000000001 257.2L328.2000000000001 235.2L264.0000000000001 281.7V355.5L311.4000000000001 381.7C350.6 368.7 384.8000000000001 343.7 409.3000000000001 310.3zM184.9 381.6L232 355.5V281.7L167.8 235.2L97.2 257.2L87.1 309.7C111.4 343.1 145 368.3 184.9 381.6zM139 68.5L85.9 75C71.5 95.1 48.6 134.6 48.1 190.3L87.1 226.7L158.2 204.5L182.5 130.2000000000001L139 68.5000000000001zM187.2 1.5L164.8 49.6L208.4 111.3H287L331.3 49.6L308.9000000000001 1.5C302.7000000000001 -0.3 251.3000000000001 -18.9 187.2000000000001 1.5z" />
+    <glyph glyph-name="gem"
+      unicode="&#xF3A5;"
+      horiz-adv-x="576" d=" M464 448H112C108 448 104.2 446 102 442.6L2 295.4C-0.9 291 -0.6 285.2000000000001 2.7 281.2000000000001L278.7 -59.6C283.5 -65.5 292.5 -65.5 297.3 -59.6L573.3 281.2C576.5999999999999 285.3 576.9 291 574 295.4L474.1 442.6C471.8 446 468.1 448 464 448zM444.7 400L508 304H439.6L387.9000000000001 400H444.7000000000001zM242.6 400H333.3L385 304H191L242.6 400zM131.3 400H188.1L136.4 304H68L131.3 400zM88.3 256H139.7L208 96L88.3 256zM191.2 256H384.8L288 12.7L191.2 256zM368 96L436.2 256H487.6L368 96z" />
+    <glyph glyph-name="hand-lizard"
+      unicode="&#xF258;"
+      horiz-adv-x="576" d=" M556.686 157.458L410.328 383.171C397.001 403.728 374.417 416 349.917 416H56C25.121 416 0 390.878 0 360V352C0 307.8880000000001 35.888 272 80 272H276.0420000000001L257.7090000000001 224H144C95.477 224 56 184.523 56 136C56 105.121 81.121 80 112 80H243.552C246.539 80 249.466 79.451 252.249 78.369L352 39.582V-32H576V92.171C576 115.396 569.321 137.972 556.686 157.458zM528 16H400V39.582C400 59.53 387.986 77.09 369.396 84.318L269.645 123.106A71.733 71.733 0 0 1 243.552 128H112C107.589 128 104 131.589 104 136C104 158.056 121.944 176 144 176H257.709C277.476 176 295.495 188.407 302.549 206.873L327.101 271.154C336.097 294.707 318.673 320 293.471 320H80C62.355 320 48 334.355 48 352V360C48 364.411 51.589 368 56 368H349.917C358.083 368 365.61 363.91 370.054 357.058L516.412 131.343A71.84 71.84 0 0 0 528 92.171V16z" />
+    <glyph glyph-name="hand-paper"
+      unicode="&#xF256;"
+      horiz-adv-x="448" d=" M372.57 335.359V346.184C372.57 389.796 332.05 422.875 289.531 411.73C263.902 461.23 195.441 459.18 171.549 410.983C130.269 421.544 89.144 390.055 89.144 346V219.87C69.191 227.297 45.836 224.938 27.061 210.999C-2.294 189.203 -8.733 147.666 12.511 117.846L132.48 -50.569A32 32 0 0 1 158.542 -64.001H381.439C396.343 -64.001 409.274 -53.712 412.621 -39.188L442.805 91.77A203.637 203.637 0 0 1 448 137.436V269C448 309.62 412.477 340.992 372.57 335.359zM399.997 137.437C399.997 125.706 398.663 113.968 396.0320000000001 102.551L368.707 -16H166.787L51.591 145.697C37.152 165.967 66.614 188.473 80.985 168.302L108.113 130.223C117.108 117.597 137.144 123.936 137.144 139.506V346C137.144 371.645 173.715 370.81 173.715 345.309V192C173.715 183.163 180.878 176 189.715 176H196.571C205.408 176 212.571 183.163 212.571 192V381C212.571 406.663 249.142 405.81 249.142 380.309V192C249.142 183.163 256.305 176 265.142 176H271.998C280.835 176 287.998 183.163 287.998 192V346.875C287.998 372.5470000000001 324.568 371.685 324.568 346.184V192C324.568 183.163 331.731 176 340.568 176H347.425C356.262 176 363.425 183.163 363.425 192V268.309C363.425 294.551 399.995 293.949 399.995 269V137.437z" />
+    <glyph glyph-name="hand-peace"
+      unicode="&#xF25B;"
+      horiz-adv-x="448" d=" M362.146 256.024C348.4360000000001 277.673 323.385 290.04 297.14 286.365V374C297.14 414.804 264.329 448 223.999 448C183.669 448 150.859 414.804 150.859 374L160 280L141.321 358.85C126.578 397.157 83.85 415.89 46.209 400.7920000000001C8.735 385.762 -9.571 343.0370000000001 5.008 305.15L60.765 160.223C30.208 135.267 16.771 102.414 36.032 68.005L90.885 -29.994C102.625 -50.97 124.73 -64 148.575 -64H354.277C385.021 -64 411.835 -42.56 418.832 -12.203L446.259 106.7960000000001A67.801 67.801 0 0 1 447.988 121.999L448 192C448 236.956 404.737 269.343 362.146 256.024zM399.987 122C399.987 120.512 399.8180000000001 119.023 399.485 117.577L372.058 -1.424C370.08 -10.006 362.768 -16 354.276 -16H148.575C142.089 -16 136.033 -12.379 132.77 -6.551L77.916 91.449C73.359 99.59 75.297 110.117 82.424 115.937L109.071 137.701A16 16 0 0 1 113.883 155.84L49.793 322.389C37.226 355.044 84.37 373.163 96.51 341.611L156.294 186.254A16 16 0 0 1 171.227 176H182.859C191.696 176 198.859 183.163 198.859 192V374C198.859 408.375 249.14 408.43 249.14 374V192C249.14 183.163 256.303 176 265.14 176H271.996C280.833 176 287.996 183.163 287.996 192V220C287.996 245.122 324.563 245.159 324.563 220V192C324.563 183.163 331.726 176 340.563 176H347.419C356.256 176 363.419 183.163 363.419 192C363.419 217.12 399.986 217.16 399.986 192V122z" />
+    <glyph glyph-name="hand-point-down"
+      unicode="&#xF0A7;"
+      horiz-adv-x="448" d=" M188.8 -64C234.416 -64 272 -26.235 272 19.2V54.847A93.148 93.148 0 0 1 294.064 62.776C316.0700000000001 60.269 339.0420000000001 66.2789999999999 356.855 78.761C409.342 79.9 448 116.159 448 178.701V200C448 260.063 408 298.512 408 327.2V329.879C412.952 335.626 416 343.415 416 351.999V416C416 433.673 403.106 448 387.2 448H156.8C140.894 448 128 433.673 128 416V352C128 343.416 131.048 335.627 136 329.88V327.201C136 320.237 129.807 312.339 112.332 297.0180000000001L112.184 296.889L112.038 296.7580000000001C102.101 287.9020000000001 91.197 278.642 78.785 270.9070000000001C48.537 252.202 0 240.514 0 195.2C0 138.272 35.286 103.2 83.2 103.2C91.226 103.2 98.689 104.014 105.6 105.376V19.2C105.6 -25.899 143.701 -64 188.8 -64zM188.8 -16C170.1 -16 153.6 0.775 153.6 19.2V177.6C136.275 177.6 118.4 151.2000000000001 83.2 151.2000000000001C56.8 151.2000000000001 48 171.8250000000001 48 195.2000000000001C48 203.9940000000001 80.712 215.6450000000001 104.1 230.1260000000001C118.675 239.2000000000001 131.325 249.6500000000001 143.975 260.9250000000001C162.349 277.0340000000001 180.608 294.761 183.571 320.0000000000001H360.3230000000001C364.087 277.2100000000001 400 245.491 400 200V178.701C400 138.177 377.803 121.577 338.675 128.1C330.6740000000001 113.488 304.6960000000001 103.949 285.05 115.175C266.825 95.81 238.669 97.388 224 110.225V19.2C224 0.225 207.775 -16 188.8 -16zM328 384C328 397.255 338.745 408 352 408S376 397.255 376 384S365.255 360 352 360S328 370.745 328 384z" />
+    <glyph glyph-name="hand-point-left"
+      unicode="&#xF0A5;"
+      horiz-adv-x="512" d=" M0 227.2C0 181.584 37.765 144 83.2 144H118.847A93.148 93.148 0 0 1 126.776 121.936C124.269 99.93 130.279 76.958 142.761 59.145C143.9 6.658 180.159 -32 242.701 -32H264C324.063 -32 362.512 8 391.2 8H393.879C399.626 3.048 407.415 0 415.999 0H479.999C497.672 0 511.999 12.894 511.999 28.8V259.2C511.999 275.106 497.672 288 479.999 288H415.999C407.415 288 399.626 284.952 393.879 280H391.2C384.236 280 376.338 286.193 361.017 303.668L360.888 303.8160000000001L360.757 303.962C351.901 313.899 342.641 324.803 334.906 337.215C316.202 367.463 304.514 416 259.2 416C202.272 416 167.2 380.714 167.2 332.8C167.2 324.774 168.014 317.3110000000001 169.376 310.4H83.2C38.101 310.4 0 272.299 0 227.2zM48 227.2C48 245.9 64.775 262.4 83.2 262.4H241.6C241.6 279.725 215.2 297.6 215.2 332.8C215.2 359.2 235.825 368 259.2000000000001 368C267.9940000000001 368 279.6450000000001 335.288 294.1260000000001 311.9C303.2000000000001 297.325 313.6500000000001 284.675 324.925 272.025C341.034 253.651 358.761 235.392 384 232.429V55.677C341.21 51.913 309.491 16 264 16H242.701C202.177 16 185.577 38.197 192.1 77.325C177.488 85.326 167.949 111.304 179.175 130.95C159.81 149.175 161.388 177.331 174.225 192H83.2C64.225 192 48 208.225 48 227.2zM448 88C461.255 88 472 77.255 472 64S461.255 40 448 40S424 50.745 424 64S434.745 88 448 88z" />
+    <glyph glyph-name="hand-point-right"
+      unicode="&#xF0A4;"
+      horiz-adv-x="512" d=" M428.8 310.4H342.623A115.52 115.52 0 0 1 344.799 332.8C344.799 380.714 309.727 416 252.799 416C207.485 416 195.797 367.463 177.092 337.216C169.357 324.803 160.098 313.899 151.241 303.963L151.11 303.817L150.981 303.6690000000001C135.662 286.193 127.764 280 120.8 280H118.121C112.374 284.952 104.585 288 96.001 288H32C14.327 288 0 275.106 0 259.2V28.8C0 12.894 14.327 0 32 0H96C104.584 0 112.373 3.048 118.12 8H120.799C149.487 8 187.936 -32 247.999 -32H269.298C331.8400000000001 -32 368.098 6.658 369.238 59.145C381.7200000000001 76.958 387.729 99.93 385.223 121.936A93.148 93.148 0 0 1 393.152 144H428.8C474.235 144 512 181.584 512 227.2C512 272.299 473.899 310.4 428.8 310.4zM428.8 192H337.774C350.611 177.331 352.189 149.175 332.824 130.95C344.051 111.304 334.511 85.326 319.899 77.325C326.423 38.197 309.823 16 269.299 16H248C202.509 16 170.79 51.913 128 55.676V232.429C153.239 235.393 170.966 253.651 187.075 272.025C198.35 284.675 208.8 297.3250000000001 217.874 311.9C232.355 335.288 244.006 368 252.8 368C276.175 368 296.8 359.2 296.8 332.8C296.8 297.6 270.4000000000001 279.725 270.4000000000001 262.4H428.8000000000001C447.2250000000001 262.4 464.0000000000001 245.9 464.0000000000001 227.2C464.0000000000001 208.225 447.7750000000001 192 428.8000000000001 192zM88 64C88 50.745 77.255 40 64 40S40 50.745 40 64S50.745 88 64 88S88 77.255 88 64z" />
+    <glyph glyph-name="hand-point-up"
+      unicode="&#xF0A6;"
+      horiz-adv-x="448" d=" M105.6 364.8V278.623A115.52 115.52 0 0 1 83.2 280.799C35.286 280.799 0 245.727 0 188.799C0 143.485 48.537 131.797 78.784 113.092C91.197 105.357 102.101 96.098 112.037 87.241L112.183 87.11L112.331 86.981C129.807 71.662 136 63.764 136 56.8V54.121C131.048 48.374 128 40.585 128 32.001V-31.999C128 -49.672 140.894 -63.999 156.8 -63.999H387.2000000000001C403.1060000000001 -63.999 416.0000000000001 -49.672 416.0000000000001 -31.999V32.001C416.0000000000001 40.585 412.9520000000001 48.374 408.0000000000001 54.121V56.8C408.0000000000001 85.488 448.0000000000001 123.937 448.0000000000001 184V205.299C448.0000000000001 267.841 409.3420000000001 304.099 356.8550000000001 305.2390000000001C339.0420000000001 317.721 316.0700000000001 323.73 294.0640000000001 321.224A93.148 93.148 0 0 1 272 329.153V364.8C272 410.235 234.416 448 188.8 448C143.701 448 105.6 409.899 105.6 364.8zM224 364.8V273.774C238.669 286.611 266.825 288.189 285.05 268.824C304.6960000000001 280.0510000000001 330.6740000000001 270.511 338.675 255.899C377.803 262.423 400 245.823 400 205.299V184C400 138.509 364.087 106.79 360.324 64H183.571C180.607 89.239 162.349 106.966 143.975 123.075C131.325 134.35 118.675 144.8 104.1 153.874C80.712 168.355 48 180.006 48 188.8C48 212.175 56.8 232.8 83.2 232.8C118.4 232.8 136.275 206.4 153.6 206.4V364.8C153.6 383.225 170.1 400 188.8 400C207.775 400 224 383.775 224 364.8zM352 24C365.255 24 376 13.255 376 0S365.255 -24 352 -24S328 -13.255 328 0S338.745 24 352 24z" />
+    <glyph glyph-name="hand-pointer"
+      unicode="&#xF25A;"
+      horiz-adv-x="448" d=" M358.182 268.639C338.689 293.4070000000001 305.5030000000001 300.584 278.31 287.737C263.183 303.4240000000001 242.128 310.2240000000001 221.715 307.366V381C221.715 417.944 191.979 448 155.429 448S89.143 417.944 89.143 381V219.871C69.234 227.281 45.871 224.965 27.06 210.999C-2.295 189.204 -8.733 147.6660000000001 12.51 117.847L122.209 -36.154C134.632 -53.59 154.741 -64 176 -64H354.286C385.088 -64 411.86 -42.5 418.843 -12.203L446.272 106.7960000000001A67.873 67.873 0 0 1 448 122V206C448 252.844 401.375 285.273 358.182 268.639zM80.985 168.303L108.111 130.224C117.106 117.598 137.142 123.937 137.142 139.507V381C137.142 406.12 173.713 406.16 173.713 381V206C173.713 197.164 180.876 190 189.713 190H196.57C205.407 190 212.57 197.164 212.57 206V241C212.57 266.12 249.141 266.16 249.141 241V206C249.141 197.164 256.304 190 265.141 190H272C280.837 190 288 197.164 288 206V227C288 252.12 324.5710000000001 252.16 324.5710000000001 227V206C324.5710000000001 197.164 331.7340000000001 190 340.5710000000001 190H347.4280000000001C356.2650000000001 190 363.4280000000001 197.164 363.4280000000001 206C363.4280000000001 231.121 399.999 231.16 399.999 206V122C399.999 120.512 399.8300000000001 119.023 399.497 117.577L372.067 -1.424C370.089 -10.006 362.777 -16 354.2850000000001 -16H176C170.231 -16 164.737 -13.122 161.303 -8.303L51.591 145.697C37.185 165.92 66.585 188.515 80.985 168.303zM176.143 48V144C176.143 152.837 182.411 160 190.143 160H196.143C203.875 160 210.143 152.837 210.143 144V48C210.143 39.163 203.875 32 196.143 32H190.143C182.41 32 176.143 39.163 176.143 48zM251.571 48V144C251.571 152.837 257.839 160 265.5710000000001 160H271.5710000000001C279.3030000000001 160 285.5710000000001 152.837 285.5710000000001 144V48C285.5710000000001 39.163 279.3030000000001 32 271.5710000000001 32H265.5710000000001C257.839 32 251.5710000000001 39.163 251.5710000000001 48zM327 48V144C327 152.837 333.268 160 341 160H347C354.7320000000001 160 361 152.837 361 144V48C361 39.163 354.7320000000001 32 347 32H341C333.268 32 327 39.163 327 48z" />
+    <glyph glyph-name="hand-rock"
+      unicode="&#xF255;"
+      horiz-adv-x="512" d=" M408.864 368.948C386.463 402.846 342.756 411.221 310.051 392.536C280.577 424.005 230.906 423.629 201.717 392.558C154.557 419.578 93.007 387.503 91.046 331.752C44.846 342.593 0 307.999 0 260.5710000000001V203.618C0 170.877 14.28 139.664 39.18 117.984L136.89 32.903C141.142 29.201 140 27.33 140 -1e-13C140 -17.6730000000001 154.327 -32.0000000000001 172 -32.0000000000001H424C441.673 -32.0000000000001 456 -17.6730000000001 456 -1e-13C456 23.5129999999999 454.985 30.745 459.982 42.37L502.817 142.026C508.911 156.203 512 171.198 512 186.5939999999999V301.0370000000001C512 353.876 457.686 389.699 408.8640000000001 368.948zM464 186.594A64.505 64.505 0 0 0 458.718 160.981L415.8830000000001 61.326C410.653 49.155 408.0000000000001 36.286 408.0000000000001 23.076V16H188V26.286C188 42.656 180.86 58.263 168.41 69.103L70.7 154.183C56.274 166.745 48 184.764 48 203.619V260.572C48 293.78 100 294.1090000000001 100 259.895V218.667A16 16 0 0 1 105.493 206.6L112.493 200.505A16 16 0 0 1 139 212.571V329.1430000000001C139 362.24 191 362.868 191 328.466V301.7150000000001C191 292.879 198.164 285.7150000000001 207 285.7150000000001H214C222.836 285.7150000000001 230 292.879 230 301.7150000000001V342.858C230 375.992 282 376.533 282 342.181V301.7150000000001C282 292.879 289.163 285.7150000000001 298 285.7150000000001H305C313.837 285.7150000000001 321 292.879 321 301.7150000000001V329.144C321 362.174 373 362.924 373 328.467V301.716C373 292.88 380.163 285.716 389 285.716H396C404.837 285.716 412 292.88 412 301.716C412 334.862 464 335.329 464 301.039V186.5940000000001z" />
+    <glyph glyph-name="hand-scissors"
+      unicode="&#xF257;"
+      horiz-adv-x="512" d=" M256 -32L326 -31.987C331.114 -31.987 336.231 -31.404 341.203 -30.258L460.202 -2.831C490.56 4.165 512 30.98 512 61.723V267.425C512 291.27 498.97 313.376 477.995 325.115L379.996 379.968C345.587 399.2290000000001 312.733 385.7920000000001 287.778 355.235L142.85 410.992C104.963 425.5710000000001 62.238 407.265 47.208 369.791C32.11 332.149 50.843 289.421 89.15 274.679L168 256L74 265.141C33.196 265.141 0 232.33 0 192.001C0 151.671 33.196 118.86 74 118.86H161.635C157.96 92.615 170.327 67.563 191.976 53.8539999999999C178.657 11.263 211.044 -32 256 -32zM256 16.013C230.84 16.013 230.88 52.58 256 52.58C264.837 52.58 272 59.743 272 68.58V75.436C272 84.273 264.837 91.436 256 91.436H228C202.841 91.436 202.878 128.003 228 128.003H256C264.837 128.003 272 135.166 272 144.003V150.859C272 159.696 264.837 166.859 256 166.859H74C39.57 166.859 39.625 217.14 74 217.14H256C264.837 217.14 272 224.303 272 233.14V244.772A16 16 0 0 1 261.746 259.705L106.389 319.49C74.837 331.63 92.957 378.773 125.611 366.207L292.16 302.116A16.001 16.001 0 0 1 310.299 306.928L332.063 333.5750000000001C337.883 340.702 348.411 342.639 356.551 338.0830000000001L454.551 283.2290000000001C460.379 279.966 464 273.911 464 267.424V61.723C464 53.232 458.006 45.919 449.424 43.941L330.423 16.514A19.743 19.743 0 0 0 326 16.012H256z" />
+    <glyph glyph-name="hand-spock"
+      unicode="&#xF259;"
+      horiz-adv-x="512" d=" M21.096 66.21L150.188 -55.303A32 32 0 0 1 172.12 -64.001H409.7200000000001C423.8900000000001 -64.001 436.3730000000001 -54.682 440.4000000000001 -41.097L472.215 66.216A115.955 115.955 0 0 1 477 99.189V136.028C477 140.079 477.476 144.132 478.414 148.073L510.144 281.4830000000001C520.243 323.8950000000001 487.828 364.221 444.6 364.0080000000001C440.456 388.8640000000001 422.057 411.1730000000001 394.75 418.0000000000001C358.947 426.9520000000001 322.523 405.3450000000001 313.5 369.25L296.599 264L274.924 395.99C266.638 432.06 230.621 454.562 194.62 446.286C165.004 439.4820000000001 144.482 413.897 142.738 384.991C100.101 384.16 69.283 344.428 78.667 303.147L109.707 166.639C82.513 189.154 42.423 186.631 18.225 160.917C-7.151 133.956 -5.873 91.592 21.096 66.21zM53.164 128.021L53.166 128.0219999999999C60.385 135.694 72.407 136.002 80.022 128.8349999999999L133.034 78.9409999999999C143.225 69.351 160 76.6 160 90.594V160.073C160 161.266 159.866 162.456 159.603 163.619L125.473 313.791C119.877 338.408 156.975 346.651 162.527 322.212L192.926 188.4549999999999A16 16 0 0 1 208.529 176.0009999999999H217.1330000000001C227.4090000000001 176.0009999999999 235.0270000000001 185.5679999999999 232.7270000000001 195.5839999999999L191.107 376.7369999999999C185.484 401.2059999999999 222.497 409.813 228.142 385.2449999999999L273.362 188.4169999999999A16 16 0 0 1 288.956 176H302.173A16 16 0 0 1 317.695 188.119L360.067 357.6090000000001C366.171 382.0310000000001 403.029 372.7680000000001 396.932 348.3920000000001L358.805 195.88C356.284 185.792 363.92 176 374.327 176H384.021A16 16 0 0 1 399.586 188.295L426.509 301.4C432.3300000000001 325.848 469.306 317.087 463.475 292.598L431.7200000000001 159.19A100.094 100.094 0 0 1 429 136.028V99.189C429 92.641 428.057 86.138 426.195 79.8610000000001L397.775 -16H178.465L53.978 101.164C46.349 108.344 45.984 120.393 53.164 128.021z" />
+    <glyph glyph-name="handshake"
+      unicode="&#xF2B5;"
+      horiz-adv-x="640" d=" M519.2 320.1L471.6 367.7A56.252 56.252 0 0 1 432 384H205.2C190.4 384 176.1 378.1 165.6 367.7L118 320.1H0V64.4H64C81.6 64.4 95.8 78.6 95.9 96.1H105L189.6 19.6999999999999C220.5 -5.4000000000001 263.4 -6.0000000000001 295.2 15.8999999999999C307.7 5.0999999999999 321.2 -1e-13 336.3 -1e-13C354.5 -1e-13 371.6 7.3999999999999 385.1 23.9999999999999C407.2000000000001 15.3 433.3 21.3999999999999 449.1 40.8L475.3 73.1C480.9 79.9999999999999 484.4 87.9 486.2 96.1H544.1C544.2 78.6 558.5 64.4 576 64.4H640V320.1H519.2zM48 96.4C39.2 96.4 32 103.6 32 112.4S39.2 128.4 48 128.4S64 121.2 64 112.4C64 103.5 56.8 96.4 48 96.4zM438 103.3L411.9 71.1C409.1 67.7 404.1 67.1 400.6 69.9L376.7 89.3L346.7 52.8C340.7 45.4999999999999 331.7 47.9999999999999 328.7 50.4L291.9 81.9L276.3 62.7C262.4 45.6 237.1 43 221 56.1L123.7 144.1H96V272.2H137.9L199.6 333.8C201.6 334.6 203.3 335.3 205.3 336.1H262L223.3 300.6C193.9 273.7 192.2 228.3 218.9 199.3C233.7 183.1 280.1 158.1 320.4 194.9L328.6 202.4L436.8 114.6C440.2 111.8 440.7 106.7 438 103.3zM544 144.1H474.8C472.5 146.9 469.9 149.5 467.1 151.8L364.4000000000001 235.2L376.9000000000001 246.6C383.4000000000001 252.6 383.9000000000001 262.7 377.9000000000001 269.2L367 280.9C361 287.4 350.9 287.8 344.4 281.9L289.2 231.3C279.7 222.6 263.5 221.9 254.6 231.3C245.3 241.2 246.1 256.4 255.8 265.2000000000001L321.4 325.3C328.8 332.1 338.4 335.8 348.4 335.8L432.1 336C434.2 336 436.2 335.2000000000001 437.6 333.7000000000001L499.3 272.1H544V144.1zM592 96.4C583.2 96.4 576 103.6 576 112.4S583.2 128.4 592 128.4S608 121.2 608 112.4C608 103.5 600.8 96.4 592 96.4z" />
+    <glyph glyph-name="hdd"
+      unicode="&#xF0A0;"
+      horiz-adv-x="576" d=" M567.403 212.358L462.323 363.411A48 48 0 0 1 422.919 384H153.081A48 48 0 0 1 113.677 363.411L8.597 212.358A48.001 48.001 0 0 1 0 184.946V48C0 21.49 21.49 0 48 0H528C554.51 0 576 21.49 576 48V184.946C576 194.747 573 204.312 567.403 212.358zM153.081 336H422.919L500.832 224H75.168L153.081 336zM528 48H48V176H528V48zM496 112C496 94.327 481.673 80 464 80S432 94.327 432 112S446.327 144 464 144S496 129.673 496 112zM400 112C400 94.327 385.673 80 368 80S336 94.327 336 112S350.327 144 368 144S400 129.673 400 112z" />
+    <glyph glyph-name="heart"
+      unicode="&#xF004;"
+      horiz-adv-x="512" d=" M458.4 383.7C400.6 432.3 311.3 425 256 368.7C200.7 425 111.4 432.4 53.6 383.7C-21.6 320.4 -10.6 217.2 43 162.5L218.4 -16.2C228.4 -26.4 241.8 -32.1 256 -32.1C270.3 -32.1 283.6 -26.4999999999999 293.6 -16.3L469 162.4C522.5 217.1 533.7 320.3 458.4 383.7zM434.8 196.2L259.4 17.5C257 15.1 255 15.1 252.6 17.5L77.2 196.2C40.7 233.4 33.3 303.8 84.5 346.9C123.4 379.6 183.4 374.7 221 336.4L256 300.7L291 336.4C328.8 374.9 388.8 379.6 427.5 347C478.6 303.9 471 233.1 434.8 196.2z" />
+    <glyph glyph-name="hospital"
+      unicode="&#xF0F8;"
+      horiz-adv-x="448" d=" M128 204V244C128 250.627 133.373 256 140 256H180C186.627 256 192 250.627 192 244V204C192 197.373 186.627 192 180 192H140C133.373 192 128 197.373 128 204zM268 192H308C314.627 192 320 197.373 320 204V244C320 250.627 314.627 256 308 256H268C261.373 256 256 250.627 256 244V204C256 197.373 261.373 192 268 192zM192 108V148C192 154.627 186.627 160 180 160H140C133.373 160 128 154.627 128 148V108C128 101.373 133.373 96 140 96H180C186.627 96 192 101.373 192 108zM268 96H308C314.627 96 320 101.373 320 108V148C320 154.627 314.627 160 308 160H268C261.373 160 256 154.627 256 148V108C256 101.373 261.373 96 268 96zM448 -28V-64H0V-28C0 -21.373 5.373 -16 12 -16H31.5V362.9650000000001C31.5 374.582 42.245 384 55.5 384H144V424C144 437.255 154.745 448 168 448H280C293.255 448 304 437.255 304 424V384H392.5C405.755 384 416.5 374.582 416.5 362.9650000000001V-16H436C442.627 -16 448 -21.373 448 -28zM79.5 -15H192V52C192 58.627 197.373 64 204 64H244C250.627 64 256 58.627 256 52V-15H368.5V336H304V312C304 298.745 293.255 288 280 288H168C154.745 288 144 298.745 144 312V336H79.5V-15zM266 384H240V410A6 6 0 0 1 234 416H214A6 6 0 0 1 208 410V384H182A6 6 0 0 1 176 378V358A6 6 0 0 1 182 352H208V326A6 6 0 0 1 214 320H234A6 6 0 0 1 240 326V352H266A6 6 0 0 1 272 358V378A6 6 0 0 1 266 384z" />
+    <glyph glyph-name="hourglass"
+      unicode="&#xF254;"
+      horiz-adv-x="384" d=" M368 400H372C378.627 400 384 405.373 384 412V436C384 442.627 378.627 448 372 448H12C5.373 448 0 442.627 0 436V412C0 405.373 5.373 400 12 400H16C16 319.4360000000001 48.188 234.193 113.18 192C47.899 149.619 16 64.1 16 -16H12C5.373 -16 0 -21.373 0 -28V-52C0 -58.627 5.373 -64 12 -64H372C378.627 -64 384 -58.627 384 -52V-28C384 -21.373 378.627 -16 372 -16H368C368 64.564 335.812 149.807 270.82 192C336.102 234.381 368 319.9 368 400zM64 400H320C320 298.38 262.693 216 192 216S64 298.379 64 400zM320 -16H64C64 85.62 121.308 168 192 168S320 85.62 320 -16z" />
+    <glyph glyph-name="id-badge"
+      unicode="&#xF2C1;"
+      horiz-adv-x="384" d=" M336 448H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V400C384 426.5 362.5 448 336 448zM336 -16H48V400H336V-16zM144 336H240C248.8 336 256 343.2 256 352S248.8 368 240 368H144C135.2 368 128 360.8 128 352S135.2 336 144 336zM192 160C227.3 160 256 188.7 256 224S227.3 288 192 288S128 259.3 128 224S156.7 160 192 160zM102.4 32H281.6C294 32 304 40.6 304 51.2V70.4C304 102.2 273.9 128 236.8 128C226 128 218.1 120 192 120C165.1 120 158.6 128 147.2 128C110.1 128 80 102.2 80 70.4V51.2C80 40.6 90 32 102.4 32z" />
+    <glyph glyph-name="id-card"
+      unicode="&#xF2C2;"
+      horiz-adv-x="576" d=" M528 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H528C554.5 -32 576 -10.5 576 16V368C576 394.5 554.5 416 528 416zM528 16H303.2C304.1 20.5 304 12.4 304 38.4C304 70.2 273.9 96 236.8 96C226 96 218.1 88 192 88C165.1 88 158.6 96 147.2 96C110.1 96 80 70.2 80 38.4C80 12.4 79.8 20.5 80.8 16H48V304H528V16zM360 96H472C476.4 96 480 99.6 480 104V120C480 124.4 476.4 128 472 128H360C355.6 128 352 124.4 352 120V104C352 99.6 355.6 96 360 96zM360 160H472C476.4 160 480 163.6 480 168V184C480 188.4 476.4 192 472 192H360C355.6 192 352 188.4 352 184V168C352 163.6 355.6 160 360 160zM360 224H472C476.4 224 480 227.6 480 232V248C480 252.4 476.4 256 472 256H360C355.6 256 352 252.4 352 248V232C352 227.6 355.6 224 360 224zM192 128C227.3 128 256 156.7 256 192S227.3 256 192 256S128 227.3 128 192S156.7 128 192 128z" />
+    <glyph glyph-name="image"
+      unicode="&#xF03E;"
+      horiz-adv-x="512" d=" M464 384H48C21.49 384 0 362.51 0 336V48C0 21.49 21.49 0 48 0H464C490.51 0 512 21.49 512 48V336C512 362.51 490.51 384 464 384zM458 48H54A6 6 0 0 0 48 54V330A6 6 0 0 0 54 336H458A6 6 0 0 0 464 330V54A6 6 0 0 0 458 48zM128 296C105.909 296 88 278.091 88 256S105.909 216 128 216S168 233.909 168 256S150.091 296 128 296zM96 96H416V176L328.485 263.515C323.7990000000001 268.201 316.201 268.201 311.514 263.515L192 144L152.485 183.515C147.799 188.201 140.201 188.201 135.514 183.515L96 144V96z" />
+    <glyph glyph-name="images"
+      unicode="&#xF302;"
+      horiz-adv-x="576" d=" M480 32V16C480 -10.51 458.51 -32 432 -32H48C21.49 -32 0 -10.51 0 16V272C0 298.51 21.49 320 48 320H64V272H54A6 6 0 0 1 48 266V22A6 6 0 0 1 54 16H426A6 6 0 0 1 432 22V32H480zM522 368H150A6 6 0 0 1 144 362V118A6 6 0 0 1 150 112H522A6 6 0 0 1 528 118V362A6 6 0 0 1 522 368zM528 416C554.51 416 576 394.51 576 368V112C576 85.49 554.51 64 528 64H144C117.49 64 96 85.49 96 112V368C96 394.51 117.49 416 144 416H528zM264 304C264 281.909 246.091 264 224 264S184 281.909 184 304S201.909 344 224 344S264 326.091 264 304zM192 208L231.515 247.515C236.201 252.201 243.799 252.201 248.486 247.515L288 208L391.515 311.515C396.201 316.201 403.799 316.201 408.486 311.515L480 240V160H192V208z" />
+    <glyph glyph-name="keyboard"
+      unicode="&#xF11C;"
+      horiz-adv-x="576" d=" M528 384H48C21.49 384 0 362.51 0 336V48C0 21.49 21.49 0 48 0H528C554.51 0 576 21.49 576 48V336C576 362.51 554.51 384 528 384zM536 48C536 43.589 532.411 40 528 40H48C43.589 40 40 43.589 40 48V336C40 340.411 43.589 344 48 344H528C532.411 344 536 340.411 536 336V48zM170 178V206C170 212.627 164.627 218 158 218H130C123.373 218 118 212.627 118 206V178C118 171.373 123.373 166 130 166H158C164.627 166 170 171.373 170 178zM266 178V206C266 212.627 260.627 218 254 218H226C219.373 218 214 212.627 214 206V178C214 171.373 219.373 166 226 166H254C260.627 166 266 171.373 266 178zM362 178V206C362 212.627 356.627 218 350 218H322C315.373 218 310 212.627 310 206V178C310 171.373 315.373 166 322 166H350C356.627 166 362 171.373 362 178zM458 178V206C458 212.627 452.627 218 446 218H418C411.373 218 406 212.627 406 206V178C406 171.373 411.373 166 418 166H446C452.627 166 458 171.373 458 178zM122 96V124C122 130.627 116.627 136 110 136H82C75.373 136 70 130.627 70 124V96C70 89.373 75.373 84 82 84H110C116.627 84 122 89.373 122 96zM506 96V124C506 130.627 500.627 136 494 136H466C459.373 136 454 130.627 454 124V96C454 89.373 459.373 84 466 84H494C500.627 84 506 89.373 506 96zM122 260V288C122 294.627 116.627 300 110 300H82C75.373 300 70 294.627 70 288V260C70 253.373 75.373 248 82 248H110C116.627 248 122 253.373 122 260zM218 260V288C218 294.627 212.627 300 206 300H178C171.373 300 166 294.627 166 288V260C166 253.373 171.373 248 178 248H206C212.627 248 218 253.373 218 260zM314 260V288C314 294.627 308.627 300 302 300H274C267.373 300 262 294.627 262 288V260C262 253.373 267.373 248 274 248H302C308.627 248 314 253.373 314 260zM410 260V288C410 294.627 404.627 300 398 300H370C363.373 300 358 294.627 358 288V260C358 253.373 363.373 248 370 248H398C404.627 248 410 253.373 410 260zM506 260V288C506 294.627 500.627 300 494 300H466C459.373 300 454 294.627 454 288V260C454 253.373 459.373 248 466 248H494C500.627 248 506 253.373 506 260zM408 102V118C408 124.627 402.627 130 396 130H180C173.373 130 168 124.627 168 118V102C168 95.373 173.373 90 180 90H396C402.627 90 408 95.373 408 102z" />
+    <glyph glyph-name="lemon"
+      unicode="&#xF094;"
+      horiz-adv-x="512" d=" M484.112 420.111C455.989 448.233 416.108 456.057 387.0590000000001 439.135C347.604 416.152 223.504 489.111 91.196 356.803C-41.277 224.328 31.923 100.528 8.866 60.942C-8.056 31.891 -0.234 -7.99 27.888 -36.112C56.023 -64.247 95.899 -72.0499999999999 124.945 -55.133C164.368 -32.163 288.502 -105.102 420.803 27.196C553.277 159.673 480.076 283.473 503.134 323.057C520.056 352.1070000000001 512.234 391.988 484.112 420.111zM461.707 347.217C422.907 280.608 507.307 181.582 386.862 61.137C266.422 -59.306 167.387 25.089 100.786 -13.706C78.1069999999999 -26.913 36.751 13.535 50.2929999999999 36.782C89.0929999999999 103.391 4.6929999999999 202.417 125.138 322.862C245.573 443.298 344.616 358.914 411.219 397.708C433.949 410.948 475.224 370.42 461.707 347.217zM291.846 338.481C293.216 327.521 285.442 317.524 274.481 316.154C219.635 309.299 138.702 228.367 131.846 173.519C130.473 162.53 120.447 154.785 109.52 156.154C98.559 157.524 90.785 167.52 92.155 178.48C101.317 251.766 196.322 346.6950000000001 269.5200000000001 355.8450000000001C280.473 357.213 290.4760000000001 349.442 291.8460000000001 338.481z" />
+    <glyph glyph-name="life-ring"
+      unicode="&#xF1CD;"
+      horiz-adv-x="512" d=" M256 -56C392.967 -56 504 55.033 504 192S392.967 440 256 440S8 328.967 8 192S119.033 -56 256 -56zM152.602 20.72L206.013 74.131C237.819 60.625 274.141 60.609 305.987 74.131L359.398 20.72C296.1810000000001 -17.599 215.819 -17.599 152.602 20.72zM336 192C336 147.888 300.112 112 256 112S176 147.888 176 192S211.888 272 256 272S336 236.112 336 192zM427.28 88.602L373.869 142.013C387.374 173.819 387.391 210.141 373.869 241.987L427.28 295.398C465.599 232.181 465.599 151.819 427.28 88.602zM359.397 363.28L305.986 309.8690000000001C274.18 323.374 237.858 323.391 206.013 309.8690000000001L152.602 363.28C215.819 401.599 296.1810000000001 401.599 359.397 363.28zM84.72 295.398L138.131 241.987C124.625 210.181 124.609 173.859 138.131 142.013L84.72 88.602C46.401 151.819 46.401 232.181 84.72 295.398z" />
+    <glyph glyph-name="lightbulb"
+      unicode="&#xF0EB;"
+      horiz-adv-x="384" d=" M272 20V-8C272 -18.449 265.32 -27.334 256 -30.629V-40C256 -53.255 245.255 -64 232 -64H152C138.745 -64 128 -53.255 128 -40V-30.629C118.68 -27.334 112 -18.449 112 -8V20C112 26.627 117.373 32 124 32H260C266.627 32 272 26.627 272 20zM128 272C128 307.29 156.71 336 192 336C200.837 336 208 343.164 208 352S200.837 368 192 368C139.065 368 96 324.935 96 272C96 263.164 103.164 256 112 256S128 263.164 128 272zM192 400C262.734 400 320 342.746 320 272C320 194.398 282.617 211.523 239.02 112H144.98C101.318 211.67 64 194.131 64 272C64 342.735 121.254 400 192 400M192 448C94.805 448 16 369.197 16 272C16 170.269 67.697 180.459 106.516 79.326C110.066 70.077 118.986 64 128.892 64H255.107C265.013 64 273.933 70.078 277.483 79.326C316.303 180.459 368 170.269 368 272C368 369.197 289.195 448 192 448z" />
+    <glyph glyph-name="list-alt"
+      unicode="&#xF022;"
+      horiz-adv-x="512" d=" M464 416H48C21.49 416 0 394.51 0 368V16C0 -10.51 21.49 -32 48 -32H464C490.51 -32 512 -10.51 512 16V368C512 394.51 490.51 416 464 416zM458 16H54A6 6 0 0 0 48 22V362A6 6 0 0 0 54 368H458A6 6 0 0 0 464 362V22A6 6 0 0 0 458 16zM416 108V84C416 77.373 410.627 72 404 72H204C197.373 72 192 77.373 192 84V108C192 114.627 197.373 120 204 120H404C410.627 120 416 114.627 416 108zM416 204V180C416 173.373 410.627 168 404 168H204C197.373 168 192 173.373 192 180V204C192 210.627 197.373 216 204 216H404C410.627 216 416 210.627 416 204zM416 300V276C416 269.373 410.627 264 404 264H204C197.373 264 192 269.373 192 276V300C192 306.627 197.373 312 204 312H404C410.627 312 416 306.627 416 300zM164 288C164 268.118 147.882 252 128 252S92 268.118 92 288S108.118 324 128 324S164 307.882 164 288zM164 192C164 172.118 147.882 156 128 156S92 172.118 92 192S108.118 228 128 228S164 211.882 164 192zM164 96C164 76.118 147.882 60 128 60S92 76.118 92 96S108.118 132 128 132S164 115.882 164 96z" />
+    <glyph glyph-name="map"
+      unicode="&#xF279;"
+      horiz-adv-x="576" d=" M508.505 411.83L381.517 355.424L207.179 413.537A47.992 47.992 0 0 1 172.505 411.863L28.505 347.863A48 48 0 0 1 0 304V16.033C0 -18.905 35.991 -41.831 67.495 -27.83L194.483 28.576L368.822 -29.537A47.992 47.992 0 0 1 403.496 -27.863L547.496 36.137A48 48 0 0 1 576 80V367.967C576 402.905 540.009 425.831 508.505 411.83zM360 24L216 72V360L360 312V24zM48 16V304L168 357.333V69.333L48 16zM528 80L408 26.667V314.6670000000001L528 368V80z" />
+    <glyph glyph-name="meh"
+      unicode="&#xF11A;"
+      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM168 208C185.7 208 200 222.3 200 240S185.7 272 168 272S136 257.7 136 240S150.3 208 168 208zM328 272C310.3 272 296 257.7 296 240S310.3 208 328 208S360 222.3 360 240S345.7 272 328 272zM336 128H160C146.8 128 136 117.2 136 104S146.8 80 160 80H336C349.2 80 360 90.8 360 104S349.2 128 336 128z" />
+    <glyph glyph-name="minus-square"
+      unicode="&#xF146;"
+      horiz-adv-x="448" d=" M108 164C101.4 164 96 169.4 96 176V208C96 214.6 101.4 220 108 220H340C346.6 220 352 214.6 352 208V176C352 169.4 346.6 164 340 164H108zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM400 22V362C400 365.3 397.3 368 394 368H54C50.7 368 48 365.3 48 362V22C48 18.7 50.7 16 54 16H394C397.3 16 400 18.7 400 22z" />
+    <glyph glyph-name="money-bill-alt"
+      unicode="&#xF3D1;"
+      horiz-adv-x="640" d=" M320 304C266.98 304 224 253.86 224 192C224 130.15 266.98 80 320 80C373 80 416 130.13 416 192C416 253.86 373.02 304 320 304zM360 136C360 131.58 356.42 128 352 128H288C283.58 128 280 131.58 280 136V152C280 156.42 283.58 160 288 160H304V215.44L303.53 215.13A7.991999999999999 7.991999999999999 0 0 0 292.44 217.35L283.56 230.66A7.991999999999999 7.991999999999999 0 0 0 285.7800000000001 241.75L301.11 251.97A23.99 23.99 0 0 0 314.42 256H328C332.42 256 336 252.42 336 248V160H352C356.42 160 360 156.42 360 152V136zM608 384H32C14.33 384 0 369.67 0 352V32C0 14.33 14.33 0 32 0H608C625.67 0 640 14.33 640 32V352C640 369.67 625.67 384 608 384zM592 112C556.65 112 528 83.35 528 48H112C112 83.35 83.35 112 48 112V272C83.35 272 112 300.65 112 336H528C528 300.65 556.65 272 592 272V112z" />
+    <glyph glyph-name="moon"
+      unicode="&#xF186;"
+      horiz-adv-x="512" d=" M279.135 -64C357.891 -64 430.117 -28.196 477.979 30.775C506.249 65.606 475.421 116.497 431.73 108.176C349.382 92.493 273.458 155.444 273.458 238.968C273.458 287.392 299.518 331.26 340.892 354.804C379.637 376.854 369.891 435.592 325.87 443.723A257.936 257.936 0 0 1 279.135 448C137.775 448 23.135 333.425 23.135 192C23.135 50.64 137.711 -64 279.135 -64zM279.135 400C292.12 400 304.824 398.799 317.151 396.522C262.391 365.359 225.4580000000001 306.48 225.4580000000001 238.968C225.4580000000001 125.12 329.0990000000001 39.768 440.7100000000001 61.024C402.574 14.036 344.366 -16 279.135 -16C164.26 -16 71.135 77.125 71.135 192S164.26 400 279.135 400z" />
+    <glyph glyph-name="newspaper"
+      unicode="&#xF1EA;"
+      horiz-adv-x="576" d=" M552 384H112C91.142 384 73.357 370.623 66.752 352H24C10.745 352 0 341.255 0 328V56C0 25.072 25.072 0 56 0H552C565.255 0 576 10.745 576 24V360C576 373.255 565.255 384 552 384zM48 56V304H64V56C64 51.589 60.411 48 56 48S48 51.589 48 56zM528 48H111.422C111.796 50.614 112 53.283 112 56V336H528V48zM172 168H308C314.627 168 320 173.373 320 180V276C320 282.627 314.627 288 308 288H172C165.373 288 160 282.627 160 276V180C160 173.373 165.373 168 172 168zM200 248H280V208H200V248zM160 108V132C160 138.627 165.373 144 172 144H308C314.627 144 320 138.627 320 132V108C320 101.373 314.627 96 308 96H172C165.373 96 160 101.373 160 108zM352 108V132C352 138.627 357.373 144 364 144H468C474.627 144 480 138.627 480 132V108C480 101.373 474.627 96 468 96H364C357.373 96 352 101.373 352 108zM352 252V276C352 282.627 357.373 288 364 288H468C474.627 288 480 282.627 480 276V252C480 245.373 474.627 240 468 240H364C357.373 240 352 245.373 352 252zM352 180V204C352 210.627 357.373 216 364 216H468C474.627 216 480 210.627 480 204V180C480 173.373 474.627 168 468 168H364C357.373 168 352 173.373 352 180z" />
+    <glyph glyph-name="object-group"
+      unicode="&#xF247;"
+      horiz-adv-x="512" d=" M500 320C506.627 320 512 325.373 512 332V404C512 410.627 506.627 416 500 416H428C421.373 416 416 410.627 416 404V392H96V404C96 410.627 90.627 416 84 416H12C5.373 416 0 410.627 0 404V332C0 325.373 5.373 320 12 320H24V64H12C5.373 64 0 58.627 0 52V-20C0 -26.627 5.373 -32 12 -32H84C90.627 -32 96 -26.627 96 -20V-8H416V-20C416 -26.627 421.373 -32 428 -32H500C506.627 -32 512 -26.627 512 -20V52C512 58.627 506.627 64 500 64H488V320H500zM448 384H480V352H448V384zM32 384H64V352H32V384zM64 0H32V32H64V0zM480 0H448V32H480V0zM440 64H428C421.373 64 416 58.627 416 52V40H96V52C96 58.627 90.627 64 84 64H72V320H84C90.627 320 96 325.373 96 332V344H416V332C416 325.373 421.373 320 428 320H440V64zM404 256H320V308C320 314.628 314.627 320 308 320H108C101.373 320 96 314.628 96 308V140C96 133.372 101.373 128 108 128H192V76C192 69.372 197.373 64 204 64H404C410.627 64 416 69.372 416 76V244C416 250.628 410.627 256 404 256zM136 280H280V168H136V280zM376 104H232V128H308C314.627 128 320 133.372 320 140V216H376V104z" />
+    <glyph glyph-name="object-ungroup"
+      unicode="&#xF248;"
+      horiz-adv-x="576" d=" M564 224C570.627 224 576 229.373 576 236V308C576 314.627 570.627 320 564 320H492C485.373 320 480 314.627 480 308V296H392V320H404C410.627 320 416 325.373 416 332V404C416 410.627 410.627 416 404 416H332C325.373 416 320 410.627 320 404V392H96V404C96 410.627 90.627 416 84 416H12C5.373 416 0 410.627 0 404V332C0 325.373 5.373 320 12 320H24V160H12C5.373 160 0 154.627 0 148V76C0 69.373 5.373 64 12 64H84C90.627 64 96 69.373 96 76V88H184V64H172C165.373 64 160 58.627 160 52V-20C160 -26.627 165.373 -32 172 -32H244C250.627 -32 256 -26.627 256 -20V-8H480V-20C480 -26.627 485.373 -32 492 -32H564C570.627 -32 576 -26.627 576 -20V52C576 58.627 570.627 64 564 64H552V224H564zM352 384H384V352H352V384zM352 128H384V96H352V128zM64 96H32V128H64V96zM64 352H32V384H64V352zM96 136V148C96 154.627 90.627 160 84 160H72V320H84C90.627 320 96 325.373 96 332V344H320V332C320 325.373 325.373 320 332 320H344V160H332C325.373 160 320 154.627 320 148V136H96zM224 0H192V32H224V0zM504 64H492C485.373 64 480 58.627 480 52V40H256V52C256 58.627 250.627 64 244 64H232V88H320V76C320 69.373 325.373 64 332 64H404C410.627 64 416 69.373 416 76V148C416 154.627 410.627 160 404 160H392V248H480V236C480 229.373 485.373 224 492 224H504V64zM544 0H512V32H544V0zM544 256H512V288H544V256z" />
+    <glyph glyph-name="paper-plane"
+      unicode="&#xF1D8;"
+      horiz-adv-x="512" d=" M440 441.5L24 201.6C-10.4 181.7 -7.1 130.8 29.7 115.7L144 68.4V-16C144 -62.4 203.2 -81.5 230.6 -44.6L274.4 14.5L386.3 -31.7C392.2 -34.1 398.4 -35.3 404.6 -35.3C412.8 -35.3 420.9 -33.2 428.2 -29.1C441 -21.9 449.8 -9.1 452.1 5.4L511.4999999999999 392.6C517.5999999999999 432.7 474.6 461.4 440 441.5zM192 -16V48.6L228.6 33.5L192 -16zM404.6 12.7L250.8 76.2L391 278.5C401.7 294 381.5 312 367.3 299.7L155.8 115.4L48 160L464 400L404.6 12.7z" />
+    <glyph glyph-name="pause-circle"
+      unicode="&#xF28B;"
+      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM256 -8C145.5 -8 56 81.5 56 192S145.5 392 256 392S456 302.5 456 192S366.5 -8 256 -8zM352 272V112C352 103.2 344.8 96 336 96H288C279.2 96 272 103.2 272 112V272C272 280.8 279.2 288 288 288H336C344.8 288 352 280.8 352 272zM240 272V112C240 103.2 232.8 96 224 96H176C167.2 96 160 103.2 160 112V272C160 280.8 167.2 288 176 288H224C232.8 288 240 280.8 240 272z" />
+    <glyph glyph-name="play-circle"
+      unicode="&#xF144;"
+      horiz-adv-x="512" d=" M371.7 210L195.7 317C179.9 325.8 160 314.5 160 296V88C160 69.6 179.8 58.2 195.7 67L371.7 168C388.1 177.1 388.1 200.8 371.7 210zM504 192C504 329 393 440 256 440S8 329 8 192S119 -56 256 -56S504 55 504 192zM56 192C56 302.5 145.5 392 256 392S456 302.5 456 192S366.5 -8 256 -8S56 81.5 56 192z" />
+    <glyph glyph-name="plus-square"
+      unicode="&#xF0FE;"
+      horiz-adv-x="448" d=" M352 208V176C352 169.4 346.6 164 340 164H252V76C252 69.4 246.6 64 240 64H208C201.4 64 196 69.4 196 76V164H108C101.4 164 96 169.4 96 176V208C96 214.6 101.4 220 108 220H196V308C196 314.6 201.4 320 208 320H240C246.6 320 252 314.6 252 308V220H340C346.6 220 352 214.6 352 208zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM400 22V362C400 365.3 397.3 368 394 368H54C50.7 368 48 365.3 48 362V22C48 18.7 50.7 16 54 16H394C397.3 16 400 18.7 400 22z" />
+    <glyph glyph-name="question-circle"
+      unicode="&#xF059;"
+      horiz-adv-x="512" d=" M256 440C119.043 440 8 328.9170000000001 8 192C8 55.003 119.043 -56 256 -56S504 55.003 504 192C504 328.9170000000001 392.957 440 256 440zM256 -8C145.468 -8 56 81.431 56 192C56 302.495 145.472 392 256 392C366.491 392 456 302.529 456 192C456 81.47 366.569 -8 256 -8zM363.2440000000001 247.2C363.2440000000001 180.148 290.8230000000001 179.116 290.8230000000001 154.337V148C290.8230000000001 141.373 285.4500000000001 136 278.8230000000001 136H233.1760000000001C226.5490000000001 136 221.1760000000001 141.373 221.1760000000001 148V156.659C221.1760000000001 192.404 248.2760000000001 206.693 268.7550000000001 218.175C286.3160000000001 228.02 297.0790000000001 234.716 297.0790000000001 247.754C297.0790000000001 265 275.0800000000001 276.447 257.2950000000001 276.447C234.1060000000001 276.447 223.4010000000001 265.4700000000001 208.3530000000001 246.478C204.2960000000001 241.358 196.8930000000001 240.407 191.6870000000001 244.354L163.8630000000001 265.452C158.7560000000001 269.324 157.6120000000001 276.5180000000001 161.2190000000001 281.815C184.846 316.509 214.94 336 261.794 336C310.865 336 363.244 297.6960000000001 363.244 247.2zM298 80C298 56.841 279.159 38 256 38S214 56.841 214 80S232.841 122 256 122S298 103.159 298 80z" />
+    <glyph glyph-name="registered"
+      unicode="&#xF25D;"
+      horiz-adv-x="512" d=" M256 440C119.033 440 8 328.967 8 192S119.033 -56 256 -56S504 55.033 504 192S392.967 440 256 440zM256 -8C145.468 -8 56 81.451 56 192C56 302.531 145.451 392 256 392C366.532 392 456 302.549 456 192C456 81.468 366.549 -8 256 -8zM366.442 73.791C313.396 170.075 316.192 165.259 313.171 169.876C337.438 183.755 352.653 211.439 352.653 243.052C352.653 295.555 322.406 328.304 251.1550000000001 328.304H172.488C165.8710000000001 328.304 160.488 322.921 160.488 316.304V68C160.488 61.383 165.8710000000001 56 172.488 56H211.0560000000001C217.673 56 223.0560000000001 61.383 223.0560000000001 68V151.663H255.0140000000001L302.5290000000001 62.36A11.98 11.98 0 0 1 313.1220000000001 56H355.9320000000001C365.0720000000001 56 370.8460000000001 65.799 366.4420000000001 73.791zM256.933 208.094H223.058V272.234H250.435C282.852 272.234 289.3640000000001 260.101 289.3640000000001 240.525C289.3630000000001 219.612 277.846 208.094 256.9330000000001 208.094z" />
+    <glyph glyph-name="save"
+      unicode="&#xF0C7;"
+      horiz-adv-x="448" d=" M433.941 318.059L350.059 401.9410000000001A48 48 0 0 1 316.118 416H48C21.49 416 0 394.51 0 368V16C0 -10.51 21.49 -32 48 -32H400C426.51 -32 448 -10.51 448 16V284.118A48 48 0 0 1 433.941 318.059zM272 368V288H144V368H272zM394 16H54A6 6 0 0 0 48 22V362A6 6 0 0 0 54 368H96V264C96 250.745 106.745 240 120 240H296C309.255 240 320 250.745 320 264V364.118L398.243 285.875A6 6 0 0 0 400 281.632V22A6 6 0 0 0 394 16zM224 216C175.477 216 136 176.523 136 128S175.477 40 224 40S312 79.477 312 128S272.523 216 224 216zM224 88C201.944 88 184 105.944 184 128S201.944 168 224 168S264 150.056 264 128S246.056 88 224 88z" />
+    <glyph glyph-name="share-square"
+      unicode="&#xF14D;"
+      horiz-adv-x="576" d=" M561.938 289.94L417.94 433.908C387.926 463.922 336 442.903 336 399.968V342.77C293.55 340.89 251.97 336.2200000000001 215.24 324.7800000000001C180.07 313.8300000000001 152.17 297.2000000000001 132.33 275.36C108.22 248.8 96 215.4 96 176.06C96 114.363 129.178 63.605 180.87 31.3C218.416 7.792 266.118 43.951 251.89 87.04C236.375 134.159 234.734 157.963 336 165.8V112C336 69.007 387.968 48.087 417.94 78.06L561.938 222.06C580.688 240.8 580.688 271.2 561.938 289.94zM384 112V215.84C255.309 213.918 166.492 192.65 206.31 72C176.79 90.45 144 123.92 144 176.06C144 285.394 273.14 295.007 384 295.91V400L528 256L384 112zM408.74 27.507A82.658 82.658 0 0 1 429.714 36.81C437.69 41.762 448 35.984 448 26.596V-16C448 -42.51 426.51 -64 400 -64H48C21.49 -64 0 -42.51 0 -16V336C0 362.51 21.49 384 48 384H180C186.627 384 192 378.627 192 372V367.514C192 362.597 189.013 358.145 184.431 356.362C170.729 351.031 158.035 344.825 146.381 337.777A12.138 12.138 0 0 0 140.101 336H54A6 6 0 0 1 48 330V-10A6 6 0 0 1 54 -16H394A6 6 0 0 1 400 -10V15.966C400 21.336 403.579 26.025 408.74 27.507z" />
+    <glyph glyph-name="smile"
+      unicode="&#xF118;"
+      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM332 135.4C311.2 110.4 280.5 96 248 96S184.8 110.3 164 135.4C155.5 145.6 140.4 146.9 130.2 138.5C120 130 118.7 114.9 127.1 104.7C157.1 68.7 201.2 48.1 248 48.1S338.9 68.7 368.9 104.7C377.4 114.9 376 130 365.8 138.5C355.6 146.9 340.5 145.6 332 135.4zM168 208C185.7 208 200 222.3 200 240S185.7 272 168 272S136 257.7 136 240S150.3 208 168 208zM328 208C345.7 208 360 222.3 360 240S345.7 272 328 272S296 257.7 296 240S310.3 208 328 208z" />
+    <glyph glyph-name="snowflake"
+      unicode="&#xF2DC;"
+      horiz-adv-x="448" d=" M438.237 92.073L371.663 130.613L431.111 140.94C436.957 142.315 441.72 146.123 444.569 151.07C447.0490000000001 155.377 448.075 160.548 447.093 165.721C444.983 176.836 434.4070000000001 183.76 423.4720000000001 181.188L338.0490000000001 150.073L255.914 192L338.05 233.926L423.473 202.811C434.409 200.239 444.985 207.163 447.094 218.278C449.205 229.393 442.048 240.487 431.113 243.059L371.665 253.386L438.238 291.926C447.778 297.449 450.853 310.018 445.105 320C439.357 329.982 426.965 333.596 417.425 328.074L350.851 289.534L371.656 346.3210000000001C374.902 357.103 368.898 368.863 358.243 372.589C347.589 376.314 336.3209999999999 370.592 333.075 359.81L317.2369999999999 270.075L244.8139999999999 228.149V312L314.3989999999999 370.621C322.0879999999999 378.831 321.3959999999999 391.4770000000001 312.8509999999999 398.866C304.3059999999999 406.257 291.1459999999999 405.589 283.4569999999999 397.38L244.8129999999999 350.92V428C244.8129999999999 439.046 235.4949999999999 448 223.9999999999999 448S203.1869999999999 439.046 203.1869999999999 428V350.92L164.5429999999999 397.38C156.8539999999999 405.5900000000001 143.6939999999999 406.256 135.1489999999999 398.866C126.6049999999999 391.477 125.9129999999999 378.831 133.6019999999999 370.621L203.187 312V228.147L130.764 270.073L114.926 359.809C111.679 370.591 100.411 376.313 89.757 372.588C79.101 368.863 73.098 357.102 76.344 346.32L97.149 289.533L30.576 328.073C21.036 333.596 8.643 329.981 2.896 319.999S0.223 297.448 9.763 291.925L76.337 253.385L16.888 243.057C5.953 240.485 -1.202 229.391 0.907 218.276C3.017 207.162 13.593 200.238 24.529 202.81L109.951 233.925L192.086 192L109.95 150.074L24.527 181.189C13.591 183.761 3.016 176.8370000000001 0.905 165.723C-1.204 154.61 5.951 143.514 16.886 140.942L76.335 130.614L9.761 92.074C0.223 86.551 -2.852 73.982 2.896 64S21.036 50.403 30.576 55.926L97.15 94.466L76.345 37.68C74.61 31.916 75.517 25.875 78.365 20.929C80.845 16.622 84.798 13.145 89.757 11.412C100.412 7.687 111.68 13.409 114.926 24.191L130.764 113.927L203.187 155.853V72L133.602 13.379C125.912 5.169 126.605 -7.476 135.149 -14.866C143.693 -22.254 156.854 -21.589 164.543 -13.379L203.187 33.081V-44C203.187 -55.046 212.505 -64 224 -64S244.813 -55.046 244.813 -44V33.081L283.457 -13.379C287.568 -17.768 293.2389999999999 -19.9999999999999 298.935 -19.9999999999999C303.8949999999999 -19.9999999999999 308.874 -18.3059999999999 312.851 -14.8659999999999C321.396 -7.4759999999999 322.088 5.1690000000001 314.399 13.3790000000001L244.813 72V155.853L317.236 113.927L333.074 24.191C336.32 13.409 347.588 7.687 358.242 11.412C368.8950000000001 15.138 374.901 26.8990000000001 371.654 37.6800000000001L350.849 94.467L417.423 55.927C426.963 50.404 439.356 54.019 445.103 64.001C450.852 73.982 447.778 86.5510000000001 438.237 92.073z" />
+    <glyph glyph-name="square"
+      unicode="&#xF0C8;"
+      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM394 16H54C50.7 16 48 18.7 48 22V362C48 365.3 50.7 368 54 368H394C397.3 368 400 365.3 400 362V22C400 18.7 397.3 16 394 16z" />
+    <glyph glyph-name="star-half"
+      unicode="&#xF089;"
+      horiz-adv-x="576" d=" M288 62.7L163.7 -2.7L187.4 135.6999999999999L86.8 233.7L225.8 253.8999999999999L288 379.8999999999999V448C276.6 448 265.2 442.1 259.3 430.2L194 297.8L47.9 276.6C21.7 272.8 11.2 240.5 30.2 222L135.9 119L110.9 -26.5C106.4 -52.6 133.9 -72.5 157.3 -60.2L288 8.4V62.7z" />
+    <glyph glyph-name="star"
+      unicode="&#xF005;"
+      horiz-adv-x="576" d=" M528.1 276.5L382 297.8L316.7 430.2C305 453.8 271.1 454.1 259.3 430.2L194 297.8L47.9 276.5C21.7 272.7 11.2 240.4 30.2 221.9L135.9 118.9L110.9 -26.6C106.4 -52.9 134.1 -72.6 157.3 -60.3L288 8.4L418.7 -60.3C441.9 -72.5 469.6 -52.9 465.1 -26.6L440.1 118.9L545.8 221.9C564.8 240.4 554.3 272.7 528.0999999999999 276.5zM388.6 135.7L412.3 -2.7L288 62.6L163.7 -2.7L187.4 135.7000000000001L86.8 233.7000000000001L225.8 253.9000000000001L288 379.9000000000001L350.2 253.9000000000001L489.2 233.7000000000001L388.6 135.7000000000001z" />
+    <glyph glyph-name="sticky-note"
+      unicode="&#xF249;"
+      horiz-adv-x="448" d=" M448 99.894V368C448 394.51 426.51 416 400 416H48C21.49 416 0 394.51 0 368V16.012C0 -10.498 21.49 -31.988 48 -31.988H316.118A48 48 0 0 1 350.059 -17.929L433.941 65.953A48 48 0 0 1 448 99.894zM320 19.894V96.012H396.118L320 19.894zM400 368V144.012H296C282.745 144.012 272 133.267 272 120.012V16.012H48V368H400z" />
+    <glyph glyph-name="stop-circle"
+      unicode="&#xF28D;"
+      horiz-adv-x="512" d=" M504 192C504 329 393 440 256 440S8 329 8 192S119 -56 256 -56S504 55 504 192zM56 192C56 302.5 145.5 392 256 392S456 302.5 456 192S366.5 -8 256 -8S56 81.5 56 192zM352 272V112C352 103.2 344.8 96 336 96H176C167.2 96 160 103.2 160 112V272C160 280.8 167.2 288 176 288H336C344.8 288 352 280.8 352 272z" />
+    <glyph glyph-name="sun"
+      unicode="&#xF185;"
+      horiz-adv-x="512" d=" M220.116 -39.936L199.903 9.489A3.9920000000000004 3.9920000000000004 0 0 1 194.095 11.3750000000001L148.691 -16.7289999999999C119.225 -34.9689999999999 82.396 -8.2099999999999 90.637 25.45L103.336 77.3150000000001A3.9930000000000003 3.9930000000000003 0 0 1 99.746 82.256L46.495 86.2070000000001C11.941 88.7690000000001 -2.137 132.0620000000001 24.321 154.4540000000001L65.08 188.95A3.9920000000000004 3.9920000000000004 0 0 1 65.08 195.056L24.32 229.553C-2.13 251.937 11.93 295.235 46.494 297.799L99.745 301.75A3.9930000000000003 3.9930000000000003 0 0 1 103.335 306.691L90.637 358.557C82.398 392.213 119.218 418.977 148.691 400.736L194.094 372.632A3.9930000000000003 3.9930000000000003 0 0 1 199.902 374.519L220.115 423.944C233.231 456.015 278.753 456.025 291.873 423.944L312.085 374.52A3.9939999999999998 3.9939999999999998 0 0 1 317.894 372.6330000000001L363.2970000000001 400.737C392.761 418.973 429.5940000000001 392.224 421.351 358.558L408.652 306.693A3.9950000000000006 3.9950000000000006 0 0 1 412.242 301.752L465.4929999999999 297.8010000000001C500.0459999999999 295.2380000000001 514.126 251.947 487.6679999999999 229.555L446.908 195.058A3.9930000000000003 3.9930000000000003 0 0 1 446.908 188.951L487.6679999999999 154.455C514.179 132.014 499.99 88.766 465.4929999999999 86.208L412.242 82.257A3.9930000000000003 3.9930000000000003 0 0 1 408.653 77.3149999999999L421.351 25.451C429.592 -8.207 392.7679999999999 -34.97 363.2969999999999 -16.729L317.8939999999999 11.3749999999999A3.9939999999999998 3.9939999999999998 0 0 1 312.0849999999999 9.4879999999999L291.8729999999999 -39.936C278.7139999999999 -72.114 233.1979999999999 -71.9290000000001 220.1159999999999 -39.936zM236.93 24.632L255.994 -21.984L275.058 24.631C285.366 49.831 315.836 59.697 338.95 45.39L381.772 18.883L369.796 67.802C363.321 94.246 382.176 120.141 409.283 122.151L459.509 125.877L421.065 158.413C400.283 176.004 400.318 208.034 421.066 225.593L459.508 258.129L409.283 261.856C382.132 263.871 363.333 289.8040000000001 369.795 316.2050000000001L381.773 365.124L338.95 338.617C315.799 324.29 285.347 334.217 275.058 359.377L255.994 405.992L236.93 359.375C226.625 334.177 196.152 324.3090000000001 173.039 338.615L130.216 365.123L142.193 316.2050000000001C148.667 289.759 129.812 263.867 102.705 261.855L52.481 258.129L90.924 225.592C111.706 208.004 111.671 175.973 90.924 158.414L52.48 125.877L102.706 122.151C129.857 120.137 148.656 94.204 142.193 67.802L130.216 18.883L173.039 45.39C196.227 59.7450000000001 226.661 49.742 236.93 24.6320000000001zM256 64C185.42 64 128 121.421 128 192C128 262.58 185.42 320 256 320C326.579 320 384 262.58 384 192C384 121.421 326.579 64 256 64zM256 272C211.888 272 176 236.112 176 192S211.888 112 256 112S336 147.888 336 192S300.112 272 256 272z" />
+    <glyph glyph-name="thumbs-down"
+      unicode="&#xF165;"
+      horiz-adv-x="512" d=" M466.27 222.69C470.944 245.337 467.134 267.228 457.28 285.68C460.238 309.548 453.259 334.245 439.94 352.67C438.986 408.577 404.117 448 327 448C320 448 312 447.99 304.78 447.99C201.195 447.99 168.997 408 128 408H117.155C111.515 412.975 104.113 416 96 416H32C14.327 416 0 401.673 0 384V144C0 126.327 14.327 112 32 112H96C107.842 112 118.175 118.438 123.708 128H130.76C149.906 111.047 176.773 67.347 199.52 44.6C213.187 30.9330000000001 209.673 -64 271.28 -64C328.86 -64 366.55 -32.064 366.55 40.73C366.55 59.14 362.62 74.46 357.7 87.27H394.18C442.782 87.27 479.9999999999999 128.835 479.9999999999999 172.85C479.9999999999999 192 475.04 207.84 466.2699999999999 222.69zM64 152C50.745 152 40 162.745 40 176S50.745 200 64 200S88 189.255 88 176S77.255 152 64 152zM394.18 135.27H290.19C290.19 97.45 318.55 79.9 318.55 40.73C318.55 16.98 318.55 -16.0000000000001 271.2800000000001 -16.0000000000001C252.3700000000001 2.91 261.8200000000001 50.18 233.4600000000001 78.54C206.9 105.11 167.28 176 138.92 176H128V362.17C181.611 362.17 228.001 399.99 299.64 399.99H337.46C372.972 399.99 398.28 382.87 390.58 334.0900000000001C405.78 325.93 417.08 297.65 404.52 276.52C426.101 256.136 423.219 225.455 409.73 210.9C419.18 210.9 432.09 191.99 432 173.09C431.91 154.18 415.29 135.2700000000001 394.18 135.2700000000001z" />
+    <glyph glyph-name="thumbs-up"
+      unicode="&#xF164;"
+      horiz-adv-x="512" d=" M466.27 161.31C475.04 176.16 480 192 480 211.15C480 255.165 442.782 296.73 394.18 296.73H357.7C362.62 309.54 366.55 324.86 366.55 343.27C366.55 416.064 328.86 448 271.28 448C209.673 448 213.187 353.067 199.52 339.4C176.773 316.653 149.905 272.953 130.76 256H32C14.327 256 0 241.673 0 224V-16C0 -33.673 14.327 -48 32 -48H96C110.893 -48 123.408 -37.826 126.978 -24.05C171.487 -25.051 202.038 -63.99 304.78 -63.99C312 -63.99 320 -64 327 -64C404.117 -64 438.986 -24.577 439.94 31.33C453.259 49.755 460.239 74.452 457.28 98.32C467.134 116.772 470.944 138.663 466.27 161.31zM404.52 107.48C417.08 86.35 405.78 58.0700000000001 390.58 49.91C398.28 1.13 372.972 -15.99 337.46 -15.99H299.64C228.001 -15.99 181.611 21.83 128 21.83V208H138.92C167.28 208 206.9 278.89 233.46 305.46C261.82 333.82 252.37 381.09 271.28 400C318.55 400 318.55 367.02 318.55 343.27C318.55 304.1 290.19 286.55 290.19 248.73H394.18C415.29 248.73 431.91 229.82 432 210.91C432.0899999999999 192.01 419.18 173.1 409.73 173.1C423.219 158.545 426.101 127.864 404.52 107.48zM88 16C88 2.745 77.255 -8 64 -8S40 2.745 40 16S50.745 40 64 40S88 29.255 88 16z" />
+    <glyph glyph-name="times-circle"
+      unicode="&#xF057;"
+      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM256 -8C145.5 -8 56 81.5 56 192S145.5 392 256 392S456 302.5 456 192S366.5 -8 256 -8zM357.8 254.2L295.6 192L357.8 129.8C362.5 125.1 362.5 117.5 357.8 112.8L335.2 90.2C330.5 85.5 322.9 85.5 318.2 90.2L256 152.4L193.8 90.2C189.1 85.5 181.5 85.5 176.8 90.2L154.2 112.8C149.5 117.5 149.5 125.1 154.2 129.8L216.4 192L154.2000000000001 254.2C149.5000000000001 258.9 149.5000000000001 266.5 154.2000000000001 271.2L176.8000000000001 293.8C181.5 298.5 189.1000000000001 298.5 193.8000000000001 293.8L256.0000000000001 231.6L318.2000000000001 293.8C322.9000000000001 298.5 330.5000000000001 298.5 335.2000000000001 293.8L357.8000000000001 271.2C362.5000000000001 266.5 362.5000000000001 258.9 357.8000000000001 254.2z" />
+    <glyph glyph-name="trash-alt"
+      unicode="&#xF2ED;"
+      horiz-adv-x="448" d=" M192 260V44C192 37.373 186.627 32 180 32H156C149.373 32 144 37.373 144 44V260C144 266.627 149.373 272 156 272H180C186.627 272 192 266.627 192 260zM292 272H268C261.373 272 256 266.627 256 260V44C256 37.373 261.373 32 268 32H292C298.627 32 304 37.373 304 44V260C304 266.627 298.627 272 292 272zM424 368C437.255 368 448 357.255 448 344V332C448 325.373 442.627 320 436 320H416V-16C416 -42.51 394.51 -64 368 -64H80C53.49 -64 32 -42.51 32 -16V320H12C5.373 320 0 325.373 0 332V344C0 357.255 10.745 368 24 368H98.411L132.429 424.6960000000001A48 48 0 0 0 173.589 448H274.412A48 48 0 0 0 315.572 424.6960000000001L349.589 368H424zM154.389 368H293.612L276.1600000000001 397.087A6 6 0 0 1 271.015 400H176.987A6 6 0 0 1 171.842 397.087L154.389 368zM368 320H80V-10A6 6 0 0 1 86 -16H362A6 6 0 0 1 368 -10V320z" />
+    <glyph glyph-name="user-circle"
+      unicode="&#xF2BD;"
+      horiz-adv-x="496" d=" M248 344C195 344 152 301 152 248S195 152 248 152S344 195 344 248S301 344 248 344zM248 200C221.5 200 200 221.5 200 248S221.5 296 248 296S296 274.5 296 248S274.5 200 248 200zM248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C198.3 -8 152.9 10.3 117.9 40.4C132.8 63.4 158.3 79 187.5 79.9C208.3 73.5 228.1 70.3 248 70.3S287.7 73.4 308.5 79.9C337.7 78.9 363.2 63.4 378.1 40.4C343.1 10.3 297.7000000000001 -8 248.0000000000001 -8zM410.7 76.1C386.3 107.5 348.6 128 305.6 128C295.4000000000001 128 279.6 118.4 248.0000000000001 118.4C216.5 118.4 200.6 128 190.4 128C147.5 128 109.8 107.5 85.3 76.1C61.9 108.8 48 148.8 48 192C48 302.3 137.7 392 248 392S448 302.3 448 192C448 148.8 434.1 108.8 410.7 76.1z" />
+    <glyph glyph-name="user"
+      unicode="&#xF007;"
+      horiz-adv-x="448" d=" M313.6 144C284.9000000000001 144 271.1 128 224 128C176.9 128 163.2000000000001 144 134.4 144C60.2 144 0 83.8 0 9.6V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V9.6C448 83.8 387.8 144 313.6 144zM400 -16H48V9.6C48 57.2000000000001 86.8 96 134.4 96C149 96 172.7 80 224 80C275.7 80 298.9 96 313.6 96C361.2000000000001 96 400 57.2 400 9.6V-16zM224 160C303.5 160 368 224.5 368 304S303.5 448 224 448S80 383.5 80 304S144.5 160 224 160zM224 400C276.9 400 320 356.9 320 304S276.9 208 224 208S128 251.1 128 304S171.1 400 224 400z" />
+    <glyph glyph-name="window-close"
+      unicode="&#xF410;"
+      horiz-adv-x="512" d=" M464 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H464C490.5 -32 512 -10.5 512 16V368C512 394.5 490.5 416 464 416zM464 22C464 18.7 461.3 16 458 16H54C50.7 16 48 18.7 48 22V362C48 365.3 50.7 368 54 368H458C461.3 368 464 365.3 464 362V22zM356.5 253.4L295.1 192L356.5 130.6C361.1 126 361.1 118.5 356.5 113.8L334.2 91.5C329.6 86.9 322.1 86.9 317.4 91.5L256 152.9L194.6 91.5C190 86.9 182.5 86.9 177.8 91.5L155.5 113.8C150.9 118.4 150.9 125.9 155.5 130.6L216.9 192L155.5 253.4000000000001C150.9 258 150.9 265.5 155.5 270.2000000000001L177.8 292.5000000000001C182.4 297.1 189.9 297.1 194.6 292.5000000000001L256 231.1000000000001L317.4 292.5000000000001C322 297.1 329.5 297.1 334.2 292.5000000000001L356.5 270.2000000000001C361.2 265.6 361.2 258.1 356.5 253.4000000000001z" />
+    <glyph glyph-name="window-maximize"
+      unicode="&#xF2D0;"
+      horiz-adv-x="512" d=" M464 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H464C490.5 -32 512 -10.5 512 16V368C512 394.5 490.5 416 464 416zM464 22C464 18.7 461.3 16 458 16H54C50.7 16 48 18.7 48 22V256H464V22z" />
+    <glyph glyph-name="window-minimize"
+      unicode="&#xF2D1;"
+      horiz-adv-x="512" d=" M480 -32H32C14.3 -32 0 -17.7 0 0S14.3 32 32 32H480C497.7 32 512 17.7 512 0S497.7 -32 480 -32z" />
+    <glyph glyph-name="window-restore"
+      unicode="&#xF2D2;"
+      horiz-adv-x="512" d=" M464 448H144C117.5 448 96 426.5 96 400V352H48C21.5 352 0 330.5 0 304V-16C0 -42.5 21.5 -64 48 -64H368C394.5 -64 416 -42.5 416 -16V32H464C490.5 32 512 53.5 512 80V400C512 426.5 490.5 448 464 448zM368 -16H48V192H368V-16zM464 80H416V304C416 330.5 394.5 352 368 352H144V400H464V80z" />
+  </font>
+</defs>
+</svg>
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-regular-400.ttf b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-regular-400.ttf
new file mode 100644
index 00000000000..b219a1f28d8
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-regular-400.ttf differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-regular-400.woff b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-regular-400.woff
new file mode 100644
index 00000000000..f6a39683f29
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-regular-400.woff differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-regular-400.woff2 b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-regular-400.woff2
new file mode 100644
index 00000000000..1fb1c388b53
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-regular-400.woff2 differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-solid-900.eot b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-solid-900.eot
new file mode 100644
index 00000000000..a32dc8aeba4
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-solid-900.eot differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-solid-900.svg b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-solid-900.svg
new file mode 100644
index 00000000000..94bb8f27bc7
--- /dev/null
+++ b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-solid-900.svg
@@ -0,0 +1,1896 @@
+<?xml version="1.0" standalone="no"?> 
+<!--
+Font Awesome Free 5.0.13 by @fontawesome - https://fontawesome.com
+License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+-->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<defs>
+  <font id="fontawesome-free" horiz-adv-x="640">
+    <font-face font-family="Font Awesome 5 Free"
+      units-per-em="512" ascent="448"
+      descent="64"
+      font-weight="900"
+      font-style="Solid" />
+    <missing-glyph horiz-adv-x="0" />
+    <glyph glyph-name="address-book"
+      unicode="&#xF2B9;"
+      horiz-adv-x="448" d=" M436 288C442.6 288 448 293.4 448 300V340C448 346.6 442.6 352 436 352H416V400C416 426.5 394.5 448 368 448H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H368C394.5 -64 416 -42.5 416 -16V32H436C442.6 32 448 37.4 448 44V84C448 90.6 442.6 96 436 96H416V160H436C442.6 160 448 165.4 448 172V212C448 218.6 442.6 224 436 224H416V288H436zM208 320C243.3 320 272 291.3 272 256S243.3 192 208 192S144 220.7 144 256S172.7 320 208 320zM320 83.2C320 72.6 310 64 297.6 64H118.4C106 64 96 72.6 96 83.2V102.4C96 134.2 126.1 160 163.2 160H168.2C180.5 154.9 193.9 152 208 152S235.6 154.9 247.8 160H252.8C289.9000000000001 160 320 134.2 320 102.4V83.2z" />
+    <glyph glyph-name="address-card"
+      unicode="&#xF2BB;"
+      horiz-adv-x="576" d=" M528 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H528C554.5 -32 576 -10.5 576 16V368C576 394.5 554.5 416 528 416zM176 320C211.3 320 240 291.3 240 256S211.3 192 176 192S112 220.7 112 256S140.7 320 176 320zM288 83.2C288 72.6 278 64 265.6 64H86.4C74 64 64 72.6 64 83.2V102.4C64 134.2 94.1 160 131.2 160H136.2C148.5 154.9 161.9 152 176 152S203.6 154.9 215.8 160H220.8C257.9000000000001 160 288 134.2 288 102.4V83.2zM512 136C512 131.6 508.4 128 504 128H360C355.6 128 352 131.6 352 136V152C352 156.4 355.6 160 360 160H504C508.4 160 512 156.4 512 152V136zM512 200C512 195.6 508.4 192 504 192H360C355.6 192 352 195.6 352 200V216C352 220.4 355.6 224 360 224H504C508.4 224 512 220.4 512 216V200zM512 264C512 259.6 508.4 256 504 256H360C355.6 256 352 259.6 352 264V280C352 284.4 355.6 288 360 288H504C508.4 288 512 284.4 512 280V264z" />
+    <glyph glyph-name="adjust"
+      unicode="&#xF042;"
+      horiz-adv-x="512" d=" M8 192C8 55.034 119.033 -56 256 -56S504 55.034 504 192S392.966 440 256 440S8 328.967 8 192zM256 8V376C357.705 376 440 293.689 440 192C440 90.295 357.689 8 256 8z" />
+    <glyph glyph-name="align-center"
+      unicode="&#xF037;"
+      horiz-adv-x="448" d=" M352 404V364C352 355.163 344.837 348 336 348H112C103.163 348 96 355.163 96 364V404C96 412.837 103.163 420 112 420H336C344.837 420 352 412.837 352 404zM16 220H432C440.837 220 448 227.163 448 236V276C448 284.837 440.837 292 432 292H16C7.163 292 0 284.837 0 276V236C0 227.163 7.163 220 16 220zM16 -36H432C440.837 -36 448 -28.837 448 -20V20C448 28.837 440.837 36 432 36H16C7.163 36 0 28.837 0 20V-20C0 -28.837 7.163 -36 16 -36zM336 164H112C103.163 164 96 156.837 96 148V108C96 99.163 103.163 92 112 92H336C344.837 92 352 99.163 352 108V148C352 156.837 344.837 164 336 164z" />
+    <glyph glyph-name="align-justify"
+      unicode="&#xF039;"
+      horiz-adv-x="448" d=" M0 364V404C0 412.837 7.163 420 16 420H432C440.837 420 448 412.837 448 404V364C448 355.163 440.837 348 432 348H16C7.163 348 0 355.163 0 364zM16 220H432C440.837 220 448 227.163 448 236V276C448 284.837 440.837 292 432 292H16C7.163 292 0 284.837 0 276V236C0 227.163 7.163 220 16 220zM16 -36H432C440.837 -36 448 -28.837 448 -20V20C448 28.837 440.837 36 432 36H16C7.163 36 0 28.837 0 20V-20C0 -28.837 7.163 -36 16 -36zM16 92H432C440.837 92 448 99.163 448 108V148C448 156.837 440.837 164 432 164H16C7.163 164 0 156.837 0 148V108C0 99.163 7.163 92 16 92z" />
+    <glyph glyph-name="align-left"
+      unicode="&#xF036;"
+      horiz-adv-x="448" d=" M288 404V364C288 355.163 280.837 348 272 348H16C7.163 348 0 355.163 0 364V404C0 412.837 7.163 420 16 420H272C280.837 420 288 412.837 288 404zM0 276V236C0 227.163 7.163 220 16 220H432C440.837 220 448 227.163 448 236V276C448 284.837 440.837 292 432 292H16C7.163 292 0 284.837 0 276zM16 -36H432C440.837 -36 448 -28.837 448 -20V20C448 28.837 440.837 36 432 36H16C7.163 36 0 28.837 0 20V-20C0 -28.837 7.163 -36 16 -36zM272 164H16C7.163 164 0 156.837 0 148V108C0 99.163 7.163 92 16 92H272C280.837 92 288 99.163 288 108V148C288 156.837 280.837 164 272 164z" />
+    <glyph glyph-name="align-right"
+      unicode="&#xF038;"
+      horiz-adv-x="448" d=" M160 364V404C160 412.837 167.163 420 176 420H432C440.837 420 448 412.837 448 404V364C448 355.163 440.837 348 432 348H176C167.163 348 160 355.163 160 364zM16 220H432C440.837 220 448 227.163 448 236V276C448 284.837 440.837 292 432 292H16C7.163 292 0 284.837 0 276V236C0 227.163 7.163 220 16 220zM16 -36H432C440.837 -36 448 -28.837 448 -20V20C448 28.837 440.837 36 432 36H16C7.163 36 0 28.837 0 20V-20C0 -28.837 7.163 -36 16 -36zM176 92H432C440.837 92 448 99.163 448 108V148C448 156.837 440.837 164 432 164H176C167.163 164 160 156.837 160 148V108C160 99.163 167.163 92 176 92z" />
+    <glyph glyph-name="allergies"
+      unicode="&#xF461;"
+      horiz-adv-x="448" d=" M416 336C398.4 336 384 321.6 384 304V232C384 227.6 380.4 224 376 224H360C355.6 224 352 227.6 352 232V384C352 401.6 337.6 416 320 416S288 401.6 288 384V232C288 227.6 284.4 224 280 224H264C259.6 224 256 227.6 256 232V416C256 433.6 241.6 448 224 448S192 433.6 192 416V232C192 227.6 188.4 224 184 224H168C163.6 224 160 227.6 160 232V384C160 401.6 145.6 416 128 416S96 401.6 96 384V143L72.4 175.5C59.4 193.4 34.4 197.3 16.5 184.3S-5.3 146.3 7.7 128.4L133.3 -44.3C142.3 -56.6999999999999 156.8 -64.0999999999999 172.1 -64.0999999999999H369.7000000000001C392.0000000000001 -64.0999999999999 411.3000000000001 -48.7999999999999 416.4000000000001 -27.0999999999999L442.9000000000001 85.6000000000001C446.1 99.3000000000001 447.8 113.9000000000001 448.0000000000001 127.9000000000001V304C448.0000000000001 321.6 433.6000000000001 336 416.0000000000001 336zM176 32C167.2 32 160 39.2 160 48S167.2 64 176 64S192 56.8 192 48S184.8 32 176 32zM176 128C167.2 128 160 135.2 160 144S167.2 160 176 160S192 152.8 192 144S184.8 128 176 128zM240 0C231.2 0 224 7.2 224 16S231.2 32 240 32S256 24.8 256 16S248.8 0 240 0zM240 96C231.2 96 224 103.2 224 112S231.2 128 240 128S256 120.8 256 112S248.8 96 240 96zM304 64C295.2 64 288 71.2 288 80S295.2 96 304 96S320 88.8 320 80S312.8 64 304 64zM336 0C327.2 0 320 7.2 320 16S327.2 32 336 32S352 24.8 352 16S344.8 0 336 0zM368 128C359.2 128 352 135.2 352 144S359.2 160 368 160S384 152.8 384 144S376.8 128 368 128z" />
+    <glyph glyph-name="ambulance"
+      unicode="&#xF0F9;"
+      horiz-adv-x="640" d=" M624 96H608V204.1C608 216.8 602.9 229 593.9 238L494 337.9C485 346.9 472.8 352 460.1 352H416V400C416 426.5 394.5 448 368 448H48C21.5 448 0 426.5 0 400V80C0 53.5 21.5 32 48 32H64C64 -21 107 -64 160 -64S256 -21 256 32H384C384 -21 427 -64 480 -64S576 -21 576 32H624C632.8 32 640 39.2 640 48V80C640 88.8 632.8 96 624 96zM160 -16C133.5 -16 112 5.5 112 32S133.5 80 160 80S208 58.5 208 32S186.5 -16 160 -16zM304 232C304 227.6 300.4 224 296 224H240V168C240 163.6 236.4 160 232 160H184C179.6 160 176 163.6 176 168V224H120C115.6 224 112 227.6 112 232V280C112 284.4 115.6 288 120 288H176V344C176 348.4 179.6 352 184 352H232C236.4 352 240 348.4 240 344V288H296C300.4 288 304 284.4 304 280V232zM480 -16C453.5 -16 432 5.5 432 32S453.5 80 480 80S528 58.5 528 32S506.5 -16 480 -16zM560 192H416V304H460.1L560 204.1V192z" />
+    <glyph glyph-name="american-sign-language-interpreting"
+      unicode="&#xF2A3;"
+      horiz-adv-x="640" d=" M290.5470000000001 258.961C270.252 269.11 246.4000000000001 270.1600000000001 225.808 262.851C268.4140000000001 262.851 297.016 242.376 311.386 212.275C319.9620000000001 194.376 306.238 174.204 287.769 174.204C306.198 174.204 319.98 154.068 311.386 136.1330000000001C296.661 105.287 265.2630000000001 85.2790000000001 231.088 85.2790000000001C230.5310000000001 85.2790000000001 136.617 93.8940000000001 136.617 93.8940000000001L70.211 60.5470000000001C60.827 55.8540000000001 50.396 60.1680000000001 46.316 68.3280000000001L1.86 157.253C-2.307 165.868 0.749 176.15 8.806 180.874L66.878 213.943L108 288.139C114.39 345.384 142.731 397.906 187.743 434.865C199.134 444.313 216.084 442.646 225.253 431.252C234.699 419.858 233.033 403.185 221.641 393.736C209.138 383.177 198.023 371.227 189.132 358.166C210.804 372.895 235.811 382.898 263.318 386.233C278.043 388.178 291.381 377.897 293.048 363.168C294.993 348.44 284.712 335.101 269.986 333.434C253.87 331.4890000000001 238.866 325.931 225.808 318.15C251.922 323.863 284.52 321.288 313.887 307.035C327.223 300.366 332.78 284.526 326.111 271.187C319.722 258.127 303.607 252.57 290.547 258.961zM263.3180000000001 189.489C257.206 201.994 244.9800000000001 209.775 231.0870000000001 209.775A35.46 35.46 0 0 1 195.5220000000001 174.2050000000001C195.5220000000001 152.7770000000001 213.3300000000001 138.6350000000001 231.0870000000001 138.6350000000001C244.9800000000001 138.6350000000001 257.206 146.4160000000001 263.3180000000001 158.9210000000001C267.7640000000001 168.3700000000001 276.932 173.927 286.6570000000001 174.2050000000001C276.932 174.482 267.764 180.04 263.3180000000001 189.489zM638.1390000000001 226.7260000000001C642.3070000000001 218.111 639.2500000000001 207.829 631.1930000000001 203.105L573.1220000000001 170.036L532 95.84C525.61 38.595 497.269 -13.927 452.257 -50.886C441.325 -59.998 424.4580000000001 -59.03 414.747 -47.273C405.301 -35.879 406.9670000000001 -19.206 418.36 -9.757C430.863 0.802 441.9770000000001 12.752 450.868 25.813C429.196 11.084 404.189 1.081 376.682 -2.254C366.661 -4.76 349.13 3.389 346.952 20.811C345.007 35.539 355.288 48.878 370.014 50.545C386.13 52.491 401.134 58.048 414.192 65.829C388.0780000000001 60.1159999999999 355.48 62.691 326.113 76.944C312.777 83.6129999999999 307.2200000000001 99.453 313.889 112.792C320.278 125.853 336.394 131.411 349.454 125.019C369.749 114.87 393.601 113.8199999999999 414.193 121.129C371.587 121.129 342.985 141.604 328.615 171.705C320.039 189.604 333.7630000000001 209.776 352.2320000000001 209.776C333.8030000000001 209.776 320.021 229.912 328.615 247.847C342.648 277.243 372.654 298.734 410.581 298.701L503.384 290.086L569.79 323.433C579.198 328.137 589.6179999999999 323.787 593.684 315.652L638.139 226.726zM408.9120000000002 245.344C395.0190000000001 245.344 382.7930000000001 237.563 376.6810000000002 225.058C372.2350000000002 215.609 363.0670000000002 210.052 353.3420000000002 209.774C363.0670000000002 209.4960000000001 372.2350000000002 203.938 376.6810000000002 194.4900000000001C382.7930000000002 181.985 395.0190000000002 174.2040000000001 408.9120000000002 174.2040000000001A35.46 35.46 0 0 1 444.4770000000002 209.7740000000001C444.4770000000002 231.2030000000001 426.6690000000002 245.3440000000001 408.9120000000002 245.3440000000001z" />
+    <glyph glyph-name="anchor"
+      unicode="&#xF13D;"
+      horiz-adv-x="576" d=" M12.971 96H45.365C67.172 -6.735 181.944 -64 288 -64C394.229 -64 508.853 -6.62 530.635 96H563.029C573.72 96 579.074 108.926 571.514 116.485L504.485 183.514C499.799 188.2 492.201 188.2 487.514 183.514L420.485 116.485C412.925 108.925 418.279 96 428.9700000000001 96H464.116C443.826 41.683 379.153 9.412 319.999 1.985V192H371.999C378.6260000000001 192 383.999 197.373 383.999 204V244C383.999 250.627 378.6260000000001 256 371.999 256H319.999V261.4700000000001C357.2800000000001 274.648 383.9940000000001 310.195 383.999 351.988C384.005 404.228 341.605 447.262 289.37 447.99C235.723 448.739 192 405.475 192 352C192 310.202 218.716 274.65 256 261.4700000000001V256H204C197.373 256 192 250.627 192 244V204C192 197.373 197.373 192 204 192H256V1.985C197.064 9.384 132.18 41.664 111.883 96H147.029C157.72 96 163.074 108.926 155.514 116.485L88.485 183.514C83.799 188.2 76.201 188.2 71.514 183.514L4.485 116.485C-3.074 108.926 2.28 96 12.971 96zM288 384C305.645 384 320 369.645 320 352S305.645 320 288 320S256 334.355 256 352S270.355 384 288 384z" />
+    <glyph glyph-name="angle-double-down"
+      unicode="&#xF103;"
+      horiz-adv-x="320" d=" M143 191.7L7 327.7C-2.4 337.1 -2.4 352.3 7 361.6L29.6 384.2C39 393.6 54.2 393.6 63.5 384.2L159.9 287.8L256.3 384.2C265.7 393.6 280.9000000000001 393.6 290.2 384.2L313 361.7C322.4 352.3 322.4 337.1 313 327.8L177 191.8C167.6 182.3 152.4 182.3 143 191.7zM177 -0.3L313 135.7C322.4 145.1 322.4 160.3 313 169.6L290.4 192.2C281 201.6 265.8 201.6 256.5 192.2L160 95.9L63.6 192.3C54.2 201.7 39 201.7 29.7 192.3L7 169.7C-2.4 160.3 -2.4 145.1 7 135.8L143 -0.2C152.4 -9.7 167.6 -9.7 177 -0.3z" />
+    <glyph glyph-name="angle-double-left"
+      unicode="&#xF100;"
+      horiz-adv-x="448" d=" M223.7 209L359.7 345C369.1 354.4 384.3 354.4 393.6 345L416.2 322.4C425.6 313 425.6 297.8 416.2 288.5L319.9 192L416.3 95.6C425.7 86.2000000000001 425.7 71 416.3 61.7000000000001L393.7 39C384.3 29.6 369.1 29.6 359.8 39L223.8 175C214.3 184.4 214.3 199.6 223.7 209zM31.7 175L167.7 39C177.1 29.6 192.3 29.6 201.6 39L224.2 61.6C233.6 71 233.6 86.2000000000001 224.2 95.5L127.9 192L224.3 288.4C233.7 297.8 233.7 313 224.3 322.3L201.7 345C192.3 354.4 177.1 354.4 167.8 345L31.8 209C22.3 199.6 22.3 184.4 31.7 175z" />
+    <glyph glyph-name="angle-double-right"
+      unicode="&#xF101;"
+      horiz-adv-x="448" d=" M224.3 175L88.3 39C78.9 29.6 63.7 29.6 54.4 39L31.8 61.6C22.4 71 22.4 86.2000000000001 31.8 95.5L128.2 191.9L31.8 288.3C22.4 297.7 22.4 312.9 31.8 322.2L54.3 345C63.7 354.4 78.9 354.4 88.2 345L224.2 209C233.7 199.6 233.7 184.4 224.3 175zM416.3 209L280.3 345C270.9000000000001 354.4 255.7 354.4 246.4 345L223.8 322.4C214.4 313 214.4 297.8 223.8 288.5L320.2000000000001 192.1L223.8000000000001 95.7C214.4 86.3 214.4 71.1 223.8000000000001 61.8L246.4000000000001 39.2C255.8000000000001 29.8 271.0000000000001 29.8 280.3 39.2L416.3 175.2C425.7 184.4 425.7 199.6 416.3 209z" />
+    <glyph glyph-name="angle-double-up"
+      unicode="&#xF102;"
+      horiz-adv-x="320" d=" M177 192.3L313 56.3C322.4 46.9 322.4 31.7 313 22.4L290.4 -0.2C281 -9.6 265.8 -9.6 256.5 -0.2L160 96.1L63.6 -0.3C54.2 -9.6999999999999 39 -9.6999999999999 29.7 -0.3L7 22.3C-2.4 31.7 -2.4 46.9 7 56.2L143 192.2C152.4 201.7 167.6 201.7 177 192.3zM143 384.3L7 248.3C-2.4 238.9 -2.4 223.7 7 214.4L29.6 191.8C39 182.4 54.2 182.4 63.5 191.8L159.9 288.2000000000001L256.3 191.8C265.7 182.4 280.9000000000001 182.4 290.2 191.8L312.8 214.4C322.2 223.8 322.2 239 312.8 248.3L176.8 384.3C167.6 393.7 152.4 393.7 143 384.3z" />
+    <glyph glyph-name="angle-down"
+      unicode="&#xF107;"
+      horiz-adv-x="320" d=" M143 95.7L7 231.7C-2.4 241.1 -2.4 256.3 7 265.6L29.6 288.2C39 297.6 54.2 297.6 63.5 288.2L159.9 191.8L256.3 288.2C265.7 297.6 280.9000000000001 297.6 290.2 288.2L312.8 265.6C322.2 256.2 322.2 241 312.8 231.7L176.8 95.6999999999999C167.6 86.3 152.4 86.3 143 95.6999999999999z" />
+    <glyph glyph-name="angle-left"
+      unicode="&#xF104;"
+      horiz-adv-x="256" d=" M31.7 209L167.7 345C177.1 354.4 192.3 354.4 201.6 345L224.2 322.4C233.6 313 233.6 297.8 224.2 288.5L127.9 192L224.3 95.6C233.7 86.2000000000001 233.7 71 224.3 61.7000000000001L201.7 39C192.3 29.6 177.1 29.6 167.8 39L31.8 175C22.3 184.4 22.3 199.6 31.7 209z" />
+    <glyph glyph-name="angle-right"
+      unicode="&#xF105;"
+      horiz-adv-x="256" d=" M224.3 175L88.3 39C78.9 29.6 63.7 29.6 54.4 39L31.8 61.6C22.4 71 22.4 86.2000000000001 31.8 95.5L128.2 191.9L31.8 288.3C22.4 297.7 22.4 312.9 31.8 322.2L54.3 345C63.7 354.4 78.9 354.4 88.2 345L224.2 209C233.7 199.6 233.7 184.4 224.3 175z" />
+    <glyph glyph-name="angle-up"
+      unicode="&#xF106;"
+      horiz-adv-x="320" d=" M177 288.3L313 152.3C322.4 142.9 322.4 127.7 313 118.4L290.4 95.8C281 86.4 265.8 86.4 256.5 95.8L160 192.1L63.6 95.7C54.2 86.3 39 86.3 29.7 95.7L7 118.3C-2.4 127.7 -2.4 142.9 7 152.2L143 288.2C152.4 297.7 167.6 297.7 177 288.3z" />
+    <glyph glyph-name="archive"
+      unicode="&#xF187;"
+      horiz-adv-x="512" d=" M32 0C32 -17.7 46.3 -32 64 -32H448C465.7 -32 480 -17.7 480 0V288H32V0zM192 212C192 218.6 197.4 224 204 224H308C314.6 224 320 218.6 320 212V204C320 197.4 314.6 192 308 192H204C197.4 192 192 197.4 192 204V212zM480 416H32C14.3 416 0 401.7 0 384V336C0 327.2 7.2 320 16 320H496C504.8 320 512 327.2 512 336V384C512 401.7 497.7 416 480 416z" />
+    <glyph glyph-name="arrow-alt-circle-down"
+      unicode="&#xF358;"
+      horiz-adv-x="512" d=" M504 192C504 55 393 -56 256 -56S8 55 8 192S119 440 256 440S504 329 504 192zM212 308V192H141.1C130.4 192 125 179 132.6 171.5L247.5 57.2C252.2 52.5 259.7 52.5 264.4 57.2L379.3 171.5C386.9 179.1 381.5 192 370.8 192H300V308C300 314.6 294.6 320 288 320H224C217.4 320 212 314.6 212 308z" />
+    <glyph glyph-name="arrow-alt-circle-left"
+      unicode="&#xF359;"
+      horiz-adv-x="512" d=" M256 -56C119 -56 8 55 8 192S119 440 256 440S504 329 504 192S393 -56 256 -56zM372 236H256V306.9C256 317.6 243 323 235.5 315.4L121.2 200.5C116.5 195.8 116.5 188.3 121.2 183.6L235.5 68.7000000000001C243.1 61.1 256 66.5000000000001 256 77.2000000000001V148H372C378.6 148 384 153.4 384 160V224C384 230.6 378.6 236 372 236z" />
+    <glyph glyph-name="arrow-alt-circle-right"
+      unicode="&#xF35A;"
+      horiz-adv-x="512" d=" M256 440C393 440 504 329 504 192S393 -56 256 -56S8 55 8 192S119 440 256 440zM140 148H256V77.1C256 66.4 269 61 276.5 68.6L390.8 183.5C395.5 188.2 395.5 195.7 390.8 200.4L276.5 315.4C268.9 323 256 317.6 256 306.9V236H140C133.4 236 128 230.6 128 224V160C128 153.4 133.4 148 140 148z" />
+    <glyph glyph-name="arrow-alt-circle-up"
+      unicode="&#xF35B;"
+      horiz-adv-x="512" d=" M8 192C8 329 119 440 256 440S504 329 504 192S393 -56 256 -56S8 55 8 192zM300 76V192H370.9C381.6 192 387 205 379.4 212.5L264.5 326.8C259.8 331.5 252.3 331.5 247.6 326.8L132.6 212.5C125 204.9 130.4 192 141.1 192H212V76C212 69.4 217.4 64 224 64H288C294.6 64 300 69.4 300 76z" />
+    <glyph glyph-name="arrow-circle-down"
+      unicode="&#xF0AB;"
+      horiz-adv-x="512" d=" M504 192C504 55 393 -56 256 -56S8 55 8 192S119 440 256 440S504 329 504 192zM360.4 220.9L288 145.4V328C288 341.3 277.3 352 264 352H248C234.7 352 224 341.3 224 328V145.4L151.6 220.9C142.3 230.6 126.8 230.8 117.3 221.3L106.4 210.3C97 200.9 97 185.7 106.4 176.4L239 43.7C248.4 34.3 263.6 34.3 272.9 43.7L405.6 176.4C415 185.8 415 201 405.6 210.3L394.7 221.3C385.2 230.8 369.7 230.6 360.4 220.9z" />
+    <glyph glyph-name="arrow-circle-left"
+      unicode="&#xF0A8;"
+      horiz-adv-x="512" d=" M256 -56C119 -56 8 55 8 192S119 440 256 440S504 329 504 192S393 -56 256 -56zM284.9 87.6L209.4 160H392C405.3 160 416 170.7 416 184V200C416 213.3 405.3 224 392 224H209.4L284.9 296.4C294.6 305.7000000000001 294.8 321.2 285.3 330.7L274.3 341.6C264.9 351 249.7 351 240.4 341.6L107.7 209C98.3 199.6 98.3 184.4 107.7 175.1L240.4 42.4C249.8 33.0000000000001 265 33.0000000000001 274.3 42.4L285.3 53.3C294.8 62.8 294.6 78.3 284.9 87.6z" />
+    <glyph glyph-name="arrow-circle-right"
+      unicode="&#xF0A9;"
+      horiz-adv-x="512" d=" M256 440C393 440 504 329 504 192S393 -56 256 -56S8 55 8 192S119 440 256 440zM227.1 296.4L302.6 224H120C106.7 224 96 213.3 96 200V184C96 170.7 106.7 160 120 160H302.6L227.1 87.6C217.4 78.3 217.2 62.8 226.7 53.3L237.7 42.4C247.1 33.0000000000001 262.3 33.0000000000001 271.6 42.4L404.3 175C413.7 184.4 413.7 199.6 404.3 208.9L271.6 341.7C262.2000000000001 351.1 247.0000000000001 351.1 237.7 341.7L226.7 330.8C217.2 321.2 217.4 305.7 227.1 296.4z" />
+    <glyph glyph-name="arrow-circle-up"
+      unicode="&#xF0AA;"
+      horiz-adv-x="512" d=" M8 192C8 329 119 440 256 440S504 329 504 192S393 -56 256 -56S8 55 8 192zM151.6 163.1L224 238.6V56C224 42.7 234.7 32 248 32H264C277.3 32 288 42.7 288 56V238.6L360.4 163.1C369.7 153.4 385.2 153.2000000000001 394.7 162.7000000000001L405.6 173.7000000000001C415 183.1 415 198.3000000000001 405.6 207.6000000000001L273 340.3C263.6 349.7 248.4 349.7 239.1 340.3L106.3 207.6C96.9 198.2 96.9 183 106.3 173.7L117.2 162.7C126.8 153.2 142.3 153.4 151.6 163.1z" />
+    <glyph glyph-name="arrow-down"
+      unicode="&#xF063;"
+      horiz-adv-x="448" d=" M413.1 225.5L435.3 203.3C444.7 193.9 444.7 178.7 435.3 169.4L241 -25C231.6 -34.4 216.4 -34.4 207.1 -25L12.7 169.4C3.3 178.8 3.3 194 12.7 203.3L34.9 225.5C44.4 235 59.9 234.8 69.2 225.1L184 104.6V392C184 405.3 194.7 416 208 416H240C253.3 416 264 405.3 264 392V104.6L378.8 225.1C388.1 234.9000000000001 403.6 235.1 413.1 225.5000000000001z" />
+    <glyph glyph-name="arrow-left"
+      unicode="&#xF060;"
+      horiz-adv-x="448" d=" M257.5 2.9L235.3 -19.3C225.9 -28.7 210.7 -28.7 201.4 -19.3L7 175C-2.4 184.4 -2.4 199.6 7 208.9L201.4 403.3C210.8 412.7 226 412.7 235.3 403.3L257.5 381.1C267 371.6 266.8 356.1 257.1 346.8L136.6 232H424C437.3 232 448 221.3 448 208V176C448 162.7 437.3 152 424 152H136.6L257.1 37.2C266.9000000000001 27.9 267.1 12.4 257.5 2.9z" />
+    <glyph glyph-name="arrow-right"
+      unicode="&#xF061;"
+      horiz-adv-x="448" d=" M190.5 381.1L212.7 403.3C222.1 412.7 237.3 412.7 246.6 403.3L441 209C450.4 199.6 450.4 184.4 441 175.1L246.6 -19.3C237.2 -28.7 222 -28.7 212.7 -19.3L190.5 2.9C181 12.4 181.2 27.9 190.9 37.2L311.4 152H24C10.7 152 0 162.7 0 176V208C0 221.3 10.7 232 24 232H311.4L190.9 346.8C181.1 356.1 180.9 371.6 190.5 381.1z" />
+    <glyph glyph-name="arrow-up"
+      unicode="&#xF062;"
+      horiz-adv-x="448" d=" M34.9 158.5L12.7 180.7C3.3 190.1 3.3 205.3 12.7 214.6L207 409C216.4 418.4 231.6 418.4 240.9 409L435.2000000000001 214.7C444.6 205.3 444.6 190.1 435.2000000000001 180.8L413 158.6C403.5 149.1 388 149.3 378.7 159L264 279.4V-8C264 -21.3 253.3 -32 240 -32H208C194.7 -32 184 -21.3 184 -8V279.4L69.2 158.9C59.9 149.1 44.4 148.9 34.9 158.5z" />
+    <glyph glyph-name="arrows-alt-h"
+      unicode="&#xF337;"
+      horiz-adv-x="512" d=" M377.941 278.059V232H134.059V278.059C134.059 299.4410000000001 108.208 310.149 93.088 295.03L7.029 208.971C-2.344 199.598 -2.344 184.403 7.029 175.03L93.088 88.971C108.207 73.852 134.059 84.56 134.059 105.942V152H377.9410000000001V105.941C377.9410000000001 84.559 403.7920000000001 73.851 418.9120000000001 88.97L504.971 175.029C514.344 184.402 514.344 199.597 504.971 208.97L418.9120000000001 295.029C403.793 310.149 377.9410000000001 299.4410000000001 377.9410000000001 278.059z" />
+    <glyph glyph-name="arrows-alt-v"
+      unicode="&#xF338;"
+      horiz-adv-x="256" d=" M214.059 70.059H168V313.9410000000001H214.059C235.441 313.9410000000001 246.149 339.7920000000001 231.03 354.9120000000001L144.971 440.971C135.598 450.344 120.403 450.344 111.03 440.971L24.971 354.9120000000001C9.852 339.793 20.56 313.9410000000001 41.942 313.9410000000001H88V70.059H41.941C20.559 70.059 9.851 44.208 24.97 29.088L111.029 -56.971C120.402 -66.344 135.597 -66.344 144.97 -56.971L231.029 29.088C246.149 44.207 235.441 70.059 214.059 70.059z" />
+    <glyph glyph-name="arrows-alt"
+      unicode="&#xF0B2;"
+      horiz-adv-x="512" d=" M352.201 22.225L273.005 -56.971C263.632 -66.344 248.437 -66.344 239.064 -56.971L159.868 22.225C144.749 37.3440000000001 155.457 63.196 176.839 63.1950000000001H228.001L228 164H127.196V112.838C127.196 91.456 101.345 80.7480000000001 86.225 95.867L7.029 175.063C-2.344 184.436 -2.344 199.632 7.029 209.004L86.225 288.2C101.344 303.319 127.196 292.611 127.196 271.229V220H228V320.804H176.77C155.388 320.804 144.68 346.655 159.799 361.775L238.995 440.971C248.368 450.344 263.563 450.344 272.9360000000001 440.971L352.1320000000001 361.775C367.2510000000001 346.656 356.5430000000001 320.804 335.1610000000001 320.804H283.9990000000001V220H384.8030000000001V271.1620000000001C384.8030000000001 292.544 410.6540000000001 303.252 425.7730000000002 288.1330000000001L504.9690000000002 208.937C514.3420000000002 199.564 514.3420000000002 184.368 504.9690000000002 174.996L425.773 95.8C410.654 80.681 384.802 91.389 384.803 112.771V164H284V63.196H335.23C356.612 63.196 367.3200000000001 37.345 352.201 22.225z" />
+    <glyph glyph-name="assistive-listening-systems"
+      unicode="&#xF2A2;"
+      horiz-adv-x="512" d=" M216 188C216 172.536 203.464 160 188 160S160 172.536 160 188C160 232.112 195.888 268 240 268S320 232.112 320 188C320 172.536 307.464 160 292 160S264 172.536 264 188C264 201.234 253.233 212 240 212S216 201.234 216 188zM240 364C142.953 364 64 285.0470000000001 64 188C64 172.536 76.536 160 92 160S120 172.536 120 188C120 254.168 173.832 308 240 308S360 254.168 360 188C360 112.836 288.991 117.689 288.003 44.378L288 44C288 15.327 264.673 -8 236 -8C220.536 -8 208 -20.536 208 -36S220.536 -64 236 -64C295.475 -64 343.876 -15.672 344 43.774C344.5950000000001 78.202 416 92.014 416 188C416 285.0470000000001 337.0470000000001 364 240 364zM160 128C142.327 128 128 113.673 128 96S142.327 64 160 64S192 78.327 192 96S177.673 128 160 128zM32 0C14.327 0 0 -14.327 0 -32S14.327 -64 32 -64S64 -49.673 64 -32S49.673 0 32 0zM512 187.993C512 189.511 511.988 191.018 511.955 192.524C510.076 307.475 436.157 409.53 327.9940000000001 446.489C313.3610000000001 451.487 297.4450000000001 443.68 292.444 429.0470000000001C287.444 414.414 295.254 398.498 309.886 393.497C395.7920000000001 364.1430000000001 454.496 282.984 455.963 191.544L455.966 191.356C455.992 190.238 455.999 189.12 455.999 187.993C455.999 172.529 468.535 159.993 483.999 159.993S512 172.529 512 187.993zM152.971 8.971L72.971 88.971L39.03 55.03L119.03 -24.97L152.971 8.971z" />
+    <glyph glyph-name="asterisk"
+      unicode="&#xF069;"
+      horiz-adv-x="512" d=" M478.21 113.907L336 192L478.21 270.093C490.0050000000001 276.5700000000001 494.171 291.4770000000001 487.442 303.13L467.962 336.8710000000001C461.234 348.524 446.242 352.37 434.735 345.394L296 261.2820000000001L299.475 423.486C299.763 436.939 288.937 448 275.48 448H236.52C223.064 448 212.237 436.939 212.526 423.486L216 261.2820000000001L77.265 345.3930000000001C65.759 352.3690000000001 50.766 348.523 44.038 336.87L24.558 303.129C17.83 291.476 21.996 276.569 33.791 270.092L176 192L33.79 113.907C21.995 107.43 17.829 92.523 24.558 80.87L44.038 47.129C50.766 35.476 65.759 31.63 77.265 38.606L216 122.718L212.525 -39.486C212.237 -52.939 223.064 -64 236.52 -64H275.481C288.937 -64 299.764 -52.939 299.476 -39.486L296 122.718L434.735 38.607C446.241 31.631 461.234 35.477 467.962 47.1300000000001L487.442 80.871C494.17 92.5240000000001 490.005 107.4300000000001 478.21 113.9070000000001z" />
+    <glyph glyph-name="at"
+      unicode="&#xF1FA;"
+      horiz-adv-x="512" d=" M256 440C118.941 440 8 329.081 8 192C8 54.941 118.919 -56 256 -56C304.154 -56 351.342 -41.86 391.408 -15.777C403.413 -7.962 406.033 8.511 396.9600000000001 19.595L386.783 32.028C379.112 41.399 365.6040000000001 43.695 355.4100000000001 37.157C325.92 18.243 291.314 8 256 8C154.542 8 72 90.542 72 192S154.542 376 256 376C356.139 376 440 318.381 440 216C440 177.214 418.907 136.258 381.83 132.307C364.481 132.761 364.92 145.164 368.354 162.331L391.787 283.4410000000001C394.653 298.25 383.308 312 368.225 312H323.2440000000001A13.518 13.518 0 0 1 309.812 300.007L309.802 299.915C295.105 317.8160000000001 269.3540000000001 321.69 249.831 321.69C175.251 321.69 112 259.456 112 170.23C112 104.927 148.785 64.36 208 64.36C234.9840000000001 64.36 265.3690000000001 79.997 282.9910000000001 102.693C292.5130000000001 68.589 323.6040000000001 68.59 353.701 68.59C462.609 68.59 504 140.202 504 216C504 352.347 394.023 440 256 440zM234.32 135.57C212.071 135.57 198.25 151.193 198.25 176.341C198.25 221.334 229.029 249.07 256.88 249.07C279.1720000000001 249.07 292.481 233.829 292.481 208.3C292.481 163.239 258.606 135.57 234.32 135.57z" />
+    <glyph glyph-name="audio-description"
+      unicode="&#xF29E;"
+      horiz-adv-x="512" d=" M162.925 209.291L171.747 178.636H146.141L155.182 209.288C156.459 213.709 157.833 219.282 159.054 224.533C160.274 219.282 161.648 213.71 162.9250000000001 209.291zM329.399 241.39H314.876V142.609H329.399C359.175 142.609 375.574 160.287 375.574 192.385C375.574 224.624 358.084 241.39 329.399 241.39zM512 336V48C512 21.49 490.51 0 464 0H48C21.49 0 0 21.49 0 48V336C0 362.51 21.49 384 48 384H464C490.51 384 512 362.51 512 336zM245.459 111.861L188.362 279.861A12.001000000000001 12.001000000000001 0 0 1 177 288H141.106A12.001000000000001 12.001000000000001 0 0 1 129.744 279.861L72.647 111.861C70.003 104.078 75.789 96 84.009 96H113.142A12 12 0 0 1 124.677 104.693L133.251 134.599H184.618L193.411 104.622A12 12 0 0 1 204.926 96H234.098C242.318 96 248.104 104.078 245.459 111.861zM430.16 192.386C430.16 251.363 392.241 288 331.2 288H273.834C267.207 288 261.834 282.627 261.834 276V108C261.834 101.373 267.207 96 273.834 96H331.2C392.241 96 430.16 132.933 430.16 192.386z" />
+    <glyph glyph-name="backward"
+      unicode="&#xF04A;"
+      horiz-adv-x="512" d=" M11.5 167.4L203.5 7.4C224.1 -9.8 256 4.6 256 32V352C256 379.4 224.1 393.8 203.5 376.6L11.5 216.6C-3.8 203.8 -3.8 180.2 11.5 167.4zM267.5 167.4L459.5 7.4C480.1 -9.8 512 4.6 512 32V352C512 379.4 480.1 393.8 459.5 376.6L267.5 216.6C252.2 203.8 252.2 180.2 267.5 167.4z" />
+    <glyph glyph-name="balance-scale"
+      unicode="&#xF24E;"
+      horiz-adv-x="640" d=" M256 112H255.98C255.98 128.18 257.32 120.73 170.93 293.51C153.28 328.8 102.74 328.87 85.06 293.51C-2.06 119.25 0.02 127.67 0.02 112H0C0 67.82 57.31 32 128 32S256 67.82 256 112zM128 272L200 128H56L128 272zM639.98 112C639.98 128.18 641.32 120.73 554.9300000000001 293.51C537.2800000000001 328.8 486.7400000000001 328.87 469.0600000000001 293.51C381.9400000000001 119.25 384.0200000000001 127.67 384.0200000000001 112H384C384 67.82 441.31 32 512 32S640 67.82 640 112H639.98zM440 128L512 272L584 128H440zM528 0H352V294.75C375.51 305.04 393.16 326.23 398.39 352H528C536.84 352 544 359.16 544 368V400C544 408.8400000000001 536.84 416 528 416H383.64C369.04 435.32 346.09 448 320 448S270.96 435.32 256.36 416H112C103.16 416 96 408.8400000000001 96 400V368C96 359.16 103.16 352 112 352H241.61C246.84 326.24 264.48 305.04 288 294.75V0H112C103.16 0 96 -7.16 96 -16V-48C96 -56.84 103.16 -64 112 -64H528C536.84 -64 544 -56.84 544 -48V-16C544 -7.16 536.84 0 528 0z" />
+    <glyph glyph-name="ban"
+      unicode="&#xF05E;"
+      horiz-adv-x="512" d=" M256 440C119.034 440 8 328.967 8 192S119.034 -56 256 -56S504 55.034 504 192S392.967 440 256 440zM386.108 322.108C451.556 256.6600000000001 456.108 156.627 406.7850000000001 86.471L150.47 342.784C220.674 392.14 320.6960000000001 387.519 386.108 322.108zM125.892 61.892C60.444 127.34 55.892 227.373 105.215 297.529L361.53 41.216C291.327 -8.14 191.304 -3.52 125.892 61.892z" />
+    <glyph glyph-name="band-aid"
+      unicode="&#xF462;"
+      horiz-adv-x="640" d=" M0 288V96C0 60.7 28.7 32 64 32H160V352H64C28.7 352 0 323.3 0 288zM576 352H480V32H576C611.3 32 640 60.7 640 96V288C640 323.3 611.3 352 576 352zM192 32H448V352H192V32zM368 264C381.3 264 392 253.3 392 240S381.3 216 368 216S344 226.7 344 240S354.7 264 368 264zM368 168C381.3 168 392 157.3 392 144S381.3 120 368 120S344 130.7 344 144S354.7 168 368 168zM272 264C285.3 264 296 253.3 296 240S285.3 216 272 216S248 226.7 248 240S258.7 264 272 264zM272 168C285.3 168 296 157.3 296 144S285.3 120 272 120S248 130.7 248 144S258.7 168 272 168z" />
+    <glyph glyph-name="barcode"
+      unicode="&#xF02A;"
+      horiz-adv-x="512" d=" M0 0V384H18V0H0zM26.857 0.273V384H36V0.273H26.857zM54 0.273V384H62.857V0.273H54zM98.857 0.273V384H107.714V0.273H98.857zM134.857 0.273V384H152.571V0.273H134.857zM179.714 0.273V384H188.571V0.273H179.714zM197.714 0.273V384H206.571V0.273H197.714zM215.714 0.273V384H224.571V0.273H215.714zM251.429 0.273V384H269.429V0.273H251.429zM296.286 0.273V384H314.286V0.273H296.286zM332.2850000000001 0.273V384H350.286V0.273H332.2850000000001zM368.286 0.273V384H386.287V0.273H368.286zM395.1430000000001 0.273V384H413.1430000000001V0.273H395.1430000000001zM440.2860000000001 0.273V384H467.143V0.273H440.2860000000001zM476.0000000000001 0.273V384H485.143V0.273H476zM494.0000000000001 0V384H512V0H494z" />
+    <glyph glyph-name="bars"
+      unicode="&#xF0C9;"
+      horiz-adv-x="448" d=" M16 316H432C440.837 316 448 323.163 448 332V372C448 380.837 440.837 388 432 388H16C7.163 388 0 380.837 0 372V332C0 323.163 7.163 316 16 316zM16 156H432C440.837 156 448 163.163 448 172V212C448 220.837 440.837 228 432 228H16C7.163 228 0 220.837 0 212V172C0 163.163 7.163 156 16 156zM16 -4H432C440.837 -4 448 3.163 448 12V52C448 60.837 440.837 68 432 68H16C7.163 68 0 60.837 0 52V12C0 3.163 7.163 -4 16 -4z" />
+    <glyph glyph-name="baseball-ball"
+      unicode="&#xF433;"
+      horiz-adv-x="496" d=" M368.5 84.1L397.3 98C408.4000000000001 75.1 423.3 54.8 441.4000000000001 37.1C475.4 79.6 495.9 133.4 495.9 192C495.9 250.5000000000001 475.5000000000001 304.2000000000001 441.7000000000001 346.6C423.9000000000001 329.3 409.1 309.5 398.1 287.1L369.4000000000001 301.2000000000001C382.2000000000001 327.2000000000001 399.4000000000001 350.2000000000001 420.2000000000001 370.2000000000001C375.6 413.3 315 440 248 440C181.1 440 120.5 413.4 75.9 370.3C96.6 350.4 113.8 327.4 126.6 301.5L97.9 287.4C86.9 309.7000000000001 72.2 329.5 54.4 346.8C20.4 304.3 0 250.6 0 192C0 133.4 20.4 79.7 54.4 37.3C72.6 55 87.6 75.3 98.7 98.3L127.5 84.4C114.6 57.7000000000001 97.2 34.1 76 13.7C120.5 -29.4 181.1 -55.9999999999999 248 -55.9999999999999C314.8 -55.9999999999999 375.3 -29.4999999999999 419.9 13.5000000000001C398.8 33.9 381.4 57.4 368.5 84.1zM140.2 116.1L109.7 125.9C124.6 172.3 122.4 219.7000000000001 109.1 259.9000000000001L139.5 269.9000000000001C154.5 224.3000000000001 157.5 170 140.2 116.1zM356.5 269.5L386.9 259.5C373.7 219.4 371.4 172 386.3 125.5L355.8 115.7C338.5 169.7 341.5 224 356.5 269.5z" />
+    <glyph glyph-name="basketball-ball"
+      unicode="&#xF434;"
+      horiz-adv-x="496" d=" M212.3 437.7C168.5 431.4 126.1 413.6 90.1 383.9L167.5 306.5C195.3 342.3 210.8 387.7 212.3 437.7zM248 226L405.9 383.9C363.5 418.9 312.3 437.4 260.4 440C259.2 376.1 238.9 317.7000000000001 201.7 272.3L248 226zM56.1 349.9C26.4 313.9 8.6 271.5 2.3 227.7C52.3 229.2 97.8 244.7 133.5 272.5L56.1 349.9zM328.3 145.7000000000001C373.6 182.8000000000001 432 203.1000000000001 496 204.4C493.4 256.3000000000001 474.9 307.5 439.9 349.9000000000001L282 192L328.3 145.7zM248 158L90.1 0.1C132.5 -34.8 183.7 -53.4 235.6 -56C236.9 8 257.2 66.4 294.3 111.7L248 158zM439.9 34.1C469.6 70.1 487.4 112.5 493.7 156.3C443.6 154.7 398.2 139.2 362.5 111.5L439.9 34.1zM167.7 238.3C122.3 201.1 63.9 180.7 0 179.6C2.6 127.7000000000001 21.1 76.5 56.1 34.1L214 192L167.7 238.3zM283.7 -53.7C327.5 -47.4 369.9 -29.6 405.9 0.1L328.5 77.5C300.8 41.8 285.3 -3.7 283.7 -53.7z" />
+    <glyph glyph-name="bath"
+      unicode="&#xF2CD;"
+      horiz-adv-x="512" d=" M488 192H80V336C80 353.645 94.355 368 112 368C123.351 368 133.332 362.055 139.015 353.12C122.523 327.913 124.328 293.544 145.853 270.0850000000001C141.677 265.372 141.832 258.169 146.344 253.657L157.658 242.343C162.344 237.657 169.942 237.657 174.629 242.343L269.659 337.372C274.345 342.058 274.345 349.656 269.659 354.343L258.345 365.6570000000001C253.833 370.169 246.63 370.323 241.917 366.148C223.968 382.617 199.623 387.577 177.739 381.5130000000001C163.281 402.333 139.212 416 112 416C67.888 416 32 380.112 32 336V192H24C10.745 192 0 181.255 0 168V152C0 138.745 10.745 128 24 128H32V96C32 67.57 44.362 42.031 64 24.453V-8C64 -21.255 74.745 -32 88 -32H104C117.255 -32 128 -21.255 128 -8V0H384V-8C384 -21.255 394.745 -32 408 -32H424C437.255 -32 448 -21.255 448 -8V24.453C467.638 42.031 480 67.57 480 96V128H488C501.255 128 512 138.745 512 152V168C512 181.255 501.255 192 488 192z" />
+    <glyph glyph-name="battery-empty"
+      unicode="&#xF244;"
+      horiz-adv-x="640" d=" M544 288V224H576V160H544V96H64V288H544M560 352H48C21.49 352 0 330.51 0 304V80C0 53.49 21.49 32 48 32H560C586.51 32 608 53.49 608 80V96H616C629.255 96 640 106.745 640 120V264C640 277.255 629.255 288 616 288H608V304C608 330.51 586.51 352 560 352z" />
+    <glyph glyph-name="battery-full"
+      unicode="&#xF240;"
+      horiz-adv-x="640" d=" M544 288V224H576V160H544V96H64V288H544M560 352H48C21.49 352 0 330.51 0 304V80C0 53.49 21.49 32 48 32H560C586.51 32 608 53.49 608 80V96H616C629.255 96 640 106.745 640 120V264C640 277.255 629.255 288 616 288H608V304C608 330.51 586.51 352 560 352zM512 256H96V128H512V256z" />
+    <glyph glyph-name="battery-half"
+      unicode="&#xF242;"
+      horiz-adv-x="640" d=" M544 288V224H576V160H544V96H64V288H544M560 352H48C21.49 352 0 330.51 0 304V80C0 53.49 21.49 32 48 32H560C586.51 32 608 53.49 608 80V96H616C629.255 96 640 106.745 640 120V264C640 277.255 629.255 288 616 288H608V304C608 330.51 586.51 352 560 352zM320 256H96V128H320V256z" />
+    <glyph glyph-name="battery-quarter"
+      unicode="&#xF243;"
+      horiz-adv-x="640" d=" M544 288V224H576V160H544V96H64V288H544M560 352H48C21.49 352 0 330.51 0 304V80C0 53.49 21.49 32 48 32H560C586.51 32 608 53.49 608 80V96H616C629.255 96 640 106.745 640 120V264C640 277.255 629.255 288 616 288H608V304C608 330.51 586.51 352 560 352zM224 256H96V128H224V256z" />
+    <glyph glyph-name="battery-three-quarters"
+      unicode="&#xF241;"
+      horiz-adv-x="640" d=" M544 288V224H576V160H544V96H64V288H544M560 352H48C21.49 352 0 330.51 0 304V80C0 53.49 21.49 32 48 32H560C586.51 32 608 53.49 608 80V96H616C629.255 96 640 106.745 640 120V264C640 277.255 629.255 288 616 288H608V304C608 330.51 586.51 352 560 352zM416 256H96V128H416V256z" />
+    <glyph glyph-name="bed"
+      unicode="&#xF236;"
+      horiz-adv-x="576" d=" M552 160C565.255 160 576 149.255 576 136V0H480V64H96V0H0V360C0 373.255 10.745 384 24 384H72C85.255 384 96 373.255 96 360V160H552zM192 352C147.817 352 112 316.183 112 272S147.817 192 192 192S272 227.817 272 272S236.183 352 192 352zM576 224C576 277.019 533.019 320 480 320H312C298.745 320 288 309.255 288 296V192H576V224z" />
+    <glyph glyph-name="beer"
+      unicode="&#xF0FC;"
+      horiz-adv-x="448" d=" M368 352H320V392C320 405.255 309.255 416 296 416H24C10.745 416 0 405.255 0 392V-8C0 -21.255 10.745 -32 24 -32H296C309.255 -32 320 -21.255 320 -8V34.11L400.606 70.087C429.396 82.937 448 111.612 448 143.14V272C448 316.112 412.112 352 368 352zM384 143.14A16.018 16.018 0 0 0 374.521 128.529L320 104.195V288H368C376.822 288 384 280.822 384 272V143.14zM208 64C199.164 64 192 71.164 192 80V304C192 312.836 199.164 320 208 320S224 312.836 224 304V80C224 71.164 216.836 64 208 64zM112 64C103.164 64 96 71.164 96 80V304C96 312.836 103.164 320 112 320S128 312.836 128 304V80C128 71.164 120.836 64 112 64z" />
+    <glyph glyph-name="bell-slash"
+      unicode="&#xF1F6;"
+      horiz-adv-x="576" d=" M78.107 81.941C47.958 51.792 69.325 0 112.048 0H224C224 -35.346 252.654 -64 288 -64C323.346 -64 352 -35.346 352 0H384.685L127.848 226.621C125.65 129.543 99.409 103.243 78.107 81.941zM264 0C264 -13.234 274.766 -24 288 -24A8 8 0 0 0 288 -40C265.944 -40 248 -22.056 248 0H264zM569.896 -43.733L559.134 -55.819C550.219 -65.831 534.801 -66.7860000000001 524.697 -57.952L8.256 393.607C-1.848 402.442 -2.811 417.7200000000001 6.104 427.733L16.865 439.819C25.781 449.831 41.199 450.786 51.303 441.951L165.113 342.439C189.13 371.217 223.059 391.435 261.663 397.829A31.85 31.85 0 0 0 256 416C256 433.673 270.327 448 288 448S320 433.673 320 416C320 409.25 317.905 402.992 314.337 397.83C390.169 385.269 448 319.394 448 240C448 131.882 475.634 104.191 497.884 81.941C510.033 69.792 513.807 54.165 511.214 39.8200000000001L567.744 -9.607C577.8480000000001 -18.4419999999999 578.811 -33.72 569.8960000000001 -43.7329999999999z" />
+    <glyph glyph-name="bell"
+      unicode="&#xF0F3;"
+      horiz-adv-x="448" d=" M433.884 81.941C411.634 104.191 384 131.882 384 240C384 319.394 326.169 385.269 250.337 397.8300000000001A31.845000000000002 31.845000000000002 0 0 1 256 416C256 433.673 241.673 448 224 448S192 433.673 192 416C192 409.25 194.095 402.992 197.663 397.83C121.831 385.269 64 319.394 64 240C64 131.882 36.357 104.191 14.107 81.941C-16.042 51.792 5.325 0 48.048 0H160C160 -35.346 188.654 -64 224 -64S288 -35.346 288 0H399.943C442.581 0 464.094 51.731 433.884 81.941zM224 -24A8 8 0 0 0 224 -40C201.944 -40 184 -22.056 184 0H200C200 -13.234 210.766 -24 224 -24z" />
+    <glyph glyph-name="bicycle"
+      unicode="&#xF206;"
+      horiz-adv-x="640" d=" M512.509 255.999C496.136 256.063 480.479 253.044 466.073 247.504L388.3930000000001 372.657A24 24 0 0 1 368.001 384H304.001C295.164 384 288.001 376.837 288.001 368V352C288.001 343.163 295.164 336 304.001 336H354.65L369.546 312H256.002V328C256.002 336.837 248.839 344 240.002 344H152.543C139.102 344 127.766 333.001 128.007 319.563C128.239 306.519 138.883 296 152.002 296H200.728L171.311 248.48C157.878 253.31 143.407 255.963 128.319 256C58.094 256.17 0.412 198.988 0.002 128.764C-0.413 57.721 57.055 0 128.002 0C187.644 0 237.76 40.793 251.969 96H304.002A24 24 0 0 1 324.408 107.367L410.37 246.23L425.308 222.163C399.853 198.715 383.923 165.082 384.001 127.726C384.146 58.893 441.9 0.675 510.73 0.007C581.336 -0.678 638.911 55.81 639.9849999999999 126.003C641.0709999999999 196.944 583.459 255.723 512.5089999999999 255.999zM186.75 182.228C196.477 171.699 203.423 158.567 206.392 144H163.086L186.75 182.228zM128.002 48C83.89 48 48.002 83.888 48.002 128S83.89 208 128.002 208C133.871 208 139.588 207.347 145.101 206.141L99.596 132.632C89.715 116.673 101.213 96 120.002 96H201.302C188.932 67.775 160.74 48 128.002 48zM290.632 144H255.008C251.048 175.756 235.452 203.894 212.625 224.026L237.371 264H364.918L290.632 144zM507.689 48.114C466.653 50.2790000000001 433.64 83.806 432.062 124.869C431.25 145.99 438.695 165.3870000000001 451.3969999999999 180.132L495.8299999999999 108.546C500.49 101.038 510.3539999999999 98.73 517.862 103.39L531.456 111.827C538.964 116.487 541.273 126.351 536.612 133.859L492.1439999999999 205.502A79.901 79.901 0 0 0 512.002 207.999C556.1139999999999 207.999 592.002 172.111 592.002 127.999C592.001 82.459 553.75 45.683 507.689 48.114z" />
+    <glyph glyph-name="binoculars"
+      unicode="&#xF1E5;"
+      horiz-adv-x="512" d=" M192 344H96V392C96 405.255 106.745 416 120 416H168C181.255 416 192 405.255 192 392V344zM416 392C416 405.255 405.255 416 392 416H344C330.745 416 320 405.255 320 392V344H416V392zM0 -8C0 -21.255 10.745 -32 24 -32H144C157.255 -32 168 -21.255 168 -8V8H0V-8zM88 320C74.745 320 64 309.255 64 296C64 192 0 176 0 32H168V136C168 149.255 178.745 160 192 160V320H88zM344 -8C344 -21.255 354.745 -32 368 -32H488C501.255 -32 512 -21.255 512 -8V8H344V-8zM216 320V160H296V320H216zM344 32H512C512 176 448 192 448 296C448 309.255 437.255 320 424 320H320V160C333.255 160 344 149.255 344 136V32z" />
+    <glyph glyph-name="birthday-cake"
+      unicode="&#xF1FD;"
+      horiz-adv-x="448" d=" M448 64C419.98 64 416.74 96 373.5 96C330.07 96 326.675 64 298.75 64C271.055 64 267.296 96 224 96C181.158 96 176.782 64 149.5 64C121.352 64 118.298 96 74.75 96C31.203 96 28.097 64 0 64V144C0 170.5 21.5 192 48 192H64V336H128V192H192V336H256V192H320V336H384V192H400C426.5 192 448 170.5 448 144V64zM448 -64H0V32C43.356 32 46.767 64 74.75 64C102.701 64 106.003 32 149.5 32C192.343 32 196.717 64 224 64C252.148 64 255.201 32 298.75 32C342.107 32 345.517 64 373.5 64C400.988 64 404.752 32 448 32V-64zM96 352C78.25 352 64 366.25 64 384C64 415 96 407 96 448C108 448 128 418.5 128 392S113.75 352 96 352zM224 352C206.25 352 192 366.25 192 384C192 415 224 407 224 448C236 448 256 418.5 256 392S241.75 352 224 352zM352 352C334.25 352 320 366.25 320 384C320 415 352 407 352 448C364 448 384 418.5 384 392S369.75 352 352 352z" />
+    <glyph glyph-name="blender"
+      unicode="&#xF517;"
+      horiz-adv-x="512" d=" M416 64H160C124.65 64 96 35.35 96 0V-32C96 -49.67 110.33 -64 128 -64H448C465.67 -64 480 -49.67 480 -32V0C480 35.35 451.35 64 416 64zM288 -32C270.33 -32 256 -17.67 256 0S270.33 32 288 32S320 17.67 320 0S305.67 -32 288 -32zM328 384H494.54L512 448H48C21.49 448 0 426.51 0 400V240C0 213.49 21.49 192 48 192H151.27L160 96H416L433.46 160H328C323.58 160 320 163.58 320 168V184C320 188.42 323.58 192 328 192H442.18L459.64 256H328C323.58 256 320 259.5800000000001 320 264V280C320 284.42 323.58 288 328 288H468.36L485.82 352H328C323.58 352 320 355.58 320 360V376C320 380.42 323.58 384 328 384zM64 256V384H133.82L145.46 256H64z" />
+    <glyph glyph-name="blind"
+      unicode="&#xF29D;"
+      horiz-adv-x="384" d=" M380.15 -62.837A8 8 0 0 0 369.161 -60.15L243.831 146.2770000000001A31.923 31.923 0 0 1 256.7890000000001 155.7620000000001L382.8370000000001 -51.8459999999999A8 8 0 0 0 380.1500000000001 -62.8369999999999zM142.803 133.662L110.263 44.177L146.383 -44.1080000000001C153.076 -60.4680000000001 171.76 -68.3000000000001 188.116 -61.609C204.473 -54.917 212.309 -36.2330000000001 205.617 -19.8750000000001L142.803 133.6619999999999zM96 360C120.301 360 140 379.699 140 404S120.301 448 96 448S52 428.301 52 404S71.699 360 96 360zM250.837 190.872L130.837 342.872C126.104 348.867 119.087 351.98 112 351.9840000000001V352H80V351.974C72.854 351.971 65.783 348.813 61.056 342.7340000000001L0 264.2340000000001V168.54C0 155.085 11.011 143.749 24.464 144.004C37.505 144.252 48 154.9 48 168V247.766L64 268.337V127.639L9.927 -21.055C3.887 -37.664 12.455 -56.024 29.065 -62.064C45.667 -68.1030000000001 64.033 -59.54 70.074 -42.926L136 138.362V245.559L104.594 285.375A4 4 0 1 0 110.863 290.346L213.163 161.129C222.308 149.545 237.531 149.79 246.871 157.1640000000001C257.281 165.3800000000001 259.0300000000001 180.4980000000001 250.837 190.8720000000001z" />
+    <glyph glyph-name="bold"
+      unicode="&#xF032;"
+      horiz-adv-x="384" d=" M304.793 204.109C338.432 222.646 358.45 258.269 358.45 299.802C358.45 348.038 332.2 387.428 289.824 403.981C265.138 413.99 240.849 416 209.661 416H24C15.163 416 8 408.837 8 400V366.951C8 358.114 15.163 350.951 24 350.951H57.113V32.4210000000001H24C15.163 32.4210000000001 8 25.258 8 16.4210000000001V-16C8 -24.837 15.163 -32 24 -32H219.69C243.893 -32 264.524 -30.711 286.556 -24.416C337.52 -9.193 376 37.353 376 97.986C376 150.154 349.427 189.67 304.793 204.109zM142.217 347.1910000000001H209.661C225.955 347.1910000000001 237.197 345.1720000000001 247.186 340.474C263.014 331.995 272.092 313.972 272.092 291.028C272.092 255.999 251.772 234.2380000000001 219.063 234.2380000000001H142.217V347.1910000000001zM254.859 41.716C244.719 37.66 232.182 36.809 223.45 36.809H142.217V166.057H226.584C266.229 166.057 289.641 140.677 289.641 103C289.642 74.575 275.981 50.517 254.8590000000001 41.716z" />
+    <glyph glyph-name="bolt"
+      unicode="&#xF0E7;"
+      horiz-adv-x="320" d=" M295.973 288H180.572L215.19 417.816C219.25 433.044 207.756 448 192 448H56C43.971 448 33.8 439.0950000000001 32.211 427.1720000000001L0.215 187.172C-1.704 172.783 9.504 160 24.004 160H142.705L96.646 -34.466C93.05 -49.649 104.659 -64 119.992 -64C128.342 -64 136.368 -59.626 140.77 -52.022L316.7430000000001 251.975C325.9870000000001 267.942 314.4550000000001 288 295.9730000000001 288z" />
+    <glyph glyph-name="bomb"
+      unicode="&#xF1E2;"
+      horiz-adv-x="512" d=" M440.5 359.5L388.5 307.5L415 281C424.4 271.6 424.4 256.4 415 247.1L397.6 229.7C409.4000000000001 203.6 416 174.6 416 144.1C416 29.2 322.9 -63.9 208 -63.9S0 29.1 0 144S93.1 352 208 352C238.5 352 267.5 345.4 293.6 333.6L311 351C320.4 360.4 335.6 360.4 344.9 351L371.4 324.5L423.4 376.5L440.5 359.5zM500 388H476C469.4 388 464 382.6 464 376S469.4 364 476 364H500C506.6 364 512 369.4 512 376S506.6 388 500 388zM440 448C433.4 448 428 442.6 428 436V412C428 405.4 433.4 400 440 400S452 405.4 452 412V436C452 442.6 446.6 448 440 448zM473.9 393L490.9 410C495.6 414.7 495.6 422.3 490.9 427C486.2 431.7 478.6 431.7 473.9 427L456.9 410C452.2 405.3 452.2 397.7 456.9 393C461.7 388.3 469.3 388.3 473.9 393zM406.1 393C410.8 388.3 418.4 388.3 423.1 393C427.8 397.7 427.8 405.3 423.1 410L406.1 427C401.4 431.7 393.8 431.7 389.1 427C384.4 422.3 384.4 414.7 389.1 410L406.1 393zM473.9 359C469.2 363.7 461.6 363.7 456.9 359C452.2 354.3 452.2 346.7 456.9 342L473.9 325C478.6 320.3 486.2 320.3 490.9 325C495.6 329.7 495.6 337.3 490.9 342L473.9 359zM112 176C112 211.3 140.7 240 176 240C184.8 240 192 247.2 192 256S184.8 272 176 272C123.1 272 80 228.9 80 176C80 167.2 87.2 160 96 160S112 167.2 112 176z" />
+    <glyph glyph-name="book-open"
+      unicode="&#xF518;"
+      horiz-adv-x="576" d=" M542.2 447.9C487.4 444.8 378.5000000000001 433.5 311.2000000000001 392.3C306.6 389.5 303.9000000000001 384.4 303.9000000000001 379.1V15.2C303.9000000000001 3.7 316.5000000000001 -3.6 327.2000000000001 1.7C396.4000000000001 36.5000000000001 496.4 46.0000000000001 545.9000000000001 48.6C562.8000000000001 49.5 575.9000000000001 63 575.9000000000001 79.3V417.3C576 435 560.6 449 542.2 447.9zM264.7 392.4C197.5 433.5 88.6 444.8 33.8 447.9C15.4 449 0 435 0 417.3V79.5C0 63.3 13.1 49.7 30 48.8C79.5 46.2 179.6 36.7 248.8 1.8C259.4000000000001 -3.6 272 3.7 272 15.3V379.4C272 384.7 269.4 389.5 264.7 392.4z" />
+    <glyph glyph-name="book"
+      unicode="&#xF02D;"
+      horiz-adv-x="448" d=" M448 88V424C448 437.3 437.3 448 424 448H96C43 448 0 405 0 352V32C0 -21 43 -64 96 -64H424C437.3 -64 448 -53.3 448 -40V-24C448 -16.5 444.5 -9.7 439.1 -5.3C434.9000000000001 10.1 434.9000000000001 54 439.1 69.4C444.5 73.7 448 80.5 448 88zM128 314C128 317.3 130.7 320 134 320H346C349.3 320 352 317.3 352 314V294C352 290.7 349.3 288 346 288H134C130.7 288 128 290.7 128 294V314zM128 250C128 253.3 130.7 256 134 256H346C349.3 256 352 253.3 352 250V230C352 226.7 349.3 224 346 224H134C130.7 224 128 226.7 128 230V250zM381.4 0H96C78.3 0 64 14.3 64 32C64 49.6 78.4 64 96 64H381.4C379.5 46.9 379.5 17.1 381.4 0z" />
+    <glyph glyph-name="bookmark"
+      unicode="&#xF02E;"
+      horiz-adv-x="384" d=" M0 -64V400C0 426.51 21.49 448 48 448H336C362.51 448 384 426.51 384 400V-64L192 48L0 -64z" />
+    <glyph glyph-name="bowling-ball"
+      unicode="&#xF436;"
+      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM120 256C102.3 256 88 270.3 88 288S102.3 320 120 320S152 305.7 152 288S137.7 256 120 256zM184 352C184 369.7 198.3 384 216 384S248 369.7 248 352S233.7 320 216 320S184 334.3 184 352zM232 208C214.3 208 200 222.3 200 240S214.3 272 232 272S264 257.7 264 240S249.7 208 232 208z" />
+    <glyph glyph-name="box-open"
+      unicode="&#xF49E;"
+      horiz-adv-x="640" d=" M53.2 407L1.7 304.2C-2.9 295 2 284 11.8 281.2L209.7 224.7C216.8 222.7 224.4 225.7 228.2 232L320 384L69.8 415.9C62.9 416.7 56.3 413.2 53.2 407zM638.3000000000001 304.2L586.8 407C583.6999999999999 413.2 577 416.8 570.0999999999999 415.9L320 384L411.7 231.9C415.5 225.6 423.1 222.6 430.2 224.6L628.1 281.1C638 284 642.8000000000001 295 638.3000000000001 304.2zM425.7 192C408.8 192 392.9 201 384.3 215.4L320 322L255.8 215.4C247.1 200.9 231.2 191.9 214.3 191.9C209.8 191.9 205.3 192.5 201 193.8L64 233V55C64 40.3 74 27.5 88.2 24L304.4 -30.1C314.6 -32.6 325.3 -32.6 335.4 -30.1L551.8 24C566 27.6 576 40.4 576 55V233L439 193.9C434.7 192.6 430.2 192 425.7 192z" />
+    <glyph glyph-name="box"
+      unicode="&#xF466;"
+      horiz-adv-x="512" d=" M509.5 263.4L458.9 415.2C452.4 434.8 434.1 448 413.4 448H272V256H510.7C510.3 258.5 510.3 261 509.5 263.4zM240 448H98.6C77.9 448 59.6 434.8 53.1 415.2L2.5 263.4C1.7 261 1.7 258.5 1.3 256H240V448zM0 224V-16C0 -42.5 21.5 -64 48 -64H464C490.5 -64 512 -42.5 512 -16V224H0z" />
+    <glyph glyph-name="boxes"
+      unicode="&#xF468;"
+      horiz-adv-x="576" d=" M560 160H480V64L448 85.3L416 64V160H336C327.2 160 320 152.8 320 144V-48C320 -56.8 327.2 -64 336 -64H560C568.8 -64 576 -56.8 576 -48V144C576 152.8 568.8 160 560 160zM176 224H400C408.8 224 416 231.2 416 240V432C416 440.8 408.8 448 400 448H320V352L288 373.3L256 352V448H176C167.2 448 160 440.8 160 432V240C160 231.2 167.2 224 176 224zM240 160H160V64L128 85.3L96 64V160H16C7.2 160 0 152.8 0 144V-48C0 -56.8 7.2 -64 16 -64H240C248.8 -64 256 -56.8 256 -48V144C256 152.8 248.8 160 240 160z" />
+    <glyph glyph-name="braille"
+      unicode="&#xF2A1;"
+      horiz-adv-x="640" d=" M128 192C128 156.654 99.346 128 64 128S0 156.654 0 192S28.654 256 64 256S128 227.346 128 192zM64 64C46.327 64 32 49.673 32 32S46.327 0 64 0S96 14.327 96 32S81.673 64 64 64zM64 416C28.654 416 0 387.346 0 352S28.654 288 64 288S128 316.654 128 352S99.346 416 64 416zM224 224C206.327 224 192 209.673 192 192S206.327 160 224 160S256 174.327 256 192S241.673 224 224 224zM224 64C206.327 64 192 49.673 192 32S206.327 0 224 0S256 14.327 256 32S241.673 64 224 64zM224 416C188.654 416 160 387.346 160 352S188.654 288 224 288S288 316.654 288 352S259.346 416 224 416zM448 224C430.327 224 416 209.673 416 192S430.327 160 448 160S480 174.327 480 192S465.673 224 448 224zM448 64C430.327 64 416 49.673 416 32S430.327 0 448 0S480 14.327 480 32S465.673 64 448 64zM448 416C412.654 416 384 387.346 384 352S412.654 288 448 288S512 316.654 512 352S483.346 416 448 416zM608 224C590.327 224 576 209.673 576 192S590.327 160 608 160S640 174.327 640 192S625.673 224 608 224zM608 64C590.327 64 576 49.673 576 32S590.327 0 608 0S640 14.327 640 32S625.673 64 608 64zM608 384C590.327 384 576 369.673 576 352S590.327 320 608 320S640 334.327 640 352S625.673 384 608 384z" />
+    <glyph glyph-name="briefcase-medical"
+      unicode="&#xF469;"
+      horiz-adv-x="512" d=" M464 320H384V368C384 394.5 362.5 416 336 416H176C149.5 416 128 394.5 128 368V320H48C21.5 320 0 298.5 0 272V-16C0 -42.5 21.5 -64 48 -64H464C490.5 -64 512 -42.5 512 -16V272C512 298.5 490.5 320 464 320zM192 352H320V320H192V352zM352 104C352 99.6 348.4 96 344 96H288V40C288 35.6 284.4 32 280 32H232C227.6 32 224 35.6 224 40V96H168C163.6 96 160 99.6 160 104V152C160 156.4 163.6 160 168 160H224V216C224 220.4 227.6 224 232 224H280C284.4 224 288 220.4 288 216V160H344C348.4 160 352 156.4 352 152V104z" />
+    <glyph glyph-name="briefcase"
+      unicode="&#xF0B1;"
+      horiz-adv-x="512" d=" M320 160H512V16C512 -10.51 490.51 -32 464 -32H48C21.49 -32 0 -10.51 0 16V160H192V140C192 133.373 197.373 128 204 128H308C314.627 128 320 133.373 320 140V160zM512 272V192H0V272C0 298.51 21.49 320 48 320H128V368C128 394.51 149.49 416 176 416H336C362.51 416 384 394.51 384 368V320H464C490.51 320 512 298.51 512 272zM320 352H192V320H320V352z" />
+    <glyph glyph-name="broadcast-tower"
+      unicode="&#xF519;"
+      horiz-adv-x="640" d=" M150.94 256H184.67C195.68 256 203.28 266.8300000000001 199.53 277.18C194.6 290.76 191.98 305.16 191.98 320S194.6 349.24 199.53 362.82C203.29 373.17 195.68 384 184.67 384H150.94C143.93 384 137.48 379.51 135.53 372.77C130.64 355.79 128 338.12 128 320C128 301.88 130.64 284.2100000000001 135.54 267.24C137.48 260.5 143.93 256 150.94 256zM89.92 424.6600000000001C95.56 435.28 87.97 448 75.96 448H40.63C34.36 448 28.49 444.4100000000001 25.89 438.69C9.4 402.46 0 362.35 0 320C0 295.25 3.12 251.67 26.69 201.14C29.31 195.51 35.11 192 41.3 192H76.14C88.16 192 95.75 204.74 90.09 215.37C40.31 308.69 73.38 393.52 89.92 424.66zM614.06 438.71C611.46 444.42 605.6 448 599.33 448H563.9100000000001C551.9300000000001 448 544.2500000000001 435.34 549.8900000000001 424.75C568.1600000000001 390.46 598.3100000000001 305.33 550.1700000000001 215.52C544.45 204.84 551.97 192 564.08 192H599.3100000000001C605.58 192 611.44 195.58 614.0400000000001 201.29C630.57 237.52 640 277.64 640 320S630.58 402.48 614.06 438.71zM489.06 384H455.33C444.32 384 436.72 373.17 440.47 362.82C445.4 349.24 448.02 334.84 448.02 320S445.4 290.76 440.47 277.18C436.71 266.8300000000001 444.32 256 455.33 256H489.06C496.08 256 502.52 260.49 504.47 267.24C509.37 284.2100000000001 512 301.88 512 320C512 338.12 509.36 355.79 504.46 372.76C502.52 379.51 496.07 384 489.06 384zM372.76 283.88C379.81 294.17 383.96 306.5900000000001 383.96 320C383.96 355.35 355.33 384 320 384C284.68 384 256.04 355.35 256.04 320C256.04 306.5900000000001 260.19 294.17 267.24 283.88L136.74 -29.53C133.34 -37.68 137.2 -47.05 145.35 -50.45L174.86 -62.76C183.01 -66.1600000000001 192.38 -62.3000000000001 195.77 -54.15L244.96 64H395.03L444.23 -54.15C447.63 -62.31 456.99 -66.16 465.14 -62.76L494.65 -50.45C502.8 -47.05 506.65 -37.68 503.26 -29.53L372.76 283.8800000000001zM271.62 128L320 244.19L368.38 128H271.62z" />
+    <glyph glyph-name="broom"
+      unicode="&#xF51A;"
+      horiz-adv-x="512" d=" M10.8 200.8C-0.7 196.2 -3.7 181.3 5 172.6L59.8 117.8L133 142.2L108.6 69L236.6 -59C245.4 -67.7999999999999 260.2 -64.7 264.8 -53.2L362.9 190.5L254.5 298.9L10.8 200.8zM507.3 420.7L484.7 443.3C478.5 449.6 468.3 449.6 462.1 443.3L359.8 341.1L319.4000000000001 381.5C315.2000000000001 385.8 308.0000000000001 384.5 305.5000000000001 379L278.3000000000001 320.4L384.4000000000001 214.3L443.0000000000001 241.5C448.4000000000001 244 449.7000000000001 251.2 445.5000000000001 255.4L405.1000000000002 295.8L507.3 398.1C513.6 404.3 513.6 414.4 507.3 420.7z" />
+    <glyph glyph-name="bug"
+      unicode="&#xF188;"
+      horiz-adv-x="512" d=" M511.988 159.1C511.51 141.67 496.771 128 479.335 128H424V112C424 90.136 419.118 69.416 410.4 50.855L470.628 -9.373C483.124 -21.87 483.124 -42.131 470.628 -54.628C458.13 -67.125 437.869 -67.124 425.372 -54.628L370.636 0.108C345.886 -19.965 314.351 -32 280 -32V212C280 218.627 274.627 224 268 224H244C237.373 224 232 218.627 232 212V-32C197.649 -32 166.114 -19.965 141.364 0.108L86.628 -54.628C74.13 -67.125 53.869 -67.124 41.372 -54.628C28.876 -42.131 28.876 -21.87 41.372 -9.373L101.6 50.855C92.882 69.416 88 90.136 88 112V128H32.666C15.23 128 0.491 141.67 0.013 159.1C-0.484 177.184 14.028 192 32 192H88V250.745L41.372 297.373C28.876 309.87 28.876 330.131 41.372 342.628C53.87 355.125 74.13 355.125 86.628 342.628L141.255 288H370.7440000000001L425.3710000000001 342.627C437.8690000000001 355.124 458.129 355.124 470.6270000000001 342.627C483.123 330.13 483.123 309.8690000000001 470.6270000000001 297.372L424 250.745V192H480C497.972 192 512.484 177.184 511.988 159.1zM257 448C195.144 448 145 397.856 145 336H369C369 397.856 318.856 448 257 448z" />
+    <glyph glyph-name="building"
+      unicode="&#xF1AD;"
+      horiz-adv-x="448" d=" M436 -32H416V424C416 437.255 405.255 448 392 448H56C42.745 448 32 437.255 32 424V-32H12C5.373 -32 0 -37.373 0 -44V-64H448V-44C448 -37.373 442.627 -32 436 -32zM128 372C128 378.627 133.373 384 140 384H180C186.627 384 192 378.627 192 372V332C192 325.373 186.627 320 180 320H140C133.373 320 128 325.373 128 332V372zM128 276C128 282.627 133.373 288 140 288H180C186.627 288 192 282.627 192 276V236C192 229.373 186.627 224 180 224H140C133.373 224 128 229.373 128 236V276zM180 128H140C133.373 128 128 133.373 128 140V180C128 186.627 133.373 192 140 192H180C186.627 192 192 186.627 192 180V140C192 133.373 186.627 128 180 128zM256 -32H192V52C192 58.627 197.373 64 204 64H244C250.627 64 256 58.627 256 52V-32zM320 140C320 133.373 314.627 128 308 128H268C261.373 128 256 133.373 256 140V180C256 186.627 261.373 192 268 192H308C314.627 192 320 186.627 320 180V140zM320 236C320 229.373 314.627 224 308 224H268C261.373 224 256 229.373 256 236V276C256 282.627 261.373 288 268 288H308C314.627 288 320 282.627 320 276V236zM320 332C320 325.373 314.627 320 308 320H268C261.373 320 256 325.373 256 332V372C256 378.627 261.373 384 268 384H308C314.627 384 320 378.627 320 372V332z" />
+    <glyph glyph-name="bullhorn"
+      unicode="&#xF0A1;"
+      horiz-adv-x="576" d=" M576 224C576 244.896 562.64 262.666 544 269.2580000000001V384C544 419.346 515.346 448 480 448C415.015 392 337.969 320 208 320H48C21.49 320 0 298.51 0 272V176C0 149.49 21.49 128 48 128H91.263C72.521 63.35 93.742 11.621 110.077 -39.44C111.779 -44.76 115.28 -49.333 119.999 -52.32C140.779 -65.475 188.354 -67.977 213.772 -57.471C229.818 -50.838 233.732 -30.048 221.294 -17.934C202.786 0.092 191.158 18.976 201.499 42.924A12.278 12.278 0 0 1 200.454 54.597C184.145 79.276 196.873 116.704 228.971 127.349C346.403 120.113 418.591 52.919 480 0C515.346 0 544 28.654 544 64V178.742C562.64 185.334 576 203.104 576 224zM480 84.145C425.391 129.124 354.967 177.085 256 189.127V258.874C354.967 270.916 425.391 318.876 480 363.856V84.145z" />
+    <glyph glyph-name="bullseye"
+      unicode="&#xF140;"
+      horiz-adv-x="512" d=" M256 376C357.689 376 440 293.705 440 192C440 90.311 357.705 8 256 8C154.311 8 72 90.295 72 192C72 293.689 154.295 376 256 376M256 440C119.033 440 8 328.967 8 192S119.033 -56 256 -56S504 55.033 504 192S392.967 440 256 440zM256 256C291.29 256 320 227.29 320 192S291.29 128 256 128S192 156.71 192 192S220.71 256 256 256M256 320C185.308 320 128 262.692 128 192S185.308 64 256 64S384 121.308 384 192S326.692 320 256 320z" />
+    <glyph glyph-name="burn"
+      unicode="&#xF46A;"
+      horiz-adv-x="384" d=" M192 448C79.7 346.7 0 227.1 0 147.5C0 23 79 -64 192 -64S384 23 384 147.5C384 227.4 303.8 347.1 192 448zM192 0C135.5 0 96 39 96 94.8C96 108.3 100.6 156.3 192 256C283.4 156.3 288 108.3 288 94.8C288 39 248.5 0 192 0z" />
+    <glyph glyph-name="bus"
+      unicode="&#xF207;"
+      horiz-adv-x="512" d=" M512 296V216C512 202.745 501.255 192 488 192H480V24C480 10.745 469.255 0 456 0H448V-40C448 -53.255 437.255 -64 424 -64H376C362.745 -64 352 -53.255 352 -40V0H160V-40C160 -53.255 149.255 -64 136 -64H88C74.745 -64 64 -53.255 64 -40V0H56C42.745 0 32 10.745 32 24V192H24C10.745 192 0 202.745 0 216V296C0 309.255 10.745 320 24 320H32V368C32 412.183 132.288 448 256 448S480 412.183 480 368V320H488C501.255 320 512 309.255 512 296zM112 128C89.909 128 72 110.091 72 88S89.909 48 112 48S152 65.909 152 88S134.091 128 112 128zM400 128C377.909 128 360 110.091 360 88S377.909 48 400 48S440 65.909 440 88S422.091 128 400 128zM432 184V328C432 341.255 421.255 352 408 352H104C90.745 352 80 341.255 80 328V184C80 170.745 90.745 160 104 160H408C421.255 160 432 170.745 432 184z" />
+    <glyph glyph-name="calculator"
+      unicode="&#xF1EC;"
+      horiz-adv-x="448" d=" M0 -16V400C0 426.51 21.49 448 48 448H400C426.51 448 448 426.51 448 400V-16C448 -42.51 426.51 -64 400 -64H48C21.49 -64 0 -42.51 0 -16zM384 268V372C384 378.627 378.627 384 372 384H76C69.373 384 64 378.627 64 372V268C64 261.373 69.373 256 76 256H372C378.627 256 384 261.373 384 268zM128 140V180C128 186.627 122.627 192 116 192H76C69.373 192 64 186.627 64 180V140C64 133.373 69.373 128 76 128H116C122.627 128 128 133.373 128 140zM384 12V180C384 186.627 378.627 192 372 192H332C325.373 192 320 186.627 320 180V12C320 5.373 325.373 0 332 0H372C378.627 0 384 5.373 384 12zM128 12V52C128 58.627 122.627 64 116 64H76C69.373 64 64 58.627 64 52V12C64 5.373 69.373 0 76 0H116C122.627 0 128 5.373 128 12zM256 140V180C256 186.627 250.627 192 244 192H204C197.373 192 192 186.627 192 180V140C192 133.373 197.373 128 204 128H244C250.627 128 256 133.373 256 140zM256 12V52C256 58.627 250.627 64 244 64H204C197.373 64 192 58.627 192 52V12C192 5.373 197.373 0 204 0H244C250.627 0 256 5.373 256 12z" />
+    <glyph glyph-name="calendar-alt"
+      unicode="&#xF073;"
+      horiz-adv-x="448" d=" M436 288H12C5.4 288 0 293.4 0 300V336C0 362.5 21.5 384 48 384H96V436C96 442.6 101.4 448 108 448H148C154.6 448 160 442.6 160 436V384H288V436C288 442.6 293.4 448 300 448H340C346.6 448 352 442.6 352 436V384H400C426.5 384 448 362.5 448 336V300C448 293.4 442.6 288 436 288zM12 256H436C442.6 256 448 250.6 448 244V-16C448 -42.5 426.5 -64 400 -64H48C21.5 -64 0 -42.5 0 -16V244C0 250.6 5.4 256 12 256zM128 52C128 58.6 122.6 64 116 64H76C69.4 64 64 58.6 64 52V12C64 5.4 69.4 0 76 0H116C122.6 0 128 5.4 128 12V52zM128 180C128 186.6 122.6 192 116 192H76C69.4 192 64 186.6 64 180V140C64 133.4 69.4 128 76 128H116C122.6 128 128 133.4 128 140V180zM256 52C256 58.6 250.6 64 244 64H204C197.4 64 192 58.6 192 52V12C192 5.4 197.4 0 204 0H244C250.6 0 256 5.4 256 12V52zM256 180C256 186.6 250.6 192 244 192H204C197.4 192 192 186.6 192 180V140C192 133.4 197.4 128 204 128H244C250.6 128 256 133.4 256 140V180zM384 52C384 58.6 378.6 64 372 64H332C325.4 64 320 58.6 320 52V12C320 5.4 325.4 0 332 0H372C378.6 0 384 5.4 384 12V52zM384 180C384 186.6 378.6 192 372 192H332C325.4 192 320 186.6 320 180V140C320 133.4 325.4 128 332 128H372C378.6 128 384 133.4 384 140V180z" />
+    <glyph glyph-name="calendar-check"
+      unicode="&#xF274;"
+      horiz-adv-x="448" d=" M436 288H12C5.373 288 0 293.373 0 300V336C0 362.51 21.49 384 48 384H96V436C96 442.627 101.373 448 108 448H148C154.627 448 160 442.627 160 436V384H288V436C288 442.627 293.373 448 300 448H340C346.627 448 352 442.627 352 436V384H400C426.51 384 448 362.51 448 336V300C448 293.373 442.627 288 436 288zM12 256H436C442.627 256 448 250.627 448 244V-16C448 -42.51 426.51 -64 400 -64H48C21.49 -64 0 -42.51 0 -16V244C0 250.627 5.373 256 12 256zM345.296 160.053L317.127 188.451C312.4600000000001 193.156 304.862 193.187 300.1570000000001 188.519L194.12 83.335L148.14 129.687C143.473 134.392 135.874 134.423 131.169 129.755L102.772 101.5849999999999C98.067 96.918 98.036 89.3199999999999 102.704 84.6149999999999L185.305 1.3459999999999C189.972 -3.3590000000001 197.57 -3.3900000000001 202.275 1.2779999999999L345.228 143.0829999999999C349.933 147.7499999999999 349.964 155.3479999999999 345.296 160.0529999999999z" />
+    <glyph glyph-name="calendar-minus"
+      unicode="&#xF272;"
+      horiz-adv-x="448" d=" M436 288H12C5.4 288 0 293.4 0 300V336C0 362.5 21.5 384 48 384H96V436C96 442.6 101.4 448 108 448H148C154.6 448 160 442.6 160 436V384H288V436C288 442.6 293.4 448 300 448H340C346.6 448 352 442.6 352 436V384H400C426.5 384 448 362.5 448 336V300C448 293.4 442.6 288 436 288zM12 256H436C442.6 256 448 250.6 448 244V-16C448 -42.5 426.5 -64 400 -64H48C21.5 -64 0 -42.5 0 -16V244C0 250.6 5.4 256 12 256zM316 64C322.6 64 328 69.4 328 76V116C328 122.6 322.6 128 316 128H132C125.4 128 120 122.6 120 116V76C120 69.4 125.4 64 132 64H316z" />
+    <glyph glyph-name="calendar-plus"
+      unicode="&#xF271;"
+      horiz-adv-x="448" d=" M436 288H12C5.4 288 0 293.4 0 300V336C0 362.5 21.5 384 48 384H96V436C96 442.6 101.4 448 108 448H148C154.6 448 160 442.6 160 436V384H288V436C288 442.6 293.4 448 300 448H340C346.6 448 352 442.6 352 436V384H400C426.5 384 448 362.5 448 336V300C448 293.4 442.6 288 436 288zM12 256H436C442.6 256 448 250.6 448 244V-16C448 -42.5 426.5 -64 400 -64H48C21.5 -64 0 -42.5 0 -16V244C0 250.6 5.4 256 12 256zM328 116C328 122.6 322.6 128 316 128H256V188C256 194.6 250.6 200 244 200H204C197.4 200 192 194.6 192 188V128H132C125.4 128 120 122.6 120 116V76C120 69.4 125.4 64 132 64H192V4C192 -2.6 197.4 -8 204 -8H244C250.6 -8 256 -2.6 256 4V64H316C322.6 64 328 69.4 328 76V116z" />
+    <glyph glyph-name="calendar-times"
+      unicode="&#xF273;"
+      horiz-adv-x="448" d=" M436 288H12C5.4 288 0 293.4 0 300V336C0 362.5 21.5 384 48 384H96V436C96 442.6 101.4 448 108 448H148C154.6 448 160 442.6 160 436V384H288V436C288 442.6 293.4 448 300 448H340C346.6 448 352 442.6 352 436V384H400C426.5 384 448 362.5 448 336V300C448 293.4 442.6 288 436 288zM12 256H436C442.6 256 448 250.6 448 244V-16C448 -42.5 426.5 -64 400 -64H48C21.5 -64 0 -42.5 0 -16V244C0 250.6 5.4 256 12 256zM269.3 96L317.4000000000001 144.1C322.1 148.8 322.1 156.4 317.4000000000001 161.1L289.1 189.4C284.4000000000001 194.1 276.8 194.1 272.1 189.4L224 141.3L175.9 189.4C171.2 194.1 163.6 194.1 158.9 189.4L130.6 161.1C125.9 156.4 125.9 148.8 130.6 144.1L178.7 96L130.6 47.9C125.9 43.2 125.9 35.6 130.6 30.9L158.9 2.6C163.6 -2.1 171.2 -2.1 175.9 2.6L224 50.7L272.1 2.6C276.8 -2.1 284.4000000000001 -2.1 289.1 2.6L317.4000000000001 30.9C322.1 35.6 322.1 43.2 317.4000000000001 47.9L269.3 96z" />
+    <glyph glyph-name="calendar"
+      unicode="&#xF133;"
+      horiz-adv-x="448" d=" M12 256H436C442.6 256 448 250.6 448 244V-16C448 -42.5 426.5 -64 400 -64H48C21.5 -64 0 -42.5 0 -16V244C0 250.6 5.4 256 12 256zM448 300V336C448 362.5 426.5 384 400 384H352V436C352 442.6 346.6 448 340 448H300C293.4 448 288 442.6 288 436V384H160V436C160 442.6 154.6 448 148 448H108C101.4 448 96 442.6 96 436V384H48C21.5 384 0 362.5 0 336V300C0 293.4 5.4 288 12 288H436C442.6 288 448 293.4 448 300z" />
+    <glyph glyph-name="camera-retro"
+      unicode="&#xF083;"
+      horiz-adv-x="512" d=" M48 416C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H464C490.5 -32 512 -10.5 512 16V368C512 394.5 490.5 416 464 416H48zM48 384H154C157.3 384 160 381.3 160 378V358C160 354.7 157.3 352 154 352H38C34.7 352 32 354.7 32 358V368C32 376.8 39.2 384 48 384zM474 288H38C34.7 288 32 290.7 32 294V330C32 333.3 34.7 336 38 336H176L206.2 381.3C207.3 383 209.2 384 211.2 384H464C472.8 384 480 376.8 480 368V294C480 290.7 477.3 288 474 288zM256 24C189.8 24 136 77.8 136 144S189.8 264 256 264S376 210.2 376 144S322.2 24 256 24zM256 232C207.5 232 168 192.5 168 144S207.5 56 256 56S344 95.5 344 144S304.5 232 256 232zM208 128C199.2 128 192 135.2 192 144C192 179.3 220.7 208 256 208C264.8 208 272 200.8 272 192S264.8 176 256 176C238.4 176 224 161.6 224 144C224 135.2 216.8 128 208 128z" />
+    <glyph glyph-name="camera"
+      unicode="&#xF030;"
+      horiz-adv-x="512" d=" M512 304V16C512 -10.5 490.5 -32 464 -32H48C21.5 -32 0 -10.5 0 16V304C0 330.5 21.5 352 48 352H136L148.3 384.9C155.3 403.6 173.2 416 193.2 416H318.7000000000001C338.7000000000001 416 356.6 403.6 363.6 384.9L376 352H464C490.5 352 512 330.5 512 304zM376 160C376 226.2 322.2 280 256 280S136 226.2 136 160S189.8 40 256 40S376 93.8 376 160zM344 160C344 111.5 304.5 72 256 72S168 111.5 168 160S207.5 248 256 248S344 208.5 344 160z" />
+    <glyph glyph-name="capsules"
+      unicode="&#xF46B;"
+      horiz-adv-x="576" d=" M555.3 147.9L424.2 335.2C401.9 367 366.4 384 330.4 384C307.8 384 284.9 377.3 264.9 363.3C245.2 349.5 231.2 330.5 223.4 309.5C220.5 368.8 172 416 112 416C50.1 416 0 365.9 0 304V80C0 18.1 50.1 -32 112 -32S224 18.1 224 80V229.1C227.3 220.5 231.3 212 236.8 204.1L368 16.8C390.2 -15 425.7 -32 461.8 -32C484.5 -32 507.3 -25.3 527.3 -11.3C579 24.9 591.5 96.2 555.3 147.9zM160 192H64V304C64 330.5 85.5 352 112 352S160 330.5 160 304V192zM354.8 147.1L289.2000000000001 240.8C281.5000000000001 251.8 278.5000000000001 265.2000000000001 280.9000000000001 278.4C283.2000000000001 291.6 290.6 303.2000000000001 301.6 310.9C310.1 316.9 320.1 320 330.4000000000001 320C346.9000000000001 320 362.3 312 371.7000000000001 298.5L437.3000000000001 204.8L354.8000000000001 147.1z" />
+    <glyph glyph-name="car"
+      unicode="&#xF1B9;"
+      horiz-adv-x="512" d=" M499.991 280H445.176L437.322 300.944C428.13 325.457 411.897 346.295 390.38 361.207S343.651 384 317.472 384H194.528C168.348 384 143.137 376.118 121.62 361.207C100.102 346.295 83.87 325.457 74.678 300.944L66.824 280H12.009C3.818 280 -1.965 271.976 0.625 264.2050000000001L8.625 240.205A12 12 0 0 1 20.009 232H48.824L48.772 231.86C29.222 220.907 16 200.003 16 176V128C16 111.775 22.049 96.971 32 85.691V24C32 10.745 42.745 0 56 0H104C117.255 0 128 10.745 128 24V64H384V24C384 10.745 394.745 0 408 0H456C469.255 0 480 10.745 480 24V85.691C489.951 96.972 496 111.776 496 128V176C496 200.003 482.778 220.907 463.228 231.86L463.176 232H491.991A12 12 0 0 1 503.375 240.205L511.375 264.2050000000001C513.965 271.976 508.182 280 499.991 280zM134.603 278.472C143.918 303.3110000000001 168 320 194.528 320H317.472C344 320 368.082 303.3110000000001 377.397 278.472L391.824 240H120.176L134.603 278.472zM88 120C70.327 120 56 134.327 56 152C56 169.673 70.327 184 88 184S136 153.673 136 136S105.673 120 88 120zM424 120C406.327 120 376 118.327 376 136C376 153.673 406.327 184 424 184S456 169.673 456 152C456 134.327 441.673 120 424 120z" />
+    <glyph glyph-name="caret-down"
+      unicode="&#xF0D7;"
+      horiz-adv-x="320" d=" M31.3 256H288.6C306.4000000000001 256 315.3 234.5 302.7000000000001 221.9L174.1 93.2C166.3 85.4 153.6 85.4 145.8 93.2L17.2 221.9C4.6 234.5 13.5 256 31.3 256z" />
+    <glyph glyph-name="caret-left"
+      unicode="&#xF0D9;"
+      horiz-adv-x="192" d=" M192 320.6620000000001V63.338C192 45.52 170.457 36.597 157.858 49.196L29.196 177.858C21.386 185.668 21.386 198.332 29.196 206.142L157.858 334.804C170.457 347.404 192 338.48 192 320.6620000000001z" />
+    <glyph glyph-name="caret-right"
+      unicode="&#xF0DA;"
+      horiz-adv-x="192" d=" M0 63.338V320.6620000000001C0 338.48 21.543 347.403 34.142 334.804L162.804 206.142C170.614 198.332 170.614 185.668 162.804 177.858L34.142 49.196C21.543 36.596 0 45.52 0 63.338z" />
+    <glyph glyph-name="caret-square-down"
+      unicode="&#xF150;"
+      horiz-adv-x="448" d=" M448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM92.5 227.5L215.5 104.5C220.2 99.8 227.8 99.8 232.5 104.5L355.5 227.5C363.1 235.1 357.7 248 347 248H101C90.3 248 84.9 235.1 92.5 227.5z" />
+    <glyph glyph-name="caret-square-left"
+      unicode="&#xF191;"
+      horiz-adv-x="448" d=" M400 -32H48C21.49 -32 0 -10.51 0 16V368C0 394.51 21.49 416 48 416H400C426.51 416 448 394.51 448 368V16C448 -10.51 426.51 -32 400 -32zM259.515 323.515L136.485 200.485C131.799 195.799 131.799 188.201 136.485 183.514L259.514 60.485C267.074 52.925 279.999 58.279 279.999 68.97V315.029C280 325.7200000000001 267.074 331.074 259.5150000000001 323.515z" />
+    <glyph glyph-name="caret-square-right"
+      unicode="&#xF152;"
+      horiz-adv-x="448" d=" M48 416H400C426.51 416 448 394.51 448 368V16C448 -10.51 426.51 -32 400 -32H48C21.49 -32 0 -10.51 0 16V368C0 394.51 21.49 416 48 416zM188.485 60.485L311.514 183.514C316.2 188.2 316.2 195.798 311.514 200.485L188.485 323.515C180.925 331.0750000000001 168 325.721 168 315.0300000000001V68.971C168 58.28 180.926 52.926 188.485 60.485z" />
+    <glyph glyph-name="caret-square-up"
+      unicode="&#xF151;"
+      horiz-adv-x="448" d=" M0 16V368C0 394.51 21.49 416 48 416H400C426.51 416 448 394.51 448 368V16C448 -10.51 426.51 -32 400 -32H48C21.49 -32 0 -10.51 0 16zM355.515 156.485L232.485 279.515C227.799 284.201 220.201 284.201 215.514 279.515L92.485 156.485C84.925 148.925 90.279 136 100.97 136H347.029C357.72 136 363.074 148.926 355.515 156.485z" />
+    <glyph glyph-name="caret-up"
+      unicode="&#xF0D8;"
+      horiz-adv-x="320" d=" M288.662 96H31.338C13.52 96 4.597 117.543 17.196 130.142L145.858 258.804C153.668 266.6140000000001 166.332 266.6140000000001 174.142 258.804L302.804 130.142C315.404 117.543 306.48 96 288.662 96z" />
+    <glyph glyph-name="cart-arrow-down"
+      unicode="&#xF218;"
+      horiz-adv-x="576" d=" M504.717 128H211.572L218.117 96H486.535C501.936 96 513.351 81.699 509.938 66.681L504.421 42.405C523.112 33.332 536 14.172 536 -8C536 -39.202 510.481 -64.444 479.176 -63.994C449.353 -63.565 424.826 -39.3630000000001 424.021 -9.547C423.581 6.74 430.106 21.502 440.824 32.001H231.176C241.553 21.835 248 7.674 248 -8C248 -39.813 221.472 -65.431 189.33 -63.938C160.79 -62.613 137.579 -39.553 136.079 -11.021C134.921 11.013 146.515 30.434 164.13 40.5650000000001L93.883 384H24C10.745 384 0 394.745 0 408V424C0 437.255 10.745 448 24 448H126.529C137.93 448 147.757 439.979 150.042 428.81L159.208 384H551.99C567.391 384 578.806 369.699 575.393 354.681L528.12 146.681C525.637 135.754 515.923 128 504.717 128zM403.029 256H360V316C360 322.627 354.627 328 348 328H324C317.373 328 312 322.627 312 316V256H268.971C258.2800000000001 256 252.926 243.074 260.486 235.515L327.515 168.486C332.201 163.8 339.799 163.8 344.486 168.486L411.515 235.515C419.074 243.074 413.72 256 403.029 256z" />
+    <glyph glyph-name="cart-plus"
+      unicode="&#xF217;"
+      horiz-adv-x="576" d=" M504.717 128H211.572L218.117 96H486.535C501.936 96 513.351 81.699 509.938 66.681L504.421 42.405C523.112 33.332 536 14.172 536 -8C536 -39.202 510.481 -64.444 479.176 -63.994C449.353 -63.565 424.826 -39.3630000000001 424.021 -9.547C423.581 6.74 430.106 21.502 440.824 32.001H231.176C241.553 21.835 248 7.674 248 -8C248 -39.813 221.472 -65.431 189.33 -63.938C160.79 -62.613 137.579 -39.553 136.079 -11.021C134.921 11.013 146.515 30.434 164.13 40.5650000000001L93.883 384H24C10.745 384 0 394.745 0 408V424C0 437.255 10.745 448 24 448H126.529C137.93 448 147.757 439.979 150.042 428.81L159.208 384H551.99C567.391 384 578.806 369.699 575.393 354.681L528.12 146.681C525.637 135.754 515.923 128 504.717 128zM408 280H360V320C360 328.837 352.837 336 344 336H328C319.163 336 312 328.837 312 320V280H264C255.163 280 248 272.837 248 264V248C248 239.163 255.163 232 264 232H312V192C312 183.163 319.163 176 328 176H344C352.837 176 360 183.163 360 192V232H408C416.837 232 424 239.163 424 248V264C424 272.837 416.837 280 408 280z" />
+    <glyph glyph-name="certificate"
+      unicode="&#xF0A3;"
+      horiz-adv-x="512" d=" M458.622 192.08L504.607 237.085C518.315 250.062 511.923 273.124 493.943 277.424L431.2930000000001 293.414L448.9540000000001 355.4290000000001C453.9450000000001 373.2670000000001 437.1250000000001 390.092 419.2930000000001 385.1L357.2990000000001 367.433L341.3150000000001 430.1040000000001C337.085 447.803 313.765 454.276 300.99 440.772L256 394.43L211.011 440.771C198.381 454.122 174.964 448.005 170.686 430.103L154.702 367.432L92.707 385.099C74.87 390.093 58.056 373.262 63.046 355.428L80.707 293.413L18.057 277.423C0.069 273.122 -6.31 250.056 7.392 237.085L53.377 192.08L7.392 147.076C-6.316 134.0990000000001 0.076 111.037 18.056 106.737L80.706 90.747L63.045 28.732C58.054 10.894 74.874 -5.931 92.706 -0.939L154.7 16.7280000000001L170.684 -45.9429999999999C175.123 -64.5179999999999 198.38 -69.9609999999999 211.009 -56.6109999999999L256 -10.61L300.989 -56.611C313.489 -70.0989999999999 336.976 -64.097 341.314 -45.943L357.298 16.728L419.2919999999999 -0.939C437.128 -5.933 453.9429999999999 10.898 448.9529999999999 28.732L431.2919999999999 90.747L493.9419999999999 106.737C511.9289999999999 111.0390000000001 518.3079999999999 134.1040000000001 504.6059999999999 147.076L458.6219999999999 192.08z" />
+    <glyph glyph-name="chalkboard-teacher"
+      unicode="&#xF51C;"
+      horiz-adv-x="640" d=" M208 96C205.61 96 203.22 95.65 200.94 94.91C187.98 90.7 174.35 88 160 88C145.65 88 132.02 90.7 119.05 94.91C116.77 95.65 114.39 96 112 96C49.94 96 -0.33 45.52 0 -16.62C0.14 -42.88 21.73 -64 48 -64H272C298.27 -64 319.86 -42.88 320 -16.62C320.33 45.52 270.06 96 208 96zM160 128C213.02 128 256 170.98 256 224S213.02 320 160 320S64 277.02 64 224S106.98 128 160 128zM592 448H208C181.53 448 160 425.75 160 398.41V352C183.42 352 205.1 345.2200000000001 224 334.2V384H576V96H512V160H384V96H307.76C326.86 79.31 340.88 57.27 347.45 32H592C618.47 32 640 54.25 640 81.59V398.41C640 425.75 618.47 448 592 448z" />
+    <glyph glyph-name="chalkboard"
+      unicode="&#xF51B;"
+      horiz-adv-x="640" d=" M96 384H544V32H608V408C608 430.06 590.06 448 568 448H72C49.94 448 32 430.06 32 408V32H96V384zM624 0H480V64H288V0H16C7.16 0 0 -7.16 0 -16V-48C0 -56.84 7.16 -64 16 -64H624C632.84 -64 640 -56.84 640 -48V-16C640 -7.16 632.84 0 624 0z" />
+    <glyph glyph-name="chart-area"
+      unicode="&#xF1FE;"
+      horiz-adv-x="512" d=" M500 64C506.6 64 512 58.6 512 52V12C512 5.4 506.6 0 500 0H12C5.4 0 0 5.4 0 12V372C0 378.6 5.4 384 12 384H52C58.6 384 64 378.6 64 372V64H500zM372.7 288.5L288 232L202.7 345.7C197.6 352.5 187.2 352 182.8 344.7L96 200V96H480L390.1 283.8C386.9000000000001 290.3 378.7000000000001 292.5 372.7000000000001 288.5z" />
+    <glyph glyph-name="chart-bar"
+      unicode="&#xF080;"
+      horiz-adv-x="512" d=" M500 64C506.6 64 512 58.6 512 52V12C512 5.4 506.6 0 500 0H12C5.4 0 0 5.4 0 12V372C0 378.6 5.4 384 12 384H52C58.6 384 64 378.6 64 372V64H500zM192 108V180C192 186.6 186.6 192 180 192H140C133.4 192 128 186.6 128 180V108C128 101.4 133.4 96 140 96H180C186.6 96 192 101.4 192 108zM384 108V244C384 250.6 378.6 256 372 256H332C325.4 256 320 250.6 320 244V108C320 101.4 325.4 96 332 96H372C378.6 96 384 101.4 384 108zM288 108V308C288 314.6 282.6 320 276 320H236C229.4 320 224 314.6 224 308V108C224 101.4 229.4 96 236 96H276C282.6 96 288 101.4 288 108zM480 108V340C480 346.6 474.6 352 468 352H428C421.4 352 416 346.6 416 340V108C416 101.4 421.4 96 428 96H468C474.6 96 480 101.4 480 108z" />
+    <glyph glyph-name="chart-line"
+      unicode="&#xF201;"
+      horiz-adv-x="512" d=" M500 64C506.6 64 512 58.6 512 52V12C512 5.4 506.6 0 500 0H12C5.4 0 0 5.4 0 12V372C0 378.6 5.4 384 12 384H52C58.6 384 64 378.6 64 372V64H500zM456 352H344C322.6 352 311.9 326.1 327 311L359.9 278.1L287.9 205.2L232.3 260.8C227.6 265.5 220.1 265.5 215.4 260.8L96.4 143C91.7 138.4 91.6 130.8 96.2 126.1L124.7 96.7000000000001C129.4 91.9 137.1 91.8000000000001 141.8 96.6L223.9 178.7000000000001L279.4 123.2000000000001C284.1 118.5000000000001 291.7 118.5000000000001 296.4 123.2000000000001L405.6 232.4000000000001L439 199C454.1 183.9 480 194.6 480 216V328C480 341.3 469.3 352 456 352z" />
+    <glyph glyph-name="chart-pie"
+      unicode="&#xF200;"
+      horiz-adv-x="576" d=" M288 435.7V208H515.7C522.6 208 528 213.8 527.7 220.7C521.3000000000001 343.1 423.2000000000001 441.3 300.7000000000001 447.7C293.8000000000001 448 288.0000000000001 442.6 288.0000000000001 435.7zM552.7 160C559.6 160 565 154.2 564.7 147.3C561.9000000000001 94.1 541.5 41.7 503.5000000000001 -0.5C498.9 -5.6 490.9 -5.9 486.0000000000001 -1L325 160H552.7zM401 15C405.8 10.2 405.7 2.2 400.6 -2.3C358 -40.7 301.6 -64 239.8 -64C107.6 -63.9 -0.2 44.2 0 176.5C0.2 304.6 100.8 409.1 227.3 415.7C234.2 416.1 240 410.6 240 403.7V176L401 15z" />
+    <glyph glyph-name="check-circle"
+      unicode="&#xF058;"
+      horiz-adv-x="512" d=" M504 192C504 55.033 392.967 -56 256 -56S8 55.033 8 192S119.033 440 256 440S504 328.967 504 192zM227.314 60.686L411.314 244.686C417.562 250.934 417.562 261.065 411.314 267.313L388.687 289.94C382.439 296.189 372.308 296.189 366.059 289.94L216 139.882L145.941 209.941C139.693 216.189 129.562 216.189 123.313 209.941L100.686 187.314C94.438 181.066 94.438 170.935 100.686 164.687L204.686 60.687C210.935 54.438 221.065 54.438 227.314 60.686z" />
+    <glyph glyph-name="check-square"
+      unicode="&#xF14A;"
+      horiz-adv-x="448" d=" M400 -32H48C21.49 -32 0 -10.51 0 16V368C0 394.51 21.49 416 48 416H400C426.51 416 448 394.51 448 368V16C448 -10.51 426.51 -32 400 -32zM195.314 66.059L379.314 250.059C385.562 256.307 385.562 266.438 379.314 272.686L356.687 295.313C350.439 301.561 340.308 301.562 334.059 295.313L184 145.255L113.941 215.314C107.693 221.562 97.562 221.562 91.313 215.314L68.686 192.687C62.438 186.439 62.438 176.308 68.686 170.06L172.686 66.06C178.935 59.81 189.065 59.81 195.314 66.059z" />
+    <glyph glyph-name="check"
+      unicode="&#xF00C;"
+      horiz-adv-x="512" d=" M173.898 8.596L7.498 174.996C-2.499 184.993 -2.499 201.202 7.498 211.2L43.701 247.404C53.698 257.402 69.908 257.402 79.905 247.404L192 135.31L432.0950000000001 375.404C442.0920000000001 385.401 458.302 385.401 468.299 375.404L504.5020000000001 339.2C514.499 329.203 514.499 312.9940000000001 504.5020000000001 302.996L210.1020000000001 8.595C200.1040000000001 -1.402 183.8950000000001 -1.402 173.8980000000001 8.5959999999999z" />
+    <glyph glyph-name="chess-bishop"
+      unicode="&#xF43A;"
+      horiz-adv-x="320" d=" M123.158 370.1190000000001C107.369 375.4700000000001 96 390.403 96 408C96 430.091 113.909 448 136 448H183.796C205.887 448 223.796 430.091 223.796 408C223.796 390.459 212.501 375.5660000000001 196.791 370.171C220.784 353.514 245.368 323.332 265.4940000000001 288.121L144.929 167.557A6 6 0 0 1 144.929 159.072L159.071 144.93A6 6 0 0 1 167.556 144.93L280.9 258.274C298.658 219.977 310.271 178.831 310.271 144.001C310.271 90.215 287.374 68.213 251.825 57.968V0H68.174V57.97C32.631 68.216 9.739 90.219 9.739 144C9.739 222.029 68.02 331.766 123.158 370.1190000000001zM320 -52V-28C320 -21.373 314.627 -16 308 -16H12C5.373 -16 0 -21.373 0 -28V-52C0 -58.627 5.373 -64 12 -64H308C314.627 -64 320 -58.627 320 -52z" />
+    <glyph glyph-name="chess-board"
+      unicode="&#xF43C;"
+      horiz-adv-x="512" d=" M256 192V128H192V192H256zM256 448H192V384H256V448zM256 192H320V256H256V192zM384 448H320V384H384V448zM384 -64H448V0H384V-64zM512 0V64H448V0H512zM128 -64H192V0H128V-64zM128 448H64V384H128V448zM512 256V320H448V256H512zM512 128V192H448V128H512zM0 -64H64V0H0V-64zM0 384V320H64V384H0zM0 256V192H64V256H0zM0 128V64H64V128H0zM256 -64H320V0H256V-64zM192 64V0H256V64H192zM256 256V320H192V256H256zM64 64V0H128V64H64zM128 192H64V128H128V192zM384 64H448V128H384V64zM512 448H448V384H512V448zM384 192H448V256H384V192zM384 384V320H448V384H384zM320 64V0H384V64H320zM128 128V64H192V128H128zM256 128V64H320V128H256zM192 256H128V192H192V256zM128 320H64V256H128V320zM320 128H384V192H320V128zM192 320V384H128V320H192zM320 320V384H256V320H320zM320 256H384V320H320V256z" />
+    <glyph glyph-name="chess-king"
+      unicode="&#xF43F;"
+      horiz-adv-x="448" d=" M416 -28V-52C416 -58.627 410.627 -64 404 -64H44C37.373 -64 32 -58.627 32 -52V-28C32 -21.373 37.373 -16 44 -16H404C410.627 -16 416 -21.373 416 -28zM407.967 296H248V344H298A6 6 0 0 1 304 350V386A6 6 0 0 1 298 392H248V442A6 6 0 0 1 242 448H206A6 6 0 0 1 200 442V392H150A6 6 0 0 1 144 386V350A6 6 0 0 1 150 344H200V296H40.033C12.459 296 -6.846 268.756 2.295 242.741L87.582 0H360.418L445.7050000000001 242.741C454.846 268.756 435.541 296 407.967 296z" />
+    <glyph glyph-name="chess-knight"
+      unicode="&#xF441;"
+      horiz-adv-x="384" d=" M352 224V0H32V46.557C32 76.859 49.12 104.56 76.223 118.111L133.466 146.733A48 48 0 0 1 160 189.666V240L137.873 228.937A23.996 23.996 0 0 1 125.323 213.292L113.488 165.954A12 12 0 0 0 106.303 157.723L76.702 145.8830000000001A11.998 11.998 0 0 0 67.372 146.059L7.126 172.833A12 12 0 0 0 0 183.799V342.059C0 348.424 2.529 354.529 7.03 359.03L16 368L1.789 396.4220000000001A16.937 16.937 0 0 0 0 404C0 410.627 5.373 416 12 416H160C266.039 416 352 330.039 352 224zM372 -16H12C5.373 -16 0 -21.373 0 -28V-52C0 -58.627 5.373 -64 12 -64H372C378.627 -64 384 -58.627 384 -52V-28C384 -21.373 378.627 -16 372 -16zM52 320C40.954 320 32 311.046 32 300S40.954 280 52 280S72 288.954 72 300S63.046 320 52 320z" />
+    <glyph glyph-name="chess-pawn"
+      unicode="&#xF443;"
+      horiz-adv-x="320" d=" M264 0H56S116 42.743 116 176H84C77.373 176 72 181.373 72 188V212C72 218.627 77.373 224 84 224H124.209C95.721 237.44 76 266.4120000000001 76 300C76 346.392 113.608 384 160 384S244 346.392 244 300C244 266.4120000000001 224.279 237.44 195.791 224H236C242.627 224 248 218.627 248 212V188C248 181.373 242.627 176 236 176H204C204 42.743 264 0 264 0zM292 -16H28C21.373 -16 16 -21.373 16 -28V-52C16 -58.627 21.373 -64 28 -64H292C298.627 -64 304 -58.627 304 -52V-28C304 -21.373 298.627 -16 292 -16z" />
+    <glyph glyph-name="chess-queen"
+      unicode="&#xF445;"
+      horiz-adv-x="512" d=" M436 -64H76C69.373 -64 64 -58.627 64 -52V-28C64 -21.373 69.373 -16 76 -16H436C442.627 -16 448 -21.373 448 -28V-52C448 -58.627 442.627 -64 436 -64zM255.579 448C224.651 448 199.579 422.928 199.579 392S224.651 336 255.579 336S311.579 361.072 311.579 392S286.507 448 255.579 448zM460.147 293.366C454.3790000000001 296.411 447.2310000000001 294.298 444.0650000000001 288.596C435.4490000000001 273.0800000000001 421.3180000000001 250.795 400.0000000000001 250.795C371.2860000000001 250.795 369.3750000000001 270.5990000000001 368.3140000000001 308.337C368.1310000000001 314.829 362.8130000000001 320.0010000000001 356.3190000000001 320.0010000000001H315.3130000000001C310.1380000000001 320.0010000000001 305.5590000000001 316.673 303.9250000000002 311.7630000000001C295.0350000000002 285.0540000000001 277.8520000000002 270.7710000000001 256.0000000000001 270.7710000000001S216.9660000000001 285.0540000000001 208.0750000000001 311.7630000000001C206.4410000000001 316.673 201.8620000000001 320.0010000000001 196.6870000000001 320.0010000000001H155.6820000000001C149.1870000000001 320.0010000000001 143.8690000000001 314.827 143.6870000000001 308.3340000000001C142.6350000000001 270.692 140.7530000000001 250.795 111.9990000000001 250.795C91.3080000000001 250.795 78.1820000000001 271.019 67.5740000000001 288.8200000000001C64.3080000000001 294.3 57.3160000000001 296.2510000000001 51.6750000000001 293.273L12.4960000000001 272.5940000000001A12 12 0 0 1 6.9860000000001 257.449L112 0H400L505.014 257.448A12 12 0 0 1 499.504 272.593L460.147 293.366z" />
+    <glyph glyph-name="chess-rook"
+      unicode="&#xF447;"
+      horiz-adv-x="384" d=" M81.241 232.973C80.957 189.08 77.411 99.924 48 0H335.9820000000001C306.5820000000001 99.604 303.0460000000001 188.912 302.761 232.975L348.1790000000001 275.287A11.998 11.998 0 0 1 351.999 284.067V404C351.999 410.627 346.6260000000001 416 339.999 416H299.999C293.372 416 287.999 410.627 287.999 404V360H239.999V404C239.999 410.627 234.6260000000001 416 227.999 416H155.999C149.372 416 143.999 410.627 143.999 404V360H96V404C96 410.627 90.627 416 84 416H44C37.373 416 32 410.627 32 404V284.068C32 280.738 33.384 277.558 35.82 275.288L81.241 232.973zM160 192C160 209.673 174.327 224 192 224C209.673 224 224 209.673 224 192V127.996H160V192zM384 -28V-52C384 -58.627 378.627 -64 372 -64H12C5.373 -64 0 -58.627 0 -52V-28C0 -21.373 5.373 -16 12 -16H372C378.627 -16 384 -21.373 384 -28z" />
+    <glyph glyph-name="chess"
+      unicode="&#xF439;"
+      horiz-adv-x="512" d=" M199.821 230.367A6 6 0 0 0 205.821 224.367L205.82 203.601A6 6 0 0 0 199.82 197.601H174.015C174.015 165.886 171.862 101.4 191.413 44.372H64.597C84.54 102.548 82.02 168.755 82.02 197.601H56.183A6 6 0 0 0 50.183 203.601L50.185 224.367A6 6 0 0 0 56.185 230.367H199.821zM41.554 332.9120000000001L76.134 237.841H179.868L214.44 332.913C217.286 340.7390000000001 211.49 349.014 203.162 349.014H152V379.2340000000001H173.57A6 6 0 0 1 179.57 385.2340000000001V407.617A6 6 0 0 1 173.57 413.617H145.203V442A6 6 0 0 1 139.203 448H116.82A6 6 0 0 1 110.82 442V413.617H82.421A6 6 0 0 1 76.421 407.617V385.2340000000001A6 6 0 0 1 82.421 379.2340000000001H104V349.015H52.831C44.503 349.014 38.707 340.7390000000001 41.554 332.9120000000001zM222.678 2.83V30.897A6 6 0 0 1 216.678 36.897H39.322A6 6 0 0 1 33.322 30.897V2.83L11.174 -11.334A6 6 0 0 1 8.407 -16.389V-58A6 6 0 0 1 14.407 -64H241.594A6 6 0 0 1 247.594 -58V-16.388A6 6 0 0 1 244.8270000000001 -11.333L222.678 2.83zM313.256 147.055L338.136 130.0919999999999C338.226 111.9679999999999 337.969 66.1879999999999 326.231 15.5699999999999H473.757C462.044 66.045 461.788 111.894 461.875 130.107L486.734 147.056A3.856 3.856 0 0 1 488.418 150.243V220.144A3.8569999999999998 3.8569999999999998 0 0 1 484.561 224.001H456.9059999999999A3.8569999999999998 3.8569999999999998 0 0 1 453.0489999999999 220.144V188.63H430.3119999999999V220.144A3.8569999999999998 3.8569999999999998 0 0 1 426.4539999999999 224.001H373.5359999999999A3.8569999999999998 3.8569999999999998 0 0 1 369.6789999999999 220.144V188.63H346.9419999999999V220.144A3.8569999999999998 3.8569999999999998 0 0 1 343.0849999999998 224.001H315.43A3.8569999999999998 3.8569999999999998 0 0 1 311.573 220.144V150.243A3.8549999999999995 3.8549999999999995 0 0 1 313.256 147.055zM384.841 95.149C384.841 103.521 391.628 110.307 400 110.307S415.158 103.52 415.158 95.149V64.831H384.841V95.149zM504.62 -22.059L490.956 -11.42V4.132A3.8569999999999998 3.8569999999999998 0 0 1 487.099 7.989H312.915A3.8569999999999998 3.8569999999999998 0 0 1 309.058 4.132V-11.42L295.381 -22.059A3.8569999999999998 3.8569999999999998 0 0 1 293.893 -25.103V-60.142A3.8569999999999998 3.8569999999999998 0 0 1 297.75 -63.999H502.25A3.8569999999999998 3.8569999999999998 0 0 1 506.107 -60.142V-25.102A3.859 3.859 0 0 1 504.62 -22.059z" />
+    <glyph glyph-name="chevron-circle-down"
+      unicode="&#xF13A;"
+      horiz-adv-x="512" d=" M504 192C504 55 393 -56 256 -56S8 55 8 192S119 440 256 440S504 329 504 192zM273 78.1L408.5 213.6C417.9 223 417.9 238.2 408.5 247.5000000000001L391.5 264.5C382.1 273.9000000000001 366.9 273.9000000000001 357.6 264.5L256 162.9L154.4 264.5C145 273.9 129.8 273.9 120.5 264.5L103.5 247.5C94.1 238.1 94.1 222.9 103.5 213.6L239 78.1C248.4 68.7000000000001 263.6 68.7000000000001 273 78.1z" />
+    <glyph glyph-name="chevron-circle-left"
+      unicode="&#xF137;"
+      horiz-adv-x="512" d=" M256 -56C119 -56 8 55 8 192S119 440 256 440S504 329 504 192S393 -56 256 -56zM142.1 175L277.6 39.5C287 30.1 302.2000000000001 30.1 311.5 39.5L328.5 56.5C337.9 65.9 337.9 81.1 328.5 90.4L226.9 192L328.5 293.6C337.9 303 337.9 318.2 328.5 327.5L311.5 344.5C302.1 353.9 286.9 353.9 277.6 344.5L142.1 209C132.7 199.6 132.7 184.4 142.1 175z" />
+    <glyph glyph-name="chevron-circle-right"
+      unicode="&#xF138;"
+      horiz-adv-x="512" d=" M256 440C393 440 504 329 504 192S393 -56 256 -56S8 55 8 192S119 440 256 440zM369.9 209L234.4 344.5C225 353.9 209.8 353.9 200.5 344.5L183.5 327.5C174.1 318.1 174.1 302.9 183.5 293.6L285.1 192L183.5 90.4C174.1 81 174.1 65.8 183.5 56.5L200.5 39.5C209.9 30.1 225.1 30.1 234.4 39.5L369.9 175C379.3 184.4 379.3 199.6 369.9 209z" />
+    <glyph glyph-name="chevron-circle-up"
+      unicode="&#xF139;"
+      horiz-adv-x="512" d=" M8 192C8 329 119 440 256 440S504 329 504 192S393 -56 256 -56S8 55 8 192zM239 305.9L103.5 170.4C94.1 161 94.1 145.8 103.5 136.5L120.5 119.5C129.9 110.1 145.1 110.1 154.4 119.5L256 221.1L357.6 119.5C367 110.1 382.2000000000001 110.1 391.5 119.5L408.5 136.5C417.9 145.9 417.9 161.1 408.5 170.4L273 305.9C263.6 315.3 248.4 315.3 239 305.9z" />
+    <glyph glyph-name="chevron-down"
+      unicode="&#xF078;"
+      horiz-adv-x="448" d=" M207.029 66.524L12.686 260.868C3.313 270.241 3.313 285.437 12.686 294.809L35.353 317.476C44.71 326.833 59.875 326.851 69.254 317.516L224 163.495L378.745 317.516C388.124 326.851 403.289 326.833 412.646 317.476L435.313 294.809C444.686 285.4360000000001 444.686 270.24 435.313 260.868L240.971 66.524C231.598 57.152 216.402 57.152 207.029 66.524z" />
+    <glyph glyph-name="chevron-left"
+      unicode="&#xF053;"
+      horiz-adv-x="320" d=" M34.52 208.97L228.87 403.31C238.24 412.68 253.44 412.68 262.81 403.31L285.48 380.64C294.8400000000001 371.28 294.85 356.12 285.5200000000001 346.74L131.49 192L285.51 37.25C294.85 27.87 294.83 12.71 285.47 3.35L262.8 -19.32C253.43 -28.69 238.23 -28.69 228.86 -19.32L34.52 175.03C25.15 184.4 25.15 199.6 34.52 208.97z" />
+    <glyph glyph-name="chevron-right"
+      unicode="&#xF054;"
+      horiz-adv-x="320" d=" M285.476 175.029L91.132 -19.314C81.759 -28.687 66.563 -28.687 57.191 -19.314L34.524 3.353C25.167 12.7099999999999 25.149 27.8749999999999 34.484 37.254L188.505 192L34.484 346.745C25.149 356.124 25.167 371.289 34.524 380.646L57.191 403.313C66.564 412.6860000000001 81.76 412.6860000000001 91.132 403.313L285.475 208.97C294.848 199.598 294.848 184.402 285.476 175.029z" />
+    <glyph glyph-name="chevron-up"
+      unicode="&#xF077;"
+      horiz-adv-x="448" d=" M240.971 317.476L435.314 123.1330000000001C444.687 113.7600000000001 444.687 98.564 435.314 89.192L412.647 66.525C403.29 57.168 388.125 57.15 378.7459999999999 66.485L224 220.505L69.255 66.484C59.876 57.149 44.711 57.167 35.354 66.524L12.687 89.191C3.314 98.564 3.314 113.7600000000001 12.687 123.1320000000001L207.03 317.475C216.402 326.848 231.598 326.848 240.971 317.476z" />
+    <glyph glyph-name="child"
+      unicode="&#xF1AE;"
+      horiz-adv-x="384" d=" M120 376C120 415.765 152.235 448 192 448S264 415.765 264 376C264 336.236 231.765 304 192 304S120 336.236 120 376zM374.627 374.627C362.1310000000001 387.124 341.8690000000001 387.124 329.373 374.627L242.745 288H141.254L54.627 374.627C42.131 387.124 21.869 387.124 9.373 374.627C-3.124 362.13 -3.124 341.8690000000001 9.373 329.372L104 234.746V-32C104 -49.673 118.327 -64 136 -64H152C169.673 -64 184 -49.673 184 -32V80H200V-32C200 -49.673 214.327 -64 232 -64H248C265.673 -64 280 -49.673 280 -32V234.746L374.627 329.373C387.124 341.87 387.124 362.13 374.627 374.627z" />
+    <glyph glyph-name="church"
+      unicode="&#xF51D;"
+      horiz-adv-x="640" d=" M464.46 201.32L352 268.8V320H400C408.84 320 416 327.16 416 336V368C416 376.8400000000001 408.84 384 400 384H352V432C352 440.84 344.84 448 336 448H304C295.1600000000001 448 288 440.84 288 432V384H240C231.16 384 224 376.8400000000001 224 368V336C224 327.16 231.16 320 240 320H288V268.8L175.54 201.32A31.997 31.997 0 0 1 160 173.88V-64H256V32C256 67.35 284.65 96 320 96S384 67.35 384 32V-64H480V173.88C480 185.12 474.1 195.54 464.46 201.32zM0 52.04V-48C0 -56.84 7.16 -64 16 -64H128V128L19.39 81.46A32.024 32.024 0 0 1 0 52.04zM620.61 81.46L512 128V-64H624C632.84 -64 640 -56.84 640 -48V52.04C640 64.84 632.37 76.41 620.61 81.46z" />
+    <glyph glyph-name="circle-notch"
+      unicode="&#xF1CE;"
+      horiz-adv-x="512" d=" M288 408.944V392.2850000000001C288 381.481 295.281 372.126 305.686 369.219C383.204 347.5660000000001 440 276.482 440 192C440 90.311 357.705 8 256 8C154.311 8 72 90.295 72 192C72 276.4700000000001 128.786 347.564 206.312 369.219C216.719 372.126 224 381.483 224 392.288V408.936C224 424.645 209.166 436.089 193.954 432.17C86.603 404.5180000000001 7.394 306.794 8.003 190.668C8.723 53.616 119.48 -56.288 256.534 -55.999C393.255 -55.711 504 55.212 504 192C504 307.633 424.86 404.779 317.789 432.236C302.678 436.111 288 424.544 288 408.944z" />
+    <glyph glyph-name="circle"
+      unicode="&#xF111;"
+      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440z" />
+    <glyph glyph-name="clipboard-check"
+      unicode="&#xF46C;"
+      horiz-adv-x="384" d=" M336 384H256C256 419.3 227.3 448 192 448S128 419.3 128 384H48C21.5 384 0 362.5 0 336V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V336C384 362.5 362.5 384 336 384zM192 408C205.3 408 216 397.3 216 384S205.3 360 192 360S168 370.7 168 384S178.7 408 192 408zM313.2 176.2L170.2 34.4C165.5 29.7 157.9 29.8 153.2 34.5L70.6 117.8C65.9 122.5 66 130.1 70.7 134.8L99.1 163C103.8 167.7 111.4 167.6 116.1 162.9L162.1 116.5L268.1 221.7C272.8 226.4 280.4000000000001 226.3 285.1 221.6L313.3 193.2C318 188.4 317.9000000000001 180.9 313.2 176.2z" />
+    <glyph glyph-name="clipboard-list"
+      unicode="&#xF46D;"
+      horiz-adv-x="384" d=" M336 384H256C256 419.3 227.3 448 192 448S128 419.3 128 384H48C21.5 384 0 362.5 0 336V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V336C384 362.5 362.5 384 336 384zM96 24C82.7 24 72 34.7 72 48S82.7 72 96 72S120 61.3 120 48S109.3 24 96 24zM96 120C82.7 120 72 130.7 72 144S82.7 168 96 168S120 157.3 120 144S109.3 120 96 120zM96 216C82.7 216 72 226.7 72 240S82.7 264 96 264S120 253.3 120 240S109.3 216 96 216zM192 408C205.3 408 216 397.3 216 384S205.3 360 192 360S168 370.7 168 384S178.7 408 192 408zM320 40C320 35.6 316.4 32 312 32H168C163.6 32 160 35.6 160 40V56C160 60.4 163.6 64 168 64H312C316.4 64 320 60.4 320 56V40zM320 136C320 131.6 316.4 128 312 128H168C163.6 128 160 131.6 160 136V152C160 156.4 163.6 160 168 160H312C316.4 160 320 156.4 320 152V136zM320 232C320 227.6 316.4 224 312 224H168C163.6 224 160 227.6 160 232V248C160 252.4 163.6 256 168 256H312C316.4 256 320 252.4 320 248V232z" />
+    <glyph glyph-name="clipboard"
+      unicode="&#xF328;"
+      horiz-adv-x="384" d=" M384 336V-16C384 -42.51 362.51 -64 336 -64H48C21.49 -64 0 -42.51 0 -16V336C0 362.51 21.49 384 48 384H128C128 419.29 156.71 448 192 448S256 419.29 256 384H336C362.51 384 384 362.51 384 336zM192 408C178.745 408 168 397.255 168 384S178.745 360 192 360S216 370.745 216 384S205.255 408 192 408M288 294V314A6 6 0 0 1 282 320H102A6 6 0 0 1 96 314V294A6 6 0 0 1 102 288H282A6 6 0 0 1 288 294z" />
+    <glyph glyph-name="clock"
+      unicode="&#xF017;"
+      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM313.1 89.9L224.9 154C221.8 156.3 220 159.9 220 163.7V332C220 338.6 225.4 344 232 344H280C286.6 344 292 338.6 292 332V194.3L355.5 148.1C360.9 144.2000000000001 362 136.7000000000001 358.1 131.3L329.9000000000001 92.5C326.0000000000001 87.2 318.5000000000001 86 313.1 89.9z" />
+    <glyph glyph-name="clone"
+      unicode="&#xF24D;"
+      horiz-adv-x="512" d=" M464 448C490.51 448 512 426.51 512 400V112C512 85.49 490.51 64 464 64H176C149.49 64 128 85.49 128 112V400C128 426.51 149.49 448 176 448H464M176 32C131.888 32 96 67.888 96 112V320H48C21.49 320 0 298.51 0 272V-16C0 -42.51 21.49 -64 48 -64H336C362.51 -64 384 -42.51 384 -16V32H176z" />
+    <glyph glyph-name="closed-captioning"
+      unicode="&#xF20A;"
+      horiz-adv-x="512" d=" M464 384H48C21.5 384 0 362.5 0 336V48C0 21.5 21.5 0 48 0H464C490.5 0 512 21.5 512 48V336C512 362.5 490.5 384 464 384zM218.1 160.3C220.9 162.8 225.2 162.4 227.3 159.4L246.8 131.7000000000001C248.5 129.3000000000001 248.3 126.1 246.3 124.0000000000001C192.7 67.2000000000001 73.5 91.9 73.5 191.9000000000001C73.5 289.2000000000001 195.2 311.4000000000001 246 262.0000000000001C248.1 260.0000000000001 248.5 258.8000000000001 247 256.3000000000001L229.5 225.8000000000001C227.6 222.7000000000001 223.3 221.8000000000001 220.4 224.1000000000001C179.6 256.1000000000002 125.8 239.0000000000001 125.8 192.9000000000001C125.9 144.9000000000001 176.9 122.4000000000001 218.1 160.3000000000001zM408.5 160.3C411.3 162.8 415.6 162.4 417.7 159.4L437.2 131.7000000000001C438.9 129.3000000000001 438.7 126.1 436.7 124.0000000000001C383.2 67.1000000000001 264 91.9 264 191.9000000000001C264 289.2000000000001 385.7 311.4000000000001 436.5 262.0000000000001C438.6 260.0000000000001 439 258.8000000000001 437.5 256.3000000000001L420 225.8C418.1 222.7 413.8 221.8 410.9 224.1C370.1 256.1 316.3 239.0000000000001 316.3 192.9C316.3 144.9 367.3 122.4 408.5 160.3z" />
+    <glyph glyph-name="cloud-download-alt"
+      unicode="&#xF381;"
+      horiz-adv-x="640" d=" M537.6 221.4C541.7 232.1 544 243.8 544 256C544 309 501 352 448 352C428.3 352 409.9 346 394.7 335.8C367 383.8 315.3 416 256 416C167.6 416 96 344.4 96 256C96 253.3 96.1 250.6 96.2 247.9C40.2 228.2 0 174.8 0 112C0 32.5 64.5 -32 144 -32H512C582.7 -32 640 25.3 640 96C640 157.9 596 209.6 537.6 221.4zM404.7000000000001 132.7L299.3 27.3C293.1 21.1 282.9000000000001 21.1 276.7 27.3L171.3 132.7C161.2 142.8 168.4 160 182.6 160H248V272C248 280.8 255.2 288 264 288H312C320.8 288 328 280.8 328 272V160H393.4C407.6 160 414.8 142.8 404.7 132.7z" />
+    <glyph glyph-name="cloud-upload-alt"
+      unicode="&#xF382;"
+      horiz-adv-x="640" d=" M537.6 221.4C541.7 232.1 544 243.8 544 256C544 309 501 352 448 352C428.3 352 409.9 346 394.7 335.8C367 383.8 315.3 416 256 416C167.6 416 96 344.4 96 256C96 253.3 96.1 250.6 96.2 247.9C40.2 228.2 0 174.8 0 112C0 32.5 64.5 -32 144 -32H512C582.7 -32 640 25.3 640 96C640 157.9 596 209.6 537.6 221.4zM393.4 160H328V48C328 39.2 320.8 32 312 32H264C255.2 32 248 39.2 248 48V160H182.6C168.3 160 161.2 177.2 171.3 187.3L276.7 292.7000000000001C282.9 298.9 293.1 298.9 299.3 292.7000000000001L404.7000000000001 187.3C414.8000000000001 177.2 407.6 160 393.4000000000001 160z" />
+    <glyph glyph-name="cloud"
+      unicode="&#xF0C2;"
+      horiz-adv-x="640" d=" M537.6 221.4C541.7 232.1 544 243.8 544 256C544 309 501 352 448 352C428.3 352 409.9 346 394.7 335.8C367 383.8 315.3 416 256 416C167.6 416 96 344.4 96 256C96 253.3 96.1 250.6 96.2 247.9C40.2 228.2 0 174.8 0 112C0 32.5 64.5 -32 144 -32H512C582.7 -32 640 25.3 640 96C640 157.9 596 209.6 537.6 221.4z" />
+    <glyph glyph-name="code-branch"
+      unicode="&#xF126;"
+      horiz-adv-x="384" d=" M384 304C384 348.2 348.2 384 304 384S224 348.2 224 304C224 267.6 248.3 236.9 281.5 227.2C280.9 211.1 277.3 198.7 270.5 190.3C255.1 171.1 221.2 167.9 185.3 164.6C157.1 162 127.9 159.2000000000001 104 147.7000000000001V291.7000000000001C136.5 301.9000000000001 160 332.2000000000001 160 368.0000000000001C160 412.2000000000001 124.2 448.0000000000001 80 448.0000000000001S0 412.2 0 368C0 332.2 23.5 301.9 56 291.7V92.4C23.5 82.1 0 51.8 0 16C0 -28.2 35.8 -64 80 -64S160 -28.2 160 16C160 50 138.8 79.1 108.8 90.6C111.9 95.8 116.6 100.4 123.7 104C139.9 112.2 164.1 114.4 189.8 116.8C232 120.7 279.8 125.2 308 160.2C322 177.6 329.1 200 329.6 228.1C361.2000000000001 238.9 384 268.8 384 304zM80 384C88.8 384 96 376.8 96 368S88.8 352 80 352S64 359.2 64 368S71.2 384 80 384zM80 0C71.2 0 64 7.2 64 16S71.2 32 80 32S96 24.8 96 16S88.8 0 80 0zM304 320C312.8 320 320 312.8 320 304S312.8 288 304 288S288 295.2 288 304S295.2 320 304 320z" />
+    <glyph glyph-name="code"
+      unicode="&#xF121;"
+      horiz-adv-x="640" d=" M278.9 -63.5L217.9 -45.8C211.5 -44 207.9 -37.3 209.7 -30.9L346.2 439.3C348 445.7 354.7 449.3 361.1 447.5L422.1 429.8C428.5 428 432.1 421.3 430.3 414.9L293.8 -55.3C291.9000000000001 -61.7 285.3 -65.4 278.9000000000001 -63.5zM164.9 48.7L208.4 95.1C213 99.9999999999999 212.7 107.8 207.6 112.3L117 192L207.6 271.7C212.7 276.2 213.1 284 208.4 288.9L164.9 335.3C160.4 340.1 152.8 340.4 147.9 335.8L3.8 200.8C-1.3 196.1 -1.3 188 3.8 183.3L147.9 48.2C152.8 43.6 160.4 43.8000000000001 164.9 48.7zM492.1 48.1L636.1999999999999 183.1999999999999C641.3 187.8999999999999 641.3 196 636.1999999999999 200.6999999999999L492.1 335.9C487.3 340.4 479.7 340.2 475.1 335.4L431.6 289C427 284.1 427.3 276.3 432.4000000000001 271.8L523 192L432.4 112.3C427.3 107.8 426.9 100 431.6 95.1L475.1 48.7C479.6 43.8000000000001 487.2 43.6 492.1 48.1z" />
+    <glyph glyph-name="coffee"
+      unicode="&#xF0F4;"
+      horiz-adv-x="640" d=" M192 64H384C437 64 480 107 480 160H512C582.6 160 640 217.4 640 288S582.6 416 512 416H120C106.7 416 96 405.3 96 392V160C96 107 139 64 192 64zM512 352C547.3 352 576 323.3 576 288S547.3 224 512 224H480V352H512zM559.7 -32H48.3C0.7 -32 -12.7 32 12.3 32H595.5999999999999C620.5999999999999 32 607.3999999999999 -32 559.6999999999999 -32z" />
+    <glyph glyph-name="cog"
+      unicode="&#xF013;"
+      horiz-adv-x="512" d=" M444.788 156.9L487.404 132.301C492.271 129.492 494.53 123.683 492.863 118.316C481.793 82.674 462.893 50.474 438.174 23.73A12.015999999999998 12.015999999999998 0 0 0 423.342 21.4759999999999L380.758 46.0709999999999A191.577 191.577 0 0 0 319.999 10.9409999999999V-38.2410000000001A12.01 12.01 0 0 0 310.622 -49.9590000000001C275.666 -57.8090000000001 238.123 -58.2150000000001 201.403 -49.9660000000001C195.913 -48.7330000000001 192 -43.8700000000001 192 -38.2430000000001V10.9409999999999A191.555 191.555 0 0 0 131.241 46.0709999999999L88.657 21.4759999999999A12.015999999999998 12.015999999999998 0 0 0 73.825 23.7299999999999C49.107 50.4739999999999 30.206 82.6739999999999 19.136 118.3159999999999C17.469 123.6819999999999 19.728 129.4909999999999 24.595 132.3009999999999L67.212 156.9A193.48000000000002 193.48000000000002 0 0 0 67.212 227.099L24.596 251.698C19.729 254.507 17.47 260.316 19.137 265.683C30.207 301.325 49.107 333.525 73.826 360.269A12.015999999999998 12.015999999999998 0 0 0 88.658 362.523L131.242 337.928A191.577 191.577 0 0 0 192.001 373.058V422.241A12.01 12.01 0 0 0 201.3780000000001 433.959C236.3340000000001 441.8090000000001 273.8770000000001 442.215 310.5970000000001 433.966C316.0870000000001 432.733 320.0000000000001 427.87 320.0000000000001 422.243V373.059A191.555 191.555 0 0 0 380.7590000000001 337.929L423.3430000000001 362.524A12.015999999999998 12.015999999999998 0 0 0 438.1750000000001 360.27C462.8930000000001 333.526 481.7940000000001 301.326 492.8640000000001 265.684C494.5310000000001 260.318 492.2720000000001 254.509 487.4050000000001 251.699L444.788 227.1A193.485 193.485 0 0 0 444.788 156.9zM336 192C336 236.112 300.112 272 256 272S176 236.112 176 192S211.888 112 256 112S336 147.888 336 192z" />
+    <glyph glyph-name="cogs"
+      unicode="&#xF085;"
+      horiz-adv-x="640" d=" M512.1 257L503.9 242.7C500.9 237.4 494.5000000000001 235.2 488.8 237.3C477 241.7 466.2 248 456.7 255.9C452.1 259.7 450.9 266.4 453.9 271.6L462.1 285.9C455.2 293.9 449.8 303.2 446.2 313.3H429.7C423.7 313.3 418.5 317.6 417.5 323.6C415.5 335.6 415.4 348.2 417.5 360.7C418.5 366.7 423.7 371.1 429.7 371.1H446.2C449.8 381.2 455.2 390.5 462.1 398.5L453.9 412.8C450.9 418 452 424.7 456.7 428.5C466.2 436.4 477.1 442.7 488.8 447.1C494.5 449.2 500.9 447 503.9 441.7L512.1 427.4C522.6 429.3 533.3000000000001 429.3 543.8000000000001 427.4L552 441.7C555 447 561.4 449.2 567.1 447.1C578.9 442.7 589.7 436.4 599.2 428.5C603.8000000000001 424.7 605 418 602 412.8L593.8 398.5C600.6999999999999 390.5 606.0999999999999 381.2 609.6999999999999 371.1H626.1999999999999C632.1999999999999 371.1 637.4 366.8 638.4 360.8C640.4 348.8 640.5 336.2 638.4 323.7C637.4 317.7 632.1999999999999 313.3 626.1999999999999 313.3H609.6999999999999C606.0999999999999 303.2 600.6999999999999 293.9 593.8 285.9L602 271.6C605 266.4 603.9 259.7 599.2 255.9C589.7 248 578.8000000000001 241.7 567.1 237.3C561.4 235.2 555 237.4 552 242.7L543.8 257C533.4 255.1 522.5999999999999 255.1 512.0999999999999 257zM501.6 315.8C540.1 286.2000000000001 584 330.1 554.4 368.6C515.9 398.3 472 354.3 501.6 315.8zM386.3 161.9L420 145.1C430.1 139.3 434.5 127 430.5 116C421.6 91.8 404.1 69.6 387.9 50.1999999999999C380.5 41.3 367.7 39.0999999999999 357.6 44.8999999999999L328.5 61.6999999999999C312.5 47.9999999999999 293.8999999999999 37.0999999999999 273.6 29.9999999999999V-3.6000000000001C273.6 -15.2000000000001 265.3 -25.2000000000001 253.9 -27.2000000000001C229.3 -31.4000000000001 203.5 -31.6000000000001 178 -27.2000000000001C166.5 -25.2000000000001 158 -15.3000000000001 158 -3.6000000000001V30C137.7 37.2 119.1 48 103.1 61.7L74 45C64 39.2 51.1 41.4 43.7 50.3C27.5 69.7 10.4 91.9 1.5 116C-2.5 126.9 1.9 139.2 12 145.1L45.3 161.9C41.4 182.8 41.4 204.3000000000001 45.3 225.3000000000001L12 242.2C1.9 248 -2.6 260.3 1.5 271.2C10.4 295.4 27.5 317.6 43.7 337C51.1 345.9 63.9 348.1 74 342.3L103.1 325.5C119.1 339.2 137.7 350.1 158 357.2V390.9C158 402.4 166.2 412.4 177.6 414.4C202.2 418.6 228.1 418.8 253.6 414.5C265.1 412.5 273.6 402.6 273.6 390.9V357.3C293.9000000000001 350.1 312.5 339.3 328.5 325.6L357.6 342.4C367.6 348.2 380.5 346 387.9000000000001 337.1C404.1 317.7 421.1 295.5 430.0000000000001 271.3C434.0000000000001 260.4 430.1000000000001 248.1 420.0000000000001 242.2L386.3000000000001 225.4C390.2000000000001 204.4 390.2000000000001 182.9 386.3000000000001 161.9zM268.7000000000001 140.8C327.9000000000001 217.8 240.0000000000001 305.7 163.0000000000001 246.5C103.8000000000001 169.5 191.7000000000001 81.5999999999999 268.7000000000001 140.8zM512.1 -41.9L503.9 -56.2C500.9 -61.5000000000001 494.5000000000001 -63.7 488.8 -61.6C477 -57.2 466.2 -50.9 456.7 -43C452.1 -39.2 450.9 -32.5 453.9 -27.3L462.1 -13C455.2 -5 449.8 4.3 446.2 14.4H429.7C423.7 14.4 418.5 18.7 417.5 24.7C415.5 36.7 415.4 49.3 417.5 61.8C418.5 67.8 423.7 72.2 429.7 72.2H446.2C449.8 82.3 455.2 91.6 462.1 99.6L453.9 113.9C450.9 119.1 452 125.8 456.7 129.6C466.2 137.5 477.1 143.8 488.8 148.2C494.5 150.3 500.9 148.1 503.9 142.8L512.1 128.5C522.6 130.4 533.3000000000001 130.4 543.8000000000001 128.5L552.0000000000001 142.8C555.0000000000001 148.1 561.4000000000001 150.3 567.1000000000001 148.2C578.9000000000001 143.8 589.7000000000002 137.5 599.2000000000002 129.6C603.8000000000002 125.8 605.0000000000001 119.1 602.0000000000001 113.9L593.8000000000001 99.6C600.7 91.6 606.1 82.3 609.7 72.2H626.2C632.2 72.2 637.4000000000001 67.9 638.4000000000001 61.9C640.4000000000001 49.9 640.5000000000001 37.3 638.4000000000001 24.8C637.4000000000001 18.8 632.2 14.4 626.2 14.4H609.7C606.1 4.3 600.7 -5 593.8000000000001 -13L602.0000000000001 -27.3C605.0000000000001 -32.5 603.9000000000001 -39.2 599.2000000000002 -43C589.7000000000002 -50.9 578.8000000000002 -57.2 567.1000000000001 -61.6C561.4000000000001 -63.7 555.0000000000001 -61.5 552.0000000000001 -56.2L543.8000000000001 -41.9C533.4000000000001 -43.8 522.6 -43.8 512.1 -41.9zM501.6 17C540.1 -12.6 584 31.3 554.4 69.8C515.9 99.4 472 55.5 501.6 17z" />
+    <glyph glyph-name="coins"
+      unicode="&#xF51E;"
+      horiz-adv-x="512" d=" M0 42.7V0C0 -35.3 86 -64 192 -64S384 -35.3 384 0V42.7C342.7 13.6 267.2 0 192 0S41.3 13.6 0 42.7zM320 320C426 320 512 348.7 512 384S426 448 320 448S128 419.3 128 384S214 320 320 320zM0 147.6V96C0 60.7 86 32 192 32S384 60.7 384 96V147.6C342.7 113.6 267.1 96 192 96S41.3 113.6 0 147.6zM416 136.6C473.3 147.7000000000001 512 168.3 512 192V234.7000000000001C488.8 218.3000000000001 454.7 207.1000000000001 416 200.2000000000001V136.6zM192 288C86 288 0 252.2 0 208S86 128 192 128S384 163.8 384 208S298 288 192 288zM411.3 231.7C471.3 242.5 512 263.7 512 288V330.7C476.5 305.6 415.5 292.1 351.3 288.9C380.8 274.6 402.5 255.4 411.3 231.7z" />
+    <glyph glyph-name="columns"
+      unicode="&#xF0DB;"
+      horiz-adv-x="512" d=" M464 416H48C21.49 416 0 394.51 0 368V16C0 -10.51 21.49 -32 48 -32H464C490.51 -32 512 -10.51 512 16V368C512 394.51 490.51 416 464 416zM224 32H64V288H224V32zM448 32H288V288H448V32z" />
+    <glyph glyph-name="comment-alt"
+      unicode="&#xF27A;"
+      horiz-adv-x="512" d=" M448 448H64C28.7 448 0 419.3 0 384V96C0 60.7 28.7 32 64 32H160V-52C160 -61.8 171.2 -67.5 179.1 -61.7L304 32H448C483.3 32 512 60.7 512 96V384C512 419.3 483.3 448 448 448z" />
+    <glyph glyph-name="comment-dots"
+      unicode="&#xF4AD;"
+      horiz-adv-x="512" d=" M256 416C114.6 416 0 322.9 0 208C0 158.4 21.4 113 57 77.3C44.5 26.9 2.7 -18 2.2 -18.5C0 -20.8 -0.6 -24.2 0.7 -27.2S4.8 -32 8 -32C74.3 -32 124 -0.2 148.6 19.4C181.3 7.1 217.6 0 256 0C397.4 0 512 93.1 512 208S397.4 416 256 416zM128 176C110.3 176 96 190.3 96 208S110.3 240 128 240S160 225.7 160 208S145.7 176 128 176zM256 176C238.3 176 224 190.3 224 208S238.3 240 256 240S288 225.7 288 208S273.7 176 256 176zM384 176C366.3 176 352 190.3 352 208S366.3 240 384 240S416 225.7 416 208S401.7 176 384 176z" />
+    <glyph glyph-name="comment-slash"
+      unicode="&#xF4B3;"
+      horiz-adv-x="640" d=" M64 208C64 158.4 85.4 113 121 77.3C108.4 27 66.7 -17.9 66.2 -18.5C64 -20.8 63.4 -24.2 64.7 -27.2C66 -30.1 68.8 -32 72 -32C138.3 -32 188 -0.2 212.6 19.4C245.3 7.1 281.6 0 320 0C347.4 0 373.7 3.6 398.4 10L72.9 261.6C67.3 244.5 64 226.6 64 208zM633.8 -10.1L519.4 78.3C554.6 113.9 576 158.8 576 208C576 322.9 461.4 416 320 416C254.9 416 195.8 395.9 150.6 363.3L45.5 444.6C38.5 450 28.5 448.8 23 441.8L3.4 416.6C-2 409.6 -0.8 399.6 6.2 394.2L594.6 -60.5C601.6 -65.9 611.6 -64.7 617.1 -57.7L636.7 -32.4C642.1 -25.6 640.8000000000001 -15.5 633.8000000000001 -10.1z" />
+    <glyph glyph-name="comment"
+      unicode="&#xF075;"
+      horiz-adv-x="512" d=" M256 416C114.6 416 0 322.9 0 208C0 158.4 21.4 113 57 77.3C44.5 26.9 2.7 -18 2.2 -18.5C0 -20.8 -0.6 -24.2 0.7 -27.2S4.8 -32 8 -32C74.3 -32 124 -0.2 148.6 19.4C181.3 7.1 217.6 0 256 0C397.4 0 512 93.1 512 208S397.4 416 256 416z" />
+    <glyph glyph-name="comments"
+      unicode="&#xF086;"
+      horiz-adv-x="576" d=" M416 256C416 344.4 322.9 416 208 416S0 344.4 0 256C0 221.7 14.1 190.1 38 164C24.6 133.8 2.5 109.8 2.2 109.5C0 107.2 -0.6 103.8 0.7 100.8S4.8 96 8 96C44.6 96 74.9 108.3 96.7 121C128.9 105.3 167 96 208 96C322.9 96 416 167.6 416 256zM538 36C561.9 62 576 93.7 576 128C576 194.9 522.5 252.2 446.7 276.1C447.6 269.5 448 262.8 448 256C448 150.1 340.3 64 208 64C197.2 64 186.7 64.8 176.3 65.9C207.8 8.4 281.8 -32 368 -32C409 -32 447.1 -22.8 479.3 -7C501.1 -19.7 531.4 -32 568 -32C571.2 -32 574.1 -30.1 575.3 -27.2C576.5999999999999 -24.3 576 -20.9 573.8 -18.5C573.5 -18.2 551.4 5.7 538 36z" />
+    <glyph glyph-name="compact-disc"
+      unicode="&#xF51F;"
+      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM88 192H56C56 297.9 142.1 384 248 384V352C159.8 352 88 280.2 88 192zM248 96C195 96 152 139 152 192S195 288 248 288S344 245 344 192S301 96 248 96zM248 224C230.3 224 216 209.7 216 192S230.3 160 248 160S280 174.3 280 192S265.7 224 248 224z" />
+    <glyph glyph-name="compass"
+      unicode="&#xF14E;"
+      horiz-adv-x="512" d=" M504 192C504 55.033 392.967 -56 256 -56S8 55.033 8 192S119.033 440 256 440S504 328.967 504 192zM307.4460000000001 327.156L204.804 229.377A23.997 23.997 0 0 1 198.0320000000001 217.648L164.673 79.869C158.993 56.41 187.4500000000001 40.551 204.553 56.845L307.1930000000001 154.624A23.99 23.99 0 0 1 313.9650000000001 166.353L347.324 304.132C352.942 327.3300000000001 324.733 343.625 307.4460000000001 327.156zM256 224C238.327 224 224 209.673 224 192S238.327 160 256 160S288 174.327 288 192S273.673 224 256 224z" />
+    <glyph glyph-name="compress"
+      unicode="&#xF066;"
+      horiz-adv-x="448" d=" M436 256H312C298.7 256 288 266.7 288 280V404C288 410.6 293.4 416 300 416H340C346.6 416 352 410.6 352 404V320H436C442.6 320 448 314.6 448 308V268C448 261.4 442.6 256 436 256zM160 280V404C160 410.6 154.6 416 148 416H108C101.4 416 96 410.6 96 404V320H12C5.4 320 0 314.6 0 308V268C0 261.4 5.4 256 12 256H136C149.3 256 160 266.7 160 280zM160 -20V104C160 117.3 149.3 128 136 128H12C5.4 128 0 122.6 0 116V76C0 69.4 5.4 64 12 64H96V-20C96 -26.6 101.4 -32 108 -32H148C154.6 -32 160 -26.6 160 -20zM352 -20V64H436C442.6 64 448 69.4 448 76V116C448 122.6 442.6 128 436 128H312C298.7 128 288 117.3 288 104V-20C288 -26.6 293.4 -32 300 -32H340C346.6 -32 352 -26.6 352 -20z" />
+    <glyph glyph-name="copy"
+      unicode="&#xF0C5;"
+      horiz-adv-x="448" d=" M320 0V-40C320 -53.255 309.255 -64 296 -64H24C10.745 -64 0 -53.255 0 -40V328C0 341.255 10.745 352 24 352H96V56C96 25.121 121.121 0 152 0H320zM320 344V448H152C138.745 448 128 437.255 128 424V56C128 42.745 138.745 32 152 32H424C437.255 32 448 42.745 448 56V320H344C330.8 320 320 330.8 320 344zM440.971 375.029L375.029 440.971A24 24 0 0 1 358.0590000000001 448H352V352H448V358.059A24 24 0 0 1 440.971 375.029z" />
+    <glyph glyph-name="copyright"
+      unicode="&#xF1F9;"
+      horiz-adv-x="512" d=" M256 440C119.033 440 8 328.967 8 192S119.033 -56 256 -56S504 55.033 504 192S392.967 440 256 440zM373.134 93.247C371.5420000000001 91.38 333.358 47.516 263.283 47.516C178.591 47.516 118.799 110.776 118.799 193.083C118.799 274.386 180.803 336.4840000000001 262.5610000000001 336.4840000000001C329.5180000000001 336.4840000000001 364.5260000000001 299.1690000000001 365.9830000000001 297.5800000000001A12 12 0 0 0 367.2210000000001 282.9570000000001L344.8410000000001 248.3020000000001C340.7920000000001 242.0350000000001 332.0670000000001 240.9510000000001 326.6070000000001 246.0070000000001C326.3740000000001 246.2210000000001 300.0780000000001 269.8870000000001 264.7270000000001 269.8870000000001C218.6110000000001 269.8870000000001 190.8110000000001 236.3120000000001 190.8110000000001 193.8050000000001C190.8110000000001 154.2030000000001 216.3250000000001 114.1130000000001 265.0880000000001 114.1130000000001C303.7850000000001 114.1130000000001 330.3680000000001 142.4510000000001 330.6320000000001 142.7380000000001C335.7640000000001 148.3030000000001 344.6910000000001 147.7710000000001 349.1400000000001 141.6850000000001L373.6870000000001 108.1130000000001A12.001000000000001 12.001000000000001 0 0 0 373.1340000000001 93.2470000000001z" />
+    <glyph glyph-name="couch"
+      unicode="&#xF4B8;"
+      horiz-adv-x="640" d=" M160 224V160H480V224C480 259.3 508.7 288 544 288H576C576 341 533 384 480 384H160C107 384 64 341 64 288H96C131.3 288 160 259.3 160 224zM576 256H544C526.3 256 512 241.7 512 224V128H128V224C128 241.7 113.7 256 96 256H64C28.7 256 0 227.3 0 192C0 168.4 13 148 32 136.9V16C32 7.2 39.2 0 48 0H112C120.8 0 128 7.2 128 16V32H512V16C512 7.2 519.2 0 528 0H592C600.8 0 608 7.2 608 16V136.9C627 148 640 168.4 640 192C640 227.3 611.3 256 576 256z" />
+    <glyph glyph-name="credit-card"
+      unicode="&#xF09D;"
+      horiz-adv-x="576" d=" M0 16C0 -10.5 21.5 -32 48 -32H528C554.5 -32 576 -10.5 576 16V192H0V16zM192 84C192 90.6 197.4 96 204 96H340C346.6 96 352 90.6 352 84V44C352 37.4 346.6 32 340 32H204C197.4 32 192 37.4 192 44V84zM64 84C64 90.6 69.4 96 76 96H148C154.6 96 160 90.6 160 84V44C160 37.4 154.6 32 148 32H76C69.4 32 64 37.4 64 44V84zM576 368V320H0V368C0 394.5 21.5 416 48 416H528C554.5 416 576 394.5 576 368z" />
+    <glyph glyph-name="crop"
+      unicode="&#xF125;"
+      horiz-adv-x="512" d=" M488 96H448V338.7L505 395.7C514.4 405.1 514.4 420.3 505 429.6L493.7 441C484.3 450.4 469.1 450.4 459.8 441L402.8 384H160V424C160 437.3 149.3 448 136 448H88C74.7 448 64 437.3 64 424V384H24C10.7 384 0 373.3 0 360V312C0 298.7 10.7 288 24 288H64V24C64 10.7 74.7 0 88 0H352V-40C352 -53.3 362.7 -64 376 -64H424C437.3 -64 448 -53.3 448 -40V0H488C501.3 0 512 10.7 512 24V72C512 85.3 501.3 96 488 96zM306.7 288L160 141.3V288H306.7zM205.3 96L352 242.7V96H205.3z" />
+    <glyph glyph-name="crosshairs"
+      unicode="&#xF05B;"
+      horiz-adv-x="512" d=" M500 224H469.636C455.724 317.675 381.675 391.724 288 405.636V436C288 442.627 282.627 448 276 448H236C229.373 448 224 442.627 224 436V405.636C130.325 391.724 56.276 317.675 42.364 224H12C5.373 224 0 218.627 0 212V172C0 165.373 5.373 160 12 160H42.364C56.276 66.325 130.325 -7.724 224 -21.636V-52C224 -58.627 229.373 -64 236 -64H276C282.627 -64 288 -58.627 288 -52V-21.636C381.675 -7.724 455.724 66.325 469.636 160H500C506.627 160 512 165.373 512 172V212C512 218.627 506.627 224 500 224zM288 43.366V84C288 90.627 282.627 96 276 96H236C229.373 96 224 90.627 224 84V43.366C165.826 55.768 119.783 101.757 107.366 160H148C154.627 160 160 165.373 160 172V212C160 218.627 154.627 224 148 224H107.366C119.768 282.174 165.757 328.217 224 340.634V300C224 293.373 229.373 288 236 288H276C282.627 288 288 293.373 288 300V340.634C346.174 328.232 392.217 282.243 404.634 224H364C357.373 224 352 218.627 352 212V172C352 165.373 357.373 160 364 160H404.634C392.2320000000001 101.826 346.243 55.783 288 43.366zM288 192C288 174.327 273.673 160 256 160S224 174.327 224 192C224 209.673 238.327 224 256 224S288 209.673 288 192z" />
+    <glyph glyph-name="crow"
+      unicode="&#xF520;"
+      horiz-adv-x="640" d=" M544 416H527.64C513.04 435.32 490.09 448 464 448C419.82 448 384 412.18 384 368V347.02L12.09 54.43A30.216 30.216 0 0 1 0 30.26C0 7.8 23.64 -6.81 43.73 3.23L165.27 64H261.76L306.17 -56.1C308.44 -62.33 315.32 -65.5400000000001 321.55 -63.27L344.1 -55.0600000000001C350.33 -52.7900000000001 353.54 -45.9100000000001 351.27 -39.6800000000001L312.94 64H352C353.9100000000001 64 355.76 64.23 357.6600000000001 64.29L402.17 -56.09C404.44 -62.32 411.32 -65.53 417.55 -63.26L440.1 -55.05C446.3300000000001 -52.78 449.54 -45.9 447.2700000000001 -39.67L406.0300000000001 71.86C485.74 95.2 544 168.74 544 256V336L640 352C640 387.35 597.02 416 544 416zM464 344C450.75 344 440 354.75 440 368C440 381.26 450.75 392 464 392S488 381.26 488 368C488 354.75 477.25 344 464 344z" />
+    <glyph glyph-name="crown"
+      unicode="&#xF521;"
+      horiz-adv-x="640" d=" M528 0H112C103.2 0 96 -7.2 96 -16V-48C96 -56.8 103.2 -64 112 -64H528C536.8 -64 544 -56.8 544 -48V-16C544 -7.2 536.8 0 528 0zM592 320C565.5 320 544 298.5 544 272C544 264.9 545.6 258.3 548.4 252.2L476 208.8C460.6 199.6 440.7 204.8 431.8 220.4L350.3 363C361 371.8 368 385 368 400C368 426.5 346.5 448 320 448S272 426.5 272 400C272 385 279 371.8 289.7 363L208.2 220.4C199.3 204.8 179.3 199.6 164 208.8L91.7 252.2C94.4 258.2000000000001 96.1 264.9 96.1 272C96.1 298.5 74.6 320 48.1 320S0 298.5 0 272S21.5 224 48 224C50.6 224 53.2 224.4 55.7 224.8L128 32H512L584.3 224.8C586.8 224.4 589.4 224 592 224C618.5 224 640 245.5 640 272S618.5 320 592 320z" />
+    <glyph glyph-name="cube"
+      unicode="&#xF1B2;"
+      horiz-adv-x="512" d=" M239.1 441.7L31.1 363.7C12.4 356.7 0 338.7 0 318.7V93.6C0 75.4 10.3 58.8 26.5 50.7L234.5 -53.3C248 -60.1 263.9 -60.1 277.4 -53.3L485.4 50.7C501.7 58.8000000000001 511.9 75.5000000000001 511.9 93.6V318.7C511.9 338.7 499.5 356.6 480.8 363.6L272.8 441.6C262 445.8 250 445.8 239.1 441.7zM256 379.6L448 307.6V306.5L256 228.5L64 306.5V307.6L256 379.6zM288 23.6V172.5L448 237.5V103.6L288 23.6z" />
+    <glyph glyph-name="cubes"
+      unicode="&#xF1B3;"
+      horiz-adv-x="512" d=" M488.6 197.8L392 234V342.5C392 357.5 382.7 370.9 368.6 376.2L268.6 413.7C260.5 416.8 251.5000000000001 416.8 243.3 413.7L143.3 376.2C129.2 370.9 119.9 357.5 119.9 342.5V234L23.3 197.8C9.3 192.5 0 179.1 0 164.1V54C0 40.4 7.7 27.9 19.9 21.8L119.9 -28.2C130 -33.3 142 -33.3 152.1 -28.2L256 23.8L359.9 -28.2C370 -33.3 382 -33.3 392.1 -28.2L492.1 21.8C504.3 27.9 511.9999999999999 40.4 511.9999999999999 54V164.1C511.9999999999999 179.1 502.6999999999999 192.5 488.6 197.8zM358 233.2L273 201.3V269.5L358 306.5V233.2zM154 343.9L256 382.1L358 343.9V343.3L256 301.9L154 343.3V343.9zM238 52.8L153 10.3V89.4L238 128.2V52.8zM238 164.8L136 123.4L34 164.8V165.4L136 203.6L238 165.4V164.8zM478 52.8L393 10.3V89.4L478 128.2V52.8zM478 164.8L376 123.4L274 164.8V165.4L376 203.6L478 165.4V164.8z" />
+    <glyph glyph-name="cut"
+      unicode="&#xF0C4;"
+      horiz-adv-x="448" d=" M444.485 25.574C449.1740000000001 20.885 449.1690000000001 13.287 444.485 8.603C411.6810000000001 -24.201 358.4940000000001 -24.201 325.69 8.603L210.176 124.117L185.317 99.258C189.63 88.343 192 76.448 192 64C192 10.981 149.019 -32 96 -32S0 10.981 0 64S42.981 160 96 160C100.536 160 104.995 159.678 109.363 159.07L142.293 192L109.363 224.93C104.995 224.322 100.536 224 96 224C42.981 224 0 266.981 0 320S42.981 416 96 416S192 373.019 192 320C192 307.552 189.63 295.6570000000001 185.318 284.742L210.177 259.883L325.69 375.397C358.4940000000001 408.201 411.681 408.201 444.485 375.397C449.1690000000001 370.713 449.1740000000001 363.115 444.485 358.426L278.0590000000001 192L444.485 25.574zM96 352C78.355 352 64 337.645 64 320S78.355 288 96 288S128 302.355 128 320S113.645 352 96 352M96 96C78.355 96 64 81.645 64 64S78.355 32 96 32S128 46.355 128 64S113.645 96 96 96M208 204C201.373 204 196 198.627 196 192S201.373 180 208 180S220 185.373 220 192S214.627 204 208 204z" />
+    <glyph glyph-name="database"
+      unicode="&#xF1C0;"
+      horiz-adv-x="448" d=" M448 374.857V329.1430000000001C448 288.857 347.667 256 224 256S0 288.857 0 329.1430000000001V374.857C0 415.1430000000001 100.333 448 224 448S448 415.1430000000001 448 374.857zM448 272V169.143C448 128.857 347.667 96 224 96S0 128.857 0 169.143V272C48.125 238.857 136.208 223.428 224 223.428S399.874 238.857 448 272zM448 112V9.143C448 -31.143 347.667 -64 224 -64S0 -31.143 0 9.143V112C48.125 78.857 136.208 63.428 224 63.428S399.874 78.857 448 112z" />
+    <glyph glyph-name="deaf"
+      unicode="&#xF2A4;"
+      horiz-adv-x="512" d=" M216 188C216 172.536 203.464 160 188 160S160 172.536 160 188C160 232.112 195.888 268 240 268S320 232.112 320 188C320 172.536 307.464 160 292 160S264 172.536 264 188C264 201.234 253.233 212 240 212S216 201.234 216 188zM240 364C142.953 364 64 285.0470000000001 64 188C64 172.536 76.536 160 92 160S120 172.536 120 188C120 254.168 173.832 308 240 308S360 254.168 360 188C360 112.836 288.991 117.689 288.003 44.378L288 44C288 15.327 264.673 -8 236 -8C220.536 -8 208 -20.536 208 -36S220.536 -64 236 -64C295.475 -64 343.876 -15.672 344 43.774C344.5950000000001 78.202 416 92.014 416 188C416 285.0470000000001 337.0470000000001 364 240 364zM508.485 416.201L480.2 444.485C475.513 449.171 467.916 449.171 463.229 444.485L376.2 357.456C371.514 352.77 371.514 345.1720000000001 376.2 340.485L404.485 312.2C409.171 307.514 416.769 307.514 421.4550000000001 312.2L508.485 399.229C513.172 403.917 513.172 411.515 508.485 416.201zM168.97 133.255C164.284 137.941 156.686 137.941 152 133.255L3.515 -15.23C-1.171 -19.916 -1.171 -27.514 3.515 -32.201L31.8 -60.485C36.487 -65.171 44.084 -65.171 48.771 -60.485L197.256 88C201.942 92.686 201.942 100.284 197.256 104.971L168.97 133.255z" />
+    <glyph glyph-name="desktop"
+      unicode="&#xF108;"
+      horiz-adv-x="576" d=" M528 448H48C21.5 448 0 426.5 0 400V80C0 53.5 21.5 32 48 32H240L224 -16H152C138.7 -16 128 -26.7 128 -40S138.7 -64 152 -64H424C437.3 -64 448 -53.3 448 -40S437.3 -16 424 -16H352L336 32H528C554.5 32 576 53.5 576 80V400C576 426.5 554.5 448 528 448zM512 96H64V384H512V96z" />
+    <glyph glyph-name="diagnoses"
+      unicode="&#xF470;"
+      horiz-adv-x="640" d=" M496 192C504.8 192 512 199.2 512 208S504.8 224 496 224S480 216.8 480 208S487.2 192 496 192zM320 272C368.5 272 408 311.5 408 360S368.5 448 320 448S232 408.5 232 360S271.5 272 320 272zM59.8 84C70 68.7 89.1 66.2 102.7 74.2C118.9 83.8 158.9 105.9 208 122.8V32H432V122.7C481.1 105.9 521.1 83.7 537.3 74.1C550.9 66.1 570 68.8 580.1999999999999 83.9L597.9999999999999 110.6C606.7999999999998 123.8 605.5999999999999 145.2 587.9999999999999 155.7C576.0999999999999 162.8 558.2999999999998 172.7 536.8999999999999 183.1C508.7999999999998 137 437.4999999999999 165.3 449.1999999999999 218.2C409.3 230.8 365.1 240 320 240C263 240 207.1 225.5 160 207.8C159.8 167.6 112.4 144.5 80.8 171.8C69.6 165.8 59.5 160.2 52.1 155.8C34.5 145.3 33.3 124 42.1 110.7L59.8 84zM368 104C381.3 104 392 93.3 392 80S381.3 56 368 56S344 66.7 344 80S354.7 104 368 104zM272 200C285.3 200 296 189.3 296 176S285.3 152 272 152S248 162.7 248 176S258.7 200 272 200zM112 192C120.8 192 128 199.2 128 208S120.8 224 112 224S96 216.8 96 208S103.2 192 112 192zM624 0H16C7.2 0 0 -7.2 0 -16V-48C0 -56.8 7.2 -64 16 -64H624C632.8 -64 640 -56.8 640 -48V-16C640 -7.2 632.8 0 624 0z" />
+    <glyph glyph-name="dice-five"
+      unicode="&#xF523;"
+      horiz-adv-x="448" d=" M384 416H64C28.65 416 0 387.35 0 352V32C0 -3.35 28.65 -32 64 -32H384C419.35 -32 448 -3.35 448 32V352C448 387.35 419.35 416 384 416zM128 64C110.33 64 96 78.33 96 96S110.33 128 128 128S160 113.67 160 96S145.67 64 128 64zM128 256C110.33 256 96 270.3300000000001 96 288S110.33 320 128 320S160 305.67 160 288S145.67 256 128 256zM224 160C206.33 160 192 174.33 192 192S206.33 224 224 224S256 209.67 256 192S241.67 160 224 160zM320 64C302.33 64 288 78.33 288 96S302.33 128 320 128S352 113.67 352 96S337.67 64 320 64zM320 256C302.33 256 288 270.3300000000001 288 288S302.33 320 320 320S352 305.67 352 288S337.67 256 320 256z" />
+    <glyph glyph-name="dice-four"
+      unicode="&#xF524;"
+      horiz-adv-x="448" d=" M384 416H64C28.65 416 0 387.35 0 352V32C0 -3.35 28.65 -32 64 -32H384C419.35 -32 448 -3.35 448 32V352C448 387.35 419.35 416 384 416zM128 64C110.33 64 96 78.33 96 96S110.33 128 128 128S160 113.67 160 96S145.67 64 128 64zM128 256C110.33 256 96 270.3300000000001 96 288S110.33 320 128 320S160 305.67 160 288S145.67 256 128 256zM320 64C302.33 64 288 78.33 288 96S302.33 128 320 128S352 113.67 352 96S337.67 64 320 64zM320 256C302.33 256 288 270.3300000000001 288 288S302.33 320 320 320S352 305.67 352 288S337.67 256 320 256z" />
+    <glyph glyph-name="dice-one"
+      unicode="&#xF525;"
+      horiz-adv-x="448" d=" M384 416H64C28.65 416 0 387.35 0 352V32C0 -3.35 28.65 -32 64 -32H384C419.35 -32 448 -3.35 448 32V352C448 387.35 419.35 416 384 416zM224 160C206.33 160 192 174.33 192 192S206.33 224 224 224S256 209.67 256 192S241.67 160 224 160z" />
+    <glyph glyph-name="dice-six"
+      unicode="&#xF526;"
+      horiz-adv-x="448" d=" M384 448H64C28.65 448 0 419.35 0 384V64C0 28.65 28.65 0 64 0H384C419.35 0 448 28.65 448 64V384C448 419.35 419.35 448 384 448zM128 96C110.33 96 96 110.33 96 128S110.33 160 128 160S160 145.67 160 128S145.67 96 128 96zM128 192C110.33 192 96 206.33 96 224S110.33 256 128 256S160 241.67 160 224S145.67 192 128 192zM128 288C110.33 288 96 302.3300000000001 96 320S110.33 352 128 352S160 337.67 160 320S145.67 288 128 288zM320 96C302.33 96 288 110.33 288 128S302.33 160 320 160S352 145.67 352 128S337.67 96 320 96zM320 192C302.33 192 288 206.33 288 224S302.33 256 320 256S352 241.67 352 224S337.67 192 320 192zM320 288C302.33 288 288 302.3300000000001 288 320S302.33 352 320 352S352 337.67 352 320S337.67 288 320 288z" />
+    <glyph glyph-name="dice-three"
+      unicode="&#xF527;"
+      horiz-adv-x="448" d=" M384 416H64C28.65 416 0 387.35 0 352V32C0 -3.35 28.65 -32 64 -32H384C419.35 -32 448 -3.35 448 32V352C448 387.35 419.35 416 384 416zM128 256C110.33 256 96 270.3300000000001 96 288S110.33 320 128 320S160 305.67 160 288S145.67 256 128 256zM224 160C206.33 160 192 174.33 192 192S206.33 224 224 224S256 209.67 256 192S241.67 160 224 160zM320 64C302.33 64 288 78.33 288 96S302.33 128 320 128S352 113.67 352 96S337.67 64 320 64z" />
+    <glyph glyph-name="dice-two"
+      unicode="&#xF528;"
+      horiz-adv-x="448" d=" M384 416H64C28.65 416 0 387.35 0 352V32C0 -3.35 28.65 -32 64 -32H384C419.35 -32 448 -3.35 448 32V352C448 387.35 419.35 416 384 416zM128 256C110.33 256 96 270.3300000000001 96 288S110.33 320 128 320S160 305.67 160 288S145.67 256 128 256zM320 64C302.33 64 288 78.33 288 96S302.33 128 320 128S352 113.67 352 96S337.67 64 320 64z" />
+    <glyph glyph-name="dice"
+      unicode="&#xF522;"
+      horiz-adv-x="640" d=" M592 256H473.26C485.95 226.41 480.38 190.8 456.26 166.68L320 30.42V-16C320 -42.51 341.49 -64 368 -64H592C618.51 -64 640 -42.51 640 -16V208C640 234.51 618.51 256 592 256zM480 72C466.75 72 456 82.75 456 96C456 109.26 466.75 120 480 120S504 109.26 504 96C504 82.75 493.25 72 480 72zM433.63 258.7L258.7 433.63C239.54 452.79 208.47 452.79 189.31 433.63L14.37 258.7C-4.79 239.54 -4.79 208.47 14.37 189.31L189.3 14.37C208.46 -4.79 239.53 -4.79 258.69 14.37L433.63 189.3C452.79 208.47 452.79 239.54 433.63 258.7000000000001zM96 200C82.75 200 72 210.75 72 224C72 237.26 82.75 248 96 248S120 237.26 120 224C120 210.75 109.25 200 96 200zM224 72C210.75 72 200 82.75 200 96C200 109.26 210.75 120 224 120S248 109.26 248 96C248 82.75 237.25 72 224 72zM224 200C210.75 200 200 210.75 200 224C200 237.26 210.75 248 224 248S248 237.26 248 224C248 210.75 237.25 200 224 200zM224 328C210.75 328 200 338.75 200 352C200 365.26 210.75 376 224 376S248 365.26 248 352C248 338.75 237.25 328 224 328zM352 200C338.75 200 328 210.75 328 224C328 237.26 338.75 248 352 248S376 237.26 376 224C376 210.75 365.25 200 352 200z" />
+    <glyph glyph-name="divide"
+      unicode="&#xF529;"
+      horiz-adv-x="448" d=" M224 96C188.65 96 160 67.35 160 32S188.65 -32 224 -32S288 -3.35 288 32S259.35 96 224 96zM224 288C259.35 288 288 316.65 288 352S259.35 416 224 416S160 387.35 160 352S188.65 288 224 288zM416 240H32C14.33 240 0 225.67 0 208V176C0 158.33 14.33 144 32 144H416C433.67 144 448 158.33 448 176V208C448 225.67 433.67 240 416 240z" />
+    <glyph glyph-name="dna"
+      unicode="&#xF471;"
+      horiz-adv-x="448" d=" M0.1 -46.1C-1 -55.6 6.4 -63.9 16 -63.9L48.3 -64C56.4 -64 63.2 -58.1 64.3 -50.1C65 -45.2 66.1 -39 67.7 -32H380C381.6 -38.9 382.9 -45.2 383.5 -50.1C384.6 -58.1 391.4 -64.1 399.5 -64L431.8 -63.9C441.4000000000001 -63.9 448.9000000000001 -55.6 447.7 -46.1C443.1 -8.2 422.1 82.9 328.8 161.6C311.2 149.2000000000001 291.7 137.4 270.3 126.2000000000001C276.5 121.6 281.7 116.8000000000001 287.3 112.0000000000001H159.7C181 130.1000000000001 206.7 147.6000000000001 238.4 163.4C410.5 248.9 442.1 382.2 447.9 430.1C449 439.6 441.6 447.9 432 447.9L399.6 448C391.5 448 384.7000000000001 442.1 383.6 434.1C382.9000000000001 429.2 381.8 423 380.2000000000001 416H67.8C66.2 423 65.1 429.1 64.4 434.1C63.3 442.1 56.5 448.1 48.4 448L16.1 447.9C6.5 447.9 -1 439.6 0.1 430.1C5.3 387.2 31.4 276.2 160 192C31.5 107.8 5.3 -3.2 0.1 -46.1zM224 228.4C198.9 242.1 177.6 256.8 159.7 272H288.2C270.4 256.8 249.1 242 224 228.4zM355.1 352C349.3 341.6 342.3 330.9 334.1 320H114C105.7 330.9 98.7 341.6 93 352H355.1zM92.9 32C98.7 42.4 105.7 53.1 113.9 64H333.3C341.6 53.1 348.7 42.4 354.5 32H92.9z" />
+    <glyph glyph-name="dollar-sign"
+      unicode="&#xF155;"
+      horiz-adv-x="288" d=" M209.2 214.6L101.2 246.2C88.7 249.8 80 261.5 80 274.5C80 290.8 93.2 304 109.5 304H175.8C188 304 200 300.3 210 293.5C216.1 289.4 224.3 290.4 229.5 295.5L264.3 329.5C271.4000000000001 336.4 270.4000000000001 347.9 262.5 354C238 373.2 207.4 383.9 176 384V432C176 440.8 168.8 448 160 448H128C119.2 448 112 440.8 112 432V384H109.5C45.8 384 -5.4 329.3 0.5 264.4C4.7 218.3 39.9 180.8 84.3 167.8L186.8 137.8C199.3 134.1 208 122.5 208 109.5C208 93.2 194.8 80 178.5 80H112.2C100 80 88 83.7 78 90.5C71.9 94.6 63.7 93.6 58.5 88.5L23.7 54.5C16.6 47.6 17.6 36.1 25.5 30C50 10.8 80.6 0.1 112 0V-48C112 -56.8 119.2 -64 128 -64H160C168.8 -64 176 -56.8 176 -48V0.2C222.6 1.1 266.3 28.8 281.7 72.9C303.2 134.5 267.1 197.7 209.2 214.6z" />
+    <glyph glyph-name="dolly-flatbed"
+      unicode="&#xF474;"
+      horiz-adv-x="640" d=" M208 128H592C600.8 128 608 135.2 608 144V400C608 408.8 600.8 416 592 416H448V288L400 320L352 288V416H208C199.2 416 192 408.8 192 400V144C192 135.2 199.2 128 208 128zM624 64H128V432C128 440.8 120.8 448 112 448H16C7.2 448 0 440.8 0 432V400C0 391.2 7.2 384 16 384H64V16C64 7.2 71.2 0 80 0H162.9C161.1 -5 160 -10.4 160 -16C160 -42.5 181.5 -64 208 -64S256 -42.5 256 -16C256 -10.4 254.8 -5 253.1 0H451C449.2 -5 448.1 -10.4 448.1 -16C448.1 -42.5 469.6 -64 496.1 -64S544.1 -42.5 544.1 -16C544.1 -10.4 542.9 -5 541.2 0H624C632.8 0 640 7.2 640 16V48C640 56.8 632.8 64 624 64z" />
+    <glyph glyph-name="dolly"
+      unicode="&#xF472;"
+      horiz-adv-x="576" d=" M294.2 170.3C312.2 165.3 328.9 156.9 343.7 145.6L505.2 199.4C513.6 202.2000000000001 518.1 211.3000000000001 515.3 219.6L454.9 400.8C452.1 409.2 443 413.7 434.7 410.9L373.6 390.5L406.7 291.1L346 271L312.9 370.4L251.3 349.9C242.9 347.1 238.4 338 241.2 329.7L294.2 170.3zM575.2 121.6L565 152C562.2 160.4 553.1 164.9 544.8 162.1L331.3 90.9C314.1 112.9 287.7 127.3 257.8 127.9L158.4 426.1C154 439.2 141.8 448 128 448H16C7.2 448 0 440.8 0 432V400C0 391.2 7.2 384 16 384H104.9L197.1 107.3C171 86.9 155.4 53.7 161.1 16.8C167.2 -22.6 199 -55.5 238.4000000000001 -62.4C298.6 -73.1 350.7000000000001 -27.6 351.8000000000001 30.2L565.1000000000001 101.4C573.4000000000001 104.2000000000001 578.0000000000001 113.2000000000001 575.2000000000002 121.6zM256 -16C229.5 -16 208 5.5 208 32S229.5 80 256 80S304 58.5 304 32S282.5 -16 256 -16z" />
+    <glyph glyph-name="donate"
+      unicode="&#xF4B9;"
+      horiz-adv-x="512" d=" M256 32C370.9 32 464 125.1 464 240S370.9 448 256 448S48 354.9 48 240S141.1 32 256 32zM233.8 350.6V367.4C233.8 376.6 241.2 384 250.4 384H261.5C270.7 384 278.1 376.6 278.1 367.4V350.4C293.6 349.6 308.6 344.3 321.1 335C326.7000000000001 330.9 327.3 322.7 322.3 317.9L306 302.4C302.2 298.7000000000001 296.5 298.6 292 301.4C286.6 304.8 280.6 306.5 274.2 306.5H235.3C226.3 306.5 219 298.3 219 288.2C219 280 224 272.7 231.1 270.6L293.4 251.9C319.1 244.2 337.1 219.5 337.1 191.8C337.1 157.8 310.7 130.3 278 129.4V112.6C278 103.4 270.6 96 261.3999999999999 96H250.3C241.1 96 233.7 103.4 233.7 112.6V129.6C218.1999999999999 130.4 203.1999999999999 135.7000000000001 190.6999999999999 145C185.0999999999999 149.1 184.5 157.3 189.5 162.1L205.8 177.6C209.6 181.3 215.3 181.4 219.8 178.6C225.2 175.2000000000001 231.2 173.5 237.6 173.5H276.5C285.5 173.5 292.8 181.7 292.8 191.8C292.8 200 287.8 207.3 280.7 209.4L218.3999999999999 228.1C192.6999999999999 235.8 174.6999999999999 260.5 174.6999999999999 288.2C174.7999999999999 322.2 201.0999999999999 349.7 233.8 350.6zM480 96H447.5C427.9 70 402.9 48.3 374.5 32H438.3C443.6 32 447.9000000000001 28.4 447.9000000000001 24V8C447.9000000000001 3.6 443.6 0 438.3 0H73.6C68.3 0 64 3.6 64 8V24C64 28.4 68.3 32 73.6 32H137.4C109 48.3 84.1 70 64.4 96H32C14.3 96 0 81.7 0 64V-32C0 -49.7 14.3 -64 32 -64H480C497.7 -64 512 -49.7 512 -32V64C512 81.7 497.7 96 480 96z" />
+    <glyph glyph-name="door-closed"
+      unicode="&#xF52A;"
+      horiz-adv-x="640" d=" M624 0H512V397.2C512 425.2200000000001 490.47 448 464 448H175.99C149.52 448 127.99 425.2200000000001 127.99 397.2V0H16C7.16 0 0 -7.16 0 -16V-48C0 -56.84 7.16 -64 16 -64H624C632.84 -64 640 -56.84 640 -48V-16C640 -7.16 632.84 0 624 0zM415.99 160C398.32 160 383.99 174.33 383.99 192S398.32 224 415.99 224S447.99 209.67 447.99 192C448 174.33 433.67 160 415.99 160z" />
+    <glyph glyph-name="door-open"
+      unicode="&#xF52B;"
+      horiz-adv-x="640" d=" M624 0H544V334.55C544 361.81 522.47 384 496 384H384V320H480V-64H624C632.84 -64 640 -56.84 640 -48V-16C640 -7.16 632.84 0 624 0zM312.24 446.99L120.24 397.25C105.99 393.56 96 380.3 96 365.08V0H16C7.16 0 0 -7.16 0 -16V-48C0 -56.84 7.16 -64 16 -64H352V414.82C352 436.4 332.44 452.23 312.24 446.99zM264 160C250.75 160 240 174.33 240 192S250.75 224 264 224S288 209.67 288 192S277.25 160 264 160z" />
+    <glyph glyph-name="dot-circle"
+      unicode="&#xF192;"
+      horiz-adv-x="512" d=" M256 440C119.033 440 8 328.967 8 192S119.033 -56 256 -56S504 55.033 504 192S392.967 440 256 440zM336 192C336 147.888 300.112 112 256 112S176 147.888 176 192S211.888 272 256 272S336 236.112 336 192z" />
+    <glyph glyph-name="dove"
+      unicode="&#xF4BA;"
+      horiz-adv-x="512" d=" M288 280.8V308.9C259.8 345.2 240.9 388.2 233.9 434.1C231.8 447.6 214.9 452.9 206.1 442.4000000000001C185 417.5 168.4 388.3 157.2 355.9C191.4 317.6 237.2 291.3 288 280.8zM400 384C355.8 384 320 348.1 320 303.9V244.5C215.6 250.7 127 315 87 406.2C81.5 418.7 63.8 419.4 58 407.1C41.4 372 32 332.8 32 291.4C32 220.6 66.1 154.5 117.1 105.5C130.3 92.8 143.2 82.3 156 72.7L12.1 36.7C1.4 34 -3.4 21.6 2.6 12.3C20 -14.6 63 -60.2 155.8 -64C163.8 -64.2999999999999 171.8 -61.4 177.9 -56.1L243.1 0H320C408.4 0 480 71.5 480 159.9V320L512 384H400zM400 287.9C391.2 287.9 384 295.1 384 303.9S391.2 319.9 400 319.9S416 312.7000000000001 416 303.9S408.8 287.9 400 287.9z" />
+    <glyph glyph-name="download"
+      unicode="&#xF019;"
+      horiz-adv-x="512" d=" M216 448H296C309.3 448 320 437.3 320 424V256H407.7C425.5 256 434.4 234.5 421.8 221.9L269.7 69.7C262.2 62.2 249.9 62.2 242.4 69.7L90.1 221.9C77.5 234.5 86.4 256 104.2 256H192V424C192 437.3 202.7 448 216 448zM512 72V-40C512 -53.3 501.3 -64 488 -64H24C10.7 -64 0 -53.3 0 -40V72C0 85.3 10.7 96 24 96H170.7L219.7 47C239.8 26.9 272.2 26.9 292.3 47L341.3 96H488C501.3 96 512 85.3 512 72zM388 -16C388 -5 379 4 368 4S348 -5 348 -16S357 -36 368 -36S388 -27 388 -16zM452 -16C452 -5 443 4 432 4S412 -5 412 -16S421 -36 432 -36S452 -27 452 -16z" />
+    <glyph glyph-name="dumbbell"
+      unicode="&#xF44B;"
+      horiz-adv-x="640" d=" M104 352H56C42.7 352 32 341.3 32 328V224H8C3.6 224 0 220.4 0 216V168C0 163.6 3.6 160 8 160H32V56C32 42.7 42.7 32 56 32H104C117.3 32 128 42.7 128 56V328C128 341.3 117.3 352 104 352zM632 224H608V328C608 341.3 597.3 352 584 352H536C522.7 352 512 341.3 512 328V56C512 42.7 522.7 32 536 32H584C597.3 32 608 42.7 608 56V160H632C636.4 160 640 163.6 640 168V216C640 220.4 636.4 224 632 224zM456 416H408C394.7 416 384 405.3 384 392V224H256V392C256 405.3 245.3 416 232 416H184C170.7 416 160 405.3 160 392V-8C160 -21.3 170.7 -32 184 -32H232C245.3 -32 256 -21.3 256 -8V160H384V-8C384 -21.3 394.7 -32 408 -32H456C469.3 -32 480 -21.3 480 -8V392C480 405.3 469.3 416 456 416z" />
+    <glyph glyph-name="edit"
+      unicode="&#xF044;"
+      horiz-adv-x="576" d=" M402.6 364.8L492.8 274.6C496.6 270.8 496.6 264.6 492.8 260.8L274.4 42.4L181.6 32.1C169.2 30.7 158.7 41.2 160.1 53.6L170.4 146.4L388.8 364.8C392.6 368.6 398.8 368.6 402.6 364.8zM564.6 387.7L515.8000000000001 436.5C500.6000000000001 451.7 475.9000000000001 451.7 460.6000000000001 436.5L425.2000000000001 401.1C421.4000000000001 397.3 421.4000000000001 391.1 425.2000000000001 387.3L515.4000000000001 297.1C519.2 293.3 525.4000000000001 293.3 529.2 297.1L564.6 332.5C579.8000000000001 347.8 579.8000000000001 372.5 564.6 387.7zM384 101.8V0H64V320H293.8C297 320 300 321.3 302.3 323.5L342.3 363.5C349.9000000000001 371.1 344.5 384 333.8 384H48C21.5 384 0 362.5 0 336V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V141.8C448 152.5 435.1 157.8 427.5 150.3L387.5 110.3C385.3 108 384 105 384 101.8z" />
+    <glyph glyph-name="eject"
+      unicode="&#xF052;"
+      horiz-adv-x="448" d=" M448 64V0C448 -17.673 433.673 -32 416 -32H32C14.327 -32 0 -17.673 0 0V64C0 81.673 14.327 96 32 96H416C433.673 96 448 81.673 448 64zM48.053 128H399.939C441.5900000000001 128 463.52 177.674 435.322 208.435L259.383 400.442C240.369 421.185 207.632 421.186 188.616 400.442L12.67 208.435C-15.475 177.732 6.324 128 48.053 128z" />
+    <glyph glyph-name="ellipsis-h"
+      unicode="&#xF141;"
+      horiz-adv-x="512" d=" M328 192C328 152.2 295.8 120 256 120S184 152.2 184 192S216.2 264 256 264S328 231.8 328 192zM432 264C392.2 264 360 231.8 360 192S392.2 120 432 120S504 152.2 504 192S471.8 264 432 264zM80 264C40.2 264 8 231.8 8 192S40.2 120 80 120S152 152.2 152 192S119.8 264 80 264z" />
+    <glyph glyph-name="ellipsis-v"
+      unicode="&#xF142;"
+      horiz-adv-x="192" d=" M96 264C135.8 264 168 231.8 168 192S135.8 120 96 120S24 152.2 24 192S56.2 264 96 264zM24 368C24 328.2 56.2 296 96 296S168 328.2 168 368S135.8 440 96 440S24 407.8 24 368zM24 16C24 -23.8 56.2 -56 96 -56S168 -23.8 168 16S135.8 88 96 88S24 55.8 24 16z" />
+    <glyph glyph-name="envelope-open"
+      unicode="&#xF2B6;"
+      horiz-adv-x="512" d=" M512 -16C512 -42.51 490.51 -64 464 -64H48C21.49 -64 0 -42.51 0 -16V247.276A48 48 0 0 0 18.387 285.052C43.3 304.581 63.888 320.4170000000001 182.587 406.563C199.412 418.83 232.797 448.347 256 447.997C279.198 448.351 312.596 418.825 329.413 406.564C448.1 320.427 468.716 304.569 493.613 285.052A48 48 0 0 0 512 247.276V-16zM446.334 180.605C443.771 184.333 438.634 185.2000000000001 434.995 182.512C412.15 165.639 379.533 141.807 329.413 105.433C312.588 93.167 279.2030000000001 63.652 256 64.003C232.789 63.659 199.441 93.146 182.587 105.433C132.473 141.803 99.853 165.637 77.005 182.512C73.366 185.2 68.229 184.333 65.666 180.605L56.594 167.409A7.997999999999999 7.997999999999999 0 0 1 58.433 156.442C81.32 139.543 113.887 115.752 163.736 79.574C184.01 64.793 220.26 31.761 256 32.001C291.724 31.759 327.961 64.7720000000001 348.2630000000001 79.574C398.1130000000001 115.7530000000001 430.6810000000001 139.544 453.566 156.442A7.997999999999999 7.997999999999999 0 0 1 455.405 167.409L446.334 180.605z" />
+    <glyph glyph-name="envelope-square"
+      unicode="&#xF199;"
+      horiz-adv-x="448" d=" M400 416H48C21.49 416 0 394.51 0 368V16C0 -10.51 21.49 -32 48 -32H400C426.51 -32 448 -10.51 448 16V368C448 394.51 426.51 416 400 416zM178.117 185.896C87.429 251.713 88.353 251.879 64 270.833V296C64 309.255 74.745 320 88 320H360C373.255 320 384 309.255 384 296V270.833C359.629 251.864 360.566 251.709 269.883 185.895C259.383 178.24 238.491 159.775 224 160.001C209.497 159.783 188.633 178.228 178.117 185.896zM384 230.225V88C384 74.745 373.255 64 360 64H88C74.745 64 64 74.745 64 88V230.225C77.958 219.431 97.329 204.989 159.303 160.011C173.465 149.67 197.278 127.866 223.997 128.001C250.884 127.867 275.034 150.042 288.717 160.026C350.675 204.991 370.042 219.432 384 230.225z" />
+    <glyph glyph-name="envelope"
+      unicode="&#xF0E0;"
+      horiz-adv-x="512" d=" M502.3 257.2C506.2 260.3 512 257.4 512 252.5V48C512 21.5 490.5 0 464 0H48C21.5 0 0 21.5 0 48V252.4C0 257.4 5.7 260.2000000000001 9.7 257.1C32.1 239.7 61.8 217.6 163.8 143.5C184.9 128.1 220.5 95.7 256 95.9C291.7 95.6 328 128.7 348.3 143.5C450.3 217.6 479.9 239.8 502.3 257.2zM256 128C279.2 127.6 312.6 157.2 329.4 169.4C462.1 265.7 472.2 274.1 502.8 298.1C508.6 302.6 511.9999999999999 309.6 511.9999999999999 317V336C511.9999999999999 362.5 490.4999999999999 384 463.9999999999999 384H48C21.5 384 0 362.5 0 336V317C0 309.6 3.4 302.7 9.2 298.1C39.8 274.2 49.9 265.7 182.6 169.4C199.4 157.2 232.8 127.6 256 128z" />
+    <glyph glyph-name="equals"
+      unicode="&#xF52C;"
+      horiz-adv-x="448" d=" M416 144H32C14.33 144 0 129.67 0 112V80C0 62.33 14.33 48 32 48H416C433.67 48 448 62.33 448 80V112C448 129.67 433.67 144 416 144zM416 336H32C14.33 336 0 321.67 0 304V272C0 254.33 14.33 240 32 240H416C433.67 240 448 254.33 448 272V304C448 321.67 433.67 336 416 336z" />
+    <glyph glyph-name="eraser"
+      unicode="&#xF12D;"
+      horiz-adv-x="512" d=" M497.941 174.059C516.6859999999999 192.804 516.6859999999999 223.196 497.941 241.9410000000001L337.941 401.9410000000001C319.196 420.6860000000001 288.805 420.687 270.058 401.9410000000001L14.058 145.941C-4.687 127.196 -4.687 96.804 14.058 78.059L110.058 -17.941A48.004000000000005 48.004000000000005 0 0 1 144 -32H500C506.627 -32 512 -26.627 512 -20V20C512 26.627 506.627 32 500 32H355.883L497.941 174.059zM195.314 236.6860000000001L332.687 99.3130000000001L265.373 32H150.628L70.628 112L195.314 236.686z" />
+    <glyph glyph-name="euro-sign"
+      unicode="&#xF153;"
+      horiz-adv-x="320" d=" M310.706 34.235C309.392 40.865 302.8710000000001 45.107 296.2820000000001 43.604C285.5900000000001 41.165 268.86 38.191 250.8560000000001 38.191C194.0930000000001 38.191 148.9270000000001 72.9810000000001 129.3950000000001 123.6400000000001H243.0840000000001A12 12 0 0 1 254.7920000000001 133.009L261.165 161.369C262.851 168.8710000000001 257.146 176 249.457 176H115.22C114.01 190.328 113.806 204.287 115.357 218.245H261.95A12 12 0 0 1 273.673 227.679L280.185 257.434C281.823 264.918 276.124 272 268.462 272H130.184C150.817 316.991 192.874 347.03 247.803 347.03C262.289 347.03 276.367 344.78 285.654 342.885C291.87 341.617 298.001 345.3830000000001 299.656 351.5080000000001L311.647 395.8760000000001C313.469 402.617 309.182 409.492 302.321 410.793C290.217 413.088 270.71 416 249.635 416C152.451 416 74.03 355.748 45.075 272H12C5.373 272 0 266.627 0 260V230.245C0 223.618 5.373 218.245 12 218.245H33.569C32.56 204.638 32.388 188.958 33.388 176H12C5.373 176 0 170.627 0 164V135.64C0 129.013 5.373 123.64 12 123.64H42.114C67.139 33.308 145.264 -32 249.635 -32C275.936 -32 298.197 -27.456 310.736 -24.212C316.903 -22.617 320.763 -16.504 319.524 -10.255L310.706 34.235z" />
+    <glyph glyph-name="exchange-alt"
+      unicode="&#xF362;"
+      horiz-adv-x="512" d=" M0 280V296C0 309.255 10.745 320 24 320H384V368C384 389.367 409.899 400.0420000000001 424.971 384.971L504.971 304.971C514.343 295.598 514.343 280.4020000000001 504.971 271.03L424.971 191.03C409.956 176.018 384 186.544 384 208V256H24C10.745 256 0 266.745 0 280zM488 128H128V176C128 197.314 102.138 208.08 87.029 192.971L7.029 112.971C-2.343 103.598 -2.343 88.402 7.029 79.03L87.029 -0.97C102.057 -15.997 128 -5.437 128 16V64H488C501.255 64 512 74.745 512 88V104C512 117.255 501.255 128 488 128z" />
+    <glyph glyph-name="exclamation-circle"
+      unicode="&#xF06A;"
+      horiz-adv-x="512" d=" M504 192C504 55.003 392.957 -56 256 -56S8 55.003 8 192C8 328.9170000000001 119.043 440 256 440S504 328.9170000000001 504 192zM256 142C230.595 142 210 121.405 210 96S230.595 50 256 50S302 70.595 302 96S281.405 142 256 142zM212.327 307.346L219.745 171.346C220.092 164.982 225.354 160 231.727 160H280.273C286.646 160 291.908 164.982 292.255 171.346L299.673 307.346C300.048 314.2200000000001 294.575 320 287.6910000000001 320H224.308C217.424 320 211.952 314.2200000000001 212.327 307.346z" />
+    <glyph glyph-name="exclamation-triangle"
+      unicode="&#xF071;"
+      horiz-adv-x="576" d=" M569.517 7.987C587.975 -24.007 564.806 -64 527.94 -64H48.054C11.117 -64 -11.945 -23.945 6.477 7.987L246.423 424.015C264.89 456.024 311.1430000000001 455.966 329.577 424.015L569.517 7.987zM288 94C262.5950000000001 94 242 73.405 242 48S262.5950000000001 2 288 2S334 22.595 334 48S313.405 94 288 94zM244.327 259.346L251.745 123.346C252.092 116.982 257.354 112 263.727 112H312.273C318.646 112 323.908 116.982 324.255 123.346L331.673 259.346C332.048 266.2200000000001 326.575 272 319.6910000000001 272H256.3080000000001C249.4240000000001 272 243.9520000000001 266.2200000000001 244.3270000000001 259.346z" />
+    <glyph glyph-name="exclamation"
+      unicode="&#xF12A;"
+      horiz-adv-x="192" d=" M176 16C176 -28.112 140.112 -64 96 -64S16 -28.112 16 16S51.888 96 96 96S176 60.112 176 16zM25.26 422.801L38.86 150.801C39.499 138.028 50.041 128 62.83 128H129.17C141.959 128 152.501 138.028 153.14 150.801L166.74 422.801C167.425 436.51 156.496 448 142.77 448H49.23C35.504 448 24.575 436.51 25.26 422.801z" />
+    <glyph glyph-name="expand-arrows-alt"
+      unicode="&#xF31E;"
+      horiz-adv-x="448.1" d=" M448.1 104V-8C448.1 -21.3 437.4000000000001 -32 424.1 -32H312.1C290.7000000000001 -32 280 -6.1 295.1 9L331.3 45.2L224 152.4L116.8 45.1L153 9C168.1 -6.1 157.4 -32 136 -32H24C10.7 -32 0 -21.3 0 -8V104C0 125.4 25.9 136.1 41 121L77.2 84.8L184.5 192L77.2 299.3L41 263C25.9 247.9 0 258.6 0 280V392C0 405.3 10.7 416 24 416H136C157.4 416 168.1 390.1 153 375L116.8 338.8L224 231.6L331.3 338.9L295.1 375C280 390.1 290.7000000000001 416 312.1 416H424.1C437.4000000000001 416 448.1 405.3 448.1 392V280C448.1 258.6 422.2000000000001 247.9 407.1 263L370.9000000000001 299.2L263.6 192L370.9000000000001 84.7L407.1 120.9C422.2000000000001 136.1 448.1 125.4 448.1 104z" />
+    <glyph glyph-name="expand"
+      unicode="&#xF065;"
+      horiz-adv-x="448" d=" M0 268V392C0 405.3 10.7 416 24 416H148C154.6 416 160 410.6 160 404V364C160 357.4 154.6 352 148 352H64V268C64 261.4 58.6 256 52 256H12C5.4 256 0 261.4 0 268zM288 404V364C288 357.4 293.4 352 300 352H384V268C384 261.4 389.4 256 396 256H436C442.6 256 448 261.4 448 268V392C448 405.3 437.3 416 424 416H300C293.4 416 288 410.6 288 404zM436 128H396C389.4 128 384 122.6 384 116V32H300C293.4 32 288 26.6 288 20V-20C288 -26.6 293.4 -32 300 -32H424C437.3 -32 448 -21.3 448 -8V116C448 122.6 442.6 128 436 128zM160 -20V20C160 26.6 154.6 32 148 32H64V116C64 122.6 58.6 128 52 128H12C5.4 128 0 122.6 0 116V-8C0 -21.3 10.7 -32 24 -32H148C154.6 -32 160 -26.6 160 -20z" />
+    <glyph glyph-name="external-link-alt"
+      unicode="&#xF35D;"
+      horiz-adv-x="576" d=" M576 424V296.016C576 274.555 550.04 264.0360000000001 535.029 279.045L499.322 314.754L255.799 71.231C246.426 61.858 231.231 61.858 221.858 71.231L199.231 93.858C189.858 103.231 189.858 118.427 199.231 127.799L442.756 371.324L407.053 407.029C391.9820000000001 422.1 402.656 448 424.024 448H552C565.255 448 576 437.255 576 424zM407.029 177.206L391.029 161.206A23.999000000000002 23.999000000000002 0 0 1 384 144.235V0H64V320H328A24.003 24.003 0 0 1 344.9700000000001 327.029L360.9700000000001 343.029C376.089 358.149 365.381 384 344 384H48C21.49 384 0 362.51 0 336V-16C0 -42.51 21.49 -64 48 -64H400C426.51 -64 448 -42.51 448 -16V160.236C448 181.618 422.148 192.326 407.029 177.206z" />
+    <glyph glyph-name="external-link-square-alt"
+      unicode="&#xF360;"
+      horiz-adv-x="448" d=" M448 368V16C448 -10.51 426.51 -32 400 -32H48C21.49 -32 0 -10.51 0 16V368C0 394.51 21.49 416 48 416H400C426.51 416 448 394.51 448 368zM360 352H248.029C226.716 352 215.949 326.139 231.058 311.029L263.042 279.0420000000001L67.515 83.515C62.829 78.829 62.829 71.231 67.515 66.544L98.544 35.515C103.231 30.829 110.829 30.829 115.515 35.515L311.041 231.041L343.029 199.05C358.058 184.023 384 194.575 384 216.021V328C384 341.255 373.255 352 360 352z" />
+    <glyph glyph-name="eye-dropper"
+      unicode="&#xF1FB;"
+      horiz-adv-x="512" d=" M177.38 241.36L39.03 103.03A24.01 24.01 0 0 1 32 86.06V24L0 -32L32 -64L88 -32H150.06C156.42 -32 162.53 -29.47 167.03 -24.97L305.38 113.36L177.38 241.36zM402.932 210.89L419.884 193.94C429.254 184.5700000000001 429.254 169.37 419.884 160L378.911 119.03C369.6190000000001 109.718 354.405 109.596 344.971 119.03L183.028 280.9700000000001C173.658 290.3400000000001 173.658 305.54 183.028 314.91L224 355.88C233.289 365.189 248.502 365.318 257.94 355.88L274.932 338.89L357.538 421.491C392.728 456.681 450.038 456.991 485.538 421.491C526.028 373.411 515.198 323.151 485.538 293.491L402.932 210.89z" />
+    <glyph glyph-name="eye-slash"
+      unicode="&#xF070;"
+      horiz-adv-x="576" d=" M286.693 56.016L319.272 9.474A333.958 333.958 0 0 0 288 8C168.19 8 63.031 71.949 6.646 167.631A47.999 47.999 0 0 0 6.646 216.37C30.669 257.136 63.559 292.145 102.67 318.907L159.747 237.368C154.736 223.18 152 207.913 152 192C152 117.264 212.135 56.718 286.693 56.016zM569.354 167.631C537.687 113.894 490.607 70.1710000000001 434.1790000000001 42.1560000000001L434.1900000000001 42.1410000000001L475.6600000000001 -17.0589999999999C483.2600000000001 -27.9189999999999 480.6200000000001 -42.8789999999999 469.7600000000001 -50.4789999999999L456.6500000000001 -59.6589999999999C445.7900000000001 -67.2589999999999 430.8300000000001 -64.6189999999999 423.2300000000001 -53.759L100.34 401.06C92.74 411.92 95.38 426.88 106.24 434.48L119.35 443.6600000000001C130.21 451.26 145.17 448.62 152.77 437.76L203.808 365.1430000000001C230.68 372.224 258.905 376 288 376C407.81 376 512.969 312.051 569.354 216.369A48.00200000000001 48.00200000000001 0 0 0 569.354 167.631zM424 192C424 267.174 363.162 328 288 328C270.061 328 252.944 324.527 237.271 318.228L256.57 291.17C282.439 299.341 311.614 297.3330000000001 336.9700000000001 283.76H336.9400000000001C313.2900000000001 283.76 294.1200000000001 264.5900000000001 294.1200000000001 240.9400000000001C294.1200000000001 217.314 313.2670000000001 198.12 336.9400000000001 198.12C360.5900000000001 198.12 379.7600000000001 217.29 379.7600000000001 240.9400000000001V240.9700000000001C398.2220000000001 206.48 396.0720000000001 163.0560000000001 371.5100000000001 130.0200000000001V130.0100000000001L390.8240000000001 102.9490000000001C411.496 126.8 424 157.926 424 192zM262.014 91.273L184.484 202.03C179.47 149.643 213.798 103.6760000000001 262.014 91.273z" />
+    <glyph glyph-name="eye"
+      unicode="&#xF06E;"
+      horiz-adv-x="576" d=" M569.354 216.369C512.969 312.051 407.81 376 288 376C168.14 376 63.004 312.006 6.646 216.369A47.999 47.999 0 0 1 6.646 167.63C63.031 71.949 168.19 8 288 8C407.86 8 512.996 71.994 569.354 167.631A47.997 47.997 0 0 1 569.354 216.369zM288 56C212.838 56 152 116.827 152 192C152 267.1620000000001 212.826 328 288 328C363.1620000000001 328 424 267.174 424 192C424 116.838 363.174 56 288 56zM392 192C392 134.562 345.438 88 288 88S184 134.562 184 192C184 209.708 188.431 226.379 196.236 240.973L196.235 240.941C196.235 217.29 215.408 198.118 239.059 198.118S281.883 217.291 281.883 240.941C281.883 264.592 262.71 283.765 239.059 283.765L239.027 283.764C253.621 291.569 270.292 296 288 296C345.438 296 392 249.438 392 192z" />
+    <glyph glyph-name="fast-backward"
+      unicode="&#xF049;"
+      horiz-adv-x="512" d=" M0 12V372C0 378.6 5.4 384 12 384H52C58.6 384 64 378.6 64 372V220.1L235.5 376.6C256.1 393.7 288 379.4 288 352V220.1L459.5 376.6C480.1 393.7 512 379.4 512 352V32C512 4.6 480.1 -9.7 459.5 7.4L288 162.7V32C288 4.6 256.1 -9.7 235.5 7.4L64 162.7V12C64 5.4 58.6 0 52 0H12C5.4 0 0 5.4 0 12z" />
+    <glyph glyph-name="fast-forward"
+      unicode="&#xF050;"
+      horiz-adv-x="512" d=" M512 372V12C512 5.4 506.6 0 500 0H460C453.4 0 448 5.4 448 12V163.9L276.5 7.4C255.9 -9.8 224 4.6 224 32V163.9L52.5 7.4C31.9 -9.8 0 4.6 0 32V352C0 379.4 31.9 393.7 52.5 376.6L224 221.2V352C224 379.4 255.9 393.7 276.5 376.6L448 221.2V372C448 378.6 453.4 384 460 384H500C506.6 384 512 378.6 512 372z" />
+    <glyph glyph-name="fax"
+      unicode="&#xF1AC;"
+      horiz-adv-x="512" d=" M128 304V-16C128 -42.51 106.51 -64 80 -64H48C21.49 -64 0 -42.51 0 -16V304C0 330.51 21.49 352 48 352H80C106.51 352 128 330.51 128 304zM512 240V-16C512 -42.51 490.51 -64 464 -64H192C165.49 -64 144 -42.51 144 -16V408C144 430.091 161.909 448 184 448H391.432A39.996 39.996 0 0 0 419.716 436.284L468.285 387.715A39.999 39.999 0 0 0 480 359.432V285.258C498.641 278.667 512 260.898 512 240zM192 256H432V352H408C394.7970000000001 352 384 362.7970000000001 384 376V400H192V256zM288 52C288 58.627 282.627 64 276 64H236C229.373 64 224 58.627 224 52V12C224 5.373 229.373 0 236 0H276C282.627 0 288 5.373 288 12V52zM288 180C288 186.627 282.627 192 276 192H236C229.373 192 224 186.627 224 180V140C224 133.373 229.373 128 236 128H276C282.627 128 288 133.373 288 140V180zM416 52C416 58.627 410.627 64 404 64H364C357.373 64 352 58.627 352 52V12C352 5.373 357.373 0 364 0H404C410.627 0 416 5.373 416 12V52zM416 180C416 186.627 410.627 192 404 192H364C357.373 192 352 186.627 352 180V140C352 133.373 357.373 128 364 128H404C410.627 128 416 133.373 416 140V180z" />
+    <glyph glyph-name="feather"
+      unicode="&#xF52D;"
+      horiz-adv-x="512" d=" M512 448C504.81 447.99 98.51 425.99 71.47 160.58C68.85 137.98 67.25 115.3 66.1 92.6L226.75 253.25C233 259.5 243.13 259.5 249.37 253.25S255.62 236.87 249.37 230.63L9.37 -9.37A31.899999999999995 31.899999999999995 0 0 1 -0.01 -32.04C0.02 -49.68 14.33 -64 32 -64C40.19 -64 48.38 -60.88 54.62 -54.62L109.67 0.43C148.07 0.93 186.43 3.06 224.58 7.48C236.16 8.66 247.12 10.77 257.79 13.32L256 64H357.86C370.4700000000001 74.63 381.98 86.45 392.62 99.07L384 160H434.19C502.8 284.4 512 447.9 512 448z" />
+    <glyph glyph-name="female"
+      unicode="&#xF182;"
+      horiz-adv-x="256" d=" M128 448C163.346 448 192 419.346 192 384S163.346 320 128 320C92.654 320 64 348.654 64 384S92.654 448 128 448M247.283 93.821L199.283 285.8210000000001A24 24 0 0 1 176 304H164.64C141.929 293.557 115.05 293.106 91.36 304H80A24 24 0 0 1 56.717 285.8210000000001L8.717 93.821C4.935 78.695 16.383 64 32 64H88V-40C88 -53.255 98.745 -64 112 -64H144C157.255 -64 168 -53.255 168 -40V64H224C239.591 64 251.071 78.671 247.283 93.821z" />
+    <glyph glyph-name="fighter-jet"
+      unicode="&#xF0FB;"
+      horiz-adv-x="640" d=" M544 224L416 240L368 256H344L227.158 404H266.667C278.3330000000001 404 288 406.625 288 410S278.3330000000001 416 266.6670000000001 416H152V404H168V240H120L53.333 320H18.667L8 309.333V240H16V224H64V221.334L0 213.334V170.667L64 162.667V160H16V144H8V74.667L18.667 64H53.334L120 144H168V-20H152V-32H266.6670000000001C278.334 -32 288 -29.375 288 -26S278.3330000000001 -20 266.6670000000001 -20H227.158L344 128H368L416 144L544 160C640 181.333 640 186.583 640 192C640 197.417 640 202.667 544 224z" />
+    <glyph glyph-name="file-alt"
+      unicode="&#xF15C;"
+      horiz-adv-x="384" d=" M224 312V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V288H248C234.8 288 224 298.8 224 312zM288 76C288 69.4 282.6 64 276 64H108C101.4 64 96 69.4 96 76V84C96 90.6 101.4 96 108 96H276C282.6 96 288 90.6 288 84V76zM288 140C288 133.4 282.6 128 276 128H108C101.4 128 96 133.4 96 140V148C96 154.6 101.4 160 108 160H276C282.6 160 288 154.6 288 148V140zM288 212V204C288 197.4 282.6 192 276 192H108C101.4 192 96 197.4 96 204V212C96 218.6 101.4 224 108 224H276C282.6 224 288 218.6 288 212zM384 326.1V320H256V448H262.1C268.5 448 274.6 445.5 279.1 441L377 343C381.5 338.5 384 332.4 384 326.1z" />
+    <glyph glyph-name="file-archive"
+      unicode="&#xF1C6;"
+      horiz-adv-x="384" d=" M224 312V448H160.4V416H128.4V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V288H248C234.8 288 224 298.8 224 312zM95.9 416H127.9V384H95.9V416zM128.2 32C95 32 70.2 62.4 76.8 94.9L96.4 192V224H128.4V256H96.4V288H128.4V320H96.4V352H128.4V384H160.4V352H128.4V320H160.4V288H128.4V256H160.4V224H128.4V192H150.5C156.2 192 161.2 187.9 162.3 182.3L179.6 94.6C186 62.2000000000001 161.2 32 128.2 32zM160.9 85C160.9 70.1 146.4 58 128.5 58S96 70 96 85C96 99.9 110.5 112 128.4 112S160.9 99.9 160.9 85zM384 326.1V320H256V448H262.1C268.5 448 274.6 445.5 279.1 441L377 343C381.5 338.5 384 332.4 384 326.1z" />
+    <glyph glyph-name="file-audio"
+      unicode="&#xF1C7;"
+      horiz-adv-x="384" d=" M224 312V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V288H248C234.8 288 224 298.8 224 312zM160 44C160 33.3 147.1 28 139.5 35.5L104 72H76C69.4 72 64 77.4 64 84V140C64 146.6 69.4 152 76 152H104L139.5 188.5C147.1 196.1 160 190.7 160 180V44zM193.2 91.6C202.3 100.9 202.3 115.7000000000001 193.2 125C171.1 147.8 205.4 181.2 227.6 158.5C254.8 130.6 254.8 86.1 227.6 58.1C205.8 35.8 170.7 68.5 193.2 91.6zM279.2 208.7C333.6 152.8 333.6 63.9 279.2 7.9C257.4 -14.5 222.2 18.2 244.8 41.4C281 78.6 281.1 137.9 244.8 175.2C222.7 198 257.1 231.5 279.2 208.7zM384 326.1V320H256V448H262.1C268.5 448 274.6 445.5 279.1 441L377 343C381.5 338.5 384 332.4 384 326.1z" />
+    <glyph glyph-name="file-code"
+      unicode="&#xF1C9;"
+      horiz-adv-x="384" d=" M384 326.059V320H256V448H262.0590000000001C268.4240000000001 448 274.5290000000001 445.471 279.0300000000001 440.971L376.971 343.03A24.005 24.005 0 0 0 384 326.059zM248 288C234.8 288 224 298.8 224 312V448H24C10.745 448 0 437.255 0 424V-40C0 -53.255 10.745 -64 24 -64H360C373.255 -64 384 -53.255 384 -40V288H248zM123.206 47.495A5.4 5.4 0 0 0 115.573 47.249L50.707 108.061A5.4 5.4 0 0 0 50.707 115.9400000000001L115.573 176.7520000000001A5.4 5.4 0 0 0 123.206 176.5060000000001L142.785 155.6210000000001A5.4 5.4 0 0 0 142.413 147.8740000000001L101.65 112L142.413 76.126A5.4 5.4 0 0 0 142.785 68.379L123.206 47.495zM174.501 -2.984L147.048 4.986A5.401999999999999 5.401999999999999 0 0 0 143.367 11.6780000000001L204.807 223.3040000000001A5.401999999999999 5.401999999999999 0 0 0 211.499 226.9850000000001L238.951 219.0150000000001A5.4 5.4 0 0 0 242.631 212.3230000000001L181.191 0.6970000000001A5.396999999999999 5.396999999999999 0 0 0 174.501 -2.9839999999999zM335.293 108.061L270.427 47.249A5.4 5.4 0 0 0 262.7940000000001 47.495L243.2140000000001 68.38A5.4 5.4 0 0 0 243.5860000000001 76.127L284.35 112L243.587 147.874A5.4 5.4 0 0 0 243.215 155.6210000000001L262.795 176.506A5.4 5.4 0 0 0 270.428 176.752L335.294 115.94A5.4 5.4 0 0 0 335.293 108.061z" />
+    <glyph glyph-name="file-excel"
+      unicode="&#xF1C3;"
+      horiz-adv-x="384" d=" M224 312V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V288H248C234.8 288 224 298.8 224 312zM284.1 205.5L224 112L284.1 18.5C289.2000000000001 10.5 283.5 0 274 0H239.1C234.7 0 230.6 2.4 228.5 6.3C208.9 42.5 192 75 192 75C185.6 60.2 182 55 155.4 6.2C153.3 2.3 149.3 -0.1 144.9 -0.1H110C100.5 -0.1 94.8 10.4 99.9 18.4L160.2 111.9L99.9 205.4C94.7 213.4 100.5 223.9 110 223.9H144.8C149.2 223.9 153.3 221.5 155.4 217.6C181.5 168.8 175.4 184 192 149.1C192 149.1 198.1 160.8 228.6 217.6C230.7 221.5 234.8 223.9 239.2 223.9H274C283.5 224 289.2 213.5 284.1 205.5zM384 326.1V320H256V448H262.1C268.5 448 274.6 445.5 279.1 441L377 343C381.5 338.5 384 332.4 384 326.1z" />
+    <glyph glyph-name="file-image"
+      unicode="&#xF1C5;"
+      horiz-adv-x="384" d=" M384 326.059V320H256V448H262.0590000000001A24 24 0 0 0 279.029 440.971L376.9700000000001 343.03A24.002000000000002 24.002000000000002 0 0 0 384 326.059zM248 288C234.8 288 224 298.8 224 312V448H24C10.745 448 0 437.255 0 424V-40C0 -53.255 10.745 -64 24 -64H360C373.255 -64 384 -53.255 384 -40V288H248zM112.545 272C139.055 272 160.545 250.51 160.545 224S139.055 176 112.545 176S64.545 197.49 64.545 224S86.036 272 112.545 272zM320.545 32H64.545L65.03 80.485L104.545 120C109.231 124.686 116.344 124.201 121.03 119.515L160.545 80L264.06 183.515C268.746 188.201 276.344 188.201 281.031 183.515L320.545 144V32z" />
+    <glyph glyph-name="file-medical-alt"
+      unicode="&#xF478;"
+      horiz-adv-x="448" d=" M288 312V448H88C74.7 448 64 437.3 64 424V192H8C3.6 192 0 188.4 0 184V168C0 163.6 3.6 160 8 160H148.9C151.9 160 154.7 158.3 156.1 155.6L176 115.8L232.8 229.5C235.7 235.4 244.2 235.4 247.1 229.5L281.8 160H352C360.8 160 368 152.8 368 144S360.8 128 352 128H262.1L240 172.2L183.2 58.5C180.3 52.6 171.8 52.6 168.9 58.5L134.1 128H64V-40C64 -53.3 74.7 -64 88 -64H424C437.3 -64 448 -53.3 448 -40V288H312C298.8 288 288 298.8 288 312zM441 343L343.1 441C338.6 445.5 332.5 448 326.1 448H320V320H448V326.1C448 332.4 445.5 338.5 441 343z" />
+    <glyph glyph-name="file-medical"
+      unicode="&#xF477;"
+      horiz-adv-x="384" d=" M377 343L279.1 441C274.6 445.5 268.5 448 262.1 448H256V320H384V326.1C384 332.4 381.5 338.5 377 343zM224 312V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V288H248C234.8 288 224 298.8 224 312zM288 152V104C288 99.6 284.4 96 280 96H224V40C224 35.6 220.4 32 216 32H168C163.6 32 160 35.6 160 40V96H104C99.6 96 96 99.6 96 104V152C96 156.4 99.6 160 104 160H160V216C160 220.4 163.6 224 168 224H216C220.4 224 224 220.4 224 216V160H280C284.4 160 288 156.4 288 152z" />
+    <glyph glyph-name="file-pdf"
+      unicode="&#xF1C1;"
+      horiz-adv-x="384" d=" M181.9 191.9C176.9 207.9 177 238.8 179.9 238.8C188.3 238.8 187.5 201.9 181.9 191.9zM180.2 144.7C172.5 124.5 162.9 101.4 151.8 82C170.1 89 190.8 99.2 214.7 103.9C202 113.5 189.8 127.3 180.2 144.7zM86.1 19.9C86.1 19.1 99.3 25.3 121 60.1C114.3 53.8 91.9 35.6 86.1 19.9zM248 288H384V-40C384 -53.3 373.3 -64 360 -64H24C10.7 -64 0 -53.3 0 -40V424C0 437.3 10.7 448 24 448H224V312C224 298.8 234.8 288 248 288zM240 116.2C220 128.4 206.7 145.2 197.3 170C201.8 188.5 208.9 216.6 203.5 234.2C198.8 263.6 161.1 260.7 155.7 241C150.7 222.7 155.3 196.9 163.8 164C152.2 136.4 135.1 99.4 123 78.2C122.9 78.2 122.9 78.1 122.8 78.1C95.7 64.2 49.2 33.6 68.3 10.1C73.9 3.2 84.3 0.1 89.8 0.1C107.7 0.1 125.5 18.1 150.9 61.9C176.7 70.4 205 81 229.9 85.1C251.6 73.3 277 65.6 293.9 65.6C323.1 65.6 325.1 97.6 313.6 108.9999999999999C299.7 122.6 259.3 118.6999999999999 240 116.1999999999999zM377 343L279 441C274.5 445.5 268.4 448 262 448H256V320H384V326.1C384 332.4 381.5 338.5 377 343zM302.9 87.7C307 90.4 300.4 99.6 260.1 96.7C297.2 80.9 302.9 87.7 302.9 87.7z" />
+    <glyph glyph-name="file-powerpoint"
+      unicode="&#xF1C4;"
+      horiz-adv-x="384" d=" M193.7 176.8C202.5 176.8 209.2 174.1 214 168.7C223.6 157.8 223.8 136 213.8 124.6C208.9 119 201.9 116.1 192.7 116.1H165.8V176.8H193.7zM377 343L279 441C274.5 445.5 268.4 448 262 448H256V320H384V326.1C384 332.4 381.5 338.5 377 343zM224 312V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V288H248C234.8 288 224 298.8 224 312zM277 146.8C277 56.5 188.2 69.2000000000001 165.9 69.2000000000001V12C165.9 5.4 160.5 0 153.9 0H123.1C116.5 0 111.1 5.4 111.1 12V211.8C111.1 218.4 116.5 223.8 123.1 223.8H204.1C248.6 223.8 277 191 277 146.8z" />
+    <glyph glyph-name="file-video"
+      unicode="&#xF1C8;"
+      horiz-adv-x="384" d=" M384 326.059V320H256V448H262.0590000000001C268.4240000000001 448 274.5290000000001 445.471 279.0300000000001 440.971L376.971 343.03A24.005 24.005 0 0 0 384 326.059zM224 312V448H24C10.745 448 0 437.255 0 424V-40C0 -53.255 10.745 -64 24 -64H360C373.255 -64 384 -53.255 384 -40V288H248C234.8 288 224 298.8 224 312zM320 167.984V56.0210000000001C320 34.5760000000001 294.057 24.0230000000001 279.029 39.0500000000001L224 94.059V56C224 42.745 213.255 32 200 32H88C74.745 32 64 42.745 64 56V168C64 181.255 74.745 192 88 192H200C213.255 192 224 181.255 224 168V129.941L279.029 184.954C294.04 199.964 320 189.445 320 167.984z" />
+    <glyph glyph-name="file-word"
+      unicode="&#xF1C2;"
+      horiz-adv-x="384" d=" M224 312V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V288H248C234.8 288 224 298.8 224 312zM281.1 192H305C312.7 192 318.4 184.9 316.7 177.3L278.7 9.3C277.5 3.8 272.6 0 267 0H229C223.5 0 218.7 3.8 217.4 9.1C191.6 112.6 196.6 90.3 191.8 119.6H191.3C190.2 105.3 188.9 102.2000000000001 165.7 9.1C164.4 3.8 159.6 0 154.1 0H117C111.4 0 106.5 3.9 105.3 9.4L67.5 177.4C65.8 184.9 71.5 192 79.2 192H103.7C109.4 192 114.4 188 115.5 182.3C131.1 104.3 135.6 72.8 136.5 60.1C138.1 70.3 143.8 92.8 165.9 182.8C167.2 188.2 172 191.9 177.6 191.9H206.7C212.3 191.9 217.1 188.1 218.4 182.7000000000001C242.4 82.3000000000001 247.2 58.7000000000001 248 53.3000000000001C247.8 64.5000000000001 245.4 71.1000000000001 269.6 182.5000000000001C270.6 188.1000000000001 275.5 192.0000000000001 281.1 192.0000000000001zM384 326.1V320H256V448H262.1C268.5 448 274.6 445.5 279.1 441L377 343C381.5 338.5 384 332.4 384 326.1z" />
+    <glyph glyph-name="file"
+      unicode="&#xF15B;"
+      horiz-adv-x="384" d=" M224 312V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V288H248C234.8 288 224 298.8 224 312zM384 326.1V320H256V448H262.1C268.5 448 274.6 445.5 279.1 441L377 343C381.5 338.5 384 332.4 384 326.1z" />
+    <glyph glyph-name="film"
+      unicode="&#xF008;"
+      horiz-adv-x="512" d=" M488 384H480V364C480 357.4 474.6 352 468 352H428C421.4 352 416 357.4 416 364V384H96V364C96 357.4 90.6 352 84 352H44C37.4 352 32 357.4 32 364V384H24C10.7 384 0 373.3 0 360V24C0 10.7 10.7 0 24 0H32V20C32 26.6 37.4 32 44 32H84C90.6 32 96 26.6 96 20V0H416V20C416 26.6 421.4 32 428 32H468C474.6 32 480 26.6 480 20V0H488C501.3 0 512 10.7 512 24V360C512 373.3 501.3 384 488 384zM96 76C96 69.4 90.6 64 84 64H44C37.4 64 32 69.4 32 76V116C32 122.6 37.4 128 44 128H84C90.6 128 96 122.6 96 116V76zM96 172C96 165.4 90.6 160 84 160H44C37.4 160 32 165.4 32 172V212C32 218.6 37.4 224 44 224H84C90.6 224 96 218.6 96 212V172zM96 268C96 261.4 90.6 256 84 256H44C37.4 256 32 261.4 32 268V308C32 314.6 37.4 320 44 320H84C90.6 320 96 314.6 96 308V268zM368 60C368 53.4 362.6 48 356 48H156C149.4 48 144 53.4 144 60V156C144 162.6 149.4 168 156 168H356C362.6 168 368 162.6 368 156V60zM368 228C368 221.4 362.6 216 356 216H156C149.4 216 144 221.4 144 228V324C144 330.6 149.4 336 156 336H356C362.6 336 368 330.6 368 324V228zM480 76C480 69.4 474.6 64 468 64H428C421.4 64 416 69.4 416 76V116C416 122.6 421.4 128 428 128H468C474.6 128 480 122.6 480 116V76zM480 172C480 165.4 474.6 160 468 160H428C421.4 160 416 165.4 416 172V212C416 218.6 421.4 224 428 224H468C474.6 224 480 218.6 480 212V172zM480 268C480 261.4 474.6 256 468 256H428C421.4 256 416 261.4 416 268V308C416 314.6 421.4 320 428 320H468C474.6 320 480 314.6 480 308V268z" />
+    <glyph glyph-name="filter"
+      unicode="&#xF0B0;"
+      horiz-adv-x="512" d=" M487.976 448H24.028C2.71 448 -8.047 422.134 7.058 407.029L192 222.059V16C192 8.169 195.821 0.83 202.237 -3.662L282.237 -59.642C298.02 -70.69 320 -59.493 320 -39.98V222.059L504.947 407.029C520.021 422.104 509.338 448 487.976 448z" />
+    <glyph glyph-name="fire-extinguisher"
+      unicode="&#xF134;"
+      horiz-adv-x="448" d=" M434.027 421.671L266.027 393.671C254.693 391.782 256 380.2 256 376H197.668C208.353 411.892 181.446 448 144 448C104.565 448 77.632 408.324 91.772 371.7970000000001C39.733 358.746 16.391 317.584 1.723 280.913C-3.2 268.606 2.786 254.639 15.093 249.716C27.41 244.79 41.372 250.791 46.289 263.086C75.058 335.01 106.964 328 168 328V300.924C126.457 290.062 96 251.689 96 206.795V-40C96 -53.255 106.745 -64 120 -64H264C277.255 -64 288 -53.255 288 -40V208C288 252.731 257.404 290.312 216 300.9700000000001V328H256C256 325.026 254.297 312.284 266.027 310.329L434.027 282.329C441.342 281.11 448 286.75 448 294.166V409.834C448 417.25 441.342 422.89 434.027 421.671zM144 376C135.178 376 128 383.178 128 392S135.178 408 144 408S160 400.822 160 392S152.822 376 144 376z" />
+    <glyph glyph-name="fire"
+      unicode="&#xF06D;"
+      horiz-adv-x="384" d=" M216 424.142C216 447.944 185.347 456.907 171.851 437.18C48 256.149 224 248 224 160C224 124.371 194.886 95.542 159.15 96.006C123.98 96.462 96 125.78 96 160.954V246.464C96 268.1670000000001 69.529 278.689 54.568 262.968C27.801 234.842 0 186.668 0 128C0 22.131 86.131 -64 192 -64S384 22.131 384 128C384 298.29 216 321.003 216 424.142z" />
+    <glyph glyph-name="first-aid"
+      unicode="&#xF479;"
+      horiz-adv-x="576" d=" M0 368V16C0 -10.5 21.5 -32 48 -32H96V416H48C21.5 416 0 394.5 0 368zM128 -32H448V416H128V-32zM192 216C192 220.4 195.6 224 200 224H256V280C256 284.4 259.6 288 264 288H312C316.4 288 320 284.4 320 280V224H376C380.4 224 384 220.4 384 216V168C384 163.6 380.4 160 376 160H320V104C320 99.6 316.4 96 312 96H264C259.6 96 256 99.6 256 104V160H200C195.6 160 192 163.6 192 168V216zM528 416H480V-32H528C554.5 -32 576 -10.5 576 16V368C576 394.5 554.5 416 528 416z" />
+    <glyph glyph-name="flag-checkered"
+      unicode="&#xF11E;"
+      horiz-adv-x="512" d=" M466.515 381.072C487.731 390.926 512 375.449 512 352.056V108.956C512 98.43 506.839 88.549 498.157 82.598C462.32 58.034 423.822 41.74 375.652 41.74C308.279 41.74 264.022 76.523 210.435 76.523C159.582 76.523 124.311 66.465 96 54.401V-40C96 -53.255 85.255 -64 72 -64H56C42.745 -64 32 -53.255 32 -40V346.055C17.497 356.175 8 372.974 8 392C8 423.704 34.345 449.254 66.338 447.952C94.806 446.794 118.117 423.984 119.889 395.548C120.409 387.206 119.079 379.238 116.303 371.986C137.039 379.616 159.393 384 184.348 384C251.721 384 295.978 349.217 349.5650000000001 349.217C390.0610000000001 349.217 432.177 365.123 466.515 381.072zM96 313.37V242.88C125 253.55 147.18 260.71 169.6 263.79V335.36C146.1 333.19 129.16 325.57 96 313.37zM316.8 304.18C290.3830000000001 308.852 266.914 318.159 243.2 325.52V258.1C267.375 251.3940000000001 290.766 241.6560000000001 316.8 235.79V304.18zM169.6 263.79V193.75C202.396 196.728 223.51 194.385 243.2 189.95V258.1C217.953 265.135 196.619 267.523 169.6 263.79zM243.2 121.5600000000001C269.538 116.9080000000001 292.932 107.633 316.8 100.2200000000001V167.6300000000001C292.523 174.3760000000001 269.26 184.0800000000001 243.2 189.9500000000001V121.5600000000001zM96 105.9C119.62 114.29 143.79 119.74 169.6 122.46V193.75C143.49 191.4 122.24 185.71 96 176.39V105.9zM464 327.5C442.7 318.65 417.41 309.86 390.4 305.03V233.12C417.71 237.48 440.43 247.22 464 257.01V327.5zM464 117.54V188.03C441.81 173.83 415.2200000000001 165.42 390.4 162.01V90.43C415.47 92.81 438.89 101.47 464 117.54zM316.8 235.79V167.63C342.464 160.496 363.416 158.288 390.4 162.01V233.12C364.401 228.933 340.457 230.444 316.8 235.79z" />
+    <glyph glyph-name="flag"
+      unicode="&#xF024;"
+      horiz-adv-x="512" d=" M349.565 349.217C295.978 349.217 251.721 384 184.348 384C159.393 384 137.039 379.616 116.303 371.987A55.947 55.947 0 0 1 119.889 395.549C118.117 423.985 94.806 446.794 66.338 447.952C34.345 449.254 8 423.704 8 392C8 372.974 17.497 356.175 32 346.055V-40C32 -53.255 42.745 -64 56 -64H72C85.255 -64 96 -53.255 96 -40V54.4C124.311 66.464 159.582 76.522 210.435 76.522C264.023 76.522 308.279 41.739 375.6520000000001 41.739C423.8210000000001 41.739 462.3190000000001 58.033 498.157 82.597C506.84 88.548 512 98.429 512 108.955V352.055C512 375.448 487.731 390.925 466.515 381.071C432.177 365.123 390.061 349.217 349.565 349.217z" />
+    <glyph glyph-name="flask"
+      unicode="&#xF0C3;"
+      horiz-adv-x="448" d=" M437.2 44.5L320 233V384H328C341.3 384 352 394.7 352 408V424C352 437.3 341.3 448 328 448H120C106.7 448 96 437.3 96 424V408C96 394.7 106.7 384 120 384H128V233L10.8 44.5C-18.5 -2.6 15.3 -64 70.9 -64H377.1C432.8 -64 466.5 -2.5 437.2000000000001 44.5zM137.9 128L186.1 205.6C189.8 210.8 191.9 217.2 191.9 224V384H255.9000000000001V224C255.9000000000001 217.1 258.1 210.8 261.7000000000001 205.6L309.9000000000001 128H137.9z" />
+    <glyph glyph-name="folder-open"
+      unicode="&#xF07C;"
+      horiz-adv-x="576" d=" M572.694 155.907L500.27 31.752A63.99699999999999 63.99699999999999 0 0 0 444.989 0H45.025C26.502 0 14.961 20.093 24.294 36.093L96.718 160.2480000000001A64 64 0 0 0 152 192H551.9639999999999C570.487 192 582.0279999999999 171.907 572.694 155.907zM152 224H480V272C480 298.51 458.51 320 432 320H272L208 384H48C21.49 384 0 362.51 0 336V57.954L69.077 176.372C86.214 205.75 117.989 224 152 224z" />
+    <glyph glyph-name="folder"
+      unicode="&#xF07B;"
+      horiz-adv-x="512" d=" M464 320H272L208 384H48C21.49 384 0 362.51 0 336V48C0 21.49 21.49 0 48 0H464C490.51 0 512 21.49 512 48V272C512 298.51 490.51 320 464 320z" />
+    <glyph glyph-name="font"
+      unicode="&#xF031;"
+      horiz-adv-x="448" d=" M152 32H127.987L154.573 112.782H292.8L319.386 32H296C287.163 32 280 24.837 280 16V-16C280 -24.837 287.163 -32 296 -32H432C440.837 -32 448 -24.837 448 -16V16C448 24.837 440.837 32 432 32H405.261L275.495 405.254A16 16 0 0 1 260.382 416H187.616A16 16 0 0 1 172.503 405.254L42.739 32H16C7.163 32 0 24.837 0 16V-16C0 -24.837 7.163 -32 16 -32H152C160.837 -32 168 -24.837 168 -16V16C168 24.837 160.837 32 152 32zM216.353 303.778C220.701 318.9940000000001 222.963 331.9340000000001 223.939 338.4220000000001C224.778 331.901 226.878 318.9460000000001 231.6660000000001 303.716L273.0010000000001 179.71H174.382L216.353 303.778z" />
+    <glyph glyph-name="football-ball"
+      unicode="&#xF44E;"
+      horiz-adv-x="496" d=" M481.5 387.7C476.7 405.9 462.4 420.2 444.2 425.1C420.3 431.5 383 439.1 339.4 440L496 283.2C495.2 326.7 487.8 363.8 481.5 387.7zM14.5 -3.7C19.3 -21.9 33.6 -36.2 51.8 -41.1C75.7 -47.4999999999999 113 -55.1 156.6 -55.9999999999999L0 100.8C0.8 57.3 8.2 20.2 14.5 -3.7zM4.2 164.6L220.4 -52C352.9 -32.6 469.2 66.7 491.9 219.4L275.6 436C143.1 416.6 26.8 317.3 4.2 164.6zM321.5 288.2000000000001C324.6 291.3 329.7 291.3 332.8 288.2000000000001L344.1 276.9C347.2000000000001 273.8 347.2000000000001 268.7000000000001 344.1 265.6L315.8 237.3L344.1 209C347.2000000000001 205.9 347.2000000000001 200.8 344.1 197.7L332.8 186.4C329.7 183.3 324.6 183.3 321.5 186.4L293.2 214.7L270.6 192L298.9 163.7C302 160.6 302 155.5 298.9 152.4L287.6 141.1C284.5 138 279.4 138 276.3 141.1L248 169.4L225.4 146.8L253.7 118.5C256.8 115.3999999999999 256.8 110.3 253.7 107.1999999999999L242.4 95.8999999999999C239.3 92.7999999999999 234.2 92.7999999999999 231.1 95.8999999999999L202.8 124.1999999999999L174.5 95.8999999999999C171.4 92.7999999999999 166.3 92.7999999999999 163.2 95.8999999999999L151.9 107.1999999999999C148.8 110.3 148.8 115.3999999999999 151.9 118.5L180.2 146.8L151.9 175C148.8 178.1 148.8 183.1999999999999 151.9 186.3L163.2 197.6C166.3 200.7 171.4 200.7 174.5 197.6L202.8 169.3L225.4 191.9L197.1 220.2C194 223.3 194 228.4 197.1 231.5L208.4 242.8C211.5 245.9 216.6 245.9 219.7 242.8L248 214.5L270.6 237.1L242.3 265.4C239.2 268.5 239.2 273.6 242.3 276.7000000000001L253.6 288C256.7000000000001 291.1 261.8 291.1 264.9000000000001 288L293.2000000000001 259.7000000000001L321.5000000000001 288.2000000000001z" />
+    <glyph glyph-name="forward"
+      unicode="&#xF04E;"
+      horiz-adv-x="512" d=" M500.5 216.6L308.5 376.6C287.9 393.7 256 379.4 256 352V32C256 4.6 287.9 -9.8 308.5 7.4L500.5 167.4C515.8 180.2 515.8 203.8 500.5 216.6zM244.5 216.6L52.5 376.6C31.9 393.7 0 379.4 0 352V32C0 4.6 31.9 -9.8 52.5 7.4L244.5 167.4C259.8 180.2 259.8 203.8 244.5 216.6z" />
+    <glyph glyph-name="frog"
+      unicode="&#xF52E;"
+      horiz-adv-x="576" d=" M446.53 350.57C439.67 387.77 407.19 416 368 416C328.77 416 296.28 387.71 289.46 350.46C126.75 335.04 -0.5 197.88 0 31.02C0.11 -3.9 29.08 -32 64 -32H368C376.84 -32 384 -24.84 384 -16C384 1.67 369.67 16 352 16H272.51L308.31 64.33C332.45 100.56 318.6600000000001 152.61 274.6 170.93C250.7100000000001 180.86 223.05 175.5799999999999 202.36 160.05L169.6 135.46C162.54 130.15 152.51 131.55 147.19 138.65C141.89 145.73 143.31 155.76 150.38 161.06L185.16 187.15C222 214.81 273.4400000000001 214.77 310.29 187.15C321.1600000000001 179 356.1600000000001 148.09 351.0900000000001 93.94L469.62 -32H560C568.84 -32 576 -24.84 576 -16C576 1.67 561.67 16 544 16H490.37L391.85 120.68L546.29 207.33A58.15999999999999 58.15999999999999 0 0 1 576 258.06C576 279.4600000000001 564.28 299.01 545.52 309.29C504.96 331.51 446.53 350.57 446.53 350.57zM368 312C354.74 312 344 322.75 344 336C344 349.26 354.74 360 368 360C381.25 360 392 349.26 392 336C392 322.75 381.25 312 368 312z" />
+    <glyph glyph-name="frown"
+      unicode="&#xF119;"
+      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM328 272C345.7 272 360 257.7 360 240S345.7 208 328 208S296 222.3 296 240S310.3 272 328 272zM168 272C185.7 272 200 257.7 200 240S185.7 208 168 208S136 222.3 136 240S150.3 272 168 272zM360.7 51.7C357.7 49.2 354.1 48 350.5 48C345.9 48 341.4 50 338.2 53.8C315.8 80.6 282.9 96 248 96S180.2 80.6 157.8 53.8C152.2 47 142.1 46.1 135.3 51.8C128.5 57.5 127.6 67.5 133.3 74.3C161.7 108.4 203.6 128 248 128S334.3 108.4 362.7 74.2C368.4 67.5 367.5 57.4 360.7 51.7z" />
+    <glyph glyph-name="futbol"
+      unicode="&#xF1E3;"
+      horiz-adv-x="512" d=" M504 192C504 55.033 392.967 -56 256 -56S8 55.033 8 192S119.033 440 256 440S504 328.967 504 192zM456 192L455.997 192.282L429.933 169.541L367.254 228.041L383.7080000000001 312.396L418.011 309.324C393.122 343.54 358.007 369.413 317.302 382.4650000000001L330.9530000000001 350.526L256 309L181.047 350.525L194.698 382.464C154.067 369.436 118.918 343.594 93.989 309.323L128.554 312.396L144.746 228.041L82.068 169.541L56.004 192.282L56.001 192C56.001 148.985 69.498 108.048 94.473 74.009L102.177 107.906L187.315 97.459L223.616 19.633L193.714 1.847C233.916 -11.275 278.004 -11.301 318.286 1.847L288.384 19.633L324.685 97.4590000000001L409.823 107.9060000000001L417.527 74.0090000000001C442.503 108.048 456 148.985 456 192zM207.898 122.429L178.004 213.741L256 270.2680000000001L333.996 213.741L304.374 122.429H207.898z" />
+    <glyph glyph-name="gamepad"
+      unicode="&#xF11B;"
+      horiz-adv-x="640" d=" M480 352H160C71.6 352 0 280.4 0 192S71.6 32 160 32C204.8 32 245.2 50.4 274.2 80H365.7C394.7 50.4 435.2 32 479.9 32C568.3 32 639.9 103.6 639.9 192S568.4 352 480 352zM256 172C256 165.4 250.6 160 244 160H192V108C192 101.4 186.6 96 180 96H140C133.4 96 128 101.4 128 108V160H76C69.4 160 64 165.4 64 172V212C64 218.6 69.4 224 76 224H128V276C128 282.6 133.4 288 140 288H180C186.6 288 192 282.6 192 276V224H244C250.6 224 256 218.6 256 212V172zM440 104C413.5 104 392 125.5 392 152S413.5 200 440 200S488 178.5 488 152S466.5 104 440 104zM520 184C493.5 184 472 205.5 472 232S493.5 280 520 280S568 258.5 568 232S546.5 184 520 184z" />
+    <glyph glyph-name="gas-pump"
+      unicode="&#xF52F;"
+      horiz-adv-x="512" d=" M336 0H16C7.2 0 0 -7.2 0 -16V-48C0 -56.8 7.2 -64 16 -64H336C344.8 -64 352 -56.8 352 -48V-16C352 -7.2 344.8 0 336 0zM493.2 340.7L412.2 421.7C406 427.9 395.8 427.9 389.6 421.7L378.3 410.4C372.1 404.2 372.1 394 378.3 387.8L416 350.1V288C416 259.9 436.9 236.7 464 232.8V72C464 58.8 453.2 48 440 48S416 58.8 416 72V104C416 152.6 376.6 192 328 192H320V384C320 419.3 291.3 448 256 448H96C60.7 448 32 419.3 32 384V32H320V144H328C350.1 144 368 126.1 368 104V76.2C368 38.5 395 4.2 432.5 0.3C475.5 -4.0000000000001 512 29.8 512 71.9999999999999V295.4C512 312.4 505.2 328.7 493.2 340.7zM256 256H96V384H256V256z" />
+    <glyph glyph-name="gavel"
+      unicode="&#xF0E3;"
+      horiz-adv-x="512" d=" M504.971 248.638L482.344 271.265C472.971 280.6380000000001 457.775 280.6380000000001 448.403 271.265L442.7460000000001 265.608L329.608 378.745L335.265 384.402C344.638 393.775 344.638 408.971 335.265 418.343L312.638 440.971C303.265 450.344 288.069 450.344 278.697 440.971L154.246 316.52C144.873 307.1470000000001 144.873 291.951 154.246 282.579L176.873 259.952C186.246 250.579 201.442 250.579 210.814 259.952L216.471 265.6090000000001L256.069 226.011L175.029 144.971L169.372 150.628C156.875 163.125 136.614 163.125 124.117 150.628L9.373 35.882C-3.124 23.385 -3.124 3.124 9.373 -9.373L54.628 -54.628C67.125 -67.125 87.386 -67.125 99.883 -54.628L214.628 60.117C227.125 72.614 227.125 92.875 214.628 105.372L208.971 111.029L290.011 192.069L329.6090000000001 152.471L323.9520000000001 146.814C314.5790000000001 137.441 314.5790000000001 122.245 323.9520000000001 112.8730000000001L346.5790000000001 90.246C355.9520000000001 80.8730000000001 371.1480000000001 80.8730000000001 380.5200000000001 90.246L504.9710000000001 214.697C514.3430000000001 224.069 514.3430000000001 239.2650000000001 504.9710000000001 248.6380000000001z" />
+    <glyph glyph-name="gem"
+      unicode="&#xF3A5;"
+      horiz-adv-x="576" d=" M485.5 448L576 288H474.9L405.7 448H485.5zM357.5 448L426.7 288H149.3L218.5 448H357.5zM90.5 448H170.3L101.1 288H0L90.5 448zM0 256H100.7L223.7 4.3C225.2 1.2 221 -1.6 218.7 1L0 256zM148.2 256H427.8L290.8 -62.2C289.8 -64.6 286.3 -64.6 285.3 -62.2L148.2 256zM352.3 4.3L475.3 256H576L357.3 1.1C355 -1.6 350.8 1.2 352.3 4.3z" />
+    <glyph glyph-name="genderless"
+      unicode="&#xF22D;"
+      horiz-adv-x="288" d=" M144 272C188.1 272 224 236.1 224 192S188.1 112 144 112S64 147.9 64 192S99.9 272 144 272M144 336C64.5 336 0 271.5 0 192S64.5 48 144 48S288 112.5 288 192S223.5 336 144 336z" />
+    <glyph glyph-name="gift"
+      unicode="&#xF06B;"
+      horiz-adv-x="512" d=" M32 0C32 -17.7 46.3 -32 64 -32H224V128H32V0zM480 288H437.9C444.1 300.1 448 313.5 448 328C448 376.5 408.5 416 360 416C318.4 416 291.5 394.7 257 347.7C222.5 394.7 195.6 416 154 416C105.5 416 66 376.5 66 328C66 313.5 69.8 300.1 76.1 288H32C14.3 288 0 273.7 0 256V176C0 167.2 7.2 160 16 160H496C504.8 160 512 167.2 512 176V256C512 273.7 497.7 288 480 288zM153.9 288C131.8 288 113.9 305.9 113.9 328S131.8 368 153.9 368C173.8 368 188.5 364.7 240 288H153.9zM360 288H273.9C325.3 364.5 339.6 368 360 368C382.1 368 400 350.1 400 328S382.1 288 360 288zM288 -32H448C465.7 -32 480 -17.7 480 0V128H288V-32z" />
+    <glyph glyph-name="glass-martini"
+      unicode="&#xF000;"
+      horiz-adv-x="512" d=" M507.3 420.7C517.3 430.7 510.2 448 496 448H16C1.8 448 -5.4 430.8 4.7 420.7L216 209.4V-24H124C108.5 -24 96 -36.5 96 -52C96 -58.6 101.4 -64 108 -64H404C410.6 -64 416 -58.6 416 -52C416 -36.5 403.5 -24 388 -24H296V209.4L507.3 420.7z" />
+    <glyph glyph-name="glasses"
+      unicode="&#xF530;"
+      horiz-adv-x="576" d=" M574.1 167.63L528.75 349.3400000000001C522.84 373.04 507.16 393.39 485.75 405.15C464.31 416.88 438.78 419.26 415.56 411.48L400.31 406.4C391.92 403.61 387.39 394.54 390.19 386.1600000000001L395.25 370.98C398.04 362.6 407.1 358.0700000000001 415.48 360.86L428.6600000000001 365.25C439.5300000000001 368.87 451.66 368.82 461.8200000000001 363.52C472.1100000000001 358.15 479.39 348.9600000000001 482.1900000000001 337.7000000000001L520.6500000000001 183.88C498.4600000000001 190.69 470.8600000000001 196.34 439.4500000000001 196.34C404.6800000000001 196.34 365.4700000000001 189.32 324.6000000000002 169.6H251.4200000000002C210.5500000000001 189.34 171.3400000000002 196.35 136.5600000000001 196.35C105.1400000000001 196.35 77.5400000000001 190.7000000000001 55.3500000000001 183.8900000000001L93.8100000000001 337.7200000000001C96.6000000000001 348.9700000000001 103.9000000000001 358.1700000000001 114.1900000000001 363.5300000000001C124.3500000000001 368.8300000000001 136.4700000000001 368.8800000000001 147.3400000000001 365.2600000000001L160.5100000000001 360.8700000000001C168.8900000000001 358.0800000000001 177.9500000000001 362.6100000000001 180.7400000000001 370.9900000000001L185.8000000000001 386.1700000000001C188.6000000000001 394.5500000000001 184.0700000000001 403.6200000000001 175.6800000000001 406.4100000000001L160.4300000000001 411.4900000000001C137.2100000000001 419.2700000000001 111.6800000000001 416.9000000000001 90.2400000000001 405.1600000000001C68.8300000000001 393.3900000000001 53.1500000000001 373.0500000000001 47.2400000000001 349.3600000000001L1.9 167.63A64.218 64.218 0 0 1 0 152.14V81.89C0 18.99 51.58 -32 115.2 -32H152.32C212.6 -32 262.69 13.94 267.2 73.37L270.13 112H305.88L308.81 73.37C313.31 13.94 363.4 -32 423.68 -32H460.8C524.42 -32 576 18.99 576 81.88V152.13C576 157.36 575.36 162.56 574.1 167.63zM203.38 78.21C201.41 52.3 178.98 32 152.32 32H115.2C86.97 32 64 54.38 64 81.89V119.43C82.12 125.92 107.42 132.35 136.58 132.35C160.44 132.35 183.84 128.0200000000001 206.51 119.43L203.38 78.21zM512 81.88C512 54.37 489.03 32 460.8 32H423.68C397.01 32 374.58 52.3 372.62 78.21L369.49 119.43C392.1600000000001 128.0199999999999 415.57 132.35 439.44 132.35C468.56 132.35 493.87 125.91 511.99 119.42V81.8799999999999z" />
+    <glyph glyph-name="globe"
+      unicode="&#xF0AC;"
+      horiz-adv-x="496" d=" M336.5 288C322 377.3 287.8 440 248 440S174 377.3 159.5 288H336.5zM152 192C152 169.8 153.2 148.5 155.3 128H340.6C342.7000000000001 148.5 343.9000000000001 169.8 343.9000000000001 192S342.7000000000001 235.5 340.6 256H155.3C153.2 235.5 152 214.2 152 192zM476.7 288C448.1 355.9 390.2 408.4 318.7 429.6C343.1 395.8 359.9 344.9 368.7 288H476.7zM177.2 429.6C105.8 408.4 47.8 355.9 19.3 288H127.3C136 344.9 152.8 395.8 177.2 429.6zM487.4 256H372.7C374.8 235 376 213.5 376 192S374.8 149 372.7 128H487.3C492.8 148.5 495.9 169.8 495.9 192S492.8 235.5 487.4 256zM120 192C120 213.5 121.2 235 123.3 256H8.6C3.2 235.5 0 214.2 0 192S3.2 148.5 8.6 128H123.2C121.2 149 120 170.5 120 192zM159.5 96C174 6.7 208.2 -56 248 -56S322 6.7 336.5 96H159.5zM318.8 -45.6C390.2000000000001 -24.4 448.2000000000001 28.1 476.8 96H368.8C360 39.1 343.2 -11.8 318.8 -45.6zM19.3 96C47.9 28.1 105.8 -24.4 177.3 -45.6C152.9 -11.8 136.1 39.1 127.3 96H19.3z" />
+    <glyph glyph-name="golf-ball"
+      unicode="&#xF450;"
+      horiz-adv-x="416" d=" M96 32H320C320 14.3 305.7 0 288 0H272C254.3 0 240 -14.3 240 -32V-52C240 -58.6 234.6 -64 228 -64H188C181.4 -64 176 -58.6 176 -52V-32C176 -14.3 161.7 0 144 0H128C110.3 0 96 14.3 96 32zM416 240C416 165.8 377 100.8 318.5 64H97.5C39 100.8 0 165.8 0 240C0 354.9 93.1 448 208 448S416 354.9 416 240zM235.9 196.1C254.2 196.1 269 210.9 269 229.2C269 243.6 259.7 255.5 246.9 260.1C256.5 233.3 231.3 208.8 205 218.2C209.6 205.4 221.5 196.1 235.9 196.1zM285 149.2C285 163.6 275.7 175.5 262.9 180.1C272.5 153.3 247.3 128.8 221 138.2C225.6 125.4 237.5 116.1 251.9 116.1C270.2 116.1 285 131 285 149.2zM349 213.2C349 227.6 339.7 239.5 326.9 244.1C336.5 217.3 311.3 192.8 285 202.2C289.6 189.4 301.5 180.1 315.9 180.1C334.2 180.1 349 195 349 213.2z" />
+    <glyph glyph-name="graduation-cap"
+      unicode="&#xF19D;"
+      horiz-adv-x="640" d=" M622.884 248.995L347.067 163.895A96 96 0 0 0 292.933 163.895L92.398 225.768C83.834 214.33 81.38 202.718 80.48 187.433C89.778 181.835 96 171.645 96 160C96 148.048 89.443 137.634 79.735 132.139L95.932 9.043C96.562 4.257 92.832 0 88 0H40C35.172 0 31.438 4.253 32.068 9.044L48.265 132.14C38.557 137.634 32 148.048 32 160C32 172.034 38.646 182.511 48.465 187.976C49.412 205.927 52.439 221.207 60.617 235.573L17.115 248.995C-5.761 255.796 -5.651 288.236 17.115 295.005L292.932 380.105A96 96 0 0 0 347.0660000000001 380.105L622.883 295.005C645.76 288.204 645.6500000000001 255.764 622.884 248.995zM356.503 133.318L356.296 133.254L356.089 133.193A127.99799999999999 127.99799999999999 0 0 0 283.912 133.193L283.705 133.254L283.498 133.318L132.584 179.888L120 96C120 60.654 209.543 32 320 32S520 60.654 520 96L507.417 179.888L356.503 133.3180000000001z" />
+    <glyph glyph-name="greater-than-equal"
+      unicode="&#xF532;"
+      horiz-adv-x="448" d=" M55.22 340.31L230.78 272.2200000000001L55.34 204.17C36.95 198.14 27.46 179.78 34.14 163.17L46.23 133.09C52.91 116.48 73.22 107.9 91.61 113.9400000000001L393.02 233.8C406.79 238.32 416 250.4100000000001 416 263.9700000000001V279.9300000000001C416 293.49 406.79 305.5800000000001 393.02 310.1L91.3 430.08C73.01 436.08 52.79 427.55 46.15 411.02L34.12 381.1C27.48 364.57 36.93 346.31 55.22 340.31zM424 48H24C10.75 48 0 37.26 0 24V-24C0 -37.25 10.75 -48 24 -48H424C437.25 -48 448 -37.25 448 -24V24C448 37.26 437.25 48 424 48z" />
+    <glyph glyph-name="greater-than"
+      unicode="&#xF531;"
+      horiz-adv-x="384" d=" M365.52 238.15L59.22 380.99C43.16 388.48 24.07 381.53 16.58 365.4700000000001L3.01 336.39C-4.48 320.33 2.47 301.24 18.53 293.75L236.96 191.9L18.49 90.01C2.47 82.54 -4.46 63.5 3.01 47.48L16.53 18.48C24 2.46 43.04 -4.47 59.06 3L365.5300000000001 145.91A32.003 32.003 0 0 1 384.0100000000001 174.91V209.14C384.0000000000001 221.59 376.8000000000001 232.9 365.5200000000001 238.15z" />
+    <glyph glyph-name="h-square"
+      unicode="&#xF0FD;"
+      horiz-adv-x="448" d=" M448 368V16C448 -10.51 426.51 -32 400 -32H48C21.49 -32 0 -10.51 0 16V368C0 394.51 21.49 416 48 416H400C426.51 416 448 394.51 448 368zM336 320H304C295.163 320 288 312.837 288 304V224H160V304C160 312.837 152.837 320 144 320H112C103.163 320 96 312.837 96 304V80C96 71.163 103.163 64 112 64H144C152.837 64 160 71.163 160 80V160H288V80C288 71.163 295.163 64 304 64H336C344.837 64 352 71.163 352 80V304C352 312.837 344.837 320 336 320z" />
+    <glyph glyph-name="hand-holding-heart"
+      unicode="&#xF4BE;"
+      horiz-adv-x="576" d=" M275.3 197.5C282.3 190.1 293.7 190.1 300.8 197.5L409.7000000000001 311.7C441.3000000000001 344.9 439.5000000000001 399.9 404.1 430.5C373.3 457.2 327.4000000000001 452.4 299.2000000000001 422.8L288 411.1L276.9 422.7C248.7 452.4 202.8 457.2 172 430.5C136.7 399.9 134.8 344.9 166.4 311.7L275.3 197.5zM565.3 119.9C553.5 130.6 535.0999999999999 129.9 522.6999999999999 119.9L430.3 46C419 36.9 404.9000000000001 32 390.3 32H272C263.2 32 256 39.2 256 48S263.2 64 272 64H350.3C366.2 64 381 74.9 383.6 90.6C386.9000000000001 110.6 371.5 128 352 128H192C165 128 138.9 118.7 117.9 101.7L71.4 64H16C7.2 64 0 56.8 0 48V-48C0 -56.8 7.2 -64 16 -64H372.8C387.3 -64 401.4000000000001 -59.1 412.8 -50L564 71C579.2 83.1 580.4 106.3 565.3 119.9z" />
+    <glyph glyph-name="hand-holding-usd"
+      unicode="&#xF4C0;"
+      horiz-adv-x="544" d=" M257.6 303.7L307.6 289.4C311.2000000000001 288.4 313.7000000000001 285 313.7000000000001 281.3C313.7000000000001 276.7 309.9000000000001 272.9 305.3000000000001 272.9H272.5000000000001C268.9000000000001 272.9 265.4000000000001 273.7 262.2000000000001 275.1C257.4000000000001 277.3 251.8000000000001 276.8 248.1000000000001 273.1L230.6000000000001 255.6C225.3000000000001 250.3 225.9000000000001 241.3 232.1000000000001 237.2C241.6000000000001 230.9 252.4000000000001 227.1 263.9000000000001 225.7V208C263.9000000000001 199.2 271.1 192 279.9000000000001 192H295.9000000000001C304.7000000000001 192 311.9000000000001 199.2 311.9000000000001 208V225.6C342.2000000000001 229.2 365.2000000000001 256.6 361.2000000000001 288.6C358.3000000000001 311.6 340.5000000000001 329.9 318.3000000000001 336.3L268.3000000000001 350.6C264.7000000000001 351.6 262.2000000000001 355 262.2000000000001 358.7C262.2000000000001 363.3 266.0000000000001 367.1 270.6 367.1H303.4000000000001C307.0000000000001 367.1 310.5000000000001 366.3 313.7000000000001 364.9C318.5000000000001 362.7 324.1 363.2 327.8000000000001 366.9L345.3000000000001 384.4C350.6000000000001 389.7 350.0000000000001 398.7 343.8000000000001 402.8C334.3000000000001 409.1 323.5000000000001 412.9 312.0000000000001 414.3V432C312.0000000000001 440.8 304.8000000000001 448 296.0000000000001 448H280.0000000000001C271.2000000000001 448 264.0000000000001 440.8 264.0000000000001 432V414.4C233.7000000000001 410.8 210.7000000000001 383.4 214.7000000000001 351.4C217.6000000000001 328.4 235.4000000000001 310.1 257.6 303.7zM533.9000000000001 119.9C522.7 130.6 505.4000000000001 129.9 493.6000000000001 119.9L406.4 46C395.7 36.9 382.4 32 368.6 32H256.9C248.6 32 241.8 39.2 241.8 48S248.6 64 256.9 64H330.8C345.9 64 359.8 74.9 362.2 90.6C365.3 110.6 350.7 128 332.3999999999999 128H181.3C155.8 128 131.1 118.7 111.4 101.7L67.5 64H15.1C6.8 64 0 56.8 0 48V-48C0 -56.8 6.8 -64 15.1 -64H352C365.7 -64 379 -59.1 389.8 -50L532.6 71C547 83.1 548.1 106.3 533.9 119.9z" />
+    <glyph glyph-name="hand-holding"
+      unicode="&#xF4BD;"
+      horiz-adv-x="576" d=" M565.3 119.9C553.5 130.6 535.0999999999999 129.9 522.6999999999999 119.9L430.3 46C419 36.9 404.9000000000001 32 390.3 32H272C263.2 32 256 39.2 256 48S263.2 64 272 64H350.3C366.2 64 381 74.9 383.6 90.6C386.9000000000001 110.6 371.5 128 352 128H192C165 128 138.9 118.7 117.9 101.7L71.4 64H16C7.2 64 0 56.8 0 48V-48C0 -56.8 7.2 -64 16 -64H372.8C387.3 -64 401.4000000000001 -59.1 412.8 -50L564 71C579.2 83.1 580.4 106.3 565.3 119.9z" />
+    <glyph glyph-name="hand-lizard"
+      unicode="&#xF258;"
+      horiz-adv-x="576" d=" M384 -32H576V84.222A95.998 95.998 0 0 1 561.167 135.485L398.127 393.632A48 48 0 0 1 357.544 416H24C10.745 416 0 405.255 0 392V376C0 345.072 25.072 320 56 320H285.981C298.825 320 307.537 306.933 302.596 295.077L281.186 243.692A32 32 0 0 0 251.648 224H128C92.654 224 64 195.346 64 160V152C64 138.745 74.745 128 88 128H235.406A47.995 47.995 0 0 0 261.098 120.545L372.846 49.734A24.001000000000005 24.001000000000005 0 0 0 384 29.461V-32z" />
+    <glyph glyph-name="hand-paper"
+      unicode="&#xF256;"
+      horiz-adv-x="448" d=" M408.781 319.993C386.356 320.4220000000001 368 301.64 368 279.2100000000001V192H360V368.21C360 390.64 341.644 409.4220000000001 319.219 408.993C297.488 408.577 280 390.831 280 369V192H272V407.21C272 429.64 253.644 448.4220000000001 231.219 447.993C209.488 447.577 192 429.831 192 408V192H184V367.21C184 389.64 165.644 408.4220000000001 143.219 407.993C121.488 407.577 104 389.831 104 368V132.0080000000001L72.352 175.5270000000001C59.359 193.393 34.343 197.3440000000001 16.475 184.35C-1.39 171.356 -5.34 146.34 7.653 128.473L133.254 -44.232A48 48 0 0 1 172.073 -64H369.663C391.937 -64 411.2850000000001 -48.676 416.387 -26.994L442.895 85.6659999999999A192.011 192.011 0 0 1 447.999 129.641V280C448 301.831 430.512 319.577 408.781 319.993z" />
+    <glyph glyph-name="hand-peace"
+      unicode="&#xF25B;"
+      horiz-adv-x="448" d=" M408 232C385.908 232 368 214.091 368 192H360V224C360 246.091 342.092 264 320 264S280 246.091 280 224V192H272V400C272 426.51 250.51 448 224 448S176 426.51 176 400V192H162.428L92.688 369.551C82.994 394.226 55.134 406.37 30.461 396.676C5.787 386.983 -6.356 359.123 3.337 334.449L78.102 144.107L47.012 119.235C31.631 106.929 27.497 85.257 37.271 68.1539999999999L101.271 -43.8460000000001A39.998 39.998 0 0 1 136 -64H376C394.562 -64 410.686 -51.23 414.937 -33.162L446.937 102.838A39.97 39.97 0 0 1 448 112V192C448 214.091 430.092 232 408 232z" />
+    <glyph glyph-name="hand-point-down"
+      unicode="&#xF0A7;"
+      horiz-adv-x="384" d=" M91.826 -19.2V130.034C83.578 124.193 75.268 119.464 66.908 115.881C35.098 102.248 -0.014 125.778 0 160C0.008 178.616 10.897 192.203 29.092 200C57.378 212.122 93.421 278.648 106.415 307.534C114.371 325.391 131.894 335.987 150.26 335.998L150.261 336H321.7870000000001C333.5990000000001 336 343.6840000000001 327.404 345.49 315.731C352.74 268.894 383.973 253.971 383.805 192C383.798 189.276 384 178.746 384 176C384 125.346 361.878 94.426 312.737 103.4C303.44 84.803 273.251 72.662 250.422 86.95C229.245 62.305 196.526 64.311 179.478 80.651V-19.2C179.478 -43.35 159.277 -64 135.652 -64C112.369 -64 91.826 -42.65 91.826 -19.2zM112 376V424C112 437.255 122.745 448 136 448H328C341.255 448 352 437.255 352 424V376C352 362.745 341.255 352 328 352H136C122.745 352 112 362.745 112 376zM324 400C324 411.046 315.046 420 304 420S284 411.046 284 400S292.954 380 304 380S324 388.954 324 400z" />
+    <glyph glyph-name="hand-point-left"
+      unicode="&#xF0A5;"
+      horiz-adv-x="512" d=" M44.8 292.174H194.034C188.193 300.4220000000001 183.464 308.732 179.881 317.092C166.248 348.902 189.778 384.014 224 384C242.616 383.992 256.203 373.103 264 354.908C276.122 326.622 342.648 290.579 371.534 277.5850000000001C389.391 269.629 399.987 252.106 399.998 233.74L400 233.739V62.213C400 50.401 391.404 40.316 379.731 38.51C332.894 31.26 317.971 0.027 256 0.195C253.276 0.202 242.746 0 240 0C189.346 0 158.426 22.122 167.4 71.263C148.803 80.5600000000001 136.662 110.749 150.95 133.578C126.305 154.7550000000001 128.311 187.4740000000001 144.651 204.5220000000001H44.8C20.65 204.5220000000001 0 224.7230000000001 0 248.3480000000001C0 271.6310000000001 21.35 292.1740000000001 44.8 292.1740000000001zM440 272H488C501.255 272 512 261.255 512 248V56C512 42.745 501.255 32 488 32H440C426.745 32 416 42.745 416 56V248C416 261.255 426.745 272 440 272zM464 60C475.046 60 484 68.954 484 80S475.046 100 464 100S444 91.046 444 80S452.954 60 464 60z" />
+    <glyph glyph-name="hand-point-right"
+      unicode="&#xF0A4;"
+      horiz-adv-x="512" d=" M512 248.348C512 224.723 491.35 204.522 467.2 204.522H367.349C383.689 187.4740000000001 385.695 154.756 361.05 133.578C375.338 110.749 363.197 80.561 344.6 71.263C353.574 22.122 322.654 0 272 0C269.254 0 258.724 0.203 256 0.195C194.029 0.027 179.106 31.26 132.269 38.51C120.596 40.317 112 50.401 112 62.214V233.739L112.002 233.74C112.013 252.106 122.609 269.629 140.466 277.5850000000001C169.352 290.579 235.879 326.623 248 354.908C255.797 373.102 269.384 383.992 288 384C322.222 384.014 345.752 348.902 332.1190000000001 317.092C328.536 308.733 323.807 300.422 317.966 292.174H467.2C490.65 292.174 512 271.631 512 248.348zM96 248V56C96 42.745 85.255 32 72 32H24C10.745 32 0 42.745 0 56V248C0 261.255 10.745 272 24 272H72C85.255 272 96 261.255 96 248zM68 80C68 91.046 59.046 100 48 100S28 91.046 28 80S36.954 60 48 60S68 68.954 68 80z" />
+    <glyph glyph-name="hand-point-up"
+      unicode="&#xF0A6;"
+      horiz-adv-x="384" d=" M135.652 448C159.277 448 179.478 427.35 179.478 403.2V303.349C196.526 319.689 229.244 321.695 250.422 297.05C273.251 311.338 303.439 299.197 312.737 280.6C361.878 289.574 384 258.654 384 208C384 205.254 383.7970000000001 194.724 383.805 192C383.973 130.029 352.74 115.106 345.49 68.269C343.683 56.596 333.599 48 321.786 48H150.261L150.26 48.002C131.894 48.013 114.371 58.609 106.415 76.466C93.421 105.352 57.377 171.878 29.092 184C10.897 191.797 0.008 205.384 0 224C-0.014 258.222 35.098 281.752 66.908 268.1190000000001C75.267 264.536 83.578 259.807 91.826 253.966V403.2C91.826 426.65 112.369 448 135.652 448zM136 32H328C341.255 32 352 21.255 352 8V-40C352 -53.255 341.255 -64 328 -64H136C122.745 -64 112 -53.255 112 -40V8C112 21.255 122.745 32 136 32zM304 4C292.954 4 284 -4.954 284 -16S292.954 -36 304 -36S324 -27.046 324 -16S315.046 4 304 4z" />
+    <glyph glyph-name="hand-pointer"
+      unicode="&#xF25A;"
+      horiz-adv-x="448" d=" M448 208V112C448 108.916 447.644 105.841 446.937 102.838L414.937 -33.162C410.686 -51.23 394.562 -64 376 -64H168A40.004 40.004 0 0 0 135.65 -47.527L7.653 128.473C-5.34 146.339 -1.39 171.356 16.475 184.349C34.342 197.343 59.359 193.392 72.352 175.526L104 132.008V408C104 430.091 121.908 448 144 448S184 430.091 184 408V208H192V248C192 270.091 209.908 288 232 288S272 270.091 272 248V208H280V232C280 254.091 297.908 272 320 272S360 254.091 360 232V208H368C368 230.091 385.908 248 408 248S448 230.091 448 208zM192 128H184V32H192V128zM280 128H272V32H280V128zM368 128H360V32H368V128z" />
+    <glyph glyph-name="hand-rock"
+      unicode="&#xF255;"
+      horiz-adv-x="512" d=" M512 319.2100000000001C512 345.5320000000001 491.139 367.554 464.82 367.993C437.935 368.442 416 346.783 416 320H408V351.21C408 377.532 387.139 399.554 360.82 399.993C333.935 400.442 312 378.783 312 352V320H304V367.21C304 393.532 283.139 415.554 256.82 415.993C229.935 416.442 208 394.783 208 368V320H200V351.21C200 377.532 179.139 399.554 152.82 399.993C125.935 400.442 104 378.783 104 352V216L96 223.111V271.2100000000001C96 297.5320000000001 75.139 319.554 48.82 319.993C21.935 320.442 0 298.783 0 272V205.555A95.998 95.998 0 0 1 32.221 133.804L143.889 34.543A47.999 47.999 0 0 0 160 -1.333V-8C160 -21.255 170.745 -32 184 -32H424C437.255 -32 448 -21.255 448 -8V-5.079A96.01 96.01 0 0 0 455.523 32.175L504.477 148.44A96.002 96.002 0 0 1 512 185.694V319.2100000000001z" />
+    <glyph glyph-name="hand-scissors"
+      unicode="&#xF257;"
+      horiz-adv-x="512" d=" M216 8C216 30.092 233.909 48 256 48V56H224C201.909 56 184 73.908 184 96S201.909 136 224 136H256V144H48C21.49 144 0 165.49 0 192S21.49 240 48 240H256V253.572L78.449 323.312C53.775 333.006 41.631 360.867 51.324 385.54C61.017 410.214 88.878 422.357 113.552 412.664L303.894 337.899L328.766 368.9890000000001C341.072 384.37 362.7440000000001 388.504 379.8470000000001 378.73L491.847 314.73A40.002 40.002 0 0 0 512 280V40C512 21.438 499.23 5.314 481.162 1.063L345.162 -30.937A39.982 39.982 0 0 0 336 -32H256C233.909 -32 216 -14.092 216 8z" />
+    <glyph glyph-name="hand-spock"
+      unicode="&#xF259;"
+      horiz-adv-x="512" d=" M10.872 131.415C26.011 147.501 51.326 148.269 67.415 133.1280000000001L128 76.107V155.5120000000001L88.995 327.135C84.099 348.677 97.593 370.1090000000001 119.135 375.005C140.684 379.899 162.11 366.406 167.005 344.8640000000001L201.747 192H211.58L164.016 399.034C159.07 420.565 172.514 442.028 194.044 446.974C215.576 451.924 237.038 438.476 241.984 416.9460000000001L293.664 192H308.769L357.194 385.702C362.5510000000001 407.134 384.269 420.164 405.701 414.806C427.1330000000001 409.448 440.1640000000001 387.731 434.805 366.299L391.231 192H402.311L433.079 321.265C438.196 342.756 459.764 356.033 481.256 350.912C502.747 345.795 516.021 324.226 510.903 302.735L474.611 150.268A96.02400000000002 96.02400000000002 0 0 1 472 128.033V85.931A96.002 96.002 0 0 0 468.04 58.6440000000001L441.8660000000001 -29.6429999999999C435.825 -50.022 417.101 -64 395.846 -64H179.172A48.00200000000001 48.00200000000001 0 0 0 146.274 -50.954L12.585 74.872C-3.502 90.013 -4.268 115.328 10.872 131.415z" />
+    <glyph glyph-name="hands-helping"
+      unicode="&#xF4C4;"
+      horiz-adv-x="640" d=" M488 256H336V200C336 160.3 303.7 128 264 128S192 160.3 192 200V321.6L127.1 282.6C107.8 271.1 96 250.2 96 227.8V180.5L16 134.3C0.7 125.5 -4.6 105.9 4.3 90.6L84.3 -48C93.1 -63.3 112.7 -68.5 128 -59.7L231.4 0H368C403.3 0 432 28.7 432 64H448C465.7 64 480 78.3 480 96V160H488C501.3 160 512 170.7 512 184V232C512 245.3 501.3 256 488 256zM635.7 293.4L555.7 432C546.9 447.3 527.3 452.5 512 443.7L408.6 384H306.4C294.4 384 282.7 380.6 272.5 374.3L239 353.4C229.6 347.6 224 337.3 224 326.3V200C224 177.9 241.9 160 264 160S304 177.9 304 200V288H488C518.9 288 544 262.9 544 232V203.5L624 249.7C639.3 258.6 644.5 278.1 635.7 293.4z" />
+    <glyph glyph-name="hands"
+      unicode="&#xF4C2;"
+      horiz-adv-x="640" d=" M204.8 217.6C194.2 231.7 174.1 234.6 160 224C145.9 213.4 143 193.3 153.6 179.2L191.7 128.4C196.5 122 195.8 113.1 190.2 107.5L177.4 94.7C170.7 88 159.8 88.5 153.8 95.8L64 203.6V352C64 369.7 49.7 384 32 384S0 369.7 0 352V133.6C0 122.7000000000001 3.7 112.1 10.5 103.6L114.6 -30.7C119.6 -37.2 123 -44.6 125 -52.4C126.8 -59.2999999999999 133.1 -64 140.3 -64H272C280.8 -64 288 -56.8 288 -48V64C288 91.7 279 118.6 262.4 140.8L204.8 217.6zM608 384C590.3 384 576 369.7 576 352V203.6L486.2 95.8C480.2 88.6 469.2 88.1 462.6 94.7L449.8 107.5C444.2 113.1 443.5 122 448.3 128.4L486.4 179.2C497 193.3 494.1 213.4 480 224C465.9 234.6 445.8 231.7 435.2 217.6L377.6 140.8C361 118.6 352 91.7 352 64V-48C352 -56.8 359.2 -64 368 -64H499.7C506.8 -64 513.2 -59.3 515 -52.4C517 -44.6 520.4 -37.2 525.4 -30.7L629.5 103.6C636.3 112.1 640 122.7000000000001 640 133.6V352C640 369.7 625.7 384 608 384z" />
+    <glyph glyph-name="handshake"
+      unicode="&#xF2B5;"
+      horiz-adv-x="640" d=" M434.7 384H348.8C340.8 384 333.1 381 327.2 375.6L228.8999999999999 285.6C228.8 285.5 228.7 285.3 228.5999999999999 285.2C211.9999999999999 269.6 212.2999999999999 244.7 226.4999999999999 229.2C239.1999999999999 215.3 265.8999999999999 211.6 282.5999999999999 226.5C282.7 226.6 282.8999999999999 226.6 282.9999999999999 226.7L362.8999999999999 299.9C369.3999999999999 305.8 379.5999999999999 305.4 385.4999999999999 298.9C391.4999999999999 292.4 390.9999999999999 282.3 384.4999999999999 276.3L358.3999999999999 252.4L504 134.2C506.9 131.8 509.5 129.2 511.9 126.5V320L457.3 374.6C451.4 380.6 443.2 384 434.7 384zM544 319.8V95.9C544 78.2 558.3 63.9 576 63.9H640V319.8H544zM592 95.9C583.2 95.9 576 103.1 576 111.9S583.2 127.9 592 127.9S608 120.7 608 111.9S600.8 95.9 592 95.9zM0 64H64C81.7 64 96 78.3 96 96V319.8H0V64zM48 127.9C56.8 127.9 64 120.7 64 111.9S56.8 95.9 48 95.9S32 103.1 32 111.9C32 120.8 39.2 127.9 48 127.9zM483.9 109.3L334.6 230.5L304.6 203C274.9000000000001 175.9 229.4000000000001 178.5 202.9 207.4C176 236.8 178.1 282.3 207.3000000000001 309.1L289.1 384H205.3C196.8 384 188.7 380.6 182.7 374.6L128 320V96.1H146.3L236.8 14.2C264.2 -8.1 304.5 -3.9 326.8 23.5000000000001L327 23.7L344.9 8.2C360.8 -4.8 384.3 -2.3 397.2 13.6L428.6 52.2L434 47.8000000000001C447.7 36.7 467.8999999999999 38.7 478.9999999999999 52.5000000000001L488.4999999999999 64.2000000000001C499.6999999999999 78.0000000000001 497.6 98.1 483.8999999999999 109.3000000000001z" />
+    <glyph glyph-name="hashtag"
+      unicode="&#xF292;"
+      horiz-adv-x="448" d=" M440.667 265.891L447.81 305.891C449.123 313.246 443.468 320 435.997 320H361.187L375.81 401.891C377.123 409.246 371.468 416 363.997 416H323.365A12 12 0 0 1 311.552 406.109L296.175 320H197.54L212.163 401.891C213.477 409.246 207.822 416 200.35 416H159.718A12 12 0 0 1 147.905 406.109L132.528 320H53.432A12 12 0 0 1 41.619 310.1090000000001L34.476 270.1090000000001C33.163 262.754 38.818 256 46.289 256H121.099L98.242 128H19.146A12 12 0 0 1 7.333 118.109L0.19 78.109C-1.123 70.754 4.532 64 12.003 64H86.813L72.19 -17.891C70.877 -25.246 76.532 -32 84.003 -32H124.635A12 12 0 0 1 136.448 -22.109L151.826 64H250.46L235.837 -17.891C234.523 -25.246 240.178 -32 247.65 -32H288.282A12 12 0 0 1 300.095 -22.109L315.472 64H394.568A12 12 0 0 1 406.381 73.891L413.524 113.891C414.837 121.2460000000001 409.182 128 401.711 128H326.901L349.7579999999999 256H428.854A12 12 0 0 1 440.6669999999999 265.891zM261.889 128H163.255L186.112 256H284.746L261.889 128z" />
+    <glyph glyph-name="hdd"
+      unicode="&#xF0A0;"
+      horiz-adv-x="576" d=" M576 144V48C576 21.49 554.51 0 528 0H48C21.49 0 0 21.49 0 48V144C0 170.51 21.49 192 48 192H528C554.51 192 576 170.51 576 144zM528 224A79.557 79.557 0 0 0 558.777 217.835L462.25 362.626A48.003 48.003 0 0 1 422.311 384H153.689A48 48 0 0 1 113.751 362.626L17.223 217.835A79.557 79.557 0 0 0 48 224H528zM480 128C462.327 128 448 113.673 448 96S462.327 64 480 64S512 78.327 512 96S497.673 128 480 128zM384 128C366.327 128 352 113.673 352 96S366.327 64 384 64S416 78.327 416 96S401.673 128 384 128z" />
+    <glyph glyph-name="heading"
+      unicode="&#xF1DC;"
+      horiz-adv-x="512" d=" M496 368V400C496 408.837 488.837 416 480 416H320C311.163 416 304 408.837 304 400V368C304 359.163 311.163 352 320 352H357.621V224H154.379V352H192C200.837 352 208 359.163 208 368V400C208 408.837 200.837 416 192 416H32C23.163 416 16 408.837 16 400V368C16 359.163 23.163 352 32 352H69.275V32H32C23.163 32 16 24.837 16 16V-16C16 -24.837 23.163 -32 32 -32H192C200.837 -32 208 -24.837 208 -16V16C208 24.837 200.837 32 192 32H154.379V160H357.62V32H320C311.163 32 304 24.837 304 16V-16C304 -24.837 311.163 -32 320 -32H480C488.837 -32 496 -24.837 496 -16V16C496 24.837 488.837 32 480 32H442.725V352H480C488.837 352 496 359.163 496 368z" />
+    <glyph glyph-name="headphones"
+      unicode="&#xF025;"
+      horiz-adv-x="512" d=" M256 416C114.52 416 0 301.504 0 160V112A32 32 0 0 1 17.689 83.378L32.072 76.187C34.083 16.097 83.421 -32 144 -32H168C181.255 -32 192 -21.255 192 -8V168C192 181.255 181.255 192 168 192H144C112.658 192 84.329 179.121 64 158.373V160C64 265.8690000000001 150.131 352 256 352S448 265.8690000000001 448 160V158.373C427.671 179.121 399.342 192 368 192H344C330.745 192 320 181.255 320 168V-8C320 -21.255 330.745 -32 344 -32H368C428.579 -32 477.917 16.098 479.928 76.187L494.31 83.378A32 32 0 0 1 512 112V160C512 301.4790000000001 397.504 416 256 416z" />
+    <glyph glyph-name="heart"
+      unicode="&#xF004;"
+      horiz-adv-x="512" d=" M462.3 385.4C407.5 432.1 326 423.7 275.7 371.8L256 351.5L236.3 371.8C186.1 423.7 104.5 432.1 49.7 385.4C-13.1 331.8 -16.4 235.6 39.8 177.5L233.3 -22.3C245.8 -35.2 266.1 -35.2 278.6 -22.3L472.1 177.5C528.4 235.6 525.1 331.8 462.3 385.4z" />
+    <glyph glyph-name="heartbeat"
+      unicode="&#xF21E;"
+      horiz-adv-x="512" d=" M320.2 204.2L270.5 104.8C264.5 92.6999999999999 247.1 93.1 241.6 105.4L184.7 231.7L154.7 160H60.6L243.1 -26.5C250.2 -33.8 261.7 -33.8 268.8 -26.5L451.4 160H342.3L320.2 204.2zM473.7 374.1L471.3 376.6C419.8 429.2 335.5 429.2 283.9 376.6L256 348L228.1 376.5C176.6 429.2 92.2 429.2 40.7 376.5L38.3 374.1C-10.4 324.3 -12.5 245 31 192H133.4L169.3 278.2C174.7 291.1 192.9 291.4 198.7 278.6L256.9000000000001 149.3L305.9000000000001 247.2C311.8 259 328.6 259 334.5000000000001 247.2L362.1000000000001 192H481C524.5 245 522.4 324.3 473.7 374.0999999999999z" />
+    <glyph glyph-name="helicopter"
+      unicode="&#xF533;"
+      horiz-adv-x="640" d=" M304 64H576C593.67 64 608 78.33 608 96C608 219.71 507.71 320 384 320V384H560C568.84 384 576 391.16 576 400V432C576 440.84 568.84 448 560 448H144C135.16 448 128 440.84 128 432V400C128 391.16 135.16 384 144 384H320V320H112L68.8 377.6C65.78 381.63 61.03 384 56 384H16.01C5.6 384 -2.04 374.2200000000001 0.49 364.12L32 256L192 192L278.4 76.8A31.991999999999997 31.991999999999997 0 0 1 304 64zM416 252.49C478.55 239.7 528.03 190.56 540.79 128H416V252.49zM635.37 -10.81L613.22 11.39C606.97 17.65 596.98 17.49 590.58 11.38C583.49 4.61 576.74 0.13 565.94 0.13H240C231.16 0.13 224 -7.05 224 -15.9V-47.96C224 -56.81 231.16 -63.99 240 -63.99H565.94C580.82 -63.99 601.24 -63.52 634.3900000000001 -34.47C641.4100000000001 -28.33 641.9600000000002 -17.42 635.3700000000001 -10.81z" />
+    <glyph glyph-name="history"
+      unicode="&#xF1DA;"
+      horiz-adv-x="512" d=" M504 192.469C504.253 55.829 392.82 -55.903 256.18 -55.999C197.165 -56.041 142.957 -35.469 100.358 -1.088C89.281 7.852 88.453 24.453 98.519 34.519L109.786 45.786C118.395 54.395 132.139 55.337 141.677 47.77C173.062 22.865 212.781 8 256 8C357.705 8 440 90.311 440 192C440 293.705 357.689 376 256 376C207.186 376 162.851 357.031 129.932 326.068L180.686 275.314C190.766 265.234 183.627 248 169.373 248H24C15.163 248 8 255.163 8 264V409.373C8 423.627 25.234 430.766 35.314 420.687L84.686 371.315C129.209 413.864 189.552 440 256 440C392.81 440 503.747 329.2200000000001 504 192.469zM323.088 113.685L332.911 126.315C341.0489999999999 136.778 339.164 151.857 328.701 159.994L288 191.651V296C288 309.255 277.255 320 264 320H248C234.745 320 224 309.255 224 296V160.349L289.409 109.475C299.872 101.338 314.95 103.222 323.088 113.685z" />
+    <glyph glyph-name="hockey-puck"
+      unicode="&#xF453;"
+      horiz-adv-x="512" d=" M0 288C0 341 114.6 384 256 384S512 341 512 288S397.4 192 256 192S0 235 0 288zM0 205.8V96C0 43 114.6 0 256 0S512 43 512 96V205.8C398.6 123.5 113.5 123.4 0 205.8z" />
+    <glyph glyph-name="home"
+      unicode="&#xF015;"
+      horiz-adv-x="576" d=" M488 135.3V-8C488 -21.3 477.3 -32 464 -32H348C341.4 -32 336 -26.6 336 -20V92C336 98.6 330.6 104 324 104H252C245.4 104 240 98.6 240 92V-20C240 -26.6 234.6 -32 228 -32H112C98.7 -32 88 -21.3 88 -8V135.3C88 138.9 89.6 142.3 92.4 144.6L280.4 299.4000000000001C284.8 303 291.2 303 295.7 299.4000000000001L483.7 144.6C486.4 142.3 488 138.9 488 135.3zM571.6 196.2L488 265.1V403.6C488 410.2 482.6 415.6 476 415.6H420C413.4 415.6 408 410.2 408 403.6V331L318.5 404.7C300.8 419.3 275.2 419.3 257.5 404.7L4.4 196.2C-0.7 192 -1.4 184.4 2.8 179.3L28.3 148.3C32.5 143.2 40.1 142.5 45.2 146.7L280.4 340.4C284.8 344 291.2 344 295.7 340.4L530.9 146.7C536 142.5 543.6 143.2 547.8 148.3L573.3 179.3C577.5 184.5 576.6999999999999 192 571.5999999999999 196.2z" />
+    <glyph glyph-name="hospital-alt"
+      unicode="&#xF47D;"
+      horiz-adv-x="576" d=" M544 352H416V416C416 433.7 401.7 448 384 448H192C174.3 448 160 433.7 160 416V352H32C14.3 352 0 337.7 0 320V-48C0 -56.8 7.2 -64 16 -64H560C568.8 -64 576 -56.8 576 -48V320C576 337.7 561.7 352 544 352zM160 12C160 5.4 154.6 0 148 0H108C101.4 0 96 5.4 96 12V52C96 58.6 101.4 64 108 64H148C154.6 64 160 58.6 160 52V12zM160 140C160 133.4 154.6 128 148 128H108C101.4 128 96 133.4 96 140V180C96 186.6 101.4 192 108 192H148C154.6 192 160 186.6 160 180V140zM320 12C320 5.4 314.6 0 308 0H268C261.4 0 256 5.4 256 12V52C256 58.6 261.4 64 268 64H308C314.6 64 320 58.6 320 52V12zM320 140C320 133.4 314.6 128 308 128H268C261.4 128 256 133.4 256 140V180C256 186.6 261.4 192 268 192H308C314.6 192 320 186.6 320 180V140zM336 310C336 306.7 333.3 304 330 304H304V278C304 274.7 301.3 272 298 272H278C274.7 272 272 274.7 272 278V304H246C242.7 304 240 306.7 240 310V330C240 333.3 242.7 336 246 336H272V362C272 365.3 274.7 368 278 368H298C301.3 368 304 365.3 304 362V336H330C333.3 336 336 333.3 336 330V310zM480 12C480 5.4 474.6 0 468 0H428C421.4 0 416 5.4 416 12V52C416 58.6 421.4 64 428 64H468C474.6 64 480 58.6 480 52V12zM480 140C480 133.4 474.6 128 468 128H428C421.4 128 416 133.4 416 140V180C416 186.6 421.4 192 428 192H468C474.6 192 480 186.6 480 180V140z" />
+    <glyph glyph-name="hospital-symbol"
+      unicode="&#xF47E;"
+      horiz-adv-x="512" d=" M256 448C114.6 448 0 333.4 0 192S114.6 -64 256 -64S512 50.6 512 192S397.4 448 256 448zM368 72C368 67.6 364.4 64 360 64H312C307.6 64 304 67.6 304 72V160H208V72C208 67.6 204.4 64 200 64H152C147.6 64 144 67.6 144 72V312C144 316.4 147.6 320 152 320H200C204.4 320 208 316.4 208 312V224H304V312C304 316.4 307.6 320 312 320H360C364.4 320 368 316.4 368 312V72z" />
+    <glyph glyph-name="hospital"
+      unicode="&#xF0F8;"
+      horiz-adv-x="448" d=" M448 -44V-64H0V-44C0 -37.373 5.373 -32 12 -32H32V328C32 341.255 42.745 352 56 352H144V424C144 437.255 154.745 448 168 448H280C293.255 448 304 437.255 304 424V352H392C405.255 352 416 341.255 416 328V-32H436C442.627 -32 448 -37.373 448 -44zM308 256H268C261.373 256 256 250.627 256 244V204C256 197.373 261.373 192 268 192H308C314.627 192 320 197.373 320 204V244C320 250.627 314.627 256 308 256zM140 192H180C186.627 192 192 197.373 192 204V244C192 250.627 186.627 256 180 256H140C133.373 256 128 250.627 128 244V204C128 197.373 133.373 192 140 192zM244 64H204C197.373 64 192 58.627 192 52V-32H256V52C256 58.627 250.627 64 244 64zM308 160H268C261.373 160 256 154.627 256 148V108C256 101.373 261.373 96 268 96H308C314.627 96 320 101.373 320 108V148C320 154.627 314.627 160 308 160zM192 148C192 154.627 186.627 160 180 160H140C133.373 160 128 154.627 128 148V108C128 101.373 133.373 96 140 96H180C186.627 96 192 101.373 192 108V148zM182 352H208V326A6 6 0 0 1 214 320H234A6 6 0 0 1 240 326V352H266A6 6 0 0 1 272 358V378A6 6 0 0 1 266 384H240V410A6 6 0 0 1 234 416H214A6 6 0 0 1 208 410V384H182A6 6 0 0 1 176 378V358A6 6 0 0 1 182 352z" />
+    <glyph glyph-name="hourglass-end"
+      unicode="&#xF253;"
+      horiz-adv-x="384" d=" M360 384C373.255 384 384 394.745 384 408V424C384 437.255 373.255 448 360 448H24C10.745 448 0 437.255 0 424V408C0 394.745 10.745 384 24 384C24 293.035 75.016 216.266 144.842 192C75.016 167.734 24 90.965 24 0C10.745 0 0 -10.745 0 -24V-40C0 -53.255 10.745 -64 24 -64H360C373.255 -64 384 -53.255 384 -40V-24C384 -10.745 373.255 0 360 0C360 90.965 308.984 167.734 239.158 192C308.984 216.266 360 293.035 360 384zM192 240C134.213 240 88 306.5180000000001 88 384H296C296 306.055 249.49 240 192 240z" />
+    <glyph glyph-name="hourglass-half"
+      unicode="&#xF252;"
+      horiz-adv-x="384" d=" M360 448H24C10.745 448 0 437.255 0 424V408C0 394.745 10.745 384 24 384C24 293.035 75.016 216.266 144.842 192C75.016 167.734 24 90.965 24 0C10.745 0 0 -10.745 0 -24V-40C0 -53.255 10.745 -64 24 -64H360C373.255 -64 384 -53.255 384 -40V-24C384 -10.745 373.255 0 360 0C360 90.965 308.984 167.734 239.158 192C308.984 216.266 360 293.035 360 384C373.255 384 384 394.745 384 408V424C384 437.255 373.255 448 360 448zM284.9220000000001 64H99.08C116.139 110.797 151.176 144 192 144C232.821 144 267.862 110.804 284.9220000000001 64zM284.9410000000001 320H99.078C91.988 339.452 88 361.252 88 384H296C296 361.195 292.013 339.413 284.941 320z" />
+    <glyph glyph-name="hourglass-start"
+      unicode="&#xF251;"
+      horiz-adv-x="384" d=" M360 448H24C10.745 448 0 437.255 0 424V408C0 394.745 10.745 384 24 384C24 293.035 75.016 216.266 144.842 192C75.016 167.734 24 90.965 24 0C10.745 0 0 -10.745 0 -24V-40C0 -53.255 10.745 -64 24 -64H360C373.255 -64 384 -53.255 384 -40V-24C384 -10.745 373.255 0 360 0C360 90.965 308.984 167.734 239.158 192C308.984 216.266 360 293.035 360 384C373.255 384 384 394.745 384 408V424C384 437.255 373.255 448 360 448zM296 0H88C88 77.458 134.204 144 192 144C249.786 144 296 77.483 296 0z" />
+    <glyph glyph-name="hourglass"
+      unicode="&#xF254;"
+      horiz-adv-x="384" d=" M360 384C373.255 384 384 394.745 384 408V424C384 437.255 373.255 448 360 448H24C10.745 448 0 437.255 0 424V408C0 394.745 10.745 384 24 384C24 293.035 75.016 216.266 144.842 192C75.016 167.734 24 90.965 24 0C10.745 0 0 -10.745 0 -24V-40C0 -53.255 10.745 -64 24 -64H360C373.255 -64 384 -53.255 384 -40V-24C384 -10.745 373.255 0 360 0C360 90.965 308.984 167.734 239.158 192C308.984 216.266 360 293.035 360 384z" />
+    <glyph glyph-name="i-cursor"
+      unicode="&#xF246;"
+      horiz-adv-x="256" d=" M256 395.952V435.935C256 442.504 250.726 447.852 244.158 447.9340000000001C211.621 448.344 166.469 447.989 128 410.041C90.266 447.264 46.979 448.114 11.913 447.886C5.318 447.843 0 442.481 0 435.886V396.241C0 389.554 5.458 384.163 12.145 384.243C38.111 384.553 96 380.757 96 335.818V224H60C53.373 224 48 218.627 48 212V172C48 165.373 53.373 160 60 160H96V48C96 3.068 39.925 -0.031 12.05 0.041C5.404 0.058 0 -5.306 0 -11.952V-51.935C0 -58.504 5.274 -63.852 11.842 -63.934C44.379 -64.3430000000001 89.531 -63.988 128 -26.04C165.734 -63.263 209.021 -64.1130000000001 244.087 -63.885C250.682 -63.842 256 -58.48 256 -51.885V-12.24C256 -5.553 250.542 -0.162 243.855 -0.242C217.889 -0.553 160 3.061 160 48V160H196C202.627 160 208 165.373 208 172V212C208 218.627 202.627 224 196 224H160V335.818C160 380.75 216.075 384.031 243.95 383.9600000000001C250.596 383.942 256 389.3060000000001 256 395.952z" />
+    <glyph glyph-name="id-badge"
+      unicode="&#xF2C1;"
+      horiz-adv-x="384" d=" M336 448H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V400C384 426.5 362.5 448 336 448zM144 416H240C248.8 416 256 408.8 256 400S248.8 384 240 384H144C135.2 384 128 391.2 128 400S135.2 416 144 416zM192 288C227.3 288 256 259.3 256 224S227.3 160 192 160S128 188.7 128 224S156.7 288 192 288zM304 51.2C304 40.6 294 32 281.6 32H102.4C90 32 80 40.6 80 51.2V70.4C80 102.2 110.1 128 147.2 128H152.2C164.5 122.9 177.9 120 192 120S219.6 122.9 231.8 128H236.8C273.9000000000001 128 304 102.2 304 70.4V51.2z" />
+    <glyph glyph-name="id-card-alt"
+      unicode="&#xF47F;"
+      horiz-adv-x="576" d=" M528 384H384V288H192V384H48C21.5 384 0 362.5 0 336V-16C0 -42.5 21.5 -64 48 -64H528C554.5 -64 576 -42.5 576 -16V336C576 362.5 554.5 384 528 384zM288 224C323.3 224 352 195.3 352 160S323.3 96 288 96S224 124.7 224 160S252.7 224 288 224zM381.3 0H194.7C184.3 0 175.9 10 179.1 19.8C187.4 45.4 211.5 64 240 64H248.2C260.5 58.9 273.9 56 288 56S315.6 58.9 327.8 64H336C364.4 64 388.5 45.5 396.9 19.8C400.1 10 391.7 0 381.3 0zM352 416C352 433.7 337.7 448 320 448H256C238.3 448 224 433.7 224 416V320H352V416z" />
+    <glyph glyph-name="id-card"
+      unicode="&#xF2C2;"
+      horiz-adv-x="576" d=" M528 416H48C21.5 416 0 394.5 0 368V352H576V368C576 394.5 554.5 416 528 416zM0 16C0 -10.5 21.5 -32 48 -32H528C554.5 -32 576 -10.5 576 16V320H0V16zM352 248C352 252.4 355.6 256 360 256H504C508.4 256 512 252.4 512 248V232C512 227.6 508.4 224 504 224H360C355.6 224 352 227.6 352 232V248zM352 184C352 188.4 355.6 192 360 192H504C508.4 192 512 188.4 512 184V168C512 163.6 508.4 160 504 160H360C355.6 160 352 163.6 352 168V184zM352 120C352 124.4 355.6 128 360 128H504C508.4 128 512 124.4 512 120V104C512 99.6 508.4 96 504 96H360C355.6 96 352 99.6 352 104V120zM176 256C211.3 256 240 227.3 240 192S211.3 128 176 128S112 156.7 112 192S140.7 256 176 256zM67.1 51.8C75.5 77.5 99.6 96 128 96H136.2C148.5 90.9 161.9 88 176 88S203.6 90.9 215.8 96H224C252.4 96 276.5 77.5 284.9 51.8C288.1 41.9 279.7 32 269.3 32H82.7C72.3 32 63.9 42 67.1 51.8z" />
+    <glyph glyph-name="image"
+      unicode="&#xF03E;"
+      horiz-adv-x="512" d=" M464 0H48C21.49 0 0 21.49 0 48V336C0 362.51 21.49 384 48 384H464C490.51 384 512 362.51 512 336V48C512 21.49 490.51 0 464 0zM112 328C81.072 328 56 302.928 56 272S81.072 216 112 216S168 241.072 168 272S142.928 328 112 328zM64 64H448V176L360.485 263.515C355.7990000000001 268.201 348.201 268.201 343.514 263.515L208 128L152.485 183.515C147.799 188.201 140.201 188.201 135.514 183.515L64 112V64z" />
+    <glyph glyph-name="images"
+      unicode="&#xF302;"
+      horiz-adv-x="576" d=" M480 32V16C480 -10.51 458.51 -32 432 -32H48C21.49 -32 0 -10.51 0 16V272C0 298.51 21.49 320 48 320H64V112C64 67.888 99.888 32 144 32H480zM576 112V368C576 394.51 554.51 416 528 416H144C117.49 416 96 394.51 96 368V112C96 85.49 117.49 64 144 64H528C554.51 64 576 85.49 576 112zM256 320C256 293.49 234.51 272 208 272S160 293.49 160 320S181.49 368 208 368S256 346.51 256 320zM160 176L215.515 231.515C220.201 236.201 227.799 236.201 232.486 231.515L272 192L407.515 327.515C412.201 332.201 419.799 332.201 424.486 327.515L512 240V128H160V176z" />
+    <glyph glyph-name="inbox"
+      unicode="&#xF01C;"
+      horiz-adv-x="576" d=" M567.938 204.092L462.25 362.626A48.003 48.003 0 0 1 422.311 384H153.689A48 48 0 0 1 113.751 362.626L8.062 204.092A47.994 47.994 0 0 1 0 177.467V48C0 21.49 21.49 0 48 0H528C554.51 0 576 21.49 576 48V177.467A47.994 47.994 0 0 1 567.938 204.092zM162.252 320H413.749L499.082 192H376L344 128H232L200 192H76.918L162.252 320z" />
+    <glyph glyph-name="indent"
+      unicode="&#xF03C;"
+      horiz-adv-x="448" d=" M0 364V404C0 412.837 7.163 420 16 420H432C440.837 420 448 412.837 448 404V364C448 355.163 440.837 348 432 348H16C7.163 348 0 355.163 0 364zM176 220H432C440.837 220 448 227.163 448 236V276C448 284.837 440.837 292 432 292H176C167.163 292 160 284.837 160 276V236C160 227.163 167.163 220 176 220zM16 -36H432C440.837 -36 448 -28.837 448 -20V20C448 28.837 440.837 36 432 36H16C7.163 36 0 28.837 0 20V-20C0 -28.837 7.163 -36 16 -36zM176 92H432C440.837 92 448 99.163 448 108V148C448 156.837 440.837 164 432 164H176C167.163 164 160 156.837 160 148V108C160 99.163 167.163 92 176 92zM123.313 203.313L27.313 299.297C17.266 309.348 0 302.224 0 287.9840000000001V96.009C0 81.68 17.325 74.705 27.313 84.696L123.313 180.6880000000001C129.562 186.9350000000001 129.562 197.0650000000001 123.313 203.3130000000001z" />
+    <glyph glyph-name="industry"
+      unicode="&#xF275;"
+      horiz-adv-x="512" d=" M475.115 284.219L336 195.691V263.971C336 282.887 315.069 294.37 299.115 284.219L160 195.691V392C160 405.255 149.255 416 136 416H24C10.745 416 0 405.255 0 392V-8C0 -21.255 10.745 -32 24 -32H488C501.255 -32 512 -21.255 512 -8V263.971C512 282.8880000000001 491.069 294.37 475.115 284.219z" />
+    <glyph glyph-name="infinity"
+      unicode="&#xF534;"
+      horiz-adv-x="640" d=" M471.1 352C405 352 353.3 310.7 320 273.4C286.7 310.7 235 352 168.9 352C75.8 352 0 280.2 0 192S75.8 32 168.9 32C235 32 286.7 73.3 320 110.6C353.3 73.3 405 32 471.1 32C564.2 32 640 103.8 640 192S564.2 352 471.1 352zM168.9 128C128.7 128 96 156.7 96 192S128.7 256 168.9 256C207.1 256 242.3 219.9 262.9 192C242.5 164.4 207 128 168.9 128zM471.1 128C432.9000000000001 128 397.7000000000001 164.1 377.1 192C397.5 219.6 433 256 471.1 256C511.3 256 544 227.3 544 192S511.3 128 471.1 128z" />
+    <glyph glyph-name="info-circle"
+      unicode="&#xF05A;"
+      horiz-adv-x="512" d=" M256 440C119.043 440 8 328.9170000000001 8 192C8 55.003 119.043 -56 256 -56S504 55.003 504 192C504 328.9170000000001 392.957 440 256 440zM256 330C279.1960000000001 330 298 311.1960000000001 298 288S279.1960000000001 246 256 246S214 264.804 214 288S232.804 330 256 330zM312 76C312 69.373 306.627 64 300 64H212C205.373 64 200 69.373 200 76V100C200 106.627 205.373 112 212 112H224V176H212C205.373 176 200 181.373 200 188V212C200 218.627 205.373 224 212 224H276C282.627 224 288 218.627 288 212V112H300C306.627 112 312 106.627 312 100V76z" />
+    <glyph glyph-name="info"
+      unicode="&#xF129;"
+      horiz-adv-x="192" d=" M20 23.771H40V168.229H20C8.954 168.229 0 177.183 0 188.229V236C0 247.046 8.954 256 20 256H132C143.046 256 152 247.046 152 236V23.771H172C183.046 23.771 192 14.817 192 3.771V-44C192 -55.046 183.046 -64 172 -64H20C8.954 -64 0 -55.046 0 -44V3.771C0 14.817 8.954 23.771 20 23.771zM96 448C56.235 448 24 415.765 24 376S56.235 304 96 304S168 336.235 168 376S135.764 448 96 448z" />
+    <glyph glyph-name="italic"
+      unicode="&#xF033;"
+      horiz-adv-x="320" d=" M204.758 32H170.909L233.0010000000001 352H273.7260000000001A16 16 0 0 1 289.4300000000001 364.937L295.6720000000001 396.937C297.599 406.8160000000001 290.034 416 279.968 416H120.235A16 16 0 0 1 104.531 403.063L98.289 371.063C96.362 361.184 103.927 352 113.993 352H147.839L85.749 32H46.278A16 16 0 0 1 30.574 19.065L24.329 -12.935C22.402 -22.815 29.967 -32 40.034 -32H198.513A16 16 0 0 1 214.217 -19.065L220.462 12.935C222.389 22.815 214.824 32 204.758 32z" />
+    <glyph glyph-name="key"
+      unicode="&#xF084;"
+      horiz-adv-x="512" d=" M512 271.999C512 174.797 433.202 96 336 96C324.78 96 313.81 97.062 303.173 99.069L279.161 72.055A23.999000000000002 23.999000000000002 0 0 0 261.223 64H224V24C224 10.745 213.255 0 200 0H160V-40C160 -53.255 149.255 -64 136 -64H24C10.745 -64 0 -53.255 0 -40V38.059C0 44.424 2.529 50.529 7.029 55.03L168.831 216.832C163.108 234.186 160 252.729 160 272C160 369.202 238.797 447.999 335.999 448C433.488 448.001 512 369.4890000000001 512 271.999zM336 320C336 293.49 357.49 272 384 272S432 293.49 432 320S410.51 368 384 368S336 346.51 336 320z" />
+    <glyph glyph-name="keyboard"
+      unicode="&#xF11C;"
+      horiz-adv-x="576" d=" M528 0H48C21.49 0 0 21.49 0 48V336C0 362.51 21.49 384 48 384H528C554.51 384 576 362.51 576 336V48C576 21.49 554.51 0 528 0zM128 268V308C128 314.627 122.627 320 116 320H76C69.373 320 64 314.627 64 308V268C64 261.373 69.373 256 76 256H116C122.627 256 128 261.373 128 268zM224 268V308C224 314.627 218.627 320 212 320H172C165.373 320 160 314.627 160 308V268C160 261.373 165.373 256 172 256H212C218.627 256 224 261.373 224 268zM320 268V308C320 314.627 314.627 320 308 320H268C261.373 320 256 314.627 256 308V268C256 261.373 261.373 256 268 256H308C314.627 256 320 261.373 320 268zM416 268V308C416 314.627 410.627 320 404 320H364C357.373 320 352 314.627 352 308V268C352 261.373 357.373 256 364 256H404C410.627 256 416 261.373 416 268zM512 268V308C512 314.627 506.627 320 500 320H460C453.373 320 448 314.627 448 308V268C448 261.373 453.373 256 460 256H500C506.627 256 512 261.373 512 268zM176 172V212C176 218.627 170.627 224 164 224H124C117.373 224 112 218.627 112 212V172C112 165.373 117.373 160 124 160H164C170.627 160 176 165.373 176 172zM272 172V212C272 218.627 266.627 224 260 224H220C213.373 224 208 218.627 208 212V172C208 165.373 213.373 160 220 160H260C266.627 160 272 165.373 272 172zM368 172V212C368 218.627 362.627 224 356 224H316C309.373 224 304 218.627 304 212V172C304 165.373 309.373 160 316 160H356C362.627 160 368 165.373 368 172zM464 172V212C464 218.627 458.627 224 452 224H412C405.373 224 400 218.627 400 212V172C400 165.373 405.373 160 412 160H452C458.627 160 464 165.373 464 172zM128 76V116C128 122.627 122.627 128 116 128H76C69.373 128 64 122.627 64 116V76C64 69.373 69.373 64 76 64H116C122.627 64 128 69.373 128 76zM416 76V116C416 122.627 410.627 128 404 128H172C165.373 128 160 122.627 160 116V76C160 69.373 165.373 64 172 64H404C410.627 64 416 69.373 416 76zM512 76V116C512 122.627 506.627 128 500 128H460C453.373 128 448 122.627 448 116V76C448 69.373 453.373 64 460 64H500C506.627 64 512 69.373 512 76z" />
+    <glyph glyph-name="kiwi-bird"
+      unicode="&#xF535;"
+      horiz-adv-x="576" d=" M575.81 230.02C572.64 290.5900000000001 518.28 336 457.63 336H448.26C395.44 336 344.01 352.25 300.52 382.24C258.53 411.2 204.48 423.86 147.31 410.94C129.3 406.88 -0.08 369.76 0 224C0.04 153.05 38.68 91.2 95.99 57.99V-16C95.99 -24.84 103.15 -32 111.99 -32H127.99C136.83 -32 143.99 -24.84 143.99 -16V38.26C159.35 34.3 175.39 32 191.99 32C197.43 32 202.67 32.73 207.99 33.18V-16C207.99 -24.84 215.15 -32 223.99 -32H239.99C248.83 -32 255.99 -24.84 255.99 -16V43.43C270.23 48.49 283.87 54.82 296.3300000000001 62.94C342.07 92.75 393.86 112 448.46 112C473.94 112 464.47 112.31 471.51 112.78L545.92 -23.66C548.78 -28.89 554.2199999999999 -32 559.9699999999999 -32C561.2799999999999 -32 562.6099999999999 -31.84 563.92 -31.5C571.01 -29.7 575.9699999999999 -23.31 575.9699999999999 -16C575.9699999999999 -16 576.1099999999999 224.24 575.81 230.02zM463.97 200C450.72 200 439.9700000000001 210.75 439.9700000000001 224C439.9700000000001 237.26 450.72 248 463.97 248S487.97 237.26 487.97 224C487.97 210.75 477.22 200 463.97 200zM543.97 46.75L504.11 119.83C519.23 125.66 532.84 134.43 543.97 145.81V46.75z" />
+    <glyph glyph-name="language"
+      unicode="&#xF1AB;"
+      horiz-adv-x="640" d=" M304 32H24C10.745 32 0 42.745 0 56V328C0 341.255 10.745 352 24 352H304V32zM183.324 104.622A12 12 0 0 1 194.839 96H217.702C225.922 96 231.709 104.078 229.064 111.861L171.61 280.915A12 12 0 0 1 160.248 289.054H127.759A12.001000000000001 12.001000000000001 0 0 1 116.397 280.915L58.942 111.861C56.297 104.078 62.084 96 70.304 96H93.109A12 12 0 0 1 104.644 104.693L113.762 136.5H173.973L183.324 104.622zM144.273 245.042S148.593 223.981 152.103 211.832L162.9030000000001 174.301H124.8330000000001L135.9030000000001 211.832C139.4130000000001 223.982 143.7330000000001 245.042 143.7330000000001 245.042H144.2730000000001zM616 32H336V352H616C629.255 352 640 341.255 640 328V56C640 42.745 629.255 32 616 32zM580 260H516V276C516 282.627 510.627 288 504 288H488C481.373 288 476 282.627 476 276V260H412C405.373 260 400 254.627 400 248V232C400 225.373 405.373 220 412 220H526.106C519.843 205.701 509.588 191.028 496.083 176.794C489.523 183.692 483.686 190.704 478.718 197.727C475.079 202.871 468.133 204.402 462.723 201.173L455.443 196.827L448.945 192.948C442.989 189.392 441.252 181.527 445.21 175.831C451.275 167.102 458.308 158.495 466.194 150.105C458.0719999999999 143.879 449.353 137.861 440.091 132.141C434.57 128.731 432.7099999999999 121.585 435.929 115.951L443.87 102.055C447.232 96.172 454.8049999999999 94.2289999999999 460.576 97.7789999999999C473.308 105.61 485.147 113.954 496.0189999999999 122.67C506.9359999999999 113.9089999999999 518.785 105.568 531.415 97.789C537.189 94.233 544.7679999999999 96.171 548.132 102.059L556.0759999999999 115.962C559.2889999999999 121.585 557.4459999999999 128.722 551.9409999999999 132.133A312.737 312.737 0 0 0 525.881 150.152C546.905 172.577 561.649 196.441 568.5939999999999 220.002H580C586.627 220.002 592 225.375 592 232.002V248.002C592 254.627 586.627 260 580 260z" />
+    <glyph glyph-name="laptop"
+      unicode="&#xF109;"
+      horiz-adv-x="640" d=" M512 384V128H128V384H512M528 448H112C85.5 448 64 426.5 64 400V112C64 85.5 85.5 64 112 64H528C554.5 64 576 85.5 576 112V400C576 426.5 554.5 448 528 448zM628 32H389.5C386.5 32 384 29.9 383.6 26.9C381.2 11.7 368 0 352 0H288C272 0 258.8 11.7 256.4 26.9C255.9 29.8 253.4 32 250.5 32H12C5.4 32 0 26.6 0 20V-16C0 -42.5 21.5 -64 48 -64H592C618.5 -64 640 -42.5 640 -16V20C640 26.6 634.6 32 628 32z" />
+    <glyph glyph-name="leaf"
+      unicode="&#xF06C;"
+      horiz-adv-x="576" d=" M546.2 438.3C540.6 450.8 524.6 451.3 517.9000000000001 439.5C486.9 385.6 431.4 352 368 352H288C182 352 96 266 96 160C96 153 96.8 146.3 97.5 139.5C161.3 185.2 253.4 224 384 224C392.8 224 400 216.8 400 208S392.8 192 384 192C132.6 192 26 37.9 2.4 -20C-4.2 -36.3 3.6 -54.9 19.9 -61.6C36.3 -68.4 54.9 -60.5 61.7 -44.3C63.2 -40.7 82.6 3.6 133.6 46.3C166 2.4 227.6 -39.5000000000001 308.5 -30.9C465.5 -19.5 576 121.3 576 293.7C576 343.9 565.2 395.9 546.2 438.3z" />
+    <glyph glyph-name="lemon"
+      unicode="&#xF094;"
+      horiz-adv-x="512" d=" M489.038 425.037C465.944 448.13 434.648 453.93 413.947 441.871C355.041 407.5590000000001 232.697 494.948 92.874 355.125S40.441 92.959 6.129 34.055C-5.93 13.353 -0.131 -17.944 22.962 -41.038C46.057 -64.133 77.354 -69.929 98.057 -57.87C156.958 -23.56 279.303 -110.9489999999999 419.125 28.873S471.56 291.04 505.871 349.944C517.93 370.646 512.132 401.943 489.038 425.0370000000001zM243.881 352.478C185.692 337.931 110.073 262.323 95.523 204.12C93.706 196.85 87.181 191.996 80.012 191.996C78.728 191.996 77.422 192.152 76.119 192.477C67.547 194.621 62.335 203.307 64.477 211.88C81.901 281.573 166.316 366.07 236.119 383.522C244.694 385.665 253.38 380.453 255.522 371.88S252.453 354.621 243.881 352.478z" />
+    <glyph glyph-name="less-than-equal"
+      unicode="&#xF537;"
+      horiz-adv-x="448" d=" M54.98 233.8L356.3900000000001 113.93C374.7800000000001 107.9 395.1 116.47 401.7700000000001 133.08L413.86 163.16C420.54 179.77 411.04 198.13 392.6500000000001 204.16L217.21 272.21L392.7700000000001 340.3C411.0600000000001 346.3 420.5100000000001 364.57 413.8700000000001 381.09L401.8400000000001 411.01C395.2000000000001 427.54 374.9800000000001 436.07 356.6900000000001 430.07L54.98 310.11C41.21 305.5900000000001 32 293.5 32 279.93V263.9700000000001C32 250.41 41.21 238.32 54.98 233.8zM424 48H24C10.75 48 0 37.26 0 24V-24C0 -37.25 10.75 -48 24 -48H424C437.25 -48 448 -37.25 448 -24V24C448 37.26 437.25 48 424 48z" />
+    <glyph glyph-name="less-than"
+      unicode="&#xF536;"
+      horiz-adv-x="384" d=" M365.46 90.26L147.04 192.11L365.51 293.99C381.53 301.4600000000001 388.46 320.5 380.99 336.52L367.4700000000001 365.52C360 381.54 340.96 388.4700000000001 324.94 381L18.48 238.09A32.014 32.014 0 0 1 0 209.09V174.85C0 162.41 7.21 151.1 18.48 145.85L324.79 3.02C340.85 -4.47 359.94 2.48 367.43 18.54L380.99 47.62C388.48 63.68 381.5300000000001 82.7699999999999 365.4600000000001 90.2599999999999z" />
+    <glyph glyph-name="level-down-alt"
+      unicode="&#xF3BE;"
+      horiz-adv-x="320" d=" M313.553 55.669L209.587 -56.334C200.102 -66.548 183.911 -66.563 174.413 -56.334L70.438 55.669C56.232 70.969 67.062 96 88.025 96H152V368H68.024A11.996 11.996 0 0 0 59.539 371.515L3.539 427.515C-4.021 435.074 1.333 448 12.024 448H208C221.255 448 232 437.255 232 424V96H295.966C316.844 96 327.817 71.031 313.553 55.669z" />
+    <glyph glyph-name="level-up-alt"
+      unicode="&#xF3BF;"
+      horiz-adv-x="320" d=" M313.553 328.331L209.587 440.334C200.102 450.548 183.911 450.563 174.413 440.334L70.438 328.331C56.232 313.031 67.062 288 88.025 288H152V16H68.024A11.996 11.996 0 0 1 59.539 12.485L3.539 -43.515C-4.021 -51.074 1.333 -64 12.024 -64H208C221.255 -64 232 -53.255 232 -40V288H295.966C316.844 288 327.817 312.969 313.553 328.331z" />
+    <glyph glyph-name="life-ring"
+      unicode="&#xF1CD;"
+      horiz-adv-x="512" d=" M256 440C119.033 440 8 328.967 8 192S119.033 -56 256 -56S504 55.033 504 192S392.967 440 256 440zM429.6960000000001 320.4410000000001L366.2970000000001 257.0420000000001C355.31 275.601 339.627 291.294 321.0420000000001 302.2970000000001L384.4410000000001 365.6960000000001A218.396 218.396 0 0 0 429.6960000000001 320.4410000000001zM256 96C202.981 96 160 138.981 160 192S202.981 288 256 288S352 245.019 352 192S309.019 96 256 96zM127.559 365.6960000000001L190.958 302.2970000000001C172.399 291.31 156.706 275.627 145.703 257.0420000000001L82.304 320.4410000000001A218.372 218.372 0 0 0 127.559 365.6960000000001zM82.304 63.559L145.703 126.958C156.69 108.399 172.373 92.706 190.958 81.703L127.559 18.304A218.396 218.396 0 0 0 82.304 63.559zM384.4410000000001 18.304L321.0420000000001 81.703C339.6010000000001 92.6900000000001 355.2940000000001 108.3730000000001 366.2970000000001 126.958L429.6960000000001 63.559A218.40299999999996 218.40299999999996 0 0 0 384.4410000000001 18.304z" />
+    <glyph glyph-name="lightbulb"
+      unicode="&#xF0EB;"
+      horiz-adv-x="384" d=" M272 20V-8C272 -18.449 265.32 -27.334 256 -30.629V-40C256 -53.255 245.255 -64 232 -64H152C138.745 -64 128 -53.255 128 -40V-30.629C118.68 -27.334 112 -18.449 112 -8V20C112 26.627 117.373 32 124 32H260C266.627 32 272 26.627 272 20zM128.893 64C118.986 64 110.067 70.078 106.517 79.327C67.697 180.459 16 170.269 16 272C16 369.197 94.805 448 192 448S368 369.197 368 272C368 170.269 316.303 180.459 277.484 79.327C273.934 70.078 265.014 64 255.108 64H128.893zM112 272C112 316.112 147.888 352 192 352C200.837 352 208 359.164 208 368S200.837 384 192 384C130.243 384 80 333.757 80 272C80 263.164 87.164 256 96 256S112 263.164 112 272z" />
+    <glyph glyph-name="link"
+      unicode="&#xF0C1;"
+      horiz-adv-x="512" d=" M326.612 262.6090000000001C386.3590000000001 202.8 385.5390000000001 106.911 326.9720000000001 48.019C326.862 47.899 326.7320000000001 47.769 326.612 47.649L259.4120000000001 -19.551C200.142 -78.821 103.713 -78.813 44.452 -19.551C-14.818 39.709 -14.818 136.149 44.452 195.409L81.558 232.515C91.398 242.355 108.344 235.8150000000001 108.852 221.909C109.5 204.187 112.678 186.382 118.542 169.1880000000001C120.528 163.3660000000001 119.109 156.9260000000001 114.759 152.576L101.672 139.489C73.646 111.463 72.767 65.8290000000001 100.517 37.5290000000001C128.541 8.95 174.603 8.78 202.842 37.0190000000001L270.0420000000001 104.2090000000001C298.233 132.4 298.115 177.9660000000001 270.0420000000001 206.0390000000001C266.341 209.733 262.6130000000001 212.603 259.701 214.608A16.037 16.037 0 0 0 252.754 227.2140000000001C252.3580000000001 237.7810000000001 256.1020000000001 248.67 264.452 257.0200000000001L285.506 278.0750000000001C291.027 283.596 299.688 284.2740000000001 306.09 279.8060000000001A152.482 152.482 0 0 0 326.612 262.6090000000001zM467.547 403.551C408.286 462.813 311.8570000000001 462.821 252.587 403.551L185.387 336.351C185.267 336.231 185.137 336.101 185.027 335.981C126.461 277.089 125.64 181.2 185.387 121.391A152.454 152.454 0 0 1 205.908 104.1949999999999C212.31 99.7269999999999 220.972 100.406 226.492 105.9259999999999L247.546 126.981C255.896 135.331 259.6400000000001 146.2199999999999 259.2440000000001 156.7869999999999A16.037 16.037 0 0 1 252.2970000000001 169.3929999999999C249.385 171.3979999999999 245.6570000000001 174.2679999999999 241.956 177.9619999999999C213.883 206.035 213.765 251.601 241.956 279.7919999999999L309.156 346.9819999999999C337.395 375.2209999999999 383.456 375.051 411.481 346.4719999999999C439.231 318.1719999999999 438.353 272.5379999999999 410.326 244.5119999999999L397.2390000000001 231.425C392.889 227.075 391.4700000000001 220.6349999999999 393.456 214.8129999999999C399.32 197.619 402.498 179.8139999999999 403.146 162.0919999999999C403.6550000000001 148.1859999999999 420.6 141.6459999999999 430.44 151.4859999999999L467.546 188.5919999999999C526.817 247.851 526.817 344.291 467.547 403.551z" />
+    <glyph glyph-name="lira-sign"
+      unicode="&#xF195;"
+      horiz-adv-x="384" d=" M371.9940000000001 192H323.975C317.64 192 312 187.088 312 180.754C312 80 230.179 32 144 32V191.219L278.603 221.131A12 12 0 0 1 288 232.845V273.8210000000001C288 281.498 280.891 287.201 273.397 285.535L144 256.781V287.2200000000001L278.603 317.132A12 12 0 0 1 288 328.846V369.8210000000001C288 377.498 280.891 383.201 273.397 381.535L144 352.781V404C144 410.627 138.627 416 132 416H76C69.373 416 64 410.627 64 404V335.003L9.397 322.8690000000001A12 12 0 0 1 0 311.155V270.179C0 262.502 7.109 256.799 14.603 258.4650000000001L64 269.442V239.003L9.397 226.869A12 12 0 0 1 0 215.155V174.179C0 166.502 7.109 160.799 14.603 162.465L64 173.442V-20C64 -26.627 69.373 -32 76 -32H155.583C289.674 -32 378.838 45.834 383.991 179.592C384.252 186.374 378.78 192 371.994 192z" />
+    <glyph glyph-name="list-alt"
+      unicode="&#xF022;"
+      horiz-adv-x="512" d=" M464 -32H48C21.49 -32 0 -10.51 0 16V368C0 394.51 21.49 416 48 416H464C490.51 416 512 394.51 512 368V16C512 -10.51 490.51 -32 464 -32zM128 328C105.909 328 88 310.091 88 288S105.909 248 128 248S168 265.909 168 288S150.091 328 128 328zM128 232C105.909 232 88 214.091 88 192S105.909 152 128 152S168 169.909 168 192S150.091 232 128 232zM128 136C105.909 136 88 118.091 88 96S105.909 56 128 56S168 73.909 168 96S150.091 136 128 136zM416 272V304C416 310.627 410.627 316 404 316H204C197.373 316 192 310.627 192 304V272C192 265.373 197.373 260 204 260H404C410.627 260 416 265.373 416 272zM416 176V208C416 214.627 410.627 220 404 220H204C197.373 220 192 214.627 192 208V176C192 169.373 197.373 164 204 164H404C410.627 164 416 169.373 416 176zM416 80V112C416 118.627 410.627 124 404 124H204C197.373 124 192 118.627 192 112V80C192 73.373 197.373 68 204 68H404C410.627 68 416 73.373 416 80z" />
+    <glyph glyph-name="list-ol"
+      unicode="&#xF0CB;"
+      horiz-adv-x="512" d=" M3.263 308.473C3.263 315.9500000000001 7.18 320.045 14.836 320.045H29.967V359.9220000000001C29.967 365.085 30.501 370.425 30.501 370.425H30.145S28.366 367.755 27.297 366.687C22.846 362.414 16.793 362.236 11.631 367.755L6.113 373.986C0.771 379.327 1.129 385.202 6.647 390.365L28.367 410.303C32.815 414.398 36.732 416 42.785 416H54.89C62.546 416 66.639 412.084 66.639 404.428V320.044H82.127C89.782 320.044 93.699 315.95 93.699 308.472V299.5710000000001C93.699 292.094 89.782 287.999 82.127 287.999H14.836C7.18 287.999 3.263 292.094 3.263 299.5710000000001V308.473zM2.211 143.409C2.211 190.687 53.166 199.792 53.166 212.574C53.166 219.754 47.212 221.329 43.886 221.329C40.733 221.329 37.407 220.278 34.431 217.477C29.352 212.574 23.924 210.473 18.32 215.026L9.741 221.855C3.962 226.408 2.561 231.6600000000001 6.938 237.264C13.592 246.019 26.025 256 47.387 256C66.824 256 91.863 245.494 91.863 216.427C91.863 178.08 45.11 170.025 43.184 159.518H82.233C89.762 159.518 93.79 155.491 93.79 148.136V139.381C93.79 132.027 89.762 127.999 82.233 127.999H14.293C7.288 127.999 2.21 132.027 2.21 139.381V143.409zM5.654 -6.61L11.257 2.67C15.11 9.324 20.362 9.674 26.841 5.8219999999999C31.744 3.7209999999999 36.471 2.67 41.2 2.67C51.355 2.67 55.558 6.172 55.558 10.9C55.558 17.554 49.954 20.006 39.624 20.006H34.896C28.942 20.006 25.616 22.107 22.638 27.886L21.588 29.812C19.137 34.54 20.362 39.6179999999999 24.389 44.696L29.993 51.7C36.822 60.105 42.25 65.183 42.25 65.183V65.533S38.047 64.482 29.642 64.482H16.685C9.155 64.482 5.302 68.5100000000001 5.302 75.864V84.619C5.302 92.149 9.155 96.001 16.685 96.001H75.169C82.698 96.001 86.551 91.9740000000001 86.551 84.619V81.292C86.551 75.514 85.15 71.4860000000001 81.472 67.109L63.963 46.972C83.574 41.8940000000001 92.679 26.485 92.679 12.1270000000001C92.679 -9.2359999999999 78.321 -31.9989999999999 44.176 -31.9989999999999C27.54 -31.9989999999999 15.984 -27.2709999999999 8.28 -22.5439999999999C2.501 -18.3419999999999 1.976 -12.7389999999999 5.654 -6.6099999999999zM144 316H496C504.837 316 512 323.163 512 332V372C512 380.837 504.837 388 496 388H144C135.163 388 128 380.837 128 372V332C128 323.163 135.163 316 144 316zM144 156H496C504.837 156 512 163.163 512 172V212C512 220.837 504.837 228 496 228H144C135.163 228 128 220.837 128 212V172C128 163.163 135.163 156 144 156zM144 -4H496C504.837 -4 512 3.163 512 12V52C512 60.837 504.837 68 496 68H144C135.163 68 128 60.837 128 52V12C128 3.163 135.163 -4 144 -4z" />
+    <glyph glyph-name="list-ul"
+      unicode="&#xF0CA;"
+      horiz-adv-x="512" d=" M96 352C96 325.49 74.51 304 48 304S0 325.49 0 352S21.49 400 48 400S96 378.51 96 352zM48 240C21.49 240 0 218.51 0 192S21.49 144 48 144S96 165.49 96 192S74.51 240 48 240zM48 80C21.49 80 0 58.51 0 32S21.49 -16 48 -16S96 5.49 96 32S74.51 80 48 80zM144 316H496C504.837 316 512 323.163 512 332V372C512 380.837 504.837 388 496 388H144C135.163 388 128 380.837 128 372V332C128 323.163 135.163 316 144 316zM144 156H496C504.837 156 512 163.163 512 172V212C512 220.837 504.837 228 496 228H144C135.163 228 128 220.837 128 212V172C128 163.163 135.163 156 144 156zM144 -4H496C504.837 -4 512 3.163 512 12V52C512 60.837 504.837 68 496 68H144C135.163 68 128 60.837 128 52V12C128 3.163 135.163 -4 144 -4z" />
+    <glyph glyph-name="list"
+      unicode="&#xF03A;"
+      horiz-adv-x="512" d=" M128 332V372C128 380.837 135.163 388 144 388H496C504.837 388 512 380.837 512 372V332C512 323.163 504.837 316 496 316H144C135.163 316 128 323.163 128 332zM144 156H496C504.837 156 512 163.163 512 172V212C512 220.837 504.837 228 496 228H144C135.163 228 128 220.837 128 212V172C128 163.163 135.163 156 144 156zM144 -4H496C504.837 -4 512 3.163 512 12V52C512 60.837 504.837 68 496 68H144C135.163 68 128 60.837 128 52V12C128 3.163 135.163 -4 144 -4zM16 304H80C88.837 304 96 311.163 96 320V384C96 392.837 88.837 400 80 400H16C7.163 400 0 392.837 0 384V320C0 311.163 7.163 304 16 304zM16 144H80C88.837 144 96 151.163 96 160V224C96 232.837 88.837 240 80 240H16C7.163 240 0 232.837 0 224V160C0 151.163 7.163 144 16 144zM16 -16H80C88.837 -16 96 -8.837 96 0V64C96 72.837 88.837 80 80 80H16C7.163 80 0 72.837 0 64V0C0 -8.837 7.163 -16 16 -16z" />
+    <glyph glyph-name="location-arrow"
+      unicode="&#xF124;"
+      horiz-adv-x="512" d=" M443.683 443.471L27.818 251.582C-18.702 230.111 -3.39 160 47.933 160H224V-15.993C224 -67.72 294.161 -82.519 315.582 -36.108L507.38 379.775C526.285 420.736 483.628 461.908 443.683 443.471z" />
+    <glyph glyph-name="lock-open"
+      unicode="&#xF3C1;"
+      horiz-adv-x="576" d=" M423.5 448C339.5 447.7 272 378.5 272 294.5V224H48C21.5 224 0 202.5 0 176V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V176C448 202.5 426.5 224 400 224H352V295.1C352 334.7 383.7 367.6 423.3 368C463.3 368.4 496 335.9 496 296V216C496 202.7 506.7 192 520 192H552C565.3 192 576 202.7 576 216V296C576 380 507.5 448.3 423.5 448z" />
+    <glyph glyph-name="lock"
+      unicode="&#xF023;"
+      horiz-adv-x="448" d=" M400 224H376V296C376 379.8 307.8 448 224 448S72 379.8 72 296V224H48C21.5 224 0 202.5 0 176V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V176C448 202.5 426.5 224 400 224zM296 224H152V296C152 335.7 184.3 368 224 368S296 335.7 296 296V224z" />
+    <glyph glyph-name="long-arrow-alt-down"
+      unicode="&#xF309;"
+      horiz-adv-x="256" d=" M168 102.059V404C168 410.627 162.627 416 156 416H100C93.373 416 88 410.627 88 404V102.059H41.941C20.559 102.059 9.851 76.208 24.97 61.088L111.029 -24.971C120.402 -34.344 135.598 -34.344 144.97 -24.971L231.029 61.088C246.148 76.207 235.44 102.059 214.058 102.059H168z" />
+    <glyph glyph-name="long-arrow-alt-left"
+      unicode="&#xF30A;"
+      horiz-adv-x="448" d=" M134.059 152H436C442.627 152 448 157.373 448 164V220C448 226.627 442.627 232 436 232H134.059V278.059C134.059 299.4410000000001 108.208 310.149 93.088 295.03L7.029 208.971C-2.344 199.598 -2.344 184.402 7.029 175.03L93.088 88.971C108.207 73.852 134.059 84.56 134.059 105.942V152z" />
+    <glyph glyph-name="long-arrow-alt-right"
+      unicode="&#xF30B;"
+      horiz-adv-x="448" d=" M313.941 232H12C5.373 232 0 226.627 0 220V164C0 157.373 5.373 152 12 152H313.941V105.941C313.941 84.559 339.792 73.851 354.912 88.97L440.971 175.029C450.344 184.402 450.344 199.598 440.971 208.97L354.9120000000001 295.029C339.793 310.148 313.9410000000001 299.44 313.9410000000001 278.058V232z" />
+    <glyph glyph-name="long-arrow-alt-up"
+      unicode="&#xF30C;"
+      horiz-adv-x="256" d=" M88 281.9410000000001V-20C88 -26.627 93.373 -32 100 -32H156C162.627 -32 168 -26.627 168 -20V281.9410000000001H214.059C235.441 281.9410000000001 246.149 307.7920000000001 231.03 322.9120000000001L144.971 408.971C135.598 418.344 120.402 418.344 111.03 408.971L24.971 322.9120000000001C9.852 307.793 20.56 281.9410000000001 41.942 281.9410000000001H88z" />
+    <glyph glyph-name="low-vision"
+      unicode="&#xF2A8;"
+      horiz-adv-x="576" d=" M569.344 216.369C512.96 312.051 407.81 376 288 376C259.532 376 231.898 372.381 205.549 365.591L152.778 437.76C145.177 448.618 130.214 451.26 119.355 443.6600000000001L106.241 434.482C95.381 426.881 92.739 411.916 100.341 401.056L143.472 342.661C89.449 316.27 40.228 273.317 6.682 216.419C6.672 216.402 6.659 216.386 6.648 216.369C-2.117 201.494 -2.316 182.841 6.648 167.63C45.148 102.298 106.39 51.768 179.507 26.281L55.316 203.698A272.194 272.194 0 0 0 83.61 239.61L203.01 69.03H203.02L243.65 10.99A330.055 330.055 0 0 1 322.59 9.8199999999999L132.61 281.2199999999999A277.628 277.628 0 0 0 171.387 302.7829999999999L423.223 -53.7610000000001C430.824 -64.619 445.7870000000001 -67.2600000000001 456.646 -59.6610000000001L469.76 -50.4830000000001C480.62 -42.8820000000001 483.262 -27.9160000000001 475.66 -17.0570000000001L432.54 41.3199999999999L432.533 41.329C489.694 69.307 537.3679999999999 113.369 569.343 167.63A47.937999999999995 47.937999999999995 0 0 1 569.3439999999999 216.369zM390.026 102.06L370.9600000000001 129.29C395.6420000000001 161.857 398.6710000000001 205.643 379.7600000000001 240.9700000000001V240.9400000000001C379.7600000000001 217.29 360.5900000000001 198.12 336.9400000000001 198.12C313.1120000000001 198.12 294.1200000000001 217.469 294.1200000000001 240.9400000000001C294.1200000000001 264.5900000000001 313.2900000000001 283.76 336.9400000000001 283.76H336.9700000000001C312.2200000000001 297.009 283.4480000000001 299.403 257.4600000000001 291.4400000000001L238.392 318.677C253.758 324.694 270.488 328 288 328C363.1620000000001 328 424 267.174 424 192C424 157.496 411.167 126.025 390.026 102.06z" />
+    <glyph glyph-name="magic"
+      unicode="&#xF0D0;"
+      horiz-adv-x="512" d=" M101.1 -57L7 37.1C-2.4 46.5 -2.4 61.7000000000001 7 71L377 441C386.4 450.4 401.6 450.4 410.9 441L505 346.9C514.4 337.5 514.4 322.3 505 313L135 -57C125.7 -66.2999999999999 110.5 -66.2999999999999 101.1 -57zM304 288.8L352.8 240L442.7000000000001 329.9L393.9000000000001 378.7L304 288.8zM138.9 408.7L127.2 384.9L101 381.1C96.3 380.4 94.4 374.6 97.8 371.3L116.8 352.8L112.3 326.7000000000001C111.5 322 116.4 318.4 120.6 320.6L144 333L167.4 320.7C171.6 318.5 176.5 322.1 175.7 326.8L171.2 352.9L190.2 371.4C193.6 374.7 191.7 380.5 187 381.2L160.8 385L149.1 408.8C147.1 412.9 141 412.9 138.9 408.7zM236.6 429.4L228.8 413.6L211.3 411C208.2 410.5 206.9 406.7 209.2 404.5L221.8 392.2L218.8 374.8C218.3 371.7000000000001 221.6 369.3 224.4 370.8L240 379L255.6 370.8C258.4 369.3 261.7 371.7 261.2 374.8L258.2 392.2L270.8 404.5C273.1 406.7 271.8 410.6 268.7 411L251.2 413.5L243.4 429.3C242 432.3 238 432.3 236.6 429.4zM44.6 429.4L36.8 413.6L19.3 411C16.2 410.5 14.9 406.7 17.2 404.5L29.8 392.2L26.8 374.8C26.3 371.7000000000001 29.6 369.3 32.4 370.8L48 379L63.6 370.8C66.4 369.3 69.7 371.7 69.2 374.8L66.2 392.2L78.8 404.5C81.1 406.7 79.8 410.6 76.7 411L59.2 413.5L51.4 429.3C50 432.3 46 432.3 44.6 429.4zM460.6 205.9L452.8 190.1L435.3 187.6C432.2 187.1 430.9000000000001 183.3 433.2 181.1L445.8 168.8L442.8 151.4C442.3 148.3 445.6 145.9 448.4000000000001 147.4L464.0000000000001 155.6L479.6000000000001 147.4C482.4000000000001 145.9 485.7000000000001 148.3 485.2000000000001 151.4L482.2000000000001 168.8L494.8000000000001 181.1C497.1000000000001 183.3 495.8000000000001 187.2000000000001 492.7000000000001 187.6L475.2000000000001 190.1L467.4000000000001 205.9C466.0000000000001 208.7000000000001 462.0000000000001 208.7000000000001 460.6000000000001 205.9z" />
+    <glyph glyph-name="magnet"
+      unicode="&#xF076;"
+      horiz-adv-x="512.1" d=" M164.1 288H12C5.4 288 0 293.4 0 300V380C0 399.9 16.1 416 36 416H140C159.9 416 176 399.9 176 380V300C176.1 293.4 170.7 288 164.1 288zM512.1 300V380.1C512.1 400 496 416.1 476.1 416.1H372.1C352.2000000000001 416.1 336.1 400 336.1 380.1V300.1C336.1 293.5 341.5 288.1 348.1 288.1H500.1C506.7 288 512.1 293.4 512.1 300zM348.1 256C341.5 256 336.1 250.6 336.1 244V192C336.1 63.9 176.1 64.1 176.1 192V244C176.1 250.6 170.7 256 164.1 256H12.1C5.4 256 0.1 250.6 0.1 243.9C0.2 222.5 0.7 203.6 0.1 190.6C0.1 40 136.3 -56 256.9 -56C377.5 -56 512 40 512 190.7C511.4 203.5 511.8 223.7 512 243.9C512 250.6 506.7 256 500 256H348.1z" />
+    <glyph glyph-name="male"
+      unicode="&#xF183;"
+      horiz-adv-x="192" d=" M96 448C131.346 448 160 419.346 160 384S131.346 320 96 320S32 348.654 32 384S60.654 448 96 448M144 304H132.64C109.929 293.557 83.05 293.106 59.36 304H48C21.49 304 0 282.51 0 256V120C0 106.745 10.745 96 24 96H40V-40C40 -53.255 50.745 -64 64 -64H128C141.255 -64 152 -53.255 152 -40V96H168C181.255 96 192 106.745 192 120V256C192 282.51 170.51 304 144 304z" />
+    <glyph glyph-name="map-marker-alt"
+      unicode="&#xF3C5;"
+      horiz-adv-x="384" d=" M172.268 -53.67C26.97 156.969 0 178.587 0 256C0 362.039 85.961 448 192 448S384 362.039 384 256C384 178.587 357.03 156.969 211.732 -53.67C202.197 -67.444 181.802 -67.443 172.268 -53.67zM192 176C236.183 176 272 211.817 272 256S236.183 336 192 336S112 300.183 112 256S147.817 176 192 176z" />
+    <glyph glyph-name="map-marker"
+      unicode="&#xF041;"
+      horiz-adv-x="384" d=" M172.268 -53.67C26.97 156.969 0 178.587 0 256C0 362.039 85.961 448 192 448S384 362.039 384 256C384 178.587 357.03 156.969 211.732 -53.67C202.197 -67.444 181.802 -67.443 172.268 -53.67z" />
+    <glyph glyph-name="map-pin"
+      unicode="&#xF276;"
+      horiz-adv-x="320" d=" M192 147.187V-25.633L169.985 -58.656C165.235 -65.7809999999999 154.766 -65.7809999999999 150.016 -58.656L128 -25.633V147.187A162.221 162.221 0 0 1 192 147.187zM160 448C239.529 448 304 383.529 304 304S239.529 160 160 160S16 224.471 16 304S80.471 448 160 448M80 312C80 351.701 112.299 384 152 384A8 8 0 0 1 152 400C103.477 400 64 360.523 64 312A8 8 0 0 1 80 312z" />
+    <glyph glyph-name="map-signs"
+      unicode="&#xF277;"
+      horiz-adv-x="512" d=" M487.515 343.515L439.03 295.03A23.998000000000005 23.998000000000005 0 0 0 422.06 288.001H56C42.745 288.001 32 298.746 32 312.001V392C32 405.255 42.745 416 56 416H216V424C216 437.255 226.745 448 240 448H272C285.255 448 296 437.255 296 424V416H422.059A24 24 0 0 0 439.029 408.971L487.514 360.486C492.201 355.799 492.201 348.201 487.515 343.515zM216 80V-40C216 -53.255 226.745 -64 240 -64H272C285.255 -64 296 -53.255 296 -40V80H216zM456 224H296V272H216V224H89.941A24 24 0 0 1 72.971 216.971L24.486 168.486C19.8 163.8 19.8 156.202 24.486 151.515L72.971 103.03A23.998000000000005 23.998000000000005 0 0 1 89.941 96.001H456C469.255 96.001 480 106.746 480 120.001V200.001C480 213.255 469.255 224 456 224z" />
+    <glyph glyph-name="map"
+      unicode="&#xF279;"
+      horiz-adv-x="576" d=" M576 391.985V56.015A23.998000000000005 23.998000000000005 0 0 0 562.733 34.549L434.733 -29.451C418.948 -37.344 400 -25.992 400 -7.985V327.985A23.998000000000005 23.998000000000005 0 0 0 413.267 349.451L541.267 413.451C557.052 421.344 576 409.992 576 391.985zM369.747 349.915L225.747 413.915C209.996 420.915 192 409.454 192 391.983V56.016A24 24 0 0 1 206.253 34.085L350.253 -29.915C366.004 -36.915 384 -25.4539999999999 384 -7.984V327.983A24 24 0 0 1 369.747 349.915zM141.267 413.451L13.267 349.466A23.998000000000005 23.998000000000005 0 0 1 0 328V-7.985C0 -25.992 18.948 -37.344 34.733 -29.451L162.733 34.534A23.998000000000005 23.998000000000005 0 0 1 176 56V391.985C176 409.992 157.052 421.344 141.267 413.451z" />
+    <glyph glyph-name="mars-double"
+      unicode="&#xF227;"
+      horiz-adv-x="512" d=" M340 448H261C250.3 448 245 435.1 252.5 427.5L269.4 410.6L220.7 361.9C198.5 375.9 172.2 384 144 384C64.5 384 0 319.5 0 240S64.5 96 144 96S288 160.5 288 240C288 268.2 279.9 294.5 265.9 316.7L314.6 365.4L331.5 348.5C333.8999999999999 346.1 337 345 339.8999999999999 345C346.0999999999999 345 352 349.8 352 357V436C352 442.6 346.6 448 340 448zM144 160C99.9 160 64 195.9 64 240S99.9 320 144 320S224 284.1 224 240S188.1 160 144 160zM500 288.1H421C410.3 288.1 405 275.2 412.5 267.6L429.4 250.7L380.7 202C362.5 213.4 341.7 220.9 319.2 223.3C317.1 201.5 311 180 300.8 160C301.9000000000001 160 303 160.1 304 160.1C348.1 160.1 384 124.2000000000001 384 80.1S348.1 0.1 304 0.1S224 36 224 80.1C224 81.2000000000001 224 82.3 224.1 83.3C204.1 73.1 182.6 66.9 160.8 64.9C168.4 -7.6 229.6 -64 304 -64C383.5 -64 448 0.5 448 80C448 108.2 439.9 134.5 425.9 156.7L474.6 205.4L491.4999999999999 188.5C493.8999999999999 186.1 496.8999999999999 185 499.8999999999999 185C506.0999999999999 185 511.9999999999999 189.8 511.9999999999999 197V276C511.9999999999999 282.7 506.6 288.1 499.9999999999999 288.1z" />
+    <glyph glyph-name="mars-stroke-h"
+      unicode="&#xF22B;"
+      horiz-adv-x="480" d=" M476.2 200.5L420.3 256.4C412.7 264 399.8 258.6 399.8 247.9V224H376V244C376 250.6 370.6 256 364 256H324C317.4 256 312 250.6 312 244V224H284.4C278.6 249.6 265.7 273.9 245.8 293.8C189.6 350 98.4 350 42.2 293.8C-14 237.6 -14 146.4 42.2 90.2000000000001C98.4 34.0000000000001 189.6 34.0000000000001 245.8 90.2000000000001C265.7 110.1 278.6 134.4 284.4000000000001 160.0000000000001H312V140.0000000000001C312 133.4 317.4 128.0000000000001 324 128.0000000000001H364C370.6 128.0000000000001 376 133.4 376 140.0000000000001V160.0000000000001H399.9V136.1000000000001C399.9 125.4000000000001 412.8 120.1000000000001 420.4 127.6000000000001L476.3 183.5000000000001C480.9 188.2000000000001 480.9 195.8000000000001 476.1999999999999 200.5000000000001zM200.6 135.4C169.4 104.2 118.7 104.2 87.5 135.4C56.3 166.6 56.3 217.3 87.5 248.5C118.7 279.7 169.4 279.7 200.6 248.5C231.8 217.4 231.8 166.6 200.6 135.4z" />
+    <glyph glyph-name="mars-stroke-v"
+      unicode="&#xF22A;"
+      horiz-adv-x="288" d=" M245.8 213.8C225.9 233.7 201.6 246.6 176 252.4V277.8H196C202.6 277.8 208 283.2000000000001 208 289.8V329.8C208 336.4 202.6 341.8 196 341.8H176V366.6H199.9C210.6 366.6 215.9 379.5 208.4 387.1L152.5 442.9C147.8 447.6 140.2 447.6 135.5 442.9L79.6 387C72 379.4 77.4 366.5 88.1 366.5H112V341.8H92C85.4 341.8 80 336.4 80 329.8V289.8C80 283.2000000000001 85.4 277.8 92 277.8H112V252.4C86.4 246.6 62.1 233.7 42.2 213.8C-14 157.6 -14 66.4 42.2 10.2C98.4 -45.9999999999999 189.6 -45.9999999999999 245.8 10.2C302.1 66.4 302.1 157.6 245.8 213.8000000000001zM200.6 55.4C169.4 24.2 118.7 24.2 87.5 55.4C56.3 86.6 56.3 137.3 87.5 168.5C118.7 199.7 169.4 199.7 200.6 168.5C231.8 137.4 231.8 86.6 200.6 55.4z" />
+    <glyph glyph-name="mars-stroke"
+      unicode="&#xF229;"
+      horiz-adv-x="384" d=" M372 384H293C282.3 384 277 371.1 284.5 363.5L301.4 346.6L283.9 329.1L269.8 343.2C265.1 347.9 257.5 347.9 252.8 343.2L224.5 315C219.8 310.3 219.8 302.7 224.5 298L238.6 283.9L220.6 265.9C198.4 279.9 172.1 288 143.9 288C64.5 288 0 223.5 0 144S64.5 0 144 0S288 64.5 288 144C288 172.2 279.9 198.5 265.9 220.7L283.9 238.7L298 224.6C302.7 219.9 310.3 219.9 315 224.6L343.3 252.9C348 257.6 348 265.2000000000001 343.3 269.9L329.2 284L346.7 301.5L363.6 284.6C371.2 277 384.1 282.4 384.1 293.1V372C384 378.6 378.6 384 372 384zM144 64C99.9 64 64 99.9 64 144S99.9 224 144 224S224 188.1 224 144S188.1 64 144 64z" />
+    <glyph glyph-name="mars"
+      unicode="&#xF222;"
+      horiz-adv-x="384" d=" M372 384H293C282.3 384 277 371.1 284.5 363.5L301.4 346.6L220.7 265.9C198.5 279.9 172.2 288 144 288C64.5 288 0 223.5 0 144S64.5 0 144 0S288 64.5 288 144C288 172.2 279.9 198.5 265.9 220.7L346.6 301.4L363.5 284.5C371.1 276.9 384 282.3 384 293V372C384 378.6 378.6 384 372 384zM144 64C99.9 64 64 99.9 64 144S99.9 224 144 224S224 188.1 224 144S188.1 64 144 64z" />
+    <glyph glyph-name="medkit"
+      unicode="&#xF0FA;"
+      horiz-adv-x="512" d=" M96 -32H416V320H384V368C384 394.51 362.51 416 336 416H176C149.49 416 128 394.51 128 368V320H96V-32zM192 352H320V320H192V352zM512 272V16C512 -10.51 490.51 -32 464 -32H448V320H464C490.51 320 512 298.51 512 272zM64 -32H48C21.49 -32 0 -10.51 0 16V272C0 298.51 21.49 320 48 320H64V-32zM352 176V144C352 135.163 344.837 128 336 128H288V80C288 71.163 280.837 64 272 64H240C231.163 64 224 71.163 224 80V128H176C167.163 128 160 135.163 160 144V176C160 184.837 167.163 192 176 192H224V240C224 248.837 231.163 256 240 256H272C280.837 256 288 248.837 288 240V192H336C344.837 192 352 184.837 352 176z" />
+    <glyph glyph-name="meh"
+      unicode="&#xF11A;"
+      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM168 272C185.7 272 200 257.7 200 240S185.7 208 168 208S136 222.3 136 240S150.3 272 168 272zM344 80H152C143.2 80 136 87.2 136 96S143.2 112 152 112H344C352.8 112 360 104.8 360 96S352.8 80 344 80zM328 208C310.3 208 296 222.3 296 240S310.3 272 328 272S360 257.7 360 240S345.7 208 328 208z" />
+    <glyph glyph-name="memory"
+      unicode="&#xF538;"
+      horiz-adv-x="640" d=" M640 317.06V352C640 369.67 625.67 384 608 384H32C14.33 384 0 369.67 0 352V317.06C18.6 310.45 32 292.87 32 272S18.6 233.55 0 226.94V128H640V226.94C621.4 233.55 608 251.13 608 272S621.4 310.45 640 317.06zM224 192H160V320H224V192zM352 192H288V320H352V192zM480 192H416V320H480V192zM0 0H64V26.67C64 35.51 71.16 42.67 80 42.67S96 35.51 96 26.67V0H224V26.67C224 35.51 231.16 42.67 240 42.67S256 35.51 256 26.67V0H384V26.67C384 35.51 391.1600000000001 42.67 400 42.67S416 35.51 416 26.67V0H544V26.67C544 35.51 551.16 42.67 560 42.67S576 35.51 576 26.67V0H640V96H0V0z" />
+    <glyph glyph-name="mercury"
+      unicode="&#xF223;"
+      horiz-adv-x="288" d=" M288 240C288 284.2 268.1 323.7 236.8 350.1C239.3 351.9 241.7 353.9 244 355.9C268.7 377.1 283.8 404.7 287.2 434.7C288.1 441.8 282.5 448 275.3 448H234.8C229 448 224.1 443.9 223 438.2C220.6 425.7 213.4 413.9 202.3 404.4C187 391.2 166.3 384 144 384S101 391.2 85.6 404.4C74.5 413.9 67.4 425.7 64.9 438.2C63.8 443.9 58.9 448 53.2 448H12.7C5.5 448 -0.1 441.8 0.8 434.7C4.2 404.6 19.2 377 44 355.8C46.3 353.8 48.7 351.9 51.2 350C19.9 323.7 0 284.2 0 240C0 171.5 47.9 114.1 112 99.6V48H76C69.4 48 64 42.6 64 36V-4C64 -10.6 69.4 -16 76 -16H112V-52C112 -58.6 117.4 -64 124 -64H164C170.6 -64 176 -58.6 176 -52V-16H212C218.6 -16 224 -10.6 224 -4V36C224 42.6 218.6 48 212 48H176V99.6C240.1 114.1 288 171.5 288 240.0000000000001zM64 240C64 284.1 99.9 320 144 320S224 284.1 224 240S188.1 160 144 160S64 195.9 64 240z" />
+    <glyph glyph-name="microchip"
+      unicode="&#xF2DB;"
+      horiz-adv-x="512" d=" M416 400V-16C416 -42.51 394.51 -64 368 -64H144C117.49 -64 96 -42.51 96 -16V400C96 426.51 117.49 448 144 448H368C394.51 448 416 426.51 416 400zM512 342V330A6 6 0 0 0 506 324H488V318A6 6 0 0 0 482 312H440V360H482A6 6 0 0 0 488 354V348H506A6 6 0 0 0 512 342zM512 246V234A6 6 0 0 0 506 228H488V222A6 6 0 0 0 482 216H440V264H482A6 6 0 0 0 488 258V252H506A6 6 0 0 0 512 246zM512 150V138A6 6 0 0 0 506 132H488V126A6 6 0 0 0 482 120H440V168H482A6 6 0 0 0 488 162V156H506A6 6 0 0 0 512 150zM512 54V42A6 6 0 0 0 506 36H488V30A6 6 0 0 0 482 24H440V72H482A6 6 0 0 0 488 66V60H506A6 6 0 0 0 512 54zM30 72H72V24H30A6 6 0 0 0 24 30V36H6A6 6 0 0 0 0 42V54A6 6 0 0 0 6 60H24V66A6 6 0 0 0 30 72zM30 168H72V120H30A6 6 0 0 0 24 126V132H6A6 6 0 0 0 0 138V150A6 6 0 0 0 6 156H24V162A6 6 0 0 0 30 168zM30 264H72V216H30A6 6 0 0 0 24 222V228H6A6 6 0 0 0 0 234V246A6 6 0 0 0 6 252H24V258A6 6 0 0 0 30 264zM30 360H72V312H30A6 6 0 0 0 24 318V324H6A6 6 0 0 0 0 330V342A6 6 0 0 0 6 348H24V354A6 6 0 0 0 30 360z" />
+    <glyph glyph-name="microphone-alt-slash"
+      unicode="&#xF539;"
+      horiz-adv-x="640" d=" M633.82 -10.1L476.26 111.67C488.74 135.79 496 163.02 496 192V240C496 248.84 488.84 256 480 256H464C455.16 256 448 248.84 448 240V192C448 174.08 444.04 157.2 437.28 141.8L410.73 162.32C413.83 171.72 416.01 181.54 416.01 191.99H372.3399999999999L330.94 223.99H416V255.99H330.67C324.7800000000001 255.99 320 259.5700000000001 320 263.99V279.99C320 284.41 324.78 287.99 330.67 287.99H416V319.99H330.67C324.7800000000001 319.99 320 323.57 320 327.99V343.99C320 348.4100000000001 324.78 351.99 330.67 351.99H416C416 405.01 373.02 447.99 320 447.99S224 405.01 224 351.99V306.63L45.47 444.63C38.49 450.05 28.43 448.8 23.01 441.82L3.37 416.55C-2.05 409.58 -0.8 399.53 6.18 394.1L594.54 -60.63C601.52 -66.0599999999999 611.5699999999999 -64.7999999999999 617 -57.82L636.64 -32.55C642.05 -25.58 640.8 -15.53 633.8199999999999 -10.1zM400 -16H344V17.78C355.71 19.4 367.1 22.0599999999999 377.96 25.86L327.56 64.8199999999999C320.85 64.42 314.15 63.9499999999999 307.21 64.62C251.36 70.0699999999999 208.47 113.25 196.03 166.4699999999999L144 206.69V199.84C144 110.2 207.97 30.29 296 18.15V-16H240C231.16 -16 224 -23.16 224 -32V-48C224 -56.84 231.16 -64 240 -64H400C408.84 -64 416 -56.84 416 -48V-32C416 -23.16 408.84 -16 400 -16z" />
+    <glyph glyph-name="microphone-alt"
+      unicode="&#xF3C9;"
+      horiz-adv-x="352" d=" M336 256H320C311.1600000000001 256 304 248.84 304 240V192C304 117.2 239.51 57.18 163.21 64.62C96.71 71.11 48 130.89 48 197.7V240C48 248.84 40.84 256 32 256H16C7.16 256 0 248.84 0 240V199.84C0 110.2 63.97 30.29 152 18.15V-16H96C87.16 -16 80 -23.16 80 -32V-48C80 -56.84 87.16 -64 96 -64H256C264.84 -64 272 -56.84 272 -48V-32C272 -23.16 264.84 -16 256 -16H200V17.77C285.71 29.53 352 103.1 352 192V240C352 248.84 344.84 256 336 256zM176 96C229.02 96 272 138.98 272 192H186.67C180.78 192 176 195.58 176 200V216C176 220.42 180.78 224 186.67 224H272V256H186.67C180.78 256 176 259.5800000000001 176 264V280C176 284.42 180.78 288 186.67 288H272V320H186.67C180.78 320 176 323.58 176 328V344C176 348.42 180.78 352 186.67 352H272C272 405.02 229.02 448 176 448S80 405.02 80 352V192C80 138.98 122.98 96 176 96z" />
+    <glyph glyph-name="microphone-slash"
+      unicode="&#xF131;"
+      horiz-adv-x="640" d=" M633.82 -10.1L476.02 111.86C488.61 135.87 496 162.99 496 192V240C496 248.84 488.84 256 480 256H464C455.16 256 448 248.84 448 240V192C448 174.08 444.04 157.2 437.28 141.8L410.73 162.32C413.83 171.72 416.01 181.54 416.01 191.99V352C416.01 405.02 373.0299999999999 448 320.01 448S224.0099999999999 405.02 224.0099999999999 352V306.64L45.47 444.63C38.49 450.05 28.43 448.8 23.01 441.82L3.37 416.55C-2.05 409.58 -0.8 399.53 6.18 394.1L594.54 -60.63C601.52 -66.0599999999999 611.5699999999999 -64.7999999999999 617 -57.82L636.64 -32.55C642.05 -25.58 640.8 -15.53 633.8199999999999 -10.1zM400 -16H344V17.77C355.6600000000001 19.37 366.85 22.31 377.67 26.08L327.56 64.81C320.85 64.41 314.15 63.94 307.21 64.61C251.36 70.06 208.47 113.24 196.03 166.46L144 206.69V199.84C144 110.2 207.97 30.29 296 18.15V-16H240C231.16 -16 224 -23.16 224 -32V-48C224 -56.84 231.16 -64 240 -64H400C408.84 -64 416 -56.84 416 -48V-32C416 -23.16 408.84 -16 400 -16z" />
+    <glyph glyph-name="microphone"
+      unicode="&#xF130;"
+      horiz-adv-x="352" d=" M176 96C229.02 96 272 138.98 272 192V352C272 405.02 229.02 448 176 448S80 405.02 80 352V192C80 138.98 122.98 96 176 96zM336 256H320C311.1600000000001 256 304 248.84 304 240V192C304 117.2 239.51 57.18 163.21 64.62C96.71 71.11 48 130.89 48 197.7V240C48 248.84 40.84 256 32 256H16C7.16 256 0 248.84 0 240V199.84C0 110.2 63.97 30.29 152 18.15V-16H96C87.16 -16 80 -23.16 80 -32V-48C80 -56.84 87.16 -64 96 -64H256C264.84 -64 272 -56.84 272 -48V-32C272 -23.16 264.84 -16 256 -16H200V17.77C285.71 29.53 352 103.1 352 192V240C352 248.84 344.84 256 336 256z" />
+    <glyph glyph-name="minus-circle"
+      unicode="&#xF056;"
+      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM124 152C117.4 152 112 157.4 112 164V220C112 226.6 117.4 232 124 232H388C394.6 232 400 226.6 400 220V164C400 157.4 394.6 152 388 152H124z" />
+    <glyph glyph-name="minus-square"
+      unicode="&#xF146;"
+      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM92 152C85.4 152 80 157.4 80 164V220C80 226.6 85.4 232 92 232H356C362.6 232 368 226.6 368 220V164C368 157.4 362.6 152 356 152H92z" />
+    <glyph glyph-name="minus"
+      unicode="&#xF068;"
+      horiz-adv-x="448" d=" M416 240H32C14.33 240 0 225.67 0 208V176C0 158.33 14.33 144 32 144H416C433.67 144 448 158.33 448 176V208C448 225.67 433.67 240 416 240z" />
+    <glyph glyph-name="mobile-alt"
+      unicode="&#xF3CD;"
+      horiz-adv-x="320" d=" M272 448H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H272C298.5 -64 320 -42.5 320 -16V400C320 426.5 298.5 448 272 448zM160 -32C142.3 -32 128 -17.7 128 0S142.3 32 160 32S192 17.7 192 0S177.7 -32 160 -32zM272 76C272 69.4 266.6 64 260 64H60C53.4 64 48 69.4 48 76V388C48 394.6 53.4 400 60 400H260C266.6 400 272 394.6 272 388V76z" />
+    <glyph glyph-name="mobile"
+      unicode="&#xF10B;"
+      horiz-adv-x="320" d=" M272 448H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H272C298.5 -64 320 -42.5 320 -16V400C320 426.5 298.5 448 272 448zM160 -32C142.3 -32 128 -17.7 128 0S142.3 32 160 32S192 17.7 192 0S177.7 -32 160 -32z" />
+    <glyph glyph-name="money-bill-alt"
+      unicode="&#xF3D1;"
+      horiz-adv-x="640" d=" M352 160H336V248C336 252.42 332.42 256 328 256H314.42C309.68 256 305.05 254.6 301.11 251.97L285.7800000000001 241.75A7.993999999999999 7.993999999999999 0 0 1 283.56 230.66L292.44 217.35A7.993999999999999 7.993999999999999 0 0 1 303.53 215.13L304 215.44V160H288C283.58 160 280 156.42 280 152V136C280 131.58 283.58 128 288 128H352C356.42 128 360 131.58 360 136V152C360 156.42 356.42 160 352 160zM608 384H32C14.33 384 0 369.67 0 352V32C0 14.33 14.33 0 32 0H608C625.67 0 640 14.33 640 32V352C640 369.67 625.67 384 608 384zM48 48V112C83.35 112 112 83.35 112 48H48zM48 272V336H112C112 300.65 83.35 272 48 272zM320 80C266.98 80 224 130.15 224 192C224 253.86 266.98 304 320 304S416 253.86 416 192C416 130.13 373 80 320 80zM592 48H528C528 83.35 556.65 112 592 112V48zM592 272C556.65 272 528 300.65 528 336H592V272z" />
+    <glyph glyph-name="money-bill-wave-alt"
+      unicode="&#xF53B;"
+      horiz-adv-x="640" d=" M621.16 393.54C582.37 409.81 543.55 416 504.75 416C381.58 416.01 258.42 353.66 135.25 353.66C104.36 353.66 73.49 357.58 42.6 367.38C39.13 368.48 35.65 369 32.25 369C15.04 369 0 355.68 0 337.19V19.93C0 7.3 7.23 -4.67 18.84 -9.53C57.63 -25.81 96.45 -32 135.25 -32C258.42 -32 381.5900000000001 30.35 504.76 30.35C535.65 30.35 566.52 26.43 597.41 16.63C600.88 15.53 604.36 15.01 607.76 15.01C624.97 15.01 640.01 28.33 640.01 46.82V364.07C640 376.71 632.77 388.67 621.16 393.54zM320 96C275.81 96 240 138.99 240 192C240 245.02 275.82 288 320 288S400 245.02 400 192C400 138.97 364.17 96 320 96z" />
+    <glyph glyph-name="money-bill-wave"
+      unicode="&#xF53A;"
+      horiz-adv-x="640" d=" M621.16 393.54C582.37 409.81 543.55 416 504.75 416C381.58 416.01 258.42 353.66 135.25 353.66C104.36 353.66 73.49 357.58 42.6 367.38C39.13 368.48 35.65 369 32.25 369C15.04 369 0 355.68 0 337.19V19.93C0 7.3 7.23 -4.67 18.84 -9.53C57.63 -25.81 96.45 -32 135.25 -32C258.42 -32 381.5900000000001 30.35 504.76 30.35C535.65 30.35 566.52 26.43 597.41 16.63C600.88 15.53 604.36 15.01 607.76 15.01C624.97 15.01 640.01 28.33 640.01 46.82V364.07C640 376.71 632.77 388.67 621.16 393.54zM48 315.78C68.12 310.74 89.12 308.2100000000001 110.72 306.85C104.84 277.4600000000001 79 255.31 48 255.31V315.78zM48 30.78V78.56C82.37 78.56 110.18 51.29 111.71 17.16C89.18 18.97 68.12 23.47 48 30.78zM320 96C275.81 96 240 138.99 240 192C240 245.02 275.82 288 320 288S400 245.02 400 192C400 138.97 364.17 96 320 96zM592 68.22C574.48 72.61 556.29 75.0700000000001 537.68 76.66C543.55 102.74 565.18 122.54 592 125.9400000000001V68.22zM592 304.3300000000001C561.11 308.24 537.14 334.0300000000001 536.19 365.8800000000001C555.73 363.7100000000001 574.2800000000001 359.6500000000001 592 353.2200000000001V304.3300000000001z" />
+    <glyph glyph-name="money-bill"
+      unicode="&#xF0D6;"
+      horiz-adv-x="640" d=" M608 384H32C14.33 384 0 369.67 0 352V32C0 14.33 14.33 0 32 0H608C625.67 0 640 14.33 640 32V352C640 369.67 625.67 384 608 384zM48 48V112C83.35 112 112 83.35 112 48H48zM48 272V336H112C112 300.65 83.35 272 48 272zM320 96C275.81 96 240 138.99 240 192C240 245.02 275.82 288 320 288S400 245.02 400 192C400 138.97 364.17 96 320 96zM592 48H528C528 83.35 556.65 112 592 112V48zM592 272C556.65 272 528 300.65 528 336H592V272z" />
+    <glyph glyph-name="money-check-alt"
+      unicode="&#xF53D;"
+      horiz-adv-x="640" d=" M608 416H32C14.33 416 0 401.67 0 384V0C0 -17.67 14.33 -32 32 -32H608C625.67 -32 640 -17.67 640 0V384C640 401.67 625.67 416 608 416zM176 120.12V104C176 99.58 172.42 96 168 96H152C147.58 96 144 99.58 144 104V120.29C132.71 120.87 121.73 124.81 112.63 131.6400000000001C108.73 134.5700000000001 108.53 140.41 112.06 143.78L123.81 154.99C126.58 157.63 130.7 157.75 133.94 155.72C137.81 153.3 142.2 152 146.76 152H174.87C181.37 152 186.67 157.92 186.67 165.19C186.67 171.14 183.06 176.38 177.9 177.92L132.9 191.42C114.31 197 101.32 214.84 101.32 234.81C101.32 259.3300000000001 120.37 279.25 143.99 279.88V296C143.99 300.42 147.57 304 151.99 304H167.99C172.41 304 175.99 300.42 175.99 296V279.7100000000001C187.28 279.13 198.26 275.2000000000001 207.36 268.36C211.26 265.43 211.46 259.5900000000001 207.93 256.2200000000001L196.18 245.01C193.41 242.3700000000001 189.29 242.2500000000001 186.05 244.2800000000001C182.18 246.7100000000001 177.79 248.0000000000001 173.23 248.0000000000001H145.12C138.62 248.0000000000001 133.32 242.0800000000001 133.32 234.8100000000001C133.32 228.8600000000001 136.93 223.62 142.09 222.0800000000001L187.09 208.5800000000001C205.68 203 218.67 185.16 218.67 165.1900000000001C218.67 140.6600000000001 199.62 120.7500000000001 176 120.1200000000001zM416 136C416 131.58 412.42 128 408 128H296C291.58 128 288 131.58 288 136V152C288 156.42 291.58 160 296 160H408C412.42 160 416 156.42 416 152V136zM576 136C576 131.58 572.42 128 568 128H488C483.58 128 480 131.58 480 136V152C480 156.42 483.58 160 488 160H568C572.42 160 576 156.42 576 152V136zM576 232C576 227.58 572.42 224 568 224H296C291.58 224 288 227.58 288 232V248C288 252.42 291.58 256 296 256H568C572.42 256 576 252.42 576 248V232z" />
+    <glyph glyph-name="money-check"
+      unicode="&#xF53C;"
+      horiz-adv-x="640" d=" M0 0C0 -17.67 14.33 -32 32 -32H608C625.67 -32 640 -17.67 640 0V320H0V0zM448 208C448 216.84 455.16 224 464 224H560C568.84 224 576 216.84 576 208V176C576 167.16 568.84 160 560 160H464C455.16 160 448 167.16 448 176V208zM448 88C448 92.42 451.58 96 456 96H568C572.42 96 576 92.42 576 88V72C576 67.58 572.42 64 568 64H456C451.58 64 448 67.58 448 72V88zM64 184C64 188.42 67.58 192 72 192H376C380.42 192 384 188.42 384 184V168C384 163.58 380.42 160 376 160H72C67.58 160 64 163.58 64 168V184zM64 88C64 92.42 67.58 96 72 96H248C252.42 96 256 92.42 256 88V72C256 67.58 252.42 64 248 64H72C67.58 64 64 67.58 64 72V88zM624 416H16C7.16 416 0 408.8400000000001 0 400V352H640V400C640 408.8400000000001 632.84 416 624 416z" />
+    <glyph glyph-name="moon"
+      unicode="&#xF186;"
+      horiz-adv-x="512" d=" M283.211 -64C362.173 -64 434.29 -28.075 482.068 30.792C489.136 39.5000000000001 481.429 52.222 470.506 50.1420000000001C346.303 26.4880000000001 232.244 121.7180000000001 232.244 247.0960000000001C232.244 319.3180000000001 270.906 385.7310000000001 333.742 421.4900000000001C343.428 427.0020000000001 340.992 441.6870000000001 329.986 443.7200000000001A258.156 258.156 0 0 1 283.211 448C141.902 448 27.211 333.4890000000001 27.211 192C27.211 50.691 141.722 -64 283.211 -64z" />
+    <glyph glyph-name="motorcycle"
+      unicode="&#xF21C;"
+      horiz-adv-x="640" d=" M512.949 255.997C498.0869999999999 256.105 483.809 253.675 470.515 249.123L437.589 304H520C533.255 304 544 314.745 544 328V360C544 373.255 533.255 384 520 384H474.689A24 24 0 0 1 456.85 376.055L419.3540000000001 334.392L396.5800000000001 372.348A24 24 0 0 1 376 384H296C287.163 384 280 376.837 280 368V352C280 343.163 287.163 336 296 336H362.411L381.611 304H227.904C210.177 327.073 182.98 344 128 344H72.54C59.085 344 47.749 332.9890000000001 48.004 319.536C48.252 306.495 58.9 296 72 296H128C152.504 296 166.686 285.081 175.787 271.231L164.496 250.702C151.49 254.567 137.625 256.438 123.245 255.912C55.857 253.451 1.565 198.395 0.034 130.979C-1.603 58.924 56.317 0 128 0C187.642 0 237.744 40.794 251.953 96H336.189C349.862 96 360.778 107.421 360.165 121.077C358.0470000000001 168.197 377.687 214.742 416.35 246.103L428.8350000000001 225.295C401.189 201.641 383.7380000000001 166.415 384.004 127.116C384.4740000000001 57.56 441.207 0.664 510.762 0.006C582.391 -0.672 640.601 57.493 639.996 129.105C639.408 198.696 582.5409999999999 255.491 512.949 255.997zM128 48C83.888 48 48 83.888 48 128S83.888 208 128 208C132.242 208 136.405 207.659 140.469 207.018L98.97 131.566C90.187 115.593 101.762 96 120 96H201.297C188.927 67.775 160.737 48 128 48zM516.351 48.116C470.272 45.663 432 82.446 432 128C432 149.363 440.4340000000001 168.781 454.125 183.144L503.537 100.792C508.083 93.215 517.912 90.758 525.489 95.304L539.2090000000001 103.5360000000001C546.7860000000001 108.0820000000001 549.243 117.9110000000001 544.6970000000001 125.4880000000001L496.1410000000001 206.4150000000001A80.005 80.005 0 0 0 512 208C557.554 208 594.338 169.727 591.884 123.648C589.724 83.09 556.91 50.276 516.351 48.116z" />
+    <glyph glyph-name="mouse-pointer"
+      unicode="&#xF245;"
+      horiz-adv-x="320" d=" M302.189 118.874H196.105L251.936 -17.119C255.825 -26.547 251.381 -37.118 242.492 -41.118L193.327 -62.545C184.162 -66.5450000000001 173.884 -61.974 169.995 -52.831L116.942 76.305L30.278 -12.8330000000001C18.729 -24.71 0 -15.554 0 0.023V429.701C0 446.101 19.921 454.096 30.277 442.557L314.689 150.0150000000001C326.161 138.8360000000001 317.696 118.874 302.189 118.874z" />
+    <glyph glyph-name="music"
+      unicode="&#xF001;"
+      horiz-adv-x="512" d=" M470.4 446.5L166.4 350.5C153.1 346.3 144 334 144 320V55.4C129.9 60.8 113.5 64 96 64C43 64 0 35.3 0 0S43 -64 96 -64S192 -35.3 192 0V227.5L464 313.4V119.4C449.9 124.8 433.5 128 416 128C363 128 320 99.3 320 64S363 0 416 0S512 28.7 512 64V416C512 437.7 490.9 453 470.4 446.5z" />
+    <glyph glyph-name="neuter"
+      unicode="&#xF22C;"
+      horiz-adv-x="288" d=" M288 272C288 351.5 223.5 416 144 416S0 351.5 0 272C0 203.5 47.9 146.1 112 131.6V-20C112 -26.6 117.4 -32 124 -32H164C170.6 -32 176 -26.6 176 -20V131.6C240.1 146.1 288 203.5 288 272zM144 192C99.9 192 64 227.9 64 272S99.9 352 144 352S224 316.1 224 272S188.1 192 144 192z" />
+    <glyph glyph-name="newspaper"
+      unicode="&#xF1EA;"
+      horiz-adv-x="576" d=" M552 384H88C74.745 384 64 373.255 64 360V352H24C10.745 352 0 341.255 0 328V56C0 25.072 25.072 0 56 0H528C554.51 0 576 21.49 576 48V360C576 373.255 565.255 384 552 384zM56 48A8 8 0 0 0 48 56V304H64V56A8 8 0 0 0 56 48zM292 64H140C133.373 64 128 69.373 128 76V84C128 90.627 133.373 96 140 96H292C298.627 96 304 90.627 304 84V76C304 69.373 298.627 64 292 64zM500 64H348C341.373 64 336 69.373 336 76V84C336 90.627 341.373 96 348 96H500C506.627 96 512 90.627 512 84V76C512 69.373 506.627 64 500 64zM292 160H140C133.373 160 128 165.373 128 172V180C128 186.627 133.373 192 140 192H292C298.627 192 304 186.627 304 180V172C304 165.373 298.627 160 292 160zM500 160H348C341.373 160 336 165.373 336 172V180C336 186.627 341.373 192 348 192H500C506.627 192 512 186.627 512 180V172C512 165.373 506.627 160 500 160zM500 256H140C133.373 256 128 261.373 128 268V308C128 314.627 133.373 320 140 320H500C506.627 320 512 314.627 512 308V268C512 261.373 506.627 256 500 256z" />
+    <glyph glyph-name="not-equal"
+      unicode="&#xF53E;"
+      horiz-adv-x="448" d=" M416 240C433.67 240 448 254.33 448 272V304C448 321.67 433.67 336 416 336H392.12L443.99 402.81C449.36 409.83 448.0300000000001 419.87 441.02 425.24L415.61 444.7C408.5900000000001 450.08 398.55 448.74 393.17 441.73L311.09 336H32C14.33 336 0 321.67 0 304V272C0 254.33 14.33 240 32 240H236.56L162.03 144H32C14.33 144 0 129.67 0 112V80C0 62.33 14.33 48 32 48H87.49L35.62 -18.81C30.25 -25.82 31.58 -35.86 38.59 -41.24L64 -60.7C71.02 -66.08 81.06 -64.74 86.43 -57.73L168.52 48H416C433.67 48 448 62.33 448 80V112C448 129.67 433.67 144 416 144H243.05L317.5800000000001 240H416z" />
+    <glyph glyph-name="notes-medical"
+      unicode="&#xF481;"
+      horiz-adv-x="384" d=" M336 384H256C256 419.3 227.3 448 192 448S128 419.3 128 384H48C21.5 384 0 362.5 0 336V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V336C384 362.5 362.5 384 336 384zM192 408C205.3 408 216 397.3 216 384S205.3 360 192 360S168 370.7 168 384S178.7 408 192 408zM288 104C288 99.6 284.4 96 280 96H224V40C224 35.6 220.4 32 216 32H168C163.6 32 160 35.6 160 40V96H104C99.6 96 96 99.6 96 104V152C96 156.4 99.6 160 104 160H160V216C160 220.4 163.6 224 168 224H216C220.4 224 224 220.4 224 216V160H280C284.4 160 288 156.4 288 152V104zM288 296C288 291.6 284.4 288 280 288H104C99.6 288 96 291.6 96 296V312C96 316.4 99.6 320 104 320H280C284.4 320 288 316.4 288 312V296z" />
+    <glyph glyph-name="object-group"
+      unicode="&#xF247;"
+      horiz-adv-x="512" d=" M480 320V352H500C506.627 352 512 357.373 512 364V404C512 410.627 506.627 416 500 416H460C453.373 416 448 410.627 448 404V384H64V404C64 410.627 58.627 416 52 416H12C5.373 416 0 410.627 0 404V364C0 357.373 5.373 352 12 352H32V32H12C5.373 32 0 26.627 0 20V-20C0 -26.627 5.373 -32 12 -32H52C58.627 -32 64 -26.627 64 -20V0H448V-20C448 -26.627 453.373 -32 460 -32H500C506.627 -32 512 -26.627 512 -20V20C512 26.627 506.627 32 500 32H480V320zM96 172V308C96 314.627 101.373 320 108 320H276C282.627 320 288 314.627 288 308V172C288 165.373 282.627 160 276 160H108C101.373 160 96 165.373 96 172zM416 76C416 69.373 410.627 64 404 64H236C229.373 64 224 69.373 224 76V128H296C309.255 128 320 138.745 320 152V224H404C410.627 224 416 218.627 416 212V76z" />
+    <glyph glyph-name="object-ungroup"
+      unicode="&#xF248;"
+      horiz-adv-x="576" d=" M64 128V102A6 6 0 0 0 58 96H6A6 6 0 0 0 0 102V154A6 6 0 0 0 6 160H32V352H6A6 6 0 0 0 0 358V410A6 6 0 0 0 6 416H58A6 6 0 0 0 64 410V384H352V410A6 6 0 0 0 358 416H410A6 6 0 0 0 416 410V358A6 6 0 0 0 410 352H384V160H410A6 6 0 0 0 416 154V102A6 6 0 0 0 410 96H358A6 6 0 0 0 352 102V128H64zM544 192V224H570A6 6 0 0 1 576 230V282A6 6 0 0 1 570 288H518A6 6 0 0 1 512 282V256H408V184H416C429.255 184 440 173.255 440 160V96C440 82.745 429.255 72 416 72H352C338.745 72 328 82.745 328 96V104H192V32H166A6 6 0 0 1 160 26V-26A6 6 0 0 1 166 -32H218A6 6 0 0 1 224 -26V0H512V-26A6 6 0 0 1 518 -32H570A6 6 0 0 1 576 -26V26A6 6 0 0 1 570 32H544V192z" />
+    <glyph glyph-name="outdent"
+      unicode="&#xF03B;"
+      horiz-adv-x="448" d=" M0 364V404C0 412.837 7.163 420 16 420H432C440.837 420 448 412.837 448 404V364C448 355.163 440.837 348 432 348H16C7.163 348 0 355.163 0 364zM208 220H432C440.837 220 448 227.163 448 236V276C448 284.837 440.837 292 432 292H208C199.163 292 192 284.837 192 276V236C192 227.163 199.163 220 208 220zM16 -36H432C440.837 -36 448 -28.837 448 -20V20C448 28.837 440.837 36 432 36H16C7.163 36 0 28.837 0 20V-20C0 -28.837 7.163 -36 16 -36zM208 92H432C440.837 92 448 99.163 448 108V148C448 156.837 440.837 164 432 164H208C199.163 164 192 156.837 192 148V108C192 99.163 199.163 92 208 92zM4.687 180.687L100.687 84.703C110.734 74.652 128 81.776 128 96.016V287.992C128 302.3210000000001 110.675 309.296 100.687 299.305L4.687 203.313C-1.562 197.065 -1.562 186.935 4.687 180.687z" />
+    <glyph glyph-name="paint-brush"
+      unicode="&#xF1FC;"
+      horiz-adv-x="512" d=" M269.9 83.4C271.3 77 272 70.4 272 63.7C272 -17.5 217.8 -64 137.2 -64C41.5 -64 0 12.9 0 100.4C10.4 93.3 46.9 63.9 58.7 63.9C65.7 63.9 71.7 67.9 74.2 74.5C97.8 136.7 140.7 151 187.1 151.9C202.7 118.1 233.2 92.3 269.9000000000001 83.4zM460.6 448C446.2000000000001 448 432.7000000000001 441.6 422.4000000000001 432.3C228.2 258 208 253.9 208 202.6C208 153.8 248.5 112 298.2 112C357.2 112 391.4 155.4 498.8 356.8C505.8 370.5 511.9999999999999 385.3 511.9999999999999 400.7C512 428.3 487.3 448 460.6 448z" />
+    <glyph glyph-name="palette"
+      unicode="&#xF53F;"
+      horiz-adv-x="512" d=" M204.3 443C104.9 423.6 24.8 343.7 5.2 244.6C-31.8 57.6 136.9 -81.7999999999999 264 -62.1C305.2 -55.7 325.4 -7.5 306.5 29.6C283.4 74.9999999999999 316.4 128 367.4 128H447.1C482.9 128 511.9 157.6 512 193.3C511.5 350.9 368.1 474.9 204.3 443zM96 128C78.3 128 64 142.3 64 160S78.3 192 96 192S128 177.7 128 160S113.7 128 96 128zM128 256C110.3 256 96 270.3 96 288S110.3 320 128 320S160 305.7 160 288S145.7 256 128 256zM256 320C238.3 320 224 334.3 224 352S238.3 384 256 384S288 369.7 288 352S273.7 320 256 320zM384 256C366.3 256 352 270.3 352 288S366.3 320 384 320S416 305.7 416 288S401.7 256 384 256z" />
+    <glyph glyph-name="pallet"
+      unicode="&#xF482;"
+      horiz-adv-x="640" d=" M144 192H496C504.8 192 512 199.2 512 208V432C512 440.8 504.8 448 496 448H384V320L320 352L256 320V448H144C135.2 448 128 440.8 128 432V208C128 199.2 135.2 192 144 192zM624 64C632.8 64 640 71.2 640 80V112C640 120.8 632.8 128 624 128H16C7.2 128 0 120.8 0 112V80C0 71.2 7.2 64 16 64H64V0H16C7.2 0 0 -7.2 0 -16V-48C0 -56.8 7.2 -64 16 -64H624C632.8 -64 640 -56.8 640 -48V-16C640 -7.2 632.8 0 624 0H576V64H624zM288 0H128V64H288V0zM512 0H352V64H512V0z" />
+    <glyph glyph-name="paper-plane"
+      unicode="&#xF1D8;"
+      horiz-adv-x="512" d=" M476 444.8L12.5 177.4C-5.6 167 -3.3 141.8 14.7 134.2L121 89.6L408.3 342.8C413.8 347.7000000000001 421.6 340.2000000000001 416.9000000000001 334.5L176 41V-39.5C176 -63.1 204.5 -72.4 218.5 -55.3L282 22L406.6 -30.2C420.8 -36.2 437 -27.3 439.6 -12L511.6 420C515 440.2 493.3 454.8 476 444.8z" />
+    <glyph glyph-name="paperclip"
+      unicode="&#xF0C6;"
+      horiz-adv-x="448" d=" M43.246 -18.142C-15.184 42.147 -14.095 139.369 44.632 199.439L254.392 414C298.708 459.332 370.743 459.336 415.063 414C458.953 369.106 459.006 296.671 415.063 251.724L232.214 64.872C202.359 34.335 153.581 34.761 124.232 65.87C95.957 95.84 96.864 143.343 125.684 172.823L269.427 319.658C275.6090000000001 325.972 285.7390000000001 326.08 292.053 319.899L314.914 297.52C321.229 291.338 321.336 281.208 315.155 274.894L171.427 128.073C166.495 123.028 166.191 114.645 170.779 109.781C175.151 105.1469999999999 182.024 105.0699999999999 186.467 109.6159999999999L369.316 296.467C388.929 316.529 388.929 349.1919999999999 369.305 369.265C350.116 388.892 319.348 388.902 300.151 369.265L90.39 154.705C55.627 119.145 55.091 61.585 89.199 26.392C123.209 -8.701 178.184 -8.745 212.257 26.106L384.317 202.105C390.4940000000001 208.424 400.624 208.538 406.943 202.361L429.82 179.997C436.139 173.82 436.254 163.69 430.076 157.3710000000001L258.016 -18.627C198.44 -79.5649999999999 102.073 -78.843 43.246 -18.1419999999999z" />
+    <glyph glyph-name="parachute-box"
+      unicode="&#xF4CD;"
+      horiz-adv-x="512" d=" M511.9 273C502.8 348.6 433.5 405.4 353.6 431.7C390 392.3 416 331.1 416 256H444.1L327.5 126.5C325 127.1 322.7 128 320 128H272V256H384C384 371.2 315.1 448 256 448S128 371.2 128 256H240V128H192C189.3 128 187 127.1 184.5 126.5L67.9 256H96C96 331.1 122 392.3 158.4 431.7C78.5 405.3 9.2 348.5 0.1 273C-1 263.9 6.9 256 16.1 256H24.8L161.5 104.1C160.8 101.5 159.9 98.9 159.9 96V-32C159.9 -49.7 174.2 -64 191.9 -64H319.9C337.6 -64 351.9 -49.7 351.9 -32V96C351.9 98.9 351 101.4 350.3 104.1L487.1 256H495.8C505.1 256 513 263.8 511.9 273z" />
+    <glyph glyph-name="paragraph"
+      unicode="&#xF1DD;"
+      horiz-adv-x="448" d=" M408 416H177.531C88.948 416 16.045 344.665 16 256.082C15.956 167.679 87.607 96 176 96V-8C176 -21.255 186.745 -32 200 -32H232C245.255 -32 256 -21.255 256 -8V336H288V-8C288 -21.255 298.745 -32 312 -32H344C357.255 -32 368 -21.255 368 -8V336H408C421.255 336 432 346.745 432 360V392C432 405.255 421.255 416 408 416z" />
+    <glyph glyph-name="parking"
+      unicode="&#xF540;"
+      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM240 128H192V80C192 71.2 184.8 64 176 64H144C135.2 64 128 71.2 128 80V304C128 312.8 135.2 320 144 320H240C292.9 320 336 276.9 336 224S292.9 128 240 128zM240 256H192V192H240C257.6 192 272 206.4 272 224S257.6 256 240 256z" />
+    <glyph glyph-name="paste"
+      unicode="&#xF0EA;"
+      horiz-adv-x="448" d=" M128 264C128 294.879 153.122 320 184 320H320V392C320 405.255 309.255 416 296 416H215.39C204.306 435.11 183.637 448 160 448S115.694 435.11 104.61 416H24C10.745 416 0 405.255 0 392V56C0 42.745 10.745 32 24 32H128V264zM160 408C173.255 408 184 397.255 184 384S173.255 360 160 360S136 370.745 136 384S146.745 408 160 408zM344 160H448V-40C448 -53.255 437.255 -64 424 -64H184C170.745 -64 160 -53.255 160 -40V264C160 277.255 170.745 288 184 288H320V184C320 170.8 330.8 160 344 160zM448 198.059V192H352V288H358.0590000000001A24 24 0 0 0 375.029 280.971L440.9700000000001 215.03A24.002000000000002 24.002000000000002 0 0 0 448 198.059z" />
+    <glyph glyph-name="pause-circle"
+      unicode="&#xF28B;"
+      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM240 112C240 103.2 232.8 96 224 96H176C167.2 96 160 103.2 160 112V272C160 280.8 167.2 288 176 288H224C232.8 288 240 280.8 240 272V112zM352 112C352 103.2 344.8 96 336 96H288C279.2 96 272 103.2 272 112V272C272 280.8 279.2 288 288 288H336C344.8 288 352 280.8 352 272V112z" />
+    <glyph glyph-name="pause"
+      unicode="&#xF04C;"
+      horiz-adv-x="448" d=" M144 -31H48C21.5 -31 0 -9.5 0 17V369C0 395.5 21.5 417 48 417H144C170.5 417 192 395.5 192 369V17C192 -9.5 170.5 -31 144 -31zM448 17V369C448 395.5 426.5 417 400 417H304C277.5 417 256 395.5 256 369V17C256 -9.5 277.5 -31 304 -31H400C426.5 -31 448 -9.5 448 17z" />
+    <glyph glyph-name="paw"
+      unicode="&#xF1B0;"
+      horiz-adv-x="512" d=" M85.231 117.042C36 117.042 0 174.208 0 216.5C0 244.792 16 274.5420000000001 49.538 274.5420000000001C98.769 274.5420000000001 134.769 217.084 134.769 174.792C134.769 146.5 119.077 117.042 85.231 117.042zM433.231 10.875C433.231 -26.167 401.231 -32 369.846 -32C328.615 -32 295.384 -5.75 256 -5.75C214.769 -5.75 179.692 -31.708 135.077 -31.708C105.23 -31.708 78.769 -22.083 78.769 10.875C78.769 80 180.616 182.667 256 182.667S433.231 79.708 433.231 10.875zM182.462 244.208C132.615 244.208 102.462 303.708 102.462 344.541C102.462 377.208 120.308 416 160 416C210.154 416 240 356.5 240 315.6670000000001C240 283 222.154 244.208 182.462 244.208zM272 315.6670000000001C272 356.5 301.846 416 352 416C391.692 416 409.539 377.208 409.539 344.5420000000001C409.539 303.709 379.385 244.209 329.538 244.209C289.846 244.208 272 283 272 315.6670000000001zM512 216.5C512 174.208 476 117.042 426.769 117.042C392.9220000000001 117.042 377.231 146.5 377.231 174.792C377.231 217.083 413.23 274.5420000000001 462.462 274.5420000000001C496 274.5420000000001 512 244.792 512 216.5z" />
+    <glyph glyph-name="pen-square"
+      unicode="&#xF14B;"
+      horiz-adv-x="448" d=" M400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368V16C448 -10.5 426.5 -32 400 -32zM238.1 270.1L102.4 134.4L96.1 77.3C95.3 69.6999999999999 101.7 63.1999999999999 109.4 63.9999999999999L166.5 70.3L302.2 206C304.5 208.3 304.5 212.1 302.2 214.5L246.7 270C244.2 272.4 240.4 272.4 238.1 270.1zM345 282.9L314.9 313C305.5 322.4 290.3 322.4 281 313L257.9 289.9C255.6 287.6 255.6 283.8 257.9 281.4L313.4 225.9C315.7 223.6 319.5 223.6 321.9 225.9L345 249C354.3 258.3 354.3 273.5 345 282.9z" />
+    <glyph glyph-name="pencil-alt"
+      unicode="&#xF303;"
+      horiz-adv-x="512" d=" M497.9 305.9L451.8 259.8C447.1 255.1 439.5 255.1 434.8 259.8L323.8 370.8C319.1 375.5 319.1 383.1 323.8 387.8L369.9 433.9000000000001C388.6 452.6 419 452.6 437.8 433.9000000000001L497.9 373.8C516.6999999999999 355.1 516.6999999999999 324.7000000000001 497.9 305.9zM284.2 348.2L21.6 85.6L0.4 -35.9C-2.5 -52.3 11.8 -66.5 28.2 -63.7L149.7 -42.4L412.3 220.2000000000001C417 224.9 417 232.5000000000001 412.3 237.2000000000001L301.3 348.2000000000001C296.5 352.9000000000001 288.9000000000001 352.9000000000001 284.2 348.2000000000001zM124.1 108.1C118.6 113.6 118.6 122.4 124.1 127.9L278.1 281.9000000000001C283.6 287.4000000000001 292.4000000000001 287.4000000000001 297.9000000000001 281.9000000000001S303.4000000000001 267.6 297.9000000000001 262.1L143.9 108.1C138.4 102.6 129.6 102.6 124.1 108.1zM88 24H136V-12.3L71.5 -23.6L40.4 7.5L51.7 72H88V24z" />
+    <glyph glyph-name="people-carry"
+      unicode="&#xF4CE;"
+      horiz-adv-x="640" d=" M128 352C154.5 352 176 373.5 176 400S154.5 448 128 448S80 426.5 80 400S101.5 352 128 352zM512 352C538.5 352 560 373.5 560 400S538.5 448 512 448S464 426.5 464 400S485.5 352 512 352zM637.7 -20.1L593.7 89.9L552.6 43.5L550.6 25.3L578.3000000000001 -43.9C583.3000000000001 -56.4 595.3000000000001 -64 608.0000000000001 -64C612.0000000000001 -64 616.0000000000001 -63.3 619.9000000000001 -61.7C636.3000000000001 -55.1 644.3000000000001 -36.5 637.7 -20.1zM603.5 189.7L585 269.9C580.4 289.9 566.4 306.7 547.5 314.8C529 322.8 508.5 321.5 491.4 311.5C468.7 298.1 451.7 277 443.3 252.1L432 218.2L416 208V304C416 312.8 408.8 320 400 320H240C231.2 320 224 312.8 224 304V208L207.9 218.2L196.6 252.1C188.3 277.1 171.2 298.1 148.5 311.5C131.3 321.5 110.9 322.8 92.4 314.8C73.5 306.7000000000001 59.5 289.9 54.9 269.9L36.5 189.7C31.9 169.7 37.2 148.5 50.9 133L118.1 57.1L128.2 -35.5C130 -51.8 143.8 -64 160 -64C161.2 -64 162.3 -63.9 163.5 -63.8C181.1 -61.9 193.7 -46.1 191.8 -28.5L181.7 64.3C180.2 77.3 174.8 89.4 166.1 99.3L122.8 148.3L140.4 218.6L147.2000000000001 198.2C151.3000000000001 185.7000000000001 159.1000000000001 174.8 171.7000000000001 165.6L222.8000000000001 133.1C227.4000000000001 130.2000000000001 234.9000000000001 128.5 240.0000000000001 128.1H400C405.1 128.5 412.6 130.2000000000001 417.2 133.1L468.3 165.6C480.9 174.8 488.7 185.6 492.8 198.2L499.6 218.6L517.2 148.3L473.9 99.3C465.2 89.4 459.8 77.3 458.3 64.3L448.2 -28.5C446.3 -46.1 459 -61.9 476.5 -63.8C477.7 -63.9 478.8 -64 480 -64C496.1 -64 510 -51.9 511.8 -35.5L521.9 57.1L589.1 133C602.7 148.5 608.1 169.7 603.5 189.7zM46.3 89.9L2.3 -20.1C-4.3 -36.5 3.7 -55.1 20.1 -61.7C36.9 -68.3000000000001 55.2 -60.0000000000001 61.7 -43.9L89.4 25.3L87.4 43.4999999999999L46.3 89.8999999999999z" />
+    <glyph glyph-name="percent"
+      unicode="&#xF295;"
+      horiz-adv-x="448" d=" M112 224C173.9 224 224 274.1 224 336S173.9 448 112 448S0 397.9 0 336S50.1 224 112 224zM112 384C138.5 384 160 362.5 160 336S138.5 288 112 288S64 309.5 64 336S85.5 384 112 384zM336 160C274.1 160 224 109.9 224 48S274.1 -64 336 -64S448 -13.9 448 48S397.9 160 336 160zM336 0C309.5 0 288 21.5 288 48S309.5 96 336 96S384 74.5 384 48S362.5 0 336 0zM392.3 447.8L423.9000000000001 447.9C443.3 448 454.8 426.1 443.6 410.1L77.4 -53.6A23.95 23.95 0 0 0 57.8 -63.8L24.4 -63.9C4.9 -63.9 -6.5 -42.0000000000001 4.7 -26.1L372.7 437.6C377.2 444 384.5 447.8 392.3 447.8z" />
+    <glyph glyph-name="percentage"
+      unicode="&#xF541;"
+      horiz-adv-x="384" d=" M109.25 274.75C134.24 299.74 134.24 340.27 109.25 365.26C84.26 390.25 43.73 390.25 18.74 365.26C-6.25 340.27 -6.25 299.74 18.74 274.75C43.74 249.75 84.26 249.75 109.25 274.75zM365.25 109.26C340.26 134.25 299.73 134.25 274.74 109.26C249.75 84.27 249.75 43.74 274.74 18.75C299.73 -6.24 340.26 -6.24 365.25 18.75C390.25 43.74 390.25 84.26 365.25 109.26zM363.31 340.69L340.69 363.31C328.19 375.81 307.93 375.81 295.44 363.31L20.69 88.56C8.19 76.06 8.19 55.8 20.69 43.31L43.31 20.69C55.81 8.19 76.07 8.19 88.56 20.69L363.31 295.44C375.81 307.93 375.81 328.19 363.31 340.69z" />
+    <glyph glyph-name="phone-slash"
+      unicode="&#xF3DD;"
+      horiz-adv-x="640" d=" M268.2 66.6L218.6 127.2000000000001C211.8 135.5000000000001 200.4 138.3000000000001 190.6 134.1L78.6 86.1C67.9 81.5 62.1 70 64.7 58.6L88.7 -45.4C91.2 -56.2 100.8 -64 112.1 -64C212.8 -64 305.8 -31.6 381.8 22.9L301.8 84.7C290.9 78.2 279.7 72 268.2 66.6zM633.8 -10.1L475.1 112.5C537.9 191.6 576 291.1 576 400C576 411.2 568.3 420.9 557.4 423.4L453.4 447.4C442.1 450 430.5 444.1 425.9 433.5L377.9 321.5C373.7 311.7 376.5 300.2 384.8 293.5L445.4 243.9C433.2 217.8 417.5 193.6 399.4 171.1L45.5 444.6C38.5 450 28.5 448.8 23 441.8L3.4 416.6C-2 409.6 -0.8 399.6 6.2 394.2L594.6 -60.5C601.6 -65.9 611.6 -64.7 617.1 -57.7L636.7 -32.4C642.1 -25.6 640.8000000000001 -15.5 633.8000000000001 -10.1z" />
+    <glyph glyph-name="phone-square"
+      unicode="&#xF098;"
+      horiz-adv-x="448" d=" M400 416H48C21.49 416 0 394.51 0 368V16C0 -10.51 21.49 -32 48 -32H400C426.51 -32 448 -10.51 448 16V368C448 394.51 426.51 416 400 416zM94 32C86.967 32 80.943 36.873 79.384 43.627L64.386 108.627A15 15 0 0 0 73.093 125.787L143.091 155.7860000000001A15 15 0 0 0 160.609 151.4970000000001L191.606 113.6120000000001C240.55 136.5750000000001 279.903 176.4700000000001 302.387 224.3920000000001L264.501 255.3890000000001A15.000999999999998 15.000999999999998 0 0 0 260.212 272.9070000000001L290.212 342.9050000000001A15 15 0 0 0 307.372 351.6120000000001L372.372 336.6140000000001A14.997000000000002 14.997000000000002 0 0 0 384 322C384 161.708 254.055 32 94 32z" />
+    <glyph glyph-name="phone-volume"
+      unicode="&#xF2A0;"
+      horiz-adv-x="384" d=" M97.333 -58.966C-32.541 70.908 -32.348 281.286 97.333 410.967C103.031 416.665 111.86 417.599 118.596 413.389L183.413 372.876A17.187 17.187 0 0 0 190.262 351.918L157.854 270.897A17.188 17.188 0 0 0 140.185 260.178L84.375 265.7580000000001C63.324 207.497 63.763 143.287 84.375 86.2430000000001L140.186 91.8240000000001A17.188 17.188 0 0 0 157.855 81.1050000000001L190.263 0.0830000000001A17.188 17.188 0 0 0 183.414 -20.8749999999999L118.597 -61.3879999999999A17.19 17.19 0 0 0 97.333 -58.9659999999998zM247.126 352.527C258.9580000000001 332.48 258.9580000000001 307.519 247.126 287.472C243.176 280.779 234.018 279.513 228.408 284.891L222.433 290.617C218.522 294.365 217.64 300.239 220.172 305.027A32.063 32.063 0 0 1 220.172 334.972C217.6390000000001 339.76 218.522 345.634 222.433 349.382L228.408 355.108C234.0180000000001 360.486 243.176 359.22 247.126 352.527zM338.913 443.714C399.053 372.11 399.005 267.832 338.913 196.286C334.439 190.959 326.3830000000001 190.54 321.361 195.353L315.563 200.91C311.003 205.281 310.586 212.439 314.633 217.289C364.32 276.827 364.279 363.222 314.633 422.711C310.586 427.561 311.002 434.719 315.563 439.09L321.361 444.647C326.383 449.46 334.439 449.041 338.913 443.714zM292.9410000000001 398.773C328.9910000000001 352.451 329.0490000000001 287.624 292.9410000000001 241.227C288.5510000000001 235.586 280.2440000000001 234.976 275.0850000000001 239.923L269.2670000000001 245.502C264.8670000000001 249.721 264.2690000000001 256.597 267.9820000000001 261.433C294.5180000000001 295.997 294.516 344.005 267.9820000000001 378.567C264.269 383.403 264.867 390.278 269.2670000000001 394.4980000000001L275.0850000000001 400.077C280.2440000000001 405.024 288.5510000000001 404.414 292.9410000000001 398.773z" />
+    <glyph glyph-name="phone"
+      unicode="&#xF095;"
+      horiz-adv-x="512" d=" M493.4 423.4L389.4 447.4C378.1 450 366.5 444.1 361.9 433.5L313.9 321.5C309.7 311.7 312.5 300.2 320.8 293.5L381.4 243.9C345.4 167.2 282.5 103.4 204.2 66.7000000000001L154.6 127.3000000000001C147.8 135.6000000000001 136.4 138.4000000000001 126.6 134.2000000000001L14.6 86.2000000000001C3.9 81.5 -2 69.9 0.6 58.6L24.6 -45.4C27.1 -56.2 36.7 -64 48 -64C304.1 -64 512 143.5 512 400C512 411.2 504.3 420.9 493.4 423.4z" />
+    <glyph glyph-name="piggy-bank"
+      unicode="&#xF4D3;"
+      horiz-adv-x="576" d=" M560 224H530.5C521.7 244 508.9 261.7 493.1 276.5L512 352H480C450.6 352 424.6 338.5 407 317.7C399.4 318.8 391.9 320 384 320H256C178.6 320 114.1 265 99.2 192H56C41.2 192 29.5 205.5 32.5 220.8C34.7 232.2 45.4 240 57 240H58C61.3 240 64 242.7 64 246V266C64 269.3 61.3 272 58 272C29.5 272 4.1 251.6 0.5 223.4C-3.9 189.2 22.7 160 56 160H96C96 107.8 121.4 61.9 160 32.7V-48C160 -56.8 167.2 -64 176 -64H240C248.8 -64 256 -56.8 256 -48V0H384V-48C384 -56.8 391.2 -64 400 -64H464C472.8 -64 480 -56.8 480 -48V32.7C491.8 41.6 502.3 52.1 511.3 64H560C568.8 64 576 71.2 576 80V208C576 216.8 568.8 224 560 224zM432 160C423.2 160 416 167.2 416 176S423.2 192 432 192S448 184.8 448 176S440.8 160 432 160zM256 352H384C389.4 352 394.7 351.6 399.9 351.2C399.9 351.5 400 351.7 400 352C400 405 357 448 304 448S208 405 208 352C208 349.9 208.5 347.9 208.6 345.8C223.8 349.7 239.6 352 256 352z" />
+    <glyph glyph-name="pills"
+      unicode="&#xF484;"
+      horiz-adv-x="576" d=" M112 416C50.1 416 0 365.9 0 304V80C0 18.1 50.1 -32 112 -32S224 18.1 224 80V304C224 365.9 173.9 416 112 416zM160 192H64V304C64 330.5 85.5 352 112 352S160 330.5 160 304V192zM299.7 221.7C296.2 225.2 290.3 224.8 287.4 220.9C242.1 158.4 247 70.8 303.3 14.5C359.6 -41.8 447.2 -46.7 509.6999999999999 -1.4C513.6999999999999 1.5 513.9999999999999 7.4 510.4999999999999 10.9L299.7 221.7zM529.5 240.7C473.2 297 385.6 301.9 323.1 256.6C319.1 253.7 318.8 247.8 322.3 244.3L533.1 33.5C536.6 30 542.5 30.4 545.4 34.3C590.6999999999999 96.9 585.9 184.4 529.5 240.7z" />
+    <glyph glyph-name="plane"
+      unicode="&#xF072;"
+      horiz-adv-x="576" d=" M480 256H365.71L260.61 439.94A16.014 16.014 0 0 1 246.71 448H181.21C170.58 448 162.91 437.83 165.83 427.61L214.86 256H112L68.8 313.6C65.78 317.63 61.03 320 56 320H16.01C5.6 320 -2.04 310.2200000000001 0.49 300.12L32 192L0.49 83.88C-2.04 73.78 5.6 64 16.01 64H56C61.04 64 65.78 66.37 68.8 70.4L112 128H214.86L165.83 -43.6C162.91 -53.82 170.58 -64 181.21 -64H246.71C252.45 -64 257.75 -60.92 260.6 -55.94L365.71 128H480C515.35 128 576 156.65 576 192S515.35 256 480 256z" />
+    <glyph glyph-name="play-circle"
+      unicode="&#xF144;"
+      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM371.7 168L195.7 67C179.9 58.2 160 69.5 160 88V296C160 314.4 179.8 325.8 195.7 317L371.7 210C388.1 200.8 388.1 177.1 371.7 168z" />
+    <glyph glyph-name="play"
+      unicode="&#xF04B;"
+      horiz-adv-x="448" d=" M424.4 233.3L72.4 441.4C43.8 458.3 0 441.9 0 400.1V-16C0 -53.5 40.7 -76.1 72.4 -57.3L424.4 150.7C455.8 169.2 455.9 214.8 424.4 233.3z" />
+    <glyph glyph-name="plug"
+      unicode="&#xF1E6;"
+      horiz-adv-x="384" d=" M256 304V416C256 433.673 270.327 448 288 448S320 433.673 320 416V304H256zM368 288H16C7.163 288 0 280.837 0 272V240C0 231.163 7.163 224 16 224H32V192C32 114.594 86.969 50.029 160 35.204V-64H224V35.204C297.031 50.029 352 114.594 352 192V224H368C376.837 224 384 231.163 384 240V272C384 280.837 376.837 288 368 288zM128 304V416C128 433.673 113.673 448 96 448S64 433.673 64 416V304H128z" />
+    <glyph glyph-name="plus-circle"
+      unicode="&#xF055;"
+      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM400 164C400 157.4 394.6 152 388 152H296V60C296 53.4 290.6 48 284 48H228C221.4 48 216 53.4 216 60V152H124C117.4 152 112 157.4 112 164V220C112 226.6 117.4 232 124 232H216V324C216 330.6 221.4 336 228 336H284C290.6 336 296 330.6 296 324V232H388C394.6 232 400 226.6 400 220V164z" />
+    <glyph glyph-name="plus-square"
+      unicode="&#xF0FE;"
+      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM368 164C368 157.4 362.6 152 356 152H264V60C264 53.4 258.6 48 252 48H196C189.4 48 184 53.4 184 60V152H92C85.4 152 80 157.4 80 164V220C80 226.6 85.4 232 92 232H184V324C184 330.6 189.4 336 196 336H252C258.6 336 264 330.6 264 324V232H356C362.6 232 368 226.6 368 220V164z" />
+    <glyph glyph-name="plus"
+      unicode="&#xF067;"
+      horiz-adv-x="448" d=" M416 240H272V384C272 401.67 257.67 416 240 416H208C190.33 416 176 401.67 176 384V240H32C14.33 240 0 225.67 0 208V176C0 158.33 14.33 144 32 144H176V0C176 -17.67 190.33 -32 208 -32H240C257.67 -32 272 -17.67 272 0V144H416C433.67 144 448 158.33 448 176V208C448 225.67 433.67 240 416 240z" />
+    <glyph glyph-name="podcast"
+      unicode="&#xF2CE;"
+      horiz-adv-x="448" d=" M267.429 -40.563C262.286 -59.573 242.858 -64 224 -64C205.143 -64 185.714 -59.573 180.572 -40.563C172.927 -12.134 160 59.102 160 92.25C160 127.406 191.142 136 224 136S288 127.406 288 92.25C288 59.301 275.129 -11.929 267.429 -40.563zM156.867 159.446C138.174 177.754 126.909 203.619 128.083 232.045C130.137 281.769 170.478 322.0010000000001 220.207 323.9260000000001C274.862 326.0420000000001 320 282.193 320 228C320 201.173 308.936 176.884 291.134 159.448C288.459 156.828 288.733 152.462 291.762 150.261C301.074 143.496 308.222 134.918 312.996 124.898C314.737 121.244 319.493 120.238 322.445 123.007C351.271 150.05 368.998 188.79 367.956 231.572C366.101 307.778 304.361 369.78 228.163 371.9409999999999C146.869 374.247 80 308.785 80 228C80 186.639 97.532 149.3 125.55 123.011C128.503 120.24 133.261 121.241 135.003 124.898C139.777 134.919 146.926 143.496 156.238 150.261C159.267 152.461 159.542 156.827 156.867 159.446zM224 448C100.204 448 0 347.815 0 224C0 134.008 52.602 58.353 125.739 22.592C130.072 20.474 135.006 24.136 134.274 28.902C131.892 44.414 129.932 59.848 128.868 73.241C128.722 75.077 127.719 76.727 126.19 77.753C78.79 109.559 47.626 163.769 48.003 225.1C48.595 321.337 127.293 399.748 223.532 399.999C320.793 400.253 400 321.203 400 224C400 162.068 367.842 107.51 319.35 76.133C318.351 62.0960000000001 316.281 45.545 313.726 28.903C312.994 24.136 317.929 20.474 322.261 22.593C395.227 58.273 448 133.813 448 224C448 347.795 347.815 448 224 448zM224 288C188.654 288 160 259.346 160 224S188.654 160 224 160S288 188.654 288 224S259.346 288 224 288z" />
+    <glyph glyph-name="poo"
+      unicode="&#xF2FE;"
+      horiz-adv-x="512" d=" M451.4 78.9C468.7 92 480 112.6 480 136C480 175.8 447.8 208 408 208H393.9C407.3 219.7 416 236.8 416 256C416 291.3 387.3 320 352 320H346.1C349.7000000000001 330.1 352 340.7 352 352C352 405 309 448 256 448C250.8 448 245.8 447.3 240.9 446.5C250.3 433.4 256 417.4 256 400C256 355.8 220.2 320 176 320H160C124.7 320 96 291.3 96 256C96 236.8 104.7 219.7 118.1 208H104C64.2 208 32 175.8 32 136C32 112.6 43.3 92 60.6 78.9C26.3 73.4 0 43.9 0 8C0 -31.8 32.2 -64 72 -64H440C479.8 -64 512 -31.8 512 8C512 43.9 485.7 73.4 451.4 78.9zM192 192C209.7 192 224 177.7 224 160S209.7 128 192 128S160 142.3 160 160S174.3 192 192 192zM351.5 53C341 25.1 293 0 256 0S171 25.1 160.5 53C158.5 58.3 162.5 64 168.3 64H343.7000000000001C349.5000000000001 64 353.5000000000001 58.3 351.5000000000001 53zM320 128C302.3 128 288 142.3 288 160S302.3 192 320 192S352 177.7 352 160S337.7 128 320 128z" />
+    <glyph glyph-name="portrait"
+      unicode="&#xF3E0;"
+      horiz-adv-x="384" d=" M336 448H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V400C384 426.5 362.5 448 336 448zM192 320C227.3 320 256 291.3 256 256S227.3 192 192 192S128 220.7 128 256S156.7 320 192 320zM304 83.2C304 72.6 294 64 281.6 64H102.4C90 64 80 72.6 80 83.2V102.4C80 134.2 110.1 160 147.2 160H152.2C164.5 154.9 177.9 152 192 152S219.6 154.9 231.8 160H236.8C273.9000000000001 160 304 134.2 304 102.4V83.2z" />
+    <glyph glyph-name="pound-sign"
+      unicode="&#xF154;"
+      horiz-adv-x="320" d=" M308 96H262.505C255.878 96 250.505 90.627 250.505 84V33.152H128V160H212C218.627 160 224 165.373 224 172V212C224 218.627 218.627 224 212 224H128V287.556C128 319.822 152.562 344.642 189.792 344.642C213.45 344.642 235.67 333.137 247.444 325.793C252.5950000000001 322.58 259.332 323.742 263.132 328.478L291.625 363.991C295.858 369.267 294.904 376.996 289.506 381.072C273.124 393.44 236.576 416 187.931 416C106.026 416 48 363.258 48 290.039V224H20C13.373 224 8 218.627 8 212V172C8 165.373 13.373 160 20 160H48V32H12C5.373 32 0 26.627 0 20V-20C0 -26.627 5.373 -32 12 -32H308C314.627 -32 320 -26.627 320 -20V84C320 90.627 314.627 96 308 96z" />
+    <glyph glyph-name="power-off"
+      unicode="&#xF011;"
+      horiz-adv-x="512" d=" M400 393.9C463 348.9 504 275.3 504 192C504 55.2 393.2 -55.7 256.5 -56C120 -56.3 8.2 55 8 191.6C7.9 274.9 48.9 348.7 111.8 393.8C123.5 402.1 139.8 398.6 146.8 386.1L162.6 358C168.5 347.5 165.7 334.2 156 327C114.5 296.2 88 247.4 88 192.1C87.9 99.8 162.5 24 256 24C347.6 24 424.6 98.2 424 193.1C423.7 244.9 399.3 294.9 355.9 327.1C346.2 334.3 343.5 347.6 349.4 358L365.2 386.1C372.2 398.5 388.4 402.2 400 393.9zM296 184V424C296 437.3 285.3 448 272 448H240C226.7 448 216 437.3 216 424V184C216 170.7 226.7 160 240 160H272C285.3 160 296 170.7 296 184z" />
+    <glyph glyph-name="prescription-bottle-alt"
+      unicode="&#xF486;"
+      horiz-adv-x="384" d=" M360 448H24C10.8 448 0 437.2 0 424V376C0 362.8 10.8 352 24 352H360C373.2 352 384 362.8 384 376V424C384 437.2 373.2 448 360 448zM32 -32C32 -49.6 46.4 -64 64 -64H320C337.6 -64 352 -49.6 352 -32V320H32V-32zM96 152C96 156.4 99.6 160 104 160H160V216C160 220.4 163.6 224 168 224H216C220.4 224 224 220.4 224 216V160H280C284.4 160 288 156.4 288 152V104C288 99.6 284.4 96 280 96H224V40C224 35.6 220.4 32 216 32H168C163.6 32 160 35.6 160 40V96H104C99.6 96 96 99.6 96 104V152z" />
+    <glyph glyph-name="prescription-bottle"
+      unicode="&#xF485;"
+      horiz-adv-x="384" d=" M32 256H152C156.4 256 160 252.4 160 248V232C160 227.6 156.4 224 152 224H32V160H152C156.4 160 160 156.4 160 152V136C160 131.6 156.4 128 152 128H32V64H152C156.4 64 160 60.4 160 56V40C160 35.6 156.4 32 152 32H32V-32C32 -49.6 46.4 -64 64 -64H320C337.6 -64 352 -49.6 352 -32V320H32V256zM360 448H24C10.8 448 0 437.2 0 424V376C0 362.8 10.8 352 24 352H360C373.2 352 384 362.8 384 376V424C384 437.2 373.2 448 360 448z" />
+    <glyph glyph-name="print"
+      unicode="&#xF02F;"
+      horiz-adv-x="512" d=" M464 256H448V366.059A24 24 0 0 1 440.971 383.029L383.029 440.971A24 24 0 0 1 366.0590000000001 448H88C74.745 448 64 437.255 64 424V256H48C21.49 256 0 234.51 0 208V76C0 69.373 5.373 64 12 64H64V-40C64 -53.255 74.745 -64 88 -64H424C437.255 -64 448 -53.255 448 -40V64H500C506.627 64 512 69.373 512 76V208C512 234.51 490.51 256 464 256zM384 0H128V96H384V0zM128 224V384H320V344C320 330.8 330.8 320 344 320H384V224H128zM432 152C418.746 152 408 162.746 408 176S418.746 200 432 200S456 189.254 456 176S445.254 152 432 152z" />
+    <glyph glyph-name="procedures"
+      unicode="&#xF487;"
+      horiz-adv-x="640" d=" M528 224H272C263.2 224 256 216.8 256 208V64H64V304C64 312.8 56.8 320 48 320H16C7.2 320 0 312.8 0 304V-48C0 -56.8 7.2 -64 16 -64H48C56.8 -64 64 -56.8 64 -48V0H576V-48C576 -56.8 583.2 -64 592 -64H624C632.8 -64 640 -56.8 640 -48V112C640 173.9 589.9 224 528 224zM136 352H262.1L289.7000000000001 296.8C295.6 285 312.4000000000001 285 318.3000000000001 296.8L368 396.2L390.1 352H512C520.8 352 528 359.2 528 368S520.8 384 512 384H409.9L382.3 439.2C376.4 451 359.6 451 353.7 439.2L304 339.8L284.1 379.6C282.7000000000001 382.3 280 384 276.9000000000001 384H136C131.6 384 128 380.4 128 376V360C128 355.6 131.6 352 136 352zM160 96C195.3 96 224 124.7 224 160S195.3 224 160 224S96 195.3 96 160S124.7 96 160 96z" />
+    <glyph glyph-name="project-diagram"
+      unicode="&#xF542;"
+      horiz-adv-x="640" d=" M384 128H256C238.33 128 224 113.67 224 96V-32C224 -49.67 238.33 -64 256 -64H384C401.67 -64 416 -49.67 416 -32V96C416 113.67 401.67 128 384 128zM192 416C192 433.67 177.67 448 160 448H32C14.33 448 0 433.67 0 416V288C0 270.33 14.33 256 32 256H127.72L200.88 127.96C211.98 147.02 232.4 160 256 160H256.28L192 272.49V320H416V384H192V416zM608 448H480C462.33 448 448 433.67 448 416V288C448 270.33 462.33 256 480 256H608C625.67 256 640 270.3300000000001 640 288V416C640 433.67 625.67 448 608 448z" />
+    <glyph glyph-name="puzzle-piece"
+      unicode="&#xF12E;"
+      horiz-adv-x="576" d=" M519.442 159.349C477.923 159.349 459.942 127.756 437.384 127.756C377.409 127.756 432 304 432 304S235.712 224 235.712 307.2970000000001C235.712 343.124 272 353.5470000000001 272 393.282C272 428.784 243.885 448 210.539 448C175.885 448 144.173 429.109 144.173 391.654C144.173 350.29 175.884 332.377 175.884 309.904C175.885 240.281 0 281.242 0 281.242V-51.995S178.635 -93.042 178.635 -23.333C178.635 -0.86 138.635 16.774 138.635 58.138C138.635 95.594 167.885 114.484 202.212 114.484C235.885 114.484 264 95.268 264 59.767C264 20.032 227.712 9.609 227.712 -26.218C227.712 -87.021 357.387 -51.948 408.942 -51.948C408.942 -51.948 374.217 68.153 434.769 68.153C470.731 68.153 481.192 32.001 521.077 32.001C556.712 32 576 60.01 576 93.557C576 127.756 557.038 159.3490000000001 519.442 159.3490000000001z" />
+    <glyph glyph-name="qrcode"
+      unicode="&#xF029;"
+      horiz-adv-x="448" d=" M0 224H192V416H0V224zM64 352H128V288H64V352zM256 416V224H448V416H256zM384 288H320V352H384V288zM0 -32H192V160H0V-32zM64 96H128V32H64V96zM416 160H448V32H352V64H320V-32H256V160H352V128H416V160zM416 0H448V-32H416V0zM352 0H384V-32H352V0z" />
+    <glyph glyph-name="question-circle"
+      unicode="&#xF059;"
+      horiz-adv-x="512" d=" M504 192C504 55.003 392.957 -56 256 -56S8 55.003 8 192C8 328.9170000000001 119.043 440 256 440S504 328.9170000000001 504 192zM262.655 358C208.158 358 173.4 335.043 146.106 294.242C142.57 288.956 143.753 281.827 148.821 277.984L183.52 251.674C188.725 247.727 196.141 248.666 200.185 253.796C218.049 276.454 230.298 289.593 257.488 289.593C277.9169999999999 289.593 303.1859999999999 276.445 303.1859999999999 256.635C303.1859999999999 241.659 290.8229999999999 233.968 270.652 222.659C247.128 209.472 216 193.059 216 152V148C216 141.373 221.373 136 228 136H284C290.627 136 296 141.373 296 148V149.333C296 177.795 379.1860000000001 178.98 379.1860000000001 256C379.1860000000001 314.0020000000001 319.021 358 262.6550000000001 358zM256 110C230.635 110 210 89.365 210 64C210 38.636 230.635 18 256 18S302 38.636 302 64C302 89.365 281.365 110 256 110z" />
+    <glyph glyph-name="question"
+      unicode="&#xF128;"
+      horiz-adv-x="384" d=" M202.021 448C122.202 448 70.503 415.2970000000001 29.914 356.974C22.551 346.394 24.821 331.8880000000001 35.092 324.1L78.23 291.391C88.603 283.526 103.362 285.365 111.483 295.539C136.532 326.92 155.113 344.988 194.24 344.988C225.004 344.988 263.0560000000001 325.189 263.0560000000001 295.357C263.0560000000001 272.805 244.4390000000001 261.223 214.0630000000001 244.193C178.6400000000001 224.333 131.7640000000001 199.617 131.7640000000001 137.788V128C131.7640000000001 114.745 142.5090000000001 104 155.7640000000001 104H228.2350000000001C241.4900000000001 104 252.2350000000001 114.745 252.2350000000001 128V133.773C252.2350000000001 176.6330000000001 377.5030000000001 178.418 377.5030000000001 294.4000000000001C377.504 381.7440000000001 286.902 448 202.021 448zM192 74.541C153.804 74.541 122.729 43.466 122.729 5.27C122.729 -32.925 153.804 -64 192 -64S261.271 -32.925 261.271 5.271S230.1960000000001 74.541 192 74.541z" />
+    <glyph glyph-name="quidditch"
+      unicode="&#xF458;"
+      horiz-adv-x="640" d=" M256.5 231.2L343.2 122S326.6 19.6 266.6 -28.1C206.7 -75.7999999999999 0 -62.2 0 -62.2S3.8 -39.1 11 -6.8L105.6 105.4C109.6 110.1 104.7 117 99 114.9L38.6 92.8C53 134.5 71.3 172.8 93.2 190.3C153.1 238.1 256.5 231.2 256.5 231.2zM494.5 96.2C450.5 96.2 414.7 60.4 414.7 16.3C414.7 -27.8000000000001 450.4 -63.6 494.5 -63.6C538.6 -63.6 574.3 -27.8 574.3 16.3C574.3 60.4999999999999 538.5 96.1999999999999 494.4999999999999 96.1999999999999zM636.5 417L616.7 442C611.2 448.9 601.2 450 594.3000000000001 444.6L361.8 266.7L327.7 309.7C322.6 316.1 312.6 314.9 309.1 307.5L283.8 252.9L370.5 143.7L429.3 156.1C437.3 157.8 440.7 167.3 435.6 173.7L401.5 216.6L634 394.5C640.9 400 642 410.1 636.5 417z" />
+    <glyph glyph-name="quote-left"
+      unicode="&#xF10D;"
+      horiz-adv-x="512" d=" M464 192H384V256C384 291.3 412.7 320 448 320H456C469.3 320 480 330.7 480 344V392C480 405.3 469.3 416 456 416H448C359.6 416 288 344.4 288 256V16C288 -10.5 309.5 -32 336 -32H464C490.5 -32 512 -10.5 512 16V144C512 170.5 490.5 192 464 192zM176 192H96V256C96 291.3 124.7 320 160 320H168C181.3 320 192 330.7 192 344V392C192 405.3 181.3 416 168 416H160C71.6 416 0 344.4 0 256V16C0 -10.5 21.5 -32 48 -32H176C202.5 -32 224 -10.5 224 16V144C224 170.5 202.5 192 176 192z" />
+    <glyph glyph-name="quote-right"
+      unicode="&#xF10E;"
+      horiz-adv-x="512" d=" M464 416H336C309.5 416 288 394.5 288 368V240C288 213.5 309.5 192 336 192H416V128C416 92.7 387.3 64 352 64H344C330.7 64 320 53.3 320 40V-8C320 -21.3 330.7 -32 344 -32H352C440.4 -32 512 39.6 512 128V368C512 394.5 490.5 416 464 416zM176 416H48C21.5 416 0 394.5 0 368V240C0 213.5 21.5 192 48 192H128V128C128 92.7 99.3 64 64 64H56C42.7 64 32 53.3 32 40V-8C32 -21.3 42.7 -32 56 -32H64C152.4 -32 224 39.6 224 128V368C224 394.5 202.5 416 176 416z" />
+    <glyph glyph-name="random"
+      unicode="&#xF074;"
+      horiz-adv-x="512" d=" M504.971 88.971C514.344 79.598 514.344 64.402 504.971 55.03L424.971 -24.954C409.961 -39.964 384 -29.444 384 -7.983V32H325.2150000000001A12.004 12.004 0 0 0 316.442 35.812L245.886 111.408L299.2190000000001 168.5510000000001L352 112H384V151.981C384 173.419 409.943 183.979 424.971 168.952L504.971 88.971zM12 272H96L148.781 215.449L202.114 272.592L131.558 348.188A11.999000000000002 11.999000000000002 0 0 1 122.785 352H12C5.373 352 0 346.627 0 340V284C0 277.373 5.373 272 12 272zM384 272V232.016C384 210.556 409.961 200.036 424.971 215.045L504.971 295.029C514.344 304.402 514.344 319.598 504.971 328.9700000000001L424.971 408.951C409.943 423.979 384 413.418 384 391.981V352H325.2150000000001A12.004 12.004 0 0 1 316.442 348.188L96 112H12C5.373 112 0 106.627 0 100V44C0 37.373 5.373 32 12 32H122.785C126.111 32 129.288 33.381 131.558 35.812L352 272H384z" />
+    <glyph glyph-name="receipt"
+      unicode="&#xF543;"
+      horiz-adv-x="384" d=" M358.4 444.8L320 400L265.6 444.8A15.9 15.9 0 0 1 246.4000000000001 444.8L192 400L137.6 444.8A15.9 15.9 0 0 1 118.4 444.8L64 400L25.6 444.8C15 452.7 0 445.2 0 432V-48C0 -61.2 15 -68.7 25.6 -60.8L64 -16L118.4 -60.8A15.9 15.9 0 0 1 137.6 -60.8L192 -16L246.4 -60.8A15.9 15.9 0 0 1 265.6 -60.8L320 -16L358.4 -60.8C368.9 -68.7 384 -61.2 384 -48V432C384 445.2 369 452.7 358.4 444.8zM320 88C320 83.6 316.4 80 312 80H72C67.6 80 64 83.6 64 88V104C64 108.4 67.6 112 72 112H312C316.4 112 320 108.4 320 104V88zM320 184C320 179.6 316.4 176 312 176H72C67.6 176 64 179.6 64 184V200C64 204.4 67.6 208 72 208H312C316.4 208 320 204.4 320 200V184zM320 280C320 275.6 316.4 272 312 272H72C67.6 272 64 275.6 64 280V296C64 300.4 67.6 304 72 304H312C316.4 304 320 300.4 320 296V280z" />
+    <glyph glyph-name="recycle"
+      unicode="&#xF1B8;"
+      horiz-adv-x="512" d=" M184.561 186.097C187.793 172.1 172.438 161.462 160.493 168.929L119.757 194.384L68.89 112.982C55.606 91.727 70.96 64 96.012 64H148C154.627 64 160 58.627 160 52V12C160 5.373 154.627 0 148 0H96.115C20.781 0 -25.187 83.048 14.707 146.88L65.529 228.268L24.804 253.716C12.723 261.2630000000001 15.838 279.677 29.683 282.874L139.92 308.324C148.531 310.312 157.121 304.943 159.109 296.334L184.561 186.097zM283.122 369.012L324.411 302.936L283.671 277.479C271.62 269.951 274.671 251.526 288.55 248.321L398.7870000000001 222.871C407.4590000000001 220.872 416.002 226.309 417.9760000000001 234.861L443.4260000000001 345.098C446.6230000000001 358.942 431.4360000000001 369.817 419.3580000000001 362.266L378.6710000000001 336.842L337.4080000000001 402.924C299.8870000000001 462.957 212.1990000000001 463.095 174.5920000000001 402.924L156.6290000000001 374.158C153.1190000000001 368.538 154.8290000000001 361.137 160.4490000000001 357.625L194.3680000000001 336.43C199.9880000000001 332.918 207.3920000000001 334.627 210.9040000000001 340.247L228.8650000000001 368.99C241.5770000000001 389.331 270.8380000000001 388.666 283.1220000000001 369.012zM497.288 146.88L469.773 190.945C466.262 196.568 458.857 198.279 453.235 194.766L419.374 173.607C413.754 170.095 412.0440000000001 162.692 415.5560000000001 157.071L443.1200000000001 112.959C456.3770000000001 91.7479999999999 441.0630000000001 63.999 415.9840000000001 63.999H320V111.98C320 126.1930000000001 302.758 133.363 292.687 123.293L212.687 43.312C206.438 37.064 206.438 26.933 212.687 20.685L292.687 -59.304C302.689 -69.308 320 -62.3 320 -47.989V0H415.88C491.154 0 537.215 82.997 497.288 146.88z" />
+    <glyph glyph-name="redo-alt"
+      unicode="&#xF2F9;"
+      horiz-adv-x="512" d=" M256.455 440C322.724 439.881 382.892 413.767 427.314 371.315L463.029 407.03C478.149 422.149 504 411.4410000000001 504 390.059V256C504 242.745 493.255 232 480 232H345.941C324.559 232 313.851 257.851 328.97 272.971L370.72 314.721C339.856 343.62 299.919 359.628 257.49 359.9940000000001C165.092 360.7920000000001 87.207 286.017 88.0059999999999 190.552C88.764 99.991 162.184 24 256 24C297.127 24 335.997 38.678 366.629 65.556C371.372 69.717 378.5350000000001 69.464 382.997 65.003L422.659 25.341C427.531 20.469 427.29 12.526 422.177 7.908C378.202 -31.813 319.926 -56 256 -56C119.034 -56 8.001 55.033 8 191.998C7.999 328.807 119.646 440.245 256.455 440z" />
+    <glyph glyph-name="redo"
+      unicode="&#xF01E;"
+      horiz-adv-x="512.333" d=" M500.333 448H452.922C446.069 448 440.608 442.271 440.9360000000001 435.426L444.9020000000001 352.6670000000001C399.416 406.101 331.6720000000001 440 256.001 440C119.34 440 7.899 328.474 8 191.813C8.101 54.932 119.096 -56 256 -56C319.926 -56 378.202 -31.813 422.178 7.908C427.291 12.526 427.532 20.469 422.6600000000001 25.341L388.689 59.312C384.223 63.778 377.0490000000001 64.029 372.3090000000001 59.855C341.308 32.552 300.606 16 256 16C158.733 16 80 94.716 80 192C80 289.267 158.716 368 256 368C316.892 368 370.506 337.142 402.099 290.2L300.574 295.065C293.729 295.3930000000001 288 289.932 288 283.079V235.668C288 229.041 293.373 223.668 300 223.668H500.333C506.96 223.668 512.333 229.041 512.333 235.668V436C512.333 442.627 506.96 448 500.333 448z" />
+    <glyph glyph-name="registered"
+      unicode="&#xF25D;"
+      horiz-adv-x="512" d=" M285.363 240.525C285.363 221.925 275.532 212.094 256.932 212.094H227.056V268.234H250.4340000000001C279.1020000000001 268.234 285.3630000000001 259.461 285.3630000000001 240.525zM504 192C504 55.033 392.967 -56 256 -56S8 55.033 8 192S119.033 440 256 440S504 328.967 504 192zM363.411 87.586C316.682 172.411 320.112 166.222 318.709 168.566C342.141 183.7380000000001 356.654 211.545 356.654 243.052C356.654 297.2960000000001 325.154 332.3040000000001 251.156 332.3040000000001H180.489C167.234 332.3040000000001 156.489 321.5590000000001 156.489 308.3040000000001V76C156.489 62.745 167.234 52 180.489 52H203.056C216.311 52 227.056 62.745 227.056 76V147.663H252.612L296.7410000000001 64.726A24.001000000000005 24.001000000000005 0 0 1 317.9290000000001 51.999H342.3930000000001C360.6540000000001 52 372.2220000000001 71.59 363.4110000000001 87.586z" />
+    <glyph glyph-name="reply-all"
+      unicode="&#xF122;"
+      horiz-adv-x="576" d=" M136.309 258.164L312.313 410.149C327.7200000000001 423.454 352 412.652 352 391.985V309.222C481.182 298.991 576 257.01 576 125.674C576 64.233 536.418 3.365 492.667 -28.458C479.014 -38.389 459.556 -25.925 464.59 -9.827C503.102 113.335 460.668 159.655 352 172.188V88.013C352 67.312 327.7 56.56 312.313 69.849L136.309 221.836C125.238 231.397 125.223 248.589 136.309 258.164zM8.309 221.836L184.313 69.85C199.7 56.561 224 67.313 224 88.014V103.832L115.394 197.617A55.96 55.96 0 0 0 96 240.002A55.95300000000001 55.95300000000001 0 0 0 115.393 282.382L224 376.168V391.985C224 412.652 199.72 423.454 184.313 410.149L8.309 258.164C-2.777 248.589 -2.762 231.397 8.309 221.836z" />
+    <glyph glyph-name="reply"
+      unicode="&#xF3E5;"
+      horiz-adv-x="512" d=" M8.309 258.164L184.313 410.149C199.719 423.454 224 412.653 224 391.985V311.932C384.629 310.093 512 277.9000000000001 512 125.674C512 64.233 472.419 3.365 428.6670000000001 -28.458C415.014 -38.389 395.5560000000001 -25.925 400.5900000000001 -9.827C445.9340000000001 135.185 379.0830000000001 173.683 224 175.915V88C224 67.3 199.7 56.547 184.3130000000001 69.836L8.3090000000001 221.836C-2.7619999999999 231.398 -2.7769999999999 248.589 8.3090000000001 258.164z" />
+    <glyph glyph-name="retweet"
+      unicode="&#xF079;"
+      horiz-adv-x="640" d=" M629.657 104.402L528.971 3.716C519.598 -5.656 504.403 -5.656 495.03 3.716L394.343 104.402C384.9700000000001 113.775 384.9700000000001 128.971 394.343 138.343L405.166 149.166C414.728 158.728 430.299 158.5059999999999 439.585 148.6739999999999L480 105.882V288H292.451A24.005 24.005 0 0 0 275.48 295.029L259.48 311.029C244.361 326.149 255.069 352 276.451 352H520C533.255 352 544 341.255 544 328V105.882L584.4159999999999 148.674C593.7009999999999 158.505 609.2719999999999 158.728 618.8349999999999 149.166L629.6579999999999 138.343C639.0299999999999 128.971 639.0299999999999 113.774 629.6569999999999 104.402zM364.5190000000001 88.971A23.999000000000002 23.999000000000002 0 0 1 347.548 96H160V278.1190000000001L200.416 235.327C209.702 225.496 225.272 225.273 234.835 234.836L245.657 245.658C255.03 255.031 255.03 270.227 245.657 279.599L144.971 380.284C135.598 389.657 120.402 389.657 111.03 380.284L10.343 279.598C0.97 270.225 0.97 255.029 10.343 245.657L21.165 234.835C30.727 225.273 46.298 225.495 55.584 235.326L96 278.1190000000001V56C96 42.745 106.745 32 120 32H363.549C384.931 32 395.639 57.851 380.52 72.971L364.519 88.971z" />
+    <glyph glyph-name="ribbon"
+      unicode="&#xF4D6;"
+      horiz-adv-x="448" d=" M6.1 3.7C-3.5 -7.1 -1.4 -23.9 10.6 -32L79.4 -59.9C89.3 -66.6 102.7 -64.9 110.7 -56.1L202.5 45.8000000000001L123.3 133.7000000000001L6.1 3.7zM441.9000000000001 3.7S149.9 328.3 146.5000000000001 333.8C161.9000000000001 342.2000000000001 186.7000000000001 351.7000000000001 224.0000000000001 351.7000000000001S286.1000000000001 342.2000000000001 301.5000000000001 333.8C298.2000000000001 328.2000000000001 245.5000000000001 269.2000000000001 245.5000000000001 269.2000000000001L324.6 181.5L358.8 219.5C387.5 251.4 392.1 298.1 370.2 335L326.5 408.5C322.2 415.7 316.6 421.8 309.7 426.5C269 454.1 182.3 456.2 138.3 426.5C131.4 421.8 125.8 415.7 121.5 408.5L77.9 335.3C76.4 332.8 40.8 273.1 89.4 219.3L337.5 -56C345.5 -64.9 358.9 -66.5 368.8 -59.8L437.6 -31.9C449.5 -23.9 451.6 -7.1 441.9000000000001 3.7z" />
+    <glyph glyph-name="road"
+      unicode="&#xF018;"
+      horiz-adv-x="576" d=" M567.3 64.4L429.9 369.8C426 378.5 417.4 384 408 384H311.9L313.8 365.2C314.5 358.1 309 352 301.9 352H274C266.9 352 261.3 358.2 262.1 365.2L264 384H168C158.6 384 150 378.5 146.1 369.8L8.7 64.4C3.2 52.2 0 38.4 0 24C0 10.7 10.7 0 24 0H237.6C230.5 0 224.9 6.2 225.7 13.2L236.5 117.2C237.1 123.3 242.3 128 248.4 128H327.6C333.7000000000001 128 338.9000000000001 123.4 339.5 117.2L350.3 13.2C351 6.1 345.5 0 338.4000000000001 0H552C565.2 0 576 10.7 576 24C576 37.9 573 51.7 567.3 64.4zM254.7 293.2L258 325.2C258.6 331.3 263.8 336 269.9 336H306.1C312.2 336 317.4 331.4 318 325.2L321.3 293.2C322 286.1 316.5 280 309.4 280H266.6C259.5 280 253.9 286.2 254.7 293.2zM321.8 160H254.2C247.1 160 241.5000000000001 166.2 242.3 173.2L249.7 245.2C250.3 251.3 255.5000000000001 256 261.6 256H314.3C320.4000000000001 256 325.6 251.4 326.2 245.2L333.6 173.2C334.5 166.2 328.9 160 321.8 160z" />
+    <glyph glyph-name="robot"
+      unicode="&#xF544;"
+      horiz-adv-x="640" d=" M0 192V64C0 46.3 14.3 32 32 32H64V224H32C14.3 224 0 209.7 0 192zM464 352H352V416C352 433.7 337.7 448 320 448S288 433.7 288 416V352H176C131.8 352 96 316.2 96 272V0C96 -35.3 124.7 -64 160 -64H480C515.3 -64 544 -35.3 544 0V272C544 316.2 508.2 352 464 352zM256 32H192V64H256V32zM224 152C201.9 152 184 169.9 184 192S201.9 232 224 232S264 214.1 264 192S246.1 152 224 152zM352 32H288V64H352V32zM448 32H384V64H448V32zM416 152C393.9 152 376 169.9 376 192S393.9 232 416 232S456 214.1 456 192S438.1 152 416 152zM608 224H576V32H608C625.7 32 640 46.3 640 64V192C640 209.7 625.7 224 608 224z" />
+    <glyph glyph-name="rocket"
+      unicode="&#xF135;"
+      horiz-adv-x="512" d=" M505.1 428.9C503.8 435 499 439.8 492.9 441.1C460.7 448 435.5 448 410.4 448C307.2 448 245.3 392.8 199.1 320H94.9C76.7 320 60.1 309.7 52 293.5L2.6 194.7C-5.4 178.7 6.2 160 24.1 160H119.2C113.3 147.2 107.3 134.5 101.2 122.3C98.1 116.1 99.3 108.7 104.2 103.8L167.8 40.2C172.7 35.3 180.1 34.1 186.3 37.2C198.5 43.3 211.2 49.2 224 55.1V-40C224 -57.8 242.8 -69.4 258.7 -61.5L357.4 -12.1C373.7 -4 383.9 12.7 383.9 30.8V135.2C456.5 181.5 511.9 243.6 511.9 346.3C512 371.5 512 396.7 505.1 428.9zM400 288C373.5 288 352 309.5 352 336S373.5 384 400 384S448 362.5 448 336S426.5 288 400 288z" />
+    <glyph glyph-name="rss-square"
+      unicode="&#xF143;"
+      horiz-adv-x="448" d=" M400 416H48C21.49 416 0 394.51 0 368V16C0 -10.51 21.49 -32 48 -32H400C426.51 -32 448 -10.51 448 16V368C448 394.51 426.51 416 400 416zM112 32C85.49 32 64 53.49 64 80S85.49 128 112 128S160 106.51 160 80S138.51 32 112 32zM269.533 32H235.198C229.187 32 224.147 36.636 223.756 42.634C218.542 122.684 154.513 186.554 74.633 191.757C68.636 192.147 64 197.188 64 203.198V237.533C64 244.068 69.468 249.31 75.994 248.9580000000001C186.54 242.9840000000001 274.9910000000001 154.422 280.9580000000001 43.994C281.31 37.468 276.0680000000001 32 269.533 32zM372.56 32H338.226C332.065 32 327.051 36.882 326.799 43.038C321.201 179.573 211.595 289.199 75.039 294.798C68.882 295.051 64 300.065 64 306.226V340.56C64 347.014 69.338 352.224 75.787 351.992C243.617 345.967 377.997 210.801 383.992 43.787C384.224 37.338 379.014 32.0000000000001 372.56 32.0000000000001z" />
+    <glyph glyph-name="rss"
+      unicode="&#xF09E;"
+      horiz-adv-x="448" d=" M128.081 32.041C128.081 -3.328 99.409 -32 64.04 -32S0 -3.328 0 32.041S28.672 96.082 64.041 96.082S128.081 67.409 128.081 32.041zM303.741 -15.209C295.387 139.391 171.556 263.378 16.791 271.741C7.656 272.235 0 264.895 0 255.747V207.678C0 199.263 6.49 192.206 14.887 191.66C126.719 184.376 216.36 94.958 223.659 -17.112C224.206 -25.509 231.263 -31.999 239.677 -31.999H287.746C296.895 -32 304.235 -24.344 303.741 -15.209zM447.99 -15.497C439.596 218.323 251.465 407.555 16.503 415.99C7.473 416.314 0 409.019 0 399.984V351.916C0 343.291 6.835 336.271 15.453 335.9170000000001C206.632 328.078 360.08 174.601 367.918 -16.548C368.271 -25.166 375.291 -32.001 383.917 -32.001H431.985C441.019 -32 448.314 -24.527 447.99 -15.497z" />
+    <glyph glyph-name="ruble-sign"
+      unicode="&#xF158;"
+      horiz-adv-x="384" d=" M239.36 128C324.48 128 384 187.458 384 272.929S324.48 416 239.36 416H76C69.373 416 64 410.627 64 404V197.368H12C5.373 197.368 0 191.995 0 185.368V140C0 133.373 5.373 128 12 128H64V96H12C5.373 96 0 90.627 0 84V44C0 37.373 5.373 32 12 32H64V-20C64 -26.627 69.373 -32 76 -32H134.56C141.187 -32 146.56 -26.627 146.56 -20V32H308C314.627 32 320 37.373 320 44V84C320 90.627 314.627 96 308 96H146.56V128H239.36zM146.56 347.252H225.28C272 347.252 300.16 318.142 300.16 272.9290000000001C300.16 227.0970000000001 272 197.368 224 197.368H146.56V347.252z" />
+    <glyph glyph-name="ruler-combined"
+      unicode="&#xF546;"
+      horiz-adv-x="512" d=" M160 160H104C99.58 160 96 163.58 96 168V184C96 188.42 99.58 192 104 192H160V256H104C99.58 256 96 259.5800000000001 96 264V280C96 284.42 99.58 288 104 288H160V352H104C99.58 352 96 355.58 96 360V376C96 380.42 99.58 384 104 384H160V416C160 433.67 145.67 448 128 448H32C14.33 448 0 433.67 0 416V-32C0 -34.77 0.91 -37.24 1.57 -39.8L160 118.62V160zM480 96H448V40C448 35.58 444.42 32 440 32H424C419.58 32 416 35.58 416 40V96H352V40C352 35.58 348.42 32 344 32H328C323.58 32 320 35.58 320 40V96H256V40C256 35.58 252.42 32 248 32H232C227.58 32 224 35.58 224 40V96H182.63L24.2 -62.43C26.76 -63.09 29.24 -64 32 -64H480C497.67 -64 512 -49.67 512 -32V64C512 81.67 497.67 96 480 96z" />
+    <glyph glyph-name="ruler-horizontal"
+      unicode="&#xF547;"
+      horiz-adv-x="576" d=" M544 320H496V232C496 227.58 492.42 224 488 224H472C467.58 224 464 227.58 464 232V320H400V232C400 227.58 396.42 224 392 224H376C371.58 224 368 227.58 368 232V320H304V232C304 227.58 300.42 224 296 224H280C275.58 224 272 227.58 272 232V320H208V232C208 227.58 204.42 224 200 224H184C179.58 224 176 227.58 176 232V320H112V232C112 227.58 108.42 224 104 224H88C83.58 224 80 227.58 80 232V320H32C14.33 320 0 305.67 0 288V96C0 78.33 14.33 64 32 64H544C561.67 64 576 78.33 576 96V288C576 305.67 561.67 320 544 320z" />
+    <glyph glyph-name="ruler-vertical"
+      unicode="&#xF548;"
+      horiz-adv-x="256" d=" M168 32C163.58 32 160 35.58 160 40V56C160 60.42 163.58 64 168 64H256V128H168C163.58 128 160 131.58 160 136V152C160 156.42 163.58 160 168 160H256V224H168C163.58 224 160 227.58 160 232V248C160 252.42 163.58 256 168 256H256V320H168C163.58 320 160 323.58 160 328V344C160 348.42 163.58 352 168 352H256V416C256 433.67 241.67 448 224 448H32C14.33 448 0 433.67 0 416V-32C0 -49.67 14.33 -64 32 -64H224C241.67 -64 256 -49.67 256 -32V32H168z" />
+    <glyph glyph-name="ruler"
+      unicode="&#xF545;"
+      horiz-adv-x="640" d=" M635.7 280.8L556.1 416.3C547.3000000000001 431.3 527.8000000000001 436.4 512.6 427.8L443.6 388.7L503.3 287C505.5 283.2 504.2 278.5 500.4 276.3L486.6 268.5C482.8 266.3 477.9 267.6 475.7 271.4L416 373L360.8 341.7L388.7 294.3C390.9 290.5 389.6 285.8 385.8 283.6L372 275.8C368.2 273.6 363.3 274.9 361.1 278.7000000000001L333.2 326L278 294.7L337.8 193C340 189.3 338.7 184.5 334.9000000000001 182.3L321.1 174.5C317.3 172.3 312.4000000000001 173.6 310.2000000000001 177.4L250.5000000000001 279.1L195.3000000000001 247.8L223.2000000000001 200.4C225.4000000000001 196.5999999999999 224.1000000000001 191.9 220.3000000000001 189.6999999999999L206.5000000000001 181.8999999999999C202.7000000000001 179.6999999999999 197.8000000000001 181 195.6000000000001 184.7999999999999L167.7000000000001 232.2999999999999L112.5 200.9999999999999L172.2000000000001 99.2999999999999C174.4 95.5999999999999 173.1000000000001 90.7999999999999 169.3000000000001 88.5999999999999L155.5 80.7999999999999C151.7 78.5999999999999 146.8000000000001 79.8999999999999 144.6 83.6999999999999L84.9 185.1L15.9 146C0.7 137.3 -4.6 118.2 4.2 103.2L83.8 -32.4C92.6 -47.4 112.1 -52.5 127.3 -43.9L624.1 238C639.3000000000001 246.6 644.5 265.8 635.7 280.8z" />
+    <glyph glyph-name="rupee-sign"
+      unicode="&#xF156;"
+      horiz-adv-x="320" d=" M308 352C314.627 352 320 357.373 320 364V404C320 410.627 314.627 416 308 416H12C5.373 416 0 410.627 0 404V359.252C0 352.625 5.373 347.252 12 347.252H97.28C124.588 347.252 145.541 337.294 158.25 320H12C5.373 320 0 314.627 0 308V268C0 261.373 5.373 256 12 256H170.757C164.54 219.914 137.796 197.368 96 197.368H12C5.373 197.368 0 191.995 0 185.368V132.356C0 129.007 1.4 125.81 3.861 123.538L168.913 -28.818A12.001000000000001 12.001000000000001 0 0 1 177.052 -32H259.614C270.538 -32 275.78 -18.592 267.753 -11.182L116.871 128.094C193.37 130.434 248.015 181.489 255.189 256H308C314.627 256 320 261.373 320 268V308C320 314.627 314.627 320 308 320H249.31C245.824 331.541 241.03 342.246 235.058 352H308z" />
+    <glyph glyph-name="save"
+      unicode="&#xF0C7;"
+      horiz-adv-x="448" d=" M433.941 318.059L350.059 401.9410000000001A48 48 0 0 1 316.118 416H48C21.49 416 0 394.51 0 368V16C0 -10.51 21.49 -32 48 -32H400C426.51 -32 448 -10.51 448 16V284.118A48 48 0 0 1 433.941 318.059zM224 32C188.654 32 160 60.654 160 96C160 131.346 188.654 160 224 160S288 131.346 288 96C288 60.654 259.346 32 224 32zM320 336.52V236C320 229.373 314.627 224 308 224H76C69.373 224 64 229.373 64 236V340C64 346.627 69.373 352 76 352H304.52C307.703 352 310.755 350.736 313.005 348.485L316.485 345.005A11.996 11.996 0 0 0 320 336.52z" />
+    <glyph glyph-name="school"
+      unicode="&#xF549;"
+      horiz-adv-x="640" d=" M0 224V-48C0 -56.84 7.16 -64 16 -64H96V256H32C14.33 256 0 241.67 0 224zM360 272H336V312C336 316.42 332.42 320 328 320H312C307.58 320 304 316.42 304 312V248C304 243.58 307.58 240 312 240H360C364.42 240 368 243.58 368 248V264C368 268.42 364.42 272 360 272zM497.75 335.9600000000001L337.75 442.63A32.02 32.02 0 0 1 302.25 442.63L142.25 335.9600000000001A32.002 32.002 0 0 1 128 309.3400000000001V-64H256V80C256 88.84 263.1600000000001 96 272 96H368C376.84 96 384 88.84 384 80V-64H512V309.3300000000001C512 320.0300000000001 506.65 330.0300000000001 497.75 335.9600000000001zM320 192C275.82 192 240 227.82 240 272S275.82 352 320 352S400 316.18 400 272S364.18 192 320 192zM608 256H544V-64H624C632.84 -64 640 -56.84 640 -48V224C640 241.67 625.67 256 608 256z" />
+    <glyph glyph-name="screwdriver"
+      unicode="&#xF54A;"
+      horiz-adv-x="512" d=" M448 448L320 352V289.94L236.97 206.91C243.76 202.66 250.24 197.85 256.04 192.04C261.8400000000001 186.24 266.6600000000001 179.76 270.9100000000001 172.97L353.94 256H416L512 384L448 448zM128 169.41L10.92 52.33C-3.63 37.78 -3.63 14.18 10.92 -0.38L63.62 -53.08C78.18 -67.64 101.77 -67.64 116.33 -53.08L233.41 64C262.52 93.11 262.52 140.3 233.41 169.41S157.11 198.52 128 169.41z" />
+    <glyph glyph-name="search-minus"
+      unicode="&#xF010;"
+      horiz-adv-x="512" d=" M304 256V224C304 217.4 298.6 212 292 212H124C117.4 212 112 217.4 112 224V256C112 262.6 117.4 268 124 268H292C298.6 268 304 262.6 304 256zM505 -28.7L476.7 -57C467.3 -66.4 452.1 -66.4 442.8 -57L343 42.7C338.5 47.2 336 53.3 336 59.7V76C300.7 48.4 256.3 32 208 32C93.1 32 0 125.1 0 240S93.1 448 208 448S416 354.9 416 240C416 191.7 399.6 147.3 372 112H388.3C394.7 112 400.8 109.5 405.3 105L505 5.3C514.3 -4.1 514.3 -19.3 505 -28.7zM344 240C344 315.2 283.2 376 208 376S72 315.2 72 240S132.8 104 208 104S344 164.8 344 240z" />
+    <glyph glyph-name="search-plus"
+      unicode="&#xF00E;"
+      horiz-adv-x="512" d=" M304 256V224C304 217.4 298.6 212 292 212H236V156C236 149.4 230.6 144 224 144H192C185.4 144 180 149.4 180 156V212H124C117.4 212 112 217.4 112 224V256C112 262.6 117.4 268 124 268H180V324C180 330.6 185.4 336 192 336H224C230.6 336 236 330.6 236 324V268H292C298.6 268 304 262.6 304 256zM505 -28.7L476.7 -57C467.3 -66.4 452.1 -66.4 442.8 -57L343 42.7C338.5 47.2 336 53.3 336 59.7V76C300.7 48.4 256.3 32 208 32C93.1 32 0 125.1 0 240S93.1 448 208 448S416 354.9 416 240C416 191.7 399.6 147.3 372 112H388.3C394.7 112 400.8 109.5 405.3 105L505 5.3C514.3 -4.1 514.3 -19.3 505 -28.7zM344 240C344 315.2 283.2 376 208 376S72 315.2 72 240S132.8 104 208 104S344 164.8 344 240z" />
+    <glyph glyph-name="search"
+      unicode="&#xF002;"
+      horiz-adv-x="512" d=" M505 5.3L405.3 105C400.8 109.5 394.7 112 388.3 112H372C399.6 147.3 416 191.7 416 240C416 354.9 322.9 448 208 448S0 354.9 0 240S93.1 32 208 32C256.3 32 300.7 48.4 336 76V59.7C336 53.3 338.5 47.2 343 42.7L442.7 -57C452.1 -66.4 467.3 -66.4 476.6 -57L504.9 -28.7C514.3 -19.3 514.3 -4.1 505 5.3zM208 112C137.3 112 80 169.2 80 240C80 310.7 137.2 368 208 368C278.7 368 336 310.8 336 240C336 169.3 278.8 112 208 112z" />
+    <glyph glyph-name="seedling"
+      unicode="&#xF4D8;"
+      horiz-adv-x="512" d=" M64 352H0C0 228.3 100.3 128 224 128V-16C224 -24.8 231.2 -32 240 -32H272C280.8 -32 288 -24.8 288 -16V128C288 251.7 187.7 352 64 352zM448 416C363.8 416 290.6 369.5 252.3 300.8C280 270.6 300.5 233.9 311.3 193.2C424 204.9 512 300.1 512 416H448z" />
+    <glyph glyph-name="server"
+      unicode="&#xF233;"
+      horiz-adv-x="512" d=" M480 288H32C14.327 288 0 302.327 0 320V384C0 401.673 14.327 416 32 416H480C497.673 416 512 401.673 512 384V320C512 302.327 497.673 288 480 288zM432 376C418.745 376 408 365.255 408 352S418.745 328 432 328S456 338.745 456 352S445.255 376 432 376zM368 376C354.745 376 344 365.255 344 352S354.745 328 368 328S392 338.745 392 352S381.255 376 368 376zM480 128H32C14.327 128 0 142.327 0 160V224C0 241.673 14.327 256 32 256H480C497.673 256 512 241.673 512 224V160C512 142.327 497.673 128 480 128zM432 216C418.745 216 408 205.255 408 192S418.745 168 432 168S456 178.745 456 192S445.255 216 432 216zM368 216C354.745 216 344 205.255 344 192S354.745 168 368 168S392 178.745 392 192S381.255 216 368 216zM480 -32H32C14.327 -32 0 -17.673 0 0V64C0 81.673 14.327 96 32 96H480C497.673 96 512 81.673 512 64V0C512 -17.673 497.673 -32 480 -32zM432 56C418.745 56 408 45.255 408 32S418.745 8 432 8S456 18.745 456 32S445.255 56 432 56zM368 56C354.745 56 344 45.255 344 32S354.745 8 368 8S392 18.745 392 32S381.255 56 368 56z" />
+    <glyph glyph-name="share-alt-square"
+      unicode="&#xF1E1;"
+      horiz-adv-x="448" d=" M448 368V16C448 -10.51 426.51 -32 400 -32H48C21.49 -32 0 -10.51 0 16V368C0 394.51 21.49 416 48 416H400C426.51 416 448 394.51 448 368zM304 152C289.438 152 276.177 146.439 266.217 137.329L198.259 178.104A56.33899999999999 56.33899999999999 0 0 1 198.259 205.897L266.217 246.672C276.177 237.561 289.438 232 304 232C334.928 232 360 257.072 360 288S334.928 344 304 344S248 318.928 248 288C248 283.203 248.605 278.5470000000001 249.74 274.103L181.782 233.328C171.823 242.439 158.562 248 144 248C113.072 248 88 222.928 88 192S113.072 136 144 136C158.562 136 171.823 141.561 181.783 150.671L249.741 109.896A56.08800000000001 56.08800000000001 0 0 1 248.001 95.999C248.001 65.071 273.073 39.999 304.001 39.999S360.001 65.071 360.001 95.999C360 126.928 334.928 152 304 152z" />
+    <glyph glyph-name="share-alt"
+      unicode="&#xF1E0;"
+      horiz-adv-x="448" d=" M352 128C329.392 128 308.613 120.181 292.21 107.105L189.724 171.159A96.551 96.551 0 0 1 189.724 212.842L292.21 276.896C308.613 263.819 329.392 256 352 256C405.019 256 448 298.981 448 352S405.019 448 352 448S256 405.019 256 352C256 344.842 256.79 337.87 258.276 331.159L155.79 267.105C139.387 280.1810000000001 118.608 288 96 288C42.981 288 0 245.019 0 192S42.981 96 96 96C118.608 96 139.387 103.819 155.79 116.895L258.276 52.841A96.301 96.301 0 0 1 256 32C256 -21.019 298.981 -64 352 -64S448 -21.019 448 32S405.019 128 352 128z" />
+    <glyph glyph-name="share-square"
+      unicode="&#xF14D;"
+      horiz-adv-x="576" d=" M568.482 270.552L424.479 134.567C409.3 120.232 384 130.86 384 152.015V223.978C239.425 223.008 178.434 188.865 219.225 52.625C223.708 37.652 206.379 26.058 194.219 35.295C155.252 64.895 120 121.512 120 178.661C120 322.598 237.599 351.161 384 351.973V423.988C384 445.162 409.317 455.756 424.479 441.436L568.482 305.448C578.502 295.985 578.51 280.023 568.482 270.552zM384 68.872V0H64V320H114.916A11.989999999999998 11.989999999999998 0 0 1 123.564 323.693C138.517 339.261 155.801 351.583 174.578 361.3690000000001C185.708 367.17 181.584 384 169.033 384H48C21.49 384 0 362.51 0 336V-16C0 -42.51 21.49 -64 48 -64H400C426.51 -64 448 -42.51 448 -16V72.806C448 81.094 439.803 86.872 431.989 84.108A71.83 71.83 0 0 0 397.8 80.731C390.53 81.777 384 76.217 384 68.872z" />
+    <glyph glyph-name="share"
+      unicode="&#xF064;"
+      horiz-adv-x="512" d=" M503.691 258.164L327.687 410.149C312.281 423.454 288 412.653 288 391.985V311.932C127.371 310.093 0 277.9 0 125.674C0 64.233 39.581 3.365 83.333 -28.458C96.986 -38.389 116.444 -25.925 111.41 -9.827C66.066 135.186 132.917 173.684 288 175.915V88C288 67.3 312.3 56.547 327.687 69.836L503.691 221.836C514.7620000000001 231.398 514.777 248.589 503.691 258.164z" />
+    <glyph glyph-name="shekel-sign"
+      unicode="&#xF20B;"
+      horiz-adv-x="448" d=" M248 280V112C248 103.16 255.16 96 264 96H312C320.84 96 328 103.16 328 112V280C328 355.11 267.11 416 192 416H24C10.75 416 0 405.26 0 392V-16C0 -24.84 7.16 -32 16 -32H64C72.84 -32 80 -24.84 80 -16V336H192C222.93 336 248 310.93 248 280zM432 416H384C375.1600000000001 416 368 408.8400000000001 368 400V104C368 73.07 342.93 48 312 48H200V272C200 280.8400000000001 192.84 288 184 288H136C127.16 288 120 280.8400000000001 120 272V-8C120 -21.25 130.75 -32 144 -32H312C387.11 -32 448 28.89 448 104V400C448 408.8400000000001 440.84 416 432 416z" />
+    <glyph glyph-name="shield-alt"
+      unicode="&#xF3ED;"
+      horiz-adv-x="512" d=" M496 320C496 98.718 360.0660000000001 -24.645 274.461 -60.308A48 48 0 0 0 237.538 -60.308C130.495 -15.713 16 121.513 16 320A48 48 0 0 0 45.539 364.308L237.539 444.308A48 48 0 0 0 274.462 444.308L466.462 364.308A48 48 0 0 0 496 320zM256 1.687L256.066 1.653C349.801 48.342 428.563 157.961 431.883 309.382L256 382.6670000000001V1.687z" />
+    <glyph glyph-name="ship"
+      unicode="&#xF21A;"
+      horiz-adv-x="640" d=" M496.616 75.361L566.6279999999999 145.373C583.5269999999999 162.273 576.5699999999999 191.144 553.7919999999999 198.465L512 211.898V352C512 369.673 497.673 384 480 384H416V424C416 437.255 405.255 448 392 448H248C234.745 448 224 437.255 224 424V384H160C142.327 384 128 369.673 128 352V211.898L86.208 198.465C63.455 191.152 56.454 162.292 73.372 145.373L143.384 75.361C125.828 31.713 85.587 0 24 0C10.745 0 0 -10.745 0 -24V-40C0 -53.255 10.745 -64 24 -64C85.023 -64 131.499 -43.39 167.258 -4.604C181.677 -39.432 216.021 -64 256 -64H384C423.979 -64 458.323 -39.432 472.742 -4.604C508.495 -43.384 554.968 -64 616 -64C629.255 -64 640 -53.255 640 -40V-24C640 -10.745 629.255 0 616 0C555.183 0 514.458 31.001 496.616 75.361zM192 320H448V232.469L329.7920000000001 270.464A31.995 31.995 0 0 1 310.2080000000001 270.464L192 232.469V320z" />
+    <glyph glyph-name="shipping-fast"
+      unicode="&#xF48B;"
+      horiz-adv-x="640" d=" M624 96H608V204.1C608 216.8 602.9 229 593.9 238L494 337.9C485 346.9 472.8 352 460.1 352H416V400C416 426.5 394.5 448 368 448H112C85.5 448 64 426.5 64 400V352H8C3.6 352 0 348.4 0 344V328C0 323.6 3.6 320 8 320H280C284.4 320 288 316.4 288 312V296C288 291.6 284.4 288 280 288H40C35.6 288 32 284.4 32 280V264C32 259.6 35.6 256 40 256H248C252.4 256 256 252.4 256 248V232C256 227.6 252.4 224 248 224H8C3.6 224 0 220.4 0 216V200C0 195.6 3.6 192 8 192H216C220.4 192 224 188.4 224 184V168C224 163.6 220.4 160 216 160H64V32C64 -21 107 -64 160 -64S256 -21 256 32H384C384 -21 427 -64 480 -64S576 -21 576 32H624C632.8 32 640 39.2 640 48V80C640 88.8 632.8 96 624 96zM160 -16C133.5 -16 112 5.5 112 32S133.5 80 160 80S208 58.5 208 32S186.5 -16 160 -16zM480 -16C453.5 -16 432 5.5 432 32S453.5 80 480 80S528 58.5 528 32S506.5 -16 480 -16zM560 192H416V304H460.1L560 204.1V192z" />
+    <glyph glyph-name="shoe-prints"
+      unicode="&#xF54B;"
+      horiz-adv-x="640" d=" M192 288H224V416H192C156.65 416 128 387.35 128 352S156.65 288 192 288zM0 32C0 -3.35 28.65 -32 64 -32H96V96H64C28.65 96 0 67.35 0 32zM337.46 160C302.55 160 261.3 146.88 232.73 128C207.94 111.62 188.21 96 128 96V-32L185.53 -47.97C211.74 -55.25 238.54 -61.09 265.84 -63.02C298.53 -65.33 331.44 -63.69 363.42 -56.82C472.9 -33.3 512 18.78 512 64C512 128 427.82 160 337.4600000000001 160zM491.42 440.81C459.44 447.68 426.53 449.33 393.84 447.01C366.54 445.08 339.74 439.24 313.53 431.9700000000001L256 416V288C316.2 288 335.94 272.38 360.73 256C389.3 237.12 430.55 224 465.46 224C555.82 224 640 256 640 320C640 365.2200000000001 600.9 417.3 491.42 440.81z" />
+    <glyph glyph-name="shopping-bag"
+      unicode="&#xF290;"
+      horiz-adv-x="448" d=" M352 288V320C352 390.58 294.579 448 224 448C153.42 448 96 390.58 96 320V288H0V16C0 -28.183 35.817 -64 80 -64H368C412.183 -64 448 -28.183 448 16V288H352zM160 320C160 355.29 188.71 384 224 384S288 355.29 288 320V288H160V320zM320 200C306.745 200 296 210.745 296 224S306.745 248 320 248S344 237.255 344 224S333.255 200 320 200zM128 200C114.745 200 104 210.745 104 224S114.745 248 128 248S152 237.255 152 224S141.255 200 128 200z" />
+    <glyph glyph-name="shopping-basket"
+      unicode="&#xF291;"
+      horiz-adv-x="576" d=" M576 232V216C576 202.745 565.255 192 552 192H544L517.887 9.212C514.509 -14.435 494.257 -32 470.37 -32H105.63C81.743 -32 61.491 -14.435 58.112 9.212L32 192H24C10.745 192 0 202.745 0 216V232C0 245.255 10.745 256 24 256H91.341L198.121 402.8210000000001C208.516 417.113 228.528 420.274 242.822 409.879C257.115 399.484 260.275 379.471 249.88 365.178L170.477 256H405.523L326.12 365.179C315.725 379.471 318.886 399.485 333.1790000000001 409.88C347.4700000000001 420.275 367.485 417.115 377.8800000000001 402.822L484.659 256H552C565.255 256 576 245.255 576 232zM312 56V168C312 181.255 301.255 192 288 192S264 181.255 264 168V56C264 42.745 274.745 32 288 32S312 42.745 312 56zM424 56V168C424 181.255 413.255 192 400 192S376 181.255 376 168V56C376 42.745 386.745 32 400 32S424 42.745 424 56zM200 56V168C200 181.255 189.255 192 176 192S152 181.255 152 168V56C152 42.745 162.745 32 176 32S200 42.745 200 56z" />
+    <glyph glyph-name="shopping-cart"
+      unicode="&#xF07A;"
+      horiz-adv-x="576" d=" M528.12 146.681L575.393 354.681C578.806 369.699 567.391 384 551.99 384H159.208L150.042 428.81C147.758 439.979 137.93 448 126.529 448H24C10.745 448 0 437.255 0 424V408C0 394.745 10.745 384 24 384H93.883L164.131 40.565C147.325 30.9 136 12.778 136 -8C136 -38.928 161.072 -64 192 -64S248 -38.928 248 -8C248 7.674 241.553 21.835 231.176 32H440.823C430.447 21.835 424 7.674 424 -8C424 -38.928 449.072 -64 480 -64S536 -38.928 536 -8C536 14.172 523.112 33.332 504.421 42.405L509.938 66.681C513.351 81.699 501.936 96 486.535 96H218.117L211.572 128H504.717C515.923 128 525.637 135.754 528.12 146.681z" />
+    <glyph glyph-name="shower"
+      unicode="&#xF2CC;"
+      horiz-adv-x="512" d=" M389.6600000000001 312.4L231.6 154.34C222.23 144.97 207.03 144.97 197.66 154.34L186.34 165.66C176.97 175.03 176.97 190.23 186.34 199.6L186.45 199.71C152.42 239.92 151.29 298.65 183.06 340.09C171.09 347.64 156.92 352 141.7600000000001 352C98.88 352 64 317.12 64 274.24V-32H0V274.24C0 352.41 63.59 416 141.76 416C178.69 416 212.37 401.8 237.62 378.58C273.52 390.09 314.12 383.08 344.29 357.55L344.4000000000001 357.66C353.7700000000001 367.03 368.9700000000001 367.03 378.3400000000001 357.66L389.6600000000001 346.3400000000001C399.0300000000001 336.9700000000001 399.0300000000001 321.77 389.6600000000001 312.4zM384 240C384 231.163 376.837 224 368 224S352 231.163 352 240S359.163 256 368 256S384 248.837 384 240zM416 240C416 248.837 423.163 256 432 256S448 248.837 448 240S440.837 224 432 224S416 231.163 416 240zM512 240C512 231.163 504.837 224 496 224S480 231.163 480 240S487.163 256 496 256S512 248.837 512 240zM352 208C352 199.163 344.837 192 336 192S320 199.163 320 208S327.163 224 336 224S352 216.837 352 208zM400 224C408.837 224 416 216.837 416 208S408.837 192 400 192S384 199.163 384 208S391.163 224 400 224zM480 208C480 199.163 472.837 192 464 192S448 199.163 448 208S455.163 224 464 224S480 216.837 480 208zM320 176C320 167.163 312.837 160 304 160S288 167.163 288 176S295.163 192 304 192S320 184.837 320 176zM352 176C352 184.837 359.163 192 368 192S384 184.837 384 176S376.837 160 368 160S352 167.163 352 176zM448 176C448 167.163 440.837 160 432 160S416 167.163 416 176S423.163 192 432 192S448 184.837 448 176zM320 144C320 152.837 327.163 160 336 160S352 152.837 352 144S344.837 128 336 128S320 135.163 320 144zM416 144C416 135.163 408.837 128 400 128S384 135.163 384 144S391.163 160 400 160S416 152.837 416 144zM320 112C320 103.163 312.837 96 304 96S288 103.163 288 112S295.163 128 304 128S320 120.837 320 112zM384 112C384 103.163 376.837 96 368 96S352 103.163 352 112S359.163 128 368 128S384 120.837 384 112zM352 80C352 71.163 344.837 64 336 64S320 71.163 320 80S327.163 96 336 96S352 88.837 352 80zM320 48C320 39.163 312.837 32 304 32S288 39.163 288 48S295.163 64 304 64S320 56.837 320 48z" />
+    <glyph glyph-name="sign-in-alt"
+      unicode="&#xF2F6;"
+      horiz-adv-x="512" d=" M416 0H332C325.4 0 320 5.4 320 12V52C320 58.6 325.4 64 332 64H416C433.7 64 448 78.3 448 96V288C448 305.7 433.7 320 416 320H332C325.4 320 320 325.4 320 332V372C320 378.6 325.4 384 332 384H416C469 384 512 341 512 288V96C512 43 469 0 416 0zM369 201L201 369C186 384 160 373.5 160 352V256H24C10.7 256 0 245.3 0 232V136C0 122.7 10.7 112 24 112H160V16C160 -5.5 186 -16 201 -1L369 167C378.3 176.4 378.3 191.6 369 201z" />
+    <glyph glyph-name="sign-language"
+      unicode="&#xF2A7;"
+      horiz-adv-x="448" d=" M91.434 -35.987C91.127 -19.969 104.543 -6.858 120.564 -6.858H182.857V-1.144H56.993C40.972 -1.144 27.556 11.967 27.863 27.985C28.16 43.509 40.835 56 56.428 56H182.857V61.714H29.136C13.115 61.714 -0.301 74.825 0.006 90.843C0.303 106.365 12.979 118.856 28.572 118.856H182.858V124.57H57.707C41.686 124.57 28.27 137.681 28.577 153.699C28.874 169.221 41.55 181.712 57.143 181.712H225.709L194.624 204.318C181.862 213.599 179.041 231.467 188.322 244.23C197.603 256.991 215.472 259.812 228.234 250.532L351.5950000000001 160.817A34.287 34.287 0 0 0 365.7150000000001 133.089V-8.047C365.7150000000001 -23.957 354.769 -37.777 339.2820000000001 -41.421L258.8110000000001 -60.3550000000001A137.16 137.16 0 0 0 227.4000000000001 -64.0010000000001H120C104.407 -64.0000000000001 91.731 -51.5090000000001 91.434 -35.9870000000001zM164.683 189.714H201.106L189.919 197.8499999999999C171.34 211.3609999999999 169.606 238.737 186.749 254.386L173.745 271.0859999999999C163.902 283.7269999999999 145.315 286.257 132.865 276.1739999999999C120.8 266.4029999999999 118.732 248.7269999999999 128.312 236.4239999999999L164.683 189.714zM447.981 191.817L442.978 344.269C442.4600000000001 360.04 429.2560000000001 372.405 413.485 371.8879999999999C397.712 371.37 385.348 358.166 385.866 342.395L387.128 303.98L283.565 436.981C273.985 449.284 256.342 451.611 243.912 442.3090000000001C231.085 432.71 228.983 414.069 238.826 401.428L315.715 302.683L311.206 299.1720000000001L216.416 420.906C206.8359999999999 433.209 189.1929999999999 435.536 176.763 426.234C163.936 416.635 161.834 397.994 171.6769999999999 385.353L266.12 264.065L261.611 260.554L183.9359999999999 360.308C174.3559999999999 372.611 156.7129999999999 374.938 144.2829999999999 365.636C131.4559999999999 356.0370000000001 129.3539999999999 337.396 139.1969999999999 324.755L191.2499999999999 257.906C203.7469999999999 266.163 220.3049999999999 266.1910000000001 232.9399999999999 257.002L356.2999999999999 167.288C367.2039999999999 159.358 373.7149999999999 146.573 373.7149999999999 133.09V116.091L434.779 163.64A34.285 34.285 0 0 1 447.981 191.817z" />
+    <glyph glyph-name="sign-out-alt"
+      unicode="&#xF2F5;"
+      horiz-adv-x="512" d=" M497 175L329 7C314 -8 288 2.5 288 24V120H152C138.7 120 128 130.7 128 144V240C128 253.3 138.7 264 152 264H288V360C288 381.4 313.9 392 329 377L497 209C506.3 199.6 506.3 184.4 497 175zM192 12V52C192 58.6 186.6 64 180 64H96C78.3 64 64 78.3 64 96V288C64 305.7 78.3 320 96 320H180C186.6 320 192 325.4 192 332V372C192 378.6 186.6 384 180 384H96C43 384 0 341 0 288V96C0 43 43 0 96 0H180C186.6 0 192 5.4 192 12z" />
+    <glyph glyph-name="sign"
+      unicode="&#xF4D9;"
+      horiz-adv-x="512" d=" M496 384H128V432C128 440.8 120.8 448 112 448H80C71.2 448 64 440.8 64 432V384H16C7.2 384 0 376.8 0 368V336C0 327.2 7.2 320 16 320H64V-48C64 -56.8 71.2 -64 80 -64H112C120.8 -64 128 -56.8 128 -48V320H496C504.8 320 512 327.2 512 336V368C512 376.8 504.8 384 496 384zM160 64H480V288H160V64z" />
+    <glyph glyph-name="signal"
+      unicode="&#xF012;"
+      horiz-adv-x="640" d=" M36 64H92C98.6 64 104 58.6 104 52V-52C104 -58.6 98.6 -64 92 -64H36C29.4 -64 24 -58.6 24 -52V52C24 58.6 29.4 64 36 64zM152 100V-52C152 -58.6 157.4 -64 164 -64H220C226.6 -64 232 -58.6 232 -52V100C232 106.6 226.6 112 220 112H164C157.4 112 152 106.6 152 100zM280 180V-52C280 -58.6 285.4 -64 292 -64H348C354.6 -64 360 -58.6 360 -52V180C360 186.6 354.6 192 348 192H292C285.4 192 280 186.6 280 180zM408 292V-52C408 -58.6 413.4 -64 420 -64H476C482.6 -64 488 -58.6 488 -52V292C488 298.6 482.6 304 476 304H420C413.4 304 408 298.6 408 292zM536 436V-52C536 -58.6 541.4 -64 548 -64H604C610.6 -64 616 -58.6 616 -52V436C616 442.6 610.6 448 604 448H548C541.4 448 536 442.6 536 436z" />
+    <glyph glyph-name="sitemap"
+      unicode="&#xF0E8;"
+      horiz-adv-x="640" d=" M128 96H32C14.33 96 0 81.67 0 64V-32C0 -49.67 14.33 -64 32 -64H128C145.67 -64 160 -49.67 160 -32V64C160 81.67 145.67 96 128 96zM104 176H296V128H344V176H536V128H584V185.59C584 206.7600000000001 566.77 224 545.59 224H344V288H384C401.67 288 416 302.3300000000001 416 320V416C416 433.67 401.67 448 384 448H256C238.33 448 224 433.67 224 416V320C224 302.33 238.33 288 256 288H296V224H94.41C73.23 224 56 206.77 56 185.59V128H104V176zM368 96H272C254.33 96 240 81.67 240 64V-32C240 -49.67 254.33 -64 272 -64H368C385.67 -64 400 -49.67 400 -32V64C400 81.67 385.67 96 368 96zM608 96H512C494.33 96 480 81.67 480 64V-32C480 -49.67 494.33 -64 512 -64H608C625.67 -64 640 -49.67 640 -32V64C640 81.67 625.67 96 608 96z" />
+    <glyph glyph-name="skull"
+      unicode="&#xF54C;"
+      horiz-adv-x="512" d=" M256 448C114.6 448 0 347.7 0 224C0 153.9 36.9 91.4 94.5 50.3C104.1 43.4 109.7 32.2 108 20.4L98.6 -45.8C97.2 -55.4 104.6 -63.9999999999999 114.3 -63.9999999999999H192V-7.9999999999999C192 -3.6 195.6 1e-13 200 1e-13H216C220.4 1e-13 224 -3.6 224 -7.9999999999999V-63.9999999999999H288V-7.9999999999999C288 -3.6 291.6 1e-13 296 1e-13H312C316.4 1e-13 320 -3.6 320 -7.9999999999999V-63.9999999999999H397.7C407.4 -63.9999999999999 414.8 -55.3999999999999 413.4 -45.8L404 20.4C402.3 32.1 407.8 43.4 417.5 50.3C475.1 91.4 512 153.9 512 224C512 347.7 397.4 448 256 448zM160 128C124.7 128 96 156.7 96 192S124.7 256 160 256S224 227.3 224 192S195.3 128 160 128zM352 128C316.7 128 288 156.7 288 192S316.7 256 352 256S416 227.3 416 192S387.3 128 352 128z" />
+    <glyph glyph-name="sliders-h"
+      unicode="&#xF1DE;"
+      horiz-adv-x="512" d=" M496 64H160V80C160 88.8 152.8 96 144 96H112C103.2 96 96 88.8 96 80V64H16C7.2 64 0 56.8 0 48V16C0 7.2 7.2 0 16 0H96V-16C96 -24.8 103.2 -32 112 -32H144C152.8 -32 160 -24.8 160 -16V0H496C504.8 0 512 7.2 512 16V48C512 56.8 504.8 64 496 64zM496 224H416V240C416 248.8 408.8 256 400 256H368C359.2 256 352 248.8 352 240V224H16C7.2 224 0 216.8 0 208V176C0 167.2 7.2 160 16 160H352V144C352 135.2 359.2 128 368 128H400C408.8 128 416 135.2 416 144V160H496C504.8 160 512 167.2 512 176V208C512 216.8 504.8 224 496 224zM496 384H288V400C288 408.8 280.8 416 272 416H240C231.2 416 224 408.8 224 400V384H16C7.2 384 0 376.8 0 368V336C0 327.2 7.2 320 16 320H224V304C224 295.2 231.2 288 240 288H272C280.8 288 288 295.2 288 304V320H496C504.8 320 512 327.2 512 336V368C512 376.8 504.8 384 496 384z" />
+    <glyph glyph-name="smile"
+      unicode="&#xF118;"
+      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM328 272C345.7 272 360 257.7 360 240S345.7 208 328 208S296 222.3 296 240S310.3 272 328 272zM168 272C185.7 272 200 257.7 200 240S185.7 208 168 208S136 222.3 136 240S150.3 272 168 272zM362.8 101.8C334.3 67.6 292.5 48 248 48S161.7 67.6 133.2 101.8C127.5 108.6 128.5 118.7 135.2 124.3C142 130 152.1 129 157.7 122.3C180.1 95.4 212.9 80.1 247.9 80.1S315.7 95.5 338.1 122.3C343.8 129.1 353.8 130 360.6 124.3C367.5 118.6 368.4 108.5 362.8 101.8z" />
+    <glyph glyph-name="smoking-ban"
+      unicode="&#xF54D;"
+      horiz-adv-x="512" d=" M96 144C96 135.2 103.2 128 112 128H229.5L133.5 224H112C103.2 224 96 216.8 96 208V144zM256 448C114.6 448 0 333.4 0 192S114.6 -64 256 -64S512 50.6 512 192S397.4 448 256 448zM256 0C150.1 0 64 86.1 64 192C64 233.4 77.3 271.7 99.7 303.1L367.1 35.7C335.7 13.3 297.4 0 256 0zM301.2 192H384V160H333.2L301.2 192zM412.3 80.9L365.2 128H400C408.8 128 416 135.2 416 144V208C416 216.8 408.8 224 400 224H269.2L144.9 348.3C176.3 370.7 214.6 384 256 384C361.9 384 448 297.9 448 192C448 150.6 434.7 112.3 412.3 80.9zM320.6 320C305 320 292 331.2 289.2000000000001 345.9C288.5000000000001 349.5 285.2000000000001 352 281.5000000000001 352H265.3000000000001C260.3000000000001 352 256.6000000000001 347.5 257.3000000000001 342.6C261.9000000000001 311.7 288.5000000000001 288 320.6000000000001 288C336.2000000000001 288 349.2000000000001 276.8 352.0000000000001 262.1C352.7000000000001 258.5 356.0000000000001 256 359.7000000000001 256H375.9000000000001C380.9000000000001 256 384.6 260.5 383.9000000000001 265.4C379.3 296.3 352.7000000000001 320 320.6 320z" />
+    <glyph glyph-name="smoking"
+      unicode="&#xF48D;"
+      horiz-adv-x="640" d=" M632 96H584C579.6 96 576 92.4 576 88V-56C576 -60.4 579.6 -64 584 -64H632C636.4 -64 640 -60.4 640 -56V88C640 92.4 636.4 96 632 96zM553.3 360.9C547.5999999999999 364.7 544 370.9 544 377.7V440C544 444.4 540.4 448 536 448H488C483.6 448 480 444.4 480 440V377.7C480 355.7 490.2 334.3 508.6 322.3C550.8000000000001 295 576 248.5 576 198.3V168C576 163.6 579.6 160 584 160H632C636.4 160 640 163.6 640 168V198.3C640 263.8 607.6 324.5 553.3 360.9zM432 96H48C21.5 96 0 74.5 0 48V-16C0 -42.5 21.5 -64 48 -64H432C440.8 -64 448 -56.8 448 -48V80C448 88.8 440.8 96 432 96zM400 -16H224V48H400V-16zM487.7 306.4C463.8 323 448 348.7 448 377.7V440C448 444.4 444.4 448 440 448H392C387.6 448 384 444.4 384 440V373.6C384 329.9 408.6 292 444.3 266.9C466.7 251.2 480 225.7 480 198.3V168C480 163.6 483.6 160 488 160H536C540.4 160 544 163.6 544 168V198.3C544 241.6 523 281.7000000000001 487.7 306.4zM536 96H488C483.6 96 480 92.4 480 88V-56C480 -60.4 483.6 -64 488 -64H536C540.4 -64 544 -60.4 544 -56V88C544 92.4 540.4 96 536 96z" />
+    <glyph glyph-name="snowflake"
+      unicode="&#xF2DC;"
+      horiz-adv-x="448" d=" M444.816 146.361A24.12 24.12 0 0 1 447.477 163.339C444.752 176.305 432.138 184.584 419.303 181.831L331.896 156.785L264 192L331.896 227.215L419.303 202.169C432.138 199.416 444.752 207.695 447.477 220.661C450.202 233.627 442.006 246.369 429.172 249.122L381.695 256.259L434.772 287.2150000000001C446.135 293.842 450.029 308.521 443.468 320C436.9070000000001 331.479 422.377 335.4120000000001 411.014 328.785L357.937 297.829L375.558 342.933C379.615 355.539 372.79 369.079 360.311 373.178C347.833 377.2770000000001 334.428 370.3810000000001 330.371 357.776L308.139 268.786L247.759 233.571V304L312.9340000000001 367.945C321.7120000000001 377.7970000000001 320.9210000000001 392.972 311.168 401.839C301.415 410.706 286.3930000000001 409.907 277.616 400.055L247.759 362.088V424C247.759 437.255 237.122 448 224.001 448S200.243 437.255 200.243 424V362.088L170.386 400.055C161.607 409.907 146.587 410.707 136.834 401.839C127.081 392.972 126.291 377.7970000000001 135.068 367.945L200.242 304V233.569L139.862 268.784L117.63 357.774C113.573 370.379 100.168 377.2750000000001 87.69 373.1760000000001C75.212 369.077 68.386 355.536 72.443 342.9310000000001L90.063 297.827L36.986 328.783C25.623 335.41 11.093 331.477 4.532 319.998S1.865 293.841 13.228 287.213L66.305 256.257L18.828 249.12C5.993 246.366 -2.203 233.625 0.523 220.659C3.248 207.694 15.862 199.414 28.697 202.167L116.104 227.213L184 192L116.104 156.785L28.698 181.83C15.863 184.583 3.249 176.304 0.524 163.338C-2.201 150.371 5.994 137.63 18.829 134.877L66.306 127.74L13.229 96.7839999999999C1.866 90.157 -2.027 75.479 4.533 64S25.624 48.588 36.987 55.215L90.064 86.171L72.444 41.067A24.157 24.157 0 0 1 74.466 21.639C77.297 16.686 81.882 12.73 87.69 10.823C100.168 6.724 113.573 13.6200000000001 117.63 26.225L139.862 115.215L200.242 150.4300000000001V80L135.067 16.055C126.289 6.203 127.08 -8.972 136.833 -17.839C146.587 -26.707 161.607 -25.907 170.385 -16.055L200.242 21.912V-40C200.242 -53.255 210.879 -64 224 -64S247.758 -53.255 247.758 -40V21.912L277.615 -16.055A23.59 23.59 0 0 1 295.282 -24A23.534 23.534 0 0 1 311.167 -17.839C320.92 -8.972 321.711 6.203 312.933 16.055L247.758 80V150.431L308.1380000000001 115.216L330.37 26.226C334.427 13.621 347.832 6.725 360.31 10.824C372.789 14.923 379.614 28.464 375.557 41.069L357.9360000000001 86.173L411.0130000000001 55.217C422.3760000000001 48.59 436.9060000000001 52.523 443.4670000000001 64.002S446.134 90.159 434.771 96.787L381.694 127.7430000000001L429.171 134.8800000000001C436.031 136.3490000000001 441.565 140.6730000000001 444.816 146.3610000000001z" />
+    <glyph glyph-name="sort-alpha-down"
+      unicode="&#xF15D;"
+      horiz-adv-x="448" d=" M187.298 52.686L107.314 -27.316C101.066 -33.563 90.931 -33.561 84.687 -27.316L4.705 52.686C-5.365 62.756 1.807 80 16.019 80H64V400C64 408.837 71.163 416 80 416H112C120.837 416 128 408.837 128 400V80H175.984C190.225 80 197.347 62.736 187.298 52.686zM306.373 232.693A12 12 0 0 0 294.838 224H259.1210000000001C250.9010000000001 224 245.1140000000001 232.078 247.7590000000001 239.861L304.855 407.861A12 12 0 0 0 316.217 416H355.783C360.9220000000001 416 365.4910000000001 412.727 367.1450000000001 407.861L424.2410000000001 239.861C426.886 232.078 421.1 224 412.879 224H377.144A12 12 0 0 0 365.629 232.622L357.3280000000001 260.9210000000001H314.4650000000001L306.3730000000001 232.693zM329.23 311.39H342.5970000000001L335.997 334.327L329.23 311.39zM341.805 24.067L409.256 119.765A12 12 0 0 1 411.448 126.678V148C411.448 154.627 406.075 160 399.448 160H274.522C267.895 160 262.522 154.627 262.522 148V119.07C262.522 112.443 267.895 107.07 274.522 107.07H330.991C330.252 106.079 329.494 105.034 328.721 103.937L261.5180000000001 8.732A12.001000000000001 12.001000000000001 0 0 1 259.322 1.812V-20C259.322 -26.627 264.695 -32 271.322 -32H400.677C407.3040000000001 -32 412.677 -26.627 412.677 -20V8.93C412.677 15.557 407.3040000000001 20.93 400.677 20.93H339.531C340.271 21.923 341.031 22.969 341.805 24.067z" />
+    <glyph glyph-name="sort-alpha-up"
+      unicode="&#xF15E;"
+      horiz-adv-x="448" d=" M4.702 331.314L84.686 411.316C90.934 417.563 101.069 417.561 107.313 411.316L187.294 331.314C197.364 321.2440000000001 190.193 304 175.98 304H128V-16C128 -24.837 120.837 -32 112 -32H80C71.163 -32 64 -24.837 64 -16V304H16.016C1.775 304 -5.347 321.264 4.702 331.314zM306.373 232.693A12 12 0 0 0 294.838 224H259.1210000000001C250.9010000000001 224 245.1140000000001 232.078 247.7590000000001 239.861L304.855 407.861A12 12 0 0 0 316.217 416H355.783C360.9220000000001 416 365.4910000000001 412.727 367.1450000000001 407.861L424.2410000000001 239.861C426.886 232.078 421.1 224 412.879 224H377.144A12 12 0 0 0 365.629 232.622L357.3280000000001 260.9210000000001H314.4650000000001L306.3730000000001 232.693zM329.23 311.39H342.5970000000001L335.997 334.327L329.23 311.39zM341.805 24.067L409.256 119.765A12 12 0 0 1 411.448 126.678V148C411.448 154.627 406.075 160 399.448 160H274.522C267.895 160 262.522 154.627 262.522 148V119.07C262.522 112.443 267.895 107.07 274.522 107.07H330.991C330.252 106.079 329.494 105.034 328.721 103.937L261.5180000000001 8.732A12.001000000000001 12.001000000000001 0 0 1 259.322 1.812V-20C259.322 -26.627 264.695 -32 271.322 -32H400.677C407.3040000000001 -32 412.677 -26.627 412.677 -20V8.93C412.677 15.557 407.3040000000001 20.93 400.677 20.93H339.531C340.271 21.923 341.031 22.969 341.805 24.067z" />
+    <glyph glyph-name="sort-amount-down"
+      unicode="&#xF160;"
+      horiz-adv-x="512" d=" M187.298 52.686L107.314 -27.316C101.066 -33.563 90.931 -33.561 84.687 -27.316L4.705 52.686C-5.365 62.756 1.807 80 16.019 80H64V400C64 408.837 71.163 416 80 416H112C120.837 416 128 408.837 128 400V80H175.984C190.225 80 197.347 62.736 187.298 52.686zM240 352H496C504.837 352 512 359.163 512 368V400C512 408.837 504.837 416 496 416H240C231.163 416 224 408.837 224 400V368C224 359.163 231.163 352 240 352zM224 240V272C224 280.837 231.163 288 240 288H432C440.837 288 448 280.837 448 272V240C448 231.163 440.837 224 432 224H240C231.163 224 224 231.163 224 240zM224 -16V16C224 24.837 231.163 32 240 32H304C312.837 32 320 24.837 320 16V-16C320 -24.837 312.837 -32 304 -32H240C231.163 -32 224 -24.837 224 -16zM224 112V144C224 152.837 231.163 160 240 160H368C376.837 160 384 152.837 384 144V112C384 103.163 376.837 96 368 96H240C231.163 96 224 103.163 224 112z" />
+    <glyph glyph-name="sort-amount-up"
+      unicode="&#xF161;"
+      horiz-adv-x="512" d=" M4.702 331.314L84.686 411.316C90.934 417.563 101.069 417.561 107.313 411.316L187.294 331.314C197.364 321.2440000000001 190.193 304 175.98 304H128V-16C128 -24.837 120.837 -32 112 -32H80C71.163 -32 64 -24.837 64 -16V304H16.016C1.775 304 -5.347 321.264 4.702 331.314zM240 352H496C504.837 352 512 359.163 512 368V400C512 408.837 504.837 416 496 416H240C231.163 416 224 408.837 224 400V368C224 359.163 231.163 352 240 352zM224 240V272C224 280.837 231.163 288 240 288H432C440.837 288 448 280.837 448 272V240C448 231.163 440.837 224 432 224H240C231.163 224 224 231.163 224 240zM224 -16V16C224 24.837 231.163 32 240 32H304C312.837 32 320 24.837 320 16V-16C320 -24.837 312.837 -32 304 -32H240C231.163 -32 224 -24.837 224 -16zM224 112V144C224 152.837 231.163 160 240 160H368C376.837 160 384 152.837 384 144V112C384 103.163 376.837 96 368 96H240C231.163 96 224 103.163 224 112z" />
+    <glyph glyph-name="sort-down"
+      unicode="&#xF0DD;"
+      horiz-adv-x="320" d=" M41 160H279C300.4 160 311.1 134.1 296 119L177 0C167.6 -9.4 152.4 -9.4 143.1 0L24 119C8.9 134.1 19.6 160 41 160z" />
+    <glyph glyph-name="sort-numeric-down"
+      unicode="&#xF162;"
+      horiz-adv-x="448" d=" M308.811 334.213L289.363 355.008C284.841 359.844 285.089 367.429 289.919 371.958L333.362 412.699A11.999000000000002 11.999000000000002 0 0 0 341.571 415.9460000000001H373.162C379.789 415.9460000000001 385.162 410.573 385.162 403.9460000000001V276.876H410.822C417.449 276.876 422.822 271.5030000000001 422.822 264.876V235.946C422.822 229.319 417.449 223.946 410.822 223.946H301.649C295.022 223.946 289.649 229.319 289.649 235.946V264.876C289.649 271.5030000000001 295.022 276.876 301.649 276.876H327.063V334.814C319.809 328.2340000000001 312.852 329.8930000000001 308.811 334.213zM278.241 95.644C278.241 128.297 302.106 163 346.335 163C384.588 163 425.759 134.139 425.759 70.772C425.759 19.496 393.522 -35 333.776 -35C315.94 -35 303.23 -31.443 295.228 -28.219C289.438 -25.886 286.439 -19.473 288.306 -13.516L297.543 15.964C299.5780000000001 22.46 306.592 25.947 313.01 23.68C326.039 19.078 340.888 18.405 351.113 27.818C312.371 22.746 278.241 53.178 278.241 95.644zM370.514 76.306C370.514 98.591 355.212 112.811 344.6790000000001 112.811C336.0370000000001 112.811 331.5150000000001 104.846 331.5150000000001 96.979C331.5150000000001 91.31 333.3300000000001 72.811 356.6830000000001 72.811C366.6560000000001 72.811 370.0600000000001 74.965 370.427 75.542C370.4480000000001 75.588 370.514 75.833 370.514 76.306zM175.984 80H128V400C128 408.837 120.837 416 112 416H80C71.163 416 64 408.837 64 400V80H16.019C1.807 80 -5.365 62.756 4.705 52.686L84.686 -27.316C90.931 -33.561 101.066 -33.563 107.313 -27.316L187.297 52.686C197.347 62.736 190.225 80 175.984 80z" />
+    <glyph glyph-name="sort-numeric-up"
+      unicode="&#xF163;"
+      horiz-adv-x="448" d=" M308.811 334.213L289.363 355.008C284.841 359.844 285.089 367.429 289.919 371.958L333.362 412.699A11.999000000000002 11.999000000000002 0 0 0 341.571 415.9460000000001H373.162C379.789 415.9460000000001 385.162 410.573 385.162 403.9460000000001V276.876H410.822C417.449 276.876 422.822 271.5030000000001 422.822 264.876V235.946C422.822 229.319 417.449 223.946 410.822 223.946H301.649C295.022 223.946 289.649 229.319 289.649 235.946V264.876C289.649 271.5030000000001 295.022 276.876 301.649 276.876H327.063V334.814C319.809 328.2340000000001 312.852 329.8930000000001 308.811 334.213zM278.241 95.644C278.241 128.297 302.106 163 346.335 163C384.588 163 425.759 134.139 425.759 70.772C425.759 19.496 393.522 -35 333.776 -35C315.94 -35 303.23 -31.443 295.228 -28.219C289.438 -25.886 286.439 -19.473 288.306 -13.516L297.543 15.964C299.5780000000001 22.46 306.592 25.947 313.01 23.68C326.039 19.078 340.888 18.405 351.113 27.818C312.371 22.746 278.241 53.178 278.241 95.644zM370.514 76.306C370.514 98.591 355.212 112.811 344.6790000000001 112.811C336.0370000000001 112.811 331.5150000000001 104.846 331.5150000000001 96.979C331.5150000000001 91.31 333.3300000000001 72.811 356.6830000000001 72.811C366.6560000000001 72.811 370.0600000000001 74.965 370.427 75.542C370.4480000000001 75.588 370.514 75.833 370.514 76.306zM16.016 304H64V-16C64 -24.837 71.163 -32 80 -32H112C120.837 -32 128 -24.837 128 -16V304H175.981C190.193 304 197.365 321.2440000000001 187.295 331.314L107.314 411.316C101.069 417.561 90.934 417.563 84.687 411.316L4.702 331.314C-5.347 321.264 1.775 304 16.016 304z" />
+    <glyph glyph-name="sort-up"
+      unicode="&#xF0DE;"
+      horiz-adv-x="320" d=" M279 224H41C19.6 224 8.9 249.9 24 265L143 384C152.4 393.4 167.6 393.4 176.9 384L295.9 265C311.1 249.9 300.4 224 279 224z" />
+    <glyph glyph-name="sort"
+      unicode="&#xF0DC;"
+      horiz-adv-x="320" d=" M41 160H279C300.4 160 311.1 134.1 296 119L177 0C167.6 -9.4 152.4 -9.4 143.1 0L24 119C8.9 134.1 19.6 160 41 160zM296 265L177 384C167.6 393.4 152.4 393.4 143.1 384L24 265C8.9 249.9 19.6 224 41 224H279C300.4 224 311.1 249.9 296 265z" />
+    <glyph glyph-name="space-shuttle"
+      unicode="&#xF197;"
+      horiz-adv-x="640" d=" M592.604 239.756C559.735 255.164 515.777 264 472 264H186.327C181.375 270.555 175.742 275.978 169.607 280H376C229.157 310.253 219.403 416 96.003 416H96V288H80V416C53.49 416 32 387.346 32 352V288C8.803 288 0 277.968 0 264V224C0 210.017 8.819 200 32 200V184C8.803 184 0 173.968 0 160V120C0 106.017 8.819 96 32 96V32C32 -3.346 53.49 -32 80 -32V96H96V-32H96.003C219.403 -32 229.157 73.747 376 104H169.606C175.741 108.022 181.374 113.445 186.326 120H472C515.777 120 559.735 128.836 592.604 144.244C622.282 158.155 640 176.008 640 192S622.282 225.845 592.604 239.756zM488 152A8 8 0 0 0 480 160V224A8 8 0 0 0 488 232C519.909 232 519.942 152 488 152z" />
+    <glyph glyph-name="spinner"
+      unicode="&#xF110;"
+      horiz-adv-x="512" d=" M304 400C304 373.49 282.51 352 256 352S208 373.49 208 400S229.49 448 256 448S304 426.51 304 400zM256 32C229.49 32 208 10.51 208 -16S229.49 -64 256 -64S304 -42.51 304 -16S282.51 32 256 32zM464 240C437.49 240 416 218.51 416 192S437.49 144 464 144S512 165.49 512 192S490.51 240 464 240zM96 192C96 218.51 74.51 240 48 240S0 218.51 0 192S21.49 144 48 144S96 165.49 96 192zM108.922 92.922C82.412 92.922 60.922 71.432 60.922 44.922S82.412 -3.078 108.922 -3.078S156.922 18.412 156.922 44.922C156.922 71.431 135.431 92.922 108.922 92.922zM403.078 92.922C376.568 92.922 355.078 71.432 355.078 44.922S376.568 -3.078 403.078 -3.078S451.078 18.412 451.078 44.922C451.078 71.431 429.588 92.922 403.078 92.922zM108.922 387.078C82.412 387.078 60.922 365.588 60.922 339.078S82.412 291.078 108.922 291.078S156.922 312.568 156.922 339.078S135.431 387.078 108.922 387.078z" />
+    <glyph glyph-name="square-full"
+      unicode="&#xF45C;"
+      horiz-adv-x="512" d=" M512 -64H0V448H512V-64z" />
+    <glyph glyph-name="square"
+      unicode="&#xF0C8;"
+      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416z" />
+    <glyph glyph-name="star-half"
+      unicode="&#xF089;"
+      horiz-adv-x="576" d=" M288 448C276.6 448 265.2 442.1 259.3 430.2L194 297.8L47.9 276.6C21.7 272.8 11.2 240.5 30.2 222L135.9 119L110.9 -26.5C106.4 -52.6 133.9 -72.5 157.3 -60.2L288 8.4V448z" />
+    <glyph glyph-name="star"
+      unicode="&#xF005;"
+      horiz-adv-x="576" d=" M259.3 430.2L194 297.8L47.9 276.5C21.7 272.7 11.2 240.4 30.2 221.9L135.9 118.9L110.9 -26.6C106.4 -52.9 134.1 -72.6 157.3 -60.3L288 8.4L418.7 -60.3C441.9 -72.5 469.6 -52.9 465.1 -26.6L440.1 118.9L545.8 221.9C564.8 240.4 554.3 272.7 528.0999999999999 276.5L382 297.8L316.7 430.2C305 453.8 271.1 454.1 259.3 430.2z" />
+    <glyph glyph-name="step-backward"
+      unicode="&#xF048;"
+      horiz-adv-x="448" d=" M64 -20V404C64 410.6 69.4 416 76 416H124C130.6 416 136 410.6 136 404V227.6L331.5 408.6C352.1 425.7 384 411.4 384 384V0C384 -27.4 352.1 -41.7 331.5 -24.6L136 155.3V-20C136 -26.6 130.6 -32 124 -32H76C69.4 -32 64 -26.6 64 -20z" />
+    <glyph glyph-name="step-forward"
+      unicode="&#xF051;"
+      horiz-adv-x="448" d=" M384 404V-20C384 -26.6 378.6 -32 372 -32H324C317.4 -32 312 -26.6 312 -20V156.4L116.5 -24.6C95.9 -41.7 64 -27.4 64 0V384C64 411.4 95.9 425.7 116.5 408.6L312 228.7V404C312 410.6 317.4 416 324 416H372C378.6 416 384 410.6 384 404z" />
+    <glyph glyph-name="stethoscope"
+      unicode="&#xF0F1;"
+      horiz-adv-x="512" d=" M447.1 336C412.9000000000001 335.5 384.8 307.6 384.1 273.4C383.6 249.1 396.6 227.8 416.1 216.6V104C416.1 46.7 365.9000000000001 0 304.1 0C244.1 0 194.9 44.1 192.2 99.2C265 114.2 320 178.8 320 256V411.4C320 422.8 311.9 432.7 300.7 434.9L237.8 447.5C224.8 450.1 212.2 441.7 209.6 428.7L206.4 413C203.8 400 212.2 387.4 225.2 384.8L255.9 378.7V257.3C255.9 204.4 213.7 160.6 160.8 160.1C107.4 159.6 63.9 202.8 63.9 256.1V378.6L94.6 384.7C107.6 387.3 116 399.9 113.4 412.9L110.3 428.6C107.7 441.6 95.1 450 82.1 447.4L19.3 435C8.1 432.7 0 422.9 0 411.4V256C0 178.7 55.1 114 128.1 99.2C130.7 8.8 208.6 -64 304 -64C401 -64 480 11.4 480 104V216.6C499.1 227.7 512 248.3 512 272C512 307.7 482.8 336.5 447.1 336zM448 256C439.2 256 432 263.2 432 272S439.2 288 448 288S464 280.8 464 272S456.8 256 448 256z" />
+    <glyph glyph-name="sticky-note"
+      unicode="&#xF249;"
+      horiz-adv-x="448" d=" M312 128H448V392C448 405.3 437.3 416 424 416H24C10.7 416 0 405.3 0 392V-8C0 -21.3 10.7 -32 24 -32H288V104C288 117.2 298.8 128 312 128zM441 73L343 -25C338.5 -29.5 332.4 -32 326 -32H320V96H448V89.9C448 83.6 445.5 77.5 441 73z" />
+    <glyph glyph-name="stop-circle"
+      unicode="&#xF28D;"
+      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM352 112C352 103.2 344.8 96 336 96H176C167.2 96 160 103.2 160 112V272C160 280.8 167.2 288 176 288H336C344.8 288 352 280.8 352 272V112z" />
+    <glyph glyph-name="stop"
+      unicode="&#xF04D;"
+      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416z" />
+    <glyph glyph-name="stopwatch"
+      unicode="&#xF2F2;"
+      horiz-adv-x="448" d=" M432 144C432 29.1 338.9 -64 224 -64S16 29.1 16 144C16 248 92.3 334.2 192 349.5V384H164C157.4 384 152 389.4 152 396V436C152 442.6 157.4 448 164 448H284C290.6 448 296 442.6 296 436V396C296 389.4 290.6 384 284 384H256V349.5C293.5 343.7 327.7 327.9 355.7 304.9L383.2 332.4C387.9 337.1 395.5 337.1 400.2 332.4L428.5 304.1C433.2 299.4 433.2 291.8 428.5 287.1L399.1 257.7L398.5 257.1C419.7 224.7 432 185.8 432 144zM256 108V259.5C256 266.1 250.6 271.5 244 271.5H204C197.4 271.5 192 266.1 192 259.5V108C192 101.4 197.4 96 204 96H244C250.6 96 256 101.4 256 108z" />
+    <glyph glyph-name="store-alt"
+      unicode="&#xF54F;"
+      horiz-adv-x="640" d=" M320 64H128V224H64V-32C64 -49.7 78.3 -64 96 -64H352C369.7 -64 384 -49.7 384 -32V224H320V64zM634.6 305.8L549.3000000000001 433.8C543.3000000000001 442.7 533.3000000000001 448 522.6 448H117.4C106.7 448 96.7 442.7 90.8 433.8L5.5 305.8C-8.7 284.5 6.5 256 32.1 256H608C633.5 256 648.7 284.5 634.6 305.8zM512 -48C512 -56.8 519.2 -64 528 -64H560C568.8 -64 576 -56.8 576 -48V224H512V-48z" />
+    <glyph glyph-name="store"
+      unicode="&#xF54E;"
+      horiz-adv-x="616" d=" M602 329.4L537.1 433C531.3 442.3 521 448 510 448H106C95 448 84.7 442.3 78.9 433L14 329.4C-19.5 275.9 10.2 201.5 72.8 193C77.3 192.4 81.9 192.1 86.5 192.1C116.1 192.1 142.3 205.1 160.3 225.2C178.3 205.1 204.6 192.1 234.1 192.1C263.7000000000001 192.1 289.9000000000001 205.1 307.9000000000001 225.2C325.9000000000001 205.1 352.2000000000001 192.1 381.7000000000001 192.1C411.3000000000001 192.1 437.5000000000001 205.1 455.5000000000001 225.2C473.6000000000001 205.1 499.8000000000001 192.1 529.3000000000001 192.1C534.0000000000001 192.1 538.5000000000001 192.4 543.0000000000001 193C605.8000000000001 201.4 635.6000000000001 275.8 602.0000000000001 329.4zM529.5 160C519.5 160 509.6 161.5 500 163.8V64H116V163.8C106.4 161.6 96.5 160 86.5 160C80.5 160 74.4 160.4 68.5 161.2C62.9 162 57.4 163.3 52.1 164.8V-32C52.1 -49.7 66.4 -64 84.1 -64H532.1C549.8000000000001 -64 564.1 -49.7 564.1 -32V164.8C558.7 163.2 553.3000000000001 161.9 547.7 161.2C541.6 160.4 535.6 160 529.5 160z" />
+    <glyph glyph-name="stream"
+      unicode="&#xF550;"
+      horiz-adv-x="512" d=" M16 320H432C440.84 320 448 327.16 448 336V400C448 408.8400000000001 440.84 416 432 416H16C7.16 416 0 408.8400000000001 0 400V336C0 327.16 7.16 320 16 320zM496 240H80C71.16 240 64 232.84 64 224V160C64 151.16 71.16 144 80 144H496C504.84 144 512 151.16 512 160V224C512 232.84 504.84 240 496 240zM432 64H16C7.16 64 0 56.84 0 48V-16C0 -24.84 7.16 -32 16 -32H432C440.84 -32 448 -24.84 448 -16V48C448 56.84 440.84 64 432 64z" />
+    <glyph glyph-name="street-view"
+      unicode="&#xF21D;"
+      horiz-adv-x="512" d=" M192 384C192 419.346 220.654 448 256 448S320 419.346 320 384C320 348.654 291.346 320 256 320S192 348.654 192 384zM304 304H292.64C269.929 293.557 243.05 293.106 219.36 304H208C181.49 304 160 282.51 160 256V152C160 138.745 170.745 128 184 128H200V24C200 10.745 210.745 0 224 0H288C301.255 0 312 10.745 312 24V128H328C341.255 128 352 138.745 352 152V256C352 282.51 330.51 304 304 304zM389.642 114.848A72.50299999999999 72.50299999999999 0 0 0 360.632 87.839C391.133 82.749 480 62.146 480 32C480 -14.304 312.344 -32 256 -32C185.697 -32 32 -11.141 32 32C32 62.123 120.361 82.665 151.367 87.839A72.516 72.516 0 0 0 122.357 114.848C74.959 104.605 0 80.401 0 32C0 -45.111 178.658 -64 256 -64C333.249 -64 512 -45.135 512 32C512 80.403 437.033 104.606 389.642 114.848z" />
+    <glyph glyph-name="strikethrough"
+      unicode="&#xF0CC;"
+      horiz-adv-x="512" d=" M496 160H16C7.163 160 0 167.163 0 176V208C0 216.837 7.163 224 16 224H496C504.837 224 512 216.837 512 208V176C512 167.163 504.837 160 496 160zM281.334 144C308.592 131.063 327.858 115.317 327.858 87.757C327.858 54.649 298.8810000000001 34.081 252.237 34.081C219.912 34.081 175.363 46.161 175.363 78.352V80C175.363 88.837 168.1990000000001 96 159.363 96H113.75C104.914 96 97.75 88.837 97.75 80V60.796C97.75 -6.049 175.467 -41.024 252.237 -41.024C340.815 -41.024 414.25 4.414 414.25 93.4C414.25 113.215 410.632 129.817 404.107 144H281.334zM250.382 240C217.96 253.505 193.546 268.9460000000001 193.546 299.683C193.546 333.603 224.447 347.089 258.508 347.089C301.155 347.089 323.47 330.496 323.47 314.104V312C323.47 303.163 330.634 296 339.47 296H385.083C393.919 296 401.083 303.163 401.083 312V342.318C401.083 394.756 329.358 422.193 258.508 422.193C173.305 422.193 107.782 381.221 107.782 296.5470000000001C107.782 273.837 112.447 255.371 120.559 240H250.382z" />
+    <glyph glyph-name="stroopwafel"
+      unicode="&#xF551;"
+      horiz-adv-x="512" d=" M188.12 237.26L142.86 192L188.11 146.75L233.37 192L188.12 237.26zM301.25 259.88L256 305.14L210.75 259.89L256 214.63L301.25 259.88zM210.75 124.12L256 78.86L301.26 124.12L256 169.37L210.75 124.12zM256 448C114.62 448 0 333.38 0 192S114.62 -64 256 -64S512 50.62 512 192S397.38 448 256 448zM442.68 152.4L431.37 141.09C428.25 137.97 423.18 137.97 420.06 141.09L391.77 169.38L346.52 124.13L380.46 90.19L397.43 107.16C400.55 110.28 405.62 110.28 408.74 107.16L420.05 95.85C423.17 92.73 423.17 87.66 420.05 84.54L403.08 67.5699999999999L420.05 50.5999999999999C423.17 47.4799999999999 423.17 42.4099999999999 420.05 39.2899999999999L408.74 27.9799999999999C405.62 24.8599999999999 400.55 24.8599999999999 397.43 27.9799999999999L380.4599999999999 44.9499999999999L363.4899999999999 27.9799999999999C360.3699999999999 24.8599999999999 355.2999999999999 24.8599999999999 352.1799999999999 27.9799999999999L340.8699999999999 39.2899999999999C337.7499999999999 42.4099999999999 337.7499999999999 47.4799999999999 340.8699999999999 50.5999999999999L357.8399999999999 67.5699999999999L323.8999999999999 101.5099999999999L278.64 56.2499999999999L306.93 27.9599999999999C310.05 24.8399999999999 310.05 19.7699999999999 306.93 16.6499999999999L295.62 5.3399999999999C292.5 2.2199999999999 287.43 2.2199999999999 284.31 5.3399999999999L256 33.61L227.71 5.32C224.59 2.2 219.52 2.2 216.4 5.32L205.09 16.63C201.97 19.75 201.97 24.82 205.09 27.94L233.38 56.23L188.13 101.49L154.19 67.55L171.16 50.58C174.28 47.46 174.28 42.39 171.16 39.27L159.85 27.96C156.73 24.84 151.66 24.84 148.54 27.96L131.57 44.9300000000001L114.6 27.96C111.48 24.84 106.41 24.84 103.29 27.96L91.98 39.27C88.86 42.39 88.86 47.46 91.98 50.58L108.95 67.5500000000001L91.98 84.5200000000001C88.86 87.6400000000001 88.86 92.7100000000001 91.98 95.8300000000001L103.29 107.1400000000001C106.41 110.2600000000001 111.48 110.2600000000001 114.6 107.1400000000001L131.57 90.1700000000001L165.51 124.1100000000001L120.26 169.3600000000001L91.97 141.0700000000001C88.85 137.9500000000001 83.78 137.9500000000001 80.66 141.0700000000001L69.32 152.4C66.2 155.52 66.2 160.59 69.32 163.71L97.61 192L69.32 220.29C66.2 223.41 66.2 228.48 69.32 231.6L80.63 242.91C83.75 246.03 88.82 246.03 91.94 242.91L120.23 214.62L165.48 259.88L131.54 293.82L114.57 276.85C111.45 273.73 106.38 273.73 103.26 276.85L91.95 288.16C88.83 291.28 88.83 296.35 91.95 299.4700000000001L108.92 316.44L91.95 333.41C88.83 336.53 88.83 341.6 91.95 344.7200000000001L103.26 356.03C106.38 359.15 111.45 359.15 114.57 356.03L131.54 339.06L148.51 356.03C151.63 359.15 156.7 359.15 159.82 356.03L171.13 344.7200000000001C174.25 341.6 174.25 336.53 171.13 333.41L154.16 316.44L188.1 282.5L233.36 327.75L205.07 356.04C201.95 359.16 201.95 364.23 205.07 367.35L216.38 378.66C219.5 381.78 224.57 381.78 227.69 378.66L256 350.39L284.29 378.68C287.4100000000001 381.8 292.48 381.8 295.6 378.68L306.9100000000001 367.37C310.0300000000001 364.25 310.0300000000001 359.18 306.9100000000001 356.06L278.62 327.77L323.88 282.52L357.82 316.4600000000001L340.85 333.43C337.73 336.55 337.73 341.62 340.85 344.74L352.1600000000001 356.05C355.2800000000001 359.17 360.35 359.17 363.4700000000001 356.05L380.4400000000001 339.0800000000001L397.4100000000001 356.05C400.5300000000001 359.17 405.6000000000001 359.17 408.7200000000001 356.05L420.0300000000001 344.74C423.1500000000001 341.62 423.1500000000001 336.55 420.0300000000001 333.43L403.0600000000001 316.4600000000001L420.0300000000001 299.49C423.1500000000001 296.37 423.1500000000001 291.3 420.0300000000001 288.18L408.7200000000001 276.87C405.6000000000001 273.75 400.5300000000001 273.75 397.4100000000001 276.87L380.4400000000001 293.8400000000001L346.5000000000001 259.9L391.7500000000001 214.64L420.0400000000001 242.93C423.1600000000001 246.05 428.2300000000001 246.05 431.3500000000001 242.93L442.6600000000001 231.62C445.7800000000001 228.5 445.7800000000001 223.43 442.6600000000001 220.31L414.39 192L442.68 163.72A8.015 8.015 0 0 0 442.68 152.4zM278.63 192L323.89 146.75L369.14 192L323.89 237.26L278.63 192z" />
+    <glyph glyph-name="subscript"
+      unicode="&#xF12C;"
+      horiz-adv-x="512" d=" M395.198 32C398.659 42.526 413.994 53.28 431.463 64.425C448.088 75.03 466.9299999999999 87.051 481.804 103.287C499.2619999999999 122.341 507.748 143.4620000000001 507.748 167.8540000000001C507.748 228.4160000000001 457.046 256.0000000000001 409.938 256.0000000000001C367.447 256.0000000000001 333.56 233.9840000000001 315.506 205.5530000000001C310.852 198.2240000000001 312.914 188.5170000000001 320.129 183.6880000000001L350.457 163.3920000000001C357.4889999999999 158.686 366.9169999999999 160.3080000000001 372.087 167.006C380.1089999999999 177.4 390.9049999999999 185.2310000000001 403.7539999999999 185.2310000000001C423.1409999999999 185.2310000000001 430.0199999999999 172.3300000000001 430.0199999999999 161.2830000000001C430.0199999999999 125.1240000000001 310.5829999999999 104.2600000000001 310.5829999999999 1.2590000000001C310.5829999999999 -5.3949999999999 311.1439999999999 -11.7549999999999 311.998 -18.0719999999999C313.074 -26.0359999999999 319.832 -31.9999999999999 327.868 -31.9999999999999H496C504.837 -31.9999999999999 512 -24.8369999999999 512 -15.9999999999999V16.0000000000001C512 24.837 504.837 32.0000000000001 496 32.0000000000001H395.198zM272 192C280.837 192 288 184.837 288 176V144C288 135.163 280.837 128 272 128H209.601A16 16 0 0 0 196.06 135.478L150.359 208.093C148.062 211.445 145.937 215.062 144.164 218.302C142.514 215.058 140.517 211.365 138.29 207.72L93.578 135.573A15.999 15.999 0 0 0 79.978 128.001H16C7.163 128.001 0 135.1640000000001 0 144.001V176.001C0 184.838 7.163 192.001 16 192.001H42.325L98.877 274.7100000000001L46.111 352H16C7.163 352 0 359.163 0 368V400C0 408.837 7.163 416 16 416H84.806A16 16 0 0 0 98.451 408.356L138.333 343.23C140.405 339.707 142.386 336.059 144.06 332.86C145.837 336.104 147.98 339.814 150.297 343.397L190.629 408.432A15.999 15.999 0 0 0 204.226 416H272C280.837 416 288 408.837 288 400V368C288 359.163 280.837 352 272 352H244.021L191.331 276.329L249.974 192H272z" />
+    <glyph glyph-name="subway"
+      unicode="&#xF239;"
+      horiz-adv-x="448" d=" M448 352V96C448 44.185 386.376 0 317.978 0L380.9580000000001 -49.721C386.905 -54.417 383.562 -64 376 -64H72C64.422 -64 61.108 -54.406 67.043 -49.721L130.022 0C61.82 0 0 44.046 0 96V352C0 405.019 64 448 128 448H320C385 448 448 405.019 448 352zM200 216V328C200 341.255 189.255 352 176 352H72C58.745 352 48 341.255 48 328V216C48 202.745 58.745 192 72 192H176C189.255 192 200 202.745 200 216zM400 216V328C400 341.255 389.255 352 376 352H272C258.745 352 248 341.255 248 328V216C248 202.745 258.745 192 272 192H376C389.255 192 400 202.745 400 216zM352 160C325.49 160 304 138.51 304 112S325.49 64 352 64S400 85.49 400 112S378.51 160 352 160zM96 160C69.49 160 48 138.51 48 112S69.49 64 96 64S144 85.49 144 112S122.51 160 96 160z" />
+    <glyph glyph-name="suitcase"
+      unicode="&#xF0F2;"
+      horiz-adv-x="512" d=" M128 -32H384V368C384 394.5 362.5 416 336 416H176C149.5 416 128 394.5 128 368V-32zM192 352H320V320H192V352zM512 272V16C512 -10.5 490.5 -32 464 -32H416V320H464C490.5 320 512 298.5 512 272zM96 -32H48C21.5 -32 0 -10.5 0 16V272C0 298.5 21.5 320 48 320H96V-32z" />
+    <glyph glyph-name="sun"
+      unicode="&#xF185;"
+      horiz-adv-x="512" d=" M274.835 435.354L300.351 372.961C304.564 362.66 317.022 358.612 326.485 364.469L383.8010000000001 399.948C399.2910000000001 409.536 418.6090000000001 395.501 414.2760000000001 377.806L398.2460000000001 312.331C395.5990000000001 301.521 403.2990000000001 290.923 414.3980000000001 290.1L481.6220000000001 285.1130000000001C499.7890000000001 283.765 507.1680000000001 261.0560000000001 493.2630000000001 249.2870000000001L441.81 205.74C433.315 198.55 433.315 185.451 441.81 178.261L493.264 134.713C507.17 122.944 499.791 100.235 481.623 98.887L414.399 93.9C403.3 93.077 395.6 82.479 398.247 71.669L414.2770000000001 6.194C418.6090000000001 -11.501 399.2910000000001 -25.5360000000001 383.802 -15.948L326.486 19.531C317.023 25.389 304.564 21.341 300.352 11.0389999999999L274.836 -51.354C267.94 -68.216 244.062 -68.216 237.166 -51.354L211.65 11.039C207.437 21.34 194.979 25.388 185.516 19.531L128.199 -15.948C112.709 -25.536 93.391 -11.501 97.724 6.194L113.754 71.669C116.401 82.479 108.701 93.077 97.602 93.9L30.378 98.887C12.211 100.235 4.832 122.944 18.737 134.713L70.19 178.26C78.685 185.45 78.685 198.549 70.19 205.739L18.736 249.287C4.83 261.056 12.209 283.765 30.377 285.113L97.601 290.1C108.7 290.923 116.4 301.521 113.753 312.331L97.723 377.806C93.391 395.501 112.709 409.536 128.198 399.948L185.515 364.469C194.978 358.611 207.436 362.659 211.649 372.961L237.165 435.354C244.061 452.215 267.939 452.215 274.835 435.354zM392 192C392 266.991 330.99 328 256 328C181.009 328 120 266.991 120 192S181.009 56 256 56C330.99 56 392 117.009 392 192zM360 192C360 134.654 313.346 88 256 88S152 134.654 152 192S198.654 296 256 296S360 249.346 360 192z" />
+    <glyph glyph-name="superscript"
+      unicode="&#xF12B;"
+      horiz-adv-x="512" d=" M395.198 192C398.659 202.526 413.994 213.28 431.463 224.425C448.088 235.03 466.9299999999999 247.051 481.804 263.2870000000001C499.2619999999999 282.341 507.748 303.462 507.748 327.854C507.748 388.416 457.046 416 409.938 416C367.447 416 333.56 393.984 315.506 365.553C310.852 358.224 312.914 348.517 320.129 343.688L350.457 323.392C357.4889999999999 318.6860000000001 366.9169999999999 320.308 372.087 327.006C380.1089999999999 337.4 390.9049999999999 345.231 403.7539999999999 345.231C423.1409999999999 345.231 430.0199999999999 332.33 430.0199999999999 321.283C430.0199999999999 285.124 310.5829999999999 264.26 310.5829999999999 161.259C310.5829999999999 154.605 311.1439999999999 148.245 311.998 141.928C313.074 133.964 319.832 128 327.868 128H496C504.837 128 512 135.163 512 144V176C512 184.837 504.837 192 496 192H395.198zM272 32C280.837 32 288 24.837 288 16V-16C288 -24.837 280.837 -32 272 -32H209.601A16 16 0 0 0 196.06 -24.522L150.359 48.093C148.062 51.445 145.937 55.062 144.164 58.302C142.514 55.058 140.517 51.365 138.29 47.72L93.578 -24.427A15.999 15.999 0 0 0 79.978 -31.999H16C7.163 -31.999 0 -24.836 0 -15.999V16.001C0 24.838 7.163 32.001 16 32.001H42.325L98.877 114.71L46.111 192H16C7.163 192 0 199.163 0 208V240C0 248.837 7.163 256 16 256H84.806A16 16 0 0 0 98.451 248.356L138.333 183.23C140.405 179.707 142.386 176.059 144.06 172.86C145.837 176.1040000000001 147.98 179.814 150.297 183.397L190.629 248.432A16 16 0 0 0 204.227 255.999H272C280.837 255.999 288 248.836 288 239.999V207.999C288 199.162 280.837 191.999 272 191.999H244.021L191.331 116.328L249.974 32H272z" />
+    <glyph glyph-name="sync-alt"
+      unicode="&#xF2F1;"
+      horiz-adv-x="512" d=" M370.7200000000001 314.7200000000001C339.4580000000001 343.992 298.888 360.038 255.848 360C178.39 359.932 111.52 306.822 93.057 233.15C91.713 227.787 86.935 224 81.406 224H24.103C16.605 224 10.909 230.807 12.296 238.176C33.933 353.076 134.813 440 256 440C322.448 440 382.791 413.8640000000001 427.315 371.315L463.03 407.03C478.149 422.149 504 411.4410000000001 504 390.059V256C504 242.745 493.255 232 480 232H345.941C324.559 232 313.851 257.851 328.97 272.971L370.72 314.7200000000001zM32 152H166.059C187.441 152 198.149 126.149 183.03 111.029L141.28 69.279C172.542 40.006 213.115 23.96 256.156 23.999C333.574 24.069 400.471 77.143 418.943 150.848C420.287 156.211 425.065 159.998 430.594 159.998H487.898C495.396 159.998 501.092 153.191 499.705 145.822C478.067 30.924 377.187 -56 256 -56C189.552 -56 129.209 -29.864 84.685 12.685L48.97 -23.03C33.851 -38.149 8 -27.441 8 -6.059V128C8 141.255 18.745 152 32 152z" />
+    <glyph glyph-name="sync"
+      unicode="&#xF021;"
+      horiz-adv-x="512.333" d=" M440.935 435.426L444.901 352.66C399.416 406.096 331.674 440 256 440C134.813 440 33.933 353.076 12.296 238.176C10.908 230.807 16.604 224 24.103 224H73.187C78.757 224 83.564 227.842 84.863 233.259C103.407 310.592 172.931 368 256 368C316.8930000000001 368 370.512 337.144 402.1040000000001 290.199L300.5740000000001 295.064C293.7290000000001 295.3920000000001 288.0000000000001 289.9310000000001 288.0000000000001 283.0780000000001V235.6670000000001C288.0000000000001 229.04 293.3730000000001 223.667 300.0000000000001 223.667H500.3330000000001C506.9600000000001 223.667 512.3330000000001 229.04 512.3330000000001 235.6670000000001V436C512.3330000000001 442.627 506.9600000000001 448 500.3330000000001 448H452.9220000000001C446.0690000000001 448 440.6070000000001 442.271 440.9350000000001 435.426zM256 16C195.105 16 141.483 46.858 109.891 93.805L211.759 88.934C218.604 88.607 224.332 94.068 224.332 100.92V148.332C224.332 154.959 218.959 160.332 212.332 160.332H12C5.373 160.332 0 154.959 0 148.332V-52C0 -58.627 5.373 -64 12 -64H59.385C66.248 -64 71.713 -58.255 71.37 -51.401L67.241 31.174C112.725 -22.166 180.405 -56 256 -56C377.187 -56 478.067 30.924 499.704 145.824C501.092 153.193 495.396 160 487.897 160H438.813C433.243 160 428.436 156.158 427.137 150.741C408.593 73.408 339.069 16 256 16z" />
+    <glyph glyph-name="syringe"
+      unicode="&#xF48E;"
+      horiz-adv-x="512" d=" M201.5 273.2L257.2 217.4C260.3 214.3 260.3 209.2 257.2 206.1L245.9 194.8C242.8 191.6999999999999 237.7 191.6999999999999 234.6 194.8L178.9 250.6L133.6 205.3L189.4 149.5C192.5 146.3999999999999 192.5 141.3 189.4 138.1999999999999L178.1 126.8999999999999C175 123.7999999999999 169.9 123.7999999999999 166.8 126.8999999999999L111 182.8L84.6 156.4C67.3 139.1 59 115.3 61.6 91L68.7 27.4L2.3 -39C-0.8 -42.1 -0.8 -47.2 2.3 -50.3L13.6 -61.6C16.7 -64.7 21.8 -64.7 24.9 -61.6L91.2 4.7L154.8 -2.4C178.7 -5.0000000000001 202.7 2.9999999999999 220.2 20.6L402.1 202.5L266.4000000000001 338.2L201.5 273.2zM509.7 366.5L430.5 445.7C427.4 448.8 422.3 448.8 419.2 445.7L407.9 434.4C404.8 431.3 404.8 426.2 407.9 423.1L436.2 394.8L390.9 349.5L334.3 406.1L317.3 423.1C314.2 426.2 309.1 426.2 306 423.1L272.1 389.2C269 386.1 269 381 272.1 377.9L289.1 360.9L424.8 225L441.8 208C444.9000000000001 204.9 450 204.9 453.1 208L487 242C490.1 245.1 490.1 250.2 487 253.3L413.5 326.8L458.8 372.1L487.1 343.8C490.2 340.7000000000001 495.3 340.7000000000001 498.4 343.8L509.7 355.1C512.8000000000001 358.3 512.8000000000001 363.3 509.7 366.5z" />
+    <glyph glyph-name="table-tennis"
+      unicode="&#xF45D;"
+      horiz-adv-x="512" d=" M496.2 151.5C527.7 229.3 512 321.8 449 384.9C365.1 469 229 469 145.1 384.9L89.1 328.8L300.6 117.3C346.7000000000001 179.4 432.1 194.7 496.2 151.5zM278.3 71.8L57.9 292.1C30.6 246.8 36.2 187.1 75.2 148L109.7 113.4L6.7 24C-1.9 16.5 -2.4 3.3 5.7 -4.8L59.1 -58.3C67.1 -66.4 80.3 -65.9 87.8 -57.3L177.1 46L212.8 10.3C232.5 -9.4 257.4000000000001 -20.2 283.1 -23C276 -6 272.1 12.6 272.1 32.1C272 45.9 274.6 59.1 278.3 71.8zM416 128C363 128 320 85 320 32S363 -64 416 -64S512 -21 512 32S469 128 416 128z" />
+    <glyph glyph-name="table"
+      unicode="&#xF0CE;"
+      horiz-adv-x="512" d=" M464 416H48C21.49 416 0 394.51 0 368V16C0 -10.51 21.49 -32 48 -32H464C490.51 -32 512 -10.51 512 16V368C512 394.51 490.51 416 464 416zM224 32H64V128H224V32zM224 192H64V288H224V192zM448 32H288V128H448V32zM448 192H288V288H448V192z" />
+    <glyph glyph-name="tablet-alt"
+      unicode="&#xF3FA;"
+      horiz-adv-x="448" d=" M400 448H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V400C448 426.5 426.5 448 400 448zM224 -32C206.3 -32 192 -17.7 192 0S206.3 32 224 32S256 17.7 256 0S241.7 -32 224 -32zM400 76C400 69.4 394.6 64 388 64H60C53.4 64 48 69.4 48 76V388C48 394.6 53.4 400 60 400H388C394.6 400 400 394.6 400 388V76z" />
+    <glyph glyph-name="tablet"
+      unicode="&#xF10A;"
+      horiz-adv-x="448" d=" M400 448H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V400C448 426.5 426.5 448 400 448zM224 -32C206.3 -32 192 -17.7 192 0S206.3 32 224 32S256 17.7 256 0S241.7 -32 224 -32z" />
+    <glyph glyph-name="tablets"
+      unicode="&#xF490;"
+      horiz-adv-x="640" d=" M160 256C78.9 256 12.5 197.5 0.1 121.3C-0.7 116.5 3.4 112 8.4 112H311.7C316.7 112 320.8 116.5 320 121.3C307.5 197.5 241.1 256 160 256zM311.6 80H8.4C3.4 80 -0.7 75.5 0.1 70.7C12.5 -5.5 78.9 -64 160 -64S307.5 -5.5 319.9 70.7C320.7 75.5 316.6 80 311.6 80zM593.4 401.4C536.9 457.9 449.2 462.8 386.5 417.4C382.5 414.5 382.2 408.5 385.7 405.1L597 193.7C600.5 190.2 606.5 190.5 609.3 194.5C654.8 257.2 649.9 344.9 593.4 401.4zM363 382.3C359.5 385.8 353.5 385.5 350.7 381.5C305.3 318.8 310.2 231.1 366.6 174.6C423.1 118.1 510.8 113.2000000000001 573.5 158.7000000000001C577.5 161.6 577.8 167.6 574.3 171.0000000000001L363 382.3z" />
+    <glyph glyph-name="tachometer-alt"
+      unicode="&#xF3FD;"
+      horiz-adv-x="576" d=" M75.694 -32A48.02 48.02 0 0 0 33.246 -6.429C12.023 33.7 0 79.444 0 128C0 287.058 128.942 416 288 416S576 287.058 576 128C576 79.444 563.977 33.7 542.754 -6.429A48.01800000000001 48.01800000000001 0 0 0 500.306 -32H75.694zM512 160C494.327 160 480 145.673 480 128C480 110.327 494.327 96 512 96S544 110.327 544 128C544 145.673 529.673 160 512 160zM288 320C305.673 320 320 334.327 320 352C320 369.673 305.673 384 288 384S256 369.673 256 352C256 334.327 270.327 320 288 320zM64 160C46.327 160 32 145.673 32 128C32 110.327 46.327 96 64 96S96 110.327 96 128C96 145.673 81.673 160 64 160zM129.608 318.392C111.935 318.392 97.608 304.065 97.608 286.392C97.608 268.719 111.935 254.392 129.608 254.392S161.608 268.719 161.608 286.392C161.608 304.065 147.281 318.392 129.608 318.392zM446.392 318.392C428.719 318.392 414.392 304.065 414.392 286.392C414.392 268.719 428.719 254.392 446.392 254.392S478.392 268.719 478.392 286.392C478.392 304.065 464.065 318.392 446.392 318.392zM359.314 286.858C346.687 290.898 333.181 283.938 329.141 271.314L283.218 127.803C250.108 125.355 224 97.736 224 64C224 28.654 252.654 0 288 0C323.346 0 352 28.654 352 64C352 83.773 343.029 101.447 328.939 113.187L374.858 256.685C378.897 269.31 371.938 282.818 359.314 286.858z" />
+    <glyph glyph-name="tag"
+      unicode="&#xF02B;"
+      horiz-adv-x="512" d=" M0 195.882V400C0 426.51 21.49 448 48 448H252.118A48 48 0 0 0 286.059 433.941L497.941 222.059C516.6859999999999 203.314 516.6859999999999 172.922 497.941 154.177L293.823 -49.941C275.078 -68.6859999999999 244.686 -68.6859999999999 225.941 -49.941L14.059 161.941A48 48 0 0 0 0 195.882zM112 384C85.49 384 64 362.51 64 336S85.49 288 112 288S160 309.49 160 336S138.51 384 112 384z" />
+    <glyph glyph-name="tags"
+      unicode="&#xF02C;"
+      horiz-adv-x="640" d=" M497.941 222.059L286.0590000000001 433.941A48 48 0 0 1 252.118 448H48C21.49 448 0 426.51 0 400V195.882A48 48 0 0 1 14.059 161.941L225.941 -49.941C244.685 -68.6859999999999 275.077 -68.687 293.823 -49.941L497.941 154.177C516.6859999999999 172.922 516.6859999999999 203.314 497.941 222.059zM112 288C85.49 288 64 309.49 64 336S85.49 384 112 384S160 362.51 160 336S138.51 288 112 288zM625.941 154.177L421.823 -49.941C403.078 -68.6859999999999 372.686 -68.6859999999999 353.941 -49.941L353.581 -49.581L527.64 124.478C544.639 141.477 554 164.078 554 188.118S544.638 234.759 527.64 251.758L331.397 448H380.118A48 48 0 0 0 414.059 433.941L625.941 222.059C644.686 203.314 644.686 172.922 625.941 154.177z" />
+    <glyph glyph-name="tape"
+      unicode="&#xF4DB;"
+      horiz-adv-x="640" d=" M224 256C188.7 256 160 227.3 160 192S188.7 128 224 128S288 156.7 288 192S259.3 256 224 256zM624 32H380.6C422.1 72.7 448 129.3 448 192C448 315.7 347.7 416 224 416S0 315.7 0 192S100.3 -32 224 -32H624C632.8 -32 640 -24.8 640 -16V16C640 24.8 632.8 32 624 32zM224 96C171 96 128 139 128 192S171 288 224 288S320 245 320 192S277 96 224 96z" />
+    <glyph glyph-name="tasks"
+      unicode="&#xF0AE;"
+      horiz-adv-x="512" d=" M208 316H496C504.8 316 512 323.2 512 332V372C512 380.8 504.8 388 496 388H208C199.2 388 192 380.8 192 372V332C192 323.2 199.2 316 208 316zM208 156H496C504.8 156 512 163.2 512 172V212C512 220.8 504.8 228 496 228H208C199.2 228 192 220.8 192 212V172C192 163.2 199.2 156 208 156zM208 -4H496C504.8 -4 512 3.2 512 12V52C512 60.8 504.8 68 496 68H208C199.2 68 192 60.8 192 52V12C192 3.2 199.2 -4 208 -4zM64 80C37.5 80 15.4 58.5 15.4 32S37.5 -16 64 -16S112 5.5 112 32S90.5 80 64 80zM156.5 379L84.3 306.8L68.7 291.2000000000001C64 286.5 55.8 286.5 51.1 291.2000000000001L3.5 338.6C-1.2 343.3 -1.2 350.9 3.5 355.6L19.2 371.3C23.9 376 31.5 376 36.2 371.3L58.9 349.2L122.6 412.5C127.3 417.2 134.9 417.2 139.6 412.5L156.6 396C161.2 391.3 161.2 383.7 156.5 379zM156.5 219.4L84.3 147.2L68.6 131.5C63.9 126.8 55.7 126.8 51 131.5L3.5 179C-1.2 183.7 -1.2 191.3 3.5 196L19.2 211.7C23.9 216.4 31.5 216.4 36.2 211.7L58.9 189.6L122.6 253.3C127.3 258 134.9 258 139.6 253.3L156.6 236.3C161.2 231.7 161.2 224.1 156.5 219.4z" />
+    <glyph glyph-name="taxi"
+      unicode="&#xF1BA;"
+      horiz-adv-x="512" d=" M461.951 204.135L440.1350000000001 291.403A79.885 79.885 0 0 1 362.522 352H352V392C352 405.255 341.255 416 328 416H184C170.745 416 160 405.255 160 392V352H149.478A79.885 79.885 0 0 1 71.866 291.403L50.05 204.135C25.515 195.177 8 171.634 8 144V96C8 75.793 17.374 57.786 32 46.057V-8C32 -21.255 42.745 -32 56 -32H104C117.255 -32 128 -21.255 128 -8V32H384V-8C384 -21.255 394.745 -32 408 -32H456C469.255 -32 480 -21.255 480 -8V46.057C494.626 57.786 504 75.794 504 96V144C504 171.634 486.485 195.177 461.951 204.135zM149.478 288H362.523A15.975 15.975 0 0 0 378.045 275.88L395.015 208H116.985L133.955 275.881A15.975999999999999 15.975999999999999 0 0 0 149.478 288zM132 112C132 92.118 115.882 76 96 76S60 92.118 60 112S76.118 148 96 148S132 131.882 132 112zM452 112C452 92.118 435.882 76 416 76S380 92.118 380 112S396.118 148 416 148S452 131.882 452 112z" />
+    <glyph glyph-name="terminal"
+      unicode="&#xF120;"
+      horiz-adv-x="640" d=" M257.981 175.029L63.638 -19.314C54.265 -28.687 39.069 -28.687 29.697 -19.314L7.029 3.353C-2.328 12.71 -2.346 27.875 6.989 37.254L161.011 192L6.99 346.745C-2.345 356.124 -2.327 371.289 7.03 380.646L29.697 403.313C39.07 412.6860000000001 54.266 412.6860000000001 63.638 403.313L257.981 208.97C267.354 199.598 267.354 184.402 257.981 175.029zM640 -8V24C640 37.255 629.255 48 616 48H312C298.745 48 288 37.255 288 24V-8C288 -21.255 298.745 -32 312 -32H616C629.255 -32 640 -21.255 640 -8z" />
+    <glyph glyph-name="text-height"
+      unicode="&#xF034;"
+      horiz-adv-x="576" d=" M16 416H304C312.837 416 320 408.837 320 400V304C320 295.163 312.837 288 304 288H268.504C259.6670000000001 288 252.504 295.163 252.504 304V352H197.743V32H232C240.837 32 248 24.837 248 16V-16C248 -24.837 240.837 -32 232 -32H88C79.163 -32 72 -24.837 72 -16V16C72 24.837 79.163 32 88 32H122.257V352H67.496V304C67.496 295.163 60.333 288 51.496 288H16C7.163 288 0 295.163 0 304V400C0 408.837 7.163 416 16 416zM491.308 411.315L571.303 331.314C581.309 321.307 574.297 304 559.99 304H512V80H560C575.639 80 580.635 62.009 571.313 52.686L491.318 -27.3150000000001C485.071 -33.5620000000001 474.937 -33.5600000000001 468.692 -27.3150000000001L388.697 52.6859999999999C378.691 62.693 385.703 80 400.01 80H448V304H400C384.361 304 379.365 321.991 388.687 331.314L468.682 411.315C474.929 417.563 485.063 417.56 491.308 411.315z" />
+    <glyph glyph-name="text-width"
+      unicode="&#xF035;"
+      horiz-adv-x="448" d=" M16 416H432C440.837 416 448 408.837 448 400V304C448 295.163 440.837 288 432 288H396.504C387.6670000000001 288 380.504 295.163 380.504 304V352H261.743V224H296C304.837 224 312 216.837 312 208V176C312 167.163 304.837 160 296 160H152C143.163 160 136 167.163 136 176V208C136 216.837 143.163 224 152 224H186.257V352H67.496V304C67.496 295.163 60.333 288 51.496 288H16C7.163 288 0 295.163 0 304V400C0 408.837 7.163 416 16 416zM443.315 75.318L363.314 155.313C353.991 164.635 336 159.638 336 144V96H112V143.99C112 158.297 94.693 165.309 84.686 155.303L4.685 75.308C-1.56 69.063 -1.562 58.929 4.685 52.682L84.686 -27.313C94.009 -36.635 112 -31.638 112 -16V32H336V-15.99C336 -30.297 353.307 -37.309 363.314 -27.303L443.3150000000001 52.692C449.5600000000001 58.937 449.5630000000001 69.071 443.3150000000001 75.318z" />
+    <glyph glyph-name="th-large"
+      unicode="&#xF009;"
+      horiz-adv-x="512" d=" M296 416H488C501.255 416 512 405.255 512 392V232C512 218.745 501.255 208 488 208H296C282.745 208 272 218.745 272 232V392C272 405.255 282.745 416 296 416zM216 416H24C10.745 416 0 405.255 0 392V232C0 218.745 10.745 208 24 208H216C229.255 208 240 218.745 240 232V392C240 405.255 229.255 416 216 416zM0 152V-8C0 -21.255 10.745 -32 24 -32H216C229.255 -32 240 -21.255 240 -8V152C240 165.255 229.255 176 216 176H24C10.745 176 0 165.255 0 152zM296 -32H488C501.255 -32 512 -21.255 512 -8V152C512 165.255 501.255 176 488 176H296C282.745 176 272 165.255 272 152V-8C272 -21.255 282.745 -32 296 -32z" />
+    <glyph glyph-name="th-list"
+      unicode="&#xF00B;"
+      horiz-adv-x="512" d=" M149.333 232V152C149.333 138.745 138.588 128 125.333 128H24C10.745 128 0 138.745 0 152V232C0 245.255 10.745 256 24 256H125.333C138.588 256 149.333 245.255 149.333 232zM0 72V-8C0 -21.255 10.745 -32 24 -32H125.333C138.588 -32 149.333 -21.255 149.333 -8V72C149.333 85.255 138.588 96 125.333 96H24C10.745 96 0 85.255 0 72zM125.333 416H24C10.745 416 0 405.255 0 392V312C0 298.745 10.745 288 24 288H125.333C138.588 288 149.333 298.745 149.333 312V392C149.333 405.255 138.588 416 125.333 416zM205.333 -32H488C501.255 -32 512 -21.255 512 -8V72C512 85.255 501.255 96 488 96H205.333C192.078 96 181.333 85.255 181.333 72V-8C181.333 -21.255 192.078 -32 205.333 -32zM181.333 392V312C181.333 298.745 192.078 288 205.333 288H488C501.255 288 512 298.745 512 312V392C512 405.255 501.255 416 488 416H205.333C192.078 416 181.333 405.255 181.333 392zM205.333 128H488C501.255 128 512 138.745 512 152V232C512 245.255 501.255 256 488 256H205.333C192.078 256 181.333 245.255 181.333 232V152C181.333 138.745 192.078 128 205.333 128z" />
+    <glyph glyph-name="th"
+      unicode="&#xF00A;"
+      horiz-adv-x="512" d=" M149.333 392V312C149.333 298.745 138.588 288 125.333 288H24C10.745 288 0 298.745 0 312V392C0 405.255 10.745 416 24 416H125.333C138.588 416 149.333 405.255 149.333 392zM330.6670000000001 152V232C330.6670000000001 245.255 319.9220000000001 256 306.6670000000001 256H205.333C192.078 256 181.333 245.255 181.333 232V152C181.333 138.745 192.078 128 205.333 128H306.666C319.9220000000001 128 330.667 138.745 330.667 152zM362.6670000000001 392V312C362.6670000000001 298.745 373.4120000000001 288 386.6670000000001 288H488C501.255 288 512 298.745 512 312V392C512 405.255 501.255 416 488 416H386.667C373.412 416 362.667 405.255 362.667 392zM330.6670000000001 312V392C330.6670000000001 405.255 319.9220000000001 416 306.6670000000001 416H205.333C192.078 416 181.333 405.255 181.333 392V312C181.333 298.745 192.078 288 205.333 288H306.666C319.9220000000001 288 330.667 298.745 330.667 312zM125.333 256H24C10.745 256 0 245.255 0 232V152C0 138.745 10.745 128 24 128H125.333C138.588 128 149.333 138.745 149.333 152V232C149.333 245.255 138.588 256 125.333 256zM0 72V-8C0 -21.255 10.745 -32 24 -32H125.333C138.588 -32 149.333 -21.255 149.333 -8V72C149.333 85.255 138.588 96 125.333 96H24C10.745 96 0 85.255 0 72zM386.667 128H488C501.255 128 512 138.745 512 152V232C512 245.255 501.255 256 488 256H386.667C373.412 256 362.667 245.255 362.667 232V152C362.667 138.745 373.412 128 386.667 128zM386.667 -32H488C501.255 -32 512 -21.255 512 -8V72C512 85.255 501.255 96 488 96H386.667C373.412 96 362.667 85.255 362.667 72V-8C362.667 -21.255 373.412 -32 386.667 -32zM181.333 72V-8C181.333 -21.255 192.078 -32 205.333 -32H306.666C319.921 -32 330.666 -21.255 330.666 -8V72C330.666 85.255 319.921 96 306.666 96H205.333C192.078 96 181.333 85.255 181.333 72z" />
+    <glyph glyph-name="thermometer-empty"
+      unicode="&#xF2CB;"
+      horiz-adv-x="256" d=" M192 64C192 28.654 163.346 0 128 0S64 28.654 64 64C64 99.346 92.654 128 128 128S192 99.346 192 64zM224 148.653C243.912 126.09 256 96.459 256 64C256 -6.696 198.697 -64 128 -64C127.701 -64 127.391 -63.999 127.091 -63.997C56.789 -63.509 -0.357 -5.636 0.002 64.667C0.166 96.865 12.225 126.245 32 148.653V352C32 405.019 74.981 448 128 448S224 405.019 224 352V148.653zM208 64C208 98.339 188.63 116.19 176 130.502V352C176 378.467 154.467 400 128 400S80 378.467 80 352V130.502C67.268 116.074 48.175 98.402 48.001 64.422C47.777 20.5460000000001 83.564 -15.694 127.424 -15.998L128 -16C172.112 -16 208 19.888 208 64z" />
+    <glyph glyph-name="thermometer-full"
+      unicode="&#xF2C7;"
+      horiz-adv-x="256" d=" M224 352C224 405.019 181.019 448 128 448S32 405.019 32 352V148.653C12.225 126.244 0.166 96.864 0.002 64.667C-0.357 -5.636 56.789 -63.509 127.091 -63.997C127.39 -63.999 127.701 -64 128 -64C198.698 -64 256 -6.696 256 64C256 96.459 243.912 126.09 224 148.653V352zM128 -16L127.424 -15.998C83.564 -15.694 47.777 20.546 48.001 64.422C48.174 98.402 67.267 116.074 80 130.502V352C80 378.467 101.533 400 128 400S176 378.467 176 352V130.502C188.63 116.19 208 98.338 208 64C208 19.888 172.112 -16 128 -16zM192 64C192 28.654 163.346 0 128 0S64 28.654 64 64C64 87.685 76.876 108.349 96 119.417V352C96 369.673 110.327 384 128 384S160 369.673 160 352V119.417C179.124 108.3490000000001 192 87.6850000000001 192 64z" />
+    <glyph glyph-name="thermometer-half"
+      unicode="&#xF2C9;"
+      horiz-adv-x="256" d=" M192 64C192 28.654 163.346 0 128 0S64 28.654 64 64C64 87.685 76.876 108.349 96 119.417V224C96 241.673 110.327 256 128 256S160 241.673 160 224V119.417C179.124 108.3490000000001 192 87.6850000000001 192 64zM224 148.653C243.912 126.09 256 96.459 256 64C256 -6.696 198.697 -64 128 -64C127.701 -64 127.391 -63.999 127.091 -63.997C56.789 -63.509 -0.357 -5.636 0.002 64.667C0.166 96.865 12.225 126.245 32 148.653V352C32 405.019 74.981 448 128 448S224 405.019 224 352V148.653zM208 64C208 98.339 188.63 116.19 176 130.502V352C176 378.467 154.467 400 128 400S80 378.467 80 352V130.502C67.268 116.074 48.175 98.402 48.001 64.422C47.777 20.5460000000001 83.564 -15.694 127.424 -15.998L128 -16C172.112 -16 208 19.888 208 64z" />
+    <glyph glyph-name="thermometer-quarter"
+      unicode="&#xF2CA;"
+      horiz-adv-x="256" d=" M192 64C192 28.654 163.346 0 128 0S64 28.654 64 64C64 87.685 76.876 108.349 96 119.417V160C96 177.673 110.327 192 128 192S160 177.673 160 160V119.417C179.124 108.3490000000001 192 87.6850000000001 192 64zM224 148.653C243.912 126.09 256 96.459 256 64C256 -6.696 198.697 -64 128 -64C127.701 -64 127.391 -63.999 127.091 -63.997C56.789 -63.509 -0.357 -5.636 0.002 64.667C0.166 96.865 12.225 126.245 32 148.653V352C32 405.019 74.981 448 128 448S224 405.019 224 352V148.653zM208 64C208 98.339 188.63 116.19 176 130.502V352C176 378.467 154.467 400 128 400S80 378.467 80 352V130.502C67.268 116.074 48.175 98.402 48.001 64.422C47.777 20.5460000000001 83.564 -15.694 127.424 -15.998L128 -16C172.112 -16 208 19.888 208 64z" />
+    <glyph glyph-name="thermometer-three-quarters"
+      unicode="&#xF2C8;"
+      horiz-adv-x="256" d=" M192 64C192 28.654 163.346 0 128 0C92.654 0 64 28.654 64 64C64 87.685 76.876 108.349 96 119.417V288C96 305.673 110.327 320 128 320S160 305.673 160 288V119.417C179.124 108.3490000000001 192 87.6850000000001 192 64zM224 148.653C243.912 126.09 256 96.459 256 64C256 -6.696 198.697 -64 128 -64C127.701 -64 127.391 -63.999 127.091 -63.997C56.789 -63.509 -0.357 -5.636 0.002 64.667C0.166 96.865 12.225 126.245 32 148.653V352C32 405.019 74.981 448 128 448S224 405.019 224 352V148.653zM208 64C208 98.339 188.63 116.19 176 130.502V352C176 378.467 154.467 400 128 400S80 378.467 80 352V130.502C67.268 116.074 48.175 98.402 48.001 64.422C47.777 20.5460000000001 83.564 -15.694 127.424 -15.998L128 -16C172.112 -16 208 19.888 208 64z" />
+    <glyph glyph-name="thermometer"
+      unicode="&#xF491;"
+      horiz-adv-x="512" d=" M476.8 427.6C439.3 458.3 381.3 453.9 344.9 417.4L299.2 371.4L349.7 320.9C352.8 317.8 352.8 312.7000000000001 349.7 309.6L338.4 298.3C335.3 295.2 330.2 295.2 327.1 298.3L276.7 348.8L231.6 303.4L281.9 253C285 249.9 285 244.8 281.9 241.7L270.6 230.4C267.5 227.3 262.4 227.3 259.3 230.4L209 280.6L163.9 235.2L214 185C217.1 181.9 217.1 176.8 214 173.7L202.7 162.4C199.6 159.3 194.5 159.3 191.4 162.4L141.3 212.6L96 166.9V66L7 -23C-2.4 -32.4 -2.4 -47.6 7 -56.9C16.4 -66.2999999999999 31.6 -66.2999999999999 40.9 -56.9L129.9 32.1H229.8L484 285.4C518.9 320.3 526.2 386.9 476.8 427.6z" />
+    <glyph glyph-name="thumbs-down"
+      unicode="&#xF165;"
+      horiz-adv-x="512" d=" M0 392V152C0 138.745 10.745 128 24 128H104C117.255 128 128 138.745 128 152V392C128 405.255 117.255 416 104 416H24C10.745 416 0 405.255 0 392zM40 192C40 205.255 50.745 216 64 216S88 205.255 88 192S77.255 168 64 168S40 178.745 40 192zM312 -64C291.817 -64 282.515 -24.707 278.069 -6.205C272.863 15.461 267.48 37.865 252.676 52.697C220.207 85.221 203.173 126.664 163.559 165.808A11.98 11.98 0 0 0 160.001 174.329V388.099C160.001 394.64 165.244 399.977 171.784 400.097C187.615 400.387 208.478 409.176 224.435 416.275C256.189 430.402 295.709 447.983 343.995 448H346.839C389.616 448 440.202 447.587 460.613 418.263C469.005 406.206 471.059 391.229 466.761 373.631C483.073 356.578 491.824 324.7680000000001 483.143 298.874C500.687 275.442 502.2860000000001 242.742 492.451 219.405L492.561 219.295C504.4540000000001 207.346 512.0840000000001 188.036 512 170.098C511.844 139.746 485.843 111.9999999999999 452.447 111.9999999999999H350.723C358.03 83.66 384 59.868 384 17.452C384 -56 336 -64 312 -64z" />
+    <glyph glyph-name="thumbs-up"
+      unicode="&#xF164;"
+      horiz-adv-x="512" d=" M104 224H24C10.745 224 0 213.255 0 200V-40C0 -53.255 10.745 -64 24 -64H104C117.255 -64 128 -53.255 128 -40V200C128 213.255 117.255 224 104 224zM64 -24C50.745 -24 40 -13.255 40 0S50.745 24 64 24S88 13.255 88 0S77.255 -24 64 -24zM384 366.548C384 324.132 358.03 300.3400000000001 350.723 272H452.446C485.843 272 511.843 244.254 511.999 213.902C512.083 195.964 504.453 176.653 492.56 164.705L492.45 164.595C502.286 141.258 500.687 108.558 483.142 85.126C491.823 59.231 483.073 27.422 466.76 10.369C471.058 -7.229 469.004 -22.206 460.612 -34.263C440.202 -63.587 389.616 -64 346.839 -64L343.994 -63.999C295.707 -63.982 256.188 -46.401 224.434 -32.274C208.477 -25.175 187.613 -16.387 171.783 -16.096C165.243 -15.976 160 -10.639 160 -4.098V209.672C160 212.872 161.282 215.943 163.558 218.193C203.172 257.337 220.206 298.78 252.675 331.304C267.479 346.136 272.863 368.54 278.068 390.206C282.515 408.707 291.817 448 312 448C336 448 384 440 384 366.548z" />
+    <glyph glyph-name="thumbtack"
+      unicode="&#xF08D;"
+      horiz-adv-x="384" d=" M298.028 233.733L285.793 352H328C341.255 352 352 362.745 352 376V424C352 437.255 341.255 448 328 448H56C42.745 448 32 437.255 32 424V376C32 362.745 42.745 352 56 352H98.207L85.972 233.733C37.465 211.18 0 170.739 0 120C0 106.745 10.745 96 24 96H160V-8.007C160 -9.249 160.289 -10.474 160.845 -11.585L184.845 -59.585C187.786 -65.467 196.209 -65.4779999999999 199.156 -59.585L223.156 -11.585A8.008 8.008 0 0 1 224.001 -8.007V96H360.001C373.256 96 384.001 106.745 384.001 120C384 171.183 346.018 211.42 298.028 233.733z" />
+    <glyph glyph-name="ticket-alt"
+      unicode="&#xF3FF;"
+      horiz-adv-x="576" d=" M128 288H448V96H128V288zM528 192C528 165.49 549.49 144 576 144V48C576 21.49 554.51 0 528 0H48C21.49 0 0 21.49 0 48V144C26.51 144 48 165.49 48 192S26.51 240 0 240V336C0 362.51 21.49 384 48 384H528C554.51 384 576 362.51 576 336V240C549.49 240 528 218.51 528 192zM480 296C480 309.255 469.255 320 456 320H120C106.745 320 96 309.255 96 296V88C96 74.745 106.745 64 120 64H456C469.255 64 480 74.745 480 88V296z" />
+    <glyph glyph-name="times-circle"
+      unicode="&#xF057;"
+      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM377.6 126.9C382.3 122.2 382.3 114.6 377.6 109.9L338 70.4C333.3 65.7 325.7 65.7 321 70.4L256 136L190.9 70.4C186.2 65.7 178.6 65.7 173.9 70.4L134.4 110C129.7 114.7 129.7 122.3 134.4 127L200 192L134.4 257.1C129.7 261.8 129.7 269.4 134.4 274.1L174 313.7C178.7 318.4 186.3 318.4 191 313.7L256 248L321.1 313.6C325.8 318.3 333.4000000000001 318.3 338.1 313.6L377.7000000000001 274C382.4000000000001 269.3 382.4000000000001 261.7 377.7000000000001 257L312 192L377.6 126.9z" />
+    <glyph glyph-name="times"
+      unicode="&#xF00D;"
+      horiz-adv-x="352" d=" M242.72 192L342.79 292.07C355.07 304.35 355.07 324.26 342.79 336.55L320.55 358.79C308.27 371.07 288.36 371.07 276.07 358.79L176 258.7200000000001L75.93 358.79C63.65 371.07 43.74 371.07 31.45 358.79L9.21 336.55C-3.07 324.27 -3.07 304.36 9.21 292.07L109.28 192L9.21 91.93C-3.07 79.65 -3.07 59.74 9.21 47.45L31.45 25.21C43.73 12.93 63.65 12.93 75.93 25.21L176 125.28L276.07 25.21C288.35 12.93 308.27 12.93 320.55 25.21L342.79 47.45C355.07 59.73 355.07 79.64 342.79 91.93L242.72 192z" />
+    <glyph glyph-name="tint"
+      unicode="&#xF043;"
+      horiz-adv-x="384" d=" M192 -64C93.565 -64 13.913 15.652 13.913 114.087C13.913 225.283 115.107 268.152 162.435 425.912C171.539 456.028 213.534 454.69 221.565 425.912C269.111 267.426 370.087 225.843 370.087 114.087C370.087 15.652 290.435 -64 192 -64zM149.478 107.826C147.969 113.359 140.031 113.358 138.522 107.826C129.299 78.401 110.609 70.181 110.609 49.391C110.609 30.87 125.478 16 144 16S177.391 30.87 177.391 49.391C177.391 70.23 158.718 78.347 149.478 107.826z" />
+    <glyph glyph-name="toggle-off"
+      unicode="&#xF204;"
+      horiz-adv-x="576" d=" M384 384H192C85.961 384 0 298.039 0 192S85.961 0 192 0H384C490.039 0 576 85.961 576 192S490.039 384 384 384zM64 192C64 262.741 121.249 320 192 320C262.741 320 320 262.751 320 192C320 121.259 262.751 64 192 64C121.259 64 64 121.249 64 192zM384 64H335.0950000000001C400.312 136.858 400.331 247.12 335.0950000000001 320H384C454.741 320 512 262.751 512 192C512 121.26 454.751 64 384 64z" />
+    <glyph glyph-name="toggle-on"
+      unicode="&#xF205;"
+      horiz-adv-x="576" d=" M576 192C576 85.961 490.039 0 384 0H192C85.961 0 0 85.961 0 192S85.961 384 192 384H384C490.039 384 576 298.039 576 192zM384 320C313.259 320 256 262.751 256 192C256 121.259 313.249 64 384 64C454.741 64 512 121.249 512 192C512 262.741 454.751 320 384 320" />
+    <glyph glyph-name="toolbox"
+      unicode="&#xF552;"
+      horiz-adv-x="512" d=" M502.63 233.37L457.38 278.62C451.38 284.62 443.24 287.99 434.75 287.99H384V368C384 394.51 362.51 416 336 416H176C149.49 416 128 394.51 128 368V288H77.25C68.76 288 60.63 284.63 54.62 278.63L9.37 233.37C3.37 227.37 0 219.23 0 210.74V128H128V144C128 152.84 135.16 160 144 160H176C184.84 160 192 152.84 192 144V128H320V144C320 152.84 327.1600000000001 160 336 160H368C376.84 160 384 152.84 384 144V128H512V210.75C512 219.23 508.63 227.37 502.63 233.37zM320 288H192V352H320V288zM384 80C384 71.16 376.84 64 368 64H336C327.1600000000001 64 320 71.16 320 80V96H192V80C192 71.16 184.84 64 176 64H144C135.16 64 128 71.16 128 80V96H0V0C0 -17.67 14.33 -32 32 -32H480C497.67 -32 512 -17.67 512 0V96H384V80z" />
+    <glyph glyph-name="trademark"
+      unicode="&#xF25C;"
+      horiz-adv-x="640" d=" M97.119 284.867H12C5.373 284.867 0 290.24 0 296.867V340C0 346.627 5.373 352 12 352H260.559C267.186 352 272.559 346.627 272.559 340V296.867C272.559 290.24 267.186 284.867 260.559 284.867H175.44V44C175.44 37.373 170.067 32 163.44 32H109.118C102.491 32 97.118 37.373 97.118 44V284.867zM329.825 352H395.25A12 12 0 0 0 406.596 343.907L450.355 216.839C457.516 196.251 466.466 164.027 466.466 164.027H467.362S476.312 196.251 483.473 216.839L527.231 343.907A12 12 0 0 0 538.577 352H603.987A12 12 0 0 0 615.948 340.9700000000001L639.96 44.97C640.527 37.983 635.009 32 627.999 32H573.898A12 12 0 0 0 561.926 43.182L552.844 176.112C551.0540000000001 200.28 552.844 229.8180000000001 552.844 229.8180000000001H551.9480000000001S541.2070000000001 196.2520000000001 534.046 176.112L503.3460000000001 91.381A12 12 0 0 0 492.0640000000001 83.4690000000001H441.7620000000001A12 12 0 0 0 430.4800000000001 91.381L399.7800000000001 176.112C392.6190000000001 196.252 381.8770000000001 229.8180000000001 381.8770000000001 229.8180000000001H380.9820000000001S382.7720000000001 200.28 380.9820000000001 176.112L371.9000000000001 43.182C371.4720000000001 36.887 366.2400000000001 32 359.9300000000001 32H305.4C298.383 32 292.864 37.994 293.441 44.987L317.866 340.987A11.999000000000002 11.999000000000002 0 0 0 329.825 352z" />
+    <glyph glyph-name="train"
+      unicode="&#xF238;"
+      horiz-adv-x="448" d=" M448 352V96C448 44.185 386.376 0 317.978 0L380.9580000000001 -49.721C386.905 -54.417 383.562 -64 376 -64H72C64.422 -64 61.108 -54.406 67.043 -49.721L130.022 0C61.82 0 0 44.046 0 96V352C0 405.019 64 448 128 448H320C385 448 448 405.019 448 352zM400 216V328C400 341.255 389.255 352 376 352H72C58.745 352 48 341.255 48 328V216C48 202.745 58.745 192 72 192H376C389.255 192 400 202.745 400 216zM224 152C193.072 152 168 126.928 168 96S193.072 40 224 40S280 65.072 280 96S254.928 152 224 152z" />
+    <glyph glyph-name="transgender-alt"
+      unicode="&#xF225;"
+      horiz-adv-x="480" d=" M468 448H389C378.3 448 373 435.1 380.5 427.5L397.4 410.6L316.7 329.9C294.5 343.9 268.2 352 240 352C211.8 352 185.5 343.9 163.3 329.9L146.8 346.4L166.6 366.2C171.3 370.9 171.3 378.5 166.6 383.2L138.3 411.5C133.6 416.2 126 416.2 121.3 411.5L101.5 391.7L82.5 410.7L99.4 427.6C107.1 435.1 101.7 448 91 448H12C5.4 448 0 442.6 0 436V357C0 346.3 12.9 341 20.5 348.5L37.4 365.4L56.4 346.4L36.6 326.6C31.9 321.9 31.9 314.3 36.6 309.6L64.9 281.3C69.6 276.6 77.2 276.6 81.9 281.3L101.7 301.1L118.2 284.6C104.1 262.5 96 236.2 96 208C96 139.5 143.9 82.1 208 67.6V40H172C165.4 40 160 34.6 160 28V-12C160 -18.6 165.4 -24 172 -24H208V-52C208 -58.6 213.4 -64 220 -64H260C266.6 -64 272 -58.6 272 -52V-24H308C314.6 -24 320 -18.6 320 -12V28C320 34.6 314.6 40 308 40H272V67.6C336.1 82.2000000000001 384 139.5 384 208C384 236.2 375.9 262.5 361.9 284.7000000000001L442.6 365.4000000000001L459.4999999999999 348.5000000000001C467.1 340.9000000000001 479.9999999999999 346.3000000000001 479.9999999999999 357.0000000000001V436C479.9999999999999 442.6 474.6 448 467.9999999999999 448zM240 128C195.9 128 160 163.9 160 208S195.9 288 240 288S320 252.1 320 208S284.1 128 240 128z" />
+    <glyph glyph-name="transgender"
+      unicode="&#xF224;"
+      horiz-adv-x="384" d=" M372 448H293C282.3 448 277 435.1 284.5 427.5L301.4 410.6L220.7 329.9C198.5 343.9 172.2 352 144 352C64.5 352 0 287.5 0 208C0 139.5 47.9 82.1 112 67.6V40H76C69.4 40 64 34.6 64 28V-12C64 -18.6 69.4 -24 76 -24H112V-52C112 -58.6 117.4 -64 124 -64H164C170.6 -64 176 -58.6 176 -52V-24H212C218.6 -24 224 -18.6 224 -12V28C224 34.6 218.6 40 212 40H176V67.6C240.1 82.2000000000001 288 139.5 288 208C288 236.2 279.9 262.5 265.9 284.7000000000001L346.6 365.4000000000001L363.5 348.5000000000001C371.1 340.9000000000001 384 346.3000000000001 384 357.0000000000001V436C384 442.6 378.6 448 372 448zM144 128C99.9 128 64 163.9 64 208S99.9 288 144 288S224 252.1 224 208S188.1 128 144 128z" />
+    <glyph glyph-name="trash-alt"
+      unicode="&#xF2ED;"
+      horiz-adv-x="448" d=" M0 364V392C0 405.3 10.7 416 24 416H136L145.4 434.7C149.4 442.9 157.7 448 166.8 448H281.1C290.2000000000001 448 298.5 442.9 302.6 434.7L312 416H424C437.3 416 448 405.3 448 392V364C448 357.4 442.6 352 436 352H12C5.4 352 0 357.4 0 364zM416 308V-16C416 -42.5 394.5 -64 368 -64H80C53.5 -64 32 -42.5 32 -16V308C32 314.6 37.4 320 44 320H404C410.6 320 416 314.6 416 308zM144 240C144 248.8 136.8 256 128 256S112 248.8 112 240V16C112 7.2 119.2 0 128 0S144 7.2 144 16V240zM240 240C240 248.8 232.8 256 224 256S208 248.8 208 240V16C208 7.2 215.2 0 224 0S240 7.2 240 16V240zM336 240C336 248.8 328.8 256 320 256S304 248.8 304 240V16C304 7.2 311.2 0 320 0S336 7.2 336 16V240z" />
+    <glyph glyph-name="trash"
+      unicode="&#xF1F8;"
+      horiz-adv-x="448" d=" M0 364V392C0 405.3 10.7 416 24 416H136L145.4 434.7C149.4 442.9 157.7 448 166.8 448H281.1C290.2000000000001 448 298.5 442.9 302.6 434.7L312 416H424C437.3 416 448 405.3 448 392V364C448 357.4 442.6 352 436 352H12C5.4 352 0 357.4 0 364zM415.2 307.3L394.8 -19C393.2 -44.3 372.2 -64 346.9000000000001 -64H101.1C75.8 -64 54.8 -44.3 53.2 -19L32.8 307.3C32.4 314.2000000000001 37.9 320 44.8 320H403.3C410.1 320 415.6 314.2000000000001 415.2 307.3z" />
+    <glyph glyph-name="tree"
+      unicode="&#xF1BB;"
+      horiz-adv-x="384" d=" M377.33 72.571L293.906 160H328C349.017 160 359.872 185.207 345.448 200.479L262.79 288H296C316.878 288 327.851 312.969 313.587 328.331L209.587 440.334C200.102 450.548 183.911 450.563 174.413 440.334L70.413 328.331C56.206 313.031 67.037 288 88 288H121.21L38.551 200.479C24.121 185.199 34.993 160 56 160H90.094L6.665 72.571C-7.869 57.345 2.925 32 24.025 32H144C144 -0.781 132.812 -17.26 110.005 -35.506C98.225 -44.93 104.914 -64 120 -64H264C279.086 -64 285.776 -44.931 273.995 -35.506C254.227 -19.6919999999999 240.003 -3.841 240 31.99V32H359.9700000000001C381.0200000000001 32 391.899 57.309 377.3300000000001 72.571z" />
+    <glyph glyph-name="trophy"
+      unicode="&#xF091;"
+      horiz-adv-x="576" d=" M552 384H448V424C448 437.3 437.3 448 424 448H152C138.7 448 128 437.3 128 424V384H24C10.7 384 0 373.3 0 360V304C0 268.3 22.5 231.6 61.9 203.3C93.4 180.6 131.7 166.2 171.9 161.6C203.3 109.5 240 88 240 88V16H192C156.7 16 128 -4.7 128 -40V-52C128 -58.6 133.4 -64 140 -64H436C442.6 -64 448 -58.6 448 -52V-40C448 -4.7 419.3 16 384 16H336V88S372.7 109.5 404.1 161.6C444.4000000000001 166.2000000000001 482.7 180.6 514.1 203.3C553.4 231.6 576 268.3 576 304V360C576 373.3 565.3 384 552 384zM99.3 255.2C74.9 272.8 64 292.4 64 304V320H128.2C129.2 287.4 134 258.8 141 233.8C125.9 239 111.8 246.2 99.3 255.2zM512 304C512 287.9 494.3 267.9 476.7 255.2C464.2 246.2 450 239 434.9 233.8C441.9 258.8 446.7 287.4 447.7 320H512V304z" />
+    <glyph glyph-name="truck-loading"
+      unicode="&#xF4DE;"
+      horiz-adv-x="640" d=" M50.2 72.4C52.5 63.9 61.3 58.8 69.8 61.1L286.2000000000001 119.1C294.7000000000001 121.4 299.8000000000001 130.2 297.5000000000001 138.7L247.8000000000001 324.2C245.5000000000001 332.7 236.7000000000001 337.8 228.2000000000001 335.5L151 314.7L175.8 222L114 205.5L89.2 298.2L11.9 277.5C3.4 275.2 -1.7 266.4 0.6 257.9L50.2 72.4zM384 448C366.3 448 352 433.7 352 416V92.4L5.9 -2C1.6 -3.2 -0.9 -7.6 0.3 -11.8L12.9 -58.1C14.1 -62.4 18.5 -64.9 22.7 -63.7L416.4 43.6999999999999C418.8 -16.1 467.6 -64 528 -64C589.9 -64 640 -13.9 640 48V448H384zM528 0C501.5 0 480 21.5 480 48S501.5 96 528 96S576 74.5 576 48S554.5 0 528 0z" />
+    <glyph glyph-name="truck-moving"
+      unicode="&#xF4DF;"
+      horiz-adv-x="640" d=" M621.3 210.7L562.8 269.2C550.8 281.2 534.5 287.9 517.5 287.9H480V384C480 401.7 465.7 416 448 416H32C14.3 416 0 401.7 0 384V48C0 3.8 35.8 -32 80 -32C106.3 -32 129.4 -19.1 144 0.4C158.6 -19.2 181.7 -32 208 -32C252.2 -32 288 3.8 288 48C288 53.5 287.4 58.8 286.4 64H449.6C448.5 58.8 448 53.5 448 48C448 3.8 483.8 -32 528 -32S608 3.8 608 48C608 53.5 607.4 58.8 606.4 64H624C632.8 64 640 71.2 640 80V165.5C640 182.5 633.3 198.7 621.3 210.7zM80 16C62.4 16 48 30.4 48 48S62.4 80 80 80S112 65.6 112 48S97.6 16 80 16zM208 16C190.4 16 176 30.4 176 48S190.4 80 208 80S240 65.6 240 48S225.6 16 208 16zM480 240H517.5C521.8 240 525.8 238.3 528.8 235.3L572.0999999999999 192H480V240zM528 16C510.4 16 496 30.4 496 48S510.4 80 528 80S560 65.6 560 48S545.6 16 528 16z" />
+    <glyph glyph-name="truck"
+      unicode="&#xF0D1;"
+      horiz-adv-x="640" d=" M624 96H608V204.1C608 216.8 602.9 229 593.9 238L494 337.9C485 346.9 472.8 352 460.1 352H416V400C416 426.5 394.5 448 368 448H48C21.5 448 0 426.5 0 400V80C0 53.5 21.5 32 48 32H64C64 -21 107 -64 160 -64S256 -21 256 32H384C384 -21 427 -64 480 -64S576 -21 576 32H624C632.8 32 640 39.2 640 48V80C640 88.8 632.8 96 624 96zM160 -16C133.5 -16 112 5.5 112 32S133.5 80 160 80S208 58.5 208 32S186.5 -16 160 -16zM480 -16C453.5 -16 432 5.5 432 32S453.5 80 480 80S528 58.5 528 32S506.5 -16 480 -16zM560 192H416V304H460.1L560 204.1V192z" />
+    <glyph glyph-name="tshirt"
+      unicode="&#xF553;"
+      horiz-adv-x="640" d=" M631.2 351.5L436.5 448C416.4 420.2 371.9 400.8 320 400.8S223.6 420.2 203.5 448L8.8 351.5C0.9 347.5 -2.3 337.9 1.6 330L58.8 215.5C62.8 207.6 72.4 204.4 80.3 208.3L136.9 236C147.5 241.2 159.9 233.5 159.9 221.6V-32C159.9 -49.7 174.2 -64 191.9 -64H447.9C465.6 -64 479.9 -49.7 479.9 -32V221.7C479.9 233.5 492.3 241.3 502.9 236.1L559.5 208.4C567.4 204.4 577 207.6 581 215.6L638.3 330C642.3 337.9 639.0999999999999 347.6 631.1999999999999 351.5z" />
+    <glyph glyph-name="tty"
+      unicode="&#xF1E4;"
+      horiz-adv-x="512" d=" M5.37 344.178C143.902 482.71 368.306 482.504 506.632 344.178C512.71 338.1 513.706 328.682 509.215 321.497L466.001 252.359A18.332 18.332 0 0 0 443.6450000000001 245.054L357.2230000000001 279.623A18.335 18.335 0 0 0 345.7890000000001 298.469L351.741 358C289.596 380.454 221.105 379.986 160.258 358L166.211 298.468A18.331 18.331 0 0 0 154.777 279.622L68.354 245.0540000000001A18.334 18.334 0 0 0 45.998 252.3590000000001L2.787 321.498A18.333 18.333 0 0 0 5.37 344.178zM96 140V180C96 186.627 90.627 192 84 192H44C37.373 192 32 186.627 32 180V140C32 133.373 37.373 128 44 128H84C90.627 128 96 133.373 96 140zM192 140V180C192 186.627 186.627 192 180 192H140C133.373 192 128 186.627 128 180V140C128 133.373 133.373 128 140 128H180C186.627 128 192 133.373 192 140zM288 140V180C288 186.627 282.627 192 276 192H236C229.373 192 224 186.627 224 180V140C224 133.373 229.373 128 236 128H276C282.627 128 288 133.373 288 140zM384 140V180C384 186.627 378.627 192 372 192H332C325.373 192 320 186.627 320 180V140C320 133.373 325.373 128 332 128H372C378.627 128 384 133.373 384 140zM480 140V180C480 186.627 474.627 192 468 192H428C421.373 192 416 186.627 416 180V140C416 133.373 421.373 128 428 128H468C474.627 128 480 133.373 480 140zM144 44V84C144 90.627 138.627 96 132 96H92C85.373 96 80 90.627 80 84V44C80 37.373 85.373 32 92 32H132C138.627 32 144 37.373 144 44zM240 44V84C240 90.627 234.627 96 228 96H188C181.373 96 176 90.627 176 84V44C176 37.373 181.373 32 188 32H228C234.627 32 240 37.373 240 44zM336 44V84C336 90.627 330.627 96 324 96H284C277.373 96 272 90.627 272 84V44C272 37.373 277.373 32 284 32H324C330.627 32 336 37.373 336 44zM432 44V84C432 90.627 426.627 96 420 96H380C373.373 96 368 90.627 368 84V44C368 37.373 373.373 32 380 32H420C426.627 32 432 37.373 432 44zM96 -52V-12C96 -5.373 90.627 0 84 0H44C37.373 0 32 -5.373 32 -12V-52C32 -58.627 37.373 -64 44 -64H84C90.627 -64 96 -58.627 96 -52zM384 -52V-12C384 -5.373 378.627 0 372 0H140C133.373 0 128 -5.373 128 -12V-52C128 -58.627 133.373 -64 140 -64H372C378.627 -64 384 -58.627 384 -52zM480 -52V-12C480 -5.373 474.627 0 468 0H428C421.373 0 416 -5.373 416 -12V-52C416 -58.627 421.373 -64 428 -64H468C474.627 -64 480 -58.627 480 -52z" />
+    <glyph glyph-name="tv"
+      unicode="&#xF26C;"
+      horiz-adv-x="640" d=" M592 448H48C21.5 448 0 426.5 0 400V80C0 53.5 21.5 32 48 32H293.1V0H133.1C115.4 0 101.1 -14.3 101.1 -32S115.4 -64 133.1 -64H517.1C534.8000000000001 -64 549.1 -49.7 549.1 -32S534.8000000000001 0 517.1 0H357.1V32H592C618.5 32 640 53.5 640 80V400C640 426.5 618.5 448 592 448zM576 96H64V384H576V96z" />
+    <glyph glyph-name="umbrella"
+      unicode="&#xF0E9;"
+      horiz-adv-x="576" d=" M557.011 180.369C505.579 225.586 449.439 224.067 398.444 149.638C393.146 141.7770000000001 383.538 142.473 378.708 149.638C376.225 153.2620000000001 346.49 210.446 288 210.446C242.234 210.446 217.458 179.0680000000001 197.291 149.638C192.462 142.473 182.855 141.7770000000001 177.557 149.638C126.653 223.923 70.944 226.0440000000001 18.99 180.369C8.78 172.105 -1.922 181.478 0.294 189.85C32.146 313.427 158.516 383.3880000000001 288.001 383.3880000000001C416.794 383.3880000000001 544.547 313.427 575.707 189.85C577.913 181.528 567.281 172.057 557.011 180.369zM256 186.999V32C256 14.355 241.645 0 224 0S192 14.355 192 32C192 49.673 177.673 64 160 64S128 49.673 128 32C128 -20.935 171.065 -64 224 -64S320 -20.935 320 32V186.712C298.164 197.518 274.575 196.449 256 186.999zM320 398.0060000000001V416C320 433.673 305.673 448 288 448S256 433.673 256 416V398.0130000000001A372.105 372.105 0 0 0 320 398.0060000000001z" />
+    <glyph glyph-name="underline"
+      unicode="&#xF0CD;"
+      horiz-adv-x="448" d=" M224.264 59.76C132.595 59.76 67.661 110.925 67.661 211.152V384H39.37C30.533 384 23.37 391.163 23.37 400V432C23.37 440.837 30.533 448 39.37 448H176.76C185.597 448 192.76 440.837 192.76 432V400C192.76 391.163 185.597 384 176.76 384H147.947V211.152C147.947 157.453 176.261 131.708 224.264 131.708C271.23 131.708 300.06 157.142 300.06 211.673V384H271.769C262.932 384 255.769 391.163 255.769 400V432C255.769 440.837 262.932 448 271.769 448H408.637C417.474 448 424.637 440.837 424.637 432V400C424.637 391.163 417.474 384 408.637 384H380.346V211.152C380.346 111.747 315.4650000000001 59.76 224.264 59.76zM16 0H432C440.837 0 448 -7.163 448 -16V-48C448 -56.837 440.837 -64 432 -64H16C7.163 -64 0 -56.837 0 -48V-16C0 -7.163 7.163 0 16 0z" />
+    <glyph glyph-name="undo-alt"
+      unicode="&#xF2EA;"
+      horiz-adv-x="512" d=" M255.545 440C189.276 439.881 129.107 413.767 84.685 371.315L48.971 407.029C33.851 422.149 8 411.4410000000001 8 390.059V256C8 242.745 18.745 232 32 232H166.059C187.441 232 198.149 257.851 183.03 272.971L141.28 314.721C172.144 343.62 212.081 359.628 254.51 359.9940000000001C346.908 360.7920000000001 424.793 286.017 423.9940000000001 190.552C423.236 99.991 349.816 24 256 24C214.873 24 176.003 38.678 145.37 65.556C140.627 69.717 133.464 69.464 129.002 65.003L89.34 25.341C84.468 20.469 84.709 12.526 89.822 7.908C133.798 -31.813 192.074 -56 256 -56C392.966 -56 503.999 55.033 504 191.998C504.001 328.807 392.354 440.245 255.545 440z" />
+    <glyph glyph-name="undo"
+      unicode="&#xF0E2;"
+      horiz-adv-x="512" d=" M212.333 223.667H12C5.373 223.667 0 229.04 0 235.667V436C0 442.627 5.373 448 12 448H60C66.627 448 72 442.627 72 436V357.8880000000001C117.773 408.721 184.26 440.53 258.175 439.993C395.081 438.999 504.623 328.37 504.332 191.461C504.041 54.742 393.12 -56 256.3330000000001 -56C192.244 -56 133.8370000000001 -31.687 89.823 8.215C84.724 12.837 84.489 20.769 89.356 25.635L123.323 59.602C127.7970000000001 64.076 134.9850000000001 64.319 139.7240000000001 60.127C170.76 32.664 211.58 16 256.3330000000001 16C353.601 16 432.3330000000001 94.716 432.3330000000001 192C432.3330000000001 289.267 353.617 368 256.3330000000001 368C197.837 368 146.053 339.524 114.059 295.6670000000001H212.333C218.96 295.6670000000001 224.333 290.294 224.333 283.6670000000001V235.667C224.333 229.04 218.96 223.667 212.333 223.667z" />
+    <glyph glyph-name="universal-access"
+      unicode="&#xF29A;"
+      horiz-adv-x="512" d=" M256 400C370.953 400 464 306.971 464 192C464 77.047 370.971 -16 256 -16C141.047 -16 48 77.029 48 192C48 306.953 141.029 400 256 400M256 440C119.033 440 8 328.967 8 192S119.033 -56 256 -56S504 55.033 504 192S392.967 440 256 440zM256 384C149.961 384 64 298.039 64 192S149.961 0 256 0S448 85.961 448 192S362.039 384 256 384zM256 340C275.882 340 292 323.882 292 304S275.882 268 256 268S220 284.118 220 304S236.118 340 256 340zM373.741 241.977C345.029 235.198 318.23 229.229 291.601 226.17C292.452 125.1470000000001 303.907 103.118 316.638 70.549C320.255 61.289 315.681 50.851 306.421 47.234C297.16 43.617 286.722 48.191 283.105 57.451C274.4000000000001 79.759 266.019 98.087 260.844 136H251.158C245.991 98.149 237.624 79.792 228.896 57.451C225.281 48.196 214.846 43.615 205.581 47.234C196.321 50.8510000000001 191.747 61.29 195.364 70.549C208.077 103.09 219.549 125.09 220.401 226.1700000000001C193.772 229.2280000000001 166.973 235.1970000000001 138.26 241.9770000000001C129.66 244.0080000000001 124.334 252.6250000000001 126.365 261.226S137.012 275.1520000000001 145.614 273.1210000000001C242.3 250.2920000000001 269.897 250.338 366.389 273.1210000000001C374.988 275.1510000000001 383.6070000000001 269.827 385.6380000000001 261.226C387.6670000000001 252.6250000000001 382.341 244.0070000000001 373.7410000000001 241.9770000000001z" />
+    <glyph glyph-name="university"
+      unicode="&#xF19C;"
+      horiz-adv-x="512" d=" M496 320V304A8 8 0 0 0 488 296H464V284C464 277.373 458.627 272 452 272H60C53.373 272 48 277.373 48 284V296H24A8 8 0 0 0 16 304V320A8 8 0 0 0 20.941 327.392L252.941 415.392A7.996000000000001 7.996000000000001 0 0 0 259.0590000000001 415.392L491.059 327.392A8 8 0 0 0 496 320zM472 16H40C26.745 16 16 5.255 16 -8V-24A8 8 0 0 1 24 -32H488A8 8 0 0 1 496 -24V-8C496 5.255 485.255 16 472 16zM96 256V64H60C53.373 64 48 58.627 48 52V32H464V52C464 58.627 458.627 64 452 64H416V256H352V64H288V256H224V64H160V256H96z" />
+    <glyph glyph-name="unlink"
+      unicode="&#xF127;"
+      horiz-adv-x="512" d=" M304.0830000000001 42.093C308.769 37.407 308.769 29.809 304.0830000000001 25.122L259.4090000000001 -19.552C200.1460000000001 -78.814 103.716 -78.818 44.448 -19.552C-14.816 39.713 -14.816 136.144 44.448 195.4080000000001L89.123 240.0830000000001C93.809 244.7690000000001 101.407 244.7690000000001 106.094 240.0830000000001L145.692 200.485C150.3780000000001 195.799 150.3780000000001 188.201 145.692 183.514L101.017 138.84C72.945 110.7670000000001 72.945 65.09 101.017 37.0170000000001C129.089 8.9450000000001 174.7670000000001 8.9440000000001 202.841 37.0170000000001L247.5150000000001 81.691C252.2010000000001 86.377 259.7990000000001 86.377 264.4860000000001 81.691L304.0830000000001 42.093zM247.5150000000001 302.3090000000001C252.2010000000001 297.6230000000001 259.7990000000001 297.6230000000001 264.4860000000001 302.3090000000001L309.1600000000001 346.9830000000001C337.2320000000001 375.0580000000001 382.9100000000001 375.0560000000001 410.9840000000001 346.9830000000001C439.0560000000001 318.9100000000001 439.0560000000001 273.2330000000001 410.9840000000001 245.1600000000001L366.3090000000001 200.486C361.6230000000001 195.8 361.6230000000001 188.202 366.3090000000001 183.5150000000001L405.9070000000001 143.917C410.593 139.2310000000001 418.1910000000001 139.2310000000001 422.8780000000001 143.917L467.5530000000001 188.5920000000001C526.8180000000001 247.8570000000001 526.8180000000001 344.2870000000001 467.5530000000001 403.552C408.2870000000001 462.816 311.8580000000001 462.816 252.5920000000001 403.552L207.918 358.8780000000001C203.232 354.192 203.232 346.5940000000001 207.918 341.9070000000001L247.5150000000001 302.3090000000001zM482.3430000000001 -56.9709999999999L504.9700000000001 -34.3439999999999C514.3430000000001 -24.9709999999999 514.3430000000001 -9.7749999999999 504.9700000000001 -0.4029999999999L63.598 440.971C54.225 450.344 39.029 450.344 29.657 440.971L7.029 418.343C-2.344 408.9700000000001 -2.344 393.774 7.029 384.402L448.402 -56.971C457.775 -66.343 472.971 -66.343 482.343 -56.971z" />
+    <glyph glyph-name="unlock-alt"
+      unicode="&#xF13E;"
+      horiz-adv-x="448" d=" M400 192H152V295.1C152 334.7 183.7 367.6 223.3 368C263.3 368.4 296 335.9 296 296V280C296 266.7 306.7 256 320 256H352C365.3 256 376 266.7 376 280V296C376 380 307.5 448.3 223.5 448C139.5 447.7 72 378.5 72 294.5V192H48C21.5 192 0 170.5 0 144V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V144C448 170.5 426.5 192 400 192zM264 40C264 17.9 246.1 0 224 0S184 17.9 184 40V88C184 110.1 201.9 128 224 128S264 110.1 264 88V40z" />
+    <glyph glyph-name="unlock"
+      unicode="&#xF09C;"
+      horiz-adv-x="448" d=" M400 192H152V295.1C152 334.7 183.7 367.6 223.3 368C263.3 368.4 296 335.9 296 296V280C296 266.7 306.7 256 320 256H352C365.3 256 376 266.7 376 280V296C376 380 307.5 448.3 223.5 448C139.5 447.7 72 378.5 72 294.5V192H48C21.5 192 0 170.5 0 144V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V144C448 170.5 426.5 192 400 192z" />
+    <glyph glyph-name="upload"
+      unicode="&#xF093;"
+      horiz-adv-x="512" d=" M296 64H216C202.7 64 192 74.7 192 88V256H104.3C86.5 256 77.6 277.5 90.2 290.1L242.3 442.3C249.8 449.8 262.1 449.8 269.6 442.3L421.8 290.1C434.4000000000001 277.5 425.5 256 407.7 256H320V88C320 74.7 309.3 64 296 64zM512 72V-40C512 -53.3 501.3 -64 488 -64H24C10.7 -64 0 -53.3 0 -40V72C0 85.3 10.7 96 24 96H160V88C160 57.1 185.1 32 216 32H296C326.9 32 352 57.1 352 88V96H488C501.3 96 512 85.3 512 72zM388 -16C388 -5 379 4 368 4S348 -5 348 -16S357 -36 368 -36S388 -27 388 -16zM452 -16C452 -5 443 4 432 4S412 -5 412 -16S421 -36 432 -36S452 -27 452 -16z" />
+    <glyph glyph-name="user-alt-slash"
+      unicode="&#xF4FA;"
+      horiz-adv-x="640" d=" M633.8 -10.1L389.6 178.7C433.8 203.3 464 249.9 464 304C464 383.5 399.5 448 320 448C252.9 448 197 401.9 181 339.8L45.5 444.6C38.5 450 28.5 448.8 23 441.8L3.4 416.6C-2 409.6 -0.8 399.6 6.2 394.2L594.6 -60.5C601.6 -65.9 611.6 -64.7 617.1 -57.7L636.7 -32.4C642.1 -25.6 640.8000000000001 -15.5 633.8000000000001 -10.1zM198.4 128C124.2 128 64 67.8 64 -6.4V-16C64 -42.5 85.5 -64 112 -64H494.2L245.8 128H198.4z" />
+    <glyph glyph-name="user-alt"
+      unicode="&#xF406;"
+      horiz-adv-x="512" d=" M256 160C335.5 160 400 224.5 400 304S335.5 448 256 448S112 383.5 112 304S176.5 160 256 160zM384 128H328.9C306.7 117.8 282 112 256 112S205.4 117.8 183.1 128H128C57.3 128 0 70.7 0 0V-16C0 -42.5 21.5 -64 48 -64H464C490.5 -64 512 -42.5 512 -16V0C512 70.7 454.7 128 384 128z" />
+    <glyph glyph-name="user-astronaut"
+      unicode="&#xF4FB;"
+      horiz-adv-x="448" d=" M64 224H77.5C102.2 167.5 158.4 128 224 128S345.8 167.5 370.5 224H384C392.8 224 400 231.2 400 240V336C400 344.8 392.8 352 384 352H370.5C345.8 408.5 289.6 448 224 448S102.2 408.5 77.5 352H64C55.2 352 48 344.8 48 336V240C48 231.2 55.2 224 64 224zM104 312C104 334.1 125.5 352 152 352H296C322.5 352 344 334.1 344 312V288C344 235 301 192 248 192H200C147 192 104 235 104 288V312zM176 240L188 276L224 288L188 300L176 336L164 300L128 288L164 276L176 240zM327.6 126.6C297.7 107.3 262.2 96 224 96S150.3 107.3 120.4 126.6C52.9 119.5 0 63 0 -6.4V-16C0 -42.5 21.5 -64 48 -64H128V0C128 17.7 142.3 32 160 32H288C305.7 32 320 17.7 320 0V-64H400C426.5 -64 448 -42.5 448 -16V-6.4C448 63 395.1 119.5 327.6 126.6zM272 0C263.2 0 256 -7.2 256 -16S263.2 -32 272 -32S288 -24.8 288 -16S280.8 0 272 0zM176 0C167.2 0 160 -7.2 160 -16V-64H192V-16C192 -7.2 184.8 0 176 0z" />
+    <glyph glyph-name="user-check"
+      unicode="&#xF4FC;"
+      horiz-adv-x="640" d=" M224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192zM313.6 160H296.9000000000001C274.7000000000001 149.8 250.0000000000001 144 224 144S173.4 149.8 151.1 160H134.4C60.2 160 0 99.8 0 25.6V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V25.6C448 99.8 387.8 160 313.6 160zM636.6 288.4L608.8000000000001 316.5C604.2 321.2 596.7 321.2 592.0000000000001 316.6L487.2000000000001 212.6L441.7000000000001 258.4C437.1000000000001 263.1 429.6000000000001 263.1 424.9000000000001 258.5L396.8000000000001 230.6C392.1000000000001 226 392.1000000000001 218.5 396.7000000000001 213.8L478.4 131.5C483.0000000000001 126.8 490.5000000000001 126.8 495.2 131.3999999999999L636.5 271.5999999999999C641.1 276.2999999999999 641.2 283.7999999999999 636.6 288.3999999999999z" />
+    <glyph glyph-name="user-circle"
+      unicode="&#xF2BD;"
+      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 344C296.6 344 336 304.6 336 256S296.6 168 248 168S160 207.4 160 256S199.4 344 248 344zM248 0C189.3 0 136.7 26.6 101.5 68.2C120.3 103.6 157.1 128 200 128C202.4 128 204.8 127.6 207.1 126.9C220.1 122.7 233.7 120 248 120C262.3 120 276 122.7 288.9 126.9C291.2 127.6 293.6 128 296 128C338.9 128 375.7 103.6 394.5 68.2C359.3 26.6 306.7 0 248 0z" />
+    <glyph glyph-name="user-clock"
+      unicode="&#xF4FD;"
+      horiz-adv-x="640" d=" M496 224C416.4 224 352 159.6 352 80S416.4 -64 496 -64S640 0.4 640 80S575.6 224 496 224zM560 73.7C560 68.4 555.6 64 550.3 64H489.6999999999999C484.3999999999999 64 479.9999999999999 68.4 479.9999999999999 73.7V150.3C479.9999999999999 155.6 484.3999999999999 160 489.6999999999999 160H502.3C507.6 160 511.9999999999999 155.6 511.9999999999999 150.3V96H550.3C555.5999999999999 96 560 91.6 560 86.3V73.7zM320 80C320 107.8 326.7 134.1 338.2 157.5C330.2 159 322 160 313.6 160H296.9C274.7 149.8 250 144 224 144S173.4 149.8 151.1 160H134.4C60.2 160 0 99.8 0 25.6V-16C0 -42.5 21.5 -64 48 -64H395.1C349.8 -32.1 320 20.5 320 80zM224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192z" />
+    <glyph glyph-name="user-cog"
+      unicode="&#xF4FE;"
+      horiz-adv-x="640" d=" M610.5 74.7C613.1 88.8 613.1 103.2 610.5 117.3L636.3 132.2C639.3 133.9 640.5999999999999 137.4 639.5999999999999 140.7C632.8999999999999 162.3 621.3999999999999 181.9 606.3999999999999 198.1C604.0999999999999 200.6 600.3999999999999 201.2 597.3999999999999 199.5L571.5999999999999 184.6C560.6999999999999 193.9 548.1999999999999 201.1 534.6999999999999 205.9V235.7000000000001C534.6999999999999 239.1000000000001 532.3 242.1000000000001 528.9999999999999 242.8000000000001C506.6999999999999 247.8000000000001 483.9999999999999 247.6000000000001 462.7999999999999 242.8000000000001C459.4999999999999 242.1000000000001 457.0999999999999 239.1000000000001 457.0999999999999 235.7000000000001V205.9C443.5999999999999 201.1 431.0999999999999 193.9 420.2 184.6L394.3999999999999 199.5C391.5 201.2 387.7 200.6 385.3999999999999 198.1C370.3999999999999 181.9 358.8999999999999 162.3 352.2 140.7000000000001C351.2 137.4 352.5999999999999 133.9 355.5 132.2000000000001L381.3 117.3000000000001C378.7 103.2000000000001 378.7 88.8000000000001 381.3 74.7000000000001L355.5 59.8000000000001C352.5 58.1000000000001 351.2 54.6000000000001 352.2 51.3000000000001C358.8999999999999 29.7 370.3999999999999 10.2 385.3999999999999 -6.0999999999999C387.7 -8.5999999999999 391.3999999999999 -9.1999999999999 394.3999999999999 -7.4999999999999L420.2 7.4000000000001C431.0999999999999 -1.8999999999999 443.5999999999999 -9.0999999999999 457.0999999999999 -13.8999999999999V-43.6999999999999C457.0999999999999 -47.0999999999999 459.4999999999999 -50.0999999999999 462.7999999999999 -50.8C485.0999999999999 -55.8 507.7999999999999 -55.6 528.9999999999999 -50.8C532.2999999999998 -50.1 534.6999999999999 -47.1 534.6999999999999 -43.6999999999999V-13.8999999999999C548.1999999999999 -9.0999999999999 560.6999999999999 -1.8999999999999 571.5999999999999 7.4000000000001L597.3999999999999 -7.4999999999999C600.2999999999998 -9.1999999999999 604.0999999999999 -8.5999999999999 606.3999999999999 -6.0999999999999C621.3999999999999 10.1000000000001 632.8999999999999 29.7000000000001 639.5999999999999 51.3000000000001C640.5999999999999 54.6000000000001 639.1999999999999 58.1000000000001 636.3 59.8000000000001L610.5 74.7000000000001zM496 47.5C469.2 47.5 447.5 69.3 447.5 96S469.3 144.5 496 144.5S544.5 122.7 544.5 96S522.8 47.5 496 47.5zM224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192zM425.2 -34.5C422.9 -33.3 420.6 -31.9 418.4 -30.6L410.5 -35.2C404.5 -38.6 397.7 -40.5000000000001 390.9 -40.5000000000001C380 -40.5000000000001 369.5 -35.9 362 -27.9C343.7 -8.1 329.7 15.9999999999999 321.8 41.6999999999999C316.3 59.3999999999999 323.7 78.0999999999999 339.7 87.3999999999999L347.6 91.9999999999999C347.5 94.6 347.5 97.1999999999999 347.6 99.8L339.7 104.4C323.7 113.6 316.3 132.4 321.8 150.1C322.7 153 324 155.9 325 158.8C321.2 159.1 317.5 160 313.6 160H296.9000000000001C274.7000000000001 149.8 250.0000000000001 144 224 144S173.4 149.8 151.1 160H134.4C60.2 160 0 99.8 0 25.6V-16C0 -42.5 21.5 -64 48 -64H400C410.1 -64 419.5 -60.8 427.2 -55.5C426 -51.7 425.2 -47.8 425.2 -43.7V-34.5z" />
+    <glyph glyph-name="user-edit"
+      unicode="&#xF4FF;"
+      horiz-adv-x="640" d=" M224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192zM313.6 160H296.9000000000001C274.7000000000001 149.8 250.0000000000001 144 224 144S173.4 149.8 151.1 160H134.4C60.2 160 0 99.8 0 25.6V-16C0 -42.5 21.5 -64 48 -64H322.9C320.5 -57.2 319.5 -50 320.3 -42.7L327.1 18.2L328.3 29.3L336.2 37.2L413.5 114.5C389 142.2 353.5 160 313.5999999999999 160zM358.9000000000001 14.7L352.1 -46.3C351 -56.5 359.6 -65.1 369.7000000000001 -63.9L430.6 -57.1L568.5 80.8L496.8 152.5L358.9 14.6999999999999zM633 179.1L595.1 217C585.8000000000001 226.3 570.6 226.3 561.3000000000001 217L523.5000000000001 179.2L519.4000000000001 175.1L591.2 103.4L633 145.2C642.3 154.6 642.3 169.7 633 179.1z" />
+    <glyph glyph-name="user-friends"
+      unicode="&#xF500;"
+      horiz-adv-x="640" d=" M192 192C253.9 192 304 242.1 304 304S253.9 416 192 416S80 365.9 80 304S130.1 192 192 192zM268.8 160H260.5C239.7 150 216.6 144 192 144S144.4 150 123.5 160H115.2C51.6 160 0 108.4 0 44.8V16C0 -10.5 21.5 -32 48 -32H336C362.5 -32 384 -10.5 384 16V44.8C384 108.4 332.4 160 268.8 160zM480 192C533 192 576 235 576 288S533 384 480 384S384 341 384 288S427 192 480 192zM528 160H524.2C510.3000000000001 155.2 495.6 152 480.0000000000001 152S449.7000000000001 155.2 435.8000000000001 160H432C411.6 160 392.8 154.1 376.3 144.6C400.7 118.3 416 83.4 416 44.8V6.4C416 4.2 415.5 2.1 415.4 1e-13H592C618.5 1e-13 640 21.5000000000001 640 48.0000000000001C640 109.9 589.9 160.0000000000001 528 160.0000000000001z" />
+    <glyph glyph-name="user-graduate"
+      unicode="&#xF501;"
+      horiz-adv-x="448" d=" M319.4 127.4L224 32L128.6 127.4C57.1 124.3 0 65.8 0 -6.4V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V-6.4C448 65.8 390.9 124.3 319.4 127.4zM13.6 368.2L20 366.7V308.3C13 304.1 8 296.8 8 288C8 279.6 12.6 272.6 19.1 268.3L3.5 206C1.8 199.1 5.6 192 11.1 192H52.9C58.4 192 62.2 199.1 60.5 206L44.9 268.3C51.4 272.6 56 279.6 56 288C56 296.8 51 304.1 44 308.3V360.9L110 345C101.4 327.8 96 308.6 96 288C96 217.3 153.3 160 224 160S352 217.3 352 288C352 308.6 346.7 327.8 338 345L434.3 368.2C452.5 372.6 452.5 395.3 434.3 399.7L243.9 445.7C230.9 448.8 217.2 448.8 204.2 445.7L13.6 399.8C-4.5 395.4 -4.5 372.6 13.6 368.2z" />
+    <glyph glyph-name="user-lock"
+      unicode="&#xF502;"
+      horiz-adv-x="640" d=" M320 128C320 139.1 323.1 149.4 328.1 158.5C323.3 159 318.6 160 313.6 160H296.9000000000001C274.7000000000001 149.8 250.0000000000001 144 224 144S173.4 149.8 151.1 160H134.4C60.2 160 0 99.8 0 25.6V-16C0 -42.5 21.5 -64 48 -64H328.9C323.4 -54.5 320 -43.7 320 -32V128zM224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192zM608 160H576V208C576 252.2 540.2 288 496 288S416 252.2 416 208V160H384C366.3 160 352 145.7 352 128V-32C352 -49.7 366.3 -64 384 -64H608C625.7 -64 640 -49.7 640 -32V128C640 145.7 625.7 160 608 160zM528 160H464V208C464 225.6 478.4 240 496 240S528 225.6 528 208V160z" />
+    <glyph glyph-name="user-md"
+      unicode="&#xF0F0;"
+      horiz-adv-x="448" d=" M224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192zM104 24C104 10.7 114.7 0 128 0S152 10.7 152 24S141.3 48 128 48S104 37.3 104 24zM320 159.4V110.4C356.5 103 384 70.6 384 32V-9.7C384 -17.3 378.6 -23.9 371.1 -25.4L338.9000000000001 -31.8C334.6 -32.6999999999999 330.4000000000001 -29.9 329.5000000000001 -25.4999999999999L326.4000000000001 -9.8C325.5000000000001 -5.4999999999999 328.3 -1.1999999999999 332.7000000000001 -0.4L352.0000000000001 3.5V32C352.0000000000001 94.8 256.0000000000001 97.1 256.0000000000001 30.1V3.4L275.3000000000001 -0.4999999999999C279.6000000000001 -1.3999999999999 282.4000000000001 -5.6 281.6000000000001 -9.8999999999999L278.5000000000001 -25.5999999999999C277.6000000000001 -29.8999999999999 273.4000000000001 -32.6999999999999 269.1000000000001 -31.8999999999999L237.9000000000001 -27.6999999999999C230.0000000000001 -26.5999999999999 224.1000000000001 -19.8999999999999 224.1000000000001 -11.8V32C224.1000000000001 70.6 251.6000000000001 102.9 288.1000000000001 110.4V155.6C285.9000000000001 154.9 283.7000000000001 154.5 281.5000000000001 153.7C263.5000000000001 147.4 244.2000000000001 143.9 224.1000000000001 143.9S184.7000000000001 147.4 166.7000000000001 153.7C159.3000000000001 156.3 151.8000000000001 157.9 144.1000000000001 158.9V77.3C167.2000000000001 70.4 184.1000000000001 49.1999999999999 184.1000000000001 23.9C184.1000000000001 -7 159.0000000000001 -32.1 128.1000000000001 -32.1S72.1000000000001 -7 72.1000000000001 23.9C72.1000000000001 49.2 89.0000000000001 70.4 112.1000000000001 77.3V157.6999999999999C48.5 147 0 92.2 0 25.6V-19.2C0 -43.9 20.1 -64 44.8 -64H403.2C427.9 -64 448 -43.9 448 -19.2V25.6C448 97.6 391.2 155.9 320 159.4z" />
+    <glyph glyph-name="user-minus"
+      unicode="&#xF503;"
+      horiz-adv-x="640" d=" M624 240H432C423.2 240 416 232.8 416 224V192C416 183.2 423.2 176 432 176H624C632.8 176 640 183.2 640 192V224C640 232.8 632.8 240 624 240zM224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192zM313.6 160H296.9000000000001C274.7000000000001 149.8 250.0000000000001 144 224 144S173.4 149.8 151.1 160H134.4C60.2 160 0 99.8 0 25.6V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V25.6C448 99.8 387.8 160 313.6 160z" />
+    <glyph glyph-name="user-ninja"
+      unicode="&#xF504;"
+      horiz-adv-x="448" d=" M325.4 158.8L224 57.4L122.6 158.8C54 152.7 0 95.8 0 25.6V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V25.6C448 95.8 394 152.7000000000001 325.4 158.8zM32 256C59.3 256 83.8 267.5 101.2 285.7C116.3 231.8 165.2 192 224 192C294.7 192 352 249.3 352 320S294.7 448 224 448C173.6 448 130.4 418.6 109.5 376.2C92.1 400.2 64 416 32 416C32 382.6 49.1 353.2 75.1 336C49.1 318.8 32 289.4 32 256zM176 352H272C289.7 352 304 337.7 304 320H144C144 337.7 158.3 352 176 352z" />
+    <glyph glyph-name="user-plus"
+      unicode="&#xF234;"
+      horiz-adv-x="640" d=" M624 240H560V304C560 312.8 552.8 320 544 320H512C503.2 320 496 312.8 496 304V240H432C423.2 240 416 232.8 416 224V192C416 183.2 423.2 176 432 176H496V112C496 103.2 503.2 96 512 96H544C552.8 96 560 103.2 560 112V176H624C632.8 176 640 183.2 640 192V224C640 232.8 632.8 240 624 240zM224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192zM313.6 160H296.9000000000001C274.7000000000001 149.8 250.0000000000001 144 224 144S173.4 149.8 151.1 160H134.4C60.2 160 0 99.8 0 25.6V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V25.6C448 99.8 387.8 160 313.6 160z" />
+    <glyph glyph-name="user-secret"
+      unicode="&#xF21B;"
+      horiz-adv-x="448" d=" M383.9 139.7L407.8 202.3C411.8 212.8 404.1 224 392.8 224H334.3C345.3 242.9 352.1 264.6 352.1 288V288.3C391.3 296.1 416.1 307.4 416.1 320C416.1 333.3 388.8 345.1 346 353C336.8 385.8 319 418.8 305.4 435.8C295.9 447.7 279.5 451.4 265.9 444.6L238.3 430.8C229.3 426.3 218.7 426.3 209.7 430.8L182.1 444.6C168.5 451.4 152.1 447.7 142.6 435.8C129.1 418.8 111.2 385.8 102 353C59.3 345.1 32 333.3 32 320C32 307.4 56.8 296.1 96 288.3V288C96 264.6 102.8 242.9 113.8 224H56.3C44.8 224 37.1 212.3 41.6 201.7L67.4 141.5C27.3 118.2 0 75.3 0 25.6V-19.2C0 -43.9 20.1 -64 44.8 -64H403.2C427.9 -64 448 -43.9 448 -19.2V25.6C448 74 422.2 116 383.9 139.7000000000001zM176 -32L134.4 160L184 128L208 88L176 -32zM272 -32L240 88L264 128L313.6 160L272 -32zM313.7 266.5C309.8 254.6 306.7 241.9 297.2 233.1C287.1 223.8 249.2 210.7 233.2 258.1C230.4 266.5 217.8 266.5 214.9 258.1C197.9 207.9 158.9 225.7 150.9 233.1C141.4 241.9 138.2 254.6 134.4 266.5C133.6 269 128.1 272.2 128.1 272.3V283.1C156.4 279.5 189.1 277.3 224.1 277.3S291.8 279.4 320.1 283.1V272.3C320 272.2000000000001 314.5 269.1 313.7 266.5z" />
+    <glyph glyph-name="user-shield"
+      unicode="&#xF505;"
+      horiz-adv-x="640" d=" M622.3 176.9L507.1 221.9C502.9999999999999 223.5 494.4999999999999 225.6 484.9 221.9L369.7 176.9C359 172.7 352 162.9 352 152C352 40.4 420.7 -36.8 484.9 -61.9C494.5 -65.6 502.9 -63.5 507.1 -61.9C558.4 -41.9 640 27.5 640 152C640 162.9 633 172.7 622.3 176.9zM496 -14.4V174.7L591.5 137.4C585.9 50.3 530.6 2 496 -14.4zM224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192zM320 152C320 154.5 320.8 156.8 321.1 159.2C318.6 159.3 316.2000000000001 160 313.6 160H296.9000000000001C274.7000000000001 149.8 250.0000000000001 144 224 144S173.4 149.8 151.1 160H134.4C60.2 160 0 99.8 0 25.6V-16C0 -42.5 21.5 -64 48 -64H400C406.8 -64 413.3 -62.5 419.2 -60C365.2 -17.1 320 56.7 320 152z" />
+    <glyph glyph-name="user-slash"
+      unicode="&#xF506;"
+      horiz-adv-x="640" d=" M633.8 -10.1L362.3 199.7C412.1 217.3 448 264.2 448 320C448 390.7 390.7 448 320 448C252.9 448 198.5 396.2 193.1 330.6L45.5 444.6C38.5 450 28.5 448.8 23 441.8L3.4 416.6C-2 409.6 -0.8 399.6 6.2 394.2L594.6 -60.5C601.6 -65.9 611.6 -64.7 617.1 -57.7L636.7 -32.4C642.1 -25.6 640.8000000000001 -15.5 633.8000000000001 -10.1zM96 25.6V-16C96 -42.5 117.5 -64 144 -64H494.2L207.4 157.7C144.2 146.7 96 92 96 25.6z" />
+    <glyph glyph-name="user-tag"
+      unicode="&#xF507;"
+      horiz-adv-x="640" d=" M630.6 83.1L540.3000000000001 173.3C528.3000000000001 185.3 512.0000000000001 192 495.0000000000001 192H415.7000000000001C398.0000000000001 192 383.7000000000001 177.7 383.7000000000001 160V80.8C383.7000000000001 63.8 390.4000000000001 47.6 402.4000000000001 35.6L492.7 -54.6C505.2 -67.0999999999999 525.5 -67.0999999999999 538 -54.6L630.5 37.9C643.1 50.4 643.1 70.6 630.6 83.1zM447.8 104.1C434.5 104.1 423.8 114.8 423.8 128.1S434.5 152.1 447.8 152.1S471.8 141.4 471.8 128.1C471.8 114.9 461.1 104.1 447.8 104.1zM224 192.1C294.7 192.1 352 249.4000000000001 352 320.1C352 390.7 294.7 448 224 448S96 390.7 96 320C96 249.4 153.3 192.1 224 192.1zM351.8 80.9V154C339.6 157.6 326.9000000000001 160.2 313.6 160.2H296.9000000000001C274.7000000000001 150 250.0000000000001 144.2 224 144.2S173.4 150 151.1 160.2H134.4C60.2 160.1 0 99.9 0 25.7V-15.9C0 -42.4 21.5 -63.9 48 -63.9H400C415.5 -63.9 429.1 -56.4 437.9 -45.0000000000001L379.9 12.9999999999999C361.8 31.1 351.8 55.1999999999999 351.8 80.9z" />
+    <glyph glyph-name="user-tie"
+      unicode="&#xF508;"
+      horiz-adv-x="448" d=" M224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192zM319.8 159.4L272 -32L240 104L272 160H176L208 104L176 -32L128.2 159.4C56.9 156 0 97.7 0 25.6V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V25.6C448 97.7000000000001 391.1 156 319.8 159.4z" />
+    <glyph glyph-name="user-times"
+      unicode="&#xF235;"
+      horiz-adv-x="640" d=" M589.6 208L635.2 253.6C641.5 259.9 641.5 270.1 635.2 276.4L612.4000000000001 299.2000000000001C606.1000000000001 305.5 595.9000000000001 305.5 589.6000000000001 299.2000000000001L544 253.6L498.4 299.2C492.1 305.5 481.9 305.5 475.6 299.2L452.8 276.4C446.5 270.1 446.5 259.9 452.8 253.6L498.4 208L452.8 162.4C446.5 156.1 446.5 145.9 452.8 139.6L475.6 116.8C481.9 110.4999999999999 492.1 110.4999999999999 498.4 116.8L544 162.4L589.6 116.8C595.9 110.4999999999999 606.1 110.4999999999999 612.4 116.8L635.1999999999999 139.6C641.4999999999999 145.9 641.4999999999999 156.1 635.1999999999999 162.4L589.6 208zM224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192zM313.6 160H296.9000000000001C274.7000000000001 149.8 250.0000000000001 144 224 144S173.4 149.8 151.1 160H134.4C60.2 160 0 99.8 0 25.6V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V25.6C448 99.8 387.8 160 313.6 160z" />
+    <glyph glyph-name="user"
+      unicode="&#xF007;"
+      horiz-adv-x="448" d=" M224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192zM313.6 160H296.9000000000001C274.7000000000001 149.8 250.0000000000001 144 224 144S173.4 149.8 151.1 160H134.4C60.2 160 0 99.8 0 25.6V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V25.6C448 99.8 387.8 160 313.6 160z" />
+    <glyph glyph-name="users-cog"
+      unicode="&#xF509;"
+      horiz-adv-x="640" d=" M610.5 106.7C613.1 120.8 613.1 135.2 610.5 149.3L636.3 164.2C639.3 165.9 640.5999999999999 169.4 639.5999999999999 172.7C632.8999999999999 194.3 621.3999999999999 213.9 606.3999999999999 230.1C604.0999999999999 232.6 600.3999999999999 233.2 597.3999999999999 231.5L571.5999999999999 216.6C560.6999999999999 225.9 548.1999999999999 233.1 534.6999999999999 237.9V267.7000000000001C534.6999999999999 271.1 532.3 274.1 528.9999999999999 274.8C506.6999999999999 279.8 483.9999999999999 279.6 462.7999999999999 274.8C459.4999999999999 274.1 457.0999999999999 271.1 457.0999999999999 267.7000000000001V237.9C443.5999999999999 233.1 431.0999999999999 225.9 420.2 216.6L394.3999999999999 231.5C391.5 233.2 387.7 232.6 385.3999999999999 230.1C370.3999999999999 213.9 358.8999999999999 194.3 352.2 172.7C351.2 169.4 352.5999999999999 165.9 355.5 164.2L381.3 149.3C378.7 135.2 378.7 120.8 381.3 106.7L355.5 91.8C352.5 90.1 351.2 86.6 352.2 83.3C358.8999999999999 61.7 370.3999999999999 42.2 385.3999999999999 25.9C387.7 23.4 391.3999999999999 22.8 394.3999999999999 24.5000000000001L420.2 39.4C431.0999999999999 30.1 443.5999999999999 22.9 457.0999999999999 18.1V-11.7C457.0999999999999 -15.1 459.4999999999999 -18.1 462.7999999999999 -18.8C485.0999999999999 -23.8 507.7999999999999 -23.6 528.9999999999999 -18.8C532.2999999999998 -18.1 534.6999999999999 -15.1 534.6999999999999 -11.7V18.1C548.1999999999999 22.9 560.6999999999999 30.1 571.5999999999999 39.4L597.3999999999999 24.5000000000001C600.2999999999998 22.8000000000001 604.0999999999999 23.4 606.3999999999999 25.9C621.3999999999999 42.1 632.8999999999999 61.7000000000001 639.5999999999999 83.3C640.5999999999999 86.6 639.1999999999999 90.1 636.3 91.8L610.5 106.7zM496 79.5C469.2 79.5 447.5 101.3 447.5 128S469.3 176.5 496 176.5S544.5 154.7 544.5 128S522.8 79.5 496 79.5zM96 224C131.3 224 160 252.7 160 288S131.3 352 96 352S32 323.3 32 288S60.7 224 96 224zM320 192C321.9 192 323.7 192.5 325.6 192.6C333.9000000000001 214.3 346.1 234.7 361.9000000000001 251.8C369.3 259.8 379.8 264.4 390.8 264.4C397.7 264.4 404.5 262.6 410.4000000000001 259.1L418.3 254.5C419.1 255 419.9000000000001 255.4 420.7 255.9C427.7 270.5 431.9 286.7000000000001 431.9 303.9C431.9 365.8 381.8 415.9 319.9 415.9S208 365.9 208 304C208 242.1 258.1 192 320 192zM425.2 -2.5C422.9 -1.3 420.6 0.1 418.4 1.4C410.2 -3.4 403.1 -8.4 390.9 -8.4C380 -8.4 369.5 -3.8 362 4.2C343.7 24 329.7 48.1 321.8 73.8C311.1 108.3 346.7 123.5 347.6 124.1C347.5 126.7 347.5 129.3 347.6 131.9L339.7000000000001 136.5C335.9000000000001 138.7 332.7000000000001 141.5 329.9000000000001 144.6C326.6 144.4 323.4000000000001 144 320.1 144C295.5 144 272.5 150 251.6 160H243.3C179.6 160 128 108.4 128 44.8V16C128 -10.5 149.5 -32 176 -32H431.4C427.7 -26 425.2 -19.2 425.2 -11.7V-2.5zM173.1 173.4C161.5 184.9 145.6 192 128 192H64C28.7 192 0 163.3 0 128V96C0 78.3 14.3 64 32 64H97.9C104.2 111.4 132.8 151.3 173.1 173.4z" />
+    <glyph glyph-name="users"
+      unicode="&#xF0C0;"
+      horiz-adv-x="640" d=" M96 224C131.3 224 160 252.7 160 288S131.3 352 96 352S32 323.3 32 288S60.7 224 96 224zM544 224C579.3 224 608 252.7 608 288S579.3 352 544 352S480 323.3 480 288S508.7 224 544 224zM576 192H512C494.4 192 478.5 184.9 466.9 173.4C507.2 151.3 535.8 111.4 542 64H608C625.7 64 640 78.3 640 96V128C640 163.3 611.3 192 576 192zM320 192C381.9 192 432 242.1 432 304S381.9 416 320 416S208 365.9 208 304S258.1 192 320 192zM396.8 160H388.5C367.7 150 344.6 144 320 144S272.4 150 251.5 160H243.2C179.6 160 128 108.4 128 44.8V16C128 -10.5 149.5 -32 176 -32H464C490.5 -32 512 -10.5 512 16V44.8C512 108.4 460.4 160 396.8 160zM173.1 173.4C161.5 184.9 145.6 192 128 192H64C28.7 192 0 163.3 0 128V96C0 78.3 14.3 64 32 64H97.9C104.2 111.4 132.8 151.3 173.1 173.4z" />
+    <glyph glyph-name="utensil-spoon"
+      unicode="&#xF2E5;"
+      horiz-adv-x="512" d=" M480.1 416.1C425.1 471.2 315.2000000000001 450.6 252.3 387.6C203 338.3 197.2 277.6 223.5 227.2L9 34.8C-2.6 24.3 -3.1 6.3 8 -4.7L59.3 -56C70.3 -67 88.4 -66.5 98.8 -54.9L291.2 159.5C341.6 133.2 402.3 139 451.6 188.3C514.6 251.2 535.2 361.1 480.1 416.1z" />
+    <glyph glyph-name="utensils"
+      unicode="&#xF2E7;"
+      horiz-adv-x="416" d=" M207.9 432.8C208.7 428.1 224 338.3 224 304C224 251.7 196.2 214.4 155.1 199.4L168 -38.7C168.7 -52.4 157.8 -64 144 -64H80C66.3 -64 55.3 -52.5 56 -38.7L68.9 199.4C27.7 214.4 0 251.8 0 304C0 338.4 15.3 428.1 16.1 432.8C19.3 453.1 61.4 453.4 64 431.7V290.5C65.3 287.1 79.1 287.3 80 290.5C81.4 315.8 87.9 429.7 88 432.3C91.3 453.1 132.7 453.1 135.9 432.3C136.1 429.6 142.5 315.8 143.9 290.5C144.8 287.3 158.7 287.1 159.9 290.5V431.7C162.5 453.3 204.7 453.1 207.9 432.8zM327.1 147.1L312.1 -38C310.9000000000001 -52 322 -64 336 -64H392C405.3 -64 416 -53.3 416 -40V424C416 437.2 405.3 448 392 448C309.5 448 170.6 269.5 327.1 147.1z" />
+    <glyph glyph-name="venus-double"
+      unicode="&#xF226;"
+      horiz-adv-x="512" d=" M288 272C288 351.5 223.5 416 144 416S0 351.5 0 272C0 203.5 47.9 146.1 112 131.6V80H76C69.4 80 64 74.6 64 68V28C64 21.4 69.4 16 76 16H112V-20C112 -26.6 117.4 -32 124 -32H164C170.6 -32 176 -26.6 176 -20V16H212C218.6 16 224 21.4 224 28V68C224 74.6 218.6 80 212 80H176V131.6C240.1 146.1 288 203.5 288 272zM64 272C64 316.1 99.9 352 144 352S224 316.1 224 272S188.1 192 144 192S64 227.9 64 272zM400 131.6V80H436C442.6 80 448 74.6 448 68V28C448 21.4 442.6 16 436 16H400V-20C400 -26.6 394.6 -32 388 -32H348C341.4 -32 336 -26.6 336 -20V16H300C293.4 16 288 21.4 288 28V68C288 74.6 293.4 80 300 80H336V131.6C314.8 136.4 295.4 145.9 278.8 158.9C292.8 175.6 303.8 194.9 310.9000000000001 216C325.4000000000001 201.2 345.6 192 368.0000000000001 192C412.1000000000001 192 448.0000000000001 227.9000000000001 448.0000000000001 272S412.1000000000001 352 368.0000000000001 352C345.7000000000001 352 325.4000000000001 342.8 310.9000000000001 328C303.8 349.1 292.9000000000001 368.4000000000001 278.8 385.1C303.4 404.4 334.3 416 368 416C447.5 416 512 351.5 512 272C512 203.5 464.1 146.1 400 131.6z" />
+    <glyph glyph-name="venus-mars"
+      unicode="&#xF228;"
+      horiz-adv-x="576" d=" M564 448H485C474.3 448 469 435.1 476.5 427.5L493.4 410.6L444.7 361.9C422.5 375.9 396.2 384 368 384C334.3 384 303.4 372.4 278.8 353.1C292.8 336.4 303.8 317.1 310.9000000000001 296C325.4000000000001 310.8 345.6 320 368.0000000000001 320C412.1000000000001 320 448.0000000000001 284.1 448.0000000000001 240S412.1000000000001 160 368.0000000000001 160C345.7000000000001 160 325.4000000000001 169.2 310.9000000000001 184C303.8 162.9 292.9000000000001 143.6 278.8 126.9C303.3 107.5 334.3 96 368 96C447.5 96 512 160.5 512 240C512 268.2 503.9 294.5 489.9 316.7L538.6 365.4L555.5 348.5C557.9 346.1 560.9 345 563.9 345C570.1 345 576 349.8 576 357V436C576 442.6 570.6 448 564 448zM144 384C64.5 384 0 319.5 0 240C0 171.5 47.9 114.1 112 99.6V48H76C69.4 48 64 42.6 64 36V-4C64 -10.6 69.4 -16 76 -16H112V-52C112 -58.6 117.4 -64 124 -64H164C170.6 -64 176 -58.6 176 -52V-16H212C218.6 -16 224 -10.6 224 -4V36C224 42.6 218.6 48 212 48H176V99.6C240.1 114.2000000000001 288 171.5 288 240.0000000000001C288 319.5 223.5 384 144 384zM144 160C99.9 160 64 195.9 64 240S99.9 320 144 320S224 284.1 224 240S188.1 160 144 160z" />
+    <glyph glyph-name="venus"
+      unicode="&#xF221;"
+      horiz-adv-x="288" d=" M288 272C288 351.5 223.5 416 144 416S0 351.5 0 272C0 203.5 47.9 146.1 112 131.6V80H76C69.4 80 64 74.6 64 68V28C64 21.4 69.4 16 76 16H112V-20C112 -26.6 117.4 -32 124 -32H164C170.6 -32 176 -26.6 176 -20V16H212C218.6 16 224 21.4 224 28V68C224 74.6 218.6 80 212 80H176V131.6C240.1 146.1 288 203.5 288 272zM64 272C64 316.1 99.9 352 144 352S224 316.1 224 272S188.1 192 144 192S64 227.9 64 272z" />
+    <glyph glyph-name="vial"
+      unicode="&#xF492;"
+      horiz-adv-x="480" d=" M477.7 261.9L309.5 429.7C306.4 432.8 301.3 432.8 298.2 429.7L264.2 395.8C261.1 392.7 261.1 387.6 264.2 384.5L275.4 373.4L33 131.5C-5.8 92.8 -12.1 29.5 23.6 -12C44.2 -36 73.1 -48 102 -47.9C128.4 -47.9 154.8 -37.9 174.9 -17.8L421.2000000000001 227.9000000000001L432.4000000000001 216.8000000000001C435.5000000000001 213.7000000000001 440.6 213.7000000000001 443.7000000000001 216.8000000000001L477.7 250.7000000000001C480.8000000000001 253.7000000000001 480.8000000000001 258.8000000000001 477.7 261.9000000000001zM318 192H161L309 339.7L387.5 261.4L318 192z" />
+    <glyph glyph-name="vials"
+      unicode="&#xF493;"
+      horiz-adv-x="640" d=" M72 384H96V144C96 99.9 131.9 64 176 64S256 99.9 256 144V384H280C284.4 384 288 387.6 288 392V440C288 444.4 284.4 448 280 448H72C67.6 448 64 444.4 64 440V392C64 387.6 67.6 384 72 384zM144 384H208V288H144V384zM624 0H16C7.2 0 0 -7.2 0 -16V-48C0 -56.8 7.2 -64 16 -64H624C632.8 -64 640 -56.8 640 -48V-16C640 -7.2 632.8 0 624 0zM360 384H384V144C384 99.9 419.9 64 464 64S544 99.9 544 144V384H568C572.4 384 576 387.6 576 392V440C576 444.4 572.4 448 568 448H360C355.6 448 352 444.4 352 440V392C352 387.6 355.6 384 360 384zM432 384H496V288H432V384z" />
+    <glyph glyph-name="video-slash"
+      unicode="&#xF4E2;"
+      horiz-adv-x="640" d=" M633.8 -10.1L578.8 32.4C594.1999999999999 33.8 608 46.1 608 63.5V320.5C608 346 578.9 360.9 557.6 346.3L448 270.7V133.5L416 158.2V336.2C416 362.6 394.6 384 368.2 384H123.9L45.5 444.6C38.5 450 28.5 448.8 23 441.8L3.4 416.6C-2 409.6 -0.8 399.6 6.2 394.2L42.7 366L416 77.4L594.5 -60.6C601.5 -66 611.5 -64.8000000000001 617 -57.8L636.6 -32.5C642.1 -25.6 640.8000000000001 -15.5 633.8000000000001 -10.1zM32 47.8C32 21.4 53.4 0 79.8 0H368.2C379.4 0 389.6 4 397.8 10.5L32 293.3V47.8z" />
+    <glyph glyph-name="video"
+      unicode="&#xF03D;"
+      horiz-adv-x="576" d=" M336.2 384H47.8C21.4 384 0 362.6 0 336.2V47.8C0 21.4 21.4 0 47.8 0H336.2C362.6 0 384 21.4 384 47.8V336.2C384 362.6 362.6 384 336.2 384zM525.6 346.3L416 270.7V113.3L525.6 37.8C546.8000000000001 23.1999999999999 576 38.1 576 63.6V320.5C576 345.9 546.9 360.9 525.6 346.3z" />
+    <glyph glyph-name="volleyball-ball"
+      unicode="&#xF45F;"
+      horiz-adv-x="495.9" d=" M223.3 204.6C222.4 241.6 214.7 277.4 200.6 310.3C109.8 267.9 43.1 187.9 20.3 93.5C33.7 62.7 53.2 35.2 77.2 12.4C99.9 91.6 151.4 160.2 223.3 204.6zM186.4 339C171.4 365.4 151.9 389.1 129 409.7C38 359.9 -15.8 256.8 4 147.5C37.4 230.6 102.4 299.5 186.4 339zM374 173.9C382.6 273.7 346.7 371.4 276.5 438.3C261.8 440 224.9 443.8 177.6 429.8C234.9 370.5 268.6 291.6 271.1 207.1C303.6 189.4 338.4000000000001 178.1 374 173.9zM249.3 164.4C217.7 145.1 190.6 120.5 169.1 91.8C251.1 34.4999999999999 353.6 16.6999999999999 446.6 43.9999999999999C466.3 70.3999999999999 480.8 100.8 488.8 133.9C462.2 127.3 435.1 123.5 407.9 123.5C353.3 123.6 299 137.6 249.3 164.4zM151 64.7C135.8 38.7 125.3 10.3 118.9 -19.5C156.5 -42.5 200.6 -56 248 -56C309 -56 364.7 -33.9 407.9 2.6C295 -13.5 204.6 27.4 151 64.7zM331.3 425.3C386.6 354.9 413.8 264.1 405.9 171.7C436.2 171.5 466.4 176.5 495.6 185.9C495.6 187.9 495.9 189.9 495.9 191.9C495.9 299.7 427.2 391 331.3 425.3z" />
+    <glyph glyph-name="volume-down"
+      unicode="&#xF027;"
+      horiz-adv-x="384" d=" M256 359.983V24.019C256 2.581 230.057 -7.979 215.029 7.048L126.059 96H24C10.745 96 0 106.745 0 120V264C0 277.255 10.745 288 24 288H126.059L215.03 376.954C230.04 391.964 256 381.444 256 359.983zM384 192C384 225.717 366.814 256.35 338.028 273.944C322.949 283.158 303.2530000000001 278.4070000000001 294.036 263.3280000000001S289.572 228.5530000000001 304.651 219.3360000000001C314.263 213.462 320 203.243 320 192A32.056 32.056 0 0 0 306.198 165.668C291.674 155.599 288.062 135.662 298.131 121.138C308.201 106.6130000000001 328.139 103.002 342.661 113.071C368.546 131.017 384 160.522 384 192z" />
+    <glyph glyph-name="volume-off"
+      unicode="&#xF026;"
+      horiz-adv-x="256" d=" M256 359.983V24.019C256 2.581 230.057 -7.979 215.029 7.048L126.059 96H24C10.745 96 0 106.745 0 120V264C0 277.255 10.745 288 24 288H126.059L215.03 376.954C230.04 391.964 256 381.444 256 359.983z" />
+    <glyph glyph-name="volume-up"
+      unicode="&#xF028;"
+      horiz-adv-x="576" d=" M256 359.983V24.019C256 2.581 230.057 -7.979 215.029 7.048L126.059 96H24C10.745 96 0 106.745 0 120V264C0 277.255 10.745 288 24 288H126.059L215.03 376.954C230.04 391.964 256 381.444 256 359.983zM438.0560000000001 437.8590000000001C422.9820000000001 447.08 403.283 442.332 394.061 427.255C384.84 412.178 389.588 392.481 404.665 383.26C468.967 343.937 512 273.017 512 192C512 118.569 475.923 49.708 415.493 7.794C400.971 -2.278 397.364 -22.216 407.436 -36.738C417.512 -51.266 437.452 -54.864 451.967 -44.795C529.633 9.073 576 97.594 576 192C576 295.2440000000001 521.421 386.877 438.0560000000001 437.8590000000001zM480 192C480 260.5470000000001 443.85 321.777 388.043 355.901C372.967 365.121 353.269 360.372 344.049 345.294C334.829 330.216 339.578 310.52 354.656 301.3C393.067 277.812 416 236.952 416 192C416 150.036 395.38 110.681 360.842 86.724C346.321 76.651 342.714 56.714 352.786 42.192C359.002 33.232 368.971 28.427 379.108 28.427A31.861999999999995 31.861999999999995 0 0 1 397.318 34.136C449.091 70.047 480 129.062 480 192zM384 192C384 225.717 366.814 256.35 338.028 273.944C322.949 283.158 303.2530000000001 278.4070000000001 294.036 263.3280000000001S289.572 228.5530000000001 304.651 219.3360000000001C314.263 213.462 320 203.243 320 192A32.056 32.056 0 0 0 306.198 165.668C291.674 155.599 288.062 135.662 298.131 121.138C308.201 106.6130000000001 328.139 103.002 342.661 113.071C368.546 131.017 384 160.522 384 192z" />
+    <glyph glyph-name="walking"
+      unicode="&#xF554;"
+      horiz-adv-x="320" d=" M208 352C234.5 352 256 373.5 256 400S234.5 448 208 448S160 426.5 160 400S181.5 352 208 352zM302.5 202.9L279.2 214.7L269.5 244.1C254.8 288.7000000000001 213.8 319.9000000000001 167.3 320C131.3 320.1 111.4 309.9000000000001 74 294.8000000000001C52.4 286.1 34.7 269.6 24.3 248.6L17.6 235C9.8 219.2 16.1 200 31.8 192.1C47.4 184.2 66.4 190.6 74.3 206.4L81 220C84.5 227 90.3 232.5 97.5 235.4L124.3 246.2L109.1 185.5C103.9 164.7 109.5 142.6 124 126.7L183.9 61.3C191.1 53.4 196.2 43.9 198.8 33.6L217.1 -39.7C221.4 -56.8000000000001 238.8 -67.3000000000001 255.9000000000001 -63.0000000000001C273.0000000000001 -58.7 283.5000000000001 -41.3000000000001 279.2000000000001 -24.2L257.0000000000001 64.8C254.4000000000001 75.1 249.3000000000001 84.6999999999999 242.1000000000001 92.4999999999999L196.6000000000001 142.1999999999999L213.8000000000001 210.8999999999999L219.3000000000001 194.3999999999999C224.6000000000001 178.2999999999999 236.0000000000001 165 251.0000000000001 157.3999999999999L274.3 145.5999999999999C289.9000000000001 137.6999999999999 308.9000000000001 144.0999999999999 316.8 159.8999999999999C324.5 175.5999999999999 318.2 194.9999999999999 302.5 202.8999999999999zM73.6 62.2C70.4 54.1 65.6 46.8 59.4 40.7L9.4 -9.4C-3.1 -21.9 -3.1 -42.2 9.4 -54.7S42.1 -67.2 54.6 -54.7L114 4.6999999999999C120.1 10.8 124.9 18.0999999999999 128.2 26.1999999999999L141.7 59.9999999999999C86.4 120.3 103 101.8 94.3 113.6999999999999L73.6 62.1999999999999z" />
+    <glyph glyph-name="wallet"
+      unicode="&#xF555;"
+      horiz-adv-x="512" d=" M461.2 320H80C71.16 320 64 327.16 64 336S71.16 352 80 352H464C472.84 352 480 359.16 480 368C480 394.51 458.51 416 432 416H64C28.65 416 0 387.35 0 352V32C0 -3.35 28.65 -32 64 -32H461.2C489.22 -32 512 -10.47 512 16V272C512 298.4700000000001 489.22 320 461.2 320zM416 112C398.33 112 384 126.33 384 144S398.33 176 416 176S448 161.67 448 144S433.67 112 416 112z" />
+    <glyph glyph-name="warehouse"
+      unicode="&#xF494;"
+      horiz-adv-x="640" d=" M504 96H136.4C132 96 128.4 92.4 128.4 88L128.3 40C128.3 35.6 131.9 32 136.3 32H504C508.4 32 512 35.6 512 40V88C512 92.4 508.4 96 504 96zM504 0H136.1C131.7 0 128.1 -3.6 128.1 -8L128 -56C128 -60.4 131.6 -64 136 -64H504C508.4 -64 512 -60.4 512 -56V-8C512 -3.6 508.4 0 504 0zM504 192H136.6C132.2 192 128.6 188.4 128.6 184L128.5 136C128.5 131.6 132.1 128 136.5 128H504C508.4 128 512 131.6 512 136V184C512 188.4 508.4 192 504 192zM610.5 331L338.4 444.3A48.15 48.15 0 0 1 301.5 444.3L29.5 331C11.7 323.5 0 306.1 0 286.7V-56C0 -60.4 3.6 -64 8 -64H88C92.4 -64 96 -60.4 96 -56V192C96 209.6 110.6 224 128.6 224H511.4C529.4 224 544 209.6 544 192V-56C544 -60.4 547.6 -64 552 -64H632C636.4 -64 640 -60.4 640 -56V286.7C640 306.1 628.3 323.5 610.5 331z" />
+    <glyph glyph-name="weight"
+      unicode="&#xF496;"
+      horiz-adv-x="512" d=" M448 384H422C438.4 355.7 448 323 448 288C448 182.1 361.9 96 256 96S64 182.1 64 288C64 323 73.6 355.7 90 384H64C28.7 384 0 355.3 0 320V0C0 -35.3 28.7 -64 64 -64H448C483.3 -64 512 -35.3 512 0V320C512 355.3 483.3 384 448 384zM256 128C344.4 128 416 199.6 416 288S344.4 448 256 448S96 376.4 96 288S167.6 128 256 128zM255.7 279.9L289.3 358.3C292.8 366.5 302.2 370.2000000000001 310.3 366.7000000000001S322.2 353.8 318.7 345.7000000000001L285 267.1C291.7 260 295.9 250.5 295.9 240C295.9 217.9 278 200 255.9 200S215.9 217.9 215.9 240C216 262 233.8 279.8 255.7 279.9z" />
+    <glyph glyph-name="wheelchair"
+      unicode="&#xF193;"
+      horiz-adv-x="512" d=" M496.101 62.331L510.328 33.668C514.257 25.753 511.025 16.152 503.11 12.223L437.645 -20.663C421.596 -28.63 402.089 -21.857 394.456 -5.608L331.679 128H192C176.075 128 162.574 139.71 160.321 155.475C126.433 392.692 128.38 377.956 128 384C128 420.358 158.318 449.635 195.052 447.929C228.3230000000001 446.384 255.1 419.024 255.9770000000001 385.728C256.8450000000001 352.795 232.8250000000001 325.305 201.369 320.689L206.039 287.999H336C344.837 287.999 352 280.836 352 271.999V239.999C352 231.162 344.837 223.999 336 223.999H215.182L219.754 191.999H352A32 32 0 0 0 380.962 173.607L438.477 51.2L474.655 69.549C482.57 73.478 492.172 70.246 496.101 62.331zM311.358 96H286.852C279.064 41.796 232.324 0 176 0C114.243 0 64 50.243 64 112C64 153.505 86.694 189.809 120.324 209.156C116.612 235.121 113.48 257.016 110.836 275.4890000000001C45.956 249.536 0 186.037 0 112C0 14.953 78.953 -64 176 -64C247.87 -64 309.8060000000001 -20.692 337.11 41.192L311.358 96z" />
+    <glyph glyph-name="wifi"
+      unicode="&#xF1EB;"
+      horiz-adv-x="640" d=" M384 32C384 -3.346 355.346 -32 320 -32S256 -3.346 256 32C256 67.346 284.654 96 320 96S384 67.346 384 32zM520.659 156.443C527.124 162.908 526.904 173.508 520.095 179.61C406.302 281.5950000000001 233.569 281.4790000000001 119.905 179.61C113.096 173.5080000000001 112.876 162.908 119.341 156.443L153.347 122.437C159.274 116.51 168.811 116.117 175.1160000000001 121.641C257.9960000000001 194.25 382.1900000000001 194.088 464.884 121.641C471.189 116.117 480.726 116.509 486.653 122.437L520.659 156.443zM632.769 270.161C639.154 276.546 639.023 286.977 632.419 293.134C456.651 456.994 183.285 456.934 7.582 293.134C0.978 286.977 0.847 276.545 7.232 270.161L41.198 236.195C47.293 230.1 57.089 229.964 63.422 235.812C208.185 369.48 431.778 369.514 576.578 235.812C582.911 229.964 592.707 230.1 598.802 236.195L632.769 270.161z" />
+    <glyph glyph-name="window-close"
+      unicode="&#xF410;"
+      horiz-adv-x="512" d=" M464 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H464C490.5 -32 512 -10.5 512 16V368C512 394.5 490.5 416 464 416zM380.4 125.5C385.2 120.7 385.2 112.9 380.4 108.1L339.9 67.6C335.1 62.8 327.3 62.8 322.5 67.6L256 134.7L189.5 67.6C184.7 62.8 176.9 62.8 172.1 67.6L131.6 108.1C126.8 112.9 126.8 120.7000000000001 131.6 125.5L198.7 192L131.6 258.5C126.8 263.3 126.8 271.1 131.6 275.9L172.1 316.4C176.9 321.2 184.7 321.2 189.5 316.4L256 249.3L322.5 316.4C327.3 321.2 335.1 321.2 339.9 316.4L380.4 275.9C385.2 271.1 385.2 263.3 380.4 258.5L313.3 192L380.4 125.5z" />
+    <glyph glyph-name="window-maximize"
+      unicode="&#xF2D0;"
+      horiz-adv-x="512" d=" M464 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H464C490.5 -32 512 -10.5 512 16V368C512 394.5 490.5 416 464 416zM448 256H64V340C64 346.6 69.4 352 76 352H436C442.6 352 448 346.6 448 340V256z" />
+    <glyph glyph-name="window-minimize"
+      unicode="&#xF2D1;"
+      horiz-adv-x="512" d=" M464 96H48C21.5 96 0 74.5 0 48V16C0 -10.5 21.5 -32 48 -32H464C490.5 -32 512 -10.5 512 16V48C512 74.5 490.5 96 464 96z" />
+    <glyph glyph-name="window-restore"
+      unicode="&#xF2D2;"
+      horiz-adv-x="512" d=" M512 400V112C512 85.5 490.5 64 464 64H416V272C416 316.1 380.1 352 336 352H128V400C128 426.5 149.5 448 176 448H464C490.5 448 512 426.5 512 400zM384 272V-16C384 -42.5 362.5 -64 336 -64H48C21.5 -64 0 -42.5 0 -16V272C0 298.5 21.5 320 48 320H336C362.5 320 384 298.5 384 272zM316 244C316 250.6 310.6 256 304 256H76C69.4 256 64 250.6 64 244V192H316V244z" />
+    <glyph glyph-name="wine-glass"
+      unicode="&#xF4E3;"
+      horiz-adv-x="288" d=" M287.4 255.3L271.4 433.4C270.7 441.7 263.9 448 255.7 448H32.3C24.1 448 17.3 441.7 16.6 433.4L0.6 255.3C-6.6 175.3 51.3 106.4 128 97.7000000000001V-32H74.1C49.6 -32 40.9 -64 54.1 -64H233.9C247 -64 238.4 -32 213.9 -32H160V97.7C236.7 106.5 294.6 175.3 287.4 255.3zM226.2 400L233.4 320H54.6L61.8 400H226.2z" />
+    <glyph glyph-name="won-sign"
+      unicode="&#xF159;"
+      horiz-adv-x="576" d=" M564 256C570.627 256 576 261.373 576 268V308C576 314.627 570.627 320 564 320H515.972L534.544 400.61C536.276 408.128 530.566 415.304 522.851 415.304H476.744A11.998 11.998 0 0 1 465.008 405.804L450.73 320H340.839L321.114 405.987A12 12 0 0 1 309.418 415.304H265.43A12 12 0 0 1 253.743 406.027L233.696 320H124.975L107.5 405.701A12 12 0 0 1 95.742 415.303H53.628C45.942 415.303 40.238 408.179 41.919 400.679L60 320H12C5.373 320 0 314.627 0 308V268C0 261.373 5.373 256 12 256H74.342L81.513 224H12C5.373 224 0 218.627 0 212V172C0 165.373 5.373 160 12 160H95.856L136.783 -22.624A12 12 0 0 1 148.492 -32H205.259C210.842 -32 215.687 -28.15 216.948 -22.712L259.335 160H314.421L356.807 -22.712A12 12 0 0 1 368.496 -32H425.322A12 12 0 0 1 437.016 -22.694L479.108 160H564C570.627 160 576 165.373 576 172V212C576 218.627 570.627 224 564 224H493.854L501.227 256H564zM138.024 256H218.781L211.324 224H144.548L138.024 256zM183.82 105.971C177.626 80.14 177.062 58.721 176.499 58.721H175.373S173.684 80.771 168.615 105.971L157.599 160H196.411L183.82 105.971zM274.182 224L276.178 232.602C278.034 240.564 279.635 248.57 280.981 256H292.775C294.122 248.57 295.722 240.564 297.578 232.602L299.574 224H274.182zM405.141 105.971C400.0730000000001 80.771 398.3830000000001 58.721 398.3830000000001 58.721H397.2570000000001C396.6940000000001 58.721 396.1310000000001 80.141 389.9360000000001 105.971L377.542 160H416.649L405.141 105.971zM430.281 224H362.861L355.521 256H437.098L430.281 224z" />
+    <glyph glyph-name="wrench"
+      unicode="&#xF0AD;"
+      horiz-adv-x="512" d=" M507.73 338.9C505.49 347.93 494.19 350.99 487.61 344.4100000000001L413.25 270.05L345.37 281.36L334.06 349.24L408.42 423.6C415.04 430.2200000000001 411.85 441.5 402.76 443.76C355.38 455.5 303.21 442.85 266.18 405.8300000000001C226.54 366.19 215.63 308.73 232.13 258.63L18.74 45.24C-6.25 20.25 -6.25 -20.27 18.74 -45.26C43.73 -70.25 84.25 -70.25 109.24 -45.26L322.45 167.9500000000001C372.57 151.2400000000001 429.92 162.2700000000001 469.82 202.1700000000001C506.89 239.2400000000001 519.52 291.49 507.73 338.9000000000001zM64 -24C50.75 -24 40 -13.25 40 0C40 13.26 50.75 24 64 24S88 13.26 88 0C88 -13.25 77.25 -24 64 -24z" />
+    <glyph glyph-name="x-ray"
+      unicode="&#xF497;"
+      horiz-adv-x="640" d=" M240 64C231.2 64 224 56.8 224 48S231.2 32 240 32S256 39.2 256 48S248.8 64 240 64zM400 32C408.8 32 416 39.2 416 48S408.8 64 400 64S384 56.8 384 48S391.2 32 400 32zM624 448H16C7.2 448 0 440.8 0 432V400C0 391.2 7.2 384 16 384H624C632.8 384 640 391.2 640 400V432C640 440.8 632.8 448 624 448zM624 0H576V352H64V0H16C7.2 0 0 -7.2 0 -16V-48C0 -56.8 7.2 -64 16 -64H624C632.8 -64 640 -56.8 640 -48V-16C640 -7.2 632.8 0 624 0zM480 200C480 195.6 476.4 192 472 192H336V160H440C444.4 160 448 156.4 448 152V136C448 131.6 444.4 128 440 128H336V96H400C426.5 96 448 74.5 448 48S426.5 0 400 0S352 21.5 352 48V64H288V48C288 21.5 266.5 0 240 0S192 21.5 192 48S213.5 96 240 96H304V128H200C195.6 128 192 131.6 192 136V152C192 156.4 195.6 160 200 160H304V192H168C163.6 192 160 195.6 160 200V216C160 220.4 163.6 224 168 224H304V256H200C195.6 256 192 259.6 192 264V280C192 284.4 195.6 288 200 288H304V312C304 316.4 307.6 320 312 320H328C332.4 320 336 316.4 336 312V288H440C444.4 288 448 284.4 448 280V264C448 259.6 444.4 256 440 256H336V224H472C476.4 224 480 220.4 480 216V200z" />
+    <glyph glyph-name="yen-sign"
+      unicode="&#xF157;"
+      horiz-adv-x="384" d=" M351.2080000000001 416H285.9310000000001A12 12 0 0 1 275.153 409.276L219.763 296.113C205.25 261.409 192.63 224.181 192.63 224.181H191.368S178.748 261.409 164.235 296.113L108.845 409.276A11.997 11.997 0 0 1 98.068 416H32.792C23.735 416 17.942 406.35 22.202 398.357L102.322 248H44C37.373 248 32 242.627 32 236V204C32 197.373 37.373 192 44 192H132.162L152 154.772V128H44C37.373 128 32 122.627 32 116V84C32 77.373 37.373 72 44 72H152V-20C152 -26.627 157.373 -32 164 -32H220C226.627 -32 232 -26.627 232 -20V72H340C346.627 72 352 77.373 352 84V116C352 122.627 346.627 128 340 128H232V154.772L251.838 192H340C346.627 192 352 197.373 352 204V236C352 242.627 346.627 248 340 248H281.678L361.798 398.357C366.058 406.35 360.266 416 351.2080000000001 416z" />
+  </font>
+</defs>
+</svg>
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-solid-900.ttf b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-solid-900.ttf
new file mode 100644
index 00000000000..4e518ad496c
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-solid-900.ttf differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-solid-900.woff b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-solid-900.woff
new file mode 100644
index 00000000000..277d8cebc7f
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-solid-900.woff differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-solid-900.woff2 b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-solid-900.woff2
new file mode 100644
index 00000000000..69bd4299c86
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/fonts/font-awesome/webfonts/fa-solid-900.woff2 differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/images/block.png b/src/KurrentDB.ClusterNode.Web/clusternode-web/images/block.png
new file mode 100644
index 00000000000..64dd9a72f55
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/images/block.png differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/images/check.png b/src/KurrentDB.ClusterNode.Web/clusternode-web/images/check.png
new file mode 100644
index 00000000000..4110c0618a9
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/images/check.png differ
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/images/clipboard--hover.svg b/src/KurrentDB.ClusterNode.Web/clusternode-web/images/clipboard--hover.svg
similarity index 100%
rename from src/EventStore.ClusterNode.Web/clusternode-web/images/clipboard--hover.svg
rename to src/KurrentDB.ClusterNode.Web/clusternode-web/images/clipboard--hover.svg
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/images/clipboard.svg b/src/KurrentDB.ClusterNode.Web/clusternode-web/images/clipboard.svg
similarity index 100%
rename from src/EventStore.ClusterNode.Web/clusternode-web/images/clipboard.svg
rename to src/KurrentDB.ClusterNode.Web/clusternode-web/images/clipboard.svg
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/images/error_outline.png b/src/KurrentDB.ClusterNode.Web/clusternode-web/images/error_outline.png
new file mode 100644
index 00000000000..557a6748b61
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/images/error_outline.png differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/images/info.png b/src/KurrentDB.ClusterNode.Web/clusternode-web/images/info.png
new file mode 100644
index 00000000000..774a4a89ed8
Binary files /dev/null and b/src/KurrentDB.ClusterNode.Web/clusternode-web/images/info.png differ
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/images/logo.svg b/src/KurrentDB.ClusterNode.Web/clusternode-web/images/logo.svg
new file mode 100644
index 00000000000..ebcabcc14d4
--- /dev/null
+++ b/src/KurrentDB.ClusterNode.Web/clusternode-web/images/logo.svg
@@ -0,0 +1 @@
+<svg width="855" height="189" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#a)" fill="#fff"><path d="M1.155 187.841V.001l15.653 25.436v136.967L1.155 187.841Zm24.706 0V.001l15.654 35.22v117.4l-15.654 35.22Zm24.706 0V.001L66.22 45.003v97.834L50.567 187.84Zm24.706 0V.001l15.654 54.786v78.267l-15.654 54.787Zm24.706 0V.001l15.653 64.57v58.7l-15.653 64.57Zm24.707 0V.001l15.653 74.353v39.134l-15.653 74.353Zm24.705 0V.001l15.653 84.136v19.567l-15.653 84.137Zm24.707 0V.001l15.653 93.92-15.653 93.92Z"/></g><path d="M399.178 164.347v-11.683c-3.666 4.908-7.887 8.574-12.665 10.995-4.713 2.357-10.112 3.535-16.199 3.535-13.549 0-23.955-4.156-31.22-12.469-7.265-8.312-10.898-20.257-10.898-35.834V56.353h25.428v48.499c0 14.595 1.669 24.577 5.007 29.944 3.338 5.366 9.097 8.05 17.279 8.05 8.377 0 14.366-3.011 17.966-9.032 3.665-6.022 5.498-16.232 5.498-30.631v-46.83h24.74v107.994h-24.936Zm97.39-86.101c-9.752.785-16.559 3.338-20.42 7.658-3.862 4.32-5.793 12.108-5.793 23.366v55.077h-25.133V56.353h23.563V68.82c3.796-4.843 7.952-8.378 12.468-10.603 4.516-2.29 9.621-3.436 15.315-3.436v23.464Zm64.208 0c-9.752.785-16.559 3.338-20.421 7.658-3.861 4.32-5.792 12.108-5.792 23.366v55.077H509.43V56.353h23.562V68.82c3.796-4.843 7.952-8.378 12.468-10.603 4.516-2.29 9.622-3.436 15.316-3.436v23.464Zm89.242 20.126c-2.16-7.2-5.792-12.665-10.897-16.395-5.04-3.797-11.422-5.695-19.145-5.695-6.676 0-12.665 2.03-17.966 6.087-5.302 4.058-8.869 9.393-10.701 16.003h58.709Zm-59.593 19.93c.851 7.789 3.927 13.941 9.229 18.457 5.367 4.451 12.272 6.676 20.715 6.676 5.629 0 10.668-1.178 15.119-3.534 4.516-2.357 8.083-5.662 10.701-9.916h27.097c-4.582 11.781-11.454 20.944-20.617 27.489-9.098 6.48-19.635 9.72-31.613 9.72-8.05 0-15.479-1.407-22.286-4.222-6.741-2.88-12.796-7.101-18.163-12.665-5.105-5.301-9.065-11.421-11.879-18.359-2.814-7.003-4.222-14.17-4.222-21.5 0-7.527 1.277-14.596 3.829-21.206 2.618-6.676 6.447-12.665 11.487-17.967 5.498-5.825 11.716-10.308 18.654-13.45 6.937-3.141 14.104-4.712 21.5-4.712 9.36 0 18.097 2.127 26.213 6.381 8.116 4.255 15.021 10.243 20.715 17.966 3.469 4.648 6.022 9.85 7.658 15.61 1.702 5.76 2.553 12.371 2.553 19.832 0 .589-.033 1.506-.098 2.749a51.866 51.866 0 0 0-.099 2.651h-86.493Zm127.04-61.949v12.272c3.665-4.91 7.854-8.542 12.567-10.898 4.778-2.356 10.21-3.534 16.297-3.534 7.789 0 14.563 1.472 20.323 4.418 5.825 2.945 10.668 7.363 14.53 13.254 2.487 3.927 4.254 8.41 5.301 13.45 1.113 4.974 1.669 12.272 1.669 21.893v57.139h-25.133v-47.812c0-14.465-1.669-24.38-5.007-29.748-3.338-5.367-9.098-8.05-17.279-8.05-8.378 0-14.399 2.978-18.064 8.934-3.666 5.89-5.498 16.035-5.498 30.435v46.241h-24.25V56.353h24.544Zm88.266 107.994V21.402h25.133v34.95H855v22.385h-31.969l7.833 11.068v74.542h-25.133ZM226.315 21.402h24.14v143.333h-24.14zm55.673 86.677 37.07-51.675h-27.007l-23.567 32.86-13.503 18.815 13.503 18.814 26.917 37.508h27.006l-40.419-56.322Z" fill="#fff"/><defs><clipPath id="a"><path fill="#fff" transform="rotate(-90 94.298 94.297)" d="M0 0h188.596v190.104H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/index.html b/src/KurrentDB.ClusterNode.Web/clusternode-web/index.html
new file mode 100644
index 00000000000..65514994d9c
--- /dev/null
+++ b/src/KurrentDB.ClusterNode.Web/clusternode-web/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=1024"><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><title ng-bind="'Kurrent - ' + $state.current.data.title">Kurrent</title><link rel=stylesheet href=css/main.min.css><link rel=apple-touch-icon href=apple-touch-icon.png><link rel=icon type=image/png href=favicon.png><meta name=msapplication-TileImage content=es-tile.png><meta name=msapplication-TileColor content=#6BA300></head><body><div ui-view></div><script data-main=js/app.min.js src=js/requirejs.min.js></script></body></html>
\ No newline at end of file
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/js/ace/ace.js b/src/KurrentDB.ClusterNode.Web/clusternode-web/js/ace/ace.js
similarity index 100%
rename from src/EventStore.ClusterNode.Web/clusternode-web/js/ace/ace.js
rename to src/KurrentDB.ClusterNode.Web/clusternode-web/js/ace/ace.js
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/js/ace/mode-javascript.js b/src/KurrentDB.ClusterNode.Web/clusternode-web/js/ace/mode-javascript.js
similarity index 100%
rename from src/EventStore.ClusterNode.Web/clusternode-web/js/ace/mode-javascript.js
rename to src/KurrentDB.ClusterNode.Web/clusternode-web/js/ace/mode-javascript.js
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/js/ace/mode-json.js b/src/KurrentDB.ClusterNode.Web/clusternode-web/js/ace/mode-json.js
similarity index 100%
rename from src/EventStore.ClusterNode.Web/clusternode-web/js/ace/mode-json.js
rename to src/KurrentDB.ClusterNode.Web/clusternode-web/js/ace/mode-json.js
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/js/ace/theme-monokai.js b/src/KurrentDB.ClusterNode.Web/clusternode-web/js/ace/theme-monokai.js
similarity index 100%
rename from src/EventStore.ClusterNode.Web/clusternode-web/js/ace/theme-monokai.js
rename to src/KurrentDB.ClusterNode.Web/clusternode-web/js/ace/theme-monokai.js
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/js/ace/worker-javascript.js b/src/KurrentDB.ClusterNode.Web/clusternode-web/js/ace/worker-javascript.js
similarity index 100%
rename from src/EventStore.ClusterNode.Web/clusternode-web/js/ace/worker-javascript.js
rename to src/KurrentDB.ClusterNode.Web/clusternode-web/js/ace/worker-javascript.js
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/js/ace/worker-json.js b/src/KurrentDB.ClusterNode.Web/clusternode-web/js/ace/worker-json.js
similarity index 100%
rename from src/EventStore.ClusterNode.Web/clusternode-web/js/ace/worker-json.js
rename to src/KurrentDB.ClusterNode.Web/clusternode-web/js/ace/worker-json.js
diff --git a/src/KurrentDB.ClusterNode.Web/clusternode-web/js/app.min.js b/src/KurrentDB.ClusterNode.Web/clusternode-web/js/app.min.js
new file mode 100644
index 00000000000..9f8af388496
--- /dev/null
+++ b/src/KurrentDB.ClusterNode.Web/clusternode-web/js/app.min.js
@@ -0,0 +1,32 @@
+/**
+ * @license AngularJS v1.3.20
+ * (c) 2010-2014 Google, Inc. http://angularjs.org
+ * License: MIT
+ */
+var CollapsibleTree;!function(e,t,n){"use strict";function i(e,t){return t=t||Error,function(){var n,i,r=arguments[0],s=arguments;for(n=(n="["+(e?e+":":"")+r+"] "+arguments[1].replace(/\{\d+\}/g,(function(e){var t=+e.slice(1,-1);return t+2<s.length?Le(s[t+2]):e})))+"\nhttp://errors.angularjs.org/1.3.20/"+(e?e+"/":"")+r,i=2;i<arguments.length;i++)n=n+(2==i?"?":"&")+"p"+(i-2)+"="+encodeURIComponent(Le(arguments[i]));return new t(n)}}var r=/^\/(.+)\/([a-z]*)$/,s="validity",o=function(e){return D(e)?e.toLowerCase():e},a=Object.prototype.hasOwnProperty,l=function(e){return D(e)?e.toUpperCase():e};"i"!=="I".toLowerCase()&&(o=function(e){return D(e)?e.replace(/[A-Z]/g,(function(e){return String.fromCharCode(32|e.charCodeAt(0))})):e},l=function(e){return D(e)?e.replace(/[a-z]/g,(function(e){return String.fromCharCode(-33&e.charCodeAt(0))})):e});var u,c,h,d,f=[].slice,p=[].splice,g=[].push,m=Object.prototype.toString,v=i("ng"),y=e.angular||(e.angular={}),$=0;function w(e){if(null==e||U(e))return!1;var t="length"in Object(e)&&e.length;return!(e.nodeType!==Me||!t)||(D(e)||F(e)||0===t||"number"==typeof t&&t>0&&t-1 in e)}function b(e,t,n){var i,r;if(e)if(j(e))for(i in e)"prototype"==i||"length"==i||"name"==i||e.hasOwnProperty&&!e.hasOwnProperty(i)||t.call(n,e[i],i,e);else if(F(e)||w(e)){var s="object"!=typeof e;for(i=0,r=e.length;i<r;i++)(s||i in e)&&t.call(n,e[i],i,e)}else if(e.forEach&&e.forEach!==b)e.forEach(t,n,e);else for(i in e)e.hasOwnProperty(i)&&t.call(n,e[i],i,e);return e}function S(e){return Object.keys(e).sort()}function x(e){return function(t,n){e(n,t)}}function C(){return++$}function k(e,t){t?e.$$hashKey=t:delete e.$$hashKey}function _(e){for(var t=e.$$hashKey,n=1,i=arguments.length;n<i;n++){var r=arguments[n];if(r)for(var s=Object.keys(r),o=0,a=s.length;o<a;o++){var l=s[o];e[l]=r[l]}}return k(e,t),e}function M(e){return parseInt(e,10)}function A(e,t){return _(Object.create(e),t)}function E(){}function R(e){return e}function T(e){return function(){return e}}function L(e){return void 0===e}function P(e){return void 0!==e}function I(e){return null!==e&&"object"==typeof e}function D(e){return"string"==typeof e}function O(e){return"number"==typeof e}function N(e){return"[object Date]"===m.call(e)}u=t.documentMode,E.$inject=[],R.$inject=[];var F=Array.isArray;function j(e){return"function"==typeof e}function B(e){return"[object RegExp]"===m.call(e)}function U(e){return e&&e.window===e}function H(e){return e&&e.$evalAsync&&e.$watch}function W(e){return"boolean"==typeof e}function z(e){return e&&j(e.then)}var V=function(e){return D(e)?e.trim():e},q=function(e){return e.replace(/([-()\[\]{}+?*.$\^|,:#<!\\])/g,"\\$1").replace(/\x08/g,"\\x08")};function Y(e){return!(!e||!(e.nodeName||e.prop&&e.attr&&e.find))}function G(e){return o(e.nodeName||e[0]&&e[0].nodeName)}function K(e,t){var n=e.indexOf(t);return n>=0&&e.splice(n,1),t}function Q(e,t,n,i){if(U(e)||H(e))throw v("cpws","Can't copy! Making copies of Window or Scope instances is not supported.");if(t){if(e===t)throw v("cpi","Can't copy! Source and destination are identical.");if(n=n||[],i=i||[],I(e)){var r=n.indexOf(e);if(-1!==r)return i[r];n.push(e),i.push(t)}var s;if(F(e)){t.length=0;for(var o=0;o<e.length;o++)s=Q(e[o],null,n,i),I(e[o])&&(n.push(e[o]),i.push(s)),t.push(s)}else{var a=t.$$hashKey;for(var l in F(t)?t.length=0:b(t,(function(e,n){delete t[n]})),e)e.hasOwnProperty(l)&&(s=Q(e[l],null,n,i),I(e[l])&&(n.push(e[l]),i.push(s)),t[l]=s);k(t,a)}}else if(t=e,e)if(F(e))t=Q(e,[],n,i);else if(N(e))t=new Date(e.getTime());else if(B(e))(t=new RegExp(e.source,e.toString().match(/[^\/]*$/)[0])).lastIndex=e.lastIndex;else if(I(e)){var u=Object.create(Object.getPrototypeOf(e));t=Q(e,u,n,i)}return t}function J(e,t){if(F(e)){t=t||[];for(var n=0,i=e.length;n<i;n++)t[n]=e[n]}else if(I(e))for(var r in t=t||{},e)"$"===r.charAt(0)&&"$"===r.charAt(1)||(t[r]=e[r]);return t||e}function X(e,t){if(e===t)return!0;if(null===e||null===t)return!1;if(e!=e&&t!=t)return!0;var i,r,s,o=typeof e;if(o==typeof t&&"object"==o){if(!F(e)){if(N(e))return!!N(t)&&X(e.getTime(),t.getTime());if(B(e))return!!B(t)&&e.toString()==t.toString();if(H(e)||H(t)||U(e)||U(t)||F(t)||N(t)||B(t))return!1;for(r in s={},e)if("$"!==r.charAt(0)&&!j(e[r])){if(!X(e[r],t[r]))return!1;s[r]=!0}for(r in t)if(!s.hasOwnProperty(r)&&"$"!==r.charAt(0)&&t[r]!==n&&!j(t[r]))return!1;return!0}if(!F(t))return!1;if((i=e.length)==t.length){for(r=0;r<i;r++)if(!X(e[r],t[r]))return!1;return!0}}return!1}var Z=function(){if(P(Z.isActive_))return Z.isActive_;var e=!(!t.querySelector("[ng-csp]")&&!t.querySelector("[data-ng-csp]"));if(!e)try{new Function("")}catch(t){e=!0}return Z.isActive_=e};function ee(e,t,n){return e.concat(f.call(t,n))}function te(e,t){return f.call(e,t||0)}function ne(e,t){var n=arguments.length>2?te(arguments,2):[];return!j(t)||t instanceof RegExp?t:n.length?function(){return arguments.length?t.apply(e,ee(n,arguments,0)):t.apply(e,n)}:function(){return arguments.length?t.apply(e,arguments):t.call(e)}}function ie(e,i){var r=i;return"string"==typeof e&&"$"===e.charAt(0)&&"$"===e.charAt(1)?r=n:U(i)?r="$WINDOW":i&&t===i?r="$DOCUMENT":H(i)&&(r="$SCOPE"),r}function re(e,t){return void 0===e?n:(O(t)||(t=t?2:null),JSON.stringify(e,ie,t))}function se(e){return D(e)?JSON.parse(e):e}function oe(e){e=c(e).clone();try{e.empty()}catch(e){}var t=c("<div>").append(e).html();try{return e[0].nodeType===Ae?o(t):t.match(/^(<[^>]+>)/)[1].replace(/^<([\w\-]+)/,(function(e,t){return"<"+o(t)}))}catch(e){return o(t)}}function ae(e){try{return decodeURIComponent(e)}catch(e){}}function le(e){var t,n,i={};return b((e||"").split("&"),(function(e){if(e&&(t=e.replace(/\+/g,"%20").split("="),P(n=ae(t[0])))){var r=!P(t[1])||ae(t[1]);a.call(i,n)?F(i[n])?i[n].push(r):i[n]=[i[n],r]:i[n]=r}})),i}function ue(e){var t=[];return b(e,(function(e,n){F(e)?b(e,(function(e){t.push(he(n,!0)+(!0===e?"":"="+he(e,!0)))})):t.push(he(n,!0)+(!0===e?"":"="+he(e,!0)))})),t.length?t.join("&"):""}function ce(e){return he(e,!0).replace(/%26/gi,"&").replace(/%3D/gi,"=").replace(/%2B/gi,"+")}function he(e,t){return encodeURIComponent(e).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%3B/gi,";").replace(/%20/g,t?"%20":"+")}var de=["ng-","data-ng-","ng:","x-ng-"];function fe(e,t){var n,i,r={};b(de,(function(t){var r=t+"app";!n&&e.hasAttribute&&e.hasAttribute(r)&&(n=e,i=e.getAttribute(r))})),b(de,(function(t){var r,s=t+"app";!n&&(r=e.querySelector("["+s.replace(":","\\:")+"]"))&&(n=r,i=r.getAttribute(s))})),n&&(r.strictDi=null!==function(e,t){var n,i,r=de.length;for(e=c(e),i=0;i<r;++i)if(n=de[i]+t,D(n=e.attr(n)))return n;return null}(n,"strict-di"),t(n,i?[i]:[],r))}function pe(n,i,r){I(r)||(r={});r=_({strictDi:!1},r);var s=function(){if((n=c(n)).injector()){var e=n[0]===t?"document":oe(n);throw v("btstrpd","App Already Bootstrapped with this Element '{0}'",e.replace(/</,"&lt;").replace(/>/,"&gt;"))}(i=i||[]).unshift(["$provide",function(e){e.value("$rootElement",n)}]),r.debugInfoEnabled&&i.push(["$compileProvider",function(e){e.debugInfoEnabled(!0)}]),i.unshift("ng");var s=kt(i,r.strictDi);return s.invoke(["$rootScope","$rootElement","$compile","$injector",function(e,t,n,i){e.$apply((function(){t.data("$injector",i),n(t)(e)}))}]),s},o=/^NG_ENABLE_DEBUG_INFO!/,a=/^NG_DEFER_BOOTSTRAP!/;if(e&&o.test(e.name)&&(r.debugInfoEnabled=!0,e.name=e.name.replace(o,"")),e&&!a.test(e.name))return s();e.name=e.name.replace(a,""),y.resumeBootstrap=function(e){return b(e,(function(e){i.push(e)})),s()},j(y.resumeDeferredBootstrap)&&y.resumeDeferredBootstrap()}function ge(){e.name="NG_ENABLE_DEBUG_INFO!"+e.name,e.location.reload()}function me(e){var t=y.element(e).injector();if(!t)throw v("test","no injector found for element argument to getTestability");return t.get("$$testability")}var ve=/[A-Z]/g;function ye(e,t){return t=t||"_",e.replace(ve,(function(e,n){return(n?t:"")+e.toLowerCase()}))}var $e,we=!1;function be(e,t,n){if(!e)throw v("areq","Argument '{0}' is {1}",t||"?",n||"required");return e}function Se(e,t,n){return n&&F(e)&&(e=e[e.length-1]),be(j(e),t,"not a function, got "+(e&&"object"==typeof e?e.constructor.name||"Object":typeof e)),e}function xe(e,t){if("hasOwnProperty"===e)throw v("badname","hasOwnProperty is not a valid {0} name",t)}function Ce(e,t,n){if(!t)return e;for(var i,r=t.split("."),s=e,o=r.length,a=0;a<o;a++)i=r[a],e&&(e=(s=e)[i]);return!n&&j(e)?ne(s,e):e}function ke(e){var t=e[0],n=e[e.length-1],i=[t];do{if(!(t=t.nextSibling))break;i.push(t)}while(t!==n);return c(i)}function _e(){return Object.create(null)}var Me=1,Ae=3,Ee=8,Re=9,Te=11;function Le(e){return"function"==typeof e?e.toString().replace(/ \{[\s\S]*$/,""):void 0===e?"undefined":"string"!=typeof e?function(e){var t=[];return JSON.stringify(e,(function(e,n){if(I(n=ie(e,n))){if(t.indexOf(n)>=0)return"<<already seen>>";t.push(n)}return n}))}(e):e}var Pe={full:"1.3.20",major:1,minor:3,dot:20,codeName:"shallow-translucence"};Je.expando="ng339";var Ie=Je.cache={},De=1,Oe=function(e,t,n){e.addEventListener(t,n,!1)},Ne=function(e,t,n){e.removeEventListener(t,n,!1)};Je._data=function(e){return this.cache[e[this.expando]]||{}};var Fe=/([\:\-\_]+(.))/g,je=/^moz([A-Z])/,Be={mouseleave:"mouseout",mouseenter:"mouseover"},Ue=i("jqLite");function He(e){return e.replace(Fe,(function(e,t,n,i){return i?n.toUpperCase():n})).replace(je,"Moz$1")}var We=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,ze=/<|&#?\w+;/,Ve=/<([\w:]+)/,qe=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,Ye={option:[1,'<select multiple="multiple">',"</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function Ge(e){return!ze.test(e)}function Ke(e){var t=e.nodeType;return t===Me||!t||t===Re}function Qe(e,t){var n,i,r,s,o=t.createDocumentFragment(),a=[];if(Ge(e))a.push(t.createTextNode(e));else{for(n=n||o.appendChild(t.createElement("div")),i=(Ve.exec(e)||["",""])[1].toLowerCase(),r=Ye[i]||Ye._default,n.innerHTML=r[1]+e.replace(qe,"<$1></$2>")+r[2],s=r[0];s--;)n=n.lastChild;a=ee(a,n.childNodes),(n=o.firstChild).textContent=""}return o.textContent="",o.innerHTML="",b(a,(function(e){o.appendChild(e)})),o}function Je(e){if(e instanceof Je)return e;var n,i,r,s;if(D(e)&&(e=V(e),n=!0),!(this instanceof Je)){if(n&&"<"!=e.charAt(0))throw Ue("nosel","Looking up elements via selectors is not supported by jqLite! See: http://docs.angularjs.org/api/angular.element");return new Je(e)}at(this,n?(i=e,r=r||t,(s=We.exec(i))?[r.createElement(s[1])]:(s=Qe(i,r))?s.childNodes:[]):e)}function Xe(e){return e.cloneNode(!0)}function Ze(e,t){if(t||tt(e),e.querySelectorAll)for(var n=e.querySelectorAll("*"),i=0,r=n.length;i<r;i++)tt(n[i])}function et(e,t,n,i){if(P(i))throw Ue("offargs","jqLite#off() does not support the `selector` argument");var r=nt(e),s=r&&r.events,o=r&&r.handle;if(o)if(t)b(t.split(" "),(function(t){if(P(n)){var i=s[t];if(K(i||[],n),i&&i.length>0)return}Ne(e,t,o),delete s[t]}));else for(t in s)"$destroy"!==t&&Ne(e,t,o),delete s[t]}function tt(e,t){var i=e.ng339,r=i&&Ie[i];if(r){if(t)return void delete r.data[t];r.handle&&(r.events.$destroy&&r.handle({},"$destroy"),et(e)),delete Ie[i],e.ng339=n}}function nt(e,t){var i=e.ng339,r=i&&Ie[i];return t&&!r&&(e.ng339=i=++De,r=Ie[i]={events:{},data:{},handle:n}),r}function it(e,t,n){if(Ke(e)){var i=P(n),r=!i&&t&&!I(t),s=!t,o=nt(e,!r),a=o&&o.data;if(i)a[t]=n;else{if(s)return a;if(r)return a&&a[t];_(a,t)}}}function rt(e,t){return!!e.getAttribute&&(" "+(e.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").indexOf(" "+t+" ")>-1}function st(e,t){t&&e.setAttribute&&b(t.split(" "),(function(t){e.setAttribute("class",V((" "+(e.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").replace(" "+V(t)+" "," ")))}))}function ot(e,t){if(t&&e.setAttribute){var n=(" "+(e.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ");b(t.split(" "),(function(e){e=V(e),-1===n.indexOf(" "+e+" ")&&(n+=e+" ")})),e.setAttribute("class",V(n))}}function at(e,t){if(t)if(t.nodeType)e[e.length++]=t;else{var n=t.length;if("number"==typeof n&&t.window!==t){if(n)for(var i=0;i<n;i++)e[e.length++]=t[i]}else e[e.length++]=t}}function lt(e,t){return ut(e,"$"+(t||"ngController")+"Controller")}function ut(e,t,i){e.nodeType==Re&&(e=e.documentElement);for(var r=F(t)?t:[t];e;){for(var s=0,o=r.length;s<o;s++)if((i=c.data(e,r[s]))!==n)return i;e=e.parentNode||e.nodeType===Te&&e.host}}function ct(e){for(Ze(e,!0);e.firstChild;)e.removeChild(e.firstChild)}function ht(e,t){t||Ze(e);var n=e.parentNode;n&&n.removeChild(e)}Ye.optgroup=Ye.option,Ye.tbody=Ye.tfoot=Ye.colgroup=Ye.caption=Ye.thead,Ye.th=Ye.td;var dt=Je.prototype={ready:function(n){var i=!1;function r(){i||(i=!0,n())}"complete"===t.readyState?setTimeout(r):(this.on("DOMContentLoaded",r),Je(e).on("load",r))},toString:function(){var e=[];return b(this,(function(t){e.push(""+t)})),"["+e.join(", ")+"]"},eq:function(e){return c(e>=0?this[e]:this[this.length+e])},length:0,push:g,sort:[].sort,splice:[].splice},ft={};b("multiple,selected,checked,disabled,readOnly,required,open".split(","),(function(e){ft[o(e)]=e}));var pt={};b("input,select,option,textarea,button,form,details".split(","),(function(e){pt[e]=!0}));var gt={ngMinlength:"minlength",ngMaxlength:"maxlength",ngMin:"min",ngMax:"max",ngPattern:"pattern"};function mt(e,t){var n=ft[t.toLowerCase()];return n&&pt[G(e)]&&n}function vt(){this.$get=function(){return _(Je,{hasClass:function(e,t){return e.attr&&(e=e[0]),rt(e,t)},addClass:function(e,t){return e.attr&&(e=e[0]),ot(e,t)},removeClass:function(e,t){return e.attr&&(e=e[0]),st(e,t)}})}}function yt(e,t){var n=e&&e.$$hashKey;if(n)return"function"==typeof n&&(n=e.$$hashKey()),n;var i=typeof e;return n="function"==i||"object"==i&&null!==e?e.$$hashKey=i+":"+(t||C)():i+":"+e}function $t(e,t){if(t){var n=0;this.nextUid=function(){return++n}}b(e,this.put,this)}b({data:it,removeData:tt},(function(e,t){Je[t]=e})),b({data:it,inheritedData:ut,scope:function(e){return c.data(e,"$scope")||ut(e.parentNode||e,["$isolateScope","$scope"])},isolateScope:function(e){return c.data(e,"$isolateScope")||c.data(e,"$isolateScopeNoTemplate")},controller:lt,injector:function(e){return ut(e,"$injector")},removeAttr:function(e,t){e.removeAttribute(t)},hasClass:rt,css:function(e,t,n){if(t=He(t),!P(n))return e.style[t];e.style[t]=n},attr:function(e,t,i){var r=e.nodeType;if(r!==Ae&&2!==r&&r!==Ee){var s=o(t);if(ft[s]){if(!P(i))return e[t]||(e.attributes.getNamedItem(t)||E).specified?s:n;i?(e[t]=!0,e.setAttribute(t,s)):(e[t]=!1,e.removeAttribute(s))}else if(P(i))e.setAttribute(t,i);else if(e.getAttribute){var a=e.getAttribute(t,2);return null===a?n:a}}},prop:function(e,t,n){if(!P(n))return e[t];e[t]=n},text:function(){return e.$dv="",e;function e(e,t){if(L(t)){var n=e.nodeType;return n===Me||n===Ae?e.textContent:""}e.textContent=t}}(),val:function(e,t){if(L(t)){if(e.multiple&&"select"===G(e)){var n=[];return b(e.options,(function(e){e.selected&&n.push(e.value||e.text)})),0===n.length?null:n}return e.value}e.value=t},html:function(e,t){if(L(t))return e.innerHTML;Ze(e,!0),e.innerHTML=t},empty:ct},(function(e,t){Je.prototype[t]=function(t,i){var r,s,o=this.length;if(e!==ct&&(2==e.length&&e!==rt&&e!==lt?t:i)===n){if(I(t)){for(r=0;r<o;r++)if(e===it)e(this[r],t);else for(s in t)e(this[r],s,t[s]);return this}for(var a=e.$dv,l=a===n?Math.min(o,1):o,u=0;u<l;u++){var c=e(this[u],t,i);a=a?a+c:c}return a}for(r=0;r<o;r++)e(this[r],t,i);return this}})),b({removeData:tt,on:function e(t,n,i,r){if(P(r))throw Ue("onargs","jqLite#on() does not support the `selector` or `eventData` parameters");if(Ke(t)){var s=nt(t,!0),o=s.events,a=s.handle;a||(a=s.handle=function(e,t){var n=function(n,i){n.isDefaultPrevented=function(){return n.defaultPrevented};var r=t[i||n.type],s=r?r.length:0;if(s){if(L(n.immediatePropagationStopped)){var o=n.stopImmediatePropagation;n.stopImmediatePropagation=function(){n.immediatePropagationStopped=!0,n.stopPropagation&&n.stopPropagation(),o&&o.call(n)}}n.isImmediatePropagationStopped=function(){return!0===n.immediatePropagationStopped},s>1&&(r=J(r));for(var a=0;a<s;a++)n.isImmediatePropagationStopped()||r[a].call(e,n)}};return n.elem=e,n}(t,o));for(var l=n.indexOf(" ")>=0?n.split(" "):[n],u=l.length;u--;){var c=o[n=l[u]];c||(o[n]=[],"mouseenter"===n||"mouseleave"===n?e(t,Be[n],(function(e){var t=e.relatedTarget;t&&(t===this||this.contains(t))||a(e,n)})):"$destroy"!==n&&Oe(t,n,a),c=o[n]),c.push(i)}}},off:et,one:function(e,t,n){(e=c(e)).on(t,(function i(){e.off(t,n),e.off(t,i)})),e.on(t,n)},replaceWith:function(e,t){var n,i=e.parentNode;Ze(e),b(new Je(t),(function(t){n?i.insertBefore(t,n.nextSibling):i.replaceChild(t,e),n=t}))},children:function(e){var t=[];return b(e.childNodes,(function(e){e.nodeType===Me&&t.push(e)})),t},contents:function(e){return e.contentDocument||e.childNodes||[]},append:function(e,t){var n=e.nodeType;if(n===Me||n===Te)for(var i=0,r=(t=new Je(t)).length;i<r;i++){var s=t[i];e.appendChild(s)}},prepend:function(e,t){if(e.nodeType===Me){var n=e.firstChild;b(new Je(t),(function(t){e.insertBefore(t,n)}))}},wrap:function(e,t){t=c(t).eq(0).clone()[0];var n=e.parentNode;n&&n.replaceChild(t,e),t.appendChild(e)},remove:ht,detach:function(e){ht(e,!0)},after:function(e,t){for(var n=e,i=e.parentNode,r=0,s=(t=new Je(t)).length;r<s;r++){var o=t[r];i.insertBefore(o,n.nextSibling),n=o}},addClass:ot,removeClass:st,toggleClass:function(e,t,n){t&&b(t.split(" "),(function(t){var i=n;L(i)&&(i=!rt(e,t)),(i?ot:st)(e,t)}))},parent:function(e){var t=e.parentNode;return t&&t.nodeType!==Te?t:null},next:function(e){return e.nextElementSibling},find:function(e,t){return e.getElementsByTagName?e.getElementsByTagName(t):[]},clone:Xe,triggerHandler:function(e,t,n){var i,r,s,o=t.type||t,a=nt(e),l=a&&a.events,u=l&&l[o];u&&(i={preventDefault:function(){this.defaultPrevented=!0},isDefaultPrevented:function(){return!0===this.defaultPrevented},stopImmediatePropagation:function(){this.immediatePropagationStopped=!0},isImmediatePropagationStopped:function(){return!0===this.immediatePropagationStopped},stopPropagation:E,type:o,target:e},t.type&&(i=_(i,t)),r=J(u),s=n?[i].concat(n):[i],b(r,(function(t){i.isImmediatePropagationStopped()||t.apply(e,s)})))}},(function(e,t){Je.prototype[t]=function(t,n,i){for(var r,s=0,o=this.length;s<o;s++)L(r)?P(r=e(this[s],t,n,i))&&(r=c(r)):at(r,e(this[s],t,n,i));return P(r)?r:this},Je.prototype.bind=Je.prototype.on,Je.prototype.unbind=Je.prototype.off})),$t.prototype={put:function(e,t){this[yt(e,this.nextUid)]=t},get:function(e){return this[yt(e,this.nextUid)]},remove:function(e){var t=this[e=yt(e,this.nextUid)];return delete this[e],t}};var wt=/^function\s*[^\(]*\(\s*([^\)]*)\)/m,bt=/,/,St=/^\s*(_?)(\S+?)\1\s*$/,xt=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/gm,Ct=i("$injector");function kt(e,t){t=!0===t;var i={},r="Provider",s=[],o=new $t([],!0),a={$provide:{provider:h(f),factory:h(g),service:h((function(e,t){return g(e,["$injector",function(e){return e.instantiate(t)}])})),value:h((function(e,t){return g(e,T(t),!1)})),constant:h((function(e,t){xe(e,"constant"),a[e]=t,u[e]=t})),decorator:function(e,t){var n=l.get(e+r),i=n.$get;n.$get=function(){var e=c.invoke(i,n);return c.invoke(t,null,{$delegate:e})}}}},l=a.$injector=m(a,(function(e,t){throw y.isString(t)&&s.push(t),Ct("unpr","Unknown provider: {0}",s.join(" <- "))})),u={},c=u.$injector=m(u,(function(e,t){var i=l.get(e+r,t);return c.invoke(i.$get,i,n,e)}));return b(function e(t){var n,i=[];return b(t,(function(t){if(!o.get(t)){o.put(t,!0);try{D(t)?(n=d(t),i=i.concat(e(n.requires)).concat(n._runBlocks),r(n._invokeQueue),r(n._configBlocks)):j(t)||F(t)?i.push(l.invoke(t)):Se(t,"module")}catch(e){throw F(t)&&(t=t[t.length-1]),e.message&&e.stack&&-1==e.stack.indexOf(e.message)&&(e=e.message+"\n"+e.stack),Ct("modulerr","Failed to instantiate module {0} due to:\n{1}",t,e.stack||e.message||e)}}function r(e){var t,n;for(t=0,n=e.length;t<n;t++){var i=e[t],r=l.get(i[0]);r[i[1]].apply(r,i[2])}}})),i}(e),(function(e){c.invoke(e||E)})),c;function h(e){return function(t,n){if(!I(t))return e(t,n);b(t,x(e))}}function f(e,t){if(xe(e,"service"),(j(t)||F(t))&&(t=l.instantiate(t)),!t.$get)throw Ct("pget","Provider '{0}' must define $get factory method.",e);return a[e+r]=t}function p(e,t){return function(){var n=c.invoke(t,this);if(L(n))throw Ct("undef","Provider '{0}' must return a value from $get factory method.",e);return n}}function g(e,t,n){return f(e,{$get:!1!==n?p(e,t):t})}function m(e,n){function o(t,r){if(e.hasOwnProperty(t)){if(e[t]===i)throw Ct("cdep","Circular dependency found: {0}",t+" <- "+s.join(" <- "));return e[t]}try{return s.unshift(t),e[t]=i,e[t]=n(t,r)}catch(n){throw e[t]===i&&delete e[t],n}finally{s.shift()}}function l(e,n,i,r){"string"==typeof i&&(r=i,i=null);var s,a,l,u=[],c=kt.$$annotate(e,t,r);for(a=0,s=c.length;a<s;a++){if("string"!=typeof(l=c[a]))throw Ct("itkn","Incorrect injection token! Expected service name as string, got {0}",l);u.push(i&&i.hasOwnProperty(l)?i[l]:o(l,r))}return F(e)&&(e=e[s]),e.apply(n,u)}return{invoke:l,instantiate:function(e,t,n){var i=Object.create((F(e)?e[e.length-1]:e).prototype||null),r=l(e,i,t,n);return I(r)||j(r)?r:i},get:o,annotate:kt.$$annotate,has:function(t){return a.hasOwnProperty(t+r)||e.hasOwnProperty(t)}}}}function _t(){var t=!0;this.disableAutoScrolling=function(){t=!1},this.$get=["$window","$location","$rootScope",function(n,i,r){var s=n.document;function o(e){if(e){e.scrollIntoView();var t=function(){var e=a.yOffset;if(j(e))e=e();else if(Y(e)){var t=e[0];e="fixed"!==n.getComputedStyle(t).position?0:t.getBoundingClientRect().bottom}else O(e)||(e=0);return e}();if(t){var i=e.getBoundingClientRect().top;n.scrollBy(0,i-t)}}else n.scrollTo(0,0)}function a(){var e,t,n,r=i.hash();r?(e=s.getElementById(r))?o(e):(t=s.getElementsByName(r),n=null,Array.prototype.some.call(t,(function(e){if("a"===G(e))return n=e,!0})),(e=n)?o(e):"top"===r&&o(null)):o(null)}return t&&r.$watch((function(){return i.hash()}),(function(t,n){var i,s;t===n&&""===t||(i=function(){r.$evalAsync(a)},"complete"===(s=s||e).document.readyState?s.setTimeout(i):c(s).on("load",i))})),a}]}kt.$$annotate=function(e,t,n){var i,r;if("function"==typeof e){if(!(i=e.$inject)){if(i=[],e.length){if(t)throw D(n)&&n||(n=e.name||function(e){var t=e.toString().replace(xt,"").match(wt);return t?"function("+(t[1]||"").replace(/[\s\r\n]+/," ")+")":"fn"}(e)),Ct("strictdi","{0} is not using explicit annotation and cannot be invoked in strict mode",n);b(e.toString().replace(xt,"").match(wt)[1].split(bt),(function(e){e.replace(St,(function(e,t,n){i.push(n)}))}))}e.$inject=i}}else F(e)?(Se(e[r=e.length-1],"fn"),i=e.slice(0,r)):Se(e,"fn",!0);return i};var Mt=i("$animate"),At=["$provide",function(e){this.$$selectors={},this.register=function(t,n){var i=t+"-animation";if(t&&"."!=t.charAt(0))throw Mt("notcsel","Expecting class selector starting with '.' got '{0}'.",t);this.$$selectors[t.substr(1)]=i,e.factory(i,n)},this.classNameFilter=function(e){return 1===arguments.length&&(this.$$classNameFilter=e instanceof RegExp?e:null),this.$$classNameFilter},this.$get=["$$q","$$asyncCallback","$rootScope",function(e,t,n){var i;function r(e,t,n){for(var i=0,r=t.length;i<r;++i){e[t[i]]=n}}function s(){return i||(i=e.defer(),t((function(){i.resolve(),i=null}))),i.promise}function o(e,t){if(y.isObject(t)){var n=_(t.from||{},t.to||{});e.css(n)}}return{animate:function(e,t,n){return o(e,{from:t,to:n}),s()},enter:function(e,t,n,i){return o(e,i),n?n.after(e):t.prepend(e),s()},leave:function(e,t){return o(e,t),e.remove(),s()},move:function(e,t,n,i){return this.enter(e,t,n,i)},addClass:function(e,t,n){return this.setClass(e,t,[],n)},$$addClassImmediately:function(e,t,n){return e=c(e),t=D(t)?t:F(t)?t.join(" "):"",b(e,(function(e){ot(e,t)})),o(e,n),s()},removeClass:function(e,t,n){return this.setClass(e,[],t,n)},$$removeClassImmediately:function(e,t,n){return e=c(e),t=D(t)?t:F(t)?t.join(" "):"",b(e,(function(e){st(e,t)})),o(e,n),s()},setClass:function(t,i,s,o){var a=this,l="$$animateClasses",u=!1,h=(t=c(t)).data(l);h?o&&h.options&&(h.options=y.extend(h.options||{},o)):(h={classes:{},options:o},u=!0);var d,f,p,g=h.classes;return i=F(i)?i:i.split(" "),s=F(s)?s:s.split(" "),r(g,i,!0),r(g,s,!1),u&&(h.promise=(d=function(e){var n=t.data(l);if(t.removeData(l),n){var i=function(e,t){var n=[],i=[],r=_e();return b((e.attr("class")||"").split(/\s+/),(function(e){r[e]=!0})),b(t,(function(e,t){var s=r[t];!1===e&&s?i.push(t):!0!==e||s||n.push(t)})),n.length+i.length>0&&[n.length?n:null,i.length?i:null]}(t,n.classes);i&&a.$$setClassImmediately(t,i[0],i[1],n.options)}e()},(p=e.defer()).promise.$$cancelFn=function(){f&&f()},n.$$postDigest((function(){f=d((function(){p.resolve()}))})),p.promise),t.data(l,h)),h.promise},$$setClassImmediately:function(e,t,n,i){return t&&this.$$addClassImmediately(e,t),n&&this.$$removeClassImmediately(e,n),o(e,i),s()},enabled:E,cancel:E}}]}];function Et(){this.$get=["$$rAF","$timeout",function(e,t){return e.supported?function(t){return e(t)}:function(e){return t(e,0,!1)}}]}function Rt(e,t,i,r){var s=this,o=t[0],a=e.location,l=e.history,u=e.setTimeout,h=e.clearTimeout,d={};s.isMock=!1;var f=0,p=[];function g(e){try{e.apply(null,te(arguments,1))}finally{if(0===--f)for(;p.length;)try{p.pop()()}catch(e){i.error(e)}}}s.$$completeOutstandingRequest=g,s.$$incOutstandingRequestCount=function(){f++},s.notifyWhenNoOutstandingRequests=function(e){b(v,(function(e){e()})),0===f?e():p.push(e)};var m,v=[];s.addPollFn=function(e){return L(m)&&function(e,t){!function n(){b(v,(function(e){e()})),m=t(n,e)}()}(100,u),v.push(e),e};var y,$,w=a.href,S=t.find("base"),x=null;A(),$=y,s.url=function(t,n,i){if(L(i)&&(i=null),a!==e.location&&(a=e.location),l!==e.history&&(l=e.history),t){var o=$===i;if(w===t&&(!r.history||o))return s;var u=w&&gn(w)===gn(t);return w=t,$=i,!r.history||u&&o?(u&&!x||(x=t),n?a.replace(t):u?a.hash=function(e){var t=e.indexOf("#");return-1===t?"":e.substr(t)}(t):a.href=t):(l[n?"replaceState":"pushState"](i,"",t),A(),$=y),s}return x||a.href.replace(/%27/g,"'")},s.state=function(){return y};var C=[],k=!1;function _(){A(),R()}var M=null;function A(){X(y=L(y=function(){try{return l.state}catch(e){}}())?null:y,M)&&(y=M),M=y}function R(){w===s.url()&&$===y||(w=s.url(),$=y,b(C,(function(e){e(s.url(),y)})))}s.onUrlChange=function(t){return k||(r.history&&c(e).on("popstate",_),c(e).on("hashchange",_),k=!0),C.push(t),t},s.$$checkUrlChange=R,s.baseHref=function(){var e=S.attr("href");return e?e.replace(/^(https?\:)?\/\/[^\/]*/,""):""};var T={},P="",I=s.baseHref();function O(e){try{return decodeURIComponent(e)}catch(t){return e}}s.cookies=function(e,t){var r,s,a,l,u;if(!e){if(o.cookie!==P)for(s=(P=o.cookie).split("; "),T={},l=0;l<s.length;l++)(u=(a=s[l]).indexOf("="))>0&&(e=O(a.substring(0,u)),T[e]===n&&(T[e]=O(a.substring(u+1))));return T}t===n?o.cookie=encodeURIComponent(e)+"=;path="+I+";expires=Thu, 01 Jan 1970 00:00:00 GMT":D(t)&&(r=(o.cookie=encodeURIComponent(e)+"="+encodeURIComponent(t)+";path="+I).length+1)>4096&&i.warn("Cookie '"+e+"' possibly not set or overflowed because it was too large ("+r+" > 4096 bytes)!")},s.defer=function(e,t){var n;return f++,n=u((function(){delete d[n],g(e)}),t||0),d[n]=!0,n},s.defer.cancel=function(e){return!!d[e]&&(delete d[e],h(e),g(E),!0)}}function Tt(){this.$get=["$window","$log","$sniffer","$document",function(e,t,n,i){return new Rt(e,i,t,n)}]}function Lt(){this.$get=function(){var e={};function t(t,n){if(t in e)throw i("$cacheFactory")("iid","CacheId '{0}' is already taken!",t);var r=0,s=_({},n,{id:t}),o={},a=n&&n.capacity||Number.MAX_VALUE,l={},u=null,c=null;return e[t]={put:function(e,t){a<Number.MAX_VALUE&&h(l[e]||(l[e]={key:e}));if(!L(t))return e in o||r++,o[e]=t,r>a&&this.remove(c.key),t},get:function(e){if(a<Number.MAX_VALUE){var t=l[e];if(!t)return;h(t)}return o[e]},remove:function(e){if(a<Number.MAX_VALUE){var t=l[e];if(!t)return;t==u&&(u=t.p),t==c&&(c=t.n),d(t.n,t.p),delete l[e]}delete o[e],r--},removeAll:function(){o={},r=0,l={},u=c=null},destroy:function(){o=null,s=null,l=null,delete e[t]},info:function(){return _({},s,{size:r})}};function h(e){e!=u&&(c?c==e&&(c=e.n):c=e,d(e.n,e.p),d(e,u),(u=e).n=null)}function d(e,t){e!=t&&(e&&(e.p=t),t&&(t.n=e))}}return t.info=function(){var t={};return b(e,(function(e,n){t[n]=e.info()})),t},t.get=function(t){return e[t]},t}}function Pt(){this.$get=["$cacheFactory",function(e){return e("templates")}]}var It=i("$compile");function Dt(e,i){var r={},s="Directive",a=/^\s*directive\:\s*([\w\-]+)\s+(.*)$/,l=/(([\w\-]+)(?:\:([^;]+))?;?)/,u=function(e){var t,n={},i=e.split(",");for(t=0;t<i.length;t++)n[i[t]]=!0;return n}("ngSrc,ngSrcset,src,srcset"),d=/^(?:(\^\^?)?(\?)?(\^\^?)?)?/,f=/^(on[a-z]+|formaction)$/;this.directive=function t(n,i){return xe(n,"directive"),D(n)?(be(i,"directiveFactory"),r.hasOwnProperty(n)||(r[n]=[],e.factory(n+s,["$injector","$exceptionHandler",function(e,t){var i=[];return b(r[n],(function(r,s){try{var o=e.invoke(r);j(o)?o={compile:T(o)}:!o.compile&&o.link&&(o.compile=T(o.link)),o.priority=o.priority||0,o.index=s,o.name=o.name||n,o.require=o.require||o.controller&&o.name,o.restrict=o.restrict||"EA",I(o.scope)&&(o.$$isolateBindings=(a=o.scope,l=o.name,u=/^\s*([@&]|=(\*?))(\??)\s*(\w*)\s*$/,c={},b(a,(function(e,t){var n=e.match(u);if(!n)throw It("iscp","Invalid isolate scope definition for directive '{0}'. Definition: {... {1}: '{2}' ...}",l,t,e);c[t]={mode:n[1][0],collection:"*"===n[2],optional:"?"===n[3],attrName:n[4]||t}})),c)),i.push(o)}catch(e){t(e)}var a,l,u,c})),i}])),r[n].push(i)):b(n,x(t)),this},this.aHrefSanitizationWhitelist=function(e){return P(e)?(i.aHrefSanitizationWhitelist(e),this):i.aHrefSanitizationWhitelist()},this.imgSrcSanitizationWhitelist=function(e){return P(e)?(i.imgSrcSanitizationWhitelist(e),this):i.imgSrcSanitizationWhitelist()};var p=!0;this.debugInfoEnabled=function(e){return P(e)?(p=e,this):p},this.$get=["$injector","$interpolate","$exceptionHandler","$templateRequest","$parse","$controller","$rootScope","$document","$sce","$animate","$$sanitizeUri",function(e,i,g,m,v,y,$,w,S,x,C){var k=function(e,t){if(t){var n,i,r,s=Object.keys(t);for(n=0,i=s.length;n<i;n++)this[r=s[n]]=t[r]}else this.$attr={};this.$$element=e};function M(e,t){try{e.addClass(t)}catch(e){}}k.prototype={$normalize:Nt,$addClass:function(e){e&&e.length>0&&x.addClass(this.$$element,e)},$removeClass:function(e){e&&e.length>0&&x.removeClass(this.$$element,e)},$updateClass:function(e,t){var n=Ft(e,t);n&&n.length&&x.addClass(this.$$element,n);var i=Ft(t,e);i&&i.length&&x.removeClass(this.$$element,i)},$set:function(e,t,i,r){var s,o=this.$$element[0],a=mt(o,e),l=function(e,t){var n=e.nodeName;return("INPUT"===n||"TEXTAREA"===n)&&gt[t]}(o,e),u=e;if(a?(this.$$element.prop(e,t),r=a):l&&(this[l]=t,u=l),this[e]=t,r?this.$attr[e]=r:(r=this.$attr[e])||(this.$attr[e]=r=ye(e,"-")),"a"===(s=G(this.$$element))&&"href"===e||"img"===s&&"src"===e)this[e]=t=C(t,"src"===e);else if("img"===s&&"srcset"===e){for(var c="",h=V(t),d=/\s/.test(h)?/(\s+\d+x\s*,|\s+\d+w\s*,|\s+,|,\s+)/:/(,)/,f=h.split(d),p=Math.floor(f.length/2),m=0;m<p;m++){var v=2*m;c+=C(V(f[v]),!0),c+=" "+V(f[v+1])}var y=V(f[2*m]).split(/\s/);c+=C(V(y[0]),!0),2===y.length&&(c+=" "+V(y[1])),this[e]=t=c}!1!==i&&(null===t||t===n?this.$$element.removeAttr(r):this.$$element.attr(r,t));var $=this.$$observers;$&&b($[u],(function(e){try{e(t)}catch(e){g(e)}}))},$observe:function(e,t){var n=this,i=n.$$observers||(n.$$observers=_e()),r=i[e]||(i[e]=[]);return r.push(t),$.$evalAsync((function(){!r.$$inter&&n.hasOwnProperty(e)&&t(n[e])})),function(){K(r,t)}}};var T=i.startSymbol(),L=i.endSymbol(),P="{{"==T||"}}"==L?R:function(e){return e.replace(/\{\{/g,T).replace(/}}/g,L)},O=/^ngAttr[A-Z]/;return N.$$addBindingInfo=p?function(e,t){var n=e.data("$binding")||[];F(t)?n=n.concat(t):n.push(t),e.data("$binding",n)}:E,N.$$addBindingClass=p?function(e){M(e,"ng-binding")}:E,N.$$addScopeInfo=p?function(e,t,n,i){var r=n?i?"$isolateScopeNoTemplate":"$isolateScope":"$scope";e.data(r,t)}:E,N.$$addScopeClass=p?function(e,t){M(e,t?"ng-isolate-scope":"ng-scope")}:E,N;function N(e,t,n,i,r){e instanceof c||(e=c(e)),b(e,(function(t,n){t.nodeType==Ae&&t.nodeValue.match(/\S+/)&&(e[n]=c(t).wrap("<span></span>").parent()[0])}));var s=B(e,t,e,n,i,r);N.$$addScopeClass(e);var o=null;return function(t,n,i){be(t,"scope");var r,a,l,u=(i=i||{}).parentBoundTranscludeFn,h=i.transcludeControllers,d=i.futureParentElement;if(u&&u.$$boundTransclude&&(u=u.$$boundTransclude),o||(a=(r=d)&&r[0],o=a&&"foreignobject"!==G(a)&&a.toString().match(/SVG/)?"svg":"html"),l="html"!==o?c(se(o,c("<div>").append(e).html())):n?dt.clone.call(e):e,h)for(var f in h)l.data("$"+f+"Controller",h[f].instance);return N.$$addScopeInfo(l,t),n&&n(l,t),s&&s(t,l,l,u),l}}function B(e,t,i,r,s,o){for(var a,l,u,h,d,f,p,g=[],m=0;m<e.length;m++)a=new k,(u=(l=W(e[m],[],a,0===m?r:n,s)).length?Y(l,e[m],a,t,i,null,[],[],o):null)&&u.scope&&N.$$addScopeClass(a.$$element),d=u&&u.terminal||!(h=e[m].childNodes)||!h.length?null:B(h,u?(u.transcludeOnThisElement||!u.templateOnThisElement)&&u.transclude:t),(u||d)&&(g.push(m,u,d),f=!0,p=p||u),o=null;return f?function(e,i,r,s){var o,a,l,u,h,d,f,m;if(p){var v=i.length;for(m=new Array(v),h=0;h<g.length;h+=3)m[f=g[h]]=i[f]}else m=i;for(h=0,d=g.length;h<d;)l=m[g[h++]],o=g[h++],a=g[h++],o?(o.scope?(u=e.$new(),N.$$addScopeInfo(c(l),u)):u=e,o(a,u,l,r,o.transcludeOnThisElement?U(e,o.transclude,s,o.elementTranscludeOnThisElement):!o.templateOnThisElement&&s?s:!s&&t?U(e,t):null)):a&&a(e,l.childNodes,n,s)}:null}function U(e,t,n,i){return function(i,r,s,o,a){return i||((i=e.$new(!1,a)).$$transcluded=!0),t(i,r,{parentBoundTranscludeFn:n,transcludeControllers:s,futureParentElement:o})}}function W(e,t,n,r,s){var o,u,c=e.nodeType,h=n.$attr;switch(c){case Me:J(t,Nt(G(e)),"E",r,s);for(var d,f,p,g,m,v,y=e.attributes,$=0,w=y&&y.length;$<w;$++){var b=!1,S=!1;f=(d=y[$]).name,m=V(d.value),g=Nt(f),(v=O.test(g))&&(f=f.replace(Ot,"").substr(8).replace(/_(.)/g,(function(e,t){return t.toUpperCase()})));var x=g.replace(/(Start|End)$/,"");Z(x)&&g===x+"Start"&&(b=f,S=f.substr(0,f.length-5)+"end",f=f.substr(0,f.length-6)),h[p=Nt(f.toLowerCase())]=f,!v&&n.hasOwnProperty(p)||(n[p]=m,mt(e,p)&&(n[p]=!0)),ae(e,t,m,p,v),J(t,p,"A",r,s,b,S)}if(I(u=e.className)&&(u=u.animVal),D(u)&&""!==u)for(;o=l.exec(u);)J(t,p=Nt(o[2]),"C",r,s)&&(n[p]=V(o[3])),u=u.substr(o.index+o[0].length);break;case Ae:!function(e,t){var n=i(t,!0);n&&e.push({priority:0,compile:function(e){var t=e.parent(),i=!!t.length;return i&&N.$$addBindingClass(t),function(e,t){var r=t.parent();i||N.$$addBindingClass(r),N.$$addBindingInfo(r,n.expressions),e.$watch(n,(function(e){t[0].nodeValue=e}))}}})}(t,e.nodeValue);break;case Ee:try{(o=a.exec(e.nodeValue))&&J(t,p=Nt(o[1]),"M",r,s)&&(n[p]=V(o[2]))}catch(e){}}return t.sort(ie),t}function z(e,t,n){var i=[],r=0;if(t&&e.hasAttribute&&e.hasAttribute(t))do{if(!e)throw It("uterdir","Unterminated attribute, found '{0}' but no matching '{1}' found.",t,n);e.nodeType==Me&&(e.hasAttribute(t)&&r++,e.hasAttribute(n)&&r--),i.push(e),e=e.nextSibling}while(r>0);else i.push(e);return c(i)}function q(e,t,n){return function(i,r,s,o,a){return r=z(r[0],t,n),e(i,r,s,o,a)}}function Y(e,r,s,o,a,l,u,h,f){f=f||{};for(var p,m,$,w,S,x,C,_=-Number.MAX_VALUE,M=f.controllerDirectives,A=f.newIsolateScopeDirective,E=f.templateDirective,R=f.nonTlbTranscludeDirective,T=!1,L=!1,O=f.hasElementTranscludeDirective,B=s.$$element=c(r),U=l,Y=o,G=0,K=e.length;G<K;G++){var J=($=e[G]).$$start,Z=$.$$end;if(J&&(B=z(r,J,Z)),S=n,_>$.priority)break;if((C=$.scope)&&($.templateUrl||(I(C)?(re("new/isolated scope",A||p,$,B),A=$):re("new/isolated scope",A,$,B)),p=p||$),w=$.name,!$.templateUrl&&$.controller&&(C=$.controller,re("'"+w+"' controller",(M=M||{})[w],$,B),M[w]=$),(C=$.transclude)&&(T=!0,$.$$tlb||(re("transclusion",R,$,B),R=$),"element"==C?(O=!0,_=$.priority,S=B,B=s.$$element=c(t.createComment(" "+w+": "+s[w]+" ")),r=B[0],le(a,te(S),r),Y=N(S,o,_,U&&U.name,{nonTlbTranscludeDirective:R})):(S=c(Xe(r)).contents(),B.empty(),Y=N(S,o))),$.template)if(L=!0,re("template",E,$,B),E=$,C=j($.template)?$.template(B,s):$.template,C=P(C),$.replace){if(U=$,S=Ge(C)?[]:jt(se($.templateNamespace,V(C))),r=S[0],1!=S.length||r.nodeType!==Me)throw It("tplrt","Template for directive '{0}' must have exactly one root element. {1}",w,"");le(a,B,r);var ie={$attr:{}},ae=W(r,[],ie),he=e.splice(G+1,e.length-(G+1));A&&Q(ae),e=e.concat(ae).concat(he),ee(s,ie),K=e.length}else B.html(C);if($.templateUrl)L=!0,re("template",E,$,B),E=$,$.replace&&(U=$),pe=ne(e.splice(G,e.length-G),B,s,a,T&&Y,u,h,{controllerDirectives:M,newIsolateScopeDirective:A,templateDirective:E,nonTlbTranscludeDirective:R}),K=e.length;else if($.compile)try{j(x=$.compile(B,s,Y))?de(null,x,J,Z):x&&de(x.pre,x.post,J,Z)}catch(e){g(e,oe(B))}$.terminal&&(pe.terminal=!0,_=Math.max(_,$.priority))}return pe.scope=p&&!0===p.scope,pe.transcludeOnThisElement=T,pe.elementTranscludeOnThisElement=O,pe.templateOnThisElement=L,pe.transclude=Y,f.hasElementTranscludeDirective=O,pe;function de(e,t,n,i){e&&(n&&(e=q(e,n,i)),e.require=$.require,e.directiveName=w,(A===$||$.$$isolateScope)&&(e=ue(e,{isolateScope:!0})),u.push(e)),t&&(n&&(t=q(t,n,i)),t.require=$.require,t.directiveName=w,(A===$||$.$$isolateScope)&&(t=ue(t,{isolateScope:!0})),h.push(t))}function fe(e,t,n,i){var r,s,o="data",a=!1,l=n;if(D(t)){if(s=t.match(d),t=t.substring(s[0].length),s[3]&&(s[1]?s[3]=null:s[1]=s[3]),"^"===s[1]?o="inheritedData":"^^"===s[1]&&(o="inheritedData",l=n.parent()),"?"===s[2]&&(a=!0),r=null,i&&"data"===o&&(r=i[t])&&(r=r.instance),!(r=r||l[o]("$"+t+"Controller"))&&!a)throw It("ctreq","Controller '{0}', required by directive '{1}', can't be found!",t,e);return r||null}return F(t)&&(r=[],b(t,(function(t){r.push(fe(e,t,n,i))}))),r}function pe(e,t,o,a,l){var d,f,p,g,$,w,S,x,C;if(r===o?(C=s,x=s.$$element):(x=c(o),C=new k(x,s)),A&&($=t.$new(!0)),l&&(S=function(e,t,i){var r;H(e)||(i=t,t=e,e=n);O&&(r=w);i||(i=O?x.parent():x);return l(e,t,r,i,T)},S.$$boundTransclude=l),M&&(m={},w={},b(M,(function(e){var n,i={$scope:e===A||e.$$isolateScope?$:t,$element:x,$attrs:C,$transclude:S};"@"==(g=e.controller)&&(g=C[e.name]),n=y(g,i,!0,e.controllerAs),w[e.name]=n,O||x.data("$"+e.name+"Controller",n.instance),m[e.name]=n}))),A){N.$$addScopeInfo(x,$,!0,!(E&&(E===A||E===A.$$originalDirective))),N.$$addScopeClass(x,!0);var _=m&&m[A.name],R=$;_&&_.identifier&&!0===A.bindToController&&(R=_.instance),b($.$$isolateBindings=A.$$isolateBindings,(function(e,n){var r,s,o,a,l=e.attrName,u=e.optional;switch(e.mode){case"@":C.$observe(l,(function(e){R[n]=e})),C.$$observers[l].$$scope=t,C[l]&&(R[n]=i(C[l])(t));break;case"=":if(u&&!C[l])return;s=v(C[l]),a=s.literal?X:function(e,t){return e===t||e!=e&&t!=t},o=s.assign||function(){throw r=R[n]=s(t),It("nonassign","Expression '{0}' used with directive '{1}' is non-assignable!",C[l],A.name)},r=R[n]=s(t);var c,h=function(e){return a(e,R[n])||(a(e,r)?o(t,e=R[n]):R[n]=e),r=e};h.$stateful=!0,c=e.collection?t.$watchCollection(C[l],h):t.$watch(v(C[l],h),null,s.literal),$.$on("$destroy",c);break;case"&":s=v(C[l]),R[n]=function(e){return s(t,e)}}}))}for(m&&(b(m,(function(e){e()})),m=null),d=0,f=u.length;d<f;d++)ce(p=u[d],p.isolateScope?$:t,x,C,p.require&&fe(p.directiveName,p.require,x,w),S);var T=t;for(A&&(A.template||null===A.templateUrl)&&(T=$),e&&e(T,o.childNodes,n,l),d=h.length-1;d>=0;d--)ce(p=h[d],p.isolateScope?$:t,x,C,p.require&&fe(p.directiveName,p.require,x,w),S)}}function Q(e){for(var t=0,n=e.length;t<n;t++)e[t]=A(e[t],{$$isolateScope:!0})}function J(t,i,o,a,l,u,c){if(i===l)return null;var h=null;if(r.hasOwnProperty(i))for(var d,f=e.get(i+s),p=0,m=f.length;p<m;p++)try{d=f[p],(a===n||a>d.priority)&&-1!=d.restrict.indexOf(o)&&(u&&(d=A(d,{$$start:u,$$end:c})),t.push(d),h=d)}catch(e){g(e)}return h}function Z(t){if(r.hasOwnProperty(t))for(var n=e.get(t+s),i=0,o=n.length;i<o;i++)if(n[i].multiElement)return!0;return!1}function ee(e,t){var n=t.$attr,i=e.$attr,r=e.$$element;b(e,(function(i,r){"$"!=r.charAt(0)&&(t[r]&&t[r]!==i&&(i+=("style"===r?";":" ")+t[r]),e.$set(r,i,!0,n[r]))})),b(t,(function(t,s){"class"==s?(M(r,t),e.class=(e.class?e.class+" ":"")+t):"style"==s?(r.attr("style",r.attr("style")+";"+t),e.style=(e.style?e.style+";":"")+t):"$"==s.charAt(0)||e.hasOwnProperty(s)||(e[s]=t,i[s]=n[s])}))}function ne(e,t,n,i,r,s,o,a){var l,u,h=[],d=t[0],f=e.shift(),p=A(f,{templateUrl:null,transclude:null,replace:null,$$originalDirective:f}),g=j(f.templateUrl)?f.templateUrl(t,n):f.templateUrl,v=f.templateNamespace;return t.empty(),m(g).then((function(m){var y,$,w,S;if(m=P(m),f.replace){if(w=Ge(m)?[]:jt(se(v,V(m))),y=w[0],1!=w.length||y.nodeType!==Me)throw It("tplrt","Template for directive '{0}' must have exactly one root element. {1}",f.name,g);$={$attr:{}},le(i,t,y);var x=W(y,[],$);I(f.scope)&&Q(x),e=x.concat(e),ee(n,$)}else y=d,t.html(m);for(e.unshift(p),l=Y(e,y,n,r,t,f,s,o,a),b(i,(function(e,n){e==y&&(i[n]=t[0])})),u=B(t[0].childNodes,r);h.length;){var C=h.shift(),k=h.shift(),_=h.shift(),A=h.shift(),E=t[0];if(!C.$$destroyed){if(k!==d){var R=k.className;a.hasElementTranscludeDirective&&f.replace||(E=Xe(y)),le(_,c(k),E),M(c(E),R)}S=l.transcludeOnThisElement?U(C,l.transclude,A):A,l(u,C,E,i,S)}}h=null})),function(e,t,n,i,r){var s=r;t.$$destroyed||(h?h.push(t,n,i,s):(l.transcludeOnThisElement&&(s=U(t,l.transclude,r)),l(u,t,n,i,s)))}}function ie(e,t){var n=t.priority-e.priority;return 0!==n?n:e.name!==t.name?e.name<t.name?-1:1:e.index-t.index}function re(e,t,n,i){if(t)throw It("multidir","Multiple directives [{0}, {1}] asking for {2} on: {3}",t.name,n.name,e,oe(i))}function se(e,n){switch(e=o(e||"html")){case"svg":case"math":var i=t.createElement("div");return i.innerHTML="<"+e+">"+n+"</"+e+">",i.childNodes[0].childNodes;default:return n}}function ae(e,t,n,r,s){var o=function(e,t){if("srcdoc"==t)return S.HTML;var n=G(e);return"xlinkHref"==t||"form"==n&&"action"==t||"img"!=n&&("src"==t||"ngSrc"==t)?S.RESOURCE_URL:void 0}(e,r);s=u[r]||s;var a=i(n,!0,o,s);if(a){if("multiple"===r&&"select"===G(e))throw It("selmulti","Binding to the 'multiple' attribute is not supported. Element: {0}",oe(e));t.push({priority:100,compile:function(){return{pre:function(e,t,l){var u=l.$$observers||(l.$$observers={});if(f.test(r))throw It("nodomevents","Interpolations for HTML DOM event attributes are disallowed.  Please use the ng- versions (such as ng-click instead of onclick) instead.");var c=l[r];c!==n&&(a=c&&i(c,!0,o,s),n=c),a&&(l[r]=a(e),(u[r]||(u[r]=[])).$$inter=!0,(l.$$observers&&l.$$observers[r].$$scope||e).$watch(a,(function(e,t){"class"===r&&e!=t?l.$updateClass(e,t):l.$set(r,e)})))}}}})}}function le(e,n,i){var r,s,o=n[0],a=n.length,l=o.parentNode;if(e)for(r=0,s=e.length;r<s;r++)if(e[r]==o){e[r++]=i;for(var u=r,d=u+a-1,f=e.length;u<f;u++,d++)d<f?e[u]=e[d]:delete e[u];e.length-=a-1,e.context===o&&(e.context=i);break}l&&l.replaceChild(i,o);var p=t.createDocumentFragment();p.appendChild(o),c(i).data(c(o).data()),h?($e=!0,h.cleanData([o])):delete c.cache[o[c.expando]];for(var g=1,m=n.length;g<m;g++){var v=n[g];c(v).remove(),p.appendChild(v),delete n[g]}n[0]=i,n.length=1}function ue(e,t){return _((function(){return e.apply(null,arguments)}),e,t)}function ce(e,t,n,i,r,s){try{e(t,n,i,r,s)}catch(e){g(e,oe(n))}}}]}Dt.$inject=["$provide","$$sanitizeUriProvider"];var Ot=/^((?:x|data)[\:\-_])/i;function Nt(e){return He(e.replace(Ot,""))}function Ft(e,t){var n="",i=e.split(/\s+/),r=t.split(/\s+/);e:for(var s=0;s<i.length;s++){for(var o=i[s],a=0;a<r.length;a++)if(o==r[a])continue e;n+=(n.length>0?" ":"")+o}return n}function jt(e){var t=(e=c(e)).length;if(t<=1)return e;for(;t--;){e[t].nodeType===Ee&&p.call(e,t,1)}return e}var Bt=i("$controller");function Ut(){var e={},t=!1,r=/^(\S+)(\s+as\s+(\w+))?$/;this.register=function(t,n){xe(t,"controller"),I(t)?_(e,t):e[t]=n},this.allowGlobals=function(){t=!0},this.$get=["$injector","$window",function(s,o){return function(i,l,u,c){var h,d,f,p;if(u=!0===u,c&&D(c)&&(p=c),D(i)){if(!(d=i.match(r)))throw Bt("ctrlfmt","Badly formed controller string '{0}'. Must match `__name__ as __id__` or `__name__`.",i);f=d[1],p=p||d[3],Se(i=e.hasOwnProperty(f)?e[f]:Ce(l.$scope,f,!0)||(t?Ce(o,f,!0):n),f,!0)}if(u){var g=(F(i)?i[i.length-1]:i).prototype;return h=Object.create(g||null),p&&a(l,p,h,f||i.name),_((function(){return s.invoke(i,h,l,f),h}),{instance:h,identifier:p})}return h=s.instantiate(i,l,f),p&&a(l,p,h,f||i.name),h};function a(e,t,n,r){if(!e||!I(e.$scope))throw i("$controller")("noscp","Cannot export controller '{0}' as '{1}'! No $scope object provided via `locals`.",r,t);e.$scope[t]=n}}]}function Ht(){this.$get=["$window",function(e){return c(e.document)}]}function Wt(){this.$get=["$log",function(e){return function(t,n){e.error.apply(e,arguments)}}]}var zt="application/json",Vt={"Content-Type":zt+";charset=utf-8"},qt=/^\[|^\{(?!\{)/,Yt={"[":/]$/,"{":/}$/},Gt=/^\)\]\}',?\n/;function Kt(e,t){if(D(e)){var n=e.replace(Gt,"").trim();if(n){var i=t("Content-Type");(i&&0===i.indexOf(zt)||(s=(r=n).match(qt))&&Yt[s[0]].test(r))&&(e=se(n))}}var r,s;return e}function Qt(e){var t,n,i,r=_e();return e?(b(e.split("\n"),(function(e){i=e.indexOf(":"),t=o(V(e.substr(0,i))),n=V(e.substr(i+1)),t&&(r[t]=r[t]?r[t]+", "+n:n)})),r):r}function Jt(e){var t=I(e)?e:n;return function(n){if(t||(t=Qt(e)),n){var i=t[o(n)];return void 0===i&&(i=null),i}return t}}function Xt(e,t,n,i){return j(i)?i(e,t,n):(b(i,(function(i){e=i(e,t,n)})),e)}function Zt(e){return 200<=e&&e<300}function en(){var e=this.defaults={transformResponse:[Kt],transformRequest:[function(e){return!I(e)||(t=e,"[object File]"===m.call(t))||function(e){return"[object Blob]"===m.call(e)}(e)||function(e){return"[object FormData]"===m.call(e)}(e)?e:re(e);var t}],headers:{common:{Accept:"application/json, text/plain, */*"},post:J(Vt),put:J(Vt),patch:J(Vt)},xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN"},t=!1;this.useApplyAsync=function(e){return P(e)?(t=!!e,this):t};var r=this.interceptors=[];this.$get=["$httpBackend","$browser","$cacheFactory","$rootScope","$q","$injector",function(s,a,u,c,h,d){var f=u("$http"),p=[];function g(r){if(!y.isObject(r))throw i("$http")("badreq","Http request configuration must be an object.  Received: {0}",r);var u=_({method:"get",transformRequest:e.transformRequest,transformResponse:e.transformResponse},r);u.headers=function(t){var n,i,r,s=e.headers,a=_({},t.headers);s=_({},s.common,s[o(t.method)]);e:for(n in s){for(r in i=o(n),a)if(o(r)===i)continue e;a[n]=s[n]}return l=a,c={},b(l,(function(e,t){j(e)?null!=(u=e())&&(c[t]=u):c[t]=e})),c;var l,u,c}(r),u.method=l(u.method);var d=[function(i){var r=i.headers,l=Xt(i.data,Jt(r),n,i.transformRequest);return L(l)&&b(r,(function(e,t){"content-type"===o(t)&&delete r[t]})),L(i.withCredentials)&&!L(e.withCredentials)&&(i.withCredentials=e.withCredentials),function(i,r){var o,l,u=h.defer(),d=u.promise,p=i.headers,m=function(e,t){if(!t)return e;var n=[];(function(e,t,n){for(var i=S(e),r=0;r<i.length;r++)t.call(n,e[i[r]],i[r])})(t,(function(e,t){null===e||L(e)||(F(e)||(e=[e]),b(e,(function(e){I(e)&&(e=N(e)?e.toISOString():re(e)),n.push(he(t)+"="+he(e))})))})),n.length>0&&(e+=(-1==e.indexOf("?")?"?":"&")+n.join("&"));return e}(i.url,i.params);g.pendingRequests.push(i),d.then(x,x),!i.cache&&!e.cache||!1===i.cache||"GET"!==i.method&&"JSONP"!==i.method||(o=I(i.cache)?i.cache:I(e.cache)?e.cache:f);o&&(P(l=o.get(m))?z(l)?l.then(w,w):F(l)?$(l[1],l[0],J(l[2]),l[3]):$(l,200,{},"OK"):o.put(m,d));if(L(l)){var v=ci(i.url)?a.cookies()[i.xsrfCookieName||e.xsrfCookieName]:n;v&&(p[i.xsrfHeaderName||e.xsrfHeaderName]=v),s(i.method,m,r,y,p,i.timeout,i.withCredentials,i.responseType)}return d;function y(e,n,i,r){function s(){$(n,e,i,r)}o&&(Zt(e)?o.put(m,[e,n,Qt(i),r]):o.remove(m)),t?c.$applyAsync(s):(s(),c.$$phase||c.$apply())}function $(e,t,n,r){(Zt(t=t>=-1?t:0)?u.resolve:u.reject)({data:e,status:t,headers:Jt(n),config:i,statusText:r})}function w(e){$(e.data,e.status,J(e.headers()),e.statusText)}function x(){var e=g.pendingRequests.indexOf(i);-1!==e&&g.pendingRequests.splice(e,1)}}(i,l).then(w,w)},n],m=h.when(u);for(b(p,(function(e){(e.request||e.requestError)&&d.unshift(e.request,e.requestError),(e.response||e.responseError)&&d.push(e.response,e.responseError)}));d.length;){var v=d.shift(),$=d.shift();m=m.then(v,$)}return m.success=function(e){return Se(e,"fn"),m.then((function(t){e(t.data,t.status,t.headers,u)})),m},m.error=function(e){return Se(e,"fn"),m.then(null,(function(t){e(t.data,t.status,t.headers,u)})),m},m;function w(e){var t=_({},e);return e.data?t.data=Xt(e.data,e.headers,e.status,u.transformResponse):t.data=e.data,Zt(e.status)?t:h.reject(t)}}return b(r,(function(e){p.unshift(D(e)?d.get(e):d.invoke(e))})),g.pendingRequests=[],function(e){b(arguments,(function(e){g[e]=function(t,n){return g(_(n||{},{method:e,url:t}))}}))}("get","delete","head","jsonp"),function(e){b(arguments,(function(e){g[e]=function(t,n,i){return g(_(i||{},{method:e,url:t,data:n}))}}))}("post","put","patch"),g.defaults=e,g}]}function tn(){return new e.XMLHttpRequest}function nn(){this.$get=["$browser","$window","$document",function(e,t,i){return function(e,t,i,r,s){return function(s,l,u,c,h,d,f,p){if(e.$$incOutstandingRequestCount(),l=l||e.url(),"jsonp"==o(s)){var g="_"+(r.counter++).toString(36);r[g]=function(e){r[g].data=e,r[g].called=!0};var m=a(l.replace("JSON_CALLBACK","angular.callbacks."+g),g,(function(e,t){S(c,e,r[g].data,"",t),r[g]=E}))}else{var v=t();v.open(s,l,!0),b(h,(function(e,t){P(e)&&v.setRequestHeader(t,e)})),v.onload=function(){var e=v.statusText||"",t="response"in v?v.response:v.responseText,n=1223===v.status?204:v.status;0===n&&(n=t?200:"file"==ui(l).protocol?404:0),S(c,n,t,v.getAllResponseHeaders(),e)};var y=function(){S(c,-1,null,null,"")};if(v.onerror=y,v.onabort=y,f&&(v.withCredentials=!0),p)try{v.responseType=p}catch(e){if("json"!==p)throw e}v.send(u||null)}if(d>0)var $=i(w,d);else z(d)&&d.then(w);function w(){m&&m(),v&&v.abort()}function S(t,r,s,o,a){$!==n&&i.cancel($),m=v=null,t(r,s,o,a),e.$$completeOutstandingRequest(E)}};function a(e,t,n){var i=s.createElement("script"),o=null;return i.type="text/javascript",i.src=e,i.async=!0,o=function(e){Ne(i,"load",o),Ne(i,"error",o),s.body.removeChild(i),i=null;var a=-1,l="unknown";e&&("load"!==e.type||r[t].called||(e={type:"error"}),l=e.type,a="error"===e.type?404:200),n&&n(a,l)},Oe(i,"load",o),Oe(i,"error",o),s.body.appendChild(i),o}}(e,tn,e.defer,t.angular.callbacks,i[0])}]}var rn=i("$interpolate");function sn(){var e="{{",t="}}";this.startSymbol=function(t){return t?(e=t,this):e},this.endSymbol=function(e){return e?(t=e,this):t},this.$get=["$parse","$exceptionHandler","$sce",function(n,i,r){var s=e.length,o=t.length,a=new RegExp(e.replace(/./g,u),"g"),l=new RegExp(t.replace(/./g,u),"g");function u(e){return"\\\\\\"+e}function c(u,c,h,d){d=!!d;for(var f,p,g,m=0,v=[],y=[],$=u.length,w=[],b=[];m<$;){if(-1==(f=u.indexOf(e,m))||-1==(p=u.indexOf(t,f+s))){m!==$&&w.push(k(u.substring(m)));break}m!==f&&w.push(k(u.substring(m,f))),g=u.substring(f+s,p),v.push(g),y.push(n(g,M)),m=p+o,b.push(w.length),w.push("")}if(h&&w.length>1)throw rn("noconcat","Error while interpolating: {0}\nStrict Contextual Escaping disallows interpolations that concatenate multiple expressions when a trusted value is required.  See http://docs.angularjs.org/api/ng.$sce",u);if(!c||v.length){var S=function(e){for(var t=0,n=v.length;t<n;t++){if(d&&L(e[t]))return;w[b[t]]=e[t]}return w.join("")},x=function(e){return h?r.getTrusted(h,e):r.valueOf(e)},C=function(e){if(null==e)return"";switch(typeof e){case"string":break;case"number":e=""+e;break;default:e=re(e)}return e};return _((function(e){var t=0,n=v.length,r=new Array(n);try{for(;t<n;t++)r[t]=y[t](e);return S(r)}catch(e){var s=rn("interr","Can't interpolate: {0}\n{1}",u,e.toString());i(s)}}),{exp:u,expressions:v,$$watchDelegate:function(e,t,n){var i;return e.$watchGroup(y,(function(n,r){var s=S(n);j(t)&&t.call(this,s,n!==r?i:s,e),i=s}),n)}})}function k(n){return n.replace(a,e).replace(l,t)}function M(e){try{return e=x(e),d&&!P(e)?e:C(e)}catch(e){var t=rn("interr","Can't interpolate: {0}\n{1}",u,e.toString());i(t)}}}return c.startSymbol=function(){return e},c.endSymbol=function(){return t},c}]}function on(){this.$get=["$rootScope","$window","$q","$$q",function(e,t,n,i){var r={};function s(s,o,a,l){var u=t.setInterval,c=t.clearInterval,h=0,d=P(l)&&!l,f=(d?i:n).defer(),p=f.promise;return a=P(a)?a:0,p.then(null,null,s),p.$$intervalId=u((function(){f.notify(h++),a>0&&h>=a&&(f.resolve(h),c(p.$$intervalId),delete r[p.$$intervalId]),d||e.$apply()}),o),r[p.$$intervalId]=f,p}return s.cancel=function(e){return!(!e||!(e.$$intervalId in r))&&(r[e.$$intervalId].reject("canceled"),t.clearInterval(e.$$intervalId),delete r[e.$$intervalId],!0)},s}]}function an(){this.$get=function(){return{id:"en-us",NUMBER_FORMATS:{DECIMAL_SEP:".",GROUP_SEP:",",PATTERNS:[{minInt:1,minFrac:0,maxFrac:3,posPre:"",posSuf:"",negPre:"-",negSuf:"",gSize:3,lgSize:3},{minInt:1,minFrac:2,maxFrac:2,posPre:"¤",posSuf:"",negPre:"(¤",negSuf:")",gSize:3,lgSize:3}],CURRENCY_SYM:"$"},DATETIME_FORMATS:{MONTH:"January,February,March,April,May,June,July,August,September,October,November,December".split(","),SHORTMONTH:"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec".split(","),DAY:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday".split(","),SHORTDAY:"Sun,Mon,Tue,Wed,Thu,Fri,Sat".split(","),AMPMS:["AM","PM"],medium:"MMM d, y h:mm:ss a",short:"M/d/yy h:mm a",fullDate:"EEEE, MMMM d, y",longDate:"MMMM d, y",mediumDate:"MMM d, y",shortDate:"M/d/yy",mediumTime:"h:mm:ss a",shortTime:"h:mm a",ERANAMES:["Before Christ","Anno Domini"],ERAS:["BC","AD"]},pluralCat:function(e){return 1===e?"one":"other"}}}}var ln=/^([^\?#]*)(\?([^#]*))?(#(.*))?$/,un={http:80,https:443,ftp:21},cn=i("$location");function hn(e){for(var t=e.split("/"),n=t.length;n--;)t[n]=ce(t[n]);return t.join("/")}function dn(e,t){var n=ui(e);t.$$protocol=n.protocol,t.$$host=n.hostname,t.$$port=M(n.port)||un[n.protocol]||null}function fn(e,t){var n="/"!==e.charAt(0);n&&(e="/"+e);var i=ui(e);t.$$path=decodeURIComponent(n&&"/"===i.pathname.charAt(0)?i.pathname.substring(1):i.pathname),t.$$search=le(i.search),t.$$hash=decodeURIComponent(i.hash),t.$$path&&"/"!=t.$$path.charAt(0)&&(t.$$path="/"+t.$$path)}function pn(e,t){if(0===t.indexOf(e))return t.substr(e.length)}function gn(e){var t=e.indexOf("#");return-1==t?e:e.substr(0,t)}function mn(e){return e.replace(/(#.+)|#$/,"$1")}function vn(e,t,i){this.$$html5=!0,i=i||"",dn(e,this),this.$$parse=function(e){var n=pn(t,e);if(!D(n))throw cn("ipthprfx",'Invalid url "{0}", missing path prefix "{1}".',e,t);fn(n,this),this.$$path||(this.$$path="/"),this.$$compose()},this.$$compose=function(){var e=ue(this.$$search),n=this.$$hash?"#"+ce(this.$$hash):"";this.$$url=hn(this.$$path)+(e?"?"+e:"")+n,this.$$absUrl=t+this.$$url.substr(1)},this.$$parseLinkUrl=function(r,s){return s&&"#"===s[0]?(this.hash(s.slice(1)),!0):((o=pn(e,r))!==n?(a=o,l=(o=pn(i,o))!==n?t+(pn("/",o)||o):e+a):(o=pn(t,r))!==n?l=t+o:t==r+"/"&&(l=t),l&&this.$$parse(l),!!l);var o,a,l}}function yn(e,t,n){dn(e,this),this.$$parse=function(i){var r,s=pn(e,i)||pn(t,i);L(s)||"#"!==s.charAt(0)?this.$$html5?r=s:(r="",L(s)&&(e=i,this.replace())):L(r=pn(n,s))&&(r=s),fn(r,this),this.$$path=function(e,t,n){var i,r=/^\/[A-Z]:(\/.*)/;0===t.indexOf(n)&&(t=t.replace(n,""));if(r.exec(t))return e;return(i=r.exec(e))?i[1]:e}(this.$$path,r,e),this.$$compose()},this.$$compose=function(){var t=ue(this.$$search),i=this.$$hash?"#"+ce(this.$$hash):"";this.$$url=hn(this.$$path)+(t?"?"+t:"")+i,this.$$absUrl=e+(this.$$url?n+this.$$url:"")},this.$$parseLinkUrl=function(t,n){return gn(e)==gn(t)&&(this.$$parse(t),!0)}}function $n(e,t,n){this.$$html5=!0,yn.apply(this,arguments),this.$$parseLinkUrl=function(i,r){return r&&"#"===r[0]?(this.hash(r.slice(1)),!0):(e==gn(i)?s=i:(o=pn(t,i))?s=e+n+o:t===i+"/"&&(s=t),s&&this.$$parse(s),!!s);var s,o},this.$$compose=function(){var t=ue(this.$$search),i=this.$$hash?"#"+ce(this.$$hash):"";this.$$url=hn(this.$$path)+(t?"?"+t:"")+i,this.$$absUrl=e+n+this.$$url}}var wn={$$html5:!1,$$replace:!1,absUrl:bn("$$absUrl"),url:function(e){if(L(e))return this.$$url;var t=ln.exec(e);return(t[1]||""===e)&&this.path(decodeURIComponent(t[1])),(t[2]||t[1]||""===e)&&this.search(t[3]||""),this.hash(t[5]||""),this},protocol:bn("$$protocol"),host:bn("$$host"),port:bn("$$port"),path:Sn("$$path",(function(e){return"/"==(e=null!==e?e.toString():"").charAt(0)?e:"/"+e})),search:function(e,t){switch(arguments.length){case 0:return this.$$search;case 1:if(D(e)||O(e))e=e.toString(),this.$$search=le(e);else{if(!I(e))throw cn("isrcharg","The first argument of the `$location#search()` call must be a string or an object.");b(e=Q(e,{}),(function(t,n){null==t&&delete e[n]})),this.$$search=e}break;default:L(t)||null===t?delete this.$$search[e]:this.$$search[e]=t}return this.$$compose(),this},hash:Sn("$$hash",(function(e){return null!==e?e.toString():""})),replace:function(){return this.$$replace=!0,this}};function bn(e){return function(){return this[e]}}function Sn(e,t){return function(n){return L(n)?this[e]:(this[e]=t(n),this.$$compose(),this)}}function xn(){var e="",t={enabled:!1,requireBase:!0,rewriteLinks:!0};this.hashPrefix=function(t){return P(t)?(e=t,this):e},this.html5Mode=function(e){return W(e)?(t.enabled=e,this):I(e)?(W(e.enabled)&&(t.enabled=e.enabled),W(e.requireBase)&&(t.requireBase=e.requireBase),W(e.rewriteLinks)&&(t.rewriteLinks=e.rewriteLinks),this):t},this.$get=["$rootScope","$browser","$sniffer","$rootElement","$window",function(n,i,r,s,o){var a,l,u,h,d=i.baseHref(),f=i.url();if(t.enabled){if(!d&&t.requireBase)throw cn("nobase","$location in HTML5 mode requires a <base> tag to be present!");u=(h=f).substring(0,h.indexOf("/",h.indexOf("//")+2))+(d||"/"),l=r.history?vn:$n}else u=gn(f),l=yn;var p=function(e){return e.substr(0,gn(e).lastIndexOf("/")+1)}(u);(a=new l(u,p,"#"+e)).$$parseLinkUrl(f,f),a.$$state=i.state();var g=/^\s*(javascript|mailto):/i;function m(e,t,n){var r=a.url(),s=a.$$state;try{i.url(e,t,n),a.$$state=i.state()}catch(e){throw a.url(r),a.$$state=s,e}}s.on("click",(function(e){if(t.rewriteLinks&&!e.ctrlKey&&!e.metaKey&&!e.shiftKey&&2!=e.which&&2!=e.button){for(var r=c(e.target);"a"!==G(r[0]);)if(r[0]===s[0]||!(r=r.parent())[0])return;var l=r.prop("href"),u=r.attr("href")||r.attr("xlink:href");I(l)&&"[object SVGAnimatedString]"===l.toString()&&(l=ui(l.animVal).href),g.test(l)||!l||r.attr("target")||e.isDefaultPrevented()||a.$$parseLinkUrl(l,u)&&(e.preventDefault(),a.absUrl()!=i.url()&&(n.$apply(),o.angular["ff-684208-preventDefault"]=!0))}})),mn(a.absUrl())!=mn(f)&&i.url(a.absUrl(),!0);var v=!0;return i.onUrlChange((function(e,t){L(pn(p,e))?o.location.href=e:(n.$evalAsync((function(){var i,r=a.absUrl(),s=a.$$state;a.$$parse(e),a.$$state=t,i=n.$broadcast("$locationChangeStart",e,r,t,s).defaultPrevented,a.absUrl()===e&&(i?(a.$$parse(r),a.$$state=s,m(r,!1,s)):(v=!1,y(r,s)))})),n.$$phase||n.$digest())})),n.$watch((function(){var e=mn(i.url()),t=mn(a.absUrl()),s=i.state(),o=a.$$replace,l=e!==t||a.$$html5&&r.history&&s!==a.$$state;(v||l)&&(v=!1,n.$evalAsync((function(){var t=a.absUrl(),i=n.$broadcast("$locationChangeStart",t,e,a.$$state,s).defaultPrevented;a.absUrl()===t&&(i?(a.$$parse(e),a.$$state=s):(l&&m(t,o,s===a.$$state?null:a.$$state),y(e,s)))}))),a.$$replace=!1})),a;function y(e,t){n.$broadcast("$locationChangeSuccess",a.absUrl(),e,a.$$state,t)}}]}function Cn(){var e=!0,t=this;this.debugEnabled=function(t){return P(t)?(e=t,this):e},this.$get=["$window",function(n){return{log:r("log"),info:r("info"),warn:r("warn"),error:r("error"),debug:(i=r("debug"),function(){e&&i.apply(t,arguments)})};var i;function r(e){var t=n.console||{},i=t[e]||t.log||E,r=!1;try{r=!!i.apply}catch(e){}return r?function(){var e=[];return b(arguments,(function(t){e.push(function(e){return e instanceof Error&&(e.stack?e=e.message&&-1===e.stack.indexOf(e.message)?"Error: "+e.message+"\n"+e.stack:e.stack:e.sourceURL&&(e=e.message+"\n"+e.sourceURL+":"+e.line)),e}(t))})),i.apply(t,e)}:function(e,t){i(e,null==t?"":t)}}}]}b([$n,yn,vn],(function(e){e.prototype=Object.create(wn),e.prototype.state=function(t){if(!arguments.length)return this.$$state;if(e!==vn||!this.$$html5)throw cn("nostate","History API state support is available only in HTML5 mode and only in browsers supporting HTML5 History API");return this.$$state=L(t)?null:t,this}}));var kn=i("$parse");function _n(e,t){if("__defineGetter__"===e||"__defineSetter__"===e||"__lookupGetter__"===e||"__lookupSetter__"===e||"__proto__"===e)throw kn("isecfld","Attempting to access a disallowed field in Angular expressions! Expression: {0}",t);return e}function Mn(e,t){if(!D(e+=""))throw kn("iseccst","Cannot convert object to primitive value! Expression: {0}",t);return e}function An(e,t){if(e){if(e.constructor===e)throw kn("isecfn","Referencing Function in Angular expressions is disallowed! Expression: {0}",t);if(e.window===e)throw kn("isecwindow","Referencing the Window in Angular expressions is disallowed! Expression: {0}",t);if(e.children&&(e.nodeName||e.prop&&e.attr&&e.find))throw kn("isecdom","Referencing DOM nodes in Angular expressions is disallowed! Expression: {0}",t);if(e===Object)throw kn("isecobj","Referencing Object in Angular expressions is disallowed! Expression: {0}",t)}return e}var En=Function.prototype.call,Rn=Function.prototype.apply,Tn=Function.prototype.bind;var Ln=_e();b({null:function(){return null},true:function(){return!0},false:function(){return!1},undefined:function(){}},(function(e,t){e.constant=e.literal=e.sharedGetter=!0,Ln[t]=e})),Ln.this=function(e){return e},Ln.this.sharedGetter=!0;var Pn=_(_e(),{"+":function(e,t,i,r){return i=i(e,t),r=r(e,t),P(i)?P(r)?i+r:i:P(r)?r:n},"-":function(e,t,n,i){return n=n(e,t),i=i(e,t),(P(n)?n:0)-(P(i)?i:0)},"*":function(e,t,n,i){return n(e,t)*i(e,t)},"/":function(e,t,n,i){return n(e,t)/i(e,t)},"%":function(e,t,n,i){return n(e,t)%i(e,t)},"===":function(e,t,n,i){return n(e,t)===i(e,t)},"!==":function(e,t,n,i){return n(e,t)!==i(e,t)},"==":function(e,t,n,i){return n(e,t)==i(e,t)},"!=":function(e,t,n,i){return n(e,t)!=i(e,t)},"<":function(e,t,n,i){return n(e,t)<i(e,t)},">":function(e,t,n,i){return n(e,t)>i(e,t)},"<=":function(e,t,n,i){return n(e,t)<=i(e,t)},">=":function(e,t,n,i){return n(e,t)>=i(e,t)},"&&":function(e,t,n,i){return n(e,t)&&i(e,t)},"||":function(e,t,n,i){return n(e,t)||i(e,t)},"!":function(e,t,n){return!n(e,t)},"=":!0,"|":!0}),In={n:"\n",f:"\f",r:"\r",t:"\t",v:"\v","'":"'",'"':'"'},Dn=function(e){this.options=e};function On(e){return e.constant}Dn.prototype={constructor:Dn,lex:function(e){for(this.text=e,this.index=0,this.tokens=[];this.index<this.text.length;){var t=this.text.charAt(this.index);if('"'===t||"'"===t)this.readString(t);else if(this.isNumber(t)||"."===t&&this.isNumber(this.peek()))this.readNumber();else if(this.isIdent(t))this.readIdent();else if(this.is(t,"(){}[].,;:?"))this.tokens.push({index:this.index,text:t}),this.index++;else if(this.isWhitespace(t))this.index++;else{var n=t+this.peek(),i=n+this.peek(2),r=Pn[t],s=Pn[n],o=Pn[i];if(r||s||o){var a=o?i:s?n:t;this.tokens.push({index:this.index,text:a,operator:!0}),this.index+=a.length}else this.throwError("Unexpected next character ",this.index,this.index+1)}}return this.tokens},is:function(e,t){return-1!==t.indexOf(e)},peek:function(e){var t=e||1;return this.index+t<this.text.length&&this.text.charAt(this.index+t)},isNumber:function(e){return"0"<=e&&e<="9"&&"string"==typeof e},isWhitespace:function(e){return" "===e||"\r"===e||"\t"===e||"\n"===e||"\v"===e||" "===e},isIdent:function(e){return"a"<=e&&e<="z"||"A"<=e&&e<="Z"||"_"===e||"$"===e},isExpOperator:function(e){return"-"===e||"+"===e||this.isNumber(e)},throwError:function(e,t,n){n=n||this.index;var i=P(t)?"s "+t+"-"+this.index+" ["+this.text.substring(t,n)+"]":" "+n;throw kn("lexerr","Lexer Error: {0} at column{1} in expression [{2}].",e,i,this.text)},readNumber:function(){for(var e="",t=this.index;this.index<this.text.length;){var n=o(this.text.charAt(this.index));if("."==n||this.isNumber(n))e+=n;else{var i=this.peek();if("e"==n&&this.isExpOperator(i))e+=n;else if(this.isExpOperator(n)&&i&&this.isNumber(i)&&"e"==e.charAt(e.length-1))e+=n;else{if(!this.isExpOperator(n)||i&&this.isNumber(i)||"e"!=e.charAt(e.length-1))break;this.throwError("Invalid exponent")}}this.index++}this.tokens.push({index:t,text:e,constant:!0,value:Number(e)})},readIdent:function(){for(var e=this.index;this.index<this.text.length;){var t=this.text.charAt(this.index);if(!this.isIdent(t)&&!this.isNumber(t))break;this.index++}this.tokens.push({index:e,text:this.text.slice(e,this.index),identifier:!0})},readString:function(e){var t=this.index;this.index++;for(var n="",i=e,r=!1;this.index<this.text.length;){var s=this.text.charAt(this.index);if(i+=s,r){if("u"===s){var o=this.text.substring(this.index+1,this.index+5);o.match(/[\da-f]{4}/i)||this.throwError("Invalid unicode escape [\\u"+o+"]"),this.index+=4,n+=String.fromCharCode(parseInt(o,16))}else{n+=In[s]||s}r=!1}else if("\\"===s)r=!0;else{if(s===e)return this.index++,void this.tokens.push({index:t,text:i,constant:!0,value:n});n+=s}this.index++}this.throwError("Unterminated quote",t)}};var Nn=function(e,t,n){this.lexer=e,this.$filter=t,this.options=n};function Fn(e,t,n,i,r){An(e,r),An(t,r);for(var s,o=n.split("."),a=0;o.length>1;a++){s=_n(o.shift(),r);var l=0===a&&t&&t[s]||e[s];l||(l={},e[s]=l),e=An(l,r)}return An(e[s=_n(o.shift(),r)],r),e[s]=i,i}Nn.ZERO=_((function(){return 0}),{sharedGetter:!0,constant:!0}),Nn.prototype={constructor:Nn,parse:function(e){this.text=e,this.tokens=this.lexer.lex(e);var t=this.statements();return 0!==this.tokens.length&&this.throwError("is an unexpected token",this.tokens[0]),t.literal=!!t.literal,t.constant=!!t.constant,t},primary:function(){var e,t,n;this.expect("(")?(e=this.filterChain(),this.consume(")")):this.expect("[")?e=this.arrayDeclaration():this.expect("{")?e=this.object():this.peek().identifier&&this.peek().text in Ln?e=Ln[this.consume().text]:this.peek().identifier?e=this.identifier():this.peek().constant?e=this.constant():this.throwError("not a primary expression",this.peek());for(;t=this.expect("(","[",".");)"("===t.text?(e=this.functionCall(e,n),n=null):"["===t.text?(n=e,e=this.objectIndex(e)):"."===t.text?(n=e,e=this.fieldAccess(e)):this.throwError("IMPOSSIBLE");return e},throwError:function(e,t){throw kn("syntax","Syntax Error: Token '{0}' {1} at column {2} of the expression [{3}] starting at [{4}].",t.text,e,t.index+1,this.text,this.text.substring(t.index))},peekToken:function(){if(0===this.tokens.length)throw kn("ueoe","Unexpected end of expression: {0}",this.text);return this.tokens[0]},peek:function(e,t,n,i){return this.peekAhead(0,e,t,n,i)},peekAhead:function(e,t,n,i,r){if(this.tokens.length>e){var s=this.tokens[e],o=s.text;if(o===t||o===n||o===i||o===r||!t&&!n&&!i&&!r)return s}return!1},expect:function(e,t,n,i){var r=this.peek(e,t,n,i);return!!r&&(this.tokens.shift(),r)},consume:function(e){if(0===this.tokens.length)throw kn("ueoe","Unexpected end of expression: {0}",this.text);var t=this.expect(e);return t||this.throwError("is unexpected, expecting ["+e+"]",this.peek()),t},unaryFn:function(e,t){var n=Pn[e];return _((function(e,i){return n(e,i,t)}),{constant:t.constant,inputs:[t]})},binaryFn:function(e,t,n,i){var r=Pn[t];return _((function(t,i){return r(t,i,e,n)}),{constant:e.constant&&n.constant,inputs:!i&&[e,n]})},identifier:function(){for(var e=this.consume().text;this.peek(".")&&this.peekAhead(1).identifier&&!this.peekAhead(2,"(");)e+=this.consume().text+this.consume().text;return function(e,t,i){var r=t.expensiveChecks,s=r?Bn:jn,o=s[e];if(o)return o;var a=e.split("."),l=a.length;if(t.csp)o=l<6?Hn(a[0],a[1],a[2],a[3],a[4],i,r):function(e,t){var s,o=0;do{s=Hn(a[o++],a[o++],a[o++],a[o++],a[o++],i,r)(e,t),t=n,e=s}while(o<l);return s};else{var u="";r&&(u+="s = eso(s, fe);\nl = eso(l, fe);\n");var c=r;b(a,(function(e,t){_n(e,i);var n=(t?"s":'((l&&l.hasOwnProperty("'+e+'"))?l:s)')+"."+e;(r||Un(e))&&(n="eso("+n+", fe)",c=!0),u+="if(s == null) return undefined;\ns="+n+";\n"})),u+="return s;";var h=new Function("s","l","eso","fe",u);h.toString=T(u),c&&(h=function(e,t){return function(n,i){return e(n,i,An,t)}}(h,i)),o=h}return o.sharedGetter=!0,o.assign=function(t,n,i){return Fn(t,i,e,n,e)},s[e]=o,o}(e,this.options,this.text)},constant:function(){var e=this.consume().value;return _((function(){return e}),{constant:!0,literal:!0})},statements:function(){for(var e=[];;)if(this.tokens.length>0&&!this.peek("}",")",";","]")&&e.push(this.filterChain()),!this.expect(";"))return 1===e.length?e[0]:function(t,n){for(var i,r=0,s=e.length;r<s;r++)i=e[r](t,n);return i}},filterChain:function(){for(var e=this.expression();this.expect("|");)e=this.filter(e);return e},filter:function(e){var t,i,r=this.$filter(this.consume().text);if(this.peek(":"))for(t=[],i=[];this.expect(":");)t.push(this.expression());var s=[e].concat(t||[]);return _((function(s,o){var a=e(s,o);if(i){i[0]=a;for(var l=t.length;l--;)i[l+1]=t[l](s,o);return r.apply(n,i)}return r(a)}),{constant:!r.$stateful&&s.every(On),inputs:!r.$stateful&&s})},expression:function(){return this.assignment()},assignment:function(){var e,t,n=this.ternary();return(t=this.expect("="))?(n.assign||this.throwError("implies assignment but ["+this.text.substring(0,t.index)+"] can not be assigned to",t),e=this.ternary(),_((function(t,i){return n.assign(t,e(t,i),i)}),{inputs:[n,e]})):n},ternary:function(){var e,t=this.logicalOR();if(this.expect("?")&&(e=this.assignment(),this.consume(":"))){var n=this.assignment();return _((function(i,r){return t(i,r)?e(i,r):n(i,r)}),{constant:t.constant&&e.constant&&n.constant})}return t},logicalOR:function(){for(var e,t=this.logicalAND();e=this.expect("||");)t=this.binaryFn(t,e.text,this.logicalAND(),!0);return t},logicalAND:function(){for(var e,t=this.equality();e=this.expect("&&");)t=this.binaryFn(t,e.text,this.equality(),!0);return t},equality:function(){for(var e,t=this.relational();e=this.expect("==","!=","===","!==");)t=this.binaryFn(t,e.text,this.relational());return t},relational:function(){for(var e,t=this.additive();e=this.expect("<",">","<=",">=");)t=this.binaryFn(t,e.text,this.additive());return t},additive:function(){for(var e,t=this.multiplicative();e=this.expect("+","-");)t=this.binaryFn(t,e.text,this.multiplicative());return t},multiplicative:function(){for(var e,t=this.unary();e=this.expect("*","/","%");)t=this.binaryFn(t,e.text,this.unary());return t},unary:function(){var e;return this.expect("+")?this.primary():(e=this.expect("-"))?this.binaryFn(Nn.ZERO,e.text,this.unary()):(e=this.expect("!"))?this.unaryFn(e.text,this.unary()):this.primary()},fieldAccess:function(e){var t=this.identifier();return _((function(i,r,s){var o=s||e(i,r);return null==o?n:t(o)}),{assign:function(n,i,r){var s=e(n,r);return s||e.assign(n,s={},r),t.assign(s,i)}})},objectIndex:function(e){var t=this.text,i=this.expression();return this.consume("]"),_((function(r,s){var o=e(r,s),a=Mn(i(r,s),t);return _n(a,t),o?An(o[a],t):n}),{assign:function(n,r,s){var o=_n(Mn(i(n,s),t),t),a=An(e(n,s),t);return a||e.assign(n,a={},s),a[o]=r}})},functionCall:function(e,t){var i=[];if(")"!==this.peekToken().text)do{i.push(this.expression())}while(this.expect(","));this.consume(")");var r=this.text,s=i.length?[]:null;return function(o,a){var l=t?t(o,a):P(t)?n:o,u=e(o,a,l)||E;if(s)for(var c=i.length;c--;)s[c]=An(i[c](o,a),r);An(l,r),function(e,t){if(e){if(e.constructor===e)throw kn("isecfn","Referencing Function in Angular expressions is disallowed! Expression: {0}",t);if(e===En||e===Rn||e===Tn)throw kn("isecff","Referencing call, apply or bind in Angular expressions is disallowed! Expression: {0}",t)}}(u,r);var h=u.apply?u.apply(l,s):u(s[0],s[1],s[2],s[3],s[4]);return s&&(s.length=0),An(h,r)}},arrayDeclaration:function(){var e=[];if("]"!==this.peekToken().text)do{if(this.peek("]"))break;e.push(this.expression())}while(this.expect(","));return this.consume("]"),_((function(t,n){for(var i=[],r=0,s=e.length;r<s;r++)i.push(e[r](t,n));return i}),{literal:!0,constant:e.every(On),inputs:e})},object:function(){var e=[],t=[];if("}"!==this.peekToken().text)do{if(this.peek("}"))break;var n=this.consume();n.constant?e.push(n.value):n.identifier?e.push(n.text):this.throwError("invalid key",n),this.consume(":"),t.push(this.expression())}while(this.expect(","));return this.consume("}"),_((function(n,i){for(var r={},s=0,o=t.length;s<o;s++)r[e[s]]=t[s](n,i);return r}),{literal:!0,constant:t.every(On),inputs:t})}};var jn=_e(),Bn=_e();function Un(e){return"constructor"==e}function Hn(e,t,i,r,s,o,a){_n(e,o),_n(t,o),_n(i,o),_n(r,o),_n(s,o);var l=function(e){return An(e,o)},u=a||Un(e)?l:R,c=a||Un(t)?l:R,h=a||Un(i)?l:R,d=a||Un(r)?l:R,f=a||Un(s)?l:R;return function(o,a){var l=a&&a.hasOwnProperty(e)?a:o;return null==l?l:(l=u(l[e]),t?null==l?n:(l=c(l[t]),i?null==l?n:(l=h(l[i]),r?null==l?n:(l=d(l[r]),s?null==l?n:l=f(l[s]):l):l):l):l)}}var Wn=Object.prototype.valueOf;function zn(e){return j(e.valueOf)?e.valueOf():Wn.call(e)}function Vn(){var e=_e(),t=_e();this.$get=["$filter","$sniffer",function(n,i){var r={csp:i.csp,expensiveChecks:!1},s={csp:i.csp,expensiveChecks:!0};return function(i,o,a){var f,p,g;switch(typeof i){case"string":g=i=i.trim();var m=a?t:e;if(!(f=m[g])){":"===i.charAt(0)&&":"===i.charAt(1)&&(p=!0,i=i.substring(2));var v=a?s:r,y=new Dn(v);(f=new Nn(y,n,v).parse(i)).constant?f.$$watchDelegate=h:p?(f=function(e){var t=e;return e.sharedGetter&&((t=function(t,n){return e(t,n)}).literal=e.literal,t.constant=e.constant,t.assign=e.assign),t}(f),f.$$watchDelegate=f.literal?c:u):f.inputs&&(f.$$watchDelegate=l),m[g]=f}return d(f,o);case"function":return d(i,o);default:return d(E,o)}};function o(e,t){for(var n=0,i=e.length;n<i;n++){var r=e[n];r.constant||(r.inputs?o(r.inputs,t):-1===t.indexOf(r)&&t.push(r))}return t}function a(e,t){return null==e||null==t?e===t:("object"!=typeof e||"object"!=typeof(e=zn(e)))&&(e===t||e!=e&&t!=t)}function l(e,t,n,i){var r,s=i.$$inputs||(i.$$inputs=o(i.inputs,[]));if(1===s.length){var l=a;return s=s[0],e.$watch((function(e){var t=s(e);return a(t,l)||(r=i(e),l=t&&zn(t)),r}),t,n)}for(var u=[],c=0,h=s.length;c<h;c++)u[c]=a;return e.$watch((function(e){for(var t=!1,n=0,o=s.length;n<o;n++){var l=s[n](e);(t||(t=!a(l,u[n])))&&(u[n]=l&&zn(l))}return t&&(r=i(e)),r}),t,n)}function u(e,t,n,i){var r,s;return r=e.$watch((function(e){return i(e)}),(function(e,n,i){s=e,j(t)&&t.apply(this,arguments),P(e)&&i.$$postDigest((function(){P(s)&&r()}))}),n)}function c(e,t,n,i){var r,s;return r=e.$watch((function(e){return i(e)}),(function(e,n,i){s=e,j(t)&&t.call(this,e,n,i),o(e)&&i.$$postDigest((function(){o(s)&&r()}))}),n);function o(e){var t=!0;return b(e,(function(e){P(e)||(t=!1)})),t}}function h(e,t,n,i){var r;return r=e.$watch((function(e){return i(e)}),(function(e,n,i){j(t)&&t.apply(this,arguments),r()}),n)}function d(e,t){if(!t)return e;var n=e.$$watchDelegate,i=n!==c&&n!==u?function(n,i){var r=e(n,i);return t(r,n,i)}:function(n,i){var r=e(n,i),s=t(r,n,i);return P(r)?s:r};return e.$$watchDelegate&&e.$$watchDelegate!==l?i.$$watchDelegate=e.$$watchDelegate:t.$stateful||(i.$$watchDelegate=l,i.inputs=[e]),i}}]}function qn(){this.$get=["$rootScope","$exceptionHandler",function(e,t){return Gn((function(t){e.$evalAsync(t)}),t)}]}function Yn(){this.$get=["$browser","$exceptionHandler",function(e,t){return Gn((function(t){e.defer(t)}),t)}]}function Gn(e,t){var r=i("$q",TypeError);function s(){this.$$state={status:0}}function o(e,t){return function(n){t.call(e,n)}}function a(i){!i.processScheduled&&i.pending&&(i.processScheduled=!0,e((function(){!function(e){var i,r,s;s=e.pending,e.processScheduled=!1,e.pending=n;for(var o=0,a=s.length;o<a;++o){r=s[o][0],i=s[o][e.status];try{j(i)?r.resolve(i(e.value)):1===e.status?r.resolve(e.value):r.reject(e.value)}catch(e){r.reject(e),t(e)}}}(i)})))}function l(){this.promise=new s,this.resolve=o(this,this.resolve),this.reject=o(this,this.reject),this.notify=o(this,this.notify)}s.prototype={then:function(e,t,n){var i=new l;return this.$$state.pending=this.$$state.pending||[],this.$$state.pending.push([i,e,t,n]),this.$$state.status>0&&a(this.$$state),i.promise},catch:function(e){return this.then(null,e)},finally:function(e,t){return this.then((function(t){return c(t,!0,e)}),(function(t){return c(t,!1,e)}),t)}},l.prototype={resolve:function(e){this.promise.$$state.status||(e===this.promise?this.$$reject(r("qcycle","Expected promise to be resolved with value other than itself '{0}'",e)):this.$$resolve(e))},$$resolve:function(e){var n,i;i=function(e,t,n){var i=!1;function r(t){return function(n){i||(i=!0,t.call(e,n))}}return[r(t),r(n)]}(this,this.$$resolve,this.$$reject);try{(I(e)||j(e))&&(n=e&&e.then),j(n)?(this.promise.$$state.status=-1,n.call(e,i[0],i[1],this.notify)):(this.promise.$$state.value=e,this.promise.$$state.status=1,a(this.promise.$$state))}catch(e){i[1](e),t(e)}},reject:function(e){this.promise.$$state.status||this.$$reject(e)},$$reject:function(e){this.promise.$$state.value=e,this.promise.$$state.status=2,a(this.promise.$$state)},notify:function(n){var i=this.promise.$$state.pending;this.promise.$$state.status<=0&&i&&i.length&&e((function(){for(var e,r,s=0,o=i.length;s<o;s++){r=i[s][0],e=i[s][3];try{r.notify(j(e)?e(n):n)}catch(e){t(e)}}}))}};var u=function(e,t){var n=new l;return t?n.resolve(e):n.reject(e),n.promise},c=function(e,t,n){var i=null;try{j(n)&&(i=n())}catch(e){return u(e,!1)}return z(i)?i.then((function(){return u(e,t)}),(function(e){return u(e,!1)})):u(e,t)},h=function(e,t,n,i){var r=new l;return r.resolve(e),r.promise.then(t,n,i)};var d=function e(t){if(!j(t))throw r("norslvr","Expected resolverFn, got '{0}'",t);if(!(this instanceof e))return new e(t);var n=new l;return t((function(e){n.resolve(e)}),(function(e){n.reject(e)})),n.promise};return d.defer=function(){return new l},d.reject=function(e){var t=new l;return t.reject(e),t.promise},d.when=h,d.all=function(e){var t=new l,n=0,i=F(e)?[]:{};return b(e,(function(e,r){n++,h(e).then((function(e){i.hasOwnProperty(r)||(i[r]=e,--n||t.resolve(i))}),(function(e){i.hasOwnProperty(r)||t.reject(e)}))})),0===n&&t.resolve(i),t.promise},d}function Kn(){this.$get=["$window","$timeout",function(e,t){var n,i=e.requestAnimationFrame||e.webkitRequestAnimationFrame,r=e.cancelAnimationFrame||e.webkitCancelAnimationFrame||e.webkitCancelRequestAnimationFrame,s=!!i,o=s?function(e){var t=i(e);return function(){r(t)}}:function(e){var n=t(e,16.66,!1);return function(){t.cancel(n)}};c.supported=s;var a=0,l=[];return c;function u(){for(var e=0;e<l.length;e++){var t=l[e];t&&(l[e]=null,t())}a=l.length=0}function c(e){var t=l.length;return a++,l.push(e),0===t&&(n=o(u)),function(){t>=0&&(l[t]=null,t=null,0==--a&&n&&(n(),n=null,l.length=0))}}}]}function Qn(){var e=10,t=i("$rootScope"),n=null,r=null;this.digestTtl=function(t){return arguments.length&&(e=t),e},this.$get=["$injector","$exceptionHandler","$parse","$browser",function(i,s,o,l){function u(e){e.currentScope.$$destroyed=!0}function c(){this.$id=C(),this.$$phase=this.$parent=this.$$watchers=this.$$nextSibling=this.$$prevSibling=this.$$childHead=this.$$childTail=null,this.$root=this,this.$$destroyed=!1,this.$$listeners={},this.$$listenerCount={},this.$$isolateBindings=null}c.prototype={constructor:c,$new:function(e,t){var n;return t=t||this,e?(n=new c).$root=this.$root:(this.$$ChildScope||(this.$$ChildScope=function(e){function t(){this.$$watchers=this.$$nextSibling=this.$$childHead=this.$$childTail=null,this.$$listeners={},this.$$listenerCount={},this.$id=C(),this.$$ChildScope=null}return t.prototype=e,t}(this)),n=new this.$$ChildScope),n.$parent=t,n.$$prevSibling=t.$$childTail,t.$$childHead?(t.$$childTail.$$nextSibling=n,t.$$childTail=n):t.$$childHead=t.$$childTail=n,(e||t!=this)&&n.$on("$destroy",u),n},$watch:function(e,t,i){var r=o(e);if(r.$$watchDelegate)return r.$$watchDelegate(this,t,i,r);var s=this.$$watchers,a={fn:t,last:y,get:r,exp:e,eq:!!i};return n=null,j(t)||(a.fn=E),s||(s=this.$$watchers=[]),s.unshift(a),function(){K(s,a),n=null}},$watchGroup:function(e,t){var n=new Array(e.length),i=new Array(e.length),r=[],s=this,o=!1,a=!0;if(!e.length){var l=!0;return s.$evalAsync((function(){l&&t(i,i,s)})),function(){l=!1}}if(1===e.length)return this.$watch(e[0],(function(e,r,s){i[0]=e,n[0]=r,t(i,e===r?i:n,s)}));function u(){o=!1,a?(a=!1,t(i,i,s)):t(i,n,s)}return b(e,(function(e,t){var a=s.$watch(e,(function(e,r){i[t]=e,n[t]=r,o||(o=!0,s.$evalAsync(u))}));r.push(a)})),function(){for(;r.length;)r.shift()()}},$watchCollection:function(e,t){g.$stateful=!0;var n,i,r,s=this,l=t.length>1,u=0,c=o(e,g),h=[],d={},f=!0,p=0;function g(e){var t,r,s,o;if(!L(n=e)){if(I(n))if(w(n)){i!==h&&(p=(i=h).length=0,u++),t=n.length,p!==t&&(u++,i.length=p=t);for(var a=0;a<t;a++)o=i[a],s=n[a],o!=o&&s!=s||o===s||(u++,i[a]=s)}else{for(r in i!==d&&(i=d={},p=0,u++),t=0,n)n.hasOwnProperty(r)&&(t++,s=n[r],o=i[r],r in i?o!=o&&s!=s||o===s||(u++,i[r]=s):(p++,i[r]=s,u++));if(p>t)for(r in u++,i)n.hasOwnProperty(r)||(p--,delete i[r])}else i!==n&&(i=n,u++);return u}}return this.$watch(c,(function(){if(f?(f=!1,t(n,n,s)):t(n,r,s),l)if(I(n))if(w(n)){r=new Array(n.length);for(var e=0;e<n.length;e++)r[e]=n[e]}else for(var i in r={},n)a.call(n,i)&&(r[i]=n[i]);else r=n}))},$digest:function(){var i,o,a,u,c,p,v,w,b,S,x=e,C=this,k=[];g("$digest"),l.$$checkUrlChange(),this===h&&null!==r&&(l.defer.cancel(r),$()),n=null;do{for(p=!1,w=C;d.length;){try{(S=d.shift()).scope.$eval(S.expression,S.locals)}catch(e){s(e)}n=null}e:do{if(u=w.$$watchers)for(c=u.length;c--;)try{if(i=u[c])if((o=i.get(w))===(a=i.last)||(i.eq?X(o,a):"number"==typeof o&&"number"==typeof a&&isNaN(o)&&isNaN(a))){if(i===n){p=!1;break e}}else p=!0,n=i,i.last=i.eq?Q(o,null):o,i.fn(o,a===y?o:a,w),x<5&&(k[b=4-x]||(k[b]=[]),k[b].push({msg:j(i.exp)?"fn: "+(i.exp.name||i.exp.toString()):i.exp,newVal:o,oldVal:a}))}catch(e){s(e)}if(!(v=w.$$childHead||w!==C&&w.$$nextSibling))for(;w!==C&&!(v=w.$$nextSibling);)w=w.$parent}while(w=v);if((p||d.length)&&!x--)throw m(),t("infdig","{0} $digest() iterations reached. Aborting!\nWatchers fired in the last 5 iterations: {1}",e,k)}while(p||d.length);for(m();f.length;)try{f.shift()()}catch(e){s(e)}},$destroy:function(){if(!this.$$destroyed){var e=this.$parent;if(this.$broadcast("$destroy"),this.$$destroyed=!0,this!==h){for(var t in this.$$listenerCount)v(this,this.$$listenerCount[t],t);e.$$childHead==this&&(e.$$childHead=this.$$nextSibling),e.$$childTail==this&&(e.$$childTail=this.$$prevSibling),this.$$prevSibling&&(this.$$prevSibling.$$nextSibling=this.$$nextSibling),this.$$nextSibling&&(this.$$nextSibling.$$prevSibling=this.$$prevSibling),this.$destroy=this.$digest=this.$apply=this.$evalAsync=this.$applyAsync=E,this.$on=this.$watch=this.$watchGroup=function(){return E},this.$$listeners={},this.$parent=this.$$nextSibling=this.$$prevSibling=this.$$childHead=this.$$childTail=this.$root=this.$$watchers=null}}},$eval:function(e,t){return o(e)(this,t)},$evalAsync:function(e,t){h.$$phase||d.length||l.defer((function(){d.length&&h.$digest()})),d.push({scope:this,expression:e,locals:t})},$$postDigest:function(e){f.push(e)},$apply:function(e){try{return g("$apply"),this.$eval(e)}catch(e){s(e)}finally{m();try{h.$digest()}catch(e){throw s(e),e}}},$applyAsync:function(e){var t=this;e&&p.push((function(){t.$eval(e)})),null===r&&(r=l.defer((function(){h.$apply($)})))},$on:function(e,t){var n=this.$$listeners[e];n||(this.$$listeners[e]=n=[]),n.push(t);var i=this;do{i.$$listenerCount[e]||(i.$$listenerCount[e]=0),i.$$listenerCount[e]++}while(i=i.$parent);var r=this;return function(){var i=n.indexOf(t);-1!==i&&(n[i]=null,v(r,1,e))}},$emit:function(e,t){var n,i,r,o=[],a=this,l=!1,u={name:e,targetScope:a,stopPropagation:function(){l=!0},preventDefault:function(){u.defaultPrevented=!0},defaultPrevented:!1},c=ee([u],arguments,1);do{for(n=a.$$listeners[e]||o,u.currentScope=a,i=0,r=n.length;i<r;i++)if(n[i])try{n[i].apply(null,c)}catch(e){s(e)}else n.splice(i,1),i--,r--;if(l)return u.currentScope=null,u;a=a.$parent}while(a);return u.currentScope=null,u},$broadcast:function(e,t){var n=this,i=n,r=n,o={name:e,targetScope:n,preventDefault:function(){o.defaultPrevented=!0},defaultPrevented:!1};if(!n.$$listenerCount[e])return o;for(var a,l,u,c=ee([o],arguments,1);i=r;){for(o.currentScope=i,l=0,u=(a=i.$$listeners[e]||[]).length;l<u;l++)if(a[l])try{a[l].apply(null,c)}catch(e){s(e)}else a.splice(l,1),l--,u--;if(!(r=i.$$listenerCount[e]&&i.$$childHead||i!==n&&i.$$nextSibling))for(;i!==n&&!(r=i.$$nextSibling);)i=i.$parent}return o.currentScope=null,o}};var h=new c,d=h.$$asyncQueue=[],f=h.$$postDigestQueue=[],p=h.$$applyAsyncQueue=[];return h;function g(e){if(h.$$phase)throw t("inprog","{0} already in progress",h.$$phase);h.$$phase=e}function m(){h.$$phase=null}function v(e,t,n){do{e.$$listenerCount[n]-=t,0===e.$$listenerCount[n]&&delete e.$$listenerCount[n]}while(e=e.$parent)}function y(){}function $(){for(;p.length;)try{p.shift()()}catch(e){s(e)}r=null}}]}function Jn(){var e=/^\s*(https?|ftp|mailto|tel|file):/,t=/^\s*((https?|ftp|file|blob):|data:image\/)/;this.aHrefSanitizationWhitelist=function(t){return P(t)?(e=t,this):e},this.imgSrcSanitizationWhitelist=function(e){return P(e)?(t=e,this):t},this.$get=function(){return function(n,i){var r,s=i?t:e;return""===(r=ui(n).href)||r.match(s)?n:"unsafe:"+r}}}var Xn=i("$sce"),Zn={HTML:"html",CSS:"css",URL:"url",RESOURCE_URL:"resourceUrl",JS:"js"};function ei(e){var t=[];return P(e)&&b(e,(function(e){t.push(function(e){if("self"===e)return e;if(D(e)){if(e.indexOf("***")>-1)throw Xn("iwcard","Illegal sequence *** in string matcher.  String: {0}",e);return e=q(e).replace("\\*\\*",".*").replace("\\*","[^:/.?&;]*"),new RegExp("^"+e+"$")}if(B(e))return new RegExp("^"+e.source+"$");throw Xn("imatcher",'Matchers may only be "self", string patterns or RegExp objects')}(e))})),t}function ti(){this.SCE_CONTEXTS=Zn;var e=["self"],t=[];this.resourceUrlWhitelist=function(t){return arguments.length&&(e=ei(t)),e},this.resourceUrlBlacklist=function(e){return arguments.length&&(t=ei(e)),t},this.$get=["$injector",function(i){var r=function(e){throw Xn("unsafe","Attempting to use an unsafe value in a safe context.")};function s(e,t){return"self"===e?ci(t):!!e.exec(t.href)}function o(e){var t=function(e){this.$$unwrapTrustedValue=function(){return e}};return e&&(t.prototype=new e),t.prototype.valueOf=function(){return this.$$unwrapTrustedValue()},t.prototype.toString=function(){return this.$$unwrapTrustedValue().toString()},t}i.has("$sanitize")&&(r=i.get("$sanitize"));var a=o(),l={};return l[Zn.HTML]=o(a),l[Zn.CSS]=o(a),l[Zn.URL]=o(a),l[Zn.JS]=o(a),l[Zn.RESOURCE_URL]=o(l[Zn.URL]),{trustAs:function(e,t){var i=l.hasOwnProperty(e)?l[e]:null;if(!i)throw Xn("icontext","Attempted to trust a value in invalid context. Context: {0}; Value: {1}",e,t);if(null===t||t===n||""===t)return t;if("string"!=typeof t)throw Xn("itype","Attempted to trust a non-string value in a content requiring a string: Context: {0}",e);return new i(t)},getTrusted:function(i,o){if(null===o||o===n||""===o)return o;var a=l.hasOwnProperty(i)?l[i]:null;if(a&&o instanceof a)return o.$$unwrapTrustedValue();if(i===Zn.RESOURCE_URL){if(function(n){var i,r,o=ui(n.toString()),a=!1;for(i=0,r=e.length;i<r;i++)if(s(e[i],o)){a=!0;break}if(a)for(i=0,r=t.length;i<r;i++)if(s(t[i],o)){a=!1;break}return a}(o))return o;throw Xn("insecurl","Blocked loading resource from url not allowed by $sceDelegate policy.  URL: {0}",o.toString())}if(i===Zn.HTML)return r(o);throw Xn("unsafe","Attempting to use an unsafe value in a safe context.")},valueOf:function(e){return e instanceof a?e.$$unwrapTrustedValue():e}}}]}function ni(){var e=!0;this.enabled=function(t){return arguments.length&&(e=!!t),e},this.$get=["$parse","$sceDelegate",function(t,n){if(e&&u<8)throw Xn("iequirks","Strict Contextual Escaping does not support Internet Explorer version < 11 in quirks mode.  You can fix this by adding the text <!doctype html> to the top of your HTML document.  See http://docs.angularjs.org/api/ng.$sce for more information.");var i=J(Zn);i.isEnabled=function(){return e},i.trustAs=n.trustAs,i.getTrusted=n.getTrusted,i.valueOf=n.valueOf,e||(i.trustAs=i.getTrusted=function(e,t){return t},i.valueOf=R),i.parseAs=function(e,n){var r=t(n);return r.literal&&r.constant?r:t(n,(function(t){return i.getTrusted(e,t)}))};var r=i.parseAs,s=i.getTrusted,a=i.trustAs;return b(Zn,(function(e,t){var n=o(t);i[He("parse_as_"+n)]=function(t){return r(e,t)},i[He("get_trusted_"+n)]=function(t){return s(e,t)},i[He("trust_as_"+n)]=function(t){return a(e,t)}})),i}]}function ii(){this.$get=["$window","$document",function(e,t){var n,i,r={},s=M((/android (\d+)/.exec(o((e.navigator||{}).userAgent))||[])[1]),a=/Boxee/i.test((e.navigator||{}).userAgent),l=t[0]||{},c=/^(Moz|webkit|ms)(?=[A-Z])/,h=l.body&&l.body.style,d=!1,f=!1;if(h){for(var p in h)if(i=c.exec(p)){n=(n=i[0]).substr(0,1).toUpperCase()+n.substr(1);break}n||(n="WebkitOpacity"in h&&"webkit"),d=!(!("transition"in h)&&!(n+"Transition"in h)),f=!(!("animation"in h)&&!(n+"Animation"in h)),!s||d&&f||(d=D(l.body.style.webkitTransition),f=D(l.body.style.webkitAnimation))}return{history:!(!e.history||!e.history.pushState||s<4||a),hasEvent:function(e){if("input"===e&&u<=11)return!1;if(L(r[e])){var t=l.createElement("div");r[e]="on"+e in t}return r[e]},csp:Z(),vendorPrefix:n,transitions:d,animations:f,android:s}}]}It=i("$compile");function ri(){this.$get=["$templateCache","$http","$q","$sce",function(e,t,n,i){function r(s,o){r.totalPendingRequests++,D(s)&&e.get(s)||(s=i.getTrustedResourceUrl(s));var a=t.defaults&&t.defaults.transformResponse;F(a)?a=a.filter((function(e){return e!==Kt})):a===Kt&&(a=null);var l={cache:e,transformResponse:a};return t.get(s,l).finally((function(){r.totalPendingRequests--})).then((function(e){return e.data}),(function(e){if(!o)throw It("tpload","Failed to load template: {0}",s);return n.reject(e)}))}return r.totalPendingRequests=0,r}]}function si(){this.$get=["$rootScope","$browser","$location",function(e,t,n){var i={findBindings:function(e,t,n){var i=e.getElementsByClassName("ng-binding"),r=[];return b(i,(function(e){var i=y.element(e).data("$binding");i&&b(i,(function(i){n?new RegExp("(^|\\s)"+q(t)+"(\\s|\\||$)").test(i)&&r.push(e):-1!=i.indexOf(t)&&r.push(e)}))})),r},findModels:function(e,t,n){for(var i=["ng-","data-ng-","ng\\:"],r=0;r<i.length;++r){var s="["+i[r]+"model"+(n?"=":"*=")+'"'+t+'"]',o=e.querySelectorAll(s);if(o.length)return o}},getLocation:function(){return n.url()},setLocation:function(t){t!==n.url()&&(n.url(t),e.$digest())},whenStable:function(e){t.notifyWhenNoOutstandingRequests(e)}};return i}]}function oi(){this.$get=["$rootScope","$browser","$q","$$q","$exceptionHandler",function(e,t,n,i,r){var s={};function o(o,a,l){var u,c=P(l)&&!l,h=(c?i:n).defer(),d=h.promise;return u=t.defer((function(){try{h.resolve(o())}catch(e){h.reject(e),r(e)}finally{delete s[d.$$timeoutId]}c||e.$apply()}),a),d.$$timeoutId=u,s[u]=h,d}return o.cancel=function(e){return!(!e||!(e.$$timeoutId in s))&&(s[e.$$timeoutId].reject("canceled"),delete s[e.$$timeoutId],t.defer.cancel(e.$$timeoutId))},o}]}var ai=t.createElement("a"),li=ui(e.location.href);function ui(e){var t=e;return u&&(ai.setAttribute("href",t),t=ai.href),ai.setAttribute("href",t),{href:ai.href,protocol:ai.protocol?ai.protocol.replace(/:$/,""):"",host:ai.host,search:ai.search?ai.search.replace(/^\?/,""):"",hash:ai.hash?ai.hash.replace(/^#/,""):"",hostname:ai.hostname,port:ai.port,pathname:"/"===ai.pathname.charAt(0)?ai.pathname:"/"+ai.pathname}}function ci(e){var t=D(e)?ui(e):e;return t.protocol===li.protocol&&t.host===li.host}function hi(){this.$get=T(e)}function di(e){var t="Filter";function n(i,r){if(I(i)){var s={};return b(i,(function(e,t){s[t]=n(t,e)})),s}return e.factory(i+t,r)}this.register=n,this.$get=["$injector",function(e){return function(n){return e.get(n+t)}}],n("currency",gi),n("date",Ai),n("filter",fi),n("json",Ei),n("limitTo",Li),n("lowercase",Ri),n("number",mi),n("orderBy",Pi),n("uppercase",Ti)}function fi(){return function(e,t,n){if(!F(e))return e;var i,r;switch(null!==t?typeof t:"null"){case"function":i=t;break;case"boolean":case"null":case"number":case"string":r=!0;case"object":i=function(e,t,n){var i,r=I(e)&&"$"in e;!0===t?t=X:j(t)||(t=function(e,t){return!L(e)&&(null===e||null===t?e===t:!I(e)&&!I(t)&&(e=o(""+e),t=o(""+t),-1!==e.indexOf(t)))});return i=function(i){return r&&!I(i)?pi(i,e.$,t,!1):pi(i,e,t,n)},i}(t,n,r);break;default:return e}return e.filter(i)}}function pi(e,t,n,i,r){var s=null!==e?typeof e:"null",o=null!==t?typeof t:"null";if("string"===o&&"!"===t.charAt(0))return!pi(e,t.substring(1),n,i);if(F(e))return e.some((function(e){return pi(e,t,n,i)}));switch(s){case"object":var a;if(i){for(a in e)if("$"!==a.charAt(0)&&pi(e[a],t,n,!0))return!0;return!r&&pi(e,t,n,!1)}if("object"===o){for(a in t){var l=t[a];if(!j(l)&&!L(l)){var u="$"===a;if(!pi(u?e:e[a],l,n,u,u))return!1}}return!0}return n(e,t);case"function":return!1;default:return n(e,t)}}function gi(e){var t=e.NUMBER_FORMATS;return function(e,n,i){return L(n)&&(n=t.CURRENCY_SYM),L(i)&&(i=t.PATTERNS[1].maxFrac),null==e?e:yi(e,t.PATTERNS[1],t.GROUP_SEP,t.DECIMAL_SEP,i).replace(/\u00A4/g,n)}}function mi(e){var t=e.NUMBER_FORMATS;return function(e,n){return null==e?e:yi(e,t.PATTERNS[0],t.GROUP_SEP,t.DECIMAL_SEP,n)}}di.$inject=["$provide"],gi.$inject=["$locale"],mi.$inject=["$locale"];var vi=".";function yi(e,t,n,i,r){if(!isFinite(e)||I(e))return"";var s=e<0,o=(e=Math.abs(e))+"",a="",l=[],u=!1;if(-1!==o.indexOf("e")){var c=o.match(/([\d\.]+)e(-?)(\d+)/);c&&"-"==c[2]&&c[3]>r+1?e=0:(a=o,u=!0)}if(u)r>0&&e<1&&(a=e.toFixed(r),e=parseFloat(a));else{var h=(o.split(vi)[1]||"").length;L(r)&&(r=Math.min(Math.max(t.minFrac,h),t.maxFrac));var d=(""+(e=+(Math.round(+(e.toString()+"e"+r)).toString()+"e"+-r))).split(vi),f=d[0];d=d[1]||"";var p,g=0,m=t.lgSize,v=t.gSize;if(f.length>=m+v)for(g=f.length-m,p=0;p<g;p++)(g-p)%v==0&&0!==p&&(a+=n),a+=f.charAt(p);for(p=g;p<f.length;p++)(f.length-p)%m==0&&0!==p&&(a+=n),a+=f.charAt(p);for(;d.length<r;)d+="0";r&&"0"!==r&&(a+=i+d.substr(0,r))}return 0===e&&(s=!1),l.push(s?t.negPre:t.posPre,a,s?t.negSuf:t.posSuf),l.join("")}function $i(e,t,n){var i="";for(e<0&&(i="-",e=-e),e=""+e;e.length<t;)e="0"+e;return n&&(e=e.substr(e.length-t)),i+e}function wi(e,t,n,i){return n=n||0,function(r){var s=r["get"+e]();return(n>0||s>-n)&&(s+=n),0===s&&-12==n&&(s=12),$i(s,t,i)}}function bi(e,t){return function(n,i){var r=n["get"+e]();return i[l(t?"SHORT"+e:e)][r]}}function Si(e){var t=new Date(e,0,1).getDay();return new Date(e,0,(t<=4?5:12)-t)}function xi(e){return function(t){var n,i=Si(t.getFullYear()),r=+(n=t,new Date(n.getFullYear(),n.getMonth(),n.getDate()+(4-n.getDay())))-+i;return $i(1+Math.round(r/6048e5),e)}}function Ci(e,t){return e.getFullYear()<=0?t.ERAS[0]:t.ERAS[1]}var ki={yyyy:wi("FullYear",4),yy:wi("FullYear",2,0,!0),y:wi("FullYear",1),MMMM:bi("Month"),MMM:bi("Month",!0),MM:wi("Month",2,1),M:wi("Month",1,1),dd:wi("Date",2),d:wi("Date",1),HH:wi("Hours",2),H:wi("Hours",1),hh:wi("Hours",2,-12),h:wi("Hours",1,-12),mm:wi("Minutes",2),m:wi("Minutes",1),ss:wi("Seconds",2),s:wi("Seconds",1),sss:wi("Milliseconds",3),EEEE:bi("Day"),EEE:bi("Day",!0),a:function(e,t){return e.getHours()<12?t.AMPMS[0]:t.AMPMS[1]},Z:function(e){var t=-1*e.getTimezoneOffset(),n=t>=0?"+":"";return n+=$i(Math[t>0?"floor":"ceil"](t/60),2)+$i(Math.abs(t%60),2)},ww:xi(2),w:xi(1),G:Ci,GG:Ci,GGG:Ci,GGGG:function(e,t){return e.getFullYear()<=0?t.ERANAMES[0]:t.ERANAMES[1]}},_i=/((?:[^yMdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z|G+|w+))(.*)/,Mi=/^\-?\d+$/;function Ai(e){var t=/^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;return function(n,i,r){var s,o,a="",l=[];if(i=i||"mediumDate",i=e.DATETIME_FORMATS[i]||i,D(n)&&(n=Mi.test(n)?M(n):function(e){var n;if(n=e.match(t)){var i=new Date(0),r=0,s=0,o=n[8]?i.setUTCFullYear:i.setFullYear,a=n[8]?i.setUTCHours:i.setHours;n[9]&&(r=M(n[9]+n[10]),s=M(n[9]+n[11])),o.call(i,M(n[1]),M(n[2])-1,M(n[3]));var l=M(n[4]||0)-r,u=M(n[5]||0)-s,c=M(n[6]||0),h=Math.round(1e3*parseFloat("0."+(n[7]||0)));return a.call(i,l,u,c,h),i}return e}(n)),O(n)&&(n=new Date(n)),!N(n))return n;for(;i;)(o=_i.exec(i))?i=(l=ee(l,o,1)).pop():(l.push(i),i=null);return r&&"UTC"===r&&(n=new Date(n.getTime())).setMinutes(n.getMinutes()+n.getTimezoneOffset()),b(l,(function(t){s=ki[t],a+=s?s(n,e.DATETIME_FORMATS):t.replace(/(^'|'$)/g,"").replace(/''/g,"'")})),a}}function Ei(){return function(e,t){return L(t)&&(t=2),re(e,t)}}Ai.$inject=["$locale"];var Ri=T(o),Ti=T(l);function Li(){return function(e,t){return O(e)&&(e=e.toString()),F(e)||D(e)?(t=Math.abs(Number(t))===1/0?Number(t):M(t))?t>0?e.slice(0,t):e.slice(t):D(e)?"":[]:e}}function Pi(e){return function(t,n,i){return w(t)?(0===(n=F(n)?n:[n]).length&&(n=["+"]),n=n.map((function(t){var n=!1,i=t||R;if(D(t)){if("+"!=t.charAt(0)&&"-"!=t.charAt(0)||(n="-"==t.charAt(0),t=t.substring(1)),""===t)return r(a,n);if((i=e(t)).constant){var s=i();return r((function(e,t){return a(e[s],t[s])}),n)}}return r((function(e,t){return a(i(e),i(t))}),n)})),f.call(t).sort(r((function(e,t){for(var i=0;i<n.length;i++){var r=n[i](e,t);if(0!==r)return r}return 0}),i))):t;function r(e,t){return t?function(t,n){return e(n,t)}:e}function s(e){switch(typeof e){case"number":case"boolean":case"string":return!0;default:return!1}}function o(e){return null===e?"null":"function"==typeof e.valueOf&&s(e=e.valueOf())||"function"==typeof e.toString&&s(e=e.toString())?e:""}function a(e,t){var n=typeof e,i=typeof t;return n===i&&"object"===n&&(e=o(e),t=o(t)),n===i?("string"===n&&(e=e.toLowerCase(),t=t.toLowerCase()),e===t?0:e<t?-1:1):n<i?-1:1}}}function Ii(e){return j(e)&&(e={link:e}),e.restrict=e.restrict||"AC",T(e)}Pi.$inject=["$parse"];var Di=T({restrict:"E",compile:function(e,t){if(!t.href&&!t.xlinkHref&&!t.name)return function(e,t){if("a"===t[0].nodeName.toLowerCase()){var n="[object SVGAnimatedString]"===m.call(t.prop("href"))?"xlink:href":"href";t.on("click",(function(e){t.attr(n)||e.preventDefault()}))}}}}),Oi={};b(ft,(function(e,t){if("multiple"!=e){var n=Nt("ng-"+t);Oi[n]=function(){return{restrict:"A",priority:100,link:function(e,i,r){e.$watch(r[n],(function(e){r.$set(t,!!e)}))}}}}})),b(gt,(function(e,t){Oi[t]=function(){return{priority:100,link:function(e,n,i){if("ngPattern"===t&&"/"==i.ngPattern.charAt(0)){var s=i.ngPattern.match(r);if(s)return void i.$set("ngPattern",new RegExp(s[1],s[2]))}e.$watch(i[t],(function(e){i.$set(t,e)}))}}}})),b(["src","srcset","href"],(function(e){var t=Nt("ng-"+e);Oi[t]=function(){return{priority:99,link:function(n,i,r){var s=e,o=e;"href"===e&&"[object SVGAnimatedString]"===m.call(i.prop("href"))&&(o="xlinkHref",r.$attr[o]="xlink:href",s=null),r.$observe(t,(function(t){t?(r.$set(o,t),u&&s&&i.prop(s,r[o])):"href"===e&&r.$set(o,null)}))}}}}));var Ni={$addControl:E,$$renameControl:function(e,t){e.$name=t},$removeControl:E,$setValidity:E,$setDirty:E,$setPristine:E,$setSubmitted:E},Fi="ng-submitted";function ji(e,t,i,r,s){var o=this,a=[],l=o.$$parentForm=e.parent().controller("form")||Ni;o.$error={},o.$$success={},o.$pending=n,o.$name=s(t.name||t.ngForm||"")(i),o.$dirty=!1,o.$pristine=!0,o.$valid=!0,o.$invalid=!1,o.$submitted=!1,l.$addControl(o),o.$rollbackViewValue=function(){b(a,(function(e){e.$rollbackViewValue()}))},o.$commitViewValue=function(){b(a,(function(e){e.$commitViewValue()}))},o.$addControl=function(e){xe(e.$name,"input"),a.push(e),e.$name&&(o[e.$name]=e)},o.$$renameControl=function(e,t){var n=e.$name;o[n]===e&&delete o[n],o[t]=e,e.$name=t},o.$removeControl=function(e){e.$name&&o[e.$name]===e&&delete o[e.$name],b(o.$pending,(function(t,n){o.$setValidity(n,null,e)})),b(o.$error,(function(t,n){o.$setValidity(n,null,e)})),b(o.$$success,(function(t,n){o.$setValidity(n,null,e)})),K(a,e)},Nr({ctrl:this,$element:e,set:function(e,t,n){var i=e[t];i?-1===i.indexOf(n)&&i.push(n):e[t]=[n]},unset:function(e,t,n){var i=e[t];i&&(K(i,n),0===i.length&&delete e[t])},parentForm:l,$animate:r}),o.$setDirty=function(){r.removeClass(e,Mr),r.addClass(e,Ar),o.$dirty=!0,o.$pristine=!1,l.$setDirty()},o.$setPristine=function(){r.setClass(e,Mr,Ar+" "+Fi),o.$dirty=!1,o.$pristine=!0,o.$submitted=!1,b(a,(function(e){e.$setPristine()}))},o.$setUntouched=function(){b(a,(function(e){e.$setUntouched()}))},o.$setSubmitted=function(){r.addClass(e,Fi),o.$submitted=!0,l.$setSubmitted()}}ji.$inject=["$element","$attrs","$scope","$animate","$interpolate"];var Bi=function(e){return["$timeout",function(t){return{name:"form",restrict:e?"EAC":"E",controller:ji,compile:function(i,r){i.addClass(Mr).addClass(kr);var s=r.name?"name":!(!e||!r.ngForm)&&"ngForm";return{pre:function(e,i,r,o){if(!("action"in r)){var a=function(t){e.$apply((function(){o.$commitViewValue(),o.$setSubmitted()})),t.preventDefault()};Oe(i[0],"submit",a),i.on("$destroy",(function(){t((function(){Ne(i[0],"submit",a)}),0,!1)}))}var l=o.$$parentForm;s&&(Fn(e,null,o.$name,o,o.$name),r.$observe(s,(function(t){o.$name!==t&&(Fn(e,null,o.$name,n,o.$name),l.$$renameControl(o,t),Fn(e,null,o.$name,o,o.$name))}))),i.on("$destroy",(function(){l.$removeControl(o),s&&Fn(e,null,r[s],n,o.$name),_(o,Ni)}))}}}}}]},Ui=Bi(),Hi=Bi(!0),Wi=/\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/,zi=/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/,Vi=/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i,qi=/^\s*(\-|\+)?(\d+|(\d*(\.\d*)))\s*$/,Yi=/^(\d{4})-(\d{2})-(\d{2})$/,Gi=/^(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,Ki=/^(\d{4})-W(\d\d)$/,Qi=/^(\d{4})-(\d\d)$/,Ji=/^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,Xi={text:function(e,t,n,i,r,s){er(e,t,n,i,r,s),Zi(i)},date:nr("date",Yi,tr(Yi,["yyyy","MM","dd"]),"yyyy-MM-dd"),"datetime-local":nr("datetimelocal",Gi,tr(Gi,["yyyy","MM","dd","HH","mm","ss","sss"]),"yyyy-MM-ddTHH:mm:ss.sss"),time:nr("time",Ji,tr(Ji,["HH","mm","ss","sss"]),"HH:mm:ss.sss"),week:nr("week",Ki,(function(e,t){if(N(e))return e;if(D(e)){Ki.lastIndex=0;var n=Ki.exec(e);if(n){var i=+n[1],r=+n[2],s=0,o=0,a=0,l=0,u=Si(i),c=7*(r-1);return t&&(s=t.getHours(),o=t.getMinutes(),a=t.getSeconds(),l=t.getMilliseconds()),new Date(i,0,u.getDate()+c,s,o,a,l)}}return NaN}),"yyyy-Www"),month:nr("month",Qi,tr(Qi,["yyyy","MM"]),"yyyy-MM"),number:function(e,t,i,r,s,o){if(ir(e,t,i,r),er(e,t,i,r,s,o),r.$$parserName="number",r.$parsers.push((function(e){return r.$isEmpty(e)?null:qi.test(e)?parseFloat(e):n})),r.$formatters.push((function(e){if(!r.$isEmpty(e)){if(!O(e))throw Lr("numfmt","Expected `{0}` to be a number",e);e=e.toString()}return e})),P(i.min)||i.ngMin){var a;r.$validators.min=function(e){return r.$isEmpty(e)||L(a)||e>=a},i.$observe("min",(function(e){P(e)&&!O(e)&&(e=parseFloat(e,10)),a=O(e)&&!isNaN(e)?e:n,r.$validate()}))}if(P(i.max)||i.ngMax){var l;r.$validators.max=function(e){return r.$isEmpty(e)||L(l)||e<=l},i.$observe("max",(function(e){P(e)&&!O(e)&&(e=parseFloat(e,10)),l=O(e)&&!isNaN(e)?e:n,r.$validate()}))}},url:function(e,t,n,i,r,s){er(e,t,n,i,r,s),Zi(i),i.$$parserName="url",i.$validators.url=function(e,t){var n=e||t;return i.$isEmpty(n)||zi.test(n)}},email:function(e,t,n,i,r,s){er(e,t,n,i,r,s),Zi(i),i.$$parserName="email",i.$validators.email=function(e,t){var n=e||t;return i.$isEmpty(n)||Vi.test(n)}},radio:function(e,t,n,i){L(n.name)&&t.attr("name",C());t.on("click",(function(e){t[0].checked&&i.$setViewValue(n.value,e&&e.type)})),i.$render=function(){var e=n.value;t[0].checked=e==i.$viewValue},n.$observe("value",i.$render)},checkbox:function(e,t,n,i,r,s,o,a){var l=rr(a,e,"ngTrueValue",n.ngTrueValue,!0),u=rr(a,e,"ngFalseValue",n.ngFalseValue,!1);t.on("click",(function(e){i.$setViewValue(t[0].checked,e&&e.type)})),i.$render=function(){t[0].checked=i.$viewValue},i.$isEmpty=function(e){return!1===e},i.$formatters.push((function(e){return X(e,l)})),i.$parsers.push((function(e){return e?l:u}))},hidden:E,button:E,submit:E,reset:E,file:E};function Zi(e){e.$formatters.push((function(t){return e.$isEmpty(t)?t:t.toString()}))}function er(e,t,n,i,r,s){var a=o(t[0].type);if(!r.android){var l=!1;t.on("compositionstart",(function(e){l=!0})),t.on("compositionend",(function(){l=!1,u()}))}var u=function(e){if(c&&(s.defer.cancel(c),c=null),!l){var r=t.val(),o=e&&e.type;"password"===a||n.ngTrim&&"false"===n.ngTrim||(r=V(r)),(i.$viewValue!==r||""===r&&i.$$hasNativeValidators)&&i.$setViewValue(r,o)}};if(r.hasEvent("input"))t.on("input",u);else{var c,h=function(e,t,n){c||(c=s.defer((function(){c=null,t&&t.value===n||u(e)})))};t.on("keydown",(function(e){var t=e.keyCode;91===t||15<t&&t<19||37<=t&&t<=40||h(e,this,this.value)})),r.hasEvent("paste")&&t.on("paste cut",h)}t.on("change",u),i.$render=function(){t.val(i.$isEmpty(i.$viewValue)?"":i.$viewValue)}}function tr(e,t){return function(n,i){var r,s;if(N(n))return n;if(D(n)){if('"'==n.charAt(0)&&'"'==n.charAt(n.length-1)&&(n=n.substring(1,n.length-1)),Wi.test(n))return new Date(n);if(e.lastIndex=0,r=e.exec(n))return r.shift(),s=i?{yyyy:i.getFullYear(),MM:i.getMonth()+1,dd:i.getDate(),HH:i.getHours(),mm:i.getMinutes(),ss:i.getSeconds(),sss:i.getMilliseconds()/1e3}:{yyyy:1970,MM:1,dd:1,HH:0,mm:0,ss:0,sss:0},b(r,(function(e,n){n<t.length&&(s[t[n]]=+e)})),new Date(s.yyyy,s.MM-1,s.dd,s.HH,s.mm,s.ss||0,1e3*s.sss||0)}return NaN}}function nr(e,t,i,r){return function(s,o,a,l,u,c,h){ir(s,o,a,l),er(0,o,a,l,u,c);var d,f,p,g=l&&l.$options&&l.$options.timezone;(l.$$parserName=e,l.$parsers.push((function(e){if(l.$isEmpty(e))return null;if(t.test(e)){var r=i(e,d);return"UTC"===g&&r.setMinutes(r.getMinutes()-r.getTimezoneOffset()),r}return n})),l.$formatters.push((function(e){if(e&&!N(e))throw Lr("datefmt","Expected `{0}` to be a date",e);if(m(e)){if((d=e)&&"UTC"===g){var t=6e4*d.getTimezoneOffset();d=new Date(d.getTime()+t)}return h("date")(e,r,g)}return d=null,""})),P(a.min)||a.ngMin)&&(l.$validators.min=function(e){return!m(e)||L(f)||i(e)>=f},a.$observe("min",(function(e){f=v(e),l.$validate()})));(P(a.max)||a.ngMax)&&(l.$validators.max=function(e){return!m(e)||L(p)||i(e)<=p},a.$observe("max",(function(e){p=v(e),l.$validate()})));function m(e){return e&&!(e.getTime&&e.getTime()!=e.getTime())}function v(e){return P(e)?N(e)?e:i(e):n}}}function ir(e,t,i,r){var o=t[0];(r.$$hasNativeValidators=I(o.validity))&&r.$parsers.push((function(e){var i=t.prop(s)||{};return i.badInput&&!i.typeMismatch?n:e}))}function rr(e,t,n,i,r){var s;if(P(i)){if(!(s=e(i)).constant)throw Lr("constexpr","Expected constant expression for `{0}`, but saw `{1}`.",n,i);return s(t)}return r}var sr=["$browser","$sniffer","$filter","$parse",function(e,t,n,i){return{restrict:"E",require:["?ngModel"],link:{pre:function(r,s,a,l){l[0]&&(Xi[o(a.type)]||Xi.text)(r,s,a,l[0],t,e,n,i)}}}}],or=/^(true|false|\d+)$/,ar=function(){return{restrict:"A",priority:100,compile:function(e,t){return or.test(t.ngValue)?function(e,t,n){n.$set("value",e.$eval(n.ngValue))}:function(e,t,n){e.$watch(n.ngValue,(function(e){n.$set("value",e)}))}}}},lr=["$compile",function(e){return{restrict:"AC",compile:function(t){return e.$$addBindingClass(t),function(t,i,r){e.$$addBindingInfo(i,r.ngBind),i=i[0],t.$watch(r.ngBind,(function(e){i.textContent=e===n?"":e}))}}}}],ur=["$interpolate","$compile",function(e,t){return{compile:function(i){return t.$$addBindingClass(i),function(i,r,s){var o=e(r.attr(s.$attr.ngBindTemplate));t.$$addBindingInfo(r,o.expressions),r=r[0],s.$observe("ngBindTemplate",(function(e){r.textContent=e===n?"":e}))}}}}],cr=["$sce","$parse","$compile",function(e,t,n){return{restrict:"A",compile:function(i,r){var s=t(r.ngBindHtml),o=t(r.ngBindHtml,(function(e){return(e||"").toString()}));return n.$$addBindingClass(i),function(t,i,r){n.$$addBindingInfo(i,r.ngBindHtml),t.$watch(o,(function(){i.html(e.getTrustedHtml(s(t))||"")}))}}}}],hr=T({restrict:"A",require:"ngModel",link:function(e,t,n,i){i.$viewChangeListeners.push((function(){e.$eval(n.ngChange)}))}});function dr(e,t){return e="ngClass"+e,["$animate",function(n){return{restrict:"AC",link:function(s,o,a){var l;function u(e){var t=c(e,1);a.$addClass(t)}function c(e,t){var n=o.data("$classCounts")||{},i=[];return b(e,(function(e){(t>0||n[e])&&(n[e]=(n[e]||0)+t,n[e]===+(t>0)&&i.push(e))})),o.data("$classCounts",n),i.join(" ")}function h(e){if(!0===t||s.$index%2===t){var a=r(e||[]);if(l){if(!X(e,l)){!function(e,t){var r=i(t,e),s=i(e,t);r=c(r,1),s=c(s,-1),r&&r.length&&n.addClass(o,r),s&&s.length&&n.removeClass(o,s)}(r(l),a)}}else u(a)}l=J(e)}s.$watch(a[e],h,!0),a.$observe("class",(function(t){h(s.$eval(a[e]))})),"ngClass"!==e&&s.$watch("$index",(function(n,i){var o=1&n;if(o!==(1&i)){var l=r(s.$eval(a[e]));o===t?u(l):function(e){var t=c(e,-1);a.$removeClass(t)}(l)}}))}};function i(e,t){var n=[];e:for(var i=0;i<e.length;i++){for(var r=e[i],s=0;s<t.length;s++)if(r==t[s])continue e;n.push(r)}return n}function r(e){if(F(e))return e;if(D(e))return e.split(" ");if(I(e)){var t=[];return b(e,(function(e,n){e&&(t=t.concat(n.split(" ")))})),t}return e}}]}var fr=dr("",!0),pr=dr("Odd",0),gr=dr("Even",1),mr=Ii({compile:function(e,t){t.$set("ngCloak",n),e.removeClass("ng-cloak")}}),vr=[function(){return{restrict:"A",scope:!0,controller:"@",priority:500}}],yr={},$r={blur:!0,focus:!0};b("click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste".split(" "),(function(e){var t=Nt("ng-"+e);yr[t]=["$parse","$rootScope",function(n,i){return{restrict:"A",compile:function(r,s){var o=n(s[t],null,!0);return function(t,n){n.on(e,(function(n){var r=function(){o(t,{$event:n})};$r[e]&&i.$$phase?t.$evalAsync(r):t.$apply(r)}))}}}}]}));var wr=["$animate",function(e){return{multiElement:!0,transclude:"element",priority:600,terminal:!0,restrict:"A",$$tlb:!0,link:function(n,i,r,s,o){var a,l,u;n.$watch(r.ngIf,(function(n){n?l||o((function(n,s){l=s,n[n.length++]=t.createComment(" end ngIf: "+r.ngIf+" "),a={clone:n},e.enter(n,i.parent(),i)})):(u&&(u.remove(),u=null),l&&(l.$destroy(),l=null),a&&(u=ke(a.clone),e.leave(u).then((function(){u=null})),a=null))}))}}}],br=["$templateRequest","$anchorScroll","$animate",function(e,t,n){return{restrict:"ECA",priority:400,terminal:!0,transclude:"element",controller:y.noop,compile:function(i,r){var s=r.ngInclude||r.src,o=r.onload||"",a=r.autoscroll;return function(i,r,l,u,c){var h,d,f,p=0,g=function(){d&&(d.remove(),d=null),h&&(h.$destroy(),h=null),f&&(n.leave(f).then((function(){d=null})),d=f,f=null)};i.$watch(s,(function(s){var l=function(){!P(a)||a&&!i.$eval(a)||t()},d=++p;s?(e(s,!0).then((function(e){if(d===p){var t=i.$new();u.template=e;var a=c(t,(function(e){g(),n.enter(e,null,r).then(l)}));f=a,(h=t).$emit("$includeContentLoaded",s),i.$eval(o)}}),(function(){d===p&&(g(),i.$emit("$includeContentError",s))})),i.$emit("$includeContentRequested",s)):(g(),u.template=null)}))}}}}],Sr=["$compile",function(e){return{restrict:"ECA",priority:-400,require:"ngInclude",link:function(n,i,r,s){if(/SVG/.test(i[0].toString()))return i.empty(),void e(Qe(s.template,t).childNodes)(n,(function(e){i.append(e)}),{futureParentElement:i});i.html(s.template),e(i.contents())(n)}}}],xr=Ii({priority:450,compile:function(){return{pre:function(e,t,n){e.$eval(n.ngInit)}}}}),Cr=function(){return{restrict:"A",priority:100,require:"ngModel",link:function(e,t,i,r){var s=t.attr(i.$attr.ngList)||", ",o="false"!==i.ngTrim,a=o?V(s):s;r.$parsers.push((function(e){if(!L(e)){var t=[];return e&&b(e.split(a),(function(e){e&&t.push(o?V(e):e)})),t}})),r.$formatters.push((function(e){return F(e)?e.join(s):n})),r.$isEmpty=function(e){return!e||!e.length}}}},kr="ng-valid",_r="ng-invalid",Mr="ng-pristine",Ar="ng-dirty",Er="ng-untouched",Rr="ng-touched",Tr="ng-pending",Lr=i("ngModel"),Pr=["$scope","$exceptionHandler","$attrs","$element","$parse","$animate","$timeout","$rootScope","$q","$interpolate",function(e,t,i,r,s,o,a,l,u,c){this.$viewValue=Number.NaN,this.$modelValue=Number.NaN,this.$$rawModelValue=n,this.$validators={},this.$asyncValidators={},this.$parsers=[],this.$formatters=[],this.$viewChangeListeners=[],this.$untouched=!0,this.$touched=!1,this.$pristine=!0,this.$dirty=!1,this.$valid=!0,this.$invalid=!1,this.$error={},this.$$success={},this.$pending=n,this.$name=c(i.name||"",!1)(e);var h,d=s(i.ngModel),f=d.assign,p=d,g=f,m=null,v=this;this.$$setOptions=function(e){if(v.$options=e,e&&e.getterSetter){var t=s(i.ngModel+"()"),n=s(i.ngModel+"($$$p)");p=function(e){var n=d(e);return j(n)&&(n=t(e)),n},g=function(e,t){j(d(e))?n(e,{$$$p:v.$modelValue}):f(e,v.$modelValue)}}else if(!d.assign)throw Lr("nonassign","Expression '{0}' is non-assignable. Element: {1}",i.ngModel,oe(r))},this.$render=E,this.$isEmpty=function(e){return L(e)||""===e||null===e||e!=e};var y=r.inheritedData("$formController")||Ni,$=0;Nr({ctrl:this,$element:r,set:function(e,t){e[t]=!0},unset:function(e,t){delete e[t]},parentForm:y,$animate:o}),this.$setPristine=function(){v.$dirty=!1,v.$pristine=!0,o.removeClass(r,Ar),o.addClass(r,Mr)},this.$setDirty=function(){v.$dirty=!0,v.$pristine=!1,o.removeClass(r,Mr),o.addClass(r,Ar),y.$setDirty()},this.$setUntouched=function(){v.$touched=!1,v.$untouched=!0,o.setClass(r,Er,Rr)},this.$setTouched=function(){v.$touched=!0,v.$untouched=!1,o.setClass(r,Rr,Er)},this.$rollbackViewValue=function(){a.cancel(m),v.$viewValue=v.$$lastCommittedViewValue,v.$render()},this.$validate=function(){if(!O(v.$modelValue)||!isNaN(v.$modelValue)){var e=v.$$lastCommittedViewValue,t=v.$$rawModelValue,i=v.$valid,r=v.$modelValue,s=v.$options&&v.$options.allowInvalid;v.$$runValidators(t,e,(function(e){s||i===e||(v.$modelValue=e?t:n,v.$modelValue!==r&&v.$$writeModelToScope())}))}},this.$$runValidators=function(e,t,i){var r,s,o=++$;(function(){var e=v.$$parserName||"parse";if(h!==n)return h||(b(v.$validators,(function(e,t){a(t,null)})),b(v.$asyncValidators,(function(e,t){a(t,null)}))),a(e,h),h;a(e,null);return!0})()?!function(){var n=!0;if(b(v.$validators,(function(i,r){var s=i(e,t);n=n&&s,a(r,s)})),!n)return b(v.$asyncValidators,(function(e,t){a(t,null)})),!1;return!0}()?l(!1):(r=[],s=!0,b(v.$asyncValidators,(function(i,o){var l=i(e,t);if(!z(l))throw Lr("$asyncValidators","Expected asynchronous validator to return a promise but got '{0}' instead.",l);a(o,n),r.push(l.then((function(){a(o,!0)}),(function(e){s=!1,a(o,!1)})))})),r.length?u.all(r).then((function(){l(s)}),E):l(!0)):l(!1);function a(e,t){o===$&&v.$setValidity(e,t)}function l(e){o===$&&i(e)}},this.$commitViewValue=function(){var e=v.$viewValue;a.cancel(m),(v.$$lastCommittedViewValue!==e||""===e&&v.$$hasNativeValidators)&&(v.$$lastCommittedViewValue=e,v.$pristine&&this.$setDirty(),this.$$parseAndValidate())},this.$$parseAndValidate=function(){var t=v.$$lastCommittedViewValue;if(h=!L(t)||n)for(var i=0;i<v.$parsers.length;i++)if(L(t=v.$parsers[i](t))){h=!1;break}O(v.$modelValue)&&isNaN(v.$modelValue)&&(v.$modelValue=p(e));var r=v.$modelValue,s=v.$options&&v.$options.allowInvalid;function o(){v.$modelValue!==r&&v.$$writeModelToScope()}v.$$rawModelValue=t,s&&(v.$modelValue=t,o()),v.$$runValidators(t,v.$$lastCommittedViewValue,(function(e){s||(v.$modelValue=e?t:n,o())}))},this.$$writeModelToScope=function(){g(e,v.$modelValue),b(v.$viewChangeListeners,(function(e){try{e()}catch(e){t(e)}}))},this.$setViewValue=function(e,t){v.$viewValue=e,v.$options&&!v.$options.updateOnDefault||v.$$debounceViewValueCommit(t)},this.$$debounceViewValueCommit=function(t){var n,i=0,r=v.$options;r&&P(r.debounce)&&(O(n=r.debounce)?i=n:O(n[t])?i=n[t]:O(n.default)&&(i=n.default)),a.cancel(m),i?m=a((function(){v.$commitViewValue()}),i):l.$$phase?v.$commitViewValue():e.$apply((function(){v.$commitViewValue()}))},e.$watch((function(){var t=p(e);if(t!==v.$modelValue&&(v.$modelValue==v.$modelValue||t==t)){v.$modelValue=v.$$rawModelValue=t,h=n;for(var i=v.$formatters,r=i.length,s=t;r--;)s=i[r](s);v.$viewValue!==s&&(v.$viewValue=v.$$lastCommittedViewValue=s,v.$render(),v.$$runValidators(t,s,E))}return t}))}],Ir=["$rootScope",function(e){return{restrict:"A",require:["ngModel","^?form","^?ngModelOptions"],controller:Pr,priority:1,compile:function(t){return t.addClass(Mr).addClass(Er).addClass(kr),{pre:function(e,t,n,i){var r=i[0],s=i[1]||Ni;r.$$setOptions(i[2]&&i[2].$options),s.$addControl(r),n.$observe("name",(function(e){r.$name!==e&&s.$$renameControl(r,e)})),e.$on("$destroy",(function(){s.$removeControl(r)}))},post:function(t,n,i,r){var s=r[0];s.$options&&s.$options.updateOn&&n.on(s.$options.updateOn,(function(e){s.$$debounceViewValueCommit(e&&e.type)})),n.on("blur",(function(n){s.$touched||(e.$$phase?t.$evalAsync(s.$setTouched):t.$apply(s.$setTouched))}))}}}}}],Dr=/(\s+|^)default(\s+|$)/,Or=function(){return{restrict:"A",controller:["$scope","$attrs",function(e,t){var i=this;this.$options=e.$eval(t.ngModelOptions),this.$options.updateOn!==n?(this.$options.updateOnDefault=!1,this.$options.updateOn=V(this.$options.updateOn.replace(Dr,(function(){return i.$options.updateOnDefault=!0," "})))):this.$options.updateOnDefault=!0}]}};function Nr(e){var t=e.ctrl,i=e.$element,r={},s=e.set,o=e.unset,a=e.parentForm,l=e.$animate;function u(e,t){t&&!r[e]?(l.addClass(i,e),r[e]=!0):!t&&r[e]&&(l.removeClass(i,e),r[e]=!1)}function c(e,t){e=e?"-"+ye(e,"-"):"",u(kr+e,!0===t),u(_r+e,!1===t)}r[_r]=!(r[kr]=i.hasClass(kr)),t.$setValidity=function(e,i,r){i===n?function(e,n,i){t[e]||(t[e]={});s(t[e],n,i)}("$pending",e,r):function(e,i,r){t[e]&&o(t[e],i,r);Fr(t[e])&&(t[e]=n)}("$pending",e,r);W(i)?i?(o(t.$error,e,r),s(t.$$success,e,r)):(s(t.$error,e,r),o(t.$$success,e,r)):(o(t.$error,e,r),o(t.$$success,e,r));t.$pending?(u(Tr,!0),t.$valid=t.$invalid=n,c("",null)):(u(Tr,!1),t.$valid=Fr(t.$error),t.$invalid=!t.$valid,c("",t.$valid));var l;l=t.$pending&&t.$pending[e]?n:!t.$error[e]&&(!!t.$$success[e]||null);c(e,l),a.$setValidity(e,l,t)}}function Fr(e){if(e)for(var t in e)return!1;return!0}var jr,Br=Ii({terminal:!0,priority:1e3}),Ur=["$locale","$interpolate",function(e,t){var n=/{}/g,i=/^when(Minus)?(.+)$/;return{restrict:"EA",link:function(r,s,a){var l,u=a.count,c=a.$attr.when&&s.attr(a.$attr.when),h=a.offset||0,d=r.$eval(c)||{},f={},p=t.startSymbol(),g=t.endSymbol(),m=p+u+"-"+h+g,v=y.noop;function $(e){s.text(e||"")}b(a,(function(e,t){var n=i.exec(t);if(n){var r=(n[1]?"-":"")+o(n[2]);d[r]=s.attr(a.$attr[t])}})),b(d,(function(e,i){f[i]=t(e.replace(n,m))})),r.$watch(u,(function(t){var n=parseFloat(t),i=isNaN(n);i||n in d||(n=e.pluralCat(n-h)),n===l||i&&isNaN(l)||(v(),v=r.$watch(f[n],$),l=n)}))}}}],Hr=["$parse","$animate",function(e,r){var s="$$NG_REMOVED",o=i("ngRepeat"),a=function(e,t,n,i,r,s,o){e[n]=i,r&&(e[r]=s),e.$index=t,e.$first=0===t,e.$last=t===o-1,e.$middle=!(e.$first||e.$last),e.$odd=!(e.$even=0==(1&t))},l=function(e){return e.clone[0]},u=function(e){return e.clone[e.clone.length-1]};return{restrict:"A",multiElement:!0,transclude:"element",priority:1e3,terminal:!0,$$tlb:!0,compile:function(i,h){var d=h.ngRepeat,f=t.createComment(" end ngRepeat: "+d+" "),p=d.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+track\s+by\s+([\s\S]+?))?\s*$/);if(!p)throw o("iexp","Expected expression in form of '_item_ in _collection_[ track by _id_]' but got '{0}'.",d);var g=p[1],m=p[2],v=p[3],y=p[4];if(!(p=g.match(/^(?:(\s*[\$\w]+)|\(\s*([\$\w]+)\s*,\s*([\$\w]+)\s*\))$/)))throw o("iidexp","'_item_' in '_item_ in _collection_' should be an identifier or '(_key_, _value_)' expression, but got '{0}'.",g);var $,S,x,C,k=p[3]||p[1],_=p[2];if(v&&(!/^[$a-zA-Z_][$a-zA-Z0-9_]*$/.test(v)||/^(null|undefined|this|\$index|\$first|\$middle|\$last|\$even|\$odd|\$parent|\$root|\$id)$/.test(v)))throw o("badident","alias '{0}' is invalid --- must be a valid JS identifier which is not a reserved name.",v);var M={$id:yt};return y?$=e(y):(x=function(e,t){return yt(t)},C=function(e){return e}),function(e,t,i,h,p){$&&(S=function(t,n,i){return _&&(M[_]=t),M[k]=n,M.$index=i,$(e,M)});var g=_e();e.$watchCollection(m,(function(i){var h,m,y,$,M,A,E,R,T,L,P,I,D=t[0],O=_e();if(v&&(e[v]=i),w(i))T=i,R=S||x;else{for(var N in R=S||C,T=[],i)i.hasOwnProperty(N)&&"$"!=N.charAt(0)&&T.push(N);T.sort()}for($=T.length,P=new Array($),h=0;h<$;h++)if(M=i===T?h:T[h],A=i[M],E=R(M,A,h),g[E])L=g[E],delete g[E],O[E]=L,P[h]=L;else{if(O[E])throw b(P,(function(e){e&&e.scope&&(g[e.id]=e)})),o("dupes","Duplicates in a repeater are not allowed. Use 'track by' expression to specify unique keys. Repeater: {0}, Duplicate key: {1}, Duplicate value: {2}",d,E,A);P[h]={id:E,scope:n,clone:n},O[E]=!0}for(var F in g){if(I=ke((L=g[F]).clone),r.leave(I),I[0].parentNode)for(h=0,m=I.length;h<m;h++)I[h][s]=!0;L.scope.$destroy()}for(h=0;h<$;h++)if(M=i===T?h:T[h],A=i[M],(L=P[h]).scope){y=D;do{y=y.nextSibling}while(y&&y[s]);l(L)!=y&&r.move(ke(L.clone),null,c(D)),D=u(L),a(L.scope,h,k,A,_,M,$)}else p((function(e,t){L.scope=t;var n=f.cloneNode(!1);e[e.length++]=n,r.enter(e,null,c(D)),D=n,L.clone=e,O[L.id]=L,a(L.scope,h,k,A,_,M,$)}));g=O}))}}}}],Wr="ng-hide",zr="ng-hide-animate",Vr=["$animate",function(e){return{restrict:"A",multiElement:!0,link:function(t,n,i){t.$watch(i.ngShow,(function(t){e[t?"removeClass":"addClass"](n,Wr,{tempClasses:zr})}))}}}],qr=["$animate",function(e){return{restrict:"A",multiElement:!0,link:function(t,n,i){t.$watch(i.ngHide,(function(t){e[t?"addClass":"removeClass"](n,Wr,{tempClasses:zr})}))}}}],Yr=Ii((function(e,t,n){e.$watch(n.ngStyle,(function(e,n){n&&e!==n&&b(n,(function(e,n){t.css(n,"")})),e&&t.css(e)}),!0)})),Gr=["$animate",function(e){return{restrict:"EA",require:"ngSwitch",controller:["$scope",function(){this.cases={}}],link:function(n,i,r,s){var o=r.ngSwitch||r.on,a=[],l=[],u=[],c=[],h=function(e,t){return function(){e.splice(t,1)}};n.$watch(o,(function(n){var i,r;for(i=0,r=u.length;i<r;++i)e.cancel(u[i]);for(u.length=0,i=0,r=c.length;i<r;++i){var o=ke(l[i].clone);c[i].$destroy(),(u[i]=e.leave(o)).then(h(u,i))}l.length=0,c.length=0,(a=s.cases["!"+n]||s.cases["?"])&&b(a,(function(n){n.transclude((function(i,r){c.push(r);var s=n.element;i[i.length++]=t.createComment(" end ngSwitchWhen: ");var o={clone:i};l.push(o),e.enter(i,s.parent(),s)}))}))}))}}}],Kr=Ii({transclude:"element",priority:1200,require:"^ngSwitch",multiElement:!0,link:function(e,t,n,i,r){i.cases["!"+n.ngSwitchWhen]=i.cases["!"+n.ngSwitchWhen]||[],i.cases["!"+n.ngSwitchWhen].push({transclude:r,element:t})}}),Qr=Ii({transclude:"element",priority:1200,require:"^ngSwitch",multiElement:!0,link:function(e,t,n,i,r){i.cases["?"]=i.cases["?"]||[],i.cases["?"].push({transclude:r,element:t})}}),Jr=Ii({restrict:"EAC",link:function(e,t,n,r,s){if(!s)throw i("ngTransclude")("orphan","Illegal use of ngTransclude directive in the template! No parent directive that requires a transclusion found. Element: {0}",oe(t));s((function(e){t.empty(),t.append(e)}))}}),Xr=["$templateCache",function(e){return{restrict:"E",terminal:!0,compile:function(t,n){if("text/ng-template"==n.type){var i=n.id,r=t[0].text;e.put(i,r)}}}}],Zr=i("ngOptions"),es=T({restrict:"A",terminal:!0}),ts=["$compile","$parse",function(e,i){var r=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,s={$setViewValue:E};return{restrict:"E",require:["select","?ngModel"],controller:["$element","$scope","$attrs",function(e,t,n){var i,r=this,o={},a=s;r.databound=n.ngModel,r.init=function(e,t,n){a=e,t,i=n},r.addOption=function(t,n){xe(t,'"option value"'),o[t]=!0,a.$viewValue==t&&(e.val(t),i.parent()&&i.remove()),n&&n[0].hasAttribute("selected")&&(n[0].selected=!0)},r.removeOption=function(e){this.hasOption(e)&&(delete o[e],a.$viewValue===e&&this.renderUnknownOption(e))},r.renderUnknownOption=function(t){var n="? "+yt(t)+" ?";i.val(n),e.prepend(i),e.val(n),i.prop("selected",!0)},r.hasOption=function(e){return o.hasOwnProperty(e)},t.$on("$destroy",(function(){r.renderUnknownOption=E}))}],link:function(s,o,a,l){if(l[1]){for(var h,d=l[0],f=l[1],p=a.multiple,g=a.ngOptions,m=!1,v=!1,y=c(t.createElement("option")),$=c(t.createElement("optgroup")),w=y.clone(),x=0,C=o.children(),k=C.length;x<k;x++)if(""===C[x].value){h=m=C.eq(x);break}d.init(f,m,w),p&&(f.$isEmpty=function(e){return!e||0===e.length}),g?function(t,s,o){var a;if(!(a=g.match(r)))throw Zr("iexp","Expected expression in form of '_select_ (as _label_)? for (_key_,)?_value_ in _collection_' but got '{0}'. Element: {1}",g,oe(s));var l=i(a[2]||a[1]),c=a[4]||a[6],h=/ as /.test(a[0])&&a[1],f=h?i(h):null,w=a[5],x=i(a[3]||""),C=i(a[2]?a[1]:c),k=i(a[7]),_=a[8]?i(a[8]):null,M={},A=[[{element:s,label:""}]],E={};m&&(e(m)(t),m.removeClass("ng-scope"),m.remove());s.empty(),s.on("change",T),o.$render=N,t.$watchCollection(k,D),t.$watchCollection(I,D),p&&t.$watchCollection((function(){return o.$modelValue}),D);function R(e,n,i){return E[c]=i,w&&(E[w]=n),e(t,E)}function T(){t.$apply((function(){var e,n=k(t)||[];if(p)e=[],b(s.val(),(function(t){t=_?M[t]:t,e.push(L(t,n[t]))}));else{var i=_?M[s.val()]:s.val();e=L(i,n[i])}o.$setViewValue(e),N()}))}function L(e,t){return"?"===e?n:""===e?null:R(f||C,e,t)}function I(){var e,n=k(t);if(n&&F(n)){e=new Array(n.length);for(var i=0,r=n.length;i<r;i++)e[i]=R(l,i,n[i]);return e}if(n)for(var s in e={},n)n.hasOwnProperty(s)&&(e[s]=R(l,s,n[s]));return e}function D(){v||(t.$$postDigest(N),v=!0)}function O(e,t,n){e[t]=e[t]||0,e[t]+=n?1:-1}function N(){v=!1;var e,n,i,r,a,c,h,g,T,L,I,D,N,j,B,U,H,W={"":[]},z=[""],V=o.$viewValue,q=k(t)||[],Y=w?S(q):q,G={},K=function(e){var t;if(p)if(_&&F(e)){t=new $t([]);for(var n=0;n<e.length;n++)t.put(R(_,null,e[n]),!0)}else t=new $t(e);else _&&(e=R(_,null,e));return function(n,i){var r;return r=_||f||C,p?P(t.remove(R(r,n,i))):e===R(r,n,i)}}(V),Q=!1;for(M={},D=0;D<(L=Y.length);D++)h=D,w&&"$"===(h=Y[D]).charAt(0)||(g=q[h],(n=W[e=R(x,h,g)||""])||(n=W[e]=[],z.push(e)),N=K(h,g),Q=Q||N,U=P(U=R(l,h,g))?U:"",H=_?_(t,E):w?Y[D]:D,_&&(M[H]=h),n.push({id:H,label:U,selected:N}));for(p||(m||null===V?W[""].unshift({id:"",label:"",selected:!Q}):Q||W[""].unshift({id:"?",label:"",selected:!0})),I=0,T=z.length;I<T;I++){for(n=W[e=z[I]],A.length<=I?(a=[r={element:$.clone().attr("label",e),label:n.label}],A.push(a),s.append(r.element)):(r=(a=A[I])[0]).label!=e&&r.element.attr("label",r.label=e),j=null,D=0,L=n.length;D<L;D++)i=n[D],(c=a[D+1])?(j=c.element,c.label!==i.label&&(O(G,c.label,!1),O(G,i.label,!0),j.text(c.label=i.label),j.prop("label",c.label)),c.id!==i.id&&j.val(c.id=i.id),j[0].selected!==i.selected&&(j.prop("selected",c.selected=i.selected),u&&j.prop("selected",c.selected))):(""===i.id&&m?B=m:(B=y.clone()).val(i.id).prop("selected",i.selected).attr("selected",i.selected).prop("label",i.label).text(i.label),a.push(c={element:B,label:i.label,id:i.id,selected:i.selected}),O(G,i.label,!0),j?j.after(B):r.element.append(B),j=B);for(D++;a.length>D;)O(G,(i=a.pop()).label,!1),i.element.remove()}for(;A.length>I;){for(n=A.pop(),D=1;D<n.length;++D)O(G,n[D].label,!1);n[0].element.remove()}b(G,(function(e,t){e>0?d.addOption(t):e<0&&d.removeOption(t)}))}}(s,o,f):p?function(e,t,n){var i;n.$render=function(){var e=new $t(n.$viewValue);b(t.find("option"),(function(t){t.selected=P(e.get(t.value))}))},e.$watch((function(){X(i,n.$viewValue)||(i=J(n.$viewValue),n.$render())})),t.on("change",(function(){e.$apply((function(){var e=[];b(t.find("option"),(function(t){t.selected&&e.push(t.value)})),n.$setViewValue(e)}))}))}(s,o,f):function(e,t,n,i){n.$render=function(){var e=n.$viewValue;i.hasOption(e)?(w.parent()&&w.remove(),t.val(e),""===e&&h.prop("selected",!0)):null==e&&h?t.val(""):i.renderUnknownOption(e)},t.on("change",(function(){e.$apply((function(){w.parent()&&w.remove(),n.$setViewValue(t.val())}))}))}(s,o,f,d)}}}}],ns=["$interpolate",function(e){var t={addOption:E,removeOption:E};return{restrict:"E",priority:100,compile:function(n,i){if(L(i.value)){var r=e(n.text(),!0);r||i.$set("value",n.text())}return function(e,n,i){var s="$selectController",o=n.parent(),a=o.data(s)||o.parent().data(s);a&&a.databound||(a=t),r?e.$watch(r,(function(e,t){i.$set("value",e),t!==e&&a.removeOption(t),a.addOption(e,n)})):a.addOption(i.value,n),n.on("$destroy",(function(){a.removeOption(i.value)}))}}}}],is=T({restrict:"E",terminal:!1}),rs=function(){return{restrict:"A",require:"?ngModel",link:function(e,t,n,i){i&&(n.required=!0,i.$validators.required=function(e,t){return!n.required||!i.$isEmpty(t)},n.$observe("required",(function(){i.$validate()})))}}},ss=function(){return{restrict:"A",require:"?ngModel",link:function(e,t,r,s){if(s){var o,a=r.ngPattern||r.pattern;r.$observe("pattern",(function(e){if(D(e)&&e.length>0&&(e=new RegExp("^"+e+"$")),e&&!e.test)throw i("ngPattern")("noregexp","Expected {0} to be a RegExp but was {1}. Element: {2}",a,e,oe(t));o=e||n,s.$validate()})),s.$validators.pattern=function(e,t){return s.$isEmpty(t)||L(o)||o.test(t)}}}}},os=function(){return{restrict:"A",require:"?ngModel",link:function(e,t,n,i){if(i){var r=-1;n.$observe("maxlength",(function(e){var t=M(e);r=isNaN(t)?-1:t,i.$validate()})),i.$validators.maxlength=function(e,t){return r<0||i.$isEmpty(t)||t.length<=r}}}}},as=function(){return{restrict:"A",require:"?ngModel",link:function(e,t,n,i){if(i){var r=0;n.$observe("minlength",(function(e){r=M(e)||0,i.$validate()})),i.$validators.minlength=function(e,t){return i.$isEmpty(t)||t.length>=r}}}}};e.angular.bootstrap?console.log("WARNING: Tried to load angular more than once."):(we||((h=e.jQuery)&&h.fn.on?(c=h,_(h.fn,{scope:dt.scope,isolateScope:dt.isolateScope,controller:dt.controller,injector:dt.injector,inheritedData:dt.inheritedData}),jr=h.cleanData,h.cleanData=function(e){var t;if($e)$e=!1;else for(var n,i=0;null!=(n=e[i]);i++)(t=h._data(n,"events"))&&t.$destroy&&h(n).triggerHandler("$destroy");jr(e)}):c=Je,y.element=c,we=!0),function(t){_(t,{bootstrap:pe,copy:Q,extend:_,equals:X,element:c,forEach:b,injector:kt,noop:E,bind:ne,toJson:re,fromJson:se,identity:R,isUndefined:L,isDefined:P,isString:D,isFunction:j,isObject:I,isNumber:O,isElement:Y,isArray:F,version:Pe,isDate:N,lowercase:o,uppercase:l,callbacks:{counter:0},getTestability:me,$$minErr:i,$$csp:Z,reloadWithDebugInfo:ge}),d=function(e){var t=i("$injector"),n=i("ng");function r(e,t,n){return e[t]||(e[t]=n())}var s=r(e,"angular",Object);return s.$$minErr=s.$$minErr||i,r(s,"module",(function(){var e={};return function(i,s,o){return function(e,t){if("hasOwnProperty"===e)throw n("badname","hasOwnProperty is not a valid {0} name","module")}(i),s&&e.hasOwnProperty(i)&&(e[i]=null),r(e,i,(function(){if(!s)throw t("nomod","Module '{0}' is not available! You either misspelled the module name or forgot to load it. If registering a module ensure that you specify the dependencies as the second argument.",i);var e=[],n=[],r=[],a=u("$injector","invoke","push",n),l={_invokeQueue:e,_configBlocks:n,_runBlocks:r,requires:s,name:i,provider:u("$provide","provider"),factory:u("$provide","factory"),service:u("$provide","service"),value:u("$provide","value"),constant:u("$provide","constant","unshift"),animation:u("$animateProvider","register"),filter:u("$filterProvider","register"),controller:u("$controllerProvider","register"),directive:u("$compileProvider","directive"),config:a,run:function(e){return r.push(e),this}};return o&&a(o),l;function u(t,n,i,r){return r||(r=e),function(){return r[i||"push"]([t,n,arguments]),l}}}))}}))}(e);try{d("ngLocale")}catch(e){d("ngLocale",[]).provider("$locale",an)}d("ng",["ngLocale"],["$provide",function(e){e.provider({$$sanitizeUri:Jn}),e.provider("$compile",Dt).directive({a:Di,input:sr,textarea:sr,form:Ui,script:Xr,select:ts,style:is,option:ns,ngBind:lr,ngBindHtml:cr,ngBindTemplate:ur,ngClass:fr,ngClassEven:gr,ngClassOdd:pr,ngCloak:mr,ngController:vr,ngForm:Hi,ngHide:qr,ngIf:wr,ngInclude:br,ngInit:xr,ngNonBindable:Br,ngPluralize:Ur,ngRepeat:Hr,ngShow:Vr,ngStyle:Yr,ngSwitch:Gr,ngSwitchWhen:Kr,ngSwitchDefault:Qr,ngOptions:es,ngTransclude:Jr,ngModel:Ir,ngList:Cr,ngChange:hr,pattern:ss,ngPattern:ss,required:rs,ngRequired:rs,minlength:as,ngMinlength:as,maxlength:os,ngMaxlength:os,ngValue:ar,ngModelOptions:Or}).directive({ngInclude:Sr}).directive(Oi).directive(yr),e.provider({$anchorScroll:_t,$animate:At,$browser:Tt,$cacheFactory:Lt,$controller:Ut,$document:Ht,$exceptionHandler:Wt,$filter:di,$interpolate:sn,$interval:on,$http:en,$httpBackend:nn,$location:xn,$log:Cn,$parse:Vn,$rootScope:Qn,$q:qn,$$q:Yn,$sce:ni,$sceDelegate:ti,$sniffer:ii,$templateCache:Pt,$templateRequest:ri,$$testability:si,$timeout:oi,$window:hi,$$rAF:Kn,$$asyncCallback:Et,$$jqLite:vt})}])}(y),c(t).ready((function(){fe(t,pe)})))}(window,document),!window.angular.$$csp()&&window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}</style>'),define("angular",function(e){return function(){return e.angular}}(this)),
+/**
+ * State-based routing for AngularJS
+ * @version v0.2.18
+ * @link http://angular-ui.github.com/
+ * @license MIT License, http://www.opensource.org/licenses/MIT
+ */
+"undefined"!=typeof module&&"undefined"!=typeof exports&&module.exports===exports&&(module.exports="ui.router"),function(e,t,n){var i,r=t.isDefined,s=t.isFunction,o=t.isString,a=t.isObject,l=t.isArray,u=t.forEach,c=t.extend,h=t.copy,d=t.toJson;function f(e,t){return c(new(c((function(){}),{prototype:e})),t)}function p(e){return u(arguments,(function(t){t!==e&&u(t,(function(t,n){e.hasOwnProperty(n)||(e[n]=t)}))})),e}function g(e){if(Object.keys)return Object.keys(e);var t=[];return u(e,(function(e,n){t.push(n)})),t}function m(e,t){if(Array.prototype.indexOf)return e.indexOf(t,Number(arguments[2])||0);var n=e.length>>>0,i=Number(arguments[2])||0;for((i=i<0?Math.ceil(i):Math.floor(i))<0&&(i+=n);i<n;i++)if(i in e&&e[i]===t)return i;return-1}function v(e,t,n,i){var r,s=function(e,t){var n=[];for(var i in e.path){if(e.path[i]!==t.path[i])break;n.push(e.path[i])}return n}(n,i),o={},a=[];for(var l in s)if(s[l]&&s[l].params&&(r=g(s[l].params)).length)for(var u in r)m(a,r[u])>=0||(a.push(r[u]),o[r[u]]=e[r[u]]);return c({},o,t)}function y(e,t,n){if(!n)for(var i in n=[],e)n.push(i);for(var r=0;r<n.length;r++){var s=n[r];if(e[s]!=t[s])return!1}return!0}function $(e,t){var n={};return u(e,(function(e){n[e]=t[e]})),n}function w(e){var t={},n=Array.prototype.concat.apply(Array.prototype,Array.prototype.slice.call(arguments,1));return u(n,(function(n){n in e&&(t[n]=e[n])})),t}function b(e){var t={},n=Array.prototype.concat.apply(Array.prototype,Array.prototype.slice.call(arguments,1));for(var i in e)-1==m(n,i)&&(t[i]=e[i]);return t}function S(e,t){var n=l(e),i=n?[]:{};return u(e,(function(e,r){t(e,r)&&(i[n?i.length:r]=e)})),i}function x(e,t){var n=l(e)?[]:{};return u(e,(function(e,i){n[i]=t(e,i)})),n}function C(e,t){var i={},s=[],l=i,h=c(e.when(i),{$$promises:i,$$values:i});this.study=function(i){if(!a(i))throw new Error("'invocables' must be an object");var d=g(i||{}),f=[],v=[],y={};function $(e){return a(e)&&e.then&&e.$$promises}return u(i,(function e(n,r){if(2!==y[r]){if(v.push(r),1===y[r])throw v.splice(0,m(v,r)),new Error("Cyclic dependency: "+v.join(" -> "));if(y[r]=1,o(n))f.push(r,[function(){return t.get(n)}],s);else{var a=t.annotate(n);u(a,(function(t){t!==r&&i.hasOwnProperty(t)&&e(i[t],t)})),f.push(r,n,a)}v.pop(),y[r]=2}})),i=v=y=null,function(i,s,o){if($(i)&&o===n&&(o=s,s=i,i=null),i){if(!a(i))throw new Error("'locals' must be an object")}else i=l;if(s){if(!$(s))throw new Error("'parent' must be a promise returned by $resolve.resolve()")}else s=h;var g=e.defer(),m=g.promise,v=m.$$promises={},y=c({},i),w=1+f.length/3,S=!1;function x(){--w||(S||p(y,s.$$values),m.$$values=y,m.$$promises=m.$$promises||!0,delete m.$$inheritedValues,g.resolve(y))}function C(e){m.$$failure=e,g.reject(e)}if(r(s.$$failure))return C(s.$$failure),m;s.$$inheritedValues&&p(y,b(s.$$inheritedValues,d)),c(v,s.$$promises),s.$$values?(S=p(y,b(s.$$values,d)),m.$$inheritedValues=b(s.$$values,d),x()):(s.$$inheritedValues&&(m.$$inheritedValues=b(s.$$inheritedValues,d)),s.then(x,C));for(var k=0,_=f.length;k<_;k+=3)i.hasOwnProperty(f[k])?x():M(f[k],f[k+1],f[k+2]);function M(n,s,a){var l=e.defer(),c=0;function h(e){l.reject(e),C(e)}function d(){if(!r(m.$$failure))try{l.resolve(t.invoke(s,o,y)),l.promise.then((function(e){y[n]=e,x()}),h)}catch(e){h(e)}}u(a,(function(e){v.hasOwnProperty(e)&&!i.hasOwnProperty(e)&&(c++,v[e].then((function(t){y[e]=t,--c||d()}),h))})),c||d(),v[n]=l.promise}return m}},this.resolve=function(e,t,n,i){return this.study(e)(t,n,i)}}function k(e,t,n){this.fromConfig=function(e,t,n){return r(e.template)?this.fromString(e.template,t):r(e.templateUrl)?this.fromUrl(e.templateUrl,t):r(e.templateProvider)?this.fromProvider(e.templateProvider,t,n):null},this.fromString=function(e,t){return s(e)?e(t):e},this.fromUrl=function(n,i){return s(n)&&(n=n(i)),null==n?null:e.get(n,{cache:t,headers:{Accept:"text/html"}}).then((function(e){return e.data}))},this.fromProvider=function(e,t,i){return n.invoke(e,null,i||{params:t})}}function _(e,t,r){t=c({params:{}},a(t)?t:{});var s,o,l,u,h=/([:*])([\w\[\]]+)|\{([\w\[\]]+)(?:\:\s*((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g,d=/([:]?)([\w\[\].-]+)|\{([\w\[\].-]+)(?:\:\s*((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g,p="^",g=0,m=this.segments=[],v=r?r.params:{},y=this.params=r?r.params.$$new():new i.ParamSet,$=[];function w(t,n,r,s){if($.push(t),v[t])return v[t];if(!/^\w+([-.]+\w+)*(?:\[\])?$/.test(t))throw new Error("Invalid parameter name '"+t+"' in pattern '"+e+"'");if(y[t])throw new Error("Duplicate parameter name '"+t+"' in pattern '"+e+"'");return y[t]=new i.Param(t,n,r,s),y[t]}function b(e,t,n,i){var r=["",""],s=e.replace(/[\\\[\]\^$*+?.()|{}]/g,"\\$&");if(!t)return s;switch(n){case!1:r=["(",")"+(i?"?":"")];break;case!0:s=s.replace(/\/$/,""),r=["(?:/(",")|/)?"];break;default:r=["("+n+"|",")?"]}return s+r[0]+t+r[1]}function S(r,s){var o,a,l,u,c;return o=r[2]||r[3],c=t.params[o],l=e.substring(g,r.index),(a=s?r[4]:r[4]||("*"==r[1]?".*":null))&&(u=i.type(a)||f(i.type("string"),{pattern:new RegExp(a,t.caseInsensitive?"i":n)})),{id:o,regexp:a,segment:l,type:u,cfg:c}}for(this.source=e;(s=h.exec(e))&&!((o=S(s,!1)).segment.indexOf("?")>=0);)l=w(o.id,o.type,o.cfg,"path"),p+=b(o.segment,l.type.pattern.source,l.squash,l.isOptional),m.push(o.segment),g=h.lastIndex;var x=(u=e.substring(g)).indexOf("?");if(x>=0){var C=this.sourceSearch=u.substring(x);if(u=u.substring(0,x),this.sourcePath=e.substring(0,g+x),C.length>0)for(g=0;s=d.exec(C);)l=w((o=S(s,!0)).id,o.type,o.cfg,"search"),g=h.lastIndex}else this.sourcePath=e,this.sourceSearch="";p+=b(u)+(!1===t.strict?"/?":"")+"$",m.push(u),this.regexp=new RegExp(p,t.caseInsensitive?"i":n),this.prefix=m[0],this.$$paramNames=$}function M(e){c(this,e)}function A(e,i){var a,u=[],h=null,d=!1;function f(e,t,n){if(!n)return!1;var i=e.invoke(t,t,{$match:n});return!r(i)||i}function p(i,r,s,l,c){var f,p=l.baseHref(),g=i.url();function m(e){if(!e||!e.defaultPrevented){f&&i.url();f=n;var t,r=u.length;for(t=0;t<r;t++)if(a(u[t]))return;h&&a(h)}function a(e){var t=e(s,i);return!!t&&(o(t)&&i.replace().url(t),!0)}}function v(){return a=a||r.$on("$locationChangeSuccess",m)}return d||v(),{sync:function(){m()},listen:function(){return v()},update:function(e){e?g=i.url():i.url()!==g&&(i.url(g),i.replace())},push:function(e,t,r){var s=e.format(t||{});null!==s&&t&&t["#"]&&(s+="#"+t["#"]),i.url(s),f=r&&r.$$avoidResync?i.url():n,r&&r.replace&&i.replace()},href:function(n,r,s){if(!n.validates(r))return null;var o=e.html5Mode();t.isObject(o)&&(o=o.enabled),o=o&&c.history;var a=n.format(r);if(s=s||{},o||null===a||(a="#"+e.hashPrefix()+a),null!==a&&r&&r["#"]&&(a+="#"+r["#"]),a=function(e,t,n){return"/"===p?e:t?p.slice(0,-1)+e:n?p.slice(1)+e:e}(a,o,s.absolute),!s.absolute||!a)return a;var l=!o&&a?"/":"",u=i.port();return u=80===u||443===u?"":":"+u,[i.protocol(),"://",i.host(),u,l,a].join("")}}}this.rule=function(e){if(!s(e))throw new Error("'rule' must be a function");return u.push(e),this},this.otherwise=function(e){if(o(e)){var t=e;e=function(){return t}}else if(!s(e))throw new Error("'rule' must be a function");return h=e,this},this.when=function(e,t){var n,r=o(t);if(o(e)&&(e=i.compile(e)),!r&&!s(t)&&!l(t))throw new Error("invalid 'handler' in when()");var a={matcher:function(e,t){return r&&(n=i.compile(t),t=["$match",function(e){return n.format(e)}]),c((function(n,i){return f(n,t,e.exec(i.path(),i.search()))}),{prefix:o(e.prefix)?e.prefix:""})},regex:function(e,t){if(e.global||e.sticky)throw new Error("when() RegExp must not be global or sticky");return r&&(n=t,t=["$match",function(e){return t=e,n.replace(/\$(\$|\d{1,2})/,(function(e,n){return t["$"===n?0:Number(n)]}));var t}]),c((function(n,i){return f(n,t,e.exec(i.path()))}),{prefix:(i=e,s=/^\^((?:\\[^a-zA-Z0-9]|[^\\\[\]\^$*+?.()|{}]+)*)/.exec(i.source),null!=s?s[1].replace(/\\(.)/g,"$1"):"")});var i,s}},u={matcher:i.isMatcher(e),regex:e instanceof RegExp};for(var h in u)if(u[h])return this.rule(a[h](e,t));throw new Error("invalid 'what' in when()")},this.deferIntercept=function(e){e===n&&(e=!0),d=e},this.$get=p,p.$inject=["$location","$rootScope","$injector","$browser","$sniffer"]}function E(e,d){var p,b,S={},C={},k="abstract",_={parent:function(e){if(r(e.parent)&&e.parent)return M(e.parent);var t=/^(.+)\.[^.]+$/.exec(e.name);return t?M(t[1]):p},data:function(e){return e.parent&&e.parent.data&&(e.data=e.self.data=f(e.parent.data,e.data)),e.data},url:function(e){var t=e.url,n={params:e.params||{}};if(o(t))return"^"==t.charAt(0)?d.compile(t.substring(1),n):(e.parent.navigable||p).url.concat(t,n);if(!t||d.isMatcher(t))return t;throw new Error("Invalid url '"+t+"' in state '"+e+"'")},navigable:function(e){return e.url?e:e.parent?e.parent.navigable:null},ownParams:function(e){var t=e.url&&e.url.params||new i.ParamSet;return u(e.params||{},(function(e,n){t[n]||(t[n]=new i.Param(n,null,e,"config"))})),t},params:function(e){var t=w(e.ownParams,e.ownParams.$$keys());return e.parent&&e.parent.params?c(e.parent.params.$$new(),t):new i.ParamSet},views:function(e){var t={};return u(r(e.views)?e.views:{"":e},(function(n,i){i.indexOf("@")<0&&(i+="@"+e.parent.name),t[i]=n})),t},path:function(e){return e.parent?e.parent.path.concat(e):[]},includes:function(e){var t=e.parent?c({},e.parent.includes):{};return t[e.name]=!0,t},$delegates:{}};function M(e,t){if(!e)return n;var i,r=o(e),s=r?e:e.name;if(0===(i=s).indexOf(".")||0===i.indexOf("^")){if(!t)throw new Error("No reference point given for path '"+s+"'");t=M(t);for(var a=s.split("."),l=0,u=a.length,c=t;l<u;l++)if(""!==a[l]||0!==l){if("^"!==a[l])break;if(!c.parent)throw new Error("Path '"+s+"' not valid for state '"+t.name+"'");c=c.parent}else c=t;a=a.slice(l).join("."),s=c.name+(c.name&&a?".":"")+a}var h=S[s];return!h||!r&&(r||h!==e&&h.self!==e)?n:h}function A(t){var n=(t=f(t,{self:t,resolve:t.resolve||{},toString:function(){return this.name}})).name;if(!o(n)||n.indexOf("@")>=0)throw new Error("State must have a valid name");if(S.hasOwnProperty(n))throw new Error("State '"+n+"' is already defined");var i=-1!==n.indexOf(".")?n.substring(0,n.lastIndexOf(".")):o(t.parent)?t.parent:a(t.parent)&&o(t.parent.name)?t.parent.name:"";if(i&&!S[i])return function(e,t){C[e]||(C[e]=[]),C[e].push(t)}(i,t.self);for(var r in _)s(_[r])&&(t[r]=_[r](t,_.$delegates[r]));return S[n]=t,!t[k]&&t.url&&e.when(t.url,["$match","$stateParams",function(e,n){b.$current.navigable==t&&y(e,n)||b.transitionTo(t,e,{inherit:!0,location:!1})}]),function(e){for(var t=C[e]||[];t.length;)A(t.shift())}(n),t}function E(e,d,C,_,A,E,R,T,L){var P=d.reject(new Error("transition superseded")),I=d.reject(new Error("transition prevented")),D=d.reject(new Error("transition aborted")),O=d.reject(new Error("transition failed"));function N(e,n,i,r,o,a){var c=i?n:$(e.params.$$keys(),n),h={$stateParams:c};o.resolve=A.resolve(e.resolve,h,o.resolve,e);var f=[o.resolve.then((function(e){o.globals=e}))];return r&&f.push(r),d.all(f).then((function(){var n=[];return u(e.views,(function(i,r){var u=i.resolve&&i.resolve!==e.resolve?i.resolve:{};u.$template=[function(){return C.load(r,{view:i,locals:o.globals,params:c,notify:a.notify})||""}],n.push(A.resolve(u,o.globals,o.resolve,e).then((function(n){if(s(i.controllerProvider)||l(i.controllerProvider)){var a=t.extend({},u,o.globals);n.$$controller=_.invoke(i.controllerProvider,null,a)}else n.$$controller=i.controller;n.$$state=e,n.$$controllerAs=i.controllerAs,o[r]=n})))})),d.all(n).then((function(){return o.globals}))})).then((function(e){return o}))}return p.locals={resolve:null,globals:{$stateParams:{}}},(b={params:{},current:p.self,$current:p,transition:null}).reload=function(e){return b.transitionTo(b.current,E,{reload:e||!0,inherit:!1,notify:!0})},b.go=function(e,t,n){return b.transitionTo(e,t,c({inherit:!0,relative:b.$current},n))},b.transitionTo=function(t,n,s){n=n||{},s=c({location:!0,inherit:!1,relative:null,notify:!0,reload:!1,$retry:!1},s||{});var l=b.$current,u=b.params,g=l.path,m=M(t,s.relative),y=n["#"];if(!r(m)){var S={to:t,toParams:n,options:s},x=function(t,n,i,r){var s=e.$broadcast("$stateNotFound",t,n,i);if(s.defaultPrevented)return R.update(),D;if(!s.retry)return null;if(r.$retry)return R.update(),O;var o=b.transition=d.when(s.retry);return o.then((function(){return o!==b.transition?P:(t.options.$retry=!0,b.transitionTo(t.to,t.toParams,t.options))}),(function(){return D})),R.update(),o}(S,l.self,u,s);if(x)return x;if(n=S.toParams,m=M(t=S.to,(s=S.options).relative),!r(m)){if(!s.relative)throw new Error("No such state '"+t+"'");throw new Error("Could not resolve '"+t+"' from state '"+s.relative+"'")}}if(m[k])throw new Error("Cannot transition to abstract state '"+t+"'");if(s.inherit&&(n=v(E,n||{},b.$current,m)),!m.params.$$validates(n))return O;n=m.params.$$values(n);var C=(t=m).path,A=0,T=C[A],L=p.locals,F=[];if(s.reload){if(o(s.reload)||a(s.reload)){if(a(s.reload)&&!s.reload.name)throw new Error("Invalid reload state object");var j=!0===s.reload?g[0]:M(s.reload);if(s.reload&&!j)throw new Error("No such reload state '"+(o(s.reload)?s.reload:s.reload.name)+"'");for(;T&&T===g[A]&&T!==j;)L=F[A]=T.locals,A++,T=C[A]}}else for(;T&&T===g[A]&&T.ownParams.$$equals(n,u);)L=F[A]=T.locals,A++,T=C[A];if(function(e,t,n,r,s,o){function a(e,t,n){function r(t){return"search"!=e.params[t].location}var s=e.params.$$keys().filter(r),o=w.apply({},[e.params].concat(s));return new i.ParamSet(o).$$equals(t,n)}if(!o.reload&&e===n&&(s===n.locals||!1===e.self.reloadOnSearch&&a(n,r,t)))return!0}(t,n,l,u,L,s))return y&&(n["#"]=y),b.params=n,h(b.params,E),h($(t.params.$$keys(),E),t.locals.globals.$stateParams),s.location&&t.navigable&&t.navigable.url&&(R.push(t.navigable.url,n,{$$avoidResync:!0,replace:"replace"===s.location}),R.update(!0)),b.transition=null,d.when(b.current);if(n=$(t.params.$$keys(),n||{}),y&&(n["#"]=y),s.notify&&e.$broadcast("$stateChangeStart",t.self,n,l.self,u,s).defaultPrevented)return e.$broadcast("$stateChangeCancel",t.self,n,l.self,u),null==b.transition&&R.update(),I;for(var B=d.when(L),U=A;U<C.length;U++,T=C[U])L=F[U]=f(L),B=N(T,n,T===t,B,L,s);var H=b.transition=B.then((function(){var i,r,o;if(b.transition!==H)return P;for(i=g.length-1;i>=A;i--)(o=g[i]).self.onExit&&_.invoke(o.self.onExit,o.self,o.locals.globals),o.locals=null;for(i=A;i<C.length;i++)(r=C[i]).locals=F[i],r.self.onEnter&&_.invoke(r.self.onEnter,r.self,r.locals.globals);return b.transition!==H?P:(b.$current=t,b.current=t.self,b.params=n,h(b.params,E),b.transition=null,s.location&&t.navigable&&R.push(t.navigable.url,t.navigable.locals.globals.$stateParams,{$$avoidResync:!0,replace:"replace"===s.location}),s.notify&&e.$broadcast("$stateChangeSuccess",t.self,n,l.self,u),R.update(!0),b.current)}),(function(i){return b.transition!==H?P:(b.transition=null,e.$broadcast("$stateChangeError",t.self,n,l.self,u,i).defaultPrevented||R.update(),d.reject(i))}));return H},b.is=function(e,t,i){var s=M(e,(i=c({relative:b.$current},i||{})).relative);return r(s)?b.$current===s&&(!t||y(s.params.$$values(t),E)):n},b.includes=function(e,t,i){if(i=c({relative:b.$current},i||{}),o(e)&&e.indexOf("*")>-1){if(!function(e){for(var t=e.split("."),n=b.$current.name.split("."),i=0,r=t.length;i<r;i++)"*"===t[i]&&(n[i]="*");return"**"===t[0]&&(n=n.slice(m(n,t[1]))).unshift("**"),"**"===t[t.length-1]&&(n.splice(m(n,t[t.length-2])+1,Number.MAX_VALUE),n.push("**")),t.length==n.length&&n.join("")===t.join("")}(e))return!1;e=b.$current.name}var s=M(e,i.relative);return r(s)?!!r(b.$current.includes[s.name])&&(!t||y(s.params.$$values(t),E,g(t))):n},b.href=function(e,t,i){var s=M(e,(i=c({lossy:!0,inherit:!0,absolute:!1,relative:b.$current},i||{})).relative);if(!r(s))return null;i.inherit&&(t=v(E,t||{},b.$current,s));var o=s&&i.lossy?s.navigable:s;return o&&o.url!==n&&null!==o.url?R.href(o.url,$(s.params.$$keys().concat("#"),t||{}),{absolute:i.absolute}):null},b.get=function(e,t){if(0===arguments.length)return x(g(S),(function(e){return S[e].self}));var n=M(e,t||b.$current);return n&&n.self?n.self:null},b}(p=A({name:"",url:"^",views:null,abstract:!0})).navigable=null,this.decorator=function(e,t){if(o(e)&&!r(t))return _[e];if(!s(t)||!o(e))return this;_[e]&&!_.$delegates[e]&&(_.$delegates[e]=_[e]);return _[e]=t,this},this.state=function(e,t){a(e)?t=e:t.name=e;return A(t),this},this.$get=E,E.$inject=["$rootScope","$q","$view","$injector","$resolve","$stateParams","$urlRouter","$location","$urlMatcherFactory"]}function R(){function e(e,t){return{load:function(e,n){var i;return(n=c({template:null,controller:null,view:null,locals:null,notify:!0,async:!0,params:{}},n)).view&&(i=t.fromConfig(n.view,n.params,n.locals)),i}}}this.$get=e,e.$inject=["$rootScope","$templateFactory"]}t.module("ui.router.util",["ng"]),t.module("ui.router.router",["ui.router.util"]),t.module("ui.router.state",["ui.router.router","ui.router.util"]),t.module("ui.router",["ui.router.state"]),t.module("ui.router.compat",["ui.router"]),C.$inject=["$q","$injector"],t.module("ui.router.util").service("$resolve",C),k.$inject=["$http","$templateCache","$injector"],t.module("ui.router.util").service("$templateFactory",k),_.prototype.concat=function(e,t){var n={caseInsensitive:i.caseInsensitive(),strict:i.strictMode(),squash:i.defaultSquashPolicy()};return new _(this.sourcePath+e+this.sourceSearch,c(n,t),this)},_.prototype.toString=function(){return this.source},_.prototype.exec=function(e,t){var n=this.regexp.exec(e);if(!n)return null;t=t||{};var i,s,o,a,l,u=this.parameters(),c=u.length,h=this.segments.length-1,d={};if(h!==n.length-1)throw new Error("Unbalanced capture group in route '"+this.source+"'");function f(e){function t(e){return e.split("").reverse().join("")}var n=x(t(e).split(/-(?!\\)/),t);return x(n,(function(e){return e.replace(/\\-/g,"-")})).reverse()}for(i=0;i<h;i++){for(o=u[i],a=this.params[o],l=n[i+1],s=0;s<a.replace.length;s++)a.replace[s].from===l&&(l=a.replace[s].to);l&&!0===a.array&&(l=f(l)),r(l)&&(l=a.type.decode(l)),d[o]=a.value(l)}for(;i<c;i++){for(d[o=u[i]]=this.params[o].value(t[o]),a=this.params[o],l=t[o],s=0;s<a.replace.length;s++)a.replace[s].from===l&&(l=a.replace[s].to);r(l)&&(l=a.type.decode(l)),d[o]=a.value(l)}return d},_.prototype.parameters=function(e){return r(e)?this.params[e]||null:this.$$paramNames},_.prototype.validates=function(e){return this.params.$$validates(e)},_.prototype.format=function(e){e=e||{};var t=this.segments,n=this.parameters(),i=this.params;if(!this.validates(e))return null;var r,s=!1,a=t.length-1,u=n.length,c=t[0];function h(e){return encodeURIComponent(e).replace(/-/g,(function(e){return"%5C%"+e.charCodeAt(0).toString(16).toUpperCase()}))}for(r=0;r<u;r++){var d=r<a,f=n[r],p=i[f],g=p.value(e[f]),m=p.isOptional&&p.type.equals(p.value(),g),v=!!m&&p.squash,y=p.type.encode(g);if(d){var $=t[r+1],w=r+1===a;if(!1===v)null!=y&&(l(y)?c+=x(y,h).join("-"):c+=encodeURIComponent(y)),c+=$;else if(!0===v){var b=c.match(/\/$/)?/\/?(.*)/:/(.*)/;c+=$.match(b)[1]}else o(v)&&(c+=v+$);w&&!0===p.squash&&"/"===c.slice(-1)&&(c=c.slice(0,-1))}else{if(null==y||m&&!1!==v)continue;if(l(y)||(y=[y]),0===y.length)continue;c+=(s?"&":"?")+f+"="+(y=x(y,encodeURIComponent).join("&"+f+"=")),s=!0}}return c},M.prototype.is=function(e,t){return!0},M.prototype.encode=function(e,t){return e},M.prototype.decode=function(e,t){return e},M.prototype.equals=function(e,t){return e==t},M.prototype.$subPattern=function(){var e=this.pattern.toString();return e.substr(1,e.length-2)},M.prototype.pattern=/.*/,M.prototype.toString=function(){return"{Type:"+this.name+"}"},M.prototype.$normalize=function(e){return this.is(e)?e:this.decode(e)},M.prototype.$asArray=function(e,t){if(!e)return this;if("auto"===e&&!t)throw new Error("'auto' array mode is for query parameters only");return new function(e,t){function i(e,t){return function(){return e[t].apply(e,arguments)}}function s(e){return l(e)?e:r(e)?[e]:[]}function o(e){return!e}function a(e,i){return function(r){if(l(r)&&0===r.length)return r;var a=x(r=s(r),e);return!0===i?0===S(a,o).length:function(e){switch(e.length){case 0:return n;case 1:return"auto"===t?e[0]:e;default:return e}}(a)}}var u;this.encode=a(i(e,"encode")),this.decode=a(i(e,"decode")),this.is=a(i(e,"is"),!0),this.equals=(u=i(e,"equals"),function(e,t){var n=s(e),i=s(t);if(n.length!==i.length)return!1;for(var r=0;r<n.length;r++)if(!u(n[r],i[r]))return!1;return!0}),this.pattern=e.pattern,this.$normalize=a(i(e,"$normalize")),this.name=e.name,this.$arrayMode=t}(this,e)},t.module("ui.router.util").provider("$urlMatcherFactory",(function e(){i=this;var h=!1,d=!0,p=!1;function v(e){return null!=e?e.toString().replace(/~/g,"~~").replace(/\//g,"~2F"):e}var y,$={},w=!0,b=[],C={string:{encode:v,decode:function(e){return null!=e?e.toString().replace(/~2F/g,"/").replace(/~~/g,"~"):e},is:function(e){return null==e||!r(e)||"string"==typeof e},pattern:/[^/]*/},int:{encode:v,decode:function(e){return parseInt(e,10)},is:function(e){return r(e)&&this.decode(e.toString())===e},pattern:/\d+/},bool:{encode:function(e){return e?1:0},decode:function(e){return 0!==parseInt(e,10)},is:function(e){return!0===e||!1===e},pattern:/0|1/},date:{encode:function(e){return this.is(e)?[e.getFullYear(),("0"+(e.getMonth()+1)).slice(-2),("0"+e.getDate()).slice(-2)].join("-"):n},decode:function(e){if(this.is(e))return e;var t=this.capture.exec(e);return t?new Date(t[1],t[2]-1,t[3]):n},is:function(e){return e instanceof Date&&!isNaN(e.valueOf())},equals:function(e,t){return this.is(e)&&this.is(t)&&e.toISOString()===t.toISOString()},pattern:/[0-9]{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[1-2][0-9]|3[0-1])/,capture:/([0-9]{4})-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])/},json:{encode:t.toJson,decode:t.fromJson,is:t.isObject,equals:t.equals,pattern:/[^/]*/},any:{encode:t.identity,decode:t.identity,equals:t.equals,pattern:/.*/}};function k(e){return s(e)||l(e)&&s(e[e.length-1])}function A(){for(;b.length;){var e=b.shift();if(e.pattern)throw new Error("You cannot override a type's .pattern at runtime.");t.extend($[e.name],y.invoke(e.def))}}function E(e){c(this,e||{})}e.$$getDefaultValue=function(e){if(!k(e.value))return e.value;if(!y)throw new Error("Injectable functions cannot be called at configuration time");return y.invoke(e.value)},this.caseInsensitive=function(e){return r(e)&&(h=e),h},this.strictMode=function(e){return r(e)&&(d=e),d},this.defaultSquashPolicy=function(e){if(!r(e))return p;if(!0!==e&&!1!==e&&!o(e))throw new Error("Invalid squash policy: "+e+". Valid policies: false, true, arbitrary-string");return p=e,e},this.compile=function(e,t){return new _(e,c({strict:d,caseInsensitive:h},t))},this.isMatcher=function(e){if(!a(e))return!1;var t=!0;return u(_.prototype,(function(n,i){s(n)&&(t=t&&r(e[i])&&s(e[i]))})),t},this.type=function(e,t,n){if(!r(t))return $[e];if($.hasOwnProperty(e))throw new Error("A type named '"+e+"' has already been defined.");return $[e]=new M(c({name:e},t)),n&&(b.push({name:e,def:n}),w||A()),this},u(C,(function(e,t){$[t]=new M(c({name:t},e))})),$=f($,{}),this.$get=["$injector",function(e){return y=e,w=!1,A(),u(C,(function(e,t){$[t]||($[t]=new M(e))})),this}],this.Param=function(e,i,s,u){var h=this;s=function(e){var t=a(e)?g(e):[];-1===m(t,"value")&&-1===m(t,"type")&&-1===m(t,"squash")&&-1===m(t,"array")&&(e={value:e});return e.$$fn=k(e.value)?e.value:function(){return e.value},e}(s),i=function(n,i,r){if(n.type&&i)throw new Error("Param '"+e+"' has two type configurations.");return i||(n.type?t.isString(n.type)?$[n.type]:n.type instanceof M?n.type:new M(n.type):"config"===r?$.any:$.string)}(s,i,u);var d,f,v=(d={array:"search"===u&&"auto"},f=e.match(/\[\]$/)?{array:!0}:{},c(d,f,s).array);"string"!==(i=v?i.$asArray(v,"search"===u):i).name||v||"path"!==u||s.value!==n||(s.value="");var w=s.value!==n,b=function(e,t){var n=e.squash;if(!t||!1===n)return!1;if(!r(n)||null==n)return p;if(!0===n||o(n))return n;throw new Error("Invalid squash policy: '"+n+"'. Valid policies: false, true, or arbitrary string")}(s,w),C=function(e,t,i,r){var s,a,u=[{from:"",to:i||t?n:""},{from:null,to:i||t?n:""}];s=l(e.replace)?e.replace:[],o(r)&&s.push({from:r,to:n});return a=x(s,(function(e){return e.from})),S(u,(function(e){return-1===m(a,e.from)})).concat(s)}(s,v,w,b);c(this,{id:e,type:i,location:u,array:v,squash:b,replace:C,isOptional:w,value:function(e){return e=function(e){var t,n=x(S(h.replace,(t=e,function(e){return e.from===t})),(function(e){return e.to}));return n.length?n[0]:e}(e),r(e)?h.type.$normalize(e):function(){if(!y)throw new Error("Injectable functions cannot be called at configuration time");var e=y.invoke(s.$$fn);if(null!==e&&e!==n&&!h.type.is(e))throw new Error("Default value ("+e+") for parameter '"+h.id+"' is not an instance of Type ("+h.type.name+")");return e}()},dynamic:n,config:s,toString:function(){return"{Param:"+e+" "+i+" squash: '"+b+"' optional: "+w+"}"}})},E.prototype={$$new:function(){return f(this,c(new E,{$$parent:this}))},$$keys:function(){for(var e=[],t=[],n=this,i=g(E.prototype);n;)t.push(n),n=n.$$parent;return t.reverse(),u(t,(function(t){u(g(t),(function(t){-1===m(e,t)&&-1===m(i,t)&&e.push(t)}))})),e},$$values:function(e){var t={},n=this;return u(n.$$keys(),(function(i){t[i]=n[i].value(e&&e[i])})),t},$$equals:function(e,t){var n=!0,i=this;return u(i.$$keys(),(function(r){var s=e&&e[r],o=t&&t[r];i[r].type.equals(s,o)||(n=!1)})),n},$$validates:function(e){var i,r,s,o,a,l=this.$$keys();for(i=0;i<l.length&&(r=this[l[i]],(s=e[l[i]])!==n&&null!==s||!r.isOptional);i++){if(o=r.type.$normalize(s),!r.type.is(o))return!1;if(a=r.type.encode(o),t.isString(a)&&!r.type.pattern.exec(a))return!1}return!0},$$parent:n},this.ParamSet=E})),t.module("ui.router.util").run(["$urlMatcherFactory",function(e){}]),A.$inject=["$locationProvider","$urlMatcherFactoryProvider"],t.module("ui.router.router").provider("$urlRouter",A),E.$inject=["$urlRouterProvider","$urlMatcherFactoryProvider"],t.module("ui.router.state").factory("$stateParams",(function(){return{}})).provider("$state",E),R.$inject=[],t.module("ui.router.state").provider("$view",R),t.module("ui.router.state").provider("$uiViewScroll",(function(){var e=!1;this.useAnchorScroll=function(){e=!0},this.$get=["$anchorScroll","$timeout",function(t,n){return e?t:function(e){return n((function(){e[0].scrollIntoView()}),0,!1)}}]}));var T=t.version.major,L=t.version.minor;function P(e,n,i,r){var s=n.has?function(e){return n.has(e)?n.get(e):null}:function(e){try{return n.get(e)}catch(e){return null}},o=s("$animator"),a=s("$animate");return{restrict:"ECA",terminal:!0,priority:400,transclude:"element",compile:function(n,s,l){return function(n,s,u){var c,h,d,f,p=u.onload||"",g=u.autoscroll,m=function(e,n){var i={enter:function(e,t,n){t.after(e),n()},leave:function(e,t){e.remove(),t()}};if(e.noanimation)return i;function r(e){return 1===T&&L>=4?!!a.enabled(e):1===T&&L>=2?!!a.enabled():!!o}if(a)return{enter:function(e,n,s){r(e)?t.version.minor>2?a.enter(e,null,n).then(s):a.enter(e,null,n,s):i.enter(e,n,s)},leave:function(e,n){r(e)?t.version.minor>2?a.leave(e).then(n):a.leave(e,n):i.leave(e,n)}};if(o){var s=o&&o(n,e);return{enter:function(e,t,n){s.enter(e,null,t),n()},leave:function(e,t){s.leave(e),t()}}}return i}(u,n);function v(o){var a,v=D(n,u,s,r),y=v&&e.$current&&e.$current.locals[v];if((o||y!==f)&&!n._willBeDestroyed){a=n.$new(),f=e.$current.locals[v],a.$emit("$viewContentLoading",v);var $=l(a,(function(e){m.enter(e,s,(function(){d&&d.$emit("$viewContentAnimationEnded"),(t.isDefined(g)&&!g||n.$eval(g))&&i(e)})),function(){var e=c,t=d;function n(){e&&e.remove(),t&&t.$destroy()}t&&(t._willBeDestroyed=!0),h?(m.leave(h,(function(){n(),c=null})),c=h):(n(),c=null),h=null,d=null}()}));h=$,(d=a).$emit("$viewContentLoaded",v),d.$eval(p)}}n.$on("$stateChangeSuccess",(function(){v(!1)})),v(!0)}}}}function I(e,t,n,i){return{restrict:"ECA",priority:-400,compile:function(r){var s=r.html();return function(r,o,a){var l=n.$current,u=D(r,a,o,i),c=l&&l.locals[u];if(c){o.data("$uiView",{name:u,state:c.$$state}),o.html(c.$template?c.$template:s);var h=e(o.contents());if(c.$$controller){c.$scope=r,c.$element=o;var d=t(c.$$controller,c);c.$$controllerAs&&(r[c.$$controllerAs]=d),o.data("$ngControllerController",d),o.children().data("$ngControllerController",d)}h(r)}}}}}function D(e,t,n,i){var r=i(t.uiView||t.name||"")(e),s=n.inheritedData("$uiView");return r.indexOf("@")>=0?r:r+"@"+(s?s.state.name:"")}function O(e,t){var n,i=e.match(/^\s*({[^}]*})\s*$/);if(i&&(e=t+"("+i[1]+")"),!(n=e.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/))||4!==n.length)throw new Error("Invalid state ref '"+e+"'");return{state:n[1],paramExpr:n[3]||null}}function N(e){var t=e.parent().inheritedData("$uiView");if(t&&t.state&&t.state.name)return t.state}function F(e){var t="[object SVGAnimatedString]"===Object.prototype.toString.call(e.prop("href")),n="FORM"===e[0].nodeName;return{attr:n?"action":t?"xlink:href":"href",isAnchor:"A"===e.prop("tagName").toUpperCase(),clickable:!n}}function j(e,t,n,i,r){return function(s){var o=s.which||s.button,a=r();if(!(o>1||s.ctrlKey||s.metaKey||s.shiftKey||e.attr("target"))){var l=n((function(){t.go(a.state,a.params,a.options)}));s.preventDefault();var u=i.isAnchor&&!a.href?1:0;s.preventDefault=function(){u--<=0&&n.cancel(l)}}}}function B(e,n){return{restrict:"A",require:["?^uiSrefActive","?^uiSrefActiveEq"],link:function(i,r,s,o){var a=O(s.uiSref,e.current.name),l={state:a.state,href:null,params:null},u=F(r),h=o[1]||o[0];l.options=c(function(e,t){return{relative:N(e)||t.$current,inherit:!0}}(r,e),s.uiSrefOpts?i.$eval(s.uiSrefOpts):{});var d=function(n){n&&(l.params=t.copy(n)),l.href=e.href(a.state,l.params,l.options),h&&h.$$addStateInfo(a.state,l.params),null!==l.href&&s.$set(u.attr,l.href)};a.paramExpr&&(i.$watch(a.paramExpr,(function(e){e!==l.params&&d(e)}),!0),l.params=t.copy(i.$eval(a.paramExpr))),d(),u.clickable&&r.bind("click",j(r,e,n,u,(function(){return l})))}}}function U(e,t){return{restrict:"A",require:["?^uiSrefActive","?^uiSrefActiveEq"],link:function(n,i,r,s){var o=F(i),a=s[1]||s[0],l="["+[r.uiState,r.uiStateParams||null,r.uiStateOpts||null].map((function(e){return e||"null"})).join(", ")+"]",u={state:null,params:null,options:null,href:null};function c(t){u.state=t[0],u.params=t[1],u.options=t[2],u.href=e.href(u.state,u.params,u.options),a&&a.$$addStateInfo(u.state,u.params),u.href&&r.$set(o.attr,u.href)}n.$watch(l,c,!0),c(n.$eval(l)),o.clickable&&i.bind("click",j(i,e,t,o,(function(){return u})))}}}function H(e,t,n){return{restrict:"A",controller:["$scope","$element","$attrs","$timeout",function(t,i,r,s){var l,c,h=[],f={};l=n(r.uiSrefActiveEq||"",!1)(t);try{c=t.$eval(r.uiSrefActive)}catch(e){}function p(n,r,s){var l=e.get(n,N(i)),u=function(e,n){if(!o(e))throw new Error("state should be a string");if(a(n))return e+d(n);if(n=t.$eval(n),a(n))return e+d(n);return e}(n,r);h.push({state:l||{name:n},params:r,hash:u}),f[u]=s}function g(){for(var t=0;t<h.length;t++)n=h[t].state,r=h[t].params,e.includes(n.name,r)?m(i,f[h[t].hash]):v(i,f[h[t].hash]),y(h[t].state,h[t].params)?m(i,l):v(i,l);var n,r}function m(e,t){s((function(){e.addClass(t)}))}function v(e,t){e.removeClass(t)}function y(t,n){return e.is(t.name,n)}c=c||n(r.uiSrefActive||"",!1)(t),a(c)&&u(c,(function(n,i){if(o(n)){var r=O(n,e.current.name);p(r.state,t.$eval(r.paramExpr),i)}})),this.$$addStateInfo=function(e,t){a(c)&&h.length>0||(p(e,t,c),g())},t.$on("$stateChangeSuccess",g),g()}]}}function W(e){var t=function(t,n){return e.is(t,n)};return t.$stateful=!0,t}function z(e){var t=function(t,n,i){return e.includes(t,n,i)};return t.$stateful=!0,t}P.$inject=["$state","$injector","$uiViewScroll","$interpolate"],I.$inject=["$compile","$controller","$state","$interpolate"],t.module("ui.router.state").directive("uiView",P),t.module("ui.router.state").directive("uiView",I),B.$inject=["$state","$timeout"],U.$inject=["$state","$timeout"],H.$inject=["$state","$stateParams","$interpolate"],t.module("ui.router.state").directive("uiSref",B).directive("uiSrefActive",H).directive("uiSrefActiveEq",H).directive("uiState",U),W.$inject=["$state"],z.$inject=["$state"],t.module("ui.router.state").filter("isState",W).filter("includedByState",z)}(window,window.angular),define("uiRouter",["angular"],(function(){})),
+/**
+ * angular-ui-utils - Swiss-Army-Knife of AngularJS tools (with no external dependencies!)
+ * @version v0.1.1 - 2014-02-05
+ * @link http://angular-ui.github.com
+ * @license MIT License, http://www.opensource.org/licenses/MIT
+ */
+angular.module("ui.alias",[]).config(["$compileProvider","uiAliasConfig",function(e,t){t=t||{},angular.forEach(t,(function(t,n){angular.isString(t)&&(t={replace:!0,template:t}),e.directive(n,(function(){return t}))}))}]),angular.module("ui.event",[]).directive("uiEvent",["$parse",function(e){return function(t,n,i){var r=t.$eval(i.uiEvent);angular.forEach(r,(function(i,r){var s=e(i);n.bind(r,(function(e){var n=Array.prototype.slice.call(arguments);n=n.splice(1),s(t,{$event:e,$params:n}),t.$$phase||t.$apply()}))}))}}]),angular.module("ui.format",[]).filter("format",(function(){return function(e,t){var n=e;if(angular.isString(n)&&void 0!==t)if(angular.isArray(t)||angular.isObject(t)||(t=[t]),angular.isArray(t)){var i=t.length;n=n.replace(/\$([0-9]+)/g,(function(e,n){return(n=parseInt(n,10))>=0&&n<i?t[n]:e}))}else angular.forEach(t,(function(e,t){n=n.split(":"+t).join(e)}));return n}})),angular.module("ui.highlight",[]).filter("highlight",(function(){return function(e,t,n){return t||angular.isNumber(t)?(e=e.toString(),t=t.toString(),n?e.split(t).join('<span class="ui-match">'+t+"</span>"):e.replace(new RegExp(t,"gi"),'<span class="ui-match">$&</span>')):e}})),angular.module("ui.include",[]).directive("uiInclude",["$http","$templateCache","$anchorScroll","$compile",function(e,t,n,i){return{restrict:"ECA",terminal:!0,compile:function(r,s){var o=s.uiInclude||s.src,a=s.fragment||"",l=s.onload||"",u=s.autoscroll;return function(r,s){var c,h=0,d=function(){c&&(c.$destroy(),c=null),s.html("")};function f(){var f=++h,p=r.$eval(o),g=r.$eval(a);p?e.get(p,{cache:t}).success((function(e){var t;f===h&&(c&&c.$destroy(),c=r.$new(),t=g?angular.element("<div/>").html(e).find(g):angular.element("<div/>").html(e).contents(),s.html(t),i(t)(c),!angular.isDefined(u)||u&&!r.$eval(u)||n(),c.$emit("$includeContentLoaded"),r.$eval(l))})).error((function(){f===h&&d()})):d()}r.$watch(a,f),r.$watch(o,f)}}}}]),angular.module("ui.indeterminate",[]).directive("uiIndeterminate",[function(){return{compile:function(e,t){return t.type&&"checkbox"===t.type.toLowerCase()?function(e,t,n){e.$watch(n.uiIndeterminate,(function(e){t[0].indeterminate=!!e}))}:angular.noop}}}]),angular.module("ui.inflector",[]).filter("inflector",(function(){function e(e){return e.replace(/^([a-z])|\s+([a-z])/g,(function(e){return e.toUpperCase()}))}function t(e,t){return e.replace(/[A-Z]/g,(function(e){return t+e}))}var n={humanize:function(n){return e(t(n," ").split("_").join(" "))},underscore:function(e){return e.substr(0,1).toLowerCase()+t(e.substr(1),"_").toLowerCase().split(" ").join("_")},variable:function(t){return t=t.substr(0,1).toLowerCase()+e(t.split("_").join(" ")).substr(1).split(" ").join("")}};return function(e,t){return!1!==t&&angular.isString(e)?n[t=t||"humanize"](e):e}})),angular.module("ui.jq",[]).value("uiJqConfig",{}).directive("uiJq",["uiJqConfig","$timeout",function(e,t){return{restrict:"A",compile:function(n,i){if(!angular.isFunction(n[i.uiJq]))throw new Error('ui-jq: The "'+i.uiJq+'" function does not exist');var r=e&&e[i.uiJq];return function(e,n,i){var s=[];function o(){t((function(){n[i.uiJq].apply(n,s)}),0,!1)}i.uiOptions?(s=e.$eval("["+i.uiOptions+"]"),angular.isObject(r)&&angular.isObject(s[0])&&(s[0]=angular.extend({},r,s[0]))):r&&(s=[r]),i.ngModel&&n.is("select,input,textarea")&&n.bind("change",(function(){n.trigger("input")})),i.uiRefresh&&e.$watch(i.uiRefresh,(function(){o()})),o()}}}}]),angular.module("ui.keypress",[]).factory("keypressHelper",["$parse",function(e){var t={8:"backspace",9:"tab",13:"enter",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"delete"};return function(n,i,r,s){var o,a,l=[];o=i.$eval(s["ui"+(a=n,a.charAt(0).toUpperCase()+a.slice(1))]),angular.forEach(o,(function(t,n){var i,r;r=e(t),angular.forEach(n.split(" "),(function(e){i={expression:r,keys:{}},angular.forEach(e.split("-"),(function(e){i.keys[e]=!0})),l.push(i)}))})),r.bind(n,(function(e){var r=!(!e.metaKey||e.ctrlKey),s=!!e.altKey,o=!!e.ctrlKey,a=!!e.shiftKey,u=e.keyCode;"keypress"===n&&!a&&u>=97&&u<=122&&(u-=32),angular.forEach(l,(function(n){var l=n.keys[t[u]]||n.keys[u.toString()],c=!!n.keys.meta,h=!!n.keys.alt,d=!!n.keys.ctrl,f=!!n.keys.shift;l&&c===r&&h===s&&d===o&&f===a&&i.$apply((function(){n.expression(i,{$event:e})}))}))}))}}]),angular.module("ui.keypress").directive("uiKeydown",["keypressHelper",function(e){return{link:function(t,n,i){e("keydown",t,n,i)}}}]),angular.module("ui.keypress").directive("uiKeypress",["keypressHelper",function(e){return{link:function(t,n,i){e("keypress",t,n,i)}}}]),angular.module("ui.keypress").directive("uiKeyup",["keypressHelper",function(e){return{link:function(t,n,i){e("keyup",t,n,i)}}}]),angular.module("ui.mask",[]).value("uiMaskConfig",{maskDefinitions:{9:/\d/,A:/[a-zA-Z]/,"*":/[a-zA-Z0-9]/}}).directive("uiMask",["uiMaskConfig",function(e){return{priority:100,require:"ngModel",restrict:"A",compile:function(){var t=e;return function(e,n,i,r){var s,o,a,l,u,c,h,d,f,p,g,m,v=!1,y=!1,$=i.placeholder,w=i.maxlength;var b={};function S(){return v=!1,function(){if(!y)return;n.unbind("blur",_),n.unbind("mousedown",M),n.unbind("mouseup",M),n.unbind("input",E),n.unbind("keyup",E),n.unbind("click",E),n.unbind("focus",E),y=!1}(),angular.isDefined($)?n.attr("placeholder",$):n.removeAttr("placeholder"),angular.isDefined(w)?n.attr("maxlength",w):n.removeAttr("maxlength"),n.val(r.$modelValue),r.$viewValue=r.$modelValue,!1}function x(e){return!e.length||e.length>=u}function C(e){var t="",n=o.slice();return e=e.toString(),angular.forEach(l,(function(t){e=e.replace(t,"")})),angular.forEach(e.split(""),(function(e){n.length&&n[0].test(e)&&(t+=e,n.shift())})),t}function k(e){var t="",n=s.slice();return angular.forEach(a.split(""),(function(i,r){e.length&&r===n[0]?(t+=e.charAt(0)||"_",e=e.substr(1),n.shift()):t+=i})),t}function _(){g=0,m=0,d&&0!==c.length||(h="",n.val(""),e.$apply((function(){r.$setViewValue("")})))}function M(e){"mousedown"===e.type?n.bind("mouseout",A):n.unbind("mouseout",A)}function A(){m=T(this),n.unbind("mouseout",A)}function E(t){var i=(t=t||{}).which,o=t.type;if(16!==i&&91!==i){var a,l=n.val(),u=f,c=C(l),h=p,d=!1,v=function(e){if(!e)return 0;if(void 0!==e.selectionStart)return e.selectionStart;if(document.selection){e.focus();var t=document.selection.createRange();return t.moveStart("character",-e.value.length),t.text.length}return 0}(this)||0,y=g||0,$=v-y,w=s[0],b=s[c.length]||s.slice().shift(),S=m||0,x=T(this)>0,_=S>0,M=l.length>u.length||S&&l.length>u.length-S,A=l.length<u.length||S&&l.length===u.length-S,E=i>=37&&i<=40&&t.shiftKey,L=8===i||"keyup"!==o&&A&&-1===$,P=46===i||"keyup"!==o&&A&&0===$&&!_,I=(37===i||L||"click"===o)&&v>w;if(m=T(this),!E&&(!x||"click"!==o&&"keyup"!==o)){if("input"===o&&A&&!_&&c===h){for(;L&&v>w&&!R(v);)v--;for(;P&&v<b&&-1===s.indexOf(v);)v++;var D=s.indexOf(v);c=c.substring(0,D)+c.substring(D+1),d=!0}for(a=k(c),f=a,p=c,n.val(a),d&&e.$apply((function(){r.$setViewValue(c)})),M&&v<=w&&(v=w+1),I&&v--,v=v>b?b:v<w?w:v;!R(v)&&v>w&&v<b;)v+=I?-1:1;(I&&v<b||M&&!R(y))&&v++,g=v,function(e,t){if(!e)return 0;if(0===e.offsetWidth||0===e.offsetHeight)return;if(e.setSelectionRange)e.focus(),e.setSelectionRange(t,t);else if(e.createTextRange){var n=e.createTextRange();n.collapse(!0),n.moveEnd("character",t),n.moveStart("character",t),n.select()}}(this,v)}}}function R(e){return s.indexOf(e)>-1}function T(e){return e?void 0!==e.selectionStart?e.selectionEnd-e.selectionStart:document.selection?document.selection.createRange().text.length:0:0}i.uiOptions?(b=e.$eval("["+i.uiOptions+"]"),angular.isObject(b[0])&&(b=function(e,t){for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]?angular.extend(t[n],e[n]):t[n]=angular.copy(e[n]));return t}(t,b[0]))):b=t,i.$observe("uiMask",(function(e){return angular.isDefined(e)?(function(e){var t=0;if(s=[],o=[],a="","string"==typeof e){u=0;var n=!1,r=e.split("");angular.forEach(r,(function(e,r){b.maskDefinitions[e]?(s.push(t),a+=function(e){var t=i.placeholder;return void 0!==t&&t[e]?t[e]:"_"}(r),o.push(b.maskDefinitions[e]),t++,n||u++):"?"===e?n=!0:(a+=e,t++)}))}s.push(s.slice().pop()+1),l=a.replace(/[_]+/g,"_").replace(/([^_]+)([a-zA-Z0-9])([^_])/g,"$1$2_$3").split("_"),v=s.length>1}(e),v?(function(){c=p=C(r.$modelValue||""),h=f=k(c);var e=(d=x(c))&&c.length?h:"";i.maxlength&&n.attr("maxlength",2*s[s.length-1]);n.attr("placeholder",a),n.val(e),r.$viewValue=e}(),function(){if(y)return;n.bind("blur",_),n.bind("mousedown mouseup",M),n.bind("input keyup click focus",E),y=!0}(),!0):S()):S()})),i.$observe("placeholder",(function(e){angular.isDefined(e)&&(a=e,v&&E())})),r.$formatters.push((function(e){return v?(c=C(e||""),d=x(c),r.$setValidity("mask",d),d&&c.length?k(c):void 0):e})),r.$parsers.push((function(e){return v?(c=C(e||""),d=x(c),r.$viewValue=c.length?k(c):"",r.$setValidity("mask",d),""===c&&void 0!==r.$error.required&&r.$setValidity("required",!1),d?c:void 0):e})),n.bind("mousedown mouseup",M),Array.prototype.indexOf||(Array.prototype.indexOf=function(e){if(null===this)throw new TypeError;var t=Object(this),n=t.length>>>0;if(0===n)return-1;var i=0;if(arguments.length>1&&((i=Number(arguments[1]))!=i?i=0:0!==i&&i!==1/0&&i!==-1/0&&(i=(i>0||-1)*Math.floor(Math.abs(i)))),i>=n)return-1;for(var r=i>=0?i:Math.max(n-Math.abs(i),0);r<n;r++)if(r in t&&t[r]===e)return r;return-1})}}}}]),angular.module("ui.reset",[]).value("uiResetConfig",null).directive("uiReset",["uiResetConfig",function(e){var t=null;return void 0!==e&&(t=e),{require:"ngModel",link:function(e,n,i,r){var s;s=angular.element('<a class="ui-reset" />'),n.wrap('<span class="ui-resetwrap" />').after(s),s.bind("click",(function(n){n.preventDefault(),e.$apply((function(){i.uiReset?r.$setViewValue(e.$eval(i.uiReset)):r.$setViewValue(t),r.$render()}))}))}}}]),angular.module("ui.route",[]).directive("uiRoute",["$location","$parse",function(e,t){return{restrict:"AC",scope:!0,compile:function(n,i){var r;if(i.uiRoute)r="uiRoute";else if(i.ngHref)r="ngHref";else{if(!i.href)throw new Error("uiRoute missing a route or href property on "+n[0]);r="href"}return function(n,i,s){var o=t(s.ngModel||s.routeModel||"$uiRoute").assign,a=angular.noop;function l(t){var i=t.indexOf("#");i>-1&&(t=t.substr(i+1)),(a=function(){o(n,e.path().indexOf(t)>-1)})()}function u(t){var i=t.indexOf("#");i>-1&&(t=t.substr(i+1)),(a=function(){var i=new RegExp("^"+t+"$",["i"]);o(n,i.test(e.path()))})()}switch(r){case"uiRoute":s.uiRoute?u(s.uiRoute):s.$observe("uiRoute",u);break;case"ngHref":s.ngHref?l(s.ngHref):s.$observe("ngHref",l);break;case"href":l(s.href)}n.$on("$routeChangeSuccess",(function(){a()})),n.$on("$stateChangeSuccess",(function(){a()}))}}}}]),angular.module("ui.scroll.jqlite",["ui.scroll"]).service("jqLiteExtras",["$log","$window",function(e,t){return{registerFor:function(e){var n,i,r,s,o,a,l;return i=angular.element.prototype.css,e.prototype.css=function(e,t){var n;if(this,(n=this[0])&&3!==n.nodeType&&8!==n.nodeType&&n.style)return i.call(this,e,t)},a=function(e){return e&&e.document&&e.location&&e.alert&&e.setInterval},l=function(e,t,n){var i,r,s,o,l;return i=e[0],r=(l={top:["scrollTop","pageYOffset","scrollLeft"],left:["scrollLeft","pageXOffset","scrollTop"]}[t])[0],o=l[1],s=l[2],a(i)?angular.isDefined(n)?i.scrollTo(e[s].call(e),n):o in i?i[o]:i.document.documentElement[r]:angular.isDefined(n)?i[r]=n:i[r]},t.getComputedStyle?(s=function(e){return t.getComputedStyle(e,null)},n=function(e,t){return parseFloat(t)}):(s=function(e){return e.currentStyle},n=function(e,t){var n,i,r,s,o;return new RegExp("^("+/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source+")(?!px)[a-z%]+$","i").test(t)?(n=(o=e.style).left,s=(r=e.runtimeStyle)&&r.left,r&&(r.left=o.left),o.left=t,i=o.pixelLeft,o.left=n,s&&(r.left=s),i):parseFloat(t)}),r=function(e,t){var i,r,o,l,u,c,h,d,f,p,g;return a(e)?{base:i=document.documentElement[{height:"clientHeight",width:"clientWidth"}[t]],padding:0,border:0,margin:0}:(i=(g={width:[e.offsetWidth,"Left","Right"],height:[e.offsetHeight,"Top","Bottom"]}[t])[0],h=g[1],d=g[2],c=s(e),f=n(e,c["padding"+h])||0,p=n(e,c["padding"+d])||0,r=n(e,c["border"+h+"Width"])||0,o=n(e,c["border"+d+"Width"])||0,l=c["margin"+h],u=c["margin"+d],{base:i,padding:f+p,border:r+o,margin:(n(e,l)||0)+(n(e,u)||0)})},o=function(e,t,n){var i,o;return(i=r(e,t)).base>0?{base:i.base-i.padding-i.border,outer:i.base,outerfull:i.base+i.margin}[n]:(((o=s(e)[t])<0||null===o)&&(o=e.style[t]||0),{base:(o=parseFloat(o)||0)-i.padding-i.border,outer:o,outerfull:o+i.padding+i.border+i.margin}[n])},angular.forEach({before:function(e){var t,n,i,r,s,o;if(this,n=this[0],(t=(r=this.parent()).contents())[0]===n)return r.prepend(e);for(i=s=1,o=t.length-1;1<=o?s<=o:s>=o;i=1<=o?++s:--s)if(t[i]===n)return void angular.element(t[i-1]).after(e);throw new Error("invalid DOM structure "+n.outerHTML)},height:function(e){return this,angular.isDefined(e)?(angular.isNumber(e)&&(e+="px"),i.call(this,"height",e)):o(this[0],"height","base")},outerHeight:function(e){return o(this[0],"height",e?"outerfull":"outer")},offset:function(e){var t,n,i,r,s;return this,arguments.length?void 0===e?this:e:(t={top:0,left:0},(n=(r=this[0])&&r.ownerDocument)?(i=n.documentElement,r.getBoundingClientRect&&(t=r.getBoundingClientRect()),s=n.defaultView||n.parentWindow,{top:t.top+(s.pageYOffset||i.scrollTop)-(i.clientTop||0),left:t.left+(s.pageXOffset||i.scrollLeft)-(i.clientLeft||0)}):void 0)},scrollTop:function(e){return l(this,"top",e)},scrollLeft:function(e){return l(this,"left",e)}},(function(t,n){if(!e.prototype[n])return e.prototype[n]=t}))}}}]).run(["$log","$window","jqLiteExtras",function(e,t,n){if(!t.jQuery)return n.registerFor(angular.element)}]),angular.module("ui.scroll",[]).directive("ngScrollViewport",["$log",function(){return{controller:["$scope","$element",function(e,t){return t}]}}]).directive("ngScroll",["$log","$injector","$rootScope","$timeout",function(e,t,n,i){return{require:["?^ngScrollViewport"],transclude:"element",priority:1e3,terminal:!0,compile:function(r,s,o){return function(s,a,l,u){var c,h,d,f,p,g,m,v,y,$,w,b,S,x,C,k,_,M,A,E,R,T,L,P,I,D,O,N,F,j,B,U,H,W,z,V;if(!(P=l.ngScroll.match(/^\s*(\w+)\s+in\s+(\w+)\s*$/)))throw new Error('Expected ngScroll in form of "item_ in _datasource_" but got "'+l.ngScroll+'"');if(T=P[1],b=P[2],E=function(e){return angular.isObject(e)&&e.get&&angular.isFunction(e.get)},!E(w=s[b])&&!E(w=t.get(b)))throw new Error(b+" is not a valid datasource");return v=Math.max(3,+l.bufferSize||10),m=function(){return V.height()*Math.max(.1,+l.padding||.1)},B=function(e){return e[0].scrollHeight||e[0].document.documentElement.scrollHeight},c=null,o(W=s.$new(),(function(e){var t,n,i,s,o,a;if("dl"===(s=e[0].localName))throw new Error("ng-scroll directive does not support <"+e[0].localName+"> as a repeating tag: "+e[0].outerHTML);return"li"!==s&&"tr"!==s&&(s="div"),(a=u[0]||angular.element(window)).css({"overflow-y":"auto",display:"block"}),i=function(e){var t,n,i;return"tr"===e?(i=angular.element("<table><tr><td><div></div></td></tr></table>"),t=i.find("div"),(n=i.find("tr")).paddingHeight=function(){return t.height.apply(t,arguments)},n):((n=angular.element("<"+e+"></"+e+">")).paddingHeight=n.height,n)},n=function(e,t,n){return t[{top:"before",bottom:"after"}[n]](e),{paddingHeight:function(){return e.paddingHeight.apply(e,arguments)},insert:function(t){return e[{top:"after",bottom:"before"}[n]](t)}}},o=n(i(s),r,"top"),t=n(i(s),r,"bottom"),W.$destroy(),c={viewport:a,topPadding:o.paddingHeight,bottomPadding:t.paddingHeight,append:t.insert,prepend:o.insert,bottomDataPos:function(){return B(a)-t.paddingHeight()},topDataPos:function(){return o.paddingHeight()}}})),V=c.viewport,M=1,I=1,g=[],D=[],x=!1,f=!1,L=w.loading||function(){},R=!1,N=function(e,t){var n,i;for(n=i=e;e<=t?i<t:i>t;n=e<=t?++i:--i)g[n].scope.$destroy(),g[n].element.remove();return g.splice(e,t-e)},O=function(){return M=1,I=1,N(0,g.length),c.topPadding(0),c.bottomPadding(0),D=[],x=!1,f=!1,h(!1)},p=function(){return V.scrollTop()+V.height()},z=function(){return V.scrollTop()},U=function(){return!x&&c.bottomDataPos()<p()+m()},y=function(){var t,n,i,r,s,o;for(t=0,r=0,n=s=o=g.length-1;(o<=0?s<=0:s>=0)&&(i=g[n].element.outerHeight(!0),c.bottomDataPos()-t-i>p()+m());n=o<=0?++s:--s)t+=i,r++,x=!1;if(r>0)return c.bottomPadding(c.bottomPadding()+t),N(g.length-r,g.length),I-=r,e.log("clipped off bottom "+r+" bottom padding "+c.bottomPadding())},H=function(){return!f&&c.topDataPos()>z()-m()},$=function(){var t,n,i,r,s;for(i=0,n=0,r=0,s=g.length;r<s&&(t=g[r].element.outerHeight(!0),c.topDataPos()+i+t<z()-m());r++)i+=t,n++,f=!1;if(n>0)return c.topPadding(c.topPadding()+i),N(0,n),M+=n,e.log("clipped off top "+n+" top padding "+c.topPadding())},S=function(e,t){if(R||(R=!0,L(!0)),1===D.push(e))return k(t)},A=function(e,t){var n,i,r;return(n=s.$new())[T]=t,i=e>M,n.$index=e,i&&n.$index--,r={scope:n},o(n,(function(t){return r.element=t,i?e===I?(c.append(t),g.push(r)):(g[e-M].element.after(t),g.splice(e-M+1,0,r)):(c.prepend(t),g.unshift(r))})),{appended:i,wrapper:r}},d=function(e,t){var n;return e?c.bottomPadding(Math.max(0,c.bottomPadding()-t.element.outerHeight(!0))):(n=c.topPadding()-t.element.outerHeight(!0))>=0?c.topPadding(n):V.scrollTop(V.scrollTop()+t.element.outerHeight(!0))},h=function(t,n,r){var s;return s=function(){if(e.log("top {actual="+c.topDataPos()+" visible from="+z()+" bottom {visible through="+p()+" actual="+c.bottomDataPos()+"}"),U()?S(!0,t):H()&&S(!1,t),r)return r()},n?i((function(){var e,t,i;for(t=0,i=n.length;t<i;t++)e=n[t],d(e.appended,e.wrapper);return s()})):s()},_=function(e,t){return h(e,t,(function(){return D.shift(),0===D.length?(R=!1,L(!1)):k(e)}))},k=function(t){return D[0]?g.length&&!U()?_(t):w.get(I,v,(function(n){var i,r,s,o;if(r=[],0===n.length)x=!0,c.bottomPadding(0),e.log("appended: requested "+v+" records starting from "+I+" recieved: eof");else{for($(),s=0,o=n.length;s<o;s++)i=n[s],r.push(A(++I,i));e.log("appended: requested "+v+" received "+n.length+" buffer size "+g.length+" first "+M+" next "+I)}return _(t,r)})):g.length&&!H()?_(t):w.get(M-v,v,(function(n){var i,r,s,o;if(r=[],0===n.length)f=!0,c.topPadding(0),e.log("prepended: requested "+v+" records starting from "+(M-v)+" recieved: bof");else{for(y(),i=s=o=n.length-1;o<=0?s<=0:s>=0;i=o<=0?++s:--s)r.unshift(A(--M,n[i]));e.log("prepended: requested "+v+" received "+n.length+" buffer size "+g.length+" first "+M+" next "+I)}return _(t,r)}))},F=function(){if(!n.$$phase&&!R)return h(!1),s.$apply()},V.bind("resize",F),j=function(){if(!n.$$phase&&!R)return h(!0),s.$apply()},V.bind("scroll",j),s.$watch(w.revision,(function(){return O()})),C=w.scope?w.scope.$new():s.$new(),s.$on("$destroy",(function(){return C.$destroy(),V.unbind("resize",F),V.unbind("scroll",j)})),C.$on("update.items",(function(e,t,n){var i,r,s,o;if(angular.isFunction(t))for(i=function(e){return t(e.scope)},r=0,s=g.length;r<s;r++)i(g[r]);else 0<=(o=t-M-1)&&o<g.length&&(g[t-M-1].scope[T]=n);return null})),C.$on("delete.items",(function(e,t){var n,i,r,s,o,a,l,u,c,d,f;if(angular.isFunction(t)){for(r=[],o=0,u=g.length;o<u;o++)i=g[o],r.unshift(i);for(s=function(e){if(t(e.scope))return N(r.length-1-n,r.length-n),I--},n=a=0,c=r.length;a<c;n=++a)s(r[n])}else 0<=(f=t-M-1)&&f<g.length&&(N(t-M-1,t-M),I--);for(n=l=0,d=g.length;l<d;n=++l)(i=g[n]).scope.$index=M+n;return h(!1)})),C.$on("insert.item",(function(e,t,n){var i,r,s,o,a,l,u,c,d,f,p;if(r=[],angular.isFunction(t)){for(s=[],a=0,c=g.length;a<c;a++)n=g[a],s.unshift(n);for(o=function(e){var s,o,a,l,u;if(o=t(e.scope)){if(A=function(e,t){return A(e,t),I++},angular.isArray(o)){for(u=[],s=a=0,l=o.length;a<l;s=++a)n=o[s],u.push(r.push(A(i+s,n)));return u}return r.push(A(i,o))}},i=l=0,d=s.length;l<d;i=++l)o(s[i])}else 0<=(p=t-M-1)&&p<g.length&&(r.push(A(t,n)),I++);for(i=u=0,f=g.length;u<f;i=++u)(n=g[i]).scope.$index=M+i;return h(!1,r)}))}}}}]),angular.module("ui.scrollfix",[]).directive("uiScrollfix",["$window",function(e){return{require:"^?uiScrollfixTarget",link:function(t,n,i,r){var s=n[0].offsetTop,o=r&&r.$element||angular.element(e);function a(){var t;angular.isDefined(e.pageYOffset)?t=e.pageYOffset:t=(document.compatMode&&"BackCompat"!==document.compatMode?document.documentElement:document.body).scrollTop;!n.hasClass("ui-scrollfix")&&t>i.uiScrollfix?n.addClass("ui-scrollfix"):n.hasClass("ui-scrollfix")&&t<i.uiScrollfix&&n.removeClass("ui-scrollfix")}i.uiScrollfix?"string"==typeof i.uiScrollfix&&("-"===i.uiScrollfix.charAt(0)?i.uiScrollfix=s-parseFloat(i.uiScrollfix.substr(1)):"+"===i.uiScrollfix.charAt(0)&&(i.uiScrollfix=s+parseFloat(i.uiScrollfix.substr(1)))):i.uiScrollfix=s,o.on("scroll",a),t.$on("$destroy",(function(){o.off("scroll",a)}))}}}]).directive("uiScrollfixTarget",[function(){return{controller:["$element",function(e){this.$element=e}]}}]),angular.module("ui.showhide",[]).directive("uiShow",[function(){return function(e,t,n){e.$watch(n.uiShow,(function(e){e?t.addClass("ui-show"):t.removeClass("ui-show")}))}}]).directive("uiHide",[function(){return function(e,t,n){e.$watch(n.uiHide,(function(e){e?t.addClass("ui-hide"):t.removeClass("ui-hide")}))}}]).directive("uiToggle",[function(){return function(e,t,n){e.$watch(n.uiToggle,(function(e){e?t.removeClass("ui-hide").addClass("ui-show"):t.removeClass("ui-show").addClass("ui-hide")}))}}]),angular.module("ui.unique",[]).filter("unique",["$parse",function(e){return function(t,n){if(!1===n)return t;if((n||angular.isUndefined(n))&&angular.isArray(t)){var i=[],r=angular.isString(n)?e(n):function(e){return e},s=function(e){return angular.isObject(e)?r(e):e};angular.forEach(t,(function(e){for(var t=!1,n=0;n<i.length;n++)if(angular.equals(s(i[n]),s(e))){t=!0;break}t||i.push(e)})),t=i}return t}}]),angular.module("ui.validate",[]).directive("uiValidate",(function(){return{restrict:"A",require:"ngModel",link:function(e,t,n,i){var r,s,o={},a=e.$eval(n.uiValidate);a&&(angular.isString(a)&&(a={validator:a}),angular.forEach(a,(function(t,n){r=function(r){var s=e.$eval(t,{$value:r});return angular.isObject(s)&&angular.isFunction(s.then)?(s.then((function(){i.$setValidity(n,!0)}),(function(){i.$setValidity(n,!1)})),r):s?(i.$setValidity(n,!0),r):(i.$setValidity(n,!1),r)},o[n]=r,i.$formatters.push(r),i.$parsers.push(r)})),n.uiValidateWatch&&(s=e.$eval(n.uiValidateWatch),angular.isString(s)?e.$watch(s,(function(){angular.forEach(o,(function(e){e(i.$modelValue)}))})):angular.isArray(s)?angular.forEach(s,(function(t){e.$watch(t,(function(){angular.forEach(o,(function(e){e(i.$modelValue)}))}))})):angular.isObject(s)&&angular.forEach(s,(function(t,n){angular.isString(t)&&e.$watch(t,(function(){o[n](i.$modelValue)})),angular.isArray(t)&&angular.forEach(t,(function(t){e.$watch(t,(function(){o[n](i.$modelValue)}))}))}))))}}})),angular.module("ui.utils",["ui.event","ui.format","ui.highlight","ui.include","ui.indeterminate","ui.inflector","ui.jq","ui.keypress","ui.mask","ui.reset","ui.route","ui.scrollfix","ui.scroll","ui.scroll.jqlite","ui.showhide","ui.unique","ui.validate"]),define("uiUtils",["angular"],(function(){})),function(){var e=function(){return this}();!e&&"undefined"!=typeof window&&(e=window);var t=function(e,n,i){"string"==typeof e?(2==arguments.length&&(i=n),t.modules[e]||(t.payloads[e]=i,t.modules[e]=null)):t.original?t.original.apply(this,arguments):(console.error("dropping module because define wasn't a string."),console.trace())};t.modules={},t.payloads={};var n=function(e,t,n){if("string"==typeof t){var r=s(e,t);if(null!=r)return n&&n(),r}else if("[object Array]"===Object.prototype.toString.call(t)){for(var o=[],a=0,l=t.length;a<l;++a){var u=s(e,t[a]);if(null==u&&i.original)return;o.push(u)}return n&&n.apply(null,o)||!0}},i=function(e,t){var r=n("",e,t);return null==r&&i.original?i.original.apply(this,arguments):r},r=function(e,t){if(-1!==t.indexOf("!")){var n=t.split("!");return r(e,n[0])+"!"+r(e,n[1])}if("."==t.charAt(0))for(t=e.split("/").slice(0,-1).join("/")+"/"+t;-1!==t.indexOf(".")&&i!=t;){var i=t;t=t.replace(/\/\.\//,"/").replace(/[^\/]+\/\.\.\//,"")}return t},s=function(e,i){i=r(e,i);var s=t.modules[i];if(!s){if("function"==typeof(s=t.payloads[i])){var o={},a={id:i,uri:"",exports:o,packaged:!0},l=s((function(e,t){return n(i,e,t)}),o,a);o=l||a.exports,t.modules[i]=o,delete t.payloads[i]}s=t.modules[i]=o||s}return s};!function(n){var r=e;n&&(e[n]||(e[n]={}),r=e[n]),r.define&&r.define.packaged||(t.original=r.define,r.define=t,r.define.packaged=!0),r.require&&r.require.packaged||(i.original=r.require,r.require=i,r.require.packaged=!0)}("ace")}(),ace.define("ace/lib/regexp",["require","exports","module"],(function(e,t,n){"use strict";var i={exec:RegExp.prototype.exec,test:RegExp.prototype.test,match:String.prototype.match,replace:String.prototype.replace,split:String.prototype.split},r=void 0===i.exec.call(/()??/,"")[1],s=function(){var e=/^/g;return i.test.call(e,""),!e.lastIndex}();s&&r||(RegExp.prototype.exec=function(e){var t,n,o=i.exec.apply(this,arguments);if("string"==typeof e&&o){if(!r&&o.length>1&&function(e,t,n){if(Array.prototype.indexOf)return e.indexOf(t,n);for(var i=n||0;i<e.length;i++)if(e[i]===t)return i;return-1}(o,"")>-1&&(n=RegExp(this.source,i.replace.call(function(e){return(e.global?"g":"")+(e.ignoreCase?"i":"")+(e.multiline?"m":"")+(e.extended?"x":"")+(e.sticky?"y":"")}(this),"g","")),i.replace.call(e.slice(o.index),n,(function(){for(var e=1;e<arguments.length-2;e++)void 0===arguments[e]&&(o[e]=void 0)}))),this._xregexp&&this._xregexp.captureNames)for(var a=1;a<o.length;a++)(t=this._xregexp.captureNames[a-1])&&(o[t]=o[a]);!s&&this.global&&!o[0].length&&this.lastIndex>o.index&&this.lastIndex--}return o},s||(RegExp.prototype.test=function(e){var t=i.exec.call(this,e);return t&&this.global&&!t[0].length&&this.lastIndex>t.index&&this.lastIndex--,!!t}))})),ace.define("ace/lib/es5-shim",["require","exports","module"],(function(e,t,n){function i(){}function r(e){try{return Object.defineProperty(e,"sentinel",{}),"sentinel"in e}catch(e){}}function s(e){return(e=+e)!=e?e=0:0!==e&&e!==1/0&&e!==-1/0&&(e=(e>0||-1)*Math.floor(Math.abs(e))),e}Function.prototype.bind||(Function.prototype.bind=function(e){var t=this;if("function"!=typeof t)throw new TypeError("Function.prototype.bind called on incompatible "+t);var n=p.call(arguments,1),r=function(){if(this instanceof r){var i=t.apply(this,n.concat(p.call(arguments)));return Object(i)===i?i:this}return t.apply(e,n.concat(p.call(arguments)))};return t.prototype&&(i.prototype=t.prototype,r.prototype=new i,i.prototype=null),r});var o,a,l,u,c,h=Function.prototype.call,d=Array.prototype,f=Object.prototype,p=d.slice,g=h.bind(f.toString),m=h.bind(f.hasOwnProperty);if((c=m(f,"__defineGetter__"))&&(o=h.bind(f.__defineGetter__),a=h.bind(f.__defineSetter__),l=h.bind(f.__lookupGetter__),u=h.bind(f.__lookupSetter__)),2!=[1,2].splice(0).length)if(function(){function e(e){var t=new Array(e+2);return t[0]=t[1]=0,t}var t,n=[];if(n.splice.apply(n,e(20)),n.splice.apply(n,e(26)),t=n.length,n.splice(5,0,"XXX"),n.length,t+1==n.length)return!0}()){var v=Array.prototype.splice;Array.prototype.splice=function(e,t){return arguments.length?v.apply(this,[void 0===e?0:e,void 0===t?this.length-e:t].concat(p.call(arguments,2))):[]}}else Array.prototype.splice=function(e,t){var n=this.length;e>0?e>n&&(e=n):null==e?e=0:e<0&&(e=Math.max(n+e,0)),e+t<n||(t=n-e);var i=this.slice(e,e+t),r=p.call(arguments,2),s=r.length;if(e===n)s&&this.push.apply(this,r);else{var o=Math.min(t,n-e),a=e+o,l=a+s-o,u=n-a,c=n-o;if(l<a)for(var h=0;h<u;++h)this[l+h]=this[a+h];else if(l>a)for(h=u;h--;)this[l+h]=this[a+h];if(s&&e===c)this.length=c,this.push.apply(this,r);else for(this.length=c+s,h=0;h<s;++h)this[e+h]=r[h]}return i};Array.isArray||(Array.isArray=function(e){return"[object Array]"==g(e)});var y,$=Object("a"),w="a"!=$[0]||!(0 in $);if(Array.prototype.forEach||(Array.prototype.forEach=function(e){var t=T(this),n=w&&"[object String]"==g(this)?this.split(""):t,i=arguments[1],r=-1,s=n.length>>>0;if("[object Function]"!=g(e))throw new TypeError;for(;++r<s;)r in n&&e.call(i,n[r],r,t)}),Array.prototype.map||(Array.prototype.map=function(e){var t=T(this),n=w&&"[object String]"==g(this)?this.split(""):t,i=n.length>>>0,r=Array(i),s=arguments[1];if("[object Function]"!=g(e))throw new TypeError(e+" is not a function");for(var o=0;o<i;o++)o in n&&(r[o]=e.call(s,n[o],o,t));return r}),Array.prototype.filter||(Array.prototype.filter=function(e){var t,n=T(this),i=w&&"[object String]"==g(this)?this.split(""):n,r=i.length>>>0,s=[],o=arguments[1];if("[object Function]"!=g(e))throw new TypeError(e+" is not a function");for(var a=0;a<r;a++)a in i&&(t=i[a],e.call(o,t,a,n)&&s.push(t));return s}),Array.prototype.every||(Array.prototype.every=function(e){var t=T(this),n=w&&"[object String]"==g(this)?this.split(""):t,i=n.length>>>0,r=arguments[1];if("[object Function]"!=g(e))throw new TypeError(e+" is not a function");for(var s=0;s<i;s++)if(s in n&&!e.call(r,n[s],s,t))return!1;return!0}),Array.prototype.some||(Array.prototype.some=function(e){var t=T(this),n=w&&"[object String]"==g(this)?this.split(""):t,i=n.length>>>0,r=arguments[1];if("[object Function]"!=g(e))throw new TypeError(e+" is not a function");for(var s=0;s<i;s++)if(s in n&&e.call(r,n[s],s,t))return!0;return!1}),Array.prototype.reduce||(Array.prototype.reduce=function(e){var t=T(this),n=w&&"[object String]"==g(this)?this.split(""):t,i=n.length>>>0;if("[object Function]"!=g(e))throw new TypeError(e+" is not a function");if(!i&&1==arguments.length)throw new TypeError("reduce of empty array with no initial value");var r,s=0;if(arguments.length>=2)r=arguments[1];else for(;;){if(s in n){r=n[s++];break}if(++s>=i)throw new TypeError("reduce of empty array with no initial value")}for(;s<i;s++)s in n&&(r=e.call(void 0,r,n[s],s,t));return r}),Array.prototype.reduceRight||(Array.prototype.reduceRight=function(e){var t=T(this),n=w&&"[object String]"==g(this)?this.split(""):t,i=n.length>>>0;if("[object Function]"!=g(e))throw new TypeError(e+" is not a function");if(!i&&1==arguments.length)throw new TypeError("reduceRight of empty array with no initial value");var r,s=i-1;if(arguments.length>=2)r=arguments[1];else for(;;){if(s in n){r=n[s--];break}if(--s<0)throw new TypeError("reduceRight of empty array with no initial value")}do{s in this&&(r=e.call(void 0,r,n[s],s,t))}while(s--);return r}),Array.prototype.indexOf&&-1==[0,1].indexOf(1,2)||(Array.prototype.indexOf=function(e){var t=w&&"[object String]"==g(this)?this.split(""):T(this),n=t.length>>>0;if(!n)return-1;var i=0;for(arguments.length>1&&(i=s(arguments[1])),i=i>=0?i:Math.max(0,n+i);i<n;i++)if(i in t&&t[i]===e)return i;return-1}),Array.prototype.lastIndexOf&&-1==[0,1].lastIndexOf(0,-3)||(Array.prototype.lastIndexOf=function(e){var t=w&&"[object String]"==g(this)?this.split(""):T(this),n=t.length>>>0;if(!n)return-1;var i=n-1;for(arguments.length>1&&(i=Math.min(i,s(arguments[1]))),i=i>=0?i:n-Math.abs(i);i>=0;i--)if(i in t&&e===t[i])return i;return-1}),Object.getPrototypeOf||(Object.getPrototypeOf=function(e){return e.__proto__||(e.constructor?e.constructor.prototype:f)}),!Object.getOwnPropertyDescriptor){Object.getOwnPropertyDescriptor=function(e,t){if("object"!=typeof e&&"function"!=typeof e||null===e)throw new TypeError("Object.getOwnPropertyDescriptor called on a non-object: "+e);if(m(e,t)){var n;if(n={enumerable:!0,configurable:!0},c){var i=e.__proto__;e.__proto__=f;var r=l(e,t),s=u(e,t);if(e.__proto__=i,r||s)return r&&(n.get=r),s&&(n.set=s),n}return n.value=e[t],n}}}(Object.getOwnPropertyNames||(Object.getOwnPropertyNames=function(e){return Object.keys(e)}),Object.create)||(y=null===Object.prototype.__proto__?function(){return{__proto__:null}}:function(){var e={};for(var t in e)e[t]=null;return e.constructor=e.hasOwnProperty=e.propertyIsEnumerable=e.isPrototypeOf=e.toLocaleString=e.toString=e.valueOf=e.__proto__=null,e},Object.create=function(e,t){var n;if(null===e)n=y();else{if("object"!=typeof e)throw new TypeError("typeof prototype["+typeof e+"] != 'object'");var i=function(){};i.prototype=e,(n=new i).__proto__=e}return void 0!==t&&Object.defineProperties(n,t),n});if(Object.defineProperty){var b=r({}),S="undefined"==typeof document||r(document.createElement("div"));if(!b||!S)var x=Object.defineProperty}if(!Object.defineProperty||x){Object.defineProperty=function(e,t,n){if("object"!=typeof e&&"function"!=typeof e||null===e)throw new TypeError("Object.defineProperty called on non-object: "+e);if("object"!=typeof n&&"function"!=typeof n||null===n)throw new TypeError("Property description must be an object: "+n);if(x)try{return x.call(Object,e,t,n)}catch(e){}if(m(n,"value"))if(c&&(l(e,t)||u(e,t))){var i=e.__proto__;e.__proto__=f,delete e[t],e[t]=n.value,e.__proto__=i}else e[t]=n.value;else{if(!c)throw new TypeError("getters & setters can not be defined on this javascript engine");m(n,"get")&&o(e,t,n.get),m(n,"set")&&a(e,t,n.set)}return e}}Object.defineProperties||(Object.defineProperties=function(e,t){for(var n in t)m(t,n)&&Object.defineProperty(e,n,t[n]);return e}),Object.seal||(Object.seal=function(e){return e}),Object.freeze||(Object.freeze=function(e){return e});try{Object.freeze((function(){}))}catch(e){Object.freeze=function(e){return function(t){return"function"==typeof t?t:e(t)}}(Object.freeze)}if(Object.preventExtensions||(Object.preventExtensions=function(e){return e}),Object.isSealed||(Object.isSealed=function(e){return!1}),Object.isFrozen||(Object.isFrozen=function(e){return!1}),Object.isExtensible||(Object.isExtensible=function(e){if(Object(e)===e)throw new TypeError;for(var t="";m(e,t);)t+="?";e[t]=!0;var n=m(e,t);return delete e[t],n}),!Object.keys){var C=!0,k=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],_=k.length;for(var M in{toString:null})C=!1;Object.keys=function(e){if("object"!=typeof e&&"function"!=typeof e||null===e)throw new TypeError("Object.keys called on a non-object");var t=[];for(var n in e)m(e,n)&&t.push(n);if(C)for(var i=0,r=_;i<r;i++){var s=k[i];m(e,s)&&t.push(s)}return t}}Date.now||(Date.now=function(){return(new Date).getTime()});var A="\t\n\v\f\r   ᠎             　\u2028\u2029\ufeff";if(!String.prototype.trim||A.trim()){A="["+A+"]";var E=new RegExp("^"+A+A+"*"),R=new RegExp(A+A+"*$");String.prototype.trim=function(){return String(this).replace(E,"").replace(R,"")}}var T=function(e){if(null==e)throw new TypeError("can't convert "+e+" to object");return Object(e)}})),ace.define("ace/lib/fixoldbrowsers",["require","exports","module","ace/lib/regexp","ace/lib/es5-shim"],(function(e,t,n){"use strict";e("./regexp"),e("./es5-shim"),"undefined"!=typeof Element&&!Element.prototype.remove&&Object.defineProperty(Element.prototype,"remove",{enumerable:!1,writable:!0,configurable:!0,value:function(){this.parentNode&&this.parentNode.removeChild(this)}})})),ace.define("ace/lib/useragent",["require","exports","module"],(function(e,t,n){"use strict";if(t.OS={LINUX:"LINUX",MAC:"MAC",WINDOWS:"WINDOWS"},t.getOS=function(){return t.isMac?t.OS.MAC:t.isLinux?t.OS.LINUX:t.OS.WINDOWS},"object"==typeof navigator){var i=(navigator.platform.match(/mac|win|linux/i)||["other"])[0].toLowerCase(),r=navigator.userAgent;t.isWin="win"==i,t.isMac="mac"==i,t.isLinux="linux"==i,t.isIE="Microsoft Internet Explorer"==navigator.appName||navigator.appName.indexOf("MSAppHost")>=0?parseFloat((r.match(/(?:MSIE |Trident\/[0-9]+[\.0-9]+;.*rv:)([0-9]+[\.0-9]+)/)||[])[1]):parseFloat((r.match(/(?:Trident\/[0-9]+[\.0-9]+;.*rv:)([0-9]+[\.0-9]+)/)||[])[1]),t.isOldIE=t.isIE&&t.isIE<9,t.isGecko=t.isMozilla=r.match(/ Gecko\/\d+/),t.isOpera=window.opera&&"[object Opera]"==Object.prototype.toString.call(window.opera),t.isWebKit=parseFloat(r.split("WebKit/")[1])||void 0,t.isChrome=parseFloat(r.split(" Chrome/")[1])||void 0,t.isEdge=parseFloat(r.split(" Edge/")[1])||void 0,t.isAIR=r.indexOf("AdobeAIR")>=0,t.isIPad=r.indexOf("iPad")>=0,t.isAndroid=r.indexOf("Android")>=0,t.isChromeOS=r.indexOf(" CrOS ")>=0,t.isIOS=/iPad|iPhone|iPod/.test(r)&&!window.MSStream,t.isIOS&&(t.isMac=!0),t.isMobile=t.isIPad||t.isAndroid}})),ace.define("ace/lib/dom",["require","exports","module","ace/lib/useragent"],(function(e,t,n){"use strict";var i=e("./useragent");if(t.buildDom=function e(t,n,i){if("string"==typeof t&&t){var r=document.createTextNode(t);return n&&n.appendChild(r),r}if(!Array.isArray(t))return t;if("string"!=typeof t[0]||!t[0]){for(var s=[],o=0;o<t.length;o++){var a=e(t[o],n,i);a&&s.push(a)}return s}var l=document.createElement(t[0]),u=t[1],c=1;u&&"object"==typeof u&&!Array.isArray(u)&&(c=2);for(o=c;o<t.length;o++)e(t[o],l,i);return 2==c&&Object.keys(u).forEach((function(e){var t=u[e];"class"===e?l.className=Array.isArray(t)?t.join(" "):t:"function"==typeof t||"value"==e?l[e]=t:"ref"===e?i&&(i[t]=l):null!=t&&l.setAttribute(e,t)})),n&&n.appendChild(l),l},t.getDocumentHead=function(e){return e||(e=document),e.head||e.getElementsByTagName("head")[0]||e.documentElement},t.createElement=function(e,t){return document.createElementNS?document.createElementNS(t||"http://www.w3.org/1999/xhtml",e):document.createElement(e)},t.removeChildren=function(e){e.innerHTML=""},t.createTextNode=function(e,t){return(t?t.ownerDocument:document).createTextNode(e)},t.createFragment=function(e){return(e?e.ownerDocument:document).createDocumentFragment()},t.hasCssClass=function(e,t){return-1!==(e.className+"").split(/\s+/g).indexOf(t)},t.addCssClass=function(e,n){t.hasCssClass(e,n)||(e.className+=" "+n)},t.removeCssClass=function(e,t){for(var n=e.className.split(/\s+/g);;){var i=n.indexOf(t);if(-1==i)break;n.splice(i,1)}e.className=n.join(" ")},t.toggleCssClass=function(e,t){for(var n=e.className.split(/\s+/g),i=!0;;){var r=n.indexOf(t);if(-1==r)break;i=!1,n.splice(r,1)}return i&&n.push(t),e.className=n.join(" "),i},t.setCssClass=function(e,n,i){i?t.addCssClass(e,n):t.removeCssClass(e,n)},t.hasCssString=function(e,t){var n,i=0;if(n=(t=t||document).querySelectorAll("style"))for(;i<n.length;)if(n[i++].id===e)return!0},t.importCssString=function(e,n,i){var r=i;i&&i.getRootNode&&(r=i.getRootNode())&&r!=i||(r=document);var s=r.ownerDocument||r;if(n&&t.hasCssString(n,r))return null;n&&(e+="\n/*# sourceURL=ace/css/"+n+" */");var o=t.createElement("style");o.appendChild(s.createTextNode(e)),n&&(o.id=n),r==s&&(r=t.getDocumentHead(s)),r.insertBefore(o,r.firstChild)},t.importCssStylsheet=function(e,n){t.buildDom(["link",{rel:"stylesheet",href:e}],t.getDocumentHead(n))},t.scrollbarWidth=function(e){var n=t.createElement("ace_inner");n.style.width="100%",n.style.minWidth="0px",n.style.height="200px",n.style.display="block";var i=t.createElement("ace_outer"),r=i.style;r.position="absolute",r.left="-10000px",r.overflow="hidden",r.width="200px",r.minWidth="0px",r.height="150px",r.display="block",i.appendChild(n);var s=e.documentElement;s.appendChild(i);var o=n.offsetWidth;r.overflow="scroll";var a=n.offsetWidth;return o==a&&(a=i.clientWidth),s.removeChild(i),o-a},"undefined"==typeof document&&(t.importCssString=function(){}),t.computedStyle=function(e,t){return window.getComputedStyle(e,"")||{}},t.setStyle=function(e,t,n){e[t]!==n&&(e[t]=n)},t.HAS_CSS_ANIMATION=!1,t.HAS_CSS_TRANSFORMS=!1,t.HI_DPI=!i.isWin||"undefined"!=typeof window&&window.devicePixelRatio>=1.5,"undefined"!=typeof document){var r=document.createElement("div");t.HI_DPI&&void 0!==r.style.transform&&(t.HAS_CSS_TRANSFORMS=!0),!i.isEdge&&void 0!==r.style.animationName&&(t.HAS_CSS_ANIMATION=!0),r=null}t.HAS_CSS_TRANSFORMS?t.translate=function(e,t,n){e.style.transform="translate("+Math.round(t)+"px, "+Math.round(n)+"px)"}:t.translate=function(e,t,n){e.style.top=Math.round(n)+"px",e.style.left=Math.round(t)+"px"}})),ace.define("ace/lib/oop",["require","exports","module"],(function(e,t,n){"use strict";t.inherits=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})},t.mixin=function(e,t){for(var n in t)e[n]=t[n];return e},t.implement=function(e,n){t.mixin(e,n)}})),ace.define("ace/lib/keys",["require","exports","module","ace/lib/oop"],(function(e,t,n){"use strict";var i=e("./oop"),r=function(){var e,t,n={MODIFIER_KEYS:{16:"Shift",17:"Ctrl",18:"Alt",224:"Meta"},KEY_MODS:{ctrl:1,alt:2,option:2,shift:4,super:8,meta:8,command:8,cmd:8},FUNCTION_KEYS:{8:"Backspace",9:"Tab",13:"Return",19:"Pause",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"Print",45:"Insert",46:"Delete",96:"Numpad0",97:"Numpad1",98:"Numpad2",99:"Numpad3",100:"Numpad4",101:"Numpad5",102:"Numpad6",103:"Numpad7",104:"Numpad8",105:"Numpad9","-13":"NumpadEnter",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"Numlock",145:"Scrolllock"},PRINTABLE_KEYS:{32:" ",48:"0",49:"1",50:"2",51:"3",52:"4",53:"5",54:"6",55:"7",56:"8",57:"9",59:";",61:"=",65:"a",66:"b",67:"c",68:"d",69:"e",70:"f",71:"g",72:"h",73:"i",74:"j",75:"k",76:"l",77:"m",78:"n",79:"o",80:"p",81:"q",82:"r",83:"s",84:"t",85:"u",86:"v",87:"w",88:"x",89:"y",90:"z",107:"+",109:"-",110:".",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'",111:"/",106:"*"}};for(t in n.FUNCTION_KEYS)e=n.FUNCTION_KEYS[t].toLowerCase(),n[e]=parseInt(t,10);for(t in n.PRINTABLE_KEYS)e=n.PRINTABLE_KEYS[t].toLowerCase(),n[e]=parseInt(t,10);return i.mixin(n,n.MODIFIER_KEYS),i.mixin(n,n.PRINTABLE_KEYS),i.mixin(n,n.FUNCTION_KEYS),n.enter=n.return,n.escape=n.esc,n.del=n.delete,n[173]="-",function(){for(var e=["cmd","ctrl","alt","shift"],t=Math.pow(2,e.length);t--;)n.KEY_MODS[t]=e.filter((function(e){return t&n.KEY_MODS[e]})).join("-")+"-"}(),n.KEY_MODS[0]="",n.KEY_MODS[-1]="input-",n}();i.mixin(t,r),t.keyCodeToString=function(e){var t=r[e];return"string"!=typeof t&&(t=String.fromCharCode(e)),t.toLowerCase()}})),ace.define("ace/lib/event",["require","exports","module","ace/lib/keys","ace/lib/useragent"],(function(e,t,n){"use strict";function i(e,t,n){var i=u(t);if(!o.isMac&&a){if(t.getModifierState&&(t.getModifierState("OS")||t.getModifierState("Win"))&&(i|=8),a.altGr){if(3==(3&i))return;a.altGr=0}if(18===n||17===n){var r="location"in t?t.location:t.keyLocation;if(17===n&&1===r)1==a[n]&&(l=t.timeStamp);else if(18===n&&3===i&&2===r){t.timeStamp-l<50&&(a.altGr=!0)}}}if((n in s.MODIFIER_KEYS&&(n=-1),8&i&&n>=91&&n<=93&&(n=-1),!i&&13===n)&&(3===(r="location"in t?t.location:t.keyLocation)&&(e(t,i,-n),t.defaultPrevented)))return;if(o.isChromeOS&&8&i){if(e(t,i,n),t.defaultPrevented)return;i&=-9}return!!(i||n in s.FUNCTION_KEYS||n in s.PRINTABLE_KEYS)&&e(t,i,n)}function r(){a=Object.create(null)}var s=e("./keys"),o=e("./useragent"),a=null,l=0;t.addListener=function(e,t,n){if(e.addEventListener)return e.addEventListener(t,n,!1);if(e.attachEvent){var i=function(){n.call(e,window.event)};n._wrapper=i,e.attachEvent("on"+t,i)}},t.removeListener=function(e,t,n){if(e.removeEventListener)return e.removeEventListener(t,n,!1);e.detachEvent&&e.detachEvent("on"+t,n._wrapper||n)},t.stopEvent=function(e){return t.stopPropagation(e),t.preventDefault(e),!1},t.stopPropagation=function(e){e.stopPropagation?e.stopPropagation():e.cancelBubble=!0},t.preventDefault=function(e){e.preventDefault?e.preventDefault():e.returnValue=!1},t.getButton=function(e){return"dblclick"==e.type?0:"contextmenu"==e.type||o.isMac&&e.ctrlKey&&!e.altKey&&!e.shiftKey?2:e.preventDefault?e.button:{1:0,2:2,4:1}[e.button]},t.capture=function(e,n,i){function r(e){n&&n(e),i&&i(e),t.removeListener(document,"mousemove",n,!0),t.removeListener(document,"mouseup",r,!0),t.removeListener(document,"dragstart",r,!0)}return t.addListener(document,"mousemove",n,!0),t.addListener(document,"mouseup",r,!0),t.addListener(document,"dragstart",r,!0),r},t.addTouchMoveListener=function(e,n){var i,r;t.addListener(e,"touchstart",(function(e){var t=e.touches[0];i=t.clientX,r=t.clientY})),t.addListener(e,"touchmove",(function(e){var t=e.touches;if(!(t.length>1)){var s=t[0];e.wheelX=i-s.clientX,e.wheelY=r-s.clientY,i=s.clientX,r=s.clientY,n(e)}}))},t.addMouseWheelListener=function(e,n){"onmousewheel"in e?t.addListener(e,"mousewheel",(function(e){void 0!==e.wheelDeltaX?(e.wheelX=-e.wheelDeltaX/8,e.wheelY=-e.wheelDeltaY/8):(e.wheelX=0,e.wheelY=-e.wheelDelta/8),n(e)})):"onwheel"in e?t.addListener(e,"wheel",(function(e){switch(e.deltaMode){case e.DOM_DELTA_PIXEL:e.wheelX=.35*e.deltaX||0,e.wheelY=.35*e.deltaY||0;break;case e.DOM_DELTA_LINE:case e.DOM_DELTA_PAGE:e.wheelX=5*(e.deltaX||0),e.wheelY=5*(e.deltaY||0)}n(e)})):t.addListener(e,"DOMMouseScroll",(function(e){e.axis&&e.axis==e.HORIZONTAL_AXIS?(e.wheelX=5*(e.detail||0),e.wheelY=0):(e.wheelX=0,e.wheelY=5*(e.detail||0)),n(e)}))},t.addMultiMouseDownListener=function(e,n,i,r){function s(e){if(0!==t.getButton(e)?h=0:e.detail>1?++h>4&&(h=1):h=1,o.isIE){var s=Math.abs(e.clientX-l)>5||Math.abs(e.clientY-u)>5;c&&!s||(h=1),c&&clearTimeout(c),c=setTimeout((function(){c=null}),n[h-1]||600),1==h&&(l=e.clientX,u=e.clientY)}if(e._clicks=h,i[r]("mousedown",e),h>4)h=0;else if(h>1)return i[r](d[h],e)}function a(e){h=2,c&&clearTimeout(c),c=setTimeout((function(){c=null}),n[h-1]||600),i[r]("mousedown",e),i[r](d[h],e)}var l,u,c,h=0,d={2:"dblclick",3:"tripleclick",4:"quadclick"};Array.isArray(e)||(e=[e]),e.forEach((function(e){t.addListener(e,"mousedown",s),o.isOldIE&&t.addListener(e,"dblclick",a)}))};var u=o.isMac&&o.isOpera&&!("KeyboardEvent"in window)?function(e){return 0|(e.metaKey?1:0)|(e.altKey?2:0)|(e.shiftKey?4:0)|(e.ctrlKey?8:0)}:function(e){return 0|(e.ctrlKey?1:0)|(e.altKey?2:0)|(e.shiftKey?4:0)|(e.metaKey?8:0)};if(t.getModifierString=function(e){return s.KEY_MODS[u(e)]},t.addCommandKeyListener=function(e,n){var s=t.addListener;if(o.isOldGecko||o.isOpera&&!("KeyboardEvent"in window)){var l=null;s(e,"keydown",(function(e){l=e.keyCode})),s(e,"keypress",(function(e){return i(n,e,l)}))}else{var u=null;s(e,"keydown",(function(e){a[e.keyCode]=(a[e.keyCode]||0)+1;var t=i(n,e,e.keyCode);return u=e.defaultPrevented,t})),s(e,"keypress",(function(e){u&&(e.ctrlKey||e.altKey||e.shiftKey||e.metaKey)&&(t.stopEvent(e),u=null)})),s(e,"keyup",(function(e){a[e.keyCode]=null})),a||(r(),s(window,"focus",r))}},"object"==typeof window&&window.postMessage&&!o.isOldIE){var c=1;t.nextTick=function(e,n){n=n||window;var i="zero-timeout-message-"+c++,r=function(s){s.data==i&&(t.stopPropagation(s),t.removeListener(n,"message",r),e())};t.addListener(n,"message",r),n.postMessage(i,"*")}}t.$idleBlocked=!1,t.onIdle=function(e,n){return setTimeout((function n(){t.$idleBlocked?setTimeout(n,100):e()}),n)},t.$idleBlockId=null,t.blockIdle=function(e){t.$idleBlockId&&clearTimeout(t.$idleBlockId),t.$idleBlocked=!0,t.$idleBlockId=setTimeout((function(){t.$idleBlocked=!1}),e||100)},t.nextFrame="object"==typeof window&&(window.requestAnimationFrame||window.mozRequestAnimationFrame||window.webkitRequestAnimationFrame||window.msRequestAnimationFrame||window.oRequestAnimationFrame),t.nextFrame?t.nextFrame=t.nextFrame.bind(window):t.nextFrame=function(e){setTimeout(e,17)}})),ace.define("ace/range",["require","exports","module"],(function(e,t,n){"use strict";var i=function(e,t,n,i){this.start={row:e,column:t},this.end={row:n,column:i}};(function(){this.isEqual=function(e){return this.start.row===e.start.row&&this.end.row===e.end.row&&this.start.column===e.start.column&&this.end.column===e.end.column},this.toString=function(){return"Range: ["+this.start.row+"/"+this.start.column+"] -> ["+this.end.row+"/"+this.end.column+"]"},this.contains=function(e,t){return 0==this.compare(e,t)},this.compareRange=function(e){var t,n=e.end,i=e.start;return 1==(t=this.compare(n.row,n.column))?1==(t=this.compare(i.row,i.column))?2:0==t?1:0:-1==t?-2:-1==(t=this.compare(i.row,i.column))?-1:1==t?42:0},this.comparePoint=function(e){return this.compare(e.row,e.column)},this.containsRange=function(e){return 0==this.comparePoint(e.start)&&0==this.comparePoint(e.end)},this.intersects=function(e){var t=this.compareRange(e);return-1==t||0==t||1==t},this.isEnd=function(e,t){return this.end.row==e&&this.end.column==t},this.isStart=function(e,t){return this.start.row==e&&this.start.column==t},this.setStart=function(e,t){"object"==typeof e?(this.start.column=e.column,this.start.row=e.row):(this.start.row=e,this.start.column=t)},this.setEnd=function(e,t){"object"==typeof e?(this.end.column=e.column,this.end.row=e.row):(this.end.row=e,this.end.column=t)},this.inside=function(e,t){return 0==this.compare(e,t)&&(!this.isEnd(e,t)&&!this.isStart(e,t))},this.insideStart=function(e,t){return 0==this.compare(e,t)&&!this.isEnd(e,t)},this.insideEnd=function(e,t){return 0==this.compare(e,t)&&!this.isStart(e,t)},this.compare=function(e,t){return this.isMultiLine()||e!==this.start.row?e<this.start.row?-1:e>this.end.row?1:this.start.row===e?t>=this.start.column?0:-1:this.end.row===e?t<=this.end.column?0:1:0:t<this.start.column?-1:t>this.end.column?1:0},this.compareStart=function(e,t){return this.start.row==e&&this.start.column==t?-1:this.compare(e,t)},this.compareEnd=function(e,t){return this.end.row==e&&this.end.column==t?1:this.compare(e,t)},this.compareInside=function(e,t){return this.end.row==e&&this.end.column==t?1:this.start.row==e&&this.start.column==t?-1:this.compare(e,t)},this.clipRows=function(e,t){if(this.end.row>t)var n={row:t+1,column:0};else if(this.end.row<e)n={row:e,column:0};if(this.start.row>t)var r={row:t+1,column:0};else if(this.start.row<e)r={row:e,column:0};return i.fromPoints(r||this.start,n||this.end)},this.extend=function(e,t){var n=this.compare(e,t);if(0==n)return this;if(-1==n)var r={row:e,column:t};else var s={row:e,column:t};return i.fromPoints(r||this.start,s||this.end)},this.isEmpty=function(){return this.start.row===this.end.row&&this.start.column===this.end.column},this.isMultiLine=function(){return this.start.row!==this.end.row},this.clone=function(){return i.fromPoints(this.start,this.end)},this.collapseRows=function(){return 0==this.end.column?new i(this.start.row,0,Math.max(this.start.row,this.end.row-1),0):new i(this.start.row,0,this.end.row,0)},this.toScreenRange=function(e){var t=e.documentToScreenPosition(this.start),n=e.documentToScreenPosition(this.end);return new i(t.row,t.column,n.row,n.column)},this.moveBy=function(e,t){this.start.row+=e,this.start.column+=t,this.end.row+=e,this.end.column+=t}}).call(i.prototype),i.fromPoints=function(e,t){return new i(e.row,e.column,t.row,t.column)},i.comparePoints=function(e,t){return e.row-t.row||e.column-t.column},i.comparePoints=function(e,t){return e.row-t.row||e.column-t.column},t.Range=i})),ace.define("ace/lib/lang",["require","exports","module"],(function(e,t,n){"use strict";t.last=function(e){return e[e.length-1]},t.stringReverse=function(e){return e.split("").reverse().join("")},t.stringRepeat=function(e,t){for(var n="";t>0;)1&t&&(n+=e),(t>>=1)&&(e+=e);return n};var i=/^\s\s*/,r=/\s\s*$/;t.stringTrimLeft=function(e){return e.replace(i,"")},t.stringTrimRight=function(e){return e.replace(r,"")},t.copyObject=function(e){var t={};for(var n in e)t[n]=e[n];return t},t.copyArray=function(e){for(var t=[],n=0,i=e.length;n<i;n++)e[n]&&"object"==typeof e[n]?t[n]=this.copyObject(e[n]):t[n]=e[n];return t},t.deepCopy=function e(t){if("object"!=typeof t||!t)return t;var n;if(Array.isArray(t)){n=[];for(var i=0;i<t.length;i++)n[i]=e(t[i]);return n}if("[object Object]"!==Object.prototype.toString.call(t))return t;for(var i in n={},t)n[i]=e(t[i]);return n},t.arrayToMap=function(e){for(var t={},n=0;n<e.length;n++)t[e[n]]=1;return t},t.createMap=function(e){var t=Object.create(null);for(var n in e)t[n]=e[n];return t},t.arrayRemove=function(e,t){for(var n=0;n<=e.length;n++)t===e[n]&&e.splice(n,1)},t.escapeRegExp=function(e){return e.replace(/([.*+?^${}()|[\]\/\\])/g,"\\$1")},t.escapeHTML=function(e){return(""+e).replace(/&/g,"&#38;").replace(/"/g,"&#34;").replace(/'/g,"&#39;").replace(/</g,"&#60;")},t.getMatchOffsets=function(e,t){var n=[];return e.replace(t,(function(e){n.push({offset:arguments[arguments.length-2],length:e.length})})),n},t.deferredCall=function(e){var t=null,n=function(){t=null,e()},i=function(e){return i.cancel(),t=setTimeout(n,e||0),i};return i.schedule=i,i.call=function(){return this.cancel(),e(),i},i.cancel=function(){return clearTimeout(t),t=null,i},i.isPending=function(){return t},i},t.delayedCall=function(e,t){var n=null,i=function(){n=null,e()},r=function(e){null==n&&(n=setTimeout(i,e||t))};return r.delay=function(e){n&&clearTimeout(n),n=setTimeout(i,e||t)},r.schedule=r,r.call=function(){this.cancel(),e()},r.cancel=function(){n&&clearTimeout(n),n=null},r.isPending=function(){return n},r}})),ace.define("ace/keyboard/textinput",["require","exports","module","ace/lib/event","ace/lib/useragent","ace/lib/dom","ace/lib/lang","ace/lib/keys"],(function(e,t,n){"use strict";var i=e("../lib/event"),r=e("../lib/useragent"),s=e("../lib/dom"),o=e("../lib/lang"),a=r.isChrome<18,l=r.isIE,u=r.isChrome>63,c=400,h=e("../lib/keys"),d=h.KEY_MODS,f=r.isIOS,p=f?/\s/:/\n/;t.TextInput=function(e,t){function n(){x=!0,m.blur(),m.focus(),x=!1}function g(){clearTimeout(U),U=setTimeout((function(){b&&(m.style.cssText=b,b=""),null==t.renderer.$keepTextAreaAtCursor&&(t.renderer.$keepTextAreaAtCursor=!0,t.renderer.$moveTextAreaToCursor())}),0)}var m=s.createElement("textarea");m.className="ace_text-input",m.setAttribute("wrap","off"),m.setAttribute("autocorrect","off"),m.setAttribute("autocapitalize","off"),m.setAttribute("spellcheck",!1),m.style.opacity="0",e.insertBefore(m,e.firstChild);var v=!1,y=!1,$=!1,w=!1,b="";r.isMobile||(m.style.fontSize="1px");var S=!1,x=!1,C="",k=0,_=0;try{var M=document.activeElement===m}catch(e){}i.addListener(m,"blur",(function(e){x||(t.onBlur(e),M=!1)})),i.addListener(m,"focus",(function(e){if(!x){if(M=!0,r.isEdge)try{if(!document.hasFocus())return}catch(e){}t.onFocus(e),r.isEdge?setTimeout(A):A()}})),this.$focusScroll=!1,this.focus=function(){if(b||u||"browser"==this.$focusScroll)return m.focus({preventScroll:!0});var e=m.style.top;m.style.position="fixed",m.style.top="0px";try{var t=0!=m.getBoundingClientRect().top}catch(e){return}var n=[];if(t)for(var i=m.parentElement;i&&1==i.nodeType;)n.push(i),i.setAttribute("ace_nocontext",!0),i=!i.parentElement&&i.getRootNode?i.getRootNode().host:i.parentElement;m.focus({preventScroll:!0}),t&&n.forEach((function(e){e.removeAttribute("ace_nocontext")})),setTimeout((function(){m.style.position="","0px"==m.style.top&&(m.style.top=e)}),0)},this.blur=function(){m.blur()},this.isFocused=function(){return M},t.on("beforeEndOperation",(function(){t.curOp&&"insertstring"==t.curOp.command.name||($&&(C=m.value="",j()),A())}));var A=f?function(e){if(M&&(!v||e)){e||(e="");var n="\n ab"+e+"cde fg\n";n!=m.value&&(m.value=C=n);var i=4+(e.length||(t.selection.isEmpty()?0:1));(4!=k||_!=i)&&m.setSelectionRange(4,i),k=4,_=i}}:function(){if(!$&&!w&&(M||R)){$=!0;var e=t.selection,n=e.getRange(),i=e.cursor.row,r=n.start.column,s=n.end.column,o=t.session.getLine(i);if(n.start.row!=i){var a=t.session.getLine(i-1);r=n.start.row<i-1?0:r,s+=a.length+1,o=a+"\n"+o}else if(n.end.row!=i){var l=t.session.getLine(i+1);s=n.end.row>i+1?l.length:s,s+=o.length+1,o=o+"\n"+l}o.length>c&&(r<c&&s<c?o=o.slice(0,c):(o="\n",r=0,s=1));var u=o+"\n\n";if(u!=C&&(m.value=C=u,k=_=u.length),R&&(k=m.selectionStart,_=m.selectionEnd),_!=s||k!=r||m.selectionEnd!=_)try{m.setSelectionRange(r,s),k=r,_=s}catch(e){}$=!1}};M&&t.onFocus();var E=null;this.setInputHandler=function(e){E=e},this.getInputHandler=function(){return E};var R=!1,T=function(e,n){if(R&&(R=!1),y)return A(),e&&t.onPaste(e),y=!1,"";for(var i=m.selectionStart,r=m.selectionEnd,s=k,o=C.length-_,a=e,l=e.length-i,u=e.length-r,c=0;s>0&&C[c]==e[c];)c++,s--;for(a=a.slice(c),c=1;o>0&&C.length-c>k-1&&C[C.length-c]==e[e.length-c];)c++,o--;return l-=c-1,u-=c-1,a=a.slice(0,a.length-c+1),n||l!=a.length||s||o||u?(w=!0,a&&!s&&!o&&!l&&!u||S?t.onTextInput(a):t.onTextInput(a,{extendLeft:s,extendRight:o,restoreStart:l,restoreEnd:u}),w=!1,C=e,k=i,_=r,a):""},L=function(e){if($)return F();var t=m.value,n=T(t,!0);(t.length>500||p.test(n))&&A()},P=function(e,t,n){var i=e.clipboardData||window.clipboardData;if(i&&!a){var r=l||n?"Text":"text/plain";try{return t?!1!==i.setData(r,t):i.getData(r)}catch(e){if(!n)return P(e,t,!0)}}},I=function(e,n){var r=t.getCopyText();if(!r)return i.preventDefault(e);P(e,r)?(f&&(A(r),v=r,setTimeout((function(){v=!1}),10)),n?t.onCut():t.onCopy(),i.preventDefault(e)):(v=!0,m.value=r,m.select(),setTimeout((function(){v=!1,A(),n?t.onCut():t.onCopy()})))},D=function(e){I(e,!0)},O=function(e){I(e,!1)},N=function(e){var n=P(e);"string"==typeof n?(n&&t.onPaste(n,e),r.isIE&&setTimeout(A),i.preventDefault(e)):(m.value="",y=!0)};i.addCommandKeyListener(m,t.onCommandKey.bind(t)),i.addListener(m,"select",(function(e){$||(v?v=!1:function(e){return 0===e.selectionStart&&e.selectionEnd>=C.length&&e.value===C&&C&&e.selectionEnd!==_}(m)&&(t.selectAll(),A()))})),i.addListener(m,"input",L),i.addListener(m,"cut",D),i.addListener(m,"copy",O),i.addListener(m,"paste",N),(!("oncut"in m)||!("oncopy"in m)||!("onpaste"in m))&&i.addListener(e,"keydown",(function(e){if((!r.isMac||e.metaKey)&&e.ctrlKey)switch(e.keyCode){case 67:O(e);break;case 86:N(e);break;case 88:D(e)}}));var F=function(){if($&&t.onCompositionUpdate&&!t.$readOnly){if(S)return n();if($.useTextareaForIME)t.onCompositionUpdate(m.value);else{var e=m.value;T(e),$.markerRange&&($.context&&($.markerRange.start.column=$.selectionStart=$.context.compositionStartOffset),$.markerRange.end.column=$.markerRange.start.column+_-$.selectionStart)}}},j=function(e){t.onCompositionEnd&&!t.$readOnly&&($=!1,t.onCompositionEnd(),t.off("mousedown",n),e&&L())},B=o.delayedCall(F,50).schedule.bind(null,null);i.addListener(m,"compositionstart",(function(e){if(!$&&t.onCompositionStart&&!t.$readOnly&&($={},!S)){setTimeout(F,0),t.on("mousedown",n);var i=t.getSelectionRange();i.end.row=i.start.row,i.end.column=i.start.column,$.markerRange=i,$.selectionStart=k,t.onCompositionStart($),$.useTextareaForIME?(m.value="",C="",k=0,_=0):(m.msGetInputContext&&($.context=m.msGetInputContext()),m.getInputContext&&($.context=m.getInputContext()))}})),i.addListener(m,"compositionupdate",F),i.addListener(m,"keyup",(function(e){27==e.keyCode&&m.value.length<m.selectionStart&&($||(C=m.value),k=_=-1,A()),B()})),i.addListener(m,"keydown",B),i.addListener(m,"compositionend",j),this.getElement=function(){return m},this.setCommandMode=function(e){S=e,m.readOnly=!1},this.setReadOnly=function(e){S||(m.readOnly=e)},this.setCopyWithEmptySelection=function(e){e},this.onContextMenu=function(e){R=!0,A(),t._emit("nativecontextmenu",{target:t,domEvent:e}),this.moveToMouse(e,!0)},this.moveToMouse=function(e,n){b||(b=m.style.cssText),m.style.cssText=(n?"z-index:100000;":"")+(r.isIE?"opacity:0.1;":"")+"text-indent: -"+(k+_)*t.renderer.characterWidth*.5+"px;";var o=t.container.getBoundingClientRect(),a=s.computedStyle(t.container),l=o.top+(parseInt(a.borderTopWidth)||0),u=o.left+(parseInt(o.borderLeftWidth)||0),c=o.bottom-l-m.clientHeight-2,h=function(e){m.style.left=e.clientX-u-2+"px",m.style.top=Math.min(e.clientY-l-2,c)+"px"};h(e),"mousedown"==e.type&&(t.renderer.$keepTextAreaAtCursor&&(t.renderer.$keepTextAreaAtCursor=null),clearTimeout(U),r.isWin&&i.capture(t.container,h,g))},this.onContextMenuClose=g;var U,H=function(e){t.textInput.onContextMenu(e),g()};i.addListener(m,"mouseup",H),i.addListener(m,"mousedown",(function(e){e.preventDefault(),g()})),i.addListener(t.renderer.scroller,"contextmenu",H),i.addListener(m,"contextmenu",H),f&&function(e,t,n){var i=null,r=!1;n.addEventListener("keydown",(function(e){i&&clearTimeout(i),r=!0}),!0),n.addEventListener("keyup",(function(e){i=setTimeout((function(){r=!1}),100)}),!0);var s=function(e){if(document.activeElement===n&&!r&&!$&&!v){var i=n.selectionStart,s=n.selectionEnd,o=null,a=0;console.log(i,s),0==i?o=h.up:1==i?o=h.home:s>_&&"\n"==C[s]?o=h.end:i<k&&" "==C[i-1]?(o=h.left,a=d.option):i<k||i==k&&_!=k&&i==s?o=h.left:s>_&&C.slice(0,s).split("\n").length>2?o=h.down:s>_&&" "==C[s-1]?(o=h.right,a=d.option):(s>_||s==_&&_!=k&&i==s)&&(o=h.right),i!==s&&(a|=d.shift),o&&(t.onCommandKey(null,a,o),k=i,_=s,A(""))}};document.addEventListener("selectionchange",s),t.on("destroy",(function(){document.removeEventListener("selectionchange",s)}))}(0,t,m)}})),ace.define("ace/mouse/default_handlers",["require","exports","module","ace/lib/useragent"],(function(e,t,n){"use strict";function i(e){e.$clickSelection=null;var t=e.editor;t.setDefaultHandler("mousedown",this.onMouseDown.bind(e)),t.setDefaultHandler("dblclick",this.onDoubleClick.bind(e)),t.setDefaultHandler("tripleclick",this.onTripleClick.bind(e)),t.setDefaultHandler("quadclick",this.onQuadClick.bind(e)),t.setDefaultHandler("mousewheel",this.onMouseWheel.bind(e)),t.setDefaultHandler("touchmove",this.onTouchMove.bind(e));["select","startSelect","selectEnd","selectAllEnd","selectByWordsEnd","selectByLinesEnd","dragWait","dragWaitEnd","focusWait"].forEach((function(t){e[t]=this[t]}),this),e.selectByLines=this.extendSelectionBy.bind(e,"getLineRange"),e.selectByWords=this.extendSelectionBy.bind(e,"getWordRange")}function r(e,t){if(e.start.row==e.end.row)var n=2*t.column-e.start.column-e.end.column;else if(e.start.row!=e.end.row-1||e.start.column||e.end.column)n=2*t.row-e.start.row-e.end.row;else var n=t.column-4;return n<0?{cursor:e.start,anchor:e.end}:{cursor:e.end,anchor:e.start}}var s=e("../lib/useragent");(function(){this.onMouseDown=function(e){var t=e.inSelection(),n=e.getDocumentPosition();this.mousedownEvent=e;var i=this.editor,r=e.getButton();return 0!==r?((i.getSelectionRange().isEmpty()||1==r)&&i.selection.moveToPosition(n),void(2==r&&(i.textInput.onContextMenu(e.domEvent),s.isMozilla||e.preventDefault()))):(this.mousedownEvent.time=Date.now(),!t||i.isFocused()||(i.focus(),!this.$focusTimeout||this.$clickSelection||i.inMultiSelectMode)?(this.captureMouse(e),this.startSelect(n,e.domEvent._clicks>1),e.preventDefault()):(this.setState("focusWait"),void this.captureMouse(e)))},this.startSelect=function(e,t){e=e||this.editor.renderer.screenToTextCoordinates(this.x,this.y);var n=this.editor;this.mousedownEvent&&(this.mousedownEvent.getShiftKey()?n.selection.selectToPosition(e):t||n.selection.moveToPosition(e),t||this.select(),n.renderer.scroller.setCapture&&n.renderer.scroller.setCapture(),n.setStyle("ace_selecting"),this.setState("select"))},this.select=function(){var e,t=this.editor,n=t.renderer.screenToTextCoordinates(this.x,this.y);if(this.$clickSelection){var i=this.$clickSelection.comparePoint(n);if(-1==i)e=this.$clickSelection.end;else if(1==i)e=this.$clickSelection.start;else{var s=r(this.$clickSelection,n);n=s.cursor,e=s.anchor}t.selection.setSelectionAnchor(e.row,e.column)}t.selection.selectToPosition(n),t.renderer.scrollCursorIntoView()},this.extendSelectionBy=function(e){var t,n=this.editor,i=n.renderer.screenToTextCoordinates(this.x,this.y),s=n.selection[e](i.row,i.column);if(this.$clickSelection){var o=this.$clickSelection.comparePoint(s.start),a=this.$clickSelection.comparePoint(s.end);if(-1==o&&a<=0)t=this.$clickSelection.end,s.end.row==i.row&&s.end.column==i.column||(i=s.start);else if(1==a&&o>=0)t=this.$clickSelection.start,s.start.row==i.row&&s.start.column==i.column||(i=s.end);else if(-1==o&&1==a)i=s.end,t=s.start;else{var l=r(this.$clickSelection,i);i=l.cursor,t=l.anchor}n.selection.setSelectionAnchor(t.row,t.column)}n.selection.selectToPosition(i),n.renderer.scrollCursorIntoView()},this.selectEnd=this.selectAllEnd=this.selectByWordsEnd=this.selectByLinesEnd=function(){this.$clickSelection=null,this.editor.unsetStyle("ace_selecting"),this.editor.renderer.scroller.releaseCapture&&this.editor.renderer.scroller.releaseCapture()},this.focusWait=function(){var e=function(e,t,n,i){return Math.sqrt(Math.pow(n-e,2)+Math.pow(i-t,2))}(this.mousedownEvent.x,this.mousedownEvent.y,this.x,this.y),t=Date.now();(e>0||t-this.mousedownEvent.time>this.$focusTimeout)&&this.startSelect(this.mousedownEvent.getDocumentPosition())},this.onDoubleClick=function(e){var t=e.getDocumentPosition(),n=this.editor,i=n.session.getBracketRange(t);i?(i.isEmpty()&&(i.start.column--,i.end.column++),this.setState("select")):(i=n.selection.getWordRange(t.row,t.column),this.setState("selectByWords")),this.$clickSelection=i,this.select()},this.onTripleClick=function(e){var t=e.getDocumentPosition(),n=this.editor;this.setState("selectByLines");var i=n.getSelectionRange();i.isMultiLine()&&i.contains(t.row,t.column)?(this.$clickSelection=n.selection.getLineRange(i.start.row),this.$clickSelection.end=n.selection.getLineRange(i.end.row).end):this.$clickSelection=n.selection.getLineRange(t.row),this.select()},this.onQuadClick=function(e){var t=this.editor;t.selectAll(),this.$clickSelection=t.getSelectionRange(),this.setState("selectAll")},this.onMouseWheel=function(e){if(!e.getAccelKey()){e.getShiftKey()&&e.wheelY&&!e.wheelX&&(e.wheelX=e.wheelY,e.wheelY=0);var t=this.editor;this.$lastScroll||(this.$lastScroll={t:0,vx:0,vy:0,allowed:0});var n=this.$lastScroll,i=e.domEvent.timeStamp,r=i-n.t,s=r?e.wheelX/r:n.vx,o=r?e.wheelY/r:n.vy;r<550&&(s=(s+n.vx)/2,o=(o+n.vy)/2);var a=Math.abs(s/o),l=!1;if(a>=1&&t.renderer.isScrollableBy(e.wheelX*e.speed,0)&&(l=!0),a<=1&&t.renderer.isScrollableBy(0,e.wheelY*e.speed)&&(l=!0),l)n.allowed=i;else if(i-n.allowed<550){Math.abs(s)<=1.5*Math.abs(n.vx)&&Math.abs(o)<=1.5*Math.abs(n.vy)?(l=!0,n.allowed=i):n.allowed=0}return n.t=i,n.vx=s,n.vy=o,l?(t.renderer.scrollBy(e.wheelX*e.speed,e.wheelY*e.speed),e.stop()):void 0}},this.onTouchMove=function(e){this.editor._emit("mousewheel",e)}}).call(i.prototype),t.DefaultHandlers=i})),ace.define("ace/tooltip",["require","exports","module","ace/lib/oop","ace/lib/dom"],(function(e,t,n){"use strict";function i(e){this.isOpen=!1,this.$element=null,this.$parentNode=e}e("./lib/oop");var r=e("./lib/dom");(function(){this.$init=function(){return this.$element=r.createElement("div"),this.$element.className="ace_tooltip",this.$element.style.display="none",this.$parentNode.appendChild(this.$element),this.$element},this.getElement=function(){return this.$element||this.$init()},this.setText=function(e){this.getElement().textContent=e},this.setHtml=function(e){this.getElement().innerHTML=e},this.setPosition=function(e,t){this.getElement().style.left=e+"px",this.getElement().style.top=t+"px"},this.setClassName=function(e){r.addCssClass(this.getElement(),e)},this.show=function(e,t,n){null!=e&&this.setText(e),null!=t&&null!=n&&this.setPosition(t,n),this.isOpen||(this.getElement().style.display="block",this.isOpen=!0)},this.hide=function(){this.isOpen&&(this.getElement().style.display="none",this.isOpen=!1)},this.getHeight=function(){return this.getElement().offsetHeight},this.getWidth=function(){return this.getElement().offsetWidth},this.destroy=function(){this.isOpen=!1,this.$element&&this.$element.parentNode&&this.$element.parentNode.removeChild(this.$element)}}).call(i.prototype),t.Tooltip=i})),ace.define("ace/mouse/default_gutter_handler",["require","exports","module","ace/lib/dom","ace/lib/oop","ace/lib/event","ace/tooltip"],(function(e,t,n){"use strict";function i(e){a.call(this,e)}var r=e("../lib/dom"),s=e("../lib/oop"),o=e("../lib/event"),a=e("../tooltip").Tooltip;s.inherits(i,a),function(){this.setPosition=function(e,t){var n=window.innerWidth||document.documentElement.clientWidth,i=window.innerHeight||document.documentElement.clientHeight,r=this.getWidth(),s=this.getHeight();(e+=15)+r>n&&(e-=e+r-n),(t+=15)+s>i&&(t-=20+s),a.prototype.setPosition.call(this,e,t)}}.call(i.prototype),t.GutterHandler=function(e){function t(){var t=l.getDocumentPosition().row,i=h.$annotations[t];if(!i)return n();if(t==c.session.getLength()){var r=c.renderer.pixelToScreenCoordinates(0,l.y).row,o=l.$pos;if(r>c.session.documentToScreenRow(o.row,o.column))return n()}if(u!=i)if(u=i.text.join("<br/>"),d.setHtml(u),d.show(),c._signal("showGutterTooltip",d),c.on("mousewheel",n),e.$tooltipFollowsMouse)s(l);else{var a=l.domEvent.target.getBoundingClientRect(),f=d.getElement().style;f.left=a.right+"px",f.top=a.bottom+"px"}}function n(){a&&(a=clearTimeout(a)),u&&(d.hide(),u=null,c._signal("hideGutterTooltip",d),c.removeEventListener("mousewheel",n))}function s(e){d.setPosition(e.x,e.y)}var a,l,u,c=e.editor,h=c.renderer.$gutterLayer,d=new i(c.container);e.editor.setDefaultHandler("guttermousedown",(function(t){if(c.isFocused()&&0==t.getButton()&&"foldWidgets"!=h.getRegion(t)){var n=t.getDocumentPosition().row,i=c.session.selection;if(t.getShiftKey())i.selectTo(n,0);else{if(2==t.domEvent.detail)return c.selectAll(),t.preventDefault();e.$clickSelection=c.selection.getLineRange(n)}return e.setState("selectByLines"),e.captureMouse(t),t.preventDefault()}})),e.editor.setDefaultHandler("guttermousemove",(function(i){var o=i.domEvent.target||i.domEvent.srcElement;if(r.hasCssClass(o,"ace_fold-widget"))return n();u&&e.$tooltipFollowsMouse&&s(i),l=i,a||(a=setTimeout((function(){a=null,l&&!e.isMousePressed?t():n()}),50))})),o.addListener(c.renderer.$gutter,"mouseout",(function(e){l=null,u&&!a&&(a=setTimeout((function(){a=null,n()}),50))})),c.on("changeSession",n)}})),ace.define("ace/mouse/mouse_event",["require","exports","module","ace/lib/event","ace/lib/useragent"],(function(e,t,n){"use strict";var i=e("../lib/event"),r=e("../lib/useragent"),s=t.MouseEvent=function(e,t){this.domEvent=e,this.editor=t,this.x=this.clientX=e.clientX,this.y=this.clientY=e.clientY,this.$pos=null,this.$inSelection=null,this.propagationStopped=!1,this.defaultPrevented=!1};(function(){this.stopPropagation=function(){i.stopPropagation(this.domEvent),this.propagationStopped=!0},this.preventDefault=function(){i.preventDefault(this.domEvent),this.defaultPrevented=!0},this.stop=function(){this.stopPropagation(),this.preventDefault()},this.getDocumentPosition=function(){return this.$pos||(this.$pos=this.editor.renderer.screenToTextCoordinates(this.clientX,this.clientY)),this.$pos},this.inSelection=function(){if(null!==this.$inSelection)return this.$inSelection;var e=this.editor.getSelectionRange();if(e.isEmpty())this.$inSelection=!1;else{var t=this.getDocumentPosition();this.$inSelection=e.contains(t.row,t.column)}return this.$inSelection},this.getButton=function(){return i.getButton(this.domEvent)},this.getShiftKey=function(){return this.domEvent.shiftKey},this.getAccelKey=r.isMac?function(){return this.domEvent.metaKey}:function(){return this.domEvent.ctrlKey}}).call(s.prototype)})),ace.define("ace/mouse/dragdrop_handler",["require","exports","module","ace/lib/dom","ace/lib/event","ace/lib/useragent"],(function(e,t,n){"use strict";function i(e){function t(){var e=b;(function(e,t){var n=Date.now(),i=!t||e.row!=t.row,s=!t||e.column!=t.column;!k||i||s?(p.moveCursorToPosition(e),k=n,_={x:v,y:y}):r(_.x,_.y,v,y)>c?k=null:n-k>=u&&(p.renderer.scrollCursorIntoView(),k=null)})(b=p.renderer.screenToTextCoordinates(v,y),e),function(e,t){var n=Date.now(),i=p.renderer.layerConfig.lineHeight,r=p.renderer.layerConfig.characterWidth,s=p.renderer.scroller.getBoundingClientRect(),o={x:{left:v-s.left,right:s.right-v},y:{top:y-s.top,bottom:s.bottom-y}},a=Math.min(o.x.left,o.x.right),u=Math.min(o.y.top,o.y.bottom),c={row:e.row,column:e.column};a/r<=2&&(c.column+=o.x.left<o.x.right?-3:2),u/i<=1&&(c.row+=o.y.top<o.y.bottom?-1:1);var h=e.row!=c.row,d=e.column!=c.column,f=!t||e.row!=t.row;h||d&&!f?C?n-C>=l&&p.renderer.scrollCursorIntoView(c):C=n:C=null}(b,e)}function n(){w=p.selection.toOrientedRange(),m=p.session.addMarker(w,"ace_selection",p.getSelectionStyle()),p.clearSelection(),p.isFocused()&&p.renderer.$cursorLayer.setBlinking(!1),clearInterval($),t(),$=setInterval(t,20),A=0,o.addListener(document,"mousemove",h)}function i(){clearInterval($),p.session.removeMarker(m),m=null,p.selection.fromOrientedRange(w),p.isFocused()&&!x&&p.renderer.$cursorLayer.setBlinking(!p.getReadOnly()),w=null,b=null,A=0,C=null,k=null,o.removeListener(document,"mousemove",h)}function h(){null==E&&(E=setTimeout((function(){null!=E&&m&&i()}),20))}function d(e){var t=e.types;return!t||Array.prototype.some.call(t,(function(e){return"text/plain"==e||"Text"==e}))}function f(e){var t=["copy","copymove","all","uninitialized"],n=a.isMac?e.altKey:e.ctrlKey,i="uninitialized";try{i=e.dataTransfer.effectAllowed.toLowerCase()}catch(e){}var r="none";return n&&t.indexOf(i)>=0?r="copy":["move","copymove","linkmove","all","uninitialized"].indexOf(i)>=0?r="move":t.indexOf(i)>=0&&(r="copy"),r}var p=e.editor,g=s.createElement("img");g.src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",a.isOpera&&(g.style.cssText="width:1px;height:1px;position:fixed;top:0;left:0;z-index:2147483647;opacity:0;");["dragWait","dragWaitEnd","startDrag","dragReadyEnd","onMouseDrag"].forEach((function(t){e[t]=this[t]}),this),p.addEventListener("mousedown",this.onMouseDown.bind(e));var m,v,y,$,w,b,S,x,C,k,_,M=p.container,A=0;this.onDragStart=function(e){if(this.cancelDrag||!M.draggable){var t=this;return setTimeout((function(){t.startSelect(),t.captureMouse(e)}),0),e.preventDefault()}w=p.getSelectionRange();var n=e.dataTransfer;n.effectAllowed=p.getReadOnly()?"copy":"copyMove",a.isOpera&&(p.container.appendChild(g),g.scrollTop=0),n.setDragImage&&n.setDragImage(g,0,0),a.isOpera&&p.container.removeChild(g),n.clearData(),n.setData("Text",p.session.getTextRange()),x=!0,this.setState("drag")},this.onDragEnd=function(e){if(M.draggable=!1,x=!1,this.setState(null),!p.getReadOnly()){var t=e.dataTransfer.dropEffect;!S&&"move"==t&&p.session.remove(p.getSelectionRange()),p.renderer.$cursorLayer.setBlinking(!0)}this.editor.unsetStyle("ace_dragging"),this.editor.renderer.setCursorStyle("")},this.onDragEnter=function(e){if(!p.getReadOnly()&&d(e.dataTransfer))return v=e.clientX,y=e.clientY,m||n(),A++,e.dataTransfer.dropEffect=S=f(e),o.preventDefault(e)},this.onDragOver=function(e){if(!p.getReadOnly()&&d(e.dataTransfer))return v=e.clientX,y=e.clientY,m||(n(),A++),null!==E&&(E=null),e.dataTransfer.dropEffect=S=f(e),o.preventDefault(e)},this.onDragLeave=function(e){if(--A<=0&&m)return i(),S=null,o.preventDefault(e)},this.onDrop=function(e){if(b){var t=e.dataTransfer;if(x)switch(S){case"move":w=w.contains(b.row,b.column)?{start:b,end:b}:p.moveText(w,b);break;case"copy":w=p.moveText(w,b,!0)}else{var n=t.getData("Text");w={start:b,end:p.session.insert(b,n)},p.focus(),S=null}return i(),o.preventDefault(e)}},o.addListener(M,"dragstart",this.onDragStart.bind(e)),o.addListener(M,"dragend",this.onDragEnd.bind(e)),o.addListener(M,"dragenter",this.onDragEnter.bind(e)),o.addListener(M,"dragover",this.onDragOver.bind(e)),o.addListener(M,"dragleave",this.onDragLeave.bind(e)),o.addListener(M,"drop",this.onDrop.bind(e));var E=null}function r(e,t,n,i){return Math.sqrt(Math.pow(n-e,2)+Math.pow(i-t,2))}var s=e("../lib/dom"),o=e("../lib/event"),a=e("../lib/useragent"),l=200,u=200,c=5;(function(){this.dragWait=function(){Date.now()-this.mousedownEvent.time>this.editor.getDragDelay()&&this.startDrag()},this.dragWaitEnd=function(){this.editor.container.draggable=!1,this.startSelect(this.mousedownEvent.getDocumentPosition()),this.selectEnd()},this.dragReadyEnd=function(e){this.editor.renderer.$cursorLayer.setBlinking(!this.editor.getReadOnly()),this.editor.unsetStyle("ace_dragging"),this.editor.renderer.setCursorStyle(""),this.dragWaitEnd()},this.startDrag=function(){this.cancelDrag=!1;var e=this.editor;e.container.draggable=!0,e.renderer.$cursorLayer.setBlinking(!1),e.setStyle("ace_dragging");var t=a.isWin?"default":"move";e.renderer.setCursorStyle(t),this.setState("dragReady")},this.onMouseDrag=function(e){var t=this.editor.container;a.isIE&&"dragReady"==this.state&&(r(this.mousedownEvent.x,this.mousedownEvent.y,this.x,this.y)>3&&t.dragDrop());"dragWait"===this.state&&(r(this.mousedownEvent.x,this.mousedownEvent.y,this.x,this.y)>0&&(t.draggable=!1,this.startSelect(this.mousedownEvent.getDocumentPosition())))},this.onMouseDown=function(e){if(this.$dragEnabled){this.mousedownEvent=e;var t=this.editor,n=e.inSelection(),i=e.getButton();if(1===(e.domEvent.detail||1)&&0===i&&n){if(e.editor.inMultiSelectMode&&(e.getAccelKey()||e.getShiftKey()))return;this.mousedownEvent.time=Date.now();var r=e.domEvent.target||e.domEvent.srcElement;if("unselectable"in r&&(r.unselectable="on"),t.getDragDelay()){if(a.isWebKit)this.cancelDrag=!0,t.container.draggable=!0;this.setState("dragWait")}else this.startDrag();this.captureMouse(e,this.onMouseDrag.bind(this)),e.defaultPrevented=!0}}}}).call(i.prototype),t.DragdropHandler=i})),ace.define("ace/lib/net",["require","exports","module","ace/lib/dom"],(function(e,t,n){"use strict";var i=e("./dom");t.get=function(e,t){var n=new XMLHttpRequest;n.open("GET",e,!0),n.onreadystatechange=function(){4===n.readyState&&t(n.responseText)},n.send(null)},t.loadScript=function(e,t){var n=i.getDocumentHead(),r=document.createElement("script");r.src=e,n.appendChild(r),r.onload=r.onreadystatechange=function(e,n){!n&&r.readyState&&"loaded"!=r.readyState&&"complete"!=r.readyState||(r=r.onload=r.onreadystatechange=null,n||t())}},t.qualifyURL=function(e){var t=document.createElement("a");return t.href=e,t.href}})),ace.define("ace/lib/event_emitter",["require","exports","module"],(function(e,t,n){"use strict";var i={},r=function(){this.propagationStopped=!0},s=function(){this.defaultPrevented=!0};i._emit=i._dispatchEvent=function(e,t){this._eventRegistry||(this._eventRegistry={}),this._defaultHandlers||(this._defaultHandlers={});var n=this._eventRegistry[e]||[],i=this._defaultHandlers[e];if(n.length||i){"object"==typeof t&&t||(t={}),t.type||(t.type=e),t.stopPropagation||(t.stopPropagation=r),t.preventDefault||(t.preventDefault=s),n=n.slice();for(var o=0;o<n.length&&(n[o](t,this),!t.propagationStopped);o++);return i&&!t.defaultPrevented?i(t,this):void 0}},i._signal=function(e,t){var n=(this._eventRegistry||{})[e];if(n){n=n.slice();for(var i=0;i<n.length;i++)n[i](t,this)}},i.once=function(e,t){var n=this;if(this.addEventListener(e,(function i(){n.removeEventListener(e,i),t.apply(null,arguments)})),!t)return new Promise((function(e){t=e}))},i.setDefaultHandler=function(e,t){var n=this._defaultHandlers;if(n||(n=this._defaultHandlers={_disabled_:{}}),n[e]){var i=n[e],r=n._disabled_[e];r||(n._disabled_[e]=r=[]),r.push(i);var s=r.indexOf(t);-1!=s&&r.splice(s,1)}n[e]=t},i.removeDefaultHandler=function(e,t){var n=this._defaultHandlers;if(n){var i=n._disabled_[e];if(n[e]==t)i&&this.setDefaultHandler(e,i.pop());else if(i){var r=i.indexOf(t);-1!=r&&i.splice(r,1)}}},i.on=i.addEventListener=function(e,t,n){this._eventRegistry=this._eventRegistry||{};var i=this._eventRegistry[e];return i||(i=this._eventRegistry[e]=[]),-1==i.indexOf(t)&&i[n?"unshift":"push"](t),t},i.off=i.removeListener=i.removeEventListener=function(e,t){this._eventRegistry=this._eventRegistry||{};var n=this._eventRegistry[e];if(n){var i=n.indexOf(t);-1!==i&&n.splice(i,1)}},i.removeAllListeners=function(e){this._eventRegistry&&(this._eventRegistry[e]=[])},t.EventEmitter=i})),ace.define("ace/lib/app_config",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],(function(e,t,n){function i(e){"undefined"!=typeof console&&console.warn&&console.warn.apply(console,arguments)}function r(e,t){var n=new Error(e);n.data=t,"object"==typeof console&&console.error&&console.error(n),setTimeout((function(){throw n}))}var s=e("./oop"),o=e("./event_emitter").EventEmitter,a={setOptions:function(e){Object.keys(e).forEach((function(t){this.setOption(t,e[t])}),this)},getOptions:function(e){var t={};if(e)Array.isArray(e)||(t=e,e=Object.keys(t));else{var n=this.$options;e=Object.keys(n).filter((function(e){return!n[e].hidden}))}return e.forEach((function(e){t[e]=this.getOption(e)}),this),t},setOption:function(e,t){if(this["$"+e]!==t){var n=this.$options[e];return n?n.forwardTo?this[n.forwardTo]&&this[n.forwardTo].setOption(e,t):(n.handlesSet||(this["$"+e]=t),void(n&&n.set&&n.set.call(this,t))):i('misspelled option "'+e+'"')}},getOption:function(e){var t=this.$options[e];return t?t.forwardTo?this[t.forwardTo]&&this[t.forwardTo].getOption(e):t&&t.get?t.get.call(this):this["$"+e]:i('misspelled option "'+e+'"')}},l=function(){this.$defaultOptions={}};(function(){s.implement(this,o),this.defineOptions=function(e,t,n){return e.$options||(this.$defaultOptions[t]=e.$options={}),Object.keys(n).forEach((function(t){var i=n[t];"string"==typeof i&&(i={forwardTo:i}),i.name||(i.name=t),e.$options[i.name]=i,"initialValue"in i&&(e["$"+i.name]=i.initialValue)})),s.implement(e,a),this},this.resetOptions=function(e){Object.keys(e.$options).forEach((function(t){var n=e.$options[t];"value"in n&&e.setOption(t,n.value)}))},this.setDefaultValue=function(e,t,n){var i=this.$defaultOptions[e]||(this.$defaultOptions[e]={});i[t]&&(i.forwardTo?this.setDefaultValue(i.forwardTo,t,n):i[t].value=n)},this.setDefaultValues=function(e,t){Object.keys(t).forEach((function(n){this.setDefaultValue(e,n,t[n])}),this)},this.warn=i,this.reportError=r}).call(l.prototype),t.AppConfig=l})),ace.define("ace/config",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/lib/net","ace/lib/app_config"],(function(e,t,n){function i(e){return e.replace(/-(.)/g,(function(e,t){return t.toUpperCase()}))}var r=e("./lib/lang"),s=(e("./lib/oop"),e("./lib/net")),o=e("./lib/app_config").AppConfig;n.exports=t=new o;var a=function(){return this||"undefined"!=typeof window&&window}(),l={packaged:!1,workerPath:null,modePath:null,themePath:null,basePath:"",suffix:".js",$moduleUrls:{}};t.get=function(e){if(!l.hasOwnProperty(e))throw new Error("Unknown config key: "+e);return l[e]},t.set=function(e,t){if(!l.hasOwnProperty(e))throw new Error("Unknown config key: "+e);l[e]=t},t.all=function(){return r.copyObject(l)},t.$modes={},t.moduleUrl=function(e,t){if(l.$moduleUrls[e])return l.$moduleUrls[e];var n=e.split("/"),i="snippets"==(t=t||n[n.length-2]||"")?"/":"-",r=n[n.length-1];if("worker"==t&&"-"==i){var s=new RegExp("^"+t+"[\\-_]|[\\-_]"+t+"$","g");r=r.replace(s,"")}(!r||r==t)&&n.length>1&&(r=n[n.length-2]);var o=l[t+"Path"];return null==o?o=l.basePath:"/"==i&&(t=i=""),o&&"/"!=o.slice(-1)&&(o+="/"),o+t+i+r+this.get("suffix")},t.setModuleUrl=function(e,t){return l.$moduleUrls[e]=t},t.$loading={},t.loadModule=function(n,i){var r,o;Array.isArray(n)&&(o=n[0],n=n[1]);try{r=e(n)}catch(e){}if(r&&!t.$loading[n])return i&&i(r);if(t.$loading[n]||(t.$loading[n]=[]),t.$loading[n].push(i),!(t.$loading[n].length>1)){var a=function(){e([n],(function(e){t._emit("load.module",{name:n,module:e});var i=t.$loading[n];t.$loading[n]=null,i.forEach((function(t){t&&t(e)}))}))};if(!t.get("packaged"))return a();s.loadScript(t.moduleUrl(n,o),a),u()}};var u=function(){!l.basePath&&!l.workerPath&&!l.modePath&&!l.themePath&&!Object.keys(l.$moduleUrls).length&&(console.error("Unable to infer path to ace from script src,","use ace.config.set('basePath', 'path') to enable dynamic loading of modes and themes","or with webpack use ace/webpack-resolver"),u=function(){})};t.init=function(r){if(a&&a.document){l.packaged=r||e.packaged||n.packaged||a.define&&define.packaged;for(var s={},o="",u=document.currentScript||document._currentScript,c=(u&&u.ownerDocument||document).getElementsByTagName("script"),h=0;h<c.length;h++){var d=c[h],f=d.src||d.getAttribute("src");if(f){for(var p=d.attributes,g=0,m=p.length;g<m;g++){var v=p[g];0===v.name.indexOf("data-ace-")&&(s[i(v.name.replace(/^data-ace-/,""))]=v.value)}var y=f.match(/^(.*)\/ace(\-\w+)?\.js(\?|$)/);y&&(o=y[1])}}for(var $ in o&&(s.base=s.base||o,s.packaged=!0),s.basePath=s.base,s.workerPath=s.workerPath||s.base,s.modePath=s.modePath||s.base,s.themePath=s.themePath||s.base,delete s.base,s)void 0!==s[$]&&t.set($,s[$])}}})),ace.define("ace/mouse/mouse_handler",["require","exports","module","ace/lib/event","ace/lib/useragent","ace/mouse/default_handlers","ace/mouse/default_gutter_handler","ace/mouse/mouse_event","ace/mouse/dragdrop_handler","ace/config"],(function(e,t,n){"use strict";var i=e("../lib/event"),r=e("../lib/useragent"),s=e("./default_handlers").DefaultHandlers,o=e("./default_gutter_handler").GutterHandler,a=e("./mouse_event").MouseEvent,l=e("./dragdrop_handler").DragdropHandler,u=e("../config"),c=function(e){var t=this;this.editor=e,new s(this),new o(this),new l(this);var n=function(t){(!document.hasFocus||!document.hasFocus()||!e.isFocused()&&document.activeElement==(e.textInput&&e.textInput.getElement()))&&window.focus(),e.focus()},a=e.renderer.getMouseEventTarget();i.addListener(a,"click",this.onMouseEvent.bind(this,"click")),i.addListener(a,"mousemove",this.onMouseMove.bind(this,"mousemove")),i.addMultiMouseDownListener([a,e.renderer.scrollBarV&&e.renderer.scrollBarV.inner,e.renderer.scrollBarH&&e.renderer.scrollBarH.inner,e.textInput&&e.textInput.getElement()].filter(Boolean),[400,300,250],this,"onMouseEvent"),i.addMouseWheelListener(e.container,this.onMouseWheel.bind(this,"mousewheel")),i.addTouchMoveListener(e.container,this.onTouchMove.bind(this,"touchmove"));var u=e.renderer.$gutter;i.addListener(u,"mousedown",this.onMouseEvent.bind(this,"guttermousedown")),i.addListener(u,"click",this.onMouseEvent.bind(this,"gutterclick")),i.addListener(u,"dblclick",this.onMouseEvent.bind(this,"gutterdblclick")),i.addListener(u,"mousemove",this.onMouseEvent.bind(this,"guttermousemove")),i.addListener(a,"mousedown",n),i.addListener(u,"mousedown",n),r.isIE&&e.renderer.scrollBarV&&(i.addListener(e.renderer.scrollBarV.element,"mousedown",n),i.addListener(e.renderer.scrollBarH.element,"mousedown",n)),e.on("mousemove",(function(n){if(!t.state&&!t.$dragDelay&&t.$dragEnabled){var i=e.renderer.screenToTextCoordinates(n.x,n.y),r=e.session.selection.getRange(),s=e.renderer;!r.isEmpty()&&r.insideStart(i.row,i.column)?s.setCursorStyle("default"):s.setCursorStyle("")}}))};(function(){this.onMouseEvent=function(e,t){this.editor._emit(e,new a(t,this.editor))},this.onMouseMove=function(e,t){var n=this.editor._eventRegistry&&this.editor._eventRegistry.mousemove;n&&n.length&&this.editor._emit(e,new a(t,this.editor))},this.onMouseWheel=function(e,t){var n=new a(t,this.editor);n.speed=2*this.$scrollSpeed,n.wheelX=t.wheelX,n.wheelY=t.wheelY,this.editor._emit(e,n)},this.onTouchMove=function(e,t){var n=new a(t,this.editor);n.speed=1,n.wheelX=t.wheelX,n.wheelY=t.wheelY,this.editor._emit(e,n)},this.setState=function(e){this.state=e},this.captureMouse=function(e,t){this.x=e.x,this.y=e.y,this.isMousePressed=!0;var n=this.editor,s=this.editor.renderer;s.$keepTextAreaAtCursor&&(s.$keepTextAreaAtCursor=null);var o=this,l=function(e){if(e)return r.isWebKit&&!e.which&&o.releaseMouse?o.releaseMouse():(o.x=e.clientX,o.y=e.clientY,t&&t(e),o.mouseEvent=new a(e,o.editor),void(o.$mouseMoved=!0))},u=function(e){n.off("beforeEndOperation",h),clearInterval(d),c(),o[o.state+"End"]&&o[o.state+"End"](e),o.state="",null==s.$keepTextAreaAtCursor&&(s.$keepTextAreaAtCursor=!0,s.$moveTextAreaToCursor()),o.isMousePressed=!1,o.$onCaptureMouseMove=o.releaseMouse=null,e&&o.onMouseEvent("mouseup",e),n.endOperation()},c=function(){o[o.state]&&o[o.state](),o.$mouseMoved=!1};if(r.isOldIE&&"dblclick"==e.domEvent.type)return setTimeout((function(){u(e)}));var h=function(e){o.releaseMouse&&n.curOp.command.name&&n.curOp.selectionChanged&&(o[o.state+"End"]&&o[o.state+"End"](),o.state="",o.releaseMouse())};n.on("beforeEndOperation",h),n.startOperation({command:{name:"mouse"}}),o.$onCaptureMouseMove=l,o.releaseMouse=i.capture(this.editor.container,l,u);var d=setInterval(c,20)},this.releaseMouse=null,this.cancelContextMenu=function(){var e=function(t){t&&t.domEvent&&"contextmenu"!=t.domEvent.type||(this.editor.off("nativecontextmenu",e),t&&t.domEvent&&i.stopEvent(t.domEvent))}.bind(this);setTimeout(e,10),this.editor.on("nativecontextmenu",e)}}).call(c.prototype),u.defineOptions(c.prototype,"mouseHandler",{scrollSpeed:{initialValue:2},dragDelay:{initialValue:r.isMac?150:0},dragEnabled:{initialValue:!0},focusTimeout:{initialValue:0},tooltipFollowsMouse:{initialValue:!0}}),t.MouseHandler=c})),ace.define("ace/mouse/fold_handler",["require","exports","module","ace/lib/dom"],(function(e,t,n){"use strict";var i=e("../lib/dom");t.FoldHandler=function(e){e.on("click",(function(t){var n=t.getDocumentPosition(),r=e.session,s=r.getFoldAt(n.row,n.column,1);s&&(t.getAccelKey()?r.removeFold(s):r.expandFold(s),t.stop());var o=t.domEvent&&t.domEvent.target;o&&i.hasCssClass(o,"ace_inline_button")&&i.hasCssClass(o,"ace_toggle_wrap")&&(r.setOption("wrap",!0),e.renderer.scrollCursorIntoView())})),e.on("gutterclick",(function(t){if("foldWidgets"==e.renderer.$gutterLayer.getRegion(t)){var n=t.getDocumentPosition().row,i=e.session;i.foldWidgets&&i.foldWidgets[n]&&e.session.onFoldWidgetClick(n,t),e.isFocused()||e.focus(),t.stop()}})),e.on("gutterdblclick",(function(t){if("foldWidgets"==e.renderer.$gutterLayer.getRegion(t)){var n=t.getDocumentPosition().row,i=e.session,r=i.getParentFoldRangeData(n,!0),s=r.range||r.firstRange;if(s){n=s.start.row;var o=i.getFoldAt(n,i.getLine(n).length,1);o?i.removeFold(o):(i.addFold("...",s),e.renderer.scrollCursorIntoView({row:s.start.row,column:0}))}t.stop()}}))}})),ace.define("ace/keyboard/keybinding",["require","exports","module","ace/lib/keys","ace/lib/event"],(function(e,t,n){"use strict";var i=e("../lib/keys"),r=e("../lib/event"),s=function(e){this.$editor=e,this.$data={editor:e},this.$handlers=[],this.setDefaultHandler(e.commands)};(function(){this.setDefaultHandler=function(e){this.removeKeyboardHandler(this.$defaultHandler),this.$defaultHandler=e,this.addKeyboardHandler(e,0)},this.setKeyboardHandler=function(e){var t=this.$handlers;if(t[t.length-1]!=e){for(;t[t.length-1]&&t[t.length-1]!=this.$defaultHandler;)this.removeKeyboardHandler(t[t.length-1]);this.addKeyboardHandler(e,1)}},this.addKeyboardHandler=function(e,t){if(e){"function"==typeof e&&!e.handleKeyboard&&(e.handleKeyboard=e);var n=this.$handlers.indexOf(e);-1!=n&&this.$handlers.splice(n,1),null==t?this.$handlers.push(e):this.$handlers.splice(t,0,e),-1==n&&e.attach&&e.attach(this.$editor)}},this.removeKeyboardHandler=function(e){var t=this.$handlers.indexOf(e);return-1!=t&&(this.$handlers.splice(t,1),e.detach&&e.detach(this.$editor),!0)},this.getKeyboardHandler=function(){return this.$handlers[this.$handlers.length-1]},this.getStatusText=function(){var e=this.$data,t=e.editor;return this.$handlers.map((function(n){return n.getStatusText&&n.getStatusText(t,e)||""})).filter(Boolean).join(" ")},this.$callKeyboardHandlers=function(e,t,n,i){for(var s,o=!1,a=this.$editor.commands,l=this.$handlers.length;l--&&!((s=this.$handlers[l].handleKeyboard(this.$data,e,t,n,i))&&s.command&&((o="null"==s.command||a.exec(s.command,this.$editor,s.args,i))&&i&&-1!=e&&1!=s.passEvent&&1!=s.command.passEvent&&r.stopEvent(i),o)););return!o&&-1==e&&(s={command:"insertstring"},o=a.exec("insertstring",this.$editor,t)),o&&this.$editor._signal&&this.$editor._signal("keyboardActivity",s),o},this.onCommandKey=function(e,t,n){var r=i.keyCodeToString(n);this.$callKeyboardHandlers(t,r,n,e)},this.onTextInput=function(e){this.$callKeyboardHandlers(-1,e)}}).call(s.prototype),t.KeyBinding=s})),ace.define("ace/lib/bidiutil",["require","exports","module"],(function(e,t,n){"use strict";function i(e,t,n,i){var r=a?f:d,p=null,g=null,m=null,v=0,y=null,$=-1,S=null,C=null,k=[];if(!i)for(S=0,i=[];S<n;S++)i[S]=o(e[S]);for(l=a,u=!1,!1,c=!1,h=!1,C=0;C<n;C++){if(p=v,k[C]=g=s(e,i,k,C),y=240&(v=r[p][g]),v&=15,t[C]=m=r[v][5],y>0)if(16==y){for(S=$;S<C;S++)t[S]=1;$=-1}else $=-1;if(r[v][6])-1==$&&($=C);else if($>-1){for(S=$;S<C;S++)t[S]=m;$=-1}i[C]==w&&(t[C]=0),l|=m}if(h)for(S=0;S<n;S++)if(i[S]==b){t[S]=a;for(var _=S-1;_>=0&&i[_]==x;_--)t[_]=a}}function r(e,t,n){if(!(l<e))if(1!=e||a!=p||c)for(var i,r,s,o,u=n.length,h=0;h<u;){if(t[h]>=e){for(i=h+1;i<u&&t[i]>=e;)i++;for(r=h,s=i-1;r<s;r++,s--)o=n[r],n[r]=n[s],n[s]=o;h=i}h++}else n.reverse()}function s(e,t,n,i){var r,s,o,l,d=t[i];switch(d){case g:case m:u=!1;case $:case y:return d;case v:return u?y:v;case S:return u=!0,!0,m;case x:return $;case C:return i<1||i+1>=t.length||(r=n[i-1])!=v&&r!=y||(s=t[i+1])!=v&&s!=y?$:(u&&(s=y),s==r?s:$);case k:return(r=i>0?n[i-1]:w)==v&&i+1<t.length&&t[i+1]==v?v:$;case _:if(i>0&&n[i-1]==v)return v;if(u)return $;for(l=i+1,o=t.length;l<o&&t[l]==_;)l++;return l<o&&t[l]==v?v:$;case M:for(o=t.length,l=i+1;l<o&&t[l]==M;)l++;if(l<o){var f=e[i],p=f>=1425&&f<=2303||64286==f;if(r=t[l],p&&(r==m||r==S))return m}return i<1||(r=t[i-1])==w?$:n[i-1];case w:return u=!1,c=!0,a;case b:return h=!0,$;case A:case E:case T:case L:case R:u=!1;case P:return $}}function o(e){var t=e.charCodeAt(0),n=t>>8;return 0==n?t>191?g:I[t]:5==n?/[\u0591-\u05f4]/.test(e)?m:g:6==n?/[\u0610-\u061a\u064b-\u065f\u06d6-\u06e4\u06e7-\u06ed]/.test(e)?M:/[\u0660-\u0669\u066b-\u066c]/.test(e)?y:1642==t?_:/[\u06f0-\u06f9]/.test(e)?v:S:32==n&&t<=8287?D[255&t]:254==n&&t>=65136?S:$}var a=0,l=0,u=!1,c=!1,h=!1,d=[[0,3,0,1,0,0,0],[0,3,0,1,2,2,0],[0,3,0,17,2,0,1],[0,3,5,5,4,1,0],[0,3,21,21,4,0,1],[0,3,5,5,4,2,0]],f=[[2,0,1,1,0,1,0],[2,0,1,1,0,2,0],[2,0,2,1,3,2,0],[2,0,2,33,3,1,1]],p=1,g=0,m=1,v=2,y=3,$=4,w=5,b=6,S=7,x=8,C=9,k=10,_=11,M=12,A=13,E=14,R=15,T=16,L=17,P=18,I=[P,P,P,P,P,P,P,P,P,b,w,b,x,w,P,P,P,P,P,P,P,P,P,P,P,P,P,P,w,w,w,b,x,$,$,_,_,_,$,$,$,$,$,k,C,k,C,C,v,v,v,v,v,v,v,v,v,v,C,$,$,$,$,$,$,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,$,$,$,$,$,$,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,$,$,$,$,P,P,P,P,P,P,w,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,P,C,$,_,_,_,_,$,$,$,$,g,$,$,P,$,$,_,_,v,v,$,g,$,$,$,v,g,$,$,$,$,$],D=[x,x,x,x,x,x,x,x,x,x,x,P,P,P,g,m,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,x,w,A,E,R,T,L,C,_,_,_,_,_,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,C,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,x];t.L=g,t.R=m,t.EN=v,t.ON_R=3,t.AN=4,t.R_H=5,t.B=6,t.RLE=7,t.DOT="·",t.doBidiReorder=function(e,n,s){if(e.length<2)return{};var o=e.split(""),l=new Array(o.length),u=new Array(o.length),c=[];a=s?p:0,i(o,c,o.length,n);for(var h=0;h<l.length;l[h]=h,h++);r(2,c,l),r(1,c,l);for(h=0;h<l.length-1;h++)n[h]===y?c[h]=t.AN:c[h]===m&&(n[h]>S&&n[h]<A||n[h]===$||n[h]===P)?c[h]=t.ON_R:h>0&&"ل"===o[h-1]&&/\u0622|\u0623|\u0625|\u0627/.test(o[h])&&(c[h-1]=c[h]=t.R_H,h++);o[o.length-1]===t.DOT&&(c[o.length-1]=t.B),"‫"===o[0]&&(c[0]=t.RLE);for(h=0;h<l.length;h++)u[h]=c[l[h]];return{logicalFromVisual:l,bidiLevels:u}},t.hasBidiCharacters=function(e,t){for(var n=!1,i=0;i<e.length;i++)t[i]=o(e.charAt(i)),!n&&(t[i]==m||t[i]==S||t[i]==y)&&(n=!0);return n},t.getVisualFromLogicalIdx=function(e,t){for(var n=0;n<t.logicalFromVisual.length;n++)if(t.logicalFromVisual[n]==e)return n;return 0}})),ace.define("ace/bidihandler",["require","exports","module","ace/lib/bidiutil","ace/lib/lang"],(function(e,t,n){"use strict";var i=e("./lib/bidiutil"),r=e("./lib/lang"),s=/[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac\u202B]/,o=function(e){this.session=e,this.bidiMap={},this.currentRow=null,this.bidiUtil=i,this.charWidths=[],this.EOL="¬",this.showInvisibles=!0,this.isRtlDir=!1,this.line="",this.wrapIndent=0,this.EOF="¶",this.RLE="‫",this.contentWidth=0,this.fontMetrics=null,this.rtlLineOffset=0,this.wrapOffset=0,this.isMoveLeftOperation=!1,this.seenBidi=s.test(e.getValue())};(function(){this.isBidiRow=function(e,t,n){return!!this.seenBidi&&(e!==this.currentRow&&(this.currentRow=e,this.updateRowLine(t,n),this.updateBidiMap()),this.bidiMap.bidiLevels)},this.onChange=function(e){this.seenBidi?this.currentRow=null:"insert"==e.action&&s.test(e.lines.join("\n"))&&(this.seenBidi=!0,this.currentRow=null)},this.getDocumentRow=function(){var e=0,t=this.session.$screenRowCache;if(t.length){var n=this.session.$getRowCacheIndex(t,this.currentRow);n>=0&&(e=this.session.$docRowCache[n])}return e},this.getSplitIndex=function(){var e=0,t=this.session.$screenRowCache;if(t.length)for(var n,i=this.session.$getRowCacheIndex(t,this.currentRow);this.currentRow-e>0&&(n=this.session.$getRowCacheIndex(t,this.currentRow-e-1))===i;)i=n,e++;else e=this.currentRow;return e},this.updateRowLine=function(e,t){void 0===e&&(e=this.getDocumentRow());var n=e===this.session.getLength()-1?this.EOF:this.EOL;if(this.wrapIndent=0,this.line=this.session.getLine(e),this.isRtlDir=this.line.charAt(0)===this.RLE,this.session.$useWrapMode){var s=this.session.$wrapData[e];s&&(void 0===t&&(t=this.getSplitIndex()),t>0&&s.length?(this.wrapIndent=s.indent,this.wrapOffset=this.wrapIndent*this.charWidths[i.L],this.line=t<s.length?this.line.substring(s[t-1],s[t]):this.line.substring(s[s.length-1])):this.line=this.line.substring(0,s[t])),t==s.length&&(this.line+=this.showInvisibles?n:i.DOT)}else this.line+=this.showInvisibles?n:i.DOT;var o,a=this.session,l=0;this.line=this.line.replace(/\t|[\u1100-\u2029, \u202F-\uFFE6]/g,(function(e,t){return"\t"===e||a.isFullWidth(e.charCodeAt(0))?(o="\t"===e?a.getScreenTabSize(t+l):2,l+=o-1,r.stringRepeat(i.DOT,o)):e})),this.isRtlDir&&(this.fontMetrics.$main.innerHTML=this.line.charAt(this.line.length-1)==i.DOT?this.line.substr(0,this.line.length-1):this.line,this.rtlLineOffset=this.contentWidth-this.fontMetrics.$main.getBoundingClientRect().width)},this.updateBidiMap=function(){var e=[];i.hasBidiCharacters(this.line,e)||this.isRtlDir?this.bidiMap=i.doBidiReorder(this.line,e,this.isRtlDir):this.bidiMap={}},this.markAsDirty=function(){this.currentRow=null},this.updateCharacterWidths=function(e){if(this.characterWidth!==e.$characterSize.width){this.fontMetrics=e;var t=this.characterWidth=e.$characterSize.width,n=e.$measureCharWidth("ה");this.charWidths[i.L]=this.charWidths[i.EN]=this.charWidths[i.ON_R]=t,this.charWidths[i.R]=this.charWidths[i.AN]=n,this.charWidths[i.R_H]=.45*n,this.charWidths[i.B]=this.charWidths[i.RLE]=0,this.currentRow=null}},this.setShowInvisibles=function(e){this.showInvisibles=e,this.currentRow=null},this.setEolChar=function(e){this.EOL=e},this.setContentWidth=function(e){this.contentWidth=e},this.isRtlLine=function(e){return null!=e?this.session.getLine(e).charAt(0)==this.RLE:this.isRtlDir},this.setRtlDirection=function(e,t){for(var n=e.getCursorPosition(),i=e.selection.getSelectionAnchor().row;i<=n.row;i++)t||e.session.getLine(i).charAt(0)!==e.session.$bidiHandler.RLE?t&&e.session.getLine(i).charAt(0)!==e.session.$bidiHandler.RLE&&e.session.doc.insert({column:0,row:i},e.session.$bidiHandler.RLE):e.session.doc.removeInLine(i,0,1)},this.getPosLeft=function(e){e-=this.wrapIndent;var t=this.line.charAt(0)===this.RLE?1:0,n=e>t?this.session.getOverwrite()?e:e-1:t,r=i.getVisualFromLogicalIdx(n,this.bidiMap),s=this.bidiMap.bidiLevels,o=0;!this.session.getOverwrite()&&e<=t&&s[r]%2!=0&&r++;for(var a=0;a<r;a++)o+=this.charWidths[s[a]];return!this.session.getOverwrite()&&e>t&&s[r]%2==0&&(o+=this.charWidths[s[r]]),this.wrapIndent&&(o+=this.isRtlDir?-1*this.wrapOffset:this.wrapOffset),this.isRtlDir&&(o+=this.rtlLineOffset),o},this.getSelections=function(e,t){var n,i=this.bidiMap,r=i.bidiLevels,s=[],o=0,a=Math.min(e,t)-this.wrapIndent,l=Math.max(e,t)-this.wrapIndent,u=!1,c=!1,h=0;this.wrapIndent&&(o+=this.isRtlDir?-1*this.wrapOffset:this.wrapOffset);for(var d,f=0;f<r.length;f++)d=i.logicalFromVisual[f],n=r[f],(u=d>=a&&d<l)&&!c?h=o:!u&&c&&s.push({left:h,width:o-h}),o+=this.charWidths[n],c=u;if(u&&f===r.length&&s.push({left:h,width:o-h}),this.isRtlDir)for(var p=0;p<s.length;p++)s[p].left+=this.rtlLineOffset;return s},this.offsetToCol=function(e){this.isRtlDir&&(e-=this.rtlLineOffset);var t=0,n=(e=Math.max(e,0),0),i=0,r=this.bidiMap.bidiLevels,s=this.charWidths[r[i]];for(this.wrapIndent&&(e-=this.isRtlDir?-1*this.wrapOffset:this.wrapOffset);e>n+s/2;){if(n+=s,i===r.length-1){s=0;break}s=this.charWidths[r[++i]]}return i>0&&r[i-1]%2!=0&&r[i]%2==0?(e<n&&i--,t=this.bidiMap.logicalFromVisual[i]):i>0&&r[i-1]%2==0&&r[i]%2!=0?t=1+(e>n?this.bidiMap.logicalFromVisual[i]:this.bidiMap.logicalFromVisual[i-1]):this.isRtlDir&&i===r.length-1&&0===s&&r[i-1]%2==0||!this.isRtlDir&&0===i&&r[i]%2!=0?t=1+this.bidiMap.logicalFromVisual[i]:(i>0&&r[i-1]%2!=0&&0!==s&&i--,t=this.bidiMap.logicalFromVisual[i]),0===t&&this.isRtlDir&&t++,t+this.wrapIndent}}).call(o.prototype),t.BidiHandler=o})),ace.define("ace/selection",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/lib/event_emitter","ace/range"],(function(e,t,n){"use strict";var i=e("./lib/oop"),r=e("./lib/lang"),s=e("./lib/event_emitter").EventEmitter,o=e("./range").Range,a=function(e){this.session=e,this.doc=e.getDocument(),this.clearSelection(),this.cursor=this.lead=this.doc.createAnchor(0,0),this.anchor=this.doc.createAnchor(0,0),this.$silent=!1;var t=this;this.cursor.on("change",(function(e){t.$cursorChanged=!0,t.$silent||t._emit("changeCursor"),!t.$isEmpty&&!t.$silent&&t._emit("changeSelection"),!t.$keepDesiredColumnOnChange&&e.old.column!=e.value.column&&(t.$desiredColumn=null)})),this.anchor.on("change",(function(){t.$anchorChanged=!0,!t.$isEmpty&&!t.$silent&&t._emit("changeSelection")}))};(function(){i.implement(this,s),this.isEmpty=function(){return this.$isEmpty||this.anchor.row==this.lead.row&&this.anchor.column==this.lead.column},this.isMultiLine=function(){return!this.$isEmpty&&this.anchor.row!=this.cursor.row},this.getCursor=function(){return this.lead.getPosition()},this.setSelectionAnchor=function(e,t){this.$isEmpty=!1,this.anchor.setPosition(e,t)},this.getAnchor=this.getSelectionAnchor=function(){return this.$isEmpty?this.getSelectionLead():this.anchor.getPosition()},this.getSelectionLead=function(){return this.lead.getPosition()},this.isBackwards=function(){var e=this.anchor,t=this.lead;return e.row>t.row||e.row==t.row&&e.column>t.column},this.getRange=function(){var e=this.anchor,t=this.lead;return this.$isEmpty?o.fromPoints(t,t):this.isBackwards()?o.fromPoints(t,e):o.fromPoints(e,t)},this.clearSelection=function(){this.$isEmpty||(this.$isEmpty=!0,this._emit("changeSelection"))},this.selectAll=function(){this.$setSelection(0,0,Number.MAX_VALUE,Number.MAX_VALUE)},this.setRange=this.setSelectionRange=function(e,t){var n=t?e.end:e.start,i=t?e.start:e.end;this.$setSelection(n.row,n.column,i.row,i.column)},this.$setSelection=function(e,t,n,i){var r=this.$isEmpty,s=this.inMultiSelectMode;this.$silent=!0,this.$cursorChanged=this.$anchorChanged=!1,this.anchor.setPosition(e,t),this.cursor.setPosition(n,i),this.$isEmpty=!o.comparePoints(this.anchor,this.cursor),this.$silent=!1,this.$cursorChanged&&this._emit("changeCursor"),(this.$cursorChanged||this.$anchorChanged||r!=this.$isEmpty||s)&&this._emit("changeSelection")},this.$moveSelection=function(e){var t=this.lead;this.$isEmpty&&this.setSelectionAnchor(t.row,t.column),e.call(this)},this.selectTo=function(e,t){this.$moveSelection((function(){this.moveCursorTo(e,t)}))},this.selectToPosition=function(e){this.$moveSelection((function(){this.moveCursorToPosition(e)}))},this.moveTo=function(e,t){this.clearSelection(),this.moveCursorTo(e,t)},this.moveToPosition=function(e){this.clearSelection(),this.moveCursorToPosition(e)},this.selectUp=function(){this.$moveSelection(this.moveCursorUp)},this.selectDown=function(){this.$moveSelection(this.moveCursorDown)},this.selectRight=function(){this.$moveSelection(this.moveCursorRight)},this.selectLeft=function(){this.$moveSelection(this.moveCursorLeft)},this.selectLineStart=function(){this.$moveSelection(this.moveCursorLineStart)},this.selectLineEnd=function(){this.$moveSelection(this.moveCursorLineEnd)},this.selectFileEnd=function(){this.$moveSelection(this.moveCursorFileEnd)},this.selectFileStart=function(){this.$moveSelection(this.moveCursorFileStart)},this.selectWordRight=function(){this.$moveSelection(this.moveCursorWordRight)},this.selectWordLeft=function(){this.$moveSelection(this.moveCursorWordLeft)},this.getWordRange=function(e,t){if(void 0===t){var n=e||this.lead;e=n.row,t=n.column}return this.session.getWordRange(e,t)},this.selectWord=function(){this.setSelectionRange(this.getWordRange())},this.selectAWord=function(){var e=this.getCursor(),t=this.session.getAWordRange(e.row,e.column);this.setSelectionRange(t)},this.getLineRange=function(e,t){var n,i="number"==typeof e?e:this.lead.row,r=this.session.getFoldLine(i);return r?(i=r.start.row,n=r.end.row):n=i,!0===t?new o(i,0,n,this.session.getLine(n).length):new o(i,0,n+1,0)},this.selectLine=function(){this.setSelectionRange(this.getLineRange())},this.moveCursorUp=function(){this.moveCursorBy(-1,0)},this.moveCursorDown=function(){this.moveCursorBy(1,0)},this.wouldMoveIntoSoftTab=function(e,t,n){var i=e.column,r=e.column+t;return n<0&&(i=e.column-t,r=e.column),this.session.isTabStop(e)&&this.doc.getLine(e.row).slice(i,r).split(" ").length-1==t},this.moveCursorLeft=function(){var e,t=this.lead.getPosition();if(e=this.session.getFoldAt(t.row,t.column,-1))this.moveCursorTo(e.start.row,e.start.column);else if(0===t.column)t.row>0&&this.moveCursorTo(t.row-1,this.doc.getLine(t.row-1).length);else{var n=this.session.getTabSize();this.wouldMoveIntoSoftTab(t,n,-1)&&!this.session.getNavigateWithinSoftTabs()?this.moveCursorBy(0,-n):this.moveCursorBy(0,-1)}},this.moveCursorRight=function(){var e,t=this.lead.getPosition();if(e=this.session.getFoldAt(t.row,t.column,1))this.moveCursorTo(e.end.row,e.end.column);else if(this.lead.column==this.doc.getLine(this.lead.row).length)this.lead.row<this.doc.getLength()-1&&this.moveCursorTo(this.lead.row+1,0);else{var n=this.session.getTabSize();t=this.lead;this.wouldMoveIntoSoftTab(t,n,1)&&!this.session.getNavigateWithinSoftTabs()?this.moveCursorBy(0,n):this.moveCursorBy(0,1)}},this.moveCursorLineStart=function(){var e=this.lead.row,t=this.lead.column,n=this.session.documentToScreenRow(e,t),i=this.session.screenToDocumentPosition(n,0),r=this.session.getDisplayLine(e,null,i.row,i.column).match(/^\s*/);r[0].length!=t&&!this.session.$useEmacsStyleLineStart&&(i.column+=r[0].length),this.moveCursorToPosition(i)},this.moveCursorLineEnd=function(){var e=this.lead,t=this.session.getDocumentLastRowColumnPosition(e.row,e.column);if(this.lead.column==t.column){var n=this.session.getLine(t.row);if(t.column==n.length){var i=n.search(/\s+$/);i>0&&(t.column=i)}}this.moveCursorTo(t.row,t.column)},this.moveCursorFileEnd=function(){var e=this.doc.getLength()-1,t=this.doc.getLine(e).length;this.moveCursorTo(e,t)},this.moveCursorFileStart=function(){this.moveCursorTo(0,0)},this.moveCursorLongWordRight=function(){var e=this.lead.row,t=this.lead.column,n=this.doc.getLine(e),i=n.substring(t);this.session.nonTokenRe.lastIndex=0,this.session.tokenRe.lastIndex=0;var r=this.session.getFoldAt(e,t,1);if(r)this.moveCursorTo(r.end.row,r.end.column);else{if(this.session.nonTokenRe.exec(i)&&(t+=this.session.nonTokenRe.lastIndex,this.session.nonTokenRe.lastIndex=0,i=n.substring(t)),t>=n.length)return this.moveCursorTo(e,n.length),this.moveCursorRight(),void(e<this.doc.getLength()-1&&this.moveCursorWordRight());this.session.tokenRe.exec(i)&&(t+=this.session.tokenRe.lastIndex,this.session.tokenRe.lastIndex=0),this.moveCursorTo(e,t)}},this.moveCursorLongWordLeft=function(){var e,t=this.lead.row,n=this.lead.column;if(e=this.session.getFoldAt(t,n,-1))this.moveCursorTo(e.start.row,e.start.column);else{var i=this.session.getFoldStringAt(t,n,-1);null==i&&(i=this.doc.getLine(t).substring(0,n));var s=r.stringReverse(i);if(this.session.nonTokenRe.lastIndex=0,this.session.tokenRe.lastIndex=0,this.session.nonTokenRe.exec(s)&&(n-=this.session.nonTokenRe.lastIndex,s=s.slice(this.session.nonTokenRe.lastIndex),this.session.nonTokenRe.lastIndex=0),n<=0)return this.moveCursorTo(t,0),this.moveCursorLeft(),void(t>0&&this.moveCursorWordLeft());this.session.tokenRe.exec(s)&&(n-=this.session.tokenRe.lastIndex,this.session.tokenRe.lastIndex=0),this.moveCursorTo(t,n)}},this.$shortWordEndIndex=function(e){var t,n=0,i=/\s/,r=this.session.tokenRe;if(r.lastIndex=0,this.session.tokenRe.exec(e))n=this.session.tokenRe.lastIndex;else{for(;(t=e[n])&&i.test(t);)n++;if(n<1)for(r.lastIndex=0;(t=e[n])&&!r.test(t);)if(r.lastIndex=0,n++,i.test(t)){if(n>2){n--;break}for(;(t=e[n])&&i.test(t);)n++;if(n>2)break}}return r.lastIndex=0,n},this.moveCursorShortWordRight=function(){var e=this.lead.row,t=this.lead.column,n=this.doc.getLine(e),i=n.substring(t),r=this.session.getFoldAt(e,t,1);if(r)return this.moveCursorTo(r.end.row,r.end.column);if(t==n.length){var s=this.doc.getLength();do{e++,i=this.doc.getLine(e)}while(e<s&&/^\s*$/.test(i));/^\s+/.test(i)||(i=""),t=0}var o=this.$shortWordEndIndex(i);this.moveCursorTo(e,t+o)},this.moveCursorShortWordLeft=function(){var e,t=this.lead.row,n=this.lead.column;if(e=this.session.getFoldAt(t,n,-1))return this.moveCursorTo(e.start.row,e.start.column);var i=this.session.getLine(t).substring(0,n);if(0===n){do{t--,i=this.doc.getLine(t)}while(t>0&&/^\s*$/.test(i));n=i.length,/\s+$/.test(i)||(i="")}var s=r.stringReverse(i),o=this.$shortWordEndIndex(s);return this.moveCursorTo(t,n-o)},this.moveCursorWordRight=function(){this.session.$selectLongWords?this.moveCursorLongWordRight():this.moveCursorShortWordRight()},this.moveCursorWordLeft=function(){this.session.$selectLongWords?this.moveCursorLongWordLeft():this.moveCursorShortWordLeft()},this.moveCursorBy=function(e,t){var n,i=this.session.documentToScreenPosition(this.lead.row,this.lead.column);0===t&&(0!==e&&(this.session.$bidiHandler.isBidiRow(i.row,this.lead.row)?(n=this.session.$bidiHandler.getPosLeft(i.column),i.column=Math.round(n/this.session.$bidiHandler.charWidths[0])):n=i.column*this.session.$bidiHandler.charWidths[0]),this.$desiredColumn?i.column=this.$desiredColumn:this.$desiredColumn=i.column);var r=this.session.screenToDocumentPosition(i.row+e,i.column,n);0!==e&&0===t&&r.row===this.lead.row&&r.column===this.lead.column&&this.session.lineWidgets&&this.session.lineWidgets[r.row]&&(r.row>0||e>0)&&r.row++,this.moveCursorTo(r.row,r.column+t,0===t)},this.moveCursorToPosition=function(e){this.moveCursorTo(e.row,e.column)},this.moveCursorTo=function(e,t,n){var i=this.session.getFoldAt(e,t,1);i&&(e=i.start.row,t=i.start.column),this.$keepDesiredColumnOnChange=!0;var r=this.session.getLine(e);/[\uDC00-\uDFFF]/.test(r.charAt(t))&&r.charAt(t-1)&&(this.lead.row==e&&this.lead.column==t+1?t-=1:t+=1),this.lead.setPosition(e,t),this.$keepDesiredColumnOnChange=!1,n||(this.$desiredColumn=null)},this.moveCursorToScreen=function(e,t,n){var i=this.session.screenToDocumentPosition(e,t);this.moveCursorTo(i.row,i.column,n)},this.detach=function(){this.lead.detach(),this.anchor.detach(),this.session=this.doc=null},this.fromOrientedRange=function(e){this.setSelectionRange(e,e.cursor==e.start),this.$desiredColumn=e.desiredColumn||this.$desiredColumn},this.toOrientedRange=function(e){var t=this.getRange();return e?(e.start.column=t.start.column,e.start.row=t.start.row,e.end.column=t.end.column,e.end.row=t.end.row):e=t,e.cursor=this.isBackwards()?e.start:e.end,e.desiredColumn=this.$desiredColumn,e},this.getRangeOfMovements=function(e){var t=this.getCursor();try{e(this);var n=this.getCursor();return o.fromPoints(t,n)}catch(e){return o.fromPoints(t,t)}finally{this.moveCursorToPosition(t)}},this.toJSON=function(){if(this.rangeCount)var e=this.ranges.map((function(e){var t=e.clone();return t.isBackwards=e.cursor==e.start,t}));else(e=this.getRange()).isBackwards=this.isBackwards();return e},this.fromJSON=function(e){if(null==e.start){if(this.rangeList){this.toSingleRange(e[0]);for(var t=e.length;t--;){var n=o.fromPoints(e[t].start,e[t].end);e[t].isBackwards&&(n.cursor=n.start),this.addRange(n,!0)}return}e=e[0]}this.rangeList&&this.toSingleRange(e),this.setSelectionRange(e,e.isBackwards)},this.isEqual=function(e){if((e.length||this.rangeCount)&&e.length!=this.rangeCount)return!1;if(!e.length||!this.ranges)return this.getRange().isEqual(e);for(var t=this.ranges.length;t--;)if(!this.ranges[t].isEqual(e[t]))return!1;return!0}}).call(a.prototype),t.Selection=a})),ace.define("ace/tokenizer",["require","exports","module","ace/config"],(function(e,t,n){"use strict";var i=e("./config"),r=2e3,s=function(e){for(var t in this.states=e,this.regExps={},this.matchMappings={},this.states){for(var n=this.states[t],i=[],r=0,s=this.matchMappings[t]={defaultToken:"text"},o="g",a=[],l=0;l<n.length;l++){var u=n[l];if(u.defaultToken&&(s.defaultToken=u.defaultToken),u.caseInsensitive&&(o="gi"),null!=u.regex){u.regex instanceof RegExp&&(u.regex=u.regex.toString().slice(1,-1));var c=u.regex,h=new RegExp("(?:("+c+")|(.))").exec("a").length-2;Array.isArray(u.token)?1==u.token.length||1==h?u.token=u.token[0]:h-1!=u.token.length?(this.reportError("number of classes and regexp groups doesn't match",{rule:u,groupCount:h-1}),u.token=u.token[0]):(u.tokenArray=u.token,u.token=null,u.onMatch=this.$arrayTokens):"function"==typeof u.token&&!u.onMatch&&(u.onMatch=h>1?this.$applyToken:u.token),h>1&&(/\\\d/.test(u.regex)?c=u.regex.replace(/\\([0-9]+)/g,(function(e,t){return"\\"+(parseInt(t,10)+r+1)})):(h=1,c=this.removeCapturingGroups(u.regex)),!u.splitRegex&&"string"!=typeof u.token&&a.push(u)),s[r]=l,r+=h,i.push(c),u.onMatch||(u.onMatch=null)}}i.length||(s[0]=0,i.push("$")),a.forEach((function(e){e.splitRegex=this.createSplitterRegexp(e.regex,o)}),this),this.regExps[t]=new RegExp("("+i.join(")|(")+")|($)",o)}};(function(){this.$setMaxTokenCount=function(e){r=0|e},this.$applyToken=function(e){var t=this.splitRegex.exec(e).slice(1),n=this.token.apply(this,t);if("string"==typeof n)return[{type:n,value:e}];for(var i=[],r=0,s=n.length;r<s;r++)t[r]&&(i[i.length]={type:n[r],value:t[r]});return i},this.$arrayTokens=function(e){if(!e)return[];var t=this.splitRegex.exec(e);if(!t)return"text";for(var n=[],i=this.tokenArray,r=0,s=i.length;r<s;r++)t[r+1]&&(n[n.length]={type:i[r],value:t[r+1]});return n},this.removeCapturingGroups=function(e){return e.replace(/\\.|\[(?:\\.|[^\\\]])*|\(\?[:=!]|(\()/g,(function(e,t){return t?"(?:":e}))},this.createSplitterRegexp=function(e,t){if(-1!=e.indexOf("(?=")){var n=0,i=!1,r={};e.replace(/(\\.)|(\((?:\?[=!])?)|(\))|([\[\]])/g,(function(e,t,s,o,a,l){return i?i="]"!=a:a?i=!0:o?(n==r.stack&&(r.end=l+1,r.stack=-1),n--):s&&(n++,1!=s.length&&(r.stack=n,r.start=l)),e})),null!=r.end&&/^\)*$/.test(e.substr(r.end))&&(e=e.substring(0,r.start)+e.substr(r.end))}return"^"!=e.charAt(0)&&(e="^"+e),"$"!=e.charAt(e.length-1)&&(e+="$"),new RegExp(e,(t||"").replace("g",""))},this.getLineTokens=function(e,t){if(t&&"string"!=typeof t){var n=t.slice(0);"#tmp"===(t=n[0])&&(n.shift(),t=n.shift())}else n=[];var i=t||"start",s=this.states[i];s||(i="start",s=this.states[i]);var o=this.matchMappings[i],a=this.regExps[i];a.lastIndex=0;for(var l,u=[],c=0,h=0,d={type:null,value:""};l=a.exec(e);){var f=o.defaultToken,p=null,g=l[0],m=a.lastIndex;if(m-g.length>c){var v=e.substring(c,m-g.length);d.type==f?d.value+=v:(d.type&&u.push(d),d={type:f,value:v})}for(var y=0;y<l.length-2;y++)if(void 0!==l[y+1]){f=(p=s[o[y]]).onMatch?p.onMatch(g,i,n,e):p.token,p.next&&(i="string"==typeof p.next?p.next:p.next(i,n),(s=this.states[i])||(this.reportError("state doesn't exist",i),i="start",s=this.states[i]),o=this.matchMappings[i],c=m,(a=this.regExps[i]).lastIndex=m),p.consumeLineEnd&&(c=m);break}if(g)if("string"==typeof f)p&&!1===p.merge||d.type!==f?(d.type&&u.push(d),d={type:f,value:g}):d.value+=g;else if(f){d.type&&u.push(d),d={type:null,value:""};for(y=0;y<f.length;y++)u.push(f[y])}if(c==e.length)break;if(c=m,h++>r){for(h>2*e.length&&this.reportError("infinite loop with in ace tokenizer",{startState:t,line:e});c<e.length;)d.type&&u.push(d),d={value:e.substring(c,c+=2e3),type:"overflow"};i="start",n=[];break}}return d.type&&u.push(d),n.length>1&&n[0]!==i&&n.unshift("#tmp",i),{tokens:u,state:n.length?n:i}},this.reportError=i.reportError}).call(s.prototype),t.Tokenizer=s})),ace.define("ace/mode/text_highlight_rules",["require","exports","module","ace/lib/lang"],(function(e,t,n){"use strict";var i=e("../lib/lang"),r=function(){this.$rules={start:[{token:"empty_line",regex:"^$"},{defaultToken:"text"}]}};(function(){this.addRules=function(e,t){if(t)for(var n in e){for(var i=e[n],r=0;r<i.length;r++){var s=i[r];(s.next||s.onMatch)&&("string"==typeof s.next&&0!==s.next.indexOf(t)&&(s.next=t+s.next),s.nextState&&0!==s.nextState.indexOf(t)&&(s.nextState=t+s.nextState))}this.$rules[t+n]=i}else for(var n in e)this.$rules[n]=e[n]},this.getRules=function(){return this.$rules},this.embedRules=function(e,t,n,r,s){var o="function"==typeof e?(new e).getRules():e;if(r)for(var a=0;a<r.length;a++)r[a]=t+r[a];else for(var l in r=[],o)r.push(t+l);if(this.addRules(o,t),n){var u=Array.prototype[s?"push":"unshift"];for(a=0;a<r.length;a++)u.apply(this.$rules[r[a]],i.deepCopy(n))}this.$embeds||(this.$embeds=[]),this.$embeds.push(t)},this.getEmbeds=function(){return this.$embeds};var e=function(e,t){return("start"!=e||t.length)&&t.unshift(this.nextState,e),this.nextState},t=function(e,t){return t.shift(),t.shift()||"start"};this.normalizeRules=function(){var n=0,i=this.$rules;Object.keys(i).forEach((function r(s){var o=i[s];o.processed=!0;for(var a=0;a<o.length;a++){var l=o[a],u=null;Array.isArray(l)&&(u=l,l={}),!l.regex&&l.start&&(l.regex=l.start,l.next||(l.next=[]),l.next.push({defaultToken:l.token},{token:l.token+".end",regex:l.end||l.start,next:"pop"}),l.token=l.token+".start",l.push=!0);var c=l.next||l.push;if(c&&Array.isArray(c)){var h=l.stateName;h||("string"!=typeof(h=l.token)&&(h=h[0]||""),i[h]&&(h+=n++)),i[h]=c,l.next=h,r(h)}else"pop"==c&&(l.next=t);if(l.push&&(l.nextState=l.next||l.push,l.next=e,delete l.push),l.rules)for(var d in l.rules)i[d]?i[d].push&&i[d].push.apply(i[d],l.rules[d]):i[d]=l.rules[d];var f="string"==typeof l?l:l.include;if(f&&(u=Array.isArray(f)?f.map((function(e){return i[e]})):i[f]),u){var p=[a,1].concat(u);l.noEscape&&(p=p.filter((function(e){return!e.next}))),o.splice.apply(o,p),a--}l.keywordMap&&(l.token=this.createKeywordMapper(l.keywordMap,l.defaultToken||"text",l.caseInsensitive),delete l.defaultToken)}}),this)},this.createKeywordMapper=function(e,t,n,i){var r=Object.create(null);return Object.keys(e).forEach((function(t){var s=e[t];n&&(s=s.toLowerCase());for(var o=s.split(i||"|"),a=o.length;a--;)r[o[a]]=t})),Object.getPrototypeOf(r)&&(r.__proto__=null),this.$keywordList=Object.keys(r),e=null,n?function(e){return r[e.toLowerCase()]||t}:function(e){return r[e]||t}},this.getKeywords=function(){return this.$keywords}}).call(r.prototype),t.TextHighlightRules=r})),ace.define("ace/mode/behaviour",["require","exports","module"],(function(e,t,n){"use strict";var i=function(){this.$behaviours={}};(function(){this.add=function(e,t,n){switch(void 0){case this.$behaviours:this.$behaviours={};case this.$behaviours[e]:this.$behaviours[e]={}}this.$behaviours[e][t]=n},this.addBehaviours=function(e){for(var t in e)for(var n in e[t])this.add(t,n,e[t][n])},this.remove=function(e){this.$behaviours&&this.$behaviours[e]&&delete this.$behaviours[e]},this.inherit=function(e,t){if("function"==typeof e)var n=(new e).getBehaviours(t);else n=e.getBehaviours(t);this.addBehaviours(n)},this.getBehaviours=function(e){if(!e)return this.$behaviours;for(var t={},n=0;n<e.length;n++)this.$behaviours[e[n]]&&(t[e[n]]=this.$behaviours[e[n]]);return t}}).call(i.prototype),t.Behaviour=i})),ace.define("ace/token_iterator",["require","exports","module","ace/range"],(function(e,t,n){"use strict";var i=e("./range").Range,r=function(e,t,n){this.$session=e,this.$row=t,this.$rowTokens=e.getTokens(t);var i=e.getTokenAt(t,n);this.$tokenIndex=i?i.index:-1};(function(){this.stepBackward=function(){for(this.$tokenIndex-=1;this.$tokenIndex<0;){if(this.$row-=1,this.$row<0)return this.$row=0,null;this.$rowTokens=this.$session.getTokens(this.$row),this.$tokenIndex=this.$rowTokens.length-1}return this.$rowTokens[this.$tokenIndex]},this.stepForward=function(){var e;for(this.$tokenIndex+=1;this.$tokenIndex>=this.$rowTokens.length;){if(this.$row+=1,e||(e=this.$session.getLength()),this.$row>=e)return this.$row=e-1,null;this.$rowTokens=this.$session.getTokens(this.$row),this.$tokenIndex=0}return this.$rowTokens[this.$tokenIndex]},this.getCurrentToken=function(){return this.$rowTokens[this.$tokenIndex]},this.getCurrentTokenRow=function(){return this.$row},this.getCurrentTokenColumn=function(){var e=this.$rowTokens,t=this.$tokenIndex,n=e[t].start;if(void 0!==n)return n;for(n=0;t>0;)n+=e[t-=1].value.length;return n},this.getCurrentTokenPosition=function(){return{row:this.$row,column:this.getCurrentTokenColumn()}},this.getCurrentTokenRange=function(){var e=this.$rowTokens[this.$tokenIndex],t=this.getCurrentTokenColumn();return new i(this.$row,t,this.$row,t+e.value.length)}}).call(r.prototype),t.TokenIterator=r})),ace.define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"],(function(e,t,n){"use strict";var i,r=e("../../lib/oop"),s=e("../behaviour").Behaviour,o=e("../../token_iterator").TokenIterator,a=e("../../lib/lang"),l=["text","paren.rparen","punctuation.operator"],u=["text","paren.rparen","punctuation.operator","comment"],c={},h={'"':'"',"'":"'"},d=function(e){var t=-1;if(e.multiSelect&&(t=e.selection.index,c.rangeCount!=e.multiSelect.rangeCount&&(c={rangeCount:e.multiSelect.rangeCount})),c[t])return i=c[t];i=c[t]={autoInsertedBrackets:0,autoInsertedRow:-1,autoInsertedLineEnd:"",maybeInsertedBrackets:0,maybeInsertedRow:-1,maybeInsertedLineStart:"",maybeInsertedLineEnd:""}},f=function(e,t,n,i){var r=e.end.row-e.start.row;return{text:n+t+i,selection:[0,e.start.column+1,r,e.end.column+(r?0:1)]}},p=function(e){this.add("braces","insertion",(function(t,n,r,s,o){var l=r.getCursorPosition(),u=s.doc.getLine(l.row);if("{"==o){d(r);var c=r.getSelectionRange(),h=s.doc.getTextRange(c);if(""!==h&&"{"!==h&&r.getWrapBehavioursEnabled())return f(c,h,"{","}");if(p.isSaneInsertion(r,s))return/[\]\}\)]/.test(u[l.column])||r.inMultiSelectMode||e&&e.braces?(p.recordAutoInsert(r,s,"}"),{text:"{}",selection:[1,1]}):(p.recordMaybeInsert(r,s,"{"),{text:"{",selection:[1,1]})}else if("}"==o){if(d(r),"}"==u.substring(l.column,l.column+1))if(null!==s.$findOpeningBracket("}",{column:l.column+1,row:l.row})&&p.isAutoInsertedClosing(l,u,o))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}else{if("\n"==o||"\r\n"==o){d(r);var g="";if(p.isMaybeInsertedClosing(l,u)&&(g=a.stringRepeat("}",i.maybeInsertedBrackets),p.clearMaybeInsertedClosing()),"}"===u.substring(l.column,l.column+1)){var m=s.findMatchingBracket({row:l.row,column:l.column+1},"}");if(!m)return null;var v=this.$getIndent(s.getLine(m.row))}else{if(!g)return void p.clearMaybeInsertedClosing();v=this.$getIndent(u)}var y=v+s.getTabString();return{text:"\n"+y+"\n"+v+g,selection:[1,y.length,1,y.length]}}p.clearMaybeInsertedClosing()}})),this.add("braces","deletion",(function(e,t,n,r,s){var o=r.doc.getTextRange(s);if(!s.isMultiLine()&&"{"==o){if(d(n),"}"==r.doc.getLine(s.start.row).substring(s.end.column,s.end.column+1))return s.end.column++,s;i.maybeInsertedBrackets--}})),this.add("parens","insertion",(function(e,t,n,i,r){if("("==r){d(n);var s=n.getSelectionRange(),o=i.doc.getTextRange(s);if(""!==o&&n.getWrapBehavioursEnabled())return f(s,o,"(",")");if(p.isSaneInsertion(n,i))return p.recordAutoInsert(n,i,")"),{text:"()",selection:[1,1]}}else if(")"==r){d(n);var a=n.getCursorPosition(),l=i.doc.getLine(a.row);if(")"==l.substring(a.column,a.column+1))if(null!==i.$findOpeningBracket(")",{column:a.column+1,row:a.row})&&p.isAutoInsertedClosing(a,l,r))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}})),this.add("parens","deletion",(function(e,t,n,i,r){var s=i.doc.getTextRange(r);if(!r.isMultiLine()&&"("==s&&(d(n),")"==i.doc.getLine(r.start.row).substring(r.start.column+1,r.start.column+2)))return r.end.column++,r})),this.add("brackets","insertion",(function(e,t,n,i,r){if("["==r){d(n);var s=n.getSelectionRange(),o=i.doc.getTextRange(s);if(""!==o&&n.getWrapBehavioursEnabled())return f(s,o,"[","]");if(p.isSaneInsertion(n,i))return p.recordAutoInsert(n,i,"]"),{text:"[]",selection:[1,1]}}else if("]"==r){d(n);var a=n.getCursorPosition(),l=i.doc.getLine(a.row);if("]"==l.substring(a.column,a.column+1))if(null!==i.$findOpeningBracket("]",{column:a.column+1,row:a.row})&&p.isAutoInsertedClosing(a,l,r))return p.popAutoInsertedClosing(),{text:"",selection:[1,1]}}})),this.add("brackets","deletion",(function(e,t,n,i,r){var s=i.doc.getTextRange(r);if(!r.isMultiLine()&&"["==s&&(d(n),"]"==i.doc.getLine(r.start.row).substring(r.start.column+1,r.start.column+2)))return r.end.column++,r})),this.add("string_dquotes","insertion",(function(e,t,n,i,r){var s=i.$mode.$quotes||h;if(1==r.length&&s[r]){if(this.lineCommentStart&&-1!=this.lineCommentStart.indexOf(r))return;d(n);var o=r,a=n.getSelectionRange(),l=i.doc.getTextRange(a);if(""!==l&&(1!=l.length||!s[l])&&n.getWrapBehavioursEnabled())return f(a,l,o,o);if(!l){var u=n.getCursorPosition(),c=i.doc.getLine(u.row),p=c.substring(u.column-1,u.column),g=c.substring(u.column,u.column+1),m=i.getTokenAt(u.row,u.column),v=i.getTokenAt(u.row,u.column+1);if("\\"==p&&m&&/escape/.test(m.type))return null;var y,$=m&&/string|escape/.test(m.type),w=!v||/string|escape/.test(v.type);if(g==o)(y=$!==w)&&/string\.end/.test(v.type)&&(y=!1);else{if($&&!w)return null;if($&&w)return null;var b=i.$mode.tokenRe;b.lastIndex=0;var S=b.test(p);b.lastIndex=0;var x=b.test(p);if(S||x)return null;if(g&&!/[\s;,.})\]\\]/.test(g))return null;y=!0}return{text:y?o+o:"",selection:[1,1]}}}})),this.add("string_dquotes","deletion",(function(e,t,n,i,r){var s=i.$mode.$quotes||h,o=i.doc.getTextRange(r);if(!r.isMultiLine()&&s.hasOwnProperty(o)&&(d(n),i.doc.getLine(r.start.row).substring(r.start.column+1,r.start.column+2)==o))return r.end.column++,r}))};p.isSaneInsertion=function(e,t){var n=e.getCursorPosition(),i=new o(t,n.row,n.column);if(!this.$matchTokenType(i.getCurrentToken()||"text",l)){var r=new o(t,n.row,n.column+1);if(!this.$matchTokenType(r.getCurrentToken()||"text",l))return!1}return i.stepForward(),i.getCurrentTokenRow()!==n.row||this.$matchTokenType(i.getCurrentToken()||"text",u)},p.$matchTokenType=function(e,t){return t.indexOf(e.type||e)>-1},p.recordAutoInsert=function(e,t,n){var r=e.getCursorPosition(),s=t.doc.getLine(r.row);this.isAutoInsertedClosing(r,s,i.autoInsertedLineEnd[0])||(i.autoInsertedBrackets=0),i.autoInsertedRow=r.row,i.autoInsertedLineEnd=n+s.substr(r.column),i.autoInsertedBrackets++},p.recordMaybeInsert=function(e,t,n){var r=e.getCursorPosition(),s=t.doc.getLine(r.row);this.isMaybeInsertedClosing(r,s)||(i.maybeInsertedBrackets=0),i.maybeInsertedRow=r.row,i.maybeInsertedLineStart=s.substr(0,r.column)+n,i.maybeInsertedLineEnd=s.substr(r.column),i.maybeInsertedBrackets++},p.isAutoInsertedClosing=function(e,t,n){return i.autoInsertedBrackets>0&&e.row===i.autoInsertedRow&&n===i.autoInsertedLineEnd[0]&&t.substr(e.column)===i.autoInsertedLineEnd},p.isMaybeInsertedClosing=function(e,t){return i.maybeInsertedBrackets>0&&e.row===i.maybeInsertedRow&&t.substr(e.column)===i.maybeInsertedLineEnd&&t.substr(0,e.column)==i.maybeInsertedLineStart},p.popAutoInsertedClosing=function(){i.autoInsertedLineEnd=i.autoInsertedLineEnd.substr(1),i.autoInsertedBrackets--},p.clearMaybeInsertedClosing=function(){i&&(i.maybeInsertedBrackets=0,i.maybeInsertedRow=-1)},r.inherits(p,s),t.CstyleBehaviour=p})),ace.define("ace/unicode",["require","exports","module"],(function(e,t,n){"use strict";for(var i=[48,9,8,25,5,0,2,25,48,0,11,0,5,0,6,22,2,30,2,457,5,11,15,4,8,0,2,0,18,116,2,1,3,3,9,0,2,2,2,0,2,19,2,82,2,138,2,4,3,155,12,37,3,0,8,38,10,44,2,0,2,1,2,1,2,0,9,26,6,2,30,10,7,61,2,9,5,101,2,7,3,9,2,18,3,0,17,58,3,100,15,53,5,0,6,45,211,57,3,18,2,5,3,11,3,9,2,1,7,6,2,2,2,7,3,1,3,21,2,6,2,0,4,3,3,8,3,1,3,3,9,0,5,1,2,4,3,11,16,2,2,5,5,1,3,21,2,6,2,1,2,1,2,1,3,0,2,4,5,1,3,2,4,0,8,3,2,0,8,15,12,2,2,8,2,2,2,21,2,6,2,1,2,4,3,9,2,2,2,2,3,0,16,3,3,9,18,2,2,7,3,1,3,21,2,6,2,1,2,4,3,8,3,1,3,2,9,1,5,1,2,4,3,9,2,0,17,1,2,5,4,2,2,3,4,1,2,0,2,1,4,1,4,2,4,11,5,4,4,2,2,3,3,0,7,0,15,9,18,2,2,7,2,2,2,22,2,9,2,4,4,7,2,2,2,3,8,1,2,1,7,3,3,9,19,1,2,7,2,2,2,22,2,9,2,4,3,8,2,2,2,3,8,1,8,0,2,3,3,9,19,1,2,7,2,2,2,22,2,15,4,7,2,2,2,3,10,0,9,3,3,9,11,5,3,1,2,17,4,23,2,8,2,0,3,6,4,0,5,5,2,0,2,7,19,1,14,57,6,14,2,9,40,1,2,0,3,1,2,0,3,0,7,3,2,6,2,2,2,0,2,0,3,1,2,12,2,2,3,4,2,0,2,5,3,9,3,1,35,0,24,1,7,9,12,0,2,0,2,0,5,9,2,35,5,19,2,5,5,7,2,35,10,0,58,73,7,77,3,37,11,42,2,0,4,328,2,3,3,6,2,0,2,3,3,40,2,3,3,32,2,3,3,6,2,0,2,3,3,14,2,56,2,3,3,66,5,0,33,15,17,84,13,619,3,16,2,25,6,74,22,12,2,6,12,20,12,19,13,12,2,2,2,1,13,51,3,29,4,0,5,1,3,9,34,2,3,9,7,87,9,42,6,69,11,28,4,11,5,11,11,39,3,4,12,43,5,25,7,10,38,27,5,62,2,28,3,10,7,9,14,0,89,75,5,9,18,8,13,42,4,11,71,55,9,9,4,48,83,2,2,30,14,230,23,280,3,5,3,37,3,5,3,7,2,0,2,0,2,0,2,30,3,52,2,6,2,0,4,2,2,6,4,3,3,5,5,12,6,2,2,6,67,1,20,0,29,0,14,0,17,4,60,12,5,0,4,11,18,0,5,0,3,9,2,0,4,4,7,0,2,0,2,0,2,3,2,10,3,3,6,4,5,0,53,1,2684,46,2,46,2,132,7,6,15,37,11,53,10,0,17,22,10,6,2,6,2,6,2,6,2,6,2,6,2,6,2,6,2,31,48,0,470,1,36,5,2,4,6,1,5,85,3,1,3,2,2,89,2,3,6,40,4,93,18,23,57,15,513,6581,75,20939,53,1164,68,45,3,268,4,27,21,31,3,13,13,1,2,24,9,69,11,1,38,8,3,102,3,1,111,44,25,51,13,68,12,9,7,23,4,0,5,45,3,35,13,28,4,64,15,10,39,54,10,13,3,9,7,22,4,1,5,66,25,2,227,42,2,1,3,9,7,11171,13,22,5,48,8453,301,3,61,3,105,39,6,13,4,6,11,2,12,2,4,2,0,2,1,2,1,2,107,34,362,19,63,3,53,41,11,5,15,17,6,13,1,25,2,33,4,2,134,20,9,8,25,5,0,2,25,12,88,4,5,3,5,3,5,3,2],r=0,s=[],o=0;o<i.length;o+=2)s.push(r+=i[o]),i[o+1]&&s.push(45,r+=i[o+1]);t.wordChars=String.fromCharCode.apply(null,s)})),ace.define("ace/mode/text",["require","exports","module","ace/config","ace/tokenizer","ace/mode/text_highlight_rules","ace/mode/behaviour/cstyle","ace/unicode","ace/lib/lang","ace/token_iterator","ace/range"],(function(e,t,n){"use strict";var i=e("../config"),r=e("../tokenizer").Tokenizer,s=e("./text_highlight_rules").TextHighlightRules,o=e("./behaviour/cstyle").CstyleBehaviour,a=e("../unicode"),l=e("../lib/lang"),u=e("../token_iterator").TokenIterator,c=e("../range").Range,h=function(){this.HighlightRules=s};(function(){this.$defaultBehaviour=new o,this.tokenRe=new RegExp("^["+a.wordChars+"\\$_]+","g"),this.nonTokenRe=new RegExp("^(?:[^"+a.wordChars+"\\$_]|\\s])+","g"),this.getTokenizer=function(){return this.$tokenizer||(this.$highlightRules=this.$highlightRules||new this.HighlightRules(this.$highlightRuleConfig),this.$tokenizer=new r(this.$highlightRules.getRules())),this.$tokenizer},this.lineCommentStart="",this.blockComment="",this.toggleCommentLines=function(e,t,n,i){function r(e){for(var t=n;t<=i;t++)e(s.getLine(t),t)}var s=t.doc,o=!0,a=!0,u=1/0,c=t.getTabSize(),h=!1;if(this.lineCommentStart){if(Array.isArray(this.lineCommentStart))m=this.lineCommentStart.map(l.escapeRegExp).join("|"),p=this.lineCommentStart[0];else m=l.escapeRegExp(this.lineCommentStart),p=this.lineCommentStart;m=new RegExp("^(\\s*)(?:"+m+") ?"),h=t.getUseSoftTabs();$=function(e,t){var n=e.match(m);if(n){var i=n[1].length,r=n[0].length;!f(e,i,r)&&" "==n[0][r-1]&&r--,s.removeInLine(t,i,r)}};var d=p+" ",f=(y=function(e,t){o&&!/\S/.test(e)||(f(e,u,u)?s.insertInLine({row:t,column:u},d):s.insertInLine({row:t,column:u},p))},w=function(e,t){return m.test(e)},function(e,t,n){for(var i=0;t--&&" "==e.charAt(t);)i++;if(i%c!=0)return!1;for(i=0;" "==e.charAt(n++);)i++;return c>2?i%c!=c-1:i%c==0})}else{if(!this.blockComment)return!1;var p=this.blockComment.start,g=this.blockComment.end,m=new RegExp("^(\\s*)(?:"+l.escapeRegExp(p)+")"),v=new RegExp("(?:"+l.escapeRegExp(g)+")\\s*$"),y=function(e,t){w(e,t)||o&&!/\S/.test(e)||(s.insertInLine({row:t,column:e.length},g),s.insertInLine({row:t,column:u},p))},$=function(e,t){var n;(n=e.match(v))&&s.removeInLine(t,e.length-n[0].length,e.length),(n=e.match(m))&&s.removeInLine(t,n[1].length,n[0].length)},w=function(e,n){if(m.test(e))return!0;for(var i=t.getTokens(n),r=0;r<i.length;r++)if("comment"===i[r].type)return!0}}var b=1/0;r((function(e,t){var n=e.search(/\S/);-1!==n?(n<u&&(u=n),a&&!w(e,t)&&(a=!1)):b>e.length&&(b=e.length)})),u==1/0&&(u=b,o=!1,a=!1),h&&u%c!=0&&(u=Math.floor(u/c)*c),r(a?$:y)},this.toggleBlockComment=function(e,t,n,i){var r=this.blockComment;if(r){!r.start&&r[0]&&(r=r[0]);var s,o,a=(g=new u(t,i.row,i.column)).getCurrentToken(),l=(t.selection,t.selection.toOrientedRange());if(a&&/comment/.test(a.type)){for(var h,d;a&&/comment/.test(a.type);){if(-1!=(m=a.value.indexOf(r.start))){var f=g.getCurrentTokenRow(),p=g.getCurrentTokenColumn()+m;h=new c(f,p,f,p+r.start.length);break}a=g.stepBackward()}var g;for(a=(g=new u(t,i.row,i.column)).getCurrentToken();a&&/comment/.test(a.type);){var m;if(-1!=(m=a.value.indexOf(r.end))){f=g.getCurrentTokenRow(),p=g.getCurrentTokenColumn()+m;d=new c(f,p,f,p+r.end.length);break}a=g.stepForward()}d&&t.remove(d),h&&(t.remove(h),s=h.start.row,o=-r.start.length)}else o=r.start.length,s=n.start.row,t.insert(n.end,r.end),t.insert(n.start,r.start);l.start.row==s&&(l.start.column+=o),l.end.row==s&&(l.end.column+=o),t.selection.fromOrientedRange(l)}},this.getNextLineIndent=function(e,t,n){return this.$getIndent(t)},this.checkOutdent=function(e,t,n){return!1},this.autoOutdent=function(e,t,n){},this.$getIndent=function(e){return e.match(/^\s*/)[0]},this.createWorker=function(e){return null},this.createModeDelegates=function(e){for(var t in this.$embeds=[],this.$modes={},e)if(e[t]){var n=e[t],r=n.prototype.$id,s=i.$modes[r];s||(i.$modes[r]=s=new n),i.$modes[t]||(i.$modes[t]=s),this.$embeds.push(t),this.$modes[t]=s}var o=["toggleBlockComment","toggleCommentLines","getNextLineIndent","checkOutdent","autoOutdent","transformAction","getCompletions"];for(t=0;t<o.length;t++)!function(e){var n=o[t],i=e[n];e[o[t]]=function(){return this.$delegator(n,arguments,i)}}(this)},this.$delegator=function(e,t,n){var i=t[0];if("string"!=typeof i){if(Array.isArray(i[2])){var r=i[2][i[2].length-1];if(o=this.$modes[r])return o[e].apply(o,[i[1]].concat([].slice.call(t,1)))}i=i[0]}for(var s=0;s<this.$embeds.length;s++)if(this.$modes[this.$embeds[s]]){var o,a=i.split(this.$embeds[s]);if(!a[0]&&a[1])return t[0]=a[1],(o=this.$modes[this.$embeds[s]])[e].apply(o,t)}var l=n.apply(this,t);return n?l:void 0},this.transformAction=function(e,t,n,i,r){if(this.$behaviour){var s=this.$behaviour.getBehaviours();for(var o in s)if(s[o][t]){var a=s[o][t].apply(this,arguments);if(a)return a}}},this.getKeywords=function(e){if(!this.completionKeywords){var t=this.$tokenizer.rules,n=[];for(var i in t)for(var r=t[i],s=0,o=r.length;s<o;s++)if("string"==typeof r[s].token)/keyword|support|storage/.test(r[s].token)&&n.push(r[s].regex);else if("object"==typeof r[s].token)for(var a=0,l=r[s].token.length;a<l;a++)if(/keyword|support|storage/.test(r[s].token[a])){i=r[s].regex.match(/\(.+?\)/g)[a];n.push(i.substr(1,i.length-2))}this.completionKeywords=n}return e?n.concat(this.$keywordList||[]):this.$keywordList},this.$createKeywordList=function(){return this.$highlightRules||this.getTokenizer(),this.$keywordList=this.$highlightRules.$keywordList||[]},this.getCompletions=function(e,t,n,i){return(this.$keywordList||this.$createKeywordList()).map((function(e){return{name:e,value:e,score:0,meta:"keyword"}}))},this.$id="ace/mode/text"}).call(h.prototype),t.Mode=h})),ace.define("ace/apply_delta",["require","exports","module"],(function(e,t,n){"use strict";t.applyDelta=function(e,t,n){var i=t.start.row,r=t.start.column,s=e[i]||"";switch(t.action){case"insert":if(1===t.lines.length)e[i]=s.substring(0,r)+t.lines[0]+s.substring(r);else{var o=[i,1].concat(t.lines);e.splice.apply(e,o),e[i]=s.substring(0,r)+e[i],e[i+t.lines.length-1]+=s.substring(r)}break;case"remove":var a=t.end.column,l=t.end.row;i===l?e[i]=s.substring(0,r)+s.substring(a):e.splice(i,l-i+1,s.substring(0,r)+e[l].substring(a))}}})),ace.define("ace/anchor",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],(function(e,t,n){"use strict";var i=e("./lib/oop"),r=e("./lib/event_emitter").EventEmitter,s=t.Anchor=function(e,t,n){this.$onChange=this.onChange.bind(this),this.attach(e),void 0===n?this.setPosition(t.row,t.column):this.setPosition(t,n)};(function(){function e(e,t,n){var i=n?e.column<=t.column:e.column<t.column;return e.row<t.row||e.row==t.row&&i}function t(t,n,i){var r="insert"==t.action,s=(r?1:-1)*(t.end.row-t.start.row),o=(r?1:-1)*(t.end.column-t.start.column),a=t.start,l=r?a:t.end;return e(n,a,i)?{row:n.row,column:n.column}:e(l,n,!i)?{row:n.row+s,column:n.column+(n.row==l.row?o:0)}:{row:a.row,column:a.column}}i.implement(this,r),this.getPosition=function(){return this.$clipPositionToDocument(this.row,this.column)},this.getDocument=function(){return this.document},this.$insertRight=!1,this.onChange=function(e){if(!(e.start.row==e.end.row&&e.start.row!=this.row||e.start.row>this.row)){var n=t(e,{row:this.row,column:this.column},this.$insertRight);this.setPosition(n.row,n.column,!0)}},this.setPosition=function(e,t,n){var i;if(i=n?{row:e,column:t}:this.$clipPositionToDocument(e,t),this.row!=i.row||this.column!=i.column){var r={row:this.row,column:this.column};this.row=i.row,this.column=i.column,this._signal("change",{old:r,value:i})}},this.detach=function(){this.document.removeEventListener("change",this.$onChange)},this.attach=function(e){this.document=e||this.document,this.document.on("change",this.$onChange)},this.$clipPositionToDocument=function(e,t){var n={};return e>=this.document.getLength()?(n.row=Math.max(0,this.document.getLength()-1),n.column=this.document.getLine(n.row).length):e<0?(n.row=0,n.column=0):(n.row=e,n.column=Math.min(this.document.getLine(n.row).length,Math.max(0,t))),t<0&&(n.column=0),n}}).call(s.prototype)})),ace.define("ace/document",["require","exports","module","ace/lib/oop","ace/apply_delta","ace/lib/event_emitter","ace/range","ace/anchor"],(function(e,t,n){"use strict";var i=e("./lib/oop"),r=e("./apply_delta").applyDelta,s=e("./lib/event_emitter").EventEmitter,o=e("./range").Range,a=e("./anchor").Anchor,l=function(e){this.$lines=[""],0===e.length?this.$lines=[""]:Array.isArray(e)?this.insertMergedLines({row:0,column:0},e):this.insert({row:0,column:0},e)};(function(){i.implement(this,s),this.setValue=function(e){var t=this.getLength()-1;this.remove(new o(0,0,t,this.getLine(t).length)),this.insert({row:0,column:0},e)},this.getValue=function(){return this.getAllLines().join(this.getNewLineCharacter())},this.createAnchor=function(e,t){return new a(this,e,t)},0==="aaa".split(/a/).length?this.$split=function(e){return e.replace(/\r\n|\r/g,"\n").split("\n")}:this.$split=function(e){return e.split(/\r\n|\r|\n/)},this.$detectNewLine=function(e){var t=e.match(/^.*?(\r\n|\r|\n)/m);this.$autoNewLine=t?t[1]:"\n",this._signal("changeNewLineMode")},this.getNewLineCharacter=function(){switch(this.$newLineMode){case"windows":return"\r\n";case"unix":return"\n";default:return this.$autoNewLine||"\n"}},this.$autoNewLine="",this.$newLineMode="auto",this.setNewLineMode=function(e){this.$newLineMode!==e&&(this.$newLineMode=e,this._signal("changeNewLineMode"))},this.getNewLineMode=function(){return this.$newLineMode},this.isNewLine=function(e){return"\r\n"==e||"\r"==e||"\n"==e},this.getLine=function(e){return this.$lines[e]||""},this.getLines=function(e,t){return this.$lines.slice(e,t+1)},this.getAllLines=function(){return this.getLines(0,this.getLength())},this.getLength=function(){return this.$lines.length},this.getTextRange=function(e){return this.getLinesForRange(e).join(this.getNewLineCharacter())},this.getLinesForRange=function(e){var t;if(e.start.row===e.end.row)t=[this.getLine(e.start.row).substring(e.start.column,e.end.column)];else{(t=this.getLines(e.start.row,e.end.row))[0]=(t[0]||"").substring(e.start.column);var n=t.length-1;e.end.row-e.start.row==n&&(t[n]=t[n].substring(0,e.end.column))}return t},this.insertLines=function(e,t){return console.warn("Use of document.insertLines is deprecated. Use the insertFullLines method instead."),this.insertFullLines(e,t)},this.removeLines=function(e,t){return console.warn("Use of document.removeLines is deprecated. Use the removeFullLines method instead."),this.removeFullLines(e,t)},this.insertNewLine=function(e){return console.warn("Use of document.insertNewLine is deprecated. Use insertMergedLines(position, ['', '']) instead."),this.insertMergedLines(e,["",""])},this.insert=function(e,t){return this.getLength()<=1&&this.$detectNewLine(t),this.insertMergedLines(e,this.$split(t))},this.insertInLine=function(e,t){var n=this.clippedPos(e.row,e.column),i=this.pos(e.row,e.column+t.length);return this.applyDelta({start:n,end:i,action:"insert",lines:[t]},!0),this.clonePos(i)},this.clippedPos=function(e,t){var n=this.getLength();void 0===e?e=n:e<0?e=0:e>=n&&(e=n-1,t=void 0);var i=this.getLine(e);return null==t&&(t=i.length),{row:e,column:t=Math.min(Math.max(t,0),i.length)}},this.clonePos=function(e){return{row:e.row,column:e.column}},this.pos=function(e,t){return{row:e,column:t}},this.$clipPosition=function(e){var t=this.getLength();return e.row>=t?(e.row=Math.max(0,t-1),e.column=this.getLine(t-1).length):(e.row=Math.max(0,e.row),e.column=Math.min(Math.max(e.column,0),this.getLine(e.row).length)),e},this.insertFullLines=function(e,t){var n=0;(e=Math.min(Math.max(e,0),this.getLength()))<this.getLength()?(t=t.concat([""]),n=0):(t=[""].concat(t),e--,n=this.$lines[e].length),this.insertMergedLines({row:e,column:n},t)},this.insertMergedLines=function(e,t){var n=this.clippedPos(e.row,e.column),i={row:n.row+t.length-1,column:(1==t.length?n.column:0)+t[t.length-1].length};return this.applyDelta({start:n,end:i,action:"insert",lines:t}),this.clonePos(i)},this.remove=function(e){var t=this.clippedPos(e.start.row,e.start.column),n=this.clippedPos(e.end.row,e.end.column);return this.applyDelta({start:t,end:n,action:"remove",lines:this.getLinesForRange({start:t,end:n})}),this.clonePos(t)},this.removeInLine=function(e,t,n){var i=this.clippedPos(e,t),r=this.clippedPos(e,n);return this.applyDelta({start:i,end:r,action:"remove",lines:this.getLinesForRange({start:i,end:r})},!0),this.clonePos(i)},this.removeFullLines=function(e,t){e=Math.min(Math.max(0,e),this.getLength()-1);var n=(t=Math.min(Math.max(0,t),this.getLength()-1))==this.getLength()-1&&e>0,i=t<this.getLength()-1,r=n?e-1:e,s=n?this.getLine(r).length:0,a=i?t+1:t,l=i?0:this.getLine(a).length,u=new o(r,s,a,l),c=this.$lines.slice(e,t+1);return this.applyDelta({start:u.start,end:u.end,action:"remove",lines:this.getLinesForRange(u)}),c},this.removeNewLine=function(e){e<this.getLength()-1&&e>=0&&this.applyDelta({start:this.pos(e,this.getLine(e).length),end:this.pos(e+1,0),action:"remove",lines:["",""]})},this.replace=function(e,t){return e instanceof o||(e=o.fromPoints(e.start,e.end)),0===t.length&&e.isEmpty()?e.start:t==this.getTextRange(e)?e.end:(this.remove(e),t?this.insert(e.start,t):e.start)},this.applyDeltas=function(e){for(var t=0;t<e.length;t++)this.applyDelta(e[t])},this.revertDeltas=function(e){for(var t=e.length-1;t>=0;t--)this.revertDelta(e[t])},this.applyDelta=function(e,t){var n="insert"==e.action;(n?e.lines.length<=1&&!e.lines[0]:!o.comparePoints(e.start,e.end))||(n&&e.lines.length>2e4?this.$splitAndapplyLargeDelta(e,2e4):(r(this.$lines,e,t),this._signal("change",e)))},this.$splitAndapplyLargeDelta=function(e,t){for(var n=e.lines,i=n.length-t+1,r=e.start.row,s=e.start.column,o=0,a=0;o<i;o=a){a+=t-1;var l=n.slice(o,a);l.push(""),this.applyDelta({start:this.pos(r+o,s),end:this.pos(r+a,s=0),action:e.action,lines:l},!0)}e.lines=n.slice(o),e.start.row=r+o,e.start.column=s,this.applyDelta(e,!0)},this.revertDelta=function(e){this.applyDelta({start:this.clonePos(e.start),end:this.clonePos(e.end),action:"insert"==e.action?"remove":"insert",lines:e.lines.slice()})},this.indexToPosition=function(e,t){for(var n=this.$lines||this.getAllLines(),i=this.getNewLineCharacter().length,r=t||0,s=n.length;r<s;r++)if((e-=n[r].length+i)<0)return{row:r,column:e+n[r].length+i};return{row:s-1,column:e+n[s-1].length+i}},this.positionToIndex=function(e,t){for(var n=this.$lines||this.getAllLines(),i=this.getNewLineCharacter().length,r=0,s=Math.min(e.row,n.length),o=t||0;o<s;++o)r+=n[o].length+i;return r+e.column}}).call(l.prototype),t.Document=l})),ace.define("ace/background_tokenizer",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],(function(e,t,n){"use strict";var i=e("./lib/oop"),r=e("./lib/event_emitter").EventEmitter,s=function(e,t){this.running=!1,this.lines=[],this.states=[],this.currentLine=0,this.tokenizer=e;var n=this;this.$worker=function(){if(n.running){for(var e=new Date,t=n.currentLine,i=-1,r=n.doc,s=t;n.lines[t];)t++;var o=r.getLength(),a=0;for(n.running=!1;t<o;){n.$tokenizeRow(t),i=t;do{t++}while(n.lines[t]);if(++a%5==0&&new Date-e>20){n.running=setTimeout(n.$worker,20);break}}n.currentLine=t,-1==i&&(i=t),s<=i&&n.fireUpdateEvent(s,i)}}};(function(){i.implement(this,r),this.setTokenizer=function(e){this.tokenizer=e,this.lines=[],this.states=[],this.start(0)},this.setDocument=function(e){this.doc=e,this.lines=[],this.states=[],this.stop()},this.fireUpdateEvent=function(e,t){var n={first:e,last:t};this._signal("update",{data:n})},this.start=function(e){this.currentLine=Math.min(e||0,this.currentLine,this.doc.getLength()),this.lines.splice(this.currentLine,this.lines.length),this.states.splice(this.currentLine,this.states.length),this.stop(),this.running=setTimeout(this.$worker,700)},this.scheduleStart=function(){this.running||(this.running=setTimeout(this.$worker,700))},this.$updateOnChange=function(e){var t=e.start.row,n=e.end.row-t;if(0===n)this.lines[t]=null;else if("remove"==e.action)this.lines.splice(t,n+1,null),this.states.splice(t,n+1,null);else{var i=Array(n+1);i.unshift(t,1),this.lines.splice.apply(this.lines,i),this.states.splice.apply(this.states,i)}this.currentLine=Math.min(t,this.currentLine,this.doc.getLength()),this.stop()},this.stop=function(){this.running&&clearTimeout(this.running),this.running=!1},this.getTokens=function(e){return this.lines[e]||this.$tokenizeRow(e)},this.getState=function(e){return this.currentLine==e&&this.$tokenizeRow(e),this.states[e]||"start"},this.$tokenizeRow=function(e){var t=this.doc.getLine(e),n=this.states[e-1],i=this.tokenizer.getLineTokens(t,n,e);return this.states[e]+""!=i.state+""?(this.states[e]=i.state,this.lines[e+1]=null,this.currentLine>e+1&&(this.currentLine=e+1)):this.currentLine==e&&(this.currentLine=e+1),this.lines[e]=i.tokens}}).call(s.prototype),t.BackgroundTokenizer=s})),ace.define("ace/search_highlight",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/range"],(function(e,t,n){"use strict";var i=e("./lib/lang"),r=(e("./lib/oop"),e("./range").Range),s=function(e,t,n){this.setRegexp(e),this.clazz=t,this.type=n||"text"};(function(){this.MAX_RANGES=500,this.setRegexp=function(e){this.regExp+""!=e+""&&(this.regExp=e,this.cache=[])},this.update=function(e,t,n,s){if(this.regExp)for(var o=s.firstRow,a=s.lastRow,l=o;l<=a;l++){var u=this.cache[l];null==u&&((u=i.getMatchOffsets(n.getLine(l),this.regExp)).length>this.MAX_RANGES&&(u=u.slice(0,this.MAX_RANGES)),u=u.map((function(e){return new r(l,e.offset,l,e.offset+e.length)})),this.cache[l]=u.length?u:"");for(var c=u.length;c--;)t.drawSingleLineMarker(e,u[c].toScreenRange(n),this.clazz,s)}}}).call(s.prototype),t.SearchHighlight=s})),ace.define("ace/edit_session/fold_line",["require","exports","module","ace/range"],(function(e,t,n){"use strict";function i(e,t){this.foldData=e,Array.isArray(t)?this.folds=t:t=this.folds=[t];var n=t[t.length-1];this.range=new r(t[0].start.row,t[0].start.column,n.end.row,n.end.column),this.start=this.range.start,this.end=this.range.end,this.folds.forEach((function(e){e.setFoldLine(this)}),this)}var r=e("../range").Range;(function(){this.shiftRow=function(e){this.start.row+=e,this.end.row+=e,this.folds.forEach((function(t){t.start.row+=e,t.end.row+=e}))},this.addFold=function(e){if(e.sameRow){if(e.start.row<this.startRow||e.endRow>this.endRow)throw new Error("Can't add a fold to this FoldLine as it has no connection");this.folds.push(e),this.folds.sort((function(e,t){return-e.range.compareEnd(t.start.row,t.start.column)})),this.range.compareEnd(e.start.row,e.start.column)>0?(this.end.row=e.end.row,this.end.column=e.end.column):this.range.compareStart(e.end.row,e.end.column)<0&&(this.start.row=e.start.row,this.start.column=e.start.column)}else if(e.start.row==this.end.row)this.folds.push(e),this.end.row=e.end.row,this.end.column=e.end.column;else{if(e.end.row!=this.start.row)throw new Error("Trying to add fold to FoldRow that doesn't have a matching row");this.folds.unshift(e),this.start.row=e.start.row,this.start.column=e.start.column}e.foldLine=this},this.containsRow=function(e){return e>=this.start.row&&e<=this.end.row},this.walk=function(e,t,n){var i,r,s=0,o=this.folds,a=!0;null==t&&(t=this.end.row,n=this.end.column);for(var l=0;l<o.length;l++){if(-1==(r=(i=o[l]).range.compareStart(t,n)))return void e(null,t,n,s,a);if(!e(null,i.start.row,i.start.column,s,a)&&e(i.placeholder,i.start.row,i.start.column,s)||0===r)return;a=!i.sameRow,s=i.end.column}e(null,t,n,s,a)},this.getNextFoldTo=function(e,t){for(var n,i,r=0;r<this.folds.length;r++){if(-1==(i=(n=this.folds[r]).range.compareEnd(e,t)))return{fold:n,kind:"after"};if(0===i)return{fold:n,kind:"inside"}}return null},this.addRemoveChars=function(e,t,n){var i,r,s=this.getNextFoldTo(e,t);if(s)if(i=s.fold,"inside"==s.kind&&i.start.column!=t&&i.start.row!=e)window.console&&window.console.log(e,t,i);else if(i.start.row==e){var o=(r=this.folds).indexOf(i);for(0===o&&(this.start.column+=n);o<r.length;o++){if((i=r[o]).start.column+=n,!i.sameRow)return;i.end.column+=n}this.end.column+=n}},this.split=function(e,t){var n=this.getNextFoldTo(e,t);if(!n||"inside"==n.kind)return null;var r=n.fold,s=this.folds,o=this.foldData,a=s.indexOf(r),l=s[a-1];this.end.row=l.end.row,this.end.column=l.end.column;var u=new i(o,s=s.splice(a,s.length-a));return o.splice(o.indexOf(this)+1,0,u),u},this.merge=function(e){for(var t=e.folds,n=0;n<t.length;n++)this.addFold(t[n]);var i=this.foldData;i.splice(i.indexOf(e),1)},this.toString=function(){var e=[this.range.toString()+": ["];return this.folds.forEach((function(t){e.push("  "+t.toString())})),e.push("]"),e.join("\n")},this.idxToPosition=function(e){for(var t=0,n=0;n<this.folds.length;n++){var i=this.folds[n];if((e-=i.start.column-t)<0)return{row:i.start.row,column:i.start.column+e};if((e-=i.placeholder.length)<0)return i.start;t=i.end.column}return{row:this.end.row,column:this.end.column+e}}}).call(i.prototype),t.FoldLine=i})),ace.define("ace/range_list",["require","exports","module","ace/range"],(function(e,t,n){"use strict";var i=e("./range").Range.comparePoints,r=function(){this.ranges=[]};(function(){this.comparePoints=i,this.pointIndex=function(e,t,n){for(var r=this.ranges,s=n||0;s<r.length;s++){var o=r[s],a=i(e,o.end);if(!(a>0)){var l=i(e,o.start);return 0===a?t&&0!==l?-s-2:s:l>0||0===l&&!t?s:-s-1}}return-s-1},this.add=function(e){var t=!e.isEmpty(),n=this.pointIndex(e.start,t);n<0&&(n=-n-1);var i=this.pointIndex(e.end,t,n);return i<0?i=-i-1:i++,this.ranges.splice(n,i-n,e)},this.addList=function(e){for(var t=[],n=e.length;n--;)t.push.apply(t,this.add(e[n]));return t},this.substractPoint=function(e){var t=this.pointIndex(e);if(t>=0)return this.ranges.splice(t,1)},this.merge=function(){var e=[],t=this.ranges;t=t.sort((function(e,t){return i(e.start,t.start)}));for(var n,r=t[0],s=1;s<t.length;s++){n=r,r=t[s];var o=i(n.end,r.start);o<0||(0!=o||n.isEmpty()||r.isEmpty())&&(i(n.end,r.end)<0&&(n.end.row=r.end.row,n.end.column=r.end.column),t.splice(s,1),e.push(r),r=n,s--)}return this.ranges=t,e},this.contains=function(e,t){return this.pointIndex({row:e,column:t})>=0},this.containsPoint=function(e){return this.pointIndex(e)>=0},this.rangeAtPoint=function(e){var t=this.pointIndex(e);if(t>=0)return this.ranges[t]},this.clipRows=function(e,t){var n=this.ranges;if(n[0].start.row>t||n[n.length-1].start.row<e)return[];var i=this.pointIndex({row:e,column:0});i<0&&(i=-i-1);var r=this.pointIndex({row:t,column:0},i);r<0&&(r=-r-1);for(var s=[],o=i;o<r;o++)s.push(n[o]);return s},this.removeAll=function(){return this.ranges.splice(0,this.ranges.length)},this.attach=function(e){this.session&&this.detach(),this.session=e,this.onChange=this.$onChange.bind(this),this.session.on("change",this.onChange)},this.detach=function(){this.session&&(this.session.removeListener("change",this.onChange),this.session=null)},this.$onChange=function(e){for(var t=e.start,n=e.end,i=t.row,r=n.row,s=this.ranges,o=0,a=s.length;o<a;o++){if((c=s[o]).end.row>=i)break}if("insert"==e.action)for(var l=r-i,u=-t.column+n.column;o<a;o++){if((c=s[o]).start.row>i)break;if(c.start.row==i&&c.start.column>=t.column&&(c.start.column!=t.column||!this.$insertRight)&&(c.start.column+=u,c.start.row+=l),c.end.row==i&&c.end.column>=t.column){if(c.end.column==t.column&&this.$insertRight)continue;c.end.column==t.column&&u>0&&o<a-1&&c.end.column>c.start.column&&c.end.column==s[o+1].start.column&&(c.end.column-=u),c.end.column+=u,c.end.row+=l}}else for(l=i-r,u=t.column-n.column;o<a;o++){if((c=s[o]).start.row>r)break;c.end.row<r&&(i<c.end.row||i==c.end.row&&t.column<c.end.column)?(c.end.row=i,c.end.column=t.column):c.end.row==r?c.end.column<=n.column?(l||c.end.column>t.column)&&(c.end.column=t.column,c.end.row=t.row):(c.end.column+=u,c.end.row+=l):c.end.row>r&&(c.end.row+=l),c.start.row<r&&(i<c.start.row||i==c.start.row&&t.column<c.start.column)?(c.start.row=i,c.start.column=t.column):c.start.row==r?c.start.column<=n.column?(l||c.start.column>t.column)&&(c.start.column=t.column,c.start.row=t.row):(c.start.column+=u,c.start.row+=l):c.start.row>r&&(c.start.row+=l)}if(0!=l&&o<a)for(;o<a;o++){var c;(c=s[o]).start.row+=l,c.end.row+=l}}}).call(r.prototype),t.RangeList=r})),ace.define("ace/edit_session/fold",["require","exports","module","ace/range","ace/range_list","ace/lib/oop"],(function(e,t,n){"use strict";function i(e,t){e.row-=t.row,0==e.row&&(e.column-=t.column)}function r(e,t){i(e.start,t),i(e.end,t)}function s(e,t){0==e.row&&(e.column+=t.column),e.row+=t.row}e("../range").Range;var o=e("../range_list").RangeList,a=e("../lib/oop"),l=t.Fold=function(e,t){this.foldLine=null,this.placeholder=t,this.range=e,this.start=e.start,this.end=e.end,this.sameRow=e.start.row==e.end.row,this.subFolds=this.ranges=[]};a.inherits(l,o),function(){this.toString=function(){return'"'+this.placeholder+'" '+this.range.toString()},this.setFoldLine=function(e){this.foldLine=e,this.subFolds.forEach((function(t){t.setFoldLine(e)}))},this.clone=function(){var e=this.range.clone(),t=new l(e,this.placeholder);return this.subFolds.forEach((function(e){t.subFolds.push(e.clone())})),t.collapseChildren=this.collapseChildren,t},this.addSubFold=function(e){if(!this.range.isEqual(e)){if(!this.range.containsRange(e))throw new Error("A fold can't intersect already existing fold"+e.range+this.range);r(e,this.start);for(var t=e.start.row,n=e.start.column,i=0,s=-1;i<this.subFolds.length&&1==(s=this.subFolds[i].range.compare(t,n));i++);var o=this.subFolds[i];if(0==s)return o.addSubFold(e);t=e.range.end.row,n=e.range.end.column;var a=i;for(s=-1;a<this.subFolds.length&&1==(s=this.subFolds[a].range.compare(t,n));a++);this.subFolds[a];if(0==s)throw new Error("A fold can't intersect already existing fold"+e.range+this.range);this.subFolds.splice(i,a-i,e);return e.setFoldLine(this.foldLine),e}},this.restoreRange=function(e){return function(e,t){s(e.start,t),s(e.end,t)}(e,this.start)}}.call(l.prototype)})),ace.define("ace/edit_session/folding",["require","exports","module","ace/range","ace/edit_session/fold_line","ace/edit_session/fold","ace/token_iterator"],(function(e,t,n){"use strict";var i=e("../range").Range,r=e("./fold_line").FoldLine,s=e("./fold").Fold,o=e("../token_iterator").TokenIterator;t.Folding=function(){this.getFoldAt=function(e,t,n){var i=this.getFoldLine(e);if(!i)return null;for(var r=i.folds,s=0;s<r.length;s++){var o=r[s];if(o.range.contains(e,t)){if(1==n&&o.range.isEnd(e,t))continue;if(-1==n&&o.range.isStart(e,t))continue;return o}}},this.getFoldsInRange=function(e){var t=e.start,n=e.end,i=this.$foldData,r=[];t.column+=1,n.column-=1;for(var s=0;s<i.length;s++){var o=i[s].range.compareRange(e);if(2!=o){if(-2==o)break;for(var a=i[s].folds,l=0;l<a.length;l++){var u=a[l];if(-2==(o=u.range.compareRange(e)))break;if(2!=o){if(42==o)break;r.push(u)}}}}return t.column-=1,n.column+=1,r},this.getFoldsInRangeList=function(e){if(Array.isArray(e)){var t=[];e.forEach((function(e){t=t.concat(this.getFoldsInRange(e))}),this)}else t=this.getFoldsInRange(e);return t},this.getAllFolds=function(){for(var e=[],t=this.$foldData,n=0;n<t.length;n++)for(var i=0;i<t[n].folds.length;i++)e.push(t[n].folds[i]);return e},this.getFoldStringAt=function(e,t,n,i){if(!(i=i||this.getFoldLine(e)))return null;for(var r,s,o={end:{column:0}},a=0;a<i.folds.length;a++){var l=(s=i.folds[a]).range.compareEnd(e,t);if(-1==l){r=this.getLine(s.start.row).substring(o.end.column,s.start.column);break}if(0===l)return null;o=s}return r||(r=this.getLine(s.start.row).substring(o.end.column)),-1==n?r.substring(0,t-o.end.column):1==n?r.substring(t-o.end.column):r},this.getFoldLine=function(e,t){var n=this.$foldData,i=0;for(t&&(i=n.indexOf(t)),-1==i&&(i=0);i<n.length;i++){var r=n[i];if(r.start.row<=e&&r.end.row>=e)return r;if(r.end.row>e)return null}return null},this.getNextFoldLine=function(e,t){var n=this.$foldData,i=0;for(t&&(i=n.indexOf(t)),-1==i&&(i=0);i<n.length;i++){var r=n[i];if(r.end.row>=e)return r}return null},this.getFoldedRowCount=function(e,t){for(var n=this.$foldData,i=t-e+1,r=0;r<n.length;r++){var s=n[r],o=s.end.row,a=s.start.row;if(o>=t){a<t&&(a>=e?i-=t-a:i=0);break}o>=e&&(i-=a>=e?o-a:o-e+1)}return i},this.$addFoldLine=function(e){return this.$foldData.push(e),this.$foldData.sort((function(e,t){return e.start.row-t.start.row})),e},this.addFold=function(e,t){var n,i=this.$foldData,o=!1;e instanceof s?n=e:(n=new s(t,e)).collapseChildren=t.collapseChildren,this.$clipRangeToDocument(n.range);var a=n.start.row,l=n.start.column,u=n.end.row,c=n.end.column;if(a<u||a==u&&l<=c-2){var h=this.getFoldAt(a,l,1),d=this.getFoldAt(u,c,-1);if(h&&d==h)return h.addSubFold(n);h&&!h.range.isStart(a,l)&&this.removeFold(h),d&&!d.range.isEnd(u,c)&&this.removeFold(d);var f=this.getFoldsInRange(n.range);f.length>0&&(this.removeFolds(f),f.forEach((function(e){n.addSubFold(e)})));for(var p=0;p<i.length;p++){var g=i[p];if(u==g.start.row){g.addFold(n),o=!0;break}if(a==g.end.row){if(g.addFold(n),o=!0,!n.sameRow){var m=i[p+1];if(m&&m.start.row==u){g.merge(m);break}}break}if(u<=g.start.row)break}return o||(g=this.$addFoldLine(new r(this.$foldData,n))),this.$useWrapMode?this.$updateWrapData(g.start.row,g.start.row):this.$updateRowLengthCache(g.start.row,g.start.row),this.$modified=!0,this._signal("changeFold",{data:n,action:"add"}),n}throw new Error("The range has to be at least 2 characters width")},this.addFolds=function(e){e.forEach((function(e){this.addFold(e)}),this)},this.removeFold=function(e){var t=e.foldLine,n=t.start.row,i=t.end.row,r=this.$foldData,s=t.folds;if(1==s.length)r.splice(r.indexOf(t),1);else if(t.range.isEnd(e.end.row,e.end.column))s.pop(),t.end.row=s[s.length-1].end.row,t.end.column=s[s.length-1].end.column;else if(t.range.isStart(e.start.row,e.start.column))s.shift(),t.start.row=s[0].start.row,t.start.column=s[0].start.column;else if(e.sameRow)s.splice(s.indexOf(e),1);else{var o=t.split(e.start.row,e.start.column);(s=o.folds).shift(),o.start.row=s[0].start.row,o.start.column=s[0].start.column}this.$updating||(this.$useWrapMode?this.$updateWrapData(n,i):this.$updateRowLengthCache(n,i)),this.$modified=!0,this._signal("changeFold",{data:e,action:"remove"})},this.removeFolds=function(e){for(var t=[],n=0;n<e.length;n++)t.push(e[n]);t.forEach((function(e){this.removeFold(e)}),this),this.$modified=!0},this.expandFold=function(e){this.removeFold(e),e.subFolds.forEach((function(t){e.restoreRange(t),this.addFold(t)}),this),e.collapseChildren>0&&this.foldAll(e.start.row+1,e.end.row,e.collapseChildren-1),e.subFolds=[]},this.expandFolds=function(e){e.forEach((function(e){this.expandFold(e)}),this)},this.unfold=function(e,t){var n,r;if(null==e?(n=new i(0,0,this.getLength(),0),t=!0):n="number"==typeof e?new i(e,0,e,this.getLine(e).length):"row"in e?i.fromPoints(e,e):e,r=this.getFoldsInRangeList(n),t)this.removeFolds(r);else for(var s=r;s.length;)this.expandFolds(s),s=this.getFoldsInRangeList(n);if(r.length)return r},this.isRowFolded=function(e,t){return!!this.getFoldLine(e,t)},this.getRowFoldEnd=function(e,t){var n=this.getFoldLine(e,t);return n?n.end.row:e},this.getRowFoldStart=function(e,t){var n=this.getFoldLine(e,t);return n?n.start.row:e},this.getFoldDisplayLine=function(e,t,n,i,r){null==i&&(i=e.start.row),null==r&&(r=0),null==t&&(t=e.end.row),null==n&&(n=this.getLine(t).length);var s=this.doc,o="";return e.walk((function(e,t,n,a){if(!(t<i)){if(t==i){if(n<r)return;a=Math.max(r,a)}o+=null!=e?e:s.getLine(t).substring(a,n)}}),t,n),o},this.getDisplayLine=function(e,t,n,i){var r,s=this.getFoldLine(e);return s?this.getFoldDisplayLine(s,e,t,n,i):(r=this.doc.getLine(e)).substring(i||0,t||r.length)},this.$cloneFoldData=function(){var e=[];return e=this.$foldData.map((function(t){var n=t.folds.map((function(e){return e.clone()}));return new r(e,n)})),e},this.toggleFold=function(e){var t,n,i=this.selection.getRange();if(i.isEmpty()){var r=i.start;if(t=this.getFoldAt(r.row,r.column))return void this.expandFold(t);(n=this.findMatchingBracket(r))?1==i.comparePoint(n)?i.end=n:(i.start=n,i.start.column++,i.end.column--):(n=this.findMatchingBracket({row:r.row,column:r.column+1}))?(1==i.comparePoint(n)?i.end=n:i.start=n,i.start.column++):i=this.getCommentFoldRange(r.row,r.column)||i}else{var s=this.getFoldsInRange(i);if(e&&s.length)return void this.expandFolds(s);1==s.length&&(t=s[0])}if(t||(t=this.getFoldAt(i.start.row,i.start.column)),t&&t.range.toString()==i.toString())this.expandFold(t);else{var o="...";if(!i.isMultiLine()){if((o=this.getTextRange(i)).length<4)return;o=o.trim().substring(0,2)+".."}this.addFold(o,i)}},this.getCommentFoldRange=function(e,t,n){var r=new o(this,e,t),s=r.getCurrentToken(),a=s.type;if(s&&/^comment|string/.test(a)){"comment"==(a=a.match(/comment|string/)[0])&&(a+="|doc-start");var l=new RegExp(a),u=new i;if(1!=n){do{s=r.stepBackward()}while(s&&l.test(s.type));r.stepForward()}if(u.start.row=r.getCurrentTokenRow(),u.start.column=r.getCurrentTokenColumn()+2,r=new o(this,e,t),-1!=n){var c=-1;do{if(s=r.stepForward(),-1==c){var h=this.getState(r.$row);l.test(h)||(c=r.$row)}else if(r.$row>c)break}while(s&&l.test(s.type));s=r.stepBackward()}else s=r.getCurrentToken();return u.end.row=r.getCurrentTokenRow(),u.end.column=r.getCurrentTokenColumn()+s.value.length-2,u}},this.foldAll=function(e,t,n){null==n&&(n=1e5);var i=this.foldWidgets;if(i){t=t||this.getLength();for(var r=e=e||0;r<t;r++)if(null==i[r]&&(i[r]=this.getFoldWidget(r)),"start"==i[r]){var s=this.getFoldWidgetRange(r);if(s&&s.isMultiLine()&&s.end.row<=t&&s.start.row>=e){r=s.end.row;try{var o=this.addFold("...",s);o&&(o.collapseChildren=n)}catch(e){}}}}},this.$foldStyles={manual:1,markbegin:1,markbeginend:1},this.$foldStyle="markbegin",this.setFoldStyle=function(e){if(!this.$foldStyles[e])throw new Error("invalid fold style: "+e+"["+Object.keys(this.$foldStyles).join(", ")+"]");if(this.$foldStyle!=e){this.$foldStyle=e,"manual"==e&&this.unfold();var t=this.$foldMode;this.$setFolding(null),this.$setFolding(t)}},this.$setFolding=function(e){this.$foldMode!=e&&(this.$foldMode=e,this.off("change",this.$updateFoldWidgets),this.off("tokenizerUpdate",this.$tokenizerUpdateFoldWidgets),this._signal("changeAnnotation"),e&&"manual"!=this.$foldStyle?(this.foldWidgets=[],this.getFoldWidget=e.getFoldWidget.bind(e,this,this.$foldStyle),this.getFoldWidgetRange=e.getFoldWidgetRange.bind(e,this,this.$foldStyle),this.$updateFoldWidgets=this.updateFoldWidgets.bind(this),this.$tokenizerUpdateFoldWidgets=this.tokenizerUpdateFoldWidgets.bind(this),this.on("change",this.$updateFoldWidgets),this.on("tokenizerUpdate",this.$tokenizerUpdateFoldWidgets)):this.foldWidgets=null)},this.getParentFoldRangeData=function(e,t){var n=this.foldWidgets;if(!n||t&&n[e])return{};for(var i,r=e-1;r>=0;){var s=n[r];if(null==s&&(s=n[r]=this.getFoldWidget(r)),"start"==s){var o=this.getFoldWidgetRange(r);if(i||(i=o),o&&o.end.row>=e)break}r--}return{range:-1!==r&&o,firstRange:i}},this.onFoldWidgetClick=function(e,t){var n={children:(t=t.domEvent).shiftKey,all:t.ctrlKey||t.metaKey,siblings:t.altKey};if(!this.$toggleFoldWidget(e,n)){var i=t.target||t.srcElement;i&&/ace_fold-widget/.test(i.className)&&(i.className+=" ace_invalid")}},this.$toggleFoldWidget=function(e,t){if(this.getFoldWidget){var n=this.getFoldWidget(e),i=this.getLine(e),r="end"===n?-1:1,s=this.getFoldAt(e,-1===r?0:i.length,r);if(s)return t.children||t.all?this.removeFold(s):this.expandFold(s),s;var o=this.getFoldWidgetRange(e,!0);if(o&&!o.isMultiLine()&&(s=this.getFoldAt(o.start.row,o.start.column,1))&&o.isEqual(s.range))return this.removeFold(s),s;if(t.siblings){var a=this.getParentFoldRangeData(e);if(a.range)var l=a.range.start.row+1,u=a.range.end.row;this.foldAll(l,u,t.all?1e4:0)}else t.children?(u=o?o.end.row:this.getLength(),this.foldAll(e+1,u,t.all?1e4:0)):o&&(t.all&&(o.collapseChildren=1e4),this.addFold("...",o));return o}},this.toggleFoldWidget=function(e){var t=this.selection.getCursor().row;t=this.getRowFoldStart(t);var n=this.$toggleFoldWidget(t,{});if(!n){var i=this.getParentFoldRangeData(t,!0);if(n=i.range||i.firstRange){t=n.start.row;var r=this.getFoldAt(t,this.getLine(t).length,1);r?this.removeFold(r):this.addFold("...",n)}}},this.updateFoldWidgets=function(e){var t=e.start.row,n=e.end.row-t;if(0===n)this.foldWidgets[t]=null;else if("remove"==e.action)this.foldWidgets.splice(t,n+1,null);else{var i=Array(n+1);i.unshift(t,1),this.foldWidgets.splice.apply(this.foldWidgets,i)}},this.tokenizerUpdateFoldWidgets=function(e){var t=e.data;t.first!=t.last&&this.foldWidgets.length>t.first&&this.foldWidgets.splice(t.first,this.foldWidgets.length)}}})),ace.define("ace/edit_session/bracket_match",["require","exports","module","ace/token_iterator","ace/range"],(function(e,t,n){"use strict";var i=e("../token_iterator").TokenIterator,r=e("../range").Range;t.BracketMatch=function(){this.findMatchingBracket=function(e,t){if(0==e.column)return null;var n=t||this.getLine(e.row).charAt(e.column-1);if(""==n)return null;var i=n.match(/([\(\[\{])|([\)\]\}])/);return i?i[1]?this.$findClosingBracket(i[1],e):this.$findOpeningBracket(i[2],e):null},this.getBracketRange=function(e){var t,n=this.getLine(e.row),i=!0,s=n.charAt(e.column-1),o=s&&s.match(/([\(\[\{])|([\)\]\}])/);if(o||(s=n.charAt(e.column),e={row:e.row,column:e.column+1},o=s&&s.match(/([\(\[\{])|([\)\]\}])/),i=!1),!o)return null;if(o[1]){if(!(a=this.$findClosingBracket(o[1],e)))return null;t=r.fromPoints(e,a),i||(t.end.column++,t.start.column--),t.cursor=t.end}else{var a;if(!(a=this.$findOpeningBracket(o[2],e)))return null;t=r.fromPoints(a,e),i||(t.start.column++,t.end.column--),t.cursor=t.start}return t},this.$brackets={")":"(","(":")","]":"[","[":"]","{":"}","}":"{"},this.$findOpeningBracket=function(e,t,n){var r=this.$brackets[e],s=1,o=new i(this,t.row,t.column),a=o.getCurrentToken();if(a||(a=o.stepForward()),a){n||(n=new RegExp("(\\.?"+a.type.replace(".","\\.").replace("rparen",".paren").replace(/\b(?:end)\b/,"(?:start|begin|end)")+")+"));for(var l=t.column-o.getCurrentTokenColumn()-2,u=a.value;;){for(;l>=0;){var c=u.charAt(l);if(c==r){if(0==(s-=1))return{row:o.getCurrentTokenRow(),column:l+o.getCurrentTokenColumn()}}else c==e&&(s+=1);l-=1}do{a=o.stepBackward()}while(a&&!n.test(a.type));if(null==a)break;l=(u=a.value).length-1}return null}},this.$findClosingBracket=function(e,t,n){var r=this.$brackets[e],s=1,o=new i(this,t.row,t.column),a=o.getCurrentToken();if(a||(a=o.stepForward()),a){n||(n=new RegExp("(\\.?"+a.type.replace(".","\\.").replace("lparen",".paren").replace(/\b(?:start|begin)\b/,"(?:start|begin|end)")+")+"));for(var l=t.column-o.getCurrentTokenColumn();;){for(var u=a.value,c=u.length;l<c;){var h=u.charAt(l);if(h==r){if(0==(s-=1))return{row:o.getCurrentTokenRow(),column:l+o.getCurrentTokenColumn()}}else h==e&&(s+=1);l+=1}do{a=o.stepForward()}while(a&&!n.test(a.type));if(null==a)break;l=0}return null}}}})),ace.define("ace/edit_session",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/bidihandler","ace/config","ace/lib/event_emitter","ace/selection","ace/mode/text","ace/range","ace/document","ace/background_tokenizer","ace/search_highlight","ace/edit_session/folding","ace/edit_session/bracket_match"],(function(e,t,n){"use strict";var i=e("./lib/oop"),r=e("./lib/lang"),s=e("./bidihandler").BidiHandler,o=e("./config"),a=e("./lib/event_emitter").EventEmitter,l=e("./selection").Selection,u=e("./mode/text").Mode,c=e("./range").Range,h=e("./document").Document,d=e("./background_tokenizer").BackgroundTokenizer,f=e("./search_highlight").SearchHighlight,p=function(e,t){this.$breakpoints=[],this.$decorations=[],this.$frontMarkers={},this.$backMarkers={},this.$markerId=1,this.$undoSelect=!0,this.$foldData=[],this.id="session"+ ++p.$uid,this.$foldData.toString=function(){return this.join("\n")},this.on("changeFold",this.onChangeFold.bind(this)),this.$onChange=this.onChange.bind(this),"object"==typeof e&&e.getLine||(e=new h(e)),this.setDocument(e),this.selection=new l(this),this.$bidiHandler=new s(this),o.resetOptions(this),this.setMode(t),o._signal("session",this)};p.$uid=0,function(){function e(e){return!(e<4352)&&(e>=4352&&e<=4447||e>=4515&&e<=4519||e>=4602&&e<=4607||e>=9001&&e<=9002||e>=11904&&e<=11929||e>=11931&&e<=12019||e>=12032&&e<=12245||e>=12272&&e<=12283||e>=12288&&e<=12350||e>=12353&&e<=12438||e>=12441&&e<=12543||e>=12549&&e<=12589||e>=12593&&e<=12686||e>=12688&&e<=12730||e>=12736&&e<=12771||e>=12784&&e<=12830||e>=12832&&e<=12871||e>=12880&&e<=13054||e>=13056&&e<=19903||e>=19968&&e<=42124||e>=42128&&e<=42182||e>=43360&&e<=43388||e>=44032&&e<=55203||e>=55216&&e<=55238||e>=55243&&e<=55291||e>=63744&&e<=64255||e>=65040&&e<=65049||e>=65072&&e<=65106||e>=65108&&e<=65126||e>=65128&&e<=65131||e>=65281&&e<=65376||e>=65504&&e<=65510)}i.implement(this,a),this.setDocument=function(e){this.doc&&this.doc.removeListener("change",this.$onChange),this.doc=e,e.on("change",this.$onChange),this.bgTokenizer&&this.bgTokenizer.setDocument(this.getDocument()),this.resetCaches()},this.getDocument=function(){return this.doc},this.$resetRowCache=function(e){if(!e)return this.$docRowCache=[],void(this.$screenRowCache=[]);var t=this.$docRowCache.length,n=this.$getRowCacheIndex(this.$docRowCache,e)+1;t>n&&(this.$docRowCache.splice(n,t),this.$screenRowCache.splice(n,t))},this.$getRowCacheIndex=function(e,t){for(var n=0,i=e.length-1;n<=i;){var r=n+i>>1,s=e[r];if(t>s)n=r+1;else{if(!(t<s))return r;i=r-1}}return n-1},this.resetCaches=function(){this.$modified=!0,this.$wrapData=[],this.$rowLengthCache=[],this.$resetRowCache(0),this.bgTokenizer&&this.bgTokenizer.start(0)},this.onChangeFold=function(e){var t=e.data;this.$resetRowCache(t.start.row)},this.onChange=function(e){this.$modified=!0,this.$bidiHandler.onChange(e),this.$resetRowCache(e.start.row);var t=this.$updateInternalDataOnChange(e);!this.$fromUndo&&this.$undoManager&&(t&&t.length&&(this.$undoManager.add({action:"removeFolds",folds:t},this.mergeUndoDeltas),this.mergeUndoDeltas=!0),this.$undoManager.add(e,this.mergeUndoDeltas),this.mergeUndoDeltas=!0,this.$informUndoManager.schedule()),this.bgTokenizer&&this.bgTokenizer.$updateOnChange(e),this._signal("change",e)},this.setValue=function(e){this.doc.setValue(e),this.selection.moveTo(0,0),this.$resetRowCache(0),this.setUndoManager(this.$undoManager),this.getUndoManager().reset()},this.getValue=this.toString=function(){return this.doc.getValue()},this.getSelection=function(){return this.selection},this.getState=function(e){return this.bgTokenizer.getState(e)},this.getTokens=function(e){return this.bgTokenizer.getTokens(e)},this.getTokenAt=function(e,t){var n,i=this.bgTokenizer.getTokens(e),r=0;if(null==t){var s=i.length-1;r=this.getLine(e).length}else for(s=0;s<i.length&&!((r+=i[s].value.length)>=t);s++);return(n=i[s])?(n.index=s,n.start=r-n.value.length,n):null},this.setUndoManager=function(e){if(this.$undoManager=e,this.$informUndoManager&&this.$informUndoManager.cancel(),e){var t=this;e.addSession(this),this.$syncInformUndoManager=function(){t.$informUndoManager.cancel(),t.mergeUndoDeltas=!1},this.$informUndoManager=r.delayedCall(this.$syncInformUndoManager)}else this.$syncInformUndoManager=function(){}},this.markUndoGroup=function(){this.$syncInformUndoManager&&this.$syncInformUndoManager()},this.$defaultUndoManager={undo:function(){},redo:function(){},reset:function(){},add:function(){},addSelection:function(){},startNewGroup:function(){},addSession:function(){}},this.getUndoManager=function(){return this.$undoManager||this.$defaultUndoManager},this.getTabString=function(){return this.getUseSoftTabs()?r.stringRepeat(" ",this.getTabSize()):"\t"},this.setUseSoftTabs=function(e){this.setOption("useSoftTabs",e)},this.getUseSoftTabs=function(){return this.$useSoftTabs&&!this.$mode.$indentWithTabs},this.setTabSize=function(e){this.setOption("tabSize",e)},this.getTabSize=function(){return this.$tabSize},this.isTabStop=function(e){return this.$useSoftTabs&&e.column%this.$tabSize==0},this.setNavigateWithinSoftTabs=function(e){this.setOption("navigateWithinSoftTabs",e)},this.getNavigateWithinSoftTabs=function(){return this.$navigateWithinSoftTabs},this.$overwrite=!1,this.setOverwrite=function(e){this.setOption("overwrite",e)},this.getOverwrite=function(){return this.$overwrite},this.toggleOverwrite=function(){this.setOverwrite(!this.$overwrite)},this.addGutterDecoration=function(e,t){this.$decorations[e]||(this.$decorations[e]=""),this.$decorations[e]+=" "+t,this._signal("changeBreakpoint",{})},this.removeGutterDecoration=function(e,t){this.$decorations[e]=(this.$decorations[e]||"").replace(" "+t,""),this._signal("changeBreakpoint",{})},this.getBreakpoints=function(){return this.$breakpoints},this.setBreakpoints=function(e){this.$breakpoints=[];for(var t=0;t<e.length;t++)this.$breakpoints[e[t]]="ace_breakpoint";this._signal("changeBreakpoint",{})},this.clearBreakpoints=function(){this.$breakpoints=[],this._signal("changeBreakpoint",{})},this.setBreakpoint=function(e,t){void 0===t&&(t="ace_breakpoint"),t?this.$breakpoints[e]=t:delete this.$breakpoints[e],this._signal("changeBreakpoint",{})},this.clearBreakpoint=function(e){delete this.$breakpoints[e],this._signal("changeBreakpoint",{})},this.addMarker=function(e,t,n,i){var r=this.$markerId++,s={range:e,type:n||"line",renderer:"function"==typeof n?n:null,clazz:t,inFront:!!i,id:r};return i?(this.$frontMarkers[r]=s,this._signal("changeFrontMarker")):(this.$backMarkers[r]=s,this._signal("changeBackMarker")),r},this.addDynamicMarker=function(e,t){if(e.update){var n=this.$markerId++;return e.id=n,e.inFront=!!t,t?(this.$frontMarkers[n]=e,this._signal("changeFrontMarker")):(this.$backMarkers[n]=e,this._signal("changeBackMarker")),e}},this.removeMarker=function(e){var t=this.$frontMarkers[e]||this.$backMarkers[e];t&&(delete(t.inFront?this.$frontMarkers:this.$backMarkers)[e],this._signal(t.inFront?"changeFrontMarker":"changeBackMarker"))},this.getMarkers=function(e){return e?this.$frontMarkers:this.$backMarkers},this.highlight=function(e){if(!this.$searchHighlight){var t=new f(null,"ace_selected-word","text");this.$searchHighlight=this.addDynamicMarker(t)}this.$searchHighlight.setRegexp(e)},this.highlightLines=function(e,t,n,i){"number"!=typeof t&&(n=t,t=e),n||(n="ace_step");var r=new c(e,0,t,1/0);return r.id=this.addMarker(r,n,"fullLine",i),r},this.setAnnotations=function(e){this.$annotations=e,this._signal("changeAnnotation",{})},this.getAnnotations=function(){return this.$annotations||[]},this.clearAnnotations=function(){this.setAnnotations([])},this.$detectNewLine=function(e){var t=e.match(/^.*?(\r?\n)/m);this.$autoNewLine=t?t[1]:"\n"},this.getWordRange=function(e,t){var n=this.getLine(e),i=!1;if(t>0&&(i=!!n.charAt(t-1).match(this.tokenRe)),i||(i=!!n.charAt(t).match(this.tokenRe)),i)var r=this.tokenRe;else if(/^\s+$/.test(n.slice(t-1,t+1)))r=/\s/;else r=this.nonTokenRe;var s=t;if(s>0){do{s--}while(s>=0&&n.charAt(s).match(r));s++}for(var o=t;o<n.length&&n.charAt(o).match(r);)o++;return new c(e,s,e,o)},this.getAWordRange=function(e,t){for(var n=this.getWordRange(e,t),i=this.getLine(n.end.row);i.charAt(n.end.column).match(/[ \t]/);)n.end.column+=1;return n},this.setNewLineMode=function(e){this.doc.setNewLineMode(e)},this.getNewLineMode=function(){return this.doc.getNewLineMode()},this.setUseWorker=function(e){this.setOption("useWorker",e)},this.getUseWorker=function(){return this.$useWorker},this.onReloadTokenizer=function(e){var t=e.data;this.bgTokenizer.start(t.first),this._signal("tokenizerUpdate",e)},this.$modes=o.$modes,this.$mode=null,this.$modeId=null,this.setMode=function(e,t){if(e&&"object"==typeof e){if(e.getTokenizer)return this.$onChangeMode(e);var n=e,i=n.path}else i=e||"ace/mode/text";if(this.$modes["ace/mode/text"]||(this.$modes["ace/mode/text"]=new u),this.$modes[i]&&!n)return this.$onChangeMode(this.$modes[i]),void(t&&t());this.$modeId=i,o.loadModule(["mode",i],function(e){if(this.$modeId!==i)return t&&t();this.$modes[i]&&!n?this.$onChangeMode(this.$modes[i]):e&&e.Mode&&(e=new e.Mode(n),n||(this.$modes[i]=e,e.$id=i),this.$onChangeMode(e)),t&&t()}.bind(this)),this.$mode||this.$onChangeMode(this.$modes["ace/mode/text"],!0)},this.$onChangeMode=function(e,t){if(t||(this.$modeId=e.$id),this.$mode!==e){this.$mode=e,this.$stopWorker(),this.$useWorker&&this.$startWorker();var n=e.getTokenizer();if(void 0!==n.addEventListener){var i=this.onReloadTokenizer.bind(this);n.addEventListener("update",i)}if(this.bgTokenizer)this.bgTokenizer.setTokenizer(n);else{this.bgTokenizer=new d(n);var r=this;this.bgTokenizer.addEventListener("update",(function(e){r._signal("tokenizerUpdate",e)}))}this.bgTokenizer.setDocument(this.getDocument()),this.tokenRe=e.tokenRe,this.nonTokenRe=e.nonTokenRe,t||(e.attachToSession&&e.attachToSession(this),this.$options.wrapMethod.set.call(this,this.$wrapMethod),this.$setFolding(e.foldingRules),this.bgTokenizer.start(0),this._emit("changeMode"))}},this.$stopWorker=function(){this.$worker&&(this.$worker.terminate(),this.$worker=null)},this.$startWorker=function(){try{this.$worker=this.$mode.createWorker(this)}catch(e){o.warn("Could not load worker",e),this.$worker=null}},this.getMode=function(){return this.$mode},this.$scrollTop=0,this.setScrollTop=function(e){this.$scrollTop===e||isNaN(e)||(this.$scrollTop=e,this._signal("changeScrollTop",e))},this.getScrollTop=function(){return this.$scrollTop},this.$scrollLeft=0,this.setScrollLeft=function(e){this.$scrollLeft===e||isNaN(e)||(this.$scrollLeft=e,this._signal("changeScrollLeft",e))},this.getScrollLeft=function(){return this.$scrollLeft},this.getScreenWidth=function(){return this.$computeWidth(),this.lineWidgets?Math.max(this.getLineWidgetMaxWidth(),this.screenWidth):this.screenWidth},this.getLineWidgetMaxWidth=function(){if(null!=this.lineWidgetsWidth)return this.lineWidgetsWidth;var e=0;return this.lineWidgets.forEach((function(t){t&&t.screenWidth>e&&(e=t.screenWidth)})),this.lineWidgetWidth=e},this.$computeWidth=function(e){if(this.$modified||e){if(this.$modified=!1,this.$useWrapMode)return this.screenWidth=this.$wrapLimit;for(var t=this.doc.getAllLines(),n=this.$rowLengthCache,i=0,r=0,s=this.$foldData[r],o=s?s.start.row:1/0,a=t.length,l=0;l<a;l++){if(l>o){if((l=s.end.row+1)>=a)break;o=(s=this.$foldData[r++])?s.start.row:1/0}null==n[l]&&(n[l]=this.$getStringScreenWidth(t[l])[0]),n[l]>i&&(i=n[l])}this.screenWidth=i}},this.getLine=function(e){return this.doc.getLine(e)},this.getLines=function(e,t){return this.doc.getLines(e,t)},this.getLength=function(){return this.doc.getLength()},this.getTextRange=function(e){return this.doc.getTextRange(e||this.selection.getRange())},this.insert=function(e,t){return this.doc.insert(e,t)},this.remove=function(e){return this.doc.remove(e)},this.removeFullLines=function(e,t){return this.doc.removeFullLines(e,t)},this.undoChanges=function(e,t){if(e.length){this.$fromUndo=!0;for(var n=e.length-1;-1!=n;n--){var i=e[n];"insert"==i.action||"remove"==i.action?this.doc.revertDelta(i):i.folds&&this.addFolds(i.folds)}!t&&this.$undoSelect&&(e.selectionBefore?this.selection.fromJSON(e.selectionBefore):this.selection.setRange(this.$getUndoSelection(e,!0))),this.$fromUndo=!1}},this.redoChanges=function(e,t){if(e.length){this.$fromUndo=!0;for(var n=0;n<e.length;n++){var i=e[n];("insert"==i.action||"remove"==i.action)&&this.doc.applyDelta(i)}!t&&this.$undoSelect&&(e.selectionAfter?this.selection.fromJSON(e.selectionAfter):this.selection.setRange(this.$getUndoSelection(e,!1))),this.$fromUndo=!1}},this.setUndoSelect=function(e){this.$undoSelect=e},this.$getUndoSelection=function(e,t){function n(e){return t?"insert"!==e.action:"insert"===e.action}for(var i,r,s=0;s<e.length;s++){var o=e[s];o.start&&(i?n(o)?(r=o.start,-1==i.compare(r.row,r.column)&&i.setStart(r),r=o.end,1==i.compare(r.row,r.column)&&i.setEnd(r),!0):(r=o.start,-1==i.compare(r.row,r.column)&&(i=c.fromPoints(o.start,o.start)),!1):n(o)?(i=c.fromPoints(o.start,o.end),!0):(i=c.fromPoints(o.start,o.start),!1))}return i},this.replace=function(e,t){return this.doc.replace(e,t)},this.moveText=function(e,t,n){var i=this.getTextRange(e),r=this.getFoldsInRange(e),s=c.fromPoints(t,t);if(!n){this.remove(e);var o=e.start.row-e.end.row;(u=o?-e.end.column:e.start.column-e.end.column)&&(s.start.row==e.end.row&&s.start.column>e.end.column&&(s.start.column+=u),s.end.row==e.end.row&&s.end.column>e.end.column&&(s.end.column+=u)),o&&s.start.row>=e.end.row&&(s.start.row+=o,s.end.row+=o)}if(s.end=this.insert(s.start,i),r.length){var a=e.start,l=s.start,u=(o=l.row-a.row,l.column-a.column);this.addFolds(r.map((function(e){return(e=e.clone()).start.row==a.row&&(e.start.column+=u),e.end.row==a.row&&(e.end.column+=u),e.start.row+=o,e.end.row+=o,e})))}return s},this.indentRows=function(e,t,n){n=n.replace(/\t/g,this.getTabString());for(var i=e;i<=t;i++)this.doc.insertInLine({row:i,column:0},n)},this.outdentRows=function(e){for(var t=e.collapseRows(),n=new c(0,0,0,0),i=this.getTabSize(),r=t.start.row;r<=t.end.row;++r){var s=this.getLine(r);n.start.row=r,n.end.row=r;for(var o=0;o<i&&" "==s.charAt(o);++o);o<i&&"\t"==s.charAt(o)?(n.start.column=o,n.end.column=o+1):(n.start.column=0,n.end.column=o),this.remove(n)}},this.$moveLines=function(e,t,n){if(e=this.getRowFoldStart(e),t=this.getRowFoldEnd(t),n<0){if((r=this.getRowFoldStart(e+n))<0)return 0;var i=r-e}else if(n>0){var r;if((r=this.getRowFoldEnd(t+n))>this.doc.getLength()-1)return 0;i=r-t}else{e=this.$clipRowToDocument(e);i=(t=this.$clipRowToDocument(t))-e+1}var s=new c(e,0,t,Number.MAX_VALUE),o=this.getFoldsInRange(s).map((function(e){return(e=e.clone()).start.row+=i,e.end.row+=i,e})),a=0==n?this.doc.getLines(e,t):this.doc.removeFullLines(e,t);return this.doc.insertFullLines(e+i,a),o.length&&this.addFolds(o),i},this.moveLinesUp=function(e,t){return this.$moveLines(e,t,-1)},this.moveLinesDown=function(e,t){return this.$moveLines(e,t,1)},this.duplicateLines=function(e,t){return this.$moveLines(e,t,0)},this.$clipRowToDocument=function(e){return Math.max(0,Math.min(e,this.doc.getLength()-1))},this.$clipColumnToRow=function(e,t){return t<0?0:Math.min(this.doc.getLine(e).length,t)},this.$clipPositionToDocument=function(e,t){if(t=Math.max(0,t),e<0)e=0,t=0;else{var n=this.doc.getLength();e>=n?(e=n-1,t=this.doc.getLine(n-1).length):t=Math.min(this.doc.getLine(e).length,t)}return{row:e,column:t}},this.$clipRangeToDocument=function(e){e.start.row<0?(e.start.row=0,e.start.column=0):e.start.column=this.$clipColumnToRow(e.start.row,e.start.column);var t=this.doc.getLength()-1;return e.end.row>t?(e.end.row=t,e.end.column=this.doc.getLine(t).length):e.end.column=this.$clipColumnToRow(e.end.row,e.end.column),e},this.$wrapLimit=80,this.$useWrapMode=!1,this.$wrapLimitRange={min:null,max:null},this.setUseWrapMode=function(e){if(e!=this.$useWrapMode){if(this.$useWrapMode=e,this.$modified=!0,this.$resetRowCache(0),e){var t=this.getLength();this.$wrapData=Array(t),this.$updateWrapData(0,t-1)}this._signal("changeWrapMode")}},this.getUseWrapMode=function(){return this.$useWrapMode},this.setWrapLimitRange=function(e,t){this.$wrapLimitRange.min===e&&this.$wrapLimitRange.max===t||(this.$wrapLimitRange={min:e,max:t},this.$modified=!0,this.$bidiHandler.markAsDirty(),this.$useWrapMode&&this._signal("changeWrapMode"))},this.adjustWrapLimit=function(e,t){var n=this.$wrapLimitRange;n.max<0&&(n={min:t,max:t});var i=this.$constrainWrapLimit(e,n.min,n.max);return i!=this.$wrapLimit&&i>1&&(this.$wrapLimit=i,this.$modified=!0,this.$useWrapMode&&(this.$updateWrapData(0,this.getLength()-1),this.$resetRowCache(0),this._signal("changeWrapLimit")),!0)},this.$constrainWrapLimit=function(e,t,n){return t&&(e=Math.max(t,e)),n&&(e=Math.min(n,e)),e},this.getWrapLimit=function(){return this.$wrapLimit},this.setWrapLimit=function(e){this.setWrapLimitRange(e,e)},this.getWrapLimitRange=function(){return{min:this.$wrapLimitRange.min,max:this.$wrapLimitRange.max}},this.$updateInternalDataOnChange=function(e){var t=this.$useWrapMode,n=e.action,i=e.start,r=e.end,s=i.row,o=r.row,a=o-s,l=null;if(this.$updating=!0,0!=a)if("remove"===n){this[t?"$wrapData":"$rowLengthCache"].splice(s,a);var u=this.$foldData;l=this.getFoldsInRange(e),this.removeFolds(l);var c=0;if(g=this.getFoldLine(r.row)){g.addRemoveChars(r.row,r.column,i.column-r.column),g.shiftRow(-a);var h=this.getFoldLine(s);h&&h!==g&&(h.merge(g),g=h),c=u.indexOf(g)+1}for(;c<u.length;c++){(g=u[c]).start.row>=r.row&&g.shiftRow(-a)}o=s}else{var d=Array(a);d.unshift(s,0);var f=t?this.$wrapData:this.$rowLengthCache;f.splice.apply(f,d);u=this.$foldData,c=0;if(g=this.getFoldLine(s)){var p=g.range.compareInside(i.row,i.column);0==p?(g=g.split(i.row,i.column))&&(g.shiftRow(a),g.addRemoveChars(o,0,r.column-i.column)):-1==p&&(g.addRemoveChars(s,0,r.column-i.column),g.shiftRow(a)),c=u.indexOf(g)+1}for(;c<u.length;c++){var g;(g=u[c]).start.row>=s&&g.shiftRow(a)}}else a=Math.abs(e.start.column-e.end.column),"remove"===n&&(l=this.getFoldsInRange(e),this.removeFolds(l),a=-a),(g=this.getFoldLine(s))&&g.addRemoveChars(s,i.column,a);return t&&this.$wrapData.length!=this.doc.getLength()&&console.error("doc.getLength() and $wrapData.length have to be the same!"),this.$updating=!1,t?this.$updateWrapData(s,o):this.$updateRowLengthCache(s,o),l},this.$updateRowLengthCache=function(e,t,n){this.$rowLengthCache[e]=null,this.$rowLengthCache[t]=null},this.$updateWrapData=function(e,i){var r,s,o=this.doc.getAllLines(),a=this.getTabSize(),l=this.$wrapData,u=this.$wrapLimit,c=e;for(i=Math.min(i,o.length-1);c<=i;)(s=this.getFoldLine(c,s))?(r=[],s.walk(function(e,i,s,a){var l;if(null!=e){(l=this.$getDisplayTokens(e,r.length))[0]=t;for(var u=1;u<l.length;u++)l[u]=n}else l=this.$getDisplayTokens(o[i].substring(a,s),r.length);r=r.concat(l)}.bind(this),s.end.row,o[s.end.row].length+1),l[s.start.row]=this.$computeWrapSplits(r,u,a),c=s.end.row+1):(r=this.$getDisplayTokens(o[c]),l[c]=this.$computeWrapSplits(r,u,a),c++)};var t=3,n=4;this.$computeWrapSplits=function(e,i,r){function s(){var t=0;if(0===f)return t;if(d)for(var n=0;n<e.length;n++){var i=e[n];if(10==i)t+=1;else{if(11!=i){if(12==i)continue;break}t+=r}}return h&&!1!==d&&(t+=r),Math.min(t,f)}function o(t){for(var n=t-u,i=u;i<t;i++){var r=e[i];12!==r&&2!==r||(n-=1)}a.length||(p=s(),a.indent=p),c+=n,a.push(c),u=t}if(0==e.length)return[];for(var a=[],l=e.length,u=0,c=0,h=this.$wrapAsCode,d=this.$indentedSoftWrap,f=i<=Math.max(2*r,8)||!1===d?0:Math.floor(i/2),p=0;l-u>i-p;){var g=u+i-p;if(e[g-1]>=10&&e[g]>=10)o(g);else if(e[g]!=t&&e[g]!=n){for(var m=Math.max(g-(i-(i>>2)),u-1);g>m&&e[g]<t;)g--;if(h){for(;g>m&&e[g]<t;)g--;for(;g>m&&9==e[g];)g--}else for(;g>m&&e[g]<10;)g--;g>m?o(++g):(2==e[g=u+i]&&g--,o(g-p))}else{for(;g!=u-1&&e[g]!=t;g--);if(g>u){o(g);continue}for(g=u+i;g<e.length&&e[g]==n;g++);if(g==e.length)break;o(g)}}return a},this.$getDisplayTokens=function(t,n){var i,r=[];n=n||0;for(var s=0;s<t.length;s++){var o=t.charCodeAt(s);if(9==o){i=this.getScreenTabSize(r.length+n),r.push(11);for(var a=1;a<i;a++)r.push(12)}else 32==o?r.push(10):o>39&&o<48||o>57&&o<64?r.push(9):o>=4352&&e(o)?r.push(1,2):r.push(1)}return r},this.$getStringScreenWidth=function(t,n,i){if(0==n)return[0,0];var r,s;for(null==n&&(n=1/0),i=i||0,s=0;s<t.length&&(9==(r=t.charCodeAt(s))?i+=this.getScreenTabSize(i):r>=4352&&e(r)?i+=2:i+=1,!(i>n));s++);return[i,s]},this.lineWidgets=null,this.getRowLength=function(e){if(this.lineWidgets)var t=this.lineWidgets[e]&&this.lineWidgets[e].rowCount||0;else t=0;return this.$useWrapMode&&this.$wrapData[e]?this.$wrapData[e].length+1+t:1+t},this.getRowLineCount=function(e){return this.$useWrapMode&&this.$wrapData[e]?this.$wrapData[e].length+1:1},this.getRowWrapIndent=function(e){if(this.$useWrapMode){var t=this.screenToDocumentPosition(e,Number.MAX_VALUE),n=this.$wrapData[t.row];return n.length&&n[0]<t.column?n.indent:0}return 0},this.getScreenLastRowColumn=function(e){var t=this.screenToDocumentPosition(e,Number.MAX_VALUE);return this.documentToScreenColumn(t.row,t.column)},this.getDocumentLastRowColumn=function(e,t){var n=this.documentToScreenRow(e,t);return this.getScreenLastRowColumn(n)},this.getDocumentLastRowColumnPosition=function(e,t){var n=this.documentToScreenRow(e,t);return this.screenToDocumentPosition(n,Number.MAX_VALUE/10)},this.getRowSplitData=function(e){return this.$useWrapMode?this.$wrapData[e]:void 0},this.getScreenTabSize=function(e){return this.$tabSize-e%this.$tabSize},this.screenToDocumentRow=function(e,t){return this.screenToDocumentPosition(e,t).row},this.screenToDocumentColumn=function(e,t){return this.screenToDocumentPosition(e,t).column},this.screenToDocumentPosition=function(e,t,n){if(e<0)return{row:0,column:0};var i,r,s=0,o=0,a=0,l=0,u=this.$screenRowCache,c=this.$getRowCacheIndex(u,e),h=u.length;if(h&&c>=0){a=u[c],s=this.$docRowCache[c];var d=e>u[h-1]}else d=!h;for(var f=this.getLength()-1,p=this.getNextFoldLine(s),g=p?p.start.row:1/0;a<=e&&!(a+(l=this.getRowLength(s))>e||s>=f);)a+=l,++s>g&&(s=p.end.row+1,g=(p=this.getNextFoldLine(s,p))?p.start.row:1/0),d&&(this.$docRowCache.push(s),this.$screenRowCache.push(a));if(p&&p.start.row<=s)i=this.getFoldDisplayLine(p),s=p.start.row;else{if(a+l<=e||s>f)return{row:f,column:this.getLine(f).length};i=this.getLine(s),p=null}var m=0,v=Math.floor(e-a);if(this.$useWrapMode){var y=this.$wrapData[s];y&&(r=y[v],v>0&&y.length&&(m=y.indent,o=y[v-1]||y[y.length-1],i=i.substring(o)))}return void 0!==n&&this.$bidiHandler.isBidiRow(a+v,s,v)&&(t=this.$bidiHandler.offsetToCol(n)),o+=this.$getStringScreenWidth(i,t-m)[1],this.$useWrapMode&&o>=r&&(o=r-1),p?p.idxToPosition(o):{row:s,column:o}},this.documentToScreenPosition=function(e,t){if(void 0===t)var n=this.$clipPositionToDocument(e.row,e.column);else n=this.$clipPositionToDocument(e,t);e=n.row,t=n.column;var i,r=0,s=null;(i=this.getFoldAt(e,t,1))&&(e=i.start.row,t=i.start.column);var o,a=0,l=this.$docRowCache,u=this.$getRowCacheIndex(l,e),c=l.length;if(c&&u>=0){a=l[u],r=this.$screenRowCache[u];var h=e>l[c-1]}else h=!c;for(var d=this.getNextFoldLine(a),f=d?d.start.row:1/0;a<e;){if(a>=f){if((o=d.end.row+1)>e)break;f=(d=this.getNextFoldLine(o,d))?d.start.row:1/0}else o=a+1;r+=this.getRowLength(a),a=o,h&&(this.$docRowCache.push(a),this.$screenRowCache.push(r))}var p="";d&&a>=f?(p=this.getFoldDisplayLine(d,e,t),s=d.start.row):(p=this.getLine(e).substring(0,t),s=e);var g=0;if(this.$useWrapMode){var m=this.$wrapData[s];if(m){for(var v=0;p.length>=m[v];)r++,v++;p=p.substring(m[v-1]||0,p.length),g=v>0?m.indent:0}}return{row:r,column:g+this.$getStringScreenWidth(p)[0]}},this.documentToScreenColumn=function(e,t){return this.documentToScreenPosition(e,t).column},this.documentToScreenRow=function(e,t){return this.documentToScreenPosition(e,t).row},this.getScreenLength=function(){var e=0,t=null;if(this.$useWrapMode)for(var n=this.$wrapData.length,i=0,r=(a=0,(t=this.$foldData[a++])?t.start.row:1/0);i<n;){var s=this.$wrapData[i];e+=s?s.length+1:1,++i>r&&(i=t.end.row+1,r=(t=this.$foldData[a++])?t.start.row:1/0)}else{e=this.getLength();for(var o=this.$foldData,a=0;a<o.length;a++)e-=(t=o[a]).end.row-t.start.row}return this.lineWidgets&&(e+=this.$getWidgetScreenLength()),e},this.$setFontMetrics=function(e){this.$enableVarChar&&(this.$getStringScreenWidth=function(t,n,i){if(0===n)return[0,0];var r,s;for(n||(n=1/0),i=i||0,s=0;s<t.length&&!((i+="\t"===(r=t.charAt(s))?this.getScreenTabSize(i):e.getCharacterWidth(r))>n);s++);return[i,s]})},this.destroy=function(){this.bgTokenizer&&(this.bgTokenizer.setDocument(null),this.bgTokenizer=null),this.$stopWorker()},this.isFullWidth=e}.call(p.prototype),e("./edit_session/folding").Folding.call(p.prototype),e("./edit_session/bracket_match").BracketMatch.call(p.prototype),o.defineOptions(p.prototype,"session",{wrap:{set:function(e){if(e&&"off"!=e?"free"==e?e=!0:"printMargin"==e?e=-1:"string"==typeof e&&(e=parseInt(e,10)||!1):e=!1,this.$wrap!=e)if(this.$wrap=e,e){var t="number"==typeof e?e:null;this.setWrapLimitRange(t,t),this.setUseWrapMode(!0)}else this.setUseWrapMode(!1)},get:function(){return this.getUseWrapMode()?-1==this.$wrap?"printMargin":this.getWrapLimitRange().min?this.$wrap:"free":"off"},handlesSet:!0},wrapMethod:{set:function(e){(e="auto"==e?"text"!=this.$mode.type:"text"!=e)!=this.$wrapAsCode&&(this.$wrapAsCode=e,this.$useWrapMode&&(this.$useWrapMode=!1,this.setUseWrapMode(!0)))},initialValue:"auto"},indentedSoftWrap:{set:function(){this.$useWrapMode&&(this.$useWrapMode=!1,this.setUseWrapMode(!0))},initialValue:!0},firstLineNumber:{set:function(){this._signal("changeBreakpoint")},initialValue:1},useWorker:{set:function(e){this.$useWorker=e,this.$stopWorker(),e&&this.$startWorker()},initialValue:!0},useSoftTabs:{initialValue:!0},tabSize:{set:function(e){isNaN(e)||this.$tabSize===e||(this.$modified=!0,this.$rowLengthCache=[],this.$tabSize=e,this._signal("changeTabSize"))},initialValue:4,handlesSet:!0},navigateWithinSoftTabs:{initialValue:!1},foldStyle:{set:function(e){this.setFoldStyle(e)},handlesSet:!0},overwrite:{set:function(e){this._signal("changeOverwrite")},initialValue:!1},newLineMode:{set:function(e){this.doc.setNewLineMode(e)},get:function(){return this.doc.getNewLineMode()},handlesSet:!0},mode:{set:function(e){this.setMode(e)},get:function(){return this.$modeId},handlesSet:!0}}),t.EditSession=p})),ace.define("ace/search",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/range"],(function(e,t,n){"use strict";var i=e("./lib/lang"),r=e("./lib/oop"),s=e("./range").Range,o=function(){this.$options={}};(function(){this.set=function(e){return r.mixin(this.$options,e),this},this.getOptions=function(){return i.copyObject(this.$options)},this.setOptions=function(e){this.$options=e},this.find=function(e){var t=this.$options,n=this.$matchIterator(e,t);if(!n)return!1;var i=null;return n.forEach((function(e,n,r,o){return i=new s(e,n,r,o),!(n==o&&t.start&&t.start.start&&0!=t.skipCurrent&&i.isEqual(t.start))||(i=null,!1)})),i},this.findAll=function(e){var t=this.$options;if(!t.needle)return[];this.$assembleRegExp(t);var n=t.range,r=n?e.getLines(n.start.row,n.end.row):e.doc.getAllLines(),o=[],a=t.re;if(t.$isMultiLine){var l,u=a.length,c=r.length-u;e:for(var h=a.offset||0;h<=c;h++){for(var d=0;d<u;d++)if(-1==r[h+d].search(a[d]))continue e;var f=r[h],p=r[h+u-1],g=f.length-f.match(a[0])[0].length,m=p.match(a[u-1])[0].length;l&&l.end.row===h&&l.end.column>g||(o.push(l=new s(h,g,h+u-1,m)),u>2&&(h=h+u-2))}}else for(var v=0;v<r.length;v++){var y=i.getMatchOffsets(r[v],a);for(d=0;d<y.length;d++){var $=y[d];o.push(new s(v,$.offset,v,$.offset+$.length))}}if(n){var w=n.start.column,b=n.start.column;for(v=0,d=o.length-1;v<d&&o[v].start.column<w&&o[v].start.row==n.start.row;)v++;for(;v<d&&o[d].end.column>b&&o[d].end.row==n.end.row;)d--;for(o=o.slice(v,d+1),v=0,d=o.length;v<d;v++)o[v].start.row+=n.start.row,o[v].end.row+=n.start.row}return o},this.replace=function(e,t){var n=this.$options,i=this.$assembleRegExp(n);if(n.$isMultiLine)return t;if(i){var r=i.exec(e);if(!r||r[0].length!=e.length)return null;if(t=e.replace(i,t),n.preserveCase){t=t.split("");for(var s=Math.min(e.length,e.length);s--;){var o=e[s];o&&o.toLowerCase()!=o?t[s]=t[s].toUpperCase():t[s]=t[s].toLowerCase()}t=t.join("")}return t}},this.$assembleRegExp=function(e,t){if(e.needle instanceof RegExp)return e.re=e.needle;var n=e.needle;if(!e.needle)return e.re=!1;e.regExp||(n=i.escapeRegExp(n)),e.wholeWord&&(n=function(e,t){function n(e){return/\w/.test(e)||t.regExp?"\\b":""}return n(e[0])+e+n(e[e.length-1])}(n,e));var r=e.caseSensitive?"gm":"gmi";if(e.$isMultiLine=!t&&/[\n\r]/.test(n),e.$isMultiLine)return e.re=this.$assembleMultilineRegExp(n,r);try{var s=new RegExp(n,r)}catch(e){s=!1}return e.re=s},this.$assembleMultilineRegExp=function(e,t){for(var n=e.replace(/\r\n|\r|\n/g,"$\n^").split("\n"),i=[],r=0;r<n.length;r++)try{i.push(new RegExp(n[r],t))}catch(e){return!1}return i},this.$matchIterator=function(e,t){var n=this.$assembleRegExp(t);if(!n)return!1;var i=1==t.backwards,r=0!=t.skipCurrent,s=t.range,o=t.start;o||(o=s?s[i?"end":"start"]:e.selection.getRange()),o.start&&(o=o[r!=i?"end":"start"]);var a=s?s.start.row:0,l=s?s.end.row:e.getLength()-1;if(i)var u=function(e){var n=o.row;if(!h(n,o.column,e)){for(n--;n>=a;n--)if(h(n,Number.MAX_VALUE,e))return;if(0!=t.wrap)for(n=l,a=o.row;n>=a;n--)if(h(n,Number.MAX_VALUE,e))return}};else u=function(e){var n=o.row;if(!h(n,o.column,e)){for(n+=1;n<=l;n++)if(h(n,0,e))return;if(0!=t.wrap)for(n=a,l=o.row;n<=l;n++)if(h(n,0,e))return}};if(t.$isMultiLine)var c=n.length,h=function(t,r,s){var o=i?t-c+1:t;if(!(o<0)){var a=e.getLine(o),l=a.search(n[0]);if(!(!i&&l<r||-1===l)){for(var u=1;u<c;u++)if(-1==(a=e.getLine(o+u)).search(n[u]))return;var h=a.match(n[c-1])[0].length;if(!(i&&h>r))return!!s(o,l,o+c-1,h)||void 0}}};else if(i)h=function(t,i,r){var s,o=e.getLine(t),a=[],l=0;for(n.lastIndex=0;s=n.exec(o);){var u=s[0].length;if(l=s.index,!u){if(l>=o.length)break;n.lastIndex=l+=1}if(s.index+u>i)break;a.push(s.index,u)}for(var c=a.length-1;c>=0;c-=2){var h=a[c-1];if(r(t,h,t,h+(u=a[c])))return!0}};else h=function(t,i,r){var s,o,a=e.getLine(t);for(n.lastIndex=i;o=n.exec(a);){var l=o[0].length;if(r(t,s=o.index,t,s+l))return!0;if(!l&&(n.lastIndex=s+=1,s>=a.length))return!1}};return{forEach:u}}}).call(o.prototype),t.Search=o})),ace.define("ace/keyboard/hash_handler",["require","exports","module","ace/lib/keys","ace/lib/useragent"],(function(e,t,n){"use strict";function i(e,t){this.platform=t||(o.isMac?"mac":"win"),this.commands={},this.commandKeyBinding={},this.addCommands(e),this.$singleCommand=!0}function r(e,t){i.call(this,e,t),this.$singleCommand=!1}var s=e("../lib/keys"),o=e("../lib/useragent"),a=s.KEY_MODS;r.prototype=i.prototype,function(){function e(e){return"object"==typeof e&&e.bindKey&&e.bindKey.position||(e.isDefault?-100:0)}this.addCommand=function(e){this.commands[e.name]&&this.removeCommand(e),this.commands[e.name]=e,e.bindKey&&this._buildKeyHash(e)},this.removeCommand=function(e,t){var n=e&&("string"==typeof e?e:e.name);e=this.commands[n],t||delete this.commands[n];var i=this.commandKeyBinding;for(var r in i){var s=i[r];if(s==e)delete i[r];else if(Array.isArray(s)){var o=s.indexOf(e);-1!=o&&(s.splice(o,1),1==s.length&&(i[r]=s[0]))}}},this.bindKey=function(e,t,n){if("object"==typeof e&&e&&(null==n&&(n=e.position),e=e[this.platform]),e)return"function"==typeof t?this.addCommand({exec:t,bindKey:e,name:t.name||e}):void e.split("|").forEach((function(e){var i="";if(-1!=e.indexOf(" ")){var r=e.split(/\s+/);e=r.pop(),r.forEach((function(e){var t=this.parseKeys(e),n=a[t.hashId]+t.key;i+=(i?" ":"")+n,this._addCommandToBinding(i,"chainKeys")}),this),i+=" "}var s=this.parseKeys(e),o=a[s.hashId]+s.key;this._addCommandToBinding(i+o,t,n)}),this)},this._addCommandToBinding=function(t,n,i){var r,s=this.commandKeyBinding;if(n)if(!s[t]||this.$singleCommand)s[t]=n;else{Array.isArray(s[t])?-1!=(r=s[t].indexOf(n))&&s[t].splice(r,1):s[t]=[s[t]],"number"!=typeof i&&(i=e(n));var o=s[t];for(r=0;r<o.length;r++){if(e(o[r])>i)break}o.splice(r,0,n)}else delete s[t]},this.addCommands=function(e){e&&Object.keys(e).forEach((function(t){var n=e[t];if(n){if("string"==typeof n)return this.bindKey(n,t);"function"==typeof n&&(n={exec:n}),"object"==typeof n&&(n.name||(n.name=t),this.addCommand(n))}}),this)},this.removeCommands=function(e){Object.keys(e).forEach((function(t){this.removeCommand(e[t])}),this)},this.bindKeys=function(e){Object.keys(e).forEach((function(t){this.bindKey(t,e[t])}),this)},this._buildKeyHash=function(e){this.bindKey(e.bindKey,e)},this.parseKeys=function(e){var t=e.toLowerCase().split(/[\-\+]([\-\+])?/).filter((function(e){return e})),n=t.pop(),i=s[n];if(s.FUNCTION_KEYS[i])n=s.FUNCTION_KEYS[i].toLowerCase();else{if(!t.length)return{key:n,hashId:-1};if(1==t.length&&"shift"==t[0])return{key:n.toUpperCase(),hashId:-1}}for(var r=0,o=t.length;o--;){var a=s.KEY_MODS[t[o]];if(null==a)return"undefined"!=typeof console&&console.error("invalid modifier "+t[o]+" in "+e),!1;r|=a}return{key:n,hashId:r}},this.findKeyCommand=function(e,t){var n=a[e]+t;return this.commandKeyBinding[n]},this.handleKeyboard=function(e,t,n,i){if(!(i<0)){var r=a[t]+n,s=this.commandKeyBinding[r];return e.$keyChain&&(e.$keyChain+=" "+r,s=this.commandKeyBinding[e.$keyChain]||s),!s||"chainKeys"!=s&&"chainKeys"!=s[s.length-1]?(e.$keyChain&&(t&&4!=t||1!=n.length?(-1==t||i>0)&&(e.$keyChain=""):e.$keyChain=e.$keyChain.slice(0,-r.length-1)),{command:s}):(e.$keyChain=e.$keyChain||r,{command:"null"})}},this.getStatusText=function(e,t){return t.$keyChain||""}}.call(i.prototype),t.HashHandler=i,t.MultiHashHandler=r})),ace.define("ace/commands/command_manager",["require","exports","module","ace/lib/oop","ace/keyboard/hash_handler","ace/lib/event_emitter"],(function(e,t,n){"use strict";var i=e("../lib/oop"),r=e("../keyboard/hash_handler").MultiHashHandler,s=e("../lib/event_emitter").EventEmitter,o=function(e,t){r.call(this,t,e),this.byName=this.commands,this.setDefaultHandler("exec",(function(e){return e.command.exec(e.editor,e.args||{})}))};i.inherits(o,r),function(){i.implement(this,s),this.exec=function(e,t,n){if(Array.isArray(e)){for(var i=e.length;i--;)if(this.exec(e[i],t,n))return!0;return!1}if("string"==typeof e&&(e=this.commands[e]),!e)return!1;if(t&&t.$readOnly&&!e.readOnly)return!1;if(0!=this.$checkCommandState&&e.isAvailable&&!e.isAvailable(t))return!1;var r={editor:t,command:e,args:n};return r.returnValue=this._emit("exec",r),this._signal("afterExec",r),!1!==r.returnValue},this.toggleRecording=function(e){if(!this.$inReplay)return e&&e._emit("changeStatus"),this.recording?(this.macro.pop(),this.removeEventListener("exec",this.$addCommandToMacro),this.macro.length||(this.macro=this.oldMacro),this.recording=!1):(this.$addCommandToMacro||(this.$addCommandToMacro=function(e){this.macro.push([e.command,e.args])}.bind(this)),this.oldMacro=this.macro,this.macro=[],this.on("exec",this.$addCommandToMacro),this.recording=!0)},this.replay=function(e){if(!this.$inReplay&&this.macro){if(this.recording)return this.toggleRecording(e);try{this.$inReplay=!0,this.macro.forEach((function(t){"string"==typeof t?this.exec(t,e):this.exec(t[0],e,t[1])}),this)}finally{this.$inReplay=!1}}},this.trimMacro=function(e){return e.map((function(e){return"string"!=typeof e[0]&&(e[0]=e[0].name),e[1]||(e=e[0]),e}))}}.call(o.prototype),t.CommandManager=o})),ace.define("ace/commands/default_commands",["require","exports","module","ace/lib/lang","ace/config","ace/range"],(function(e,t,n){"use strict";function i(e,t){return{win:e,mac:t}}var r=e("../lib/lang"),s=e("../config"),o=e("../range").Range;t.commands=[{name:"showSettingsMenu",bindKey:i("Ctrl-,","Command-,"),exec:function(e){s.loadModule("ace/ext/settings_menu",(function(t){t.init(e),e.showSettingsMenu()}))},readOnly:!0},{name:"goToNextError",bindKey:i("Alt-E","F4"),exec:function(e){s.loadModule("./ext/error_marker",(function(t){t.showErrorMarker(e,1)}))},scrollIntoView:"animate",readOnly:!0},{name:"goToPreviousError",bindKey:i("Alt-Shift-E","Shift-F4"),exec:function(e){s.loadModule("./ext/error_marker",(function(t){t.showErrorMarker(e,-1)}))},scrollIntoView:"animate",readOnly:!0},{name:"selectall",bindKey:i("Ctrl-A","Command-A"),exec:function(e){e.selectAll()},readOnly:!0},{name:"centerselection",bindKey:i(null,"Ctrl-L"),exec:function(e){e.centerSelection()},readOnly:!0},{name:"gotoline",bindKey:i("Ctrl-L","Command-L"),exec:function(e,t){"number"!=typeof t&&(t=parseInt(prompt("Enter line number:"),10)),isNaN(t)||e.gotoLine(t)},readOnly:!0},{name:"fold",bindKey:i("Alt-L|Ctrl-F1","Command-Alt-L|Command-F1"),exec:function(e){e.session.toggleFold(!1)},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"unfold",bindKey:i("Alt-Shift-L|Ctrl-Shift-F1","Command-Alt-Shift-L|Command-Shift-F1"),exec:function(e){e.session.toggleFold(!0)},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"toggleFoldWidget",bindKey:i("F2","F2"),exec:function(e){e.session.toggleFoldWidget()},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"toggleParentFoldWidget",bindKey:i("Alt-F2","Alt-F2"),exec:function(e){e.session.toggleFoldWidget(!0)},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"foldall",bindKey:i(null,"Ctrl-Command-Option-0"),exec:function(e){e.session.foldAll()},scrollIntoView:"center",readOnly:!0},{name:"foldOther",bindKey:i("Alt-0","Command-Option-0"),exec:function(e){e.session.foldAll(),e.session.unfold(e.selection.getAllRanges())},scrollIntoView:"center",readOnly:!0},{name:"unfoldall",bindKey:i("Alt-Shift-0","Command-Option-Shift-0"),exec:function(e){e.session.unfold()},scrollIntoView:"center",readOnly:!0},{name:"findnext",bindKey:i("Ctrl-K","Command-G"),exec:function(e){e.findNext()},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"findprevious",bindKey:i("Ctrl-Shift-K","Command-Shift-G"),exec:function(e){e.findPrevious()},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"selectOrFindNext",bindKey:i("Alt-K","Ctrl-G"),exec:function(e){e.selection.isEmpty()?e.selection.selectWord():e.findNext()},readOnly:!0},{name:"selectOrFindPrevious",bindKey:i("Alt-Shift-K","Ctrl-Shift-G"),exec:function(e){e.selection.isEmpty()?e.selection.selectWord():e.findPrevious()},readOnly:!0},{name:"find",bindKey:i("Ctrl-F","Command-F"),exec:function(e){s.loadModule("ace/ext/searchbox",(function(t){t.Search(e)}))},readOnly:!0},{name:"overwrite",bindKey:"Insert",exec:function(e){e.toggleOverwrite()},readOnly:!0},{name:"selecttostart",bindKey:i("Ctrl-Shift-Home","Command-Shift-Home|Command-Shift-Up"),exec:function(e){e.getSelection().selectFileStart()},multiSelectAction:"forEach",readOnly:!0,scrollIntoView:"animate",aceCommandGroup:"fileJump"},{name:"gotostart",bindKey:i("Ctrl-Home","Command-Home|Command-Up"),exec:function(e){e.navigateFileStart()},multiSelectAction:"forEach",readOnly:!0,scrollIntoView:"animate",aceCommandGroup:"fileJump"},{name:"selectup",bindKey:i("Shift-Up","Shift-Up|Ctrl-Shift-P"),exec:function(e){e.getSelection().selectUp()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"golineup",bindKey:i("Up","Up|Ctrl-P"),exec:function(e,t){e.navigateUp(t.times)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selecttoend",bindKey:i("Ctrl-Shift-End","Command-Shift-End|Command-Shift-Down"),exec:function(e){e.getSelection().selectFileEnd()},multiSelectAction:"forEach",readOnly:!0,scrollIntoView:"animate",aceCommandGroup:"fileJump"},{name:"gotoend",bindKey:i("Ctrl-End","Command-End|Command-Down"),exec:function(e){e.navigateFileEnd()},multiSelectAction:"forEach",readOnly:!0,scrollIntoView:"animate",aceCommandGroup:"fileJump"},{name:"selectdown",bindKey:i("Shift-Down","Shift-Down|Ctrl-Shift-N"),exec:function(e){e.getSelection().selectDown()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"golinedown",bindKey:i("Down","Down|Ctrl-N"),exec:function(e,t){e.navigateDown(t.times)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectwordleft",bindKey:i("Ctrl-Shift-Left","Option-Shift-Left"),exec:function(e){e.getSelection().selectWordLeft()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotowordleft",bindKey:i("Ctrl-Left","Option-Left"),exec:function(e){e.navigateWordLeft()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selecttolinestart",bindKey:i("Alt-Shift-Left","Command-Shift-Left|Ctrl-Shift-A"),exec:function(e){e.getSelection().selectLineStart()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotolinestart",bindKey:i("Alt-Left|Home","Command-Left|Home|Ctrl-A"),exec:function(e){e.navigateLineStart()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectleft",bindKey:i("Shift-Left","Shift-Left|Ctrl-Shift-B"),exec:function(e){e.getSelection().selectLeft()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotoleft",bindKey:i("Left","Left|Ctrl-B"),exec:function(e,t){e.navigateLeft(t.times)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectwordright",bindKey:i("Ctrl-Shift-Right","Option-Shift-Right"),exec:function(e){e.getSelection().selectWordRight()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotowordright",bindKey:i("Ctrl-Right","Option-Right"),exec:function(e){e.navigateWordRight()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selecttolineend",bindKey:i("Alt-Shift-Right","Command-Shift-Right|Shift-End|Ctrl-Shift-E"),exec:function(e){e.getSelection().selectLineEnd()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotolineend",bindKey:i("Alt-Right|End","Command-Right|End|Ctrl-E"),exec:function(e){e.navigateLineEnd()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectright",bindKey:i("Shift-Right","Shift-Right"),exec:function(e){e.getSelection().selectRight()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotoright",bindKey:i("Right","Right|Ctrl-F"),exec:function(e,t){e.navigateRight(t.times)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectpagedown",bindKey:"Shift-PageDown",exec:function(e){e.selectPageDown()},readOnly:!0},{name:"pagedown",bindKey:i(null,"Option-PageDown"),exec:function(e){e.scrollPageDown()},readOnly:!0},{name:"gotopagedown",bindKey:i("PageDown","PageDown|Ctrl-V"),exec:function(e){e.gotoPageDown()},readOnly:!0},{name:"selectpageup",bindKey:"Shift-PageUp",exec:function(e){e.selectPageUp()},readOnly:!0},{name:"pageup",bindKey:i(null,"Option-PageUp"),exec:function(e){e.scrollPageUp()},readOnly:!0},{name:"gotopageup",bindKey:"PageUp",exec:function(e){e.gotoPageUp()},readOnly:!0},{name:"scrollup",bindKey:i("Ctrl-Up",null),exec:function(e){e.renderer.scrollBy(0,-2*e.renderer.layerConfig.lineHeight)},readOnly:!0},{name:"scrolldown",bindKey:i("Ctrl-Down",null),exec:function(e){e.renderer.scrollBy(0,2*e.renderer.layerConfig.lineHeight)},readOnly:!0},{name:"selectlinestart",bindKey:"Shift-Home",exec:function(e){e.getSelection().selectLineStart()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectlineend",bindKey:"Shift-End",exec:function(e){e.getSelection().selectLineEnd()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"togglerecording",bindKey:i("Ctrl-Alt-E","Command-Option-E"),exec:function(e){e.commands.toggleRecording(e)},readOnly:!0},{name:"replaymacro",bindKey:i("Ctrl-Shift-E","Command-Shift-E"),exec:function(e){e.commands.replay(e)},readOnly:!0},{name:"jumptomatching",bindKey:i("Ctrl-P","Ctrl-P"),exec:function(e){e.jumpToMatching()},multiSelectAction:"forEach",scrollIntoView:"animate",readOnly:!0},{name:"selecttomatching",bindKey:i("Ctrl-Shift-P","Ctrl-Shift-P"),exec:function(e){e.jumpToMatching(!0)},multiSelectAction:"forEach",scrollIntoView:"animate",readOnly:!0},{name:"expandToMatching",bindKey:i("Ctrl-Shift-M","Ctrl-Shift-M"),exec:function(e){e.jumpToMatching(!0,!0)},multiSelectAction:"forEach",scrollIntoView:"animate",readOnly:!0},{name:"passKeysToBrowser",bindKey:i(null,null),exec:function(){},passEvent:!0,readOnly:!0},{name:"copy",exec:function(e){},readOnly:!0},{name:"cut",exec:function(e){var t=e.$copyWithEmptySelection&&e.selection.isEmpty()?e.selection.getLineRange():e.selection.getRange();e._emit("cut",t),t.isEmpty()||e.session.remove(t),e.clearSelection()},scrollIntoView:"cursor",multiSelectAction:"forEach"},{name:"paste",exec:function(e,t){e.$handlePaste(t)},scrollIntoView:"cursor"},{name:"removeline",bindKey:i("Ctrl-D","Command-D"),exec:function(e){e.removeLines()},scrollIntoView:"cursor",multiSelectAction:"forEachLine"},{name:"duplicateSelection",bindKey:i("Ctrl-Shift-D","Command-Shift-D"),exec:function(e){e.duplicateSelection()},scrollIntoView:"cursor",multiSelectAction:"forEach"},{name:"sortlines",bindKey:i("Ctrl-Alt-S","Command-Alt-S"),exec:function(e){e.sortLines()},scrollIntoView:"selection",multiSelectAction:"forEachLine"},{name:"togglecomment",bindKey:i("Ctrl-/","Command-/"),exec:function(e){e.toggleCommentLines()},multiSelectAction:"forEachLine",scrollIntoView:"selectionPart"},{name:"toggleBlockComment",bindKey:i("Ctrl-Shift-/","Command-Shift-/"),exec:function(e){e.toggleBlockComment()},multiSelectAction:"forEach",scrollIntoView:"selectionPart"},{name:"modifyNumberUp",bindKey:i("Ctrl-Shift-Up","Alt-Shift-Up"),exec:function(e){e.modifyNumber(1)},scrollIntoView:"cursor",multiSelectAction:"forEach"},{name:"modifyNumberDown",bindKey:i("Ctrl-Shift-Down","Alt-Shift-Down"),exec:function(e){e.modifyNumber(-1)},scrollIntoView:"cursor",multiSelectAction:"forEach"},{name:"replace",bindKey:i("Ctrl-H","Command-Option-F"),exec:function(e){s.loadModule("ace/ext/searchbox",(function(t){t.Search(e,!0)}))}},{name:"undo",bindKey:i("Ctrl-Z","Command-Z"),exec:function(e){e.undo()}},{name:"redo",bindKey:i("Ctrl-Shift-Z|Ctrl-Y","Command-Shift-Z|Command-Y"),exec:function(e){e.redo()}},{name:"copylinesup",bindKey:i("Alt-Shift-Up","Command-Option-Up"),exec:function(e){e.copyLinesUp()},scrollIntoView:"cursor"},{name:"movelinesup",bindKey:i("Alt-Up","Option-Up"),exec:function(e){e.moveLinesUp()},scrollIntoView:"cursor"},{name:"copylinesdown",bindKey:i("Alt-Shift-Down","Command-Option-Down"),exec:function(e){e.copyLinesDown()},scrollIntoView:"cursor"},{name:"movelinesdown",bindKey:i("Alt-Down","Option-Down"),exec:function(e){e.moveLinesDown()},scrollIntoView:"cursor"},{name:"del",bindKey:i("Delete","Delete|Ctrl-D|Shift-Delete"),exec:function(e){e.remove("right")},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"backspace",bindKey:i("Shift-Backspace|Backspace","Ctrl-Backspace|Shift-Backspace|Backspace|Ctrl-H"),exec:function(e){e.remove("left")},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"cut_or_delete",bindKey:i("Shift-Delete",null),exec:function(e){if(!e.selection.isEmpty())return!1;e.remove("left")},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removetolinestart",bindKey:i("Alt-Backspace","Command-Backspace"),exec:function(e){e.removeToLineStart()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removetolineend",bindKey:i("Alt-Delete","Ctrl-K|Command-Delete"),exec:function(e){e.removeToLineEnd()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removetolinestarthard",bindKey:i("Ctrl-Shift-Backspace",null),exec:function(e){var t=e.selection.getRange();t.start.column=0,e.session.remove(t)},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removetolineendhard",bindKey:i("Ctrl-Shift-Delete",null),exec:function(e){var t=e.selection.getRange();t.end.column=Number.MAX_VALUE,e.session.remove(t)},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removewordleft",bindKey:i("Ctrl-Backspace","Alt-Backspace|Ctrl-Alt-Backspace"),exec:function(e){e.removeWordLeft()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removewordright",bindKey:i("Ctrl-Delete","Alt-Delete"),exec:function(e){e.removeWordRight()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"outdent",bindKey:i("Shift-Tab","Shift-Tab"),exec:function(e){e.blockOutdent()},multiSelectAction:"forEach",scrollIntoView:"selectionPart"},{name:"indent",bindKey:i("Tab","Tab"),exec:function(e){e.indent()},multiSelectAction:"forEach",scrollIntoView:"selectionPart"},{name:"blockoutdent",bindKey:i("Ctrl-[","Ctrl-["),exec:function(e){e.blockOutdent()},multiSelectAction:"forEachLine",scrollIntoView:"selectionPart"},{name:"blockindent",bindKey:i("Ctrl-]","Ctrl-]"),exec:function(e){e.blockIndent()},multiSelectAction:"forEachLine",scrollIntoView:"selectionPart"},{name:"insertstring",exec:function(e,t){e.insert(t)},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"inserttext",exec:function(e,t){e.insert(r.stringRepeat(t.text||"",t.times||1))},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"splitline",bindKey:i(null,"Ctrl-O"),exec:function(e){e.splitLine()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"transposeletters",bindKey:i("Alt-Shift-X","Ctrl-T"),exec:function(e){e.transposeLetters()},multiSelectAction:function(e){e.transposeSelections(1)},scrollIntoView:"cursor"},{name:"touppercase",bindKey:i("Ctrl-U","Ctrl-U"),exec:function(e){e.toUpperCase()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"tolowercase",bindKey:i("Ctrl-Shift-U","Ctrl-Shift-U"),exec:function(e){e.toLowerCase()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"expandtoline",bindKey:i("Ctrl-Shift-L","Command-Shift-L"),exec:function(e){var t=e.selection.getRange();t.start.column=t.end.column=0,t.end.row++,e.selection.setRange(t,!1)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"joinlines",bindKey:i(null,null),exec:function(e){for(var t=e.selection.isBackwards(),n=t?e.selection.getSelectionLead():e.selection.getSelectionAnchor(),i=t?e.selection.getSelectionAnchor():e.selection.getSelectionLead(),s=e.session.doc.getLine(n.row).length,a=e.session.doc.getTextRange(e.selection.getRange()).replace(/\n\s*/," ").length,l=e.session.doc.getLine(n.row),u=n.row+1;u<=i.row+1;u++){var c=r.stringTrimLeft(r.stringTrimRight(e.session.doc.getLine(u)));0!==c.length&&(c=" "+c),l+=c}i.row+1<e.session.doc.getLength()-1&&(l+=e.session.doc.getNewLineCharacter()),e.clearSelection(),e.session.doc.replace(new o(n.row,0,i.row+2,0),l),a>0?(e.selection.moveCursorTo(n.row,n.column),e.selection.selectTo(n.row,n.column+a)):(s=e.session.doc.getLine(n.row).length>s?s+1:s,e.selection.moveCursorTo(n.row,s))},multiSelectAction:"forEach",readOnly:!0},{name:"invertSelection",bindKey:i(null,null),exec:function(e){var t=e.session.doc.getLength()-1,n=e.session.doc.getLine(t).length,i=e.selection.rangeList.ranges,r=[];i.length<1&&(i=[e.selection.getRange()]);for(var s=0;s<i.length;s++)s==i.length-1&&(i[s].end.row!==t||i[s].end.column!==n)&&r.push(new o(i[s].end.row,i[s].end.column,t,n)),0===s?(0!==i[s].start.row||0!==i[s].start.column)&&r.push(new o(0,0,i[s].start.row,i[s].start.column)):r.push(new o(i[s-1].end.row,i[s-1].end.column,i[s].start.row,i[s].start.column));e.exitMultiSelectMode(),e.clearSelection();for(s=0;s<r.length;s++)e.selection.addRange(r[s],!1)},readOnly:!0,scrollIntoView:"none"}]})),ace.define("ace/clipboard",["require","exports","module"],(function(e,t,n){"use strict";n.exports={lineMode:!1}})),ace.define("ace/editor",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/oop","ace/lib/dom","ace/lib/lang","ace/lib/useragent","ace/keyboard/textinput","ace/mouse/mouse_handler","ace/mouse/fold_handler","ace/keyboard/keybinding","ace/edit_session","ace/search","ace/range","ace/lib/event_emitter","ace/commands/command_manager","ace/commands/default_commands","ace/config","ace/token_iterator","ace/clipboard"],(function(e,t,n){"use strict";e("./lib/fixoldbrowsers");var i=e("./lib/oop"),r=e("./lib/dom"),s=e("./lib/lang"),o=e("./lib/useragent"),a=e("./keyboard/textinput").TextInput,l=e("./mouse/mouse_handler").MouseHandler,u=e("./mouse/fold_handler").FoldHandler,c=e("./keyboard/keybinding").KeyBinding,h=e("./edit_session").EditSession,d=e("./search").Search,f=e("./range").Range,p=e("./lib/event_emitter").EventEmitter,g=e("./commands/command_manager").CommandManager,m=e("./commands/default_commands").commands,v=e("./config"),y=e("./token_iterator").TokenIterator,$=e("./clipboard"),w=function(e,t,n){var i=e.getContainerElement();this.container=i,this.renderer=e,this.id="editor"+ ++w.$uid,this.commands=new g(o.isMac?"mac":"win",m),"object"==typeof document&&(this.textInput=new a(e.getTextAreaContainer(),this),this.renderer.textarea=this.textInput.getElement(),this.$mouseHandler=new l(this),new u(this)),this.keyBinding=new c(this),this.$search=(new d).set({wrap:!0}),this.$historyTracker=this.$historyTracker.bind(this),this.commands.on("exec",this.$historyTracker),this.$initOperationListeners(),this._$emitInputEvent=s.delayedCall(function(){this._signal("input",{}),this.session&&this.session.bgTokenizer&&this.session.bgTokenizer.scheduleStart()}.bind(this)),this.on("change",(function(e,t){t._$emitInputEvent.schedule(31)})),this.setSession(t||n&&n.session||new h("")),v.resetOptions(this),n&&this.setOptions(n),v._signal("editor",this)};w.$uid=0,function(){i.implement(this,p),this.$initOperationListeners=function(){this.commands.on("exec",this.startOperation.bind(this),!0),this.commands.on("afterExec",this.endOperation.bind(this),!0),this.$opResetTimer=s.delayedCall(this.endOperation.bind(this,!0)),this.on("change",function(){this.curOp||(this.startOperation(),this.curOp.selectionBefore=this.$lastSel),this.curOp.docChanged=!0}.bind(this),!0),this.on("changeSelection",function(){this.curOp||(this.startOperation(),this.curOp.selectionBefore=this.$lastSel),this.curOp.selectionChanged=!0}.bind(this),!0)},this.curOp=null,this.prevOp={},this.startOperation=function(e){if(this.curOp){if(!e||this.curOp.command)return;this.prevOp=this.curOp}e||(this.previousCommand=null,e={}),this.$opResetTimer.schedule(),this.curOp=this.session.curOp={command:e.command||{},args:e.args,scrollTop:this.renderer.scrollTop},this.curOp.selectionBefore=this.selection.toJSON()},this.endOperation=function(e){if(this.curOp){if(e&&!1===e.returnValue)return this.curOp=null;if(1==e&&this.curOp.command&&"mouse"==this.curOp.command.name)return;if(this._signal("beforeEndOperation"),!this.curOp)return;var t=this.curOp.command,n=t&&t.scrollIntoView;if(n){switch(n){case"center-animate":n="animate";case"center":this.renderer.scrollCursorIntoView(null,.5);break;case"animate":case"cursor":this.renderer.scrollCursorIntoView();break;case"selectionPart":var i=this.selection.getRange(),r=this.renderer.layerConfig;(i.start.row>=r.lastRow||i.end.row<=r.firstRow)&&this.renderer.scrollSelectionIntoView(this.selection.anchor,this.selection.lead)}"animate"==n&&this.renderer.animateScrolling(this.curOp.scrollTop)}var s=this.selection.toJSON();this.curOp.selectionAfter=s,this.$lastSel=this.selection.toJSON(),this.session.getUndoManager().addSelection(s),this.prevOp=this.curOp,this.curOp=null}},this.$mergeableCommands=["backspace","del","insertstring"],this.$historyTracker=function(e){if(this.$mergeUndoDeltas){var t=this.prevOp,n=this.$mergeableCommands,i=t.command&&e.command.name==t.command.name;if("insertstring"==e.command.name){var r=e.args;void 0===this.mergeNextCommand&&(this.mergeNextCommand=!0),i=i&&this.mergeNextCommand&&(!/\s/.test(r)||/\s/.test(t.args)),this.mergeNextCommand=!0}else i=i&&-1!==n.indexOf(e.command.name);"always"!=this.$mergeUndoDeltas&&Date.now()-this.sequenceStartTime>2e3&&(i=!1),i?this.session.mergeUndoDeltas=!0:-1!==n.indexOf(e.command.name)&&(this.sequenceStartTime=Date.now())}},this.setKeyboardHandler=function(e,t){if(e&&"string"==typeof e&&"ace"!=e){this.$keybindingId=e;var n=this;v.loadModule(["keybinding",e],(function(i){n.$keybindingId==e&&n.keyBinding.setKeyboardHandler(i&&i.handler),t&&t()}))}else this.$keybindingId=null,this.keyBinding.setKeyboardHandler(e),t&&t()},this.getKeyboardHandler=function(){return this.keyBinding.getKeyboardHandler()},this.setSession=function(e){if(this.session!=e){this.curOp&&this.endOperation(),this.curOp={};var t=this.session;if(t){this.session.off("change",this.$onDocumentChange),this.session.off("changeMode",this.$onChangeMode),this.session.off("tokenizerUpdate",this.$onTokenizerUpdate),this.session.off("changeTabSize",this.$onChangeTabSize),this.session.off("changeWrapLimit",this.$onChangeWrapLimit),this.session.off("changeWrapMode",this.$onChangeWrapMode),this.session.off("changeFold",this.$onChangeFold),this.session.off("changeFrontMarker",this.$onChangeFrontMarker),this.session.off("changeBackMarker",this.$onChangeBackMarker),this.session.off("changeBreakpoint",this.$onChangeBreakpoint),this.session.off("changeAnnotation",this.$onChangeAnnotation),this.session.off("changeOverwrite",this.$onCursorChange),this.session.off("changeScrollTop",this.$onScrollTopChange),this.session.off("changeScrollLeft",this.$onScrollLeftChange);var n=this.session.getSelection();n.off("changeCursor",this.$onCursorChange),n.off("changeSelection",this.$onSelectionChange)}this.session=e,e?(this.$onDocumentChange=this.onDocumentChange.bind(this),e.on("change",this.$onDocumentChange),this.renderer.setSession(e),this.$onChangeMode=this.onChangeMode.bind(this),e.on("changeMode",this.$onChangeMode),this.$onTokenizerUpdate=this.onTokenizerUpdate.bind(this),e.on("tokenizerUpdate",this.$onTokenizerUpdate),this.$onChangeTabSize=this.renderer.onChangeTabSize.bind(this.renderer),e.on("changeTabSize",this.$onChangeTabSize),this.$onChangeWrapLimit=this.onChangeWrapLimit.bind(this),e.on("changeWrapLimit",this.$onChangeWrapLimit),this.$onChangeWrapMode=this.onChangeWrapMode.bind(this),e.on("changeWrapMode",this.$onChangeWrapMode),this.$onChangeFold=this.onChangeFold.bind(this),e.on("changeFold",this.$onChangeFold),this.$onChangeFrontMarker=this.onChangeFrontMarker.bind(this),this.session.on("changeFrontMarker",this.$onChangeFrontMarker),this.$onChangeBackMarker=this.onChangeBackMarker.bind(this),this.session.on("changeBackMarker",this.$onChangeBackMarker),this.$onChangeBreakpoint=this.onChangeBreakpoint.bind(this),this.session.on("changeBreakpoint",this.$onChangeBreakpoint),this.$onChangeAnnotation=this.onChangeAnnotation.bind(this),this.session.on("changeAnnotation",this.$onChangeAnnotation),this.$onCursorChange=this.onCursorChange.bind(this),this.session.on("changeOverwrite",this.$onCursorChange),this.$onScrollTopChange=this.onScrollTopChange.bind(this),this.session.on("changeScrollTop",this.$onScrollTopChange),this.$onScrollLeftChange=this.onScrollLeftChange.bind(this),this.session.on("changeScrollLeft",this.$onScrollLeftChange),this.selection=e.getSelection(),this.selection.on("changeCursor",this.$onCursorChange),this.$onSelectionChange=this.onSelectionChange.bind(this),this.selection.on("changeSelection",this.$onSelectionChange),this.onChangeMode(),this.onCursorChange(),this.onScrollTopChange(),this.onScrollLeftChange(),this.onSelectionChange(),this.onChangeFrontMarker(),this.onChangeBackMarker(),this.onChangeBreakpoint(),this.onChangeAnnotation(),this.session.getUseWrapMode()&&this.renderer.adjustWrapLimit(),this.renderer.updateFull()):(this.selection=null,this.renderer.setSession(e)),this._signal("changeSession",{session:e,oldSession:t}),this.curOp=null,t&&t._signal("changeEditor",{oldEditor:this}),e&&e._signal("changeEditor",{editor:this}),e&&e.bgTokenizer&&e.bgTokenizer.scheduleStart()}},this.getSession=function(){return this.session},this.setValue=function(e,t){return this.session.doc.setValue(e),t?1==t?this.navigateFileEnd():-1==t&&this.navigateFileStart():this.selectAll(),e},this.getValue=function(){return this.session.getValue()},this.getSelection=function(){return this.selection},this.resize=function(e){this.renderer.onResize(e)},this.setTheme=function(e,t){this.renderer.setTheme(e,t)},this.getTheme=function(){return this.renderer.getTheme()},this.setStyle=function(e){this.renderer.setStyle(e)},this.unsetStyle=function(e){this.renderer.unsetStyle(e)},this.getFontSize=function(){return this.getOption("fontSize")||r.computedStyle(this.container).fontSize},this.setFontSize=function(e){this.setOption("fontSize",e)},this.$highlightBrackets=function(){if(this.session.$bracketHighlight&&(this.session.removeMarker(this.session.$bracketHighlight),this.session.$bracketHighlight=null),!this.$highlightPending){var e=this;this.$highlightPending=!0,setTimeout((function(){e.$highlightPending=!1;var t=e.session;if(t&&t.bgTokenizer){var n=t.findMatchingBracket(e.getCursorPosition());if(n)var i=new f(n.row,n.column,n.row,n.column+1);else if(t.$mode.getMatching)i=t.$mode.getMatching(e.session);i&&(t.$bracketHighlight=t.addMarker(i,"ace_bracket","text"))}}),50)}},this.$highlightTags=function(){if(!this.$highlightTagPending){var e=this;this.$highlightTagPending=!0,setTimeout((function(){e.$highlightTagPending=!1;var t=e.session;if(t&&t.bgTokenizer){var n=e.getCursorPosition(),i=new y(e.session,n.row,n.column),r=i.getCurrentToken();if(!r||!/\b(?:tag-open|tag-name)/.test(r.type))return t.removeMarker(t.$tagHighlight),void(t.$tagHighlight=null);if(-1==r.type.indexOf("tag-open")||(r=i.stepForward())){var s=r.value,o=0,a=i.stepBackward();if("<"==a.value)do{a=r,(r=i.stepForward())&&r.value===s&&-1!==r.type.indexOf("tag-name")&&("<"===a.value?o++:"</"===a.value&&o--)}while(r&&o>=0);else{do{r=a,a=i.stepBackward(),r&&r.value===s&&-1!==r.type.indexOf("tag-name")&&("<"===a.value?o++:"</"===a.value&&o--)}while(a&&o<=0);i.stepForward()}if(!r)return t.removeMarker(t.$tagHighlight),void(t.$tagHighlight=null);var l=i.getCurrentTokenRow(),u=i.getCurrentTokenColumn(),c=new f(l,u,l,u+r.value.length),h=t.$backMarkers[t.$tagHighlight];t.$tagHighlight&&null!=h&&0!==c.compareRange(h.range)&&(t.removeMarker(t.$tagHighlight),t.$tagHighlight=null),t.$tagHighlight||(t.$tagHighlight=t.addMarker(c,"ace_bracket","text"))}}}),50)}},this.focus=function(){var e=this;setTimeout((function(){e.isFocused()||e.textInput.focus()})),this.textInput.focus()},this.isFocused=function(){return this.textInput.isFocused()},this.blur=function(){this.textInput.blur()},this.onFocus=function(e){this.$isFocused||(this.$isFocused=!0,this.renderer.showCursor(),this.renderer.visualizeFocus(),this._emit("focus",e))},this.onBlur=function(e){this.$isFocused&&(this.$isFocused=!1,this.renderer.hideCursor(),this.renderer.visualizeBlur(),this._emit("blur",e))},this.$cursorChange=function(){this.renderer.updateCursor()},this.onDocumentChange=function(e){var t=this.session.$useWrapMode,n=e.start.row==e.end.row?e.end.row:1/0;this.renderer.updateLines(e.start.row,n,t),this._signal("change",e),this.$cursorChange(),this.$updateHighlightActiveLine()},this.onTokenizerUpdate=function(e){var t=e.data;this.renderer.updateLines(t.first,t.last)},this.onScrollTopChange=function(){this.renderer.scrollToY(this.session.getScrollTop())},this.onScrollLeftChange=function(){this.renderer.scrollToX(this.session.getScrollLeft())},this.onCursorChange=function(){this.$cursorChange(),this.$highlightBrackets(),this.$highlightTags(),this.$updateHighlightActiveLine(),this._signal("changeSelection")},this.$updateHighlightActiveLine=function(){var e,t=this.getSession();if(this.$highlightActiveLine&&("line"==this.$selectionStyle&&this.selection.isMultiLine()||(e=this.getCursorPosition()),this.renderer.theme&&this.renderer.theme.$selectionColorConflict&&!this.selection.isEmpty()&&(e=!1),this.renderer.$maxLines&&1===this.session.getLength()&&!(this.renderer.$minLines>1)&&(e=!1)),t.$highlightLineMarker&&!e)t.removeMarker(t.$highlightLineMarker.id),t.$highlightLineMarker=null;else if(!t.$highlightLineMarker&&e){var n=new f(e.row,e.column,e.row,1/0);n.id=t.addMarker(n,"ace_active-line","screenLine"),t.$highlightLineMarker=n}else e&&(t.$highlightLineMarker.start.row=e.row,t.$highlightLineMarker.end.row=e.row,t.$highlightLineMarker.start.column=e.column,t._signal("changeBackMarker"))},this.onSelectionChange=function(e){var t=this.session;if(t.$selectionMarker&&t.removeMarker(t.$selectionMarker),t.$selectionMarker=null,this.selection.isEmpty())this.$updateHighlightActiveLine();else{var n=this.selection.getRange(),i=this.getSelectionStyle();t.$selectionMarker=t.addMarker(n,"ace_selection",i)}var r=this.$highlightSelectedWord&&this.$getSelectionHighLightRegexp();this.session.highlight(r),this._signal("changeSelection")},this.$getSelectionHighLightRegexp=function(){var e=this.session,t=this.getSelectionRange();if(!t.isEmpty()&&!t.isMultiLine()){var n=t.start.column,i=t.end.column,r=e.getLine(t.start.row),s=r.substring(n,i);if(!(s.length>5e3)&&/[\w\d]/.test(s)){var o=this.$search.$assembleRegExp({wholeWord:!0,caseSensitive:!0,needle:s}),a=r.substring(n-1,i+1);if(o.test(a))return o}}},this.onChangeFrontMarker=function(){this.renderer.updateFrontMarkers()},this.onChangeBackMarker=function(){this.renderer.updateBackMarkers()},this.onChangeBreakpoint=function(){this.renderer.updateBreakpoints()},this.onChangeAnnotation=function(){this.renderer.setAnnotations(this.session.getAnnotations())},this.onChangeMode=function(e){this.renderer.updateText(),this._emit("changeMode",e)},this.onChangeWrapLimit=function(){this.renderer.updateFull()},this.onChangeWrapMode=function(){this.renderer.onResize(!0)},this.onChangeFold=function(){this.$updateHighlightActiveLine(),this.renderer.updateFull()},this.getSelectedText=function(){return this.session.getTextRange(this.getSelectionRange())},this.getCopyText=function(){var e=this.getSelectedText(),t=this.session.doc.getNewLineCharacter(),n=!1;if(!e&&this.$copyWithEmptySelection){n=!0;for(var i=this.selection.getAllRanges(),r=0;r<i.length;r++){var s=i[r];r&&i[r-1].start.row==s.start.row||(e+=this.session.getLine(s.start.row)+t)}}var o={text:e};return this._signal("copy",o),$.lineMode=n?o.text:"",o.text},this.onCopy=function(){this.commands.exec("copy",this)},this.onCut=function(){this.commands.exec("cut",this)},this.onPaste=function(e,t){var n={text:e,event:t};this.commands.exec("paste",this,n)},this.$handlePaste=function(e){"string"==typeof e&&(e={text:e}),this._signal("paste",e);var t=e.text,n=t==$.lineMode,i=this.session;if(!this.inMultiSelectMode||this.inVirtualSelectionMode)n?i.insert({row:this.selection.lead.row,column:0},t):this.insert(t);else if(n)this.selection.rangeList.ranges.forEach((function(e){i.insert({row:e.start.row,column:0},t)}));else{var r=t.split(/\r\n|\r|\n/),s=this.selection.rangeList.ranges;if(r.length>s.length||r.length<2||!r[1])return this.commands.exec("insertstring",this,t);for(var o=s.length;o--;){var a=s[o];a.isEmpty()||i.remove(a),i.insert(a.start,r[o])}}},this.execCommand=function(e,t){return this.commands.exec(e,this,t)},this.insert=function(e,t){var n=this.session,i=n.getMode(),r=this.getCursorPosition();if(this.getBehavioursEnabled()&&!t){var s=i.transformAction(n.getState(r.row),"insertion",this,n,e);s&&(e!==s.text&&(this.inVirtualSelectionMode||(this.session.mergeUndoDeltas=!1,this.mergeNextCommand=!1)),e=s.text)}if("\t"==e&&(e=this.session.getTabString()),this.selection.isEmpty()){if(this.session.getOverwrite()&&-1==e.indexOf("\n")){(o=new f.fromPoints(r,r)).end.column+=e.length,this.session.remove(o)}}else{var o=this.getSelectionRange();r=this.session.remove(o),this.clearSelection()}if("\n"==e||"\r\n"==e){var a=n.getLine(r.row);if(r.column>a.search(/\S|$/)){var l=a.substr(r.column).search(/\S|$/);n.doc.removeInLine(r.row,r.column,r.column+l)}}this.clearSelection();var u=r.column,c=n.getState(r.row),h=(a=n.getLine(r.row),i.checkOutdent(c,a,e));n.insert(r,e);if(s&&s.selection&&(2==s.selection.length?this.selection.setSelectionRange(new f(r.row,u+s.selection[0],r.row,u+s.selection[1])):this.selection.setSelectionRange(new f(r.row+s.selection[0],s.selection[1],r.row+s.selection[2],s.selection[3]))),n.getDocument().isNewLine(e)){var d=i.getNextLineIndent(c,a.slice(0,r.column),n.getTabString());n.insert({row:r.row+1,column:0},d)}h&&i.autoOutdent(c,n,r.row)},this.onTextInput=function(e,t){if(!t)return this.keyBinding.onTextInput(e);this.startOperation({command:{name:"insertstring"}});var n=this.applyComposition.bind(this,e,t);this.selection.rangeCount?this.forEachSelection(n):n(),this.endOperation()},this.applyComposition=function(e,t){var n;(t.extendLeft||t.extendRight)&&((n=this.selection.getRange()).start.column-=t.extendLeft,n.end.column+=t.extendRight,this.selection.setRange(n),!e&&!n.isEmpty()&&this.remove());((e||!this.selection.isEmpty())&&this.insert(e,!0),t.restoreStart||t.restoreEnd)&&((n=this.selection.getRange()).start.column-=t.restoreStart,n.end.column-=t.restoreEnd,this.selection.setRange(n))},this.onCommandKey=function(e,t,n){this.keyBinding.onCommandKey(e,t,n)},this.setOverwrite=function(e){this.session.setOverwrite(e)},this.getOverwrite=function(){return this.session.getOverwrite()},this.toggleOverwrite=function(){this.session.toggleOverwrite()},this.setScrollSpeed=function(e){this.setOption("scrollSpeed",e)},this.getScrollSpeed=function(){return this.getOption("scrollSpeed")},this.setDragDelay=function(e){this.setOption("dragDelay",e)},this.getDragDelay=function(){return this.getOption("dragDelay")},this.setSelectionStyle=function(e){this.setOption("selectionStyle",e)},this.getSelectionStyle=function(){return this.getOption("selectionStyle")},this.setHighlightActiveLine=function(e){this.setOption("highlightActiveLine",e)},this.getHighlightActiveLine=function(){return this.getOption("highlightActiveLine")},this.setHighlightGutterLine=function(e){this.setOption("highlightGutterLine",e)},this.getHighlightGutterLine=function(){return this.getOption("highlightGutterLine")},this.setHighlightSelectedWord=function(e){this.setOption("highlightSelectedWord",e)},this.getHighlightSelectedWord=function(){return this.$highlightSelectedWord},this.setAnimatedScroll=function(e){this.renderer.setAnimatedScroll(e)},this.getAnimatedScroll=function(){return this.renderer.getAnimatedScroll()},this.setShowInvisibles=function(e){this.renderer.setShowInvisibles(e)},this.getShowInvisibles=function(){return this.renderer.getShowInvisibles()},this.setDisplayIndentGuides=function(e){this.renderer.setDisplayIndentGuides(e)},this.getDisplayIndentGuides=function(){return this.renderer.getDisplayIndentGuides()},this.setShowPrintMargin=function(e){this.renderer.setShowPrintMargin(e)},this.getShowPrintMargin=function(){return this.renderer.getShowPrintMargin()},this.setPrintMarginColumn=function(e){this.renderer.setPrintMarginColumn(e)},this.getPrintMarginColumn=function(){return this.renderer.getPrintMarginColumn()},this.setReadOnly=function(e){this.setOption("readOnly",e)},this.getReadOnly=function(){return this.getOption("readOnly")},this.setBehavioursEnabled=function(e){this.setOption("behavioursEnabled",e)},this.getBehavioursEnabled=function(){return this.getOption("behavioursEnabled")},this.setWrapBehavioursEnabled=function(e){this.setOption("wrapBehavioursEnabled",e)},this.getWrapBehavioursEnabled=function(){return this.getOption("wrapBehavioursEnabled")},this.setShowFoldWidgets=function(e){this.setOption("showFoldWidgets",e)},this.getShowFoldWidgets=function(){return this.getOption("showFoldWidgets")},this.setFadeFoldWidgets=function(e){this.setOption("fadeFoldWidgets",e)},this.getFadeFoldWidgets=function(){return this.getOption("fadeFoldWidgets")},this.remove=function(e){this.selection.isEmpty()&&("left"==e?this.selection.selectLeft():this.selection.selectRight());var t=this.getSelectionRange();if(this.getBehavioursEnabled()){var n=this.session,i=n.getState(t.start.row),r=n.getMode().transformAction(i,"deletion",this,n,t);if(0===t.end.column){var s=n.getTextRange(t);if("\n"==s[s.length-1]){var o=n.getLine(t.end.row);/^\s+$/.test(o)&&(t.end.column=o.length)}}r&&(t=r)}this.session.remove(t),this.clearSelection()},this.removeWordRight=function(){this.selection.isEmpty()&&this.selection.selectWordRight(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeWordLeft=function(){this.selection.isEmpty()&&this.selection.selectWordLeft(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeToLineStart=function(){this.selection.isEmpty()&&this.selection.selectLineStart(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeToLineEnd=function(){this.selection.isEmpty()&&this.selection.selectLineEnd();var e=this.getSelectionRange();e.start.column==e.end.column&&e.start.row==e.end.row&&(e.end.column=0,e.end.row++),this.session.remove(e),this.clearSelection()},this.splitLine=function(){this.selection.isEmpty()||(this.session.remove(this.getSelectionRange()),this.clearSelection());var e=this.getCursorPosition();this.insert("\n"),this.moveCursorToPosition(e)},this.transposeLetters=function(){if(this.selection.isEmpty()){var e=this.getCursorPosition(),t=e.column;if(0!==t){var n,i,r=this.session.getLine(e.row);t<r.length?(n=r.charAt(t)+r.charAt(t-1),i=new f(e.row,t-1,e.row,t+1)):(n=r.charAt(t-1)+r.charAt(t-2),i=new f(e.row,t-2,e.row,t)),this.session.replace(i,n),this.session.selection.moveToPosition(i.end)}}},this.toLowerCase=function(){var e=this.getSelectionRange();this.selection.isEmpty()&&this.selection.selectWord();var t=this.getSelectionRange(),n=this.session.getTextRange(t);this.session.replace(t,n.toLowerCase()),this.selection.setSelectionRange(e)},this.toUpperCase=function(){var e=this.getSelectionRange();this.selection.isEmpty()&&this.selection.selectWord();var t=this.getSelectionRange(),n=this.session.getTextRange(t);this.session.replace(t,n.toUpperCase()),this.selection.setSelectionRange(e)},this.indent=function(){var e=this.session,t=this.getSelectionRange();if(!(t.start.row<t.end.row)){if(t.start.column<t.end.column){var n=e.getTextRange(t);if(!/^\s+$/.test(n)){c=this.$getSelectedRows();return void e.indentRows(c.first,c.last,"\t")}}var i=e.getLine(t.start.row),r=t.start,o=e.getTabSize(),a=e.documentToScreenColumn(r.row,r.column);if(this.session.getUseSoftTabs())var l=o-a%o,u=s.stringRepeat(" ",l);else{for(l=a%o;" "==i[t.start.column-1]&&l;)t.start.column--,l--;this.selection.setSelectionRange(t),u="\t"}return this.insert(u)}var c=this.$getSelectedRows();e.indentRows(c.first,c.last,"\t")},this.blockIndent=function(){var e=this.$getSelectedRows();this.session.indentRows(e.first,e.last,"\t")},this.blockOutdent=function(){var e=this.session.getSelection();this.session.outdentRows(e.getRange())},this.sortLines=function(){for(var e=this.$getSelectedRows(),t=this.session,n=[],i=e.first;i<=e.last;i++)n.push(t.getLine(i));n.sort((function(e,t){return e.toLowerCase()<t.toLowerCase()?-1:e.toLowerCase()>t.toLowerCase()?1:0}));var r=new f(0,0,0,0);for(i=e.first;i<=e.last;i++){var s=t.getLine(i);r.start.row=i,r.end.row=i,r.end.column=s.length,t.replace(r,n[i-e.first])}},this.toggleCommentLines=function(){var e=this.session.getState(this.getCursorPosition().row),t=this.$getSelectedRows();this.session.getMode().toggleCommentLines(e,this.session,t.first,t.last)},this.toggleBlockComment=function(){var e=this.getCursorPosition(),t=this.session.getState(e.row),n=this.getSelectionRange();this.session.getMode().toggleBlockComment(t,this.session,n,e)},this.getNumberAt=function(e,t){var n=/[\-]?[0-9]+(?:\.[0-9]+)?/g;n.lastIndex=0;for(var i=this.session.getLine(e);n.lastIndex<t;){var r=n.exec(i);if(r.index<=t&&r.index+r[0].length>=t)return{value:r[0],start:r.index,end:r.index+r[0].length}}return null},this.modifyNumber=function(e){var t=this.selection.getCursor().row,n=this.selection.getCursor().column,i=new f(t,n-1,t,n),r=this.session.getTextRange(i);if(!isNaN(parseFloat(r))&&isFinite(r)){var s=this.getNumberAt(t,n);if(s){var o=s.value.indexOf(".")>=0?s.start+s.value.indexOf(".")+1:s.end,a=s.start+s.value.length-o,l=parseFloat(s.value);l*=Math.pow(10,a),o!==s.end&&n<o?e*=Math.pow(10,s.end-n-1):e*=Math.pow(10,s.end-n),l+=e;var u=(l/=Math.pow(10,a)).toFixed(a),c=new f(t,s.start,t,s.end);this.session.replace(c,u),this.moveCursorTo(t,Math.max(s.start+1,n+u.length-s.value.length))}}else this.toggleWord()},this.$toggleWordPairs=[["first","last"],["true","false"],["yes","no"],["width","height"],["top","bottom"],["right","left"],["on","off"],["x","y"],["get","set"],["max","min"],["horizontal","vertical"],["show","hide"],["add","remove"],["up","down"],["before","after"],["even","odd"],["inside","outside"],["next","previous"],["increase","decrease"],["attach","detach"],["&&","||"],["==","!="]],this.toggleWord=function(){var e=this.selection.getCursor().row,t=this.selection.getCursor().column;this.selection.selectWord();var n=this.getSelectedText(),i=this.selection.getWordRange().start.column,r=n.replace(/([a-z]+|[A-Z]+)(?=[A-Z_]|$)/g,"$1 ").split(/\s/),o=t-i-1;o<0&&(o=0);var a=0,l=0,u=this;n.match(/[A-Za-z0-9_]+/)&&r.forEach((function(t,r){l=a+t.length,o>=a&&o<=l&&(n=t,u.selection.clearSelection(),u.moveCursorTo(e,a+i),u.selection.selectTo(e,l+i)),a=l}));for(var c,h=this.$toggleWordPairs,d=0;d<h.length;d++)for(var f=h[d],p=0;p<=1;p++){var g=+!p,m=n.match(new RegExp("^\\s?_?("+s.escapeRegExp(f[p])+")\\s?$","i"));if(m)n.match(new RegExp("([_]|^|\\s)("+s.escapeRegExp(m[1])+")($|\\s)","g"))&&(c=n.replace(new RegExp(s.escapeRegExp(f[p]),"i"),(function(e){var t=f[g];return e.toUpperCase()==e?t=t.toUpperCase():e.charAt(0).toUpperCase()==e.charAt(0)&&(t=t.substr(0,0)+f[g].charAt(0).toUpperCase()+t.substr(1)),t})),this.insert(c),c="")}},this.removeLines=function(){var e=this.$getSelectedRows();this.session.removeFullLines(e.first,e.last),this.clearSelection()},this.duplicateSelection=function(){var e=this.selection,t=this.session,n=e.getRange(),i=e.isBackwards();if(n.isEmpty()){var r=n.start.row;t.duplicateLines(r,r)}else{var s=i?n.start:n.end,o=t.insert(s,t.getTextRange(n),!1);n.start=s,n.end=o,e.setSelectionRange(n,i)}},this.moveLinesDown=function(){this.$moveLines(1,!1)},this.moveLinesUp=function(){this.$moveLines(-1,!1)},this.moveText=function(e,t,n){return this.session.moveText(e,t,n)},this.copyLinesUp=function(){this.$moveLines(-1,!0)},this.copyLinesDown=function(){this.$moveLines(1,!0)},this.$moveLines=function(e,t){var n,i,r=this.selection;if(!r.inMultiSelectMode||this.inVirtualSelectionMode){var s=r.toOrientedRange();n=this.$getSelectedRows(s),i=this.session.$moveLines(n.first,n.last,t?0:e),t&&-1==e&&(i=0),s.moveBy(i,0),r.fromOrientedRange(s)}else{var o=r.rangeList.ranges;r.rangeList.detach(this.session),this.inVirtualSelectionMode=!0;for(var a=0,l=0,u=o.length,c=0;c<u;c++){var h=c;o[c].moveBy(a,0);for(var d=(n=this.$getSelectedRows(o[c])).first,f=n.last;++c<u;){l&&o[c].moveBy(l,0);var p=this.$getSelectedRows(o[c]);if(t&&p.first!=f)break;if(!t&&p.first>f+1)break;f=p.last}for(c--,a=this.session.$moveLines(d,f,t?0:e),t&&-1==e&&(h=c+1);h<=c;)o[h].moveBy(a,0),h++;t||(a=0),l+=a}r.fromOrientedRange(r.ranges[0]),r.rangeList.attach(this.session),this.inVirtualSelectionMode=!1}},this.$getSelectedRows=function(e){return e=(e||this.getSelectionRange()).collapseRows(),{first:this.session.getRowFoldStart(e.start.row),last:this.session.getRowFoldEnd(e.end.row)}},this.onCompositionStart=function(e){this.renderer.showComposition(e)},this.onCompositionUpdate=function(e){this.renderer.setCompositionText(e)},this.onCompositionEnd=function(){this.renderer.hideComposition()},this.getFirstVisibleRow=function(){return this.renderer.getFirstVisibleRow()},this.getLastVisibleRow=function(){return this.renderer.getLastVisibleRow()},this.isRowVisible=function(e){return e>=this.getFirstVisibleRow()&&e<=this.getLastVisibleRow()},this.isRowFullyVisible=function(e){return e>=this.renderer.getFirstFullyVisibleRow()&&e<=this.renderer.getLastFullyVisibleRow()},this.$getVisibleRowCount=function(){return this.renderer.getScrollBottomRow()-this.renderer.getScrollTopRow()+1},this.$moveByPage=function(e,t){var n=this.renderer,i=this.renderer.layerConfig,r=e*Math.floor(i.height/i.lineHeight);!0===t?this.selection.$moveSelection((function(){this.moveCursorBy(r,0)})):!1===t&&(this.selection.moveCursorBy(r,0),this.selection.clearSelection());var s=n.scrollTop;n.scrollBy(0,r*i.lineHeight),null!=t&&n.scrollCursorIntoView(null,.5),n.animateScrolling(s)},this.selectPageDown=function(){this.$moveByPage(1,!0)},this.selectPageUp=function(){this.$moveByPage(-1,!0)},this.gotoPageDown=function(){this.$moveByPage(1,!1)},this.gotoPageUp=function(){this.$moveByPage(-1,!1)},this.scrollPageDown=function(){this.$moveByPage(1)},this.scrollPageUp=function(){this.$moveByPage(-1)},this.scrollToRow=function(e){this.renderer.scrollToRow(e)},this.scrollToLine=function(e,t,n,i){this.renderer.scrollToLine(e,t,n,i)},this.centerSelection=function(){var e=this.getSelectionRange(),t={row:Math.floor(e.start.row+(e.end.row-e.start.row)/2),column:Math.floor(e.start.column+(e.end.column-e.start.column)/2)};this.renderer.alignCursor(t,.5)},this.getCursorPosition=function(){return this.selection.getCursor()},this.getCursorPositionScreen=function(){return this.session.documentToScreenPosition(this.getCursorPosition())},this.getSelectionRange=function(){return this.selection.getRange()},this.selectAll=function(){this.selection.selectAll()},this.clearSelection=function(){this.selection.clearSelection()},this.moveCursorTo=function(e,t){this.selection.moveCursorTo(e,t)},this.moveCursorToPosition=function(e){this.selection.moveCursorToPosition(e)},this.jumpToMatching=function(e,t){var n=this.getCursorPosition(),i=new y(this.session,n.row,n.column),r=i.getCurrentToken(),s=r||i.stepForward();if(s){var o,a,l=!1,u={},c=n.column-s.start,h={")":"(","(":"(","]":"[","[":"[","{":"{","}":"{"};do{if(s.value.match(/[{}()\[\]]/g)){for(;c<s.value.length&&!l;c++)if(h[s.value[c]])switch(a=h[s.value[c]]+"."+s.type.replace("rparen","lparen"),isNaN(u[a])&&(u[a]=0),s.value[c]){case"(":case"[":case"{":u[a]++;break;case")":case"]":case"}":u[a]--,-1===u[a]&&(o="bracket",l=!0)}}else-1!==s.type.indexOf("tag-name")&&(isNaN(u[s.value])&&(u[s.value]=0),"<"===r.value?u[s.value]++:"</"===r.value&&u[s.value]--,-1===u[s.value]&&(o="tag",l=!0));l||(r=s,s=i.stepForward(),c=0)}while(s&&!l);if(o){var d,p;if("bracket"===o)(d=this.session.getBracketRange(n))||(p=(d=new f(i.getCurrentTokenRow(),i.getCurrentTokenColumn()+c-1,i.getCurrentTokenRow(),i.getCurrentTokenColumn()+c-1)).start,(t||p.row===n.row&&Math.abs(p.column-n.column)<2)&&(d=this.session.getBracketRange(p)));else if("tag"===o){if(!s||-1===s.type.indexOf("tag-name"))return;var g=s.value;if(0===(d=new f(i.getCurrentTokenRow(),i.getCurrentTokenColumn()-2,i.getCurrentTokenRow(),i.getCurrentTokenColumn()-2)).compare(n.row,n.column)){l=!1;do{s=r,(r=i.stepBackward())&&(-1!==r.type.indexOf("tag-close")&&d.setEnd(i.getCurrentTokenRow(),i.getCurrentTokenColumn()+1),s.value===g&&-1!==s.type.indexOf("tag-name")&&("<"===r.value?u[g]++:"</"===r.value&&u[g]--,0===u[g]&&(l=!0)))}while(r&&!l)}s&&s.type.indexOf("tag-name")&&((p=d.start).row==n.row&&Math.abs(p.column-n.column)<2&&(p=d.end))}(p=d&&d.cursor||p)&&(e?d&&t?this.selection.setRange(d):d&&d.isEqual(this.getSelectionRange())?this.clearSelection():this.selection.selectTo(p.row,p.column):this.selection.moveTo(p.row,p.column))}}},this.gotoLine=function(e,t,n){this.selection.clearSelection(),this.session.unfold({row:e-1,column:t||0}),this.exitMultiSelectMode&&this.exitMultiSelectMode(),this.moveCursorTo(e-1,t||0),this.isRowFullyVisible(e-1)||this.scrollToLine(e-1,!0,n)},this.navigateTo=function(e,t){this.selection.moveTo(e,t)},this.navigateUp=function(e){if(this.selection.isMultiLine()&&!this.selection.isBackwards()){var t=this.selection.anchor.getPosition();return this.moveCursorToPosition(t)}this.selection.clearSelection(),this.selection.moveCursorBy(-e||-1,0)},this.navigateDown=function(e){if(this.selection.isMultiLine()&&this.selection.isBackwards()){var t=this.selection.anchor.getPosition();return this.moveCursorToPosition(t)}this.selection.clearSelection(),this.selection.moveCursorBy(e||1,0)},this.navigateLeft=function(e){if(this.selection.isEmpty())for(e=e||1;e--;)this.selection.moveCursorLeft();else{var t=this.getSelectionRange().start;this.moveCursorToPosition(t)}this.clearSelection()},this.navigateRight=function(e){if(this.selection.isEmpty())for(e=e||1;e--;)this.selection.moveCursorRight();else{var t=this.getSelectionRange().end;this.moveCursorToPosition(t)}this.clearSelection()},this.navigateLineStart=function(){this.selection.moveCursorLineStart(),this.clearSelection()},this.navigateLineEnd=function(){this.selection.moveCursorLineEnd(),this.clearSelection()},this.navigateFileEnd=function(){this.selection.moveCursorFileEnd(),this.clearSelection()},this.navigateFileStart=function(){this.selection.moveCursorFileStart(),this.clearSelection()},this.navigateWordRight=function(){this.selection.moveCursorWordRight(),this.clearSelection()},this.navigateWordLeft=function(){this.selection.moveCursorWordLeft(),this.clearSelection()},this.replace=function(e,t){t&&this.$search.set(t);var n=this.$search.find(this.session),i=0;return n?(this.$tryReplace(n,e)&&(i=1),this.selection.setSelectionRange(n),this.renderer.scrollSelectionIntoView(n.start,n.end),i):i},this.replaceAll=function(e,t){t&&this.$search.set(t);var n=this.$search.findAll(this.session),i=0;if(!n.length)return i;var r=this.getSelectionRange();this.selection.moveTo(0,0);for(var s=n.length-1;s>=0;--s)this.$tryReplace(n[s],e)&&i++;return this.selection.setSelectionRange(r),i},this.$tryReplace=function(e,t){var n=this.session.getTextRange(e);return null!==(t=this.$search.replace(n,t))?(e.end=this.session.replace(e,t),e):null},this.getLastSearchOptions=function(){return this.$search.getOptions()},this.find=function(e,t,n){t||(t={}),"string"==typeof e||e instanceof RegExp?t.needle=e:"object"==typeof e&&i.mixin(t,e);var r=this.selection.getRange();null==t.needle&&((e=this.session.getTextRange(r)||this.$search.$options.needle)||(r=this.session.getWordRange(r.start.row,r.start.column),e=this.session.getTextRange(r)),this.$search.set({needle:e})),this.$search.set(t),t.start||this.$search.set({start:r});var s=this.$search.find(this.session);return t.preventScroll?s:s?(this.revealRange(s,n),s):(t.backwards?r.start=r.end:r.end=r.start,void this.selection.setRange(r))},this.findNext=function(e,t){this.find({skipCurrent:!0,backwards:!1},e,t)},this.findPrevious=function(e,t){this.find(e,{skipCurrent:!0,backwards:!0},t)},this.revealRange=function(e,t){this.session.unfold(e),this.selection.setSelectionRange(e);var n=this.renderer.scrollTop;this.renderer.scrollSelectionIntoView(e.start,e.end,.5),!1!==t&&this.renderer.animateScrolling(n)},this.undo=function(){this.session.getUndoManager().undo(this.session),this.renderer.scrollCursorIntoView(null,.5)},this.redo=function(){this.session.getUndoManager().redo(this.session),this.renderer.scrollCursorIntoView(null,.5)},this.destroy=function(){this.renderer.destroy(),this._signal("destroy",this),this.session&&this.session.destroy()},this.setAutoScrollEditorIntoView=function(e){if(e){var t,n=this,i=!1;this.$scrollAnchor||(this.$scrollAnchor=document.createElement("div"));var r=this.$scrollAnchor;r.style.cssText="position:absolute",this.container.insertBefore(r,this.container.firstChild);var s=this.on("changeSelection",(function(){i=!0})),o=this.renderer.on("beforeRender",(function(){i&&(t=n.renderer.container.getBoundingClientRect())})),a=this.renderer.on("afterRender",(function(){if(i&&t&&(n.isFocused()||n.searchBox&&n.searchBox.isFocused())){var e=n.renderer,s=e.$cursorLayer.$pixelPos,o=e.layerConfig,a=s.top-o.offset;null!=(i=s.top>=0&&a+t.top<0||!(s.top<o.height&&s.top+t.top+o.lineHeight>window.innerHeight)&&null)&&(r.style.top=a+"px",r.style.left=s.left+"px",r.style.height=o.lineHeight+"px",r.scrollIntoView(i)),i=t=null}}));this.setAutoScrollEditorIntoView=function(e){e||(delete this.setAutoScrollEditorIntoView,this.off("changeSelection",s),this.renderer.off("afterRender",a),this.renderer.off("beforeRender",o))}}},this.$resetCursorStyle=function(){var e=this.$cursorStyle||"ace",t=this.renderer.$cursorLayer;t&&(t.setSmoothBlinking(/smooth/.test(e)),t.isBlinking=!this.$readOnly&&"wide"!=e,r.setCssClass(t.element,"ace_slim-cursors",/slim/.test(e)))}}.call(w.prototype),v.defineOptions(w.prototype,"editor",{selectionStyle:{set:function(e){this.onSelectionChange(),this._signal("changeSelectionStyle",{data:e})},initialValue:"line"},highlightActiveLine:{set:function(){this.$updateHighlightActiveLine()},initialValue:!0},highlightSelectedWord:{set:function(e){this.$onSelectionChange()},initialValue:!0},readOnly:{set:function(e){this.textInput.setReadOnly(e),this.$resetCursorStyle()},initialValue:!1},copyWithEmptySelection:{set:function(e){this.textInput.setCopyWithEmptySelection(e)},initialValue:!1},cursorStyle:{set:function(e){this.$resetCursorStyle()},values:["ace","slim","smooth","wide"],initialValue:"ace"},mergeUndoDeltas:{values:[!1,!0,"always"],initialValue:!0},behavioursEnabled:{initialValue:!0},wrapBehavioursEnabled:{initialValue:!0},autoScrollEditorIntoView:{set:function(e){this.setAutoScrollEditorIntoView(e)}},keyboardHandler:{set:function(e){this.setKeyboardHandler(e)},get:function(){return this.$keybindingId},handlesSet:!0},value:{set:function(e){this.session.setValue(e)},get:function(){return this.getValue()},handlesSet:!0,hidden:!0},session:{set:function(e){this.setSession(e)},get:function(){return this.session},handlesSet:!0,hidden:!0},showLineNumbers:{set:function(e){this.renderer.$gutterLayer.setShowLineNumbers(e),this.renderer.$loop.schedule(this.renderer.CHANGE_GUTTER),e&&this.$relativeLineNumbers?b.attach(this):b.detach(this)},initialValue:!0},relativeLineNumbers:{set:function(e){this.$showLineNumbers&&e?b.attach(this):b.detach(this)}},hScrollBarAlwaysVisible:"renderer",vScrollBarAlwaysVisible:"renderer",highlightGutterLine:"renderer",animatedScroll:"renderer",showInvisibles:"renderer",showPrintMargin:"renderer",printMarginColumn:"renderer",printMargin:"renderer",fadeFoldWidgets:"renderer",showFoldWidgets:"renderer",displayIndentGuides:"renderer",showGutter:"renderer",fontSize:"renderer",fontFamily:"renderer",maxLines:"renderer",minLines:"renderer",scrollPastEnd:"renderer",fixedWidthGutter:"renderer",theme:"renderer",hasCssTransforms:"renderer",maxPixelHeight:"renderer",useTextareaForIME:"renderer",scrollSpeed:"$mouseHandler",dragDelay:"$mouseHandler",dragEnabled:"$mouseHandler",focusTimeout:"$mouseHandler",tooltipFollowsMouse:"$mouseHandler",firstLineNumber:"session",overwrite:"session",newLineMode:"session",useWorker:"session",useSoftTabs:"session",navigateWithinSoftTabs:"session",tabSize:"session",wrap:"session",indentedSoftWrap:"session",foldStyle:"session",mode:"session"});var b={getText:function(e,t){return(Math.abs(e.selection.lead.row-t)||t+1+(t<9?"·":""))+""},getWidth:function(e,t,n){return Math.max(t.toString().length,(n.lastRow+1).toString().length,2)*n.characterWidth},update:function(e,t){t.renderer.$loop.schedule(t.renderer.CHANGE_GUTTER)},attach:function(e){e.renderer.$gutterLayer.$renderer=this,e.on("changeSelection",this.update),this.update(null,e)},detach:function(e){e.renderer.$gutterLayer.$renderer==this&&(e.renderer.$gutterLayer.$renderer=null),e.off("changeSelection",this.update),this.update(null,e)}};t.Editor=w})),ace.define("ace/undomanager",["require","exports","module","ace/range"],(function(e,t,n){"use strict";function i(e){return{row:e.row,column:e.column}}function r(e){if(e=e||this,Array.isArray(e))return e.map(r).join("\n");var t="";return e.action?(t="insert"==e.action?"+":"-",t+="["+e.lines+"]"):e.value&&(t=Array.isArray(e.value)?e.value.map(s).join("\n"):s(e.value)),e.start&&(t+=s(e)),(e.id||e.rev)&&(t+="\t("+(e.id||e.rev)+")"),t}function s(e){return e.start.row+":"+e.start.column+"=>"+e.end.row+":"+e.end.column}function o(e,t){var n="insert"==e.action,i="insert"==t.action;if(n&&i)if(g(t.start,e.end)>=0)u(t,e,-1);else{if(!(g(t.start,e.start)<=0))return null;u(e,t,1)}else if(n&&!i)if(g(t.start,e.end)>=0)u(t,e,-1);else{if(!(g(t.end,e.start)<=0))return null;u(e,t,-1)}else if(!n&&i)if(g(t.start,e.start)>=0)u(t,e,1);else{if(!(g(t.start,e.start)<=0))return null;u(e,t,1)}else if(!n&&!i)if(g(t.start,e.start)>=0)u(t,e,1);else{if(!(g(t.end,e.start)<=0))return null;u(e,t,-1)}return[t,e]}function a(e,t){for(var n=e.length;n--;)for(var i=0;i<t.length;i++)if(!o(e[n],t[i])){for(;n<e.length;){for(;i--;)o(t[i],e[n]);i=t.length,n++}return[e,t]}return e.selectionBefore=t.selectionBefore=e.selectionAfter=t.selectionAfter=null,[t,e]}function l(e,t){var n="insert"==e.action,i="insert"==t.action;if(n&&i)g(e.start,t.start)<0?u(t,e,1):u(e,t,1);else if(n&&!i)g(e.start,t.end)>=0?u(e,t,-1):(g(e.start,t.start)<=0||u(e,p.fromPoints(t.start,e.start),-1),u(t,e,1));else if(!n&&i)g(t.start,e.end)>=0?u(t,e,-1):(g(t.start,e.start)<=0||u(t,p.fromPoints(e.start,t.start),-1),u(e,t,1));else if(!n&&!i)if(g(t.start,e.end)>=0)u(t,e,-1);else{var r,s;if(!(g(t.end,e.start)<=0))return g(e.start,t.start)<0&&(r=e,e=h(e,t.start)),g(e.end,t.end)>0&&(s=h(e,t.end)),c(t.end,e.start,e.end,-1),s&&!r&&(e.lines=s.lines,e.start=s.start,e.end=s.end,s=e),[t,r,s].filter(Boolean);u(e,t,-1)}return[t,e]}function u(e,t,n){c(e.start,t.start,t.end,n),c(e.end,t.start,t.end,n)}function c(e,t,n,i){e.row==(1==i?t:n).row&&(e.column+=i*(n.column-t.column)),e.row+=i*(n.row-t.row)}function h(e,t){var n=e.lines,r=e.end;e.end=i(t);var s=e.end.row-e.start.row,o=n.splice(s,n.length),a=s?t.column:t.column-e.start.column;return n.push(o[0].substring(0,a)),o[0]=o[0].substr(a),{start:i(t),end:r,lines:o,action:e.action}}function d(e,t){t=function(e){return{start:i(e.start),end:i(e.end),action:e.action,lines:e.lines.slice()}}(t);for(var n=e.length;n--;){for(var r=e[n],s=0;s<r.length;s++){var o=l(r[s],t);t=o[0],2!=o.length&&(o[2]?(r.splice(s+1,1,o[1],o[2]),s++):o[1]||(r.splice(s,1),s--))}r.length||e.splice(n,1)}return e}var f=function(){this.$maxRev=0,this.$fromUndo=!1,this.reset()};(function(){this.addSession=function(e){this.$session=e},this.add=function(e,t,n){this.$fromUndo||e!=this.$lastDelta&&(!1!==t&&this.lastDeltas||(this.lastDeltas=[],this.$undoStack.push(this.lastDeltas),e.id=this.$rev=++this.$maxRev),"remove"!=e.action&&"insert"!=e.action||(this.$lastDelta=e),this.lastDeltas.push(e))},this.addSelection=function(e,t){this.selections.push({value:e,rev:t||this.$rev})},this.startNewGroup=function(){return this.lastDeltas=null,this.$rev},this.markIgnored=function(e,t){null==t&&(t=this.$rev+1);for(var n=this.$undoStack,i=n.length;i--;){var r=n[i][0];if(r.id<=e)break;r.id<t&&(r.ignore=!0)}this.lastDeltas=null},this.getSelection=function(e,t){for(var n=this.selections,i=n.length;i--;){var r=n[i];if(r.rev<e)return t&&(r=n[i+1]),r}},this.getRevision=function(){return this.$rev},this.getDeltas=function(e,t){null==t&&(t=this.$rev+1);for(var n=this.$undoStack,i=null,r=0,s=n.length;s--;){var o=n[s][0];if(o.id<t&&!i&&(i=s+1),o.id<=e){r=s+1;break}}return n.slice(r,i)},this.getChangedRanges=function(e,t){null==t&&(t=this.$rev+1)},this.getChangedLines=function(e,t){null==t&&(t=this.$rev+1)},this.undo=function(e,t){this.lastDeltas=null;var n=this.$undoStack;if(function(e,t){for(var n=t;n--;){var i=e[n];if(i&&!i[0].ignore){for(;n<t-1;){var r=a(e[n],e[n+1]);e[n]=r[0],e[n+1]=r[1],n++}return!0}}}(n,n.length)){e||(e=this.$session),this.$redoStackBaseRev!==this.$rev&&this.$redoStack.length&&(this.$redoStack=[]),this.$fromUndo=!0;var i=n.pop(),r=null;return i&&i.length&&(r=e.undoChanges(i,t),this.$redoStack.push(i),this.$syncRev()),this.$fromUndo=!1,r}},this.redo=function(e,t){if(this.lastDeltas=null,e||(e=this.$session),this.$fromUndo=!0,this.$redoStackBaseRev!=this.$rev){var n=this.getDeltas(this.$redoStackBaseRev,this.$rev+1);(function(e,t){for(var n=0;n<t.length;n++)for(var i=t[n],r=0;r<i.length;r++)d(e,i[r])})(this.$redoStack,n),this.$redoStackBaseRev=this.$rev,this.$redoStack.forEach((function(e){e[0].id=++this.$maxRev}),this)}var i=this.$redoStack.pop(),r=null;return i&&(r=e.redoChanges(i,t),this.$undoStack.push(i),this.$syncRev()),this.$fromUndo=!1,r},this.$syncRev=function(){var e=this.$undoStack,t=e[e.length-1],n=t&&t[0].id||0;this.$redoStackBaseRev=n,this.$rev=n},this.reset=function(){this.lastDeltas=null,this.$lastDelta=null,this.$undoStack=[],this.$redoStack=[],this.$rev=0,this.mark=0,this.$redoStackBaseRev=this.$rev,this.selections=[]},this.canUndo=function(){return this.$undoStack.length>0},this.canRedo=function(){return this.$redoStack.length>0},this.bookmark=function(e){null==e&&(e=this.$rev),this.mark=e},this.isAtBookmark=function(){return this.$rev===this.mark},this.toJSON=function(){},this.fromJSON=function(){},this.hasUndo=this.canUndo,this.hasRedo=this.canRedo,this.isClean=this.isAtBookmark,this.markClean=this.bookmark,this.$prettyPrint=function(e){return e?r(e):r(this.$undoStack)+"\n---\n"+r(this.$redoStack)}}).call(f.prototype);var p=e("./range").Range,g=p.comparePoints;p.comparePoints;t.UndoManager=f})),ace.define("ace/layer/lines",["require","exports","module","ace/lib/dom"],(function(e,t,n){"use strict";var i=e("../lib/dom"),r=function(e,t){this.element=e,this.canvasHeight=t||5e5,this.element.style.height=2*this.canvasHeight+"px",this.cells=[],this.cellCache=[],this.$offsetCoefficient=0};(function(){this.moveContainer=function(e){i.translate(this.element,0,-e.firstRowScreen*e.lineHeight%this.canvasHeight-e.offset*this.$offsetCoefficient)},this.pageChanged=function(e,t){return Math.floor(e.firstRowScreen*e.lineHeight/this.canvasHeight)!==Math.floor(t.firstRowScreen*t.lineHeight/this.canvasHeight)},this.computeLineTop=function(e,t,n){var i=t.firstRowScreen*t.lineHeight,r=Math.floor(i/this.canvasHeight);return n.documentToScreenRow(e,0)*t.lineHeight-r*this.canvasHeight},this.computeLineHeight=function(e,t,n){return t.lineHeight*n.getRowLength(e)},this.getLength=function(){return this.cells.length},this.get=function(e){return this.cells[e]},this.shift=function(){this.$cacheCell(this.cells.shift())},this.pop=function(){this.$cacheCell(this.cells.pop())},this.push=function(e){if(Array.isArray(e)){this.cells.push.apply(this.cells,e);for(var t=i.createFragment(this.element),n=0;n<e.length;n++)t.appendChild(e[n].element);this.element.appendChild(t)}else this.cells.push(e),this.element.appendChild(e.element)},this.unshift=function(e){if(Array.isArray(e)){this.cells.unshift.apply(this.cells,e);for(var t=i.createFragment(this.element),n=0;n<e.length;n++)t.appendChild(e[n].element);this.element.firstChild?this.element.insertBefore(t,this.element.firstChild):this.element.appendChild(t)}else this.cells.unshift(e),this.element.insertAdjacentElement("afterbegin",e.element)},this.last=function(){return this.cells.length?this.cells[this.cells.length-1]:null},this.$cacheCell=function(e){e&&(e.element.remove(),this.cellCache.push(e))},this.createCell=function(e,t,n,r){var s=this.cellCache.pop();if(!s){var o=i.createElement("div");r&&r(o),this.element.appendChild(o),s={element:o,text:"",row:e}}return s.row=e,s}}).call(r.prototype),t.Lines=r})),ace.define("ace/layer/gutter",["require","exports","module","ace/lib/dom","ace/lib/oop","ace/lib/lang","ace/lib/event_emitter","ace/layer/lines"],(function(e,t,n){"use strict";function i(e){var t=document.createTextNode("");e.appendChild(t);var n=r.createElement("span");return e.appendChild(n),e}var r=e("../lib/dom"),s=e("../lib/oop"),o=e("../lib/lang"),a=e("../lib/event_emitter").EventEmitter,l=e("./lines").Lines,u=function(e){this.element=r.createElement("div"),this.element.className="ace_layer ace_gutter-layer",e.appendChild(this.element),this.setShowFoldWidgets(this.$showFoldWidgets),this.gutterWidth=0,this.$annotations=[],this.$updateAnnotations=this.$updateAnnotations.bind(this),this.$lines=new l(this.element),this.$lines.$offsetCoefficient=1};(function(){s.implement(this,a),this.setSession=function(e){this.session&&this.session.removeEventListener("change",this.$updateAnnotations),this.session=e,e&&e.on("change",this.$updateAnnotations)},this.addGutterDecoration=function(e,t){window.console&&console.warn&&console.warn("deprecated use session.addGutterDecoration"),this.session.addGutterDecoration(e,t)},this.removeGutterDecoration=function(e,t){window.console&&console.warn&&console.warn("deprecated use session.removeGutterDecoration"),this.session.removeGutterDecoration(e,t)},this.setAnnotations=function(e){this.$annotations=[];for(var t=0;t<e.length;t++){var n=e[t],i=n.row,r=this.$annotations[i];r||(r=this.$annotations[i]={text:[]});var s=n.text;s=s?o.escapeHTML(s):n.html||"",-1===r.text.indexOf(s)&&r.text.push(s);var a=n.type;"error"==a?r.className=" ace_error":"warning"==a&&" ace_error"!=r.className?r.className=" ace_warning":"info"==a&&!r.className&&(r.className=" ace_info")}},this.$updateAnnotations=function(e){if(this.$annotations.length){var t=e.start.row,n=e.end.row-t;if(0!==n)if("remove"==e.action)this.$annotations.splice(t,n+1,null);else{var i=new Array(n+1);i.unshift(t,1),this.$annotations.splice.apply(this.$annotations,i)}}},this.update=function(e){this.config=e;var t=this.session,n=e.firstRow,r=Math.min(e.lastRow+e.gutterOffset,t.getLength()-1);this.oldLastRow=r,this.config=e,this.$lines.moveContainer(e),this.$updateCursorRow();for(var s=t.getNextFoldLine(n),o=s?s.start.row:1/0,a=null,l=-1,u=n;;){if(u>o&&(u=s.end.row+1,o=(s=t.getNextFoldLine(u,s))?s.start.row:1/0),u>r){for(;this.$lines.getLength()>l+1;)this.$lines.pop();break}(a=this.$lines.get(++l))?a.row=u:(a=this.$lines.createCell(u,e,this.session,i),this.$lines.push(a)),this.$renderCell(a,e,s,u),u++}this._signal("afterRender"),this.$updateGutterWidth(e)},this.$updateGutterWidth=function(e){var t=this.session,n=t.gutterRenderer||this.$renderer,i=t.$firstLineNumber,r=this.$lines.last()?this.$lines.last().text:"";(this.$fixedWidth||t.$useWrapMode)&&(r=t.getLength()+i-1);var s=n?n.getWidth(t,r,e):r.toString().length*e.characterWidth,o=this.$padding||this.$computePadding();(s+=o.left+o.right)!==this.gutterWidth&&!isNaN(s)&&(this.gutterWidth=s,this.element.parentNode.style.width=this.element.style.width=Math.ceil(this.gutterWidth)+"px",this._signal("changeGutterWidth",s))},this.$updateCursorRow=function(){if(this.$highlightGutterLine){var e=this.session.selection.getCursor();this.$cursorRow!==e.row&&(this.$cursorRow=e.row)}},this.updateLineHighlight=function(){if(this.$highlightGutterLine){var e=this.session.selection.cursor.row;if(this.$cursorRow=e,!this.$cursorCell||this.$cursorCell.row!=e){this.$cursorCell&&(this.$cursorCell.element.className=this.$cursorCell.element.className.replace("ace_gutter-active-line ",""));var t=this.$lines.cells;this.$cursorCell=null;for(var n=0;n<t.length;n++){var i=t[n];if(i.row>=this.$cursorRow){if(i.row>this.$cursorRow){var r=this.session.getFoldLine(this.$cursorRow);if(!(n>0&&r&&r.start.row==t[n-1].row))break;i=t[n-1]}i.element.className="ace_gutter-active-line "+i.element.className,this.$cursorCell=i;break}}}}},this.scrollLines=function(e){var t=this.config;if(this.config=e,this.$updateCursorRow(),this.$lines.pageChanged(t,e))return this.update(e);this.$lines.moveContainer(e);var n=Math.min(e.lastRow+e.gutterOffset,this.session.getLength()-1),i=this.oldLastRow;if(this.oldLastRow=n,!t||i<e.firstRow)return this.update(e);if(n<t.firstRow)return this.update(e);if(t.firstRow<e.firstRow)for(var r=this.session.getFoldedRowCount(t.firstRow,e.firstRow-1);r>0;r--)this.$lines.shift();if(i>n)for(r=this.session.getFoldedRowCount(n+1,i);r>0;r--)this.$lines.pop();e.firstRow<t.firstRow&&this.$lines.unshift(this.$renderLines(e,e.firstRow,t.firstRow-1)),n>i&&this.$lines.push(this.$renderLines(e,i+1,n)),this.updateLineHighlight(),this._signal("afterRender"),this.$updateGutterWidth(e)},this.$renderLines=function(e,t,n){for(var r=[],s=t,o=this.session.getNextFoldLine(s),a=o?o.start.row:1/0;s>a&&(s=o.end.row+1,a=(o=this.session.getNextFoldLine(s,o))?o.start.row:1/0),!(s>n);){var l=this.$lines.createCell(s,e,this.session,i);this.$renderCell(l,e,o,s),r.push(l),s++}return r},this.$renderCell=function(e,t,n,i){var s=e.element,o=this.session,a=s.childNodes[0],l=s.childNodes[1],u=o.$firstLineNumber,c=o.$breakpoints,h=o.$decorations,d=o.gutterRenderer||this.$renderer,f=this.$showFoldWidgets&&o.foldWidgets,p=n?n.start.row:Number.MAX_VALUE,g="ace_gutter-cell ";if(this.$highlightGutterLine&&(i==this.$cursorRow||n&&i<this.$cursorRow&&i>=p&&this.$cursorRow<=n.end.row)&&(g+="ace_gutter-active-line ",this.$cursorCell!=e&&(this.$cursorCell&&(this.$cursorCell.element.className=this.$cursorCell.element.className.replace("ace_gutter-active-line ","")),this.$cursorCell=e)),c[i]&&(g+=c[i]),h[i]&&(g+=h[i]),this.$annotations[i]&&(g+=this.$annotations[i].className),s.className!=g&&(s.className=g),f){var m=f[i];null==m&&(m=f[i]=o.getFoldWidget(i))}if(m){g="ace_fold-widget ace_"+m;"start"==m&&i==p&&i<n.end.row?g+=" ace_closed":g+=" ace_open",l.className!=g&&(l.className=g);var v=t.lineHeight+"px";r.setStyle(l.style,"height",v),r.setStyle(l.style,"display","inline-block")}else l&&r.setStyle(l.style,"display","none");var y=(d?d.getText(o,i):i+u).toString();return y!==a.data&&(a.data=y),r.setStyle(e.element.style,"height",this.$lines.computeLineHeight(i,t,o)+"px"),r.setStyle(e.element.style,"top",this.$lines.computeLineTop(i,t,o)+"px"),e.text=y,e},this.$fixedWidth=!1,this.$highlightGutterLine=!0,this.$renderer="",this.setHighlightGutterLine=function(e){this.$highlightGutterLine=e},this.$showLineNumbers=!0,this.$renderer="",this.setShowLineNumbers=function(e){this.$renderer=!e&&{getWidth:function(){return 0},getText:function(){return""}}},this.getShowLineNumbers=function(){return this.$showLineNumbers},this.$showFoldWidgets=!0,this.setShowFoldWidgets=function(e){e?r.addCssClass(this.element,"ace_folding-enabled"):r.removeCssClass(this.element,"ace_folding-enabled"),this.$showFoldWidgets=e,this.$padding=null},this.getShowFoldWidgets=function(){return this.$showFoldWidgets},this.$computePadding=function(){if(!this.element.firstChild)return{left:0,right:0};var e=r.computedStyle(this.element.firstChild);return this.$padding={},this.$padding.left=(parseInt(e.borderLeftWidth)||0)+(parseInt(e.paddingLeft)||0)+1,this.$padding.right=(parseInt(e.borderRightWidth)||0)+(parseInt(e.paddingRight)||0),this.$padding},this.getRegion=function(e){var t=this.$padding||this.$computePadding(),n=this.element.getBoundingClientRect();return e.x<t.left+n.left?"markers":this.$showFoldWidgets&&e.x>n.right-t.right?"foldWidgets":void 0}}).call(u.prototype),t.Gutter=u})),ace.define("ace/layer/marker",["require","exports","module","ace/range","ace/lib/dom"],(function(e,t,n){"use strict";var i=e("../range").Range,r=e("../lib/dom"),s=function(e){this.element=r.createElement("div"),this.element.className="ace_layer ace_marker-layer",e.appendChild(this.element)};(function(){function e(e,t,n,i){return(e?1:0)|(t?2:0)|(n?4:0)|(i?8:0)}this.$padding=0,this.setPadding=function(e){this.$padding=e},this.setSession=function(e){this.session=e},this.setMarkers=function(e){this.markers=e},this.elt=function(e,t){var n=-1!=this.i&&this.element.childNodes[this.i];n?this.i++:(n=document.createElement("div"),this.element.appendChild(n),this.i=-1),n.style.cssText=t,n.className=e},this.update=function(e){if(e){var t;for(var n in this.config=e,this.i=0,this.markers){var i=this.markers[n];if(i.range){var r=i.range.clipRows(e.firstRow,e.lastRow);if(!r.isEmpty())if(r=r.toScreenRange(this.session),i.renderer){var s=this.$getTop(r.start.row,e),o=this.$padding+r.start.column*e.characterWidth;i.renderer(t,r,o,s,e)}else"fullLine"==i.type?this.drawFullLineMarker(t,r,i.clazz,e):"screenLine"==i.type?this.drawScreenLineMarker(t,r,i.clazz,e):r.isMultiLine()?"text"==i.type?this.drawTextMarker(t,r,i.clazz,e):this.drawMultiLineMarker(t,r,i.clazz,e):this.drawSingleLineMarker(t,r,i.clazz+" ace_start ace_br15",e)}else i.update(t,this,this.session,e)}if(-1!=this.i)for(;this.i<this.element.childElementCount;)this.element.removeChild(this.element.lastChild)}},this.$getTop=function(e,t){return(e-t.firstRowScreen)*t.lineHeight},this.drawTextMarker=function(t,n,r,s,o){for(var a=this.session,l=n.start.row,u=n.end.row,c=l,h=0,d=0,f=a.getScreenLastRowColumn(c),p=new i(c,n.start.column,c,d);c<=u;c++)p.start.row=p.end.row=c,p.start.column=c==l?n.start.column:a.getRowWrapIndent(c),p.end.column=f,h=d,d=f,f=c+1<u?a.getScreenLastRowColumn(c+1):c==u?0:n.end.column,this.drawSingleLineMarker(t,p,r+(c==l?" ace_start":"")+" ace_br"+e(c==l||c==l+1&&n.start.column,h<d,d>f,c==u),s,c==u?0:1,o)},this.drawMultiLineMarker=function(e,t,n,i,r){var s=this.$padding,o=i.lineHeight,a=this.$getTop(t.start.row,i),l=s+t.start.column*i.characterWidth;(r=r||"",this.session.$bidiHandler.isBidiRow(t.start.row))?((u=t.clone()).end.row=u.start.row,u.end.column=this.session.getLine(u.start.row).length,this.drawBidiSingleLineMarker(e,u,n+" ace_br1 ace_start",i,null,r)):this.elt(n+" ace_br1 ace_start","height:"+o+"px;right:0;top:"+a+"px;left:"+l+"px;"+(r||""));if(this.session.$bidiHandler.isBidiRow(t.end.row)){var u;(u=t.clone()).start.row=u.end.row,u.start.column=0,this.drawBidiSingleLineMarker(e,u,n+" ace_br12",i,null,r)}else{a=this.$getTop(t.end.row,i);var c=t.end.column*i.characterWidth;this.elt(n+" ace_br12","height:"+o+"px;width:"+c+"px;top:"+a+"px;left:"+s+"px;"+(r||""))}if(!((o=(t.end.row-t.start.row-1)*i.lineHeight)<=0)){a=this.$getTop(t.start.row+1,i);var h=(t.start.column?1:0)|(t.end.column?0:8);this.elt(n+(h?" ace_br"+h:""),"height:"+o+"px;right:0;top:"+a+"px;left:"+s+"px;"+(r||""))}},this.drawSingleLineMarker=function(e,t,n,i,r,s){if(this.session.$bidiHandler.isBidiRow(t.start.row))return this.drawBidiSingleLineMarker(e,t,n,i,r,s);var o=i.lineHeight,a=(t.end.column+(r||0)-t.start.column)*i.characterWidth,l=this.$getTop(t.start.row,i),u=this.$padding+t.start.column*i.characterWidth;this.elt(n,"height:"+o+"px;width:"+a+"px;top:"+l+"px;left:"+u+"px;"+(s||""))},this.drawBidiSingleLineMarker=function(e,t,n,i,r,s){var o=i.lineHeight,a=this.$getTop(t.start.row,i),l=this.$padding;this.session.$bidiHandler.getSelections(t.start.column,t.end.column).forEach((function(e){this.elt(n,"height:"+o+"px;width:"+e.width+(r||0)+"px;top:"+a+"px;left:"+(l+e.left)+"px;"+(s||""))}),this)},this.drawFullLineMarker=function(e,t,n,i,r){var s=this.$getTop(t.start.row,i),o=i.lineHeight;t.start.row!=t.end.row&&(o+=this.$getTop(t.end.row,i)-s),this.elt(n,"height:"+o+"px;top:"+s+"px;left:0;right:0;"+(r||""))},this.drawScreenLineMarker=function(e,t,n,i,r){var s=this.$getTop(t.start.row,i),o=i.lineHeight;this.elt(n,"height:"+o+"px;top:"+s+"px;left:0;right:0;"+(r||""))}}).call(s.prototype),t.Marker=s})),ace.define("ace/layer/text",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/lang","ace/layer/lines","ace/lib/event_emitter"],(function(e,t,n){"use strict";var i=e("../lib/oop"),r=e("../lib/dom"),s=e("../lib/lang"),o=e("./lines").Lines,a=e("../lib/event_emitter").EventEmitter,l=function(e){this.dom=r,this.element=this.dom.createElement("div"),this.element.className="ace_layer ace_text-layer",e.appendChild(this.element),this.$updateEolChar=this.$updateEolChar.bind(this),this.$lines=new o(this.element)};(function(){i.implement(this,a),this.EOF_CHAR="¶",this.EOL_CHAR_LF="¬",this.EOL_CHAR_CRLF="¤",this.EOL_CHAR=this.EOL_CHAR_LF,this.TAB_CHAR="—",this.SPACE_CHAR="·",this.$padding=0,this.MAX_LINE_LENGTH=1e4,this.$updateEolChar=function(){var e=this.session.doc,t="\n"==e.getNewLineCharacter()&&"windows"!=e.getNewLineMode()?this.EOL_CHAR_LF:this.EOL_CHAR_CRLF;if(this.EOL_CHAR!=t)return this.EOL_CHAR=t,!0},this.setPadding=function(e){this.$padding=e,this.element.style.margin="0 "+e+"px"},this.getLineHeight=function(){return this.$fontMetrics.$characterSize.height||0},this.getCharacterWidth=function(){return this.$fontMetrics.$characterSize.width||0},this.$setFontMetrics=function(e){this.$fontMetrics=e,this.$fontMetrics.on("changeCharacterSize",function(e){this._signal("changeCharacterSize",e)}.bind(this)),this.$pollSizeChanges()},this.checkForSizeChanges=function(){this.$fontMetrics.checkForSizeChanges()},this.$pollSizeChanges=function(){return this.$pollSizeChangesTimer=this.$fontMetrics.$pollSizeChanges()},this.setSession=function(e){this.session=e,e&&this.$computeTabString()},this.showInvisibles=!1,this.setShowInvisibles=function(e){return this.showInvisibles!=e&&(this.showInvisibles=e,this.$computeTabString(),!0)},this.displayIndentGuides=!0,this.setDisplayIndentGuides=function(e){return this.displayIndentGuides!=e&&(this.displayIndentGuides=e,this.$computeTabString(),!0)},this.$tabStrings=[],this.onChangeTabSize=this.$computeTabString=function(){var e=this.session.getTabSize();this.tabSize=e;for(var t=this.$tabStrings=[0],n=1;n<e+1;n++)if(this.showInvisibles){(i=this.dom.createElement("span")).className="ace_invisible ace_invisible_tab",i.textContent=s.stringRepeat(this.TAB_CHAR,n),t.push(i)}else t.push(this.dom.createTextNode(s.stringRepeat(" ",n),this.element));if(this.displayIndentGuides){this.$indentGuideRe=/\s\S| \t|\t |\s$/;var i,r="ace_indent-guide",o="",a="";if(this.showInvisibles){r+=" ace_invisible",o=" ace_invisible_space",a=" ace_invisible_tab";var l=s.stringRepeat(this.SPACE_CHAR,this.tabSize),u=s.stringRepeat(this.TAB_CHAR,this.tabSize)}else u=l=s.stringRepeat(" ",this.tabSize);(i=this.dom.createElement("span")).className=r+o,i.textContent=l,this.$tabStrings[" "]=i,(i=this.dom.createElement("span")).className=r+a,i.textContent=u,this.$tabStrings["\t"]=i}},this.updateLines=function(e,t,n){if(this.config.lastRow!=e.lastRow||this.config.firstRow!=e.firstRow)return this.update(e);this.config=e;for(var i=Math.max(t,e.firstRow),r=Math.min(n,e.lastRow),s=this.element.childNodes,o=0,a=e.firstRow;a<i;a++){if(l=this.session.getFoldLine(a)){if(l.containsRow(i)){i=l.start.row;break}a=l.end.row}o++}for(var l,u=!1,c=(a=i,(l=this.session.getNextFoldLine(a))?l.start.row:1/0);a>c&&(a=l.end.row+1,c=(l=this.session.getNextFoldLine(a,l))?l.start.row:1/0),!(a>r);){var h=s[o++];if(h){this.dom.removeChildren(h),this.$renderLine(h,a,a==c&&l);var d=e.lineHeight*this.session.getRowLength(a)+"px";h.style.height!=d&&(u=!0,h.style.height=d)}a++}if(u)for(;o<this.$lines.cells.length;){var f=this.$lines.cells[o++];f.element.style.top=this.$lines.computeLineTop(f.row,e,this.session)+"px"}},this.scrollLines=function(e){var t=this.config;if(this.config=e,this.$lines.pageChanged(t,e))return this.update(e);this.$lines.moveContainer(e);var n=e.lastRow,i=t?t.lastRow:-1;if(!t||i<e.firstRow)return this.update(e);if(n<t.firstRow)return this.update(e);if(!t||t.lastRow<e.firstRow)return this.update(e);if(e.lastRow<t.firstRow)return this.update(e);if(t.firstRow<e.firstRow)for(var r=this.session.getFoldedRowCount(t.firstRow,e.firstRow-1);r>0;r--)this.$lines.shift();if(t.lastRow>e.lastRow)for(r=this.session.getFoldedRowCount(e.lastRow+1,t.lastRow);r>0;r--)this.$lines.pop();e.firstRow<t.firstRow&&this.$lines.unshift(this.$renderLinesFragment(e,e.firstRow,t.firstRow-1)),e.lastRow>t.lastRow&&this.$lines.push(this.$renderLinesFragment(e,t.lastRow+1,e.lastRow))},this.$renderLinesFragment=function(e,t,n){for(var i=[],s=t,o=this.session.getNextFoldLine(s),a=o?o.start.row:1/0;s>a&&(s=o.end.row+1,a=(o=this.session.getNextFoldLine(s,o))?o.start.row:1/0),!(s>n);){var l=this.$lines.createCell(s,e,this.session),u=l.element;this.dom.removeChildren(u),r.setStyle(u.style,"height",this.$lines.computeLineHeight(s,e,this.session)+"px"),r.setStyle(u.style,"top",this.$lines.computeLineTop(s,e,this.session)+"px"),this.$renderLine(u,s,s==a&&o),this.$useLineGroups()?u.className="ace_line_group":u.className="ace_line",i.push(l),s++}return i},this.update=function(e){this.$lines.moveContainer(e),this.config=e;for(var t=e.firstRow,n=e.lastRow,i=this.$lines;i.getLength();)i.pop();i.push(this.$renderLinesFragment(e,t,n))},this.$textToken={text:!0,rparen:!0,lparen:!0},this.$renderToken=function(e,t,n,i){for(var o,a=this,l=/(\t)|( +)|([\x00-\x1f\x80-\xa0\xad\u1680\u180E\u2000-\u200f\u2028\u2029\u202F\u205F\uFEFF\uFFF9-\uFFFC]+)|(\u3000)|([\u1100-\u115F\u11A3-\u11A7\u11FA-\u11FF\u2329-\u232A\u2E80-\u2E99\u2E9B-\u2EF3\u2F00-\u2FD5\u2FF0-\u2FFB\u3001-\u303E\u3041-\u3096\u3099-\u30FF\u3105-\u312D\u3131-\u318E\u3190-\u31BA\u31C0-\u31E3\u31F0-\u321E\u3220-\u3247\u3250-\u32FE\u3300-\u4DBF\u4E00-\uA48C\uA490-\uA4C6\uA960-\uA97C\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFAFF\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE66\uFE68-\uFE6B\uFF01-\uFF60\uFFE0-\uFFE6]|[\uD800-\uDBFF][\uDC00-\uDFFF])/g,u=this.dom.createFragment(this.element),c=0;o=l.exec(i);){var h=o[1],d=o[2],f=o[3],p=o[4],g=o[5];if(a.showInvisibles||!d){var m=c!=o.index?i.slice(c,o.index):"";if(c=o.index+o[0].length,m&&u.appendChild(this.dom.createTextNode(m,this.element)),h){var v=a.session.getScreenTabSize(t+o.index);u.appendChild(a.$tabStrings[v].cloneNode(!0)),t+=v-1}else if(d)if(a.showInvisibles){($=this.dom.createElement("span")).className="ace_invisible ace_invisible_space",$.textContent=s.stringRepeat(a.SPACE_CHAR,d.length),u.appendChild($)}else u.appendChild(this.com.createTextNode(d,this.element));else if(f){($=this.dom.createElement("span")).className="ace_invisible ace_invisible_space ace_invalid",$.textContent=s.stringRepeat(a.SPACE_CHAR,f.length),u.appendChild($)}else if(p){a.showInvisibles&&a.SPACE_CHAR;t+=1,($=this.dom.createElement("span")).style.width=2*a.config.characterWidth+"px",$.className=a.showInvisibles?"ace_cjk ace_invisible ace_invisible_space":"ace_cjk",$.textContent=a.showInvisibles?a.SPACE_CHAR:"",u.appendChild($)}else if(g){t+=1,($=r.createElement("span")).style.width=2*a.config.characterWidth+"px",$.className="ace_cjk",$.textContent=g,u.appendChild($)}}}if(u.appendChild(this.dom.createTextNode(c?i.slice(c):i,this.element)),this.$textToken[n.type])e.appendChild(u);else{var y="ace_"+n.type.replace(/\./g," ace_"),$=this.dom.createElement("span");"fold"==n.type&&($.style.width=n.value.length*this.config.characterWidth+"px"),$.className=y,$.appendChild(u),e.appendChild($)}return t+i.length},this.renderIndentGuide=function(e,t,n){var i=t.search(this.$indentGuideRe);if(i<=0||i>=n)return t;if(" "==t[0]){for(var r=(i-=i%this.tabSize)/this.tabSize,s=0;s<r;s++)e.appendChild(this.$tabStrings[" "].cloneNode(!0));return t.substr(i)}if("\t"==t[0]){for(s=0;s<i;s++)e.appendChild(this.$tabStrings["\t"].cloneNode(!0));return t.substr(i)}return t},this.$createLineElement=function(e){var t=this.dom.createElement("div");return t.className="ace_line",t.style.height=this.config.lineHeight+"px",t},this.$renderWrappedLine=function(e,t,n){var i=0,r=0,o=n[0],a=0,l=this.$createLineElement();e.appendChild(l);for(var u=0;u<t.length;u++){var c=t[u],h=c.value;if(0==u&&this.displayIndentGuides){if(i=h.length,!(h=this.renderIndentGuide(l,h,o)))continue;i-=h.length}if(i+h.length<o)a=this.$renderToken(l,a,c,h),i+=h.length;else{for(;i+h.length>=o;)a=this.$renderToken(l,a,c,h.substring(0,o-i)),h=h.substring(o-i),i=o,l=this.$createLineElement(),e.appendChild(l),l.appendChild(this.dom.createTextNode(s.stringRepeat(" ",n.indent),this.element)),a=0,o=n[++r]||Number.MAX_VALUE;0!=h.length&&(i+=h.length,a=this.$renderToken(l,a,c,h))}}},this.$renderSimpleLine=function(e,t){var n=0,i=t[0],r=i.value;this.displayIndentGuides&&(r=this.renderIndentGuide(e,r)),r&&(n=this.$renderToken(e,n,i,r));for(var s=1;s<t.length;s++){if(n+(r=(i=t[s]).value).length>this.MAX_LINE_LENGTH)return this.$renderOverflowMessage(e,n,i,r);n=this.$renderToken(e,n,i,r)}},this.$renderOverflowMessage=function(e,t,n,i){this.$renderToken(e,t,n,i.slice(0,this.MAX_LINE_LENGTH-t));var r=this.dom.createElement("span");r.className="ace_inline_button ace_keyword ace_toggle_wrap",r.style.position="absolute",r.style.right="0",r.textContent="<click to see more...>",e.appendChild(r)},this.$renderLine=function(e,t,n){if(!n&&0!=n&&(n=this.session.getFoldLine(t)),n)var i=this.$getFoldLineTokens(t,n);else i=this.session.getTokens(t);var r=e;if(i.length){var s=this.session.getRowSplitData(t);if(s&&s.length){this.$renderWrappedLine(e,i,s);r=e.lastChild}else{r=e;this.$useLineGroups()&&(r=this.$createLineElement(),e.appendChild(r)),this.$renderSimpleLine(r,i)}}else this.$useLineGroups()&&(r=this.$createLineElement(),e.appendChild(r));if(this.showInvisibles&&r){n&&(t=n.end.row);var o=this.dom.createElement("span");o.className="ace_invisible ace_invisible_eol",o.textContent=t==this.session.getLength()-1?this.EOF_CHAR:this.EOL_CHAR,r.appendChild(o)}},this.$getFoldLineTokens=function(e,t){var n=this.session,i=[],r=n.getTokens(e);return t.walk((function(e,t,s,o,a){null!=e?i.push({type:"fold",value:e}):(a&&(r=n.getTokens(t)),r.length&&function(e,t,n){for(var r=0,s=0;s+e[r].value.length<t;)if(s+=e[r].value.length,++r==e.length)return;for(s!=t&&((o=e[r].value.substring(t-s)).length>n-t&&(o=o.substring(0,n-t)),i.push({type:e[r].type,value:o}),s=t+o.length,r+=1);s<n&&r<e.length;){var o;(o=e[r].value).length+s>n?i.push({type:e[r].type,value:o.substring(0,n-s)}):i.push(e[r]),s+=o.length,r+=1}}(r,o,s))}),t.end.row,this.session.getLine(t.end.row).length),i},this.$useLineGroups=function(){return this.session.getUseWrapMode()},this.destroy=function(){}}).call(l.prototype),t.Text=l})),ace.define("ace/layer/cursor",["require","exports","module","ace/lib/dom"],(function(e,t,n){"use strict";var i=e("../lib/dom"),r=function(e){this.element=i.createElement("div"),this.element.className="ace_layer ace_cursor-layer",e.appendChild(this.element),this.isVisible=!1,this.isBlinking=!0,this.blinkInterval=1e3,this.smoothBlinking=!1,this.cursors=[],this.cursor=this.addCursor(),i.addCssClass(this.element,"ace_hidden-cursors"),this.$updateCursors=this.$updateOpacity.bind(this)};(function(){this.$updateOpacity=function(e){for(var t=this.cursors,n=t.length;n--;)i.setStyle(t[n].style,"opacity",e?"":"0")},this.$startCssAnimation=function(){for(var e=this.cursors,t=e.length;t--;)e[t].style.animationDuration=this.blinkInterval+"ms";setTimeout(function(){i.addCssClass(this.element,"ace_animate-blinking")}.bind(this))},this.$stopCssAnimation=function(){i.removeCssClass(this.element,"ace_animate-blinking")},this.$padding=0,this.setPadding=function(e){this.$padding=e},this.setSession=function(e){this.session=e},this.setBlinking=function(e){e!=this.isBlinking&&(this.isBlinking=e,this.restartTimer())},this.setBlinkInterval=function(e){e!=this.blinkInterval&&(this.blinkInterval=e,this.restartTimer())},this.setSmoothBlinking=function(e){e!=this.smoothBlinking&&(this.smoothBlinking=e,i.setCssClass(this.element,"ace_smooth-blinking",e),this.$updateCursors(!0),this.restartTimer())},this.addCursor=function(){var e=i.createElement("div");return e.className="ace_cursor",this.element.appendChild(e),this.cursors.push(e),e},this.removeCursor=function(){if(this.cursors.length>1){var e=this.cursors.pop();return e.parentNode.removeChild(e),e}},this.hideCursor=function(){this.isVisible=!1,i.addCssClass(this.element,"ace_hidden-cursors"),this.restartTimer()},this.showCursor=function(){this.isVisible=!0,i.removeCssClass(this.element,"ace_hidden-cursors"),this.restartTimer()},this.restartTimer=function(){var e=this.$updateCursors;if(clearInterval(this.intervalId),clearTimeout(this.timeoutId),this.$stopCssAnimation(),this.smoothBlinking&&i.removeCssClass(this.element,"ace_smooth-blinking"),e(!0),this.isBlinking&&this.blinkInterval&&this.isVisible)if(this.smoothBlinking&&setTimeout(function(){i.addCssClass(this.element,"ace_smooth-blinking")}.bind(this)),i.HAS_CSS_ANIMATION)this.$startCssAnimation();else{var t=function(){this.timeoutId=setTimeout((function(){e(!1)}),.6*this.blinkInterval)}.bind(this);this.intervalId=setInterval((function(){e(!0),t()}),this.blinkInterval),t()}else this.$stopCssAnimation()},this.getPixelPosition=function(e,t){if(!this.config||!this.session)return{left:0,top:0};e||(e=this.session.selection.getCursor());var n=this.session.documentToScreenPosition(e);return{left:this.$padding+(this.session.$bidiHandler.isBidiRow(n.row,e.row)?this.session.$bidiHandler.getPosLeft(n.column):n.column*this.config.characterWidth),top:(n.row-(t?this.config.firstRowScreen:0))*this.config.lineHeight}},this.isCursorInView=function(e,t){return e.top>=0&&e.top<t.maxHeight},this.update=function(e){this.config=e;var t=this.session.$selectionMarkers,n=0,r=0;void 0!==t&&0!==t.length||(t=[{cursor:null}]);n=0;for(var s=t.length;n<s;n++){var o=this.getPixelPosition(t[n].cursor,!0);if(!((o.top>e.height+e.offset||o.top<0)&&n>1)){var a=this.cursors[r++]||this.addCursor(),l=a.style;this.drawCursor?this.drawCursor(a,o,e,t[n],this.session):this.isCursorInView(o,e)?(i.setStyle(l,"display","block"),i.translate(a,o.left,o.top),i.setStyle(l,"width",Math.round(e.characterWidth)+"px"),i.setStyle(l,"height",e.lineHeight+"px")):i.setStyle(l,"display","none")}}for(;this.cursors.length>r;)this.removeCursor();var u=this.session.getOverwrite();this.$setOverwrite(u),this.$pixelPos=o,this.restartTimer()},this.drawCursor=null,this.$setOverwrite=function(e){e!=this.overwrite&&(this.overwrite=e,e?i.addCssClass(this.element,"ace_overwrite-cursors"):i.removeCssClass(this.element,"ace_overwrite-cursors"))},this.destroy=function(){clearInterval(this.intervalId),clearTimeout(this.timeoutId)}}).call(r.prototype),t.Cursor=r})),ace.define("ace/scrollbar",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/event","ace/lib/event_emitter"],(function(e,t,n){"use strict";var i=e("./lib/oop"),r=e("./lib/dom"),s=e("./lib/event"),o=e("./lib/event_emitter").EventEmitter,a=32768,l=function(e){this.element=r.createElement("div"),this.element.className="ace_scrollbar ace_scrollbar"+this.classSuffix,this.inner=r.createElement("div"),this.inner.className="ace_scrollbar-inner",this.element.appendChild(this.inner),e.appendChild(this.element),this.setVisible(!1),this.skipEvent=!1,s.addListener(this.element,"scroll",this.onScroll.bind(this)),s.addListener(this.element,"mousedown",s.preventDefault)};(function(){i.implement(this,o),this.setVisible=function(e){this.element.style.display=e?"":"none",this.isVisible=e,this.coeff=1}}).call(l.prototype);var u=function(e,t){l.call(this,e),this.scrollTop=0,this.scrollHeight=0,t.$scrollbarWidth=this.width=r.scrollbarWidth(e.ownerDocument),this.inner.style.width=this.element.style.width=(this.width||15)+5+"px",this.$minWidth=0};i.inherits(u,l),function(){this.classSuffix="-v",this.onScroll=function(){if(!this.skipEvent){if(this.scrollTop=this.element.scrollTop,1!=this.coeff){var e=this.element.clientHeight/this.scrollHeight;this.scrollTop=this.scrollTop*(1-e)/(this.coeff-e)}this._emit("scroll",{data:this.scrollTop})}this.skipEvent=!1},this.getWidth=function(){return Math.max(this.isVisible?this.width:0,this.$minWidth||0)},this.setHeight=function(e){this.element.style.height=e+"px"},this.setInnerHeight=this.setScrollHeight=function(e){this.scrollHeight=e,e>a?(this.coeff=a/e,e=a):1!=this.coeff&&(this.coeff=1),this.inner.style.height=e+"px"},this.setScrollTop=function(e){this.scrollTop!=e&&(this.skipEvent=!0,this.scrollTop=e,this.element.scrollTop=e*this.coeff)}}.call(u.prototype);var c=function(e,t){l.call(this,e),this.scrollLeft=0,this.height=t.$scrollbarWidth,this.inner.style.height=this.element.style.height=(this.height||15)+5+"px"};i.inherits(c,l),function(){this.classSuffix="-h",this.onScroll=function(){this.skipEvent||(this.scrollLeft=this.element.scrollLeft,this._emit("scroll",{data:this.scrollLeft})),this.skipEvent=!1},this.getHeight=function(){return this.isVisible?this.height:0},this.setWidth=function(e){this.element.style.width=e+"px"},this.setInnerWidth=function(e){this.inner.style.width=e+"px"},this.setScrollWidth=function(e){this.inner.style.width=e+"px"},this.setScrollLeft=function(e){this.scrollLeft!=e&&(this.skipEvent=!0,this.scrollLeft=this.element.scrollLeft=e)}}.call(c.prototype),t.ScrollBar=u,t.ScrollBarV=u,t.ScrollBarH=c,t.VScrollBar=u,t.HScrollBar=c})),ace.define("ace/renderloop",["require","exports","module","ace/lib/event"],(function(e,t,n){"use strict";var i=e("./lib/event"),r=function(e,t){this.onRender=e,this.pending=!1,this.changes=0,this.$recursionLimit=2,this.window=t||window;var n=this;this._flush=function(e){n.pending=!1;var t=n.changes;if(t&&(i.blockIdle(100),n.changes=0,n.onRender(t)),n.changes){if(n.$recursionLimit--<0)return;n.schedule()}else n.$recursionLimit=2}};(function(){this.schedule=function(e){this.changes=this.changes|e,this.changes&&!this.pending&&(i.nextFrame(this._flush),this.pending=!0)},this.clear=function(e){var t=this.changes;return this.changes=0,t}}).call(r.prototype),t.RenderLoop=r})),ace.define("ace/layer/font_metrics",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/lang","ace/lib/event","ace/lib/useragent","ace/lib/event_emitter"],(function(e,t,n){var i=e("../lib/oop"),r=e("../lib/dom"),s=e("../lib/lang"),o=e("../lib/event"),a=e("../lib/useragent"),l=e("../lib/event_emitter").EventEmitter,u=256,c="function"==typeof ResizeObserver,h=200,d=t.FontMetrics=function(e){this.el=r.createElement("div"),this.$setMeasureNodeStyles(this.el.style,!0),this.$main=r.createElement("div"),this.$setMeasureNodeStyles(this.$main.style),this.$measureNode=r.createElement("div"),this.$setMeasureNodeStyles(this.$measureNode.style),this.el.appendChild(this.$main),this.el.appendChild(this.$measureNode),e.appendChild(this.el),this.$measureNode.innerHTML=s.stringRepeat("X",u),this.$characterSize={width:0,height:0},c?this.$addObserver():this.checkForSizeChanges()};(function(){i.implement(this,l),this.$characterSize={width:0,height:0},this.$setMeasureNodeStyles=function(e,t){e.width=e.height="auto",e.left=e.top="0px",e.visibility="hidden",e.position="absolute",e.whiteSpace="pre",a.isIE<8?e["font-family"]="inherit":e.font="inherit",e.overflow=t?"hidden":"visible"},this.checkForSizeChanges=function(e){if(void 0===e&&(e=this.$measureSizes()),e&&(this.$characterSize.width!==e.width||this.$characterSize.height!==e.height)){this.$measureNode.style.fontWeight="bold";var t=this.$measureSizes();this.$measureNode.style.fontWeight="",this.$characterSize=e,this.charSizes=Object.create(null),this.allowBoldFonts=t&&t.width===e.width&&t.height===e.height,this._emit("changeCharacterSize",{data:e})}},this.$addObserver=function(){var e=this;this.$observer=new window.ResizeObserver((function(t){var n=t[0].contentRect;e.checkForSizeChanges({height:n.height,width:n.width/u})})),this.$observer.observe(this.$measureNode)},this.$pollSizeChanges=function(){if(this.$pollSizeChangesTimer||this.$observer)return this.$pollSizeChangesTimer;var e=this;return this.$pollSizeChangesTimer=o.onIdle((function t(){e.checkForSizeChanges(),o.onIdle(t,500)}),500)},this.setPolling=function(e){e?this.$pollSizeChanges():this.$pollSizeChangesTimer&&(clearInterval(this.$pollSizeChangesTimer),this.$pollSizeChangesTimer=0)},this.$measureSizes=function(e){var t={height:(e||this.$measureNode).clientHeight,width:(e||this.$measureNode).clientWidth/u};return 0===t.width||0===t.height?null:t},this.$measureCharWidth=function(e){return this.$main.innerHTML=s.stringRepeat(e,u),this.$main.getBoundingClientRect().width/u},this.getCharacterWidth=function(e){var t=this.charSizes[e];return void 0===t&&(t=this.charSizes[e]=this.$measureCharWidth(e)/this.$characterSize.width),t},this.destroy=function(){clearInterval(this.$pollSizeChangesTimer),this.$observer&&this.$observer.disconnect(),this.el&&this.el.parentNode&&this.el.parentNode.removeChild(this.el)},this.$getZoom=function e(t){return t?(window.getComputedStyle(t).zoom||1)*e(t.parentElement):1},this.$initTransformMeasureNodes=function(){var e=function(e,t){return["div",{style:"position: absolute;top:"+e+"px;left:"+t+"px;"}]};this.els=r.buildDom([e(0,0),e(h,0),e(0,h),e(h,h)],this.el)},this.transformCoordinates=function(e,t){function n(e,t,n){var i=e[1]*t[0]-e[0]*t[1];return[(-t[1]*n[0]+t[0]*n[1])/i,(+e[1]*n[0]-e[0]*n[1])/i]}function i(e,t){return[e[0]-t[0],e[1]-t[1]]}function r(e,t){return[e[0]+t[0],e[1]+t[1]]}function s(e,t){return[e*t[0],e*t[1]]}function o(e){var t=e.getBoundingClientRect();return[t.left,t.top]}e&&(e=s(1/this.$getZoom(this.el),e));this.els||this.$initTransformMeasureNodes();var a=o(this.els[0]),l=o(this.els[1]),u=o(this.els[2]),c=o(this.els[3]),d=n(i(c,l),i(c,u),i(r(l,u),r(c,a))),f=s(1+d[0],i(l,a)),p=s(1+d[1],i(u,a));if(t){var g=t,m=d[0]*g[0]/h+d[1]*g[1]/h+1,v=r(s(g[0],f),s(g[1],p));return r(s(1/m/h,v),a)}var y=i(e,a),$=n(i(f,s(d[0],y)),i(p,s(d[1],y)),y);return s(h,$)}}).call(d.prototype)})),ace.define("ace/virtual_renderer",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/config","ace/layer/gutter","ace/layer/marker","ace/layer/text","ace/layer/cursor","ace/scrollbar","ace/scrollbar","ace/renderloop","ace/layer/font_metrics","ace/lib/event_emitter","ace/lib/useragent"],(function(e,t,n){"use strict";var i=e("./lib/oop"),r=e("./lib/dom"),s=e("./config"),o=e("./layer/gutter").Gutter,a=e("./layer/marker").Marker,l=e("./layer/text").Text,u=e("./layer/cursor").Cursor,c=e("./scrollbar").HScrollBar,h=e("./scrollbar").VScrollBar,d=e("./renderloop").RenderLoop,f=e("./layer/font_metrics").FontMetrics,p=e("./lib/event_emitter").EventEmitter,g='.ace_br1 {border-top-left-radius    : 3px;}.ace_br2 {border-top-right-radius   : 3px;}.ace_br3 {border-top-left-radius    : 3px; border-top-right-radius:    3px;}.ace_br4 {border-bottom-right-radius: 3px;}.ace_br5 {border-top-left-radius    : 3px; border-bottom-right-radius: 3px;}.ace_br6 {border-top-right-radius   : 3px; border-bottom-right-radius: 3px;}.ace_br7 {border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-right-radius: 3px;}.ace_br8 {border-bottom-left-radius : 3px;}.ace_br9 {border-top-left-radius    : 3px; border-bottom-left-radius:  3px;}.ace_br10{border-top-right-radius   : 3px; border-bottom-left-radius:  3px;}.ace_br11{border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-left-radius:  3px;}.ace_br12{border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}.ace_br13{border-top-left-radius    : 3px; border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}.ace_br14{border-top-right-radius   : 3px; border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}.ace_br15{border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px;}.ace_editor {position: relative;overflow: hidden;font: 12px/normal \'Monaco\', \'Menlo\', \'Ubuntu Mono\', \'Consolas\', \'source-code-pro\', monospace;direction: ltr;text-align: left;-webkit-tap-highlight-color: rgba(0, 0, 0, 0);}.ace_scroller {position: absolute;overflow: hidden;top: 0;bottom: 0;background-color: inherit;-ms-user-select: none;-moz-user-select: none;-webkit-user-select: none;user-select: none;cursor: text;}.ace_content {position: absolute;box-sizing: border-box;min-width: 100%;contain: style size layout;}.ace_dragging .ace_scroller:before{position: absolute;top: 0;left: 0;right: 0;bottom: 0;content: \'\';background: rgba(250, 250, 250, 0.01);z-index: 1000;}.ace_dragging.ace_dark .ace_scroller:before{background: rgba(0, 0, 0, 0.01);}.ace_selecting, .ace_selecting * {cursor: text !important;}.ace_gutter {position: absolute;overflow : hidden;width: auto;top: 0;bottom: 0;left: 0;cursor: default;z-index: 4;-ms-user-select: none;-moz-user-select: none;-webkit-user-select: none;user-select: none;contain: style size layout;}.ace_gutter-active-line {position: absolute;left: 0;right: 0;}.ace_scroller.ace_scroll-left {box-shadow: 17px 0 16px -16px rgba(0, 0, 0, 0.4) inset;}.ace_gutter-cell {position: absolute;top: 0;left: 0;right: 0;padding-left: 19px;padding-right: 6px;background-repeat: no-repeat;}.ace_gutter-cell.ace_error {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAABOFBMVEX/////////QRswFAb/Ui4wFAYwFAYwFAaWGAfDRymzOSH/PxswFAb/SiUwFAYwFAbUPRvjQiDllog5HhHdRybsTi3/Tyv9Tir+Syj/UC3////XurebMBIwFAb/RSHbPx/gUzfdwL3kzMivKBAwFAbbvbnhPx66NhowFAYwFAaZJg8wFAaxKBDZurf/RB6mMxb/SCMwFAYwFAbxQB3+RB4wFAb/Qhy4Oh+4QifbNRcwFAYwFAYwFAb/QRzdNhgwFAYwFAbav7v/Uy7oaE68MBK5LxLewr/r2NXewLswFAaxJw4wFAbkPRy2PyYwFAaxKhLm1tMwFAazPiQwFAaUGAb/QBrfOx3bvrv/VC/maE4wFAbRPBq6MRO8Qynew8Dp2tjfwb0wFAbx6eju5+by6uns4uH9/f36+vr/GkHjAAAAYnRSTlMAGt+64rnWu/bo8eAA4InH3+DwoN7j4eLi4xP99Nfg4+b+/u9B/eDs1MD1mO7+4PHg2MXa347g7vDizMLN4eG+Pv7i5evs/v79yu7S3/DV7/498Yv24eH+4ufQ3Ozu/v7+y13sRqwAAADLSURBVHjaZc/XDsFgGIBhtDrshlitmk2IrbHFqL2pvXf/+78DPokj7+Fz9qpU/9UXJIlhmPaTaQ6QPaz0mm+5gwkgovcV6GZzd5JtCQwgsxoHOvJO15kleRLAnMgHFIESUEPmawB9ngmelTtipwwfASilxOLyiV5UVUyVAfbG0cCPHig+GBkzAENHS0AstVF6bacZIOzgLmxsHbt2OecNgJC83JERmePUYq8ARGkJx6XtFsdddBQgZE2nPR6CICZhawjA4Fb/chv+399kfR+MMMDGOQAAAABJRU5ErkJggg==");background-repeat: no-repeat;background-position: 2px center;}.ace_gutter-cell.ace_warning {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAmVBMVEX///8AAAD///8AAAAAAABPSzb/5sAAAAB/blH/73z/ulkAAAAAAAD85pkAAAAAAAACAgP/vGz/rkDerGbGrV7/pkQICAf////e0IsAAAD/oED/qTvhrnUAAAD/yHD/njcAAADuv2r/nz//oTj/p064oGf/zHAAAAA9Nir/tFIAAAD/tlTiuWf/tkIAAACynXEAAAAAAAAtIRW7zBpBAAAAM3RSTlMAABR1m7RXO8Ln31Z36zT+neXe5OzooRDfn+TZ4p3h2hTf4t3k3ucyrN1K5+Xaks52Sfs9CXgrAAAAjklEQVR42o3PbQ+CIBQFYEwboPhSYgoYunIqqLn6/z8uYdH8Vmdnu9vz4WwXgN/xTPRD2+sgOcZjsge/whXZgUaYYvT8QnuJaUrjrHUQreGczuEafQCO/SJTufTbroWsPgsllVhq3wJEk2jUSzX3CUEDJC84707djRc5MTAQxoLgupWRwW6UB5fS++NV8AbOZgnsC7BpEAAAAABJRU5ErkJggg==");background-position: 2px center;}.ace_gutter-cell.ace_info {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAJ0Uk5TAAB2k804AAAAPklEQVQY02NgIB68QuO3tiLznjAwpKTgNyDbMegwisCHZUETUZV0ZqOquBpXj2rtnpSJT1AEnnRmL2OgGgAAIKkRQap2htgAAAAASUVORK5CYII=");background-position: 2px center;}.ace_dark .ace_gutter-cell.ace_info {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAJFBMVEUAAAChoaGAgIAqKiq+vr6tra1ZWVmUlJSbm5s8PDxubm56enrdgzg3AAAAAXRSTlMAQObYZgAAAClJREFUeNpjYMAPdsMYHegyJZFQBlsUlMFVCWUYKkAZMxZAGdxlDMQBAG+TBP4B6RyJAAAAAElFTkSuQmCC");}.ace_scrollbar {contain: strict;position: absolute;right: 0;bottom: 0;z-index: 6;}.ace_scrollbar-inner {position: absolute;cursor: text;left: 0;top: 0;}.ace_scrollbar-v{overflow-x: hidden;overflow-y: scroll;top: 0;}.ace_scrollbar-h {overflow-x: scroll;overflow-y: hidden;left: 0;}.ace_print-margin {position: absolute;height: 100%;}.ace_text-input {position: absolute;z-index: 0;width: 0.5em;height: 1em;opacity: 0;background: transparent;-moz-appearance: none;appearance: none;border: none;resize: none;outline: none;overflow: hidden;font: inherit;padding: 0 1px;margin: 0 -1px;contain: strict;-ms-user-select: text;-moz-user-select: text;-webkit-user-select: text;user-select: text;white-space: pre!important;}.ace_text-input.ace_composition {background: transparent;color: inherit;z-index: 1000;opacity: 1;}.ace_composition_placeholder { color: transparent }.ace_composition_marker { border-bottom: 1px solid;position: absolute;border-radius: 0;margin-top: 1px;}[ace_nocontext=true] {transform: none!important;filter: none!important;perspective: none!important;clip-path: none!important;mask : none!important;contain: none!important;perspective: none!important;mix-blend-mode: initial!important;z-index: auto;}.ace_layer {z-index: 1;position: absolute;overflow: hidden;word-wrap: normal;white-space: pre;height: 100%;width: 100%;box-sizing: border-box;pointer-events: none;}.ace_gutter-layer {position: relative;width: auto;text-align: right;pointer-events: auto;height: 1000000px;contain: style size layout;}.ace_text-layer {font: inherit !important;position: absolute;height: 1000000px;width: 1000000px;contain: style size layout;}.ace_text-layer > .ace_line, .ace_text-layer > .ace_line_group {contain: style size layout;position: absolute;top: 0;left: 0;right: 0;}.ace_hidpi .ace_text-layer,.ace_hidpi .ace_gutter-layer,.ace_hidpi .ace_content,.ace_hidpi .ace_gutter {contain: strict;will-change: transform;}.ace_hidpi .ace_text-layer > .ace_line, .ace_hidpi .ace_text-layer > .ace_line_group {contain: strict;}.ace_cjk {display: inline-block;text-align: center;}.ace_cursor-layer {z-index: 4;}.ace_cursor {z-index: 4;position: absolute;box-sizing: border-box;border-left: 2px solid;transform: translatez(0);}.ace_multiselect .ace_cursor {border-left-width: 1px;}.ace_slim-cursors .ace_cursor {border-left-width: 1px;}.ace_overwrite-cursors .ace_cursor {border-left-width: 0;border-bottom: 1px solid;}.ace_hidden-cursors .ace_cursor {opacity: 0.2;}.ace_smooth-blinking .ace_cursor {transition: opacity 0.18s;}.ace_animate-blinking .ace_cursor {animation-duration: 1000ms;animation-timing-function: step-end;animation-name: blink-ace-animate;animation-iteration-count: infinite;}.ace_animate-blinking.ace_smooth-blinking .ace_cursor {animation-duration: 1000ms;animation-timing-function: ease-in-out;animation-name: blink-ace-animate-smooth;}@keyframes blink-ace-animate {from, to { opacity: 1; }60% { opacity: 0; }}@keyframes blink-ace-animate-smooth {from, to { opacity: 1; }45% { opacity: 1; }60% { opacity: 0; }85% { opacity: 0; }}.ace_marker-layer .ace_step, .ace_marker-layer .ace_stack {position: absolute;z-index: 3;}.ace_marker-layer .ace_selection {position: absolute;z-index: 5;}.ace_marker-layer .ace_bracket {position: absolute;z-index: 6;}.ace_marker-layer .ace_active-line {position: absolute;z-index: 2;}.ace_marker-layer .ace_selected-word {position: absolute;z-index: 4;box-sizing: border-box;}.ace_line .ace_fold {box-sizing: border-box;display: inline-block;height: 11px;margin-top: -2px;vertical-align: middle;background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAAJCAYAAADU6McMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAJpJREFUeNpi/P//PwOlgAXGYGRklAVSokD8GmjwY1wasKljQpYACtpCFeADcHVQfQyMQAwzwAZI3wJKvCLkfKBaMSClBlR7BOQikCFGQEErIH0VqkabiGCAqwUadAzZJRxQr/0gwiXIal8zQQPnNVTgJ1TdawL0T5gBIP1MUJNhBv2HKoQHHjqNrA4WO4zY0glyNKLT2KIfIMAAQsdgGiXvgnYAAAAASUVORK5CYII="),url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAA3CAYAAADNNiA5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAACJJREFUeNpi+P//fxgTAwPDBxDxD078RSX+YeEyDFMCIMAAI3INmXiwf2YAAAAASUVORK5CYII=");background-repeat: no-repeat, repeat-x;background-position: center center, top left;color: transparent;border: 1px solid black;border-radius: 2px;cursor: pointer;pointer-events: auto;}.ace_dark .ace_fold {}.ace_fold:hover{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAAJCAYAAADU6McMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAJpJREFUeNpi/P//PwOlgAXGYGRklAVSokD8GmjwY1wasKljQpYACtpCFeADcHVQfQyMQAwzwAZI3wJKvCLkfKBaMSClBlR7BOQikCFGQEErIH0VqkabiGCAqwUadAzZJRxQr/0gwiXIal8zQQPnNVTgJ1TdawL0T5gBIP1MUJNhBv2HKoQHHjqNrA4WO4zY0glyNKLT2KIfIMAAQsdgGiXvgnYAAAAASUVORK5CYII="),url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAA3CAYAAADNNiA5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAACBJREFUeNpi+P//fz4TAwPDZxDxD5X4i5fLMEwJgAADAEPVDbjNw87ZAAAAAElFTkSuQmCC");}.ace_tooltip {background-color: #FFF;background-image: linear-gradient(to bottom, transparent, rgba(0, 0, 0, 0.1));border: 1px solid gray;border-radius: 1px;box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);color: black;max-width: 100%;padding: 3px 4px;position: fixed;z-index: 999999;box-sizing: border-box;cursor: default;white-space: pre;word-wrap: break-word;line-height: normal;font-style: normal;font-weight: normal;letter-spacing: normal;pointer-events: none;}.ace_folding-enabled > .ace_gutter-cell {padding-right: 13px;}.ace_fold-widget {box-sizing: border-box;margin: 0 -12px 0 1px;display: none;width: 11px;vertical-align: top;background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAANElEQVR42mWKsQ0AMAzC8ixLlrzQjzmBiEjp0A6WwBCSPgKAXoLkqSot7nN3yMwR7pZ32NzpKkVoDBUxKAAAAABJRU5ErkJggg==");background-repeat: no-repeat;background-position: center;border-radius: 3px;border: 1px solid transparent;cursor: pointer;}.ace_folding-enabled .ace_fold-widget {display: inline-block;   }.ace_fold-widget.ace_end {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAANElEQVR42m3HwQkAMAhD0YzsRchFKI7sAikeWkrxwScEB0nh5e7KTPWimZki4tYfVbX+MNl4pyZXejUO1QAAAABJRU5ErkJggg==");}.ace_fold-widget.ace_closed {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAGCAYAAAAG5SQMAAAAOUlEQVR42jXKwQkAMAgDwKwqKD4EwQ26sSOkVWjgIIHAzPiCgaqiqnJHZnKICBERHN194O5b9vbLuAVRL+l0YWnZAAAAAElFTkSuQmCCXA==");}.ace_fold-widget:hover {border: 1px solid rgba(0, 0, 0, 0.3);background-color: rgba(255, 255, 255, 0.2);box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);}.ace_fold-widget:active {border: 1px solid rgba(0, 0, 0, 0.4);background-color: rgba(0, 0, 0, 0.05);box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);}.ace_dark .ace_fold-widget {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHklEQVQIW2P4//8/AzoGEQ7oGCaLLAhWiSwB146BAQCSTPYocqT0AAAAAElFTkSuQmCC");}.ace_dark .ace_fold-widget.ace_end {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAH0lEQVQIW2P4//8/AxQ7wNjIAjDMgC4AxjCVKBirIAAF0kz2rlhxpAAAAABJRU5ErkJggg==");}.ace_dark .ace_fold-widget.ace_closed {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAFCAYAAACAcVaiAAAAHElEQVQIW2P4//+/AxAzgDADlOOAznHAKgPWAwARji8UIDTfQQAAAABJRU5ErkJggg==");}.ace_dark .ace_fold-widget:hover {box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2);background-color: rgba(255, 255, 255, 0.1);}.ace_dark .ace_fold-widget:active {box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2);}.ace_inline_button {border: 1px solid lightgray;display: inline-block;margin: -1px 8px;padding: 0 5px;pointer-events: auto;cursor: pointer;}.ace_inline_button:hover {border-color: gray;background: rgba(200,200,200,0.2);display: inline-block;pointer-events: auto;}.ace_fold-widget.ace_invalid {background-color: #FFB4B4;border-color: #DE5555;}.ace_fade-fold-widgets .ace_fold-widget {transition: opacity 0.4s ease 0.05s;opacity: 0;}.ace_fade-fold-widgets:hover .ace_fold-widget {transition: opacity 0.05s ease 0.05s;opacity:1;}.ace_underline {text-decoration: underline;}.ace_bold {font-weight: bold;}.ace_nobold .ace_bold {font-weight: normal;}.ace_italic {font-style: italic;}.ace_error-marker {background-color: rgba(255, 0, 0,0.2);position: absolute;z-index: 9;}.ace_highlight-marker {background-color: rgba(255, 255, 0,0.2);position: absolute;z-index: 8;}',m=e("./lib/useragent"),v=m.isIE;r.importCssString(g,"ace_editor.css");var y=function(e,t){var n=this;this.container=e||r.createElement("div"),r.addCssClass(this.container,"ace_editor"),r.HI_DPI&&r.addCssClass(this.container,"ace_hidpi"),this.setTheme(t),this.$gutter=r.createElement("div"),this.$gutter.className="ace_gutter",this.container.appendChild(this.$gutter),this.$gutter.setAttribute("aria-hidden",!0),this.scroller=r.createElement("div"),this.scroller.className="ace_scroller",this.container.appendChild(this.scroller),this.content=r.createElement("div"),this.content.className="ace_content",this.scroller.appendChild(this.content),this.$gutterLayer=new o(this.$gutter),this.$gutterLayer.on("changeGutterWidth",this.onGutterResize.bind(this)),this.$markerBack=new a(this.content);var i=this.$textLayer=new l(this.content);this.canvas=i.element,this.$markerFront=new a(this.content),this.$cursorLayer=new u(this.content),this.$horizScroll=!1,this.$vScroll=!1,this.scrollBar=this.scrollBarV=new h(this.container,this),this.scrollBarH=new c(this.container,this),this.scrollBarV.addEventListener("scroll",(function(e){n.$scrollAnimation||n.session.setScrollTop(e.data-n.scrollMargin.top)})),this.scrollBarH.addEventListener("scroll",(function(e){n.$scrollAnimation||n.session.setScrollLeft(e.data-n.scrollMargin.left)})),this.scrollTop=0,this.scrollLeft=0,this.cursorPos={row:0,column:0},this.$fontMetrics=new f(this.container),this.$textLayer.$setFontMetrics(this.$fontMetrics),this.$textLayer.addEventListener("changeCharacterSize",(function(e){n.updateCharacterSize(),n.onResize(!0,n.gutterWidth,n.$size.width,n.$size.height),n._signal("changeCharacterSize",e)})),this.$size={width:0,height:0,scrollerHeight:0,scrollerWidth:0,$dirty:!0},this.layerConfig={width:1,padding:0,firstRow:0,firstRowScreen:0,lastRow:0,lineHeight:0,characterWidth:0,minHeight:1,maxHeight:1,offset:0,height:1,gutterOffset:1},this.scrollMargin={left:0,right:0,top:0,bottom:0,v:0,h:0},this.margin={left:0,right:0,top:0,bottom:0,v:0,h:0},this.$keepTextAreaAtCursor=!m.isIOS,this.$loop=new d(this.$renderChanges.bind(this),this.container.ownerDocument.defaultView),this.$loop.schedule(this.CHANGE_FULL),this.updateCharacterSize(),this.setPadding(4),s.resetOptions(this),s._emit("renderer",this)};(function(){this.CHANGE_CURSOR=1,this.CHANGE_MARKER=2,this.CHANGE_GUTTER=4,this.CHANGE_SCROLL=8,this.CHANGE_LINES=16,this.CHANGE_TEXT=32,this.CHANGE_SIZE=64,this.CHANGE_MARKER_BACK=128,this.CHANGE_MARKER_FRONT=256,this.CHANGE_FULL=512,this.CHANGE_H_SCROLL=1024,i.implement(this,p),this.updateCharacterSize=function(){this.$textLayer.allowBoldFonts!=this.$allowBoldFonts&&(this.$allowBoldFonts=this.$textLayer.allowBoldFonts,this.setStyle("ace_nobold",!this.$allowBoldFonts)),this.layerConfig.characterWidth=this.characterWidth=this.$textLayer.getCharacterWidth(),this.layerConfig.lineHeight=this.lineHeight=this.$textLayer.getLineHeight(),this.$updatePrintMargin()},this.setSession=function(e){this.session&&this.session.doc.off("changeNewLineMode",this.onChangeNewLineMode),this.session=e,e&&this.scrollMargin.top&&e.getScrollTop()<=0&&e.setScrollTop(-this.scrollMargin.top),this.$cursorLayer.setSession(e),this.$markerBack.setSession(e),this.$markerFront.setSession(e),this.$gutterLayer.setSession(e),this.$textLayer.setSession(e),e&&(this.$loop.schedule(this.CHANGE_FULL),this.session.$setFontMetrics(this.$fontMetrics),this.scrollBarH.scrollLeft=this.scrollBarV.scrollTop=null,this.onChangeNewLineMode=this.onChangeNewLineMode.bind(this),this.onChangeNewLineMode(),this.session.doc.on("changeNewLineMode",this.onChangeNewLineMode))},this.updateLines=function(e,t,n){if(void 0===t&&(t=1/0),this.$changedLines?(this.$changedLines.firstRow>e&&(this.$changedLines.firstRow=e),this.$changedLines.lastRow<t&&(this.$changedLines.lastRow=t)):this.$changedLines={firstRow:e,lastRow:t},this.$changedLines.lastRow<this.layerConfig.firstRow){if(!n)return;this.$changedLines.lastRow=this.layerConfig.lastRow}this.$changedLines.firstRow>this.layerConfig.lastRow||this.$loop.schedule(this.CHANGE_LINES)},this.onChangeNewLineMode=function(){this.$loop.schedule(this.CHANGE_TEXT),this.$textLayer.$updateEolChar(),this.session.$bidiHandler.setEolChar(this.$textLayer.EOL_CHAR)},this.onChangeTabSize=function(){this.$loop.schedule(this.CHANGE_TEXT|this.CHANGE_MARKER),this.$textLayer.onChangeTabSize()},this.updateText=function(){this.$loop.schedule(this.CHANGE_TEXT)},this.updateFull=function(e){e?this.$renderChanges(this.CHANGE_FULL,!0):this.$loop.schedule(this.CHANGE_FULL)},this.updateFontSize=function(){this.$textLayer.checkForSizeChanges()},this.$changes=0,this.$updateSizeAsync=function(){this.$loop.pending?this.$size.$dirty=!0:this.onResize()},this.onResize=function(e,t,n,i){if(!(this.resizing>2)){this.resizing>0?this.resizing++:this.resizing=e?1:0;var r=this.container;i||(i=r.clientHeight||r.scrollHeight),n||(n=r.clientWidth||r.scrollWidth);var s=this.$updateCachedSize(e,t,n,i);if(!this.$size.scrollerHeight||!n&&!i)return this.resizing=0;e&&(this.$gutterLayer.$padding=null),e?this.$renderChanges(s|this.$changes,!0):this.$loop.schedule(s|this.$changes),this.resizing&&(this.resizing=0),this.scrollBarV.scrollLeft=this.scrollBarV.scrollTop=null}},this.$updateCachedSize=function(e,t,n,i){i-=this.$extraHeight||0;var s=0,o=this.$size,a={width:o.width,height:o.height,scrollerHeight:o.scrollerHeight,scrollerWidth:o.scrollerWidth};if(i&&(e||o.height!=i)&&(o.height=i,s|=this.CHANGE_SIZE,o.scrollerHeight=o.height,this.$horizScroll&&(o.scrollerHeight-=this.scrollBarH.getHeight()),this.scrollBarV.element.style.bottom=this.scrollBarH.getHeight()+"px",s|=this.CHANGE_SCROLL),n&&(e||o.width!=n)){s|=this.CHANGE_SIZE,o.width=n,null==t&&(t=this.$showGutter?this.$gutter.offsetWidth:0),this.gutterWidth=t,r.setStyle(this.scrollBarH.element.style,"left",t+"px"),r.setStyle(this.scroller.style,"left",t+this.margin.left+"px"),o.scrollerWidth=Math.max(0,n-t-this.scrollBarV.getWidth()-this.margin.h),r.setStyle(this.$gutter.style,"left",this.margin.left+"px");var l=this.scrollBarV.getWidth()+"px";r.setStyle(this.scrollBarH.element.style,"right",l),r.setStyle(this.scroller.style,"right",l),r.setStyle(this.scroller.style,"bottom",this.scrollBarH.getHeight()),(this.session&&this.session.getUseWrapMode()&&this.adjustWrapLimit()||e)&&(s|=this.CHANGE_FULL)}return o.$dirty=!n||!i,s&&this._signal("resize",a),s},this.onGutterResize=function(e){var t=this.$showGutter?e:0;t!=this.gutterWidth&&(this.$changes|=this.$updateCachedSize(!0,t,this.$size.width,this.$size.height)),this.session.getUseWrapMode()&&this.adjustWrapLimit()||this.$size.$dirty?this.$loop.schedule(this.CHANGE_FULL):this.$computeLayerConfig()},this.adjustWrapLimit=function(){var e=this.$size.scrollerWidth-2*this.$padding,t=Math.floor(e/this.characterWidth);return this.session.adjustWrapLimit(t,this.$showPrintMargin&&this.$printMarginColumn)},this.setAnimatedScroll=function(e){this.setOption("animatedScroll",e)},this.getAnimatedScroll=function(){return this.$animatedScroll},this.setShowInvisibles=function(e){this.setOption("showInvisibles",e),this.session.$bidiHandler.setShowInvisibles(e)},this.getShowInvisibles=function(){return this.getOption("showInvisibles")},this.getDisplayIndentGuides=function(){return this.getOption("displayIndentGuides")},this.setDisplayIndentGuides=function(e){this.setOption("displayIndentGuides",e)},this.setShowPrintMargin=function(e){this.setOption("showPrintMargin",e)},this.getShowPrintMargin=function(){return this.getOption("showPrintMargin")},this.setPrintMarginColumn=function(e){this.setOption("printMarginColumn",e)},this.getPrintMarginColumn=function(){return this.getOption("printMarginColumn")},this.getShowGutter=function(){return this.getOption("showGutter")},this.setShowGutter=function(e){return this.setOption("showGutter",e)},this.getFadeFoldWidgets=function(){return this.getOption("fadeFoldWidgets")},this.setFadeFoldWidgets=function(e){this.setOption("fadeFoldWidgets",e)},this.setHighlightGutterLine=function(e){this.setOption("highlightGutterLine",e)},this.getHighlightGutterLine=function(){return this.getOption("highlightGutterLine")},this.$updatePrintMargin=function(){if(this.$showPrintMargin||this.$printMarginEl){if(!this.$printMarginEl){var e=r.createElement("div");e.className="ace_layer ace_print-margin-layer",this.$printMarginEl=r.createElement("div"),this.$printMarginEl.className="ace_print-margin",e.appendChild(this.$printMarginEl),this.content.insertBefore(e,this.content.firstChild)}var t=this.$printMarginEl.style;t.left=Math.round(this.characterWidth*this.$printMarginColumn+this.$padding)+"px",t.visibility=this.$showPrintMargin?"visible":"hidden",this.session&&-1==this.session.$wrap&&this.adjustWrapLimit()}},this.getContainerElement=function(){return this.container},this.getMouseEventTarget=function(){return this.scroller},this.getTextAreaContainer=function(){return this.container},this.$moveTextAreaToCursor=function(){var e=this.textarea.style;if(this.$keepTextAreaAtCursor){var t=this.$cursorLayer.$pixelPos;if(t){var n=this.$composition;n&&n.markerRange&&(t=this.$cursorLayer.getPixelPosition(n.markerRange.start,!0));var i=this.layerConfig,s=t.top,o=t.left;s-=i.offset;var a=n&&n.useTextareaForIME?this.lineHeight:v?0:1;if(s<0||s>i.height-a)r.translate(this.textarea,0,0);else{var l=1;if(n)if(n.useTextareaForIME){var u=this.textarea.value;l=this.characterWidth*this.session.$getStringScreenWidth(u)[0],a+=2}else s+=this.lineHeight+2;else s+=this.lineHeight;(o-=this.scrollLeft)>this.$size.scrollerWidth-l&&(o=this.$size.scrollerWidth-l),o+=this.gutterWidth+this.margin.left,r.setStyle(e,"height",a+"px"),r.setStyle(e,"width",l+"px"),r.translate(this.textarea,Math.min(o,this.$size.scrollerWidth-l),Math.min(s,this.$size.height-a))}}}else r.translate(this.textarea,-100,0)},this.getFirstVisibleRow=function(){return this.layerConfig.firstRow},this.getFirstFullyVisibleRow=function(){return this.layerConfig.firstRow+(0===this.layerConfig.offset?0:1)},this.getLastFullyVisibleRow=function(){var e=this.layerConfig,t=e.lastRow;return this.session.documentToScreenRow(t,0)*e.lineHeight-this.session.getScrollTop()>e.height-e.lineHeight?t-1:t},this.getLastVisibleRow=function(){return this.layerConfig.lastRow},this.$padding=null,this.setPadding=function(e){this.$padding=e,this.$textLayer.setPadding(e),this.$cursorLayer.setPadding(e),this.$markerFront.setPadding(e),this.$markerBack.setPadding(e),this.$loop.schedule(this.CHANGE_FULL),this.$updatePrintMargin()},this.setScrollMargin=function(e,t,n,i){var r=this.scrollMargin;r.top=0|e,r.bottom=0|t,r.right=0|i,r.left=0|n,r.v=r.top+r.bottom,r.h=r.left+r.right,r.top&&this.scrollTop<=0&&this.session&&this.session.setScrollTop(-r.top),this.updateFull()},this.setMargin=function(e,t,n,i){var r=this.margin;r.top=0|e,r.bottom=0|t,r.right=0|i,r.left=0|n,r.v=r.top+r.bottom,r.h=r.left+r.right,this.$updateCachedSize(!0,this.gutterWidth,this.$size.width,this.$size.height),this.updateFull()},this.getHScrollBarAlwaysVisible=function(){return this.$hScrollBarAlwaysVisible},this.setHScrollBarAlwaysVisible=function(e){this.setOption("hScrollBarAlwaysVisible",e)},this.getVScrollBarAlwaysVisible=function(){return this.$vScrollBarAlwaysVisible},this.setVScrollBarAlwaysVisible=function(e){this.setOption("vScrollBarAlwaysVisible",e)},this.$updateScrollBarV=function(){var e=this.layerConfig.maxHeight,t=this.$size.scrollerHeight;!this.$maxLines&&this.$scrollPastEnd&&(e-=(t-this.lineHeight)*this.$scrollPastEnd,this.scrollTop>e-t&&(e=this.scrollTop+t,this.scrollBarV.scrollTop=null)),this.scrollBarV.setScrollHeight(e+this.scrollMargin.v),this.scrollBarV.setScrollTop(this.scrollTop+this.scrollMargin.top)},this.$updateScrollBarH=function(){this.scrollBarH.setScrollWidth(this.layerConfig.width+2*this.$padding+this.scrollMargin.h),this.scrollBarH.setScrollLeft(this.scrollLeft+this.scrollMargin.left)},this.$frozen=!1,this.freeze=function(){this.$frozen=!0},this.unfreeze=function(){this.$frozen=!1},this.$renderChanges=function(e,t){if(this.$changes&&(e|=this.$changes,this.$changes=0),this.session&&this.container.offsetWidth&&!this.$frozen&&(e||t)){if(this.$size.$dirty)return this.$changes|=e,this.onResize(!0);this.lineHeight||this.$textLayer.checkForSizeChanges(),this._signal("beforeRender"),this.session&&this.session.$bidiHandler&&this.session.$bidiHandler.updateCharacterWidths(this.$fontMetrics);var n=this.layerConfig;if(e&this.CHANGE_FULL||e&this.CHANGE_SIZE||e&this.CHANGE_TEXT||e&this.CHANGE_LINES||e&this.CHANGE_SCROLL||e&this.CHANGE_H_SCROLL){if(e|=this.$computeLayerConfig()|this.$loop.clear(),n.firstRow!=this.layerConfig.firstRow&&n.firstRowScreen==this.layerConfig.firstRowScreen){var i=this.scrollTop+(n.firstRow-this.layerConfig.firstRow)*this.lineHeight;i>0&&(this.scrollTop=i,e|=this.CHANGE_SCROLL,e|=this.$computeLayerConfig()|this.$loop.clear())}n=this.layerConfig,this.$updateScrollBarV(),e&this.CHANGE_H_SCROLL&&this.$updateScrollBarH(),r.translate(this.content,-this.scrollLeft,-n.offset);var s=n.width+2*this.$padding+"px",o=n.minHeight+"px";r.setStyle(this.content.style,"width",s),r.setStyle(this.content.style,"height",o)}return e&this.CHANGE_H_SCROLL&&(r.translate(this.content,-this.scrollLeft,-n.offset),this.scroller.className=this.scrollLeft<=0?"ace_scroller":"ace_scroller ace_scroll-left"),e&this.CHANGE_FULL?(this.$textLayer.update(n),this.$showGutter&&this.$gutterLayer.update(n),this.$markerBack.update(n),this.$markerFront.update(n),this.$cursorLayer.update(n),this.$moveTextAreaToCursor(),void this._signal("afterRender")):e&this.CHANGE_SCROLL?(e&this.CHANGE_TEXT||e&this.CHANGE_LINES?this.$textLayer.update(n):this.$textLayer.scrollLines(n),this.$showGutter&&(e&this.CHANGE_GUTTER||e&this.CHANGE_LINES?this.$gutterLayer.update(n):this.$gutterLayer.scrollLines(n)),this.$markerBack.update(n),this.$markerFront.update(n),this.$cursorLayer.update(n),this.$moveTextAreaToCursor(),void this._signal("afterRender")):(e&this.CHANGE_TEXT?(this.$textLayer.update(n),this.$showGutter&&this.$gutterLayer.update(n)):e&this.CHANGE_LINES?(this.$updateLines()||e&this.CHANGE_GUTTER&&this.$showGutter)&&this.$gutterLayer.update(n):e&this.CHANGE_TEXT||e&this.CHANGE_GUTTER?this.$showGutter&&this.$gutterLayer.update(n):e&this.CHANGE_CURSOR&&this.$highlightGutterLine&&this.$gutterLayer.updateLineHighlight(n),e&this.CHANGE_CURSOR&&(this.$cursorLayer.update(n),this.$moveTextAreaToCursor()),e&(this.CHANGE_MARKER|this.CHANGE_MARKER_FRONT)&&this.$markerFront.update(n),e&(this.CHANGE_MARKER|this.CHANGE_MARKER_BACK)&&this.$markerBack.update(n),void this._signal("afterRender"))}this.$changes|=e},this.$autosize=function(){var e=this.session.getScreenLength()*this.lineHeight,t=this.$maxLines*this.lineHeight,n=Math.min(t,Math.max((this.$minLines||1)*this.lineHeight,e))+this.scrollMargin.v+(this.$extraHeight||0);this.$horizScroll&&(n+=this.scrollBarH.getHeight()),this.$maxPixelHeight&&n>this.$maxPixelHeight&&(n=this.$maxPixelHeight);var i=!(n<=2*this.lineHeight)&&e>t;if(n!=this.desiredHeight||this.$size.height!=this.desiredHeight||i!=this.$vScroll){i!=this.$vScroll&&(this.$vScroll=i,this.scrollBarV.setVisible(i));var r=this.container.clientWidth;this.container.style.height=n+"px",this.$updateCachedSize(!0,this.$gutterWidth,r,n),this.desiredHeight=n,this._signal("autosize")}},this.$computeLayerConfig=function(){var e=this.session,t=this.$size,n=t.height<=2*this.lineHeight,i=this.session.getScreenLength()*this.lineHeight,r=this.$getLongestLine(),s=!n&&(this.$hScrollBarAlwaysVisible||t.scrollerWidth-r-2*this.$padding<0),o=this.$horizScroll!==s;o&&(this.$horizScroll=s,this.scrollBarH.setVisible(s));var a=this.$vScroll;this.$maxLines&&this.lineHeight>1&&this.$autosize();var l=t.scrollerHeight+this.lineHeight,u=!this.$maxLines&&this.$scrollPastEnd?(t.scrollerHeight-this.lineHeight)*this.$scrollPastEnd:0;i+=u;var c=this.scrollMargin;this.session.setScrollTop(Math.max(-c.top,Math.min(this.scrollTop,i-t.scrollerHeight+c.bottom))),this.session.setScrollLeft(Math.max(-c.left,Math.min(this.scrollLeft,r+2*this.$padding-t.scrollerWidth+c.right)));var h=!n&&(this.$vScrollBarAlwaysVisible||t.scrollerHeight-i+u<0||this.scrollTop>c.top),d=a!==h;d&&(this.$vScroll=h,this.scrollBarV.setVisible(h));var f,p,g=this.scrollTop%this.lineHeight,m=Math.ceil(l/this.lineHeight)-1,v=Math.max(0,Math.round((this.scrollTop-g)/this.lineHeight)),y=v+m,$=this.lineHeight;v=e.screenToDocumentRow(v,0);var w=e.getFoldLine(v);w&&(v=w.start.row),f=e.documentToScreenRow(v,0),p=e.getRowLength(v)*$,y=Math.min(e.screenToDocumentRow(y,0),e.getLength()-1),l=t.scrollerHeight+e.getRowLength(y)*$+p,g=this.scrollTop-f*$;var b=0;return(this.layerConfig.width!=r||o)&&(b=this.CHANGE_H_SCROLL),(o||d)&&(b=this.$updateCachedSize(!0,this.gutterWidth,t.width,t.height),this._signal("scrollbarVisibilityChanged"),d&&(r=this.$getLongestLine())),this.layerConfig={width:r,padding:this.$padding,firstRow:v,firstRowScreen:f,lastRow:y,lineHeight:$,characterWidth:this.characterWidth,minHeight:l,maxHeight:i,offset:g,gutterOffset:$?Math.max(0,Math.ceil((g+t.height-t.scrollerHeight)/$)):0,height:this.$size.scrollerHeight},this.session.$bidiHandler&&this.session.$bidiHandler.setContentWidth(r-this.$padding),b},this.$updateLines=function(){if(this.$changedLines){var e=this.$changedLines.firstRow,t=this.$changedLines.lastRow;this.$changedLines=null;var n=this.layerConfig;if(!(e>n.lastRow+1||t<n.firstRow))return t===1/0?(this.$showGutter&&this.$gutterLayer.update(n),void this.$textLayer.update(n)):(this.$textLayer.updateLines(n,e,t),!0)}},this.$getLongestLine=function(){var e=this.session.getScreenWidth();return this.showInvisibles&&!this.session.$useWrapMode&&(e+=1),this.$textLayer&&e>this.$textLayer.MAX_LINE_LENGTH&&(e=this.$textLayer.MAX_LINE_LENGTH+30),Math.max(this.$size.scrollerWidth-2*this.$padding,Math.round(e*this.characterWidth))},this.updateFrontMarkers=function(){this.$markerFront.setMarkers(this.session.getMarkers(!0)),this.$loop.schedule(this.CHANGE_MARKER_FRONT)},this.updateBackMarkers=function(){this.$markerBack.setMarkers(this.session.getMarkers()),this.$loop.schedule(this.CHANGE_MARKER_BACK)},this.addGutterDecoration=function(e,t){this.$gutterLayer.addGutterDecoration(e,t)},this.removeGutterDecoration=function(e,t){this.$gutterLayer.removeGutterDecoration(e,t)},this.updateBreakpoints=function(e){this.$loop.schedule(this.CHANGE_GUTTER)},this.setAnnotations=function(e){this.$gutterLayer.setAnnotations(e),this.$loop.schedule(this.CHANGE_GUTTER)},this.updateCursor=function(){this.$loop.schedule(this.CHANGE_CURSOR)},this.hideCursor=function(){this.$cursorLayer.hideCursor()},this.showCursor=function(){this.$cursorLayer.showCursor()},this.scrollSelectionIntoView=function(e,t,n){this.scrollCursorIntoView(e,n),this.scrollCursorIntoView(t,n)},this.scrollCursorIntoView=function(e,t,n){if(0!==this.$size.scrollerHeight){var i=this.$cursorLayer.getPixelPosition(e),r=i.left,s=i.top,o=n&&n.top||0,a=n&&n.bottom||0,l=this.$scrollAnimation?this.session.getScrollTop():this.scrollTop;l+o>s?(t&&l+o>s+this.lineHeight&&(s-=t*this.$size.scrollerHeight),0===s&&(s=-this.scrollMargin.top),this.session.setScrollTop(s)):l+this.$size.scrollerHeight-a<s+this.lineHeight&&(t&&l+this.$size.scrollerHeight-a<s-this.lineHeight&&(s+=t*this.$size.scrollerHeight),this.session.setScrollTop(s+this.lineHeight+a-this.$size.scrollerHeight));var u=this.scrollLeft;u>r?(r<this.$padding+2*this.layerConfig.characterWidth&&(r=-this.scrollMargin.left),this.session.setScrollLeft(r)):u+this.$size.scrollerWidth<r+this.characterWidth?this.session.setScrollLeft(Math.round(r+this.characterWidth-this.$size.scrollerWidth)):u<=this.$padding&&r-u<this.characterWidth&&this.session.setScrollLeft(0)}},this.getScrollTop=function(){return this.session.getScrollTop()},this.getScrollLeft=function(){return this.session.getScrollLeft()},this.getScrollTopRow=function(){return this.scrollTop/this.lineHeight},this.getScrollBottomRow=function(){return Math.max(0,Math.floor((this.scrollTop+this.$size.scrollerHeight)/this.lineHeight)-1)},this.scrollToRow=function(e){this.session.setScrollTop(e*this.lineHeight)},this.alignCursor=function(e,t){"number"==typeof e&&(e={row:e,column:0});var n=this.$cursorLayer.getPixelPosition(e),i=this.$size.scrollerHeight-this.lineHeight,r=n.top-i*(t||0);return this.session.setScrollTop(r),r},this.STEPS=8,this.$calcSteps=function(e,t){var n=0,i=this.STEPS,r=[],s=function(e,t,n){return n*(Math.pow(e-1,3)+1)+t};for(n=0;n<i;++n)r.push(s(n/this.STEPS,e,t-e));return r},this.scrollToLine=function(e,t,n,i){var r=this.$cursorLayer.getPixelPosition({row:e,column:0}).top;t&&(r-=this.$size.scrollerHeight/2);var s=this.scrollTop;this.session.setScrollTop(r),!1!==n&&this.animateScrolling(s,i)},this.animateScrolling=function(e,t){var n=this.scrollTop;if(this.$animatedScroll){var i=this;if(e!=n){if(this.$scrollAnimation){var r=this.$scrollAnimation.steps;if(r.length&&(e=r[0])==n)return}var s=i.$calcSteps(e,n);this.$scrollAnimation={from:e,to:n,steps:s},clearInterval(this.$timer),i.session.setScrollTop(s.shift()),i.session.$scrollTop=n,this.$timer=setInterval((function(){s.length?(i.session.setScrollTop(s.shift()),i.session.$scrollTop=n):null!=n?(i.session.$scrollTop=-1,i.session.setScrollTop(n),n=null):(i.$timer=clearInterval(i.$timer),i.$scrollAnimation=null,t&&t())}),10)}}},this.scrollToY=function(e){this.scrollTop!==e&&(this.$loop.schedule(this.CHANGE_SCROLL),this.scrollTop=e)},this.scrollToX=function(e){this.scrollLeft!==e&&(this.scrollLeft=e),this.$loop.schedule(this.CHANGE_H_SCROLL)},this.scrollTo=function(e,t){this.session.setScrollTop(t),this.session.setScrollLeft(t)},this.scrollBy=function(e,t){t&&this.session.setScrollTop(this.session.getScrollTop()+t),e&&this.session.setScrollLeft(this.session.getScrollLeft()+e)},this.isScrollableBy=function(e,t){return t<0&&this.session.getScrollTop()>=1-this.scrollMargin.top||(t>0&&this.session.getScrollTop()+this.$size.scrollerHeight-this.layerConfig.maxHeight<-1+this.scrollMargin.bottom||(e<0&&this.session.getScrollLeft()>=1-this.scrollMargin.left||(e>0&&this.session.getScrollLeft()+this.$size.scrollerWidth-this.layerConfig.width<-1+this.scrollMargin.right||void 0)))},this.pixelToScreenCoordinates=function(e,t){var n;if(this.$hasCssTransforms){n={top:0,left:0};var i=this.$fontMetrics.transformCoordinates([e,t]);e=i[1]-this.gutterWidth-this.margin.left,t=i[0]}else n=this.scroller.getBoundingClientRect();var r=e+this.scrollLeft-n.left-this.$padding,s=r/this.characterWidth,o=Math.floor((t+this.scrollTop-n.top)/this.lineHeight),a=this.$blockCursor?Math.floor(s):Math.round(s);return{row:o,column:a,side:s-a>0?1:-1,offsetX:r}},this.screenToTextCoordinates=function(e,t){var n;if(this.$hasCssTransforms){n={top:0,left:0};var i=this.$fontMetrics.transformCoordinates([e,t]);e=i[1]-this.gutterWidth-this.margin.left,t=i[0]}else n=this.scroller.getBoundingClientRect();var r=e+this.scrollLeft-n.left-this.$padding,s=r/this.characterWidth,o=this.$blockCursor?Math.floor(s):Math.round(s),a=Math.floor((t+this.scrollTop-n.top)/this.lineHeight);return this.session.screenToDocumentPosition(a,Math.max(o,0),r)},this.textToScreenCoordinates=function(e,t){var n=this.scroller.getBoundingClientRect(),i=this.session.documentToScreenPosition(e,t),r=this.$padding+(this.session.$bidiHandler.isBidiRow(i.row,e)?this.session.$bidiHandler.getPosLeft(i.column):Math.round(i.column*this.characterWidth)),s=i.row*this.lineHeight;return{pageX:n.left+r-this.scrollLeft,pageY:n.top+s-this.scrollTop}},this.visualizeFocus=function(){r.addCssClass(this.container,"ace_focus")},this.visualizeBlur=function(){r.removeCssClass(this.container,"ace_focus")},this.showComposition=function(e){this.$composition=e,e.cssText||(e.cssText=this.textarea.style.cssText,e.keepTextAreaAtCursor=this.$keepTextAreaAtCursor),e.useTextareaForIME=this.$useTextareaForIME,this.$useTextareaForIME?(this.$keepTextAreaAtCursor=!0,r.addCssClass(this.textarea,"ace_composition"),this.textarea.style.cssText="",this.$moveTextAreaToCursor(),this.$cursorLayer.element.style.display="none"):e.markerId=this.session.addMarker(e.markerRange,"ace_composition_marker","text")},this.setCompositionText=function(e){var t=this.session.selection.cursor;this.addToken(e,"composition_placeholder",t.row,t.column),this.$moveTextAreaToCursor()},this.hideComposition=function(){this.$composition&&(this.$composition.markerId&&this.session.removeMarker(this.$composition.markerId),r.removeCssClass(this.textarea,"ace_composition"),this.$keepTextAreaAtCursor=this.$composition.keepTextAreaAtCursor,this.textarea.style.cssText=this.$composition.cssText,this.$composition=null,this.$cursorLayer.element.style.display="")},this.addToken=function(e,t,n,i){var r=this.session;r.bgTokenizer.lines[n]=null;var s={type:t,value:e},o=r.getTokens(n);if(null==i)o.push(s);else for(var a=0,l=0;l<o.length;l++){var u=o[l];if(i<=(a+=u.value.length)){var c=u.value.length-(a-i),h=u.value.slice(0,c),d=u.value.slice(c);o.splice(l,1,{type:u.type,value:h},s,{type:u.type,value:d});break}}this.updateLines(n,n)},this.setTheme=function(e,t){function n(n){if(i.$themeId!=e)return t&&t();if(!n||!n.cssClass)throw new Error("couldn't load module "+e+" or it didn't call define");n.$id&&(i.$themeId=n.$id),r.importCssString(n.cssText,n.cssClass,i.container),i.theme&&r.removeCssClass(i.container,i.theme.cssClass);var s="padding"in n?n.padding:"padding"in(i.theme||{})?4:i.$padding;i.$padding&&s!=i.$padding&&i.setPadding(s),i.$theme=n.cssClass,i.theme=n,r.addCssClass(i.container,n.cssClass),r.setCssClass(i.container,"ace_dark",n.isDark),i.$size&&(i.$size.width=0,i.$updateSizeAsync()),i._dispatchEvent("themeLoaded",{theme:n}),t&&t()}var i=this;if(this.$themeId=e,i._dispatchEvent("themeChange",{theme:e}),e&&"string"!=typeof e)n(e);else{var o=e||this.$options.theme.initialValue;s.loadModule(["theme",o],n)}},this.getTheme=function(){return this.$themeId},this.setStyle=function(e,t){r.setCssClass(this.container,e,!1!==t)},this.unsetStyle=function(e){r.removeCssClass(this.container,e)},this.setCursorStyle=function(e){r.setStyle(this.scroller.style,"cursor",e)},this.setMouseCursor=function(e){r.setStyle(this.scroller.style,"cursor",e)},this.attachToShadowRoot=function(){r.importCssString(g,"ace_editor.css",this.container)},this.destroy=function(){this.$fontMetrics.destroy(),this.$cursorLayer.destroy()}}).call(y.prototype),s.defineOptions(y.prototype,"renderer",{animatedScroll:{initialValue:!1},showInvisibles:{set:function(e){this.$textLayer.setShowInvisibles(e)&&this.$loop.schedule(this.CHANGE_TEXT)},initialValue:!1},showPrintMargin:{set:function(){this.$updatePrintMargin()},initialValue:!0},printMarginColumn:{set:function(){this.$updatePrintMargin()},initialValue:80},printMargin:{set:function(e){"number"==typeof e&&(this.$printMarginColumn=e),this.$showPrintMargin=!!e,this.$updatePrintMargin()},get:function(){return this.$showPrintMargin&&this.$printMarginColumn}},showGutter:{set:function(e){this.$gutter.style.display=e?"block":"none",this.$loop.schedule(this.CHANGE_FULL),this.onGutterResize()},initialValue:!0},fadeFoldWidgets:{set:function(e){r.setCssClass(this.$gutter,"ace_fade-fold-widgets",e)},initialValue:!1},showFoldWidgets:{set:function(e){this.$gutterLayer.setShowFoldWidgets(e),this.$loop.schedule(this.CHANGE_GUTTER)},initialValue:!0},displayIndentGuides:{set:function(e){this.$textLayer.setDisplayIndentGuides(e)&&this.$loop.schedule(this.CHANGE_TEXT)},initialValue:!0},highlightGutterLine:{set:function(e){this.$gutterLayer.setHighlightGutterLine(e),this.$loop.schedule(this.CHANGE_GUTTER)},initialValue:!0},hScrollBarAlwaysVisible:{set:function(e){(!this.$hScrollBarAlwaysVisible||!this.$horizScroll)&&this.$loop.schedule(this.CHANGE_SCROLL)},initialValue:!1},vScrollBarAlwaysVisible:{set:function(e){(!this.$vScrollBarAlwaysVisible||!this.$vScroll)&&this.$loop.schedule(this.CHANGE_SCROLL)},initialValue:!1},fontSize:{set:function(e){"number"==typeof e&&(e+="px"),this.container.style.fontSize=e,this.updateFontSize()},initialValue:12},fontFamily:{set:function(e){this.container.style.fontFamily=e,this.updateFontSize()}},maxLines:{set:function(e){this.updateFull()}},minLines:{set:function(e){this.$minLines<562949953421311||(this.$minLines=0),this.updateFull()}},maxPixelHeight:{set:function(e){this.updateFull()},initialValue:0},scrollPastEnd:{set:function(e){e=+e||0,this.$scrollPastEnd!=e&&(this.$scrollPastEnd=e,this.$loop.schedule(this.CHANGE_SCROLL))},initialValue:0,handlesSet:!0},fixedWidthGutter:{set:function(e){this.$gutterLayer.$fixedWidth=!!e,this.$loop.schedule(this.CHANGE_GUTTER)}},theme:{set:function(e){this.setTheme(e)},get:function(){return this.$themeId||this.theme},initialValue:"./theme/textmate",handlesSet:!0},hasCssTransforms:{},useTextareaForIME:{initialValue:!m.isMobile&&!m.isIE}}),t.VirtualRenderer=y})),ace.define("ace/worker/worker_client",["require","exports","module","ace/lib/oop","ace/lib/net","ace/lib/event_emitter","ace/config"],(function(e,t,n){"use strict";function i(e){if("undefined"==typeof Worker)return{postMessage:function(){},terminate:function(){}};var t=function(e){var t="importScripts('"+s.qualifyURL(e)+"');";try{return new Blob([t],{type:"application/javascript"})}catch(e){var n=new(window.BlobBuilder||window.WebKitBlobBuilder||window.MozBlobBuilder);return n.append(t),n.getBlob("application/javascript")}}(e),n=(window.URL||window.webkitURL).createObjectURL(t);return new Worker(n)}var r=e("../lib/oop"),s=e("../lib/net"),o=e("../lib/event_emitter").EventEmitter,a=e("../config"),l=function(t,n,r,s,o){if(this.$sendDeltaQueue=this.$sendDeltaQueue.bind(this),this.changeListener=this.changeListener.bind(this),this.onMessage=this.onMessage.bind(this),e.nameToUrl&&!e.toUrl&&(e.toUrl=e.nameToUrl),a.get("packaged")||!e.toUrl)s=s||a.moduleUrl(n,"worker");else{var l=this.$normalizePath;s=s||l(e.toUrl("ace/worker/worker.js",null,"_"));var u={};t.forEach((function(t){u[t]=l(e.toUrl(t,null,"_").replace(/(\.js)?(\?.*)?$/,""))}))}this.$worker=i(s),o&&this.send("importScripts",o),this.$worker.postMessage({init:!0,tlns:u,module:n,classname:r}),this.callbackId=1,this.callbacks={},this.$worker.onmessage=this.onMessage};(function(){r.implement(this,o),this.onMessage=function(e){var t=e.data;switch(t.type){case"event":this._signal(t.name,{data:t.data});break;case"call":var n=this.callbacks[t.id];n&&(n(t.data),delete this.callbacks[t.id]);break;case"error":this.reportError(t.data);break;case"log":window.console&&console.log&&console.log.apply(console,t.data)}},this.reportError=function(e){window.console&&console.error&&console.error(e)},this.$normalizePath=function(e){return s.qualifyURL(e)},this.terminate=function(){this._signal("terminate",{}),this.deltaQueue=null,this.$worker.terminate(),this.$worker=null,this.$doc&&this.$doc.off("change",this.changeListener),this.$doc=null},this.send=function(e,t){this.$worker.postMessage({command:e,args:t})},this.call=function(e,t,n){if(n){var i=this.callbackId++;this.callbacks[i]=n,t.push(i)}this.send(e,t)},this.emit=function(e,t){try{t.data&&t.data.err&&(t.data.err={message:t.data.err.message,stack:t.data.err.stack,code:t.data.err.code}),this.$worker.postMessage({event:e,data:{data:t.data}})}catch(e){console.error(e.stack)}},this.attachToDocument=function(e){this.$doc&&this.terminate(),this.$doc=e,this.call("setValue",[e.getValue()]),e.on("change",this.changeListener)},this.changeListener=function(e){this.deltaQueue||(this.deltaQueue=[],setTimeout(this.$sendDeltaQueue,0)),"insert"==e.action?this.deltaQueue.push(e.start,e.lines):this.deltaQueue.push(e.start,e.end)},this.$sendDeltaQueue=function(){var e=this.deltaQueue;e&&(this.deltaQueue=null,e.length>50&&e.length>this.$doc.getLength()>>1?this.call("setValue",[this.$doc.getValue()]):this.emit("change",{data:e}))}}).call(l.prototype);var u=function(e,t,n){this.$sendDeltaQueue=this.$sendDeltaQueue.bind(this),this.changeListener=this.changeListener.bind(this),this.callbackId=1,this.callbacks={},this.messageBuffer=[];var i=null,r=!1,s=Object.create(o),l=this;this.$worker={},this.$worker.terminate=function(){},this.$worker.postMessage=function(e){l.messageBuffer.push(e),i&&(r?setTimeout(u):u())},this.setEmitSync=function(e){r=e};var u=function(){var e=l.messageBuffer.shift();e.command?i[e.command].apply(i,e.args):e.event&&s._signal(e.event,e.data)};s.postMessage=function(e){l.onMessage({data:e})},s.callback=function(e,t){this.postMessage({type:"call",id:t,data:e})},s.emit=function(e,t){this.postMessage({type:"event",name:e,data:t})},a.loadModule(["worker",t],(function(e){for(i=new e[n](s);l.messageBuffer.length;)u()}))};u.prototype=l.prototype,t.UIWorkerClient=u,t.WorkerClient=l,t.createWorker=i})),ace.define("ace/placeholder",["require","exports","module","ace/range","ace/lib/event_emitter","ace/lib/oop"],(function(e,t,n){"use strict";var i=e("./range").Range,r=e("./lib/event_emitter").EventEmitter,s=e("./lib/oop"),o=function(e,t,n,i,r,s){var o=this;this.length=t,this.session=e,this.doc=e.getDocument(),this.mainClass=r,this.othersClass=s,this.$onUpdate=this.onUpdate.bind(this),this.doc.on("change",this.$onUpdate),this.$others=i,this.$onCursorChange=function(){setTimeout((function(){o.onCursorChange()}))},this.$pos=n;var a=e.getUndoManager().$undoStack||e.getUndoManager().$undostack||{length:-1};this.$undoStackDepth=a.length,this.setup(),e.selection.on("changeCursor",this.$onCursorChange)};(function(){s.implement(this,r),this.setup=function(){var e=this,t=this.doc,n=this.session;this.selectionBefore=n.selection.toJSON(),n.selection.inMultiSelectMode&&n.selection.toSingleRange(),this.pos=t.createAnchor(this.$pos.row,this.$pos.column);var r=this.pos;r.$insertRight=!0,r.detach(),r.markerId=n.addMarker(new i(r.row,r.column,r.row,r.column+this.length),this.mainClass,null,!1),this.others=[],this.$others.forEach((function(n){var i=t.createAnchor(n.row,n.column);i.$insertRight=!0,i.detach(),e.others.push(i)})),n.setUndoSelect(!1)},this.showOtherMarkers=function(){if(!this.othersActive){var e=this.session,t=this;this.othersActive=!0,this.others.forEach((function(n){n.markerId=e.addMarker(new i(n.row,n.column,n.row,n.column+t.length),t.othersClass,null,!1)}))}},this.hideOtherMarkers=function(){if(this.othersActive){this.othersActive=!1;for(var e=0;e<this.others.length;e++)this.session.removeMarker(this.others[e].markerId)}},this.onUpdate=function(e){if(this.$updating)return this.updateAnchors(e);var t=e;if(t.start.row===t.end.row&&t.start.row===this.pos.row){this.$updating=!0;var n="insert"===e.action?t.end.column-t.start.column:t.start.column-t.end.column,r=t.start.column>=this.pos.column&&t.start.column<=this.pos.column+this.length+1,s=t.start.column-this.pos.column;if(this.updateAnchors(e),r&&(this.length+=n),r&&!this.session.$fromUndo)if("insert"===e.action)for(var o=this.others.length-1;o>=0;o--){var a={row:(l=this.others[o]).row,column:l.column+s};this.doc.insertMergedLines(a,e.lines)}else if("remove"===e.action)for(o=this.others.length-1;o>=0;o--){var l;a={row:(l=this.others[o]).row,column:l.column+s};this.doc.remove(new i(a.row,a.column,a.row,a.column-n))}this.$updating=!1,this.updateMarkers()}},this.updateAnchors=function(e){this.pos.onChange(e);for(var t=this.others.length;t--;)this.others[t].onChange(e);this.updateMarkers()},this.updateMarkers=function(){if(!this.$updating){var e=this,t=this.session,n=function(n,r){t.removeMarker(n.markerId),n.markerId=t.addMarker(new i(n.row,n.column,n.row,n.column+e.length),r,null,!1)};n(this.pos,this.mainClass);for(var r=this.others.length;r--;)n(this.others[r],this.othersClass)}},this.onCursorChange=function(e){if(!this.$updating&&this.session){var t=this.session.selection.getCursor();t.row===this.pos.row&&t.column>=this.pos.column&&t.column<=this.pos.column+this.length?(this.showOtherMarkers(),this._emit("cursorEnter",e)):(this.hideOtherMarkers(),this._emit("cursorLeave",e))}},this.detach=function(){this.session.removeMarker(this.pos&&this.pos.markerId),this.hideOtherMarkers(),this.doc.removeEventListener("change",this.$onUpdate),this.session.selection.removeEventListener("changeCursor",this.$onCursorChange),this.session.setUndoSelect(!0),this.session=null},this.cancel=function(){if(-1!==this.$undoStackDepth){for(var e=this.session.getUndoManager(),t=(e.$undoStack||e.$undostack).length-this.$undoStackDepth,n=0;n<t;n++)e.undo(this.session,!0);this.selectionBefore&&this.session.selection.fromJSON(this.selectionBefore)}}}).call(o.prototype),t.PlaceHolder=o})),ace.define("ace/mouse/multi_select_handler",["require","exports","module","ace/lib/event","ace/lib/useragent"],(function(e,t,n){function i(e,t){return e.row==t.row&&e.column==t.column}var r=e("../lib/event"),s=e("../lib/useragent");t.onMouseDown=function(e){var t=e.domEvent,n=t.altKey,o=t.shiftKey,a=t.ctrlKey,l=e.getAccelKey(),u=e.getButton();if(a&&s.isMac&&(u=t.button),e.editor.inMultiSelectMode&&2==u)e.editor.textInput.onContextMenu(e.domEvent);else if(a||n||l){if(0===u){var c,h=e.editor,d=h.selection,f=h.inMultiSelectMode,p=e.getDocumentPosition(),g=d.getCursor(),m=e.inSelection()||d.isEmpty()&&i(p,g),v=e.x,y=e.y,$=h.session,w=h.renderer.pixelToScreenCoordinates(v,y),b=w;if(h.$mouseHandler.$enableJumpToDef)a&&n||l&&n?c=o?"block":"add":n&&h.$blockSelectEnabled&&(c="block");else if(l&&!n){if(c="add",!f&&o)return}else n&&h.$blockSelectEnabled&&(c="block");if(c&&s.isMac&&t.ctrlKey&&h.$mouseHandler.cancelContextMenu(),"add"==c){if(!f&&m)return;if(!f){var S=d.toOrientedRange();h.addSelectionMarker(S)}var x=d.rangeList.rangeAtPoint(p);h.inVirtualSelectionMode=!0,o&&(x=null,S=d.ranges[0]||S,h.removeSelectionMarker(S)),h.once("mouseup",(function(){var e=d.toOrientedRange();x&&e.isEmpty()&&i(x.cursor,e.cursor)?d.substractPoint(e.cursor):(o?d.substractPoint(S.cursor):S&&(h.removeSelectionMarker(S),d.addRange(S)),d.addRange(e)),h.inVirtualSelectionMode=!1}))}else if("block"==c){e.stop(),h.inVirtualSelectionMode=!0;var C,k=[],_=function(){var e=h.renderer.pixelToScreenCoordinates(v,y),t=$.screenToDocumentPosition(e.row,e.column,e.offsetX);i(b,e)&&i(t,d.lead)||(b=e,h.selection.moveToPosition(t),h.renderer.scrollCursorIntoView(),h.removeSelectionMarkers(k),k=d.rectangularRangeBlock(b,w),h.$mouseHandler.$clickSelection&&1==k.length&&k[0].isEmpty()&&(k[0]=h.$mouseHandler.$clickSelection.clone()),k.forEach(h.addSelectionMarker,h),h.updateSelectionMarkers())};f&&!l?d.toSingleRange():!f&&l&&(C=d.toOrientedRange(),h.addSelectionMarker(C)),o?w=$.documentToScreenPosition(d.lead):d.moveToPosition(p),b={row:-1,column:-1};var M=_;r.capture(h.container,(function(e){v=e.clientX,y=e.clientY}),(function(e){_(),clearInterval(A),h.removeSelectionMarkers(k),k.length||(k=[d.toOrientedRange()]),C&&(h.removeSelectionMarker(C),d.toSingleRange(C));for(var t=0;t<k.length;t++)d.addRange(k[t]);h.inVirtualSelectionMode=!1,h.$mouseHandler.$clickSelection=null}));var A=setInterval((function(){M()}),20);return e.preventDefault()}}}else 0===u&&e.editor.inMultiSelectMode&&e.editor.exitMultiSelectMode()}})),ace.define("ace/commands/multi_select_commands",["require","exports","module","ace/keyboard/hash_handler"],(function(e,t,n){t.defaultCommands=[{name:"addCursorAbove",exec:function(e){e.selectMoreLines(-1)},bindKey:{win:"Ctrl-Alt-Up",mac:"Ctrl-Alt-Up"},scrollIntoView:"cursor",readOnly:!0},{name:"addCursorBelow",exec:function(e){e.selectMoreLines(1)},bindKey:{win:"Ctrl-Alt-Down",mac:"Ctrl-Alt-Down"},scrollIntoView:"cursor",readOnly:!0},{name:"addCursorAboveSkipCurrent",exec:function(e){e.selectMoreLines(-1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Up",mac:"Ctrl-Alt-Shift-Up"},scrollIntoView:"cursor",readOnly:!0},{name:"addCursorBelowSkipCurrent",exec:function(e){e.selectMoreLines(1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Down",mac:"Ctrl-Alt-Shift-Down"},scrollIntoView:"cursor",readOnly:!0},{name:"selectMoreBefore",exec:function(e){e.selectMore(-1)},bindKey:{win:"Ctrl-Alt-Left",mac:"Ctrl-Alt-Left"},scrollIntoView:"cursor",readOnly:!0},{name:"selectMoreAfter",exec:function(e){e.selectMore(1)},bindKey:{win:"Ctrl-Alt-Right",mac:"Ctrl-Alt-Right"},scrollIntoView:"cursor",readOnly:!0},{name:"selectNextBefore",exec:function(e){e.selectMore(-1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Left",mac:"Ctrl-Alt-Shift-Left"},scrollIntoView:"cursor",readOnly:!0},{name:"selectNextAfter",exec:function(e){e.selectMore(1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Right",mac:"Ctrl-Alt-Shift-Right"},scrollIntoView:"cursor",readOnly:!0},{name:"splitIntoLines",exec:function(e){e.multiSelect.splitIntoLines()},bindKey:{win:"Ctrl-Alt-L",mac:"Ctrl-Alt-L"},readOnly:!0},{name:"alignCursors",exec:function(e){e.alignCursors()},bindKey:{win:"Ctrl-Alt-A",mac:"Ctrl-Alt-A"},scrollIntoView:"cursor"},{name:"findAll",exec:function(e){e.findAll()},bindKey:{win:"Ctrl-Alt-K",mac:"Ctrl-Alt-G"},scrollIntoView:"cursor",readOnly:!0}],t.multiSelectCommands=[{name:"singleSelection",bindKey:"esc",exec:function(e){e.exitMultiSelectMode()},scrollIntoView:"cursor",readOnly:!0,isAvailable:function(e){return e&&e.inMultiSelectMode}}];var i=e("../keyboard/hash_handler").HashHandler;t.keyboardHandler=new i(t.multiSelectCommands)})),ace.define("ace/multi_select",["require","exports","module","ace/range_list","ace/range","ace/selection","ace/mouse/multi_select_handler","ace/lib/event","ace/lib/lang","ace/commands/multi_select_commands","ace/search","ace/edit_session","ace/editor","ace/config"],(function(e,t,n){function i(e,t){return e.row==t.row&&e.column==t.column}function r(e){e.$multiselectOnSessionChange||(e.$onAddRange=e.$onAddRange.bind(e),e.$onRemoveRange=e.$onRemoveRange.bind(e),e.$onMultiSelect=e.$onMultiSelect.bind(e),e.$onSingleSelect=e.$onSingleSelect.bind(e),e.$multiselectOnSessionChange=t.onSessionChange.bind(e),e.$checkMultiselectChange=e.$checkMultiselectChange.bind(e),e.$multiselectOnSessionChange(e),e.on("changeSession",e.$multiselectOnSessionChange),e.on("mousedown",l),e.commands.addCommands(h.defaultCommands),function(e){function t(t){i&&(e.renderer.setMouseCursor(""),i=!1)}var n=e.textInput.getElement(),i=!1;u.addListener(n,"keydown",(function(n){var r=18==n.keyCode&&!(n.ctrlKey||n.shiftKey||n.metaKey);e.$blockSelectEnabled&&r?i||(e.renderer.setMouseCursor("crosshair"),i=!0):i&&t()})),u.addListener(n,"keyup",t),u.addListener(n,"blur",t)}(e))}var s=e("./range_list").RangeList,o=e("./range").Range,a=e("./selection").Selection,l=e("./mouse/multi_select_handler").onMouseDown,u=e("./lib/event"),c=e("./lib/lang"),h=e("./commands/multi_select_commands");t.commands=h.defaultCommands.concat(h.multiSelectCommands);var d=new(0,e("./search").Search),f=e("./edit_session").EditSession;(function(){this.getSelectionMarkers=function(){return this.$selectionMarkers}}).call(f.prototype),function(){this.ranges=null,this.rangeList=null,this.addRange=function(e,t){if(e){if(!this.inMultiSelectMode&&0===this.rangeCount){var n=this.toOrientedRange();if(this.rangeList.add(n),this.rangeList.add(e),2!=this.rangeList.ranges.length)return this.rangeList.removeAll(),t||this.fromOrientedRange(e);this.rangeList.removeAll(),this.rangeList.add(n),this.$onAddRange(n)}e.cursor||(e.cursor=e.end);var i=this.rangeList.add(e);return this.$onAddRange(e),i.length&&this.$onRemoveRange(i),this.rangeCount>1&&!this.inMultiSelectMode&&(this._signal("multiSelect"),this.inMultiSelectMode=!0,this.session.$undoSelect=!1,this.rangeList.attach(this.session)),t||this.fromOrientedRange(e)}},this.toSingleRange=function(e){e=e||this.ranges[0];var t=this.rangeList.removeAll();t.length&&this.$onRemoveRange(t),e&&this.fromOrientedRange(e)},this.substractPoint=function(e){var t=this.rangeList.substractPoint(e);if(t)return this.$onRemoveRange(t),t[0]},this.mergeOverlappingRanges=function(){var e=this.rangeList.merge();e.length&&this.$onRemoveRange(e)},this.$onAddRange=function(e){this.rangeCount=this.rangeList.ranges.length,this.ranges.unshift(e),this._signal("addRange",{range:e})},this.$onRemoveRange=function(e){if(this.rangeCount=this.rangeList.ranges.length,1==this.rangeCount&&this.inMultiSelectMode){var t=this.rangeList.ranges.pop();e.push(t),this.rangeCount=0}for(var n=e.length;n--;){var i=this.ranges.indexOf(e[n]);this.ranges.splice(i,1)}this._signal("removeRange",{ranges:e}),0===this.rangeCount&&this.inMultiSelectMode&&(this.inMultiSelectMode=!1,this._signal("singleSelect"),this.session.$undoSelect=!0,this.rangeList.detach(this.session)),(t=t||this.ranges[0])&&!t.isEqual(this.getRange())&&this.fromOrientedRange(t)},this.$initRangeList=function(){this.rangeList||(this.rangeList=new s,this.ranges=[],this.rangeCount=0)},this.getAllRanges=function(){return this.rangeCount?this.rangeList.ranges.concat():[this.getRange()]},this.splitIntoLines=function(){if(this.rangeCount>1){var e=this.rangeList.ranges,t=e[e.length-1],n=o.fromPoints(e[0].start,t.end);this.toSingleRange(),this.setSelectionRange(n,t.cursor==t.start)}else{n=this.getRange();var i=this.isBackwards(),r=n.start.row,s=n.end.row;if(r==s){if(i)var a=n.end,l=n.start;else a=n.start,l=n.end;return this.addRange(o.fromPoints(l,l)),void this.addRange(o.fromPoints(a,a))}var u=[],c=this.getLineRange(r,!0);c.start.column=n.start.column,u.push(c);for(var h=r+1;h<s;h++)u.push(this.getLineRange(h,!0));(c=this.getLineRange(s,!0)).end.column=n.end.column,u.push(c),u.forEach(this.addRange,this)}},this.toggleBlockSelection=function(){if(this.rangeCount>1){var e=this.rangeList.ranges,t=e[e.length-1],n=o.fromPoints(e[0].start,t.end);this.toSingleRange(),this.setSelectionRange(n,t.cursor==t.start)}else{var i=this.session.documentToScreenPosition(this.cursor),r=this.session.documentToScreenPosition(this.anchor);this.rectangularRangeBlock(i,r).forEach(this.addRange,this)}},this.rectangularRangeBlock=function(e,t,n){var r=[],s=e.column<t.column;if(s)var a=e.column,l=t.column,u=e.offsetX,c=t.offsetX;else a=t.column,l=e.column,u=t.offsetX,c=e.offsetX;var h,d=e.row<t.row;if(d)var f=e.row,p=t.row;else f=t.row,p=e.row;a<0&&(a=0),f<0&&(f=0),f==p&&(n=!0);for(var g=f;g<=p;g++){var m=o.fromPoints(this.session.screenToDocumentPosition(g,a,u),this.session.screenToDocumentPosition(g,l,c));if(m.isEmpty()){if(h&&i(m.end,h))break;h=m.end}m.cursor=s?m.start:m.end,r.push(m)}if(d&&r.reverse(),!n){for(var v=r.length-1;r[v].isEmpty()&&v>0;)v--;if(v>0)for(var y=0;r[y].isEmpty();)y++;for(var $=v;$>=y;$--)r[$].isEmpty()&&r.splice($,1)}return r}}.call(a.prototype);var p=e("./editor").Editor;(function(){this.updateSelectionMarkers=function(){this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.addSelectionMarker=function(e){e.cursor||(e.cursor=e.end);var t=this.getSelectionStyle();return e.marker=this.session.addMarker(e,"ace_selection",t),this.session.$selectionMarkers.push(e),this.session.selectionMarkerCount=this.session.$selectionMarkers.length,e},this.removeSelectionMarker=function(e){if(e.marker){this.session.removeMarker(e.marker);var t=this.session.$selectionMarkers.indexOf(e);-1!=t&&this.session.$selectionMarkers.splice(t,1),this.session.selectionMarkerCount=this.session.$selectionMarkers.length}},this.removeSelectionMarkers=function(e){for(var t=this.session.$selectionMarkers,n=e.length;n--;){var i=e[n];if(i.marker){this.session.removeMarker(i.marker);var r=t.indexOf(i);-1!=r&&t.splice(r,1)}}this.session.selectionMarkerCount=t.length},this.$onAddRange=function(e){this.addSelectionMarker(e.range),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onRemoveRange=function(e){this.removeSelectionMarkers(e.ranges),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onMultiSelect=function(e){this.inMultiSelectMode||(this.inMultiSelectMode=!0,this.setStyle("ace_multiselect"),this.keyBinding.addKeyboardHandler(h.keyboardHandler),this.commands.setDefaultHandler("exec",this.$onMultiSelectExec),this.renderer.updateCursor(),this.renderer.updateBackMarkers())},this.$onSingleSelect=function(e){this.session.multiSelect.inVirtualMode||(this.inMultiSelectMode=!1,this.unsetStyle("ace_multiselect"),this.keyBinding.removeKeyboardHandler(h.keyboardHandler),this.commands.removeDefaultHandler("exec",this.$onMultiSelectExec),this.renderer.updateCursor(),this.renderer.updateBackMarkers(),this._emit("changeSelection"))},this.$onMultiSelectExec=function(e){var t=e.command,n=e.editor;if(n.multiSelect){if(t.multiSelectAction)"forEach"==t.multiSelectAction?i=n.forEachSelection(t,e.args):"forEachLine"==t.multiSelectAction?i=n.forEachSelection(t,e.args,!0):"single"==t.multiSelectAction?(n.exitMultiSelectMode(),i=t.exec(n,e.args||{})):i=t.multiSelectAction(n,e.args||{});else{var i=t.exec(n,e.args||{});n.multiSelect.addRange(n.multiSelect.toOrientedRange()),n.multiSelect.mergeOverlappingRanges()}return i}},this.forEachSelection=function(e,t,n){if(!this.inVirtualSelectionMode){var i,r=n&&n.keepOrder,s=1==n||n&&n.$byLines,o=this.session,l=this.selection,u=l.rangeList,c=(r?l:u).ranges;if(!c.length)return e.exec?e.exec(this,t||{}):e(this,t||{});var h=l._eventRegistry;l._eventRegistry={};var d=new a(o);this.inVirtualSelectionMode=!0;for(var f=c.length;f--;){if(s)for(;f>0&&c[f].start.row==c[f-1].end.row;)f--;d.fromOrientedRange(c[f]),d.index=f,this.selection=o.selection=d;var p=e.exec?e.exec(this,t||{}):e(this,t||{});!i&&void 0!==p&&(i=p),d.toOrientedRange(c[f])}d.detach(),this.selection=o.selection=l,this.inVirtualSelectionMode=!1,l._eventRegistry=h,l.mergeOverlappingRanges(),l.ranges[0]&&l.fromOrientedRange(l.ranges[0]);var g=this.renderer.$scrollAnimation;return this.onCursorChange(),this.onSelectionChange(),g&&g.from==g.to&&this.renderer.animateScrolling(g.from),i}},this.exitMultiSelectMode=function(){this.inMultiSelectMode&&!this.inVirtualSelectionMode&&this.multiSelect.toSingleRange()},this.getSelectedText=function(){var e="";if(this.inMultiSelectMode&&!this.inVirtualSelectionMode){for(var t=this.multiSelect.rangeList.ranges,n=[],i=0;i<t.length;i++)n.push(this.session.getTextRange(t[i]));var r=this.session.getDocument().getNewLineCharacter();(e=n.join(r)).length==(n.length-1)*r.length&&(e="")}else this.selection.isEmpty()||(e=this.session.getTextRange(this.getSelectionRange()));return e},this.$checkMultiselectChange=function(e,t){if(this.inMultiSelectMode&&!this.inVirtualSelectionMode){var n=this.multiSelect.ranges[0];if(this.multiSelect.isEmpty()&&t==this.multiSelect.anchor)return;var i=t==this.multiSelect.anchor?n.cursor==n.start?n.end:n.start:n.cursor;i.row!=t.row||this.session.$clipPositionToDocument(i.row,i.column).column!=t.column?this.multiSelect.toSingleRange(this.multiSelect.toOrientedRange()):this.multiSelect.mergeOverlappingRanges()}},this.findAll=function(e,t,n){if((t=t||{}).needle=e||t.needle,null==t.needle){var i=this.selection.isEmpty()?this.selection.getWordRange():this.selection.getRange();t.needle=this.session.getTextRange(i)}this.$search.set(t);var r=this.$search.findAll(this.session);if(!r.length)return 0;var s=this.multiSelect;n||s.toSingleRange(r[0]);for(var o=r.length;o--;)s.addRange(r[o],!0);return i&&s.rangeList.rangeAtPoint(i.start)&&s.addRange(i,!0),r.length},this.selectMoreLines=function(e,t){var n=this.selection.toOrientedRange(),i=n.cursor==n.end,r=this.session.documentToScreenPosition(n.cursor);this.selection.$desiredColumn&&(r.column=this.selection.$desiredColumn);var s,a=this.session.screenToDocumentPosition(r.row+e,r.column);if(n.isEmpty())u=a;else var l=this.session.documentToScreenPosition(i?n.end:n.start),u=this.session.screenToDocumentPosition(l.row+e,l.column);i?(s=o.fromPoints(a,u)).cursor=s.start:(s=o.fromPoints(u,a)).cursor=s.end;if(s.desiredColumn=r.column,this.selection.inMultiSelectMode){if(t)var c=n.cursor}else this.selection.addRange(n);this.selection.addRange(s),c&&this.selection.substractPoint(c)},this.transposeSelections=function(e){for(var t=this.session,n=t.multiSelect,i=n.ranges,r=i.length;r--;){if((a=i[r]).isEmpty()){var s=t.getWordRange(a.start.row,a.start.column);a.start.row=s.start.row,a.start.column=s.start.column,a.end.row=s.end.row,a.end.column=s.end.column}}n.mergeOverlappingRanges();var o=[];for(r=i.length;r--;){var a=i[r];o.unshift(t.getTextRange(a))}e<0?o.unshift(o.pop()):o.push(o.shift());for(r=i.length;r--;){s=(a=i[r]).clone();t.replace(a,o[r]),a.start.row=s.start.row,a.start.column=s.start.column}n.fromOrientedRange(n.ranges[0])},this.selectMore=function(e,t,n){var i=this.session,r=i.multiSelect.toOrientedRange();if(!r.isEmpty()||((r=i.getWordRange(r.start.row,r.start.column)).cursor=-1==e?r.start:r.end,this.multiSelect.addRange(r),!n)){var s=i.getTextRange(r),o=function(e,t,n){return d.$options.wrap=!0,d.$options.needle=t,d.$options.backwards=-1==n,d.find(e)}(i,s,e);o&&(o.cursor=-1==e?o.start:o.end,this.session.unfold(o),this.multiSelect.addRange(o),this.renderer.scrollCursorIntoView(null,.5)),t&&this.multiSelect.substractPoint(r.cursor)}},this.alignCursors=function(){var e=this.session,t=e.multiSelect,n=t.ranges,i=-1,r=n.filter((function(e){if(e.cursor.row==i)return!0;i=e.cursor.row}));if(n.length&&r.length!=n.length-1){r.forEach((function(e){t.substractPoint(e.cursor)}));var s=0,a=1/0,l=n.map((function(t){var n=t.cursor,i=e.getLine(n.row).substr(n.column).search(/\S/g);return-1==i&&(i=0),n.column>s&&(s=n.column),i<a&&(a=i),i}));n.forEach((function(t,n){var i=t.cursor,r=s-i.column,u=l[n]-a;r>u?e.insert(i,c.stringRepeat(" ",r-u)):e.remove(new o(i.row,i.column,i.row,i.column-r+u)),t.start.column=t.end.column=s,t.start.row=t.end.row=i.row,t.cursor=t.end})),t.fromOrientedRange(n[0]),this.renderer.updateCursor(),this.renderer.updateBackMarkers()}else{var u=this.selection.getRange(),h=u.start.row,d=u.end.row,f=h==d;if(f){var p,g=this.session.getLength();do{p=this.session.getLine(d)}while(/[=:]/.test(p)&&++d<g);do{p=this.session.getLine(h)}while(/[=:]/.test(p)&&--h>0);h<0&&(h=0),d>=g&&(d=g-1)}var m=this.session.removeFullLines(h,d);m=this.$reAlignText(m,f),this.session.insert({row:h,column:0},m.join("\n")+"\n"),f||(u.start.column=0,u.end.column=m[m.length-1].length),this.selection.setRange(u)}},this.$reAlignText=function(e,t){function n(e){return c.stringRepeat(" ",e)}function i(e){return e[2]?n(r)+e[2]+n(s-e[2].length+o)+e[4].replace(/^([=:])\s+/,"$1 "):e[0]}var r,s,o,a=!0,l=!0;return e.map((function(e){var t=e.match(/(\s*)(.*?)(\s*)([=:].*)/);return t?null==r?(r=t[1].length,s=t[2].length,o=t[3].length,t):(r+s+o!=t[1].length+t[2].length+t[3].length&&(l=!1),r!=t[1].length&&(a=!1),r>t[1].length&&(r=t[1].length),s<t[2].length&&(s=t[2].length),o>t[3].length&&(o=t[3].length),t):[e]})).map(t?i:a?l?function(e){return e[2]?n(r+s-e[2].length)+e[2]+n(o)+e[4].replace(/^([=:])\s+/,"$1 "):e[0]}:i:function(e){return e[2]?n(r)+e[2]+n(o)+e[4].replace(/^([=:])\s+/,"$1 "):e[0]})}}).call(p.prototype),t.onSessionChange=function(e){var t=e.session;t&&!t.multiSelect&&(t.$selectionMarkers=[],t.selection.$initRangeList(),t.multiSelect=t.selection),this.multiSelect=t&&t.multiSelect;var n=e.oldSession;n&&(n.multiSelect.off("addRange",this.$onAddRange),n.multiSelect.off("removeRange",this.$onRemoveRange),n.multiSelect.off("multiSelect",this.$onMultiSelect),n.multiSelect.off("singleSelect",this.$onSingleSelect),n.multiSelect.lead.off("change",this.$checkMultiselectChange),n.multiSelect.anchor.off("change",this.$checkMultiselectChange)),t&&(t.multiSelect.on("addRange",this.$onAddRange),t.multiSelect.on("removeRange",this.$onRemoveRange),t.multiSelect.on("multiSelect",this.$onMultiSelect),t.multiSelect.on("singleSelect",this.$onSingleSelect),t.multiSelect.lead.on("change",this.$checkMultiselectChange),t.multiSelect.anchor.on("change",this.$checkMultiselectChange)),t&&this.inMultiSelectMode!=t.selection.inMultiSelectMode&&(t.selection.inMultiSelectMode?this.$onMultiSelect():this.$onSingleSelect())},t.MultiSelect=r,e("./config").defineOptions(p.prototype,"editor",{enableMultiselect:{set:function(e){r(this),e?(this.on("changeSession",this.$multiselectOnSessionChange),this.on("mousedown",l)):(this.off("changeSession",this.$multiselectOnSessionChange),this.off("mousedown",l))},value:!0},enableBlockSelect:{set:function(e){this.$blockSelectEnabled=e},value:!0}})})),ace.define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],(function(e,t,n){"use strict";var i=e("../../range").Range,r=t.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(e,t,n){var i=e.getLine(n);return this.foldingStartMarker.test(i)?"start":"markbeginend"==t&&this.foldingStopMarker&&this.foldingStopMarker.test(i)?"end":""},this.getFoldWidgetRange=function(e,t,n){return null},this.indentationBlock=function(e,t,n){var r=/\S/,s=e.getLine(t),o=s.search(r);if(-1!=o){for(var a=n||s.length,l=e.getLength(),u=t,c=t;++t<l;){var h=e.getLine(t).search(r);if(-1!=h){if(h<=o)break;c=t}}if(c>u){var d=e.getLine(c).length;return new i(u,a,c,d)}}},this.openingBracketBlock=function(e,t,n,r,s){var o={row:n,column:r+1},a=e.$findClosingBracket(t,o,s);if(a){var l=e.foldWidgets[a.row];return null==l&&(l=e.getFoldWidget(a.row)),"start"==l&&a.row>o.row&&(a.row--,a.column=e.getLine(a.row).length),i.fromPoints(o,a)}},this.closingBracketBlock=function(e,t,n,r,s){var o={row:n,column:r},a=e.$findOpeningBracket(t,o);if(a)return a.column++,o.column--,i.fromPoints(a,o)}}).call(r.prototype)})),ace.define("ace/theme/textmate",["require","exports","module","ace/lib/dom"],(function(e,t,n){"use strict";t.isDark=!1,t.cssClass="ace-tm",t.cssText='.ace-tm .ace_gutter {background: #f0f0f0;color: #333;}.ace-tm .ace_print-margin {width: 1px;background: #e8e8e8;}.ace-tm .ace_fold {background-color: #6B72E6;}.ace-tm {background-color: #FFFFFF;color: black;}.ace-tm .ace_cursor {color: black;}.ace-tm .ace_invisible {color: rgb(191, 191, 191);}.ace-tm .ace_storage,.ace-tm .ace_keyword {color: blue;}.ace-tm .ace_constant {color: rgb(197, 6, 11);}.ace-tm .ace_constant.ace_buildin {color: rgb(88, 72, 246);}.ace-tm .ace_constant.ace_language {color: rgb(88, 92, 246);}.ace-tm .ace_constant.ace_library {color: rgb(6, 150, 14);}.ace-tm .ace_invalid {background-color: rgba(255, 0, 0, 0.1);color: red;}.ace-tm .ace_support.ace_function {color: rgb(60, 76, 114);}.ace-tm .ace_support.ace_constant {color: rgb(6, 150, 14);}.ace-tm .ace_support.ace_type,.ace-tm .ace_support.ace_class {color: rgb(109, 121, 222);}.ace-tm .ace_keyword.ace_operator {color: rgb(104, 118, 135);}.ace-tm .ace_string {color: rgb(3, 106, 7);}.ace-tm .ace_comment {color: rgb(76, 136, 107);}.ace-tm .ace_comment.ace_doc {color: rgb(0, 102, 255);}.ace-tm .ace_comment.ace_doc.ace_tag {color: rgb(128, 159, 191);}.ace-tm .ace_constant.ace_numeric {color: rgb(0, 0, 205);}.ace-tm .ace_variable {color: rgb(49, 132, 149);}.ace-tm .ace_xml-pe {color: rgb(104, 104, 91);}.ace-tm .ace_entity.ace_name.ace_function {color: #0000A2;}.ace-tm .ace_heading {color: rgb(12, 7, 255);}.ace-tm .ace_list {color:rgb(185, 6, 144);}.ace-tm .ace_meta.ace_tag {color:rgb(0, 22, 142);}.ace-tm .ace_string.ace_regex {color: rgb(255, 0, 0)}.ace-tm .ace_marker-layer .ace_selection {background: rgb(181, 213, 255);}.ace-tm.ace_multiselect .ace_selection.ace_start {box-shadow: 0 0 3px 0px white;}.ace-tm .ace_marker-layer .ace_step {background: rgb(252, 255, 0);}.ace-tm .ace_marker-layer .ace_stack {background: rgb(164, 229, 101);}.ace-tm .ace_marker-layer .ace_bracket {margin: -1px 0 0 -1px;border: 1px solid rgb(192, 192, 192);}.ace-tm .ace_marker-layer .ace_active-line {background: rgba(0, 0, 0, 0.07);}.ace-tm .ace_gutter-active-line {background-color : #dcdcdc;}.ace-tm .ace_marker-layer .ace_selected-word {background: rgb(250, 250, 255);border: 1px solid rgb(200, 200, 250);}.ace-tm .ace_indent-guide {background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y;}',t.$id="ace/theme/textmate",e("../lib/dom").importCssString(t.cssText,t.cssClass)})),ace.define("ace/line_widgets",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/range"],(function(e,t,n){"use strict";function i(e){this.session=e,this.session.widgetManager=this,this.session.getRowLength=this.getRowLength,this.session.$getWidgetScreenLength=this.$getWidgetScreenLength,this.updateOnChange=this.updateOnChange.bind(this),this.renderWidgets=this.renderWidgets.bind(this),this.measureWidgets=this.measureWidgets.bind(this),this.session._changedWidgets=[],this.$onChangeEditor=this.$onChangeEditor.bind(this),this.session.on("change",this.updateOnChange),this.session.on("changeFold",this.updateOnFold),this.session.on("changeEditor",this.$onChangeEditor)}e("./lib/oop");var r=e("./lib/dom");e("./range").Range;(function(){this.getRowLength=function(e){var t;return t=this.lineWidgets&&this.lineWidgets[e]&&this.lineWidgets[e].rowCount||0,this.$useWrapMode&&this.$wrapData[e]?this.$wrapData[e].length+1+t:1+t},this.$getWidgetScreenLength=function(){var e=0;return this.lineWidgets.forEach((function(t){t&&t.rowCount&&!t.hidden&&(e+=t.rowCount)})),e},this.$onChangeEditor=function(e){this.attach(e.editor)},this.attach=function(e){e&&e.widgetManager&&e.widgetManager!=this&&e.widgetManager.detach(),this.editor!=e&&(this.detach(),this.editor=e,e&&(e.widgetManager=this,e.renderer.on("beforeRender",this.measureWidgets),e.renderer.on("afterRender",this.renderWidgets)))},this.detach=function(e){var t=this.editor;if(t){this.editor=null,t.widgetManager=null,t.renderer.off("beforeRender",this.measureWidgets),t.renderer.off("afterRender",this.renderWidgets);var n=this.session.lineWidgets;n&&n.forEach((function(e){e&&e.el&&e.el.parentNode&&(e._inDocument=!1,e.el.parentNode.removeChild(e.el))}))}},this.updateOnFold=function(e,t){var n=t.lineWidgets;if(n&&e.action){for(var i=e.data,r=i.start.row,s=i.end.row,o="add"==e.action,a=r+1;a<s;a++)n[a]&&(n[a].hidden=o);n[s]&&(o?n[r]?n[s].hidden=o:n[r]=n[s]:(n[r]==n[s]&&(n[r]=void 0),n[s].hidden=o))}},this.updateOnChange=function(e){var t=this.session.lineWidgets;if(t){var n=e.start.row,i=e.end.row-n;if(0!==i)if("remove"==e.action){t.splice(n+1,i).forEach((function(e){e&&this.removeLineWidget(e)}),this),this.$updateRows()}else{var r=new Array(i);r.unshift(n,0),t.splice.apply(t,r),this.$updateRows()}}},this.$updateRows=function(){var e=this.session.lineWidgets;if(e){var t=!0;e.forEach((function(e,n){if(e)for(t=!1,e.row=n;e.$oldWidget;)e.$oldWidget.row=n,e=e.$oldWidget})),t&&(this.session.lineWidgets=null)}},this.addLineWidget=function(e){this.session.lineWidgets||(this.session.lineWidgets=new Array(this.session.getLength()));var t=this.session.lineWidgets[e.row];t&&(e.$oldWidget=t,t.el&&t.el.parentNode&&(t.el.parentNode.removeChild(t.el),t._inDocument=!1)),this.session.lineWidgets[e.row]=e,e.session=this.session;var n=this.editor.renderer;e.html&&!e.el&&(e.el=r.createElement("div"),e.el.innerHTML=e.html),e.el&&(r.addCssClass(e.el,"ace_lineWidgetContainer"),e.el.style.position="absolute",e.el.style.zIndex=5,n.container.appendChild(e.el),e._inDocument=!0),e.coverGutter||(e.el.style.zIndex=3),null==e.pixelHeight&&(e.pixelHeight=e.el.offsetHeight),null==e.rowCount&&(e.rowCount=e.pixelHeight/n.layerConfig.lineHeight);var i=this.session.getFoldAt(e.row,0);if(e.$fold=i,i){var s=this.session.lineWidgets;e.row!=i.end.row||s[i.start.row]?e.hidden=!0:s[i.start.row]=e}return this.session._emit("changeFold",{data:{start:{row:e.row}}}),this.$updateRows(),this.renderWidgets(null,n),this.onWidgetChanged(e),e},this.removeLineWidget=function(e){if(e._inDocument=!1,e.session=null,e.el&&e.el.parentNode&&e.el.parentNode.removeChild(e.el),e.editor&&e.editor.destroy)try{e.editor.destroy()}catch(e){}if(this.session.lineWidgets){var t=this.session.lineWidgets[e.row];if(t==e)this.session.lineWidgets[e.row]=e.$oldWidget,e.$oldWidget&&this.onWidgetChanged(e.$oldWidget);else for(;t;){if(t.$oldWidget==e){t.$oldWidget=e.$oldWidget;break}t=t.$oldWidget}}this.session._emit("changeFold",{data:{start:{row:e.row}}}),this.$updateRows()},this.getWidgetsAtRow=function(e){for(var t=this.session.lineWidgets,n=t&&t[e],i=[];n;)i.push(n),n=n.$oldWidget;return i},this.onWidgetChanged=function(e){this.session._changedWidgets.push(e),this.editor&&this.editor.renderer.updateFull()},this.measureWidgets=function(e,t){var n=this.session._changedWidgets,i=t.layerConfig;if(n&&n.length){for(var r=1/0,s=0;s<n.length;s++){var o=n[s];if(o&&o.el&&o.session==this.session){if(!o._inDocument){if(this.session.lineWidgets[o.row]!=o)continue;o._inDocument=!0,t.container.appendChild(o.el)}o.h=o.el.offsetHeight,o.fixedWidth||(o.w=o.el.offsetWidth,o.screenWidth=Math.ceil(o.w/i.characterWidth));var a=o.h/i.lineHeight;o.coverLine&&((a-=this.session.getRowLineCount(o.row))<0&&(a=0)),o.rowCount!=a&&(o.rowCount=a,o.row<r&&(r=o.row))}}r!=1/0&&(this.session._emit("changeFold",{data:{start:{row:r}}}),this.session.lineWidgetWidth=null),this.session._changedWidgets=[]}},this.renderWidgets=function(e,t){var n=t.layerConfig,i=this.session.lineWidgets;if(i){for(var r=Math.min(this.firstRow,n.firstRow),s=Math.max(this.lastRow,n.lastRow,i.length);r>0&&!i[r];)r--;this.firstRow=n.firstRow,this.lastRow=n.lastRow,t.$cursorLayer.config=n;for(var o=r;o<=s;o++){var a=i[o];if(a&&a.el)if(a.hidden)a.el.style.top=-100-(a.pixelHeight||0)+"px";else{a._inDocument||(a._inDocument=!0,t.container.appendChild(a.el));var l=t.$cursorLayer.getPixelPosition({row:o,column:0},!0).top;a.coverLine||(l+=n.lineHeight*this.session.getRowLineCount(a.row)),a.el.style.top=l-n.offset+"px";var u=a.coverGutter?0:t.gutterWidth;a.fixedWidth||(u-=t.scrollLeft),a.el.style.left=u+"px",a.fullWidth&&a.screenWidth&&(a.el.style.minWidth=n.width+2*n.padding+"px"),a.fixedWidth?a.el.style.right=t.scrollBar.getWidth()+"px":a.el.style.right=""}}}}}).call(i.prototype),t.LineWidgets=i})),ace.define("ace/ext/error_marker",["require","exports","module","ace/line_widgets","ace/lib/dom","ace/range"],(function(e,t,n){"use strict";function i(e,t,n){var i=e.getAnnotations().sort(o.comparePoints);if(i.length){var r=function(e,t,n){for(var i=0,r=e.length-1;i<=r;){var s=i+r>>1,o=n(t,e[s]);if(o>0)i=s+1;else{if(!(o<0))return s;r=s-1}}return-(i+1)}(i,{row:t,column:-1},o.comparePoints);r<0&&(r=-r-1),r>=i.length?r=n>0?0:i.length-1:0===r&&n<0&&(r=i.length-1);var s=i[r];if(s&&n){if(s.row===t){do{s=i[r+=n]}while(s&&s.row===t);if(!s)return i.slice()}var a=[];t=s.row;do{a[n<0?"unshift":"push"](s),s=i[r+=n]}while(s&&s.row==t);return a.length&&a}}}var r=e("../line_widgets").LineWidgets,s=e("../lib/dom"),o=e("../range").Range;t.showErrorMarker=function(e,t){var n=e.session;n.widgetManager||(n.widgetManager=new r(n),n.widgetManager.attach(e));var o=e.getCursorPosition(),a=o.row,l=n.widgetManager.getWidgetsAtRow(a).filter((function(e){return"errorMarker"==e.type}))[0];l?l.destroy():a-=t;var u,c=i(n,a,t);if(c){var h=c[0];o.column=(h.pos&&"number"!=typeof h.column?h.pos.sc:h.column)||0,o.row=h.row,u=e.renderer.$gutterLayer.$annotations[o.row]}else{if(l)return;u={text:["Looks good!"],className:"ace_ok"}}e.session.unfold(o.row),e.selection.moveToPosition(o);var d={row:o.row,fixedWidth:!0,coverGutter:!0,el:s.createElement("div"),type:"errorMarker"},f=d.el.appendChild(s.createElement("div")),p=d.el.appendChild(s.createElement("div"));p.className="error_widget_arrow "+u.className;var g=e.renderer.$cursorLayer.getPixelPosition(o).left;p.style.left=g+e.renderer.gutterWidth-5+"px",d.el.className="error_widget_wrapper",f.className="error_widget "+u.className,f.innerHTML=u.text.join("<br>"),f.appendChild(s.createElement("div"));var m=function(e,t,n){if(0===t&&("esc"===n||"return"===n))return d.destroy(),{command:"null"}};d.destroy=function(){e.$mouseHandler.isMousePressed||(e.keyBinding.removeKeyboardHandler(m),n.widgetManager.removeLineWidget(d),e.off("changeSelection",d.destroy),e.off("changeSession",d.destroy),e.off("mouseup",d.destroy),e.off("change",d.destroy))},e.keyBinding.addKeyboardHandler(m),e.on("changeSelection",d.destroy),e.on("changeSession",d.destroy),e.on("mouseup",d.destroy),e.on("change",d.destroy),e.session.widgetManager.addLineWidget(d),d.el.onmousedown=e.focus.bind(e),e.renderer.scrollCursorIntoView(null,.5,{bottom:d.el.offsetHeight})},s.importCssString("    .error_widget_wrapper {        background: inherit;        color: inherit;        border:none    }    .error_widget {        border-top: solid 2px;        border-bottom: solid 2px;        margin: 5px 0;        padding: 10px 40px;        white-space: pre-wrap;    }    .error_widget.ace_error, .error_widget_arrow.ace_error{        border-color: #ff5a5a    }    .error_widget.ace_warning, .error_widget_arrow.ace_warning{        border-color: #F1D817    }    .error_widget.ace_info, .error_widget_arrow.ace_info{        border-color: #5a5a5a    }    .error_widget.ace_ok, .error_widget_arrow.ace_ok{        border-color: #5aaa5a    }    .error_widget_arrow {        position: absolute;        border: solid 5px;        border-top-color: transparent!important;        border-right-color: transparent!important;        border-left-color: transparent!important;        top: -5px;    }","")})),ace.define("ace/ace",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/dom","ace/lib/event","ace/range","ace/editor","ace/edit_session","ace/undomanager","ace/virtual_renderer","ace/worker/worker_client","ace/keyboard/hash_handler","ace/placeholder","ace/multi_select","ace/mode/folding/fold_mode","ace/theme/textmate","ace/ext/error_marker","ace/config"],(function(e,t,n){"use strict";e("./lib/fixoldbrowsers");var i=e("./lib/dom"),r=e("./lib/event"),s=e("./range").Range,o=e("./editor").Editor,a=e("./edit_session").EditSession,l=e("./undomanager").UndoManager,u=e("./virtual_renderer").VirtualRenderer;e("./worker/worker_client"),e("./keyboard/hash_handler"),e("./placeholder"),e("./multi_select"),e("./mode/folding/fold_mode"),e("./theme/textmate"),e("./ext/error_marker"),t.config=e("./config"),t.require=e,"function"==typeof define&&(t.define=define),t.edit=function(e,n){if("string"==typeof e){var s=e;if(!(e=document.getElementById(s)))throw new Error("ace.edit can't find div #"+s)}if(e&&e.env&&e.env.editor instanceof o)return e.env.editor;var a="";if(e&&/input|textarea/i.test(e.tagName)){var l=e;a=l.value,e=i.createElement("pre"),l.parentNode.replaceChild(e,l)}else e&&(a=e.textContent,e.innerHTML="");var c=t.createEditSession(a),h=new o(new u(e),c,n),d={document:c,editor:h,onResize:h.resize.bind(h,null)};return l&&(d.textarea=l),r.addListener(window,"resize",d.onResize),h.on("destroy",(function(){r.removeListener(window,"resize",d.onResize),d.editor.container.env=null})),h.container.env=h.env=d,h},t.createEditSession=function(e,t){var n=new a(e,t);return n.setUndoManager(new l),n},t.Range=s,t.Editor=o,t.EditSession=a,t.UndoManager=l,t.VirtualRenderer=u,t.version="1.4.2"})),ace.require(["ace/ace"],(function(e){for(var t in e&&(e.config.init(!0),e.define=ace.define),window.ace||(window.ace=e),e)e.hasOwnProperty(t)&&(window.ace[t]=e[t]);window.ace.default=window.ace,"object"==typeof module&&"object"==typeof exports&&module&&(module.exports=window.ace)})),define("ace",(function(){})),angular.module("ui.ace",[]).constant("uiAceConfig",{}).directive("uiAce",["uiAceConfig",function(e){if(angular.isUndefined(window.ace))throw new Error("ui-ace need ace to work... (o rly?)");return{restrict:"EA",require:"?ngModel",link:function(t,n,i,r){var s,o,a=e.ace||{},l=angular.extend({},a,t.$eval(i.uiAce)),u=window.ace.edit(n[0]),c=u.getSession(),h=function(){var e=arguments[0],n=Array.prototype.slice.call(arguments,1);angular.isDefined(e)&&t.$apply((function(){if(!angular.isFunction(e))throw new Error("ui-ace use a function as callback.");e(n)}))},d=function(e){return function(n){var i=c.getValue();!r||i===r.$viewValue||t.$$phase||t.$root.$$phase||t.$applyAsync((function(){r.$setViewValue(i)})),h(e,n,u)}},f=function(e){return function(){h(e,u)}};i.$observe("readonly",(function(e){u.setReadOnly(!!e||""===e)})),r&&(r.$formatters.push((function(e){if(angular.isUndefined(e)||null===e)return"";if(angular.isObject(e)||angular.isArray(e))throw new Error("ui-ace cannot use an object or an array as a model");return e})),r.$render=function(){c.setValue(r.$viewValue)});var p=function(e,n){e!==n&&((l=angular.extend({},a,t.$eval(i.uiAce))).callbacks=[l.onLoad],l.onLoad!==a.onLoad&&l.callbacks.unshift(a.onLoad),c.removeListener("change",s),s=d(l.onChange),c.on("change",s),u.removeListener("blur",o),o=f(l.onBlur),u.on("blur",o),function(e,t,n){var i,r;if(angular.isDefined(n.workerPath)&&window.ace.require("ace/config").set("workerPath",n.workerPath),angular.isDefined(n.require)&&n.require.forEach((function(e){window.ace.require(e)})),angular.isDefined(n.showGutter)&&e.renderer.setShowGutter(n.showGutter),angular.isDefined(n.useWrapMode)&&t.setUseWrapMode(n.useWrapMode),angular.isDefined(n.showInvisibles)&&e.renderer.setShowInvisibles(n.showInvisibles),angular.isDefined(n.showIndentGuides)&&e.renderer.setDisplayIndentGuides(n.showIndentGuides),angular.isDefined(n.useSoftTabs)&&t.setUseSoftTabs(n.useSoftTabs),angular.isDefined(n.showPrintMargin)&&e.setShowPrintMargin(n.showPrintMargin),angular.isDefined(n.disableSearch)&&n.disableSearch&&e.commands.addCommands([{name:"unfind",bindKey:{win:"Ctrl-F",mac:"Command-F"},exec:function(){return!1},readOnly:!0}]),angular.forEach(n.callbacks,(function(t){angular.isFunction(t)&&t(e)})),angular.isString(n.theme)&&e.setTheme("ace/theme/"+n.theme),angular.isString(n.mode)&&t.setMode("ace/mode/"+n.mode),angular.isDefined(n.firstLineNumber)&&(angular.isNumber(n.firstLineNumber)?t.setOption("firstLineNumber",n.firstLineNumber):angular.isFunction(n.firstLineNumber)&&t.setOption("firstLineNumber",n.firstLineNumber())),angular.isDefined(n.advanced))for(i in n.advanced)r={name:i,value:n.advanced[i]},e.setOption(r.name,r.value);if(angular.isDefined(n.rendererOptions))for(i in n.rendererOptions)r={name:i,value:n.rendererOptions[i]},e.renderer.setOption(r.name,r.value)}(u,c,l))};t.$watch(i.uiAce,p,!0),p(a),n.on("$destroy",(function(){u.session.$stopWorker(),u.destroy()})),t.$watch((function(){return[n[0].offsetWidth,n[0].offsetHeight]}),(function(){u.resize(),u.renderer.updateFull()}),!0)}}}]),define("uiAce",["angular","ace"],(function(){})),angular.module("toastr",[]).directive("toast",["$compile","$interval","toastr",function(e,t,n){return{replace:!0,templateUrl:"templates/toastr/toastr.html",link:function(i,r,s){var o;if(i.toastClass=i.options.toastClass,i.titleClass=i.options.titleClass,i.messageClass=i.options.messageClass,i.options.closeHtml){var a=angular.element(i.options.closeHtml);a.addClass("toast-close-button"),a.attr("ng-click","close()"),e(a)(i),r.prepend(a)}function l(e){return t((function(){n.remove(i.toastId)}),e,1)}i.init=function(){i.options.timeOut&&(o=l(i.options.timeOut))},r.on("mouseenter",(function(){o&&t.cancel(o)})),i.tapToast=function(){i.options.tapToDismiss&&i.close()},i.close=function(){n.remove(i.toastId)},r.on("mouseleave",(function(){0===i.options.timeOut&&0===i.options.extendedTimeOut||(o=l(i.options.extendedTimeOut))}))}}}]).constant("toastrConfig",{allowHtml:!1,closeButton:!1,closeHtml:"<button>&times;</button>",containerId:"toast-container",extendedTimeOut:1e3,iconClasses:{error:"toast-error",info:"toast-info",success:"toast-success",warning:"toast-warning"},messageClass:"toast-message",newestOnTop:!0,positionClass:"toast-top-right",tapToDismiss:!0,timeOut:5e3,titleClass:"toast-title",toastClass:"toast"}).factory("toastr",["$animate","$compile","$document","$rootScope","$sce","toastrConfig","$q",function(e,t,n,i,r,s,o){var a,l=0,u=[],c=o.defer();return{clear:function(e){if(e)f(e.toastId);else for(var t=0;t<u.length;t++)f(u[t].toastId)},error:function(e,t,n){return d({iconClass:h().iconClasses.error,message:e,optionsOverride:n,title:t})},info:function(e,t,n){return d({iconClass:h().iconClasses.info,message:e,optionsOverride:n,title:t})},remove:f,success:function(e,t,n){return d({iconClass:h().iconClasses.success,message:e,optionsOverride:n,title:t})},warning:function(e,t,n){return d({iconClass:h().iconClasses.warning,message:e,optionsOverride:n,title:t})}};function h(){return angular.extend({},s)}function d(s){var o,d,f=h(),p={toastId:l++,scope:i.$new()};return p.iconClass=s.iconClass,s.optionsOverride&&(f=angular.extend(f,s.optionsOverride),p.iconClass=s.optionsOverride.iconClass||p.iconClass),function(e,t,n){n.allowHtml?(e.scope.allowHtml=!0,e.scope.title=r.trustAsHtml(t.title),e.scope.message=r.trustAsHtml(t.message)):(e.scope.title=t.title,e.scope.message=t.message);e.scope.toastType=e.iconClass,e.scope.toastId=e.toastId,e.scope.options={extendedTimeOut:n.extendedTimeOut,messageClass:n.messageClass,tapToDismiss:n.tapToDismiss,timeOut:n.timeOut,titleClass:n.titleClass,toastClass:n.toastClass},n.closeButton&&(e.scope.options.closeHtml=n.closeHtml)}(p,s,f),p.el=(o=p.scope,d=angular.element("<div toast></div>"),t(d)(o)),u.push(p),function(t){if(a)return c.promise;(a=angular.element("<div></div>")).attr("id",t.containerId),a.addClass(t.positionClass),a.css({"pointer-events":"auto"});var i=n.find("body").eq(0);return e.enter(a,i).then((function(){c.resolve()})),c.promise}(f).then((function(){f.newestOnTop?e.enter(p.el,a).then((function(){p.scope.init()})):e.enter(p.el,a,a[0].lastChild).then((function(){p.scope.init()}))})),p}function f(t){var n=function(e){for(var t=0;t<u.length;t++)if(u[t].toastId===e)return u[t]}(t);n&&e.leave(n.el).then((function(){n.scope.$destroy(),a&&0===a.children().length&&(u=[],a.remove(),a=null,c=o.defer())}))}}]),angular.module("toastr").run(["$templateCache",function(e){"use strict";e.put("templates/toastr/toastr.html",'<div class="{{toastClass}} {{toastType}}" ng-click="tapToast()">\n  <div ng-switch on="allowHtml">\n    <div ng-switch-default ng-if="title" class="{{titleClass}}">{{title}}</div>\n    <div ng-switch-default class="{{messageClass}}">{{message}}</div>\n    <div ng-switch-when="true" ng-if="title" class="{{titleClass}}" ng-bind-html="title"></div>\n    <div ng-switch-when="true" class="{{messageClass}}" ng-bind-html="message"></div>\n  </div>\n</div>')}]),define("ngToastr",["angular"],function(e){return function(){return e.ngToastr}}(this)),function(e,t){"function"==typeof define&&define.amd?define("angular-clipboard",["angular"],t):"object"==typeof module&&module.exports?module.exports=t(require("angular")):e.angularClipboard=t(e.angular)}(this,(function(e){return e.module("angular-clipboard",[]).factory("clipboard",["$document","$window",function(e,t){return{copyText:function(n,i){var r=t.pageXOffset||e[0].documentElement.scrollLeft,s=t.pageYOffset||e[0].documentElement.scrollTop,o=function(n,i){var r=e[0].createElement("textarea");return r.style.position="absolute",r.style.fontSize="12pt",r.style.border="0",r.style.padding="0",r.style.margin="0",r.style.left="-10000px",r.style.top=(t.pageYOffset||e[0].documentElement.scrollTop)+"px",r.textContent=n,r}(n);e[0].body.appendChild(o),function(t){try{e[0].body.style.webkitUserSelect="initial";var n=e[0].getSelection();n.removeAllRanges();var i=document.createRange();i.selectNodeContents(t),n.addRange(i),t.select(),t.setSelectionRange(0,999999);try{if(!e[0].execCommand("copy"))throw"failure copy"}finally{n.removeAllRanges()}}finally{e[0].body.style.webkitUserSelect=""}}(o),t.scrollTo(r,s),e[0].body.removeChild(o)},supported:"queryCommandSupported"in e[0]&&e[0].queryCommandSupported("copy")}}]).directive("clipboard",["clipboard",function(t){return{restrict:"A",scope:{onCopied:"&",onError:"&",text:"=",supported:"=?"},link:function(n,i){n.supported=t.supported,i.on("click",(function(r){try{t.copyText(n.text,i[0]),e.isFunction(n.onCopied)&&n.$evalAsync(n.onCopied())}catch(t){e.isFunction(n.onError)&&n.$evalAsync(n.onError({err:t}))}}))}}}])})),define("modules/projections/controllers/_module",["angular"],(function(e){"use strict";return e.module("es-ui.projections.controllers",["es-ui.projections.services"])})),define("modules/projections/controllers/ProjectionsItemDebugCtrl",["./_module"],(function(e){"use strict";return e.controller("ProjectionsItemDebugCtrl",["$scope","$state","$stateParams","$q","$timeout","$window","ProjectionsService","MessageService",function(e,t,n,i,r,s,o,a){function l(t){t||(t="N/A"),e.statusInfo=t}l(""),e.location=n.location,e.aceConfig={mode:"javascript",useWrapMode:!1,showGutter:!0,theme:"monokai",onChange:function(){e.queryUpdated=!0}},e.aceEventsConfig={mode:"json",useWrapMode:!1,showGutter:!0,theme:"monokai"},e.isRunning=!1,e.isUpdating=!1,e.query="",e.events="",e.state="";var u,c,h,d,f,p,g,m,v={};function y(){o.readEvents(h,d).then((function(t){var n=t.data;e.events=JSON.stringify(n,void 0,4),(u=n.events)&&u.length>0?function(){if(c=u[0],p)return void $();l("Running the definition..."),e.$broadcast("load-scripts"),r($,100)}():(l("No further events are available. Waiting..."),e.isRunning=!0,m=r(y,1e3))}),(function(e){a.failure("Failed to read projection events: "+e.message)}))}function $(){(g=document.getElementById("script-placeholder").contentWindow.processor)?(p=!0,l(""),f=null,function(t){t="("+t+")",e.currentPartition=t}(f=h.byCustomPartitions?g.get_state_partition(c.isJson?angular.toJson(c.data):c.data,c.isJson,c.eventStreamId,c.eventType,c.category,c.eventNumber,c.isJson?angular.toJson(c.metadata):c.metadata):h.byStream?c.eventStreamId:""),v[f]?w(v[f]):(l("Loading the projection state..."),o.state(e.location,{partition:f}).then((function(e){w(e.data)}),(function(e){l("Failed to load the projection state: "+e.message)})))):r($,1e3)}function w(t){var n;l("Ready for debugging!"),e.isRunning=!1,""===t?(g.initialize(),v[f]=g.debugging_get_state()):(t=function(e){try{var t=JSON.parse(e);if(t&&"object"==typeof t&&null!==t)return t}catch(e){}return!1}(t)?t:angular.toJson(t),v[f]=t,g.set_state(t));try{n=angular.fromJson(v[f]),e.state=n}catch(t){e.state=""}}l("Loading definition..."),a.info("The projection will be stopped for debugging"),o.disable(e.location).then((function(){!function(){v={};var t=[],n=o.statistics(e.location),r=o.state(e.location,{timeout:2e3}),s=o.query(e.location);t.push(n),t.push(r),t.push(s),i.allSettled(t).then((function(t){var n,i=t[0],r=t[1],s=t[2];if(i.data.projections[0].status.indexOf("Stopped")>-1&&i.data.projections[0].status.indexOf("Faulted")>-1&&(e.isRunning=!0),n=r.headers()["es-position"],d=angular.fromJson(n),h=s.data.definition,e.query=s.data.query,!d)return a.failure("The projection`s state query did not return an ES-Position header.\nEnsure that the projection is not Completed/Stopped or Faulted.\nWe cannot continue debugging.","Please ensure that the header includes ES-Position."),void(e.isRunning=!0);l(""),y()}),(function(t){var n=t[0],i=t[1],r=t[2];n&&!n.data&&a.failure("Failed to retrieve projection stats: "+n.message),i&&!i.data&&a.failure("Failed to retrieve projection state: "+i.message),r&&!r.data?a.failure("Failed to retrieve projection query: "+r.message):e.query=r.data.query}))}()}),(function(e){a.failure("Failed to stop projection: "+e.message)})),e.runStep=function(){var e=g.process_event(c.isJson?JSON.stringify(c.data):c.data,c.isJson,c.eventStreamId,c.eventType,c.category,c.eventNumber,c.isJson?JSON.stringify(c.metadata):c.metadata,c.isJson?JSON.stringify(c.linkMetadata):c.linkMetadata,f);v[f]=e,w(v[f]),d=c.readerPosition,y()},e.update=function(){e.isUpdating=!0,o.updateQuery(e.location,null,e.query).then((function(){a.info("Projection Updated"),s.location.reload()}),(function(t){e.isUpdating=!1,a.failure("Failed to update projection: "+t.message)}))},e.stop=function(){m&&(r.cancel(m),m=null),o.disable(e.location).then((function(){a.info("Projection Stopped"),e.isRunning=!1}),(function(e){a.failure("Failed to stop projection: "+e.message)}))},e.goBack=function(){n.fromQueryState?t.go("query",{location:e.location}):t.go("^.details")}}])})),define("modules/projections/controllers/ProjectionsItemDeleteCtrl",["./_module"],(function(e){"use strict";return e.controller("ProjectionsItemDeleteCtrl",["$scope","$state","$stateParams","ProjectionsService","MessageService",function(e,t,n,i,r){function s(n){i.remove(e.location,{deleteCheckpointStream:e.deleteCheckpoint?"yes":"no",deleteStateStream:e.deleteState?"yes":"no",deleteEmittedStreams:e.deleteEmittedStreams?"yes":"no"}).then((function(){r.success("Projection has been removed"),t.go("projections.list")}),(function(e){r.failure("Failed to remove projection: "+e.message)}))}e.location=n.location,e.projection={name:"",source:"",state:""},i.state(e.location).then((function(t){e.projection.state=t.data}),(function(e){r.failure("Failed to load the projection state: "+e.message)})),i.query(e.location).then((function(t){e.projection.source=t.data.query,e.projection.name=t.data.name}),(function(e){r.failure("Failed to load projection source: "+e.message)})),e.remove=function(t){t.preventDefault(),t.stopPropagation(),i.disable(e.location).then((function(){s(e.location)}),(function(t){-1!==t.message.indexOf("Not enabled")?s(e.location):r.failure("Failed to stop projection: "+t.message)}))}}])})),define("modules/projections/controllers/ProjectionsItemDetailsCtrl",["./_module"],(function(e){"use strict";return e.controller("ProjectionsItemDetailsCtrl",["$scope","$state","$stateParams","ProjectionsService","ProjectionsMonitor","MessageService",function(e,t,n,i,r,s){var o=null,a=null;e.location=n.location,e.aceConfig={mode:"javascript",useWrapMode:!1,showGutter:!0,theme:"monokai"},r.start(e.location,{partitionProvider:e}).then(null,null,(function(t){var n;t.statistics&&t.statistics.projections.length&&(e.stats=t.statistics.projections[0],e.isTransientProjection="Transient"==e.stats.mode,"$by_category"!==e.stats.name&&"$stream_by_category"!==e.stats.name||(e.aceConfig.mode="text"),null!==o&&(e.stats.eventsPerSecond=(1e3*(e.stats.eventsProcessedAfterRestart-o)/(new Date-a)).toFixed(1)),a=new Date,o=e.stats.eventsProcessedAfterRestart,n=e.stats.status,e.isRunning=!(0===n.indexOf("Loaded")||0===n.indexOf("Stopped")||0===n.indexOf("Completed")||0===n.indexOf("Faulted")),e.isStopped=!!~n.indexOf("Stopped")),t.query&&(t.query.definition?e.stream=t.query.definition.resultStreamName:e.stream=void 0,e.query=t.query.query),t.result&&(e.result=t.result),t.state&&(e.state=t.state)})),e.reset=function(){s.confirm("Projection reset is an unsafe operation. Any previously emitted events will be emitted again to the same streams and handled by their subscribers.\n\rAre you sure?")&&i.reset(e.location).then((function(){s.success("Projection has been reset")}),(function(e){s.failure("Failed to reset projection: "+e.message)}))},e.start=function(){i.enable(e.location).then((function(){s.success("Projection started")}),(function(e){s.failure("Failed to start projection: "+e.message)}))},e.stop=function(){i.disable(e.location).then((function(){s.success("Projection has been stopped")}),(function(e){s.failure("Failed to stop projection: "+e.message)}))},e.$on("$destroy",(function(){r.stop()})),e.clearState=function(){e.state=void 0}}])})),define("modules/projections/controllers/ProjectionsItemEditCtrl",["./_module"],(function(e){"use strict";return e.controller("ProjectionsItemEditCtrl",["$scope","$state","$stateParams","ProjectionsService","ProjectionsMonitor","MessageService",function(e,t,n,i,r,s){e.location=n.location,e.aceConfig={mode:"javascript",useWrapMode:!1,showGutter:!0,theme:"monokai"},i.query(e.location).then((function(t){var n=t.data;e.query=n.query,n.definition?e.stream=n.definition.resultStreamName:e.stream=void 0,e.emit=n.emitEnabled}),(function(e){s.failure("Failed to load projection source: "+e.message)})),r.start(e.location,{partitionProvider:e,ignoreQuery:!0}).then(null,null,(function(t){var n;t.statistics&&t.statistics.projections.length&&(e.stats=t.statistics.projections[0],"$by_category"!==e.stats.name&&"$stream_by_category"!==e.stats.name||(e.aceConfig.mode="text"),n=e.stats.status,e.isRunning=!(0===n.indexOf("Loaded")||0===n.indexOf("Stopped")||0===n.indexOf("Completed")||0===n.indexOf("Faulted")),e.isStopped=!!~n.indexOf("Stopped")),t.result&&(e.result=t.result),t.state&&(e.state=t.state)})),e.save=function(){i.updateQuery(e.location,e.emit?"yes":"no",e.query).then((function(){s.success("Projection saved")}),(function(e){s.failure("Failed to save projection: "+e.message)}))},e.reset=function(){s.confirm("Projection reset is an unsafe operation. Any previously emitted events will be emitted again to the same streams and handled by their subscribers.\n\rAre you sure?")&&i.reset(e.location).then((function(){s.success("Projection has been reset")}),(function(e){s.failure("Failed to reset projection: "+e.message)}))},e.start=function(){i.enable(e.location).then((function(){s.success("Projection started")}),(function(e){s.failure("Failed to start projection: "+e.message)}))},e.stop=function(){i.disable(e.location).then((function(){s.success("Projection stopped")}),(function(e){s.failure("Failed to stop projection: "+e.message)}))},e.$on("$destroy",(function(){r.stop()}))}])})),define("modules/projections/controllers/ProjectionsItemConfigCtrl",["./_module"],(function(e){"use strict";return e.controller("ProjectionsItemConfigCtrl",["$scope","$state","$stateParams","ProjectionsService","ProjectionsMonitor","MessageService",function(e,t,n,i,r,s){e.location=n.location,i.configuration(e.location).then((function(t){e.config=t.data}),(function(t){e.config={},s.failure("Failed to load projection configuration: "+t.message)})),r.start(e.location,{ignoreQuery:!0}).then(null,null,(function(t){t.statistics&&t.statistics.projections.length&&(e.stats=t.statistics.projections[0]),t.result&&(e.result=t.result),t.state&&(e.state=t.state)})),e.save=function(){var t={emitEnabled:e.config.emitEnabled,trackEmittedStreams:e.config.trackEmittedStreams,checkpointAfterMs:e.config.checkpointAfterMs,checkpointHandledThreshold:e.config.checkpointHandledThreshold,checkpointUnhandledBytesThreshold:e.config.checkpointUnhandledBytesThreshold,pendingEventsThreshold:e.config.pendingEventsThreshold,maxWriteBatchLength:e.config.maxWriteBatchLength,maxAllowedWritesInFlight:e.config.maxAllowedWritesInFlight,projectionExecutionTimeout:e.config.projectionExecutionTimeout};i.updateConfiguration(e.location,t).then((function(){s.success("Projection configuration saved")}),(function(e){s.failure("Failed to save projection configuration: "+e.message)}))},e.$on("$destroy",(function(){r.stop()}))}])})),define("modules/projections/controllers/ProjectionsListCtrl",["./_module"],(function(e){"use strict";return e.controller("ProjectionsListCtrl",["$rootScope","$scope","$timeout","ProjectionsService","ProjectionsMapper","poller","MessageService","$state",function(e,t,n,i,r,s,o,a){function l(){if(!e.projectionsEnabled)return o.failure("Projections are not enabled on the node"),void a.go("dashboard.list");var l=s.create({interval:2e3,action:i.all,params:[!1]});l.start(),l.promise.then(null,null,(function(e){t.projections=r.map(e)})),l.promise.catch((function(e){o.failure("Failed to retrieve list of projections: "+e.message),l.stop()})),t.disableAll=function(e){e.preventDefault(),e.stopPropagation(),o.confirm("Are you sure you want to disable & stop all projections?")&&i.disableAll().then((function(){o.success("All projections have been disabled")}),(function(e){o.failure("Failed to disable all the projections: "+e)}))},t.enableAll=function(e){e.preventDefault(),e.stopPropagation(),o.confirm("Are you sure you want to enable & start all projections?")&&i.enableAll().then((function(){o.success("All projections have been enabled")}),(function(e){o.failure("Failed to enable all projections: "+e)}))},t.includeQueries=!1,t.toggleIncludeQueries=function(){t.includeQueries=!t.includeQueries},t.showCopiedMessage=function(e){e.copied=!0,o.success('Copied "'+e.name+'" to clipboard'),n((function(){e.copied=!1}),4e3)};var u=t.$watch("includeQueries",(function(e,t){e!==t&&l.update({params:[e]})}));t.$on("$destroy",(function(){u(),s.clear()}))}if(e.initialized)l();else var u=e.$on("initialized",(function(){l(),u()}))}])})),define("modules/projections/controllers/ProjectionsNewCtrl",["./_module"],(function(e){"use strict";return e.controller("ProjectionsNewCtrl",["$scope","$state","ProjectionsService","MessageService",function(e,t,n,i){function r(e){return e?"yes":"no"}e.aceConfig={mode:"javascript",useWrapMode:!1,showGutter:!0,theme:"monokai"},e.modes=[{value:"onetime",name:"One-Time"},{value:"continuous",name:"Continuous"}],e.mode="onetime",e.enabled=!0,e.checkpointsDisabled=!1,e.checkpoints=!1,e.trackEmittedStreams=!1,e.save=function(){if(e.newProj.$invalid)i.warn("Please fix all validation errors");else{var s={name:e.name,emit:r(e.emit),checkpoints:r(e.checkpoints),enabled:r(e.enabled),trackemittedstreams:r(e.trackemittedstreams)};n.create(e.mode,e.source,s).then((function(e){var n=(0,e.headers)().location;t.go("^.item.details",{location:encodeURIComponent(n)})}),(function(e){i.failure("Failed to create new projection: "+e.message)}))}};var s=e.$watch("mode",(function(t,n){t!==n&&("continuous"===t?(e.checkpoints=!0,e.checkpointsDisabled=!0):(e.checkpointsDisabled=!1,e.checkpoints=!0))}));e.$on("$destroy",(function(){s()}))}])})),define("modules/projections/controllers/ProjectionsStandardCtrl",["./_module"],(function(e){"use strict";return e.controller("ProjectionsStandardCtrl",["$scope","$state","ProjectionsService","MessageService",function(e,t,n,i){e.types=[{value:"native:EventStore.Projections.Core.Standard.IndexStreams",name:"Index Streams"},{value:"native:EventStore.Projections.Core.Standard.CategorizeStreamByPath",name:"Categorize Stream by Path"},{value:"native:EventStore.Projections.Core.Standard.CategorizeEventsByStreamPath",name:"Categorize Event by Stream Path"},{value:"native:EventStore.Projections.Core.Standard.IndexEventsByEventType",name:"Index Events by Event Type"},{value:"native:EventStore.Projections.Core.Standard.StubHandler",name:"Reading Speed Test Handler"}],e.aceConfig={mode:"javascript",useWrapMode:!1,showGutter:!0,theme:"monokai"},e.type="native:EventStore.Projections.Core.Standard.IndexStreams",e.save=function(){e.newProj.$invalid?i.info("Please fix all validation errors"):n.createStandard(e.name,e.type,e.source).then((function(e){var n=(0,e.headers)().location;t.go("^.item.details",{location:encodeURIComponent(n)})}),(function(e){i.failure("Failed to create new standard projection: "+e.message)}))}}])})),define("modules/projections/controllers/QueryCtrl",["./_module"],(function(e){"use strict";return e.controller("QueryCtrl",["$scope","$state","$stateParams","QueryService","ProjectionsMonitor","MessageService","ProjectionsService",function(e,t,n,i,r,s,o){var a;function l(){return r.stop(),i.disable(a)}function u(){e.maximized=!1;i.update(a,e.query).then((function(){var t=i.enable(a);e.state=void 0,r.stop(),r.start(a,{ignoreQuery:!0,ignoreResult:!0}).then(null,null,(function(t){var n,i,r,s;if(t.state&&(e.state=t.state,e.isStopped&&l()),t.statistics&&t.statistics.projections.length){i=(n=t.statistics.projections[0]).status,r=n.stateReason,e.status=i;var o=r.match(/[^\r\n]+/g);e.stateReason=null!==o&&o.length>0?o[0]:r,s=!!~i.indexOf("Stopped")&&!~i.indexOf("Preparing")||!!~i.indexOf("Faulted")||!!~i.indexOf("Completed"),e.isStopped=s,e.progress=n.progress}})),t.catch((function(e){s.failure("Failed to start query: "+e.message),r.stop()}))}),(function(e){404===e.statusCode?s.failure("The query was not updated because it was not found. The query probably expired and was deleted."):s.failure("Failed to update the query: "+e.message)}))}n.location?(a=n.location,o.query(a).then((function(t){e.query=t.data.query}),(function(e){s.failure("Failed to load query source: "+e.message)}))):n.initStreamId?e.query="fromStream('"+n.initStreamId+"')\n  .when({\n  })":e.query=i.retrieveQuery(),e.aceConfig={mode:"javascript",useWrapMode:!1,showGutter:!0,theme:"monokai",onChange:function(){i.rememberQuery(e.query)}},e.disableStop=function(){return!e.isCreated||!!e.isStopped},e.run=function(){e.isCreated?u():i.create(e.query,{emit:"no",checkpoints:"no",enabled:"no"}).then((function(t){var n=t.headers;a=n().location,e.isCreated=!0,u()}),(function(t){e.isCreated=!1,s.failure("Failed to create new query: "+t.message)}))},e.stop=function(){l().catch((function(e){s.failure("Failed to stop query: "+e.message)}))},e.debug=function(){i.disable(a).then((function(){i.reset(a).then((function(){t.go("projections.item.debug",{location:encodeURIComponent(a),fromQueryState:!0},{inherit:!1})}),(function(e){s.failure("Failed to reset query: "+e.message)}))}),(function(e){s.failure("Failed to stop query: "+e.message)}))};var c=e.$watch("query",(function(e,t,n){}));e.$on("$destroy",(function(){c(),r.stop()}))}])})),define("modules/projections/controllers/_index",["./ProjectionsItemDebugCtrl","./ProjectionsItemDeleteCtrl","./ProjectionsItemDetailsCtrl","./ProjectionsItemEditCtrl","./ProjectionsItemConfigCtrl","./ProjectionsListCtrl","./ProjectionsNewCtrl","./ProjectionsStandardCtrl","./QueryCtrl"],(function(){})),define("modules/projections/services/_module",["angular"],(function(e){"use strict";return e.module("es-ui.projections.services",[])})),define("modules/projections/services/ProjectionsService",["./_module"],(function(e){"use strict";return e.provider("ProjectionsService",(function(){this.$get=["$http","$q","urls","constants","UrlBuilder","uri",function(e,t,n,i,r,s){function o(n,i,r){var s=n(),o=t.defer();return s.then((function(n){var s,a=n.data,l=[],u=[];angular.forEach(a.projections,(function(t){s=t.statusUrl+i,t.status!==r&&(l.push(e.post(s)),u.push(t))})),0!==l.length?t.allSettled(l).then((function(e){o.resolve(e)}),(function(e){for(var t="",n=0,i=0;i<e.length;i++)e[i].data||(n>0&&(t+=", "),t+=u[i].name+": "+e[i].message,n+=1);o.reject(t)})):o.resolve([])}),(function(e){o.reject("Failed to retrieve projections list: "+e.message)})),o.promise}return{all:function(t){var i;return i=t?r.build(n.projections.any):r.build(n.projections.allNonTransient),e.get(i)},disableAll:function(){return o(this.all,n.projections.disable,i.projectionStatus.stopped)},enableAll:function(){return o(this.all,n.projections.enable,i.projectionStatus.running)},create:function(t,i,o){var a=s.getQuery(o),l=r.build(n.projections.create,t)+a;return e.post(l,i)},createStandard:function(t,i,s,o){var a=r.build(n.projections.createStandard,t,i);return e.post(a,s)},status:function(t,n){return t=r.simpleBuild("%s",t),e.get(t,n)},partitionedState:function(t){return function(i,o,a){var l;return o&&!o.timeout?(t.partition&&(o.partition=t.partition),l="?"+s.getQuery(o)):(l=t.partition?"?"+s.getQuery({partition:t.partition}):"",a=o),i=r.simpleBuild(n.projections.state,i)+l,e.get(i,a)}},state:function(t,i,o){var a;return i&&!i.timeout?(a=s.getQuery(i),t=r.simpleBuild(n.projections.state,t)+"?"+a):(o=i,t=r.simpleBuild(n.projections.state,t)),e.get(t,o)},result:function(t,i){return t=r.simpleBuild(n.projections.result,t),e.get(t,i)},statistics:function(t,i){return t=r.simpleBuild(n.projections.statistics,t),e.get(t,i)},query:function(t,i,s){return t=i&&!i.timeout?r.simpleBuild(n.projections.queryWithoutConfig,t):r.simpleBuild(n.projections.query,t),e.get(t,s)},readEvents:function(t,i,s){var o,a=r.build(n.projections.readEvents);return o={query:t,position:i,maxEvents:s=s||10},e.post(a,JSON.stringify(o))},remove:function(t,i,o){i.timeout&&(i=void 0);var a=s.getQuery(i);return t=r.simpleBuild(n.projections.remove,t)+a,e.delete(t)},reset:function(t){return t=r.simpleBuild(n.projections.commands.reset,t),e.post(t)},enable:function(t){return t=r.simpleBuild(n.projections.commands.enable,t),e.post(t)},disable:function(t){return t=r.simpleBuild(n.projections.commands.disable,t),e.post(t)},updateQuery:function(t,i,s){return t=i?r.simpleBuild(n.projections.updateQuery,t)+i:r.simpleBuild(n.projections.updatePlainQuery,t),e.put(t,s)},configuration:function(t){return t=r.simpleBuild(n.projections.configuration,t),e.get(t)},updateConfiguration:function(t,i){return t=r.simpleBuild(n.projections.configuration,t),e.put(t,i,{headers:{"Content-Type":"application/json"}})}}}]}))})),define("modules/projections/services/ProjectionsMapper",["./_module"],(function(e){"use strict";return e.provider("ProjectionsMapper",(function(){var e,t={};function n(n){var i,r,s,o,a,l=n.projections,u={},c=new Date,h=0,d=l.length;for(l.sort((function(e,t){return e.name.localeCompare(t.name)}));h<d;h++)a=(i=l[h]).name,o=t[a],u[a]=i,void 0!==o&&e&&(r=i.eventsProcessedAfterRestart-o.eventsProcessedAfterRestart,s=c-e,i.eventsPerSecond=(1e3*r/s).toFixed(1)),i.location=encodeURIComponent(i.statusUrl),l[h]=i;return t=u,e=c,l}this.$get=[function(){return{map:n}}]}))})),define("modules/projections/services/ProjectionsMonitor",["./_module"],(function(e){"use strict";return e.factory("ProjectionsMonitor",["$q","poller","ProjectionsService","MessageService",function(e,t,n,i){var r;function s(e,n,i,r){var s=t.create({interval:1e3,action:n,params:[e]});return s.start(),s.promise.then(null,r,i),s}return{start:function(t,o){return o=o||{},r=e.defer(),o.ignoreStats||s(t,n.statistics,(function(e){r?r.notify({statistics:e}):console.log("deffered is null")}),(function(e){i.failure("Failed to fetch projection statistics: "+e.message)})),!o.ignoreState&&o.partitionProvider?s(t,n.partitionedState(o.partitionProvider),(function(e){r?r.notify({state:e}):console.log("deffered is null")}),(function(e){i.failure("Failed to fetch projection partition state: "+e.message)})):o.ignoreState||o.partitionProvider||s(t,n.state,(function(e){r?r.notify({state:e}):console.log("deffered is null")}),(function(e){i.failure("Failed to fetch projection state: "+e.message)})),o.ignoreQuery||s(t,n.query,(function(e){r?r.notify({query:e}):console.log("deffered is null")}),(function(e){i.failure("Failed to fetch projection query: "+e.message)})),o.ignoreResult||s(t,n.result,(function(e){r?r.notify({result:e}):console.log("deffered is null")}),(function(e){i.failure("Failed to fetch projection result: "+e.message)})),r.promise},stop:function(){t.clear(),null,null,null,null,r&&r.resolve()}}}])})),define("modules/projections/services/QueryService",["./_module"],(function(e){"use strict";return e.provider("QueryService",(function(){this.$get=["$http","$q","urls","UrlBuilder","uri",function(e,t,n,i,r){return{rememberQuery:function(e){localStorage&&localStorage.setItem("latest-query",e)},retrieveQuery:function(){return localStorage&&localStorage.getItem("latest-query")||""},create:function(t,s){var o=r.getQuery(s),a=i.build(n.query.create)+o;return e.post(a,t)},update:function(t,r){return t=i.simpleBuild(n.query.update,t),e.put(t,r)},state:function(t){return t=i.simpleBuild(n.query.state,t),e.get(t)},enable:function(t){return t=i.simpleBuild(n.query.commands.enable,t),e.post(t)},disable:function(t){return t=i.simpleBuild(n.query.commands.disable,t),e.post(t)},reset:function(t){return t=i.simpleBuild(n.query.commands.reset,t),e.post(t)}}}]}))})),define("modules/projections/services/AtomEventsReader",["./_module"],(function(e){"use strict";return e.factory("AtomEventsReader",["$q","$timeout","StreamsService","uri","poller",function(e,t,n,i,r){var s,o;return{start:function(t){return this.stop(),s=e.defer(),(o=r.create({interval:1e3,action:n.streamEvents,params:[t]})).start(),o.promise.then(null,null,(function(e){r.stopAll();var t,o,a,l,u=function(e){var t,n,r,s,o=[],a={};for(t=e.entries,r=e.links.length,n=0;n<r;n++)(s=e.links[n]).fullUri=s.uri,s.uri="#"+i.parse(s.uri).pathname,"previous"===s.relation&&(a={index:n,uri:s.fullUri}),o.push(s);return{headOfStream:e.headOfStream,entries:t,links:o,previous:a}}(e);s.notify(u),t=u.previous,o=e.headOfStream,a=function(){r.resume()},l=function(){r.clear(),s.resolve()},o?(t.uri||a(),n.validateFullUrl(t.uri).then((function(){a()}),(function(e){console.error("Failed to validate URL: "+t.uri+". Error: "+e.message)}))):l()})),o.promise.catch((function(e){r.clear(),s.reject(e)})),s.promise},map:function(e,t){var n,i,r=e.length;for(n=0;n<r;n++){if(t[(i=e[n]).title]&&(i.showJson=!0),i.metaData)try{i.metaDataParsed=JSON.parse(i.metaData)}catch(e){i.metaDataParsed=null}if(i.linkMetaData)try{i.linkMetaDataParsed=JSON.parse(i.linkMetaData)}catch(e){i.linkMetaDataParsed=null}e[n]=i}return e},stop:function(){r.clear(),s=null},pause:function(){r.pauseAll()},resume:function(){r.resume()},resumePaused:function(){r.resumePaused()}}}])})),define("modules/projections/services/_index",["./ProjectionsService","./ProjectionsMapper","./ProjectionsMonitor","./QueryService","./AtomEventsReader"],(function(){})),define("modules/projections/directives/_module",["angular"],(function(e){"use strict";return e.module("es-ui.projections.directives",[])})),define("modules/projections/directives/EsProjDebugFrame",["./_module"],(function(e){"use strict";return e.directive("esProjDebugFrame",["$rootScope",function(e){return{restrict:"A",scope:{esLocation:"="},link:function(t,n){var i='<div id="text"></div><script src="BASE_URI/web/es/js/projections/v8/Prelude/Modules.js"><\/script><script src="BASE_URI/web/es/js/projections/v8/Prelude/Projections.js"><\/script><script src="BASE_URI/web/es/js/projections/es.projections.environment.js"><\/script><script src="BASE_URI/web/es/js/projections/v8/Prelude/1Prelude.js"><\/script><script>window.processor = $initialize_hosted_projections(); processor.set_debugging();<\/script><script src="LOCATION/query"><\/script>';i=(i=i.replace(/BASE_URI/g,e.baseUrl)).replace(/LOCATION/g,decodeURIComponent(t.esLocation)),t.$on("load-scripts",(function(){!function(){var e=document.getElementById("script-placeholder");e&&e.parentNode.removeChild(e)}();var e,t=document.createElement("iframe");t.setAttribute("frameborder","0"),t.setAttribute("width","100%"),t.id="script-placeholder",n[0].appendChild(t),e=t.document,t.contentDocument?e=t.contentDocument:t.contentWindow&&(e=t.contentWindow.document),e.open(),e.writeln(i),e.close()}))}}}])})),define("modules/projections/directives/_index",["./EsProjDebugFrame"],(function(){})),define("modules/projections/templates/templates",["angular"],(function(e){"use strict";!function(t){try{t=e.module("es-ui.projections.templates")}catch(n){t=e.module("es-ui.projections.templates",[])}t.run(["$templateCache",function(e){e.put("projections.item.config.tpl.html",'<header class=page-header><h2 class=page-title>Projection Configuration</h2><ul class=page-nav><li class=page-nav__item><button ng-click=save()>Save</button></li><li class=page-nav__item><a ui-sref=^.details>Back</a></li></ul></header><h3>{{stats.name}} - {{stats.status}}</h3><p><strong>mode: </strong><span>{{stats.mode}}</span></p><p style="background-color: #FF4A80; color: white" ng-if=stats.stateReason>{{stats.stateReason}}</p><table><tbody><tr class=table-subheading><td colspan=2>Projection Configuration</td></tr><tr><td>Emit Enabled</td><td><input type=checkbox ng-model=config.emitEnabled required class=form-table name=emit></td></tr><tr><td>Track Emitted Streams</td><td><input type=checkbox ng-model=config.trackEmittedStreams required class=form-table name=trackEmittedStreams></td></tr><tr><td>Checkpoint After (ms)</td><td><input ng-model=config.checkpointAfterMs required class=form-table name=checkpointAfterMs></td></tr><tr><td>Checkpoint Handled Threshold</td><td><input ng-model=config.checkpointHandledThreshold required class=form-table name=checkpointHandledThreshold></td></tr><tr><td>Checkpoint Unhandled Threshold (bytes)</td><td><input ng-model=config.checkpointUnhandledBytesThreshold required class=form-table name=checkpointUnhandledBytesThreshold></td></tr><tr><td>Pending Events Threshold</td><td><input ng-model=config.pendingEventsThreshold required class=form-table name=pendingEventsThreshold></td></tr><tr><td>Max Write Batch Length</td><td><input ng-model=config.maxWriteBatchLength required class=form-table name=maxWriteBatchLength></td></tr><tr><td>Maximum Number Of Allowed Writes In Flight</td><td><input ng-model=config.maxAllowedWritesInFlight required class=form-table name=maxAllowedWritesInFlight></td></tr><tr><td>Per Event Projection Processing Timeout</td><td><input ng-model=config.projectionExecutionTimeout required class=form-table name=projectionExecutionTimeout></td></tr></tbody></table>')}])}(),function(t){try{t=e.module("es-ui.projections.templates")}catch(n){t=e.module("es-ui.projections.templates",[])}t.run(["$templateCache",function(e){e.put("projections.item.debug.tpl.html",'<header class=page-header><h2 class=page-title>Projection Debug</h2><ul class=page-nav><li class=page-nav__item><button ng-click=runStep() ng-disabled=isRunning>Run Step</button></li><li class=page-nav__item><button ng-click=stop() ng-disabled=!isRunning>Stop</button></li><li class=page-nav__item><button ng-click=update() ng-disabled=isUpdating>Update</button></li><li class=page-nav__item><a ng-click=goBack()>Back</a></li></ul></header><h3>Current Status: <small>{{statusInfo}}</small></h3><div class=container><div class=container-left><h3 class=block-title>Source</h3><div ng-show=queryUpdated><h4>The query has been updated but not saved. Your changes will not take effect until you hit the "Update" button</h4></div><div ui-ace=aceConfig ng-model=query></div></div><div class=container-right><h3 class=block-title>State {{ currentPartition }}</h3><pre>\n{{ state | json }}\n\t\t\t\t</pre><h3 class=block-title>Events</h3><div ui-ace=aceEventsConfig readonly=true ng-model=events></div></div></div><div class=container><div class=container-left><div class=block><h3 class=block-title>Instructions</h3><ol><li>Make sure you use the Google Chrome browser.</li><li>Open a debugger (<kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>J</kbd> on Windows).</li><li>Check the debugger console for errors (occurred while running the projection definition on while loading state and events).</li><li>Click the ‘Run’ button above.</li><li>Watch for errors in the debugger console</li><li>Check the debugging status on XXXXXXXXX.</li><li>Execution will stop on ‘debugger’ statement immediately before invoking your event handler.</li></ol><p>Any log output and emitted events will appear in the log viewer.</p><p class=note--warning>The projection will be debugged using the browsers javascript engine and may behave differently than when it is running normally</p></div></div><div class=container-right><h3 class=block-title>Log Viewer</h3><div es-proj-debug-frame es-location=location></div></div></div>')}])}(),function(t){try{t=e.module("es-ui.projections.templates")}catch(n){t=e.module("es-ui.projections.templates",[])}t.run(["$templateCache",function(e){e.put("projections.item.delete.tpl.html","<header class=page-header><h2 class=page-title>Delete Projection</h2><ul class=page-nav><li class=page-nav__item><a ng-click=remove($event) href=#>Confirm Delete</a> <a ui-sref=^.details>Back</a></li></ul></header><table><tbody><tr><td>Name</td><td><span>{{ projection.name }}</span></td></tr><tr><td>State</td><td><span>{{ projection.state }}</span></td></tr><tr><td>Source</td><td><pre>\n{{ projection.source }}\n\t\t\t\t</pre></td></tr><tr><td></td><td><label><input type=checkbox ng-model=deleteCheckpoint> Delete Checkpoint Stream</label></td></tr><tr><td></td><td><label><input type=checkbox ng-model=deleteState> Delete State Stream</label></td></tr><tr><td></td><td><label><input type=checkbox ng-model=deleteEmittedStreams> Delete Emitted Streams</label></td></tr></tbody></table>")}])}(),function(t){try{t=e.module("es-ui.projections.templates")}catch(n){t=e.module("es-ui.projections.templates",[])}t.run(["$templateCache",function(e){e.put("projections.item.details.tpl.html",'<header class=page-header><h2 class=page-title>Projection Details</h2><ul class=page-nav><li class=page-nav__item><button ng-click=start() ng-disabled=isRunning href=#>Start</button></li><li class=page-nav__item><button ng-click=stop() ng-disabled=isStopped>Stop</button></li><li class=page-nav__item><a ui-sref=^.edit>Edit</a></li><li class=page-nav__item><a ui-sref=^.config>Config</a></li><li ng-show=!isTransientProjection class=page-nav__item><a ui-sref=^.debug>Debug</a></li><li class=page-nav__item><a ui-sref=^.delete ng-if=!isRunning>Delete</a> <a title="a Projection must be stopped before it may be deleted." ng-if=isRunning ng-disabled=isRunning>Delete</a></li><li ng-show=!isTransientProjection class=page-nav__item><button ng-click=reset($event)>Reset</button></li><li class=page-nav__item><a ui-sref=^.^.list>Back</a></li></ul></header><h3>{{stats.name}} - {{stats.status}}</h3><p><strong>mode: </strong><span>{{stats.mode}}</span></p><p style="background-color: #FF4A80; color: white" ng-if=stats.stateReason>{{stats.stateReason}}</p><div class=container><div class=container-left><h3 class=block-title>Source</h3><div readonly=true ui-ace=aceConfig ng-model=query></div></div><div class=container-right><table><thead><tr><th colspan=2>Stats</th></tr></thead><tbody><tr><td>Events/sec</td><td>{{ stats.eventsPerSecond }}</td></tr><tr><td>Buffered events</td><td>{{ stats.bufferedEvents }}</td></tr><tr><td>Events processed</td><td>{{ stats.eventsProcessedAfterRestart }}</td></tr><tr><td>Partitions cached</td><td>{{ stats.partitionsCached }}</td></tr><tr><td>Reads in-progress</td><td>{{ stats.readsInProgress }}</td></tr><tr><td>Writes in-progress</td><td>{{ stats.writesInProgress }}</td></tr><tr><td>Write queue</td><td>{{ stats.writePendingEventsAfterCheckpoint }}</td></tr><tr><td>Write queue (chkp)</td><td>{{ stats.writePendingEventsBeforeCheckpoint }}</td></tr><tr><td>Checkpoint status</td><td>{{ stats.checkpointStatus }}</td></tr><tr><td>Position</td><td>{{ stats.position }}</td></tr><tr><td>Last checkpoint</td><td>{{ stats.lastCheckpoint }}</td></tr></tbody></table><table><thead><tr><th colspan=2>Results <span ng-show=stream>(<a ui-sref="streams.item.events({streamId: stream})">{{ stream }}</a>)</span></th></tr></thead><tbody><tr><td colspan=2><pre>{{result | json}}</pre></td></tr></tbody></table><table><thead><tr><th colspan=2>State</th></tr></thead><tbody><tr><td colspan=2><input ng-model=partition ng-change=clearState() placeholder=partition></td></tr><tr><td colspan=2><pre>{{state | json}}</pre></td></tr></tbody></table></div></div>')}])}(),function(t){try{t=e.module("es-ui.projections.templates")}catch(n){t=e.module("es-ui.projections.templates",[])}t.run(["$templateCache",function(e){e.put("projections.item.edit.tpl.html",'<header class=page-header><h2 class=page-title>Projection Edit</h2><ul class=page-nav><li class=page-nav__item><button ng-click=start() ng-disabled=isRunning href=#>Start</button></li><li class=page-nav__item><button ng-click=stop() ng-disabled=isStopped>Stop</button></li><li class=page-nav__item><button ng-click=save()>Save</button></li><li class=page-nav__item><button ng-click=reset($event)>Reset</button></li><li class=page-nav__item ng-hide=maximized><button ng-click="maximized = true">Maximize</button></li><li class=page-nav__item ng-show=maximized><button ng-click="maximized = false">Minimize</button></li><li class=page-nav__item><a ui-sref=^.details>Back</a></li></ul></header><h3>{{stats.name}} - {{stats.status}}</h3><p ng-hide=maximized><strong>mode: </strong><span>{{stats.mode}}</span></p><p style="background-color: #FF4A80; color: white" ng-if=stats.stateReason>{{stats.stateReason}}</p><div class=container><div class=edit-projection ng-class="{ \'container-left\': !maximized, maximized: maximized }"><h3 class=block-title ng-hide=maximized>Source</h3><div ui-ace=aceConfig ng-model=query></div><label><input type=checkbox ng-model=emit>Emit enabled</label></div><div ng-hide=maximized class=container-right><table><thead><tr><th colspan=2>Results <span ng-show=stream>(<a ui-sref="streams.item.events({streamId: stream})">{{ stream }}</a>)</span></th></tr></thead><tbody><tr><td colspan=2><pre>{{result | json}}</pre></td></tr></tbody><thead><tr><th colspan=2>State</th></tr></thead><tbody><tr><td colspan=2><input ng-model=partition ng-change=clearState() placeholder=partition></td></tr><tr><td colspan=2><pre>{{state | json}}</pre></td></tr></tbody></table></div></div>')}])}(),function(t){try{t=e.module("es-ui.projections.templates")}catch(n){t=e.module("es-ui.projections.templates",[])}t.run(["$templateCache",function(e){e.put("projections.item.tpl.html","<div ui-view></div>")}])}(),function(t){try{t=e.module("es-ui.projections.templates")}catch(n){t=e.module("es-ui.projections.templates",[])}t.run(["$templateCache",function(e){e.put("projections.list.tpl.html",'<header class=page-header><h2 class=page-title>Projections</h2><ul class=page-nav><li class=page-nav__item><a ng-click=disableAll($event)>Disable All</a></li><li class=page-nav__item><a ng-click=enableAll($event)>Enable All</a></li><li class=page-nav__item><a ng-if=includeQueries class=highlight ng-click=toggleIncludeQueries()>Don\'t Include Queries</a> <a ng-if=!includeQueries ng-click=toggleIncludeQueries()>Include Queries</a></li><li class=page-nav__item><a ui-sref=^.new>New Projection</a></li></ul></header><table class=table-projections><thead><tr><th>Name</th><th>Status</th><th>Checkpoint Status</th><th>Mode</th><th>Done</th><th>Read / Write in Progress</th><th>Write Queues</th><th>Partitions Cached</th><th>Rate (events/s)</th><th colspan=2>Events</th></tr><tr><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th class=table-subheading>Processed</th><th class=table-subheading>Buffered</th></tr></thead><tbody ng-repeat="projection in projections"><tr><td><a ui-sref="^.item.details({location: projection.location})">{{ projection.name }}</a><li class="page-nav__item copy-icon-right"><a ui-sref=# clipboard ng-class="{ copied: projection.copied }" text=projection.name on-copied=showCopiedMessage(projection)>⎘</a></li></td><td>{{ projection.status }}</td><td>{{ projection.checkpointStatus == \'\' ? \'-\' : projection.checkpointStatus }}</td><td>{{ projection.mode }}</td><td>{{ projection.progress.toFixed(1) }}%</td><td>{{ projection.readsInProgress }} / {{ projection.writesInProgress }}</td><td>{{ projection.writePendingEventsAfterCheckpoint }} / {{ projection.writePendingEventsBeforeCheckpoint }}</td><td>{{ projection.partitionsCached }}</td><td>{{ projection.eventsPerSecond }}</td><td>{{ projection.eventsProcessedAfterRestart }}</td><td>{{ projection.bufferedEvents }}</td></tr><tr ng-if="projection.status.indexOf(\'Faulted\') !== -1"><td style="background-color: #FF4A80; color: white; font-size: .9rem; padding-left: 2rem;" colspan=10000>{{ projection.stateReason }}</td></tr><tr ng-hide=projections><td colspan=10><em>No projections</em></td></tr></tbody></table>')}])}(),function(t){try{t=e.module("es-ui.projections.templates")}catch(n){t=e.module("es-ui.projections.templates",[])}t.run(["$templateCache",function(e){e.put("projections.new.tpl.html",'<header class=page-header><h2 class=page-title>New Projection</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.list>Back</a></li></ul></header><div><a ui-sref=^.standard>You can also post a standard projection</a></div><form novalidate name=newProj ng-submit=save() class=new-projection-form><table><tbody><tr><td>Name</td><td><input ng-model=name required class=form-table name=projName ng-class="{ \'form-table--error\' : newProj.projName.$invalid && !newProj.projName.$pristine }"></td></tr><tr><td>Source</td><td><div ui-ace=aceConfig required ng-model=source></div></td></tr><tr><td>Mode</td><td><select ng-model=mode class=form-table ng-options="obj.value as obj.name for obj in modes"></select></td></tr><tr><td>Checkpoints Enabled</td><td><input type=checkbox ng-model=checkpoints ng-disabled=checkpointsDisabled></td></tr><tr><td>Emit Enabled</td><td><input type=checkbox ng-model=emit></td></tr><tr><td>Track Emitted Streams</td><td><input type=checkbox ng-model=trackemittedstreams ng-disabled=trackEmittedStreamsDisabled></td></tr><tr><td>Enabled</td><td><input type=checkbox ng-model=enabled></td></tr></tbody></table><ul class=page-nav><li class=page-nav__item><button type=submit ng-disabled=newProj.$invalid>Create</button></li></ul></form>')}])}(),function(t){try{t=e.module("es-ui.projections.templates")}catch(n){t=e.module("es-ui.projections.templates",[])}t.run(["$templateCache",function(e){e.put("projections.standard.tpl.html",'<header class=page-header><h2 class=page-title>New Standard Projection</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.list>Back</a></li></ul></header><form novalidate name=newProj ng-submit=save()><table><tbody><tr><td>Name</td><td><input ng-model=name required class=form-table name=projName ng-class="{ \'form-table--error\' : newProj.projName.$invalid && !newProj.projName.$pristine }"></td></tr><tr><td>Source</td><td><div ui-ace=aceConfig required ng-model=source></div></td></tr><tr><td>Select Type</td><td><select ng-model=type required class=form-table ng-options="obj.value as obj.name for obj in types"></select></td></tr></tbody></table><ul class=page-nav><li class=page-nav__item><button type=submit ng-disabled=newProj.$invalid>Create</button></li></ul></form>')}])}(),function(t){try{t=e.module("es-ui.projections.templates")}catch(n){t=e.module("es-ui.projections.templates",[])}t.run(["$templateCache",function(e){e.put("projections.tpl.html","<div ui-view></div>")}])}(),function(t){try{t=e.module("es-ui.projections.templates")}catch(n){t=e.module("es-ui.projections.templates",[])}t.run(["$templateCache",function(e){e.put("query.tpl.html",'<header class=page-header><h2 class=page-title>Query</h2><ul class=page-nav><li class=page-nav__item><button ng-click=run()>Run</button></li><li class=page-nav__item><button ng-click=stop() ng-disabled=disableStop()>Break</button></li><li class=page-nav__item><button ng-click=debug() ng-disabled=!isCreated>Debug</button></li><li class=page-nav__item ng-hide=maximized><button ng-click="maximized = true">Maximize</button></li><li class=page-nav__item ng-show=maximized><button ng-click="maximized = false">Minimize</button></li></ul></header><h3 ng-visible=status>{{status}} <span ng-if="isStopped === false && progress > 0">({{ progress | number:2 }}%)</span><br></h3><i>{{stateReason}}</i><div class=container><div class=edit-projection ng-class=" { \'container-left\': !maximized, maximized: maximized }"><h3 class=block-title>Source</h3><div ui-ace=aceConfig ng-model=query></div></div><div ng-hide=maximized class=container-right><h3 class=block-title>State</h3><pre ng-if="state !== undefined">\n{{state | json}}\n\t\t</pre></div></div>')}])}()})),define("modules/projections/_index",["angular","uiRouter","./controllers/_index","./services/_index","./directives/_index","./templates/templates"],(function(e){"use strict";return e.module("es-ui.projections",["ui.router","es-ui.projections.controllers","es-ui.projections.services","es-ui.projections.directives","es-ui.projections.templates"])})),define("modules/projections/module",["./_index"],(function(e){"use strict";return e.config(["$stateProvider",function(e){e.state("projections",{url:"projections",parent:"app",abstract:!0,templateUrl:"projections.tpl.html",data:{title:"Projections"}}).state("projections.list",{url:"",templateUrl:"projections.list.tpl.html",controller:"ProjectionsListCtrl",data:{title:"Projections"}}).state("projections.new",{url:"/new",templateUrl:"projections.new.tpl.html",controller:"ProjectionsNewCtrl",data:{title:"New Projection"}}).state("projections.standard",{url:"/standard",templateUrl:"projections.standard.tpl.html",controller:"ProjectionsStandardCtrl",data:{title:"New Standard Projection"}}).state("projections.item",{url:"/{location}",abstract:!0,templateUrl:"projections.item.tpl.html"}).state("projections.item.details",{url:"",templateUrl:"projections.item.details.tpl.html",controller:"ProjectionsItemDetailsCtrl",data:{title:"Projection Details"}}).state("projections.item.delete",{url:"/delete",templateUrl:"projections.item.delete.tpl.html",controller:"ProjectionsItemDeleteCtrl",data:{title:"Projection Delte"}}).state("projections.item.debug",{url:"/debug?fromQueryState",templateUrl:"projections.item.debug.tpl.html",controller:"ProjectionsItemDebugCtrl",data:{title:"Projection Debug"}}).state("projections.item.edit",{url:"/edit",templateUrl:"projections.item.edit.tpl.html",controller:"ProjectionsItemEditCtrl",data:{title:"Projection Edit"}}).state("projections.item.config",{url:"/config",templateUrl:"projections.item.config.tpl.html",controller:"ProjectionsItemConfigCtrl",data:{title:"Projection Configuration"}}).state("query",{url:"query?location&initStreamId",parent:"app",templateUrl:"query.tpl.html",controller:"QueryCtrl",data:{title:"Query"}})}])})),define("modules/admin/controllers/_module",["angular"],(function(e){"use strict";return e.module("es-ui.admin.controllers",["es-ui.admin.services"])})),define("modules/admin/controllers/AdminCtrl",["./_module"],(function(e){"use strict";return e.controller("AdminCtrl",["$scope","AdminService","MessageService","poller","$state","ScavengeNotificationService","constants","$timeout",function(e,t,n,i,r,s,o,a){e.subSystems=null,e.scavengeHistory=null,e.noSubSystemsText="No sub systems are running.",e.noScavengeHistoryText="No scavenges have been run.",e.polling=!1,t.getSubsystems().then((function(t){var n=t.data;n&&(e.subSystems=n)}),(function(t){401===t.statusCode?e.noSubSystemsText="You are not authorized to view enabled sub systems.":n.failure("Failed to retrieve sub systems: "+t.message)}));var l=function(e){e.preventDefault(),e.stopPropagation()};function u(t){if(t){for(var n={},i=0;i<t.entries.length;i++){var r=t.entries[i],s=JSON.parse(r.data),o=n[s.scavengeId];o||(o={scavengeId:s.scavengeId,nodeEndpoint:s.nodeEndpoint},n[s.scavengeId]=o),"$scavengeStarted"===r.eventType&&(o.startTime=new Date(r.updated)),"$scavengeCompleted"===r.eventType&&(o.endTime=new Date(r.updated),o.result=s.result)}for(var a=Object.keys(n).map((function(e){return n[e]})),l=[],u=0;u<a.length;u++)a[u].startTime&&l.push(a[u]);e.scavengeHistory=l}}e.shutdown=function(e){l(e),n.confirm("Are you sure you wish to shutdown the node?")&&t.shutdown().then((function(){n.success("Server shutdown initiated")}),(function(e){n.failure("Shutdown failed: "+e.message)}))},e.scavenge=function(e){l(e),t.scavenge().then((function(){d()}),(function(e){n.failure("Scavenge failed: "+e.message)}))},e.stopScavenge=function(e,i){l(e),t.stopScavenge(i.scavengeId).then(null,(function(e){n.failure("Stopping scavenge "+i.scavengeId+" failed: "+e.message)}))},e.scavengeHistoryButton=function(){r.go("streams.item.events",{streamId:"$scavenges"})};var c,h={};function d(){!0!==e.polling&&(e.polling=!0,(h=i.create({interval:o.scavengeStatus.pollInterval,action:t.scavengeStatus,params:[]})).start(),h.promise.then(null,(function(t){return 401===t.statusCode?(e.noScavengeHistoryText="You are not authorized to view the scavenge history",void(e.polling=!1)):404===t.statusCode?(e.noScavengeHistoryText="No scavenges have been run.",void(e.polling=!1)):(c&&(a.cancel(c),c=null),void(c=a((function(){d()}),o.scavengeStatus.pollInterval)))}),u))}d(),e.$on("$destroy",(function(){c&&(a.cancel(c),c=null),h.stop()}))}])})),define("modules/admin/controllers/ScavengeCtrl",["./_module"],(function(e){"use strict";return e.controller("ScavengeCtrl",["$scope","$state","AdminService","MessageService","poller","constants",function(e,t,n,i,r,s){e.pagination={pageNumber:parseInt(t.params.page),fromEventNumber:parseInt(t.params.from),pageSize:20,canGoForward:function(){return e.pagination.lastEventPos>0},canGoBackward:function(){return e.pagination.pageNumber>0}},e.scavengeInfo=[],e.scavengeId=t.params.scavengeId;var o=null;function a(t){if(t.length>0){var n=t[t.length-1],i=t[0];e.nodeEndpoint=JSON.parse(i.data).nodeEndpoint,e.pagination.firstEventPos=i.positionEventNumber,e.pagination.lastEventPos=n.positionEventNumber}!function(t){for(var n=[],i=0;i<t.length;i++){var r,s=t[i];switch(s.eventType){case"$scavengeStarted":n.push({status:"Started",type:s.EventType});break;case"$scavengeChunksCompleted":if(r="No chunks scavenged",(o=JSON.parse(s.data)).wasScavenged)r=o.chunkEndNumber-o.chunkStartNumber+1+" chunk(s) scavenged";o.errorMessage&&(r="Error: "+o.errorMessage),n.push({status:"Scavenging chunks "+o.chunkStartNumber+" - "+o.chunkEndNumber+" complete",timeTaken:o.timeTaken,spaceSaved:o.spaceSaved,type:s.eventType,result:r});break;case"$scavengeMergeCompleted":if(r="No chunks merged",(o=JSON.parse(s.data)).wasMerged)r=o.chunkEndNumber-o.chunkStartNumber+1+" chunk(s) merged";o.errorMessage&&(r="Error: "+o.errorMessage),n.push({status:"Merging chunks "+o.chunkStartNumber+" - "+o.chunkEndNumber+" complete",timeTaken:o.timeTaken,spaceSaved:o.spaceSaved,type:s.eventType,result:r});break;case"$scavengeIndexCompleted":var o;r="Index table not scavenged",(o=JSON.parse(s.data)).wasScavenged&&(r=o.entriesDeleted+" index entries scavenged"),o.errorMessage&&(r="Error: "+o.errorMessage);var a="("+o.level+","+o.index+")";n.push({status:"Scavenging index table "+a+" complete",timeTaken:o.timeTaken,spaceSaved:o.spaceSaved,type:s.eventType,result:r});break;case"$scavengeCompleted":var l=JSON.parse(s.data);r=l.result,"Failed"===l.result&&(r+=": "+l.error),n.push({status:"Completed",timeTaken:l.timeTaken,spaceSaved:l.spaceSaved,type:s.EventType,result:r})}e.scavengeInfo=n}}(t)}e.pageForward=function(){if(e.pagination.canGoForward()){var n=e.pagination.pageNumber+1,i=e.pagination.lastEventPos-1;t.go("scavenge",{scavengeId:e.scavengeId,page:n,from:i})}},e.pageBackward=function(){if(e.pagination.canGoBackward()){var n=e.pagination.pageNumber-1,i=e.pagination.firstEventPos+e.pagination.pageSize;t.go("scavenge",{scavengeId:e.scavengeId,page:n,from:i})}},0===e.pagination.pageNumber?(e.pagination.fromEventNumber="head",(o=r.create({interval:s.scavengeStatus.pollInterval,action:n.scavengeInfo,params:[e.scavengeId,e.pagination.fromEventNumber,e.pagination.pageSize]})).start(),o.promise.then(null,(function(e){i.failure("Failed to retrieve scavenge info: "+e.message)}),(function(e){a(e.entries)}))):n.scavengeInfo(e.scavengeId,e.pagination.fromEventNumber,e.pagination.pageSize).then((function(e){a(e.data.entries)}),(function(e){i.failure("Failed to retrieve scavenge info: "+e.message)})),e.$on("$destroy",(function(){o&&o.stop()}))}])})),define("modules/admin/controllers/_index",["./AdminCtrl","./ScavengeCtrl"],(function(){})),define("modules/admin/services/_module",["angular"],(function(e){"use strict";return e.module("es-ui.admin.services",[])})),define("modules/admin/services/AdminService",["./_module"],(function(e){"use strict";return e.provider("AdminService",(function(){this.$get=["$http","urls","UrlBuilder",function(e,t,n){return{halt:function(){var i=n.build(t.admin.halt);return e.post(i)},shutdown:function(){var i=n.build(t.admin.shutdown);return e.post(i)},scavenge:function(){var i=n.build(t.admin.scavenge);return e.post(i)},stopScavenge:function(i){var r=n.build(t.admin.scavenge+"/"+i);return e.delete(r)},getSubsystems:function(){var i=n.build(t.system.subsystems);return e.get(i)},scavengeStatus:function(){var i=n.build(t.streams.scavenges+"?embed=tryharder");return e.get(i)},scavengeInfo:function(i,r,s){var o=n.build(t.streams.scavenges+"/"+i+"/"+r+"/"+s+"?embed=tryharder");return e.get(o)},lastScavengeStatus:function(){var i=n.build(t.streams.scavenges+"/head/1?embed=tryharder");return e.get(i)}}}]}))})),define("modules/admin/services/_index",["./AdminService"],(function(){})),define("modules/admin/templates/templates",["angular"],(function(e){"use strict";!function(t){try{t=e.module("es-ui.admin.templates")}catch(n){t=e.module("es-ui.admin.templates",[])}t.run(["$templateCache",function(e){e.put("admin.tpl.html",'<header class=page-header><h2 class=page-title>Admin</h2><ul class=page-nav><li class=page-nav__item><a href=# ng-click=shutdown($event)>Shutdown Server</a></li><li class=page-nav__item><a href=# ng-click=scavenge($event)>Scavenge</a></li></ul></header><div class=container><div class=container-left><table><thead><tr><th>Enabled Sub Systems</th></tr></thead><tbody><tr ng-repeat="subSystem in subSystems"><td>{{ subSystem }}</td></tr><tr ng-hide=subSystems><td><em>{{noSubSystemsText}}</em></td></tr></tbody></table></div><div class=container-right><table><thead><tr><th>Scavenge</th><th>Started</th><th>Completed</th><th>Result</th></tr></thead><tbody><tr ng-hide=scavengeHistory><td colspan=4><em>{{noScavengeHistoryText}}</em></td></tr><tr ng-repeat="history in scavengeHistory track by history.scavengeId | orderBy : \'startTime\'"><td><a ui-sref="scavenge({scavengeId: history.scavengeId, page: 0, from: 0})">{{history.nodeEndpoint}}<br>{{history.scavengeId}}</a></td><td>{{history.startTime | date:\'yyyy-MM-dd HH:mm\'}}</td><td><span ng-show=history.endTime>{{history.endTime | date:\'yyyy-MM-dd HH:mm\'}}</span><span ng-hide=history.endTime><em>Not Finished</em></span></td><td><span ng-show=history.result>{{history.result}}</span> <span ng-hide=history.result class=page-nav__item><a ui-sref=# ng-click="stopScavenge($event, history)">Cancel</a></span></td></tr></tbody></table><span class=note--warning>If the progress of your scavenge(s) does not appear to be updating, this might indicate that there was an issue writing the status to disk. Please consult your logs.</span><ul class=page-nav><li class=page-nav__item><a ng-click=scavengeHistoryButton()>Scavenge History</a></li></ul></div></div>')}])}(),function(t){try{t=e.module("es-ui.admin.templates")}catch(n){t=e.module("es-ui.admin.templates",[])}t.run(["$templateCache",function(e){e.put("scavenge.tpl.html",'<header class=page-header><h2 class=page-title>Scavenge {{nodeEndpoint}}</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=admin>Back</a></li></ul></header><h3 class=page-title><em>{{scavengeId}}</em></h3><ul style="list-style-type: none; padding:0 0 0.75rem 0 !important"><li class=page-nav__item><a ng-click=pageForward() ng-disabled=!pagination.canGoForward()>Next</a> <a ng-click=pageBackward() ng-disabled=!pagination.canGoBackward()>Previous</a></li></ul><br><div class=container><table><thead><tr><th>Status</th><th>Space Saved (bytes)</th><th>Time Taken</th><th>Result</th></tr></thead><tbody><tr ng-repeat="info in scavengeInfo"><td>{{info.status}}</td><td>{{info.spaceSaved | number}}</td><td>{{info.timeTaken}}</td><td>{{info.result}}</td></tr></tbody></table></div>')}])}()})),define("modules/admin/_index",["angular","uiRouter","./controllers/_index","./services/_index","./templates/templates"],(function(e){"use strict";return e.module("es-ui.admin",["ui.router","es-ui.admin.controllers","es-ui.admin.services","es-ui.admin.templates"])})),define("modules/admin/module",["./_index"],(function(e){"use strict";return e.config(["$stateProvider",function(e){e.state("admin",{url:"admin",parent:"app",templateUrl:"admin.tpl.html",controller:"AdminCtrl",data:{title:"Admin"}}).state("scavenge",{url:"scavenge/{scavengeId}/?page?from",parent:"app",templateUrl:"scavenge.tpl.html",controller:"ScavengeCtrl",data:{title:"Scavenge"}})}])})),define("modules/dashboard/controllers/_module",["angular"],(function(e){"use strict";return e.module("es-ui.dashboard.controllers",["es-ui.dashboard.services"])})),define("modules/dashboard/controllers/DashboardListCtrl",["./_module"],(function(e){"use strict";return e.controller("DashboardListCtrl",["$scope","DashboardService","DashboardMapper","poller","MessageService","constants",function(e,t,n,i,r,s){var o=i.create({interval:1e3,action:t.stats,params:[]});e.queues={},e.queues.__tag="queues",o.start(),o.promise.then(null,null,(function(t){e.queues=n.map(t,e.queues)})),o.promise.catch((function(t){r.failure("Failed to fetch dashboard stats: "+t.message),e.queues=null,o.stop()})),e.tcpStats=[];var a=i.create({interval:s.tcpStats.pollInterval,action:t.tcpStats,params:[]});function l(e,t){if(!t)return null;for(var n=0;n<t.length;n++)if(t[n].connectionId===e)return t[n];return null}a.start(),a.promise.then(null,null,(function(t){for(var n=0;n<t.length;n++){var i=t[n],r=l(i.connectionId,e.tcpStats);i.averageBytesSentPerSecond=r?i.totalBytesSent-r.totalBytesSent:0,i.averageBytesReceivedPerSecond=r?i.totalBytesReceived-r.totalBytesReceived:0}e.tcpStats=t})),a.promise.catch((function(t){r.failure("Failed to fetch TCP connection stats: "+t.message),e.tcpStats=null,a.stop()})),e.tcpStatsPaging={currentPage:0,pageSize:5,canPageNext:function(){return e.tcpStatsPaging.currentPage<e.tcpStats.length/e.tcpStatsPaging.pageSize-1},canPagePrevious:function(){return e.tcpStatsPaging.currentPage>0},nextPage:function(){e.tcpStatsPaging.canPageNext()&&e.tcpStatsPaging.currentPage++},previousPage:function(){e.tcpStatsPaging.canPagePrevious()&&e.tcpStatsPaging.currentPage--}},e.$on("$destroy",(function(){i.clear(),e.queues={},e.tcpStats=[]}))}]).filter("startFrom",(function(){return function(e,t){if(e)return t=parseInt(t),e.slice(t)}}))})),define("modules/dashboard/controllers/DashboardSnapshotCtrl",["./_module"],(function(e){"use strict";return e.controller("DashboardSnaphostCtrl",["$scope","DashboardService","SprintfService","MessageService",function(e,t,n,i){t.stats().then((function(t){var i,r;i=t.data,r="Snapshot taken at: "+(new Date).toString(),r+="\n\r",r+=n.format("%-30s  %15s  %15s  %15s  %15s  %45s","Name","Length","Rate (items/s)","Time (ms/item)","Item Processed","Current/Last message"),r+="\n\r",r+=n.format("%-30s  %8s  %5s","","Current","Peak"),r+="\n\r",r+=n.format("%'=30s  %'=8s  %'=5s  %'=15s  %'=15s  %'=15s  %'=45s","=","=","=","=","=","=","="),angular.forEach(i.es.queue,(function(e){r+="\n\r",r+=n.format("%-30s  %8s  %5s  %15s  %15s  %15s  %45s",e.queueName,e.lengthCurrentTryPeak,e.lengthLifetimePeak,e.avgItemsPerSecond,e.avgProcessingTime.toFixed(3),e.totalItemsProcessed,e.inProgressMessage+" / "+e.lastProcessedMessage)})),e.snapshot=r}),(function(e){i.failure("Failed to retrieve dashboard stats: "+e.message)}))}])})),define("modules/dashboard/controllers/_index",["./DashboardListCtrl","./DashboardSnapshotCtrl"],(function(){})),define("modules/dashboard/services/_module",["angular"],(function(e){"use strict";return e.module("es-ui.dashboard.services",[])})),define("modules/dashboard/services/DashboardMapper",["./_module"],(function(e){"use strict";return e.provider("DashboardMapper",(function(){function e(e,t){var n,i,r,s,o,a={};for(n in e.es.queue)(i=e.es.queue[n]).groupName?(r=a[i.groupName]?a[i.groupName]:{queueName:o=i.groupName,groupName:o,length:0,avgItemsPerSecond:0,avgProcessingTime:0,idleTimePercent:0,lengthCurrentTryPeak:0,lengthLifetimePeak:0,totalItemsProcessed:0,groupQueues:0,queues:[]},s=t[i.groupName],r.show=!!s&&s.show,r.queues.push(i),r.length+=i.length,r.groupQueues+=1,r.avgItemsPerSecond+=i.avgItemsPerSecond,r.totalItemsProcessed+=i.totalItemsProcessed,r.avgProcessingTime=(r.avgProcessingTime+i.avgProcessingTime)/r.groupQueues,r.idleTimePercent=(r.idleTimePercent+i.idleTimePercent)/r.groupQueues,r.lengthCurrentTryPeak=Math.max(r.lengthCurrentTryPeak,i.lengthCurrentTryPeak),r.lengthLifetimePeak=Math.max(r.lengthLifetimePeak,i.lengthLifetimePeak),a[i.groupName]=r):a[i.queueName]=i;return a}this.$get=[function(){return{map:e}}]}))})),define("modules/dashboard/services/DashboardService",["./_module"],(function(e){"use strict";return e.provider("DashboardService",(function(){this.$get=["$http","urls","UrlBuilder",function(e,t,n){return{stats:function(){var i=n.build(t.stats);return e.get(i)},tcpStats:function(){var i=n.build(t.tcpStats);return e.get(i)}}}]}))})),define("modules/dashboard/services/_index",["./DashboardMapper","./DashboardService"],(function(){})),define("modules/dashboard/directives/_module",["angular"],(function(e){"use strict";return e.module("es-ui.dashboard.directives",[])})),define("modules/dashboard/directives/EsQueueRow",["./_module"],(function(e){"use strict";return e.directive("esQueueRow",[function(){return{restrict:"A",templateUrl:"dashboard.row.tpl.html",scope:{esQueue:"="},link:function(){}}}])})),define("modules/dashboard/directives/EsQueueRowHeader",["./_module"],(function(e){"use strict";return e.directive("esQueueRowHeader",[function(){return{restrict:"A",templateUrl:"dashboard.row.header.tpl.html",scope:{esQueue:"="},link:function(e,t){function n(){e.$apply((function(){e.toggle()}))}e.toggle=function(){e.esQueue.show=!e.esQueue.show},t.bind("click",n),e.$on("$destroy",(function(){t.unbind("click",n)}))}}}])})),define("modules/dashboard/directives/_index",["./EsQueueRow","./EsQueueRowHeader"],(function(){})),define("modules/dashboard/templates/templates",["angular"],(function(e){"use strict";!function(t){try{t=e.module("es-ui.dashboard.templates")}catch(n){t=e.module("es-ui.dashboard.templates",[])}t.run(["$templateCache",function(e){e.put("dashboard.list.tpl.html","<header class=page-header><h2 class=page-title>Dashboard</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.snapshot>Snapshot</a></li></ul></header><table class=table-queues><thead><tr><th>Queue Name</th><th colspan=2>Length</th><th>Rate (items/s)</th><th>Time (ms/item)</th><th>Items Processed</th><th>Current / Last Message</th></tr><tr><th></th><th class=table-subheading>Current</th><th class=table-subheading>Peak</th><th></th><th></th><th></th><th></th></tr></thead><tbody ng-repeat=\"(key, prop) in queues track by key\"><tr ng-if=prop.queues class=table-subheading style=\"cursor: pointer;\" es-queue-row-header es-queue=prop></tr><tr ng-if=!prop.queues es-queue-row es-queue=prop></tr><tr ng-show=prop.show ng-repeat=\"item in prop.queues\" class=table-indentedrow es-queue-row es-queue=item></tr></tbody><tbody ng-hide=queues><tr><td colspan=8><em>No stats to display</em></td></tr></tbody></table><br><br><header class=page-header><h2 class=page-title>Connections ({{tcpStats.length}})</h2><ul class=page-nav><li class=page-nav__item><button ng-click=tcpStatsPaging.nextPage() ng-disabled=!tcpStatsPaging.canPageNext()>Next</button></li><li class=page-nav__item><button ng-click=tcpStatsPaging.previousPage() ng-disabled=!tcpStatsPaging.canPagePrevious()>Previous</button></li></ul></header><table class=table-subscriptions><thead><tr><th>Connection</th><th>Client Connection Name</th><th>Type</th><th>IP Address</th><th colspan=3>Sent (Bytes)</th><th colspan=3>Received (Bytes)</th></tr><tr><th></th><th></th><th></th><th></th><th class=table-subheading>Rate (Bytes/s)</th><th class=table-subheading>Current</th><th class=table-subheading>Pending</th><th class=table-subheading>Rate (Bytes/s)</th><th class=table-subheading>Current</th><th class=table-subheading>Pending</th></tr></thead><tbody><tr ng-repeat=\"stat in tcpStats | startFrom:tcpStatsPaging.currentPage * tcpStatsPaging.pageSize | limitTo: tcpStatsPaging.pageSize\"><td>{{stat.connectionId}}</td><td>{{stat.clientConnectionName ? stat.clientConnectionName : 'N/A'}}</td><td>{{stat.isExternalConnection ? 'External' : 'Internal'}} {{stat.isSslConnection ? 'SSL' : ''}}</td><td>{{stat.remoteEndPoint}}</td><td>{{stat.averageBytesSentPerSecond | number}}</td><td>{{stat.totalBytesSent | number}}</td><td>{{stat.pendingSendBytes | number}}</td><td>{{stat.averageBytesReceivedPerSecond | number}}</td><td>{{stat.totalBytesReceived | number}}</td><td>{{stat.pendingReceivedBytes | number}}</td></tr></tbody><tbody ng-hide=tcpStats.length><tr><td colspan=10><em>No Connections</em></td></tr></tbody></table>")}])}(),function(t){try{t=e.module("es-ui.dashboard.templates")}catch(n){t=e.module("es-ui.dashboard.templates",[])}t.run(["$templateCache",function(e){e.put("dashboard.row.header.tpl.html",'<td ng-if=esQueue.show>{{ esQueue.queueName }} <a class=table-collapsetoggle>&minus;</a></td><td ng-if=!esQueue.show>{{ esQueue.queueName }} <a class=table-collapsetoggle>&plus;</a></td><td>{{ esQueue.lengthCurrentTryPeak }}</td><td>{{ esQueue.lengthLifetimePeak }}</td><td>{{ esQueue.avgItemsPerSecond }}</td><td>{{ esQueue.avgProcessingTime.toFixed(3)}}</td><td>{{ esQueue.totalItemsProcessed }}</td><td style="text-align: right">n/a</td>')}])}(),function(t){try{t=e.module("es-ui.dashboard.templates")}catch(n){t=e.module("es-ui.dashboard.templates",[])}t.run(["$templateCache",function(e){e.put("dashboard.row.tpl.html",'<td>{{ esQueue.queueName }}</td><td>{{ esQueue.lengthCurrentTryPeak }}</td><td>{{ esQueue.lengthLifetimePeak }}</td><td>{{ esQueue.avgItemsPerSecond }}</td><td>{{ esQueue.avgProcessingTime.toFixed(3)}}</td><td>{{ esQueue.totalItemsProcessed }}</td><td style="text-align: right">{{ esQueue.inProgressMessage }} / {{ esQueue.lastProcessedMessage }}</td>')}])}(),function(t){try{t=e.module("es-ui.dashboard.templates")}catch(n){t=e.module("es-ui.dashboard.templates",[])}t.run(["$templateCache",function(e){e.put("dashboard.snapshot.tpl.html","<header class=page-header><h2 class=page-title>Dashboard Snapshot</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=dashboard.list>Back</a></li></ul></header><pre ng-bind=snapshot>\n\n</pre>")}])}(),function(t){try{t=e.module("es-ui.dashboard.templates")}catch(n){t=e.module("es-ui.dashboard.templates",[])}t.run(["$templateCache",function(e){e.put("dashboard.tpl.html","<div ui-view></div>")}])}()})),define("modules/dashboard/_index",["angular","uiRouter","./controllers/_index","./services/_index","./directives/_index","./templates/templates"],(function(e){"use strict";return e.module("es-ui.dashboard",["ui.router","es-ui.dashboard.templates","es-ui.dashboard.controllers","es-ui.dashboard.services","es-ui.dashboard.directives"])})),define("modules/dashboard/module",["./_index"],(function(e){"use strict";return e.config(["$stateProvider",function(e){e.state("dashboard",{parent:"app",url:"dashboard",templateUrl:"dashboard.tpl.html",abstract:!0,data:{title:"Dashboard"}}).state("dashboard.list",{url:"",templateUrl:"dashboard.list.tpl.html",controller:"DashboardListCtrl",data:{title:"Dashboard"}}).state("dashboard.snapshot",{url:"/snapshot",templateUrl:"dashboard.snapshot.tpl.html",controller:"DashboardSnaphostCtrl",data:{title:"Dashboard Snapshot"}})}])})),define("modules/clusterstatus/controllers/_module",["angular"],(function(e){"use strict";return e.module("es-ui.clusterstatus.controllers",[])})),define("modules/clusterstatus/controllers/ClusterStatusListCtrl",["./_module"],(function(e){"use strict";return e.controller("ClusterStatusListCtrl",["$scope","poller","ClusterStatusService","InfoService","constants","MessageService",function(e,t,n,i,r,s){e.replicas=[];var o,a="";function l(){var i=t.create({interval:1e3,action:n.gossip,params:[]});i.start(),i.promise.then(null,(function(e){s.failure("Failed to retrieve gossip info: "+e.message)}),(function(i){if(e.lastUpdatedTime=new Date,i.error)e.errorMessage="couldn't connect to manager";else{e.errorMessage="",e.nodes=i.members;var l=d();if(l){var f=l.httpEndPointIp+":"+l.httpEndPointPort;o&&f===a||(a=f,(o=t.create({interval:r.clusterStatus.replicaPollInterval,action:n.replicaStats,params:[a]})).start(),o.promise.then(null,(function(e){s.failure("Failed to retrieve replica stats: "+e.message)}),(function(t){for(var n=d(),i=0;i<t.length;i++){var r=t[i],s=c(r.connectionId,e.replicas);u(r,n,h(r.subscriptionEndpoint,e.nodes),s)}e.replicas=t})))}}}))}function u(e,t,n,i){if(n&&(e.isCatchingUp="CatchingUp"===n.state,e.bytesToCatchUp=t.writerCheckpoint-n.writerCheckpoint,e.catchupStartTime=(new Date).getTime(),e.catchupStartBytesSent=e.totalBytesSent,i)){i.isCatchingUp&&(e.catchupStartTime=i.catchupStartTime,e.catchupStartBytesSent=i.catchupStartBytesSent);var s=((new Date).getTime()-e.catchupStartTime)/r.clusterStatus.replicaPollInterval,o=e.totalBytesSent-e.catchupStartBytesSent;e.approxSpeed=Math.round(o/s);var a=Math.round(e.bytesToCatchUp/e.approxSpeed);a<1&&(a=1),e.estimatedTime=function(e){function t(e){return e<10?"0"+e:e}var n=Math.floor(e%86400/3600),i=Math.floor(e%86400%3600/60),r=e%86400%3600%60;return t(n)+":"+t(i)+":"+t(r)}(a)}}function c(e,t){for(var n=0;n<t.length;n++)if(t[n].connectionId===e)return t[n]}function h(e,t){for(var n=0;n<t.length;n++){var i=t[n].internalSecureTcpPort?t[n].internalSecureTcpPort:t[n].internalTcpPort;if(t[n].internalTcpIp+":"+i===(e=e.replace("Unspecified/","")))return t[n]}}function d(){for(var t=0;t<e.nodes.length;t++)if("Leader"===e.nodes[t].state)return e.nodes[t]}i.getOptions().then((function(e){var t=e.data;for(var n in t)"ClusterSize"===t[n].name&&t[n].value>1&&l()}),(function(e){s.failure("Failed to load options: "+e.message)})),e.$on("$destroy",(function(){t.clear()}))}])})),define("modules/clusterstatus/controllers/ClusterStatusSnapshotCtrl",["./_module"],(function(e){"use strict";return e.controller("ClusterStatusSnapshotCtrl",["$scope","dateFilter","poller","SprintfService","ClusterStatusService","MessageService",function(e,t,n,i,r,s){e.$on("$destroy",(function(){n.clear()})),r.gossip().then((function(n){!function(n){var r=n.members,s=i.format("%s\n","Snapshot taken at "+t(new Date,"yyyy-MM-d HH:mm:ss"));s+=i.format("%-31s %-31s %-23s %-7s %-14s %-19s %-10s\n","Internal Tcp","External Tcp","Http","Status","State","Timestamp (UTC)","Checkpoints");for(var o=0;o<r.length;o++){var a=r[o];s+=i.format("%-30s  %-30s  %-22s  %-6s  %-12s  %19s  %-90s\n",a.internalTcpIp+":"+(a.internalSecureTcpPort||a.internalTcpPort),a.externalTcpIp+":"+(a.externalSecureTcpPort||a.externalTcpPort),a.httpEndPointIp+":"+a.httpEndPointPort,a.isAlive?"Alive":"Unreachable",a.state,t(a.timeStamp,"yyyy-MM-d HH:mm:ss"),"Manager"===a.state?"n/a":i.format("L%d/W%d/C%d/E%d@%d:{%s}",a.lastCommitPosition,a.writerCheckpoint,a.chaserCheckpoint,a.epochNumber,a.epochPosition,a.epochId))}e.snapshot=s}(n.data)}),(function(e){s.failure("Failed to retrieve gossip info: "+e.message)}))}])})),define("modules/clusterstatus/controllers/_index",["./ClusterStatusListCtrl","./ClusterStatusSnapshotCtrl"],(function(){})),define("modules/clusterstatus/services/_module",["angular"],(function(e){"use strict";return e.module("es-ui.clusterstatus.services",[])})),define("modules/clusterstatus/services/ClusterStatusService",["./_module"],(function(e){"use strict";return e.provider("ClusterStatusService",(function(){this.$get=["$http","urls","UrlBuilder","$q","$location",function(e,t,n,i,r){return{gossip:function(){var i=n.build(t.gossip);return e.get(i)},replicaStats:function(n){if(!n){var s=i.defer();return s.resolve({}),s.promise}var o=r.protocol()+"://"+n+t.replicationStats;return e.get(o)}}}]}))})),define("modules/clusterstatus/services/_index",["./ClusterStatusService"],(function(){})),define("modules/clusterstatus/templates/templates",["angular"],(function(e){"use strict";!function(t){try{t=e.module("es-ui.clusterstatus.templates")}catch(n){t=e.module("es-ui.clusterstatus.templates",[])}t.run(["$templateCache",function(e){e.put("clusterstatus.list.tpl.html",'<header class=page-header><h2 class=page-title>Cluster Status</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.snapshot>Snapshot</a></li></ul></header><div class=last-updated>Last updated: <span>{{ lastUpdatedTime | date : \'yyyy-MM-d HH:mm:ss\' }}</span></div><div><table class=table-nodes><thead><tr><th>State</th><th>Status</th><th>Timestamp (UTC)</th><th>Checkpoints</th><th>Tcp</th><th>Http</th><th>Actions</th></tr><tr><th></th><th></th><th></th><th></th><th></th><th></th><th></th></tr></thead><tbody><tr ng-repeat="node in nodes" ng-class="{dead: !node.isAlive}"><td><text ng-if="node.state == \'Leader\'"><b>{{ node.state }}</b></text><text ng-if="node.state == \'Manager\'" style=color:lightgray>{{ node.state }}</text><text ng-if="node.state != \'Leader\' && node.state != \'Manager\'">{{ node.state }}</text></td><td ng-class="{dead: !node.isAlive}"><text ng-if=node.isAlive>Alive</text><text ng-if=!node.isAlive>Unreachable</text></td><td>{{ node.timeStamp | date : \'yyyy-MM-d HH:mm:ss\' }}</td><td><text ng-if="node.state == \'Manager\'">n/a</text><text ng-if="node.state != \'Manager\'">L{{ node.lastCommitPosition}} / W {{node.writerCheckpoint}} / C {{node.chaserCheckpoint}}<br>E{{ node.epochNumber }} @ {{ node.epochPosition }} : { {{ node.epochId }} }</text></td><td>Internal : {{ node.internalTcpIp }}:{{ node.internalSecureTcpPort || node.internalTcpPort }}<br>External : {{ node.externalTcpIp }}:{{ node.externalSecureTcpPort || node.externalTcpPort }}</td><td>{{ node.httpEndPointIp }}:{{ node.httpEndPointPort }}</td><td style=text-align:center;><ul class=page-nav><li class=page-nav__item><a ng-href="//{{node.httpEndPointIp}}:{{node.httpEndPointPort}}/ping?format=json" target=_blank>ping</a></li><li class=page-nav__item><a ng-href=//{{node.httpEndPointIp}}:{{node.httpEndPointPort}} target=_blank>show website</a></li><li class=page-nav__item><a ng-href="//{{node.httpEndPointIp}}:{{node.httpEndPointPort}}/gossip?format=json" target=_blank>show gossip</a></li></ul></td></tr><tr ng-hide=nodes><td colspan=9><em>No nodes in the cluster</em></td></tr></tbody></table><br><div ng-show="replicas.length > 0"><br><header class=page-header><h2 class=page-title>Replica Status</h2></header><table class=table-nodes><thead><tr><th>Replica Endpoint</th><th>Total Sent (bytes)</th><th>Total Received (bytes)</th><th>Pending Send (bytes)</th><th>Pending Receive (bytes)</th><th>Send Queue Size</th><th>To Catch Up (bytes)</th><th>Transfer Speed (bytes/second)</th><th>Estimated Time</th></tr></thead><tbody><tr ng-repeat="replica in replicas"><td>{{replica.subscriptionEndpoint}}</td><td>{{replica.totalBytesSent | number}}</td><td>{{replica.totalBytesReceived | number}}</td><td>{{replica.pendingSendBytes | number}}</td><td>{{replica.pendingReceivedBytes | number}}</td><td>{{replica.sendQueueSize | number}}</td><td ng-if=!replica.isCatchingUp colspan=3>Caught Up</td><td ng-if=replica.isCatchingUp>{{replica.bytesToCatchUp | number}}</td><td ng-if=replica.isCatchingUp>{{replica.approxSpeed | number}}</td><td ng-if=replica.isCatchingUp>{{replica.estimatedTime}}</td></tr></tbody></table></div></div><script>function selectText(element) {\n        var doc = document\n          , text = doc.getElementById(element)\n          , range\n          , selection;\n        if (doc.body.createTextRange) { //ms\n            range = doc.body.createTextRange();\n            range.moveToElementText(text);\n            range.select();\n        } else if (window.getSelection) { //all others\n            selection = window.getSelection();\n            range = doc.createRange();\n            range.selectNodeContents(text);\n            selection.removeAllRanges();\n            selection.addRange(range);\n        }\n    }<\/script>')}])}(),function(t){try{t=e.module("es-ui.clusterstatus.templates")}catch(n){t=e.module("es-ui.clusterstatus.templates",[])}t.run(["$templateCache",function(e){e.put("clusterstatus.snapshot.tpl.html","<header class=page-header><h2 class=page-title>Cluster Status Snapshot</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=clusterstatus.list>Back</a></li></ul></header><pre ng-bind=snapshot>\n\n</pre>")}])}(),function(t){try{t=e.module("es-ui.clusterstatus.templates")}catch(n){t=e.module("es-ui.clusterstatus.templates",[])}t.run(["$templateCache",function(e){e.put("clusterstatus.tpl.html","<div ui-view></div>")}])}()})),define("modules/clusterstatus/_index",["angular","uiRouter","./controllers/_index","./services/_index","./templates/templates"],(function(e){"use strict";return e.module("es-ui.clusterstatus",["ui.router","es-ui.clusterstatus.templates","es-ui.clusterstatus.services","es-ui.clusterstatus.controllers"])})),define("modules/clusterstatus/module",["./_index"],(function(e){"use strict";return e.config(["$stateProvider",function(e){e.state("clusterstatus",{parent:"app",url:"clusterstatus",templateUrl:"clusterstatus.tpl.html",abstract:!0,data:{title:"Cluster Status"}}).state("clusterstatus.list",{url:"",templateUrl:"clusterstatus.list.tpl.html",controller:"ClusterStatusListCtrl",data:{title:"Cluster Status"}}).state("clusterstatus.snapshot",{url:"/snapshot",templateUrl:"clusterstatus.snapshot.tpl.html",controller:"ClusterStatusSnapshotCtrl",data:{title:"Cluster Status Snapshot"}})}])})),define("modules/streams/controllers/_module",["angular"],(function(e){"use strict";return e.module("es-ui.streams.controllers",["es-ui.streams.services"])})),define("modules/streams/controllers/StreamsItemEventCtrl",["./_module"],(function(e){"use strict";function t(e,t,n){404===e.statusCode||410===e.statusCode||n.failure("Failed to load event content for stream '"+t.streamId+"': "+e.message)}return e.controller("StreamsItemEventCtrl",["$scope","$state","$stateParams","StreamsService","MessageService",function(e,n,i,r,s){e.streamId=i.streamId,e.isMetadata=n.current.data.metadata,e.eventNumber=e.isMetadata?"metadata":i.eventNumber,e.visualize=function(e){var t=e.linkMetaDataParsed&&e.linkMetaDataParsed.$correlationId?e.linkMetaDataParsed.$correlationId:e.metaDataParsed.$correlationId;n.go("visualize.eventflow",{correlationId:t})},r.eventContent(e.streamId,e.eventNumber).then((function(n){var i=n.data;if(e.evt=i,e.hasEvent=null!==i.eventNumber&&void 0!==i.eventNumber,e.isNotTheSame=i.positionStreamId!==i.streamId||i.positionEventNumber!==i.eventNumber,e.links=i.links,e.evt.metaData)try{e.evt.metaDataParsed=JSON.parse(e.evt.metaData)}catch(t){e.evt.metaDataParsed=null}if(e.evt.linkMetaData)try{e.evt.linkMetaDataParsed=JSON.parse(e.evt.linkMetaData)}catch(t){e.evt.linkMetaDataParsed=null}e.isMetadata||i.hasOwnProperty("positionEventNumber")&&i.hasOwnProperty("positionStreamId")&&(r.eventContent(e.streamId,i.positionEventNumber+1).then((function(){e.next=!0}),(function(n){t(n,e,s)})),i.positionEventNumber-1>=0&&r.eventContent(e.streamId,i.positionEventNumber-1).then((function(){e.prev=!0}),(function(n){t(n,e,s)})))}),(function(n){t(n,e,s)}))}])})),define("modules/streams/controllers/StreamsItemEventsCtrl",["./_module"],(function(e){"use strict";return e.controller("StreamsItemEventsCtrl",["$scope","$state","$stateParams","AtomEventsReader","MessageService","StreamsService",function(e,t,n,i,r,s){var o={};function a(e){void 0!==e?r.confirm("Are you sure you want to delete the stream: "+e+"?")&&s.deleteStream(e).then((function(){r.info("Stream '"+e+"' deleted")}),(function(t){r.failure("Failed to delete stream '"+e+"': "+t.message)})):r.info("You cannot delete this stream as the stream ID is empty or undefined")}e.$parent.streams=[],e.$parent.links=[],e.streamId=n.streamId,e.source=n.source,i.start(n).then(null,(function(t){404===t.statusCode||410===t.statusCode?e.entries=[]:r.failure("Failed to read events for stream '"+e.streamId+"': "+t.message)}),(function(t){e.$parent.headOfStream=t.headOfStream,e.$broadcast("add-link-header",function(e){for(var t=0;t<e.length;t++)if("self"===e[t].relation)return e[t].fullUri}(t.links)),e.$parent.streams=i.map(t.entries,o),e.$parent.links=t.links,"$all"!==e.streamId&&0!==e.streamId.indexOf("$$$")||(e.$parent.links=function(e){for(var t=-1,n=0,i=e.length;n<i;n++)if("metadata"===e[n].relation){t=n;break}-1!==t&&e.splice(t,1);return e}(e.$parent.links))})),e.toggleJson=function(e,t){e.preventDefault(),e.stopPropagation(),t.showJson=!t.showJson,o[t.title]=t.showJson},e.visualize=function(e){var n=e.linkMetaDataParsed&&e.linkMetaDataParsed.$correlationId?e.linkMetaDataParsed.$correlationId:e.metaDataParsed.$correlationId;t.go("visualize.eventflow",{correlationId:n})},e.deleteStream=function(t,n){a(e.streamId)},e.$parent.deleteStream=function(){a(e.streamId)},e.$parent.isPolling=!0,e.$parent.togglePause=function(){e.$parent.isPolling?i.pause():i.resumePaused(),e.$parent.isPolling=!e.$parent.isPolling},e.getTextToCopy=function(e){return r.info("The event data for "+e.title+" will be copied to the clipboard","Copied to clipboard"),e.data},e.$on("$destroy",(function(){i.stop(),e.$parent.streams=[],e.$parent.links=[],e.$parent.isPolling=null,o={}}))}])})),define("modules/streams/controllers/StreamsAddEventCtrl",["./_module"],(function(e){"use strict";return e.controller("StreamsAddEventCtrl",["$scope","$state","$q","$stateParams","StreamsService","MessageService",function(e,n,i,r,s,o){if(e.streamId=r.streamId,e.addingToSpecificStream=Boolean(e.streamId),e.eventData="{\n}",e.eventMetadata="{\n}",e.eventId=t(),r.fromEvent){var a=r.fromEvent;e.eventType=a.eventType,e.addingToSpecificStream=!1,e.eventData=a.data,e.eventMetadata=a.metaData}function l(e,t){return i((function(n,i){if(/^\s*$/.test(t))return n(void 0);try{return n(JSON.parse(t))}catch(t){return i({statusText:e+" is not valid JSON."})}}))}e.aceConfig={mode:"json",useWrapMode:!1,showGutter:!0,theme:"monokai"},e.addEvent=function(){i.all([l("Event Data",e.eventData),l("Event Metadata",e.eventMetadata)]).then((function(t){return s.addEvent(e.streamId,{eventId:e.eventId,eventType:e.eventType,data:t[0],metadata:t[1]})})).then((function(){o.success("Event "+e.eventId+"("+e.eventType+") created"),e.eventId=t()}),(function(e){o.failure("Failed to create event: "+e.message)}))}}]);function t(){var e=(new Date).getTime().toString();return[e.slice(-9,-1),e.slice(-5,-1),e.slice(-5,-1),e.slice(-5,-1),e.slice(-13,-1)].join("-")}})),define("modules/streams/controllers/StreamsItemAclCtrl",["./_module"],(function(e){"use strict";return e.controller("StreamsItemAclCtrl",["$scope","$state","$stateParams","StreamsService","MessageService",function(e,t,n,i,r){var s;e.streamId=n.streamId,i.getAcl(e.streamId).then((function(t){var n=t.data;n&&(s=n,n.$acl&&(e.reader=n.$acl.$r,e.writer=n.$acl.$w,e.deleter=n.$acl.$d,e.metareader=n.$acl.$mr,e.metawriter=n.$acl.$mw))}),(function(n){r.failure("Failed to load metadata for stream '"+e.streamId+"': "+n.message),t.go("^.events")})),e.updateAcl=function(){var n=s||{};n.$acl={$r:e.reader,$w:e.writer,$d:e.deleter,$mr:e.metareader,$mw:e.metawriter},i.updateAcl(e.streamId,n).then((function(){r.info("acl updated"),t.go("^.events")}),(function(t){r.failure("Failed to update metadata for stream '"+e.streamId+"': "+t.message)}))}}])})),define("modules/streams/controllers/StreamsListCtrl",["./_module"],(function(e){"use strict";return e.controller("StreamsListCtrl",["$rootScope","$scope","$state","StreamsService","MessageService",function(e,t,n,i,r){function s(e){for(var t,n={},i=0,r=e.length,s=[];i<r;i++)e[i].streamId&&(n[(t=e[i]).streamId]=!0);for(t in n)s.push({streamId:t});return s}t.gotoStream=function(e){e.preventDefault(),e.stopPropagation(),i.checkStreamExists(t.search).then((function(){n.go("^.item.events",{streamId:t.search})}),(function(e){404===e.statusCode?r.warn("The stream '"+t.search+"' does not exist."):r.failure("Failed to read stream '"+t.search+"': "+e.message)}))},t.search="$all",t.noChangedStreamsText="No recently changed streams",t.noCreatedStreamsText="No recently created streams",i.recentlyChangedStreams().then((function(e){t.changedStreams=s(e.data.entries)}),(function(e){401===e.statusCode?t.noChangedStreamsText="You are not authorized to view recently changed streams":404===e.statusCode?t.noChangedStreamsText="No recently changed streams":r.failure("Failed to load recently changed streams: "+e.message)})),i.recentlyCreatedStreams().then((function(e){t.createdStreams=s(e.data.entries)}),(function(e){401===e.statusCode?t.noCreatedStreamsText="You are not authorized to view recently created streams":404===e.statusCode?t.noCreatedStreamsText="No recently created streams":r.failure("Failed to load recently created streams: "+e.message)}))}])})),define("modules/streams/controllers/_index",["./StreamsItemEventCtrl","./StreamsItemEventsCtrl","./StreamsAddEventCtrl","./StreamsItemAclCtrl","./StreamsListCtrl"],(function(){})),define("modules/streams/directives/_module",["angular"],(function(e){"use strict";return e.module("es-ui.streams.directives",[])})),define("modules/streams/directives/EsLinkHeader",["./_module"],(function(e){"use strict";return e.directive("esLinkHeader",[function(){return{restrict:"A",link:function(e){var t=e.$on("add-link-header",(function(e,t){var n;(n=document.querySelector('link[type="application/atom+xml"]'))&&document.head.removeChild(n);var i=document.createElement("link");i.rel="alternative",i.type="application/atom+xml",i.href=t,document.head.appendChild(i)}));e.$on("$destroy",(function(){t()}))}}}])})),define("modules/streams/directives/_index",["./EsLinkHeader"],(function(){})),define("modules/streams/services/_module",["angular"],(function(e){"use strict";return e.module("es-ui.streams.services",[])})),define("modules/streams/services/StreamsService",["./_module"],(function(e){"use strict";return e.provider("StreamsService",(function(){this.$get=["$http","$q","urls","UrlBuilder",function(e,t,n,i){return{getAcl:function(t){var r=i.build(n.streams.metadata,"$$",t);return e.get(r)},updateAcl:function(t,r){var s=i.build(n.streams.updateAcl,t);return e.post(s,JSON.stringify(r),{headers:{"ES-EventType":"$metadata","Content-Type":"application/json"}})},addEvent:function(t,r){var s=i.build(n.streams.events,t);return e.post(s,JSON.stringify([r]),{headers:{"Content-Type":"application/vnd.eventstore.events+json"}})},validateFullUrl:function(t){var r=i.simpleBuild(n.streams.base,t);return e.get(r)},recentlyChangedStreams:function(){var t=i.build(n.streams.recent);return e.get(t)},recentlyCreatedStreams:function(){var t=i.build(n.streams.created);return e.get(t)},streamEvents:function(t){var r=i.build(n.streams.events,t.streamId);return t.position&&(r+="/"+t.position),t.type&&(r+="/"+t.type),t.count&&(r+="/"+t.count),r+=n.streams.tryharder,e.get(r)},eventContent:function(t,r){var s=i.build(n.streams.eventDetails,t,r);return e.get(s,{headers:{Accept:"application/vnd.eventstore.atom+json"}})},checkStreamExists:function(t){var r=i.build(n.streams.events,t);return e.get(r)},deleteStream:function(t){var r=i.build(n.streams.events,t);return e.delete(r)}}}]}))})),define("modules/streams/services/_index",["./StreamsService"],(function(){})),define("modules/streams/templates/templates",["angular"],(function(e){"use strict";!function(t){try{t=e.module("es-ui.streams.templates")}catch(n){t=e.module("es-ui.streams.templates",[])}t.run(["$templateCache",function(e){e.put("streams.event.new.tpl.html",'<header class=page-header><h2 class=page-title>New Event</h2></header><form novalidate name=newEvent ng-submit=save() class=new-subscription-form><table><tbody><tr><td>Stream ID</td><td><input ng-model=streamId class=form-table name=stream ng-class="{ \'form-table--error\' : newEvent.stream.$invalid && !newEvent.stream.$pristine }" ng-disabled=addingToSpecificStream></td></tr><tr><td>Event ID</td><td><input ng-model=eventId class=form-table name=evnt ng-class="{ \'form-table--error\' : newEvent.evnt.$invalid && !newEvent.evnt.$pristine }"></td></tr><tr><td>Event Type</td><td><input ng-model=eventType class=form-table name=eventType ng-class="{ \'form-table--error\' : newEvent.eventType.$invalid && !newEvent.eventType.$pristine }"></td></tr><tr class=table-subheading><td colspan=2>Data</td></tr><tr><td colspan=2><div ui-ace=aceConfig style="min-height: 350px; max-height: 350px" ng-model=eventData></div></td></tr><tr class=table-subheading><td colspan=2>Metadata</td></tr><tr><td colspan=2><div ui-ace=aceConfig style="min-height: 150px; max-height: 150px" ng-model=eventMetadata></div></td></tr></tbody></table><ul class=page-nav><li class=page-nav__item><button type=submit ng-click=addEvent() ng-disabled=newEvent.$invalid>Add</button></li></ul></form>')}])}(),function(t){try{t=e.module("es-ui.streams.templates")}catch(n){t=e.module("es-ui.streams.templates",[])}t.run(["$templateCache",function(e){e.put("streams.item.acl.tpl.html","<header class=page-header><h2 class=page-title>Edit ACL for Event Stream '{{ streamId }}'</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.events>Back</a></li></ul></header><form novalidate name=editAcl ng-submit=updateAcl()><table><tbody><tr><td>Reader</td><td><input name=reader class=form-table ng-model=reader></td></tr><tr><td>Writer</td><td><input name=writer class=form-table ng-model=writer></td></tr><tr><td>Deleter</td><td><input name=deleter class=form-table ng-model=deleter></td></tr><tr><td>Meta Reader</td><td><input name=metareader class=form-table ng-model=metareader></td></tr><tr><td>Meta Writer</td><td><input name=metawriter class=form-table ng-model=metawriter></td></tr></tbody></table><ul class=page-nav><li class=page-nav__item><button type=submit>Save</button></li></ul></form>")}])}(),function(t){try{t=e.module("es-ui.streams.templates")}catch(n){t=e.module("es-ui.streams.templates",[])}t.run(["$templateCache",function(e){e.put("streams.item.event.tpl.html",'<header class=page-header><h2 class=page-title>{{ evt.title }} <small ng-if=isNotTheSame>Link from {{ evt.positionEventNumber + \'@\' + evt.positionStreamId }}</small></h2><ul class=page-nav><li class=page-nav__item><a ng-if=evt ui-sref="^.addStreamEvent({ fromEvent: evt })">Add New Like This</a></li><li class=page-nav__item><a ui-sref=^.events>Back</a></li></ul></header><ul class=page-nav style="padding:0rem 0rem 2rem 0rem !important"><li class=page-nav__item><button ng-disabled=!prev ui-sref=".({streamId: evt.streamId, eventNumber: evt.positionEventNumber - 1})">prev</button></li><li class=page-nav__item><button ng-disabled=!next ui-sref=".({streamId: evt.streamId, eventNumber: evt.positionEventNumber + 1})">next</button></li></ul><br><table><thead><tr><th>No</th><th>Stream</th><th>Type</th><th>Timestamp</th></tr></thead><tbody ng-hide=hasEvent><tr><td colspan=5><em>Event does not exist for stream: {{streamId}}</em></td></tr></tbody><tbody ng-show=hasEvent><tr><td>{{ evt.eventNumber }}</td><td><a ui-sref="^.events({streamId: evt.streamId})">{{ evt.streamId }}</a></td><td>{{ evt.eventType }}</td><td>{{ evt.updated | date:\'yyyy-MM-dd HH:mm:ss\'}}</td></tr><tr ng-if="evt.isJson || evt.isMetaData || evt.isLinkMetaData"><td colspan=4><div ng-if=evt.isJson><strong>Data</strong><pre ng-if=!evt.isRedacted>\n{{ evt.data }}\n\t\t\t\t</pre><span class=note--warning ng-if=evt.isRedacted>This event\'s data was redacted</span></div><div ng-if=evt.isMetaData><strong>Metadata</strong> <a ng-click=visualize(evt) style=cursor:pointer ng-if="evt.metaDataParsed && evt.metaDataParsed.$correlationId"><i class="far fa-eye" style="color:#2E9625; font-size: 16px;" title=Visualize></i></a><pre>{{ evt.metaData }}</pre></div><div ng-if=evt.isLinkMetaData><strong>Link metadata</strong> <a ng-click=visualize(evt) style=cursor:pointer ng-if="evt.linkMetaDataParsed && evt.linkMetaDataParsed.$correlationId"><i class="far fa-eye" style="color:#2E9625; font-size: 16px;" title=Visualize></i></a><pre>{{ evt.linkMetaData }}</pre></div></td></tr></tbody><thead ng-show=hasEvent><tr><th colspan=4>Internal data</th></tr></thead><tbody ng-show=hasEvent><tr><td>EventId</td><td colspan=3>{{ evt.eventId }}</td></tr></tbody></table>')}])}(),function(t){try{t=e.module("es-ui.streams.templates")}catch(n){t=e.module("es-ui.streams.templates",[])}t.run(["$templateCache",function(e){e.put("streams.item.events.tpl.html",'<table><thead><tr><th>Event #</th><th>Name</th><th>Type</th><th>Created Date</th><th></th></tr></thead><tbody ng-repeat="event in streams track by $index"><tr ng-class="{ \'invalid\': !event.streamId }"><td><a ng-if=event.streamId ui-sref="^.event({streamId: event.streamId, eventNumber: event.eventNumber})">{{ event.positionEventNumber }}</a><text ng-if=!event.streamId>{{ event.positionEventNumber }}</text></td><td><a ng-if=event.streamId ui-sref="^.event({streamId: event.streamId, eventNumber: event.eventNumber})">{{ event.title }}</a><text ng-if=!event.streamId>{{ event.title }}</text></td><td>{{ event.eventType }}</td><td>{{ event.updated | date:\'yyyy-MM-dd HH:mm:ss\'}}</td><td><a ng-click="toggleJson($event, event)" style="cursor: pointer;" ng-if="event.isJson || event.isLinkMetaData || event.isMetaData">JSON</a> &nbsp; <a ng-click=visualize(event) style=cursor:pointer ng-if="(event.metaDataParsed && event.metaDataParsed.$correlationId) || (event.linkMetaDataParsed && event.linkMetaDataParsed.$correlationId)"><i class="far fa-eye" style="color:#2E9625; font-size: 16px;" title=Visualize></i></a></td></tr><tr ng-show=event.showJson><td colspan=5><div ng-if=event.isJson><strong>Data</strong><pre ng-if=!event.isRedacted>\n{{ event.data }}\t\t\t\t\t\n\t\t\t\t\t</pre><span class=note--warning ng-if=event.isRedacted>This event\'s data was redacted</span></div><div ng-if=event.metaData><strong>Metadata</strong> <a ng-click=visualize(event) style=cursor:pointer ng-if="event.metaDataParsed && event.metaDataParsed.$correlationId"><i class="far fa-eye" style="color:#2E9625; font-size: 16px;" title=Visualize></i></a><pre>\n{{ event.metaData }}\n\t\t\t\t\t</pre></div><div ng-if=event.isLinkMetaData><strong>Link metadata</strong> <a ng-click=visualize(event) style=cursor:pointer ng-if="event.linkMetaDataParsed && event.linkMetaDataParsed.$correlationId"><i class="far fa-eye" style="color:#2E9625; font-size: 16px;" title=Visualize></i></a><pre>\n{{ event.linkMetaData }}\n\t\t\t\t\t</pre></div></td></tr></tbody><tbody ng-if="streams.length < 1"><tr><td colspan=5><div ng-if="$stateParams.hasOwnProperty(\'position\')"><em>No events for stream: {{ $stateParams.streamId }} at position {{ $stateParams.position }}</em></div><div ng-if="!$stateParams.hasOwnProperty(\'position\')"><em>No events for stream: {{ $stateParams.streamId }}</em></div></td></tr></tbody></table>')}])}(),function(t){try{t=e.module("es-ui.streams.templates")}catch(n){t=e.module("es-ui.streams.templates",[])}t.run(["$templateCache",function(e){e.put("streams.item.tpl.html",'<header class=page-header><h2 class=page-title>Event Stream \'{{ streamId }}\'</h2><ul class=page-nav><li class=page-nav__item><a ng-class="{highlight: isPolling == false}" ng-click=togglePause() ng-show=headOfStream>{{ isPolling == true ? \'Pause\' : \'Resume\' }}</a></li><li class=page-nav__item><a ui-sref=.acl ng-show="streamId !== \'$all\'">Edit ACL</a></li><li class=page-nav__item><a ui-sref=.addStreamEvent ng-show="streamId.indexOf(\'$\') !== 0">Add Event</a></li><li class=page-nav__item><a ng-click=deleteStream()>Delete</a></li><li ng-if=projectionsEnabled class=page-nav__item><a ui-sref="query({ initStreamId: streamId })">Query</a></li><li class=page-nav__item><a ui-sref=subscriptions.list ng-show="source == \'persistentSubscriptions\'">Back</a> <a ui-sref=^.list ng-show="source == undefined">Back</a></li></ul></header><ul style="list-style-type: none; padding:0 0 0.75rem 0 !important"><li class=page-nav__item ng-repeat="link in links"><a ng-href={{link.uri}}>{{ link.relation }}</a></li></ul><br><div ui-view es-link-header></div>')}])}(),function(t){try{t=e.module("es-ui.streams.templates")}catch(n){t=e.module("es-ui.streams.templates",[])}t.run(["$templateCache",function(e){e.put("streams.list.tpl.html",'<header class=page-header><h2 class=page-title>Stream Browser</h2><ul class=page-nav><li class=page-nav__item><form><input ui-keypress="{\'enter\': \'gotoStream($event)\'}" ng-model=search placeholder="Search for stream"></form></li><li class=page-nav__item><a ui-sref=.addStreamEvent>Add Event</a></li></ul></header><div class=container><div class=container-left><table><thead><tr><th>Recently Created Streams</th></tr></thead><tbody><tr ng-repeat="stream in createdStreams"><td><a ui-sref="^.item.events({streamId: stream.streamId})">{{ stream.streamId }}</a></td></tr><tr ng-hide=createdStreams><td><em>{{noCreatedStreamsText}}</em></td></tr></tbody></table></div><div class=container-right><table><thead><tr><th>Recently Changed Streams</th></tr></thead><tbody><tr ng-repeat="stream in changedStreams"><td><a ui-sref="^.item.events({streamId: stream.streamId})">{{ stream.streamId }}</a></td></tr><tr ng-hide=changedStreams><td><em>{{noChangedStreamsText}}</em></td></tr></tbody></table></div></div>')}])}(),function(t){try{t=e.module("es-ui.streams.templates")}catch(n){t=e.module("es-ui.streams.templates",[])}t.run(["$templateCache",function(e){e.put("streams.tpl.html","<div ui-view></div>")}])}()})),define("modules/streams/_index",["angular","uiRouter","./controllers/_index","./directives/_index","./services/_index","./templates/templates"],(function(e){"use strict";return e.module("es-ui.streams",["ui.router","es-ui.streams.controllers","es-ui.streams.services","es-ui.streams.templates","es-ui.streams.directives"])})),define("modules/streams/module",["./_index"],(function(e){"use strict";return e.config(["$stateProvider",function(e){e.state("streams",{url:"streams",parent:"app",templateUrl:"streams.tpl.html",abstract:!0}).state("streams.list",{url:"",templateUrl:"streams.list.tpl.html",controller:"StreamsListCtrl",data:{title:"Stream Browser"}}).state("streams.item",{url:"/{streamId}",templateUrl:"streams.item.tpl.html",abstract:!0,controller:["$scope","$stateParams",function(e,t){e.streamId=t.streamId}],data:{title:"Stream"}}).state("streams.item.events",{url:"",templateUrl:"streams.item.events.tpl.html",controller:"StreamsItemEventsCtrl",data:{title:"Stream"}}).state("streams.item.navigation",{url:"/{position}/{type}/{count:[0-9]{1,99}}",templateUrl:"streams.item.events.tpl.html",controller:"StreamsItemEventsCtrl",data:{title:"Stream"}}).state("streams.item.metadata",{url:"/metadata",views:{"@streams":{templateUrl:"streams.item.event.tpl.html",controller:"StreamsItemEventCtrl"}},data:{metadata:!0,title:"Stream Event"}}).state("streams.item.event",{url:"/{eventNumber:[0-9]{1,99}}",views:{"@streams":{templateUrl:"streams.item.event.tpl.html",controller:"StreamsItemEventCtrl"}},data:{title:"Stream Event"}}).state("streams.item.acl",{url:"/acl",views:{"@streams":{templateUrl:"streams.item.acl.tpl.html",controller:"StreamsItemAclCtrl"}},data:{title:"Edit Stream ACL"}}).state("streams.list.addStreamEvent",{url:"/addEvent",views:{"@streams":{templateUrl:"streams.event.new.tpl.html",controller:"StreamsAddEventCtrl"}},data:{title:"Add Event To Stream"}}).state("streams.item.addStreamEvent",{url:"/addEvent",views:{"@streams":{templateUrl:"streams.event.new.tpl.html",controller:"StreamsAddEventCtrl"}},data:{title:"Add Event To Stream"},params:{fromEvent:null,streamId:""}})}])})),define("modules/security/controllers/_module",["angular"],(function(e){"use strict";return e.module("es-ui.security.controllers",[])})),define("modules/security/controllers/SignInCtrl",["./_module"],(function(e){"use strict";return e.controller("SignInCtrl",["$scope","$rootScope","$state","$location","AuthService","MessageService","InfoService",function(e,t,n,i,r,s,o){function a(){if(t.previousUrl&&"/"!==t.previousUrl){var e=t.previousUrl;t.previousUrl=null,i.path(e)}else n.go("dashboard.list")}e.log={username:"",password:""},e.signIn=function(){e.login.$invalid?s.warn("Please fix all validation errors"):r.validate(e.log.username,e.log.password).then((function(){r.setCredentials(e.log.username,e.log.password),o.getOptions().then((function(e){var n=e.data;for(var i in n)"ClusterSize"===n[i].name&&n[i].value>1&&(t.singleNode=!1)}),(function(e){401!==e.statusCode&&s.failure("Failed to load options: "+e.message)})),a()}),(function(e){401===e.statusCode?s.warn("Incorrect user credentials supplied."):s.failure("Failed to validate user: "+e.message)}))},r.existsAndValid().then((function(){a()}))}])})),define("modules/security/controllers/SignOutCtrl",["./_module"],(function(e){"use strict";return e.controller("SignOutCtrl",["$scope","$state","AuthService","$rootScope",function(e,t,n,i){n.clearCredentials(),"OAuthAuthentication"===i.authentication.type?i.hideMenuOptions=!0:t.go("signin")}])})),define("modules/security/controllers/_index",["./SignInCtrl","./SignOutCtrl"],(function(){})),define("modules/security/templates/templates",["angular"],(function(e){"use strict";!function(t){try{t=e.module("es-ui.security.templates")}catch(n){t=e.module("es-ui.security.templates",[])}t.run(["$templateCache",function(e){e.put("signin.tpl.html",'<div class=page-logon es-height><div class=logon-container><h1 class=site-title><a href="javascript:return false;"><img src=images/logo.svg height=29 width=119 alt=Kurrent></a></h1><form novalidate name=login ng-submit=signIn() class=login-form><label for=username>Username</label> <input placeholder=Username autofocus required name=username es-auto-focus ng-class="{ \'form-table--error\' : login.username.$invalid && !login.username.$pristine }" ng-model=log.username> <label for=password>Password</label> <input type=password ng-class="{ \'form-table--error\' : login.password.$invalid && !login.password.$pristine }" name=password class=form-table placeholder=Password ng-model=log.password required> <button type=submit style=cursor:pointer; ng-disabled=login.$invalid>Sign In</button></form></div><footer class=site-footer><p>Kurrent</p></footer></div>')}])}()})),define("modules/security/_index",["angular","uiRouter","./controllers/_index","./templates/templates"],(function(e){"use strict";return e.module("es-ui.security",["ui.router","es-ui.security.controllers","es-ui.security.templates"])})),define("modules/security/module",["./_index"],(function(e){"use strict";return e.config(["$stateProvider",function(e){e.state("signin",{url:"signin",templateUrl:"signin.tpl.html",controller:"SignInCtrl",data:{title:"Sign in"}}).state("signout",{url:"signout",parent:"app",template:"<div ui-view>{{logoutText}}</div>",controller:"SignOutCtrl",data:{title:"Sign out"}})}])})),define("modules/users/controllers/_module",["angular"],(function(e){"use strict";return e.module("es-ui.users.controllers",["es-ui.users.services"])})),define("modules/users/controllers/UsersItemDeleteCtrl",["./_module"],(function(e){"use strict";return e.controller("UsersItemDeleteCtrl",["$scope","$state","$stateParams","UserService","MessageService",function(e,t,n,i,r){e.disable=!0,e.confirm=function(n){n.preventDefault(),n.stopPropagation(),i.remove(e.user.loginName).then((function(){r.success("User deleted"),t.go("users.list")}),(function(e){r.failure("Failed to delete user: "+e.message)}))},i.get(n.username).then((function(t){var n=t.data;e.user=n.data,e.disable=!1}),(function(e){404===e.statusCode?r.failure("User does not exist"):r.failure("Failed to get user: "+e.message),t.go("users")}))}])})),define("modules/users/controllers/UsersItemDetailsCtrl",["./_module"],(function(e){"use strict";return e.controller("UsersItemDetailsCtrl",["$scope","$state","$stateParams","UserService","MessageService",function(e,t,n,i,r){i.get(n.username).then((function(t){var n=t.data;e.user=n.data}),(function(e){r.failure("Failed to get user: "+e.message),t.go("users")}))}])})),define("modules/users/controllers/UsersItemDisableCtrl",["./_module"],(function(e){"use strict";return e.controller("UsersItemDisableCtrl",["$scope","$state","$stateParams","UserService","MessageService",function(e,t,n,i,r){e.disable=!0,e.confirm=function(t){t.preventDefault(),t.stopPropagation(),i.disable(e.user.loginName).then((function(){r.success("User disabled"),e.$state.go("^.details")}),(function(e){r.failure("Failed to disable user: "+e.message)}))},i.get(n.username).then((function(n){var i=n.data;e.user=i.data,e.disable=!1,e.user.disabled&&(r.warn("User already disabled"),t.go("^.details"))}),(function(e){404===e.statusCode?r.failure("User does not exist"):r.failure("Failed to get user: "+e.message),t.go("users")}))}])})),define("modules/users/controllers/UsersItemEditCtrl",["./_module"],(function(e){"use strict";return e.controller("UsersItemEditCtrl",["$scope","$state","$stateParams","UserService","MessageService",function(e,t,n,i,r){e.confirm=function(){e.editUsr.$invalid?r.warn("Please fix all validation errors"):i.update(e.user.loginName,e.fullName,e.user.role).then((function(){r.success("user updated"),t.go("^.details")}),(function(e){r.failure("Failed to update user: "+e.message)}))},i.get(n.username).then((function(t){var n=t.data;e.user=n.data,e.user.role=n.data.groups[0],e.fullName=e.user.fullName}),(function(e){404===e.statusCode?r.failure("User does not exist"):r.failure("Failed to get user: "+e.message),t.go("users")}))}])})),define("modules/users/controllers/UsersItemEnableCtrl",["./_module"],(function(e){"use strict";return e.controller("UsersItemEnableCtrl",["$scope","$state","$stateParams","UserService","MessageService",function(e,t,n,i,r){e.disable=!0,e.confirm=function(n){n.preventDefault(),n.stopPropagation(),i.enable(e.user.loginName).then((function(){r.success("user enabled"),t.go("^.details")}),(function(e){r.failure("Failed to enable user: "+e.message)}))},i.get(n.username).then((function(n){var i=n.data;e.user=i.data,e.disable=!1,e.user.disabled||(r.warn("user already enabled"),t.go("^.details"))}),(function(e){404===e.statusCode?r.failure("User does not exist"):r.failure("Failed to get user: "+e.message),t.go("users")}))}])})),define("modules/users/controllers/UsersItemResetCtrl",["./_module"],(function(e){"use strict";return e.controller("UsersItemResetCtrl",["$rootScope","$scope","$state","UserService","MessageService","AuthService",function(e,t,n,i,r,s){t.confirm=function(){t.resetPwd.$invalid?r.warn("Please fix all validation errors"):i.resetPassword(t.user.loginName,t.password).then((function(){r.success("Password has been reset"),s.resetCredentials(t.user.loginName,t.password).then((function(){n.go("^.details")}),(function(){r.failure("We tried to reset the credentials in the cookie and failed. Please log in again."),n.go("signin")}))}),(function(e){r.failure("Failed to reset password: "+e.message)}))},i.get(t.$stateParams.username).then((function(e){var n=e.data;t.user=n.data}),(function(e){404===e.statusCode?r.failure("User does not exist"):r.failure("Failed to get user: "+e.message),n.go("users")}))}])})),define("modules/users/controllers/UsersListCtrl",["./_module"],(function(e){"use strict";return e.controller("UsersListCtrl",["$rootScope","$state","$scope","UserService","poller","MessageService",function(e,t,n,i,r,s){function o(){if(!e.userManagementEnabled)return s.failure("User Management is not available"),void t.go("dashboard.list");var o=r.create({interval:1e3,action:i.all,params:[]});o.start(),o.promise.then(null,null,(function(e){n.users=e.data})),o.promise.catch((function(e){o.stop(),s.failure("Failed to retrieve list of users: "+e.message)})),n.$on("$destroy",(function(){r.clear()}))}if(e.initialized)o();else var a=e.$on("initialized",(function(){o(),a()}))}])})),define("modules/users/controllers/UsersNewCtrl",["./_module"],(function(e){"use strict";return e.controller("UsersNewCtrl",["$scope","$state","UserService","MessageService",function(e,t,n,i){e.newUser={},e.confirm=function(){e.newUsr.$invalid?i.warn("Please fix all validation errors"):n.create(e.newUser).then((function(){i.success("User created"),t.go("^.list")}),(function(e){i.failure("Failed to create user: "+e.message)}))}}])})),define("modules/users/controllers/_index",["./UsersItemDeleteCtrl","./UsersItemDetailsCtrl","./UsersItemDisableCtrl","./UsersItemEditCtrl","./UsersItemEnableCtrl","./UsersItemResetCtrl","./UsersListCtrl","./UsersNewCtrl"],(function(){})),define("modules/users/services/_module",["angular"],(function(e){"use strict";return e.module("es-ui.users.services",[])})),define("modules/users/services/UserService",["./_module"],(function(e){"use strict";return e.provider("UserService",(function(){this.$get=["$http","urls","UrlBuilder",function(e,t,n){return{all:function(){var i=n.build(t.users.list);return e.get(i)},get:function(i){var r=n.build(t.users.get,i);return e.get(r)},create:function(i){var r=n.build(t.users.create);return i.groups=[],i.role&&i.groups.push(i.role),delete i.confirmPassword,e.post(r,i)},update:function(i,r,s){var o=n.build(t.users.update,i),a=[];return s&&a.push(s),e.put(o,{fullName:r,groups:a})},remove:function(i){var r=n.build(t.users.remove,i);return e.delete(r)},disable:function(i){var r=n.build(t.users.disable,i);return e.post(r)},enable:function(i){var r=n.build(t.users.enable,i);return e.post(r)},resetPassword:function(i,r){var s=n.build(t.users.resetPassword,i);return e.post(s,{newPassword:r})}}}]}))})),define("modules/users/services/_index",["./UserService"],(function(){})),define("modules/users/templates/templates",["angular"],(function(e){"use strict";!function(t){try{t=e.module("es-ui.users.templates")}catch(n){t=e.module("es-ui.users.templates",[])}t.run(["$templateCache",function(e){e.put("users.item.delete.tpl.html","<header class=page-header><h2 class=page-title>Delete User {{ user.loginName }}</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.details>Back</a></li></ul></header><pre>\n{{ user | json }}\n</pre><ul class=page-nav><li class=page-nav__item><a href=# ng-click=confirm($event) ng-disabled=disable>Delete</a></li></ul>")}])}(),function(t){try{t=e.module("es-ui.users.templates")}catch(n){t=e.module("es-ui.users.templates",[])}t.run(["$templateCache",function(e){e.put("users.item.details.tpl.html",'<div ui-view><header class=page-header><h2 class=page-title>User Details {{ user.loginName }}</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.edit>Edit</a></li><li class=page-nav__item><a ui-sref=^.delete>Delete</a></li><li class=page-nav__item ng-hide=user.disabled><a ui-sref=^.disable>Disable</a></li><li class=page-nav__item ng-show=user.disabled><a ui-sref=^.enable>Enable</a></li><li class=page-nav__item><a ui-sref=^.reset>Password Reset</a></li><li class=page-nav__item><a ui-sref=^.^.list>Back</a></li></ul></header></div><div><table><tr><th>Fields</th><th>Values</th></tr><tr><td>Login Name</td><td>{{ user.loginName }}</td></tr><tr><td>Full Name</td><td>{{ user.fullName }}</td></tr><tr><td>Groups</td><td><ul ng-repeat="group in user.groups"><li>{{ group }}</li></ul></td></tr><tr><td>Disabled</td><td>{{ user.disabled }}</td></tr><tr><td>API Links</td><td><ul ng-repeat="userData in user.links"><li><b>Link</b> - <a href={{userData.href}} target=_blank>{{ userData.href }}</a></li><li><b>Rel</b> - {{userData.rel}}</li></ul></td></tr></table></div>')}])}(),function(t){try{t=e.module("es-ui.users.templates")}catch(n){t=e.module("es-ui.users.templates",[])}t.run(["$templateCache",function(e){e.put("users.item.disable.tpl.html","<header class=page-header><h2 class=page-title>Disable User {{ user.loginName }}</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.details>Back</a></li></ul></header><pre>\n{{ user | json }}\n</pre><ul class=page-nav><li class=page-nav__item><a href=# ng-click=confirm($event) ng-disabled=disable>Disable</a></li></ul>")}])}(),function(t){try{t=e.module("es-ui.users.templates")}catch(n){t=e.module("es-ui.users.templates",[])}t.run(["$templateCache",function(e){e.put("users.item.edit.tpl.html","<header class=page-header><h2 class=page-title>Edit User {{ user.loginName }}</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.details>Back</a></li></ul></header><form novalidate name=editUsr ng-submit=confirm()><table><tbody><tr><td>Login Name</td><td>{{ user.loginName}}</td></tr><tr><td>Full Name</td><td><input name=fullName class=form-table ng-class=\"{ 'form-table--error' : editUsr.fullName.$invalid && !editUsr.fullName.$pristine }\" ng-model=fullName required></td></tr><tr><td>Groups</td><td><input type=radio name=role ng-model=user.role value=$ops> <label for=isOperations>Is Operations</label> <input type=radio name=role ng-model=user.role value=$admins> <label for=isAdmin>Is Administrator</label> <input type=radio name=role ng-model=user.role> <label for=hasNoRole>None</label></td></tr></tbody></table><ul class=page-nav><li class=page-nav__item><button type=submit ng-disabled=editUsr.$invalid>Update</button></li></ul></form>")}])}(),function(t){try{t=e.module("es-ui.users.templates")}catch(n){t=e.module("es-ui.users.templates",[])}t.run(["$templateCache",function(e){e.put("users.item.enable.tpl.html","<header class=page-header><h2 class=page-title>Enable User {{ user.loginName }}</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.details>Back</a></li></ul></header><pre>\n{{ user | json }}\n</pre><ul class=page-nav><li class=page-nav__item><a href=# ng-click=confirm($event) ng-disabled=disable>Enable</a></li></ul>")}])}(),function(t){try{t=e.module("es-ui.users.templates")}catch(n){t=e.module("es-ui.users.templates",[])}t.run(["$templateCache",function(e){e.put("users.item.reset.tpl.html","<header class=page-header><h2 class=page-title>Reset User {{ user.loginName }} Password</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.details>Back</a></li></ul></header><form novalidate name=resetPwd ng-submit=confirm()><table><tbody><tr><td>Login Name</td><td>{{ user.loginName}}</td></tr><tr><td>Password</td><td><input type=password name=password class=form-table ng-class=\"{ 'form-table--error' : resetPwd.password.$invalid && !resetPwd.password.$pristine }\" ng-model=password required></td></tr><tr><td>Confirm Password</td><td><input type=password class=form-table name=confirmPassword ng-model=confirmPassword ng-class=\"{ 'form-table--error' : resetPwd.confirmPassword.$invalid && !resetPwd.confirmPassword.$pristine }\" es-validate-equals=password></td></tr></tbody></table><ul class=page-nav><li class=page-nav__item><button type=submit ng-disabled=resetPwd.$invalid>Reset password</button></li></ul></form>")}])}(),function(t){try{t=e.module("es-ui.users.templates")}catch(n){t=e.module("es-ui.users.templates",[])}t.run(["$templateCache",function(e){e.put("users.item.tpl.html","<div ui-view></div>")}])}(),function(t){try{t=e.module("es-ui.users.templates")}catch(n){t=e.module("es-ui.users.templates",[])}t.run(["$templateCache",function(e){e.put("users.list.tpl.html","<div ui-view><header class=page-header><h2 class=page-title>Users</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.new>New User</a></li></ul></header><table class=table-queues><thead><tr><th>Login Name</th><th>Full Name</th><th>Groups</th><th>Disabled</th><th>Updated</th></tr></thead><tbody><tr ng-repeat=\"user in users\"><td><a ui-sref=\"^.item.details({username: user.loginName})\">{{ user.loginName }}</a></td><td>{{ user.fullName }}</td><td>{{ user.groups.join(', ') }}</td><td>{{ user.disabled }}</td><td>{{ user.dateLastUpdated | date:'short' }}</td></tr><tr ng-hide=users><td colspan=5><em>No users</em></td></tr></tbody></table></div>")}])}(),function(t){try{t=e.module("es-ui.users.templates")}catch(n){t=e.module("es-ui.users.templates",[])}t.run(["$templateCache",function(e){e.put("users.new.tpl.html","<header class=page-header><h2 class=page-title>New User</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.list>Back</a></li></ul></header><form novalidate name=newUsr ng-submit=confirm()><table><tbody><tr><td>Login Name</td><td><input class=form-table autofocus required name=loginName ng-class=\"{ 'form-table--error' : newUsr.loginName.$invalid && !newUsr.loginName.$pristine }\" ng-model=newUser.loginName></td></tr><tr><td>Full Name</td><td><input ng-class=\"{ 'form-table--error' : newUsr.fullName.$invalid && !newUsr.fullName.$pristine }\" name=fullName class=form-table required ng-model=newUser.fullName></td></tr><tr><td>Password</td><td><input type=password ng-class=\"{ 'form-table--error' : newUsr.password.$invalid && !newUsr.password.$pristine }\" name=password class=form-table ng-model=newUser.password required></td></tr><tr><td>Confirm Password</td><td><input type=password ng-class=\"{ 'form-table--error' : newUsr.confirmPassword.$invalid && !newUsr.confirmPassword.$pristine }\" name=confirmPassword class=form-table required ng-model=newUser.confirmPassword es-validate-equals=newUser.password></td></tr><tr><td>Groups</td><td><input type=radio name=role ng-model=newUser.role value=$ops> <label for=isOperations>Is Operations</label> <input type=radio name=role ng-model=newUser.role value=$admins> <label for=isAdmin>Is Administrator</label> <input type=radio name=role ng-model=user.role> <label for=hasNoRole>None</label></td></tr></tbody></table><ul class=page-nav><li class=page-nav__item><button type=submit ng-disabled=newUsr.$invalid>Create</button></li></ul></form>")}])}(),function(t){try{t=e.module("es-ui.users.templates")}catch(n){t=e.module("es-ui.users.templates",[])}t.run(["$templateCache",function(e){e.put("users.tpl.html","<div ui-view></div>")}])}()})),define("modules/users/_index",["angular","uiRouter","./controllers/_index","./services/_index","./templates/templates"],(function(e){"use strict";return e.module("es-ui.users",["ui.router","es-ui.users.controllers","es-ui.users.services","es-ui.users.templates"])})),define("modules/users/module",["./_index"],(function(e){"use strict";return e.config(["$stateProvider",function(e){e.state("users",{url:"users",parent:"app",templateUrl:"users.tpl.html",abstract:!0,data:{title:"Users"}}).state("users.list",{url:"",templateUrl:"users.list.tpl.html",controller:"UsersListCtrl",data:{title:"Users"}}).state("users.new",{url:"/new",templateUrl:"users.new.tpl.html",controller:"UsersNewCtrl",data:{title:"New User"}}).state("users.item",{url:"/{username}",abstract:!0,templateUrl:"users.item.tpl.html",data:{title:"User Details"}}).state("users.item.details",{url:"",templateUrl:"users.item.details.tpl.html",controller:"UsersItemDetailsCtrl",data:{title:"User Details"}}).state("users.item.edit",{url:"/edit",templateUrl:"users.item.edit.tpl.html",controller:"UsersItemEditCtrl",data:{title:"Edit User"}}).state("users.item.disable",{url:"/disable",templateUrl:"users.item.disable.tpl.html",controller:"UsersItemDisableCtrl",data:{title:"Disable User"}}).state("users.item.enable",{url:"/enable",templateUrl:"users.item.enable.tpl.html",controller:"UsersItemEnableCtrl",data:{title:"Enable User"}}).state("users.item.delete",{url:"/delete",templateUrl:"users.item.delete.tpl.html",controller:"UsersItemDeleteCtrl",data:{title:"Delete User"}}).state("users.item.reset",{url:"/reset",templateUrl:"users.item.reset.tpl.html",controller:"UsersItemResetCtrl",data:{title:"Reset User Password"}})}])})),define("modules/competing/controllers/_module",["angular"],(function(e){"use strict";return e.module("es-ui.competing.controllers",["es-ui.competing.services"])})),define("modules/competing/controllers/SubscriptionsListCtrl",["./_module"],(function(e){"use strict";return e.controller("SubscriptionsListCtrl",["$scope","CompetingService","SubscriptionsMapper","poller","MessageService","urls","UrlBuilder",function(e,t,n,i,r,s,o){function a(s,o){var a=o||1;i.clear();var l=i.create({interval:1e3*a,action:t.subscriptions,params:[s]});l.start(),l.promise.then(null,null,(function(t){let i={};for(var r=0;r<t.links.length;r++)i[t.links[r].rel]=t.links[r].href;e.paging.currentOffset=t.offset,e.paging.count=t.count,e.paging.total=t.total,e.paging.firstEntry=0,e.paging.lastEntry=0,t.count>0&&(e.paging.firstEntry=t.offset+1,e.paging.lastEntry=t.offset+t.count),e.paging.firstUrl=i.first,e.paging.selfUrl=i.self,e.paging.nextUrl=i.next,e.paging.previousUrl=i.previous,e.subscriptions=n.map(t.subscriptions,e.subscriptions)})),l.promise.catch((function(t){r.failure("Failed to retrieve list of subscriptions: "+t.message),e.subscriptions=null,l.stop()}))}let l=t.getPageSizeFromCookie()||100,u=t.getPageRefreshIntervalSecondsFromCookie()||1;e.paging={currentOffset:0,pageSize:l,pageSizeInput:l,pageRefreshInterval:u,pageRefreshIntervalInput:u,firstEntry:0,lastEntry:0,total:0,firstUrl:t.getSubscriptionsFirstUrl(l),selfUrl:null,nextUrl:null,previousUrl:null,canPageNext:function(){return e.paging.nextUrl},canPagePrevious:function(){return e.paging.previousUrl},firstPage:function(){a(e.paging.firstUrl,e.paging.pageRefreshInterval)},nextPage:function(){e.paging.canPageNext()&&a(e.paging.nextUrl,e.paging.pageRefreshInterval)},previousPage:function(){e.paging.canPagePrevious()&&a(e.paging.previousUrl,e.paging.pageRefreshInterval)},onPageSizeChanged:function(){e.paging.pageSizeInput>=1&&e.paging.pageSizeInput!==e.paging.pageSize&&(e.paging.pageSize=e.paging.pageSizeInput,t.savePageSizeToCookie(e.paging.pageSize),a(t.getSubscriptionsFirstUrl(e.paging.pageSize),e.paging.pageRefreshInterval))},onPageRefreshIntervalChanged:function(){e.paging.pageRefreshIntervalInput>=1&&e.paging.pageRefreshIntervalInput!==e.paging.pageRefreshInterval&&(e.paging.pageRefreshInterval=e.paging.pageRefreshIntervalInput,t.savePageRefreshIntervalSecondsToCookie(e.paging.pageRefreshInterval),a(e.paging.selfUrl,e.paging.pageRefreshInterval))}},e.replayParkedMessages=function(e,n){t.replayParked(e,n).then((function(){r.success("Replaying Parked Messages")}),(function(e){r.failure("Failed to initiate replaying of parked messages: "+e.message)}))},e.subscriptions={},a(e.paging.firstUrl,e.paging.pageRefreshInterval),e.$on("$destroy",(function(){i.clear()}))}])})),define("modules/competing/controllers/SubscriptionsDetailCtrl",["./_module"],(function(e){"use strict";return e.controller("SubscriptionsDetailCtrl",["$scope","$stateParams","CompetingService","MessageService",function(e,t,n,i){e.streamId=t.streamId,e.groupName=t.groupName,n.subscriptionDetail(e.streamId,e.groupName).then((function(t){e.detail=t.data}),(function(e){i.failure("Failed to retrieve subscription details: "+e.message)}))}])})),define("modules/competing/controllers/SubscriptionsNewCtrl",["./_module"],(function(e){"use strict";return e.controller("SubscriptionsNewCtrl",["$scope","$state","CompetingService","MessageService",function(e,t,n,i){e.namedConsumerStrategies=[{value:"RoundRobin",name:"Round Robin"},{value:"DispatchToSingle",name:"Dispatch To Single"},{value:"Pinned",name:"Pinned"},{value:"PinnedByCorrelation",name:"Pinned By Correlation"}],e.checkpoints=1e3,e.resolveLinktos=!1,e.startFrom=0,e.messageTimeoutMilliseconds=1e4,e.extraStatistics=!1,e.maxRetryCount=10,e.liveBufferSize=500,e.bufferSize=500,e.readBatchSize=20,e.checkPointAfterMilliseconds=1e3,e.minCheckPointCount=10,e.maxCheckPointCount=500,e.maxSubscriberCount=10,e.namedConsumerStrategy="RoundRobin",e.save=function(){if(e.newSubscription.$invalid)i.warn("Please fix all validation errors");else{var r={checkpoints:e.checkpoints,resolveLinktos:e.resolveLinktos,startFrom:e.startFrom,messageTimeoutMilliseconds:e.messageTimeoutMilliseconds,extraStatistics:e.extraStatistics,maxRetryCount:e.maxRetryCount,liveBufferSize:e.liveBufferSize,bufferSize:e.bufferSize,readBatchSize:e.readBatchSize,checkPointAfterMilliseconds:e.checkPointAfterMilliseconds,minCheckPointCount:e.minCheckPointCount,maxCheckPointCount:e.maxCheckPointCount,maxSubscriberCount:e.maxSubscriberCount,namedConsumerStrategy:e.namedConsumerStrategy};n.create(e.stream,e.subscription,r).then((function(){i.success("Subscription has been created"),t.go("^.list")}),(function(e){var t=e.message;e.errorData&&e.errorData.reason&&(t=e.errorData.reason),i.failure("Failed to create new subscription: "+t)}))}}}])})),define("modules/competing/controllers/SubscriptionsEditCtrl",["./_module"],(function(e){"use strict";return e.controller("SubscriptionsEditCtrl",["$scope","$state","CompetingService","MessageService",function(e,t,n,i){e.stream=t.params.streamId,e.subscription=t.params.groupName,e.namedConsumerStrategies=[{value:"RoundRobin",name:"Round Robin"},{value:"DispatchToSingle",name:"Dispatch To Single"},{value:"Pinned",name:"Pinned"},{value:"PinnedByCorrelation",name:"Pinned By Correlation"}],n.subscriptionDetail(e.stream,e.subscription).then((function(t){e.config=t.data.config}),(function(e){i.failure("Failed to retrieve subscription details: "+e.message)})),e.namedConsumerStrategy="RoundRobin",e.save=function(){if(e.updateSubscription.$invalid)i.warn("Please fix all validation errors");else{var r={checkpoints:e.config.checkpoints,enabled:e.config.enabled,resolveLinktos:e.config.resolveLinktos,startFrom:e.config.startFrom,messageTimeoutMilliseconds:e.config.messageTimeoutMilliseconds,extraStatistics:e.config.extraStatistics,maxRetryCount:e.config.maxRetryCount,liveBufferSize:e.config.liveBufferSize,bufferSize:e.config.bufferSize,readBatchSize:e.config.readBatchSize,checkPointAfterMilliseconds:e.config.checkPointAfterMilliseconds,minCheckPointCount:e.config.minCheckPointCount,maxCheckPointCount:e.config.maxCheckPointCount,maxSubscriberCount:e.config.maxSubscriberCount,namedConsumerStrategy:e.config.namedConsumerStrategy};n.update(e.stream,e.subscription,r).then((function(e){var n=(0,e.headers)().location;i.success("Subscription has been updated"),t.go("subscriptions.list",{location:encodeURIComponent(n)})}),(function(e){var t=e.message;e.errorData&&e.errorData.reason&&(t=e.errorData.reason),i.failure("Failed to update subscription: "+t)}))}}}])})),define("modules/competing/controllers/SubscriptionsDeleteCtrl",["./_module"],(function(e){"use strict";return e.controller("SubscriptionsDeleteCtrl",["$scope","$state","CompetingService","MessageService",function(e,t,n,i){e.stream=t.params.streamId,e.subscription=t.params.groupName,e.delete=function(){i.confirm("Are you sure you wish to delete the subscription?")&&n.delete(e.stream,e.subscription).then((function(){i.success("Subscription has been deleted"),t.go("subscriptions.list")}),(function(e){i.failure("Failed to delete subscription: "+e.message)}))}}])})),define("modules/competing/controllers/SubscriptionsViewParkedMessagesCtrl",["./_module"],(function(e){"use strict";function t(e,t,n){404===e.statusCode||410===e.statusCode?t.entries=[]:n.failure("Failed to read parked messages: "+e.message)}return e.controller("SubscriptionsViewParkedMessagesCtrl",["$scope","$stateParams","CompetingService","poller","MessageService",function(e,n,i,r,s){e.streamId=n.streamId,e.groupName=n.groupName,e.$parent.showHeader=!1;var o={};i.viewParkedMessagesBackward(e.streamId,e.groupName,"head",20).then((function(t){var n=t.data;null!=n.entries?e.entries=n.entries:e.entries=[]}),(function(n){t(n,e,s)})),e.pageForward=function(n){if(null!=n&&n.length>0){var r=n[0].positionEventNumber+1;i.viewParkedMessagesForward(e.streamId,e.groupName,r,20).then((function(t){var n=t.data;void 0!==n&&void 0!==n.entries&&n.entries.length>0&&(e.entries=n.entries)}),(function(n){t(n,e,s)}))}},e.pageForwardPoll=function(){var t=0;return null!=e.entries&&e.entries.length>0&&(t=e.entries[0].positionEventNumber+1),i.viewParkedMessagesForward(e.streamId,e.groupName,t,20)};var a=r.create({interval:5e3,action:e.pageForwardPoll,params:[]});a.start(),a.promise.then(null,null,(function(t){if(void 0!==t&&void 0!==t.entries&&t.entries.length>0)for(var n in t.entries)t.entries[n].positionEventNumber>e.entries[0].positionEventNumber&&e.entries.unshift(t.entries[n])})),a.promise.catch((function(n){t(n,e,s),a.stop()})),e.pageBackward=function(n){if(a.stop(),null!=n&&n.length>0){var r=n[n.length-1].positionEventNumber-1;i.viewParkedMessagesBackward(e.streamId,e.groupName,r,20).then((function(t){var n=t.data;a.stop(),void 0!==n&&void 0!==n.entries&&n.entries.length>0&&(e.entries=n.entries)}),(function(n){t(n,e,s)}))}},e.pageFirst=function(){i.viewParkedMessagesBackward(e.streamId,e.groupName,"head",20).then((function(t){var n=t.data;void 0!==n&&void 0!==n.entries&&n.entries.length>0&&(e.entries=n.entries)}),(function(n){t(n,e,s)})),a.start()},e.$on("$destroy",(function(){a.stop()})),e.toggleJson=function(e,t){e.preventDefault(),e.stopPropagation(),t.showJson=!t.showJson,o[t.title]=t.showJson}}])})),define("modules/competing/controllers/_index",["./SubscriptionsListCtrl","./SubscriptionsDetailCtrl","./SubscriptionsNewCtrl","./SubscriptionsEditCtrl","./SubscriptionsDeleteCtrl","./SubscriptionsViewParkedMessagesCtrl"],(function(){})),define("modules/competing/services/_module",["angular"],(function(e){"use strict";return e.module("es-ui.competing.services",[])})),define("modules/competing/services/CompetingService",["./_module"],(function(e){"use strict";return e.provider("CompetingService",(function(){this.$get=["$http","$cookieStore","urls","UrlBuilder",function(e,t,n,i){return{subscriptions:function(t){return e.get(t)},getSubscriptionsFirstUrl:function(e){return i.build(n.competing.subscriptions,0,e)},subscriptionDetail:function(t,r){var s=i.build(n.competing.subscriptionDetails,t,r);return e.get(s)},create:function(t,r,s){var o=i.build(n.competing.create,t,r);return e.put(o,s,{headers:{"Content-Type":"application/json"}})},update:function(t,r,s){var o=i.build(n.competing.update,t,r);return e.post(o,s,{headers:{"Content-Type":"application/json"}})},delete:function(t,r){var s=i.build(n.competing.delete,t,r);return e.delete(s,{headers:{"Content-Type":"application/json"}})},replayParked:function(t,r){var s=i.build(n.competing.replayParked,t,r);return e.post(s,{},{headers:{"Content-Type":"application/json"}})},viewParkedMessagesBackward:function(t,r,s,o){var a=i.build(n.competing.viewParkedMessagesBackward,t,r,s,o);return e.get(a,{headers:{Accept:"application/vnd.eventstore.competingatom+json"}})},viewParkedMessagesForward:function(t,r,s,o){var a=i.build(n.competing.viewParkedMessagesForward,t,r,s,o);return e.get(a,{headers:{Accept:"application/vnd.eventstore.competingatom+json"}})},getPageSizeFromCookie:function(){var e=t.get("es-subscription-options");return e?e.pageSize:null},savePageSizeToCookie:function(e){var n=t.get("es-subscription-options");n||(n={}),n.pageSize=e,t.put("es-subscription-options",n)},getPageRefreshIntervalSecondsFromCookie:function(){var e=t.get("es-subscription-options");return e?e.pageRefreshIntervalSeconds:null},savePageRefreshIntervalSecondsToCookie:function(e){var n=t.get("es-subscription-options");n||(n={}),n.pageRefreshIntervalSeconds=e,t.put("es-subscription-options",n)}}}]}))})),define("modules/competing/services/SubscriptionsMapper",["./_module"],(function(e){"use strict";return e.provider("SubscriptionsMapper",(function(){function e(e,t){for(var n in e)if(e[n].groupName===t)return e[n]}function t(e){for(var t in e.groups)if(e.groups[t].status.indexOf("behind")>=0)return e.groups[t].status;return e.groups[0].status}function n(e){return{commit:parseInt(e.split("/")[0].split("C:")[1]),prepare:parseInt(e.split("/")[1].split("P:")[1])}}function i(e,t,i){if(void 0===e)return t;if(void 0===t)return e;if(null===e)return e;if(null===t)return t;if(i){var r=n(e),s=n(t);return Math.max(r.commit,r.prepare)<=Math.max(s.commit,s.prepare)?e:t}return parseInt(e)<=parseInt(t)?e:t}function r(n,r){var s,o,a,l,u=n,c={};for(s in u){var h=(o=u[s]).eventStreamId;h.startsWith("$")&&(h="_"+h);var d=e(r[h]?r[h].groups:[],o.groupName);"$all"===o.eventStreamId?(o.behindByMessages=o.lastKnownEventPosition===o.lastCheckpointedEventPosition?0:void 0,o.behindByTime=void 0,o.behindStatus=""):(null==o.lastKnownEventPosition?o.behindByMessages=0:o.behindByMessages=o.lastKnownEventPosition-o.lastCheckpointedEventPosition+1,o.behindByTime=Math.round(o.behindByMessages/o.averageItemsPerSecond*100)/100,o.behindByTime=isFinite(o.behindByTime)?o.behindByTime:0,o.behindStatus=o.behindByMessages+" / "+o.behindByTime),o.averageItemsPerSecond=d?o.totalItemsProcessed-d.totalItemsProcessed:0,o.inFlightMessages=o.totalInFlightMessages,h?(a=c[h]?c[h]:{streamName:o.eventStreamId,averageItemsPerSecond:0,totalItemsProcessed:0,connectionCount:0,lastKnownEventPosition:void 0,lastCheckpointedEventPosition:void 0,inFlightMessages:0,status:"Idle",behindByMessages:0,behindByTime:0,groups:[]},l=r[h],a.show=!!l&&l.show,a.groups.push(o),a.inFlightMessages+=o.totalInFlightMessages,a.averageItemsPerSecond+=o.averageItemsPerSecond,a.connectionCount+=o.connectionCount,a.lastKnownEventPosition=i(a.lastKnownEventPosition,o.lastKnownEventPosition,"$all"===o.eventStreamId),a.lastCheckpointedEventPosition=i(a.lastCheckpointedEventPosition,o.lastCheckpointedEventPosition,"$all"===o.eventStreamId),"$all"===o.eventStreamId?(a.behindByMessages=void 0,a.behindByTime=void 0,a.behindStatus=""):(a.behindByMessages+=o.behindByMessages,a.behindByTime+=o.behindByTime,a.behindByTime=Math.round(100*o.behindByTime)/100,a.behindStatus=a.behindByMessages+" / "+a.behindByTime),a.status=t(a),c[h]=a):c[h]=o}return c}String.prototype.startsWith||(String.prototype.startsWith=function(e,t){return t=t||0,this.indexOf(e,t)===t}),this.$get=[function(){return{map:r}}]}))})),define("modules/competing/services/_index",["./CompetingService","./SubscriptionsMapper"],(function(){})),define("modules/competing/directives/_module",["angular"],(function(e){"use strict";return e.module("es-ui.competing.directives",[])})),define("modules/competing/directives/EsSubscriptionRow",["./_module"],(function(e){"use strict";return e.directive("esSubscriptionRow",[function(e){return{restrict:"A",templateUrl:"subscription.row.tpl.html",scope:{esSubscription:"="},link:function(){}}}])})),define("modules/competing/directives/EsSubscriptionRowHeader",["./_module"],(function(e){"use strict";return e.directive("esSubscriptionRowHeader",[function(){return{restrict:"A",templateUrl:"subscription.row.header.tpl.html",scope:{esSubscription:"="},link:function(e,t){function n(){e.$apply((function(){e.toggle()}))}e.toggle=function(){e.esSubscription.show=!e.esSubscription.show},t.bind("click",n),e.$on("$destroy",(function(){t.unbind("click",n)}))}}}])})),define("modules/competing/directives/_index",["./EsSubscriptionRow","./EsSubscriptionRowHeader"],(function(){})),define("modules/competing/templates/templates",["angular"],(function(e){"use strict";!function(t){try{t=e.module("es-ui.competing.templates")}catch(n){t=e.module("es-ui.competing.templates",[])}t.run(["$templateCache",function(e){e.put("subscription.row.header.tpl.html","<td ng-if=esSubscription.show>{{ esSubscription.streamName }} <a class=table-collapsetoggle>&minus;</a></td><td ng-if=!esSubscription.show>{{ esSubscription.streamName }} <a class=table-collapsetoggle>&plus;</a></td><td>{{ esSubscription.averageItemsPerSecond }}</td><td>{{ esSubscription.lastKnownEventPosition }}</td><td>{{ esSubscription.lastCheckpointedEventPosition }}</td><td>{{ esSubscription.inFlightMessages }}</td><td>{{ esSubscription.connectionCount }}</td><td>{{ esSubscription.behindStatus }}</td><td></td>")}])}(),function(t){try{t=e.module("es-ui.competing.templates")}catch(n){t=e.module("es-ui.competing.templates",[])}t.run(["$templateCache",function(e){e.put("subscription.row.tpl.html",'<td>{{ esSubscription.groupName }}</td><td>{{ esSubscription.averageItemsPerSecond }}</td><td>{{ esSubscription.lastKnownEventPosition }}</td><td>{{ esSubscription.lastCheckpointedEventPosition }}</td><td>{{ esSubscription.inFlightMessages }}</td><td>{{ esSubscription.connectionCount }}</td><td>{{ esSubscription.behindStatus }}</td><td><ul class=page-nav><li ng-if="esSubscription.eventStreamId !== \'$all\'" class=page-nav__item><a ui-sref="^.item.edit({streamId: esSubscription.eventStreamId, groupName: esSubscription.groupName})">Edit</a></li><li ng-if="esSubscription.eventStreamId !== \'$all\'" class=page-nav__item><a ui-sref="^.item.delete({streamId: esSubscription.eventStreamId, groupName: esSubscription.groupName})">Delete</a></li><li class=page-nav__item><a ui-sref="^.item.detail({streamId: esSubscription.eventStreamId, groupName: esSubscription.groupName})">Detail</a></li><li class=page-nav__item><a ng-click="$parent.replayParkedMessages(esSubscription.eventStreamId, esSubscription.groupName)">Replay Parked Messages</a></li><li class=page-nav__item><a ui-sref="^.item.viewparkedmessages({streamId: esSubscription.eventStreamId, groupName: esSubscription.groupName})">View Parked Messages</a></li></ul></td>')}])}(),function(t){try{t=e.module("es-ui.competing.templates")}catch(n){t=e.module("es-ui.competing.templates",[])}t.run(["$templateCache",function(e){e.put("subscriptions.item.delete.tpl.html","<form novalidate name=deleteSubscription ng-submit=delete() class=delete-subscription-form><table><tbody><tr><td>Group</td><td><input ng-model=subscription required readonly=true class=form-table name=subscription ng-class=\"{ 'form-table--error' : deleteSubscription.subscription.$invalid && !deleteSubscription.subscription.$pristine }\"></td></tr><tr><td>Stream</td><td><input ng-model=stream required readonly=true class=form-table name=stream ng-class=\"{ 'form-table--error' : deleteSubscription.stream.$invalid && !deleteSubscription.stream.$pristine }\"></td></tr></tbody></table><ul class=page-nav><li class=page-nav__item><button type=submit ng-disabled=deleteSubscription.$invalid>Delete</button></li></ul></form>")}])}(),function(t){try{t=e.module("es-ui.competing.templates")}catch(n){t=e.module("es-ui.competing.templates",[])}t.run(["$templateCache",function(e){e.put("subscriptions.item.detail.tpl.html","<div class=container><table><thead><tr><th>Configuration</th></tr></thead><thead><tr><th>Buffer Size</th><th>Check Point After</th><th>Extra Statistics</th><th>Live Buffer Size</th><th>Max Checkpoint Count</th><th>Max Retry Count</th><th>Message Timeout (ms)</th><th>Min Checkpoint Count</th><th>Consumer Strategy</th><th>Read Batch Size</th><th>Resolve Link tos</th><th>Start From</th></tr></thead><tbody><tr><td>{{ detail.config.bufferSize }}</td><td>{{ detail.config.checkPointAfterMilliseconds }}</td><td>{{ detail.config.extraStatistics }}</td><td>{{ detail.config.liveBufferSize }}</td><td>{{ detail.config.maxCheckPointCount }}</td><td>{{ detail.config.maxRetryCount }}</td><td>{{ detail.config.messageTimeoutMilliseconds }}</td><td>{{ detail.config.minCheckPointCount }}</td><td>{{ detail.config.namedConsumerStrategy }}</td><td>{{ detail.config.readBatchSize }}</td><td>{{ detail.config.resolveLinktos }}</td><td>{{ detail.config.startPosition }}</td></tr></tbody></table></div>")}])}(),function(t){try{t=e.module("es-ui.competing.templates")}catch(n){t=e.module("es-ui.competing.templates",[])}t.run(["$templateCache",function(e){e.put("subscriptions.item.edit.tpl.html",'<form novalidate name=updateSubscription ng-submit=save() class=edit-subscription-form><table><tbody><tr class=table-subheading><td colspan=2>Basic Details</td></tr><tr><td>Group</td><td><input ng-model=subscription required class=form-table readonly=true name=subscription></td></tr><tr><td>Stream</td><td><input ng-model=stream required class=form-table readonly=true name=stream></td></tr><tr class=table-subheading><td colspan=2>Configuration</td></tr><tr><td>Resolve Link Tos</td><td><input type=checkbox ng-model=config.resolveLinktos ng-disabled=resolveLinktosDisabled></td></tr><tr><td>Start From</td><td><input ng-model=config.startFrom class=form-table name=startFrom></td></tr><tr><td>Message Timeout (ms)</td><td><input type=number min=0 ng-model=config.messageTimeoutMilliseconds class=form-table name=messageTimeoutMilliseconds></td></tr><tr><td>Extra Statistics</td><td><input type=checkbox ng-model=config.extraStatistics ng-disabled=extraStatisticsDisabled></td></tr><tr><td>Max Retry Count</td><td><input type=number min=0 ng-model=config.maxRetryCount class=form-table name=maxRetryCount></td></tr><tr><td>Live Buffer Size</td><td><input type=number min=0 ng-model=config.liveBufferSize class=form-table name=liveBufferSize></td></tr><tr><td>Buffer Size</td><td><input type=number min=0 ng-model=config.bufferSize class=form-table name=bufferSize></td></tr><tr><td>Read Batch Size</td><td><input type=number min=0 ng-model=config.readBatchSize class=form-table name=readBatchSize></td></tr><tr><td>CheckPoint After (ms)</td><td><input type=number min=0 ng-model=config.checkPointAfterMilliseconds class=form-table name=checkPointAfterMilliseconds></td></tr><tr><td>Min CheckPoint Count</td><td><input type=number min=0 ng-model=config.minCheckPointCount class=form-table name=minCheckPointCount></td></tr><tr><td>Max CheckPoint Count</td><td><input type=number min=0 ng-model=config.maxCheckPointCount class=form-table name=maxCheckPointCount></td></tr><tr><td>Max Subscriber Count</td><td><input type=number min=0 ng-model=config.maxSubscriberCount class=form-table name=maxSubscriberCount></td></tr><tr><td>Named Consumer Strategy</td><td><select ng-model=config.namedConsumerStrategy class=form-table ng-options="obj.value as obj.name for obj in namedConsumerStrategies"></select></td></tr></tbody></table><ul class=page-nav><li class=page-nav__item><button type=submit ng-disabled=updateSubscription.$invalid>Update</button></li></ul></form>')}])}(),function(t){try{t=e.module("es-ui.competing.templates")}catch(n){t=e.module("es-ui.competing.templates",[])}t.run(["$templateCache",function(e){e.put("subscriptions.item.tpl.html",'<div ng-if=showHeader><header class=page-header><h2 class=page-title>Subscription - {{ streamId }}/{{ groupName }}</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.list>Back</a></li></ul></header><ul style="list-style-type: none; padding:0 0 0.75rem 0 !important"><li class=page-nav__item ng-repeat="link in links"><a ng-href={{link.uri}}>{{ link.relation }}</a></li></ul></div><div ui-view es-link-header></div>')}])}(),function(t){try{t=e.module("es-ui.competing.templates")}catch(n){t=e.module("es-ui.competing.templates",[])}t.run(["$templateCache",function(e){e.put("subscriptions.item.viewparkedmessages.tpl.html",'<header class=page-header><h2 class=page-title>View Parked Messages - {{streamId}}::{{groupName}}</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.^.list>Back</a></li></ul></header><ul style="list-style-type: none; padding:0 0 0.75rem 0 !important"><li class=page-nav__item><a ng-click=pageFirst(entries)>First</a> <a ng-click=pageBackward(entries)>Next</a> <a ng-click=pageForward(entries)>Previous</a></li></ul><br><table><thead><tr><th>Event #</th><th>Name</th><th>Type</th><th>Created Date</th><th></th></tr></thead><tbody ng-repeat="event in entries track by event.positionEventNumber"><tr ng-class="{ \'invalid\': !event.streamId }"><td>{{ event.positionEventNumber }}</td><td>{{ event.title }}</td><td>{{ event.eventType }}</td><td>{{ event.updated | date:\'yyyy-MM-dd HH:mm:ss\'}}</td><td><a ng-click="toggleJson($event, event)" style="cursor: pointer;" ng-if="event.isJson || event.isLinkMetaData || event.isMetaData">JSON</a></td></tr><tr ng-show=event.showJson><td colspan=5><div ng-if=event.isJson><strong>Data</strong><pre>{{ event.data }}</pre></div><div ng-if=event.metaData><strong>Metadata</strong><pre>{{ event.metaData }}</pre></div><div ng-if=event.isLinkMetaData><strong>Link metadata</strong><pre>{{ event.linkMetaData }}</pre></div></td></tr></tbody><tbody ng-if="entries.length < 1"><tr><td colspan=5><em>No parked events for subscription {{streamId}}::{{groupName}}</em></td></tr></tbody></table>')}])}(),function(t){try{t=e.module("es-ui.competing.templates")}catch(n){t=e.module("es-ui.competing.templates",[])}t.run(["$templateCache",function(e){e.put("subscriptions.list.tpl.html",'<header class=page-header><h2 class=page-title>Dashboard</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.new>New Subscription</a></li></ul></header><ul class=page-nav style="list-style-type: none; padding:0 0 0.75rem 0 !important"><li class=page-nav__item><button ng-click=paging.firstPage() ng-disabled=!paging.canPagePrevious()>First</button></li><li class=page-nav__item><button ng-click=paging.previousPage() ng-disabled=!paging.canPagePrevious()>Previous</button></li><li class=page-nav__item><button ng-click=paging.nextPage() ng-disabled=!paging.canPageNext()>Next</button></li><li class=page-nav__item><p>Showing {{ paging.firstEntry}} - {{ paging.lastEntry }} of {{ paging.total }}</p></li></ul><br><table class=table-subscriptions><thead><tr><th>Stream/Group(s)</th><th>Rate (messages/s)</th><th colspan=3>Messages</th><th>Connections</th><th>Status<br># of msgs / estimated time to catchup in seconds</th><th></th></tr><tr><th></th><th></th><th class=table-subheading title="Last known event position. The value displayed in the subscription\'s header is the minimum value among all groups.">Last Known</th><th class=table-subheading title="Checkpointed event position. The value displayed in the subscription\'s header is the minimum value among all groups.">Checkpoint</th><th class=table-subheading># in Flight</th><th></th><th></th><th></th></tr></thead><tbody ng-repeat="(key, prop) in subscriptions track by key"><tr ng-if=prop.groups class=table-subheading style="cursor: pointer;" es-subscription-row-header es-subscription=prop></tr><tr ng-if=!prop.groups es-subscription-row es-subscription=prop></tr><tr ng-show=prop.show ng-repeat="item in prop.groups" class=table-indentedrow es-subscription-row es-subscription=item></tr></tbody><tbody ng-hide=subscriptions><tr><td colspan=8><em>No subscriptions</em></td></tr></tbody></table><br>Show <input type=number class=inline-input ng-model=paging.pageSizeInput min=1 ng-model-options={debounce:500} ng-change=paging.onPageSizeChanged() name=pageSize> entries per page. Refresh every <input type=number class=inline-input ng-model=paging.pageRefreshIntervalInput min=1 ng-model-options={debounce:500} ng-change=paging.onPageRefreshIntervalChanged() name=pageRefreshInterval> second(s).')}])}(),function(t){try{t=e.module("es-ui.competing.templates")}catch(n){t=e.module("es-ui.competing.templates",[])}t.run(["$templateCache",function(e){e.put("subscriptions.new.tpl.html",'<header class=page-header><h2 class=page-title>New Subscription</h2><ul class=page-nav><li class=page-nav__item><a ui-sref=^.list>Back</a></li></ul></header><form novalidate name=newSubscription ng-submit=save() class=new-subscription-form><table><tbody><tr class=table-subheading><td colspan=2>Basic Details</td></tr><tr><td>Group</td><td><input ng-model=subscription required class=form-table name=subscription ng-class="{ \'form-table--error\' : newSubscription.subscription.$invalid && !newSubscription.subscription.$pristine }"></td></tr><tr><td>Stream</td><td><input ng-model=stream required class=form-table name=stream ng-class="{ \'form-table--error\' : newSubscription.stream.$invalid && !newSubscription.stream.$pristine }"></td></tr><tr class=table-subheading><td colspan=2>Configuration</td></tr><tr><td>Resolve Link Tos</td><td><input type=checkbox ng-model=resolveLinktos ng-disabled=resolveLinktosDisabled></td></tr><tr><td>Start From</td><td><input ng-model=startFrom class=form-table name=startFrom></td></tr><tr><td>Message Timeout (ms)</td><td><input type=number min=0 ng-model=messageTimeoutMilliseconds class=form-table name=messageTimeoutMilliseconds></td></tr><tr><td>Extra Statistics</td><td><input type=checkbox ng-model=extraStatistics ng-disabled=extraStatisticsDisabled></td></tr><tr><td>Max Retry Count</td><td><input type=number min=0 ng-model=maxRetryCount class=form-table name=maxRetryCount></td></tr><tr><td>Live Buffer Size</td><td><input type=number min=0 ng-model=liveBufferSize class=form-table name=liveBufferSize></td></tr><tr><td>Buffer Size</td><td><input type=number min=0 ng-model=bufferSize class=form-table name=bufferSize></td></tr><tr><td>Read Batch Size</td><td><input type=number min=0 ng-model=readBatchSize class=form-table name=readBatchSize></td></tr><tr><td>CheckPoint After (ms)</td><td><input type=number min=0 ng-model=checkPointAfterMilliseconds class=form-table name=checkPointAfterMilliseconds></td></tr><tr><td>Min CheckPoint Count</td><td><input type=number min=0 ng-model=minCheckPointCount class=form-table name=minCheckPointCount></td></tr><tr><td>Max CheckPoint Count</td><td><input type=number min=0 ng-model=maxCheckPointCount class=form-table name=maxCheckPointCount></td></tr><tr><td>Max Subscriber Count</td><td><input type=number min=0 ng-model=maxSubscriberCount class=form-table name=maxSubscriberCount></td></tr><tr><td>Named Consumer Strategy</td><td><select ng-model=namedConsumerStrategy class=form-table ng-options="obj.value as obj.name for obj in namedConsumerStrategies"></select></td></tr></tbody></table><ul class=page-nav><li class=page-nav__item><button type=submit ng-disabled=newSubscription.$invalid>Create</button></li></ul></form>')}])}(),function(t){try{t=e.module("es-ui.competing.templates")}catch(n){t=e.module("es-ui.competing.templates",[])}t.run(["$templateCache",function(e){e.put("subscriptions.tpl.html","<div ui-view></div>")}])}()})),define("modules/competing/_index",["angular","uiRouter","./controllers/_index","./services/_index","./directives/_index","./templates/templates"],(function(e){"use strict";return e.module("es-ui.competing",["ui.router","es-ui.competing.templates","es-ui.competing.controllers","es-ui.competing.services","es-ui.competing.directives"])})),define("modules/competing/module",["./_index"],(function(e){"use strict";return e.config(["$stateProvider",function(e){e.state("subscriptions",{parent:"app",url:"subscriptions",templateUrl:"subscriptions.tpl.html",abstract:!0,data:{title:"Competing Consumers"}}).state("subscriptions.list",{url:"",templateUrl:"subscriptions.list.tpl.html",controller:"SubscriptionsListCtrl",data:{title:"Subscriptions"}}).state("subscriptions.new",{url:"/new",templateUrl:"subscriptions.new.tpl.html",controller:"SubscriptionsNewCtrl",data:{title:"New Subscription"}}).state("subscriptions.item",{url:"/{streamId}/{groupName}",templateUrl:"subscriptions.item.tpl.html",abstract:!0,controller:["$scope","$stateParams",function(e,t){e.streamId=t.streamId,e.groupName=t.groupName,e.showHeader=!0}],data:{title:"Subscriptions"}}).state("subscriptions.item.detail",{url:"",templateUrl:"subscriptions.item.detail.tpl.html",controller:"SubscriptionsDetailCtrl",data:{title:"Subscription Detail"}}).state("subscriptions.item.edit",{url:"/edit",templateUrl:"subscriptions.item.edit.tpl.html",controller:"SubscriptionsEditCtrl",data:{title:"Edit Subscription"}}).state("subscriptions.item.delete",{url:"/delete",templateUrl:"subscriptions.item.delete.tpl.html",controller:"SubscriptionsDeleteCtrl",data:{title:"Delete Subscription"}}).state("subscriptions.item.viewparkedmessages",{url:"/viewparkedmessages/",templateUrl:"subscriptions.item.viewparkedmessages.tpl.html",controller:"SubscriptionsViewParkedMessagesCtrl",data:{title:"View Parked Messages Subscription"}})}])})),define("modules/visualize/controllers/_module",["angular"],(function(e){"use strict";return e.module("es-ui.visualize.controllers",["es-ui.visualize.services"])})),function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define("moment",t):e.moment=t()}(this,(function(){"use strict";var e,t;function n(){return e.apply(null,arguments)}function i(e){return e instanceof Array||"[object Array]"===Object.prototype.toString.call(e)}function r(e){return null!=e&&"[object Object]"===Object.prototype.toString.call(e)}function s(e){return void 0===e}function o(e){return"number"==typeof e||"[object Number]"===Object.prototype.toString.call(e)}function a(e){return e instanceof Date||"[object Date]"===Object.prototype.toString.call(e)}function l(e,t){var n,i=[];for(n=0;n<e.length;++n)i.push(t(e[n],n));return i}function u(e,t){return Object.prototype.hasOwnProperty.call(e,t)}function c(e,t){for(var n in t)u(t,n)&&(e[n]=t[n]);return u(t,"toString")&&(e.toString=t.toString),u(t,"valueOf")&&(e.valueOf=t.valueOf),e}function h(e,t,n,i){return kt(e,t,n,i,!0).utc()}function d(e){return null==e._pf&&(e._pf={empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1,parsedDateParts:[],meridiem:null,rfc2822:!1,weekdayMismatch:!1}),e._pf}function f(e){if(null==e._isValid){var n=d(e),i=t.call(n.parsedDateParts,(function(e){return null!=e})),r=!isNaN(e._d.getTime())&&n.overflow<0&&!n.empty&&!n.invalidMonth&&!n.invalidWeekday&&!n.weekdayMismatch&&!n.nullInput&&!n.invalidFormat&&!n.userInvalidated&&(!n.meridiem||n.meridiem&&i);if(e._strict&&(r=r&&0===n.charsLeftOver&&0===n.unusedTokens.length&&void 0===n.bigHour),null!=Object.isFrozen&&Object.isFrozen(e))return r;e._isValid=r}return e._isValid}function p(e){var t=h(NaN);return null!=e?c(d(t),e):d(t).userInvalidated=!0,t}t=Array.prototype.some?Array.prototype.some:function(e){for(var t=Object(this),n=t.length>>>0,i=0;i<n;i++)if(i in t&&e.call(this,t[i],i,t))return!0;return!1};var g=n.momentProperties=[];function m(e,t){var n,i,r;if(s(t._isAMomentObject)||(e._isAMomentObject=t._isAMomentObject),s(t._i)||(e._i=t._i),s(t._f)||(e._f=t._f),s(t._l)||(e._l=t._l),s(t._strict)||(e._strict=t._strict),s(t._tzm)||(e._tzm=t._tzm),s(t._isUTC)||(e._isUTC=t._isUTC),s(t._offset)||(e._offset=t._offset),s(t._pf)||(e._pf=d(t)),s(t._locale)||(e._locale=t._locale),0<g.length)for(n=0;n<g.length;n++)s(r=t[i=g[n]])||(e[i]=r);return e}var v=!1;function y(e){m(this,e),this._d=new Date(null!=e._d?e._d.getTime():NaN),this.isValid()||(this._d=new Date(NaN)),!1===v&&(v=!0,n.updateOffset(this),v=!1)}function $(e){return e instanceof y||null!=e&&null!=e._isAMomentObject}function w(e){return e<0?Math.ceil(e)||0:Math.floor(e)}function b(e){var t=+e,n=0;return 0!==t&&isFinite(t)&&(n=w(t)),n}function S(e,t,n){var i,r=Math.min(e.length,t.length),s=Math.abs(e.length-t.length),o=0;for(i=0;i<r;i++)(n&&e[i]!==t[i]||!n&&b(e[i])!==b(t[i]))&&o++;return o+s}function x(e){!1===n.suppressDeprecationWarnings&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+e)}function C(e,t){var i=!0;return c((function(){if(null!=n.deprecationHandler&&n.deprecationHandler(null,e),i){for(var r,s=[],o=0;o<arguments.length;o++){if(r="","object"==typeof arguments[o]){for(var a in r+="\n["+o+"] ",arguments[0])r+=a+": "+arguments[0][a]+", ";r=r.slice(0,-2)}else r=arguments[o];s.push(r)}x(e+"\nArguments: "+Array.prototype.slice.call(s).join("")+"\n"+(new Error).stack),i=!1}return t.apply(this,arguments)}),t)}var k,_={};function M(e,t){null!=n.deprecationHandler&&n.deprecationHandler(e,t),_[e]||(x(t),_[e]=!0)}function A(e){return e instanceof Function||"[object Function]"===Object.prototype.toString.call(e)}function E(e,t){var n,i=c({},e);for(n in t)u(t,n)&&(r(e[n])&&r(t[n])?(i[n]={},c(i[n],e[n]),c(i[n],t[n])):null!=t[n]?i[n]=t[n]:delete i[n]);for(n in e)u(e,n)&&!u(t,n)&&r(e[n])&&(i[n]=c({},i[n]));return i}function R(e){null!=e&&this.set(e)}n.suppressDeprecationWarnings=!1,n.deprecationHandler=null,k=Object.keys?Object.keys:function(e){var t,n=[];for(t in e)u(e,t)&&n.push(t);return n};var T={};function L(e,t){var n=e.toLowerCase();T[n]=T[n+"s"]=T[t]=e}function P(e){return"string"==typeof e?T[e]||T[e.toLowerCase()]:void 0}function I(e){var t,n,i={};for(n in e)u(e,n)&&(t=P(n))&&(i[t]=e[n]);return i}var D={};function O(e,t){D[e]=t}function N(e,t,n){var i=""+Math.abs(e),r=t-i.length;return(0<=e?n?"+":"":"-")+Math.pow(10,Math.max(0,r)).toString().substr(1)+i}var F=/(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g,j=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,B={},U={};function H(e,t,n,i){var r=i;"string"==typeof i&&(r=function(){return this[i]()}),e&&(U[e]=r),t&&(U[t[0]]=function(){return N(r.apply(this,arguments),t[1],t[2])}),n&&(U[n]=function(){return this.localeData().ordinal(r.apply(this,arguments),e)})}function W(e,t){return e.isValid()?(t=z(t,e.localeData()),B[t]=B[t]||function(e){var t,n,i,r=e.match(F);for(t=0,n=r.length;t<n;t++)U[r[t]]?r[t]=U[r[t]]:r[t]=(i=r[t]).match(/\[[\s\S]/)?i.replace(/^\[|\]$/g,""):i.replace(/\\/g,"");return function(t){var i,s="";for(i=0;i<n;i++)s+=A(r[i])?r[i].call(t,e):r[i];return s}}(t),B[t](e)):e.localeData().invalidDate()}function z(e,t){var n=5;function i(e){return t.longDateFormat(e)||e}for(j.lastIndex=0;0<=n&&j.test(e);)e=e.replace(j,i),j.lastIndex=0,n-=1;return e}var V=/\d/,q=/\d\d/,Y=/\d{3}/,G=/\d{4}/,K=/[+-]?\d{6}/,Q=/\d\d?/,J=/\d\d\d\d?/,X=/\d\d\d\d\d\d?/,Z=/\d{1,3}/,ee=/\d{1,4}/,te=/[+-]?\d{1,6}/,ne=/\d+/,ie=/[+-]?\d+/,re=/Z|[+-]\d\d:?\d\d/gi,se=/Z|[+-]\d\d(?::?\d\d)?/gi,oe=/[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i,ae={};function le(e,t,n){ae[e]=A(t)?t:function(e,i){return e&&n?n:t}}function ue(e,t){return u(ae,e)?ae[e](t._strict,t._locale):new RegExp(ce(e.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,(function(e,t,n,i,r){return t||n||i||r}))))}function ce(e){return e.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}var he={};function de(e,t){var n,i=t;for("string"==typeof e&&(e=[e]),o(t)&&(i=function(e,n){n[t]=b(e)}),n=0;n<e.length;n++)he[e[n]]=i}function fe(e,t){de(e,(function(e,n,i,r){i._w=i._w||{},t(e,i._w,i,r)}))}var pe=0,ge=1,me=2,ve=3,ye=4,$e=5,we=6,be=7,Se=8;function xe(e){return Ce(e)?366:365}function Ce(e){return e%4==0&&e%100!=0||e%400==0}H("Y",0,0,(function(){var e=this.year();return e<=9999?""+e:"+"+e})),H(0,["YY",2],0,(function(){return this.year()%100})),H(0,["YYYY",4],0,"year"),H(0,["YYYYY",5],0,"year"),H(0,["YYYYYY",6,!0],0,"year"),L("year","y"),O("year",1),le("Y",ie),le("YY",Q,q),le("YYYY",ee,G),le("YYYYY",te,K),le("YYYYYY",te,K),de(["YYYYY","YYYYYY"],pe),de("YYYY",(function(e,t){t[pe]=2===e.length?n.parseTwoDigitYear(e):b(e)})),de("YY",(function(e,t){t[pe]=n.parseTwoDigitYear(e)})),de("Y",(function(e,t){t[pe]=parseInt(e,10)})),n.parseTwoDigitYear=function(e){return b(e)+(68<b(e)?1900:2e3)};var ke,_e=Me("FullYear",!0);function Me(e,t){return function(i){return null!=i?(Ee(this,e,i),n.updateOffset(this,t),this):Ae(this,e)}}function Ae(e,t){return e.isValid()?e._d["get"+(e._isUTC?"UTC":"")+t]():NaN}function Ee(e,t,n){e.isValid()&&!isNaN(n)&&("FullYear"===t&&Ce(e.year())&&1===e.month()&&29===e.date()?e._d["set"+(e._isUTC?"UTC":"")+t](n,e.month(),Re(n,e.month())):e._d["set"+(e._isUTC?"UTC":"")+t](n))}function Re(e,t){if(isNaN(e)||isNaN(t))return NaN;var n=(t%12+12)%12;return e+=(t-n)/12,1===n?Ce(e)?29:28:31-n%7%2}ke=Array.prototype.indexOf?Array.prototype.indexOf:function(e){var t;for(t=0;t<this.length;++t)if(this[t]===e)return t;return-1},H("M",["MM",2],"Mo",(function(){return this.month()+1})),H("MMM",0,0,(function(e){return this.localeData().monthsShort(this,e)})),H("MMMM",0,0,(function(e){return this.localeData().months(this,e)})),L("month","M"),O("month",8),le("M",Q),le("MM",Q,q),le("MMM",(function(e,t){return t.monthsShortRegex(e)})),le("MMMM",(function(e,t){return t.monthsRegex(e)})),de(["M","MM"],(function(e,t){t[ge]=b(e)-1})),de(["MMM","MMMM"],(function(e,t,n,i){var r=n._locale.monthsParse(e,i,n._strict);null!=r?t[ge]=r:d(n).invalidMonth=e}));var Te=/D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/,Le="January_February_March_April_May_June_July_August_September_October_November_December".split("_"),Pe="Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_");function Ie(e,t){var n;if(!e.isValid())return e;if("string"==typeof t)if(/^\d+$/.test(t))t=b(t);else if(!o(t=e.localeData().monthsParse(t)))return e;return n=Math.min(e.date(),Re(e.year(),t)),e._d["set"+(e._isUTC?"UTC":"")+"Month"](t,n),e}function De(e){return null!=e?(Ie(this,e),n.updateOffset(this,!0),this):Ae(this,"Month")}var Oe=oe,Ne=oe;function Fe(){function e(e,t){return t.length-e.length}var t,n,i=[],r=[],s=[];for(t=0;t<12;t++)n=h([2e3,t]),i.push(this.monthsShort(n,"")),r.push(this.months(n,"")),s.push(this.months(n,"")),s.push(this.monthsShort(n,""));for(i.sort(e),r.sort(e),s.sort(e),t=0;t<12;t++)i[t]=ce(i[t]),r[t]=ce(r[t]);for(t=0;t<24;t++)s[t]=ce(s[t]);this._monthsRegex=new RegExp("^("+s.join("|")+")","i"),this._monthsShortRegex=this._monthsRegex,this._monthsStrictRegex=new RegExp("^("+r.join("|")+")","i"),this._monthsShortStrictRegex=new RegExp("^("+i.join("|")+")","i")}function je(e){var t=new Date(Date.UTC.apply(null,arguments));return e<100&&0<=e&&isFinite(t.getUTCFullYear())&&t.setUTCFullYear(e),t}function Be(e,t,n){var i=7+t-n;return-(7+je(e,0,i).getUTCDay()-t)%7+i-1}function Ue(e,t,n,i,r){var s,o,a=1+7*(t-1)+(7+n-i)%7+Be(e,i,r);return a<=0?o=xe(s=e-1)+a:a>xe(e)?(s=e+1,o=a-xe(e)):(s=e,o=a),{year:s,dayOfYear:o}}function He(e,t,n){var i,r,s=Be(e.year(),t,n),o=Math.floor((e.dayOfYear()-s-1)/7)+1;return o<1?i=o+We(r=e.year()-1,t,n):o>We(e.year(),t,n)?(i=o-We(e.year(),t,n),r=e.year()+1):(r=e.year(),i=o),{week:i,year:r}}function We(e,t,n){var i=Be(e,t,n),r=Be(e+1,t,n);return(xe(e)-i+r)/7}H("w",["ww",2],"wo","week"),H("W",["WW",2],"Wo","isoWeek"),L("week","w"),L("isoWeek","W"),O("week",5),O("isoWeek",5),le("w",Q),le("ww",Q,q),le("W",Q),le("WW",Q,q),fe(["w","ww","W","WW"],(function(e,t,n,i){t[i.substr(0,1)]=b(e)})),H("d",0,"do","day"),H("dd",0,0,(function(e){return this.localeData().weekdaysMin(this,e)})),H("ddd",0,0,(function(e){return this.localeData().weekdaysShort(this,e)})),H("dddd",0,0,(function(e){return this.localeData().weekdays(this,e)})),H("e",0,0,"weekday"),H("E",0,0,"isoWeekday"),L("day","d"),L("weekday","e"),L("isoWeekday","E"),O("day",11),O("weekday",11),O("isoWeekday",11),le("d",Q),le("e",Q),le("E",Q),le("dd",(function(e,t){return t.weekdaysMinRegex(e)})),le("ddd",(function(e,t){return t.weekdaysShortRegex(e)})),le("dddd",(function(e,t){return t.weekdaysRegex(e)})),fe(["dd","ddd","dddd"],(function(e,t,n,i){var r=n._locale.weekdaysParse(e,i,n._strict);null!=r?t.d=r:d(n).invalidWeekday=e})),fe(["d","e","E"],(function(e,t,n,i){t[i]=b(e)}));var ze="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),Ve="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),qe="Su_Mo_Tu_We_Th_Fr_Sa".split("_"),Ye=oe,Ge=oe,Ke=oe;function Qe(){function e(e,t){return t.length-e.length}var t,n,i,r,s,o=[],a=[],l=[],u=[];for(t=0;t<7;t++)n=h([2e3,1]).day(t),i=this.weekdaysMin(n,""),r=this.weekdaysShort(n,""),s=this.weekdays(n,""),o.push(i),a.push(r),l.push(s),u.push(i),u.push(r),u.push(s);for(o.sort(e),a.sort(e),l.sort(e),u.sort(e),t=0;t<7;t++)a[t]=ce(a[t]),l[t]=ce(l[t]),u[t]=ce(u[t]);this._weekdaysRegex=new RegExp("^("+u.join("|")+")","i"),this._weekdaysShortRegex=this._weekdaysRegex,this._weekdaysMinRegex=this._weekdaysRegex,this._weekdaysStrictRegex=new RegExp("^("+l.join("|")+")","i"),this._weekdaysShortStrictRegex=new RegExp("^("+a.join("|")+")","i"),this._weekdaysMinStrictRegex=new RegExp("^("+o.join("|")+")","i")}function Je(){return this.hours()%12||12}function Xe(e,t){H(e,0,0,(function(){return this.localeData().meridiem(this.hours(),this.minutes(),t)}))}function Ze(e,t){return t._meridiemParse}H("H",["HH",2],0,"hour"),H("h",["hh",2],0,Je),H("k",["kk",2],0,(function(){return this.hours()||24})),H("hmm",0,0,(function(){return""+Je.apply(this)+N(this.minutes(),2)})),H("hmmss",0,0,(function(){return""+Je.apply(this)+N(this.minutes(),2)+N(this.seconds(),2)})),H("Hmm",0,0,(function(){return""+this.hours()+N(this.minutes(),2)})),H("Hmmss",0,0,(function(){return""+this.hours()+N(this.minutes(),2)+N(this.seconds(),2)})),Xe("a",!0),Xe("A",!1),L("hour","h"),O("hour",13),le("a",Ze),le("A",Ze),le("H",Q),le("h",Q),le("k",Q),le("HH",Q,q),le("hh",Q,q),le("kk",Q,q),le("hmm",J),le("hmmss",X),le("Hmm",J),le("Hmmss",X),de(["H","HH"],ve),de(["k","kk"],(function(e,t,n){var i=b(e);t[ve]=24===i?0:i})),de(["a","A"],(function(e,t,n){n._isPm=n._locale.isPM(e),n._meridiem=e})),de(["h","hh"],(function(e,t,n){t[ve]=b(e),d(n).bigHour=!0})),de("hmm",(function(e,t,n){var i=e.length-2;t[ve]=b(e.substr(0,i)),t[ye]=b(e.substr(i)),d(n).bigHour=!0})),de("hmmss",(function(e,t,n){var i=e.length-4,r=e.length-2;t[ve]=b(e.substr(0,i)),t[ye]=b(e.substr(i,2)),t[$e]=b(e.substr(r)),d(n).bigHour=!0})),de("Hmm",(function(e,t,n){var i=e.length-2;t[ve]=b(e.substr(0,i)),t[ye]=b(e.substr(i))})),de("Hmmss",(function(e,t,n){var i=e.length-4,r=e.length-2;t[ve]=b(e.substr(0,i)),t[ye]=b(e.substr(i,2)),t[$e]=b(e.substr(r))}));var et,tt=Me("Hours",!0),nt={calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},longDateFormat:{LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},invalidDate:"Invalid date",ordinal:"%d",dayOfMonthOrdinalParse:/\d{1,2}/,relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},months:Le,monthsShort:Pe,week:{dow:0,doy:6},weekdays:ze,weekdaysMin:qe,weekdaysShort:Ve,meridiemParse:/[ap]\.?m?\.?/i},it={},rt={};function st(e){return e?e.toLowerCase().replace("_","-"):e}function ot(e){var t=null;if(!it[e]&&"undefined"!=typeof module&&module&&module.exports)try{t=et._abbr,require("./locale/"+e),at(t)}catch(e){}return it[e]}function at(e,t){var n;return e&&((n=s(t)?ut(e):lt(e,t))?et=n:"undefined"!=typeof console&&console.warn&&console.warn("Locale "+e+" not found. Did you forget to load it?")),et._abbr}function lt(e,t){if(null!==t){var n,i=nt;if(t.abbr=e,null!=it[e])M("defineLocaleOverride","use moment.updateLocale(localeName, config) to change an existing locale. moment.defineLocale(localeName, config) should only be used for creating a new locale See http://momentjs.com/guides/#/warnings/define-locale/ for more info."),i=it[e]._config;else if(null!=t.parentLocale)if(null!=it[t.parentLocale])i=it[t.parentLocale]._config;else{if(null==(n=ot(t.parentLocale)))return rt[t.parentLocale]||(rt[t.parentLocale]=[]),rt[t.parentLocale].push({name:e,config:t}),null;i=n._config}return it[e]=new R(E(i,t)),rt[e]&&rt[e].forEach((function(e){lt(e.name,e.config)})),at(e),it[e]}return delete it[e],null}function ut(e){var t;if(e&&e._locale&&e._locale._abbr&&(e=e._locale._abbr),!e)return et;if(!i(e)){if(t=ot(e))return t;e=[e]}return function(e){for(var t,n,i,r,s=0;s<e.length;){for(t=(r=st(e[s]).split("-")).length,n=(n=st(e[s+1]))?n.split("-"):null;0<t;){if(i=ot(r.slice(0,t).join("-")))return i;if(n&&n.length>=t&&S(r,n,!0)>=t-1)break;t--}s++}return et}(e)}function ct(e){var t,n=e._a;return n&&-2===d(e).overflow&&(t=n[ge]<0||11<n[ge]?ge:n[me]<1||n[me]>Re(n[pe],n[ge])?me:n[ve]<0||24<n[ve]||24===n[ve]&&(0!==n[ye]||0!==n[$e]||0!==n[we])?ve:n[ye]<0||59<n[ye]?ye:n[$e]<0||59<n[$e]?$e:n[we]<0||999<n[we]?we:-1,d(e)._overflowDayOfYear&&(t<pe||me<t)&&(t=me),d(e)._overflowWeeks&&-1===t&&(t=be),d(e)._overflowWeekday&&-1===t&&(t=Se),d(e).overflow=t),e}function ht(e,t,n){return null!=e?e:null!=t?t:n}function dt(e){var t,i,r,s,o,a=[];if(!e._d){var l,u;for(l=e,u=new Date(n.now()),r=l._useUTC?[u.getUTCFullYear(),u.getUTCMonth(),u.getUTCDate()]:[u.getFullYear(),u.getMonth(),u.getDate()],e._w&&null==e._a[me]&&null==e._a[ge]&&function(e){var t,n,i,r,s,o,a,l;if(null!=(t=e._w).GG||null!=t.W||null!=t.E)s=1,o=4,n=ht(t.GG,e._a[pe],He(_t(),1,4).year),i=ht(t.W,1),((r=ht(t.E,1))<1||7<r)&&(l=!0);else{s=e._locale._week.dow,o=e._locale._week.doy;var u=He(_t(),s,o);n=ht(t.gg,e._a[pe],u.year),i=ht(t.w,u.week),null!=t.d?((r=t.d)<0||6<r)&&(l=!0):null!=t.e?(r=t.e+s,(t.e<0||6<t.e)&&(l=!0)):r=s}i<1||i>We(n,s,o)?d(e)._overflowWeeks=!0:null!=l?d(e)._overflowWeekday=!0:(a=Ue(n,i,r,s,o),e._a[pe]=a.year,e._dayOfYear=a.dayOfYear)}(e),null!=e._dayOfYear&&(o=ht(e._a[pe],r[pe]),(e._dayOfYear>xe(o)||0===e._dayOfYear)&&(d(e)._overflowDayOfYear=!0),i=je(o,0,e._dayOfYear),e._a[ge]=i.getUTCMonth(),e._a[me]=i.getUTCDate()),t=0;t<3&&null==e._a[t];++t)e._a[t]=a[t]=r[t];for(;t<7;t++)e._a[t]=a[t]=null==e._a[t]?2===t?1:0:e._a[t];24===e._a[ve]&&0===e._a[ye]&&0===e._a[$e]&&0===e._a[we]&&(e._nextDay=!0,e._a[ve]=0),e._d=(e._useUTC?je:function(e,t,n,i,r,s,o){var a=new Date(e,t,n,i,r,s,o);return e<100&&0<=e&&isFinite(a.getFullYear())&&a.setFullYear(e),a}).apply(null,a),s=e._useUTC?e._d.getUTCDay():e._d.getDay(),null!=e._tzm&&e._d.setUTCMinutes(e._d.getUTCMinutes()-e._tzm),e._nextDay&&(e._a[ve]=24),e._w&&void 0!==e._w.d&&e._w.d!==s&&(d(e).weekdayMismatch=!0)}}var ft=/^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,pt=/^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,gt=/Z|[+-]\d\d(?::?\d\d)?/,mt=[["YYYYYY-MM-DD",/[+-]\d{6}-\d\d-\d\d/],["YYYY-MM-DD",/\d{4}-\d\d-\d\d/],["GGGG-[W]WW-E",/\d{4}-W\d\d-\d/],["GGGG-[W]WW",/\d{4}-W\d\d/,!1],["YYYY-DDD",/\d{4}-\d{3}/],["YYYY-MM",/\d{4}-\d\d/,!1],["YYYYYYMMDD",/[+-]\d{10}/],["YYYYMMDD",/\d{8}/],["GGGG[W]WWE",/\d{4}W\d{3}/],["GGGG[W]WW",/\d{4}W\d{2}/,!1],["YYYYDDD",/\d{7}/]],vt=[["HH:mm:ss.SSSS",/\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss,SSSS",/\d\d:\d\d:\d\d,\d+/],["HH:mm:ss",/\d\d:\d\d:\d\d/],["HH:mm",/\d\d:\d\d/],["HHmmss.SSSS",/\d\d\d\d\d\d\.\d+/],["HHmmss,SSSS",/\d\d\d\d\d\d,\d+/],["HHmmss",/\d\d\d\d\d\d/],["HHmm",/\d\d\d\d/],["HH",/\d\d/]],yt=/^\/?Date\((\-?\d+)/i;function $t(e){var t,n,i,r,s,o,a=e._i,l=ft.exec(a)||pt.exec(a);if(l){for(d(e).iso=!0,t=0,n=mt.length;t<n;t++)if(mt[t][1].exec(l[1])){r=mt[t][0],i=!1!==mt[t][2];break}if(null==r)return void(e._isValid=!1);if(l[3]){for(t=0,n=vt.length;t<n;t++)if(vt[t][1].exec(l[3])){s=(l[2]||" ")+vt[t][0];break}if(null==s)return void(e._isValid=!1)}if(!i&&null!=s)return void(e._isValid=!1);if(l[4]){if(!gt.exec(l[4]))return void(e._isValid=!1);o="Z"}e._f=r+(s||"")+(o||""),xt(e)}else e._isValid=!1}var wt=/^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/;var bt={UT:0,GMT:0,EDT:-240,EST:-300,CDT:-300,CST:-360,MDT:-360,MST:-420,PDT:-420,PST:-480};function St(e){var t,n,i,r=wt.exec(e._i.replace(/\([^)]*\)|[\n\t]/g," ").replace(/(\s\s+)/g," ").trim());if(r){var s=function(e,t,n,i,r,s){var o=[function(e){var t=parseInt(e,10);return t<=49?2e3+t:t<=999?1900+t:t}(e),Pe.indexOf(t),parseInt(n,10),parseInt(i,10),parseInt(r,10)];return s&&o.push(parseInt(s,10)),o}(r[4],r[3],r[2],r[5],r[6],r[7]);if(n=s,i=e,(t=r[1])&&Ve.indexOf(t)!==new Date(n[0],n[1],n[2]).getDay()&&(d(i).weekdayMismatch=!0,!(i._isValid=!1)))return;e._a=s,e._tzm=function(e,t,n){if(e)return bt[e];if(t)return 0;var i=parseInt(n,10),r=i%100;return(i-r)/100*60+r}(r[8],r[9],r[10]),e._d=je.apply(null,e._a),e._d.setUTCMinutes(e._d.getUTCMinutes()-e._tzm),d(e).rfc2822=!0}else e._isValid=!1}function xt(e){if(e._f!==n.ISO_8601)if(e._f!==n.RFC_2822){e._a=[],d(e).empty=!0;var t,i,r,s,o,a,l,c,h=""+e._i,f=h.length,p=0;for(r=z(e._f,e._locale).match(F)||[],t=0;t<r.length;t++)s=r[t],(i=(h.match(ue(s,e))||[])[0])&&(0<(o=h.substr(0,h.indexOf(i))).length&&d(e).unusedInput.push(o),h=h.slice(h.indexOf(i)+i.length),p+=i.length),U[s]?(i?d(e).empty=!1:d(e).unusedTokens.push(s),a=s,c=e,null!=(l=i)&&u(he,a)&&he[a](l,c._a,c,a)):e._strict&&!i&&d(e).unusedTokens.push(s);d(e).charsLeftOver=f-p,0<h.length&&d(e).unusedInput.push(h),e._a[ve]<=12&&!0===d(e).bigHour&&0<e._a[ve]&&(d(e).bigHour=void 0),d(e).parsedDateParts=e._a.slice(0),d(e).meridiem=e._meridiem,e._a[ve]=function(e,t,n){var i;return null==n?t:null!=e.meridiemHour?e.meridiemHour(t,n):(null!=e.isPM&&((i=e.isPM(n))&&t<12&&(t+=12),i||12!==t||(t=0)),t)}(e._locale,e._a[ve],e._meridiem),dt(e),ct(e)}else St(e);else $t(e)}function Ct(e){var t,u,h,g,v=e._i,w=e._f;return e._locale=e._locale||ut(e._l),null===v||void 0===w&&""===v?p({nullInput:!0}):("string"==typeof v&&(e._i=v=e._locale.preparse(v)),$(v)?new y(ct(v)):(a(v)?e._d=v:i(w)?function(e){var t,n,i,r,s;if(0===e._f.length)return d(e).invalidFormat=!0,e._d=new Date(NaN);for(r=0;r<e._f.length;r++)s=0,t=m({},e),null!=e._useUTC&&(t._useUTC=e._useUTC),t._f=e._f[r],xt(t),f(t)&&(s+=d(t).charsLeftOver,s+=10*d(t).unusedTokens.length,d(t).score=s,(null==i||s<i)&&(i=s,n=t));c(e,n||t)}(e):w?xt(e):s(u=(t=e)._i)?t._d=new Date(n.now()):a(u)?t._d=new Date(u.valueOf()):"string"==typeof u?(h=t,null===(g=yt.exec(h._i))?($t(h),!1===h._isValid&&(delete h._isValid,St(h),!1===h._isValid&&(delete h._isValid,n.createFromInputFallback(h)))):h._d=new Date(+g[1])):i(u)?(t._a=l(u.slice(0),(function(e){return parseInt(e,10)})),dt(t)):r(u)?function(e){if(!e._d){var t=I(e._i);e._a=l([t.year,t.month,t.day||t.date,t.hour,t.minute,t.second,t.millisecond],(function(e){return e&&parseInt(e,10)})),dt(e)}}(t):o(u)?t._d=new Date(u):n.createFromInputFallback(t),f(e)||(e._d=null),e))}function kt(e,t,n,s,o){var a,l={};return!0!==n&&!1!==n||(s=n,n=void 0),(r(e)&&function(e){if(Object.getOwnPropertyNames)return 0===Object.getOwnPropertyNames(e).length;var t;for(t in e)if(e.hasOwnProperty(t))return!1;return!0}(e)||i(e)&&0===e.length)&&(e=void 0),l._isAMomentObject=!0,l._useUTC=l._isUTC=o,l._l=n,l._i=e,l._f=t,l._strict=s,(a=new y(ct(Ct(l))))._nextDay&&(a.add(1,"d"),a._nextDay=void 0),a}function _t(e,t,n,i){return kt(e,t,n,i,!1)}n.createFromInputFallback=C("value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are discouraged and will be removed in an upcoming major release. Please refer to http://momentjs.com/guides/#/warnings/js-date/ for more info.",(function(e){e._d=new Date(e._i+(e._useUTC?" UTC":""))})),n.ISO_8601=function(){},n.RFC_2822=function(){};var Mt=C("moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/",(function(){var e=_t.apply(null,arguments);return this.isValid()&&e.isValid()?e<this?this:e:p()})),At=C("moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/",(function(){var e=_t.apply(null,arguments);return this.isValid()&&e.isValid()?this<e?this:e:p()}));function Et(e,t){var n,r;if(1===t.length&&i(t[0])&&(t=t[0]),!t.length)return _t();for(n=t[0],r=1;r<t.length;++r)t[r].isValid()&&!t[r][e](n)||(n=t[r]);return n}var Rt=["year","quarter","month","week","day","hour","minute","second","millisecond"];function Tt(e){var t=I(e),n=t.year||0,i=t.quarter||0,r=t.month||0,s=t.week||0,o=t.day||0,a=t.hour||0,l=t.minute||0,u=t.second||0,c=t.millisecond||0;this._isValid=function(e){for(var t in e)if(-1===ke.call(Rt,t)||null!=e[t]&&isNaN(e[t]))return!1;for(var n=!1,i=0;i<Rt.length;++i)if(e[Rt[i]]){if(n)return!1;parseFloat(e[Rt[i]])!==b(e[Rt[i]])&&(n=!0)}return!0}(t),this._milliseconds=+c+1e3*u+6e4*l+1e3*a*60*60,this._days=+o+7*s,this._months=+r+3*i+12*n,this._data={},this._locale=ut(),this._bubble()}function Lt(e){return e instanceof Tt}function Pt(e){return e<0?-1*Math.round(-1*e):Math.round(e)}function It(e,t){H(e,0,0,(function(){var e=this.utcOffset(),n="+";return e<0&&(e=-e,n="-"),n+N(~~(e/60),2)+t+N(~~e%60,2)}))}It("Z",":"),It("ZZ",""),le("Z",se),le("ZZ",se),de(["Z","ZZ"],(function(e,t,n){n._useUTC=!0,n._tzm=Ot(se,e)}));var Dt=/([\+\-]|\d\d)/gi;function Ot(e,t){var n=(t||"").match(e);if(null===n)return null;var i=((n[n.length-1]||[])+"").match(Dt)||["-",0,0],r=60*i[1]+b(i[2]);return 0===r?0:"+"===i[0]?r:-r}function Nt(e,t){var i,r;return t._isUTC?(i=t.clone(),r=($(e)||a(e)?e.valueOf():_t(e).valueOf())-i.valueOf(),i._d.setTime(i._d.valueOf()+r),n.updateOffset(i,!1),i):_t(e).local()}function Ft(e){return 15*-Math.round(e._d.getTimezoneOffset()/15)}function jt(){return!!this.isValid()&&this._isUTC&&0===this._offset}n.updateOffset=function(){};var Bt=/^(\-|\+)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)(\.\d*)?)?$/,Ut=/^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;function Ht(e,t){var n,i,r,s=e,a=null;return Lt(e)?s={ms:e._milliseconds,d:e._days,M:e._months}:o(e)?(s={},t?s[t]=e:s.milliseconds=e):(a=Bt.exec(e))?(n="-"===a[1]?-1:1,s={y:0,d:b(a[me])*n,h:b(a[ve])*n,m:b(a[ye])*n,s:b(a[$e])*n,ms:b(Pt(1e3*a[we]))*n}):(a=Ut.exec(e))?(n="-"===a[1]?-1:(a[1],1),s={y:Wt(a[2],n),M:Wt(a[3],n),w:Wt(a[4],n),d:Wt(a[5],n),h:Wt(a[6],n),m:Wt(a[7],n),s:Wt(a[8],n)}):null==s?s={}:"object"==typeof s&&("from"in s||"to"in s)&&(r=function(e,t){var n;return e.isValid()&&t.isValid()?(t=Nt(t,e),e.isBefore(t)?n=zt(e,t):((n=zt(t,e)).milliseconds=-n.milliseconds,n.months=-n.months),n):{milliseconds:0,months:0}}(_t(s.from),_t(s.to)),(s={}).ms=r.milliseconds,s.M=r.months),i=new Tt(s),Lt(e)&&u(e,"_locale")&&(i._locale=e._locale),i}function Wt(e,t){var n=e&&parseFloat(e.replace(",","."));return(isNaN(n)?0:n)*t}function zt(e,t){var n={milliseconds:0,months:0};return n.months=t.month()-e.month()+12*(t.year()-e.year()),e.clone().add(n.months,"M").isAfter(t)&&--n.months,n.milliseconds=+t-+e.clone().add(n.months,"M"),n}function Vt(e,t){return function(n,i){var r;return null===i||isNaN(+i)||(M(t,"moment()."+t+"(period, number) is deprecated. Please use moment()."+t+"(number, period). See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info."),r=n,n=i,i=r),qt(this,Ht(n="string"==typeof n?+n:n,i),e),this}}function qt(e,t,i,r){var s=t._milliseconds,o=Pt(t._days),a=Pt(t._months);e.isValid()&&(r=null==r||r,a&&Ie(e,Ae(e,"Month")+a*i),o&&Ee(e,"Date",Ae(e,"Date")+o*i),s&&e._d.setTime(e._d.valueOf()+s*i),r&&n.updateOffset(e,o||a))}Ht.fn=Tt.prototype,Ht.invalid=function(){return Ht(NaN)};var Yt=Vt(1,"add"),Gt=Vt(-1,"subtract");function Kt(e,t){var n=12*(t.year()-e.year())+(t.month()-e.month()),i=e.clone().add(n,"months");return-(n+(t-i<0?(t-i)/(i-e.clone().add(n-1,"months")):(t-i)/(e.clone().add(n+1,"months")-i)))||0}function Qt(e){var t;return void 0===e?this._locale._abbr:(null!=(t=ut(e))&&(this._locale=t),this)}n.defaultFormat="YYYY-MM-DDTHH:mm:ssZ",n.defaultFormatUtc="YYYY-MM-DDTHH:mm:ss[Z]";var Jt=C("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",(function(e){return void 0===e?this.localeData():this.locale(e)}));function Xt(){return this._locale}function Zt(e,t){H(0,[e,e.length],0,t)}function en(e,t,n,i,r){var s;return null==e?He(this,i,r).year:((s=We(e,i,r))<t&&(t=s),function(e,t,n,i,r){var s=Ue(e,t,n,i,r),o=je(s.year,0,s.dayOfYear);return this.year(o.getUTCFullYear()),this.month(o.getUTCMonth()),this.date(o.getUTCDate()),this}.call(this,e,t,n,i,r))}H(0,["gg",2],0,(function(){return this.weekYear()%100})),H(0,["GG",2],0,(function(){return this.isoWeekYear()%100})),Zt("gggg","weekYear"),Zt("ggggg","weekYear"),Zt("GGGG","isoWeekYear"),Zt("GGGGG","isoWeekYear"),L("weekYear","gg"),L("isoWeekYear","GG"),O("weekYear",1),O("isoWeekYear",1),le("G",ie),le("g",ie),le("GG",Q,q),le("gg",Q,q),le("GGGG",ee,G),le("gggg",ee,G),le("GGGGG",te,K),le("ggggg",te,K),fe(["gggg","ggggg","GGGG","GGGGG"],(function(e,t,n,i){t[i.substr(0,2)]=b(e)})),fe(["gg","GG"],(function(e,t,i,r){t[r]=n.parseTwoDigitYear(e)})),H("Q",0,"Qo","quarter"),L("quarter","Q"),O("quarter",7),le("Q",V),de("Q",(function(e,t){t[ge]=3*(b(e)-1)})),H("D",["DD",2],"Do","date"),L("date","D"),O("date",9),le("D",Q),le("DD",Q,q),le("Do",(function(e,t){return e?t._dayOfMonthOrdinalParse||t._ordinalParse:t._dayOfMonthOrdinalParseLenient})),de(["D","DD"],me),de("Do",(function(e,t){t[me]=b(e.match(Q)[0])}));var tn=Me("Date",!0);H("DDD",["DDDD",3],"DDDo","dayOfYear"),L("dayOfYear","DDD"),O("dayOfYear",4),le("DDD",Z),le("DDDD",Y),de(["DDD","DDDD"],(function(e,t,n){n._dayOfYear=b(e)})),H("m",["mm",2],0,"minute"),L("minute","m"),O("minute",14),le("m",Q),le("mm",Q,q),de(["m","mm"],ye);var nn=Me("Minutes",!1);H("s",["ss",2],0,"second"),L("second","s"),O("second",15),le("s",Q),le("ss",Q,q),de(["s","ss"],$e);var rn,sn=Me("Seconds",!1);for(H("S",0,0,(function(){return~~(this.millisecond()/100)})),H(0,["SS",2],0,(function(){return~~(this.millisecond()/10)})),H(0,["SSS",3],0,"millisecond"),H(0,["SSSS",4],0,(function(){return 10*this.millisecond()})),H(0,["SSSSS",5],0,(function(){return 100*this.millisecond()})),H(0,["SSSSSS",6],0,(function(){return 1e3*this.millisecond()})),H(0,["SSSSSSS",7],0,(function(){return 1e4*this.millisecond()})),H(0,["SSSSSSSS",8],0,(function(){return 1e5*this.millisecond()})),H(0,["SSSSSSSSS",9],0,(function(){return 1e6*this.millisecond()})),L("millisecond","ms"),O("millisecond",16),le("S",Z,V),le("SS",Z,q),le("SSS",Z,Y),rn="SSSS";rn.length<=9;rn+="S")le(rn,ne);function on(e,t){t[we]=b(1e3*("0."+e))}for(rn="S";rn.length<=9;rn+="S")de(rn,on);var an=Me("Milliseconds",!1);H("z",0,0,"zoneAbbr"),H("zz",0,0,"zoneName");var ln=y.prototype;function un(e){return e}ln.add=Yt,ln.calendar=function(e,t){var i=e||_t(),r=Nt(i,this).startOf("day"),s=n.calendarFormat(this,r)||"sameElse",o=t&&(A(t[s])?t[s].call(this,i):t[s]);return this.format(o||this.localeData().calendar(s,this,_t(i)))},ln.clone=function(){return new y(this)},ln.diff=function(e,t,n){var i,r,s;if(!this.isValid())return NaN;if(!(i=Nt(e,this)).isValid())return NaN;switch(r=6e4*(i.utcOffset()-this.utcOffset()),t=P(t)){case"year":s=Kt(this,i)/12;break;case"month":s=Kt(this,i);break;case"quarter":s=Kt(this,i)/3;break;case"second":s=(this-i)/1e3;break;case"minute":s=(this-i)/6e4;break;case"hour":s=(this-i)/36e5;break;case"day":s=(this-i-r)/864e5;break;case"week":s=(this-i-r)/6048e5;break;default:s=this-i}return n?s:w(s)},ln.endOf=function(e){return void 0===(e=P(e))||"millisecond"===e?this:("date"===e&&(e="day"),this.startOf(e).add(1,"isoWeek"===e?"week":e).subtract(1,"ms"))},ln.format=function(e){e||(e=this.isUtc()?n.defaultFormatUtc:n.defaultFormat);var t=W(this,e);return this.localeData().postformat(t)},ln.from=function(e,t){return this.isValid()&&($(e)&&e.isValid()||_t(e).isValid())?Ht({to:this,from:e}).locale(this.locale()).humanize(!t):this.localeData().invalidDate()},ln.fromNow=function(e){return this.from(_t(),e)},ln.to=function(e,t){return this.isValid()&&($(e)&&e.isValid()||_t(e).isValid())?Ht({from:this,to:e}).locale(this.locale()).humanize(!t):this.localeData().invalidDate()},ln.toNow=function(e){return this.to(_t(),e)},ln.get=function(e){return A(this[e=P(e)])?this[e]():this},ln.invalidAt=function(){return d(this).overflow},ln.isAfter=function(e,t){var n=$(e)?e:_t(e);return!(!this.isValid()||!n.isValid())&&("millisecond"===(t=P(s(t)?"millisecond":t))?this.valueOf()>n.valueOf():n.valueOf()<this.clone().startOf(t).valueOf())},ln.isBefore=function(e,t){var n=$(e)?e:_t(e);return!(!this.isValid()||!n.isValid())&&("millisecond"===(t=P(s(t)?"millisecond":t))?this.valueOf()<n.valueOf():this.clone().endOf(t).valueOf()<n.valueOf())},ln.isBetween=function(e,t,n,i){return("("===(i=i||"()")[0]?this.isAfter(e,n):!this.isBefore(e,n))&&(")"===i[1]?this.isBefore(t,n):!this.isAfter(t,n))},ln.isSame=function(e,t){var n,i=$(e)?e:_t(e);return!(!this.isValid()||!i.isValid())&&("millisecond"===(t=P(t||"millisecond"))?this.valueOf()===i.valueOf():(n=i.valueOf(),this.clone().startOf(t).valueOf()<=n&&n<=this.clone().endOf(t).valueOf()))},ln.isSameOrAfter=function(e,t){return this.isSame(e,t)||this.isAfter(e,t)},ln.isSameOrBefore=function(e,t){return this.isSame(e,t)||this.isBefore(e,t)},ln.isValid=function(){return f(this)},ln.lang=Jt,ln.locale=Qt,ln.localeData=Xt,ln.max=At,ln.min=Mt,ln.parsingFlags=function(){return c({},d(this))},ln.set=function(e,t){if("object"==typeof e)for(var n=function(e){var t=[];for(var n in e)t.push({unit:n,priority:D[n]});return t.sort((function(e,t){return e.priority-t.priority})),t}(e=I(e)),i=0;i<n.length;i++)this[n[i].unit](e[n[i].unit]);else if(A(this[e=P(e)]))return this[e](t);return this},ln.startOf=function(e){switch(e=P(e)){case"year":this.month(0);case"quarter":case"month":this.date(1);case"week":case"isoWeek":case"day":case"date":this.hours(0);case"hour":this.minutes(0);case"minute":this.seconds(0);case"second":this.milliseconds(0)}return"week"===e&&this.weekday(0),"isoWeek"===e&&this.isoWeekday(1),"quarter"===e&&this.month(3*Math.floor(this.month()/3)),this},ln.subtract=Gt,ln.toArray=function(){var e=this;return[e.year(),e.month(),e.date(),e.hour(),e.minute(),e.second(),e.millisecond()]},ln.toObject=function(){var e=this;return{years:e.year(),months:e.month(),date:e.date(),hours:e.hours(),minutes:e.minutes(),seconds:e.seconds(),milliseconds:e.milliseconds()}},ln.toDate=function(){return new Date(this.valueOf())},ln.toISOString=function(e){if(!this.isValid())return null;var t=!0!==e,n=t?this.clone().utc():this;return n.year()<0||9999<n.year()?W(n,t?"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYYYY-MM-DD[T]HH:mm:ss.SSSZ"):A(Date.prototype.toISOString)?t?this.toDate().toISOString():new Date(this.valueOf()+60*this.utcOffset()*1e3).toISOString().replace("Z",W(n,"Z")):W(n,t?"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYY-MM-DD[T]HH:mm:ss.SSSZ")},ln.inspect=function(){if(!this.isValid())return"moment.invalid(/* "+this._i+" */)";var e="moment",t="";this.isLocal()||(e=0===this.utcOffset()?"moment.utc":"moment.parseZone",t="Z");var n="["+e+'("]',i=0<=this.year()&&this.year()<=9999?"YYYY":"YYYYYY",r=t+'[")]';return this.format(n+i+"-MM-DD[T]HH:mm:ss.SSS"+r)},ln.toJSON=function(){return this.isValid()?this.toISOString():null},ln.toString=function(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},ln.unix=function(){return Math.floor(this.valueOf()/1e3)},ln.valueOf=function(){return this._d.valueOf()-6e4*(this._offset||0)},ln.creationData=function(){return{input:this._i,format:this._f,locale:this._locale,isUTC:this._isUTC,strict:this._strict}},ln.year=_e,ln.isLeapYear=function(){return Ce(this.year())},ln.weekYear=function(e){return en.call(this,e,this.week(),this.weekday(),this.localeData()._week.dow,this.localeData()._week.doy)},ln.isoWeekYear=function(e){return en.call(this,e,this.isoWeek(),this.isoWeekday(),1,4)},ln.quarter=ln.quarters=function(e){return null==e?Math.ceil((this.month()+1)/3):this.month(3*(e-1)+this.month()%3)},ln.month=De,ln.daysInMonth=function(){return Re(this.year(),this.month())},ln.week=ln.weeks=function(e){var t=this.localeData().week(this);return null==e?t:this.add(7*(e-t),"d")},ln.isoWeek=ln.isoWeeks=function(e){var t=He(this,1,4).week;return null==e?t:this.add(7*(e-t),"d")},ln.weeksInYear=function(){var e=this.localeData()._week;return We(this.year(),e.dow,e.doy)},ln.isoWeeksInYear=function(){return We(this.year(),1,4)},ln.date=tn,ln.day=ln.days=function(e){if(!this.isValid())return null!=e?this:NaN;var t,n,i=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=e?(t=e,n=this.localeData(),e="string"!=typeof t?t:isNaN(t)?"number"==typeof(t=n.weekdaysParse(t))?t:null:parseInt(t,10),this.add(e-i,"d")):i},ln.weekday=function(e){if(!this.isValid())return null!=e?this:NaN;var t=(this.day()+7-this.localeData()._week.dow)%7;return null==e?t:this.add(e-t,"d")},ln.isoWeekday=function(e){if(!this.isValid())return null!=e?this:NaN;if(null!=e){var t=(n=e,i=this.localeData(),"string"==typeof n?i.weekdaysParse(n)%7||7:isNaN(n)?null:n);return this.day(this.day()%7?t:t-7)}return this.day()||7;var n,i},ln.dayOfYear=function(e){var t=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return null==e?t:this.add(e-t,"d")},ln.hour=ln.hours=tt,ln.minute=ln.minutes=nn,ln.second=ln.seconds=sn,ln.millisecond=ln.milliseconds=an,ln.utcOffset=function(e,t,i){var r,s=this._offset||0;if(!this.isValid())return null!=e?this:NaN;if(null!=e){if("string"==typeof e){if(null===(e=Ot(se,e)))return this}else Math.abs(e)<16&&!i&&(e*=60);return!this._isUTC&&t&&(r=Ft(this)),this._offset=e,this._isUTC=!0,null!=r&&this.add(r,"m"),s!==e&&(!t||this._changeInProgress?qt(this,Ht(e-s,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,n.updateOffset(this,!0),this._changeInProgress=null)),this}return this._isUTC?s:Ft(this)},ln.utc=function(e){return this.utcOffset(0,e)},ln.local=function(e){return this._isUTC&&(this.utcOffset(0,e),this._isUTC=!1,e&&this.subtract(Ft(this),"m")),this},ln.parseZone=function(){if(null!=this._tzm)this.utcOffset(this._tzm,!1,!0);else if("string"==typeof this._i){var e=Ot(re,this._i);null!=e?this.utcOffset(e):this.utcOffset(0,!0)}return this},ln.hasAlignedHourOffset=function(e){return!!this.isValid()&&(e=e?_t(e).utcOffset():0,(this.utcOffset()-e)%60==0)},ln.isDST=function(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()},ln.isLocal=function(){return!!this.isValid()&&!this._isUTC},ln.isUtcOffset=function(){return!!this.isValid()&&this._isUTC},ln.isUtc=jt,ln.isUTC=jt,ln.zoneAbbr=function(){return this._isUTC?"UTC":""},ln.zoneName=function(){return this._isUTC?"Coordinated Universal Time":""},ln.dates=C("dates accessor is deprecated. Use date instead.",tn),ln.months=C("months accessor is deprecated. Use month instead",De),ln.years=C("years accessor is deprecated. Use year instead",_e),ln.zone=C("moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/",(function(e,t){return null!=e?("string"!=typeof e&&(e=-e),this.utcOffset(e,t),this):-this.utcOffset()})),ln.isDSTShifted=C("isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information",(function(){if(!s(this._isDSTShifted))return this._isDSTShifted;var e={};if(m(e,this),(e=Ct(e))._a){var t=e._isUTC?h(e._a):_t(e._a);this._isDSTShifted=this.isValid()&&0<S(e._a,t.toArray())}else this._isDSTShifted=!1;return this._isDSTShifted}));var cn=R.prototype;function hn(e,t,n,i){var r=ut(),s=h().set(i,t);return r[n](s,e)}function dn(e,t,n){if(o(e)&&(t=e,e=void 0),e=e||"",null!=t)return hn(e,t,n,"month");var i,r=[];for(i=0;i<12;i++)r[i]=hn(e,i,n,"month");return r}function fn(e,t,n,i){"boolean"==typeof e?o(t)&&(n=t,t=void 0):(t=e,e=!1,o(n=t)&&(n=t,t=void 0)),t=t||"";var r,s=ut(),a=e?s._week.dow:0;if(null!=n)return hn(t,(n+a)%7,i,"day");var l=[];for(r=0;r<7;r++)l[r]=hn(t,(r+a)%7,i,"day");return l}cn.calendar=function(e,t,n){var i=this._calendar[e]||this._calendar.sameElse;return A(i)?i.call(t,n):i},cn.longDateFormat=function(e){var t=this._longDateFormat[e],n=this._longDateFormat[e.toUpperCase()];return t||!n?t:(this._longDateFormat[e]=n.replace(/MMMM|MM|DD|dddd/g,(function(e){return e.slice(1)})),this._longDateFormat[e])},cn.invalidDate=function(){return this._invalidDate},cn.ordinal=function(e){return this._ordinal.replace("%d",e)},cn.preparse=un,cn.postformat=un,cn.relativeTime=function(e,t,n,i){var r=this._relativeTime[n];return A(r)?r(e,t,n,i):r.replace(/%d/i,e)},cn.pastFuture=function(e,t){var n=this._relativeTime[0<e?"future":"past"];return A(n)?n(t):n.replace(/%s/i,t)},cn.set=function(e){var t,n;for(n in e)A(t=e[n])?this[n]=t:this["_"+n]=t;this._config=e,this._dayOfMonthOrdinalParseLenient=new RegExp((this._dayOfMonthOrdinalParse.source||this._ordinalParse.source)+"|"+/\d{1,2}/.source)},cn.months=function(e,t){return e?i(this._months)?this._months[e.month()]:this._months[(this._months.isFormat||Te).test(t)?"format":"standalone"][e.month()]:i(this._months)?this._months:this._months.standalone},cn.monthsShort=function(e,t){return e?i(this._monthsShort)?this._monthsShort[e.month()]:this._monthsShort[Te.test(t)?"format":"standalone"][e.month()]:i(this._monthsShort)?this._monthsShort:this._monthsShort.standalone},cn.monthsParse=function(e,t,n){var i,r,s;if(this._monthsParseExact)return function(e,t,n){var i,r,s,o=e.toLocaleLowerCase();if(!this._monthsParse)for(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[],i=0;i<12;++i)s=h([2e3,i]),this._shortMonthsParse[i]=this.monthsShort(s,"").toLocaleLowerCase(),this._longMonthsParse[i]=this.months(s,"").toLocaleLowerCase();return n?"MMM"===t?-1!==(r=ke.call(this._shortMonthsParse,o))?r:null:-1!==(r=ke.call(this._longMonthsParse,o))?r:null:"MMM"===t?-1!==(r=ke.call(this._shortMonthsParse,o))||-1!==(r=ke.call(this._longMonthsParse,o))?r:null:-1!==(r=ke.call(this._longMonthsParse,o))||-1!==(r=ke.call(this._shortMonthsParse,o))?r:null}.call(this,e,t,n);for(this._monthsParse||(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[]),i=0;i<12;i++){if(r=h([2e3,i]),n&&!this._longMonthsParse[i]&&(this._longMonthsParse[i]=new RegExp("^"+this.months(r,"").replace(".","")+"$","i"),this._shortMonthsParse[i]=new RegExp("^"+this.monthsShort(r,"").replace(".","")+"$","i")),n||this._monthsParse[i]||(s="^"+this.months(r,"")+"|^"+this.monthsShort(r,""),this._monthsParse[i]=new RegExp(s.replace(".",""),"i")),n&&"MMMM"===t&&this._longMonthsParse[i].test(e))return i;if(n&&"MMM"===t&&this._shortMonthsParse[i].test(e))return i;if(!n&&this._monthsParse[i].test(e))return i}},cn.monthsRegex=function(e){return this._monthsParseExact?(u(this,"_monthsRegex")||Fe.call(this),e?this._monthsStrictRegex:this._monthsRegex):(u(this,"_monthsRegex")||(this._monthsRegex=Ne),this._monthsStrictRegex&&e?this._monthsStrictRegex:this._monthsRegex)},cn.monthsShortRegex=function(e){return this._monthsParseExact?(u(this,"_monthsRegex")||Fe.call(this),e?this._monthsShortStrictRegex:this._monthsShortRegex):(u(this,"_monthsShortRegex")||(this._monthsShortRegex=Oe),this._monthsShortStrictRegex&&e?this._monthsShortStrictRegex:this._monthsShortRegex)},cn.week=function(e){return He(e,this._week.dow,this._week.doy).week},cn.firstDayOfYear=function(){return this._week.doy},cn.firstDayOfWeek=function(){return this._week.dow},cn.weekdays=function(e,t){return e?i(this._weekdays)?this._weekdays[e.day()]:this._weekdays[this._weekdays.isFormat.test(t)?"format":"standalone"][e.day()]:i(this._weekdays)?this._weekdays:this._weekdays.standalone},cn.weekdaysMin=function(e){return e?this._weekdaysMin[e.day()]:this._weekdaysMin},cn.weekdaysShort=function(e){return e?this._weekdaysShort[e.day()]:this._weekdaysShort},cn.weekdaysParse=function(e,t,n){var i,r,s;if(this._weekdaysParseExact)return function(e,t,n){var i,r,s,o=e.toLocaleLowerCase();if(!this._weekdaysParse)for(this._weekdaysParse=[],this._shortWeekdaysParse=[],this._minWeekdaysParse=[],i=0;i<7;++i)s=h([2e3,1]).day(i),this._minWeekdaysParse[i]=this.weekdaysMin(s,"").toLocaleLowerCase(),this._shortWeekdaysParse[i]=this.weekdaysShort(s,"").toLocaleLowerCase(),this._weekdaysParse[i]=this.weekdays(s,"").toLocaleLowerCase();return n?"dddd"===t?-1!==(r=ke.call(this._weekdaysParse,o))?r:null:"ddd"===t?-1!==(r=ke.call(this._shortWeekdaysParse,o))?r:null:-1!==(r=ke.call(this._minWeekdaysParse,o))?r:null:"dddd"===t?-1!==(r=ke.call(this._weekdaysParse,o))||-1!==(r=ke.call(this._shortWeekdaysParse,o))||-1!==(r=ke.call(this._minWeekdaysParse,o))?r:null:"ddd"===t?-1!==(r=ke.call(this._shortWeekdaysParse,o))||-1!==(r=ke.call(this._weekdaysParse,o))||-1!==(r=ke.call(this._minWeekdaysParse,o))?r:null:-1!==(r=ke.call(this._minWeekdaysParse,o))||-1!==(r=ke.call(this._weekdaysParse,o))||-1!==(r=ke.call(this._shortWeekdaysParse,o))?r:null}.call(this,e,t,n);for(this._weekdaysParse||(this._weekdaysParse=[],this._minWeekdaysParse=[],this._shortWeekdaysParse=[],this._fullWeekdaysParse=[]),i=0;i<7;i++){if(r=h([2e3,1]).day(i),n&&!this._fullWeekdaysParse[i]&&(this._fullWeekdaysParse[i]=new RegExp("^"+this.weekdays(r,"").replace(".",".?")+"$","i"),this._shortWeekdaysParse[i]=new RegExp("^"+this.weekdaysShort(r,"").replace(".",".?")+"$","i"),this._minWeekdaysParse[i]=new RegExp("^"+this.weekdaysMin(r,"").replace(".",".?")+"$","i")),this._weekdaysParse[i]||(s="^"+this.weekdays(r,"")+"|^"+this.weekdaysShort(r,"")+"|^"+this.weekdaysMin(r,""),this._weekdaysParse[i]=new RegExp(s.replace(".",""),"i")),n&&"dddd"===t&&this._fullWeekdaysParse[i].test(e))return i;if(n&&"ddd"===t&&this._shortWeekdaysParse[i].test(e))return i;if(n&&"dd"===t&&this._minWeekdaysParse[i].test(e))return i;if(!n&&this._weekdaysParse[i].test(e))return i}},cn.weekdaysRegex=function(e){return this._weekdaysParseExact?(u(this,"_weekdaysRegex")||Qe.call(this),e?this._weekdaysStrictRegex:this._weekdaysRegex):(u(this,"_weekdaysRegex")||(this._weekdaysRegex=Ye),this._weekdaysStrictRegex&&e?this._weekdaysStrictRegex:this._weekdaysRegex)},cn.weekdaysShortRegex=function(e){return this._weekdaysParseExact?(u(this,"_weekdaysRegex")||Qe.call(this),e?this._weekdaysShortStrictRegex:this._weekdaysShortRegex):(u(this,"_weekdaysShortRegex")||(this._weekdaysShortRegex=Ge),this._weekdaysShortStrictRegex&&e?this._weekdaysShortStrictRegex:this._weekdaysShortRegex)},cn.weekdaysMinRegex=function(e){return this._weekdaysParseExact?(u(this,"_weekdaysRegex")||Qe.call(this),e?this._weekdaysMinStrictRegex:this._weekdaysMinRegex):(u(this,"_weekdaysMinRegex")||(this._weekdaysMinRegex=Ke),this._weekdaysMinStrictRegex&&e?this._weekdaysMinStrictRegex:this._weekdaysMinRegex)},cn.isPM=function(e){return"p"===(e+"").toLowerCase().charAt(0)},cn.meridiem=function(e,t,n){return 11<e?n?"pm":"PM":n?"am":"AM"},at("en",{dayOfMonthOrdinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(e){var t=e%10;return e+(1===b(e%100/10)?"th":1===t?"st":2===t?"nd":3===t?"rd":"th")}}),n.lang=C("moment.lang is deprecated. Use moment.locale instead.",at),n.langData=C("moment.langData is deprecated. Use moment.localeData instead.",ut);var pn=Math.abs;function gn(e,t,n,i){var r=Ht(t,n);return e._milliseconds+=i*r._milliseconds,e._days+=i*r._days,e._months+=i*r._months,e._bubble()}function mn(e){return e<0?Math.floor(e):Math.ceil(e)}function vn(e){return 4800*e/146097}function yn(e){return 146097*e/4800}function $n(e){return function(){return this.as(e)}}var wn=$n("ms"),bn=$n("s"),Sn=$n("m"),xn=$n("h"),Cn=$n("d"),kn=$n("w"),_n=$n("M"),Mn=$n("y");function An(e){return function(){return this.isValid()?this._data[e]:NaN}}var En=An("milliseconds"),Rn=An("seconds"),Tn=An("minutes"),Ln=An("hours"),Pn=An("days"),In=An("months"),Dn=An("years"),On=Math.round,Nn={ss:44,s:45,m:45,h:22,d:26,M:11},Fn=Math.abs;function jn(e){return(0<e)-(e<0)||+e}function Bn(){if(!this.isValid())return this.localeData().invalidDate();var e,t,n=Fn(this._milliseconds)/1e3,i=Fn(this._days),r=Fn(this._months);t=w((e=w(n/60))/60),n%=60,e%=60;var s=w(r/12),o=r%=12,a=i,l=t,u=e,c=n?n.toFixed(3).replace(/\.?0+$/,""):"",h=this.asSeconds();if(!h)return"P0D";var d=h<0?"-":"",f=jn(this._months)!==jn(h)?"-":"",p=jn(this._days)!==jn(h)?"-":"",g=jn(this._milliseconds)!==jn(h)?"-":"";return d+"P"+(s?f+s+"Y":"")+(o?f+o+"M":"")+(a?p+a+"D":"")+(l||u||c?"T":"")+(l?g+l+"H":"")+(u?g+u+"M":"")+(c?g+c+"S":"")}var Un=Tt.prototype;return Un.isValid=function(){return this._isValid},Un.abs=function(){var e=this._data;return this._milliseconds=pn(this._milliseconds),this._days=pn(this._days),this._months=pn(this._months),e.milliseconds=pn(e.milliseconds),e.seconds=pn(e.seconds),e.minutes=pn(e.minutes),e.hours=pn(e.hours),e.months=pn(e.months),e.years=pn(e.years),this},Un.add=function(e,t){return gn(this,e,t,1)},Un.subtract=function(e,t){return gn(this,e,t,-1)},Un.as=function(e){if(!this.isValid())return NaN;var t,n,i=this._milliseconds;if("month"===(e=P(e))||"year"===e)return t=this._days+i/864e5,n=this._months+vn(t),"month"===e?n:n/12;switch(t=this._days+Math.round(yn(this._months)),e){case"week":return t/7+i/6048e5;case"day":return t+i/864e5;case"hour":return 24*t+i/36e5;case"minute":return 1440*t+i/6e4;case"second":return 86400*t+i/1e3;case"millisecond":return Math.floor(864e5*t)+i;default:throw new Error("Unknown unit "+e)}},Un.asMilliseconds=wn,Un.asSeconds=bn,Un.asMinutes=Sn,Un.asHours=xn,Un.asDays=Cn,Un.asWeeks=kn,Un.asMonths=_n,Un.asYears=Mn,Un.valueOf=function(){return this.isValid()?this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*b(this._months/12):NaN},Un._bubble=function(){var e,t,n,i,r,s=this._milliseconds,o=this._days,a=this._months,l=this._data;return 0<=s&&0<=o&&0<=a||s<=0&&o<=0&&a<=0||(s+=864e5*mn(yn(a)+o),a=o=0),l.milliseconds=s%1e3,e=w(s/1e3),l.seconds=e%60,t=w(e/60),l.minutes=t%60,n=w(t/60),l.hours=n%24,a+=r=w(vn(o+=w(n/24))),o-=mn(yn(r)),i=w(a/12),a%=12,l.days=o,l.months=a,l.years=i,this},Un.clone=function(){return Ht(this)},Un.get=function(e){return e=P(e),this.isValid()?this[e+"s"]():NaN},Un.milliseconds=En,Un.seconds=Rn,Un.minutes=Tn,Un.hours=Ln,Un.days=Pn,Un.weeks=function(){return w(this.days()/7)},Un.months=In,Un.years=Dn,Un.humanize=function(e){if(!this.isValid())return this.localeData().invalidDate();var t,n,i,r,s,o,a,l,u,c,h=this.localeData(),d=(t=!e,n=h,i=Ht(this).abs(),r=On(i.as("s")),s=On(i.as("m")),o=On(i.as("h")),a=On(i.as("d")),l=On(i.as("M")),u=On(i.as("y")),(c=r<=Nn.ss&&["s",r]||r<Nn.s&&["ss",r]||s<=1&&["m"]||s<Nn.m&&["mm",s]||o<=1&&["h"]||o<Nn.h&&["hh",o]||a<=1&&["d"]||a<Nn.d&&["dd",a]||l<=1&&["M"]||l<Nn.M&&["MM",l]||u<=1&&["y"]||["yy",u])[2]=t,c[3]=0<+this,c[4]=n,function(e,t,n,i,r){return r.relativeTime(t||1,!!n,e,i)}.apply(null,c));return e&&(d=h.pastFuture(+this,d)),h.postformat(d)},Un.toISOString=Bn,Un.toString=Bn,Un.toJSON=Bn,Un.locale=Qt,Un.localeData=Xt,Un.toIsoString=C("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",Bn),Un.lang=Jt,H("X",0,0,"unix"),H("x",0,0,"valueOf"),le("x",ie),le("X",/[+-]?\d+(\.\d{1,3})?/),de("X",(function(e,t,n){n._d=new Date(1e3*parseFloat(e,10))})),de("x",(function(e,t,n){n._d=new Date(b(e))})),n.version="2.22.1",e=_t,n.fn=ln,n.min=function(){return Et("isBefore",[].slice.call(arguments,0))},n.max=function(){return Et("isAfter",[].slice.call(arguments,0))},n.now=function(){return Date.now?Date.now():+new Date},n.utc=h,n.unix=function(e){return _t(1e3*e)},n.months=function(e,t){return dn(e,t,"months")},n.isDate=a,n.locale=at,n.invalid=p,n.duration=Ht,n.isMoment=$,n.weekdays=function(e,t,n){return fn(e,t,n,"weekdays")},n.parseZone=function(){return _t.apply(null,arguments).parseZone()},n.localeData=ut,n.isDuration=Lt,n.monthsShort=function(e,t){return dn(e,t,"monthsShort")},n.weekdaysMin=function(e,t,n){return fn(e,t,n,"weekdaysMin")},n.defineLocale=lt,n.updateLocale=function(e,t){if(null!=t){var n,i,r=nt;null!=(i=ot(e))&&(r=i._config),(n=new R(t=E(r,t))).parentLocale=it[e],it[e]=n,at(e)}else null!=it[e]&&(null!=it[e].parentLocale?it[e]=it[e].parentLocale:null!=it[e]&&delete it[e]);return it[e]},n.locales=function(){return k(it)},n.weekdaysShort=function(e,t,n){return fn(e,t,n,"weekdaysShort")},n.normalizeUnits=P,n.relativeTimeRounding=function(e){return void 0===e?On:"function"==typeof e&&(On=e,!0)},n.relativeTimeThreshold=function(e,t){return void 0!==Nn[e]&&(void 0===t?Nn[e]:(Nn[e]=t,"s"===e&&(Nn.ss=t-1),!0))},n.calendarFormat=function(e,t){var n=e.diff(t,"days",!0);return n<-6?"sameElse":n<-1?"lastWeek":n<0?"lastDay":n<1?"sameDay":n<2?"nextDay":n<7?"nextWeek":"sameElse"},n.prototype=ln,n.HTML5_FMT={DATETIME_LOCAL:"YYYY-MM-DDTHH:mm",DATETIME_LOCAL_SECONDS:"YYYY-MM-DDTHH:mm:ss",DATETIME_LOCAL_MS:"YYYY-MM-DDTHH:mm:ss.SSS",DATE:"YYYY-MM-DD",TIME:"HH:mm",TIME_SECONDS:"HH:mm:ss",TIME_MS:"HH:mm:ss.SSS",WEEK:"YYYY-[W]WW",MONTH:"YYYY-MM"},n})),function(){function e(e){return e&&(e.ownerDocument||e.document||e).documentElement}function t(e){return e&&(e.ownerDocument&&e.ownerDocument.defaultView||e.document&&e||e.defaultView)}function n(e,t){return t>e?-1:e>t?1:e>=t?0:NaN}function i(e){return null===e?NaN:+e}function r(e){return!isNaN(e)}function s(e){return{left:function(t,n,i,r){for(arguments.length<3&&(i=0),arguments.length<4&&(r=t.length);r>i;){var s=i+r>>>1;e(t[s],n)<0?i=s+1:r=s}return i},right:function(t,n,i,r){for(arguments.length<3&&(i=0),arguments.length<4&&(r=t.length);r>i;){var s=i+r>>>1;e(t[s],n)>0?r=s:i=s+1}return i}}}function o(e){return e.length}function a(e,t){for(var n in t)Object.defineProperty(e.prototype,n,{value:t[n],enumerable:!1})}function l(){this._=Object.create(null)}function u(e){return(e+="")===Cs||e[0]===ks?ks+e:e}function c(e){return(e+="")[0]===ks?e.slice(1):e}function h(e){return u(e)in this._}function d(e){return(e=u(e))in this._&&delete this._[e]}function f(){var e=[];for(var t in this._)e.push(c(t));return e}function p(){var e=0;for(var t in this._)++e;return e}function g(){for(var e in this._)return!1;return!0}function m(){this._=Object.create(null)}function v(e){return e}function y(e,t,n){return function(){var i=n.apply(t,arguments);return i===t?e:i}}function $(e,t){if(t in e)return t;t=t.charAt(0).toUpperCase()+t.slice(1);for(var n=0,i=_s.length;i>n;++n){var r=_s[n]+t;if(r in e)return r}}function w(){}function b(){}function S(e){function t(){for(var t,i=n,r=-1,s=i.length;++r<s;)(t=i[r].on)&&t.apply(this,arguments);return e}var n=[],i=new l;return t.on=function(t,r){var s,o=i.get(t);return arguments.length<2?o&&o.on:(o&&(o.on=null,n=n.slice(0,s=n.indexOf(o)).concat(n.slice(s+1)),i.remove(t)),r&&n.push(i.set(t,{on:r})),e)},t}function x(){fs.event.preventDefault()}function C(){for(var e,t=fs.event;e=t.sourceEvent;)t=e;return t}function k(e){for(var t=new b,n=0,i=arguments.length;++n<i;)t[arguments[n]]=S(t);return t.of=function(n,i){return function(r){try{var s=r.sourceEvent=fs.event;r.target=e,fs.event=r,t[r.type].apply(n,i)}finally{fs.event=s}}},t}function _(e){return As(e,Ls),e}function M(e){return"function"==typeof e?e:function(){return Es(e,this)}}function A(e){return"function"==typeof e?e:function(){return Rs(e,this)}}function E(e,t){return e=fs.ns.qualify(e),null==t?e.local?function(){this.removeAttributeNS(e.space,e.local)}:function(){this.removeAttribute(e)}:"function"==typeof t?e.local?function(){var n=t.apply(this,arguments);null==n?this.removeAttributeNS(e.space,e.local):this.setAttributeNS(e.space,e.local,n)}:function(){var n=t.apply(this,arguments);null==n?this.removeAttribute(e):this.setAttribute(e,n)}:e.local?function(){this.setAttributeNS(e.space,e.local,t)}:function(){this.setAttribute(e,t)}}function R(e){return e.trim().replace(/\s+/g," ")}function T(e){return new RegExp("(?:^|\\s+)"+fs.requote(e)+"(?:\\s+|$)","g")}function L(e){return(e+"").trim().split(/^|\s+/)}function P(e,t){var n=(e=L(e).map(I)).length;return"function"==typeof t?function(){for(var i=-1,r=t.apply(this,arguments);++i<n;)e[i](this,r)}:function(){for(var i=-1;++i<n;)e[i](this,t)}}function I(e){var t=T(e);return function(n,i){if(r=n.classList)return i?r.add(e):r.remove(e);var r=n.getAttribute("class")||"";i?(t.lastIndex=0,t.test(r)||n.setAttribute("class",R(r+" "+e))):n.setAttribute("class",R(r.replace(t," ")))}}function D(e,t,n){return null==t?function(){this.style.removeProperty(e)}:"function"==typeof t?function(){var i=t.apply(this,arguments);null==i?this.style.removeProperty(e):this.style.setProperty(e,i,n)}:function(){this.style.setProperty(e,t,n)}}function O(e,t){return null==t?function(){delete this[e]}:"function"==typeof t?function(){var n=t.apply(this,arguments);null==n?delete this[e]:this[e]=n}:function(){this[e]=t}}function N(e){return"function"==typeof e?e:(e=fs.ns.qualify(e)).local?function(){return this.ownerDocument.createElementNS(e.space,e.local)}:function(){var t=this.ownerDocument,n=this.namespaceURI;return n===Ps&&t.documentElement.namespaceURI===Ps?t.createElement(e):t.createElementNS(n,e)}}function F(){var e=this.parentNode;e&&e.removeChild(this)}function j(e){return{__data__:e}}function B(e){return function(){return Ts(this,e)}}function U(e){return arguments.length||(e=n),function(t,n){return t&&n?e(t.__data__,n.__data__):!t-!n}}function H(e,t){for(var n=0,i=e.length;i>n;n++)for(var r,s=e[n],o=0,a=s.length;a>o;o++)(r=s[o])&&t(r,o,n);return e}function W(e){return As(e,Ds),e}function z(e,t,n){function i(){var t=this[r];t&&(this.removeEventListener(e,t,t.$),delete this[r])}var r="__on"+e,s=e.indexOf("."),o=V;s>0&&(e=e.slice(0,s));var a=Os.get(e);return a&&(e=a,o=q),s?t?function(){var s=o(t,gs(arguments));i.call(this),this.addEventListener(e,this[r]=s,s.$=n),s._=t}:i:t?w:function(){var t,n=new RegExp("^__on([^.]+)"+fs.requote(e)+"$");for(var i in this)if(t=i.match(n)){var r=this[i];this.removeEventListener(t[1],r,r.$),delete this[i]}}}function V(e,t){return function(n){var i=fs.event;fs.event=n,t[0]=this.__data__;try{e.apply(this,t)}finally{fs.event=i}}}function q(e,t){var n=V(e,t);return function(e){var t=this,i=e.relatedTarget;i&&(i===t||8&i.compareDocumentPosition(t))||n.call(t,e)}}function Y(n){var i=".dragsuppress-"+ ++Fs,r="click"+i,s=fs.select(t(n)).on("touchmove"+i,x).on("dragstart"+i,x).on("selectstart"+i,x);if(null==Ns&&(Ns=!("onselectstart"in n)&&$(n.style,"userSelect")),Ns){var o=e(n).style,a=o[Ns];o[Ns]="none"}return function(e){if(s.on(i,null),Ns&&(o[Ns]=a),e){var t=function(){s.on(r,null)};s.on(r,(function(){x(),t()}),!0),setTimeout(t,0)}}}function G(e,n){n.changedTouches&&(n=n.changedTouches[0]);var i=e.ownerSVGElement||e;if(i.createSVGPoint){var r=i.createSVGPoint();if(0>js){var s=t(e);if(s.scrollX||s.scrollY){var o=(i=fs.select("body").append("svg").style({position:"absolute",top:0,left:0,margin:0,padding:0,border:"none"},"important"))[0][0].getScreenCTM();js=!(o.f||o.e),i.remove()}}return js?(r.x=n.pageX,r.y=n.pageY):(r.x=n.clientX,r.y=n.clientY),[(r=r.matrixTransform(e.getScreenCTM().inverse())).x,r.y]}var a=e.getBoundingClientRect();return[n.clientX-a.left-e.clientLeft,n.clientY-a.top-e.clientTop]}function K(){return fs.event.changedTouches[0].identifier}function Q(e){return e>0?1:0>e?-1:0}function J(e,t,n){return(t[0]-e[0])*(n[1]-e[1])-(t[1]-e[1])*(n[0]-e[0])}function X(e){return e>1?0:-1>e?Hs:Math.acos(e)}function Z(e){return e>1?Vs:-1>e?-Vs:Math.asin(e)}function ee(e){return((e=Math.exp(e))+1/e)/2}function te(e){return(e=Math.sin(e/2))*e}function ne(){}function ie(e,t,n){return this instanceof ie?(this.h=+e,this.s=+t,void(this.l=+n)):arguments.length<2?e instanceof ie?new ie(e.h,e.s,e.l):ve(""+e,ye,ie):new ie(e,t,n)}function re(e,t,n){function i(e){return Math.round(255*function(e){return e>360?e-=360:0>e&&(e+=360),60>e?r+(s-r)*e/60:180>e?s:240>e?r+(s-r)*(240-e)/60:r}(e))}var r,s;return e=isNaN(e)?0:(e%=360)<0?e+360:e,t=isNaN(t)||0>t?0:t>1?1:t,r=2*(n=0>n?0:n>1?1:n)-(s=.5>=n?n*(1+t):n+t-n*t),new fe(i(e+120),i(e),i(e-120))}function se(e,t,n){return this instanceof se?(this.h=+e,this.c=+t,void(this.l=+n)):arguments.length<2?e instanceof se?new se(e.h,e.c,e.l):ue(e instanceof ae?e.l:(e=$e((e=fs.rgb(e)).r,e.g,e.b)).l,e.a,e.b):new se(e,t,n)}function oe(e,t,n){return isNaN(e)&&(e=0),isNaN(t)&&(t=0),new ae(n,Math.cos(e*=qs)*t,Math.sin(e)*t)}function ae(e,t,n){return this instanceof ae?(this.l=+e,this.a=+t,void(this.b=+n)):arguments.length<2?e instanceof ae?new ae(e.l,e.a,e.b):e instanceof se?oe(e.h,e.c,e.l):$e((e=fe(e)).r,e.g,e.b):new ae(e,t,n)}function le(e,t,n){var i=(e+16)/116,r=i+t/500,s=i-n/200;return new fe(de(3.2404542*(r=ce(r)*to)-1.5371385*(i=ce(i)*no)-.4985314*(s=ce(s)*io)),de(-.969266*r+1.8760108*i+.041556*s),de(.0556434*r-.2040259*i+1.0572252*s))}function ue(e,t,n){return e>0?new se(Math.atan2(n,t)*Ys,Math.sqrt(t*t+n*n),e):new se(NaN,NaN,e)}function ce(e){return e>.206893034?e*e*e:(e-4/29)/7.787037}function he(e){return e>.008856?Math.pow(e,1/3):7.787037*e+4/29}function de(e){return Math.round(255*(.00304>=e?12.92*e:1.055*Math.pow(e,1/2.4)-.055))}function fe(e,t,n){return this instanceof fe?(this.r=~~e,this.g=~~t,void(this.b=~~n)):arguments.length<2?e instanceof fe?new fe(e.r,e.g,e.b):ve(""+e,fe,re):new fe(e,t,n)}function pe(e){return new fe(e>>16,e>>8&255,255&e)}function ge(e){return pe(e)+""}function me(e){return 16>e?"0"+Math.max(0,e).toString(16):Math.min(255,e).toString(16)}function ve(e,t,n){var i,r,s,o=0,a=0,l=0;if(i=/([a-z]+)\((.*)\)/.exec(e=e.toLowerCase()))switch(r=i[2].split(","),i[1]){case"hsl":return n(parseFloat(r[0]),parseFloat(r[1])/100,parseFloat(r[2])/100);case"rgb":return t(be(r[0]),be(r[1]),be(r[2]))}return(s=oo.get(e))?t(s.r,s.g,s.b):(null==e||"#"!==e.charAt(0)||isNaN(s=parseInt(e.slice(1),16))||(4===e.length?(o=(3840&s)>>4,o|=o>>4,a=240&s,a|=a>>4,l=15&s,l|=l<<4):7===e.length&&(o=(16711680&s)>>16,a=(65280&s)>>8,l=255&s)),t(o,a,l))}function ye(e,t,n){var i,r,s=Math.min(e/=255,t/=255,n/=255),o=Math.max(e,t,n),a=o-s,l=(o+s)/2;return a?(r=.5>l?a/(o+s):a/(2-o-s),i=e==o?(t-n)/a+(n>t?6:0):t==o?(n-e)/a+2:(e-t)/a+4,i*=60):(i=NaN,r=l>0&&1>l?0:i),new ie(i,r,l)}function $e(e,t,n){var i=he((.4124564*(e=we(e))+.3575761*(t=we(t))+.1804375*(n=we(n)))/to),r=he((.2126729*e+.7151522*t+.072175*n)/no);return ae(116*r-16,500*(i-r),200*(r-he((.0193339*e+.119192*t+.9503041*n)/io)))}function we(e){return(e/=255)<=.04045?e/12.92:Math.pow((e+.055)/1.055,2.4)}function be(e){var t=parseFloat(e);return"%"===e.charAt(e.length-1)?Math.round(2.55*t):t}function Se(e){return"function"==typeof e?e:function(){return e}}function xe(e){return function(t,n,i){return 2===arguments.length&&"function"==typeof n&&(i=n,n=null),Ce(t,n,e,i)}}function Ce(e,t,n,i){function r(){var e,t=l.status;if(!t&&function(e){var t=e.responseType;return t&&"text"!==t?e.response:e.responseText}(l)||t>=200&&300>t||304===t){try{e=n.call(s,l)}catch(e){return void o.error.call(s,e)}o.load.call(s,e)}else o.error.call(s,l)}var s={},o=fs.dispatch("beforesend","progress","load","error"),a={},l=new XMLHttpRequest,u=null;return!this.XDomainRequest||"withCredentials"in l||!/^(http(s)?:)?\/\//.test(e)||(l=new XDomainRequest),"onload"in l?l.onload=l.onerror=r:l.onreadystatechange=function(){l.readyState>3&&r()},l.onprogress=function(e){var t=fs.event;fs.event=e;try{o.progress.call(s,l)}finally{fs.event=t}},s.header=function(e,t){return e=(e+"").toLowerCase(),arguments.length<2?a[e]:(null==t?delete a[e]:a[e]=t+"",s)},s.mimeType=function(e){return arguments.length?(t=null==e?null:e+"",s):t},s.responseType=function(e){return arguments.length?(u=e,s):u},s.response=function(e){return n=e,s},["get","post"].forEach((function(e){s[e]=function(){return s.send.apply(s,[e].concat(gs(arguments)))}})),s.send=function(n,i,r){if(2===arguments.length&&"function"==typeof i&&(r=i,i=null),l.open(n,e,!0),null==t||"accept"in a||(a.accept=t+",*/*"),l.setRequestHeader)for(var c in a)l.setRequestHeader(c,a[c]);return null!=t&&l.overrideMimeType&&l.overrideMimeType(t),null!=u&&(l.responseType=u),null!=r&&s.on("error",r).on("load",(function(e){r(null,e)})),o.beforesend.call(s,l),l.send(null==i?null:i),s},s.abort=function(){return l.abort(),s},fs.rebind(s,o,"on"),null==i?s:s.get(function(e){return 1===e.length?function(t,n){e(null==t?n:null)}:e}(i))}function ke(e,t,n){var i=arguments.length;2>i&&(t=0),3>i&&(n=Date.now());var r={c:e,t:n+t,n:null};return lo?lo.n=r:ao=r,lo=r,uo||(co=clearTimeout(co),uo=1,ho(_e)),r}function _e(){var e=Me(),t=Ae()-e;t>24?(isFinite(t)&&(clearTimeout(co),co=setTimeout(_e,t)),uo=0):(uo=1,ho(_e))}function Me(){for(var e=Date.now(),t=ao;t;)e>=t.t&&t.c(e-t.t)&&(t.c=null),t=t.n;return e}function Ae(){for(var e,t=ao,n=1/0;t;)t.c?(t.t<n&&(n=t.t),t=(e=t).n):t=e?e.n=t.n:ao=t.n;return lo=e,n}function Ee(e,t){return t-(e?Math.ceil(Math.log(e)/Math.LN10):1)}function Re(e){var t=e.decimal,n=e.thousands,i=e.grouping,r=e.currency,s=i&&n?function(e,t){for(var r=e.length,s=[],o=0,a=i[0],l=0;r>0&&a>0&&(l+a+1>t&&(a=Math.max(1,t-l)),s.push(e.substring(r-=a,r+a)),!((l+=a+1)>t));)a=i[o=(o+1)%i.length];return s.reverse().join(n)}:v;return function(e){var n=po.exec(e),i=n[1]||" ",o=n[2]||">",a=n[3]||"-",l=n[4]||"",u=n[5],c=+n[6],h=n[7],d=n[8],f=n[9],p=1,g="",m="",v=!1,y=!0;switch(d&&(d=+d.substring(1)),(u||"0"===i&&"="===o)&&(u=i="0",o="="),f){case"n":h=!0,f="g";break;case"%":p=100,m="%",f="f";break;case"p":p=100,m="%",f="r";break;case"b":case"o":case"x":case"X":"#"===l&&(g="0"+f.toLowerCase());case"c":y=!1;case"d":v=!0,d=0;break;case"s":p=-1,f="r"}"$"===l&&(g=r[0],m=r[1]),"r"!=f||d||(f="g"),null!=d&&("g"==f?d=Math.max(1,Math.min(21,d)):"e"!=f&&"f"!=f||(d=Math.max(0,Math.min(20,d)))),f=go.get(f)||Te;var $=u&&h;return function(e){var n=m;if(v&&e%1)return"";var r=0>e||0===e&&0>1/e?(e=-e,"-"):"-"===a?"":a;if(0>p){var l=fs.formatPrefix(e,d);e=l.scale(e),n=l.symbol+m}else e*=p;var w,b,S=(e=f(e,d)).lastIndexOf(".");if(0>S){var x=y?e.lastIndexOf("e"):-1;0>x?(w=e,b=""):(w=e.substring(0,x),b=e.substring(x))}else w=e.substring(0,S),b=t+e.substring(S+1);!u&&h&&(w=s(w,1/0));var C=g.length+w.length+b.length+($?0:r.length),k=c>C?new Array(C=c-C+1).join(i):"";return $&&(w=s(k+w,k.length?c-b.length:1/0)),r+=g,e=w+b,("<"===o?r+e+k:">"===o?k+r+e:"^"===o?k.substring(0,C>>=1)+r+e+k.substring(C):r+($?e:k+e))+n}}}function Te(e){return e+""}function Le(){this._=new Date(arguments.length>1?Date.UTC.apply(this,arguments):arguments[0])}function Pe(e,t,n){function i(t){var n=e(t),i=s(n,1);return i-t>t-n?n:i}function r(n){return t(n=e(new vo(n-1)),1),n}function s(e,n){return t(e=new vo(+e),n),e}function o(e,i,s){var o=r(e),a=[];if(s>1)for(;i>o;)n(o)%s||a.push(new Date(+o)),t(o,1);else for(;i>o;)a.push(new Date(+o)),t(o,1);return a}e.floor=e,e.round=i,e.ceil=r,e.offset=s,e.range=o;var a=e.utc=Ie(e);return a.floor=a,a.round=Ie(i),a.ceil=Ie(r),a.offset=Ie(s),a.range=function(e,t,n){try{vo=Le;var i=new Le;return i._=e,o(i,t,n)}finally{vo=Date}},e}function Ie(e){return function(t,n){try{vo=Le;var i=new Le;return i._=t,e(i,n)._}finally{vo=Date}}}function De(e){function t(e){function t(t){for(var n,r,s,o=[],a=-1,l=0;++a<i;)37===e.charCodeAt(a)&&(o.push(e.slice(l,a)),null!=(r=$o[n=e.charAt(++a)])&&(n=e.charAt(++a)),(s=w[n])&&(n=s(t,null==r?"e"===n?" ":"0":r)),o.push(n),l=a+1);return o.push(e.slice(l,a)),o.join("")}var i=e.length;return t.parse=function(t){var i={y:1900,m:0,d:1,H:0,M:0,S:0,L:0,Z:null};if(n(i,e,t,0)!=t.length)return null;"p"in i&&(i.H=i.H%12+12*i.p);var r=null!=i.Z&&vo!==Le,s=new(r?Le:vo);return"j"in i?s.setFullYear(i.y,0,i.j):"W"in i||"U"in i?("w"in i||(i.w="W"in i?1:0),s.setFullYear(i.y,0,1),s.setFullYear(i.y,0,"W"in i?(i.w+6)%7+7*i.W-(s.getDay()+5)%7:i.w+7*i.U-(s.getDay()+6)%7)):s.setFullYear(i.y,i.m,i.d),s.setHours(i.H+(i.Z/100|0),i.M+i.Z%100,i.S,i.L),r?s._:s},t.toString=function(){return e},t}function n(e,t,n,i){for(var r,s,o,a=0,l=t.length,u=n.length;l>a;){if(i>=u)return-1;if(37===(r=t.charCodeAt(a++))){if(o=t.charAt(a++),!(s=b[o in $o?t.charAt(a++):o])||(i=s(e,n,i))<0)return-1}else if(r!=n.charCodeAt(i++))return-1}return i}var i=e.dateTime,r=e.date,s=e.time,o=e.periods,a=e.days,l=e.shortDays,u=e.months,c=e.shortMonths;t.utc=function(e){function n(e){try{var t=new(vo=Le);return t._=e,i(t)}finally{vo=Date}}var i=t(e);return n.parse=function(e){try{vo=Le;var t=i.parse(e);return t&&t._}finally{vo=Date}},n.toString=i.toString,n},t.multi=t.utc.multi=et;var h=fs.map(),d=Ne(a),f=Fe(a),p=Ne(l),g=Fe(l),m=Ne(u),v=Fe(u),y=Ne(c),$=Fe(c);o.forEach((function(e,t){h.set(e.toLowerCase(),t)}));var w={a:function(e){return l[e.getDay()]},A:function(e){return a[e.getDay()]},b:function(e){return c[e.getMonth()]},B:function(e){return u[e.getMonth()]},c:t(i),d:function(e,t){return Oe(e.getDate(),t,2)},e:function(e,t){return Oe(e.getDate(),t,2)},H:function(e,t){return Oe(e.getHours(),t,2)},I:function(e,t){return Oe(e.getHours()%12||12,t,2)},j:function(e,t){return Oe(1+mo.dayOfYear(e),t,3)},L:function(e,t){return Oe(e.getMilliseconds(),t,3)},m:function(e,t){return Oe(e.getMonth()+1,t,2)},M:function(e,t){return Oe(e.getMinutes(),t,2)},p:function(e){return o[+(e.getHours()>=12)]},S:function(e,t){return Oe(e.getSeconds(),t,2)},U:function(e,t){return Oe(mo.sundayOfYear(e),t,2)},w:function(e){return e.getDay()},W:function(e,t){return Oe(mo.mondayOfYear(e),t,2)},x:t(r),X:t(s),y:function(e,t){return Oe(e.getFullYear()%100,t,2)},Y:function(e,t){return Oe(e.getFullYear()%1e4,t,4)},Z:Xe,"%":function(){return"%"}},b={a:function(e,t,n){p.lastIndex=0;var i=p.exec(t.slice(n));return i?(e.w=g.get(i[0].toLowerCase()),n+i[0].length):-1},A:function(e,t,n){d.lastIndex=0;var i=d.exec(t.slice(n));return i?(e.w=f.get(i[0].toLowerCase()),n+i[0].length):-1},b:function(e,t,n){y.lastIndex=0;var i=y.exec(t.slice(n));return i?(e.m=$.get(i[0].toLowerCase()),n+i[0].length):-1},B:function(e,t,n){m.lastIndex=0;var i=m.exec(t.slice(n));return i?(e.m=v.get(i[0].toLowerCase()),n+i[0].length):-1},c:function(e,t,i){return n(e,w.c.toString(),t,i)},d:qe,e:qe,H:Ge,I:Ge,j:Ye,L:Je,m:Ve,M:Ke,p:function(e,t,n){var i=h.get(t.slice(n,n+=2).toLowerCase());return null==i?-1:(e.p=i,n)},S:Qe,U:Be,w:je,W:Ue,x:function(e,t,i){return n(e,w.x.toString(),t,i)},X:function(e,t,i){return n(e,w.X.toString(),t,i)},y:We,Y:He,Z:ze,"%":Ze};return t}function Oe(e,t,n){var i=0>e?"-":"",r=(i?-e:e)+"",s=r.length;return i+(n>s?new Array(n-s+1).join(t)+r:r)}function Ne(e){return new RegExp("^(?:"+e.map(fs.requote).join("|")+")","i")}function Fe(e){for(var t=new l,n=-1,i=e.length;++n<i;)t.set(e[n].toLowerCase(),n);return t}function je(e,t,n){wo.lastIndex=0;var i=wo.exec(t.slice(n,n+1));return i?(e.w=+i[0],n+i[0].length):-1}function Be(e,t,n){wo.lastIndex=0;var i=wo.exec(t.slice(n));return i?(e.U=+i[0],n+i[0].length):-1}function Ue(e,t,n){wo.lastIndex=0;var i=wo.exec(t.slice(n));return i?(e.W=+i[0],n+i[0].length):-1}function He(e,t,n){wo.lastIndex=0;var i=wo.exec(t.slice(n,n+4));return i?(e.y=+i[0],n+i[0].length):-1}function We(e,t,n){wo.lastIndex=0;var i=wo.exec(t.slice(n,n+2));return i?(e.y=function(e){return e+(e>68?1900:2e3)}(+i[0]),n+i[0].length):-1}function ze(e,t,n){return/^[+-]\d{4}$/.test(t=t.slice(n,n+5))?(e.Z=-t,n+5):-1}function Ve(e,t,n){wo.lastIndex=0;var i=wo.exec(t.slice(n,n+2));return i?(e.m=i[0]-1,n+i[0].length):-1}function qe(e,t,n){wo.lastIndex=0;var i=wo.exec(t.slice(n,n+2));return i?(e.d=+i[0],n+i[0].length):-1}function Ye(e,t,n){wo.lastIndex=0;var i=wo.exec(t.slice(n,n+3));return i?(e.j=+i[0],n+i[0].length):-1}function Ge(e,t,n){wo.lastIndex=0;var i=wo.exec(t.slice(n,n+2));return i?(e.H=+i[0],n+i[0].length):-1}function Ke(e,t,n){wo.lastIndex=0;var i=wo.exec(t.slice(n,n+2));return i?(e.M=+i[0],n+i[0].length):-1}function Qe(e,t,n){wo.lastIndex=0;var i=wo.exec(t.slice(n,n+2));return i?(e.S=+i[0],n+i[0].length):-1}function Je(e,t,n){wo.lastIndex=0;var i=wo.exec(t.slice(n,n+3));return i?(e.L=+i[0],n+i[0].length):-1}function Xe(e){var t=e.getTimezoneOffset(),n=t>0?"-":"+",i=xs(t)/60|0,r=xs(t)%60;return n+Oe(i,"0",2)+Oe(r,"0",2)}function Ze(e,t,n){bo.lastIndex=0;var i=bo.exec(t.slice(n,n+1));return i?n+i[0].length:-1}function et(e){for(var t=e.length,n=-1;++n<t;)e[n][0]=this(e[n][0]);return function(t){for(var n=0,i=e[n];!i[1](t);)i=e[++n];return i[0](t)}}function tt(){}function nt(e,t,n){var i=n.s=e+t,r=i-e,s=i-r;n.t=e-s+(t-r)}function it(e,t){e&&ko.hasOwnProperty(e.type)&&ko[e.type](e,t)}function rt(e,t,n){var i,r=-1,s=e.length-n;for(t.lineStart();++r<s;)i=e[r],t.point(i[0],i[1],i[2]);t.lineEnd()}function st(e,t){var n=-1,i=e.length;for(t.polygonStart();++n<i;)rt(e[n],t,1);t.polygonEnd()}function ot(){function e(e,t){t=t*qs/2+Hs/4;var n=(e*=qs)-i,o=n>=0?1:-1,a=o*n,l=Math.cos(t),u=Math.sin(t),c=s*u,h=r*l+c*Math.cos(a),d=c*o*Math.sin(a);Mo.add(Math.atan2(d,h)),i=e,r=l,s=u}var t,n,i,r,s;Ao.point=function(o,a){Ao.point=e,i=(t=o)*qs,r=Math.cos(a=(n=a)*qs/2+Hs/4),s=Math.sin(a)},Ao.lineEnd=function(){e(t,n)}}function at(e){var t=e[0],n=e[1],i=Math.cos(n);return[i*Math.cos(t),i*Math.sin(t),Math.sin(n)]}function lt(e,t){return e[0]*t[0]+e[1]*t[1]+e[2]*t[2]}function ut(e,t){return[e[1]*t[2]-e[2]*t[1],e[2]*t[0]-e[0]*t[2],e[0]*t[1]-e[1]*t[0]]}function ct(e,t){e[0]+=t[0],e[1]+=t[1],e[2]+=t[2]}function ht(e,t){return[e[0]*t,e[1]*t,e[2]*t]}function dt(e){var t=Math.sqrt(e[0]*e[0]+e[1]*e[1]+e[2]*e[2]);e[0]/=t,e[1]/=t,e[2]/=t}function ft(e){return[Math.atan2(e[1],e[0]),Z(e[2])]}function pt(e,t){return xs(e[0]-t[0])<Bs&&xs(e[1]-t[1])<Bs}function gt(e,t){e*=qs;var n=Math.cos(t*=qs);mt(n*Math.cos(e),n*Math.sin(e),Math.sin(t))}function mt(e,t,n){++Eo,To+=(e-To)/Eo,Lo+=(t-Lo)/Eo,Po+=(n-Po)/Eo}function vt(){function e(e,r){e*=qs;var s=Math.cos(r*=qs),o=s*Math.cos(e),a=s*Math.sin(e),l=Math.sin(r),u=Math.atan2(Math.sqrt((u=n*l-i*a)*u+(u=i*o-t*l)*u+(u=t*a-n*o)*u),t*o+n*a+i*l);Ro+=u,Io+=u*(t+(t=o)),Do+=u*(n+(n=a)),Oo+=u*(i+(i=l)),mt(t,n,i)}var t,n,i;Bo.point=function(r,s){r*=qs;var o=Math.cos(s*=qs);t=o*Math.cos(r),n=o*Math.sin(r),i=Math.sin(s),Bo.point=e,mt(t,n,i)}}function yt(){Bo.point=gt}function $t(){function e(e,t){e*=qs;var n=Math.cos(t*=qs),o=n*Math.cos(e),a=n*Math.sin(e),l=Math.sin(t),u=r*l-s*a,c=s*o-i*l,h=i*a-r*o,d=Math.sqrt(u*u+c*c+h*h),f=i*o+r*a+s*l,p=d&&-X(f)/d,g=Math.atan2(d,f);No+=p*u,Fo+=p*c,jo+=p*h,Ro+=g,Io+=g*(i+(i=o)),Do+=g*(r+(r=a)),Oo+=g*(s+(s=l)),mt(i,r,s)}var t,n,i,r,s;Bo.point=function(o,a){t=o,n=a,Bo.point=e,o*=qs;var l=Math.cos(a*=qs);i=l*Math.cos(o),r=l*Math.sin(o),s=Math.sin(a),mt(i,r,s)},Bo.lineEnd=function(){e(t,n),Bo.lineEnd=yt,Bo.point=gt}}function wt(e,t){function n(n,i){return n=e(n,i),t(n[0],n[1])}return e.invert&&t.invert&&(n.invert=function(n,i){return(n=t.invert(n,i))&&e.invert(n[0],n[1])}),n}function bt(){return!0}function St(e,t,n,i,r){var s=[],o=[];if(e.forEach((function(e){if(!((t=e.length-1)<=0)){var t,n=e[0],i=e[t];if(pt(n,i)){r.lineStart();for(var a=0;t>a;++a)r.point((n=e[a])[0],n[1]);return void r.lineEnd()}var l=new Ct(n,e,null,!0),u=new Ct(n,null,l,!1);l.o=u,s.push(l),o.push(u),l=new Ct(i,e,null,!1),u=new Ct(i,null,l,!0),l.o=u,s.push(l),o.push(u)}})),o.sort(t),xt(s),xt(o),s.length){for(var a=0,l=n,u=o.length;u>a;++a)o[a].e=l=!l;for(var c,h,d=s[0];;){for(var f=d,p=!0;f.v;)if((f=f.n)===d)return;c=f.z,r.lineStart();do{if(f.v=f.o.v=!0,f.e){if(p)for(a=0,u=c.length;u>a;++a)r.point((h=c[a])[0],h[1]);else i(f.x,f.n.x,1,r);f=f.n}else{if(p)for(a=(c=f.p.z).length-1;a>=0;--a)r.point((h=c[a])[0],h[1]);else i(f.x,f.p.x,-1,r);f=f.p}c=(f=f.o).z,p=!p}while(!f.v);r.lineEnd()}}}function xt(e){if(t=e.length){for(var t,n,i=0,r=e[0];++i<t;)r.n=n=e[i],n.p=r,r=n;r.n=n=e[0],n.p=r}}function Ct(e,t,n,i){this.x=e,this.z=t,this.o=n,this.e=i,this.v=!1,this.n=this.p=null}function kt(e,t,n,i){return function(r,s){function o(t,n){var i=r(t,n);e(t=i[0],n=i[1])&&s.point(t,n)}function a(e,t){var n=r(e,t);m.point(n[0],n[1])}function l(){y.point=a,m.lineStart()}function u(){y.point=o,m.lineEnd()}function c(e,t){g.push([e,t]);var n=r(e,t);w.point(n[0],n[1])}function h(){w.lineStart(),g=[]}function d(){c(g[0][0],g[0][1]),w.lineEnd();var e,t=w.clean(),n=$.buffer(),i=n.length;if(g.pop(),p.push(g),g=null,i)if(1&t){var r,o=-1;if((i=(e=n[0]).length-1)>0){for(b||(s.polygonStart(),b=!0),s.lineStart();++o<i;)s.point((r=e[o])[0],r[1]);s.lineEnd()}}else i>1&&2&t&&n.push(n.pop().concat(n.shift())),f.push(n.filter(_t))}var f,p,g,m=t(s),v=r.invert(i[0],i[1]),y={point:o,lineStart:l,lineEnd:u,polygonStart:function(){y.point=c,y.lineStart=h,y.lineEnd=d,f=[],p=[]},polygonEnd:function(){y.point=o,y.lineStart=l,y.lineEnd=u,f=fs.merge(f);var e=function(e,t){var n=e[0],i=e[1],r=[Math.sin(n),-Math.cos(n),0],s=0,o=0;Mo.reset();for(var a=0,l=t.length;l>a;++a){var u=t[a],c=u.length;if(c)for(var h=u[0],d=h[0],f=h[1]/2+Hs/4,p=Math.sin(f),g=Math.cos(f),m=1;;){m===c&&(m=0);var v=(e=u[m])[0],y=e[1]/2+Hs/4,$=Math.sin(y),w=Math.cos(y),b=v-d,S=b>=0?1:-1,x=S*b,C=x>Hs,k=p*$;if(Mo.add(Math.atan2(k*S*Math.sin(x),g*w+k*Math.cos(x))),s+=C?b+S*Ws:b,C^d>=n^v>=n){var _=ut(at(h),at(e));dt(_);var M=ut(r,_);dt(M);var A=(C^b>=0?-1:1)*Z(M[2]);(i>A||i===A&&(_[0]||_[1]))&&(o+=C^b>=0?1:-1)}if(!m++)break;d=v,p=$,g=w,h=e}}return(-Bs>s||Bs>s&&-Bs>Mo)^1&o}(v,p);f.length?(b||(s.polygonStart(),b=!0),St(f,At,e,n,s)):e&&(b||(s.polygonStart(),b=!0),s.lineStart(),n(null,null,1,s),s.lineEnd()),b&&(s.polygonEnd(),b=!1),f=p=null},sphere:function(){s.polygonStart(),s.lineStart(),n(null,null,1,s),s.lineEnd(),s.polygonEnd()}},$=Mt(),w=t($),b=!1;return y}}function _t(e){return e.length>1}function Mt(){var e,t=[];return{lineStart:function(){t.push(e=[])},point:function(t,n){e.push([t,n])},lineEnd:w,buffer:function(){var n=t;return t=[],e=null,n},rejoin:function(){t.length>1&&t.push(t.pop().concat(t.shift()))}}}function At(e,t){return((e=e.x)[0]<0?e[1]-Vs-Bs:Vs-e[1])-((t=t.x)[0]<0?t[1]-Vs-Bs:Vs-t[1])}function Et(e,t,n,i){return function(r){var s,o=r.a,a=r.b,l=o.x,u=o.y,c=0,h=1,d=a.x-l,f=a.y-u;if(s=e-l,d||!(s>0)){if(s/=d,0>d){if(c>s)return;h>s&&(h=s)}else if(d>0){if(s>h)return;s>c&&(c=s)}if(s=n-l,d||!(0>s)){if(s/=d,0>d){if(s>h)return;s>c&&(c=s)}else if(d>0){if(c>s)return;h>s&&(h=s)}if(s=t-u,f||!(s>0)){if(s/=f,0>f){if(c>s)return;h>s&&(h=s)}else if(f>0){if(s>h)return;s>c&&(c=s)}if(s=i-u,f||!(0>s)){if(s/=f,0>f){if(s>h)return;s>c&&(c=s)}else if(f>0){if(c>s)return;h>s&&(h=s)}return c>0&&(r.a={x:l+c*d,y:u+c*f}),1>h&&(r.b={x:l+h*d,y:u+h*f}),r}}}}}}function Rt(e,t,n,i){function r(i,r){return xs(i[0]-e)<Bs?r>0?0:3:xs(i[0]-n)<Bs?r>0?2:1:xs(i[1]-t)<Bs?r>0?1:0:r>0?3:2}function s(e,t){return o(e.x,t.x)}function o(e,t){var n=r(e,1),i=r(t,1);return n!==i?n-i:0===n?t[1]-e[1]:1===n?e[0]-t[0]:2===n?e[1]-t[1]:t[0]-e[0]}return function(a){function l(s,a,l,u){var c=0,h=0;if(null==s||(c=r(s,l))!==(h=r(a,l))||o(s,a)<0^l>0)do{u.point(0===c||3===c?e:n,c>1?i:t)}while((c=(c+l+4)%4)!==h);else u.point(a[0],a[1])}function u(r,s){return r>=e&&n>=r&&s>=t&&i>=s}function c(e,t){u(e,t)&&a.point(e,t)}function h(e,t){var n=u(e=Math.max(-Ho,Math.min(Ho,e)),t=Math.max(-Ho,Math.min(Ho,t)));if(f&&p.push([e,t]),b)g=e,m=t,v=n,b=!1,n&&(a.lineStart(),a.point(e,t));else if(n&&w)a.point(e,t);else{var i={a:{x:y,y:$},b:{x:e,y:t}};k(i)?(w||(a.lineStart(),a.point(i.a.x,i.a.y)),a.point(i.b.x,i.b.y),n||a.lineEnd(),S=!1):n&&(a.lineStart(),a.point(e,t),S=!1)}y=e,$=t,w=n}var d,f,p,g,m,v,y,$,w,b,S,x=a,C=Mt(),k=Et(e,t,n,i),_={point:c,lineStart:function(){_.point=h,f&&f.push(p=[]),b=!0,w=!1,y=$=NaN},lineEnd:function(){d&&(h(g,m),v&&w&&C.rejoin(),d.push(C.buffer())),_.point=c,w&&a.lineEnd()},polygonStart:function(){a=C,d=[],f=[],S=!0},polygonEnd:function(){a=x,d=fs.merge(d);var t=function(e){for(var t=0,n=f.length,i=e[1],r=0;n>r;++r)for(var s,o=1,a=f[r],l=a.length,u=a[0];l>o;++o)s=a[o],u[1]<=i?s[1]>i&&J(u,s,e)>0&&++t:s[1]<=i&&J(u,s,e)<0&&--t,u=s;return 0!==t}([e,i]),n=S&&t,r=d.length;(n||r)&&(a.polygonStart(),n&&(a.lineStart(),l(null,null,1,a),a.lineEnd()),r&&St(d,s,t,l,a),a.polygonEnd()),d=f=p=null}};return _}}function Tt(e){var t=0,n=Hs/3,i=Vt(e),r=i(t,n);return r.parallels=function(e){return arguments.length?i(t=e[0]*Hs/180,n=e[1]*Hs/180):[t/Hs*180,n/Hs*180]},r}function Lt(e,t){function n(e,t){var n=Math.sqrt(s-2*r*Math.sin(t))/r;return[n*Math.sin(e*=r),o-n*Math.cos(e)]}var i=Math.sin(e),r=(i+Math.sin(t))/2,s=1+i*(2*r-i),o=Math.sqrt(s)/r;return n.invert=function(e,t){var n=o-t;return[Math.atan2(e,n)/r,Z((s-(e*e+n*n)*r*r)/(2*r))]},n}function Pt(){function e(e,t){zo+=r*e-i*t,i=e,r=t}var t,n,i,r;Ko.point=function(s,o){Ko.point=e,t=i=s,n=r=o},Ko.lineEnd=function(){e(t,n)}}function It(){function e(e,t){o.push("M",e,",",t,s)}function t(e,t){o.push("M",e,",",t),a.point=n}function n(e,t){o.push("L",e,",",t)}function i(){a.point=e}function r(){o.push("Z")}var s=Dt(4.5),o=[],a={point:e,lineStart:function(){a.point=t},lineEnd:i,polygonStart:function(){a.lineEnd=r},polygonEnd:function(){a.lineEnd=i,a.point=e},pointRadius:function(e){return s=Dt(e),a},result:function(){if(o.length){var e=o.join("");return o=[],e}}};return a}function Dt(e){return"m0,"+e+"a"+e+","+e+" 0 1,1 0,"+-2*e+"a"+e+","+e+" 0 1,1 0,"+2*e+"z"}function Ot(e,t){To+=e,Lo+=t,++Po}function Nt(){function e(e,i){var r=e-t,s=i-n,o=Math.sqrt(r*r+s*s);Io+=o*(t+e)/2,Do+=o*(n+i)/2,Oo+=o,Ot(t=e,n=i)}var t,n;Jo.point=function(i,r){Jo.point=e,Ot(t=i,n=r)}}function Ft(){Jo.point=Ot}function jt(){function e(e,t){var n=e-i,s=t-r,o=Math.sqrt(n*n+s*s);Io+=o*(i+e)/2,Do+=o*(r+t)/2,Oo+=o,No+=(o=r*e-i*t)*(i+e),Fo+=o*(r+t),jo+=3*o,Ot(i=e,r=t)}var t,n,i,r;Jo.point=function(s,o){Jo.point=e,Ot(t=i=s,n=r=o)},Jo.lineEnd=function(){e(t,n)}}function Bt(e){function t(t,n){e.moveTo(t+o,n),e.arc(t,n,o,0,Ws)}function n(t,n){e.moveTo(t,n),a.point=i}function i(t,n){e.lineTo(t,n)}function r(){a.point=t}function s(){e.closePath()}var o=4.5,a={point:t,lineStart:function(){a.point=n},lineEnd:r,polygonStart:function(){a.lineEnd=s},polygonEnd:function(){a.lineEnd=r,a.point=t},pointRadius:function(e){return o=e,a},result:w};return a}function Ut(e){function t(e){return(a?i:n)(e)}function n(t){return Wt(t,(function(n,i){n=e(n,i),t.point(n[0],n[1])}))}function i(t){function n(n,i){n=e(n,i),t.point(n[0],n[1])}function i(){y=NaN,x.point=s,t.lineStart()}function s(n,i){var s=at([n,i]),o=e(n,i);r(y,$,v,w,b,S,y=o[0],$=o[1],v=n,w=s[0],b=s[1],S=s[2],a,t),t.point(y,$)}function o(){x.point=n,t.lineEnd()}function l(){i(),x.point=u,x.lineEnd=c}function u(e,t){s(h=e,t),d=y,f=$,p=w,g=b,m=S,x.point=s}function c(){r(y,$,v,w,b,S,d,f,h,p,g,m,a,t),x.lineEnd=o,o()}var h,d,f,p,g,m,v,y,$,w,b,S,x={point:n,lineStart:i,lineEnd:o,polygonStart:function(){t.polygonStart(),x.lineStart=l},polygonEnd:function(){t.polygonEnd(),x.lineStart=i}};return x}function r(t,n,i,a,l,u,c,h,d,f,p,g,m,v){var y=c-t,$=h-n,w=y*y+$*$;if(w>4*s&&m--){var b=a+f,S=l+p,x=u+g,C=Math.sqrt(b*b+S*S+x*x),k=Math.asin(x/=C),_=xs(xs(x)-1)<Bs||xs(i-d)<Bs?(i+d)/2:Math.atan2(S,b),M=e(_,k),A=M[0],E=M[1],R=A-t,T=E-n,L=$*R-y*T;(L*L/w>s||xs((y*R+$*T)/w-.5)>.3||o>a*f+l*p+u*g)&&(r(t,n,i,a,l,u,A,E,_,b/=C,S/=C,x,m,v),v.point(A,E),r(A,E,_,b,S,x,c,h,d,f,p,g,m,v))}}var s=.5,o=Math.cos(30*qs),a=16;return t.precision=function(e){return arguments.length?(a=(s=e*e)>0&&16,t):Math.sqrt(s)},t}function Ht(e){this.stream=e}function Wt(e,t){return{point:t,sphere:function(){e.sphere()},lineStart:function(){e.lineStart()},lineEnd:function(){e.lineEnd()},polygonStart:function(){e.polygonStart()},polygonEnd:function(){e.polygonEnd()}}}function zt(e){return Vt((function(){return e}))()}function Vt(e){function t(e){return[(e=a(e[0]*qs,e[1]*qs))[0]*d+l,u-e[1]*d]}function n(e){return(e=a.invert((e[0]-l)/d,(u-e[1])/d))&&[e[0]*Ys,e[1]*Ys]}function i(){a=wt(o=Kt(y,$,w),s);var e=s(g,m);return l=f-e[0]*d,u=p+e[1]*d,r()}function r(){return c&&(c.valid=!1,c=null),t}var s,o,a,l,u,c,h=Ut((function(e,t){return[(e=s(e,t))[0]*d+l,u-e[1]*d]})),d=150,f=480,p=250,g=0,m=0,y=0,$=0,w=0,b=Uo,S=v,x=null,C=null;return t.stream=function(e){return c&&(c.valid=!1),(c=qt(b(o,h(S(e))))).valid=!0,c},t.clipAngle=function(e){return arguments.length?(b=null==e?(x=e,Uo):function(e){function t(e,t){return Math.cos(e)*Math.cos(t)>r}function n(e,t,n){var i=[1,0,0],s=ut(at(e),at(t)),o=lt(s,s),a=s[0],l=o-a*a;if(!l)return!n&&e;var u=r*o/l,c=-r*a/l,h=ut(i,s),d=ht(i,u);ct(d,ht(s,c));var f=h,p=lt(d,f),g=lt(f,f),m=p*p-g*(lt(d,d)-1);if(!(0>m)){var v=Math.sqrt(m),y=ht(f,(-p-v)/g);if(ct(y,d),y=ft(y),!n)return y;var $,w=e[0],b=t[0],S=e[1],x=t[1];w>b&&($=w,w=b,b=$);var C=b-w,k=xs(C-Hs)<Bs;if(!k&&S>x&&($=S,S=x,x=$),k||Bs>C?k?S+x>0^y[1]<(xs(y[0]-w)<Bs?S:x):S<=y[1]&&y[1]<=x:C>Hs^(w<=y[0]&&y[0]<=b)){var _=ht(f,(-p+v)/g);return ct(_,d),[y,ft(_)]}}}function i(t,n){var i=s?e:Hs-e,r=0;return-i>t?r|=1:t>i&&(r|=2),-i>n?r|=4:n>i&&(r|=8),r}var r=Math.cos(e),s=r>0,o=xs(r)>Bs;return kt(t,(function(e){var r,a,l,u,c;return{lineStart:function(){u=l=!1,c=1},point:function(h,d){var f,p=[h,d],g=t(h,d),m=s?g?0:i(h,d):g?i(h+(0>h?Hs:-Hs),d):0;if(!r&&(u=l=g)&&e.lineStart(),g!==l&&(f=n(r,p),(pt(r,f)||pt(p,f))&&(p[0]+=Bs,p[1]+=Bs,g=t(p[0],p[1]))),g!==l)c=0,g?(e.lineStart(),f=n(p,r),e.point(f[0],f[1])):(f=n(r,p),e.point(f[0],f[1]),e.lineEnd()),r=f;else if(o&&r&&s^g){var v;m&a||!(v=n(p,r,!0))||(c=0,s?(e.lineStart(),e.point(v[0][0],v[0][1]),e.point(v[1][0],v[1][1]),e.lineEnd()):(e.point(v[1][0],v[1][1]),e.lineEnd(),e.lineStart(),e.point(v[0][0],v[0][1])))}!g||r&&pt(r,p)||e.point(p[0],p[1]),r=p,l=g,a=m},lineEnd:function(){l&&e.lineEnd(),r=null},clean:function(){return c|(u&&l)<<1}}}),Zt(e,6*qs),s?[0,-e]:[-Hs,e-Hs])}((x=+e)*qs),r()):x},t.clipExtent=function(e){return arguments.length?(C=e,S=e?Rt(e[0][0],e[0][1],e[1][0],e[1][1]):v,r()):C},t.scale=function(e){return arguments.length?(d=+e,i()):d},t.translate=function(e){return arguments.length?(f=+e[0],p=+e[1],i()):[f,p]},t.center=function(e){return arguments.length?(g=e[0]%360*qs,m=e[1]%360*qs,i()):[g*Ys,m*Ys]},t.rotate=function(e){return arguments.length?(y=e[0]%360*qs,$=e[1]%360*qs,w=e.length>2?e[2]%360*qs:0,i()):[y*Ys,$*Ys,w*Ys]},fs.rebind(t,h,"precision"),function(){return s=e.apply(this,arguments),t.invert=s.invert&&n,i()}}function qt(e){return Wt(e,(function(t,n){e.point(t*qs,n*qs)}))}function Yt(e,t){return[e,t]}function Gt(e,t){return[e>Hs?e-Ws:-Hs>e?e+Ws:e,t]}function Kt(e,t,n){return e?t||n?wt(Jt(e),Xt(t,n)):Jt(e):t||n?Xt(t,n):Gt}function Qt(e){return function(t,n){return[(t+=e)>Hs?t-Ws:-Hs>t?t+Ws:t,n]}}function Jt(e){var t=Qt(e);return t.invert=Qt(-e),t}function Xt(e,t){function n(e,t){var n=Math.cos(t),a=Math.cos(e)*n,l=Math.sin(e)*n,u=Math.sin(t),c=u*i+a*r;return[Math.atan2(l*s-c*o,a*i-u*r),Z(c*s+l*o)]}var i=Math.cos(e),r=Math.sin(e),s=Math.cos(t),o=Math.sin(t);return n.invert=function(e,t){var n=Math.cos(t),a=Math.cos(e)*n,l=Math.sin(e)*n,u=Math.sin(t),c=u*s-l*o;return[Math.atan2(l*s+u*o,a*i+c*r),Z(c*i-a*r)]},n}function Zt(e,t){var n=Math.cos(e),i=Math.sin(e);return function(r,s,o,a){var l=o*t;null!=r?(r=en(n,r),s=en(n,s),(o>0?s>r:r>s)&&(r+=o*Ws)):(r=e+o*Ws,s=e-.5*l);for(var u,c=r;o>0?c>s:s>c;c-=l)a.point((u=ft([n,-i*Math.cos(c),-i*Math.sin(c)]))[0],u[1])}}function en(e,t){var n=at(t);n[0]-=e,dt(n);var i=X(-n[1]);return((-n[2]<0?-i:i)+2*Math.PI-Bs)%(2*Math.PI)}function tn(e,t,n){var i=fs.range(e,t-Bs,n).concat(t);return function(e){return i.map((function(t){return[e,t]}))}}function nn(e,t,n){var i=fs.range(e,t-Bs,n).concat(t);return function(e){return i.map((function(t){return[t,e]}))}}function rn(e){return e.source}function sn(e){return e.target}function on(e,t){function n(t,n){var i=Math.cos(t),r=Math.cos(n),s=e(i*r);return[s*r*Math.sin(t),s*Math.sin(n)]}return n.invert=function(e,n){var i=Math.sqrt(e*e+n*n),r=t(i),s=Math.sin(r),o=Math.cos(r);return[Math.atan2(e*s,i*o),Math.asin(i&&n*s/i)]},n}function an(e,t){function n(e,t){o>0?-Vs+Bs>t&&(t=-Vs+Bs):t>Vs-Bs&&(t=Vs-Bs);var n=o/Math.pow(r(t),s);return[n*Math.sin(s*e),o-n*Math.cos(s*e)]}var i=Math.cos(e),r=function(e){return Math.tan(Hs/4+e/2)},s=e===t?Math.sin(e):Math.log(i/Math.cos(t))/Math.log(r(t)/r(e)),o=i*Math.pow(r(e),s)/s;return s?(n.invert=function(e,t){var n=o-t,i=Q(s)*Math.sqrt(e*e+n*n);return[Math.atan2(e,n)/s,2*Math.atan(Math.pow(o/i,1/s))-Vs]},n):un}function ln(e,t){function n(e,t){var n=s-t;return[n*Math.sin(r*e),s-n*Math.cos(r*e)]}var i=Math.cos(e),r=e===t?Math.sin(e):(i-Math.cos(t))/(t-e),s=i/r+e;return xs(r)<Bs?Yt:(n.invert=function(e,t){var n=s-t;return[Math.atan2(e,n)/r,s-Q(r)*Math.sqrt(e*e+n*n)]},n)}function un(e,t){return[e,Math.log(Math.tan(Hs/4+t/2))]}function cn(e){var t,n=zt(e),i=n.scale,r=n.translate,s=n.clipExtent;return n.scale=function(){var e=i.apply(n,arguments);return e===n?t?n.clipExtent(null):n:e},n.translate=function(){var e=r.apply(n,arguments);return e===n?t?n.clipExtent(null):n:e},n.clipExtent=function(e){var o=s.apply(n,arguments);if(o===n){if(t=null==e){var a=Hs*i(),l=r();s([[l[0]-a,l[1]-a],[l[0]+a,l[1]+a]])}}else t&&(o=null);return o},n.clipExtent(null)}function hn(e,t){return[Math.log(Math.tan(Hs/4+t/2)),-e]}function dn(e){return e[0]}function fn(e){return e[1]}function pn(e){for(var t=e.length,n=[0,1],i=2,r=2;t>r;r++){for(;i>1&&J(e[n[i-2]],e[n[i-1]],e[r])<=0;)--i;n[i++]=r}return n.slice(0,i)}function gn(e,t){return e[0]-t[0]||e[1]-t[1]}function mn(e,t,n){return(n[0]-t[0])*(e[1]-t[1])<(n[1]-t[1])*(e[0]-t[0])}function vn(e,t,n,i){var r=e[0],s=n[0],o=t[0]-r,a=i[0]-s,l=e[1],u=n[1],c=t[1]-l,h=i[1]-u,d=(a*(l-u)-h*(r-s))/(h*o-a*c);return[r+d*o,l+d*c]}function yn(e){var t=e[0],n=e[e.length-1];return!(t[0]-n[0]||t[1]-n[1])}function $n(){Fn(this),this.edge=this.site=this.circle=null}function wn(e){var t=ha.pop()||new $n;return t.site=e,t}function bn(e){Rn(e),la.remove(e),ha.push(e),Fn(e)}function Sn(e){var t=e.circle,n=t.x,i=t.cy,r={x:n,y:i},s=e.P,o=e.N,a=[e];bn(e);for(var l=s;l.circle&&xs(n-l.circle.x)<Bs&&xs(i-l.circle.cy)<Bs;)s=l.P,a.unshift(l),bn(l),l=s;a.unshift(l),Rn(l);for(var u=o;u.circle&&xs(n-u.circle.x)<Bs&&xs(i-u.circle.cy)<Bs;)o=u.N,a.push(u),bn(u),u=o;a.push(u),Rn(u);var c,h=a.length;for(c=1;h>c;++c)u=a[c],l=a[c-1],Dn(u.edge,l.site,u.site,r);l=a[0],(u=a[h-1]).edge=Pn(l.site,u.site,null,r),En(l),En(u)}function xn(e){for(var t,n,i,r,s=e.x,o=e.y,a=la._;a;)if((i=Cn(a,o)-s)>Bs)a=a.L;else{if(!((r=s-kn(a,o))>Bs)){i>-Bs?(t=a.P,n=a):r>-Bs?(t=a,n=a.N):t=n=a;break}if(!a.R){t=a;break}a=a.R}var l=wn(e);if(la.insert(t,l),t||n){if(t===n)return Rn(t),n=wn(t.site),la.insert(l,n),l.edge=n.edge=Pn(t.site,l.site),En(t),void En(n);if(!n)return void(l.edge=Pn(t.site,l.site));Rn(t),Rn(n);var u=t.site,c=u.x,h=u.y,d=e.x-c,f=e.y-h,p=n.site,g=p.x-c,m=p.y-h,v=2*(d*m-f*g),y=d*d+f*f,$=g*g+m*m,w={x:(m*y-f*$)/v+c,y:(d*$-g*y)/v+h};Dn(n.edge,u,p,w),l.edge=Pn(u,e,null,w),n.edge=Pn(e,p,null,w),En(t),En(n)}}function Cn(e,t){var n=e.site,i=n.x,r=n.y,s=r-t;if(!s)return i;var o=e.P;if(!o)return-1/0;var a=(n=o.site).x,l=n.y,u=l-t;if(!u)return a;var c=a-i,h=1/s-1/u,d=c/u;return h?(-d+Math.sqrt(d*d-2*h*(c*c/(-2*u)-l+u/2+r-s/2)))/h+i:(i+a)/2}function kn(e,t){var n=e.N;if(n)return Cn(n,t);var i=e.site;return i.y===t?i.x:1/0}function _n(e){this.site=e,this.edges=[]}function Mn(e,t){return t.angle-e.angle}function An(){Fn(this),this.x=this.y=this.arc=this.site=this.cy=null}function En(e){var t=e.P,n=e.N;if(t&&n){var i=t.site,r=e.site,s=n.site;if(i!==s){var o=r.x,a=r.y,l=i.x-o,u=i.y-a,c=s.x-o,h=2*(l*(m=s.y-a)-u*c);if(!(h>=-Us)){var d=l*l+u*u,f=c*c+m*m,p=(m*d-u*f)/h,g=(l*f-c*d)/h,m=g+a,v=da.pop()||new An;v.arc=e,v.site=r,v.x=p+o,v.y=m+Math.sqrt(p*p+g*g),v.cy=m,e.circle=v;for(var y=null,$=ca._;$;)if(v.y<$.y||v.y===$.y&&v.x<=$.x){if(!$.L){y=$.P;break}$=$.L}else{if(!$.R){y=$;break}$=$.R}ca.insert(y,v),y||(ua=v)}}}}function Rn(e){var t=e.circle;t&&(t.P||(ua=t.N),ca.remove(t),da.push(t),Fn(t),e.circle=null)}function Tn(e,t){var n=e.b;if(n)return!0;var i,r,s=e.a,o=t[0][0],a=t[1][0],l=t[0][1],u=t[1][1],c=e.l,h=e.r,d=c.x,f=c.y,p=h.x,g=h.y,m=(d+p)/2,v=(f+g)/2;if(g===f){if(o>m||m>=a)return;if(d>p){if(s){if(s.y>=u)return}else s={x:m,y:l};n={x:m,y:u}}else{if(s){if(s.y<l)return}else s={x:m,y:u};n={x:m,y:l}}}else if(r=v-(i=(d-p)/(g-f))*m,-1>i||i>1)if(d>p){if(s){if(s.y>=u)return}else s={x:(l-r)/i,y:l};n={x:(u-r)/i,y:u}}else{if(s){if(s.y<l)return}else s={x:(u-r)/i,y:u};n={x:(l-r)/i,y:l}}else if(g>f){if(s){if(s.x>=a)return}else s={x:o,y:i*o+r};n={x:a,y:i*a+r}}else{if(s){if(s.x<o)return}else s={x:a,y:i*a+r};n={x:o,y:i*o+r}}return e.a=s,e.b=n,!0}function Ln(e,t){this.l=e,this.r=t,this.a=this.b=null}function Pn(e,t,n,i){var r=new Ln(e,t);return oa.push(r),n&&Dn(r,e,t,n),i&&Dn(r,t,e,i),aa[e.i].edges.push(new On(r,e,t)),aa[t.i].edges.push(new On(r,t,e)),r}function In(e,t,n){var i=new Ln(e,null);return i.a=t,i.b=n,oa.push(i),i}function Dn(e,t,n,i){e.a||e.b?e.l===n?e.b=i:e.a=i:(e.a=i,e.l=t,e.r=n)}function On(e,t,n){var i=e.a,r=e.b;this.edge=e,this.site=t,this.angle=n?Math.atan2(n.y-t.y,n.x-t.x):e.l===t?Math.atan2(r.x-i.x,i.y-r.y):Math.atan2(i.x-r.x,r.y-i.y)}function Nn(){this._=null}function Fn(e){e.U=e.C=e.L=e.R=e.P=e.N=null}function jn(e,t){var n=t,i=t.R,r=n.U;r?r.L===n?r.L=i:r.R=i:e._=i,i.U=r,n.U=i,n.R=i.L,n.R&&(n.R.U=n),i.L=n}function Bn(e,t){var n=t,i=t.L,r=n.U;r?r.L===n?r.L=i:r.R=i:e._=i,i.U=r,n.U=i,n.L=i.R,n.L&&(n.L.U=n),i.R=n}function Un(e){for(;e.L;)e=e.L;return e}function Hn(e,t){var n,i,r,s=e.sort(Wn).pop();for(oa=[],aa=new Array(e.length),la=new Nn,ca=new Nn;;)if(r=ua,s&&(!r||s.y<r.y||s.y===r.y&&s.x<r.x))s.x===n&&s.y===i||(aa[s.i]=new _n(s),xn(s),n=s.x,i=s.y),s=e.pop();else{if(!r)break;Sn(r.arc)}t&&(function(e){for(var t,n=oa,i=Et(e[0][0],e[0][1],e[1][0],e[1][1]),r=n.length;r--;)(!Tn(t=n[r],e)||!i(t)||xs(t.a.x-t.b.x)<Bs&&xs(t.a.y-t.b.y)<Bs)&&(t.a=t.b=null,n.splice(r,1))}(t),function(e){for(var t,n,i,r,s,o,a,l,u,c,h=e[0][0],d=e[1][0],f=e[0][1],p=e[1][1],g=aa,m=g.length;m--;)if((s=g[m])&&s.prepare())for(l=(a=s.edges).length,o=0;l>o;)i=(c=a[o].end()).x,r=c.y,t=(u=a[++o%l].start()).x,n=u.y,(xs(i-t)>Bs||xs(r-n)>Bs)&&(a.splice(o,0,new On(In(s.site,c,xs(i-h)<Bs&&p-r>Bs?{x:h,y:xs(t-h)<Bs?n:p}:xs(r-p)<Bs&&d-i>Bs?{x:xs(n-p)<Bs?t:d,y:p}:xs(i-d)<Bs&&r-f>Bs?{x:d,y:xs(t-d)<Bs?n:f}:xs(r-f)<Bs&&i-h>Bs?{x:xs(n-f)<Bs?t:h,y:f}:null),s.site,null)),++l)}(t));var o={cells:aa,edges:oa};return la=ca=oa=aa=null,o}function Wn(e,t){return t.y-e.y||t.x-e.x}function zn(e,t,n){return(e.x-n.x)*(t.y-e.y)-(e.x-t.x)*(n.y-e.y)}function Vn(e){return e.x}function qn(e){return e.y}function Yn(e,t,n,i,r,s){if(!e(t,n,i,r,s)){var o=.5*(n+r),a=.5*(i+s),l=t.nodes;l[0]&&Yn(e,l[0],n,i,o,a),l[1]&&Yn(e,l[1],o,i,r,a),l[2]&&Yn(e,l[2],n,a,o,s),l[3]&&Yn(e,l[3],o,a,r,s)}}function Gn(e,t){e=fs.rgb(e),t=fs.rgb(t);var n=e.r,i=e.g,r=e.b,s=t.r-n,o=t.g-i,a=t.b-r;return function(e){return"#"+me(Math.round(n+s*e))+me(Math.round(i+o*e))+me(Math.round(r+a*e))}}function Kn(e,t){var n,i={},r={};for(n in e)n in t?i[n]=Xn(e[n],t[n]):r[n]=e[n];for(n in t)n in e||(r[n]=t[n]);return function(e){for(n in i)r[n]=i[n](e);return r}}function Qn(e,t){return e=+e,t=+t,function(n){return e*(1-n)+t*n}}function Jn(e,t){var n,i,r,s=pa.lastIndex=ga.lastIndex=0,o=-1,a=[],l=[];for(e+="",t+="";(n=pa.exec(e))&&(i=ga.exec(t));)(r=i.index)>s&&(r=t.slice(s,r),a[o]?a[o]+=r:a[++o]=r),(n=n[0])===(i=i[0])?a[o]?a[o]+=i:a[++o]=i:(a[++o]=null,l.push({i:o,x:Qn(n,i)})),s=ga.lastIndex;return s<t.length&&(r=t.slice(s),a[o]?a[o]+=r:a[++o]=r),a.length<2?l[0]?(t=l[0].x,function(e){return t(e)+""}):function(){return t}:(t=l.length,function(e){for(var n,i=0;t>i;++i)a[(n=l[i]).i]=n.x(e);return a.join("")})}function Xn(e,t){for(var n,i=fs.interpolators.length;--i>=0&&!(n=fs.interpolators[i](e,t)););return n}function Zn(e,t){var n,i=[],r=[],s=e.length,o=t.length,a=Math.min(e.length,t.length);for(n=0;a>n;++n)i.push(Xn(e[n],t[n]));for(;s>n;++n)r[n]=e[n];for(;o>n;++n)r[n]=t[n];return function(e){for(n=0;a>n;++n)r[n]=i[n](e);return r}}function ei(e){return function(t){return 1-e(1-t)}}function ti(e){return function(t){return.5*(.5>t?e(2*t):2-e(2-2*t))}}function ni(e){return e*e}function ii(e){return e*e*e}function ri(e){if(0>=e)return 0;if(e>=1)return 1;var t=e*e,n=t*e;return 4*(.5>e?n:3*(e-t)+n-.75)}function si(e){return 1-Math.cos(e*Vs)}function oi(e){return Math.pow(2,10*(e-1))}function ai(e){return 1-Math.sqrt(1-e*e)}function li(e){return 1/2.75>e?7.5625*e*e:2/2.75>e?7.5625*(e-=1.5/2.75)*e+.75:2.5/2.75>e?7.5625*(e-=2.25/2.75)*e+.9375:7.5625*(e-=2.625/2.75)*e+.984375}function ui(e,t){return t-=e,function(n){return Math.round(e+t*n)}}function ci(e){var t=[e.a,e.b],n=[e.c,e.d],i=di(t),r=hi(t,n),s=di(function(e,t,n){return e[0]+=n*t[0],e[1]+=n*t[1],e}(n,t,-r))||0;t[0]*n[1]<n[0]*t[1]&&(t[0]*=-1,t[1]*=-1,i*=-1,r*=-1),this.rotate=(i?Math.atan2(t[1],t[0]):Math.atan2(-n[0],n[1]))*Ys,this.translate=[e.e,e.f],this.scale=[i,s],this.skew=s?Math.atan2(r,s)*Ys:0}function hi(e,t){return e[0]*t[0]+e[1]*t[1]}function di(e){var t=Math.sqrt(hi(e,e));return t&&(e[0]/=t,e[1]/=t),t}function fi(e){return e.length?e.pop()+",":""}function pi(e,t){var n=[],i=[];return e=fs.transform(e),t=fs.transform(t),function(e,t,n,i){if(e[0]!==t[0]||e[1]!==t[1]){var r=n.push("translate(",null,",",null,")");i.push({i:r-4,x:Qn(e[0],t[0])},{i:r-2,x:Qn(e[1],t[1])})}else(t[0]||t[1])&&n.push("translate("+t+")")}(e.translate,t.translate,n,i),function(e,t,n,i){e!==t?(e-t>180?t+=360:t-e>180&&(e+=360),i.push({i:n.push(fi(n)+"rotate(",null,")")-2,x:Qn(e,t)})):t&&n.push(fi(n)+"rotate("+t+")")}(e.rotate,t.rotate,n,i),function(e,t,n,i){e!==t?i.push({i:n.push(fi(n)+"skewX(",null,")")-2,x:Qn(e,t)}):t&&n.push(fi(n)+"skewX("+t+")")}(e.skew,t.skew,n,i),function(e,t,n,i){if(e[0]!==t[0]||e[1]!==t[1]){var r=n.push(fi(n)+"scale(",null,",",null,")");i.push({i:r-4,x:Qn(e[0],t[0])},{i:r-2,x:Qn(e[1],t[1])})}else 1===t[0]&&1===t[1]||n.push(fi(n)+"scale("+t+")")}(e.scale,t.scale,n,i),e=t=null,function(e){for(var t,r=-1,s=i.length;++r<s;)n[(t=i[r]).i]=t.x(e);return n.join("")}}function gi(e,t){return t=(t-=e=+e)||1/t,function(n){return(n-e)/t}}function mi(e,t){return t=(t-=e=+e)||1/t,function(n){return Math.max(0,Math.min(1,(n-e)/t))}}function vi(e){for(var t=e.source,n=e.target,i=function(e,t){if(e===t)return e;for(var n=yi(e),i=yi(t),r=n.pop(),s=i.pop(),o=null;r===s;)o=r,r=n.pop(),s=i.pop();return o}(t,n),r=[t];t!==i;)t=t.parent,r.push(t);for(var s=r.length;n!==i;)r.splice(s,0,n),n=n.parent;return r}function yi(e){for(var t=[],n=e.parent;null!=n;)t.push(e),e=n,n=n.parent;return t.push(e),t}function $i(e){e.fixed|=2}function wi(e){e.fixed&=-7}function bi(e){e.fixed|=4,e.px=e.x,e.py=e.y}function Si(e){e.fixed&=-5}function xi(e,t,n){var i=0,r=0;if(e.charge=0,!e.leaf)for(var s,o=e.nodes,a=o.length,l=-1;++l<a;)null!=(s=o[l])&&(xi(s,t,n),e.charge+=s.charge,i+=s.charge*s.cx,r+=s.charge*s.cy);if(e.point){e.leaf||(e.point.x+=Math.random()-.5,e.point.y+=Math.random()-.5);var u=t*n[e.point.index];e.charge+=e.pointCharge=u,i+=u*e.point.x,r+=u*e.point.y}e.cx=i/e.charge,e.cy=r/e.charge}function Ci(e,t){return fs.rebind(e,t,"sort","children","value"),e.nodes=e,e.links=Ri,e}function ki(e,t){for(var n=[e];null!=(e=n.pop());)if(t(e),(r=e.children)&&(i=r.length))for(var i,r;--i>=0;)n.push(r[i])}function _i(e,t){for(var n=[e],i=[];null!=(e=n.pop());)if(i.push(e),(s=e.children)&&(r=s.length))for(var r,s,o=-1;++o<r;)n.push(s[o]);for(;null!=(e=i.pop());)t(e)}function Mi(e){return e.children}function Ai(e){return e.value}function Ei(e,t){return t.value-e.value}function Ri(e){return fs.merge(e.map((function(e){return(e.children||[]).map((function(t){return{source:e,target:t}}))})))}function Ti(e){return e.x}function Li(e){return e.y}function Pi(e,t,n){e.y0=t,e.y=n}function Ii(e){return fs.range(e.length)}function Di(e){for(var t=-1,n=e[0].length,i=[];++t<n;)i[t]=0;return i}function Oi(e){for(var t,n=1,i=0,r=e[0][1],s=e.length;s>n;++n)(t=e[n][1])>r&&(i=n,r=t);return i}function Ni(e){return e.reduce(Fi,0)}function Fi(e,t){return e+t[1]}function ji(e,t){return Bi(e,Math.ceil(Math.log(t.length)/Math.LN2+1))}function Bi(e,t){for(var n=-1,i=+e[0],r=(e[1]-i)/t,s=[];++n<=t;)s[n]=r*n+i;return s}function Ui(e){return[fs.min(e),fs.max(e)]}function Hi(e,t){return e.value-t.value}function Wi(e,t){var n=e._pack_next;e._pack_next=t,t._pack_prev=e,t._pack_next=n,n._pack_prev=t}function zi(e,t){e._pack_next=t,t._pack_prev=e}function Vi(e,t){var n=t.x-e.x,i=t.y-e.y,r=e.r+t.r;return.999*r*r>n*n+i*i}function qi(e){function t(e){c=Math.min(e.x-e.r,c),h=Math.max(e.x+e.r,h),d=Math.min(e.y-e.r,d),f=Math.max(e.y+e.r,f)}if((n=e.children)&&(u=n.length)){var n,i,r,s,o,a,l,u,c=1/0,h=-1/0,d=1/0,f=-1/0;if(n.forEach(Yi),(i=n[0]).x=-i.r,i.y=0,t(i),u>1&&((r=n[1]).x=r.r,r.y=0,t(r),u>2))for(Qi(i,r,s=n[2]),t(s),Wi(i,s),i._pack_prev=s,Wi(s,r),r=i._pack_next,o=3;u>o;o++){Qi(i,r,s=n[o]);var p=0,g=1,m=1;for(a=r._pack_next;a!==r;a=a._pack_next,g++)if(Vi(a,s)){p=1;break}if(1==p)for(l=i._pack_prev;l!==a._pack_prev&&!Vi(l,s);l=l._pack_prev,m++);p?(m>g||g==m&&r.r<i.r?zi(i,r=a):zi(i=l,r),o--):(Wi(i,s),r=s,t(s))}var v=(c+h)/2,y=(d+f)/2,$=0;for(o=0;u>o;o++)(s=n[o]).x-=v,s.y-=y,$=Math.max($,s.r+Math.sqrt(s.x*s.x+s.y*s.y));e.r=$,n.forEach(Gi)}}function Yi(e){e._pack_next=e._pack_prev=e}function Gi(e){delete e._pack_next,delete e._pack_prev}function Ki(e,t,n,i){var r=e.children;if(e.x=t+=i*e.x,e.y=n+=i*e.y,e.r*=i,r)for(var s=-1,o=r.length;++s<o;)Ki(r[s],t,n,i)}function Qi(e,t,n){var i=e.r+n.r,r=t.x-e.x,s=t.y-e.y;if(i&&(r||s)){var o=t.r+n.r,a=r*r+s*s,l=.5+((i*=i)-(o*=o))/(2*a),u=Math.sqrt(Math.max(0,2*o*(i+a)-(i-=a)*i-o*o))/(2*a);n.x=e.x+l*r+u*s,n.y=e.y+l*s-u*r}else n.x=e.x+i,n.y=e.y}function Ji(e,t){return e.parent==t.parent?1:2}function Xi(e){var t=e.children;return t.length?t[0]:e.t}function Zi(e){var t,n=e.children;return(t=n.length)?n[t-1]:e.t}function er(e,t,n){var i=n/(t.i-e.i);t.c-=i,t.s+=n,e.c+=i,t.z+=n,t.m+=n}function tr(e,t,n){return e.a.parent===t.parent?e.a:n}function nr(e){var t=e.children;return t&&t.length?nr(t[0]):e}function ir(e){var t,n=e.children;return n&&(t=n.length)?ir(n[t-1]):e}function rr(e){return{x:e.x,y:e.y,dx:e.dx,dy:e.dy}}function sr(e,t){var n=e.x+t[3],i=e.y+t[0],r=e.dx-t[1]-t[3],s=e.dy-t[0]-t[2];return 0>r&&(n+=r/2,r=0),0>s&&(i+=s/2,s=0),{x:n,y:i,dx:r,dy:s}}function or(e){var t=e[0],n=e[e.length-1];return n>t?[t,n]:[n,t]}function ar(e){return e.rangeExtent?e.rangeExtent():or(e.range())}function lr(e,t,n,i){var r=n(e[0],e[1]),s=i(t[0],t[1]);return function(e){return s(r(e))}}function ur(e,t){var n,i=0,r=e.length-1,s=e[i],o=e[r];return s>o&&(n=i,i=r,r=n,n=s,s=o,o=n),e[i]=t.floor(s),e[r]=t.ceil(o),e}function cr(e){return e?{floor:function(t){return Math.floor(t/e)*e},ceil:function(t){return Math.ceil(t/e)*e}}:_a}function hr(e,t,n,i){var r=[],s=[],o=0,a=Math.min(e.length,t.length)-1;for(e[a]<e[0]&&(e=e.slice().reverse(),t=t.slice().reverse());++o<=a;)r.push(n(e[o-1],e[o])),s.push(i(t[o-1],t[o]));return function(t){var n=fs.bisect(e,t,1,a)-1;return s[n](r[n](t))}}function dr(e,t,n,i){function r(){var r=Math.min(e.length,t.length)>2?hr:lr,l=i?mi:gi;return o=r(e,t,l,n),a=r(t,e,l,Xn),s}function s(e){return o(e)}var o,a;return s.invert=function(e){return a(e)},s.domain=function(t){return arguments.length?(e=t.map(Number),r()):e},s.range=function(e){return arguments.length?(t=e,r()):t},s.rangeRound=function(e){return s.range(e).interpolate(ui)},s.clamp=function(e){return arguments.length?(i=e,r()):i},s.interpolate=function(e){return arguments.length?(n=e,r()):n},s.ticks=function(t){return mr(e,t)},s.tickFormat=function(t,n){return vr(e,t,n)},s.nice=function(t){return pr(e,t),r()},s.copy=function(){return dr(e,t,n,i)},r()}function fr(e,t){return fs.rebind(e,t,"range","rangeRound","interpolate","clamp")}function pr(e,t){return ur(e,cr(gr(e,t)[2])),ur(e,cr(gr(e,t)[2])),e}function gr(e,t){null==t&&(t=10);var n=or(e),i=n[1]-n[0],r=Math.pow(10,Math.floor(Math.log(i/t)/Math.LN10)),s=t/i*r;return.15>=s?r*=10:.35>=s?r*=5:.75>=s&&(r*=2),n[0]=Math.ceil(n[0]/r)*r,n[1]=Math.floor(n[1]/r)*r+.5*r,n[2]=r,n}function mr(e,t){return fs.range.apply(fs,gr(e,t))}function vr(e,t,n){var i=gr(e,t);if(n){var r=po.exec(n);if(r.shift(),"s"===r[8]){var s=fs.formatPrefix(Math.max(xs(i[0]),xs(i[1])));return r[7]||(r[7]="."+yr(s.scale(i[2]))),r[8]="f",n=fs.format(r.join("")),function(e){return n(s.scale(e))+s.symbol}}r[7]||(r[7]="."+function(e,t){var n=yr(t[2]);return e in Ma?Math.abs(n-yr(Math.max(xs(t[0]),xs(t[1]))))+ +("e"!==e):n-2*("%"===e)}(r[8],i)),n=r.join("")}else n=",."+yr(i[2])+"f";return fs.format(n)}function yr(e){return-Math.floor(Math.log(e)/Math.LN10+.01)}function $r(e,t,n,i){function r(e){return(n?Math.log(0>e?0:e):-Math.log(e>0?0:-e))/Math.log(t)}function s(e){return n?Math.pow(t,e):-Math.pow(t,-e)}function o(t){return e(r(t))}return o.invert=function(t){return s(e.invert(t))},o.domain=function(t){return arguments.length?(n=t[0]>=0,e.domain((i=t.map(Number)).map(r)),o):i},o.base=function(n){return arguments.length?(t=+n,e.domain(i.map(r)),o):t},o.nice=function(){var t=ur(i.map(r),n?Math:Ea);return e.domain(t),i=t.map(s),o},o.ticks=function(){var e=or(i),o=[],a=e[0],l=e[1],u=Math.floor(r(a)),c=Math.ceil(r(l)),h=t%1?2:t;if(isFinite(c-u)){if(n){for(;c>u;u++)for(var d=1;h>d;d++)o.push(s(u)*d);o.push(s(u))}else for(o.push(s(u));u++<c;)for(d=h-1;d>0;d--)o.push(s(u)*d);for(u=0;o[u]<a;u++);for(c=o.length;o[c-1]>l;c--);o=o.slice(u,c)}return o},o.tickFormat=function(e,n){if(!arguments.length)return Aa;arguments.length<2?n=Aa:"function"!=typeof n&&(n=fs.format(n));var i=Math.max(1,t*e/o.ticks().length);return function(e){var o=e/s(Math.round(r(e)));return t-.5>o*t&&(o*=t),i>=o?n(e):""}},o.copy=function(){return $r(e.copy(),t,n,i)},fr(o,e)}function wr(e,t,n){function i(t){return e(r(t))}var r=br(t),s=br(1/t);return i.invert=function(t){return s(e.invert(t))},i.domain=function(t){return arguments.length?(e.domain((n=t.map(Number)).map(r)),i):n},i.ticks=function(e){return mr(n,e)},i.tickFormat=function(e,t){return vr(n,e,t)},i.nice=function(e){return i.domain(pr(n,e))},i.exponent=function(o){return arguments.length?(r=br(t=o),s=br(1/t),e.domain(n.map(r)),i):t},i.copy=function(){return wr(e.copy(),t,n)},fr(i,e)}function br(e){return function(t){return 0>t?-Math.pow(-t,e):Math.pow(t,e)}}function Sr(e,t){function n(n){return s[((r.get(n)||("range"===t.t?r.set(n,e.push(n)):NaN))-1)%s.length]}function i(t,n){return fs.range(e.length).map((function(e){return t+n*e}))}var r,s,o;return n.domain=function(i){if(!arguments.length)return e;e=[],r=new l;for(var s,o=-1,a=i.length;++o<a;)r.has(s=i[o])||r.set(s,e.push(s));return n[t.t].apply(n,t.a)},n.range=function(e){return arguments.length?(s=e,o=0,t={t:"range",a:arguments},n):s},n.rangePoints=function(r,a){arguments.length<2&&(a=0);var l=r[0],u=r[1],c=e.length<2?(l=(l+u)/2,0):(u-l)/(e.length-1+a);return s=i(l+c*a/2,c),o=0,t={t:"rangePoints",a:arguments},n},n.rangeRoundPoints=function(r,a){arguments.length<2&&(a=0);var l=r[0],u=r[1],c=e.length<2?(l=u=Math.round((l+u)/2),0):(u-l)/(e.length-1+a)|0;return s=i(l+Math.round(c*a/2+(u-l-(e.length-1+a)*c)/2),c),o=0,t={t:"rangeRoundPoints",a:arguments},n},n.rangeBands=function(r,a,l){arguments.length<2&&(a=0),arguments.length<3&&(l=a);var u=r[1]<r[0],c=r[u-0],h=(r[1-u]-c)/(e.length-a+2*l);return s=i(c+h*l,h),u&&s.reverse(),o=h*(1-a),t={t:"rangeBands",a:arguments},n},n.rangeRoundBands=function(r,a,l){arguments.length<2&&(a=0),arguments.length<3&&(l=a);var u=r[1]<r[0],c=r[u-0],h=r[1-u],d=Math.floor((h-c)/(e.length-a+2*l));return s=i(c+Math.round((h-c-(e.length-a)*d)/2),d),u&&s.reverse(),o=Math.round(d*(1-a)),t={t:"rangeRoundBands",a:arguments},n},n.rangeBand=function(){return o},n.rangeExtent=function(){return or(t.a[0])},n.copy=function(){return Sr(e,t)},n.domain(e)}function xr(e,t){function s(){var n=0,i=t.length;for(a=[];++n<i;)a[n-1]=fs.quantile(e,n/i);return o}function o(e){return isNaN(e=+e)?void 0:t[fs.bisect(a,e)]}var a;return o.domain=function(t){return arguments.length?(e=t.map(i).filter(r).sort(n),s()):e},o.range=function(e){return arguments.length?(t=e,s()):t},o.quantiles=function(){return a},o.invertExtent=function(n){return 0>(n=t.indexOf(n))?[NaN,NaN]:[n>0?a[n-1]:e[0],n<a.length?a[n]:e[e.length-1]]},o.copy=function(){return xr(e,t)},s()}function Cr(e,t,n){function i(t){return n[Math.max(0,Math.min(o,Math.floor(s*(t-e))))]}function r(){return s=n.length/(t-e),o=n.length-1,i}var s,o;return i.domain=function(n){return arguments.length?(e=+n[0],t=+n[n.length-1],r()):[e,t]},i.range=function(e){return arguments.length?(n=e,r()):n},i.invertExtent=function(t){return[t=0>(t=n.indexOf(t))?NaN:t/s+e,t+1/s]},i.copy=function(){return Cr(e,t,n)},r()}function kr(e,t){function n(n){return n>=n?t[fs.bisect(e,n)]:void 0}return n.domain=function(t){return arguments.length?(e=t,n):e},n.range=function(e){return arguments.length?(t=e,n):t},n.invertExtent=function(n){return n=t.indexOf(n),[e[n-1],e[n]]},n.copy=function(){return kr(e,t)},n}function _r(e){function t(e){return+e}return t.invert=t,t.domain=t.range=function(n){return arguments.length?(e=n.map(t),t):e},t.ticks=function(t){return mr(e,t)},t.tickFormat=function(t,n){return vr(e,t,n)},t.copy=function(){return _r(e)},t}function Mr(){return 0}function Ar(e){return e.innerRadius}function Er(e){return e.outerRadius}function Rr(e){return e.startAngle}function Tr(e){return e.endAngle}function Lr(e){return e&&e.padAngle}function Pr(e,t,n,i){return(e-n)*t-(t-i)*e>0?0:1}function Ir(e,t,n,i,r){var s=e[0]-t[0],o=e[1]-t[1],a=(r?i:-i)/Math.sqrt(s*s+o*o),l=a*o,u=-a*s,c=e[0]+l,h=e[1]+u,d=t[0]+l,f=t[1]+u,p=(c+d)/2,g=(h+f)/2,m=d-c,v=f-h,y=m*m+v*v,$=n-i,w=c*f-d*h,b=(0>v?-1:1)*Math.sqrt(Math.max(0,$*$*y-w*w)),S=(w*v-m*b)/y,x=(-w*m-v*b)/y,C=(w*v+m*b)/y,k=(-w*m+v*b)/y,_=S-p,M=x-g,A=C-p,E=k-g;return _*_+M*M>A*A+E*E&&(S=C,x=k),[[S-l,x-u],[S*n/$,x*n/$]]}function Dr(e){function t(t){function o(){u.push("M",s(e(c),a))}for(var l,u=[],c=[],h=-1,d=t.length,f=Se(n),p=Se(i);++h<d;)r.call(this,l=t[h],h)?c.push([+f.call(this,l,h),+p.call(this,l,h)]):c.length&&(o(),c=[]);return c.length&&o(),u.length?u.join(""):null}var n=dn,i=fn,r=bt,s=Or,o=s.key,a=.7;return t.x=function(e){return arguments.length?(n=e,t):n},t.y=function(e){return arguments.length?(i=e,t):i},t.defined=function(e){return arguments.length?(r=e,t):r},t.interpolate=function(e){return arguments.length?(o="function"==typeof e?s=e:(s=Da.get(e)||Or).key,t):o},t.tension=function(e){return arguments.length?(a=e,t):a},t}function Or(e){return e.length>1?e.join("L"):e+"Z"}function Nr(e){return e.join("L")+"Z"}function Fr(e){for(var t=0,n=e.length,i=e[0],r=[i[0],",",i[1]];++t<n;)r.push("V",(i=e[t])[1],"H",i[0]);return r.join("")}function jr(e){for(var t=0,n=e.length,i=e[0],r=[i[0],",",i[1]];++t<n;)r.push("H",(i=e[t])[0],"V",i[1]);return r.join("")}function Br(e,t){if(t.length<1||e.length!=t.length&&e.length!=t.length+2)return Or(e);var n=e.length!=t.length,i="",r=e[0],s=e[1],o=t[0],a=o,l=1;if(n&&(i+="Q"+(s[0]-2*o[0]/3)+","+(s[1]-2*o[1]/3)+","+s[0]+","+s[1],r=e[1],l=2),t.length>1){a=t[1],s=e[l],l++,i+="C"+(r[0]+o[0])+","+(r[1]+o[1])+","+(s[0]-a[0])+","+(s[1]-a[1])+","+s[0]+","+s[1];for(var u=2;u<t.length;u++,l++)s=e[l],a=t[u],i+="S"+(s[0]-a[0])+","+(s[1]-a[1])+","+s[0]+","+s[1]}if(n){var c=e[l];i+="Q"+(s[0]+2*a[0]/3)+","+(s[1]+2*a[1]/3)+","+c[0]+","+c[1]}return i}function Ur(e,t){for(var n,i=[],r=(1-t)/2,s=e[0],o=e[1],a=1,l=e.length;++a<l;)n=s,s=o,o=e[a],i.push([r*(o[0]-n[0]),r*(o[1]-n[1])]);return i}function Hr(e){if(e.length<3)return Or(e);var t=1,n=e.length,i=e[0],r=i[0],s=i[1],o=[r,r,r,(i=e[1])[0]],a=[s,s,s,i[1]],l=[r,",",s,"L",Wr(Fa,o),",",Wr(Fa,a)];for(e.push(e[n-1]);++t<=n;)i=e[t],o.shift(),o.push(i[0]),a.shift(),a.push(i[1]),zr(l,o,a);return e.pop(),l.push("L",i),l.join("")}function Wr(e,t){return e[0]*t[0]+e[1]*t[1]+e[2]*t[2]+e[3]*t[3]}function zr(e,t,n){e.push("C",Wr(Oa,t),",",Wr(Oa,n),",",Wr(Na,t),",",Wr(Na,n),",",Wr(Fa,t),",",Wr(Fa,n))}function Vr(e,t){return(t[1]-e[1])/(t[0]-e[0])}function qr(e){for(var t,n,i,r,s=[],o=function(e){for(var t=0,n=e.length-1,i=[],r=e[0],s=e[1],o=i[0]=Vr(r,s);++t<n;)i[t]=(o+(o=Vr(r=s,s=e[t+1])))/2;return i[t]=o,i}(e),a=-1,l=e.length-1;++a<l;)t=Vr(e[a],e[a+1]),xs(t)<Bs?o[a]=o[a+1]=0:(r=(n=o[a]/t)*n+(i=o[a+1]/t)*i)>9&&(r=3*t/Math.sqrt(r),o[a]=r*n,o[a+1]=r*i);for(a=-1;++a<=l;)r=(e[Math.min(l,a+1)][0]-e[Math.max(0,a-1)][0])/(6*(1+o[a]*o[a])),s.push([r||0,o[a]*r||0]);return s}function Yr(e){for(var t,n,i,r=-1,s=e.length;++r<s;)n=(t=e[r])[0],i=t[1]-Vs,t[0]=n*Math.cos(i),t[1]=n*Math.sin(i);return e}function Gr(e){function t(t){function l(){g.push("M",a(e(v),h),c,u(e(m.reverse()),h),"Z")}for(var d,f,p,g=[],m=[],v=[],y=-1,$=t.length,w=Se(n),b=Se(r),S=n===i?function(){return f}:Se(i),x=r===s?function(){return p}:Se(s);++y<$;)o.call(this,d=t[y],y)?(m.push([f=+w.call(this,d,y),p=+b.call(this,d,y)]),v.push([+S.call(this,d,y),+x.call(this,d,y)])):m.length&&(l(),m=[],v=[]);return m.length&&l(),g.length?g.join(""):null}var n=dn,i=dn,r=0,s=fn,o=bt,a=Or,l=a.key,u=a,c="L",h=.7;return t.x=function(e){return arguments.length?(n=i=e,t):i},t.x0=function(e){return arguments.length?(n=e,t):n},t.x1=function(e){return arguments.length?(i=e,t):i},t.y=function(e){return arguments.length?(r=s=e,t):s},t.y0=function(e){return arguments.length?(r=e,t):r},t.y1=function(e){return arguments.length?(s=e,t):s},t.defined=function(e){return arguments.length?(o=e,t):o},t.interpolate=function(e){return arguments.length?(l="function"==typeof e?a=e:(a=Da.get(e)||Or).key,u=a.reverse||a,c=a.closed?"M":"L",t):l},t.tension=function(e){return arguments.length?(h=e,t):h},t}function Kr(e){return e.radius}function Qr(e){return[e.x,e.y]}function Jr(){return 64}function Xr(){return"circle"}function Zr(e){var t=Math.sqrt(e/Hs);return"M0,"+t+"A"+t+","+t+" 0 1,1 0,"+-t+"A"+t+","+t+" 0 1,1 0,"+t+"Z"}function es(e){return function(){var t,n,i;(t=this[e])&&(i=t[n=t.active])&&(i.timer.c=null,i.timer.t=NaN,--t.count?delete t[n]:delete this[e],t.active+=.5,i.event&&i.event.interrupt.call(this,this.__data__,i.index))}}function ts(e,t,n){return As(e,Va),e.namespace=t,e.id=n,e}function ns(e,t,n,i){var r=e.id,s=e.namespace;return H(e,"function"==typeof n?function(e,o,a){e[s][r].tween.set(t,i(n.call(e,e.__data__,o,a)))}:(n=i(n),function(e){e[s][r].tween.set(t,n)}))}function is(e){return null==e&&(e=""),function(){this.textContent=e}}function rs(e){return null==e?"__transition__":"__transition_"+e+"__"}function ss(e,t,n,i,r){function s(n){var r=f.active,s=f[r];for(var l in s&&(s.timer.c=null,s.timer.t=NaN,--f.count,delete f[r],s.event&&s.event.interrupt.call(e,e.__data__,s.index)),f)if(i>+l){var g=f[l];g.timer.c=null,g.timer.t=NaN,--f.count,delete f[l]}u.c=o,ke((function(){return u.c&&o(n||1)&&(u.c=null,u.t=NaN),1}),0,a),f.active=i,p.event&&p.event.start.call(e,e.__data__,t),d=[],p.tween.forEach((function(n,i){(i=i.call(e,e.__data__,t))&&d.push(i)})),h=p.ease,c=p.duration}function o(r){for(var s=r/c,o=h(s),a=d.length;a>0;)d[--a].call(e,o);return s>=1?(p.event&&p.event.end.call(e,e.__data__,t),--f.count?delete f[i]:delete e[n],1):void 0}var a,u,c,h,d,f=e[n]||(e[n]={active:0,count:0}),p=f[i];p||(a=r.time,u=ke((function(e){var t=p.delay;return u.t=t+a,e>=t?s(e-t):void(u.c=s)}),0,a),p=f[i]={tween:new l,time:a,timer:u,delay:r.delay,duration:r.duration,ease:r.ease,index:t},r=null,++f.count)}function os(e,t,n){e.attr("transform",(function(e){var i=t(e);return"translate("+(isFinite(i)?i:n(e))+",0)"}))}function as(e,t,n){e.attr("transform",(function(e){var i=t(e);return"translate(0,"+(isFinite(i)?i:n(e))+")"}))}function ls(e){return e.toISOString()}function us(e,t,n){function i(t){return e(t)}function r(e,n){var i=(e[1]-e[0])/n,r=fs.bisect(el,i);return r==el.length?[t.year,gr(e.map((function(e){return e/31536e6})),n)[2]]:r?t[i/el[r-1]<el[r]/i?r-1:r]:[il,gr(e,n)[2]]}return i.invert=function(t){return cs(e.invert(t))},i.domain=function(t){return arguments.length?(e.domain(t),i):e.domain().map(cs)},i.nice=function(e,t){function n(n){return!isNaN(n)&&!e.range(n,cs(+n+1),t).length}var s=i.domain(),o=or(s),a=null==e?r(o,10):"number"==typeof e&&r(o,e);return a&&(e=a[0],t=a[1]),i.domain(ur(s,t>1?{floor:function(t){for(;n(t=e.floor(t));)t=cs(t-1);return t},ceil:function(t){for(;n(t=e.ceil(t));)t=cs(+t+1);return t}}:e))},i.ticks=function(e,t){var n=or(i.domain()),s=null==e?r(n,10):"number"==typeof e?r(n,e):!e.range&&[{range:e},t];return s&&(e=s[0],t=s[1]),e.range(n[0],cs(+n[1]+1),1>t?1:t)},i.tickFormat=function(){return n},i.copy=function(){return us(e.copy(),t,n)},fr(i,e)}function cs(e){return new Date(e)}function hs(e){return JSON.parse(e.responseText)}function ds(e){var t=ms.createRange();return t.selectNode(ms.body),t.createContextualFragment(e.responseText)}var fs={version:"3.5.17"},ps=[].slice,gs=function(e){return ps.call(e)},ms=this.document;if(ms)try{gs(ms.documentElement.childNodes)[0].nodeType}catch(e){gs=function(e){for(var t=e.length,n=new Array(t);t--;)n[t]=e[t];return n}}if(Date.now||(Date.now=function(){return+new Date}),ms)try{ms.createElement("DIV").style.setProperty("opacity",0,"")}catch(e){var vs=this.Element.prototype,ys=vs.setAttribute,$s=vs.setAttributeNS,ws=this.CSSStyleDeclaration.prototype,bs=ws.setProperty;vs.setAttribute=function(e,t){ys.call(this,e,t+"")},vs.setAttributeNS=function(e,t,n){$s.call(this,e,t,n+"")},ws.setProperty=function(e,t,n){bs.call(this,e,t+"",n)}}fs.ascending=n,fs.descending=function(e,t){return e>t?-1:t>e?1:t>=e?0:NaN},fs.min=function(e,t){var n,i,r=-1,s=e.length;if(1===arguments.length){for(;++r<s;)if(null!=(i=e[r])&&i>=i){n=i;break}for(;++r<s;)null!=(i=e[r])&&n>i&&(n=i)}else{for(;++r<s;)if(null!=(i=t.call(e,e[r],r))&&i>=i){n=i;break}for(;++r<s;)null!=(i=t.call(e,e[r],r))&&n>i&&(n=i)}return n},fs.max=function(e,t){var n,i,r=-1,s=e.length;if(1===arguments.length){for(;++r<s;)if(null!=(i=e[r])&&i>=i){n=i;break}for(;++r<s;)null!=(i=e[r])&&i>n&&(n=i)}else{for(;++r<s;)if(null!=(i=t.call(e,e[r],r))&&i>=i){n=i;break}for(;++r<s;)null!=(i=t.call(e,e[r],r))&&i>n&&(n=i)}return n},fs.extent=function(e,t){var n,i,r,s=-1,o=e.length;if(1===arguments.length){for(;++s<o;)if(null!=(i=e[s])&&i>=i){n=r=i;break}for(;++s<o;)null!=(i=e[s])&&(n>i&&(n=i),i>r&&(r=i))}else{for(;++s<o;)if(null!=(i=t.call(e,e[s],s))&&i>=i){n=r=i;break}for(;++s<o;)null!=(i=t.call(e,e[s],s))&&(n>i&&(n=i),i>r&&(r=i))}return[n,r]},fs.sum=function(e,t){var n,i=0,s=e.length,o=-1;if(1===arguments.length)for(;++o<s;)r(n=+e[o])&&(i+=n);else for(;++o<s;)r(n=+t.call(e,e[o],o))&&(i+=n);return i},fs.mean=function(e,t){var n,s=0,o=e.length,a=-1,l=o;if(1===arguments.length)for(;++a<o;)r(n=i(e[a]))?s+=n:--l;else for(;++a<o;)r(n=i(t.call(e,e[a],a)))?s+=n:--l;return l?s/l:void 0},fs.quantile=function(e,t){var n=(e.length-1)*t+1,i=Math.floor(n),r=+e[i-1],s=n-i;return s?r+s*(e[i]-r):r},fs.median=function(e,t){var s,o=[],a=e.length,l=-1;if(1===arguments.length)for(;++l<a;)r(s=i(e[l]))&&o.push(s);else for(;++l<a;)r(s=i(t.call(e,e[l],l)))&&o.push(s);return o.length?fs.quantile(o.sort(n),.5):void 0},fs.variance=function(e,t){var n,s,o=e.length,a=0,l=0,u=-1,c=0;if(1===arguments.length)for(;++u<o;)r(n=i(e[u]))&&(l+=(s=n-a)*(n-(a+=s/++c)));else for(;++u<o;)r(n=i(t.call(e,e[u],u)))&&(l+=(s=n-a)*(n-(a+=s/++c)));return c>1?l/(c-1):void 0},fs.deviation=function(){var e=fs.variance.apply(this,arguments);return e?Math.sqrt(e):e};var Ss=s(n);fs.bisectLeft=Ss.left,fs.bisect=fs.bisectRight=Ss.right,fs.bisector=function(e){return s(1===e.length?function(t,i){return n(e(t),i)}:e)},fs.shuffle=function(e,t,n){(s=arguments.length)<3&&(n=e.length,2>s&&(t=0));for(var i,r,s=n-t;s;)r=Math.random()*s--|0,i=e[s+t],e[s+t]=e[r+t],e[r+t]=i;return e},fs.permute=function(e,t){for(var n=t.length,i=new Array(n);n--;)i[n]=e[t[n]];return i},fs.pairs=function(e){for(var t=0,n=e.length-1,i=e[0],r=new Array(0>n?0:n);n>t;)r[t]=[i,i=e[++t]];return r},fs.transpose=function(e){if(!(r=e.length))return[];for(var t=-1,n=fs.min(e,o),i=new Array(n);++t<n;)for(var r,s=-1,a=i[t]=new Array(r);++s<r;)a[s]=e[s][t];return i},fs.zip=function(){return fs.transpose(arguments)},fs.keys=function(e){var t=[];for(var n in e)t.push(n);return t},fs.values=function(e){var t=[];for(var n in e)t.push(e[n]);return t},fs.entries=function(e){var t=[];for(var n in e)t.push({key:n,value:e[n]});return t},fs.merge=function(e){for(var t,n,i,r=e.length,s=-1,o=0;++s<r;)o+=e[s].length;for(n=new Array(o);--r>=0;)for(t=(i=e[r]).length;--t>=0;)n[--o]=i[t];return n};var xs=Math.abs;fs.range=function(e,t,n){if(arguments.length<3&&(n=1,arguments.length<2&&(t=e,e=0)),(t-e)/n==1/0)throw new Error("infinite range");var i,r=[],s=function(e){for(var t=1;e*t%1;)t*=10;return t}(xs(n)),o=-1;if(e*=s,t*=s,0>(n*=s))for(;(i=e+n*++o)>t;)r.push(i/s);else for(;(i=e+n*++o)<t;)r.push(i/s);return r},fs.map=function(e,t){var n=new l;if(e instanceof l)e.forEach((function(e,t){n.set(e,t)}));else if(Array.isArray(e)){var i,r=-1,s=e.length;if(1===arguments.length)for(;++r<s;)n.set(r,e[r]);else for(;++r<s;)n.set(t.call(e,i=e[r],r),i)}else for(var o in e)n.set(o,e[o]);return n};var Cs="__proto__",ks="\0";a(l,{has:h,get:function(e){return this._[u(e)]},set:function(e,t){return this._[u(e)]=t},remove:d,keys:f,values:function(){var e=[];for(var t in this._)e.push(this._[t]);return e},entries:function(){var e=[];for(var t in this._)e.push({key:c(t),value:this._[t]});return e},size:p,empty:g,forEach:function(e){for(var t in this._)e.call(this,c(t),this._[t])}}),fs.nest=function(){function e(t,o,a){if(a>=s.length)return i?i.call(r,o):n?o.sort(n):o;for(var u,c,h,d,f=-1,p=o.length,g=s[a++],m=new l;++f<p;)(d=m.get(u=g(c=o[f])))?d.push(c):m.set(u,[c]);return t?(c=t(),h=function(n,i){c.set(n,e(t,i,a))}):(c={},h=function(n,i){c[n]=e(t,i,a)}),m.forEach(h),c}function t(e,n){if(n>=s.length)return e;var i=[],r=o[n++];return e.forEach((function(e,r){i.push({key:e,values:t(r,n)})})),r?i.sort((function(e,t){return r(e.key,t.key)})):i}var n,i,r={},s=[],o=[];return r.map=function(t,n){return e(n,t,0)},r.entries=function(n){return t(e(fs.map,n,0),0)},r.key=function(e){return s.push(e),r},r.sortKeys=function(e){return o[s.length-1]=e,r},r.sortValues=function(e){return n=e,r},r.rollup=function(e){return i=e,r},r},fs.set=function(e){var t=new m;if(e)for(var n=0,i=e.length;i>n;++n)t.add(e[n]);return t},a(m,{has:h,add:function(e){return this._[u(e+="")]=!0,e},remove:d,values:f,size:p,empty:g,forEach:function(e){for(var t in this._)e.call(this,c(t))}}),fs.behavior={},fs.rebind=function(e,t){for(var n,i=1,r=arguments.length;++i<r;)e[n=arguments[i]]=y(e,t,t[n]);return e};var _s=["webkit","ms","moz","Moz","o","O"];fs.dispatch=function(){for(var e=new b,t=-1,n=arguments.length;++t<n;)e[arguments[t]]=S(e);return e},b.prototype.on=function(e,t){var n=e.indexOf("."),i="";if(n>=0&&(i=e.slice(n+1),e=e.slice(0,n)),e)return arguments.length<2?this[e].on(i):this[e].on(i,t);if(2===arguments.length){if(null==t)for(e in this)this.hasOwnProperty(e)&&this[e].on(i,null);return this}},fs.event=null,fs.requote=function(e){return e.replace(Ms,"\\$&")};var Ms=/[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g,As={}.__proto__?function(e,t){e.__proto__=t}:function(e,t){for(var n in t)e[n]=t[n]},Es=function(e,t){return t.querySelector(e)},Rs=function(e,t){return t.querySelectorAll(e)},Ts=function(e,t){var n=e.matches||e[$(e,"matchesSelector")];return(Ts=function(e,t){return n.call(e,t)})(e,t)};"function"==typeof Sizzle&&(Es=function(e,t){return Sizzle(e,t)[0]||null},Rs=Sizzle,Ts=Sizzle.matchesSelector),fs.selection=function(){return fs.select(ms.documentElement)};var Ls=fs.selection.prototype=[];Ls.select=function(e){var t,n,i,r,s=[];e=M(e);for(var o=-1,a=this.length;++o<a;){s.push(t=[]),t.parentNode=(i=this[o]).parentNode;for(var l=-1,u=i.length;++l<u;)(r=i[l])?(t.push(n=e.call(r,r.__data__,l,o)),n&&"__data__"in r&&(n.__data__=r.__data__)):t.push(null)}return _(s)},Ls.selectAll=function(e){var t,n,i=[];e=A(e);for(var r=-1,s=this.length;++r<s;)for(var o=this[r],a=-1,l=o.length;++a<l;)(n=o[a])&&(i.push(t=gs(e.call(n,n.__data__,a,r))),t.parentNode=n);return _(i)};var Ps="http://www.w3.org/1999/xhtml",Is={svg:"http://www.w3.org/2000/svg",xhtml:Ps,xlink:"http://www.w3.org/1999/xlink",xml:"http://www.w3.org/XML/1998/namespace",xmlns:"http://www.w3.org/2000/xmlns/"};fs.ns={prefix:Is,qualify:function(e){var t=e.indexOf(":"),n=e;return t>=0&&"xmlns"!==(n=e.slice(0,t))&&(e=e.slice(t+1)),Is.hasOwnProperty(n)?{space:Is[n],local:e}:e}},Ls.attr=function(e,t){if(arguments.length<2){if("string"==typeof e){var n=this.node();return(e=fs.ns.qualify(e)).local?n.getAttributeNS(e.space,e.local):n.getAttribute(e)}for(t in e)this.each(E(t,e[t]));return this}return this.each(E(e,t))},Ls.classed=function(e,t){if(arguments.length<2){if("string"==typeof e){var n=this.node(),i=(e=L(e)).length,r=-1;if(t=n.classList){for(;++r<i;)if(!t.contains(e[r]))return!1}else for(t=n.getAttribute("class");++r<i;)if(!T(e[r]).test(t))return!1;return!0}for(t in e)this.each(P(t,e[t]));return this}return this.each(P(e,t))},Ls.style=function(e,n,i){var r=arguments.length;if(3>r){if("string"!=typeof e){for(i in 2>r&&(n=""),e)this.each(D(i,e[i],n));return this}if(2>r){var s=this.node();return t(s).getComputedStyle(s,null).getPropertyValue(e)}i=""}return this.each(D(e,n,i))},Ls.property=function(e,t){if(arguments.length<2){if("string"==typeof e)return this.node()[e];for(t in e)this.each(O(t,e[t]));return this}return this.each(O(e,t))},Ls.text=function(e){return arguments.length?this.each("function"==typeof e?function(){var t=e.apply(this,arguments);this.textContent=null==t?"":t}:null==e?function(){this.textContent=""}:function(){this.textContent=e}):this.node().textContent},Ls.html=function(e){return arguments.length?this.each("function"==typeof e?function(){var t=e.apply(this,arguments);this.innerHTML=null==t?"":t}:null==e?function(){this.innerHTML=""}:function(){this.innerHTML=e}):this.node().innerHTML},Ls.append=function(e){return e=N(e),this.select((function(){return this.appendChild(e.apply(this,arguments))}))},Ls.insert=function(e,t){return e=N(e),t=M(t),this.select((function(){return this.insertBefore(e.apply(this,arguments),t.apply(this,arguments)||null)}))},Ls.remove=function(){return this.each(F)},Ls.data=function(e,t){function n(e,n){var i,r,s,o=e.length,h=n.length,d=Math.min(o,h),f=new Array(h),p=new Array(h),g=new Array(o);if(t){var m,v=new l,y=new Array(o);for(i=-1;++i<o;)(r=e[i])&&(v.has(m=t.call(r,r.__data__,i))?g[i]=r:v.set(m,r),y[i]=m);for(i=-1;++i<h;)(r=v.get(m=t.call(n,s=n[i],i)))?!0!==r&&(f[i]=r,r.__data__=s):p[i]=j(s),v.set(m,!0);for(i=-1;++i<o;)i in y&&!0!==v.get(y[i])&&(g[i]=e[i])}else{for(i=-1;++i<d;)r=e[i],s=n[i],r?(r.__data__=s,f[i]=r):p[i]=j(s);for(;h>i;++i)p[i]=j(n[i]);for(;o>i;++i)g[i]=e[i]}p.update=f,p.parentNode=f.parentNode=g.parentNode=e.parentNode,a.push(p),u.push(f),c.push(g)}var i,r,s=-1,o=this.length;if(!arguments.length){for(e=new Array(o=(i=this[0]).length);++s<o;)(r=i[s])&&(e[s]=r.__data__);return e}var a=W([]),u=_([]),c=_([]);if("function"==typeof e)for(;++s<o;)n(i=this[s],e.call(i,i.parentNode.__data__,s));else for(;++s<o;)n(i=this[s],e);return u.enter=function(){return a},u.exit=function(){return c},u},Ls.datum=function(e){return arguments.length?this.property("__data__",e):this.property("__data__")},Ls.filter=function(e){var t,n,i,r=[];"function"!=typeof e&&(e=B(e));for(var s=0,o=this.length;o>s;s++){r.push(t=[]),t.parentNode=(n=this[s]).parentNode;for(var a=0,l=n.length;l>a;a++)(i=n[a])&&e.call(i,i.__data__,a,s)&&t.push(i)}return _(r)},Ls.order=function(){for(var e=-1,t=this.length;++e<t;)for(var n,i=this[e],r=i.length-1,s=i[r];--r>=0;)(n=i[r])&&(s&&s!==n.nextSibling&&s.parentNode.insertBefore(n,s),s=n);return this},Ls.sort=function(e){e=U.apply(this,arguments);for(var t=-1,n=this.length;++t<n;)this[t].sort(e);return this.order()},Ls.each=function(e){return H(this,(function(t,n,i){e.call(t,t.__data__,n,i)}))},Ls.call=function(e){var t=gs(arguments);return e.apply(t[0]=this,t),this},Ls.empty=function(){return!this.node()},Ls.node=function(){for(var e=0,t=this.length;t>e;e++)for(var n=this[e],i=0,r=n.length;r>i;i++){var s=n[i];if(s)return s}return null},Ls.size=function(){var e=0;return H(this,(function(){++e})),e};var Ds=[];fs.selection.enter=W,fs.selection.enter.prototype=Ds,Ds.append=Ls.append,Ds.empty=Ls.empty,Ds.node=Ls.node,Ds.call=Ls.call,Ds.size=Ls.size,Ds.select=function(e){for(var t,n,i,r,s,o=[],a=-1,l=this.length;++a<l;){i=(r=this[a]).update,o.push(t=[]),t.parentNode=r.parentNode;for(var u=-1,c=r.length;++u<c;)(s=r[u])?(t.push(i[u]=n=e.call(r.parentNode,s.__data__,u,a)),n.__data__=s.__data__):t.push(null)}return _(o)},Ds.insert=function(e,t){return arguments.length<2&&(t=function(e){var t,n;return function(i,r,s){var o,a=e[s].update,l=a.length;for(s!=n&&(n=s,t=0),r>=t&&(t=r+1);!(o=a[t])&&++t<l;);return o}}(this)),Ls.insert.call(this,e,t)},fs.select=function(t){var n;return"string"==typeof t?(n=[Es(t,ms)]).parentNode=ms.documentElement:(n=[t]).parentNode=e(t),_([n])},fs.selectAll=function(e){var t;return"string"==typeof e?(t=gs(Rs(e,ms))).parentNode=ms.documentElement:(t=gs(e)).parentNode=null,_([t])},Ls.on=function(e,t,n){var i=arguments.length;if(3>i){if("string"!=typeof e){for(n in 2>i&&(t=!1),e)this.each(z(n,e[n],t));return this}if(2>i)return(i=this.node()["__on"+e])&&i._;n=!1}return this.each(z(e,t,n))};var Os=fs.map({mouseenter:"mouseover",mouseleave:"mouseout"});ms&&Os.forEach((function(e){"on"+e in ms&&Os.remove(e)}));var Ns,Fs=0;fs.mouse=function(e){return G(e,C())};var js=this.navigator&&/WebKit/.test(this.navigator.userAgent)?-1:0;fs.touch=function(e,t,n){if(arguments.length<3&&(n=t,t=C().changedTouches),t)for(var i,r=0,s=t.length;s>r;++r)if((i=t[r]).identifier===n)return G(e,i)},fs.behavior.drag=function(){function e(){this.on("mousedown.drag",s).on("touchstart.drag",o)}function n(e,t,n,s,o){return function(){var a,l=this,u=fs.event.target.correspondingElement||fs.event.target,c=l.parentNode,h=i.of(l,arguments),d=0,f=e(),p=".drag"+(null==f?"":"-"+f),g=fs.select(n(u)).on(s+p,(function(){var e,n,i=t(c,f);i&&(e=i[0]-v[0],n=i[1]-v[1],d|=e|n,v=i,h({type:"drag",x:i[0]+a[0],y:i[1]+a[1],dx:e,dy:n}))})).on(o+p,(function(){t(c,f)&&(g.on(s+p,null).on(o+p,null),m(d),h({type:"dragend"}))})),m=Y(u),v=t(c,f);r?a=[(a=r.apply(l,arguments)).x-v[0],a.y-v[1]]:a=[0,0],h({type:"dragstart"})}}var i=k(e,"drag","dragstart","dragend"),r=null,s=n(w,fs.mouse,t,"mousemove","mouseup"),o=n(K,fs.touch,v,"touchmove","touchend");return e.origin=function(t){return arguments.length?(r=t,e):r},fs.rebind(e,i,"on")},fs.touches=function(e,t){return arguments.length<2&&(t=C().touches),t?gs(t).map((function(t){var n=G(e,t);return n.identifier=t.identifier,n})):[]};var Bs=1e-6,Us=Bs*Bs,Hs=Math.PI,Ws=2*Hs,zs=Ws-Bs,Vs=Hs/2,qs=Hs/180,Ys=180/Hs,Gs=Math.SQRT2;fs.interpolateZoom=function(e,t){var n,i,r=e[0],s=e[1],o=e[2],a=t[0],l=t[1],u=t[2],c=a-r,h=l-s,d=c*c+h*h;if(Us>d)i=Math.log(u/o)/Gs,n=function(e){return[r+e*c,s+e*h,o*Math.exp(Gs*e*i)]};else{var f=Math.sqrt(d),p=(u*u-o*o+4*d)/(2*o*2*f),g=(u*u-o*o-4*d)/(2*u*2*f),m=Math.log(Math.sqrt(p*p+1)-p),v=Math.log(Math.sqrt(g*g+1)-g);i=(v-m)/Gs,n=function(e){var t=e*i,n=ee(m),a=o/(2*f)*(n*function(e){return((e=Math.exp(2*e))-1)/(e+1)}(Gs*t+m)-function(e){return((e=Math.exp(e))-1/e)/2}(m));return[r+a*c,s+a*h,o*n/ee(Gs*t+m)]}}return n.duration=1e3*i,n},fs.behavior.zoom=function(){function e(e){e.on(R,c).on(Qs+".zoom",d).on("dblclick.zoom",f).on(P,h)}function n(e){return[(e[0]-C.x)/C.k,(e[1]-C.y)/C.k]}function i(e){C.k=Math.max(M[0],Math.min(M[1],e))}function r(e,t){t=function(e){return[e[0]*C.k+C.x,e[1]*C.k+C.y]}(t),C.x+=e[0]-t[0],C.y+=e[1]-t[1]}function s(t,n,s,o){t.__chart__={x:C.x,y:C.y,k:C.k},i(Math.pow(2,o)),r(g=n,s),t=fs.select(t),A>0&&(t=t.transition().duration(A)),t.call(e.event)}function o(){w&&w.domain($.range().map((function(e){return(e-C.x)/C.k})).map($.invert)),S&&S.domain(b.range().map((function(e){return(e-C.y)/C.k})).map(b.invert))}function a(e){E++||e({type:"zoomstart"})}function l(e){o(),e({type:"zoom",scale:C.k,translate:[C.x,C.y]})}function u(e){--E||(e({type:"zoomend"}),g=null)}function c(){var e=this,i=I.of(e,arguments),s=0,o=fs.select(t(e)).on(T,(function(){s=1,r(fs.mouse(e),c),l(i)})).on(L,(function(){o.on(T,null).on(L,null),h(s),u(i)})),c=n(fs.mouse(e)),h=Y(e);za.call(e),a(i)}function h(){function e(){var e=fs.touches(p);return f=C.k,e.forEach((function(e){e.identifier in m&&(m[e.identifier]=n(e))})),e}function t(){var t=fs.event.target;fs.select(t).on(w,o).on(b,d),S.push(t);for(var n=fs.event.changedTouches,i=0,r=n.length;r>i;++i)m[n[i].identifier]=null;var a=e(),l=Date.now();if(1===a.length){if(500>l-y){var u=a[0];s(p,u,m[u.identifier],Math.floor(Math.log(C.k)/Math.LN2)+1),x()}y=l}else if(a.length>1){u=a[0];var c=a[1],h=u[0]-c[0],f=u[1]-c[1];v=h*h+f*f}}function o(){var e,t,n,s,o=fs.touches(p);za.call(p);for(var a=0,u=o.length;u>a;++a,s=null)if(n=o[a],s=m[n.identifier]){if(t)break;e=n,t=s}if(s){var c=(c=n[0]-e[0])*c+(c=n[1]-e[1])*c,h=v&&Math.sqrt(c/v);e=[(e[0]+n[0])/2,(e[1]+n[1])/2],t=[(t[0]+s[0])/2,(t[1]+s[1])/2],i(h*f)}y=null,r(e,t),l(g)}function d(){if(fs.event.touches.length){for(var t=fs.event.changedTouches,n=0,i=t.length;i>n;++n)delete m[t[n].identifier];for(var r in m)return void e()}fs.selectAll(S).on($,null),k.on(R,c).on(P,h),_(),u(g)}var f,p=this,g=I.of(p,arguments),m={},v=0,$=".zoom-"+fs.event.changedTouches[0].identifier,w="touchmove"+$,b="touchend"+$,S=[],k=fs.select(p),_=Y(p);t(),a(g),k.on(R,null).on(P,t)}function d(){var e=I.of(this,arguments);v?clearTimeout(v):(za.call(this),p=n(g=m||fs.mouse(this)),a(e)),v=setTimeout((function(){v=null,u(e)}),50),x(),i(Math.pow(2,.002*Ks())*C.k),r(g,p),l(e)}function f(){var e=fs.mouse(this),t=Math.log(C.k)/Math.LN2;s(this,e,n(e),fs.event.shiftKey?Math.ceil(t)-1:Math.floor(t)+1)}var p,g,m,v,y,$,w,b,S,C={x:0,y:0,k:1},_=[960,500],M=Js,A=250,E=0,R="mousedown.zoom",T="mousemove.zoom",L="mouseup.zoom",P="touchstart.zoom",I=k(e,"zoomstart","zoom","zoomend");return Qs||(Qs="onwheel"in ms?(Ks=function(){return-fs.event.deltaY*(fs.event.deltaMode?120:1)},"wheel"):"onmousewheel"in ms?(Ks=function(){return fs.event.wheelDelta},"mousewheel"):(Ks=function(){return-fs.event.detail},"MozMousePixelScroll")),e.event=function(e){e.each((function(){var e=I.of(this,arguments),t=C;Ha?fs.select(this).transition().each("start.zoom",(function(){C=this.__chart__||{x:0,y:0,k:1},a(e)})).tween("zoom:zoom",(function(){var n=_[0],i=_[1],r=g?g[0]:n/2,s=g?g[1]:i/2,o=fs.interpolateZoom([(r-C.x)/C.k,(s-C.y)/C.k,n/C.k],[(r-t.x)/t.k,(s-t.y)/t.k,n/t.k]);return function(t){var i=o(t),a=n/i[2];this.__chart__=C={x:r-i[0]*a,y:s-i[1]*a,k:a},l(e)}})).each("interrupt.zoom",(function(){u(e)})).each("end.zoom",(function(){u(e)})):(this.__chart__=C,a(e),l(e),u(e))}))},e.translate=function(t){return arguments.length?(C={x:+t[0],y:+t[1],k:C.k},o(),e):[C.x,C.y]},e.scale=function(t){return arguments.length?(C={x:C.x,y:C.y,k:null},i(+t),o(),e):C.k},e.scaleExtent=function(t){return arguments.length?(M=null==t?Js:[+t[0],+t[1]],e):M},e.center=function(t){return arguments.length?(m=t&&[+t[0],+t[1]],e):m},e.size=function(t){return arguments.length?(_=t&&[+t[0],+t[1]],e):_},e.duration=function(t){return arguments.length?(A=+t,e):A},e.x=function(t){return arguments.length?(w=t,$=t.copy(),C={x:0,y:0,k:1},e):w},e.y=function(t){return arguments.length?(S=t,b=t.copy(),C={x:0,y:0,k:1},e):S},fs.rebind(e,I,"on")};var Ks,Qs,Js=[0,1/0];fs.color=ne,ne.prototype.toString=function(){return this.rgb()+""},fs.hsl=ie;var Xs=ie.prototype=new ne;Xs.brighter=function(e){return e=Math.pow(.7,arguments.length?e:1),new ie(this.h,this.s,this.l/e)},Xs.darker=function(e){return e=Math.pow(.7,arguments.length?e:1),new ie(this.h,this.s,e*this.l)},Xs.rgb=function(){return re(this.h,this.s,this.l)},fs.hcl=se;var Zs=se.prototype=new ne;Zs.brighter=function(e){return new se(this.h,this.c,Math.min(100,this.l+eo*(arguments.length?e:1)))},Zs.darker=function(e){return new se(this.h,this.c,Math.max(0,this.l-eo*(arguments.length?e:1)))},Zs.rgb=function(){return oe(this.h,this.c,this.l).rgb()},fs.lab=ae;var eo=18,to=.95047,no=1,io=1.08883,ro=ae.prototype=new ne;ro.brighter=function(e){return new ae(Math.min(100,this.l+eo*(arguments.length?e:1)),this.a,this.b)},ro.darker=function(e){return new ae(Math.max(0,this.l-eo*(arguments.length?e:1)),this.a,this.b)},ro.rgb=function(){return le(this.l,this.a,this.b)},fs.rgb=fe;var so=fe.prototype=new ne;so.brighter=function(e){e=Math.pow(.7,arguments.length?e:1);var t=this.r,n=this.g,i=this.b,r=30;return t||n||i?(t&&r>t&&(t=r),n&&r>n&&(n=r),i&&r>i&&(i=r),new fe(Math.min(255,t/e),Math.min(255,n/e),Math.min(255,i/e))):new fe(r,r,r)},so.darker=function(e){return new fe((e=Math.pow(.7,arguments.length?e:1))*this.r,e*this.g,e*this.b)},so.hsl=function(){return ye(this.r,this.g,this.b)},so.toString=function(){return"#"+me(this.r)+me(this.g)+me(this.b)};var oo=fs.map({aliceblue:15792383,antiquewhite:16444375,aqua:65535,aquamarine:8388564,azure:15794175,beige:16119260,bisque:16770244,black:0,blanchedalmond:16772045,blue:255,blueviolet:9055202,brown:10824234,burlywood:14596231,cadetblue:6266528,chartreuse:8388352,chocolate:13789470,coral:16744272,cornflowerblue:6591981,cornsilk:16775388,crimson:14423100,cyan:65535,darkblue:139,darkcyan:35723,darkgoldenrod:12092939,darkgray:11119017,darkgreen:25600,darkgrey:11119017,darkkhaki:12433259,darkmagenta:9109643,darkolivegreen:5597999,darkorange:16747520,darkorchid:10040012,darkred:9109504,darksalmon:15308410,darkseagreen:9419919,darkslateblue:4734347,darkslategray:3100495,darkslategrey:3100495,darkturquoise:52945,darkviolet:9699539,deeppink:16716947,deepskyblue:49151,dimgray:6908265,dimgrey:6908265,dodgerblue:2003199,firebrick:11674146,floralwhite:16775920,forestgreen:2263842,fuchsia:16711935,gainsboro:14474460,ghostwhite:16316671,gold:16766720,goldenrod:14329120,gray:8421504,green:32768,greenyellow:11403055,grey:8421504,honeydew:15794160,hotpink:16738740,indianred:13458524,indigo:4915330,ivory:16777200,khaki:15787660,lavender:15132410,lavenderblush:16773365,lawngreen:8190976,lemonchiffon:16775885,lightblue:11393254,lightcoral:15761536,lightcyan:14745599,lightgoldenrodyellow:16448210,lightgray:13882323,lightgreen:9498256,lightgrey:13882323,lightpink:16758465,lightsalmon:16752762,lightseagreen:2142890,lightskyblue:8900346,lightslategray:7833753,lightslategrey:7833753,lightsteelblue:11584734,lightyellow:16777184,lime:65280,limegreen:3329330,linen:16445670,magenta:16711935,maroon:8388608,mediumaquamarine:6737322,mediumblue:205,mediumorchid:12211667,mediumpurple:9662683,mediumseagreen:3978097,mediumslateblue:8087790,mediumspringgreen:64154,mediumturquoise:4772300,mediumvioletred:13047173,midnightblue:1644912,mintcream:16121850,mistyrose:16770273,moccasin:16770229,navajowhite:16768685,navy:128,oldlace:16643558,olive:8421376,olivedrab:7048739,orange:16753920,orangered:16729344,orchid:14315734,palegoldenrod:15657130,palegreen:10025880,paleturquoise:11529966,palevioletred:14381203,papayawhip:16773077,peachpuff:16767673,peru:13468991,pink:16761035,plum:14524637,powderblue:11591910,purple:8388736,rebeccapurple:6697881,red:16711680,rosybrown:12357519,royalblue:4286945,saddlebrown:9127187,salmon:16416882,sandybrown:16032864,seagreen:3050327,seashell:16774638,sienna:10506797,silver:12632256,skyblue:8900331,slateblue:6970061,slategray:7372944,slategrey:7372944,snow:16775930,springgreen:65407,steelblue:4620980,tan:13808780,teal:32896,thistle:14204888,tomato:16737095,turquoise:4251856,violet:15631086,wheat:16113331,white:16777215,whitesmoke:16119285,yellow:16776960,yellowgreen:10145074});oo.forEach((function(e,t){oo.set(e,pe(t))})),fs.functor=Se,fs.xhr=xe(v),fs.dsv=function(e,t){function n(e,n,s){arguments.length<3&&(s=n,n=null);var o=Ce(e,t,null==n?i:r(n),s);return o.row=function(e){return arguments.length?o.response(null==(n=e)?i:r(e)):n},o}function i(e){return n.parse(e.responseText)}function r(e){return function(t){return n.parse(t.responseText,e)}}function s(t){return t.map(o).join(e)}function o(e){return a.test(e)?'"'+e.replace(/\"/g,'""')+'"':e}var a=new RegExp('["'+e+"\n]"),l=e.charCodeAt(0);return n.parse=function(e,t){var i;return n.parseRows(e,(function(e,n){if(i)return i(e,n-1);var r=new Function("d","return {"+e.map((function(e,t){return JSON.stringify(e)+": d["+t+"]"})).join(",")+"}");i=t?function(e,n){return t(r(e),n)}:r}))},n.parseRows=function(e,t){function n(){if(c>=u)return o;if(r)return r=!1,s;var t=c;if(34===e.charCodeAt(t)){for(var n=t;n++<u;)if(34===e.charCodeAt(n)){if(34!==e.charCodeAt(n+1))break;++n}return c=n+2,13===(i=e.charCodeAt(n+1))?(r=!0,10===e.charCodeAt(n+2)&&++c):10===i&&(r=!0),e.slice(t+1,n).replace(/""/g,'"')}for(;u>c;){var i,a=1;if(10===(i=e.charCodeAt(c++)))r=!0;else if(13===i)r=!0,10===e.charCodeAt(c)&&(++c,++a);else if(i!==l)continue;return e.slice(t,c-a)}return e.slice(t)}for(var i,r,s={},o={},a=[],u=e.length,c=0,h=0;(i=n())!==o;){for(var d=[];i!==s&&i!==o;)d.push(i),i=n();t&&null==(d=t(d,h++))||a.push(d)}return a},n.format=function(t){if(Array.isArray(t[0]))return n.formatRows(t);var i=new m,r=[];return t.forEach((function(e){for(var t in e)i.has(t)||r.push(i.add(t))})),[r.map(o).join(e)].concat(t.map((function(t){return r.map((function(e){return o(t[e])})).join(e)}))).join("\n")},n.formatRows=function(e){return e.map(s).join("\n")},n},fs.csv=fs.dsv(",","text/csv"),fs.tsv=fs.dsv("\t","text/tab-separated-values");var ao,lo,uo,co,ho=this[$(this,"requestAnimationFrame")]||function(e){setTimeout(e,17)};fs.timer=function(){ke.apply(this,arguments)},fs.timer.flush=function(){Me(),Ae()},fs.round=function(e,t){return t?Math.round(e*(t=Math.pow(10,t)))/t:Math.round(e)};var fo=["y","z","a","f","p","n","µ","m","","k","M","G","T","P","E","Z","Y"].map((function(e,t){var n=Math.pow(10,3*xs(8-t));return{scale:t>8?function(e){return e/n}:function(e){return e*n},symbol:e}}));fs.formatPrefix=function(e,t){var n=0;return(e=+e)&&(0>e&&(e*=-1),t&&(e=fs.round(e,Ee(e,t))),n=1+Math.floor(1e-12+Math.log(e)/Math.LN10),n=Math.max(-24,Math.min(24,3*Math.floor((n-1)/3)))),fo[8+n/3]};var po=/(?:([^{])?([<>=^]))?([+\- ])?([$#])?(0)?(\d+)?(,)?(\.-?\d+)?([a-z%])?/i,go=fs.map({b:function(e){return e.toString(2)},c:function(e){return String.fromCharCode(e)},o:function(e){return e.toString(8)},x:function(e){return e.toString(16)},X:function(e){return e.toString(16).toUpperCase()},g:function(e,t){return e.toPrecision(t)},e:function(e,t){return e.toExponential(t)},f:function(e,t){return e.toFixed(t)},r:function(e,t){return(e=fs.round(e,Ee(e,t))).toFixed(Math.max(0,Math.min(20,Ee(e*(1+1e-15),t))))}}),mo=fs.time={},vo=Date;Le.prototype={getDate:function(){return this._.getUTCDate()},getDay:function(){return this._.getUTCDay()},getFullYear:function(){return this._.getUTCFullYear()},getHours:function(){return this._.getUTCHours()},getMilliseconds:function(){return this._.getUTCMilliseconds()},getMinutes:function(){return this._.getUTCMinutes()},getMonth:function(){return this._.getUTCMonth()},getSeconds:function(){return this._.getUTCSeconds()},getTime:function(){return this._.getTime()},getTimezoneOffset:function(){return 0},valueOf:function(){return this._.valueOf()},setDate:function(){yo.setUTCDate.apply(this._,arguments)},setDay:function(){yo.setUTCDay.apply(this._,arguments)},setFullYear:function(){yo.setUTCFullYear.apply(this._,arguments)},setHours:function(){yo.setUTCHours.apply(this._,arguments)},setMilliseconds:function(){yo.setUTCMilliseconds.apply(this._,arguments)},setMinutes:function(){yo.setUTCMinutes.apply(this._,arguments)},setMonth:function(){yo.setUTCMonth.apply(this._,arguments)},setSeconds:function(){yo.setUTCSeconds.apply(this._,arguments)},setTime:function(){yo.setTime.apply(this._,arguments)}};var yo=Date.prototype;mo.year=Pe((function(e){return(e=mo.day(e)).setMonth(0,1),e}),(function(e,t){e.setFullYear(e.getFullYear()+t)}),(function(e){return e.getFullYear()})),mo.years=mo.year.range,mo.years.utc=mo.year.utc.range,mo.day=Pe((function(e){var t=new vo(2e3,0);return t.setFullYear(e.getFullYear(),e.getMonth(),e.getDate()),t}),(function(e,t){e.setDate(e.getDate()+t)}),(function(e){return e.getDate()-1})),mo.days=mo.day.range,mo.days.utc=mo.day.utc.range,mo.dayOfYear=function(e){var t=mo.year(e);return Math.floor((e-t-6e4*(e.getTimezoneOffset()-t.getTimezoneOffset()))/864e5)},["sunday","monday","tuesday","wednesday","thursday","friday","saturday"].forEach((function(e,t){t=7-t;var n=mo[e]=Pe((function(e){return(e=mo.day(e)).setDate(e.getDate()-(e.getDay()+t)%7),e}),(function(e,t){e.setDate(e.getDate()+7*Math.floor(t))}),(function(e){var n=mo.year(e).getDay();return Math.floor((mo.dayOfYear(e)+(n+t)%7)/7)-(n!==t)}));mo[e+"s"]=n.range,mo[e+"s"].utc=n.utc.range,mo[e+"OfYear"]=function(e){var n=mo.year(e).getDay();return Math.floor((mo.dayOfYear(e)+(n+t)%7)/7)}})),mo.week=mo.sunday,mo.weeks=mo.sunday.range,mo.weeks.utc=mo.sunday.utc.range,mo.weekOfYear=mo.sundayOfYear;var $o={"-":"",_:" ",0:"0"},wo=/^\s*\d+/,bo=/^%/;fs.locale=function(e){return{numberFormat:Re(e),timeFormat:De(e)}};var So=fs.locale({decimal:".",thousands:",",grouping:[3],currency:["$",""],dateTime:"%a %b %e %X %Y",date:"%m/%d/%Y",time:"%H:%M:%S",periods:["AM","PM"],days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],shortDays:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],shortMonths:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]});fs.format=So.numberFormat,fs.geo={},tt.prototype={s:0,t:0,add:function(e){nt(e,this.t,xo),nt(xo.s,this.s,this),this.s?this.t+=xo.t:this.s=xo.t},reset:function(){this.s=this.t=0},valueOf:function(){return this.s}};var xo=new tt;fs.geo.stream=function(e,t){e&&Co.hasOwnProperty(e.type)?Co[e.type](e,t):it(e,t)};var Co={Feature:function(e,t){it(e.geometry,t)},FeatureCollection:function(e,t){for(var n=e.features,i=-1,r=n.length;++i<r;)it(n[i].geometry,t)}},ko={Sphere:function(e,t){t.sphere()},Point:function(e,t){e=e.coordinates,t.point(e[0],e[1],e[2])},MultiPoint:function(e,t){for(var n=e.coordinates,i=-1,r=n.length;++i<r;)e=n[i],t.point(e[0],e[1],e[2])},LineString:function(e,t){rt(e.coordinates,t,0)},MultiLineString:function(e,t){for(var n=e.coordinates,i=-1,r=n.length;++i<r;)rt(n[i],t,0)},Polygon:function(e,t){st(e.coordinates,t)},MultiPolygon:function(e,t){for(var n=e.coordinates,i=-1,r=n.length;++i<r;)st(n[i],t)},GeometryCollection:function(e,t){for(var n=e.geometries,i=-1,r=n.length;++i<r;)it(n[i],t)}};fs.geo.area=function(e){return _o=0,fs.geo.stream(e,Ao),_o};var _o,Mo=new tt,Ao={sphere:function(){_o+=4*Hs},point:w,lineStart:w,lineEnd:w,polygonStart:function(){Mo.reset(),Ao.lineStart=ot},polygonEnd:function(){var e=2*Mo;_o+=0>e?4*Hs+e:e,Ao.lineStart=Ao.lineEnd=Ao.point=w}};fs.geo.bounds=function(){function e(e,t){$.push(w=[c=e,d=e]),h>t&&(h=t),t>f&&(f=t)}function t(t,n){var i=at([t*qs,n*qs]);if(v){var r=ut(v,i),s=ut([r[1],-r[0],0],r);dt(s),s=ft(s);var o=t-p,l=o>0?1:-1,u=s[0]*Ys*l,g=xs(o)>180;if(g^(u>l*p&&l*t>u))(m=s[1]*Ys)>f&&(f=m);else if(g^((u=(u+360)%360-180)>l*p&&l*t>u)){var m=-s[1]*Ys;h>m&&(h=m)}else h>n&&(h=n),n>f&&(f=n);g?p>t?a(c,t)>a(c,d)&&(d=t):a(t,d)>a(c,d)&&(c=t):d>=c?(c>t&&(c=t),t>d&&(d=t)):t>p?a(c,t)>a(c,d)&&(d=t):a(t,d)>a(c,d)&&(c=t)}else e(t,n);v=i,p=t}function n(){b.point=t}function i(){w[0]=c,w[1]=d,b.point=e,v=null}function r(e,n){if(v){var i=e-p;y+=xs(i)>180?i+(i>0?360:-360):i}else g=e,m=n;Ao.point(e,n),t(e,n)}function s(){Ao.lineStart()}function o(){r(g,m),Ao.lineEnd(),xs(y)>Bs&&(c=-(d=180)),w[0]=c,w[1]=d,v=null}function a(e,t){return(t-=e)<0?t+360:t}function l(e,t){return e[0]-t[0]}function u(e,t){return t[0]<=t[1]?t[0]<=e&&e<=t[1]:e<t[0]||t[1]<e}var c,h,d,f,p,g,m,v,y,$,w,b={point:e,lineStart:n,lineEnd:i,polygonStart:function(){b.point=r,b.lineStart=s,b.lineEnd=o,y=0,Ao.polygonStart()},polygonEnd:function(){Ao.polygonEnd(),b.point=e,b.lineStart=n,b.lineEnd=i,0>Mo?(c=-(d=180),h=-(f=90)):y>Bs?f=90:-Bs>y&&(h=-90),w[0]=c,w[1]=d}};return function(e){if(f=d=-(c=h=1/0),$=[],fs.geo.stream(e,b),s=$.length){$.sort(l);for(var t=1,n=[p=$[0]];s>t;++t)u((r=$[t])[0],p)||u(r[1],p)?(a(p[0],r[1])>a(p[0],p[1])&&(p[1]=r[1]),a(r[0],p[1])>a(p[0],p[1])&&(p[0]=r[0])):n.push(p=r);for(var i,r,s,o=-1/0,p=(t=0,n[s=n.length-1]);s>=t;p=r,++t)r=n[t],(i=a(p[1],r[0]))>o&&(o=i,c=r[0],d=p[1])}return $=w=null,c===1/0||h===1/0?[[NaN,NaN],[NaN,NaN]]:[[c,h],[d,f]]}}(),fs.geo.centroid=function(e){Eo=Ro=To=Lo=Po=Io=Do=Oo=No=Fo=jo=0,fs.geo.stream(e,Bo);var t=No,n=Fo,i=jo,r=t*t+n*n+i*i;return Us>r&&(t=Io,n=Do,i=Oo,Bs>Ro&&(t=To,n=Lo,i=Po),Us>(r=t*t+n*n+i*i))?[NaN,NaN]:[Math.atan2(n,t)*Ys,Z(i/Math.sqrt(r))*Ys]};var Eo,Ro,To,Lo,Po,Io,Do,Oo,No,Fo,jo,Bo={sphere:w,point:gt,lineStart:vt,lineEnd:yt,polygonStart:function(){Bo.lineStart=$t},polygonEnd:function(){Bo.lineStart=vt}},Uo=kt(bt,(function(e){var t,n=NaN,i=NaN,r=NaN;return{lineStart:function(){e.lineStart(),t=1},point:function(s,o){var a=s>0?Hs:-Hs,l=xs(s-n);xs(l-Hs)<Bs?(e.point(n,i=(i+o)/2>0?Vs:-Vs),e.point(r,i),e.lineEnd(),e.lineStart(),e.point(a,i),e.point(s,i),t=0):r!==a&&l>=Hs&&(xs(n-r)<Bs&&(n-=r*Bs),xs(s-a)<Bs&&(s-=a*Bs),i=function(e,t,n,i){var r,s,o=Math.sin(e-n);return xs(o)>Bs?Math.atan((Math.sin(t)*(s=Math.cos(i))*Math.sin(n)-Math.sin(i)*(r=Math.cos(t))*Math.sin(e))/(r*s*o)):(t+i)/2}(n,i,s,o),e.point(r,i),e.lineEnd(),e.lineStart(),e.point(a,i),t=0),e.point(n=s,i=o),r=a},lineEnd:function(){e.lineEnd(),n=i=NaN},clean:function(){return 2-t}}}),(function(e,t,n,i){var r;if(null==e)r=n*Vs,i.point(-Hs,r),i.point(0,r),i.point(Hs,r),i.point(Hs,0),i.point(Hs,-r),i.point(0,-r),i.point(-Hs,-r),i.point(-Hs,0),i.point(-Hs,r);else if(xs(e[0]-t[0])>Bs){var s=e[0]<t[0]?Hs:-Hs;r=n*s/2,i.point(-s,r),i.point(0,r),i.point(s,r)}else i.point(t[0],t[1])}),[-Hs,-Hs/2]),Ho=1e9;fs.geo.clipExtent=function(){var e,t,n,i,r,s,o={stream:function(e){return r&&(r.valid=!1),(r=s(e)).valid=!0,r},extent:function(a){return arguments.length?(s=Rt(e=+a[0][0],t=+a[0][1],n=+a[1][0],i=+a[1][1]),r&&(r.valid=!1,r=null),o):[[e,t],[n,i]]}};return o.extent([[0,0],[960,500]])},(fs.geo.conicEqualArea=function(){return Tt(Lt)}).raw=Lt,fs.geo.albers=function(){return fs.geo.conicEqualArea().rotate([96,0]).center([-.6,38.7]).parallels([29.5,45.5]).scale(1070)},fs.geo.albersUsa=function(){function e(e){var s=e[0],o=e[1];return t=null,n(s,o),t||(i(s,o),t)||r(s,o),t}var t,n,i,r,s=fs.geo.albers(),o=fs.geo.conicEqualArea().rotate([154,0]).center([-2,58.5]).parallels([55,65]),a=fs.geo.conicEqualArea().rotate([157,0]).center([-3,19.9]).parallels([8,18]),l={point:function(e,n){t=[e,n]}};return e.invert=function(e){var t=s.scale(),n=s.translate(),i=(e[0]-n[0])/t,r=(e[1]-n[1])/t;return(r>=.12&&.234>r&&i>=-.425&&-.214>i?o:r>=.166&&.234>r&&i>=-.214&&-.115>i?a:s).invert(e)},e.stream=function(e){var t=s.stream(e),n=o.stream(e),i=a.stream(e);return{point:function(e,r){t.point(e,r),n.point(e,r),i.point(e,r)},sphere:function(){t.sphere(),n.sphere(),i.sphere()},lineStart:function(){t.lineStart(),n.lineStart(),i.lineStart()},lineEnd:function(){t.lineEnd(),n.lineEnd(),i.lineEnd()},polygonStart:function(){t.polygonStart(),n.polygonStart(),i.polygonStart()},polygonEnd:function(){t.polygonEnd(),n.polygonEnd(),i.polygonEnd()}}},e.precision=function(t){return arguments.length?(s.precision(t),o.precision(t),a.precision(t),e):s.precision()},e.scale=function(t){return arguments.length?(s.scale(t),o.scale(.35*t),a.scale(t),e.translate(s.translate())):s.scale()},e.translate=function(t){if(!arguments.length)return s.translate();var u=s.scale(),c=+t[0],h=+t[1];return n=s.translate(t).clipExtent([[c-.455*u,h-.238*u],[c+.455*u,h+.238*u]]).stream(l).point,i=o.translate([c-.307*u,h+.201*u]).clipExtent([[c-.425*u+Bs,h+.12*u+Bs],[c-.214*u-Bs,h+.234*u-Bs]]).stream(l).point,r=a.translate([c-.205*u,h+.212*u]).clipExtent([[c-.214*u+Bs,h+.166*u+Bs],[c-.115*u-Bs,h+.234*u-Bs]]).stream(l).point,e},e.scale(1070)};var Wo,zo,Vo,qo,Yo,Go,Ko={point:w,lineStart:w,lineEnd:w,polygonStart:function(){zo=0,Ko.lineStart=Pt},polygonEnd:function(){Ko.lineStart=Ko.lineEnd=Ko.point=w,Wo+=xs(zo/2)}},Qo={point:function(e,t){Vo>e&&(Vo=e),e>Yo&&(Yo=e),qo>t&&(qo=t),t>Go&&(Go=t)},lineStart:w,lineEnd:w,polygonStart:w,polygonEnd:w},Jo={point:Ot,lineStart:Nt,lineEnd:Ft,polygonStart:function(){Jo.lineStart=jt},polygonEnd:function(){Jo.point=Ot,Jo.lineStart=Nt,Jo.lineEnd=Ft}};fs.geo.path=function(){function e(e){return e&&("function"==typeof a&&s.pointRadius(+a.apply(this,arguments)),o&&o.valid||(o=r(s)),fs.geo.stream(e,o)),s.result()}function t(){return o=null,e}var n,i,r,s,o,a=4.5;return e.area=function(e){return Wo=0,fs.geo.stream(e,r(Ko)),Wo},e.centroid=function(e){return To=Lo=Po=Io=Do=Oo=No=Fo=jo=0,fs.geo.stream(e,r(Jo)),jo?[No/jo,Fo/jo]:Oo?[Io/Oo,Do/Oo]:Po?[To/Po,Lo/Po]:[NaN,NaN]},e.bounds=function(e){return Yo=Go=-(Vo=qo=1/0),fs.geo.stream(e,r(Qo)),[[Vo,qo],[Yo,Go]]},e.projection=function(e){return arguments.length?(r=(n=e)?e.stream||function(e){var t=Ut((function(t,n){return e([t*Ys,n*Ys])}));return function(e){return qt(t(e))}}(e):v,t()):n},e.context=function(e){return arguments.length?(s=null==(i=e)?new It:new Bt(e),"function"!=typeof a&&s.pointRadius(a),t()):i},e.pointRadius=function(t){return arguments.length?(a="function"==typeof t?t:(s.pointRadius(+t),+t),e):a},e.projection(fs.geo.albersUsa()).context(null)},fs.geo.transform=function(e){return{stream:function(t){var n=new Ht(t);for(var i in e)n[i]=e[i];return n}}},Ht.prototype={point:function(e,t){this.stream.point(e,t)},sphere:function(){this.stream.sphere()},lineStart:function(){this.stream.lineStart()},lineEnd:function(){this.stream.lineEnd()},polygonStart:function(){this.stream.polygonStart()},polygonEnd:function(){this.stream.polygonEnd()}},fs.geo.projection=zt,fs.geo.projectionMutator=Vt,(fs.geo.equirectangular=function(){return zt(Yt)}).raw=Yt.invert=Yt,fs.geo.rotation=function(e){function t(t){return(t=e(t[0]*qs,t[1]*qs))[0]*=Ys,t[1]*=Ys,t}return e=Kt(e[0]%360*qs,e[1]*qs,e.length>2?e[2]*qs:0),t.invert=function(t){return(t=e.invert(t[0]*qs,t[1]*qs))[0]*=Ys,t[1]*=Ys,t},t},Gt.invert=Yt,fs.geo.circle=function(){function e(){var e="function"==typeof i?i.apply(this,arguments):i,t=Kt(-e[0]*qs,-e[1]*qs,0).invert,r=[];return n(null,null,1,{point:function(e,n){r.push(e=t(e,n)),e[0]*=Ys,e[1]*=Ys}}),{type:"Polygon",coordinates:[r]}}var t,n,i=[0,0],r=6;return e.origin=function(t){return arguments.length?(i=t,e):i},e.angle=function(i){return arguments.length?(n=Zt((t=+i)*qs,r*qs),e):t},e.precision=function(i){return arguments.length?(n=Zt(t*qs,(r=+i)*qs),e):r},e.angle(90)},fs.geo.distance=function(e,t){var n,i=(t[0]-e[0])*qs,r=e[1]*qs,s=t[1]*qs,o=Math.sin(i),a=Math.cos(i),l=Math.sin(r),u=Math.cos(r),c=Math.sin(s),h=Math.cos(s);return Math.atan2(Math.sqrt((n=h*o)*n+(n=u*c-l*h*a)*n),l*c+u*h*a)},fs.geo.graticule=function(){function e(){return{type:"MultiLineString",coordinates:t()}}function t(){return fs.range(Math.ceil(s/m)*m,r,m).map(d).concat(fs.range(Math.ceil(u/v)*v,l,v).map(f)).concat(fs.range(Math.ceil(i/p)*p,n,p).filter((function(e){return xs(e%m)>Bs})).map(c)).concat(fs.range(Math.ceil(a/g)*g,o,g).filter((function(e){return xs(e%v)>Bs})).map(h))}var n,i,r,s,o,a,l,u,c,h,d,f,p=10,g=p,m=90,v=360,y=2.5;return e.lines=function(){return t().map((function(e){return{type:"LineString",coordinates:e}}))},e.outline=function(){return{type:"Polygon",coordinates:[d(s).concat(f(l).slice(1),d(r).reverse().slice(1),f(u).reverse().slice(1))]}},e.extent=function(t){return arguments.length?e.majorExtent(t).minorExtent(t):e.minorExtent()},e.majorExtent=function(t){return arguments.length?(s=+t[0][0],r=+t[1][0],u=+t[0][1],l=+t[1][1],s>r&&(t=s,s=r,r=t),u>l&&(t=u,u=l,l=t),e.precision(y)):[[s,u],[r,l]]},e.minorExtent=function(t){return arguments.length?(i=+t[0][0],n=+t[1][0],a=+t[0][1],o=+t[1][1],i>n&&(t=i,i=n,n=t),a>o&&(t=a,a=o,o=t),e.precision(y)):[[i,a],[n,o]]},e.step=function(t){return arguments.length?e.majorStep(t).minorStep(t):e.minorStep()},e.majorStep=function(t){return arguments.length?(m=+t[0],v=+t[1],e):[m,v]},e.minorStep=function(t){return arguments.length?(p=+t[0],g=+t[1],e):[p,g]},e.precision=function(t){return arguments.length?(y=+t,c=tn(a,o,90),h=nn(i,n,y),d=tn(u,l,90),f=nn(s,r,y),e):y},e.majorExtent([[-180,-90+Bs],[180,90-Bs]]).minorExtent([[-180,-80-Bs],[180,80+Bs]])},fs.geo.greatArc=function(){function e(){return{type:"LineString",coordinates:[t||i.apply(this,arguments),n||r.apply(this,arguments)]}}var t,n,i=rn,r=sn;return e.distance=function(){return fs.geo.distance(t||i.apply(this,arguments),n||r.apply(this,arguments))},e.source=function(n){return arguments.length?(i=n,t="function"==typeof n?null:n,e):i},e.target=function(t){return arguments.length?(r=t,n="function"==typeof t?null:t,e):r},e.precision=function(){return arguments.length?e:0},e},fs.geo.interpolate=function(e,t){return function(e,t,n,i){var r=Math.cos(t),s=Math.sin(t),o=Math.cos(i),a=Math.sin(i),l=r*Math.cos(e),u=r*Math.sin(e),c=o*Math.cos(n),h=o*Math.sin(n),d=2*Math.asin(Math.sqrt(te(i-t)+r*o*te(n-e))),f=1/Math.sin(d),p=d?function(e){var t=Math.sin(e*=d)*f,n=Math.sin(d-e)*f,i=n*l+t*c,r=n*u+t*h,o=n*s+t*a;return[Math.atan2(r,i)*Ys,Math.atan2(o,Math.sqrt(i*i+r*r))*Ys]}:function(){return[e*Ys,t*Ys]};return p.distance=d,p}(e[0]*qs,e[1]*qs,t[0]*qs,t[1]*qs)},fs.geo.length=function(e){return Xo=0,fs.geo.stream(e,Zo),Xo};var Xo,Zo={sphere:w,point:w,lineStart:function(){function e(e,r){var s=Math.sin(r*=qs),o=Math.cos(r),a=xs((e*=qs)-t),l=Math.cos(a);Xo+=Math.atan2(Math.sqrt((a=o*Math.sin(a))*a+(a=i*s-n*o*l)*a),n*s+i*o*l),t=e,n=s,i=o}var t,n,i;Zo.point=function(r,s){t=r*qs,n=Math.sin(s*=qs),i=Math.cos(s),Zo.point=e},Zo.lineEnd=function(){Zo.point=Zo.lineEnd=w}},lineEnd:w,polygonStart:w,polygonEnd:w},ea=on((function(e){return Math.sqrt(2/(1+e))}),(function(e){return 2*Math.asin(e/2)}));(fs.geo.azimuthalEqualArea=function(){return zt(ea)}).raw=ea;var ta=on((function(e){var t=Math.acos(e);return t&&t/Math.sin(t)}),v);(fs.geo.azimuthalEquidistant=function(){return zt(ta)}).raw=ta,(fs.geo.conicConformal=function(){return Tt(an)}).raw=an,(fs.geo.conicEquidistant=function(){return Tt(ln)}).raw=ln;var na=on((function(e){return 1/e}),Math.atan);(fs.geo.gnomonic=function(){return zt(na)}).raw=na,un.invert=function(e,t){return[e,2*Math.atan(Math.exp(t))-Vs]},(fs.geo.mercator=function(){return cn(un)}).raw=un;var ia=on((function(){return 1}),Math.asin);(fs.geo.orthographic=function(){return zt(ia)}).raw=ia;var ra=on((function(e){return 1/(1+e)}),(function(e){return 2*Math.atan(e)}));(fs.geo.stereographic=function(){return zt(ra)}).raw=ra,hn.invert=function(e,t){return[-t,2*Math.atan(Math.exp(e))-Vs]},(fs.geo.transverseMercator=function(){var e=cn(hn),t=e.center,n=e.rotate;return e.center=function(e){return e?t([-e[1],e[0]]):[(e=t())[1],-e[0]]},e.rotate=function(e){return e?n([e[0],e[1],e.length>2?e[2]+90:90]):[(e=n())[0],e[1],e[2]-90]},n([0,0,90])}).raw=hn,fs.geom={},fs.geom.hull=function(e){function t(e){if(e.length<3)return[];var t,r=Se(n),s=Se(i),o=e.length,a=[],l=[];for(t=0;o>t;t++)a.push([+r.call(this,e[t],t),+s.call(this,e[t],t),t]);for(a.sort(gn),t=0;o>t;t++)l.push([a[t][0],-a[t][1]]);var u=pn(a),c=pn(l),h=c[0]===u[0],d=c[c.length-1]===u[u.length-1],f=[];for(t=u.length-1;t>=0;--t)f.push(e[a[u[t]][2]]);for(t=+h;t<c.length-d;++t)f.push(e[a[c[t]][2]]);return f}var n=dn,i=fn;return arguments.length?t(e):(t.x=function(e){return arguments.length?(n=e,t):n},t.y=function(e){return arguments.length?(i=e,t):i},t)},fs.geom.polygon=function(e){return As(e,sa),e};var sa=fs.geom.polygon.prototype=[];sa.area=function(){for(var e,t=-1,n=this.length,i=this[n-1],r=0;++t<n;)e=i,i=this[t],r+=e[1]*i[0]-e[0]*i[1];return.5*r},sa.centroid=function(e){var t,n,i=-1,r=this.length,s=0,o=0,a=this[r-1];for(arguments.length||(e=-1/(6*this.area()));++i<r;)t=a,a=this[i],n=t[0]*a[1]-a[0]*t[1],s+=(t[0]+a[0])*n,o+=(t[1]+a[1])*n;return[s*e,o*e]},sa.clip=function(e){for(var t,n,i,r,s,o,a=yn(e),l=-1,u=this.length-yn(this),c=this[u-1];++l<u;){for(t=e.slice(),e.length=0,r=this[l],s=t[(i=t.length-a)-1],n=-1;++n<i;)mn(o=t[n],c,r)?(mn(s,c,r)||e.push(vn(s,o,c,r)),e.push(o)):mn(s,c,r)&&e.push(vn(s,o,c,r)),s=o;a&&e.push(e[0]),c=r}return e};var oa,aa,la,ua,ca,ha=[],da=[];_n.prototype.prepare=function(){for(var e,t=this.edges,n=t.length;n--;)(e=t[n].edge).b&&e.a||t.splice(n,1);return t.sort(Mn),t.length},On.prototype={start:function(){return this.edge.l===this.site?this.edge.a:this.edge.b},end:function(){return this.edge.l===this.site?this.edge.b:this.edge.a}},Nn.prototype={insert:function(e,t){var n,i,r;if(e){if(t.P=e,t.N=e.N,e.N&&(e.N.P=t),e.N=t,e.R){for(e=e.R;e.L;)e=e.L;e.L=t}else e.R=t;n=e}else this._?(e=Un(this._),t.P=null,t.N=e,e.P=e.L=t,n=e):(t.P=t.N=null,this._=t,n=null);for(t.L=t.R=null,t.U=n,t.C=!0,e=t;n&&n.C;)n===(i=n.U).L?(r=i.R)&&r.C?(n.C=r.C=!1,i.C=!0,e=i):(e===n.R&&(jn(this,n),n=(e=n).U),n.C=!1,i.C=!0,Bn(this,i)):(r=i.L)&&r.C?(n.C=r.C=!1,i.C=!0,e=i):(e===n.L&&(Bn(this,n),n=(e=n).U),n.C=!1,i.C=!0,jn(this,i)),n=e.U;this._.C=!1},remove:function(e){e.N&&(e.N.P=e.P),e.P&&(e.P.N=e.N),e.N=e.P=null;var t,n,i,r=e.U,s=e.L,o=e.R;if(n=s?o?Un(o):s:o,r?r.L===e?r.L=n:r.R=n:this._=n,s&&o?(i=n.C,n.C=e.C,n.L=s,s.U=n,n!==o?(r=n.U,n.U=e.U,e=n.R,r.L=e,n.R=o,o.U=n):(n.U=r,r=n,e=n.R)):(i=e.C,e=n),e&&(e.U=r),!i){if(e&&e.C)return void(e.C=!1);do{if(e===this._)break;if(e===r.L){if((t=r.R).C&&(t.C=!1,r.C=!0,jn(this,r),t=r.R),t.L&&t.L.C||t.R&&t.R.C){t.R&&t.R.C||(t.L.C=!1,t.C=!0,Bn(this,t),t=r.R),t.C=r.C,r.C=t.R.C=!1,jn(this,r),e=this._;break}}else if((t=r.L).C&&(t.C=!1,r.C=!0,Bn(this,r),t=r.L),t.L&&t.L.C||t.R&&t.R.C){t.L&&t.L.C||(t.R.C=!1,t.C=!0,jn(this,t),t=r.L),t.C=r.C,r.C=t.L.C=!1,Bn(this,r),e=this._;break}t.C=!0,e=r,r=r.U}while(!e.C);e&&(e.C=!1)}}},fs.geom.voronoi=function(e){function t(e){var t=new Array(e.length),i=a[0][0],r=a[0][1],s=a[1][0],o=a[1][1];return Hn(n(e),a).cells.forEach((function(n,a){var l=n.edges,u=n.site,c=t[a]=l.length?l.map((function(e){var t=e.start();return[t.x,t.y]})):u.x>=i&&u.x<=s&&u.y>=r&&u.y<=o?[[i,o],[s,o],[s,r],[i,r]]:[];c.point=e[a]})),t}function n(e){return e.map((function(e,t){return{x:Math.round(s(e,t)/Bs)*Bs,y:Math.round(o(e,t)/Bs)*Bs,i:t}}))}var i=dn,r=fn,s=i,o=r,a=fa;return e?t(e):(t.links=function(e){return Hn(n(e)).edges.filter((function(e){return e.l&&e.r})).map((function(t){return{source:e[t.l.i],target:e[t.r.i]}}))},t.triangles=function(e){var t=[];return Hn(n(e)).cells.forEach((function(n,i){for(var r,s=n.site,o=n.edges.sort(Mn),a=-1,l=o.length,u=o[l-1].edge,c=u.l===s?u.r:u.l;++a<l;)u,r=c,c=(u=o[a].edge).l===s?u.r:u.l,i<r.i&&i<c.i&&zn(s,r,c)<0&&t.push([e[i],e[r.i],e[c.i]])})),t},t.x=function(e){return arguments.length?(s=Se(i=e),t):i},t.y=function(e){return arguments.length?(o=Se(r=e),t):r},t.clipExtent=function(e){return arguments.length?(a=null==e?fa:e,t):a===fa?null:a},t.size=function(e){return arguments.length?t.clipExtent(e&&[[0,0],e]):a===fa?null:a&&a[1]},t)};var fa=[[-1e6,-1e6],[1e6,1e6]];fs.geom.delaunay=function(e){return fs.geom.voronoi().triangles(e)},fs.geom.quadtree=function(e,t,n,i,r){function s(e){function s(e,t,n,i,r,s,o,a){if(!isNaN(n)&&!isNaN(i))if(e.leaf){var l=e.x,c=e.y;if(null!=l)if(xs(l-n)+xs(c-i)<.01)u(e,t,n,i,r,s,o,a);else{var h=e.point;e.x=e.y=e.point=null,u(e,h,l,c,r,s,o,a),u(e,t,n,i,r,s,o,a)}else e.x=n,e.y=i,e.point=t}else u(e,t,n,i,r,s,o,a)}function u(e,t,n,i,r,o,a,l){var u=.5*(r+a),c=.5*(o+l),h=n>=u,d=i>=c,f=d<<1|h;e.leaf=!1,h?r=u:a=u,d?o=c:l=c,s(e=e.nodes[f]||(e.nodes[f]={leaf:!0,nodes:[],point:null,x:null,y:null}),t,n,i,r,o,a,l)}var c,h,d,f,p,g,m,v,y,$=Se(a),w=Se(l);if(null!=t)g=t,m=n,v=i,y=r;else if(v=y=-(g=m=1/0),h=[],d=[],p=e.length,o)for(f=0;p>f;++f)(c=e[f]).x<g&&(g=c.x),c.y<m&&(m=c.y),c.x>v&&(v=c.x),c.y>y&&(y=c.y),h.push(c.x),d.push(c.y);else for(f=0;p>f;++f){var b=+$(c=e[f],f),S=+w(c,f);g>b&&(g=b),m>S&&(m=S),b>v&&(v=b),S>y&&(y=S),h.push(b),d.push(S)}var x=v-g,C=y-m;x>C?y=m+x:v=g+C;var k={leaf:!0,nodes:[],point:null,x:null,y:null,add:function(e){s(k,e,+$(e,++f),+w(e,f),g,m,v,y)}};if(k.visit=function(e){Yn(e,k,g,m,v,y)},k.find=function(e){return function(e,t,n,i,r,s,o){var a,l=1/0;return function e(u,c,h,d,f){if(!(c>s||h>o||i>d||r>f)){if(p=u.point){var p,g=t-u.x,m=n-u.y,v=g*g+m*m;if(l>v){var y=Math.sqrt(l=v);i=t-y,r=n-y,s=t+y,o=n+y,a=p}}for(var $=u.nodes,w=.5*(c+d),b=.5*(h+f),S=(n>=b)<<1|t>=w,x=S+4;x>S;++S)if(u=$[3&S])switch(3&S){case 0:e(u,c,h,w,b);break;case 1:e(u,w,h,d,b);break;case 2:e(u,c,b,w,f);break;case 3:e(u,w,b,d,f)}}}(e,i,r,s,o),a}(k,e[0],e[1],g,m,v,y)},f=-1,null==t){for(;++f<p;)s(k,e[f],h[f],d[f],g,m,v,y);--f}else e.forEach(k.add);return h=d=e=c=null,k}var o,a=dn,l=fn;return(o=arguments.length)?(a=Vn,l=qn,3===o&&(r=n,i=t,n=t=0),s(e)):(s.x=function(e){return arguments.length?(a=e,s):a},s.y=function(e){return arguments.length?(l=e,s):l},s.extent=function(e){return arguments.length?(null==e?t=n=i=r=null:(t=+e[0][0],n=+e[0][1],i=+e[1][0],r=+e[1][1]),s):null==t?null:[[t,n],[i,r]]},s.size=function(e){return arguments.length?(null==e?t=n=i=r=null:(t=n=0,i=+e[0],r=+e[1]),s):null==t?null:[i-t,r-n]},s)},fs.interpolateRgb=Gn,fs.interpolateObject=Kn,fs.interpolateNumber=Qn,fs.interpolateString=Jn;var pa=/[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g,ga=new RegExp(pa.source,"g");fs.interpolate=Xn,fs.interpolators=[function(e,t){var n=typeof t;return("string"===n?oo.has(t.toLowerCase())||/^(#|rgb\(|hsl\()/i.test(t)?Gn:Jn:t instanceof ne?Gn:Array.isArray(t)?Zn:"object"===n&&isNaN(t)?Kn:Qn)(e,t)}],fs.interpolateArray=Zn;var ma=function(){return v},va=fs.map({linear:ma,poly:function(e){return function(t){return Math.pow(t,e)}},quad:function(){return ni},cubic:function(){return ii},sin:function(){return si},exp:function(){return oi},circle:function(){return ai},elastic:function(e,t){var n;return arguments.length<2&&(t=.45),arguments.length?n=t/Ws*Math.asin(1/e):(e=1,n=t/4),function(i){return 1+e*Math.pow(2,-10*i)*Math.sin((i-n)*Ws/t)}},back:function(e){return e||(e=1.70158),function(t){return t*t*((e+1)*t-e)}},bounce:function(){return li}}),ya=fs.map({in:v,out:ei,"in-out":ti,"out-in":function(e){return ti(ei(e))}});fs.ease=function(e){var t=e.indexOf("-"),n=t>=0?e.slice(0,t):e,i=t>=0?e.slice(t+1):"in";return n=va.get(n)||ma,function(e){return function(t){return 0>=t?0:t>=1?1:e(t)}}((i=ya.get(i)||v)(n.apply(null,ps.call(arguments,1))))},fs.interpolateHcl=function(e,t){e=fs.hcl(e),t=fs.hcl(t);var n=e.h,i=e.c,r=e.l,s=t.h-n,o=t.c-i,a=t.l-r;return isNaN(o)&&(o=0,i=isNaN(i)?t.c:i),isNaN(s)?(s=0,n=isNaN(n)?t.h:n):s>180?s-=360:-180>s&&(s+=360),function(e){return oe(n+s*e,i+o*e,r+a*e)+""}},fs.interpolateHsl=function(e,t){e=fs.hsl(e),t=fs.hsl(t);var n=e.h,i=e.s,r=e.l,s=t.h-n,o=t.s-i,a=t.l-r;return isNaN(o)&&(o=0,i=isNaN(i)?t.s:i),isNaN(s)?(s=0,n=isNaN(n)?t.h:n):s>180?s-=360:-180>s&&(s+=360),function(e){return re(n+s*e,i+o*e,r+a*e)+""}},fs.interpolateLab=function(e,t){e=fs.lab(e),t=fs.lab(t);var n=e.l,i=e.a,r=e.b,s=t.l-n,o=t.a-i,a=t.b-r;return function(e){return le(n+s*e,i+o*e,r+a*e)+""}},fs.interpolateRound=ui,fs.transform=function(e){var t=ms.createElementNS(fs.ns.prefix.svg,"g");return(fs.transform=function(e){if(null!=e){t.setAttribute("transform",e);var n=t.transform.baseVal.consolidate()}return new ci(n?n.matrix:$a)})(e)},ci.prototype.toString=function(){return"translate("+this.translate+")rotate("+this.rotate+")skewX("+this.skew+")scale("+this.scale+")"};var $a={a:1,b:0,c:0,d:1,e:0,f:0};fs.interpolateTransform=pi,fs.layout={},fs.layout.bundle=function(){return function(e){for(var t=[],n=-1,i=e.length;++n<i;)t.push(vi(e[n]));return t}},fs.layout.chord=function(){function e(){var e,u,h,d,f,p={},g=[],m=fs.range(s),v=[];for(n=[],i=[],e=0,d=-1;++d<s;){for(u=0,f=-1;++f<s;)u+=r[d][f];g.push(u),v.push(fs.range(s)),e+=u}for(o&&m.sort((function(e,t){return o(g[e],g[t])})),a&&v.forEach((function(e,t){e.sort((function(e,n){return a(r[t][e],r[t][n])}))})),e=(Ws-c*s)/e,u=0,d=-1;++d<s;){for(h=u,f=-1;++f<s;){var y=m[d],$=v[y][f],w=r[y][$],b=u,S=u+=w*e;p[y+"-"+$]={index:y,subindex:$,startAngle:b,endAngle:S,value:w}}i[y]={index:y,startAngle:h,endAngle:u,value:g[y]},u+=c}for(d=-1;++d<s;)for(f=d-1;++f<s;){var x=p[d+"-"+f],C=p[f+"-"+d];(x.value||C.value)&&n.push(x.value<C.value?{source:C,target:x}:{source:x,target:C})}l&&t()}function t(){n.sort((function(e,t){return l((e.source.value+e.target.value)/2,(t.source.value+t.target.value)/2)}))}var n,i,r,s,o,a,l,u={},c=0;return u.matrix=function(e){return arguments.length?(s=(r=e)&&r.length,n=i=null,u):r},u.padding=function(e){return arguments.length?(c=e,n=i=null,u):c},u.sortGroups=function(e){return arguments.length?(o=e,n=i=null,u):o},u.sortSubgroups=function(e){return arguments.length?(a=e,n=null,u):a},u.sortChords=function(e){return arguments.length?(l=e,n&&t(),u):l},u.chords=function(){return n||e(),n},u.groups=function(){return i||e(),i},u},fs.layout.force=function(){function e(e){return function(t,n,i,r){if(t.point!==e){var s=t.cx-e.x,o=t.cy-e.y,a=r-n,l=s*s+o*o;if(l>a*a/y){if(g>l){var u=t.charge/l;e.px-=s*u,e.py-=o*u}return!0}if(t.point&&l&&g>l){u=t.pointCharge/l;e.px-=s*u,e.py-=o*u}}return!t.charge}}function t(e){e.px=fs.event.x,e.py=fs.event.y,l.resume()}var n,i,r,s,o,a,l={},u=fs.dispatch("start","tick","end"),c=[1,1],h=.9,d=wa,f=ba,p=-30,g=Sa,m=.1,y=.64,$=[],w=[];return l.tick=function(){if((r*=.99)<.005)return n=null,u.end({type:"end",alpha:r=0}),!0;var t,i,l,d,f,g,v,y,b,S=$.length,x=w.length;for(i=0;x>i;++i)d=(l=w[i]).source,(g=(y=(f=l.target).x-d.x)*y+(b=f.y-d.y)*b)&&(y*=g=r*o[i]*((g=Math.sqrt(g))-s[i])/g,b*=g,f.x-=y*(v=d.weight+f.weight?d.weight/(d.weight+f.weight):.5),f.y-=b*v,d.x+=y*(v=1-v),d.y+=b*v);if((v=r*m)&&(y=c[0]/2,b=c[1]/2,i=-1,v))for(;++i<S;)(l=$[i]).x+=(y-l.x)*v,l.y+=(b-l.y)*v;if(p)for(xi(t=fs.geom.quadtree($),r,a),i=-1;++i<S;)(l=$[i]).fixed||t.visit(e(l));for(i=-1;++i<S;)(l=$[i]).fixed?(l.x=l.px,l.y=l.py):(l.x-=(l.px-(l.px=l.x))*h,l.y-=(l.py-(l.py=l.y))*h);u.tick({type:"tick",alpha:r})},l.nodes=function(e){return arguments.length?($=e,l):$},l.links=function(e){return arguments.length?(w=e,l):w},l.size=function(e){return arguments.length?(c=e,l):c},l.linkDistance=function(e){return arguments.length?(d="function"==typeof e?e:+e,l):d},l.distance=l.linkDistance,l.linkStrength=function(e){return arguments.length?(f="function"==typeof e?e:+e,l):f},l.friction=function(e){return arguments.length?(h=+e,l):h},l.charge=function(e){return arguments.length?(p="function"==typeof e?e:+e,l):p},l.chargeDistance=function(e){return arguments.length?(g=e*e,l):Math.sqrt(g)},l.gravity=function(e){return arguments.length?(m=+e,l):m},l.theta=function(e){return arguments.length?(y=e*e,l):Math.sqrt(y)},l.alpha=function(e){return arguments.length?(e=+e,r?e>0?r=e:(n.c=null,n.t=NaN,n=null,u.end({type:"end",alpha:r=0})):e>0&&(u.start({type:"start",alpha:r=e}),n=ke(l.tick)),l):r},l.start=function(){function e(e,i){if(!n){for(n=new Array(r),l=0;r>l;++l)n[l]=[];for(l=0;u>l;++l){var s=w[l];n[s.source.index].push(s.target),n[s.target.index].push(s.source)}}for(var o,a=n[t],l=-1,c=a.length;++l<c;)if(!isNaN(o=a[l][e]))return o;return Math.random()*i}var t,n,i,r=$.length,u=w.length,h=c[0],g=c[1];for(t=0;r>t;++t)(i=$[t]).index=t,i.weight=0;for(t=0;u>t;++t)"number"==typeof(i=w[t]).source&&(i.source=$[i.source]),"number"==typeof i.target&&(i.target=$[i.target]),++i.source.weight,++i.target.weight;for(t=0;r>t;++t)i=$[t],isNaN(i.x)&&(i.x=e("x",h)),isNaN(i.y)&&(i.y=e("y",g)),isNaN(i.px)&&(i.px=i.x),isNaN(i.py)&&(i.py=i.y);if(s=[],"function"==typeof d)for(t=0;u>t;++t)s[t]=+d.call(this,w[t],t);else for(t=0;u>t;++t)s[t]=d;if(o=[],"function"==typeof f)for(t=0;u>t;++t)o[t]=+f.call(this,w[t],t);else for(t=0;u>t;++t)o[t]=f;if(a=[],"function"==typeof p)for(t=0;r>t;++t)a[t]=+p.call(this,$[t],t);else for(t=0;r>t;++t)a[t]=p;return l.resume()},l.resume=function(){return l.alpha(.1)},l.stop=function(){return l.alpha(0)},l.drag=function(){return i||(i=fs.behavior.drag().origin(v).on("dragstart.force",$i).on("drag.force",t).on("dragend.force",wi)),arguments.length?void this.on("mouseover.force",bi).on("mouseout.force",Si).call(i):i},fs.rebind(l,u,"on")};var wa=20,ba=1,Sa=1/0;fs.layout.hierarchy=function(){function e(r){var s,o=[r],a=[];for(r.depth=0;null!=(s=o.pop());)if(a.push(s),(u=n.call(e,s,s.depth))&&(l=u.length)){for(var l,u,c;--l>=0;)o.push(c=u[l]),c.parent=s,c.depth=s.depth+1;i&&(s.value=0),s.children=u}else i&&(s.value=+i.call(e,s,s.depth)||0),delete s.children;return _i(r,(function(e){var n,r;t&&(n=e.children)&&n.sort(t),i&&(r=e.parent)&&(r.value+=e.value)})),a}var t=Ei,n=Mi,i=Ai;return e.sort=function(n){return arguments.length?(t=n,e):t},e.children=function(t){return arguments.length?(n=t,e):n},e.value=function(t){return arguments.length?(i=t,e):i},e.revalue=function(t){return i&&(ki(t,(function(e){e.children&&(e.value=0)})),_i(t,(function(t){var n;t.children||(t.value=+i.call(e,t,t.depth)||0),(n=t.parent)&&(n.value+=t.value)}))),t},e},fs.layout.partition=function(){function e(t,n,i,r){var s=t.children;if(t.x=n,t.y=t.depth*r,t.dx=i,t.dy=r,s&&(o=s.length)){var o,a,l,u=-1;for(i=t.value?i/t.value:0;++u<o;)e(a=s[u],n,l=a.value*i,r),n+=l}}function t(e){var n=e.children,i=0;if(n&&(r=n.length))for(var r,s=-1;++s<r;)i=Math.max(i,t(n[s]));return 1+i}function n(n,s){var o=i.call(this,n,s);return e(o[0],0,r[0],r[1]/t(o[0])),o}var i=fs.layout.hierarchy(),r=[1,1];return n.size=function(e){return arguments.length?(r=e,n):r},Ci(n,i)},fs.layout.pie=function(){function e(o){var a,l=o.length,u=o.map((function(n,i){return+t.call(e,n,i)})),c=+("function"==typeof i?i.apply(this,arguments):i),h=("function"==typeof r?r.apply(this,arguments):r)-c,d=Math.min(Math.abs(h)/l,+("function"==typeof s?s.apply(this,arguments):s)),f=d*(0>h?-1:1),p=fs.sum(u),g=p?(h-l*f)/p:0,m=fs.range(l),v=[];return null!=n&&m.sort(n===xa?function(e,t){return u[t]-u[e]}:function(e,t){return n(o[e],o[t])}),m.forEach((function(e){v[e]={data:o[e],value:a=u[e],startAngle:c,endAngle:c+=a*g+f,padAngle:d}})),v}var t=Number,n=xa,i=0,r=Ws,s=0;return e.value=function(n){return arguments.length?(t=n,e):t},e.sort=function(t){return arguments.length?(n=t,e):n},e.startAngle=function(t){return arguments.length?(i=t,e):i},e.endAngle=function(t){return arguments.length?(r=t,e):r},e.padAngle=function(t){return arguments.length?(s=t,e):s},e};var xa={};fs.layout.stack=function(){function e(a,l){if(!(d=a.length))return a;var u=a.map((function(n,i){return t.call(e,n,i)})),c=u.map((function(t){return t.map((function(t,n){return[s.call(e,t,n),o.call(e,t,n)]}))})),h=n.call(e,c,l);u=fs.permute(u,h),c=fs.permute(c,h);var d,f,p,g,m=i.call(e,c,l),v=u[0].length;for(p=0;v>p;++p)for(r.call(e,u[0][p],g=m[p],c[0][p][1]),f=1;d>f;++f)r.call(e,u[f][p],g+=c[f-1][p][1],c[f][p][1]);return a}var t=v,n=Ii,i=Di,r=Pi,s=Ti,o=Li;return e.values=function(n){return arguments.length?(t=n,e):t},e.order=function(t){return arguments.length?(n="function"==typeof t?t:Ca.get(t)||Ii,e):n},e.offset=function(t){return arguments.length?(i="function"==typeof t?t:ka.get(t)||Di,e):i},e.x=function(t){return arguments.length?(s=t,e):s},e.y=function(t){return arguments.length?(o=t,e):o},e.out=function(t){return arguments.length?(r=t,e):r},e};var Ca=fs.map({"inside-out":function(e){var t,n,i=e.length,r=e.map(Oi),s=e.map(Ni),o=fs.range(i).sort((function(e,t){return r[e]-r[t]})),a=0,l=0,u=[],c=[];for(t=0;i>t;++t)n=o[t],l>a?(a+=s[n],u.push(n)):(l+=s[n],c.push(n));return c.reverse().concat(u)},reverse:function(e){return fs.range(e.length).reverse()},default:Ii}),ka=fs.map({silhouette:function(e){var t,n,i,r=e.length,s=e[0].length,o=[],a=0,l=[];for(n=0;s>n;++n){for(t=0,i=0;r>t;t++)i+=e[t][n][1];i>a&&(a=i),o.push(i)}for(n=0;s>n;++n)l[n]=(a-o[n])/2;return l},wiggle:function(e){var t,n,i,r,s,o,a,l,u,c=e.length,h=e[0],d=h.length,f=[];for(f[0]=l=u=0,n=1;d>n;++n){for(t=0,r=0;c>t;++t)r+=e[t][n][1];for(t=0,s=0,a=h[n][0]-h[n-1][0];c>t;++t){for(i=0,o=(e[t][n][1]-e[t][n-1][1])/(2*a);t>i;++i)o+=(e[i][n][1]-e[i][n-1][1])/a;s+=o*e[t][n][1]}f[n]=l-=r?s/r*a:0,u>l&&(u=l)}for(n=0;d>n;++n)f[n]-=u;return f},expand:function(e){var t,n,i,r=e.length,s=e[0].length,o=1/r,a=[];for(n=0;s>n;++n){for(t=0,i=0;r>t;t++)i+=e[t][n][1];if(i)for(t=0;r>t;t++)e[t][n][1]/=i;else for(t=0;r>t;t++)e[t][n][1]=o}for(n=0;s>n;++n)a[n]=0;return a},zero:Di});fs.layout.histogram=function(){function e(e,s){for(var o,a,l=[],u=e.map(n,this),c=i.call(this,u,s),h=r.call(this,c,u,s),d=(s=-1,u.length),f=h.length-1,p=t?1:1/d;++s<f;)(o=l[s]=[]).dx=h[s+1]-(o.x=h[s]),o.y=0;if(f>0)for(s=-1;++s<d;)(a=u[s])>=c[0]&&a<=c[1]&&((o=l[fs.bisect(h,a,1,f)-1]).y+=p,o.push(e[s]));return l}var t=!0,n=Number,i=Ui,r=ji;return e.value=function(t){return arguments.length?(n=t,e):n},e.range=function(t){return arguments.length?(i=Se(t),e):i},e.bins=function(t){return arguments.length?(r="number"==typeof t?function(e){return Bi(e,t)}:Se(t),e):r},e.frequency=function(n){return arguments.length?(t=!!n,e):t},e},fs.layout.pack=function(){function e(e,s){var o=n.call(this,e,s),a=o[0],l=r[0],u=r[1],c=null==t?Math.sqrt:"function"==typeof t?t:function(){return t};if(a.x=a.y=0,_i(a,(function(e){e.r=+c(e.value)})),_i(a,qi),i){var h=i*(t?1:Math.max(2*a.r/l,2*a.r/u))/2;_i(a,(function(e){e.r+=h})),_i(a,qi),_i(a,(function(e){e.r-=h}))}return Ki(a,l/2,u/2,t?1:1/Math.max(2*a.r/l,2*a.r/u)),o}var t,n=fs.layout.hierarchy().sort(Hi),i=0,r=[1,1];return e.size=function(t){return arguments.length?(r=t,e):r},e.radius=function(n){return arguments.length?(t=null==n||"function"==typeof n?n:+n,e):t},e.padding=function(t){return arguments.length?(i=+t,e):i},Ci(e,n)},fs.layout.tree=function(){function e(e,l){var u=r.call(this,e,l),c=u[0],h=function(e){for(var t,n={A:null,children:[e]},i=[n];null!=(t=i.pop());)for(var r,s=t.children,o=0,a=s.length;a>o;++o)i.push((s[o]=r={_:s[o],parent:t,children:(r=s[o].children)&&r.slice()||[],A:null,a:null,z:0,m:0,c:0,s:0,t:null,i:o}).a=r);return n.children[0]}(c);if(_i(h,t),h.parent.m=-h.z,ki(h,n),a)ki(c,i);else{var d=c,f=c,p=c;ki(c,(function(e){e.x<d.x&&(d=e),e.x>f.x&&(f=e),e.depth>p.depth&&(p=e)}));var g=s(d,f)/2-d.x,m=o[0]/(f.x+s(f,d)/2+g),v=o[1]/(p.depth||1);ki(c,(function(e){e.x=(e.x+g)*m,e.y=e.depth*v}))}return u}function t(e){var t=e.children,n=e.parent.children,i=e.i?n[e.i-1]:null;if(t.length){!function(e){for(var t,n=0,i=0,r=e.children,s=r.length;--s>=0;)(t=r[s]).z+=n,t.m+=n,n+=t.s+(i+=t.c)}(e);var r=(t[0].z+t[t.length-1].z)/2;i?(e.z=i.z+s(e._,i._),e.m=e.z-r):e.z=r}else i&&(e.z=i.z+s(e._,i._));e.parent.A=function(e,t,n){if(t){for(var i,r=e,o=e,a=t,l=r.parent.children[0],u=r.m,c=o.m,h=a.m,d=l.m;a=Zi(a),r=Xi(r),a&&r;)l=Xi(l),(o=Zi(o)).a=e,(i=a.z+h-r.z-u+s(a._,r._))>0&&(er(tr(a,e,n),e,i),u+=i,c+=i),h+=a.m,u+=r.m,d+=l.m,c+=o.m;a&&!Zi(o)&&(o.t=a,o.m+=h-c),r&&!Xi(l)&&(l.t=r,l.m+=u-d,n=e)}return n}(e,i,e.parent.A||n[0])}function n(e){e._.x=e.z+e.parent.m,e.m+=e.parent.m}function i(e){e.x*=o[0],e.y=e.depth*o[1]}var r=fs.layout.hierarchy().sort(null).value(null),s=Ji,o=[1,1],a=null;return e.separation=function(t){return arguments.length?(s=t,e):s},e.size=function(t){return arguments.length?(a=null==(o=t)?i:null,e):a?null:o},e.nodeSize=function(t){return arguments.length?(a=null==(o=t)?null:i,e):a?o:null},Ci(e,r)},fs.layout.cluster=function(){function e(e,s){var o,a=t.call(this,e,s),l=a[0],u=0;_i(l,(function(e){var t=e.children;t&&t.length?(e.x=function(e){return e.reduce((function(e,t){return e+t.x}),0)/e.length}(t),e.y=function(e){return 1+fs.max(e,(function(e){return e.y}))}(t)):(e.x=o?u+=n(e,o):0,e.y=0,o=e)}));var c=nr(l),h=ir(l),d=c.x-n(c,h)/2,f=h.x+n(h,c)/2;return _i(l,r?function(e){e.x=(e.x-l.x)*i[0],e.y=(l.y-e.y)*i[1]}:function(e){e.x=(e.x-d)/(f-d)*i[0],e.y=(1-(l.y?e.y/l.y:1))*i[1]}),a}var t=fs.layout.hierarchy().sort(null).value(null),n=Ji,i=[1,1],r=!1;return e.separation=function(t){return arguments.length?(n=t,e):n},e.size=function(t){return arguments.length?(r=null==(i=t),e):r?null:i},e.nodeSize=function(t){return arguments.length?(r=null!=(i=t),e):r?i:null},Ci(e,t)},fs.layout.treemap=function(){function e(e,t){for(var n,i,r=-1,s=e.length;++r<s;)i=(n=e[r]).value*(0>t?0:t),n.area=isNaN(i)||0>=i?0:i}function t(n){var s=n.children;if(s&&s.length){var o,a,l,u=h(n),c=[],d=s.slice(),p=1/0,g="slice"===f?u.dx:"dice"===f?u.dy:"slice-dice"===f?1&n.depth?u.dy:u.dx:Math.min(u.dx,u.dy);for(e(d,u.dx*u.dy/n.value),c.area=0;(l=d.length)>0;)c.push(o=d[l-1]),c.area+=o.area,"squarify"!==f||(a=i(c,g))<=p?(d.pop(),p=a):(c.area-=c.pop().area,r(c,g,u,!1),g=Math.min(u.dx,u.dy),c.length=c.area=0,p=1/0);c.length&&(r(c,g,u,!0),c.length=c.area=0),s.forEach(t)}}function n(t){var i=t.children;if(i&&i.length){var s,o=h(t),a=i.slice(),l=[];for(e(a,o.dx*o.dy/t.value),l.area=0;s=a.pop();)l.push(s),l.area+=s.area,null!=s.z&&(r(l,s.z?o.dx:o.dy,o,!a.length),l.length=l.area=0);i.forEach(n)}}function i(e,t){for(var n,i=e.area,r=0,s=1/0,o=-1,a=e.length;++o<a;)(n=e[o].area)&&(s>n&&(s=n),n>r&&(r=n));return t*=t,(i*=i)?Math.max(t*r*p/i,i/(t*s*p)):1/0}function r(e,t,n,i){var r,s=-1,o=e.length,a=n.x,u=n.y,c=t?l(e.area/t):0;if(t==n.dx){for((i||c>n.dy)&&(c=n.dy);++s<o;)(r=e[s]).x=a,r.y=u,r.dy=c,a+=r.dx=Math.min(n.x+n.dx-a,c?l(r.area/c):0);r.z=!0,r.dx+=n.x+n.dx-a,n.y+=c,n.dy-=c}else{for((i||c>n.dx)&&(c=n.dx);++s<o;)(r=e[s]).x=a,r.y=u,r.dx=c,u+=r.dy=Math.min(n.y+n.dy-u,c?l(r.area/c):0);r.z=!1,r.dy+=n.y+n.dy-u,n.x+=c,n.dx-=c}}function s(i){var r=o||a(i),s=r[0];return s.x=s.y=0,s.value?(s.dx=u[0],s.dy=u[1]):s.dx=s.dy=0,o&&a.revalue(s),e([s],s.dx*s.dy/s.value),(o?n:t)(s),d&&(o=r),r}var o,a=fs.layout.hierarchy(),l=Math.round,u=[1,1],c=null,h=rr,d=!1,f="squarify",p=.5*(1+Math.sqrt(5));return s.size=function(e){return arguments.length?(u=e,s):u},s.padding=function(e){function t(t){return sr(t,e)}return arguments.length?(h=null==(c=e)?rr:"function"==(n=typeof e)?function(t){var n=e.call(s,t,t.depth);return null==n?rr(t):sr(t,"number"==typeof n?[n,n,n,n]:n)}:"number"===n?(e=[e,e,e,e],t):t,s):c;var n},s.round=function(e){return arguments.length?(l=e?Math.round:Number,s):l!=Number},s.sticky=function(e){return arguments.length?(d=e,o=null,s):d},s.ratio=function(e){return arguments.length?(p=e,s):p},s.mode=function(e){return arguments.length?(f=e+"",s):f},Ci(s,a)},fs.random={normal:function(e,t){var n=arguments.length;return 2>n&&(t=1),1>n&&(e=0),function(){var n,i,r;do{r=(n=2*Math.random()-1)*n+(i=2*Math.random()-1)*i}while(!r||r>1);return e+t*n*Math.sqrt(-2*Math.log(r)/r)}},logNormal:function(){var e=fs.random.normal.apply(fs,arguments);return function(){return Math.exp(e())}},bates:function(e){var t=fs.random.irwinHall(e);return function(){return t()/e}},irwinHall:function(e){return function(){for(var t=0,n=0;e>n;n++)t+=Math.random();return t}}},fs.scale={};var _a={floor:v,ceil:v};fs.scale.linear=function(){return dr([0,1],[0,1],Xn,!1)};var Ma={s:1,g:1,p:1,r:1,e:1};fs.scale.log=function(){return $r(fs.scale.linear().domain([0,1]),10,!0,[1,10])};var Aa=fs.format(".0e"),Ea={floor:function(e){return-Math.ceil(-e)},ceil:function(e){return-Math.floor(-e)}};fs.scale.pow=function(){return wr(fs.scale.linear(),1,[0,1])},fs.scale.sqrt=function(){return fs.scale.pow().exponent(.5)},fs.scale.ordinal=function(){return Sr([],{t:"range",a:[[]]})},fs.scale.category10=function(){return fs.scale.ordinal().range(Ra)},fs.scale.category20=function(){return fs.scale.ordinal().range(Ta)},fs.scale.category20b=function(){return fs.scale.ordinal().range(La)},fs.scale.category20c=function(){return fs.scale.ordinal().range(Pa)};var Ra=[2062260,16744206,2924588,14034728,9725885,9197131,14907330,8355711,12369186,1556175].map(ge),Ta=[2062260,11454440,16744206,16759672,2924588,10018698,14034728,16750742,9725885,12955861,9197131,12885140,14907330,16234194,8355711,13092807,12369186,14408589,1556175,10410725].map(ge),La=[3750777,5395619,7040719,10264286,6519097,9216594,11915115,13556636,9202993,12426809,15186514,15190932,8666169,11356490,14049643,15177372,8077683,10834324,13528509,14589654].map(ge),Pa=[3244733,7057110,10406625,13032431,15095053,16616764,16625259,16634018,3253076,7652470,10607003,13101504,7695281,10394312,12369372,14342891,6513507,9868950,12434877,14277081].map(ge);fs.scale.quantile=function(){return xr([],[])},fs.scale.quantize=function(){return Cr(0,1,[0,1])},fs.scale.threshold=function(){return kr([.5],[0,1])},fs.scale.identity=function(){return _r([0,1])},fs.svg={},fs.svg.arc=function(){function e(){var e=Math.max(0,+n.apply(this,arguments)),u=Math.max(0,+i.apply(this,arguments)),c=o.apply(this,arguments)-Vs,h=a.apply(this,arguments)-Vs,d=Math.abs(h-c),f=c>h?0:1;if(e>u&&(p=u,u=e,e=p),d>=zs)return t(u,f)+(e?t(e,1-f):"")+"Z";var p,g,m,v,y,$,w,b,S,x,C,k,_=0,M=0,A=[];if((v=(+l.apply(this,arguments)||0)/2)&&(m=s===Ia?Math.sqrt(e*e+u*u):+s.apply(this,arguments),f||(M*=-1),u&&(M=Z(m/u*Math.sin(v))),e&&(_=Z(m/e*Math.sin(v)))),u){y=u*Math.cos(c+M),$=u*Math.sin(c+M),w=u*Math.cos(h-M),b=u*Math.sin(h-M);var E=Math.abs(h-c-2*M)<=Hs?0:1;if(M&&Pr(y,$,w,b)===f^E){var R=(c+h)/2;y=u*Math.cos(R),$=u*Math.sin(R),w=b=null}}else y=$=0;if(e){S=e*Math.cos(h-_),x=e*Math.sin(h-_),C=e*Math.cos(c+_),k=e*Math.sin(c+_);var T=Math.abs(c-h+2*_)<=Hs?0:1;if(_&&Pr(S,x,C,k)===1-f^T){var L=(c+h)/2;S=e*Math.cos(L),x=e*Math.sin(L),C=k=null}}else S=x=0;if(d>Bs&&(p=Math.min(Math.abs(u-e)/2,+r.apply(this,arguments)))>.001){g=u>e^f?0:1;var P=p,I=p;if(Hs>d){var D=null==C?[S,x]:null==w?[y,$]:vn([y,$],[C,k],[w,b],[S,x]),O=y-D[0],N=$-D[1],F=w-D[0],j=b-D[1],B=1/Math.sin(Math.acos((O*F+N*j)/(Math.sqrt(O*O+N*N)*Math.sqrt(F*F+j*j)))/2),U=Math.sqrt(D[0]*D[0]+D[1]*D[1]);I=Math.min(p,(e-U)/(B-1)),P=Math.min(p,(u-U)/(B+1))}if(null!=w){var H=Ir(null==C?[S,x]:[C,k],[y,$],u,P,f),W=Ir([w,b],[S,x],u,P,f);p===P?A.push("M",H[0],"A",P,",",P," 0 0,",g," ",H[1],"A",u,",",u," 0 ",1-f^Pr(H[1][0],H[1][1],W[1][0],W[1][1]),",",f," ",W[1],"A",P,",",P," 0 0,",g," ",W[0]):A.push("M",H[0],"A",P,",",P," 0 1,",g," ",W[0])}else A.push("M",y,",",$);if(null!=C){var z=Ir([y,$],[C,k],e,-I,f),V=Ir([S,x],null==w?[y,$]:[w,b],e,-I,f);p===I?A.push("L",V[0],"A",I,",",I," 0 0,",g," ",V[1],"A",e,",",e," 0 ",f^Pr(V[1][0],V[1][1],z[1][0],z[1][1]),",",1-f," ",z[1],"A",I,",",I," 0 0,",g," ",z[0]):A.push("L",V[0],"A",I,",",I," 0 0,",g," ",z[0])}else A.push("L",S,",",x)}else A.push("M",y,",",$),null!=w&&A.push("A",u,",",u," 0 ",E,",",f," ",w,",",b),A.push("L",S,",",x),null!=C&&A.push("A",e,",",e," 0 ",T,",",1-f," ",C,",",k);return A.push("Z"),A.join("")}function t(e,t){return"M0,"+e+"A"+e+","+e+" 0 1,"+t+" 0,"+-e+"A"+e+","+e+" 0 1,"+t+" 0,"+e}var n=Ar,i=Er,r=Mr,s=Ia,o=Rr,a=Tr,l=Lr;return e.innerRadius=function(t){return arguments.length?(n=Se(t),e):n},e.outerRadius=function(t){return arguments.length?(i=Se(t),e):i},e.cornerRadius=function(t){return arguments.length?(r=Se(t),e):r},e.padRadius=function(t){return arguments.length?(s=t==Ia?Ia:Se(t),e):s},e.startAngle=function(t){return arguments.length?(o=Se(t),e):o},e.endAngle=function(t){return arguments.length?(a=Se(t),e):a},e.padAngle=function(t){return arguments.length?(l=Se(t),e):l},e.centroid=function(){var e=(+n.apply(this,arguments)+ +i.apply(this,arguments))/2,t=(+o.apply(this,arguments)+ +a.apply(this,arguments))/2-Vs;return[Math.cos(t)*e,Math.sin(t)*e]},e};var Ia="auto";fs.svg.line=function(){return Dr(v)};var Da=fs.map({linear:Or,"linear-closed":Nr,step:function(e){for(var t=0,n=e.length,i=e[0],r=[i[0],",",i[1]];++t<n;)r.push("H",(i[0]+(i=e[t])[0])/2,"V",i[1]);return n>1&&r.push("H",i[0]),r.join("")},"step-before":Fr,"step-after":jr,basis:Hr,"basis-open":function(e){if(e.length<4)return Or(e);for(var t,n=[],i=-1,r=e.length,s=[0],o=[0];++i<3;)t=e[i],s.push(t[0]),o.push(t[1]);for(n.push(Wr(Fa,s)+","+Wr(Fa,o)),--i;++i<r;)t=e[i],s.shift(),s.push(t[0]),o.shift(),o.push(t[1]),zr(n,s,o);return n.join("")},"basis-closed":function(e){for(var t,n,i=-1,r=e.length,s=r+4,o=[],a=[];++i<4;)n=e[i%r],o.push(n[0]),a.push(n[1]);for(t=[Wr(Fa,o),",",Wr(Fa,a)],--i;++i<s;)n=e[i%r],o.shift(),o.push(n[0]),a.shift(),a.push(n[1]),zr(t,o,a);return t.join("")},bundle:function(e,t){var n=e.length-1;if(n)for(var i,r,s=e[0][0],o=e[0][1],a=e[n][0]-s,l=e[n][1]-o,u=-1;++u<=n;)r=u/n,(i=e[u])[0]=t*i[0]+(1-t)*(s+r*a),i[1]=t*i[1]+(1-t)*(o+r*l);return Hr(e)},cardinal:function(e,t){return e.length<3?Or(e):e[0]+Br(e,Ur(e,t))},"cardinal-open":function(e,t){return e.length<4?Or(e):e[1]+Br(e.slice(1,-1),Ur(e,t))},"cardinal-closed":function(e,t){return e.length<3?Nr(e):e[0]+Br((e.push(e[0]),e),Ur([e[e.length-2]].concat(e,[e[1]]),t))},monotone:function(e){return e.length<3?Or(e):e[0]+Br(e,qr(e))}});Da.forEach((function(e,t){t.key=e,t.closed=/-closed$/.test(e)}));var Oa=[0,2/3,1/3,0],Na=[0,1/3,2/3,0],Fa=[0,1/6,2/3,1/6];fs.svg.line.radial=function(){var e=Dr(Yr);return e.radius=e.x,delete e.x,e.angle=e.y,delete e.y,e},Fr.reverse=jr,jr.reverse=Fr,fs.svg.area=function(){return Gr(v)},fs.svg.area.radial=function(){var e=Gr(Yr);return e.radius=e.x,delete e.x,e.innerRadius=e.x0,delete e.x0,e.outerRadius=e.x1,delete e.x1,e.angle=e.y,delete e.y,e.startAngle=e.y0,delete e.y0,e.endAngle=e.y1,delete e.y1,e},fs.svg.chord=function(){function e(e,o){var a=t(this,r,e,o),l=t(this,s,e,o);return"M"+a.p0+n(a.r,a.p1,a.a1-a.a0)+(function(e,t){return e.a0==t.a0&&e.a1==t.a1}(a,l)?i(a.r,a.p1,a.r,a.p0):i(a.r,a.p1,l.r,l.p0)+n(l.r,l.p1,l.a1-l.a0)+i(l.r,l.p1,a.r,a.p0))+"Z"}function t(e,t,n,i){var r=t.call(e,n,i),s=o.call(e,r,i),u=a.call(e,r,i)-Vs,c=l.call(e,r,i)-Vs;return{r:s,a0:u,a1:c,p0:[s*Math.cos(u),s*Math.sin(u)],p1:[s*Math.cos(c),s*Math.sin(c)]}}function n(e,t,n){return"A"+e+","+e+" 0 "+ +(n>Hs)+",1 "+t}function i(e,t,n,i){return"Q 0,0 "+i}var r=rn,s=sn,o=Kr,a=Rr,l=Tr;return e.radius=function(t){return arguments.length?(o=Se(t),e):o},e.source=function(t){return arguments.length?(r=Se(t),e):r},e.target=function(t){return arguments.length?(s=Se(t),e):s},e.startAngle=function(t){return arguments.length?(a=Se(t),e):a},e.endAngle=function(t){return arguments.length?(l=Se(t),e):l},e},fs.svg.diagonal=function(){function e(e,r){var s=t.call(this,e,r),o=n.call(this,e,r),a=(s.y+o.y)/2,l=[s,{x:s.x,y:a},{x:o.x,y:a},o];return"M"+(l=l.map(i))[0]+"C"+l[1]+" "+l[2]+" "+l[3]}var t=rn,n=sn,i=Qr;return e.source=function(n){return arguments.length?(t=Se(n),e):t},e.target=function(t){return arguments.length?(n=Se(t),e):n},e.projection=function(t){return arguments.length?(i=t,e):i},e},fs.svg.diagonal.radial=function(){var e=fs.svg.diagonal(),t=Qr,n=e.projection;return e.projection=function(e){return arguments.length?n(function(e){return function(){var t=e.apply(this,arguments),n=t[0],i=t[1]-Vs;return[n*Math.cos(i),n*Math.sin(i)]}}(t=e)):t},e},fs.svg.symbol=function(){function e(e,i){return(ja.get(t.call(this,e,i))||Zr)(n.call(this,e,i))}var t=Xr,n=Jr;return e.type=function(n){return arguments.length?(t=Se(n),e):t},e.size=function(t){return arguments.length?(n=Se(t),e):n},e};var ja=fs.map({circle:Zr,cross:function(e){var t=Math.sqrt(e/5)/2;return"M"+-3*t+","+-t+"H"+-t+"V"+-3*t+"H"+t+"V"+-t+"H"+3*t+"V"+t+"H"+t+"V"+3*t+"H"+-t+"V"+t+"H"+-3*t+"Z"},diamond:function(e){var t=Math.sqrt(e/(2*Ua)),n=t*Ua;return"M0,"+-t+"L"+n+",0 0,"+t+" "+-n+",0Z"},square:function(e){var t=Math.sqrt(e)/2;return"M"+-t+","+-t+"L"+t+","+-t+" "+t+","+t+" "+-t+","+t+"Z"},"triangle-down":function(e){var t=Math.sqrt(e/Ba),n=t*Ba/2;return"M0,"+n+"L"+t+","+-n+" "+-t+","+-n+"Z"},"triangle-up":function(e){var t=Math.sqrt(e/Ba),n=t*Ba/2;return"M0,"+-n+"L"+t+","+n+" "+-t+","+n+"Z"}});fs.svg.symbolTypes=ja.keys();var Ba=Math.sqrt(3),Ua=Math.tan(30*qs);Ls.transition=function(e){for(var t,n,i=Ha||++qa,r=rs(e),s=[],o=Wa||{time:Date.now(),ease:ri,delay:0,duration:250},a=-1,l=this.length;++a<l;){s.push(t=[]);for(var u=this[a],c=-1,h=u.length;++c<h;)(n=u[c])&&ss(n,c,r,i,o),t.push(n)}return ts(s,r,i)},Ls.interrupt=function(e){return this.each(null==e?za:es(rs(e)))};var Ha,Wa,za=es(rs()),Va=[],qa=0;Va.call=Ls.call,Va.empty=Ls.empty,Va.node=Ls.node,Va.size=Ls.size,fs.transition=function(e,t){return e&&e.transition?Ha?e.transition(t):e:fs.selection().transition(e)},fs.transition.prototype=Va,Va.select=function(e){var t,n,i,r=this.id,s=this.namespace,o=[];e=M(e);for(var a=-1,l=this.length;++a<l;){o.push(t=[]);for(var u=this[a],c=-1,h=u.length;++c<h;)(i=u[c])&&(n=e.call(i,i.__data__,c,a))?("__data__"in i&&(n.__data__=i.__data__),ss(n,c,s,r,i[s][r]),t.push(n)):t.push(null)}return ts(o,s,r)},Va.selectAll=function(e){var t,n,i,r,s,o=this.id,a=this.namespace,l=[];e=A(e);for(var u=-1,c=this.length;++u<c;)for(var h=this[u],d=-1,f=h.length;++d<f;)if(i=h[d]){s=i[a][o],n=e.call(i,i.__data__,d,u),l.push(t=[]);for(var p=-1,g=n.length;++p<g;)(r=n[p])&&ss(r,p,a,o,s),t.push(r)}return ts(l,a,o)},Va.filter=function(e){var t,n,i=[];"function"!=typeof e&&(e=B(e));for(var r=0,s=this.length;s>r;r++){i.push(t=[]);for(var o,a=0,l=(o=this[r]).length;l>a;a++)(n=o[a])&&e.call(n,n.__data__,a,r)&&t.push(n)}return ts(i,this.namespace,this.id)},Va.tween=function(e,t){var n=this.id,i=this.namespace;return arguments.length<2?this.node()[i][n].tween.get(e):H(this,null==t?function(t){t[i][n].tween.remove(e)}:function(r){r[i][n].tween.set(e,t)})},Va.attr=function(e,t){function n(){this.removeAttribute(s)}function i(){this.removeAttributeNS(s.space,s.local)}if(arguments.length<2){for(t in e)this.attr(t,e[t]);return this}var r="transform"==e?pi:Xn,s=fs.ns.qualify(e);return ns(this,"attr."+e,t,s.local?function(e){return null==e?i:(e+="",function(){var t,n=this.getAttributeNS(s.space,s.local);return n!==e&&(t=r(n,e),function(e){this.setAttributeNS(s.space,s.local,t(e))})})}:function(e){return null==e?n:(e+="",function(){var t,n=this.getAttribute(s);return n!==e&&(t=r(n,e),function(e){this.setAttribute(s,t(e))})})})},Va.attrTween=function(e,t){var n=fs.ns.qualify(e);return this.tween("attr."+e,n.local?function(e,i){var r=t.call(this,e,i,this.getAttributeNS(n.space,n.local));return r&&function(e){this.setAttributeNS(n.space,n.local,r(e))}}:function(e,i){var r=t.call(this,e,i,this.getAttribute(n));return r&&function(e){this.setAttribute(n,r(e))}})},Va.style=function(e,n,i){function r(){this.style.removeProperty(e)}var s=arguments.length;if(3>s){if("string"!=typeof e){for(i in 2>s&&(n=""),e)this.style(i,e[i],n);return this}i=""}return ns(this,"style."+e,n,(function(n){return null==n?r:(n+="",function(){var r,s=t(this).getComputedStyle(this,null).getPropertyValue(e);return s!==n&&(r=Xn(s,n),function(t){this.style.setProperty(e,r(t),i)})})}))},Va.styleTween=function(e,n,i){return arguments.length<3&&(i=""),this.tween("style."+e,(function(r,s){var o=n.call(this,r,s,t(this).getComputedStyle(this,null).getPropertyValue(e));return o&&function(t){this.style.setProperty(e,o(t),i)}}))},Va.text=function(e){return ns(this,"text",e,is)},Va.remove=function(){var e=this.namespace;return this.each("end.transition",(function(){var t;this[e].count<2&&(t=this.parentNode)&&t.removeChild(this)}))},Va.ease=function(e){var t=this.id,n=this.namespace;return arguments.length<1?this.node()[n][t].ease:("function"!=typeof e&&(e=fs.ease.apply(fs,arguments)),H(this,(function(i){i[n][t].ease=e})))},Va.delay=function(e){var t=this.id,n=this.namespace;return arguments.length<1?this.node()[n][t].delay:H(this,"function"==typeof e?function(i,r,s){i[n][t].delay=+e.call(i,i.__data__,r,s)}:(e=+e,function(i){i[n][t].delay=e}))},Va.duration=function(e){var t=this.id,n=this.namespace;return arguments.length<1?this.node()[n][t].duration:H(this,"function"==typeof e?function(i,r,s){i[n][t].duration=Math.max(1,e.call(i,i.__data__,r,s))}:(e=Math.max(1,e),function(i){i[n][t].duration=e}))},Va.each=function(e,t){var n=this.id,i=this.namespace;if(arguments.length<2){var r=Wa,s=Ha;try{Ha=n,H(this,(function(t,r,s){Wa=t[i][n],e.call(t,t.__data__,r,s)}))}finally{Wa=r,Ha=s}}else H(this,(function(r){var s=r[i][n];(s.event||(s.event=fs.dispatch("start","end","interrupt"))).on(e,t)}));return this},Va.transition=function(){for(var e,t,n,i=this.id,r=++qa,s=this.namespace,o=[],a=0,l=this.length;l>a;a++){o.push(e=[]);for(var u,c=0,h=(u=this[a]).length;h>c;c++)(t=u[c])&&ss(t,c,s,r,{time:(n=t[s][i]).time,ease:n.ease,delay:n.delay+n.duration,duration:n.duration}),e.push(t)}return ts(o,s,r)},fs.svg.axis=function(){function e(e){e.each((function(){var e,u=fs.select(this),c=this.__chart__||n,h=this.__chart__=n.copy(),d=null==l?h.ticks?h.ticks.apply(h,a):h.domain():l,f=null==t?h.tickFormat?h.tickFormat.apply(h,a):v:t,p=u.selectAll(".tick").data(d,h),g=p.enter().insert("g",".domain").attr("class","tick").style("opacity",Bs),m=fs.transition(p.exit()).style("opacity",Bs).remove(),y=fs.transition(p.order()).style("opacity",1),$=Math.max(r,0)+o,w=ar(h),b=u.selectAll(".domain").data([0]),S=(b.enter().append("path").attr("class","domain"),fs.transition(b));g.append("line"),g.append("text");var x,C,k,_,M=g.select("line"),A=y.select("line"),E=p.select("text").text(f),R=g.select("text"),T=y.select("text"),L="top"===i||"left"===i?-1:1;if("bottom"===i||"top"===i?(e=os,x="x",k="y",C="x2",_="y2",E.attr("dy",0>L?"0em":".71em").style("text-anchor","middle"),S.attr("d","M"+w[0]+","+L*s+"V0H"+w[1]+"V"+L*s)):(e=as,x="y",k="x",C="y2",_="x2",E.attr("dy",".32em").style("text-anchor",0>L?"end":"start"),S.attr("d","M"+L*s+","+w[0]+"H0V"+w[1]+"H"+L*s)),M.attr(_,L*r),R.attr(k,L*$),A.attr(C,0).attr(_,L*r),T.attr(x,0).attr(k,L*$),h.rangeBand){var P=h,I=P.rangeBand()/2;c=h=function(e){return P(e)+I}}else c.rangeBand?c=h:m.call(e,h,c);g.call(e,c,h),y.call(e,h,h)}))}var t,n=fs.scale.linear(),i=Ya,r=6,s=6,o=3,a=[10],l=null;return e.scale=function(t){return arguments.length?(n=t,e):n},e.orient=function(t){return arguments.length?(i=t in Ga?t+"":Ya,e):i},e.ticks=function(){return arguments.length?(a=gs(arguments),e):a},e.tickValues=function(t){return arguments.length?(l=t,e):l},e.tickFormat=function(n){return arguments.length?(t=n,e):t},e.tickSize=function(t){var n=arguments.length;return n?(r=+t,s=+arguments[n-1],e):r},e.innerTickSize=function(t){return arguments.length?(r=+t,e):r},e.outerTickSize=function(t){return arguments.length?(s=+t,e):s},e.tickPadding=function(t){return arguments.length?(o=+t,e):o},e.tickSubdivide=function(){return arguments.length&&e},e};var Ya="bottom",Ga={top:1,right:1,bottom:1,left:1};fs.svg.brush=function(){function e(t){t.each((function(){var t=fs.select(this).style("pointer-events","all").style("-webkit-tap-highlight-color","rgba(0,0,0,0)").on("mousedown.brush",s).on("touchstart.brush",s),o=t.selectAll(".background").data([0]);o.enter().append("rect").attr("class","background").style("visibility","hidden").style("cursor","crosshair"),t.selectAll(".extent").data([0]).enter().append("rect").attr("class","extent").style("cursor","move");var a=t.selectAll(".resize").data(g,v);a.exit().remove(),a.enter().append("g").attr("class",(function(e){return"resize "+e})).style("cursor",(function(e){return Ka[e]})).append("rect").attr("x",(function(e){return/[ew]$/.test(e)?-3:null})).attr("y",(function(e){return/^[ns]/.test(e)?-3:null})).attr("width",6).attr("height",6).style("visibility","hidden"),a.style("display",e.empty()?"none":null);var l,h=fs.transition(t),d=fs.transition(o);u&&(l=ar(u),d.attr("x",l[0]).attr("width",l[1]-l[0]),i(h)),c&&(l=ar(c),d.attr("y",l[0]).attr("height",l[1]-l[0]),r(h)),n(h)}))}function n(e){e.selectAll(".resize").attr("transform",(function(e){return"translate("+h[+/e$/.test(e)]+","+d[+/^s/.test(e)]+")"}))}function i(e){e.select(".extent").attr("x",h[0]),e.selectAll(".extent,.n>rect,.s>rect").attr("width",h[1]-h[0])}function r(e){e.select(".extent").attr("y",d[0]),e.selectAll(".extent,.e>rect,.w>rect").attr("height",d[1]-d[0])}function s(){function s(){var e=fs.mouse($),t=!1;y&&(e[0]+=y[0],e[1]+=y[1]),M||(fs.event.altKey?(v||(v=[(h[0]+h[1])/2,(d[0]+d[1])/2]),E[0]=h[+(e[0]<v[0])],E[1]=d[+(e[1]<v[1])]):v=null),k&&g(e,u,0)&&(i(S),t=!0),_&&g(e,c,1)&&(r(S),t=!0),t&&(n(S),b({type:"brush",mode:M?"move":"resize"}))}function g(e,t,n){var i,r,s=ar(t),l=s[0],u=s[1],c=E[n],g=n?d:h,m=g[1]-g[0];return M&&(l-=c,u-=m+c),i=(n?p:f)?Math.max(l,Math.min(u,e[n])):e[n],M?r=(i+=c)+m:(v&&(c=Math.max(l,Math.min(u,2*v[n]-i))),i>c?(r=i,i=c):r=c),g[0]!=i||g[1]!=r?(n?a=null:o=null,g[0]=i,g[1]=r,!0):void 0}function m(){s(),S.style("pointer-events","all").selectAll(".resize").style("display",e.empty()?"none":null),fs.select("body").style("cursor",null),R.on("mousemove.brush",null).on("mouseup.brush",null).on("touchmove.brush",null).on("touchend.brush",null).on("keydown.brush",null).on("keyup.brush",null),A(),b({type:"brushend"})}var v,y,$=this,w=fs.select(fs.event.target),b=l.of($,arguments),S=fs.select($),C=w.datum(),k=!/^(n|s)$/.test(C)&&u,_=!/^(e|w)$/.test(C)&&c,M=w.classed("extent"),A=Y($),E=fs.mouse($),R=fs.select(t($)).on("keydown.brush",(function(){32==fs.event.keyCode&&(M||(v=null,E[0]-=h[1],E[1]-=d[1],M=2),x())})).on("keyup.brush",(function(){32==fs.event.keyCode&&2==M&&(E[0]+=h[1],E[1]+=d[1],M=0,x())}));if(fs.event.changedTouches?R.on("touchmove.brush",s).on("touchend.brush",m):R.on("mousemove.brush",s).on("mouseup.brush",m),S.interrupt().selectAll("*").interrupt(),M)E[0]=h[0]-E[0],E[1]=d[0]-E[1];else if(C){var T=+/w$/.test(C),L=+/^n/.test(C);y=[h[1-T]-E[0],d[1-L]-E[1]],E[0]=h[T],E[1]=d[L]}else fs.event.altKey&&(v=E.slice());S.style("pointer-events","none").selectAll(".resize").style("display",null),fs.select("body").style("cursor",w.style("cursor")),b({type:"brushstart"}),s()}var o,a,l=k(e,"brushstart","brush","brushend"),u=null,c=null,h=[0,0],d=[0,0],f=!0,p=!0,g=Qa[0];return e.event=function(e){e.each((function(){var e=l.of(this,arguments),t={x:h,y:d,i:o,j:a},n=this.__chart__||t;this.__chart__=t,Ha?fs.select(this).transition().each("start.brush",(function(){o=n.i,a=n.j,h=n.x,d=n.y,e({type:"brushstart"})})).tween("brush:brush",(function(){var n=Zn(h,t.x),i=Zn(d,t.y);return o=a=null,function(r){h=t.x=n(r),d=t.y=i(r),e({type:"brush",mode:"resize"})}})).each("end.brush",(function(){o=t.i,a=t.j,e({type:"brush",mode:"resize"}),e({type:"brushend"})})):(e({type:"brushstart"}),e({type:"brush",mode:"resize"}),e({type:"brushend"}))}))},e.x=function(t){return arguments.length?(g=Qa[!(u=t)<<1|!c],e):u},e.y=function(t){return arguments.length?(g=Qa[!u<<1|!(c=t)],e):c},e.clamp=function(t){return arguments.length?(u&&c?(f=!!t[0],p=!!t[1]):u?f=!!t:c&&(p=!!t),e):u&&c?[f,p]:u?f:c?p:null},e.extent=function(t){var n,i,r,s,l;return arguments.length?(u&&(n=t[0],i=t[1],c&&(n=n[0],i=i[0]),o=[n,i],u.invert&&(n=u(n),i=u(i)),n>i&&(l=n,n=i,i=l),n==h[0]&&i==h[1]||(h=[n,i])),c&&(r=t[0],s=t[1],u&&(r=r[1],s=s[1]),a=[r,s],c.invert&&(r=c(r),s=c(s)),r>s&&(l=r,r=s,s=l),r==d[0]&&s==d[1]||(d=[r,s])),e):(u&&(o?(n=o[0],i=o[1]):(n=h[0],i=h[1],u.invert&&(n=u.invert(n),i=u.invert(i)),n>i&&(l=n,n=i,i=l))),c&&(a?(r=a[0],s=a[1]):(r=d[0],s=d[1],c.invert&&(r=c.invert(r),s=c.invert(s)),r>s&&(l=r,r=s,s=l))),u&&c?[[n,r],[i,s]]:u?[n,i]:c&&[r,s])},e.clear=function(){return e.empty()||(h=[0,0],d=[0,0],o=a=null),e},e.empty=function(){return!!u&&h[0]==h[1]||!!c&&d[0]==d[1]},fs.rebind(e,l,"on")};var Ka={n:"ns-resize",e:"ew-resize",s:"ns-resize",w:"ew-resize",nw:"nwse-resize",ne:"nesw-resize",se:"nwse-resize",sw:"nesw-resize"},Qa=[["n","e","s","w","nw","ne","se","sw"],["e","w"],["n","s"],[]],Ja=mo.format=So.timeFormat,Xa=Ja.utc,Za=Xa("%Y-%m-%dT%H:%M:%S.%LZ");Ja.iso=Date.prototype.toISOString&&+new Date("2000-01-01T00:00:00.000Z")?ls:Za,ls.parse=function(e){var t=new Date(e);return isNaN(t)?null:t},ls.toString=Za.toString,mo.second=Pe((function(e){return new vo(1e3*Math.floor(e/1e3))}),(function(e,t){e.setTime(e.getTime()+1e3*Math.floor(t))}),(function(e){return e.getSeconds()})),mo.seconds=mo.second.range,mo.seconds.utc=mo.second.utc.range,mo.minute=Pe((function(e){return new vo(6e4*Math.floor(e/6e4))}),(function(e,t){e.setTime(e.getTime()+6e4*Math.floor(t))}),(function(e){return e.getMinutes()})),mo.minutes=mo.minute.range,mo.minutes.utc=mo.minute.utc.range,mo.hour=Pe((function(e){var t=e.getTimezoneOffset()/60;return new vo(36e5*(Math.floor(e/36e5-t)+t))}),(function(e,t){e.setTime(e.getTime()+36e5*Math.floor(t))}),(function(e){return e.getHours()})),mo.hours=mo.hour.range,mo.hours.utc=mo.hour.utc.range,mo.month=Pe((function(e){return(e=mo.day(e)).setDate(1),e}),(function(e,t){e.setMonth(e.getMonth()+t)}),(function(e){return e.getMonth()})),mo.months=mo.month.range,mo.months.utc=mo.month.utc.range;var el=[1e3,5e3,15e3,3e4,6e4,3e5,9e5,18e5,36e5,108e5,216e5,432e5,864e5,1728e5,6048e5,2592e6,7776e6,31536e6],tl=[[mo.second,1],[mo.second,5],[mo.second,15],[mo.second,30],[mo.minute,1],[mo.minute,5],[mo.minute,15],[mo.minute,30],[mo.hour,1],[mo.hour,3],[mo.hour,6],[mo.hour,12],[mo.day,1],[mo.day,2],[mo.week,1],[mo.month,1],[mo.month,3],[mo.year,1]],nl=Ja.multi([[".%L",function(e){return e.getMilliseconds()}],[":%S",function(e){return e.getSeconds()}],["%I:%M",function(e){return e.getMinutes()}],["%I %p",function(e){return e.getHours()}],["%a %d",function(e){return e.getDay()&&1!=e.getDate()}],["%b %d",function(e){return 1!=e.getDate()}],["%B",function(e){return e.getMonth()}],["%Y",bt]]),il={range:function(e,t,n){return fs.range(Math.ceil(e/n)*n,+t,n).map(cs)},floor:v,ceil:v};tl.year=mo.year,mo.scale=function(){return us(fs.scale.linear(),tl,nl)};var rl=tl.map((function(e){return[e[0].utc,e[1]]})),sl=Xa.multi([[".%L",function(e){return e.getUTCMilliseconds()}],[":%S",function(e){return e.getUTCSeconds()}],["%I:%M",function(e){return e.getUTCMinutes()}],["%I %p",function(e){return e.getUTCHours()}],["%a %d",function(e){return e.getUTCDay()&&1!=e.getUTCDate()}],["%b %d",function(e){return 1!=e.getUTCDate()}],["%B",function(e){return e.getUTCMonth()}],["%Y",bt]]);rl.year=mo.year.utc,mo.scale.utc=function(){return us(fs.scale.linear(),rl,sl)},fs.text=xe((function(e){return e.responseText})),fs.json=function(e,t){return Ce(e,"application/json",hs,t)},fs.html=function(e,t){return Ce(e,"text/html",ds,t)},fs.xml=xe((function(e){return e.responseXML})),"function"==typeof define&&define.amd?(this.d3=fs,define("d3",fs)):"object"==typeof module&&module.exports?module.exports=fs:this.d3=fs}(),define("modules/visualize/controllers/VisualizeEventFlowCtrl",["./_module","moment","d3"],(function(e,t,n){"use strict";return e.controller("VisualizeEventFlowCtrl",["$scope","StreamsService","ProjectionsService","UrlBuilder","$stateParams","MessageService",function(e,i,r,s,o,a){e.epoch=0,e.correlationIdProperty="Loading...",e.causedByProperty="$causationId",e.tree=new CollapsibleTree(n,t,"canvas",e,a),e.projectionStatus="",e.updateCorrelationIdProperty=function(){var t=s.build("/projection/$by_correlation_id");r.query(t,!0).then((function(t){e.correlationIdProperty=t.data.correlationIdProperty}),(function(e){a.failure("Error getting $by_correlation_id projection source: "+e.message),console.error(e)}))},e.updateProjectionStatus=function(){var t=s.build("/projection/$by_correlation_id");r.status(t).then((function(t){e.projectionStatus=t.data.status}),(function(e){a.failure("Error getting $by_correlation_id projection status: "+e.message),console.error(e)}))},e.startProjection=function(){var t=s.build("/projection/$by_correlation_id");r.enable(t).then((function(){a.success("$by_correlation_id projection started"),e.updateProjectionStatus()}),(function(e){a.failure("Error starting $by_correlation_id projection: "+e.message),console.error(e)}))},e.go=function(){e.selectedEvent=null,e.tree.clearEvents(),e.epoch++;var t=!0,n=0;!function r(s,o){if(o===e.epoch){var l={streamId:"$bc-"+e.correlationId,position:""+s,type:"forward",count:"1000"};i.streamEvents(l).then((function(i){o===e.epoch&&(i.data.entries.length>0&&(e.tree.addEvents(i.data.entries.reverse(),t),t=!1,n=i.data.entries[i.data.entries.length-1].positionEventNumber+1),setTimeout((function(){r(n,o)}),3e3))}),(function(t){o===e.epoch&&a.failure("Error getting Correlation Id stream ("+l.streamId+") please make sure that the $by_correlation_id projection is running. Error: "+t.message)}))}}(n,e.epoch)},e.$on("$destroy",(function(){e.epoch&&e.epoch++})),e.updateCorrelationIdProperty(),e.updateProjectionStatus(),o.correlationId&&(e.correlationId=o.correlationId,e.go())}])})),CollapsibleTree=function(e,t,n,i,r){"use strict";var s,o,a,l=this,u=0,c=500,h=n,d=20,f=120,p=120,g=120,m=document.getElementById(h).clientWidth,v=document.getElementById(h).clientHeight,y=m-f-g,$=v-d-p,w={},b=Number.MAX_SAFE_INTEGER;function S(e){var n=0;if(e.length>20){for(var i=e.substring(20,e.length-1);i.length<6;)i+="0";n=i[5]-"0"+10*(i[4]-"0")+100*(i[3]-"0")}return 1e3*t(e).valueOf()+n}function x(e,t){var n=[];return n.push(e),!e._children||t&&!e.children||e._children.forEach((function(e){x(e,t).forEach((function(e){n.push(e)}))})),n}function C(e){if(e.length<=1)return Number.MAX_SAFE_INTEGER;if(2===e.length){var t=e[0].x-e[1].x,n=e[0].y-e[1].y;return t*t+n*n}for(var i=[],r=[],s=Math.floor(e.length/2),o=0;o<e.length;o++)o<s?i.push(e[o]):r.push(e[o]);var a=Number.MAX_SAFE_INTEGER;a=Math.min(a,C(i)),a=Math.min(a,C(r));for(var l=[],u=0;u<e.length;u++){var c=e[u].x-e[s].x;c*c<a&&l.push(e[u])}for(l=l.sort((function(e,t){return e.y-t.y})),o=0;o<l.length;o++)for(var h=o+1;h<l.length&&(l[h].y-l[o].y)*(l[h].y-l[o].y)<a;h++){var d=l[o].x-l[h].x,f=l[o].y-l[h].y;a=Math.min(d*d+f*f,a)}return a}function k(e){return Math.round(10*e)/10}function _(e){var t=1e3,n=6e4,i=36e5,r=24*i,s=7*r;if(e>=s){var o=k(e/s);return o+" week"+(o>1?"s":"")}if(e>=r){var a=k(e/r);return a+" day"+(a>1?"s":"")}if(e>=i){var l=k(e/i);return l+" hour"+(l>1?"s":"")}if(e>=n){var u=Math.floor(e/n);return u+" min"+(u>1?"s":"")}return e>=t?Math.floor(e/t)+" s":e+" ms"}function M(n){var r=a.nodes(o).reverse(),h=a.links(r),d=S(n.timestamp),f=S(n.timestamp);r.forEach((function(e){e.y=180*e.depth,S(e.timestamp)<d&&(d=S(e.timestamp)),S(e.timestamp)>f&&(f=S(e.timestamp))}));var p=e.scale.linear().domain([d,f]).range([1,y]),g=function(e,t){return e.y=t(S(e.timestamp)),e},m=s.selectAll("g.node").data(r,(function(e){return e.id||(e.id=++u)}));var v=m.enter().append("g").attr("class","node").attr("transform",(function(){var e={x:n.x0,y:n.y0,timestamp:n.timestamp},t=g(e,n.prevTimeScale);return"translate("+t.y+","+t.x+")"})).on("mousedown",(function(e){e.clickInProcess=!0,setTimeout((function(){e.clickInProcess&&(e.clickInProcess=!1,function(e){l.makeRootNode(e)}(e))}),1500)})).on("mouseup",(function(e){e.clickInProcess&&(e.clickInProcess=!1,function(e){e.children?e.children=null:e.children=e._children,M(e)}(e))})).on("mouseover",(function(e){i.selectedEvent=e.event;var n=e.x,r=e.y;e.dropline=s.append("line").attr("x1",(function(){return r})).attr("y1",(function(){return n+7})).attr("x2",(function(){return r})).attr("y2",(function(){return $+25})).attr("stroke","gray").attr("stroke-dasharray","2,2").attr("stroke-width","1"),e.droplineText=s.append("text").attr("x",(function(){return r})).attr("y",(function(){return $+70})).attr("text-anchor","middle").attr("font-weight","bold").text((function(){return new t(e.timestamp).format("HH:mm:ss SSS")}))})).on("mouseout",(function(e){e.dropline&&e.dropline.remove(),e.droplineText&&e.droplineText.remove()}));v.append("circle").attr("r",1e-6).style("fill",(function(e){return e._children?"#2E9625":"#fff"})),v.append("text").attr("x",(function(e){return e._children?-12:12})).attr("dy",".35em").attr("class","node-name").attr("text-anchor",(function(e){return e._children?"end":"start"})).text((function(e){var t,n,i=20;return(!e._parent||e._parent&&e._parent._children&&1===e._parent._children.length)&&(i=14),e.name.length>i?(t=e.name,n=i,t.length<=n?t:t.substring(0,n-2)+".."):e.name})).style("fill-opacity",1e-6),v.append("text").attr("x",(function(e){return e._children?12:-12})).attr("dy",".35em").attr("class","node-timestamp").attr("text-anchor","start").text((function(e){if(e.eventId===o.eventId)return"[0 ms]";var n=t(o.timestamp);return"["+_(t(e.timestamp).diff(n))+"]"})).style("fill-opacity",1e-6);var w=m.transition().duration(c).attr("transform",(function(e){var t=g(e,p);return"translate("+t.y+","+t.x+")"}));w.select("circle").attr("r",7).style("fill",(function(e){return e._children&&e._children.length>0?"#2E9625":"#fff"})),w.select("text").style("fill-opacity",1),w.selectAll(".node-timestamp").style("fill-opacity",1);var b=m.exit().transition().duration(c).attr("transform",(function(){var e=g(n,p);return"translate("+e.y+","+e.x+")"})).remove();b.select("circle").attr("r",1e-6),b.select("text").style("fill-opacity",1e-6);var x=s.selectAll("path.link").data(h,(function(e){return e.target.id})),C=function(e,t){return e.source.y=t(S(e.source.timestamp)),e.target.y=t(S(e.target.timestamp)),e},k=function(e){var t="";return t+="M"+e.source.y+","+e.source.x,t+="C"+e.source.y+","+(e.source.x+e.target.x)/2,t+=" "+e.target.y+","+(e.source.x+e.target.x)/2,t+=" "+e.target.y+","+e.target.x};x.enter().insert("path","g").attr("class","link").attr("id",(function(e){return e.source.id+":"+e.target.id})).attr("d",(function(){var e={x:n.x0,y:n.y0,timestamp:n.timestamp};return k(C({source:e,target:e},n.prevTimeScale))})),x.transition().duration(c).attr("d",(function(e){return k(C(e,p))})),x.exit().transition().duration(c).attr("d",(function(){return k(C({source:n,target:n},p))})).remove(),e.selectAll(".edge-label").remove(),h.forEach((function(e){var n=t(e.source.timestamp),i=t(e.target.timestamp).diff(n);s.append("text").attr("class","edge-label").append("textPath").attr("startOffset","40%").attr("href","#"+e.source.id+":"+e.target.id).append("tspan").attr("dy",(function(){return e.target.x>e.source.x?"15":"-15"})).text("+ "+_(i))})),r.forEach((function(e){e.x0=e.x,e.y0=e.y,e.prevTimeScale=p})),e.selectAll(".xaxis").remove();var A=e.svg.axis().orient("bottom").scale(p).ticks(5).tickFormat((function(e){return new t(e/1e3).format("YYYY-MM-DD HH:mm:ss SSS")}));s.append("g").attr("class","xaxis").attr("transform","translate(0,"+($+25)+")").attr("fill","none").call(A)}function A(){x(o,!1).forEach((function(e){e.children=e._children})),M(o);var e=function(){var t=[],n=-1,r=Number.MAX_SAFE_INTEGER;x(o,!0).forEach((function(e){t.push({x:e.x,y:e.y});var i=S(e.timestamp);e.timeMicroseconds=i,i>n&&(n=i),i<r&&(r=i)}));var s=C(t=t.sort((function(e,t){return e.x!==t.x?e.x-t.x:e.y-t.y})));if(s!==Number.MAX_SAFE_INTEGER)if(s=Math.sqrt(s),r!==Number.MAX_SAFE_INTEGER&&-1!==n){var a=r+.8*(n-r);s<150?(x(o,!0).forEach((function(e){e.timeMicroseconds>=a&&e._parent&&(e._parent.children=null)})),M(o),setTimeout(e,c)):i.collapsingNodes=!1}else i.collapsingNodes=!1;else i.collapsingNodes=!1};i.collapsingNodes=!0,e()}return this.path=[],this.draw=function(){e.select("#"+h+" > *").remove(),a=e.layout.tree().size([$,y]),s=e.select("#"+h).append("svg").attr("width",y+f+g).attr("height",$+d+p).append("g").attr("transform","translate("+g+","+d+")"),o.x0=$/2,o.y0=0,o.prevTimeScale=function(){return 0},e.select(self.frameElement).style("height","600px"),this.makeRootNode(o)},this.collapseAll=function(){x(o,!1).forEach((function(e){e.children=null})),M(o)},this.expandAll=function(){x(o,!1).forEach((function(e){e.children=e._children})),M(o)},this.smartCollapse=function(){A()},this.makeRootNode=function(e){o=e;var t=[];for(t.push(e);e._parent;)e=e._parent,t.push(e);this.path=t.reverse(),l.smartCollapse()},this.addEvents=function(e,t){if(t)for(var n in e)b=Math.min(b,e[n].positionEventNumber);for(var s in e){var a=e[s],u=JSON.parse(a.linkMetaData),c="$link"in u,h=c?u.$link.eventId:a.eventId;if(w[h]={},w[h].eventId=h,w[h].event=a,w[h].name=a.eventType,w[h]._children=[],w[h]._parent=null,w[h].timestamp=u.$eventTimestamp,a.positionEventNumber===b)o=w[h],l.draw();else try{var d=JSON.parse(a.metaData),f=i.causedByProperty,p=null;(p=c?u.$link.metadata[f]:d[f])?p in w?(w[h]._parent=w[p],w[p]._children.push(w[h])):(console.error("parent node not found: "+JSON.stringify(a)),r.failure("Parent node not found for event: "+h+" ("+f+": "+p+")")):(console.error("no "+f+" property on event: "+JSON.stringify(a)),r.failure("No "+f+" property on event: "+h))}catch(e){console.error(e),r.failure("An error has occured. Please check the console log for more details")}}o?M(o):(console.error("Root node does not exist."),r.failure("Root node does not exist.")),l.smartCollapse()},this.clearEvents=function(){w={},b=Number.MAX_SAFE_INTEGER},this},define("modules/visualize/controllers/_index",["./VisualizeEventFlowCtrl"],(function(){})),define("modules/visualize/services/_module",["angular"],(function(e){"use strict";return e.module("es-ui.visualize.services",[])})),define("modules/visualize/services/VisualizeService",["./_module"],(function(e){"use strict";return e.provider("VisualizeService",(function(){this.$get=[function(){return{}}]}))})),define("modules/visualize/services/_index",["./VisualizeService"],(function(){})),define("modules/visualize/templates/templates",["angular"],(function(e){"use strict";!function(t){try{t=e.module("es-ui.visualize.templates")}catch(n){t=e.module("es-ui.visualize.templates",[])}t.run(["$templateCache",function(e){e.put("visualize.eventflow.tpl.html",'<style>.node {\n\t  cursor: pointer;\n\t}\n\n\t.node circle {\n\t  fill: #fff;\n\t  stroke: #2E9625;\n\t  stroke-width: 1.5px;\n\t}\n\n\t.node text {\n\t  font: 14px sans-serif;\n\t}\n\n\t.link {\n\t  fill: none;\n\t  stroke: #ccc;\n\t  stroke-width: 1.5px;\n\t}\n\n\t.arrow{\n\t\tstroke-width:8;\n\t\tstroke:#000;\n\t}\n\n\t.tree_path{\n\t\tfont-size: 20px;\n\t\tfont-weight: bold;\n\t\tmargin-top: 10px;\n\t\tmargin-bottom: 10px;\n\t\tpadding: 6px 20px 6px 20px;\n\t}\n\n\t.tree_path_separator{\n\t\twidth: 40px;\n\t\tfloat: left;\n\t\tfont-weight: bold;\n\t\ttext-align: center;\n\t}\n\n\t#canvas{\n\t\twidth: 100%;\n\t\theight: 600px;\n\t}\n\n\t.input_controls{\n\t\twidth: 400px;\n\t\tfloat: left;\n\t}\n\n\t.input_controls div{\n\t\tmargin-bottom: 10px;\n\t}\n\n\t.input_controls label{\n\t\twidth: 140px;\n\t}\n\n\t.tips{\n\t\tfloat:right;\n\t\twidth: 400px;\n\t}\n\n\t.tips ul{\n\t\tmargin: 0;\n\t\tpadding: 0;\n\t}\n\n\t.event-details{\n\t\twidth: 350px;\n\t\tfloat: left;\n\t}\n\n\t.event-data{\n\t\tfloat: left;\n\t\twidth: 350px;\n\t}\n\n\t.event-data pre{\n\t\tbackground: #FCFCCF;\n\t\theight: 130px;\n\t\toverflow:scroll;\n\t}\n\n\t.edge-label{\n\t\tfont-size: 10px;\n\t}\n\t.node-timestamp{\n\t\tfont-size: 10px !important;\n\t}\n\n\t.node-name{\n\t\tfont-size: 13px !important;\n\t}\n\n\t.xaxis line{\n\tstroke: #2E9625;\n\tstroke-width: 1px;\n\t}\n\n\t.xaxis path{\n\tstroke: #2E9625;\n\tstroke-width: 1px;\n\t}\n\n\t.xaxis text{\n\tfill:black;\n\t}\n\n\t.projection-status-Running{\n\t\tcolor: green\n\t}\n\n\t.projection-status-Stopped{\n\t\tcolor: red\n\t}\n\n\t.visualize-form-table{\n\t\tborder: 0;\n\t}\n\n\t.visualize-form-table tbody td {\n\t\tborder: 0;\n\t}</style><header></header><div class=input_controls><h2>Event Flow Visualization</h2><form><table border=0 class=visualize-form-table><tr><td><label for=correlation_id_prop>Correlation ID property:</label></td><td><input class=input_control id=correlation_id_property ng-model=correlationIdProperty disabled=true></td></tr><tr><td><label for=caused_by_prop>Caused By property:</label></td><td><input class=input_control id=caused_by_property ng-model=causedByProperty></td></tr><tr><td><label for=correlation_id>Correlation ID:</label></td><td><input class=input_control id=correlation_id ng-model=correlationId></td></tr><tr><td colspan=2 class=page-nav__item><input type=submit ng-click=go() value="Let\'s go!"></td></tr></table></form></div><div class=event-details ng-if=selectedEvent><h2>Event Details</h2><div><div><strong>Type:</strong> {{selectedEvent.eventType}}</div><div><strong>Timestamp:</strong> {{selectedEvent.updated}}</div><div><strong>Event ID:</strong> {{selectedEvent.eventId}}</div><div><strong>Link:</strong> <a target=_blank href={{selectedEvent.id}}>{{selectedEvent.id}}</a></div></div></div><div class=event-data ng-if=selectedEvent><h2>Event Data</h2><pre>{{selectedEvent.data}}</pre></div><div class=tips><h2>Some tips to get started</h2><ul class=page-nav__item><li>Make sure that the <strong>$by_correlation_id</strong> projection is running.<br><strong>Current status: <span class=projection-status-{{projectionStatus}}>{{projectionStatus}}</span> <button ng-if="projectionStatus==\'Stopped\'" ng-click=startProjection()>Start</button></strong></li><li>Enter the <strong>Correlation ID</strong> of the event flow you want to visualize</li><li>Click on green events <svg height=12 width=12><circle cx=6 cy=6 r=5 fill=#2E9625 /></svg> to expand</li><li>Hover on events to see the event details</li><li>Hold your click on any event for 2 seconds make it the root node</li></ul></div><div style=clear:both></div><div class=tree_path><span ng-repeat="node in tree.path"><div class=tree_path_separator ng-if="$index > 0">></div><div style="float: left;" ng-click=tree.makeRootNode(node)><a href=javascript:;>{{ node.name }}</a></div></span><div style=clear:both></div></div><div class="tree_controls page-nav__item"><button ng-disabled=collapsingNodes ng-click=tree.collapseAll()>Collapse all</button> <button ng-disabled=collapsingNodes ng-click=tree.expandAll()>Expand all</button> <button ng-disabled=collapsingNodes ng-click=tree.smartCollapse()>Smart Collapse</button> <span ng-if=collapsingNodes><strong>Collapsing nodes for a better viewing experience...</strong></span></div><div id=canvas></div>')}])}(),function(t){try{t=e.module("es-ui.visualize.templates")}catch(n){t=e.module("es-ui.visualize.templates",[])}t.run(["$templateCache",function(e){e.put("visualize.tpl.html","<div ui-view></div>")}])}()})),define("modules/visualize/_index",["angular","uiRouter","./controllers/_index","./services/_index","./templates/templates"],(function(e){"use strict";return e.module("es-ui.visualize",["ui.router","es-ui.visualize.templates","es-ui.visualize.services","es-ui.visualize.controllers"])})),define("modules/visualize/module",["./_index"],(function(e){"use strict";return e.config(["$stateProvider",function(e){e.state("visualize",{url:"visualize",templateUrl:"visualize.tpl.html",parent:"app",abstract:!0,data:{title:"Visualize"}}).state("visualize.eventflow",{url:"/{correlationId}",templateUrl:"visualize.eventflow.tpl.html",controller:"VisualizeEventFlowCtrl",data:{title:"Event Flow Visualization"}})}])})),define("modules/license/controllers/_module",["angular"],(function(e){"use strict";return e.module("es-ui.license.controllers",["es-ui.license.services"])})),define("modules/license/controllers/LicenseDetailsCtrl",["./_module"],(function(e){"use strict";return e.controller("LicenseDetailsCtrl",["$scope","$state","$stateParams","LicenseService","MessageService",function(e,t,n,i,r){i.getLicense().then((function(t){e.license=t}),(function(e){console.error("Failed to get license: "+e.message)}))}])})),define("modules/license/controllers/_index",["./LicenseDetailsCtrl"],(function(){})),define("modules/license/services/_module",["angular"],(function(e){"use strict";return e.module("es-ui.license.services",[])})),define("modules/license/services/LicenseService",["./_module","moment"],(function(e,t){"use strict";return e.provider("LicenseService",(function(){this.$get=["$http","urls","UrlBuilder",function(e,n,i){return{getLicense:function(){var r=i.build(n.license.get);return e.get(r).then((function(e){var n=e.data,i=t.unix(Number(n.startDate)),r=n.daysRemaining,s="";if("True"===n.isExpired)s="Expired";else{var o=t().add(r,"days");s=t(o).isValid()?o.format("DD/MM/YYYY"):"-"}return{name:"KurrentDB",organization:n.company,startDate:i.format("DD/MM/YYYY"),endDate:s,daysRemaining:r,isExpired:"true"===n.isExpired.toLowerCase(),isValid:"true"===n.isValid.toLowerCase(),isTrial:"true"===n.isTrial.toLowerCase(),isFloating:"true"===n.isFloating.toLowerCase(),licenseMessage:n.notes}}),(function(e){return{licenseMessage:e.errorData}}))}}}]}))})),define("modules/license/services/_index",["./LicenseService"],(function(){})),define("modules/license/templates/templates",["angular"],(function(e){"use strict";!function(t){try{t=e.module("es-ui.license.templates")}catch(n){t=e.module("es-ui.license.templates",[])}t.run(["$templateCache",function(e){e.put("license.details.tpl.html","<div ui-view><header class=page-header><h2 class=page-title>License</h2></header><table class=table-queues><thead><tr><th>License Name</th><th>Organization</th><th>Start Date</th><th>End Date</th><th>Days Remaining</th><th>Valid</th><th>Trial</th><th>Floating</th></tr></thead><tbody><tr ng-hide=!license.name><td>{{ license.name }}</td><td>{{ license.organization }}</td><td>{{ license.startDate }}</td><td>{{ license.endDate }}</td><td>{{ license.daysRemaining }}</td><td>{{ license.isValid && 'Yes' || 'No' }}</td><td>{{ license.isTrial && 'Yes' || 'No' }}</td><td>{{ license.isFloating && 'Yes' || 'No' }}</td></tr><tr ng-hide=license.name><td colspan=8><em>There is no valid license, enterprise features disabled. <a href=https://www.eventstore.com/contact#contact-form>Click here</a> to request a trial</em></td></tr></tbody></table></div>")}])}(),function(t){try{t=e.module("es-ui.license.templates")}catch(n){t=e.module("es-ui.license.templates",[])}t.run(["$templateCache",function(e){e.put("license.tpl.html","<div ui-view></div>")}])}()})),define("modules/license/_index",["angular","uiRouter","./controllers/_index","./services/_index","./templates/templates"],(function(e){"use strict";return e.module("es-ui.license",["ui.router","es-ui.license.templates","es-ui.license.services","es-ui.license.controllers"])})),define("modules/license/module",["./_index"],(function(e){"use strict";return e.config(["$stateProvider",function(e){e.state("license",{parent:"app",url:"license",templateUrl:"license.tpl.html",abstract:!0,data:{title:"License"}}).state("license.details",{url:"",templateUrl:"license.details.tpl.html",controller:"LicenseDetailsCtrl",data:{title:"License Details"}})}])})),
+/**
+ * @license AngularJS v1.3.20
+ * (c) 2010-2014 Google, Inc. http://angularjs.org
+ * License: MIT
+ */
+function(e,t,n){"use strict";t.module("ngCookies",["ng"]).factory("$cookies",["$rootScope","$browser",function(e,n){var i,r={},s={},o=!1,a=t.copy,l=t.isUndefined;return n.addPollFn((function(){var t=n.cookies();i!=t&&(i=t,a(t,s),a(t,r),o&&e.$apply())}))(),o=!0,e.$watch((function(){var e,i,o,a;for(e in s)l(r[e])&&(n.cookies(e,undefined),delete s[e]);for(e in r)i=r[e],t.isString(i)||(i=""+i,r[e]=i),i!==s[e]&&(n.cookies(e,i),s[e]=i,a=!0);if(a)for(e in o=n.cookies(),r)r[e]!==o[e]&&(l(o[e])?(delete r[e],delete s[e]):r[e]=s[e]=o[e])})),r}]).factory("$cookieStore",["$cookies",function(e){return{get:function(n){var i=e[n];return i?t.fromJson(i):i},put:function(n,i){e[n]=t.toJson(i)},remove:function(t){delete e[t]}}}])}(window,window.angular),define("ngCookies",["angular"],function(e){return function(){return e.ngCookies}}(this)),define("services/_module",["angular","ngCookies"],(function(e){"use strict";return e.module("es-ui.services",["ngCookies"])})),define("services/Uri",["./_module"],(function(e){"use strict";return e.factory("uri",(function(){var e;return{parse:function(t){return e||(e=document.createElement("a")),e.href=t,{hash:e.hash,host:e.host,hostname:e.hostname,href:t,pathname:e.pathname,port:e.port,protocol:e.protocol,search:e.search,file:e.pathname.split("/").pop(),params:(n=e.search,i={},r=new RegExp("([^?=&]+)(=([^&]*))?","g"),n.replace(r,(function(e,t,n,r){i[t]=r})),i)};var n,i,r},getQuery:function(e){var t,n=[];for(t in e)n.push(t+"="+encodeURIComponent(e[t]));return n.join("&")}}}))})),define("services/Base64",["./_module"],(function(e){"use strict";return e.factory("Base64",["MessageService",function(e){var t=new TextEncoder("utf-8"),n=new TextDecoder("utf-8");return{encode:function(e){var n=t.encode(e),i=String.fromCodePoint(...n);return btoa(i)},decode:function(t){/[^A-Za-z0-9\+\/\=]/g.exec(t)&&e.failure("There were invalid base64 characters in the input text.\nValid base64 characters are A-Z, a-z, 0-9, '+', '/',and '='\nExpect errors in decoding.");var i=atob(t),r=Uint8Array.from(i,(e=>e.codePointAt(0)));return n.decode(r)}}}])})),define("services/Poller",["./_module"],(function(e){"use strict";return e.factory("poller",["$timeout","$q",function(e,t){var n=[];function i(e){this.deferred=t.defer(),this.opts=e,this.canceller=null,this.isPaused=!1}function r(){for(var e=0,t=n.length;e<t;e++)n[e].stop()}return i.prototype={resumePaused:function(){this.isPaused=!1,this.resume()},resume:function(){var n=this;n.isPaused||(n.canceller=t.defer(),function t(){var i=n.opts.params.slice();n.canceller&&(i.push({timeout:n.canceller.promise}),n.opts.action.apply(null,i).then((function(i){n.intervalId=e(t,n.opts.interval),n.deferred.notify(i.data)}),(function(e){n.deferred.reject(e)})))}())},start:function(){return this.resume(),this.promise=this.deferred.promise,this},pause:function(){this.canceller&&this.canceller.resolve("pausing"),e.cancel(this.intervalId),this.isPaused=!0},stop:function(){e.cancel(this.intervalId),this.canceller&&(this.canceller.resolve("pausing"),this.canceller=null)},update:function(e){e.interval=e.interval||this.opts.interval,e.params=e.params||this.opts.params,e.action=this.opts.action,this.opts=e}},{create:function(e){var t=new i(e);return n.push(t),t},stopAll:r,pauseAll:function(){for(var e=0,t=n.length;e<t;e++)n[e].pause()},resumePaused:function(){for(var e=0,t=n.length;e<t;e++)n[e].resumePaused()},clear:function(){r(),n=[]},resume:function(){for(var e=0,t=n.length;e<t;e++)n[e].resume()}}}])})),define("services/UrlBuilder",["./_module","angular"],(function(e,t){"use strict";return e.factory("UrlBuilder",["urls","$rootScope","SprintfService",function(e,n,i){return{simpleBuild:function(e,t){return i.format(e,decodeURIComponent(t))},buildWithoutBaseUrl:function(e){var n=[].slice.call(arguments,1),r=[];return r.push(e),t.forEach(n,(function(e){this.push(encodeURIComponent(e))}),r),e=i.format.apply(null,r)},build:function(e){var r=[].slice.call(arguments,1),s=[];return s.push(e),t.forEach(r,(function(e){this.push(encodeURIComponent(e))}),s),e=i.format.apply(null,s),n.baseUrl+e}}}])})),function(e){var t={not_string:/[^s]/,number:/[diefg]/,json:/[j]/,not_json:/[^j]/,text:/^[^\x25]+/,modulo:/^\x25{2}/,placeholder:/^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-gijosuxX])/,key:/^([a-z_][a-z_\d]*)/i,key_access:/^\.([a-z_][a-z_\d]*)/i,index_access:/^\[(\d+)\]/,sign:/^[\+\-]/};function n(){var e=arguments[0],t=n.cache;return t[e]&&t.hasOwnProperty(e)||(t[e]=n.parse(e)),n.format.call(null,t[e],arguments)}n.format=function(e,i){var s,o,a,l,u,c,h,d,f=1,p=e.length,g="",m=[],v=!0,y="";for(o=0;o<p;o++)if("string"===(g=r(e[o])))m[m.length]=e[o];else if("array"===g){if((l=e[o])[2])for(s=i[f],a=0;a<l[2].length;a++){if(!s.hasOwnProperty(l[2][a]))throw new Error(n("[sprintf] property '%s' does not exist",l[2][a]));s=s[l[2][a]]}else s=l[1]?i[l[1]]:i[f++];if("function"==r(s)&&(s=s()),t.not_string.test(l[8])&&t.not_json.test(l[8])&&"number"!=r(s)&&isNaN(s))throw new TypeError(n("[sprintf] expecting number but found %s",r(s)));switch(t.number.test(l[8])&&(v=s>=0),l[8]){case"b":s=s.toString(2);break;case"c":s=String.fromCharCode(s);break;case"d":case"i":s=parseInt(s,10);break;case"j":s=JSON.stringify(s,null,l[6]?parseInt(l[6]):0);break;case"e":s=l[7]?s.toExponential(l[7]):s.toExponential();break;case"f":s=l[7]?parseFloat(s).toFixed(l[7]):parseFloat(s);break;case"g":s=l[7]?parseFloat(s).toPrecision(l[7]):parseFloat(s);break;case"o":s=s.toString(8);break;case"s":s=(s=String(s))&&l[7]?s.substring(0,l[7]):s;break;case"u":s>>>=0;break;case"x":s=s.toString(16);break;case"X":s=s.toString(16).toUpperCase()}t.json.test(l[8])?m[m.length]=s:(!t.number.test(l[8])||v&&!l[3]?y="":(y=v?"+":"-",s=s.toString().replace(t.sign,"")),c=l[4]?"0"===l[4]?"0":l[4].charAt(1):" ",h=l[6]-(y+s).length,u=l[6]&&h>0?(d=c,Array(h+1).join(d)):"",m[m.length]=l[5]?y+s+u:"0"===c?y+u+s:u+y+s)}return m.join("")},n.cache={},n.parse=function(e){for(var n=e,i=[],r=[],s=0;n;){if(null!==(i=t.text.exec(n)))r[r.length]=i[0];else if(null!==(i=t.modulo.exec(n)))r[r.length]="%";else{if(null===(i=t.placeholder.exec(n)))throw new SyntaxError("[sprintf] unexpected placeholder");if(i[2]){s|=1;var o=[],a=i[2],l=[];if(null===(l=t.key.exec(a)))throw new SyntaxError("[sprintf] failed to parse named argument key");for(o[o.length]=l[1];""!==(a=a.substring(l[0].length));)if(null!==(l=t.key_access.exec(a)))o[o.length]=l[1];else{if(null===(l=t.index_access.exec(a)))throw new SyntaxError("[sprintf] failed to parse named argument key");o[o.length]=l[1]}i[2]=o}else s|=2;if(3===s)throw new Error("[sprintf] mixing positional and named placeholders is not (yet) supported");r[r.length]=i}n=n.substring(i[0].length)}return r};var i=function(e,t,i){return(i=(t||[]).slice(0)).splice(0,0,e),n.apply(null,i)};function r(e){return Object.prototype.toString.call(e).slice(8,-1).toLowerCase()}"undefined"!=typeof exports?(exports.sprintf=n,exports.vsprintf=i):(e.sprintf=n,e.vsprintf=i,"function"==typeof define&&define.amd&&define("sprintf",[],(function(){return{sprintf:n,vsprintf:i}})))}("undefined"==typeof window?this:window),define("services/SprintfService",["./_module","sprintf"],(function(e,t){"use strict";return e.factory("SprintfService",[function(){return{format:function(){var e=[].slice.call(arguments);return t.sprintf.apply(null,e)}}}])})),define("services/AuthService",["./_module"],(function(e){"use strict";return e.factory("AuthService",["Base64","$q","$cookies","$cookieStore","$http","$rootScope","$location","urls","UrlBuilder",function(e,t,n,i,r,s,o,a,l){function u(){var e=i.get("es-creds");return e?e.credentials:null}var c=u();return c&&(c=c.credentials),{setCredentials:function(t,n){var s=e.encode(t+":"+n);r.defaults.headers.common.Authorization="Basic "+s,function(t,n){var r=i.get("es-creds");r||(r={}),r={credentials:e.encode(t+":"+n)},i.put("es-creds",r)}(t,n)},loadCredentials:function(){var e=u();e&&(r.defaults.headers.common.Authorization="Basic "+e)},clearCredentials:function(){document.execCommand("ClearAuthenticationCache"),r.defaults.headers.common.Authorization=void 0,i.remove("es-creds")},existsAndValid:function(){var i,o=t.defer();if("insecure"===s.authentication.type)o.resolve();else if("OAuthAuthentication"===s.authentication.type){(i=n.oauth_id_token)&&(document.cookie="oauth_id_token=;path=/;max-age=-1",r.defaults.headers.common.Authorization="Bearer "+i);var a=r.defaults.headers.common.Authorization;void 0!==a&&a.startsWith("Bearer ")?o.resolve():o.reject("Not authenticated")}else{var l=u();if(l){var c=e.decode(l).split(":");this.validate(c[0],c[1]).success((function(){o.resolve()})).error((function(){o.reject("Wrong credentials")}))}else o.reject("Data does not exists")}return o.promise},resetCredentials:function(n,i){var r=t.defer(),s=u();return e.decode(s).split(":")[0]===n?this.validate(n,i).success((function(){r.resolve()})).error((function(){r.reject("Wrong credentials")})):r.resolve(),r.promise},validate:function(t,n){var i=e.encode(t+":"+n);return r.defaults.headers.common.Authorization="Basic "+(i||""),r.get(s.baseUrl+a.system.info,{headers:{Accept:"*/*",Authorization:"Basic "+i}})}}}])})),define("services/InfoService",["./_module"],(function(e){"use strict";return e.factory("InfoService",["$http","$rootScope","urls","UrlBuilder",function(e,t,n,i){return{getInfo:function(){var t=i.build(n.system.info);return e.get(t)},getOptions:function(){var t=i.build(n.system.options);return e.get(t)}}}])})),define("services/MessageService",["./_module"],(function(e){"use strict";return e.factory("MessageService",["toastr",function(e){function t(e,t){return{closeButton:!!e||"warning"===t,positionClass:e?"toast-container-modal toast-bottom-full-width":"toast-bottom-full-width",timeOut:e?0:"warning"===t?5e3:"info"===t||"success"===t?2e3:0}}function n(e,t){return(e=e||t)+" (tap notification to dismiss)"}return{success:function(i,r){e.success(i,n(r,"Success"),t(!1,"success"))},info:function(i,r){e.info(i,n(r,"Info"),t(!1,"info"))},warn:function(i,r){e.warning(i,n(r,"Warning"),t(!1,"warning"))},failure:function(i,r){e.error(i,n(r,"Failure"),t(!0,"failure"))},confirm:function(e){return confirm(e)}}}])})),define("services/ScavengeNotificationService",["./_module"],(function(e){"use strict";return e.factory("ScavengeNotificationService",["$http","$timeout","$rootScope","AdminService","MessageService","constants",function(e,t,n,i,r,s){var o="";return{start:function e(){i.lastScavengeStatus().then((function(e){e.data.entries.length>0&&(o=e.data.entries[0].eventId);var n=function(){i.lastScavengeStatus().then((function(e){!function(e){if(e.data&&e.data.entries.length>0){var t=e.data.entries[0];if(t.eventId!==o){o=t.eventId;var n=JSON.parse(t.data),i="Scavenge "+n.scavengeId;"$scavengeStarted"===t.eventType?(i+=" initiated",r.success(i)):n.error?(i+=" failed",r.failure(i)):"Stopped"===n.result?(i+=" stopped",r.success(i)):(i+=" completed",r.success(i))}}}(e),t((function(){n()}),s.scavengeStatus.pollInterval)}),(function(e){401!==e.statusCode&&r.failure("Failed to retrieve last scavenge status: "+e.message)}))};n()}),(function(n){401!==n.statusCode&&(404===n.statusCode?t((function(){e()}),s.scavengeStatus.pollInterval):r.failure("Failed to retrieve last scavenge status: "+n.message))}))}}}])})),define("services/_index",["./Uri","./Base64","./Poller","./UrlBuilder","./SprintfService","./AuthService","./InfoService","./MessageService","./ScavengeNotificationService"],(function(){})),define("directives/_module",["angular"],(function(e){"use strict";return e.module("es-ui.directives",[])})),define("directives/EsValidateEquals",["./_module"],(function(e){"use strict";return e.directive("esValidateEquals",[function(){return{restrict:"A",require:"ngModel",link:function(e,t,n,i){function r(e,t){return e===t?(i.$setValidity("equal",!0),e):void i.$setValidity("equal",!1)}e.$watch(n.esValidateEquals,(function(e){r(i.$viewValue,e)})),i.$parsers.unshift((function(t){return r(t,e.$eval(n.esValidateEquals))})),i.$formatters.unshift((function(t){return r(t,e.$eval(n.esValidateEquals))}))}}}])})),define("directives/EsHeight",["./_module"],(function(e){"use strict";return e.directive("esHeight",[function(){return{restrict:"A",link:function(e,t){t.parent().addClass("login-height")}}}])})),define("directives/EsAutoFocus",["./_module"],(function(e){"use strict";return e.directive("esAutoFocus",["$timeout",function(e){return{restrict:"AC",link:function(t,n){e((function(){n[0].focus()}),0)}}}])})),define("directives/_index",["./EsValidateEquals","./EsHeight","./EsAutoFocus"],(function(){})),define("templates/templates",["angular"],(function(e){"use strict";!function(t){try{t=e.module("es-ui.templates")}catch(n){t=e.module("es-ui.templates",[])}t.run(["$templateCache",function(e){e.put("es-toggable-row.tpl.html",'<td ng-if=esQueue.show>{{ esQueue.queueName }} <a class=table-collapsetoggle>&minus;</a></td><td ng-if=!esQueue.show>{{ esQueue.queueName }} <a class=table-collapsetoggle>&plus;</a></td><td>{{ esQueue.lengthCurrentTryPeak }}</td><td>{{ esQueue.lengthLifetimePeak }}</td><td>{{ esQueue.avgItemsPerSecond }}</td><td>{{ esQueue.avgProcessingTime.toFixed(3)}}</td><td>{{ esQueue.busy }}</td><td>{{ esQueue.totalItemsProcessed }}</td><td style="text-align: right">n/a</td>')}])}(),function(t){try{t=e.module("es-ui.templates")}catch(n){t=e.module("es-ui.templates",[])}t.run(["$templateCache",function(e){e.put("index.tpl.html","<header class=site-header><h1 class=site-title><a ui-sref=dashboard.list><img src=images/logo.svg height=29 width=119 alt=Kurrent></a></h1><ul class=site-nav ng-hide=hideMenuOptions><li class=site-nav__item ng-class=\"{'site-nav__item--active': $state.includes('dashboard') }\"><a ui-sref=dashboard.list>Dashboard</a></li><li ng-if=!singleNode class=site-nav__item ng-class=\"{'site-nav__item--active': $state.includes('clusterstatus') }\"><a ui-sref=clusterstatus.list>Cluster Status</a></li><li class=site-nav__item ng-class=\"{'site-nav__item--active': $state.includes('streams') }\" title=\"{{!streamsBrowserEnabled ? atomDisabledMessage : ''}}\"><a ng-class=\"{'disabled':!streamsBrowserEnabled}\" ui-sref=streams.list>Stream Browser</a></li><li class=site-nav__item ng-class=\"{'site-nav__item--active': $state.includes('projections') }\" title=\"{{!projectionsEnabled ? projectionsNotRunningMessage : ''}}\"><a ng-class=\"{'disabled': !projectionsEnabled}\" ui-sref=projections.list>Projections</a></li><li class=site-nav__item ng-class=\"{'site-nav__item--active': $state.includes('query') }\" title=\"{{!projectionsEnabled ? projectionsNotRunningMessage : ''}}\"><a ng-class=\"{'disabled':!projectionsEnabled}\" ui-sref=query>Query</a></li><li class=site-nav__item ng-class=\"{'site-nav__item--active': $state.includes('visualize') }\" title=\"{{!projectionsEnabled ? projectionsNotRunningMessage : ''}}\"><a ng-class=\"{'disabled':!projectionsEnabled}\" ui-sref=visualize.eventflow>Visualize</a></li><li class=site-nav__item ng-class=\"{'site-nav__item--active': $state.includes('competing') }\"><a ui-sref=subscriptions.list>Persistent Subscriptions</a></li><li class=site-nav__item ng-class=\"{'site-nav__item--active': $state.includes('license') }\"><a ui-sref=license.details>License</a></li><li class=site-nav__item ng-class=\"{'site-nav__item--active': $state.includes('admin') }\"><a ui-sref=admin>Admin</a></li><li class=site-nav__item ng-class=\"{'site-nav__item--active': $state.includes('users') }\"><a ng-class=\"{'disabled': !userManagementEnabled}\" ui-sref=users.list>Users</a></li><li class=site-nav__item ng-class=\"{'site-nav__item--active': $state.includes('signout') }\"><a ng-class=\"{'disabled': !logoutEnabled}\" ui-sref=signout>{{ logoutButtonText }}</a></li></ul></header><header class=navigator-banner-header><a href=https://developers.eventstore.com/navigator/ >The Admin UI is being replaced by <b>Navigator</b></a></header><header class=\"license-header invalid-license\" ng-if=\"licenseInvalid && licenseMessage\"><a href=https://www.eventstore.com/contact#contact-form class=invalid-license>{{ licenseMessage }}</a></header><main class=site-main><div ui-view></div></main><footer class=site-footer><p>KurrentDB {{ esVersion }} &middot; <a href=https://eventstore.com/docs/ target=_blank>Documentation</a> &middot; <a href=https://eventstore.com/support/ target=_blank>Support</a></p></footer>")}])}()})),define("templates/_index",["./templates"],(function(){})),define("es-ui",["angular","uiRouter","uiUtils","uiAce","ngToastr","angular-clipboard","./modules/projections/module","./modules/admin/module","./modules/dashboard/module","./modules/clusterstatus/module","./modules/streams/module","./modules/security/module","./modules/users/module","./modules/competing/module","./modules/visualize/module","./modules/license/module","./services/_index","./directives/_index","./templates/_index"],(function(e){"use strict";return e.module("es-ui",["es-ui.projections","es-ui.admin","es-ui.dashboard","es-ui.clusterstatus","es-ui.streams","es-ui.users","es-ui.competing","es-ui.security","es-ui.directives","es-ui.services","es-ui.templates","es-ui.visualize","es-ui.license","ui.router","ui.utils","ui.ace","toastr","angular-clipboard"])})),define("run",["es-ui"],(function(e){"use strict";return e.config(["toastrConfig",function(e){angular.extend(e,{timeOut:0,preventDuplicates:!0})}]),e.run(["$rootScope","$location","$state","$stateParams","AuthService","InfoService","LicenseService","MessageService","$http",function(e,t,n,i,r,s,o,a,l){function u(){if(e.previousUrl&&"/"!==e.previousUrl){var i=e.previousUrl;e.previousUrl=null,t.path(i)}else n.go("dashboard.list")}e.baseUrl=t.protocol()+"://"+t.host()+":"+t.port(),e.projectionsEnabled=!1,e.userManagementEnabled=!1,e.streamsBrowserEnabled=!1,e.licenseInvalid=!1,e.licenseMessage="",e.initialized=!1,e.logoutEnabled=!0,e.logoutButtonText="Log Out",e.logoutText="You have been logged out.",e.singleNode=!0,r.loadCredentials(),s.getInfo().then((function(i){var c=i.data;e.esVersion=c.esVersion||"0.0.0.0",e.esVersion="0.0.0.0"===e.esVersion?"development build":e.esVersion,e.projectionsEnabled=!0===c.features.projections,e.userManagementEnabled=!0===c.features.userManagement,e.streamsBrowserEnabled=!0===c.features.atomPub,e.authentication=c.authentication,e.logoutEnabled="insecure"!==c.authentication.type,e.logoutButtonText="OAuthAuthentication"===c.authentication.type?"Disconnect":e.logoutButtonText,e.logoutText="OAuthAuthentication"===c.authentication.type?"You have been disconnected.":e.logoutText,e.previousUrl=t.$$path,e.initialized=!0,e.$broadcast("initialized"),r.existsAndValid().then((function(){s.getOptions().then((function(t){var n=t.data;for(var i in n)"ClusterSize"===n[i].name&&n[i].value>1&&(e.singleNode=!1)}),(function(e){401!==e.statusCode&&a.failure("Failed to load options: "+e.message)})),o.getLicense().then((function(t){t.isExpired?(e.licenseInvalid=!0,e.licenseMessage=t.name+" licensed to "+t.organization+" has expired"):t.isValid?(e.licenseInvalid=!1,e.licenseMessage=t.name+" licensed to "+t.organization):(e.licenseInvalid=!0,e.licenseMessage=t.licenseMessage),u()}),(function(){console.error("Could not load license information"),e.licenseInvalid=!0,e.licenseMessage="Could not load license information",u()}))}),(function(){if("OAuthAuthentication"===e.authentication.type){var t=e.authentication.properties.authorization_endpoint,i=encodeURIComponent(e.authentication.properties.client_id),r=encodeURIComponent(e.authentication.properties.response_type),s=encodeURIComponent(e.authentication.properties.scope),o=e.baseUrl+e.authentication.properties.code_challenge_uri;l.get(o).then((function(n){var o=n.data.code_challenge,a=n.data.code_challenge_method,l={code_challenge_correlation_id:n.data.code_challenge_correlation_id};l=btoa(JSON.stringify(l));var u=encodeURIComponent(e.baseUrl+e.authentication.properties.redirect_uri),c=t+"?response_type="+r+"&client_id="+i+"&redirect_uri="+u+"&scope="+s+"&code_challenge="+o+"&code_challenge_method="+a+"&state="+l;window.location.href=c}),(function(){a.failure("Could not fetch OAuth code challenge")}))}else n.go("signin")}))}),(function(e){a.failure("Failed to load /info endpoint: "+e.message),r.clearCredentials()})),e.$state=n,e.$stateParams=i}])})),define("config/constants",["es-ui"],(function(e){"use strict";return e.constant("constants",{projectionStatus:{running:"Running",stopped:"Stopped"},scavengeStatus:{pollInterval:2e3},tcpStats:{pollInterval:1e3},clusterStatus:{replicaPollInterval:1e3}})})),define("config/urls",["es-ui"],(function(e){"use strict";return e.value("baseUrl",""),e.constant("urls",{base:"https://127.0.0.1:2113",stats:"/stats",tcpStats:"/stats/tcp",replicationStats:"/stats/replication",admin:{shutdown:"/admin/shutdown",scavenge:"/admin/scavenge",login:"/admin/login"},gossip:"/gossip",users:{list:"/users/",get:"/users/%s",current:"/users/$current",create:"/users/",update:"/users/%s",remove:"/users/%s",disable:"/users/%s/command/disable",enable:"/users/%s/command/enable",resetPassword:"/users/%s/command/reset-password"},query:{create:"/projections/transient?",update:"%s/query?emit=no",state:"%s/state",commands:{enable:"%s/command/enable",disable:"%s/command/disable",reset:"%s/command/reset"}},projections:{any:"/projections/any",allNonTransient:"/projections/all-non-transient",disable:"/command/disable",enable:"/command/enable",create:"/projections/%s?",createStandard:"/projections/continuous?emit=yes&checkpoints=yes&enabled=yes&name=%s&type=%s",state:"%s/state",result:"%s/result",statistics:"%s/statistics",remove:"%s?",query:"%s/query?config=yes",updateQuery:"%s/query?emit=",updatePlainQuery:"%s/query",queryWithoutConfig:"%s/query?config=no",readEvents:"/projections/read-events",commands:{reset:"%s/command/reset",enable:"%s/command/enable",disable:"%s/command/disable"},configuration:"%s/config"},streams:{base:"%s",recent:"/streams/$all/head/100?embed=rich",created:"/streams/$streams/head/50?embed=rich",events:"/streams/%s",eventDetails:"/streams/%s/%s?embed=tryharder",tryharder:"?embed=tryharder",metadata:"/streams/%s%s/head",updateAcl:"/streams/$$%s",scavenges:"/streams/$scavenges"},system:{subsystems:"/sys/subsystems",info:"/info",options:"/info/options"},competing:{subscriptions:"/subscriptions?offset=%s&count=%s",subscriptionDetails:"/subscriptions/%s/%s/info",create:"/subscriptions/%s/%s",update:"/subscriptions/%s/%s",delete:"/subscriptions/%s/%s",replayParked:"/subscriptions/%s/%s/replayParked",parkedQueue:"$persistentsubscription-%s::%s-parked",viewParkedMessagesBackward:"/subscriptions/viewparkedmessages/%s/%s/%s/backward/%s?embed=tryharder",viewParkedMessagesForward:"/subscriptions/viewparkedmessages/%s/%s/%s/forward/%s?embed=tryharder"},license:{get:"/license"}})})),define("config/values",["es-ui"],(function(e){"use strict";return e.value("baseUrl",{})})),define("config/http",["es-ui"],(function(e){"use strict";return e.config(["$httpProvider",function(e){e.defaults.headers.common.Accept="application/json",e.defaults.headers.get={"ES-LongPoll":5},e.interceptors.push(["$q",function(e){return{responseError:function(t){var n=e.defer(),i={400:"Bad Request",401:"Unauthorized",403:"Forbidden",404:"Not Found",405:"Method Not Allowed",406:"Not Acceptable",409:"Conflict",500:"Internal Server Error",502:"Bad Gateway",503:"Service Unavailable"},r={message:"Unknown error",statusCode:t.status,errorData:t.data},s=t.headers()["content-type"];return s&&-1!==s.indexOf("text/plain")&&""!==t.data?r.message=t.data:""!==t.statusText?r.message=t.statusText:t.status in i&&(r.message=i[t.status]),n.reject(r),n.promise}}}])}])})),define("config/qDecorator",["es-ui"],(function(e){"use strict";return e.config(["$stateProvider","$urlRouterProvider","$httpProvider","$provide",function(e,t,n,i){i.decorator("$q",["$delegate",function(e){var t=e;return t.allSettled=t.allSettled||function(e){var n=t.defer();if(!angular.isArray(e))throw"allSettled can only handle an array of promises (for now)";var i=[],r=[],s=!1;angular.forEach(e,(function(e,t){i[t]=!1}));var o=function(e,t,n,i){var r=!0;angular.forEach(e,(function(e){e||(r=!1)})),r&&(i?n.reject(t):n.resolve(t))};return angular.forEach(e,(function(e,a){t.when(e).then((function(e){i[a]=!0,r[a]=e,o(i,r,n,s)}),(function(e){i[a]=!0,r[a]=e,o(i,r,n,s=!0)}))})),n.promise},t}])}])})),define("config/routes",["es-ui"],(function(e){"use strict";return e.config(["$stateProvider","$urlRouterProvider",function(e,t){t.otherwise("/"),e.state("app",{url:"/",templateUrl:"index.tpl.html",abstract:!0,controller:["$scope",function(e){e.notAdminMessage="You must be an admin to view this item",e.notAdminOrOpsMessage="You must be in the $admins or $ops group to view this item",e.projectionsNotRunningMessage="Projections are not running",e.atomDisabledMessage="AtomPub over HTTP has been disabled on the server"}]})}])})),
+/**
+ * @license RequireJS domReady 2.0.1 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
+ * see: http://github.com/requirejs/domReady for details
+ */
+define("domReady",[],(function(){"use strict";var e,t,n,i="undefined"!=typeof window&&window.document,r=!i,s=i?document:null,o=[];function a(){var e=o;r&&e.length&&(o=[],function(e){var t;for(t=0;t<e.length;t+=1)e[t](s)}(e))}function l(){r||(r=!0,n&&clearInterval(n),a())}if(i){if(document.addEventListener)document.addEventListener("DOMContentLoaded",l,!1),window.addEventListener("load",l,!1);else if(window.attachEvent){window.attachEvent("onload",l),t=document.createElement("div");try{e=null===window.frameElement}catch(e){}t.doScroll&&e&&window.external&&(n=setInterval((function(){try{t.doScroll(),l()}catch(e){}}),30))}"complete"===document.readyState&&l()}function u(e){return r?e(s):o.push(e),u}return u.version="2.0.1",u.load=function(e,t,n,i){i.isBuild?n(null):u(n)},u})),define("bootstrap",["require","angular","es-ui","run","./config/constants","./config/urls","./config/values","./config/http","./config/qDecorator","./config/routes"],(function(e,t){"use strict";e(["domReady!"],(function(e){t.bootstrap(e,["es-ui"])}))})),define("es-dist-main",["bootstrap","ace"],(function(e,t){var n=ace.require("ace/config"),i="js/ace";n.set("packaged",!0),n.set("workerPath",location.href.replace(location.hash,"").replace("index.html","")+i),n.set("modePath",i),n.set("themePath",i),n.set("basePath",i)})),require(["es-dist-main"]);
\ No newline at end of file
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/js/requirejs.min.js b/src/KurrentDB.ClusterNode.Web/clusternode-web/js/requirejs.min.js
similarity index 100%
rename from src/EventStore.ClusterNode.Web/clusternode-web/js/requirejs.min.js
rename to src/KurrentDB.ClusterNode.Web/clusternode-web/js/requirejs.min.js
diff --git a/src/EventStore.ClusterNode.Web/projections/es.projections.environment.js b/src/KurrentDB.ClusterNode.Web/projections/es.projections.environment.js
similarity index 100%
rename from src/EventStore.ClusterNode.Web/projections/es.projections.environment.js
rename to src/KurrentDB.ClusterNode.Web/projections/es.projections.environment.js
diff --git a/src/EventStore.Common.Tests/Configuration/ConfigurationRootExtensionsTest.cs b/src/KurrentDB.Common.Tests/Configuration/ConfigurationRootExtensionsTest.cs
similarity index 82%
rename from src/EventStore.Common.Tests/Configuration/ConfigurationRootExtensionsTest.cs
rename to src/KurrentDB.Common.Tests/Configuration/ConfigurationRootExtensionsTest.cs
index b0944ef899a..272ad8d4610 100644
--- a/src/EventStore.Common.Tests/Configuration/ConfigurationRootExtensionsTest.cs
+++ b/src/KurrentDB.Common.Tests/Configuration/ConfigurationRootExtensionsTest.cs
@@ -1,23 +1,26 @@
-using EventStore.Common.Configuration;
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Common.Configuration;
 using Microsoft.Extensions.Configuration;
 
-namespace EventStore.Common.Tests.Configuration;
+namespace KurrentDB.Common.Tests.Configuration;
 
 public class ConfigurationRootExtensionsTest {
 	const string GOSSIP_SEED = "GossipSeed";
-	
+
 	[Fact]
 	public void successful_comma_separated_value() {
 		var config = new Dictionary<string, string?> {
 			{ GOSSIP_SEED, "nodeb.eventstore.test:2113,nodec.eventstore.test:3113" }
 		};
-		
+
 		var configuration = new ConfigurationBuilder()
 			.AddInMemoryCollection(config)
 			.Build();
-		
+
 		var values = configuration.GetCommaSeparatedValueAsArray("GossipSeed");
-		
+
 		Assert.Equal(2, values.Length);
 	}
 
@@ -26,7 +29,7 @@ public void invalid_delimiter() {
 		var config = new Dictionary<string, string?> {
 			{ GOSSIP_SEED, "nodeb.eventstore.test:2113;nodec.eventstore.test:3113" }
 		};
-		
+
 		var configuration = new ConfigurationBuilder()
 			.AddInMemoryCollection(config)
 			.Build();
@@ -34,7 +37,7 @@ public void invalid_delimiter() {
 		Assert.Throws<ArgumentException>(() =>
 			configuration.GetCommaSeparatedValueAsArray("GossipSeed"));
 	}
-	
+
 	[Fact]
 	public void mixed_invalid_delimiter() {
 		var config = new Dictionary<string, string?> {
diff --git a/src/KurrentDB.Common.Tests/Configuration/SectionTests.cs b/src/KurrentDB.Common.Tests/Configuration/SectionTests.cs
new file mode 100644
index 00000000000..709a6840bab
--- /dev/null
+++ b/src/KurrentDB.Common.Tests/Configuration/SectionTests.cs
@@ -0,0 +1,62 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Reflection;
+using KurrentDB.Common.Configuration;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration.Memory;
+
+namespace KurrentDB.Common.Tests.Configuration;
+
+public class SectionTests {
+	[Fact]
+	public void SanityCheck() {
+		var config = new ConfigurationBuilder()
+			.AddInMemoryCollection(new Dictionary<string, string?> {
+				{"a", "v a"},
+				{"sub:a", "v sub:a"},
+			})
+			.AddSection("section2", b => b
+				.AddInMemoryCollection(new Dictionary<string, string?> {
+					{"a", "v section2:a"},
+					{"b", "v section2:b"},
+					{"sub:a", "v section2:sub:a"},
+				})
+				.AddInMemoryCollection(new Dictionary<string, string?> {
+					{"a", "v section2:a2"},
+					{"c", "v section2:c"},
+					{"sub:b", "v section2:sub:b"},
+				}))
+			.AddSection("section3", b => b
+				.AddInMemoryCollection(new Dictionary<string, string?> {
+					{"a", "v section3:a"},
+				}))
+			.Build();
+
+		Assert.Equal("v a", config["a"]);
+		Assert.Equal("v sub:a", config.GetSection("sub")["a"]);
+
+		Assert.Equal("v section2:a2", config.GetSection("section2")["a"]);
+		Assert.Equal("v section2:b", config.GetSection("section2")["b"]);
+		Assert.Equal("v section2:c", config.GetSection("section2")["c"]);
+
+		Assert.Equal("v section2:sub:a", config.GetSection("section2").GetSection("sub")["a"]);
+		Assert.Equal("v section2:sub:b", config.GetSection("section2").GetSection("sub")["b"]);
+
+		Assert.Equal("v section3:a", config.GetSection("section3")["a"]);
+
+		// SectionProvider reloads when mounted section changes
+		var sectionProvider = config.Providers.OfType<SectionProvider>().First();
+		var memConfigProvider = sectionProvider.Providers.OfType<MemoryConfigurationProvider>().First();
+		memConfigProvider.Add("new", "v section2:new");
+		typeof(ConfigurationProvider).GetMethod("OnReload", BindingFlags.Instance | BindingFlags.NonPublic)!.Invoke(memConfigProvider, null);
+
+		Assert.Equal("v section2:new", config.GetSection("section2")["new"]);
+
+		// can get the provider for a key
+		Assert.True(sectionProvider.TryGet("section2:a", out var value));
+		Assert.Equal("v section2:a2", value);
+		Assert.True(sectionProvider.TryGetProviderFor("section2:a", out var provider));
+		Assert.IsType<MemoryConfigurationProvider>(provider);
+	}
+}
diff --git a/src/KurrentDB.Common.Tests/KurrentDB.Common.Tests.csproj b/src/KurrentDB.Common.Tests/KurrentDB.Common.Tests.csproj
new file mode 100644
index 00000000000..f7c70468467
--- /dev/null
+++ b/src/KurrentDB.Common.Tests/KurrentDB.Common.Tests.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<IsPackable>false</IsPackable>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+		<PackageReference Include="System.Net.Http" Version="4.3.4" />
+		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
+		<PackageReference Include="xunit" Version="2.9.3" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="coverlet.collector" Version="6.0.4">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.Common\KurrentDB.Common.csproj" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.Common.Tests/Usings.cs b/src/KurrentDB.Common.Tests/Usings.cs
new file mode 100644
index 00000000000..81814f1af1e
--- /dev/null
+++ b/src/KurrentDB.Common.Tests/Usings.cs
@@ -0,0 +1,4 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+global using Xunit;
diff --git a/src/KurrentDB.Common.Tests/Utils/JsonTests.cs b/src/KurrentDB.Common.Tests/Utils/JsonTests.cs
new file mode 100644
index 00000000000..2110996884f
--- /dev/null
+++ b/src/KurrentDB.Common.Tests/Utils/JsonTests.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Common.Tests.Utils;
+
+public class JsonTests {
+	[Theory]
+	[InlineData("""
+		{
+			"some": "actually",
+			"correct": ["json", true, false, null]
+		}
+		""")]
+	[InlineData("""
+		// a comment
+		{
+			// b comment
+			"foo": "bar", // cheeky trailing comma
+			// c comment
+		}
+		// d comment
+		""")]
+	public void accepts_valid(string json) {
+		Assert.True(new ReadOnlyMemory<byte>(Encoding.UTF8.GetBytes(json)).IsValidUtf8Json());
+	}
+
+	[Theory]
+	[InlineData("")]
+	[InlineData("{} invalid")]
+	[InlineData("""{ "foo": "bar", invalid }""")]
+	[InlineData("""
+		// comment
+		{ "foo": "bar" }
+		invalid
+		""")]
+	[InlineData("""
+		{ "foo": "bar" }
+		invalid
+		""")]
+	[InlineData("""
+		{ "foo": "bar" }
+		{ "foo": "bar" }
+		""")]
+	public void rejects_invalid(string invalidJson) {
+		Assert.False(new ReadOnlyMemory<byte>(Encoding.UTF8.GetBytes(invalidJson)).IsValidUtf8Json());
+	}
+
+	[Theory]
+	[InlineData(64, true)]
+	[InlineData(65, false)]
+	public void check_depth(int depth, bool isValid) {
+		var json =
+			new string('[', depth) +
+			new string(']', depth);
+
+		Assert.Equal(isValid, new ReadOnlyMemory<byte>(Encoding.UTF8.GetBytes(json)).IsValidUtf8Json());
+	}
+
+	[Fact]
+	public void rejects_bom() {
+		var json = new byte[] {
+			0xEF, 0xBB, 0xBF, // bom
+			(byte)'{',
+			(byte)'}',
+		};
+		Assert.False(new ReadOnlyMemory<byte>(json).IsValidUtf8Json());
+	}
+
+	[Fact]
+	public void utf16_is_not_valid() {
+		var json = """{ "foo": "bar" }""";
+		Assert.False(new ReadOnlyMemory<byte>(Encoding.Unicode.GetBytes(json)).IsValidUtf8Json());
+	}
+}
diff --git a/src/KurrentDB.Common/Configuration/ConfigurationRootExtensions.cs b/src/KurrentDB.Common/Configuration/ConfigurationRootExtensions.cs
new file mode 100644
index 00000000000..c5da1a7aa67
--- /dev/null
+++ b/src/KurrentDB.Common/Configuration/ConfigurationRootExtensions.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System;
+using Microsoft.Extensions.Configuration;
+
+namespace KurrentDB.Common.Configuration;
+
+public static class ConfigurationRootExtensions {
+	private static readonly string[] INVALID_DELIMITERS = [";", "\t"];
+
+	public static string[] GetCommaSeparatedValueAsArray(this IConfiguration configuration, string key) {
+		var value = configuration.GetValue<string?>(key);
+		if (string.IsNullOrEmpty(value)) {
+			return Array.Empty<string>();
+		}
+
+		foreach (var invalidDelimiter in INVALID_DELIMITERS) {
+			if (value.Contains(invalidDelimiter)) {
+				throw new ArgumentException($"Invalid delimiter {invalidDelimiter} for {key}");
+			}
+		}
+
+		return value.Split(',', StringSplitOptions.RemoveEmptyEntries);
+	}
+}
diff --git a/src/KurrentDB.Common/Configuration/DeprecatedAttribute.cs b/src/KurrentDB.Common/Configuration/DeprecatedAttribute.cs
new file mode 100644
index 00000000000..cebe6098e80
--- /dev/null
+++ b/src/KurrentDB.Common/Configuration/DeprecatedAttribute.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Common.Configuration;
+
+[AttributeUsage(AttributeTargets.Property)]
+public class DeprecatedAttribute(string message) : Attribute {
+	public string Message { get; } = message;
+}
diff --git a/src/KurrentDB.Common/Configuration/EnvironmentOnlyAttribute.cs b/src/KurrentDB.Common/Configuration/EnvironmentOnlyAttribute.cs
new file mode 100644
index 00000000000..8b88d4db62e
--- /dev/null
+++ b/src/KurrentDB.Common/Configuration/EnvironmentOnlyAttribute.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Common.Configuration;
+
+[AttributeUsage(AttributeTargets.Property)]
+public class EnvironmentOnlyAttribute(string message) : Attribute {
+	public string Message { get; } = message;
+}
diff --git a/src/KurrentDB.Common/Configuration/ExperimentalOptions.cs b/src/KurrentDB.Common/Configuration/ExperimentalOptions.cs
new file mode 100644
index 00000000000..47a37c9c2cb
--- /dev/null
+++ b/src/KurrentDB.Common/Configuration/ExperimentalOptions.cs
@@ -0,0 +1,8 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Common.Configuration;
+
+public class ExperimentalOptions {
+	public bool AsyncIO { get; set; }
+}
diff --git a/src/KurrentDB.Common/Configuration/MetricsConfiguration.cs b/src/KurrentDB.Common/Configuration/MetricsConfiguration.cs
new file mode 100644
index 00000000000..4f09bf08223
--- /dev/null
+++ b/src/KurrentDB.Common/Configuration/MetricsConfiguration.cs
@@ -0,0 +1,193 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.Configuration;
+
+namespace KurrentDB.Common.Configuration;
+
+public class MetricsConfiguration {
+	public static MetricsConfiguration Get(IConfiguration configuration) =>
+		configuration
+			.GetSection("KurrentDB:Metrics")
+			.Get<MetricsConfiguration>() ?? new();
+
+	public enum StatusTracker {
+		Index = 1,
+		Node,
+		Scavenge,
+	}
+
+	public enum Checkpoint {
+		Chaser = 1,
+		Epoch,
+		Index,
+		Proposal,
+		Replication,
+		StreamExistenceFilter,
+		Truncate,
+		Writer,
+	}
+
+	public enum IncomingGrpcCall {
+		Current = 1,
+		Total,
+		Failed,
+		Unimplemented,
+		DeadlineExceeded,
+	}
+
+	public enum GrpcMethod {
+		StreamRead = 1,
+		StreamAppend,
+		StreamBatchAppend,
+		StreamDelete,
+		StreamTombstone,
+	}
+
+	public enum GossipTracker {
+		PullFromPeer = 1,
+		PushToPeer,
+		ProcessingPushFromPeer,
+		ProcessingRequestFromPeer,
+		ProcessingRequestFromGrpcClient,
+		ProcessingRequestFromHttpClient,
+	}
+
+	public enum WriterTracker {
+		FlushSize = 1,
+		FlushDuration,
+	}
+
+	public enum EventTracker {
+		Read = 1,
+		Written,
+	}
+
+	public enum Cache {
+		StreamInfo = 1,
+		Chunk,
+	}
+
+	public enum KestrelTracker {
+		ConnectionCount = 1,
+	}
+
+	public enum SystemTracker {
+		Cpu = 1,
+		LoadAverage1m,
+		LoadAverage5m,
+		LoadAverage15m,
+		FreeMem,
+		TotalMem,
+		DriveTotalBytes,
+		DriveUsedBytes,
+	}
+
+	public enum ProcessTracker {
+		UpTime = 1,
+		Cpu,
+		MemWorkingSet,
+		MemPagedBytes,
+		MemVirtualBytes,
+		ThreadCount,
+		ThreadPoolPendingWorkItemCount,
+		LockContentionCount,
+		ExceptionCount,
+		Gen0CollectionCount,
+		Gen1CollectionCount,
+		Gen2CollectionCount,
+		Gen0Size,
+		Gen1Size,
+		Gen2Size,
+		LohSize,
+		TimeInGc,
+		HeapSize,
+		HeapFragmentation,
+		TotalAllocatedBytes,
+		DiskReadBytes,
+		DiskReadOps,
+		DiskWrittenBytes,
+		DiskWrittenOps,
+		GcPauseDuration,
+	}
+
+	public enum QueueTracker {
+		Busy = 1,
+		Length,
+		Processing,
+	}
+
+	public class LabelMappingCase {
+		public string Regex { get; set; } = "";
+		public string Label { get; set; } = "";
+	}
+
+	private const string LegacyCoreMeterName = "EventStore.Core";
+	private const string NormalCoreMeterName = "KurrentDB.Core";
+	private const string LegacyProjectionsMeterName = "EventStore.Projections.Core";
+	private const string NormalProjectionsMeterName = "KurrentDB.Projections.Core";
+
+	public bool LegacyCoreNaming =>
+		Meters.Contains(LegacyCoreMeterName) &&
+		!Meters.Contains(NormalCoreMeterName);
+
+	public bool LegacyProjectionsNaming =>
+		Meters.Contains(LegacyProjectionsMeterName) &&
+		!Meters.Contains(NormalProjectionsMeterName);
+
+	public string CoreMeterName => LegacyCoreNaming
+		? LegacyCoreMeterName
+		: NormalCoreMeterName;
+
+	public string ProjectionsMeterName => LegacyProjectionsNaming
+		? LegacyProjectionsMeterName
+		: NormalProjectionsMeterName;
+
+	public string ServiceName => LegacyCoreNaming && LegacyProjectionsNaming
+		? "eventstore"
+		: "kurrentdb";
+
+	public string[] Meters { get; set; } = Array.Empty<string>();
+
+	public Dictionary<StatusTracker, bool> Statuses { get; set; } = new();
+
+	public Dictionary<Checkpoint, bool> Checkpoints { get; set; } = new();
+
+	public Dictionary<IncomingGrpcCall, bool> IncomingGrpcCalls { get; set; } = new();
+
+	public Dictionary<GrpcMethod, string> GrpcMethods { get; set; } = new();
+
+	public Dictionary<GossipTracker, bool> Gossip { get; set; } = new();
+
+	public Dictionary<KestrelTracker, bool> Kestrel { get; set; } = new();
+
+	public Dictionary<SystemTracker, bool> System { get; set; } = new();
+
+	public Dictionary<ProcessTracker, bool> Process { get; set; } = new();
+
+	public Dictionary<WriterTracker, bool> Writer { get; set; } = new();
+
+	public Dictionary<EventTracker, bool> Events { get; set; } = new();
+
+	public Dictionary<Cache, bool> CacheHitsMisses { get; set; } = new();
+
+	public bool ProjectionStats { get; set; }
+
+	public bool PersistentSubscriptionStats { get; set; } = false;
+
+	public bool ElectionsCount { get; set; } = false;
+
+	public bool CacheResources { get; set; } = false;
+
+	// must be 0, 1, 5, 10 or a multiple of 15
+	public int ExpectedScrapeIntervalSeconds { get; set; }
+
+	public Dictionary<QueueTracker, bool> Queues { get; set; } = new();
+
+	public LabelMappingCase[] QueueLabels { get; set; } = Array.Empty<LabelMappingCase>();
+
+	public LabelMappingCase[] MessageTypes { get; set; } = Array.Empty<LabelMappingCase>();
+}
diff --git a/src/KurrentDB.Common/Configuration/SectionProvider.cs b/src/KurrentDB.Common/Configuration/SectionProvider.cs
new file mode 100644
index 00000000000..4c47f08c60b
--- /dev/null
+++ b/src/KurrentDB.Common/Configuration/SectionProvider.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Primitives;
+
+namespace KurrentDB.Common.Configuration;
+
+public sealed class SectionProvider : ConfigurationProvider, IDisposable {
+	private readonly IConfigurationRoot _configuration;
+	private readonly string _sectionName;
+	private readonly IDisposable _registration;
+
+	public SectionProvider(string sectionName, IConfigurationRoot configuration) {
+		_configuration = configuration;
+		_sectionName = sectionName;
+		_registration = ChangeToken.OnChange(
+			configuration.GetReloadToken,
+			Load);
+	}
+
+	public IEnumerable<IConfigurationProvider> Providers => _configuration.Providers;
+
+	public bool TryGetProviderFor(string key, out IConfigurationProvider provider) {
+		var prefix = _sectionName + ":";
+		if (key.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)) {
+			key = key[prefix.Length..];
+			foreach (var candidate in Providers) {
+				if (candidate.TryGet(key, out _)) {
+					provider = candidate;
+					return true;
+				}
+			}
+		}
+
+		provider = default;
+		return false;
+	}
+
+	public void Dispose() {
+		_registration.Dispose();
+	}
+
+	public override void Load() {
+		var data = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+		foreach (var kvp in _configuration.AsEnumerable()) {
+			data[_sectionName + ":" + kvp.Key] = kvp.Value;
+		}
+		Data = data;
+		OnReload();
+	}
+}
diff --git a/src/EventStore.Common/Configuration/SectionSource.cs b/src/KurrentDB.Common/Configuration/SectionSource.cs
similarity index 80%
rename from src/EventStore.Common/Configuration/SectionSource.cs
rename to src/KurrentDB.Common/Configuration/SectionSource.cs
index 762ac8382e4..17714539011 100644
--- a/src/EventStore.Common/Configuration/SectionSource.cs
+++ b/src/KurrentDB.Common/Configuration/SectionSource.cs
@@ -1,7 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using Microsoft.Extensions.Configuration;
 
-namespace EventStore.Common.Configuration;
+namespace KurrentDB.Common.Configuration;
 
 public class SectionSource : IConfigurationSource {
 	private readonly string _sectionName;
diff --git a/src/KurrentDB.Common/Configuration/SensitiveAttribute.cs b/src/KurrentDB.Common/Configuration/SensitiveAttribute.cs
new file mode 100644
index 00000000000..6ea264cd39f
--- /dev/null
+++ b/src/KurrentDB.Common/Configuration/SensitiveAttribute.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Common.Configuration;
+
+[AttributeUsage(AttributeTargets.Property)]
+public class SensitiveAttribute : Attribute;
diff --git a/src/KurrentDB.Common/Configuration/UnitAttribute.cs b/src/KurrentDB.Common/Configuration/UnitAttribute.cs
new file mode 100644
index 00000000000..fe9ad25f7ff
--- /dev/null
+++ b/src/KurrentDB.Common/Configuration/UnitAttribute.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Common.Configuration;
+
+[AttributeUsage(AttributeTargets.Property)]
+public class UnitAttribute(string unit) : Attribute {
+	public string Unit { get; } = unit;
+}
+
+
+
diff --git a/src/KurrentDB.Common/DevCertificates/CertificateKeyExportFormat.cs b/src/KurrentDB.Common/DevCertificates/CertificateKeyExportFormat.cs
new file mode 100644
index 00000000000..74a3bcdf811
--- /dev/null
+++ b/src/KurrentDB.Common/DevCertificates/CertificateKeyExportFormat.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Common.DevCertificates;
+
+public enum CertificateKeyExportFormat {
+	Pfx,
+	Pem,
+}
diff --git a/src/KurrentDB.Common/DevCertificates/CertificateManager.cs b/src/KurrentDB.Common/DevCertificates/CertificateManager.cs
new file mode 100644
index 00000000000..b533ab52a45
--- /dev/null
+++ b/src/KurrentDB.Common/DevCertificates/CertificateManager.cs
@@ -0,0 +1,911 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.Tracing;
+using System.IO;
+using System.Linq;
+using System.Runtime;
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+using System.Text;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Common.DevCertificates;
+
+
+public abstract class CertificateManager {
+	internal const int CurrentCertificateVersion = 2;
+	internal const string EventStoreDbHttpsOid = "1.3.6.1.4.1.43941.1.1.1";
+	internal const string EventStoreHttpsOidFriendlyName = "Kurrent HTTPS development certificate";
+
+	private const string ServerAuthenticationEnhancedKeyUsageOid = "1.3.6.1.5.5.7.3.1";
+	private const string ServerAuthenticationEnhancedKeyUsageOidFriendlyName = "Server Authentication";
+
+	private const string LocalhostHttpsDnsName = "localhost";
+	private const string LocalhostHttpsDistinguishedName = "CN=" + LocalhostHttpsDnsName;
+
+	public const int RSAMinimumKeySizeInBits = 2048;
+
+#pragma warning disable CA1416 // Validate platform compatibility
+	public static CertificateManager Instance { get; } = RuntimeInformation.IsWindows
+		? new WindowsCertificateManager()
+		: RuntimeInformation.IsOSX
+			? new MacOSCertificateManager() as CertificateManager
+			: new UnixCertificateManager();
+#pragma warning restore CA1416 // Validate platform compatibility
+
+	public static CertificateManagerEventSource Log { get; set; } = new CertificateManagerEventSource();
+
+	// Setting to 0 means we don't append the version byte,
+	// which is what all machines currently have.
+	public int EventStoreHttpsCertificateVersion { get; }
+
+	public string Subject { get; }
+
+	protected CertificateManager() : this(LocalhostHttpsDistinguishedName, CurrentCertificateVersion) {
+	}
+
+	// For testing purposes only
+	internal CertificateManager(string subject, int version) {
+		Subject = subject;
+		EventStoreHttpsCertificateVersion = version;
+	}
+
+	public static bool IsHttpsDevelopmentCertificate(X509Certificate2 certificate) =>
+		certificate.Extensions.OfType<X509Extension>()
+			.Any(e => string.Equals(EventStoreDbHttpsOid, e.Oid?.Value, StringComparison.Ordinal));
+
+	public IList<X509Certificate2> ListCertificates(
+		StoreName storeName,
+		StoreLocation location,
+		bool isValid,
+		bool requireExportable = true) {
+		Log.ListCertificatesStart(location, storeName);
+		var certificates = new List<X509Certificate2>();
+		try {
+			using var store = new X509Store(storeName, location);
+			store.Open(OpenFlags.ReadOnly);
+			certificates.AddRange(store.Certificates.OfType<X509Certificate2>());
+			IEnumerable<X509Certificate2> matchingCertificates = certificates;
+			matchingCertificates = matchingCertificates
+				.Where(c => HasOid(c, EventStoreDbHttpsOid));
+
+			if (Log.IsEnabled()) {
+				Log.DescribeFoundCertificates(ToCertificateDescription(matchingCertificates));
+			}
+
+			if (isValid) {
+				// Ensure the certificate hasn't expired, has a private key and its exportable
+				// (for container/unix scenarios).
+				Log.CheckCertificatesValidity();
+				var now = DateTimeOffset.Now;
+				var validCertificates = matchingCertificates
+					.Where(c => IsValidCertificate(c, now, requireExportable))
+					.OrderByDescending(c => GetCertificateVersion(c))
+					.ToArray();
+
+				if (Log.IsEnabled()) {
+					var invalidCertificates = matchingCertificates.Except(validCertificates);
+					Log.DescribeValidCertificates(ToCertificateDescription(validCertificates));
+					Log.DescribeInvalidCertificates(ToCertificateDescription(invalidCertificates));
+				}
+
+				matchingCertificates = validCertificates;
+			}
+
+			// We need to enumerate the certificates early to prevent disposing issues.
+			matchingCertificates = matchingCertificates.ToList();
+
+			var certificatesToDispose = certificates.Except(matchingCertificates);
+			DisposeCertificates(certificatesToDispose);
+
+			store.Close();
+
+			Log.ListCertificatesEnd();
+			return (IList<X509Certificate2>)matchingCertificates;
+		} catch (Exception e) {
+			if (Log.IsEnabled()) {
+				Log.ListCertificatesError(e.ToString());
+			}
+
+			DisposeCertificates(certificates);
+			certificates.Clear();
+			return certificates;
+		}
+
+		bool HasOid(X509Certificate2 certificate, string oid) =>
+			certificate.Extensions.OfType<X509Extension>()
+				.Any(e => string.Equals(oid, e.Oid?.Value, StringComparison.Ordinal));
+
+		static byte GetCertificateVersion(X509Certificate2 c) {
+			var byteArray = c.Extensions
+				.OfType<X509Extension>()
+				.Single(e => string.Equals(EventStoreDbHttpsOid, e.Oid?.Value, StringComparison.Ordinal))
+				.RawData;
+
+			if ((byteArray.Length == EventStoreHttpsOidFriendlyName.Length && byteArray[0] == (byte)'A') ||
+				byteArray.Length == 0) {
+				// No Version set, default to 0
+				return 0b0;
+			} else {
+				// Version is in the only byte of the byte array.
+				return byteArray[0];
+			}
+		}
+
+		bool IsValidCertificate(X509Certificate2 certificate, DateTimeOffset currentDate, bool requireExportable) =>
+			certificate.NotBefore <= currentDate &&
+			currentDate <= certificate.NotAfter &&
+			(!requireExportable || IsExportable(certificate)) &&
+			GetCertificateVersion(certificate) >= EventStoreHttpsCertificateVersion;
+	}
+
+	public IList<X509Certificate2> GetHttpsCertificates() =>
+		ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: true, requireExportable: true);
+
+	public EnsureCertificateResult EnsureDevelopmentCertificate(
+		DateTimeOffset notBefore,
+		DateTimeOffset notAfter,
+		string path = null,
+		bool trust = false,
+		bool includePrivateKey = false,
+		string password = null,
+		CertificateKeyExportFormat keyExportFormat = CertificateKeyExportFormat.Pfx,
+		bool isInteractive = true) {
+		var result = EnsureCertificateResult.Succeeded;
+
+		var currentUserCertificates = ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: true,
+			requireExportable: true);
+		var trustedCertificates = ListCertificates(StoreName.My, StoreLocation.LocalMachine, isValid: true,
+			requireExportable: true);
+		var certificates = currentUserCertificates.Concat(trustedCertificates);
+
+		var filteredCertificates = certificates.Where(c => c.Subject == Subject);
+
+		if (Log.IsEnabled()) {
+			var excludedCertificates = certificates.Except(filteredCertificates);
+			Log.FilteredCertificates(ToCertificateDescription(filteredCertificates));
+			Log.ExcludedCertificates(ToCertificateDescription(excludedCertificates));
+		}
+
+		certificates = filteredCertificates;
+
+		X509Certificate2 certificate = null;
+		var isNewCertificate = false;
+		if (certificates.Any()) {
+			certificate = certificates.First();
+			var failedToFixCertificateState = false;
+			if (isInteractive) {
+				// Skip this step if the command is not interactive,
+				// as we don't want to prompt on first run experience.
+				foreach (var candidate in currentUserCertificates) {
+					var status = CheckCertificateState(candidate, true);
+					if (!status.Success) {
+						try {
+							if (Log.IsEnabled()) {
+								Log.CorrectCertificateStateStart(GetDescription(candidate));
+							}
+
+							CorrectCertificateState(candidate);
+							Log.CorrectCertificateStateEnd();
+						} catch (Exception e) {
+							if (Log.IsEnabled()) {
+								Log.CorrectCertificateStateError(e.ToString());
+							}
+
+							result = EnsureCertificateResult.FailedToMakeKeyAccessible;
+							// We don't return early on this type of failure to allow for tooling to
+							// export or trust the certificate even in this situation, as that enables
+							// exporting the certificate to perform any necessary fix with native tooling.
+							failedToFixCertificateState = true;
+						}
+					}
+				}
+			}
+
+			if (!failedToFixCertificateState) {
+				if (Log.IsEnabled()) {
+					Log.ValidCertificatesFound(ToCertificateDescription(certificates));
+				}
+
+				certificate = certificates.First();
+				if (Log.IsEnabled()) {
+					Log.SelectedCertificate(GetDescription(certificate));
+				}
+
+				result = EnsureCertificateResult.ValidCertificatePresent;
+			}
+		} else {
+			Log.NoValidCertificatesFound();
+			try {
+				Log.CreateDevelopmentCertificateStart();
+				isNewCertificate = true;
+				certificate = CreateDevelopmentCertificate(notBefore, notAfter);
+			} catch (Exception e) {
+				if (Log.IsEnabled()) {
+					Log.CreateDevelopmentCertificateError(e.ToString());
+				}
+
+				result = EnsureCertificateResult.ErrorCreatingTheCertificate;
+				return result;
+			}
+
+			Log.CreateDevelopmentCertificateEnd();
+
+			try {
+				certificate = SaveCertificate(certificate);
+			} catch (Exception e) {
+				Log.SaveCertificateInStoreError(e.ToString());
+				result = EnsureCertificateResult.ErrorSavingTheCertificateIntoTheCurrentUserPersonalStore;
+				return result;
+			}
+
+			if (isInteractive) {
+				try {
+					if (Log.IsEnabled()) {
+						Log.CorrectCertificateStateStart(GetDescription(certificate));
+					}
+
+					CorrectCertificateState(certificate);
+					Log.CorrectCertificateStateEnd();
+				} catch (Exception e) {
+					if (Log.IsEnabled()) {
+						Log.CorrectCertificateStateError(e.ToString());
+					}
+
+					// We don't return early on this type of failure to allow for tooling to
+					// export or trust the certificate even in this situation, as that enables
+					// exporting the certificate to perform any necessary fix with native tooling.
+					result = EnsureCertificateResult.FailedToMakeKeyAccessible;
+				}
+			}
+		}
+
+		if (path != null) {
+			try {
+				ExportCertificate(certificate, path, includePrivateKey, password, keyExportFormat);
+			} catch (Exception e) {
+				if (Log.IsEnabled()) {
+					Log.ExportCertificateError(e.ToString());
+				}
+
+				// We don't want to mask the original source of the error here.
+				result = result != EnsureCertificateResult.Succeeded &&
+						 result != EnsureCertificateResult.ValidCertificatePresent
+					? result
+					: EnsureCertificateResult.ErrorExportingTheCertificate;
+
+				return result;
+			}
+		}
+
+		if (trust) {
+			try {
+				TrustCertificate(certificate);
+			} catch (UserCancelledTrustException) {
+				result = EnsureCertificateResult.UserCancelledTrustStep;
+				return result;
+			} catch {
+				result = EnsureCertificateResult.FailedToTrustTheCertificate;
+				return result;
+			}
+		}
+
+		DisposeCertificates(!isNewCertificate ? certificates : certificates.Append(certificate));
+
+		return result;
+	}
+
+	internal ImportCertificateResult ImportCertificate(string certificatePath, string password) {
+		if (!File.Exists(certificatePath)) {
+			Log.ImportCertificateMissingFile(certificatePath);
+			return ImportCertificateResult.CertificateFileMissing;
+		}
+
+		var certificates = ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: false,
+			requireExportable: false);
+		if (certificates.Any()) {
+			if (Log.IsEnabled()) {
+				Log.ImportCertificateExistingCertificates(ToCertificateDescription(certificates));
+			}
+
+			return ImportCertificateResult.ExistingCertificatesPresent;
+		}
+
+		X509Certificate2 certificate;
+		try {
+			Log.LoadCertificateStart(certificatePath);
+			certificate = new X509Certificate2(certificatePath, password,
+				X509KeyStorageFlags.Exportable | X509KeyStorageFlags.EphemeralKeySet);
+			if (Log.IsEnabled()) {
+				Log.LoadCertificateEnd(GetDescription(certificate));
+			}
+		} catch (Exception e) {
+			if (Log.IsEnabled()) {
+				Log.LoadCertificateError(e.ToString());
+			}
+
+			return ImportCertificateResult.InvalidCertificate;
+		}
+
+		if (!IsHttpsDevelopmentCertificate(certificate)) {
+			if (Log.IsEnabled()) {
+				Log.NoHttpsDevelopmentCertificate(GetDescription(certificate));
+			}
+
+			return ImportCertificateResult.NoDevelopmentHttpsCertificate;
+		}
+
+		try {
+			SaveCertificate(certificate);
+		} catch (Exception e) {
+			if (Log.IsEnabled()) {
+				Log.SaveCertificateInStoreError(e.ToString());
+			}
+
+			return ImportCertificateResult.ErrorSavingTheCertificateIntoTheCurrentUserPersonalStore;
+		}
+
+		return ImportCertificateResult.Succeeded;
+	}
+
+	public void CleanupHttpsCertificates() {
+		// On OS X we don't have a good way to manage trusted certificates in the system keychain
+		// so we do everything by invoking the native toolchain.
+		// This has some limitations, like for example not being able to identify our custom OID extension. For that
+		// matter, when we are cleaning up certificates on the machine, we start by removing the trusted certificates.
+		// To do this, we list the certificates that we can identify on the current user personal store and we invoke
+		// the native toolchain to remove them from the sytem keychain. Once we have removed the trusted certificates,
+		// we remove the certificates from the local user store to finish up the cleanup.
+		var certificates = ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: false);
+		var filteredCertificates = certificates.Where(c => c.Subject == Subject);
+
+		if (Log.IsEnabled()) {
+			var excludedCertificates = certificates.Except(filteredCertificates);
+			Log.FilteredCertificates(ToCertificateDescription(filteredCertificates));
+			Log.ExcludedCertificates(ToCertificateDescription(excludedCertificates));
+		}
+
+		foreach (var certificate in filteredCertificates) {
+			RemoveCertificate(certificate, RemoveLocations.All);
+		}
+	}
+
+	public abstract bool IsTrusted(X509Certificate2 certificate);
+
+	protected abstract X509Certificate2 SaveCertificateCore(X509Certificate2 certificate, StoreName storeName,
+		StoreLocation storeLocation);
+
+	protected abstract void TrustCertificateCore(X509Certificate2 certificate);
+
+	protected abstract bool IsExportable(X509Certificate2 c);
+
+	protected abstract void RemoveCertificateFromTrustedRoots(X509Certificate2 certificate);
+
+	protected abstract IList<X509Certificate2> GetCertificatesToRemove(StoreName storeName,
+		StoreLocation storeLocation);
+
+	internal static void ExportCertificate(X509Certificate2 certificate, string path, bool includePrivateKey,
+		string password, CertificateKeyExportFormat format) {
+		if (Log.IsEnabled()) {
+			Log.ExportCertificateStart(GetDescription(certificate), path, includePrivateKey);
+		}
+
+		if (includePrivateKey && password == null) {
+			Log.NoPasswordForCertificate();
+		}
+
+		var targetDirectoryPath = Path.GetDirectoryName(path);
+		if (!string.IsNullOrEmpty(targetDirectoryPath)) {
+			Log.CreateExportCertificateDirectory(targetDirectoryPath);
+			Directory.CreateDirectory(targetDirectoryPath);
+		}
+
+		byte[] bytes;
+		byte[] keyBytes;
+		byte[] pemEnvelope = null;
+		RSA key = null;
+
+		try {
+			if (includePrivateKey) {
+				switch (format) {
+					case CertificateKeyExportFormat.Pfx:
+						bytes = certificate.ExportToPkcs12(password);
+						break;
+					case CertificateKeyExportFormat.Pem:
+						key = certificate.GetRSAPrivateKey()!;
+
+						char[] pem;
+						if (password != null) {
+							// TODO: cleanup cast: https://github.com/dotnet/aspnetcore/issues/41455
+							keyBytes = key.ExportEncryptedPkcs8PrivateKey((ReadOnlySpan<char>)password,
+								new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256,
+									100000));
+							pem = PemEncoding.Write("ENCRYPTED PRIVATE KEY", keyBytes);
+							pemEnvelope = Encoding.ASCII.GetBytes(pem);
+						} else {
+							// Export the key first to an encrypted PEM to avoid issues with System.Security.Cryptography.Cng indicating that the operation is not supported.
+							// This is likely by design to avoid exporting the key by mistake.
+							// To bypass it, we export the certificate to pem temporarily and then we import it and export it as unprotected PEM.
+							// TODO: cleanup cast: https://github.com/dotnet/aspnetcore/issues/41455
+							keyBytes = key.ExportEncryptedPkcs8PrivateKey((ReadOnlySpan<char>)"",
+								new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 1));
+							pem = PemEncoding.Write("ENCRYPTED PRIVATE KEY", keyBytes);
+							key.Dispose();
+							key = RSA.Create();
+							// TODO: cleanup cast: https://github.com/dotnet/aspnetcore/issues/41455
+							key.ImportFromEncryptedPem(pem, (ReadOnlySpan<char>)"");
+							Array.Clear(keyBytes, 0, keyBytes.Length);
+							Array.Clear(pem, 0, pem.Length);
+							keyBytes = key.ExportPkcs8PrivateKey();
+							pem = PemEncoding.Write("PRIVATE KEY", keyBytes);
+							pemEnvelope = Encoding.ASCII.GetBytes(pem);
+						}
+
+						Array.Clear(keyBytes, 0, keyBytes.Length);
+						Array.Clear(pem, 0, pem.Length);
+
+						bytes = Encoding.ASCII.GetBytes(PemEncoding.Write("CERTIFICATE",
+							certificate.Export(X509ContentType.Cert)));
+						break;
+					default:
+						throw new InvalidOperationException("Unknown format.");
+				}
+			} else {
+				if (format == CertificateKeyExportFormat.Pem) {
+					bytes = Encoding.ASCII.GetBytes(PemEncoding.Write("CERTIFICATE",
+						certificate.Export(X509ContentType.Cert)));
+				} else {
+					bytes = certificate.Export(X509ContentType.Cert);
+				}
+			}
+		} catch (Exception e) when (Log.IsEnabled()) {
+			Log.ExportCertificateError(e.ToString());
+			throw;
+		} finally {
+			key?.Dispose();
+		}
+
+		try {
+			Log.WriteCertificateToDisk(path);
+			File.WriteAllBytes(path, bytes);
+		} catch (Exception ex) when (Log.IsEnabled()) {
+			Log.WriteCertificateToDiskError(ex.ToString());
+			throw;
+		} finally {
+			Array.Clear(bytes, 0, bytes.Length);
+		}
+
+		if (includePrivateKey && format == CertificateKeyExportFormat.Pem) {
+			Debug.Assert(pemEnvelope != null);
+
+			try {
+				var keyPath = Path.ChangeExtension(path, ".key");
+				Log.WritePemKeyToDisk(keyPath);
+				File.WriteAllBytes(keyPath, pemEnvelope);
+			} catch (Exception ex) when (Log.IsEnabled()) {
+				Log.WritePemKeyToDiskError(ex.ToString());
+				throw;
+			} finally {
+				Array.Clear(pemEnvelope, 0, pemEnvelope.Length);
+			}
+		}
+	}
+
+	internal X509Certificate2 CreateDevelopmentCertificate(DateTimeOffset notBefore, DateTimeOffset notAfter) {
+		var subject = new X500DistinguishedName(Subject);
+		var extensions = new List<X509Extension>();
+		var sanBuilder = new SubjectAlternativeNameBuilder();
+		sanBuilder.AddDnsName(LocalhostHttpsDnsName);
+
+		var keyUsage =
+			new X509KeyUsageExtension(X509KeyUsageFlags.KeyEncipherment | X509KeyUsageFlags.DigitalSignature,
+				critical: true);
+		var enhancedKeyUsage = new X509EnhancedKeyUsageExtension(
+			new OidCollection() {
+				new Oid(
+					ServerAuthenticationEnhancedKeyUsageOid,
+					ServerAuthenticationEnhancedKeyUsageOidFriendlyName)
+			},
+			critical: true);
+
+		var basicConstraints = new X509BasicConstraintsExtension(
+			certificateAuthority: false,
+			hasPathLengthConstraint: false,
+			pathLengthConstraint: 0,
+			critical: true);
+
+		byte[] bytePayload;
+
+		if (EventStoreHttpsCertificateVersion != 0) {
+			bytePayload = new byte[1];
+			bytePayload[0] = (byte)EventStoreHttpsCertificateVersion;
+		} else {
+			bytePayload = Encoding.ASCII.GetBytes(EventStoreHttpsOidFriendlyName);
+		}
+
+		var aspNetHttpsExtension = new X509Extension(
+			new AsnEncodedData(
+				new Oid(EventStoreDbHttpsOid, EventStoreHttpsOidFriendlyName),
+				bytePayload),
+			critical: false);
+
+		extensions.Add(basicConstraints);
+		extensions.Add(keyUsage);
+		extensions.Add(enhancedKeyUsage);
+		extensions.Add(sanBuilder.Build(critical: true));
+		extensions.Add(aspNetHttpsExtension);
+
+		var certificate = CreateSelfSignedCertificate(subject, extensions, notBefore, notAfter);
+		return certificate;
+	}
+
+	internal X509Certificate2 SaveCertificate(X509Certificate2 certificate) {
+		var name = StoreName.My;
+		var location = StoreLocation.CurrentUser;
+
+		if (Log.IsEnabled()) {
+			Log.SaveCertificateInStoreStart(GetDescription(certificate), name, location);
+		}
+
+		certificate = SaveCertificateCore(certificate, name, location);
+
+		Log.SaveCertificateInStoreEnd();
+		return certificate;
+	}
+
+	public void TrustCertificate(X509Certificate2 certificate) {
+		try {
+			if (Log.IsEnabled()) {
+				Log.TrustCertificateStart(GetDescription(certificate));
+			}
+
+			TrustCertificateCore(certificate);
+			Log.TrustCertificateEnd();
+		} catch (Exception ex) when (Log.IsEnabled()) {
+			Log.TrustCertificateError(ex.ToString());
+			throw;
+		}
+	}
+
+	// Internal, for testing purposes only.
+	internal void RemoveAllCertificates(StoreName storeName, StoreLocation storeLocation) {
+		var certificates = GetCertificatesToRemove(storeName, storeLocation);
+		var certificatesWithName = certificates.Where(c => c.Subject == Subject);
+
+		var removeLocation = storeName == StoreName.My ? RemoveLocations.Local : RemoveLocations.Trusted;
+
+		foreach (var certificate in certificates) {
+			RemoveCertificate(certificate, removeLocation);
+		}
+
+		DisposeCertificates(certificates);
+	}
+
+	internal void RemoveCertificate(X509Certificate2 certificate, RemoveLocations locations) {
+		switch (locations) {
+			case RemoveLocations.Undefined:
+				throw new InvalidOperationException(
+					$"'{nameof(RemoveLocations.Undefined)}' is not a valid location.");
+			case RemoveLocations.Local:
+				RemoveCertificateFromUserStore(certificate);
+				break;
+			case RemoveLocations.Trusted:
+				RemoveCertificateFromTrustedRoots(certificate);
+				break;
+			case RemoveLocations.All:
+				RemoveCertificateFromTrustedRoots(certificate);
+				RemoveCertificateFromUserStore(certificate);
+				break;
+			default:
+				throw new InvalidOperationException("Invalid location.");
+		}
+	}
+
+	internal abstract CheckCertificateStateResult CheckCertificateState(X509Certificate2 candidate,
+		bool interactive);
+
+	internal abstract void CorrectCertificateState(X509Certificate2 candidate);
+
+	internal static X509Certificate2 CreateSelfSignedCertificate(
+		X500DistinguishedName subject,
+		IEnumerable<X509Extension> extensions,
+		DateTimeOffset notBefore,
+		DateTimeOffset notAfter) {
+		using var key = CreateKeyMaterial(RSAMinimumKeySizeInBits);
+
+		var request = new CertificateRequest(subject, key, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
+		foreach (var extension in extensions) {
+			request.CertificateExtensions.Add(extension);
+		}
+
+		var result = request.CreateSelfSigned(notBefore, notAfter);
+		return result;
+
+		static RSA CreateKeyMaterial(int minimumKeySize) {
+			var rsa = RSA.Create(minimumKeySize);
+			if (rsa.KeySize < minimumKeySize) {
+				throw new InvalidOperationException($"Failed to create a key with a size of {minimumKeySize} bits");
+			}
+
+			return rsa;
+		}
+	}
+
+	internal static void DisposeCertificates(IEnumerable<X509Certificate2> disposables) {
+		foreach (var disposable in disposables) {
+			try {
+				disposable.Dispose();
+			} catch {
+			}
+		}
+	}
+
+	private static void RemoveCertificateFromUserStore(X509Certificate2 certificate) {
+		try {
+			if (Log.IsEnabled()) {
+				Log.RemoveCertificateFromUserStoreStart(GetDescription(certificate));
+			}
+
+			using var store = new X509Store(StoreName.My, StoreLocation.CurrentUser);
+			store.Open(OpenFlags.ReadWrite);
+			var matching = store.Certificates
+				.OfType<X509Certificate2>()
+				.Single(c => c.SerialNumber == certificate.SerialNumber);
+
+			store.Remove(matching);
+			store.Close();
+			Log.RemoveCertificateFromUserStoreEnd();
+		} catch (Exception ex) when (Log.IsEnabled()) {
+			Log.RemoveCertificateFromUserStoreError(ex.ToString());
+			throw;
+		}
+	}
+
+	internal static string ToCertificateDescription(IEnumerable<X509Certificate2> certificates) {
+		var list = certificates.ToList();
+		var certificatesDescription = list.Count switch {
+			0 => "no certificates",
+			1 => "1 certificate",
+			_ => $"{list.Count} certificates",
+		};
+		var description = list.OrderBy(c => c.Thumbprint).Select((c, i) => $"    {i + 1}) " + GetDescription(c))
+			.Prepend(certificatesDescription);
+		return string.Join(Environment.NewLine, description);
+	}
+
+	internal static string GetDescription(X509Certificate2 c) =>
+		$"{c.Thumbprint} - {c.Subject} - Valid from {c.NotBefore:u} to {c.NotAfter:u} - IsKurrentDevelopmentCertificate: {IsHttpsDevelopmentCertificate(c).ToString().ToLowerInvariant()} - IsExportable: {Instance.IsExportable(c).ToString().ToLowerInvariant()}";
+
+	[EventSource(Name = "kurrentdb-dev-certs")]
+	public sealed class CertificateManagerEventSource : EventSource {
+		[Event(1, Level = EventLevel.Verbose, Message = "Listing certificates from {0}\\{1}")]
+		[UnconditionalSuppressMessage("Trimming", "IL2026",
+			Justification = "Parameters passed to WriteEvent are all primitive values.")]
+		public void ListCertificatesStart(StoreLocation location, StoreName storeName) =>
+			WriteEvent(1, location, storeName);
+
+		[Event(2, Level = EventLevel.Verbose, Message = "Found certificates: {0}")]
+		public void DescribeFoundCertificates(string matchingCertificates) => WriteEvent(2, matchingCertificates);
+
+		[Event(3, Level = EventLevel.Verbose, Message = "Checking certificates validity")]
+		public void CheckCertificatesValidity() => WriteEvent(3);
+
+		[Event(4, Level = EventLevel.Verbose, Message = "Valid certificates: {0}")]
+		public void DescribeValidCertificates(string validCertificates) => WriteEvent(4, validCertificates);
+
+		[Event(5, Level = EventLevel.Verbose, Message = "Invalid certificates: {0}")]
+		public void DescribeInvalidCertificates(string invalidCertificates) => WriteEvent(5, invalidCertificates);
+
+		[Event(6, Level = EventLevel.Verbose, Message = "Finished listing certificates.")]
+		public void ListCertificatesEnd() => WriteEvent(6);
+
+		[Event(7, Level = EventLevel.Error, Message = "An error occurred while listing the certificates: {0}")]
+		public void ListCertificatesError(string e) => WriteEvent(7, e);
+
+		[Event(8, Level = EventLevel.Verbose, Message = "Filtered certificates: {0}")]
+		public void FilteredCertificates(string filteredCertificates) => WriteEvent(8, filteredCertificates);
+
+		[Event(9, Level = EventLevel.Verbose, Message = "Excluded certificates: {0}")]
+		public void ExcludedCertificates(string excludedCertificates) => WriteEvent(9, excludedCertificates);
+
+		[Event(14, Level = EventLevel.Verbose, Message = "Valid certificates: {0}")]
+		public void ValidCertificatesFound(string certificates) => WriteEvent(14, certificates);
+
+		[Event(15, Level = EventLevel.Verbose, Message = "Selected certificate: {0}")]
+		public void SelectedCertificate(string certificate) => WriteEvent(15, certificate);
+
+		[Event(16, Level = EventLevel.Verbose, Message = "No valid certificates found.")]
+		public void NoValidCertificatesFound() => WriteEvent(16);
+
+		[Event(17, Level = EventLevel.Verbose, Message = "Generating HTTPS development certificate.")]
+		public void CreateDevelopmentCertificateStart() => WriteEvent(17);
+
+		[Event(18, Level = EventLevel.Verbose, Message = "Finished generating HTTPS development certificate.")]
+		public void CreateDevelopmentCertificateEnd() => WriteEvent(18);
+
+		[Event(19, Level = EventLevel.Error, Message = "An error has occurred generating the certificate: {0}.")]
+		public void CreateDevelopmentCertificateError(string e) => WriteEvent(19, e);
+
+		[Event(20, Level = EventLevel.Verbose, Message = "Saving certificate '{0}' to store {2}\\{1}.")]
+		[UnconditionalSuppressMessage("Trimming", "IL2026",
+			Justification = "Parameters passed to WriteEvent are all primitive values.")]
+		public void SaveCertificateInStoreStart(string certificate, StoreName name, StoreLocation location) =>
+			WriteEvent(20, certificate, name, location);
+
+		[Event(21, Level = EventLevel.Verbose, Message = "Finished saving certificate to the store.")]
+		public void SaveCertificateInStoreEnd() => WriteEvent(21);
+
+		[Event(22, Level = EventLevel.Error, Message = "An error has occurred saving the certificate: {0}.")]
+		public void SaveCertificateInStoreError(string e) => WriteEvent(22, e);
+
+		[Event(23, Level = EventLevel.Verbose, Message = "Saving certificate '{0}' to {1} {2} private key.")]
+		public void ExportCertificateStart(string certificate, string path, bool includePrivateKey) =>
+			WriteEvent(23, certificate, path, includePrivateKey ? "with" : "without");
+
+		[Event(24, Level = EventLevel.Verbose, Message = "Exporting certificate with private key but no password.")]
+		public void NoPasswordForCertificate() => WriteEvent(24);
+
+		[Event(25, Level = EventLevel.Verbose, Message = "Creating directory {0}.")]
+		public void CreateExportCertificateDirectory(string path) => WriteEvent(25, path);
+
+		[Event(26, Level = EventLevel.Error,
+			Message = "An error has occurred while exporting the certificate: {0}.")]
+		public void ExportCertificateError(string error) => WriteEvent(26, error);
+
+		[Event(27, Level = EventLevel.Verbose, Message = "Writing the certificate to: {0}.")]
+		public void WriteCertificateToDisk(string path) => WriteEvent(27, path);
+
+		[Event(28, Level = EventLevel.Error,
+			Message = "An error has occurred while writing the certificate to disk: {0}.")]
+		public void WriteCertificateToDiskError(string error) => WriteEvent(28, error);
+
+		[Event(29, Level = EventLevel.Verbose, Message = "Trusting the certificate to: {0}.")]
+		public void TrustCertificateStart(string certificate) => WriteEvent(29, certificate);
+
+		[Event(30, Level = EventLevel.Verbose, Message = "Finished trusting the certificate.")]
+		public void TrustCertificateEnd() => WriteEvent(30);
+
+		[Event(31, Level = EventLevel.Error,
+			Message = "An error has occurred while trusting the certificate: {0}.")]
+		public void TrustCertificateError(string error) => WriteEvent(31, error);
+
+		[Event(32, Level = EventLevel.Verbose, Message = "Running the trust command {0}.")]
+		public void MacOSTrustCommandStart(string command) => WriteEvent(32, command);
+
+		[Event(33, Level = EventLevel.Verbose, Message = "Finished running the trust command.")]
+		public void MacOSTrustCommandEnd() => WriteEvent(33);
+
+		[Event(34, Level = EventLevel.Warning,
+			Message = "An error has occurred while running the trust command: {0}.")]
+		public void MacOSTrustCommandError(int exitCode) => WriteEvent(34, exitCode);
+
+		[Event(35, Level = EventLevel.Verbose, Message = "Running the remove trust command for {0}.")]
+		public void MacOSRemoveCertificateTrustRuleStart(string certificate) => WriteEvent(35, certificate);
+
+		[Event(36, Level = EventLevel.Verbose, Message = "Finished running the remove trust command.")]
+		public void MacOSRemoveCertificateTrustRuleEnd() => WriteEvent(36);
+
+		[Event(37, Level = EventLevel.Warning,
+			Message = "An error has occurred while running the remove trust command: {0}.")]
+		public void MacOSRemoveCertificateTrustRuleError(int exitCode) => WriteEvent(37, exitCode);
+
+		[Event(38, Level = EventLevel.Verbose, Message = "The certificate is not trusted: {0}.")]
+		public void MacOSCertificateUntrusted(string certificate) => WriteEvent(38, certificate);
+
+		[Event(39, Level = EventLevel.Verbose, Message = "Removing the certificate from the keychain {0} {1}.")]
+		public void MacOSRemoveCertificateFromKeyChainStart(string keyChain, string certificate) =>
+			WriteEvent(39, keyChain, certificate);
+
+		[Event(40, Level = EventLevel.Verbose, Message = "Finished removing the certificate from the keychain.")]
+		public void MacOSRemoveCertificateFromKeyChainEnd() => WriteEvent(40);
+
+		[Event(41, Level = EventLevel.Warning,
+			Message = "An error has occurred while running the remove trust command: {0}.")]
+		public void MacOSRemoveCertificateFromKeyChainError(int exitCode) => WriteEvent(41, exitCode);
+
+		[Event(42, Level = EventLevel.Verbose, Message = "Removing the certificate from the user store {0}.")]
+		public void RemoveCertificateFromUserStoreStart(string certificate) => WriteEvent(42, certificate);
+
+		[Event(43, Level = EventLevel.Verbose, Message = "Finished removing the certificate from the user store.")]
+		public void RemoveCertificateFromUserStoreEnd() => WriteEvent(43);
+
+		[Event(44, Level = EventLevel.Error,
+			Message = "An error has occurred while removing the certificate from the user store: {0}.")]
+		public void RemoveCertificateFromUserStoreError(string error) => WriteEvent(44, error);
+
+		[Event(45, Level = EventLevel.Verbose,
+			Message = "Adding certificate to the trusted root certification authority store.")]
+		public void WindowsAddCertificateToRootStore() => WriteEvent(45);
+
+		[Event(46, Level = EventLevel.Verbose, Message = "The certificate is already trusted.")]
+		public void WindowsCertificateAlreadyTrusted() => WriteEvent(46);
+
+		[Event(47, Level = EventLevel.Verbose, Message = "Trusting the certificate was cancelled by the user.")]
+		public void WindowsCertificateTrustCanceled() => WriteEvent(47);
+
+		[Event(48, Level = EventLevel.Verbose,
+			Message = "Removing the certificate from the trusted root certification authority store.")]
+		public void WindowsRemoveCertificateFromRootStoreStart() => WriteEvent(48);
+
+		[Event(49, Level = EventLevel.Verbose,
+			Message = "Finished removing the certificate from the trusted root certification authority store.")]
+		public void WindowsRemoveCertificateFromRootStoreEnd() => WriteEvent(49);
+
+		[Event(50, Level = EventLevel.Verbose, Message = "The certificate was not trusted.")]
+		public void WindowsRemoveCertificateFromRootStoreNotFound() => WriteEvent(50);
+
+		[Event(51, Level = EventLevel.Verbose, Message = "Correcting the the certificate state for '{0}'.")]
+		public void CorrectCertificateStateStart(string certificate) => WriteEvent(51, certificate);
+
+		[Event(52, Level = EventLevel.Verbose, Message = "Finished correcting the certificate state.")]
+		public void CorrectCertificateStateEnd() => WriteEvent(52);
+
+		[Event(53, Level = EventLevel.Error,
+			Message = "An error has occurred while correcting the certificate state: {0}.")]
+		public void CorrectCertificateStateError(string error) => WriteEvent(53, error);
+
+		[Event(54, Level = EventLevel.Verbose, Message = "Importing the certificate {1} to the keychain '{0}'.")]
+		internal void MacOSAddCertificateToKeyChainStart(string keychain, string certificate) =>
+			WriteEvent(54, keychain, certificate);
+
+		[Event(55, Level = EventLevel.Verbose, Message = "Finished importing the certificate to the keychain.")]
+		internal void MacOSAddCertificateToKeyChainEnd() => WriteEvent(55);
+
+		[Event(56, Level = EventLevel.Error,
+			Message = "An error has occurred while importing the certificate to the keychain: {0}.")]
+		internal void MacOSAddCertificateToKeyChainError(int exitCode) => WriteEvent(56, exitCode);
+
+		[Event(57, Level = EventLevel.Verbose, Message = "Writing the certificate to: {0}.")]
+		public void WritePemKeyToDisk(string path) => WriteEvent(57, path);
+
+		[Event(58, Level = EventLevel.Error,
+			Message = "An error has occurred while writing the certificate to disk: {0}.")]
+		public void WritePemKeyToDiskError(string error) => WriteEvent(58, error);
+
+		[Event(59, Level = EventLevel.Error, Message = "The file '{0}' does not exist.")]
+		internal void ImportCertificateMissingFile(string certificatePath) => WriteEvent(59, certificatePath);
+
+		[Event(60, Level = EventLevel.Error, Message = "One or more HTTPS certificates exist '{0}'.")]
+		internal void ImportCertificateExistingCertificates(string certificateDescription) =>
+			WriteEvent(60, certificateDescription);
+
+		[Event(61, Level = EventLevel.Verbose, Message = "Loading certificate from path '{0}'.")]
+		internal void LoadCertificateStart(string certificatePath) => WriteEvent(61, certificatePath);
+
+		[Event(62, Level = EventLevel.Verbose, Message = "The certificate '{0}' has been loaded successfully.")]
+		internal void LoadCertificateEnd(string description) => WriteEvent(62, description);
+
+		[Event(63, Level = EventLevel.Error,
+			Message = "An error has occurred while loading the certificate from disk: {0}.")]
+		internal void LoadCertificateError(string error) => WriteEvent(63, error);
+
+		[Event(64, Level = EventLevel.Error,
+			Message = "The provided certificate '{0}' is not a valid Kurrent HTTPS development certificate.")]
+		internal void NoHttpsDevelopmentCertificate(string description) => WriteEvent(64, description);
+	}
+
+	internal sealed class UserCancelledTrustException : Exception {
+	}
+
+	internal readonly struct CheckCertificateStateResult {
+		public bool Success { get; }
+		public string FailureMessage { get; }
+
+		public CheckCertificateStateResult(bool success, string failureMessage) {
+			Success = success;
+			FailureMessage = failureMessage;
+		}
+	}
+
+	internal enum RemoveLocations {
+		Undefined,
+		Local,
+		Trusted,
+		All
+	}
+}
diff --git a/src/KurrentDB.Common/DevCertificates/CertificatePurpose.cs b/src/KurrentDB.Common/DevCertificates/CertificatePurpose.cs
new file mode 100644
index 00000000000..fcb0a6e7bb0
--- /dev/null
+++ b/src/KurrentDB.Common/DevCertificates/CertificatePurpose.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Common.DevCertificates;
+
+internal enum CertificatePurpose {
+	All,
+	HTTPS
+}
diff --git a/src/KurrentDB.Common/DevCertificates/EnsureCertificateResult.cs b/src/KurrentDB.Common/DevCertificates/EnsureCertificateResult.cs
new file mode 100644
index 00000000000..177a3771159
--- /dev/null
+++ b/src/KurrentDB.Common/DevCertificates/EnsureCertificateResult.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Common.DevCertificates;
+
+public enum EnsureCertificateResult {
+	Succeeded = 1,
+	ValidCertificatePresent,
+	ErrorCreatingTheCertificate,
+	ErrorSavingTheCertificateIntoTheCurrentUserPersonalStore,
+	ErrorExportingTheCertificate,
+	FailedToTrustTheCertificate,
+	UserCancelledTrustStep,
+	FailedToMakeKeyAccessible,
+}
diff --git a/src/KurrentDB.Common/DevCertificates/ImportCertificateResult.cs b/src/KurrentDB.Common/DevCertificates/ImportCertificateResult.cs
new file mode 100644
index 00000000000..5a7fd41eb97
--- /dev/null
+++ b/src/KurrentDB.Common/DevCertificates/ImportCertificateResult.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Common.DevCertificates;
+
+public enum ImportCertificateResult {
+	Succeeded = 1,
+	CertificateFileMissing,
+	InvalidCertificate,
+	NoDevelopmentHttpsCertificate,
+	ExistingCertificatesPresent,
+	ErrorSavingTheCertificateIntoTheCurrentUserPersonalStore,
+}
diff --git a/src/KurrentDB.Common/DevCertificates/MacOSCertificateManager.cs b/src/KurrentDB.Common/DevCertificates/MacOSCertificateManager.cs
new file mode 100644
index 00000000000..687b7225e42
--- /dev/null
+++ b/src/KurrentDB.Common/DevCertificates/MacOSCertificateManager.cs
@@ -0,0 +1,302 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Runtime;
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+using System.Text.RegularExpressions;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Common.DevCertificates;
+
+
+internal sealed class MacOSCertificateManager : CertificateManager {
+	private const string CertificateSubjectRegex = "CN=(.*[^,]+).*";
+
+	private static readonly string MacOSUserKeyChain =
+			$"{RuntimeInformation.HomeFolder}/Library/Keychains/login.keychain-db";
+
+	private const string MacOSSystemKeyChain = "/Library/Keychains/System.keychain";
+	private const string MacOSFindCertificateCommandLine = "security";
+
+	private const string MacOSFindCertificateCommandLineArgumentsFormat =
+		"find-certificate -c {0} -a -Z -p " + MacOSSystemKeyChain;
+
+	private const string MacOSFindCertificateOutputRegex = "SHA-1 hash: ([0-9A-Z]+)";
+	private const string MacOSRemoveCertificateTrustCommandLine = "sudo";
+
+	private const string MacOSRemoveCertificateTrustCommandLineArgumentsFormat =
+		"security remove-trusted-cert -d {0}";
+
+	private const string MacOSDeleteCertificateCommandLine = "sudo";
+
+	private const string MacOSDeleteCertificateCommandLineArgumentsFormat =
+		"security delete-certificate -Z {0} {1}";
+
+	private const string MacOSTrustCertificateCommandLine = "sudo";
+
+	private const string MacOSTrustCertificateCommandLineArguments =
+		"security add-trusted-cert -d -r trustRoot -k " + MacOSSystemKeyChain + " ";
+
+	private const string MacOSAddCertificateToKeyChainCommandLine = "security";
+
+	private static readonly string MacOSAddCertificateToKeyChainCommandLineArgumentsFormat =
+		"import {0} -k " + MacOSUserKeyChain + " -t cert -f pkcs12 -P {1} -A";
+
+	public const string InvalidCertificateState =
+		"The ASP.NET Core developer certificate is in an invalid state. " +
+		"To fix this issue, run the following commands 'dotnet dev-certs https --clean' and 'dotnet dev-certs https' to remove all existing ASP.NET Core development certificates " +
+		"and create a new untrusted developer certificate. " +
+		"On macOS or Windows, use 'dotnet dev-certs https --trust' to trust the new certificate.";
+
+	public const string KeyNotAccessibleWithoutUserInteraction =
+		"The application is trying to access the ASP.NET Core developer certificate key. " +
+		"A prompt might appear to ask for permission to access the key. " +
+		"When that happens, select 'Always Allow' to grant 'dotnet' access to the certificate key in the future.";
+
+	private static readonly TimeSpan MaxRegexTimeout = TimeSpan.FromMinutes(1);
+
+	public MacOSCertificateManager() {
+	}
+
+	internal MacOSCertificateManager(string subject, int version)
+		: base(subject, version) {
+	}
+
+	protected override void TrustCertificateCore(X509Certificate2 publicCertificate) {
+		var tmpFile = Path.GetTempFileName();
+		try {
+			ExportCertificate(publicCertificate, tmpFile, includePrivateKey: false, password: null,
+				CertificateKeyExportFormat.Pfx);
+			if (Log.IsEnabled()) {
+				Log.MacOSTrustCommandStart(
+					$"{MacOSTrustCertificateCommandLine} {MacOSTrustCertificateCommandLineArguments}{tmpFile}");
+			}
+
+			using (var process = Process.Start(MacOSTrustCertificateCommandLine,
+					   MacOSTrustCertificateCommandLineArguments + tmpFile)) {
+				process.WaitForExit();
+				if (process.ExitCode != 0) {
+					Log.MacOSTrustCommandError(process.ExitCode);
+					throw new InvalidOperationException("There was an error trusting the certificate.");
+				}
+			}
+
+			Log.MacOSTrustCommandEnd();
+		} finally {
+			try {
+				if (File.Exists(tmpFile)) {
+					File.Delete(tmpFile);
+				}
+			} catch {
+				// We don't care if we can't delete the temp file.
+			}
+		}
+	}
+
+	internal override CheckCertificateStateResult CheckCertificateState(X509Certificate2 candidate,
+		bool interactive) {
+		var sentinelPath = Path.Combine(RuntimeInformation.HomeFolder, ".dotnet",
+			$"certificates.{candidate.GetCertHashString(HashAlgorithmName.SHA256)}.sentinel");
+		if (!interactive && !File.Exists(sentinelPath)) {
+			return new CheckCertificateStateResult(false, KeyNotAccessibleWithoutUserInteraction);
+		}
+
+		// Tries to use the certificate key to validate it can't access it
+		try {
+			using var rsa = candidate.GetRSAPrivateKey();
+			if (rsa == null) {
+				return new CheckCertificateStateResult(false, InvalidCertificateState);
+			}
+
+			// Encrypting a random value is the ultimate test for a key validity.
+			// Windows and Mac OS both return HasPrivateKey = true if there is (or there has been) a private key associated
+			// with the certificate at some point.
+			var value = new byte[32];
+			RandomNumberGenerator.Fill(value);
+			rsa.Decrypt(rsa.Encrypt(value, RSAEncryptionPadding.Pkcs1), RSAEncryptionPadding.Pkcs1);
+
+			// If we were able to access the key, create a sentinel so that we don't have to show a prompt
+			// on every kestrel run.
+			if (Directory.Exists(Path.GetDirectoryName(sentinelPath)) && !File.Exists(sentinelPath)) {
+				File.WriteAllText(sentinelPath, "true");
+			}
+
+			// Being able to encrypt and decrypt a payload is the strongest guarantee that the key is valid.
+			return new CheckCertificateStateResult(true, null);
+		} catch (Exception) {
+			return new CheckCertificateStateResult(false, InvalidCertificateState);
+		}
+	}
+
+	internal override void CorrectCertificateState(X509Certificate2 candidate) {
+		var status = CheckCertificateState(candidate, true);
+		if (!status.Success) {
+			throw new InvalidOperationException(InvalidCertificateState);
+		}
+	}
+
+	public override bool IsTrusted(X509Certificate2 certificate) {
+		var subjectMatch = Regex.Match(certificate.Subject, CertificateSubjectRegex, RegexOptions.Singleline,
+			MaxRegexTimeout);
+		if (!subjectMatch.Success) {
+			throw new InvalidOperationException(
+				$"Can't determine the subject for the certificate with subject '{certificate.Subject}'.");
+		}
+
+		var subject = subjectMatch.Groups[1].Value;
+		using var checkTrustProcess = Process.Start(new ProcessStartInfo(
+			MacOSFindCertificateCommandLine,
+			string.Format(CultureInfo.InvariantCulture, MacOSFindCertificateCommandLineArgumentsFormat, subject)) {
+			RedirectStandardOutput = true
+		});
+		var output = checkTrustProcess!.StandardOutput.ReadToEnd();
+		checkTrustProcess.WaitForExit();
+		var matches = Regex.Matches(output, MacOSFindCertificateOutputRegex, RegexOptions.Multiline,
+			MaxRegexTimeout);
+		var hashes = matches.OfType<Match>().Select(m => m.Groups[1].Value).ToList();
+		return hashes.Any(h => string.Equals(h, certificate.Thumbprint, StringComparison.Ordinal));
+	}
+
+	protected override void RemoveCertificateFromTrustedRoots(X509Certificate2 certificate) {
+		if (IsTrusted(certificate)) // On OSX this check just ensures its on the system keychain
+		{
+			// A trusted certificate in OSX is installed into the system keychain and
+			// as a "trust rule" applied to it.
+			// To remove the certificate we first need to remove the "trust rule" and then
+			// remove the certificate from the keychain.
+			// We don't care if we fail to remove the trust rule if
+			// for some reason the certificate became untrusted.
+			// Trying to remove the certificate from the keychain will fail if the certificate is
+			// trusted.
+			try {
+				RemoveCertificateTrustRule(certificate);
+			} catch {
+			}
+
+			RemoveCertificateFromKeyChain(MacOSSystemKeyChain, certificate);
+		} else {
+			Log.MacOSCertificateUntrusted(GetDescription(certificate));
+		}
+	}
+
+	private static void RemoveCertificateTrustRule(X509Certificate2 certificate) {
+		Log.MacOSRemoveCertificateTrustRuleStart(GetDescription(certificate));
+		var certificatePath = Path.GetTempFileName();
+		try {
+			var certBytes = certificate.Export(X509ContentType.Cert);
+			File.WriteAllBytes(certificatePath, certBytes);
+			var processInfo = new ProcessStartInfo(
+				MacOSRemoveCertificateTrustCommandLine,
+				string.Format(
+					CultureInfo.InvariantCulture,
+					MacOSRemoveCertificateTrustCommandLineArgumentsFormat,
+					certificatePath
+				));
+			using var process = Process.Start(processInfo);
+			process!.WaitForExit();
+			if (process.ExitCode != 0) {
+				Log.MacOSRemoveCertificateTrustRuleError(process.ExitCode);
+			}
+
+			Log.MacOSRemoveCertificateTrustRuleEnd();
+		} finally {
+			try {
+				if (File.Exists(certificatePath)) {
+					File.Delete(certificatePath);
+				}
+			} catch {
+				// We don't care about failing to do clean-up on a temp file.
+			}
+		}
+	}
+
+	private static void RemoveCertificateFromKeyChain(string keyChain, X509Certificate2 certificate) {
+		var processInfo = new ProcessStartInfo(
+			MacOSDeleteCertificateCommandLine,
+			string.Format(
+				CultureInfo.InvariantCulture,
+				MacOSDeleteCertificateCommandLineArgumentsFormat,
+				certificate.Thumbprint.ToUpperInvariant(),
+				keyChain
+			)) {
+			RedirectStandardOutput = true,
+			RedirectStandardError = true
+		};
+
+		if (Log.IsEnabled()) {
+			Log.MacOSRemoveCertificateFromKeyChainStart(keyChain, GetDescription(certificate));
+		}
+
+		using (var process = Process.Start(processInfo)) {
+			var output = process!.StandardOutput.ReadToEnd() + process.StandardError.ReadToEnd();
+			process.WaitForExit();
+
+			if (process.ExitCode != 0) {
+				Log.MacOSRemoveCertificateFromKeyChainError(process.ExitCode);
+				throw new InvalidOperationException(
+					$@"There was an error removing the certificate with thumbprint '{certificate.Thumbprint}'.
+{output}");
+			}
+		}
+
+		Log.MacOSRemoveCertificateFromKeyChainEnd();
+	}
+
+	// We don't have a good way of checking on the underlying implementation if ti is exportable, so just return true.
+	protected override bool IsExportable(X509Certificate2 c) => true;
+
+	protected override X509Certificate2 SaveCertificateCore(X509Certificate2 certificate, StoreName storeName,
+		StoreLocation storeLocation) {
+		// security import https.pfx -k $loginKeyChain -t cert -f pkcs12 -P password -A;
+		var passwordBytes = new byte[48];
+		RandomNumberGenerator.Fill(passwordBytes.AsSpan()[0..35]);
+		var password = Convert.ToBase64String(passwordBytes, 0, 36);
+		var certBytes = certificate.ExportToPkcs12(password);
+		var certificatePath = Path.GetTempFileName();
+		File.WriteAllBytes(certificatePath, certBytes);
+
+		var processInfo = new ProcessStartInfo(
+			MacOSAddCertificateToKeyChainCommandLine,
+			string.Format(
+				CultureInfo.InvariantCulture,
+				MacOSAddCertificateToKeyChainCommandLineArgumentsFormat,
+				certificatePath,
+				password
+			)) {
+			RedirectStandardOutput = true,
+			RedirectStandardError = true
+		};
+
+		if (Log.IsEnabled()) {
+			Log.MacOSAddCertificateToKeyChainStart(MacOSUserKeyChain, GetDescription(certificate));
+		}
+
+		using (var process = Process.Start(processInfo)) {
+			var output = process!.StandardOutput.ReadToEnd() + process.StandardError.ReadToEnd();
+			process.WaitForExit();
+
+			if (process.ExitCode != 0) {
+				Log.MacOSAddCertificateToKeyChainError(process.ExitCode);
+				throw new InvalidOperationException(
+					$@"There was an error importing the certificate into the user key chain '{certificate.Thumbprint}'.
+{output}");
+			}
+		}
+
+		Log.MacOSAddCertificateToKeyChainEnd();
+
+		return certificate;
+	}
+
+	protected override IList<X509Certificate2> GetCertificatesToRemove(StoreName storeName,
+		StoreLocation storeLocation) {
+		return ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: false);
+	}
+}
diff --git a/src/KurrentDB.Common/DevCertificates/UnixCertificateManager.cs b/src/KurrentDB.Common/DevCertificates/UnixCertificateManager.cs
new file mode 100644
index 00000000000..740b7ff2519
--- /dev/null
+++ b/src/KurrentDB.Common/DevCertificates/UnixCertificateManager.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Cryptography.X509Certificates;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Common.DevCertificates;
+
+
+internal sealed class UnixCertificateManager : CertificateManager {
+	public UnixCertificateManager() {
+	}
+
+	internal UnixCertificateManager(string subject, int version)
+		: base(subject, version) {
+	}
+
+	public override bool IsTrusted(X509Certificate2 certificate) => false;
+
+	protected override X509Certificate2 SaveCertificateCore(X509Certificate2 certificate, StoreName storeName,
+		StoreLocation storeLocation) {
+		var export = certificate.ExportToPkcs12(string.Empty);
+		certificate.Dispose();
+		certificate = new X509Certificate2(export, "",
+			X509KeyStorageFlags.PersistKeySet | X509KeyStorageFlags.Exportable);
+		Array.Clear(export, 0, export.Length);
+
+		using (var store = new X509Store(storeName, storeLocation)) {
+			store.Open(OpenFlags.ReadWrite);
+			store.Add(certificate);
+			store.Close();
+		}
+
+		;
+
+		return certificate;
+	}
+
+	internal override CheckCertificateStateResult CheckCertificateState(X509Certificate2 candidate,
+		bool interactive) {
+		// Return true as we don't perform any check.
+		return new CheckCertificateStateResult(true, null);
+	}
+
+	internal override void CorrectCertificateState(X509Certificate2 candidate) {
+		// Do nothing since we don't have anything to check here.
+	}
+
+	protected override bool IsExportable(X509Certificate2 c) => true;
+
+	protected override void TrustCertificateCore(X509Certificate2 certificate) =>
+		throw new InvalidOperationException("Trusting the certificate is not supported on linux");
+
+	protected override void RemoveCertificateFromTrustedRoots(X509Certificate2 certificate) {
+		// No-op here as is benign
+	}
+
+	protected override IList<X509Certificate2> GetCertificatesToRemove(StoreName storeName,
+		StoreLocation storeLocation) {
+		return ListCertificates(StoreName.My, StoreLocation.CurrentUser, isValid: false, requireExportable: false);
+	}
+}
diff --git a/src/KurrentDB.Common/DevCertificates/WindowsCertificateManager.cs b/src/KurrentDB.Common/DevCertificates/WindowsCertificateManager.cs
new file mode 100644
index 00000000000..19eb0ae30cd
--- /dev/null
+++ b/src/KurrentDB.Common/DevCertificates/WindowsCertificateManager.cs
@@ -0,0 +1,126 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Versioning;
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Common.DevCertificates;
+
+
+[SupportedOSPlatform("windows")]
+internal sealed class WindowsCertificateManager : CertificateManager {
+	private const int UserCancelledErrorCode = 1223;
+
+	public WindowsCertificateManager() {
+	}
+
+	// For testing purposes only
+	internal WindowsCertificateManager(string subject, int version)
+		: base(subject, version) {
+	}
+
+	protected override bool IsExportable(X509Certificate2 c) {
+#if XPLAT
+        // For the first run experience we don't need to know if the certificate can be exported.
+        return true;
+#else
+		using var key = c.GetRSAPrivateKey();
+		return (key is RSACryptoServiceProvider rsaPrivateKey &&
+				rsaPrivateKey.CspKeyContainerInfo.Exportable) ||
+			   (key is RSACng cngPrivateKey &&
+			   cngPrivateKey.Key.ExportPolicy.HasFlag(CngExportPolicies.AllowExport));
+#endif
+	}
+
+	internal override CheckCertificateStateResult CheckCertificateState(X509Certificate2 candidate,
+		bool interactive) {
+		// Return true as we don't perform any check.
+		return new CheckCertificateStateResult(true, null);
+	}
+
+	internal override void CorrectCertificateState(X509Certificate2 candidate) {
+		// Do nothing since we don't have anything to check here.
+	}
+
+	protected override X509Certificate2 SaveCertificateCore(X509Certificate2 certificate, StoreName storeName,
+		StoreLocation storeLocation) {
+		// On non OSX systems we need to export the certificate and import it so that the transient
+		// key that we generated gets persisted.
+		var export = certificate.ExportToPkcs12(string.Empty);
+		certificate.Dispose();
+		certificate = new X509Certificate2(export, "",
+			X509KeyStorageFlags.PersistKeySet | X509KeyStorageFlags.Exportable);
+		Array.Clear(export, 0, export.Length);
+		certificate.FriendlyName = EventStoreHttpsOidFriendlyName;
+
+		using (var store = new X509Store(storeName, storeLocation)) {
+			store.Open(OpenFlags.ReadWrite);
+			store.Add(certificate);
+			store.Close();
+		}
+
+		;
+
+		return certificate;
+	}
+
+	protected override void TrustCertificateCore(X509Certificate2 certificate) {
+		using var publicCertificate = new X509Certificate2(certificate.Export(X509ContentType.Cert));
+
+		publicCertificate.FriendlyName = certificate.FriendlyName;
+
+		using var store = new X509Store(StoreName.Root, StoreLocation.CurrentUser);
+
+		store.Open(OpenFlags.ReadWrite);
+		var existing = store.Certificates.Find(X509FindType.FindByThumbprint, publicCertificate.Thumbprint,
+			validOnly: false);
+		if (existing.Count > 0) {
+			Log.WindowsCertificateAlreadyTrusted();
+			DisposeCertificates(existing.OfType<X509Certificate2>());
+			return;
+		}
+
+		try {
+			Log.WindowsAddCertificateToRootStore();
+			store.Add(publicCertificate);
+			store.Close();
+		} catch (CryptographicException exception) when (exception.HResult == UserCancelledErrorCode) {
+			Log.WindowsCertificateTrustCanceled();
+			throw new UserCancelledTrustException();
+		}
+	}
+
+	protected override void RemoveCertificateFromTrustedRoots(X509Certificate2 certificate) {
+		Log.WindowsRemoveCertificateFromRootStoreStart();
+		using var store = new X509Store(StoreName.Root, StoreLocation.CurrentUser);
+
+		store.Open(OpenFlags.ReadWrite);
+		var matching = store.Certificates
+			.OfType<X509Certificate2>()
+			.SingleOrDefault(c => c.SerialNumber == certificate.SerialNumber);
+
+		if (matching != null) {
+			store.Remove(matching);
+		} else {
+			Log.WindowsRemoveCertificateFromRootStoreNotFound();
+		}
+
+		store.Close();
+		Log.WindowsRemoveCertificateFromRootStoreEnd();
+	}
+
+	public override bool IsTrusted(X509Certificate2 certificate) {
+		return ListCertificates(StoreName.Root, StoreLocation.CurrentUser, isValid: true, requireExportable: false)
+			.Any(c => c.Thumbprint == certificate.Thumbprint);
+	}
+
+	protected override IList<X509Certificate2> GetCertificatesToRemove(StoreName storeName,
+		StoreLocation storeLocation) {
+		return ListCertificates(storeName, storeLocation, isValid: false);
+	}
+}
diff --git a/src/KurrentDB.Common/Exceptions/ApplicationInitializationException.cs b/src/KurrentDB.Common/Exceptions/ApplicationInitializationException.cs
new file mode 100644
index 00000000000..d758b3cf3c8
--- /dev/null
+++ b/src/KurrentDB.Common/Exceptions/ApplicationInitializationException.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Common.Exceptions;
+
+public class ApplicationInitializationException : Exception {
+	public ApplicationInitializationException(string message) : base(message) {
+	}
+
+	public ApplicationInitializationException(string message, Exception innerException) : base(message,
+		innerException) {
+	}
+}
diff --git a/src/KurrentDB.Common/Exceptions/InvalidConfigurationException.cs b/src/KurrentDB.Common/Exceptions/InvalidConfigurationException.cs
new file mode 100644
index 00000000000..0e189fdc11d
--- /dev/null
+++ b/src/KurrentDB.Common/Exceptions/InvalidConfigurationException.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Common.Exceptions;
+
+public class InvalidConfigurationException : Exception {
+	public InvalidConfigurationException(string message) : base(message) { }
+}
diff --git a/src/KurrentDB.Common/KurrentDB.Common.csproj b/src/KurrentDB.Common/KurrentDB.Common.csproj
new file mode 100644
index 00000000000..b51e891226f
--- /dev/null
+++ b/src/KurrentDB.Common/KurrentDB.Common.csproj
@@ -0,0 +1,49 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<GitVersion>false</GitVersion>
+	</PropertyGroup>
+	<ItemGroup>
+		<FrameworkReference Include="Microsoft.AspNetCore.App" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="GitInfo" Version="3.3.3">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
+		<PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+
+		<PackageReference Include="Serilog" Version="4.0.1" />
+		<PackageReference Include="Serilog.Enrichers.Process" Version="3.0.0" />
+		<PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
+		<PackageReference Include="Serilog.Expressions" Version="5.0.0" />
+		<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+		<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.2" />
+		<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
+		<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
+		<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+
+		<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
+		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
+		<PackageReference Include="YamlDotnet" Version="13.7.1" />
+		<!-- upgrade because of transitive dependency vulnerability https://github.com/advisories/GHSA-8g4q-xg66-9fp4 -->
+		<PackageReference Include="System.Text.Json" Version="8.0.5" />
+		<!-- upgrade because of transitive dependency vulnerability https://github.com/advisories/GHSA-447r-wph3-92pm -->
+		<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
+		<!-- upgrade because of transitive dependency vulnerability https://github.com/advisories/GHSA-5f2m-466j-3848 and https://github.com/advisories/GHSA-xhfc-gr8f-ffwc -->
+		<PackageReference Include="System.Private.Uri" Version="4.3.2" />
+	</ItemGroup>
+	<ItemGroup>
+	  <None Update="Utils\version.properties">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </None>
+	</ItemGroup>
+	<ItemGroup>
+	  <ProjectReference Include="..\KurrentDB.SystemRuntime\KurrentDB.SystemRuntime.csproj" />
+	</ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/KurrentDB.Common/Options/DbLogFormat.cs b/src/KurrentDB.Common/Options/DbLogFormat.cs
new file mode 100644
index 00000000000..7b85200a06c
--- /dev/null
+++ b/src/KurrentDB.Common/Options/DbLogFormat.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Common.Options;
+
+public enum DbLogFormat {
+	V2,
+	ExperimentalV3,
+}
diff --git a/src/KurrentDB.Common/Options/LogConsoleFormat.cs b/src/KurrentDB.Common/Options/LogConsoleFormat.cs
new file mode 100644
index 00000000000..313d2f01dc2
--- /dev/null
+++ b/src/KurrentDB.Common/Options/LogConsoleFormat.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Common.Options;
+
+public enum LogConsoleFormat {
+	Plain = 0,
+	Json = 1
+}
diff --git a/src/KurrentDB.Common/Options/LogLevel.cs b/src/KurrentDB.Common/Options/LogLevel.cs
new file mode 100644
index 00000000000..6335efbeab0
--- /dev/null
+++ b/src/KurrentDB.Common/Options/LogLevel.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Common.Options;
+
+public enum LogLevel {
+	Default = 0,
+	Verbose = 1,
+	Debug = 2,
+	Information = 3,
+	Warning = 4,
+	Error = 5,
+	Fatal = 6,
+
+	// support for MS levels
+	Trace = Verbose,
+	Critical = Fatal,
+	None = Fatal,
+}
diff --git a/src/KurrentDB.Common/Options/ProjectionType.cs b/src/KurrentDB.Common/Options/ProjectionType.cs
new file mode 100644
index 00000000000..0de63f0cf7c
--- /dev/null
+++ b/src/KurrentDB.Common/Options/ProjectionType.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Common.Options;
+
+public enum ProjectionType {
+	None,
+	System,
+	All
+}
diff --git a/src/KurrentDB.Common/Properties/JetbrainsAnnotations.cs b/src/KurrentDB.Common/Properties/JetbrainsAnnotations.cs
new file mode 100644
index 00000000000..14aa1aa4b40
--- /dev/null
+++ b/src/KurrentDB.Common/Properties/JetbrainsAnnotations.cs
@@ -0,0 +1,630 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#pragma warning disable 1591
+// ReSharper disable UnusedMember.Global
+// ReSharper disable UnusedParameter.Local
+// ReSharper disable MemberCanBePrivate.Global
+// ReSharper disable UnusedAutoPropertyAccessor.Global
+// ReSharper disable IntroduceOptionalParameters.Global
+// ReSharper disable MemberCanBeProtected.Global
+// ReSharper disable InconsistentNaming
+
+// ReSharper disable once CheckNamespace
+namespace System;
+
+/// <summary>
+/// Indicates that the value of the marked element could be <c>null</c> sometimes,
+/// so the check for <c>null</c> is necessary before its usage
+/// </summary>
+/// <example><code>
+/// [CanBeNull] public object Test() { return null; }
+/// public void UseTest() {
+///   var p = Test();
+///   var s = p.ToString(); // Warning: Possible 'System.NullReferenceException'
+/// }
+/// </code></example>
+[AttributeUsage(
+	AttributeTargets.Method | AttributeTargets.Parameter |
+	AttributeTargets.Property | AttributeTargets.Delegate |
+	AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
+internal sealed class CanBeNullAttribute : Attribute {
+}
+
+/// <summary>
+/// Indicates that the value of the marked element could never be <c>null</c>
+/// </summary>
+/// <example><code>
+/// [NotNull] public object Foo() {
+///   return null; // Warning: Possible 'null' assignment
+/// }
+/// </code></example>
+[AttributeUsage(
+	AttributeTargets.Method | AttributeTargets.Parameter |
+	AttributeTargets.Property | AttributeTargets.Delegate |
+	AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
+internal sealed class NotNullAttribute : Attribute {
+}
+
+/// <summary>
+/// Indicates that the marked method builds string by format pattern and (optional) arguments.
+/// Parameter, which contains format string, should be given in constructor. The format string
+/// should be in <see cref="string.Format(IFormatProvider,string,object[])"/>-like form
+/// </summary>
+/// <example><code>
+/// [StringFormatMethod("message")]
+/// public void ShowError(string message, params object[] args) { /* do something */ }
+/// public void Foo() {
+///   ShowError("Failed: {0}"); // Warning: Non-existing argument in format string
+/// }
+/// </code></example>
+[AttributeUsage(
+	AttributeTargets.Constructor | AttributeTargets.Method,
+	AllowMultiple = false, Inherited = true)]
+internal sealed class StringFormatMethodAttribute : Attribute {
+	/// <param name="formatParameterName">
+	/// Specifies which parameter of an annotated method should be treated as format-string
+	/// </param>
+	public StringFormatMethodAttribute(string formatParameterName) {
+		FormatParameterName = formatParameterName;
+	}
+
+	public string FormatParameterName { get; private set; }
+}
+
+/// <summary>
+/// Indicates that the function argument should be string literal and match one
+/// of the parameters of the caller function. For example, ReSharper annotates
+/// the parameter of <see cref="System.ArgumentNullException"/>
+/// </summary>
+/// <example><code>
+/// public void Foo(string param) {
+///   if (param == null)
+///     throw new ArgumentNullException("par"); // Warning: Cannot resolve symbol
+/// }
+/// </code></example>
+[AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false, Inherited = true)]
+internal sealed class InvokerParameterNameAttribute : Attribute {
+}
+
+/// <summary>
+/// Indicates that the method is contained in a type that implements
+/// <see cref="System.ComponentModel.INotifyPropertyChanged"/> interface
+/// and this method is used to notify that some property value changed
+/// </summary>
+/// <remarks>
+/// The method should be non-static and conform to one of the supported signatures:
+/// <list>
+/// <item><c>NotifyChanged(string)</c></item>
+/// <item><c>NotifyChanged(params string[])</c></item>
+/// <item><c>NotifyChanged{T}(Expression{Func{T}})</c></item>
+/// <item><c>NotifyChanged{T,U}(Expression{Func{T,U}})</c></item>
+/// <item><c>SetProperty{T}(ref T, T, string)</c></item>
+/// </list>
+/// </remarks>
+/// <example><code>
+/// public class Foo : INotifyPropertyChanged {
+///   public event PropertyChangedEventHandler PropertyChanged;
+///   [NotifyPropertyChangedInvocator]
+///   protected virtual void NotifyChanged(string propertyName) { ... }
+///
+///   private string _name;
+///   public string Name {
+///     get { return _name; }
+///     set { _name = value; NotifyChanged("LastName"); /* Warning */ }
+///   }
+/// }
+/// </code>
+/// Examples of generated notifications:
+/// <list>
+/// <item><c>NotifyChanged("Property")</c></item>
+/// <item><c>NotifyChanged(() =&gt; Property)</c></item>
+/// <item><c>NotifyChanged((VM x) =&gt; x.Property)</c></item>
+/// <item><c>SetProperty(ref myField, value, "Property")</c></item>
+/// </list>
+/// </example>
+[AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+internal sealed class NotifyPropertyChangedInvocatorAttribute : Attribute {
+	public NotifyPropertyChangedInvocatorAttribute() {
+	}
+
+	public NotifyPropertyChangedInvocatorAttribute(string parameterName) {
+		ParameterName = parameterName;
+	}
+
+	public string ParameterName { get; private set; }
+}
+
+/// <summary>
+/// Describes dependency between method input and output
+/// </summary>
+/// <syntax>
+/// <p>Function Definition Table syntax:</p>
+/// <list>
+/// <item>FDT      ::= FDTRow [;FDTRow]*</item>
+/// <item>FDTRow   ::= Input =&gt; Output | Output &lt;= Input</item>
+/// <item>Input    ::= ParameterName: Value [, Input]*</item>
+/// <item>Output   ::= [ParameterName: Value]* {halt|stop|void|nothing|Value}</item>
+/// <item>Value    ::= true | false | null | notnull | canbenull</item>
+/// </list>
+/// If method has single input parameter, it's name could be omitted.<br/>
+/// Using <c>halt</c> (or <c>void</c>/<c>nothing</c>, which is the same)
+/// for method output means that the methos doesn't return normally.<br/>
+/// <c>canbenull</c> annotation is only applicable for output parameters.<br/>
+/// You can use multiple <c>[ContractAnnotation]</c> for each FDT row,
+/// or use single attribute with rows separated by semicolon.<br/>
+/// </syntax>
+/// <examples><list>
+/// <item><code>
+/// [ContractAnnotation("=> halt")]
+/// public void TerminationMethod()
+/// </code></item>
+/// <item><code>
+/// [ContractAnnotation("halt &lt;= condition: false")]
+/// public void Assert(bool condition, string text) // regular assertion method
+/// </code></item>
+/// <item><code>
+/// [ContractAnnotation("s:null => true")]
+/// public bool IsNullOrEmpty(string s) // string.IsNullOrEmpty()
+/// </code></item>
+/// <item><code>
+/// // A method that returns null if the parameter is null, and not null if the parameter is not null
+/// [ContractAnnotation("null => null; notnull => notnull")]
+/// public object Transform(object data) 
+/// </code></item>
+/// <item><code>
+/// [ContractAnnotation("s:null=>false; =>true,result:notnull; =>false, result:null")]
+/// public bool TryParse(string s, out Person result)
+/// </code></item>
+/// </list></examples>
+[AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
+internal sealed class ContractAnnotationAttribute : Attribute {
+	public ContractAnnotationAttribute([NotNull] string contract)
+		: this(contract, false) {
+	}
+
+	public ContractAnnotationAttribute([NotNull] string contract, bool forceFullStates) {
+		Contract = contract;
+		ForceFullStates = forceFullStates;
+	}
+
+	public string Contract { get; private set; }
+	public bool ForceFullStates { get; private set; }
+}
+
+/// <summary>
+/// Indicates that marked element should be localized or not
+/// </summary>
+/// <example><code>
+/// [LocalizationRequiredAttribute(true)]
+/// public class Foo {
+///   private string str = "my string"; // Warning: Localizable string
+/// }
+/// </code></example>
+[AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = true)]
+internal sealed class LocalizationRequiredAttribute : Attribute {
+	public LocalizationRequiredAttribute() : this(true) {
+	}
+
+	public LocalizationRequiredAttribute(bool required) {
+		Required = required;
+	}
+
+	public bool Required { get; private set; }
+}
+
+/// <summary>
+/// Indicates that the value of the marked type (or its derivatives)
+/// cannot be compared using '==' or '!=' operators and <c>Equals()</c>
+/// should be used instead. However, using '==' or '!=' for comparison
+/// with <c>null</c> is always permitted.
+/// </summary>
+/// <example><code>
+/// [CannotApplyEqualityOperator]
+/// class NoEquality { }
+/// class UsesNoEquality {
+///   public void Test() {
+///     var ca1 = new NoEquality();
+///     var ca2 = new NoEquality();
+///     if (ca1 != null) { // OK
+///       bool condition = ca1 == ca2; // Warning
+///     }
+///   }
+/// }
+/// </code></example>
+[AttributeUsage(
+	AttributeTargets.Interface | AttributeTargets.Class |
+	AttributeTargets.Struct, AllowMultiple = false, Inherited = true)]
+internal sealed class CannotApplyEqualityOperatorAttribute : Attribute {
+}
+
+/// <summary>
+/// When applied to a target attribute, specifies a requirement for any type marked
+/// with the target attribute to implement or inherit specific type or types.
+/// </summary>
+/// <example><code>
+/// [BaseTypeRequired(typeof(IComponent)] // Specify requirement
+/// public class ComponentAttribute : Attribute { }
+/// [Component] // ComponentAttribute requires implementing IComponent interface
+/// public class MyComponent : IComponent { }
+/// </code></example>
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
+[BaseTypeRequired(typeof(Attribute))]
+internal sealed class BaseTypeRequiredAttribute : Attribute {
+	public BaseTypeRequiredAttribute([NotNull] Type baseType) {
+		BaseType = baseType;
+	}
+
+	[NotNull] public Type BaseType { get; private set; }
+}
+
+/// <summary>
+/// Indicates that the marked symbol is used implicitly
+/// (e.g. via reflection, in external library), so this symbol
+/// will not be marked as unused (as well as by other usage inspections)
+/// </summary>
+[AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = true)]
+internal sealed class UsedImplicitlyAttribute : Attribute {
+	public UsedImplicitlyAttribute()
+		: this(ImplicitUseKindFlags.Default, ImplicitUseTargetFlags.Default) {
+	}
+
+	public UsedImplicitlyAttribute(ImplicitUseKindFlags useKindFlags)
+		: this(useKindFlags, ImplicitUseTargetFlags.Default) {
+	}
+
+	public UsedImplicitlyAttribute(ImplicitUseTargetFlags targetFlags)
+		: this(ImplicitUseKindFlags.Default, targetFlags) {
+	}
+
+	public UsedImplicitlyAttribute(
+		ImplicitUseKindFlags useKindFlags, ImplicitUseTargetFlags targetFlags) {
+		UseKindFlags = useKindFlags;
+		TargetFlags = targetFlags;
+	}
+
+	public ImplicitUseKindFlags UseKindFlags { get; private set; }
+	public ImplicitUseTargetFlags TargetFlags { get; private set; }
+}
+
+/// <summary>
+/// Should be used on attributes and causes ReSharper
+/// to not mark symbols marked with such attributes as unused
+/// (as well as by other usage inspections)
+/// </summary>
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+internal sealed class MeansImplicitUseAttribute : Attribute {
+	public MeansImplicitUseAttribute()
+		: this(ImplicitUseKindFlags.Default, ImplicitUseTargetFlags.Default) {
+	}
+
+	public MeansImplicitUseAttribute(ImplicitUseKindFlags useKindFlags)
+		: this(useKindFlags, ImplicitUseTargetFlags.Default) {
+	}
+
+	public MeansImplicitUseAttribute(ImplicitUseTargetFlags targetFlags)
+		: this(ImplicitUseKindFlags.Default, targetFlags) {
+	}
+
+	public MeansImplicitUseAttribute(
+		ImplicitUseKindFlags useKindFlags, ImplicitUseTargetFlags targetFlags) {
+		UseKindFlags = useKindFlags;
+		TargetFlags = targetFlags;
+	}
+
+	[UsedImplicitly] public ImplicitUseKindFlags UseKindFlags { get; private set; }
+	[UsedImplicitly] public ImplicitUseTargetFlags TargetFlags { get; private set; }
+}
+
+[Flags]
+internal enum ImplicitUseKindFlags {
+	Default = Access | Assign | InstantiatedWithFixedConstructorSignature,
+
+	/// <summary>Only entity marked with attribute considered used</summary>
+	Access = 1,
+
+	/// <summary>Indicates implicit assignment to a member</summary>
+	Assign = 2,
+
+	/// <summary>
+	/// Indicates implicit instantiation of a type with fixed constructor signature.
+	/// That means any unused constructor parameters won't be reported as such.
+	/// </summary>
+	InstantiatedWithFixedConstructorSignature = 4,
+
+	/// <summary>Indicates implicit instantiation of a type</summary>
+	InstantiatedNoFixedConstructorSignature = 8,
+}
+
+/// <summary>
+/// Specify what is considered used implicitly
+/// when marked with <see cref="MeansImplicitUseAttribute"/>
+/// or <see cref="UsedImplicitlyAttribute"/>
+/// </summary>
+[Flags]
+internal enum ImplicitUseTargetFlags {
+	Default = Itself,
+	Itself = 1,
+
+	/// <summary>Members of entity marked with attribute are considered used</summary>
+	Members = 2,
+
+	/// <summary>Entity marked with attribute and all its members considered used</summary>
+	WithMembers = Itself | Members
+}
+
+/// <summary>
+/// This attribute is intended to mark publicly available API
+/// which should not be removed and so is treated as used
+/// </summary>
+[MeansImplicitUse]
+internal sealed class PublicAPIAttribute : Attribute {
+	public PublicAPIAttribute() {
+	}
+
+	public PublicAPIAttribute([NotNull] string comment) {
+		Comment = comment;
+	}
+
+	[NotNull] public string Comment { get; private set; }
+}
+
+/// <summary>
+/// Tells code analysis engine if the parameter is completely handled
+/// when the invoked method is on stack. If the parameter is a delegate,
+/// indicates that delegate is executed while the method is executed.
+/// If the parameter is an enumerable, indicates that it is enumerated
+/// while the method is executed
+/// </summary>
+[AttributeUsage(AttributeTargets.Parameter, Inherited = true)]
+internal sealed class InstantHandleAttribute : Attribute {
+}
+
+/// <summary>
+/// Indicates that a method does not make any observable state changes.
+/// The same as <c>System.Diagnostics.Contracts.PureAttribute</c>
+/// </summary>
+/// <example><code>
+/// [Pure] private int Multiply(int x, int y) { return x * y; }
+/// public void Foo() {
+///   const int a = 2, b = 2;
+///   Multiply(a, b); // Waring: Return value of pure method is not used
+/// }
+/// </code></example>
+[AttributeUsage(AttributeTargets.Method, Inherited = true)]
+internal sealed class PureAttribute : Attribute {
+}
+
+/// <summary>
+/// Indicates that a parameter is a path to a file or a folder
+/// within a web project. Path can be relative or absolute,
+/// starting from web root (~)
+/// </summary>
+[AttributeUsage(AttributeTargets.Parameter)]
+internal class PathReferenceAttribute : Attribute {
+	public PathReferenceAttribute() {
+	}
+
+	public PathReferenceAttribute([PathReference] string basePath) {
+		BasePath = basePath;
+	}
+
+	[NotNull] public string BasePath { get; private set; }
+}
+
+// ASP.NET MVC attributes
+
+[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+internal sealed class AspMvcAreaMasterLocationFormatAttribute : Attribute {
+	public AspMvcAreaMasterLocationFormatAttribute(string format) {
+	}
+}
+
+[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+internal sealed class AspMvcAreaPartialViewLocationFormatAttribute : Attribute {
+	public AspMvcAreaPartialViewLocationFormatAttribute(string format) {
+	}
+}
+
+[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+internal sealed class AspMvcAreaViewLocationFormatAttribute : Attribute {
+	public AspMvcAreaViewLocationFormatAttribute(string format) {
+	}
+}
+
+[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+internal sealed class AspMvcMasterLocationFormatAttribute : Attribute {
+	public AspMvcMasterLocationFormatAttribute(string format) {
+	}
+}
+
+[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+internal sealed class AspMvcPartialViewLocationFormatAttribute : Attribute {
+	public AspMvcPartialViewLocationFormatAttribute(string format) {
+	}
+}
+
+[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+internal sealed class AspMvcViewLocationFormatAttribute : Attribute {
+	public AspMvcViewLocationFormatAttribute(string format) {
+	}
+}
+
+/// <summary>
+/// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter
+/// is an MVC action. If applied to a method, the MVC action name is calculated
+/// implicitly from the context. Use this attribute for custom wrappers similar to
+/// <c>System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String)</c>
+/// </summary>
+[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
+internal sealed class AspMvcActionAttribute : Attribute {
+	public AspMvcActionAttribute() {
+	}
+
+	public AspMvcActionAttribute([NotNull] string anonymousProperty) {
+		AnonymousProperty = anonymousProperty;
+	}
+
+	[NotNull] public string AnonymousProperty { get; private set; }
+}
+
+/// <summary>
+/// ASP.NET MVC attribute. Indicates that a parameter is an MVC area.
+/// Use this attribute for custom wrappers similar to
+/// <c>System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String)</c>
+/// </summary>
+[AttributeUsage(AttributeTargets.Parameter)]
+internal sealed class AspMvcAreaAttribute : PathReferenceAttribute {
+	public AspMvcAreaAttribute() {
+	}
+
+	public AspMvcAreaAttribute([NotNull] string anonymousProperty) {
+		AnonymousProperty = anonymousProperty;
+	}
+
+	[NotNull] public string AnonymousProperty { get; private set; }
+}
+
+/// <summary>
+/// ASP.NET MVC attribute. If applied to a parameter, indicates that
+/// the parameter is an MVC controller. If applied to a method,
+/// the MVC controller name is calculated implicitly from the context.
+/// Use this attribute for custom wrappers similar to 
+/// <c>System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String, String)</c>
+/// </summary>
+[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
+internal sealed class AspMvcControllerAttribute : Attribute {
+	public AspMvcControllerAttribute() {
+	}
+
+	public AspMvcControllerAttribute([NotNull] string anonymousProperty) {
+		AnonymousProperty = anonymousProperty;
+	}
+
+	[NotNull] public string AnonymousProperty { get; private set; }
+}
+
+/// <summary>
+/// ASP.NET MVC attribute. Indicates that a parameter is an MVC Master.
+/// Use this attribute for custom wrappers similar to
+/// <c>System.Web.Mvc.Controller.View(String, String)</c>
+/// </summary>
+[AttributeUsage(AttributeTargets.Parameter)]
+internal sealed class AspMvcMasterAttribute : Attribute {
+}
+
+/// <summary>
+/// ASP.NET MVC attribute. Indicates that a parameter is an MVC model type.
+/// Use this attribute for custom wrappers similar to
+/// <c>System.Web.Mvc.Controller.View(String, Object)</c>
+/// </summary>
+[AttributeUsage(AttributeTargets.Parameter)]
+internal sealed class AspMvcModelTypeAttribute : Attribute {
+}
+
+/// <summary>
+/// ASP.NET MVC attribute. If applied to a parameter, indicates that
+/// the parameter is an MVC partial view. If applied to a method,
+/// the MVC partial view name is calculated implicitly from the context.
+/// Use this attribute for custom wrappers similar to
+/// <c>System.Web.Mvc.Html.RenderPartialExtensions.RenderPartial(HtmlHelper, String)</c>
+/// </summary>
+[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
+internal sealed class AspMvcPartialViewAttribute : PathReferenceAttribute {
+}
+
+/// <summary>
+/// ASP.NET MVC attribute. Allows disabling all inspections
+/// for MVC views within a class or a method.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
+internal sealed class AspMvcSupressViewErrorAttribute : Attribute {
+}
+
+/// <summary>
+/// ASP.NET MVC attribute. Indicates that a parameter is an MVC display template.
+/// Use this attribute for custom wrappers similar to 
+/// <c>System.Web.Mvc.Html.DisplayExtensions.DisplayForModel(HtmlHelper, String)</c>
+/// </summary>
+[AttributeUsage(AttributeTargets.Parameter)]
+internal sealed class AspMvcDisplayTemplateAttribute : Attribute {
+}
+
+/// <summary>
+/// ASP.NET MVC attribute. Indicates that a parameter is an MVC editor template.
+/// Use this attribute for custom wrappers similar to
+/// <c>System.Web.Mvc.Html.EditorExtensions.EditorForModel(HtmlHelper, String)</c>
+/// </summary>
+[AttributeUsage(AttributeTargets.Parameter)]
+internal sealed class AspMvcEditorTemplateAttribute : Attribute {
+}
+
+/// <summary>
+/// ASP.NET MVC attribute. Indicates that a parameter is an MVC template.
+/// Use this attribute for custom wrappers similar to
+/// <c>System.ComponentModel.DataAnnotations.UIHintAttribute(System.String)</c>
+/// </summary>
+[AttributeUsage(AttributeTargets.Parameter)]
+internal sealed class AspMvcTemplateAttribute : Attribute {
+}
+
+/// <summary>
+/// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter
+/// is an MVC view. If applied to a method, the MVC view name is calculated implicitly
+/// from the context. Use this attribute for custom wrappers similar to
+/// <c>System.Web.Mvc.Controller.View(Object)</c>
+/// </summary>
+[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
+internal sealed class AspMvcViewAttribute : PathReferenceAttribute {
+}
+
+/// <summary>
+/// ASP.NET MVC attribute. When applied to a parameter of an attribute,
+/// indicates that this parameter is an MVC action name
+/// </summary>
+/// <example><code>
+/// [ActionName("Foo")]
+/// public ActionResult Login(string returnUrl) {
+///   ViewBag.ReturnUrl = Url.Action("Foo"); // OK
+///   return RedirectToAction("Bar"); // Error: Cannot resolve action
+/// }
+/// </code></example>
+[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property)]
+internal sealed class AspMvcActionSelectorAttribute : Attribute {
+}
+
+[AttributeUsage(
+	AttributeTargets.Parameter | AttributeTargets.Property |
+	AttributeTargets.Field, Inherited = true)]
+internal sealed class HtmlElementAttributesAttribute : Attribute {
+	public HtmlElementAttributesAttribute() {
+	}
+
+	public HtmlElementAttributesAttribute([NotNull] string name) {
+		Name = name;
+	}
+
+	[NotNull] public string Name { get; private set; }
+}
+
+[AttributeUsage(
+	AttributeTargets.Parameter | AttributeTargets.Field |
+	AttributeTargets.Property, Inherited = true)]
+internal sealed class HtmlAttributeValueAttribute : Attribute {
+	public HtmlAttributeValueAttribute([NotNull] string name) {
+		Name = name;
+	}
+
+	[NotNull] public string Name { get; private set; }
+}
+
+// Razor attributes
+
+/// <summary>
+/// Razor attribute. Indicates that a parameter or a method is a Razor section.
+/// Use this attribute for custom wrappers similar to 
+/// <c>System.Web.WebPages.WebPageBase.RenderSection(String)</c>
+/// </summary>
+[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method, Inherited = true)]
+internal sealed class RazorSectionAttribute : Attribute {
+}
diff --git a/src/KurrentDB.Common/Utils/Application.cs b/src/KurrentDB.Common/Utils/Application.cs
new file mode 100644
index 00000000000..a48f1986122
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/Application.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Common.Utils;
+
+public enum ExitCode {
+	Success = 0,
+	Error = 1
+}
+
+public class Application {
+	private static readonly ILogger Log = Serilog.Log.ForContext<Application>();
+
+	private static Action<int> _exit = delegate {
+	};
+
+	private static int _exited;
+
+	public static void RegisterExitAction(Action<int> exitAction) {
+		Ensure.NotNull(exitAction, "exitAction");
+
+		_exit = exitAction;
+	}
+
+	public static void ExitSilent(int exitCode, string reason) => Exit(exitCode, reason, true);
+	public static void Exit(ExitCode exitCode, string reason) => Exit((int)exitCode, reason);
+	public static void Exit(int exitCode, string reason) => Exit(exitCode, reason, false);
+
+	private static void Exit(int exitCode, string reason, bool silent) {
+		if (Interlocked.CompareExchange(ref _exited, 1, 0) != 0)
+			return;
+
+		Ensure.NotNullOrEmpty(reason, "reason");
+
+		if (!silent) {
+			if (exitCode != 0)
+				Log.Error("Exiting with exit code: {exitCode}.\nExit reason: {e}", exitCode, reason);
+			else
+				Log.Information("Exiting with exit code: {exitCode}.\nExit reason: {e}", exitCode, reason);
+		}
+
+		_exit?.Invoke(exitCode);
+	}
+}
diff --git a/src/KurrentDB.Common/Utils/BytesFormatter.cs b/src/KurrentDB.Common/Utils/BytesFormatter.cs
new file mode 100644
index 00000000000..955de7a18e0
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/BytesFormatter.cs
@@ -0,0 +1,85 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+
+namespace KurrentDB.Common.Utils;
+
+public static class BytesFormatter {
+	private static readonly string[] SizeOrders = new[] { "B", "KiB", "MiB", "GiB", "TiB" };
+	private static readonly string[] SpeedOrders = new[] { "B/s", "KiB/s", "MiB/s", "GiB/s", "TiB/s" };
+	private static readonly string[] NumberOrders = new[] { "", "K", "M", "G", "T" };
+
+	public static string ToFriendlySpeedString(this double bytes) {
+		return FormatSpeed((float)bytes);
+	}
+
+	public static string ToFriendlySizeString(this ulong bytes) {
+		return bytes > long.MaxValue ? "more than long.MaxValue" : ToFriendlySizeString((long)bytes);
+	}
+
+	public static string ToFriendlySizeString(this long bytes) {
+		return FormatLong(bytes, SizeOrders);
+	}
+
+	public static string ToFriendlyNumberString(this ulong number) {
+		return number > long.MaxValue ? "more than long.MaxValue" : ToFriendlyNumberString((long)number);
+	}
+
+	public static string ToFriendlyNumberString(this long number) {
+		return FormatLong(number, NumberOrders);
+	}
+
+	private static string FormatLong(long bytes, IEnumerable<string> orders) {
+		const int scale = 1024;
+		bool isNegative = bytes < 0;
+		bytes = Math.Abs(bytes);
+
+		long max = 1;
+		string finalOrder = string.Empty;
+
+		foreach (var order in orders) {
+			max *= scale;
+			finalOrder = order;
+			if (bytes < max)
+				break;
+		}
+
+		max /= scale;
+
+		var friendlyStr = string.Format(CultureInfo.InvariantCulture,
+			"{0}{1:##0.##}{2}",
+			isNegative ? "-" : string.Empty,
+			bytes * 1.0 / (double)max,
+			finalOrder);
+		return friendlyStr;
+	}
+
+	//the only difference is double vs long
+	private static string FormatSpeed(double bytesPerSec) {
+		const int scale = 1024;
+		bool isNegative = bytesPerSec < 0; // verrry strange, but we need to show this if it happened already
+		bytesPerSec = Math.Abs(bytesPerSec);
+
+		long max = 1;
+		string finalOrder = string.Empty;
+
+		foreach (var speedOrder in SpeedOrders) {
+			max *= scale;
+			finalOrder = speedOrder;
+			if (bytesPerSec < max)
+				break;
+		}
+
+		max /= scale;
+
+		var friendlyStr = string.Format(CultureInfo.InvariantCulture,
+			"{0}{1:##0.##}{2}",
+			isNegative ? "-" : string.Empty,
+			bytesPerSec / (double)max,
+			finalOrder);
+		return friendlyStr;
+	}
+}
diff --git a/src/KurrentDB.Common/Utils/CertificateDelegates.cs b/src/KurrentDB.Common/Utils/CertificateDelegates.cs
new file mode 100644
index 00000000000..bb1e0a86422
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/CertificateDelegates.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net.Security;
+using System.Security.Cryptography.X509Certificates;
+
+namespace KurrentDB.Common.Utils;
+
+public static class CertificateDelegates {
+	public delegate (bool, string) ServerCertificateValidator(X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors, string[] otherNames);
+	public delegate (bool, string) ClientCertificateValidator(X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors);
+}
diff --git a/src/KurrentDB.Common/Utils/CertificateExtensions.cs b/src/KurrentDB.Common/Utils/CertificateExtensions.cs
new file mode 100644
index 00000000000..17335e6213e
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/CertificateExtensions.cs
@@ -0,0 +1,313 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Formats.Asn1;
+using System.Globalization;
+using System.Linq;
+using System.Net;
+using System.Security.Cryptography;
+using System.Security.Cryptography.Pkcs;
+using System.Security.Cryptography.X509Certificates;
+
+namespace KurrentDB.Common.Utils;
+
+public static class CertificateExtensions {
+	public static IEnumerable<(string name, string type)> GetSubjectAlternativeNames(this X509Certificate2 certificate) {
+		// Implemented based on RFC 5280 (https://datatracker.ietf.org/doc/html/rfc5280)
+		// - Reads IP addresses and DNS names from the Subject Alternative Names extension
+		// - Does not support other name types yet
+
+		X509ExtensionCollection extensions;
+		try {
+			extensions = certificate.Extensions;
+		} catch (CryptographicException) {
+			return null;
+		}
+
+		var sans = new List<(string, string)>();
+		foreach (var extension in extensions) {
+			if (extension.Oid?.Value != "2.5.29.17")
+				continue; // Oid for Subject Alternative Names extension
+			var asnReader = new AsnReader(extension.RawData, AsnEncodingRules.DER).ReadSequence();
+			while (asnReader.HasData) {
+				Asn1Tag tag;
+				try {
+					tag = asnReader.PeekTag();
+				} catch (AsnContentException) {
+					break;
+				}
+
+				switch (tag.TagValue) {
+					case 2: // dNSName [2] IA5String
+						sans.Add((asnReader.ReadCharacterString(UniversalTagNumber.IA5String, tag), CertificateNameType.DnsName));
+						break;
+					case 7: // iPAddress [7] OCTET STRING
+						sans.Add((new IPAddress(asnReader.ReadOctetString(tag)).ToString(), CertificateNameType.IpAddress));
+						break;
+					default:
+						asnReader.ReadEncodedValue();
+						break;
+				}
+			}
+		}
+
+		return sans;
+	}
+
+	public static bool MatchesName(this X509Certificate2 certificate, string name) {
+		// Implemented based on RFC 6125 (https://datatracker.ietf.org/doc/html/rfc6125) with the following changes:
+		// - Does not support SRV-ID and URI-ID identifier types yet
+		// - Partial wildcard support is not implemented since it has been deprecated in most major browsers
+
+		var sans = GetSubjectAlternativeNames(certificate).ToArray();
+		if (sans.Length > 0)
+			return sans.Any(san => MatchesName(san.name, san.type, name));
+
+		var cn = GetCommonName(certificate);
+		return cn != null && MatchesName(cn, CertificateNameType.DnsName, name);
+	}
+
+	public static bool ClientCertificateMatchesName(this X509Certificate2 clientCertificate, string name) {
+		// This method, as a whole, is not based on any standard and is specific to EventStoreDB.
+		// It matches a client certificate's CN against a name as follows:
+		// i)  do an exact (case-insensitive) match if the CN is a wildcard name, otherwise
+		// ii) do an RFC 6125 compliant match (with the implementation limitations mentioned above)
+		//
+		// Basic rules:
+		// CN = *.test.com MUST match with name = *.test.com
+		// CN = *.test.com MUST NOT match with name = abc.test.com
+		// CN = abc.test.com MUST match with name = *.test.com
+		// CN = abc.test.com MUST match with name = abc.test.com
+
+		var cn = clientCertificate.GetCommonName();
+
+		// if the CN is a wildcard name, do an exact (case-insensitive) match
+		// as a standard RFC 6125 compliant match of two wildcard names will fail
+		if (cn.IsWildcardCertificateName())
+			return cn.EqualsOrdinalIgnoreCase(name);
+
+		// otherwise, do a standard RFC 6125 compliant name match
+		return MatchesName(name, CertificateNameType.DnsName, cn);
+	}
+
+	public static string GetCommonName(this X509Certificate2 certificate) => certificate.GetNameInfo(X509NameType.SimpleName, false);
+
+	// FIPS compliant PKCS #12 bundle creation
+	public static byte[] ExportToPkcs12(this X509Certificate2 certificate, string password = null) {
+		password ??= string.Empty;
+
+		using var rsa = RSA.Create();
+		rsa.ImportRSAPrivateKey(certificate.GetRSAPrivateKey()!.ExportRSAPrivateKey(), out _);
+		var builder = new Pkcs12Builder();
+		var safeContents = new Pkcs12SafeContents();
+		var pbeParams = new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 2048);
+		safeContents.AddCertificate(certificate);
+		safeContents.AddShroudedKey(rsa, password, pbeParams);
+		builder.AddSafeContentsEncrypted(safeContents, password, pbeParams);
+		builder.SealWithMac(password, HashAlgorithmName.SHA256, 2048);
+
+		return builder.Encode();
+	}
+
+	private static bool HasNonAsciiChars(string s) => s.Any(t => t > 127);
+
+	private static bool IsInternationalizedDomainNameLabel(string s) {
+		const string ACEPrefix = "xn--";
+		return HasNonAsciiChars(s) || s.StartsWith(ACEPrefix, StringComparison.OrdinalIgnoreCase);
+	}
+
+	// Based on RFC 952
+	private static bool IsValidDnsNameLabel(string label) =>
+		label.All(x => x is >= '0' and <= '9' or >= 'a' and <= 'z' or >= 'A' and <= 'Z' or '-');
+
+	// Based on RFC 6125 (without support for partial wildcard DNS labels
+	// since it has been deprecated by most major browsers)
+	private static bool IsValidCertificateNameFirstLabel(string label) =>
+		label == "*" || IsValidDnsNameLabel(label);
+
+	private static bool IsWildcardCertificateName(this string certName) {
+		if (!certName.StartsWith("*.", StringComparison.Ordinal))
+			return false;
+
+		// the certificate name starts with a wildcard DNS label. to verify if it's a valid wildcard name,
+		// we replace the wildcard by the letter 'a', then match it against the original certificate name
+		return MatchesName(certName, CertificateNameType.DnsName, 'a' + certName[1..]);
+	}
+
+	private static bool MatchesName(string certName, string certNameType, string name) {
+		const string Wildcard = "*";
+		const char Delimiter = '.';
+
+		if (string.IsNullOrEmpty(certName) ||
+			string.IsNullOrEmpty(name))
+			return false;
+
+		// if at least one of the names is an IP address, do an exact match
+		if (certNameType == CertificateNameType.IpAddress ||
+			IPAddress.TryParse(certName, out _) ||
+			IPAddress.TryParse(name, out _))
+			return name.EqualsOrdinalIgnoreCase(certName);
+
+		Debug.Assert(certNameType == CertificateNameType.DnsName);
+
+		var certNameLabels = certName.Split(Delimiter);
+		var dnsNameLabels = name.Split(Delimiter);
+
+		if (certNameLabels.Length != dnsNameLabels.Length)
+			return false;
+
+		if (certNameLabels.Any(string.IsNullOrEmpty) ||
+			dnsNameLabels.Any(string.IsNullOrEmpty))
+			return false;
+
+		if (certNameLabels.Any(IsInternationalizedDomainNameLabel) ||
+			dnsNameLabels.Any(IsInternationalizedDomainNameLabel)) {
+			var idnMapping = new IdnMapping();
+			dnsNameLabels = dnsNameLabels.Select(x => idnMapping.GetAscii(x)).ToArray();
+			certNameLabels = certNameLabels.Select(x => idnMapping.GetAscii(x)).ToArray();
+		}
+
+		if (!IsValidCertificateNameFirstLabel(certNameLabels.First()) ||
+			!certNameLabels.Skip(1).All(IsValidDnsNameLabel) ||
+			!dnsNameLabels.All(IsValidDnsNameLabel))
+			return false;
+
+		// if first label is not a wildcard, check for an exact match
+		if (certNameLabels.First() != Wildcard)
+			return certNameLabels.EqualsOrdinalIgnoreCase(dnsNameLabels);
+
+		// first label is wildcard, a wildcard FQDN should have at least 3 labels
+		if (certNameLabels.Length <= 2)
+			return false;
+
+		// compare the other labels of the wildcard FQDN
+		return certNameLabels.Skip(1).EqualsOrdinalIgnoreCase(dnsNameLabels.Skip(1));
+	}
+
+	public static IDisposable ConvertToCertificate2(this X509Certificate certificate, out X509Certificate2 certificate2) {
+		if (certificate is X509Certificate2 c2) {
+			certificate2 = c2;
+			return null;
+		}
+
+		certificate2 = new X509Certificate2(certificate);
+		return certificate2;
+	}
+
+	public static bool TryGetKeyUsages(
+		this X509Certificate2 certificate,
+		out X509KeyUsageFlags keyUsages,
+		out bool hasExtendedKeyUsage,
+		out Oid[] extKeyUsages,
+		out string failReason) {
+
+		keyUsages = X509KeyUsageFlags.None;
+		hasExtendedKeyUsage = false;
+		extKeyUsages = [];
+		failReason = "";
+
+		X509ExtensionCollection extensions;
+		try {
+			extensions = certificate.Extensions;
+		} catch (CryptographicException ex) {
+			failReason = ex.Message;
+			return false;
+		}
+
+		foreach (var extension in extensions) {
+			switch (extension.Oid?.Value) {
+				case "2.5.29.15": // Oid for Key Usage extension
+					var keyUsageExt = (X509KeyUsageExtension)extension;
+					keyUsages |= keyUsageExt.KeyUsages;
+					break;
+				case "2.5.29.37": // Oid for Extended Key Usage extension
+					hasExtendedKeyUsage = true;
+					var enhancedKeyUsageExt = (X509EnhancedKeyUsageExtension)extension;
+					extKeyUsages = new Oid[enhancedKeyUsageExt.EnhancedKeyUsages.Count];
+					if (extKeyUsages.Length > 0)
+						enhancedKeyUsageExt.EnhancedKeyUsages.CopyTo(extKeyUsages, 0);
+					break;
+			}
+		}
+
+		return true;
+	}
+
+	private static bool HasCorrectKeyUsages(X509KeyUsageFlags keyUsageFlags, out string failReason) {
+		if (!keyUsageFlags.HasFlag(X509KeyUsageFlags.DigitalSignature)) {
+			failReason = "Missing key usage: Digital Signature";
+			return false;
+		}
+
+		if (!keyUsageFlags.HasFlag(X509KeyUsageFlags.KeyEncipherment) &&
+			!keyUsageFlags.HasFlag(X509KeyUsageFlags.KeyAgreement)) {
+			failReason = "Missing key usage: Key Encipherment and/or Key Agreement";
+			return false;
+		}
+
+		failReason = string.Empty;
+		return true;
+	}
+
+	private static bool HasServerAuthExtendedKeyUsage(IEnumerable<Oid> extendedKeyUsages, out string failReason) {
+		if (extendedKeyUsages.All(oid => oid.Value != "1.3.6.1.5.5.7.3.1")) { // serverAuth
+			failReason = "Missing extended key usage: Server Authentication";
+			return false;
+		}
+
+		failReason = string.Empty;
+		return true;
+	}
+
+	private static bool HasClientAuthExtendedKeyUsage(IEnumerable<Oid> extendedKeyUsages, out string failReason) {
+		if (extendedKeyUsages.All(oid => oid.Value != "1.3.6.1.5.5.7.3.2")) { // clientAuth
+			failReason = "Missing extended key usage: Client Authentication";
+			return false;
+		}
+
+		failReason = string.Empty;
+		return true;
+	}
+
+	public static bool IsServerCertificate(this X509Certificate2 certificate, out string failReason) {
+		if (!certificate.TryGetKeyUsages(out var keyUsages, out var hasExtKeyUsagesExtension, out var extKeyUsages, out failReason))
+			return false;
+
+		if (!HasCorrectKeyUsages(keyUsages, out failReason))
+			return false;
+
+		// rfc5280 section-4.2.1.12: extended key usages (EKUs) only have to be enforced
+		// if the extension is present at all. here, we don't enforce them for server
+		// certificates for backwards compatibility. however, this also implies that we
+		// _need_ the EKUs to be present for other types of certificates (e.g user certificates)
+		// as otherwise it would cause ambiguity when trying to determine the certificate type.
+		if (hasExtKeyUsagesExtension) {
+			if (!HasServerAuthExtendedKeyUsage(extKeyUsages, out failReason))
+				return false;
+
+			// historically, server certificates also have the clientAuth EKU
+			if (!HasClientAuthExtendedKeyUsage(extKeyUsages, out failReason))
+				return false;
+		}
+
+		failReason = string.Empty;
+		return true;
+	}
+
+	public static bool IsClientCertificate(this X509Certificate2 certificate, out string failReason) {
+		if (!certificate.TryGetKeyUsages(out var keyUsages, out _, out var extKeyUsages, out failReason))
+			return false;
+
+		if (!HasCorrectKeyUsages(keyUsages, out failReason))
+			return false;
+
+		if (!HasClientAuthExtendedKeyUsage(extKeyUsages, out failReason))
+			return false;
+
+		failReason = string.Empty;
+		return true;
+	}
+}
diff --git a/src/KurrentDB.Common/Utils/CertificateNameType.cs b/src/KurrentDB.Common/Utils/CertificateNameType.cs
new file mode 100644
index 00000000000..e7f5a7caaec
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/CertificateNameType.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Common.Utils;
+
+public static class CertificateNameType {
+	// Based on RFC 5280 (https://datatracker.ietf.org/doc/html/rfc5280)
+	public const string IpAddress = "iPAddress";
+	public const string DnsName = "dNSName";
+}
diff --git a/src/KurrentDB.Common/Utils/ClaimsPrincipalExtensions.cs b/src/KurrentDB.Common/Utils/ClaimsPrincipalExtensions.cs
new file mode 100644
index 00000000000..7c041a1aaba
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/ClaimsPrincipalExtensions.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Claims;
+
+namespace KurrentDB.Common.Utils;
+
+public static class ClaimsPrincipalExtensions {
+	public static bool LegacyRoleCheck(this ClaimsPrincipal user, string role) {
+		return user.HasClaim(ClaimTypes.Name, role) || user.HasClaim(ClaimTypes.Role, role);
+	}
+}
diff --git a/src/KurrentDB.Common/Utils/ConcurrentQueueWrapper.cs b/src/KurrentDB.Common/Utils/ConcurrentQueueWrapper.cs
new file mode 100644
index 00000000000..8c80b58af48
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/ConcurrentQueueWrapper.cs
@@ -0,0 +1,96 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Concurrent;
+using System.Threading;
+
+namespace KurrentDB.Common.Utils;
+
+//Workaround for: https://github.com/dotnet/corefx/issues/29759
+//As from mono 5.2 and .NET Core 2.0, ConcurrentQueue.Count has knowingly been made slower (in some cases, O(N)) in favor of faster Enqueue() and Dequeue() operations (See: https://github.com/dotnet/corefx/issues/29759#issuecomment-390435245)
+//This wrapper implements a workaround by maintaining the queue count at the expense of a slightly slower Enqueue()/Dequeue()
+//Interlocked.Increment/Decrement operations are of the order of 36-90 cycles (similar to a division operation) which is good enough in our case.
+public class ConcurrentQueueWrapper<T> : ConcurrentQueue<T> {
+	private volatile int _queueCount = 0;
+
+	public new bool IsEmpty {
+		get { return _queueCount <= 0; }
+	}
+
+	public new int Count {
+		get {
+			int curCount = _queueCount;
+			return curCount < 0 ? 0 : curCount;
+		}
+	}
+
+	//Note: The count is not updated atomically together with dequeueing.
+	//This means that the count will be eventually consistent but it's not an issue since between the Count call and any other operation items may be enqueued or dequeued anyway and the count will no longer be valid.
+	public new bool TryDequeue(out T result) {
+		var dequeued = base.TryDequeue(out result);
+		if (dequeued)
+			Interlocked.Decrement(ref _queueCount);
+		return dequeued;
+	}
+
+	//Note: The count is not updated atomically together with dequeueing.
+	//This means that the count will be eventually consistent but it's not an issue since between the Count call and any other operation items may be enqueued or dequeued anyway and the count will no longer be valid.
+	public new void Enqueue(T item) {
+		base.Enqueue(item);
+		Interlocked.Increment(ref _queueCount);
+	}
+}
+
+/*
+//For future reference, the following code can be used to test if the problem is still occuring.
+//Running the application should make the Main thread use 100% CPU and is very very slow.
+//The code has been tested on Mono 5.2-5.16 (the issue does not occur on earlier versions) and .NET Core 2.0 - .NET Core 3.0 preview
+
+using System;
+using System.Threading;
+using System.Collections.Concurrent;
+
+public class Program
+{
+    private static ConcurrentQueue<int> queue = new ConcurrentQueue<int>();
+    private static volatile bool exit = false;
+
+    public static void Main(string[] args)
+    {
+        Thread t = new Thread(AddEventsThread);
+        t.Name = "AddEventsThread";
+        t.Start();
+
+        Thread.Sleep(5000); //wait for 5 seconds to make sure the AddEventsThread thread has started
+        var queueCount = 0L;
+        var totalElapsed = 0L;
+
+        Console.WriteLine("Starting to hammer queue.Count.");
+
+        for(int i=0;i<1000000;i++){
+            var start = DateTime.UtcNow.Ticks;
+            queueCount = queue.Count;
+            totalElapsed += DateTime.UtcNow.Ticks - start;
+        }
+
+        Console.Out.WriteLine("Total Elapsed: {0}, Queue Count: {1}", totalElapsed, queueCount);
+        exit = true;
+    }
+
+    public static void AddEventsThread(){
+        while(!exit){
+            Console.WriteLine("Enqueing");
+            for(int i=0;i<50000 && !exit;i++){
+                queue.Enqueue(50);
+                Thread.Sleep(1);
+            }
+            Console.WriteLine("Dequeing");
+            for(int i=0;i<50000 && !exit;i++){
+                int result;
+                queue.TryDequeue(out result);
+                Thread.Sleep(1);
+            }
+        }
+    }
+}
+*/
diff --git a/src/KurrentDB.Common/Utils/ContainerizedEnvironment.cs b/src/KurrentDB.Common/Utils/ContainerizedEnvironment.cs
new file mode 100644
index 00000000000..1bc84046419
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/ContainerizedEnvironment.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Runtime;
+
+namespace KurrentDB.Common.Utils;
+
+public static class ContainerizedEnvironment {
+	public const int ReaderThreadCount = 4;
+	public const int WorkerThreadCount = 5;
+	public const int StreamInfoCacheCapacity = 100000;
+
+	public static bool IsRunningInContainer() => RuntimeInformation.IsRunningInContainer;
+}
diff --git a/src/KurrentDB.Common/Utils/Empty.cs b/src/KurrentDB.Common/Utils/Empty.cs
new file mode 100644
index 00000000000..704bdc90064
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/Empty.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Common.Utils;
+
+public static class Empty {
+	public static readonly byte[] ByteArray = new byte[0];
+	public static readonly string[] StringArray = new string[0];
+	public static readonly object[] ObjectArray = new object[0];
+
+	public static readonly Action Action = () => { };
+	public static readonly object Result = new object();
+	public static readonly string Xml = String.Empty;
+	public static readonly string Json = "{}";
+}
diff --git a/src/KurrentDB.Common/Utils/EndPointComparer.cs b/src/KurrentDB.Common/Utils/EndPointComparer.cs
new file mode 100644
index 00000000000..26f3470cf60
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/EndPointComparer.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+
+namespace KurrentDB.Common.Utils;
+
+public class EndPointComparer : IComparer<EndPoint> {
+	public int Compare(EndPoint x, EndPoint y) {
+		if (ReferenceEquals(x, y))
+			return 0;
+		if (ReferenceEquals(null, y))
+			return 1;
+		if (ReferenceEquals(null, x))
+			return -1;
+		var portCompare = x.GetPort().CompareTo(y.GetPort());
+		if (portCompare != 0)
+			return portCompare;
+		return string.Compare(x.GetHost(), y.GetHost(), StringComparison.Ordinal);
+	}
+}
+
+public class EndPointEqualityComparer : IEqualityComparer<EndPoint> {
+	public bool Equals(EndPoint x, EndPoint y) {
+		return x.GetHost().Equals(y.GetHost()) && x.GetPort() == y.GetPort();
+	}
+
+	public int GetHashCode(EndPoint obj) {
+		return obj.GetHost().GetHashCode() ^ obj.GetPort();
+	}
+}
diff --git a/src/KurrentDB.Common/Utils/EndpointExtensions.cs b/src/KurrentDB.Common/Utils/EndpointExtensions.cs
new file mode 100644
index 00000000000..f45ab989a53
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/EndpointExtensions.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+
+namespace KurrentDB.Common.Utils;
+
+public static class EndpointExtensions {
+	public static string HTTP_SCHEMA => Uri.UriSchemeHttp;
+	public static string HTTPS_SCHEMA => Uri.UriSchemeHttps;
+
+	public static string ToHttpUrl(this EndPoint endPoint, string schema, string rawUrl = null) =>
+		endPoint switch {
+			IPEndPoint ipEndPoint => CreateHttpUrl(schema, ipEndPoint.Address.ToString(), ipEndPoint.Port,
+				rawUrl != null ? rawUrl.TrimStart('/') : string.Empty),
+			DnsEndPoint dnsEndpoint => CreateHttpUrl(schema, dnsEndpoint.Host, dnsEndpoint.Port,
+				rawUrl != null ? rawUrl.TrimStart('/') : string.Empty),
+			_ => null
+		};
+
+	public static string GetHost(this EndPoint endpoint) =>
+		endpoint switch {
+			IPWithClusterDnsEndPoint ipWithClusterDns => ipWithClusterDns.Address.ToString(),
+			IPEndPoint ip => ip.Address.ToString(),
+			DnsEndPoint dns => dns.Host,
+			_ => throw new ArgumentOutOfRangeException(nameof(endpoint), endpoint?.GetType(),
+				"An invalid endpoint has been provided")
+		};
+
+	public static string[] GetOtherNames(this EndPoint endpoint) =>
+		endpoint switch {
+			IPWithClusterDnsEndPoint ipWithClusterDns => new[] { ipWithClusterDns.ClusterDnsName },
+			IPEndPoint => null,
+			DnsEndPoint => null,
+			_ => throw new ArgumentOutOfRangeException(nameof(endpoint), endpoint?.GetType(),
+				"An invalid endpoint has been provided")
+		};
+
+	public static int GetPort(this EndPoint endpoint) =>
+		endpoint switch {
+			IPEndPoint ip => ip.Port,
+			DnsEndPoint dns => dns.Port,
+			_ => throw new ArgumentOutOfRangeException(nameof(endpoint), endpoint?.GetType(),
+				"An invalid endpoint has been provided")
+		};
+
+	public static IPEndPoint ResolveDnsToIPAddress(this EndPoint endpoint) {
+		var entries = Dns.GetHostAddresses(endpoint.GetHost());
+		if (entries.Length == 0)
+			throw new Exception($"Unable get host addresses for DNS host ({endpoint.GetHost()})");
+		var ipaddress = entries.FirstOrDefault(a => a.AddressFamily == AddressFamily.InterNetwork);
+		if (ipaddress == null)
+			throw new Exception($"Could not get an IPv4 address for host '{endpoint.GetHost()}'");
+		return new IPEndPoint(ipaddress, endpoint.GetPort());
+	}
+
+	public static EndPoint WithClusterDns(this DnsEndPoint dnsEndPoint, string clusterDns) {
+		if (clusterDns != null && IPAddress.TryParse(dnsEndPoint.Host, out var ip))
+			return new IPWithClusterDnsEndPoint(ip, clusterDns, dnsEndPoint.Port);
+
+		return dnsEndPoint;
+	}
+
+	public static EndPoint WithClusterDns(this IPEndPoint ipEndPoint, string clusterDns) {
+		if (clusterDns != null)
+			return new IPWithClusterDnsEndPoint(ipEndPoint.Address, clusterDns, ipEndPoint.Port);
+
+		return ipEndPoint;
+	}
+
+	public static DnsEndPoint ToDnsEndPoint(this IPEndPoint ipEndPoint) {
+		return new DnsEndPoint(ipEndPoint.Address.ToString(), ipEndPoint.Port);
+	}
+
+	private static string CreateHttpUrl(string schema, string host, int port, string path) {
+		return $"{schema}://{host}:{port}/{path}";
+	}
+
+	private static readonly EndPointEqualityComparer EndPointEqualityComparer = new EndPointEqualityComparer();
+	public static bool EndPointEquals(this EndPoint x, EndPoint y) => EndPointEqualityComparer.Equals(x, y);
+}
diff --git a/src/KurrentDB.Common/Utils/Ensure.cs b/src/KurrentDB.Common/Utils/Ensure.cs
new file mode 100644
index 00000000000..424736f0917
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/Ensure.cs
@@ -0,0 +1,73 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace KurrentDB.Common.Utils;
+
+public interface IValidator<T> {
+	void Validate(T t);
+}
+
+public static class Ensure {
+	public static T NotNull<T>(T argument, [CallerArgumentExpression("argument")] string argumentName = null) where T : class {
+		ArgumentNullException.ThrowIfNull(argument, argumentName);
+		return argument;
+	}
+
+	public static string NotNullOrEmpty(string argument, [CallerArgumentExpression("argument")] string argumentName = null) {
+		return string.IsNullOrEmpty(argument) ? throw new ArgumentNullException(argument, argumentName) : argument;
+	}
+
+	public static int Positive(int number, [CallerArgumentExpression("number")] string argumentName = null) {
+		if (number <= 0)
+			throw new ArgumentOutOfRangeException(argumentName, $"{argumentName} should be positive.");
+		return number;
+	}
+
+	public static long Positive(long number, [CallerArgumentExpression("number")] string argumentName = null) {
+		if (number <= 0)
+			throw new ArgumentOutOfRangeException(argumentName, $"{argumentName} should be positive.");
+		return number;
+	}
+
+	public static long Nonnegative(long number, [CallerArgumentExpression("number")] string argumentName = null) {
+		if (number < 0)
+			throw new ArgumentOutOfRangeException(argumentName, argumentName + " should be non negative.");
+		return number;
+	}
+
+	public static int Nonnegative(int number, [CallerArgumentExpression("number")] string argumentName = null) {
+		return number < 0 ? throw new ArgumentOutOfRangeException(argumentName, argumentName + " should be non negative.") : number;
+	}
+
+	public static double Nonnegative(double number, [CallerArgumentExpression("number")] string argumentName = null) {
+		return number < 0 ? throw new ArgumentOutOfRangeException(argumentName, $"{argumentName} should be non negative.") : number;
+	}
+
+	public static Guid NotEmptyGuid(Guid guid, [CallerArgumentExpression("guid")] string argumentName = null) {
+		if (Guid.Empty == guid)
+			throw new ArgumentException(argumentName, $"{argumentName} should be non-empty GUID.");
+		return guid;
+	}
+
+	public static void Equal(int expected, int actual, string argumentName) {
+		if (expected != actual)
+			throw new ArgumentException($"{argumentName} expected value: {expected}, actual value: {actual}");
+	}
+
+	public static void Equal(long expected, long actual, string argumentName) {
+		if (expected != actual)
+			throw new ArgumentException($"{argumentName} expected value: {expected}, actual value: {actual}");
+	}
+
+	public static void Equal(bool expected, bool actual, string argumentName) {
+		if (expected != actual)
+			throw new ArgumentException($"{argumentName} expected value: {expected}, actual value: {actual}");
+	}
+
+	public static void Valid<T>(T t, IValidator<T> validator) {
+		validator?.Validate(t);
+	}
+}
diff --git a/src/KurrentDB.Common/Utils/EnumerableExtensions.cs b/src/KurrentDB.Common/Utils/EnumerableExtensions.cs
new file mode 100644
index 00000000000..8528660ab5a
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/EnumerableExtensions.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace KurrentDB.Common.Utils;
+
+public static class EnumerableExtensions {
+	public static IEnumerable<T> Safe<T>(this IEnumerable<T> collection) {
+		return collection ?? Enumerable.Empty<T>();
+	}
+
+	public static bool Contains<T>(this IEnumerable<T> collection, Predicate<T> condition) {
+		return collection.Any(x => condition(x));
+	}
+
+	public static bool IsEmpty<T>(this IEnumerable<T> collection) {
+		if (collection == null)
+			return true;
+		var coll = collection as ICollection;
+		if (coll != null)
+			return coll.Count == 0;
+		return !collection.Any();
+	}
+
+	public static bool IsNotEmpty<T>(this IEnumerable<T> collection) {
+		return !IsEmpty(collection);
+	}
+}
diff --git a/src/EventStore.Common/Utils/EventPositionParser.cs b/src/KurrentDB.Common/Utils/EventPositionParser.cs
similarity index 76%
rename from src/EventStore.Common/Utils/EventPositionParser.cs
rename to src/KurrentDB.Common/Utils/EventPositionParser.cs
index b9995efb468..d03ee811b28 100644
--- a/src/EventStore.Common/Utils/EventPositionParser.cs
+++ b/src/KurrentDB.Common/Utils/EventPositionParser.cs
@@ -1,6 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 
-namespace EventStore.Common.Utils;
+namespace KurrentDB.Common.Utils;
 
 public abstract class EventPositionParser {
 	public static (long commit, long prepare) ParseCommitPreparePosition(string position) {
diff --git a/src/KurrentDB.Common/Utils/FileStreamExtensions.cs b/src/KurrentDB.Common/Utils/FileStreamExtensions.cs
new file mode 100644
index 00000000000..2502eb0310e
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/FileStreamExtensions.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
+using Microsoft.Win32.SafeHandles;
+using Serilog.Core;
+using ILogger = Serilog.ILogger;
+using RuntimeInformation = System.Runtime.RuntimeInformation;
+
+namespace KurrentDB.Common.Utils;
+
+public static class FileStreamExtensions {
+	private static readonly ILogger Log =
+		Serilog.Log.ForContext(Constants.SourceContextPropertyName, "FileStreamExtensions");
+	private static Action<FileStream> FlushSafe;
+
+	[DllImport("kernel32.dll", SetLastError = true)]
+	[return: MarshalAs(UnmanagedType.Bool)]
+	public static extern bool FlushFileBuffers(SafeFileHandle hFile);
+
+	//[DllImport("kernel32.dll", SetLastError = true)]
+	//[return: MarshalAs(UnmanagedType.Bool)]
+	//static extern bool FlushViewOfFile(IntPtr lpBaseAddress, UIntPtr dwNumberOfBytesToFlush);
+
+	static FileStreamExtensions() {
+		ConfigureFlush(disableFlushToDisk: false);
+	}
+
+	public static void FlushToDisk(this FileStream fs) {
+		FlushSafe(fs);
+	}
+
+	public static void ConfigureFlush(bool disableFlushToDisk) {
+		if (disableFlushToDisk) {
+			Log.Information("FlushToDisk: DISABLED");
+			FlushSafe = f => f.Flush(flushToDisk: false);
+			return;
+		}
+
+		if (!RuntimeInformation.IsWindows)
+			FlushSafe = f => f.Flush(flushToDisk: true);
+		else {
+			FlushSafe = f => {
+				f.Flush(flushToDisk: false);
+				if (!FlushFileBuffers(f.SafeFileHandle))
+					throw new Exception($"FlushFileBuffers failed with err: {Marshal.GetLastWin32Error()}");
+			};
+		}
+	}
+}
diff --git a/src/KurrentDB.Common/Utils/Helper.cs b/src/KurrentDB.Common/Utils/Helper.cs
new file mode 100644
index 00000000000..78714bdd8a6
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/Helper.cs
@@ -0,0 +1,74 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Reflection;
+using System.Text;
+
+namespace KurrentDB.Common.Utils;
+
+public static class Helper {
+	public static readonly UTF8Encoding UTF8NoBom = new(encoderShouldEmitUTF8Identifier: false);
+
+	public static void EatException(Action action) {
+		try {
+			action();
+		} catch (Exception) {
+		}
+	}
+
+	public static void EatException<TArg>(TArg arg, Action<TArg> action) {
+		try {
+			action(arg);
+		} catch (Exception) {
+		}
+	}
+
+	public static T EatException<T>(Func<T> action, T defaultValue = default(T)) {
+		try {
+			return action();
+		} catch (Exception) {
+			return defaultValue;
+		}
+	}
+
+	public static string GetDefaultLogsDir() {
+		return Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "es-logs");
+	}
+
+	public static string FormatBinaryDump(byte[] logBulk) {
+		return FormatBinaryDump(new ArraySegment<byte>(logBulk ?? Empty.ByteArray));
+	}
+
+	public static string FormatBinaryDump(ArraySegment<byte> logBulk) {
+		if (logBulk.Count == 0)
+			return "--- NO DATA ---";
+
+		var sb = new StringBuilder();
+		int cur = 0;
+		int len = logBulk.Count;
+		for (int row = 0, rows = (logBulk.Count + 15) / 16; row < rows; ++row) {
+			sb.AppendFormat("{0:000000}:", row * 16);
+			for (int i = 0; i < 16; ++i, ++cur) {
+				if (cur >= len)
+					sb.Append("   ");
+				else
+					sb.AppendFormat(" {0:X2}", logBulk.Array[logBulk.Offset + cur]);
+			}
+
+			sb.Append("  | ");
+			cur -= 16;
+			for (int i = 0; i < 16; ++i, ++cur) {
+				if (cur < len) {
+					var b = (char)logBulk.Array[logBulk.Offset + cur];
+					sb.Append(char.IsControl(b) ? '.' : b);
+				}
+			}
+
+			sb.AppendLine();
+		}
+
+		return sb.ToString();
+	}
+}
diff --git a/src/KurrentDB.Common/Utils/HostName.cs b/src/KurrentDB.Common/Utils/HostName.cs
new file mode 100644
index 00000000000..81505731f37
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/HostName.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+
+namespace KurrentDB.Common.Utils;
+
+public class HostName {
+	public static string Combine(Uri responseUrl, string relativeUri, params object[] arg) {
+		try {
+			return CombineHostNameAndPath(responseUrl, relativeUri, arg);
+		} catch (Exception e) {
+			Debug.WriteLine("Failed to combine hostname with relative path: {0}", e.Message);
+			return relativeUri;
+		}
+	}
+
+	private static string CombineHostNameAndPath(Uri responseUrl,
+		string relativeUri,
+		object[] arg) {
+		//TODO: encode???
+		var path = string.Format(relativeUri, arg);
+		if (path.Length > 0 && path[0] == '/')
+			path = path.Substring(1);
+		return new UriBuilder(responseUrl.Scheme, responseUrl.Host, responseUrl.Port, responseUrl.LocalPath + path)
+			.Uri.AbsoluteUri;
+	}
+}
diff --git a/src/KurrentDB.Common/Utils/IPEndPointArrayConverter.cs b/src/KurrentDB.Common/Utils/IPEndPointArrayConverter.cs
new file mode 100644
index 00000000000..161de908638
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/IPEndPointArrayConverter.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using System.Net;
+
+namespace KurrentDB.Common.Utils;
+
+public class IPEndPointArrayConverter : ArrayConverter {
+	public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) {
+		return sourceType == typeof(string) || sourceType == typeof(Array) ||
+			   base.CanConvertFrom(context, sourceType);
+	}
+
+	public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture,
+		object value) {
+		if (value.GetType() == typeof(string)) {
+			var valueAsString = value as string;
+			if (valueAsString != null) {
+				var ipEndPointList = valueAsString.Split(new[] { "," }, StringSplitOptions.None)
+					.Select(x => (IPEndPoint)new IPEndPointConverter().ConvertFrom(x));
+				return ipEndPointList.ToArray();
+			}
+		} else if (value.GetType().IsArray) {
+			var values = value as IEnumerable;
+			var ipEndPointList = new List<IPEndPoint>();
+			foreach (var val in values) {
+				ipEndPointList.Add((IPEndPoint)new IPEndPointConverter().ConvertFrom(val));
+			}
+
+			return ipEndPointList.ToArray();
+		}
+
+		return base.ConvertFrom(context, culture, value);
+	}
+}
diff --git a/src/KurrentDB.Common/Utils/IPEndpointConverter.cs b/src/KurrentDB.Common/Utils/IPEndpointConverter.cs
new file mode 100644
index 00000000000..31a20c4c65e
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/IPEndpointConverter.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using System.Net;
+
+namespace KurrentDB.Common.Utils;
+
+public class IPEndPointConverter : TypeConverter {
+	public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) {
+		return sourceType == typeof(string) || base.CanConvertFrom(context, sourceType);
+	}
+
+	public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture,
+		object value) {
+		var valueAsString = value as string;
+		if (valueAsString != null) {
+			var address = valueAsString.Substring(0, valueAsString.LastIndexOf(':'));
+			var port = valueAsString.Substring(valueAsString.LastIndexOf(':') + 1);
+
+			return new IPEndPoint(IPAddress.Parse(address), Int32.Parse(port));
+		}
+
+		return base.ConvertFrom(context, culture, value);
+	}
+}
diff --git a/src/KurrentDB.Common/Utils/IPFinder.cs b/src/KurrentDB.Common/Utils/IPFinder.cs
new file mode 100644
index 00000000000..9d70135b735
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/IPFinder.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net;
+using System.Net.NetworkInformation;
+using System.Net.Sockets;
+
+namespace KurrentDB.Common.Utils;
+
+public static class IPFinder {
+	public static IPAddress GetNonLoopbackAddress() {
+		foreach (var adapter in NetworkInterface.GetAllNetworkInterfaces()) {
+			foreach (UnicastIPAddressInformation address in adapter.GetIPProperties().UnicastAddresses) {
+				if (address.Address.AddressFamily == AddressFamily.InterNetwork) {
+					if (!IPAddress.IsLoopback(address.Address)) {
+						return address.Address;
+					}
+				}
+			}
+		}
+
+		return null;
+	}
+}
diff --git a/src/KurrentDB.Common/Utils/IPWithClusterDnsEndPoint.cs b/src/KurrentDB.Common/Utils/IPWithClusterDnsEndPoint.cs
new file mode 100644
index 00000000000..a8c43cbb2c8
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/IPWithClusterDnsEndPoint.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net;
+
+namespace KurrentDB.Common.Utils;
+
+public class IPWithClusterDnsEndPoint : IPEndPoint {
+	public string ClusterDnsName { get; }
+
+	public IPWithClusterDnsEndPoint(IPAddress address, string clusterDns, int port) : base(address, port) {
+		Ensure.NotNull(clusterDns, "clusterDns");
+		Ensure.NotNull(address, "address");
+		ClusterDnsName = clusterDns;
+	}
+
+	public override string ToString() => $"{base.ToString()}/{ClusterDnsName}";
+}
diff --git a/src/KurrentDB.Common/Utils/Json.cs b/src/KurrentDB.Common/Utils/Json.cs
new file mode 100644
index 00000000000..b33a0061cbb
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/Json.cs
@@ -0,0 +1,74 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text.Json;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Serialization;
+using Formatting = Newtonsoft.Json.Formatting;
+
+namespace KurrentDB.Common.Utils;
+
+public static class Json {
+	public static readonly JsonSerializerSettings JsonSettings = new JsonSerializerSettings {
+		ContractResolver = new CamelCasePropertyNamesContractResolver(),
+		DateFormatHandling = DateFormatHandling.IsoDateFormat,
+		NullValueHandling = NullValueHandling.Ignore,
+		DefaultValueHandling = DefaultValueHandling.Ignore,
+		MissingMemberHandling = MissingMemberHandling.Ignore,
+		TypeNameHandling = TypeNameHandling.None,
+		Converters = new JsonConverter[] { new StringEnumConverter() }
+	};
+
+	public static byte[] ToJsonBytes(this object source) {
+		string instring = JsonConvert.SerializeObject(source, Formatting.Indented, JsonSettings);
+		return Helper.UTF8NoBom.GetBytes(instring);
+	}
+
+	public static string ToJson(this object source) {
+		string instring = JsonConvert.SerializeObject(source, Formatting.Indented, JsonSettings);
+		return instring;
+	}
+
+	public static string ToCanonicalJson(this object source) {
+		string instring = JsonConvert.SerializeObject(source);
+		return instring;
+	}
+
+	public static T ParseJson<T>(this string json) {
+		var result = JsonConvert.DeserializeObject<T>(json, JsonSettings);
+		return result;
+	}
+
+	public static T ParseJson<T>(this byte[] json) {
+		var result = JsonConvert.DeserializeObject<T>(Helper.UTF8NoBom.GetString(json), JsonSettings);
+		return result;
+	}
+
+	public static T ParseJson<T>(this ReadOnlyMemory<byte> json) {
+		var result = JsonConvert.DeserializeObject<T>(Helper.UTF8NoBom.GetString(json.Span), JsonSettings);
+		return result;
+	}
+
+	private static JsonReaderOptions JsonReaderOptions = new() {
+		AllowTrailingCommas = true,
+		CommentHandling = JsonCommentHandling.Skip,
+		MaxDepth = 64, // default - just being explicit
+	};
+
+	public static bool IsValidUtf8Json(this ReadOnlyMemory<byte> value) {
+		// Don't bother letting an Exception getting thrown.
+		if (value.IsEmpty)
+			return false;
+
+		try {
+			var reader = new Utf8JsonReader(value.Span, JsonReaderOptions);
+			while (reader.Read())
+				reader.Skip();
+			return true;
+		} catch {
+			return false;
+		}
+	}
+}
diff --git a/src/KurrentDB.Common/Utils/Locations.cs b/src/KurrentDB.Common/Utils/Locations.cs
new file mode 100644
index 00000000000..269835bc9b5
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/Locations.cs
@@ -0,0 +1,122 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime;
+
+namespace KurrentDB.Common.Utils;
+
+public class Locations {
+	public static readonly string ApplicationDirectory;
+	public static readonly string WebContentDirectory;
+	public static readonly string ProjectionsDirectory;
+	public static readonly string PreludeDirectory;
+	public static readonly string PluginsDirectory;
+	public static readonly string DefaultContentDirectory;
+	public static readonly string DefaultConfigurationDirectory;
+	public static readonly string DefaultDataDirectory;
+	public static readonly string DefaultLogDirectory;
+	public static readonly string DefaultTestClientLogDirectory;
+	public static readonly string FallbackDefaultDataDirectory;
+	public static readonly string DefaultTrustedRootCertificateDirectory;
+	// Legacy EventStore directories
+	public static readonly string LegacyConfigurationDirectory;
+	public static readonly string LegacyDataDirectory;
+	public static readonly string LegacyLogDirectory;
+
+	static Locations() {
+		ApplicationDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ??
+							   Path.GetFullPath(".");
+
+		PluginsDirectory = Path.Combine(ApplicationDirectory, "plugins");
+		FallbackDefaultDataDirectory = Path.Combine(ApplicationDirectory, "data");
+
+		switch (RuntimeInformation.OsPlatform) {
+			case RuntimeOSPlatform.Linux:
+				DefaultContentDirectory = "/usr/share/kurrentdb";
+				DefaultConfigurationDirectory = "/etc/kurrentdb";
+				LegacyConfigurationDirectory = "/etc/eventstore";
+				DefaultDataDirectory = "/var/lib/kurrentdb";
+				LegacyDataDirectory = "/var/lib/eventstore";
+				DefaultLogDirectory = "/var/log/kurrentdb";
+				LegacyLogDirectory = "/var/log/eventstore";
+				DefaultTrustedRootCertificateDirectory = "/etc/ssl/certs";
+				DefaultTestClientLogDirectory = Path.Combine(ApplicationDirectory, "testclientlog");
+				if (!Directory.Exists(PluginsDirectory))
+					PluginsDirectory = Path.Combine(DefaultContentDirectory, "plugins");
+				break;
+			case RuntimeOSPlatform.OSX:
+				DefaultContentDirectory = "/usr/local/share/kurrentdb";
+				DefaultConfigurationDirectory = "/etc/kurrentdb";
+				LegacyConfigurationDirectory = "/etc/eventstore";
+				DefaultDataDirectory = "/var/lib/kurrentdb";
+				LegacyDataDirectory = "/var/lib/eventstore";
+				DefaultLogDirectory = "/var/log/kurrentdb";
+				LegacyLogDirectory = "/var/log/eventstore";
+				DefaultTestClientLogDirectory = Path.Combine(ApplicationDirectory, "testclientlog");
+				if (!Directory.Exists(PluginsDirectory))
+					PluginsDirectory = Path.Combine(DefaultContentDirectory, "plugins");
+				break;
+			default:
+				DefaultContentDirectory = ApplicationDirectory;
+				DefaultConfigurationDirectory = ApplicationDirectory;
+				LegacyConfigurationDirectory = ApplicationDirectory;
+				DefaultDataDirectory = Path.Combine(ApplicationDirectory, "data");
+				DefaultLogDirectory = Path.Combine(ApplicationDirectory, "logs");
+				DefaultTestClientLogDirectory = Path.Combine(ApplicationDirectory, "testclientlog");
+				break;
+		}
+
+		WebContentDirectory = GetPrecededLocation(
+			Path.Combine(ApplicationDirectory, "clusternode-web"),
+			Path.Combine(DefaultContentDirectory, "clusternode-web")
+		);
+		ProjectionsDirectory = GetPrecededLocation(
+			Path.Combine(ApplicationDirectory, "projections"),
+			Path.Combine(DefaultContentDirectory, "projections")
+		);
+		PreludeDirectory = GetPrecededLocation(
+			Path.Combine(ApplicationDirectory, "Prelude"),
+			Path.Combine(DefaultContentDirectory, "Prelude")
+		);
+	}
+
+	/// <summary>
+	/// Returns the preceded location by checking the existence of the directory.
+	/// The local directory should be the first priority as the first element followed by
+	/// the global default location as last element.
+	/// </summary>
+	/// <param name="locations">the locations ordered by prioity starting with the preceded location</param>
+	/// <returns>the preceded location</returns>
+	public static string GetPrecededLocation(params string[] locations) {
+		var precedenceList = locations.Distinct().ToList();
+		return precedenceList.FirstOrDefault(Directory.Exists) ??
+			   precedenceList.Last();
+	}
+
+	/// <summary>
+	/// Returns the directories that potentially contain any configuration files.
+	/// </summary>
+	/// <returns></returns>
+	public static string[] GetPotentialConfigurationDirectories() => new[] {
+		DefaultConfigurationDirectory,
+		LegacyConfigurationDirectory,
+		ApplicationDirectory,
+	}.Distinct().ToArray();
+
+	/// Tries to identify the name and path of the given config file.
+	/// Given a full path to a file it just splits the path into directory and file.
+	/// Given a only config file name, looks for that file in the potential directories.
+	public static bool TryLocateConfigFile(string configFilePath, out string directory, out string fileName) {
+		directory = Path.IsPathRooted(configFilePath)
+			? Path.GetDirectoryName(configFilePath)
+			: GetPotentialConfigurationDirectories().FirstOrDefault(d =>
+				File.Exists(Path.Combine(d, configFilePath)));
+
+		fileName = Path.GetFileName(configFilePath);
+
+		return directory is not null;
+	}
+}
diff --git a/src/KurrentDB.Common/Utils/NumberExtensions.cs b/src/KurrentDB.Common/Utils/NumberExtensions.cs
new file mode 100644
index 00000000000..11241218c44
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/NumberExtensions.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Common.Utils;
+
+public static class NumberExtensions {
+	public static long RoundDownToMultipleOf(this long x, int multiple) {
+		return (x / multiple) * multiple;
+	}
+
+	public static long RoundUpToMultipleOf(this long x, int multiple) {
+		var ret = x.RoundDownToMultipleOf(multiple);
+		if (ret != x) {
+			ret += multiple;
+		}
+		return ret;
+	}
+
+	public static int RoundDownToMultipleOf(this int x, int multiple) {
+		return (x / multiple) * multiple;
+	}
+
+	public static int RoundUpToMultipleOf(this int x, int multiple) {
+		var ret = x.RoundDownToMultipleOf(multiple);
+		if (ret != x) {
+			ret += multiple;
+		}
+		return ret;
+	}
+
+	public static long ScaleByWeight(this long x, int weight, int totalWeight) {
+		if (totalWeight <= 0)
+			throw new ArgumentOutOfRangeException(nameof(totalWeight));
+
+		if (weight < 0 || weight > totalWeight)
+			throw new ArgumentOutOfRangeException(nameof(weight));
+
+		return (long)((double)x * weight / totalWeight);
+	}
+
+	public static long ScaleByPercent(this long x, int percent) =>
+		ScaleByWeight(x, percent, 100);
+
+}
diff --git a/src/KurrentDB.Common/Utils/StringExtensions.cs b/src/KurrentDB.Common/Utils/StringExtensions.cs
new file mode 100644
index 00000000000..0546780a47d
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/StringExtensions.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace KurrentDB.Common.Utils;
+
+public static class StringExtensions {
+	public static bool IsEmptyString(this string s) {
+		return string.IsNullOrEmpty(s);
+	}
+
+	public static bool IsNotEmptyString(this string s) {
+		return !string.IsNullOrEmpty(s);
+	}
+
+	public static bool EqualsOrdinalIgnoreCase(this string a, string b) =>
+		string.Compare(a, b, StringComparison.OrdinalIgnoreCase) == 0;
+
+	public static bool EqualsOrdinalIgnoreCase(this IEnumerable<string> a, IEnumerable<string> b) =>
+		a.SequenceEqual(b, StringComparer.OrdinalIgnoreCase);
+}
diff --git a/src/KurrentDB.Common/Utils/VersionInfo.cs b/src/KurrentDB.Common/Utils/VersionInfo.cs
new file mode 100644
index 00000000000..051ea7111f5
--- /dev/null
+++ b/src/KurrentDB.Common/Utils/VersionInfo.cs
@@ -0,0 +1,71 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+
+namespace KurrentDB.Common.Utils;
+
+public static class VersionInfo {
+	public const string DefaultVersion = "default_version";
+	public const string OldVersion = "old_version";
+	public const string UnknownVersion = "unknown_version";
+
+	public static string BuildId { get; private set; } = "";
+	public static string Edition { get; private set; } = "";
+	public static string VersionPrefix { get; private set; } = "";
+	public static string VersionSuffix { get; private set; } = "";
+	public static string Version => string.IsNullOrWhiteSpace(VersionSuffix)
+		? VersionPrefix
+		: VersionPrefix + "-" + VersionSuffix;
+
+	public static string CommitSha { get; private set; } = ThisAssembly.Git.Commit;
+	public static string Timestamp { get; private set; } = ThisAssembly.Git.CommitDate;
+
+	public static string Text => $"KurrentDB version {Version} {Edition} ({BuildId}/{CommitSha})";
+
+	static VersionInfo() {
+		// the official release assemblies contain the version prefix (4 part number)
+		// but not the suffix (beta, rc1, rtm, etc) so that the same assembly can be promoted.
+		var versionPrefix = Assembly.GetEntryAssembly().GetName().Version.ToString();
+		if (versionPrefix.EndsWith(".0"))
+			versionPrefix = versionPrefix[..^2];
+		VersionPrefix = versionPrefix;
+
+		var versionFilePath = Path.Join(
+			Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory),
+			"version.properties");
+		var properties = LoadProperties(versionFilePath);
+
+		if (properties.TryGetValue("version_suffix", out var versionSuffix))
+			VersionSuffix = versionSuffix;
+
+		if (properties.TryGetValue("commit_sha", out var commitSha))
+			CommitSha = commitSha;
+
+		if (properties.TryGetValue("timestamp", out var timestamp))
+			Timestamp = timestamp;
+
+		if (properties.TryGetValue("build_id", out var buildId))
+			BuildId = buildId;
+
+		if (properties.TryGetValue("edition", out var edition))
+			Edition = edition;
+	}
+
+	private static Dictionary<string, string> LoadProperties(string file) {
+		using var reader = new StreamReader(file);
+
+		var properties = new Dictionary<string, string>();
+		string line;
+		while ((line = reader.ReadLine()) != null) {
+			var parts = line.Split('=', 2);
+			if (parts.Length == 2)
+				properties[parts[0]] = parts[1];
+		}
+
+		return properties;
+	}
+}
diff --git a/src/EventStore.Common/Utils/version.properties b/src/KurrentDB.Common/Utils/version.properties
similarity index 100%
rename from src/EventStore.Common/Utils/version.properties
rename to src/KurrentDB.Common/Utils/version.properties
diff --git a/src/EventStore.Common/app.ico b/src/KurrentDB.Common/app.ico
similarity index 100%
rename from src/EventStore.Common/app.ico
rename to src/KurrentDB.Common/app.ico
diff --git a/src/EventStore.ClusterNode/app2.ico b/src/KurrentDB.Common/app2.ico
similarity index 100%
rename from src/EventStore.ClusterNode/app2.ico
rename to src/KurrentDB.Common/app2.ico
diff --git a/src/KurrentDB.Core.Tests/AssertEx.cs b/src/KurrentDB.Core.Tests/AssertEx.cs
new file mode 100644
index 00000000000..e1d720812f2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/AssertEx.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests;
+
+public static class AssertEx {
+	public static T IsType<T>(object o) {
+		Assert.IsInstanceOf<T>(o);
+		return (T)o;
+	}
+
+	public static async Task<TException> ThrowsAsync<TException>(Func<Task> code)
+		where TException : Exception {
+		var expected = default(TException);
+		try {
+			await code();
+			Assert.Fail($"Expected exception of type: {typeof(TException)} but no exception was thrown");
+		} catch (TException ex) {
+			expected = ex;
+		} catch (Exception ex) {
+			Assert.Fail($"Expected exception of type: {typeof(TException)} but was {ex.GetType()} instead");
+		}
+
+		return expected;
+	}
+
+	public static async Task DoesNotThrowAsync<TException>(Func<Task> code, string message)
+		where TException : Exception {
+		try {
+			await code();
+		} catch (TException) {
+			Assert.Fail(message);
+		}
+	}
+
+	/// <summary>
+	/// Asserts the given function will return true before the timeout expires.
+	/// Repeatedly evaluates the function until true is returned or the timeout expires.
+	/// Will return immediately when the condition is true.
+	/// Evaluates the timeout until expired.
+	/// Will not yield the thread by default, if yielding is required to resolve deadlocks set yieldThread to true.
+	/// </summary>
+	/// <param name="func">The function to evaluate.</param>
+	/// <param name="timeout">A timeout in milliseconds. If not specified, defaults to 1000.</param>
+	/// <param name="msg">A message to display if the condition is not satisfied.</param>
+	/// <param name="onFail">Action to invoke on failure.</param>
+	public static void IsOrBecomesTrue(Func<bool> func, TimeSpan? timeout = null,
+		string msg = "AssertEx.IsOrBecomesTrue() timed out", Action onFail = null,
+		[CallerMemberName] string memberName = "",
+		[CallerFilePath] string sourceFilePath = "",
+		[CallerLineNumber] int sourceLineNumber = 0) {
+
+		if (SpinWait.SpinUntil(func, timeout ?? TimeSpan.FromMilliseconds(1000)))
+			return;
+
+		onFail?.Invoke();
+
+		Assert.Fail($"{msg} in {memberName} {sourceFilePath}:{sourceLineNumber}");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Authentication/PassthroughHttpAuthenticationProviderTests.cs b/src/KurrentDB.Core.Tests/Authentication/PassthroughHttpAuthenticationProviderTests.cs
new file mode 100644
index 00000000000..c3636886930
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Authentication/PassthroughHttpAuthenticationProviderTests.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using EventStore.Plugins.Authentication;
+using KurrentDB.Core.Authentication.DelegatedAuthentication;
+using KurrentDB.Core.Authentication.PassthroughAuthentication;
+using KurrentDB.Core.Services.Transport.Http.Authentication;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Authentication;
+
+[TestFixture]
+public class PassthroughHttpAuthenticationProviderTests {
+	[Test]
+	public void WrongProviderThrows() =>
+		Assert.Throws<ArgumentException>(() => new PassthroughHttpAuthenticationProvider(new TestAuthenticationProvider()));
+
+	[TestCaseSource(nameof(TestCases))]
+	public void CorrectProviderDoesNotThrow(IAuthenticationProvider provider) =>
+		Assert.DoesNotThrow(() => new PassthroughHttpAuthenticationProvider(provider));
+
+	public static IEnumerable<object[]> TestCases() {
+		yield return [new DelegatedAuthenticationProvider(new PassthroughAuthenticationProvider())];
+		yield return [new PassthroughAuthenticationProvider()];
+	}
+
+	class TestAuthenticationProvider : AuthenticationProviderBase {
+		public override void Authenticate(AuthenticationRequest authenticationRequest) =>
+			throw new NotImplementedException();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Authentication/StubPasswordHashAlgorithm.cs b/src/KurrentDB.Core.Tests/Authentication/StubPasswordHashAlgorithm.cs
new file mode 100644
index 00000000000..82aaa2c0b58
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Authentication/StubPasswordHashAlgorithm.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Authentication.InternalAuthentication;
+
+namespace KurrentDB.Core.Tests.Authentication;
+
+public class StubPasswordHashAlgorithm : PasswordHashAlgorithm {
+	public override void Hash(string password, out string hash, out string salt) {
+		hash = password;
+		salt = ReverseString(password);
+	}
+
+	public override bool Verify(string password, string hash, string salt) {
+		return password == hash && ReverseString(password) == salt;
+	}
+
+	private static string ReverseString(string s) {
+		return new String(s.Reverse().ToArray());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Authentication/when_handling_multiple_requests_with_reset_password_cache_in_between.cs b/src/KurrentDB.Core.Tests/Authentication/when_handling_multiple_requests_with_reset_password_cache_in_between.cs
new file mode 100644
index 00000000000..ec3fb0b56f6
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Authentication/when_handling_multiple_requests_with_reset_password_cache_in_between.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Security.Claims;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Authentication;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_multiple_requests_with_reset_password_cache_in_between<TLogFormat, TStreamId> : with_internal_authentication_provider<TLogFormat, TStreamId> {
+	private bool _unauthorized;
+	private ClaimsPrincipal _authenticatedAs;
+	private bool _error;
+
+	protected override void Given() {
+		base.Given();
+		ExistingEvent("$user-user", "$user", null, "{LoginName:'user', Salt:'drowssap',Hash:'password'}");
+	}
+
+	[SetUp]
+	public void SetUp() {
+		SetUpProvider();
+
+		_internalAuthenticationProvider.Authenticate(
+			new TestAuthenticationRequest(
+				name: "user",
+				suppliedPassword: "password",
+				unauthorized: () => { },
+				authenticated: _ => { },
+				error: () => { },
+				notReady: () => { }
+			)
+		);
+
+		_internalAuthenticationProvider.Handle(new("user"));
+
+		_consumer.HandledMessages.Clear();
+
+		_internalAuthenticationProvider.Authenticate(
+			new TestAuthenticationRequest(
+				name: "user",
+				suppliedPassword: "password",
+				unauthorized: () => _unauthorized = true,
+				authenticated: principal => _authenticatedAs = principal,
+				error: () => _error = true,
+				notReady: () => { }
+			)
+		);
+	}
+
+	[Test]
+	public void authenticates_user() {
+		Assert.IsFalse(_unauthorized);
+		Assert.IsFalse(_error);
+		Assert.NotNull(_authenticatedAs);
+		Assert.IsTrue(_authenticatedAs.Identity!.Name == "user");
+	}
+
+	[Test]
+	public void publishes_some_read_requests() {
+		Assert.Greater(
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsBackward>().Count()
+			+ _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count(), 0);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Authentication/when_handling_multiple_requests_with_the_same_correct_user_name_and_password.cs b/src/KurrentDB.Core.Tests/Authentication/when_handling_multiple_requests_with_the_same_correct_user_name_and_password.cs
new file mode 100644
index 00000000000..0967f95e756
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Authentication/when_handling_multiple_requests_with_the_same_correct_user_name_and_password.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Security.Claims;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Authentication;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_multiple_requests_with_the_same_correct_user_name_and_password<TLogFormat, TStreamId> :
+	with_internal_authentication_provider<TLogFormat, TStreamId> {
+	private bool _unauthorized;
+	private ClaimsPrincipal _authenticatedAs;
+	private bool _error;
+
+	protected override void Given() {
+		base.Given();
+		ExistingEvent("$user-user", "$user", null, "{LoginName:'user', Salt:'drowssap',Hash:'password'}");
+	}
+
+	[SetUp]
+	public void SetUp() {
+		SetUpProvider();
+
+		_internalAuthenticationProvider.Authenticate(
+			new TestAuthenticationRequest("user", "password", () => { }, p => { }, () => { }, () => { }));
+
+		_consumer.HandledMessages.Clear();
+
+		_internalAuthenticationProvider.Authenticate(
+			new TestAuthenticationRequest(
+				"user", "password", () => _unauthorized = true, p => _authenticatedAs = p, () => _error = true,
+				() => { }));
+	}
+
+	[Test]
+	public void authenticates_user() {
+		Assert.IsFalse(_unauthorized);
+		Assert.IsFalse(_error);
+		Assert.NotNull(_authenticatedAs);
+		Assert.IsTrue(_authenticatedAs.Identity.Name == "user");
+	}
+
+	[Test]
+	public void does_not_publish_any_read_requests() {
+		Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsBackward>().Count());
+		Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Authentication/with_internal_authentication_provider.cs b/src/KurrentDB.Core.Tests/Authentication/with_internal_authentication_provider.cs
new file mode 100644
index 00000000000..0c5fbe00243
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Authentication/with_internal_authentication_provider.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using EventStore.Plugins.Authentication;
+using KurrentDB.Core.Authentication.InternalAuthentication;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Helpers;
+using IODispatcherDelayedMessage = KurrentDB.Core.Helpers.IODispatcherDelayedMessage;
+
+namespace KurrentDB.Core.Tests.Authentication;
+
+public abstract class with_internal_authentication_provider<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	protected new IODispatcher _ioDispatcher;
+	protected InternalAuthenticationProvider _internalAuthenticationProvider;
+
+	protected void SetUpProvider() {
+		_ioDispatcher = new IODispatcher(_bus, _bus);
+		_bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_ioDispatcher.BackwardReader);
+		_bus.Subscribe<ClientMessage.NotHandled>(_ioDispatcher.BackwardReader);
+		_bus.Subscribe(_ioDispatcher.ForwardReader);
+		_bus.Subscribe(_ioDispatcher.Writer);
+		_bus.Subscribe(_ioDispatcher.StreamDeleter);
+		_bus.Subscribe(_ioDispatcher.Awaker);
+		_bus.Subscribe<IODispatcherDelayedMessage>(_ioDispatcher);
+		_bus.Subscribe<ClientMessage.NotHandled>(_ioDispatcher);
+
+		_internalAuthenticationProvider = new(_bus, _ioDispatcher, new StubPasswordHashAlgorithm(), 1000, false, DefaultData.DefaultUserOptions);
+		_bus.Subscribe(_internalAuthenticationProvider);
+	}
+}
+
+class TestAuthenticationRequest(
+	string name,
+	string suppliedPassword,
+	Action unauthorized,
+	Action<ClaimsPrincipal> authenticated,
+	Action error,
+	Action notReady
+) : AuthenticationRequest("test", new Dictionary<string, string> {
+	["uid"] = name,
+	["pwd"] = suppliedPassword
+}) {
+	public override void Unauthorized() => unauthorized();
+
+	public override void Authenticated(ClaimsPrincipal principal) => authenticated(principal);
+
+	public override void Error() => error();
+
+	public override void NotReady() => notReady();
+}
diff --git a/src/KurrentDB.Core.Tests/Authorization/LegacyPolicyVerification.cs b/src/KurrentDB.Core.Tests/Authorization/LegacyPolicyVerification.cs
new file mode 100644
index 00000000000..e0acbc50228
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Authorization/LegacyPolicyVerification.cs
@@ -0,0 +1,539 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Core.Authorization;
+using KurrentDB.Core.Authorization.AuthorizationPolicies;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.UserManagement;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Authorization;
+
+[TestFixture(true, true, true)]
+[TestFixture(true, true, false)]
+[TestFixture(true, false, true)]
+[TestFixture(true, false, false)]
+[TestFixture(false, true, true)]
+[TestFixture(false, true, false)]
+[TestFixture(false, false, true)]
+[TestFixture(false, false, false)]
+public class LegacyPolicyVerification {
+	private const string _streamWithDefaultPermissions = "StreamWithDefaultPermissions";
+	private const string _streamWithCustomPermissions = "StreamWithCustomPermissions";
+
+	private readonly IAuthorizationProvider _authorizationProvider;
+	private readonly AclResponder _aclResponder;
+	private static bool _allowAnonymousEndpointAccess;
+	private static bool _allowAnonymousStreamAccess;
+	private static bool _overrideAnonymousGossipEndpointAccess;
+
+	public LegacyPolicyVerification(bool allowAnonymousEndpointAccess, bool allowAnonymousStreamAccess, bool overrideAnonymousGossipEndpointAccess) {
+		_aclResponder = new AclResponder();
+		_allowAnonymousEndpointAccess = allowAnonymousEndpointAccess;
+		_allowAnonymousStreamAccess = allowAnonymousStreamAccess;
+		_overrideAnonymousGossipEndpointAccess = overrideAnonymousGossipEndpointAccess;
+		_authorizationProvider = new InternalAuthorizationProviderFactory(
+			new StaticAuthorizationPolicyRegistry([new LegacyPolicySelectorFactory(
+				allowAnonymousEndpointAccess,
+				allowAnonymousStreamAccess,
+				overrideAnonymousGossipEndpointAccess).Create(_aclResponder)]))
+		.Build();
+	}
+
+	public abstract class PolicyVerificationParameters {
+		public ClaimsPrincipal User { get; }
+		public Operation Operation { get; }
+		public string Stream { get; }
+		public StorageMessage.EffectiveAcl StreamAcl { get; }
+		public abstract string TestName { get; }
+
+		public PolicyVerificationParameters(ClaimsPrincipal user, Operation operation, string stream, StorageMessage.EffectiveAcl streamAcl) {
+			User = user;
+			Operation = operation;
+			Stream = stream;
+			StreamAcl = streamAcl;
+		}
+
+		public override string ToString() => TestName;
+	}
+
+	public class StaticPolicyVerificationParameters : PolicyVerificationParameters {
+		public bool IsAuthorized { get; }
+		public bool ShouldRequestAcl { get; }
+		public override string TestName => $"{User.Identity?.Name ?? "Anonymous (empty)"} {(IsAuthorized ? "is" : "is not")} authorized to perform operation {Operation}";
+
+		public StaticPolicyVerificationParameters(ClaimsPrincipal user, Operation operation, string stream, StorageMessage.EffectiveAcl streamAcl, bool isAuthorized, bool shouldRequestAcl) :
+		base(user, operation, stream, streamAcl) {
+			IsAuthorized = isAuthorized;
+			ShouldRequestAcl = shouldRequestAcl;
+		}
+	}
+
+	public class ConfigurablePolicyVerificationParameters : PolicyVerificationParameters {
+		public Func<bool, bool, bool> AuthorizationCheck { get; }
+		public Func<bool, bool> AclCheck { get; }
+		public override string TestName => $"Verify if Anonymous user is authorized to perform operation {Operation}";
+
+		public ConfigurablePolicyVerificationParameters(ClaimsPrincipal user, Operation operation, string stream, StorageMessage.EffectiveAcl streamAcl, Func<bool, bool, bool> authorizationCheck, Func<bool, bool> aclCheck)
+		: base(user, operation, stream, streamAcl) {
+			AuthorizationCheck = authorizationCheck;
+			AclCheck = aclCheck;
+		}
+	}
+
+	public class GossipPolicyVerificationParameters : PolicyVerificationParameters {
+		public Func<bool, bool, bool> AuthorizationCheck { get; }
+
+		public override string TestName =>
+			$"Verify if Anonymous user is authorized to perform gossip operation {Operation}";
+
+		public GossipPolicyVerificationParameters(ClaimsPrincipal user, Operation operation, string stream,
+			StorageMessage.EffectiveAcl streamAcl, Func<bool, bool, bool> authorizationCheck)
+			: base(user, operation, stream, streamAcl) {
+			AuthorizationCheck = authorizationCheck;
+		}
+	}
+
+	public static IEnumerable<PolicyVerificationParameters> PolicyTests() {
+		StorageMessage.EffectiveAcl systemStreamPermission = new StorageMessage.EffectiveAcl(
+			SystemSettings.Default.SystemStreamAcl,
+			SystemSettings.Default.SystemStreamAcl,
+			SystemSettings.Default.SystemStreamAcl
+		);
+
+		StorageMessage.EffectiveAcl defaultUseruserStreamPermission = new StorageMessage.EffectiveAcl(
+			SystemSettings.Default.UserStreamAcl,
+			SystemSettings.Default.UserStreamAcl,
+			SystemSettings.Default.UserStreamAcl
+		);
+
+		StorageMessage.EffectiveAcl userStreamPermission = new StorageMessage.EffectiveAcl(
+			new StreamAcl("test", "test", "test", "test", "test"),
+			SystemSettings.Default.UserStreamAcl,
+			SystemSettings.Default.UserStreamAcl
+		);
+
+		ClaimsPrincipal admin = CreatePrincipal("admin", SystemRoles.Admins);
+		ClaimsPrincipal userAdmin = CreatePrincipal("adminuser", SystemRoles.Admins);
+		ClaimsPrincipal ops = CreatePrincipal("ops", SystemRoles.Operations);
+		ClaimsPrincipal userOps = CreatePrincipal("opsuser", SystemRoles.Operations);
+		ClaimsPrincipal user1 = CreatePrincipal("test");
+		ClaimsPrincipal user2 = CreatePrincipal("test2");
+		ClaimsPrincipal userSystem = SystemAccounts.System;
+
+		var admins = new[] { admin, userAdmin };
+		var operations = new[] { ops, userOps };
+		var users = new[] { user1, user2 };
+		var system = new[] { userSystem };
+		var anonymous = new[] { new ClaimsPrincipal(), new ClaimsPrincipal(new ClaimsIdentity(new Claim[] { new Claim(ClaimTypes.Anonymous, ""), })), };
+		foreach (var user in system) {
+			foreach (var operation in SystemOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					true,
+					false
+				);
+			}
+		}
+		foreach (var user in admins) {
+			foreach (var operation in SystemOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					false,
+					false
+				);
+			}
+			foreach (var operation in AdminOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					true,
+					false
+				);
+			}
+			foreach (var operation in OpsOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					true,
+					false
+				);
+			}
+
+			foreach (var operation in UserOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					true,
+					false
+				);
+			}
+
+			foreach (var operation in AuthenticatedOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					true,
+					false
+				);
+			}
+
+			foreach (var operation in AnonymousOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					true,
+					false
+				);
+			}
+		}
+
+		foreach (var user in operations) {
+			foreach (var operation in SystemOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					false,
+					false
+				);
+			}
+			foreach (var operation in AdminOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					false,
+					operation.Item3 != null
+				);
+			}
+			foreach (var operation in OpsOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					true,
+					false
+				);
+			}
+
+			foreach (var operation in UserOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					operation.Item2 == null || operation.Item3 == defaultUseruserStreamPermission,
+					operation.Item2 != null
+				);
+			}
+
+			foreach (var operation in AuthenticatedOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					true,
+					operation.Item2 != null
+				);
+			}
+
+			foreach (var operation in AnonymousOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					true,
+					operation.Item2 != null
+				);
+			}
+		}
+
+		foreach (var user in users) {
+			foreach (var operation in SystemOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					false,
+					false
+				);
+			}
+			foreach (var operation in AdminOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					false,
+					operation.Item3 != null
+				);
+			}
+			foreach (var operation in OpsOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					false,
+					false
+				);
+			}
+
+			foreach (var operation in UserOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					operation.Item2 == null || user.Identity.Name != "test2" || operation.Item3 == defaultUseruserStreamPermission,
+					operation.Item3 != null
+				);
+			}
+
+			foreach (var operation in AuthenticatedOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					true,
+					operation.Item3 != null
+				);
+			}
+			foreach (var operation in AnonymousOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					true,
+					operation.Item3 != null
+				);
+			}
+		}
+
+		foreach (var user in anonymous) {
+			foreach (var operation in SystemOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					false,
+					false
+				);
+			}
+			foreach (var operation in AdminOperations()) {
+				yield return new ConfigurablePolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					(_, _) => false,
+					(allowAnonymousStreamAccess) => allowAnonymousStreamAccess
+				);
+			}
+			foreach (var operation in OpsOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					false,
+					operation.Item3 != null
+				);
+			}
+
+			foreach (var operation in UserOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					false,
+					false
+				);
+			}
+
+			foreach (var operation in AuthenticatedOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					false,
+					false
+				);
+			}
+			foreach (var operation in AnonymousOperations()) {
+				yield return new StaticPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					true,
+					operation.Item3 != null
+				);
+			}
+			foreach (var operation in AllowAnonymousEndpointAccessOperations()) {
+				yield return new ConfigurablePolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					(allowAnonymousEndpointAccess, _) => allowAnonymousEndpointAccess,
+					(_) => operation.Item3 != null
+				);
+			}
+			foreach (var operation in AllowAnonymousStreamAccessOperations()) {
+				yield return new ConfigurablePolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					(_, allowAnonymousStreamAccess) => allowAnonymousStreamAccess,
+					(allowAnonymousStreamAccess) => allowAnonymousStreamAccess
+				);
+			}
+
+			foreach (var operation in ClientGossipOperations()) {
+				yield return new GossipPolicyVerificationParameters(user,
+					operation.Item1, operation.Item2, operation.Item3,
+					(allowAnonymousGossipAccess, overrideAnonymousGossipAccess) =>
+						overrideAnonymousGossipAccess || allowAnonymousGossipAccess
+				);
+			}
+		}
+
+		IEnumerable<(Operation, string, StorageMessage.EffectiveAcl)> SystemOperations() {
+			yield return CreateOperation(Operations.Node.Gossip.Update);
+
+			yield return CreateOperation(Operations.Node.Elections.Prepare);
+			yield return CreateOperation(Operations.Node.Elections.PrepareOk);
+			yield return CreateOperation(Operations.Node.Elections.ViewChange);
+			yield return CreateOperation(Operations.Node.Elections.ViewChangeProof);
+			yield return CreateOperation(Operations.Node.Elections.Proposal);
+			yield return CreateOperation(Operations.Node.Elections.Accept);
+			yield return CreateOperation(Operations.Node.Elections.LeaderIsResigning);
+			yield return CreateOperation(Operations.Node.Elections.LeaderIsResigningOk);
+			yield return CreateOperation(Operations.Node.Gossip.Read);
+		}
+
+		IEnumerable<(Operation, string, StorageMessage.EffectiveAcl)> AdminOperations() {
+			yield return (new Operation(Operations.Streams.Read).WithParameter(
+					Operations.Streams.Parameters.StreamId("$$$scavenge")),
+				"$$$scavenge",
+				systemStreamPermission);
+		}
+
+		IEnumerable<(Operation, string, StorageMessage.EffectiveAcl)> OpsOperations() {
+			yield return CreateOperation(Operations.Node.Information.Subsystems);
+
+			yield return CreateOperation(Operations.Node.Shutdown);
+			yield return CreateOperation(Operations.Node.ReloadConfiguration);
+			yield return CreateOperation(Operations.Node.Scavenge.Start);
+			yield return CreateOperation(Operations.Node.Scavenge.Stop);
+			yield return CreateOperation(Operations.Node.Scavenge.Read);
+			yield return CreateOperation(Operations.Node.MergeIndexes);
+			yield return CreateOperation(Operations.Node.SetPriority);
+			yield return CreateOperation(Operations.Node.Resign);
+
+			yield return CreateOperation(Operations.Subscriptions.Create);
+			yield return CreateOperation(Operations.Subscriptions.Update);
+			yield return CreateOperation(Operations.Subscriptions.Delete);
+			yield return CreateOperation(Operations.Subscriptions.Restart);
+
+			yield return CreateOperation(Operations.Node.Information.Histogram);
+			yield return CreateOperation(Operations.Node.Information.Options);
+			yield return (new Operation(Operations.Subscriptions.ReplayParked).WithParameter(Operations.Subscriptions.Parameters.StreamId(_streamWithCustomPermissions)), _streamWithCustomPermissions, null);
+			yield return (new Operation(Operations.Subscriptions.ReplayParked).WithParameter(Operations.Subscriptions.Parameters.StreamId(_streamWithDefaultPermissions)), _streamWithDefaultPermissions, null);
+
+			yield return CreateOperation(Operations.Projections.UpdateConfiguration);
+
+			yield return CreateOperation(Operations.Projections.ReadConfiguration);
+			yield return CreateOperation(Operations.Projections.Delete);
+			yield return CreateOperation(Operations.Projections.Restart);
+		}
+
+		IEnumerable<(Operation, string, StorageMessage.EffectiveAcl)> UserOperations() {
+
+			yield return (new Operation(Operations.Subscriptions.ProcessMessages).WithParameter(Operations.Subscriptions.Parameters.StreamId(_streamWithCustomPermissions)), _streamWithCustomPermissions, userStreamPermission);
+			yield return (new Operation(Operations.Subscriptions.ProcessMessages).WithParameter(Operations.Subscriptions.Parameters.StreamId(_streamWithDefaultPermissions)), _streamWithDefaultPermissions, defaultUseruserStreamPermission);
+			yield return CreateOperation(Operations.Projections.List);
+			yield return CreateOperation(Operations.Projections.Abort);
+			yield return CreateOperation(Operations.Projections.Create);
+			yield return CreateOperation(Operations.Projections.DebugProjection);
+			yield return CreateOperation(Operations.Projections.Disable);
+			yield return CreateOperation(Operations.Projections.Enable);
+			yield return CreateOperation(Operations.Projections.Read);
+			yield return CreateOperation(Operations.Projections.Reset);
+			yield return CreateOperation(Operations.Projections.Update);
+			yield return CreateOperation(Operations.Projections.State);
+			yield return CreateOperation(Operations.Projections.Status);
+			yield return CreateOperation(Operations.Projections.Statistics);
+		}
+
+		IEnumerable<(Operation, string, StorageMessage.EffectiveAcl)> AuthenticatedOperations() {
+			yield return CreateOperation(Operations.Subscriptions.Statistics);
+			yield return CreateOperation(Operations.Projections.List);
+		}
+
+		IEnumerable<(Operation, string, StorageMessage.EffectiveAcl)> AnonymousOperations() {
+			yield return CreateOperation(Operations.Node.Redirect);
+			yield return CreateOperation(Operations.Node.StaticContent);
+			yield return CreateOperation(Operations.Node.Ping);
+			yield return CreateOperation(Operations.Node.Information.Read);
+		}
+
+		IEnumerable<(Operation, string, StorageMessage.EffectiveAcl)> ClientGossipOperations() {
+			yield return CreateOperation(Operations.Node.Gossip.ClientRead);
+		}
+
+		IEnumerable<(Operation, string, StorageMessage.EffectiveAcl)> AllowAnonymousEndpointAccessOperations() {
+			yield return CreateOperation(Operations.Node.Options);
+			yield return CreateOperation(Operations.Node.Statistics.Read);
+			yield return CreateOperation(Operations.Node.Statistics.Replication);
+			yield return CreateOperation(Operations.Node.Statistics.Tcp);
+			yield return CreateOperation(Operations.Node.Statistics.Custom);
+		}
+
+		IEnumerable<(Operation, string, StorageMessage.EffectiveAcl)> AllowAnonymousStreamAccessOperations() {
+			yield return (new Operation(Operations.Streams.Read).WithParameter(
+					Operations.Streams.Parameters.StreamId(_streamWithDefaultPermissions)),
+				_streamWithDefaultPermissions, defaultUseruserStreamPermission);
+			yield return (new Operation(Operations.Streams.Write).WithParameter(
+					Operations.Streams.Parameters.StreamId(_streamWithDefaultPermissions)),
+				_streamWithDefaultPermissions, defaultUseruserStreamPermission);
+			yield return (new Operation(Operations.Streams.Delete).WithParameter(
+					Operations.Streams.Parameters.StreamId(_streamWithDefaultPermissions)),
+				_streamWithDefaultPermissions, defaultUseruserStreamPermission);
+			yield return (new Operation(Operations.Streams.MetadataRead).WithParameter(
+					Operations.Streams.Parameters.StreamId(_streamWithDefaultPermissions)),
+				_streamWithDefaultPermissions, defaultUseruserStreamPermission);
+			yield return (new Operation(Operations.Streams.MetadataWrite).WithParameter(
+					Operations.Streams.Parameters.StreamId(_streamWithDefaultPermissions)),
+				_streamWithDefaultPermissions, defaultUseruserStreamPermission);
+		}
+
+		(Operation, string, StorageMessage.EffectiveAcl) CreateOperation(OperationDefinition def) {
+			return (new Operation(def), null, null);
+		}
+
+		ClaimsPrincipal CreatePrincipal(string name, params string[] roles) {
+			var claims =
+				(new[] { new Claim(ClaimTypes.Name, name) }).Concat(roles.Select(x => new Claim(ClaimTypes.Role, x)));
+			return new ClaimsPrincipal(new ClaimsIdentity(claims));
+		}
+	}
+
+	[Test]
+	public async Task VerifyPolicy([ValueSource(nameof(PolicyTests))] PolicyVerificationParameters pvp) {
+		_aclResponder.ExpectedAcl(pvp.Stream, pvp.StreamAcl);
+		var result =
+				await _authorizationProvider.CheckAccessAsync(pvp.User, pvp.Operation, CancellationToken.None);
+		switch (pvp) {
+			case StaticPolicyVerificationParameters staticPvp:
+				Assert.AreEqual(staticPvp.IsAuthorized, result,
+					staticPvp.IsAuthorized ? "was not authorized" : "was authorized");
+				Assert.AreEqual(staticPvp.ShouldRequestAcl, _aclResponder.MessageReceived,
+					staticPvp.ShouldRequestAcl ? "did not request acl" : "requested acl");
+				break;
+			case ConfigurablePolicyVerificationParameters confPvp:
+				Assert.AreEqual(confPvp.AuthorizationCheck(_allowAnonymousEndpointAccess, _allowAnonymousStreamAccess), result,
+					confPvp.AuthorizationCheck(_allowAnonymousEndpointAccess, _allowAnonymousStreamAccess)
+						? "was not authorized"
+						: "was authorized");
+				Assert.AreEqual(confPvp.AclCheck(_allowAnonymousStreamAccess), _aclResponder.MessageReceived,
+					confPvp.AclCheck(_allowAnonymousStreamAccess) ? "did not request acl" : "requested acl");
+				break;
+			case GossipPolicyVerificationParameters gossipPvp:
+				Assert.AreEqual(
+					gossipPvp.AuthorizationCheck(_allowAnonymousEndpointAccess,
+						_overrideAnonymousGossipEndpointAccess), result,
+					gossipPvp.AuthorizationCheck(_allowAnonymousEndpointAccess,
+						_overrideAnonymousGossipEndpointAccess)
+						? "was not authorized"
+						: "was authorized");
+				break;
+		}
+	}
+
+	class AclResponder : IPublisher {
+		public bool MessageReceived { get; private set; }
+		private StorageMessage.EffectiveAcl _acl;
+		private string _expectedStream;
+
+		public AclResponder() {
+			MessageReceived = false;
+		}
+		public void Publish(Message message) {
+			MessageReceived = true;
+			Assert.IsInstanceOf<StorageMessage.EffectiveStreamAclRequest>(message);
+			var request = (StorageMessage.EffectiveStreamAclRequest)message;
+			Assert.AreEqual(_expectedStream, request.StreamId);
+			Assert.NotNull(request.Envelope);
+			request.Envelope.ReplyWith(new StorageMessage.EffectiveStreamAclResponse(_acl));
+		}
+
+		public void ExpectedAcl(string stream, StorageMessage.EffectiveAcl acl) {
+			MessageReceived = false;
+			if (stream == null)
+				return;
+			_expectedStream = SystemStreams.IsMetastream(stream) ? SystemStreams.OriginalStreamOf(stream) : stream;
+			_acl = acl;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Authorization/MultiClaimMatchTests.cs b/src/KurrentDB.Core.Tests/Authorization/MultiClaimMatchTests.cs
new file mode 100644
index 00000000000..ac777ee0597
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Authorization/MultiClaimMatchTests.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Core.Authorization;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Authorization;
+
+[TestFixture]
+public class MultiClaimMatchTests {
+	[Test]
+	public async Task NoneMatchingHasMatches() {
+		var assertion = new MultipleClaimMatchAssertion(Grant.Deny, MultipleMatchMode.None,
+			new Claim("test1", "value1"), new Claim("test2", "value2"));
+		var cp = new ClaimsPrincipal(new ClaimsIdentity(new Claim[] { new Claim("test1", "value1") }));
+		var context = new EvaluationContext(new Operation("test", "test"), CancellationToken.None);
+		Assert.False(await assertion.Evaluate(cp, new Operation("test", "test"),
+			new PolicyInformation("test", 1, DateTimeOffset.MaxValue), context));
+		Assert.AreEqual(Grant.Unknown, context.Grant);
+	}
+
+	[Test]
+	public async Task NonMatchingHasNoMatches() {
+		var assertion = new MultipleClaimMatchAssertion(Grant.Deny, MultipleMatchMode.None,
+			new Claim("test1", "value1"), new Claim("test2", "value2"));
+		var cp = new ClaimsPrincipal(new ClaimsIdentity(new Claim[] { new Claim("test3", "value3") }));
+		var context = new EvaluationContext(new Operation("test", "test"), CancellationToken.None);
+		Assert.True(await assertion.Evaluate(cp, new Operation("test", "test"),
+			new PolicyInformation("test", 1, DateTimeOffset.MaxValue), context));
+		Assert.AreEqual(Grant.Deny, context.Grant);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Authorization/TestAuthorizationProvider.cs b/src/KurrentDB.Core.Tests/Authorization/TestAuthorizationProvider.cs
new file mode 100644
index 00000000000..44b56b85c57
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Authorization/TestAuthorizationProvider.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Core.Tests.Authorization;
+
+class TestAuthorizationProvider : Plugin, IAuthorizationProvider {
+	public ValueTask<bool> CheckAccessAsync(ClaimsPrincipal principal, Operation operation, CancellationToken cancellationToken) =>
+		ValueTask.FromResult(true);
+}
diff --git a/src/KurrentDB.Core.Tests/AwakeService/TestMessage.cs b/src/KurrentDB.Core.Tests/AwakeService/TestMessage.cs
new file mode 100644
index 00000000000..e4e3263d53b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/AwakeService/TestMessage.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Tests.AwakeService;
+
+public class TestMessage : Message {
+	public readonly int Kind;
+
+	public TestMessage(int kind) {
+		Kind = kind;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/AwakeService/when_creating.cs b/src/KurrentDB.Core.Tests/AwakeService/when_creating.cs
new file mode 100644
index 00000000000..6bc2c205c7f
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/AwakeService/when_creating.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.AwakeService;
+
+[TestFixture]
+public class when_creating {
+	[Test]
+	public void it_can_ce_created() {
+		var it = new KurrentDB.Core.Services.AwakeReaderService.AwakeService();
+		Assert.NotNull(it);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/AwakeService/when_handling_comitted_event.cs b/src/KurrentDB.Core.Tests/AwakeService/when_handling_comitted_event.cs
new file mode 100644
index 00000000000..c7e97e89021
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/AwakeService/when_handling_comitted_event.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.AwakeService;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_comitted_event<TLogFormat, TStreamId> {
+	private KurrentDB.Core.Services.AwakeReaderService.AwakeService _it;
+	private EventRecord _eventRecord;
+	private StorageMessage.EventCommitted _eventCommitted;
+	private Exception _exception;
+
+	[SetUp]
+	public void SetUp() {
+		_exception = null;
+		Given();
+		When();
+	}
+
+	private void Given() {
+		_it = new KurrentDB.Core.Services.AwakeReaderService.AwakeService();
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		_eventRecord = new EventRecord(
+			10,
+			LogRecord.Prepare(
+				recordFactory, 500, Guid.NewGuid(), Guid.NewGuid(), 500, 0, streamId, 99, PrepareFlags.Data,
+				eventTypeId, new byte[0], null, DateTime.UtcNow), "Stream", "EventType");
+		_eventCommitted = new StorageMessage.EventCommitted(1000, _eventRecord, isTfEof: true);
+	}
+
+	private void When() {
+		try {
+			_it.Handle(_eventCommitted);
+		} catch (Exception ex) {
+			_exception = ex;
+		}
+	}
+
+	[Test]
+	public void it_is_handled() {
+		Assert.IsNull(_exception, (_exception ?? (object)"").ToString());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/AwakeService/when_handling_committed_event_after_unsybscribe.cs b/src/KurrentDB.Core.Tests/AwakeService/when_handling_committed_event_after_unsybscribe.cs
new file mode 100644
index 00000000000..90ef245c08d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/AwakeService/when_handling_committed_event_after_unsybscribe.cs
@@ -0,0 +1,132 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Tests.Bus.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+
+namespace KurrentDB.Core.Tests.AwakeService;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_committed_event_after_unsybscribe<TLogFormat, TStreamId> {
+	private KurrentDB.Core.Services.AwakeReaderService.AwakeService _it;
+	private EventRecord _eventRecord;
+	private StorageMessage.EventCommitted _eventCommitted;
+	private Exception _exception;
+	private IEnvelope _envelope;
+	private SynchronousScheduler _publisher;
+	private TestHandler<TestMessage> _handler;
+	private TestMessage _reply1;
+	private TestMessage _reply2;
+	private TestMessage _reply3;
+	private TestMessage _reply4;
+	private TestMessage _reply5;
+	private Guid _correlationId1;
+	private Guid _correlationId2;
+	private Guid _correlationId3;
+	private Guid _correlationId4;
+	private Guid _correlationId5;
+
+	[SetUp]
+	public void SetUp() {
+		_exception = null;
+		Given();
+		When();
+	}
+
+	private void Given() {
+		_it = new KurrentDB.Core.Services.AwakeReaderService.AwakeService();
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		_eventRecord = new EventRecord(
+			100,
+			LogRecord.Prepare(
+				recordFactory, 1500, Guid.NewGuid(), Guid.NewGuid(), 1500, 0, streamId, 99, PrepareFlags.Data,
+				eventTypeId, new byte[0], null, DateTime.UtcNow), "Stream", "EventType");
+		_eventCommitted = new StorageMessage.EventCommitted(2000, _eventRecord, isTfEof: true);
+		_publisher = new();
+		_envelope = _publisher;
+		_handler = new TestHandler<TestMessage>();
+		_publisher.Subscribe(_handler);
+		_reply1 = new TestMessage(1);
+		_reply2 = new TestMessage(2);
+		_reply3 = new TestMessage(3);
+		_reply4 = new TestMessage(4);
+		_reply5 = new TestMessage(5);
+
+		_correlationId1 = Guid.NewGuid();
+		_it.Handle(
+			new AwakeServiceMessage.SubscribeAwake(
+				_envelope, _correlationId1, "Stream", new TFPos(1000, 500), _reply1));
+		_correlationId2 = Guid.NewGuid();
+		_it.Handle(
+			new AwakeServiceMessage.SubscribeAwake(
+				_envelope, _correlationId2, "Stream", new TFPos(100000, 99500), _reply2));
+		_correlationId3 = Guid.NewGuid();
+		_it.Handle(
+			new AwakeServiceMessage.SubscribeAwake(
+				_envelope, _correlationId3, "Stream2", new TFPos(1000, 500), _reply3));
+		_correlationId4 = Guid.NewGuid();
+		_it.Handle(
+			new AwakeServiceMessage.SubscribeAwake(
+				_envelope, _correlationId4, null, new TFPos(1000, 500), _reply4));
+		_correlationId5 = Guid.NewGuid();
+		_it.Handle(
+			new AwakeServiceMessage.SubscribeAwake(
+				_envelope, _correlationId5, null, new TFPos(100000, 99500), _reply5));
+	}
+
+	private void When() {
+		try {
+			_it.Handle(new AwakeServiceMessage.UnsubscribeAwake(_correlationId1));
+			_it.Handle(new AwakeServiceMessage.UnsubscribeAwake(_correlationId2));
+			_it.Handle(new AwakeServiceMessage.UnsubscribeAwake(_correlationId3));
+			_it.Handle(new AwakeServiceMessage.UnsubscribeAwake(_correlationId4));
+			_it.Handle(new AwakeServiceMessage.UnsubscribeAwake(_correlationId5));
+			_it.Handle(_eventCommitted);
+		} catch (Exception ex) {
+			_exception = ex;
+		}
+	}
+
+	[Test]
+	public void it_is_handled() {
+		Assert.IsNull(_exception, (_exception ?? (object)"").ToString());
+	}
+
+	[Test]
+	public void does_not_awake_stream_subscriber_before_position() {
+		Assert.That(!_handler.HandledMessages.Any(m => m.Kind == 1));
+	}
+
+	[Test]
+	public void does_not_awake_stream_subscriber_after_position() {
+		Assert.That(!_handler.HandledMessages.Any(m => m.Kind == 2));
+	}
+
+	[Test]
+	public void does_not_awake_all_subscriber_before_position() {
+		Assert.That(!_handler.HandledMessages.Any(m => m.Kind == 4));
+	}
+
+	[Test]
+	public void does_not_awake_all_subscriber_after_position() {
+		Assert.That(!_handler.HandledMessages.Any(m => m.Kind == 5));
+	}
+
+	[Test]
+	public void does_not_awake_another_stream_subscriber_before_position() {
+		Assert.That(!_handler.HandledMessages.Any(m => m.Kind == 3));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/AwakeService/when_handling_committed_event_with_subscribers.cs b/src/KurrentDB.Core.Tests/AwakeService/when_handling_committed_event_with_subscribers.cs
new file mode 100644
index 00000000000..337c49e0ee1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/AwakeService/when_handling_committed_event_with_subscribers.cs
@@ -0,0 +1,117 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Tests.Bus.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+
+namespace KurrentDB.Core.Tests.AwakeService;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_committed_event_with_subscribers<TLogFormat, TStreamId> {
+	private KurrentDB.Core.Services.AwakeReaderService.AwakeService _it;
+	private EventRecord _eventRecord;
+	private StorageMessage.EventCommitted _eventCommitted;
+	private Exception _exception;
+	private IEnvelope _envelope;
+	private SynchronousScheduler _publisher;
+	private TestHandler<TestMessage> _handler;
+	private TestMessage _reply1;
+	private TestMessage _reply2;
+	private TestMessage _reply3;
+	private TestMessage _reply4;
+	private TestMessage _reply5;
+
+	[SetUp]
+	public void SetUp() {
+		_exception = null;
+		Given();
+		When();
+	}
+
+	private void Given() {
+		_it = new KurrentDB.Core.Services.AwakeReaderService.AwakeService();
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		_eventRecord = new EventRecord(
+			100,
+			LogRecord.Prepare(
+				recordFactory, 1500, Guid.NewGuid(), Guid.NewGuid(), 1500, 0, streamId, 99, PrepareFlags.Data,
+				eventTypeId, new byte[0], null, DateTime.UtcNow), "Stream", "EventType");
+		_eventCommitted = new StorageMessage.EventCommitted(2000, _eventRecord, isTfEof: true);
+		_publisher = new();
+		_envelope = _publisher;
+		_handler = new TestHandler<TestMessage>();
+		_publisher.Subscribe(_handler);
+		_reply1 = new TestMessage(1);
+		_reply2 = new TestMessage(2);
+		_reply3 = new TestMessage(3);
+		_reply4 = new TestMessage(4);
+		_reply5 = new TestMessage(5);
+
+		_it.Handle(
+			new AwakeServiceMessage.SubscribeAwake(
+				_envelope, Guid.NewGuid(), "Stream", new TFPos(1000, 500), _reply1));
+		_it.Handle(
+			new AwakeServiceMessage.SubscribeAwake(
+				_envelope, Guid.NewGuid(), "Stream", new TFPos(100000, 99500), _reply2));
+		_it.Handle(
+			new AwakeServiceMessage.SubscribeAwake(
+				_envelope, Guid.NewGuid(), "Stream2", new TFPos(1000, 500), _reply3));
+		_it.Handle(
+			new AwakeServiceMessage.SubscribeAwake(
+				_envelope, Guid.NewGuid(), null, new TFPos(1000, 500), _reply4));
+		_it.Handle(
+			new AwakeServiceMessage.SubscribeAwake(
+				_envelope, Guid.NewGuid(), null, new TFPos(100000, 99500), _reply5));
+	}
+
+	private void When() {
+		try {
+			_it.Handle(_eventCommitted);
+		} catch (Exception ex) {
+			_exception = ex;
+		}
+	}
+
+	[Test]
+	public void it_is_handled() {
+		Assert.IsNull(_exception, (_exception ?? (object)"").ToString());
+	}
+
+	[Test]
+	public void awakes_stream_subscriber_before_position() {
+		Assert.That(_handler.HandledMessages.Any(m => m.Kind == 1));
+	}
+
+	[Test]
+	public void does_not_awake_stream_subscriber_after_position() {
+		Assert.That(_handler.HandledMessages.All(m => m.Kind != 2));
+	}
+
+	[Test]
+	public void awakes_all_subscriber_before_position() {
+		Assert.That(_handler.HandledMessages.Any(m => m.Kind == 4));
+	}
+
+	[Test]
+	public void does_not_awake_all_subscriber_after_position() {
+		Assert.That(_handler.HandledMessages.All(m => m.Kind != 5));
+	}
+
+	[Test]
+	public void does_not_awake_another_stream_subscriber_before_position() {
+		Assert.That(_handler.HandledMessages.All(m => m.Kind != 3));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/AwakeService/when_handling_subscribe_awake.cs b/src/KurrentDB.Core.Tests/AwakeService/when_handling_subscribe_awake.cs
new file mode 100644
index 00000000000..8c23d34e139
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/AwakeService/when_handling_subscribe_awake.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messaging;
+using NUnit.Framework;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+
+namespace KurrentDB.Core.Tests.AwakeService;
+
+[TestFixture]
+public class when_handling_subscribe_awake {
+	private KurrentDB.Core.Services.AwakeReaderService.AwakeService _it;
+	private Exception _exception;
+	private IEnvelope _envelope;
+
+	[SetUp]
+	public void SetUp() {
+		_exception = null;
+		Given();
+		When();
+	}
+
+	private void Given() {
+		_it = new KurrentDB.Core.Services.AwakeReaderService.AwakeService();
+
+		_envelope = new NoopEnvelope();
+	}
+
+	private void When() {
+		try {
+			_it.Handle(
+				new AwakeServiceMessage.SubscribeAwake(
+					_envelope, Guid.NewGuid(), "Stream", new TFPos(1000, 500), new Bus.Helpers.TestMessage()));
+		} catch (Exception ex) {
+			_exception = ex;
+		}
+	}
+
+	[Test]
+	public void it_is_handled() {
+		Assert.IsNull(_exception, (_exception ?? (object)"").ToString());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/AwakeService/when_subscribing_before_last_position_with_already_committed_events.cs b/src/KurrentDB.Core.Tests/AwakeService/when_subscribing_before_last_position_with_already_committed_events.cs
new file mode 100644
index 00000000000..98934775ff0
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/AwakeService/when_subscribing_before_last_position_with_already_committed_events.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Tests.Bus.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+
+namespace KurrentDB.Core.Tests.AwakeService;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_subscribing_before_last_position_with_already_committed_events<TLogFormat, TStreamId> {
+	private KurrentDB.Core.Services.AwakeReaderService.AwakeService _it;
+	private EventRecord _eventRecord;
+	private StorageMessage.EventCommitted _eventCommitted;
+	private Exception _exception;
+	private IEnvelope _envelope;
+	private SynchronousScheduler _publisher;
+	private TestHandler<TestMessage> _handler;
+	private TestMessage _reply1;
+	private TestMessage _reply2;
+	private TestMessage _reply3;
+
+	[SetUp]
+	public void SetUp() {
+		_exception = null;
+		Given();
+		When();
+	}
+
+	private void Given() {
+		_it = new KurrentDB.Core.Services.AwakeReaderService.AwakeService();
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		_eventRecord = new EventRecord(
+			100,
+			LogRecord.Prepare(
+				recordFactory, 1500, Guid.NewGuid(), Guid.NewGuid(), 1500, 0, streamId, 99, PrepareFlags.Data,
+				eventTypeId, new byte[0], null, DateTime.UtcNow), "Stream", "EventType");
+		_eventCommitted = new StorageMessage.EventCommitted(2000, _eventRecord, isTfEof: true);
+		_publisher = new();
+		_envelope = _publisher;
+		_handler = new TestHandler<TestMessage>();
+		_publisher.Subscribe(_handler);
+		_reply1 = new TestMessage(1);
+		_reply2 = new TestMessage(3);
+		_reply3 = new TestMessage(4);
+
+		_it.Handle(_eventCommitted);
+	}
+
+	private void When() {
+		try {
+			_it.Handle(
+				new AwakeServiceMessage.SubscribeAwake(
+					_envelope, Guid.NewGuid(), "Stream", new TFPos(1000, 500), _reply1));
+			_it.Handle(
+				new AwakeServiceMessage.SubscribeAwake(
+					_envelope, Guid.NewGuid(), "Stream2", new TFPos(1000, 500), _reply2));
+			_it.Handle(
+				new AwakeServiceMessage.SubscribeAwake(
+					_envelope, Guid.NewGuid(), null, new TFPos(1000, 500), _reply3));
+		} catch (Exception ex) {
+			_exception = ex;
+		}
+	}
+
+	[Test]
+	public void it_is_handled() {
+		Assert.IsNull(_exception, (_exception ?? (object)"").ToString());
+	}
+
+	[Test]
+	public void immediately_awakes_stream_subscriber() {
+		Assert.That(_handler.HandledMessages.Any(m => m.Kind == 1));
+	}
+
+	[Test]
+	public void immediately_awakes_all_subscriber() {
+		Assert.That(_handler.HandledMessages.Any(m => m.Kind == 4));
+	}
+
+	[Test]
+	public void immediately_awakes_another_stream_subscriber() {
+		Assert.That(_handler.HandledMessages.Any(m => m.Kind == 3));
+	}
+}
diff --git a/src/EventStore.Core.Tests/Bus/FSMSpeedTest.cs b/src/KurrentDB.Core.Tests/Bus/FSMSpeedTest.cs
similarity index 91%
rename from src/EventStore.Core.Tests/Bus/FSMSpeedTest.cs
rename to src/KurrentDB.Core.Tests/Bus/FSMSpeedTest.cs
index 1e59a31bc1c..de12ae6dfc5 100644
--- a/src/EventStore.Core.Tests/Bus/FSMSpeedTest.cs
+++ b/src/KurrentDB.Core.Tests/Bus/FSMSpeedTest.cs
@@ -1,16 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
-using System.Threading;
 using System.Threading.Tasks;
 using DotNext.Diagnostics;
 using DotNext.Runtime;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.VNode;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.VNode;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Bus;
+namespace KurrentDB.Core.Tests.Bus;
 
 [TestFixture]
 public class FSMSpeedTest {
diff --git a/src/KurrentDB.Core.Tests/Bus/FakeQueuedHandler.cs b/src/KurrentDB.Core.Tests/Bus/FakeQueuedHandler.cs
new file mode 100644
index 00000000000..c3b1af767b5
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Bus/FakeQueuedHandler.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Monitoring.Stats;
+
+namespace KurrentDB.Core.Tests.Bus;
+
+public class FakeQueuedHandler : IQueuedHandler {
+	public string Name => string.Empty;
+	public void Handle(Message message) { }
+	public void Publish(Message message) { }
+	public void Start() { }
+	public Task Stop() => Task.CompletedTask;
+	public void RequestStop() { }
+	public QueueStats GetStatistics() => null;
+}
diff --git a/src/KurrentDB.Core.Tests/Bus/Helpers/BusTestMessages.cs b/src/KurrentDB.Core.Tests/Bus/Helpers/BusTestMessages.cs
new file mode 100644
index 00000000000..478d29616f1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Bus/Helpers/BusTestMessages.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Tests.Bus.Helpers;
+
+public class TestMessage : Message {
+}
+
+public class TestMessage2 : Message {
+}
+
+public class TestMessage3 : Message {
+}
+
+public class ParentTestMessage : Message {
+}
+
+public class ChildTestMessage : ParentTestMessage {
+}
+
+public class GrandChildTestMessage : ChildTestMessage {
+}
+
+public class TestMessageWithId : Message {
+	public readonly int Id;
+
+	public TestMessageWithId(int id) {
+		Id = id;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Bus/Helpers/FakeCollectingQueuedHandler.cs b/src/KurrentDB.Core.Tests/Bus/Helpers/FakeCollectingQueuedHandler.cs
new file mode 100644
index 00000000000..58238c3f98e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Bus/Helpers/FakeCollectingQueuedHandler.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Monitoring.Stats;
+
+namespace KurrentDB.Core.Tests.Bus.Helpers;
+
+public class FakeCollectingQueuedHandler : IQueuedHandler {
+	public List<Message> PublishedMessages { get; } = [];
+
+	public void Handle(Message message) { }
+
+	public void Publish(Message message) {
+		PublishedMessages.Add(message);
+	}
+
+	public string Name => string.Empty;
+	public void Start() { }
+
+	public Task Stop() => Task.CompletedTask;
+
+	public void RequestStop() { }
+
+	public QueueStats GetStatistics() => null;
+}
diff --git a/src/KurrentDB.Core.Tests/Bus/Helpers/Messages.cs b/src/KurrentDB.Core.Tests/Bus/Helpers/Messages.cs
new file mode 100644
index 00000000000..b4854a83d5d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Bus/Helpers/Messages.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Tests.Bus.Helpers;
+
+public class DeferredExecutionTestMessage : Message {
+	private readonly Action _action;
+
+	public DeferredExecutionTestMessage(Action action) {
+		if (action == null)
+			throw new ArgumentNullException("action");
+		_action = action;
+	}
+
+	public void Execute() {
+		_action();
+	}
+}
+
+public class ExecutableTestMessage : Message {
+	private readonly Action _action;
+
+	public ExecutableTestMessage(Action action) {
+		if (action == null)
+			throw new ArgumentNullException("action");
+		_action = action;
+	}
+
+	public void Execute() {
+		_action();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Bus/Helpers/NoopConsumer.cs b/src/KurrentDB.Core.Tests/Bus/Helpers/NoopConsumer.cs
new file mode 100644
index 00000000000..c4d9600e76d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Bus/Helpers/NoopConsumer.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Tests.Bus.Helpers;
+
+public class NoopConsumer : IHandle<Message> {
+	public void Handle(Message message) {
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Bus/Helpers/QueuedHandlerTestWithNoopConsumer.cs b/src/KurrentDB.Core.Tests/Bus/Helpers/QueuedHandlerTestWithNoopConsumer.cs
new file mode 100644
index 00000000000..75f6c5e12cc
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Bus/Helpers/QueuedHandlerTestWithNoopConsumer.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Bus.Helpers;
+
+public abstract class QueuedHandlerTestWithNoopConsumer {
+	private readonly Func<IHandle<Message>, string, TimeSpan, IQueuedHandler> _queuedHandlerFactory;
+
+	protected IQueuedHandler Queue;
+	protected IHandle<Message> Consumer;
+
+	protected QueuedHandlerTestWithNoopConsumer(
+		Func<IHandle<Message>, string, TimeSpan, IQueuedHandler> queuedHandlerFactory) {
+		Ensure.NotNull(queuedHandlerFactory, "queuedHandlerFactory");
+		_queuedHandlerFactory = queuedHandlerFactory;
+	}
+
+	[SetUp]
+	public virtual void SetUp() {
+		Consumer = new NoopConsumer();
+		Queue = _queuedHandlerFactory(Consumer, "test_name", TimeSpan.FromMilliseconds(5000));
+	}
+
+	[TearDown]
+	public virtual async Task TearDown() {
+		await Queue.Stop();
+		Queue = null;
+		Consumer = null;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Bus/Helpers/QueuedHandlerTestWithWaitingConsumer.cs b/src/KurrentDB.Core.Tests/Bus/Helpers/QueuedHandlerTestWithWaitingConsumer.cs
new file mode 100644
index 00000000000..40a3cac9801
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Bus/Helpers/QueuedHandlerTestWithWaitingConsumer.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Bus.Helpers;
+
+public abstract class QueuedHandlerTestWithWaitingConsumer {
+	private readonly Func<IHandle<Message>, string, TimeSpan, IQueuedHandler> _queuedHandlerFactory;
+
+	protected IQueuedHandler Queue;
+	protected WaitingConsumer Consumer;
+
+	protected QueuedHandlerTestWithWaitingConsumer(
+		Func<IHandle<Message>, string, TimeSpan, IQueuedHandler> queuedHandlerFactory) {
+		Ensure.NotNull(queuedHandlerFactory, "queuedHandlerFactory");
+		_queuedHandlerFactory = queuedHandlerFactory;
+	}
+
+	[SetUp]
+	public virtual void SetUp() {
+		Consumer = new WaitingConsumer(0);
+		Queue = _queuedHandlerFactory(Consumer, "waiting_queue", TimeSpan.FromMilliseconds(5000));
+	}
+
+	[TearDown]
+	public virtual async Task TearDown() {
+		await Queue.Stop();
+		Queue = null;
+		Consumer.Dispose();
+		Consumer = null;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Bus/Helpers/TestHandler.cs b/src/KurrentDB.Core.Tests/Bus/Helpers/TestHandler.cs
new file mode 100644
index 00000000000..b1d0999d35a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Bus/Helpers/TestHandler.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Tests.Bus.Helpers;
+
+public class TestHandler<T> : IHandle<T> where T : Message {
+	public readonly List<T> HandledMessages = new List<T>();
+
+	public void Handle(T message) {
+		HandledMessages.Add(message);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Bus/Helpers/TestMultiHandler.cs b/src/KurrentDB.Core.Tests/Bus/Helpers/TestMultiHandler.cs
new file mode 100644
index 00000000000..fb00abbdf25
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Bus/Helpers/TestMultiHandler.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Tests.Bus.Helpers;
+
+public class TestMultiHandler : IHandle<TestMessage>, IHandle<TestMessage2>, IHandle<TestMessage3> {
+	public readonly List<Message> HandledMessages = new List<Message>();
+
+	public void Handle(TestMessage message) {
+		HandledMessages.Add(message);
+	}
+
+	public void Handle(TestMessage2 message) {
+		HandledMessages.Add(message);
+	}
+
+	public void Handle(TestMessage3 message) {
+		HandledMessages.Add(message);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Bus/Helpers/WaitingConsumer.cs b/src/KurrentDB.Core.Tests/Bus/Helpers/WaitingConsumer.cs
new file mode 100644
index 00000000000..ff084b82732
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Bus/Helpers/WaitingConsumer.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Tests.Bus.Helpers;
+
+public class WaitingConsumer : IHandle<Message>, IDisposable {
+	public readonly List<Message> HandledMessages = new List<Message>();
+
+	private readonly CountdownEvent _countdownEvent;
+
+	public WaitingConsumer(int initialCount) {
+		_countdownEvent = new CountdownEvent(initialCount);
+	}
+
+	public void SetWaitingCount(int count) {
+		_countdownEvent.Reset(count);
+	}
+
+	public bool Wait(int ms = 5000) {
+		return _countdownEvent.Wait(ms);
+	}
+
+	public void Handle(Message message) {
+		HandledMessages.Add(message);
+
+		var typedMsg = message as DeferredExecutionTestMessage;
+		if (typedMsg != null)
+			((Action<DeferredExecutionTestMessage>)(deffered => deffered.Execute()))(typedMsg);
+
+		var executableTestMessage = message as ExecutableTestMessage;
+		if (executableTestMessage != null)
+			((Action<ExecutableTestMessage>)(deffered => deffered.Execute()))(executableTestMessage);
+
+		_countdownEvent.Signal();
+	}
+
+	public void Dispose() {
+		_countdownEvent.Dispose();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Bus/SynchronousScheduler.cs b/src/KurrentDB.Core.Tests/Bus/SynchronousScheduler.cs
new file mode 100644
index 00000000000..3a14051d64c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Bus/SynchronousScheduler.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Messaging;
+
+// Resharper disable CheckNamespace
+
+namespace KurrentDB.Core.Bus;
+
+public sealed class SynchronousScheduler(string name = "Test", bool watchSlowMsg = true) : InMemoryBus(name, watchSlowMsg), IPublisher {
+	public void Publish(Message msg) {
+		ArgumentNullException.ThrowIfNull(msg);
+
+		var task = DispatchAsync(msg, CancellationToken.None);
+		if (task.IsCompleted) {
+			task.GetAwaiter().GetResult();
+		} else {
+			var wrapperTask = task.AsTask();
+
+			try {
+				wrapperTask.Wait();
+			} catch (AggregateException e) when (e.InnerExceptions is [var innerEx]) {
+				throw innerEx;
+			} finally {
+				wrapperTask.Dispose();
+			}
+		}
+	}
+
+	ValueTask IAsyncHandle<Message>.HandleAsync(Message msg, CancellationToken token)
+		=> DispatchAsync(msg, token);
+}
diff --git a/src/KurrentDB.Core.Tests/Bus/queued_handler_should.cs b/src/KurrentDB.Core.Tests/Bus/queued_handler_should.cs
new file mode 100644
index 00000000000..a494c6807eb
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Bus/queued_handler_should.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Tests.Bus.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Bus;
+
+[TestFixture]
+public abstract class queued_handler_should : QueuedHandlerTestWithNoopConsumer {
+	protected queued_handler_should(Func<IHandle<Message>, string, TimeSpan, IQueuedHandler> queuedHandlerFactory)
+		: base(queuedHandlerFactory) {
+	}
+
+	[Test]
+	public void throw_if_handler_is_null() {
+		Assert.Throws<ArgumentNullException>(
+			static () => new QueuedHandlerThreadPool(null, "throwing", new(), new(), watchSlowMsg: false));
+	}
+
+	[Test]
+	public void throw_if_name_is_null() {
+		Assert.Throws<ArgumentNullException>(
+			() => new QueuedHandlerThreadPool(Consumer, null, new(), new(), watchSlowMsg: false));
+	}
+}
+
+[TestFixture]
+public class queued_handler_threadpool_should : queued_handler_should {
+	public queued_handler_threadpool_should()
+		: base((consumer, name, timeout) =>
+			new QueuedHandlerThreadPool(consumer, name, new QueueStatsManager(), new(), false, null, timeout)) {
+	}
+}
diff --git a/src/EventStore.Core.Tests/Bus/when_publishing_into_memory_bus.cs b/src/KurrentDB.Core.Tests/Bus/when_publishing_into_memory_bus.cs
similarity index 86%
rename from src/EventStore.Core.Tests/Bus/when_publishing_into_memory_bus.cs
rename to src/KurrentDB.Core.Tests/Bus/when_publishing_into_memory_bus.cs
index bd18fc297fc..62491369516 100644
--- a/src/EventStore.Core.Tests/Bus/when_publishing_into_memory_bus.cs
+++ b/src/KurrentDB.Core.Tests/Bus/when_publishing_into_memory_bus.cs
@@ -1,11 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Tests.Bus.Helpers;
-using EventStore.Core.Tests.Helpers;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Tests.Bus.Helpers;
+using KurrentDB.Core.Tests.Helpers;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Bus;
+namespace KurrentDB.Core.Tests.Bus;
 
 [TestFixture]
 public class when_publishing_into_memory_bus {
@@ -37,8 +40,8 @@ public async Task unsubscribed_messages_noone_should_handle_it() {
 		await _bus.DispatchAsync(new TestMessage3());
 
 		Assert.That(handler1.HandledMessages.Count == 0
-		            && handler2.HandledMessages.Count == 0
-		            && handler3.HandledMessages.Count == 0);
+					&& handler2.HandledMessages.Count == 0
+					&& handler3.HandledMessages.Count == 0);
 	}
 
 	[Test]
@@ -117,7 +120,7 @@ public async Task message_of_grand_child_type_then_all_subscribed_handlers_of_ba
 		await _bus.DispatchAsync(new GrandChildTestMessage());
 
 		Assert.That(parentHandler.HandledMessages.ContainsSingle<GrandChildTestMessage>() &&
-		            childHandler.HandledMessages.ContainsSingle<GrandChildTestMessage>());
+					childHandler.HandledMessages.ContainsSingle<GrandChildTestMessage>());
 	}
 
 	[Test]
@@ -134,7 +137,7 @@ public async Task
 		await _bus.DispatchAsync(new GrandChildTestMessage());
 
 		Assert.That(parentHandler.HandledMessages.ContainsSingle<GrandChildTestMessage>() &&
-		            childHandler.HandledMessages.ContainsSingle<GrandChildTestMessage>() &&
-		            grandChildHandler.HandledMessages.ContainsSingle<GrandChildTestMessage>());
+					childHandler.HandledMessages.ContainsSingle<GrandChildTestMessage>() &&
+					grandChildHandler.HandledMessages.ContainsSingle<GrandChildTestMessage>());
 	}
 }
diff --git a/src/EventStore.Core.Tests/Bus/when_publishing_to_queued_handler.cs b/src/KurrentDB.Core.Tests/Bus/when_publishing_to_queued_handler.cs
similarity index 83%
rename from src/EventStore.Core.Tests/Bus/when_publishing_to_queued_handler.cs
rename to src/KurrentDB.Core.Tests/Bus/when_publishing_to_queued_handler.cs
index 452aec67b9e..07a2c11465a 100644
--- a/src/EventStore.Core.Tests/Bus/when_publishing_to_queued_handler.cs
+++ b/src/KurrentDB.Core.Tests/Bus/when_publishing_to_queued_handler.cs
@@ -1,12 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Linq;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests.Bus.Helpers;
-using EventStore.Core.Tests.Helpers;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Tests.Bus.Helpers;
+using KurrentDB.Core.Tests.Helpers;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Bus;
+namespace KurrentDB.Core.Tests.Bus;
 
 [TestFixture, Category("LongRunning")]
 public abstract class when_publishing_to_queued_handler : QueuedHandlerTestWithWaitingConsumer {
@@ -20,10 +24,10 @@ public override void SetUp() {
 		Queue.Start();
 	}
 
-	public override void TearDown() {
+	public override async Task TearDown() {
 		Consumer.Dispose();
-		Queue.Stop();
-		base.TearDown();
+		await Queue.Stop();
+		await base.TearDown();
 	}
 
 	[Test, Ignore("We do not check each message for null for performance reasons.")]
diff --git a/src/KurrentDB.Core.Tests/Bus/when_stopping_queued_handler.cs b/src/KurrentDB.Core.Tests/Bus/when_stopping_queued_handler.cs
new file mode 100644
index 00000000000..8ed85c65a88
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Bus/when_stopping_queued_handler.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Tests.Bus.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Bus;
+
+[TestFixture]
+public abstract class when_stopping_queued_handler : QueuedHandlerTestWithNoopConsumer {
+	protected when_stopping_queued_handler(
+		Func<IHandle<Message>, string, TimeSpan, IQueuedHandler> queuedHandlerFactory)
+		: base(queuedHandlerFactory) {
+	}
+
+
+	[Test]
+	public void gracefully_should_not_throw() {
+		Queue.Start();
+		Assert.DoesNotThrowAsync(Queue.Stop);
+	}
+
+	[Test]
+	public async Task gracefully_and_queue_is_not_busy_should_not_take_much_time() {
+		Queue.Start();
+		await Queue.Stop().WaitAsync(TimeSpan.FromMilliseconds(5000));
+	}
+
+	[Test]
+	public void second_time_should_not_throw() {
+		Queue.Start();
+		Assert.DoesNotThrowAsync(Queue.Stop);
+	}
+
+	[Test]
+	public async Task second_time_should_not_take_much_time() {
+		Queue.Start();
+		await Queue.Stop().WaitAsync(TimeSpan.FromMilliseconds(5000))
+			.ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext | ConfigureAwaitOptions.SuppressThrowing);
+
+		Assert.IsTrue(Queue.Stop().IsCompletedSuccessfully);
+	}
+
+	[Test]
+	public void while_queue_is_busy_should_crash_with_timeout() {
+		var consumer = new WaitingConsumer(1);
+		var busyQueue = new QueuedHandlerThreadPool(consumer, "busy_test_queue", new QueueStatsManager(), new(),
+			watchSlowMsg: false,
+			threadStopWaitTimeout: TimeSpan.FromMilliseconds(100));
+		var waitHandle = new ManualResetEvent(false);
+		var handledEvent = new ManualResetEvent(false);
+		try {
+			busyQueue.Start();
+			busyQueue.Publish(new DeferredExecutionTestMessage(() => {
+				handledEvent.Set();
+				waitHandle.WaitOne();
+			}));
+
+			handledEvent.WaitOne();
+			Assert.ThrowsAsync<TimeoutException>(busyQueue.Stop);
+		} finally {
+			waitHandle.Set();
+			consumer.Wait();
+
+			busyQueue.RequestStop();
+			waitHandle.Dispose();
+			handledEvent.Dispose();
+			consumer.Dispose();
+		}
+	}
+}
+
+[TestFixture]
+public class when_stopping_queued_handler_threadpool : when_stopping_queued_handler {
+	public when_stopping_queued_handler_threadpool()
+		: base((consumer, name, timeout) =>
+			new QueuedHandlerThreadPool(consumer, name, new QueueStatsManager(), new(), false, null, timeout)) {
+	}
+}
diff --git a/src/EventStore.Core.Tests/Bus/when_subscribing_to_memory_bus.cs b/src/KurrentDB.Core.Tests/Bus/when_subscribing_to_memory_bus.cs
similarity index 75%
rename from src/EventStore.Core.Tests/Bus/when_subscribing_to_memory_bus.cs
rename to src/KurrentDB.Core.Tests/Bus/when_subscribing_to_memory_bus.cs
index 612d766f819..7cfdeb79034 100644
--- a/src/EventStore.Core.Tests/Bus/when_subscribing_to_memory_bus.cs
+++ b/src/KurrentDB.Core.Tests/Bus/when_subscribing_to_memory_bus.cs
@@ -1,11 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Tests.Bus.Helpers;
-using EventStore.Core.Tests.Helpers;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Tests.Bus.Helpers;
+using KurrentDB.Core.Tests.Helpers;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Bus;
+namespace KurrentDB.Core.Tests.Bus;
 
 [TestFixture]
 public class when_subscribing_to_memory_bus {
@@ -58,8 +61,8 @@ public async Task one_handler_to_multiple_messages_they_all_should_be_handled()
 		await _bus.DispatchAsync(new TestMessage3());
 
 		Assert.That(multiHandler.HandledMessages.ContainsSingle<TestMessage>() &&
-		            multiHandler.HandledMessages.ContainsSingle<TestMessage2>() &&
-		            multiHandler.HandledMessages.ContainsSingle<TestMessage3>());
+					multiHandler.HandledMessages.ContainsSingle<TestMessage2>() &&
+					multiHandler.HandledMessages.ContainsSingle<TestMessage3>());
 	}
 
 	[Test]
@@ -73,8 +76,8 @@ public async Task one_handler_to_few_messages_then_only_subscribed_should_be_han
 		await _bus.DispatchAsync(new TestMessage3());
 
 		Assert.That(multiHandler.HandledMessages.ContainsSingle<TestMessage>() &&
-		            multiHandler.HandledMessages.ContainsNo<TestMessage2>() &&
-		            multiHandler.HandledMessages.ContainsSingle<TestMessage3>());
+					multiHandler.HandledMessages.ContainsNo<TestMessage2>() &&
+					multiHandler.HandledMessages.ContainsSingle<TestMessage3>());
 	}
 
 	[Test]
@@ -111,11 +114,11 @@ public async Task multiple_handlers_to_multiple_messages_then_each_handler_shoul
 		await _bus.DispatchAsync(new TestMessage3());
 
 		Assert.That(handler1.HandledMessages.ContainsSingle<TestMessage>() &&
-		            handler1.HandledMessages.ContainsSingle<TestMessage3>() &&
-		            handler2.HandledMessages.ContainsSingle<TestMessage>() &&
-		            handler2.HandledMessages.ContainsSingle<TestMessage2>() &&
-		            handler3.HandledMessages.ContainsSingle<TestMessage2>() &&
-		            handler3.HandledMessages.ContainsSingle<TestMessage3>());
+					handler1.HandledMessages.ContainsSingle<TestMessage3>() &&
+					handler2.HandledMessages.ContainsSingle<TestMessage>() &&
+					handler2.HandledMessages.ContainsSingle<TestMessage2>() &&
+					handler3.HandledMessages.ContainsSingle<TestMessage2>() &&
+					handler3.HandledMessages.ContainsSingle<TestMessage3>());
 	}
 
 	[Test]
@@ -141,14 +144,14 @@ public async Task
 
 
 		Assert.That(handler1.HandledMessages.ContainsSingle<TestMessage>() &&
-		            handler1.HandledMessages.ContainsNo<TestMessage2>() &&
-		            handler1.HandledMessages.ContainsSingle<TestMessage3>() &&
-		            handler2.HandledMessages.ContainsSingle<TestMessage>() &&
-		            handler2.HandledMessages.ContainsSingle<TestMessage2>() &&
-		            handler2.HandledMessages.ContainsNo<TestMessage3>() &&
-		            handler3.HandledMessages.ContainsNo<TestMessage>() &&
-		            handler3.HandledMessages.ContainsSingle<TestMessage2>() &&
-		            handler3.HandledMessages.ContainsSingle<TestMessage3>());
+					handler1.HandledMessages.ContainsNo<TestMessage2>() &&
+					handler1.HandledMessages.ContainsSingle<TestMessage3>() &&
+					handler2.HandledMessages.ContainsSingle<TestMessage>() &&
+					handler2.HandledMessages.ContainsSingle<TestMessage2>() &&
+					handler2.HandledMessages.ContainsNo<TestMessage3>() &&
+					handler3.HandledMessages.ContainsNo<TestMessage>() &&
+					handler3.HandledMessages.ContainsSingle<TestMessage2>() &&
+					handler3.HandledMessages.ContainsSingle<TestMessage3>());
 	}
 
 	[Test /*, Ignore("This logic is confused when having hierarchy flattening on subscription in InMemoryBus.")*/]
diff --git a/src/EventStore.Core.Tests/Bus/when_unsubscribing_from_memory_bus.cs b/src/KurrentDB.Core.Tests/Bus/when_unsubscribing_from_memory_bus.cs
similarity index 81%
rename from src/EventStore.Core.Tests/Bus/when_unsubscribing_from_memory_bus.cs
rename to src/KurrentDB.Core.Tests/Bus/when_unsubscribing_from_memory_bus.cs
index cb36ab3793d..07e423e964f 100644
--- a/src/EventStore.Core.Tests/Bus/when_unsubscribing_from_memory_bus.cs
+++ b/src/KurrentDB.Core.Tests/Bus/when_unsubscribing_from_memory_bus.cs
@@ -1,11 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Tests.Bus.Helpers;
-using EventStore.Core.Tests.Helpers;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Tests.Bus.Helpers;
+using KurrentDB.Core.Tests.Helpers;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Bus;
+namespace KurrentDB.Core.Tests.Bus;
 
 [TestFixture]
 public class when_unsubscribing_from_memory_bus {
@@ -79,8 +82,8 @@ public async Task handler_from_multiple_messages_they_all_should_not_be_handled_
 		await _bus.DispatchAsync(new TestMessage3());
 
 		Assert.That(handler.HandledMessages.ContainsNo<TestMessage>() &&
-		            handler.HandledMessages.ContainsNo<TestMessage2>() &&
-		            handler.HandledMessages.ContainsNo<TestMessage3>());
+					handler.HandledMessages.ContainsNo<TestMessage2>() &&
+					handler.HandledMessages.ContainsNo<TestMessage3>());
 	}
 
 	[Test]
@@ -97,8 +100,8 @@ public async Task handler_from_message_it_should_not_handle_this_message_anymore
 		await _bus.DispatchAsync(new TestMessage3());
 
 		Assert.That(handler.HandledMessages.ContainsNo<TestMessage>() &&
-		            handler.HandledMessages.ContainsSingle<TestMessage2>() &&
-		            handler.HandledMessages.ContainsSingle<TestMessage3>());
+					handler.HandledMessages.ContainsSingle<TestMessage2>() &&
+					handler.HandledMessages.ContainsSingle<TestMessage3>());
 	}
 
 	[Test]
@@ -115,8 +118,8 @@ public async Task one_handler_and_leaving_others_subscribed_only_others_should_h
 		await _bus.DispatchAsync(new TestMessage());
 
 		Assert.That(handler1.HandledMessages.ContainsNo<TestMessage>() &&
-		            handler2.HandledMessages.ContainsSingle<TestMessage>() &&
-		            handler3.HandledMessages.ContainsSingle<TestMessage>());
+					handler2.HandledMessages.ContainsSingle<TestMessage>() &&
+					handler3.HandledMessages.ContainsSingle<TestMessage>());
 	}
 
 	[Test]
@@ -135,8 +138,8 @@ public async Task all_handlers_from_message_noone_should_handle_message() {
 		await _bus.DispatchAsync(new TestMessage());
 
 		Assert.That(handler1.HandledMessages.ContainsNo<TestMessage>() &&
-		            handler2.HandledMessages.ContainsNo<TestMessage>() &&
-		            handler3.HandledMessages.ContainsNo<TestMessage>());
+					handler2.HandledMessages.ContainsNo<TestMessage>() &&
+					handler3.HandledMessages.ContainsNo<TestMessage>());
 	}
 
 	[Test]
@@ -156,8 +159,8 @@ public async Task handlers_after_publishing_message_all_is_still_done_correctly(
 
 		//just to ensure
 		Assert.That(handler1.HandledMessages.ContainsNo<TestMessage>() &&
-		            handler2.HandledMessages.ContainsNo<TestMessage>() &&
-		            handler3.HandledMessages.ContainsNo<TestMessage>());
+					handler2.HandledMessages.ContainsNo<TestMessage>() &&
+					handler3.HandledMessages.ContainsNo<TestMessage>());
 
 		_bus.Unsubscribe(handler1);
 		_bus.Unsubscribe(handler2);
@@ -165,7 +168,7 @@ public async Task handlers_after_publishing_message_all_is_still_done_correctly(
 		await _bus.DispatchAsync(new TestMessage());
 
 		Assert.That(handler1.HandledMessages.ContainsNo<TestMessage>() &&
-		            handler2.HandledMessages.ContainsNo<TestMessage>() &&
-		            handler3.HandledMessages.ContainsNo<TestMessage>());
+					handler2.HandledMessages.ContainsNo<TestMessage>() &&
+					handler3.HandledMessages.ContainsNo<TestMessage>());
 	}
 }
diff --git a/src/KurrentDB.Core.Tests/Caching/AdHocDynamicCache.cs b/src/KurrentDB.Core.Tests/Caching/AdHocDynamicCache.cs
new file mode 100644
index 00000000000..f74a2f79068
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Caching/AdHocDynamicCache.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Caching;
+
+namespace KurrentDB.Core.Tests.Caching;
+
+public class AdHocDynamicCache : IDynamicCache {
+	private readonly Func<long> _getSize;
+	private readonly Action<long> _setCapacity;
+	private readonly Func<long> _getFreedSize;
+	private readonly Action _resetFreedSize;
+
+	public AdHocDynamicCache(
+		Func<long> getSize,
+		Action<long> setCapacity,
+		Func<long> getFreedSize = null,
+		Action resetFreedSize = null,
+		string name = null) {
+
+		_getSize = getSize;
+		_setCapacity = setCapacity;
+		_getFreedSize = getFreedSize ?? (() => 0);
+		_resetFreedSize = resetFreedSize ?? (() => { });
+
+		Name = name ?? nameof(AdHocDynamicCache);
+	}
+
+	public string Name { get; }
+
+	public long Capacity { get; private set; }
+
+	public void SetCapacity(long value) {
+		Capacity = value;
+		_setCapacity(value);
+	}
+
+	public void ResetFreedSize() {
+		_resetFreedSize();
+	}
+
+	public long Size => _getSize();
+	public long FreedSize => _getFreedSize();
+	public long Count => _getSize(); // one byte per item
+}
diff --git a/src/KurrentDB.Core.Tests/Caching/CacheResizerTests.cs b/src/KurrentDB.Core.Tests/Caching/CacheResizerTests.cs
new file mode 100644
index 00000000000..29e40f8988c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Caching/CacheResizerTests.cs
@@ -0,0 +1,195 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Caching;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Caching;
+
+[TestFixture]
+public class CacheResizerTests {
+	[Test]
+	public void dynamic_resizer_loopback() {
+		var cacheResizer = new DynamicCacheResizer(ResizerUnit.Bytes, 10, 100, 12, EmptyDynamicCache.Instance);
+		Assert.AreEqual(12, cacheResizer.Weight);
+	}
+
+	[Test]
+	public void static_resizer_loopback() {
+		var cacheResizer = new StaticCacheResizer(ResizerUnit.Bytes, 10, EmptyDynamicCache.Instance);
+		Assert.AreEqual(0, cacheResizer.Weight);
+	}
+
+	[Test]
+	public void dynamic_resizer_with_zero_weight_throws() =>
+		Assert.Throws<ArgumentOutOfRangeException>(() =>
+				new DynamicCacheResizer(ResizerUnit.Bytes, 0, 0, 0, EmptyDynamicCache.Instance));
+
+	[Test]
+	public void dynamic_resizer_with_negative_weight_throws() =>
+		Assert.Throws<ArgumentOutOfRangeException>(() =>
+			new DynamicCacheResizer(ResizerUnit.Bytes, 0, 0, -1, EmptyDynamicCache.Instance));
+
+	[Test]
+	public void dynamic_resizer_with_negative_min_capacity_throws() =>
+		Assert.Throws<ArgumentOutOfRangeException>(() =>
+			new DynamicCacheResizer(ResizerUnit.Bytes, -1, 0, 10, EmptyDynamicCache.Instance));
+
+	[Test]
+	public void dynamic_resizer_with_negative_max_capacity_throws() =>
+		Assert.Throws<ArgumentOutOfRangeException>(() =>
+			new DynamicCacheResizer(ResizerUnit.Bytes, 0, -1, 10, EmptyDynamicCache.Instance));
+
+	[Test]
+	public void static_resizer_with_negative_capacity_throws() =>
+		Assert.Throws<ArgumentOutOfRangeException>(() =>
+			new StaticCacheResizer(ResizerUnit.Bytes, -1, EmptyDynamicCache.Instance));
+
+	[Test]
+	public void composite_resizer_with_mixed_units_throws() =>
+		Assert.Throws<ArgumentException>(() =>
+			new CompositeCacheResizer("root", 100,
+				new StaticCacheResizer(ResizerUnit.Bytes, 10, EmptyDynamicCache.Instance),
+				new StaticCacheResizer(ResizerUnit.Entries, 10, EmptyDynamicCache.Instance)));
+
+	[Test]
+	public void static_calculates_capacity_correctly() {
+		var cache = new EmptyDynamicCache();
+
+		var sut = new StaticCacheResizer(ResizerUnit.Bytes, 1000, cache);
+
+		sut.CalcCapacityTopLevel(2000);
+		Assert.AreEqual(1000, cache.Capacity);
+
+		sut.CalcCapacityTopLevel(200);
+		Assert.AreEqual(1000, cache.Capacity);
+	}
+
+	[Test]
+	public void dynamic_calculates_capacity_correctly() {
+		var cache = new EmptyDynamicCache();
+
+		var sut = new DynamicCacheResizer(ResizerUnit.Bytes, 1000, 100_000, 50, cache);
+
+		sut.CalcCapacityTopLevel(4000);
+		Assert.AreEqual(4000, cache.Capacity);
+
+		sut.CalcCapacityTopLevel(200);
+		Assert.AreEqual(1000, cache.Capacity);
+	}
+
+	[Test]
+	public void composite_calculates_capacity_correctly_static() {
+		var cacheA = new EmptyDynamicCache();
+		var cacheB = new EmptyDynamicCache();
+
+		var sut = new CompositeCacheResizer("root", 100,
+			new StaticCacheResizer(ResizerUnit.Bytes, 1000, cacheA),
+			new StaticCacheResizer(ResizerUnit.Bytes, 2000, cacheB));
+
+		sut.CalcCapacityTopLevel(4000);
+		Assert.AreEqual(1000, cacheA.Capacity);
+		Assert.AreEqual(2000, cacheB.Capacity);
+
+		sut.CalcCapacityTopLevel(200);
+		Assert.AreEqual(1000, cacheA.Capacity);
+		Assert.AreEqual(2000, cacheB.Capacity);
+	}
+
+	[Test]
+	public void composite_calculates_capacity_correctly_dynamic() {
+		var cacheA = new EmptyDynamicCache();
+		var cacheB = new EmptyDynamicCache();
+
+		var sut = new CompositeCacheResizer("root", 100,
+			new DynamicCacheResizer(ResizerUnit.Bytes, 3000, 100_000, 40, cacheA),
+			new DynamicCacheResizer(ResizerUnit.Bytes, 1000, 100_000, 60, cacheB));
+
+		sut.CalcCapacityTopLevel(10_000);
+		Assert.AreEqual(4000, cacheA.Capacity);
+		Assert.AreEqual(6000, cacheB.Capacity);
+
+		// nb: we overflow the capacity available in order to meet the minimums
+		sut.CalcCapacityTopLevel(5000);
+		Assert.AreEqual(3000, cacheA.Capacity); // <-- minimum
+		Assert.AreEqual(3000, cacheB.Capacity); // <-- 60% of 5000
+
+		sut.CalcCapacityTopLevel(200);
+		Assert.AreEqual(3000, cacheA.Capacity);
+		Assert.AreEqual(1000, cacheB.Capacity);
+
+	}
+
+	[Test]
+	public void composite_calculates_capacity_correctly_mixed() {
+		var cacheA = new EmptyDynamicCache();
+		var cacheB = new EmptyDynamicCache();
+
+		var sut = new CompositeCacheResizer("root", 100,
+			new StaticCacheResizer(ResizerUnit.Bytes, 1000, cacheA),
+			new DynamicCacheResizer(ResizerUnit.Bytes, 1000, 100_000, 60, cacheB));
+
+		sut.CalcCapacityTopLevel(10_000);
+		Assert.AreEqual(1000, cacheA.Capacity);
+		Assert.AreEqual(9000, cacheB.Capacity);
+	}
+
+	[Test]
+	public void composite_calculates_capacity_correctly_complex() {
+		var cacheA = new EmptyDynamicCache();
+		var cacheB = new EmptyDynamicCache();
+		var cacheC = new EmptyDynamicCache();
+		var cacheD = new EmptyDynamicCache();
+
+		// root
+		//  -> static 1000                 A
+		//  -> composite
+		//      -> static 1000             B
+		//      -> dynamic 60% min 1000    C
+		//      -> dynamic 40% min 1000    D
+
+		var sut = new CompositeCacheResizer(
+			name: "root",
+			weight: 100,
+			new StaticCacheResizer(
+				unit: ResizerUnit.Bytes,
+				capacity: 1000,
+				cache: cacheA),
+			new CompositeCacheResizer(
+				name: "composite",
+				weight: 50,
+				new StaticCacheResizer(
+					unit: ResizerUnit.Bytes,
+					capacity: 1000,
+					cache: cacheB),
+				new DynamicCacheResizer(
+					unit: ResizerUnit.Bytes,
+					minCapacity: 1000,
+					maxCapacity: 100_000,
+					weight: 60,
+					cache: cacheC),
+				new DynamicCacheResizer(
+					unit: ResizerUnit.Bytes,
+					minCapacity: 1000,
+					maxCapacity: 100_000,
+					weight: 40,
+					cache: cacheD)));
+
+		// lots of space
+		sut.CalcCapacityTopLevel(12_000);
+
+		Assert.AreEqual(1000, cacheA.Capacity);
+		Assert.AreEqual(1000, cacheB.Capacity);
+		Assert.AreEqual(6000, cacheC.Capacity);
+		Assert.AreEqual(4000, cacheD.Capacity);
+
+		// low space
+		sut.CalcCapacityTopLevel(1_000);
+
+		Assert.AreEqual(1000, cacheA.Capacity);
+		Assert.AreEqual(1000, cacheB.Capacity);
+		Assert.AreEqual(1000, cacheC.Capacity);
+		Assert.AreEqual(1000, cacheD.Capacity);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Caching/DynamicCacheManagerTests.cs b/src/KurrentDB.Core.Tests/Caching/DynamicCacheManagerTests.cs
new file mode 100644
index 00000000000..9d466955936
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Caching/DynamicCacheManagerTests.cs
@@ -0,0 +1,332 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Caching;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Services.Replication;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Caching;
+
+[TestFixture]
+public class DynamicCacheManagerTests {
+	private readonly FakePublisher _fakePublisher = new();
+
+	private DynamicCacheManager GenSut(
+		Func<long> getFreeSystemMem,
+		Func<long> getFreeHeapMem,
+		Func<int> getGcCollectionCount,
+		long totalMem,
+		int keepFreeMemPercent,
+		long keepFreeMemBytes,
+		TimeSpan monitoringInterval,
+		TimeSpan minResizeInterval,
+		long minResizeThreshold,
+		ICacheResizer rootCacheResizer) {
+		var sut = new DynamicCacheManager(
+			_fakePublisher,
+			getFreeSystemMem,
+			getFreeHeapMem,
+			getGcCollectionCount,
+			totalMem,
+			keepFreeMemPercent,
+			keepFreeMemBytes,
+			monitoringInterval,
+			minResizeInterval,
+			minResizeThreshold,
+			rootCacheResizer,
+			new CacheResourcesTracker.NoOp());
+		sut.Start();
+
+		_fakePublisher.Messages.Clear();
+
+		return sut;
+	}
+
+	private async Task TickPublished() {
+		while (!_fakePublisher.Messages.ToArray().Any(x => x is TimerMessage.Schedule))
+			await Task.Delay(10);
+
+		_fakePublisher.Messages.Clear();
+	}
+
+	[Test]
+	public async Task ticks() {
+		var sut = GenSut(
+			() => 100,
+			() => 0,
+			() => 0,
+			100,
+			0,
+			0,
+			TimeSpan.MaxValue,
+			TimeSpan.MaxValue,
+			0,
+			new StaticCacheResizer(ResizerUnit.Bytes, 0, EmptyDynamicCache.Instance));
+
+		sut.Handle(new MonitoringMessage.DynamicCacheManagerTick());
+		await TickPublished().WithTimeout(TimeSpan.FromSeconds(10));
+	}
+
+	[TestCase(20, 0, true)]
+	[TestCase(0, 20, true)]
+	[TestCase(20, 0, false)]
+	[TestCase(0, 20, false)]
+	public async Task caches_resized_depending_on_whether_total_free_memory_is_above_or_below_keep_free_mem(int percent, long bytes, bool aboveKeepFreeMem) {
+		long cache1Mem = -1, cache2Mem = -1;
+		var cache1 = new DynamicCacheResizer(ResizerUnit.Bytes, 1, 100_000, 60, new AdHocDynamicCache(
+			() => 0,
+			mem => Interlocked.Exchange(ref cache1Mem, mem),
+			() => 1, // included in total free mem
+			() => { },
+			name: "cache1"));
+
+		var cache2 = new DynamicCacheResizer(ResizerUnit.Bytes, 2, 100_000, 40, new AdHocDynamicCache(
+			() => 0,
+			mem => Interlocked.Exchange(ref cache2Mem, mem),
+			() => 1, // included in total free mem
+			() => { },
+			name: "cache2"));
+
+		var freeSystemMemReq = 0;
+		var freeSystemMem = new[] { 100, 11 + (aboveKeepFreeMem ? 1 : 0) }; // included in total free mem
+
+		var freeHeapMemReq = 0;
+		var freeHeapMem = new[] { 0, 6 }; // included in total free mem
+
+		var sut = GenSut(
+			() => freeSystemMem[freeSystemMemReq++],
+			() => freeHeapMem[freeHeapMemReq++],
+			() => 0,
+			100,
+			percent,
+			bytes,
+			TimeSpan.MaxValue,
+			TimeSpan.MaxValue,
+			0,
+			new CompositeCacheResizer("root", 100, cache1, cache2));
+
+		sut.Handle(new MonitoringMessage.DynamicCacheManagerTick());
+
+		await TickPublished();
+
+		if (aboveKeepFreeMem) {
+			// caches not resized to minimum amount
+			Assert.AreNotEqual(1, Interlocked.Read(ref cache1Mem));
+			Assert.AreNotEqual(2, Interlocked.Read(ref cache2Mem));
+		} else {
+			// caches resized to minimum amount
+			Assert.AreEqual(1, Interlocked.Read(ref cache1Mem));
+			Assert.AreEqual(2, Interlocked.Read(ref cache2Mem));
+		}
+	}
+
+	[TestCase(true)]
+	[TestCase(false)]
+	public async Task caches_resized_depending_on_whether_min_resize_interval_was_exceeded(bool minResizeIntervalExceeded) {
+		long cache1Mem = -1, cache2Mem = -1;
+		var cache1 = new DynamicCacheResizer(ResizerUnit.Bytes, 1, 100_000, 60, new AdHocDynamicCache(
+			() => 0,
+			mem => Interlocked.Exchange(ref cache1Mem, mem), name: "cache1"));
+		var cache2 = new DynamicCacheResizer(ResizerUnit.Bytes, 2, 100_000, 40, new AdHocDynamicCache(
+			() => 0,
+			mem => Interlocked.Exchange(ref cache2Mem, mem), name: "cache2"));
+
+		var request = 0;
+		var freeMem = new[] { 100, 90 };
+
+		var sut = GenSut(
+			() => freeMem[request++],
+			() => 0,
+			() => 0,
+			100,
+			0,
+			0,
+			TimeSpan.MaxValue,
+			minResizeIntervalExceeded ? TimeSpan.Zero : TimeSpan.MaxValue,
+			0,
+			new CompositeCacheResizer("root", 100, cache1, cache2));
+
+		sut.Handle(new MonitoringMessage.DynamicCacheManagerTick());
+
+		await TickPublished();
+
+		if (minResizeIntervalExceeded) {
+			// caches resized according to 90% free memory
+			Assert.AreEqual(54, Interlocked.Read(ref cache1Mem));
+			Assert.AreEqual(36, Interlocked.Read(ref cache2Mem));
+		} else {
+			// caches not resized
+			Assert.AreNotEqual(54, Interlocked.Read(ref cache1Mem));
+			Assert.AreNotEqual(36, Interlocked.Read(ref cache2Mem));
+		}
+	}
+
+	[TestCase(20, 0, true)]
+	[TestCase(0, 20, false)]
+	public async Task caches_resized_depending_on_whether_min_resize_threshold_was_exceeded(int percent, long bytes, bool minResizeThresholdExceeded) {
+		long cache1Mem = -1, cache2Mem = -1;
+		var cache1 = new DynamicCacheResizer(ResizerUnit.Bytes, 1, 100_000, 60, new AdHocDynamicCache(
+			() => 0,
+			mem => Interlocked.Exchange(ref cache1Mem, mem), name: "cache1"));
+
+		var cache2 = new DynamicCacheResizer(ResizerUnit.Bytes, 2, 100_000, 40, new AdHocDynamicCache(
+			() => 0,
+			mem => Interlocked.Exchange(ref cache2Mem, mem), name: "cache2"));
+
+		var freeSystemMemReq = 0;
+		var freeSystemMem = new[] { 100, 19 };
+
+		var sut = GenSut(
+			() => freeSystemMem[freeSystemMemReq++],
+			() => 0,
+			() => 0,
+			100,
+			percent,
+			bytes,
+			TimeSpan.MaxValue,
+			TimeSpan.Zero,
+			minResizeThresholdExceeded ? 0 : 100,
+			new CompositeCacheResizer("root", 100, cache1, cache2));
+
+		sut.Handle(new MonitoringMessage.DynamicCacheManagerTick());
+
+		await TickPublished();
+
+		if (minResizeThresholdExceeded) {
+			// caches resized to minimum amount
+			Assert.AreEqual(1, Interlocked.Read(ref cache1Mem));
+			Assert.AreEqual(2, Interlocked.Read(ref cache2Mem));
+		} else {
+			// memory below keep free mem and min resize interval is zero
+			// but caches not resized to minimum amount due to high min resize threshold (100)
+			Assert.AreNotEqual(1, Interlocked.Read(ref cache1Mem));
+			Assert.AreNotEqual(2, Interlocked.Read(ref cache2Mem));
+		}
+	}
+
+	[Test]
+	public async Task freed_size_is_reset_when_gc_occurs() {
+		var tcs = new TaskCompletionSource<bool>();
+
+		var cache = new AdHocDynamicCache(
+			() => 0,
+			_ => { },
+			() => 0,
+			() => tcs.TrySetResult(true));
+
+		var cacheResizer = new DynamicCacheResizer(ResizerUnit.Bytes, 0, 100_000, 100, cache);
+
+		var sut = GenSut(
+			() => 100,
+			() => 0,
+			() => 1,
+			100,
+			0,
+			0,
+			TimeSpan.MaxValue,
+			TimeSpan.MaxValue,
+			0,
+			new CompositeCacheResizer("root", 100, cacheResizer));
+
+		sut.Handle(new MonitoringMessage.DynamicCacheManagerTick());
+		await TickPublished();
+
+		await tcs.Task.WithTimeout(1000);
+		Assert.True(tcs.Task.Result);
+	}
+
+	[Test]
+	public async Task available_memory_is_recalculated_when_gc_occurs() {
+		var cacheCapacity = -1L;
+
+		var cache = new AdHocDynamicCache(
+			() => 0,
+			x => Interlocked.Exchange(ref cacheCapacity, x));
+
+		var cacheResizer = new DynamicCacheResizer(ResizerUnit.Bytes, 0, 100_000, 100, cache);
+
+		var freeMemReq = 0;
+		var freeMem = new[] { 100 /* init */, 99 /* first calculation */, 98 /* second calculation */};
+
+		var gcCountReq = 0;
+		var gcCount = new[] { 0 /* init */, 0 /* reset freed size check */, 1 /* first calculation */, 1 /* second calculation */};
+
+		var sut = GenSut(
+			() => freeMem[freeMemReq++],
+			() => 0,
+			() => gcCount[gcCountReq++],
+			100,
+			20,
+			20,
+			TimeSpan.MaxValue,
+			TimeSpan.Zero,
+			0,
+			new CompositeCacheResizer("root", 100, cacheResizer));
+
+		sut.Handle(new MonitoringMessage.DynamicCacheManagerTick());
+		await TickPublished();
+
+		Assert.AreEqual(78, cacheCapacity);
+	}
+
+	[Test]
+	public void correct_stats_are_produced() {
+		var cache1 = new DynamicCacheResizer(ResizerUnit.Bytes, 10, 100_000, 100, new AdHocDynamicCache(
+			() => 12,
+			mem => { },
+			name: "test1"));
+		var cache2 = new StaticCacheResizer(ResizerUnit.Bytes, 15, new AdHocDynamicCache(
+			() => 10,
+			mem => { },
+			name: "test2"));
+
+		var sut = GenSut(
+			() => 58,
+			() => 0,
+			() => 0,
+			100,
+			0,
+			0,
+			TimeSpan.MaxValue,
+			TimeSpan.MaxValue,
+			0,
+			new CompositeCacheResizer("cache", 123, cache1, cache2));
+
+		var envelope = new FakeEnvelope();
+		sut.Handle(new MonitoringMessage.InternalStatsRequest(envelope));
+
+		Assert.AreEqual(1, envelope.Replies.Count);
+
+		var msg = (MonitoringMessage.InternalStatsRequestResponse)envelope.Replies.First();
+		var expectedStats = new Dictionary<string, object> {
+			{"es-cache-name", "cache"},
+			{"es-cache-sizeBytes", 22L},
+			{"es-cache-count", 22L},
+			{"es-cache-capacityBytes", 80L},
+			{"es-cache-utilizationPercent", 100.0 * 22 / 80},
+
+			{"es-cache-test1-name", "test1"},
+			{"es-cache-test1-sizeBytes", 12L},
+			{"es-cache-test1-count", 12L},
+			{"es-cache-test1-capacityBytes", 65L},
+			{"es-cache-test1-utilizationPercent", 100.0 * 12 / 65},
+
+			{"es-cache-test2-name", "test2"},
+			{"es-cache-test2-sizeBytes", 10L},
+			{"es-cache-test2-count", 10L},
+			{"es-cache-test2-capacityBytes", 15L},
+			{"es-cache-test2-utilizationPercent", 100.0 * 10 / 15},
+		};
+
+		CollectionAssert.AreEquivalent(expectedStats, msg.Stats);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Caching/EmptyDynamicCache.cs b/src/KurrentDB.Core.Tests/Caching/EmptyDynamicCache.cs
new file mode 100644
index 00000000000..f5eeea3185f
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Caching/EmptyDynamicCache.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Caching;
+
+namespace KurrentDB.Core.Tests.Caching;
+
+public class EmptyDynamicCache : IDynamicCache {
+	public static EmptyDynamicCache Instance { get; } = new();
+	public string Name => nameof(EmptyDynamicCache);
+	public long Capacity { get; private set; }
+
+	public void SetCapacity(long capacity) {
+		Capacity = capacity;
+	}
+
+	public void ResetFreedSize() {
+	}
+
+	public long Size => 0;
+	public long Count => 0;
+	public long FreedSize => 0;
+}
diff --git a/src/KurrentDB.Core.Tests/Caching/EventNumberCachedTests.cs b/src/KurrentDB.Core.Tests/Caching/EventNumberCachedTests.cs
new file mode 100644
index 00000000000..7010fd63a28
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Caching/EventNumberCachedTests.cs
@@ -0,0 +1,59 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Caching;
+using KurrentDB.Core.DataStructures;
+using NUnit.Framework;
+using EventNumberCached = KurrentDB.Core.Services.Storage.ReaderIndex.IndexBackend<string>.EventNumberCached;
+
+namespace KurrentDB.Core.Tests.Caching;
+
+public class EventNumberCachedTests {
+	[Test]
+	public void size_is_measured_correctly() {
+		var mem = MemUsage.Calculate(() =>
+			new EventNumberCached[] { // we need an array to force an allocation
+				new(10, 123)
+			}, out _);
+
+		Assert.AreEqual(mem, EventNumberCached.ApproximateSize + MemSizer.ArraySize);
+	}
+
+	[Test]
+	public void size_in_lru_cache_is_measured_correctly_with_string_key() {
+		var lruCache = new LRUCache<string, EventNumberCached>(string.Empty, 1, (_, _) => 0);
+
+		// initialize any underlying data structures (the dictionary in this case)
+		lruCache.Put("test", new EventNumberCached(0, 0));
+
+		var mem = MemUsage.Calculate(() =>
+			lruCache.Put(new string('x', 10), new EventNumberCached(10, 23)));
+
+		// internally, dictionary items are initialized in batches of ~4
+		// to keep the test simple, we just subtract the dictionary entry size
+		// to account for this already initialized entry.
+		Assert.AreEqual(mem,
+			LRUCache<string, EventNumberCached>.ApproximateItemSize(
+				MemSizer.SizeOf(new string('x', 10)), 0) -
+			MemSizer.SizeOfDictionaryEntry<string, LinkedListNode<EventNumberCached>>());
+	}
+
+	[Test]
+	public void size_in_lru_cache_is_measured_correctly_with_long_key() {
+		var lruCache = new LRUCache<long, EventNumberCached>(string.Empty, 1, (_, _) => 0);
+
+		// initialize any underlying data structures (the dictionary in this case)
+		lruCache.Put(123, new EventNumberCached(0, 0));
+
+		var mem = MemUsage.Calculate(() =>
+			lruCache.Put(456, new EventNumberCached(10, 123)));
+
+		// internally, dictionary items are initialized in batches of ~4
+		// to keep the test simple, we just subtract the dictionary entry size
+		// to account for this already initialized entry.
+		Assert.AreEqual(mem,
+			LRUCache<string, EventNumberCached>.ApproximateItemSize(0, 0) -
+			MemSizer.SizeOfDictionaryEntry<long, LinkedListNode<EventNumberCached>>());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Caching/LRUCacheTests.cs b/src/KurrentDB.Core.Tests/Caching/LRUCacheTests.cs
new file mode 100644
index 00000000000..4e423d26707
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Caching/LRUCacheTests.cs
@@ -0,0 +1,182 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.DataStructures;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Caching;
+
+[TestFixture]
+public class LRUCacheTests {
+
+	private static LRUCache<TKey, TValue> GenSut<TKey, TValue>(int capacity,
+		LRUCache<TKey, TValue>.CalculateItemSize calculateItemSize = null,
+		LRUCache<TKey, TValue>.CalculateFreedSize calculateFreedSize = null) =>
+		new(string.Empty, capacity, calculateItemSize, calculateFreedSize);
+
+	[Test]
+	public void can_add_and_read_item() {
+		var sut = GenSut<string, int>(3);
+
+		Assert.AreEqual(0, sut.Size);
+		Assert.AreEqual(3, sut.Capacity);
+
+		sut.Put("key", 1337);
+		Assert.AreEqual(1, sut.Size);
+
+		sut.TryGet("key", out var read);
+		Assert.AreEqual(1337, read);
+	}
+
+	[Test]
+	public void can_clear_items() {
+		var sut = GenSut<string, int>(10);
+
+		sut.Put("key1", 1);
+		sut.Put("key2", 2);
+		sut.Put("key3", 3);
+
+		sut.Clear();
+
+		Assert.False(sut.TryGet("key1", out _));
+		Assert.False(sut.TryGet("key2", out _));
+		Assert.False(sut.TryGet("key3", out _));
+	}
+
+	[Test]
+	public void least_recently_added_item_is_replaced_when_capacity_reached() {
+		var sut = GenSut<string, int>(2);
+
+		sut.Put("key1", 1);
+		sut.Put("key2", 1);
+		sut.Put("key3", 1);
+
+		Assert.False(sut.TryGet("key1", out _));
+		Assert.True(sut.TryGet("key2", out _));
+		Assert.True(sut.TryGet("key3", out _));
+	}
+
+	[Test]
+	public void least_recently_used_item_is_replaced_when_capacity_reached() {
+		var sut = GenSut<string, int>(2);
+
+		sut.Put("key1", 1);
+		sut.Put("key2", 1);
+
+		sut.TryGet("key1", out _);
+
+		sut.Put("key3", 1);
+
+		Assert.False(sut.TryGet("key2", out _));
+		Assert.True(sut.TryGet("key1", out _));
+		Assert.True(sut.TryGet("key3", out _));
+	}
+
+	public class WithCustomItemSizeCalculator {
+		private readonly LRUCache<int, int> _sut;
+
+		public WithCustomItemSizeCalculator() =>
+			_sut = GenSut<int, int>(7, (k, v) => k + v);
+
+		[Test]
+		public void size_is_correct_when_items_are_added() {
+			_sut.Put(1, 0);
+			Assert.AreEqual(1, _sut.Size);
+
+			_sut.Put(2, 0);
+			Assert.AreEqual(3, _sut.Size);
+
+			_sut.Put(3, 0);
+			Assert.AreEqual(6, _sut.Size);
+
+			_sut.Put(4, 0);
+			// 1 & 2 should be removed
+			Assert.AreEqual(7, _sut.Size);
+
+			_sut.Put(5, 0);
+			// 3 & 4 should be removed
+			Assert.AreEqual(5, _sut.Size);
+		}
+
+		[Test]
+		public void size_is_correct_when_items_are_updated() {
+			_sut.Put(1, 0);
+			_sut.Put(2, 0);
+			_sut.Put(3, 0);
+			_sut.Put(1, 6); // update should remove 2 & 3
+
+			Assert.AreEqual(7, _sut.Size);
+		}
+
+		[Test]
+		public void size_is_correct_when_items_are_cleared() {
+			_sut.Put(1, 0);
+			_sut.Put(2, 0);
+			_sut.Put(3, 0);
+
+			_sut.Clear();
+
+			Assert.AreEqual(0, _sut.Size);
+		}
+	}
+
+	public class WhenResizing {
+
+		[Test]
+		public void can_increase_capacity() {
+			var sut = GenSut<int, int>(6, (k, v) => k + v);
+
+			sut.Put(1, 0);
+			sut.Put(2, 0);
+			sut.Put(3, 0);
+
+			Assert.AreEqual(6, sut.Size);
+
+			sut.SetCapacity(10);
+
+			Assert.AreEqual(6, sut.Size);
+			Assert.AreEqual(10, sut.Capacity);
+		}
+
+		[Test]
+		public void can_decrease_capacity() {
+			var sut = GenSut<int, int>(6, (k, v) => k + v);
+
+			sut.Put(1, 0);
+			sut.Put(2, 0);
+			sut.Put(3, 0);
+
+			Assert.AreEqual(6, sut.Size);
+
+			sut.SetCapacity(3);
+
+			Assert.AreEqual(3, sut.Size);
+			Assert.AreEqual(3, sut.Capacity);
+		}
+
+		[Test]
+		public void can_set_capacity_to_zero() {
+			var sut = GenSut<int, int>(6, (k, v) => k + v);
+
+			sut.Put(1, 0);
+			sut.Put(2, 0);
+			sut.Put(3, 0);
+
+			Assert.AreEqual(6, sut.Size);
+
+			sut.SetCapacity(0);
+
+			Assert.AreEqual(0, sut.Size);
+			Assert.AreEqual(0, sut.Capacity);
+		}
+
+		[Test]
+		public void throws_when_setting_negative_capacity() {
+			var sut = GenSut<int, int>(6, (k, v) => k + v);
+
+			Assert.Throws<ArgumentOutOfRangeException>(() =>
+				sut.SetCapacity(-1));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Caching/MemSizerTests.cs b/src/KurrentDB.Core.Tests/Caching/MemSizerTests.cs
new file mode 100644
index 00000000000..a14b4d17518
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Caching/MemSizerTests.cs
@@ -0,0 +1,161 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Caching;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Caching;
+
+// these tests may break in the future if there are changes in the CLR.
+// the constants can then be adjusted accordingly.
+[TestFixture]
+public class MemSizerTests {
+
+	private class TestObject1 {
+		public readonly long TestField1;
+
+		public TestObject1() {
+			TestField1 = 0;
+		}
+	}
+
+	private class TestObject2 {
+		public readonly long TestField1;
+		public readonly long TestField2;
+
+		public TestObject2() {
+			TestField1 = 0;
+			TestField2 = 0;
+		}
+	}
+
+	private struct TestStruct {
+		public readonly long TestField1;
+		public readonly int TestField2;
+		public readonly bool TestField3;
+		public readonly int TestField4;
+
+		public TestStruct(long testField1, int testField2, bool testField3, int testField4) {
+			TestField1 = testField1;
+			TestField2 = testField2;
+			TestField3 = testField3;
+			TestField4 = testField4;
+		}
+	}
+
+	[Test]
+	public void object_header_size_is_correct() {
+		// .NET objects have a minimum size of 24 bytes, but the object header size is 16 bytes long.
+		// to be able to test the correctness of the object header size constant, we need to have at
+		// least one field in the object
+		Assert.AreEqual(
+			MemSizer.ObjectHeaderSize + sizeof(long),
+			MemUsage.Calculate(() => new TestObject1()));
+
+		Assert.AreEqual(
+			MemSizer.ObjectHeaderSize + 2 * sizeof(long),
+			MemUsage.Calculate(() => new TestObject2()));
+	}
+
+	[Test]
+	public void array_size_is_correct() {
+		Assert.AreEqual(
+			MemSizer.ArraySize,
+			MemUsage.Calculate(() => new object[0], out _));
+
+		Assert.AreEqual(
+			MemSizer.ArraySize,
+			MemUsage.Calculate(() => new string[0], out _));
+	}
+
+	[Test]
+	public void string_size_is_correct() {
+		var mem = MemUsage.Calculate(() => new string('x', 1234), out var s);
+		Assert.AreEqual(mem, MemSizer.SizeOf(s));
+	}
+
+	[Test]
+	public void empty_string_size_is_correct() {
+		var mem = MemUsage.Calculate(() => new string('x', 0), out var s);
+		Assert.AreEqual(mem, MemSizer.SizeOf(s));
+	}
+
+	[Test]
+	public void string_array_size_is_correct() {
+		var mem = MemUsage.Calculate(() => {
+			var s1 = new string('x', 123);
+			var s2 = new string('y', 321);
+			return new[] { s1, s2 };
+		}, out var arr);
+
+		Assert.AreEqual(mem, MemSizer.SizeOf(arr));
+	}
+
+	[TestCase("key", "value")]
+	[TestCase("key", 12)]
+	[TestCase("key", 12L)]
+	[TestCase(12, 12L)]
+	[TestCase(12L, 12)]
+	[TestCase("key", true)]
+	[TestCase(12, true)]
+	public void dictionary_entry_size_is_correct_with_primitives<TKey, TValue>(TKey key, TValue value) {
+		var mem3 = MemUsage.Calculate(() => new Dictionary<TKey, TValue>(3));
+		var mem7 = MemUsage.Calculate(() => new Dictionary<TKey, TValue>(7));
+
+		Assert.AreEqual(mem7 - mem3, MemSizer.SizeOfDictionaryEntry<TKey, TValue>() * 4);
+	}
+
+
+	[Test]
+	public void dictionary_entry_size_is_correct_with_object() {
+		var mem3 = MemUsage.Calculate(() => new Dictionary<string, TestObject2>(3));
+		var mem7 = MemUsage.Calculate(() => new Dictionary<string, TestObject2>(7));
+
+		Assert.AreEqual(mem7 - mem3, MemSizer.SizeOfDictionaryEntry<string, TestObject2>() * 4);
+	}
+
+	[Test]
+	public void dictionary_entry_size_is_correct_with_struct() {
+		var mem3 = MemUsage.Calculate(() => new Dictionary<string, TestStruct>(3));
+		var mem7 = MemUsage.Calculate(() => new Dictionary<string, TestStruct>(7));
+
+		Assert.AreEqual(mem7 - mem3, MemSizer.SizeOfDictionaryEntry<string, TestStruct>() * 4);
+	}
+
+	[TestCase("string")]
+	[TestCase(12)]
+	[TestCase(12L)]
+	[TestCase(true)]
+	public void linked_list_node_size_is_correct_with_primitives<T>(T item) {
+		var mem = MemUsage.Calculate(() => new LinkedListNode<T>(item));
+
+		Assert.AreEqual(mem, MemSizer.SizeOfLinkedListNode<T>());
+	}
+
+	[Test]
+	public void linked_list_node_size_is_correct_with_object() {
+		var x = new TestObject1();
+		var mem = MemUsage.Calculate(() => new LinkedListNode<TestObject1>(x));
+
+		Assert.AreEqual(mem, MemSizer.SizeOfLinkedListNode<TestObject1>());
+	}
+
+	[Test]
+	public void linked_list_node_size_is_correct_with_struct() {
+		var x = new TestStruct();
+		var mem = MemUsage.Calculate(() => new LinkedListNode<TestStruct>(x));
+
+		Assert.AreEqual(mem, MemSizer.SizeOfLinkedListNode<TestStruct>());
+	}
+
+	[Test]
+	public void linked_list_entry_size_is_correct() {
+		var linkedList = new LinkedList<string>();
+		var node = new LinkedListNode<string>("test");
+
+		var mem = MemUsage.Calculate(() => linkedList.AddLast(node));
+
+		Assert.AreEqual(mem, MemSizer.LinkedListEntrySize);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Caching/MemUsage.cs b/src/KurrentDB.Core.Tests/Caching/MemUsage.cs
new file mode 100644
index 00000000000..c5aa2eef660
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Caching/MemUsage.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Tests.Caching;
+
+public class MemUsage {
+	public static long Calculate<T>(Func<T> createObject, out T newObject) {
+		var memBefore = GC.GetAllocatedBytesForCurrentThread();
+		newObject = createObject();
+		var memAfter = GC.GetAllocatedBytesForCurrentThread();
+
+		return memAfter - memBefore;
+	}
+
+	public static long Calculate(Action createObject) {
+		return Calculate<object>(() => {
+			createObject();
+			return null;
+		}, out _);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Caching/MetadataCachedTests.cs b/src/KurrentDB.Core.Tests/Caching/MetadataCachedTests.cs
new file mode 100644
index 00000000000..72c50c8bbe3
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Caching/MetadataCachedTests.cs
@@ -0,0 +1,79 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using KurrentDB.Core.Caching;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.DataStructures;
+using NUnit.Framework;
+using MetadataCached = KurrentDB.Core.Services.Storage.ReaderIndex.IndexBackend<string>.MetadataCached;
+
+namespace KurrentDB.Core.Tests.Caching;
+
+public class MetadataCachedTests {
+	private static MetadataCached CreateMetadataCachedObject() =>
+		new(0, new StreamMetadata(
+			maxCount: 10,
+			maxAge: new TimeSpan(10),
+			truncateBefore: null,
+			tempStream: false,
+			cacheControl: null,
+			acl: new StreamAcl(
+				new[] { new string(' ', 1), new string(' ', 2) },
+				new[] { new string(' ', 0) },
+				null,
+				null,
+				new[] { new string(' ', 1), new string(' ', 3), new string(' ', 3), new string(' ', 7) }
+			)));
+
+	[Test]
+	public void size_is_measured_correctly() {
+		var mem = MemUsage.Calculate(() =>
+			new[] { // we need an array to force an allocation
+				CreateMetadataCachedObject()
+			}, out var metadata);
+
+		Assert.AreEqual(mem, metadata[0].ApproximateSize + MemSizer.ArraySize);
+	}
+
+	[Test]
+	public void size_in_lru_cache_is_measured_correctly_with_string_key() {
+		var lruCache = new LRUCache<string, MetadataCached>(string.Empty, 1, (_, _) => 0);
+
+		// initialize any underlying data structures (the dictionary in this case)
+		lruCache.Put("test", CreateMetadataCachedObject());
+
+		var mem = MemUsage.Calculate(() =>
+			lruCache.Put(new string('x', 10), CreateMetadataCachedObject()));
+
+		// internally, dictionary items are initialized in batches of ~4
+		// to keep the test simple, we just subtract the dictionary entry size
+		// to account for this already initialized entry.
+		var metadataCached = CreateMetadataCachedObject();
+		Assert.AreEqual(mem,
+			LRUCache<string, MetadataCached>.ApproximateItemSize(
+				MemSizer.SizeOf(new string('x', 10)), metadataCached.ApproximateSize - Unsafe.SizeOf<MetadataCached>()) -
+			MemSizer.SizeOfDictionaryEntry<string, LinkedListNode<MetadataCached>>());
+	}
+
+	[Test]
+	public void size_in_lru_cache_is_measured_correctly_with_long_key() {
+		var lruCache = new LRUCache<long, MetadataCached>(string.Empty, 1, (_, _) => 0);
+
+		// initialize any underlying data structures (the dictionary in this case)
+		lruCache.Put(123, CreateMetadataCachedObject());
+
+		var mem = MemUsage.Calculate(() =>
+			lruCache.Put(456, CreateMetadataCachedObject()));
+
+		// internally, dictionary items are initialized in batches of ~4
+		// to keep the test simple, we just subtract the dictionary entry size
+		// to account for this already initialized entry.
+		var metadataCached = CreateMetadataCachedObject();
+		Assert.AreEqual(mem,
+			LRUCache<string, MetadataCached>.ApproximateItemSize(0, metadataCached.ApproximateSize - Unsafe.SizeOf<MetadataCached>()) -
+			MemSizer.SizeOfDictionaryEntry<string, LinkedListNode<MetadataCached>>());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Certificates/ByteExtensions.cs b/src/KurrentDB.Core.Tests/Certificates/ByteExtensions.cs
new file mode 100644
index 00000000000..5649038b125
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Certificates/ByteExtensions.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Tests.Certificates;
+
+public static class ByteExtensions {
+	public static string PEM(this byte[] bytes, string label) {
+		return $"-----BEGIN {label}-----\n" + Convert.ToBase64String(bytes) + "\n" + $"-----END {label}-----\n";
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Certificates/CertificateExpiryMonitorTests.cs b/src/KurrentDB.Core.Tests/Certificates/CertificateExpiryMonitorTests.cs
new file mode 100644
index 00000000000..48a8c96b0b8
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Certificates/CertificateExpiryMonitorTests.cs
@@ -0,0 +1,86 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+using KurrentDB.Core.Certificates;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Fakes;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Certificates;
+
+
+public class CertificateExpiryMonitorTests : with_certificates {
+	private FakePublisher _publisher;
+	private FakeLogger _logger;
+
+	private static X509Certificate2 GenCertificate(TimeSpan timeUntilExpiry) {
+		using var rsa = RSA.Create();
+		var certificate = new CertificateRequest(GenerateSubject(), rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1)
+			.CreateSelfSigned(
+				notBefore: DateTime.Now,
+				notAfter: DateTime.Now + timeUntilExpiry);
+		return certificate;
+	}
+
+	[SetUp]
+	public void SetUp() {
+		_publisher = new();
+		_logger = new();
+	}
+
+	[Test]
+	public void on_start() {
+		// given
+		var certificate = GenCertificate(TimeSpan.FromDays(60));
+		var sut = new CertificateExpiryMonitor(_publisher, () => certificate, _logger);
+
+		// when
+		sut.Handle(new SystemMessage.SystemStart());
+
+		// then
+		Assert.IsInstanceOf<MonitoringMessage.CheckCertificateExpiry>(_publisher.Messages.Single());
+		Assert.IsEmpty(_logger.LogMessages);
+	}
+
+	[Test]
+	public void certificate_is_going_to_expire_within_30_days() {
+		// given
+		var certificate = GenCertificate(TimeSpan.FromDays(29));
+		var sut = new CertificateExpiryMonitor(_publisher, () => certificate, _logger);
+
+		// when
+		sut.Handle(new MonitoringMessage.CheckCertificateExpiry());
+
+		// then
+		var schedule = (TimerMessage.Schedule)_publisher.Messages.Single();
+		Assert.AreEqual(TimeSpan.FromHours(24), schedule.TriggerAfter);
+		Assert.IsInstanceOf<MonitoringMessage.CheckCertificateExpiry>(schedule.ReplyMessage);
+
+		var logMessage = _logger.LogMessages.Single();
+		Assert.AreEqual(
+			"Certificates are going to expire in 29.0 days",
+			logMessage.RenderMessage());
+	}
+
+	[Test]
+	public void certificate_is_not_going_to_expire_within_30_days() {
+		// given
+		var certificate = GenCertificate(TimeSpan.FromDays(31));
+		var sut = new CertificateExpiryMonitor(_publisher, () => certificate, _logger);
+
+		// when
+		sut.Handle(new MonitoringMessage.CheckCertificateExpiry());
+
+		// then
+		var schedule = (TimerMessage.Schedule)_publisher.Messages.Single();
+		Assert.AreEqual(TimeSpan.FromHours(24), schedule.TriggerAfter);
+		Assert.IsInstanceOf<MonitoringMessage.CheckCertificateExpiry>(schedule.ReplyMessage);
+
+		Assert.IsEmpty(_logger.LogMessages);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Certificates/X509Certificate2Extensions.cs b/src/KurrentDB.Core.Tests/Certificates/X509Certificate2Extensions.cs
new file mode 100644
index 00000000000..0c2bf958271
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Certificates/X509Certificate2Extensions.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+
+namespace KurrentDB.Core.Tests.Certificates;
+
+public static class X509Certificate2Extensions {
+	public static string PemPrivateKey(this X509Certificate2 certificate) {
+		return certificate.GetRSAPrivateKey()!.ExportRSAPrivateKey().PEM("RSA PRIVATE KEY");
+	}
+
+	public static string PemPkcs8PrivateKey(this X509Certificate2 certificate) {
+		return certificate.GetRSAPrivateKey()!.ExportPkcs8PrivateKey().PEM("PRIVATE KEY");
+	}
+
+	public static string EncryptedPemPkcs8PrivateKey(this X509Certificate2 certificate, string password) {
+		return certificate.GetRSAPrivateKey()!.ExportEncryptedPkcs8PrivateKey(password.AsSpan(), new PbeParameters(PbeEncryptionAlgorithm.Aes128Cbc, HashAlgorithmName.SHA1, 1)).PEM("ENCRYPTED PRIVATE KEY");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Certificates/certificate_validity_checks.cs b/src/KurrentDB.Core.Tests/Certificates/certificate_validity_checks.cs
new file mode 100644
index 00000000000..ad564b341cf
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Certificates/certificate_validity_checks.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Certificates;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Certificates;
+
+public class validity_checks_for_chain_of_length_1 : with_certificate_chain_of_length_1 {
+	[Test]
+	public void leaf_is_valid_node_certificate() => Assert.True(CertificateUtils.IsValidNodeCertificate(_leaf, out _));
+
+	[Test]
+	public void leaf_is_not_valid_intermediate() => Assert.False(CertificateUtils.IsValidIntermediateCertificate(_leaf, out _));
+
+	[Test]
+	public void leaf_is_valid_root() => Assert.True(CertificateUtils.IsValidRootCertificate(_leaf, out _));
+}
+
+public class validity_checks_for_chain_of_length_2 : with_certificate_chain_of_length_2 {
+	[Test]
+	public void leaf_is_valid_node_certificate() => Assert.True(CertificateUtils.IsValidNodeCertificate(_leaf, out _));
+
+	[Test]
+	public void leaf_is_valid_intermediate() => Assert.True(CertificateUtils.IsValidIntermediateCertificate(_leaf, out _));
+
+	[Test]
+	public void leaf_is_not_valid_root() => Assert.False(CertificateUtils.IsValidRootCertificate(_leaf, out _));
+
+	[Test]
+	public void root_is_not_valid_node_certificate() => Assert.False(CertificateUtils.IsValidNodeCertificate(_root, out _));
+
+	[Test]
+	public void root_is_not_valid_intermediate() => Assert.False(CertificateUtils.IsValidIntermediateCertificate(_root, out _));
+
+	[Test]
+	public void root_is_valid_root() => Assert.True(CertificateUtils.IsValidRootCertificate(_root, out _));
+}
+
+public class validity_checks_for_chain_of_length_3 : with_certificate_chain_of_length_3 {
+	[Test]
+	public void leaf_is_valid_node_certificate() => Assert.True(CertificateUtils.IsValidNodeCertificate(_leaf, out _));
+
+	[Test]
+	public void leaf_is_valid_intermediate() => Assert.True(CertificateUtils.IsValidIntermediateCertificate(_leaf, out _));
+
+	[Test]
+	public void leaf_is_not_valid_root() => Assert.False(CertificateUtils.IsValidRootCertificate(_leaf, out _));
+
+	[Test]
+	public void intermediate_is_not_valid_node_certificate() => Assert.False(CertificateUtils.IsValidNodeCertificate(_intermediate, out _));
+
+	[Test]
+	public void intermediate_is_valid_intermediate() => Assert.True(CertificateUtils.IsValidIntermediateCertificate(_intermediate, out _));
+
+	[Test]
+	public void intermediate_is_not_valid_root() => Assert.False(CertificateUtils.IsValidRootCertificate(_intermediate, out _));
+
+	[Test]
+	public void root_is_not_valid_node_certificate() => Assert.False(CertificateUtils.IsValidNodeCertificate(_root, out _));
+
+	[Test]
+	public void root_is_not_valid_intermediate() => Assert.False(CertificateUtils.IsValidIntermediateCertificate(_root, out _));
+
+	[Test]
+	public void root_is_valid_root() => Assert.True(CertificateUtils.IsValidRootCertificate(_root, out _));
+}
diff --git a/src/KurrentDB.Core.Tests/Certificates/chain_building.cs b/src/KurrentDB.Core.Tests/Certificates/chain_building.cs
new file mode 100644
index 00000000000..22403923329
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Certificates/chain_building.cs
@@ -0,0 +1,101 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Cryptography.X509Certificates;
+using KurrentDB.Core.Certificates;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Certificates;
+
+public class with_valid_chain_of_length_2 : with_certificate_chain_of_length_2 {
+	[Test]
+	public void builds_with_no_error() {
+		var chainStatus = CertificateUtils.BuildChain(
+			_leaf,
+			new X509Certificate2Collection(),
+			new X509Certificate2Collection(_root), out _);
+		Assert.True(chainStatus == X509ChainStatusFlags.NoError);
+	}
+}
+
+public class with_valid_chain_of_length_3 : with_certificate_chain_of_length_3 {
+	[Test]
+	public void builds_with_no_error() {
+		var chainStatus = CertificateUtils.BuildChain(
+			_leaf,
+			new X509Certificate2Collection(_intermediate),
+			new X509Certificate2Collection(_root), out _);
+		Assert.True(chainStatus == X509ChainStatusFlags.NoError);
+	}
+}
+
+public class with_expired_root_certificate : with_certificate_chain_of_length_3 {
+	public with_expired_root_certificate() : base(rootExpired: true) { }
+
+	[Test]
+	public void builds_with_not_time_valid() {
+		var chainStatus = CertificateUtils.BuildChain(
+			_leaf,
+			new X509Certificate2Collection(_intermediate),
+			new X509Certificate2Collection(_root), out _);
+		Assert.True(chainStatus == X509ChainStatusFlags.NotTimeValid);
+	}
+}
+
+public class with_expired_intermediate_certificate : with_certificate_chain_of_length_3 {
+	public with_expired_intermediate_certificate() : base(intermediateExpired: true) { }
+	[Test]
+	public void builds_with_not_time_valid() {
+		var chainStatus = CertificateUtils.BuildChain(
+			_leaf,
+			new X509Certificate2Collection(_intermediate),
+			new X509Certificate2Collection(_root), out _);
+		Assert.True(chainStatus == X509ChainStatusFlags.NotTimeValid);
+	}
+}
+
+public class with_expired_leaf_certificate : with_certificate_chain_of_length_3 {
+	public with_expired_leaf_certificate() : base(leafExpired: true) { }
+
+	[Test]
+	public void builds_with_not_time_valid() {
+		var chainStatus = CertificateUtils.BuildChain(
+			_leaf,
+			new X509Certificate2Collection(_intermediate),
+			new X509Certificate2Collection(_root), out _);
+		Assert.True(chainStatus == X509ChainStatusFlags.NotTimeValid);
+	}
+}
+
+public class without_intermediate_certificate : with_certificate_chain_of_length_3 {
+	[Test]
+	public void builds_with_partial_chain() {
+		var chainStatus = CertificateUtils.BuildChain(
+			_leaf,
+			new X509Certificate2Collection(),
+			new X509Certificate2Collection(_root), out _);
+		Assert.True(chainStatus == X509ChainStatusFlags.PartialChain);
+	}
+}
+
+public class without_root_certificate : with_certificate_chain_of_length_3 {
+	[Test]
+	public void builds_with_partial_chain() {
+		var chainStatus = CertificateUtils.BuildChain(
+			_leaf,
+			new X509Certificate2Collection(_intermediate),
+			new X509Certificate2Collection(), out _);
+		Assert.True(chainStatus == X509ChainStatusFlags.PartialChain);
+	}
+}
+
+public class with_untrusted_root : with_certificate_chain_of_length_3 {
+	[Test]
+	public void builds_with_untrusted_root() {
+		var chainStatus = CertificateUtils.BuildChain(
+			_leaf,
+			new X509Certificate2Collection(new[] { _intermediate, _root }),
+			new X509Certificate2Collection(), out _);
+		Assert.True(chainStatus == X509ChainStatusFlags.UntrustedRoot);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Certificates/key_usages.cs b/src/KurrentDB.Core.Tests/Certificates/key_usages.cs
new file mode 100644
index 00000000000..14ce603a61b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Certificates/key_usages.cs
@@ -0,0 +1,114 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+using KurrentDB.Common.Utils;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Certificates;
+
+public class key_usages {
+	private readonly Oid _serverAuth = Oid.FromOidValue("1.3.6.1.5.5.7.3.1", OidGroup.EnhancedKeyUsage);
+	private readonly Oid _clientAuth = Oid.FromOidValue("1.3.6.1.5.5.7.3.2", OidGroup.EnhancedKeyUsage);
+	private const X509KeyUsageFlags DefaultKeyUsages = X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.KeyEncipherment;
+
+	private static X509Certificate2 GenSut(X509KeyUsageFlags keyUsages, OidCollection extendedKeyUsages) {
+		using (RSA rsa = RSA.Create()) {
+			var certReq =
+				new CertificateRequest("CN=hello", rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
+
+			var keyUsageExtension = new X509KeyUsageExtension(keyUsages, false);
+			var extendedKeyUsageExtension = new X509EnhancedKeyUsageExtension(extendedKeyUsages, false);
+
+			certReq.CertificateExtensions.Add(keyUsageExtension);
+
+			if (extendedKeyUsages.Count != 0)
+				certReq.CertificateExtensions.Add(extendedKeyUsageExtension);
+
+			return certReq.CreateSelfSigned(DateTimeOffset.UtcNow.AddMonths(-1),
+				DateTimeOffset.UtcNow.AddMonths(1));
+		}
+	}
+
+	private static OidCollection GenOids(params Oid[] oids) {
+		var oidCollection = new OidCollection();
+		foreach (var oid in oids) {
+			oidCollection.Add(oid);
+		}
+
+		return oidCollection;
+	}
+
+	[Test]
+	public void certificate_with_client_auth_eku() {
+		var sut = GenSut(
+			keyUsages: DefaultKeyUsages,
+			extendedKeyUsages: GenOids(_clientAuth));
+
+		Assert.True(sut.IsClientCertificate(out _));
+		Assert.False(sut.IsServerCertificate(out _));
+	}
+
+	[Test]
+	public void certificate_with_client_and_server_auth_eku() {
+		var sut = GenSut(
+			keyUsages: DefaultKeyUsages,
+			extendedKeyUsages: GenOids(_clientAuth, _serverAuth));
+
+		Assert.True(sut.IsServerCertificate(out _));
+		Assert.True(sut.IsClientCertificate(out _));
+	}
+
+	[Test]
+	public void certificate_with_server_auth_eku_only() {
+		var sut = GenSut(
+			keyUsages: DefaultKeyUsages,
+			extendedKeyUsages: GenOids(_serverAuth));
+
+		// historically, server certificates also have the clientAuth EKU
+		Assert.False(sut.IsServerCertificate(out _));
+		Assert.False(sut.IsClientCertificate(out _));
+	}
+
+	[Test]
+	public void certificate_with_no_ekus() {
+		var sut = GenSut(
+			keyUsages: DefaultKeyUsages,
+			extendedKeyUsages: GenOids());
+
+		Assert.True(sut.IsServerCertificate(out _));
+		Assert.False(sut.IsClientCertificate(out _));
+	}
+
+	[Test]
+	public void certificate_with_no_key_usage() {
+		var sut = GenSut(
+			keyUsages: X509KeyUsageFlags.None,
+			extendedKeyUsages: GenOids(_clientAuth, _serverAuth));
+
+		Assert.False(sut.IsClientCertificate(out _));
+		Assert.False(sut.IsServerCertificate(out _));
+	}
+
+	[Test]
+	public void certificate_with_missing_key_usage() {
+		var sut = GenSut(
+			keyUsages: X509KeyUsageFlags.KeyEncipherment,
+			extendedKeyUsages: GenOids(_clientAuth, _serverAuth));
+
+		Assert.False(sut.IsClientCertificate(out _));
+		Assert.False(sut.IsServerCertificate(out _));
+	}
+
+	[Test]
+	public void certificate_with_key_agreement_instead_of_key_encipherment_key_usage() {
+		var sut = GenSut(
+			keyUsages: X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.KeyAgreement,
+			extendedKeyUsages: GenOids(_clientAuth, _serverAuth));
+
+		Assert.True(sut.IsClientCertificate(out _));
+		Assert.True(sut.IsServerCertificate(out _));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Certificates/name_matching.cs b/src/KurrentDB.Core.Tests/Certificates/name_matching.cs
new file mode 100644
index 00000000000..f1a358f89a3
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Certificates/name_matching.cs
@@ -0,0 +1,316 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+using KurrentDB.Common.Utils;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Certificates;
+
+public class name_matching {
+	private X509Certificate2 GenSut(string subjectName, (string name, string type)[] sans) {
+		using (RSA rsa = RSA.Create()) {
+			var certReq = new CertificateRequest(subjectName, rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
+			var sanBuilder = new SubjectAlternativeNameBuilder();
+			foreach (var (name, type) in sans) {
+				switch (type) {
+					case CertificateNameType.IpAddress:
+						sanBuilder.AddIpAddress(IPAddress.Parse(name));
+						break;
+					case CertificateNameType.DnsName:
+						sanBuilder.AddDnsName(name);
+						break;
+				}
+			}
+
+			certReq.CertificateExtensions.Add(sanBuilder.Build());
+			return certReq.CreateSelfSigned(DateTimeOffset.UtcNow.AddMonths(-1), DateTimeOffset.UtcNow.AddMonths(1));
+		}
+	}
+
+	[Test]
+	public void ip_address_matches_ip_san() {
+		var sut = GenSut("CN=test", new[] {
+				("10.123.45.6", CertificateNameType.IpAddress)
+		});
+
+		Assert.True(sut.MatchesName("10.123.45.6"));
+		Assert.False(sut.MatchesName("10.13.45.6"));
+	}
+
+	[Test]
+	public void dns_name_matches_dns_san() {
+		var sut = GenSut("CN=test", new[] {
+			("subdomain.domain.com", CertificateNameType.DnsName)
+		});
+
+		Assert.True(sut.MatchesName("subdomain.domain.com"));
+
+		Assert.False(sut.MatchesName("com"));
+		Assert.False(sut.MatchesName("domain.com"));
+		Assert.False(sut.MatchesName("subdomain"));
+		Assert.False(sut.MatchesName("subdomain.domain"));
+		Assert.False(sut.MatchesName("subdomain.domain.coms"));
+		Assert.False(sut.MatchesName("1subdomain.domain.com"));
+		Assert.False(sut.MatchesName("sub.subdomain.domain.com"));
+	}
+
+	[Test]
+	public void dns_name_matches_dns_san_case_insensitive() {
+		var sut = GenSut("CN=test", new[] {
+			("website.tld", CertificateNameType.DnsName)
+		});
+
+		Assert.True(sut.MatchesName("WeBsIte.tLd"));
+	}
+
+	[Test]
+	public void cn_is_ignored_when_dns_san_is_present() {
+		var sut = GenSut("CN=test", new[] {
+			("website.tld", CertificateNameType.DnsName)
+		});
+
+		Assert.False(sut.MatchesName("test"));
+	}
+
+	[Test]
+	public void cn_is_ignored_when_ip_san_is_present() {
+		var sut = GenSut("CN=test", new[] {
+			("127.0.0.1", CertificateNameType.IpAddress)
+		});
+
+		Assert.False(sut.MatchesName("test"));
+	}
+
+	[Test]
+	public void cn_is_considered_when_no_san_is_present() {
+		var sut = GenSut("CN=test", Array.Empty<(string name, string type)>());
+		Assert.True(sut.MatchesName("test"));
+	}
+
+	[Test]
+	public void dns_name_matches_cn_case_insensitive() {
+		var sut = GenSut("CN=subdomain.domain.com", Array.Empty<(string name, string type)>());
+		Assert.True(sut.MatchesName("SubDomain.DoMaiN.COm"));
+	}
+
+	[Test]
+	public void cn_matches_when_subject_name_contains_other_fields() {
+		var sut = GenSut("CN=a.b.c,OU=Engineering,O=Company, C=Country", Array.Empty<(string name, string type)>());
+		Assert.True(sut.MatchesName("a.b.c"));
+		Assert.False(sut.MatchesName("a.b.c,OU"));
+	}
+
+	[Test]
+	public void dns_name_matches_wildcard_cn() {
+		var sut = GenSut("CN=*.example.com", Array.Empty<(string name, string type)>());
+
+		Assert.True(sut.MatchesName("foo.example.com"));
+
+		Assert.False(sut.MatchesName(".example.com"));
+		Assert.False(sut.MatchesName("bar.foo.example.com"));
+		Assert.False(sut.MatchesName("foo"));
+		Assert.False(sut.MatchesName("foo.example"));
+	}
+
+	[Test]
+	public void dns_name_does_not_match_wildcard_cn_with_less_than_three_domain_labels() {
+		var sut = GenSut("CN=*", Array.Empty<(string name, string type)>());
+		Assert.False(sut.MatchesName("tld"));
+
+		sut = GenSut("CN=*.com", Array.Empty<(string name, string type)>());
+		Assert.False(sut.MatchesName("example.com"));
+	}
+
+	[Test]
+	public void dns_name_matches_wildcard_cn_with_four_domain_labels() {
+		var sut = GenSut("CN=*.test.example.com", Array.Empty<(string name, string type)>());
+		Assert.True(sut.MatchesName("abc.test.example.com"));
+	}
+
+	[Test]
+	public void dns_name_matches_wildcard_dns_san() {
+		var sut = GenSut("CN=test", new[] {
+			("*.example.com", CertificateNameType.DnsName)
+		});
+
+		Assert.True(sut.MatchesName("foo.example.com"));
+
+		Assert.False(sut.MatchesName(".example.com"));
+		Assert.False(sut.MatchesName("bar.foo.example.com"));
+		Assert.False(sut.MatchesName("foo"));
+		Assert.False(sut.MatchesName("foo.example"));
+	}
+
+	[Test]
+	public void dns_name_matches_wildcard_dns_san_case_insensitive() {
+		var sut = GenSut("CN=test", new[] {
+			("*.example.com", CertificateNameType.DnsName)
+		});
+
+		Assert.True(sut.MatchesName("ABcdEF.ExAmPle.CoM"));
+	}
+
+	[Test]
+	public void dns_name_does_not_match_partial_wildcard_prefix_dns_san() {
+		var sut = GenSut("CN=test", new[] {
+			("*s.abcd", CertificateNameType.DnsName)
+		});
+
+		Assert.False(sut.MatchesName("s.abcd"));
+		Assert.False(sut.MatchesName("tests.abcd"));
+	}
+
+	[Test]
+	public void dns_name_does_not_match_partial_wildcard_suffix_dns_san() {
+		var sut = GenSut("CN=test", new[] {
+			("t*.abc", CertificateNameType.DnsName)
+		});
+
+		Assert.False(sut.MatchesName("t.abc"));
+		Assert.False(sut.MatchesName("test.abc"));
+	}
+
+	[Test]
+	public void dns_name_does_not_match_partial_wildcard_dns_san() {
+		var sut = GenSut("CN=test", new[] {
+			("abc*def.tld", CertificateNameType.DnsName)
+		});
+
+		Assert.False(sut.MatchesName("abcdef.tld"));
+		Assert.False(sut.MatchesName("abcHELLOdef.tld"));
+	}
+
+	[Test]
+	public void dns_name_does_not_match_wildcard_in_non_first_dns_san_label() {
+		var sut = GenSut("CN=test", new[] {
+			("hello.*.com", CertificateNameType.DnsName)
+		});
+
+		Assert.False(sut.MatchesName("hello.test.com"));
+		Assert.False(sut.MatchesName("hello.*.com"));
+	}
+
+	[Test]
+	public void dns_name_does_not_match_multiple_wildcards_in_first_dns_san_label() {
+		var sut = GenSut("CN=test", new[] {
+			("a*bc*d.test.com", CertificateNameType.DnsName)
+		});
+
+		Assert.False(sut.MatchesName("a*bc*d.test.com"));
+		Assert.False(sut.MatchesName("abcd.test.com"));
+		Assert.False(sut.MatchesName("a1bc2d.test.com"));
+	}
+
+	[Test]
+	public void invalid_dns_name_does_not_match_wildcard_dns_san() {
+		var sut = GenSut("CN=test", new[] {
+			("*.example.com", CertificateNameType.DnsName)
+		});
+
+		Assert.False(sut.MatchesName("*.example.com"));
+		Assert.False(sut.MatchesName("te+st.example.com"));
+		Assert.False(sut.MatchesName("te$st.example.com"));
+		Assert.False(sut.MatchesName("te=st.example.com"));
+	}
+
+	[Test]
+	public void ip_address_does_not_match_wildcard_dns_san() {
+		var sut = GenSut("CN=test", new[] {
+			("*", CertificateNameType.DnsName)
+		});
+
+		Assert.False(sut.MatchesName("127.0.0.1"));
+	}
+
+	[Test]
+	public void ip_address_does_not_match_wildcard_cn() {
+		var sut = GenSut("CN=*", Array.Empty<(string name, string type)>());
+		Assert.False(sut.MatchesName("127.0.0.1"));
+	}
+
+	[Test]
+	public void dns_name_matches_internationalized_dns_san() {
+		var sut = GenSut("CN=test", new[] {
+			("سلام", CertificateNameType.DnsName),
+			("和平.tld", CertificateNameType.DnsName),
+			("world.สันติภาพ.com", CertificateNameType.DnsName)
+		});
+
+		Assert.True(sut.MatchesName("سلام"));
+		Assert.True(sut.MatchesName("xn--mgbx5cf"));
+
+		Assert.True(sut.MatchesName("和平.tld"));
+		Assert.True(sut.MatchesName("xn--0tr63u.tld"));
+
+		Assert.True(sut.MatchesName("world.สันติภาพ.com"));
+		Assert.True(sut.MatchesName("world.xn--m3chqh1c2bko.com"));
+	}
+
+	[Test]
+	public void dns_name_matches_internationalized_dns_san_with_ace_prefix() {
+		var sut = GenSut("CN=test", new[] {
+			("xn--mgbx5cf", CertificateNameType.DnsName),
+			("xn--0tr63u.tld", CertificateNameType.DnsName),
+			("world.xn--m3chqh1c2bko.com", CertificateNameType.DnsName)
+		});
+
+		Assert.True(sut.MatchesName("سلام"));
+		Assert.True(sut.MatchesName("xn--mgbx5cf"));
+
+		Assert.True(sut.MatchesName("和平.tld"));
+		Assert.True(sut.MatchesName("xn--0tr63u.tld"));
+
+		Assert.True(sut.MatchesName("world.สันติภาพ.com"));
+		Assert.True(sut.MatchesName("world.xn--m3chqh1c2bko.com"));
+	}
+
+	[Test]
+	public void dns_name_matches_internationalized_dns_san_case_insensitive() {
+		var sut = GenSut("CN=test", new[] {
+			("سلام", CertificateNameType.DnsName)
+		});
+
+		Assert.True(sut.MatchesName("Xn--MgBx5Cf"));
+	}
+
+	[Test]
+	public void dns_name_matches_internationalized_cn() {
+		var sut = GenSut("CN=xn--mgbx5cf", Array.Empty<(string name, string type)>());
+		Assert.True(sut.MatchesName("سلام"));
+		Assert.True(sut.MatchesName("xn--mgbx5cf"));
+	}
+
+	[Test]
+	public void dns_name_matches_internationalized_cn_case_insensitive() {
+		var sut = GenSut("CN=xn--mgbx5cf", Array.Empty<(string name, string type)>());
+		Assert.True(sut.MatchesName("Xn--MgBx5Cf"));
+	}
+
+	[Test]
+	public void dns_name_matches_wildcard_internationalized_dns_san() {
+		var sut = GenSut("CN=test", new[] {
+			("*.สันติภาพ.com", CertificateNameType.DnsName)
+		});
+
+		Assert.True(sut.MatchesName("world.สันติภาพ.com"));
+		Assert.True(sut.MatchesName("world.xn--m3chqh1c2bko.com"));
+
+		Assert.True(sut.MatchesName("สันติภาพ.สันติภาพ.com"));
+		Assert.True(sut.MatchesName("xn--m3chqh1c2bko.xn--m3chqh1c2bko.com"));
+	}
+
+	[Test]
+	public void dns_name_does_not_match_internationalized_dns_san_with_illegal_wildcard_characters() {
+		var sut = GenSut("CN=test", new[] {
+			("*.สันติภาพ*.com", CertificateNameType.DnsName),
+			("*.xn--*-yxflvj1d7blq.com", CertificateNameType.DnsName)
+		});
+
+		Assert.False(sut.MatchesName("world.สันติภาพ*.com"));
+		Assert.False(sut.MatchesName("world.xn--*-yxflvj1d7blq.com"));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Certificates/subject_alternative_names.cs b/src/KurrentDB.Core.Tests/Certificates/subject_alternative_names.cs
new file mode 100644
index 00000000000..8a385d5b8a0
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Certificates/subject_alternative_names.cs
@@ -0,0 +1,107 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Net;
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+using KurrentDB.Common.Utils;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Certificates;
+
+public class subject_alternative_names {
+	private X509Certificate2 GenSut((string name, string type)[] sans) {
+		using (RSA rsa = RSA.Create()) {
+			var certReq = new CertificateRequest("CN=hello", rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
+			var sanBuilder = new SubjectAlternativeNameBuilder();
+			foreach (var (name, type) in sans) {
+				switch (type) {
+					case CertificateNameType.IpAddress:
+						sanBuilder.AddIpAddress(IPAddress.Parse(name));
+						break;
+					case CertificateNameType.DnsName:
+						sanBuilder.AddDnsName(name);
+						break;
+					case "email":
+						sanBuilder.AddEmailAddress(name);
+						break;
+					case "uri":
+						sanBuilder.AddUri(new Uri(name));
+						break;
+					case "upn":
+						sanBuilder.AddUserPrincipalName(name);
+						break;
+				}
+			}
+
+			certReq.CertificateExtensions.Add(sanBuilder.Build());
+			return certReq.CreateSelfSigned(DateTimeOffset.UtcNow.AddMonths(-1), DateTimeOffset.UtcNow.AddMonths(1));
+		}
+	}
+
+	[Test]
+	public void can_read_one_ip_address_from_san() {
+		var sut = GenSut(new[] { ("127.0.0.1", CertificateNameType.IpAddress) });
+		var sans = sut.GetSubjectAlternativeNames().ToArray();
+		Assert.AreEqual(1, sans.Length);
+		Assert.AreEqual("127.0.0.1", sans[0].name);
+		Assert.AreEqual(CertificateNameType.IpAddress, sans[0].type);
+	}
+
+	[Test]
+	public void can_read_one_dns_name_from_san() {
+		var sut = GenSut(new[] { ("hello.world", CertificateNameType.DnsName) });
+		var sans = sut.GetSubjectAlternativeNames().ToArray();
+		Assert.AreEqual(1, sans.Length);
+		Assert.AreEqual("hello.world", sans[0].name);
+		Assert.AreEqual(CertificateNameType.DnsName, sans[0].type);
+	}
+
+	[Test]
+	public void can_read_multiple_ips_and_dns_names_from_san() {
+		var sut = GenSut(new[] {
+			("127.0.0.1", CertificateNameType.IpAddress),
+			("hello.world", CertificateNameType.DnsName),
+			("10.0.0.2", CertificateNameType.IpAddress),
+			("good.bye.world", CertificateNameType.DnsName)
+		});
+		var sans = sut.GetSubjectAlternativeNames().ToArray();
+		Assert.AreEqual(4, sans.Length);
+		Assert.AreEqual(new[] { "10.0.0.2", "127.0.0.1" },
+			sans.Where(san => san.type == CertificateNameType.IpAddress)
+				.Select(x => x.name)
+				.OrderBy(x => x).ToArray());
+		Assert.AreEqual(new[] { "good.bye.world", "hello.world" },
+			sans.Where(san => san.type == CertificateNameType.DnsName)
+				.Select(x => x.name)
+				.OrderBy(x => x).ToArray());
+	}
+
+	[Test]
+	public void can_read_multiple_ips_and_dns_names_from_san_with_other_name_types() {
+		var sut = GenSut(new[] {
+			("https://uritest/path", "uri"),
+			("127.0.0.1", CertificateNameType.IpAddress),
+			("test@test.com", "email"),
+			("hello.world", CertificateNameType.DnsName),
+			("https://hello.com/test", "uri"),
+			("10.0.0.2", CertificateNameType.IpAddress),
+			("user@domain.com", "upn"),
+			("good.bye.world", CertificateNameType.DnsName),
+			("test2@test2.com", "email"),
+		});
+		var sans = sut.GetSubjectAlternativeNames().ToArray();
+		Assert.AreEqual(4, sans.Length);
+		Assert.AreEqual(new[] { "10.0.0.2", "127.0.0.1" },
+			sans.Where(san => san.type == CertificateNameType.IpAddress)
+				.Select(x => x.name)
+				.OrderBy(x => x).ToArray());
+		Assert.AreEqual(new[] { "good.bye.world", "hello.world" },
+			sans.Where(san => san.type == CertificateNameType.DnsName)
+				.Select(x => x.name)
+				.OrderBy(x => x).ToArray());
+	}
+
+}
diff --git a/src/KurrentDB.Core.Tests/Certificates/with_certificate_chain_of_length_1.cs b/src/KurrentDB.Core.Tests/Certificates/with_certificate_chain_of_length_1.cs
new file mode 100644
index 00000000000..00c1bf26219
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Certificates/with_certificate_chain_of_length_1.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Cryptography.X509Certificates;
+
+namespace KurrentDB.Core.Tests.Certificates;
+
+public class with_certificate_chain_of_length_1 : with_certificates {
+	protected readonly X509Certificate2 _leaf;
+
+	public with_certificate_chain_of_length_1() {
+		_leaf = CreateCertificate(issuer: false);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Certificates/with_certificate_chain_of_length_2.cs b/src/KurrentDB.Core.Tests/Certificates/with_certificate_chain_of_length_2.cs
new file mode 100644
index 00000000000..35c17cffc9b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Certificates/with_certificate_chain_of_length_2.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Cryptography.X509Certificates;
+
+namespace KurrentDB.Core.Tests.Certificates;
+
+public class with_certificate_chain_of_length_2 : with_certificates {
+	protected readonly X509Certificate2 _root, _leaf;
+
+	public with_certificate_chain_of_length_2() {
+		var root = CreateCertificate(issuer: true);
+		var leaf = CreateCertificate(issuer: false, parent: root);
+
+		//get rid of private keys except for the leaf
+		_root = new X509Certificate2(root.Export(X509ContentType.Cert));
+		_leaf = leaf;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Certificates/with_certificate_chain_of_length_3.cs b/src/KurrentDB.Core.Tests/Certificates/with_certificate_chain_of_length_3.cs
new file mode 100644
index 00000000000..f001835b4f6
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Certificates/with_certificate_chain_of_length_3.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Cryptography.X509Certificates;
+
+namespace KurrentDB.Core.Tests.Certificates;
+
+public class with_certificate_chain_of_length_3 : with_certificates {
+	protected readonly X509Certificate2 _root, _intermediate, _leaf;
+
+	public with_certificate_chain_of_length_3(
+		bool leafExpired = false,
+		bool intermediateExpired = false,
+		bool rootExpired = false) {
+		var root = CreateCertificate(issuer: true, expired: rootExpired);
+		var intermediate = CreateCertificate(issuer: true, parent: root, expired: intermediateExpired);
+		var leaf = CreateCertificate(issuer: false, parent: intermediate, expired: leafExpired);
+
+		//get rid of private keys except for the leaf
+		_root = new X509Certificate2(root.Export(X509ContentType.Cert));
+		_intermediate = new X509Certificate2(intermediate.Export(X509ContentType.Cert));
+		_leaf = leaf;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Certificates/with_certificate_files.cs b/src/KurrentDB.Core.Tests/Certificates/with_certificate_files.cs
new file mode 100644
index 00000000000..23a33df7cde
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Certificates/with_certificate_files.cs
@@ -0,0 +1,522 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Security.Cryptography.Pkcs;
+using System.Security.Cryptography.X509Certificates;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Certificates;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Certificates;
+
+public class with_der : with_certificate_chain_of_length_1 {
+	private string _certPath, _keyPath;
+
+	[SetUp]
+	public void Setup() {
+		_certPath = $"{PathName}/leaf.der";
+		_keyPath = $"{PathName}/leaf.key";
+		File.WriteAllBytes(_certPath, _leaf.Export(X509ContentType.Cert));
+		File.WriteAllText(_keyPath, _leaf.PemPrivateKey());
+	}
+
+	[Test]
+	public void can_load_certificate() {
+		var (certificate, intermediates) = CertificateUtils.LoadFromFile(_certPath, _keyPath, string.Empty);
+		Assert.AreEqual(_leaf, certificate);
+		Assert.IsNull(intermediates);
+		Assert.True(certificate.HasPrivateKey);
+	}
+}
+
+public class with_der_and_wrong_key : with_certificate_chain_of_length_1 {
+	private string _certPath, _keyPath;
+
+	[SetUp]
+	public void Setup() {
+		_certPath = $"{PathName}/leaf.der";
+		_keyPath = $"{PathName}/leaf.key";
+
+		using var wrongKey = RSA.Create();
+		File.WriteAllBytes(_certPath, _leaf.Export(X509ContentType.Cert));
+		File.WriteAllText(_keyPath, wrongKey.ExportRSAPrivateKey().PEM("RSA PRIVATE KEY"));
+	}
+
+	[Test]
+	public void cannot_load_certificate() {
+		Assert.Throws<ArgumentException>(() =>
+			CertificateUtils.LoadFromFile(_certPath, _keyPath, string.Empty)
+		);
+	}
+}
+
+public class with_pem : with_certificate_chain_of_length_1 {
+	private string _certPath, _keyPath;
+
+	[SetUp]
+	public void Setup() {
+		_certPath = $"{PathName}/leaf.pem";
+		_keyPath = $"{PathName}/leaf.key";
+		File.WriteAllText(_certPath, _leaf.Export(X509ContentType.Cert).PEM("CERTIFICATE"));
+		File.WriteAllText(_keyPath, _leaf.PemPrivateKey());
+	}
+
+	[Test]
+	public void can_load_certificate() {
+		var (certificate, intermediates) = CertificateUtils.LoadFromFile(_certPath, _keyPath, string.Empty);
+		Assert.AreEqual(_leaf, certificate);
+		Assert.IsNull(intermediates);
+		Assert.True(certificate.HasPrivateKey);
+	}
+}
+
+public class with_pem_and_wrong_key : with_certificate_chain_of_length_1 {
+	private string _certPath, _keyPath;
+
+	[SetUp]
+	public void Setup() {
+		_certPath = $"{PathName}/leaf.pem";
+		_keyPath = $"{PathName}/leaf.key";
+
+		using var wrongKey = RSA.Create();
+		File.WriteAllText(_certPath, _leaf.Export(X509ContentType.Cert).PEM("CERTIFICATE"));
+		File.WriteAllText(_keyPath, wrongKey.ExportRSAPrivateKey().PEM("RSA PRIVATE KEY"));
+	}
+
+	[Test]
+	public void cannot_load_certificate() {
+		Assert.Throws<ArgumentException>(
+			() => CertificateUtils.LoadFromFile(_certPath, _keyPath, string.Empty)
+		);
+	}
+}
+
+public class with_password_protected_pkcs12 : with_certificate_chain_of_length_1 {
+	private string _certPath;
+	private const string Password = "test$1234";
+
+	[SetUp]
+	public void Setup() {
+		_certPath = $"{PathName}/leaf.p12";
+		File.WriteAllBytes(_certPath, _leaf.ExportToPkcs12(Password));
+	}
+
+	[Test]
+	public void can_load_certificate() {
+		var (certificate, intermediates) = CertificateUtils.LoadFromFile(_certPath, null, Password);
+		Assert.AreEqual(_leaf, certificate);
+		Assert.IsNull(intermediates);
+		Assert.True(certificate.HasPrivateKey);
+	}
+}
+
+public class with_passwordless_pkcs8_private_key : with_certificate_chain_of_length_1 {
+	private string _certPath;
+	private string _privateKeyPath;
+
+	[SetUp]
+	public void Setup() {
+		_certPath = $"{PathName}/leaf.pem";
+		File.WriteAllText(_certPath, _leaf.Export(X509ContentType.Cert).PEM("CERTIFICATE"));
+
+		_privateKeyPath = $"{PathName}/leaf.p8";
+		File.WriteAllText(_privateKeyPath, _leaf.PemPkcs8PrivateKey());
+	}
+
+	[Test]
+	public void can_load_certificate_and_private_key() {
+		var (certificate, intermediates) = CertificateUtils.LoadFromFile(_certPath, _privateKeyPath, null);
+		Assert.AreEqual(_leaf, certificate);
+		Assert.IsNull(intermediates);
+		Assert.True(certificate.HasPrivateKey);
+	}
+}
+
+public class with_password_protected_pkcs8_private_key : with_certificate_chain_of_length_1 {
+	private string _certPath;
+	private string _privateKeyPath;
+	private const string Password = "test$1234";
+
+	[SetUp]
+	public void Setup() {
+		_certPath = $"{PathName}/leaf.pem";
+		File.WriteAllText(_certPath, _leaf.Export(X509ContentType.Cert).PEM("CERTIFICATE"));
+
+		_privateKeyPath = $"{PathName}/leaf.p8";
+		File.WriteAllText(_privateKeyPath, _leaf.EncryptedPemPkcs8PrivateKey(Password));
+	}
+
+	[Test]
+	public void can_load_certificate() {
+		var (certificate, intermediates) = CertificateUtils.LoadFromFile(_certPath, _privateKeyPath, null, Password);
+		Assert.AreEqual(_leaf, certificate);
+		Assert.IsNull(intermediates);
+		Assert.True(certificate.HasPrivateKey);
+	}
+}
+
+public class with_passwordless_pkcs12 : with_certificate_chain_of_length_1 {
+	private string _certPath;
+	private const string Password = null;
+
+	[SetUp]
+	public void Setup() {
+		_certPath = $"{PathName}/leaf.p12";
+		File.WriteAllBytes(_certPath, _leaf.ExportToPkcs12(Password));
+	}
+
+	[Test]
+	public void can_load_certificate() {
+		var (certificate, intermediates) = CertificateUtils.LoadFromFile(_certPath, null, Password);
+		Assert.AreEqual(_leaf, certificate);
+		Assert.IsNull(intermediates);
+		Assert.True(certificate.HasPrivateKey);
+	}
+}
+
+public class with_pkcs12_and_wrong_key : with_certificate_chain_of_length_1 {
+	private string _certPath;
+	private const string Password = null;
+
+	[SetUp]
+	public void Setup() {
+		_certPath = $"{PathName}/leaf.p12";
+
+		using var wrongKey = RSA.Create();
+		var builder = new Pkcs12Builder();
+		var safeContents = new Pkcs12SafeContents();
+		var pbeParams = new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 2048);
+		safeContents.AddCertificate(_leaf);
+		safeContents.AddShroudedKey(wrongKey, Password, pbeParams);
+		builder.AddSafeContentsEncrypted(safeContents, Password, pbeParams);
+		builder.SealWithMac(Password, HashAlgorithmName.SHA256, 2048);
+
+		File.WriteAllBytes(_certPath, builder.Encode());
+	}
+
+	[Test]
+	public void cannot_load_certificate() {
+		Assert.Throws<ArgumentException>(() =>
+			CertificateUtils.LoadFromFile(_certPath, null, Password)
+		);
+	}
+}
+
+public class with_pem_bundle : with_certificate_chain_of_length_3 {
+	private string _certPath, _keyPath;
+
+	[SetUp]
+	public void Setup() {
+		_certPath = $"{PathName}/bundle.pem";
+		_keyPath = $"{PathName}/leaf.key";
+		var leaf = _leaf.Export(X509ContentType.Cert).PEM("CERTIFICATE");
+		var intermediate = _intermediate.Export(X509ContentType.Cert).PEM("CERTIFICATE");
+
+		File.WriteAllText(_certPath, leaf + intermediate);
+		File.WriteAllText(_keyPath, _leaf.PemPrivateKey());
+	}
+
+	[Test]
+	public void can_load_certificate() {
+		var (certificate, intermediates) = CertificateUtils.LoadFromFile(_certPath, _keyPath, string.Empty);
+		Assert.AreEqual(_leaf, certificate);
+		Assert.AreEqual(1, intermediates.Count);
+		Assert.AreEqual(_intermediate, intermediates[0]);
+		Assert.True(certificate.HasPrivateKey);
+		Assert.False(intermediates[0].HasPrivateKey);
+	}
+}
+
+public class with_pem_bundle_and_wrong_key : with_certificate_chain_of_length_3 {
+	private string _certPath, _keyPath;
+
+	[SetUp]
+	public void Setup() {
+		_certPath = $"{PathName}/bundle.pem";
+		_keyPath = $"{PathName}/leaf.key";
+		var leaf = _leaf.Export(X509ContentType.Cert).PEM("CERTIFICATE");
+		var intermediate = _intermediate.Export(X509ContentType.Cert).PEM("CERTIFICATE");
+
+		using var wrongKey = RSA.Create();
+		File.WriteAllText(_certPath, leaf + intermediate);
+		File.WriteAllText(_keyPath, wrongKey.ExportRSAPrivateKey().PEM("RSA PRIVATE KEY"));
+	}
+
+	[Test]
+	public void cannot_load_certificate() {
+		Assert.Throws<ArgumentException>(
+		() => CertificateUtils.LoadFromFile(_certPath, _keyPath, string.Empty)
+		);
+	}
+}
+
+public class with_wrongly_ordered_pem_bundle : with_certificate_chain_of_length_3 {
+	private string _certPath, _keyPath;
+
+	[SetUp]
+	public void Setup() {
+		_certPath = $"{PathName}/bundle.pem";
+		_keyPath = $"{PathName}/leaf.key";
+		var leaf = _leaf.Export(X509ContentType.Cert).PEM("CERTIFICATE");
+		var intermediate = _intermediate.Export(X509ContentType.Cert).PEM("CERTIFICATE");
+
+		File.WriteAllText(_certPath, intermediate + leaf);
+		File.WriteAllText(_keyPath, _leaf.PemPrivateKey());
+	}
+
+	[Test]
+	public void cannot_load_certificate() {
+		Assert.Throws<ArgumentException>(
+		() => CertificateUtils.LoadFromFile(_certPath, _keyPath, string.Empty)
+		);
+	}
+}
+
+public class with_password_protected_pkcs12_bundle : with_certificate_chain_of_length_3 {
+	private string _certPath;
+	private const string Password = "test$1234";
+
+	[SetUp]
+	public void Setup() {
+		_certPath = $"{PathName}/bundle.p12";
+
+		using var rsa = RSA.Create();
+		rsa.ImportRSAPrivateKey(_leaf.GetRSAPrivateKey()!.ExportRSAPrivateKey(), out _);
+		var builder = new Pkcs12Builder();
+		var safeContents = new Pkcs12SafeContents();
+		var pbeParams = new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 2048);
+		safeContents.AddCertificate(_leaf);
+		safeContents.AddCertificate(_intermediate);
+		safeContents.AddShroudedKey(rsa, Password, pbeParams);
+		builder.AddSafeContentsEncrypted(safeContents, Password, pbeParams);
+		builder.SealWithMac(Password, HashAlgorithmName.SHA256, 2048);
+
+		File.WriteAllBytes(_certPath, builder.Encode());
+	}
+
+	[Test]
+	public void can_load_certificate() {
+		var (certificate, intermediates) = CertificateUtils.LoadFromFile(_certPath, null, Password);
+		Assert.AreEqual(_leaf, certificate);
+		Assert.AreEqual(1, intermediates.Count);
+		Assert.AreEqual(_intermediate, intermediates[0]);
+		Assert.True(certificate.HasPrivateKey);
+		Assert.False(intermediates[0].HasPrivateKey);
+	}
+}
+
+public class with_passwordless_pkcs12_bundle : with_certificate_chain_of_length_3 {
+	private string _certPath;
+	private const string Password = null;
+
+	[SetUp]
+	public void Setup() {
+		_certPath = $"{PathName}/bundle.p12";
+
+		using var rsa = RSA.Create();
+		rsa.ImportRSAPrivateKey(_leaf.GetRSAPrivateKey()!.ExportRSAPrivateKey(), out _);
+		var builder = new Pkcs12Builder();
+		var safeContents = new Pkcs12SafeContents();
+		var pbeParams = new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 2048);
+		safeContents.AddCertificate(_leaf);
+		safeContents.AddCertificate(_intermediate);
+		safeContents.AddShroudedKey(rsa, Password, pbeParams);
+		builder.AddSafeContentsEncrypted(safeContents, Password, pbeParams);
+		builder.SealWithMac(Password, HashAlgorithmName.SHA256, 2048);
+
+		File.WriteAllBytes(_certPath, builder.Encode());
+	}
+
+	[Test]
+	public void can_load_certificate() {
+		var (certificate, intermediates) = CertificateUtils.LoadFromFile(_certPath, null, Password);
+		Assert.AreEqual(_leaf, certificate);
+		Assert.AreEqual(1, intermediates.Count);
+		Assert.AreEqual(_intermediate, intermediates[0]);
+		Assert.True(certificate.HasPrivateKey);
+		Assert.False(intermediates[0].HasPrivateKey);
+	}
+}
+
+public class with_wrongly_ordered_pkcs12_bundle : with_certificate_chain_of_length_3 {
+	private string _certPath;
+	private const string Password = null;
+
+	[SetUp]
+	public void Setup() {
+		_certPath = $"{PathName}/bundle.p12";
+
+		using var rsa = RSA.Create();
+		rsa.ImportRSAPrivateKey(_leaf.GetRSAPrivateKey()!.ExportRSAPrivateKey(), out _);
+		var builder = new Pkcs12Builder();
+		var safeContents = new Pkcs12SafeContents();
+		var pbeParams = new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 2048);
+		safeContents.AddCertificate(_intermediate);
+		safeContents.AddCertificate(_leaf);
+		safeContents.AddShroudedKey(rsa, Password, pbeParams);
+		builder.AddSafeContentsEncrypted(safeContents, Password, pbeParams);
+		builder.SealWithMac(Password, HashAlgorithmName.SHA256, 2048);
+
+		File.WriteAllBytes(_certPath, builder.Encode());
+	}
+
+	[Test]
+	public void cannot_load_certificate() {
+		Assert.Throws<ArgumentException>(
+			() => CertificateUtils.LoadFromFile(_certPath, null, Password)
+		);
+	}
+}
+
+public class with_pkcs12_bundle_having_no_keys : with_certificate_chain_of_length_3 {
+	private string _certPath;
+	private const string Password = null;
+
+	[SetUp]
+	public void Setup() {
+		_certPath = $"{PathName}/bundle.p12";
+
+		using var rsa = RSA.Create();
+		rsa.ImportRSAPrivateKey(_leaf.GetRSAPrivateKey()!.ExportRSAPrivateKey(), out _);
+		var builder = new Pkcs12Builder();
+		var safeContents = new Pkcs12SafeContents();
+		var pbeParams = new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 2048);
+		safeContents.AddCertificate(_leaf);
+		safeContents.AddCertificate(_intermediate);
+		builder.AddSafeContentsEncrypted(safeContents, Password, pbeParams);
+		builder.SealWithMac(Password, HashAlgorithmName.SHA256, 2048);
+
+		File.WriteAllBytes(_certPath, builder.Encode());
+	}
+
+	[Test]
+	public void cannot_load_certificate() {
+		var ex = Assert.Throws<Exception>(
+			() => CertificateUtils.LoadFromFile(_certPath, null, Password)
+		);
+		Assert.AreEqual(ex!.Message, "No private keys found");
+	}
+}
+
+public class with_pkcs12_bundle_having_no_certificates : with_certificate_chain_of_length_3 {
+	private string _certPath;
+	private const string Password = null;
+
+	[SetUp]
+	public void Setup() {
+		_certPath = $"{PathName}/bundle.p12";
+
+		using var rsa = RSA.Create();
+		rsa.ImportRSAPrivateKey(_leaf.GetRSAPrivateKey()!.ExportRSAPrivateKey(), out _);
+		var builder = new Pkcs12Builder();
+		var safeContents = new Pkcs12SafeContents();
+		var pbeParams = new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 2048);
+		safeContents.AddShroudedKey(rsa, Password, pbeParams);
+		builder.AddSafeContentsEncrypted(safeContents, Password, pbeParams);
+		builder.SealWithMac(Password, HashAlgorithmName.SHA256, 2048);
+
+		File.WriteAllBytes(_certPath, builder.Encode());
+	}
+
+	[Test]
+	public void cannot_load_certificate() {
+		var ex = Assert.Throws<Exception>(
+			() => CertificateUtils.LoadFromFile(_certPath, null, Password)
+		);
+		Assert.AreEqual(ex!.Message, "No certificates found");
+	}
+}
+
+public class with_pkcs12_bundle_having_multiple_keys : with_certificate_chain_of_length_3 {
+	private string _certPath;
+	private const string Password = null;
+
+	[SetUp]
+	public void Setup() {
+		_certPath = $"{PathName}/bundle.p12";
+
+		using var rsa = RSA.Create();
+		rsa.ImportRSAPrivateKey(_leaf.GetRSAPrivateKey()!.ExportRSAPrivateKey(), out _);
+
+		using var rsa2 = RSA.Create();
+		var builder = new Pkcs12Builder();
+		var safeContents = new Pkcs12SafeContents();
+		var pbeParams = new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 2048);
+		safeContents.AddCertificate(_intermediate);
+		safeContents.AddCertificate(_leaf);
+		safeContents.AddShroudedKey(rsa, Password, pbeParams);
+		safeContents.AddShroudedKey(rsa2, Password, pbeParams);
+		builder.AddSafeContentsEncrypted(safeContents, Password, pbeParams);
+		builder.SealWithMac(Password, HashAlgorithmName.SHA256, 2048);
+
+		File.WriteAllBytes(_certPath, builder.Encode());
+	}
+
+	[Test]
+	public void cannot_load_certificate() {
+		var ex = Assert.Throws<Exception>(
+			() => CertificateUtils.LoadFromFile(_certPath, null, Password)
+		);
+		Assert.AreEqual(ex!.Message, "Multiple private keys found");
+	}
+}
+
+public class with_pkcs12_bundle_having_wrong_key : with_certificate_chain_of_length_3 {
+	private string _certPath;
+	private const string Password = null;
+
+	[SetUp]
+	public void Setup() {
+		_certPath = $"{PathName}/bundle.p12";
+
+		using var rsa = RSA.Create();
+		var builder = new Pkcs12Builder();
+		var safeContents = new Pkcs12SafeContents();
+		var pbeParams = new PbeParameters(PbeEncryptionAlgorithm.Aes256Cbc, HashAlgorithmName.SHA256, 2048);
+		safeContents.AddCertificate(_intermediate);
+		safeContents.AddCertificate(_leaf);
+		safeContents.AddShroudedKey(rsa, Password, pbeParams);
+		builder.AddSafeContentsEncrypted(safeContents, Password, pbeParams);
+		builder.SealWithMac(Password, HashAlgorithmName.SHA256, 2048);
+
+		File.WriteAllBytes(_certPath, builder.Encode());
+	}
+
+	[Test]
+	public void cannot_load_certificate() {
+		Assert.Throws<ArgumentException>(
+			() => CertificateUtils.LoadFromFile(_certPath, null, Password)
+		);
+	}
+}
+
+public class when_loading_certificates_from_directory : with_certificate_chain_of_length_1 {
+	private const string CertsDir = "certs";
+
+	[SetUp]
+	public void Setup() {
+		Directory.CreateDirectory($"{PathName}/{CertsDir}");
+		var p = $"{PathName}/{CertsDir}/leaf";
+		File.WriteAllBytes($"{p}.der", _leaf.Export(X509ContentType.Cert));
+		File.WriteAllText($"{p}.crt", _leaf.Export(X509ContentType.Cert).PEM("CERTIFICATE"));
+		File.WriteAllText($"{p}.cer", _leaf.Export(X509ContentType.Cert).PEM("CERTIFICATE"));
+		File.WriteAllText($"{p}.cert", _leaf.Export(X509ContentType.Cert).PEM("CERTIFICATE"));
+		File.WriteAllText($"{p}.pem", _leaf.Export(X509ContentType.Cert).PEM("CERTIFICATE"));
+		File.WriteAllBytes($"{p}.p12", _leaf.ExportToPkcs12());
+		File.WriteAllBytes($"{p}.pfx", _leaf.ExportToPkcs12());
+		File.WriteAllText($"{p}.key", _leaf.PemPrivateKey());
+	}
+
+
+	[Test]
+	public void loads_only_certificates_with_accepted_extensions() {
+		var certs = CertificateUtils.LoadAllCertificates($"{PathName}/{CertsDir}").ToArray();
+		Assert.AreEqual(8 - 3, certs.Length);
+		var accepted = new[] { ".crt", ".cert", ".cer", ".pem", ".der" };
+		Assert.True(certs.All(x => accepted.Contains(new FileInfo(x.fileName).Extension)));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Certificates/with_certificates.cs b/src/KurrentDB.Core.Tests/Certificates/with_certificates.cs
new file mode 100644
index 00000000000..3e1b9263270
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Certificates/with_certificates.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+using System.Text;
+
+namespace KurrentDB.Core.Tests.Certificates;
+
+public class with_certificates : SpecificationWithDirectoryPerTestFixture {
+	private static readonly Random Random = new();
+	protected static X509Certificate2 CreateCertificate(bool issuer, X509Certificate2 parent = null, bool expired = false) {
+		using var rsa = RSA.Create();
+		var certReq = new CertificateRequest(GenerateSubject(), rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
+		var now = DateTimeOffset.UtcNow;
+		now = new DateTime(now.Year, now.Month, now.Day); // round to nearest day
+		var startDate = now.AddMonths(-1);
+		var endDate = !expired ? now.AddMonths(1) : now.AddDays(-1);
+
+		if (issuer) {
+			certReq.CertificateExtensions.Add(new X509BasicConstraintsExtension(true, false, 0, true));
+		}
+		if (parent == null) {
+			return certReq.CreateSelfSigned(startDate, endDate);
+		}
+
+		var parentKey = parent!.GetRSAPrivateKey()!;
+		var signatureGenerator = X509SignatureGenerator.CreateForRSA(parentKey!, RSASignaturePadding.Pkcs1);
+		return certReq.Create(parent.SubjectName, signatureGenerator, startDate, endDate, GenerateSerialNumber()).CopyWithPrivateKey(rsa);
+	}
+
+	private static string GetCharset() {
+		var charset = "";
+		for (var c = 'a'; c <= 'z'; c++) {
+			charset += c;
+		}
+		for (var c = 'A'; c <= 'Z'; c++) {
+			charset += c;
+		}
+		for (var c = '0'; c <= '9'; c++) {
+			charset += c;
+		}
+		return charset;
+	}
+
+	private static byte[] GenerateSerialNumber() {
+		var charset = GetCharset();
+		string s = "";
+		for (var j = 0; j < 10; j++) {
+			s += charset[Random.Next() % charset.Length];
+		}
+
+		var utf8Encoding = new UTF8Encoding(false);
+		return utf8Encoding.GetBytes(s);
+	}
+
+	protected static string GenerateSubject() {
+		var charset = GetCharset();
+		string s = "";
+		for (var j = 0; j < 10; j++) {
+			s += charset[Random.Next() % charset.Length];
+		}
+
+		return $"CN={s}";
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/DataStructures/concurrent_queue_wrapper_should.cs b/src/KurrentDB.Core.Tests/ClientAPI/DataStructures/concurrent_queue_wrapper_should.cs
new file mode 100644
index 00000000000..034d5790eaa
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/DataStructures/concurrent_queue_wrapper_should.cs
@@ -0,0 +1,98 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using EventStore.ClientAPI.Common.Utils.Threading;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.DataStructures;
+
+[TestFixture]
+public class concurrent_queue_wrapper_should {
+	[Test]
+	public void return_correct_counts_and_values_1() {
+		var queue = new ConcurrentQueueWrapper<int>();
+		Assert.AreEqual(0, queue.Count);
+		queue.Enqueue(1234);
+		Assert.AreEqual(1, queue.Count);
+		queue.Enqueue(12345);
+		Assert.AreEqual(2, queue.Count);
+
+		int val;
+		Assert.AreEqual(true, queue.TryDequeue(out val));
+		Assert.AreEqual(1234, val);
+		Assert.AreEqual(1, queue.Count);
+
+		Assert.AreEqual(true, queue.TryDequeue(out val));
+		Assert.AreEqual(12345, val);
+		Assert.AreEqual(0, queue.Count);
+
+		Assert.AreEqual(false, queue.TryDequeue(out val));
+		Assert.AreEqual(false, queue.TryDequeue(out val));
+	}
+
+	[Test]
+	public void return_correct_counts_and_values_2() {
+		var queue = new ConcurrentQueueWrapper<int>();
+		for (int i = 1; i <= 1000; i++) {
+			queue.Enqueue(i);
+			Assert.AreEqual(i, queue.Count);
+		}
+
+		int x;
+		for (int i = 1; i <= 1000; i++) {
+			Assert.AreEqual(true, queue.TryDequeue(out x));
+			Assert.AreEqual(i, x);
+			Assert.AreEqual(1000 - i, queue.Count);
+		}
+	}
+}
+
+[TestFixture]
+public class concurrent_queue_wrapper_with_parallel_dequeues_should {
+	private ConcurrentQueueWrapper<int> _concurrentQueue;
+	private const int TOTAL_ENQUEUED_ITEMS = 1000000;
+	private const int NUM_THREADS = 4;
+	private volatile bool _seenNegativeCount;
+	private volatile int _totalDequeued;
+
+	public concurrent_queue_wrapper_with_parallel_dequeues_should() {
+		_concurrentQueue = new ConcurrentQueueWrapper<int>();
+		_seenNegativeCount = false;
+		_totalDequeued = 0;
+	}
+
+	private void DequeueThread() {
+		int x;
+		while (_totalDequeued < TOTAL_ENQUEUED_ITEMS) {
+			var dequeued = _concurrentQueue.TryDequeue(out x);
+			if (_concurrentQueue.Count < 0)
+				_seenNegativeCount = true;
+			if (dequeued)
+				Interlocked.Increment(ref _totalDequeued);
+		}
+	}
+
+	[Test]
+	public void always_return_non_negative_count() {
+		var threads = new Thread[NUM_THREADS];
+		for (int i = 0; i < NUM_THREADS; i++) {
+			threads[i] = new Thread(DequeueThread);
+			threads[i].Start();
+		}
+
+		int x;
+		for (int i = 0; i < TOTAL_ENQUEUED_ITEMS; i++) {
+			_concurrentQueue.Enqueue(1);
+			var dequeued = _concurrentQueue.TryDequeue(out x);
+			if (dequeued)
+				Interlocked.Increment(ref _totalDequeued);
+		}
+
+		for (int i = 0; i < NUM_THREADS; i++)
+			threads[i].Join(TimeSpan.FromSeconds(5));
+
+		Assert.AreEqual(false, _seenNegativeCount);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/MiniNodeWithExistingRecords.cs b/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/MiniNodeWithExistingRecords.cs
new file mode 100644
index 00000000000..ae2c6fdb0b5
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/MiniNodeWithExistingRecords.cs
@@ -0,0 +1,170 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Tests.TransactionLog;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.Util;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.ExpectedVersion64Bit;
+
+public abstract class MiniNodeWithExistingRecords<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private readonly TcpType _tcpType = TcpType.Ssl;
+	protected MiniNode<TLogFormat, TStreamId> Node;
+
+	protected readonly int MaxEntriesInMemTable = 20;
+	protected readonly long MetastreamMaxCount = 1;
+	protected readonly bool PerformAdditionalCommitChecks = true;
+	protected readonly byte IndexBitnessVersion = Opts.IndexBitnessVersionDefault;
+	protected LogFormatAbstractor<TStreamId> _logFormatFactory;
+	protected TableIndex<TStreamId> TableIndex;
+	protected IReadIndex<TStreamId> ReadIndex;
+
+	protected TFChunkDb Db;
+	protected TFChunkWriter Writer;
+	protected ICheckpoint WriterCheckpoint;
+	protected ICheckpoint ChaserCheckpoint;
+	protected IODispatcher IODispatcher;
+	protected SynchronousScheduler Bus;
+
+	protected IEventStoreConnection _store;
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.To(node, _tcpType);
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		string dbPath = Path.Combine(PathName, string.Format("mini-node-db-{0}", Guid.NewGuid()));
+
+		_logFormatFactory = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
+			IndexDirectory = GetFilePathFor("index"),
+		});
+
+		Bus = new();
+		IODispatcher = new IODispatcher(Bus, Bus);
+
+		if (!Directory.Exists(dbPath))
+			Directory.CreateDirectory(dbPath);
+
+		var writerCheckFilename = Path.Combine(dbPath, Checkpoint.Writer + ".chk");
+		var chaserCheckFilename = Path.Combine(dbPath, Checkpoint.Chaser + ".chk");
+
+		WriterCheckpoint = new MemoryMappedFileCheckpoint(writerCheckFilename, Checkpoint.Writer);
+		ChaserCheckpoint = new MemoryMappedFileCheckpoint(chaserCheckFilename, Checkpoint.Chaser);
+
+		Db = new TFChunkDb(TFChunkHelper.CreateDbConfig(dbPath, WriterCheckpoint, ChaserCheckpoint, TFConsts.ChunkSize));
+		await Db.Open();
+
+		// create DB
+		Writer = new TFChunkWriter(Db);
+		await Writer.Open(CancellationToken.None);
+
+		var pm = _logFormatFactory.CreatePartitionManager(
+			reader: new TFChunkReader(Db, WriterCheckpoint),
+			writer: Writer);
+		await pm.Initialize(CancellationToken.None);
+
+		await WriteTestScenario(CancellationToken.None);
+
+		await Writer.DisposeAsync();
+		Writer = null;
+		WriterCheckpoint.Flush();
+		ChaserCheckpoint.Write(WriterCheckpoint.Read());
+		ChaserCheckpoint.Flush();
+		await Db.DisposeAsync();
+
+		// start node with our created DB
+		Node = new MiniNode<TLogFormat, TStreamId>(PathName, inMemDb: false, dbPath: dbPath);
+		await Node.Start();
+
+		try {
+			await Given().WithTimeout();
+		} catch (Exception ex) {
+			throw new Exception("Given Failed", ex);
+		}
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		_store?.Dispose();
+		_logFormatFactory?.Dispose();
+
+		await Node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+	public abstract ValueTask WriteTestScenario(CancellationToken token);
+	public abstract Task Given();
+
+	protected async ValueTask<EventRecord> WriteSingleEvent(string eventStreamName,
+		long eventNumber,
+		string data,
+		DateTime? timestamp = null,
+		Guid eventId = default(Guid),
+		string eventType = "some-type",
+		CancellationToken token = default) {
+
+		long pos = Writer.Position;
+		_logFormatFactory.StreamNameIndex.GetOrReserve(
+			_logFormatFactory.RecordFactory,
+			eventStreamName,
+			pos,
+			out var eventStreamId,
+			out var streamRecord);
+
+		if (streamRecord is not null) {
+			(_, pos) = await Writer.Write(streamRecord, token);
+		}
+
+		_logFormatFactory.EventTypeIndex.GetOrReserveEventType(
+			_logFormatFactory.RecordFactory,
+			eventType,
+			pos,
+			out var eventTypeId,
+			out var eventTypeRecord);
+
+		if (eventTypeRecord != null) {
+			(_, pos) = await Writer.Write(eventTypeRecord, token);
+		}
+
+		var prepare = LogRecord.SingleWrite(
+			_logFormatFactory.RecordFactory,
+			pos,
+			eventId == default(Guid) ? Guid.NewGuid() : eventId,
+			Guid.NewGuid(),
+			eventStreamId,
+			eventNumber - 1,
+			eventTypeId,
+			Helper.UTF8NoBom.GetBytes(data),
+			null,
+			timestamp);
+
+		(var written, pos) = await Writer.Write(prepare, token);
+		Assert.IsTrue(written);
+		var commit = LogRecord.Commit(pos, prepare.CorrelationId, prepare.LogPosition,
+			eventNumber);
+		Assert.IsTrue(await Writer.Write(commit, token) is (true, _));
+		Assert.AreEqual(eventStreamId, prepare.EventStreamId);
+
+		var eventRecord = new EventRecord(eventNumber, prepare, eventStreamName, eventType);
+		return eventRecord;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/append_to_stream_with_event_numbers_greater_than_2_billion.cs b/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/append_to_stream_with_event_numbers_greater_than_2_billion.cs
new file mode 100644
index 00000000000..3619abc253e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/append_to_stream_with_event_numbers_greater_than_2_billion.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.ExpectedVersion64Bit;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+[Category("ClientAPI"), Category("LongRunning")]
+public class append_to_stream_with_event_numbers_greater_than_2_billion<TLogFormat, TStreamId>
+	: MiniNodeWithExistingRecords<TLogFormat, TStreamId> {
+	private const string StreamName = "append_to_stream_with_event_numbers_greater_than_2_billion";
+	private const long intMaxValue = int.MaxValue;
+
+	public override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteSingleEvent(StreamName, intMaxValue + 1, new string('.', 3000), token: token);
+		await WriteSingleEvent(StreamName, intMaxValue + 2, new string('.', 3000), token: token);
+		await WriteSingleEvent(StreamName, intMaxValue + 3, new string('.', 3000), token: token);
+		await WriteSingleEvent(StreamName, intMaxValue + 4, new string('.', 3000), token: token);
+		await WriteSingleEvent(StreamName, intMaxValue + 5, new string('.', 3000), token: token);
+	}
+
+	public override async Task Given() {
+		_store = BuildConnection(Node);
+		await _store.ConnectAsync();
+		await _store.SetStreamMetadataAsync(StreamName, ExpectedVersion.Any,
+			StreamMetadata.Create(truncateBefore: intMaxValue + 1));
+	}
+
+	[Test]
+	public async Task should_be_able_to_append_to_stream() {
+		var evnt = new EventData(Guid.NewGuid(), "EventType", false, new byte[10], new byte[15]);
+		var writeResult = await _store.AppendToStreamAsync(StreamName, intMaxValue + 5, evnt);
+		Assert.AreEqual(intMaxValue + 6, writeResult.NextExpectedVersion);
+
+		var readResult = await _store
+			.ReadStreamEventsForwardAsync(StreamName, intMaxValue + 6, 1, false, DefaultData.AdminCredentials);
+		Assert.AreEqual(SliceReadStatus.Success, readResult.Status);
+		Assert.AreEqual(evnt.EventId, readResult.Events[0].Event.EventId);
+	}
+
+	[Test]
+	public async Task should_throw_wrong_expected_version_when_version_incorrect() {
+		var evnt = new EventData(Guid.NewGuid(), "EventType", false, new byte[10], new byte[15]);
+		await AssertEx.ThrowsAsync<WrongExpectedVersionException>(
+			() => _store.AppendToStreamAsync(StreamName, intMaxValue + 15, evnt));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/catchup_subscription_to_all_with_event_numbers_greater_than_2_billion.cs b/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/catchup_subscription_to_all_with_event_numbers_greater_than_2_billion.cs
new file mode 100644
index 00000000000..6ddb00efb65
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/catchup_subscription_to_all_with_event_numbers_greater_than_2_billion.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
+using ResolvedEvent = EventStore.ClientAPI.ResolvedEvent;
+using StreamMetadata = EventStore.ClientAPI.StreamMetadata;
+
+namespace KurrentDB.Core.Tests.ClientAPI.ExpectedVersion64Bit;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+[Category("ClientAPI"), Category("LongRunning")]
+public class catchup_subscription_to_all_with_event_numbers_greater_than_2_billion<TLogFormat, TStreamId>
+	: MiniNodeWithExistingRecords<TLogFormat, TStreamId> {
+	private const long intMaxValue = (long)int.MaxValue;
+
+	private string _streamId = "subscriptions-catchup-all";
+
+	private EventRecord _r1, _r2;
+
+	public override async ValueTask WriteTestScenario(CancellationToken token) {
+		_r1 = await WriteSingleEvent(_streamId, intMaxValue + 1, new string('.', 3000), token: token);
+		_r2 = await WriteSingleEvent(_streamId, intMaxValue + 2, new string('.', 3000), token: token);
+	}
+
+	public override async Task Given() {
+		_store = BuildConnection(Node);
+		await _store.ConnectAsync();
+		await _store.SetStreamMetadataAsync(_streamId, ExpectedVersion.Any,
+			StreamMetadata.Create(truncateBefore: intMaxValue + 1));
+	}
+
+	[Test]
+	public async Task should_be_able_to_subscribe_to_all_with_catchup_subscription() {
+		var evnt = new EventData(Guid.NewGuid(), "EventType", false, new byte[10], new byte[15]);
+		List<ResolvedEvent> receivedEvents = new List<ResolvedEvent>();
+
+		var countdown = new CountdownEvent(3);
+
+		_store.SubscribeToAllFrom(Position.Start, CatchUpSubscriptionSettings.Default, (s, e) => {
+			if (e.Event.EventStreamId == _streamId) {
+				receivedEvents.Add(e);
+				countdown.Signal();
+			}
+
+			return Task.CompletedTask;
+		}, userCredentials: DefaultData.AdminCredentials);
+
+		await _store.AppendToStreamAsync(_streamId, intMaxValue + 2, evnt);
+
+		Assert.That(countdown.Wait(TimeSpan.FromSeconds(10)), "Timed out waiting for events to appear");
+
+		Assert.AreEqual(_r1.EventId, receivedEvents[0].Event.EventId);
+		Assert.AreEqual(_r2.EventId, receivedEvents[1].Event.EventId);
+		Assert.AreEqual(evnt.EventId, receivedEvents[2].Event.EventId);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/persistent_subscription_with_event_numbers_greater_than_2_billion.cs b/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/persistent_subscription_with_event_numbers_greater_than_2_billion.cs
new file mode 100644
index 00000000000..5095c68c53e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/persistent_subscription_with_event_numbers_greater_than_2_billion.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
+using ResolvedEvent = EventStore.ClientAPI.ResolvedEvent;
+using StreamMetadata = EventStore.ClientAPI.StreamMetadata;
+
+namespace KurrentDB.Core.Tests.ClientAPI.ExpectedVersion64Bit;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+[Category("ClientAPI"), Category("LongRunning")]
+public class persistent_subscription_with_event_numbers_greater_than_2_billion<TLogFormat, TStreamId>
+	: MiniNodeWithExistingRecords<TLogFormat, TStreamId> {
+	private const long intMaxValue = (long)int.MaxValue;
+
+	private string _streamId = "persistent-subscription-stream";
+
+	private EventRecord _r1, _r2;
+
+	public override async ValueTask WriteTestScenario(CancellationToken token) {
+		_r1 = await WriteSingleEvent(_streamId, intMaxValue + 1, new string('.', 3000), token: token);
+		_r2 = await WriteSingleEvent(_streamId, intMaxValue + 2, new string('.', 3000), token: token);
+	}
+
+	public override async Task Given() {
+		_store = BuildConnection(Node);
+		await _store.ConnectAsync();
+		await _store.SetStreamMetadataAsync(_streamId, ExpectedVersion.Any,
+			StreamMetadata.Create(truncateBefore: intMaxValue + 1));
+	}
+
+	[Test]
+	public async Task should_be_able_to_create_the_persistent_subscription() {
+		var groupId = "group-" + Guid.NewGuid().ToString();
+		var settings = PersistentSubscriptionSettings.Create().StartFrom(intMaxValue);
+		await _store.CreatePersistentSubscriptionAsync(_streamId, groupId, settings, DefaultData.AdminCredentials);
+	}
+
+	[Test]
+	public async Task should_be_able_to_update_the_persistent_subscription() {
+		var groupId = "group-" + Guid.NewGuid().ToString();
+		var settings = PersistentSubscriptionSettings.Create();
+		await _store.CreatePersistentSubscriptionAsync(_streamId, groupId, settings, DefaultData.AdminCredentials);
+
+		settings = PersistentSubscriptionSettings.Create().StartFrom(intMaxValue);
+		await _store.UpdatePersistentSubscriptionAsync(_streamId, groupId, settings, DefaultData.AdminCredentials);
+	}
+
+	[Test]
+	public async Task should_be_able_to_connect_to_persistent_subscription() {
+		var groupId = "group-" + Guid.NewGuid().ToString();
+		var settings = PersistentSubscriptionSettings.Create().StartFrom(intMaxValue);
+		await _store.CreatePersistentSubscriptionAsync(_streamId, groupId, settings, DefaultData.AdminCredentials);
+
+		var evnt = new EventData(Guid.NewGuid(), "EventType", false, new byte[10], new byte[15]);
+		List<ResolvedEvent> receivedEvents = new List<ResolvedEvent>();
+		var countdown = new CountdownEvent(3);
+		await _store.ConnectToPersistentSubscriptionAsync(_streamId, groupId, (s, e) => {
+			receivedEvents.Add(e);
+			countdown.Signal();
+			return Task.CompletedTask;
+		}, userCredentials: DefaultData.AdminCredentials);
+
+		await _store.AppendToStreamAsync(_streamId, intMaxValue + 2, evnt);
+
+		Assert.That(countdown.Wait(TimeSpan.FromSeconds(5)), "Timed out waiting for events to appear");
+
+		Assert.AreEqual(_r1.EventId, receivedEvents[0].Event.EventId);
+		Assert.AreEqual(_r2.EventId, receivedEvents[1].Event.EventId);
+		Assert.AreEqual(evnt.EventId, receivedEvents[2].Event.EventId);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/read_stream_with_event_numbers_greater_than_2_billion.cs b/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/read_stream_with_event_numbers_greater_than_2_billion.cs
new file mode 100644
index 00000000000..cc93753c87e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/read_stream_with_event_numbers_greater_than_2_billion.cs
@@ -0,0 +1,119 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
+using StreamMetadata = EventStore.ClientAPI.StreamMetadata;
+
+namespace KurrentDB.Core.Tests.ClientAPI.ExpectedVersion64Bit;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+[Category("ClientAPI"), Category("LongRunning")]
+public class read_stream_with_event_numbers_greater_than_2_billion<TLogFormat, TStreamId>
+	: MiniNodeWithExistingRecords<TLogFormat, TStreamId> {
+	private const string StreamName = "read_stream_with_event_numbers_greater_than_2_billion";
+	private const long intMaxValue = int.MaxValue;
+
+	private EventRecord _r1, _r2, _r3, _r4, _r5;
+
+	public override async ValueTask WriteTestScenario(CancellationToken token) {
+		_r1 = await WriteSingleEvent(StreamName, intMaxValue + 1, new string('.', 3000), token: token);
+		_r2 = await WriteSingleEvent(StreamName, intMaxValue + 2, new string('.', 3000), token: token);
+		_r3 = await WriteSingleEvent(StreamName, intMaxValue + 3, new string('.', 3000), token: token);
+		_r4 = await WriteSingleEvent(StreamName, intMaxValue + 4, new string('.', 3000), token: token);
+		_r5 = await WriteSingleEvent(StreamName, intMaxValue + 5, new string('.', 3000), token: token);
+	}
+
+	public override async Task Given() {
+		_store = BuildConnection(Node);
+		await _store.ConnectAsync();
+		await _store.SetStreamMetadataAsync(StreamName, ExpectedVersion.Any,
+			StreamMetadata.Create(truncateBefore: intMaxValue + 1));
+	}
+
+	[Test]
+	public async Task read_forward_from_zero() {
+		var result = await _store.ReadStreamEventsForwardAsync(StreamName, 0, 100, false);
+		Assert.AreEqual(0, result.Events.Length);
+		Assert.AreEqual(intMaxValue + 1, result.NextEventNumber);
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_stream_forward() {
+		var result = await _store.ReadStreamEventsForwardAsync(StreamName, intMaxValue, 100, false);
+		Assert.AreEqual(5, result.Events.Count());
+		Assert.AreEqual(_r1.EventId, result.Events[0].Event.EventId);
+		Assert.AreEqual(_r2.EventId, result.Events[1].Event.EventId);
+		Assert.AreEqual(_r3.EventId, result.Events[2].Event.EventId);
+		Assert.AreEqual(_r4.EventId, result.Events[3].Event.EventId);
+		Assert.AreEqual(_r5.EventId, result.Events[4].Event.EventId);
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_stream_backward() {
+		var result = await _store.ReadStreamEventsBackwardAsync(StreamName, intMaxValue + 6, 100, false);
+		Assert.AreEqual(5, result.Events.Count());
+		Assert.AreEqual(_r5.EventId, result.Events[0].Event.EventId);
+		Assert.AreEqual(_r4.EventId, result.Events[1].Event.EventId);
+		Assert.AreEqual(_r3.EventId, result.Events[2].Event.EventId);
+		Assert.AreEqual(_r2.EventId, result.Events[3].Event.EventId);
+		Assert.AreEqual(_r1.EventId, result.Events[4].Event.EventId);
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_each_event() {
+		var record = await _store.ReadEventAsync(StreamName, intMaxValue + 1, false);
+		Assert.AreEqual(EventReadStatus.Success, record.Status);
+		Assert.AreEqual(_r1.EventId, record.Event.Value.Event.EventId);
+
+		record = await _store.ReadEventAsync(StreamName, intMaxValue + 2, false);
+		Assert.AreEqual(EventReadStatus.Success, record.Status);
+		Assert.AreEqual(_r2.EventId, record.Event.Value.Event.EventId);
+
+		record = await _store.ReadEventAsync(StreamName, intMaxValue + 3, false);
+		Assert.AreEqual(EventReadStatus.Success, record.Status);
+		Assert.AreEqual(_r3.EventId, record.Event.Value.Event.EventId);
+
+		record = await _store.ReadEventAsync(StreamName, intMaxValue + 4, false);
+		Assert.AreEqual(EventReadStatus.Success, record.Status);
+		Assert.AreEqual(_r4.EventId, record.Event.Value.Event.EventId);
+
+		record = await _store.ReadEventAsync(StreamName, intMaxValue + 5, false);
+		Assert.AreEqual(EventReadStatus.Success, record.Status);
+		Assert.AreEqual(_r5.EventId, record.Event.Value.Event.EventId);
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_all_forward() {
+		var result = await _store.ReadAllEventsForwardAsync(Position.Start, 100, false, DefaultData.AdminCredentials)
+;
+		Assert.IsTrue(result.Events.Count() > 5);
+
+		var records = result.Events.Where(x => x.OriginalStreamId == StreamName).ToList();
+		Assert.AreEqual(_r1.EventId, records[0].Event.EventId);
+		Assert.AreEqual(_r2.EventId, records[1].Event.EventId);
+		Assert.AreEqual(_r3.EventId, records[2].Event.EventId);
+		Assert.AreEqual(_r4.EventId, records[3].Event.EventId);
+		Assert.AreEqual(_r5.EventId, records[4].Event.EventId);
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_all_backward() {
+		var result = await _store.ReadAllEventsBackwardAsync(Position.End, 100, false, DefaultData.AdminCredentials)
+;
+		Assert.IsTrue(result.Events.Count() > 5);
+
+		var records = result.Events.Where(x => x.OriginalStreamId == StreamName).ToList();
+		Assert.AreEqual(_r5.EventId, records[0].Event.EventId);
+		Assert.AreEqual(_r4.EventId, records[1].Event.EventId);
+		Assert.AreEqual(_r3.EventId, records[2].Event.EventId);
+		Assert.AreEqual(_r2.EventId, records[3].Event.EventId);
+		Assert.AreEqual(_r1.EventId, records[4].Event.EventId);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/read_stream_with_link_to_event_with_event_number_greater_than_int_maxvalue.cs b/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/read_stream_with_link_to_event_with_event_number_greater_than_int_maxvalue.cs
new file mode 100644
index 00000000000..ea68099a719
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/read_stream_with_link_to_event_with_event_number_greater_than_int_maxvalue.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.ExpectedVersion64Bit;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+[Category("ClientAPI"), Category("LongRunning")]
+public class
+	read_stream_with_link_to_event_with_event_number_greater_than_int_maxvalue<TLogFormat, TStreamId>
+	: MiniNodeWithExistingRecords<TLogFormat, TStreamId> {
+	private const string StreamName = "read_stream_with_link_to_event_with_event_number_greater_than_int_maxvalue";
+	private const long intMaxValue = (long)int.MaxValue;
+
+	private string _linkedStreamName = "linked-" + StreamName;
+	private EventRecord _event1, _event2;
+
+	public override async ValueTask WriteTestScenario(CancellationToken token) {
+		_event1 = await WriteSingleEvent(StreamName, intMaxValue + 1, new string('.', 3000), token: token);
+		_event2 = await WriteSingleEvent(StreamName, intMaxValue + 2, new string('.', 3000), token: token);
+
+		await WriteSingleEvent(_linkedStreamName, 0, string.Format("{0}@{1}", intMaxValue + 1, StreamName),
+			eventType: SystemEventTypes.LinkTo, token: token);
+		await WriteSingleEvent(_linkedStreamName, 1, string.Format("{0}@{1}", intMaxValue + 2, StreamName),
+			eventType: SystemEventTypes.LinkTo, token: token);
+	}
+
+	public override async Task Given() {
+		_store = BuildConnection(Node);
+		await _store.ConnectAsync();
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_link_stream_forward_and_resolve_link_tos() {
+		var readResult = await _store
+			.ReadStreamEventsForwardAsync(_linkedStreamName, 0, 100, true, DefaultData.AdminCredentials);
+		Assert.AreEqual(SliceReadStatus.Success, readResult.Status);
+		Assert.AreEqual(2, readResult.Events.Length);
+		Assert.AreEqual(_event1.EventId, readResult.Events[0].Event.EventId);
+		Assert.AreEqual(_event2.EventId, readResult.Events[1].Event.EventId);
+		Assert.AreEqual(intMaxValue + 1, readResult.Events[0].Event.EventNumber);
+		Assert.AreEqual(intMaxValue + 2, readResult.Events[1].Event.EventNumber);
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_link_stream_backward_and_resolve_link_tos() {
+		var readResult = await _store
+			.ReadStreamEventsBackwardAsync(_linkedStreamName, 10, 100, true, DefaultData.AdminCredentials);
+		Assert.AreEqual(SliceReadStatus.Success, readResult.Status);
+		Assert.AreEqual(2, readResult.Events.Length);
+		Assert.AreEqual(_event2.EventId, readResult.Events[0].Event.EventId);
+		Assert.AreEqual(_event1.EventId, readResult.Events[1].Event.EventId);
+		Assert.AreEqual(intMaxValue + 2, readResult.Events[0].Event.EventNumber);
+		Assert.AreEqual(intMaxValue + 1, readResult.Events[1].Event.EventNumber);
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_all_stream_forward_and_resolve_link_tos() {
+		var readResult = await _store.ReadAllEventsForwardAsync(Position.Start, 100, true, DefaultData.AdminCredentials)
+;
+		var linkedEvents = readResult.Events.Where(x => x.OriginalStreamId == _linkedStreamName).ToList();
+		Assert.AreEqual(2, linkedEvents.Count());
+		Assert.AreEqual(_event1.EventId, linkedEvents[0].Event.EventId);
+		Assert.AreEqual(_event2.EventId, linkedEvents[1].Event.EventId);
+		Assert.AreEqual(intMaxValue + 1, linkedEvents[0].Event.EventNumber);
+		Assert.AreEqual(intMaxValue + 2, linkedEvents[1].Event.EventNumber);
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_all_stream_backward_and_resolve_link_tos() {
+		var readResult = await _store.ReadAllEventsBackwardAsync(Position.End, 100, true, DefaultData.AdminCredentials)
+;
+		var linkedEvents = readResult.Events.Where(x => x.OriginalStreamId == _linkedStreamName).ToList();
+		Assert.AreEqual(2, linkedEvents.Count());
+		Assert.AreEqual(_event2.EventId, linkedEvents[0].Event.EventId);
+		Assert.AreEqual(_event1.EventId, linkedEvents[1].Event.EventId);
+		Assert.AreEqual(intMaxValue + 2, linkedEvents[0].Event.EventNumber);
+		Assert.AreEqual(intMaxValue + 1, linkedEvents[1].Event.EventNumber);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/subscribe_to_stream_with_link_to_event_with_event_number_greater_than_int_maxvalue.cs b/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/subscribe_to_stream_with_link_to_event_with_event_number_greater_than_int_maxvalue.cs
new file mode 100644
index 00000000000..b7d5ab8ebba
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/subscribe_to_stream_with_link_to_event_with_event_number_greater_than_int_maxvalue.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Common.Utils;
+using KurrentDB.Core.Services;
+using NUnit.Framework;
+using ResolvedEvent = EventStore.ClientAPI.ResolvedEvent;
+
+namespace KurrentDB.Core.Tests.ClientAPI.ExpectedVersion64Bit;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+[Category("ClientAPI"), Category("LongRunning")]
+public class
+	subscribe_to_stream_with_link_to_event_with_event_number_greater_than_int_maxvalue<TLogFormat, TStreamId> :
+		MiniNodeWithExistingRecords<TLogFormat, TStreamId> {
+	private const string StreamName =
+		"subscribe_to_stream_with_link_to_event_with_event_number_greater_than_int_maxvalue";
+
+	private const long intMaxValue = (long)int.MaxValue;
+
+	private string _linkedStreamName = "linked-" + StreamName;
+	private Guid _event1Id;
+
+	private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
+	private ResolvedEvent _receivedEvent;
+
+	public override async ValueTask WriteTestScenario(CancellationToken token) {
+		var event1 = await WriteSingleEvent(StreamName, intMaxValue + 1, new string('.', 3000), token: token);
+		await WriteSingleEvent(StreamName, intMaxValue + 2, new string('.', 3000), token: token);
+		_event1Id = event1.EventId;
+	}
+
+	public override async Task Given() {
+		_store = BuildConnection(Node);
+		await _store.ConnectAsync();
+
+		await _store.SubscribeToStreamAsync(_linkedStreamName, true, HandleEvent);
+		await _store.AppendToStreamAsync(_linkedStreamName, ExpectedVersion.NoStream,
+			new EventData(Guid.NewGuid(),
+				SystemEventTypes.LinkTo, false, Helper.UTF8NoBom.GetBytes(
+					string.Format("{0}@{1}", intMaxValue + 1, StreamName)
+				), null));
+	}
+
+	private Task HandleEvent(EventStoreSubscription sub, ResolvedEvent resolvedEvent) {
+		_receivedEvent = resolvedEvent;
+		_resetEvent.Set();
+		return Task.CompletedTask;
+	}
+
+	[Test]
+	public void should_receive_and_resolve_the_linked_event() {
+		Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
+		Assert.AreEqual(intMaxValue + 1, _receivedEvent.Event.EventNumber);
+		Assert.AreEqual(_event1Id, _receivedEvent.Event.EventId);
+		Assert.AreEqual(intMaxValue + 1, _receivedEvent.Event.EventNumber);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/subscriptions_on_stream_with_event_numbers_greater_than_2_billion.cs b/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/subscriptions_on_stream_with_event_numbers_greater_than_2_billion.cs
new file mode 100644
index 00000000000..cb213cc9ed2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/subscriptions_on_stream_with_event_numbers_greater_than_2_billion.cs
@@ -0,0 +1,111 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services;
+using NUnit.Framework;
+using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
+using ResolvedEvent = EventStore.ClientAPI.ResolvedEvent;
+using StreamMetadata = EventStore.ClientAPI.StreamMetadata;
+
+namespace KurrentDB.Core.Tests.ClientAPI.ExpectedVersion64Bit;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+[Category("ClientAPI"), Category("LongRunning")]
+public class subscriptions_on_stream_with_event_numbers_greater_than_2_billion<TLogFormat, TStreamId>
+	: MiniNodeWithExistingRecords<TLogFormat, TStreamId> {
+	private const long intMaxValue = (long)int.MaxValue;
+
+	private string _volatileStreamOne = "subscriptions-volatile-1";
+	private string _volatileStreamTwo = "subscriptions-volatile-2";
+	private string _catchupStreamOne = "subscriptions-catchup-1";
+
+	private EventRecord _c1, _c2;
+
+	public override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteSingleEvent(_volatileStreamOne, intMaxValue + 1, new string('.', 3000), token: token);
+		await WriteSingleEvent(_volatileStreamOne, intMaxValue + 2, new string('.', 3000), token: token);
+
+		await WriteSingleEvent(_volatileStreamTwo, intMaxValue + 1, new string('.', 3000), token: token);
+		await WriteSingleEvent(_volatileStreamTwo, intMaxValue + 2, new string('.', 3000), token: token);
+
+		_c1 = await WriteSingleEvent(_catchupStreamOne, intMaxValue + 1, new string('.', 3000), token: token);
+		_c2 = await WriteSingleEvent(_catchupStreamOne, intMaxValue + 2, new string('.', 3000), token: token);
+	}
+
+	public override async Task Given() {
+		_store = BuildConnection(Node);
+		await _store.ConnectAsync();
+		await _store.SetStreamMetadataAsync(_volatileStreamOne, ExpectedVersion.Any,
+			StreamMetadata.Create(truncateBefore: intMaxValue + 1));
+		await _store.SetStreamMetadataAsync(_volatileStreamTwo, ExpectedVersion.Any,
+			StreamMetadata.Create(truncateBefore: intMaxValue + 1));
+		await _store.SetStreamMetadataAsync(_catchupStreamOne, ExpectedVersion.Any,
+			StreamMetadata.Create(truncateBefore: intMaxValue + 1));
+	}
+
+	[Test]
+	public async Task should_be_able_to_subscribe_to_stream_with_volatile_subscription() {
+		var evnt = new EventData(Guid.NewGuid(), "EventType", false, new byte[10], new byte[15]);
+		ResolvedEvent receivedEvent = new ResolvedEvent();
+		var mre = new ManualResetEvent(false);
+		await _store.SubscribeToStreamAsync(_volatileStreamOne, true, (s, e) => {
+			receivedEvent = e;
+			mre.Set();
+			return Task.CompletedTask;
+		});
+
+		await _store.AppendToStreamAsync(_volatileStreamOne, intMaxValue + 2, evnt);
+		Assert.That(mre.WaitOne(TimeSpan.FromSeconds(5)), "Timed out waiting for events to appear");
+
+		Assert.AreEqual(evnt.EventId, receivedEvent.Event.EventId);
+	}
+
+	[Test]
+	public async Task should_be_able_to_subscribe_to_all_with_volatile_subscription() {
+		var evnt = new EventData(Guid.NewGuid(), "EventType", false, new byte[10], new byte[15]);
+		ResolvedEvent receivedEvent = new ResolvedEvent();
+		var mre = new ManualResetEvent(false);
+		await _store.SubscribeToAllAsync(true, (s, e) => {
+			if (SystemStreams.IsSystemStream(e.OriginalStreamId))
+				return Task.CompletedTask;
+
+			receivedEvent = e;
+			mre.Set();
+			return Task.CompletedTask;
+		}, userCredentials: DefaultData.AdminCredentials);
+
+		await _store.AppendToStreamAsync(_volatileStreamTwo, intMaxValue + 2, evnt);
+		Assert.That(mre.WaitOne(TimeSpan.FromSeconds(5)), "Timed out waiting for events to appear");
+
+		Assert.AreEqual(evnt.EventId, receivedEvent.Event.EventId);
+	}
+
+	[Test]
+	public async Task should_be_able_to_subscribe_to_stream_with_catchup_subscription() {
+		var evnt = new EventData(Guid.NewGuid(), "EventType", false, new byte[10], new byte[15]);
+		List<ResolvedEvent> receivedEvents = new List<ResolvedEvent>();
+
+		var countdown = new CountdownEvent(3);
+		_store.SubscribeToStreamFrom(_catchupStreamOne, 0, CatchUpSubscriptionSettings.Default, (s, e) => {
+			receivedEvents.Add(e);
+			countdown.Signal();
+			return Task.CompletedTask;
+		});
+
+		await _store.AppendToStreamAsync(_catchupStreamOne, intMaxValue + 2, evnt);
+
+		Assert.That(countdown.Wait(TimeSpan.FromSeconds(5)), "Timed out waiting for events to appear");
+
+		Assert.AreEqual(3, receivedEvents.Count);
+		Assert.AreEqual(_c1.EventId, receivedEvents[0].Event.EventId);
+		Assert.AreEqual(_c2.EventId, receivedEvents[1].Event.EventId);
+		Assert.AreEqual(evnt.EventId, receivedEvents[2].Event.EventId);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/transactions_on_stream_with_event_numbers_greater_than_2_billion.cs b/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/transactions_on_stream_with_event_numbers_greater_than_2_billion.cs
new file mode 100644
index 00000000000..2827f993ce8
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/ExpectedVersion64Bit/transactions_on_stream_with_event_numbers_greater_than_2_billion.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
+using StreamMetadata = EventStore.ClientAPI.StreamMetadata;
+
+namespace KurrentDB.Core.Tests.ClientAPI.ExpectedVersion64Bit;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+[Category("ClientAPI"), Category("LongRunning")]
+public class transactions_on_stream_with_event_numbers_greater_than_2_billion<TLogFormat, TStreamId>
+	: MiniNodeWithExistingRecords<TLogFormat, TStreamId> {
+	private const string StreamName = "transactions_on_stream_with_event_numbers_greater_than_2_billion";
+	private const long intMaxValue = (long)int.MaxValue;
+
+	private EventRecord _r1, _r2, _r3, _r4, _r5;
+
+	public override async ValueTask WriteTestScenario(CancellationToken token) {
+		_r1 = await WriteSingleEvent(StreamName, intMaxValue + 1, new string('.', 3000), token: token);
+		_r2 = await WriteSingleEvent(StreamName, intMaxValue + 2, new string('.', 3000), token: token);
+		_r3 = await WriteSingleEvent(StreamName, intMaxValue + 3, new string('.', 3000), token: token);
+		_r4 = await WriteSingleEvent(StreamName, intMaxValue + 4, new string('.', 3000), token: token);
+		_r5 = await WriteSingleEvent(StreamName, intMaxValue + 5, new string('.', 3000), token: token);
+	}
+
+	public override async Task Given() {
+		_store = BuildConnection(Node);
+		await _store.ConnectAsync();
+		await _store.SetStreamMetadataAsync(StreamName, ExpectedVersion.Any,
+			StreamMetadata.Create(truncateBefore: intMaxValue + 1));
+	}
+
+	[Test]
+	public async Task should_be_able_to_append_to_stream_in_a_transaction() {
+		var evnt1 = new EventData(Guid.NewGuid(), "EventType", false, new byte[10], new byte[15]);
+		var evnt2 = new EventData(Guid.NewGuid(), "EventType", false, new byte[10], new byte[15]);
+
+		var transaction = await _store.StartTransactionAsync(StreamName, intMaxValue + 5, DefaultData.AdminCredentials)
+;
+		await transaction.WriteAsync(evnt1);
+		await transaction.WriteAsync(evnt2);
+		await transaction.CommitAsync();
+
+		var records = await _store.ReadStreamEventsForwardAsync(StreamName, intMaxValue, 10, false);
+		Assert.AreEqual(7, records.Events.Length);
+		Assert.AreEqual(_r1.EventId, records.Events[0].Event.EventId);
+		Assert.AreEqual(_r2.EventId, records.Events[1].Event.EventId);
+		Assert.AreEqual(_r3.EventId, records.Events[2].Event.EventId);
+		Assert.AreEqual(_r4.EventId, records.Events[3].Event.EventId);
+		Assert.AreEqual(_r5.EventId, records.Events[4].Event.EventId);
+		Assert.AreEqual(evnt1.EventId, records.Events[5].Event.EventId);
+		Assert.AreEqual(evnt2.EventId, records.Events[6].Event.EventId);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Helpers/EventDataComparer.cs b/src/KurrentDB.Core.Tests/ClientAPI/Helpers/EventDataComparer.cs
new file mode 100644
index 00000000000..e34fa82e627
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Helpers/EventDataComparer.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.ClientAPI;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Helpers;
+
+internal static class EventDataComparer {
+	public static bool Equal(EventData expected, RecordedEvent actual) {
+		if (expected.EventId != actual.EventId)
+			return false;
+
+		if (expected.Type != actual.EventType)
+			return false;
+
+		var expectedDataString = Helper.UTF8NoBom.GetString(expected.Data ?? new byte[0]);
+		var expectedMetadataString = Helper.UTF8NoBom.GetString(expected.Metadata ?? new byte[0]);
+
+		var actualDataString = Helper.UTF8NoBom.GetString(actual.Data ?? new byte[0]);
+		var actualMetadataDataString = Helper.UTF8NoBom.GetString(actual.Metadata ?? new byte[0]);
+
+		return expectedDataString == actualDataString && expectedMetadataString == actualMetadataDataString;
+	}
+
+	public static bool Equal(EventData[] expected, RecordedEvent[] actual) {
+		if (expected.Length != actual.Length)
+			return false;
+
+		for (var i = 0; i < expected.Length; i++) {
+			if (!Equal(expected[i], actual[i]))
+				return false;
+		}
+
+		return true;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Helpers/EventsStream.cs b/src/KurrentDB.Core.Tests/ClientAPI/Helpers/EventsStream.cs
new file mode 100644
index 00000000000..acb16231679
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Helpers/EventsStream.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Helpers;
+
+internal class EventsStream {
+	private const int SliceSize = 10;
+
+	public static async Task<int> Count(IEventStoreConnection store, string stream) {
+		var result = 0;
+		while (true) {
+			var slice = await store.ReadStreamEventsForwardAsync(stream, result, SliceSize, false);
+			result += slice.Events.Length;
+			if (slice.IsEndOfStream)
+				break;
+		}
+
+		return result;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Helpers/TcpType.cs b/src/KurrentDB.Core.Tests/ClientAPI/Helpers/TcpType.cs
new file mode 100644
index 00000000000..4a1179ea486
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Helpers/TcpType.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Tests.ClientAPI.Helpers;
+
+public enum TcpType {
+	Normal,
+	Ssl
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Helpers/TestConnection.cs b/src/KurrentDB.Core.Tests/ClientAPI/Helpers/TestConnection.cs
new file mode 100644
index 00000000000..6cb14d58f70
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Helpers/TestConnection.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using System.Threading;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Internal;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Core.Tests.Helpers;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Helpers;
+
+public static class TestConnection {
+	private static int _nextConnId = -1;
+
+	public static IEventStoreConnection Create(IPEndPoint endPoint, TcpType tcpType = TcpType.Ssl,
+		UserCredentials userCredentials = null) {
+
+		return EventStoreConnection.Create(Settings(tcpType, userCredentials),
+			endPoint.ToESTcpUri(),
+			$"ESC-{Interlocked.Increment(ref _nextConnId)}");
+	}
+
+	public static IEventStoreConnection To(MiniNode miniNode, TcpType tcpType,
+		UserCredentials userCredentials = null) {
+		return EventStoreConnection.Create(Settings(tcpType, userCredentials),
+			miniNode.TcpEndPoint.ToESTcpUri(),
+			$"ESC-{Interlocked.Increment(ref _nextConnId)}");
+	}
+
+	private static ConnectionSettingsBuilder Settings(TcpType tcpType, UserCredentials userCredentials) {
+		var settings = ConnectionSettings.Create()
+			.SetDefaultUserCredentials(userCredentials)
+			.UseCustomLogger(ClientApiLoggerBridge.Default)
+			.EnableVerboseLogging()
+			.LimitReconnectionsTo(10)
+			.LimitAttemptsForOperationTo(1)
+			.SetTimeoutCheckPeriodTo(TimeSpan.FromMilliseconds(100))
+			.SetReconnectionDelayTo(TimeSpan.Zero)
+			.FailOnNoServerResponse()
+			//.SetOperationTimeoutTo(TimeSpan.FromDays(1))
+			;
+		if (tcpType == TcpType.Ssl) {
+			settings.DisableServerCertificateValidation();
+		} else {
+			settings.DisableTls();
+		}
+
+		return settings;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Helpers/TestEvent.cs b/src/KurrentDB.Core.Tests/ClientAPI/Helpers/TestEvent.cs
new file mode 100644
index 00000000000..a861858db6e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Helpers/TestEvent.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using EventStore.ClientAPI;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Helpers;
+
+public class TestEvent {
+	public static EventData NewTestEvent(string data = null, string metadata = null, string eventName = "TestEvent") {
+		return NewTestEvent(Guid.NewGuid(), data, metadata, eventName);
+	}
+
+	public static EventData NewTestEvent(Guid eventId, string data = null, string metadata = null, string eventName = "TestEvent") {
+		var encodedData = Helper.UTF8NoBom.GetBytes(data ?? eventId.ToString());
+		var encodedMetadata = Helper.UTF8NoBom.GetBytes(metadata ?? "metadata");
+
+		return new EventData(eventId, eventName, false, encodedData, encodedMetadata);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Helpers/Writer.cs b/src/KurrentDB.Core.Tests/ClientAPI/Helpers/Writer.cs
new file mode 100644
index 00000000000..52d42e40bd8
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Helpers/Writer.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Helpers;
+
+internal class StreamWriter {
+	private readonly IEventStoreConnection _store;
+	private readonly string _stream;
+	private readonly long _version;
+
+	public StreamWriter(IEventStoreConnection store, string stream, long version) {
+		_store = store;
+		_stream = stream;
+		_version = version;
+	}
+
+	public async Task<TailWriter> Append(params EventData[] events) {
+		for (var i = 0; i < events.Length; i++) {
+			var expVer = _version == ExpectedVersion.Any ? ExpectedVersion.Any : _version + i;
+			var nextExpVer = (await _store.AppendToStreamAsync(_stream, expVer, new[] { events[i] })).NextExpectedVersion;
+			if (_version != ExpectedVersion.Any)
+				Assert.AreEqual(expVer + 1, nextExpVer);
+		}
+
+		return new TailWriter(_store, _stream);
+	}
+}
+
+internal class TailWriter {
+	private readonly IEventStoreConnection _store;
+	private readonly string _stream;
+
+	public TailWriter(IEventStoreConnection store, string stream) {
+		_store = store;
+		_stream = stream;
+	}
+
+	public async Task<TailWriter> Then(EventData @event, long expectedVersion) {
+		await _store.AppendToStreamAsync(_stream, expectedVersion, new[] { @event });
+		return this;
+	}
+}
+
+internal class TransactionalWriter {
+	private readonly IEventStoreConnection _store;
+	private readonly string _stream;
+
+	public TransactionalWriter(IEventStoreConnection store, string stream) {
+		_store = store;
+		_stream = stream;
+	}
+
+	public async Task<OngoingTransaction> StartTransaction(long expectedVersion) {
+		return new OngoingTransaction(await _store.StartTransactionAsync(_stream, expectedVersion));
+	}
+
+	public OngoingTransaction ContinueTransaction(long transactionId) {
+		return new OngoingTransaction(_store.ContinueTransaction(transactionId));
+	}
+}
+
+//TODO GFY this should be removed and merged with the public idea of a transaction.
+internal class OngoingTransaction {
+	private readonly EventStoreTransaction _transaction;
+
+	public long TransactionId => _transaction.TransactionId;
+
+	public OngoingTransaction(EventStoreTransaction transaction) {
+		_transaction = transaction;
+	}
+
+	public async Task<OngoingTransaction> Write(params EventData[] events) {
+		await _transaction.WriteAsync(events);
+		return this;
+	}
+
+	public Task<WriteResult> Commit() {
+		return _transaction.CommitAsync();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Security/AuthenticationTestBase.cs b/src/KurrentDB.Core.Tests/ClientAPI/Security/AuthenticationTestBase.cs
new file mode 100644
index 00000000000..f91ba3ee77c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Security/AuthenticationTestBase.cs
@@ -0,0 +1,246 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Security;
+
+public abstract class AuthenticationTestBase<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private readonly UserCredentials _userCredentials;
+	private MiniNode<TLogFormat, TStreamId> _node;
+	protected IEventStoreConnection Connection;
+
+	protected AuthenticationTestBase(UserCredentials userCredentials = null) {
+		_userCredentials = userCredentials;
+	}
+
+
+	public virtual IEventStoreConnection SetupConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.Create(node.TcpEndPoint, TcpType.Ssl, _userCredentials);
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName, enableTrustedAuth: true);
+		await _node.Start();
+
+		var userCreateEvent1 = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+		_node.Node.MainQueue.Publish(
+			new UserManagementMessage.Create(
+				new CallbackEnvelope(
+					m => {
+						Assert.IsTrue(m is UserManagementMessage.UpdateResult);
+						var msg = (UserManagementMessage.UpdateResult)m;
+						Assert.IsTrue(msg.Success);
+
+						userCreateEvent1.SetResult(true);
+					}),
+				SystemAccounts.System,
+				"user1",
+				"Test User 1",
+				new string[0],
+				"pa$$1"));
+
+		var userCreateEvent2 = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+		_node.Node.MainQueue.Publish(
+			new UserManagementMessage.Create(
+				new CallbackEnvelope(
+					m => {
+						Assert.IsTrue(m is UserManagementMessage.UpdateResult);
+						var msg = (UserManagementMessage.UpdateResult)m;
+						Assert.IsTrue(msg.Success);
+
+						userCreateEvent2.SetResult(true);
+					}),
+				SystemAccounts.System,
+				"user2",
+				"Test User 2",
+				new string[0],
+				"pa$$2"));
+
+		var adminCreateEvent2 = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+		_node.Node.MainQueue.Publish(
+			new UserManagementMessage.Create(
+				new CallbackEnvelope(
+					m => {
+						Assert.IsTrue(m is UserManagementMessage.UpdateResult);
+						var msg = (UserManagementMessage.UpdateResult)m;
+						Assert.IsTrue(msg.Success);
+
+						adminCreateEvent2.SetResult(true);
+					}),
+				SystemAccounts.System,
+				"adm",
+				"Administrator User",
+				new[] { SystemRoles.Admins },
+				"admpa$$"));
+
+		Assert.IsTrue(await userCreateEvent1.Task.WithTimeout(10000), "User 1 creation failed");
+		Assert.IsTrue(await userCreateEvent2.Task.WithTimeout(10000), "User 2 creation failed");
+		Assert.IsTrue(await adminCreateEvent2.Task.WithTimeout(10000), "Administrator User creation failed");
+
+		Connection = SetupConnection(_node);
+		await Connection.ConnectAsync();
+
+		await Connection.SetStreamMetadataAsync("noacl-stream", ExpectedVersion.NoStream, StreamMetadata.Build());
+		await Connection.SetStreamMetadataAsync(
+			"read-stream",
+			ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetReadRole("user1"));
+		await Connection.SetStreamMetadataAsync(
+			"write-stream",
+			ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetWriteRole("user1"));
+		await Connection.SetStreamMetadataAsync(
+			"metaread-stream",
+			ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetMetadataReadRole("user1"));
+		await Connection.SetStreamMetadataAsync(
+			"metawrite-stream",
+			ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetMetadataWriteRole("user1"));
+
+		await Connection.SetStreamMetadataAsync(
+			"$all",
+			ExpectedVersion.Any,
+			StreamMetadata.Build().SetReadRole("user1"),
+			new UserCredentials("adm", "admpa$$"));
+
+		await Connection.SetStreamMetadataAsync(
+			"$system-acl",
+			ExpectedVersion.NoStream,
+			StreamMetadata.Build()
+				.SetReadRole("user1")
+				.SetWriteRole("user1")
+				.SetMetadataReadRole("user1")
+				.SetMetadataWriteRole("user1"),
+			new UserCredentials("adm", "admpa$$"));
+		await Connection.SetStreamMetadataAsync(
+			"$system-adm",
+			ExpectedVersion.NoStream,
+			StreamMetadata.Build()
+				.SetReadRole(SystemRoles.Admins)
+				.SetWriteRole(SystemRoles.Admins)
+				.SetMetadataReadRole(SystemRoles.Admins)
+				.SetMetadataWriteRole(SystemRoles.Admins),
+			new UserCredentials("adm", "admpa$$"));
+
+		await Connection.SetStreamMetadataAsync(
+			"normal-all",
+			ExpectedVersion.NoStream,
+			StreamMetadata.Build()
+				.SetReadRole(SystemRoles.All)
+				.SetWriteRole(SystemRoles.All)
+				.SetMetadataReadRole(SystemRoles.All)
+				.SetMetadataWriteRole(SystemRoles.All));
+		await Connection.SetStreamMetadataAsync(
+			"$system-all",
+			ExpectedVersion.NoStream,
+			StreamMetadata.Build()
+				.SetReadRole(SystemRoles.All)
+				.SetWriteRole(SystemRoles.All)
+				.SetMetadataReadRole(SystemRoles.All)
+				.SetMetadataWriteRole(SystemRoles.All),
+			new UserCredentials("adm", "admpa$$"));
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await _node.Shutdown();
+		Connection.Close();
+		await base.TestFixtureTearDown();
+	}
+
+	protected Task ReadEvent(string streamId, string login, string password) {
+		return Connection.ReadEventAsync(streamId, -1, false,
+			login == null && password == null ? null : new UserCredentials(login, password));
+	}
+
+	protected Task ReadStreamForward(string streamId, string login, string password) {
+		return Connection.ReadStreamEventsForwardAsync(streamId, 0, 1, false,
+			login == null && password == null ? null : new UserCredentials(login, password));
+	}
+
+	protected Task ReadStreamBackward(string streamId, string login, string password) {
+		return Connection.ReadStreamEventsBackwardAsync(streamId, 0, 1, false,
+			login == null && password == null ? null : new UserCredentials(login, password));
+	}
+
+	protected Task WriteStream(string streamId, string login, string password) {
+		return Connection.AppendToStreamAsync(streamId, ExpectedVersion.Any, CreateEvents(),
+			login == null && password == null ? null : new UserCredentials(login, password));
+	}
+
+	protected Task<EventStoreTransaction> TransStart(string streamId, string login, string password) {
+		return Connection.StartTransactionAsync(streamId, ExpectedVersion.Any,
+			login == null && password == null ? null : new UserCredentials(login, password));
+	}
+
+	protected Task ReadAllForward(string login, string password) {
+		return Connection.ReadAllEventsForwardAsync(Position.Start, 1, false,
+			login == null && password == null ? null : new UserCredentials(login, password));
+	}
+
+	protected Task ReadAllBackward(string login, string password) {
+		return Connection.ReadAllEventsBackwardAsync(Position.End, 1, false,
+			login == null && password == null ? null : new UserCredentials(login, password));
+	}
+
+	protected Task ReadMeta(string streamId, string login, string password) {
+		return Connection.GetStreamMetadataAsRawBytesAsync(streamId,
+			login == null && password == null ? null : new UserCredentials(login, password));
+	}
+
+	protected Task WriteMeta(string streamId, string login, string password, string metawriteRole) {
+		return Connection.SetStreamMetadataAsync(streamId, ExpectedVersion.Any,
+			metawriteRole == null
+				? StreamMetadata.Build()
+				: StreamMetadata.Build().SetReadRole(metawriteRole)
+					.SetWriteRole(metawriteRole)
+					.SetMetadataReadRole(metawriteRole)
+					.SetMetadataWriteRole(metawriteRole),
+			login == null && password == null ? null : new UserCredentials(login, password));
+	}
+
+	protected async Task SubscribeToStream(string streamId, string login, string password) {
+		using (await Connection.SubscribeToStreamAsync(streamId, false, (x, y) => Task.CompletedTask,
+			(x, y, z) => { },
+			login == null && password == null ? null : new UserCredentials(login, password))) {
+		}
+	}
+
+	protected async Task SubscribeToAll(string login, string password) {
+		using (await Connection.SubscribeToAllAsync(false, (x, y) => Task.CompletedTask, (x, y, z) => { },
+			login == null && password == null ? null : new UserCredentials(login, password))) {
+		}
+	}
+
+	protected async Task<string> CreateStreamWithMeta(StreamMetadata metadata, string streamPrefix = null) {
+		var stream = (streamPrefix ?? string.Empty) + Guid.NewGuid().ToString();
+		await Connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
+			metadata, new UserCredentials("adm", "admpa$$"));
+		return stream;
+	}
+
+	protected Task DeleteStream(string streamId, string login, string password) {
+		return Connection.DeleteStreamAsync(streamId, ExpectedVersion.Any, true,
+			login == null && password == null ? null : new UserCredentials(login, password));
+	}
+
+	protected Task ExpectNoException(Func<Task> action) => action();
+
+	protected EventData[] CreateEvents() {
+		return new[] { new EventData(Guid.NewGuid(), "some-type", false, new byte[] { 1, 2, 3 }, null) };
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Security/all_stream_with_no_acl_security.cs b/src/KurrentDB.Core.Tests/ClientAPI/Security/all_stream_with_no_acl_security.cs
new file mode 100644
index 00000000000..749d131f59f
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Security/all_stream_with_no_acl_security.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using EventStore.ClientAPI.SystemData;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Security;
+
+[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class all_stream_with_no_acl_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		await Connection.SetStreamMetadataAsync("$all", ExpectedVersion.Any, StreamMetadata.Build(),
+			new UserCredentials("adm", "admpa$$"));
+	}
+
+	[Test]
+	public async Task write_to_all_is_never_allowed() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$all", null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$all", "user1", "pa$$1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$all", "adm", "admpa$$"));
+	}
+
+	[Test]
+	public async Task delete_of_all_is_never_allowed() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream("$all", null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream("$all", "user1", "pa$$1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream("$all", "adm", "admpa$$"));
+	}
+
+
+	[Test]
+	public async Task reading_and_subscribing_is_not_allowed_when_no_credentials_are_passed() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("$all", null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward("$all", null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward("$all", null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta("$all", null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream("$all", null, null));
+	}
+
+	[Test]
+	public async Task reading_and_subscribing_is_not_allowed_for_usual_user() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("$all", "user1", "pa$$1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward("$all", "user1", "pa$$1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward("$all", "user1", "pa$$1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta("$all", "user1", "pa$$1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream("$all", "user1", "pa$$1"));
+	}
+
+	[Test]
+	public async Task reading_and_subscribing_is_allowed_for_admin_user() {
+		await ReadEvent("$all", "adm", "admpa$$");
+		await ReadStreamForward("$all", "adm", "admpa$$");
+		await ReadStreamBackward("$all", "adm", "admpa$$");
+		await ReadMeta("$all", "adm", "admpa$$");
+		await SubscribeToStream("$all", "adm", "admpa$$");
+	}
+
+
+	[Test]
+	public async Task meta_write_is_not_allowed_when_no_credentials_are_passed() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta("$all", null, null, null));
+	}
+
+	[Test]
+	public async Task meta_write_is_not_allowed_for_usual_user() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta("$all", "user1", "pa$$1", null));
+	}
+
+	[Test]
+	public async Task meta_write_is_allowed_for_admin_user() {
+		await WriteMeta("$all", "adm", "admpa$$", null);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Security/authorized_default_credentials_security.cs b/src/KurrentDB.Core.Tests/ClientAPI/Security/authorized_default_credentials_security.cs
new file mode 100644
index 00000000000..c59da4b90ea
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Security/authorized_default_credentials_security.cs
@@ -0,0 +1,95 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI.Exceptions;
+using EventStore.ClientAPI.SystemData;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Security;
+
+[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class authorized_default_credentials_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
+	public authorized_default_credentials_security() : base(new UserCredentials("user1", "pa$$1")) {
+	}
+
+	[Test]
+	public async Task all_operations_succeeds_when_passing_no_explicit_credentials() {
+		await ReadAllForward(null, null);
+		await ReadAllBackward(null, null);
+
+		await ReadEvent("read-stream", null, null);
+		await ReadStreamForward("read-stream", null, null);
+		await ReadStreamBackward("read-stream", null, null);
+
+		await WriteStream("write-stream", null, null);
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			await ExpectNoException(async () => {
+				var trans = await TransStart("write-stream", null, null);
+				await trans.WriteAsync();
+				await trans.CommitAsync();
+			});
+		}
+
+		await ReadMeta("metaread-stream", null, null);
+		await WriteMeta("metawrite-stream", null, null, "user1");
+
+		await SubscribeToStream("read-stream", null, null);
+		await SubscribeToAll(null, null);
+	}
+
+	[Test]
+	public async Task all_operations_are_not_authenticated_when_overriden_with_not_existing_credentials() {
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadAllForward("badlogin", "badpass"));
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadAllBackward("badlogin", "badpass"));
+
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadEvent("read-stream", "badlogin", "badpass"));
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadStreamForward("read-stream", "badlogin", "badpass"));
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadStreamBackward("read-stream", "badlogin", "badpass"));
+
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => WriteStream("write-stream", "badlogin", "badpass"));
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => TransStart("write-stream", "badlogin", "badpass"));
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart("write-stream", null, null)).TransactionId;
+			var trans = Connection.ContinueTransaction(transId, new UserCredentials("badlogin", "badpass"));
+			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => trans.WriteAsync());
+			await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => trans.CommitAsync());
+		}
+
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadMeta("metaread-stream", "badlogin", "badpass"));
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => WriteMeta("metawrite-stream", "badlogin", "badpass", "user1"));
+
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => SubscribeToStream("read-stream", "badlogin", "badpass"));
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => SubscribeToAll("badlogin", "badpass"));
+	}
+
+	[Test]
+	public async Task all_operations_are_not_authorized_when_overriden_with_not_authorized_credentials() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadAllForward("user2", "pa$$2"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadAllBackward("user2", "pa$$2"));
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("read-stream", "user2", "pa$$2"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward("read-stream", "user2", "pa$$2"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward("read-stream", "user2", "pa$$2"));
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("write-stream", "user2", "pa$$2"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => TransStart("write-stream", "user2", "pa$$2"));
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart("write-stream", null, null)).TransactionId;
+			var trans = Connection.ContinueTransaction(transId, new UserCredentials("user2", "pa$$2"));
+			await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.WriteAsync());
+			await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.CommitAsync());
+		}
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta("metaread-stream", "user2", "pa$$2"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta("metawrite-stream", "user2", "pa$$2", "user1"));
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream("read-stream", "user2", "pa$$2"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToAll("user2", "pa$$2"));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Security/delete_stream_security.cs b/src/KurrentDB.Core.Tests/ClientAPI/Security/delete_stream_security.cs
new file mode 100644
index 00000000000..03d654c863c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Security/delete_stream_security.cs
@@ -0,0 +1,196 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using KurrentDB.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Security;
+
+[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class delete_stream_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
+	[Test]
+	public async Task delete_of_all_is_never_allowed() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream("$all", null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream("$all", "user1", "pa$$1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream("$all", "adm", "admpa$$"));
+	}
+
+	[Test]
+	public async Task deleting_normal_no_acl_stream_with_no_user_is_allowed() {
+		var streamId = await CreateStreamWithMeta(StreamMetadata.Build());
+		await DeleteStream(streamId, null, null);
+	}
+
+	[Test]
+	public async Task deleting_normal_no_acl_stream_with_existing_user_is_allowed() {
+		var streamId = await CreateStreamWithMeta(StreamMetadata.Build());
+		await DeleteStream(streamId, "user1", "pa$$1");
+	}
+
+	[Test]
+	public async Task deleting_normal_no_acl_stream_with_admin_user_is_allowed() {
+		var streamId = await CreateStreamWithMeta(StreamMetadata.Build());
+		await DeleteStream(streamId, "adm", "admpa$$");
+	}
+
+
+	[Test]
+	public async Task deleting_normal_user_stream_with_no_user_is_not_allowed() {
+		var streamId = await CreateStreamWithMeta(StreamMetadata.Build().SetDeleteRole("user1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(streamId, null, null));
+	}
+
+	[Test]
+	public async Task deleting_normal_user_stream_with_not_authorized_user_is_not_allowed() {
+		var streamId = await CreateStreamWithMeta(StreamMetadata.Build().SetDeleteRole("user1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(streamId, "user2", "pa$$2"));
+	}
+
+	[Test]
+	public async Task deleting_normal_user_stream_with_authorized_user_is_allowed() {
+		var streamId = await CreateStreamWithMeta(StreamMetadata.Build().SetDeleteRole("user1"));
+		await DeleteStream(streamId, "user1", "pa$$1");
+	}
+
+	[Test]
+	public async Task deleting_normal_user_stream_with_admin_user_is_allowed() {
+		var streamId = await CreateStreamWithMeta(StreamMetadata.Build().SetDeleteRole("user1"));
+		await DeleteStream(streamId, "adm", "admpa$$");
+	}
+
+
+	[Test]
+	public async Task deleting_normal_admin_stream_with_no_user_is_not_allowed() {
+		var streamId = await CreateStreamWithMeta(StreamMetadata.Build().SetDeleteRole(SystemRoles.Admins));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(streamId, null, null));
+	}
+
+	[Test]
+	public async Task deleting_normal_admin_stream_with_existing_user_is_not_allowed() {
+		var streamId = await CreateStreamWithMeta(StreamMetadata.Build().SetDeleteRole(SystemRoles.Admins));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(streamId, "user1", "pa$$1"));
+	}
+
+	[Test]
+	public async Task deleting_normal_admin_stream_with_admin_user_is_allowed() {
+		var streamId = await CreateStreamWithMeta(StreamMetadata.Build().SetDeleteRole(SystemRoles.Admins));
+		await DeleteStream(streamId, "adm", "admpa$$");
+	}
+
+
+	[Test]
+	public async Task deleting_normal_all_stream_with_no_user_is_allowed() {
+		var streamId = await CreateStreamWithMeta(StreamMetadata.Build().SetDeleteRole(SystemRoles.All));
+		await DeleteStream(streamId, null, null);
+	}
+
+	[Test]
+	public async Task deleting_normal_all_stream_with_existing_user_is_allowed() {
+		var streamId = await CreateStreamWithMeta(StreamMetadata.Build().SetDeleteRole(SystemRoles.All));
+		await DeleteStream(streamId, "user1", "pa$$1");
+	}
+
+	[Test]
+	public async Task deleting_normal_all_stream_with_admin_user_is_allowed() {
+		var streamId = await CreateStreamWithMeta(StreamMetadata.Build().SetDeleteRole(SystemRoles.All));
+		await DeleteStream(streamId, "adm", "admpa$$");
+	}
+
+	// $-stream
+
+	[Test]
+	public async Task deleting_system_no_acl_stream_with_no_user_is_not_allowed() {
+		var streamId = await CreateStreamWithMeta(streamPrefix: "$", metadata: StreamMetadata.Build());
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(streamId, null, null));
+	}
+
+	[Test]
+	public async Task deleting_system_no_acl_stream_with_existing_user_is_not_allowed() {
+		var streamId = await CreateStreamWithMeta(streamPrefix: "$", metadata: StreamMetadata.Build());
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(streamId, "user1", "pa$$1"));
+	}
+
+	[Test]
+	public async Task deleting_system_no_acl_stream_with_admin_user_is_allowed() {
+		var streamId = await CreateStreamWithMeta(streamPrefix: "$", metadata: StreamMetadata.Build());
+		await DeleteStream(streamId, "adm", "admpa$$");
+	}
+
+
+	[Test]
+	public async Task deleting_system_user_stream_with_no_user_is_not_allowed() {
+		var streamId = await CreateStreamWithMeta(streamPrefix: "$",
+			metadata: StreamMetadata.Build().SetDeleteRole("user1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(streamId, null, null));
+	}
+
+	[Test]
+	public async Task deleting_system_user_stream_with_not_authorized_user_is_not_allowed() {
+		var streamId = await CreateStreamWithMeta(streamPrefix: "$",
+			metadata: StreamMetadata.Build().SetDeleteRole("user1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(streamId, "user2", "pa$$2"));
+	}
+
+	[Test]
+	public async Task deleting_system_user_stream_with_authorized_user_is_allowed() {
+		var streamId = await CreateStreamWithMeta(streamPrefix: "$",
+			metadata: StreamMetadata.Build().SetDeleteRole("user1"));
+		await DeleteStream(streamId, "user1", "pa$$1");
+	}
+
+	[Test]
+	public async Task deleting_system_user_stream_with_admin_user_is_allowed() {
+		var streamId = await CreateStreamWithMeta(streamPrefix: "$",
+			metadata: StreamMetadata.Build().SetDeleteRole("user1"));
+		await DeleteStream(streamId, "adm", "admpa$$");
+	}
+
+
+	[Test]
+	public async Task deleting_system_admin_stream_with_no_user_is_not_allowed() {
+		var streamId = await CreateStreamWithMeta(streamPrefix: "$",
+			metadata: StreamMetadata.Build().SetDeleteRole(SystemRoles.Admins));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(streamId, null, null));
+	}
+
+	[Test]
+	public async Task deleting_system_admin_stream_with_existing_user_is_not_allowed() {
+		var streamId = await CreateStreamWithMeta(streamPrefix: "$",
+			metadata: StreamMetadata.Build().SetDeleteRole(SystemRoles.Admins));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(streamId, "user1", "pa$$1"));
+	}
+
+	[Test]
+	public async Task deleting_system_admin_stream_with_admin_user_is_allowed() {
+		var streamId = await CreateStreamWithMeta(streamPrefix: "$",
+			metadata: StreamMetadata.Build().SetDeleteRole(SystemRoles.Admins));
+		await DeleteStream(streamId, "adm", "admpa$$");
+	}
+
+
+	[Test]
+	public async Task deleting_system_all_stream_with_no_user_is_allowed() {
+		var streamId = await CreateStreamWithMeta(streamPrefix: "$",
+			metadata: StreamMetadata.Build().SetDeleteRole(SystemRoles.All));
+		await DeleteStream(streamId, null, null);
+	}
+
+	[Test]
+	public async Task deleting_system_all_stream_with_existing_user_is_allowed() {
+		var streamId = await CreateStreamWithMeta(streamPrefix: "$",
+			metadata: StreamMetadata.Build().SetDeleteRole(SystemRoles.All));
+		await DeleteStream(streamId, "user1", "pa$$1");
+	}
+
+	[Test]
+	public async Task deleting_system_all_stream_with_admin_user_is_allowed() {
+		var streamId = await CreateStreamWithMeta(streamPrefix: "$",
+			metadata: StreamMetadata.Build().SetDeleteRole(SystemRoles.All));
+		await DeleteStream(streamId, "adm", "admpa$$");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Security/multiple_role_security.cs b/src/KurrentDB.Core.Tests/ClientAPI/Security/multiple_role_security.cs
new file mode 100644
index 00000000000..6ed49e342e9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Security/multiple_role_security.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Security;
+
+[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class multiple_role_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var settings = new SystemSettings(
+			new StreamAcl(new[] { "user1", "user2" }, new[] { "$admins", "user1" }, new[] { "user1", SystemRoles.All },
+				null, null),
+			null);
+		await Connection.SetSystemSettingsAsync(settings, new UserCredentials("adm", "admpa$$"));
+	}
+
+	[Test]
+	public async Task multiple_roles_are_handled_correctly() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("usr-stream", null, null));
+		await ReadEvent("usr-stream", "user1", "pa$$1");
+		await ReadEvent("usr-stream", "user2", "pa$$2");
+		await ReadEvent("usr-stream", "adm", "admpa$$");
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("usr-stream", null, null));
+		await WriteStream("usr-stream", "user1", "pa$$1");
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("usr-stream", "user2", "pa$$2"));
+		await WriteStream("usr-stream", "adm", "admpa$$");
+
+		await DeleteStream("usr-stream1", null, null);
+		await DeleteStream("usr-stream2", "user1", "pa$$1");
+		await DeleteStream("usr-stream3", "user2", "pa$$2");
+		await DeleteStream("usr-stream4", "adm", "admpa$$");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Security/overriden_system_stream_security.cs b/src/KurrentDB.Core.Tests/ClientAPI/Security/overriden_system_stream_security.cs
new file mode 100644
index 00000000000..f350201f636
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Security/overriden_system_stream_security.cs
@@ -0,0 +1,130 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using EventStore.ClientAPI.SystemData;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Security;
+
+[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class overriden_system_stream_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var settings = new SystemSettings(userStreamAcl: null,
+			systemStreamAcl: new StreamAcl("user1", "user1", "user1", "user1", "user1"));
+		await Connection.SetSystemSettingsAsync(settings, new UserCredentials("adm", "admpa$$"));
+	}
+
+	[Test]
+	public async Task operations_on_system_stream_succeed_for_authorized_user() {
+		const string stream = "$sys-authorized-user";
+		await ReadEvent(stream, "user1", "pa$$1");
+		await ReadStreamForward(stream, "user1", "pa$$1");
+		await ReadStreamBackward(stream, "user1", "pa$$1");
+
+		await WriteStream(stream, "user1", "pa$$1");
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			await TransStart(stream, "user1", "pa$$1");
+		}
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart(stream, "adm", "admpa$$")).TransactionId;
+			var trans = Connection.ContinueTransaction(transId, new UserCredentials("user1", "pa$$1"));
+			await trans.WriteAsync();
+			await trans.CommitAsync();
+		}
+
+		await ReadMeta(stream, "user1", "pa$$1");
+		await WriteMeta(stream, "user1", "pa$$1", null);
+
+		await SubscribeToStream(stream, "user1", "pa$$1");
+
+		await DeleteStream(stream, "user1", "pa$$1");
+	}
+
+	[Test]
+	public async Task operations_on_system_stream_fail_for_not_authorized_user() {
+		const string stream = "$sys-not-authorized-user";
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent(stream, "user2", "pa$$2"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward(stream, "user2", "pa$$2"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward(stream, "user2", "pa$$2"));
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream(stream, "user2", "pa$$2"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => TransStart(stream, "user2", "pa$$2"));
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart(stream, "adm", "admpa$$")).TransactionId;
+			var trans = Connection.ContinueTransaction(transId, new UserCredentials("user2", "pa$$2"));
+			await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.WriteAsync());
+			await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.CommitAsync());
+		}
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta(stream, "user2", "pa$$2"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta(stream, "user2", "pa$$2", null));
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream(stream, "user2", "pa$$2"));
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(stream, "user2", "pa$$2"));
+	}
+
+	[Test]
+	public async Task operations_on_system_stream_fail_for_anonymous_user() {
+		const string stream = "$sys-anonymous-user";
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent(stream, null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward(stream, null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward(stream, null, null));
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream(stream, null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => TransStart(stream, null, null));
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart(stream, "adm", "admpa$$")).TransactionId;
+			var trans = Connection.ContinueTransaction(transId);
+			await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.WriteAsync());
+			await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.CommitAsync());
+		}
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta(stream, null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta(stream, null, null, null));
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream(stream, null, null));
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(stream, null, null));
+	}
+
+	[Test]
+	public async Task operations_on_system_stream_succeed_for_admin() {
+		const string stream = "$sys-admin";
+		await ReadEvent(stream, "adm", "admpa$$");
+		await ReadStreamForward(stream, "adm", "admpa$$");
+		await ReadStreamBackward(stream, "adm", "admpa$$");
+
+		await WriteStream(stream, "adm", "admpa$$");
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			await TransStart(stream, "adm", "admpa$$");
+		}
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart(stream, "adm", "admpa$$")).TransactionId;
+			var trans = Connection.ContinueTransaction(transId, new UserCredentials("adm", "admpa$$"));
+			await trans.WriteAsync();
+			await trans.CommitAsync();
+		}
+
+		await ReadMeta(stream, "adm", "admpa$$");
+		await WriteMeta(stream, "adm", "admpa$$", null);
+
+		await SubscribeToStream(stream, "adm", "admpa$$");
+
+		await DeleteStream(stream, "adm", "admpa$$");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Security/overriden_system_stream_security_for_all.cs b/src/KurrentDB.Core.Tests/ClientAPI/Security/overriden_system_stream_security_for_all.cs
new file mode 100644
index 00000000000..5b9e8aefd81
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Security/overriden_system_stream_security_for_all.cs
@@ -0,0 +1,110 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Security;
+
+[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class overriden_system_stream_security_for_all<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var settings = new SystemSettings(
+			userStreamAcl: null,
+			systemStreamAcl: new StreamAcl(SystemRoles.All, SystemRoles.All, SystemRoles.All, SystemRoles.All,
+				SystemRoles.All));
+		await Connection.SetSystemSettingsAsync(settings, new UserCredentials("adm", "admpa$$"));
+	}
+
+	[Test]
+	public async Task operations_on_system_stream_succeeds_for_user() {
+		const string stream = "$sys-authorized-user";
+		await ReadEvent(stream, "user1", "pa$$1");
+		await ReadStreamForward(stream, "user1", "pa$$1");
+		await ReadStreamBackward(stream, "user1", "pa$$1");
+
+		await WriteStream(stream, "user1", "pa$$1");
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			await TransStart(stream, "user1", "pa$$1");
+		}
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart(stream, "adm", "admpa$$")).TransactionId;
+			var trans = Connection.ContinueTransaction(transId, new UserCredentials("user1", "pa$$1"));
+			await trans.WriteAsync();
+			await trans.CommitAsync();
+		}
+
+		await ReadMeta(stream, "user1", "pa$$1");
+		await WriteMeta(stream, "user1", "pa$$1", null);
+
+		await SubscribeToStream(stream, "user1", "pa$$1");
+
+		await DeleteStream(stream, "user1", "pa$$1");
+	}
+
+	[Test]
+	public async Task operations_on_system_stream_fail_for_anonymous_user() {
+		const string stream = "$sys-anonymous-user";
+		await ReadEvent(stream, null, null);
+		await ReadStreamForward(stream, null, null);
+		await ReadStreamBackward(stream, null, null);
+
+		await WriteStream(stream, null, null);
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			await TransStart(stream, null, null);
+		}
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart(stream, "adm", "admpa$$")).TransactionId;
+			var trans = Connection.ContinueTransaction(transId);
+			await trans.WriteAsync();
+			await trans.CommitAsync();
+		}
+
+		await ReadMeta(stream, null, null);
+		await WriteMeta(stream, null, null, null);
+
+		await SubscribeToStream(stream, null, null);
+
+		await DeleteStream(stream, null, null);
+	}
+
+	[Test]
+	public async Task operations_on_system_stream_succeed_for_admin() {
+		const string stream = "$sys-admin";
+		await ReadEvent(stream, "adm", "admpa$$");
+		await ReadStreamForward(stream, "adm", "admpa$$");
+		await ReadStreamBackward(stream, "adm", "admpa$$");
+
+		await WriteStream(stream, "adm", "admpa$$");
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			await TransStart(stream, "adm", "admpa$$");
+		}
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart(stream, "adm", "admpa$$")).TransactionId;
+			var trans = Connection.ContinueTransaction(transId, new UserCredentials("adm", "admpa$$"));
+			await trans.WriteAsync();
+			await trans.CommitAsync();
+		}
+
+		await ReadMeta(stream, "adm", "admpa$$");
+		await WriteMeta(stream, "adm", "admpa$$", null);
+
+		await SubscribeToStream(stream, "adm", "admpa$$");
+
+		await DeleteStream(stream, "adm", "admpa$$");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Security/overriden_user_stream_security.cs b/src/KurrentDB.Core.Tests/ClientAPI/Security/overriden_user_stream_security.cs
new file mode 100644
index 00000000000..72f998b4897
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Security/overriden_user_stream_security.cs
@@ -0,0 +1,130 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using EventStore.ClientAPI.SystemData;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Security;
+
+[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class overriden_user_stream_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var settings = new SystemSettings(userStreamAcl: new StreamAcl("user1", "user1", "user1", "user1", "user1"),
+			systemStreamAcl: null);
+		await Connection.SetSystemSettingsAsync(settings, new UserCredentials("adm", "admpa$$"));
+	}
+
+	[Test]
+	public async Task operations_on_user_stream_succeeds_for_authorized_user() {
+		const string stream = "user-authorized-user";
+		await ReadEvent(stream, "user1", "pa$$1");
+		await ReadStreamForward(stream, "user1", "pa$$1");
+		await ReadStreamBackward(stream, "user1", "pa$$1");
+
+		await WriteStream(stream, "user1", "pa$$1");
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			await TransStart(stream, "user1", "pa$$1");
+		}
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart(stream, "adm", "admpa$$")).TransactionId;
+			var trans = Connection.ContinueTransaction(transId, new UserCredentials("user1", "pa$$1"));
+			await trans.WriteAsync();
+			await trans.CommitAsync();
+		}
+
+		await ReadMeta(stream, "user1", "pa$$1");
+		await WriteMeta(stream, "user1", "pa$$1", null);
+
+		await SubscribeToStream(stream, "user1", "pa$$1");
+
+		await DeleteStream(stream, "user1", "pa$$1");
+	}
+
+	[Test]
+	public async Task operations_on_user_stream_fail_for_not_authorized_user() {
+		const string stream = "user-not-authorized";
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent(stream, "user2", "pa$$2"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward(stream, "user2", "pa$$2"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward(stream, "user2", "pa$$2"));
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream(stream, "user2", "pa$$2"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => TransStart(stream, "user2", "pa$$2"));
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart(stream, "adm", "admpa$$")).TransactionId;
+			var trans = Connection.ContinueTransaction(transId, new UserCredentials("user2", "pa$$2"));
+			await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.WriteAsync());
+			await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.CommitAsync());
+		}
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta(stream, "user2", "pa$$2"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta(stream, "user2", "pa$$2", null));
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream(stream, "user2", "pa$$2"));
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(stream, "user2", "pa$$2"));
+	}
+
+	[Test]
+	public async Task operations_on_user_stream_fail_for_anonymous_user() {
+		const string stream = "user-anonymous-user";
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent(stream, null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward(stream, null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward(stream, null, null));
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream(stream, null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => TransStart(stream, null, null));
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart(stream, "adm", "admpa$$")).TransactionId;
+			var trans = Connection.ContinueTransaction(transId);
+			await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.WriteAsync());
+			await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.CommitAsync());
+		}
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta(stream, null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta(stream, null, null, null));
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream(stream, null, null));
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => DeleteStream(stream, null, null));
+	}
+
+	[Test]
+	public async Task operations_on_user_stream_succeed_for_admin() {
+		const string stream = "user-admin";
+		await ReadEvent(stream, "adm", "admpa$$");
+		await ReadStreamForward(stream, "adm", "admpa$$");
+		await ReadStreamBackward(stream, "adm", "admpa$$");
+
+		await WriteStream(stream, "adm", "admpa$$");
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			await TransStart(stream, "adm", "admpa$$");
+		}
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart(stream, "adm", "admpa$$")).TransactionId;
+			var trans = Connection.ContinueTransaction(transId, new UserCredentials("adm", "admpa$$"));
+			await trans.WriteAsync();
+			await trans.CommitAsync();
+		}
+
+		await ReadMeta(stream, "adm", "admpa$$");
+		await WriteMeta(stream, "adm", "admpa$$", null);
+
+		await SubscribeToStream(stream, "adm", "admpa$$");
+
+		await DeleteStream(stream, "adm", "admpa$$");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Security/read_all_security.cs b/src/KurrentDB.Core.Tests/ClientAPI/Security/read_all_security.cs
new file mode 100644
index 00000000000..68289275bde
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Security/read_all_security.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI.Exceptions;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Security;
+
+[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_all_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
+	[Test]
+	public async Task reading_all_with_not_existing_credentials_is_not_authenticated() {
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadAllForward("badlogin", "badpass"));
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadAllBackward("badlogin", "badpass"));
+	}
+
+	[Test]
+	public async Task reading_all_with_no_credentials_is_denied() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadAllForward(null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadAllBackward(null, null));
+	}
+
+	[Test]
+	public async Task reading_all_with_not_authorized_user_credentials_is_denied() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadAllForward("user2", "pa$$2"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadAllBackward("user2", "pa$$2"));
+	}
+
+	[Test]
+	public async Task reading_all_with_authorized_user_credentials_succeeds() {
+		await ReadAllForward("user1", "pa$$1");
+		await ReadAllBackward("user1", "pa$$1");
+	}
+
+	[Test]
+	public async Task reading_all_with_admin_credentials_succeeds() {
+		await ReadAllForward("adm", "admpa$$");
+		await ReadAllBackward("adm", "admpa$$");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Security/read_stream_meta_security.cs b/src/KurrentDB.Core.Tests/ClientAPI/Security/read_stream_meta_security.cs
new file mode 100644
index 00000000000..45392a5e9b4
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Security/read_stream_meta_security.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI.Exceptions;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Security;
+
+[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_stream_meta_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
+	[Test]
+	public async Task reading_stream_meta_with_not_existing_credentials_is_not_authenticated() {
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadMeta("metaread-stream", "badlogin", "badpass"));
+	}
+
+	[Test]
+	public async Task reading_stream_meta_with_no_credentials_is_denied() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta("metaread-stream", null, null));
+	}
+
+	[Test]
+	public async Task reading_stream_meta_with_not_authorized_user_credentials_is_denied() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta("metaread-stream", "user2", "pa$$2"));
+	}
+
+	[Test]
+	public async Task reading_stream_meta_with_authorized_user_credentials_succeeds() {
+		await ReadMeta("metaread-stream", "user1", "pa$$1");
+	}
+
+	[Test]
+	public async Task reading_stream_meta_with_admin_user_credentials_succeeds() {
+		await ReadMeta("metaread-stream", "adm", "admpa$$");
+	}
+
+
+	[Test]
+	public async Task reading_no_acl_stream_meta_succeeds_when_no_credentials_are_passed() {
+		await ReadMeta("noacl-stream", null, null);
+	}
+
+	[Test]
+	public async Task reading_no_acl_stream_meta_is_not_authenticated_when_not_existing_credentials_are_passed() {
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadMeta("noacl-stream", "badlogin", "badpass"));
+	}
+
+	[Test]
+	public async Task reading_no_acl_stream_meta_succeeds_when_any_existing_user_credentials_are_passed() {
+		await ReadMeta("noacl-stream", "user1", "pa$$1");
+		await ReadMeta("noacl-stream", "user2", "pa$$2");
+	}
+
+	[Test]
+	public async Task reading_no_acl_stream_meta_succeeds_when_admin_user_credentials_are_passed() {
+		await ReadMeta("noacl-stream", "adm", "admpa$$");
+	}
+
+
+	[Test]
+	public async Task reading_all_access_normal_stream_meta_succeeds_when_no_credentials_are_passed() {
+		await ReadMeta("normal-all", null, null);
+	}
+
+	[Test]
+	public async Task
+		reading_all_access_normal_stream_meta_is_not_authenticated_when_not_existing_credentials_are_passed() {
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadMeta("normal-all", "badlogin", "badpass"));
+	}
+
+	[Test]
+	public async Task reading_all_access_normal_stream_meta_succeeds_when_any_existing_user_credentials_are_passed() {
+		await ReadMeta("normal-all", "user1", "pa$$1");
+		await ReadMeta("normal-all", "user2", "pa$$2");
+	}
+
+	[Test]
+	public async Task reading_all_access_normal_stream_meta_succeeds_when_admin_user_credentials_are_passed() {
+		await ReadMeta("normal-all", "adm", "admpa$$");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Security/read_stream_security.cs b/src/KurrentDB.Core.Tests/ClientAPI/Security/read_stream_security.cs
new file mode 100644
index 00000000000..92f5eefe099
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Security/read_stream_security.cs
@@ -0,0 +1,112 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI.Exceptions;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Security;
+
+[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_stream_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
+	[Test]
+	public async Task reading_stream_with_not_existing_credentials_is_not_authenticated() {
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadEvent("read-stream", "badlogin", "badpass"));
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadStreamForward("read-stream", "badlogin", "badpass"));
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadStreamBackward("read-stream", "badlogin", "badpass"));
+	}
+
+	[Test]
+	public async Task reading_stream_with_no_credentials_is_denied() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("read-stream", null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward("read-stream", null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward("read-stream", null, null));
+	}
+
+	[Test]
+	public async Task reading_stream_with_not_authorized_user_credentials_is_denied() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("read-stream", "user2", "pa$$2"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward("read-stream", "user2", "pa$$2"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward("read-stream", "user2", "pa$$2"));
+	}
+
+	[Test]
+	public async Task reading_stream_with_authorized_user_credentials_succeeds() {
+		await ReadEvent("read-stream", "user1", "pa$$1");
+		await ReadStreamForward("read-stream", "user1", "pa$$1");
+		await ReadStreamBackward("read-stream", "user1", "pa$$1");
+	}
+
+	[Test]
+	public async Task reading_stream_with_admin_user_credentials_succeeds() {
+		await ReadEvent("read-stream", "adm", "admpa$$");
+		await ReadStreamForward("read-stream", "adm", "admpa$$");
+		await ReadStreamBackward("read-stream", "adm", "admpa$$");
+	}
+
+
+	[Test]
+	public async Task reading_no_acl_stream_succeeds_when_no_credentials_are_passed() {
+		await ReadEvent("noacl-stream", null, null);
+		await ReadStreamForward("noacl-stream", null, null);
+		await ReadStreamBackward("noacl-stream", null, null);
+	}
+
+	[Test]
+	public async Task reading_no_acl_stream_is_not_authenticated_when_not_existing_credentials_are_passed() {
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadEvent("noacl-stream", "badlogin", "badpass"));
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadStreamForward("noacl-stream", "badlogin", "badpass"));
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadStreamBackward("noacl-stream", "badlogin", "badpass"));
+	}
+
+	[Test]
+	public async Task reading_no_acl_stream_succeeds_when_any_existing_user_credentials_are_passed() {
+		await ReadEvent("noacl-stream", "user1", "pa$$1");
+		await ReadStreamForward("noacl-stream", "user1", "pa$$1");
+		await ReadStreamBackward("noacl-stream", "user1", "pa$$1");
+		await ReadEvent("noacl-stream", "user2", "pa$$2");
+		await ReadStreamForward("noacl-stream", "user2", "pa$$2");
+		await ReadStreamBackward("noacl-stream", "user2", "pa$$2");
+	}
+
+	[Test]
+	public async Task reading_no_acl_stream_succeeds_when_admin_user_credentials_are_passed() {
+		await ReadEvent("noacl-stream", "adm", "admpa$$");
+		await ReadStreamForward("noacl-stream", "adm", "admpa$$");
+		await ReadStreamBackward("noacl-stream", "adm", "admpa$$");
+	}
+
+
+	[Test]
+	public async Task reading_all_access_normal_stream_succeeds_when_no_credentials_are_passed() {
+		await ReadEvent("normal-all", null, null);
+		await ReadStreamForward("normal-all", null, null);
+		await ReadStreamBackward("normal-all", null, null);
+	}
+
+	[Test]
+	public async Task reading_all_access_normal_stream_is_not_authenticated_when_not_existing_credentials_are_passed() {
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadEvent("normal-all", "badlogin", "badpass"));
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadStreamForward("normal-all", "badlogin", "badpass"));
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => ReadStreamBackward("normal-all", "badlogin", "badpass"));
+	}
+
+	[Test]
+	public async Task reading_all_access_normal_stream_succeeds_when_any_existing_user_credentials_are_passed() {
+		await ReadEvent("normal-all", "user1", "pa$$1");
+		await ReadStreamForward("normal-all", "user1", "pa$$1");
+		await ReadStreamBackward("normal-all", "user1", "pa$$1");
+		await ReadEvent("normal-all", "user2", "pa$$2");
+		await ReadStreamForward("normal-all", "user2", "pa$$2");
+		await ReadStreamBackward("normal-all", "user2", "pa$$2");
+	}
+
+	[Test]
+	public async Task reading_all_access_normal_stream_succeeds_when_admin_user_credentials_are_passed() {
+		await ReadEvent("normal-all", "adm", "admpa$$");
+		await ReadStreamForward("normal-all", "adm", "admpa$$");
+		await ReadStreamBackward("normal-all", "adm", "admpa$$");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Security/stream_security_inheritance.cs b/src/KurrentDB.Core.Tests/ClientAPI/Security/stream_security_inheritance.cs
new file mode 100644
index 00000000000..3c50e8bff53
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Security/stream_security_inheritance.cs
@@ -0,0 +1,126 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Security;
+
+[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class stream_security_inheritance<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var settings = new SystemSettings(userStreamAcl: new StreamAcl(null, "user1", null, null, null),
+			systemStreamAcl: new StreamAcl(null, "user1", null, null, null));
+		await Connection.SetSystemSettingsAsync(settings, new UserCredentials("adm", "admpa$$"));
+
+		await Connection.SetStreamMetadataAsync("user-no-acl", ExpectedVersion.NoStream,
+			StreamMetadata.Build(), new UserCredentials("adm", "admpa$$"));
+		await Connection.SetStreamMetadataAsync("user-w-diff", ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetWriteRole("user2"), new UserCredentials("adm", "admpa$$"));
+		await Connection.SetStreamMetadataAsync("user-w-multiple", ExpectedVersion.NoStream,
+				StreamMetadata.Build().SetWriteRoles(new[] { "user1", "user2" }),
+				new UserCredentials("adm", "admpa$$"))
+			;
+		await Connection.SetStreamMetadataAsync("user-w-restricted", ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetWriteRoles(new string[0]), new UserCredentials("adm", "admpa$$"));
+		await Connection.SetStreamMetadataAsync("user-w-all", ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetWriteRole(SystemRoles.All), new UserCredentials("adm", "admpa$$"));
+
+		await Connection.SetStreamMetadataAsync("user-r-restricted", ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetReadRole("user1"), new UserCredentials("adm", "admpa$$"));
+
+		await Connection.SetStreamMetadataAsync("$sys-no-acl", ExpectedVersion.NoStream,
+			StreamMetadata.Build(), new UserCredentials("adm", "admpa$$"));
+		await Connection.SetStreamMetadataAsync("$sys-w-diff", ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetWriteRole("user2"), new UserCredentials("adm", "admpa$$"));
+		await Connection.SetStreamMetadataAsync("$sys-w-multiple", ExpectedVersion.NoStream,
+				StreamMetadata.Build().SetWriteRoles(new[] { "user1", "user2" }),
+				new UserCredentials("adm", "admpa$$"))
+			;
+		await Connection.SetStreamMetadataAsync("$sys-w-restricted", ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetWriteRoles(new string[0]), new UserCredentials("adm", "admpa$$"));
+		await Connection.SetStreamMetadataAsync("$sys-w-all", ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetWriteRole(SystemRoles.All), new UserCredentials("adm", "admpa$$"));
+	}
+
+	[Test]
+	public async Task acl_inheritance_is_working_properly_on_user_streams() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("user-no-acl", null, null));
+		await WriteStream("user-no-acl", "user1", "pa$$1");
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("user-no-acl", "user2", "pa$$2"));
+		await WriteStream("user-no-acl", "adm", "admpa$$");
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("user-w-diff", null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("user-w-diff", "user1", "pa$$1"));
+		await WriteStream("user-w-diff", "user2", "pa$$2");
+		await WriteStream("user-w-diff", "adm", "admpa$$");
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("user-w-multiple", null, null));
+		await WriteStream("user-w-multiple", "user1", "pa$$1");
+		await WriteStream("user-w-multiple", "user2", "pa$$2");
+		await WriteStream("user-w-multiple", "adm", "admpa$$");
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("user-w-restricted", null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("user-w-restricted", "user1", "pa$$1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("user-w-restricted", "user2", "pa$$2"));
+		await WriteStream("user-w-restricted", "adm", "admpa$$");
+
+		await WriteStream("user-w-all", null, null);
+		await WriteStream("user-w-all", "user1", "pa$$1");
+		await WriteStream("user-w-all", "user2", "pa$$2");
+		await WriteStream("user-w-all", "adm", "admpa$$");
+
+
+		await ReadEvent("user-no-acl", null, null);
+		await ReadEvent("user-no-acl", "user1", "pa$$1");
+		await ReadEvent("user-no-acl", "user2", "pa$$2");
+		await ReadEvent("user-no-acl", "adm", "admpa$$");
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("user-r-restricted", null, null));
+		await ReadEvent("user-r-restricted", "user1", "pa$$1");
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("user-r-restricted", "user2", "pa$$2"));
+		await ReadEvent("user-r-restricted", "adm", "admpa$$");
+	}
+
+	[Test]
+	public async Task acl_inheritance_is_working_properly_on_system_streams() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$sys-no-acl", null, null));
+		await WriteStream("$sys-no-acl", "user1", "pa$$1");
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$sys-no-acl", "user2", "pa$$2"));
+		await WriteStream("$sys-no-acl", "adm", "admpa$$");
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$sys-w-diff", null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$sys-w-diff", "user1", "pa$$1"));
+		await WriteStream("$sys-w-diff", "user2", "pa$$2");
+		await WriteStream("$sys-w-diff", "adm", "admpa$$");
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$sys-w-multiple", null, null));
+		await WriteStream("$sys-w-multiple", "user1", "pa$$1");
+		await WriteStream("$sys-w-multiple", "user2", "pa$$2");
+		await WriteStream("$sys-w-multiple", "adm", "admpa$$");
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$sys-w-restricted", null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$sys-w-restricted", "user1", "pa$$1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$sys-w-restricted", "user2", "pa$$2"));
+		await WriteStream("$sys-w-restricted", "adm", "admpa$$");
+
+		await WriteStream("$sys-w-all", null, null);
+		await WriteStream("$sys-w-all", "user1", "pa$$1");
+		await WriteStream("$sys-w-all", "user2", "pa$$2");
+		await WriteStream("$sys-w-all", "adm", "admpa$$");
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("$sys-no-acl", null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("$sys-no-acl", "user1", "pa$$1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("$sys-no-acl", "user2", "pa$$2"));
+		await ReadEvent("$sys-no-acl", "adm", "admpa$$");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Security/subscribe_to_all_security.cs b/src/KurrentDB.Core.Tests/ClientAPI/Security/subscribe_to_all_security.cs
new file mode 100644
index 00000000000..073fdf51940
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Security/subscribe_to_all_security.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI.Exceptions;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Security;
+
+[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class subscribe_to_all_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
+	[Test]
+	public async Task subscribing_to_all_with_not_existing_credentials_is_not_authenticated() {
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => SubscribeToAll("badlogin", "badpass"));
+	}
+
+	[Test]
+	public async Task subscribing_to_all_with_no_credentials_is_denied() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToAll(null, null));
+	}
+
+	[Test]
+	public async Task subscribing_to_all_with_not_authorized_user_credentials_is_denied() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToAll("user2", "pa$$2"));
+	}
+
+	[Test]
+	public async Task subscribing_to_all_with_authorized_user_credentials_succeeds() {
+		await SubscribeToAll("user1", "pa$$1");
+	}
+
+	[Test]
+	public async Task subscribing_to_all_with_admin_user_credentials_succeeds() {
+		await SubscribeToAll("adm", "admpa$$");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Security/subscribe_to_stream_security.cs b/src/KurrentDB.Core.Tests/ClientAPI/Security/subscribe_to_stream_security.cs
new file mode 100644
index 00000000000..ecbfe0efb44
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Security/subscribe_to_stream_security.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI.Exceptions;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Security;
+
+[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class subscribe_to_stream_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
+	[Test]
+	public async Task subscribing_to_stream_with_not_existing_credentials_is_not_authenticated() {
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => SubscribeToStream("read-stream", "badlogin", "badpass"));
+	}
+
+	[Test]
+	public async Task subscribing_to_stream_with_no_credentials_is_denied() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream("read-stream", null, null));
+	}
+
+	[Test]
+	public async Task subscribing_to_stream_with_not_authorized_user_credentials_is_denied() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream("read-stream", "user2", "pa$$2"));
+	}
+
+	[Test]
+	public async Task reading_stream_with_authorized_user_credentials_succeeds() {
+		await SubscribeToStream("read-stream", "user1", "pa$$1");
+	}
+
+	[Test]
+	public async Task reading_stream_with_admin_user_credentials_succeeds() {
+		await SubscribeToStream("read-stream", "adm", "admpa$$");
+	}
+
+
+	[Test]
+	public async Task subscribing_to_no_acl_stream_succeeds_when_no_credentials_are_passed() {
+		await SubscribeToStream("noacl-stream", null, null);
+	}
+
+	[Test]
+	public async Task subscribing_to_no_acl_stream_is_not_authenticated_when_not_existing_credentials_are_passed() {
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => SubscribeToStream("noacl-stream", "badlogin", "badpass"));
+	}
+
+	[Test]
+	public async Task subscribing_to_no_acl_stream_succeeds_when_any_existing_user_credentials_are_passed() {
+		await SubscribeToStream("noacl-stream", "user1", "pa$$1");
+		await SubscribeToStream("noacl-stream", "user2", "pa$$2");
+	}
+
+	[Test]
+	public async Task subscribing_to_no_acl_stream_succeeds_when_admin_user_credentials_are_passed() {
+		await SubscribeToStream("noacl-stream", "adm", "admpa$$");
+	}
+
+
+	[Test]
+	public async Task subscribing_to_all_access_normal_stream_succeeds_when_no_credentials_are_passed() {
+		await SubscribeToStream("normal-all", null, null);
+	}
+
+	[Test]
+	public async Task
+		subscribing_to_all_access_normal_stream_is_not_authenticated_when_not_existing_credentials_are_passed() {
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => SubscribeToStream("normal-all", "badlogin", "badpass"));
+	}
+
+	[Test]
+	public async Task subscribing_to_all_access_normal_stream_succeeds_when_any_existing_user_credentials_are_passed() {
+		await SubscribeToStream("normal-all", "user1", "pa$$1");
+		await SubscribeToStream("normal-all", "user2", "pa$$2");
+	}
+
+	[Test]
+	public async Task subscribing_to_all_access_normal_streamm_succeeds_when_admin_user_credentials_are_passed() {
+		await SubscribeToStream("normal-all", "adm", "admpa$$");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Security/system_stream_security.cs b/src/KurrentDB.Core.Tests/ClientAPI/Security/system_stream_security.cs
new file mode 100644
index 00000000000..1d6a5147961
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Security/system_stream_security.cs
@@ -0,0 +1,258 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI.Exceptions;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Security;
+
+[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class system_stream_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
+	[Test]
+	public async Task operations_on_system_stream_with_no_acl_set_fail_for_non_admin() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("$system-no-acl", "user1", "pa$$1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward("$system-no-acl", "user1", "pa$$1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward("$system-no-acl", "user1", "pa$$1"));
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$system-no-acl", "user1", "pa$$1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => TransStart("$system-no-acl", "user1", "pa$$1"));
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart("$system-no-acl", "adm", "admpa$$")).TransactionId;
+			var trans = Connection.ContinueTransaction(transId, new UserCredentials("user1", "pa$$1"));
+			await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.WriteAsync());
+			await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.CommitAsync());
+		}
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta("$system-no-acl", "user1", "pa$$1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta("$system-no-acl", "user1", "pa$$1", null));
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream("$system-no-acl", "user1", "pa$$1"));
+	}
+
+	[Test]
+	public async Task operations_on_system_stream_with_no_acl_set_succeed_for_admin() {
+		await ReadEvent("$system-no-acl", "adm", "admpa$$");
+		await ReadStreamForward("$system-no-acl", "adm", "admpa$$");
+		await ReadStreamBackward("$system-no-acl", "adm", "admpa$$");
+
+		await WriteStream("$system-no-acl", "adm", "admpa$$");
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			await TransStart("$system-no-acl", "adm", "admpa$$");
+		}
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart("$system-no-acl", "adm", "admpa$$")).TransactionId;
+			var trans = Connection.ContinueTransaction(transId, new UserCredentials("adm", "admpa$$"));
+			await trans.WriteAsync();
+			await trans.CommitAsync();
+		}
+
+		await ReadMeta("$system-no-acl", "adm", "admpa$$");
+		await WriteMeta("$system-no-acl", "adm", "admpa$$", null);
+
+		await SubscribeToStream("$system-no-acl", "adm", "admpa$$");
+	}
+
+	[Test]
+	public async Task operations_on_system_stream_with_acl_set_to_usual_user_fail_for_not_authorized_user() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("$system-acl", "user2", "pa$$2"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward("$system-acl", "user2", "pa$$2"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward("$system-acl", "user2", "pa$$2"));
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$system-acl", "user2", "pa$$2"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => TransStart("$system-acl", "user2", "pa$$2"));
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart("$system-acl", "user1", "pa$$1")).TransactionId;
+			var trans = Connection.ContinueTransaction(transId, new UserCredentials("user2", "pa$$2"));
+			await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.WriteAsync());
+			await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.CommitAsync());
+		}
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta("$system-acl", "user2", "pa$$2"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta("$system-acl", "user2", "pa$$2", "user1"));
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream("$system-acl", "user2", "pa$$2"));
+	}
+
+	[Test]
+	public async Task operations_on_system_stream_with_acl_set_to_usual_user_succeed_for_that_user() {
+		await ReadEvent("$system-acl", "user1", "pa$$1");
+		await ReadStreamForward("$system-acl", "user1", "pa$$1");
+		await ReadStreamBackward("$system-acl", "user1", "pa$$1");
+
+		await WriteStream("$system-acl", "user1", "pa$$1");
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			await TransStart("$system-acl", "user1", "pa$$1");
+		}
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart("$system-acl", "adm", "admpa$$")).TransactionId;
+			var trans = Connection.ContinueTransaction(transId, new UserCredentials("user1", "pa$$1"));
+			await trans.WriteAsync();
+			await trans.CommitAsync();
+		}
+
+		await ReadMeta("$system-acl", "user1", "pa$$1");
+		await WriteMeta("$system-acl", "user1", "pa$$1", "user1");
+
+		await SubscribeToStream("$system-acl", "user1", "pa$$1");
+	}
+
+	[Test]
+	public async Task operations_on_system_stream_with_acl_set_to_usual_user_succeed_for_admin() {
+		await ReadEvent("$system-acl", "adm", "admpa$$");
+		await ReadStreamForward("$system-acl", "adm", "admpa$$");
+		await ReadStreamBackward("$system-acl", "adm", "admpa$$");
+
+		await WriteStream("$system-acl", "adm", "admpa$$");
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			await TransStart("$system-acl", "adm", "admpa$$");
+		}
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart("$system-acl", "user1", "pa$$1")).TransactionId;
+			var trans = Connection.ContinueTransaction(transId, new UserCredentials("adm", "admpa$$"));
+			await trans.WriteAsync();
+			await trans.CommitAsync();
+		}
+
+		await ReadMeta("$system-acl", "adm", "admpa$$");
+		await WriteMeta("$system-acl", "adm", "admpa$$", "user1");
+
+		await SubscribeToStream("$system-acl", "adm", "admpa$$");
+	}
+
+
+	[Test]
+	public async Task operations_on_system_stream_with_acl_set_to_admins_fail_for_usual_user() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadEvent("$system-adm", "user1", "pa$$1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamForward("$system-adm", "user1", "pa$$1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadStreamBackward("$system-adm", "user1", "pa$$1"));
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$system-adm", "user1", "pa$$1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => TransStart("$system-adm", "user1", "pa$$1"));
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart("$system-adm", "adm", "admpa$$")).TransactionId;
+			var trans = Connection.ContinueTransaction(transId, new UserCredentials("user1", "pa$$1"));
+			await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.WriteAsync());
+			await AssertEx.ThrowsAsync<AccessDeniedException>(() => trans.CommitAsync());
+		}
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => ReadMeta("$system-adm", "user1", "pa$$1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta("$system-adm", "user1", "pa$$1", SystemRoles.Admins));
+
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => SubscribeToStream("$system-adm", "user1", "pa$$1"));
+	}
+
+	[Test]
+	public async Task operations_on_system_stream_with_acl_set_to_admins_succeed_for_admin() {
+		await ReadEvent("$system-adm", "adm", "admpa$$");
+		await ReadStreamForward("$system-adm", "adm", "admpa$$");
+		await ReadStreamBackward("$system-adm", "adm", "admpa$$");
+
+		await WriteStream("$system-adm", "adm", "admpa$$");
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			await TransStart("$system-adm", "adm", "admpa$$");
+		}
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart("$system-adm", "adm", "admpa$$")).TransactionId;
+			var trans = Connection.ContinueTransaction(transId, new UserCredentials("adm", "admpa$$"));
+			await trans.WriteAsync();
+			await trans.CommitAsync();
+		}
+
+		await ReadMeta("$system-adm", "adm", "admpa$$");
+		await WriteMeta("$system-adm", "adm", "admpa$$", SystemRoles.Admins);
+
+		await SubscribeToStream("$system-adm", "adm", "admpa$$");
+	}
+
+
+	[Test]
+	public async Task operations_on_system_stream_with_acl_set_to_all_succeed_for_not_authenticated_user() {
+		await ReadEvent("$system-all", null, null);
+		await ReadStreamForward("$system-all", null, null);
+		await ReadStreamBackward("$system-all", null, null);
+
+		await WriteStream("$system-all", null, null);
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			await TransStart("$system-all", null, null);
+		}
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart("$system-all", null, null)).TransactionId;
+			var trans = Connection.ContinueTransaction(transId);
+			await trans.WriteAsync();
+			await trans.CommitAsync();
+		}
+
+		await ReadMeta("$system-all", null, null);
+		await WriteMeta("$system-all", null, null, SystemRoles.All);
+
+		await SubscribeToStream("$system-all", null, null);
+	}
+
+	[Test]
+	public async Task operations_on_system_stream_with_acl_set_to_all_succeed_for_usual_user() {
+		await ReadEvent("$system-all", "user1", "pa$$1");
+		await ReadStreamForward("$system-all", "user1", "pa$$1");
+		await ReadStreamBackward("$system-all", "user1", "pa$$1");
+
+		await WriteStream("$system-all", "user1", "pa$$1");
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			await TransStart("$system-all", "user1", "pa$$1");
+		}
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart("$system-all", "user1", "pa$$1")).TransactionId;
+			var trans = Connection.ContinueTransaction(transId, new UserCredentials("user1", "pa$$1"));
+			await trans.WriteAsync();
+			await trans.CommitAsync();
+		}
+
+		await ReadMeta("$system-all", "user1", "pa$$1");
+		await WriteMeta("$system-all", "user1", "pa$$1", SystemRoles.All);
+
+		await SubscribeToStream("$system-all", "user1", "pa$$1");
+	}
+
+	[Test]
+	public async Task operations_on_system_stream_with_acl_set_to_all_succeed_for_admin() {
+		await ReadEvent("$system-all", "adm", "admpa$$");
+		await ReadStreamForward("$system-all", "adm", "admpa$$");
+		await ReadStreamBackward("$system-all", "adm", "admpa$$");
+
+		await WriteStream("$system-all", "adm", "admpa$$");
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			await TransStart("$system-all", "adm", "admpa$$");
+		}
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+			var transId = (await TransStart("$system-all", "adm", "admpa$$")).TransactionId;
+			var trans = Connection.ContinueTransaction(transId, new UserCredentials("adm", "admpa$$"));
+			await trans.WriteAsync();
+			await trans.CommitAsync();
+		}
+
+		await ReadMeta("$system-all", "adm", "admpa$$");
+		await WriteMeta("$system-all", "adm", "admpa$$", SystemRoles.All);
+
+		await SubscribeToStream("$system-all", "adm", "admpa$$");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Security/transactional_write_stream_security.cs b/src/KurrentDB.Core.Tests/ClientAPI/Security/transactional_write_stream_security.cs
new file mode 100644
index 00000000000..11efa78f791
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Security/transactional_write_stream_security.cs
@@ -0,0 +1,158 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI.Exceptions;
+using EventStore.ClientAPI.SystemData;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Security;
+
+[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class transactional_write_stream_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
+	[Test]
+	public async Task starting_transaction_with_not_existing_credentials_is_not_authenticated() {
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => TransStart("write-stream", "badlogin", "badpass"));
+	}
+
+	[Test]
+	public async Task starting_transaction_to_stream_with_no_credentials_is_denied() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => TransStart("write-stream", null, null));
+	}
+
+	[Test]
+	public async Task starting_transaction_to_stream_with_not_authorized_user_credentials_is_denied() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => TransStart("write-stream", "user2", "pa$$2"));
+	}
+
+	[Test]
+	public async Task starting_transaction_to_stream_with_authorized_user_credentials_succeeds() {
+		await TransStart("write-stream", "user1", "pa$$1");
+	}
+
+	[Test]
+	public async Task starting_transaction_to_stream_with_admin_user_credentials_succeeds() {
+		await TransStart("write-stream", "adm", "admpa$$");
+	}
+
+
+	[Test]
+	public async Task committing_transaction_with_not_existing_credentials_is_not_authenticated() {
+		var t1 = await TransStart("write-stream", "user1", "pa$$1");
+		await t1.WriteAsync(CreateEvents());
+		var t2 = Connection.ContinueTransaction(t1.TransactionId, new UserCredentials("badlogin", "badpass"));
+
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => t2.CommitAsync());
+	}
+
+	[Test]
+	public async Task committing_transaction_to_stream_with_no_credentials_is_denied() {
+		var t1 = await TransStart("write-stream", "user1", "pa$$1");
+		await t1.WriteAsync();
+		var t2 = Connection.ContinueTransaction(t1.TransactionId);
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => t2.CommitAsync());
+	}
+
+	[Test]
+	public async Task committing_transaction_to_stream_with_not_authorized_user_credentials_is_denied() {
+		var t1 = await TransStart("write-stream", "user1", "pa$$1");
+		await t1.WriteAsync();
+		var t2 = Connection.ContinueTransaction(t1.TransactionId, new UserCredentials("user2", "pa$$2"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => t2.CommitAsync());
+	}
+
+	[Test]
+	public async Task committing_transaction_to_stream_with_authorized_user_credentials_succeeds() {
+		var transId = (await TransStart("write-stream", "user1", "pa$$1")).TransactionId;
+		var t2 = Connection.ContinueTransaction(transId, new UserCredentials("user1", "pa$$1"));
+		await t2.WriteAsync();
+		await t2.CommitAsync();
+	}
+
+	[Test]
+	public async Task committing_transaction_to_stream_with_admin_user_credentials_succeeds() {
+		var transId = (await TransStart("write-stream", "user1", "pa$$1")).TransactionId;
+		var t2 = Connection.ContinueTransaction(transId, new UserCredentials("adm", "admpa$$"));
+		await t2.WriteAsync();
+		await t2.CommitAsync();
+	}
+
+
+	[Test]
+	public void transaction_to_no_acl_stream_succeeds_when_no_credentials_are_passed() {
+		ExpectNoException(async () => {
+			var t = await TransStart("noacl-stream", null, null);
+			await t.WriteAsync(CreateEvents());
+			await t.CommitAsync();
+		});
+	}
+
+	[Test]
+	public async Task transaction_to_no_acl_stream_is_not_authenticated_when_not_existing_credentials_are_passed() {
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => TransStart("noacl-stream", "badlogin", "badpass"));
+	}
+
+	[Test]
+	public void transaction_to_no_acl_stream_succeeds_when_any_existing_user_credentials_are_passed() {
+		ExpectNoException(async () => {
+			var t = await TransStart("noacl-stream", "user1", "pa$$1");
+			await t.WriteAsync(CreateEvents());
+			await t.CommitAsync();
+		});
+		ExpectNoException(async () => {
+			var t = await TransStart("noacl-stream", "user2", "pa$$2");
+			await t.WriteAsync(CreateEvents());
+			await t.CommitAsync();
+		});
+	}
+
+	[Test]
+	public void transaction_to_no_acl_stream_succeeds_when_admin_user_credentials_are_passed() {
+		ExpectNoException(async () => {
+			var t = await TransStart("noacl-stream", "adm", "admpa$$");
+			await t.WriteAsync(CreateEvents());
+			await t.CommitAsync();
+		});
+	}
+
+
+	[Test]
+	public void transaction_to_all_access_normal_stream_succeeds_when_no_credentials_are_passed() {
+		ExpectNoException(async () => {
+			var t = await TransStart("normal-all", null, null);
+			await t.WriteAsync(CreateEvents());
+			await t.CommitAsync();
+		});
+	}
+
+	[Test]
+	public async Task
+		transaction_to_all_access_normal_stream_is_not_authenticated_when_not_existing_credentials_are_passed() {
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => TransStart("normal-all", "badlogin", "badpass"));
+	}
+
+	[Test]
+	public void transaction_to_all_access_normal_stream_succeeds_when_any_existing_user_credentials_are_passed() {
+		ExpectNoException(async () => {
+			var t = await TransStart("normal-all", "user1", "pa$$1");
+			await t.WriteAsync(CreateEvents());
+			await t.CommitAsync();
+		});
+		ExpectNoException(async () => {
+			var t = await TransStart("normal-all", "user2", "pa$$2");
+			await t.WriteAsync(CreateEvents());
+			await t.CommitAsync();
+		});
+	}
+
+	[Test]
+	public void transaction_to_all_access_normal_stream_succeeds_when_admin_user_credentials_are_passed() {
+		ExpectNoException(async () => {
+			var t = await TransStart("normal-all", "adm", "admpa$$");
+			await t.WriteAsync(CreateEvents());
+			await t.CommitAsync();
+		});
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Security/write_stream_meta_security.cs b/src/KurrentDB.Core.Tests/ClientAPI/Security/write_stream_meta_security.cs
new file mode 100644
index 00000000000..143bdd0d664
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Security/write_stream_meta_security.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI.Exceptions;
+using KurrentDB.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Security;
+
+[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class write_stream_meta_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
+	[Test]
+	public async Task writing_meta_with_not_existing_credentials_is_not_authenticated() {
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => WriteMeta("metawrite-stream", "badlogin", "badpass", "user1"));
+	}
+
+	[Test]
+	public async Task writing_meta_to_stream_with_no_credentials_is_denied() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta("metawrite-stream", null, null, "user1"));
+	}
+
+	[Test]
+	public async Task writing_meta_to_stream_with_not_authorized_user_credentials_is_denied() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteMeta("metawrite-stream", "user2", "pa$$2", "user1"));
+	}
+
+	[Test]
+	public async Task writing_meta_to_stream_with_authorized_user_credentials_succeeds() {
+		await WriteMeta("metawrite-stream", "user1", "pa$$1", "user1");
+	}
+
+	[Test]
+	public async Task writing_meta_to_stream_with_admin_user_credentials_succeeds() {
+		await WriteMeta("metawrite-stream", "adm", "admpa$$", "user1");
+	}
+
+
+	[Test]
+	public async Task writing_meta_to_no_acl_stream_succeeds_when_no_credentials_are_passed() {
+		await WriteMeta("noacl-stream", null, null, null);
+	}
+
+	[Test]
+	public async Task writing_meta_to_no_acl_stream_is_not_authenticated_when_not_existing_credentials_are_passed() {
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => WriteMeta("noacl-stream", "badlogin", "badpass", null));
+	}
+
+	[Test]
+	public async Task writing_meta_to_no_acl_stream_succeeds_when_any_existing_user_credentials_are_passed() {
+		await WriteMeta("noacl-stream", "user1", "pa$$1", null);
+		await WriteMeta("noacl-stream", "user2", "pa$$2", null);
+	}
+
+	[Test]
+	public async Task writing_meta_to_no_acl_stream_succeeds_when_admin_user_credentials_are_passed() {
+		await WriteMeta("noacl-stream", "adm", "admpa$$", null);
+	}
+
+
+	[Test]
+	public async Task writing_meta_to_all_access_normal_stream_succeeds_when_no_credentials_are_passed() {
+		await WriteMeta("normal-all", null, null, SystemRoles.All);
+	}
+
+	[Test]
+	public async Task
+		writing_meta_to_all_access_normal_stream_is_not_authenticated_when_not_existing_credentials_are_passed() {
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => WriteMeta("normal-all", "badlogin", "badpass", SystemRoles.All));
+	}
+
+	[Test]
+	public async Task writing_meta_to_all_access_normal_stream_succeeds_when_any_existing_user_credentials_are_passed() {
+		await WriteMeta("normal-all", "user1", "pa$$1", SystemRoles.All);
+		await WriteMeta("normal-all", "user2", "pa$$2", SystemRoles.All);
+	}
+
+	[Test]
+	public async Task writing_meta_to_all_access_normal_stream_succeeds_when_admin_user_credentials_are_passed() {
+		await WriteMeta("normal-all", "adm", "admpa$$", SystemRoles.All);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/Security/write_stream_security.cs b/src/KurrentDB.Core.Tests/ClientAPI/Security/write_stream_security.cs
new file mode 100644
index 00000000000..625d48d71df
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/Security/write_stream_security.cs
@@ -0,0 +1,90 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI.Exceptions;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.Security;
+
+[Category("ClientAPI"), Category("LongRunning"), Category("Network")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class write_stream_security<TLogFormat, TStreamId> : AuthenticationTestBase<TLogFormat, TStreamId> {
+	[Test]
+	public async Task writing_to_all_is_never_allowed() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$all", null, null));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$all", "user1", "pa$$1"));
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("$all", "adm", "admpa$$"));
+	}
+
+	[Test]
+	public async Task writing_with_not_existing_credentials_is_not_authenticated() {
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => WriteStream("write-stream", "badlogin", "badpass"));
+	}
+
+	[Test]
+	public async Task writing_to_stream_with_no_credentials_is_denied() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("write-stream", null, null));
+	}
+
+	[Test]
+	public async Task writing_to_stream_with_not_authorized_user_credentials_is_denied() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() => WriteStream("write-stream", "user2", "pa$$2"));
+	}
+
+	[Test]
+	public async Task writing_to_stream_with_authorized_user_credentials_succeeds() {
+		await WriteStream("write-stream", "user1", "pa$$1");
+	}
+
+	[Test]
+	public async Task writing_to_stream_with_admin_user_credentials_succeeds() {
+		await WriteStream("write-stream", "adm", "admpa$$");
+	}
+
+
+	[Test]
+	public async Task writing_to_no_acl_stream_succeeds_when_no_credentials_are_passed() {
+		await WriteStream("noacl-stream", null, null);
+	}
+
+	[Test]
+	public async Task writing_to_no_acl_stream_is_not_authenticated_when_not_existing_credentials_are_passed() {
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => WriteStream("noacl-stream", "badlogin", "badpass"));
+	}
+
+	[Test]
+	public async Task writing_to_no_acl_stream_succeeds_when_any_existing_user_credentials_are_passed() {
+		await WriteStream("noacl-stream", "user1", "pa$$1");
+		await WriteStream("noacl-stream", "user2", "pa$$2");
+	}
+
+	[Test]
+	public async Task writing_to_no_acl_stream_succeeds_when_any_admin_user_credentials_are_passed() {
+		await WriteStream("noacl-stream", "adm", "admpa$$");
+	}
+
+
+	[Test]
+	public async Task writing_to_all_access_normal_stream_succeeds_when_no_credentials_are_passed() {
+		await WriteStream("normal-all", null, null);
+	}
+
+	[Test]
+	public async Task
+		writing_to_all_access_normal_stream_is_not_authenticated_when_not_existing_credentials_are_passed() {
+		await AssertEx.ThrowsAsync<NotAuthenticatedException>(() => WriteStream("normal-all", "badlogin", "badpass"));
+	}
+
+	[Test]
+	public async Task writing_to_all_access_normal_stream_succeeds_when_any_existing_user_credentials_are_passed() {
+		await WriteStream("normal-all", "user1", "pa$$1");
+		await WriteStream("normal-all", "user2", "pa$$2");
+	}
+
+	[Test]
+	public async Task writing_to_all_access_normal_stream_succeeds_when_any_admin_user_credentials_are_passed() {
+		await WriteStream("normal-all", "adm", "admpa$$");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/SpecificationWithLinkToToDeletedEvents.cs b/src/KurrentDB.Core.Tests/ClientAPI/SpecificationWithLinkToToDeletedEvents.cs
new file mode 100644
index 00000000000..26d1618b4ab
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/SpecificationWithLinkToToDeletedEvents.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Common;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+public abstract class SpecificationWithLinkToToDeletedEvents<TLogFormat, TStreamId>
+	: SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	protected string LinkedStreamName;
+	protected string DeletedStreamName;
+
+	protected override async Task Given() {
+		var creds = DefaultData.AdminCredentials;
+		LinkedStreamName = Guid.NewGuid().ToString();
+		DeletedStreamName = Guid.NewGuid().ToString();
+		await _conn.AppendToStreamAsync(DeletedStreamName, ExpectedVersion.Any, creds,
+				new EventData(Guid.NewGuid(), "testing", true, Encoding.UTF8.GetBytes("{'foo' : 4}"), new byte[0]));
+		await _conn.AppendToStreamAsync(LinkedStreamName, ExpectedVersion.Any, creds,
+			new EventData(Guid.NewGuid(), SystemEventTypes.LinkTo, false,
+				Encoding.UTF8.GetBytes("0@" + DeletedStreamName), new byte[0]));
+		await _conn.DeleteStreamAsync(DeletedStreamName, ExpectedVersion.Any);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/SpecificationWithLinkToToMaxCountDeletedEvents.cs b/src/KurrentDB.Core.Tests/ClientAPI/SpecificationWithLinkToToMaxCountDeletedEvents.cs
new file mode 100644
index 00000000000..a1f145ba359
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/SpecificationWithLinkToToMaxCountDeletedEvents.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Common;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+public abstract class SpecificationWithLinkToToMaxCountDeletedEvents<TLogFormat, TStreamId>
+	: SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	protected string LinkedStreamName;
+	protected string DeletedStreamName;
+
+	protected override async Task Given() {
+		var creds = DefaultData.AdminCredentials;
+		DeletedStreamName = Guid.NewGuid().ToString();
+		LinkedStreamName = Guid.NewGuid().ToString();
+		await _conn.AppendToStreamAsync(DeletedStreamName, ExpectedVersion.Any, creds,
+			new EventData(Guid.NewGuid(), "testing1", true, Encoding.UTF8.GetBytes("{'foo' : 4}"), new byte[0]));
+		await _conn.SetStreamMetadataAsync(DeletedStreamName, ExpectedVersion.Any,
+			new StreamMetadata(2, null, null, null, null));
+		await _conn.AppendToStreamAsync(DeletedStreamName, ExpectedVersion.Any, creds,
+			new EventData(Guid.NewGuid(), "testing2", true, Encoding.UTF8.GetBytes("{'foo' : 4}"), new byte[0]));
+		await _conn.AppendToStreamAsync(DeletedStreamName, ExpectedVersion.Any, creds,
+			new EventData(Guid.NewGuid(), "testing3", true, Encoding.UTF8.GetBytes("{'foo' : 4}"), new byte[0]));
+		await _conn.AppendToStreamAsync(LinkedStreamName, ExpectedVersion.Any, creds,
+			new EventData(Guid.NewGuid(), SystemEventTypes.LinkTo, false,
+				Encoding.UTF8.GetBytes("0@" + DeletedStreamName), new byte[0]));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/SpecificationWithMiniNode.cs b/src/KurrentDB.Core.Tests/ClientAPI/SpecificationWithMiniNode.cs
new file mode 100644
index 00000000000..d64be65f1a0
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/SpecificationWithMiniNode.cs
@@ -0,0 +1,86 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Tests.Helpers.Logging;
+using NUnit.Framework;
+using Serilog;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+public abstract class SpecificationWithMiniNode<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private readonly int _chunkSize;
+	protected MiniNode<TLogFormat, TStreamId> _node;
+	protected IEventStoreConnection _conn;
+	protected virtual TimeSpan Timeout { get; } = TimeSpan.FromMinutes(1);
+
+	protected virtual Task Given() => Task.CompletedTask;
+
+	protected abstract Task When();
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.Create(node.TcpEndPoint, TcpType.Ssl);
+	}
+
+	protected async Task CloseConnectionAndWait(IEventStoreConnection conn) {
+		TaskCompletionSource closed = new TaskCompletionSource();
+		conn.Closed += (_, _) => closed.SetResult();
+		conn.Close();
+		await closed.Task.WithTimeout(Timeout);
+	}
+
+	protected SpecificationWithMiniNode() : this(chunkSize: 1024 * 1024) { }
+
+	protected SpecificationWithMiniNode(int chunkSize) {
+		_chunkSize = chunkSize;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		Log.Logger = new LoggerConfiguration().WriteTo.Console().WriteTo.NUnitOutput().MinimumLevel.Debug().CreateLogger();
+		MiniNodeLogging.Setup();
+
+		try {
+			await base.TestFixtureSetUp();
+		} catch (Exception ex) {
+			throw new Exception("TestFixtureSetUp Failed", ex);
+		}
+
+		try {
+			_node = new MiniNode<TLogFormat, TStreamId>(PathName, chunkSize: _chunkSize);
+			await _node.Start();
+			_conn = BuildConnection(_node);
+			await _conn.ConnectAsync();
+		} catch (Exception ex) {
+			MiniNodeLogging.WriteLogs();
+			throw new Exception("MiniNodeSetUp Failed", ex);
+		}
+
+		try {
+			await Given().WithTimeout(Timeout);
+		} catch (Exception ex) {
+			MiniNodeLogging.WriteLogs();
+			throw new Exception("Given Failed", ex);
+		}
+
+		try {
+			await When().WithTimeout(Timeout);
+		} catch (Exception ex) {
+			MiniNodeLogging.WriteLogs();
+			throw new Exception("When Failed", ex);
+		}
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		_conn?.Close();
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+
+		MiniNodeLogging.Clear();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/SystemData/clientapi_tcp_package.cs b/src/KurrentDB.Core.Tests/ClientAPI/SystemData/clientapi_tcp_package.cs
new file mode 100644
index 00000000000..8b39521390b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/SystemData/clientapi_tcp_package.cs
@@ -0,0 +1,186 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using EventStore.ClientAPI.SystemData;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.SystemData;
+
+[TestFixture, Category("ClientAPI")]
+public class clientapi_tcp_package {
+	[Test]
+	public void should_throw_argument_null_exception_when_created_as_authorized_but_login_not_provided() {
+		Assert.Throws<ArgumentNullException>(() =>
+			new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, Guid.NewGuid(), null, "pa$$",
+				new byte[] { 1, 2, 3 }));
+	}
+
+	[Test]
+	public void should_throw_argument_null_exception_when_created_as_authorized_but_password_not_provided() {
+		Assert.Throws<ArgumentNullException>(() =>
+			new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, Guid.NewGuid(), "login", null,
+				new byte[] { 1, 2, 3 }));
+	}
+
+	[Test]
+	public void should_throw_argument_null_exception_when_created_as_authorized_but_token_not_provided() {
+		Assert.Throws<ArgumentNullException>(() =>
+			new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, Guid.NewGuid(), null,
+				new byte[] { 1, 2, 3 }));
+	}
+
+	[Test]
+	public void should_throw_argument_exception_when_created_as_not_authorized_but_login_is_provided() {
+		Assert.Throws<ArgumentException>(() =>
+			new TcpPackage(TcpCommand.BadRequest, TcpFlags.None, Guid.NewGuid(), "login", null,
+				new byte[] { 1, 2, 3 }));
+	}
+
+	[Test]
+	public void should_throw_argument_exception_when_created_as_not_authorized_but_password_is_provided() {
+		Assert.Throws<ArgumentException>(() =>
+			new TcpPackage(TcpCommand.BadRequest, TcpFlags.None, Guid.NewGuid(), null, "pa$$",
+				new byte[] { 1, 2, 3 }));
+	}
+
+	[Test]
+	public void should_throw_argument_exception_when_created_as_not_authorized_but_token_is_provided() {
+		Assert.Throws<ArgumentException>(() =>
+			new TcpPackage(TcpCommand.BadRequest, TcpFlags.None, Guid.NewGuid(), "token",
+				new byte[] { 1, 2, 3 }));
+	}
+
+	[Test]
+	public void not_authorized_with_data_should_serialize_and_deserialize_correctly() {
+		var corrId = Guid.NewGuid();
+		var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.None, corrId, null, null, new byte[] { 1, 2, 3 });
+		var bytes = refPkg.AsArraySegment();
+
+		var pkg = TcpPackage.FromArraySegment(bytes);
+		Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
+		Assert.AreEqual(TcpFlags.None, pkg.Flags);
+		Assert.AreEqual(corrId, pkg.CorrelationId);
+		Assert.False(pkg.Tokens.TryGetValue("uid", out _));
+		Assert.False(pkg.Tokens.TryGetValue("pwd", out _));
+		Assert.False(pkg.Tokens.TryGetValue("jwt", out _));
+
+		Assert.AreEqual(3, pkg.Data.Count);
+		Assert.AreEqual(1, pkg.Data.Array[pkg.Data.Offset + 0]);
+		Assert.AreEqual(2, pkg.Data.Array[pkg.Data.Offset + 1]);
+		Assert.AreEqual(3, pkg.Data.Array[pkg.Data.Offset + 2]);
+	}
+
+	[Test]
+	public void not_authorized_with_empty_data_should_serialize_and_deserialize_correctly() {
+		var corrId = Guid.NewGuid();
+		var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.None, corrId, null, null, new byte[0]);
+		var bytes = refPkg.AsArraySegment();
+
+		var pkg = TcpPackage.FromArraySegment(bytes);
+		Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
+		Assert.AreEqual(TcpFlags.None, pkg.Flags);
+		Assert.AreEqual(corrId, pkg.CorrelationId);
+		Assert.False(pkg.Tokens.TryGetValue("uid", out _));
+		Assert.False(pkg.Tokens.TryGetValue("pwd", out _));
+		Assert.False(pkg.Tokens.TryGetValue("jwt", out _));
+
+		Assert.AreEqual(0, pkg.Data.Count);
+	}
+
+	[Test]
+	public void authorized_with_data_should_serialize_and_deserialize_correctly() {
+		var corrId = Guid.NewGuid();
+		var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, corrId, "login", "pa$$",
+			new byte[] { 1, 2, 3 });
+		var bytes = refPkg.AsArraySegment();
+
+		var pkg = TcpPackage.FromArraySegment(bytes);
+		Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
+		Assert.AreEqual(TcpFlags.Authenticated, pkg.Flags);
+		Assert.AreEqual(corrId, pkg.CorrelationId);
+		Assert.AreEqual("login", pkg.Tokens["uid"]);
+		Assert.AreEqual("pa$$", pkg.Tokens["pwd"]);
+		Assert.False(pkg.Tokens.TryGetValue("jwt", out _));
+
+		Assert.AreEqual(3, pkg.Data.Count);
+		Assert.AreEqual(1, pkg.Data.Array[pkg.Data.Offset + 0]);
+		Assert.AreEqual(2, pkg.Data.Array[pkg.Data.Offset + 1]);
+		Assert.AreEqual(3, pkg.Data.Array[pkg.Data.Offset + 2]);
+	}
+
+	[Test]
+	public void authorized_with_empty_data_should_serialize_and_deserialize_correctly() {
+		var corrId = Guid.NewGuid();
+		var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, corrId, "login", "pa$$",
+			new byte[0]);
+		var bytes = refPkg.AsArraySegment();
+
+		var pkg = TcpPackage.FromArraySegment(bytes);
+		Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
+		Assert.AreEqual(TcpFlags.Authenticated, pkg.Flags);
+		Assert.AreEqual(corrId, pkg.CorrelationId);
+		Assert.AreEqual("login", pkg.Tokens["uid"]);
+		Assert.AreEqual("pa$$", pkg.Tokens["pwd"]);
+		Assert.False(pkg.Tokens.TryGetValue("jwt", out _));
+
+		Assert.AreEqual(0, pkg.Data.Count);
+	}
+
+	[Test]
+	public void token_authorized_with_data_should_serialize_and_deserialize_correctly() {
+		var corrId = Guid.NewGuid();
+		var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, corrId, "token",
+			new byte[] { 1, 2, 3 });
+		var bytes = refPkg.AsArraySegment();
+
+		var pkg = TcpPackage.FromArraySegment(bytes);
+		Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
+		Assert.AreEqual(TcpFlags.Authenticated, pkg.Flags);
+		Assert.AreEqual(corrId, pkg.CorrelationId);
+		Assert.AreEqual("token", pkg.Tokens["jwt"]);
+		Assert.False(pkg.Tokens.TryGetValue("uid", out _));
+		Assert.False(pkg.Tokens.TryGetValue("pwd", out _));
+
+		Assert.AreEqual(3, pkg.Data.Count);
+		Assert.AreEqual(1, pkg.Data.Array[pkg.Data.Offset + 0]);
+		Assert.AreEqual(2, pkg.Data.Array[pkg.Data.Offset + 1]);
+		Assert.AreEqual(3, pkg.Data.Array[pkg.Data.Offset + 2]);
+	}
+
+	[Test]
+	public void token_authorized_with_empty_data_should_serialize_and_deserialize_correctly() {
+		var corrId = Guid.NewGuid();
+		var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, corrId, "token",
+			new byte[0]);
+		var bytes = refPkg.AsArraySegment();
+
+		var pkg = TcpPackage.FromArraySegment(bytes);
+		Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
+		Assert.AreEqual(TcpFlags.Authenticated, pkg.Flags);
+		Assert.AreEqual(corrId, pkg.CorrelationId);
+		Assert.AreEqual("token", pkg.Tokens["jwt"]);
+		Assert.False(pkg.Tokens.TryGetValue("uid", out _));
+		Assert.False(pkg.Tokens.TryGetValue("pwd", out _));
+
+		Assert.AreEqual(0, pkg.Data.Count);
+	}
+
+	[Test]
+	public void should_throw_argument_exception_when_login_too_long() {
+		Assert.Throws<ArgumentException>(() => new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated,
+			Guid.NewGuid(), new string('*', TcpPackage.MaxLoginLength + 1), "pa$$", new byte[] { 1, 2, 3 }));
+	}
+
+	[Test]
+	public void should_throw_argument_exception_when_password_too_long() {
+		Assert.Throws<ArgumentException>(() => new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated,
+			Guid.NewGuid(), "login", new string('*', TcpPackage.MaxPasswordLength + 1), new byte[] { 1, 2, 3 }));
+	}
+
+	[Test]
+	public void should_throw_argument_exception_when_token_too_long() {
+		Assert.Throws<ArgumentException>(() => new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated,
+			Guid.NewGuid(), new string('*', TcpPackage.MaxTokenLength + 1), new byte[] { 1, 2, 3 }));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/TestWithNode.cs b/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/TestWithNode.cs
new file mode 100644
index 00000000000..742dbd93e3a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/TestWithNode.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Common.Log;
+using EventStore.ClientAPI.UserManagement;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.UserManagement;
+
+[Category("LongRunning"), Category("ClientAPI")]
+public abstract class TestWithNode<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	protected MiniNode<TLogFormat, TStreamId> _node;
+	protected UsersManager _manager;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+		_manager = new UsersManager(new NoopLogger(), _node.HttpEndPoint, TimeSpan.FromSeconds(5), httpMessageHandler: _node.HttpMessageHandler);
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.Create(node.TcpEndPoint);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/TestWithUser.cs b/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/TestWithUser.cs
new file mode 100644
index 00000000000..8a0f9bfdc65
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/TestWithUser.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.ClientAPI.SystemData;
+
+namespace KurrentDB.Core.Tests.ClientAPI.UserManagement;
+
+public abstract class TestWithUser<TLogFormat, TStreamId> : TestWithNode<TLogFormat, TStreamId> {
+	protected string _username = Guid.NewGuid().ToString();
+
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		await _manager.CreateUserAsync(_username, "name", new[] { "foo", "admins" }, "password",
+			new UserCredentials("admin", "changeit"));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/creating_a_user.cs b/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/creating_a_user.cs
new file mode 100644
index 00000000000..5f8a794fd8d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/creating_a_user.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.ClientAPI.SystemData;
+using EventStore.ClientAPI.UserManagement;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.UserManagement;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class creating_a_user<TLogFormat, TStreamId> : TestWithNode<TLogFormat, TStreamId> {
+	[Test]
+	public void creating_a_user_with_null_username_throws() {
+		Assert.Throws<ArgumentNullException>(() =>
+			_manager.CreateUserAsync(null, "greg", new[] { "foo", "bar" }, "foofoofoo"));
+	}
+
+	[Test]
+	public void creating_a_user_with_empty_username_throws() {
+		Assert.Throws<ArgumentNullException>(() =>
+			_manager.CreateUserAsync("", "ouro", new[] { "foo", "bar" }, "foofoofoo"));
+	}
+
+	[Test]
+	public void creating_a_user_with_null_name_throws() {
+		Assert.Throws<ArgumentNullException>(() =>
+			_manager.CreateUserAsync("ouro", null, new[] { "foo", "bar" }, "foofoofoo"));
+	}
+
+	[Test]
+	public void creating_a_user_with_empty_name_throws() {
+		Assert.Throws<ArgumentNullException>(() =>
+			_manager.CreateUserAsync("ouro", "", new[] { "foo", "bar" }, "foofoofoo"));
+	}
+
+
+	[Test]
+	public void creating_a_user_with_null_password_throws() {
+		Assert.Throws<ArgumentNullException>(() =>
+			_manager.CreateUserAsync("ouro", "ouro", new[] { "foo", "bar" }, null));
+	}
+
+	[Test]
+	public void creating_a_user_with_empty_password_throws() {
+		Assert.Throws<ArgumentNullException>(() =>
+			_manager.CreateUserAsync("ouro", "ouro", new[] { "foo", "bar" }, ""));
+	}
+
+	[Test]
+	public async Task creating_a_user_with_parameters_can_be_readAsync() {
+		UserDetails d = null;
+		await _manager.CreateUserAsync("ouro", "ourofull", new[] { "foo", "bar" }, "ouro",
+			new UserCredentials("admin", "changeit"));
+		d = await _manager.GetUserAsync("ouro", new UserCredentials("admin", "changeit"));
+
+		Assert.AreEqual("ouro", d.LoginName);
+		Assert.AreEqual("ourofull", d.FullName);
+		Assert.AreEqual("foo", d.Groups[0]);
+		Assert.AreEqual("bar", d.Groups[1]);
+	}
+
+	[Test]
+	public async Task creating_a_user_with_unicode_chars_can_be_readAsync() {
+		UserDetails d = null;
+		await _manager.CreateUserAsync("码ou£ro码", "ourofull", new[] { "foo", "bar" }, "ou码码ro",
+			new UserCredentials("admin", "changeit"));
+		d = await _manager.GetUserAsync("码ou£ro码", new UserCredentials("admin", "changeit"));
+
+		Assert.AreEqual("码ou£ro码", d.LoginName);
+		Assert.AreEqual("ourofull", d.FullName);
+		Assert.AreEqual("foo", d.Groups[0]);
+		Assert.AreEqual("bar", d.Groups[1]);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/deleting_a_user.cs b/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/deleting_a_user.cs
new file mode 100644
index 00000000000..18e6ae5c929
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/deleting_a_user.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.ClientAPI.Exceptions;
+using EventStore.ClientAPI.SystemData;
+using EventStore.ClientAPI.Transport.Http;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.UserManagement;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class deleting_a_user<TLogFormat, TStreamId> : TestWithNode<TLogFormat, TStreamId> {
+	[Test]
+	public async Task deleting_non_existing_user_throws() {
+		var ex = await AssertEx.ThrowsAsync<UserCommandFailedException>(() =>
+			_manager.DeleteUserAsync(Guid.NewGuid().ToString(), new UserCredentials("admin", "changeit")));
+		Assert.AreEqual(HttpStatusCode.NotFound, ex.HttpStatusCode);
+	}
+
+	[Test]
+	public async Task deleting_created_user_deletes_it() {
+		var user = Guid.NewGuid().ToString();
+		await _manager.CreateUserAsync(user, "ourofull", new[] { "foo", "bar" }, "ouro",
+			new UserCredentials("admin", "changeit"));
+		await _manager.DeleteUserAsync(user, new UserCredentials("admin", "changeit"));
+	}
+
+
+	[Test]
+	public void deleting_null_user_throws() {
+		Assert.Throws<ArgumentNullException>(() =>
+			_manager.DeleteUserAsync(null, new UserCredentials("admin", "changeit")));
+	}
+
+	[Test]
+	public void deleting_empty_user_throws() {
+		Assert.Throws<ArgumentNullException>(() =>
+			_manager.DeleteUserAsync("", new UserCredentials("admin", "changeit")));
+	}
+
+	[Test]
+	public async Task can_delete_a_user() {
+		await _manager.CreateUserAsync("ouro", "ouro", new[] { "foo", "bar" }, "ouro",
+			new UserCredentials("admin", "changeit"));
+		var x = await _manager.GetUserAsync("ouro", new UserCredentials("admin", "changeit"));
+		await _manager.DeleteUserAsync("ouro", new UserCredentials("admin", "changeit"));
+
+		var ex = await AssertEx.ThrowsAsync<AggregateException>(
+			() => _manager.GetUserAsync("ouro", new UserCredentials("admin", "changeit")));
+		Assert.AreEqual(HttpStatusCode.NotFound,
+			((UserCommandFailedException)ex.InnerException).HttpStatusCode);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/enable_disable_user.cs b/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/enable_disable_user.cs
new file mode 100644
index 00000000000..fc0ae0a4409
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/enable_disable_user.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.ClientAPI.Exceptions;
+using EventStore.ClientAPI.SystemData;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.UserManagement;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class enable_disable_user<TLogFormat, TStreamId> : TestWithUser<TLogFormat, TStreamId> {
+	[Test]
+	public async Task disable_empty_username_throws() {
+		await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
+			_manager.DisableAsync("", new UserCredentials("admin", "changeit")));
+	}
+
+	[Test]
+	public async Task disable_null_username_throws() {
+		await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
+			_manager.DisableAsync(null, new UserCredentials("admin", "changeit")));
+	}
+
+	[Test]
+	public async Task enable_empty_username_throws() {
+		await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
+			_manager.EnableAsync("", new UserCredentials("admin", "changeit")));
+	}
+
+	[Test]
+	public async Task enable_null_username_throws() {
+		await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
+			_manager.EnableAsync(null, new UserCredentials("admin", "changeit")));
+	}
+
+	[Test]
+	public async Task can_enable_disable_user() {
+		await _manager.DisableAsync(_username, new UserCredentials("admin", "changeit"));
+
+		await AssertEx.ThrowsAsync<UserCommandFailedException>(() =>
+			_manager.DisableAsync("foo", new UserCredentials(_username, "password")));
+
+		await _manager.EnableAsync(_username, new UserCredentials("admin", "changeit"));
+
+		var c = await _manager.GetCurrentUserAsync(new UserCredentials(_username, "password"));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/get_current_user.cs b/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/get_current_user.cs
new file mode 100644
index 00000000000..0e051430ae0
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/get_current_user.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI.SystemData;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.UserManagement;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class get_current_user<TLogFormat, TStreamId> : TestWithNode<TLogFormat, TStreamId> {
+	[Test]
+	public async Task returns_the_current_user() {
+		var x = await _manager.GetCurrentUserAsync(new UserCredentials("admin", "changeit"));
+		Assert.AreEqual("admin", x.LoginName);
+		Assert.AreEqual("KurrentDB Administrator", x.FullName);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/list_users.cs b/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/list_users.cs
new file mode 100644
index 00000000000..d8c7daf20fc
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/list_users.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI.SystemData;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.UserManagement;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class list_users<TLogFormat, TStreamId> : TestWithNode<TLogFormat, TStreamId> {
+	[Test]
+	public async Task list_all_users_worksAsync() {
+		await _manager.CreateUserAsync("ouro", "ourofull", new[] { "foo", "bar" }, "ouro",
+			new UserCredentials("admin", "changeit"));
+		var x = await _manager.ListAllAsync(new UserCredentials("admin", "changeit"));
+		Assert.AreEqual(3, x.Count);
+		Assert.AreEqual("admin", x[0].LoginName);
+		Assert.AreEqual("KurrentDB Administrator", x[0].FullName);
+		Assert.AreEqual("ops", x[1].LoginName);
+		Assert.AreEqual("KurrentDB Operations", x[1].FullName);
+		Assert.AreEqual("ouro", x[2].LoginName);
+		Assert.AreEqual("ourofull", x[2].FullName);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/reset_change_password.cs b/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/reset_change_password.cs
new file mode 100644
index 00000000000..80bc4209b00
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/reset_change_password.cs
@@ -0,0 +1,146 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.ClientAPI.Exceptions;
+using EventStore.ClientAPI.SystemData;
+using EventStore.ClientAPI.Transport.Http;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.UserManagement;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class reset_password<TLogFormat, TStreamId> : TestWithUser<TLogFormat, TStreamId> {
+	[Test]
+	public async Task null_user_name_throws() {
+		await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
+			_manager.ResetPasswordAsync(null, "foo", new UserCredentials("admin", "changeit")));
+	}
+
+	[Test]
+	public async Task empty_user_name_throws() {
+		await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
+			_manager.ResetPasswordAsync("", "foo", new UserCredentials("admin", "changeit")));
+	}
+
+	[Test]
+	public async Task empty_password_throws() {
+		await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
+			_manager.ResetPasswordAsync(_username, "", new UserCredentials("admin", "changeit")));
+	}
+
+	[Test]
+	public async Task null_password_throws() {
+		await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
+			_manager.ResetPasswordAsync(_username, null, new UserCredentials("admin", "changeit")));
+	}
+
+	[Test]
+	public async Task can_reset_password() {
+		await _manager.ResetPasswordAsync(_username, "foo", new UserCredentials("admin", "changeit"));
+		var ex = await AssertEx.ThrowsAsync<UserCommandFailedException>(
+			() => _manager.ChangePasswordAsync(_username, "password", "foobar",
+				new UserCredentials(_username, "password"))
+		);
+		Assert.AreEqual(HttpStatusCode.Unauthorized,
+			ex.HttpStatusCode);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class change_password<TLogFormat, TStreamId> : TestWithUser<TLogFormat, TStreamId> {
+	[Test]
+	public async Task null_username_throws() {
+		await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
+			_manager.ChangePasswordAsync(null, "oldpassword", "newpassword",
+				new UserCredentials("admin", "changeit")));
+	}
+
+	[Test]
+	public async Task empty_username_throws() {
+		await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
+			_manager.ChangePasswordAsync("", "oldpassword", "newpassword", new UserCredentials("admin", "changeit"))
+				);
+	}
+
+	[Test]
+	public async Task null_current_password_throws() {
+		await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
+			_manager.ChangePasswordAsync(_username, null, "newpassword", new UserCredentials("admin", "changeit"))
+				);
+	}
+
+	[Test]
+	public async Task empty_current_password_throws() {
+		await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
+			_manager.ChangePasswordAsync(_username, "", "newpassword", new UserCredentials("admin", "changeit"))
+				);
+	}
+
+	[Test]
+	public async Task null_new_password_throws() {
+		await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
+			_manager.ChangePasswordAsync(_username, "oldpasword", null, new UserCredentials("admin", "changeit"))
+				);
+	}
+
+	[Test]
+	public async Task empty_new_password_throws() {
+		await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
+			_manager.ChangePasswordAsync(_username, "oldpassword", "", new UserCredentials("admin", "changeit"))
+				);
+	}
+
+	[Test]
+	public async Task can_change_password() {
+		await _manager.ChangePasswordAsync(_username, "password", "fubar", new UserCredentials(_username, "password"));
+		var ex = await AssertEx.ThrowsAsync<UserCommandFailedException>(
+			() => _manager.ChangePasswordAsync(_username, "password", "foobar",
+				new UserCredentials(_username, "password"))
+		);
+		Assert.AreEqual(HttpStatusCode.Unauthorized,
+			ex.HttpStatusCode);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string), "newpassword")]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), "newpassword")]
+[TestFixture(typeof(LogFormat.V2), typeof(string), "n£wpasswordUnicode码")]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), "n£wpasswordUnicode码")]
+[TestFixture(typeof(LogFormat.V2), typeof(string), "password")] // same as old password
+[TestFixture(typeof(LogFormat.V3), typeof(uint), "password")] // same as old password
+public class change_password_and_use_the_new_one<TLogFormat, TStreamId> : TestWithUser<TLogFormat, TStreamId> {
+	private readonly string _newPassword;
+	private const string OldPassword = "password";
+	private readonly TimeSpan _passwordChangeDelay = TimeSpan.FromSeconds(20);
+
+	public change_password_and_use_the_new_one(string newPassword) {
+		_newPassword = newPassword;
+	}
+
+	[Test, Category("LongRunning"), Explicit]
+	public async Task can_change_password_and_use_the_new_one() {
+		var oldCredentials = new UserCredentials(_username, OldPassword);
+		var newCredentials = new UserCredentials(_username, _newPassword);
+
+		// change the password to the new one
+		await _manager.ChangePasswordAsync(
+			login: _username,
+			oldPassword: OldPassword,
+			newPassword: _newPassword,
+			userCredentials: oldCredentials);
+
+		// wait for some time to allow the password change notification reader to detect the change
+		await Task.Delay(_passwordChangeDelay);
+
+		// change the password again but with the new credentials to see if they work
+		await _manager.ChangePasswordAsync(
+			login: _username,
+			oldPassword: _newPassword,
+			newPassword: "foobar",
+			userCredentials: newCredentials);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/updating_a_user.cs b/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/updating_a_user.cs
new file mode 100644
index 00000000000..8e407ffd396
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/UserManagement/updating_a_user.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.ClientAPI.Exceptions;
+using EventStore.ClientAPI.SystemData;
+using EventStore.ClientAPI.UserManagement;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI.UserManagement;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class updating_a_user<TLogFormat, TStreamId> : TestWithNode<TLogFormat, TStreamId> {
+	[Test]
+	public async Task updating_a_user_with_null_username_throws() {
+		await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
+			_manager.UpdateUserAsync(null, "greg", new[] { "foo", "bar" }, new UserCredentials("admin", "changeit")));
+	}
+
+	[Test]
+	public async Task updating_a_user_with_empty_username_throws() {
+		await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
+			_manager.UpdateUserAsync("", "greg", new[] { "foo", "bar" }, new UserCredentials("admin", "changeit")));
+	}
+
+	[Test]
+	public async Task updating_a_user_with_null_name_throws() {
+		await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
+			_manager.UpdateUserAsync("greg", null, new[] { "foo", "bar" }, new UserCredentials("admin", "changeit")));
+	}
+
+	[Test]
+	public async Task updating_a_user_with_empty_name_throws() {
+		await AssertEx.ThrowsAsync<ArgumentNullException>(() =>
+			_manager.UpdateUserAsync("greg", "", new[] { "foo", "bar" }, new UserCredentials("admin", "changeit")));
+	}
+
+	[Test]
+	public async Task updating_non_existing_user_throws() {
+		await AssertEx.ThrowsAsync<UserCommandFailedException>(() => _manager.UpdateUserAsync(Guid.NewGuid().ToString(), "bar",
+			new[] { "foo" }, new UserCredentials("admin", "changeit")));
+	}
+
+	[Test]
+	public async Task updating_a_user_with_parameters_can_be_read() {
+		UserDetails d = null;
+		await _manager.CreateUserAsync("ouro", "ourofull", new[] { "foo", "bar" }, "password",
+			new UserCredentials("admin", "changeit"));
+		await _manager.UpdateUserAsync("ouro", "something", new[] { "bar", "baz" },
+			new UserCredentials("admin", "changeit"));
+		d = await _manager.GetUserAsync("ouro", new UserCredentials("admin", "changeit"));
+		Assert.AreEqual("ouro", d.LoginName);
+		Assert.AreEqual("something", d.FullName);
+		Assert.AreEqual("bar", d.Groups[0]);
+		Assert.AreEqual("baz", d.Groups[1]);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/append_to_stream.cs b/src/KurrentDB.Core.Tests/ClientAPI/append_to_stream.cs
new file mode 100644
index 00000000000..4aec15fee3b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/append_to_stream.cs
@@ -0,0 +1,679 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class append_to_stream<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private readonly TcpType _tcpType = TcpType.Ssl;
+	private MiniNode<TLogFormat, TStreamId> _node;
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.To(node, _tcpType);
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+	[Test, Category("Network")]
+	public async Task should_allow_appending_zero_events_to_stream_with_no_problems() {
+		const string stream1 = "should_allow_appending_zero_events_to_stream_with_no_problems1";
+		const string stream2 = "should_allow_appending_zero_events_to_stream_with_no_problems2";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			Assert.AreEqual(-1,
+				(await store.AppendToStreamAsync(stream1, ExpectedVersion.Any)).NextExpectedVersion);
+			Assert.AreEqual(-1,
+				(await store.AppendToStreamAsync(stream1, ExpectedVersion.NoStream)).NextExpectedVersion);
+			Assert.AreEqual(-1, (await store.AppendToStreamAsync(stream1, ExpectedVersion.Any)).NextExpectedVersion);
+			Assert.AreEqual(-1,
+				(await store.AppendToStreamAsync(stream1, ExpectedVersion.NoStream)).NextExpectedVersion);
+
+			var read1 = await store.ReadStreamEventsForwardAsync(stream1, 0, 2, resolveLinkTos: false);
+			Assert.That(read1.Events.Length, Is.EqualTo(0));
+
+			Assert.AreEqual(-1, (await store.AppendToStreamAsync(stream2, ExpectedVersion.NoStream)).NextExpectedVersion);
+			Assert.AreEqual(-1, (await store.AppendToStreamAsync(stream2, ExpectedVersion.Any)).NextExpectedVersion);
+			Assert.AreEqual(-1, (await store.AppendToStreamAsync(stream2, ExpectedVersion.NoStream)).NextExpectedVersion);
+			Assert.AreEqual(-1, (await store.AppendToStreamAsync(stream2, ExpectedVersion.Any)).NextExpectedVersion);
+
+			var read2 = await store.ReadStreamEventsForwardAsync(stream2, 0, 2, resolveLinkTos: false);
+			Assert.That(read2.Events.Length, Is.EqualTo(0));
+		}
+	}
+
+	[Test, Category("Network")]
+	public async Task should_create_stream_with_no_stream_exp_ver_on_first_write_if_does_not_exist() {
+		const string stream = "should_create_stream_with_no_stream_exp_ver_on_first_write_if_does_not_exist";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			Assert.AreEqual(0, (await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent()))
+				.NextExpectedVersion);
+
+			var read = await store.ReadStreamEventsForwardAsync(stream, 0, 2, resolveLinkTos: false);
+			Assert.That(read.Events.Length, Is.EqualTo(1));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task should_create_stream_with_any_exp_ver_on_first_write_if_does_not_exist() {
+		const string stream = "should_create_stream_with_any_exp_ver_on_first_write_if_does_not_exist";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			Assert.AreEqual(0, (await store.AppendToStreamAsync(stream, ExpectedVersion.Any, TestEvent.NewTestEvent())).NextExpectedVersion);
+
+			var read = await store.ReadStreamEventsForwardAsync(stream, 0, 2, resolveLinkTos: false);
+			Assert.That(read.Events.Length, Is.EqualTo(1));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task multiple_idempotent_writes() {
+		const string stream = "multiple_idempotent_writes";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = new[] {
+				TestEvent.NewTestEvent(), TestEvent.NewTestEvent(), TestEvent.NewTestEvent(),
+				TestEvent.NewTestEvent()
+			};
+			Assert.AreEqual(3,
+				(await store.AppendToStreamAsync(stream, ExpectedVersion.Any, events)).NextExpectedVersion);
+			Assert.AreEqual(3,
+				(await store.AppendToStreamAsync(stream, ExpectedVersion.Any, events)).NextExpectedVersion);
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task multiple_idempotent_writes_with_same_id_bug_case() {
+		const string stream = "multiple_idempotent_writes_with_same_id_bug_case";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var x = TestEvent.NewTestEvent();
+			var events = new[] { x, x, x, x, x, x };
+			Assert.AreEqual(5, (await store.AppendToStreamAsync(stream, ExpectedVersion.Any, events)).NextExpectedVersion);
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task
+		in_case_where_multiple_writes_of_multiple_events_with_the_same_ids_using_expected_version_any_then_next_expected_version_is_unreliable() {
+		const string stream = "in_wtf_multiple_case_of_multiple_writes_expected_version_any_per_all_same_id";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var x = TestEvent.NewTestEvent();
+			var events = new[] { x, x, x, x, x, x };
+			Assert.AreEqual(5, (await store.AppendToStreamAsync(stream, ExpectedVersion.Any, events)).NextExpectedVersion);
+			var f = await store.AppendToStreamAsync(stream, ExpectedVersion.Any, events);
+			Assert.AreEqual(0, f.NextExpectedVersion);
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task
+		in_case_where_multiple_writes_of_multiple_events_with_the_same_ids_using_expected_version_nostream_then_next_expected_version_is_correct() {
+		const string stream =
+			"in_slightly_reasonable_multiple_case_of_multiple_writes_with_expected_version_per_all_same_id";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var x = TestEvent.NewTestEvent();
+			var events = new[] { x, x, x, x, x, x };
+			Assert.AreEqual(5,
+				(await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, events)).NextExpectedVersion);
+			var f = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, events);
+			Assert.AreEqual(5, f.NextExpectedVersion);
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task should_fail_writing_with_correct_exp_ver_to_deleted_stream() {
+		const string stream = "should_fail_writing_with_correct_exp_ver_to_deleted_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
+
+			await AssertEx.ThrowsAsync<StreamDeletedException>(
+				() => store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent()));
+
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task should_return_log_position_when_writing() {
+		const string stream = "should_return_log_position_when_writing";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var result = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
+			Assert.IsTrue(0 < result.LogPosition.PreparePosition);
+			Assert.IsTrue(0 < result.LogPosition.CommitPosition);
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task should_fail_writing_with_any_exp_ver_to_deleted_stream() {
+		const string stream = "should_fail_writing_with_any_exp_ver_to_deleted_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			try {
+				await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
+			} catch (Exception exc) {
+				Console.WriteLine(exc);
+				Assert.Fail();
+			}
+
+			await AssertEx.ThrowsAsync<StreamDeletedException>(
+				() => store.AppendToStreamAsync(stream, ExpectedVersion.Any, TestEvent.NewTestEvent()));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task should_fail_writing_with_invalid_exp_ver_to_deleted_stream() {
+		const string stream = "should_fail_writing_with_invalid_exp_ver_to_deleted_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
+
+			await AssertEx.ThrowsAsync<StreamDeletedException>(() => store.AppendToStreamAsync(stream, 5, TestEvent.NewTestEvent()));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task should_append_with_correct_exp_ver_to_existing_stream() {
+		const string stream = "should_append_with_correct_exp_ver_to_existing_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
+
+			await store.AppendToStreamAsync(stream, 0, new[] { TestEvent.NewTestEvent() });
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task should_append_with_any_exp_ver_to_existing_stream() {
+		const string stream = "should_append_with_any_exp_ver_to_existing_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			Assert.AreEqual(0, (await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent())).NextExpectedVersion);
+			Assert.AreEqual(1, (await store.AppendToStreamAsync(stream, ExpectedVersion.Any, TestEvent.NewTestEvent())).NextExpectedVersion);
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task should_fail_appending_with_wrong_exp_ver_to_existing_stream() {
+		const string stream = "should_fail_appending_with_wrong_exp_ver_to_existing_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var wev = await AssertEx.ThrowsAsync<WrongExpectedVersionException>(() =>
+				store.AppendToStreamAsync(stream, 1, new[] { TestEvent.NewTestEvent() }));
+			Assert.AreEqual(1, wev.ExpectedVersion);
+			Assert.AreEqual(ExpectedVersion.NoStream, wev.ActualVersion);
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task should_append_with_stream_exists_exp_ver_to_existing_stream() {
+		const string stream = "should_append_with_stream_exists_exp_ver_to_existing_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
+
+			await store.AppendToStreamAsync(stream, ExpectedVersion.StreamExists, TestEvent.NewTestEvent());
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task should_append_with_stream_exists_exp_ver_to_stream_with_multiple_events() {
+		const string stream = "should_append_with_stream_exists_exp_ver_to_stream_with_multiple_events";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			for (var i = 0; i < 5; i++) {
+				await store.AppendToStreamAsync(stream, ExpectedVersion.Any, TestEvent.NewTestEvent());
+			}
+
+			await store.AppendToStreamAsync(stream, ExpectedVersion.StreamExists, TestEvent.NewTestEvent());
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task should_append_with_stream_exists_exp_ver_if_metadata_stream_exists() {
+		const string stream = "should_append_with_stream_exists_exp_ver_if_metadata_stream_exists";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			await store.SetStreamMetadataAsync(stream, ExpectedVersion.Any,
+				new StreamMetadata(10, null, null, null, null));
+
+			await store.AppendToStreamAsync(stream, ExpectedVersion.StreamExists, TestEvent.NewTestEvent());
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task should_fail_appending_with_stream_exists_exp_ver_and_stream_does_not_exist() {
+		const string stream = "should_fail_appending_with_stream_exists_exp_ver_and_stream_does_not_exist";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var wev = await AssertEx.ThrowsAsync<WrongExpectedVersionException>(
+				() => store.AppendToStreamAsync(stream, ExpectedVersion.StreamExists, TestEvent.NewTestEvent()));
+			Assert.AreEqual(ExpectedVersion.StreamExists, wev.ExpectedVersion);
+			Assert.AreEqual(ExpectedVersion.NoStream, wev.ActualVersion);
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task should_fail_appending_with_stream_exists_exp_ver_to_hard_deleted_stream() {
+		const string stream = "should_fail_appending_with_stream_exists_exp_ver_to_hard_deleted_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
+
+			await AssertEx.ThrowsAsync<StreamDeletedException>(
+				() => store.AppendToStreamAsync(stream, ExpectedVersion.StreamExists, TestEvent.NewTestEvent()));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task should_fail_appending_with_stream_exists_exp_ver_to_soft_deleted_stream() {
+		const string stream = "should_fail_appending_with_stream_exists_exp_ver_to_soft_deleted_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
+
+			await store.DeleteStreamAsync(stream, ExpectedVersion.StreamExists, hardDelete: false);
+
+			await AssertEx.ThrowsAsync<StreamDeletedException>(
+				() => store.AppendToStreamAsync(stream, ExpectedVersion.StreamExists, TestEvent.NewTestEvent()));
+		}
+	}
+
+	[Test, Category("Network")]
+	public async Task can_append_multiple_events_at_once() {
+		const string stream = "can_append_multiple_events_at_once";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 100).Select(i => TestEvent.NewTestEvent(i.ToString(), i.ToString()));
+			Assert.AreEqual(99, (await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, events)).NextExpectedVersion);
+		}
+	}
+
+	[Test]
+	public async Task cannot_append_multiple_events_larger_than_chunk_size_at_once() {
+		const string stream = "cannot_append_multiple_events_larger_than_chunk_size_at_once";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var largeData = new string(' ', 20000);
+			var events = Enumerable.Range(0, 100).Select(i => TestEvent.NewTestEvent(largeData, i.ToString()));
+
+			Assert.AreEqual(3, (await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, events.Take(4))).NextExpectedVersion);
+
+			Assert.ThrowsAsync<InvalidTransactionException>(async () =>
+				await store.AppendToStreamAsync(stream, 3, events));
+
+			// can still write to the stream with ExpectedVersion 3
+			Assert.AreEqual(7, (await store.AppendToStreamAsync(stream, 3, events.Take(4))).NextExpectedVersion);
+		}
+	}
+
+	[Test]
+	public async Task can_append_to_stream_with_long_name() {
+		var stream = "can_append_to_stream_with_long_name" + new string('A', 300);
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			Assert.AreEqual(0, (await store.AppendToStreamAsync
+				(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent())).NextExpectedVersion);
+		}
+	}
+
+	[Test]
+	public async Task can_append_multiple_events_to_stream_with_long_name_at_once() {
+		var stream = "can_append_multiple_events_to_stream_with_long_name_at_once" + new string('A', 300);
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var events = Enumerable.Range(0, 3).Select(i => TestEvent.NewTestEvent(i.ToString(), i.ToString()));
+			Assert.AreEqual(2, (await store.AppendToStreamAsync
+				(stream, ExpectedVersion.NoStream, events)).NextExpectedVersion);
+		}
+	}
+
+	[Test]
+	public async Task can_append_event_with_long_event_type() {
+		const string stream = "can_append_event_with_long_event_type";
+		var eventType = new string('A', 300);
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			Assert.AreEqual(0, (await store.AppendToStreamAsync
+				(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(eventName: eventType))).NextExpectedVersion);
+		}
+	}
+
+	[Test]
+	public async Task can_append_multiple_events_with_long_event_type_at_once() {
+		const string stream = "can_append_multiple_events_with_long_event_type_at_once";
+		var eventType = new string('A', 300);
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var events = Enumerable.Range(0, 3).Select(i =>
+				TestEvent.NewTestEvent(i.ToString(), i.ToString(), eventName: eventType));
+			Assert.AreEqual(2, (await store.AppendToStreamAsync
+				(stream, ExpectedVersion.NoStream, events)).NextExpectedVersion);
+		}
+	}
+
+	[Test, Category("Network")]
+	public async Task returns_failure_status_when_conditionally_appending_with_version_mismatch() {
+		const string stream = "returns_failure_status_when_conditionally_appending_with_version_mismatch";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var result = await store.ConditionalAppendToStreamAsync(stream, 7, new[] { TestEvent.NewTestEvent() });
+
+			Assert.AreEqual(ConditionalWriteStatus.VersionMismatch, result.Status);
+		}
+	}
+
+	[Test, Category("Network")]
+	public async Task returns_success_status_when_conditionally_appending_with_matching_version() {
+		const string stream = "returns_success_status_when_conditionally_appending_with_matching_version";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var result = await store
+				.ConditionalAppendToStreamAsync(stream, ExpectedVersion.Any, new[] { TestEvent.NewTestEvent() });
+
+			Assert.AreEqual(ConditionalWriteStatus.Succeeded, result.Status);
+			Assert.IsNotNull(result.LogPosition);
+			Assert.IsNotNull(result.NextExpectedVersion);
+		}
+	}
+
+	[Test, Category("Network")]
+	public async Task returns_failure_status_when_conditionally_appending_to_a_deleted_stream() {
+		const string stream = "returns_failure_status_when_conditionally_appending_to_a_deleted_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			await store.AppendToStreamAsync(stream, ExpectedVersion.Any, TestEvent.NewTestEvent());
+			await store.DeleteStreamAsync(stream, ExpectedVersion.Any, true);
+
+			var result = await store
+				.ConditionalAppendToStreamAsync(stream, ExpectedVersion.Any, new[] { TestEvent.NewTestEvent() });
+
+			Assert.AreEqual(ConditionalWriteStatus.StreamDeleted, result.Status);
+		}
+	}
+}
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class ssl_append_to_stream<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private readonly TcpType _tcpType = TcpType.Ssl;
+	protected MiniNode<TLogFormat, TStreamId> _node;
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.To(node, _tcpType);
+	}
+
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public async Task should_allow_appending_zero_events_to_stream_with_no_problems() {
+		const string stream = "should_allow_appending_zero_events_to_stream_with_no_problems";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			Assert.AreEqual(-1,
+				(await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream)).NextExpectedVersion);
+
+			var read = await store.ReadStreamEventsForwardAsync(stream, 0, 2, resolveLinkTos: false);
+			Assert.That(read.Events.Length, Is.EqualTo(0));
+		}
+	}
+
+	[Test]
+	public async Task should_create_stream_with_no_stream_exp_ver_on_first_write_if_does_not_exist() {
+		const string stream = "should_create_stream_with_no_stream_exp_ver_on_first_write_if_does_not_exist";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			Assert.AreEqual(0,
+				(await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent())).NextExpectedVersion);
+
+			var read = await store.ReadStreamEventsForwardAsync(stream, 0, 2, resolveLinkTos: false);
+			Assert.That(read.Events.Length, Is.EqualTo(1));
+		}
+	}
+
+	[Test]
+	public async Task should_create_stream_with_any_exp_ver_on_first_write_if_does_not_exist() {
+		const string stream = "should_create_stream_with_any_exp_ver_on_first_write_if_does_not_exist";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			Assert.AreEqual(0,
+				(await store.AppendToStreamAsync(stream, ExpectedVersion.Any, TestEvent.NewTestEvent())).NextExpectedVersion);
+
+			var read = await store.ReadStreamEventsForwardAsync(stream, 0, 2, resolveLinkTos: false);
+			Assert.That(read.Events.Length, Is.EqualTo(1));
+		}
+	}
+
+	[Test]
+	public async Task should_fail_writing_with_correct_exp_ver_to_deleted_stream() {
+		const string stream = "should_fail_writing_with_correct_exp_ver_to_deleted_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
+
+			await AssertEx.ThrowsAsync<StreamDeletedException>(() =>
+				store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent()));
+		}
+	}
+
+	[Test]
+	public async Task should_fail_writing_with_any_exp_ver_to_deleted_stream() {
+		const string stream = "should_fail_writing_with_any_exp_ver_to_deleted_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
+
+			await AssertEx.ThrowsAsync<StreamDeletedException>(() =>
+				store.AppendToStreamAsync(stream, ExpectedVersion.Any, TestEvent.NewTestEvent()));
+		}
+	}
+
+	[Test]
+	public async Task should_fail_writing_with_invalid_exp_ver_to_deleted_stream() {
+		const string stream = "should_fail_writing_with_invalid_exp_ver_to_deleted_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
+
+			await AssertEx.ThrowsAsync<StreamDeletedException>(() =>
+				store.AppendToStreamAsync(stream, 5, new[] { TestEvent.NewTestEvent() }));
+		}
+	}
+
+	[Test]
+	public async Task should_append_with_correct_exp_ver_to_existing_stream() {
+		const string stream = "should_append_with_correct_exp_ver_to_existing_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			Assert.AreEqual(0,
+				(await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent())).NextExpectedVersion);
+			Assert.AreEqual(1, (await store.AppendToStreamAsync(stream, 0, TestEvent.NewTestEvent())).NextExpectedVersion);
+		}
+	}
+
+	[Test]
+	public async Task should_append_with_any_exp_ver_to_existing_stream() {
+		const string stream = "should_append_with_any_exp_ver_to_existing_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			Assert.AreEqual(0,
+				(await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent())).NextExpectedVersion);
+			Assert.AreEqual(1, (await store.AppendToStreamAsync(stream, ExpectedVersion.Any, TestEvent.NewTestEvent())).NextExpectedVersion);
+		}
+	}
+
+	[Test]
+	public async Task should_return_log_position_when_writing() {
+		const string stream = "should_return_log_position_when_writing";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var result = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
+			Assert.IsTrue(0 < result.LogPosition.PreparePosition);
+			Assert.IsTrue(0 < result.LogPosition.CommitPosition);
+		}
+	}
+
+	[Test]
+	public async Task should_fail_appending_with_wrong_exp_ver_to_existing_stream() {
+		const string stream = "should_fail_appending_with_wrong_exp_ver_to_existing_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			Assert.AreEqual(0,
+				(await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent())).NextExpectedVersion);
+
+			var wev = await AssertEx.ThrowsAsync<WrongExpectedVersionException>(() =>
+				store.AppendToStreamAsync(stream, 1, TestEvent.NewTestEvent()));
+			Assert.AreEqual(1, wev.ExpectedVersion);
+			Assert.AreEqual(0, wev.ActualVersion.GetValueOrDefault(0));
+		}
+	}
+
+	[Test]
+	public async Task can_append_multiple_events_at_once() {
+		const string stream = "can_append_multiple_events_at_once";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 100).Select(i => TestEvent.NewTestEvent(i.ToString(), i.ToString()));
+			Assert.AreEqual(99, (await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, events)).NextExpectedVersion);
+		}
+	}
+
+	[Test]
+	public async Task cannot_append_multiple_events_larger_than_chunk_size_at_once() {
+		const string stream = "cannot_append_multiple_events_larger_than_chunk_size_at_once";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var largeData = new string(' ', 20000);
+			var events = Enumerable.Range(0, 100).Select(i => TestEvent.NewTestEvent(largeData, i.ToString()));
+
+			Assert.AreEqual(3, (await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, events.Take(4))).NextExpectedVersion);
+
+			Assert.ThrowsAsync<InvalidTransactionException>(async () =>
+				await store.AppendToStreamAsync(stream, 3, events));
+
+			// can still write to the stream with ExpectedVersion 3
+			Assert.AreEqual(7, (await store.AppendToStreamAsync(stream, 3, events.Take(4))).NextExpectedVersion);
+		}
+	}
+
+	[Test]
+	public async Task can_append_to_stream_with_long_name() {
+		var stream = "can_append_to_stream_with_long_name" + new string('A', 300);
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			Assert.AreEqual(0, (await store.AppendToStreamAsync
+				(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent())).NextExpectedVersion);
+		}
+	}
+
+	[Test]
+	public async Task can_append_multiple_events_to_stream_with_long_name_at_once() {
+		var stream = "can_append_multiple_events_to_stream_with_long_name_at_once" + new string('A', 300);
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var events = Enumerable.Range(0, 3).Select(i => TestEvent.NewTestEvent(i.ToString(), i.ToString()));
+			Assert.AreEqual(2, (await store.AppendToStreamAsync
+				(stream, ExpectedVersion.NoStream, events)).NextExpectedVersion);
+		}
+	}
+
+	[Test]
+	public async Task can_append_event_with_long_event_type() {
+		const string stream = "can_append_event_with_long_event_type";
+		var eventType = new string('A', 300);
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			Assert.AreEqual(0, (await store.AppendToStreamAsync
+				(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(eventName: eventType))).NextExpectedVersion);
+		}
+	}
+
+	[Test]
+	public async Task can_append_multiple_events_with_long_event_type_at_once() {
+		const string stream = "can_append_multiple_events_with_long_event_type_at_once";
+		var eventType = new string('A', 300);
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var events = Enumerable.Range(0, 3).Select(i =>
+				TestEvent.NewTestEvent(i.ToString(), i.ToString(), eventName: eventType));
+			Assert.AreEqual(2, (await store.AppendToStreamAsync
+				(stream, ExpectedVersion.NoStream, events)).NextExpectedVersion);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/append_to_stream_with_hash_collision.cs b/src/KurrentDB.Core.Tests/ClientAPI/append_to_stream_with_hash_collision.cs
new file mode 100644
index 00000000000..aa0ab340f33
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/append_to_stream_with_hash_collision.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Hash collisions cannot occur in Log V3")]
+public class append_to_stream_with_hash_collision<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private MiniNode<TLogFormat, TStreamId> _node;
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.To(node, TcpType.Ssl);
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName,
+			inMemDb: false,
+			memTableSize: 20,
+			hashCollisionReadLimit: 1,
+			indexBitnessVersion: PTableVersions.IndexV4,
+			hash32bit: true,
+			streamExistenceFilterSize: 0);
+		await _node.Start();
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public async Task should_throw_wrong_expected_version() {
+		const string stream1 = "account--696193173";
+		const string stream2 = "LPN-FC002_LPK51001";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			//Write event to stream 1
+			Assert.AreEqual(0, (await store.AppendToStreamAsync(stream1, ExpectedVersion.NoStream,
+					new EventData(Guid.NewGuid(), "TestEvent", true, null, null))).NextExpectedVersion);
+			//Write 100 events to stream 2 which will have the same hash as stream 1.
+			for (int i = 0; i < 100; i++) {
+				Assert.AreEqual(i, (await store.AppendToStreamAsync(stream2, ExpectedVersion.Any,
+					new EventData(Guid.NewGuid(), "TestEvent", true, null, null))).NextExpectedVersion);
+			}
+		}
+
+		var tcpPort = _node.TcpEndPoint.Port;
+		var httpPort = _node.HttpEndPoint.Port;
+		await _node.Shutdown(keepDb: true);
+
+		//Restart the node to ensure the read index stream info cache is empty
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName,
+			tcpPort, httpPort, inMemDb: false,
+			memTableSize: 20,
+			hashCollisionReadLimit: 1,
+			indexBitnessVersion: PTableVersions.IndexV4,
+			hash32bit: true,
+			streamExistenceFilterSize: 0);
+		await _node.Start();
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			await AssertEx.ThrowsAsync<WrongExpectedVersionException>(
+				() => store.AppendToStreamAsync(stream1, ExpectedVersion.Any,
+					new EventData(Guid.NewGuid(), "TestEvent", true, null, null)));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/appending_to_implicitly_created_stream.cs b/src/KurrentDB.Core.Tests/ClientAPI/appending_to_implicitly_created_stream.cs
new file mode 100644
index 00000000000..aeebbacc49b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/appending_to_implicitly_created_stream.cs
@@ -0,0 +1,295 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class appending_to_implicitly_created_stream<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private MiniNode<TLogFormat, TStreamId> _node;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.Create(node.TcpEndPoint);
+	}
+
+	/*
+	 * sequence - events written so stream
+	 * 0em1 - event number 0 written with exp version -1 (minus 1)
+	 * 1any - event number 1 written with exp version any
+	 * S_0em1_1em1_E - START bucket, two events in bucket, END bucket
+	*/
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_0em1_1e0_2e1_3e2_4e3_5e4_0em1_idempotent() {
+		const string stream =
+			"appending_to_implicitly_created_stream_sequence_0em1_1e0_2e1_3e2_4e3_5e4_0em1_idempotent";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 6).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			var writer = new StreamWriter(store, stream, -1);
+
+			var tail = await writer.Append(events);
+
+			await tail.Then(events[0], -1);
+
+			var total = await EventsStream.Count(store, stream);
+			Assert.That(total, Is.EqualTo(events.Length));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_0em1_1e0_2e1_3e2_4e3_4e4_0any_idempotent() {
+		const string stream =
+			"appending_to_implicitly_created_stream_sequence_0em1_1e0_2e1_3e2_4e3_4e4_0any_idempotent";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 6).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			var writer = new StreamWriter(store, stream, -1);
+
+			var tail = await writer.Append(events);
+			await tail.Then(events.First(), ExpectedVersion.Any);
+
+			var total = await EventsStream.Count(store, stream);
+			Assert.That(total, Is.EqualTo(events.Length));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e5_non_idempotent() {
+		const string stream =
+			"appending_to_implicitly_created_stream_sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e5_non_idempotent";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 6).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			var writer = new StreamWriter(store, stream, -1);
+
+			var tail = await writer.Append(events);
+			await tail.Then(events.First(), 5);
+
+			var total = await EventsStream.Count(store, stream);
+			Assert.That(total, Is.EqualTo(events.Length + 1));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e6_wev() {
+		const string stream = "appending_to_implicitly_created_stream_sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e6_wev";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 6).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			var writer = new StreamWriter(store, stream, -1);
+
+			var first6 = await writer.Append(events);
+			await AssertEx.ThrowsAsync<WrongExpectedVersionException>(
+				() => first6.Then(events.First(), 6));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e4_wev() {
+		const string stream = "appending_to_implicitly_created_stream_sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e4_wev";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 6).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			var writer = new StreamWriter(store, stream, -1);
+
+			var first6 = await writer.Append(events);
+			await AssertEx.ThrowsAsync<WrongExpectedVersionException>(
+				() => first6.Then(events.First(), 4));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_0em1_0e0_non_idempotent() {
+		const string stream = "appending_to_implicitly_created_stream_sequence_0em1_0e0_non_idempotent";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 1).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			var writer = new StreamWriter(store, stream, -1);
+
+			var tail = await writer.Append(events);
+			await tail.Then(events.First(), 0);
+
+			var total = await EventsStream.Count(store, stream);
+			Assert.That(total, Is.EqualTo(events.Length + 1));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_0em1_0any_idempotent() {
+		const string stream = "appending_to_implicitly_created_stream_sequence_0em1_0any_idempotent";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 1).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			var writer = new StreamWriter(store, stream, -1);
+
+			var tail = await writer.Append(events);
+
+			await tail.Then(events.First(), ExpectedVersion.Any);
+
+			var total = await EventsStream.Count(store, stream);
+			Assert.That(total, Is.EqualTo(events.Length));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_0em1_0em1_idempotent() {
+		const string stream = "appending_to_implicitly_created_stream_sequence_0em1_0em1_idempotent";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 1).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			var writer = new StreamWriter(store, stream, -1);
+
+			var tail = await writer.Append(events);
+			await tail.Then(events.First(), -1);
+
+			var total = await EventsStream.Count(store, stream);
+			Assert.That(total, Is.EqualTo(events.Length));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_0em1_1e0_2e1_1any_1any_idempotent() {
+		const string stream = "appending_to_implicitly_created_stream_sequence_0em1_1e0_2e1_1any_1any_idempotent";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 3).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			var writer = new StreamWriter(store, stream, -1);
+
+
+			var tailWriter = await writer.Append(events);
+			tailWriter = await tailWriter.Then(events[1], ExpectedVersion.Any);
+			await tailWriter.Then(events[1], ExpectedVersion.Any);
+
+			var total = await EventsStream.Count(store, stream);
+			Assert.That(total, Is.EqualTo(events.Length));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_S_0em1_1em1_E_S_0em1_E_idempotent() {
+		const string stream = "appending_to_implicitly_created_stream_sequence_S_0em1_1em1_E_S_0em1_E_idempotent";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 2).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			await store.AppendToStreamAsync(stream, -1, events);
+
+			await store.AppendToStreamAsync(stream, -1, events.First());
+
+			var total = await EventsStream.Count(store, stream);
+			Assert.That(total, Is.EqualTo(events.Length));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_S_0em1_1em1_E_S_0any_E_idempotent() {
+		const string stream = "appending_to_implicitly_created_stream_sequence_S_0em1_1em1_E_S_0any_E_idempotent";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 2).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			await store.AppendToStreamAsync(stream, -1, events);
+
+			await store.AppendToStreamAsync(stream, ExpectedVersion.Any, new[] { events.First() });
+
+			var total = await EventsStream.Count(store, stream);
+			Assert.That(total, Is.EqualTo(events.Length));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_S_0em1_1em1_E_S_1e0_E_idempotent() {
+		const string stream = "appending_to_implicitly_created_stream_sequence_S_0em1_1em1_E_S_1e0_E_idempotent";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 2).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			await store.AppendToStreamAsync(stream, -1, events);
+
+			await store.AppendToStreamAsync(stream, 0, events[1]);
+
+			var total = await EventsStream.Count(store, stream);
+			Assert.That(total, Is.EqualTo(events.Length));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_S_0em1_1em1_E_S_1any_E_idempotent() {
+		const string stream = "appending_to_implicitly_created_stream_sequence_S_0em1_1em1_E_S_1any_E_idempotent";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 2).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			await store.AppendToStreamAsync(stream, -1, events);
+
+			await store.AppendToStreamAsync(stream, ExpectedVersion.Any, events[1]);
+
+			var total = await EventsStream.Count(store, stream);
+			Assert.That(total, Is.EqualTo(events.Length));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_S_0em1_1em1_E_S_0em1_1em1_2em1_E_idempotancy_fail() {
+		const string stream =
+			"appending_to_implicitly_created_stream_sequence_S_0em1_1em1_E_S_0em1_1em1_2em1_E_idempotancy_fail";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 2).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			await store.AppendToStreamAsync(stream, -1, events);
+
+			await AssertEx.ThrowsAsync<WrongExpectedVersionException>(
+				() => store.AppendToStreamAsync(stream, -1,
+					events.Concat(new[] { TestEvent.NewTestEvent(Guid.NewGuid()) })));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/appending_to_implicitly_created_stream_using_transaction.cs b/src/KurrentDB.Core.Tests/ClientAPI/appending_to_implicitly_created_stream_using_transaction.cs
new file mode 100644
index 00000000000..66dc0ef15ef
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/appending_to_implicitly_created_stream_using_transaction.cs
@@ -0,0 +1,231 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class appending_to_implicitly_created_stream_using_transaction<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private MiniNode<TLogFormat, TStreamId> _node;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+	virtual protected IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.Create(node.TcpEndPoint);
+	}
+
+	/*
+	 * sequence - events written so stream
+	 * 0em1 - event number 0 written with exp version -1 (minus 1)
+	 * 1any - event number 1 written with exp version any
+	 * S_0em1_1em1_E - START bucket, two events in bucket, END bucket
+	*/
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_0em1_1e0_2e1_3e2_4e3_5e4_0em1_idempotent() {
+		const string stream =
+			"appending_to_implicitly_created_stream_using_transaction_sequence_0em1_1e0_2e1_3e2_4e3_5e4_0em1_idempotent";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 6).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			var writer = new TransactionalWriter(store, stream);
+
+			Assert.AreEqual(5, (await (await (await writer.StartTransaction(-1)).Write(events)).Commit()).NextExpectedVersion);
+			Assert.AreEqual(0, (await (await (await writer.StartTransaction(-1)).Write(events.First())).Commit()).NextExpectedVersion);
+
+			var total = await EventsStream.Count(store, stream);
+			Assert.That(total, Is.EqualTo(events.Length));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_0em1_1e0_2e1_3e2_4e3_5e4_0any_idempotent() {
+		const string stream =
+			"appending_to_implicitly_created_stream_using_transaction_sequence_0em1_1e0_2e1_3e2_4e3_5e4_0any_idempotent";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 6).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			var writer = new TransactionalWriter(store, stream);
+
+			Assert.AreEqual(5, (await (await (await writer.StartTransaction(-1)).Write(events)).Commit()).NextExpectedVersion);
+			Assert.AreEqual(0, (await (await (await writer.StartTransaction(ExpectedVersion.Any)).Write(events.First())).Commit()).NextExpectedVersion);
+
+			var total = await EventsStream.Count(store, stream);
+			Assert.That(total, Is.EqualTo(events.Length));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e5_non_idempotent() {
+		const string stream =
+			"appending_to_implicitly_created_stream_using_transaction_sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e5_non_idempotent";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 6).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			var writer = new TransactionalWriter(store, stream);
+
+			Assert.AreEqual(5, (await (await (await writer.StartTransaction(-1)).Write(events)).Commit()).NextExpectedVersion);
+			Assert.AreEqual(6, (await (await (await writer.StartTransaction(5)).Write(events.First())).Commit()).NextExpectedVersion);
+
+			var total = await EventsStream.Count(store, stream);
+			Assert.That(total, Is.EqualTo(events.Length + 1));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e6_wev() {
+		const string stream =
+			"appending_to_implicitly_created_stream_using_transaction_sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e6_wev";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 6).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			var writer = new TransactionalWriter(store, stream);
+
+			Assert.AreEqual(5, (await (await (await writer.StartTransaction(-1)).Write(events)).Commit()).NextExpectedVersion);
+			await AssertEx.ThrowsAsync<WrongExpectedVersionException>(async () =>
+				await (await (await writer.StartTransaction(6)).Write(events.First())).Commit());
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e4_wev() {
+		const string stream =
+			"appending_to_implicitly_created_stream_using_transaction_sequence_0em1_1e0_2e1_3e2_4e3_5e4_0e4_wev";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 6).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			var writer = new TransactionalWriter(store, stream);
+
+			Assert.AreEqual(5, (await (await (await writer.StartTransaction(-1)).Write(events)).Commit()).NextExpectedVersion);
+			await AssertEx.ThrowsAsync<WrongExpectedVersionException>(
+				async () => await (await (await writer.StartTransaction(4)).Write(events.First())).Commit());
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_0em1_0e0_non_idempotent() {
+		const string stream =
+			"appending_to_implicitly_created_stream_using_transaction_sequence_0em1_0e0_non_idempotent";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 1).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			var writer = new TransactionalWriter(store, stream);
+
+			Assert.AreEqual(0, (await (await (await writer.StartTransaction(-1)).Write(events)).Commit()).NextExpectedVersion);
+			Assert.AreEqual(1, (await (await (await writer.StartTransaction(0)).Write(events.First())).Commit()).NextExpectedVersion);
+
+			var total = await EventsStream.Count(store, stream);
+			Assert.That(total, Is.EqualTo(events.Length + 1));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_0em1_0any_idempotent() {
+		const string stream =
+			"appending_to_implicitly_created_stream_using_transaction_sequence_0em1_0any_idempotent";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 1).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			var writer = new TransactionalWriter(store, stream);
+
+			Assert.AreEqual(0,
+				(await (await (await writer.StartTransaction(-1)).Write(events)).Commit()).NextExpectedVersion);
+			Assert.AreEqual(0,
+				(await (await (await writer.StartTransaction(ExpectedVersion.Any)).Write(events.First())).Commit())
+				.NextExpectedVersion);
+
+			var total = await EventsStream.Count(store, stream);
+			Assert.That(total, Is.EqualTo(events.Length));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_0em1_0em1_idempotent() {
+		const string stream =
+			"appending_to_implicitly_created_stream_using_transaction_sequence_0em1_0em1_idempotent";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 1).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			var writer = new TransactionalWriter(store, stream);
+
+			Assert.AreEqual(0, (await (await (await writer.StartTransaction(-1)).Write(events)).Commit()).NextExpectedVersion);
+			Assert.AreEqual(0, (await (await (await writer.StartTransaction(-1)).Write(events.First())).Commit()).NextExpectedVersion);
+
+			var total = await EventsStream.Count(store, stream);
+			Assert.That(total, Is.EqualTo(events.Length));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_0em1_1e0_2e1_1any_1any_idempotent() {
+		const string stream =
+			"appending_to_implicitly_created_stream_using_transaction_sequence_0em1_1e0_2e1_1any_1any_idempotent";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 3).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			var writer = new TransactionalWriter(store, stream);
+
+			Assert.AreEqual(2, (await (await (await writer.StartTransaction(-1)).Write(events)).Commit()).NextExpectedVersion);
+			Assert.AreEqual(1, (await (await (await (await writer.StartTransaction(ExpectedVersion.Any)).Write(events[1])).Write(events[1])).Commit()).NextExpectedVersion);
+
+			var total = await EventsStream.Count(store, stream);
+			Assert.That(total, Is.EqualTo(events.Length));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task sequence_S_0em1_1em1_E_S_0em1_1em1_2em1_E_idempotancy_fail() {
+		const string stream =
+			"appending_to_implicitly_created_stream_using_transaction_sequence_S_0em1_1em1_E_S_0em1_1em1_2em1_E_idempotancy_fail";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = Enumerable.Range(0, 2).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+			var writer = new TransactionalWriter(store, stream);
+
+			Assert.AreEqual(1, (await (await (await writer.StartTransaction(-1)).Write(events)).Commit()).NextExpectedVersion);
+			await AssertEx.ThrowsAsync<WrongExpectedVersionException>(async () =>
+				await (await (await writer.StartTransaction(-1)).Write(events.Concat(new[] { TestEvent.NewTestEvent(Guid.NewGuid()) }).ToArray())).Commit());
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/appending_to_streams_across_restart.cs b/src/KurrentDB.Core.Tests/ClientAPI/appending_to_streams_across_restart.cs
new file mode 100644
index 00000000000..d28d984afd9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/appending_to_streams_across_restart.cs
@@ -0,0 +1,165 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class appending_to_streams_across_restart<TLogFormat, TStreamId> : SpecificationWithDirectory {
+	private MiniNode<TLogFormat, TStreamId> _node;
+
+	virtual protected IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.Create(node.TcpEndPoint);
+	}
+
+	[TearDown]
+	public override async Task TearDown() {
+		await _node?.Shutdown();
+		await base.TearDown();
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task detect_existing_streams_flush() {
+		void CreateNode() {
+			_node = new MiniNode<TLogFormat, TStreamId>(
+				pathname: PathName,
+				dbPath: Path.Combine(PathName, "mini-node-db"),
+				inMemDb: false,
+				streamExistenceFilterSize: 10_000,
+				streamExistenceFilterCheckpointIntervalMs: 100,
+				streamExistenceFilterCheckpointDelayMs: 0);
+		}
+
+		CreateNode();
+		await _node.Start();
+
+		// GIVEN some streams
+		var normal = "detect_existing_streams_normal";
+		var meta = "detect_existing_streams_meta";
+		var committed = "detect_existing_streams_commited_transaction";
+		var uncommitted = "detect_existing_streams_uncommited_transaction";
+
+		EventData[] GenEvents() => Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent(Guid.NewGuid())).ToArray();
+		var eventsByStream = new Dictionary<string, EventData[]>(){
+			{ normal, GenEvents() },
+			{ committed, GenEvents() },
+			{ uncommitted, GenEvents() },
+		};
+
+		var uncommittedTransId = 0L;
+
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			// normal
+			Assert.AreEqual(9, await store
+				.Apply(x => x.AppendToStreamAsync(normal, ExpectedVersion.NoStream, eventsByStream[normal]))
+				.Apply(x => x.NextExpectedVersion));
+
+			// meta
+			Assert.AreEqual(0, await store
+				.Apply(x => x.SetStreamMetadataAsync("meta", ExpectedVersion.NoStream, StreamMetadata.Create(maxCount: 5)))
+				.Apply(x => x.NextExpectedVersion));
+
+			if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
+				// committed
+				Assert.AreEqual(9, await new TransactionalWriter(store, committed)
+					.Apply(x => x.StartTransaction(-1))
+					.Apply(x => x.Write(eventsByStream[committed]))
+					.Apply(x => x.Commit())
+					.Apply(x => x.NextExpectedVersion));
+
+				// uncommitted
+				uncommittedTransId = await new TransactionalWriter(store, uncommitted)
+					.Apply(x => x.StartTransaction(-1))
+					.Apply(x => x.Write(eventsByStream[committed]))
+					.Apply(x => x.TransactionId);
+			}
+
+			// append an event to another stream because the last event is always going to get reinitialised
+			Assert.AreEqual(0, await store
+				.Apply(x => x.AppendToStreamAsync("another-stream", ExpectedVersion.NoStream, TestEvent.NewTestEvent(Guid.NewGuid())))
+				.Apply(x => x.NextExpectedVersion));
+		}
+
+		// WHEN flush and restart
+		await Task.Delay(500);
+		await _node.Shutdown(keepDb: true);
+		CreateNode();
+		await _node.Start();
+
+		// THEN the streams all exist
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			// normal
+			Assert.AreEqual(10, await store
+				.Apply(x => x.AppendToStreamAsync(normal, 9, TestEvent.NewTestEvent(Guid.NewGuid())))
+				.Apply(x => x.NextExpectedVersion));
+
+			Assert.AreEqual(
+				eventsByStream[normal].Length + 1,
+				await EventsStream.Count(store, normal));
+
+			// meta
+			Assert.AreEqual(1, await store
+				.Apply(x => x.SetStreamMetadataAsync("meta", 0, StreamMetadata.Create(maxCount: 6)))
+				.Apply(x => x.NextExpectedVersion));
+
+			Assert.AreEqual(0, await EventsStream.Count(store, meta));
+
+			if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
+				// committed
+				Assert.AreEqual(10, await store
+					.Apply(x => x.AppendToStreamAsync(committed, 9, TestEvent.NewTestEvent(Guid.NewGuid())))
+					.Apply(x => x.NextExpectedVersion));
+
+				Assert.AreEqual(
+					eventsByStream[committed].Length + 1,
+					await EventsStream.Count(store, committed));
+
+				// uncommitted
+				Assert.AreEqual(9, await new TransactionalWriter(store, uncommitted)
+					.Apply(x => x.ContinueTransaction(uncommittedTransId))
+					.Apply(x => x.Commit())
+					.Apply(x => x.NextExpectedVersion));
+
+				Assert.AreEqual(
+					eventsByStream[uncommitted].Length,
+					await EventsStream.Count(store, uncommitted));
+			}
+		}
+	}
+}
+
+public static class Extensions {
+	public async static Task<U> Apply<T, U>(this Task<T> x, Func<T, Task<U>> f) {
+		var r = await x;
+		return await f(r);
+	}
+
+	public static U Apply<T, U>(this T x, Func<T, U> f) {
+		return f(x);
+	}
+
+	public async static Task<U> Apply<T, U>(this T x, Func<T, Task<U>> f) {
+		return await f(x);
+	}
+
+	public async static Task<U> Apply<T, U>(this Task<T> x, Func<T, U> f) {
+		var r = await x;
+		return f(r);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/catch_up_subscription_handles_errors.cs b/src/KurrentDB.Core.Tests/ClientAPI/catch_up_subscription_handles_errors.cs
new file mode 100644
index 00000000000..caeacc4b7db
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/catch_up_subscription_handles_errors.cs
@@ -0,0 +1,644 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.ClientOperations;
+using EventStore.ClientAPI.Common.Log;
+using EventStore.ClientAPI.Internal;
+using EventStore.ClientAPI.SystemData;
+using NUnit.Framework;
+using ClientMessage = EventStore.ClientAPI.Messages.ClientMessage;
+using ResolvedEvent = EventStore.ClientAPI.ResolvedEvent;
+using StreamMetadata = EventStore.ClientAPI.StreamMetadata;
+using SystemSettings = EventStore.ClientAPI.SystemSettings;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[TestFixture, Category("ClientAPI"), Category("LongRunning")]
+public class catch_up_subscription_handles_errors {
+	private static readonly int TimeoutMs = Debugger.IsAttached ? Timeout.Infinite : 2000;
+	private FakeEventStoreConnection _connection;
+	private IList<ResolvedEvent> _raisedEvents;
+	private bool _liveProcessingStarted;
+	private bool _isDropped;
+	private TaskCompletionSource<bool> _dropEvent;
+	private TaskCompletionSource<bool> _raisedEventEvent;
+	private Exception _dropException;
+	private SubscriptionDropReason _dropReason;
+	private EventStoreStreamCatchUpSubscription _subscription;
+	private static readonly string StreamId = "stream1";
+
+	[SetUp]
+	public void SetUp() {
+		_connection = new FakeEventStoreConnection();
+		_raisedEvents = new List<ResolvedEvent>();
+		_dropEvent = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+		_raisedEventEvent = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+		_liveProcessingStarted = false;
+		_isDropped = false;
+		_dropReason = SubscriptionDropReason.Unknown;
+		_dropException = null;
+
+		var settings = new CatchUpSubscriptionSettings(1, 1, false, false, String.Empty);
+		_subscription = new EventStoreStreamCatchUpSubscription(_connection, new NoopLogger(), StreamId, null, null,
+			(subscription, ev) => {
+				_raisedEvents.Add(ev);
+				if (_raisedEvents.Count >= 2) {
+					_raisedEventEvent.TrySetResult(true);
+				}
+				return Task.CompletedTask;
+			},
+			subscription => { _liveProcessingStarted = true; },
+			(subscription, reason, ex) => {
+				_isDropped = true;
+				_dropReason = reason;
+				_dropException = ex;
+				_dropEvent.TrySetResult(true);
+			},
+			settings);
+	}
+
+	[Test]
+	public async Task read_events_til_stops_subscription_when_throws_immediately() {
+		var expectedException = new ApplicationException("Test");
+
+		_connection.HandleReadStreamEventsForwardAsync((stream, start, max) => {
+			Assert.That(stream, Is.EqualTo(StreamId));
+			Assert.That(start, Is.EqualTo(0));
+			Assert.That(max, Is.EqualTo(1));
+			throw expectedException;
+		});
+
+		await AssertStartFailsAndDropsSubscriptionWithException(expectedException);
+	}
+
+	private async Task AssertStartFailsAndDropsSubscriptionWithException(ApplicationException expectedException) {
+		await AssertEx.ThrowsAsync<ApplicationException>(() => _subscription.StartAsync());
+		Assert.That(_isDropped);
+		Assert.That(_dropReason, Is.EqualTo(SubscriptionDropReason.CatchUpError));
+		Assert.That(_dropException, Is.SameAs(expectedException));
+		Assert.That(_liveProcessingStarted, Is.False);
+	}
+
+	[Test]
+	public async Task read_events_til_stops_subscription_when_throws_asynchronously() {
+		var expectedException = new ApplicationException("Test");
+		_connection.HandleReadStreamEventsForwardAsync((stream, start, max) => {
+			var taskCompletionSource =
+				new TaskCompletionSource<StreamEventsSlice>(TaskCreationOptions.RunContinuationsAsynchronously);
+			Assert.That(stream, Is.EqualTo(StreamId));
+			Assert.That(start, Is.EqualTo(0));
+			Assert.That(max, Is.EqualTo(1));
+			taskCompletionSource.SetException(expectedException);
+			return taskCompletionSource.Task;
+		});
+
+		await AssertStartFailsAndDropsSubscriptionWithException(expectedException);
+	}
+
+	[Test]
+	public async Task read_events_til_stops_subscription_when_second_read_throws_immediately() {
+		var expectedException = new ApplicationException("Test");
+
+		int callCount = 0;
+
+		_connection.HandleReadStreamEventsForwardAsync((stream, start, max) => {
+			Assert.That(stream, Is.EqualTo(StreamId));
+			Assert.That(max, Is.EqualTo(1));
+
+			if (callCount++ == 0) {
+				Assert.That(start, Is.EqualTo(0));
+				var taskCompletionSource =
+					new TaskCompletionSource<StreamEventsSlice>(TaskCreationOptions.RunContinuationsAsynchronously);
+				taskCompletionSource.SetResult(CreateStreamEventsSlice());
+				return taskCompletionSource.Task;
+			} else {
+				Assert.That(start, Is.EqualTo(1));
+				throw expectedException;
+			}
+		});
+
+		await AssertStartFailsAndDropsSubscriptionWithException(expectedException);
+		Assert.That(_raisedEvents.Count, Is.EqualTo(1));
+	}
+
+	[Test]
+	public async Task read_events_til_stops_subscription_when_second_read_throws_asynchronously() {
+		var expectedException = new ApplicationException("Test");
+
+		int callCount = 0;
+
+		_connection.HandleReadStreamEventsForwardAsync((stream, start, max) => {
+			Assert.That(stream, Is.EqualTo(StreamId));
+			Assert.That(max, Is.EqualTo(1));
+
+			if (callCount++ == 0) {
+				Assert.That(start, Is.EqualTo(0));
+				var taskCompletionSource =
+					new TaskCompletionSource<StreamEventsSlice>(TaskCreationOptions.RunContinuationsAsynchronously);
+				taskCompletionSource.SetResult(CreateStreamEventsSlice());
+				return taskCompletionSource.Task;
+			} else {
+				Assert.That(start, Is.EqualTo(1));
+				var taskCompletionSource =
+					new TaskCompletionSource<StreamEventsSlice>(TaskCreationOptions.RunContinuationsAsynchronously);
+				taskCompletionSource.SetException(expectedException);
+				return taskCompletionSource.Task;
+			}
+		});
+
+		await AssertStartFailsAndDropsSubscriptionWithException(expectedException);
+		Assert.That(_raisedEvents.Count, Is.EqualTo(1));
+	}
+
+	[Test]
+	public async Task start_stops_subscription_if_subscribe_fails_immediately() {
+		var expectedException = new ApplicationException("Test");
+
+		_connection.HandleReadStreamEventsForwardAsync((stream, start, max) => {
+			var taskCompletionSource =
+				new TaskCompletionSource<StreamEventsSlice>(TaskCreationOptions.RunContinuationsAsynchronously);
+			taskCompletionSource.SetResult(CreateStreamEventsSlice(isEnd: true));
+			return taskCompletionSource.Task;
+		});
+
+		_connection.HandleSubscribeToStreamAsync((stream, raise, drop) => {
+			Assert.That(stream, Is.EqualTo(StreamId));
+			throw expectedException;
+		});
+
+		await AssertStartFailsAndDropsSubscriptionWithException(expectedException);
+		Assert.That(_raisedEvents.Count, Is.EqualTo(1));
+	}
+
+	[Test]
+	public async Task start_stops_subscription_if_subscribe_fails_async() {
+		var expectedException = new ApplicationException("Test");
+
+		_connection.HandleReadStreamEventsForwardAsync((stream, start, max) => {
+			var taskCompletionSource =
+				new TaskCompletionSource<StreamEventsSlice>(TaskCreationOptions.RunContinuationsAsynchronously);
+			taskCompletionSource.SetResult(CreateStreamEventsSlice(isEnd: true));
+			return taskCompletionSource.Task;
+		});
+
+		_connection.HandleSubscribeToStreamAsync((stream, raise, drop) => {
+			var taskCompletionSource =
+				new TaskCompletionSource<EventStoreSubscription>(TaskCreationOptions
+					.RunContinuationsAsynchronously);
+			taskCompletionSource.SetException(expectedException);
+			return taskCompletionSource.Task;
+		});
+
+		await AssertStartFailsAndDropsSubscriptionWithException(expectedException);
+		Assert.That(_raisedEvents.Count, Is.EqualTo(1));
+	}
+
+	[Test]
+	public async Task start_stops_subscription_if_historical_missed_events_load_fails_immediate() {
+		var expectedException = new ApplicationException("Test");
+
+		int callCount = 0;
+		_connection.HandleReadStreamEventsForwardAsync((stream, start, max) => {
+			if (callCount++ == 0) {
+				var taskCompletionSource =
+					new TaskCompletionSource<StreamEventsSlice>(TaskCreationOptions.RunContinuationsAsynchronously);
+				taskCompletionSource.SetResult(CreateStreamEventsSlice(isEnd: true));
+				return taskCompletionSource.Task;
+			} else {
+				Assert.That(start, Is.EqualTo(1));
+				throw expectedException;
+			}
+		});
+
+		_connection.HandleSubscribeToStreamAsync((stream, raise, drop) => {
+			var taskCompletionSource =
+				new TaskCompletionSource<EventStoreSubscription>(TaskCreationOptions
+					.RunContinuationsAsynchronously);
+			taskCompletionSource.SetResult(CreateVolatileSubscription(raise, drop, 1));
+			return taskCompletionSource.Task;
+		});
+
+		await AssertStartFailsAndDropsSubscriptionWithException(expectedException);
+		Assert.That(_raisedEvents.Count, Is.EqualTo(1));
+	}
+
+
+	[Test]
+	public async Task start_stops_subscription_if_historical_missed_events_load_fails_async() {
+		var expectedException = new ApplicationException("Test");
+
+		int callCount = 0;
+		_connection.HandleReadStreamEventsForwardAsync((stream, start, max) => {
+			if (callCount++ == 0) {
+				var taskCompletionSource =
+					new TaskCompletionSource<StreamEventsSlice>(TaskCreationOptions.RunContinuationsAsynchronously);
+				taskCompletionSource.SetResult(CreateStreamEventsSlice(isEnd: true));
+				return taskCompletionSource.Task;
+			} else {
+				Assert.That(start, Is.EqualTo(1));
+				var taskCompletionSource =
+					new TaskCompletionSource<StreamEventsSlice>(TaskCreationOptions.RunContinuationsAsynchronously);
+				taskCompletionSource.SetException(expectedException);
+				return taskCompletionSource.Task;
+			}
+		});
+
+		_connection.HandleSubscribeToStreamAsync((stream, raise, drop) => {
+			var taskCompletionSource =
+				new TaskCompletionSource<EventStoreSubscription>(TaskCreationOptions
+					.RunContinuationsAsynchronously);
+			taskCompletionSource.SetResult(CreateVolatileSubscription(raise, drop, 1));
+			return taskCompletionSource.Task;
+		});
+
+		await AssertStartFailsAndDropsSubscriptionWithException(expectedException);
+		Assert.That(_raisedEvents.Count, Is.EqualTo(1));
+	}
+
+	[Test]
+	public async Task start_completes_onces_subscription_is_live() {
+		var finalEvent = new ManualResetEventSlim();
+		int callCount = 0;
+		_connection.HandleReadStreamEventsForwardAsync((stream, start, max) => Task.Run(() => {
+			callCount++;
+
+			if (callCount == 1) {
+				return Task.FromResult(CreateStreamEventsSlice(isEnd: true));
+			} else if (callCount == 2) {
+				var result = Task.FromResult(CreateStreamEventsSlice(fromEvent: 1, isEnd: true));
+				Assert.That(finalEvent.Wait(TimeoutMs));
+				return result;
+			} else {
+				throw new InvalidOperationException("Should not get a third call");
+			}
+		}));
+
+		_connection.HandleSubscribeToStreamAsync((stream, raise, drop) =>
+			Task.FromResult<EventStoreSubscription>(CreateVolatileSubscription(raise, drop, 1)));
+
+		var task = _subscription.StartAsync();
+
+		Assert.That(task.Status, Is.Not.EqualTo(TaskStatus.RanToCompletion));
+
+		finalEvent.Set();
+
+		await task.WithTimeout(TimeoutMs);
+	}
+
+	private static VolatileEventStoreSubscription CreateVolatileSubscription(
+		Func<EventStoreSubscription, ResolvedEvent, Task> raise,
+		Action<EventStoreSubscription, SubscriptionDropReason, Exception> drop, int? lastEventNumber) {
+		return new VolatileEventStoreSubscription(
+			new VolatileSubscriptionOperation(new NoopLogger(),
+				new TaskCompletionSource<EventStoreSubscription>(TaskCreationOptions
+					.RunContinuationsAsynchronously), StreamId, false, null, raise, drop, false, () => null),
+			StreamId, -1, lastEventNumber);
+	}
+
+	private static StreamEventsSlice CreateStreamEventsSlice(int fromEvent = 0, int count = 1, bool isEnd = false) {
+		var events = Enumerable.Range(0, count)
+			.Select(
+				i =>
+					new ClientMessage.ResolvedIndexedEvent(
+						new ClientMessage.EventRecord(StreamId, i, Guid.NewGuid().ToByteArray(), null, 0, 0, null,
+							null, null, null), null))
+			.ToArray();
+
+		return new StreamEventsSlice(SliceReadStatus.Success, StreamId, fromEvent, ReadDirection.Forward, events,
+			fromEvent + count, 100, isEnd);
+	}
+}
+
+internal class FakeEventStoreConnection : IEventStoreConnection {
+	private Func<Position, int, bool, UserCredentials, Task<AllEventsSlice>> _readAllEventsForwardAsync;
+	private Func<string, long, int, Task<StreamEventsSlice>> _readStreamEventsForwardAsync;
+
+	private Func<string, Func<EventStoreSubscription, ResolvedEvent, Task>,
+			Action<EventStoreSubscription, SubscriptionDropReason, Exception>, Task<EventStoreSubscription>>
+		_subscribeToStreamAsync;
+
+	private Func<bool, Func<EventStoreSubscription, ResolvedEvent, Task>,
+			Action<EventStoreSubscription, SubscriptionDropReason, Exception>, Task<EventStoreSubscription>>
+		_subscribeToAllAsync;
+
+	public void Dispose() {
+		throw new NotImplementedException();
+	}
+
+	public string ConnectionName { get; }
+
+	public ConnectionSettings Settings {
+		get { return null; }
+	}
+
+	public Task ConnectAsync() {
+		throw new NotImplementedException();
+	}
+
+	public void Close() {
+		throw new NotImplementedException();
+	}
+
+	public Task<DeleteResult> DeleteStreamAsync(string stream, long expectedVersion,
+		UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public Task<DeleteResult> DeleteStreamAsync(string stream, long expectedVersion, bool hardDelete,
+		UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public Task<WriteResult> AppendToStreamAsync(string stream, long expectedVersion, params EventData[] events) {
+		throw new NotImplementedException();
+	}
+
+	public Task<WriteResult> AppendToStreamAsync(string stream, long expectedVersion,
+		UserCredentials userCredentials, params EventData[] events) {
+		throw new NotImplementedException();
+	}
+
+	public Task<WriteResult> AppendToStreamAsync(string stream, long expectedVersion, IEnumerable<EventData> events,
+		UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public Task<ConditionalWriteResult> ConditionalAppendToStreamAsync(string stream, long expectedVersion,
+		IEnumerable<EventData> events,
+		UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public Task<EventStoreTransaction> StartTransactionAsync(string stream, long expectedVersion,
+		UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public EventStoreTransaction ContinueTransaction(long transactionId, UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public Task<EventReadResult> ReadEventAsync(string stream, long eventNumber, bool resolveLinkTos,
+		UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public void HandleReadStreamEventsForwardAsync(Func<string, long, int, Task<StreamEventsSlice>> callback) {
+		_readStreamEventsForwardAsync = callback;
+	}
+
+	public Task<StreamEventsSlice> ReadStreamEventsForwardAsync(string stream, long start, int count,
+		bool resolveLinkTos,
+		UserCredentials userCredentials = null) {
+		return _readStreamEventsForwardAsync(stream, start, count);
+	}
+
+	public Task<StreamEventsSlice> ReadStreamEventsBackwardAsync(string stream, long start, int count,
+		bool resolveLinkTos,
+		UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public void HandleReadAllEventsForwardAsync(
+		Func<Position, int, bool, UserCredentials, Task<AllEventsSlice>> callback) {
+		_readAllEventsForwardAsync = callback;
+	}
+
+	public Task<AllEventsSlice> ReadAllEventsForwardAsync(Position position, int maxCount, bool resolveLinkTos,
+		UserCredentials userCredentials = null) {
+		return _readAllEventsForwardAsync(position, maxCount, resolveLinkTos, userCredentials);
+	}
+
+	public Task<AllEventsSlice> FilteredReadAllEventsForwardAsync(Position position, int maxCount, bool resolveLinkTos, Filter filter,
+		UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public Task<AllEventsSlice> FilteredReadAllEventsForwardAsync(Position position, int maxCount, bool resolveLinkTos, Filter filter,
+		int maxSearchWindow, UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public Task<AllEventsSlice> ReadAllEventsBackwardAsync(Position position, int maxCount, bool resolveLinkTos,
+		UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public Task<AllEventsSlice> FilteredReadAllEventsBackwardAsync(Position position, int maxCount, bool resolveLinkTos, Filter filter,
+		int maxSearchWindow, UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public Task<AllEventsSlice> FilteredReadAllEventsBackwardAsync(Position position, int maxCount, bool resolveLinkTos, Filter filter,
+		UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public void HandleSubscribeToStreamAsync(
+		Func<string, Func<EventStoreSubscription, ResolvedEvent, Task>,
+				Action<EventStoreSubscription, SubscriptionDropReason, Exception>, Task<EventStoreSubscription>>
+			callback) {
+		_subscribeToStreamAsync = callback;
+	}
+
+	public Task<EventStoreSubscription> SubscribeToStreamAsync(string stream, bool resolveLinkTos,
+		Func<EventStoreSubscription, ResolvedEvent, Task> eventAppeared,
+		Action<EventStoreSubscription, SubscriptionDropReason, Exception> subscriptionDropped = null,
+		UserCredentials userCredentials = null) {
+		return _subscribeToStreamAsync(stream, eventAppeared, subscriptionDropped);
+	}
+
+	public EventStoreStreamCatchUpSubscription SubscribeToStreamFrom(string stream, long? lastCheckpoint,
+		bool resolveLinkTos,
+		Func<EventStoreCatchUpSubscription, ResolvedEvent, Task> eventAppeared,
+		Action<EventStoreCatchUpSubscription> liveProcessingStarted = null,
+		Action<EventStoreCatchUpSubscription, SubscriptionDropReason, Exception> subscriptionDropped = null,
+		UserCredentials userCredentials = null, int readBatchSize = 500, string subscriptionName = "") {
+		throw new NotImplementedException();
+	}
+
+	public EventStoreStreamCatchUpSubscription SubscribeToStreamFrom(
+		string stream,
+		long? lastCheckpoint,
+		CatchUpSubscriptionSettings settings,
+		Func<EventStoreCatchUpSubscription, ResolvedEvent, Task> eventAppeared,
+		Action<EventStoreCatchUpSubscription> liveProcessingStarted = null,
+		Action<EventStoreCatchUpSubscription, SubscriptionDropReason, Exception> subscriptionDropped = null,
+		UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public void HandleSubscribeToAllAsync(
+		Func<bool, Func<EventStoreSubscription, ResolvedEvent, Task>,
+				Action<EventStoreSubscription, SubscriptionDropReason, Exception>, Task<EventStoreSubscription>>
+			callback) {
+		_subscribeToAllAsync = callback;
+	}
+
+	public Task<EventStoreSubscription> SubscribeToAllAsync(bool resolveLinkTos,
+		Func<EventStoreSubscription, ResolvedEvent, Task> eventAppeared,
+		Action<EventStoreSubscription, SubscriptionDropReason, Exception> subscriptionDropped = null,
+		UserCredentials userCredentials = null) {
+		return _subscribeToAllAsync(resolveLinkTos, eventAppeared, subscriptionDropped);
+	}
+
+	public Task<EventStoreSubscription> FilteredSubscribeToAllAsync(bool resolveLinkTos, Filter filter, Func<EventStoreSubscription, ResolvedEvent, Task> eventAppeared, Func<EventStoreSubscription, Position, Task> checkpointReached,
+		int checkpointInterval, Action<EventStoreSubscription, SubscriptionDropReason, Exception> subscriptionDropped = null, UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public Task<EventStoreSubscription> FilteredSubscribeToAllAsync(bool resolveLinkTos, Filter filter, Func<EventStoreSubscription, ResolvedEvent, Task> eventAppeared,
+		Action<EventStoreSubscription, SubscriptionDropReason, Exception> subscriptionDropped = null, UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public Task<EventStoreSubscription> SubscribeToAllFilteredAsync(bool resolveLinkTos, Filter filter,
+		Func<EventStoreSubscription, ResolvedEvent, Task> eventAppeared,
+		Func<EventStoreSubscription, Position, Task> checkpointReached = null,
+		int? checkpointInterval = null,
+		Action<EventStoreSubscription, SubscriptionDropReason, Exception> subscriptionDropped = null,
+		UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public EventStorePersistentSubscriptionBase ConnectToPersistentSubscription(string stream, string groupName,
+		Func<EventStorePersistentSubscriptionBase, ResolvedEvent, int?, Task> eventAppeared,
+		Action<EventStorePersistentSubscriptionBase, SubscriptionDropReason, Exception> subscriptionDropped = null,
+		UserCredentials userCredentials = null, int bufferSize = 10,
+		bool autoAck = true) {
+		throw new NotImplementedException();
+	}
+
+	public Task<EventStorePersistentSubscriptionBase> ConnectToPersistentSubscriptionAsync(string stream,
+		string groupName, Func<EventStorePersistentSubscriptionBase, ResolvedEvent, int?, Task> eventAppeared,
+		Action<EventStorePersistentSubscriptionBase, SubscriptionDropReason, Exception> subscriptionDropped = null,
+		UserCredentials userCredentials = null, int bufferSize = 10,
+		bool autoAck = true) {
+		throw new NotImplementedException();
+	}
+
+	public EventStoreAllCatchUpSubscription SubscribeToAllFrom(Position? lastCheckpoint, bool resolveLinkTos,
+		Func<EventStoreCatchUpSubscription, ResolvedEvent, Task> eventAppeared,
+		Action<EventStoreCatchUpSubscription> liveProcessingStarted = null,
+		Action<EventStoreCatchUpSubscription, SubscriptionDropReason, Exception> subscriptionDropped = null,
+		UserCredentials userCredentials = null,
+		int readBatchSize = 500,
+		string subscriptionName = "") {
+		throw new NotImplementedException();
+	}
+
+	public EventStoreAllCatchUpSubscription SubscribeToAllFrom(
+		Position? lastCheckpoint,
+		CatchUpSubscriptionSettings settings,
+		Func<EventStoreCatchUpSubscription, ResolvedEvent, Task> eventAppeared,
+		Action<EventStoreCatchUpSubscription> liveProcessingStarted = null,
+		Action<EventStoreCatchUpSubscription, SubscriptionDropReason, Exception> subscriptionDropped = null,
+		UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public EventStoreAllFilteredCatchUpSubscription FilteredSubscribeToAllFrom(Position? lastCheckpoint, Filter filter,
+		CatchUpSubscriptionFilteredSettings settings, Func<EventStoreCatchUpSubscription, ResolvedEvent, Task> eventAppeared, Func<EventStoreCatchUpSubscription, Position, Task> checkpointReached,
+		int checkpointIntervalMultiplier, Action<EventStoreCatchUpSubscription> liveProcessingStarted = null, Action<EventStoreCatchUpSubscription, SubscriptionDropReason, Exception> subscriptionDropped = null,
+		UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public EventStoreAllFilteredCatchUpSubscription FilteredSubscribeToAllFrom(Position? lastCheckpoint, Filter filter,
+		CatchUpSubscriptionFilteredSettings settings, Func<EventStoreCatchUpSubscription, ResolvedEvent, Task> eventAppeared, Action<EventStoreCatchUpSubscription> liveProcessingStarted = null,
+		Action<EventStoreCatchUpSubscription, SubscriptionDropReason, Exception> subscriptionDropped = null, UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public Task UpdatePersistentSubscriptionAsync(string stream, string groupName,
+		PersistentSubscriptionSettings settings,
+		UserCredentials credentials) {
+		throw new NotImplementedException();
+	}
+
+	public Task CreatePersistentSubscriptionAsync(string stream, string groupName,
+		PersistentSubscriptionSettings settings,
+		UserCredentials credentials) {
+		throw new NotImplementedException();
+	}
+
+	public Task DeletePersistentSubscriptionAsync(string stream, string groupName,
+		UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public Task<WriteResult> SetStreamMetadataAsync(string stream, long expectedMetastreamVersion,
+		StreamMetadata metadata,
+		UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public Task<WriteResult> SetStreamMetadataAsync(string stream, long expectedMetastreamVersion, byte[] metadata,
+		UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public Task<StreamMetadataResult>
+		GetStreamMetadataAsync(string stream, UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public Task<RawStreamMetadataResult> GetStreamMetadataAsRawBytesAsync(string stream,
+		UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public Task SetSystemSettingsAsync(SystemSettings settings, UserCredentials userCredentials = null) {
+		throw new NotImplementedException();
+	}
+
+	public event EventHandler<ClientConnectionEventArgs> Connected;
+	public event EventHandler<ClientConnectionEventArgs> Disconnected;
+	public event EventHandler<ClientReconnectingEventArgs> Reconnecting;
+	public event EventHandler<ClientClosedEventArgs> Closed;
+	public event EventHandler<ClientErrorEventArgs> ErrorOccurred;
+	public event EventHandler<ClientAuthenticationFailedEventArgs> AuthenticationFailed;
+
+	protected virtual void OnErrorOccurred(ClientErrorEventArgs e) {
+		var handler = ErrorOccurred;
+		if (handler != null)
+			handler(this, e);
+	}
+
+	protected virtual void OnAuthenticationFailed(ClientAuthenticationFailedEventArgs e) {
+		var handler = AuthenticationFailed;
+		if (handler != null)
+			handler(this, e);
+	}
+
+	protected virtual void OnClosed(ClientClosedEventArgs e) {
+		var handler = Closed;
+		if (handler != null)
+			handler(this, e);
+	}
+
+	protected virtual void OnReconnecting(ClientReconnectingEventArgs e) {
+		var handler = Reconnecting;
+		if (handler != null)
+			handler(this, e);
+	}
+
+	protected virtual void OnDisconnected(ClientConnectionEventArgs e) {
+		var handler = Disconnected;
+		if (handler != null)
+			handler(this, e);
+	}
+
+	public void OnConnected(ClientConnectionEventArgs e) {
+		var handler = Connected;
+		if (handler != null)
+			handler(this, e);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/catchup_filtered_subscription.cs b/src/KurrentDB.Core.Tests/ClientAPI/catchup_filtered_subscription.cs
new file mode 100644
index 00000000000..eb9aa5d4abd
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/catchup_filtered_subscription.cs
@@ -0,0 +1,248 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("LongRunning"), Category("ClientAPI")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class catchup_filtered_subscription<TLogFormat, TStreamId> : SpecificationWithDirectory {
+	private MiniNode<TLogFormat, TStreamId> _node;
+	private IEventStoreConnection _conn;
+	private List<EventData> _testEvents;
+	private List<EventData> _testEventsAfter;
+	private const int Timeout = 10000;
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+
+		_conn = BuildConnection(_node);
+		await _conn.ConnectAsync();
+		_conn.SetStreamMetadataAsync(SystemStreams.AllStream, -1,
+			StreamMetadata.Build().SetReadRole(SystemRoles.All),
+			new UserCredentials(SystemUsers.Admin, SystemUsers.DefaultAdminPassword)).Wait();
+
+		_testEvents = Enumerable
+			.Range(0, 10)
+			.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "AEvent"))
+			.ToList();
+
+		_testEvents.AddRange(
+			Enumerable
+				.Range(0, 10)
+				.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "BEvent")).ToList());
+
+		_testEventsAfter = Enumerable
+			.Range(0, 10)
+			.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "AEvent"))
+			.ToList();
+
+		_testEventsAfter.AddRange(
+			Enumerable
+				.Range(0, 10)
+				.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "BEvent")).ToList());
+
+		await _conn.AppendToStreamAsync("stream-a", ExpectedVersion.NoStream, _testEvents.EvenEvents());
+		await _conn.AppendToStreamAsync("stream-b", ExpectedVersion.NoStream, _testEvents.OddEvents());
+	}
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.Create(node.TcpEndPoint);
+	}
+
+	[Test]
+	public void calls_checkpoint_delegate_during_catchup() {
+		var filter = Filter.StreamId.Prefix("stream-a");
+		// in v2 there are 20 events, 10 in stream-a and 10 in stream-b.
+		// in v3 there are additionally two stream records and two event type records
+		var isV2 = LogFormatHelper<TLogFormat, TStreamId>.IsV2;
+		var checkpointReached = new CountdownEvent(isV2 ? 10 : 14);
+		var eventsSeen = 0;
+
+		var settings = new CatchUpSubscriptionFilteredSettings(
+			maxLiveQueueSize: 10000,
+			readBatchSize: 2,
+			verboseLogging: false,
+			resolveLinkTos: true,
+			maxSearchWindow: 2,
+			subscriptionName: String.Empty
+		);
+
+		_conn.FilteredSubscribeToAllFrom(
+			Position.Start,
+			filter,
+			settings,
+			(s, e) => {
+				eventsSeen++;
+				return Task.CompletedTask;
+			},
+			(s, p) => {
+				checkpointReached.Signal();
+				return Task.CompletedTask;
+			}, 1);
+
+		if (!checkpointReached.Wait(Timeout)) {
+			Assert.Fail("Checkpoint reached not called enough times within time limit.");
+		}
+
+		Assert.AreEqual(10, eventsSeen);
+	}
+
+	[Test]
+	public void calls_checkpoint_during_live_processing_stage() {
+		var filter = Filter.StreamId.Prefix("stream-a");
+		var appeared = new CountdownEvent(_testEventsAfter.EvenEvents().Count + 1); // Calls once for switch to live.
+		var eventsSeen = 0;
+		var isLive = false;
+
+		var settings = new CatchUpSubscriptionFilteredSettings(
+			10000,
+			1,
+			verboseLogging: false,
+			resolveLinkTos: true,
+			maxSearchWindow: 1,
+			subscriptionName: String.Empty
+		);
+
+		_conn.FilteredSubscribeToAllFrom(
+			Position.Start,
+			filter,
+			settings,
+			(s, e) => {
+				eventsSeen++;
+				return Task.CompletedTask;
+			},
+			(s, p) => {
+				if (isLive) {
+					appeared.Signal();
+				}
+
+				return Task.CompletedTask;
+			}, 1, s => {
+				isLive = true;
+				_conn.AppendToStreamAsync("stream-a", ExpectedVersion.Any, _testEventsAfter.EvenEvents()).Wait();
+			});
+
+		if (!appeared.Wait(Timeout)) {
+			Assert.Fail("Checkpoint appeared not called enough times within time limit.");
+		}
+
+		Assert.AreEqual(20, eventsSeen);
+	}
+
+	[Test, Category("LongRunning")]
+	public void only_return_events_with_a_given_stream_prefix() {
+		var filter = Filter.StreamId.Prefix("stream-a");
+		var foundEvents = new ConcurrentBag<ResolvedEvent>();
+		var appeared = new CountdownEvent(20);
+
+		Subscribe(filter, foundEvents, appeared);
+
+		if (!appeared.Wait(Timeout)) {
+			Assert.Fail("Appeared countdown event timed out.");
+		}
+
+		Assert.True(foundEvents.All(e => e.Event.EventStreamId == "stream-a"));
+	}
+
+	[Test, Category("LongRunning")]
+	public void only_return_events_with_a_given_event_prefix() {
+		var filter = Filter.EventType.Prefix("AE");
+		var foundEvents = new ConcurrentBag<ResolvedEvent>();
+		var appeared = new CountdownEvent(20);
+
+		Subscribe(filter, foundEvents, appeared);
+
+		if (!appeared.Wait(Timeout)) {
+			Assert.Fail("Appeared countdown event timed out.");
+		}
+
+		Assert.True(foundEvents.All(e => e.Event.EventType == "AEvent"));
+	}
+
+	[Test, Category("LongRunning")]
+	public void only_return_events_that_satisfy_a_given_stream_regex() {
+		var filter = Filter.StreamId.Regex(new Regex(@"^.*eam-b.*$"));
+		var foundEvents = new ConcurrentBag<ResolvedEvent>();
+		var appeared = new CountdownEvent(20);
+
+		Subscribe(filter, foundEvents, appeared);
+
+		if (!appeared.Wait(Timeout)) {
+			Assert.Fail("Appeared countdown event timed out.");
+		}
+
+		Assert.True(foundEvents.All(e => e.Event.EventStreamId == "stream-b"));
+	}
+
+	[Test, Category("LongRunning")]
+	public void only_return_events_that_satisfy_a_given_event_regex() {
+		var filter = Filter.EventType.Regex(new Regex(@"^.*BEv.*$"));
+		var foundEvents = new ConcurrentBag<ResolvedEvent>();
+		var appeared = new CountdownEvent(20);
+
+		Subscribe(filter, foundEvents, appeared);
+
+		if (!appeared.Wait(Timeout)) {
+			Assert.Fail("Appeared countdown event timed out.");
+		}
+
+		Assert.True(foundEvents.All(e => e.Event.EventType == "BEvent"));
+	}
+
+	[Test, Category("LongRunning")]
+	public void only_return_events_that_are_not_system_events() {
+		var filter = Filter.ExcludeSystemEvents;
+		var foundEvents = new ConcurrentBag<ResolvedEvent>();
+		var appeared = new CountdownEvent(20);
+
+		Subscribe(filter, foundEvents, appeared);
+
+		if (!appeared.Wait(Timeout)) {
+			Assert.Fail("Appeared countdown event timed out.");
+		}
+
+		Assert.True(foundEvents.All(e => !e.Event.EventType.StartsWith("$")));
+	}
+
+	private void Subscribe(Filter filter, ConcurrentBag<ResolvedEvent> foundEvents, CountdownEvent appeared) {
+		_conn.FilteredSubscribeToAllFrom(
+			Position.Start,
+			filter,
+			CatchUpSubscriptionFilteredSettings.Default,
+			(s, e) => {
+				foundEvents.Add(e);
+				appeared.Signal();
+				return Task.CompletedTask;
+			},
+			(s, p) => Task.CompletedTask, 5,
+			s => {
+				_conn.AppendToStreamAsync("stream-a", ExpectedVersion.Any, _testEventsAfter.EvenEvents()).Wait();
+				_conn.AppendToStreamAsync("stream-b", ExpectedVersion.Any, _testEventsAfter.OddEvents()).Wait();
+			});
+	}
+
+	[TearDown]
+	public override async Task TearDown() {
+		_conn.Close();
+		await _node.Shutdown();
+		await base.TearDown();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/catchup_subscription_handles_small_batch_sizes.cs b/src/KurrentDB.Core.Tests/ClientAPI/catchup_subscription_handles_small_batch_sizes.cs
new file mode 100644
index 00000000000..6fd5f905cab
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/catchup_subscription_handles_small_batch_sizes.cs
@@ -0,0 +1,93 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Ignore("Very long running")]
+[Category("LongRunning"), Category("ClientAPI")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class catchup_subscription_handles_small_batch_sizes<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private MiniNode<TLogFormat, TStreamId> _node;
+	private string _streamName = "TestStream";
+	private CatchUpSubscriptionSettings _settings;
+	private IEventStoreConnection _conn;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName, inMemDb: true);
+		await _node.Start();
+
+		_conn = BuildConnection(_node);
+		await _conn.ConnectAsync();
+		//Create 80000 events
+		for (var i = 0; i < 80; i++) {
+			await _conn.AppendToStreamAsync(_streamName, ExpectedVersion.Any, CreateThousandEvents());
+		}
+
+		_settings = new CatchUpSubscriptionSettings(100, 1, false, true, String.Empty);
+	}
+
+	private EventData[] CreateThousandEvents() {
+		var events = new List<EventData>();
+		for (var i = 0; i < 1000; i++) {
+			events.Add(new EventData(Guid.NewGuid(), "testEvent", true,
+				Encoding.UTF8.GetBytes("{ \"Foo\":\"Bar\" }"), null));
+		}
+
+		return events.ToArray();
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		_conn.Dispose();
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.Create(node.TcpEndPoint);
+	}
+
+	[Test]
+	public void CatchupSubscriptionToAllHandlesManyEventsWithSmallBatchSize() {
+		var mre = new ManualResetEvent(false);
+		_conn.SubscribeToAllFrom(null, _settings, (sub, evnt) => {
+			if (evnt.OriginalEventNumber % 1000 == 0) {
+				Console.WriteLine("Processed {0} events", evnt.OriginalEventNumber);
+			}
+
+			return Task.CompletedTask;
+		}, (sub) => { mre.Set(); }, null, new UserCredentials("admin", "changeit"));
+
+		if (!mre.WaitOne(TimeSpan.FromMinutes(10)))
+			Assert.Fail("Timed out waiting for test to complete");
+	}
+
+	[Test]
+	public void CatchupSubscriptionToStreamHandlesManyEventsWithSmallBatchSize() {
+		var mre = new ManualResetEvent(false);
+		_conn.SubscribeToStreamFrom(_streamName, null, _settings, (sub, evnt) => {
+			if (evnt.OriginalEventNumber % 1000 == 0) {
+				Console.WriteLine("Processed {0} events", evnt.OriginalEventNumber);
+			}
+
+			return Task.CompletedTask;
+		}, (sub) => { mre.Set(); }, null, new UserCredentials("admin", "changeit"));
+
+		if (!mre.WaitOne(TimeSpan.FromMinutes(10)))
+			Assert.Fail("Timed out waiting for test to complete");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/connect.cs b/src/KurrentDB.Core.Tests/ClientAPI/connect.cs
new file mode 100644
index 00000000000..565cb312f57
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/connect.cs
@@ -0,0 +1,154 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Internal;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string), TcpType.Normal)]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), TcpType.Normal)]
+[TestFixture(typeof(LogFormat.V2), typeof(string), TcpType.Ssl)]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), TcpType.Ssl)]
+public class Connect<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private readonly TcpType _tcpType;
+
+	public Connect(TcpType tcpType) {
+		_tcpType = tcpType;
+	}
+
+	//TODO GFY THESE NEED TO BE LOOKED AT IN LINUX
+	[Test, Category("Network")]
+	public async Task should_not_throw_exception_when_server_is_down() {
+		var ip = IPAddress.Loopback;
+		int port = PortsHelper.GetAvailablePort(ip);
+		using var connection = TestConnection.Create(new IPEndPoint(ip, port), _tcpType);
+		await connection.ConnectAsync();
+	}
+
+	//TODO GFY THESE NEED TO BE LOOKED AT IN LINUX
+	[Test, Category("Network")]
+	public async Task should_throw_exception_when_trying_to_reopen_closed_connection() {
+		ClientApiLoggerBridge.Default.Info("Starting '{0}' test...",
+			"should_throw_exception_when_trying_to_reopen_closed_connection");
+
+		var closed = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+		var settings = ConnectionSettings.Create()
+			.EnableVerboseLogging()
+			.UseCustomLogger(ClientApiLoggerBridge.Default)
+			.LimitReconnectionsTo(0)
+			.WithConnectionTimeoutOf(TimeSpan.FromSeconds(10))
+			.SetReconnectionDelayTo(TimeSpan.FromMilliseconds(0))
+			.FailOnNoServerResponse();
+		if (_tcpType == TcpType.Ssl) {
+			settings.DisableServerCertificateValidation();
+		} else {
+			settings.DisableTls();
+		}
+
+		var ip = IPAddress.Loopback;
+		int port = PortsHelper.GetAvailablePort(ip);
+		using var connection = EventStoreConnection.Create(settings, new IPEndPoint(ip, port).ToESTcpUri());
+		connection.Closed += (s, e) => closed.TrySetResult(true);
+
+		await connection.ConnectAsync();
+
+		await closed.Task.WithTimeout(
+			TimeSpan.FromSeconds(120)); // TCP connection timeout might be even 60 seconds
+
+		await AssertEx.ThrowsAsync<ObjectDisposedException>(() => connection.ConnectAsync().WithTimeout());
+	}
+
+	//TODO GFY THIS TEST TIMES OUT IN LINUX.
+	[Test, Category("Network")]
+	public async Task should_close_connection_after_configured_amount_of_failed_reconnections() {
+		var closed = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+		var settings =
+			ConnectionSettings.Create()
+				.EnableVerboseLogging()
+				.UseCustomLogger(ClientApiLoggerBridge.Default)
+				.LimitReconnectionsTo(1)
+				.WithConnectionTimeoutOf(TimeSpan.FromSeconds(10))
+				.SetReconnectionDelayTo(TimeSpan.FromMilliseconds(0))
+				.FailOnNoServerResponse();
+		if (_tcpType == TcpType.Ssl) {
+			settings.DisableServerCertificateValidation();
+		} else {
+			settings.DisableTls();
+		}
+
+		var ip = IPAddress.Loopback;
+		int port = PortsHelper.GetAvailablePort(ip);
+		using var connection = EventStoreConnection.Create(settings, new IPEndPoint(ip, port).ToESTcpUri());
+		connection.Closed += (s, e) => closed.TrySetResult(true);
+		connection.Connected += (s, e) =>
+			Console.WriteLine("EventStoreConnection '{0}': connected to [{1}]...",
+				e.Connection.ConnectionName, e.RemoteEndPoint);
+		connection.Reconnecting += (s, e) =>
+			Console.WriteLine("EventStoreConnection '{0}': reconnecting...", e.Connection.ConnectionName);
+		connection.Disconnected += (s, e) =>
+			Console.WriteLine("EventStoreConnection '{0}': disconnected from [{1}]...",
+				e.Connection.ConnectionName, e.RemoteEndPoint);
+		connection.ErrorOccurred += (s, e) => Console.WriteLine("EventStoreConnection '{0}': error = {1}",
+			e.Connection.ConnectionName, e.Exception);
+
+		await connection.ConnectAsync();
+
+		await closed.Task.WithTimeout(
+			TimeSpan.FromSeconds(120)); // TCP connection timeout might be even 60 seconds
+
+		await AssertEx.ThrowsAsync<ObjectDisposedException>(() => connection
+			.AppendToStreamAsync("stream", ExpectedVersion.NoStream, TestEvent.NewTestEvent())
+			.WithTimeout());
+	}
+}
+
+[TestFixture, Category("ClientAPI"), Category("LongRunning")]
+public class not_connected_tests {
+	private readonly TcpType _tcpType = TcpType.Ssl;
+
+	[Test]
+	public async Task should_timeout_connection_after_configured_amount_time_on_conenct() {
+		var closed = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+		var settings =
+			ConnectionSettings.Create()
+				.EnableVerboseLogging()
+				.UseCustomLogger(ClientApiLoggerBridge.Default)
+				.LimitReconnectionsTo(0)
+				.SetReconnectionDelayTo(TimeSpan.FromMilliseconds(0))
+				.FailOnNoServerResponse()
+				.WithConnectionTimeoutOf(TimeSpan.FromMilliseconds(1000));
+
+		if (_tcpType == TcpType.Ssl) {
+			settings.DisableServerCertificateValidation();
+		} else {
+			settings.DisableTls();
+		}
+
+		var ip = new IPAddress(new byte[]
+			{8, 8, 8, 8}); //NOTE: This relies on Google DNS server being configured to swallow nonsense traffic
+		const int port = 4567;
+		using (var connection = EventStoreConnection.Create(settings, new IPEndPoint(ip, port).ToESTcpUri())) {
+			connection.Closed += (s, e) => closed.TrySetResult(true);
+			connection.Connected += (s, e) => Console.WriteLine("EventStoreConnection '{0}': connected to [{1}]...",
+				e.Connection.ConnectionName, e.RemoteEndPoint);
+			connection.Reconnecting += (s, e) =>
+				Console.WriteLine("EventStoreConnection '{0}': reconnecting...", e.Connection.ConnectionName);
+			connection.Disconnected += (s, e) =>
+				Console.WriteLine("EventStoreConnection '{0}': disconnected from [{1}]...",
+					e.Connection.ConnectionName, e.RemoteEndPoint);
+			connection.ErrorOccurred += (s, e) => Console.WriteLine("EventStoreConnection '{0}': error = {1}",
+				e.Connection.ConnectionName, e.Exception);
+			await connection.ConnectAsync();
+
+			await closed.Task.WithTimeout(TimeSpan.FromSeconds(15));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/connecting_to_a_persistent_subscription.cs b/src/KurrentDB.Core.Tests/ClientAPI/connecting_to_a_persistent_subscription.cs
new file mode 100644
index 00000000000..739520bd889
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/connecting_to_a_persistent_subscription.cs
@@ -0,0 +1,894 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.ClientOperations;
+using EventStore.ClientAPI.Common;
+using EventStore.ClientAPI.Common.Utils;
+using EventStore.ClientAPI.Exceptions;
+using KurrentDB.Core.Tests.ClientAPI.ExpectedVersion64Bit;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("LongRunning"), Category("ClientAPI")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class connect_to_non_existing_persistent_subscription_with_permissions<TLogFormat, TStreamId>
+	: SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private Exception _caught;
+
+	protected override Task When() {
+		_caught = Assert.Throws<AggregateException>(
+			() => {
+				_conn.ConnectToPersistentSubscription(
+					"nonexisting2",
+					"foo",
+					(sub, e) => {
+						Console.Write("appeared");
+						return Task.CompletedTask;
+					},
+					(sub, reason, ex) => { },
+					DefaultData.AdminCredentials);
+				throw new Exception("should have thrown");
+			}).InnerException;
+		return Task.CompletedTask;
+	}
+
+	[Test]
+	public void the_completion_fails() {
+		Assert.IsNotNull(_caught);
+	}
+
+	[Test]
+	public void the_exception_is_an_argument_exception() {
+		Assert.IsInstanceOf<ArgumentException>(_caught);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class connect_to_existing_persistent_subscription_with_permissions<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private EventStorePersistentSubscriptionBase _sub;
+	private readonly string _stream = Guid.NewGuid().ToString();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent();
+
+	protected override async Task Given() {
+		await _conn.CreatePersistentSubscriptionAsync(_stream, "agroupname17", _settings,
+			DefaultData.AdminCredentials);
+	}
+
+	protected override Task When() {
+		_sub = _conn.ConnectToPersistentSubscription(_stream,
+			"agroupname17",
+			(sub, e) => {
+				Console.Write("appeared");
+				return Task.CompletedTask;
+			},
+			(sub, reason, ex) => { },
+			DefaultData.AdminCredentials);
+
+		return Task.CompletedTask;
+	}
+
+	[Test]
+	public void the_subscription_succeeds() {
+		Assert.IsNotNull(_sub);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class connect_to_existing_persistent_subscription_without_permissions<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = "$" + Guid.NewGuid();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent();
+
+	protected override Task When() {
+		return _conn.CreatePersistentSubscriptionAsync(_stream, "agroupname55", _settings,
+			DefaultData.AdminCredentials);
+	}
+
+	[Test]
+	public void the_subscription_fails_to_connect() {
+		try {
+			_conn.ConnectToPersistentSubscription(
+				_stream,
+				"agroupname55",
+				(sub, e) => {
+					Console.Write("appeared");
+					return Task.CompletedTask;
+				},
+				(sub, reason, ex) => Console.WriteLine("dropped."));
+			throw new Exception("should have thrown.");
+		} catch (Exception ex) {
+			Assert.IsInstanceOf<AggregateException>(ex);
+			Assert.IsInstanceOf<AccessDeniedException>(ex.InnerException);
+		}
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class connect_to_existing_persistent_subscription_with_max_one_client<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = "$" + Guid.NewGuid();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent()
+		.WithMaxSubscriberCountOf(1);
+
+	private Exception _exception;
+
+	private const string _group = "startinbeginning1";
+
+	protected override async Task Given() {
+		await base.Given();
+		await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
+			DefaultData.AdminCredentials);
+		_conn.ConnectToPersistentSubscription(
+			_stream,
+			_group,
+			(s, e) => {
+				s.Acknowledge(e);
+				return Task.CompletedTask;
+			},
+			(sub, reason, ex) => { },
+			DefaultData.AdminCredentials);
+	}
+
+	protected override Task When() {
+		_exception = Assert.Throws<AggregateException>(() => {
+			_conn.ConnectToPersistentSubscription(
+				_stream,
+				_group,
+				(s, e) => {
+					s.Acknowledge(e);
+					return Task.CompletedTask;
+				},
+				(sub, reason, ex) => { },
+				DefaultData.AdminCredentials);
+			throw new Exception("should have thrown.");
+		}).InnerException;
+		return Task.CompletedTask;
+	}
+
+	[Test]
+	public void the_second_subscription_fails_to_connect() {
+		Assert.IsInstanceOf<MaximumSubscribersReachedException>(_exception);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	connect_to_existing_persistent_subscription_with_start_from_beginning_and_no_stream<TLogFormat, TStreamId> :
+		SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = "$" + Guid.NewGuid();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromBeginning();
+
+	private readonly Guid _id = Guid.NewGuid();
+	private readonly TaskCompletionSource<ResolvedEvent> _firstEventSource = new TaskCompletionSource<ResolvedEvent>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+	private const string _group = "startinbeginning1";
+
+	protected override async Task Given() {
+		await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
+			DefaultData.AdminCredentials);
+		_conn.ConnectToPersistentSubscription(
+			_stream,
+			_group,
+			HandleEvent,
+			(sub, reason, ex) => { },
+			DefaultData.AdminCredentials);
+	}
+
+	protected override Task When() {
+		return _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
+			new EventData(_id, "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
+	}
+
+	private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
+		_firstEventSource.TrySetResult(resolvedEvent);
+		return Task.CompletedTask;
+	}
+
+	[Test]
+	public async Task the_subscription_gets_event_zero_as_its_first_event() {
+		var firstEvent = await _firstEventSource.Task.WithTimeout(TimeSpan.FromSeconds(10));
+		Assert.AreEqual(0, firstEvent.Event.EventNumber);
+		Assert.AreEqual(_id, firstEvent.Event.EventId);
+	}
+}
+
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	connect_to_existing_persistent_subscription_with_start_from_two_and_no_stream<TLogFormat, TStreamId>
+	: SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = "$" + Guid.NewGuid();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFrom(2);
+
+	private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
+	private readonly Guid _id = Guid.NewGuid();
+	private readonly TaskCompletionSource<ResolvedEvent> _firstEventSource = new TaskCompletionSource<ResolvedEvent>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+	private const string _group = "startinbeginning1";
+
+	protected override async Task Given() {
+		await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
+			DefaultData.AdminCredentials);
+		_conn.ConnectToPersistentSubscription(
+			_stream,
+			_group,
+			HandleEvent,
+			(sub, reason, ex) => { },
+			DefaultData.AdminCredentials);
+	}
+
+	protected override async Task When() {
+		await _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
+				new EventData(Guid.NewGuid(), "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]))
+;
+		await _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
+				new EventData(Guid.NewGuid(), "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]))
+;
+		await _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
+			new EventData(_id, "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
+	}
+
+	private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
+		_firstEventSource.TrySetResult(resolvedEvent);
+		return Task.CompletedTask;
+	}
+
+	[Test]
+	public async Task the_subscription_gets_event_two_as_its_first_event() {
+		var resolvedEvent = await _firstEventSource.Task.WithTimeout(TimeSpan.FromSeconds(10));
+		Assert.AreEqual(2, resolvedEvent.Event.EventNumber);
+		Assert.AreEqual(_id, resolvedEvent.Event.EventId);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	connect_to_existing_persistent_subscription_with_start_from_beginning_and_events_in_it<TLogFormat, TStreamId> :
+		SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = "$" + Guid.NewGuid();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromBeginning();
+
+	private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
+	private ResolvedEvent _firstEvent;
+	private List<Guid> _ids = new List<Guid>();
+	private bool _set = false;
+
+	private const string _group = "startinbeginning1";
+
+	protected override async Task Given() {
+		await WriteEvents(_conn);
+		await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
+			DefaultData.AdminCredentials);
+	}
+
+	private async Task WriteEvents(IEventStoreConnection connection) {
+		for (int i = 0; i < 10; i++) {
+			_ids.Add(Guid.NewGuid());
+			await connection.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
+					new EventData(_ids[i], "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]))
+;
+		}
+	}
+
+	protected override Task When() {
+		_conn.ConnectToPersistentSubscription(
+			_stream,
+			_group,
+			HandleEvent,
+			(sub, reason, ex) => { },
+			DefaultData.AdminCredentials);
+		return Task.CompletedTask;
+	}
+
+	private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
+		if (!_set) {
+			_set = true;
+			_firstEvent = resolvedEvent;
+			_resetEvent.Set();
+		}
+
+		return Task.CompletedTask;
+	}
+
+	[Test]
+	public void the_subscription_gets_event_zero_as_its_first_event() {
+		Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
+		Assert.AreEqual(0, _firstEvent.Event.EventNumber);
+		Assert.AreEqual(_ids[0], _firstEvent.Event.EventId);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	connect_to_existing_persistent_subscription_with_start_from_beginning_not_set_and_events_in_it<TLogFormat, TStreamId> :
+		SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = "$" + Guid.NewGuid();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent();
+
+	private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
+
+	private const string _group = "startinbeginning1";
+
+	protected override async Task Given() {
+		await WriteEvents(_conn);
+		await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
+			DefaultData.AdminCredentials);
+	}
+
+	private async Task WriteEvents(IEventStoreConnection connection) {
+		for (int i = 0; i < 10; i++) {
+			await connection.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
+					new EventData(Guid.NewGuid(), "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"),
+						new byte[0]))
+;
+		}
+	}
+
+	protected override Task When() {
+		_conn.ConnectToPersistentSubscription(
+			_stream,
+			_group,
+			HandleEvent,
+			(sub, reason, ex) => { },
+			DefaultData.AdminCredentials);
+		return Task.CompletedTask;
+	}
+
+	private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
+		_resetEvent.Set();
+		return Task.CompletedTask;
+	}
+
+	[Test]
+	public void the_subscription_gets_no_events() {
+		Assert.IsFalse(_resetEvent.WaitOne(TimeSpan.FromSeconds(1)));
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	connect_to_existing_persistent_subscription_with_start_from_beginning_not_set_and_events_in_it_then_event_written<TLogFormat, TStreamId> :
+		SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = "$" + Guid.NewGuid();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos();
+
+	private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
+	private ResolvedEvent _firstEvent;
+	private Guid _id;
+
+	private const string _group = "startinbeginning1";
+
+	protected override async Task Given() {
+		await WriteEvents(_conn);
+		await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
+			DefaultData.AdminCredentials);
+		_conn.ConnectToPersistentSubscription(
+			_stream,
+			_group,
+			HandleEvent,
+			(sub, reason, ex) => { },
+			DefaultData.AdminCredentials);
+	}
+
+	private async Task WriteEvents(IEventStoreConnection connection) {
+		for (int i = 0; i < 10; i++) {
+			await connection.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
+					new EventData(Guid.NewGuid(), "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"),
+						new byte[0]))
+;
+		}
+	}
+
+	protected override async Task When() {
+		_id = Guid.NewGuid();
+		await _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
+			new EventData(_id, "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
+	}
+
+	private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
+		_firstEvent = resolvedEvent;
+		_resetEvent.Set();
+		return Task.CompletedTask;
+	}
+
+	[Test]
+	public void the_subscription_gets_the_written_event_as_its_first_event() {
+		Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
+		Assert.IsNotNull(_firstEvent);
+		Assert.AreEqual(10, _firstEvent.Event.EventNumber);
+		Assert.AreEqual(_id, _firstEvent.Event.EventId);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	connect_to_existing_persistent_subscription_with_start_from_x_set_higher_than_x_and_events_in_it_then_event_written<TLogFormat, TStreamId> :
+		SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = "$" + Guid.NewGuid();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFrom(11);
+
+	private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
+	private ResolvedEvent _firstEvent;
+	private Guid _id;
+
+	private const string _group = "startinbeginning1";
+
+	protected override async Task Given() {
+		await WriteEvents(_conn);
+		await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
+			DefaultData.AdminCredentials);
+		_conn.ConnectToPersistentSubscription(
+			_stream,
+			_group,
+			HandleEvent,
+			(sub, reason, ex) => { },
+			DefaultData.AdminCredentials);
+	}
+
+	private async Task WriteEvents(IEventStoreConnection connection) {
+		for (int i = 0; i < 11; i++) {
+			await connection.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
+					new EventData(Guid.NewGuid(), "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"),
+						new byte[0]))
+;
+		}
+	}
+
+	protected override Task When() {
+		_id = Guid.NewGuid();
+		return _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
+			new EventData(_id, "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
+	}
+
+	private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
+		_firstEvent = resolvedEvent;
+		_resetEvent.Set();
+		return Task.CompletedTask;
+	}
+
+	[Test]
+	public void the_subscription_gets_the_written_event_as_its_first_event() {
+		Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
+		Assert.IsNotNull(_firstEvent);
+		Assert.AreEqual(11, _firstEvent.Event.EventNumber);
+		Assert.AreEqual(_id, _firstEvent.Event.EventId);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class a_nak_in_subscription_handler_in_autoack_mode_drops_the_subscription<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = "$" + Guid.NewGuid();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromBeginning();
+
+	private readonly ManualResetEvent _resetEvent = new ManualResetEvent(false);
+	private Exception _exception;
+	private SubscriptionDropReason _reason;
+
+	private const string _group = "naktest";
+
+	protected override async Task Given() {
+		await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
+			DefaultData.AdminCredentials);
+		_conn.ConnectToPersistentSubscription(
+			_stream,
+			_group,
+			HandleEvent,
+			Dropped,
+			DefaultData.AdminCredentials);
+	}
+
+	private void Dropped(EventStorePersistentSubscriptionBase sub, SubscriptionDropReason reason,
+		Exception exception) {
+		_exception = exception;
+		_reason = reason;
+		_resetEvent.Set();
+	}
+
+	protected override Task When() {
+		return _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
+				new EventData(Guid.NewGuid(), "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
+	}
+
+	private static Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
+		throw new Exception("test");
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_subscription_gets_dropped() {
+		Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(5)));
+		Assert.AreEqual(SubscriptionDropReason.EventHandlerException, _reason);
+		Assert.AreEqual(typeof(Exception), _exception.GetType());
+		Assert.AreEqual("test", _exception.Message);
+	}
+}
+
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	connect_to_existing_persistent_subscription_with_start_from_x_set_and_events_in_it_then_event_written<TLogFormat, TStreamId> :
+		SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = "$" + Guid.NewGuid();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFrom(10);
+
+	private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
+	private ResolvedEvent _firstEvent;
+	private Guid _id;
+
+	private const string _group = "startinbeginning1";
+
+	protected override async Task Given() {
+		await WriteEvents(_conn);
+		await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
+			DefaultData.AdminCredentials);
+		_conn.ConnectToPersistentSubscription(
+			_stream,
+			_group,
+			HandleEvent,
+			(sub, reason, ex) => { },
+			DefaultData.AdminCredentials);
+	}
+
+	private async Task WriteEvents(IEventStoreConnection connection) {
+		for (int i = 0; i < 10; i++) {
+			await connection.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
+					new EventData(Guid.NewGuid(), "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"),
+						new byte[0]))
+;
+		}
+	}
+
+	protected override Task When() {
+		_id = Guid.NewGuid();
+		return _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
+			new EventData(_id, "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
+	}
+
+	private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
+		_firstEvent = resolvedEvent;
+		_resetEvent.Set();
+		return Task.CompletedTask;
+	}
+
+	[Test]
+	public void the_subscription_gets_the_written_event_as_its_first_event() {
+		Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
+		Assert.IsNotNull(_firstEvent);
+		Assert.AreEqual(10, _firstEvent.Event.EventNumber);
+		Assert.AreEqual(_id, _firstEvent.Event.EventId);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	connect_to_existing_persistent_subscription_with_start_from_x_set_and_events_in_it<TLogFormat, TStreamId>
+	: SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = "$" + Guid.NewGuid();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFrom(4);
+
+	private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
+	private ResolvedEvent _firstEvent;
+	private Guid _id;
+
+	private const string _group = "startinx2";
+
+	protected override async Task Given() {
+		await WriteEvents(_conn);
+		await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
+			DefaultData.AdminCredentials);
+		_conn.ConnectToPersistentSubscription(
+			_stream,
+			_group,
+			HandleEvent,
+			(sub, reason, ex) => { },
+			DefaultData.AdminCredentials);
+	}
+
+	private async Task WriteEvents(IEventStoreConnection connection) {
+		for (int i = 0; i < 10; i++) {
+			var id = Guid.NewGuid();
+			await connection.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
+				new EventData(id, "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
+			if (i == 4)
+				_id = id;
+		}
+	}
+
+	protected override Task When() {
+		return _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
+			new EventData(_id, "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
+	}
+
+	private bool _set = false;
+
+	private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
+		if (_set)
+			return Task.CompletedTask;
+		_set = true;
+		_firstEvent = resolvedEvent;
+		_resetEvent.Set();
+		return Task.CompletedTask;
+	}
+
+	[Test]
+	public void the_subscription_gets_the_written_event_as_its_first_event() {
+		Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
+		Assert.IsNotNull(_firstEvent);
+		Assert.AreEqual(4, _firstEvent.Event.EventNumber);
+		Assert.AreEqual(_id, _firstEvent.Event.EventId);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+[Category("LongRunning")]
+public class
+	connect_to_persistent_subscription_with_link_to_event_with_event_number_greater_than_int_maxvalue<TLogFormat, TStreamId> :
+		MiniNodeWithExistingRecords<TLogFormat, TStreamId> {
+	private const string StreamName =
+		"connect_to_persistent_subscription_with_link_to_event_with_event_number_greater_than_int_maxvalue";
+
+	private const long intMaxValue = (long)int.MaxValue;
+
+	private string _linkedStreamName = "linked-" + StreamName;
+	private const string _group = "group-" + StreamName;
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.ResolveLinkTos()
+		.StartFromBeginning();
+
+	private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
+	private ResolvedEvent _firstEvent;
+	private bool _set = false;
+	private Guid _event1Id;
+
+	public override async ValueTask WriteTestScenario(CancellationToken token) {
+		var event1 = await WriteSingleEvent(StreamName, intMaxValue + 1, new string('.', 3000), token: token);
+		await WriteSingleEvent(StreamName, intMaxValue + 2, new string('.', 3000), token: token);
+		_event1Id = event1.EventId;
+	}
+
+	public override async Task Given() {
+		_store = BuildConnection(Node);
+		await _store.ConnectAsync();
+
+		await _store.CreatePersistentSubscriptionAsync(_linkedStreamName, _group, _settings,
+			DefaultData.AdminCredentials);
+		_store.ConnectToPersistentSubscription(
+			_linkedStreamName,
+			_group,
+			HandleEvent,
+			(sub, reason, ex) => { },
+			DefaultData.AdminCredentials);
+		await _store.AppendToStreamAsync(_linkedStreamName, ExpectedVersion.Any, new EventData(Guid.NewGuid(),
+			SystemEventTypes.LinkTo, false, Helper.UTF8NoBom.GetBytes(
+				string.Format("{0}@{1}", intMaxValue + 1, StreamName)), null));
+	}
+
+	private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
+		if (!_set) {
+			_set = true;
+			_firstEvent = resolvedEvent;
+			_resetEvent.Set();
+		}
+
+		return Task.CompletedTask;
+	}
+
+	[Test]
+	public void the_subscription_resolves_the_linked_event_correctly() {
+		Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
+		Assert.AreEqual(intMaxValue + 1, _firstEvent.Event.EventNumber);
+		Assert.AreEqual(_event1Id, _firstEvent.Event.EventId);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class connect_to_persistent_subscription_with_retries<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = Guid.NewGuid().ToString("N");
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromBeginning();
+
+	private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
+	private readonly Guid _id = Guid.NewGuid();
+	int? _retryCount;
+	private const string _group = "retries";
+
+	protected override async Task Given() {
+		await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
+			DefaultData.AdminCredentials);
+		await _conn.ConnectToPersistentSubscriptionAsync(
+			_stream,
+			_group,
+			HandleEvent,
+			(sub, reason, ex) => { },
+			DefaultData.AdminCredentials, autoAck: false);
+	}
+
+	protected override Task When() {
+		return _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
+			new EventData(_id, "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
+	}
+
+	private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent,
+		int? retryCount) {
+		if (retryCount > 4) {
+			_retryCount = retryCount;
+			sub.Acknowledge(resolvedEvent);
+			_resetEvent.Set();
+		} else {
+			sub.Fail(resolvedEvent, PersistentSubscriptionNakEventAction.Retry, "Not yet tried enough times");
+		}
+
+		return Task.CompletedTask;
+	}
+
+	[Test]
+	public void events_are_retried_until_success() {
+		Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
+		Assert.AreEqual(5, _retryCount);
+	}
+}
+
+//ALL
+
+/*
+
+    [TestFixture, Category("LongRunning")]
+    public class connect_to_non_existing_persistent_all_subscription_with_permissions : SpecificationWithMiniNode
+    {
+        private Exception _caught;
+
+        protected override void When()
+        {
+            try
+            {
+                _conn.ConnectToPersistentSubscriptionForAll("nonexisting2",
+                    (sub, e) => Console.Write("appeared"),
+                    (sub, reason, ex) =>
+                    {
+                    },
+                    DefaultData.AdminCredentials);
+                throw new Exception("should have thrown");
+            }
+            catch (Exception ex)
+            {
+                _caught = ex;
+            }
+        }
+
+        [Test]
+        public void the_completion_fails()
+        {
+            Assert.IsNotNull(_caught);
+        }
+
+        [Test]
+        public void the_exception_is_an_argument_exception()
+        {
+            Assert.IsInstanceOf<ArgumentException>(_caught.InnerException);
+        }
+    }
+
+    [TestFixture, Category("LongRunning")]
+    public class connect_to_existing_persistent_all_subscription_with_permissions : SpecificationWithMiniNode
+    {
+        private EventStorePersistentSubscription _sub;
+        private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettingsBuilder.Create()
+                                                                .DoNotResolveLinkTos()
+                                                                .StartFromCurrent();
+        protected override void When()
+        {
+            _conn.CreatePersistentSubscriptionForAllAsync("agroupname17", _settings, DefaultData.AdminCredentials).Wait();
+            _sub = _conn.ConnectToPersistentSubscriptionForAll("agroupname17",
+                (sub, e) => Console.Write("appeared"),
+                (sub, reason, ex) => { }, DefaultData.AdminCredentials);
+        }
+
+        [Test]
+        public void the_subscription_suceeds()
+        {
+            Assert.IsNotNull(_sub);
+        }
+    }
+
+    [TestFixture, Category("LongRunning")]
+    public class connect_to_existing_persistent_all_subscription_without_permissions : SpecificationWithMiniNode
+    {
+        private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettingsBuilder.Create()
+                                                                .DoNotResolveLinkTos()
+                                                                .StartFromCurrent();
+
+        protected override void When()
+        {
+            _conn.CreatePersistentSubscriptionForAllAsync("agroupname55", _settings,
+                DefaultData.AdminCredentials).Wait();
+        }
+
+        [Test]
+        public void the_subscription_fails_to_connect()
+        {
+            try
+            {
+                _conn.ConnectToPersistentSubscriptionForAll("agroupname55",
+                    (sub, e) => Console.Write("appeared"),
+                    (sub, reason, ex) => { });
+                throw new Exception("should have thrown.");
+            }
+            catch (Exception ex)
+            {
+                Assert.IsInstanceOf<AggregateException>(ex);
+                Assert.IsInstanceOf<AccessDeniedException>(ex.InnerException);
+            }
+        }
+    }
+*/
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/connecting_to_a_persistent_subscription_async.cs b/src/KurrentDB.Core.Tests/ClientAPI/connecting_to_a_persistent_subscription_async.cs
new file mode 100644
index 00000000000..16300968af6
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/connecting_to_a_persistent_subscription_async.cs
@@ -0,0 +1,373 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.ClientOperations;
+using EventStore.ClientAPI.Exceptions;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("LongRunning"), Category("ClientAPI")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class connect_to_non_existing_persistent_subscription_with_permissions_async<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private Exception _innerEx;
+
+	protected override async Task When() {
+		_innerEx = await AssertEx.ThrowsAsync<ArgumentException>(() => _conn.ConnectToPersistentSubscriptionAsync(
+			"nonexisting2",
+			"foo",
+			(sub, e) => {
+				Console.Write("appeared");
+				return Task.CompletedTask;
+			},
+			(sub, reason, ex) => { }, DefaultData.AdminCredentials));
+	}
+
+	[Test]
+	public void the_subscription_fails_to_connect_with_argument_exception() {
+		Assert.IsInstanceOf<ArgumentException>(_innerEx);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class connect_to_existing_persistent_subscription_with_permissions_async<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private EventStorePersistentSubscriptionBase _sub;
+	private readonly string _stream = Guid.NewGuid().ToString();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent();
+
+	protected override async Task When() {
+		await _conn.CreatePersistentSubscriptionAsync(_stream, "agroupname17", _settings, DefaultData.AdminCredentials)
+;
+		_sub = await _conn.ConnectToPersistentSubscriptionAsync(_stream,
+			"agroupname17",
+			(sub, e) => {
+				Console.Write("appeared");
+				return Task.CompletedTask;
+			},
+			(sub, reason, ex) => { }, DefaultData.AdminCredentials);
+	}
+
+	[Test]
+	public void the_subscription_succeeds() {
+		Assert.IsNotNull(_sub);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class connect_to_existing_persistent_subscription_without_permissions_async<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = "$" + Guid.NewGuid();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent();
+
+	private Exception _innerEx;
+
+	protected override async Task When() {
+		await _conn.CreatePersistentSubscriptionAsync(_stream, "agroupname55", _settings,
+			DefaultData.AdminCredentials);
+		_innerEx = await AssertEx.ThrowsAsync<AccessDeniedException>(() => _conn.ConnectToPersistentSubscriptionAsync(
+			_stream,
+			"agroupname55",
+			(sub, e) => {
+				Console.Write("appeared");
+				return Task.CompletedTask;
+			},
+			(sub, reason, ex) => Console.WriteLine("dropped.")));
+	}
+
+	[Test]
+	public void the_subscription_fails_to_connect_with_access_denied_exception() {
+		Assert.IsInstanceOf<AccessDeniedException>(_innerEx);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class connect_to_existing_persistent_subscription_with_max_one_client_async<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = "$" + Guid.NewGuid();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent()
+		.WithMaxSubscriberCountOf(1);
+
+	private Exception _innerEx;
+
+	private const string _group = "startinbeginning1";
+	private EventStorePersistentSubscriptionBase _firstConn;
+
+	protected override async Task Given() {
+		await base.Given();
+		await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
+			DefaultData.AdminCredentials);
+		// First connection
+		_firstConn = await _conn.ConnectToPersistentSubscriptionAsync(
+			_stream,
+			_group,
+			(s, e) => {
+				s.Acknowledge(e);
+				return Task.CompletedTask;
+			},
+			(sub, reason, ex) => { },
+			DefaultData.AdminCredentials);
+	}
+
+	protected override async Task When() {
+		_innerEx = await AssertEx.ThrowsAsync<MaximumSubscribersReachedException>(() =>
+			// Second connection
+			_conn.ConnectToPersistentSubscriptionAsync(
+				_stream,
+				_group,
+				(s, e) => {
+					s.Acknowledge(e);
+					return Task.CompletedTask;
+				},
+				(sub, reason, ex) => { },
+				DefaultData.AdminCredentials));
+	}
+
+	[Test]
+	public void the_first_subscription_connects_successfully() {
+		Assert.IsNotNull(_firstConn);
+	}
+
+	[Test]
+	public void the_second_subscription_throws_maximum_subscribers_reached_exception() {
+		Assert.IsInstanceOf<MaximumSubscribersReachedException>(_innerEx);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	connect_to_existing_persistent_subscription_with_start_from_beginning_and_no_stream_async<TLogFormat, TStreamId> :
+		SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = "$" + Guid.NewGuid();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromBeginning();
+
+	private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
+	private ResolvedEvent _firstEvent;
+	private readonly Guid _id = Guid.NewGuid();
+	private bool _set = false;
+
+	private const string _group = "startinbeginning1";
+
+	protected override async Task Given() {
+		await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
+			DefaultData.AdminCredentials);
+
+		await _conn.ConnectToPersistentSubscriptionAsync(
+			_stream,
+			_group,
+			HandleEvent,
+			(sub, reason, ex) => { },
+			DefaultData.AdminCredentials);
+	}
+
+	protected override Task When() {
+		return _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
+			new EventData(_id, "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
+	}
+
+	private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
+		if (_set)
+			return Task.CompletedTask;
+		_set = true;
+		_firstEvent = resolvedEvent;
+		_resetEvent.Set();
+		return Task.CompletedTask;
+	}
+
+	[Test]
+	public void the_subscription_gets_event_zero_as_its_first_event() {
+		Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
+		Assert.AreEqual(0, _firstEvent.Event.EventNumber);
+		Assert.AreEqual(_id, _firstEvent.Event.EventId);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	connect_to_existing_persistent_subscription_with_start_from_two_and_no_stream_async<TLogFormat, TStreamId> :
+		SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = "$" + Guid.NewGuid();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFrom(2);
+
+	private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
+	private ResolvedEvent _firstEvent;
+	private readonly Guid _id = Guid.NewGuid();
+	private bool _set = false;
+
+	private const string _group = "startinbeginning1";
+
+	protected override async Task Given() {
+		await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
+			DefaultData.AdminCredentials);
+		await _conn.ConnectToPersistentSubscriptionAsync(
+			_stream,
+			_group,
+			HandleEvent,
+			(sub, reason, ex) => { },
+			DefaultData.AdminCredentials);
+	}
+
+	protected override async Task When() {
+		await _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
+				new EventData(Guid.NewGuid(), "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
+		await _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
+				new EventData(Guid.NewGuid(), "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
+		await _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
+			new EventData(_id, "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
+	}
+
+	private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
+		if (_set)
+			return Task.CompletedTask;
+		_set = true;
+		_firstEvent = resolvedEvent;
+		_resetEvent.Set();
+		return Task.CompletedTask;
+	}
+
+	[Test]
+	public void the_subscription_gets_event_two_as_its_first_event() {
+		Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
+		Assert.AreEqual(2, _firstEvent.Event.EventNumber);
+		Assert.AreEqual(_id, _firstEvent.Event.EventId);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	connect_to_existing_persistent_subscription_with_start_from_beginning_and_events_in_it_async<TLogFormat, TStreamId> :
+		SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = "$" + Guid.NewGuid();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromBeginning();
+
+	private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
+	private ResolvedEvent _firstEvent;
+	private List<Guid> _ids = new List<Guid>();
+	private bool _set = false;
+
+	private const string _group = "startinbeginning1";
+
+	protected override async Task Given() {
+		await WriteEvents(_conn);
+		await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
+			DefaultData.AdminCredentials);
+	}
+
+	private async Task WriteEvents(IEventStoreConnection connection) {
+		for (int i = 0; i < 10; i++) {
+			_ids.Add(Guid.NewGuid());
+			await connection.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
+					new EventData(_ids[i], "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"), new byte[0]));
+		}
+	}
+
+	protected override Task When() {
+		return _conn.ConnectToPersistentSubscriptionAsync(
+			_stream,
+			_group,
+			HandleEvent,
+			(sub, reason, ex) => { },
+			DefaultData.AdminCredentials);
+	}
+
+	private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
+		if (!_set) {
+			_set = true;
+			_firstEvent = resolvedEvent;
+			_resetEvent.Set();
+		}
+
+		return Task.CompletedTask;
+	}
+
+	[Test]
+	public void the_subscription_gets_event_zero_as_its_first_event() {
+		Assert.IsTrue(_resetEvent.WaitOne(TimeSpan.FromSeconds(10)));
+		Assert.AreEqual(0, _firstEvent.Event.EventNumber);
+		Assert.AreEqual(_ids[0], _firstEvent.Event.EventId);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	connect_to_existing_persistent_subscription_with_start_from_beginning_not_set_and_events_in_it_async<TLogFormat, TStreamId> :
+		SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = "$" + Guid.NewGuid();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent();
+
+	private readonly AutoResetEvent _resetEvent = new AutoResetEvent(false);
+
+	private const string _group = "startinbeginning1";
+
+	protected override async Task Given() {
+		await WriteEvents(_conn);
+		await _conn.CreatePersistentSubscriptionAsync(_stream, _group, _settings,
+			DefaultData.AdminCredentials);
+	}
+
+	private async Task WriteEvents(IEventStoreConnection connection) {
+		for (int i = 0; i < 10; i++) {
+			await connection.AppendToStreamAsync(_stream, ExpectedVersion.Any, DefaultData.AdminCredentials,
+					new EventData(Guid.NewGuid(), "test", true, Encoding.UTF8.GetBytes("{'foo' : 'bar'}"),
+						new byte[0]));
+		}
+	}
+
+	protected override Task When() {
+		return _conn.ConnectToPersistentSubscriptionAsync(
+			_stream,
+			_group,
+			HandleEvent,
+			(sub, reason, ex) => { },
+			DefaultData.AdminCredentials);
+	}
+
+	private Task HandleEvent(EventStorePersistentSubscriptionBase sub, ResolvedEvent resolvedEvent) {
+		_resetEvent.Set();
+		return Task.CompletedTask;
+	}
+
+	[Test]
+	public void the_subscription_gets_no_events() {
+		Assert.IsFalse(_resetEvent.WaitOne(TimeSpan.FromSeconds(1)));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/connecting_with_connection_string.cs b/src/KurrentDB.Core.Tests/ClientAPI/connecting_with_connection_string.cs
new file mode 100644
index 00000000000..784f4307527
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/connecting_with_connection_string.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_connecting_with_connection_string<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private MiniNode<TLogFormat, TStreamId> _node;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public async Task should_not_throw_when_connect_to_is_set() {
+		string connectionString = string.Format("ConnectTo=tcp://{0};", _node.TcpEndPoint);
+		using (var connection = EventStoreConnection.Create(connectionString)) {
+			await connection.ConnectAsync();
+			connection.Close();
+		}
+	}
+
+	[Test]
+	public void should_not_throw_when_only_gossip_seeds_is_set() {
+		string connectionString = string.Format("GossipSeeds={0};", _node.HttpEndPoint);
+		IEventStoreConnection connection = null;
+
+		Assert.DoesNotThrow(() => connection = EventStoreConnection.Create(connectionString));
+		Assert.AreEqual(_node.HttpEndPoint, connection.Settings.GossipSeeds.First().EndPoint);
+
+		connection.Dispose();
+	}
+
+	[Test]
+	public void should_throw_when_gossip_seeds_and_connect_to_is_set() {
+		string connectionString = string.Format("ConnectTo=tcp://{0};GossipSeeds={1}", _node.TcpEndPoint,
+			_node.HttpEndPoint);
+		Assert.Throws<NotSupportedException>(() => EventStoreConnection.Create(connectionString));
+	}
+
+	[Test]
+	public void should_throw_when_neither_gossip_seeds_nor_connect_to_is_set() {
+		string connectionString = string.Format("HeartBeatTimeout=2000");
+		Assert.Throws<Exception>(() => EventStoreConnection.Create(connectionString));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/connection_string.cs b/src/KurrentDB.Core.Tests/ClientAPI/connection_string.cs
new file mode 100644
index 00000000000..f0beabbe447
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/connection_string.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.ClientAPI;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[TestFixture, Category("ClientAPI")]
+public class connection_string {
+	[Test]
+	public void can_set_bool_value_with_string() {
+		var settings = ConnectionString.GetConnectionSettings("verboselogging=true");
+		Assert.AreEqual(true, settings.VerboseLogging);
+	}
+
+	[Test]
+	public void can_set_with_spaces() {
+		var settings = ConnectionString.GetConnectionSettings("Verbose Logging=true");
+		Assert.AreEqual(true, settings.VerboseLogging);
+	}
+
+
+	[Test]
+	public void can_set_int() {
+		var settings = ConnectionString.GetConnectionSettings("maxretries=55");
+		Assert.AreEqual(55, settings.MaxRetries);
+	}
+
+	[Test]
+	public void can_set_timespan() {
+		var settings = ConnectionString.GetConnectionSettings("heartbeattimeout=5555");
+		Assert.AreEqual(5555, settings.HeartbeatTimeout.TotalMilliseconds);
+	}
+
+	[Test]
+	public void can_set_multiple_values() {
+		var settings = ConnectionString.GetConnectionSettings("heartbeattimeout=5555;maxretries=55");
+		Assert.AreEqual(5555, settings.HeartbeatTimeout.TotalMilliseconds);
+		Assert.AreEqual(55, settings.MaxRetries);
+	}
+
+	[Test]
+	public void can_set_mixed_case() {
+		var settings = ConnectionString.GetConnectionSettings("heArtbeAtTimeout=5555");
+		Assert.AreEqual(5555, settings.HeartbeatTimeout.TotalMilliseconds);
+	}
+
+	[Test]
+	public void can_set_gossip_seeds() {
+		var settings =
+			ConnectionString.GetConnectionSettings(
+				"gossipseeds=111.222.222.111:1111,111.222.222.111:1112,111.222.222.111:1113");
+		Assert.AreEqual(3, settings.GossipSeeds.Length);
+	}
+
+	[Test]
+	public void can_set_default_user_credentials() {
+		var settings = ConnectionString.GetConnectionSettings("DefaultUserCredentials=foo:bar");
+		Assert.AreEqual("foo", settings.DefaultUserCredentials.Username);
+		Assert.AreEqual("bar", settings.DefaultUserCredentials.Password);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/create_persistent_subscription.cs b/src/KurrentDB.Core.Tests/ClientAPI/create_persistent_subscription.cs
new file mode 100644
index 00000000000..6fc679e4ffa
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/create_persistent_subscription.cs
@@ -0,0 +1,293 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class create_persistent_subscription_on_existing_stream<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = Guid.NewGuid().ToString();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent();
+
+	protected override Task When() {
+		return _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any,
+			new EventData(Guid.NewGuid(), "whatever", true, Encoding.UTF8.GetBytes("{'foo' : 2}"), new Byte[0]));
+	}
+
+	[Test]
+	public async Task the_completion_succeeds() {
+		await _conn.CreatePersistentSubscriptionAsync(_stream, "existing", _settings,
+			DefaultData.AdminCredentials);
+	}
+}
+
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class create_persistent_subscription_on_non_existing_stream<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = Guid.NewGuid().ToString();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent();
+
+	protected override Task When() => Task.CompletedTask;
+
+	[Test]
+	public async Task the_completion_succeeds() {
+		await _conn.CreatePersistentSubscriptionAsync(_stream, "nonexistinggroup", _settings,
+			DefaultData.AdminCredentials);
+	}
+}
+
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class create_persistent_subscription_on_all_stream<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent();
+
+	protected override Task When() => Task.CompletedTask;
+
+	[Test]
+	public async Task the_completion_fails_with_invalid_stream() {
+		await AssertEx.ThrowsAsync<InvalidOperationException>(() =>
+			_conn.CreatePersistentSubscriptionAsync("$all", "shitbird", _settings, DefaultData.AdminCredentials));
+	}
+}
+
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class create_persistent_subscription_with_too_big_message_timeout<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	protected override Task When() => Task.CompletedTask;
+
+	[Test]
+	public void the_build_fails_with_argument_exception() {
+		Assert.Throws<ArgumentException>(() =>
+			PersistentSubscriptionSettings.Create().WithMessageTimeoutOf(TimeSpan.FromDays(25 * 365)).Build());
+	}
+}
+
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class create_persistent_subscription_with_too_big_checkpoint_after<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	protected override Task When() => Task.CompletedTask;
+
+	[Test]
+	public void the_build_fails_with_argument_exception() {
+		Assert.Throws<ArgumentException>(() =>
+			PersistentSubscriptionSettings.Create().CheckPointAfter(TimeSpan.FromDays(25 * 365)).Build());
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class create_persistent_subscription_with_dont_timeout<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = Guid.NewGuid().ToString();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent()
+		.DontTimeoutMessages();
+
+	protected override Task When() => Task.CompletedTask;
+
+	[Test]
+	public void the_message_timeout_should_be_zero() {
+		Assert.That(_settings.MessageTimeout == TimeSpan.Zero);
+	}
+
+	[Test]
+	public async Task the_subscription_is_created_without_error() {
+		await _conn.CreatePersistentSubscriptionAsync(_stream, "dont-timeout", _settings,
+			DefaultData.AdminCredentials);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class create_duplicate_persistent_subscription_group<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = Guid.NewGuid().ToString();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent();
+
+	protected override Task When() {
+		return _conn.CreatePersistentSubscriptionAsync(_stream, "group32", _settings, DefaultData.AdminCredentials);
+	}
+
+	[Test]
+	public async Task the_completion_fails_with_invalid_operation_exception() {
+		await AssertEx.ThrowsAsync<InvalidOperationException>(
+			() => _conn.CreatePersistentSubscriptionAsync(_stream, "group32", _settings,
+				DefaultData.AdminCredentials));
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	can_create_duplicate_persistent_subscription_group_name_on_different_streams<TLogFormat, TStreamId>
+	: SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = Guid.NewGuid().ToString();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent();
+
+	protected override Task When() {
+		return _conn.CreatePersistentSubscriptionAsync(_stream, "group3211", _settings, DefaultData.AdminCredentials);
+	}
+
+	[Test]
+	public async Task the_completion_succeeds() {
+		await
+			_conn.CreatePersistentSubscriptionAsync("someother" + _stream, "group3211", _settings,
+				DefaultData.AdminCredentials);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class create_persistent_subscription_group_without_permissions<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = Guid.NewGuid().ToString();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent();
+
+	protected override Task When() => Task.CompletedTask;
+
+	[Test]
+	public async Task the_completion_succeeds() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(() =>
+			_conn.CreatePersistentSubscriptionAsync(_stream, "group57", _settings, null));
+	}
+}
+
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class create_persistent_subscription_after_deleting_the_same<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = Guid.NewGuid().ToString();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent();
+
+	protected override async Task When() {
+		await _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any,
+			new EventData(Guid.NewGuid(), "whatever", true, Encoding.UTF8.GetBytes("{'foo' : 2}"), new Byte[0]));
+		await _conn.CreatePersistentSubscriptionAsync(_stream, "existing", _settings, DefaultData.AdminCredentials);
+		await _conn.DeletePersistentSubscriptionAsync(_stream, "existing", DefaultData.AdminCredentials);
+	}
+
+	[Test]
+	public async Task the_completion_succeeds() {
+		await _conn.CreatePersistentSubscriptionAsync(_stream, "existing", _settings, DefaultData.AdminCredentials);
+	}
+}
+
+//ALL
+/*
+
+	[TestFixture, Category("LongRunning")]
+	public class create_persistent_subscription_on_all : SpecificationWithMiniNode
+	{
+		private PersistentSubscriptionCreateResult _result;
+		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettingsBuilder.Create()
+																.DoNotResolveLinkTos()
+																.StartFromCurrent();
+
+		protected override void When()
+		{
+			_result = _conn.CreatePersistentSubscriptionForAllAsync("group", _settings, DefaultData.AdminCredentials).Result;
+		}
+
+		[Test]
+		public void the_completion_succeeds()
+		{
+			Assert.AreEqual(PersistentSubscriptionCreateStatus.Success, _result.Status);
+		}
+	}
+
+
+	[TestFixture, Category("LongRunning")]
+	public class create_duplicate_persistent_subscription_group_on_all : SpecificationWithMiniNode
+	{
+		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettingsBuilder.Create()
+																.DoNotResolveLinkTos()
+																.StartFromCurrent();
+		protected override void When()
+		{
+			_conn.CreatePersistentSubscriptionForAllAsync("group32", _settings, DefaultData.AdminCredentials).Wait();
+		}
+
+		[Test]
+		public void the_completion_fails_with_invalid_operation_exception()
+		{
+			try
+			{
+				_conn.CreatePersistentSubscriptionForAllAsync("group32", _settings, DefaultData.AdminCredentials).Wait();
+				throw new Exception("expected exception");
+			}
+			catch (Exception ex)
+			{
+				Assert.IsInstanceOf(typeof(AggregateException), ex);
+				var inner = ex.InnerException;
+				Assert.IsInstanceOf(typeof(InvalidOperationException), inner);
+			}
+		}
+	}
+
+	[TestFixture, Category("LongRunning")]
+	public class create_persistent_subscription_group_on_all_without_permissions : SpecificationWithMiniNode
+	{
+		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettingsBuilder.Create()
+																.DoNotResolveLinkTos()
+																.StartFromCurrent();
+		protected override void When()
+		{
+		}
+
+		[Test]
+		public void the_completion_succeeds()
+		{
+			try
+			{
+				_conn.CreatePersistentSubscriptionForAllAsync("group57", _settings, null).Wait();
+				throw new Exception("expected exception");
+			}
+			catch (Exception ex)
+			{
+				Assert.IsInstanceOf(typeof(AggregateException), ex);
+				var inner = ex.InnerException;
+				Assert.IsInstanceOf(typeof(AccessDeniedException), inner);
+			}
+		}
+	}
+*/
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/deleting_persistent_subscription.cs b/src/KurrentDB.Core.Tests/ClientAPI/deleting_persistent_subscription.cs
new file mode 100644
index 00000000000..1610bc47e28
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/deleting_persistent_subscription.cs
@@ -0,0 +1,169 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class deleting_existing_persistent_subscription_group_with_permissions<TLogFormat, TStreamId>
+	: SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent();
+
+	private readonly string _stream = Guid.NewGuid().ToString();
+
+	protected override Task When() =>
+		_conn.CreatePersistentSubscriptionAsync(_stream, "groupname123", _settings,
+			DefaultData.AdminCredentials);
+
+	[Test]
+	public async Task the_delete_of_group_succeeds() {
+		await _conn.DeletePersistentSubscriptionAsync(_stream, "groupname123", DefaultData.AdminCredentials);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class deleting_existing_persistent_subscription_with_subscriber<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent();
+
+	private readonly string _stream = Guid.NewGuid().ToString();
+	private readonly ManualResetEvent _called = new ManualResetEvent(false);
+
+	protected override async Task Given() {
+		await base.Given();
+		await _conn.CreatePersistentSubscriptionAsync(_stream, "groupname123", _settings,
+			DefaultData.AdminCredentials);
+		_conn.ConnectToPersistentSubscription(_stream, "groupname123",
+			(s, e) => Task.CompletedTask,
+			(s, r, e) => _called.Set(), DefaultData.AdminCredentials);
+	}
+
+	protected override Task When() {
+		return _conn.DeletePersistentSubscriptionAsync(_stream, "groupname123", DefaultData.AdminCredentials);
+	}
+
+	[Test]
+	public void the_subscription_is_dropped() {
+		Assert.IsTrue(_called.WaitOne(TimeSpan.FromSeconds(5)));
+	}
+}
+
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class deleting_persistent_subscription_group_that_doesnt_exist<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = Guid.NewGuid().ToString();
+
+	protected override Task When() => Task.CompletedTask;
+
+	[Test]
+	public async Task the_delete_fails_with_argument_exception() {
+		await AssertEx.ThrowsAsync<InvalidOperationException>(
+			() =>
+				_conn.DeletePersistentSubscriptionAsync(_stream, Guid.NewGuid().ToString(),
+					DefaultData.AdminCredentials));
+	}
+}
+
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class deleting_persistent_subscription_group_without_permissions<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = Guid.NewGuid().ToString();
+
+	protected override Task When() => Task.CompletedTask;
+
+	[Test]
+	public async Task the_delete_fails_with_access_denied() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(
+			() => _conn.DeletePersistentSubscriptionAsync(_stream, Guid.NewGuid().ToString()));
+	}
+}
+
+//ALL
+/*
+
+	[TestFixture, Category("LongRunning")]
+	public class deleting_existing_persistent_subscription_group_on_all_with_permissions : SpecificationWithMiniNode
+	{
+		private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettingsBuilder.Create()
+																.DoNotResolveLinkTos()
+																.StartFromCurrent();
+		protected override void When()
+		{
+			_conn.CreatePersistentSubscriptionForAllAsync("groupname123", _settings,
+				DefaultData.AdminCredentials).Wait();
+		}
+
+		[Test]
+		public void the_delete_of_group_succeeds()
+		{
+			var result = _conn.DeletePersistentSubscriptionForAllAsync("groupname123", DefaultData.AdminCredentials).Result;
+			Assert.AreEqual(PersistentSubscriptionDeleteStatus.Success, result.Status);
+		}
+	}
+
+	[TestFixture, Category("LongRunning")]
+	public class deleting_persistent_subscription_group_on_all_that_doesnt_exist : SpecificationWithMiniNode
+	{
+		protected override void When()
+		{
+		}
+
+		[Test]
+		public void the_delete_fails_with_argument_exception()
+		{
+			try
+			{
+				_conn.DeletePersistentSubscriptionForAllAsync(Guid.NewGuid().ToString(), DefaultData.AdminCredentials).Wait();
+				throw new Exception("expected exception");
+			}
+			catch (Exception ex)
+			{
+				Assert.IsInstanceOf(typeof(AggregateException), ex);
+				var inner = ex.InnerException;
+				Assert.IsInstanceOf(typeof(InvalidOperationException), inner);
+			}
+		}
+	}
+
+
+	[TestFixture, Category("LongRunning")]
+	public class deleting_persistent_subscription_group_on_all_without_permissions : SpecificationWithMiniNode
+	{
+		protected override void When()
+		{
+		}
+
+		[Test]
+		public void the_delete_fails_with_access_denied()
+		{
+			try
+			{
+				_conn.DeletePersistentSubscriptionForAllAsync(Guid.NewGuid().ToString()).Wait();
+				throw new Exception("expected exception");
+			}
+			catch (Exception ex)
+			{
+				Assert.IsInstanceOf(typeof(AggregateException), ex);
+				var inner = ex.InnerException;
+				Assert.IsInstanceOf(typeof(AccessDeniedException), inner);
+			}
+		}
+	}
+*/
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/deleting_stream.cs b/src/KurrentDB.Core.Tests/ClientAPI/deleting_stream.cs
new file mode 100644
index 00000000000..370d16b2b81
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/deleting_stream.cs
@@ -0,0 +1,96 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class deleting_stream<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private MiniNode<TLogFormat, TStreamId> _node;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+	virtual protected IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.Create(node.TcpEndPoint);
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task which_doesnt_exists_should_success_when_passed_empty_stream_expected_version() {
+		const string stream = "which_already_exists_should_success_when_passed_empty_stream_expected_version";
+		using (var connection = BuildConnection(_node)) {
+			await connection.ConnectAsync();
+			await connection.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task which_doesnt_exists_should_success_when_passed_any_for_expected_version() {
+		const string stream = "which_already_exists_should_success_when_passed_any_for_expected_version";
+		using (var connection = BuildConnection(_node)) {
+			await connection.ConnectAsync();
+
+			await connection.DeleteStreamAsync(stream, ExpectedVersion.Any, hardDelete: true);
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task with_invalid_expected_version_should_fail() {
+		const string stream = "with_invalid_expected_version_should_fail";
+		using (var connection = BuildConnection(_node)) {
+			await connection.ConnectAsync();
+
+			await AssertEx.ThrowsAsync<WrongExpectedVersionException>(() =>
+				connection.DeleteStreamAsync(stream, 1, hardDelete: true));
+		}
+	}
+
+	public async Task should_return_log_position_when_writing() {
+		const string stream = "delete_should_return_log_position_when_writing";
+		using (var connection = BuildConnection(_node)) {
+			await connection.ConnectAsync();
+
+			var result = await connection
+				.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
+			var delete = await connection.DeleteStreamAsync(stream, 1, hardDelete: true);
+
+			Assert.IsTrue(0 < result.LogPosition.PreparePosition);
+			Assert.IsTrue(0 < result.LogPosition.CommitPosition);
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task which_was_already_deleted_should_fail() {
+		const string stream = "which_was_allready_deleted_should_fail";
+		using (var connection = BuildConnection(_node)) {
+			await connection.ConnectAsync();
+
+			await connection.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
+
+			await AssertEx.ThrowsAsync<StreamDeletedException>(
+				() => connection.DeleteStreamAsync(stream, ExpectedVersion.Any, hardDelete: true));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/event_store_connection_should.cs b/src/KurrentDB.Core.Tests/ClientAPI/event_store_connection_should.cs
new file mode 100644
index 00000000000..e347c050000
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/event_store_connection_should.cs
@@ -0,0 +1,112 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string), TcpType.Normal)]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), TcpType.Normal)]
+[TestFixture(typeof(LogFormat.V2), typeof(string), TcpType.Ssl)]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), TcpType.Ssl)]
+public class event_store_connection_should<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private readonly TcpType _tcpType;
+	private MiniNode<TLogFormat, TStreamId> _node;
+
+	public event_store_connection_should(TcpType tcpType) {
+		_tcpType = tcpType;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	[Category("Network")]
+	public void not_throw_on_close_if_connect_was_not_called() {
+		var connection = TestConnection.To(_node, _tcpType);
+		Assert.DoesNotThrow(connection.Close);
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task not_throw_on_close_if_called_multiple_times() {
+		var connection = TestConnection.To(_node, _tcpType);
+		await connection.ConnectAsync();
+		connection.Close();
+		Assert.DoesNotThrow(connection.Close);
+	}
+
+	/*
+	//TODO WEIRD TEST GFY
+			[Test]
+			[Category("Network")]
+			public void throw_on_connect_called_more_than_once()
+			{
+				var connection = TestConnection.To(_node, _tcpType);
+				Assert.DoesNotThrow(() => connection.ConnectAsync().Wait());
+
+				await AssertEx.ThrowsAsync<>(() => connection.ConnectAsync().Wait(),
+							Throws.Exception.InstanceOf<AggregateException>().With.InnerException.InstanceOf<InvalidOperationException>());
+			}
+
+			[Test]
+			[Category("Network")]
+			public void throw_on_connect_called_after_close()
+			{
+				var connection = TestConnection.To(_node, _tcpType);
+				connection.ConnectAsync().Wait();
+				connection.Close();
+
+				await AssertEx.ThrowsAsync<>(() => connection.ConnectAsync().Wait(),
+							Throws.Exception.InstanceOf<AggregateException>().With.InnerException.InstanceOf<InvalidOperationException>());
+			}
+	*/
+	[Test]
+	[Category("Network")]
+	public async Task throw_invalid_operation_on_every_api_call_if_connect_was_not_called() {
+		var connection = TestConnection.To(_node, _tcpType);
+
+		const string s = "stream";
+		var events = new[] { TestEvent.NewTestEvent() };
+
+		await AssertEx.ThrowsAsync<InvalidOperationException>(() => connection.DeleteStreamAsync(s, 0));
+
+		await AssertEx.ThrowsAsync<InvalidOperationException>(() => connection.AppendToStreamAsync(s, 0, events));
+
+		await AssertEx.ThrowsAsync<InvalidOperationException>(
+			() => connection.ReadStreamEventsForwardAsync(s, 0, 1, resolveLinkTos: false));
+
+		await AssertEx.ThrowsAsync<InvalidOperationException>(
+			() => connection.ReadStreamEventsBackwardAsync(s, 0, 1, resolveLinkTos: false));
+
+		await AssertEx.ThrowsAsync<InvalidOperationException>(
+			() => connection.ReadAllEventsForwardAsync(Position.Start, 1, false));
+
+		await AssertEx.ThrowsAsync<InvalidOperationException>(() =>
+			connection.ReadAllEventsBackwardAsync(Position.End, 1, false));
+
+		await AssertEx.ThrowsAsync<InvalidOperationException>(() => connection.StartTransactionAsync(s, 0));
+
+		await AssertEx.ThrowsAsync<InvalidOperationException>(
+			() => connection.SubscribeToStreamAsync(s, false, (_, __) => Task.CompletedTask, (_, __, ___) => { }));
+
+		await AssertEx.ThrowsAsync<InvalidOperationException>(
+			() => connection.SubscribeToAllAsync(false, (_, __) => Task.CompletedTask, (_, __, ___) => { }));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/isjson_flag_on_event.cs b/src/KurrentDB.Core.Tests/ClientAPI/isjson_flag_on_event.cs
new file mode 100644
index 00000000000..8775571667c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/isjson_flag_on_event.cs
@@ -0,0 +1,91 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class isjson_flag_on_event<TLogFormat, TStreamId> : SpecificationWithDirectory {
+	private MiniNode<TLogFormat, TStreamId> _node;
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+	}
+
+	[TearDown]
+	public override async Task TearDown() {
+		await _node.Shutdown();
+		await base.TearDown();
+	}
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.To(node, TcpType.Ssl);
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task should_be_preserved_with_all_possible_write_and_read_methods() {
+		const string stream = "should_be_preserved_with_all_possible_write_methods";
+		using (var connection = BuildConnection(_node)) {
+			await connection.ConnectAsync();
+
+			await connection.AppendToStreamAsync(
+					stream,
+					ExpectedVersion.Any,
+					new EventData(Guid.NewGuid(), "some-type", true,
+						Helper.UTF8NoBom.GetBytes("{\"some\":\"json\"}"), null),
+					new EventData(Guid.NewGuid(), "some-type", true, null,
+						Helper.UTF8NoBom.GetBytes("{\"some\":\"json\"}")),
+					new EventData(Guid.NewGuid(), "some-type", true,
+						Helper.UTF8NoBom.GetBytes("{\"some\":\"json\"}"),
+						Helper.UTF8NoBom.GetBytes("{\"some\":\"json\"}")));
+			var expectedEvents = 3;
+
+			if (LogFormatHelper<TLogFormat, TStreamId>.SupportsExplicitTransactions) {
+				using (var transaction = await connection.StartTransactionAsync(stream, ExpectedVersion.Any)) {
+					await transaction.WriteAsync(
+						new EventData(Guid.NewGuid(), "some-type", true,
+							Helper.UTF8NoBom.GetBytes("{\"some\":\"json\"}"), null),
+						new EventData(Guid.NewGuid(), "some-type", true, null,
+							Helper.UTF8NoBom.GetBytes("{\"some\":\"json\"}")),
+						new EventData(Guid.NewGuid(), "some-type", true,
+							Helper.UTF8NoBom.GetBytes("{\"some\":\"json\"}"),
+							Helper.UTF8NoBom.GetBytes("{\"some\":\"json\"}")));
+					await transaction.CommitAsync();
+					expectedEvents += 3;
+				}
+			}
+
+			var done = new ManualResetEventSlim();
+			_node.Node.MainQueue.Publish(new ClientMessage.ReadStreamEventsForward(
+				Guid.NewGuid(), Guid.NewGuid(), new CallbackEnvelope(message => {
+					Assert.IsInstanceOf<ClientMessage.ReadStreamEventsForwardCompleted>(message);
+					var msg = (ClientMessage.ReadStreamEventsForwardCompleted)message;
+					Assert.AreEqual(ReadStreamResult.Success, msg.Result);
+					Assert.AreEqual(expectedEvents, msg.Events.Count);
+					Assert.IsTrue(msg.Events.All(x => (x.OriginalEvent.Flags & PrepareFlags.IsJson) != 0));
+
+					done.Set();
+				}), stream, 0, 100, false, false, null, null, replyOnExpired: false));
+			Assert.IsTrue(done.Wait(10000), "Read was not completed in time.");
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/persistent_connect_integration_tests.cs b/src/KurrentDB.Core.Tests/ClientAPI/persistent_connect_integration_tests.cs
new file mode 100644
index 00000000000..9f235c41250
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/persistent_connect_integration_tests.cs
@@ -0,0 +1,440 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Common;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class happy_case_writing_and_subscribing_to_normal_events_manual_ack<TLogFormat, TStreamId>
+	: SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private const int BufferCount = 10;
+	private const int EventWriteCount = BufferCount * 2;
+
+	private readonly ManualResetEvent _eventsReceived = new ManualResetEvent(false);
+	private int _eventReceivedCount;
+
+	protected override Task When() => Task.WhenAll(_node.Started, _node.AdminUserCreated);
+
+	[Test]
+	public async Task Test() {
+		var streamName = Guid.NewGuid().ToString();
+		var groupName = Guid.NewGuid().ToString();
+		var settings = PersistentSubscriptionSettings
+			.Create()
+			.StartFromCurrent()
+			.ResolveLinkTos()
+			.Build();
+
+		await _conn.CreatePersistentSubscriptionAsync(streamName, groupName, settings, DefaultData.AdminCredentials);
+		await _conn.ConnectToPersistentSubscriptionAsync(streamName, groupName,
+			(subscription, resolvedEvent) => {
+				subscription.Acknowledge(resolvedEvent);
+
+				if (Interlocked.Increment(ref _eventReceivedCount) == EventWriteCount) {
+					_eventsReceived.Set();
+				}
+
+				return Task.CompletedTask;
+			},
+			(sub, reason, exception) =>
+				Console.WriteLine("Subscription dropped (reason:{0}, exception:{1}).", reason, exception),
+			bufferSize: 10, autoAck: false, userCredentials: DefaultData.AdminCredentials);
+
+		for (var i = 0; i < EventWriteCount; i++) {
+			var eventData = new EventData(Guid.NewGuid(), "SomeEvent", false, new byte[0], new byte[0]);
+
+			await _conn.AppendToStreamAsync(streamName, ExpectedVersion.Any, DefaultData.AdminCredentials, eventData);
+		}
+
+		if (!_eventsReceived.WaitOne(TimeSpan.FromSeconds(5))) {
+			throw new Exception("Timed out waiting for events.");
+		}
+	}
+}
+
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class happy_case_writing_and_subscribing_to_normal_events_auto_ack<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private const int BufferCount = 10;
+	private const int EventWriteCount = BufferCount * 2;
+
+	private readonly ManualResetEvent _eventsReceived = new ManualResetEvent(false);
+	private int _eventReceivedCount;
+
+	protected override Task When() => Task.WhenAll(_node.Started, _node.AdminUserCreated);
+
+	[Test]
+	public async Task Test() {
+		var streamName = Guid.NewGuid().ToString();
+		var groupName = Guid.NewGuid().ToString();
+		var settings = PersistentSubscriptionSettings
+			.Create()
+			.StartFromCurrent()
+			.ResolveLinkTos()
+			.Build();
+		await _conn.CreatePersistentSubscriptionAsync(streamName, groupName, settings, DefaultData.AdminCredentials)
+;
+		await _conn.ConnectToPersistentSubscriptionAsync(streamName, groupName,
+			(subscription, resolvedEvent) => {
+				if (Interlocked.Increment(ref _eventReceivedCount) == EventWriteCount) {
+					_eventsReceived.Set();
+				}
+
+				return Task.CompletedTask;
+			},
+			(sub, reason, exception) =>
+				Console.WriteLine("Subscription dropped (reason:{0}, exception:{1}).", reason, exception),
+			userCredentials: DefaultData.AdminCredentials);
+
+		for (var i = 0; i < EventWriteCount; i++) {
+			var eventData = new EventData(Guid.NewGuid(), "SomeEvent", false, new byte[0], new byte[0]);
+
+			await _conn.AppendToStreamAsync(streamName, ExpectedVersion.Any, DefaultData.AdminCredentials, eventData);
+		}
+
+		if (!_eventsReceived.WaitOne(TimeSpan.FromSeconds(15))) {
+			throw new Exception($"Timed out waiting for events, received {_eventReceivedCount} event(s).");
+		}
+	}
+}
+
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class happy_case_catching_up_to_normal_events_auto_ack<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private const int BufferCount = 10;
+	private const int EventWriteCount = BufferCount * 2;
+
+	private readonly ManualResetEvent _eventsReceived = new ManualResetEvent(false);
+	private int _eventReceivedCount;
+
+	protected override Task When() => Task.WhenAll(_node.Started, _node.AdminUserCreated);
+
+
+	[Test]
+	public async Task Test() {
+		var streamName = Guid.NewGuid().ToString();
+		var groupName = Guid.NewGuid().ToString();
+		var settings = PersistentSubscriptionSettings
+			.Create()
+			.StartFromBeginning()
+			.ResolveLinkTos()
+			.Build();
+		for (var i = 0; i < EventWriteCount; i++) {
+			var eventData = new EventData(Guid.NewGuid(), "SomeEvent", false, new byte[0], new byte[0]);
+
+			await _conn.AppendToStreamAsync(streamName, ExpectedVersion.Any, DefaultData.AdminCredentials, eventData);
+		}
+
+		await _conn.CreatePersistentSubscriptionAsync(streamName, groupName, settings, DefaultData.AdminCredentials);
+		await _conn.ConnectToPersistentSubscriptionAsync(streamName, groupName,
+			(subscription, resolvedEvent) => {
+				if (Interlocked.Increment(ref _eventReceivedCount) == EventWriteCount) {
+					_eventsReceived.Set();
+				}
+
+				return Task.CompletedTask;
+			},
+			(sub, reason, exception) => {
+				Console.WriteLine($"Subscription dropped (reason:{reason}, exception:{exception}).");
+			},
+			userCredentials: DefaultData.AdminCredentials,
+			autoAck: true);
+
+		if (!_eventsReceived.WaitOne(TimeSpan.FromSeconds(5))) {
+			throw new Exception("Timed out waiting for events.");
+		}
+	}
+}
+
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class happy_case_catching_up_to_normal_events_manual_ack<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private const int BufferCount = 10;
+	private const int EventWriteCount = BufferCount * 2;
+
+	private readonly ManualResetEvent _eventsReceived = new ManualResetEvent(false);
+	private int _eventReceivedCount;
+
+	protected override Task When() => Task.WhenAll(_node.Started, _node.AdminUserCreated);
+
+
+	[Test]
+	public async Task Test() {
+		var streamName = Guid.NewGuid().ToString();
+		var groupName = Guid.NewGuid().ToString();
+		var settings = PersistentSubscriptionSettings
+			.Create()
+			.StartFromBeginning()
+			.ResolveLinkTos()
+			.Build();
+		for (var i = 0; i < EventWriteCount; i++) {
+			var eventData = new EventData(Guid.NewGuid(), "SomeEvent", false, new byte[0], new byte[0]);
+
+			await _conn.AppendToStreamAsync(streamName, ExpectedVersion.Any, DefaultData.AdminCredentials, eventData);
+		}
+
+		await _conn.CreatePersistentSubscriptionAsync(streamName, groupName, settings, DefaultData.AdminCredentials);
+		await _conn.ConnectToPersistentSubscriptionAsync(streamName, groupName,
+			(subscription, resolvedEvent) => {
+				subscription.Acknowledge(resolvedEvent);
+				if (Interlocked.Increment(ref _eventReceivedCount) == EventWriteCount) {
+					_eventsReceived.Set();
+				}
+
+				return Task.CompletedTask;
+			},
+			(sub, reason, exception) =>
+				Console.WriteLine("Subscription dropped (reason:{0}, exception:{1}).", reason, exception),
+			userCredentials: DefaultData.AdminCredentials,
+			autoAck: false);
+
+		if (!_eventsReceived.WaitOne(TimeSpan.FromSeconds(5))) {
+			throw new Exception("Timed out waiting for events.");
+		}
+	}
+}
+
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class happy_case_catching_up_to_link_to_events_manual_ack<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private const int BufferCount = 10;
+	private const int EventWriteCount = BufferCount * 2;
+
+	private readonly ManualResetEvent _eventsReceived = new ManualResetEvent(false);
+	private int _eventReceivedCount;
+
+	protected override Task When() => Task.WhenAll(_node.Started, _node.AdminUserCreated);
+
+	[Test]
+	public async Task Test() {
+		var streamName = Guid.NewGuid().ToString();
+		var groupName = Guid.NewGuid().ToString();
+		var settings = PersistentSubscriptionSettings
+			.Create()
+			.StartFromBeginning()
+			.ResolveLinkTos()
+			.Build();
+		for (var i = 0; i < EventWriteCount; i++) {
+			var eventData = new EventData(Guid.NewGuid(), "SomeEvent", false, new byte[0], new byte[0]);
+			await _conn.AppendToStreamAsync(streamName + "original", ExpectedVersion.Any, DefaultData.AdminCredentials,
+				eventData);
+		}
+
+		await _conn.CreatePersistentSubscriptionAsync(streamName, groupName, settings, DefaultData.AdminCredentials);
+		await _conn.ConnectToPersistentSubscriptionAsync(streamName, groupName,
+			(subscription, resolvedEvent) => {
+				subscription.Acknowledge(resolvedEvent);
+				if (Interlocked.Increment(ref _eventReceivedCount) == EventWriteCount) {
+					_eventsReceived.Set();
+				}
+
+				return Task.CompletedTask;
+			},
+			(sub, reason, exception) =>
+				Console.WriteLine("Subscription dropped (reason:{0}, exception:{1}).", reason, exception),
+			userCredentials: DefaultData.AdminCredentials,
+			autoAck: false);
+		for (var i = 0; i < EventWriteCount; i++) {
+			var eventData = new EventData(Guid.NewGuid(), SystemEventTypes.LinkTo, false,
+				Encoding.UTF8.GetBytes(i + "@" + streamName + "original"), null);
+			await _conn.AppendToStreamAsync(streamName, ExpectedVersion.Any, DefaultData.AdminCredentials, eventData);
+		}
+
+		if (!_eventsReceived.WaitOne(TimeSpan.FromSeconds(5))) {
+			throw new Exception("Timed out waiting for events.");
+		}
+	}
+}
+
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class happy_case_catching_up_to_link_to_events_auto_ack<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private const int BufferCount = 10;
+	private const int EventWriteCount = BufferCount * 2;
+
+	private readonly ManualResetEvent _eventsReceived = new ManualResetEvent(false);
+	private int _eventReceivedCount;
+
+	protected override Task When() => Task.WhenAll(_node.Started, _node.AdminUserCreated);
+
+	[Test]
+	public async Task Test() {
+		var streamName = Guid.NewGuid().ToString();
+		var groupName = Guid.NewGuid().ToString();
+		var settings = PersistentSubscriptionSettings
+			.Create()
+			.StartFromBeginning()
+			.ResolveLinkTos()
+			.Build();
+		for (var i = 0; i < EventWriteCount; i++) {
+			var eventData = new EventData(Guid.NewGuid(), "SomeEvent", false, new byte[0], new byte[0]);
+			await _conn.AppendToStreamAsync(streamName + "original", ExpectedVersion.Any, DefaultData.AdminCredentials,
+				eventData);
+		}
+
+		await _conn.CreatePersistentSubscriptionAsync(streamName, groupName, settings, DefaultData.AdminCredentials);
+		await _conn.ConnectToPersistentSubscriptionAsync(streamName, groupName,
+			(subscription, resolvedEvent) => {
+				if (Interlocked.Increment(ref _eventReceivedCount) == EventWriteCount) {
+					_eventsReceived.Set();
+				}
+
+				return Task.CompletedTask;
+			},
+			(sub, reason, exception) =>
+				Console.WriteLine("Subscription dropped (reason:{0}, exception:{1}).", reason, exception),
+			userCredentials: DefaultData.AdminCredentials,
+			autoAck: true);
+		for (var i = 0; i < EventWriteCount; i++) {
+			var eventData = new EventData(Guid.NewGuid(), SystemEventTypes.LinkTo, false,
+				Encoding.UTF8.GetBytes(i + "@" + streamName + "original"), null);
+			await _conn.AppendToStreamAsync(streamName, ExpectedVersion.Any, DefaultData.AdminCredentials, eventData);
+		}
+
+		if (!_eventsReceived.WaitOne(TimeSpan.FromSeconds(5))) {
+			throw new Exception("Timed out waiting for events.");
+		}
+	}
+}
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_writing_and_subscribing_to_normal_events_manual_nack<TLogFormat, TStreamId>
+	: SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private const int BufferCount = 10;
+	private const int EventWriteCount = BufferCount * 2;
+
+	private readonly ManualResetEvent _eventsReceived = new ManualResetEvent(false);
+	private int _eventReceivedCount;
+
+	protected override Task When() => Task.WhenAll(_node.Started, _node.AdminUserCreated);
+
+	[Test]
+	public async Task Test() {
+		var streamName = Guid.NewGuid().ToString();
+		var groupName = Guid.NewGuid().ToString();
+		var settings = PersistentSubscriptionSettings
+			.Create()
+			.StartFromCurrent()
+			.ResolveLinkTos()
+			.Build();
+
+		await _conn.CreatePersistentSubscriptionAsync(streamName, groupName, settings, DefaultData.AdminCredentials);
+		await _conn.ConnectToPersistentSubscriptionAsync(streamName, groupName,
+			(subscription, resolvedEvent) => {
+				subscription.Fail(resolvedEvent, PersistentSubscriptionNakEventAction.Park, "fail");
+
+				if (Interlocked.Increment(ref _eventReceivedCount) == EventWriteCount) {
+					_eventsReceived.Set();
+				}
+
+				return Task.CompletedTask;
+			},
+			(sub, reason, exception) =>
+				Console.WriteLine("Subscription dropped (reason:{0}, exception:{1}).", reason, exception),
+			bufferSize: 10, autoAck: false, userCredentials: DefaultData.AdminCredentials);
+
+		for (var i = 0; i < EventWriteCount; i++) {
+			var eventData = new EventData(Guid.NewGuid(), "SomeEvent", false, new byte[0], new byte[0]);
+
+			await _conn.AppendToStreamAsync(streamName, ExpectedVersion.Any, DefaultData.AdminCredentials, eventData);
+		}
+
+		if (!_eventsReceived.WaitOne(TimeSpan.FromSeconds(5))) {
+			throw new Exception("Timed out waiting for events.");
+		}
+	}
+}
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_connection_drops_messages_that_have_run_out_of_retries_are_not_retried<TLogFormat, TStreamId>
+	: SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly TaskCompletionSource<bool> _subscriptionDropped = new TaskCompletionSource<bool>();
+	private readonly TaskCompletionSource<bool> _eventReceived = new TaskCompletionSource<bool>();
+	private ResolvedEvent _receivedEvent;
+
+	protected override Task When() => Task.WhenAll(_node.Started, _node.AdminUserCreated);
+
+	[Test]
+	[Retry(10)]
+	public void Test() => Assert.DoesNotThrowAsync(async () => {
+		await CloseConnectionAndWait(_conn);
+		_conn = BuildConnection(_node);
+		AddLogging(_conn);
+		await _conn.ConnectAsync();
+
+		var streamName = Guid.NewGuid().ToString();
+		var groupName = Guid.NewGuid().ToString();
+		var settings = PersistentSubscriptionSettings
+			.Create()
+			.StartFromCurrent()
+			.WithMaxRetriesOf(0) // Don't retry messages
+			.Build();
+
+		await _conn.CreatePersistentSubscriptionAsync(streamName, groupName, settings, DefaultData.AdminCredentials);
+		await _conn.ConnectToPersistentSubscriptionAsync(streamName, groupName, async (subscription, resolvedEvent) => {
+			await CloseConnectionAndWait(_conn);
+		},
+			(sub, reason, exception) => {
+				Console.WriteLine("Subscription dropped (reason:{0}, exception:{1}). @ {2}", reason, exception, DateTime.Now);
+				_subscriptionDropped.TrySetResult(true);
+			},
+			bufferSize: 10, autoAck: false, userCredentials: DefaultData.AdminCredentials);
+
+		var parkedEventData = new EventData(Guid.NewGuid(), "SomeEvent", false, new byte[0], new byte[0]);
+		await _conn.AppendToStreamAsync(streamName, ExpectedVersion.Any, DefaultData.AdminCredentials, parkedEventData);
+
+		await _subscriptionDropped.Task.WithTimeout();
+
+		_conn = BuildConnection(_node);
+		AddLogging(_conn);
+		await _conn.ConnectAsync();
+
+		await _conn.ConnectToPersistentSubscriptionAsync(streamName, groupName, (subscription, resolvedEvent) => {
+			subscription.Acknowledge(resolvedEvent);
+			_receivedEvent = resolvedEvent;
+			_eventReceived.TrySetResult(true);
+		}, (sub, reason, exception) => {
+			Console.WriteLine("Second Subscription dropped (reason:{0}, exception:{1}).", reason, exception);
+		}, bufferSize: 10, autoAck: false, userCredentials: DefaultData.AdminCredentials);
+
+		// Ensure we only get the new event, not the previous one
+		var newEventData = new EventData(Guid.NewGuid(), "SomeEvent", false, new byte[0], new byte[0]);
+		await _conn.AppendToStreamAsync(streamName, ExpectedVersion.Any, DefaultData.AdminCredentials, newEventData);
+
+		await _eventReceived.Task.WithTimeout();
+		Assert.AreEqual(newEventData.EventId, _receivedEvent.Event.EventId);
+
+		//flaky: temporarily added for debugging
+		void AddLogging(IEventStoreConnection conn) {
+			conn.AuthenticationFailed += (_, args) => Console.WriteLine($"_conn.AuthenticationFailed: {args.Connection.ConnectionName} @ {DateTime.Now} {TestContext.CurrentContext.CurrentRepeatCount}");
+			conn.Closed += (_, args) => Console.WriteLine($"_conn.Closed: {args.Connection.ConnectionName} @ {DateTime.Now} {TestContext.CurrentContext.CurrentRepeatCount}");
+			conn.Connected += (_, args) => Console.WriteLine($"_conn.Connected: {args.Connection.ConnectionName} @ {DateTime.Now} {TestContext.CurrentContext.CurrentRepeatCount}");
+			conn.Disconnected += (_, args) => Console.WriteLine($"_conn.Disconnected: {args.Connection.ConnectionName} @ {DateTime.Now} {TestContext.CurrentContext.CurrentRepeatCount}");
+			conn.ErrorOccurred += (_, args) => Console.WriteLine($"_conn.ErrorOccurred: {args.Connection.ConnectionName} @ {DateTime.Now} {TestContext.CurrentContext.CurrentRepeatCount}");
+			conn.Reconnecting += (_, args) => Console.WriteLine($"_conn.Reconnecting: {args.Connection.ConnectionName} @ {DateTime.Now} {TestContext.CurrentContext.CurrentRepeatCount}");
+		}
+	});
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_backward_filtered_should.cs b/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_backward_filtered_should.cs
new file mode 100644
index 00000000000..323abff263b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_backward_filtered_should.cs
@@ -0,0 +1,94 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using NUnit.Framework;
+using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
+using StreamMetadata = EventStore.ClientAPI.StreamMetadata;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_all_events_backward_filtered_should<TLogFormat, TStreamId>
+	: SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private List<EventData> _testEvents;
+
+	protected override async Task When() {
+		await _conn.SetStreamMetadataAsync("$all", -1,
+				StreamMetadata.Build().SetReadRole(SystemRoles.All),
+				DefaultData.AdminCredentials);
+
+		_testEvents = Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "AEvent"))
+			.ToList();
+		_testEvents.AddRange(
+			Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "BEvent"))
+				.ToList());
+
+		await _conn.AppendToStreamAsync("stream-a", ExpectedVersion.NoStream, _testEvents.EvenEvents());
+		await _conn.AppendToStreamAsync("stream-b", ExpectedVersion.NoStream, _testEvents.OddEvents());
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task only_return_events_with_a_given_stream_prefix() {
+		var filter = Filter.StreamId.Prefix("stream-a");
+
+		var read = await _conn.FilteredReadAllEventsBackwardAsync(Position.End, 4096, false, filter, 4096);
+		Assert.That(EventDataComparer.Equal(
+			_testEvents.EvenEvents().ReverseEvents(),
+			read.Events.Select(x => x.Event).ToArray()));
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task only_return_events_with_a_given_event_prefix() {
+		var filter = Filter.EventType.Prefix("AE");
+
+		// Have to order the events as we are writing to two streams and can't guarantee ordering
+
+		var read = await _conn.FilteredReadAllEventsBackwardAsync(Position.End, 4096, false, filter, 4096);
+		Assert.AreEqual(ReadDirection.Backward, read.ReadDirection);
+		Assert.That(EventDataComparer.Equal(
+			_testEvents.Where(e => e.Type == "AEvent").OrderBy(x => x.EventId).ToArray(),
+			read.Events.Select(x => x.Event).OrderBy(x => x.EventId).ToArray()));
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task only_return_events_that_satisfy_a_given_stream_regex() {
+		var filter = Filter.StreamId.Regex(new Regex(@"^.*m-b.*$"));
+
+		var read = await _conn.FilteredReadAllEventsBackwardAsync(Position.End, 4096, false, filter, 4096);
+		Assert.AreEqual(ReadDirection.Backward, read.ReadDirection);
+		Assert.That(EventDataComparer.Equal(
+			_testEvents.OddEvents().ReverseEvents(),
+			read.Events.Select(x => x.Event).ToArray()));
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task only_return_events_that_satisfy_a_given_event_regex() {
+		var filter = Filter.EventType.Regex(new Regex(@"^.*BEv.*$"));
+
+		// Have to order the events as we are writing to two streams and can't guarantee ordering
+		var read = await _conn.FilteredReadAllEventsBackwardAsync(Position.End, 4096, false, filter, 4096);
+		Assert.AreEqual(ReadDirection.Backward, read.ReadDirection);
+		Assert.That(EventDataComparer.Equal(
+			_testEvents.Where(e => e.Type == "BEvent").OrderBy(x => x.EventId).ToArray(),
+			read.Events.Select(x => x.Event).OrderBy(x => x.EventId).ToArray()));
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task only_return_events_that_are_not_system_events() {
+		var filter = Filter.ExcludeSystemEvents;
+
+		// Have to order the events as we are writing to two streams and can't guarantee ordering
+		var read = await _conn.FilteredReadAllEventsBackwardAsync(Position.End, 4096, false, filter, 4096);
+		Assert.AreEqual(ReadDirection.Backward, read.ReadDirection);
+		Assert.That(!read.Events.Any(e => e.Event.EventType.StartsWith("$")));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_backward_should.cs b/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_backward_should.cs
new file mode 100644
index 00000000000..7798a759e9b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_backward_should.cs
@@ -0,0 +1,89 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_all_events_backward_should<TLogFormat, TStreamId>
+	: SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private EventData[] _testEvents;
+
+	protected override async Task When() {
+		await _conn.SetStreamMetadataAsync("$all", -1,
+				StreamMetadata.Build().SetReadRole(SystemRoles.All),
+				DefaultData.AdminCredentials);
+
+		_testEvents = Enumerable.Range(0, 20).Select(x => TestEvent.NewTestEvent(x.ToString())).ToArray();
+		await _conn.AppendToStreamAsync("stream", ExpectedVersion.NoStream, _testEvents);
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task return_empty_slice_if_asked_to_read_from_start() {
+		var read = await _conn.ReadAllEventsBackwardAsync(Position.Start, 1, false);
+		Assert.That(read.IsEndOfStream, Is.True);
+		Assert.That(read.Events.Length, Is.EqualTo(0));
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task return_partial_slice_if_not_enough_events() {
+		var read = await _conn.ReadAllEventsBackwardAsync(Position.End, 40, false);
+		Assert.That(read.Events.Length, Is.LessThan(40));
+		Assert.That(EventDataComparer.Equal(_testEvents.Reverse().ToArray(),
+			read.Events.Take(_testEvents.Length).Select(x => x.Event).ToArray()));
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task return_events_in_reversed_order_compared_to_written() {
+		var read = await _conn.ReadAllEventsBackwardAsync(Position.End, _testEvents.Length, false);
+		Assert.That(EventDataComparer.Equal(_testEvents.Reverse().ToArray(),
+			read.Events.Select(x => x.Event).ToArray()));
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task be_able_to_read_all_one_by_one_until_end_of_stream() {
+		var all = new List<RecordedEvent>();
+		var position = Position.End;
+		AllEventsSlice slice;
+
+		while (!(slice = await _conn.ReadAllEventsBackwardAsync(position, 1, false)).IsEndOfStream) {
+			all.Add(slice.Events.Single().Event);
+			position = slice.NextPosition;
+		}
+
+		Assert.That(
+			EventDataComparer.Equal(_testEvents.Reverse().ToArray(), all.Take(_testEvents.Length).ToArray()));
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task be_able_to_read_events_slice_at_time() {
+		var all = new List<RecordedEvent>();
+		var position = Position.End;
+		AllEventsSlice slice;
+
+		while (!(slice = await _conn.ReadAllEventsBackwardAsync(position, 5, false)).IsEndOfStream) {
+			all.AddRange(slice.Events.Select(x => x.Event));
+			position = slice.NextPosition;
+		}
+
+		Assert.That(
+			EventDataComparer.Equal(_testEvents.Reverse().ToArray(), all.Take(_testEvents.Length).ToArray()));
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task throw_when_got_int_max_value_as_maxcount() {
+		await AssertEx.ThrowsAsync<ArgumentException>(
+			() => _conn.ReadAllEventsBackwardAsync(Position.Start, int.MaxValue, resolveLinkTos: false));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_filtered_paging_should.cs b/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_filtered_paging_should.cs
new file mode 100644
index 00000000000..24d88119d1f
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_filtered_paging_should.cs
@@ -0,0 +1,147 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using NUnit.Framework;
+using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
+using ResolvedEvent = EventStore.ClientAPI.ResolvedEvent;
+using StreamMetadata = EventStore.ClientAPI.StreamMetadata;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_all_events_filtered_paging_should<TLogFormat, TStreamId>
+	: SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private List<EventData> _testEvents = new List<EventData>();
+
+	private List<EventData> _testEventsA;
+
+	private List<EventData> _testEventsC;
+
+	public read_all_events_filtered_paging_should() : base(chunkSize: 2 * 1024 * 1024) { }
+
+	protected override async Task When() {
+		await _conn.SetStreamMetadataAsync("$all", -1,
+			StreamMetadata.Build().SetReadRole(SystemRoles.All),
+			DefaultData.AdminCredentials);
+
+		_testEventsA = Enumerable
+			.Range(0, 10)
+			.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "AEvent"))
+			.ToList();
+
+		var testEventsB = Enumerable
+			.Range(0, 10000)
+			.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "BEvent"))
+			.ToList();
+
+		_testEventsC = Enumerable
+			.Range(0, 10)
+			.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "CEvent"))
+			.ToList();
+
+		_testEvents.AddRange(_testEventsA);
+		_testEvents.AddRange(testEventsB);
+		_testEvents.AddRange(_testEventsC);
+
+		_conn.AppendToStreamAsync("stream-a", ExpectedVersion.NoStream, _testEvents).Wait();
+	}
+
+	[Test, Category("LongRunning")]
+	public void handle_paging_between_events_forward() {
+		var numberOfEmptySlicesRead = 0;
+
+		var filter = Filter.EventType.Prefix("CE");
+		var sliceStart = Position.Start;
+		var read = new List<ResolvedEvent>();
+		AllEventsSlice slice;
+
+		do {
+			slice = _conn.FilteredReadAllEventsForwardAsync(sliceStart, 50, false, filter, maxSearchWindow: 100)
+				.GetAwaiter()
+				.GetResult();
+
+			if (slice.Events.Length == 0) {
+				numberOfEmptySlicesRead++;
+			} else {
+				read.AddRange(slice.Events);
+			}
+
+			sliceStart = slice.NextPosition;
+		} while (!slice.IsEndOfStream);
+
+		Assert.That(EventDataComparer.Equal(
+			_testEventsC.ToArray(),
+			read.Select(x => x.Event).ToArray()));
+
+		Assert.AreEqual(100, numberOfEmptySlicesRead);
+	}
+
+	[Test, Category("LongRunning")]
+	public void handle_paging_between_events_backward() {
+		var numberOfEmptySlicesRead = 0;
+
+		var filter = Filter.EventType.Prefix("AE");
+		var sliceStart = Position.End;
+		var read = new List<ResolvedEvent>();
+		AllEventsSlice slice;
+
+		do {
+			slice = _conn.FilteredReadAllEventsBackwardAsync(sliceStart, 50, false, filter, maxSearchWindow: 100)
+				.GetAwaiter()
+				.GetResult();
+			if (slice.Events.Length == 0) {
+				numberOfEmptySlicesRead++;
+			} else {
+				read.AddRange(slice.Events);
+			}
+
+			sliceStart = slice.NextPosition;
+		} while (!slice.IsEndOfStream);
+
+		Assert.That(EventDataComparer.Equal(
+			_testEventsA.ReverseEvents(),
+			read.Select(x => x.Event).ToArray()));
+
+		Assert.AreEqual(100, numberOfEmptySlicesRead);
+	}
+
+	[Test, Category("LongRunning")]
+	public void handle_paging_between_events_returns_correct_number_of_events_for_max_search_window_forward() {
+		var filter = Filter.EventType.Prefix("BE");
+
+		var slice = _conn.FilteredReadAllEventsForwardAsync(Position.Start, 30, false, filter, maxSearchWindow: 30)
+			.GetAwaiter()
+			.GetResult();
+
+		// Includes system events at start of stream (inc epoch-information)
+		var expectedCount = 11;
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.IsV3) {
+			// account for stream records: $scavenges, $user-admin, $user-ops, $users, stream-a
+			expectedCount -= 5;
+			// account for event type records: $UserCreated, $User, AEvent, BEvent, CEvent
+			expectedCount -= 5;
+		}
+
+		Assert.AreEqual(expectedCount, slice.Events.Length);
+	}
+
+	[Test, Category("LongRunning")]
+	public void handle_paging_between_events_returns_correct_number_of_events_for_max_search_window_backward() {
+		var filter = Filter.EventType.Prefix("BE");
+
+		var slice = _conn.FilteredReadAllEventsBackwardAsync(Position.End, 20, false, filter, maxSearchWindow: 20)
+			.GetAwaiter()
+			.GetResult();
+
+		Assert.AreEqual(10, slice.Events.Length); // Includes system events
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_forward_filtered_should.cs b/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_forward_filtered_should.cs
new file mode 100644
index 00000000000..96123a9c1b3
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_forward_filtered_should.cs
@@ -0,0 +1,104 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using NUnit.Framework;
+using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
+using StreamMetadata = EventStore.ClientAPI.StreamMetadata;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_all_events_forward_filtered_should<TLogFormat, TStreamId>
+	: SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private List<EventData> _testEvents;
+
+	protected override async Task When() {
+		await _conn.SetStreamMetadataAsync("$all", -1,
+				StreamMetadata.Build().SetReadRole(SystemRoles.All),
+				DefaultData.AdminCredentials);
+
+		_testEvents = Enumerable
+			.Range(0, 10)
+			.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "AEvent"))
+			.ToList();
+
+		_testEvents.AddRange(
+			Enumerable
+				.Range(0, 10)
+				.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "BEvent")).ToList());
+
+		await _conn.AppendToStreamAsync("stream-a", ExpectedVersion.NoStream, _testEvents.EvenEvents());
+		await _conn.AppendToStreamAsync("stream-b", ExpectedVersion.NoStream, _testEvents.OddEvents());
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task only_return_events_with_a_given_stream_prefix() {
+		var filter = Filter.StreamId.Prefix("stream-a");
+
+		var read = await _conn.FilteredReadAllEventsForwardAsync(Position.Start, 1000, false, filter, 1000);
+		Assert.That(EventDataComparer.Equal(
+			_testEvents.EvenEvents().ToArray(),
+			read.Events.Select(x => x.Event).ToArray()));
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task only_return_events_with_a_given_event_prefix() {
+		var filter = Filter.EventType.Prefix("AE");
+
+		// Have to order the events as we are writing to two streams and can't guarantee ordering
+		var read = await _conn.FilteredReadAllEventsForwardAsync(Position.Start, 1000, false, filter, 1000);
+		Assert.That(EventDataComparer.Equal(
+			_testEvents.Where(e => e.Type == "AEvent").OrderBy(x => x.EventId).ToArray(),
+			read.Events.Select(x => x.Event).OrderBy(x => x.EventId).ToArray()));
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task only_return_events_that_satisfy_a_given_stream_regex() {
+		var filter = Filter.StreamId.Regex(new Regex(@"^.*eam-b.*$"));
+
+		var read = await _conn.FilteredReadAllEventsForwardAsync(Position.Start, 1000, false, filter, 1000);
+		Assert.AreEqual(ReadDirection.Forward, read.ReadDirection);
+		Assert.That(EventDataComparer.Equal(
+			_testEvents.OddEvents().ToArray(),
+			read.Events.Select(x => x.Event).ToArray()));
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task only_return_events_that_satisfy_a_given_event_regex() {
+		var filter = Filter.EventType.Regex(new Regex(@"^.*BEv.*$"));
+
+		// Have to order the events as we are writing to two streams and can't guarantee ordering
+		var read = await _conn.FilteredReadAllEventsForwardAsync(Position.Start, 1000, false, filter, 1000);
+		Assert.AreEqual(ReadDirection.Forward, read.ReadDirection);
+		Assert.That(EventDataComparer.Equal(
+			_testEvents.Where(e => e.Type == "BEvent").OrderBy(x => x.EventId).ToArray(),
+			read.Events.Select(x => x.Event).OrderBy(x => x.EventId).ToArray()));
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task only_return_events_that_are_not_system_events() {
+		var filter = Filter.ExcludeSystemEvents;
+
+		// Have to order the events as we are writing to two streams and can't guarantee ordering
+		var read = await _conn.FilteredReadAllEventsForwardAsync(Position.Start, 1000, false, filter, 1000);
+		Assert.AreEqual(ReadDirection.Forward, read.ReadDirection);
+		Assert.That(!read.Events.Any(e => e.Event.EventType.StartsWith("$")));
+	}
+}
+
+internal static class EventDataExtensions {
+	internal static List<EventData> EvenEvents(this List<EventData> ed) => ed.Where((c, i) => i % 2 == 0).ToList();
+
+	internal static List<EventData> OddEvents(this List<EventData> ed) => ed.Where((c, i) => i % 2 != 0).ToList();
+
+	internal static EventData[] ReverseEvents(this List<EventData> ed) => ed.ToArray().Reverse().ToArray();
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_forward_should.cs b/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_forward_should.cs
new file mode 100644
index 00000000000..7c27ffc5f87
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_forward_should.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_all_events_forward_should<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private EventData[] _testEvents;
+
+	protected override async Task When() {
+		await _conn.SetStreamMetadataAsync("$all", -1,
+				StreamMetadata.Build().SetReadRole(SystemRoles.All),
+				DefaultData.AdminCredentials);
+
+		_testEvents = Enumerable.Range(0, 20).Select(x => TestEvent.NewTestEvent(x.ToString())).ToArray();
+		await _conn.AppendToStreamAsync("stream", ExpectedVersion.NoStream, _testEvents);
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task return_empty_slice_if_asked_to_read_from_end() {
+		var read = await _conn.ReadAllEventsForwardAsync(Position.End, 1, false);
+		Assert.That(read.IsEndOfStream, Is.True);
+		Assert.That(read.Events.Length, Is.EqualTo(0));
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task return_events_in_same_order_as_written() {
+		var read = await _conn.ReadAllEventsForwardAsync(Position.Start, _testEvents.Length + 20, false);
+		Assert.That(EventDataComparer.Equal(
+			_testEvents.ToArray(),
+			read.Events.Skip(read.Events.Length - _testEvents.Length).Select(x => x.Event).ToArray()));
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task be_able_to_read_all_one_by_one_until_end_of_stream() {
+		var all = new List<RecordedEvent>();
+		var position = Position.Start;
+		AllEventsSlice slice;
+
+		while (!(slice = await _conn.ReadAllEventsForwardAsync(position, 1, false)).IsEndOfStream) {
+			all.Add(slice.Events.Single().Event);
+			position = slice.NextPosition;
+		}
+
+		Assert.That(EventDataComparer.Equal(_testEvents, all.Skip(all.Count - _testEvents.Length).ToArray()));
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task be_able_to_read_events_slice_at_time() {
+		var all = new List<RecordedEvent>();
+		var position = Position.Start;
+		AllEventsSlice slice;
+
+		while (!(slice = await _conn.ReadAllEventsForwardAsync(position, 5, false)).IsEndOfStream) {
+			all.AddRange(slice.Events.Select(x => x.Event));
+			position = slice.NextPosition;
+		}
+
+		Assert.That(EventDataComparer.Equal(_testEvents, all.Skip(all.Count - _testEvents.Length).ToArray()));
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task return_partial_slice_if_not_enough_events() {
+		var read = await _conn.ReadAllEventsForwardAsync(Position.Start, 40, false);
+		Assert.That(read.Events.Length, Is.LessThan(40));
+		Assert.That(EventDataComparer.Equal(
+			_testEvents,
+			read.Events.Skip(read.Events.Length - _testEvents.Length).Select(x => x.Event).ToArray()));
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task throw_when_got_int_max_value_as_maxcount() {
+		await AssertEx.ThrowsAsync<ArgumentException>(
+			() => _conn.ReadAllEventsForwardAsync(Position.Start, int.MaxValue, resolveLinkTos: false));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_forward_with_hard_deleted_stream_should.cs b/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_forward_with_hard_deleted_stream_should.cs
new file mode 100644
index 00000000000..06df5e33a90
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_forward_with_hard_deleted_stream_should.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using NUnit.Framework;
+using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
+using StreamMetadata = EventStore.ClientAPI.StreamMetadata;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_all_events_forward_with_hard_deleted_stream_should<TLogFormat, TStreamId>
+	: SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private EventData[] _testEvents;
+
+	protected override async Task When() {
+		await _conn.SetStreamMetadataAsync(
+				"$all", -1, StreamMetadata.Build().SetReadRole(SystemRoles.All),
+				new UserCredentials(SystemUsers.Admin, SystemUsers.DefaultAdminPassword));
+
+		_testEvents = Enumerable.Range(0, 20).Select(x => TestEvent.NewTestEvent(x.ToString())).ToArray();
+		await _conn.AppendToStreamAsync("stream", ExpectedVersion.NoStream, _testEvents);
+		await _conn.DeleteStreamAsync("stream", ExpectedVersion.Any, hardDelete: true);
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task ensure_deleted_stream() {
+		var res = await _conn.ReadStreamEventsForwardAsync("stream", 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.StreamDeleted, res.Status);
+		Assert.AreEqual(0, res.Events.Length);
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task returns_all_events_including_tombstone() {
+		AllEventsSlice read = await _conn.ReadAllEventsForwardAsync(Position.Start, _testEvents.Length + 20, false)
+;
+		Assert.That(
+			EventDataComparer.Equal(
+				_testEvents.ToArray(),
+				read.Events.Skip(read.Events.Length - _testEvents.Length - 1)
+					.Take(_testEvents.Length)
+					.Select(x => x.Event)
+					.ToArray()));
+		var lastEvent = read.Events.Last().Event;
+		Assert.AreEqual("stream", lastEvent.EventStreamId);
+		Assert.AreEqual(SystemEventTypes.StreamDeleted, lastEvent.EventType);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_forward_with_linkto_passed_max_count.cs b/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_forward_with_linkto_passed_max_count.cs
new file mode 100644
index 00000000000..5bba0dbe413
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_forward_with_linkto_passed_max_count.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_all_events_forward_with_linkto_passed_max_count<TLogFormat, TStreamId> : SpecificationWithLinkToToMaxCountDeletedEvents<TLogFormat, TStreamId> {
+	private StreamEventsSlice _read;
+
+	protected override async Task When() {
+		_read = await _conn.ReadStreamEventsForwardAsync(LinkedStreamName, 0, 1, true);
+	}
+
+	[Test]
+	public void one_event_is_read() {
+		Assert.AreEqual(1, _read.Events.Length);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_forward_with_linkto_to_deleted_event.cs b/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_forward_with_linkto_to_deleted_event.cs
new file mode 100644
index 00000000000..13ef1cb536c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_forward_with_linkto_to_deleted_event.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_all_events_forward_with_linkto_to_deleted_event<TLogFormat, TStreamId> : SpecificationWithLinkToToDeletedEvents<TLogFormat, TStreamId> {
+	private StreamEventsSlice _read;
+
+	protected override async Task When() {
+		_read = await _conn.ReadStreamEventsForwardAsync(LinkedStreamName, 0, 1, true, null);
+	}
+
+	[Test]
+	public void one_event_is_read() {
+		Assert.AreEqual(1, _read.Events.Length);
+	}
+
+	[Test]
+	public void the_linked_event_is_not_resolved() {
+		Assert.IsNull(_read.Events[0].Event);
+	}
+
+	[Test]
+	public void the_link_event_is_included() {
+		Assert.IsNotNull(_read.Events[0].OriginalEvent);
+	}
+
+	[Test]
+	public void the_event_is_not_resolved() {
+		Assert.IsFalse(_read.Events[0].IsResolved);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_forward_with_soft_deleted_stream_should.cs b/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_forward_with_soft_deleted_stream_should.cs
new file mode 100644
index 00000000000..2e7c19f5dcf
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/read_all_events_forward_with_soft_deleted_stream_should.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using NUnit.Framework;
+using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
+using StreamMetadata = EventStore.ClientAPI.StreamMetadata;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_all_events_forward_with_soft_deleted_stream_should<TLogFormat, TStreamId>
+	: SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private EventData[] _testEvents;
+
+	protected override async Task When() {
+		await _conn.SetStreamMetadataAsync(
+				"$all", -1, StreamMetadata.Build().SetReadRole(SystemRoles.All),
+				new UserCredentials(SystemUsers.Admin, SystemUsers.DefaultAdminPassword));
+
+		_testEvents = Enumerable.Range(0, 20).Select(x => TestEvent.NewTestEvent(x.ToString())).ToArray();
+		await _conn.AppendToStreamAsync("stream", ExpectedVersion.NoStream, _testEvents);
+		await _conn.DeleteStreamAsync("stream", ExpectedVersion.Any);
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task ensure_deleted_stream() {
+		var res = await _conn.ReadStreamEventsForwardAsync("stream", 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.StreamNotFound, res.Status);
+		Assert.AreEqual(0, res.Events.Length);
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task returns_all_events_including_tombstone() {
+		AllEventsSlice read = await _conn.ReadAllEventsForwardAsync(Position.Start, _testEvents.Length + 20, false)
+;
+		Assert.That(
+			EventDataComparer.Equal(
+				_testEvents.ToArray(),
+				read.Events.Skip(read.Events.Length - _testEvents.Length - 1)
+					.Take(_testEvents.Length)
+					.Select(x => x.Event)
+					.ToArray()));
+		var lastEvent = read.Events.Last().Event;
+		Assert.AreEqual("$$stream", lastEvent.EventStreamId);
+		Assert.AreEqual(SystemEventTypes.StreamMetadata, lastEvent.EventType);
+		var metadata = StreamMetadata.FromJsonBytes(lastEvent.Data);
+		Assert.AreEqual(EventNumber.DeletedStream, metadata.TruncateBefore);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/read_allevents_backward_with_linkto_deleted_event.cs b/src/KurrentDB.Core.Tests/ClientAPI/read_allevents_backward_with_linkto_deleted_event.cs
new file mode 100644
index 00000000000..b037ded9f2c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/read_allevents_backward_with_linkto_deleted_event.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_event_of_linkto_to_deleted_event<TLogFormat, TStreamId> : SpecificationWithLinkToToDeletedEvents<TLogFormat, TStreamId> {
+	private EventReadResult _read;
+
+	protected override async Task When() {
+		_read = await _conn.ReadEventAsync(LinkedStreamName, 0, true);
+	}
+
+	[Test]
+	public void the_linked_event_is_returned() {
+		Assert.IsNotNull(_read.Event.Value.Link);
+	}
+
+	[Test]
+	public void the_deleted_event_is_not_resolved() {
+		Assert.IsNull(_read.Event.Value.Event);
+	}
+
+	[Test]
+	public void the_status_is_success() {
+		Assert.AreEqual(EventReadStatus.Success, _read.Status);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_allevents_backward_with_linkto_deleted_event<TLogFormat, TStreamId> : SpecificationWithLinkToToDeletedEvents<TLogFormat, TStreamId> {
+	private StreamEventsSlice _read;
+
+	protected override async Task When() {
+		_read = await _conn.ReadStreamEventsBackwardAsync(LinkedStreamName, 0, 1, true, null);
+	}
+
+	[Test]
+	public void one_event_is_read() {
+		Assert.AreEqual(1, _read.Events.Length);
+	}
+
+	[Test]
+	public void the_linked_event_is_not_resolved() {
+		Assert.IsNull(_read.Events[0].Event);
+	}
+
+	[Test]
+	public void the_link_event_is_included() {
+		Assert.IsNotNull(_read.Events[0].OriginalEvent);
+	}
+
+	[Test]
+	public void the_event_is_not_resolved() {
+		Assert.IsFalse(_read.Events[0].IsResolved);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/read_event_should.cs b/src/KurrentDB.Core.Tests/ClientAPI/read_event_should.cs
new file mode 100644
index 00000000000..85be5c57e05
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/read_event_should.cs
@@ -0,0 +1,114 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_event_should<TLogFormat, TStreamId>
+	: SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private Guid _eventId0;
+	private Guid _eventId1;
+
+	protected override async Task When() {
+		_eventId0 = Guid.NewGuid();
+		_eventId1 = Guid.NewGuid();
+
+		await _conn.AppendToStreamAsync("test-stream",
+				-1,
+				new EventData(_eventId0, "event0", false, new byte[3], new byte[2]),
+				new EventData(_eventId1, "event1", true, new byte[7], new byte[10]));
+		await _conn.DeleteStreamAsync("deleted-stream", -1, hardDelete: true);
+	}
+
+	[Test, Category("Network")]
+	public async Task throw_if_stream_id_is_null() {
+		await AssertEx.ThrowsAsync<ArgumentNullException>(() => _conn.ReadEventAsync(null, 0, resolveLinkTos: false));
+	}
+
+	[Test, Category("Network")]
+	public async Task throw_if_stream_id_is_empty() {
+		await AssertEx.ThrowsAsync<ArgumentNullException>(() => _conn.ReadEventAsync("", 0, resolveLinkTos: false));
+	}
+
+	[Test, Category("Network")]
+	public async Task throw_if_event_number_is_less_than_minus_one() {
+		await AssertEx.ThrowsAsync<ArgumentOutOfRangeException>(() =>
+			_conn.ReadEventAsync("stream", -2, resolveLinkTos: false));
+	}
+
+	[Test, Category("Network")]
+	public async Task notify_using_status_code_if_stream_not_found() {
+		var res = await _conn.ReadEventAsync("unexisting-stream", 5, false);
+
+		Assert.AreEqual(EventReadStatus.NoStream, res.Status);
+		Assert.IsNull(res.Event);
+		Assert.AreEqual("unexisting-stream", res.Stream);
+		Assert.AreEqual(5, res.EventNumber);
+	}
+
+	[Test, Category("Network")]
+	public async Task return_no_stream_if_requested_last_event_in_empty_stream() {
+		var res = await _conn.ReadEventAsync("some-really-empty-stream", -1, false);
+		Assert.AreEqual(EventReadStatus.NoStream, res.Status);
+	}
+
+	[Test, Category("Network")]
+	public async Task notify_using_status_code_if_stream_was_deleted() {
+		var res = await _conn.ReadEventAsync("deleted-stream", 5, false);
+
+		Assert.AreEqual(EventReadStatus.StreamDeleted, res.Status);
+		Assert.IsNull(res.Event);
+		Assert.AreEqual("deleted-stream", res.Stream);
+		Assert.AreEqual(5, res.EventNumber);
+	}
+
+	[Test, Category("Network")]
+	public async Task notify_using_status_code_if_stream_does_not_have_event() {
+		var res = await _conn.ReadEventAsync("test-stream", 5, false);
+
+		Assert.AreEqual(EventReadStatus.NotFound, res.Status);
+		Assert.IsNull(res.Event);
+		Assert.AreEqual("test-stream", res.Stream);
+		Assert.AreEqual(5, res.EventNumber);
+	}
+
+	[Test, Category("Network")]
+	public async Task return_existing_event() {
+		var res = await _conn.ReadEventAsync("test-stream", 0, false);
+
+		Assert.AreEqual(EventReadStatus.Success, res.Status);
+		Assert.AreEqual(res.Event.Value.OriginalEvent.EventId, _eventId0);
+		Assert.AreEqual("test-stream", res.Stream);
+		Assert.AreEqual(0, res.EventNumber);
+		Assert.AreNotEqual(DateTime.MinValue, res.Event.Value.OriginalEvent.Created);
+		Assert.AreNotEqual(0, res.Event.Value.OriginalEvent.CreatedEpoch);
+	}
+
+	[Test, Category("Network")]
+	public async Task retrieve_the_is_json_flag_properly() {
+		var res = await _conn.ReadEventAsync("test-stream", 1, false);
+
+		Assert.AreEqual(EventReadStatus.Success, res.Status);
+		Assert.AreEqual(res.Event.Value.OriginalEvent.EventId, _eventId1);
+		Assert.IsTrue(res.Event.Value.OriginalEvent.IsJson);
+	}
+
+	[Test, Category("Network")]
+	public async Task return_last_event_in_stream_if_event_number_is_minus_one() {
+		var res = await _conn.ReadEventAsync("test-stream", -1, false);
+
+		Assert.AreEqual(EventReadStatus.Success, res.Status);
+		Assert.AreEqual(res.Event.Value.OriginalEvent.EventId, _eventId1);
+		Assert.AreEqual("test-stream", res.Stream);
+		Assert.AreEqual(-1, res.EventNumber);
+		Assert.AreNotEqual(DateTime.MinValue, res.Event.Value.OriginalEvent.Created);
+		Assert.AreNotEqual(0, res.Event.Value.OriginalEvent.CreatedEpoch);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/read_event_stream_backward_should.cs b/src/KurrentDB.Core.Tests/ClientAPI/read_event_stream_backward_should.cs
new file mode 100644
index 00000000000..66ddbc0c138
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/read_event_stream_backward_should.cs
@@ -0,0 +1,219 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_event_stream_backward_should<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private MiniNode<TLogFormat, TStreamId> _node;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+	virtual protected IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.Create(node.TcpEndPoint);
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task throw_if_count_le_zero() {
+		const string stream = "read_event_stream_backward_should_throw_if_count_le_zero";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			await AssertEx.ThrowsAsync<ArgumentOutOfRangeException>(() =>
+				store.ReadStreamEventsBackwardAsync(stream, 0, 0, resolveLinkTos: false));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task throw_if_start_less_than_minus_one() {
+		const string stream = "read_event_stream_backward_should_throw_if_start_less_than_minus_one";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			await AssertEx.ThrowsAsync<ArgumentOutOfRangeException>(() =>
+				store.ReadStreamEventsBackwardAsync(stream, -2, 100, resolveLinkTos: false));
+		}
+	}
+
+
+	[Test]
+	[Category("Network")]
+	public async Task notify_using_status_code_if_stream_not_found() {
+		const string stream = "read_event_stream_backward_should_notify_using_status_code_if_stream_not_found";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var read = await store.ReadStreamEventsBackwardAsync(stream, StreamPosition.End, 1,
+				resolveLinkTos: false);
+
+			Assert.That(read.Status, Is.EqualTo(SliceReadStatus.StreamNotFound));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task notify_using_status_code_if_stream_was_deleted() {
+		const string stream = "read_event_stream_backward_should_notify_using_status_code_if_stream_was_deleted";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
+
+			var read = await store.ReadStreamEventsBackwardAsync(stream, StreamPosition.End, 1,
+				resolveLinkTos: false);
+
+			Assert.That(read.Status, Is.EqualTo(SliceReadStatus.StreamDeleted));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task return_no_events_when_called_on_empty_stream() {
+		const string stream = "read_event_stream_backward_should_return_single_event_when_called_on_empty_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var read = await store.ReadStreamEventsBackwardAsync(stream, StreamPosition.End, 1,
+				resolveLinkTos: false);
+
+			Assert.That(read.Events.Length, Is.EqualTo(0));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task return_partial_slice_if_no_enough_events_in_stream() {
+		const string stream =
+			"read_event_stream_backward_should_return_partial_slice_if_no_enough_events_in_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var testEvents = Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent((x + 1).ToString()))
+				.ToArray();
+			var write10 = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, testEvents);
+
+			var read = await store.ReadStreamEventsBackwardAsync(stream, 1, 5, resolveLinkTos: false);
+
+			Assert.That(read.Events.Length, Is.EqualTo(2));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task return_events_reversed_compared_to_written() {
+		const string stream = "read_event_stream_backward_should_return_events_reversed_compared_to_written";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var testEvents = Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent((x + 1).ToString()))
+				.ToArray();
+			var write10 = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, testEvents);
+
+			var read = await store.ReadStreamEventsBackwardAsync(stream, StreamPosition.End, testEvents.Length,
+				resolveLinkTos: false);
+
+			Assert.That(EventDataComparer.Equal(testEvents.Reverse().ToArray(),
+				read.Events.Select(x => x.Event).ToArray()));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task be_able_to_read_single_event_from_arbitrary_position() {
+		const string stream =
+			"read_event_stream_backward_should_be_able_to_read_single_event_from_arbitrary_position";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var testEvents = Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent(x.ToString())).ToArray();
+			var write10 = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, testEvents);
+
+			var read = await store.ReadStreamEventsBackwardAsync(stream, 7, 1, resolveLinkTos: false);
+
+			Assert.That(EventDataComparer.Equal(testEvents[7], read.Events.Single().Event));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task be_able_to_read_first_event() {
+		const string stream = "read_event_stream_backward_should_be_able_to_read_first_event";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var testEvents = Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent((x + 1).ToString()))
+				.ToArray();
+			var write10 = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, testEvents);
+
+			var read = await store.ReadStreamEventsBackwardAsync(stream, StreamPosition.Start, 1,
+				resolveLinkTos: false);
+
+			Assert.That(read.Events.Length, Is.EqualTo(1));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task be_able_to_read_last_event() {
+		const string stream = "read_event_stream_backward_should_be_able_to_read_last_event";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var testEvents = Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent(x.ToString())).ToArray();
+			var write10 = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, testEvents);
+
+			var read = await store.ReadStreamEventsBackwardAsync(stream, StreamPosition.End, 1,
+				resolveLinkTos: false);
+
+			Assert.That(EventDataComparer.Equal(testEvents.Last(), read.Events.Single().Event));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task be_able_to_read_slice_from_arbitrary_position() {
+		const string stream = "read_event_stream_backward_should_be_able_to_read_slice_from_arbitrary_position";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var testEvents = Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent(x.ToString())).ToArray();
+			var write10 = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, testEvents);
+
+			var read = await store.ReadStreamEventsBackwardAsync(stream, 3, 2, resolveLinkTos: false);
+
+			Assert.That(EventDataComparer.Equal(testEvents.Skip(2).Take(2).Reverse().ToArray(),
+				read.Events.Select(x => x.Event).ToArray()));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task throw_when_got_int_max_value_as_maxcount() {
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			await AssertEx.ThrowsAsync<ArgumentException>(() =>
+				store.ReadStreamEventsBackwardAsync("foo", StreamPosition.Start, int.MaxValue,
+					resolveLinkTos: false));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/read_event_stream_forward_should.cs b/src/KurrentDB.Core.Tests/ClientAPI/read_event_stream_forward_should.cs
new file mode 100644
index 00000000000..b4b65c80ea1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/read_event_stream_forward_should.cs
@@ -0,0 +1,197 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Globalization;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_event_stream_forward_should<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private MiniNode<TLogFormat, TStreamId> _node;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+	virtual protected IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.Create(node.TcpEndPoint);
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task throw_if_count_le_zero() {
+		const string stream = "read_event_stream_forward_should_throw_if_count_le_zero";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			await AssertEx.ThrowsAsync<ArgumentOutOfRangeException>(() =>
+				store.ReadStreamEventsForwardAsync(stream, 0, 0, resolveLinkTos: false));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task throw_if_start_lt_zero() {
+		const string stream = "read_event_stream_forward_should_throw_if_start_lt_zero";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			await AssertEx.ThrowsAsync<ArgumentOutOfRangeException>(() =>
+				store.ReadStreamEventsForwardAsync(stream, -1, 1, resolveLinkTos: false));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task notify_using_status_code_if_stream_not_found() {
+		const string stream = "read_event_stream_forward_should_notify_using_status_code_if_stream_not_found";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var read = await store.ReadStreamEventsForwardAsync(stream, 0, 1, resolveLinkTos: false);
+
+			Assert.That(read.Status, Is.EqualTo(SliceReadStatus.StreamNotFound));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task notify_using_status_code_if_stream_was_deleted() {
+		const string stream = "read_event_stream_forward_should_notify_using_status_code_if_stream_was_deleted";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var delete = await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
+
+			var read = await store.ReadStreamEventsForwardAsync(stream, 0, 1, resolveLinkTos: false);
+
+			Assert.That(read.Status, Is.EqualTo(SliceReadStatus.StreamDeleted));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task return_no_events_when_called_on_empty_stream() {
+		const string stream = "read_event_stream_forward_should_return_single_event_when_called_on_empty_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var read = await store.ReadStreamEventsForwardAsync(stream, 0, 1, resolveLinkTos: false);
+
+			Assert.That(read.Events.Length, Is.EqualTo(0));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task return_empty_slice_when_called_on_non_existing_range() {
+		const string stream =
+			"read_event_stream_forward_should_return_empty_slice_when_called_on_non_existing_range";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var write10 = await store.AppendToStreamAsync(stream,
+				ExpectedVersion.NoStream,
+				Enumerable.Range(0, 10).Select(x =>
+					TestEvent.NewTestEvent((x + 1).ToString(CultureInfo.InvariantCulture))));
+
+			var read = await store.ReadStreamEventsForwardAsync(stream, 11, 5, resolveLinkTos: false);
+
+			Assert.That(read.Events.Length, Is.EqualTo(0));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task return_partial_slice_if_not_enough_events_in_stream() {
+		const string stream = "read_event_stream_forward_should_return_partial_slice_if_no_enough_events_in_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var write10 = await store.AppendToStreamAsync(stream,
+				ExpectedVersion.NoStream,
+				Enumerable.Range(0, 10).Select(x =>
+					TestEvent.NewTestEvent((x + 1).ToString(CultureInfo.InvariantCulture))));
+
+			var read = await store.ReadStreamEventsForwardAsync(stream, 9, 5, resolveLinkTos: false);
+
+			Assert.That(read.Events.Length, Is.EqualTo(1));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task throw_when_got_int_max_value_as_maxcount() {
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			await AssertEx.ThrowsAsync<ArgumentException>(() =>
+				store.ReadStreamEventsForwardAsync("foo", StreamPosition.Start, int.MaxValue,
+					resolveLinkTos: false));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task return_events_in_same_order_as_written() {
+		const string stream = "read_event_stream_forward_should_return_events_in_same_order_as_written";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var testEvents = Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent(x.ToString())).ToArray();
+			var write10 = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, testEvents);
+
+			var read = await store.ReadStreamEventsForwardAsync(stream, StreamPosition.Start, testEvents.Length,
+				resolveLinkTos: false);
+
+			Assert.That(EventDataComparer.Equal(testEvents, read.Events.Select(x => x.Event).ToArray()));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task be_able_to_read_single_event_from_arbitrary_position() {
+		const string stream = "read_event_stream_forward_should_be_able_to_read_from_arbitrary_position";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var testEvents = Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent(x.ToString())).ToArray();
+			var write10 = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, testEvents);
+
+			var read = await store.ReadStreamEventsForwardAsync(stream, 5, 1, resolveLinkTos: false);
+
+			Assert.That(EventDataComparer.Equal(testEvents[5], read.Events.Single().Event));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task be_able_to_read_slice_from_arbitrary_position() {
+		const string stream = "read_event_stream_forward_should_be_able_to_read_slice_from_arbitrary_position";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var testEvents = Enumerable.Range(0, 10).Select(x => TestEvent.NewTestEvent(x.ToString())).ToArray();
+			var write10 = await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, testEvents);
+
+			var read = await store.ReadStreamEventsForwardAsync(stream, 5, 2, resolveLinkTos: false);
+
+			Assert.That(EventDataComparer.Equal(testEvents.Skip(5).Take(2).ToArray(),
+				read.Events.Select(x => x.Event).ToArray()));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/read_event_with_hash_collision.cs b/src/KurrentDB.Core.Tests/ClientAPI/read_event_with_hash_collision.cs
new file mode 100644
index 00000000000..5561868bf69
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/read_event_with_hash_collision.cs
@@ -0,0 +1,79 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Hash collisions cannot occur in Log V3")]
+public class read_event_with_hash_collision<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private MiniNode<TLogFormat, TStreamId> _node;
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.To(node, TcpType.Ssl);
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName,
+			inMemDb: false,
+			memTableSize: 20,
+			hashCollisionReadLimit: 1,
+			indexBitnessVersion: PTableVersions.IndexV4,
+			hash32bit: true,
+			streamExistenceFilterSize: 0);
+		await _node.Start();
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public async Task should_return_not_found() {
+		const string stream1 = "account--696193173";
+		const string stream2 = "LPN-FC002_LPK51001";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			//Write event to stream 1
+			Assert.AreEqual(0,
+				(await store.AppendToStreamAsync(stream1, ExpectedVersion.NoStream,
+					new EventData(Guid.NewGuid(), "TestEvent", true, null, null))).NextExpectedVersion);
+			//Write 100 events to stream 2 which will have the same hash as stream 1.
+			for (int i = 0; i < 100; i++) {
+				Assert.AreEqual(i,
+					(await store.AppendToStreamAsync(stream2, ExpectedVersion.Any,
+						new EventData(Guid.NewGuid(), "TestEvent", true, null, null))).NextExpectedVersion);
+			}
+		}
+
+		var tcpPort = _node.TcpEndPoint.Port;
+		var httpPort = _node.HttpEndPoint.Port;
+		await _node.Shutdown(keepDb: true);
+
+		//Restart the node to ensure the read index stream info cache is empty
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName,
+			tcpPort, httpPort, inMemDb: false,
+			memTableSize: 20,
+			hashCollisionReadLimit: 1,
+			indexBitnessVersion: PTableVersions.IndexV4,
+			hash32bit: true,
+			streamExistenceFilterSize: 0);
+		await _node.Start();
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			Assert.AreEqual(EventReadStatus.NoStream, (await store.ReadEventAsync(stream1, 0, true)).Status);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/read_from_persistent_subscription_with_link_resolution_when_stream_name_contains_at_symbol.cs b/src/KurrentDB.Core.Tests/ClientAPI/read_from_persistent_subscription_with_link_resolution_when_stream_name_contains_at_symbol.cs
new file mode 100644
index 00000000000..d46af4d9f3e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/read_from_persistent_subscription_with_link_resolution_when_stream_name_contains_at_symbol.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using NUnit.Framework;
+using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("LongRunning"), Category("ClientAPI")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_from_persistent_subscription_with_link_resolution_when_stream_name_contains_at_symbol<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private string _result;
+
+	protected override async Task When() {
+		var task = new TaskCompletionSource<string>();
+
+		var setts = PersistentSubscriptionSettings.Create()
+			.ResolveLinkTos()
+			.StartFromBeginning();
+
+		await _conn.CreatePersistentSubscriptionAsync("link", "Agroup", setts, DefaultData.AdminCredentials);
+		await _conn.ConnectToPersistentSubscriptionAsync(
+			"link",
+			"Agroup",
+			(sub, @event) => {
+				var data = Encoding.Default.GetString(@event.Event.Data);
+				task.TrySetResult(data);
+				return Task.CompletedTask;
+			},
+			(sub, reason, ex) => { }, DefaultData.AdminCredentials);
+
+		await _conn.AppendToStreamAsync("target@me@com", ExpectedVersion.NoStream, TestEvent.NewTestEvent("data", eventName: "AEvent"));
+		await _conn.AppendToStreamAsync("link", ExpectedVersion.NoStream, TestEvent.NewTestEvent("0@target@me@com", eventName: "$>"));
+
+		_result = await Task.WhenAny(task.Task, Task.Delay(TimeSpan.FromSeconds(30)).ContinueWith(_ => "timeout")).Result;
+	}
+
+	[Test]
+	public void the_subscription_resolve_the_link_properly() {
+		Assert.AreEqual(_result, "data");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/read_stream_events_backward_with_hash_collision.cs b/src/KurrentDB.Core.Tests/ClientAPI/read_stream_events_backward_with_hash_collision.cs
new file mode 100644
index 00000000000..7e5cf9478cd
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/read_stream_events_backward_with_hash_collision.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Hash collisions cannot occur in Log V3")]
+public class read_stream_events_backward_with_hash_collision<TLogFormat, TStreamId>
+	: SpecificationWithDirectoryPerTestFixture {
+	private MiniNode<TLogFormat, TStreamId> _node;
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.To(node, TcpType.Ssl);
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName,
+			inMemDb: false,
+			memTableSize: 20,
+			hashCollisionReadLimit: 1,
+			indexBitnessVersion: PTableVersions.IndexV4,
+			hash32bit: true,
+			streamExistenceFilterSize: 0);
+		await _node.Start();
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public async Task should_return_stream_not_found() {
+		const string stream1 = "account--696193173";
+		const string stream2 = "LPN-FC002_LPK51001";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			//Write event to stream 1
+			Assert.AreEqual(0,
+				(await store.AppendToStreamAsync(stream1, ExpectedVersion.NoStream,
+					new EventData(Guid.NewGuid(), "TestEvent", true, null, null))).NextExpectedVersion);
+			//Write 100 events to stream 2 which will have the same hash as stream 1.
+			for (int i = 0; i < 100; i++) {
+				Assert.AreEqual(i,
+					(await store.AppendToStreamAsync(stream2, ExpectedVersion.Any,
+						new EventData(Guid.NewGuid(), "TestEvent", true, null, null))).NextExpectedVersion);
+			}
+		}
+
+		var tcpPort = _node.TcpEndPoint.Port;
+		var httpPort = _node.HttpEndPoint.Port;
+		await _node.Shutdown(keepDb: true);
+
+		//Restart the node to ensure the read index stream info cache is empty
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName,
+			tcpPort, httpPort, inMemDb: false,
+			memTableSize: 20,
+			hashCollisionReadLimit: 1,
+			indexBitnessVersion: PTableVersions.IndexV4,
+			hash32bit: true,
+			streamExistenceFilterSize: 0);
+		await _node.Start();
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			Assert.AreEqual(SliceReadStatus.StreamNotFound,
+				(await store.ReadStreamEventsBackwardAsync(stream1, 0, 1, true)).Status);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/read_stream_events_forward_with_hash_collision.cs b/src/KurrentDB.Core.Tests/ClientAPI/read_stream_events_forward_with_hash_collision.cs
new file mode 100644
index 00000000000..e5fa4d611a5
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/read_stream_events_forward_with_hash_collision.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Hash collisions cannot occur in Log V3")]
+public class read_stream_events_forward_with_hash_collision<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private MiniNode<TLogFormat, TStreamId> _node;
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.To(node, TcpType.Ssl);
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName,
+			inMemDb: false,
+			memTableSize: 20,
+			hashCollisionReadLimit: 1,
+			indexBitnessVersion: PTableVersions.IndexV4,
+			hash32bit: true,
+			streamExistenceFilterSize: 0);
+		await _node.Start();
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public async Task should_return_stream_not_found() {
+		const string stream1 = "account--696193173";
+		const string stream2 = "LPN-FC002_LPK51001";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			//Write event to stream 1
+			Assert.AreEqual(0,
+				(await store.AppendToStreamAsync(stream1, ExpectedVersion.NoStream,
+					new EventData(Guid.NewGuid(), "TestEvent", true, null, null))).NextExpectedVersion);
+			//Write 100 events to stream 2 which will have the same hash as stream 1.
+			for (int i = 0; i < 100; i++) {
+				Assert.AreEqual(i,
+					(await store.AppendToStreamAsync(stream2, ExpectedVersion.Any,
+						new EventData(Guid.NewGuid(), "TestEvent", true, null, null))).NextExpectedVersion);
+			}
+		}
+
+		var tcpPort = _node.TcpEndPoint.Port;
+		var httpPort = _node.HttpEndPoint.Port;
+		await _node.Shutdown(keepDb: true);
+
+		//Restart the node to ensure the read index stream info cache is empty
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName,
+			tcpPort, httpPort, inMemDb: false,
+			memTableSize: 20,
+			hashCollisionReadLimit: 1,
+			indexBitnessVersion: PTableVersions.IndexV4,
+			hash32bit: true,
+			streamExistenceFilterSize: 0);
+		await _node.Start();
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			Assert.AreEqual(SliceReadStatus.StreamNotFound,
+				(await store.ReadStreamEventsForwardAsync(stream1, 0, 1, true)).Status);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/read_stream_events_with_unresolved_linkto.cs b/src/KurrentDB.Core.Tests/ClientAPI/read_stream_events_with_unresolved_linkto.cs
new file mode 100644
index 00000000000..6f6bce5a693
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/read_stream_events_with_unresolved_linkto.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using NUnit.Framework;
+using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
+using StreamMetadata = EventStore.ClientAPI.StreamMetadata;
+using SystemEventTypes = EventStore.ClientAPI.Common.SystemEventTypes;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_stream_events_with_unresolved_linkto<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private EventData[] _testEvents;
+
+	protected override async Task When() {
+		await _conn.SetStreamMetadataAsync(
+				"$all", -1, StreamMetadata.Build().SetReadRole(SystemRoles.All),
+				new UserCredentials(SystemUsers.Admin, SystemUsers.DefaultAdminPassword));
+
+		_testEvents = Enumerable.Range(0, 20).Select(x => TestEvent.NewTestEvent(x.ToString())).ToArray();
+		await _conn.AppendToStreamAsync("stream", ExpectedVersion.NoStream, _testEvents);
+		await _conn.AppendToStreamAsync(
+				"links", ExpectedVersion.NoStream,
+				new EventData(
+					Guid.NewGuid(), SystemEventTypes.LinkTo, false,
+					Encoding.UTF8.GetBytes("0@stream"), null));
+		await _conn.DeleteStreamAsync("stream", ExpectedVersion.Any);
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task ensure_deleted_stream() {
+		var res = await _conn.ReadStreamEventsForwardAsync("stream", 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.StreamNotFound, res.Status);
+		Assert.AreEqual(0, res.Events.Length);
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task returns_unresolved_linkto() {
+		var read = await _conn.ReadStreamEventsForwardAsync("links", 0, 1, true);
+		Assert.AreEqual(1, read.Events.Length);
+		Assert.IsNull(read.Events[0].Event);
+		Assert.IsNotNull(read.Events[0].Link);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/soft_delete.cs b/src/KurrentDB.Core.Tests/ClientAPI/soft_delete.cs
new file mode 100644
index 00000000000..874b3827cf2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/soft_delete.cs
@@ -0,0 +1,371 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using EventStore.ClientAPI.Internal;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class soft_delete<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private MiniNode<TLogFormat, TStreamId> _node;
+	private IEventStoreConnection _conn;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+
+		_conn = BuildConnection(_node);
+		await _conn.ConnectAsync();
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		_conn.Close();
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return EventStoreConnection.Create(
+			ConnectionSettings.Create().DisableServerCertificateValidation().Build(),
+			node.TcpEndPoint.ToESTcpUri());
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task soft_deleted_stream_returns_no_stream_and_no_events_on_read() {
+		const string stream = "soft_deleted_stream_returns_no_stream_and_no_events_on_read";
+
+		Assert.AreEqual(1,
+			(await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(),
+				TestEvent.NewTestEvent())).NextExpectedVersion);
+		await _conn.DeleteStreamAsync(stream, 1);
+
+		var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.StreamNotFound, res.Status);
+		Assert.AreEqual(0, res.Events.Length);
+		Assert.AreEqual(1, res.LastEventNumber);
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task soft_deleted_stream_allows_recreation_when_expver_any() {
+		const string stream = "soft_deleted_stream_allows_recreation_when_expver_any";
+
+		Assert.AreEqual(1,
+			(await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(),
+				TestEvent.NewTestEvent())).NextExpectedVersion);
+		await _conn.DeleteStreamAsync(stream, 1);
+
+		var events = new[] { TestEvent.NewTestEvent(), TestEvent.NewTestEvent(), TestEvent.NewTestEvent() };
+		Assert.AreEqual(4,
+			(await _conn.AppendToStreamAsync(stream, ExpectedVersion.Any, events)).NextExpectedVersion);
+
+		await Task.Delay(50); //TODO: This is a workaround until github issue #1744 is fixed
+
+		var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(events.Select(x => x.EventId), res.Events.Select(x => x.OriginalEvent.EventId));
+		Assert.AreEqual(new[] { 2, 3, 4 }, res.Events.Select(x => x.OriginalEvent.EventNumber));
+
+		var meta = await _conn.GetStreamMetadataAsync(stream);
+		Assert.AreEqual(2, meta.StreamMetadata.TruncateBefore);
+		Assert.AreEqual(1, meta.MetastreamVersion);
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task soft_deleted_stream_allows_recreation_when_expver_no_stream() {
+		const string stream = "soft_deleted_stream_allows_recreation_when_expver_no_stream";
+
+		Assert.AreEqual(1,
+			(await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(),
+				TestEvent.NewTestEvent())).NextExpectedVersion);
+		await _conn.DeleteStreamAsync(stream, 1);
+
+		var events = new[] { TestEvent.NewTestEvent(), TestEvent.NewTestEvent(), TestEvent.NewTestEvent() };
+		Assert.AreEqual(4,
+			(await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, events)).NextExpectedVersion);
+
+		await Task.Delay(50); //TODO: This is a workaround until github issue #1744 is fixed
+
+		var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(events.Select(x => x.EventId), res.Events.Select(x => x.OriginalEvent.EventId));
+		Assert.AreEqual(new[] { 2, 3, 4 }, res.Events.Select(x => x.OriginalEvent.EventNumber));
+
+		var meta = await _conn.GetStreamMetadataAsync(stream);
+		Assert.AreEqual(2, meta.StreamMetadata.TruncateBefore);
+		Assert.AreEqual(1, meta.MetastreamVersion);
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task soft_deleted_stream_allows_recreation_when_expver_is_exact() {
+		const string stream = "soft_deleted_stream_allows_recreation_when_expver_is_exact";
+
+		Assert.AreEqual(1,
+			(await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(),
+				TestEvent.NewTestEvent())).NextExpectedVersion);
+		await _conn.DeleteStreamAsync(stream, 1);
+
+		var events = new[] { TestEvent.NewTestEvent(), TestEvent.NewTestEvent(), TestEvent.NewTestEvent() };
+		Assert.AreEqual(4, (await _conn.AppendToStreamAsync(stream, 1, events)).NextExpectedVersion);
+
+		await Task.Delay(50); //TODO: This is a workaround until github issue #1744 is fixed
+
+		var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(events.Select(x => x.EventId), res.Events.Select(x => x.OriginalEvent.EventId));
+		Assert.AreEqual(new[] { 2, 3, 4 }, res.Events.Select(x => x.OriginalEvent.EventNumber));
+
+		var meta = await _conn.GetStreamMetadataAsync(stream);
+		Assert.AreEqual(2, meta.StreamMetadata.TruncateBefore);
+		Assert.AreEqual(1, meta.MetastreamVersion);
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task soft_deleted_stream_when_recreated_preserves_metadata_except_truncatebefore() {
+		const string stream = "soft_deleted_stream_when_recreated_preserves_metadata_except_truncatebefore";
+
+		Assert.AreEqual(1,
+			(await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(),
+				TestEvent.NewTestEvent())).NextExpectedVersion);
+
+		Assert.AreEqual(0, (await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetTruncateBefore(long.MaxValue)
+				.SetMaxCount(100)
+				.SetDeleteRole("some-role")
+				.SetCustomProperty("key1", true)
+				.SetCustomProperty("key2", 17)
+				.SetCustomProperty("key3", "some value"))).NextExpectedVersion);
+
+		var events = new[] { TestEvent.NewTestEvent(), TestEvent.NewTestEvent(), TestEvent.NewTestEvent() };
+		Assert.AreEqual(4, (await _conn.AppendToStreamAsync(stream, 1, events)).NextExpectedVersion);
+		await Task.Delay(50); //TODO: This is a workaround until github issue #1744 is fixed
+
+		var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(events.Select(x => x.EventId), res.Events.Select(x => x.OriginalEvent.EventId));
+		Assert.AreEqual(new[] { 2, 3, 4 }, res.Events.Select(x => x.OriginalEvent.EventNumber));
+
+		var meta = await _conn.GetStreamMetadataAsync(stream);
+		Assert.AreEqual(1, meta.MetastreamVersion);
+		Assert.AreEqual(2, meta.StreamMetadata.TruncateBefore);
+		Assert.AreEqual(100, meta.StreamMetadata.MaxCount);
+		Assert.AreEqual("some-role", meta.StreamMetadata.Acl.DeleteRole);
+		Assert.AreEqual(true, meta.StreamMetadata.GetValue<bool>("key1"));
+		Assert.AreEqual(17, meta.StreamMetadata.GetValue<int>("key2"));
+		Assert.AreEqual("some value", meta.StreamMetadata.GetValue<string>("key3"));
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task soft_deleted_stream_can_be_hard_deleted() {
+		const string stream = "soft_deleted_stream_can_be_deleted";
+
+		Assert.AreEqual(1,
+			actual: (await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(),
+				TestEvent.NewTestEvent())).NextExpectedVersion);
+		await _conn.DeleteStreamAsync(stream, 1);
+		await _conn.DeleteStreamAsync(stream, ExpectedVersion.Any, hardDelete: true);
+
+		var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.StreamDeleted, res.Status);
+		var meta = await _conn.GetStreamMetadataAsync(stream);
+		Assert.AreEqual(true, meta.IsStreamDeleted);
+
+		await AssertEx.ThrowsAsync<StreamDeletedException>(() =>
+			_conn.AppendToStreamAsync(stream, ExpectedVersion.Any, TestEvent.NewTestEvent()));
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task soft_deleted_stream_allows_recreation_only_for_first_write() {
+		const string stream = "soft_deleted_stream_allows_recreation_only_for_first_write";
+
+		Assert.AreEqual(1,
+			(await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(),
+				TestEvent.NewTestEvent())).NextExpectedVersion);
+		await _conn.DeleteStreamAsync(stream, 1);
+
+		var events = new[] { TestEvent.NewTestEvent(), TestEvent.NewTestEvent(), TestEvent.NewTestEvent() };
+		Assert.AreEqual(4,
+			(await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, events)).NextExpectedVersion);
+		await Task.Delay(50); //TODO: This is a workaround until github issue #1744 is fixed
+
+		await AssertEx.ThrowsAsync<WrongExpectedVersionException>(() =>
+			_conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent()));
+
+		var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(events.Select(x => x.EventId), res.Events.Select(x => x.OriginalEvent.EventId));
+		Assert.AreEqual(new[] { 2, 3, 4 }, res.Events.Select(x => x.OriginalEvent.EventNumber));
+
+		var meta = await _conn.GetStreamMetadataAsync(stream);
+		Assert.AreEqual(2, meta.StreamMetadata.TruncateBefore);
+		Assert.AreEqual(1, meta.MetastreamVersion);
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task soft_deleted_stream_appends_both_writes_when_expver_any() {
+		const string stream = "soft_deleted_stream_appends_both_concurrent_writes_when_expver_any";
+
+		Assert.AreEqual(1,
+			(await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(),
+				TestEvent.NewTestEvent())).NextExpectedVersion);
+		await _conn.DeleteStreamAsync(stream, 1);
+
+		var events1 = new[] { TestEvent.NewTestEvent(), TestEvent.NewTestEvent(), TestEvent.NewTestEvent() };
+		var events2 = new[] { TestEvent.NewTestEvent(), TestEvent.NewTestEvent() };
+		Assert.AreEqual(4,
+			(await _conn.AppendToStreamAsync(stream, ExpectedVersion.Any, events1)).NextExpectedVersion);
+		await Task.Delay(50); //TODO: This is a workaround until github issue #1744 is fixed
+
+		Assert.AreEqual(6,
+			(await _conn.AppendToStreamAsync(stream, ExpectedVersion.Any, events2)).NextExpectedVersion);
+
+		var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(6, res.LastEventNumber);
+		Assert.AreEqual(5, res.Events.Length);
+		Assert.AreEqual(events1.Concat(events2).Select(x => x.EventId),
+			res.Events.Select(x => x.OriginalEvent.EventId));
+		Assert.AreEqual(new[] { 2, 3, 4, 5, 6 }, res.Events.Select(x => x.OriginalEvent.EventNumber));
+
+		var meta = await _conn.GetStreamMetadataAsync(stream);
+		Assert.AreEqual(2, meta.StreamMetadata.TruncateBefore);
+		Assert.AreEqual(1, meta.MetastreamVersion);
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task
+		setting_json_metadata_on_empty_soft_deleted_stream_recreates_stream_not_overriding_metadataAsync() {
+		const string stream =
+			"setting_json_metadata_on_empty_soft_deleted_stream_recreates_stream_not_overriding_metadata";
+
+		await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.Any, StreamMetadata.Build()
+			.SetTruncateBefore(long.MaxValue));
+
+		Assert.AreEqual(1, (await _conn.SetStreamMetadataAsync(stream, 0,
+			StreamMetadata.Build().SetMaxCount(100)
+				.SetDeleteRole("some-role")
+				.SetCustomProperty("key1", true)
+				.SetCustomProperty("key2", 17)
+				.SetCustomProperty("key3", "some value"))).NextExpectedVersion);
+
+		await Task.Delay(50); //TODO: This is a workaround until github issue #1744 is fixed
+
+		var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.StreamNotFound, res.Status);
+		Assert.AreEqual(-1, res.LastEventNumber);
+		Assert.AreEqual(0, res.Events.Length);
+
+		var meta = await _conn.GetStreamMetadataAsync(stream);
+		Assert.AreEqual(2, meta.MetastreamVersion);
+		Assert.AreEqual(0, meta.StreamMetadata.TruncateBefore);
+		Assert.AreEqual(100, meta.StreamMetadata.MaxCount);
+		Assert.AreEqual("some-role", meta.StreamMetadata.Acl.DeleteRole);
+		Assert.AreEqual(true, meta.StreamMetadata.GetValue<bool>("key1"));
+		Assert.AreEqual(17, meta.StreamMetadata.GetValue<int>("key2"));
+		Assert.AreEqual("some value", meta.StreamMetadata.GetValue<string>("key3"));
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task
+		setting_json_metadata_on_nonempty_soft_deleted_stream_recreates_stream_not_overriding_metadataAsync() {
+		const string stream =
+			"setting_json_metadata_on_nonempty_soft_deleted_stream_recreates_stream_not_overriding_metadata";
+
+		Assert.AreEqual(1,
+			(await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(),
+				TestEvent.NewTestEvent())).NextExpectedVersion);
+		await _conn.DeleteStreamAsync(stream, 1, hardDelete: false);
+
+		Assert.AreEqual(1, (await _conn.SetStreamMetadataAsync(stream, 0,
+			StreamMetadata.Build().SetMaxCount(100)
+				.SetDeleteRole("some-role")
+				.SetCustomProperty("key1", true)
+				.SetCustomProperty("key2", 17)
+				.SetCustomProperty("key3", "some value"))).NextExpectedVersion);
+
+		await Task.Delay(50); //TODO: This is a workaround until github issue #1744 is fixed
+
+		var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(1, res.LastEventNumber);
+		Assert.AreEqual(0, res.Events.Length);
+
+		var meta = await _conn.GetStreamMetadataAsync(stream);
+		Assert.AreEqual(2, meta.MetastreamVersion);
+		Assert.AreEqual(2, meta.StreamMetadata.TruncateBefore);
+		Assert.AreEqual(100, meta.StreamMetadata.MaxCount);
+		Assert.AreEqual("some-role", meta.StreamMetadata.Acl.DeleteRole);
+		Assert.AreEqual(true, meta.StreamMetadata.GetValue<bool>("key1"));
+		Assert.AreEqual(17, meta.StreamMetadata.GetValue<int>("key2"));
+		Assert.AreEqual("some value", meta.StreamMetadata.GetValue<string>("key3"));
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task
+		setting_nonjson_metadata_on_empty_soft_deleted_stream_recreates_stream_keeping_original_metadataAsync() {
+		const string stream =
+			"setting_nonjson_metadata_on_empty_soft_deleted_stream_recreates_stream_overriding_metadata";
+
+		await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.Any, StreamMetadata.Build()
+			.SetTruncateBefore(long.MaxValue));
+
+		Assert.AreEqual(1, (await _conn.SetStreamMetadataAsync(stream, 0, new byte[256])).NextExpectedVersion);
+
+		await Task.Delay(50); //TODO: This is a workaround until github issue #1744 is fixed
+
+		var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.StreamNotFound, res.Status);
+		Assert.AreEqual(-1, res.LastEventNumber);
+		Assert.AreEqual(0, res.Events.Length);
+
+		var meta = await _conn.GetStreamMetadataAsRawBytesAsync(stream);
+		Assert.AreEqual(1, meta.MetastreamVersion);
+		Assert.AreEqual(new byte[256], meta.StreamMetadata);
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task
+		setting_nonjson_metadata_on_nonempty_soft_deleted_stream_recreates_stream_keeping_original_metadataAsync() {
+		const string stream =
+			"setting_nonjson_metadata_on_nonempty_soft_deleted_stream_recreates_stream_overriding_metadata";
+
+		Assert.AreEqual(1,
+			(await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(),
+				TestEvent.NewTestEvent())).NextExpectedVersion);
+		await _conn.DeleteStreamAsync(stream, 1, hardDelete: false);
+
+		Assert.AreEqual(1, (await _conn.SetStreamMetadataAsync(stream, 0, new byte[256])).NextExpectedVersion);
+		await Task.Delay(50); //TODO: This is a workaround until github issue #1744 is fixed
+
+		var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(1, res.LastEventNumber);
+		Assert.AreEqual(2, res.Events.Length);
+		Assert.AreEqual(new[] { 0, 1 }, res.Events.Select(x => x.OriginalEventNumber).ToArray());
+
+		var meta = await _conn.GetStreamMetadataAsRawBytesAsync(stream);
+		Assert.AreEqual(1, meta.MetastreamVersion);
+		Assert.AreEqual(new byte[256], meta.StreamMetadata);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/subscribe_should.cs b/src/KurrentDB.Core.Tests/ClientAPI/subscribe_should.cs
new file mode 100644
index 00000000000..cbfef5fe118
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/subscribe_should.cs
@@ -0,0 +1,113 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class subscribe_should<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private const int Timeout = 10000;
+
+	private MiniNode<TLogFormat, TStreamId> _node;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.Create(node.TcpEndPoint);
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task be_able_to_subscribe_to_non_existing_stream_and_then_catch_new_event() {
+		const string stream =
+			"subscribe_should_be_able_to_subscribe_to_non_existing_stream_and_then_catch_created_event";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var appeared = new CountdownEvent(1);
+			var dropped = new CountdownEvent(1);
+
+			using (await store.SubscribeToStreamAsync(stream, false, (s, x) => {
+				appeared.Signal();
+				return;
+			}, (s, r, e) => dropped.Signal())) {
+				await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
+				Assert.IsTrue(appeared.Wait(Timeout), "Appeared countdown event timed out.");
+			}
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task allow_multiple_subscriptions_to_same_stream() {
+		const string stream = "subscribe_should_allow_multiple_subscriptions_to_same_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var appeared = new CountdownEvent(2);
+			var dropped = new CountdownEvent(2);
+
+			using (await store.SubscribeToStreamAsync(stream, false, (s, x) => {
+				appeared.Signal();
+				return;
+			}, (s, r, e) => dropped.Signal()))
+			using (await store.SubscribeToStreamAsync(stream, false, (s, x) => {
+				appeared.Signal();
+				return;
+			}, (s, r, e) => dropped.Signal())) {
+				await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
+				Assert.IsTrue(appeared.Wait(Timeout), "Appeared countdown event timed out.");
+			}
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task call_dropped_callback_after_unsubscribe_method_call() {
+		const string stream = "subscribe_should_call_dropped_callback_after_unsubscribe_method_call";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var dropped = new CountdownEvent(1);
+			using (var subscription = await store.SubscribeToStreamAsync(stream, false, (s, x) => Task.CompletedTask,
+				(s, r, e) => dropped.Signal())) {
+				subscription.Unsubscribe();
+			}
+
+			Assert.IsTrue(dropped.Wait(Timeout), "Dropped countdown event timed out.");
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task catch_deleted_events_as_well() {
+		const string stream = "subscribe_should_catch_created_and_deleted_events_as_well";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var appeared = new CountdownEvent(1);
+			var dropped = new CountdownEvent(1);
+			using (await store.SubscribeToStreamAsync(stream, false, (s, x) => {
+				appeared.Signal();
+				return;
+			},
+				(s, r, e) => dropped.Signal())) {
+				await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
+				Assert.IsTrue(appeared.Wait(Timeout), "Appeared countdown event timed out.");
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/subscribe_to_all_catching_up_should.cs b/src/KurrentDB.Core.Tests/ClientAPI/subscribe_to_all_catching_up_should.cs
new file mode 100644
index 00000000000..93bc284ed2d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/subscribe_to_all_catching_up_should.cs
@@ -0,0 +1,268 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class subscribe_to_all_catching_up_should<TLogFormat, TStreamId> : SpecificationWithDirectory {
+	private static readonly ILogger Log = Serilog.Log.ForContext<subscribe_to_all_catching_up_should<TLogFormat, TStreamId>>();
+	private static readonly TimeSpan Timeout = TimeSpan.FromSeconds(60);
+
+	private MiniNode<TLogFormat, TStreamId> _node;
+	private IEventStoreConnection _conn;
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+
+		_conn = BuildConnection(_node);
+		await _conn.ConnectAsync();
+		await _conn.SetStreamMetadataAsync("$all", -1,
+			StreamMetadata.Build().SetReadRole(SystemRoles.All),
+			new UserCredentials(SystemUsers.Admin, SystemUsers.DefaultAdminPassword));
+	}
+
+	[TearDown]
+	public override async Task TearDown() {
+		_conn.Close();
+		await _node.Shutdown();
+		await base.TearDown();
+	}
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.Create(node.TcpEndPoint);
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task call_dropped_callback_after_stop_method_call() {
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var dropped = new CountdownEvent(1);
+			var subscription = store.SubscribeToAllFrom(null,
+				CatchUpSubscriptionSettings.Default,
+				(x, y) => Task.CompletedTask,
+				_ => Log.Information("Live processing started."),
+				(x, y, z) => dropped.Signal());
+
+			Assert.IsFalse(dropped.Wait(0));
+			subscription.Stop(Timeout);
+			Assert.IsTrue(dropped.Wait(Timeout));
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task call_dropped_callback_when_an_error_occurs_while_processing_an_event() {
+		const string stream = "call_dropped_callback_when_an_error_occurs_while_processing_an_event";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			await store.AppendToStreamAsync(stream, ExpectedVersion.Any,
+				new EventData(Guid.NewGuid(), "event", false, new byte[3], null));
+
+			var dropped = new CountdownEvent(1);
+			store.SubscribeToAllFrom(null, CatchUpSubscriptionSettings.Default,
+				(x, y) => { throw new Exception("Error"); },
+				_ => Log.Information("Live processing started."),
+				(x, y, z) => dropped.Signal());
+			Assert.IsTrue(dropped.Wait(Timeout));
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task be_able_to_subscribe_to_empty_db() {
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var appeared = new ManualResetEventSlim(false);
+			var dropped = new CountdownEvent(1);
+
+			var subscription = store.SubscribeToAllFrom(null,
+				CatchUpSubscriptionSettings.Default,
+				(_, x) => {
+					if (!SystemStreams.IsSystemStream(x.OriginalEvent.EventStreamId))
+						appeared.Set();
+					return Task.CompletedTask;
+				},
+				_ => Log.Information("Live processing started."),
+				(_, __, ___) => dropped.Signal());
+
+			await Task.Delay(100); // give time for first pull phase
+			await store.SubscribeToAllAsync(false, (s, x) => Task.CompletedTask, (s, r, e) => { });
+			await Task.Delay(100);
+
+			Assert.IsFalse(appeared.Wait(0), "Some event appeared.");
+			Assert.IsFalse(dropped.Wait(0), "Subscription was dropped prematurely.");
+			subscription.Stop(Timeout);
+			Assert.IsTrue(dropped.Wait(Timeout));
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task read_all_existing_events_and_keep_listening_to_new_ones() {
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = new List<ResolvedEvent>();
+			var appeared = new CountdownEvent(20);
+			var dropped = new CountdownEvent(1);
+
+			for (int i = 0; i < 10; ++i) {
+				await store.AppendToStreamAsync("stream-" + i.ToString(), -1,
+					new EventData(Guid.NewGuid(), "et-" + i.ToString(), false, new byte[3], null));
+			}
+
+			var subscription = store.SubscribeToAllFrom(null,
+				CatchUpSubscriptionSettings.Default,
+				(x, y) => {
+					if (!SystemStreams.IsSystemStream(y.OriginalEvent.EventStreamId)) {
+						events.Add(y);
+						appeared.Signal();
+					}
+
+					return Task.CompletedTask;
+				},
+				_ => Log.Information("Live processing started."),
+				(x, y, z) => dropped.Signal());
+			for (int i = 10; i < 20; ++i) {
+				await store.AppendToStreamAsync("stream-" + i.ToString(), -1,
+					new EventData(Guid.NewGuid(), "et-" + i.ToString(), false, new byte[3], null));
+			}
+
+			if (!appeared.Wait(Timeout)) {
+				Assert.IsFalse(dropped.Wait(0), "Subscription was dropped prematurely.");
+				Assert.Fail("Could not wait for all events.");
+			}
+
+			Assert.AreEqual(20, events.Count);
+			for (int i = 0; i < 20; ++i) {
+				Assert.AreEqual("et-" + i.ToString(), events[i].OriginalEvent.EventType);
+			}
+
+			Assert.IsFalse(dropped.Wait(0));
+			subscription.Stop(Timeout);
+			Assert.IsTrue(dropped.Wait(Timeout));
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task filter_events_and_keep_listening_to_new_ones() {
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = new List<ResolvedEvent>();
+			var appeared = new CountdownEvent(10);
+			var dropped = new CountdownEvent(1);
+
+			for (int i = 0; i < 10; ++i) {
+				await store.AppendToStreamAsync("stream-" + i.ToString(), -1,
+					new EventData(Guid.NewGuid(), "et-" + i.ToString(), false, new byte[3], null));
+			}
+
+			var allSlice = await store.ReadAllEventsForwardAsync(Position.Start, 100, false);
+			var lastEvent = allSlice.Events.Last();
+
+			var subscription = store.SubscribeToAllFrom(lastEvent.OriginalPosition,
+				CatchUpSubscriptionSettings.Default,
+				(x, y) => {
+					if (SystemStreams.IsSystemStream(y.Event.EventStreamId)) {
+						return Task.CompletedTask;
+					}
+					events.Add(y);
+					appeared.Signal();
+					return Task.CompletedTask;
+				},
+				_ => Log.Information("Live processing started."),
+				(x, y, z) => {
+					Log.Information("Subscription dropped: {0}, {1}.", y, z);
+					dropped.Signal();
+				});
+
+			for (int i = 10; i < 20; ++i) {
+				await store.AppendToStreamAsync("stream-" + i.ToString(), -1,
+					new EventData(Guid.NewGuid(), "et-" + i.ToString(), false, new byte[3], null));
+			}
+
+			Log.Information("Waiting for events...");
+			if (!appeared.Wait(Timeout)) {
+				Assert.IsFalse(dropped.Wait(0), "Subscription was dropped prematurely.");
+				Assert.Fail("Could not wait for all events.");
+			}
+
+			Log.Information("Events appeared...");
+			Assert.AreEqual(10, events.Count);
+			for (int i = 0; i < 10; ++i) {
+				Assert.AreEqual("et-" + (10 + i).ToString(), events[i].OriginalEvent.EventType);
+			}
+
+			Assert.IsFalse(dropped.Wait(0));
+			subscription.Stop(Timeout);
+			Assert.IsTrue(dropped.Wait(Timeout));
+
+			Assert.AreEqual(events.Last().OriginalPosition, subscription.LastProcessedPosition);
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task filter_events_and_work_if_nothing_was_written_after_subscription() {
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = new List<ResolvedEvent>();
+			var appeared = new CountdownEvent(1);
+			var dropped = new CountdownEvent(1);
+
+			for (int i = 0; i < 10; ++i) {
+				await store.AppendToStreamAsync("stream-" + i.ToString(), -1,
+					new EventData(Guid.NewGuid(), "et-" + i.ToString(), false, new byte[3], null));
+			}
+
+			var allSlice = await store.ReadAllEventsForwardAsync(Position.Start, 100, false);
+			var lastEvent = allSlice.Events[allSlice.Events.Length - 2];
+
+			var subscription = store.SubscribeToAllFrom(lastEvent.OriginalPosition,
+				CatchUpSubscriptionSettings.Default,
+				(x, y) => {
+					events.Add(y);
+					appeared.Signal();
+					return Task.CompletedTask;
+				},
+				_ => Log.Information("Live processing started."),
+				(x, y, z) => {
+					Log.Information("Subscription dropped: {0}, {1}.", y, z);
+					dropped.Signal();
+				});
+
+			Log.Information("Waiting for events...");
+			if (!appeared.Wait(Timeout)) {
+				Assert.IsFalse(dropped.Wait(0), "Subscription was dropped prematurely.");
+				Assert.Fail("Could not wait for all events.");
+			}
+
+			Log.Information("Events appeared...");
+			Assert.AreEqual(1, events.Count);
+			Assert.AreEqual("et-9", events[0].OriginalEvent.EventType);
+
+			Assert.IsFalse(dropped.Wait(0));
+			subscription.Stop(Timeout);
+			Assert.IsTrue(dropped.Wait(Timeout));
+
+			Assert.AreEqual(events.Last().OriginalPosition, subscription.LastProcessedPosition);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/subscribe_to_all_filtered_should.cs b/src/KurrentDB.Core.Tests/ClientAPI/subscribe_to_all_filtered_should.cs
new file mode 100644
index 00000000000..5b4e6bee5a2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/subscribe_to_all_filtered_should.cs
@@ -0,0 +1,258 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning"), NonParallelizable]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class subscribe_to_all_filtered_should<TLogFormat, TStreamId> : SpecificationWithDirectory {
+	private const int Timeout = 10000;
+
+	private MiniNode<TLogFormat, TStreamId> _node;
+	private IEventStoreConnection _conn;
+	private List<EventData> _testEvents;
+	private List<EventData> _fakeSystemEvents;
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+
+		_conn = BuildConnection(_node);
+		await _conn.ConnectAsync();
+		await _conn.SetStreamMetadataAsync("$all", -1,
+			StreamMetadata.Build().SetReadRole(SystemRoles.All),
+			new UserCredentials(SystemUsers.Admin, SystemUsers.DefaultAdminPassword));
+
+		_testEvents = Enumerable
+			.Range(0, 5)
+			.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "AEvent"))
+			.ToList();
+
+		_testEvents.AddRange(
+			Enumerable
+				.Range(0, 5)
+				.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "BEvent")).ToList());
+
+		_fakeSystemEvents = Enumerable
+			.Range(0, 5)
+			.Select(x => TestEvent.NewTestEvent(x.ToString(), eventName: "$systemEvent"))
+			.ToList();
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task only_return_events_with_a_given_stream_prefix() {
+		var filter = Filter.StreamId.Prefix("stream-a");
+		var foundEvents = new List<ResolvedEvent>();
+
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var appeared = new TaskCompletionSource<bool>();
+
+			using (await store.FilteredSubscribeToAllAsync(false, filter, (s, e) => {
+				foundEvents.Add(e);
+				if (foundEvents.Count == 5) {
+					appeared.TrySetResult(true);
+				}
+				return Task.CompletedTask;
+			}, (s, p) => Task.CompletedTask, 100, (_, reason, ex) => appeared.TrySetException(ex))) {
+				await _conn.AppendToStreamAsync("stream-b", ExpectedVersion.NoStream, _testEvents.EvenEvents());
+				await _conn.AppendToStreamAsync("stream-a", ExpectedVersion.NoStream, _testEvents.OddEvents());
+
+				await appeared.Task.WithTimeout(Timeout);
+
+				Assert.True(foundEvents.All(e => e.Event.EventStreamId == "stream-a"));
+			}
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task only_return_events_with_a_given_event_prefix() {
+		var filter = Filter.EventType.Prefix("AE");
+		var foundEvents = new List<ResolvedEvent>();
+
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var appeared = new TaskCompletionSource<bool>();
+
+			using (await store.FilteredSubscribeToAllAsync(false, filter, (s, e) => {
+				if (e.OriginalStreamId == SystemStreams.EventTypesStream)
+					return Task.CompletedTask;
+
+				foundEvents.Add(e);
+				if (foundEvents.Count == 5) {
+					appeared.TrySetResult(true);
+				}
+				return Task.CompletedTask;
+			}, (s, p) => Task.CompletedTask, 100)) {
+				await _conn.AppendToStreamAsync("stream-b", ExpectedVersion.NoStream, _testEvents.EvenEvents());
+				await _conn.AppendToStreamAsync("stream-a", ExpectedVersion.NoStream, _testEvents.OddEvents());
+
+				await appeared.Task.WithTimeout(Timeout);
+
+				Assert.True(foundEvents.All(e => e.Event.EventType == "AEvent"));
+			}
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task only_return_events_that_satisfy_a_given_stream_regex() {
+		var filter = Filter.StreamId.Regex(new Regex(@"^.*eam-b.*$"));
+		var foundEvents = new List<ResolvedEvent>();
+
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var appeared = new TaskCompletionSource<bool>();
+
+			using (await store.FilteredSubscribeToAllAsync(false, filter, (s, e) => {
+				foundEvents.Add(e);
+				if (foundEvents.Count == 5) {
+					appeared.TrySetResult(true);
+				}
+				return Task.CompletedTask;
+			}, (s, p) => Task.CompletedTask, 100)) {
+				await _conn.AppendToStreamAsync("stream-a", ExpectedVersion.NoStream, _testEvents.EvenEvents());
+				await _conn.AppendToStreamAsync("stream-b", ExpectedVersion.NoStream, _testEvents.OddEvents());
+
+				await appeared.Task.WithTimeout(Timeout);
+
+				Assert.True(foundEvents.All(e => e.Event.EventStreamId == "stream-b"));
+			}
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task only_return_events_that_satisfy_a_given_event_regex() {
+		var filter = Filter.EventType.Regex(new Regex(@"^.*BEv.*$"));
+		var foundEvents = new ConcurrentBag<ResolvedEvent>();
+
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var appeared = new TaskCompletionSource<bool>();
+
+			using (await store.FilteredSubscribeToAllAsync(false, filter, (s, e) => {
+				foundEvents.Add(e);
+				if (foundEvents.Count == 5) {
+					appeared.TrySetResult(true);
+				}
+				return Task.CompletedTask;
+			}, (s, p) => Task.CompletedTask, 100)) {
+				await _conn.AppendToStreamAsync("stream-a", ExpectedVersion.NoStream, _testEvents.EvenEvents());
+				await _conn.AppendToStreamAsync("stream-b", ExpectedVersion.NoStream, _testEvents.OddEvents());
+
+				await appeared.Task.WithTimeout(Timeout);
+
+				Assert.True(foundEvents.All(e => e.Event.EventType == "BEvent"));
+			}
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task only_return_events_that_are_not_system_events() {
+		var filter = Filter.ExcludeSystemEvents;
+		var foundEvents = new List<ResolvedEvent>();
+
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var appeared = new TaskCompletionSource<bool>();
+
+			using (await store.FilteredSubscribeToAllAsync(false, filter, (s, e) => {
+				foundEvents.Add(e);
+				if (foundEvents.Count == 5) {
+					appeared.TrySetResult(true);
+				}
+				return Task.CompletedTask;
+			}, (s, p) => Task.CompletedTask, 100)) {
+				await _conn.AppendToStreamAsync("stream-a", ExpectedVersion.NoStream, _fakeSystemEvents);
+				await _conn.AppendToStreamAsync("stream-b", ExpectedVersion.NoStream, _testEvents.EvenEvents());
+
+				await appeared.Task.WithTimeout(Timeout);
+
+				Assert.True(foundEvents.All(e => !e.Event.EventType.StartsWith("$")));
+			}
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task throw_an_exception_if_interval_is_negative() {
+		var filter = Filter.ExcludeSystemEvents;
+
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			Assert.Throws<ArgumentOutOfRangeException>(() => {
+				store.FilteredSubscribeToAllAsync(
+					false,
+					filter,
+					(s, e) => Task.CompletedTask,
+					(s, p) => Task.CompletedTask, 0).Wait();
+			});
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task calls_checkpoint_reached_according_to_checkpoint_message_count() {
+		var filter = Filter.ExcludeSystemEvents;
+
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var appeared = new TaskCompletionSource<bool>();
+			var eventsSeen = new List<ResolvedEvent>();
+			var checkpointsSeen = 0;
+
+			if (LogFormatHelper<TLogFormat, TStreamId>.IsV3) {
+				// init stream and event type records so they won't affect the test
+				await _conn.AppendToStreamAsync("stream-a", ExpectedVersion.NoStream);
+				await _conn.AppendToStreamAsync("init-event-types", ExpectedVersion.NoStream, _testEvents);
+			}
+
+			using (await store.FilteredSubscribeToAllAsync(false,
+				filter,
+				(s, e) => {
+					eventsSeen.Add(e);
+					return Task.CompletedTask;
+				},
+				(s, p) => {
+					if (++checkpointsSeen == 5) {
+						appeared.TrySetResult(true);
+					}
+					return Task.CompletedTask;
+				},
+				checkpointInterval: 2)) {
+
+				await _conn.AppendToStreamAsync("stream-a", ExpectedVersion.NoStream, _testEvents);
+
+				await appeared.Task.WithTimeout(Timeout);
+
+				Assert.AreEqual(5 /*checkpoints*/ * 2 /*considered events*/, eventsSeen.Count);
+				Assert.True(eventsSeen.All(x => x.Event.EventStreamId == "stream-a"));
+			}
+		}
+	}
+
+	[TearDown]
+	public override async Task TearDown() {
+		_conn.Close();
+		await _node.Shutdown();
+		await base.TearDown();
+	}
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.Create(node.TcpEndPoint);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/subscribe_to_all_should.cs b/src/KurrentDB.Core.Tests/ClientAPI/subscribe_to_all_should.cs
new file mode 100644
index 00000000000..4d1058a6a42
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/subscribe_to_all_should.cs
@@ -0,0 +1,90 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class subscribe_to_all_should<TLogFormat, TStreamId> : SpecificationWithDirectory {
+	private const int Timeout = 10000;
+
+	private MiniNode<TLogFormat, TStreamId> _node;
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+
+		using (var connection = BuildConnection(_node)) {
+			await connection.ConnectAsync();
+			await connection.SetStreamMetadataAsync("$all", -1,
+				StreamMetadata.Build().SetReadRole(SystemRoles.All),
+				new UserCredentials(SystemUsers.Admin, SystemUsers.DefaultAdminPassword));
+		}
+	}
+
+	[TearDown]
+	public override async Task TearDown() {
+		await _node.Shutdown();
+		await base.TearDown();
+	}
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.Create(node.TcpEndPoint);
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task allow_multiple_subscriptions() {
+		const string stream = "subscribe_to_all_should_allow_multiple_subscriptions";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var appeared = new CountdownEvent(2);
+			var dropped = new CountdownEvent(2);
+
+			using (await store.SubscribeToAllAsync(false, (s, x) => {
+				appeared.Signal();
+				return;
+			}, (s, r, e) => dropped.Signal()))
+			using (await store.SubscribeToAllAsync(false, (s, x) => {
+				appeared.Signal();
+				return;
+			}, (s, r, e) => dropped.Signal())) {
+				var create =
+					await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
+
+				Assert.IsTrue(appeared.Wait(Timeout), "Appeared countdown event timed out.");
+			}
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task catch_deleted_events_as_well() {
+		const string stream = "subscribe_to_all_should_catch_created_and_deleted_events_as_well";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var appeared = new CountdownEvent(1);
+			var dropped = new CountdownEvent(1);
+
+			using (await store.SubscribeToAllAsync(false, (s, x) => {
+				appeared.Signal();
+				return Task.CompletedTask;
+			},
+				(s, r, e) => dropped.Signal())) {
+				var delete = await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
+
+				Assert.IsTrue(appeared.Wait(Timeout), "Appeared countdown event didn't fire in time.");
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/subscribe_to_stream_catching_up_should.cs b/src/KurrentDB.Core.Tests/ClientAPI/subscribe_to_stream_catching_up_should.cs
new file mode 100644
index 00000000000..e9751d6a8f2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/subscribe_to_stream_catching_up_should.cs
@@ -0,0 +1,325 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class subscribe_to_stream_catching_up_should<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private static readonly ILogger Log =
+		Serilog.Log.ForContext<subscribe_to_stream_catching_up_should<TLogFormat, TStreamId>>();
+
+	private static readonly TimeSpan Timeout = TimeSpan.FromSeconds(500);
+
+	private MiniNode<TLogFormat, TStreamId> _node;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+	virtual protected IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.Create(node.TcpEndPoint);
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task be_able_to_subscribe_to_non_existing_stream() {
+		const string stream = "be_able_to_subscribe_to_non_existing_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var appeared = new ManualResetEventSlim(false);
+			var dropped = new CountdownEvent(1);
+
+			var subscription = store.SubscribeToStreamFrom(stream,
+				null,
+				CatchUpSubscriptionSettings.Default,
+				(_, x) => {
+					appeared.Set();
+					return Task.CompletedTask;
+				},
+				_ => Log.Information("Live processing started."),
+				(_, __, ___) => dropped.Signal());
+
+			await Task.Delay(100); // give time for first pull phase
+			await store.SubscribeToStreamAsync(stream, false, (s, x) => Task.CompletedTask, (s, r, e) => { });
+			await Task.Delay(100);
+			Assert.IsFalse(appeared.Wait(0), "Some event appeared.");
+			Assert.IsFalse(dropped.Wait(0), "Subscription was dropped prematurely.");
+			subscription.Stop(Timeout);
+			Assert.IsTrue(dropped.Wait(Timeout));
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task be_able_to_subscribe_to_non_existing_stream_and_then_catch_event() {
+		const string stream = "be_able_to_subscribe_to_non_existing_stream_and_then_catch_event";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var appeared = new CountdownEvent(1);
+			var dropped = new CountdownEvent(1);
+
+			var subscription = store.SubscribeToStreamFrom(stream,
+				null,
+				CatchUpSubscriptionSettings.Default,
+				(_, x) => {
+					appeared.Signal();
+					return Task.CompletedTask;
+				},
+				_ => Log.Information("Live processing started."),
+				(_, __, ___) => dropped.Signal());
+
+			await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
+
+			if (!appeared.Wait(Timeout)) {
+				Assert.IsFalse(dropped.Wait(0), "Subscription was dropped prematurely.");
+				Assert.Fail("Appeared countdown event timed out.");
+			}
+
+			Assert.IsFalse(dropped.Wait(0));
+			subscription.Stop(Timeout);
+			Assert.IsTrue(dropped.Wait(Timeout));
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task allow_multiple_subscriptions_to_same_stream() {
+		const string stream = "allow_multiple_subscriptions_to_same_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var appeared = new CountdownEvent(2);
+			var dropped1 = new ManualResetEventSlim(false);
+			var dropped2 = new ManualResetEventSlim(false);
+
+			var sub1 = store.SubscribeToStreamFrom(stream,
+				null,
+				CatchUpSubscriptionSettings.Default,
+				(_, e) => {
+					appeared.Signal();
+					return Task.CompletedTask;
+				},
+				_ => Log.Information("Live processing started."),
+				(x, y, z) => dropped1.Set());
+			var sub2 = store.SubscribeToStreamFrom(stream,
+				null,
+				CatchUpSubscriptionSettings.Default,
+				(_, e) => {
+					appeared.Signal();
+					return Task.CompletedTask;
+				},
+				_ => Log.Information("Live processing started."),
+				(x, y, z) => dropped2.Set());
+
+			await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
+
+			if (!appeared.Wait(Timeout)) {
+				Assert.IsFalse(dropped1.Wait(0), "Subscription1 was dropped prematurely.");
+				Assert.IsFalse(dropped2.Wait(0), "Subscription2 was dropped prematurely.");
+				Assert.Fail("Could not wait for all events.");
+			}
+
+			Assert.IsFalse(dropped1.Wait(0));
+			sub1.Stop(Timeout);
+			Assert.IsTrue(dropped1.Wait(Timeout));
+
+			Assert.IsFalse(dropped2.Wait(0));
+			sub2.Stop(Timeout);
+			Assert.IsTrue(dropped2.Wait(Timeout));
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task call_dropped_callback_after_stop_method_call() {
+		const string stream = "call_dropped_callback_after_stop_method_call";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var dropped = new CountdownEvent(1);
+			var subscription = store.SubscribeToStreamFrom(stream,
+				null,
+				CatchUpSubscriptionSettings.Default,
+				(x, y) => Task.CompletedTask,
+				_ => Log.Information("Live processing started."),
+				(x, y, z) => dropped.Signal());
+			Assert.IsFalse(dropped.Wait(0));
+			subscription.Stop(Timeout);
+			Assert.IsTrue(dropped.Wait(Timeout));
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task call_dropped_callback_when_an_error_occurs_while_processing_an_event() {
+		const string stream = "call_dropped_callback_when_an_error_occurs_while_processing_an_event";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			await store.AppendToStreamAsync(stream, ExpectedVersion.Any,
+				new EventData(Guid.NewGuid(), "event", false, new byte[3], null));
+
+			var dropped = new CountdownEvent(1);
+			store.SubscribeToStreamFrom(stream, null,
+				CatchUpSubscriptionSettings.Default,
+				(x, y) => { throw new Exception("Error"); },
+				_ => Log.Information("Live processing started."),
+				(x, y, z) => dropped.Signal());
+			Assert.IsTrue(dropped.Wait(Timeout));
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task read_all_existing_events_and_keep_listening_to_new_ones() {
+		const string stream = "read_all_existing_events_and_keep_listening_to_new_ones";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = new List<ResolvedEvent>();
+			var appeared = new CountdownEvent(20); // events
+			var dropped = new CountdownEvent(1);
+
+			for (int i = 0; i < 10; ++i) {
+				await store.AppendToStreamAsync(stream, i - 1,
+					new EventData(Guid.NewGuid(), "et-" + i.ToString(), false, new byte[3], null));
+			}
+
+			var subscription = store.SubscribeToStreamFrom(stream,
+				null,
+				CatchUpSubscriptionSettings.Default,
+				(x, y) => {
+					events.Add(y);
+					appeared.Signal();
+					return Task.CompletedTask;
+				},
+				_ => Log.Information("Live processing started."),
+				(x, y, z) => dropped.Signal());
+			for (int i = 10; i < 20; ++i) {
+				await store.AppendToStreamAsync(stream, i - 1,
+					new EventData(Guid.NewGuid(), "et-" + i.ToString(), false, new byte[3], null));
+			}
+
+			if (!appeared.Wait(Timeout)) {
+				Assert.IsFalse(dropped.Wait(0), "Subscription was dropped prematurely.");
+				Assert.Fail("Could not wait for all events.");
+			}
+
+			Assert.AreEqual(20, events.Count);
+			for (int i = 0; i < 20; ++i) {
+				Assert.AreEqual("et-" + i.ToString(), events[i].OriginalEvent.EventType);
+			}
+
+			Assert.IsFalse(dropped.Wait(0));
+			subscription.Stop(Timeout);
+			Assert.IsTrue(dropped.Wait(Timeout));
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task filter_events_and_keep_listening_to_new_ones() {
+		const string stream = "filter_events_and_keep_listening_to_new_ones";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = new List<ResolvedEvent>();
+			var appeared = new CountdownEvent(20); // skip first 10 events
+			var dropped = new CountdownEvent(1);
+
+			for (int i = 0; i < 20; ++i) {
+				await store.AppendToStreamAsync(stream, i - 1,
+					new EventData(Guid.NewGuid(), "et-" + i.ToString(), false, new byte[3], null));
+			}
+
+			var subscription = store.SubscribeToStreamFrom(stream,
+				9,
+				CatchUpSubscriptionSettings.Default,
+				(x, y) => {
+					events.Add(y);
+					appeared.Signal();
+					return Task.CompletedTask;
+				},
+				_ => Log.Information("Live processing started."),
+				(x, y, z) => dropped.Signal());
+			for (int i = 20; i < 30; ++i) {
+				await store.AppendToStreamAsync(stream, i - 1,
+					new EventData(Guid.NewGuid(), "et-" + i.ToString(), false, new byte[3], null));
+			}
+
+			if (!appeared.Wait(Timeout)) {
+				Assert.IsFalse(dropped.Wait(0), "Subscription was dropped prematurely.");
+				Assert.Fail("Could not wait for all events.");
+			}
+
+			Assert.AreEqual(20, events.Count);
+			for (int i = 0; i < 20; ++i) {
+				Assert.AreEqual("et-" + (i + 10).ToString(), events[i].OriginalEvent.EventType);
+			}
+
+			Assert.IsFalse(dropped.Wait(0));
+			subscription.Stop(Timeout);
+			Assert.IsTrue(dropped.Wait(Timeout));
+
+			Assert.AreEqual(events.Last().OriginalEventNumber, subscription.LastProcessedEventNumber);
+
+			subscription.Stop(TimeSpan.FromSeconds(0));
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task filter_events_and_work_if_nothing_was_written_after_subscription() {
+		const string stream = "filter_events_and_work_if_nothing_was_written_after_subscription";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var events = new List<ResolvedEvent>();
+			var appeared = new CountdownEvent(10);
+			var dropped = new CountdownEvent(1);
+
+			for (int i = 0; i < 20; ++i) {
+				await store.AppendToStreamAsync(stream, i - 1,
+					new EventData(Guid.NewGuid(), "et-" + i.ToString(), false, new byte[3], null));
+			}
+
+			var subscription = store.SubscribeToStreamFrom(stream,
+				9,
+				CatchUpSubscriptionSettings.Default,
+				(x, y) => {
+					events.Add(y);
+					appeared.Signal();
+					return Task.CompletedTask;
+				},
+				_ => Log.Information("Live processing started."),
+				(x, y, z) => dropped.Signal());
+			if (!appeared.Wait(Timeout)) {
+				Assert.IsFalse(dropped.Wait(0), "Subscription was dropped prematurely.");
+				Assert.Fail("Could not wait for all events.");
+			}
+
+			Assert.AreEqual(10, events.Count);
+			for (int i = 0; i < 10; ++i) {
+				Assert.AreEqual("et-" + (i + 10).ToString(), events[i].OriginalEvent.EventType);
+			}
+
+			Assert.IsFalse(dropped.Wait(0));
+			subscription.Stop(Timeout);
+			Assert.IsTrue(dropped.Wait(Timeout));
+
+			Assert.AreEqual(events.Last().OriginalEventNumber, subscription.LastProcessedEventNumber);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/transaction.cs b/src/KurrentDB.Core.Tests/ClientAPI/transaction.cs
new file mode 100644
index 00000000000..0381edce7e7
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/transaction.cs
@@ -0,0 +1,243 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class Transaction<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private MiniNode<TLogFormat, TStreamId> _node;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.Create(node.TcpEndPoint);
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task should_start_on_non_existing_stream_with_correct_exp_ver_and_create_stream_on_commit() {
+		const string stream =
+			"should_start_on_non_existing_stream_with_correct_exp_ver_and_create_stream_on_commit";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			using (var transaction = await store.StartTransactionAsync(stream, ExpectedVersion.NoStream)) {
+				await transaction.WriteAsync(TestEvent.NewTestEvent());
+				Assert.AreEqual(0, (await transaction.CommitAsync()).NextExpectedVersion);
+			}
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task should_start_on_non_existing_stream_with_exp_ver_any_and_create_stream_on_commit() {
+		const string stream = "should_start_on_non_existing_stream_with_exp_ver_any_and_create_stream_on_commit";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			using (var transaction = await store.StartTransactionAsync(stream, ExpectedVersion.Any)) {
+				await transaction.WriteAsync(TestEvent.NewTestEvent());
+				Assert.AreEqual(0, (await transaction.CommitAsync()).NextExpectedVersion);
+			}
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task should_fail_to_commit_non_existing_stream_with_wrong_exp_ver() {
+		const string stream = "should_fail_to_commit_non_existing_stream_with_wrong_exp_ver";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			using (var transaction = await store.StartTransactionAsync(stream, 1)) {
+				await transaction.WriteAsync(TestEvent.NewTestEvent());
+				await AssertEx.ThrowsAsync<WrongExpectedVersionException>(() => transaction.CommitAsync());
+			}
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task should_do_nothing_if_commits_no_events_to_empty_stream() {
+		const string stream = "should_do_nothing_if_commits_no_events_to_empty_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			using (var transaction = await store.StartTransactionAsync(stream, ExpectedVersion.NoStream)) {
+				Assert.AreEqual(-1, (await transaction.CommitAsync()).NextExpectedVersion);
+			}
+
+			var result = await store.ReadStreamEventsForwardAsync(stream, 0, 1, resolveLinkTos: false);
+			Assert.That(result.Events.Length, Is.EqualTo(0));
+		}
+	}
+
+	[Test, Category("Network")]
+	public async Task should_do_nothing_if_transactionally_writing_no_events_to_empty_stream() {
+		const string stream = "should_do_nothing_if_transactionally_writing_no_events_to_empty_stream";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			using (var transaction = await store.StartTransactionAsync(stream, ExpectedVersion.NoStream)) {
+				await transaction.WriteAsync();
+				Assert.AreEqual(-1, (await transaction.CommitAsync()).NextExpectedVersion);
+			}
+
+			var result = await store.ReadStreamEventsForwardAsync(stream, 0, 1, resolveLinkTos: false);
+			Assert.That(result.Events.Length, Is.EqualTo(0));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task should_validate_expectations_on_commit() {
+		const string stream = "should_validate_expectations_on_commit";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			using (var transaction = await store.StartTransactionAsync(stream, 100500)) {
+				await transaction.WriteAsync(TestEvent.NewTestEvent());
+				await AssertEx.ThrowsAsync<WrongExpectedVersionException>(() => transaction.CommitAsync());
+			}
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task should_commit_when_writing_with_exp_ver_any_even_while_somene_is_writing_in_parallel() {
+		const string stream =
+			"should_commit_when_writing_with_exp_ver_any_even_while_somene_is_writing_in_parallel";
+
+		const int totalTranWrites = 500;
+		const int totalPlainWrites = 500;
+
+		async Task PlainWrites() {
+			using (var store = BuildConnection(_node)) {
+				await store.ConnectAsync();
+				using (var transaction = await store.StartTransactionAsync(stream, ExpectedVersion.Any)) {
+					var writes = new List<Task>();
+					for (int i = 0; i < totalTranWrites; i++) {
+						writes.Add(transaction.WriteAsync(TestEvent.NewTestEvent(i.ToString(), "trans write")));
+					}
+
+					await Task.WhenAll(writes);
+					await transaction.CommitAsync();
+				}
+			}
+		}
+
+		async Task ParallelWrites() {
+			using (var store = BuildConnection(_node)) {
+				await store.ConnectAsync();
+				var writes = new List<Task>();
+				for (int i = 0; i < totalPlainWrites; i++) {
+					writes.Add(store.AppendToStreamAsync(stream,
+						ExpectedVersion.Any, TestEvent.NewTestEvent(i.ToString(), "plain write")));
+				}
+
+				await Task.WhenAll(writes);
+			}
+		}
+
+		await Task.WhenAll(ParallelWrites(), PlainWrites());
+
+		// check all written
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			var slice = await store.ReadStreamEventsForwardAsync(stream, 0, totalTranWrites + totalPlainWrites,
+				false);
+			Assert.That(slice.Events.Length, Is.EqualTo(totalTranWrites + totalPlainWrites));
+
+			Assert.That(slice.Events.Count(ent => Helper.UTF8NoBom.GetString(ent.Event.Metadata) == "trans write"),
+				Is.EqualTo(totalTranWrites));
+			Assert.That(slice.Events.Count(ent => Helper.UTF8NoBom.GetString(ent.Event.Metadata) == "plain write"),
+				Is.EqualTo(totalPlainWrites));
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task should_fail_to_commit_if_started_with_correct_ver_but_committing_with_bad() {
+		const string stream = "should_fail_to_commit_if_started_with_correct_ver_but_committing_with_bad";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			using (var transaction = await store.StartTransactionAsync(stream, ExpectedVersion.NoStream)) {
+				await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent())
+					;
+				await transaction.WriteAsync(TestEvent.NewTestEvent());
+				await AssertEx.ThrowsAsync<WrongExpectedVersionException>(() => transaction.CommitAsync());
+			}
+		}
+	}
+
+	[Test, Category("Network")]
+	public async Task should_not_fail_to_commit_if_started_with_wrong_ver_but_committing_with_correct_ver() {
+		const string stream = "should_not_fail_to_commit_if_started_with_wrong_ver_but_committing_with_correct_ver";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			using (var transaction = await store.StartTransactionAsync(stream, 0)) {
+				await store.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent())
+					;
+				await transaction.WriteAsync(TestEvent.NewTestEvent());
+				var writeResult = await transaction.CommitAsync();
+				Assert.AreEqual(1, writeResult.NextExpectedVersion);
+			}
+		}
+	}
+
+	[Test]
+	[Category("Network")]
+	public async Task should_fail_to_commit_if_started_with_correct_ver_but_on_commit_stream_was_deleted() {
+		const string stream = "should_fail_to_commit_if_started_with_correct_ver_but_on_commit_stream_was_deleted";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+			using (var transaction = await store.StartTransactionAsync(stream, ExpectedVersion.NoStream)) {
+				await transaction.WriteAsync(TestEvent.NewTestEvent());
+				await store.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
+				await AssertEx.ThrowsAsync<StreamDeletedException>(() => transaction.CommitAsync());
+			}
+		}
+	}
+
+	[Test, Category("LongRunning")]
+	public async Task idempotency_is_correct_for_explicit_transactions_with_expected_version_any() {
+		const string streamId = "idempotency_is_correct_for_explicit_transactions_with_expected_version_any";
+		using (var store = BuildConnection(_node)) {
+			await store.ConnectAsync();
+
+			var e = new EventData(Guid.NewGuid(), "SomethingHappened", true,
+				Helper.UTF8NoBom.GetBytes("{Value:42}"), null);
+
+			var transaction1 = await store.StartTransactionAsync(streamId, ExpectedVersion.Any);
+			await transaction1.WriteAsync(e);
+			Assert.AreEqual(0, (await transaction1.CommitAsync()).NextExpectedVersion);
+
+			var transaction2 = await store.StartTransactionAsync(streamId, ExpectedVersion.Any);
+			await transaction2.WriteAsync(e);
+			var writeResult = await transaction2.CommitAsync();
+			Assert.AreEqual(0, writeResult.NextExpectedVersion);
+
+			var res = await store.ReadStreamEventsForwardAsync(streamId, 0, 100, false);
+			Assert.AreEqual(1, res.Events.Length);
+			Assert.AreEqual(e.EventId, res.Events[0].Event.EventId);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/update_persistent_subscription.cs b/src/KurrentDB.Core.Tests/ClientAPI/update_persistent_subscription.cs
new file mode 100644
index 00000000000..cba377e941b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/update_persistent_subscription.cs
@@ -0,0 +1,130 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class update_existing_persistent_subscription<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = Guid.NewGuid().ToString();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent();
+
+	protected override async Task Given() {
+		await _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any,
+			new EventData(Guid.NewGuid(), "whatever", true, Encoding.UTF8.GetBytes("{'foo' : 2}"), new Byte[0]));
+		await _conn.CreatePersistentSubscriptionAsync(_stream, "existing", _settings, DefaultData.AdminCredentials);
+	}
+
+	protected override Task When() => Task.CompletedTask;
+
+	[Test]
+	public async Task the_completion_succeeds() {
+		await _conn.UpdatePersistentSubscriptionAsync(_stream, "existing", _settings, DefaultData.AdminCredentials);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class update_existing_persistent_subscription_with_subscribers<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = Guid.NewGuid().ToString();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent();
+
+	private readonly AutoResetEvent _dropped = new AutoResetEvent(false);
+	private SubscriptionDropReason _reason;
+	private Exception _exception;
+	private Exception _caught = null;
+
+	protected override async Task Given() {
+		await _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any,
+			new EventData(Guid.NewGuid(), "whatever", true, Encoding.UTF8.GetBytes("{'foo' : 2}"), new Byte[0]));
+		await _conn.CreatePersistentSubscriptionAsync(_stream, "existing", _settings, DefaultData.AdminCredentials)
+;
+		_conn.ConnectToPersistentSubscription(_stream, "existing", (x, y) => Task.CompletedTask,
+			(sub, reason, ex) => {
+				_dropped.Set();
+				_reason = reason;
+				_exception = ex;
+			}, DefaultData.AdminCredentials);
+	}
+
+	protected override async Task When() {
+		try {
+			await _conn.UpdatePersistentSubscriptionAsync(_stream, "existing", _settings, DefaultData.AdminCredentials);
+		} catch (Exception ex) {
+			_caught = ex;
+		}
+	}
+
+	[Test]
+	public void the_completion_succeeds() {
+		Assert.IsNull(_caught);
+	}
+
+	[Test]
+	public void existing_subscriptions_are_dropped() {
+		Assert.IsTrue(_dropped.WaitOne(TimeSpan.FromSeconds(5)));
+		Assert.AreEqual(SubscriptionDropReason.UserInitiated, _reason);
+		Assert.IsNull(_exception);
+	}
+}
+
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class update_non_existing_persistent_subscription<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = Guid.NewGuid().ToString();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent();
+
+	protected override Task When() => Task.CompletedTask;
+
+	[Test]
+	public async Task the_completion_fails_with_not_found() {
+		await AssertEx.ThrowsAsync<InvalidOperationException>(
+			() => _conn.UpdatePersistentSubscriptionAsync(_stream, "existing", _settings,
+				DefaultData.AdminCredentials));
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class update_existing_persistent_subscription_without_permissions<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private readonly string _stream = Guid.NewGuid().ToString();
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent();
+
+	protected override async Task When() {
+		await _conn.AppendToStreamAsync(_stream, ExpectedVersion.Any,
+			new EventData(Guid.NewGuid(), "whatever", true, Encoding.UTF8.GetBytes("{'foo' : 2}"), new Byte[0]));
+		await _conn.CreatePersistentSubscriptionAsync(_stream, "existing", _settings, DefaultData.AdminCredentials)
+;
+	}
+
+	[Test]
+	public async Task the_completion_fails_with_access_denied() {
+		await AssertEx.ThrowsAsync<AccessDeniedException>(
+			() => _conn.UpdatePersistentSubscriptionAsync(_stream, "existing", _settings, null));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/when_committing_empty_transaction.cs b/src/KurrentDB.Core.Tests/ClientAPI/when_committing_empty_transaction.cs
new file mode 100644
index 00000000000..281b42b9a28
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/when_committing_empty_transaction.cs
@@ -0,0 +1,102 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class when_committing_empty_transaction<TLogFormat, TStreamId> : SpecificationWithDirectory {
+	private MiniNode<TLogFormat, TStreamId> _node;
+	private IEventStoreConnection _connection;
+	private EventData _firstEvent;
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+
+		_firstEvent = TestEvent.NewTestEvent();
+
+		_connection = BuildConnection(_node);
+		await _connection.ConnectAsync();
+
+		Assert.AreEqual(2, (await _connection.AppendToStreamAsync("test-stream",
+			ExpectedVersion.NoStream,
+			_firstEvent,
+			TestEvent.NewTestEvent(),
+			TestEvent.NewTestEvent())).NextExpectedVersion);
+
+		using (var transaction = await _connection.StartTransactionAsync("test-stream", 2)) {
+			Assert.AreEqual(2, (await transaction.CommitAsync()).NextExpectedVersion);
+		}
+	}
+
+	[TearDown]
+	public override async Task TearDown() {
+		_connection.Close();
+		await _node.Shutdown();
+		await base.TearDown();
+	}
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.Create(node.TcpEndPoint);
+	}
+
+	[Test]
+	public async Task following_append_with_correct_expected_version_are_commited_correctly() {
+		Assert.AreEqual(4,
+			(await _connection.AppendToStreamAsync("test-stream", 2, TestEvent.NewTestEvent(),
+				TestEvent.NewTestEvent())
+			).NextExpectedVersion);
+
+		var res = await _connection.ReadStreamEventsForwardAsync("test-stream", 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(5, res.Events.Length);
+		for (int i = 0; i < 5; ++i) {
+			Assert.AreEqual(i, res.Events[i].OriginalEventNumber);
+		}
+	}
+
+	[Test]
+	public async Task following_append_with_expected_version_any_are_commited_correctly() {
+		Assert.AreEqual(4,
+			(await _connection.AppendToStreamAsync("test-stream", ExpectedVersion.Any, TestEvent.NewTestEvent(),
+				TestEvent.NewTestEvent())).NextExpectedVersion);
+
+		var res = await _connection.ReadStreamEventsForwardAsync("test-stream", 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(5, res.Events.Length);
+		for (int i = 0; i < 5; ++i) {
+			Assert.AreEqual(i, res.Events[i].OriginalEventNumber);
+		}
+	}
+
+	[Test]
+	public async Task committing_first_event_with_expected_version_no_stream_is_idempotent() {
+		Assert.AreEqual(0,
+			(await _connection.AppendToStreamAsync("test-stream", ExpectedVersion.NoStream, _firstEvent))
+			.NextExpectedVersion);
+
+		var res = await _connection.ReadStreamEventsForwardAsync("test-stream", 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(3, res.Events.Length);
+		for (int i = 0; i < 3; ++i) {
+			Assert.AreEqual(i, res.Events[i].OriginalEventNumber);
+		}
+	}
+
+	[Test]
+	public async Task trying_to_append_new_events_with_expected_version_no_stream_fails() {
+		await AssertEx.ThrowsAsync<WrongExpectedVersionException>(() =>
+			_connection.AppendToStreamAsync("test-stream", ExpectedVersion.NoStream, TestEvent.NewTestEvent()));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/when_having_max_count_set_for_stream.cs b/src/KurrentDB.Core.Tests/ClientAPI/when_having_max_count_set_for_stream.cs
new file mode 100644
index 00000000000..af0529dbf8d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/when_having_max_count_set_for_stream.cs
@@ -0,0 +1,131 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_having_max_count_set_for_stream<TLogFormat, TStreamId> : SpecificationWithDirectory {
+	private const string Stream = "max-count-test-stream";
+
+	private MiniNode<TLogFormat, TStreamId> _node;
+	private IEventStoreConnection _connection;
+	private EventData[] _testEvents;
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+
+		_connection = TestConnection.Create(_node.TcpEndPoint);
+		await _connection.ConnectAsync();
+
+		await _connection.SetStreamMetadataAsync(Stream, ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetMaxCount(3));
+
+		_testEvents = Enumerable.Range(0, 5).Select(x => TestEvent.NewTestEvent(data: x.ToString())).ToArray();
+		await _connection.AppendToStreamAsync(Stream, ExpectedVersion.NoStream, _testEvents);
+	}
+
+	[TearDown]
+	public override async Task TearDown() {
+		_connection.Close();
+		await _node.Shutdown();
+		await base.TearDown();
+	}
+
+	[Test]
+	public async Task read_stream_forward_respects_max_count() {
+		var res = await _connection.ReadStreamEventsForwardAsync(Stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
+			res.Events.Select(x => x.Event.EventId).ToArray());
+	}
+
+	[Test]
+	public async Task read_stream_backward_respects_max_count() {
+		var res = await _connection.ReadStreamEventsBackwardAsync(Stream, -1, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
+			res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
+	}
+
+	[Test]
+	public async Task after_setting_less_strict_max_count_read_stream_forward_reads_more_events() {
+		var res = await _connection.ReadStreamEventsForwardAsync(Stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
+			res.Events.Select(x => x.Event.EventId).ToArray());
+
+		await _connection.SetStreamMetadataAsync(Stream, 0, StreamMetadata.Build().SetMaxCount(4));
+
+		res = await _connection.ReadStreamEventsForwardAsync(Stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(4, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(1).Select(x => x.EventId).ToArray(),
+			res.Events.Select(x => x.Event.EventId).ToArray());
+	}
+
+	[Test]
+	public async Task after_setting_more_strict_max_count_read_stream_forward_reads_less_events() {
+		var res = await _connection.ReadStreamEventsForwardAsync(Stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
+			res.Events.Select(x => x.Event.EventId).ToArray());
+
+		await _connection.SetStreamMetadataAsync(Stream, 0, StreamMetadata.Build().SetMaxCount(2));
+
+		res = await _connection.ReadStreamEventsForwardAsync(Stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(2, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(3).Select(x => x.EventId).ToArray(),
+			res.Events.Select(x => x.Event.EventId).ToArray());
+	}
+
+	[Test]
+	public async Task after_setting_less_strict_max_count_read_stream_backward_reads_more_events() {
+		var res = await _connection.ReadStreamEventsBackwardAsync(Stream, -1, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
+			res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
+
+		await _connection.SetStreamMetadataAsync(Stream, 0, StreamMetadata.Build().SetMaxCount(4));
+
+		res = await _connection.ReadStreamEventsBackwardAsync(Stream, -1, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(4, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(1).Select(x => x.EventId).ToArray(),
+			res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
+	}
+
+	[Test]
+	public async Task after_setting_more_strict_max_count_read_stream_backward_reads_less_events() {
+		var res = await _connection.ReadStreamEventsBackwardAsync(Stream, -1, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
+			res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
+
+		await _connection.SetStreamMetadataAsync(Stream, 0, StreamMetadata.Build().SetMaxCount(2));
+
+		res = await _connection.ReadStreamEventsBackwardAsync(Stream, -1, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(2, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(3).Select(x => x.EventId).ToArray(),
+			res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/when_having_truncatebefore_set_for_stream.cs b/src/KurrentDB.Core.Tests/ClientAPI/when_having_truncatebefore_set_for_stream.cs
new file mode 100644
index 00000000000..e55e9819127
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/when_having_truncatebefore_set_for_stream.cs
@@ -0,0 +1,365 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_having_truncatebefore_set_for_stream<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private EventData[] _testEvents;
+
+	protected override Task When() {
+		_testEvents = Enumerable.Range(0, 5).Select(x => TestEvent.NewTestEvent(data: x.ToString())).ToArray();
+		return Task.CompletedTask;
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task read_event_respects_truncatebefore() {
+		const string stream = "read_event_respects_truncatebefore";
+		await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
+
+		await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetTruncateBefore(2));
+
+		var res = await _conn.ReadEventAsync(stream, 1, false);
+		Assert.AreEqual(EventReadStatus.NotFound, res.Status);
+
+		res = await _conn.ReadEventAsync(stream, 2, false);
+		Assert.AreEqual(EventReadStatus.Success, res.Status);
+		Assert.AreEqual(_testEvents[2].EventId, res.Event.Value.OriginalEvent.EventId);
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task read_stream_forward_respects_truncatebefore() {
+		const string stream = "read_stream_forward_respects_truncatebefore";
+		await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
+
+		await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetTruncateBefore(2));
+
+		var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
+			res.Events.Select(x => x.Event.EventId).ToArray());
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task read_stream_backward_respects_truncatebefore() {
+		const string stream = "read_stream_backward_respects_truncatebefore";
+		await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
+
+		await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetTruncateBefore(2));
+
+		var res = await _conn.ReadStreamEventsBackwardAsync(stream, -1, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
+			res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task after_setting_less_strict_truncatebefore_read_event_reads_more_events() {
+		const string stream = "after_setting_less_strict_truncatebefore_read_event_reads_more_events";
+
+		await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
+
+		await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetTruncateBefore(2));
+
+		var res = await _conn.ReadEventAsync(stream, 1, false);
+		Assert.AreEqual(EventReadStatus.NotFound, res.Status);
+
+		res = await _conn.ReadEventAsync(stream, 2, false);
+		Assert.AreEqual(EventReadStatus.Success, res.Status);
+		Assert.AreEqual(_testEvents[2].EventId, res.Event.Value.OriginalEvent.EventId);
+
+		await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(1));
+
+		res = await _conn.ReadEventAsync(stream, 0, false);
+		Assert.AreEqual(EventReadStatus.NotFound, res.Status);
+
+		res = await _conn.ReadEventAsync(stream, 1, false);
+		Assert.AreEqual(EventReadStatus.Success, res.Status);
+		Assert.AreEqual(_testEvents[1].EventId, res.Event.Value.OriginalEvent.EventId);
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task after_setting_more_strict_truncatebefore_read_event_reads_less_events() {
+		const string stream = "after_setting_more_strict_truncatebefore_read_event_reads_less_events";
+
+		await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
+
+		await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetTruncateBefore(2));
+
+		var res = await _conn.ReadEventAsync(stream, 1, false);
+		Assert.AreEqual(EventReadStatus.NotFound, res.Status);
+
+		res = await _conn.ReadEventAsync(stream, 2, false);
+		Assert.AreEqual(EventReadStatus.Success, res.Status);
+		Assert.AreEqual(_testEvents[2].EventId, res.Event.Value.OriginalEvent.EventId);
+
+		await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(3));
+
+		res = await _conn.ReadEventAsync(stream, 2, false);
+		Assert.AreEqual(EventReadStatus.NotFound, res.Status);
+
+		res = await _conn.ReadEventAsync(stream, 3, false);
+		Assert.AreEqual(EventReadStatus.Success, res.Status);
+		Assert.AreEqual(_testEvents[3].EventId, res.Event.Value.OriginalEvent.EventId);
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task less_strict_max_count_doesnt_change_anything_for_event_read() {
+		const string stream = "less_strict_max_count_doesnt_change_anything_for_event_read";
+
+		await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
+
+		await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetTruncateBefore(2));
+
+		var res = await _conn.ReadEventAsync(stream, 1, false);
+		Assert.AreEqual(EventReadStatus.NotFound, res.Status);
+
+		res = await _conn.ReadEventAsync(stream, 2, false);
+		Assert.AreEqual(EventReadStatus.Success, res.Status);
+		Assert.AreEqual(_testEvents[2].EventId, res.Event.Value.OriginalEvent.EventId);
+
+		await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(2).SetMaxCount(4));
+
+		res = await _conn.ReadEventAsync(stream, 1, false);
+		Assert.AreEqual(EventReadStatus.NotFound, res.Status);
+
+		res = await _conn.ReadEventAsync(stream, 2, false);
+		Assert.AreEqual(EventReadStatus.Success, res.Status);
+		Assert.AreEqual(_testEvents[2].EventId, res.Event.Value.OriginalEvent.EventId);
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task more_strict_max_count_gives_less_events_for_event_read() {
+		const string stream = "more_strict_max_count_gives_less_events_for_event_read";
+
+		await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
+
+		await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetTruncateBefore(2));
+
+		var res = await _conn.ReadEventAsync(stream, 1, false);
+		Assert.AreEqual(EventReadStatus.NotFound, res.Status);
+
+		res = await _conn.ReadEventAsync(stream, 2, false);
+		Assert.AreEqual(EventReadStatus.Success, res.Status);
+		Assert.AreEqual(_testEvents[2].EventId, res.Event.Value.OriginalEvent.EventId);
+
+		await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(2).SetMaxCount(2));
+
+		res = await _conn.ReadEventAsync(stream, 2, false);
+		Assert.AreEqual(EventReadStatus.NotFound, res.Status);
+
+		res = await _conn.ReadEventAsync(stream, 3, false);
+		Assert.AreEqual(EventReadStatus.Success, res.Status);
+		Assert.AreEqual(_testEvents[3].EventId, res.Event.Value.OriginalEvent.EventId);
+	}
+
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task after_setting_less_strict_truncatebefore_read_stream_forward_reads_more_events() {
+		const string stream = "after_setting_less_strict_truncatebefore_read_stream_forward_reads_more_events";
+
+		await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
+
+		await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetTruncateBefore(2));
+
+		var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
+			res.Events.Select(x => x.Event.EventId).ToArray());
+
+		await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(1));
+
+		res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(4, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(1).Select(x => x.EventId).ToArray(),
+			res.Events.Select(x => x.Event.EventId).ToArray());
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task after_setting_more_strict_truncatebefore_read_stream_forward_reads_less_events() {
+		const string stream = "after_setting_more_strict_truncatebefore_read_stream_forward_reads_less_events";
+
+		await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
+
+		await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetTruncateBefore(2));
+
+		var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
+			res.Events.Select(x => x.Event.EventId).ToArray());
+
+		await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(3));
+
+		res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(2, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(3).Select(x => x.EventId).ToArray(),
+			res.Events.Select(x => x.Event.EventId).ToArray());
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task less_strict_max_count_doesnt_change_anything_for_stream_forward_read() {
+		const string stream = "less_strict_max_count_doesnt_change_anything_for_stream_forward_read";
+
+		await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
+
+		await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetTruncateBefore(2));
+
+		var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
+			res.Events.Select(x => x.Event.EventId).ToArray());
+
+		await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(2).SetMaxCount(4));
+
+		res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
+			res.Events.Select(x => x.Event.EventId).ToArray());
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task more_strict_max_count_gives_less_events_for_stream_forward_read() {
+		const string stream = "more_strict_max_count_gives_less_events_for_stream_forward_read";
+
+		await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
+
+		await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetTruncateBefore(2));
+
+		var res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
+			res.Events.Select(x => x.Event.EventId).ToArray());
+
+		await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(2).SetMaxCount(2));
+
+		res = await _conn.ReadStreamEventsForwardAsync(stream, 0, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(2, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(3).Select(x => x.EventId).ToArray(),
+			res.Events.Select(x => x.Event.EventId).ToArray());
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task after_setting_less_strict_truncatebefore_read_stream_backward_reads_more_events() {
+		const string stream = "after_setting_less_strict_truncatebefore_read_stream_backward_reads_more_events";
+
+		await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
+
+		await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetTruncateBefore(2));
+
+		var res = await _conn.ReadStreamEventsBackwardAsync(stream, -1, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
+			res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
+
+		await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(1));
+
+		res = await _conn.ReadStreamEventsBackwardAsync(stream, -1, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(4, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(1).Select(x => x.EventId).ToArray(),
+			res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task after_setting_more_strict_truncatebefore_read_stream_backward_reads_less_events() {
+		const string stream = "after_setting_more_strict_truncatebefore_read_stream_backward_reads_less_events";
+
+		await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
+
+		await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetTruncateBefore(2));
+
+		var res = await _conn.ReadStreamEventsBackwardAsync(stream, -1, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
+			res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
+
+		await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(3));
+
+		res = await _conn.ReadStreamEventsBackwardAsync(stream, -1, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(2, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(3).Select(x => x.EventId).ToArray(),
+			res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task less_strict_max_count_doesnt_change_anything_for_stream_backward_read() {
+		const string stream = "less_strict_max_count_doesnt_change_anything_for_stream_backward_read";
+
+		await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
+
+		await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetTruncateBefore(2));
+
+		var res = await _conn.ReadStreamEventsBackwardAsync(stream, -1, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
+			res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
+
+		await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(2).SetMaxCount(4));
+
+		res = await _conn.ReadStreamEventsBackwardAsync(stream, -1, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
+			res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task more_strict_max_count_gives_less_events_for_stream_backward_read() {
+		const string stream = "more_strict_max_count_gives_less_events_for_stream_backward_read";
+
+		await _conn.AppendToStreamAsync(stream, ExpectedVersion.NoStream, _testEvents);
+
+		await _conn.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream,
+			StreamMetadata.Build().SetTruncateBefore(2));
+
+		var res = await _conn.ReadStreamEventsBackwardAsync(stream, -1, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(3, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(2).Select(x => x.EventId).ToArray(),
+			res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
+
+		await _conn.SetStreamMetadataAsync(stream, 0, StreamMetadata.Build().SetTruncateBefore(2).SetMaxCount(2));
+
+		res = await _conn.ReadStreamEventsBackwardAsync(stream, -1, 100, false);
+		Assert.AreEqual(SliceReadStatus.Success, res.Status);
+		Assert.AreEqual(2, res.Events.Length);
+		Assert.AreEqual(_testEvents.Skip(3).Select(x => x.EventId).ToArray(),
+			res.Events.Reverse().Select(x => x.Event.EventId).ToArray());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/when_working_with_metadata.cs b/src/KurrentDB.Core.Tests/ClientAPI/when_working_with_metadata.cs
new file mode 100644
index 00000000000..ccbddba3921
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/when_working_with_metadata.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_working_with_metadata<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private MiniNode<TLogFormat, TStreamId> _node;
+	private IEventStoreConnection _connection;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+
+		_connection = BuildConnection(_node);
+		await _connection.ConnectAsync();
+	}
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.Create(node.TcpEndPoint);
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		_connection.Close();
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public async Task when_getting_metadata_for_an_existing_stream_and_no_metadata_exists() {
+		const string stream = "when_getting_metadata_for_an_existing_stream_and_no_metadata_exists";
+
+		await _connection.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
+
+		var meta = await _connection.GetStreamMetadataAsRawBytesAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(false, meta.IsStreamDeleted);
+		Assert.AreEqual(-1, meta.MetastreamVersion);
+		Assert.AreEqual(Helper.UTF8NoBom.GetBytes(""), meta.StreamMetadata);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/when_working_with_stream_metadata_as_byte_array.cs b/src/KurrentDB.Core.Tests/ClientAPI/when_working_with_stream_metadata_as_byte_array.cs
new file mode 100644
index 00000000000..bce086f25cb
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/when_working_with_stream_metadata_as_byte_array.cs
@@ -0,0 +1,173 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_working_with_stream_metadata_as_byte_array<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private MiniNode<TLogFormat, TStreamId> _node;
+	private IEventStoreConnection _connection;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+
+		_connection = BuildConnection(_node);
+		await _connection.ConnectAsync();
+	}
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.Create(node.TcpEndPoint);
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		_connection.Close();
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public async Task setting_empty_metadata_works() {
+		const string stream = "setting_empty_metadata_works";
+
+		await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, (byte[])null);
+
+		var meta = await _connection.GetStreamMetadataAsRawBytesAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(false, meta.IsStreamDeleted);
+		Assert.AreEqual(0, meta.MetastreamVersion);
+		Assert.AreEqual(new byte[0], meta.StreamMetadata);
+	}
+
+	[Test]
+	public async Task setting_metadata_few_times_returns_last_metadata() {
+		const string stream = "setting_metadata_few_times_returns_last_metadata";
+
+		var metadataBytes = Guid.NewGuid().ToByteArray();
+		await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, metadataBytes);
+		var meta = await _connection.GetStreamMetadataAsRawBytesAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(false, meta.IsStreamDeleted);
+		Assert.AreEqual(0, meta.MetastreamVersion);
+		Assert.AreEqual(metadataBytes, meta.StreamMetadata);
+
+		metadataBytes = Guid.NewGuid().ToByteArray();
+		await _connection.SetStreamMetadataAsync(stream, 0, metadataBytes);
+		meta = await _connection.GetStreamMetadataAsRawBytesAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(false, meta.IsStreamDeleted);
+		Assert.AreEqual(1, meta.MetastreamVersion);
+		Assert.AreEqual(metadataBytes, meta.StreamMetadata);
+	}
+
+	[Test]
+	public async Task trying_to_set_metadata_with_wrong_expected_version_fails() {
+		const string stream = "trying_to_set_metadata_with_wrong_expected_version_fails";
+		await AssertEx.ThrowsAsync<WrongExpectedVersionException>(() => _connection.SetStreamMetadataAsync(stream, 5, new byte[100]));
+	}
+
+	[Test]
+	public async Task setting_metadata_with_expected_version_any_works() {
+		const string stream = "setting_metadata_with_expected_version_any_works";
+
+		var metadataBytes = Guid.NewGuid().ToByteArray();
+		await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.Any, metadataBytes);
+		var meta = await _connection.GetStreamMetadataAsRawBytesAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(false, meta.IsStreamDeleted);
+		Assert.AreEqual(0, meta.MetastreamVersion);
+		Assert.AreEqual(metadataBytes, meta.StreamMetadata);
+
+		metadataBytes = Guid.NewGuid().ToByteArray();
+		await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.Any, metadataBytes);
+		meta = await _connection.GetStreamMetadataAsRawBytesAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(false, meta.IsStreamDeleted);
+		Assert.AreEqual(1, meta.MetastreamVersion);
+		Assert.AreEqual(metadataBytes, meta.StreamMetadata);
+	}
+
+	[Test]
+	public async Task setting_metadata_for_not_existing_stream_works() {
+		const string stream = "setting_metadata_for_not_existing_stream_works";
+		var metadataBytes = Guid.NewGuid().ToByteArray();
+		await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, metadataBytes);
+
+		var meta = await _connection.GetStreamMetadataAsRawBytesAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(false, meta.IsStreamDeleted);
+		Assert.AreEqual(0, meta.MetastreamVersion);
+		Assert.AreEqual(metadataBytes, meta.StreamMetadata);
+	}
+
+	[Test]
+	public async Task setting_metadata_for_existing_stream_works() {
+		const string stream = "setting_metadata_for_existing_stream_works";
+
+		await _connection.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent(),
+			TestEvent.NewTestEvent());
+
+		var metadataBytes = Guid.NewGuid().ToByteArray();
+		await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, metadataBytes);
+
+		var meta = await _connection.GetStreamMetadataAsRawBytesAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(false, meta.IsStreamDeleted);
+		Assert.AreEqual(0, meta.MetastreamVersion);
+		Assert.AreEqual(metadataBytes, meta.StreamMetadata);
+	}
+
+	[Test]
+	public async Task setting_metadata_for_deleted_stream_throws_stream_deleted_exception() {
+		const string stream = "setting_metadata_for_deleted_stream_throws_stream_deleted_exception";
+
+		await _connection.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
+
+		var metadataBytes = Guid.NewGuid().ToByteArray();
+		await AssertEx.ThrowsAsync<StreamDeletedException>(
+			() => _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, metadataBytes));
+	}
+
+	[Test]
+	public async Task getting_metadata_for_nonexisting_stream_returns_empty_byte_array() {
+		const string stream = "getting_metadata_for_nonexisting_stream_returns_empty_byte_array";
+
+		var meta = await _connection.GetStreamMetadataAsRawBytesAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(false, meta.IsStreamDeleted);
+		Assert.AreEqual(-1, meta.MetastreamVersion);
+		Assert.AreEqual(new byte[0], meta.StreamMetadata);
+	}
+
+	[Test]
+	public async Task getting_metadata_for_deleted_stream_returns_empty_byte_array_and_signals_stream_deletion() {
+		const string stream =
+			"getting_metadata_for_deleted_stream_returns_empty_byte_array_and_signals_stream_deletion";
+
+		var metadataBytes = Guid.NewGuid().ToByteArray();
+		await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, metadataBytes);
+
+		await _connection.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
+
+		var meta = await _connection.GetStreamMetadataAsRawBytesAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(true, meta.IsStreamDeleted);
+		Assert.AreEqual(EventNumber.DeletedStream, meta.MetastreamVersion);
+		Assert.AreEqual(new byte[0], meta.StreamMetadata);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientAPI/when_working_with_stream_metadata_as_structured_info.cs b/src/KurrentDB.Core.Tests/ClientAPI/when_working_with_stream_metadata_as_structured_info.cs
new file mode 100644
index 00000000000..a0c0be79a91
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientAPI/when_working_with_stream_metadata_as_structured_info.cs
@@ -0,0 +1,371 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
+using StreamMetadata = EventStore.ClientAPI.StreamMetadata;
+
+namespace KurrentDB.Core.Tests.ClientAPI;
+
+[Category("ClientAPI"), Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_working_with_stream_metadata_as_structured_info<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private MiniNode<TLogFormat, TStreamId> _node;
+	private IEventStoreConnection _connection;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.Start();
+
+		_connection = BuildConnection(_node);
+		await _connection.ConnectAsync();
+	}
+
+	protected virtual IEventStoreConnection BuildConnection(MiniNode<TLogFormat, TStreamId> node) {
+		return TestConnection.Create(node.TcpEndPoint);
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		_connection.Close();
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public async Task setting_empty_metadata_works() {
+		const string stream = "setting_empty_metadata_works";
+
+		await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, StreamMetadata.Create());
+
+		var meta = await _connection.GetStreamMetadataAsRawBytesAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(false, meta.IsStreamDeleted);
+		Assert.AreEqual(0, meta.MetastreamVersion);
+		Assert.AreEqual(Helper.UTF8NoBom.GetBytes("{}"), meta.StreamMetadata);
+	}
+
+	[Test]
+	public async Task setting_metadata_few_times_returns_last_metadata_info() {
+		const string stream = "setting_metadata_few_times_returns_last_metadata_info";
+		var metadata =
+			StreamMetadata.Create(17, TimeSpan.FromSeconds(0xDEADBEEF), 10, TimeSpan.FromSeconds(0xABACABA));
+		await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, metadata);
+
+		var meta = await _connection.GetStreamMetadataAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(false, meta.IsStreamDeleted);
+		Assert.AreEqual(0, meta.MetastreamVersion);
+		Assert.AreEqual(metadata.MaxCount, meta.StreamMetadata.MaxCount);
+		Assert.AreEqual(metadata.MaxAge, meta.StreamMetadata.MaxAge);
+		Assert.AreEqual(metadata.TruncateBefore, meta.StreamMetadata.TruncateBefore);
+		Assert.AreEqual(metadata.CacheControl, meta.StreamMetadata.CacheControl);
+
+		metadata = StreamMetadata.Create(37, TimeSpan.FromSeconds(0xBEEFDEAD), 24,
+			TimeSpan.FromSeconds(0xDABACABAD));
+		await _connection.SetStreamMetadataAsync(stream, 0, metadata);
+
+		meta = await _connection.GetStreamMetadataAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(false, meta.IsStreamDeleted);
+		Assert.AreEqual(1, meta.MetastreamVersion);
+		Assert.AreEqual(metadata.MaxCount, meta.StreamMetadata.MaxCount);
+		Assert.AreEqual(metadata.MaxAge, meta.StreamMetadata.MaxAge);
+		Assert.AreEqual(metadata.TruncateBefore, meta.StreamMetadata.TruncateBefore);
+		Assert.AreEqual(metadata.CacheControl, meta.StreamMetadata.CacheControl);
+	}
+
+	[Test]
+	public async Task trying_to_set_metadata_with_wrong_expected_version_fails() {
+		const string stream = "trying_to_set_metadata_with_wrong_expected_version_fails";
+		await AssertEx.ThrowsAsync<WrongExpectedVersionException>(() =>
+			_connection.SetStreamMetadataAsync(stream, 2, StreamMetadata.Create()));
+	}
+
+	[Test]
+	public async Task setting_metadata_with_expected_version_any_works() {
+		const string stream = "setting_metadata_with_expected_version_any_works";
+		var metadata =
+			StreamMetadata.Create(17, TimeSpan.FromSeconds(0xDEADBEEF), 10, TimeSpan.FromSeconds(0xABACABA));
+		await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.Any, metadata);
+
+		var meta = await _connection.GetStreamMetadataAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(false, meta.IsStreamDeleted);
+		Assert.AreEqual(0, meta.MetastreamVersion);
+		Assert.AreEqual(metadata.MaxCount, meta.StreamMetadata.MaxCount);
+		Assert.AreEqual(metadata.MaxAge, meta.StreamMetadata.MaxAge);
+		Assert.AreEqual(metadata.TruncateBefore, meta.StreamMetadata.TruncateBefore);
+		Assert.AreEqual(metadata.CacheControl, meta.StreamMetadata.CacheControl);
+
+		metadata = StreamMetadata.Create(37, TimeSpan.FromSeconds(0xBEEFDEAD), 24,
+			TimeSpan.FromSeconds(0xDABACABAD));
+		await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.Any, metadata);
+
+		meta = await _connection.GetStreamMetadataAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(false, meta.IsStreamDeleted);
+		Assert.AreEqual(1, meta.MetastreamVersion);
+		Assert.AreEqual(metadata.MaxCount, meta.StreamMetadata.MaxCount);
+		Assert.AreEqual(metadata.MaxAge, meta.StreamMetadata.MaxAge);
+		Assert.AreEqual(metadata.TruncateBefore, meta.StreamMetadata.TruncateBefore);
+		Assert.AreEqual(metadata.CacheControl, meta.StreamMetadata.CacheControl);
+	}
+
+	[Test]
+	public async Task setting_metadata_for_not_existing_stream_works() {
+		const string stream = "setting_metadata_for_not_existing_stream_works";
+		var metadata =
+			StreamMetadata.Create(17, TimeSpan.FromSeconds(0xDEADBEEF), 10, TimeSpan.FromSeconds(0xABACABA));
+		await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, metadata);
+
+		var meta = await _connection.GetStreamMetadataAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(false, meta.IsStreamDeleted);
+		Assert.AreEqual(0, meta.MetastreamVersion);
+		Assert.AreEqual(metadata.MaxCount, meta.StreamMetadata.MaxCount);
+		Assert.AreEqual(metadata.MaxAge, meta.StreamMetadata.MaxAge);
+		Assert.AreEqual(metadata.TruncateBefore, meta.StreamMetadata.TruncateBefore);
+		Assert.AreEqual(metadata.CacheControl, meta.StreamMetadata.CacheControl);
+	}
+
+	[Test]
+	public async Task setting_metadata_for_existing_stream_works() {
+		const string stream = "setting_metadata_for_existing_stream_works";
+
+		await _connection.AppendToStreamAsync(stream, ExpectedVersion.NoStream, TestEvent.NewTestEvent());
+
+		var metadata =
+			StreamMetadata.Create(17, TimeSpan.FromSeconds(0xDEADBEEF), 10, TimeSpan.FromSeconds(0xABACABA));
+		await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, metadata);
+
+		var meta = await _connection.GetStreamMetadataAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(false, meta.IsStreamDeleted);
+		Assert.AreEqual(0, meta.MetastreamVersion);
+		Assert.AreEqual(metadata.MaxCount, meta.StreamMetadata.MaxCount);
+		Assert.AreEqual(metadata.MaxAge, meta.StreamMetadata.MaxAge);
+		Assert.AreEqual(metadata.TruncateBefore, meta.StreamMetadata.TruncateBefore);
+		Assert.AreEqual(metadata.CacheControl, meta.StreamMetadata.CacheControl);
+	}
+
+	[Test]
+	public async Task getting_metadata_for_nonexisting_stream_returns_empty_stream_metadata() {
+		const string stream = "getting_metadata_for_nonexisting_stream_returns_empty_stream_metadata";
+
+		var meta = await _connection.GetStreamMetadataAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(false, meta.IsStreamDeleted);
+		Assert.AreEqual(-1, meta.MetastreamVersion);
+		Assert.AreEqual(null, meta.StreamMetadata.MaxCount);
+		Assert.AreEqual(null, meta.StreamMetadata.MaxAge);
+		Assert.AreEqual(null, meta.StreamMetadata.TruncateBefore);
+		Assert.AreEqual(null, meta.StreamMetadata.CacheControl);
+	}
+
+	[Test, Ignore("You can't get stream metadata for metastream through ClientAPI")]
+	public async Task getting_metadata_for_metastream_returns_correct_metadata() {
+		const string stream = "$$getting_metadata_for_metastream_returns_correct_metadata";
+
+		var meta = await _connection.GetStreamMetadataAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(false, meta.IsStreamDeleted);
+		Assert.AreEqual(-1, meta.MetastreamVersion);
+		Assert.AreEqual(1, meta.StreamMetadata.MaxCount);
+		Assert.AreEqual(null, meta.StreamMetadata.MaxAge);
+		Assert.AreEqual(null, meta.StreamMetadata.TruncateBefore);
+		Assert.AreEqual(null, meta.StreamMetadata.CacheControl);
+	}
+
+	[Test]
+	public async Task getting_metadata_for_deleted_stream_returns_empty_stream_metadata_and_signals_stream_deletion() {
+		const string stream =
+			"getting_metadata_for_deleted_stream_returns_empty_stream_metadata_and_signals_stream_deletion";
+
+		var metadata =
+			StreamMetadata.Create(17, TimeSpan.FromSeconds(0xDEADBEEF), 10, TimeSpan.FromSeconds(0xABACABA));
+		await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, metadata);
+
+		await _connection.DeleteStreamAsync(stream, ExpectedVersion.NoStream, hardDelete: true);
+
+		var meta = await _connection.GetStreamMetadataAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(true, meta.IsStreamDeleted);
+		Assert.AreEqual(EventNumber.DeletedStream, meta.MetastreamVersion);
+		Assert.AreEqual(null, meta.StreamMetadata.MaxCount);
+		Assert.AreEqual(null, meta.StreamMetadata.MaxAge);
+		Assert.AreEqual(null, meta.StreamMetadata.TruncateBefore);
+		Assert.AreEqual(null, meta.StreamMetadata.CacheControl);
+		Assert.AreEqual(null, meta.StreamMetadata.Acl);
+	}
+
+	[Test]
+	public async Task setting_correctly_formatted_metadata_as_raw_allows_to_read_it_as_structured_metadata() {
+		const string stream =
+			"setting_correctly_formatted_metadata_as_raw_allows_to_read_it_as_structured_metadata";
+
+		var rawMeta = Helper.UTF8NoBom.GetBytes(@"{
+                                                           ""$maxCount"": 17,
+                                                           ""$maxAge"": 123321,
+                                                           ""$tb"": 23,
+                                                           ""$cacheControl"": 7654321,
+                                                           ""$acl"": {
+                                                               ""$r"": ""readRole"",
+                                                               ""$w"": ""writeRole"",
+                                                               ""$d"": ""deleteRole"",
+                                                               ""$mw"": ""metaWriteRole""
+                                                           },
+                                                           ""customString"": ""a string"",
+                                                           ""customInt"": -179,
+                                                           ""customDouble"": 1.7,
+                                                           ""customLong"": 123123123123123123,
+                                                           ""customBool"": true,
+                                                           ""customNullable"": null,
+                                                           ""customRawJson"": {
+                                                               ""subProperty"": 999
+                                                           }
+                                                      }");
+
+		await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, rawMeta);
+
+		var meta = await _connection.GetStreamMetadataAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(false, meta.IsStreamDeleted);
+		Assert.AreEqual(0, meta.MetastreamVersion);
+		Assert.AreEqual(17, meta.StreamMetadata.MaxCount);
+		Assert.AreEqual(TimeSpan.FromSeconds(123321), meta.StreamMetadata.MaxAge);
+		Assert.AreEqual(23, meta.StreamMetadata.TruncateBefore);
+		Assert.AreEqual(TimeSpan.FromSeconds(7654321), meta.StreamMetadata.CacheControl);
+
+		Assert.NotNull(meta.StreamMetadata.Acl);
+		Assert.AreEqual("readRole", meta.StreamMetadata.Acl.ReadRole);
+		Assert.AreEqual("writeRole", meta.StreamMetadata.Acl.WriteRole);
+		Assert.AreEqual("deleteRole", meta.StreamMetadata.Acl.DeleteRole);
+		// meta role removed to allow reading
+		//            Assert.AreEqual("metaReadRole", meta.StreamMetadata.Acl.MetaReadRole);
+		Assert.AreEqual("metaWriteRole", meta.StreamMetadata.Acl.MetaWriteRole);
+
+		Assert.AreEqual("a string", meta.StreamMetadata.GetValue<string>("customString"));
+		Assert.AreEqual(-179, meta.StreamMetadata.GetValue<int>("customInt"));
+		Assert.AreEqual(1.7, meta.StreamMetadata.GetValue<double>("customDouble"));
+		Assert.AreEqual(123123123123123123L, meta.StreamMetadata.GetValue<long>("customLong"));
+		Assert.AreEqual(true, meta.StreamMetadata.GetValue<bool>("customBool"));
+		Assert.AreEqual(null, meta.StreamMetadata.GetValue<int?>("customNullable"));
+		Assert.AreEqual(@"{""subProperty"":999}", meta.StreamMetadata.GetValueAsRawJsonString("customRawJson"));
+	}
+
+	[Test]
+	public async Task setting_structured_metadata_with_custom_properties_returns_them_untouched() {
+		const string stream = "setting_structured_metadata_with_custom_properties_returns_them_untouched";
+
+		StreamMetadata metadata = StreamMetadata.Build()
+			.SetMaxCount(17)
+			.SetMaxAge(TimeSpan.FromSeconds(123321))
+			.SetTruncateBefore(23)
+			.SetCacheControl(TimeSpan.FromSeconds(7654321))
+			.SetReadRole("readRole")
+			.SetWriteRole("writeRole")
+			.SetDeleteRole("deleteRole")
+			//.SetMetadataReadRole("metaReadRole")
+			.SetMetadataWriteRole("metaWriteRole")
+			.SetCustomProperty("customString", "a string")
+			.SetCustomProperty("customInt", -179)
+			.SetCustomProperty("customDouble", 1.7)
+			.SetCustomProperty("customLong", 123123123123123123L)
+			.SetCustomProperty("customBool", true)
+			.SetCustomProperty("customNullable", new int?())
+			.SetCustomPropertyWithValueAsRawJsonString("customRawJson",
+				@"{
+                                                                                                       ""subProperty"": 999
+                                                                                                 }");
+
+		await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, metadata);
+
+		var meta = await _connection.GetStreamMetadataAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(false, meta.IsStreamDeleted);
+		Assert.AreEqual(0, meta.MetastreamVersion);
+		Assert.AreEqual(17, meta.StreamMetadata.MaxCount);
+		Assert.AreEqual(TimeSpan.FromSeconds(123321), meta.StreamMetadata.MaxAge);
+		Assert.AreEqual(23, meta.StreamMetadata.TruncateBefore);
+		Assert.AreEqual(TimeSpan.FromSeconds(7654321), meta.StreamMetadata.CacheControl);
+
+		Assert.NotNull(meta.StreamMetadata.Acl);
+		Assert.AreEqual("readRole", meta.StreamMetadata.Acl.ReadRole);
+		Assert.AreEqual("writeRole", meta.StreamMetadata.Acl.WriteRole);
+		Assert.AreEqual("deleteRole", meta.StreamMetadata.Acl.DeleteRole);
+		//Assert.AreEqual("metaReadRole", meta.StreamMetadata.Acl.MetaReadRole);
+		Assert.AreEqual("metaWriteRole", meta.StreamMetadata.Acl.MetaWriteRole);
+
+		Assert.AreEqual("a string", meta.StreamMetadata.GetValue<string>("customString"));
+		Assert.AreEqual(-179, meta.StreamMetadata.GetValue<int>("customInt"));
+		Assert.AreEqual(1.7, meta.StreamMetadata.GetValue<double>("customDouble"));
+		Assert.AreEqual(123123123123123123L, meta.StreamMetadata.GetValue<long>("customLong"));
+		Assert.AreEqual(true, meta.StreamMetadata.GetValue<bool>("customBool"));
+		Assert.AreEqual(null, meta.StreamMetadata.GetValue<int?>("customNullable"));
+		Assert.AreEqual(@"{""subProperty"":999}", meta.StreamMetadata.GetValueAsRawJsonString("customRawJson"));
+	}
+
+	[Test]
+	public async Task setting_structured_metadata_with_multiple_roles_can_be_read_back() {
+		const string stream = "setting_structured_metadata_with_multiple_roles_can_be_read_back";
+
+		StreamMetadata metadata = StreamMetadata.Build()
+			.SetReadRoles(new[] { "r1", "r2", "r3" })
+			.SetWriteRoles(new[] { "w1", "w2" })
+			.SetDeleteRoles(new[] { "d1", "d2", "d3", "d4" })
+			.SetMetadataWriteRoles(new[] { "mw1", "mw2" });
+
+		await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, metadata);
+
+		var meta = await _connection.GetStreamMetadataAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(false, meta.IsStreamDeleted);
+		Assert.AreEqual(0, meta.MetastreamVersion);
+
+		Assert.NotNull(meta.StreamMetadata.Acl);
+		Assert.AreEqual(new[] { "r1", "r2", "r3" }, meta.StreamMetadata.Acl.ReadRoles);
+		Assert.AreEqual(new[] { "w1", "w2" }, meta.StreamMetadata.Acl.WriteRoles);
+		Assert.AreEqual(new[] { "d1", "d2", "d3", "d4" }, meta.StreamMetadata.Acl.DeleteRoles);
+		Assert.AreEqual(new[] { "mw1", "mw2" }, meta.StreamMetadata.Acl.MetaWriteRoles);
+	}
+
+	[Test]
+	public async Task setting_correct_metadata_with_multiple_roles_in_acl_allows_to_read_it_as_structured_metadata() {
+		const string stream =
+			"setting_correct_metadata_with_multiple_roles_in_acl_allows_to_read_it_as_structured_metadata";
+
+		var rawMeta = Helper.UTF8NoBom.GetBytes(@"{
+                                                           ""$acl"": {
+                                                               ""$r"": [""r1"", ""r2"", ""r3""],
+                                                               ""$w"": [""w1"", ""w2""],
+                                                               ""$d"": [""d1"", ""d2"", ""d3"", ""d4""],
+                                                               ""$mw"": [""mw1"", ""mw2""],
+                                                           }
+                                                      }");
+
+		await _connection.SetStreamMetadataAsync(stream, ExpectedVersion.NoStream, rawMeta);
+
+		var meta = await _connection.GetStreamMetadataAsync(stream);
+		Assert.AreEqual(stream, meta.Stream);
+		Assert.AreEqual(false, meta.IsStreamDeleted);
+		Assert.AreEqual(0, meta.MetastreamVersion);
+
+		Assert.NotNull(meta.StreamMetadata.Acl);
+		Assert.AreEqual(new[] { "r1", "r2", "r3" }, meta.StreamMetadata.Acl.ReadRoles);
+		Assert.AreEqual(new[] { "w1", "w2" }, meta.StreamMetadata.Acl.WriteRoles);
+		Assert.AreEqual(new[] { "d1", "d2", "d3", "d4" }, meta.StreamMetadata.Acl.DeleteRoles);
+		Assert.AreEqual(new[] { "mw1", "mw2" }, meta.StreamMetadata.Acl.MetaWriteRoles);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientOperations/specification_with_bare_vnode.cs b/src/KurrentDB.Core.Tests/ClientOperations/specification_with_bare_vnode.cs
new file mode 100644
index 00000000000..a4cb34ac8c9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientOperations/specification_with_bare_vnode.cs
@@ -0,0 +1,102 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Authentication;
+using KurrentDB.Core.Authentication.InternalAuthentication;
+using KurrentDB.Core.Authorization;
+using KurrentDB.Core.Authorization.AuthorizationPolicies;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Certificates;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Tests.Services.Transport.Tcp;
+using Microsoft.AspNetCore.Builder;
+
+namespace KurrentDB.Core.Tests.ClientOperations;
+
+public abstract class specification_with_bare_vnode<TLogFormat, TStreamId> : IPublisher, ISubscriber, IDisposable {
+	private ClusterVNode _node;
+	private readonly List<IDisposable> _disposables = new List<IDisposable>();
+	public async ValueTask CreateTestNode() {
+		var logFormatFactory = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory;
+		var options = new ClusterVNodeOptions()
+			.ReduceMemoryUsageForTests()
+			.RunInMemory()
+			.Secure(new X509Certificate2Collection(ssl_connections.GetRootCertificate()),
+				ssl_connections.GetServerCertificate());
+		_node = new ClusterVNode<TStreamId>(options, logFormatFactory,
+			new AuthenticationProviderFactory(
+				c => new InternalAuthenticationProviderFactory(c, options.DefaultUser)),
+			new AuthorizationProviderFactory(c => new InternalAuthorizationProviderFactory(
+				new StaticAuthorizationPolicyRegistry([new LegacyPolicySelectorFactory(
+					options.Application.AllowAnonymousEndpointAccess,
+					options.Application.AllowAnonymousStreamAccess,
+					options.Application.OverrideAnonymousEndpointAccessForGossip).Create(c.MainQueue)]))),
+			certificateProvider: new OptionsCertificateProvider());
+
+		var builder = WebApplication.CreateBuilder();
+		_node.Startup.ConfigureServices(builder.Services);
+		var app = builder.Build();
+		_node.Startup.Configure(app);
+
+		await _node.StartAsync(true, CancellationToken.None);
+	}
+	public void Publish(Message message) {
+		_node.MainQueue.Handle(message);
+	}
+
+	public void Subscribe<T>(IAsyncHandle<T> handler) where T : Message {
+		_node.MainBus.Subscribe(handler);
+	}
+
+	public void Unsubscribe<T>(IAsyncHandle<T> handler) where T : Message {
+		_node.MainBus.Unsubscribe(handler);
+	}
+	public Task<T> WaitForNext<T>() where T : Message {
+		var handler = new TaskHandler<T>(_node.MainBus);
+		_disposables.Add(handler);
+		return handler.Message;
+	}
+	private sealed class TaskHandler<T> : IHandle<T>, IDisposable where T : Message {
+		private readonly ISubscriber _source;
+		private readonly TaskCompletionSource<T> _tcs = new TaskCompletionSource<T>();
+		public Task<T> Message => _tcs.Task;
+		public void Handle(T message) {
+			_tcs.SetResult(message);
+			Dispose();
+		}
+		public TaskHandler(ISubscriber source) {
+			_source = source;
+			_source.Subscribe(this);
+		}
+		private bool _disposed;
+		public void Dispose() {
+			if (_disposed) { return; }
+			_disposed = true;
+			try {
+				_source.Unsubscribe(this);
+			} catch (Exception) { /* ignore*/}
+		}
+	}
+	#region IDisposable Support
+	private bool _disposed;
+	protected virtual void Dispose(bool disposing) {
+		if (!_disposed) {
+			if (disposing) {
+				_disposables?.ForEach(d => d?.Dispose());
+				_disposables?.Clear();
+				_node?.StopAsync().Wait();
+			}
+			_disposed = true;
+		}
+	}
+
+	public void Dispose() {
+		Dispose(true);
+	}
+	#endregion
+}
diff --git a/src/KurrentDB.Core.Tests/ClientOperations/specification_with_request_manager_integration.cs b/src/KurrentDB.Core.Tests/ClientOperations/specification_with_request_manager_integration.cs
new file mode 100644
index 00000000000..09ce7dc1708
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientOperations/specification_with_request_manager_integration.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Tests.Services.Replication;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientOperations;
+
+public abstract class specification_with_request_manager_integration<TLogFormat, TStreamId> : specification_with_bare_vnode<TLogFormat, TStreamId> {
+
+	protected long CompletionMessageCount;
+	protected StorageMessage.RequestCompleted CompletionMessage;
+
+	protected Guid InternalCorrId = Guid.NewGuid();
+	protected Guid ClientCorrId = Guid.NewGuid();
+	protected FakeEnvelope Envelope;
+
+	protected abstract IEnumerable<Message> WithInitialMessages();
+	protected abstract Message When();
+
+	[SetUp]
+	public async Task Setup() {
+		await CreateTestNode();
+		Envelope = new FakeEnvelope();
+
+		foreach (var m in WithInitialMessages()) {
+			Publish(m);
+		}
+		Subscribe(new AdHocHandler<StorageMessage.RequestCompleted>(msg => {
+			Interlocked.Exchange(ref CompletionMessage, msg);
+			Interlocked.Increment(ref CompletionMessageCount);
+		}));
+		Publish(When());
+	}
+
+}
diff --git a/src/KurrentDB.Core.Tests/ClientOperations/when_committing_a_transaction_with_data.cs b/src/KurrentDB.Core.Tests/ClientOperations/when_committing_a_transaction_with_data.cs
new file mode 100644
index 00000000000..c99115cfa5a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientOperations/when_committing_a_transaction_with_data.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using EventStore.ClientAPI.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientOperations;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class when_committing_a_transaction_with_data<TLogFormat, TStreamId> : specification_with_request_manager_integration<TLogFormat, TStreamId> {
+	readonly string _streamId = $"new_test_stream_{Guid.NewGuid()}";
+	readonly Event _evt = new Event(Guid.NewGuid(), "SomethingHappened", true, Helper.UTF8NoBom.GetBytes("{Value:42}"), null);
+	long _transactionId;
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		var requestComplete = WaitForNext<StorageMessage.RequestCompleted>();
+		yield return new ClientMessage.TransactionStart(Guid.NewGuid(), Guid.NewGuid(), Envelope, true, _streamId, ExpectedVersion.Any, null);
+		requestComplete.Wait();
+		AssertEx.IsOrBecomesTrue(() => Envelope.Replies.Count > 0);
+		var resp = Envelope.Replies[0] as ClientMessage.TransactionStartCompleted;
+		_transactionId = resp?.TransactionId ?? 0;
+		requestComplete = WaitForNext<StorageMessage.RequestCompleted>();
+		yield return new ClientMessage.TransactionWrite(Guid.NewGuid(), Guid.NewGuid(), Envelope, true, _transactionId, new[] { _evt }, null);
+		requestComplete.Wait();
+		Interlocked.Exchange(ref CompletionMessage, null);
+		Interlocked.Exchange(ref CompletionMessageCount, 0);
+		Envelope.Replies.Clear();
+	}
+
+	protected override Message When() {
+		return new ClientMessage.TransactionCommit(InternalCorrId, ClientCorrId, Envelope, true, _transactionId, null);
+	}
+
+	[Test]
+	public void successful_request_message_is_published() {
+		AssertEx.IsOrBecomesTrue(() => Interlocked.Read(ref CompletionMessageCount) == 1);
+		Assert.AreEqual(InternalCorrId, CompletionMessage.CorrelationId);
+		Assert.True(CompletionMessage.Success);
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to_with_success() {
+		AssertEx.IsOrBecomesTrue(() => Envelope.Replies.Count > 0);
+		Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.TransactionCommitCompleted>(
+			x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.Success), () => $"Does not contain single successful TransactionCommitCompleted with id {ClientCorrId}");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClientOperations/when_starting_a_transaction_expecting_no_stream.cs b/src/KurrentDB.Core.Tests/ClientOperations/when_starting_a_transaction_expecting_no_stream.cs
new file mode 100644
index 00000000000..7affc5bd91f
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientOperations/when_starting_a_transaction_expecting_no_stream.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientOperations;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class when_starting_a_transaction_expecting_no_stream<TLogFormat, TStreamId> : specification_with_request_manager_integration<TLogFormat, TStreamId> {
+	readonly string _streamId = $"new_test_stream_{Guid.NewGuid()}";
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield break;
+	}
+
+	protected override Message When() {
+		return new ClientMessage.TransactionStart(InternalCorrId, ClientCorrId, Envelope, true, _streamId, ExpectedVersion.NoStream, null);
+	}
+
+	[Test]
+	public void successful_request_message_is_published() {
+		AssertEx.IsOrBecomesTrue(() => Interlocked.Read(ref CompletionMessageCount) == 1);
+		Assert.AreEqual(InternalCorrId, CompletionMessage.CorrelationId);
+		Assert.True(CompletionMessage.Success);
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to_with_success() {
+		AssertEx.IsOrBecomesTrue(() => Envelope.Replies.Count > 0);
+		Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.TransactionStartCompleted>(
+			x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.Success));
+	}
+
+}
diff --git a/src/KurrentDB.Core.Tests/ClientOperations/when_starting_a_transaction_expecting_version_any.cs b/src/KurrentDB.Core.Tests/ClientOperations/when_starting_a_transaction_expecting_version_any.cs
new file mode 100644
index 00000000000..2971fa4b919
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClientOperations/when_starting_a_transaction_expecting_version_any.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.ClientOperations;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class when_starting_a_transaction_expecting_version_any<TLogFormat, TStreamId> : specification_with_request_manager_integration<TLogFormat, TStreamId> {
+	readonly string _streamId = $"new_test_stream_{Guid.NewGuid()}";
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield break;
+	}
+
+	protected override Message When() {
+		return new ClientMessage.TransactionStart(InternalCorrId, ClientCorrId, Envelope, true, _streamId, ExpectedVersion.Any, null);
+	}
+
+	[Test]
+	public void successful_request_message_is_published() {
+		AssertEx.IsOrBecomesTrue(() => Interlocked.Read(ref CompletionMessageCount) == 1);
+		Assert.AreEqual(InternalCorrId, CompletionMessage.CorrelationId);
+		Assert.True(CompletionMessage.Success);
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to_with_success() {
+		AssertEx.IsOrBecomesTrue(() => Envelope.Replies.Count > 0);
+		Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.TransactionStartCompleted>(
+			x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.Success));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Cluster/EventStoreClientCacheTests.cs b/src/KurrentDB.Core.Tests/Cluster/EventStoreClientCacheTests.cs
new file mode 100644
index 00000000000..9d08a0fd90f
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Cluster/EventStoreClientCacheTests.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+using EventStore.Core.Cluster;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Services.Transport.Http.NodeHttpClientFactory;
+using KurrentDB.Core.Tests.Fakes;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Cluster;
+
+public class EventStoreClientCacheTests {
+	private static readonly INodeHttpClientFactory NodeHttpClientFactory = new NodeHttpClientFactory(
+		uriScheme: Uri.UriSchemeHttps,
+		nodeCertificateValidator: delegate { return (true, null); },
+		clientCertificateSelector: null);
+
+	private static readonly Func<EndPoint, IPublisher, EventStoreClusterClient> EventStoreClusterClientFactory =
+		(endpoint, bus) =>
+			new EventStoreClusterClient(
+				bus, Uri.UriSchemeHttps, endpoint, NodeHttpClientFactory, null,
+				new DurationTracker.NoOp(),
+				new DurationTracker.NoOp());
+
+	[Test]
+	public void BusShouldNotBeNull() {
+		Assert.Throws<ArgumentNullException>(() =>
+			new EventStoreClusterClientCache(null, EventStoreClusterClientFactory));
+	}
+
+	[Test]
+	public void ClientFactoryShouldNotBeNull() {
+		Assert.Throws<ArgumentNullException>(() =>
+			new EventStoreClusterClientCache(new FakePublisher(), null));
+	}
+
+	[Test]
+	public void CanGetClientForEndpoint() {
+		var sut = new EventStoreClusterClientCache(new FakePublisher(), EventStoreClusterClientFactory);
+
+		var client = sut.Get(new IPEndPoint(IPAddress.Loopback, 1113));
+
+		Assert.AreEqual(client, sut.Get(new IPEndPoint(IPAddress.Loopback, 1113)));
+	}
+
+	[Test]
+	public async Task CleansCacheOnThreshold() {
+		var interval = TimeSpan.FromMinutes(30);
+		var oldItemThreshold = TimeSpan.FromMilliseconds(500);
+		var sut = new EventStoreClusterClientCache(new FakePublisher(), EventStoreClusterClientFactory, interval,
+			oldItemThreshold);
+		var oldClient = sut.Get(new IPEndPoint(IPAddress.Loopback, 1113));
+
+		sut.Handle(new ClusterClientMessage.CleanCache());
+		await Task.Delay(oldItemThreshold.Add(TimeSpan.FromMilliseconds(500)));
+
+		var newClient = sut.Get(new IPEndPoint(IPAddress.Loopback, 1113));
+		newClient = sut.Get(new IPEndPoint(IPAddress.Loopback, 1113));
+		Assert.AreNotEqual(oldClient, newClient);
+	}
+
+	[Test]
+	public void ShouldScheduleCacheCleanOnTimer() {
+		var interval = TimeSpan.FromMilliseconds(1);
+		var bus = new FakePublisher();
+		var sut = new EventStoreClusterClientCache(bus, EventStoreClusterClientFactory, interval, interval);
+
+		sut.Handle(new SystemMessage.SystemInit());
+
+		Assert.True(bus.Messages.OfType<TimerMessage.Schedule>().Count() == 1);
+	}
+
+	[Test]
+	public async Task ShouldDisposeClientOnceEvictedFromCache() {
+		var interval = TimeSpan.FromMinutes(30);
+		var oldItemThreshold = TimeSpan.FromMilliseconds(500);
+		var sut = new EventStoreClusterClientCache(new FakePublisher(), EventStoreClusterClientFactory, interval,
+			oldItemThreshold);
+		var client = sut.Get(new IPEndPoint(IPAddress.Loopback, 1113));
+		Assert.NotNull(client);
+
+		await Task.Delay(oldItemThreshold.Add(TimeSpan.FromMilliseconds(500)));
+		sut.Handle(new ClusterClientMessage.CleanCache());
+		// Give the cache enough time to dispose the client
+		await Task.Delay(oldItemThreshold);
+
+		Assert.True(client.Disposed);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Cluster/MemberInfoTests.cs b/src/KurrentDB.Core.Tests/Cluster/MemberInfoTests.cs
new file mode 100644
index 00000000000..0af0ca0a6d8
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Cluster/MemberInfoTests.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Cluster;
+
+[TestFixture]
+public class MemberInfoTests {
+	[Test]
+	public void member_with_dns_endpoint_should_equal() {
+		var ipAddress = "127.0.0.1";
+		var port = 1113;
+		var memberWithDnsEndPoint = MemberInfo.Initial(Guid.Empty, DateTime.UtcNow,
+			VNodeState.Unknown, true,
+			new DnsEndPoint(ipAddress, port),
+			new DnsEndPoint(ipAddress, port),
+			new DnsEndPoint(ipAddress, port),
+			new DnsEndPoint(ipAddress, port),
+			new DnsEndPoint(ipAddress, port),
+			null, 0, 0,
+			0, false);
+
+		var ipEndPoint = new IPEndPoint(IPAddress.Parse(ipAddress), port);
+		var dnsEndPoint = new DnsEndPoint(ipAddress, port);
+
+		Assert.True(memberWithDnsEndPoint.Is(ipEndPoint));
+		Assert.True(memberWithDnsEndPoint.Is(dnsEndPoint));
+	}
+
+	[Test]
+	public void member_with_ip_endpoint_should_equal() {
+		var ipAddress = "127.0.0.1";
+		var port = 1113;
+		var memberWithDnsEndPoint = MemberInfo.Initial(Guid.Empty, DateTime.UtcNow,
+			VNodeState.Unknown, true,
+			new IPEndPoint(IPAddress.Parse(ipAddress), port),
+			new IPEndPoint(IPAddress.Parse(ipAddress), port),
+			new IPEndPoint(IPAddress.Parse(ipAddress), port),
+			new IPEndPoint(IPAddress.Parse(ipAddress), port),
+			new IPEndPoint(IPAddress.Parse(ipAddress), port),
+			null, 0, 0, 0, false);
+
+		var ipEndPoint = new IPEndPoint(IPAddress.Parse(ipAddress), port);
+		var dnsEndPoint = new DnsEndPoint(ipAddress, port);
+
+		Assert.True(memberWithDnsEndPoint.Is(ipEndPoint));
+		Assert.True(memberWithDnsEndPoint.Is(dnsEndPoint));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ClusterVNodeOptionsExtensions.cs b/src/KurrentDB.Core.Tests/ClusterVNodeOptionsExtensions.cs
new file mode 100644
index 00000000000..df96ce893c7
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ClusterVNodeOptionsExtensions.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Tests.Helpers;
+
+namespace KurrentDB.Core.Tests;
+
+
+public static class ClusterVNodeOptionsExtensions {
+	public static ClusterVNodeOptions ReduceMemoryUsageForTests(this ClusterVNodeOptions options) {
+		return options with {
+			Cluster = options.Cluster with {
+				StreamInfoCacheCapacity = 10_000
+			},
+			Database = options.Database with {
+				ChunkSize = MiniNode.ChunkSize,
+				ChunksCacheSize = MiniNode.CachedChunkSize,
+				StreamExistenceFilterSize = 10_000,
+				ScavengeBackendCacheSize = 64 * 1024,
+			}
+		};
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Constants.cs b/src/KurrentDB.Core.Tests/Constants.cs
new file mode 100644
index 00000000000..65538558851
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Constants.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Settings;
+using KurrentDB.Core.TransactionLog.Chunks;
+
+namespace KurrentDB.Core.Tests;
+
+public class Constants {
+	public const int PTableInitialReaderCount = ESConsts.PTableInitialReaderCount;
+
+	public const int PTableMaxReaderCountDefault = 1 /* StorageWriter */
+												   + 1 /* StorageChaser */
+												   + 1 /* Projections */
+												   + TFChunkScavenger.MaxThreadCount /* Scavenging (1 per thread) */
+												   + 1 /* Subscription LinkTos resolving */
+												   + 4 /* Reader Threads Count */
+												   + 5 /* just in case reserve :) */;
+}
+
diff --git a/src/KurrentDB.Core.Tests/DataStructures/bloom_filter_integrity_should.cs b/src/KurrentDB.Core.Tests/DataStructures/bloom_filter_integrity_should.cs
new file mode 100644
index 00000000000..0c1a4399cba
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/DataStructures/bloom_filter_integrity_should.cs
@@ -0,0 +1,128 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Runtime.InteropServices;
+using KurrentDB.Core.DataStructures.ProbabilisticFilter;
+using KurrentDB.Core.Index.Hashes;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.DataStructures;
+
+[TestFixture]
+public class bloom_filter_integrity_should {
+	private static byte[] NewCacheLine(byte b) {
+		var xs = new byte[64];
+		for (int i = 0; i < xs.Length; i++) {
+			xs[i] = b;
+		}
+		return xs;
+	}
+
+	[DatapointSource]
+	public static object[][] RecoverCases = new object[][] {
+		new object[] { "all zeros is valid", true, NewCacheLine(0x00) },
+		new object[] { "all zeros with hash is valid", true, NewCacheLine(0x00).WithHash() },
+		new object[] { "all ones is invalid", false, NewCacheLine(0xFF) },
+		new object[] { "all ones with hash is valid", true, NewCacheLine(0xFF).WithHash() },
+		new object[] { "data but no hash is invalid", false, NewCacheLine(0x00).With(3, 0xAB) },
+		new object[] { "data with hash is valid", true, NewCacheLine(0x00).With(3, 0xAB).WithHash() },
+	};
+
+	[TestCaseSource(nameof(RecoverCases))]
+	public void recover_correctly(string name, bool expected, byte[] bytes) {
+		var originalBytes = bytes.ToArray();
+
+		var byteSpan = bytes.AsSpan();
+
+		if (expected) {
+			Assert.True(BloomFilterIntegrity.ValidateHash(byteSpan));
+
+			// bytes should be unchanged
+			for (var i = 0; i < bytes.Length; i++) {
+				Assert.AreEqual(originalBytes[i], bytes[i]);
+			}
+		} else {
+			Assert.False(BloomFilterIntegrity.ValidateHash(byteSpan));
+
+			// bytes should be all 1s
+			foreach (var b in bytes) {
+				Assert.AreEqual(0b1111_1111, b);
+			}
+		}
+	}
+
+	[DatapointSource]
+	public static object[][] WriteCases = new object[][] {
+		new object[] { "all 0x00", true, NewCacheLine(0x00) },
+		new object[] { "all 0xAA", true, NewCacheLine(0xAA) },
+		new object[] { "all 0xFF - corrupted and made safe", false, NewCacheLine(0xFF) },
+	};
+
+	[TestCaseSource(nameof(WriteCases))]
+	public void write_correctly(string name, bool expected, byte[] bytes) {
+		var originalBytes = bytes.ToArray();
+		var byteSpan = bytes.AsSpan();
+
+		BloomFilterIntegrity.WriteHash(byteSpan);
+
+		// bytes before the hash should be unchanged
+		for (var i = 0; i < bytes.Length - sizeof(uint); i++) {
+			Assert.AreEqual(originalBytes[i], bytes[i]);
+		}
+
+		// cacheline should be valid
+		if (expected) {
+			Assert.True(BloomFilterIntegrity.ValidateHash(byteSpan));
+		} else {
+			Assert.False(BloomFilterIntegrity.ValidateHash(byteSpan));
+		}
+	}
+
+	[TestCase]
+	public void rehash_when_exactly_one_too_many_bits_are_set() {
+		// some data with hash
+		var cacheLine = NewCacheLine(0x01).WithHash();
+
+		// set an extra bit
+		cacheLine[3] = cacheLine[3].SetBit(3);
+		var copy = cacheLine.ToArray();
+
+		// still valid
+		Assert.True(BloomFilterIntegrity.ValidateHash(cacheLine));
+
+		// same data
+		CollectionAssert.AreEqual(copy[..^4], cacheLine[..^4]);
+
+		// changed hash
+		CollectionAssert.AreNotEqual(copy[^4..], cacheLine[^4..]);
+	}
+
+	[TestCase]
+	public void not_rehash_when_very_different() {
+		// some data with hash
+		var cacheLine = NewCacheLine(0x01).WithHash();
+
+		// corrupt it
+		cacheLine.With(0, 0xEE);
+
+		// not valid
+		Assert.False(BloomFilterIntegrity.ValidateHash(cacheLine));
+	}
+}
+
+static class ByteArrayExtensions {
+	public static byte[] With(this byte[] self, int offset, byte value) {
+		self[offset] = value;
+		return self;
+	}
+
+	public static byte[] WithHash(this byte[] self) {
+		var hasher = new XXHashUnsafe();
+		var hash = hasher.Hash(self.AsSpan()[..^4]);
+		var hashSpan = MemoryMarshal.AsBytes(MemoryMarshal.CreateReadOnlySpan(ref hash, 1));
+		hashSpan.CopyTo(self.AsSpan()[^4..]);
+		return self;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/DataStructures/byte_extensions_should.cs b/src/KurrentDB.Core.Tests/DataStructures/byte_extensions_should.cs
new file mode 100644
index 00000000000..ea072bbbde1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/DataStructures/byte_extensions_should.cs
@@ -0,0 +1,85 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.DataStructures.ProbabilisticFilter;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.DataStructures;
+
+[TestFixture]
+public class byte_extensions_should {
+	[DatapointSource]
+	public static object[][] IsBitSetCases = new object[][] {
+		new object[] { true, (byte)0b1111_0000, 0 },
+		new object[] { true, (byte)0b1111_0000, 1 },
+		new object[] { true, (byte)0b1111_0000, 2 },
+		new object[] { true, (byte)0b1111_0000, 3 },
+		new object[] { false, (byte)0b1111_0000, 4 },
+		new object[] { false, (byte)0b1111_0000, 5 },
+		new object[] { false, (byte)0b1111_0000, 6 },
+		new object[] { false, (byte)0b1111_0000, 7 },
+		new object[] { false, (byte)0b0000_1111, 0 },
+		new object[] { false, (byte)0b0000_1111, 1 },
+		new object[] { false, (byte)0b0000_1111, 2 },
+		new object[] { false, (byte)0b0000_1111, 3 },
+		new object[] { true, (byte)0b0000_1111, 4 },
+		new object[] { true, (byte)0b0000_1111, 5 },
+		new object[] { true, (byte)0b0000_1111, 6 },
+		new object[] { true, (byte)0b0000_1111, 7 },
+	};
+
+	[TestCaseSource(nameof(IsBitSetCases))]
+	public void check_bit_correctly(bool expected, byte x, int bitIndex) {
+		Assert.AreEqual(expected, x.IsBitSet(bitIndex));
+	}
+
+	[DatapointSource]
+	public static object[][] SetBitCases = new object[][] {
+		new object[] { (byte)0b1111_0000, (byte)0b1111_0000, 0 },
+		new object[] { (byte)0b1111_0000, (byte)0b1111_0000, 1 },
+		new object[] { (byte)0b1111_0000, (byte)0b1111_0000, 2 },
+		new object[] { (byte)0b1111_0000, (byte)0b1111_0000, 3 },
+		new object[] { (byte)0b1111_1000, (byte)0b1111_0000, 4 },
+		new object[] { (byte)0b1111_0100, (byte)0b1111_0000, 5 },
+		new object[] { (byte)0b1111_0010, (byte)0b1111_0000, 6 },
+		new object[] { (byte)0b1111_0001, (byte)0b1111_0000, 7 },
+		new object[] { (byte)0b1000_1111, (byte)0b0000_1111, 0 },
+		new object[] { (byte)0b0100_1111, (byte)0b0000_1111, 1 },
+		new object[] { (byte)0b0010_1111, (byte)0b0000_1111, 2 },
+		new object[] { (byte)0b0001_1111, (byte)0b0000_1111, 3 },
+		new object[] { (byte)0b0000_1111, (byte)0b0000_1111, 4 },
+		new object[] { (byte)0b0000_1111, (byte)0b0000_1111, 5 },
+		new object[] { (byte)0b0000_1111, (byte)0b0000_1111, 6 },
+		new object[] { (byte)0b0000_1111, (byte)0b0000_1111, 7 },
+	};
+
+	[TestCaseSource(nameof(SetBitCases))]
+	public void set_bit_correctly(byte expected, byte x, int bitIndex) {
+		Assert.AreEqual(expected, x.SetBit(bitIndex));
+	}
+
+	[DatapointSource]
+	public static object[][] UnsetBitCases = new object[][] {
+		new object[] { (byte)0b0111_0000, (byte)0b1111_0000, 0 },
+		new object[] { (byte)0b1011_0000, (byte)0b1111_0000, 1 },
+		new object[] { (byte)0b1101_0000, (byte)0b1111_0000, 2 },
+		new object[] { (byte)0b1110_0000, (byte)0b1111_0000, 3 },
+		new object[] { (byte)0b1111_0000, (byte)0b1111_0000, 4 },
+		new object[] { (byte)0b1111_0000, (byte)0b1111_0000, 5 },
+		new object[] { (byte)0b1111_0000, (byte)0b1111_0000, 6 },
+		new object[] { (byte)0b1111_0000, (byte)0b1111_0000, 7 },
+		new object[] { (byte)0b0000_1111, (byte)0b0000_1111, 0 },
+		new object[] { (byte)0b0000_1111, (byte)0b0000_1111, 1 },
+		new object[] { (byte)0b0000_1111, (byte)0b0000_1111, 2 },
+		new object[] { (byte)0b0000_1111, (byte)0b0000_1111, 3 },
+		new object[] { (byte)0b0000_0111, (byte)0b0000_1111, 4 },
+		new object[] { (byte)0b0000_1011, (byte)0b0000_1111, 5 },
+		new object[] { (byte)0b0000_1101, (byte)0b0000_1111, 6 },
+		new object[] { (byte)0b0000_1110, (byte)0b0000_1111, 7 },
+	};
+
+	[TestCaseSource(nameof(UnsetBitCases))]
+	public void unset_bit_correctly(byte expected, byte x, int bitIndex) {
+		Assert.AreEqual(expected, x.UnsetBit(bitIndex));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/DataStructures/concurrent_queue_wrapper_should.cs b/src/KurrentDB.Core.Tests/DataStructures/concurrent_queue_wrapper_should.cs
new file mode 100644
index 00000000000..6768de37ed8
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/DataStructures/concurrent_queue_wrapper_should.cs
@@ -0,0 +1,98 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using KurrentDB.Common.Utils;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.DataStructures;
+
+[TestFixture]
+public class concurrent_queue_wrapper_should {
+	[Test]
+	public void return_correct_counts_and_values_1() {
+		var queue = new ConcurrentQueueWrapper<int>();
+		Assert.AreEqual(0, queue.Count);
+		queue.Enqueue(1234);
+		Assert.AreEqual(1, queue.Count);
+		queue.Enqueue(12345);
+		Assert.AreEqual(2, queue.Count);
+
+		int val;
+		Assert.AreEqual(true, queue.TryDequeue(out val));
+		Assert.AreEqual(1234, val);
+		Assert.AreEqual(1, queue.Count);
+
+		Assert.AreEqual(true, queue.TryDequeue(out val));
+		Assert.AreEqual(12345, val);
+		Assert.AreEqual(0, queue.Count);
+
+		Assert.AreEqual(false, queue.TryDequeue(out val));
+		Assert.AreEqual(false, queue.TryDequeue(out val));
+	}
+
+	[Test]
+	public void return_correct_counts_and_values_2() {
+		var queue = new ConcurrentQueueWrapper<int>();
+		for (int i = 1; i <= 1000; i++) {
+			queue.Enqueue(i);
+			Assert.AreEqual(i, queue.Count);
+		}
+
+		int x;
+		for (int i = 1; i <= 1000; i++) {
+			Assert.AreEqual(true, queue.TryDequeue(out x));
+			Assert.AreEqual(i, x);
+			Assert.AreEqual(1000 - i, queue.Count);
+		}
+	}
+}
+
+[TestFixture]
+public class concurrent_queue_wrapper_with_parallel_dequeues_should {
+	private ConcurrentQueueWrapper<int> _concurrentQueue;
+	private const int TOTAL_ENQUEUED_ITEMS = 1000000;
+	private const int NUM_THREADS = 4;
+	private volatile bool _seenNegativeCount;
+	private volatile int _totalDequeued;
+
+	public concurrent_queue_wrapper_with_parallel_dequeues_should() {
+		_concurrentQueue = new ConcurrentQueueWrapper<int>();
+		_seenNegativeCount = false;
+		_totalDequeued = 0;
+	}
+
+	private void DequeueThread() {
+		int x;
+		while (_totalDequeued < TOTAL_ENQUEUED_ITEMS) {
+			var dequeued = _concurrentQueue.TryDequeue(out x);
+			if (_concurrentQueue.Count < 0)
+				_seenNegativeCount = true;
+			if (dequeued)
+				Interlocked.Increment(ref _totalDequeued);
+		}
+	}
+
+	[Test]
+	public void always_return_non_negative_count() {
+		var threads = new Thread[NUM_THREADS];
+		for (int i = 0; i < NUM_THREADS; i++) {
+			threads[i] = new Thread(DequeueThread);
+			threads[i].Start();
+		}
+
+		int x;
+		for (int i = 0; i < TOTAL_ENQUEUED_ITEMS; i++) {
+			_concurrentQueue.Enqueue(1);
+			var dequeued = _concurrentQueue.TryDequeue(out x);
+			if (dequeued)
+				Interlocked.Increment(ref _totalDequeued);
+		}
+
+		for (int i = 0; i < NUM_THREADS; i++)
+			threads[i].Join(TimeSpan.FromSeconds(5));
+
+		Assert.AreEqual(false, _seenNegativeCount);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/DataStructures/pairing_heap_should.cs b/src/KurrentDB.Core.Tests/DataStructures/pairing_heap_should.cs
new file mode 100644
index 00000000000..85471c12090
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/DataStructures/pairing_heap_should.cs
@@ -0,0 +1,116 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.DataStructures;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.DataStructures;
+
+[TestFixture]
+public class pairing_heap_should {
+	PairingHeap<int> _heap;
+
+	[SetUp]
+	public void SetUp() {
+		_heap = new PairingHeap<int>();
+	}
+
+	[TearDown]
+	public void TearDown() {
+		_heap = null;
+	}
+
+	[Test]
+	public void throw_argumentnullexception_when_given_null_comparer() {
+		Assert.Throws<ArgumentNullException>(() => new PairingHeap<int>(null as IComparer<int>));
+	}
+
+	[Test]
+	public void throw_argumentnullexception_when_given_null_compare_func() {
+		Assert.Throws<ArgumentNullException>(() => new PairingHeap<int>(null as Func<int, int, bool>));
+	}
+
+	[Test]
+	public void throw_invalidoperationexception_when_trying_to_find_min_element_on_empty_queue() {
+		Assert.Throws<InvalidOperationException>(() => _heap.FindMin());
+	}
+
+	[Test]
+	public void throw_invalidoperationexception_when_trying_to_delete_min_element_on_empty_queue() {
+		Assert.Throws<InvalidOperationException>(() => _heap.DeleteMin());
+	}
+
+	[Test]
+	public void return_correct_min_element_and_keep_it_in_heap_on_findmin_operation() {
+		_heap.Add(9);
+		_heap.Add(7);
+		_heap.Add(5);
+		_heap.Add(3);
+
+		Assert.That(_heap.FindMin(), Is.EqualTo(3));
+		Assert.That(_heap.Count, Is.EqualTo(4));
+	}
+
+	[Test]
+	public void return_correct_min_element_and_remove_it_from_heap_on_delete_min_operation() {
+		_heap.Add(7);
+		_heap.Add(5);
+		_heap.Add(3);
+
+		Assert.That(_heap.DeleteMin(), Is.EqualTo(3));
+		Assert.That(_heap.Count, Is.EqualTo(2));
+	}
+
+	[Test]
+	public void return_elements_in_sorted_order() {
+		var reference = new[] { 2, 5, 7, 9, 11, 27, 32 };
+		var returned = new List<int>();
+
+		for (int i = reference.Length - 1; i >= 0; --i) {
+			_heap.Add(reference[i]);
+		}
+
+		while (_heap.Count > 0) {
+			returned.Add(_heap.DeleteMin());
+		}
+
+		Assert.That(returned, Is.EquivalentTo(reference));
+	}
+
+	[Test]
+	public void keep_all_duplicates() {
+		var reference = new[] { 2, 5, 5, 7, 9, 9, 11, 11, 11, 27, 32 };
+		var returned = new List<int>();
+
+		for (int i = reference.Length - 1; i >= 0; --i) {
+			_heap.Add(reference[i]);
+		}
+
+		while (_heap.Count > 0) {
+			returned.Add(_heap.DeleteMin());
+		}
+
+		Assert.That(returned, Is.EquivalentTo(reference));
+	}
+
+	[Test]
+	public void handle_a_lot_of_elements_and_not_loose_any_elements() {
+		var elements = new List<int>();
+		var rnd = new Random(123456791);
+
+		for (int i = 0; i < 1000; ++i) {
+			var elem = rnd.Next();
+			elements.Add(elem);
+			_heap.Add(elem);
+		}
+
+		elements.Sort();
+
+		var returned = new List<int>();
+		while (_heap.Count > 0) {
+			returned.Add(_heap.DeleteMin());
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/DataStructures/persistent_stream_bloom_filter.cs b/src/KurrentDB.Core.Tests/DataStructures/persistent_stream_bloom_filter.cs
new file mode 100644
index 00000000000..97168ab5a77
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/DataStructures/persistent_stream_bloom_filter.cs
@@ -0,0 +1,260 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using KurrentDB.Core.DataStructures.ProbabilisticFilter;
+using KurrentDB.Core.Index.Hashes;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.DataStructures;
+
+public enum PersistenceStrategy {
+	MemoryMapped,
+	FileStream,
+}
+
+[TestFixture(PersistenceStrategy.MemoryMapped, PersistenceStrategy.MemoryMapped)]
+[TestFixture(PersistenceStrategy.MemoryMapped, PersistenceStrategy.FileStream)]
+[TestFixture(PersistenceStrategy.FileStream, PersistenceStrategy.MemoryMapped)]
+[TestFixture(PersistenceStrategy.FileStream, PersistenceStrategy.FileStream)]
+public class persistent_stream_bloom_filter : SpecificationWithDirectoryPerTestFixture {
+	private readonly PersistenceStrategy _forCreate;
+	private readonly PersistenceStrategy _forOpen;
+
+	public persistent_stream_bloom_filter(PersistenceStrategy forCreate, PersistenceStrategy forOpen) {
+		_forCreate = forCreate;
+		_forOpen = forOpen;
+	}
+
+	PersistentStreamBloomFilter GenSut(string path, bool create, long size, ILongHasher<string> hasher) =>
+		(create ? _forCreate : _forOpen) switch {
+			PersistenceStrategy.MemoryMapped =>
+				new PersistentStreamBloomFilter(
+					new MemoryMappedFilePersistence(size, path, create),
+					hasher: hasher),
+
+			PersistenceStrategy.FileStream =>
+				new PersistentStreamBloomFilter(
+					new FileStreamPersistence(size, path, create),
+					hasher: hasher),
+
+			_ => throw new ArgumentOutOfRangeException(),
+		};
+
+	private static string GenerateCharset() {
+		var charset = "";
+		for (var c = 'a'; c <= 'z'; c++) {
+			charset += c;
+		}
+		for (var c = 'A'; c <= 'Z'; c++) {
+			charset += c;
+		}
+		for (var c = '0'; c <= '9'; c++) {
+			charset += c;
+		}
+		charset += "!@#$%^&*()-_";
+		return charset;
+	}
+
+	private static string GenerateRandomString(int length, string charset, Random random) {
+		string s = "";
+		for (var j = 0; j < length; j++) {
+			s += charset[random.Next() % charset.Length];
+		}
+
+		return s;
+	}
+
+	private static string[] GenerateRandomStrings(int count, int maxLength) {
+		var random = new Random(123);
+		var strings = new List<string>();
+		var charset = GenerateCharset();
+
+		for (int i = 0; i < count; i++) {
+			int length = 1 + random.Next() % maxLength;
+			strings.Add(GenerateRandomString(length, charset, random));
+		}
+
+		return strings.ToArray();
+	}
+
+	[TestFixture(PersistenceStrategy.MemoryMapped, PersistenceStrategy.MemoryMapped)]
+	[TestFixture(PersistenceStrategy.MemoryMapped, PersistenceStrategy.FileStream)]
+	[TestFixture(PersistenceStrategy.FileStream, PersistenceStrategy.MemoryMapped)]
+	[TestFixture(PersistenceStrategy.FileStream, PersistenceStrategy.FileStream)]
+	private class with_fixed_size_filter : persistent_stream_bloom_filter {
+		private PersistentStreamBloomFilter _filter;
+		private string _path;
+
+		public with_fixed_size_filter(PersistenceStrategy forCreate, PersistenceStrategy forOpen)
+			: base(forCreate, forOpen) {
+		}
+
+		[SetUp]
+		public void SetUp() {
+			_path = GetTempFilePath();
+			_filter = GenSut(_path, create: true, BloomFilterAccessor.MinSizeKB * 1000, hasher: null);
+		}
+
+		[TearDown]
+		public void Teardown() => _filter?.Dispose();
+
+		[Test]
+		public void creates_the_file_on_disk() => Assert.That(File.Exists(_path));
+
+		[Test]
+		public void can_close_and_reopen() {
+			_filter.Add("hello");
+			_filter.Flush();
+			_filter.Dispose();
+			using var newFilter = GenSut(_path, create: false, BloomFilterAccessor.MinSizeKB * 1000, hasher: null);
+			Assert.IsTrue(newFilter.MightContain("hello"));
+		}
+
+		[Test]
+		public void can_detect_incorrect_size() {
+			_filter.Add("hello");
+			_filter.Flush();
+			_filter.Dispose();
+
+			Assert.Throws<SizeMismatchException>(() => {
+				using var newFilter = GenSut(_path, create: false, BloomFilterAccessor.MinSizeKB * 1000 + 1, hasher: null);
+			});
+		}
+
+		[Test]
+		public void creates_correct_header() {
+			_filter.Dispose();
+			using var fileStream = File.Open(_path, FileMode.Open);
+			var binaryReader = new BinaryReader(fileStream);
+
+			var version = binaryReader.ReadByte();
+			binaryReader.ReadByte();
+			binaryReader.ReadByte();
+			binaryReader.ReadByte();
+			var corruptionRebuildCount = binaryReader.ReadInt32();
+			var numBits = binaryReader.ReadInt64();
+			Assert.AreEqual(0x01, version);
+			Assert.AreEqual(0, corruptionRebuildCount);
+			Assert.AreEqual(BloomFilterAccessor.MinSizeKB * 1000 * 8, numBits);
+		}
+
+		[Test]
+		public void supports_adding_long_strings() {
+			var charset = GenerateCharset();
+			var random = new Random(123);
+			var longString = GenerateRandomString(10000, charset, random);
+
+			Assert.IsFalse(_filter.MightContain(longString));
+			_filter.Add(longString);
+			Assert.IsTrue(_filter.MightContain(longString));
+		}
+	}
+
+	[Test, Combinatorial]
+	public void has_false_positives_with_probability_p(
+		[Values(BloomFilterAccessor.MinSizeKB * 1000, 2 * BloomFilterAccessor.MinSizeKB * 1000)] long size,
+		[Values(0.001, 0.02, 0.05, 0.1, 0.2)] double p
+	) {
+		using var filter = GenSut(GetTempFilePath(), create: true, size, hasher: null);
+		var n = (int)filter.CalculateOptimalNumItems(p);
+
+		var random = new Random(123);
+		var charset = GenerateCharset();
+
+		var list = new List<string>();
+
+		var selected = new HashSet<string>();
+		//generate 2n distinct items
+		for (int i = 0; i < 2 * n; i++) {
+			while (true) {
+				var length = 1 + random.Next() % 10;
+				var s = GenerateRandomString(length, charset, random);
+				if (selected.Contains(s))
+					continue;
+				list.Add(s);
+				selected.Add(s);
+				break;
+			}
+		}
+
+		//add first n distinct items to the filter
+		for (int i = 0; i < n; i++) {
+			filter.Add(list[i]);
+		}
+
+		//expected number of false positives
+		var expectedFalsePositives = Convert.ToInt32(Math.Ceiling(n * p));
+
+		//the second n distinct items should not exist but there may be some false positives
+		var falsePositives = 0;
+		for (var i = n; i < 2 * n; i++) {
+			if (filter.MightContain(list[i])) {
+				falsePositives++;
+			}
+		}
+
+		//X = random variable that takes value 1 with probability p and value 0 with probability (1-p)
+		//var(X) = E(X^2) - E(X)^2 = p - p*p;
+		//var(X1 + X2 + X3 + ... + Xn) = n*var(Xi); //variance of n uncorrelated random variables
+		//var(X1 + X2 + X3 + ... + Xn) = n*(p-p*p);
+		var variance = n * (p - (p * p));
+		var standardDeviation = Math.Sqrt(variance);
+		var threeStandardDeviations = 3 * standardDeviation; //99.7%
+
+		if (falsePositives > 0)
+			Console.Out.WriteLine("n: {0:N0}, p:{1:N3}. Found {2:N0} false positives. Expected false positives: {3:N0}. Standard deviation: {4:N2}",
+				n, p, falsePositives, expectedFalsePositives, standardDeviation);
+
+		Assert.LessOrEqual(falsePositives, expectedFalsePositives + threeStandardDeviations);
+		Assert.GreaterOrEqual(falsePositives, Math.Max(0, expectedFalsePositives - threeStandardDeviations));
+	}
+
+	[Test, Category("LongRunning")]
+	public void always_returns_true_when_an_item_was_added([Range(10_000, 100_000, 13337)] long size) {
+		using var filter = GenSut(GetTempFilePath(), create: true, size, hasher: null);
+		var strings = GenerateRandomStrings((int)filter.CalculateOptimalNumItems(PersistentBloomFilter.RecommendedFalsePositiveProbability), 100);
+
+		//no items added yet
+		foreach (var s in strings) {
+			Assert.IsFalse(filter.MightContain(s));
+		}
+
+		//add the items and verify their existence
+		foreach (var s in strings) {
+			filter.Add(s);
+			Assert.IsTrue(filter.MightContain(s));
+		}
+
+		//all the items should exist
+		foreach (var s in strings) {
+			Assert.IsTrue(filter.MightContain(s));
+		}
+	}
+
+	[Test]
+	public void throws_argument_out_of_range_exception_when_given_negative_size() {
+		Assert.Throws<ArgumentOutOfRangeException>(() =>
+			GenSut(GetTempFilePath(), create: true, size: -1, hasher: null));
+	}
+
+	[Test]
+	public void throws_argument_out_of_range_exception_when_given_zero_size() {
+		Assert.Throws<ArgumentOutOfRangeException>(() =>
+			GenSut(GetTempFilePath(), create: true, size: 0, hasher: null));
+	}
+
+	[Test]
+	public void throws_argument_out_of_range_exception_when_size_less_than_min_size() {
+		Assert.Throws<ArgumentOutOfRangeException>(() =>
+			GenSut(GetTempFilePath(), create: true, size: BloomFilterAccessor.MinSizeKB * 1000 - 1, hasher: null));
+	}
+
+	[Test]
+	public void throws_argument_out_of_range_exception_when_size_greater_than_max_size() {
+		Assert.Throws<ArgumentOutOfRangeException>(() =>
+			GenSut(GetTempFilePath(), create: true, size: BloomFilterAccessor.MaxSizeKB * 1000 + 1, hasher: null));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/DataStructures/unmanaged_memory_append_only_list_should.cs b/src/KurrentDB.Core.Tests/DataStructures/unmanaged_memory_append_only_list_should.cs
new file mode 100644
index 00000000000..63518b8cb81
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/DataStructures/unmanaged_memory_append_only_list_should.cs
@@ -0,0 +1,170 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.DataStructures;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.DataStructures;
+
+[TestFixture(1)]
+[TestFixture(2)]
+[TestFixture(10)]
+[TestFixture(13)]
+[TestFixture(100)]
+public class unmanaged_memory_append_only_list_should {
+	private UnmanagedMemoryAppendOnlyList<int> _list;
+	private readonly int _maxCapacity;
+
+	public unmanaged_memory_append_only_list_should(int maxCapacity) {
+		_maxCapacity = maxCapacity;
+	}
+
+	[SetUp]
+	public void SetUp() {
+		_list = new UnmanagedMemoryAppendOnlyList<int>(_maxCapacity);
+	}
+
+	[TearDown]
+	public void TearDown() {
+		_list?.Dispose();
+	}
+
+	[Test]
+	public void correctly_add_items() {
+		Assert.AreEqual(0, _list.Count);
+
+		for (int i = 1; i <= _maxCapacity; i++) {
+			_list.Add(i);
+			Assert.AreEqual(i, _list.Count);
+		}
+
+		for (int i = 0; i < _maxCapacity; i++) {
+			Assert.AreEqual(i + 1, _list[i]);
+		}
+	}
+
+	[Test]
+	public void return_correct_count_and_items_with_as_span() {
+		Assert.AreEqual(0, _list.AsSpan().Length);
+
+		for (int i = 1; i <= _maxCapacity; i++) {
+			_list.Add(i);
+			var span = _list.AsSpan();
+			Assert.AreEqual(i, span.Length);
+			for (int j = 0; j < i; j++) {
+				Assert.AreEqual(j + 1, span[j]);
+			}
+		}
+	}
+
+	[Test]
+	public void correctly_clear_items() {
+		Assert.AreEqual(0, _list.Count);
+
+		//add _maxCapacity items with values 1.._maxCapacity
+		for (int i = 1; i <= _maxCapacity; i++) {
+			_list.Add(i);
+			Assert.AreEqual(i, _list.Count);
+		}
+
+		//clear the list
+		_list.Clear();
+		Assert.AreEqual(0, _list.Count);
+
+		//we should not be able to access any item at indexes 0.._maxCapacity-1
+		for (int i = 0; i < _maxCapacity; i++) {
+			Assert.Throws<IndexOutOfRangeException>(() => {
+				var unused = _list[i];
+			});
+		}
+
+		//add _maxCapacity items with values -1..-_maxCapacity
+		for (int i = 1; i <= _maxCapacity; i++) {
+			_list.Add(-i);
+			Assert.AreEqual(i, _list.Count);
+		}
+
+		//verify that the new items have been correctly added
+		for (int i = 0; i < _maxCapacity; i++) {
+			Assert.AreEqual(-(i + 1), _list[i]);
+		}
+	}
+
+	[Test]
+	public void throw_max_capacity_reached_exception_if_list_is_full() {
+		for (int i = 1; i <= _maxCapacity; i++) {
+			_list.Add(0);
+		}
+
+		Assert.Throws<MaxCapacityReachedException>(() => {
+			_list.Add(0);
+		});
+	}
+
+	[Test]
+	public void throw_index_out_of_range_exception_when_accessing_out_of_bounds_index() {
+		int unused;
+		Assert.Throws<IndexOutOfRangeException>(() => {
+			unused = _list[-1];
+		});
+
+		Assert.Throws<IndexOutOfRangeException>(() => {
+			unused = _list[-2];
+		});
+
+		for (int i = 0; i < _maxCapacity; i++) {
+			Assert.Throws<IndexOutOfRangeException>(() => {
+				unused = _list[i];
+			});
+			_list.Add(0);
+
+			Assert.DoesNotThrow(() => {
+				unused = _list[i];
+			});
+		}
+
+		Assert.Throws<IndexOutOfRangeException>(() => {
+			unused = _list[_maxCapacity];
+		});
+
+		Assert.Throws<IndexOutOfRangeException>(() => {
+			unused = _list[_maxCapacity + 1];
+		});
+	}
+
+	[Test]
+	public void be_passed_by_reference() {
+		Assert.AreEqual(0, _list.Count);
+		Add(_list, 5);
+		Assert.AreEqual(1, _list.Count);
+		Assert.AreEqual(5, _list[0]);
+		Clear(_list);
+		Assert.AreEqual(0, _list.Count);
+	}
+
+	private static void Add(IAppendOnlyList<int> list, int value) {
+		list.Add(value);
+	}
+
+	private static void Clear(IAppendOnlyList<int> list) {
+		list.Clear();
+	}
+}
+
+public class unmanaged_memory_append_only_list_with_non_positive_capacity_should {
+	[Test]
+	public void throw_argument_exception() {
+		Assert.Throws<ArgumentException>(() => {
+			var unused = new UnmanagedMemoryAppendOnlyList<int>(0);
+		});
+
+		Assert.Throws<ArgumentException>(() => {
+			var unused = new UnmanagedMemoryAppendOnlyList<int>(-1);
+		});
+
+		Assert.Throws<ArgumentException>(() => {
+			var unused = new UnmanagedMemoryAppendOnlyList<int>(-2);
+		});
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/DefaultData.cs b/src/KurrentDB.Core.Tests/DefaultData.cs
new file mode 100644
index 00000000000..ea908bc2de1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/DefaultData.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Core.Services;
+
+namespace KurrentDB.Core.Tests;
+
+public class DefaultData {
+	public static string AdminUsername = SystemUsers.Admin;
+	public static string AdminPassword = SystemUsers.DefaultAdminPassword;
+	public static UserCredentials AdminCredentials = new UserCredentials(AdminUsername, AdminPassword);
+	public static NetworkCredential AdminNetworkCredentials = new NetworkCredential(AdminUsername, AdminPassword);
+	public static ClusterVNodeOptions.DefaultUserOptions DefaultUserOptions = new ClusterVNodeOptions.DefaultUserOptions() {
+		DefaultAdminPassword = SystemUsers.DefaultAdminPassword,
+		DefaultOpsPassword = SystemUsers.DefaultOpsPassword
+	};
+}
diff --git a/src/KurrentDB.Core.Tests/DirectoryDeleter.cs b/src/KurrentDB.Core.Tests/DirectoryDeleter.cs
new file mode 100644
index 00000000000..9623b05356a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/DirectoryDeleter.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core.Tests;
+
+public static class DirectoryDeleter {
+	public static async Task TryForceDeleteDirectoryAsync(string path, int retries = 10) {
+		// retry because ClusterNode.StopAsync completes immediately on receiving BecomeShutdown
+		// but BecomeShutdown also causes the StorageReaderService to close the index.
+		for (var i = 0; i < retries; i++) {
+			if (TryForceDeleteDirectory(path))
+				return;
+			await Task.Delay(1000);
+		}
+	}
+	private static bool TryForceDeleteDirectory(string path) {
+		try {
+			ForceDeleteDirectory(path);
+			return true;
+		} catch {
+			return false;
+		}
+	}
+
+	private static void ForceDeleteDirectory(string path) {
+		var directory = new DirectoryInfo(path) { Attributes = FileAttributes.Normal };
+		foreach (var info in directory.GetFileSystemInfos("*", SearchOption.AllDirectories)) {
+			info.Attributes = FileAttributes.Normal;
+		}
+
+		directory.Delete(true);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ExclusiveDbLockTests.cs b/src/KurrentDB.Core.Tests/ExclusiveDbLockTests.cs
new file mode 100644
index 00000000000..64dcfa63b4f
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ExclusiveDbLockTests.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests;
+
+[TestFixture]
+public class ExclusiveDbLockTests {
+	[Test]
+	public async Task can_release_when_running_in_task_pool() {
+		using var sut = new ExclusiveDbLock(GetDbPath());
+		Assert.True(sut.Acquire());
+		Assert.True(sut.IsAcquired);
+		await Task.Delay(1);
+		sut.Release();
+	}
+
+	[Test]
+	public void acquiring_twice_throws() {
+		using var sut = new ExclusiveDbLock(GetDbPath());
+		sut.Acquire();
+		Assert.Throws<InvalidOperationException>(() => sut.Acquire());
+	}
+
+	[Test]
+	public void releasing_before_acquiring_throws() {
+		using var sut = new ExclusiveDbLock(GetDbPath());
+		Assert.Throws<InvalidOperationException>(() => sut.Release());
+	}
+
+	private static string GetDbPath() => $"/tmp/eventstore/{Guid.NewGuid()}";
+
+
+}
diff --git a/src/EventStore.Core.Tests/FakePlugin/FakePlugin.cs b/src/KurrentDB.Core.Tests/FakePlugin/FakePlugin.cs
similarity index 100%
rename from src/EventStore.Core.Tests/FakePlugin/FakePlugin.cs
rename to src/KurrentDB.Core.Tests/FakePlugin/FakePlugin.cs
diff --git a/src/EventStore.Core.Tests/FakePlugin/FakePlugin.csproj b/src/KurrentDB.Core.Tests/FakePlugin/FakePlugin.csproj
similarity index 100%
rename from src/EventStore.Core.Tests/FakePlugin/FakePlugin.csproj
rename to src/KurrentDB.Core.Tests/FakePlugin/FakePlugin.csproj
diff --git a/src/KurrentDB.Core.Tests/Fakes/FakeLogger.cs b/src/KurrentDB.Core.Tests/Fakes/FakeLogger.cs
new file mode 100644
index 00000000000..ba8773323b9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Fakes/FakeLogger.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using Serilog;
+using Serilog.Events;
+
+namespace KurrentDB.Core.Tests.Fakes;
+
+public class FakeLogger : ILogger {
+	public List<LogEvent> LogMessages { get; } = new();
+
+	public void Write(LogEvent logEvent) {
+		LogMessages.Add(logEvent);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Fakes/FakePublisher.cs b/src/KurrentDB.Core.Tests/Fakes/FakePublisher.cs
new file mode 100644
index 00000000000..274e9ff2bc6
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Fakes/FakePublisher.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Tests.Fakes;
+
+public class FakePublisher : IPublisher {
+	public readonly List<Message> Messages;
+
+	public FakePublisher() {
+		Messages = new List<Message>();
+	}
+
+	public void Publish(Message message) {
+		Messages.Add(message);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Fakes/FakeTfReader.cs b/src/KurrentDB.Core.Tests/Fakes/FakeTfReader.cs
new file mode 100644
index 00000000000..477d46ca70c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Fakes/FakeTfReader.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog;
+
+namespace KurrentDB.Core.Tests.Fakes;
+
+public class FakeTfReader : ITransactionFileReader {
+	public void Reposition(long position) {
+		throw new NotImplementedException();
+	}
+
+	public ValueTask<SeqReadResult> TryReadNext(CancellationToken token)
+		=> ValueTask.FromException<SeqReadResult>(new NotImplementedException());
+
+	public ValueTask<SeqReadResult> TryReadPrev(CancellationToken token)
+		=> ValueTask.FromException<SeqReadResult>(new NotImplementedException());
+
+	public ValueTask<RecordReadResult> TryReadAt(long position, bool couldBeScavenged, CancellationToken token)
+		=> ValueTask.FromException<RecordReadResult>(new NotImplementedException());
+
+	public ValueTask<bool> ExistsAt(long position, CancellationToken token)
+		=> token.IsCancellationRequested ? ValueTask.FromCanceled<bool>(token) : ValueTask.FromResult(true);
+}
diff --git a/src/KurrentDB.Core.Tests/Fakes/NoopPublisher.cs b/src/KurrentDB.Core.Tests/Fakes/NoopPublisher.cs
new file mode 100644
index 00000000000..d6b86216620
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Fakes/NoopPublisher.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Tests.Fakes;
+
+public class NoopPublisher : IPublisher {
+	public void Publish(Message message) {
+		// do nothing
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Hashes/MD5HashTests.cs b/src/KurrentDB.Core.Tests/Hashes/MD5HashTests.cs
new file mode 100644
index 00000000000..e177f70b16f
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Hashes/MD5HashTests.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using KurrentDB.Core.Hashing;
+using KurrentDB.Core.Util;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Hashes;
+
+[TestFixture]
+public class MD5HashTests {
+	[Test]
+	public void does_not_include_previous_data_in_stream() {
+		var bytes = new byte[1024];
+		for (int i = 15; i < 1024; i++) {
+			bytes[i] = (byte)(i % 255);
+		}
+
+		var stream = new MemoryStream(bytes);
+		stream.Seek(16, SeekOrigin.Begin);
+		var hash = MD5Hash.GetHashFor(stream);
+		Array.Copy(hash, 0, bytes, 0, hash.Length);
+		stream.Seek(16, SeekOrigin.Begin);
+		var hash2 = MD5Hash.GetHashFor(stream);
+		Assert.AreEqual(16, hash.Length);
+		Assert.AreEqual(hash, hash2);
+	}
+
+	[Test]
+	public void changing_data_in_stream_results_in_different_hash() {
+		var bytes = new byte[1024];
+		for (int i = 15; i < 1024; i++) {
+			bytes[i] = (byte)(i % 255);
+		}
+
+		var stream = new MemoryStream(bytes);
+		stream.Seek(16, SeekOrigin.Begin);
+		var hash = MD5Hash.GetHashFor(stream);
+		bytes[243] = 17;
+		stream.Seek(16, SeekOrigin.Begin);
+		var hash2 = MD5Hash.GetHashFor(stream);
+		Assert.AreNotEqual(hash, hash2);
+	}
+
+	[Test]
+	public void includes_correct_substream_data() {
+		var bytes = new byte[1024];
+		for (int i = 15; i < 1024; i++) {
+			bytes[i] = (byte)(i % 255);
+		}
+
+		var stream = new MemoryStream(bytes);
+		var hash = MD5Hash.GetHashFor(stream, 16, bytes.Length - 32);
+
+		using (var md5 = MD5.Create()) {
+			var referenceHash = md5.ComputeHash(bytes, 16, bytes.Length - 32);
+			Assert.AreEqual(16, hash.Length);
+			Assert.AreEqual(referenceHash, hash);
+		}
+	}
+
+	[Test, Category("LongRunning"), Explicit]
+	public void randomized_hash_verification_test() {
+		var buf = new byte[1024];
+		var seed = Environment.TickCount;
+		Console.WriteLine("Seed: {0}", seed);
+		new Random().NextBytes(buf);
+
+		var stream = new MemoryStream(buf);
+
+		using (var md5 = MD5.Create()) {
+			for (int i = 0; i < buf.Length; ++i) {
+				for (int j = i; j < buf.Length + 10; ++j) {
+					var referenceHash = md5.ComputeHash(buf, i, Math.Min(buf.Length - i, j - i + 1));
+					var hash = MD5Hash.GetHashFor(stream, i, j - i + 1);
+					Assert.AreEqual(16, hash.Length);
+					Assert.AreEqual(referenceHash, hash);
+				}
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Hashes/SMHasher.cs b/src/KurrentDB.Core.Tests/Hashes/SMHasher.cs
new file mode 100644
index 00000000000..5f72b564ae9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Hashes/SMHasher.cs
@@ -0,0 +1,122 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Index.Hashes;
+
+namespace KurrentDB.Core.Tests.Hashes;
+
+/// <summary>
+/// Adapted Verification and Sanity checks from SMHasher
+/// http://code.google.com/p/smhasher/
+/// </summary>
+public static class SMHasher {
+	//-----------------------------------------------------------------------------
+	// This should hopefully be a thorough and unambiguous test of whether a hash
+	// is correctly implemented on a given platform
+	public static bool VerificationTest(IHasher hasher, uint expected) {
+		const int hashBytes = 4;
+
+		var key = new byte[256];
+		var hashes = new byte[hashBytes * 256];
+
+		// Hash keys of the form {0}, {0,1}, {0,1,2}... up to N=255,using 256-N as
+		// the seed
+		for (int i = 0; i < 256; i++) {
+			key[i] = (byte)i;
+
+			var hash = hasher.Hash(key, 0, (uint)i, (uint)(256 - i));
+			Buffer.BlockCopy(BitConverter.GetBytes(hash), 0, hashes, i * hashBytes, hashBytes);
+		}
+
+		// Then hash the result array
+
+		var verification = hasher.Hash(hashes, 0, hashBytes * 256, 0);
+
+		// The first four bytes of that hash, interpreted as a little-endian integer, is our
+		// verification value
+
+		//uint verification = (final[0] << 0) | (final[1] << 8) | (final[2] << 16) | (final[3] << 24);
+
+
+		//----------
+
+		if (expected != verification) {
+			Console.WriteLine("Verification value 0x{0:X8} : Failed! (Expected 0x{1:X8})", verification, expected);
+			return false;
+		} else {
+			Console.WriteLine("Verification value 0x{0:X8} : Passed!", verification);
+			return true;
+		}
+	}
+
+	//----------------------------------------------------------------------------
+	// Basic sanity checks:
+	//     - A hash function should not be reading outside the bounds of the key.
+	//     - Flipping a bit of a key should, with overwhelmingly high probability, result in a different hash.
+	//     - Hashing the same key twice should always produce the same result.
+	//     - The memory alignment of the key should not affect the hash result.
+	public static bool SanityTest(IHasher hasher) {
+		var rnd = new Random(883741);
+
+		bool result = true;
+
+		const int reps = 10;
+		const int keymax = 256;
+		const int pad = 16;
+		const int buflen = keymax + pad * 3;
+
+		byte[] buffer1 = new byte[buflen];
+		byte[] buffer2 = new byte[buflen];
+		//----------
+		for (int irep = 0; irep < reps; irep++) {
+			if (irep % (reps / 10) == 0)
+				Console.Write(".");
+
+			for (int len = 4; len <= keymax; len++) {
+				for (int offset = pad; offset < pad * 2; offset++) {
+					//                        byte* key1 = &buffer1[pad];
+					//                        byte* key2 = &buffer2[pad+offset];
+
+					rnd.NextBytes(buffer1);
+					rnd.NextBytes(buffer2);
+
+					//memcpy(key2, key1, len);
+					Buffer.BlockCopy(buffer2, pad + offset, buffer1, pad, len);
+
+					// hash1 = hash(key1, len, 0)
+					var hash1 = hasher.Hash(buffer1, pad, (uint)len, 0);
+
+					for (int bit = 0; bit < (len * 8); bit++) {
+						// Flip a bit, hash the key -> we should get a different result.
+						//Flipbit(key2,len,bit);
+						Flipbit(buffer2, pad + offset, len, bit);
+						var hash2 = hasher.Hash(buffer2, pad + offset, (uint)len, 0);
+
+						if (hash1 == hash2)
+							result = false;
+
+						// Flip it back, hash again -> we should get the original result.
+						//flipbit(key2,len,bit);
+						Flipbit(buffer2, pad + offset, len, bit);
+						//hash(key2, len, 0, hash2);
+						hash2 = hasher.Hash(buffer2, pad + offset, (uint)len, 0);
+
+						if (hash1 != hash2)
+							result = false;
+					}
+				}
+			}
+		}
+
+		return result;
+	}
+
+	private static void Flipbit(byte[] array, int offset, int len, int bit) {
+		var byteNum = bit >> 3;
+		bit = bit & 0x7;
+
+		if (byteNum < len)
+			array[offset + byteNum] ^= (byte)(1 << bit);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Hashes/murmur2_hash_should.cs b/src/KurrentDB.Core.Tests/Hashes/murmur2_hash_should.cs
new file mode 100644
index 00000000000..29504618942
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Hashes/murmur2_hash_should.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Index.Hashes;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Hashes;
+
+[TestFixture]
+public class murmur2_hash_should {
+	public static uint Murmur2ReferenceVerificationValue = 0x27864C1E; // taken from SMHasher
+
+	[Test]
+	public void pass_smhasher_verification_test() {
+		Assert.IsTrue(SMHasher.VerificationTest(new Murmur2Unsafe(), Murmur2ReferenceVerificationValue));
+	}
+
+	[Test, Category("LongRunning"), Explicit]
+	public void pass_smhasher_sanity_test() {
+		Assert.IsTrue(SMHasher.SanityTest(new Murmur2Unsafe()));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Hashes/murmur3a_hash_should.cs b/src/KurrentDB.Core.Tests/Hashes/murmur3a_hash_should.cs
new file mode 100644
index 00000000000..5af838e0bb8
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Hashes/murmur3a_hash_should.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Index.Hashes;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Hashes;
+
+[TestFixture]
+public class murmur3a_hash_should {
+	public static uint Murmur3AReferenceVerificationValue = 0xB0F57EE3; // taken from SMHasher
+
+	[Test]
+	public void pass_smhasher_verification_test() {
+		Assert.IsTrue(SMHasher.VerificationTest(new Murmur3AUnsafe(), Murmur3AReferenceVerificationValue));
+	}
+
+	[Test, Category("LongRunning"), Explicit]
+	public void pass_smhasher_sanity_test() {
+		Assert.IsTrue(SMHasher.SanityTest(new Murmur3AUnsafe()));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Hashes/xxhash_hash_should.cs b/src/KurrentDB.Core.Tests/Hashes/xxhash_hash_should.cs
new file mode 100644
index 00000000000..9ff4080d57b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Hashes/xxhash_hash_should.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Index.Hashes;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Hashes;
+
+[TestFixture]
+public class xxhash_hash_should {
+	// calculated from reference XXhash implementation at http://code.google.com/p/xxhash/
+	public static uint XXHashReferenceVerificationValue = 0x56D249B1;
+
+	[Test]
+	public void pass_smhasher_verification_test() {
+		Assert.IsTrue(SMHasher.VerificationTest(new XXHashUnsafe(), XXHashReferenceVerificationValue));
+	}
+
+	[Test, Category("LongRunning"), Explicit]
+	public void pass_smhasher_sanity_test() {
+		Assert.IsTrue(SMHasher.SanityTest(new XXHashUnsafe()));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/AbstractorFactoryConfigurator.cs b/src/KurrentDB.Core.Tests/Helpers/AbstractorFactoryConfigurator.cs
new file mode 100644
index 00000000000..5fe0b3f14c0
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/AbstractorFactoryConfigurator.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.LogAbstraction;
+
+namespace KurrentDB.Core.Tests.Helpers;
+
+public class AbstractorFactoryConfigurator<TStreamId> : ILogFormatAbstractorFactory<TStreamId> {
+	private readonly ILogFormatAbstractorFactory<TStreamId> _wrapped;
+	private readonly Func<LogFormatAbstractorOptions, LogFormatAbstractorOptions> _configure;
+
+	public AbstractorFactoryConfigurator(
+		ILogFormatAbstractorFactory<TStreamId> wrapped,
+		Func<LogFormatAbstractorOptions, LogFormatAbstractorOptions> configure) {
+		_wrapped = wrapped;
+		_configure = configure;
+	}
+
+	public LogFormatAbstractor<TStreamId> Create(LogFormatAbstractorOptions options) =>
+		_wrapped.Create(_configure(options));
+}
+
+public static class LogFormatFactoryExtensions {
+	public static ILogFormatAbstractorFactory<TStreamId> Configure<TStreamId>(
+		this ILogFormatAbstractorFactory<TStreamId> factory,
+		Func<LogFormatAbstractorOptions, LogFormatAbstractorOptions> configure) =>
+
+		new AbstractorFactoryConfigurator<TStreamId>(factory, configure);
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/ClientApiLoggerBridge.cs b/src/KurrentDB.Core.Tests/Helpers/ClientApiLoggerBridge.cs
new file mode 100644
index 00000000000..1c90494572b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/ClientApiLoggerBridge.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using Serilog;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Tests.Helpers;
+
+public class ClientApiLoggerBridge : EventStore.ClientAPI.ILogger {
+	public static readonly ClientApiLoggerBridge Default =
+		new ClientApiLoggerBridge(Log.ForContext(Serilog.Core.Constants.SourceContextPropertyName,
+			"client-api"));
+
+	private readonly ILogger _log;
+
+	public ClientApiLoggerBridge(ILogger log) {
+		Ensure.NotNull(log, "log");
+		_log = log;
+	}
+
+	public void Error(string format, params object[] args) {
+		if (args.Length == 0)
+			_log.Error(format);
+		else
+			_log.Error(format, args);
+	}
+
+	public void Error(Exception ex, string format, params object[] args) {
+		if (args.Length == 0)
+			_log.Error(ex, format);
+		else
+			_log.Error(ex, format, args);
+	}
+
+	public void Info(string format, params object[] args) {
+		if (args.Length == 0)
+			_log.Information(format);
+		else
+			_log.Information(format, args);
+	}
+
+	public void Info(Exception ex, string format, params object[] args) {
+		if (args.Length == 0)
+			_log.Information(ex, format);
+		else
+			_log.Information(ex, format, args);
+	}
+
+	public void Debug(string format, params object[] args) {
+		if (args.Length == 0)
+			_log.Debug(format);
+		else
+			_log.Debug(format, args);
+	}
+
+	public void Debug(Exception ex, string format, params object[] args) {
+		if (args.Length == 0)
+			_log.Debug(ex, format);
+		else
+			_log.Debug(ex, format, args);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/CollectionsExtensions.cs b/src/KurrentDB.Core.Tests/Helpers/CollectionsExtensions.cs
new file mode 100644
index 00000000000..1230bcd5b76
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/CollectionsExtensions.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace KurrentDB.Core.Tests.Helpers;
+
+public static class CollectionsExtensions {
+	public static bool ContainsNo<TMessage>(this IEnumerable<object> collection) {
+		return collection.ContainsNo<TMessage>(v => true);
+	}
+
+	public static bool ContainsNo<TMessage>(this IEnumerable<object> collection, Predicate<TMessage> predicate) {
+		return collection.ContainsN<TMessage>(0, predicate);
+	}
+
+	public static bool ContainsSingle<TMessage>(this IEnumerable<object> collection) {
+		return collection.ContainsSingle<TMessage>(v => true);
+	}
+
+	public static bool ContainsSingle<TMessage>(this IEnumerable<object> collection,
+		Predicate<TMessage> predicate) {
+		return collection.ContainsN<TMessage>(1, predicate);
+	}
+
+	public static bool ContainsN<TMessage>(this IEnumerable<object> collection, int n) {
+		return collection.ContainsN<TMessage>(n, v => true);
+	}
+
+	public static bool ContainsN<TMessage>(this IEnumerable<object> collection, int n,
+		Predicate<TMessage> predicate) {
+		return collection.OfType<TMessage>().Count(v => predicate(v)) == n;
+	}
+
+	public static bool IsEmpty(this IEnumerable<object> collection) {
+		return !collection.Any();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/HelperExtensions.cs b/src/KurrentDB.Core.Tests/Helpers/HelperExtensions.cs
new file mode 100644
index 00000000000..d0f175cfc92
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/HelperExtensions.cs
@@ -0,0 +1,100 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using KurrentDB.Common.Utils;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Helpers;
+
+public static class HelperExtensions {
+	public static bool IsBetween(this int n, int a, int b) {
+		return n >= a && n <= b;
+	}
+
+	public static bool AreEqual<TKey, TValue>(this IDictionary<TKey, TValue> first,
+		IDictionary<TKey, TValue> second) {
+		if (first.Count != second.Count)
+			return false;
+
+		TValue value;
+		return first.All(kvp => second.TryGetValue(kvp.Key, out value) && value.Equals(kvp.Value));
+	}
+
+	public static void AssertJObject(JObject expected, JObject response, string path) {
+		foreach (KeyValuePair<string, JToken> v in expected) {
+			JToken vv;
+			var propertyName = v.Key;
+			if (propertyName.StartsWith("___"))
+				propertyName = "$" + propertyName.Substring(3);
+			if (propertyName.EndsWith("___")) {
+				if (response.TryGetValue(propertyName.Substring(0, propertyName.Length - "___".Length), out vv)) {
+					Assert.Fail("{0}/{1} found, but it is explicitly forbidden", path, propertyName);
+				}
+			} else if (propertyName.EndsWith("___exists")) {
+				if (!response.TryGetValue(propertyName.Substring(0, propertyName.Length - "___exists".Length),
+					out vv)) {
+					Assert.Fail("{0}/{1} not found, but it is explicitly required", path, propertyName);
+				}
+			} else if (!response.TryGetValue(propertyName, out vv)) {
+				Assert.Fail("{0}/{1} not found in '{2}'", path, propertyName, response.ToString());
+			} else {
+				Assert.AreEqual(
+					v.Value.Type, vv.Type, "{0}/{1} type is {2}, but {3} is expected", path, propertyName, vv.Type,
+					v.Value.Type);
+				if (v.Value.Type == JTokenType.Object) {
+					AssertJObject(v.Value as JObject, vv as JObject, path + "/" + propertyName);
+				} else if (v.Value.Type == JTokenType.Array) {
+					AssertJArray(v.Value as JArray, vv as JArray, path + "/" + propertyName);
+				} else if (v.Value is JValue) {
+					Assert.AreEqual(
+						((JValue)(v.Value)).Value, ((JValue)vv).Value,
+						"{0}/{1} value is '{2}' but '{3}' is expected", path, propertyName, vv, v.Value);
+				} else
+					Assert.Fail();
+			}
+		}
+	}
+
+	public static void AssertJArray(JArray expected, JArray response, string path) {
+		for (int index = 0; index < expected.Count; index++) {
+			JToken v = expected.Count > index ? expected[index] : new JValue((object)null);
+			JToken vv = response.Count > index ? response[index] : new JValue((object)null);
+			Assert.AreEqual(
+				v.Type, vv.Type, "{0}/{1} type is {2}, but {3} is expected", path, index, vv.Type,
+				v.Type);
+			if (v.Type == JTokenType.Object) {
+				AssertJObject(v as JObject, vv as JObject, path + "/" + index);
+			} else if (v.Type == JTokenType.Array) {
+				AssertJArray(v as JArray, vv as JArray, path + "/" + index);
+			} else if (v is JValue) {
+				Assert.AreEqual(
+					((JValue)v).Value, ((JValue)vv).Value, "{0}/{1} value is '{2}' but '{3}' is expected", path,
+					index, vv, v);
+			} else
+				Assert.Fail();
+		}
+	}
+
+	public static void AssertJson<T>(T expected, JObject response) {
+		var serialized = expected.ToJson();
+		var jobject = serialized.ParseJson<JObject>();
+
+		var path = "/";
+
+		AssertJObject(jobject, response, path);
+	}
+
+	public static string GetFilePathFromAssembly(string filePath) {
+		var baseDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+		Console.WriteLine("Base dir: {0}", baseDir);
+		var result = Path.Combine(baseDir, filePath);
+		Console.WriteLine("Result: {0}", result);
+		return result;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/IODispatcherTestHelpers.cs b/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/IODispatcherTestHelpers.cs
new file mode 100644
index 00000000000..a1240c28198
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/IODispatcherTestHelpers.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using IODispatcherDelayedMessage = KurrentDB.Core.Helpers.IODispatcherDelayedMessage;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Core.Tests.Helpers.IODispatcherTests;
+
+public static class IODispatcherTestHelpers {
+	public static ResolvedEvent[] CreateResolvedEvent<TLogFormat, TStreamId>(string stream, string eventType, string data,
+		string metadata = "", long eventNumber = 0) {
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamIdIgnored = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeIdIgnored = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		var record = new EventRecord(eventNumber, LogRecord.Prepare(recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0,
+			streamIdIgnored, eventNumber, PrepareFlags.None, eventTypeIdIgnored, Encoding.UTF8.GetBytes(data),
+			Encoding.UTF8.GetBytes(metadata)), stream, eventType);
+		return new ResolvedEvent[] {
+			ResolvedEvent.ForUnresolvedEvent(record, 0)
+		};
+	}
+
+	public static void SubscribeIODispatcher(IODispatcher ioDispatcher, ISubscriber bus) {
+		bus.Subscribe<IODispatcherDelayedMessage>(ioDispatcher);
+		bus.Subscribe<ClientMessage.NotHandled>(ioDispatcher);
+		bus.Subscribe(ioDispatcher.ForwardReader);
+		bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(ioDispatcher.BackwardReader);
+		bus.Subscribe<ClientMessage.NotHandled>(ioDispatcher.BackwardReader);
+		bus.Subscribe(ioDispatcher.Writer);
+		bus.Subscribe(ioDispatcher.Awaker);
+		bus.Subscribe(ioDispatcher.StreamDeleter);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/QueueWriteEventsTests/when_a_write_completes.cs b/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/QueueWriteEventsTests/when_a_write_completes.cs
new file mode 100644
index 00000000000..ec334355f50
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/QueueWriteEventsTests/when_a_write_completes.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.UserManagement;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Helpers.IODispatcherTests.QueueWriteEventsTests;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_a_write_completes<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private bool _completed = false;
+
+	protected override void Given() {
+		AllWritesQueueUp();
+
+		_ioDispatcher.QueueWriteEvents(Guid.NewGuid(), $"stream-{Guid.NewGuid()}", ExpectedVersion.Any,
+			new Event[] { new Event(Guid.NewGuid(), "event-type", false, string.Empty, string.Empty) },
+			SystemAccounts.System, (msg) => { _completed = true; });
+		OneWriteCompletes();
+	}
+
+	[Test]
+	public void should_invoke_callback_when_write_completes() {
+		Assert.IsTrue(_completed);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/QueueWriteEventsTests/when_requesting_multiple_writes_with_different_keys.cs b/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/QueueWriteEventsTests/when_requesting_multiple_writes_with_different_keys.cs
new file mode 100644
index 00000000000..1a2088ba4be
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/QueueWriteEventsTests/when_requesting_multiple_writes_with_different_keys.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.UserManagement;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Helpers.IODispatcherTests.QueueWriteEventsTests;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_requesting_multiple_writes_with_different_keys<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	protected override void Given() {
+		_ioDispatcher.QueueWriteEvents(Guid.NewGuid(), $"stream-{Guid.NewGuid()}", ExpectedVersion.Any,
+			new Event[] { new Event(Guid.NewGuid(), "event-type", false, string.Empty, string.Empty) },
+			SystemAccounts.System, (msg) => { });
+		_ioDispatcher.QueueWriteEvents(Guid.NewGuid(), $"stream-{Guid.NewGuid()}", ExpectedVersion.Any,
+			new Event[] { new Event(Guid.NewGuid(), "event-type", false, string.Empty, string.Empty) },
+			SystemAccounts.System, (msg) => { });
+	}
+
+	[Test]
+	public void should_have_as_many_writes_in_flight_as_unique_keys() {
+		Assert.AreEqual(2, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/QueueWriteEventsTests/when_requesting_multiple_writes_with_the_same_key.cs b/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/QueueWriteEventsTests/when_requesting_multiple_writes_with_the_same_key.cs
new file mode 100644
index 00000000000..b471b6ec8a2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/QueueWriteEventsTests/when_requesting_multiple_writes_with_the_same_key.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.UserManagement;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Helpers.IODispatcherTests.QueueWriteEventsTests;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_requesting_multiple_writes_with_the_same_key<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	protected override void Given() {
+		AllWritesQueueUp();
+
+		var key = Guid.NewGuid();
+		_ioDispatcher.QueueWriteEvents(key, $"stream-{Guid.NewGuid()}", ExpectedVersion.Any,
+			new Event[] { new Event(Guid.NewGuid(), "event-type", false, string.Empty, string.Empty) },
+			SystemAccounts.System, (msg) => { });
+		_ioDispatcher.QueueWriteEvents(key, $"stream-{Guid.NewGuid()}", ExpectedVersion.Any,
+			new Event[] { new Event(Guid.NewGuid(), "event-type", false, string.Empty, string.Empty) },
+			SystemAccounts.System, (msg) => { });
+		_ioDispatcher.QueueWriteEvents(key, $"stream-{Guid.NewGuid()}", ExpectedVersion.Any,
+			new Event[] { new Event(Guid.NewGuid(), "event-type", false, string.Empty, string.Empty) },
+			SystemAccounts.System, (msg) => { });
+	}
+
+	[Test]
+	public void should_only_have_a_single_write_in_flight() {
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
+	}
+
+	[Test]
+	public void should_continue_to_only_have_a_single_write_in_flight_as_writes_complete() {
+		var writeRequests = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>();
+
+		//first write
+		_consumer.HandledMessages.Clear();
+		OneWriteCompletes();
+		Assert.AreEqual(1, writeRequests.Count());
+
+		//second write
+		_consumer.HandledMessages.Clear();
+		OneWriteCompletes();
+		Assert.AreEqual(1, writeRequests.Count());
+
+		//third write completes, no more writes left in the queue
+		_consumer.HandledMessages.Clear();
+		OneWriteCompletes();
+		Assert.AreEqual(0, writeRequests.Count());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/async_read_stream_events_backward_with_cancelled_read.cs b/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/async_read_stream_events_backward_with_cancelled_read.cs
new file mode 100644
index 00000000000..82b3d9db3ca
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/async_read_stream_events_backward_with_cancelled_read.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using KurrentDB.Core.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Helpers.IODispatcherTests.ReadEventsTests;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class async_read_stream_events_backward_with_cancelled_read<TLogFormat, TStreamId> : with_read_io_dispatcher<TLogFormat, TStreamId> {
+	private bool _hasTimedOut;
+	private bool _hasRead;
+	private bool _eventSet;
+
+	[OneTimeSetUp]
+	public override void TestFixtureSetUp() {
+		base.TestFixtureSetUp();
+		var mre = new ManualResetEvent(false);
+		var step = _ioDispatcher.BeginReadBackward(
+			_cancellationScope, _eventStreamId, _fromEventNumber, _maxCount, true, _principal,
+			res => {
+				_hasRead = true;
+				mre.Set();
+			},
+			() => {
+				_hasTimedOut = true;
+				mre.Set();
+			}
+		);
+
+		IODispatcherAsync.Run(step);
+		_cancellationScope.Cancel();
+		_eventSet = mre.WaitOne(TimeSpan.FromSeconds(5));
+	}
+
+	[Test]
+	public void should_ignore_read() {
+		Assert.IsFalse(_eventSet);
+		Assert.IsFalse(_hasRead, "Should not have completed read before replying on read message");
+		_readBackward.Envelope.ReplyWith(CreateReadStreamEventsBackwardCompleted(_readBackward));
+		Assert.IsFalse(_hasRead);
+	}
+
+	[Test]
+	public void should_ignore_timeout_message() {
+		Assert.IsFalse(_hasTimedOut, "Should not have timed out before replying on timeout message");
+		_timeoutMessage.Reply();
+		Assert.IsFalse(_hasTimedOut);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/async_read_stream_events_forward_with_cancelled_read.cs b/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/async_read_stream_events_forward_with_cancelled_read.cs
new file mode 100644
index 00000000000..9d501574a87
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/async_read_stream_events_forward_with_cancelled_read.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using KurrentDB.Core.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Helpers.IODispatcherTests.ReadEventsTests;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class async_read_stream_events_forward_with_cancelled_read<TLogFormat, TStreamId> : with_read_io_dispatcher<TLogFormat, TStreamId> {
+	private bool _hasTimedOut;
+	private bool _hasRead;
+	private bool _eventSet;
+
+	[OneTimeSetUp]
+	public override void TestFixtureSetUp() {
+		base.TestFixtureSetUp();
+		var mre = new ManualResetEvent(false);
+		var step = _ioDispatcher.BeginReadForward(
+			_cancellationScope, _eventStreamId, _fromEventNumber, _maxCount, true, _principal,
+			res => {
+				_hasRead = true;
+				mre.Set();
+			},
+			() => {
+				_hasTimedOut = true;
+				mre.Set();
+			}
+		);
+
+		IODispatcherAsync.Run(step);
+		_cancellationScope.Cancel();
+		_eventSet = mre.WaitOne(TimeSpan.FromSeconds(5));
+	}
+
+	[Test]
+	public void should_ignore_read() {
+		Assert.IsFalse(_eventSet);
+		Assert.IsFalse(_hasRead, "Should not have completed read before replying on read message");
+		_readForward.Envelope.ReplyWith(CreateReadStreamEventsForwardCompleted(_readForward));
+		Assert.IsFalse(_hasRead);
+	}
+
+	[Test]
+	public void should_ignore_timeout_message() {
+		Assert.IsFalse(_hasTimedOut, "Should not have timed out before replying on timeout message");
+		_timeoutMessage.Reply();
+		Assert.IsFalse(_hasTimedOut);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_backward_with_successful_read.cs b/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_backward_with_successful_read.cs
new file mode 100644
index 00000000000..2df0de996df
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_backward_with_successful_read.cs
@@ -0,0 +1,98 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Helpers.IODispatcherTests.ReadEventsTests;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class async_read_stream_events_backward_with_successful_read<TLogFormat, TStreamId> : with_read_io_dispatcher<TLogFormat, TStreamId> {
+	private ClientMessage.ReadStreamEventsBackwardCompleted _result;
+	private bool _hasTimedOut;
+
+	[OneTimeSetUp]
+	public override void TestFixtureSetUp() {
+		base.TestFixtureSetUp();
+		var mre = new ManualResetEvent(false);
+		var step = _ioDispatcher.BeginReadBackward(
+			_cancellationScope, _eventStreamId, _fromEventNumber, _maxCount, true, _principal,
+			res => {
+				_result = res;
+				mre.Set();
+			},
+			() => {
+				_hasTimedOut = true;
+				mre.Set();
+			}
+		);
+
+		IODispatcherAsync.Run(step);
+
+		_readBackward.Envelope.ReplyWith(CreateReadStreamEventsBackwardCompleted(_readBackward));
+		mre.WaitOne(TimeSpan.FromSeconds(10));
+	}
+
+	[Test]
+	public void should_get_read_result() {
+		Assert.IsNotNull(_result);
+		Assert.AreEqual(_maxCount, _result.Events.Count, "Event count");
+		Assert.AreEqual(_eventStreamId, _result.Events[0].OriginalStreamId, "Stream Id");
+		Assert.AreEqual(_fromEventNumber, _result.Events[_maxCount - 1].OriginalEventNumber, "From event number");
+	}
+
+	[Test]
+	public void should_ignore_timeout_message() {
+		Assert.IsFalse(_hasTimedOut, "Should not have timed out before replying on timeout message");
+		_timeoutMessage.Reply();
+		Assert.IsFalse(_hasTimedOut);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_stream_events_backward_with_successful_read<TLogFormat, TStreamId> : with_read_io_dispatcher<TLogFormat, TStreamId> {
+	private ClientMessage.ReadStreamEventsBackwardCompleted _result;
+	private bool _hasTimedOut;
+
+	[OneTimeSetUp]
+	public override void TestFixtureSetUp() {
+		base.TestFixtureSetUp();
+
+		var mre = new ManualResetEvent(false);
+		_ioDispatcher.ReadBackward(
+			_eventStreamId, _fromEventNumber, _maxCount, true, _principal,
+			res => {
+				_result = res;
+				mre.Set();
+			},
+			() => {
+				_hasTimedOut = true;
+				mre.Set();
+			},
+			Guid.NewGuid()
+		);
+
+		_readBackward.Envelope.ReplyWith(CreateReadStreamEventsBackwardCompleted(_readBackward));
+		mre.WaitOne(TimeSpan.FromSeconds(10));
+	}
+
+	[Test]
+	public void should_get_read_result() {
+		Assert.IsNotNull(_result);
+		Assert.AreEqual(_maxCount, _result.Events.Count, "Event count");
+		Assert.AreEqual(_eventStreamId, _result.Events[0].OriginalStreamId, "Stream Id");
+		Assert.AreEqual(_fromEventNumber, _result.Events[_maxCount - 1].OriginalEventNumber, "From event number");
+	}
+
+	[Test]
+	public void should_ignore_timeout_message() {
+		Assert.IsFalse(_hasTimedOut, "Should not have timed out before replying on timeout message");
+		_timeoutMessage.Reply();
+		Assert.IsFalse(_hasTimedOut);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_backward_with_timeout_on_read.cs b/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_backward_with_timeout_on_read.cs
new file mode 100644
index 00000000000..471e3ead1b3
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_backward_with_timeout_on_read.cs
@@ -0,0 +1,92 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using KurrentDB.Core.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Helpers.IODispatcherTests.ReadEventsTests;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class async_read_stream_events_backward_with_timeout_on_read<TLogFormat, TStreamId> : with_read_io_dispatcher<TLogFormat, TStreamId> {
+	private bool _didTimeout;
+	private bool _didReceiveRead;
+
+	[OneTimeSetUp]
+	public override void TestFixtureSetUp() {
+		base.TestFixtureSetUp();
+		var mre = new ManualResetEvent(false);
+		var step = _ioDispatcher.BeginReadBackward(
+			_cancellationScope, _eventStreamId, _fromEventNumber, _maxCount, true, _principal,
+			res => {
+				_didReceiveRead = true;
+				mre.Set();
+			},
+			() => {
+				_didTimeout = true;
+				mre.Set();
+			}
+		);
+		IODispatcherAsync.Run(step);
+		Assert.IsNotNull(_timeoutMessage, "Expected TimeoutMessage to not be null");
+
+		_timeoutMessage.Reply();
+		mre.WaitOne(TimeSpan.FromSeconds(10));
+	}
+
+	[Test]
+	public void should_call_timeout_handler() {
+		Assert.IsTrue(_didTimeout);
+	}
+
+	[Test]
+	public void should_ignore_read_complete() {
+		Assert.IsFalse(_didReceiveRead, "Should not have received read completed before replying on message");
+		_readBackward.Envelope.ReplyWith(CreateReadStreamEventsBackwardCompleted(_readBackward));
+		Assert.IsFalse(_didReceiveRead);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_stream_events_backward_with_timeout_on_read<TLogFormat, TStreamId> : with_read_io_dispatcher<TLogFormat, TStreamId> {
+	private bool _didTimeout;
+	private bool _didReceiveRead;
+
+	[OneTimeSetUp]
+	public override void TestFixtureSetUp() {
+		base.TestFixtureSetUp();
+
+		var mre = new ManualResetEvent(false);
+		_ioDispatcher.ReadBackward(
+			_eventStreamId, _fromEventNumber, _maxCount, true, _principal,
+			res => {
+				_didReceiveRead = true;
+				mre.Set();
+			},
+			() => {
+				_didTimeout = true;
+				mre.Set();
+			},
+			Guid.NewGuid()
+		);
+		Assert.IsNotNull(_timeoutMessage, "Expected TimeoutMessage to not be null");
+
+		_timeoutMessage.Reply();
+		mre.WaitOne(TimeSpan.FromSeconds(10));
+	}
+
+	[Test]
+	public void should_call_timeout_handler() {
+		Assert.IsTrue(_didTimeout);
+	}
+
+	[Test]
+	public void should_ignore_read_complete() {
+		Assert.IsFalse(_didReceiveRead, "Should not have received read completed before replying on message");
+		_readBackward.Envelope.ReplyWith(CreateReadStreamEventsBackwardCompleted(_readBackward));
+		Assert.IsFalse(_didReceiveRead);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_forward_with_successful_read.cs b/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_forward_with_successful_read.cs
new file mode 100644
index 00000000000..e9943c1ecf4
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_forward_with_successful_read.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Helpers.IODispatcherTests.ReadEventsTests;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class async_read_stream_events_forward_with_successful_read<TLogFormat, TStreamId> : with_read_io_dispatcher<TLogFormat, TStreamId> {
+	private ClientMessage.ReadStreamEventsForwardCompleted _result;
+	private bool _hasTimedOut;
+
+	[OneTimeSetUp]
+	public override void TestFixtureSetUp() {
+		base.TestFixtureSetUp();
+		var mre = new ManualResetEvent(false);
+		var step = _ioDispatcher.BeginReadForward(
+			_cancellationScope, _eventStreamId, _fromEventNumber, _maxCount, true, _principal,
+			res => {
+				_result = res;
+				mre.Set();
+			},
+			() => {
+				_hasTimedOut = true;
+				mre.Set();
+			}
+		);
+
+		IODispatcherAsync.Run(step);
+
+		_readForward.Envelope.ReplyWith(CreateReadStreamEventsForwardCompleted(_readForward));
+		mre.WaitOne(TimeSpan.FromSeconds(10));
+	}
+
+	[Test]
+	public void should_get_read_result() {
+		Assert.IsNotNull(_result);
+		Assert.AreEqual(_maxCount, _result.Events.Count, "Event count");
+		Assert.AreEqual(_eventStreamId, _result.Events[0].OriginalStreamId, "Stream Id");
+		Assert.AreEqual(_fromEventNumber, _result.Events[0].OriginalEventNumber, "From event number");
+	}
+
+	[Test]
+	public void should_ignore_timeout_message() {
+		Assert.IsFalse(_hasTimedOut, "Should not have timed out before replying on timeout message");
+		_timeoutMessage.Reply();
+		Assert.IsFalse(_hasTimedOut);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_stream_events_forward_with_successful_read<TLogFormat, TStreamId> : with_read_io_dispatcher<TLogFormat, TStreamId> {
+	private ClientMessage.ReadStreamEventsForwardCompleted _result;
+	private bool _hasTimedOut;
+
+	[OneTimeSetUp]
+	public override void TestFixtureSetUp() {
+		base.TestFixtureSetUp();
+		var mre = new ManualResetEvent(false);
+		_ioDispatcher.ReadForward(
+			_eventStreamId, _fromEventNumber, _maxCount, true, _principal,
+			res => {
+				_result = res;
+				mre.Set();
+			},
+			() => {
+				_hasTimedOut = true;
+				mre.Set();
+			},
+			Guid.NewGuid()
+		);
+
+		_readForward.Envelope.ReplyWith(CreateReadStreamEventsForwardCompleted(_readForward));
+		mre.WaitOne(TimeSpan.FromSeconds(10));
+	}
+
+	[Test]
+	public void should_get_read_result() {
+		Assert.IsNotNull(_result);
+		Assert.AreEqual(_maxCount, _result.Events.Count, "Event count");
+		Assert.AreEqual(_eventStreamId, _result.Events[0].OriginalStreamId, "Stream Id");
+		Assert.AreEqual(_fromEventNumber, _result.Events[0].OriginalEventNumber, "From event number");
+	}
+
+	[Test]
+	public void should_ignore_timeout_message() {
+		Assert.IsFalse(_hasTimedOut, "Should not have timed out before replying on timeout message");
+		_timeoutMessage.Reply();
+		Assert.IsFalse(_hasTimedOut);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_forward_with_timeout_on_read.cs b/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_forward_with_timeout_on_read.cs
new file mode 100644
index 00000000000..83748b15fb0
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/read_stream_events_forward_with_timeout_on_read.cs
@@ -0,0 +1,92 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using KurrentDB.Core.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Helpers.IODispatcherTests.ReadEventsTests;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class async_read_stream_events_forward_with_timeout_on_read<TLogFormat, TStreamId> : with_read_io_dispatcher<TLogFormat, TStreamId> {
+	private bool _didTimeout;
+	private bool _didReceiveRead;
+
+	[OneTimeSetUp]
+	public override void TestFixtureSetUp() {
+		base.TestFixtureSetUp();
+
+		var mre = new ManualResetEvent(false);
+		var step = _ioDispatcher.BeginReadForward(
+			_cancellationScope, _eventStreamId, _fromEventNumber, _maxCount, true, _principal,
+			res => {
+				_didReceiveRead = true;
+				mre.Set();
+			},
+			() => {
+				_didTimeout = true;
+				mre.Set();
+			}
+		);
+		IODispatcherAsync.Run(step);
+		Assert.IsNotNull(_timeoutMessage, "Expected TimeoutMessage to not be null");
+
+		_timeoutMessage.Reply();
+		mre.WaitOne(TimeSpan.FromSeconds(10));
+	}
+
+	[Test]
+	public void should_call_timeout_handler() {
+		Assert.IsTrue(_didTimeout);
+	}
+
+	[Test]
+	public void should_ignore_read_complete() {
+		Assert.IsFalse(_didReceiveRead, "Should not have received read completed before replying on message");
+		_readForward.Envelope.ReplyWith(CreateReadStreamEventsForwardCompleted(_readForward));
+		Assert.IsFalse(_didReceiveRead);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class read_stream_events_forward_with_timeout_on_read<TLogFormat, TStreamId> : with_read_io_dispatcher<TLogFormat, TStreamId> {
+	private bool _didTimeout;
+	private bool _didReceiveRead;
+
+	[OneTimeSetUp]
+	public override void TestFixtureSetUp() {
+		base.TestFixtureSetUp();
+		var mre = new ManualResetEvent(false);
+		_ioDispatcher.ReadForward(
+			_eventStreamId, _fromEventNumber, _maxCount, true, _principal,
+			res => {
+				_didReceiveRead = true;
+				mre.Set();
+			},
+			() => {
+				_didTimeout = true;
+				mre.Set();
+			},
+			Guid.NewGuid()
+		);
+		Assert.IsNotNull(_timeoutMessage, "Expected TimeoutMessage to not be null");
+
+		_timeoutMessage.Reply();
+		mre.WaitOne(TimeSpan.FromSeconds(10));
+	}
+
+	[Test]
+	public void should_call_timeout_handler() {
+		Assert.IsTrue(_didTimeout);
+	}
+
+	[Test]
+	public void should_ignore_read_complete() {
+		Assert.IsFalse(_didReceiveRead, "Should not have received read completed before replying on message");
+		_readForward.Envelope.ReplyWith(CreateReadStreamEventsForwardCompleted(_readForward));
+		Assert.IsFalse(_didReceiveRead);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/with_read_io_dispatcher.cs b/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/with_read_io_dispatcher.cs
new file mode 100644
index 00000000000..89f3687c8c7
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/IODispatcherTests/ReadEventsTests/with_read_io_dispatcher.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Services.UserManagement;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Helpers.IODispatcherTests.ReadEventsTests;
+
+public abstract class with_read_io_dispatcher<TLogFormat, TStreamId> : IHandle<ClientMessage.ReadStreamEventsForward>,
+	IHandle<ClientMessage.ReadStreamEventsBackward>,
+	IHandle<TimerMessage.Schedule> {
+	protected IODispatcher _ioDispatcher;
+	protected readonly ClaimsPrincipal _principal = SystemAccounts.System;
+	protected readonly SynchronousScheduler _bus = new();
+
+	protected readonly IODispatcherAsync.CancellationScope _cancellationScope = new();
+
+	protected ClientMessage.ReadStreamEventsForward _readForward;
+	protected ClientMessage.ReadStreamEventsBackward _readBackward;
+	protected TimerMessage.Schedule _timeoutMessage;
+
+	protected readonly int _maxCount = 1;
+	protected readonly int _fromEventNumber = 10;
+	protected readonly string _eventStreamId = "test";
+
+	[OneTimeSetUp]
+	public virtual void TestFixtureSetUp() {
+		var _queue = new QueuedHandlerThreadPool(_bus, "TestQueuedHandler", new QueueStatsManager(), new());
+		_ioDispatcher = new IODispatcher(_bus, _queue);
+		IODispatcherTestHelpers.SubscribeIODispatcher(_ioDispatcher, _bus);
+		_bus.Subscribe<ClientMessage.ReadStreamEventsForward>(this);
+		_bus.Subscribe<ClientMessage.ReadStreamEventsBackward>(this);
+		_bus.Subscribe<TimerMessage.Schedule>(this);
+		_queue.Start();
+	}
+
+	public virtual void Handle(ClientMessage.ReadStreamEventsForward message) {
+		_readForward = message;
+	}
+
+	public virtual void Handle(ClientMessage.ReadStreamEventsBackward message) {
+		_readBackward = message;
+	}
+
+	public virtual void Handle(TimerMessage.Schedule message) {
+		_timeoutMessage = message;
+	}
+
+	public ClientMessage.ReadStreamEventsForwardCompleted CreateReadStreamEventsForwardCompleted(
+		ClientMessage.ReadStreamEventsForward msg) {
+		var lastEventNumber = msg.FromEventNumber + 1;
+		var nextEventNumber = lastEventNumber + 1;
+		var events =
+			IODispatcherTestHelpers.CreateResolvedEvent<TLogFormat, TStreamId>(msg.EventStreamId, "event_type", "test", eventNumber: 10);
+		var res = new ClientMessage.ReadStreamEventsForwardCompleted(msg.CorrelationId, msg.EventStreamId,
+			msg.FromEventNumber,
+			msg.MaxCount, ReadStreamResult.Success, events, null, false, String.Empty, nextEventNumber,
+			lastEventNumber, false, 0);
+		return res;
+	}
+
+	public ClientMessage.ReadStreamEventsBackwardCompleted CreateReadStreamEventsBackwardCompleted(
+		ClientMessage.ReadStreamEventsBackward msg) {
+		var startEventNumber = msg.FromEventNumber;
+		var nextEventNumber = startEventNumber - 1;
+		var events =
+			IODispatcherTestHelpers.CreateResolvedEvent<TLogFormat, TStreamId>(msg.EventStreamId, "event_type", "test", eventNumber: 10);
+		var res = new ClientMessage.ReadStreamEventsBackwardCompleted(msg.CorrelationId, msg.EventStreamId,
+			msg.FromEventNumber,
+			msg.MaxCount, ReadStreamResult.Success, events, null, false, String.Empty, nextEventNumber,
+			startEventNumber, false, 0);
+		return res;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/LengthPrefixSuffixFramer.cs b/src/KurrentDB.Core.Tests/Helpers/LengthPrefixSuffixFramer.cs
new file mode 100644
index 00000000000..cefa578741a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/LengthPrefixSuffixFramer.cs
@@ -0,0 +1,163 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Helpers;
+
+[TestFixture]
+public class length_prefix_suffix_framer_should {
+	[Test]
+	public void correctly_frame_byte_array() {
+		var framer = new LengthPrefixSuffixFramer();
+		var data = new byte[] { 0x7, 0x17, 0x27 };
+		var framedData = MergeBytes(framer.FrameData(new ArraySegment<byte>(data)));
+
+		Assert.AreEqual(11, framedData.Length);
+
+		Assert.AreEqual(0x03, framedData[0]);
+		Assert.AreEqual(0x00, framedData[1]);
+		Assert.AreEqual(0x00, framedData[2]);
+		Assert.AreEqual(0x00, framedData[3]);
+
+		Assert.AreEqual(0x07, framedData[4]);
+		Assert.AreEqual(0x17, framedData[5]);
+		Assert.AreEqual(0x27, framedData[6]);
+
+		Assert.AreEqual(0x03, framedData[7]);
+		Assert.AreEqual(0x00, framedData[8]);
+		Assert.AreEqual(0x00, framedData[9]);
+		Assert.AreEqual(0x00, framedData[10]);
+	}
+
+	private byte[] MergeBytes(IEnumerable<ArraySegment<byte>> frameData) {
+		var bytes = new List<byte>();
+		foreach (var segm in frameData) {
+			for (int i = segm.Offset; i < segm.Offset + segm.Count; ++i) {
+				bytes.Add(segm.Array[i]);
+			}
+		}
+
+		return bytes.ToArray();
+	}
+
+	[Test]
+	public async Task unframe_record_when_provided_exactly_enough_data_in_one_call() {
+		int unframedCnt = 0;
+		var framer = new LengthPrefixSuffixFramer();
+		framer.RegisterMessageArrivedCallback(async (r, token) => {
+			unframedCnt += 1;
+			Assert.AreEqual(new byte[] { 0x07, 0x17, 0x27 }, await ReadAll(r, token));
+		});
+
+		await framer.UnFrameData(new ArraySegment<byte>([
+			0x03, 0x00, 0x00, 0x00,
+			0x07, 0x17, 0x27,
+			0x03, 0x00, 0x00, 0x00
+		]), CancellationToken.None);
+
+		Assert.AreEqual(1, unframedCnt);
+	}
+
+	[Test]
+	public async Task unframe_record_when_provided_with_small_chunks_of_data_at_a_time() {
+		int unframedCnt = 0;
+		var framer = new LengthPrefixSuffixFramer();
+		framer.RegisterMessageArrivedCallback(async (r, token) => {
+			unframedCnt += 1;
+			Assert.AreEqual(new byte[] { 0x07, 0x17, 0x27 }, await ReadAll(r, token));
+		});
+
+		await framer.UnFrameData(new ArraySegment<byte>(new byte[] { 0x03, 0x00 }), CancellationToken.None);
+		await framer.UnFrameData(new ArraySegment<byte>(new byte[] { 0x00, 0x00 }), CancellationToken.None);
+		await framer.UnFrameData(new ArraySegment<byte>(new byte[] { 0x07, 0x17, 0x27 }), CancellationToken.None);
+		await framer.UnFrameData(new ArraySegment<byte>(new byte[] { 0x03, 0x00 }), CancellationToken.None);
+
+		Assert.AreEqual(0, unframedCnt);
+		await framer.UnFrameData(new ArraySegment<byte>(new byte[] { 0x00, 0x00 }), CancellationToken.None);
+		Assert.AreEqual(1, unframedCnt);
+	}
+
+	[Test]
+	public async Task unframe_two_consecutive_records() {
+		int unframedCnt = 0;
+		var framer = new LengthPrefixSuffixFramer();
+		framer.RegisterMessageArrivedCallback(async (r, token) => {
+			if (unframedCnt == 0)
+				Assert.AreEqual(new byte[] { 0x07, 0x17, 0x27 }, await ReadAll(r, token));
+			else if (unframedCnt == 1)
+				Assert.AreEqual(new byte[] { 0x05, 0x15 }, await ReadAll(r, token));
+			else
+				Assert.Fail();
+
+			unframedCnt += 1;
+		});
+
+		await framer.UnFrameData(new ArraySegment<byte>([
+			0x03, 0x00, 0x00, 0x00,
+			0x07, 0x17, 0x27
+		]), CancellationToken.None);
+
+		Assert.AreEqual(0, unframedCnt);
+
+		await framer.UnFrameData(new ArraySegment<byte>([
+			0x03, 0x00, 0x00, 0x00,
+			0x02, 0x00, 0x00, 0x00,
+			0x05, 0x15
+		]), CancellationToken.None);
+
+		Assert.AreEqual(1, unframedCnt);
+
+		await framer.UnFrameData(new ArraySegment<byte>([0x02, 0x00, 0x00, 0x00]), CancellationToken.None);
+
+		Assert.AreEqual(2, unframedCnt);
+	}
+
+	[Test]
+	public async Task discard_data_when_reset_and_continue_unframing_from_blank_slate() {
+		int unframedCnt = 0;
+		var framer = new LengthPrefixSuffixFramer();
+		framer.RegisterMessageArrivedCallback(async (r, token) => {
+			if (unframedCnt == 0)
+				Assert.AreEqual(new byte[] { 0x07, 0x17, 0x27 }, await ReadAll(r, token));
+			else if (unframedCnt == 1)
+				Assert.AreEqual(new byte[] { 0x05, 0x15 }, await ReadAll(r, token));
+			else
+				Assert.Fail();
+
+			unframedCnt += 1;
+		});
+
+		await framer.UnFrameData(new ArraySegment<byte>([
+			0x03, 0x00, 0x00, 0x00,
+			0x07, 0x17, 0x27,
+			0x03, 0x00, 0x00, 0x00,
+			0xAA, 0xBB, 0xCC, 0x00,
+			0x01, 0x02, 0x03, 0x04,
+			0x05, 0x06, 0x07, 0x08
+		]), CancellationToken.None);
+
+		Assert.AreEqual(1, unframedCnt);
+
+		framer.Reset();
+
+		await framer.UnFrameData(new ArraySegment<byte>([
+			0x02, 0x00, 0x00, 0x00,
+			0x05, 0x15,
+			0x02, 0x00, 0x00, 0x00
+		]), CancellationToken.None);
+
+		Assert.AreEqual(2, unframedCnt);
+	}
+
+	private static ValueTask<byte[]> ReadAll(ReadOnlySequence<byte> br, CancellationToken token)
+		=> token.IsCancellationRequested
+			? ValueTask.FromCanceled<byte[]>(token)
+			: ValueTask.FromResult(br.ToArray());
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/Logging/NUnitLoggerConfigurationExtensions.cs b/src/KurrentDB.Core.Tests/Helpers/Logging/NUnitLoggerConfigurationExtensions.cs
new file mode 100644
index 00000000000..cbbdb4dab7b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/Logging/NUnitLoggerConfigurationExtensions.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using Serilog;
+using Serilog.Configuration;
+using Serilog.Core;
+using Serilog.Events;
+using Serilog.Formatting.Display;
+
+namespace KurrentDB.Core.Tests.Helpers.Logging;
+
+public static class NUnitLoggerConfigurationExtensions {
+	const string DefaultOutputTemplate = "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level}] {Message}{NewLine}  {Exception}";
+
+	public static LoggerConfiguration NUnitOutput(
+		this LoggerSinkConfiguration sinkConfiguration,
+		LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
+		IFormatProvider formatProvider = null,
+		LoggingLevelSwitch levelSwitch = null,
+		string outputTemplate = DefaultOutputTemplate) {
+
+		ArgumentNullException.ThrowIfNull(sinkConfiguration);
+		var formatter = new MessageTemplateTextFormatter(outputTemplate, formatProvider);
+		return sinkConfiguration.Sink(new NUnitSink(formatter), restrictedToMinimumLevel, levelSwitch);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/Logging/NUnitSink.cs b/src/KurrentDB.Core.Tests/Helpers/Logging/NUnitSink.cs
new file mode 100644
index 00000000000..d7ed5229658
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/Logging/NUnitSink.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using NUnit.Framework;
+using Serilog.Core;
+using Serilog.Events;
+using Serilog.Formatting.Display;
+
+namespace KurrentDB.Core.Tests.Helpers.Logging;
+
+public class NUnitSink(MessageTemplateTextFormatter formatter) : ILogEventSink {
+	private readonly MessageTemplateTextFormatter _formatter = formatter ?? throw new ArgumentNullException(nameof(formatter));
+
+	public void Emit(LogEvent logEvent) {
+		ArgumentNullException.ThrowIfNull(logEvent);
+
+		var writer = new StringWriter();
+		_formatter.Format(logEvent, writer);
+
+		TestContext.Progress.WriteLine(writer.ToString());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/ManualQueue.cs b/src/KurrentDB.Core.Tests/Helpers/ManualQueue.cs
new file mode 100644
index 00000000000..48d5157b9d2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/ManualQueue.cs
@@ -0,0 +1,92 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+
+namespace KurrentDB.Core.Tests.Helpers;
+
+public class ManualQueue : IPublisher, IHandle<TimerMessage.Schedule> {
+	private readonly Queue<Message> _queue = new();
+	private readonly SynchronousScheduler _bus;
+	private readonly ITimeProvider _time;
+	private readonly List<InternalSchedule> _timerQueue = new();
+	private bool _timerDisabled;
+
+	public ManualQueue(SynchronousScheduler bus, ITimeProvider time) {
+		_bus = bus;
+		_time = time;
+		_bus.Subscribe<TimerMessage.Schedule>(this);
+	}
+
+	public void Publish(Message message) {
+		_queue.Enqueue(message);
+	}
+
+	public int Process() {
+		ProcessTimer();
+		return ProcessNonTimer();
+	}
+
+	public int ProcessNonTimer() {
+		var count = 0;
+		while (_queue.Count > 0) {
+			var message = _queue.Dequeue();
+			_bus.Publish(message);
+			count++;
+			if (count > 1000)
+				throw new Exception("Possible infinite message loop");
+		}
+
+		return count;
+	}
+
+	public void ProcessTimer() {
+		if (!_timerDisabled) {
+			var orderedTimerMessages = _timerQueue.OrderBy(v => v.Scheduled.Add(v.Message.TriggerAfter)).ToArray();
+			_timerQueue.Clear();
+			foreach (var timerMessage in orderedTimerMessages) {
+				if (timerMessage.Scheduled.Add(timerMessage.Message.TriggerAfter) <= _time.UtcNow)
+					timerMessage.Message.Reply();
+				else
+					_timerQueue.Add(timerMessage);
+			}
+		}
+	}
+
+	public IEnumerable<TimerMessage.Schedule> TimerMessagesOfType<T>() {
+		foreach (var message in _timerQueue) {
+			if (message.Message.ReplyMessage is T) {
+				yield return message.Message;
+			}
+		}
+	}
+
+	public void DisableTimer() {
+		_timerDisabled = true;
+	}
+
+	public void EnableTimer(bool process = true) {
+		_timerDisabled = false;
+		if (process)
+			Process();
+	}
+
+	private class InternalSchedule {
+		public readonly TimerMessage.Schedule Message;
+		public readonly DateTime Scheduled;
+
+		public InternalSchedule(TimerMessage.Schedule message, DateTime scheduled) {
+			Message = message;
+			Scheduled = scheduled;
+		}
+	}
+
+	public void Handle(TimerMessage.Schedule message) {
+		_timerQueue.Add(new InternalSchedule(message, _time.UtcNow));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/MiniClusterNode.cs b/src/KurrentDB.Core.Tests/Helpers/MiniClusterNode.cs
new file mode 100644
index 00000000000..a093c0a710a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/MiniClusterNode.cs
@@ -0,0 +1,319 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Net;
+using System.Net.Http;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Subsystems;
+using KurrentDB.Common.Options;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Authentication;
+using KurrentDB.Core.Authentication.InternalAuthentication;
+using KurrentDB.Core.Authorization;
+using KurrentDB.Core.Authorization.AuthorizationPolicies;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Certificates;
+using KurrentDB.Core.Configuration.Sources;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Monitoring;
+using KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.Http;
+using KurrentDB.Core.Tests.Services.Transport.Tcp;
+using KurrentDB.Core.TransactionLog.Chunks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Server.Kestrel.Core;
+using Microsoft.AspNetCore.Server.Kestrel.Https;
+using Microsoft.Extensions.Configuration;
+using ILogger = Serilog.ILogger;
+using RuntimeInformation = System.Runtime.RuntimeInformation;
+
+namespace KurrentDB.Core.Tests.Helpers;
+
+public class MiniClusterNode<TLogFormat, TStreamId> {
+	public static int RunCount = 0;
+	public static readonly Stopwatch RunningTime = new Stopwatch();
+	public static readonly Stopwatch StartingTime = new Stopwatch();
+	public static readonly Stopwatch StoppingTime = new Stopwatch();
+
+	private static readonly ILogger Log = Serilog.Log.ForContext<MiniClusterNode<TLogFormat, TStreamId>>();
+
+	public IPEndPoint InternalTcpEndPoint { get; }
+	public IPEndPoint ExternalTcpEndPoint { get; }
+	public IPEndPoint HttpEndPoint { get; }
+
+	public readonly int DebugIndex;
+
+	public readonly ClusterVNode Node;
+	public TFChunkDb Db => Node.Db;
+	private readonly string _dbPath;
+	private readonly bool _isReadOnlyReplica;
+	private readonly TaskCompletionSource<bool> _started = new();
+	private readonly TaskCompletionSource<bool> _adminUserCreated = new();
+
+	public Task Started => _started.Task;
+	public Task AdminUserCreated => _adminUserCreated.Task;
+
+	public VNodeState NodeState = VNodeState.Unknown;
+	private readonly WebApplication _host;
+
+	private static bool EnableHttps() => !RuntimeInformation.IsOSX;
+
+	public MiniClusterNode(string pathname, int debugIndex, IPEndPoint internalTcp, IPEndPoint externalTcp,
+	IPEndPoint httpEndPoint, EndPoint[] gossipSeeds, ISubsystem[] subsystems = null,
+	bool enableTrustedAuth = false, int memTableSize = 1000, bool inMemDb = true,
+	bool disableFlushToDisk = false, bool readOnlyReplica = false, int nodePriority = 0,
+	string intHostAdvertiseAs = null, IExpiryStrategy expiryStrategy = null) {
+
+		if (RuntimeInformation.IsOSX) {
+			AppContext.SetSwitch("System.Net.Http.SocketsHttpHandler.Http2UnencryptedSupport",
+				true); //TODO JPB Remove this sadness when dotnet core supports kestrel + http2 on macOS
+		}
+
+		RunningTime.Start();
+		RunCount += 1;
+
+		DebugIndex = debugIndex;
+		InternalTcpEndPoint = internalTcp;
+		ExternalTcpEndPoint = externalTcp;
+		HttpEndPoint = httpEndPoint;
+
+		_dbPath = Path.Combine(
+			pathname,
+			$"mini-cluster-node-db-{externalTcp.Port}-{httpEndPoint.Port}");
+
+		Directory.CreateDirectory(_dbPath);
+		FileStreamExtensions.ConfigureFlush(disableFlushToDisk);
+
+		var useHttps = EnableHttps();
+
+		subsystems ??= [];
+		subsystems = [.. subsystems, new TcpApiTestPlugin.TcpApiTestPlugin()];
+
+		var options = new ClusterVNodeOptions {
+			Application = new() {
+				AllowAnonymousEndpointAccess = true,
+				AllowAnonymousStreamAccess = true,
+				Insecure = !useHttps,
+				WorkerThreads = 1,
+				StatsPeriodSec = (int)TimeSpan.FromHours(1).TotalSeconds
+			},
+			Cluster = new() {
+				DiscoverViaDns = false,
+				ClusterDns = string.Empty,
+				GossipSeed = gossipSeeds,
+				ClusterSize = 3,
+				NodePriority = nodePriority,
+				GossipIntervalMs = 2_000,
+				GossipAllowedDifferenceMs = 1_000,
+				GossipTimeoutMs = 2_000,
+				DeadMemberRemovalPeriodSec = 1_800_000,
+				ReadOnlyReplica = readOnlyReplica,
+				Archiver = false,
+				StreamInfoCacheCapacity = 10_000
+			},
+			Interface = new() {
+				ReplicationIp = InternalTcpEndPoint.Address,
+				NodeIp = ExternalTcpEndPoint.Address,
+				ReplicationPort = InternalTcpEndPoint.Port,
+				NodePort = HttpEndPoint.Port,
+				ReplicationHeartbeatTimeout = 2_000,
+				ReplicationHeartbeatInterval = 2_000,
+				EnableAtomPubOverHttp = true,
+				EnableTrustedAuth = enableTrustedAuth,
+				ReplicationHostAdvertiseAs = intHostAdvertiseAs
+			},
+			Database = new() {
+				MinFlushDelayMs = TFConsts.MinFlushDelayMs.TotalMilliseconds,
+				PrepareTimeoutMs = 10_000,
+				CommitTimeoutMs = 10_000,
+				WriteTimeoutMs = 10_000,
+				StatsStorage = StatsStorage.None,
+				DisableScavengeMerging = true,
+				ScavengeHistoryMaxAge = 30,
+				SkipDbVerify = true,
+				MaxMemTableSize = memTableSize,
+				MemDb = inMemDb,
+				Db = _dbPath,
+				ChunkSize = MiniNode.ChunkSize,
+				ChunksCacheSize = MiniNode.CachedChunkSize,
+				StreamExistenceFilterSize = 10_000
+			},
+			Projection = new() {
+				RunProjections = ProjectionType.None
+			},
+			PlugableComponents = subsystems
+		};
+
+		var inMemConf = new ConfigurationBuilder()
+			.AddInMemoryCollection(new KeyValuePair<string, string>[] {
+				new($"{KurrentConfigurationKeys.Prefix}:TcpPlugin:NodeTcpPort", externalTcp.Port.ToString()),
+				new($"{KurrentConfigurationKeys.Prefix}:TcpPlugin:EnableExternalTcp", "true"),
+				new($"{KurrentConfigurationKeys.Prefix}:TcpUnitTestPlugin:NodeTcpPort", externalTcp.Port.ToString()),
+				new($"{KurrentConfigurationKeys.Prefix}:TcpUnitTestPlugin:NodeHeartbeatInterval", "10000"),
+				new($"{KurrentConfigurationKeys.Prefix}:TcpUnitTestPlugin:NodeHeartbeatTimeout", "10000"),
+				new($"{KurrentConfigurationKeys.Prefix}:TcpUnitTestPlugin:Insecure", options.Application.Insecure.ToString()),
+			}).Build();
+		var serverCertificate = useHttps ? ssl_connections.GetServerCertificate() : null;
+		var trustedRootCertificates =
+			useHttps ? new X509Certificate2Collection(ssl_connections.GetRootCertificate()) : null;
+		options = useHttps
+			? options.Secure(trustedRootCertificates, serverCertificate)
+			: options;
+
+		_isReadOnlyReplica = readOnlyReplica;
+
+		Log.Information(
+			"\n{0,-25} {1} ({2}/{3}, {4})\n" + "{5,-25} {6} ({7})\n" + "{8,-25} {9} ({10}-bit)\n"
+			+ "{11,-25} {12}\n" + "{13,-25} {14}\n" + "{15,-25} {16}\n" + "{17,-25} {18}\n\n",
+			"ES VERSION:", VersionInfo.Version, VersionInfo.Edition, VersionInfo.CommitSha, VersionInfo.Timestamp,
+			"OS:", RuntimeInformation.OsPlatform, Environment.OSVersion, "RUNTIME:", RuntimeInformation.RuntimeVersion,
+			RuntimeInformation.RuntimeMode, "GC:",
+			GC.MaxGeneration == 0
+				? "NON-GENERATION (PROBABLY BOEHM)"
+				: $"{GC.MaxGeneration + 1} GENERATIONS", "DBPATH:", _dbPath, "ExTCP ENDPOINT:",
+			ExternalTcpEndPoint, "ExHTTP ENDPOINT:", HttpEndPoint);
+
+		var logFormatFactory = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory;
+		Node = new ClusterVNode<TStreamId>(options, logFormatFactory, new AuthenticationProviderFactory(
+				components =>
+					new InternalAuthenticationProviderFactory(components, options.DefaultUser)),
+			new AuthorizationProviderFactory(components =>
+				new InternalAuthorizationProviderFactory(
+					new StaticAuthorizationPolicyRegistry([new LegacyPolicySelectorFactory(
+						options.Application.AllowAnonymousEndpointAccess,
+						options.Application.AllowAnonymousStreamAccess,
+						options.Application.OverrideAnonymousEndpointAccessForGossip).Create(components.MainQueue)]))),
+			Array.Empty<IPersistentSubscriptionConsumerStrategyFactory>(),
+			new OptionsCertificateProvider(),
+			configuration: inMemConf,
+			expiryStrategy,
+			Guid.NewGuid(), debugIndex);
+		Node.HttpService.SetupController(new TestController(Node.MainQueue));
+
+		var builder = WebApplication.CreateBuilder();
+		builder.WebHost
+			.ConfigureKestrel(o => {
+				o.Listen(HttpEndPoint, options => {
+					if (RuntimeInformation.IsOSX) {
+						options.Protocols = HttpProtocols.Http2;
+					} else {
+						options.UseHttps(new HttpsConnectionAdapterOptions {
+							ServerCertificate = serverCertificate,
+							ClientCertificateMode = ClientCertificateMode.AllowCertificate,
+							ClientCertificateValidation = (certificate, chain, sslPolicyErrors) => {
+								var (isValid, error) =
+									ClusterVNode<string>.ValidateClientCertificate(certificate, chain, sslPolicyErrors, () => null, () => trustedRootCertificates);
+								if (!isValid && error != null) {
+									Log.Error("Client certificate validation error: {e}", error);
+								}
+								return isValid;
+							}
+						});
+					}
+				});
+			});
+		Node.Startup.ConfigureServices(builder.Services);
+		_host = builder.Build();
+		Node.Startup.Configure(_host);
+	}
+
+	public async Task Start() {
+		StartingTime.Start();
+		await _host.StartAsync();
+
+		Node.MainBus.Subscribe(
+			new AdHocHandler<SystemMessage.StateChangeMessage>(m => {
+				NodeState = m.State;
+			}));
+		if (!_isReadOnlyReplica) {
+			Node.MainBus.Subscribe(
+				new AdHocHandler<SystemMessage.BecomeLeader>(m => {
+					NodeState = VNodeState.Leader;
+					_started.TrySetResult(true);
+				}));
+			Node.MainBus.Subscribe(
+				new AdHocHandler<SystemMessage.BecomeFollower>(m => {
+					NodeState = VNodeState.Follower;
+					_started.TrySetResult(true);
+				}));
+		} else {
+			Node.MainBus.Subscribe(
+				new AdHocHandler<SystemMessage.BecomeReadOnlyReplica>(m => {
+					NodeState = VNodeState.ReadOnlyReplica;
+					_started.TrySetResult(true);
+				}));
+		}
+
+		AdHocHandler<StorageMessage.EventCommitted> waitForAdminUser = null!;
+		waitForAdminUser = new AdHocHandler<StorageMessage.EventCommitted>(WaitForAdminUser);
+		Node.MainBus.Subscribe(waitForAdminUser);
+
+		void WaitForAdminUser(StorageMessage.EventCommitted m) {
+			if (m.Event.EventStreamId != "$user-admin") {
+				return;
+			}
+
+			_adminUserCreated.TrySetResult(true);
+			Node.MainBus.Unsubscribe(waitForAdminUser);
+		}
+
+		await Node.StartAsync(waitUntilReady: false, CancellationToken.None);
+	}
+
+	public HttpClient CreateHttpClient() {
+		var httpClient = new HttpClient(new SocketsHttpHandler {
+			AllowAutoRedirect = false,
+			SslOptions = {
+				RemoteCertificateValidationCallback = delegate { return true; }
+			}
+		}, true);
+
+		var scheme = Node.DisableHttps ? "http://" : "https://";
+		httpClient.BaseAddress = new Uri($"{scheme}{HttpEndPoint}");
+		return httpClient;
+	}
+
+	public async Task Shutdown(bool keepDb = false) {
+		StoppingTime.Start();
+		if (_host != null) {
+			await _host.DisposeAsync();
+		}
+
+		await Node.StopAsync().WithTimeout(TimeSpan.FromSeconds(20));
+
+		// the same message 'BecomeShutdown' triggers the disposal of the ReadIndex
+		// and also the notification here that the node as stopped so there is a race.
+		// For now let's wait for a moment before we try to delete the directory.
+		await Task.Delay(500);
+
+		if (!keepDb)
+			TryDeleteDirectory(_dbPath);
+
+		StoppingTime.Stop();
+		RunningTime.Stop();
+	}
+
+	public void WaitIdle() {
+#if DEBUG
+		Node.QueueStatsManager.WaitIdle();
+#endif
+	}
+
+	private void TryDeleteDirectory(string directory) {
+		try {
+			Directory.Delete(directory, true);
+		} catch (Exception e) {
+			Debug.WriteLine("Failed to remove directory {0}", directory);
+			Debug.WriteLine(e);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/MiniNode.cs b/src/KurrentDB.Core.Tests/Helpers/MiniNode.cs
new file mode 100644
index 00000000000..d40e47b9c69
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/MiniNode.cs
@@ -0,0 +1,370 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authentication;
+using EventStore.Plugins.Authorization;
+using EventStore.Plugins.Subsystems;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Authentication;
+using KurrentDB.Core.Authentication.InternalAuthentication;
+using KurrentDB.Core.Authorization;
+using KurrentDB.Core.Authorization.AuthorizationPolicies;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Certificates;
+using KurrentDB.Core.Configuration.Sources;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Monitoring;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.Http;
+using KurrentDB.Core.Tests.Index.Hashers;
+using KurrentDB.Core.Tests.Services.Transport.Tcp;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.Util;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Server.Kestrel.Core;
+using Microsoft.AspNetCore.Server.Kestrel.Https;
+using Microsoft.AspNetCore.TestHost;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Serilog;
+using ILogger = Serilog.ILogger;
+using RuntimeInformation = System.Runtime.RuntimeInformation;
+
+namespace KurrentDB.Core.Tests.Helpers;
+
+public class MiniNode {
+	public const int ChunkSize = 1024 * 1024;
+	public const int CachedChunkSize = ChunkSize + ChunkHeader.Size + ChunkFooter.Size;
+
+	protected static readonly ILogger Log = Serilog.Log.ForContext<MiniNode>();
+	public IPEndPoint TcpEndPoint { get; protected set; }
+	public IPEndPoint IntTcpEndPoint { get; protected set; }
+	public IPEndPoint HttpEndPoint { get; protected set; }
+}
+
+public class MiniNode<TLogFormat, TStreamId> : MiniNode, IAsyncDisposable {
+	public static int RunCount;
+	public static readonly Stopwatch RunningTime = new Stopwatch();
+	public static readonly Stopwatch StartingTime = new Stopwatch();
+	public static readonly Stopwatch StoppingTime = new Stopwatch();
+
+	public readonly ClusterVNode Node;
+	public readonly TFChunkDb Db;
+	public readonly string DbPath;
+	public HttpClient HttpClient;
+	public HttpMessageHandler HttpMessageHandler;
+
+	private readonly WebApplication _webHost;
+	private readonly TaskCompletionSource<bool> _started;
+	private readonly TaskCompletionSource<bool> _adminUserCreated;
+	private readonly int _httpClientTimeoutSec;
+	private bool _testServerStarted;
+	public Task Started => _started.Task;
+	public Task AdminUserCreated => _adminUserCreated.Task;
+
+	public MiniNode(string pathname,
+		int? tcpPort = null, int? httpPort = null,
+		ISubsystem[] subsystems = null,
+		int chunkSize = ChunkSize, int cachedChunkSize = CachedChunkSize, bool enableTrustedAuth = false,
+		int memTableSize = 1000,
+		bool inMemDb = true, bool disableFlushToDisk = false,
+		string advertisedExtHostAddress = null, int advertisedHttpPort = 0,
+		int hashCollisionReadLimit = Opts.HashCollisionReadLimitDefault,
+		byte indexBitnessVersion = Opts.IndexBitnessVersionDefault,
+		bool hash32bit = false,
+		string dbPath = "", bool isReadOnlyReplica = false,
+		long streamExistenceFilterSize = 10_000,
+		int streamExistenceFilterCheckpointIntervalMs = 30_000,
+		int streamExistenceFilterCheckpointDelayMs = 5_000,
+		int httpClientTimeoutSec = 60,
+		IAuthenticationProviderFactory authenticationProviderFactory = null,
+		IAuthorizationProviderFactory authorizationProviderFactory = null,
+		IExpiryStrategy expiryStrategy = null,
+		string transform = "identity",
+		IConfiguration configuration = null,
+		IReadOnlyList<IDbTransform> newTransforms = null,
+		int maxAppendEventSize = TFConsts.EffectiveMaxLogRecordSize) {
+
+		_httpClientTimeoutSec = httpClientTimeoutSec;
+		RunningTime.Start();
+		RunCount += 1;
+
+		var ip = IPAddress.Loopback;
+
+		int extTcpPort = tcpPort ?? PortsHelper.GetAvailablePort(ip);
+		int httpEndPointPort = httpPort ?? PortsHelper.GetAvailablePort(ip);
+		int intTcpPort = PortsHelper.GetAvailablePort(ip);
+
+		if (string.IsNullOrEmpty(dbPath)) {
+			DbPath = Path.Combine(pathname,
+				$"mini-node-db-{extTcpPort}-{httpEndPointPort}");
+		} else {
+			DbPath = dbPath;
+		}
+
+		TcpEndPoint = new IPEndPoint(ip, extTcpPort);
+		IntTcpEndPoint = new IPEndPoint(ip, intTcpPort);
+		HttpEndPoint = new IPEndPoint(ip, httpEndPointPort);
+
+		subsystems ??= [];
+		subsystems = [.. subsystems, new TcpApiTestPlugin.TcpApiTestPlugin()];
+
+		var options = new ClusterVNodeOptions {
+			IndexBitnessVersion = indexBitnessVersion,
+			Application = new() {
+				AllowAnonymousEndpointAccess = true,
+				AllowAnonymousStreamAccess = true,
+				StatsPeriodSec = 60 * 60,
+				WorkerThreads = 1,
+				MaxAppendEventSize = maxAppendEventSize
+			},
+			Interface = new() {
+				ReplicationHeartbeatInterval = 10_000,
+				ReplicationHeartbeatTimeout = 10_000,
+				EnableTrustedAuth = enableTrustedAuth,
+				EnableAtomPubOverHttp = true
+			},
+			Cluster = new() {
+				DiscoverViaDns = false,
+				ReadOnlyReplica = isReadOnlyReplica,
+				Archiver = false,
+				StreamInfoCacheCapacity = 10_000
+			},
+			Database = new() {
+				ChunkSize = chunkSize,
+				ChunksCacheSize = cachedChunkSize,
+				SkipDbVerify = true,
+				StatsStorage = StatsStorage.None,
+				MaxMemTableSize = memTableSize,
+				DisableScavengeMerging = true,
+				HashCollisionReadLimit = hashCollisionReadLimit,
+				CommitTimeoutMs = 10_000,
+				PrepareTimeoutMs = 10_000,
+				UnsafeDisableFlushToDisk = disableFlushToDisk,
+				StreamExistenceFilterSize = streamExistenceFilterSize,
+				Transform = transform
+			},
+			PlugableComponents = subsystems,
+			// limitation: the LoadedOptions here will only reflect the defaults and not the rest
+			// of the config specified above. however we only use it for /info/options
+			LoadedOptions = ClusterVNodeOptions.GetLoadedOptions(new ConfigurationBuilder()
+					.AddKurrentDefaultValues()
+					.Build()),
+		}.Secure(new X509Certificate2Collection(ssl_connections.GetRootCertificate()),
+				ssl_connections.GetServerCertificate())
+			.WithReplicationEndpointOn(IntTcpEndPoint)
+			.WithExternalTcpOn(TcpEndPoint)
+			.WithNodeEndpointOn(HttpEndPoint);
+
+		var configurationBuilder = new ConfigurationBuilder()
+			.AddInMemoryCollection([
+				new($"{KurrentConfigurationKeys.Prefix}:TcpPlugin:NodeTcpPort", extTcpPort.ToString()),
+				new($"{KurrentConfigurationKeys.Prefix}:TcpPlugin:EnableExternalTcp", "true"),
+				new($"{KurrentConfigurationKeys.Prefix}:TcpUnitTestPlugin:NodeTcpPort", extTcpPort.ToString()),
+				new($"{KurrentConfigurationKeys.Prefix}:TcpUnitTestPlugin:NodeHeartbeatInterval", "10000"),
+				new($"{KurrentConfigurationKeys.Prefix}:TcpUnitTestPlugin:NodeHeartbeatTimeout", "10000"),
+				new($"{KurrentConfigurationKeys.Prefix}:TcpUnitTestPlugin:Insecure", options.Application.Insecure.ToString()),
+			]);
+
+		if (configuration is not null)
+			configurationBuilder.AddConfiguration(configuration);
+
+		var inMemConf = configurationBuilder.Build();
+
+		if (advertisedExtHostAddress != null)
+			options = options.AdvertiseNodeAs(new DnsEndPoint(advertisedExtHostAddress, advertisedHttpPort));
+
+		options = inMemDb
+			? options.RunInMemory()
+			: options.RunOnDisk(DbPath);
+
+		Log.Information("\n{0,-25} {1} ({2}/{3}, {4})\n"
+				 + "{5,-25} {6} ({7})\n"
+				 + "{8,-25} {9} ({10}-bit)\n"
+				 + "{11,-25} {12}\n"
+				 + "{13,-25} {14}\n"
+				 + "{15,-25} {16}\n"
+				 + "{17,-25} {18}\n\n",
+			"ES VERSION:", VersionInfo.Version, VersionInfo.Edition, VersionInfo.CommitSha, VersionInfo.Timestamp,
+			"OS:", RuntimeInformation.OsPlatform, Environment.OSVersion,
+			"RUNTIME:", RuntimeInformation.RuntimeVersion, RuntimeInformation.RuntimeMode,
+			"GC:",
+			GC.MaxGeneration == 0
+				? "NON-GENERATION (PROBABLY BOEHM)"
+				: $"{GC.MaxGeneration + 1} GENERATIONS",
+			"DBPATH:", DbPath,
+			"TCP ENDPOINT:", TcpEndPoint,
+			"HTTP ENDPOINT:", HttpEndPoint);
+
+		var logFormatFactory = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory
+			.Configure(options => options with {
+				StreamExistenceFilterCheckpointDelay = TimeSpan.FromMilliseconds(streamExistenceFilterCheckpointDelayMs),
+				StreamExistenceFilterCheckpointInterval = TimeSpan.FromMilliseconds(streamExistenceFilterCheckpointIntervalMs),
+				HighHasher = hash32bit ? new ConstantHasher(0) : options.HighHasher,
+			});
+
+		Node = new ClusterVNode<TStreamId>(options, logFormatFactory,
+			new AuthenticationProviderFactory(
+				c => authenticationProviderFactory ?? new InternalAuthenticationProviderFactory(
+					c,
+					options.DefaultUser)),
+			new AuthorizationProviderFactory(
+				c => authorizationProviderFactory ?? new InternalAuthorizationProviderFactory(
+					new StaticAuthorizationPolicyRegistry([new LegacyPolicySelectorFactory(
+						options.Application.AllowAnonymousEndpointAccess,
+						options.Application.AllowAnonymousStreamAccess,
+						options.Application.OverrideAnonymousEndpointAccessForGossip).Create(c.MainQueue)]))),
+			expiryStrategy: expiryStrategy,
+			certificateProvider: new OptionsCertificateProvider(),
+			configuration: inMemConf,
+			configureAdditionalNodeServices: services => ConfigureMiniNodeServices(services, newTransforms));
+		Db = Node.Db;
+
+		Node.HttpService.SetupController(new TestController(Node.MainQueue));
+		var builder = WebApplication.CreateBuilder();
+		builder.WebHost
+			.ConfigureKestrel(o => {
+				o.Listen(HttpEndPoint, options => {
+					if (RuntimeInformation.IsOSX) {
+						options.Protocols = HttpProtocols.Http2;
+					} else {
+						options.UseHttps(new HttpsConnectionAdapterOptions {
+							ServerCertificate = ssl_connections.GetServerCertificate(),
+							ClientCertificateMode = ClientCertificateMode.AllowCertificate,
+							ClientCertificateValidation = (certificate, chain, sslPolicyErrors) => {
+								var (isValid, error) =
+									ClusterVNode<string>.ValidateClientCertificate(certificate, chain, sslPolicyErrors, () => null, () => new X509Certificate2Collection(ssl_connections.GetRootCertificate()));
+								if (!isValid && error != null) {
+									Log.Error("Client certificate validation error: {e}", error);
+								}
+								return isValid;
+							}
+						});
+					}
+				});
+			})
+			.UseTestServer();
+		builder.Services.AddSerilog();
+		Node.Startup.ConfigureServices(builder.Services);
+		_webHost = builder.Build();
+		Node.Startup.Configure(_webHost);
+		_started = new TaskCompletionSource<bool>();
+		_adminUserCreated = new TaskCompletionSource<bool>();
+	}
+
+	public async Task StartTestServer() {
+		await _webHost.StartAsync();
+		var testServer = _webHost.GetTestServer();
+		HttpMessageHandler = testServer.CreateHandler();
+		HttpClient = new HttpClient(HttpMessageHandler) {
+			Timeout = TimeSpan.FromSeconds(_httpClientTimeoutSec),
+			BaseAddress = new UriBuilder {
+				Scheme = Uri.UriSchemeHttps
+			}.Uri
+		};
+		_testServerStarted = true;
+	}
+
+	private static void ConfigureMiniNodeServices(
+		IServiceCollection services,
+		IReadOnlyList<IDbTransform> newTransforms) {
+		if (newTransforms == null)
+			return;
+
+		services.Decorate<IReadOnlyList<IDbTransform>>(existingTransforms =>
+			DecorateTransforms(existingTransforms, newTransforms));
+	}
+
+	private static IReadOnlyList<IDbTransform> DecorateTransforms(
+		IReadOnlyList<IDbTransform> existingTransforms,
+		IReadOnlyList<IDbTransform> newTransforms) {
+		var transforms = existingTransforms.ToList();
+		transforms.AddRange(newTransforms);
+		return transforms;
+	}
+
+	public async Task Start() {
+		if (!_testServerStarted) {
+			await StartTestServer();
+		}
+
+		StartingTime.Start();
+		Node.MainBus.Subscribe(
+			new AdHocHandler<SystemMessage.BecomeLeader>(m => {
+				_started.TrySetResult(true);
+			}));
+
+		AdHocHandler<StorageMessage.EventCommitted> waitForAdminUser = null;
+		waitForAdminUser = new AdHocHandler<StorageMessage.EventCommitted>(WaitForAdminUser);
+		Node.MainBus.Subscribe(waitForAdminUser);
+
+		void WaitForAdminUser(StorageMessage.EventCommitted m) {
+			if (m.Event.EventStreamId != "$user-admin") {
+				return;
+			}
+
+			_adminUserCreated.TrySetResult(true);
+			Node.MainBus.Unsubscribe(waitForAdminUser);
+		}
+
+		using var cts = new CancellationTokenSource();
+		cts.CancelAfter(TimeSpan.FromSeconds(60));
+		await Node.StartAsync(true, cts.Token);
+
+		if (Node.IsShutdown)
+			_started.TrySetResult(true);
+
+		await Started.WithTimeout();
+
+		StartingTime.Stop();
+		Log.Information("MiniNode successfully started!");
+	}
+
+	public async Task Shutdown(bool keepDb = false) {
+
+		StoppingTime.Start();
+
+		// _kestrelTestServer.Dispose();
+		HttpMessageHandler.Dispose();
+		HttpClient.Dispose();
+		await Node.StopAsync(TimeSpan.FromSeconds(20));
+		await _webHost.DisposeAsync();
+
+		if (!keepDb)
+			TryDeleteDirectory(DbPath);
+
+		StoppingTime.Stop();
+		RunningTime.Stop();
+	}
+
+	public void WaitIdle() {
+#if DEBUG
+		Node.QueueStatsManager.WaitIdle();
+#endif
+	}
+
+	private void TryDeleteDirectory(string directory) {
+		try {
+			Directory.Delete(directory, true);
+		} catch (Exception e) {
+			Debug.WriteLine("Failed to remove directory {0}", directory);
+			Debug.WriteLine(e);
+		}
+	}
+
+	public async ValueTask DisposeAsync() {
+		await Shutdown();
+	}
+}
diff --git a/src/EventStore.Core.Tests/Helpers/MiniNodeLogging.cs b/src/KurrentDB.Core.Tests/Helpers/MiniNodeLogging.cs
similarity index 80%
rename from src/EventStore.Core.Tests/Helpers/MiniNodeLogging.cs
rename to src/KurrentDB.Core.Tests/Helpers/MiniNodeLogging.cs
index f75ff835786..c585b127f89 100644
--- a/src/EventStore.Core.Tests/Helpers/MiniNodeLogging.cs
+++ b/src/KurrentDB.Core.Tests/Helpers/MiniNodeLogging.cs
@@ -1,17 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System.IO;
 using System.Linq;
 using System.Text;
 using NUnit.Framework;
 using Serilog;
 using Serilog.Core;
-using Serilog.Core.Enrichers;
 using Serilog.Formatting.Display;
 using Serilog.Sinks.InMemory;
 
-namespace EventStore.Core.Tests.Helpers; 
+namespace KurrentDB.Core.Tests.Helpers;
+
 
 public static class MiniNodeLogging {
-	
+
 	private static readonly ILogger _logger = new LoggerConfiguration()
 		.Enrich.WithProcessId()
 		.Enrich.WithThreadId()
@@ -22,30 +25,30 @@ public static class MiniNodeLogging {
 
 	private const string Template =
 		"MiniNode: [{ProcessId,5},{ThreadId,2},{Timestamp:HH:mm:ss.fff},{Level:u3}] {Message}{NewLine}{Exception}";
-	
+
 	public static void Setup() {
-		Serilog.Log.Logger = _logger;
+		Log.Logger = _logger;
 	}
-	
+
 	public static void WriteLogs() {
 		TestContext.Error.WriteLine("MiniNode: Start writing logs...");
-		
+
 		var sb = new StringBuilder(256);
 		var f = new MessageTemplateTextFormatter(Template);
 		using var tw = new StringWriter(sb);
 		using var snapshot = InMemorySink.Instance.Snapshot();
-		
+
 		foreach (var e in snapshot.LogEvents.ToList()) {
 			sb.Clear();
 			f.Format(e, tw);
 			TestContext.Error.Write(sb.ToString());
 		}
-		
+
 		TestContext.Error.WriteLine("MiniNode: Writing logs done.");
 	}
 
 	public static void Clear() {
-		Serilog.Log.Logger = Logger.None;
+		Log.Logger = Logger.None;
 		InMemorySink.Instance.Dispose();
 	}
 }
diff --git a/src/KurrentDB.Core.Tests/Helpers/PortsHelper.cs b/src/KurrentDB.Core.Tests/Helpers/PortsHelper.cs
new file mode 100644
index 00000000000..cda50a331a8
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/PortsHelper.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net;
+using System.Net.Sockets;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Tests.Helpers;
+
+public static class PortsHelper {
+	private static readonly ILogger Log =
+		Serilog.Log.ForContext(Serilog.Core.Constants.SourceContextPropertyName, "PortsHelper");
+	public static int GetAvailablePort(IPAddress ip) {
+		TcpListener l = new TcpListener(ip, 0);
+		l.Start();
+		int port = ((IPEndPoint)l.LocalEndpoint).Port;
+		l.Stop();
+		Log.Information($"Available port found: {port}");
+		return port;
+	}
+
+	public static IPEndPoint GetLoopback() {
+		var ip = IPAddress.Loopback;
+		int port = GetAvailablePort(ip);
+		return new IPEndPoint(ip, port);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/ReflectionDynamic.cs b/src/KurrentDB.Core.Tests/Helpers/ReflectionDynamic.cs
new file mode 100644
index 00000000000..1263f289841
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/ReflectionDynamic.cs
@@ -0,0 +1,214 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Dynamic;
+using System.Linq;
+using System.Reflection;
+
+namespace KurrentDB.Core.Tests.Helpers;
+
+class PrivateReflectionDynamicObject : DynamicObject {
+	private static readonly IDictionary<Type, IDictionary<string, IProperty>> PropertiesOnType =
+		new ConcurrentDictionary<Type, IDictionary<string, IProperty>>();
+
+	// Simple abstraction to make field and property access consistent
+	interface IProperty {
+		string Name { get; }
+		object GetValue(object obj, object[] index);
+		void SetValue(object obj, object val, object[] index);
+	}
+
+	// IProperty implementation over a PropertyInfo
+	class Property : IProperty {
+		internal PropertyInfo PropertyInfo { get; set; }
+
+		string IProperty.Name {
+			get { return PropertyInfo.Name; }
+		}
+
+		object IProperty.GetValue(object obj, object[] index) {
+			return PropertyInfo.GetValue(obj, index);
+		}
+
+		void IProperty.SetValue(object obj, object val, object[] index) {
+			PropertyInfo.SetValue(obj, val, index);
+		}
+	}
+
+	// IProperty implementation over a FieldInfo
+	class Field : IProperty {
+		internal FieldInfo FieldInfo { get; set; }
+
+		string IProperty.Name {
+			get { return FieldInfo.Name; }
+		}
+
+
+		object IProperty.GetValue(object obj, object[] index) {
+			return FieldInfo.GetValue(obj);
+		}
+
+		void IProperty.SetValue(object obj, object val, object[] index) {
+			FieldInfo.SetValue(obj, val);
+		}
+	}
+
+
+	private object RealObject { get; set; }
+	private const BindingFlags bindingFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
+
+	internal static object WrapObjectIfNeeded(object o) {
+		// Don't wrap primitive types, which don't have many interesting internal APIs
+		if (o == null || o.GetType().IsPrimitive || o is string)
+			return o;
+
+		return new PrivateReflectionDynamicObject() { RealObject = o };
+	}
+
+	public override bool TryGetMember(GetMemberBinder binder, out object result) {
+		IProperty prop = GetProperty(binder.Name);
+
+		// Get the property value
+		result = prop.GetValue(RealObject, index: null);
+
+		// Wrap the sub object if necessary. This allows nested anonymous objects to work.
+		result = WrapObjectIfNeeded(result);
+
+		return true;
+	}
+
+	public override bool TrySetMember(SetMemberBinder binder, object value) {
+		IProperty prop = GetProperty(binder.Name);
+
+		// Set the property value
+		prop.SetValue(RealObject, value, index: null);
+
+		return true;
+	}
+
+	public override bool TryGetIndex(GetIndexBinder binder, object[] indexes, out object result) {
+		// The indexed property is always named "Item" in C#
+		IProperty prop = GetIndexProperty();
+		result = prop.GetValue(RealObject, indexes);
+
+		// Wrap the sub object if necessary. This allows nested anonymous objects to work.
+		result = WrapObjectIfNeeded(result);
+
+		return true;
+	}
+
+	public override bool TrySetIndex(SetIndexBinder binder, object[] indexes, object value) {
+		// The indexed property is always named "Item" in C#
+		IProperty prop = GetIndexProperty();
+		prop.SetValue(RealObject, value, indexes);
+		return true;
+	}
+
+	// Called when a method is called
+	public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result) {
+		result = InvokeMemberOnType(RealObject.GetType(), RealObject, binder.Name, args);
+
+		// Wrap the sub object if necessary. This allows nested anonymous objects to work.
+		result = WrapObjectIfNeeded(result);
+
+		return true;
+	}
+
+	public override bool TryConvert(ConvertBinder binder, out object result) {
+		result = Convert.ChangeType(RealObject, binder.Type);
+		return true;
+	}
+
+	public override string ToString() {
+		return RealObject.ToString();
+	}
+
+	private IProperty GetIndexProperty() {
+		// The index property is always named "Item" in C#
+		return GetProperty("Item");
+	}
+
+	private IProperty GetProperty(string propertyName) {
+		// Get the list of properties and fields for this type
+		IDictionary<string, IProperty> typeProperties = GetTypeProperties(RealObject.GetType());
+
+		// Look for the one we want
+		IProperty property;
+		if (typeProperties.TryGetValue(propertyName, out property)) {
+			return property;
+		}
+
+		// The property doesn't exist
+
+		// Get a list of supported properties and fields and show them as part of the exception message
+		// For fields, skip the auto property backing fields (which name start with <)
+		var propNames = typeProperties.Keys.Where(name => name[0] != '<').OrderBy(name => name);
+		throw new ArgumentException(
+			string.Format(
+				"The property {0} does not exist on type {1}. Supported properties are: {2}",
+				propertyName, RealObject.GetType(), string.Join(", ", propNames)));
+	}
+
+	private static IDictionary<string, IProperty> GetTypeProperties(Type type) {
+		// First, check if we already have it cached
+		IDictionary<string, IProperty> typeProperties;
+		if (PropertiesOnType.TryGetValue(type, out typeProperties)) {
+			return typeProperties;
+		}
+
+		// Not cache, so we need to build it
+
+		typeProperties = new ConcurrentDictionary<string, IProperty>();
+
+		// First, add all the properties
+		foreach (PropertyInfo prop in type.GetProperties(bindingFlags).Where(p => p.DeclaringType == type)) {
+			typeProperties[prop.Name] = new Property() { PropertyInfo = prop };
+		}
+
+		// Now, add all the fields
+		foreach (FieldInfo field in type.GetFields(bindingFlags).Where(p => p.DeclaringType == type)) {
+			typeProperties[field.Name] = new Field() { FieldInfo = field };
+		}
+
+		// Finally, recurse on the base class to add its fields
+		if (type.BaseType != null) {
+			foreach (IProperty prop in GetTypeProperties(type.BaseType).Values) {
+				typeProperties[prop.Name] = prop;
+			}
+		}
+
+		// Cache it for next time
+		PropertiesOnType[type] = typeProperties;
+
+		return typeProperties;
+	}
+
+	private static object InvokeMemberOnType(Type type, object target, string name, object[] args) {
+		try {
+			// Try to incoke the method
+			return type.InvokeMember(
+				name,
+				BindingFlags.InvokeMethod | bindingFlags,
+				null,
+				target,
+				args);
+		} catch (MissingMethodException) {
+			// If we couldn't find the method, try on the base class
+			if (type.BaseType != null) {
+				return InvokeMemberOnType(type.BaseType, target, name, args);
+			}
+
+			//quick greg hack to allow methods to not exist!
+			return null;
+		}
+	}
+}
+
+public static class PrivateReflectionDynamicObjectExtensions {
+	public static dynamic AsDynamic(this object o) {
+		return PrivateReflectionDynamicObject.WrapObjectIfNeeded(o);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/TestFixtureWithExistingEvents.cs b/src/KurrentDB.Core.Tests/Helpers/TestFixtureWithExistingEvents.cs
new file mode 100644
index 00000000000..ac1b8be2635
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/TestFixtureWithExistingEvents.cs
@@ -0,0 +1,840 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests.Bus.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Helpers;
+
+public abstract class TestFixtureWithExistingEvents<TLogFormat, TStreamId> : TestFixtureWithReadWriteDispatchers,
+	IHandle<ClientMessage.ReadStreamEventsBackward>,
+	IHandle<ClientMessage.ReadStreamEventsForward>,
+	IHandle<ClientMessage.ReadAllEventsForward>,
+	IHandle<ClientMessage.ReadAllEventsBackward>,
+	IHandle<ClientMessage.FilteredReadAllEventsForward>,
+	IHandle<ClientMessage.FilteredReadAllEventsBackward>,
+	IHandle<ClientMessage.WriteEvents>,
+	IHandle<ClientMessage.TransactionStart>,
+	IHandle<ClientMessage.TransactionWrite>,
+	IHandle<ClientMessage.TransactionCommit>,
+	IHandle<ClientMessage.SubscribeToStream>,
+	IHandle<ClientMessage.FilteredSubscribeToStream>,
+	IHandle<ClientMessage.DeleteStream>,
+	IHandle<StorageMessage.EventCommitted> {
+	public class Transaction {
+		private readonly ClientMessage.TransactionStart _startMessage;
+
+		private readonly List<Tuple<int, Event>> _events = new();
+
+		public Transaction(long position, ClientMessage.TransactionStart startMessage) {
+			_startMessage = startMessage;
+		}
+
+		public void Write(ClientMessage.TransactionWrite message, ref int fakePosition) {
+			foreach (var @event in message.Events) {
+				_events.Add(Tuple.Create(fakePosition, @event));
+				fakePosition += 50;
+			}
+		}
+
+		public void Commit(ClientMessage.TransactionCommit message, TestFixtureWithExistingEvents<TLogFormat, TStreamId> fixture) {
+			var commitPosition = fixture._fakePosition;
+			fixture._fakePosition += 50;
+			fixture.ProcessWrite(
+				message.Envelope, message.CorrelationId, _startMessage.EventStreamId, _startMessage.ExpectedVersion,
+				_events.Select(v => v.Item2).ToArray(),
+				(f, l) =>
+					new ClientMessage.TransactionCommitCompleted(
+						message.CorrelationId, message.TransactionId, f, l, -1, -1),
+				new ClientMessage.TransactionCommitCompleted(
+					message.CorrelationId, message.TransactionId, OperationResult.WrongExpectedVersion,
+					"Wrong expected version"),
+				_events.Select(v => (long)v.Item1).ToArray(), commitPosition);
+		}
+	}
+
+	protected TestHandler<ClientMessage.ReadStreamEventsBackward> _listEventsHandler;
+
+	protected readonly Dictionary<string, List<EventRecord>> _streams =
+		new Dictionary<string, List<EventRecord>>();
+
+	protected readonly SortedList<TFPos, EventRecord> _all = new SortedList<TFPos, EventRecord>();
+
+	protected readonly HashSet<string> _deletedStreams = new HashSet<string>();
+
+	protected readonly Dictionary<long, Transaction> _activeTransactions = new Dictionary<long, Transaction>();
+
+	private int _fakePosition = 100;
+	private bool _allWritesSucceed;
+	private readonly HashSet<string> _writesToSucceed = new HashSet<string>();
+	private bool _allWritesQueueUp;
+	private Queue<ClientMessage.WriteEvents> _writesQueue;
+	private Queue<ClientMessage.ReadStreamEventsBackward> _readEventsBackwardsQueue;
+	private bool _readsBackwardsQueuesUp;
+	private bool _readAllEnabled;
+	private bool _noOtherStreams;
+	private bool _notReady;
+	private bool _readsTimeOut;
+	protected List<DateTime> EventTimeStamps = new List<DateTime>();
+
+	protected readonly HashSet<string> _readsToTimeOutOnce = new HashSet<string>();
+
+	private static readonly char[] _linkToSeparator = new[] { '@' };
+
+	protected TFPos ExistingStreamMetadata(string streamId, string metadata) {
+		return ExistingEvent("$$" + streamId, SystemEventTypes.StreamMetadata, "", metadata, isJson: true);
+	}
+
+	protected TFPos ExistingEvent(string streamName, string eventType, string eventMetadata, string eventData,
+		bool isJson = false) {
+		return WriteEvent(streamName, eventType, eventMetadata, eventData, isJson).Item2;
+	}
+
+	protected EventRecord ExistingEventTimeStamp(string streamName, string eventType, string eventMetadata, string eventData,
+		bool isJson = false) {
+		return WriteEvent(streamName, eventType, eventMetadata, eventData, isJson).Item1;
+	}
+
+	protected (EventRecord, TFPos) WriteEvent(string streamName, string eventType, string eventMetadata, string eventData,
+		bool isJson = false) {
+		List<EventRecord> list;
+		if (!_streams.TryGetValue(streamName, out list) || list == null) {
+			list = new List<EventRecord>();
+			_streams[streamName] = list;
+		}
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamIdIgnored = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeIdIgnored = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		var eventRecord = new EventRecord(
+			list.Count,
+			LogRecord.Prepare(
+				recordFactory,
+				_fakePosition, Guid.NewGuid(), Guid.NewGuid(), _fakePosition, 0, streamIdIgnored, list.Count - 1,
+				PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd | (isJson ? PrepareFlags.IsJson : 0),
+				eventTypeIdIgnored, eventData is null ? null : Helper.UTF8NoBom.GetBytes(eventData),
+				eventMetadata == null ? new byte[0] : Helper.UTF8NoBom.GetBytes(eventMetadata),
+				_timeProvider.UtcNow), streamName, eventType);
+		list.Add(eventRecord);
+		var eventPosition = new TFPos(_fakePosition + 50, _fakePosition);
+		_all.Add(eventPosition, eventRecord);
+		_fakePosition += 100;
+		return (eventRecord, eventPosition);
+	}
+
+	protected void NotReady() {
+		_notReady = true;
+	}
+
+	protected void Ready() {
+		_notReady = false;
+	}
+
+	protected void AllReadsTimeOut() {
+		_readsTimeOut = true;
+	}
+
+	protected void EnableReadAll() {
+		_readAllEnabled = true;
+	}
+
+	protected void ReadsBackwardQueuesUp() {
+		_readsBackwardsQueuesUp = true;
+	}
+
+	protected void CompleteOneReadBackwards() {
+		var read = _readEventsBackwardsQueue.Dequeue();
+		ProcessRead(read);
+	}
+
+	protected void NoStream(string streamId) {
+		_streams[streamId] = null;
+	}
+
+	protected void NoOtherStreams() {
+		_noOtherStreams = true;
+	}
+
+	protected void DeletedStream(string streamId) {
+		_deletedStreams.Add(streamId);
+		ExistingStreamMetadata(streamId, CreateStreamDeletedEventJson());
+	}
+
+	private static string CreateStreamDeletedEventJson() {
+		return new StreamMetadata(null, null, EventNumber.DeletedStream, null, null, null).ToJsonString();
+	}
+
+	protected void AllWritesSucceed(bool succeed = true) {
+		_allWritesSucceed = succeed;
+	}
+
+	protected void AllWritesToSucceed(string streamId) {
+		_writesToSucceed.Add(streamId);
+	}
+
+	protected void AllWritesQueueUp() {
+		_allWritesQueueUp = true;
+	}
+
+	protected void TimeOutReadToStreamOnce(string streamId) {
+		_readsToTimeOutOnce.Add(streamId);
+	}
+
+	protected void OneWriteCompletes() {
+		var message = _writesQueue.Dequeue();
+		ProcessWrite(
+			message.Envelope, message.CorrelationId, message.EventStreamId, message.ExpectedVersion, message.Events,
+			(firstEventNumber, lastEventNumber) =>
+				new ClientMessage.WriteEventsCompleted(message.CorrelationId, firstEventNumber, lastEventNumber, -1,
+					-1),
+			new ClientMessage.WriteEventsCompleted(
+				message.CorrelationId, OperationResult.WrongExpectedVersion, "wrong expected version"));
+	}
+
+	protected void CompleteWriteWithResult(OperationResult result) {
+		var message = _writesQueue.Dequeue();
+		ProcessWrite(
+			message.Envelope, message.CorrelationId, message.EventStreamId, ExpectedVersion.Any, message.Events,
+			(firstEventNumber, lastEventNumber) =>
+				new ClientMessage.WriteEventsCompleted(message.CorrelationId, result, String.Empty),
+			new ClientMessage.WriteEventsCompleted(
+				message.CorrelationId, OperationResult.WrongExpectedVersion, "wrong expected version"));
+	}
+
+	protected void AllWriteComplete() {
+		while (_writesQueue.Count > 0)
+			OneWriteCompletes();
+	}
+
+	[SetUp]
+	public void setup1() {
+		_writesQueue = new Queue<ClientMessage.WriteEvents>();
+		_readEventsBackwardsQueue = new Queue<ClientMessage.ReadStreamEventsBackward>();
+		_listEventsHandler = new TestHandler<ClientMessage.ReadStreamEventsBackward>();
+		_bus.Subscribe(_listEventsHandler);
+		_bus.Subscribe<ClientMessage.WriteEvents>(this);
+		_bus.Subscribe<ClientMessage.ReadStreamEventsBackward>(this);
+		_bus.Subscribe<ClientMessage.ReadStreamEventsForward>(this);
+		_bus.Subscribe<ClientMessage.ReadAllEventsForward>(this);
+		_bus.Subscribe<ClientMessage.ReadAllEventsBackward>(this);
+		_bus.Subscribe<ClientMessage.FilteredReadAllEventsForward>(this);
+		_bus.Subscribe<ClientMessage.FilteredReadAllEventsBackward>(this);
+		_bus.Subscribe<ClientMessage.SubscribeToStream>(this);
+		_bus.Subscribe<ClientMessage.FilteredSubscribeToStream>(this);
+		_bus.Subscribe<ClientMessage.DeleteStream>(this);
+		_bus.Subscribe<ClientMessage.TransactionStart>(this);
+		_bus.Subscribe<ClientMessage.TransactionWrite>(this);
+		_bus.Subscribe<ClientMessage.TransactionCommit>(this);
+		_bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_readDispatcher);
+		_bus.Subscribe<ClientMessage.NotHandled>(_readDispatcher);
+		_bus.Subscribe<StorageMessage.EventCommitted>(this);
+		_bus.Subscribe(_writeDispatcher);
+		_bus.Subscribe(_ioDispatcher.StreamDeleter);
+		_bus.Subscribe(_ioDispatcher.Awaker);
+		_streams.Clear();
+		_deletedStreams.Clear();
+		_all.Clear();
+		_readAllEnabled = false;
+		_fakePosition = 100;
+		_activeTransactions.Clear();
+		Given1();
+		Given();
+	}
+
+	protected virtual void Given1() {
+	}
+
+	protected virtual void Given() {
+	}
+
+	public void Handle(ClientMessage.ReadStreamEventsBackward message) {
+		if (_notReady) {
+			message.Envelope.ReplyWith(new ClientMessage.NotHandled(
+				message.CorrelationId,
+				ClientMessage.NotHandled.Types.NotHandledReason.NotReady,
+				default(string)));
+		}
+
+		if (_readsBackwardsQueuesUp) {
+			_readEventsBackwardsQueue.Enqueue(message);
+			return;
+		}
+
+		if (_readsTimeOut)
+			return;
+		if (_readsToTimeOutOnce.Contains(message.EventStreamId)) {
+			Console.WriteLine("[TEST] Timing out read backwards for {0}", message.EventStreamId);
+			_readsToTimeOutOnce.Remove(message.EventStreamId);
+			return;
+		}
+
+		ProcessRead(message);
+	}
+
+	private void ProcessRead(ClientMessage.ReadStreamEventsBackward message) {
+		List<EventRecord> list;
+		if (_deletedStreams.Contains(message.EventStreamId)) {
+			message.Envelope.ReplyWith(
+				new ClientMessage.ReadStreamEventsBackwardCompleted(
+					message.CorrelationId, message.EventStreamId, message.FromEventNumber, message.MaxCount,
+					ReadStreamResult.StreamDeleted, new ResolvedEvent[0], null, false, string.Empty, -1,
+					EventNumber.DeletedStream, true, _fakePosition));
+		} else if (_streams.TryGetValue(message.EventStreamId, out list) || _noOtherStreams) {
+			if (list != null && list.Count > 0 && (list.Last().EventNumber >= message.FromEventNumber)
+				|| (message.FromEventNumber == -1)) {
+				ResolvedEvent[] records =
+					list.Safe()
+						.Reverse()
+						.SkipWhile(v => message.FromEventNumber != -1 && v.EventNumber > message.FromEventNumber)
+						.Take(message.MaxCount)
+						.Select(v => BuildEvent(v, message.ResolveLinkTos))
+						.ToArray();
+				message.Envelope.ReplyWith(
+					new ClientMessage.ReadStreamEventsBackwardCompleted(
+						message.CorrelationId, message.EventStreamId,
+						message.FromEventNumber == -1
+							? (EnumerableExtensions.IsEmpty(list) ? -1 : list.Last().EventNumber)
+							: message.FromEventNumber, message.MaxCount, ReadStreamResult.Success, records, null,
+						false,
+						string.Empty,
+						nextEventNumber: records.Length > 0 ? records.Last().OriginalEvent.EventNumber - 1 : -1,
+						lastEventNumber: list.Safe().Any() ? list.Safe().Last().EventNumber : -1,
+						isEndOfStream: records.Length == 0 || records.Last().OriginalEvent.EventNumber == 0,
+						tfLastCommitPosition: _fakePosition));
+			} else {
+				if (list == null) {
+					message.Envelope.ReplyWith(
+						new ClientMessage.ReadStreamEventsBackwardCompleted(
+							message.CorrelationId, message.EventStreamId, message.FromEventNumber, message.MaxCount,
+							ReadStreamResult.NoStream, new ResolvedEvent[0], null, false, "", nextEventNumber: -1,
+							lastEventNumber: -1,
+							isEndOfStream: true,
+							tfLastCommitPosition: _fakePosition));
+					return;
+				}
+
+				throw new NotImplementedException();
+			}
+		}
+	}
+
+	public void Handle(ClientMessage.ReadStreamEventsForward message) {
+		if (_readsTimeOut)
+			return;
+		if (_readsToTimeOutOnce.Contains(message.EventStreamId)) {
+			Console.WriteLine("[TEST] Timing out read forwards for {0}", message.EventStreamId);
+			_readsToTimeOutOnce.Remove(message.EventStreamId);
+			return;
+		}
+
+		List<EventRecord> list;
+		if (_deletedStreams.Contains(message.EventStreamId)) {
+			message.Envelope.ReplyWith(
+				new ClientMessage.ReadStreamEventsBackwardCompleted(
+					message.CorrelationId, message.EventStreamId, message.FromEventNumber, message.MaxCount,
+					ReadStreamResult.StreamDeleted, new ResolvedEvent[0], null, false, string.Empty, -1,
+					EventNumber.DeletedStream, true, _fakePosition));
+		} else if (_streams.TryGetValue(message.EventStreamId, out list) || _noOtherStreams) {
+			if (list != null && list.Count > 0 && message.FromEventNumber >= 0) {
+				ResolvedEvent[] records =
+					list.Safe()
+						.SkipWhile(v => v.EventNumber < message.FromEventNumber)
+						.Take(message.MaxCount)
+						.Select(v => BuildEvent(v, message.ResolveLinkTos))
+						.ToArray();
+				var lastEventNumber = list.Safe().Any() ? list.Safe().Last().EventNumber : -1;
+				message.Envelope.ReplyWith(
+					new ClientMessage.ReadStreamEventsForwardCompleted(
+						message.CorrelationId, message.EventStreamId,
+						message.FromEventNumber, message.MaxCount, ReadStreamResult.Success, records, null, false,
+						string.Empty,
+						nextEventNumber: records.Length > 0
+							? records.Last().OriginalEvent.EventNumber + 1
+							: lastEventNumber + 1,
+						lastEventNumber: lastEventNumber,
+						isEndOfStream: records.Length == 0 ||
+									   records.Last().OriginalEvent.EventNumber == list.Last().EventNumber,
+						tfLastCommitPosition: _fakePosition));
+			} else {
+				if (list == null) {
+					message.Envelope.ReplyWith(
+						new ClientMessage.ReadStreamEventsForwardCompleted(
+							message.CorrelationId, message.EventStreamId, message.FromEventNumber, message.MaxCount,
+							ReadStreamResult.NoStream, new ResolvedEvent[0], null, false, "", nextEventNumber: -1,
+							lastEventNumber: -1,
+							isEndOfStream: true,
+							tfLastCommitPosition: _fakePosition));
+					return;
+				}
+
+				throw new NotImplementedException();
+				/*
+									message.Envelope.ReplyWith(
+											new ClientMessage.ReadStreamEventsBackwardCompleted(
+													message.CorrelationId,
+													message.EventStreamId,
+													new EventLinkPair[0],
+													ReadStreamResult.Success,
+													nextEventNumber: -1,
+													lastEventNumber: list.Safe().Last().EventNumber,
+													isEndOfStream: true,// NOTE AN: don't know how to correctly determine this here
+													lastCommitPosition: _lastPosition));
+				*/
+			}
+		}
+	}
+
+	private ResolvedEvent BuildEvent(EventRecord x, bool resolveLinks) {
+		if (x.EventType == "$>" && resolveLinks) {
+			var parts = Helper.UTF8NoBom.GetString(x.Data.Span).Split(_linkToSeparator, 2);
+			List<EventRecord> list;
+			if (_deletedStreams.Contains(parts[1]) || !_streams.TryGetValue(parts[1], out list))
+				return ResolvedEvent.ForFailedResolvedLink(x, ReadEventResult.StreamDeleted);
+			var eventNumber = int.Parse(parts[0]);
+			var target = list[eventNumber];
+
+			return ResolvedEvent.ForResolvedLink(target, x);
+		} else
+			return ResolvedEvent.ForUnresolvedEvent(x);
+	}
+
+	private ResolvedEvent BuildEvent(EventRecord x, bool resolveLinks, long commitPosition) {
+		if (x.EventType == "$>" && resolveLinks) {
+			var parts = Helper.UTF8NoBom.GetString(x.Data.Span).Split(_linkToSeparator, 2);
+			var list = _streams[parts[1]];
+			var eventNumber = int.Parse(parts[0]);
+			var target = list[eventNumber];
+
+			return ResolvedEvent.ForResolvedLink(target, x, commitPosition);
+		} else
+			return ResolvedEvent.ForUnresolvedEvent(x, commitPosition);
+	}
+
+	public void Handle(ClientMessage.WriteEvents message) {
+		if (_allWritesSucceed || _writesToSucceed.Contains(message.EventStreamId)) {
+			ProcessWrite(
+				message.Envelope, message.CorrelationId, message.EventStreamId, message.ExpectedVersion,
+				message.Events,
+				(firstEventNumber, lastEventNumber) =>
+					new ClientMessage.WriteEventsCompleted(message.CorrelationId, firstEventNumber, lastEventNumber,
+						-1, -1),
+				new ClientMessage.WriteEventsCompleted(
+					message.CorrelationId, OperationResult.WrongExpectedVersion, "wrong expected version"));
+		} else if (_allWritesQueueUp)
+			_writesQueue.Enqueue(message);
+	}
+
+	private void ProcessWrite<T>(IEnvelope envelope, Guid correlationId, string streamId, long expectedVersion,
+		Event[] events, Func<int, int, T> writeEventsCompleted, T wrongExpectedVersionResponse,
+		long[] positions = null, long? commitPosition = null) where T : Message {
+		if (positions == null) {
+			positions = new long[events.Length];
+			for (int i = 0; i < positions.Length; i++) {
+				positions[i] = _fakePosition;
+				_fakePosition += 100;
+			}
+		}
+
+		List<EventRecord> list;
+		if (!_streams.TryGetValue(streamId, out list) || list == null) {
+			list = new List<EventRecord>();
+			_streams[streamId] = list;
+		}
+
+		if (expectedVersion != EventStore.ClientAPI.ExpectedVersion.Any) {
+			if (expectedVersion != list.Count - 1) {
+				envelope.ReplyWith(wrongExpectedVersionResponse);
+				return;
+			}
+		}
+
+		var eventRecords = (from ep in events.Zip(positions, (@event, position) => new { @event, position })
+							let e = ep.@event
+							let eventNumber = list.Count
+							//NOTE: ASSUMES STAYS ENUMERABLE
+							let tfPosition = ep.position
+							select
+								new {
+									position = tfPosition,
+									record =
+										new EventRecord(
+											eventNumber, tfPosition, correlationId, e.EventId, tfPosition, 0, streamId,
+											ExpectedVersion.Any, _timeProvider.UtcNow,
+											PrepareFlags.SingleWrite | (e.IsJson ? PrepareFlags.IsJson : PrepareFlags.None),
+											e.EventType, e.Data, e.Metadata)
+								}); //NOTE: DO NOT MAKE ARRAY
+		foreach (var eventRecord in eventRecords) {
+			list.Add(eventRecord.record);
+			var tfPos = new TFPos(commitPosition ?? eventRecord.position + 50, eventRecord.position);
+			_all.Add(tfPos, eventRecord.record);
+			_bus.Publish(
+				new StorageMessage.EventCommitted(tfPos.CommitPosition, eventRecord.record, isTfEof: false));
+		}
+
+		_bus.Publish(new StorageMessage.TfEofAtNonCommitRecord());
+
+		var firstEventNumber = list.Count - events.Length;
+		envelope?.ReplyWith(writeEventsCompleted(firstEventNumber, firstEventNumber + events.Length - 1));
+	}
+
+	public void Handle(StorageMessage.EventCommitted msg) {
+		var metadata = Json.ParseJson<ParkedMessageMetadata>(msg.Event.Metadata);
+		if (metadata != null)
+			EventTimeStamps.Add(metadata.Added.ToUniversalTime());
+	}
+
+	class ParkedMessageMetadata {
+		public DateTime Added { get; set; }
+		public string Reason { get; set; }
+		public long SubscriptionEventNumber { get; set; }
+	}
+
+	public void Handle(ClientMessage.DeleteStream message) {
+		List<EventRecord> list;
+		if (_deletedStreams.Contains(message.EventStreamId)) {
+			message.Envelope.ReplyWith(new ClientMessage.DeleteStreamCompleted(message.CorrelationId,
+				OperationResult.StreamDeleted, string.Empty, -1, -1, -1));
+			return;
+		}
+
+		if (!_streams.TryGetValue(message.EventStreamId, out list) || list == null) {
+			if (message.ExpectedVersion == ExpectedVersion.Any) {
+				message.Envelope.ReplyWith(new ClientMessage.DeleteStreamCompleted(message.CorrelationId,
+					OperationResult.StreamDeleted, string.Empty, -1, -1, -1));
+				_deletedStreams.Add(message.EventStreamId);
+				return;
+			}
+
+			message.Envelope.ReplyWith(new ClientMessage.DeleteStreamCompleted(message.CorrelationId,
+				OperationResult.WrongExpectedVersion, string.Empty));
+			return;
+		}
+
+		_deletedStreams.Add(message.EventStreamId);
+
+		ProcessWrite<Message>(
+			null, message.CorrelationId, SystemStreams.MetastreamOf(message.EventStreamId), ExpectedVersion.Any,
+			new Event[] {
+				new Event(Guid.NewGuid(), SystemEventTypes.StreamMetadata, true, CreateStreamDeletedEventJson(),
+					null)
+			},
+			null, null);
+
+		message.Envelope.ReplyWith(new ClientMessage.DeleteStreamCompleted(message.CorrelationId,
+			OperationResult.Success, string.Empty));
+	}
+
+	public void Handle(ClientMessage.ReadAllEventsForward message) {
+		if (_readsTimeOut)
+			return;
+		if (!_readAllEnabled)
+			return;
+		var from = new TFPos(message.CommitPosition, message.PreparePosition);
+		var records = _all.SkipWhile(v => v.Key < from).Take(message.MaxCount).ToArray();
+		var list = new List<ResolvedEvent>();
+		var pos = from;
+		var next = pos;
+		var prev = new TFPos(pos.CommitPosition, Int64.MaxValue);
+		foreach (KeyValuePair<TFPos, EventRecord> record in records) {
+			pos = record.Key;
+			next = new TFPos(pos.CommitPosition, pos.PreparePosition + 1);
+			list.Add(BuildEvent(record.Value, message.ResolveLinkTos, record.Key.CommitPosition));
+		}
+
+		var events = list.ToArray();
+		message.Envelope.ReplyWith(
+			new ClientMessage.ReadAllEventsForwardCompleted(
+				message.CorrelationId, ReadAllResult.Success, "", events, null, false,
+				message.MaxCount, pos, next, prev, _fakePosition));
+	}
+
+	public void Handle(ClientMessage.ReadAllEventsBackward message) {
+		if (_readsTimeOut)
+			return;
+		if (!_readAllEnabled)
+			return;
+
+		var from = new TFPos(message.CommitPosition, message.PreparePosition);
+		if (from == new TFPos(-1, -1)) // read from end
+			from = new TFPos(long.MaxValue, long.MaxValue);
+
+		var records = _all.Reverse().SkipWhile(v => v.Key > from).Take(message.MaxCount).ToArray();
+		var list = new List<ResolvedEvent>();
+		var pos = from;
+		var next = pos;
+		var prev = new TFPos(pos.CommitPosition, 0);
+		foreach (KeyValuePair<TFPos, EventRecord> record in records) {
+			pos = record.Key;
+			next = new TFPos(pos.CommitPosition, pos.PreparePosition - 1);
+			list.Add(BuildEvent(record.Value, message.ResolveLinkTos, record.Key.CommitPosition));
+		}
+
+		var events = list.ToArray();
+		message.Envelope.ReplyWith(
+			new ClientMessage.ReadAllEventsBackwardCompleted(
+				message.CorrelationId, ReadAllResult.Success, "", events, null, false,
+				message.MaxCount, pos, next, prev, _fakePosition));
+	}
+
+	public void Handle(ClientMessage.FilteredReadAllEventsForward message) {
+		if (_readsTimeOut)
+			return;
+		if (!_readAllEnabled)
+			return;
+		var from = new TFPos(message.CommitPosition, message.PreparePosition);
+		var records = _all.SkipWhile(v => v.Key < from).Where(kvp => message.EventFilter.IsEventAllowed(kvp.Value)).Take(message.MaxCount).ToArray();
+		var list = new List<ResolvedEvent>();
+		var pos = from;
+		var next = pos;
+		var prev = new TFPos(pos.CommitPosition, Int64.MaxValue);
+		foreach (KeyValuePair<TFPos, EventRecord> record in records) {
+			pos = record.Key;
+			next = new TFPos(pos.CommitPosition, pos.PreparePosition + 1);
+			list.Add(BuildEvent(record.Value, message.ResolveLinkTos, record.Key.CommitPosition));
+		}
+
+		if (records.IsEmpty()) {
+			var lastPos = _all.Keys[^1];
+			next = new TFPos(lastPos.CommitPosition, lastPos.PreparePosition + 1);
+		}
+
+		var events = list.ToArray();
+		message.Envelope.ReplyWith(
+			new ClientMessage.FilteredReadAllEventsForwardCompleted(
+				message.CorrelationId, FilteredReadAllResult.Success, "", events, null, false,
+				message.MaxCount, pos, next, prev, _fakePosition, list.Count < message.MaxCount, -1));
+	}
+
+	public void Handle(ClientMessage.FilteredReadAllEventsBackward message) {
+		if (_readsTimeOut)
+			return;
+		if (!_readAllEnabled)
+			return;
+
+		var from = new TFPos(message.CommitPosition, message.PreparePosition);
+		if (from == new TFPos(-1, -1)) // read from end
+			from = new TFPos(long.MaxValue, long.MaxValue);
+
+		var records = _all.Reverse().SkipWhile(v => v.Key > from).Where(kvp => message.EventFilter.IsEventAllowed(kvp.Value)).Take(message.MaxCount).ToArray();
+		var list = new List<ResolvedEvent>();
+		var pos = from;
+		var next = pos;
+		var prev = new TFPos(pos.CommitPosition, 0);
+		foreach (KeyValuePair<TFPos, EventRecord> record in records) {
+			pos = record.Key;
+			next = new TFPos(pos.CommitPosition, pos.PreparePosition - 1);
+			list.Add(BuildEvent(record.Value, message.ResolveLinkTos, record.Key.CommitPosition));
+		}
+
+		var events = list.ToArray();
+		message.Envelope.ReplyWith(
+			new ClientMessage.FilteredReadAllEventsBackwardCompleted(
+				message.CorrelationId, FilteredReadAllResult.Success, "", events, null, false,
+				message.MaxCount, pos, next, prev, _fakePosition, list.Count < message.MaxCount));
+	}
+
+	public void Handle(ClientMessage.SubscribeToStream msg) {
+		_streams.TryGetValue(msg.EventStreamId, out var list);
+
+		var lastEventNumber = msg.EventStreamId.IsEmptyString()
+			? (long?)null
+			: list.Safe().Any() ? list.Safe().Last().EventNumber : -1;
+
+		var lastIndexedPos = _all.IsEmpty() ? -1 : _all.Keys[^1].CommitPosition;
+		var subscribedMessage =
+			new ClientMessage.SubscriptionConfirmation(msg.CorrelationId, lastIndexedPos, lastEventNumber);
+		msg.Envelope.ReplyWith(subscribedMessage);
+	}
+
+	public void Handle(ClientMessage.FilteredSubscribeToStream msg) {
+		_streams.TryGetValue(msg.EventStreamId, out var list);
+
+		var lastEventNumber = msg.EventStreamId.IsEmptyString()
+			? (long?)null
+			: list.Safe().Any() ? list.Safe().Last().EventNumber : -1;
+		var lastCommitPos = _fakePosition;
+		var subscribedMessage =
+			new ClientMessage.SubscriptionConfirmation(msg.CorrelationId, lastCommitPos, lastEventNumber);
+		msg.Envelope.ReplyWith(subscribedMessage);
+	}
+
+	public void Handle(ClientMessage.TransactionStart message) {
+		var transactionId = _fakePosition;
+		_activeTransactions.Add(transactionId, new Transaction(transactionId, message));
+		_fakePosition += 50;
+		message.Envelope.ReplyWith(
+			new ClientMessage.TransactionStartCompleted(
+				message.CorrelationId, transactionId, OperationResult.Success, ""));
+	}
+
+	public void Handle(ClientMessage.TransactionWrite message) {
+		Transaction transaction;
+		if (!_activeTransactions.TryGetValue(message.TransactionId, out transaction)) {
+			message.Envelope.ReplyWith(
+				new ClientMessage.TransactionWriteCompleted(
+					message.CorrelationId, message.TransactionId, OperationResult.InvalidTransaction,
+					"Transaction not found"));
+		} else {
+			transaction.Write(message, ref _fakePosition);
+		}
+	}
+
+	public void Handle(ClientMessage.TransactionCommit message) {
+		Transaction transaction;
+		if (!_activeTransactions.TryGetValue(message.TransactionId, out transaction)) {
+			message.Envelope.ReplyWith(
+				new ClientMessage.TransactionWriteCompleted(
+					message.CorrelationId, message.TransactionId, OperationResult.InvalidTransaction,
+					"Transaction not found"));
+		} else {
+			transaction.Commit(message, this);
+		}
+	}
+
+	protected TFPos GetTfPos(string streamId, long eventNumber) {
+		return _all.Last(v => v.Value.EventStreamId == streamId && v.Value.EventNumber == eventNumber).Key;
+	}
+
+	public void AssertLastEvent(string streamId, string data, string message = null, int skip = 0) {
+		message = message ?? string.Format("Invalid last event in the '{0}' stream. ", streamId);
+		List<EventRecord> events;
+		Assert.That(_streams.TryGetValue(streamId, out events), message + "The stream does not exist.");
+		events = events.Take(events.Count - skip).ToList();
+		Assert.IsNotEmpty(events, message + "The stream is empty.");
+		var last = events[events.Count - 1];
+		Assert.AreEqual(data, Encoding.UTF8.GetString(last.Data.Span));
+	}
+
+	public void AssertLastEventJson<T>(string streamId, T json, string message = null, int skip = 0) {
+		message = message ?? string.Format("Invalid last event in the '{0}' stream. ", streamId);
+		List<EventRecord> events;
+		Assert.That(_streams.TryGetValue(streamId, out events), message + "The stream does not exist.");
+		events = events.Take(events.Count - skip).ToList();
+		Assert.IsNotEmpty(events, message + "The stream is empty.");
+		var last = events[events.Count - 1];
+		Assert.IsTrue((last.Flags & PrepareFlags.IsJson) != 0);
+		HelperExtensions.AssertJson(json, last.Data.ParseJson<JObject>());
+	}
+
+	public void AssertLastEventIs(string streamId, string eventType, string message = null, int skip = 0) {
+		message = message ?? string.Format("Invalid last event in the '{0}' stream. ", streamId);
+		List<EventRecord> events;
+		Assert.That(_streams.TryGetValue(streamId, out events), message + "The stream does not exist.");
+		events = events.Take(events.Count - skip).ToList();
+		Assert.IsNotEmpty(events, message + "The stream is empty.");
+		var last = events[events.Count - 1];
+		Assert.AreEqual(eventType, last.EventType);
+	}
+
+	public void AssertStreamTail(string streamId, params string[] data) {
+		var message = string.Format("Invalid events in the '{0}' stream. ", streamId);
+		List<EventRecord> events;
+		Assert.That(_streams.TryGetValue(streamId, out events), message + "The stream does not exist.");
+		var eventsText = events.Skip(events.Count - data.Length).Select(v => Encoding.UTF8.GetString(v.Data.Span))
+			.ToList();
+		if (data.Length > 0)
+			Assert.IsNotEmpty(events, message + "The stream is empty.");
+
+		Assert.That(
+			data.SequenceEqual(eventsText),
+			string.Format(
+				"{0} does end with: {1} the tail is: {2}", streamId, data.Aggregate("", (a, v) => a + " " + v),
+				eventsText.Aggregate("", (a, v) => a + " " + v)));
+	}
+
+	public void AssertStreamTailWithLinks(string streamId, params string[] data) {
+		var message = string.Format("Invalid events in the '{0}' stream. ", streamId);
+		List<EventRecord> events;
+		Assert.That(_streams.TryGetValue(streamId, out events), message + "The stream does not exist.");
+		var eventsText =
+			events.Skip(events.Count - data.Length)
+				.Select(v => new { Text = Encoding.UTF8.GetString(v.Data.Span), EventType = v.EventType })
+				.Select(
+					v =>
+						v.EventType == SystemEventTypes.LinkTo
+							? ResolveEventText(v.Text)
+							: v.EventType + ":" + v.Text)
+				.ToList();
+		if (data.Length > 0)
+			Assert.IsNotEmpty(events, message + "The stream is empty.");
+
+		Assert.That(
+			data.SequenceEqual(eventsText),
+			string.Format(
+				"{0} does not end with: {1}. the tail is: {2}", streamId, data.Aggregate("", (a, v) => a + " " + v),
+				eventsText.Aggregate("", (a, v) => a + " " + v)));
+	}
+
+	private string ResolveEventText(string link) {
+		var stream = SystemEventTypes.StreamReferenceEventToStreamId(SystemEventTypes.LinkTo, link);
+		var eventNumber = SystemEventTypes.EventLinkToEventNumber(link);
+		return _streams[stream][(int)eventNumber].EventType + ":"
+															+
+															Encoding.UTF8.GetString(
+																_streams[stream][(int)eventNumber].Data.Span);
+	}
+
+	public void AssertStreamContains(string streamId, params string[] data) {
+		var message = string.Format("Invalid events in the '{0}' stream. ", streamId);
+		List<EventRecord> events;
+		Assert.That(_streams.TryGetValue(streamId, out events), message + "The stream does not exist.");
+		if (data.Length > 0)
+			Assert.IsNotEmpty(events, message + "The stream is empty.");
+
+		var eventsData = new HashSet<string>(events.Select(v => Encoding.UTF8.GetString(v.Data.Span)));
+		var missing = data.Where(v => !eventsData.Contains(v)).ToArray();
+
+		Assert.That(missing.Length == 0,
+			string.Format("{0} does not contain: {1}", streamId, missing.Aggregate("", (a, v) => a + " " + v)));
+	}
+
+	public void AssertEvent(string streamId, long eventNumber, string data) {
+		throw new NotImplementedException();
+	}
+
+	public void AssertEmptyStream(string streamId) {
+		throw new NotImplementedException();
+	}
+
+	public void AssertEmptyOrNoStream(string streamId) {
+		List<EventRecord> events;
+		Assert.That(
+			!_streams.TryGetValue(streamId, out events) || events.Count == 0,
+			string.Format("The stream {0} should not exist.", streamId));
+	}
+
+	[Conditional("DEBUG")]
+	public void DumpStream(string streamId) {
+#if DEBUG
+		if (_deletedStreams.Contains(streamId))
+			Console.WriteLine("Stream '{0}' has been deleted", streamId);
+
+		List<EventRecord> list;
+		if (!_streams.TryGetValue(streamId, out list) || list == null)
+			Console.WriteLine("Stream '{0}' does not exist", streamId);
+		if (list != null) {
+			for (int index = 0; index < list.Count; index++) {
+				var record = list[index];
+				try {
+					Console.WriteLine("{0}: '{1}' ==> \r\n{2}", index, record.EventType, record.DebugDataView);
+				} catch (Exception ex) {
+					Console.WriteLine("EXCEPTION: {0}", ex);
+				}
+			}
+		}
+#endif
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/TestFixtureWithReadWriteDispatchers.cs b/src/KurrentDB.Core.Tests/Helpers/TestFixtureWithReadWriteDispatchers.cs
new file mode 100644
index 00000000000..155f744a288
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/TestFixtureWithReadWriteDispatchers.cs
@@ -0,0 +1,214 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using DotNext;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Tests.Bus.Helpers;
+using KurrentDB.Core.Tests.Services.TimeService;
+using NUnit.Framework;
+using IODispatcherDelayedMessage = KurrentDB.Core.Helpers.IODispatcherDelayedMessage;
+
+namespace KurrentDB.Core.Tests.Helpers;
+
+public abstract class TestFixtureWithReadWriteDispatchers {
+	protected SynchronousScheduler _bus;
+	protected IQueuedHandler _publisher;
+
+	protected RequestResponseDispatcher<ClientMessage.DeleteStream, ClientMessage.DeleteStreamCompleted>
+		_streamDispatcher;
+
+	protected RequestResponseDispatcher<ClientMessage.WriteEvents, ClientMessage.WriteEventsCompleted>
+		_writeDispatcher;
+
+	protected ReadDispatcher _readDispatcher;
+
+	protected TestHandler<Message> _consumer;
+	protected IODispatcher _ioDispatcher;
+	protected ManualQueue _queue;
+	protected ManualQueue[] _otherQueues;
+	protected FakeTimeProvider _timeProvider;
+	private IEnvelope _envelope;
+
+	protected IEnvelope Envelope {
+		get {
+			if (_envelope == null)
+				_envelope = GetInputQueue();
+			return _envelope;
+		}
+	}
+
+	protected List<Message> HandledMessages {
+		get { return _consumer.HandledMessages; }
+	}
+
+	[SetUp]
+	public void setup0() {
+		_envelope = null;
+		_timeProvider = new FakeTimeProvider();
+		_bus = new SynchronousScheduler();
+		_publisher = new QueuedHandlerThreadPool(_bus,
+			"TestQueue",
+			new QueueStatsManager(),
+			new QueueTrackers(), watchSlowMsg: false);
+		_publisher.Start();
+		_consumer = new TestHandler<Message>();
+		_bus.Subscribe(_consumer);
+		_queue = GiveInputQueue();
+		_otherQueues = null;
+		_ioDispatcher = new IODispatcher(_bus, GetInputQueue());
+		_readDispatcher = _ioDispatcher.BackwardReader;
+		_writeDispatcher = _ioDispatcher.Writer;
+		_streamDispatcher = _ioDispatcher.StreamDeleter;
+
+		_bus.Subscribe(_ioDispatcher.ForwardReader);
+		_bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_ioDispatcher.BackwardReader);
+		_bus.Subscribe<ClientMessage.NotHandled>(_ioDispatcher.BackwardReader);
+		_bus.Subscribe(_ioDispatcher.ForwardReader);
+		_bus.Subscribe(_ioDispatcher.Writer);
+		_bus.Subscribe(_ioDispatcher.StreamDeleter);
+		_bus.Subscribe(_ioDispatcher.Awaker);
+		_bus.Subscribe<IODispatcherDelayedMessage>(_ioDispatcher);
+		_bus.Subscribe<ClientMessage.NotHandled>(_ioDispatcher);
+	}
+
+	protected virtual ManualQueue GiveInputQueue() {
+		return null;
+	}
+
+	protected IPublisher GetInputQueue() {
+		return _queue.As<IPublisher>() ?? _bus;
+	}
+
+	protected void DisableTimer() {
+		_queue.DisableTimer();
+	}
+
+	protected void EnableTimer() {
+		_queue.EnableTimer();
+	}
+
+	protected void WhenLoop() {
+		_queue.Process();
+		var steps = PreWhen().Concat(When());
+		WhenLoop(steps);
+	}
+
+	protected void WhenLoop(IEnumerable<WhenStep> steps) {
+		foreach (var step in steps) {
+			_timeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(10));
+			if (step.Action != null) {
+				step.Action();
+			}
+
+			foreach (var message in step) {
+				if (message != null)
+					_queue.Publish(message);
+			}
+
+			_queue.ProcessTimer();
+			if (_otherQueues != null)
+				foreach (var other in _otherQueues)
+					other.ProcessTimer();
+
+			var count = 1;
+			var total = 0;
+			while (count > 0) {
+				count = 0;
+				count += _queue.ProcessNonTimer();
+				if (_otherQueues != null)
+					foreach (var other in _otherQueues)
+						count += other.ProcessNonTimer();
+				total += count;
+				if (total > 2000)
+					throw new Exception("Infinite loop?");
+			}
+
+			// process final timer messages
+		}
+
+		_queue.Process();
+		if (_otherQueues != null)
+			foreach (var other in _otherQueues)
+				other.Process();
+	}
+
+	public static T EatException<T>(Func<T> func, T defaultValue = default(T)) {
+		try {
+			return func();
+		} catch (Exception) {
+			return defaultValue;
+		}
+	}
+
+	public sealed class WhenStep : IEnumerable<Message> {
+		public readonly Action Action;
+		public readonly Message Message;
+		public readonly IEnumerable<Message> Messages;
+
+		private WhenStep(Message message) {
+			Message = message;
+		}
+
+		internal WhenStep(IEnumerable<Message> messages) {
+			Messages = messages;
+		}
+
+		public WhenStep(params Message[] messages) {
+			Messages = messages;
+		}
+
+		public WhenStep(Action action) {
+			Action = action;
+		}
+
+		internal WhenStep() {
+		}
+
+		public static implicit operator WhenStep(Message message) {
+			return new WhenStep(message);
+		}
+
+		public IEnumerator<Message> GetEnumerator() {
+			return GetMessages().GetEnumerator();
+		}
+
+		private IEnumerable<Message> GetMessages() {
+			if (Message != null)
+				yield return Message;
+			else if (Messages != null)
+				foreach (var message in Messages)
+					yield return message;
+			else
+				yield return null;
+		}
+
+		IEnumerator IEnumerable.GetEnumerator() {
+			return GetEnumerator();
+		}
+	}
+
+	protected virtual IEnumerable<WhenStep> PreWhen() {
+		yield break;
+	}
+
+	protected virtual IEnumerable<WhenStep> When() {
+		yield break;
+	}
+
+	public readonly WhenStep Yield = new WhenStep();
+}
+
+public static class TestUtils {
+	public static TestFixtureWithReadWriteDispatchers.WhenStep ToSteps(
+		this IEnumerable<TestFixtureWithReadWriteDispatchers.WhenStep> steps) {
+		return new TestFixtureWithReadWriteDispatchers.WhenStep(steps.SelectMany(v => v));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Helpers/TestHelper.cs b/src/KurrentDB.Core.Tests/Helpers/TestHelper.cs
new file mode 100644
index 00000000000..4802247bf74
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Helpers/TestHelper.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Tests.Helpers;
+
+public static class TestHelper {
+	public static void Consume<T>(T v) {
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/Admin/scavenges.cs b/src/KurrentDB.Core.Tests/Http/Admin/scavenges.cs
new file mode 100644
index 00000000000..6d0889e123b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/Admin/scavenges.cs
@@ -0,0 +1,96 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.Http.Users.users;
+using KurrentDB.Transport.Http;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+using HttpStatusCode = System.Net.HttpStatusCode;
+
+namespace KurrentDB.Core.Tests.Http.Admin {
+	namespace scavenges {
+		[Category("LongRunning")]
+		[TestFixture]
+		public class when_getting_scavenge_stream_without_accept_header : with_admin_user {
+			private JObject _descriptionDocument;
+			private List<JToken> _links;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				_descriptionDocument = await GetJsonWithoutAcceptHeader<JObject>("/streams/$scavenges?embed=body");
+			}
+
+			[Test]
+			public void returns_not_acceptable() {
+				Assert.AreEqual(HttpStatusCode.NotAcceptable, _lastResponse.StatusCode);
+			}
+
+			[Test]
+			public void returns_a_description_document() {
+				Assert.IsNotNull(_descriptionDocument);
+				_links = _descriptionDocument != null ? _descriptionDocument["_links"].ToList() : new List<JToken>();
+				Assert.IsNotNull(_links, "Expected there to be links in the description but _links is null");
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(ContentType.DescriptionDocJson)]
+		[TestFixture(ContentType.LegacyDescriptionDocJson)]
+		public class when_getting_scavenge_stream_with_description_document_content_type(string contentType) : with_admin_user {
+			private JObject _descriptionDocument;
+			private List<JToken> _links;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				_descriptionDocument = await GetJson<JObject>("/streams/$scavenges?embed=body", contentType, null);
+				_links = _descriptionDocument != null ? _descriptionDocument["_links"].ToList() : new List<JToken>();
+			}
+
+			[Test]
+			public void returns_ok() {
+				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+			}
+
+			[Test]
+			public void returns_a_description_document() {
+				Assert.IsNotNull(_descriptionDocument);
+			}
+
+			[Test]
+			public void contains_the_self_link() {
+				Assert.AreEqual("self", ((JProperty)_links[0]).Name);
+				Assert.AreEqual("/streams/%24scavenges%3Fembed%3Dbody", _descriptionDocument["_links"]["self"]["href"].ToString());
+			}
+
+			[Test]
+			public void self_link_contains_only_the_description_document_content_type() {
+				var supportedContentTypes = _descriptionDocument["_links"]["self"]["supportedContentTypes"]
+					.Values<string>()
+					.ToArray();
+				Assert.AreEqual(1, supportedContentTypes.Length);
+				Assert.AreEqual(contentType, supportedContentTypes[0]);
+			}
+
+			[Test]
+			public void contains_the_stream_link() {
+				Assert.AreEqual("stream", ((JProperty)_links[1]).Name);
+				Assert.AreEqual("/streams/%24scavenges%3Fembed%3Dbody", _descriptionDocument["_links"]["stream"]["href"].ToString());
+			}
+
+			[Test]
+			public void stream_link_contains_supported_stream_content_types() {
+				var supportedContentTypes = _descriptionDocument["_links"]["stream"]["supportedContentTypes"]
+					.Values<string>().ToArray();
+				Assert.AreEqual(3, supportedContentTypes.Length);
+				Assert.Contains(ContentType.Atom, supportedContentTypes);
+				Assert.Contains(ContentType.AtomJson, supportedContentTypes);
+				Assert.Contains(ContentType.LegacyAtomJson, supportedContentTypes);
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/ArgumentPassing/matching.cs b/src/KurrentDB.Core.Tests/Http/ArgumentPassing/matching.cs
new file mode 100644
index 00000000000..c30599d6347
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/ArgumentPassing/matching.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.Helpers;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Http.ArgumentPassing {
+	namespace matching {
+		[Category("LongRunning")]
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		class when_matching_against_simple_placeholders<TLogFormat, TStreamId> : HttpBehaviorSpecification<TLogFormat, TStreamId> {
+			private JObject _response;
+
+			protected override Task Given() => Task.CompletedTask;
+			protected override Task When() => Task.CompletedTask;
+
+			[Test]
+			[TestCase("1", "1", "2", "2")]
+			[TestCase("1", "1", "%41", "A")]
+			[TestCase("1", "1", "$", "$")]
+			[TestCase("1", "1", "%24", "$")]
+			[TestCase("%24", "$", "2", "2")]
+			[TestCase("$", "$", "2", "2")]
+			[TestCase("$", "$", "йцукен", "йцукен")]
+			[TestCase("$", "$", "%D0%B9%D1%86%D1%83%D0%BA%D0%B5%D0%BD", "йцукен")]
+			[TestCase("йцукен", "йцукен", "2", "2")]
+			[TestCase("%D0%B9%D1%86%D1%83%D0%BA%D0%B5%D0%BD", "йцукен", "2", "2")]
+			//            [TestCase("%3F", "?", "2", "2")] // ?
+			//            [TestCase("%2F", "/", "2", "2")] // /
+			[TestCase("%20", " ", "2", "2")] // space
+			[TestCase("%25", "%", "2", "2")] // %
+			public async Task returns_ok_status_code(string _a, string _ra, string _b, string _rb) {
+				_response = await GetJson<JObject>("/test-encoding/" + _a, extra: "b=" + _b);
+				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+				HelperExtensions.AssertJson(new { a = _ra, b = _rb }, _response);
+			}
+
+			[Test]
+			[TestCase("*/*")]
+			[TestCase("application/json")]
+			[TestCase("application/json,*/*;q=0.1")]
+			public async Task can_specify_multple_accepts(string accept) {
+				_response = await GetJson<JObject>("/test-encoding/1", accept: accept);
+				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+				HelperExtensions.AssertJson(new { a = "1" }, _response);
+			}
+		}
+	}
+}
diff --git a/src/EventStore.Core.Tests/Http/BasicAuthentication/basic_authentication.cs b/src/KurrentDB.Core.Tests/Http/BasicAuthentication/basic_authentication.cs
similarity index 94%
rename from src/EventStore.Core.Tests/Http/BasicAuthentication/basic_authentication.cs
rename to src/KurrentDB.Core.Tests/Http/BasicAuthentication/basic_authentication.cs
index e9e332d98b4..35420f5fa70 100644
--- a/src/EventStore.Core.Tests/Http/BasicAuthentication/basic_authentication.cs
+++ b/src/KurrentDB.Core.Tests/Http/BasicAuthentication/basic_authentication.cs
@@ -1,12 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Net;
 using System.Threading.Tasks;
-using EventStore.Core.Services;
-using NUnit.Framework;
+using KurrentDB.Core.Tests.Http.Users.users;
 using Newtonsoft.Json.Linq;
-using EventStore.Core.Tests.Http.Users.users;
+using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Http.BasicAuthentication {
+namespace KurrentDB.Core.Tests.Http.BasicAuthentication {
 	namespace basic_authentication {
 		[Category("LongRunning")]
 		[TestFixture(typeof(LogFormat.V2), typeof(string))]
diff --git a/src/KurrentDB.Core.Tests/Http/Cluster/when_requesting_from_follower.cs b/src/KurrentDB.Core.Tests/Http/Cluster/when_requesting_from_follower.cs
new file mode 100644
index 00000000000..72654f3b021
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/Cluster/when_requesting_from_follower.cs
@@ -0,0 +1,237 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Tests.Integration;
+using NUnit.Framework;
+using ContentType = KurrentDB.Transport.Http.ContentType;
+
+namespace KurrentDB.Core.Tests.Http.Cluster;
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_requesting_from_follower<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
+	private const string TestStream = "test-stream";
+	private const string TestDeleteStream = "test-stream-to-be-deleted";
+	private IPEndPoint _followerEndPoint;
+	private IPEndPoint _leaderEndPoint;
+	private HttpClient _client;
+
+	protected override async Task Given() {
+		var leader = GetLeader();
+		_leaderEndPoint = leader.HttpEndPoint;
+		var follower = GetFollowers().First();
+		_followerEndPoint = follower.HttpEndPoint;
+		_client = follower.CreateHttpClient();
+
+		// Wait for the admin user to be created
+		await leader.AdminUserCreated;
+		// Wait for the admin user created event to be replicated before starting our tests
+		var leaderIndex = leader.Db.Config.IndexCheckpoint.Read();
+		AssertEx.IsOrBecomesTrue(() => follower.Db.Config.IndexCheckpoint.Read() >= leaderIndex,
+			timeout: TimeSpan.FromSeconds(10),
+			msg: $"Waiting for follower to reach index checkpoint timed out! (LeaderIndex={leaderIndex},FollowerState={follower.NodeState})");
+
+		await AddStreamAndWait(leader, follower, TestDeleteStream);
+		await AddStreamAndWait(leader, follower, TestStream);
+	}
+
+	private async Task AddStreamAndWait(MiniClusterNode<TLogFormat, TStreamId> leader,
+		MiniClusterNode<TLogFormat, TStreamId> follower, string streamName) {
+		var leaderIndex = leader.Db.Config.IndexCheckpoint.Read();
+
+		var response = await PostEvent(_followerEndPoint, $"streams/{streamName}", requireLeader: false);
+		Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
+
+		AssertEx.IsOrBecomesTrue(() => leader.Db.Config.IndexCheckpoint.Read() > leaderIndex,
+			timeout: TimeSpan.FromSeconds(10),
+			msg: "Waiting for event to be processed on leader timed out!");
+
+		leaderIndex = leader.Db.Config.IndexCheckpoint.Read();
+		AssertEx.IsOrBecomesTrue(() => follower.Db.Config.IndexCheckpoint.Read() >= leaderIndex,
+			timeout: TimeSpan.FromSeconds(10),
+			msg: $"Waiting for event to be synced with follower timed out! ({leaderIndex})");
+	}
+
+	public override Task TestFixtureTearDown() {
+		_client?.Dispose();
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public async Task post_events_should_succeed_when_leader_not_required() {
+		var path = $"streams/{TestStream}";
+		var response = await PostEvent(_followerEndPoint, path, requireLeader: false);
+
+		Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
+	}
+
+	[Test]
+	public async Task delete_stream_should_succeed_when_leader_not_required() {
+		var path = $"streams/{TestDeleteStream}";
+		var response = await DeleteStream(_followerEndPoint, path, requireLeader: false);
+
+		Assert.AreEqual(HttpStatusCode.NoContent, response.StatusCode);
+	}
+
+	[Test]
+	public async Task read_from_stream_forward_should_succeed_when_leader_not_required() {
+		var path = $"streams/{TestStream}/0/forward/1";
+		var response = await ReadStream(_followerEndPoint, path, requireLeader: false);
+
+		Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+	}
+
+	[Test]
+	public async Task read_from_stream_backward_should_succeed_when_leader_not_required() {
+		var path = $"streams/{TestStream}";
+		var response = await ReadStream(_followerEndPoint, path, requireLeader: false);
+
+		Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+	}
+
+	[Test]
+	public async Task read_from_all_forward_should_succeed_when_leader_not_required() {
+		var path = $"streams/$all/00000000000000000000000000000000/forward/1";
+		var response = await ReadStream(_followerEndPoint, path, requireLeader: false);
+
+		Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+	}
+
+	[Test]
+	public async Task read_from_all_backward_should_succeed_when_leader_not_required() {
+		var path = $"streams/$all";
+		var response = await ReadStream(_followerEndPoint, path, requireLeader: false);
+
+		Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+	}
+
+	[Test]
+	[TestCase(SystemHeaders.RequireLeader)]
+	[TestCase(SystemHeaders.LegacyRequireLeader)]
+	[TestCase(SystemHeaders.RequireMaster)]
+	public async Task should_redirect_to_leader_when_writing_with_requires_leader(string requireLeaderHeader) {
+		var path = $"streams/{TestStream}";
+		var response = await PostEvent(_followerEndPoint, path, requireLeader: true, requireLeaderHeader);
+
+		Assert.AreEqual(HttpStatusCode.TemporaryRedirect, response.StatusCode);
+		var leaderLocation = CreateUri(_leaderEndPoint, path);
+		Assert.AreEqual(leaderLocation, response.Headers.Location);
+	}
+
+	[Test]
+	[TestCase(SystemHeaders.RequireLeader)]
+	[TestCase(SystemHeaders.LegacyRequireLeader)]
+	[TestCase(SystemHeaders.RequireMaster)]
+	public async Task should_redirect_to_leader_when_deleting_with_requires_leader(string requireLeaderHeader) {
+		var path = $"streams/{TestDeleteStream}";
+		var response = await DeleteStream(_followerEndPoint, path, requireLeader: true, requireLeaderHeader);
+
+		Assert.AreEqual(HttpStatusCode.TemporaryRedirect, response.StatusCode);
+		var leaderLocation = CreateUri(_leaderEndPoint, path);
+		Assert.AreEqual(leaderLocation, response.Headers.Location);
+	}
+
+	[Test]
+	public async Task should_redirect_to_leader_when_reading_from_stream_backwards_with_requires_leader() {
+		var path = $"streams/{TestStream}";
+		var response = await ReadStream(_followerEndPoint, path, requireLeader: true);
+
+		Assert.AreEqual(HttpStatusCode.TemporaryRedirect, response.StatusCode);
+		var leaderLocation = CreateUri(_leaderEndPoint, path);
+		Assert.AreEqual(leaderLocation, response.Headers.Location);
+	}
+
+	[Test]
+	[TestCase(SystemHeaders.RequireLeader)]
+	[TestCase(SystemHeaders.LegacyRequireLeader)]
+	[TestCase(SystemHeaders.RequireMaster)]
+	public async Task should_redirect_to_leader_when_reading_from_stream_forwards_with_requires_leader(string requireLeaderHeader) {
+		var path = $"streams/{TestStream}/0/forward/1";
+		var response = await ReadStream(_followerEndPoint, path, requireLeader: true, requireLeaderHeader);
+
+		Assert.AreEqual(HttpStatusCode.TemporaryRedirect, response.StatusCode);
+		var leaderLocation = CreateUri(_leaderEndPoint, path);
+		Assert.AreEqual(leaderLocation, response.Headers.Location);
+	}
+
+	[Test]
+	public async Task should_redirect_to_leader_when_reading_from_all_backwards_with_requires_leader() {
+		var path = $"streams/$all";
+		var response = await ReadStream(_followerEndPoint, path, requireLeader: true);
+
+		Assert.AreEqual(HttpStatusCode.TemporaryRedirect, response.StatusCode);
+		var leaderLocation = CreateUri(_leaderEndPoint, path);
+		Assert.AreEqual(leaderLocation, response.Headers.Location);
+	}
+
+	[Test]
+	[TestCase(SystemHeaders.RequireLeader)]
+	[TestCase(SystemHeaders.LegacyRequireLeader)]
+	[TestCase(SystemHeaders.RequireMaster)]
+	public async Task should_redirect_to_leader_when_reading_from_all_forwards_with_requires_leader(string requireLeaderHeader) {
+		var path = $"streams/$all/00000000000000000000000000000000/forward/1";
+		var response = await ReadStream(_followerEndPoint, path, requireLeader: true, requireLeaderHeader);
+
+		Assert.AreEqual(HttpStatusCode.TemporaryRedirect, response.StatusCode);
+		var leaderLocation = CreateUri(_leaderEndPoint, path);
+		Assert.AreEqual(leaderLocation, response.Headers.Location);
+	}
+
+	private Task<HttpResponseMessage> ReadStream(IPEndPoint nodeEndpoint, string path, bool requireLeader, string requireLeaderHeader = SystemHeaders.RequireLeader) {
+		var uri = CreateUri(nodeEndpoint, path);
+		var request = CreateRequest(uri, HttpMethod.Get, requireLeader, requireLeaderHeader);
+		request.Headers.Add("Accept", ContentType.Json);
+		return GetRequestResponse(request);
+	}
+
+	private Task<HttpResponseMessage> DeleteStream(IPEndPoint nodeEndpoint, string path, bool requireLeader = true, string requireLeaderHeader = SystemHeaders.RequireLeader) {
+		var uri = CreateUri(nodeEndpoint, path);
+		var request = CreateRequest(uri, HttpMethod.Delete, requireLeader, requireLeaderHeader);
+		return GetRequestResponse(request);
+	}
+
+	private Task<HttpResponseMessage> PostEvent(IPEndPoint nodeEndpoint, string path, bool requireLeader = true, string requireLeaderHeader = SystemHeaders.RequireLeader) {
+		var uri = CreateUri(nodeEndpoint, path);
+		var request = CreateRequest(uri, HttpMethod.Post, requireLeader, requireLeaderHeader);
+
+		request.Headers.Add(SystemHeaders.EventType, "SomeType");
+		request.Headers.Add(SystemHeaders.ExpectedVersion, ExpectedVersion.Any.ToString());
+		request.Headers.Add(SystemHeaders.EventId, Guid.NewGuid().ToString());
+		var data = "{a : \"1\", b:\"3\", c:\"5\" }";
+		request.Content = new StringContent(data, Encoding.UTF8, ContentType.Json);
+
+		return GetRequestResponse(request);
+	}
+
+	private static string GetAuthorizationHeader(NetworkCredential credentials)
+		=> Convert.ToBase64String(Encoding.ASCII.GetBytes($"{credentials.UserName}:{credentials.Password}"));
+
+	private HttpRequestMessage CreateRequest(Uri uri, HttpMethod method, bool requireLeader, string requireLeaderHeader) {
+		var request = new HttpRequestMessage(method, uri);
+		request.Headers.Add(requireLeaderHeader, requireLeader ? "True" : "False");
+		request.Headers.Authorization = new AuthenticationHeaderValue("Basic",
+								GetAuthorizationHeader(DefaultData.AdminNetworkCredentials));
+		return request;
+	}
+
+	private async Task<HttpResponseMessage> GetRequestResponse(HttpRequestMessage request) {
+		var response = await _client.SendAsync(request);
+		return response;
+	}
+
+	private Uri CreateUri(IPEndPoint nodeEndpoint, string path) {
+		var uriBuilder = new UriBuilder("https", nodeEndpoint.Address.ToString(), nodeEndpoint.Port, path);
+		return uriBuilder.Uri;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/HealthChecks/when_performing_a_live_check.cs b/src/KurrentDB.Core.Tests/Http/HealthChecks/when_performing_a_live_check.cs
new file mode 100644
index 00000000000..c424d3823e2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/HealthChecks/when_performing_a_live_check.cs
@@ -0,0 +1,100 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Reflection;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Http.HealthChecks;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_performing_a_live_check<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private MiniNode<TLogFormat, TStreamId> _node;
+	private bool _nodeStarted;
+	[SetUp]
+	public async Task SetUp() {
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		await _node.StartTestServer();
+	}
+
+	[TearDown]
+	public async Task Teardown() {
+		if (_nodeStarted) {
+			await _node.Shutdown();
+		}
+	}
+
+	private static readonly object[] MethodAllowedTestCases = {
+		new object[] {HttpMethod.Head},
+		new object[] {HttpMethod.Get},
+	};
+
+	private static readonly object[] MethodNotAllowedTestCases = typeof(HttpMethod)
+		.GetProperties(BindingFlags.Public | BindingFlags.Static)
+		.Where(pi => pi.PropertyType == typeof(HttpMethod))
+		.Select(pi => (HttpMethod)pi.GetValue(null))
+		.Where(x => x != HttpMethod.Get && x != HttpMethod.Head)
+		.Select(x => new object[] { x })
+		.ToArray();
+
+	[TestCaseSource(nameof(MethodAllowedTestCases))]
+	public async Task before_start_returns_error(HttpMethod method) {
+		using var response = await _node.HttpClient.SendAsync(new HttpRequestMessage(method, "/health/live"));
+		_nodeStarted = false; //just for clarity
+		Assert.GreaterOrEqual((int)response.StatusCode, 500);
+	}
+
+	[TestCaseSource(nameof(MethodAllowedTestCases))]
+	public async Task after_start_returns_success(HttpMethod method) {
+		await _node.Start()
+			.WithTimeout();
+		_nodeStarted = true;
+		using var response = await _node.HttpClient.SendAsync(new HttpRequestMessage(method, "/health/live") {
+			Version = new Version(2, 0)
+		});
+
+		Assert.GreaterOrEqual((int)response.StatusCode, 200);
+		Assert.Less((int)response.StatusCode, 400);
+	}
+
+	[TestCaseSource(nameof(MethodAllowedTestCases))]
+	public async Task with_liveCode_parameter_returns_the_same_liveCode(HttpMethod method) {
+		await _node.Start()
+			.WithTimeout();
+		_nodeStarted = true;
+		using var response = await _node.HttpClient.SendAsync(new HttpRequestMessage(method, "/health/live?liveCode=200") {
+			Version = new Version(2, 0)
+		});
+
+		Assert.AreEqual((int)response.StatusCode, 200);
+	}
+
+	[TestCaseSource(nameof(MethodAllowedTestCases))]
+	public async Task after_shutdown_returns_error(HttpMethod method) {
+		await _node.Start()
+			.WithTimeout();
+		_nodeStarted = true;
+		await _node.Node.StopAsync()
+			.WithTimeout();
+
+		using var response = await _node.HttpClient.SendAsync(new HttpRequestMessage(method, "/health/live"));
+
+		Assert.GreaterOrEqual((int)response.StatusCode, 500);
+	}
+
+	[TestCaseSource(nameof(MethodNotAllowedTestCases))]
+	public async Task using_methods_other_than_get_or_head_returns_not_found(HttpMethod method) {
+		await _node.Start()
+			.WithTimeout();
+		_nodeStarted = true;
+		using var response = await _node.HttpClient.SendAsync(new HttpRequestMessage(method, "/health/live"));
+
+		Assert.AreEqual(HttpStatusCode.NotFound, response.StatusCode);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/HttpBehaviorSpecification.cs b/src/KurrentDB.Core.Tests/Http/HttpBehaviorSpecification.cs
new file mode 100644
index 00000000000..9524cbd2eba
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/HttpBehaviorSpecification.cs
@@ -0,0 +1,284 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.IO;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Transport.Http;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Serialization;
+using ContentTypeConstant = KurrentDB.Transport.Http.ContentType;
+using HttpMethod = System.Net.Http.HttpMethod;
+
+namespace KurrentDB.Core.Tests.Http;
+
+public abstract class HttpBehaviorSpecification : HttpBehaviorSpecification<LogFormat.V2, string>;
+
+public abstract class HttpBehaviorSpecification<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	protected MiniNode<TLogFormat, TStreamId> _node;
+	protected IEventStoreConnection _connection;
+	protected HttpResponseMessage _lastResponse;
+	protected string _lastResponseBody;
+	protected byte[] _lastResponseBytes;
+	protected JsonException _lastJsonException;
+
+	private readonly List<HttpResponseMessage> _allResponses =
+		new List<HttpResponseMessage>();
+
+	private string _tag = default;
+	private NetworkCredential _defaultCredentials;
+	protected HttpClient _client => _node.HttpClient;
+
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_node = CreateMiniNode();
+		await _node.Start();
+
+		_connection = TestConnection.Create(_node.TcpEndPoint);
+		await _connection.ConnectAsync();
+
+		_lastResponse = null;
+		_lastResponseBody = null;
+		_lastResponseBytes = null;
+		_lastJsonException = null;
+
+		await Given().WithTimeout(TimeSpan.FromMinutes(5));
+
+		await When().WithTimeout(TimeSpan.FromMinutes(5));
+	}
+
+	public string TestStream {
+		get { return "/streams/test" + Tag; }
+	}
+
+	public string TestStreamName {
+		get { return "test" + Tag; }
+	}
+
+	public string TestMetadataStream {
+		get { return "/streams/$$test" + Tag; }
+	}
+
+	public string Tag {
+		get { return _tag; }
+	}
+
+	protected virtual MiniNode<TLogFormat, TStreamId> CreateMiniNode() =>
+		new(PathName);
+
+	public override async Task TestFixtureTearDown() {
+		_connection.Close();
+		await _node.Shutdown();
+		await base.TestFixtureTearDown();
+		foreach (var response in _allResponses) {
+			response?.Dispose();
+		}
+	}
+
+	protected HttpRequestMessage CreateRequest(
+		string path, string extra, string method, string contentType, NetworkCredential credentials = null,
+		NameValueCollection headers = null) {
+		credentials ??= _defaultCredentials;
+		var uri = MakeUrl(path, extra);
+		var httpWebRequest = new HttpRequestMessage(new HttpMethod(method), uri);
+		if (headers != null) {
+			foreach (var key in headers.AllKeys) {
+				httpWebRequest.Headers.Add(key, headers.GetValues(key));
+			}
+		}
+		if (credentials != null) {
+			httpWebRequest.Headers.Add("authorization", $"Basic {GetAuthorizationHeader(credentials)}");
+		}
+
+		return httpWebRequest;
+	}
+
+	protected HttpRequestMessage CreateRequest(string path, string method, NetworkCredential credentials = null,
+		string extra = null)
+		=> CreateRequest(path, extra, method, null, credentials);
+
+	protected static string GetAuthorizationHeader(NetworkCredential credentials)
+		=> Convert.ToBase64String(Encoding.ASCII.GetBytes($"{credentials.UserName}:{credentials.Password}"));
+
+	protected Uri MakeUrl(string path, string extra = "") {
+		var supplied = string.IsNullOrWhiteSpace(extra)
+			? new Uri(path, UriKind.RelativeOrAbsolute)
+			: new Uri(path + "?" + extra, UriKind.RelativeOrAbsolute);
+
+		if (supplied.IsAbsoluteUri && !supplied.IsFile)
+			return supplied;
+
+		var httpEndPoint = _node.HttpEndPoint;
+		var x = new UriBuilder("http", httpEndPoint.Address.ToString(), httpEndPoint.Port, path);
+		x.Query = extra;
+		Console.WriteLine(new string('*', 50) + Environment.NewLine + path + Environment.NewLine + extra +
+						  Environment.NewLine + x.Uri + Environment.NewLine + new string('*', 50));
+
+		return x.Uri;
+	}
+
+	protected Task<HttpResponseMessage> MakeJsonPut<T>(string path, T body, NetworkCredential credentials = null, string extra = null) {
+		credentials ??= _defaultCredentials;
+		var request = CreateRawJsonPostRequest(path, "PUT", body, credentials, extra);
+		return GetRequestResponse(request);
+	}
+
+
+	protected Task<HttpResponseMessage> MakeJsonPost<T>(string path, T body, NetworkCredential credentials = null, string extra = null) {
+		credentials ??= _defaultCredentials;
+		var request = CreateRawJsonPostRequest(path, "POST", body, credentials, extra);
+		return GetRequestResponse(request);
+	}
+
+	protected Task<HttpResponseMessage> MakeArrayEventsPost<T>(string path, T body, NetworkCredential credentials = null, string extra = null, string contentType = null) {
+		credentials ??= _defaultCredentials;
+		var request = CreateEventsJsonPostRequest(path, "POST", body, credentials, extra, contentType);
+		return GetRequestResponse(request);
+	}
+
+	protected Task<HttpResponseMessage> MakeRawJsonPost<T>(string path, T body, NetworkCredential credentials = null, string extra = null) {
+		credentials ??= _defaultCredentials;
+		var request = CreateRawJsonPostRequest(path, "POST", body, credentials, extra);
+		return GetRequestResponse(request);
+	}
+
+	protected Task<HttpResponseMessage> MakeRawJsonPut<T>(string path, T body, NetworkCredential credentials, string extra = null) {
+		credentials ??= _defaultCredentials;
+		var request = CreateRawJsonPostRequest(path, "PUT", body, credentials, extra);
+		return GetRequestResponse(request);
+	}
+
+	protected Task<HttpResponseMessage> MakeDelete(string path, NetworkCredential credentials = null, string extra = null) {
+		credentials ??= _defaultCredentials;
+		var request = CreateRequest(path, "DELETE", credentials, extra);
+		return GetRequestResponse(request);
+	}
+
+	protected Task<HttpResponseMessage> MakePost(string path, NetworkCredential credentials = null, string extra = null) {
+		credentials ??= _defaultCredentials;
+		var request = CreateJsonPostRequest(path, credentials, extra);
+		return GetRequestResponse(request);
+	}
+
+	protected async Task<XDocument> GetAtomXml(Uri uri, NetworkCredential credentials = null, string extra = null) {
+		credentials ??= _defaultCredentials;
+		await Get(uri.ToString(), extra, ContentType.Atom, credentials);
+		return XDocument.Parse(_lastResponseBody);
+	}
+
+	protected async Task<XDocument> GetXml(Uri uri, NetworkCredential credentials = null, string extra = null) {
+		credentials ??= _defaultCredentials;
+		await Get(uri.ToString(), null, ContentType.Xml, credentials);
+		return XDocument.Parse(_lastResponseBody);
+	}
+
+	protected async Task<T> GetJson<T>(string path, string accept = null, NetworkCredential credentials = null,
+		NameValueCollection headers = null, string extra = null) {
+		credentials ??= _defaultCredentials;
+		await Get(path, extra, accept, credentials, headers: headers);
+		try {
+			return _lastResponseBody.ParseJson<T>();
+		} catch (JsonException ex) {
+			_lastJsonException = ex;
+			return default;
+		}
+	}
+
+	protected async Task<T> GetJsonWithoutAcceptHeader<T>(string path) {
+		var request = CreateRequest(path, "", "GET", null);
+		_lastResponse = await GetRequestResponse(request);
+		using var memoryStream = new MemoryStream();
+		await _lastResponse.Content.CopyToAsync(memoryStream);
+		var bytes = memoryStream.ToArray();
+		_lastResponseBody = Helper.UTF8NoBom.GetString(bytes);
+		try {
+			return _lastResponseBody.ParseJson<T>();
+		} catch (JsonException ex) {
+			_lastJsonException = ex;
+			return default;
+		}
+	}
+
+	protected async Task Get(string path, string extra, string accept = null, NetworkCredential credentials = null,
+		bool setAcceptHeader = true, NameValueCollection headers = null) {
+		credentials = credentials ?? _defaultCredentials;
+		var request = CreateRequest(path, extra, "GET", null, credentials, headers);
+		if (setAcceptHeader) {
+			request.Headers.Add("accept", accept ?? ContentTypeConstant.Json);
+		}
+
+		_lastResponse = await GetRequestResponse(request);
+		using var memoryStream = new MemoryStream();
+		await _lastResponse.Content.CopyToAsync(memoryStream);
+		var bytes = memoryStream.ToArray();
+		_lastResponseBytes = bytes;
+		_lastResponseBody = Helper.UTF8NoBom.GetString(bytes);
+	}
+
+	protected async Task<HttpResponseMessage> GetRequestResponse(HttpRequestMessage request) {
+		var response = await _client.SendAsync(request);
+		_allResponses.Add(response);
+
+		return response;
+	}
+
+	protected readonly JsonSerializerSettings TestJsonSettings = new JsonSerializerSettings {
+		ContractResolver = new CamelCasePropertyNamesContractResolver(),
+		DateFormatHandling = DateFormatHandling.IsoDateFormat,
+		NullValueHandling = NullValueHandling.Ignore,
+		DefaultValueHandling = DefaultValueHandling.Include,
+		MissingMemberHandling = MissingMemberHandling.Ignore,
+		TypeNameHandling = TypeNameHandling.None,
+		Converters = new JsonConverter[] { new StringEnumConverter() }
+	};
+
+	protected byte[] ToJsonBytes(object source) {
+		string instring = JsonConvert.SerializeObject(source, Formatting.Indented, TestJsonSettings);
+		return Helper.UTF8NoBom.GetBytes(instring);
+	}
+
+	protected HttpRequestMessage CreateEventsJsonPostRequest<T>(
+		string path, string method, T body, NetworkCredential credentials = null, string extra = null, string contentType = null) {
+		credentials = credentials ?? _defaultCredentials;
+		var request = CreateRequest(path, extra, method, contentType ?? ContentTypeConstant.EventsJson, credentials);
+		request.Content = new ByteArrayContent(ToJsonBytes(body)) {
+			Headers = { ContentType = new MediaTypeHeaderValue(contentType ?? ContentTypeConstant.EventsJson) }
+		};
+		return request;
+	}
+
+	protected HttpRequestMessage CreateRawJsonPostRequest<T>(
+		string path, string method, T body, NetworkCredential credentials = null, string extra = null) {
+		credentials ??= _defaultCredentials;
+		var request = CreateRequest(path, extra, method, ContentTypeConstant.Json, credentials);
+		request.Content = new ByteArrayContent(ToJsonBytes(body)) {
+			Headers = { ContentType = new MediaTypeHeaderValue(ContentTypeConstant.Json) }
+		};
+		return request;
+	}
+	private HttpRequestMessage CreateJsonPostRequest(string path, NetworkCredential credentials = null, string extra = null) {
+		credentials = credentials ?? _defaultCredentials;
+		var request = CreateRequest(path, "POST", credentials, extra);
+
+		return request;
+	}
+	protected void SetDefaultCredentials(NetworkCredential credentials) {
+		_defaultCredentials = credentials;
+	}
+
+	protected abstract Task Given();
+	protected abstract Task When();
+}
diff --git a/src/KurrentDB.Core.Tests/Http/HttpProtocols/clear_text_http_multiplexing_middleware.cs b/src/KurrentDB.Core.Tests/Http/HttpProtocols/clear_text_http_multiplexing_middleware.cs
new file mode 100644
index 00000000000..5dd7f6d7e66
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/HttpProtocols/clear_text_http_multiplexing_middleware.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Transport.Http;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Hosting.Server.Features;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Http.HttpProtocols;
+
+
+public class Startup : IStartup {
+	public IServiceProvider ConfigureServices(IServiceCollection services) {
+		return services.AddRouting().BuildServiceProvider();
+	}
+
+	public void Configure(IApplicationBuilder app) {
+		app.UseRouter(router => {
+			router.MapGet("/test", async context => {
+				await context.Response.WriteAsync("hello");
+			});
+		});
+	}
+}
+
+[TestFixture]
+public class clear_text_http_multiplexing_middleware {
+	private IWebHost _host;
+	private string _endpoint;
+
+	[SetUp]
+	public void SetUp() {
+		_host = new WebHostBuilder()
+			.UseKestrel(server => {
+				server.Listen(IPAddress.Loopback, 0, listenOptions => {
+					listenOptions.Use(next => new ClearTextHttpMultiplexingMiddleware(next).OnConnectAsync);
+				});
+			})
+			.UseStartup(new Startup())
+			.Build();
+
+		_host.Start();
+		_endpoint = _host.ServerFeatures.Get<IServerAddressesFeature>().Addresses.Single();
+	}
+
+	[TearDown]
+	public Task Teardown() {
+		_host?.Dispose();
+		return Task.CompletedTask;
+	}
+
+	[Test]
+	public async Task http1_request() {
+		using var client = new HttpClient();
+		var request = new HttpRequestMessage(HttpMethod.Get, _endpoint + "/test");
+		var result = await client.SendAsync(request);
+		Assert.AreEqual(new Version(1, 1), result.Version);
+		Assert.AreEqual("hello", await result.Content.ReadAsStringAsync());
+	}
+
+	[Test]
+	public async Task http2_request() {
+		using var client = new HttpClient();
+		var request = new HttpRequestMessage(HttpMethod.Get, _endpoint + "/test") {
+			Version = new Version(2, 0),
+			VersionPolicy = HttpVersionPolicy.RequestVersionExact
+		};
+
+		var result = await client.SendAsync(request);
+		Assert.AreEqual(new Version(2, 0), result.Version);
+		Assert.AreEqual("hello", await result.Content.ReadAsStringAsync());
+	}
+
+}
diff --git a/src/KurrentDB.Core.Tests/Http/HttpResponseHeaderExtensions.cs b/src/KurrentDB.Core.Tests/Http/HttpResponseHeaderExtensions.cs
new file mode 100644
index 00000000000..1364e7819c4
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/HttpResponseHeaderExtensions.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Net.Http.Headers;
+
+namespace KurrentDB.Core.Tests.Http;
+
+internal static class HttpResponseHeaderExtensions {
+	public static string GetLocationAsString(this HttpResponseHeaders headers)
+		=> headers.TryGetValues("location", out var values)
+			? values.FirstOrDefault()
+			: default;
+
+}
diff --git a/src/KurrentDB.Core.Tests/Http/Info/when_getting_options.cs b/src/KurrentDB.Core.Tests/Http/Info/when_getting_options.cs
new file mode 100644
index 00000000000..7ed80578c96
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/Info/when_getting_options.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Http.Info;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_getting_options<TLogFormat, TStreamId> : HttpBehaviorSpecification<TLogFormat, TStreamId> {
+	protected override Task Given() => Task.CompletedTask;
+
+	protected override async Task When() {
+		await Get("/info/options", "", credentials: DefaultData.AdminNetworkCredentials);
+	}
+
+	[Test]
+	public void sensitive_options_are_hidden_in_response() {
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+
+		var options = _lastResponseBody.ParseJson<JArray>();
+		var sensitiveOption = options.First(x => x.Value<string>("name") == "DefaultAdminPassword");
+		Assert.AreEqual("********", sensitiveOption.Value<string>("value"));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/PersistentSubscription/ack.cs b/src/KurrentDB.Core.Tests/Http/PersistentSubscription/ack.cs
new file mode 100644
index 00000000000..395e3efb6c5
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/PersistentSubscription/ack.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using KurrentDB.Transport.Http;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+using HttpStatusCode = System.Net.HttpStatusCode;
+
+// ReSharper disable InconsistentNaming
+
+namespace KurrentDB.Core.Tests.Http.PersistentSubscription;
+
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_acking_a_message(string contentType) : with_subscription_having_events {
+	private HttpResponseMessage _response;
+	private string _ackLink;
+
+	protected override async Task Given() {
+		await base.Given();
+		var json = await GetJson<JObject>(
+			SubscriptionPath + "/1",
+			contentType,
+			_admin);
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+		_ackLink = json["entries"].Children().First()["links"].Children()
+			.First(x => x.Value<string>("relation") == "ack").Value<string>("uri");
+	}
+
+	[TearDown]
+	public void TearDown() {
+		_response.Dispose();
+	}
+
+	protected override async Task When() {
+		_response = await MakePost(_ackLink, _admin);
+	}
+
+	[Test]
+	public void returns_accepted() {
+		Assert.AreEqual(HttpStatusCode.Accepted, _response.StatusCode);
+	}
+}
+
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_acking_messages(string contentType) : with_subscription_having_events {
+	private HttpResponseMessage _response;
+	private string _ackAllLink;
+
+	protected override async Task Given() {
+		await base.Given();
+		var json = await GetJson<JObject>(
+			SubscriptionPath + "/" + Events.Count,
+			contentType,
+			_admin);
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+		_ackAllLink = json["links"].Children().First(x => x.Value<string>("relation") == "ackAll")
+			.Value<string>("uri");
+	}
+
+	[TearDown]
+	public void TearDown() {
+		_response.Dispose();
+	}
+
+	protected override async Task When() {
+		_response = await MakePost(_ackAllLink, _admin);
+	}
+
+	[Test]
+	public void returns_accepted() {
+		Assert.AreEqual(HttpStatusCode.Accepted, _response.StatusCode);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/PersistentSubscription/creating.cs b/src/KurrentDB.Core.Tests/Http/PersistentSubscription/creating.cs
new file mode 100644
index 00000000000..799f407aa15
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/PersistentSubscription/creating.cs
@@ -0,0 +1,271 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.Http.Users.users;
+using KurrentDB.Transport.Http;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+using HttpResponseMessage = System.Net.Http.HttpResponseMessage;
+using HttpStatusCode = System.Net.HttpStatusCode;
+
+namespace KurrentDB.Core.Tests.Http.PersistentSubscription;
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+class when_creating_a_subscription<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
+	private HttpResponseMessage _response;
+
+	protected override Task Given() => Task.CompletedTask;
+
+	protected override async Task When() {
+		_response = await MakeJsonPut(
+			"/subscriptions/stream/groupname334",
+			new {
+				ResolveLinkTos = true
+			}, _admin);
+	}
+
+	[OneTimeTearDown]
+	public void TearDown() {
+		_response?.Dispose();
+	}
+
+	[Test]
+	public void returns_created() {
+		Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+	}
+
+	[Test]
+	public void returns_location_header() {
+		Assert.AreEqual("http://" + _node.HttpEndPoint + "/subscriptions/stream/groupname334",
+			_response.Headers.Location.ToString());
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+class when_creating_a_subscription_with_query_params<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
+	private HttpResponseMessage _response;
+
+	protected override Task Given() => Task.CompletedTask;
+
+	protected override async Task When() {
+		_response = await MakeJsonPut(
+			"/subscriptions/stream/groupname334",
+			new {
+				ResolveLinkTos = true
+			}, _admin, "testing=test");
+	}
+
+	[OneTimeTearDown]
+	public void TearDown() {
+		_response.Dispose();
+	}
+
+	[Test]
+	public void returns_created() {
+		Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+	}
+
+	[Test]
+	public void returns_location_header() {
+		Assert.AreEqual("http://" + _node.HttpEndPoint + "/subscriptions/stream/groupname334",
+			_response.Headers.Location.ToString());
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+class when_creating_a_subscription_without_permissions<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
+	private HttpResponseMessage _response;
+
+	protected override Task Given() => Task.CompletedTask;
+
+	protected override async Task When() {
+		SetDefaultCredentials(null);
+		_response = await MakeJsonPut(
+			"/subscriptions/stream/groupname337",
+			new {
+				ResolveLinkTos = true
+			});
+	}
+
+	[OneTimeTearDown]
+	public void TearDown() {
+		_response?.Dispose();
+	}
+
+	[Test]
+	public void returns_unauthorised() {
+		Assert.AreEqual(HttpStatusCode.Unauthorized, _response.StatusCode);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+class when_creating_a_duplicate_subscription<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
+	private HttpResponseMessage _response;
+
+	protected override async Task Given() {
+		_response = await MakeJsonPut(
+			"/subscriptions/stream/groupname453",
+			new {
+				ResolveLinkTos = true
+			}, _admin);
+	}
+
+	protected override async Task When() {
+		_response = await MakeJsonPut(
+			"/subscriptions/stream/groupname453",
+			new {
+				ResolveLinkTos = true
+			}, _admin);
+	}
+
+	[OneTimeTearDown]
+	public void TearDown() {
+		_response?.Dispose();
+	}
+
+	[Test]
+	public void returns_conflict() {
+		Assert.AreEqual(HttpStatusCode.Conflict, _response.StatusCode);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+class when_creating_a_subscription_with_bad_config<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
+	protected List<object> Events;
+	protected string SubscriptionPath;
+	protected string GroupName;
+	protected HttpResponseMessage Response;
+
+	protected override async Task Given() {
+		Events = new List<object> {
+			new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {A = "1"}},
+			new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {B = "2"}},
+			new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {C = "3"}},
+			new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {D = "4"}}
+		};
+
+		Response = await MakeArrayEventsPost(
+			TestStream,
+			Events,
+			_admin);
+		Assert.AreEqual(HttpStatusCode.Created, Response.StatusCode);
+	}
+
+	protected override async Task When() {
+		GroupName = Guid.NewGuid().ToString();
+		SubscriptionPath = string.Format("/subscriptions/{0}/{1}", TestStream.Substring(9), GroupName);
+		Response = await MakeJsonPut(SubscriptionPath,
+			new {
+				ResolveLinkTos = true,
+				BufferSize = 10,
+				ReadBatchSize = 11
+			},
+			_admin);
+	}
+
+	[OneTimeTearDown]
+	public void TearDown() {
+		Response?.Dispose();
+	}
+
+	[Test]
+	public void returns_bad_request() {
+		Assert.AreEqual(HttpStatusCode.BadRequest, Response.StatusCode);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+class when_creating_persistent_subscription_with_message_timeout_0<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
+	protected string SubscriptionPath;
+	protected string GroupName;
+	protected HttpResponseMessage Response;
+	protected JObject SubsciptionInfo;
+
+	protected override Task Given() => Task.CompletedTask;
+
+	protected override async Task When() {
+		GroupName = Guid.NewGuid().ToString();
+		SubscriptionPath = string.Format("/subscriptions/{0}/{1}", TestStream.Substring(9), GroupName);
+		Response = await MakeJsonPut(SubscriptionPath,
+			new {
+				ResolveLinkTos = true,
+				MessageTimeoutMilliseconds = 0
+			},
+			_admin);
+
+		SubsciptionInfo = await GetJson<JObject>(SubscriptionPath + "/info", ContentType.Json);
+	}
+
+	[OneTimeTearDown]
+	public void TearDown() {
+		Response?.Dispose();
+	}
+
+	[Test]
+	public void returns_created() {
+		Assert.AreEqual(HttpStatusCode.Created, Response.StatusCode);
+
+	}
+
+	[Test]
+	public void timeout_set_to_0() {
+		Assert.AreEqual(0, SubsciptionInfo.Value<JObject>("config").Value<long?>("messageTimeoutMilliseconds"));
+
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+class when_creating_persistent_subscription_without_message_timeout<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
+	protected string SubscriptionPath;
+	protected string GroupName;
+	protected HttpResponseMessage Response;
+	protected JObject SubsciptionInfo;
+
+	protected override Task Given() => Task.CompletedTask;
+	protected override async Task When() {
+		GroupName = Guid.NewGuid().ToString();
+		SubscriptionPath = string.Format("/subscriptions/{0}/{1}", TestStream.Substring(9), GroupName);
+		Response = await MakeJsonPut(SubscriptionPath,
+			new {
+				ResolveLinkTos = true,
+			},
+			_admin);
+
+		SubsciptionInfo = await GetJson<JObject>(SubscriptionPath + "/info", ContentType.Json);
+	}
+
+	[OneTimeTearDown]
+	public void TearDown() {
+		Response?.Dispose();
+	}
+
+	[Test]
+	public void returns_created() {
+		Assert.AreEqual(HttpStatusCode.Created, Response.StatusCode);
+
+	}
+
+	[Test]
+	public void timeout_set_to_default_10000() {
+		Assert.AreEqual(10000, SubsciptionInfo.Value<JObject>("config").Value<long?>("messageTimeoutMilliseconds"));
+
+	}
+}
+
diff --git a/src/KurrentDB.Core.Tests/Http/PersistentSubscription/deleting.cs b/src/KurrentDB.Core.Tests/Http/PersistentSubscription/deleting.cs
new file mode 100644
index 00000000000..e26f510f91d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/PersistentSubscription/deleting.cs
@@ -0,0 +1,126 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Tests.Http.Users.users;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Http.PersistentSubscription;
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+class when_deleting_non_existing_subscription<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
+	private HttpResponseMessage _response;
+
+	protected override Task Given() => Task.CompletedTask;
+
+	protected override async Task When() {
+		var req = CreateRequest("/subscriptions/stream/groupname158", "DELETE", _admin);
+		_response = await GetRequestResponse(req);
+	}
+
+	[Test]
+	public void returns_not_found() {
+		Assert.AreEqual(HttpStatusCode.NotFound, _response.StatusCode);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+class when_deleting_an_existing_subscription<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
+	private HttpResponseMessage _response;
+
+	protected override async Task Given() {
+		_response = await MakeJsonPut(
+			"/subscriptions/stream/groupname156",
+			new {
+				ResolveLinkTos = true
+			}, _admin);
+	}
+
+	protected override async Task When() {
+		var req = CreateRequest("/subscriptions/stream/groupname156", "DELETE", _admin);
+		_response = await GetRequestResponse(req);
+	}
+
+	[Test]
+	public void returns_ok() {
+		Assert.AreEqual(HttpStatusCode.OK, _response.StatusCode);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+class when_deleting_an_existing_subscription_without_permissions<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
+	private HttpResponseMessage _response;
+
+	protected override async Task Given() {
+		_response = await MakeJsonPut(
+			"/subscriptions/stream/groupname156",
+			new {
+				ResolveLinkTos = true
+			}, _admin);
+	}
+
+	protected override async Task When() {
+		SetDefaultCredentials(null);
+		var req = CreateRequest("/subscriptions/stream/groupname156", "DELETE");
+		_response = await GetRequestResponse(req);
+	}
+
+	[Test]
+	public void returns_unauthorized() {
+		Assert.AreEqual(HttpStatusCode.Unauthorized, _response.StatusCode);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+class when_deleting_an_existing_subscription_with_subscribers<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
+	private HttpResponseMessage _response;
+	private const string _stream = "astreamname";
+	private readonly string _groupName = Guid.NewGuid().ToString();
+	private SubscriptionDropReason _reason;
+	private Exception _exception;
+	private readonly AutoResetEvent _dropped = new AutoResetEvent(false);
+
+	protected override async Task Given() {
+		_response = await MakeJsonPut(
+			string.Format("/subscriptions/{0}/{1}", _stream, _groupName),
+			new {
+				ResolveLinkTos = true
+			}, _admin);
+		_connection.ConnectToPersistentSubscription(_stream, _groupName, (x, y) => Task.CompletedTask,
+			(sub, reason, e) => {
+				_dropped.Set();
+				_reason = reason;
+				_exception = e;
+			}, DefaultData.AdminCredentials);
+	}
+
+	protected override async Task When() {
+		var req = CreateRequest(string.Format("/subscriptions/{0}/{1}", _stream, _groupName), "DELETE", _admin);
+		_response = await GetRequestResponse(req);
+	}
+
+	[Test]
+	public void returns_ok() {
+		Assert.AreEqual(HttpStatusCode.OK, _response.StatusCode);
+	}
+
+	[Test]
+	public void the_subscription_is_dropped() {
+		Assert.IsTrue(_dropped.WaitOne(TimeSpan.FromSeconds(5)));
+		Assert.AreEqual(SubscriptionDropReason.UserInitiated, _reason);
+		Assert.IsNull(_exception);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/PersistentSubscription/feed.cs b/src/KurrentDB.Core.Tests/Http/PersistentSubscription/feed.cs
new file mode 100644
index 00000000000..52ace0a9ecc
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/PersistentSubscription/feed.cs
@@ -0,0 +1,343 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Tests.Http.Streams;
+using KurrentDB.Core.Tests.Http.Users.users;
+using KurrentDB.Transport.Http;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+using HttpStatusCode = System.Net.HttpStatusCode;
+
+namespace KurrentDB.Core.Tests.Http.PersistentSubscription;
+
+abstract class SpecificationWithLongFeed : with_admin_user {
+	protected int _numberOfEvents = 5;
+
+	protected string SubscriptionGroupName {
+		get { return "test_subscription_group" + Tag; }
+	}
+
+	protected string _subscriptionEndpoint;
+	protected string _subscriptionStream;
+	protected string _subscriptionGroupName;
+	protected List<Guid> _eventIds = new List<Guid>();
+
+	protected async Task SetupPersistentSubscription(string streamId, string groupName, int messageTimeoutInMs = 10000) {
+		_subscriptionStream = streamId;
+		_subscriptionGroupName = groupName;
+		_subscriptionEndpoint =
+			String.Format("/subscriptions/{0}/{1}", _subscriptionStream, _subscriptionGroupName);
+
+		var response = await MakeJsonPut(
+			_subscriptionEndpoint,
+			new {
+				ResolveLinkTos = true,
+				MessageTimeoutMilliseconds = messageTimeoutInMs
+			}, _admin);
+
+		Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
+	}
+
+	protected async Task<string> PostEvent(int i) {
+		var eventId = Guid.NewGuid();
+		var response = await MakeArrayEventsPost(
+			TestStream, new[] { new { EventId = eventId, EventType = "event-type", Data = new { Number = i } } });
+		_eventIds.Add(eventId);
+		Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
+		return response.Headers.Location.ToString();
+	}
+
+	protected override async Task Given() {
+		await SetupPersistentSubscription(TestStreamName, SubscriptionGroupName);
+		for (var i = 0; i < _numberOfEvents; i++) {
+			await PostEvent(i);
+		}
+	}
+
+	protected string GetLink(JObject feed, string relation) {
+		var rel = (from JObject link in feed["links"]
+				   from JProperty attr in link
+				   where attr.Name == "relation" && (string)attr.Value == relation
+				   select link).SingleOrDefault();
+		return (rel == null) ? (string)null : (string)rel["uri"];
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_retrieving_an_empty_feed(string contentType) : SpecificationWithLongFeed {
+	private JObject _feed;
+	private JObject _head;
+	private string _previous;
+
+	protected override async Task Given() {
+		await base.Given();
+		_head = await GetJson<JObject>(_subscriptionEndpoint + "/" + _numberOfEvents, contentType);
+		_previous = GetLink(_head, "previous");
+	}
+
+	protected override async Task When() {
+		_feed = await GetJson<JObject>(_previous, contentType);
+	}
+
+	[Test]
+	public void returns_ok_status_code() {
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+	}
+
+	[Test]
+	public void does_not_contain_ack_all_link() {
+		var rel = GetLink(_feed, "ackAll");
+		Assert.That(string.IsNullOrEmpty(rel));
+	}
+
+	[Test]
+	public void does_not_contain_nack_all_link() {
+		var rel = GetLink(_feed, "nackAll");
+		Assert.That(string.IsNullOrEmpty(rel));
+	}
+
+	[Test]
+	public void contains_a_link_rel_previous() {
+		var rel = GetLink(_feed, "previous");
+		Assert.That(!string.IsNullOrEmpty(rel));
+	}
+
+	[Test]
+	public void the_feed_is_empty() {
+		Assert.AreEqual(0, _feed["entries"].Count());
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_retrieving_a_feed_with_events(string contentType) : SpecificationWithLongFeed {
+	private JObject _feed;
+	private List<JToken> _entries;
+
+	protected override async Task When() {
+		var allMessagesFeedLink = String.Format("{0}/{1}", _subscriptionEndpoint, _numberOfEvents);
+		_feed = await GetJson<JObject>(allMessagesFeedLink, contentType);
+		_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
+	}
+
+	[Test]
+	public void returns_ok_status_code() {
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+	}
+
+	[Test]
+	public void contains_all_the_events() {
+		Assert.AreEqual(_numberOfEvents, _entries.Count);
+	}
+
+	[Test]
+	public void the_ackAll_link_is_to_correct_uri() {
+		var ids = String.Format("ids={0}", String.Join(",", _eventIds.ToArray()));
+		var ackAllLink = String.Format("subscriptions/{0}/{1}/ack", TestStreamName, SubscriptionGroupName);
+		Assert.AreEqual(MakeUrl(ackAllLink, ids), GetLink(_feed, "ackAll"));
+	}
+
+	[Test]
+	public void the_nackAll_link_is_to_correct_uri() {
+		var ids = String.Format("ids={0}", String.Join(",", _eventIds.ToArray()));
+		var nackAllLink = String.Format("subscriptions/{0}/{1}/nack", TestStreamName, SubscriptionGroupName);
+		Assert.AreEqual(MakeUrl(nackAllLink, ids), GetLink(_feed, "nackAll"));
+	}
+
+	[Test]
+	public void all_entries_have_retry_count_element() {
+		var allEntriesHaveRetryCount = _feed["entries"].All(entry => entry["retryCount"] != null);
+		Assert.True(allEntriesHaveRetryCount);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_polling_the_head_forward_and_a_new_event_appears(string contentType) : SpecificationWithLongFeed {
+	private JObject _feed;
+	private JObject _head;
+	private string _previous;
+	private string _lastEventLocation;
+	private List<JToken> _entries;
+
+	protected override async Task Given() {
+		await base.Given();
+		_head = await GetJson<JObject>(_subscriptionEndpoint + "/" + _numberOfEvents, contentType);
+		_previous = GetLink(_head, "previous");
+		_lastEventLocation = await PostEvent(-1);
+	}
+
+	protected override async Task When() {
+		_feed = await GetJson<JObject>(_previous, contentType);
+		_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
+	}
+
+	[Test]
+	public void returns_ok_status_code() {
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+	}
+
+	[Test]
+	public void returns_a_feed_with_a_single_entry_referring_to_the_last_event() {
+		HelperExtensions.AssertJson(new { entries = new[] { new { Id = _lastEventLocation } } }, _feed);
+	}
+
+	[Test]
+	public void the_ack_link_is_to_correct_uri() {
+		var link = _entries[0]["links"][2];
+		Assert.AreEqual("ack", link["relation"].ToString());
+		var ackLink = String.Format("subscriptions/{0}/{1}/ack/{2}", TestStreamName, SubscriptionGroupName,
+			_eventIds.Last());
+		Assert.AreEqual(MakeUrl(ackLink), link["uri"].ToString());
+	}
+
+	[Test]
+	public void the_nack_link_is_to_correct_uri() {
+		var link = _entries[0]["links"][3];
+		Assert.AreEqual("nack", link["relation"].ToString());
+		var ackLink = String.Format("subscriptions/{0}/{1}/nack/{2}", TestStreamName, SubscriptionGroupName,
+			_eventIds.Last());
+		Assert.AreEqual(MakeUrl(ackLink), link["uri"].ToString());
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture]
+class when_retrieving_a_feed_with_events_with_competing_xml : SpecificationWithLongFeed {
+	private XDocument document;
+	private XElement[] _entries;
+
+	protected override async Task When() {
+		await Get(MakeUrl(_subscriptionEndpoint + "/" + 1).ToString(), String.Empty, ContentType.Competing);
+		document = XDocument.Parse(_lastResponseBody);
+		_entries = document.GetEntries();
+	}
+
+	[Test]
+	public void the_feed_has_n_events() {
+		Assert.AreEqual(1, _entries.Length);
+	}
+
+	[Test]
+	public void contains_all_the_events() {
+		Assert.AreEqual(1, _entries.Length);
+	}
+
+	[Test]
+	public void the_ackAll_link_is_to_correct_uri() {
+		var ids = String.Format("ids={0}", _eventIds[0]);
+		var ackAllLink = String.Format("subscriptions/{0}/{1}/ack", TestStreamName, SubscriptionGroupName);
+		Assert.AreEqual(MakeUrl(ackAllLink, ids),
+			document.Element(XDocumentAtomExtensions.AtomNamespace + "feed").GetLink("ackAll"));
+	}
+
+	[Test]
+	public void the_nackAll_link_is_to_correct_uri() {
+		var ids = String.Format("ids={0}", _eventIds[0]);
+		var nackAllLink = String.Format("subscriptions/{0}/{1}/nack", TestStreamName, SubscriptionGroupName);
+		Assert.AreEqual(MakeUrl(nackAllLink, ids),
+			document.Element(XDocumentAtomExtensions.AtomNamespace + "feed").GetLink("nackAll"));
+	}
+
+	[Test]
+	public void the_ack_link_is_to_correct_uri() {
+		var result = document.Element(XDocumentAtomExtensions.AtomNamespace + "feed")
+			.Element(XDocumentAtomExtensions.AtomNamespace + "entry")
+			.GetLink("ack");
+		var ackLink = String.Format("subscriptions/{0}/{1}/ack/{2}", TestStreamName, SubscriptionGroupName,
+			_eventIds[0]);
+		Assert.AreEqual(MakeUrl(ackLink), result);
+	}
+
+	[Test]
+	public void the_nack_link_is_to_correct_uri() {
+		var result = document.Element(XDocumentAtomExtensions.AtomNamespace + "feed")
+			.Element(XDocumentAtomExtensions.AtomNamespace + "entry")
+			.GetLink("nack");
+		;
+		var nackLink = String.Format("subscriptions/{0}/{1}/nack/{2}", TestStreamName, SubscriptionGroupName,
+			_eventIds[0]);
+		Assert.AreEqual(MakeUrl(nackLink), result);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture]
+class when_retrieving_a_feed_with_invalid_content_type : SpecificationWithLongFeed {
+	protected override Task When() {
+		return Get(MakeUrl(_subscriptionEndpoint + "/" + _numberOfEvents).ToString(), String.Empty, ContentType.Xml);
+	}
+
+	[Test]
+	public void returns_not_acceptable() {
+		Assert.AreEqual(HttpStatusCode.NotAcceptable, _lastResponse.StatusCode);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_retrieving_a_feed_with_events_using_prefix(string contentType) : SpecificationWithLongFeed {
+	private JObject _feed;
+	private List<JToken> _entries;
+	private string _prefix;
+
+	protected override async Task When() {
+		_prefix = "myprefix";
+		var headers = new NameValueCollection();
+		headers.Add("X-Forwarded-Prefix", _prefix);
+		var allMessagesFeedLink = String.Format("{0}/{1}", _subscriptionEndpoint, _numberOfEvents);
+		_feed = await GetJson<JObject>(allMessagesFeedLink, contentType, headers: headers);
+		_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
+	}
+
+	[Test]
+	public void returns_ok_status_code() {
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+	}
+
+	[Test]
+	public void contains_all_the_events() {
+		Assert.AreEqual(_numberOfEvents, _entries.Count);
+	}
+
+	[Test]
+	public void contains_previous_link_with_prefix() {
+		var previousLink = String.Format("{0}/subscriptions/{1}/{2}/5", _prefix, TestStreamName,
+			SubscriptionGroupName);
+		Assert.AreEqual(MakeUrl(previousLink), GetLink(_feed, "previous"));
+	}
+
+	[Test]
+	public void contains_self_link_with_prefix() {
+		var selfLink = String.Format("{0}/subscriptions/{1}/{2}", _prefix, TestStreamName, SubscriptionGroupName);
+		Assert.AreEqual(MakeUrl(selfLink), GetLink(_feed, "self"));
+	}
+
+	[Test]
+	public void the_ackAll_link_is_to_correct_uri_with_prefix() {
+		var ids = String.Format("ids={0}", String.Join(",", _eventIds.ToArray()));
+		var ackAllLink = String.Format("{0}/subscriptions/{1}/{2}/ack", _prefix, TestStreamName,
+			SubscriptionGroupName);
+		Assert.AreEqual(MakeUrl(ackAllLink, ids), GetLink(_feed, "ackAll"));
+	}
+
+	[Test]
+	public void the_nackAll_link_is_to_correct_uri_with_prefix() {
+		var ids = String.Format("ids={0}", String.Join(",", _eventIds.ToArray()));
+		var nackAllLink = String.Format("{0}/subscriptions/{1}/{2}/nack", _prefix, TestStreamName,
+			SubscriptionGroupName);
+		Assert.AreEqual(MakeUrl(nackAllLink, ids), GetLink(_feed, "nackAll"));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/PersistentSubscription/getting.cs b/src/KurrentDB.Core.Tests/Http/PersistentSubscription/getting.cs
new file mode 100644
index 00000000000..33cba273adb
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/PersistentSubscription/getting.cs
@@ -0,0 +1,313 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Common;
+using KurrentDB.Core.Tests.Http.Users.users;
+using KurrentDB.Transport.Http;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+using HttpStatusCode = System.Net.HttpStatusCode;
+
+// ReSharper disable InconsistentNaming
+
+namespace KurrentDB.Core.Tests.Http.PersistentSubscription;
+
+abstract class with_subscription_having_events : with_admin_user {
+	protected List<object> Events;
+	protected string SubscriptionPath;
+	protected string GroupName;
+	protected int? NumberOfEventsToCreate;
+
+	protected override async Task Given() {
+		Events = new List<object> {
+			new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {A = "1"}},
+			new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {B = "2"}},
+			new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {C = "3"}},
+			new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {D = "4"}}
+		};
+
+		var numberOfEventsToCreate = NumberOfEventsToCreate ?? Events.Count;
+		var response = await MakeArrayEventsPost(
+			TestStream,
+			Events.Take(numberOfEventsToCreate),
+			_admin);
+		Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
+
+		GroupName = Guid.NewGuid().ToString();
+		SubscriptionPath = string.Format("/subscriptions/{0}/{1}", TestStream.Substring(9), GroupName);
+		response = await MakeJsonPut(SubscriptionPath,
+			new {
+				ResolveLinkTos = true,
+				MessageTimeoutMilliseconds = 10000,
+			},
+			_admin);
+		Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
+		AssertEx.IsOrBecomesTrue(() => {
+			var x = GetJson<JObject>(TestStream, accept: ContentType.Json).Result;
+			return x["entries"].Count() == numberOfEventsToCreate;
+		});
+	}
+
+	protected override Task When() => Task.CompletedTask;
+
+	protected async Task SecureStream() {
+		var metadata =
+			(StreamMetadata)
+			StreamMetadata.Build()
+				.SetMetadataReadRole("admin")
+				.SetMetadataWriteRole("admin")
+				.SetReadRole("admin")
+				.SetWriteRole("admin");
+		var jsonMetadata = metadata.AsJsonString();
+		var response = await MakeArrayEventsPost(
+			TestMetadataStream,
+			new[] {
+				new {
+					EventId = Guid.NewGuid(),
+					EventType = SystemEventTypes.StreamMetadata,
+					Data = new JRaw(jsonMetadata)
+				}
+			});
+		Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_getting_messages_without_permission(string contentType) : with_subscription_having_events {
+	protected override async Task Given() {
+		await base.Given();
+		await SecureStream();
+	}
+
+	protected override async Task When() {
+		SetDefaultCredentials(null);
+		await GetJson<JObject>(
+			SubscriptionPath,
+			contentType);
+	}
+
+	[Test]
+	public void returns_unauthorised() {
+		Assert.AreEqual(HttpStatusCode.Unauthorized, _lastResponse.StatusCode);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_getting_messages_from_an_empty_subscription(string contentType) : with_admin_user {
+	private JObject _response;
+	protected List<object> Events;
+	protected string SubscriptionPath;
+	protected string GroupName;
+
+	protected override async Task Given() {
+		Events = new List<object> {
+			new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {A = "1"}},
+			new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {B = "2"}},
+			new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {C = "3"}},
+			new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {D = "4"}}
+		};
+
+		GroupName = Guid.NewGuid().ToString();
+		SubscriptionPath = string.Format("/subscriptions/{0}/{1}", TestStream.Substring(9), GroupName);
+		var response = await MakeJsonPut(SubscriptionPath,
+			new {
+				ResolveLinkTos = true,
+				MessageTimeoutMilliseconds = 10000
+			},
+			_admin);
+		Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
+
+		response = await MakeArrayEventsPost(
+			TestStream,
+			Events,
+			_admin);
+		Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
+
+		//pull all events out.
+		_response = await GetJson<JObject>(
+			SubscriptionPath + "/" + Events.Count,
+			contentType,
+			_admin);
+
+		var count = _response["entries"].Count();
+		Assert.AreEqual(Events.Count, count, "Expected {0} events, received {1}", Events.Count, count);
+	}
+
+	protected override async Task When() {
+		_response = await GetJson<JObject>(
+			SubscriptionPath,
+			contentType,
+			_admin);
+	}
+
+	[Test]
+	public void return_0_messages() {
+		var count = _response["entries"].Count();
+		Assert.AreEqual(0, count, "Expected {0} events, received {1}", 0, count);
+	}
+}
+
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_getting_messages_from_a_subscription_with_n_messages(string contentType) : with_subscription_having_events {
+	private JObject _response;
+
+	protected override async Task When() {
+		_response = await GetJson<JObject>(
+			SubscriptionPath + "/" + Events.Count,
+			contentType,
+			_admin);
+	}
+
+	[Test]
+	public void returns_n_messages() {
+		var count = ((JObject)_response)["entries"].Count();
+		Assert.AreEqual(Events.Count, count, "Expected {0} events, received {1}", Events.Count, count);
+	}
+}
+
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_getting_messages_from_a_subscription_with_more_than_n_messages(string contentType) : with_subscription_having_events {
+	private JObject _response;
+
+	protected override async Task When() {
+		_response = await GetJson<JObject>(
+			SubscriptionPath + "/" + (Events.Count - 1),
+			contentType,
+			_admin);
+	}
+
+	[Test]
+	public void returns_n_messages() {
+		var count = ((JArray)_response["entries"]).Count;
+		Assert.AreEqual(Events.Count - 1, count, "Expected {0} events, received {1}", Events.Count - 1, count);
+	}
+}
+
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_getting_messages_from_a_subscription_with_less_than_n_messags(string contentType) : with_subscription_having_events {
+	private JObject _response;
+
+	protected override async Task When() {
+		_response = await GetJson<JObject>(
+			SubscriptionPath + "/" + (Events.Count + 1),
+			contentType,
+			_admin);
+	}
+
+	[Test]
+	public void returns_all_messages() {
+		var count = ((JArray)_response["entries"]).Count;
+		Assert.AreEqual(Events.Count, count, "Expected {0} events, received {1}", Events.Count, count);
+	}
+}
+
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_getting_messages_from_a_subscription_with_unspecified_count(string contentType) : with_subscription_having_events {
+	private JObject _response;
+
+	protected override async Task When() {
+		_response = await GetJson<JObject>(
+			SubscriptionPath,
+			contentType,
+			_admin);
+	}
+
+	[Test]
+	public void returns_1_message() {
+		var count = ((JArray)_response["entries"]).Count;
+		Assert.AreEqual(1, count, "Expected {0} events, received {1}", 1, count);
+	}
+}
+
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_getting_messages_from_a_subscription_with_a_negative_count(string contentType) : with_subscription_having_events {
+	protected override Task When() {
+		return Get(SubscriptionPath + "/-1",
+			"",
+			contentType,
+			_admin);
+	}
+
+	[Test]
+	public void returns_bad_request() {
+		Assert.AreEqual(HttpStatusCode.BadRequest, _lastResponse.StatusCode);
+	}
+}
+
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_getting_messages_from_a_subscription_with_a_count_of_0(string contentType) : with_subscription_having_events {
+	protected override async Task When() {
+		await Get(SubscriptionPath + "/0",
+			"",
+			contentType,
+			_admin);
+	}
+
+	[Test]
+	public void returns_bad_request() {
+		Assert.AreEqual(HttpStatusCode.BadRequest, _lastResponse.StatusCode);
+	}
+}
+
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_getting_messages_from_a_subscription_with_count_more_than_100(string contentType) : with_subscription_having_events {
+	protected override async Task When() {
+		await Get(SubscriptionPath + "/101",
+			"",
+			contentType,
+			_admin);
+	}
+
+	[Test]
+	public void returns_bad_request() {
+		Assert.AreEqual(HttpStatusCode.BadRequest, _lastResponse.StatusCode);
+	}
+}
+
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_getting_messages_from_a_subscription_with_count_not_an_integer(string contentType) : with_subscription_having_events {
+	protected override Task When() {
+		return Get(SubscriptionPath + "/10.1",
+			"",
+			contentType,
+			_admin);
+	}
+
+	[Test]
+	public void returns_bad_request() {
+		Assert.AreEqual(HttpStatusCode.BadRequest, _lastResponse.StatusCode);
+	}
+}
+
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_getting_messages_from_a_subscription_with_count_not_a_number(string contentType) : with_subscription_having_events {
+	protected override Task When() {
+		return Get(SubscriptionPath + "/one",
+			"",
+			contentType,
+			_admin);
+	}
+
+	[Test]
+	public void returns_bad_request() {
+		Assert.AreEqual(HttpStatusCode.BadRequest, _lastResponse.StatusCode);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/PersistentSubscription/nack.cs b/src/KurrentDB.Core.Tests/Http/PersistentSubscription/nack.cs
new file mode 100644
index 00000000000..de5b8471075
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/PersistentSubscription/nack.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using KurrentDB.Transport.Http;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+using HttpStatusCode = System.Net.HttpStatusCode;
+
+// ReSharper disable InconsistentNaming
+
+namespace KurrentDB.Core.Tests.Http.PersistentSubscription;
+
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_nacking_a_message(string contentType) : with_subscription_having_events {
+	private HttpResponseMessage _response;
+	private string _nackLink;
+
+	protected override async Task Given() {
+		await base.Given();
+		var json = await GetJson<JObject>(
+			SubscriptionPath + "/1",
+			contentType,
+			_admin);
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+		Assert.DoesNotThrow(() => {
+			_nackLink = json["entries"].Children().First()["links"].Children()
+				.First(x => x.Value<string>("relation") == "nack").Value<string>("uri");
+		});
+	}
+
+	protected override async Task When() {
+		_response = await MakePost(_nackLink, _admin);
+	}
+
+	[Test]
+	public void returns_accepted() {
+		Assert.AreEqual(HttpStatusCode.Accepted, _response.StatusCode);
+	}
+}
+
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_nacking_messages(string contentType) : with_subscription_having_events {
+	private HttpResponseMessage _response;
+	private string _nackAllLink;
+
+	protected override async Task Given() {
+		await base.Given();
+		var json = await GetJson<JObject>(
+			SubscriptionPath + "/" + Events.Count,
+			contentType,
+			_admin);
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+		Assert.DoesNotThrow(() => {
+			_nackAllLink = json["links"].Children().First(x => x.Value<string>("relation") == "nackAll")
+				.Value<string>("uri");
+		});
+	}
+
+	protected override async Task When() {
+		_response = await MakePost(_nackAllLink, _admin);
+	}
+
+	[Test]
+	public void returns_accepted() {
+		Assert.AreEqual(HttpStatusCode.Accepted, _response.StatusCode);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/PersistentSubscription/parked.cs b/src/KurrentDB.Core.Tests/Http/PersistentSubscription/parked.cs
new file mode 100644
index 00000000000..9e5c2b1dcd4
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/PersistentSubscription/parked.cs
@@ -0,0 +1,347 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Transport.Http;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+using HttpStatusCode = System.Net.HttpStatusCode;
+
+namespace KurrentDB.Core.Tests.Http.PersistentSubscription;
+
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_parking_a_message(string contentType) : with_subscription_having_events {
+	private string _nackLink;
+	private Guid _eventIdToPark;
+	private Guid _parkedEventId;
+	private List<JToken> _entries;
+	private readonly TaskCompletionSource<bool> _eventParked = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+	protected override async Task Given() {
+		NumberOfEventsToCreate = 1;
+		await base.Given();
+		var json = await GetJson<JObject>(
+			SubscriptionPath + "/1",
+			extra: "embed=rich",
+			accept: contentType,
+			credentials: _admin);
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+		Assert.DoesNotThrow(() => {
+			_entries = json != null ? json["entries"].ToList() : new List<JToken>();
+			_nackLink = _entries[0]["links"][3]["uri"].ToString() + "?action=park";
+			_eventIdToPark = Guid.Parse(_entries[0]["eventId"].ToString());
+		});
+	}
+
+	protected override async Task When() {
+		var parkedStreamId = String.Format("$persistentsubscription-{0}::{1}-parked", TestStreamName, GroupName);
+
+		await _connection.SubscribeToStreamAsync(parkedStreamId, true, (x, y) => {
+			_parkedEventId = y.Event.EventId;
+			_eventParked.TrySetResult(true);
+			return Task.CompletedTask;
+		},
+			(x, y, z) => { },
+			DefaultData.AdminCredentials);
+
+		var response = await MakePost(_nackLink, _admin);
+		Assert.AreEqual(HttpStatusCode.Accepted, response.StatusCode);
+	}
+
+	[Test]
+	public async Task should_have_parked_the_event() {
+		await _eventParked.Task.WithTimeout(5000);
+		Assert.AreEqual(_eventIdToPark, _parkedEventId);
+	}
+}
+
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_replaying_one_all_parked_message(string contentType) : with_subscription_having_events {
+	private string _nackLink;
+	private Guid _eventIdToPark;
+	private Guid _receivedEventId;
+
+	private string _subscriptionParkedStream;
+	private Guid _writeCorrelationId;
+	private TaskCompletionSource<bool> _eventParked = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+	protected override async Task Given() {
+		_connection.Close();
+		_connection.Dispose();
+		NumberOfEventsToCreate = 1;
+		await base.Given();
+
+		_subscriptionParkedStream =
+			"$persistentsubscription-" + TestStream.Substring(9) + "::" + GroupName + "-parked";
+
+		// Subscribe to the writes to ensure the parked message has been written
+		_node.Node.MainBus.Subscribe(new AdHocHandler<StorageMessage.WritePrepares>(Handle));
+		_node.Node.MainBus.Subscribe(new AdHocHandler<StorageMessage.CommitIndexed>(Handle));
+
+		var json = await GetJson<JObject>(
+			SubscriptionPath + "/1",
+			extra: "embed=rich",
+			accept: contentType,
+			credentials: _admin);
+
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+
+		var _entries = json != null ? json["entries"].ToList() : new List<JToken>();
+		_nackLink = _entries[0]["links"][3]["uri"].ToString() + "?action=park";
+		_eventIdToPark = Guid.Parse(_entries[0]["eventId"].ToString());
+
+		//Park the message
+		var response = await MakePost(_nackLink, _admin);
+		Assert.AreEqual(HttpStatusCode.Accepted, response.StatusCode);
+	}
+
+	private void Handle(StorageMessage.WritePrepares msg) {
+		if (msg.EventStreamId == _subscriptionParkedStream) {
+			_writeCorrelationId = msg.CorrelationId;
+		}
+	}
+
+	private void Handle(StorageMessage.CommitIndexed msg) {
+		if (msg.CorrelationId == _writeCorrelationId) {
+			_eventParked.TrySetResult(true);
+		}
+	}
+
+	protected override async Task When() {
+		await _eventParked.Task.WithTimeout(10000);
+
+		var response = await MakePost(SubscriptionPath + "/replayParked", _admin);
+		Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+
+		for (var i = 0; i < 10; i++) {
+			var json = await GetJson<JObject>(
+				SubscriptionPath + "/1",
+				extra: "embed=rich",
+				accept: contentType,
+				credentials: _admin);
+
+			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+
+			var entries = json != null ? json["entries"].ToList() : new List<JToken>();
+			if (entries.Count != 0) {
+				_receivedEventId = Guid.Parse(entries[0]["eventId"].ToString());
+				break;
+			}
+
+			Console.WriteLine("Received no entries. Attempt {0} of 10", i + 1);
+			await Task.Delay(TimeSpan.FromSeconds(1));
+		}
+	}
+
+	[Test]
+	public void should_receive_the_replayed_event() {
+		Assert.AreEqual(_eventIdToPark, _receivedEventId);
+	}
+}
+
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_replaying_multiple_all_parked_messages(string contentType) : with_subscription_having_events {
+	private List<Guid> _parkedEventIds = new List<Guid>();
+	private List<Guid> _receivedEventId = new List<Guid>();
+
+	private string _subscriptionParkedStream;
+	private ConcurrentDictionary<Guid, bool> _writeCorrelationId = new ConcurrentDictionary<Guid, bool>();
+	private TaskCompletionSource<bool> _eventParked = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+	protected override async Task Given() {
+		_connection.Close();
+		_connection.Dispose();
+		NumberOfEventsToCreate = 3;
+		await base.Given();
+
+		_subscriptionParkedStream =
+			"$persistentsubscription-" + TestStream.Substring(9) + "::" + GroupName + "-parked";
+
+		// Subscribe to the writes to ensure the parked message has been written
+		_node.Node.MainBus.Subscribe(new AdHocHandler<StorageMessage.WritePrepares>(Handle));
+		_node.Node.MainBus.Subscribe(new AdHocHandler<StorageMessage.CommitIndexed>(Handle));
+
+		// park 3 events
+		for (int i = 0; i < NumberOfEventsToCreate; i++) {
+			for (var attempt = 0; attempt < 10; attempt++) {
+				var json = await GetJson<JObject>(
+					SubscriptionPath + "/1",
+					extra: "embed=rich",
+					accept: contentType,
+					credentials: _admin);
+
+				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+
+				var entries = json != null ? json["entries"].ToList() : new List<JToken>();
+				if (entries.Count == 1) {
+					//Park the message
+					_parkedEventIds.Add(Guid.Parse(entries[0]["eventId"].ToString()));
+					var nackLink = entries[0]["links"][3]["uri"] + "?action=park";
+					var response = await MakePost(nackLink, _admin);
+					Assert.AreEqual(HttpStatusCode.Accepted, response.StatusCode);
+					break;
+				}
+
+				Console.WriteLine("Received no entries. Attempt {0} of 10", attempt + 1);
+				await Task.Delay(TimeSpan.FromSeconds(1));
+			}
+		}
+	}
+
+	private void Handle(StorageMessage.WritePrepares msg) {
+		if (msg.EventStreamId == _subscriptionParkedStream) {
+			_writeCorrelationId.TryAdd(msg.CorrelationId, true);
+		}
+	}
+
+	private void Handle(StorageMessage.CommitIndexed msg) {
+		if (_writeCorrelationId.TryUpdate(msg.CorrelationId, false, true) && _writeCorrelationId.Count(kvp => !kvp.Value) == NumberOfEventsToCreate) {
+			_eventParked.TrySetResult(true);
+		}
+	}
+
+	protected override async Task When() {
+		await _eventParked.Task.WithTimeout(10000);
+
+		// replay all
+		var response = await MakePost(SubscriptionPath + "/replayParked", _admin);
+		Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+
+		for (int i = 0; i < NumberOfEventsToCreate; i++) {
+			for (var attempt = 0; attempt < 10; attempt++) {
+				var json = await GetJson<JObject>(
+					SubscriptionPath + "/1",
+					extra: "embed=rich",
+					accept: contentType,
+					credentials: _admin);
+
+				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+
+				var entries = json != null ? json["entries"].ToList() : new List<JToken>();
+				if (entries.Count == 1) {
+					_receivedEventId.Add(Guid.Parse(entries[0]["eventId"].ToString()));
+					break;
+				}
+
+				Console.WriteLine("Received no entries. Attempt {0} of 10", attempt + 1);
+				await Task.Delay(TimeSpan.FromSeconds(1));
+			}
+		}
+	}
+
+	[Test]
+	public void should_receive_the_replayed_event() {
+		Assert.AreEqual(_parkedEventIds[0], _receivedEventId[0]);
+		Assert.AreEqual(_parkedEventIds[1], _receivedEventId[1]);
+		Assert.AreEqual(_parkedEventIds[2], _receivedEventId[2]);
+	}
+}
+
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_replaying_multiple_some_parked_messages(string contentType) : with_subscription_having_events {
+	private List<Guid> _parkedEventIds = new List<Guid>();
+	private List<Guid> _receivedEventId = new List<Guid>();
+
+	private string _subscriptionParkedStream;
+	private ConcurrentDictionary<Guid, bool> _writeCorrelationId = new ConcurrentDictionary<Guid, bool>();
+	private TaskCompletionSource<bool> _eventParked = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+	protected override async Task Given() {
+		_connection.Close();
+		_connection.Dispose();
+		NumberOfEventsToCreate = 3;
+		await base.Given();
+
+		_subscriptionParkedStream =
+			"$persistentsubscription-" + TestStream.Substring(9) + "::" + GroupName + "-parked";
+
+		// Subscribe to the writes to ensure the parked message has been written
+		_node.Node.MainBus.Subscribe(new AdHocHandler<StorageMessage.WritePrepares>(Handle));
+		_node.Node.MainBus.Subscribe(new AdHocHandler<StorageMessage.CommitIndexed>(Handle));
+
+		// park 3 events
+		for (int i = 0; i < NumberOfEventsToCreate; i++) {
+			for (var attempt = 0; attempt < 10; attempt++) {
+				var json = await GetJson<JObject>(
+					SubscriptionPath + "/1",
+					extra: "embed=rich",
+					accept: contentType,
+					credentials: _admin);
+
+				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+
+				var entries = json != null ? json["entries"].ToList() : new List<JToken>();
+				if (entries.Count == 1) {
+					//Park the message
+					_parkedEventIds.Add(Guid.Parse(entries[0]["eventId"].ToString()));
+					var nackLink = entries[0]["links"][3]["uri"] + "?action=park";
+					var response = await MakePost(nackLink, _admin);
+					Assert.AreEqual(HttpStatusCode.Accepted, response.StatusCode);
+					break;
+				}
+
+				Console.WriteLine("Received no entries. Attempt {0} of 10", attempt + 1);
+				await Task.Delay(TimeSpan.FromSeconds(1));
+			}
+		}
+	}
+
+	private void Handle(StorageMessage.WritePrepares msg) {
+		if (msg.EventStreamId == _subscriptionParkedStream) {
+			_writeCorrelationId.TryAdd(msg.CorrelationId, true);
+		}
+	}
+
+	private void Handle(StorageMessage.CommitIndexed msg) {
+		if (_writeCorrelationId.TryUpdate(msg.CorrelationId, false, true) && _writeCorrelationId.Count(kvp => !kvp.Value) == NumberOfEventsToCreate) {
+			_eventParked.TrySetResult(true);
+		}
+	}
+
+	protected override async Task When() {
+		await _eventParked.Task.WithTimeout(10000);
+
+		// only replay 2 of the 3 messages
+		var response = await MakePost(SubscriptionPath + "/replayParked", _admin, "stopAt=2");
+		Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+
+		for (int i = 0; i < 2; i++) {
+			for (var attempt = 0; attempt < 10; attempt++) {
+				var json = await GetJson<JObject>(
+					SubscriptionPath + "/1",
+					extra: "embed=rich",
+					accept: contentType,
+					credentials: _admin);
+
+				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+
+				var entries = json != null ? json["entries"].ToList() : new List<JToken>();
+				if (entries.Count == 1) {
+					_receivedEventId.Add(Guid.Parse(entries[0]["eventId"].ToString()));
+					break;
+				}
+
+				Console.WriteLine("Received no entries. Attempt {0} of 10", attempt + 1);
+				await Task.Delay(TimeSpan.FromSeconds(1));
+			}
+		}
+	}
+
+	[Test]
+	public void should_receive_the_replayed_event() {
+		Assert.AreEqual(2, _receivedEventId.Count);
+		Assert.AreEqual(3, _parkedEventIds.Count);
+		Assert.AreEqual(_parkedEventIds[0], _receivedEventId[0]);
+		Assert.AreEqual(_parkedEventIds[1], _receivedEventId[1]);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/PersistentSubscription/statistics.cs b/src/KurrentDB.Core.Tests/Http/PersistentSubscription/statistics.cs
new file mode 100644
index 00000000000..13997f4ae6a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/PersistentSubscription/statistics.cs
@@ -0,0 +1,600 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Http.Users.users;
+using KurrentDB.Transport.Http;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+using HttpStatusCode = System.Net.HttpStatusCode;
+
+namespace KurrentDB.Core.Tests.Http.PersistentSubscription;
+
+[Category("LongRunning")]
+[TestFixture]
+class when_getting_statistics_for_new_subscription_for_stream_with_existing_events : with_subscription_having_events {
+	private JArray _json;
+
+	protected override async Task When() {
+		_json = await GetJson<JArray>("/subscriptions", accept: ContentType.Json);
+	}
+
+	[Test]
+	[Retry(5)]
+	public void returns_ok() {
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+	}
+
+	[Test]
+	[Retry(5)]
+	public void should_reflect_the_known_number_of_events_in_the_stream() {
+		var knownNumberOfEvents = _json[0]["lastKnownEventNumber"].Value<int>() + 1;
+		Assert.AreEqual(Events.Count, knownNumberOfEvents,
+			"Expected the subscription statistics to know about {0} events but seeing {1}", Events.Count,
+			knownNumberOfEvents);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(ContentType.CompetingJson)]
+[TestFixture(ContentType.LegacyCompetingJson)]
+class when_getting_statistics_for_subscription_with_parked_events(string contentType) : with_subscription_having_events {
+	private string _nackLink;
+	private JObject _json;
+	private string _streamName;
+
+	private string _subscriptionParkedStream;
+	private Guid _writeCorrelationId;
+	private TaskCompletionSource<bool> _eventParked = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+	protected override async Task Given() {
+		_connection.Close();
+		_connection.Dispose();
+		NumberOfEventsToCreate = 1;
+		await base.Given();
+
+		_streamName = TestStream.Substring(9);
+		_subscriptionParkedStream =
+			"$persistentsubscription-" + _streamName + "::" + GroupName + "-parked";
+
+		// Subscribe to the writes to ensure the parked message has been written
+		_node.Node.MainBus.Subscribe(new AdHocHandler<StorageMessage.WritePrepares>(Handle));
+		_node.Node.MainBus.Subscribe(new AdHocHandler<StorageMessage.CommitIndexed>(Handle));
+
+		var json = await GetJson<JObject>(
+			SubscriptionPath + "/1",
+			extra: "embed=rich",
+			accept: contentType,
+			credentials: _admin);
+
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+		Assert.DoesNotThrow(() => {
+			var _entries = json != null ? json["entries"].ToList() : new List<JToken>();
+			_nackLink = _entries[0]["links"][3]["uri"] + "?action=park";
+		});
+
+		//Park the message
+		var response = await MakePost(_nackLink, _admin);
+		Assert.AreEqual(HttpStatusCode.Accepted, response.StatusCode);
+	}
+
+	private void Handle(StorageMessage.WritePrepares msg) {
+		if (msg.EventStreamId == _subscriptionParkedStream) {
+			_writeCorrelationId = msg.CorrelationId;
+		}
+	}
+
+	private void Handle(StorageMessage.CommitIndexed msg) {
+		if (msg.CorrelationId == _writeCorrelationId) {
+			_eventParked.TrySetResult(true);
+		}
+	}
+
+	protected override async Task When() {
+		await _eventParked.Task.WithTimeout();
+		_json = await GetJson<JObject>("/subscriptions/" + _streamName + "/" + GroupName + "/info", ContentType.Json);
+	}
+
+	[Test]
+	[Retry(5)]
+	public void should_show_one_parked_message() {
+		Assert.AreEqual(1, _json["parkedMessageCount"].Value<int>());
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture]
+class when_getting_all_statistics_in_json : with_subscription_having_events {
+	private JArray _json;
+
+	protected override async Task When() {
+		_json = await GetJson<JArray>("/subscriptions", accept: ContentType.Json);
+	}
+
+	[Test]
+	[Retry(5)]
+	public void returns_ok() {
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+	}
+
+	[Test]
+	[Retry(5)]
+	public void body_contains_valid_json() {
+		Assert.AreEqual(TestStreamName, _json[0]["eventStreamId"].Value<string>());
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture]
+class when_getting_all_statistics_in_xml : with_subscription_having_events {
+	private XDocument _xml;
+
+	protected override async Task When() {
+		_xml = await GetXml(MakeUrl("/subscriptions"));
+	}
+
+	[Test]
+	[Retry(5)]
+	public void returns_ok() {
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+	}
+
+	[Test]
+	[Retry(5)]
+	public void body_contains_valid_xml() {
+		Assert.AreEqual(TestStreamName, _xml.Descendants("EventStreamId").First().Value);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture]
+class when_getting_non_existent_single_statistics : with_admin_user {
+	private HttpResponseMessage _response;
+
+	protected override Task Given() => Task.CompletedTask;
+
+	protected override async Task When() {
+		var request = CreateRequest("/subscriptions/fu/fubar", null, "GET", ContentType.Xml);
+		_response = await GetRequestResponse(request);
+	}
+
+	[Test]
+	[Retry(5)]
+	public void returns_not_found() {
+		Assert.AreEqual(HttpStatusCode.NotFound, _response.StatusCode);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture]
+class when_getting_non_existent_stream_statistics : with_admin_user {
+	private HttpResponseMessage _response;
+
+	protected override Task Given() => Task.CompletedTask;
+
+	protected override async Task When() {
+		var request = CreateRequest("/subscriptions/fubar", null, "GET", ContentType.Xml, null);
+		_response = await GetRequestResponse(request);
+	}
+
+	[Test]
+	[Retry(5)]
+	public void returns_not_found() {
+		Assert.AreEqual(HttpStatusCode.NotFound, _response.StatusCode);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture]
+class when_getting_subscription_statistics_for_individual : SpecificationWithPersistentSubscriptionAndConnections {
+	private JObject _json;
+
+
+	protected override async Task When() {
+		_json = await GetJson<JObject>("/subscriptions/" + _streamName + "/" + _groupName + "/info", ContentType.Json);
+	}
+
+	[Test]
+	[Retry(5)]
+	public void returns_ok() {
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+	}
+
+	[Test]
+	[Retry(5)]
+	public void detail_rel_href_is_correct() {
+		Assert.AreEqual(
+			string.Format("http://{0}/subscriptions/{1}/{2}/info", _node.HttpEndPoint, _streamName, _groupName),
+			_json["links"][0]["href"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void has_two_rel_links() {
+		Assert.AreEqual(2,
+			_json["links"].Count());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_view_detail_rel_is_correct() {
+		Assert.AreEqual("detail",
+			_json["links"][0]["rel"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_event_stream_is_correct() {
+		Assert.AreEqual(_streamName, _json["eventStreamId"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_groupname_is_correct() {
+		Assert.AreEqual(_groupName, _json["groupName"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_status_is_live() {
+		Assert.AreEqual("Live", _json["status"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void there_are_two_connections() {
+		Assert.AreEqual(2, _json["connections"].Count());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_first_connection_has_endpoint() {
+		Assert.IsNotNull(_json["connections"][0]["from"]);
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_second_connection_has_endpoint() {
+		Assert.IsNotNull(_json["connections"][1]["from"]);
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_first_connection_has_user() {
+		Assert.AreEqual("admin", _json["connections"][0]["username"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_second_connection_has_user() {
+		Assert.AreEqual("admin", _json["connections"][1]["username"].Value<string>());
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture]
+class when_getting_subscription_stats_summary : SpecificationWithPersistentSubscriptionAndConnections {
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent();
+
+	private JArray _json;
+
+	protected override async Task Given() {
+		await base.Given();
+		await _conn.CreatePersistentSubscriptionAsync(_streamName, "secondgroup", _settings,
+			DefaultData.AdminCredentials);
+		_conn.ConnectToPersistentSubscription(_streamName, "secondgroup",
+			(subscription, @event) => {
+				Console.WriteLine();
+				return Task.CompletedTask;
+			},
+			(subscription, reason, arg3) => Console.WriteLine(),
+			DefaultData.AdminCredentials);
+		_conn.ConnectToPersistentSubscription(_streamName, "secondgroup",
+			(subscription, @event) => {
+				Console.WriteLine();
+				return Task.CompletedTask;
+			},
+			(subscription, reason, arg3) => Console.WriteLine(),
+			DefaultData.AdminCredentials);
+		_conn.ConnectToPersistentSubscription(_streamName, "secondgroup",
+			(subscription, @event) => {
+				Console.WriteLine();
+				return Task.CompletedTask;
+			},
+			(subscription, reason, arg3) => Console.WriteLine(),
+			DefaultData.AdminCredentials);
+	}
+
+	protected override async Task When() {
+		_json = await GetJson<JArray>("/subscriptions", ContentType.Json);
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_response_code_is_ok() {
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_first_event_stream_is_correct() {
+		Assert.AreEqual(_streamName, _json[0]["eventStreamId"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_first_groupname_is_correct() {
+		Assert.AreEqual(_groupName, _json[0]["groupName"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_first_event_stream_detail_uri_is_correct() {
+		Assert.AreEqual(
+			string.Format("http://{0}/subscriptions/{1}/{2}/info", _node.HttpEndPoint, _streamName, _groupName),
+			_json[0]["links"][0]["href"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_first_event_stream_detail_has_one_link() {
+		Assert.AreEqual(1,
+			_json[0]["links"].Count());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_first_event_stream_detail_rel_is_correct() {
+		Assert.AreEqual("detail",
+			_json[0]["links"][0]["rel"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_second_event_stream_detail_uri_is_correct() {
+		Assert.AreEqual(
+			string.Format("http://{0}/subscriptions/{1}/{2}/info", _node.HttpEndPoint, _streamName,
+				"secondgroup"),
+			_json[1]["links"][0]["href"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_second_event_stream_detail_has_one_link() {
+		Assert.AreEqual(1,
+			_json[1]["links"].Count());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_second_event_stream_detail_rel_is_correct() {
+		Assert.AreEqual("detail",
+			_json[1]["links"][0]["rel"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_first_parked_message_queue_uri_is_correct() {
+		Assert.AreEqual(
+			string.Format("http://{0}/streams/%24persistentsubscription-{1}::{2}-parked", _node.HttpEndPoint,
+				_streamName, _groupName), _json[0]["parkedMessageUri"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_second_parked_message_queue_uri_is_correct() {
+		Assert.AreEqual(
+			string.Format("http://{0}/streams/%24persistentsubscription-{1}::{2}-parked", _node.HttpEndPoint,
+				_streamName, "secondgroup"), _json[1]["parkedMessageUri"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_status_is_live() {
+		Assert.AreEqual("Live", _json[0]["status"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void there_are_two_connections() {
+		Assert.AreEqual(2, _json[0]["connectionCount"].Value<int>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_second_subscription_event_stream_is_correct() {
+		Assert.AreEqual(_streamName, _json[1]["eventStreamId"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_second_subscription_groupname_is_correct() {
+		Assert.AreEqual("secondgroup", _json[1]["groupName"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void second_subscription_there_are_three_connections() {
+		Assert.AreEqual(3, _json[1]["connectionCount"].Value<int>());
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture]
+class when_getting_subscription_statistics_for_stream : SpecificationWithPersistentSubscriptionAndConnections {
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent();
+
+	private JArray _json;
+	private EventStorePersistentSubscriptionBase _sub4;
+	private EventStorePersistentSubscriptionBase _sub3;
+	private EventStorePersistentSubscriptionBase _sub5;
+
+	protected override async Task Given() {
+		await base.Given();
+		await _conn.CreatePersistentSubscriptionAsync(_streamName, "secondgroup", _settings,
+			DefaultData.AdminCredentials);
+		_sub3 = _conn.ConnectToPersistentSubscription(_streamName, "secondgroup",
+			(subscription, @event) => {
+				Console.WriteLine();
+				return Task.CompletedTask;
+			},
+			(subscription, reason, arg3) => Console.WriteLine(), DefaultData.AdminCredentials);
+		_sub4 = _conn.ConnectToPersistentSubscription(_streamName, "secondgroup",
+			(subscription, @event) => {
+				Console.WriteLine();
+				return Task.CompletedTask;
+			},
+			(subscription, reason, arg3) => Console.WriteLine(),
+			DefaultData.AdminCredentials);
+		_sub5 = _conn.ConnectToPersistentSubscription(_streamName, "secondgroup",
+			(subscription, @event) => {
+				Console.WriteLine();
+				return Task.CompletedTask;
+			},
+			(subscription, reason, arg3) => Console.WriteLine(),
+			DefaultData.AdminCredentials);
+	}
+
+	protected override async Task When() {
+		//make mcs stop bitching
+		Console.WriteLine(_sub3);
+		Console.WriteLine(_sub4);
+		Console.WriteLine(_sub5);
+		_json = await GetJson<JArray>("/subscriptions/" + _streamName, ContentType.Json);
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_response_code_is_ok() {
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_first_event_stream_is_correct() {
+		Assert.AreEqual(_streamName, _json[0]["eventStreamId"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_first_groupname_is_correct() {
+		Assert.AreEqual(_groupName, _json[0]["groupName"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_first_event_stream_detail_uri_is_correct() {
+		Assert.AreEqual(
+			string.Format("http://{0}/subscriptions/{1}/{2}/info", _node.HttpEndPoint, _streamName, _groupName),
+			_json[0]["links"][0]["href"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_second_event_stream_detail_uri_is_correct() {
+		Assert.AreEqual(
+			string.Format("http://{0}/subscriptions/{1}/{2}/info", _node.HttpEndPoint, _streamName,
+				"secondgroup"),
+			_json[1]["links"][0]["href"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_first_parked_message_queue_uri_is_correct() {
+		Assert.AreEqual(
+			string.Format("http://{0}/streams/%24persistentsubscription-{1}::{2}-parked", _node.HttpEndPoint,
+				_streamName, _groupName), _json[0]["parkedMessageUri"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_second_parked_message_queue_uri_is_correct() {
+		Assert.AreEqual(
+			string.Format("http://{0}/streams/%24persistentsubscription-{1}::{2}-parked", _node.HttpEndPoint,
+				_streamName, "secondgroup"), _json[1]["parkedMessageUri"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_status_is_live() {
+		Assert.AreEqual("Live", _json[0]["status"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void there_are_two_connections() {
+		Assert.AreEqual(2, _json[0]["connectionCount"].Value<int>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_second_subscription_event_stream_is_correct() {
+		Assert.AreEqual(_streamName, _json[1]["eventStreamId"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void the_second_subscription_groupname_is_correct() {
+		Assert.AreEqual("secondgroup", _json[1]["groupName"].Value<string>());
+	}
+
+	[Test]
+	[Retry(5)]
+	public void second_subscription_there_are_three_connections() {
+		Assert.AreEqual(3, _json[1]["connectionCount"].Value<int>());
+	}
+}
+
+public abstract class SpecificationWithPersistentSubscriptionAndConnections : with_admin_user {
+	protected string _streamName = Guid.NewGuid().ToString();
+	protected string _groupName = Guid.NewGuid().ToString();
+	protected IEventStoreConnection _conn;
+	protected EventStorePersistentSubscriptionBase _sub1;
+	protected EventStorePersistentSubscriptionBase _sub2;
+
+	private readonly PersistentSubscriptionSettings _settings = PersistentSubscriptionSettings.Create()
+		.DoNotResolveLinkTos()
+		.StartFromCurrent();
+
+	protected override async Task Given() {
+		_conn = EventStoreConnection.Create(ConnectionSettings.Create().DisableServerCertificateValidation().Build(),
+			_node.TcpEndPoint);
+		await _conn.ConnectAsync();
+		await _conn.CreatePersistentSubscriptionAsync(_streamName, _groupName, _settings,
+			DefaultData.AdminCredentials);
+		_sub1 = _conn.ConnectToPersistentSubscription(_streamName, _groupName,
+			(subscription, @event) => {
+				Console.WriteLine();
+				return Task.CompletedTask;
+			},
+			(subscription, reason, arg3) => Console.WriteLine(), DefaultData.AdminCredentials);
+		_sub2 = _conn.ConnectToPersistentSubscription(_streamName, _groupName,
+			(subscription, @event) => {
+				Console.WriteLine();
+				return Task.CompletedTask;
+			},
+			(subscription, reason, arg3) => Console.WriteLine(),
+			DefaultData.AdminCredentials);
+	}
+
+	protected override Task When() => Task.CompletedTask;
+
+	[OneTimeTearDown]
+	public async Task Teardown() {
+		await _conn.DeletePersistentSubscriptionAsync(_streamName, _groupName, DefaultData.AdminCredentials);
+		_conn.Close();
+		_conn.Dispose();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/PersistentSubscription/updating.cs b/src/KurrentDB.Core.Tests/Http/PersistentSubscription/updating.cs
new file mode 100644
index 00000000000..956d9bbd1d7
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/PersistentSubscription/updating.cs
@@ -0,0 +1,121 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Tests.Http.Users.users;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Http.PersistentSubscription;
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+class when_updating_a_subscription_without_permissions<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
+	private HttpResponseMessage _response;
+
+	protected override async Task Given() {
+		_response = await MakeJsonPut(
+			"/subscriptions/stream/groupname337",
+			new {
+				ResolveLinkTos = true
+			}, _admin);
+	}
+
+	protected override async Task When() {
+		SetDefaultCredentials(null);
+		_response = await MakeJsonPost(
+			"/subscriptions/stream/groupname337",
+			new {
+				ResolveLinkTos = true
+			}, null);
+	}
+
+	[Test]
+	public void returns_unauthorised() {
+		Assert.AreEqual(HttpStatusCode.Unauthorized, _response.StatusCode);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+class when_updating_a_non_existent_subscription_without_permissions<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
+	private HttpResponseMessage _response;
+
+	protected override Task Given() => Task.CompletedTask;
+
+	protected override async Task When() {
+		_response = await MakeJsonPost(
+			"/subscriptions/stream/groupname3337",
+			new {
+				ResolveLinkTos = true
+			}, new NetworkCredential("admin", "changeit"));
+	}
+
+	[Test]
+	public void returns_not_found() {
+		Assert.AreEqual(HttpStatusCode.NotFound, _response.StatusCode);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+class when_updating_an_existing_subscription<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
+	private HttpResponseMessage _response;
+	private readonly string _groupName = Guid.NewGuid().ToString();
+	private SubscriptionDropReason _droppedReason;
+	private Exception _exception;
+	private const string _stream = "stream";
+	private AutoResetEvent _dropped = new AutoResetEvent(false);
+
+	protected override async Task Given() {
+		_response = await MakeJsonPut(
+			string.Format("/subscriptions/{0}/{1}", _stream, _groupName),
+			new {
+				ResolveLinkTos = true
+			}, DefaultData.AdminNetworkCredentials);
+		SetupSubscription();
+	}
+
+	private void SetupSubscription() {
+		_connection.ConnectToPersistentSubscription(_stream, _groupName, (x, y) => Task.CompletedTask,
+			(sub, reason, ex) => {
+				_droppedReason = reason;
+				_exception = ex;
+				_dropped.Set();
+			}, DefaultData.AdminCredentials);
+	}
+
+	protected override async Task When() {
+		_response = await MakeJsonPost(
+			string.Format("/subscriptions/{0}/{1}", _stream, _groupName),
+			new {
+				ResolveLinkTos = true
+			}, DefaultData.AdminNetworkCredentials);
+	}
+
+	[Test]
+	public void returns_ok() {
+		Assert.AreEqual(HttpStatusCode.OK, _response.StatusCode);
+	}
+
+	[Test]
+	public void existing_subscriptions_are_dropped() {
+		Assert.IsTrue(_dropped.WaitOne(TimeSpan.FromSeconds(5)));
+		Assert.AreEqual(SubscriptionDropReason.UserInitiated, _droppedReason);
+		Assert.IsNull(_exception);
+	}
+
+	[Test]
+	public void location_header_is_present() {
+		Assert.AreEqual(
+			string.Format("http://{0}/subscriptions/{1}/{2}", _node.HttpEndPoint, _stream, _groupName),
+			_response.Headers.Location.ToString());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/StreamSecurity/SpecificationWithUsers.cs b/src/KurrentDB.Core.Tests/Http/StreamSecurity/SpecificationWithUsers.cs
new file mode 100644
index 00000000000..b4e3b68739d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/StreamSecurity/SpecificationWithUsers.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Tests.Helpers;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Http.StreamSecurity;
+
+abstract class SpecificationWithUsers<TLogFormat, TStreamId>
+	: HttpBehaviorSpecification<TLogFormat, TStreamId> {
+	protected override async Task Given() {
+		await PostUser("user1", "User 1", "user1!", "other");
+		await PostUser("user2", "User 2", "user2!", "other");
+		await PostUser("guest", "Guest", "guest!");
+	}
+
+	protected readonly NetworkCredential _admin = DefaultData.AdminNetworkCredentials;
+
+	protected override MiniNode<TLogFormat, TStreamId> CreateMiniNode() {
+		return new MiniNode<TLogFormat, TStreamId>(PathName,
+			enableTrustedAuth: true);
+	}
+
+	protected async Task PostUser(string login, string userFullName, string password, params string[] groups) {
+		var response = await MakeJsonPost(
+			"/users/", new { LoginName = login + Tag, FullName = userFullName, Groups = groups, Password = password },
+			_admin);
+		Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
+	}
+
+	protected async Task<string> PostMetadata(StreamMetadata metadata) {
+		var response = await MakeArrayEventsPost(
+			TestMetadataStream, new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = metadata } });
+		Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
+		return response.Headers.GetLocationAsString();
+	}
+
+	protected async Task<string> PostEvent(int i) {
+		var response = await MakeArrayEventsPost(
+			TestStream, new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = new { Number = i } } });
+		Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
+		return response.Headers.GetLocationAsString();
+	}
+
+	protected Task<HttpResponseMessage> PostEvent<T>(T data, NetworkCredential credentials = null) {
+		return MakeArrayEventsPost(
+			TestStream, new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = data } }, credentials);
+	}
+
+	protected string GetLink(JObject feed, string relation) {
+		var rel = (from JObject link in feed["links"]
+				   from JProperty attr in link
+				   where attr.Name == "relation" && (string)attr.Value == relation
+				   select link).SingleOrDefault();
+		return (rel == null) ? null : (string)rel["uri"];
+	}
+
+	protected NetworkCredential GetCorrectCredentialsFor(string user) {
+		return new NetworkCredential(user + Tag, user + "!");
+	}
+}
diff --git a/src/EventStore.Core.Tests/Http/StreamSecurity/stream_access.cs b/src/KurrentDB.Core.Tests/Http/StreamSecurity/stream_access.cs
similarity index 77%
rename from src/EventStore.Core.Tests/Http/StreamSecurity/stream_access.cs
rename to src/KurrentDB.Core.Tests/Http/StreamSecurity/stream_access.cs
index 726241e66ee..d5dba472e1b 100644
--- a/src/EventStore.Core.Tests/Http/StreamSecurity/stream_access.cs
+++ b/src/KurrentDB.Core.Tests/Http/StreamSecurity/stream_access.cs
@@ -1,16 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
 using EventStore.ClientAPI;
-using EventStore.Common.Utils;
-using EventStore.Core.Services;
-using EventStore.Core.Tests.Http.Users;
-using NUnit.Framework;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Services;
 using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+using ContentType = KurrentDB.Transport.Http.ContentType;
 
-namespace EventStore.Core.Tests.Http.StreamSecurity {
+namespace KurrentDB.Core.Tests.Http.StreamSecurity {
 	namespace stream_access {
 		[Category("LongRunning")]
 		[TestFixture(typeof(LogFormat.V2), typeof(string))]
@@ -56,16 +59,18 @@ public async Task accepts_post_event_as_authorized_user() {
 			}
 
 			[Test]
-			public async Task accepts_post_event_as_authorized_user_by_trusted_auth() {
+			[TestCase(SystemHeaders.TrustedAuth)]
+			[TestCase(SystemHeaders.LegacyTrustedAuth)]
+			public async Task accepts_post_event_as_authorized_user_by_trusted_auth(string trustedAuthHeader) {
 				var uri = MakeUrl(TestStream);
 
 				var request = new HttpRequestMessage(HttpMethod.Post, uri) {
-					Headers = { { "ES-TrustedAuth", "root; admin, other" } },
+					Headers = { { trustedAuthHeader, "root; admin, other" } },
 					Content = new ByteArrayContent(
 						new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = new { Some = "Data" } } }
 							.ToJsonBytes()) {
 						Headers = {
-							ContentType = MediaTypeHeaderValue.Parse("application/vnd.eventstore.events+json")
+							ContentType = MediaTypeHeaderValue.Parse(ContentType.EventsJson)
 						}
 					}
 				};
diff --git a/src/KurrentDB.Core.Tests/Http/Streams/HttpSpecificationWithLinkToToDeletedEvents.cs b/src/KurrentDB.Core.Tests/Http/Streams/HttpSpecificationWithLinkToToDeletedEvents.cs
new file mode 100644
index 00000000000..385e8e1163f
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/Streams/HttpSpecificationWithLinkToToDeletedEvents.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Common;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+
+namespace KurrentDB.Core.Tests.Http.Streams;
+
+public abstract class HttpSpecificationWithLinkToToDeletedEvents : HttpBehaviorSpecification {
+	protected string LinkedStreamName;
+	protected string DeletedStreamName;
+
+	protected override async Task Given() {
+		var creds = DefaultData.AdminCredentials;
+		LinkedStreamName = Guid.NewGuid().ToString();
+		DeletedStreamName = Guid.NewGuid().ToString();
+		using (var conn = TestConnection.Create(_node.TcpEndPoint)) {
+			await conn.ConnectAsync();
+			await conn.AppendToStreamAsync(DeletedStreamName, ExpectedVersion.Any, creds,
+					new EventData(Guid.NewGuid(), "testing", true, Encoding.UTF8.GetBytes("{'foo' : 4}"),
+						new byte[0]))
+;
+			await conn.AppendToStreamAsync(LinkedStreamName, ExpectedVersion.Any, creds,
+				new EventData(Guid.NewGuid(), SystemEventTypes.LinkTo, false,
+					Encoding.UTF8.GetBytes("0@" + DeletedStreamName), new byte[0]));
+			await conn.DeleteStreamAsync(DeletedStreamName, ExpectedVersion.Any);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/Streams/HttpSpecificationWithLinkToToEvents.cs b/src/KurrentDB.Core.Tests/Http/Streams/HttpSpecificationWithLinkToToEvents.cs
new file mode 100644
index 00000000000..c25d93d92e3
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/Streams/HttpSpecificationWithLinkToToEvents.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Common;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+
+namespace KurrentDB.Core.Tests.Http.Streams;
+
+public abstract class HttpSpecificationWithLinkToToEvents : HttpBehaviorSpecification {
+	protected string LinkedStreamName;
+	protected string StreamName;
+	protected string Stream2Name;
+
+	protected override async Task Given() {
+		var creds = DefaultData.AdminCredentials;
+		LinkedStreamName = Guid.NewGuid().ToString();
+		StreamName = Guid.NewGuid().ToString();
+		Stream2Name = Guid.NewGuid().ToString();
+		using (var conn = TestConnection.Create(_node.TcpEndPoint)) {
+			await conn.ConnectAsync();
+			await conn.AppendToStreamAsync(StreamName, ExpectedVersion.Any, creds,
+					new EventData(Guid.NewGuid(), "testing", true, Encoding.UTF8.GetBytes("{'foo' : 4}"),
+						new byte[0]));
+			await conn.AppendToStreamAsync(StreamName, ExpectedVersion.Any, creds,
+					new EventData(Guid.NewGuid(), "testing", true, Encoding.UTF8.GetBytes("{'foo' : 4}"),
+						new byte[0]));
+			await conn.AppendToStreamAsync(Stream2Name, ExpectedVersion.Any, creds,
+				new EventData(Guid.NewGuid(), "testing", true, Encoding.UTF8.GetBytes("{'foo' : 4}"),
+					new byte[0]));
+			await conn.AppendToStreamAsync(LinkedStreamName, ExpectedVersion.Any, creds,
+				new EventData(Guid.NewGuid(), SystemEventTypes.LinkTo, false,
+					Encoding.UTF8.GetBytes("0@" + Stream2Name), new byte[0]));
+			await conn.AppendToStreamAsync(LinkedStreamName, ExpectedVersion.Any, creds,
+				new EventData(Guid.NewGuid(), SystemEventTypes.LinkTo, false,
+					Encoding.UTF8.GetBytes("1@" + StreamName), new byte[0]));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/Streams/SpecificationWithLinkToToMaxCountDeletedEvents.cs b/src/KurrentDB.Core.Tests/Http/Streams/SpecificationWithLinkToToMaxCountDeletedEvents.cs
new file mode 100644
index 00000000000..9512c814765
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/Streams/SpecificationWithLinkToToMaxCountDeletedEvents.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Common;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+
+namespace KurrentDB.Core.Tests.Http.Streams;
+
+public abstract class SpecificationWithLinkToToMaxCountDeletedEvents : HttpBehaviorSpecification {
+	protected string LinkedStreamName;
+	protected string DeletedStreamName;
+
+	protected override async Task Given() {
+		var creds = DefaultData.AdminCredentials;
+		DeletedStreamName = Guid.NewGuid().ToString();
+		LinkedStreamName = Guid.NewGuid().ToString();
+		using (var conn = TestConnection.Create(_node.TcpEndPoint)) {
+			await conn.ConnectAsync();
+			await conn.AppendToStreamAsync(DeletedStreamName, ExpectedVersion.Any, creds,
+					new EventData(Guid.NewGuid(), "testing1", true, Encoding.UTF8.GetBytes("{'foo' : 4}"),
+						new byte[0]));
+			await conn.SetStreamMetadataAsync(DeletedStreamName, ExpectedVersion.Any,
+				new StreamMetadata(2, null, null, null, null));
+			await conn.AppendToStreamAsync(DeletedStreamName, ExpectedVersion.Any, creds,
+					new EventData(Guid.NewGuid(), "testing2", true, Encoding.UTF8.GetBytes("{'foo' : 4}"),
+						new byte[0]));
+			await conn.AppendToStreamAsync(DeletedStreamName, ExpectedVersion.Any, creds,
+					new EventData(Guid.NewGuid(), "testing3", true, Encoding.UTF8.GetBytes("{'foo' : 4}"),
+						new byte[0]));
+			await conn.AppendToStreamAsync(LinkedStreamName, ExpectedVersion.Any, creds,
+				new EventData(Guid.NewGuid(), SystemEventTypes.LinkTo, false,
+					Encoding.UTF8.GetBytes("0@" + DeletedStreamName), new byte[0]));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/Streams/XDocumentAtomExtensions.cs b/src/KurrentDB.Core.Tests/Http/Streams/XDocumentAtomExtensions.cs
new file mode 100644
index 00000000000..fbff0fbf2b4
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/Streams/XDocumentAtomExtensions.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Xml.Linq;
+
+namespace KurrentDB.Core.Tests.Http.Streams;
+
+internal static class XDocumentAtomExtensions {
+	internal static readonly XNamespace AtomNamespace = "http://www.w3.org/2005/Atom";
+
+	public static XElement[] GetEntries(this XDocument self) {
+		var feed = self.Element(AtomNamespace + "feed");
+		if (feed == null)
+			return new XElement[0];
+
+		return feed.Elements(AtomNamespace + "entry").ToArray();
+	}
+
+	public static XElement GetEntry(this XDocument self) {
+		return self.Element(AtomNamespace + "entry");
+	}
+
+	public static string GetLink(this XElement self, string rel) {
+		var matchingLinks = self.Elements(AtomNamespace + "link")
+			.Where(e => e.Attribute("rel").Value == rel)
+			.ToArray();
+
+		if (matchingLinks.Length > 1)
+			throw new ArgumentException("Multiple links found with rel '" + rel + "'", rel);
+		if (matchingLinks.Length == 0)
+			throw new ArgumentException("No link found with rel '" + rel + "'", rel);
+
+		return matchingLinks[0].Attribute("href").Value;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/Streams/append_to_stream.cs b/src/KurrentDB.Core.Tests/Http/Streams/append_to_stream.cs
new file mode 100644
index 00000000000..fa571165e4e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/Streams/append_to_stream.cs
@@ -0,0 +1,644 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests.Http.Users.users;
+using KurrentDB.Transport.Http;
+using Microsoft.Extensions.Primitives;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+using HttpStatusCode = System.Net.HttpStatusCode;
+
+namespace KurrentDB.Core.Tests.Http.Streams {
+	namespace append_to_stream {
+		public abstract class ExpectedVersionSpecification : ExpectedVersionSpecification<LogFormat.V2, string>;
+
+		public abstract class ExpectedVersionSpecification<TLogFormat, TStreamId> : with_admin_user<TLogFormat, TStreamId> {
+			public string WrongExpectedVersionDesc {
+				get { return "Wrong expected EventNumber"; }
+			}
+
+			public string DeletedStreamDesc {
+				get { return "Stream deleted"; }
+			}
+
+			public Task<HttpResponseMessage> PostEventWithExpectedVersion(long expectedVersion, string expectedVersionHeader = SystemHeaders.ExpectedVersion) {
+				var request = CreateRequest(TestStream, "", "POST", ContentType.Json);
+				request.Headers.Add(SystemHeaders.EventType, "SomeType");
+				request.Headers.Add(expectedVersionHeader, expectedVersion.ToString());
+				request.Headers.Add(SystemHeaders.EventId, Guid.NewGuid().ToString());
+				var data = Encoding.UTF8.GetBytes("{a : \"1\", b:\"3\", c:\"5\" }");
+				request.Content = new ByteArrayContent(data) {
+					Headers = { ContentType = new MediaTypeHeaderValue(ContentType.Json) }
+				};
+				return GetRequestResponse(request);
+			}
+
+			public Task TombstoneTestStream() {
+				var deleteRequest = CreateRequest(TestStream, "", "DELETE", ContentType.Json);
+				deleteRequest.Headers.Add(SystemHeaders.ExpectedVersion, ExpectedVersion.Any.ToString());
+				deleteRequest.Headers.Add(SystemHeaders.HardDelete, bool.TrueString);
+				return GetRequestResponse(deleteRequest);
+			}
+
+			public Task SoftDeleteTestStream() {
+				var deleteRequest = CreateRequest(TestMetadataStream, "", "POST", ContentType.Json);
+				deleteRequest.Headers.Add(SystemHeaders.EventType, SystemEventTypes.StreamMetadata);
+				deleteRequest.Headers.Add(SystemHeaders.ExpectedVersion, ExpectedVersion.Any.ToString());
+				deleteRequest.Headers.Add(SystemHeaders.EventId, Guid.NewGuid().ToString());
+				deleteRequest.Content = new ByteArrayContent(StreamMetadata
+					.Create(truncateBefore: long.MaxValue)
+					.AsJsonBytes()) {
+					Headers = { ContentType = new MediaTypeHeaderValue(ContentType.Json) }
+				};
+				return GetRequestResponse(deleteRequest);
+			}
+
+			public async Task<List<JToken>> GetTestStream() {
+				var stream = await GetJson<JObject>(TestStream + "/0/forward/10", accept: ContentType.Json);
+				return stream != null ? stream["entries"].ToList() : new List<JToken>();
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(-2, HttpStatusCode.Created)]
+		[TestFixture(2, HttpStatusCode.Created)]
+		[TestFixture(3, HttpStatusCode.BadRequest)]
+		public class should_support_legacy_expected_version_header(int expectedVersion, HttpStatusCode expectedResult) : ExpectedVersionSpecification {
+			private HttpResponseMessage _response;
+			private List<JToken> _read;
+
+			protected override async Task Given() {
+				for (var i = 0; i < 3; i++) {
+					await PostEventWithExpectedVersion(ExpectedVersion.Any);
+				}
+			}
+
+			protected override async Task When() {
+				_response = await PostEventWithExpectedVersion(expectedVersion, SystemHeaders.LegacyExpectedVersion);
+				_read = await GetTestStream();
+			}
+
+			[Test]
+			public void should_return_the_correct_status_code() {
+				Assert.AreEqual(expectedResult, _response.StatusCode);
+			}
+
+			[Test]
+			public void should_append_event_to_stream_if_created() {
+				if (expectedResult == HttpStatusCode.Created)
+					Assert.AreEqual(4, _read.Count);
+				else
+					Assert.AreEqual(3, _read.Count);
+			}
+		}
+
+		[TestFixture(SystemHeaders.EventId)]
+		[TestFixture(SystemHeaders.LegacyEventId)]
+		class should_support_legacy_event_id_header(string eventIdHeader) : ExpectedVersionSpecification {
+			private HttpResponseMessage _response;
+			private string _eventId = Guid.NewGuid().ToString();
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				var request = CreateRawJsonPostRequest(TestStream, "POST", new { A = "1" });
+				request.Headers.Add(eventIdHeader, _eventId);
+				request.Headers.Add(SystemHeaders.EventType, "event-type");
+				_response = await GetRequestResponse(request);
+			}
+
+			[Test]
+			public void returns_created_status_code() {
+				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+			}
+
+			[Test]
+			public async Task created_event_uses_event_id() {
+				var stream = await GetJson<JObject>(TestStream + "/0/forward/10", accept: ContentType.Json, extra: "?embed=body");
+				var read = stream["entries"]?.ToList();
+				Assert.AreEqual(_eventId, read?[0].Value<string>("eventId"));
+			}
+		}
+
+		[TestFixture(SystemHeaders.EventType)]
+		[TestFixture(SystemHeaders.LegacyEventType)]
+		class should_support_legacy_event_type_header(string eventTypeHeader) : ExpectedVersionSpecification {
+			private HttpResponseMessage _response;
+			private string _eventType = "event-type";
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				var request = CreateRawJsonPostRequest(TestStream, "POST", new { A = "1" });
+				request.Headers.Add(SystemHeaders.EventId, Guid.NewGuid().ToString());
+				request.Headers.Add(eventTypeHeader, _eventType);
+				_response = await GetRequestResponse(request);
+			}
+
+			[Test]
+			public void returns_created_status_code() {
+				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+			}
+
+			[Test]
+			public async Task created_event_uses_event_type() {
+				var stream = await GetJson<JObject>(TestStream + "/0/forward/10", accept: ContentType.Json, extra: "?embed=body");
+				var read = stream["entries"]?.ToList();
+				Assert.AreEqual(_eventType, read?[0].Value<string>("eventType"));
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(SystemHeaders.HardDelete)]
+		[TestFixture(SystemHeaders.LegacyHardDelete)]
+		public class should_support_legacy_hard_delete_header(string hardDeleteHeader) : ExpectedVersionSpecification<LogFormat.V2, string> {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				var deleteRequest = CreateRequest(TestStream, "", "DELETE", ContentType.Json);
+				deleteRequest.Headers.Add(SystemHeaders.ExpectedVersion, ExpectedVersion.Any.ToString());
+				deleteRequest.Headers.Add(hardDeleteHeader, bool.TrueString);
+				var response = await GetRequestResponse(deleteRequest);
+				Assert.AreEqual(HttpStatusCode.NoContent, response.StatusCode);
+
+				_response = await PostEventWithExpectedVersion(ExpectedVersion.Any);
+			}
+
+			[Test]
+			public void should_return_gone_status_code() {
+				Assert.AreEqual(HttpStatusCode.Gone, _response.StatusCode);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		public class
+			should_create_stream_with_no_stream_exp_ver_on_first_write_if_does_not_exist<TLogFormat, TStreamId> :
+				ExpectedVersionSpecification<TLogFormat, TStreamId> {
+			private HttpResponseMessage _response;
+			private List<JToken> _read;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				_response = await PostEventWithExpectedVersion(ExpectedVersion.NoStream);
+				_read = await GetTestStream();
+			}
+
+			[Test]
+			public void should_return_created_status_code() {
+				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+			}
+
+			[Test]
+			public void should_create_stream() {
+				Assert.AreEqual(1, _read.Count);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		public class should_fail_appending_with_no_stream_exp_ver_to_existing_stream<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
+			private HttpResponseMessage _response;
+			private List<JToken> _read;
+
+			protected override Task Given() {
+				return PostEventWithExpectedVersion(ExpectedVersion.Any);
+			}
+
+			protected override async Task When() {
+				_response = await PostEventWithExpectedVersion(ExpectedVersion.NoStream);
+				_read = await GetTestStream();
+			}
+
+			[Test]
+			public void should_return_bad_request_with_wrong_expected_version() {
+				Assert.AreEqual(HttpStatusCode.BadRequest, _response.StatusCode);
+			}
+
+			[Test]
+			public void should_return_the_current_version_in_the_header() {
+				Assert.AreEqual("0",
+					new StringValues(_response.Headers.GetValues(SystemHeaders.CurrentVersion).ToArray()));
+			}
+
+			[Test]
+			public void should_return_the_current_version_in_the_legacy_header() {
+				Assert.AreEqual("0",
+					new StringValues(_response.Headers.GetValues(SystemHeaders.LegacyCurrentVersion).ToArray()));
+			}
+
+			[Test]
+			public void should_not_append_to_stream() {
+				Assert.AreEqual(1, _read.Count);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		public class
+			should_create_stream_with_any_exp_ver_on_first_write_if_does_not_exist<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
+			private HttpResponseMessage _response;
+			private List<JToken> _read;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				_response = await PostEventWithExpectedVersion(ExpectedVersion.Any);
+				_read = await GetTestStream();
+			}
+
+			[Test]
+			public void should_return_created_status_code() {
+				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+			}
+
+			[Test]
+			public void should_create_stream() {
+				Assert.AreEqual(1, _read.Count);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		public class should_append_with_any_exp_ver_to_existing_stream<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
+			private HttpResponseMessage _response;
+			private List<JToken> _read;
+
+			protected override async Task Given() {
+				for (var i = 0; i < 3; i++) {
+					await PostEventWithExpectedVersion(ExpectedVersion.Any);
+				}
+			}
+
+			protected override async Task When() {
+				_response = await PostEventWithExpectedVersion(ExpectedVersion.Any);
+				_read = await GetTestStream();
+			}
+
+			[Test]
+			public void should_return_created_status_code() {
+				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+			}
+
+			[Test]
+			public void should_append_event_to_stream() {
+				Assert.AreEqual(4, _read.Count);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		public class should_fail_appending_with_any_exp_ver_to_deleted_stream<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() {
+				return TombstoneTestStream();
+			}
+
+			protected override async Task When() {
+				_response = await PostEventWithExpectedVersion(ExpectedVersion.Any);
+			}
+
+			[Test]
+			public void should_return_gone_status_code() {
+				Assert.AreEqual(HttpStatusCode.Gone, _response.StatusCode);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		public class should_append_with_correct_exp_ver_to_existing_stream<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
+			private HttpResponseMessage _response;
+			private List<JToken> _read;
+
+			protected override async Task Given() {
+				for (var i = 0; i < 3; i++) {
+					await PostEventWithExpectedVersion(ExpectedVersion.Any);
+				}
+			}
+
+			protected override async Task When() {
+				_response = await PostEventWithExpectedVersion(2);
+				_read = await GetTestStream();
+			}
+
+			[Test]
+			public void should_return_created_status_code() {
+				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+			}
+
+			[Test]
+			public void should_append_event_to_stream() {
+				Assert.AreEqual(4, _read.Count);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		public class should_fail_appending_with_wrong_exp_ver_to_existing_stream<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
+			private HttpResponseMessage _response;
+			private List<JToken> _read;
+
+			protected override async Task Given() {
+				for (var i = 0; i < 2; i++) {
+					await PostEventWithExpectedVersion(ExpectedVersion.Any);
+				}
+			}
+
+			protected override async Task When() {
+				_response = await PostEventWithExpectedVersion(4);
+				_read = await GetTestStream();
+			}
+
+			[Test]
+			public void should_return_bad_request_with_wrong_expected_version() {
+				Assert.AreEqual(HttpStatusCode.BadRequest, _response.StatusCode);
+			}
+
+			[Test]
+			public void should_return_the_current_version_in_the_header() {
+				Assert.AreEqual("1",
+					new StringValues(_response.Headers.GetValues(SystemHeaders.CurrentVersion).ToArray()));
+			}
+
+			[Test]
+			public void should_return_the_current_version_in_the_legacy_header() {
+				Assert.AreEqual("1",
+					new StringValues(_response.Headers.GetValues(SystemHeaders.LegacyCurrentVersion).ToArray()));
+			}
+
+			[Test]
+			public void should_not_append_event() {
+				Assert.AreEqual(2, _read.Count);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		public class should_fail_appending_with_wrong_exp_ver_to_new_stream<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
+			private HttpResponseMessage _response;
+			private List<JToken> _read;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				_response = await PostEventWithExpectedVersion(1);
+				_read = await GetTestStream();
+			}
+
+			[Test]
+			public void should_return_bad_request_with_wrong_expected_version() {
+				Assert.AreEqual(HttpStatusCode.BadRequest, _response.StatusCode);
+			}
+
+			[Test]
+			public void should_return_the_current_version_in_the_header() {
+				Assert.AreEqual("-1",
+					new StringValues(_response.Headers.GetValues(SystemHeaders.CurrentVersion).ToArray()));
+			}
+
+			[Test]
+			public void should_return_the_current_version_in_the_legacy_header() {
+				Assert.AreEqual("-1",
+					new StringValues(_response.Headers.GetValues(SystemHeaders.LegacyCurrentVersion).ToArray()));
+			}
+
+			[Test]
+			public void should_not_append_to_stream() {
+				Assert.AreEqual(0, _read.Count);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		public class should_fail_appending_with_correct_exp_ver_to_deleted_stream<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() {
+				return TombstoneTestStream();
+			}
+
+			protected override async Task When() {
+				_response = await PostEventWithExpectedVersion(ExpectedVersion.NoStream);
+			}
+
+			[Test]
+			public void should_return_gone_status_code() {
+				Assert.AreEqual(HttpStatusCode.Gone, _response.StatusCode);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		public class should_fail_appending_with_invalid_exp_ver_to_deleted_stream<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() {
+				return TombstoneTestStream();
+			}
+
+			protected override async Task When() {
+				_response = await PostEventWithExpectedVersion(5);
+			}
+
+			[Test]
+			public void should_return_gone_status_code() {
+				Assert.AreEqual(HttpStatusCode.Gone, _response.StatusCode);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		public class should_append_with_stream_exists_exp_ver_to_existing_stream<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
+			private HttpResponseMessage _response;
+			private List<JToken> _read;
+
+			protected override Task Given() {
+				return PostEventWithExpectedVersion(ExpectedVersion.Any);
+			}
+
+			protected override async Task When() {
+				_response = await PostEventWithExpectedVersion(ExpectedVersion.StreamExists);
+				_read = await GetTestStream();
+			}
+
+			[Test]
+			public void should_return_created_status_code() {
+				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+			}
+
+			[Test]
+			public void should_append_event_to_stream() {
+				Assert.AreEqual(2, _read.Count);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		public class
+			should_append_with_stream_exists_exp_ver_to_stream_with_multiple_events<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
+			private HttpResponseMessage _response;
+			private List<JToken> _read;
+
+			protected override async Task Given() {
+				for (var i = 0; i < 2; i++) {
+					await PostEventWithExpectedVersion(ExpectedVersion.Any);
+				}
+			}
+
+			protected override async Task When() {
+				_response = await PostEventWithExpectedVersion(ExpectedVersion.StreamExists);
+				_read = await GetTestStream();
+			}
+
+			[Test]
+			public void should_return_created_status_code() {
+				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+			}
+
+			[Test]
+			public void should_append_event_to_stream() {
+				Assert.AreEqual(3, _read.Count);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		public class should_append_with_stream_exists_exp_ver_if_metadata_stream_exists<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
+			private HttpResponseMessage _response;
+			private List<JToken> _read;
+
+			protected override async Task Given() {
+				var request = CreateRequest(TestMetadataStream, "", "POST", ContentType.Json);
+				request.Headers.Add(SystemHeaders.EventType, "$user-created");
+				request.Headers.Add(SystemHeaders.ExpectedVersion, ExpectedVersion.Any.ToString());
+				request.Headers.Add(SystemHeaders.EventId, Guid.NewGuid().ToString());
+				var data = Encoding.UTF8.GetBytes("{a : \"1\", b:\"3\", c:\"5\" }");
+				request.Content = new ByteArrayContent(data) {
+					Headers = { ContentType = new MediaTypeHeaderValue(ContentType.Json) }
+				};
+				await GetRequestResponse(request);
+			}
+
+			protected override async Task When() {
+				_response = await PostEventWithExpectedVersion(ExpectedVersion.StreamExists);
+				_read = await GetTestStream();
+			}
+
+			[Test]
+			public void should_return_created_status_code() {
+				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+			}
+
+			[Test]
+			public void should_append_event_to_stream() {
+				Assert.AreEqual(1, _read.Count);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		public class
+			should_fail_appending_with_stream_exists_exp_ver_and_stream_does_not_exist<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
+			private HttpResponseMessage _response;
+			private List<JToken> _read;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				_response = await PostEventWithExpectedVersion(ExpectedVersion.StreamExists);
+				_read = await GetTestStream();
+			}
+
+			[Test]
+			public void should_return_bad_request_with_wrong_expected_version() {
+				Assert.AreEqual(HttpStatusCode.BadRequest, _response.StatusCode);
+			}
+
+
+			[Test]
+			public void should_return_the_current_version_in_the_header() {
+				Assert.AreEqual("-1",
+					new StringValues(_response.Headers.GetValues(SystemHeaders.CurrentVersion).ToArray()));
+			}
+
+			[Test]
+			public void should_return_the_current_version_in_the_legacy_header() {
+				Assert.AreEqual("-1",
+					new StringValues(_response.Headers.GetValues(SystemHeaders.LegacyCurrentVersion).ToArray()));
+			}
+
+			[Test]
+			public void should_not_append_event_to_stream() {
+				Assert.AreEqual(0, _read.Count);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		public class
+			should_fail_appending_with_stream_exists_exp_ver_to_hard_deleted_stream<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() {
+				return TombstoneTestStream();
+			}
+
+			protected override async Task When() {
+				_response = await PostEventWithExpectedVersion(ExpectedVersion.StreamExists);
+			}
+
+			[Test]
+			public void should_return_gone_status_code() {
+				Assert.AreEqual(HttpStatusCode.Gone, _response.StatusCode);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		public class
+			should_fail_appending_with_stream_exists_exp_ver_to_soft_deleted_stream<TLogFormat, TStreamId> : ExpectedVersionSpecification<TLogFormat, TStreamId> {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() {
+				return SoftDeleteTestStream();
+			}
+
+			protected override async Task When() {
+				_response = await PostEventWithExpectedVersion(ExpectedVersion.StreamExists);
+			}
+
+			[Test]
+			public void should_return_gone_status_code() {
+				Assert.AreEqual(HttpStatusCode.Gone, _response.StatusCode);
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/Streams/basic.cs b/src/KurrentDB.Core.Tests/Http/Streams/basic.cs
new file mode 100644
index 00000000000..47845c564e7
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/Streams/basic.cs
@@ -0,0 +1,770 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Specialized;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Tests.Http.Users.users;
+using KurrentDB.Transport.Http;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+using HttpMethod = KurrentDB.Transport.Http.HttpMethod;
+using HttpStatusCode = System.Net.HttpStatusCode;
+
+namespace KurrentDB.Core.Tests.Http.Streams {
+	namespace basic {
+		[Category("LongRunning")]
+		[TestFixture(ContentType.AtomJson)]
+		[TestFixture(ContentType.LegacyAtomJson)]
+		public class when_requesting_a_single_event_in_the_stream_as_atom_json(string contentType) : HttpBehaviorSpecificationWithSingleEvent {
+			private JObject _json;
+
+			protected override async Task When() {
+				_json = await GetJson<JObject>(TestStream + "/0", accept: contentType);
+			}
+
+			[Test]
+			public void request_succeeds() {
+				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+			}
+
+			[Test]
+			public void returns_correct_body() {
+				HelperExtensions.AssertJson(new { Content = new { Data = new { A = "1" } } }, _json);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture]
+		public class when_requesting_a_single_event_in_the_stream_as_atom_xml : HttpBehaviorSpecificationWithSingleEvent {
+			private XDocument document;
+
+			protected override async Task When() {
+				await Get(TestStream + "/0", "", accept: ContentType.Atom);
+				document = XDocument.Parse(_lastResponseBody);
+			}
+
+			[Test]
+			public void request_succeeds() {
+				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+			}
+
+			[Test]
+			public void returns_correct_body() {
+				var val = document.GetEntry()
+					.Elements(XDocumentAtomExtensions.AtomNamespace + "content").First()
+					.Element("data")
+					.Element("a").Value;
+				Assert.AreEqual(val, "1");
+			}
+		}
+
+		[TestFixture]
+		public class when_posting_an_event_as_raw_json_without_event_type : with_admin_user {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				_response = await MakeJsonPost(
+					TestStream,
+					new { A = "1", B = "3", C = "5" });
+			}
+
+			[Test]
+			public void returns_bad_request_status_code() {
+				Assert.AreEqual(HttpStatusCode.BadRequest, _response.StatusCode);
+			}
+		}
+
+		[TestFixture(ContentType.EventsJson)]
+		[TestFixture(ContentType.LegacyEventsJson)]
+		public class when_posting_an_event_to_idempotent_uri_as_events_array(string contentType) : with_admin_user {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				_response = await MakeArrayEventsPost(
+					TestStream + "/incoming/" + Guid.NewGuid().ToString(),
+					new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = new { A = "1" } } },
+					contentType: contentType);
+			}
+
+			[Test]
+			public void returns_bad_request_status_code() {
+				Assert.AreEqual(HttpStatusCode.UnsupportedMediaType, _response.StatusCode);
+			}
+		}
+
+		[TestFixture]
+		public class when_posting_an_event_as_json_to_idempotent_uri_without_event_type : with_admin_user {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				_response = await MakeJsonPost(
+					TestStream + "/incoming/" + Guid.NewGuid().ToString(),
+					new { A = "1", B = "3", C = "5" });
+			}
+
+			[Test]
+			public void returns_bad_request_status_code() {
+				Assert.AreEqual(HttpStatusCode.BadRequest, _response.StatusCode);
+			}
+		}
+
+		[TestFixture]
+		public class when_posting_an_event_in_json_to_idempotent_uri_without_event_id : with_admin_user {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				var request = CreateRequest(TestStream + "/incoming/" + Guid.NewGuid(), "", "POST",
+					ContentType.Json);
+				request.Headers.Add(SystemHeaders.EventType, "SomeType");
+				var data = "{a : \"1\", b:\"3\", c:\"5\" }";
+				var bytes = Encoding.UTF8.GetBytes(data);
+				request.Content = new ByteArrayContent(bytes) {
+					Headers = { ContentType = new MediaTypeHeaderValue(ContentType.Json) }
+				};
+				_response = await GetRequestResponse(request);
+			}
+
+			[Test]
+			public void returns_created_status_code() {
+				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+			}
+
+			[Test]
+			public void returns_a_location_header() {
+				Assert.That(!string.IsNullOrEmpty(_response.Headers.GetLocationAsString()));
+			}
+
+			[Test]
+			public async Task returns_a_location_header_that_can_be_read_as_json() {
+				var json = await GetJson<JObject>(_response.Headers.GetLocationAsString());
+				HelperExtensions.AssertJson(new { a = "1", b = "3", c = "5" }, json);
+			}
+		}
+
+		[TestFixture]
+		public class when_posting_an_event_as_raw_json_without_event_id : with_admin_user {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				var request = CreateRequest(TestStream, "", "POST", ContentType.Json);
+				request.Headers.Add(SystemHeaders.EventType, "SomeType");
+				var data = "{A : \"1\", B:\"3\", C:\"5\" }";
+				var bytes = Encoding.UTF8.GetBytes(data);
+				request.Content = new ByteArrayContent(bytes) {
+					Headers = { ContentType = new MediaTypeHeaderValue(ContentType.Json) }
+				};
+				_response = await GetRequestResponse(request);
+			}
+
+			[Test]
+			public void returns_redirectkeepverb_status_code() {
+				Assert.AreEqual(HttpStatusCode.RedirectKeepVerb, _response.StatusCode);
+			}
+
+			[Test]
+			public void returns_a_location_header() {
+				Assert.That(!string.IsNullOrEmpty(_response.Headers.GetLocationAsString()));
+			}
+
+			[Test]
+			public void returns_a_to_incoming() {
+				Assert.IsTrue(_response.Headers.GetLocationAsString().Contains("/incoming/"));
+			}
+		}
+
+		[TestFixture(ContentType.EventsJson)]
+		[TestFixture(ContentType.LegacyEventsJson)]
+		public class when_posting_an_event_as_array_with_no_event_type(string contentType) : with_admin_user {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				_response = await MakeArrayEventsPost(
+					TestStream,
+					new[] { new { EventId = Guid.NewGuid(), Data = new { A = "1" } } },
+					contentType: contentType);
+			}
+
+			[Test]
+			public void returns_bad_request_status_code() {
+				Assert.AreEqual(HttpStatusCode.BadRequest, _response.StatusCode);
+			}
+		}
+
+		[TestFixture(ContentType.EventsJson)]
+		[TestFixture(ContentType.LegacyEventsJson)]
+		public class when_posting_an_event_as_array(string contentType) : with_admin_user {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				_response = await MakeArrayEventsPost(
+					TestStream,
+					new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = new { A = "1" } } },
+					contentType: contentType);
+			}
+
+			[Test]
+			public void returns_created_status_code() {
+				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+			}
+
+			[Test]
+			public void returns_a_location_header() {
+				Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
+			}
+
+			[Test]
+			public async Task returns_a_location_header_that_can_be_read_as_json() {
+				var json = await GetJson<JObject>(_response.Headers.GetLocationAsString());
+				HelperExtensions.AssertJson(new { A = "1" }, json);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(ContentType.EventsJson)]
+		[TestFixture(ContentType.LegacyEventJson)]
+		public class when_posting_an_event_as_array_to_stream_with_slash(string contentType) : with_admin_user {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				var request = CreateRequest(TestStream + "/", "", "POST", contentType, null);
+				request.Content = new ByteArrayContent(new[]
+					{new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {A = "1"}}}.ToJsonBytes()) {
+					Headers = { ContentType = new MediaTypeHeaderValue(contentType) }
+				};
+				_response = await _client.SendAsync(request);
+			}
+
+			[Test]
+			public void returns_permanent_redirect() {
+				Assert.AreEqual(HttpStatusCode.RedirectKeepVerb, _response.StatusCode);
+			}
+
+			[Test]
+			public void redirect_is_cacheable() {
+				Assert.AreEqual(CacheControlHeaderValue.Parse("max-age=31536000, public"),
+					_response.Headers.CacheControl);
+			}
+
+			[Test]
+			public void returns_a_location_header() {
+				Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
+			}
+
+			[Test]
+			public void returns_a_location_header_that_is_to_stream_without_slash() {
+				Assert.AreEqual(MakeUrl(TestStream), _response.Headers.GetLocationAsString());
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture]
+		public class when_deleting_to_stream_with_slash : with_admin_user {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				var request = CreateRequest(TestStream + "/", "", "DELETE", ContentType.Json, null);
+				_response = await _client.SendAsync(request);
+			}
+
+			[Test]
+			public void returns_permanent_redirect() {
+				Assert.AreEqual(HttpStatusCode.RedirectKeepVerb, _response.StatusCode);
+			}
+
+			[Test]
+			public void returns_a_location_header() {
+				Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
+			}
+
+			[Test]
+			public void returns_a_location_header_that_is_to_stream_without_slash() {
+				Assert.AreEqual(MakeUrl(TestStream), _response.Headers.GetLocationAsString());
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture]
+		public class when_getting_from_stream_with_slash : with_admin_user {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				var request = CreateRequest(TestStream + "/", "", "GET", ContentType.Json, null);
+				_response = await _client.SendAsync(request);
+			}
+
+			[Test]
+			public void returns_permanent_redirect() {
+				Assert.AreEqual(HttpStatusCode.RedirectKeepVerb, _response.StatusCode);
+			}
+
+			[Test]
+			public void returns_a_location_header() {
+				Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
+			}
+
+			[Test]
+			public void returns_a_location_header_that_is_to_stream_without_slash() {
+				Assert.AreEqual(MakeUrl(TestStream), _response.Headers.GetLocationAsString());
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture]
+		public class when_getting_from_all_stream_with_slash : with_admin_user {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				var request = CreateRequest("/streams/$all/", "", "GET", ContentType.Json, DefaultData.AdminNetworkCredentials);
+				_response = await _client.SendAsync(request);
+			}
+
+			[Test]
+			public void returns_permanent_redirect() {
+				Assert.AreEqual(HttpStatusCode.RedirectKeepVerb, _response.StatusCode);
+			}
+
+			[Test]
+			public void returns_a_location_header() {
+				Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
+			}
+
+			[Test]
+			public void returns_a_location_header_that_is_to_stream_without_slash() {
+				Assert.AreEqual(MakeUrl("/streams/$all"), _response.Headers.GetLocationAsString());
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture]
+		public class when_getting_from_encoded_all_stream_with_slash : with_admin_user {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				var request = CreateRequest("/streams/$all/", "", "GET", ContentType.Json, null);
+				request.Headers.Authorization = new AuthenticationHeaderValue("Basic",
+					GetAuthorizationHeader(DefaultData.AdminNetworkCredentials));
+				_response = await _client.SendAsync(request);
+			}
+
+			[Test]
+			public void returns_permanent_redirect() {
+				Assert.AreEqual(HttpStatusCode.RedirectKeepVerb, _response.StatusCode);
+			}
+
+			[Test]
+			public void returns_a_location_header() {
+				Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
+			}
+
+			[Test]
+			public void returns_a_location_header_that_is_to_stream_without_slash() {
+				Assert.AreEqual(MakeUrl("/streams/$all").ToString(), _response.Headers.GetLocationAsString());
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture]
+		public class when_posting_an_event_as_array_to_metadata_stream_with_slash : with_admin_user {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				var request = CreateRequest(TestStream + "/metadata/", "", "POST", ContentType.Json, null);
+				request.Content = new ByteArrayContent(
+					new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = new { A = "1" } } }
+						.ToJsonBytes()) {
+					Headers = { ContentType = new MediaTypeHeaderValue(ContentType.Json) }
+				};
+				_response = await _client.SendAsync(request);
+			}
+
+			[Test]
+			public void returns_permanent_redirect() {
+				Assert.AreEqual(HttpStatusCode.RedirectKeepVerb, _response.StatusCode);
+			}
+
+			[Test]
+			public void returns_a_location_header() {
+				Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
+			}
+
+			[Test]
+			public void returns_a_location_header_that_is_to_stream_without_slash() {
+				Assert.AreEqual(MakeUrl(TestStream + "/metadata"), _response.Headers.GetLocationAsString());
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture]
+		public class when_getting_from_metadata_stream_with_slash : with_admin_user {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				var request = CreateRequest(TestStream + "/metadata/", "", "GET", ContentType.Json, null);
+				request.Headers.Authorization = new AuthenticationHeaderValue("Basic",
+					GetAuthorizationHeader(DefaultData.AdminNetworkCredentials));
+				_response = await _client.SendAsync(request);
+			}
+
+			[Test]
+			public void returns_permanent_redirect() {
+				Assert.AreEqual(HttpStatusCode.RedirectKeepVerb, _response.StatusCode);
+			}
+
+			[Test]
+			public void returns_a_location_header() {
+				Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
+			}
+
+			[Test]
+			public void returns_a_location_header_that_is_to_stream_without_slash() {
+				Assert.AreEqual(MakeUrl(TestStream + "/metadata"), _response.Headers.GetLocationAsString());
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture]
+		public class when_posting_an_event_without_EventId_as_array : with_admin_user {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				_response = await MakeJsonPost(
+					TestStream,
+					new[] { new { EventType = "event-type", Data = new { A = "1" } } });
+			}
+
+			[Test]
+			public void returns_bad_request_status_code() {
+				Assert.AreEqual(HttpStatusCode.BadRequest, _response.StatusCode);
+			}
+		}
+
+		[TestFixture(ContentType.EventsJson, ContentType.AtomJson)]
+		[TestFixture(ContentType.LegacyEventsJson, ContentType.AtomJson)]
+		[TestFixture(ContentType.EventsJson, ContentType.LegacyAtomJson)]
+		[TestFixture(ContentType.LegacyEventsJson, ContentType.LegacyAtomJson)]
+		public class when_posting_an_event_with_type(string postContentType, string acceptContentType) : with_admin_user {
+			private HttpResponseMessage _response;
+			private readonly JArray _data = JArray.Parse(@"[{
+					""eventId"": ""fd0489ed-80a5-4004-ad79-1282f657ee27"",
+					""eventType"": ""TestType"",
+					""data"": {
+						""$type"": ""foo_type"",
+						""what"": {
+							""$type"": ""bar_type"",
+							""e622b9f3-ca43-4cf2-9433-8c59b2cb2d3c"": {
+								""$type"": ""baz_type"",
+								""another"": ""value""
+							}
+						}
+					},
+					""metadata"": {
+						""$type"": ""qux_type""
+					}
+				}]");
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				_response = await MakeArrayEventsPost(TestStream, _data, contentType: postContentType);
+			}
+
+			[Test]
+			public async Task the_json_data_retains_the_type() {
+				var json = await GetJson<JObject>(_response.Headers.GetLocationAsString(), extra: "embed=tryharder", accept: acceptContentType);
+				HelperExtensions.AssertJson(_data.First()["data"], JObject.Parse(json["content"]["data"].ToString()));
+			}
+
+			[Test]
+			public async Task the_metadata_retains_the_type() {
+				var json = await GetJson<JObject>(_response.Headers.GetLocationAsString(), extra: "embed=tryharder", accept: acceptContentType);
+				HelperExtensions.AssertJson(_data.First()["metadata"], JObject.Parse(json["content"]["metadata"].ToString()));
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(ContentType.EventsJson)]
+		[TestFixture(ContentType.LegacyEventsJson)]
+		public class when_posting_an_event_with_date_time(string contentType) : with_admin_user {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				_response = await MakeArrayEventsPost(
+					TestStream,
+					new[] {
+						new {
+							EventId = Guid.NewGuid(),
+							EventType = "event-type",
+							Data = new {A = "1987-11-07T00:00:00.000+01:00"}
+						},
+					},
+					contentType: contentType);
+			}
+
+			[Test]
+			public void returns_created_status_code() {
+				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+			}
+
+			[Test]
+			public void returns_a_location_header() {
+				Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
+			}
+
+			[Test]
+			public async Task the_json_data_is_not_mangled() {
+				var json = await GetJson<JObject>(_response.Headers.GetLocationAsString());
+				HelperExtensions.AssertJson(new { A = "1987-11-07T00:00:00.000+01:00" }, json);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(ContentType.EventsJson)]
+		[TestFixture(ContentType.LegacyEventsJson)]
+		public class when_posting_events_as_array(string contentType) : with_admin_user {
+			private HttpResponseMessage _response;
+
+			protected override Task Given() => Task.CompletedTask;
+
+			protected override async Task When() {
+				_response = await MakeArrayEventsPost(
+					TestStream,
+					new[] {
+						new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {A = "1"}},
+						new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {A = "2"}},
+					},
+					contentType: contentType);
+			}
+
+			[Test]
+			public void returns_created_status_code() {
+				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+			}
+
+			[Test]
+			public void returns_a_location_header() {
+				Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
+			}
+
+			[Test]
+			public async Task returns_a_location_header_for_the_first_posted_event() {
+				var json = await GetJson<JObject>(_response.Headers.GetLocationAsString());
+				HelperExtensions.AssertJson(new { A = "1" }, json);
+			}
+		}
+
+		public abstract class HttpBehaviorSpecificationWithSingleEvent : with_admin_user {
+			protected HttpResponseMessage _response;
+
+			protected override async Task Given() {
+				_response = await MakeArrayEventsPost(
+					TestStream,
+					new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = new { A = "1" } } });
+				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture]
+		public class when_requesting_a_single_event_that_is_deleted_linkto : HttpSpecificationWithLinkToToDeletedEvents {
+			protected override Task When() {
+				return Get("/streams/" + LinkedStreamName + "/0", "", ContentType.Json, credentials: DefaultData.AdminNetworkCredentials);
+			}
+
+			[Test]
+			public void the_event_is_gone() {
+				Assert.AreEqual(HttpStatusCode.NotFound, _lastResponse.StatusCode);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture]
+		public class when_requesting_a_single_event_that_is_maxcount_deleted_linkto : SpecificationWithLinkToToMaxCountDeletedEvents {
+			protected override Task When() {
+				return Get("/streams/" + LinkedStreamName + "/0", "", ContentType.Json, DefaultData.AdminNetworkCredentials);
+			}
+
+			[Test]
+			public void the_event_is_gone() {
+				Assert.AreEqual(HttpStatusCode.NotFound, _lastResponse.StatusCode);
+			}
+		}
+
+
+		[Category("LongRunning")]
+		[TestFixture]
+		public class when_requesting_a_single_event_in_the_stream_without_an_accept_header : HttpBehaviorSpecificationWithSingleEvent {
+			private XDocument _xmlDocument;
+
+			protected override async Task When() {
+				_xmlDocument = await GetXml(MakeUrl(TestStream + "/0"));
+			}
+
+			[Test]
+			public void request_succeeds() {
+				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+			}
+
+			[Test]
+			public void returns_correct_body() {
+				Assert.AreEqual("1", _xmlDocument.Element("data").Element("a").Value);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(ContentType.EventJson)]
+		[TestFixture(ContentType.LegacyEventJson)]
+		public class when_requesting_a_single_event_in_the_stream_as_events_json(string contentType) : HttpBehaviorSpecificationWithSingleEvent {
+			private JObject _json;
+
+			protected override async Task When() {
+				_json = await GetJson<JObject>(TestStream + "/0", accept: contentType);
+			}
+
+			[Test]
+			public void request_succeeds() {
+				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+			}
+
+			[Test]
+			public void returns_correct_body() {
+				HelperExtensions.AssertJson(new { Data = new { A = "1" } }, _json);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture]
+		public class when_requesting_a_single_event_in_the_stream_as_json : HttpBehaviorSpecificationWithSingleEvent {
+			private JObject _json;
+
+			protected override async Task When() {
+				_json = await GetJson<JObject>(TestStream + "/0", accept: ContentType.Json);
+			}
+
+			[Test]
+			public void request_succeeds() {
+				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+			}
+
+			[Test]
+			public void returns_correct_body() {
+				HelperExtensions.AssertJson(new { A = "1" }, _json);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(ContentType.Xml)]
+		[TestFixture(ContentType.EventXml)]
+		public class when_requesting_a_single_event_in_the_stream_as_xml(string contentType) : HttpBehaviorSpecificationWithSingleEvent {
+			protected override Task When() {
+				return Get(TestStream + "/0", "", accept: contentType);
+			}
+
+			[Test]
+			public void request_succeeds() {
+				Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+			}
+		}
+
+		[TestFixture]
+		public class when_requesting_a_single_raw_event_in_the_stream_as_raw : with_admin_user {
+			protected HttpResponseMessage _response;
+			protected byte[] _data;
+
+			protected override async Task Given() {
+				var request = CreateRequest(TestStream, String.Empty, HttpMethod.Post, ContentType.Raw);
+				request.Headers.Add(SystemHeaders.EventType, "TestEventType");
+				request.Headers.Add(SystemHeaders.EventId, Guid.NewGuid().ToString());
+				if (_data == null) {
+					var fileData = HelperExtensions.GetFilePathFromAssembly("Resources/es-tile.png");
+					_data = File.ReadAllBytes(fileData);
+				}
+				request.Content = new ByteArrayContent(_data) {
+					Headers = { ContentType = new MediaTypeHeaderValue(ContentType.Raw) }
+				};
+				_response = await GetRequestResponse(request);
+				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+			}
+
+			protected override Task When() {
+				return Get(TestStream + "/0", "", ContentType.Raw);
+			}
+
+			[Test]
+			public void returns_correct_body() {
+				Assert.AreEqual(_data, _lastResponseBytes);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(-2, HttpStatusCode.NoContent)]
+		[TestFixture(1, HttpStatusCode.NoContent)]
+		[TestFixture(2, HttpStatusCode.BadRequest)]
+		public class when_deleting_with_legacy_expected_version(int expectedVersion, HttpStatusCode expectedResult) : with_admin_user {
+			private HttpResponseMessage _response;
+
+			protected override async Task Given() {
+				var response = await MakeArrayEventsPost(
+					TestStream,
+					new[] {
+						new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {A = "1"}},
+						new {EventId = Guid.NewGuid(), EventType = "event-type", Data = new {A = "2"}},
+					},
+					contentType: ContentType.EventsJson);
+				Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
+			}
+
+			protected override async Task When() {
+				var request = CreateRequest(TestStream, "", "DELETE", ContentType.Json,
+					headers: new NameValueCollection { { SystemHeaders.LegacyExpectedVersion, expectedVersion.ToString() } });
+				_response = await _client.SendAsync(request);
+			}
+
+			[Test]
+			public void returns_the_expected_http_status_code() {
+				Assert.AreEqual(expectedResult, _response.StatusCode);
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/Streams/description_document.cs b/src/KurrentDB.Core.Tests/Http/Streams/description_document.cs
new file mode 100644
index 00000000000..95ffde91290
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/Streams/description_document.cs
@@ -0,0 +1,175 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.Http.Users.users;
+using KurrentDB.Transport.Http;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+using HttpStatusCode = System.Net.HttpStatusCode;
+
+namespace KurrentDB.Core.Tests.Http.Streams;
+
+
+[Category("LongRunning")]
+[TestFixture]
+public class when_getting_a_stream_without_accept_header : with_admin_user {
+	private JObject _descriptionDocument;
+	private List<JToken> _links;
+
+	protected override Task Given() => Task.CompletedTask;
+
+	protected override async Task When() {
+		_descriptionDocument = await GetJsonWithoutAcceptHeader<JObject>(TestStream);
+	}
+
+	[Test]
+	public void returns_not_acceptable() {
+		Assert.AreEqual(HttpStatusCode.NotAcceptable, _lastResponse.StatusCode);
+	}
+
+	[Test]
+	public void returns_a_description_document() {
+		Assert.IsNotNull(_descriptionDocument);
+		_links = _descriptionDocument != null ? _descriptionDocument["_links"].ToList() : new List<JToken>();
+		Assert.IsNotNull(_links, "Expected there to be links in the description but _links is null");
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(ContentType.DescriptionDocJson)]
+[TestFixture(ContentType.LegacyDescriptionDocJson)]
+public class when_getting_a_stream_with_description_document_media_type(string contentType) : with_admin_user {
+	private JObject _descriptionDocument;
+	private List<JToken> _links;
+
+	protected override Task Given() => Task.CompletedTask;
+
+	protected override async Task When() {
+		_descriptionDocument = await GetJson<JObject>(TestStream, contentType, null);
+	}
+
+	[Test]
+	public void returns_ok() {
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+	}
+
+	[Test]
+	public void returns_a_description_document() {
+		Assert.IsNotNull(_descriptionDocument);
+		_links = _descriptionDocument != null ? _descriptionDocument["_links"].ToList() : new List<JToken>();
+		Assert.IsNotNull(_links, "Expected there to be links in the description but _links is null");
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(ContentType.DescriptionDocJson)]
+[TestFixture(ContentType.LegacyDescriptionDocJson)]
+public class when_getting_description_document(string contentType) : with_admin_user {
+	private JObject _descriptionDocument;
+	private List<JToken> _links;
+
+	protected override Task Given() => Task.CompletedTask;
+
+	protected override async Task When() {
+		_descriptionDocument = await GetJson<JObject>(TestStream, contentType, null);
+		_links = _descriptionDocument != null ? _descriptionDocument["_links"].ToList() : new List<JToken>();
+	}
+
+	[Test]
+	public void returns_ok() {
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+	}
+
+	[Test]
+	public void returns_a_description_document() {
+		Assert.IsNotNull(_descriptionDocument);
+	}
+
+	[Test]
+	public void contains_the_self_link() {
+		Assert.AreEqual("self", ((JProperty)_links[0]).Name);
+		Assert.AreEqual(TestStream, _descriptionDocument["_links"]["self"]["href"].ToString());
+	}
+
+	[Test]
+	public void self_link_contains_only_the_description_document_content_type() {
+		var supportedContentTypes = _descriptionDocument["_links"]["self"]["supportedContentTypes"].Values<string>()
+			.ToArray();
+		Assert.AreEqual(1, supportedContentTypes.Length);
+		Assert.AreEqual(contentType, supportedContentTypes[0]);
+	}
+
+	[Test]
+	public void contains_the_stream_link() {
+		Assert.AreEqual("stream", ((JProperty)_links[1]).Name);
+		Assert.AreEqual(TestStream, _descriptionDocument["_links"]["stream"]["href"].ToString());
+	}
+
+	[Test]
+	public void stream_link_contains_supported_stream_content_types() {
+		var supportedContentTypes = _descriptionDocument["_links"]["stream"]["supportedContentTypes"]
+			.Values<string>().ToArray();
+		Assert.AreEqual(3, supportedContentTypes.Length);
+		Assert.Contains(ContentType.Atom, supportedContentTypes);
+		Assert.Contains(ContentType.AtomJson, supportedContentTypes);
+		Assert.Contains(ContentType.LegacyAtomJson, supportedContentTypes);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(ContentType.DescriptionDocJson)]
+[TestFixture(ContentType.LegacyDescriptionDocJson)]
+public class when_getting_description_document_and_subscription_exists_for_stream(string contentType) : with_admin_user {
+	private JObject _descriptionDocument;
+	private List<JToken> _links;
+	private JToken[] _subscriptions;
+	private string _subscriptionUrl;
+
+	protected override async Task Given() {
+		_subscriptionUrl = "/subscriptions/" + TestStreamName + "/groupname334";
+		await MakeJsonPut(
+			_subscriptionUrl,
+			new {
+				ResolveLinkTos = true
+			}, DefaultData.AdminNetworkCredentials);
+	}
+
+	protected override async Task When() {
+		_descriptionDocument = await GetJson<JObject>(TestStream, contentType, null);
+		_links = _descriptionDocument != null ? _descriptionDocument["_links"].ToList() : new List<JToken>();
+		_subscriptions = _descriptionDocument["_links"]["streamSubscription"].Values<JToken>().ToArray();
+	}
+
+	[Test]
+	public void returns_ok() {
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+	}
+
+	[Test]
+	public void returns_a_description_document() {
+		Assert.IsNotNull(_descriptionDocument);
+	}
+
+	[Test]
+	public void contains_3_links() {
+		Assert.AreEqual(3, _links.Count);
+	}
+
+	[Test]
+	public void contains_the_subscription_link() {
+		Assert.AreEqual("streamSubscription", ((JProperty)_links[2]).Name);
+		Assert.AreEqual(_subscriptionUrl, _subscriptions[0]["href"].ToString());
+	}
+
+	[Test]
+	public void subscriptions_link_contains_supported_subscription_content_types() {
+		var supportedContentTypes = _subscriptions[0]["supportedContentTypes"].Values<string>().ToArray();
+		Assert.AreEqual(3, supportedContentTypes.Length);
+		Assert.Contains(ContentType.Competing, supportedContentTypes);
+		Assert.Contains(ContentType.CompetingJson, supportedContentTypes);
+		Assert.Contains(ContentType.LegacyCompetingJson, supportedContentTypes);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/Streams/feed.cs b/src/KurrentDB.Core.Tests/Http/Streams/feed.cs
new file mode 100644
index 00000000000..7293ef1d404
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/Streams/feed.cs
@@ -0,0 +1,851 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Tests.Http.Users.users;
+using KurrentDB.Transport.Http;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+using HttpStatusCode = System.Net.HttpStatusCode;
+using SystemEventTypes = EventStore.ClientAPI.Common.SystemEventTypes;
+
+namespace KurrentDB.Core.Tests.Http.Streams;
+
+public abstract class SpecificationWithLongFeed : with_admin_user {
+	protected int _numberOfEvents;
+
+	protected override async Task Given() {
+		_numberOfEvents = 25;
+		for (var i = 0; i < _numberOfEvents; i++) {
+			await PostEvent(i);
+		}
+	}
+
+	protected async Task<string> PostEvent(int i) {
+		var response = await MakeArrayEventsPost(
+			TestStream,
+			new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = new { Number = i } } });
+		Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
+		return response.Headers.GetLocationAsString();
+	}
+
+	protected string GetLink(JObject feed, string relation) {
+		var rel = (from JObject link in feed["links"]
+				   from JProperty attr in link
+				   where attr.Name == "relation" && (string)attr.Value == relation
+				   select link).SingleOrDefault();
+		return (rel == null) ? (string)null : (string)rel["uri"];
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(ContentType.AtomJson)]
+[TestFixture(ContentType.LegacyAtomJson)]
+public class when_retrieving_feed_head(string contentType) : SpecificationWithLongFeed {
+	private JObject _feed;
+
+	protected override async Task When() {
+		_feed = await GetJson<JObject>(TestStream, contentType);
+	}
+
+	[Test]
+	public void returns_ok_status_code() {
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+	}
+
+	[Test]
+	public void contains_a_link_rel_previous() {
+		var rel = GetLink(_feed, "previous");
+		Assert.IsNotEmpty(rel);
+	}
+
+	[Test]
+	public void contains_a_link_rel_next() {
+		var rel = GetLink(_feed, "next");
+		Assert.IsNotEmpty(rel);
+	}
+
+	[Test]
+	public void contains_a_link_rel_self() {
+		var rel = GetLink(_feed, "self");
+		Assert.IsNotEmpty(rel);
+	}
+
+	[Test]
+	public void contains_a_link_rel_first() {
+		var rel = GetLink(_feed, "first");
+		Assert.IsNotEmpty(rel);
+	}
+
+	[Test]
+	public void contains_a_link_rel_last() {
+		var rel = GetLink(_feed, "last");
+		Assert.IsNotEmpty(rel);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(ContentType.AtomJson)]
+[TestFixture(ContentType.LegacyAtomJson)]
+public class when_retrieving_feed_head_with_forwarded_prefix(string contentType) : SpecificationWithLongFeed {
+	private JObject _feed;
+	private string _prefix;
+
+	protected override async Task When() {
+		_prefix = "testprefix";
+		var headers = new NameValueCollection();
+		headers.Add("X-Forwarded-Prefix", _prefix);
+		_feed = await GetJson<JObject>(TestStream, contentType, headers: headers);
+	}
+
+	[Test]
+	public void returns_ok_status_code() {
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+	}
+
+	[Test]
+	public void contains_a_link_rel_previous_with_prefix() {
+		var rel = GetLink(_feed, "previous");
+		Assert.AreEqual(MakeUrl("/" + _prefix + TestStream + "/25/forward/20"), new Uri(rel));
+	}
+
+	[Test]
+	public void contains_a_link_rel_next_with_prefix() {
+		var rel = GetLink(_feed, "next");
+		Assert.AreEqual(MakeUrl("/" + _prefix + TestStream + "/4/backward/20"), new Uri(rel));
+	}
+
+	[Test]
+	public void contains_a_link_rel_self_with_prefix() {
+		var rel = GetLink(_feed, "self");
+		Assert.AreEqual(MakeUrl("/" + _prefix + TestStream), new Uri(rel));
+	}
+
+	[Test]
+	public void contains_a_link_rel_first_with_prefix() {
+		var rel = GetLink(_feed, "first");
+		Assert.AreEqual(MakeUrl("/" + _prefix + TestStream + "/head/backward/20"), new Uri(rel));
+	}
+
+	[Test]
+	public void contains_a_link_rel_last_with_prefix() {
+		var rel = GetLink(_feed, "last");
+		Assert.AreEqual(MakeUrl("/" + _prefix + TestStream + "/0/forward/20"), new Uri(rel));
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(ContentType.AtomJson)]
+[TestFixture(ContentType.LegacyAtomJson)]
+public class when_retrieving_the_previous_link_of_the_feed_head(string contentType) : SpecificationWithLongFeed {
+	private JObject _feed;
+	private JObject _head;
+	private string _previous;
+
+	protected override async Task Given() {
+		await base.Given();
+		_head = await GetJson<JObject>(TestStream, contentType);
+		_previous = GetLink(_head, "previous");
+	}
+
+	protected override async Task When() {
+		_feed = await GetJson<JObject>(_previous, contentType);
+	}
+
+	[Test]
+	public void returns_200_response() {
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+	}
+
+	[Test]
+	public void there_is_no_prev_link() {
+		var rel = GetLink(_feed, "prev");
+		Assert.IsNull(rel);
+	}
+
+	[Test]
+	public void there_is_a_next_link() {
+		var rel = GetLink(_feed, "next");
+		Assert.IsNotEmpty(rel);
+	}
+
+	[Test]
+	public void there_is_a_self_link() {
+		var rel = GetLink(_feed, "self");
+		Assert.IsNotEmpty(rel);
+	}
+
+	[Test]
+	public void there_is_a_first_link() {
+		var rel = GetLink(_feed, "first");
+		Assert.IsNotEmpty(rel);
+	}
+
+	[Test]
+	public void there_is_a_last_link() {
+		var rel = GetLink(_feed, "last");
+		Assert.IsNotEmpty(rel);
+	}
+
+	[Test]
+	public void the_feed_is_empty() {
+		Assert.AreEqual(0, _feed["entries"].Count());
+	}
+
+	[Test]
+	public void the_response_is_not_cachable() {
+		Assert.AreEqual(CacheControlHeaderValue.Parse("max-age=0, no-cache, must-revalidate"),
+			_lastResponse.Headers.CacheControl);
+	}
+}
+
+
+[Category("LongRunning")]
+[TestFixture]
+public class when_reading_a_stream_forward_with_deleted_linktos : HttpSpecificationWithLinkToToDeletedEvents {
+	private JObject _feed;
+	private List<JToken> _entries;
+
+	protected override async Task When() {
+		_feed = await GetJson<JObject>("/streams/" + LinkedStreamName + "/0/forward/10", accept: ContentType.Json, credentials: DefaultData.AdminNetworkCredentials);
+		_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
+	}
+
+	[Test]
+	public void the_feed_has_one_event() {
+		Assert.AreEqual(1, _entries.Count());
+	}
+
+	[Test]
+	public void the_edit_link_to_is_to_correct_uri() {
+		var foo = _entries[0]["links"][0];
+		Assert.AreEqual("edit", foo["relation"].ToString());
+		Assert.AreEqual(MakeUrl("/streams/" + DeletedStreamName + "/0"), foo["uri"].ToString());
+	}
+
+	[Test]
+	public void the_alt_link_to_is_to_correct_uri() {
+		var foo = _entries[0]["links"][1];
+		Assert.AreEqual("alternate", foo["relation"].ToString());
+		Assert.AreEqual(MakeUrl("/streams/" + DeletedStreamName + "/0"), foo["uri"].ToString());
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture]
+public class when_reading_a_stream_forward_with_linkto : HttpSpecificationWithLinkToToEvents {
+	private JObject _feed;
+	private List<JToken> _entries;
+
+	protected override async Task When() {
+		_feed = await GetJson<JObject>("/streams/" + LinkedStreamName + "/0/forward/10", accept: ContentType.Json);
+		_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
+	}
+
+	[Test]
+	public void the_feed_has_two_events() {
+		Assert.AreEqual(2, _entries.Count());
+	}
+
+	[Test]
+	public void the_second_edit_link_to_is_to_correct_uri() {
+		var foo = _entries[1]["links"][0];
+		Assert.AreEqual("edit", foo["relation"].ToString());
+		Assert.AreEqual(MakeUrl("/streams/" + Stream2Name + "/0"), foo["uri"].ToString());
+	}
+
+	[Test]
+	public void the_second_alt_link_to_is_to_correct_uri() {
+		var foo = _entries[1]["links"][1];
+		Assert.AreEqual("alternate", foo["relation"].ToString());
+		Assert.AreEqual(MakeUrl("/streams/" + Stream2Name + "/0"), foo["uri"].ToString());
+	}
+
+	[Test]
+	public void the_first_edit_link_to_is_to_correct_uri() {
+		var foo = _entries[0]["links"][0];
+		Assert.AreEqual("edit", foo["relation"].ToString());
+		Assert.AreEqual(MakeUrl("/streams/" + StreamName + "/1"), foo["uri"].ToString());
+	}
+
+	[Test]
+	public void the_first_alt_link_to_is_to_correct_uri() {
+		var foo = _entries[0]["links"][1];
+		Assert.AreEqual("alternate", foo["relation"].ToString());
+		Assert.AreEqual(MakeUrl("/streams/" + StreamName + "/1"), foo["uri"].ToString());
+	}
+}
+
+
+[Category("LongRunning")]
+[TestFixture]
+public class when_reading_a_stream_forward_with_linkto_with_at_sign_in_name : HttpBehaviorSpecification {
+	protected string LinkedStreamName;
+	protected string StreamName;
+
+	protected override async Task Given() {
+		var creds = DefaultData.AdminCredentials;
+		LinkedStreamName = Guid.NewGuid().ToString();
+		StreamName = Guid.NewGuid() + "@" + Guid.NewGuid() + "@";
+		using (var conn = TestConnection.Create(_node.TcpEndPoint)) {
+			await conn.ConnectAsync();
+			await conn.AppendToStreamAsync(StreamName, ExpectedVersion.Any, creds,
+					new EventData(Guid.NewGuid(), "testing", true, Encoding.UTF8.GetBytes("{'foo' : 4}"),
+						new byte[0]))
+				;
+			await conn.AppendToStreamAsync(StreamName, ExpectedVersion.Any, creds,
+					new EventData(Guid.NewGuid(), "testing", true, Encoding.UTF8.GetBytes("{'foo' : 4}"),
+						new byte[0]))
+				;
+			await conn.AppendToStreamAsync(StreamName, ExpectedVersion.Any, creds,
+					new EventData(Guid.NewGuid(), "testing", true, Encoding.UTF8.GetBytes("{'foo' : 4}"),
+						new byte[0]))
+				;
+			await conn.AppendToStreamAsync(LinkedStreamName, ExpectedVersion.Any, creds,
+				new EventData(Guid.NewGuid(), SystemEventTypes.LinkTo, false,
+					Encoding.UTF8.GetBytes("0@" + StreamName), new byte[0]));
+			await conn.AppendToStreamAsync(LinkedStreamName, ExpectedVersion.Any, creds,
+				new EventData(Guid.NewGuid(), SystemEventTypes.LinkTo, false,
+					Encoding.UTF8.GetBytes("1@" + StreamName), new byte[0]));
+		}
+	}
+
+	private JObject _feed;
+	private List<JToken> _entries;
+
+	protected override async Task When() {
+		_feed = await GetJson<JObject>("/streams/" + LinkedStreamName + "/0/forward/10", accept: ContentType.Json);
+		_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
+	}
+
+	[Test]
+	public void the_feed_has_two_events() {
+		Assert.AreEqual(2, _entries.Count());
+	}
+
+	[Test]
+	public void the_second_edit_link_to_is_to_correct_uri() {
+		var foo = _entries[1]["links"][0];
+		Assert.AreEqual("edit", foo["relation"].ToString());
+		//TODO GFY I really wish we were targeting 4.5 only so I could use Uri.EscapeDataString
+		//given the choice between this and a dependency on system.web well yeah. When we have 4.5
+		//only lets use Uri
+		Assert.AreEqual(MakeUrl("/streams/" + StreamName.Replace("@", "%40") + "/0"), foo["uri"].ToString());
+	}
+
+	[Test]
+	public void the_second_alt_link_to_is_to_correct_uri() {
+		var foo = _entries[1]["links"][1];
+		Assert.AreEqual("alternate", foo["relation"].ToString());
+		Assert.AreEqual(MakeUrl("/streams/" + StreamName.Replace("@", "%40") + "/0"), foo["uri"].ToString());
+	}
+
+	[Test]
+	public void the_first_edit_link_to_is_to_correct_uri() {
+		var foo = _entries[0]["links"][0];
+		Assert.AreEqual("edit", foo["relation"].ToString());
+		Assert.AreEqual(MakeUrl("/streams/" + StreamName.Replace("@", "%40") + "/1"), foo["uri"].ToString());
+	}
+
+	[Test]
+	public void the_first_alt_link_to_is_to_correct_uri() {
+		var foo = _entries[0]["links"][1];
+		Assert.AreEqual("alternate", foo["relation"].ToString());
+		Assert.AreEqual(MakeUrl("/streams/" + StreamName.Replace("@", "%40") + "/1"), foo["uri"].ToString());
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture]
+public class when_reading_a_stream_forward_with_maxcount_deleted_linktos : SpecificationWithLinkToToMaxCountDeletedEvents {
+	private JObject _feed;
+	private List<JToken> _entries;
+
+	protected override async Task When() {
+		_feed = await GetJson<JObject>("/streams/" + LinkedStreamName + "/0/forward/10", accept: ContentType.Json);
+		_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
+	}
+
+	[Test]
+	public void the_feed_has_no_events() {
+		Assert.AreEqual(1, _entries.Count());
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture]
+public class when_reading_a_stream_forward_with_maxcount_deleted_linktos_with_rich_entry : SpecificationWithLinkToToMaxCountDeletedEvents {
+	private JObject _feed;
+	private List<JToken> _entries;
+
+	protected override async Task When() {
+		_feed = await GetJson<JObject>("/streams/" + LinkedStreamName + "/0/forward/10", extra: "embed=rich",
+			accept: ContentType.Json);
+		_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
+	}
+
+	[Test]
+	public void the_feed_has_some_events() {
+		Assert.AreEqual(1, _entries.Count());
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture]
+public class when_reading_a_stream_forward_with_deleted_linktos_with_content_enabled_as_xml : HttpSpecificationWithLinkToToDeletedEvents {
+	private XDocument _feed;
+	private XElement[] _entries;
+
+	protected override async Task When() {
+		_feed = await GetAtomXml(MakeUrl("/streams/" + LinkedStreamName + "/0/forward/10", "embed=content"));
+		_entries = _feed.GetEntries();
+	}
+
+	[Test]
+	public void the_feed_has_one_event() {
+		Assert.AreEqual(1, _entries.Length);
+	}
+
+	[Test]
+	public void the_edit_link_is_to_correct_uri() {
+		var link = _entries[0].GetLink("edit");
+		Assert.AreEqual(MakeUrl("/streams/" + DeletedStreamName + "/0"), link);
+	}
+
+	[Test]
+	public void the_alternate_link_is_to_correct_uri() {
+		var link = _entries[0].GetLink("alternate");
+		Assert.AreEqual(MakeUrl("/streams/" + DeletedStreamName + "/0"), link);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture]
+public class when_reading_a_stream_forward_with_deleted_linktos_with_content_enabled : HttpSpecificationWithLinkToToDeletedEvents {
+	private JObject _feed;
+	private List<JToken> _entries;
+
+	protected override async Task When() {
+		var uri = MakeUrl("/streams/" + LinkedStreamName + "/0/forward/10", "embed=content");
+		_feed = await GetJson<JObject>(uri.ToString(), accept: ContentType.Json, credentials: DefaultData.AdminNetworkCredentials);
+		_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
+	}
+
+	[Test]
+	public void the_feed_has_one_event() {
+		Assert.AreEqual(1, _entries.Count());
+	}
+
+	[Test]
+	public void the_edit_link_to_is_to_correct_uri() {
+		var foo = _entries[0]["links"][0];
+		Assert.AreEqual("edit", foo["relation"].ToString());
+		Assert.AreEqual(MakeUrl("/streams/" + DeletedStreamName + "/0"), foo["uri"].ToString());
+	}
+
+	[Test]
+	public void the_alt_link_to_is_to_correct_uri() {
+		var foo = _entries[0]["links"][1];
+		Assert.AreEqual("alternate", foo["relation"].ToString());
+		Assert.AreEqual(MakeUrl("/streams/" + DeletedStreamName + "/0"), foo["uri"].ToString());
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture]
+public class when_reading_a_stream_backward_with_deleted_linktos : HttpSpecificationWithLinkToToDeletedEvents {
+	private JObject _feed;
+	private List<JToken> _entries;
+
+	protected override async Task When() {
+		_feed = await GetJson<JObject>("/streams/" + LinkedStreamName + "/0/backward/1", accept: ContentType.Json, credentials: DefaultData.AdminNetworkCredentials);
+		_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
+	}
+
+	[Test]
+	public void the_feed_has_one_event() {
+		Assert.AreEqual(1, _entries.Count());
+	}
+
+	[Test]
+	public void the_edit_link_to_is_to_correct_uri() {
+		var foo = _entries[0]["links"][0];
+		Assert.AreEqual("edit", foo["relation"].ToString());
+		Assert.AreEqual(MakeUrl("/streams/" + DeletedStreamName + "/0"), foo["uri"].ToString());
+	}
+
+	[Test]
+	public void the_alt_link_to_is_to_correct_uri() {
+		var foo = _entries[0]["links"][1];
+		Assert.AreEqual("alternate", foo["relation"].ToString());
+		Assert.AreEqual(MakeUrl("/streams/" + DeletedStreamName + "/0"), foo["uri"].ToString());
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture]
+public class when_reading_a_stream_backward_with_deleted_linktos_and_embed_of_content : HttpSpecificationWithLinkToToDeletedEvents {
+	private JObject _feed;
+	private List<JToken> _entries;
+
+	protected override async Task When() {
+		var uri = MakeUrl("/streams/" + LinkedStreamName + "/0/backward/1", "embed=content");
+		_feed = await GetJson<JObject>(uri.ToString(), accept: ContentType.Json, credentials: DefaultData.AdminNetworkCredentials);
+		_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
+	}
+
+	[Test]
+	public void the_feed_has_one_event() {
+		Assert.AreEqual(1, _entries.Count());
+	}
+
+	[Test]
+	public void the_edit_link_to_is_to_correct_uri() {
+		var foo = _entries[0]["links"][0];
+		Assert.AreEqual("edit", foo["relation"].ToString());
+		Assert.AreEqual(MakeUrl("/streams/" + DeletedStreamName + "/0"), foo["uri"].ToString());
+	}
+
+	[Test]
+	public void the_alt_link_to_is_to_correct_uri() {
+		var foo = _entries[0]["links"][1];
+		Assert.AreEqual("alternate", foo["relation"].ToString());
+		Assert.AreEqual(MakeUrl("/streams/" + DeletedStreamName + "/0"), foo["uri"].ToString());
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(ContentType.AtomJson)]
+[TestFixture(ContentType.LegacyAtomJson)]
+public class when_polling_the_head_forward_and_a_new_event_appears(string contentType) : SpecificationWithLongFeed {
+	private JObject _feed;
+	private JObject _head;
+	private string _previous;
+	private string _lastEventLocation;
+
+	protected override async Task Given() {
+		await base.Given();
+		_head = await GetJson<JObject>(TestStream, contentType);
+		Console.WriteLine(new string('*', 60));
+		Console.WriteLine(_head);
+		Console.WriteLine(TestStream);
+		Console.WriteLine(new string('*', 60));
+		_previous = GetLink(_head, "previous");
+		_lastEventLocation = await PostEvent(-1);
+	}
+
+	protected override async Task When() {
+		_feed = await GetJson<JObject>(_previous, contentType);
+	}
+
+	[Test]
+	public void returns_ok_status_code() {
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+	}
+
+	[Test]
+	public void returns_a_feed_with_a_single_entry_referring_to_the_last_event() {
+		HelperExtensions.AssertJson(new { entries = new[] { new { Id = _lastEventLocation } } }, _feed);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(ContentType.AtomJson)]
+[TestFixture(ContentType.LegacyAtomJson)]
+public class when_reading_a_stream_forward_from_beginning_asking_for_less_events_than_in_the_stream(string contentType) : SpecificationWithLongFeed {
+	private JObject _feed;
+
+	protected override async Task When() {
+		_feed = await GetJson<JObject>(TestStream + "/0/forward/" + (_numberOfEvents - 1), accept: contentType);
+	}
+
+	[Test]
+	public void the_head_of_stream_is_false() {
+		Assert.AreEqual(false, _feed.Value<bool>("headOfStream"));
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(ContentType.AtomJson)]
+[TestFixture(ContentType.LegacyAtomJson)]
+public class when_reading_a_stream_forward_from_beginning_asking_for_more_events_than_in_the_stream(string contentType) : SpecificationWithLongFeed {
+	private JObject _feed;
+
+	protected override async Task When() {
+		_feed = await GetJson<JObject>(TestStream + "/0/forward/" + (_numberOfEvents + 1), accept: contentType);
+	}
+
+	[Test]
+	public void the_head_of_stream_is_true() {
+		Assert.AreEqual(true, _feed.Value<bool>("headOfStream"));
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(ContentType.AtomJson)]
+[TestFixture(ContentType.LegacyAtomJson)]
+public class when_reading_a_stream_forward_from_beginning_asking_for_exactly_the_events_in_the_stream(string contentType) : SpecificationWithLongFeed {
+	private JObject _feed;
+
+	protected override async Task When() {
+		_feed = await GetJson<JObject>(TestStream + "/0/forward/" + _numberOfEvents, accept: contentType);
+	}
+
+	[Test]
+	public void the_head_of_stream_is_true() {
+		Assert.AreEqual(true, _feed.Value<bool>("headOfStream"));
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(ContentType.AtomJson)]
+[TestFixture(ContentType.LegacyAtomJson)]
+public class when_reading_a_stream_forward_with_etag_in_header(string contentType) : SpecificationWithLongFeed {
+	private JObject _feed;
+
+	protected override async Task When() {
+		_feed = await GetJson<JObject>(TestStream, accept: contentType);
+		var etag = _feed.Value<string>("eTag");
+		var headers = new NameValueCollection { { "If-None-Match", EntityTagHeaderValue.Parse($@"""{etag}""").Tag } };
+		_feed = await GetJson<JObject>(TestStream, accept: contentType, headers: headers);
+	}
+
+	[Test]
+	public void should_return_not_modified() {
+		Assert.AreEqual(HttpStatusCode.NotModified, _lastResponse.StatusCode);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(SystemHeaders.ResolveLinkTos)]
+[TestFixture(SystemHeaders.LegacyResolveLinkTos)]
+public class when_reading_the_all_stream_backward_with_resolve_link_to(string resolveLinkTosHeader) : HttpSpecificationWithLinkToToEvents {
+	private JObject _feed;
+	private List<JToken> _entries;
+
+	protected override async Task When() {
+		var headers = new NameValueCollection { { resolveLinkTosHeader, "True" } };
+		_feed = await GetJson<JObject>("/streams/$all/head/backward/30",
+			ContentType.Json, DefaultData.AdminNetworkCredentials, headers);
+		_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
+	}
+
+	[Test]
+	public void there_are_three_events_for_the_first_original_stream() {
+		var events = _entries.Where(x => x["title"].Value<string>().Contains(StreamName));
+		Assert.AreEqual(3, events.Count());
+	}
+
+	[Test]
+	public void there_are_two_events_for_the_second_original_stream() {
+		var events = _entries.Where(x => x["title"].Value<string>().Contains(Stream2Name));
+		Assert.AreEqual(2, events.Count());
+	}
+
+	[Test]
+	public void there_are_no_events_for_the_linked_stream() {
+		var events = _entries.Where(x => x["title"].Value<string>().Contains(LinkedStreamName));
+		Assert.IsEmpty(events);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(SystemHeaders.ResolveLinkTos)]
+[TestFixture(SystemHeaders.LegacyResolveLinkTos)]
+public class when_reading_the_all_stream_backward_with_resolve_link_to_disabled(string resolveLinkTosHeader) : HttpSpecificationWithLinkToToEvents {
+	private JObject _feed;
+	private List<JToken> _entries;
+
+	protected override async Task When() {
+		var headers = new NameValueCollection { { resolveLinkTosHeader, "False" } };
+		_feed = await GetJson<JObject>("/streams/$all",
+			ContentType.Json, DefaultData.AdminNetworkCredentials, headers);
+		_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
+	}
+
+	[Test]
+	public void there_are_two_events_for_the_first_original_stream() {
+		var events = _entries.Where(x => x["title"].Value<string>().Contains(StreamName));
+		Assert.AreEqual(2, events.Count());
+	}
+
+	[Test]
+	public void there_is_one_event_for_the_second_original_stream() {
+		var events = _entries.Where(x => x["title"].Value<string>().Contains(Stream2Name));
+		Assert.AreEqual(1, events.Count());
+	}
+
+	[Test]
+	public void there_are_two_events_for_the_linked_stream() {
+		var events = _entries.Where(x => x["title"].Value<string>().Contains(LinkedStreamName));
+		Assert.AreEqual(2, events.Count());
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(SystemHeaders.ResolveLinkTos)]
+[TestFixture(SystemHeaders.LegacyResolveLinkTos)]
+public class when_reading_the_all_stream_forward_with_resolve_link_to(string resolveLinkTosHeader) : HttpSpecificationWithLinkToToEvents {
+	private JObject _feed;
+	private List<JToken> _entries;
+
+	protected override async Task When() {
+		var headers = new NameValueCollection { { resolveLinkTosHeader, "True" } };
+		_feed = await GetJson<JObject>("/streams/$all/00000000000000000000037777777777/forward/30",
+			ContentType.Json, DefaultData.AdminNetworkCredentials, headers);
+		_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
+	}
+
+	[Test]
+	public void there_are_three_events_for_the_first_original_stream() {
+		var events = _entries.Where(x => x["title"].Value<string>().Contains(StreamName));
+		Assert.AreEqual(3, events.Count());
+	}
+
+	[Test]
+	public void there_are_two_events_for_the_second_original_stream() {
+		var events = _entries.Where(x => x["title"].Value<string>().Contains(Stream2Name));
+		Assert.AreEqual(2, events.Count());
+	}
+
+	[Test]
+	public void there_are_no_events_for_the_linked_stream() {
+		var events = _entries.Where(x => x["title"].Value<string>().Contains(LinkedStreamName));
+		Assert.IsEmpty(events);
+	}
+}
+
+[Category("LongRunning")]
+[TestFixture(SystemHeaders.ResolveLinkTos)]
+[TestFixture(SystemHeaders.LegacyResolveLinkTos)]
+public class when_reading_the_all_stream_forward_with_resolve_link_to_disabled(string resolveLinkTosHeader) : HttpSpecificationWithLinkToToEvents {
+	private JObject _feed;
+	private List<JToken> _entries;
+
+	protected override async Task When() {
+		var headers = new NameValueCollection { { resolveLinkTosHeader, "False" } };
+		_feed = await GetJson<JObject>("/streams/$all/00000000000000000000037777777777/forward/30",
+			ContentType.Json, DefaultData.AdminNetworkCredentials, headers);
+		_entries = _feed != null ? _feed["entries"].ToList() : new List<JToken>();
+	}
+
+	[Test]
+	public void there_are_two_events_for_the_first_original_stream() {
+		var events = _entries.Where(x => x["title"].Value<string>().Contains(StreamName));
+		Assert.AreEqual(2, events.Count());
+	}
+
+	[Test]
+	public void there_is_one_event_for_the_second_original_stream() {
+		var events = _entries.Where(x => x["title"].Value<string>().Contains(Stream2Name));
+		Assert.AreEqual(1, events.Count());
+	}
+
+	[Test]
+	public void there_are_two_events_for_the_linked_stream() {
+		var events = _entries.Where(x => x["title"].Value<string>().Contains(LinkedStreamName));
+		Assert.AreEqual(2, events.Count());
+	}
+}
+
+// This test needs to be out of the streams namespace to prevent it from inheriting the wrong mini node.
+public class when_running_the_node_advertising_a_different_ip_as {
+	[Category("LongRunning")]
+	[TestFixture(ContentType.EventsJson, ContentType.AtomJson)]
+	[TestFixture(ContentType.LegacyEventsJson, ContentType.AtomJson)]
+	[TestFixture(ContentType.EventsJson, ContentType.LegacyAtomJson)]
+	[TestFixture(ContentType.LegacyEventsJson, ContentType.LegacyAtomJson)]
+	public class when_retrieving_feed_head_and_http_advertise_ip_is_set(string postContentType, string getContentType) : with_admin_user {
+		private JObject _feed;
+		private string advertisedAddress = "127.0.10.1";
+		private int advertisedPort = 2116;
+
+		protected override MiniNode<LogFormat.V2, string> CreateMiniNode() {
+			return new MiniNode<LogFormat.V2, string>(PathName,
+				advertisedExtHostAddress: advertisedAddress, advertisedHttpPort: advertisedPort);
+		}
+
+		protected override async Task Given() {
+			var response = await MakeArrayEventsPost(
+				TestStream,
+				new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = new { Number = 1 } } },
+				contentType: postContentType);
+			Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
+		}
+
+		protected string GetLink(JObject feed, string relation) {
+			var rel = (from JObject link in feed["links"]
+					   from JProperty attr in link
+					   where attr.Name == "relation" && (string)attr.Value == relation
+					   select link).SingleOrDefault();
+			return (rel == null) ? (string)null : (string)rel["uri"];
+		}
+
+		protected string GetFirstEntryLink(JObject feed) {
+			var rel = (from JObject entry in feed["entries"]
+					   from JObject link in entry["links"]
+					   from JProperty attr in link
+					   where attr.Name == "relation" && (string)attr.Value == "edit"
+					   select link).FirstOrDefault();
+			return (rel == null) ? (string)null : (string)rel["uri"];
+		}
+
+		protected override async Task When() {
+			Console.WriteLine("Getting feed");
+			_feed = await GetJson<JObject>(TestStream, getContentType);
+			Console.WriteLine("Feed: {0}", _feed);
+		}
+
+		[Test]
+		public void returns_ok_status_code() {
+			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+		}
+
+		[Test]
+		public void contains_a_link_rel_previous_using_advertised_ip_and_port() {
+			var rel = GetLink(_feed, "previous");
+			Assert.IsNotEmpty(rel);
+			var uri = new Uri(rel);
+			Assert.AreEqual(advertisedAddress.ToString(), uri.Host);
+			Assert.AreEqual(advertisedPort, uri.Port);
+		}
+
+		[Test]
+		public void contains_a_link_rel_self_using_advertised_ip_and_port() {
+			var rel = GetLink(_feed, "self");
+			Assert.IsNotEmpty(rel);
+			var uri = new Uri(rel);
+			Assert.AreEqual(advertisedAddress.ToString(), uri.Host);
+			Assert.AreEqual(advertisedPort, uri.Port);
+		}
+
+		[Test]
+		public void contains_a_link_rel_first_using_advertised_ip_and_port() {
+			var rel = GetLink(_feed, "first");
+			Assert.IsNotEmpty(rel);
+			var uri = new Uri(rel);
+			Assert.AreEqual(advertisedAddress.ToString(), uri.Host);
+			Assert.AreEqual(advertisedPort, uri.Port);
+		}
+
+		[Test]
+		public void contains_an_entry_with_rel_link_using_advertised_ip_and_port() {
+			var rel = GetFirstEntryLink(_feed);
+			Assert.IsNotEmpty(rel);
+			var uri = new Uri(rel);
+			Assert.AreEqual(advertisedAddress.ToString(), uri.Host);
+			Assert.AreEqual(advertisedPort, uri.Port);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/Streams/filtered.cs b/src/KurrentDB.Core.Tests/Http/Streams/filtered.cs
new file mode 100644
index 00000000000..b8fc31a9fc8
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/Streams/filtered.cs
@@ -0,0 +1,460 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.Http.Users.users;
+using KurrentDB.Transport.Http;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+using HttpStatusCode = System.Net.HttpStatusCode;
+
+namespace KurrentDB.Core.Tests.Http.Streams;
+
+public class Filtered {
+	public abstract class SpecificationWithLongFeed : with_admin_user {
+		protected int NumberOfEvents;
+
+		protected override async Task Given() {
+			NumberOfEvents = 25;
+			for (var i = 0; i < NumberOfEvents; i++) {
+				await PostEvent(i, TestStream + "-ignore", "ignore-event-type");
+				await PostEvent(i, TestStream + "-filter", "event1-type");
+				await PostEvent(i, TestStream + "-filter", "event2-type");
+			}
+		}
+
+		protected async Task<Uri> PostEvent(int i, string streamId, string eventType) {
+			var response = await MakeArrayEventsPost(
+				streamId,
+				new[] { new { EventId = Guid.NewGuid(), EventType = eventType, Data = new { Number = i } } });
+			Assert.AreEqual(HttpStatusCode.Created, response.StatusCode);
+			return response.Headers.Location;
+		}
+
+		protected string GetLink(JObject feed, string relation) {
+			var rel = (from JObject link in feed["links"]
+					   from JProperty attr in link
+					   where attr.Name == "relation" && (string)attr.Value == relation
+					   select link).SingleOrDefault();
+			return (rel == null) ? null : (string)rel["uri"];
+		}
+
+		protected List<string> GetEventTypes(JObject feed) =>
+			feed["entries"]
+				.Select(e => e["summary"].Value<string>())
+				.OrderBy(e => e)
+				.ToList();
+
+		protected string AllFilteredStream => "/streams/%24all/filtered";
+
+		protected string AllFilteredStreamForward => "/streams/$all/filtered/00000000000000000000000000000000/forward/14";
+	}
+
+	[Category("LongRunning")]
+	[TestFixture(ContentType.AtomJson)]
+	[TestFixture(ContentType.LegacyAtomJson)]
+	public class when_retrieving_backward_with_invalid_context(string contentType) : SpecificationWithLongFeed {
+		protected override Task When() =>
+			GetJson<JObject>(AllFilteredStream,
+				contentType,
+				DefaultData.AdminNetworkCredentials,
+				extra: "context=foo");
+
+		[Test]
+		public void returns_bad_request_status_code() =>
+			Assert.AreEqual(HttpStatusCode.BadRequest, _lastResponse.StatusCode);
+	}
+
+	[Category("LongRunning")]
+	[TestFixture(ContentType.AtomJson)]
+	[TestFixture(ContentType.LegacyAtomJson)]
+	public class when_retrieving_backward_with_invalid_type(string contentType) : SpecificationWithLongFeed {
+		protected override Task When() =>
+			GetJson<JObject>(AllFilteredStream,
+				contentType,
+				DefaultData.AdminNetworkCredentials,
+				extra: "context=streamid&type=foo");
+
+		[Test]
+		public void returns_bad_request_status_code() =>
+			Assert.AreEqual(HttpStatusCode.BadRequest, _lastResponse.StatusCode);
+	}
+
+	[Category("LongRunning")]
+	[TestFixture(ContentType.AtomJson)]
+	[TestFixture(ContentType.LegacyAtomJson)]
+	public class when_retrieving_backward_with_invalid_data(string contentType) : SpecificationWithLongFeed {
+		protected override Task When() =>
+			GetJson<JObject>(AllFilteredStream,
+				contentType,
+				DefaultData.AdminNetworkCredentials,
+				extra: "context=streamid&type=prefix");
+
+		[Test]
+		public void returns_bad_request_status_code() =>
+			Assert.AreEqual(HttpStatusCode.BadRequest, _lastResponse.StatusCode);
+	}
+
+	[Category("LongRunning")]
+	[TestFixture(ContentType.AtomJson)]
+	[TestFixture(ContentType.LegacyAtomJson)]
+	public class when_retrieving_backward_feed_head(string contentType) : SpecificationWithLongFeed {
+		private JObject _feed;
+
+		protected override async Task When() =>
+			_feed = await GetJson<JObject>(AllFilteredStream,
+				contentType,
+				DefaultData.AdminNetworkCredentials,
+				extra: "context=eventtype&type=prefix&data=event1-");
+
+		[Test]
+		public void returns_ok_status_code() =>
+			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+
+		[Test]
+		public void contains_a_link_rel_previous() {
+			var rel = GetLink(_feed, "previous");
+			Assert.IsNotEmpty(rel);
+		}
+
+		[Test]
+		public void contains_a_link_rel_next() {
+			var rel = GetLink(_feed, "next");
+			Assert.IsNotEmpty(rel);
+		}
+
+		[Test]
+		public void contains_a_link_rel_self() {
+			var rel = GetLink(_feed, "self");
+			Assert.IsNotEmpty(rel);
+			Assert.AreEqual(
+				MakeUrl(AllFilteredStream),
+				new Uri(rel));
+		}
+
+		[Test]
+		public void contains_a_link_rel_first() {
+			var rel = GetLink(_feed, "first");
+			Assert.IsNotEmpty(rel);
+		}
+
+		[Test]
+		public void contains_a_link_rel_last() {
+			var rel = GetLink(_feed, "last");
+			Assert.IsNotEmpty(rel);
+		}
+	}
+
+	[Category("LongRunning")]
+	[TestFixture(ContentType.AtomJson)]
+	[TestFixture(ContentType.LegacyAtomJson)]
+	public class when_retrieving_backward_feed_events_by_event_type_and_prefix(string contentType) : SpecificationWithLongFeed {
+		private List<string> _eventTypes;
+
+		protected override async Task When() {
+			var feed = await GetJson<JObject>(AllFilteredStream,
+				contentType,
+				DefaultData.AdminNetworkCredentials,
+				extra: "context=eventtype&type=prefix&data=event1-,event2-");
+			_eventTypes = GetEventTypes(feed);
+		}
+
+		[Test]
+		public void should_only_contain_filtered_events() {
+			for (var index = 0; index < 7; index++) {
+				Assert.AreEqual("event1-type", _eventTypes[index]);
+				Assert.AreEqual("event2-type", _eventTypes[index + 7]);
+			}
+		}
+	}
+
+	[Category("LongRunning")]
+	[TestFixture(ContentType.AtomJson)]
+	[TestFixture(ContentType.LegacyAtomJson)]
+	public class when_retrieving_backward_feed_events_by_event_type_and_regex(string contentType) : SpecificationWithLongFeed {
+		private List<string> _eventTypes;
+
+		protected override async Task When() {
+			var feed = await GetJson<JObject>(AllFilteredStream,
+				contentType,
+				DefaultData.AdminNetworkCredentials,
+				extra: "context=eventtype&type=regex&data=^.*eventtype1.*$");
+			_eventTypes = GetEventTypes(feed);
+		}
+
+		[Test]
+		public void should_only_contain_filtered_events() {
+			foreach (var eventType in _eventTypes) {
+				Assert.AreEqual("event1-type", eventType);
+			}
+		}
+	}
+
+	[Category("LongRunning")]
+	[TestFixture(ContentType.AtomJson)]
+	[TestFixture(ContentType.LegacyAtomJson)]
+	public class when_retrieving_backward_feed_events_by_stream_id_and_prefix(string contentType) : SpecificationWithLongFeed {
+		private List<string> _eventTypes;
+
+		protected override async Task When() {
+			var feed = await GetJson<JObject>(AllFilteredStream,
+				contentType,
+				DefaultData.AdminNetworkCredentials,
+				extra: $"context=streamid&type=prefix&data={TestStream}-filter");
+			_eventTypes = GetEventTypes(feed);
+		}
+
+		[Test]
+		public void should_only_contain_filtered_events() {
+			foreach (var eventType in _eventTypes) {
+				Assert.AreEqual("event-type", eventType);
+			}
+		}
+	}
+
+	[Category("LongRunning")]
+	[TestFixture(ContentType.AtomJson)]
+	[TestFixture(ContentType.LegacyAtomJson)]
+	public class when_retrieving_backward_feed_events_by_stream_id_and_regex(string contentType) : SpecificationWithLongFeed {
+		private List<string> _eventTypes;
+
+		protected override async Task When() {
+			var feed = await GetJson<JObject>(AllFilteredStream,
+				contentType,
+				DefaultData.AdminNetworkCredentials,
+				extra: $"context=streamid&type=regex&data=^.*{TestStream}-filter.*$");
+			_eventTypes = GetEventTypes(feed);
+		}
+
+		[Test]
+		public void should_only_contain_filtered_events() {
+			foreach (var eventType in _eventTypes) {
+				Assert.AreEqual("event1-type", eventType);
+			}
+		}
+	}
+
+	[Category("LongRunning")]
+	[TestFixture(ContentType.AtomJson)]
+	[TestFixture(ContentType.LegacyAtomJson)]
+	public class when_retrieving_backward_feed_events_filtering_system_events(string contentType) : SpecificationWithLongFeed {
+		private List<string> _eventTypes;
+
+		protected override async Task When() {
+			var feed = await GetJson<JObject>(AllFilteredStream,
+				contentType,
+				DefaultData.AdminNetworkCredentials,
+				extra: "exclude-system-events=true");
+			_eventTypes = GetEventTypes(feed);
+		}
+
+		[Test]
+		public void should_only_contain_filtered_events() {
+			foreach (var eventType in _eventTypes) {
+				Assert.IsFalse(eventType.StartsWith("$"));
+			}
+		}
+	}
+
+	[Category("LongRunning")]
+	[TestFixture(ContentType.AtomJson)]
+	[TestFixture(ContentType.LegacyAtomJson)]
+	public class when_retrieving_forward_with_invalid_context(string contentType) : SpecificationWithLongFeed {
+		protected override Task When() =>
+			GetJson<JObject>(AllFilteredStreamForward,
+				contentType,
+				DefaultData.AdminNetworkCredentials,
+				extra: "context=foo");
+
+
+		[Test]
+		public void returns_bad_request_status_code() =>
+			Assert.AreEqual(HttpStatusCode.BadRequest, _lastResponse.StatusCode);
+	}
+
+	[Category("LongRunning")]
+	[TestFixture(ContentType.AtomJson)]
+	[TestFixture(ContentType.LegacyAtomJson)]
+	public class when_retrieving_forward_with_invalid_type(string contentType) : SpecificationWithLongFeed {
+		protected override Task When() =>
+			GetJson<JObject>(AllFilteredStreamForward,
+				contentType,
+				DefaultData.AdminNetworkCredentials,
+				extra: "context=streamid&type=foo");
+
+		[Test]
+		public void returns_bad_request_status_code() =>
+			Assert.AreEqual(HttpStatusCode.BadRequest, _lastResponse.StatusCode);
+	}
+
+	[Category("LongRunning")]
+	[TestFixture(ContentType.AtomJson)]
+	[TestFixture(ContentType.LegacyAtomJson)]
+	public class when_retrieving_forward_with_invalid_data(string contentType) : SpecificationWithLongFeed {
+		protected override Task When() =>
+			GetJson<JObject>(AllFilteredStreamForward,
+				contentType,
+				DefaultData.AdminNetworkCredentials,
+				extra: "context=streamid&type=prefix");
+
+		[Test]
+		public void returns_bad_request_status_code() =>
+			Assert.AreEqual(HttpStatusCode.BadRequest, _lastResponse.StatusCode);
+	}
+
+	[Category("LongRunning")]
+	[TestFixture(ContentType.AtomJson)]
+	[TestFixture(ContentType.LegacyAtomJson)]
+	public class when_retrieving_forward_feed_head(string contentType) : SpecificationWithLongFeed {
+		private JObject _feed;
+
+		protected override async Task When() =>
+			_feed = await GetJson<JObject>(AllFilteredStreamForward,
+				contentType,
+				DefaultData.AdminNetworkCredentials,
+				extra: "context=eventtype&type=prefix&data=event1-");
+
+		[Test]
+		public void returns_ok_status_code() =>
+			Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+
+		[Test]
+		public void contains_a_link_rel_previous() {
+			var rel = GetLink(_feed, "previous");
+			Assert.IsNotEmpty(rel);
+		}
+
+
+		[Test]
+		public void contains_a_link_rel_self() {
+			var rel = GetLink(_feed, "self");
+			Assert.IsNotEmpty(rel);
+			Assert.AreEqual(
+				MakeUrl(AllFilteredStream),
+				new Uri(rel));
+		}
+
+		[Test]
+		public void contains_a_link_rel_first() {
+			var rel = GetLink(_feed, "first");
+			Assert.IsNotEmpty(rel);
+			Assert.AreEqual(
+				MakeUrl($"{AllFilteredStream}/head/backward/14"),
+				new Uri(rel));
+		}
+	}
+
+	[Category("LongRunning")]
+	[TestFixture(ContentType.AtomJson)]
+	[TestFixture(ContentType.LegacyAtomJson)]
+	public class when_retrieving_forward_feed_events_by_event_type_and_prefix(string contentType) : SpecificationWithLongFeed {
+		private List<string> _eventTypes;
+
+		protected override async Task When() {
+			var feed = await GetJson<JObject>(AllFilteredStreamForward,
+				contentType,
+				DefaultData.AdminNetworkCredentials,
+				extra: "context=eventtype&type=prefix&data=event1-,event2-");
+			_eventTypes = GetEventTypes(feed);
+		}
+
+		[Test]
+		public void should_only_contain_filtered_events() {
+			for (var index = 0; index < 7; index++) {
+				Assert.AreEqual("event1-type", _eventTypes[index]);
+				Assert.AreEqual("event2-type", _eventTypes[index + 7]);
+			}
+		}
+	}
+
+	[Category("LongRunning")]
+	[TestFixture(ContentType.AtomJson)]
+	[TestFixture(ContentType.LegacyAtomJson)]
+	public class when_retrieving_forward_feed_events_by_event_type_and_regex(string contentType) : SpecificationWithLongFeed {
+		private List<string> _eventTypes;
+
+		protected override async Task When() {
+			var feed = await GetJson<JObject>(AllFilteredStreamForward,
+				contentType,
+				DefaultData.AdminNetworkCredentials,
+				extra: "context=eventtype&type=regex&data=^.*eventtype1.*$");
+			_eventTypes = GetEventTypes(feed);
+		}
+
+		[Test]
+		public void should_only_contain_filtered_events() {
+			foreach (var eventType in _eventTypes) {
+				Assert.AreEqual("event1-type", eventType);
+			}
+		}
+	}
+
+	[Category("LongRunning")]
+	[TestFixture(ContentType.AtomJson)]
+	[TestFixture(ContentType.LegacyAtomJson)]
+	public class when_retrieving_forward_feed_events_by_stream_id_and_prefix(string contentType) : SpecificationWithLongFeed {
+		private List<string> _eventTypes;
+
+		protected override async Task When() {
+			var feed = await GetJson<JObject>(AllFilteredStreamForward,
+				contentType,
+				DefaultData.AdminNetworkCredentials,
+				extra: $"context=streamid&type=prefix&data={TestStream}-filter");
+			_eventTypes = GetEventTypes(feed);
+		}
+
+		[Test]
+		public void should_only_contain_filtered_events() {
+			foreach (var eventType in _eventTypes) {
+				Assert.AreEqual("event-type", eventType);
+			}
+		}
+	}
+
+	[Category("LongRunning")]
+	[TestFixture(ContentType.AtomJson)]
+	[TestFixture(ContentType.LegacyAtomJson)]
+	public class when_retrieving_forward_feed_events_by_stream_id_and_regex(string contentType) : SpecificationWithLongFeed {
+		private List<string> _eventTypes;
+
+		protected override async Task When() {
+			var feed = await GetJson<JObject>(AllFilteredStreamForward,
+				contentType,
+				DefaultData.AdminNetworkCredentials,
+				extra: $"context=streamid&type=regex&data=^.*{TestStream}-filter.*$");
+			_eventTypes = GetEventTypes(feed);
+		}
+
+		[Test]
+		public void should_only_contain_filtered_events() {
+			foreach (var eventType in _eventTypes) {
+				Assert.AreEqual("event1-type", eventType);
+			}
+		}
+	}
+
+	[Category("LongRunning")]
+	[TestFixture(ContentType.AtomJson)]
+	[TestFixture(ContentType.LegacyAtomJson)]
+	public class when_retrieving_forward_feed_events_filtering_system_events(string contentType) : SpecificationWithLongFeed {
+		private List<string> _eventTypes;
+
+		protected override async Task When() {
+			var feed = await GetJson<JObject>(AllFilteredStreamForward,
+				contentType,
+				DefaultData.AdminNetworkCredentials,
+				extra: "exclude-system-events=true");
+			_eventTypes = GetEventTypes(feed);
+		}
+
+		[Test]
+		public void should_only_contain_filtered_events() {
+			foreach (var eventType in _eventTypes) {
+				Assert.IsFalse(eventType.StartsWith("$"));
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/Streams/idempotency.cs b/src/KurrentDB.Core.Tests/Http/Streams/idempotency.cs
new file mode 100644
index 00000000000..2d14b870154
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/Streams/idempotency.cs
@@ -0,0 +1,290 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Tests.Http.Users.users;
+using KurrentDB.Transport.Http;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+using HttpStatusCode = System.Net.HttpStatusCode;
+
+namespace KurrentDB.Core.Tests.Http.Streams {
+	namespace idempotency {
+		[SetUpFixture]
+		abstract class HttpBehaviorSpecificationOfSuccessfulCreateEvent : with_admin_user {
+			protected HttpResponseMessage _response;
+
+			[OneTimeSetUp]
+			public override Task TestFixtureSetUp() {
+				return base.TestFixtureSetUp();
+			}
+
+			[OneTimeTearDown]
+			public override Task TestFixtureTearDown() {
+				_response?.Dispose();
+
+				return base.TestFixtureTearDown();
+			}
+
+			[Test]
+			public void response_should_not_be_null() {
+				Assert.IsNotNull(_response);
+			}
+
+			[Test]
+			public void returns_created_status_code() {
+				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+			}
+
+			[Test]
+			public void returns_a_location_header() {
+				Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
+			}
+
+			[Test]
+			public void returns_a_location_header_ending_with_zero() {
+				var location = _response.Headers.GetLocationAsString();
+				var tail = location.Substring(location.Length - "/0".Length);
+				Assert.AreEqual("/0", tail);
+			}
+
+			[Test]
+			public async Task returns_a_location_header_that_can_be_read_as_json() {
+				var json = await GetJson<JObject>(_response.Headers.GetLocationAsString());
+				HelperExtensions.AssertJson(new { A = "1" }, json);
+			}
+		}
+
+		[TestFixture(ContentType.EventsJson)]
+		[TestFixture(ContentType.LegacyEventsJson)]
+		class when_posting_to_idempotent_guid_id_then_as_array(string contentType) : HttpBehaviorSpecificationOfSuccessfulCreateEvent {
+			private Guid _eventId;
+
+			protected override Task Given() {
+				_eventId = Guid.NewGuid();
+				return PostEvent();
+			}
+
+			protected override async Task When() {
+				_response = await MakeArrayEventsPost(
+					TestStream,
+					new[] { new { EventId = _eventId, EventType = "event-type", Data = new { A = "1" } } },
+					contentType: contentType);
+			}
+
+			private async Task PostEvent() {
+				var request = CreateRequest(TestStream + "/incoming/" + _eventId.ToString(), "", "POST",
+					ContentType.Json);
+				request.Headers.Add(SystemHeaders.EventType, "SomeType");
+				var data = "{a : \"1\"}";
+				var bytes = Encoding.UTF8.GetBytes(data);
+				request.Content = new ByteArrayContent(bytes) {
+					Headers = { ContentType = new MediaTypeHeaderValue(ContentType.Json) }
+				};
+				_response = await GetRequestResponse(request);
+				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+			}
+		}
+
+		[TestFixture]
+		class when_posting_to_idempotent_guid_id_twice : HttpBehaviorSpecificationOfSuccessfulCreateEvent {
+			private Guid _eventId;
+
+			protected override Task Given() {
+				_eventId = Guid.NewGuid();
+				return PostEvent();
+			}
+
+			protected override Task When() {
+				return PostEvent();
+			}
+
+			private async Task PostEvent() {
+				var request = CreateRequest(TestStream + "/incoming/" + _eventId.ToString(), "", "POST",
+					ContentType.Json);
+				request.Headers.Add(SystemHeaders.EventType, "SomeType");
+				var data = "{a : \"1\"}";
+				var bytes = Encoding.UTF8.GetBytes(data);
+				request.Content = new ByteArrayContent(bytes) {
+					Headers = { ContentType = new MediaTypeHeaderValue(ContentType.Json) }
+				};
+				_response = await GetRequestResponse(request);
+				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+			}
+		}
+
+		[TestFixture]
+		class when_posting_to_idempotent_guid_id_three_times : HttpBehaviorSpecificationOfSuccessfulCreateEvent {
+			private Guid _eventId;
+
+			protected override async Task Given() {
+				_eventId = Guid.NewGuid();
+				await PostEvent();
+				await PostEvent();
+			}
+
+			protected override Task When() {
+				return PostEvent();
+			}
+
+			private async Task PostEvent() {
+				var request = CreateRequest(TestStream + "/incoming/" + _eventId.ToString(), "", "POST",
+					ContentType.Json);
+				request.Headers.Add(SystemHeaders.EventType, "SomeType");
+				var data = "{a : \"1\"}";
+				var bytes = Encoding.UTF8.GetBytes(data);
+				request.Content = new ByteArrayContent(bytes) {
+					Headers = { ContentType = new MediaTypeHeaderValue(ContentType.Json) }
+				};
+				_response = await GetRequestResponse(request);
+				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(ContentType.EventsJson)]
+		[TestFixture(ContentType.LegacyEventsJson)]
+		class when_posting_an_event_once_raw_once_with_array(string contentType) : HttpBehaviorSpecificationOfSuccessfulCreateEvent {
+			private Guid _eventId;
+
+			protected override Task Given() {
+				_eventId = Guid.NewGuid();
+				return PostEvent();
+			}
+
+			protected override async Task When() {
+				_response = await MakeArrayEventsPost(
+					TestStream,
+					new[] { new { EventId = _eventId, EventType = "event-type", Data = new { A = "1" } } },
+					contentType: contentType);
+			}
+
+			private async Task PostEvent() {
+				var request = CreateRequest(TestStream, "", "POST", ContentType.Json);
+				request.Headers.Add(SystemHeaders.EventId, _eventId.ToString());
+				request.Headers.Add(SystemHeaders.EventType, "SomeType");
+				var data = "{a : \"1\"}";
+				var bytes = Encoding.UTF8.GetBytes(data);
+				request.Content = new ByteArrayContent(bytes) {
+					Headers = { ContentType = new MediaTypeHeaderValue(ContentType.Json) }
+				};
+				_response = await GetRequestResponse(request);
+				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture]
+		class when_posting_an_event_twice_raw : HttpBehaviorSpecificationOfSuccessfulCreateEvent {
+			private Guid _eventId;
+
+			protected override Task Given() {
+				_eventId = Guid.NewGuid();
+				return PostEvent();
+			}
+
+			protected override Task When() {
+				return PostEvent();
+			}
+
+			private async Task PostEvent() {
+				var request = CreateRequest(TestStream, "", "POST", ContentType.Json);
+				request.Headers.Add(SystemHeaders.EventId, _eventId.ToString());
+				request.Headers.Add(SystemHeaders.EventType, "SomeType");
+				var data = "{a : \"1\"}";
+				var bytes = Encoding.UTF8.GetBytes(data);
+				request.Content = new ByteArrayContent(bytes) {
+					Headers = { ContentType = new MediaTypeHeaderValue(ContentType.Json) }
+				};
+				_response = await GetRequestResponse(request);
+				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture]
+		class when_posting_an_event_three_times_raw : HttpBehaviorSpecificationOfSuccessfulCreateEvent {
+			private Guid _eventId;
+
+			protected override async Task Given() {
+				_eventId = Guid.NewGuid();
+				await PostEvent();
+				await PostEvent();
+			}
+
+			protected override Task When() {
+				return PostEvent();
+			}
+
+			private async Task PostEvent() {
+				var request = CreateRequest(TestStream, "", "POST", ContentType.Json);
+				request.Headers.Add(SystemHeaders.EventId, _eventId.ToString());
+				request.Headers.Add(SystemHeaders.EventType, "SomeType");
+				var data = "{a : \"1\"}";
+				var bytes = Encoding.UTF8.GetBytes(data);
+				request.Content = new ByteArrayContent(bytes) {
+					Headers = { ContentType = new MediaTypeHeaderValue(ContentType.Json) }
+				};
+				_response = await GetRequestResponse(request);
+				Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(ContentType.EventsJson)]
+		[TestFixture(ContentType.LegacyEventsJson)]
+		class when_posting_an_event_twice_array(string contentType) : HttpBehaviorSpecificationOfSuccessfulCreateEvent {
+			private Guid _eventId;
+
+			protected override async Task Given() {
+				_eventId = Guid.NewGuid();
+				var response1 = await MakeArrayEventsPost(
+					TestStream,
+					new[] { new { EventId = _eventId, EventType = "event-type", Data = new { A = "1" } } },
+					contentType: contentType);
+				Assert.AreEqual(HttpStatusCode.Created, response1.StatusCode);
+			}
+
+			protected override async Task When() {
+				_response = await MakeArrayEventsPost(
+					TestStream,
+					new[] { new { EventId = _eventId, EventType = "event-type", Data = new { A = "1" } } },
+					contentType: contentType);
+			}
+		}
+
+		[Category("LongRunning")]
+		[TestFixture(ContentType.EventsJson)]
+		[TestFixture(ContentType.LegacyEventsJson)]
+		class when_posting_an_event_three_times_as_array(string contentType) : HttpBehaviorSpecificationOfSuccessfulCreateEvent {
+			private Guid _eventId;
+
+			protected override async Task Given() {
+				_eventId = Guid.NewGuid();
+				var response1 = await MakeArrayEventsPost(
+					TestStream,
+					new[] { new { EventId = _eventId, EventType = "event-type", Data = new { A = "1" } } },
+					contentType: contentType);
+				Assert.AreEqual(HttpStatusCode.Created, response1.StatusCode);
+				var response2 = await MakeArrayEventsPost(
+					TestStream,
+					new[] { new { EventId = _eventId, EventType = "event-type", Data = new { A = "1" } } },
+					contentType: contentType);
+				Assert.AreEqual(HttpStatusCode.Created, response2.StatusCode);
+			}
+
+			protected override async Task When() {
+				_response = await MakeArrayEventsPost(
+					TestStream,
+					new[] { new { EventId = _eventId, EventType = "event-type", Data = new { A = "1" } } },
+					contentType: contentType);
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/Streams/metadata.cs b/src/KurrentDB.Core.Tests/Http/Streams/metadata.cs
new file mode 100644
index 00000000000..57c82c4b0c1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/Streams/metadata.cs
@@ -0,0 +1,129 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Tests.Http.Streams.basic;
+using KurrentDB.Core.Tests.Http.Users.users;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+using ContentType = KurrentDB.Transport.Http.ContentType;
+using HttpStatusCode = System.Net.HttpStatusCode;
+
+namespace KurrentDB.Core.Tests.Http.Streams;
+
+[TestFixture]
+public class when_posting_metadata_as_json_to_non_existing_stream : with_admin_user {
+	private HttpResponseMessage _response;
+
+	protected override Task Given() => Task.CompletedTask;
+
+	protected override async Task When() {
+		var req = CreateRawJsonPostRequest(TestStream + "/metadata", "POST", new { A = "1" },
+			DefaultData.AdminNetworkCredentials);
+		req.Headers.Add(SystemHeaders.EventId, Guid.NewGuid().ToString());
+		_response = await _client.SendAsync(req);
+	}
+
+	[Test]
+	public void returns_created_status_code() {
+		Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+	}
+
+	[Test]
+	public void returns_a_location_header() {
+		Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
+	}
+
+	[Test]
+	public async Task returns_a_location_header_that_can_be_read_as_json() {
+		var json = await GetJson<JObject>(_response.Headers.GetLocationAsString());
+		HelperExtensions.AssertJson(new { A = "1" }, json);
+	}
+}
+
+[TestFixture(ContentType.EventsJson)]
+[TestFixture(ContentType.LegacyEventsJson)]
+public class when_posting_metadata_as_json_to_existing_stream(string contentType) : HttpBehaviorSpecificationWithSingleEvent {
+	protected override async Task Given() {
+		_response = await MakeArrayEventsPost(
+			TestStream,
+			new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = new { A = "1" } } },
+			contentType: contentType);
+	}
+
+	protected override async Task When() {
+		var req = CreateRawJsonPostRequest(TestStream + "/metadata", "POST", new { A = "1" },
+			DefaultData.AdminNetworkCredentials);
+		req.Headers.Add(SystemHeaders.EventId, Guid.NewGuid().ToString());
+		_response = await _client.SendAsync(req);
+	}
+
+	[Test]
+	public void returns_created_status_code() {
+		Assert.AreEqual(HttpStatusCode.Created, _response.StatusCode);
+	}
+
+	[Test]
+	public void returns_a_location_header() {
+		Assert.IsNotEmpty(_response.Headers.GetLocationAsString());
+	}
+
+	[Test]
+	public async Task returns_a_location_header_that_can_be_read_as_json() {
+		var json = await GetJson<JObject>(_response.Headers.GetLocationAsString());
+		HelperExtensions.AssertJson(new { A = "1" }, json);
+	}
+}
+
+[TestFixture]
+public class when_getting_metadata_for_an_existing_stream_without_an_accept_header : HttpBehaviorSpecificationWithSingleEvent {
+	protected override Task When() {
+		return Get(TestStream + "/metadata", null, null, DefaultData.AdminNetworkCredentials, false);
+	}
+
+	[Test]
+	public void returns_ok_status_code() {
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+	}
+
+	[Test]
+	public void returns_empty_body() {
+		Assert.AreEqual(Empty.Xml, _lastResponseBody);
+	}
+}
+
+[TestFixture(ContentType.EventsJson)]
+[TestFixture(ContentType.LegacyEventsJson)]
+public class when_getting_metadata_for_an_existing_stream_and_no_metadata_exists(string contentType) : HttpBehaviorSpecificationWithSingleEvent {
+	protected override async Task Given() {
+		_response = await MakeArrayEventsPost(
+			TestStream,
+			new[] { new { EventId = Guid.NewGuid(), EventType = "event-type", Data = new { A = "1" } } },
+			contentType: contentType);
+	}
+
+	protected override Task When() {
+		return Get(TestStream + "/metadata", String.Empty, ContentType.Json,
+			DefaultData.AdminNetworkCredentials);
+	}
+
+	[Test]
+	public void returns_ok_status_code() {
+		Assert.AreEqual(HttpStatusCode.OK, _lastResponse.StatusCode);
+	}
+
+	[Test]
+	public void returns_empty_etag() {
+		Assert.Null(_lastResponse.Headers.ETag);
+	}
+
+	[Test]
+	public void returns_empty_body() {
+		Assert.AreEqual(Empty.Json, _lastResponseBody);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/TestController.cs b/src/KurrentDB.Core.Tests/Http/TestController.cs
new file mode 100644
index 00000000000..19626a11947
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/TestController.cs
@@ -0,0 +1,89 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using System.Threading;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Services.Transport.Http;
+using KurrentDB.Core.Services.Transport.Http.Controllers;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.Codecs;
+using KurrentDB.Transport.Http.EntityManagement;
+
+namespace KurrentDB.Core.Tests.Http;
+
+public class TestController : CommunicationController {
+	public TestController(IPublisher publisher)
+		: base(publisher) {
+	}
+
+	protected override void SubscribeCore(IHttpService service) {
+		Register(service, "/test1", Test1Handler);
+		Register(service, "/test-anonymous", TestAnonymousHandler);
+		Register(service, "/test-encoding/{a}?b={b}", TestEncodingHandler);
+		Register(service, "/test-encoding-reserved-%20?b={b}",
+			(manager, match) => TestEncodingHandler(manager, match, "%20"));
+		Register(service, "/test-encoding-reserved-%24?b={b}",
+			(manager, match) => TestEncodingHandler(manager, match, "%24"));
+		Register(service, "/test-encoding-reserved-%25?b={b}",
+			(manager, match) => TestEncodingHandler(manager, match, "%25"));
+		Register(service, "/test-encoding-reserved- ?b={b}",
+			(manager, match) => TestEncodingHandler(manager, match, " "));
+		Register(service, "/test-encoding-reserved-$?b={b}",
+			(manager, match) => TestEncodingHandler(manager, match, "$"));
+		Register(service, "/test-encoding-reserved-%?b={b}",
+			(manager, match) => TestEncodingHandler(manager, match, "%"));
+		Register(service, "/test-timeout?sleepfor={sleepfor}",
+			(manager, match) => TestTimeoutHandler(manager, match));
+	}
+
+	private void Register(
+		IHttpService service, string uriTemplate, Action<HttpEntityManager, UriTemplateMatch> handler,
+		string httpMethod = HttpMethod.Get) {
+		Register(service, uriTemplate, httpMethod, handler, Codec.NoCodecs, new ICodec[] { Codec.ManualEncoding }, new Operation(Operations.Node.StaticContent));
+	}
+
+	private void Test1Handler(HttpEntityManager http, UriTemplateMatch match) {
+		if (http.User != null && !http.User.HasClaim(ClaimTypes.Anonymous, ""))
+			http.Reply("OK", 200, "OK", "text/plain");
+		else
+			http.Reply("Please authenticate yourself", 401, "Unauthorized", "text/plain");
+	}
+
+	private void TestAnonymousHandler(HttpEntityManager http, UriTemplateMatch match) {
+		if (!http.User.HasClaim(ClaimTypes.Anonymous, ""))
+			http.Reply("ERROR", 500, "ERROR", "text/plain");
+		else
+			http.Reply("OK", 200, "OK", "text/plain");
+	}
+
+	private void TestEncodingHandler(HttpEntityManager http, UriTemplateMatch match) {
+		var a = match.BoundVariables["a"];
+		var b = match.BoundVariables["b"];
+
+		http.Reply(new { a = a, b = b, rawSegment = http.RequestedUrl.Segments[2] }.ToJson(), 200, "OK",
+			ContentType.Json);
+	}
+
+	private void TestEncodingHandler(HttpEntityManager http, UriTemplateMatch match, string a) {
+		var b = match.BoundVariables["b"];
+
+		http.Reply(
+			new {
+				a = a,
+				b = b,
+				rawSegment = http.RequestedUrl.Segments[1],
+				requestUri = match.RequestUri,
+				rawUrl = http.HttpEntity.Request.RawUrl
+			}.ToJson(), 200, "OK", ContentType.Json);
+	}
+
+	private void TestTimeoutHandler(HttpEntityManager http, UriTemplateMatch match) {
+		var sleepFor = int.Parse(match.BoundVariables["sleepfor"]);
+		Thread.Sleep(sleepFor);
+		http.Reply("OK", 200, "OK", "text/plain");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Http/Users/StreamHelpers.cs b/src/KurrentDB.Core.Tests/Http/Users/StreamHelpers.cs
new file mode 100644
index 00000000000..b25378542ce
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Http/Users/StreamHelpers.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.Tests.Http.Users;
+
+public static class StreamHelpers {
+	public static void WriteJson<T>(this Stream stream, T data) {
+		var bytes = data.ToJsonBytes();
+		stream.Write(bytes, 0, bytes.Length);
+	}
+}
diff --git a/src/EventStore.Core.Tests/Http/Users/users.cs b/src/KurrentDB.Core.Tests/Http/Users/users.cs
similarity index 97%
rename from src/EventStore.Core.Tests/Http/Users/users.cs
rename to src/KurrentDB.Core.Tests/Http/Users/users.cs
index eae92f5e30a..8c7810174f6 100644
--- a/src/EventStore.Core.Tests/Http/Users/users.cs
+++ b/src/KurrentDB.Core.Tests/Http/Users/users.cs
@@ -1,21 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using EventStore.Core.Services;
-using EventStore.Core.Services.Transport.Http.Controllers;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
+using KurrentDB.Core.Tests.Helpers;
 using Newtonsoft.Json.Linq;
+using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Http.Users {
+namespace KurrentDB.Core.Tests.Http.Users {
 	namespace users {
+		public abstract class with_admin_user : with_admin_user<LogFormat.V2, string>;
+
 		public abstract class with_admin_user<TLogFormat, TStreamId> : HttpBehaviorSpecification<TLogFormat, TStreamId> {
 			protected readonly NetworkCredential _admin = DefaultData.AdminNetworkCredentials;
 
-			protected override bool GivenSkipInitializeStandardUsersCheck() {
-				return false;
-			}
-
 			public with_admin_user() {
 				SetDefaultCredentials(_admin);
 			}
diff --git a/src/KurrentDB.Core.Tests/IIndexReaderExtensions.cs b/src/KurrentDB.Core.Tests/IIndexReaderExtensions.cs
new file mode 100644
index 00000000000..63076d21e49
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/IIndexReaderExtensions.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+
+namespace KurrentDB.Core.Tests;
+
+public static class IIndexReaderExtensions {
+	public static ValueTask<IndexReadEventResult> ReadEvent(this IIndexReader<string> index, string streamName, long eventNumber, CancellationToken token) =>
+		index.ReadEvent(streamName, streamName, eventNumber, token);
+
+	public static ValueTask<IndexReadStreamResult> ReadStreamEventsBackward(this IIndexReader<string> index, string streamName, long fromEventNumber, int maxCount, CancellationToken token) =>
+		index.ReadStreamEventsBackward(streamName, streamName, fromEventNumber, maxCount, token);
+
+	public static ValueTask<IndexReadStreamResult> ReadStreamEventsForward(this IIndexReader<string> index, string streamName, long fromEventNumber, int maxCount, CancellationToken token) =>
+		index.ReadStreamEventsForward(streamName, streamName, fromEventNumber, maxCount, token);
+}
diff --git a/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/rolling_manual_only_merges.cs b/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/rolling_manual_only_merges.cs
new file mode 100644
index 00000000000..eb9826c21f3
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/rolling_manual_only_merges.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.AutoMergeLevelTests;
+
+[TestFixture]
+public class rolling_manual_only_merges : when_max_auto_merge_level_is_set {
+	public rolling_manual_only_merges() : base(0) {
+	}
+
+	[Test]
+	public void alternating_table_dumps_and_manual_merges_should_merge_correctly() {
+		AddTables(1);
+		Assert.AreEqual(1, _result.MergedMap.InOrder().Count());
+		for (int i = 0; i < 100; i++) {
+			AddTables(1);
+			Assert.AreEqual(2, _result.MergedMap.InOrder().Count());
+
+			_result = _result.MergedMap.TryManualMerge(_fileNameProvider,
+				_ptableVersion, 16, false);
+			_result.ToDelete.ForEach(x => x.MarkForDestruction());
+			Assert.AreEqual(1, _result.MergedMap.InOrder().Count());
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_auto_merge_level_is_zero.cs b/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_auto_merge_level_is_zero.cs
new file mode 100644
index 00000000000..35362d0693a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_auto_merge_level_is_zero.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.AutoMergeLevelTests;
+
+[TestFixture]
+public class when_auto_merge_level_is_zero : when_max_auto_merge_level_is_set {
+	public when_auto_merge_level_is_zero() : base(0) {
+	}
+
+	[Test]
+	public void manual_merge_should_merge_all_tables() {
+		AddTables(11);
+		_result = _result.MergedMap.TryManualMerge(
+			_fileNameProvider, _ptableVersion);
+		Assert.AreEqual(1, _result.MergedMap.InOrder().Count());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_max_auto_merge_level_is_reduced.cs b/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_max_auto_merge_level_is_reduced.cs
new file mode 100644
index 00000000000..c763d04e366
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_max_auto_merge_level_is_reduced.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.AutoMergeLevelTests;
+
+public class when_max_auto_merge_level_is_reduced : when_max_auto_merge_level_is_set {
+	public when_max_auto_merge_level_is_reduced() : base(5) {
+	}
+
+	[Test]
+	public void should_merge_levels_above_max_level() {
+		AddTables(201); //gives 1 level 0, 1 level 3 and 6 level 5s
+		Assert.AreEqual(8, _result.MergedMap.InOrder().Count());
+		var filename = GetFilePathFor("changemaxlevel");
+		_result.MergedMap.SaveToFile(filename);
+		_result.MergedMap.Dispose(TimeSpan.FromMilliseconds(100));
+		_map.Dispose(TimeSpan.FromMilliseconds(100));
+		_map = IndexMapTestFactory.FromFile(filename, maxAutoMergeLevel: 3);
+		_result = _map.TryManualMerge(
+			_fileNameProvider,
+			_ptableVersion,
+			skipIndexVerify: _skipIndexVerify);
+		Assert.AreEqual(2, _result.MergedMap.InOrder().Count());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_max_auto_merge_level_is_set.cs b/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_max_auto_merge_level_is_set.cs
new file mode 100644
index 00000000000..632dea00841
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_max_auto_merge_level_is_set.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.AutoMergeLevelTests;
+
+[TestFixture]
+public abstract class when_max_auto_merge_level_is_set : SpecificationWithDirectoryPerTestFixture {
+	protected readonly int _maxAutoMergeLevel;
+	protected string _filename;
+	protected IndexMap _map;
+	protected byte _ptableVersion = 4;
+	protected MergeResult _result;
+	protected bool _skipIndexVerify = true;
+	protected GuidFilenameProvider _fileNameProvider;
+
+	public when_max_auto_merge_level_is_set(int maxAutoMergeLevel = 2) {
+		_maxAutoMergeLevel = maxAutoMergeLevel;
+	}
+
+	[OneTimeSetUp]
+	public virtual void Setup() {
+		_filename = GetTempFilePath();
+		_fileNameProvider = new GuidFilenameProvider(PathName);
+		_map = IndexMapTestFactory.FromFile(_filename, maxTablesPerLevel: 2, maxAutoMergeLevel: _maxAutoMergeLevel);
+	}
+
+	protected void AddTables(int count) {
+		var memtable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		memtable.Add(0, 1, 0);
+		var first = _map;
+		if (_result != null)
+			first = _result.MergedMap;
+		var pTable = PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify);
+		_result = first.AddAndMergePTable(pTable,
+			10, 20, _fileNameProvider, _ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
+		for (int i = 3; i <= count * 2; i += 2) {
+			pTable = PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify);
+			_result = _result.MergedMap.AddAndMergePTable(
+				pTable,
+				prepareCheckpoint: i * 10,
+				commitCheckpoint: (i + 1) * 10,
+				_fileNameProvider, _ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
+			_result.ToDelete.ForEach(x => x.MarkForDestruction());
+		}
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+		_result.MergedMap.InOrder().ToList().ForEach(x => x.MarkForDestruction());
+		_result.MergedMap.Dispose(TimeSpan.FromMilliseconds(100));
+		_map.Dispose(TimeSpan.FromMilliseconds(100));
+		File.Delete(_filename);
+
+		return base.TestFixtureTearDown();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_multiple_tables_higher_than_manual_merge_level.cs b/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_multiple_tables_higher_than_manual_merge_level.cs
new file mode 100644
index 00000000000..17ee455f95d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_multiple_tables_higher_than_manual_merge_level.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.AutoMergeLevelTests;
+
+[TestFixture]
+public class when_multiple_tables_higher_than_manual_merge_level : when_max_auto_merge_level_is_set {
+	public override void Setup() {
+		base.Setup();
+		AddTables(8);
+		_map.Dispose(TimeSpan.FromMilliseconds(100));
+		var filename = GetFilePathFor("indexmap");
+		_result.MergedMap.SaveToFile(filename);
+		_result.MergedMap.Dispose(TimeSpan.FromMilliseconds(100));
+		_map = IndexMapTestFactory.FromFile(filename, maxAutoMergeLevel: 1);
+	}
+
+	[Test]
+	public void tables_should_be_merged() {
+		_result = _map.TryManualMerge(
+			_fileNameProvider,
+			_ptableVersion,
+			skipIndexVerify: _skipIndexVerify);
+		Assert.AreEqual(1, _result.MergedMap.InOrder().Count());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_no_tables_are_eligible_for_manual_merge.cs b/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_no_tables_are_eligible_for_manual_merge.cs
new file mode 100644
index 00000000000..85b5358912c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_no_tables_are_eligible_for_manual_merge.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.AutoMergeLevelTests;
+
+public class when_no_tables_are_eligible_for_manual_merge : when_max_auto_merge_level_is_set {
+	public override void Setup() {
+		base.Setup();
+		AddTables(8);
+		Assert.AreEqual(2, _result.MergedMap.InOrder().Count());
+
+		_result = _result.MergedMap.TryManualMerge(
+			_fileNameProvider,
+			_ptableVersion,
+			skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+	}
+
+	[Test]
+	public void should_not_manually_merge_any_table() {
+		Assert.AreEqual(1, _result.MergedMap.InOrder().Count());
+		AddTables(3); //adding 3 tables will cause an auto merge, but not enough to give us tables for manual merge
+		Assert.AreEqual(3, _result.MergedMap.InOrder().Count());
+
+		_result = _result.MergedMap.TryManualMerge(
+			_fileNameProvider,
+			_ptableVersion,
+			skipIndexVerify: _skipIndexVerify);
+
+		Assert.False(_result.HasMergedAny);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_no_tables_have_yet_reached_maximum_automerge_level.cs b/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_no_tables_have_yet_reached_maximum_automerge_level.cs
new file mode 100644
index 00000000000..bdd830ecc51
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_no_tables_have_yet_reached_maximum_automerge_level.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.AutoMergeLevelTests;
+
+public class when_no_tables_have_yet_reached_maximum_automerge_level : when_max_auto_merge_level_is_set {
+	[Test]
+	public void should_not_manually_merge_any_table() {
+		AddTables(3);
+		Assert.AreEqual(2, _result.MergedMap.InOrder().Count());
+		var result = _result.MergedMap.TryManualMerge(
+			_fileNameProvider,
+			_ptableVersion,
+			skipIndexVerify: _skipIndexVerify);
+		Assert.False(result.HasMergedAny);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_only_one_table_file_higher_than_manual_merge_level.cs b/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_only_one_table_file_higher_than_manual_merge_level.cs
new file mode 100644
index 00000000000..6fe06475d1b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_only_one_table_file_higher_than_manual_merge_level.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.AutoMergeLevelTests;
+
+[TestFixture]
+public class when_only_one_table_file_higher_than_manual_merge_level : when_max_auto_merge_level_is_set {
+	public override void Setup() {
+		base.Setup();
+		AddTables(5);
+		_map.Dispose(TimeSpan.FromMilliseconds(100));
+		var filename = GetFilePathFor("indexmap");
+		_result.MergedMap.SaveToFile(filename);
+		_result.MergedMap.Dispose(TimeSpan.FromMilliseconds(5));
+		_map = IndexMapTestFactory.FromFile(filename, maxAutoMergeLevel: 1);
+	}
+
+	[Test]
+	public void no_table_should_manually_merged() {
+		var result = _map.TryMergeOneLevel(
+			_fileNameProvider,
+			_ptableVersion,
+			skipIndexVerify: _skipIndexVerify
+			);
+		Assert.False(result.HasMergedAny);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_tables_available_for_manual_merge.cs b/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_tables_available_for_manual_merge.cs
new file mode 100644
index 00000000000..d233abf5514
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/AutoMergeLevelTests/when_tables_available_for_manual_merge.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.AutoMergeLevelTests;
+
+public class when_tables_available_for_manual_merge : when_max_auto_merge_level_is_set {
+	[Test]
+	public void should_merge_pending_tables_at_max_auto_merge_level() {
+		AddTables(100);
+		Assert.AreEqual(25, _result.MergedMap.InOrder().Count());
+		_result = _result.MergedMap.TryManualMerge(
+			_fileNameProvider,
+			_ptableVersion,
+			skipIndexVerify: _skipIndexVerify);
+		Assert.AreEqual(1, _result.MergedMap.InOrder().Count());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/FakeFilenameProvider.cs b/src/KurrentDB.Core.Tests/Index/FakeFilenameProvider.cs
new file mode 100644
index 00000000000..b2d9e4452ba
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/FakeFilenameProvider.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Index;
+
+namespace KurrentDB.Core.Tests.Index;
+
+public class FakeFilenameProvider : IIndexFilenameProvider {
+	private List<string> _filenames = new List<string>();
+	private int _current;
+
+
+	public FakeFilenameProvider(params string[] fakenames) {
+		_filenames.AddRange(fakenames);
+	}
+
+	public string GetFilenameNewTable() {
+		var ret = _filenames[_current];
+		_current++;
+		return ret;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/FakeIndexHasher.cs b/src/KurrentDB.Core.Tests/Index/FakeIndexHasher.cs
new file mode 100644
index 00000000000..eff9d3e40fb
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/FakeIndexHasher.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Index.Hashes;
+
+namespace KurrentDB.Core.Tests.Index;
+
+public class FakeIndexHasher : IHasher<string> {
+	public uint Hash(byte[] data) {
+		return (uint)data.Length;
+	}
+
+	public uint Hash(string s) {
+		return uint.Parse(s);
+	}
+
+	public uint Hash(byte[] data, int offset, uint len, uint seed) {
+		return (uint)data.Length;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/FakeIndexReader.cs b/src/KurrentDB.Core.Tests/Index/FakeIndexReader.cs
new file mode 100644
index 00000000000..0e0a50cdbd4
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/FakeIndexReader.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.Tests.Index;
+
+public class FakeIndexReader : ITransactionFileReader {
+	private readonly Func<long, bool> _existsAt;
+
+	public FakeIndexReader(Func<long, bool> existsAt = null) {
+		_existsAt = existsAt ?? (l => true);
+	}
+
+	public void Reposition(long position) {
+		throw new NotImplementedException();
+	}
+
+	public ValueTask<SeqReadResult> TryReadNext(CancellationToken token)
+		=> ValueTask.FromException<SeqReadResult>(new NotImplementedException());
+
+	public ValueTask<SeqReadResult> TryReadPrev(CancellationToken token)
+		=> ValueTask.FromException<SeqReadResult>(new NotImplementedException());
+
+	public ValueTask<RecordReadResult> TryReadAt(long position, bool couldBeScavenged, CancellationToken token) {
+		var record = (LogRecord)new PrepareLogRecord(position, Guid.NewGuid(), Guid.NewGuid(), 0, 0,
+			position.ToString(), null, -1, DateTime.UtcNow, PrepareFlags.None, "type", null,
+			Array.Empty<byte>(), null);
+		return new(new RecordReadResult(true, position + 1, record, 1));
+	}
+
+	public ValueTask<bool> ExistsAt(long position, CancellationToken token)
+		=> token.IsCancellationRequested
+			? ValueTask.FromCanceled<bool>(token)
+			: ValueTask.FromResult(_existsAt(position));
+}
diff --git a/src/KurrentDB.Core.Tests/Index/Hashers/ConstantHasher.cs b/src/KurrentDB.Core.Tests/Index/Hashers/ConstantHasher.cs
new file mode 100644
index 00000000000..234d94b0093
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/Hashers/ConstantHasher.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Index.Hashes;
+
+namespace KurrentDB.Core.Tests.Index.Hashers;
+
+public class ConstantHasher : IHasher<string> {
+	private readonly uint _const;
+	public ConstantHasher(uint @const) {
+		_const = @const;
+	}
+
+	public uint Hash(string s) {
+		return _const;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/Hashers/FirstCharacterHasher.cs b/src/KurrentDB.Core.Tests/Index/Hashers/FirstCharacterHasher.cs
new file mode 100644
index 00000000000..5162cc94419
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/Hashers/FirstCharacterHasher.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Index.Hashes;
+
+namespace KurrentDB.Core.Tests.Index.Hashers;
+
+public class FirstCharacterHasher : ILongHasher<string> {
+	public ulong Hash(string x) =>
+		(ulong)(x.Length == 0 ? 0 : x[0].GetHashCode());
+}
diff --git a/src/KurrentDB.Core.Tests/Index/Hashers/HumanReadableHasher.cs b/src/KurrentDB.Core.Tests/Index/Hashers/HumanReadableHasher.cs
new file mode 100644
index 00000000000..271e6096c5a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/Hashers/HumanReadableHasher.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.Services;
+
+namespace KurrentDB.Core.Tests.Index.Hashers;
+
+// Generates hashes that are obvious to humans based on the stream name.
+// The first character of the stream name is the basis of the hash for the corresponding metastream
+// The second character of the stream name is the basis of the hash for the original stream
+// e.g.
+//   "$$ma-1 -> 'm'
+//   "ma-1" -> 'a' (97)
+public class HumanReadableHasher : ILongHasher<string> {
+	private readonly HumanReadableHasher32 _hash32;
+
+	public HumanReadableHasher() {
+		_hash32 = new HumanReadableHasher32();
+	}
+
+	public ulong Hash(string x) => _hash32.Hash(x);
+}
+
+public class HumanReadableHasher32 : IHasher<string> {
+	public uint Hash(string x) {
+		if (x == "")
+			return 0;
+
+		var c = SystemStreams.IsMetastream(x)
+			? x[2]
+			: x[1];
+
+		return c;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/Hashers/HumanReadableHasherTests.cs b/src/KurrentDB.Core.Tests/Index/Hashers/HumanReadableHasherTests.cs
new file mode 100644
index 00000000000..967fbc0ff04
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/Hashers/HumanReadableHasherTests.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.Hashers;
+
+public class HumanReadableHasherTests {
+	[Test]
+	public void hashes_original_stream() {
+		var sut = new HumanReadableHasher();
+		Assert.AreEqual('a', sut.Hash("ma-1"));
+	}
+
+	[Test]
+	public void hashes_meta_stream() {
+		var sut = new HumanReadableHasher();
+		Assert.AreEqual('m', sut.Hash("$$ma-1"));
+	}
+
+	[Test]
+	public void hashes_empty_string() {
+		var sut = new HumanReadableHasher();
+		Assert.AreEqual(0UL, sut.Hash(""));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexEntryTests.cs b/src/KurrentDB.Core.Tests/Index/IndexEntryTests.cs
new file mode 100644
index 00000000000..3600613cb3e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexEntryTests.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index;
+
+[TestFixture]
+public class IndexEntryTests {
+	[Test]
+	public void key_is_made_of_stream_and_version() {
+		var entry = new IndexEntryV1 { Stream = 0x01, Version = 0x12 };
+		Assert.AreEqual(0x0000000100000012, entry.Key);
+	}
+
+	[Test]
+	public void bytes_is_made_of_key_and_position() {
+		unsafe {
+			var entry = new IndexEntryV1 { Stream = 0x0101, Version = 0x1234, Position = 0xFFFF };
+			Assert.AreEqual(0x34, entry.Bytes[0]);
+			Assert.AreEqual(0x12, entry.Bytes[1]);
+			Assert.AreEqual(0x00, entry.Bytes[2]);
+			Assert.AreEqual(0x00, entry.Bytes[3]);
+			Assert.AreEqual(0x01, entry.Bytes[4]);
+			Assert.AreEqual(0x01, entry.Bytes[5]);
+			Assert.AreEqual(0x00, entry.Bytes[6]);
+			Assert.AreEqual(0x00, entry.Bytes[7]);
+			Assert.AreEqual(0xFF, entry.Bytes[8]);
+			Assert.AreEqual(0xFF, entry.Bytes[9]);
+			Assert.AreEqual(0x00, entry.Bytes[10]);
+			Assert.AreEqual(0x00, entry.Bytes[11]);
+			Assert.AreEqual(0x00, entry.Bytes[12]);
+			Assert.AreEqual(0x00, entry.Bytes[13]);
+			Assert.AreEqual(0x00, entry.Bytes[14]);
+			Assert.AreEqual(0x00, entry.Bytes[15]);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexMapExtensions.cs b/src/KurrentDB.Core.Tests/Index/IndexMapExtensions.cs
new file mode 100644
index 00000000000..a7c6a2ec124
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexMapExtensions.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Index;
+
+namespace KurrentDB.Core.Tests.Index;
+
+public static class IndexMapExtensions {
+	public static MergeResult AddAndMergePTable(
+		this IndexMap indexMap,
+		PTable tableToAdd,
+		int prepareCheckpoint,
+		int commitCheckpoint,
+		IIndexFilenameProvider filenameProvider,
+		byte version,
+		int indexCacheDepth = 16,
+		bool skipIndexVerify = false,
+		bool useBloomFilter = true,
+		int lruCacheSize = 1_000_000) {
+
+		var addResult = indexMap.AddPTable(tableToAdd, prepareCheckpoint, commitCheckpoint);
+		if (addResult.CanMergeAny) {
+			var toDelete = new List<PTable>();
+			MergeResult mergeResult;
+			IndexMap curMap = addResult.NewMap;
+			do {
+				mergeResult = curMap.TryMergeOneLevel(
+					filenameProvider,
+					version,
+					indexCacheDepth,
+					skipIndexVerify,
+					useBloomFilter,
+					lruCacheSize
+				);
+
+				curMap = mergeResult.MergedMap;
+				toDelete.AddRange(mergeResult.ToDelete);
+			} while (mergeResult.CanMergeAny);
+
+			return new MergeResult(curMap, toDelete, true, false);
+		}
+		return new MergeResult(addResult.NewMap, new List<PTable>(), false, false);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexMapTestFactory.cs b/src/KurrentDB.Core.Tests/Index/IndexMapTestFactory.cs
new file mode 100644
index 00000000000..0558723eedd
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexMapTestFactory.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Index;
+
+namespace KurrentDB.Core.Tests.Index;
+
+public static class IndexMapTestFactory {
+	public static IndexMap FromFile(string filename, int maxTablesPerLevel = 4,
+		bool loadPTables = true,
+		int cacheDepth = 16,
+		bool skipIndexVerify = false,
+		bool useBloomFilter = true,
+		int lruCacheSize = 1_000_000,
+		int threads = 1,
+		int maxAutoMergeLevel = int.MaxValue,
+		int pTableMaxReaderCount = Constants.PTableMaxReaderCountDefault) {
+		return IndexMap.FromFile(filename, maxTablesPerLevel, loadPTables, cacheDepth, skipIndexVerify, useBloomFilter, lruCacheSize, threads,
+			maxAutoMergeLevel, pTableMaxReaderCount);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/PTableReadScenario.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/PTableReadScenario.cs
new file mode 100644
index 00000000000..53ef4edf04e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/PTableReadScenario.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+public abstract class PTableReadScenario : SpecificationWithFile {
+	private readonly int _midpointCacheDepth;
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+
+	protected PTable PTable;
+	private bool _skipIndexVerify;
+
+	protected PTableReadScenario(byte ptableVersion, bool skipIndexVerify, int midpointCacheDepth) {
+		_ptableVersion = ptableVersion;
+		_skipIndexVerify = skipIndexVerify;
+		_midpointCacheDepth = midpointCacheDepth;
+	}
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+
+		var table = new HashListMemTable(_ptableVersion, maxSize: 50);
+
+		AddItemsForScenario(table);
+
+		PTable = PTable.FromMemtable(table, Filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, cacheDepth: _midpointCacheDepth,
+			skipIndexVerify: _skipIndexVerify);
+	}
+
+	[TearDown]
+	public override void TearDown() {
+		PTable.Dispose();
+
+		base.TearDown();
+	}
+
+	protected abstract void AddItemsForScenario(IMemTable memTable);
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/adding_four_items_to_empty_index_map_with_four_tables_per_level_causes_merge.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/adding_four_items_to_empty_index_map_with_four_tables_per_level_causes_merge.cs
new file mode 100644
index 00000000000..37038af5a86
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/adding_four_items_to_empty_index_map_with_four_tables_per_level_causes_merge.cs
@@ -0,0 +1,113 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class
+	adding_four_items_to_empty_index_map_with_four_tables_per_level_causes_merge :
+		SpecificationWithDirectoryPerTestFixture {
+	private string _filename;
+	private IndexMap _map;
+	private string _mergeFile;
+	private MergeResult _result;
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+	private bool _skipIndexVerify;
+	private int _maxAutoMergeIndexLevel = 4;
+
+	public adding_four_items_to_empty_index_map_with_four_tables_per_level_causes_merge(byte version,
+		bool skipIndexVerify) {
+		_ptableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_mergeFile = GetTempFilePath();
+		_filename = GetTempFilePath();
+
+		_map = IndexMapTestFactory.FromFile(_filename, maxTablesPerLevel: 4, maxAutoMergeLevel: _maxAutoMergeIndexLevel);
+		var memtable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		memtable.Add(0, 1, 0);
+
+		_result = _map.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 1, 2,
+			new GuidFilenameProvider(PathName),
+			_ptableVersion,
+			0,
+			skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+
+		_result = _result.MergedMap.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 3, 4,
+			new GuidFilenameProvider(PathName),
+			_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+
+		_result = _result.MergedMap.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 4, 5,
+			new GuidFilenameProvider(PathName),
+			_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+
+		_result = _result.MergedMap.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 1,
+			new FakeFilenameProvider(_mergeFile),
+			_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_result.MergedMap.InOrder().ToList().ForEach(x => x.MarkForDestruction());
+		File.Delete(_filename);
+		File.Delete(_mergeFile);
+
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void the_prepare_checkpoint_is_taken_from_the_latest_added_table() {
+		Assert.AreEqual(0, _result.MergedMap.PrepareCheckpoint);
+	}
+
+	[Test]
+	public void the_commit_checkpoint_is_taken_from_the_latest_added_table() {
+		Assert.AreEqual(1, _result.MergedMap.CommitCheckpoint);
+	}
+
+	[Test]
+	public void there_are_four_items_to_delete() {
+		Assert.AreEqual(4, _result.ToDelete.Count);
+	}
+
+	[Test]
+	public void the_merged_map_has_a_single_file() {
+		Assert.AreEqual(1, _result.MergedMap.GetAllFilenames().Count());
+		Assert.AreEqual(_mergeFile, _result.MergedMap.GetAllFilenames().ToList()[0]);
+	}
+
+	[Test]
+	public void the_original_map_did_not_change() {
+		Assert.AreEqual(0, _map.InOrder().Count());
+		Assert.AreEqual(0, _map.GetAllFilenames().Count());
+	}
+
+	[Test]
+	public void a_merged_file_was_created() {
+		Assert.IsTrue(File.Exists(_mergeFile));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/adding_four_items_to_empty_index_map_with_two_tables_per_level_causes_double_merge.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/adding_four_items_to_empty_index_map_with_two_tables_per_level_causes_double_merge.cs
new file mode 100644
index 00000000000..d4805f3cd75
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/adding_four_items_to_empty_index_map_with_two_tables_per_level_causes_double_merge.cs
@@ -0,0 +1,111 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class
+	adding_four_items_to_empty_index_map_with_two_tables_per_level_causes_double_merge :
+		SpecificationWithDirectoryPerTestFixture {
+	private string _filename;
+	private IndexMap _map;
+	private string _mergeFile;
+	private MergeResult _result;
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+	private bool _skipIndexVerify;
+	private int _maxAutoMergeIndexLevel = 4;
+
+	public adding_four_items_to_empty_index_map_with_two_tables_per_level_causes_double_merge(byte version,
+		bool skipIndexVerify) {
+		_ptableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_mergeFile = GetTempFilePath();
+		_filename = GetTempFilePath();
+
+		_map = IndexMapTestFactory.FromFile(_filename, maxTablesPerLevel: 2, maxAutoMergeLevel: _maxAutoMergeIndexLevel);
+		var memtable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		memtable.Add(0, 1, 0);
+
+		_result = _map.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify),
+			10, 20,
+			new GuidFilenameProvider(PathName), _ptableVersion, 0,
+			skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+		_result = _result.MergedMap.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify),
+			20, 30,
+			new GuidFilenameProvider(PathName), _ptableVersion, 0,
+			skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+		_result = _result.MergedMap.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify),
+			30, 40,
+			new GuidFilenameProvider(PathName), _ptableVersion, 0,
+			skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+		_result = _result.MergedMap.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify),
+			50, 60,
+			new FakeFilenameProvider(_mergeFile + ".firstmerge", _mergeFile), _ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_result.MergedMap.InOrder().ToList().ForEach(x => x.MarkForDestruction());
+		File.Delete(_filename);
+		File.Delete(_mergeFile);
+
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void the_prepare_checkpoint_is_taken_from_the_latest_added_table() {
+		Assert.AreEqual(50, _result.MergedMap.PrepareCheckpoint);
+	}
+
+	[Test]
+	public void the_commit_checkpoint_is_taken_from_the_latest_added_table() {
+		Assert.AreEqual(60, _result.MergedMap.CommitCheckpoint);
+	}
+
+	[Test]
+	public void there_are_four_items_to_delete() {
+		Assert.AreEqual(4, _result.ToDelete.Count);
+	}
+
+	[Test]
+	public void the_merged_map_has_a_single_file() {
+		Assert.AreEqual(1, _result.MergedMap.GetAllFilenames().Count());
+		Assert.AreEqual(_mergeFile, _result.MergedMap.GetAllFilenames().ToList()[0]);
+	}
+
+	[Test]
+	public void the_original_map_did_not_change() {
+		Assert.AreEqual(0, _map.InOrder().Count());
+		Assert.AreEqual(0, _map.GetAllFilenames().Count());
+	}
+
+	[Test]
+	public void a_merged_file_was_created() {
+		Assert.IsTrue(File.Exists(_mergeFile));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/adding_item_to_empty_index_map.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/adding_item_to_empty_index_map.cs
new file mode 100644
index 00000000000..e2deedbb709
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/adding_item_to_empty_index_map.cs
@@ -0,0 +1,90 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class adding_item_to_empty_index_map : SpecificationWithDirectoryPerTestFixture {
+	private string _filename;
+	private IndexMap _map;
+	private string _tablename;
+	private string _mergeFile;
+	private MergeResult _result;
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+	private bool _skipIndexVerify;
+	private int _maxAutoMergeIndexLevel = 4;
+
+	public adding_item_to_empty_index_map(byte version, bool skipIndexVerify) {
+		_ptableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_filename = GetTempFilePath();
+		_tablename = GetTempFilePath();
+		_mergeFile = GetFilePathFor("mergefile");
+
+		_map = IndexMapTestFactory.FromFile(_filename, maxAutoMergeLevel: _maxAutoMergeIndexLevel);
+		var memtable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		memtable.Add(0, 1, 0);
+		var table = PTable.FromMemtable(memtable, _tablename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify);
+		_result = _map.AddAndMergePTable(table, 7, 11,
+			new FakeFilenameProvider(_mergeFile), _ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
+		table.MarkForDestruction();
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		File.Delete(_filename);
+		File.Delete(_mergeFile);
+		File.Delete(_tablename);
+
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void the_prepare_checkpoint_is_taken_from_the_latest_added_table() {
+		Assert.AreEqual(7, _result.MergedMap.PrepareCheckpoint);
+	}
+
+	[Test]
+	public void the_commit_checkpoint_is_taken_from_the_latest_added_table() {
+		Assert.AreEqual(11, _result.MergedMap.CommitCheckpoint);
+	}
+
+	[Test]
+	public void there_are_no_items_to_delete() {
+		Assert.AreEqual(0, _result.ToDelete.Count);
+	}
+
+	[Test]
+	public void the_merged_map_has_a_single_file() {
+		Assert.AreEqual(1, _result.MergedMap.GetAllFilenames().Count());
+		Assert.AreEqual(_tablename, _result.MergedMap.GetAllFilenames().ToList()[0]);
+	}
+
+	[Test]
+	public void the_original_map_did_not_change() {
+		Assert.AreEqual(0, _map.InOrder().Count());
+		Assert.AreEqual(0, _map.GetAllFilenames().Count());
+	}
+
+	[Test]
+	public void a_merged_file_was_not_created() {
+		Assert.IsFalse(File.Exists(_mergeFile));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/adding_sixteen_items_to_empty_index_map_with_four_tables_per_level_causes_double_merge.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/adding_sixteen_items_to_empty_index_map_with_four_tables_per_level_causes_double_merge.cs
new file mode 100644
index 00000000000..c758f691750
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/adding_sixteen_items_to_empty_index_map_with_four_tables_per_level_causes_double_merge.cs
@@ -0,0 +1,170 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class
+	adding_sixteen_items_to_empty_index_map_with_four_tables_per_level_causes_double_merge :
+		SpecificationWithDirectoryPerTestFixture {
+	private string _filename;
+	private IndexMap _map;
+	private string _finalmergefile;
+	private string _finalmergefile2;
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+	private int _maxAutoMergeIndexLevel = 4;
+
+	private MergeResult _result;
+	private bool _skipIndexVerify;
+
+	public adding_sixteen_items_to_empty_index_map_with_four_tables_per_level_causes_double_merge(byte version,
+		bool skipIndexVerify) {
+		_ptableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_filename = GetTempFilePath();
+		_finalmergefile = GetTempFilePath();
+		_finalmergefile2 = GetTempFilePath();
+
+		_map = IndexMapTestFactory.FromFile(_filename, maxAutoMergeLevel: _maxAutoMergeIndexLevel);
+		var memtable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		memtable.Add(0, 1, 0);
+		var guidFilename = new GuidFilenameProvider(PathName);
+		_result = _map.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
+			guidFilename,
+			_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+		_result = _result.MergedMap.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
+			guidFilename,
+			_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+		_result = _result.MergedMap.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
+			guidFilename,
+			_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+		_result = _result.MergedMap.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
+			guidFilename,
+			_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+		_result = _result.MergedMap.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
+			guidFilename,
+			_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+		_result = _result.MergedMap.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
+			guidFilename,
+			_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+		_result = _result.MergedMap.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
+			guidFilename,
+			_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+		_result = _result.MergedMap.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
+			guidFilename,
+			_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+		_result = _result.MergedMap.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
+			guidFilename,
+			_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+		_result = _result.MergedMap.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
+			guidFilename,
+			_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+		_result = _result.MergedMap.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
+			guidFilename,
+			_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+		_result = _result.MergedMap.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
+			guidFilename,
+			_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+		_result = _result.MergedMap.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
+			guidFilename,
+			_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+		_result = _result.MergedMap.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
+			guidFilename,
+			_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+		_result = _result.MergedMap.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 0, 0,
+			guidFilename,
+			_ptableVersion, 0, skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+		_result = _result.MergedMap.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify), 1, 2,
+			new FakeFilenameProvider(_finalmergefile, _finalmergefile2), _ptableVersion, 0,
+			skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_result.MergedMap.InOrder().ToList().ForEach(x => x.MarkForDestruction());
+		File.Delete(_filename);
+
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void the_prepare_checkpoint_is_taken_from_the_latest_added_table() {
+		Assert.AreEqual(1, _result.MergedMap.PrepareCheckpoint);
+	}
+
+	[Test]
+	public void the_commit_checkpoint_is_taken_from_the_latest_added_table() {
+		Assert.AreEqual(2, _result.MergedMap.CommitCheckpoint);
+	}
+
+	[Test]
+	public void there_are_eight_items_to_delete() {
+		Assert.AreEqual(8, _result.ToDelete.Count);
+	}
+
+	[Test]
+	public void the_merged_map_has_a_single_file() {
+		Assert.AreEqual(1, _result.MergedMap.GetAllFilenames().Count());
+		Assert.AreEqual(_finalmergefile2, _result.MergedMap.GetAllFilenames().ToList()[0]);
+	}
+
+	[Test]
+	public void the_original_map_did_not_change() {
+		Assert.AreEqual(0, _map.InOrder().Count());
+		Assert.AreEqual(0, _map.GetAllFilenames().Count());
+	}
+
+	[Test]
+	public void a_merged_file_was_created() {
+		Assert.IsTrue(File.Exists(_finalmergefile2));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/adding_two_items_to_empty_index_map_with_two_tables_per_level_causes_merge.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/adding_two_items_to_empty_index_map_with_two_tables_per_level_causes_merge.cs
new file mode 100644
index 00000000000..35aaa8270f9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/adding_two_items_to_empty_index_map_with_two_tables_per_level_causes_merge.cs
@@ -0,0 +1,100 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class
+	adding_two_items_to_empty_index_map_with_two_tables_per_level_causes_merge :
+		SpecificationWithDirectoryPerTestFixture {
+	private string _filename;
+	private IndexMap _map;
+	private string _mergeFile;
+	private MergeResult _result;
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+	private bool _skipIndexVerify;
+	private int _maxAutoMergeIndexLevel = 4;
+
+	public adding_two_items_to_empty_index_map_with_two_tables_per_level_causes_merge(byte version,
+		bool skipIndexVerify) {
+		_ptableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_filename = GetTempFilePath();
+		_mergeFile = GetTempFilePath();
+
+		_map = IndexMapTestFactory.FromFile(_filename, maxTablesPerLevel: 2, maxAutoMergeLevel: _maxAutoMergeIndexLevel);
+		var memtable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		memtable.Add(0, 1, 0);
+
+		_result = _map.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify),
+			123, 321,
+			new GuidFilenameProvider(PathName), _ptableVersion, 0,
+			skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+		_result = _result.MergedMap.AddAndMergePTable(
+			PTable.FromMemtable(memtable, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify),
+			100, 400,
+			new FakeFilenameProvider(_mergeFile), _ptableVersion, 0,
+			skipIndexVerify: _skipIndexVerify);
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_result.MergedMap.InOrder().ToList().ForEach(x => x.MarkForDestruction());
+		File.Delete(_filename);
+		File.Delete(_mergeFile);
+
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void the_prepare_checkpoint_is_taken_from_the_latest_added_table() {
+		Assert.AreEqual(100, _result.MergedMap.PrepareCheckpoint);
+	}
+
+	[Test]
+	public void the_commit_checkpoint_is_taken_from_the_latest_added_table() {
+		Assert.AreEqual(400, _result.MergedMap.CommitCheckpoint);
+	}
+
+	[Test]
+	public void there_are_two_items_to_delete() {
+		Assert.AreEqual(2, _result.ToDelete.Count);
+	}
+
+	[Test]
+	public void the_merged_map_has_a_single_file() {
+		Assert.AreEqual(1, _result.MergedMap.GetAllFilenames().Count());
+		Assert.AreEqual(_mergeFile, _result.MergedMap.GetAllFilenames().ToList()[0]);
+	}
+
+	[Test]
+	public void the_original_map_did_not_change() {
+		Assert.AreEqual(0, _map.InOrder().Count());
+		Assert.AreEqual(0, _map.GetAllFilenames().Count());
+	}
+
+	[Test]
+	public void a_merged_file_was_created() {
+		Assert.IsTrue(File.Exists(_mergeFile));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/corrupt_index_should.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/corrupt_index_should.cs
new file mode 100644
index 00000000000..3620e999154
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/corrupt_index_should.cs
@@ -0,0 +1,383 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.IO;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+public class corrupt_index_should : SpecificationWithDirectoryPerTestFixture {
+	private const int numIndexEntries = 256;
+	private const int depth = 16;
+
+	private string ConstructPTable(byte version) {
+		var memTable = new HashListMemTable(version, numIndexEntries + 1);
+		for (int i = 1; i <= numIndexEntries; ++i) {
+			if (version > PTableVersions.IndexV1)
+				memTable.Add((ulong)i, 1, i * 1337);
+			else
+				memTable.Add(((ulong)i) << 32, 1, i * 1337);
+		}
+
+		string pTableFilename = GetTempFilePath();
+		var pTable = PTable.FromMemtable(memTable, pTableFilename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth);
+		pTable.Dispose();
+		return pTableFilename;
+	}
+
+	private static void CorruptBloomFilter(string bloomFilterFile) {
+		using var stream = File.Open(bloomFilterFile, FileMode.Open);
+		var data = new byte[255];
+		stream.Seek(0, SeekOrigin.Begin);
+		data[0] = 0xFF;
+		stream.Write(data, 0, 1);
+	}
+
+	private static void CorruptPTableFile(string ptableFile, byte version, string corruptionType) {
+		int indexEntrySize = 0;
+		if (version == PTableVersions.IndexV1)
+			indexEntrySize = PTable.IndexEntryV1Size;
+		else if (version == PTableVersions.IndexV2)
+			indexEntrySize = PTable.IndexEntryV2Size;
+		else if (version == PTableVersions.IndexV3)
+			indexEntrySize = PTable.IndexEntryV3Size;
+		else if (version == PTableVersions.IndexV4)
+			indexEntrySize = PTable.IndexEntryV4Size;
+
+		int indexEntryKeySize = 0;
+		if (version == PTableVersions.IndexV1)
+			indexEntryKeySize = PTable.IndexKeyV1Size;
+		else if (version == PTableVersions.IndexV2)
+			indexEntryKeySize = PTable.IndexKeyV2Size;
+		else if (version == PTableVersions.IndexV3)
+			indexEntryKeySize = PTable.IndexKeyV3Size;
+		else if (version == PTableVersions.IndexV4)
+			indexEntryKeySize = PTable.IndexKeyV4Size;
+
+		int numMidpoints = PTable.GetRequiredMidpointCountCached(numIndexEntries, version);
+
+		byte[] data = new byte[255];
+
+		using (FileStream stream = File.Open(ptableFile, FileMode.Open)) {
+			if (corruptionType == "footerFileType") {
+				stream.Seek(PTableHeader.Size + numIndexEntries * indexEntrySize + numMidpoints * indexEntrySize,
+					SeekOrigin.Begin);
+				data[0] = 0xFF;
+				stream.Write(data, 0, 1);
+			} else if (corruptionType == "footerVersion") {
+				stream.Seek(
+					PTableHeader.Size + numIndexEntries * indexEntrySize + numMidpoints * indexEntrySize + 1,
+					SeekOrigin.Begin);
+				data[0] = 0xFF;
+				stream.Write(data, 0, 1);
+			} else if (corruptionType == "negativeIndexEntriesSize") {
+				stream.Seek(
+					PTableHeader.Size + numIndexEntries * indexEntrySize + numMidpoints * indexEntrySize + 2,
+					SeekOrigin.Begin);
+				data[0] = 0xFF;
+				data[1] = 0xFF;
+				data[2] = 0xFF;
+				data[3] = 0xFF;
+				stream.Write(data, 0, 4);
+			} else if (corruptionType == "notMultipleIndexEntrySize") {
+				var footerPosition = PTableHeader.Size + numIndexEntries * indexEntrySize +
+									 numMidpoints * indexEntrySize;
+				stream.Seek(footerPosition, SeekOrigin.Begin);
+				var buffer = new byte[4096];
+				int read = stream.Read(buffer, 0, 4096);
+
+				//insert a byte
+				stream.Seek(footerPosition, SeekOrigin.Begin);
+				data[0] = 0xFF;
+				stream.Write(data, 0, 1);
+				stream.Write(buffer, 0, read);
+			} else if (corruptionType == "lessThan2Midpoints") {
+				stream.Seek(
+					PTableHeader.Size + numIndexEntries * indexEntrySize + numMidpoints * indexEntrySize + 2,
+					SeekOrigin.Begin);
+				//1 midpoint
+				data[0] = 0x01;
+				data[1] = 0x00;
+				data[2] = 0x00;
+				data[3] = 0x00;
+				stream.Write(data, 0, 4);
+			} else if (corruptionType == "moreMidpointsThanIndexEntries") {
+				stream.Seek(
+					PTableHeader.Size + numIndexEntries * indexEntrySize + numMidpoints * indexEntrySize + 2,
+					SeekOrigin.Begin);
+				//change number of midpoints to 1 more than actual number to trigger the condition
+				var x = numMidpoints + 1;
+				for (int i = 0; i < 4; i++) {
+					data[i] = (byte)(x & 0xFF);
+					x >>= 8;
+				}
+
+				stream.Write(data, 0, 4);
+			} else if (corruptionType == "zeroOutMiddleEntries") {
+				//zeroes out middle index entries - useful for binary search tests
+				List<int> indexEntriesToCorrupt = new List<int>();
+				indexEntriesToCorrupt.Add(numIndexEntries / 2 - 1);
+				indexEntriesToCorrupt.Add(numIndexEntries / 2);
+
+				foreach (int entry in indexEntriesToCorrupt) {
+					stream.Seek(PTableHeader.Size + entry * indexEntrySize, SeekOrigin.Begin);
+					//modify one of the index entry hashes/version
+					stream.Write(data, 0, indexEntryKeySize);
+
+					if (version >= PTableVersions.IndexV4) {
+						//modify one of the midpoint entry hashes/version
+						stream.Seek(PTableHeader.Size + numIndexEntries * indexEntrySize + entry * indexEntrySize,
+							SeekOrigin.Begin);
+						stream.Write(data, 0, indexEntryKeySize);
+					}
+				}
+			} else if (corruptionType == "maxOutMiddleEntries") {
+				//maxes out middle index entries - useful for binary search tests
+				List<int> indexEntriesToCorrupt = new List<int>();
+				indexEntriesToCorrupt.Add(numIndexEntries / 2 - 1);
+				indexEntriesToCorrupt.Add(numIndexEntries / 2);
+
+				for (int i = 0; i < indexEntryKeySize; i++)
+					data[i] = 0xFF;
+
+				foreach (int entry in indexEntriesToCorrupt) {
+					stream.Seek(PTableHeader.Size + entry * indexEntrySize, SeekOrigin.Begin);
+					//modify one of the index entry hashes/version
+					stream.Write(data, 0, indexEntryKeySize);
+
+					if (version >= PTableVersions.IndexV4) {
+						//modify one of the midpoint entry hashes/version
+						stream.Seek(PTableHeader.Size + numIndexEntries * indexEntrySize + entry * indexEntrySize,
+							SeekOrigin.Begin);
+						stream.Write(data, 0, indexEntryKeySize);
+					}
+				}
+			} else if (corruptionType == "midpointItemIndexesNotAscendingOrder") {
+				if (version >= PTableVersions.IndexV4) {
+					//modify one of the midpoint item indexes
+					stream.Seek(
+						PTableHeader.Size + numIndexEntries * indexEntrySize + 3 * indexEntrySize - sizeof(long),
+						SeekOrigin.Begin);
+					stream.Write(data, 0, sizeof(long));
+				}
+			}
+		}
+	}
+
+	private ulong GetOriginalHash(ulong stream, byte version) {
+		if (version == PTableVersions.IndexV1)
+			return stream << 32;
+		else
+			return stream;
+	}
+
+	[TestCase(PTableVersions.IndexV2, false)]
+	[TestCase(PTableVersions.IndexV2, true)]
+	[TestCase(PTableVersions.IndexV3, false)]
+	[TestCase(PTableVersions.IndexV3, true)]
+	[TestCase(PTableVersions.IndexV4, false)]
+	[TestCase(PTableVersions.IndexV4, true)]
+	public void throw_exception_if_index_entries_not_multiple_of_index_entry_size(byte version,
+		bool skipIndexVerify) {
+		string ptableFileName = ConstructPTable(version);
+		CorruptPTableFile(ptableFileName, version, "notMultipleIndexEntrySize");
+		Assert.Throws<CorruptIndexException>(() => PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, skipIndexVerify));
+	}
+
+	[TestCase(PTableVersions.IndexV2, false)]
+	[TestCase(PTableVersions.IndexV2, true)]
+	[TestCase(PTableVersions.IndexV3, false)]
+	[TestCase(PTableVersions.IndexV3, true)]
+	[TestCase(PTableVersions.IndexV4, false)]
+	[TestCase(PTableVersions.IndexV4, true)]
+	public void throw_exception_if_midpoints_index_entries_not_in_descending_order(byte version,
+		bool skipIndexVerify) {
+		string ptableFileName = ConstructPTable(version);
+		CorruptPTableFile(ptableFileName, version, "zeroOutMiddleEntries");
+		Assert.Throws<CorruptIndexException>(() => PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, skipIndexVerify));
+	}
+
+
+	[TestCase(PTableVersions.IndexV4, false)]
+	[TestCase(PTableVersions.IndexV4, true)]
+	public void throw_exception_if_midpoints_item_indexes_not_in_ascending_order(byte version,
+		bool skipIndexVerify) {
+		string ptableFileName = ConstructPTable(version);
+		CorruptPTableFile(ptableFileName, version, "midpointItemIndexesNotAscendingOrder");
+		Assert.Throws<CorruptIndexException>(() => PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, skipIndexVerify));
+	}
+
+	[TestCase(PTableVersions.IndexV2, true)]
+	[TestCase(PTableVersions.IndexV3, true)]
+	[TestCase(PTableVersions.IndexV4, true)]
+	public void throw_exception_if_index_entries_not_descending_during_ptable_get_range(byte version,
+		bool skipIndexVerify) {
+		string ptableFileName = ConstructPTable(version);
+		CorruptPTableFile(ptableFileName, version, "zeroOutMiddleEntries");
+		//loading with a depth of 1 should load only 2 midpoints (first and last index entry)
+		PTable pTable = PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 1, skipIndexVerify);
+		Assert.Throws<MaybeCorruptIndexException>(() =>
+			pTable.GetRange(GetOriginalHash(numIndexEntries / 4, version), 1, 1));
+		pTable.Dispose();
+	}
+
+	[TestCase(PTableVersions.IndexV2, true)]
+	[TestCase(PTableVersions.IndexV3, true)]
+	[TestCase(PTableVersions.IndexV4, true)]
+	public void throw_exception_if_index_entries_not_descending_during_ptable_get_range_2(byte version,
+		bool skipIndexVerify) {
+		string ptableFileName = ConstructPTable(version);
+		CorruptPTableFile(ptableFileName, version, "maxOutMiddleEntries");
+		//loading with a depth of 1 should load only 2 midpoints (first and last index entry)
+		PTable pTable = PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 1, skipIndexVerify);
+		Assert.Throws<MaybeCorruptIndexException>(() =>
+			pTable.GetRange(GetOriginalHash(numIndexEntries / 4, version), 1, 1));
+		pTable.Dispose();
+	}
+
+	[TestCase(PTableVersions.IndexV2, true)]
+	[TestCase(PTableVersions.IndexV3, true)]
+	[TestCase(PTableVersions.IndexV4, true)]
+	public void throw_exception_if_index_entries_not_descending_during_ptable_get_latest_entry(byte version,
+		bool skipIndexVerify) {
+		string ptableFileName = ConstructPTable(version);
+		CorruptPTableFile(ptableFileName, version, "zeroOutMiddleEntries");
+		//loading with a depth of 1 should load only 2 midpoints (first and last index entry)
+		PTable pTable = PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 1, skipIndexVerify);
+		IndexEntry entry;
+		Assert.Throws<MaybeCorruptIndexException>(() =>
+			// changed 2 to 4 here because the corruption actually removes the stream at /2, so it isn't in the bloom filter
+			pTable.TryGetLatestEntry(GetOriginalHash(numIndexEntries / 4, version), out entry));
+		pTable.Dispose();
+	}
+
+	[TestCase(PTableVersions.IndexV2, true)]
+	[TestCase(PTableVersions.IndexV3, true)]
+	[TestCase(PTableVersions.IndexV4, true)]
+	public void throw_exception_if_index_entries_not_descending_during_ptable_get_latest_entry_2(byte version,
+		bool skipIndexVerify) {
+		string ptableFileName = ConstructPTable(version);
+		CorruptPTableFile(ptableFileName, version, "maxOutMiddleEntries");
+		//loading with a depth of 1 should load only 2 midpoints (first and last index entry)
+		PTable pTable = PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 1, skipIndexVerify);
+		IndexEntry entry;
+		Assert.Throws<MaybeCorruptIndexException>(() =>
+			pTable.TryGetLatestEntry(GetOriginalHash(numIndexEntries / 4, version), out entry));
+		pTable.Dispose();
+	}
+
+	[TestCase(PTableVersions.IndexV2, true)]
+	[TestCase(PTableVersions.IndexV3, true)]
+	[TestCase(PTableVersions.IndexV4, true)]
+	public void throw_exception_if_index_entries_not_descending_during_ptable_get_oldest_entry(byte version,
+		bool skipIndexVerify) {
+		string ptableFileName = ConstructPTable(version);
+		CorruptPTableFile(ptableFileName, version, "zeroOutMiddleEntries");
+		//loading with a depth of 1 should load only 2 midpoints (first and last index entry)
+		PTable pTable = PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 1, skipIndexVerify);
+		IndexEntry entry;
+		Assert.Throws<MaybeCorruptIndexException>(() =>
+			pTable.TryGetOldestEntry(GetOriginalHash(numIndexEntries / 4, version), out entry));
+		pTable.Dispose();
+	}
+
+	[TestCase(PTableVersions.IndexV2, true)]
+	[TestCase(PTableVersions.IndexV3, true)]
+	[TestCase(PTableVersions.IndexV4, true)]
+	public void throw_exception_if_index_entries_not_descending_during_ptable_get_oldest_entry_2(byte version,
+		bool skipIndexVerify) {
+		string ptableFileName = ConstructPTable(version);
+		CorruptPTableFile(ptableFileName, version, "maxOutMiddleEntries");
+		//loading with a depth of 1 should load only 2 midpoints (first and last index entry)
+		PTable pTable = PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 1, skipIndexVerify);
+		IndexEntry entry;
+		Assert.Throws<MaybeCorruptIndexException>(() =>
+			pTable.TryGetOldestEntry(GetOriginalHash(numIndexEntries / 4, version), out entry));
+		pTable.Dispose();
+	}
+
+	[TestCase(PTableVersions.IndexV2, true)]
+	[TestCase(PTableVersions.IndexV3, true)]
+	[TestCase(PTableVersions.IndexV4, true)]
+	public void throw_exception_if_index_entries_not_descending_during_ptable_get_one_value(byte version,
+		bool skipIndexVerify) {
+		string ptableFileName = ConstructPTable(version);
+		CorruptPTableFile(ptableFileName, version, "zeroOutMiddleEntries");
+		//loading with a depth of 1 should load only 2 midpoints (first and last index entry)
+		PTable pTable = PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 1, skipIndexVerify);
+		long position;
+		Assert.Throws<MaybeCorruptIndexException>(() =>
+			pTable.TryGetOneValue(GetOriginalHash(numIndexEntries / 4, version), 1, out position));
+		pTable.Dispose();
+	}
+
+	[TestCase(PTableVersions.IndexV2, true)]
+	[TestCase(PTableVersions.IndexV3, true)]
+	[TestCase(PTableVersions.IndexV4, true)]
+	public void throw_exception_if_index_entries_not_descending_during_ptable_get_one_value_2(byte version,
+		bool skipIndexVerify) {
+		string ptableFileName = ConstructPTable(version);
+		CorruptPTableFile(ptableFileName, version, "maxOutMiddleEntries");
+		//loading with a depth of 1 should load only 2 midpoints (first and last index entry)
+		PTable pTable = PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 1, skipIndexVerify);
+		long position;
+		Assert.Throws<MaybeCorruptIndexException>(() =>
+			pTable.TryGetOneValue(GetOriginalHash(numIndexEntries / 4, version), 1, out position));
+		pTable.Dispose();
+	}
+
+	[TestCase(PTableVersions.IndexV4, false)]
+	[TestCase(PTableVersions.IndexV4, true)]
+	public void throw_exception_on_invalid_ptable_filenumber_in_footer(byte version, bool skipIndexVerify) {
+		string ptableFileName = ConstructPTable(version);
+		CorruptPTableFile(ptableFileName, version, "footerFileType");
+		Assert.Throws<CorruptIndexException>(() => PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, skipIndexVerify));
+	}
+
+	[TestCase(PTableVersions.IndexV4, false)]
+	[TestCase(PTableVersions.IndexV4, true)]
+	public void throw_exception_on_header_footer_version_mismatch(byte version, bool skipIndexVerify) {
+		string ptableFileName = ConstructPTable(version);
+		CorruptPTableFile(ptableFileName, version, "footerVersion");
+		Assert.Throws<CorruptIndexException>(() => PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, skipIndexVerify));
+	}
+
+	[TestCase(PTableVersions.IndexV4, false)]
+	[TestCase(PTableVersions.IndexV4, true)]
+	public void throw_exception_if_negative_index_entries_size(byte version, bool skipIndexVerify) {
+		string ptableFileName = ConstructPTable(version);
+		CorruptPTableFile(ptableFileName, version, "negativeIndexEntriesSize");
+		Assert.Throws<CorruptIndexException>(() => PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, skipIndexVerify));
+	}
+
+	[TestCase(PTableVersions.IndexV4, false)]
+	[TestCase(PTableVersions.IndexV4, true)]
+	public void throw_exception_if_less_than_2_midpoints_cached(byte version, bool skipIndexVerify) {
+		string ptableFileName = ConstructPTable(version);
+		CorruptPTableFile(ptableFileName, version, "lessThan2Midpoints");
+		Assert.Throws<CorruptIndexException>(() => PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, skipIndexVerify));
+	}
+
+	[TestCase(PTableVersions.IndexV4, false)]
+	[TestCase(PTableVersions.IndexV4, true)]
+	public void throw_exception_if_more_midpoints_than_index_entries(byte version, bool skipIndexVerify) {
+		string ptableFileName = ConstructPTable(version);
+		CorruptPTableFile(ptableFileName, version, "moreMidpointsThanIndexEntries");
+		Assert.Throws<CorruptIndexException>(() => PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, skipIndexVerify));
+	}
+
+	[TestCase(PTableVersions.IndexV4, false)]
+	[TestCase(PTableVersions.IndexV4, true)]
+	public void continue_without_corrupt_bloom_filter(byte version, bool corrupt) {
+		string ptableFileName = ConstructPTable(version);
+
+		if (corrupt)
+			CorruptBloomFilter(PTable.GenBloomFilterFilename(ptableFileName));
+
+		var table = PTable.FromFile(ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, skipIndexVerify: true);
+		Assert.AreEqual(!corrupt, table.HasBloomFilter);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/destroying_ptable.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/destroying_ptable.cs
new file mode 100644
index 00000000000..10d6ab648b6
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/destroying_ptable.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class destroying_ptable : SpecificationWithFile {
+	private PTable _table;
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+	private bool _skipIndexVerify;
+
+	public destroying_ptable(byte version, bool skipIndexVerify) {
+		_ptableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	[SetUp]
+	public void Setup() {
+		var mtable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		mtable.Add(0x010100000000, 0x0001, 0x0001);
+		mtable.Add(0x010500000000, 0x0001, 0x0002);
+		_table = PTable.FromMemtable(mtable, Filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault,
+			skipIndexVerify: _skipIndexVerify,
+			useBloomFilter: true);
+		_table.MarkForDestruction();
+	}
+
+	[Test]
+	public void the_file_is_deleted() {
+		_table.WaitForDisposal(1000);
+		Assert.IsFalse(File.Exists(Filename));
+		Assert.IsFalse(File.Exists(_table.BloomFilterFilename));
+	}
+
+	[Test]
+	public void wait_for_destruction_returns() {
+		Assert.DoesNotThrow(() => _table.WaitForDisposal(1000));
+	}
+
+	[TearDown]
+	public void Teardown() {
+		_table.WaitForDisposal(1000);
+		File.Delete(Filename);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/index_map_should.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/index_map_should.cs
new file mode 100644
index 00000000000..e183945f5d9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/index_map_should.cs
@@ -0,0 +1,139 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Util;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2)]
+[TestFixture(PTableVersions.IndexV3)]
+[TestFixture(PTableVersions.IndexV4)]
+public class index_map_should : SpecificationWithDirectory {
+	private string _indexMapFileName;
+	private string _ptableFileName;
+	private IndexMap _emptyIndexMap;
+	private PTable _ptable;
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+
+	public index_map_should(byte version) {
+		_ptableVersion = version;
+	}
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+
+		_indexMapFileName = GetFilePathFor("index.map");
+		_ptableFileName = GetFilePathFor("ptable");
+
+		_emptyIndexMap = IndexMapTestFactory.FromFile(_indexMapFileName);
+
+		var memTable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		memTable.Add(0, 1, 2);
+		_ptable = PTable.FromMemtable(memTable, _ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault);
+	}
+
+	[TearDown]
+	public override Task TearDown() {
+		_ptable.MarkForDestruction();
+		return base.TearDown();
+	}
+
+	[Test]
+	public void not_allow_negative_prepare_checkpoint_when_adding_ptable() {
+		Assert.Throws<ArgumentOutOfRangeException>(() => _emptyIndexMap.AddPTable(_ptable, -1, 0));
+	}
+
+	[Test]
+	public void not_allow_negative_commit_checkpoint_when_adding_ptable() {
+		Assert.Throws<ArgumentOutOfRangeException>(() => _emptyIndexMap.AddPTable(_ptable, 0, -1));
+	}
+
+	[Test]
+	public void throw_corruptedindexexception_when_prepare_checkpoint_is_less_than_minus_one() {
+		CreateArtificialIndexMapFile(_indexMapFileName, -2, 0, null);
+		Assert.Throws<CorruptIndexException>(() =>
+			IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
+	}
+
+	[Test]
+	public void allow_prepare_checkpoint_equal_to_minus_one_if_no_ptables_are_in_index() {
+		CreateArtificialIndexMapFile(_indexMapFileName, -1, 0, null);
+		Assert.DoesNotThrow(() => {
+			var indexMap = IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2);
+			indexMap.InOrder().ToList().ForEach(x => x.Dispose());
+		});
+	}
+
+	[Test]
+	public void
+		throw_corruptedindexexception_if_prepare_checkpoint_is_minus_one_and_there_are_ptables_in_indexmap() {
+		CreateArtificialIndexMapFile(_indexMapFileName, -1, 0, _ptableFileName);
+		Assert.Throws<CorruptIndexException>(() =>
+			IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
+	}
+
+	[Test]
+	public void throw_corruptedindexexception_when_commit_checkpoint_is_less_than_minus_one() {
+		CreateArtificialIndexMapFile(_indexMapFileName, 0, -2, null);
+		Assert.Throws<CorruptIndexException>(() =>
+			IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
+	}
+
+	[Test]
+	public void allow_commit_checkpoint_equal_to_minus_one_if_no_ptables_are_in_index() {
+		CreateArtificialIndexMapFile(_indexMapFileName, 0, -1, null);
+		Assert.DoesNotThrow(() => {
+			var indexMap = IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2);
+			indexMap.InOrder().ToList().ForEach(x => x.Dispose());
+		});
+	}
+
+	[Test]
+	public void
+		throw_corruptedindexexception_if_commit_checkpoint_is_minus_one_and_there_are_ptables_in_indexmap() {
+		CreateArtificialIndexMapFile(_indexMapFileName, 0, -1, _ptableFileName);
+		Assert.Throws<CorruptIndexException>(() =>
+			IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
+	}
+
+	private void CreateArtificialIndexMapFile(string filePath, long prepareCheckpoint, long commitCheckpoint,
+		string ptablePath) {
+		using (var memStream = new MemoryStream())
+		using (var memWriter = new StreamWriter(memStream)) {
+			memWriter.WriteLine(new string('0', 32)); // pre-allocate space for MD5 hash
+			memWriter.WriteLine("1");
+			memWriter.WriteLine("{0}/{1}", prepareCheckpoint, commitCheckpoint);
+			if (!string.IsNullOrWhiteSpace(ptablePath)) {
+				memWriter.WriteLine("0,0,{0}", ptablePath);
+			}
+
+			memWriter.Flush();
+
+			using (var f = File.OpenWrite(filePath))
+			using (var fileWriter = new StreamWriter(f)) {
+				memStream.Position = 0;
+				memStream.CopyTo(f);
+
+				memStream.Position = 32;
+				var hash = MD5Hash.GetHashFor(memStream);
+				f.Position = 0;
+				for (int i = 0; i < hash.Length; ++i) {
+					fileWriter.Write(hash[i].ToString("X2"));
+				}
+
+				fileWriter.WriteLine();
+				fileWriter.Flush();
+				f.FlushToDisk();
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/index_map_should_detect_corruption.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/index_map_should_detect_corruption.cs
new file mode 100644
index 00000000000..75fbc5608ea
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/index_map_should_detect_corruption.cs
@@ -0,0 +1,219 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class index_map_should_detect_corruption : SpecificationWithDirectory {
+	private string _indexMapFileName;
+	private string _ptableFileName;
+	private PTable _ptable;
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+	private bool _skipIndexVerify;
+	private int _maxAutoMergeIndexLevel = 4;
+
+	public index_map_should_detect_corruption(byte version, bool skipIndexVerify) {
+		_ptableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+
+		_indexMapFileName = GetFilePathFor("index.map");
+		_ptableFileName = GetFilePathFor("ptable");
+
+		var indexMap = IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2, maxAutoMergeLevel: _maxAutoMergeIndexLevel);
+		var memtable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		memtable.Add(0, 0, 0);
+		memtable.Add(1, 1, 100);
+		_ptable = PTable.FromMemtable(memtable, _ptableFileName, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify);
+
+		indexMap = indexMap.AddAndMergePTable(_ptable, 0, 0,
+			new GuidFilenameProvider(PathName), _ptableVersion, 0, skipIndexVerify: _skipIndexVerify).MergedMap;
+		indexMap.SaveToFile(_indexMapFileName);
+	}
+
+	[TearDown]
+	public override Task TearDown() {
+		_ptable?.MarkForDestruction();
+		return base.TearDown();
+	}
+
+	[Test]
+	public void when_ptable_file_is_deleted() {
+		_ptable.MarkForDestruction();
+		_ptable = null;
+		File.Delete(_ptableFileName);
+
+		Assert.Throws<CorruptIndexException>(() =>
+			IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
+	}
+
+	[Test]
+	public void when_indexmap_file_does_not_have_md5_checksum() {
+		var lines = File.ReadAllLines(_indexMapFileName);
+		File.WriteAllLines(_indexMapFileName, lines.Skip(1));
+
+		Assert.Throws<CorruptIndexException>(() =>
+			IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
+	}
+
+	[Test]
+	public void when_indexmap_file_does_not_have_latest_commit_position() {
+		var lines = File.ReadAllLines(_indexMapFileName);
+		File.WriteAllLines(_indexMapFileName, lines.Where((x, i) => i != 1));
+
+		Assert.Throws<CorruptIndexException>(() =>
+			IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
+	}
+
+	[Test]
+	public void when_indexmap_file_exists_but_is_empty() {
+		File.WriteAllText(_indexMapFileName, "");
+
+		Assert.Throws<CorruptIndexException>(() =>
+			IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
+	}
+
+	[Test]
+	public void when_indexmap_file_is_garbage() {
+		File.WriteAllText(_indexMapFileName, "alkfjasd;lkf\nasdfasdf\n");
+
+		Assert.Throws<CorruptIndexException>(() =>
+			IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
+	}
+
+	[Test]
+	public void when_checkpoints_pair_is_corrupted() {
+		using (var fs = File.Open(_indexMapFileName, FileMode.Open)) {
+			fs.Position = 34;
+			var b = (byte)fs.ReadByte();
+			b ^= 1;
+			fs.Position = 34;
+			fs.WriteByte(b);
+		}
+
+		Assert.Throws<CorruptIndexException>(() =>
+			IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
+	}
+
+	[Test]
+	public void when_ptable_line_is_missing_one_number() {
+		var lines = File.ReadAllLines(_indexMapFileName);
+		File.WriteAllLines(_indexMapFileName, new[] { lines[0], lines[1], string.Format("0,{0}", _ptableFileName) });
+
+		Assert.Throws<CorruptIndexException>(() =>
+			IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
+	}
+
+	[Test]
+	public void when_ptable_line_constists_only_of_filename() {
+		var lines = File.ReadAllLines(_indexMapFileName);
+		File.WriteAllLines(_indexMapFileName, new[] { lines[0], lines[1], _ptableFileName });
+
+		Assert.Throws<CorruptIndexException>(() =>
+			IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
+	}
+
+	[Test]
+	public void when_ptable_line_is_missing_filename() {
+		var lines = File.ReadAllLines(_indexMapFileName);
+		File.WriteAllLines(_indexMapFileName, new[] { lines[0], lines[1], "0,0" });
+
+		Assert.Throws<CorruptIndexException>(() =>
+			IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
+	}
+
+	[Test]
+	public void when_indexmap_md5_checksum_is_corrupted() {
+		using (var fs = File.Open(_indexMapFileName, FileMode.Open)) {
+			var b = (byte)fs.ReadByte();
+			b ^= 1; // swap single bit
+			fs.Position = 0;
+			fs.WriteByte(b);
+		}
+
+		Assert.Throws<CorruptIndexException>(() =>
+			IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
+	}
+
+	[Test]
+	public void when_ptable_hash_is_corrupted() {
+		_ptable.Dispose();
+		_ptable = null;
+
+		using (var fs = File.Open(_ptableFileName, FileMode.Open)) {
+			fs.Seek(-PTable.MD5Size, SeekOrigin.End);
+			var b = (byte)fs.ReadByte();
+			b ^= 1;
+			fs.Seek(-PTable.MD5Size, SeekOrigin.End);
+			fs.WriteByte(b);
+		}
+
+		Assert.Throws<CorruptIndexException>(() =>
+			IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
+	}
+
+	[Test]
+	public void when_ptable_type_is_corrupted() {
+		_ptable.Dispose();
+		_ptable = null;
+
+		using (var fs = File.Open(_ptableFileName, FileMode.Open)) {
+			fs.Seek(0, SeekOrigin.Begin);
+			fs.WriteByte(123);
+		}
+
+		Assert.Throws<CorruptIndexException>(() =>
+			IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
+	}
+
+	[Test]
+	public void when_ptable_header_is_corrupted() {
+		_ptable.Dispose();
+		_ptable = null;
+
+		using (var fs = File.Open(_ptableFileName, FileMode.Open)) {
+			fs.Position = new Random().Next(0, PTableHeader.Size);
+			var b = (byte)fs.ReadByte();
+			b ^= 1;
+			fs.Position -= 1;
+			fs.WriteByte(b);
+		}
+
+		Assert.Throws<CorruptIndexException>(() =>
+			IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
+	}
+
+	[Test]
+	public void when_ptable_data_is_corrupted() {
+		_ptable.Dispose();
+		_ptable = null;
+
+		using (var fs = File.Open(_ptableFileName, FileMode.Open)) {
+			fs.Position = new Random().Next(PTableHeader.Size, (int)fs.Length);
+			var b = (byte)fs.ReadByte();
+			b ^= 1;
+			fs.Position -= 1;
+			fs.WriteByte(b);
+		}
+
+		Assert.Throws<CorruptIndexException>(() =>
+			IndexMapTestFactory.FromFile(_indexMapFileName, maxTablesPerLevel: 2));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/opening_a_ptable_with_more_than_32bits_of_records.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/opening_a_ptable_with_more_than_32bits_of_records.cs
new file mode 100644
index 00000000000..79f32557264
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/opening_a_ptable_with_more_than_32bits_of_records.cs
@@ -0,0 +1,96 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Security.Cryptography;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+using MD5 = KurrentDB.Core.Hashing.MD5;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTable.IndexEntryV1Size), Explicit, Ignore("Long running, unsafe")]
+public class opening_a_ptable_with_more_than_32bits_of_records : SpecificationWithFilePerTestFixture {
+	public const int MD5Size = 16;
+	public const byte Version = 1;
+	public const int DefaultSequentialBufferSize = 65536;
+
+	private PTable _ptable;
+	private long _size;
+	private long _ptableCount;
+
+	protected int _indexEntrySize = PTable.IndexEntryV1Size;
+
+	public opening_a_ptable_with_more_than_32bits_of_records(int indexEntrySize) {
+		Assert.Inconclusive("Explicit test, Test setup never returns");
+		_indexEntrySize = indexEntrySize;
+	}
+
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_ptableCount = (long)(uint.MaxValue + 10000000L);
+		_size = _ptableCount * (long)_indexEntrySize + PTableHeader.Size + PTable.MD5Size;
+		Console.WriteLine("Creating PTable at {0}. Size of PTable: {1}", Filename, _size);
+		CreatePTableFile(Filename, _size, _indexEntrySize);
+		_ptable = PTable.FromFile(Filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 22, false);
+	}
+
+	public static void CreatePTableFile(string filename, long ptableSize, int indexEntrySize, int cacheDepth = 16) {
+
+		//TODO: fix this unsafe test it will fill the target disk if the test is aborted or an error occurs
+
+		Ensure.NotNullOrEmpty(filename, "filename");
+		Ensure.Nonnegative(cacheDepth, "cacheDepth");
+
+		var sw = Stopwatch.StartNew();
+		var tableId = Guid.NewGuid();
+		using (var fs = new FileStream(filename, FileMode.Create, FileAccess.ReadWrite, FileShare.None,
+			DefaultSequentialBufferSize, FileOptions.SequentialScan)) {
+			fs.SetLength((long)ptableSize);
+			fs.Seek(0, SeekOrigin.Begin);
+
+			var recordCount = (long)((ptableSize - PTableHeader.Size - PTable.MD5Size) / (long)indexEntrySize);
+			using (var md5 = MD5.Create())
+			using (var cs = new CryptoStream(fs, md5, CryptoStreamMode.Write))
+			using (var bs = new BufferedStream(cs, DefaultSequentialBufferSize)) {
+				// WRITE HEADER
+				var headerBytes = new PTableHeader(Version).AsByteArray();
+				cs.Write(headerBytes, 0, headerBytes.Length);
+
+				// WRITE INDEX ENTRIES
+				var buffer = new byte[indexEntrySize];
+				for (long i = 0; i < recordCount; i++) {
+					bs.Write(buffer, 0, indexEntrySize);
+				}
+
+				bs.Flush();
+				cs.FlushFinalBlock();
+
+				// WRITE MD5
+				var hash = md5.Hash;
+				fs.Write(hash, 0, hash.Length);
+			}
+		}
+
+		Console.WriteLine("Created PTable File[{0}, size of {1}] in {2}.", tableId, ptableSize, sw.Elapsed);
+	}
+
+	public override void TestFixtureTearDown() {
+		_ptable.Dispose();
+		base.TestFixtureTearDown();
+	}
+
+	[Test, Explicit, Ignore("Long running, unsafe")]
+	public void count_should_be_right() {
+		Assert.AreEqual(_ptableCount, _ptable.Count);
+	}
+
+	[Test, Explicit, Ignore("Long running, unsafe")]
+	public void filename_is_correct() {
+		Assert.AreEqual(Filename, _ptable.Filename);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/ptable_midpoint_cache_should.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/ptable_midpoint_cache_should.cs
new file mode 100644
index 00000000000..fda461a806b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/ptable_midpoint_cache_should.cs
@@ -0,0 +1,93 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class ptable_midpoint_cache_should : SpecificationWithDirectory {
+	private static readonly ILogger Log = Serilog.Log.ForContext<ptable_midpoint_cache_should>();
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+	private bool _skipIndexVerify;
+
+	public ptable_midpoint_cache_should(byte version, bool skipIndexVerify) {
+		_ptableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	private void construct_valid_cache_for_any_combination_of_params(int maxIndexEntries) {
+		var rnd = new Random(123987);
+		for (int count = 0; count < maxIndexEntries; ++count) {
+			for (int depth = 0; depth < 15; ++depth) {
+				PTable ptable = null;
+				try {
+					Log.Verbose("Creating PTable with count {0}, depth {1}", count, depth);
+					ptable = ConstructPTable(
+						GetFilePathFor(string.Format("{0}-{1}-indexv{2}.ptable", count, depth, _ptableVersion)),
+						count, rnd, depth);
+					ValidateCache(ptable.GetMidPoints(), count, depth);
+				} finally {
+					if (ptable != null) {
+						ptable.Dispose();
+					}
+				}
+			}
+		}
+	}
+
+	private PTable ConstructPTable(string file, int count, Random rnd, int depth) {
+		var memTable = new HashListMemTable(_ptableVersion, 20000);
+		for (int i = 0; i < count; ++i) {
+			memTable.Add((uint)rnd.Next(), rnd.Next(0, 1 << 20), Math.Abs(rnd.Next() * rnd.Next()));
+		}
+
+		var ptable = PTable.FromMemtable(memTable, file, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, skipIndexVerify: _skipIndexVerify);
+		return ptable;
+	}
+
+	private void ValidateCache(ReadOnlySpan<PTable.Midpoint> cache, int count, int depth) {
+		if (count == 0 || depth == 0) {
+			Assert.True(cache.IsEmpty);
+			return;
+		}
+
+		if (count == 1) {
+			Assert.False(cache.IsEmpty);
+			Assert.AreEqual(2, cache.Length);
+			Assert.AreEqual(0, cache[0].ItemIndex);
+			Assert.AreEqual(0, cache[1].ItemIndex);
+			return;
+		}
+
+		Assert.False(cache.IsEmpty);
+		Assert.AreEqual(Math.Min(count, 1 << depth), cache.Length);
+
+		Assert.AreEqual(0, cache[0].ItemIndex);
+		for (int i = 1; i < cache.Length; ++i) {
+			Assert.IsTrue(cache[i - 1].Key.GreaterEqualsThan(cache[i].Key), "Expected {0} to be >= {1}",
+				cache[i - 1].Key, cache[i].Key);
+			Assert.Less(cache[i - 1].ItemIndex, cache[i].ItemIndex);
+		}
+
+		Assert.AreEqual(count - 1, cache[cache.Length - 1].ItemIndex);
+	}
+
+	[Test, Category("LongRunning"), Ignore("Veerrrryyy long running :)")]
+	public void construct_valid_cache_for_any_combination_of_params_large() {
+		construct_valid_cache_for_any_combination_of_params(4096);
+	}
+
+	[Test]
+	public void construct_valid_cache_for_any_combination_of_params_small() {
+		construct_valid_cache_for_any_combination_of_params(20);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/ptable_range_query_tests.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/ptable_range_query_tests.cs
new file mode 100644
index 00000000000..dfad8a6bed0
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/ptable_range_query_tests.cs
@@ -0,0 +1,169 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false, 1_000_000)]
+[TestFixture(PTableVersions.IndexV2, true, 1_000_000)]
+[TestFixture(PTableVersions.IndexV3, false, 1_000_000)]
+[TestFixture(PTableVersions.IndexV3, true, 1_000_000)]
+[TestFixture(PTableVersions.IndexV4, false, 1_000_000)]
+[TestFixture(PTableVersions.IndexV4, true, 1_000_000)]
+[TestFixture(PTableVersions.IndexV4, false, 0)]
+[TestFixture(PTableVersions.IndexV4, true, 0)]
+public class ptable_range_query_tests : SpecificationWithFilePerTestFixture {
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+	private PTable _ptable;
+	private readonly bool _skipIndexVerify;
+	private readonly bool _useBloomFilter;
+	private readonly int _lruCacheSize;
+
+	public ptable_range_query_tests(byte version, bool skipIndexVerify, int lruCacheSize) {
+		_ptableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+		_useBloomFilter = skipIndexVerify; // bloomfilter orthogonal
+		_lruCacheSize = lruCacheSize;
+	}
+
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var table = new HashListMemTable(_ptableVersion, maxSize: 50);
+		table.Add(0x010100000000, 0x0001, 0x0001);
+		table.Add(0x010500000000, 0x0001, 0x0002);
+		table.Add(0x010200000000, 0x0001, 0x0003);
+		table.Add(0x010200000000, 0x0002, 0x0004);
+		table.Add(0x010300000000, 0x0001, 0xFFF1);
+		table.Add(0x010300000000, 0x0003, 0xFFF3);
+		table.Add(0x010300000000, 0x0005, 0xFFF5);
+		_ptable = PTable.FromMemtable(table, Filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, cacheDepth: 0,
+			skipIndexVerify: _skipIndexVerify,
+			useBloomFilter: _useBloomFilter,
+			lruCacheSize: _lruCacheSize);
+	}
+
+	public override void TestFixtureTearDown() {
+		_ptable.Dispose();
+		base.TestFixtureTearDown();
+	}
+
+	private ulong GetHash(ulong value) {
+		return _ptableVersion == PTableVersions.IndexV1 ? value >> 32 : value;
+	}
+
+	[Test]
+	public void range_query_of_non_existing_stream_returns_nothing() {
+		var list = _ptable.GetRange(0x14, 0x01, 0x02).ToArray();
+		Assert.AreEqual(0, list.Length);
+	}
+
+	[Test]
+	public void range_query_of_non_existing_version_returns_nothing() {
+		var list = _ptable.GetRange(0x010100000000, 0x03, 0x05).ToArray();
+		Assert.AreEqual(0, list.Length);
+	}
+
+	[Test]
+	public void range_query_with_hole_returns_items_included() {
+		var list = _ptable.GetRange(0x010300000000, 0x01, 0x05).ToArray();
+		Assert.AreEqual(3, list.Length);
+		Assert.AreEqual(GetHash(0x010300000000), list[0].Stream);
+		Assert.AreEqual(0x05, list[0].Version);
+		Assert.AreEqual(0xfff5, list[0].Position);
+		Assert.AreEqual(GetHash(0x010300000000), list[1].Stream);
+		Assert.AreEqual(0x03, list[1].Version);
+		Assert.AreEqual(0xfff3, list[1].Position);
+		Assert.AreEqual(GetHash(0x010300000000), list[2].Stream);
+		Assert.AreEqual(0x01, list[2].Version);
+		Assert.AreEqual(0xfff1, list[2].Position);
+	}
+
+	[Test]
+	public void query_with_start_in_range_but_not_end_results_returns_items_included() {
+		var list = _ptable.GetRange(0x010300000000, 0x01, 0x04).ToArray();
+		Assert.AreEqual(2, list.Length);
+		Assert.AreEqual(GetHash(0x010300000000), list[0].Stream);
+		Assert.AreEqual(0x03, list[0].Version);
+		Assert.AreEqual(0xfff3, list[0].Position);
+		Assert.AreEqual(GetHash(0x010300000000), list[1].Stream);
+		Assert.AreEqual(0x01, list[1].Version);
+		Assert.AreEqual(0xfff1, list[1].Position);
+	}
+
+	[Test]
+	public void query_with_end_in_range_but_not_start_results_returns_items_included() {
+		var list = _ptable.GetRange(0x010300000000, 0x00, 0x03).ToArray();
+		Assert.AreEqual(2, list.Length);
+		Assert.AreEqual(GetHash(0x010300000000), list[0].Stream);
+		Assert.AreEqual(0x03, list[0].Version);
+		Assert.AreEqual(0xfff3, list[0].Position);
+		Assert.AreEqual(GetHash(0x010300000000), list[1].Stream);
+		Assert.AreEqual(0x01, list[1].Version);
+		Assert.AreEqual(0xfff1, list[1].Position);
+	}
+
+	[Test]
+	public void query_with_end_and_start_exclusive_results_returns_items_included() {
+		var list = _ptable.GetRange(0x010300000000, 0x00, 0x06).ToArray();
+		Assert.AreEqual(3, list.Length);
+		Assert.AreEqual(GetHash(0x010300000000), list[0].Stream);
+		Assert.AreEqual(0x05, list[0].Version);
+		Assert.AreEqual(0xfff5, list[0].Position);
+		Assert.AreEqual(GetHash(0x010300000000), list[1].Stream);
+		Assert.AreEqual(0x03, list[1].Version);
+		Assert.AreEqual(0xfff3, list[1].Position);
+		Assert.AreEqual(GetHash(0x010300000000), list[2].Stream);
+		Assert.AreEqual(0x01, list[2].Version);
+		Assert.AreEqual(0xfff1, list[2].Position);
+	}
+
+	[Test]
+	public void query_with_end_inside_the_hole_in_list_returns_items_included() {
+		var list = _ptable.GetRange(0x010300000000, 0x00, 0x04).ToArray();
+		Assert.AreEqual(2, list.Length);
+		Assert.AreEqual(GetHash(0x010300000000), list[0].Stream);
+		Assert.AreEqual(0x03, list[0].Version);
+		Assert.AreEqual(0xfff3, list[0].Position);
+		Assert.AreEqual(GetHash(0x010300000000), list[1].Stream);
+		Assert.AreEqual(0x01, list[1].Version);
+		Assert.AreEqual(0xfff1, list[1].Position);
+	}
+
+	[Test]
+	public void query_with_start_inside_the_hole_in_list_returns_items_included() {
+		var list = _ptable.GetRange(0x010300000000, 0x02, 0x06).ToArray();
+		Assert.AreEqual(2, list.Length);
+		Assert.AreEqual(GetHash(0x010300000000), list[0].Stream);
+		Assert.AreEqual(0x05, list[0].Version);
+		Assert.AreEqual(0xfff5, list[0].Position);
+		Assert.AreEqual(GetHash(0x010300000000), list[1].Stream);
+		Assert.AreEqual(0x03, list[1].Version);
+		Assert.AreEqual(0xfff3, list[1].Position);
+	}
+
+	[Test]
+	public void query_with_start_and_end_inside_the_hole_in_list_returns_items_included() {
+		var list = _ptable.GetRange(0x010300000000, 0x02, 0x04).ToArray();
+		Assert.AreEqual(1, list.Length);
+		Assert.AreEqual(GetHash(0x010300000000), list[0].Stream);
+		Assert.AreEqual(0x03, list[0].Version);
+		Assert.AreEqual(0xfff3, list[0].Position);
+	}
+
+	[Test]
+	public void query_with_start_and_end_less_than_all_items_returns_nothing() {
+		var list = _ptable.GetRange(0x010300000000, 0x00, 0x00).ToArray();
+		Assert.AreEqual(0, list.Length);
+	}
+
+	[Test]
+	public void query_with_start_and_end_greater_than_all_items_returns_nothing() {
+		var list = _ptable.GetRange(0x010300000000, 0x06, 0x06).ToArray();
+		Assert.AreEqual(0, list.Length);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/ptable_read_scenario_with_items_spanning_few_cache_segments.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/ptable_read_scenario_with_items_spanning_few_cache_segments.cs
new file mode 100644
index 00000000000..6005bce89d2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/ptable_read_scenario_with_items_spanning_few_cache_segments.cs
@@ -0,0 +1,163 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false, 10)]
+[TestFixture(PTableVersions.IndexV2, true, 10)]
+[TestFixture(PTableVersions.IndexV3, false, 10)]
+[TestFixture(PTableVersions.IndexV3, true, 10)]
+[TestFixture(PTableVersions.IndexV4, false, 10)]
+[TestFixture(PTableVersions.IndexV4, true, 10)]
+public class
+	searching_ptable_with_items_spanning_few_cache_segments_and_all_items_in_cache :
+		ptable_read_scenario_with_items_spanning_few_cache_segments {
+	public searching_ptable_with_items_spanning_few_cache_segments_and_all_items_in_cache(byte ptableVersion,
+		bool skipIndexVerify, int midpointCacheDepth)
+		: base(ptableVersion, skipIndexVerify, midpointCacheDepth) {
+	}
+}
+
+[TestFixture(PTableVersions.IndexV2, false, 0)]
+[TestFixture(PTableVersions.IndexV2, true, 0)]
+[TestFixture(PTableVersions.IndexV3, false, 0)]
+[TestFixture(PTableVersions.IndexV3, true, 0)]
+[TestFixture(PTableVersions.IndexV4, false, 0)]
+[TestFixture(PTableVersions.IndexV4, true, 0)]
+public class
+	searching_ptable_with_items_spanning_few_cache_segments_and_only_some_items_in_cache :
+		ptable_read_scenario_with_items_spanning_few_cache_segments {
+	public searching_ptable_with_items_spanning_few_cache_segments_and_only_some_items_in_cache(byte ptableVersion,
+		bool skipIndexVerify, int midpointCacheDepth)
+		: base(ptableVersion, skipIndexVerify, midpointCacheDepth) {
+	}
+}
+
+public abstract class ptable_read_scenario_with_items_spanning_few_cache_segments : PTableReadScenario {
+	protected ptable_read_scenario_with_items_spanning_few_cache_segments(byte ptableVersion, bool skipIndexVerify,
+		int midpointCacheDepth)
+		: base(ptableVersion, skipIndexVerify, midpointCacheDepth) {
+	}
+
+	protected override void AddItemsForScenario(IMemTable memTable) {
+		memTable.Add(0x010100000000, 0, 0x0001);
+		memTable.Add(0x010100000000, 0, 0x0002);
+		memTable.Add(0x010500000000, 0, 0x0003);
+		memTable.Add(0x010500000000, 0, 0x0004);
+		memTable.Add(0x010500000000, 0, 0x0005);
+	}
+
+	private ulong GetHash(ulong value) {
+		return _ptableVersion == PTableVersions.IndexV1 ? value >> 32 : value;
+	}
+
+	[Test]
+	public void the_table_has_five_items() {
+		Assert.AreEqual(5, PTable.Count);
+	}
+
+	[Test]
+	public void the_smallest_items_can_be_found() {
+		long position;
+		Assert.IsTrue(PTable.TryGetOneValue(0x010100000000, 0, out position));
+		Assert.AreEqual(0x0002, position);
+	}
+
+	[Test]
+	public void the_smallest_items_are_returned_in_descending_order() {
+		var entries = PTable.GetRange(0x010100000000, 0, 0).ToArray();
+		Assert.AreEqual(2, entries.Length);
+		Assert.AreEqual(GetHash(0x010100000000), entries[0].Stream);
+		Assert.AreEqual(0, entries[0].Version);
+		Assert.AreEqual(0x0002, entries[0].Position);
+		Assert.AreEqual(GetHash(0x010100000000), entries[1].Stream);
+		Assert.AreEqual(0, entries[1].Version);
+		Assert.AreEqual(0x0001, entries[1].Position);
+	}
+
+	[Test]
+	public void try_get_latest_entry_for_smallest_hash_returns_correct_index_entry() {
+		IndexEntry entry;
+		Assert.IsTrue(PTable.TryGetLatestEntry(0x010100000000, out entry));
+		Assert.AreEqual(GetHash(0x010100000000), entry.Stream);
+		Assert.AreEqual(0, entry.Version);
+		Assert.AreEqual(0x0002, entry.Position);
+	}
+
+	[Test]
+	public void try_get_oldest_entry_for_smallest_hash_returns_correct_index_entry() {
+		IndexEntry entry;
+		Assert.IsTrue(PTable.TryGetOldestEntry(0x010100000000, out entry));
+		Assert.AreEqual(GetHash(0x010100000000), entry.Stream);
+		Assert.AreEqual(0, entry.Version);
+		Assert.AreEqual(0x0001, entry.Position);
+	}
+
+	[Test]
+	public void the_largest_items_can_be_found() {
+		long position;
+		Assert.IsTrue(PTable.TryGetOneValue(0x010500000000, 0, out position));
+		Assert.AreEqual(0x0005, position);
+	}
+
+	[Test]
+	public void the_largest_items_are_returned_in_descending_order() {
+		var entries = PTable.GetRange(0x010500000000, 0, 0).ToArray();
+		Assert.AreEqual(3, entries.Length);
+		Assert.AreEqual(GetHash(0x010500000000), entries[0].Stream);
+		Assert.AreEqual(0, entries[0].Version);
+		Assert.AreEqual(0x0005, entries[0].Position);
+		Assert.AreEqual(GetHash(0x010500000000), entries[1].Stream);
+		Assert.AreEqual(0, entries[1].Version);
+		Assert.AreEqual(0x0004, entries[1].Position);
+		Assert.AreEqual(GetHash(0x010500000000), entries[2].Stream);
+		Assert.AreEqual(0, entries[2].Version);
+		Assert.AreEqual(0x0003, entries[2].Position);
+	}
+
+	[Test]
+	public void try_get_latest_entry_for_largest_hash_returns_correct_index_entry() {
+		IndexEntry entry;
+		Assert.IsTrue(PTable.TryGetLatestEntry(0x010500000000, out entry));
+		Assert.AreEqual(GetHash(0x010500000000), entry.Stream);
+		Assert.AreEqual(0, entry.Version);
+		Assert.AreEqual(0x0005, entry.Position);
+	}
+
+	[Test]
+	public void try_get_oldest_entry_for_largest_hash_returns_correct_index_entry() {
+		IndexEntry entry;
+		Assert.IsTrue(PTable.TryGetOldestEntry(0x010500000000, out entry));
+		Assert.AreEqual(GetHash(0x010500000000), entry.Stream);
+		Assert.AreEqual(0, entry.Version);
+		Assert.AreEqual(0x0003, entry.Position);
+	}
+
+	[Test]
+	public void non_existent_item_cannot_be_found() {
+		long position;
+		Assert.IsFalse(PTable.TryGetOneValue(2, 0, out position));
+	}
+
+	[Test]
+	public void range_query_returns_nothing_for_nonexistent_stream() {
+		var entries = PTable.GetRange(0x010200000000, 0, long.MaxValue).ToArray();
+		Assert.AreEqual(0, entries.Length);
+	}
+
+	[Test]
+	public void try_get_latest_entry_returns_nothing_for_nonexistent_stream() {
+		IndexEntry entry;
+		Assert.IsFalse(PTable.TryGetLatestEntry(0x010200000000, out entry));
+	}
+
+	[Test]
+	public void try_get_oldest_entry_returns_nothing_for_nonexistent_stream() {
+		IndexEntry entry;
+		Assert.IsFalse(PTable.TryGetOldestEntry(0x010200000000, out entry));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/ptable_read_scenario_with_usual_items.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/ptable_read_scenario_with_usual_items.cs
new file mode 100644
index 00000000000..ede334f811b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/ptable_read_scenario_with_usual_items.cs
@@ -0,0 +1,156 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false, 10)]
+[TestFixture(PTableVersions.IndexV2, true, 10)]
+[TestFixture(PTableVersions.IndexV3, false, 10)]
+[TestFixture(PTableVersions.IndexV3, true, 10)]
+[TestFixture(PTableVersions.IndexV4, false, 10)]
+[TestFixture(PTableVersions.IndexV4, true, 10)]
+public class searching_ptable_with_usual_items_and_all_items_in_cache : ptable_read_scenario_with_usual_items {
+	public searching_ptable_with_usual_items_and_all_items_in_cache(byte ptableVersion, bool skipIndexVerify,
+		int midpointCacheDepth)
+		: base(ptableVersion, skipIndexVerify, midpointCacheDepth) {
+	}
+}
+
+[TestFixture(PTableVersions.IndexV2, false, 0)]
+[TestFixture(PTableVersions.IndexV2, true, 0)]
+[TestFixture(PTableVersions.IndexV3, false, 0)]
+[TestFixture(PTableVersions.IndexV3, true, 0)]
+[TestFixture(PTableVersions.IndexV4, false, 0)]
+[TestFixture(PTableVersions.IndexV4, true, 0)]
+public class
+	searching_ptable_with_usual_items_and_only_some_items_in_cache : ptable_read_scenario_with_usual_items {
+	public searching_ptable_with_usual_items_and_only_some_items_in_cache(byte ptableVersion, bool skipIndexVerify,
+		int midpointCacheDepth)
+		: base(ptableVersion, skipIndexVerify, midpointCacheDepth) {
+	}
+}
+
+public abstract class ptable_read_scenario_with_usual_items : PTableReadScenario {
+	protected ptable_read_scenario_with_usual_items(byte ptableVersion, bool skipIndexVerify,
+		int midpointCacheDepth)
+		: base(ptableVersion, skipIndexVerify, midpointCacheDepth) {
+	}
+
+	protected override void AddItemsForScenario(IMemTable memTable) {
+		memTable.Add(0x010100000000, 0x0001, 0x0001);
+		memTable.Add(0x010500000000, 0x0001, 0x0002);
+		memTable.Add(0x010200000000, 0x0001, 0x0003);
+		memTable.Add(0x010200000000, 0x0002, 0x0004);
+		memTable.Add(0x010300000000, 0x0001, 0x0005);
+	}
+
+	private ulong GetHash(ulong hash) {
+		return _ptableVersion == PTableVersions.IndexV1 ? hash >> 32 : hash;
+	}
+
+	[Test]
+	public void the_table_has_five_items() {
+		Assert.AreEqual(5, PTable.Count);
+	}
+
+	[Test]
+	public void the_first_item_can_be_found() {
+		long position;
+		Assert.IsTrue(PTable.TryGetOneValue(0x010100000000, 0x0001, out position));
+		Assert.AreEqual(0x0001, position);
+	}
+
+	[Test]
+	public void the_second_item_can_be_found() {
+		long position;
+		Assert.IsTrue(PTable.TryGetOneValue(0x010200000000, 0x0001, out position));
+		Assert.AreEqual(0x0003, position);
+	}
+
+	[Test]
+	public void the_third_item_can_be_found() {
+		long position;
+		Assert.IsTrue(PTable.TryGetOneValue(0x010200000000, 0x0002, out position));
+		Assert.AreEqual(0x0004, position);
+	}
+
+	[Test]
+	public void the_fourth_item_can_be_found() {
+		long position;
+		Assert.IsTrue(PTable.TryGetOneValue(0x010200000000, 0x0002, out position));
+		Assert.AreEqual(0x0004, position);
+	}
+
+
+	[Test]
+	public void the_fifth_item_can_be_found() {
+		long position;
+		Assert.IsTrue(PTable.TryGetOneValue(0x010500000000, 0x0001, out position));
+		Assert.AreEqual(0x0002, position);
+	}
+
+	[Test]
+	public void non_existent_item_cannot_be_found() {
+		long position;
+		Assert.IsFalse(PTable.TryGetOneValue(0x0106, 0x0001, out position));
+	}
+
+	[Test]
+	public void range_query_returns_correct_items() {
+		// for now events are returned in order from larger key to lower
+		var items = PTable.GetRange(0x010200000000, 0x0000, 0x0010).ToArray();
+		Assert.That(items.Length, Is.EqualTo(2));
+		Assert.That(items[1].Stream, Is.EqualTo(GetHash(0x010200000000)));
+		Assert.That(items[1].Version, Is.EqualTo(0x0001));
+		Assert.That(items[1].Position, Is.EqualTo(0x0003));
+		Assert.That(items[0].Stream, Is.EqualTo(GetHash(0x010200000000)));
+		Assert.That(items[0].Version, Is.EqualTo(0x0002));
+		Assert.That(items[0].Position, Is.EqualTo(0x0004));
+	}
+
+	[Test]
+	public void range_query_returns_correct_item1() {
+		var items = PTable.GetRange(0x010200000000, 0x0000, 0x0001).ToArray();
+		Assert.That(items.Length, Is.EqualTo(1));
+		Assert.That(items[0].Stream, Is.EqualTo(GetHash(0x010200000000)));
+		Assert.That(items[0].Version, Is.EqualTo(0x0001));
+		Assert.That(items[0].Position, Is.EqualTo(0x0003));
+	}
+
+	[Test]
+	public void range_query_returns_correct_item2() {
+		var items = PTable.GetRange(0x010200000000, 0x0002, 0x0010).ToArray();
+		Assert.That(items.Length, Is.EqualTo(1));
+		Assert.That(items[0].Stream, Is.EqualTo(GetHash(0x010200000000)));
+		Assert.That(items[0].Version, Is.EqualTo(0x0002));
+		Assert.That(items[0].Position, Is.EqualTo(0x0004));
+	}
+
+	[Test]
+	public void range_query_returns_no_items_when_no_stream_in_sstable() {
+		var items = PTable.GetRange(0x0104, 0x0000, 0x0010);
+		Assert.That(items.Count(), Is.EqualTo(0));
+	}
+
+	[Test]
+	public void range_query_returns_items_when_startkey_is_less_than_current_min() {
+		var items = PTable.GetRange(0x010100000000, 0x0000, 0x0010).ToArray();
+		Assert.That(items.Length, Is.EqualTo(1));
+		Assert.That(items[0].Stream, Is.EqualTo(GetHash(0x010100000000)));
+		Assert.That(items[0].Version, Is.EqualTo(0x0001));
+		Assert.That(items[0].Position, Is.EqualTo(0x0001));
+	}
+
+	[Test]
+	public void range_query_returns_items_when_endkey_is_greater_than_current_max() {
+		var items = PTable.GetRange(0x010500000000, 0x0000, 0x0010).ToArray();
+		Assert.That(items.Length, Is.EqualTo(1));
+		Assert.That(items[0].Stream, Is.EqualTo(GetHash(0x010500000000)));
+		Assert.That(items[0].Version, Is.EqualTo(0x0001));
+		Assert.That(items[0].Position, Is.EqualTo(0x0002));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/ptable_should.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/ptable_should.cs
new file mode 100644
index 00000000000..17c1f4b2ee7
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/ptable_should.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class ptable_should : SpecificationWithFilePerTestFixture {
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+	private PTable _ptable;
+	private bool _skipIndexVerify;
+
+	public ptable_should(byte version, bool skipIndexVerify) {
+		_ptableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var table = new HashListMemTable(_ptableVersion, maxSize: 10);
+		table.Add(0x010100000000, 0x0001, 0x0001);
+		_ptable = PTable.FromMemtable(table, Filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, cacheDepth: 0, skipIndexVerify: _skipIndexVerify);
+	}
+
+	public override void TestFixtureTearDown() {
+		_ptable.Dispose();
+		base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void throw_argumentoutofrangeexception_on_range_query_when_provided_with_negative_start_version() {
+		Assert.Throws<ArgumentOutOfRangeException>(() => _ptable.GetRange(0x0000, -1, long.MaxValue).ToArray());
+	}
+
+	[Test]
+	public void throw_argumentoutofrangeexception_on_range_query_when_provided_with_negative_end_version() {
+		Assert.Throws<ArgumentOutOfRangeException>(() => _ptable.GetRange(0x0000, 0, -1).ToArray());
+	}
+
+	[Test]
+	public void throw_argumentoutofrangeexception_on_get_one_entry_query_when_provided_with_negative_version() {
+		long pos;
+		Assert.Throws<ArgumentOutOfRangeException>(() => _ptable.TryGetOneValue(0x0000, -1, out pos));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/saving_index_with_single_item_to_a_file.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/saving_index_with_single_item_to_a_file.cs
new file mode 100644
index 00000000000..ca9abeca591
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/saving_index_with_single_item_to_a_file.cs
@@ -0,0 +1,92 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Util;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2)]
+[TestFixture(PTableVersions.IndexV3)]
+[TestFixture(PTableVersions.IndexV4)]
+public class saving_index_with_single_item_to_a_file : SpecificationWithDirectoryPerTestFixture {
+	private string _filename;
+	private IndexMap _map;
+	private string _tablename;
+	private string _mergeFile;
+	private MergeResult _result;
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+	private int _maxAutoMergeIndexLevel = 4;
+
+	public saving_index_with_single_item_to_a_file(byte version) {
+		_ptableVersion = version;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_filename = GetFilePathFor("indexfile");
+		_tablename = GetTempFilePath();
+		_mergeFile = GetFilePathFor("outputfile");
+
+		_map = IndexMapTestFactory.FromFile(_filename, maxAutoMergeLevel: _maxAutoMergeIndexLevel);
+		var memtable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		memtable.Add(0, 2, 7);
+		var table = PTable.FromMemtable(memtable, _tablename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault);
+		_result = _map.AddAndMergePTable(table, 7, 11,
+			new FakeFilenameProvider(_mergeFile), _ptableVersion, 0);
+		_result.MergedMap.SaveToFile(_filename);
+		_result.ToDelete.ForEach(x => x.Dispose());
+		_result.MergedMap.InOrder().ToList().ForEach(x => x.Dispose());
+		table.Dispose();
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_result.ToDelete.ForEach(x => x.MarkForDestruction());
+		_result.MergedMap.InOrder().ToList().ForEach(x => x.MarkForDestruction());
+		_result.MergedMap.InOrder().ToList().ForEach(x => x.WaitForDisposal(1000));
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void the_file_exists() {
+		Assert.IsTrue(File.Exists(_filename));
+	}
+
+	[Test]
+	public void the_file_contains_correct_data() {
+		using (var fs = File.OpenRead(_filename))
+		using (var reader = new StreamReader(fs)) {
+			var text = reader.ReadToEnd();
+			var lines = text.Replace("\r", "").Split('\n');
+
+			fs.Position = 32;
+			var md5 = MD5Hash.GetHashFor(fs);
+			var md5String = BitConverter.ToString(md5).Replace("-", "");
+
+			Assert.AreEqual(6, lines.Count());
+			Assert.AreEqual(md5String, lines[0]);
+			Assert.AreEqual(_map.Version.ToString(), lines[1]);
+			Assert.AreEqual("7/11", lines[2]);
+			Assert.AreEqual(_maxAutoMergeIndexLevel.ToString(), lines[3]);
+			Assert.AreEqual("0,0," + Path.GetFileName(_tablename), lines[4]);
+			Assert.AreEqual("", lines[5]);
+		}
+	}
+
+	[Test]
+	public void saved_file_could_be_read_correctly_and_without_errors() {
+		var map = IndexMapTestFactory.FromFile(_filename, maxAutoMergeLevel: _maxAutoMergeIndexLevel);
+		map.InOrder().ToList().ForEach(x => x.Dispose());
+
+		Assert.AreEqual(7, map.PrepareCheckpoint);
+		Assert.AreEqual(11, map.CommitCheckpoint);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/saving_index_with_six_items_to_a_file.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/saving_index_with_six_items_to_a_file.cs
new file mode 100644
index 00000000000..aa0c4344b4b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/saving_index_with_six_items_to_a_file.cs
@@ -0,0 +1,100 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Util;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV3)]
+[TestFixture(PTableVersions.IndexV4)]
+public class saving_index_with_six_items_to_a_file : SpecificationWithDirectory {
+	private string _filename;
+	private string _tablename;
+	private string _mergeFile;
+	private IndexMap _map;
+	private MergeResult _result;
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+
+	public saving_index_with_six_items_to_a_file(byte version) {
+		_ptableVersion = version;
+	}
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+
+		_filename = GetFilePathFor("indexfile");
+		_tablename = GetTempFilePath();
+		_mergeFile = GetFilePathFor("outfile");
+
+		_map = IndexMapTestFactory.FromFile(_filename, maxTablesPerLevel: 4);
+		var memtable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		memtable.Add(0, 2, 123);
+		var table = PTable.FromMemtable(memtable, _tablename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault);
+		_result = _map.AddAndMergePTable(table, 0, 0,
+			new FakeFilenameProvider(_mergeFile), _ptableVersion, 0);
+		_result = _result.MergedMap.AddAndMergePTable(table, 0, 0,
+			new FakeFilenameProvider(_mergeFile), _ptableVersion, 0);
+		_result = _result.MergedMap.AddAndMergePTable(table, 0, 0,
+			new FakeFilenameProvider(_mergeFile), _ptableVersion, 0);
+		var merged = _result.MergedMap.AddAndMergePTable(table, 0, 0,
+			new FakeFilenameProvider(_mergeFile), _ptableVersion, 0);
+		_result = merged.MergedMap.AddAndMergePTable(table, 0, 0,
+			new FakeFilenameProvider(_mergeFile), _ptableVersion, 0);
+		_result = _result.MergedMap.AddAndMergePTable(table, 7, 11,
+			new FakeFilenameProvider(_mergeFile), _ptableVersion, 0);
+		_result.MergedMap.SaveToFile(_filename);
+
+		table.Dispose();
+
+		merged.MergedMap.InOrder().ToList().ForEach(x => x.Dispose());
+		merged.ToDelete.ForEach(x => x.Dispose());
+
+		_result.MergedMap.InOrder().ToList().ForEach(x => x.Dispose());
+		_result.ToDelete.ForEach(x => x.Dispose());
+	}
+
+	[Test]
+	public void the_file_exists() {
+		Assert.IsTrue(File.Exists(_filename));
+	}
+
+	[Test]
+	public void the_file_contains_correct_data() {
+		using (var fs = File.OpenRead(_filename))
+		using (var reader = new StreamReader(fs)) {
+			var text = reader.ReadToEnd();
+			var lines = text.Replace("\r", "").Split('\n');
+
+			fs.Position = 32;
+			var md5 = MD5Hash.GetHashFor(fs);
+			var md5String = BitConverter.ToString(md5).Replace("-", "");
+
+			Assert.AreEqual(8, lines.Count());
+			Assert.AreEqual(md5String, lines[0]);
+			Assert.AreEqual(_map.Version.ToString(), lines[1]);
+			Assert.AreEqual("7/11", lines[2]);
+			Assert.AreEqual(int.MaxValue.ToString(), lines[3]);
+			var name = new FileInfo(_tablename).Name;
+			Assert.AreEqual("0,0," + name, lines[4]);
+			Assert.AreEqual("0,1," + name, lines[5]);
+			Assert.AreEqual("1,0," + Path.GetFileName(_mergeFile), lines[6]);
+			Assert.AreEqual("", lines[7]);
+		}
+	}
+
+	[Test]
+	public void saved_file_could_be_read_correctly_and_without_errors() {
+		var map = IndexMapTestFactory.FromFile(_filename);
+		map.InOrder().ToList().ForEach(x => x.Dispose());
+
+		Assert.AreEqual(7, map.PrepareCheckpoint);
+		Assert.AreEqual(11, map.CommitCheckpoint);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/table_index_on_range_query.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/table_index_on_range_query.cs
new file mode 100644
index 00000000000..c406989faee
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/table_index_on_range_query.cs
@@ -0,0 +1,124 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Index.Hashes;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class table_index_on_range_query : SpecificationWithDirectoryPerTestFixture {
+	private TableIndex<string> _tableIndex;
+	private IHasher<string> _lowHasher;
+	private IHasher<string> _highHasher;
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+	private bool _skipIndexVerify;
+
+	public table_index_on_range_query(byte version, bool skipIndexVerify) {
+		_ptableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_lowHasher = new XXHashUnsafe();
+		_highHasher = new Murmur3AUnsafe();
+		_tableIndex = new TableIndex<string>(PathName, _lowHasher, _highHasher, "",
+			() => new HashListMemTable(version: _ptableVersion, maxSize: 40),
+			() => { throw new InvalidOperationException(); },
+			_ptableVersion,
+			5, Constants.PTableMaxReaderCountDefault,
+			maxSizeForMemory: 5,
+			skipIndexVerify: _skipIndexVerify);
+		_tableIndex.Initialize(long.MaxValue);
+
+		_tableIndex.Add(0, "0xDEAD", 0, 0xFF00);
+		_tableIndex.Add(0, "0xDEAD", 1, 0xFF01);
+
+		_tableIndex.Add(0, "0xJEEP", 0, 0xFF00);
+		_tableIndex.Add(0, "0xJEEP", 1, 0xFF01);
+
+		_tableIndex.Add(0, "0xABBA", 0, 0xFF00);
+		_tableIndex.Add(0, "0xABBA", 1, 0xFF01);
+		_tableIndex.Add(0, "0xABBA", 2, 0xFF02);
+		_tableIndex.Add(0, "0xABBA", 3, 0xFF03);
+
+		_tableIndex.Add(0, "0xDEAD", 0, 0xFF10);
+		_tableIndex.Add(0, "0xDEAD", 1, 0xFF11);
+
+		_tableIndex.Add(0, "0xADA", 0, 0xFF00);
+
+		_tableIndex.Add(0, "0xJEEP", 2, 0xFFF0);
+		_tableIndex.Add(0, "0xJEEP", 3, 0xFFF1);
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_tableIndex.Close();
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void should_return_empty_collection_when_stream_is_not_in_db() {
+		var res = _tableIndex.GetRange("0xFEED", 0, 100);
+		Assert.That(res, Is.Empty);
+	}
+
+	[Test]
+	public void should_return_all_applicable_elements_in_correct_order() {
+		var res = _tableIndex.GetRange("0xJEEP", 0, 100).ToList();
+		ulong hash = (ulong)_lowHasher.Hash("0xJEEP");
+		hash = _ptableVersion == PTableVersions.IndexV1 ? hash : hash << 32 | _highHasher.Hash("0xJEEP");
+		Assert.That(res.Count(), Is.EqualTo(4));
+
+		Assert.That(res[0].Stream, Is.EqualTo(hash));
+		Assert.That(res[0].Version, Is.EqualTo(3));
+		Assert.That(res[0].Position, Is.EqualTo(0xFFF1));
+
+		Assert.That(res[1].Stream, Is.EqualTo(hash));
+		Assert.That(res[1].Version, Is.EqualTo(2));
+		Assert.That(res[1].Position, Is.EqualTo(0xFFF0));
+
+		Assert.That(res[2].Stream, Is.EqualTo(hash));
+		Assert.That(res[2].Version, Is.EqualTo(1));
+		Assert.That(res[2].Position, Is.EqualTo(0xFF01));
+
+		Assert.That(res[3].Stream, Is.EqualTo(hash));
+		Assert.That(res[3].Version, Is.EqualTo(0));
+		Assert.That(res[3].Position, Is.EqualTo(0xFF00));
+	}
+
+	[Test]
+	public void should_return_all_elements_with_hash_collisions_in_correct_order() {
+		var res = _tableIndex.GetRange("0xDEAD", 0, 100).ToList();
+		ulong hash = (ulong)_lowHasher.Hash("0xDEAD");
+		hash = _ptableVersion == PTableVersions.IndexV1 ? hash : hash << 32 | _highHasher.Hash("0xDEAD");
+		Assert.That(res.Count(), Is.EqualTo(4));
+		Assert.That(res[0].Stream, Is.EqualTo(hash));
+		Assert.That(res[0].Version, Is.EqualTo(1));
+		Assert.That(res[0].Position, Is.EqualTo(0xFF11));
+
+		Assert.That(res[1].Stream, Is.EqualTo(hash));
+		Assert.That(res[1].Version, Is.EqualTo(1));
+		Assert.That(res[1].Position, Is.EqualTo(0xFF01));
+
+		Assert.That(res[2].Stream, Is.EqualTo(hash));
+		Assert.That(res[2].Version, Is.EqualTo(0));
+		Assert.That(res[2].Position, Is.EqualTo(0xFF10));
+
+		Assert.That(res[3].Stream, Is.EqualTo(hash));
+		Assert.That(res[3].Version, Is.EqualTo(0));
+		Assert.That(res[3].Position, Is.EqualTo(0xFF00));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/table_index_on_try_get_one_value_query.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/table_index_on_try_get_one_value_query.cs
new file mode 100644
index 00000000000..4ec9b61cc61
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/table_index_on_try_get_one_value_query.cs
@@ -0,0 +1,101 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.TransactionLog;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class table_index_on_try_get_one_value_query : SpecificationWithDirectoryPerTestFixture {
+	private TableIndex<string> _tableIndex;
+	private IHasher<string> _lowHasher;
+	private IHasher<string> _highHasher;
+	private string _indexDir;
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+	private bool _skipIndexVerify;
+
+	public table_index_on_try_get_one_value_query(byte version, bool skipIndexVerify) {
+		_ptableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_indexDir = PathName;
+		var fakeReader = new TFReaderLease(new FakeTfReader());
+		_lowHasher = new XXHashUnsafe();
+		_highHasher = new Murmur3AUnsafe();
+		_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
+			() => new HashListMemTable(_ptableVersion, maxSize: 10),
+			() => fakeReader,
+			_ptableVersion,
+			5, Constants.PTableMaxReaderCountDefault,
+			maxSizeForMemory: 5,
+			skipIndexVerify: _skipIndexVerify);
+		_tableIndex.Initialize(long.MaxValue);
+
+		_tableIndex.Add(0, "0xDEAD", 0, 0xFF00);
+		_tableIndex.Add(0, "0xDEAD", 1, 0xFF01);
+
+		_tableIndex.Add(0, "0xBEEF", 0, 0xFF00);
+		_tableIndex.Add(0, "0xBEEF", 1, 0xFF01);
+
+		_tableIndex.Add(0, "0xABBA", 0, 0xFF00); // 1st ptable0
+
+		_tableIndex.Add(0, "0xABBA", 1, 0xFF01);
+		_tableIndex.Add(0, "0xABBA", 2, 0xFF02);
+		_tableIndex.Add(0, "0xABBA", 3, 0xFF03);
+
+		_tableIndex.Add(0, "0xADA", 0,
+			0xFF00); // simulates duplicate due to concurrency in TableIndex (see memtable below)
+		_tableIndex.Add(0, "0xDEAD", 0, 0xFF10); // 2nd ptable0
+
+		_tableIndex.Add(0, "0xDEAD", 1, 0xFF11); // in memtable
+		_tableIndex.Add(0, "0xADA", 0, 0xFF00); // in memtable
+	}
+
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_tableIndex.Close();
+
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void should_return_empty_collection_when_stream_is_not_in_db() {
+		long position;
+		Assert.IsFalse(_tableIndex.TryGetOneValue("0xFEED", 0, out position));
+	}
+
+	[Test]
+	public void should_return_element_with_largest_position_when_hash_collisions() {
+		long position;
+		Assert.IsTrue(_tableIndex.TryGetOneValue("0xDEAD", 0, out position));
+		Assert.AreEqual(0xFF10, position);
+	}
+
+	[Test]
+	public void should_return_only_one_element_if_concurrency_duplicate_happens_on_range_query_as_well() {
+		var res = _tableIndex.GetRange("0xADA", 0, 100).ToList();
+		ulong hash = (ulong)_lowHasher.Hash("0xADA");
+		hash = _ptableVersion == PTableVersions.IndexV1 ? hash : hash << 32 | _highHasher.Hash("0xADA");
+		Assert.That(res.Count(), Is.EqualTo(1));
+		Assert.That(res[0].Stream, Is.EqualTo(hash));
+		Assert.That(res[0].Version, Is.EqualTo(0));
+		Assert.That(res[0].Position, Is.EqualTo(0xFF00));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/table_index_should.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/table_index_should.cs
new file mode 100644
index 00000000000..ed206efe495
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/table_index_should.cs
@@ -0,0 +1,79 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Index.Hashes;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class table_index_should : SpecificationWithDirectoryPerTestFixture {
+	private TableIndex<string> _tableIndex;
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+	private bool _skipIndexVerify;
+
+	public table_index_should(byte version, bool skipIndexVerify) {
+		_ptableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		var lowHasher = new XXHashUnsafe();
+		var highHasher = new Murmur3AUnsafe();
+		_tableIndex = new TableIndex<string>(PathName, lowHasher, highHasher, "",
+			() => new HashListMemTable(_ptableVersion, maxSize: 20),
+			() => { throw new InvalidOperationException(); },
+			_ptableVersion,
+			5, Constants.PTableMaxReaderCountDefault,
+			maxSizeForMemory: 10,
+			skipIndexVerify: _skipIndexVerify);
+		_tableIndex.Initialize(long.MaxValue);
+	}
+
+	public override Task TestFixtureTearDown() {
+		_tableIndex.Close();
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void throw_argumentoutofrangeexception_on_range_query_when_provided_with_negative_start_version() {
+		Assert.Throws<ArgumentOutOfRangeException>(
+			() => _tableIndex.GetRange("0x0000", -1, long.MaxValue).ToArray());
+	}
+
+	[Test]
+	public void throw_argumentoutofrangeexception_on_range_query_when_provided_with_negative_end_version() {
+		Assert.Throws<ArgumentOutOfRangeException>(() => _tableIndex.GetRange("0x0000", 0, -1).ToArray());
+	}
+
+	[Test]
+	public void throw_argumentoutofrangeexception_on_get_one_entry_query_when_provided_with_negative_version() {
+		long pos;
+		Assert.Throws<ArgumentOutOfRangeException>(() => _tableIndex.TryGetOneValue("0x0000", -1, out pos));
+	}
+
+	[Test]
+	public void throw_argumentoutofrangeexception_on_adding_entry_with_negative_commit_position() {
+		Assert.Throws<ArgumentOutOfRangeException>(() => _tableIndex.Add(-1, "0x0000", 0, 0));
+	}
+
+	[Test]
+	public void throw_argumentoutofrangeexception_on_adding_entry_with_negative_version() {
+		Assert.Throws<ArgumentOutOfRangeException>(() => _tableIndex.Add(0, "0x0000", -1, 0));
+	}
+
+	[Test]
+	public void throw_argumentoutofrangeexception_on_adding_entry_with_negative_position() {
+		Assert.Throws<ArgumentOutOfRangeException>(() => _tableIndex.Add(0, "0x0000", 0, -1));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/table_index_with_corrupt_index_entries_should.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/table_index_with_corrupt_index_entries_should.cs
new file mode 100644
index 00000000000..17981430238
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/table_index_with_corrupt_index_entries_should.cs
@@ -0,0 +1,179 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.TransactionLog;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture]
+public class table_index_with_corrupt_index_entries_should : SpecificationWithDirectoryPerTestFixture {
+	private TableIndex<string> _tableIndex;
+	private IndexMap _indexMap;
+	public const string StreamName = "stream";
+	public const int NumIndexEntries = 512;
+
+	public void ConstructTableIndexWithCorruptIndexEntries(byte version, bool skipIndexVerify,
+		bool createForceVerifyFile = false) {
+		var lowHasher = new XXHashUnsafe();
+		var highHasher = new Murmur3AUnsafe();
+		var fakeReader = new TFReaderLease(new FakeIndexReader());
+
+		_tableIndex = new TableIndex<string>(PathName, lowHasher, highHasher, "",
+			() => new HashListMemTable(version, maxSize: NumIndexEntries),
+			() => fakeReader,
+			version,
+			int.MaxValue, Constants.PTableMaxReaderCountDefault,
+			maxSizeForMemory: NumIndexEntries,
+			skipIndexVerify: skipIndexVerify);
+		_tableIndex.Initialize(long.MaxValue);
+
+		//create index entries
+		for (int i = 1; i <= NumIndexEntries; i++) {
+			_tableIndex.Add(i * 1337, StreamName, i, i * 1337);
+		}
+
+		_tableIndex.Close(false);
+
+		//load index map to obtain ptable filenames
+		_indexMap = IndexMapTestFactory.FromFile(Path.Combine(PathName, TableIndex.IndexMapFilename));
+		List<string> ptableFiles = new List<string>();
+
+		foreach (string ptableFilename in _indexMap.GetAllFilenames()) {
+			ptableFiles.Add(ptableFilename);
+		}
+
+		_indexMap.Dispose(TimeSpan.FromSeconds(5));
+
+		//corrupt ptable files
+		foreach (string ptableFilename in ptableFiles) {
+			CorruptPTableFile(ptableFilename, version, "zeroOutMiddleEntry");
+		}
+
+		//create force verify file if requested
+		if (createForceVerifyFile) {
+			using (FileStream fs = new FileStream(Path.Combine(PathName, TableIndex.ForceIndexVerifyFilename),
+				FileMode.OpenOrCreate)) {
+			}
+
+			;
+		}
+
+		//load table index again
+		_tableIndex = new TableIndex<string>(PathName, lowHasher, highHasher, "",
+			() => new HashListMemTable(version, maxSize: NumIndexEntries),
+			() => fakeReader,
+			version,
+			int.MaxValue, Constants.PTableMaxReaderCountDefault,
+			maxSizeForMemory: NumIndexEntries,
+			skipIndexVerify: skipIndexVerify,
+			indexCacheDepth: 8);
+		_tableIndex.Initialize(long.MaxValue);
+	}
+
+	[TearDown]
+	public void TearDown() {
+		_tableIndex.Close();
+	}
+
+	private ulong GetOriginalHash(ulong stream, byte version) {
+		if (version == PTableVersions.IndexV1)
+			return stream << 32;
+		else
+			return stream;
+	}
+
+	private void CorruptPTableFile(string ptableFile, byte version, string corruptionType) {
+		int indexEntrySize = 0;
+		if (version == PTableVersions.IndexV1)
+			indexEntrySize = PTable.IndexEntryV1Size;
+		else if (version == PTableVersions.IndexV2)
+			indexEntrySize = PTable.IndexEntryV2Size;
+		else if (version == PTableVersions.IndexV3)
+			indexEntrySize = PTable.IndexEntryV3Size;
+		else if (version == PTableVersions.IndexV4)
+			indexEntrySize = PTable.IndexEntryV4Size;
+
+		int indexEntryKeySize = 0;
+		if (version == PTableVersions.IndexV1)
+			indexEntryKeySize = PTable.IndexKeyV1Size;
+		else if (version == PTableVersions.IndexV2)
+			indexEntryKeySize = PTable.IndexKeyV2Size;
+		else if (version == PTableVersions.IndexV3)
+			indexEntryKeySize = PTable.IndexKeyV3Size;
+		else if (version == PTableVersions.IndexV4)
+			indexEntryKeySize = PTable.IndexKeyV4Size;
+
+		byte[] data = new byte[255];
+
+		using (FileStream stream = File.Open(ptableFile, FileMode.Open)) {
+			if (corruptionType == "zeroOutMiddleEntry") {
+				//zeroes out the middle entry - useful for binary search tests
+				List<int> indexEntriesToCorrupt = new List<int>();
+				indexEntriesToCorrupt.Add(NumIndexEntries / 2 - 1);
+
+				foreach (int entry in indexEntriesToCorrupt) {
+					stream.Seek(PTableHeader.Size + entry * indexEntrySize, SeekOrigin.Begin);
+					//modify one of the index entry hashes/version
+					stream.Write(data, 0, indexEntryKeySize);
+
+					if (version >= PTableVersions.IndexV4) {
+						//modify one of the midpoint entry hashes/version
+						stream.Seek(PTableHeader.Size + NumIndexEntries * indexEntrySize + entry * indexEntrySize,
+							SeekOrigin.Begin);
+						stream.Write(data, 0, indexEntryKeySize);
+					}
+				}
+			}
+		}
+	}
+
+	[TestCase(PTableVersions.IndexV2)]
+	[TestCase(PTableVersions.IndexV3)]
+	[TestCase(PTableVersions.IndexV4)]
+	public void throws_corrupt_index_exception_if_verification_enabled(byte version) {
+		//the CorruptIndexException is caught internally and should trigger an index file deletion if caught
+		ConstructTableIndexWithCorruptIndexEntries(version, false);
+		//index map file should be deleted if index verification fails
+		Assert.False(File.Exists(Path.Combine(PathName, TableIndex.IndexMapFilename)));
+		//force verify file should be cleared after rebuild/verification
+		Assert.False(File.Exists(Path.Combine(PathName, TableIndex.ForceIndexVerifyFilename)));
+	}
+
+	[TestCase(PTableVersions.IndexV2)]
+	[TestCase(PTableVersions.IndexV3)]
+	[TestCase(PTableVersions.IndexV4)]
+	public void throws_maybe_corrupt_index_exception_if_verification_disabled(byte version) {
+		//the MaybeCorruptIndexException is caught internally and should trigger an index file deletion if caught
+
+		ConstructTableIndexWithCorruptIndexEntries(version, true);
+		Assert.Throws<MaybeCorruptIndexException>(() => {
+			//since index entries are sorted in descending order, the corrupted index entry corresponds to NumIndexEntries/2+1
+			_tableIndex.GetRange(StreamName, NumIndexEntries / 2 + 1, NumIndexEntries / 2 + 1, null).ToArray();
+		});
+
+		//force verify file should be created
+		Assert.True(File.Exists(Path.Combine(PathName, TableIndex.ForceIndexVerifyFilename)));
+	}
+
+	[TestCase(PTableVersions.IndexV2)]
+	[TestCase(PTableVersions.IndexV3)]
+	[TestCase(PTableVersions.IndexV4)]
+	public void force_verification_of_index_if_verification_disabled_but_force_verification_file_present(
+		byte version) {
+		//the CorruptIndexException is caught internally and should trigger an index file deletion if caught
+		ConstructTableIndexWithCorruptIndexEntries(version, true, createForceVerifyFile: true);
+
+		//index map file should be deleted if index verification fails
+		Assert.False(File.Exists(Path.Combine(PathName, TableIndex.IndexMapFilename)));
+		//force verify file should be cleared after rebuild/verification
+		Assert.False(File.Exists(Path.Combine(PathName, TableIndex.ForceIndexVerifyFilename)));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/table_index_with_two_ptables_and_memtable_on_range_query.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/table_index_with_two_ptables_and_memtable_on_range_query.cs
new file mode 100644
index 00000000000..70f8351f38f
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/table_index_with_two_ptables_and_memtable_on_range_query.cs
@@ -0,0 +1,285 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.TransactionLog;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false), Category("LongRunning")]
+[TestFixture(PTableVersions.IndexV2, true), Category("LongRunning")]
+[TestFixture(PTableVersions.IndexV3, false), Category("LongRunning")]
+[TestFixture(PTableVersions.IndexV3, true), Category("LongRunning")]
+[TestFixture(PTableVersions.IndexV4, false), Category("LongRunning")]
+[TestFixture(PTableVersions.IndexV4, true), Category("LongRunning")]
+public class table_index_with_two_ptables_and_memtable_on_range_query : SpecificationWithDirectoryPerTestFixture {
+	private TableIndex<string> _tableIndex;
+	private IHasher<string> _lowHasher;
+	private IHasher<string> _highHasher;
+	private string _indexDir;
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+	private bool _skipIndexVerify;
+
+	public table_index_with_two_ptables_and_memtable_on_range_query(byte version, bool skipIndexVerify) {
+		_ptableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_indexDir = PathName;
+		var fakeReader = new TFReaderLease(new FakeIndexReader());
+		_lowHasher = new FakeIndexHasher();
+		_highHasher = new FakeIndexHasher();
+		_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
+			() => new HashListMemTable(_ptableVersion, maxSize: 10),
+			() => fakeReader,
+			_ptableVersion,
+			5, Constants.PTableMaxReaderCountDefault,
+			maxSizeForMemory: 2,
+			maxTablesPerLevel: 2,
+			skipIndexVerify: _skipIndexVerify);
+		_tableIndex.Initialize(long.MaxValue);
+
+		// ptable level 2
+		_tableIndex.Add(0, "1", 0, 0xFF00);
+		_tableIndex.Add(0, "1", 1, 0xFF01);
+		_tableIndex.Add(0, "2", 0, 0xFF00);
+		_tableIndex.Add(0, "2", 1, 0xFF01);
+		_tableIndex.Add(0, "3", 0, 0xFF00);
+		_tableIndex.Add(0, "3", 1, 0xFF01);
+		_tableIndex.Add(0, "3", 0, 0xFF02);
+		_tableIndex.Add(0, "3", 1, 0xFF03);
+
+		// ptable level 1
+		_tableIndex.Add(0, "4", 0, 0xFF00);
+		_tableIndex.Add(0, "5", 10, 0xFFF1);
+		_tableIndex.Add(0, "6", 0, 0xFF00);
+		_tableIndex.Add(0, "1", 0, 0xFF10);
+
+		// ptable level 0
+		_tableIndex.Add(0, "6", 1, 0xFF01);
+		_tableIndex.Add(0, "1", 1, 0xFF11);
+
+		// memtable
+		_tableIndex.Add(0, "4", 0, 0xFF01);
+
+		await Task.Delay(500);
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_tableIndex.Close();
+
+		return base.TestFixtureTearDown();
+	}
+
+	private ulong GetHash(string streamId) {
+		ulong hash = _lowHasher.Hash(streamId);
+		hash = _ptableVersion == PTableVersions.IndexV1 ? hash : hash << 32 | _highHasher.Hash(streamId);
+		return hash;
+	}
+
+	[Test]
+	public void should_not_return_latest_entry_for_nonexisting_stream() {
+		IndexEntry entry;
+		Assert.IsFalse(_tableIndex.TryGetLatestEntry("7", out entry));
+	}
+
+	[Test]
+	public void should_not_return_oldest_entry_for_nonexisting_stream() {
+		IndexEntry entry;
+		Assert.IsFalse(_tableIndex.TryGetLatestEntry("7", out entry));
+	}
+
+	[Test]
+	public void should_return_correct_latest_entry_for_stream_with_latest_entry_in_memtable() {
+		IndexEntry entry;
+		Assert.IsTrue(_tableIndex.TryGetLatestEntry("4", out entry));
+		Assert.AreEqual(GetHash("4"), entry.Stream);
+		Assert.AreEqual(0, entry.Version);
+		Assert.AreEqual(0xFF01, entry.Position);
+	}
+
+	[Test]
+	public void should_return_correct_latest_entry_for_stream_with_latest_entry_in_ptable_0() {
+		IndexEntry entry;
+		Assert.IsTrue(_tableIndex.TryGetLatestEntry("1", out entry));
+		Assert.AreEqual(GetHash("1"), entry.Stream);
+		Assert.AreEqual(1, entry.Version);
+		Assert.AreEqual(0xFF11, entry.Position);
+	}
+
+	[Test]
+	public void should_return_correct_latest_entry_for_another_stream_with_latest_entry_in_ptable_0() {
+		IndexEntry entry;
+		Assert.IsTrue(_tableIndex.TryGetLatestEntry("6", out entry));
+		Assert.AreEqual(GetHash("6"), entry.Stream);
+		Assert.AreEqual(1, entry.Version);
+		Assert.AreEqual(0xFF01, entry.Position);
+	}
+
+	[Test]
+	public void should_return_correct_latest_entry_for_stream_with_latest_entry_in_ptable_1() {
+		IndexEntry entry;
+		Assert.IsTrue(_tableIndex.TryGetLatestEntry("5", out entry));
+		Assert.AreEqual(GetHash("5"), entry.Stream);
+		Assert.AreEqual(10, entry.Version);
+		Assert.AreEqual(0xFFF1, entry.Position);
+	}
+
+	[Test]
+	public void should_return_correct_latest_entry_for_stream_with_latest_entry_in_ptable_2() {
+		IndexEntry entry;
+		Assert.IsTrue(_tableIndex.TryGetLatestEntry("2", out entry));
+		Assert.AreEqual(GetHash("2"), entry.Stream);
+		Assert.AreEqual(1, entry.Version);
+		Assert.AreEqual(0xFF01, entry.Position);
+	}
+
+	[Test]
+	public void should_return_correct_latest_entry_for_another_stream_with_latest_entry_in_ptable_2() {
+		IndexEntry entry;
+		Assert.IsTrue(_tableIndex.TryGetLatestEntry("3", out entry));
+		Assert.AreEqual(GetHash("3"), entry.Stream);
+		Assert.AreEqual(1, entry.Version);
+		Assert.AreEqual(0xFF03, entry.Position);
+	}
+
+	[Test]
+	public void should_return_correct_oldest_entries_for_each_stream() {
+		IndexEntry entry;
+
+		Assert.IsTrue(_tableIndex.TryGetOldestEntry("1", out entry));
+		Assert.AreEqual(GetHash("1"), entry.Stream);
+		Assert.AreEqual(0, entry.Version);
+		Assert.AreEqual(0xFF00, entry.Position);
+
+		Assert.IsTrue(_tableIndex.TryGetOldestEntry("2", out entry));
+		Assert.AreEqual(GetHash("2"), entry.Stream);
+		Assert.AreEqual(0, entry.Version);
+		Assert.AreEqual(0xFF00, entry.Position);
+
+		Assert.IsTrue(_tableIndex.TryGetOldestEntry("3", out entry));
+		Assert.AreEqual(GetHash("3"), entry.Stream);
+		Assert.AreEqual(0, entry.Version);
+		Assert.AreEqual(0xFF00, entry.Position);
+
+		Assert.IsTrue(_tableIndex.TryGetOldestEntry("4", out entry));
+		Assert.AreEqual(GetHash("4"), entry.Stream);
+		Assert.AreEqual(0, entry.Version);
+		Assert.AreEqual(0xFF00, entry.Position);
+
+		Assert.IsTrue(_tableIndex.TryGetOldestEntry("5", out entry));
+		Assert.AreEqual(GetHash("5"), entry.Stream);
+		Assert.AreEqual(10, entry.Version);
+		Assert.AreEqual(0xFFF1, entry.Position);
+
+		Assert.IsTrue(_tableIndex.TryGetOldestEntry("6", out entry));
+		Assert.AreEqual(GetHash("6"), entry.Stream);
+		Assert.AreEqual(0, entry.Version);
+		Assert.AreEqual(0xFF00, entry.Position);
+	}
+
+	[Test]
+	public void should_return_empty_range_for_nonexisting_stream() {
+		var range = _tableIndex.GetRange("7", 0, int.MaxValue).ToArray();
+		Assert.AreEqual(0, range.Length);
+	}
+
+	[Test]
+	public void should_return_correct_full_range_with_descending_order_for_1() {
+		var range = _tableIndex.GetRange("1", 0, long.MaxValue).ToArray();
+		Assert.AreEqual(4, range.Length);
+		Assert.AreEqual(new IndexEntry(GetHash("1"), 1, 0xFF11), range[0]);
+		Assert.AreEqual(new IndexEntry(GetHash("1"), 1, 0xFF01), range[1]);
+		Assert.AreEqual(new IndexEntry(GetHash("1"), 0, 0xFF10), range[2]);
+		Assert.AreEqual(new IndexEntry(GetHash("1"), 0, 0xFF00), range[3]);
+	}
+
+	[Test]
+	public void should_return_correct_full_range_with_descending_order_for_2() {
+		var range = _tableIndex.GetRange("2", 0, long.MaxValue).ToArray();
+		Assert.AreEqual(2, range.Length);
+		Assert.AreEqual(new IndexEntry(GetHash("2"), 1, 0xFF01), range[0]);
+		Assert.AreEqual(new IndexEntry(GetHash("2"), 0, 0xFF00), range[1]);
+	}
+
+	[Test]
+	public void should_return_correct_full_range_with_descending_order_for_3() {
+		var range = _tableIndex.GetRange("3", 0, long.MaxValue).ToArray();
+		Assert.AreEqual(4, range.Length);
+		Assert.AreEqual(new IndexEntry(GetHash("3"), 1, 0xFF03), range[0]);
+		Assert.AreEqual(new IndexEntry(GetHash("3"), 1, 0xFF01), range[1]);
+		Assert.AreEqual(new IndexEntry(GetHash("3"), 0, 0xFF02), range[2]);
+		Assert.AreEqual(new IndexEntry(GetHash("3"), 0, 0xFF00), range[3]);
+	}
+
+	[Test]
+	public void should_return_correct_full_range_with_descending_order_for_4() {
+		var range = _tableIndex.GetRange("4", 0, long.MaxValue).ToArray();
+		Assert.AreEqual(2, range.Length);
+		Assert.AreEqual(new IndexEntry(GetHash("4"), 0, 0xFF01), range[0]);
+		Assert.AreEqual(new IndexEntry(GetHash("4"), 0, 0xFF00), range[1]);
+	}
+
+	[Test]
+	public void should_return_correct_full_range_with_descending_order_for_5() {
+		var range = _tableIndex.GetRange("5", 0, long.MaxValue).ToArray();
+		Assert.AreEqual(1, range.Length);
+		Assert.AreEqual(new IndexEntry(GetHash("5"), 10, 0xFFF1), range[0]);
+	}
+
+	[Test]
+	public void should_return_correct_full_range_with_descending_order_for_6() {
+		var range = _tableIndex.GetRange("6", 0, long.MaxValue).ToArray();
+		Assert.AreEqual(2, range.Length);
+		Assert.AreEqual(new IndexEntry(GetHash("6"), 1, 0xFF01), range[0]);
+		Assert.AreEqual(new IndexEntry(GetHash("6"), 0, 0xFF00), range[1]);
+	}
+
+	[Test]
+	public void should_not_return_one_value_for_nonexistent_stream() {
+		long pos;
+		Assert.IsFalse(_tableIndex.TryGetOneValue("7", 0, out pos));
+	}
+
+	[Test]
+	public void should_return_one_value_for_existing_streams_for_existing_version() {
+		long pos;
+		Assert.IsTrue(_tableIndex.TryGetOneValue("1", 1, out pos));
+		Assert.AreEqual(0xFF11, pos);
+
+		Assert.IsTrue(_tableIndex.TryGetOneValue("2", 0, out pos));
+		Assert.AreEqual(0xFF00, pos);
+
+		Assert.IsTrue(_tableIndex.TryGetOneValue("3", 0, out pos));
+		Assert.AreEqual(0xFF02, pos);
+
+		Assert.IsTrue(_tableIndex.TryGetOneValue("4", 0, out pos));
+		Assert.AreEqual(0xFF01, pos);
+
+		Assert.IsTrue(_tableIndex.TryGetOneValue("5", 10, out pos));
+		Assert.AreEqual(0xFFF1, pos);
+
+		Assert.IsTrue(_tableIndex.TryGetOneValue("6", 1, out pos));
+		Assert.AreEqual(0xFF01, pos);
+	}
+
+	[Test]
+	public void should_not_return_one_value_for_existing_streams_for_nonexistent_version() {
+		long pos;
+		Assert.IsFalse(_tableIndex.TryGetOneValue("1", 2, out pos));
+		Assert.IsFalse(_tableIndex.TryGetOneValue("2", 2, out pos));
+		Assert.IsFalse(_tableIndex.TryGetOneValue("3", 2, out pos));
+		Assert.IsFalse(_tableIndex.TryGetOneValue("4", 1, out pos));
+		Assert.IsFalse(_tableIndex.TryGetOneValue("5", 0, out pos));
+		Assert.IsFalse(_tableIndex.TryGetOneValue("6", 2, out pos));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/when_a_ptable_header_is_corrupt_on_disk.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/when_a_ptable_header_is_corrupt_on_disk.cs
new file mode 100644
index 00000000000..71a269dee4f
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/when_a_ptable_header_is_corrupt_on_disk.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2)]
+[TestFixture(PTableVersions.IndexV3)]
+[TestFixture(PTableVersions.IndexV4)]
+public class when_a_ptable_header_is_corrupt_on_disk : SpecificationWithDirectory {
+	private string _filename;
+	private PTable _table;
+	private string _copiedfilename;
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+
+	public when_a_ptable_header_is_corrupt_on_disk(byte version) {
+		_ptableVersion = version;
+	}
+
+	[SetUp]
+	public void Setup() {
+		_filename = GetTempFilePath();
+		_copiedfilename = GetTempFilePath();
+
+		var mtable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		mtable.Add(0x010100000000, 0x0001, 0x0001);
+		mtable.Add(0x010500000000, 0x0001, 0x0002);
+		_table = PTable.FromMemtable(mtable, _filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault);
+		_table.Dispose();
+		File.Copy(_filename, _copiedfilename);
+		using (var f = new FileStream(_copiedfilename, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite)) {
+			f.Seek(22, SeekOrigin.Begin);
+			f.WriteByte(0x22);
+		}
+	}
+
+	[Test]
+	public void the_hash_is_invalid() {
+		var exc = Assert.Throws<CorruptIndexException>(() => _table = PTable.FromFile(_copiedfilename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 16, false));
+		Assert.IsInstanceOf<HashValidationException>(exc.InnerException);
+	}
+
+	[Test]
+	public void no_error_if_index_verification_disabled() {
+		Assert.DoesNotThrow(
+			() => _table = PTable.FromFile(_copiedfilename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 16, true)
+		);
+	}
+
+	[TearDown]
+	public void Teardown() {
+		_table.MarkForDestruction();
+		_table.WaitForDisposal(1000);
+		File.Delete(_filename);
+		File.Delete(_copiedfilename);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/when_a_ptable_is_corrupt_on_disk.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/when_a_ptable_is_corrupt_on_disk.cs
new file mode 100644
index 00000000000..ccb78fd2062
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/when_a_ptable_is_corrupt_on_disk.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Threading.Tasks;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2)]
+[TestFixture(PTableVersions.IndexV3)]
+[TestFixture(PTableVersions.IndexV4)]
+public class when_a_ptable_is_corrupt_on_disk : SpecificationWithDirectory {
+	private string _filename;
+	private PTable _table;
+	private string _copiedfilename;
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+
+	public when_a_ptable_is_corrupt_on_disk(byte version) {
+		_ptableVersion = version;
+	}
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+
+		_filename = GetTempFilePath();
+		_copiedfilename = GetTempFilePath();
+		var mtable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		mtable.Add(0x010100000000, 0x0001, 0x0001);
+		mtable.Add(0x010500000000, 0x0001, 0x0002);
+		_table = PTable.FromMemtable(mtable, _filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault);
+		_table.Dispose();
+		File.Copy(_filename, _copiedfilename);
+		using (var f = new FileStream(_copiedfilename, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite)) {
+			f.Seek(130, SeekOrigin.Begin);
+			f.WriteByte(0x22);
+		}
+	}
+
+	[TearDown]
+	public override Task TearDown() {
+		_table.MarkForDestruction();
+		_table.WaitForDisposal(1000);
+
+		return base.TearDown();
+	}
+
+	[Test]
+	public void the_hash_is_invalid() {
+		var exc = Assert.Throws<CorruptIndexException>(() => PTable.FromFile(_copiedfilename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 16, false));
+		Assert.IsInstanceOf<HashValidationException>(exc.InnerException);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/when_a_ptable_is_loaded_from_disk.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/when_a_ptable_is_loaded_from_disk.cs
new file mode 100644
index 00000000000..feb68ff4f43
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/when_a_ptable_is_loaded_from_disk.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class when_a_ptable_is_loaded_from_disk : SpecificationWithDirectory {
+	private string _filename;
+	private PTable _table;
+	private string _copiedfilename;
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+
+	private bool _skipIndexVerify;
+
+	public when_a_ptable_is_loaded_from_disk(byte version, bool skipIndexVerify) {
+		_ptableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+
+		_filename = GetTempFilePath();
+		_copiedfilename = GetTempFilePath();
+		var mtable = new HashListMemTable(_ptableVersion, maxSize: 1024);
+
+		long logPosition = 0;
+		long eventNumber = 1;
+		ulong streamId = 0x010100000000;
+
+		for (var i = 0; i < 1337; i++) {
+			logPosition++;
+
+			if (i % 37 == 0) {
+				streamId -= 0x1337;
+				eventNumber = 1;
+			} else
+				eventNumber++;
+
+			mtable.Add(streamId, eventNumber, logPosition);
+		}
+
+		_table = PTable.FromMemtable(mtable, _filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify);
+		_table.Dispose();
+		File.Copy(_filename, _copiedfilename);
+	}
+
+	[Test]
+	public void same_midpoints_are_loaded_when_enabling_or_disabling_index_verification() {
+		for (int depth = 2; depth <= 20; depth++) {
+			var ptableWithMD5Verification = PTable.FromFile(_copiedfilename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, false);
+			var ptableWithoutVerification = PTable.FromFile(_copiedfilename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, depth, true);
+			var midPoints1 = ptableWithMD5Verification.GetMidPoints();
+			var midPoints2 = ptableWithoutVerification.GetMidPoints();
+
+			Assert.AreEqual(midPoints1.Length, midPoints2.Length);
+			for (var i = 0; i < midPoints1.Length; i++) {
+				Assert.AreEqual(midPoints1[i].ItemIndex, midPoints2[i].ItemIndex);
+				Assert.AreEqual(midPoints1[i].Key.Stream, midPoints2[i].Key.Stream);
+				Assert.AreEqual(midPoints1[i].Key.Version, midPoints2[i].Key.Version);
+			}
+
+			ptableWithMD5Verification.Dispose();
+			ptableWithoutVerification.Dispose();
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/when_constructing_v1_ptable.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/when_constructing_v1_ptable.cs
new file mode 100644
index 00000000000..8ee544e45a5
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/when_constructing_v1_ptable.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+public class when_constructing_v1_ptable : SpecificationWithDirectoryPerTestFixture {
+	[Test]
+	public void an_exception_is_thrown() {
+		Assert.Throws<CorruptIndexException>(() => {
+			using var table = PTable.FromMemtable(
+				new HashListMemTable(PTableVersions.IndexV1, maxSize: 20),
+				GetTempFilePath(),
+				Constants.PTableInitialReaderCount,
+				Constants.PTableMaxReaderCountDefault);
+		});
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/when_creating_large_bloom_filter.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/when_creating_large_bloom_filter.cs
new file mode 100644
index 00000000000..59e78b7a867
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/when_creating_large_bloom_filter.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.DataStructures.ProbabilisticFilter;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+public class when_creating_large_bloom_filter : SpecificationWithDirectory {
+	[Ignore("Quick but requires 4gb disk")]
+	[Test]
+	public void ptable_exceeding_maximum_filter_size_succeeds() {
+		var file = GetTempFilePath();
+
+		// create
+		var filter = PTable.ConstructBloomFilter(
+			useBloomFilter: true,
+			filename: file,
+			indexEntryCount: 16_384_000_000);
+		filter.Dispose();
+
+		// and reopen
+		filter = new PersistentBloomFilter(FileStreamPersistence.FromFile(
+			PTable.GenBloomFilterFilename(file)));
+		filter.Dispose();
+	}
+
+	[Test]
+	public void out_of_memory_returns_null() {
+		var filter = PTable.ConstructBloomFilter(
+			useBloomFilter: true,
+			filename: GetTempFilePath(),
+			indexEntryCount: 1,
+			genBloomFilterSizeBytes: _ => 1_000_000_000_000); // rly big
+
+		Assert.Null(filter);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/when_creating_ptable_from_memtable.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/when_creating_ptable_from_memtable.cs
new file mode 100644
index 00000000000..d3eae7b27e0
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/when_creating_ptable_from_memtable.cs
@@ -0,0 +1,121 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Linq;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class when_creating_ptable_from_memtable : SpecificationWithFile {
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+	private bool _skipIndexVerify;
+
+	public when_creating_ptable_from_memtable(byte version, bool skipIndexVerify) {
+		_ptableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	[Test]
+	public void null_file_throws_null_exception() {
+		Assert.Throws<ArgumentNullException>(() =>
+			PTable.FromMemtable(new HashListMemTable(_ptableVersion, maxSize: 10), null, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault,
+				skipIndexVerify: _skipIndexVerify));
+	}
+
+	[Test]
+	public void null_memtable_throws_null_exception() {
+		Assert.Throws<ArgumentNullException>(() =>
+			PTable.FromMemtable(null, "C:\\foo.txt", Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify));
+	}
+
+	[Test]
+	public void wait_for_destroy_will_timeout() {
+		var table = new HashListMemTable(_ptableVersion, maxSize: 10);
+		table.Add(0x010100000000, 0x0001, 0x0001);
+		var ptable = PTable.FromMemtable(table, Filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify);
+		Assert.Throws<TimeoutException>(() => ptable.WaitForDisposal(1));
+
+		// tear down
+		ptable.MarkForDestruction();
+		ptable.WaitForDisposal(1000);
+	}
+
+	//[Test]
+	//public void non_power_of_two_throws_invalid_operation()
+	//{
+	//    var table = new HashListMemTable(_ptableVersion, );
+	//    table.Add(0x010100000000, 0x0001, 0x0001);
+	//    table.Add(0x010500000000, 0x0001, 0x0002);
+	//    table.Add(0x010200000000, 0x0001, 0x0003);
+	//    Assert.Throws<InvalidOperationException>(() => PTable.FromMemtable(table, "C:\\foo.txt"));
+	//}
+
+	[Test]
+	public void the_file_gets_created_and_can_be_read() {
+		var indexEntrySize = PTable.IndexEntryV4Size;
+		if (_ptableVersion == PTableVersions.IndexV1) {
+			indexEntrySize = PTable.IndexEntryV1Size;
+		} else if (_ptableVersion == PTableVersions.IndexV2) {
+			indexEntrySize = PTable.IndexEntryV2Size;
+		} else if (_ptableVersion == PTableVersions.IndexV3) {
+			indexEntrySize = PTable.IndexEntryV3Size;
+		}
+
+		var table = new HashListMemTable(_ptableVersion, maxSize: 10);
+		table.Add(0x010100000000, 0x0001, 0x0001);
+		table.Add(0x010500000000, 0x0001, 0x0002);
+		table.Add(0x010200000000, 0x0001, 0x0003);
+		table.Add(0x010200000000, 0x0002, 0x0003);
+		using (var sstable = PTable.FromMemtable(table, Filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault,
+			skipIndexVerify: _skipIndexVerify,
+			useBloomFilter: true)) {
+
+			var fileinfo = new FileInfo(Filename);
+			var midpointsCached = PTable.GetRequiredMidpointCountCached(4, _ptableVersion);
+			Assert.AreEqual(
+				PTableHeader.Size + 4 * indexEntrySize + midpointsCached * indexEntrySize +
+				PTableFooter.GetSize(_ptableVersion) + PTable.MD5Size, fileinfo.Length);
+			var items = sstable.IterateAllInOrder().ToList();
+			Assert.AreEqual(GetHash(0x010500000000), items[0].Stream);
+			Assert.AreEqual(0x0001, items[0].Version);
+			Assert.AreEqual(GetHash(0x010200000000), items[1].Stream);
+			Assert.AreEqual(0x0002, items[1].Version);
+			Assert.AreEqual(GetHash(0x010200000000), items[2].Stream);
+			Assert.AreEqual(0x0001, items[2].Version);
+			Assert.AreEqual(GetHash(0x010100000000), items[3].Stream);
+			Assert.AreEqual(0x0001, items[3].Version);
+
+			var stream = (ulong)0x010200000000;
+			Assert.True(sstable.TryGetLatestEntry(stream, out var entry));
+			Assert.AreEqual(GetHash(stream), entry.Stream);
+			Assert.AreEqual(0x0002, entry.Version);
+			Assert.AreEqual(0x0003, entry.Position);
+		}
+	}
+
+	[Test]
+	public void the_hash_of_file_is_valid() {
+		var table = new HashListMemTable(_ptableVersion, maxSize: 10);
+		table.Add(0x010100000000, 0x0001, 0x0001);
+		table.Add(0x010500000000, 0x0001, 0x0002);
+		table.Add(0x010200000000, 0x0001, 0x0003);
+		table.Add(0x010200000000, 0x0002, 0x0003);
+		Assert.DoesNotThrow(() => {
+			using (var sstable = PTable.FromMemtable(table, Filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: false)) {
+			}
+		});
+	}
+
+	private ulong GetHash(ulong value) {
+		return _ptableVersion == PTableVersions.IndexV1 ? value >> 32 : value;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/when_merging_four_ptables.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/when_merging_four_ptables.cs
new file mode 100644
index 00000000000..addccfdc2e9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/when_merging_four_ptables.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class when_merging_four_ptables : SpecificationWithDirectoryPerTestFixture {
+	private readonly List<string> _files = new List<string>();
+	private readonly List<PTable> _tables = new List<PTable>();
+	private PTable _newtable;
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+
+	private bool _skipIndexVerify;
+
+	public when_merging_four_ptables(byte version, bool skipIndexVerify) {
+		_ptableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		for (int i = 0; i < 4; i++) {
+			_files.Add(GetTempFilePath());
+
+			var table = new HashListMemTable(_ptableVersion, maxSize: 20);
+			for (int j = 0; j < 10; j++) {
+				table.Add((ulong)(0x010100000000 << (j + 1)), i + 1, i * j);
+			}
+
+			_tables.Add(PTable.FromMemtable(table, _files[i], Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify));
+		}
+
+		_files.Add(GetTempFilePath());
+		_newtable = PTable.MergeTo(_tables, _files[4],
+			_ptableVersion, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault,
+			skipIndexVerify: _skipIndexVerify);
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_newtable.Dispose();
+		foreach (var ssTable in _tables) {
+			ssTable.Dispose();
+		}
+
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void there_are_forty_records_in_merged_index() {
+		Assert.AreEqual(40, _newtable.Count);
+	}
+
+	[Test]
+	public void the_items_are_sorted() {
+		var last = new IndexEntry(ulong.MaxValue, 0, long.MaxValue);
+		foreach (var item in _newtable.IterateAllInOrder()) {
+			Assert.IsTrue((last.Stream == item.Stream ? last.Version > item.Version : last.Stream > item.Stream) ||
+						  ((last.Stream == item.Stream && last.Version == item.Version) &&
+						   last.Position > item.Position));
+			last = item;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/when_merging_ptables.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/when_merging_ptables.cs
new file mode 100644
index 00000000000..86877f79c75
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/when_merging_ptables.cs
@@ -0,0 +1,91 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class when_merging_ptables : SpecificationWithDirectoryPerTestFixture {
+	private readonly List<string> _files = new List<string>();
+	private readonly List<PTable> _tables = new List<PTable>();
+
+	private PTable _newtable;
+	private readonly byte _ptableVersion;
+	private readonly bool _skipIndexVerify;
+
+	public when_merging_ptables(byte version, bool skipIndexVerify) {
+		_ptableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_files.Add(GetTempFilePath());
+		var table = new HashListMemTable(_ptableVersion, maxSize: 20);
+		table.Add(0x0101, 0, 0x0101);
+		table.Add(0x0102, 0, 0x0102);
+		table.Add(0x0103, 0, 0x0103);
+		table.Add(0x0104, 0, 0x0104);
+		_tables.Add(PTable.FromMemtable(table, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault));
+		table = new HashListMemTable(_ptableVersion, maxSize: 20);
+		table.Add(0x0105, 0, 0x0105);
+		table.Add(0x0106, 0, 0x0106);
+		table.Add(0x0107, 0, 0x0107);
+		table.Add(0x0108, 0, 0x0108);
+		_tables.Add(PTable.FromMemtable(table, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault));
+		_newtable = PTable.MergeTo(
+			tables: _tables,
+			outputFile: GetTempFilePath(),
+			version: PTableVersions.IndexV4,
+			initialReaders: Constants.PTableInitialReaderCount,
+			maxReaders: Constants.PTableMaxReaderCountDefault,
+			skipIndexVerify: _skipIndexVerify,
+			useBloomFilter: true);
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_newtable.Dispose();
+		foreach (var ssTable in _tables) {
+			ssTable.Dispose();
+		}
+
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void merged_ptable_is_64bit() {
+		Assert.AreEqual(PTableVersions.IndexV4, _newtable.Version);
+	}
+
+	[Test]
+	public void there_are_8_records_in_the_merged_index() {
+		Assert.AreEqual(8, _newtable.Count);
+	}
+
+	[Test]
+	public void a_stream_can_be_found() {
+		Assert.True(_newtable.TryGetLatestEntry(0x0108, out var entry));
+		Assert.AreEqual(0x0108, entry.Stream);
+		Assert.AreEqual(0, entry.Version);
+		Assert.AreEqual(0x0108, entry.Position);
+	}
+
+	[Test]
+	public void no_entries_should_have_changed() {
+		foreach (var item in _newtable.IterateAllInOrder()) {
+			Assert.IsTrue((ulong)item.Position == item.Stream, "Expected the Stream (Hash) {0:X} to be equal to {1:X}",
+				item.Stream - 1, item.Position);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/when_merging_ptables_with_entries_to_nonexisting_record.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/when_merging_ptables_with_entries_to_nonexisting_record.cs
new file mode 100644
index 00000000000..d0908059feb
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/when_merging_ptables_with_entries_to_nonexisting_record.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+public class
+	when_merging_ptables_with_entries_to_nonexisting_record_in_newer_index_versions :
+		SpecificationWithDirectoryPerTestFixture {
+	private readonly List<string> _files = new List<string>();
+	private readonly List<PTable> _tables = new List<PTable>();
+	protected PTable _newtable;
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+
+	private bool _skipIndexVerify;
+
+	public when_merging_ptables_with_entries_to_nonexisting_record_in_newer_index_versions(byte version,
+		bool skipIndexVerify) {
+		_ptableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		for (int i = 0; i < 4; i++) {
+			_files.Add(GetTempFilePath());
+
+			var table = new HashListMemTable(_ptableVersion, maxSize: 30);
+			for (int j = 0; j < 10; j++) {
+				table.Add((ulong)(0x010100000000 << i), j, i * 10 + j);
+			}
+
+			_tables.Add(PTable.FromMemtable(table, _files[i], Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify));
+		}
+
+		_files.Add(GetTempFilePath());
+		_newtable = PTable.MergeTo(_tables, _files[4],
+			_ptableVersion, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault,
+			skipIndexVerify: _skipIndexVerify);
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_newtable.Dispose();
+		foreach (var ssTable in _tables) {
+			ssTable.Dispose();
+		}
+
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void all_entries_are_left() {
+		Assert.AreEqual(40, _newtable.Count);
+	}
+
+	[Test]
+	public void the_items_are_sorted() {
+		var last = new IndexEntry(ulong.MaxValue, 0, long.MaxValue);
+		foreach (var item in _newtable.IterateAllInOrder()) {
+			Assert.IsTrue((last.Stream == item.Stream ? last.Version > item.Version : last.Stream > item.Stream) ||
+						  ((last.Stream == item.Stream && last.Version == item.Version) &&
+						   last.Position > item.Position));
+			last = item;
+		}
+	}
+
+	[Test]
+	public void the_right_items_are_deleted() {
+		for (int i = 0; i < 4; i++) {
+			for (int j = 0; j < 10; j++) {
+				long position;
+				Assert.IsTrue(_newtable.TryGetOneValue((ulong)(0x010100000000 << i), j, out position));
+				Assert.AreEqual(i * 10 + j, position);
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/when_merging_two_ptables.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/when_merging_two_ptables.cs
new file mode 100644
index 00000000000..53db70fa174
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/when_merging_two_ptables.cs
@@ -0,0 +1,92 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class when_merging_two_ptables : SpecificationWithDirectoryPerTestFixture {
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+	private readonly List<string> _files = new List<string>();
+	private readonly List<PTable> _tables = new List<PTable>();
+
+	private PTable _newtable;
+
+	private bool _skipIndexVerify;
+
+	public when_merging_two_ptables(byte version, bool skipIndexVerify) {
+		_ptableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	private ulong GetHash(ulong value) {
+		return _ptableVersion == PTableVersions.IndexV1 ? value >> 32 : value;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		for (int i = 0; i < 2; i++) {
+			_files.Add(GetTempFilePath());
+
+			var table = new HashListMemTable(_ptableVersion, maxSize: 20);
+			for (int j = 0; j < 10; j++) {
+				table.Add((ulong)(0x010100000000 << (j + 1)), i + 1, i * j);
+			}
+
+			_tables.Add(PTable.FromMemtable(table, _files[i], Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault,
+				skipIndexVerify: _skipIndexVerify, useBloomFilter: true));
+		}
+
+		_files.Add(GetTempFilePath());
+		_newtable = PTable.MergeTo(_tables, _files[2],
+			_ptableVersion, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault,
+			skipIndexVerify: _skipIndexVerify, useBloomFilter: true);
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_newtable.Dispose();
+		foreach (var ssTable in _tables) {
+			ssTable.Dispose();
+		}
+
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void there_are_twenty_records_in_merged_index() {
+		Assert.AreEqual(20, _newtable.Count);
+	}
+
+	[Test]
+	public void the_streams_can_be_found() {
+		for (int j = 0; j < 10; j++) {
+			var stream = (ulong)(0x010100000000 << (j + 1));
+			Assert.True(_newtable.TryGetLatestEntry(stream, out var entry));
+			Assert.AreEqual(GetHash(stream), entry.Stream);
+			Assert.AreEqual(2, entry.Version);
+			Assert.AreEqual(1 * j, entry.Position);
+		}
+	}
+
+	[Test]
+	public void the_items_are_sorted() {
+		var last = new IndexEntry(ulong.MaxValue, 0, long.MaxValue);
+		foreach (var item in _newtable.IterateAllInOrder()) {
+			Assert.IsTrue((last.Stream == item.Stream ? last.Version > item.Version : last.Stream > item.Stream) ||
+						  ((last.Stream == item.Stream && last.Version == item.Version) &&
+						   last.Position > item.Position));
+			last = item;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/when_trying_to_get_latest_entry.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/when_trying_to_get_latest_entry.cs
new file mode 100644
index 00000000000..3e4583c181a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/when_trying_to_get_latest_entry.cs
@@ -0,0 +1,113 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false, 1_000_000)]
+[TestFixture(PTableVersions.IndexV2, true, 1_000_000)]
+[TestFixture(PTableVersions.IndexV3, false, 1_000_000)]
+[TestFixture(PTableVersions.IndexV3, true, 1_000_000)]
+[TestFixture(PTableVersions.IndexV4, false, 1_000_000)]
+[TestFixture(PTableVersions.IndexV4, true, 1_000_000)]
+[TestFixture(PTableVersions.IndexV4, false, 0)]
+[TestFixture(PTableVersions.IndexV4, true, 0)]
+public class when_trying_to_get_latest_entry : SpecificationWithFile {
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+
+	private readonly bool _skipIndexVerify;
+	private readonly bool _useBloomFilter;
+	private readonly int _lruCacheSize;
+
+	public when_trying_to_get_latest_entry(byte version, bool skipIndexVerify, int lruCacheSize) {
+		_ptableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+		_useBloomFilter = skipIndexVerify; // bloomfilter orthogonal
+		_lruCacheSize = lruCacheSize;
+	}
+
+	private ulong GetHash(ulong value) {
+		return _ptableVersion == PTableVersions.IndexV1 ? value >> 32 : value;
+	}
+
+	private PTable ConstructPTable(HashListMemTable memTable) {
+		return PTable.FromMemtable(
+			memTable,
+			Filename,
+			Constants.PTableInitialReaderCount,
+			Constants.PTableMaxReaderCountDefault,
+			skipIndexVerify: _skipIndexVerify,
+			useBloomFilter: _useBloomFilter,
+			lruCacheSize: _lruCacheSize);
+	}
+
+	[Test]
+	public void nothing_is_found_on_empty_stream() {
+		var memTable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		memTable.Add(0x010100000000, 0x01, 0xffff);
+		using (var ptable = ConstructPTable(memTable)) {
+			IndexEntry entry;
+			Assert.IsFalse(ptable.TryGetLatestEntry(0x12, out entry));
+		}
+	}
+
+	[Test]
+	public void single_item_is_latest() {
+		var memTable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		memTable.Add(0x010100000000, 0x01, 0xffff);
+		using (var ptable = ConstructPTable(memTable)) {
+			IndexEntry entry;
+			Assert.IsTrue(ptable.TryGetLatestEntry(0x010100000000, out entry));
+			Assert.AreEqual(GetHash(0x010100000000), entry.Stream);
+			Assert.AreEqual(0x01, entry.Version);
+			Assert.AreEqual(0xffff, entry.Position);
+		}
+	}
+
+	[Test]
+	public void correct_entry_is_returned() {
+		var memTable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		memTable.Add(0x010100000000, 0x01, 0xffff);
+		memTable.Add(0x010100000000, 0x02, 0xfff2);
+		using (var ptable = ConstructPTable(memTable)) {
+			IndexEntry entry;
+			Assert.IsTrue(ptable.TryGetLatestEntry(0x010100000000, out entry));
+			Assert.AreEqual(GetHash(0x010100000000), entry.Stream);
+			Assert.AreEqual(0x02, entry.Version);
+			Assert.AreEqual(0xfff2, entry.Position);
+		}
+	}
+
+	[Test]
+	public void when_duplicated_entries_exist_the_one_with_latest_position_is_returned() {
+		var memTable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		memTable.Add(0x010100000000, 0x01, 0xfff1);
+		memTable.Add(0x010100000000, 0x02, 0xfff2);
+		memTable.Add(0x010100000000, 0x01, 0xfff3);
+		memTable.Add(0x010100000000, 0x02, 0xfff4);
+		using (var ptable = ConstructPTable(memTable)) {
+			IndexEntry entry;
+			Assert.IsTrue(ptable.TryGetLatestEntry(0x010100000000, out entry));
+			Assert.AreEqual(GetHash(0x010100000000), entry.Stream);
+			Assert.AreEqual(0x02, entry.Version);
+			Assert.AreEqual(0xfff4, entry.Position);
+		}
+	}
+
+	[Test]
+	public void only_entry_with_largest_position_is_returned_when_triduplicated() {
+		var memTable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		memTable.Add(0x010100000000, 0x01, 0xfff1);
+		memTable.Add(0x010100000000, 0x01, 0xfff3);
+		memTable.Add(0x010100000000, 0x01, 0xfff5);
+		using (var ptable = ConstructPTable(memTable)) {
+			IndexEntry entry;
+			Assert.IsTrue(ptable.TryGetLatestEntry(0x010100000000, out entry));
+			Assert.AreEqual(GetHash(0x010100000000), entry.Stream);
+			Assert.AreEqual(0x01, entry.Version);
+			Assert.AreEqual(0xfff5, entry.Position);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/when_trying_to_get_latest_entry_before_position.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/when_trying_to_get_latest_entry_before_position.cs
new file mode 100644
index 00000000000..0720ddc0188
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/when_trying_to_get_latest_entry_before_position.cs
@@ -0,0 +1,195 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class when_trying_to_get_latest_entry_before_position : SpecificationWithFile {
+	private readonly byte _pTableVersion;
+	private readonly bool _skipIndexVerify;
+
+	private HashListMemTable _memTable;
+	private PTable _pTable;
+	private readonly long _deletedStreamEventNumber;
+
+	private const ulong HNormal = 0x01UL << 32;
+	private const ulong HTombstoned = 0x02UL << 32;
+	private const ulong HDuplicate = 0x03UL << 32;
+	private const ulong HOutOfOrder = 0x04UL << 32;
+	private const ulong HNotExists = 0x05UL << 32;
+
+	public when_trying_to_get_latest_entry_before_position(byte version, bool skipIndexVerify) {
+		_pTableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+		_deletedStreamEventNumber = version < PTableVersions.IndexV3 ? int.MaxValue : long.MaxValue;
+	}
+
+	private ulong GetHash(ulong value) {
+		return _pTableVersion == PTableVersions.IndexV1 ? value >> 32 : value;
+	}
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+		_memTable = new HashListMemTable(_pTableVersion, maxSize: 10);
+		_memTable.Add(HNormal, 0, 0);
+		_memTable.Add(HNormal, 1, 1);
+		_memTable.Add(HNormal, 2, 2);
+		_memTable.Add(HTombstoned, 1, 3);
+		_memTable.Add(HNormal, 5, 4);
+		_memTable.Add(HTombstoned, _deletedStreamEventNumber, 5);
+		_memTable.Add(HDuplicate, 0, 6);
+		_memTable.Add(HDuplicate, 0, 7);
+		_memTable.Add(HDuplicate, 1, 8);
+		_memTable.Add(HDuplicate, 1, 9);
+		_memTable.Add(HOutOfOrder, 0, 10);
+		_memTable.Add(HOutOfOrder, 2, 11);
+		_memTable.Add(HOutOfOrder, 1, 12);
+		_pTable = PTable.FromMemtable(
+			table: _memTable,
+			filename: Filename,
+			initialReaders: Constants.PTableInitialReaderCount,
+			maxReaders: Constants.PTableMaxReaderCountDefault,
+			skipIndexVerify: _skipIndexVerify);
+	}
+
+	[TearDown]
+	public override void TearDown() {
+		_pTable?.Dispose();
+		base.TearDown();
+	}
+
+	private ISearchTable GetTable(bool memTableOrPTable) => memTableOrPTable ? (ISearchTable)_memTable : _pTable;
+
+	[TestCase(true)]
+	[TestCase(false)]
+	public async Task when_hash_doesnt_exist_returns_false(bool memTableOrPTable) {
+		var table = GetTable(memTableOrPTable);
+		Assert.Null(await table.TryGetLatestEntry(HNotExists, 10, (x, token) => {
+			Assert.AreEqual(GetHash(HNotExists), x.Stream);
+			return new(true);
+		}, CancellationToken.None));
+	}
+
+	[TestCase(true)]
+	[TestCase(false)]
+	public async Task when_hash_exists_but_not_before_position_limit_returns_false(bool memTableOrPTable) {
+		var table = GetTable(memTableOrPTable);
+		Assert.Null(await table.TryGetLatestEntry(HNormal, 0, (x, token) => {
+			Assert.AreEqual(GetHash(HNormal), x.Stream);
+			return new(true);
+		}, CancellationToken.None));
+
+		Assert.Null(await table.TryGetLatestEntry(HTombstoned, 3, (x, token) => {
+			Assert.AreEqual(GetHash(HTombstoned), x.Stream);
+			return new(true);
+		}, CancellationToken.None));
+
+		Assert.Null(await table.TryGetLatestEntry(HDuplicate, 6, (x, token) => {
+			Assert.AreEqual(GetHash(HDuplicate), x.Stream);
+			return new(true);
+		}, CancellationToken.None));
+	}
+
+	[TestCase(true)]
+	[TestCase(false)]
+	public async Task when_hash_exists_before_position_limit_returns_correct_entry(bool memTableOrPTable) {
+		var table = GetTable(memTableOrPTable);
+		var res = await table.TryGetLatestEntry(HNormal, 5, (x, token) => {
+			Assert.AreEqual(GetHash(HNormal), x.Stream);
+			return new(true);
+		}, CancellationToken.None);
+		Assert.True(res.HasValue);
+		Assert.AreEqual(4, res.GetValueOrDefault().Position);
+		Assert.AreEqual(GetHash(HNormal), res.GetValueOrDefault().Stream);
+		Assert.AreEqual(5, res.GetValueOrDefault().Version);
+
+		res = await table.TryGetLatestEntry(HTombstoned, 5, (x, token) => {
+			Assert.AreEqual(GetHash(HTombstoned), x.Stream);
+			return new(true);
+		}, CancellationToken.None);
+		Assert.True(res.HasValue);
+		Assert.AreEqual(3, res.GetValueOrDefault().Position);
+		Assert.AreEqual(GetHash(HTombstoned), res.GetValueOrDefault().Stream);
+		Assert.AreEqual(1, res.GetValueOrDefault().Version);
+
+		res = await table.TryGetLatestEntry(HDuplicate, 7, (x, token) => {
+			Assert.AreEqual(GetHash(HDuplicate), x.Stream);
+			return new(true);
+		}, CancellationToken.None);
+		Assert.True(res.HasValue);
+		Assert.AreEqual(6, res.GetValueOrDefault().Position);
+		Assert.AreEqual(GetHash(HDuplicate), res.GetValueOrDefault().Stream);
+		Assert.AreEqual(0, res.GetValueOrDefault().Version);
+	}
+
+	[TestCase(true)]
+	[TestCase(false)]
+	// at the moment, this TryGetLatestEntry overload is used only for scavenging purposes
+	// and we are only interested with finding the latest event number before a position limit,
+	// not the actual index entry
+	public async Task when_duplicate_returns_entry_with_highest_position(bool memTableOrPTable) {
+		var table = GetTable(memTableOrPTable);
+
+		var res = await table.TryGetLatestEntry(HDuplicate, 8, (x, token) => {
+			Assert.AreEqual(GetHash(HDuplicate), x.Stream);
+			return new(true);
+		}, CancellationToken.None);
+		Assert.True(res.HasValue);
+		Assert.AreEqual(7, res.GetValueOrDefault().Position);
+		Assert.AreEqual(GetHash(HDuplicate), res.GetValueOrDefault().Stream);
+		Assert.AreEqual(0, res.GetValueOrDefault().Version);
+	}
+
+	[TestCase(true)]
+	[TestCase(false)]
+	public async Task when_hash_collision_returns_correct_result(bool memTableOrPTable) {
+		var table = GetTable(memTableOrPTable);
+
+		var res = await table.TryGetLatestEntry(HNormal, 10,
+			(x, token) => {
+				Assert.AreEqual(GetHash(HNormal), x.Stream);
+				return new(x.Position % 2 is 1);
+			}, CancellationToken.None);
+		Assert.True(res.HasValue);
+		Assert.AreEqual(1, res.GetValueOrDefault().Position);
+		Assert.AreEqual(GetHash(HNormal), res.GetValueOrDefault().Stream);
+		Assert.AreEqual(1, res.GetValueOrDefault().Version);
+
+		Assert.Null(await table.TryGetLatestEntry(HNormal, 10, (x, token) => {
+			Assert.AreEqual(GetHash(HNormal), x.Stream);
+			return new(false);
+		}, CancellationToken.None));
+	}
+
+	[TestCase(true)]
+	[TestCase(false)]
+	// at the moment, this TryGetLatestEntry overload is used only for scavenging purposes.
+	// if an out of order event occurs in the log (due to a bug), the function may return
+	// an index entry with an event number less than the real last event number.
+	// however, the consequences are not so bad: it can only result in less events
+	// being scavenged. during index execution, detection of these out of order events
+	// in PTables is done and logged.
+	public async Task when_out_of_order_may_return_incorrect_entry_with_smaller_event_number(bool memTableOrPTable) {
+		var table = GetTable(memTableOrPTable);
+		var res = await table.TryGetLatestEntry(HOutOfOrder, 12, (x, token) => {
+			Assert.AreEqual(GetHash(HOutOfOrder), x.Stream);
+			return new(true);
+		}, CancellationToken.None);
+		Assert.True(res.HasValue);
+		Assert.AreEqual(GetHash(HOutOfOrder), res.GetValueOrDefault().Stream);
+
+		// correct last event number should be 2
+		Assert.AreEqual(0, res.GetValueOrDefault().Version);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/when_trying_to_get_next_entry.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/when_trying_to_get_next_entry.cs
new file mode 100644
index 00000000000..b493725cd8f
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/when_trying_to_get_next_entry.cs
@@ -0,0 +1,107 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class when_trying_to_get_next_entry : SpecificationWithFile {
+	private readonly byte _pTableVersion;
+	private readonly bool _skipIndexVerify;
+
+	private HashListMemTable _memTable;
+	private PTable _pTable;
+	private readonly long _deletedStreamEventNumber;
+
+	private const ulong H1 = 0x01UL << 32;
+	private const ulong H2 = 0x02UL << 32;
+	private const ulong H3 = 0x03UL << 32;
+
+	public when_trying_to_get_next_entry(byte version, bool skipIndexVerify) {
+		_pTableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+		_deletedStreamEventNumber = version < PTableVersions.IndexV3 ? int.MaxValue : long.MaxValue;
+	}
+
+	private ulong GetHash(ulong value) {
+		return _pTableVersion == PTableVersions.IndexV1 ? value >> 32 : value;
+	}
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+		_memTable = new HashListMemTable(_pTableVersion, maxSize: 10);
+		_memTable.Add(H1, 0, 0);
+		_memTable.Add(H1, 1, 1);
+		_memTable.Add(H1, 2, 2);
+		_memTable.Add(H2, 1, 3);
+		_memTable.Add(H1, 5, 4);
+		_memTable.Add(H2, _deletedStreamEventNumber, 5);
+		_memTable.Add(H3, 0, 6);
+		_memTable.Add(H3, 0, 7);
+		_memTable.Add(H3, 1, 8);
+		_memTable.Add(H3, 1, 9);
+		_pTable = PTable.FromMemtable(
+			table: _memTable,
+			filename: Filename,
+			initialReaders: Constants.PTableInitialReaderCount,
+			maxReaders: Constants.PTableMaxReaderCountDefault,
+			skipIndexVerify: _skipIndexVerify);
+	}
+
+	[TearDown]
+	public override void TearDown() {
+		_pTable?.Dispose();
+		base.TearDown();
+	}
+
+	private ISearchTable GetTable(bool memTableOrPTable) => memTableOrPTable ? (ISearchTable)_memTable : _pTable;
+
+	[TestCase(true)]
+	[TestCase(false)]
+	public void when_next_entry_doesnt_exist_returns_false(bool memTableOrPTable) {
+		var table = GetTable(memTableOrPTable);
+		Assert.False(table.TryGetNextEntry(H1, 5, out _));
+		Assert.False(table.TryGetNextEntry(H2, _deletedStreamEventNumber, out _));
+	}
+
+	[TestCase(true)]
+	[TestCase(false)]
+	public void when_next_entry_exists_returns_correct_entry(bool memTableOrPTable) {
+		var table = GetTable(memTableOrPTable);
+
+		Assert.True(table.TryGetNextEntry(H1, 0, out var entry));
+		Assert.AreEqual(GetHash(H1), entry.Stream);
+		Assert.AreEqual(1, entry.Version);
+
+		Assert.True(table.TryGetNextEntry(H1, 1, out entry));
+		Assert.AreEqual(GetHash(H1), entry.Stream);
+		Assert.AreEqual(2, entry.Version);
+
+		Assert.True(table.TryGetNextEntry(H1, 2, out entry));
+		Assert.AreEqual(GetHash(H1), entry.Stream);
+		Assert.AreEqual(5, entry.Version);
+
+		Assert.True(table.TryGetNextEntry(H2, 1, out entry));
+		Assert.AreEqual(GetHash(H2), entry.Stream);
+		Assert.AreEqual(_deletedStreamEventNumber, entry.Version);
+	}
+
+	[TestCase(true)]
+	[TestCase(false)]
+	public void when_duplicate_or_collision_returns_correct_next_entry(bool memTableOrPTable) {
+		var table = GetTable(memTableOrPTable);
+
+		Assert.True(table.TryGetNextEntry(H3, 0, out var entry));
+		Assert.AreEqual(GetHash(H3), entry.Stream);
+		Assert.AreEqual(1, entry.Version);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/when_trying_to_get_oldest_entry.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/when_trying_to_get_oldest_entry.cs
new file mode 100644
index 00000000000..7097570d6de
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/when_trying_to_get_oldest_entry.cs
@@ -0,0 +1,113 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false, 1_000_000)]
+[TestFixture(PTableVersions.IndexV2, true, 1_000_000)]
+[TestFixture(PTableVersions.IndexV3, false, 1_000_000)]
+[TestFixture(PTableVersions.IndexV3, true, 1_000_000)]
+[TestFixture(PTableVersions.IndexV4, false, 1_000_000)]
+[TestFixture(PTableVersions.IndexV4, true, 1_000_000)]
+[TestFixture(PTableVersions.IndexV4, false, 0)]
+[TestFixture(PTableVersions.IndexV4, true, 0)]
+public class when_trying_to_get_oldest_entry : SpecificationWithFile {
+	protected byte _ptableVersion = PTableVersions.IndexV1;
+
+	private readonly bool _skipIndexVerify;
+	private readonly bool _useBloomFilter;
+	private readonly int _lruCacheSize;
+
+	public when_trying_to_get_oldest_entry(byte version, bool skipIndexVerify, int lruCacheSize) {
+		_ptableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+		_useBloomFilter = skipIndexVerify; // bloomfilter orthogonal
+		_lruCacheSize = lruCacheSize;
+	}
+
+	private ulong GetHash(ulong value) {
+		return _ptableVersion == PTableVersions.IndexV1 ? value >> 32 : value;
+	}
+
+	private PTable ConstructPTable(HashListMemTable memTable) {
+		return PTable.FromMemtable(
+			memTable,
+			Filename,
+			Constants.PTableInitialReaderCount,
+			Constants.PTableMaxReaderCountDefault,
+			skipIndexVerify: _skipIndexVerify,
+			useBloomFilter: _useBloomFilter,
+			lruCacheSize: _lruCacheSize);
+	}
+
+	[Test]
+	public void nothing_is_found_on_empty_stream() {
+		var memTable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		memTable.Add(0x010100000000, 0x01, 0xffff);
+		using (var ptable = ConstructPTable(memTable)) {
+			IndexEntry entry;
+			Assert.IsFalse(ptable.TryGetOldestEntry(0x12, out entry));
+		}
+	}
+
+	[Test]
+	public void single_item_is_latest() {
+		var memTable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		memTable.Add(0x010100000000, 0x01, 0xffff);
+		using (var ptable = ConstructPTable(memTable)) {
+			IndexEntry entry;
+			Assert.IsTrue(ptable.TryGetOldestEntry(0x010100000000, out entry));
+			Assert.AreEqual(GetHash(0x010100000000), entry.Stream);
+			Assert.AreEqual(0x01, entry.Version);
+			Assert.AreEqual(0xffff, entry.Position);
+		}
+	}
+
+	[Test]
+	public void correct_entry_is_returned() {
+		var memTable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		memTable.Add(0x010100000000, 0x01, 0xffff);
+		memTable.Add(0x010100000000, 0x02, 0xfff2);
+		using (var ptable = ConstructPTable(memTable)) {
+			IndexEntry entry;
+			Assert.IsTrue(ptable.TryGetOldestEntry(0x010100000000, out entry));
+			Assert.AreEqual(GetHash(0x010100000000), entry.Stream);
+			Assert.AreEqual(0x01, entry.Version);
+			Assert.AreEqual(0xffff, entry.Position);
+		}
+	}
+
+	[Test]
+	public void when_duplicated_entries_exist_the_one_with_oldest_position_is_returned() {
+		var memTable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		memTable.Add(0x010100000000, 0x01, 0xfff1);
+		memTable.Add(0x010100000000, 0x02, 0xfff2);
+		memTable.Add(0x010100000000, 0x01, 0xfff3);
+		memTable.Add(0x010100000000, 0x02, 0xfff4);
+		using (var ptable = ConstructPTable(memTable)) {
+			IndexEntry entry;
+			Assert.IsTrue(ptable.TryGetOldestEntry(0x010100000000, out entry));
+			Assert.AreEqual(GetHash(0x010100000000), entry.Stream);
+			Assert.AreEqual(0x01, entry.Version);
+			Assert.AreEqual(0xfff1, entry.Position);
+		}
+	}
+
+	[Test]
+	public void only_entry_with_smallest_position_is_returned_when_triduplicated() {
+		var memTable = new HashListMemTable(_ptableVersion, maxSize: 10);
+		memTable.Add(0x010100000000, 0x01, 0xfff1);
+		memTable.Add(0x010100000000, 0x01, 0xfff3);
+		memTable.Add(0x010100000000, 0x01, 0xfff5);
+		using (var ptable = ConstructPTable(memTable)) {
+			IndexEntry entry;
+			Assert.IsTrue(ptable.TryGetOldestEntry(0x010100000000, out entry));
+			Assert.AreEqual(GetHash(0x010100000000), entry.Stream);
+			Assert.AreEqual(0x01, entry.Version);
+			Assert.AreEqual(0xfff1, entry.Position);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV1/when_trying_to_get_previous_entry.cs b/src/KurrentDB.Core.Tests/Index/IndexV1/when_trying_to_get_previous_entry.cs
new file mode 100644
index 00000000000..cf3cc84c7bb
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV1/when_trying_to_get_previous_entry.cs
@@ -0,0 +1,107 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV1;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class when_trying_to_get_previous_entry : SpecificationWithFile {
+	private readonly byte _pTableVersion;
+	private readonly bool _skipIndexVerify;
+
+	private HashListMemTable _memTable;
+	private PTable _pTable;
+	private readonly long _deletedStreamEventNumber;
+
+	private const ulong H1 = 0x01UL << 32;
+	private const ulong H2 = 0x02UL << 32;
+	private const ulong H3 = 0x03UL << 32;
+
+	public when_trying_to_get_previous_entry(byte version, bool skipIndexVerify) {
+		_pTableVersion = version;
+		_skipIndexVerify = skipIndexVerify;
+		_deletedStreamEventNumber = version < PTableVersions.IndexV3 ? int.MaxValue : long.MaxValue;
+	}
+
+	private ulong GetHash(ulong value) {
+		return _pTableVersion == PTableVersions.IndexV1 ? value >> 32 : value;
+	}
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+		_memTable = new HashListMemTable(_pTableVersion, maxSize: 10);
+		_memTable.Add(H1, 0, 0);
+		_memTable.Add(H1, 1, 1);
+		_memTable.Add(H1, 2, 2);
+		_memTable.Add(H2, 1, 3);
+		_memTable.Add(H1, 5, 4);
+		_memTable.Add(H2, _deletedStreamEventNumber, 5);
+		_memTable.Add(H3, 0, 6);
+		_memTable.Add(H3, 0, 7);
+		_memTable.Add(H3, 1, 8);
+		_memTable.Add(H3, 1, 9);
+		_pTable = PTable.FromMemtable(
+			table: _memTable,
+			filename: Filename,
+			initialReaders: Constants.PTableInitialReaderCount,
+			maxReaders: Constants.PTableMaxReaderCountDefault,
+			skipIndexVerify: _skipIndexVerify);
+	}
+
+	[TearDown]
+	public override void TearDown() {
+		_pTable?.Dispose();
+		base.TearDown();
+	}
+
+	private ISearchTable GetTable(bool memTableOrPTable) => memTableOrPTable ? (ISearchTable)_memTable : _pTable;
+
+	[TestCase(true)]
+	[TestCase(false)]
+	public void when_previous_entry_doesnt_exist_returns_false(bool memTableOrPTable) {
+		var table = GetTable(memTableOrPTable);
+		Assert.False(table.TryGetPreviousEntry(H1, 0, out _));
+		Assert.False(table.TryGetPreviousEntry(H2, 1, out _));
+	}
+
+	[TestCase(true)]
+	[TestCase(false)]
+	public void when_previous_entry_exists_returns_correct_entry(bool memTableOrPTable) {
+		var table = GetTable(memTableOrPTable);
+
+		Assert.True(table.TryGetPreviousEntry(H1, 1, out var entry));
+		Assert.AreEqual(GetHash(H1), entry.Stream);
+		Assert.AreEqual(0, entry.Version);
+
+		Assert.True(table.TryGetPreviousEntry(H1, 2, out entry));
+		Assert.AreEqual(GetHash(H1), entry.Stream);
+		Assert.AreEqual(1, entry.Version);
+
+		Assert.True(table.TryGetPreviousEntry(H1, 5, out entry));
+		Assert.AreEqual(GetHash(H1), entry.Stream);
+		Assert.AreEqual(2, entry.Version);
+
+		Assert.True(table.TryGetPreviousEntry(H2, _deletedStreamEventNumber, out entry));
+		Assert.AreEqual(GetHash(H2), entry.Stream);
+		Assert.AreEqual(1, entry.Version);
+	}
+
+	[TestCase(true)]
+	[TestCase(false)]
+	public void when_duplicate_or_collision_returns_correct_previous_entry(bool memTableOrPTable) {
+		var table = GetTable(memTableOrPTable);
+
+		Assert.True(table.TryGetPreviousEntry(H3, 1, out var entry));
+		Assert.AreEqual(GetHash(H3), entry.Stream);
+		Assert.AreEqual(0, entry.Version);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV2/opening_a_ptable_with_more_than_32bits_of_records.cs b/src/KurrentDB.Core.Tests/Index/IndexV2/opening_a_ptable_with_more_than_32bits_of_records.cs
new file mode 100644
index 00000000000..c0f9d8e7f6e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV2/opening_a_ptable_with_more_than_32bits_of_records.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV2;
+
+[TestFixture(PTable.IndexEntryV2Size), Explicit]
+public class
+	opening_a_ptable_with_more_than_32bits_of_records : IndexV1.opening_a_ptable_with_more_than_32bits_of_records {
+	public opening_a_ptable_with_more_than_32bits_of_records(int indexEntrySize) : base(indexEntrySize) {
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV3/opening_a_ptable_with_more_than_32bits_of_records.cs b/src/KurrentDB.Core.Tests/Index/IndexV3/opening_a_ptable_with_more_than_32bits_of_records.cs
new file mode 100644
index 00000000000..41d4dcd8fd2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV3/opening_a_ptable_with_more_than_32bits_of_records.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV3;
+
+[TestFixture(PTable.IndexEntryV3Size), Explicit]
+public class
+	opening_a_ptable_with_more_than_32bits_of_records : IndexV1.opening_a_ptable_with_more_than_32bits_of_records {
+	public opening_a_ptable_with_more_than_32bits_of_records(int indexEntrySize) : base(indexEntrySize) {
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV3/when_upgrading_index_to_64bit_stream_version.cs b/src/KurrentDB.Core.Tests/Index/IndexV3/when_upgrading_index_to_64bit_stream_version.cs
new file mode 100644
index 00000000000..0f1221551c2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV3/when_upgrading_index_to_64bit_stream_version.cs
@@ -0,0 +1,154 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV3;
+
+[TestFixture, Category("LongRunning")]
+public class when_upgrading_index_to_64bit_stream_version : SpecificationWithDirectoryPerTestFixture {
+	private TableIndex<string> _tableIndex;
+	private IHasher<string> _lowHasher;
+	private IHasher<string> _highHasher;
+	private string _indexDir;
+	protected byte _ptableVersion;
+
+	public when_upgrading_index_to_64bit_stream_version() {
+		_ptableVersion = PTableVersions.IndexV3;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_indexDir = PathName;
+		var fakeReader = new TFReaderLease(new FakeIndexReader());
+		_lowHasher = new XXHashUnsafe();
+		_highHasher = new Murmur3AUnsafe();
+		_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
+			() => new HashListMemTable(PTableVersions.IndexV2, maxSize: 5),
+			() => fakeReader,
+			PTableVersions.IndexV2,
+			5, Constants.PTableMaxReaderCountDefault,
+			maxSizeForMemory: 5,
+			maxTablesPerLevel: 2);
+		_tableIndex.Initialize(long.MaxValue);
+
+		_tableIndex.Add(1, "testStream-1", 0, 1);
+		_tableIndex.Add(1, "testStream-2", 0, 2);
+		_tableIndex.Add(1, "testStream-1", 1, 3);
+		_tableIndex.Add(1, "testStream-2", 1, 4);
+		_tableIndex.Add(1, "testStream-1", 2, 5);
+
+		_tableIndex.Close(false);
+
+		_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
+			() => new HashListMemTable(_ptableVersion, maxSize: 5),
+			() => fakeReader,
+			_ptableVersion,
+			5, Constants.PTableMaxReaderCountDefault,
+			maxSizeForMemory: 5,
+			maxTablesPerLevel: 2);
+		_tableIndex.Initialize(long.MaxValue);
+
+		_tableIndex.Add(1, "testStream-2", 2, 6);
+		_tableIndex.Add(1, "testStream-1", 3, 7);
+		_tableIndex.Add(1, "testStream-2", 3, 8);
+		_tableIndex.Add(1, "testStream-1", 4, 9);
+		_tableIndex.Add(1, "testStream-2", 4, 10);
+
+		await Task.Delay(500);
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_tableIndex.Close();
+
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void should_have_entries_in_sorted_order() {
+		var streamId = "testStream-2";
+		var result = _tableIndex.GetRange(streamId, 0, 4).ToArray();
+		var hash = (ulong)_lowHasher.Hash(streamId) << 32 | _highHasher.Hash(streamId);
+
+		Assert.That(result.Count(), Is.EqualTo(5));
+
+		Assert.That(result[0].Stream, Is.EqualTo(hash));
+		Assert.That(result[0].Version, Is.EqualTo(4));
+		Assert.That(result[0].Position, Is.EqualTo(10));
+
+		Assert.That(result[1].Stream, Is.EqualTo(hash));
+		Assert.That(result[1].Version, Is.EqualTo(3));
+		Assert.That(result[1].Position, Is.EqualTo(8));
+
+		Assert.That(result[2].Stream, Is.EqualTo(hash));
+		Assert.That(result[2].Version, Is.EqualTo(2));
+		Assert.That(result[2].Position, Is.EqualTo(6));
+
+		Assert.That(result[3].Stream, Is.EqualTo(hash));
+		Assert.That(result[3].Version, Is.EqualTo(1));
+		Assert.That(result[3].Position, Is.EqualTo(4));
+
+		Assert.That(result[4].Stream, Is.EqualTo(hash));
+		Assert.That(result[4].Version, Is.EqualTo(0));
+		Assert.That(result[4].Position, Is.EqualTo(2));
+
+		streamId = "testStream-1";
+		result = _tableIndex.GetRange(streamId, 0, 4).ToArray();
+		hash = (ulong)_lowHasher.Hash(streamId) << 32 | _highHasher.Hash(streamId);
+
+		Assert.That(result.Count(), Is.EqualTo(5));
+
+		Assert.That(result[0].Stream, Is.EqualTo(hash));
+		Assert.That(result[0].Version, Is.EqualTo(4));
+		Assert.That(result[0].Position, Is.EqualTo(9));
+
+		Assert.That(result[1].Stream, Is.EqualTo(hash));
+		Assert.That(result[1].Version, Is.EqualTo(3));
+		Assert.That(result[1].Position, Is.EqualTo(7));
+
+		Assert.That(result[2].Stream, Is.EqualTo(hash));
+		Assert.That(result[2].Version, Is.EqualTo(2));
+		Assert.That(result[2].Position, Is.EqualTo(5));
+
+		Assert.That(result[3].Stream, Is.EqualTo(hash));
+		Assert.That(result[3].Version, Is.EqualTo(1));
+		Assert.That(result[3].Position, Is.EqualTo(3));
+
+		Assert.That(result[4].Stream, Is.EqualTo(hash));
+		Assert.That(result[4].Version, Is.EqualTo(0));
+		Assert.That(result[4].Position, Is.EqualTo(1));
+	}
+}
+
+public class FakeIndexReader : ITransactionFileReader {
+	public void Reposition(long position) {
+		throw new NotImplementedException();
+	}
+
+	public ValueTask<SeqReadResult> TryReadNext(CancellationToken token)
+		=> ValueTask.FromException<SeqReadResult>(new NotImplementedException());
+
+	public ValueTask<SeqReadResult> TryReadPrev(CancellationToken token)
+		=> ValueTask.FromException<SeqReadResult>(new NotImplementedException());
+
+	public ValueTask<RecordReadResult> TryReadAt(long position, bool couldBeScavenged, CancellationToken token) {
+		var record = (LogRecord)new PrepareLogRecord(position, Guid.NewGuid(), Guid.NewGuid(), 0, 0,
+			position % 2 == 0 ? "testStream-2" : "testStream-1", null, -1, DateTime.UtcNow, PrepareFlags.None, "type",
+			null, new byte[0], null);
+		return new(new RecordReadResult(true, position + 1, record, 1));
+	}
+
+	public ValueTask<bool> ExistsAt(long position, CancellationToken token)
+		=> token.IsCancellationRequested ? ValueTask.FromCanceled<bool>(token) : ValueTask.FromResult(true);
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV4/Utils.cs b/src/KurrentDB.Core.Tests/Index/IndexV4/Utils.cs
new file mode 100644
index 00000000000..a629931fd8b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV4/Utils.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Numerics;
+
+namespace KurrentDB.Core.Tests.Index.IndexV4;
+
+public static class Utils {
+	public static bool IsMidpointIndex(long index, long numIndexEntries, int numMidpoints) {
+		//special cases
+		if (numIndexEntries < 1)
+			return false;
+		if (numIndexEntries == 1) {
+			if (numMidpoints == 2 && index == 0)
+				return true;
+			return false;
+		}
+
+		//a midpoint index entry satisfies:
+		//index = floor (k * (numIndexEntries - 1) / (numMidpoints - 1));    for k = 0 to numMidpoints-1
+		//we need to find if there exists an integer x, such that:
+		//index*(numMidpoints-1)/(numIndexEntries-1) <= x < (index+1)*(numMidpoints-1)/(numIndexEntries-1)
+		var lower = (BigInteger)index * (numMidpoints - 1) / (numIndexEntries - 1);
+		if (((BigInteger)index * (numMidpoints - 1)) % (numIndexEntries - 1) != 0)
+			lower++;
+		var upper = (BigInteger)(index + 1) * (numMidpoints - 1) / (numIndexEntries - 1);
+		if (((BigInteger)(index + 1) * (numMidpoints - 1)) % (numIndexEntries - 1) == 0)
+			upper--;
+		return lower <= upper;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV4/opening_a_ptable_with_more_than_32bits_of_records.cs b/src/KurrentDB.Core.Tests/Index/IndexV4/opening_a_ptable_with_more_than_32bits_of_records.cs
new file mode 100644
index 00000000000..075034a12e1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV4/opening_a_ptable_with_more_than_32bits_of_records.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV4;
+
+[TestFixture(PTable.IndexEntryV4Size), Explicit]
+public class
+	opening_a_ptable_with_more_than_32bits_of_records : IndexV1.opening_a_ptable_with_more_than_32bits_of_records {
+	public opening_a_ptable_with_more_than_32bits_of_records(int indexEntrySize) : base(indexEntrySize) {
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV4/ptable_midpoint_calculations_should.cs b/src/KurrentDB.Core.Tests/Index/IndexV4/ptable_midpoint_calculations_should.cs
new file mode 100644
index 00000000000..80ff919bc3e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV4/ptable_midpoint_calculations_should.cs
@@ -0,0 +1,103 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Numerics;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Tests.Index.IndexV4;
+
+public class ptable_midpoint_calculations_should : SpecificationWithDirectory {
+	protected byte _ptableVersion = PTableVersions.IndexV4;
+	private static readonly ILogger Log = Serilog.Log.ForContext<ptable_midpoint_calculations_should>();
+
+	private void construct_same_midpoint_indexes_for_any_combination_of_params(int maxIndexEntries) {
+		for (var numIndexEntries = 0; numIndexEntries < maxIndexEntries; numIndexEntries++) {
+			for (var depth = 0; depth < 20; depth++) {
+				var requiredMidpointsCount =
+					PTable.GetRequiredMidpointCountCached(numIndexEntries, _ptableVersion, depth);
+				List<long> requiredMidpoints = new List<long>();
+				for (var k = 0; k < requiredMidpointsCount; k++) {
+					var index = PTable.GetMidpointIndex(k, numIndexEntries, requiredMidpointsCount);
+					requiredMidpoints.Add(index);
+				}
+
+				List<long> calculatedMidpoints = new List<long>();
+				for (var k = 0; k < numIndexEntries; k++) {
+					if (Utils.IsMidpointIndex(k, numIndexEntries, requiredMidpointsCount)) {
+						calculatedMidpoints.Add(k);
+					}
+				}
+
+				if (numIndexEntries == 1 && calculatedMidpoints.Count == 1) {
+					calculatedMidpoints.Add(calculatedMidpoints[0]);
+				}
+
+				if (requiredMidpoints.Count != calculatedMidpoints.Count) {
+					Log.Error(
+						"Midpoint count mismatch for numIndexEntries: {0}, depth:{1} - Expected {2}, Found {3}",
+						numIndexEntries, depth, requiredMidpoints.Count, calculatedMidpoints.Count);
+				}
+
+				Assert.AreEqual(requiredMidpoints.Count, calculatedMidpoints.Count);
+
+				for (var i = 0; i < requiredMidpoints.Count; i++) {
+					if (requiredMidpoints[i] != calculatedMidpoints[i]) {
+						Log.Error(
+							"Midpoint mismatch at index {0} for numIndexEntries: {1}, depth:{2} - Expected {3}, Found {4}",
+							i, numIndexEntries, depth, requiredMidpoints[i], calculatedMidpoints[i]);
+					}
+
+					Assert.AreEqual(requiredMidpoints[i], calculatedMidpoints[i]);
+				}
+			}
+		}
+	}
+
+	[Test, Category("LongRunning"), Ignore("Long running")]
+	public void construct_same_midpoint_indexes_for_any_combination_of_params_large() {
+		construct_same_midpoint_indexes_for_any_combination_of_params(4096);
+	}
+
+	[Test]
+	public void construct_same_midpoint_indexes_for_any_combination_of_params_small() {
+		construct_same_midpoint_indexes_for_any_combination_of_params(200);
+	}
+
+	[Test]
+	public void return_a_positive_index_even_for_really_big_ptables() {
+		var depth = 28;
+		var index = PTable.GetMidpointIndex(
+			k: 265_000_000,
+			numIndexEntries: 46_000_000_000,
+			numMidpoints: 1 << depth);
+
+		Assert.Positive(index);
+	}
+
+	[Test]
+	public void return_correct_indexes_for_really_big_ptables() {
+		var numIndexEntries = 46_000_000_000;
+		var numMidpoints = 1 << 28;
+
+		for (var k = numMidpoints - 1000; k < numMidpoints; k++) {
+			var index = PTable.GetMidpointIndex(k, numIndexEntries, numMidpoints);
+			var correctIndex = GetMidpointIndexBigInt(k, numIndexEntries, numMidpoints);
+			Assert.Positive(correctIndex);
+			Assert.AreEqual(correctIndex, index);
+		}
+	}
+
+	private static long GetMidpointIndexBigInt(int k, long numIndexEntries, int numMidpoints) {
+		if (k == 0)
+			return 0;
+
+		if (k == numMidpoints - 1)
+			return numIndexEntries - 1;
+
+		var res = (BigInteger)k * (numIndexEntries - 1) / (numMidpoints - 1);
+		return (long)res;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV4/when_merging_ptables_vx_to_v4.cs b/src/KurrentDB.Core.Tests/Index/IndexV4/when_merging_ptables_vx_to_v4.cs
new file mode 100644
index 00000000000..6aedc250068
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV4/when_merging_ptables_vx_to_v4.cs
@@ -0,0 +1,249 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV4;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class when_merging_ptables_vx_to_v4 : SpecificationWithDirectoryPerTestFixture {
+	private readonly List<string> _files = new List<string>();
+	private readonly List<PTable> _tables = new List<PTable>();
+
+	private PTable _newtable;
+	private string _newtableFile;
+	private byte _fromVersion;
+	private bool _skipIndexVerify;
+
+	public when_merging_ptables_vx_to_v4(byte fromVersion, bool skipIndexVerify) {
+		_fromVersion = fromVersion;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_files.Add(GetTempFilePath());
+		var table = new HashListMemTable(_fromVersion, maxSize: 20);
+		if (_fromVersion == PTableVersions.IndexV1) {
+			table.Add(0x010100000000, 0, 0x0101);
+			table.Add(0x010200000000, 0, 0x0102);
+			table.Add(0x010300000000, 0, 0x0103);
+			table.Add(0x010400000000, 0, 0x0104);
+		} else {
+			table.Add(0x0101, 0, 0x0101);
+			table.Add(0x0102, 0, 0x0102);
+			table.Add(0x0103, 0, 0x0103);
+			table.Add(0x0104, 0, 0x0104);
+		}
+
+		_tables.Add(PTable.FromMemtable(table, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify));
+		table = new HashListMemTable(_fromVersion, maxSize: 20);
+
+		if (_fromVersion == PTableVersions.IndexV1) {
+			table.Add(0x010500000000, 0, 0x0105);
+			table.Add(0x010600000000, 0, 0x0106);
+			table.Add(0x010700000000, 0, 0x0107);
+			table.Add(0x010800000000, 0, 0x0108);
+		} else {
+			table.Add(0x0105, 0, 0x0105);
+			table.Add(0x0106, 0, 0x0106);
+			table.Add(0x0107, 0, 0x0107);
+			table.Add(0x0108, 0, 0x0108);
+		}
+
+		_tables.Add(PTable.FromMemtable(table, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify));
+		_newtableFile = GetTempFilePath();
+		_newtable = PTable.MergeTo(_tables, _newtableFile,
+			PTableVersions.IndexV4, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault,
+			skipIndexVerify: _skipIndexVerify);
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_newtable.Dispose();
+		foreach (var ssTable in _tables) {
+			ssTable.Dispose();
+		}
+
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void merged_ptable_is_64bit() {
+		Assert.AreEqual(PTableVersions.IndexV4, _newtable.Version);
+	}
+
+	[Test]
+	public void there_are_8_records_in_the_merged_index() {
+		Assert.AreEqual(8, _newtable.Count);
+	}
+
+	[Test]
+	public void midpoints_are_cached_in_ptable_footer() {
+		var numIndexEntries = 8;
+		var requiredMidpoints = PTable.GetRequiredMidpointCountCached(numIndexEntries, PTableVersions.IndexV4);
+
+		var newTableFileCopy = GetTempFilePath();
+		File.Copy(_newtableFile, newTableFileCopy);
+		using (var filestream = File.Open(newTableFileCopy, FileMode.Open, FileAccess.Read)) {
+			var footerSize = PTableFooter.GetSize(PTableVersions.IndexV4);
+			Assert.AreEqual(filestream.Length,
+				PTableHeader.Size + numIndexEntries * PTable.IndexEntryV4Size +
+				requiredMidpoints * PTable.IndexEntryV4Size + footerSize + PTable.MD5Size);
+			filestream.Seek(
+				PTableHeader.Size + numIndexEntries * PTable.IndexEntryV4Size +
+				requiredMidpoints * PTable.IndexEntryV4Size, SeekOrigin.Begin);
+
+			var ptableFooter = PTableFooter.FromStream(filestream);
+			Assert.AreEqual(FileType.PTableFile, ptableFooter.FileType);
+			Assert.AreEqual(PTableVersions.IndexV4, ptableFooter.Version);
+			Assert.AreEqual(requiredMidpoints, ptableFooter.NumMidpointsCached);
+		}
+	}
+
+	[Test]
+	public void correct_number_of_midpoints_are_loaded() {
+		Assert.AreEqual(_newtable.GetMidPoints().Length,
+			PTable.GetRequiredMidpointCountCached(8, PTableVersions.IndexV4));
+	}
+
+	[Test]
+	public void all_the_entries_have_upgraded_hashes() {
+		if (_fromVersion == PTableVersions.IndexV1) {
+			foreach (var item in _newtable.IterateAllInOrder()) {
+				Assert.IsTrue((ulong)item.Position == item.Stream - 1,
+					"Expected the Stream (Hash) {0} to be equal to {1}", item.Stream - 1, item.Position);
+			}
+		}
+	}
+
+	[Test]
+	public void none_of_the_entries_have_upgraded_hashes() {
+		if (_fromVersion > PTableVersions.IndexV1) {
+			foreach (var item in _newtable.IterateAllInOrder()) {
+				Assert.IsTrue((ulong)item.Position == item.Stream,
+					"Expected the Stream (Hash) {0} to be equal to {1}", item.Stream, item.Position);
+			}
+		}
+	}
+}
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class when_merging_to_ptable_v4_with_deleted_entries : SpecificationWithDirectoryPerTestFixture {
+	private readonly List<string> _files = new List<string>();
+	private readonly List<PTable> _tables = new List<PTable>();
+	private string _newtableFile;
+
+	private PTable _newtable;
+	private byte _fromVersion;
+	private bool _skipIndexVerify;
+
+	public when_merging_to_ptable_v4_with_deleted_entries(byte fromVersion, bool skipIndexVerify) {
+		_fromVersion = fromVersion;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_files.Add(GetTempFilePath());
+		var table = new HashListMemTable(_fromVersion, maxSize: 20);
+		table.Add(0x010100000000, 0, 1);
+		table.Add(0x010200000000, 0, 2);
+		table.Add(0x010300000000, 0, 3);
+		table.Add(0x010300000000, 1, 4);
+		_tables.Add(PTable.FromMemtable(table, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify));
+		table = new HashListMemTable(_fromVersion, maxSize: 20);
+		table.Add(0x010100000000, 2, 5);
+		table.Add(0x010200000000, 1, 6);
+		table.Add(0x010200000000, 2, 7);
+		table.Add(0x010400000000, 0, 8);
+		table.Add(0x010400000000, 1, 9);
+		_tables.Add(PTable.FromMemtable(table, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify));
+		table = new HashListMemTable(_fromVersion, maxSize: 20);
+		table.Add(0x010100000000, 1, 10);
+		table.Add(0x010100000000, 2, 11);
+		table.Add(0x010500000000, 1, 12);
+		table.Add(0x010500000000, 2, 13);
+		table.Add(0x010500000000, 3, 14);
+		_tables.Add(PTable.FromMemtable(table, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify));
+		_newtableFile = GetTempFilePath();
+		_newtable = PTable.MergeTo(_tables, _newtableFile,
+			PTableVersions.IndexV4, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, skipIndexVerify: _skipIndexVerify);
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_newtable.Dispose();
+		foreach (var ssTable in _tables) {
+			ssTable.Dispose();
+		}
+
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void merged_ptable_is_64bit() {
+		Assert.AreEqual(PTableVersions.IndexV4, _newtable.Version);
+	}
+
+	[Test]
+	public void there_are_14_records_in_the_merged_index() {
+		Assert.AreEqual(14, _newtable.Count);
+	}
+
+	[Test]
+	public void midpoints_are_cached_in_ptable_footer() {
+		var numIndexEntries = 14;
+		var requiredMidpoints = PTable.GetRequiredMidpointCountCached(numIndexEntries, PTableVersions.IndexV4);
+
+		var newTableFileCopy = GetTempFilePath();
+		File.Copy(_newtableFile, newTableFileCopy);
+		using (var filestream = File.Open(newTableFileCopy, FileMode.Open, FileAccess.Read)) {
+			var footerSize = PTableFooter.GetSize(PTableVersions.IndexV4);
+			Assert.AreEqual(filestream.Length,
+				PTableHeader.Size + numIndexEntries * PTable.IndexEntryV4Size +
+				requiredMidpoints * PTable.IndexEntryV4Size + footerSize + PTable.MD5Size);
+			filestream.Seek(
+				PTableHeader.Size + numIndexEntries * PTable.IndexEntryV4Size +
+				requiredMidpoints * PTable.IndexEntryV4Size, SeekOrigin.Begin);
+
+			var ptableFooter = PTableFooter.FromStream(filestream);
+			Assert.AreEqual(FileType.PTableFile, ptableFooter.FileType);
+			Assert.AreEqual(PTableVersions.IndexV4, ptableFooter.Version);
+			Assert.AreEqual(requiredMidpoints, ptableFooter.NumMidpointsCached);
+		}
+	}
+
+	[Test]
+	public void correct_number_of_midpoints_are_loaded() {
+		Assert.AreEqual(_newtable.GetMidPoints().Length,
+			PTable.GetRequiredMidpointCountCached(14, PTableVersions.IndexV4));
+	}
+
+	[Test]
+	public void the_items_are_sorted() {
+		var last = new IndexEntry(ulong.MaxValue, 0, long.MaxValue);
+		foreach (var item in _newtable.IterateAllInOrder()) {
+			Assert.IsTrue((last.Stream == item.Stream ? last.Version > item.Version : last.Stream > item.Stream) ||
+						  ((last.Stream == item.Stream && last.Version == item.Version) &&
+						   last.Position > item.Position));
+			last = item;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexV4/when_merging_ptables_with_entries_to_nonexisting_record.cs b/src/KurrentDB.Core.Tests/Index/IndexV4/when_merging_ptables_with_entries_to_nonexisting_record.cs
new file mode 100644
index 00000000000..613075e5287
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexV4/when_merging_ptables_with_entries_to_nonexisting_record.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Tests.Index.IndexV1;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexV4;
+
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class
+	when_merging_ptables_with_entries_to_nonexisting_record : when_merging_ptables_with_entries_to_nonexisting_record_in_newer_index_versions {
+	public when_merging_ptables_with_entries_to_nonexisting_record(byte version, bool skipIndexVerify) : base(
+		version, skipIndexVerify) {
+	}
+
+	[Test]
+	public void the_correct_midpoints_are_cached() {
+		var midpoints = _newtable.GetMidPoints();
+		var requiredMidpoints = PTable.GetRequiredMidpointCountCached(_newtable.Count, _ptableVersion);
+
+		Assert.AreEqual(requiredMidpoints, midpoints.Length);
+
+		var position = 0;
+		foreach (var item in _newtable.IterateAllInOrder()) {
+			if (Utils.IsMidpointIndex(position, _newtable.Count, requiredMidpoints)) {
+				Assert.AreEqual(item.Stream, midpoints[position].Key.Stream);
+				Assert.AreEqual(item.Version, midpoints[position].Key.Version);
+				Assert.AreEqual(position, midpoints[position].ItemIndex);
+				position++;
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexVAny/create_index_map_from_non_existing_file.cs b/src/KurrentDB.Core.Tests/Index/IndexVAny/create_index_map_from_non_existing_file.cs
new file mode 100644
index 00000000000..59ca1d916e1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexVAny/create_index_map_from_non_existing_file.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexVAny;
+
+[TestFixture]
+public class create_index_map_from_non_existing_file {
+	private IndexMap _map;
+
+	[SetUp]
+	public void Setup() {
+		_map = IndexMapTestFactory.FromFile("thisfiledoesnotexist");
+	}
+
+	[Test]
+	public void the_map_is_empty() {
+		Assert.AreEqual(0, _map.InOrder().Count());
+	}
+
+	[Test]
+	public void no_file_names_are_used() {
+		Assert.AreEqual(0, _map.GetAllFilenames().Count());
+	}
+
+	[Test]
+	public void prepare_checkpoint_is_equal_to_minus_one() {
+		Assert.AreEqual(-1, _map.PrepareCheckpoint);
+	}
+
+	[Test]
+	public void commit_checkpoint_is_equal_to_minus_one() {
+		Assert.AreEqual(-1, _map.CommitCheckpoint);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexVAny/midpoint_assertions.cs b/src/KurrentDB.Core.Tests/Index/IndexVAny/midpoint_assertions.cs
new file mode 100644
index 00000000000..01afcb21a3c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexVAny/midpoint_assertions.cs
@@ -0,0 +1,90 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexVAny;
+
+
+[TestFixture]
+public class midpoint_assertions {
+	private const long MAX_INDEX_ENTRIES = 1000000000000L;
+	private const int MAX_TEST_DEPTH = 35;
+	private const int MAX_DEPTH = 28;
+	private static readonly byte[] IndexVersions = { PTableVersions.IndexV1, PTableVersions.IndexV2, PTableVersions.IndexV3, PTableVersions.IndexV4 };
+
+	private static int getIncrement(long numIndexEntries) {
+		if (numIndexEntries < 100)
+			return 1;
+		if (numIndexEntries < 1000000)
+			return 1337;
+		return 133333337;
+	}
+
+	public class TestCases : IEnumerable {
+		public IEnumerator GetEnumerator() {
+			foreach (var version in IndexVersions) {
+				for (int minDepth = 0; minDepth <= MAX_TEST_DEPTH; minDepth++) {
+					yield return new object[] { version, minDepth };
+				}
+			}
+		}
+	}
+
+	[Test, TestCaseSource(typeof(TestCases))]
+	public void file_size_should_be_greater_or_equal_after_adding_midpoints(byte version, int minDepth) {
+		for (long numIndexEntries = 0; numIndexEntries < MAX_INDEX_ENTRIES; numIndexEntries += getIncrement(numIndexEntries)) {
+			string testCase = $"numIndexEntries: {numIndexEntries}, minDepth: {minDepth}, version: {version}";
+			var midpointCount = PTable.GetRequiredMidpointCountCached(numIndexEntries, version, minDepth);
+			if (version < PTableVersions.IndexV4) {
+				Assert.AreEqual(0, midpointCount, testCase);
+			} else {
+				Assert.GreaterOrEqual(midpointCount, Math.Min(1 << Math.Min(MAX_DEPTH, minDepth), numIndexEntries), testCase);
+				Assert.LessOrEqual(midpointCount, Math.Max(2, numIndexEntries), testCase);
+			}
+
+			long fileSizeUpToIndexEntries = PTable.GetFileSizeUpToIndexEntries(numIndexEntries, version);
+			long fileSizeUpToMidpointEntries =
+				PTable.GetFileSizeUpToMidpointEntries(fileSizeUpToIndexEntries, midpointCount, version);
+
+			if (version < PTableVersions.IndexV4) {
+				Assert.AreEqual(fileSizeUpToIndexEntries, fileSizeUpToMidpointEntries, testCase);
+			} else {
+				Assert.GreaterOrEqual(fileSizeUpToMidpointEntries, fileSizeUpToIndexEntries, testCase);
+			}
+		}
+	}
+
+	[Test]
+	public void for_a_fixed_min_depth_and_increasing_index_entries_midpoint_count_should_increase_monotonically() {
+		for (int minDepth = 0; minDepth <= MAX_TEST_DEPTH; minDepth++) {
+			long prevMidpointCount = 0L;
+			for (long numIndexEntries = 0; numIndexEntries < MAX_INDEX_ENTRIES; numIndexEntries += getIncrement(numIndexEntries)) {
+				string testCase = $"numIndexEntries: {numIndexEntries}, minDepth: {minDepth}";
+				var midpointCount = PTable.GetRequiredMidpointCountCached(numIndexEntries, PTableVersions.IndexV4, minDepth);
+				Assert.GreaterOrEqual(midpointCount, prevMidpointCount, testCase);
+				Assert.GreaterOrEqual(midpointCount, Math.Min(1 << Math.Min(MAX_DEPTH, minDepth), numIndexEntries), testCase);
+				Assert.LessOrEqual(midpointCount, Math.Max(2, numIndexEntries), testCase);
+				prevMidpointCount = midpointCount;
+			}
+		}
+	}
+
+	[Test]
+	public void for_a_fixed_number_of_index_entries_and_increasing_min_depth_midpoint_count_should_increase_monotonically() {
+		for (long numIndexEntries = 0; numIndexEntries < MAX_INDEX_ENTRIES; numIndexEntries += getIncrement(numIndexEntries)) {
+			long prevMidpointCount = 0L;
+			for (int minDepth = 0; minDepth <= MAX_TEST_DEPTH; minDepth++) {
+				string testCase = $"numIndexEntries: {numIndexEntries}, minDepth: {minDepth}";
+				var midpointCount = PTable.GetRequiredMidpointCountCached(numIndexEntries, PTableVersions.IndexV4, minDepth);
+				Assert.GreaterOrEqual(midpointCount, prevMidpointCount, testCase);
+				Assert.GreaterOrEqual(midpointCount, Math.Min(1 << Math.Min(MAX_DEPTH, minDepth), numIndexEntries), testCase);
+				Assert.LessOrEqual(midpointCount, Math.Max(2, numIndexEntries), testCase);
+				prevMidpointCount = midpointCount;
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexVAny/saving_empty_index_to_a_file.cs b/src/KurrentDB.Core.Tests/Index/IndexVAny/saving_empty_index_to_a_file.cs
new file mode 100644
index 00000000000..41a056a7c65
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexVAny/saving_empty_index_to_a_file.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Util;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexVAny;
+
+[TestFixture]
+public class saving_empty_index_to_a_file : SpecificationWithDirectoryPerTestFixture {
+	private string _filename;
+	private IndexMap _map;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_filename = GetFilePathFor("indexfile");
+		_map = IndexMapTestFactory.FromFile(_filename);
+		_map.SaveToFile(_filename);
+	}
+
+	[Test]
+	public void the_file_exists() {
+		Assert.IsTrue(File.Exists(_filename));
+	}
+
+	[Test]
+	public void the_file_contains_correct_data() {
+		using (var fs = File.OpenRead(_filename))
+		using (var reader = new StreamReader(fs)) {
+			var text = reader.ReadToEnd();
+			var lines = text.Replace("\r", "").Split('\n');
+
+			fs.Position = 32;
+			var md5 = MD5Hash.GetHashFor(fs);
+			var md5String = BitConverter.ToString(md5).Replace("-", "");
+
+			Assert.AreEqual(5, lines.Count());
+			Assert.AreEqual(md5String, lines[0]);
+			Assert.AreEqual(IndexMap.IndexMapVersion.ToString(), lines[1]);
+			Assert.AreEqual("-1/-1", lines[2]);
+			Assert.AreEqual($"{int.MaxValue}", lines[3]);
+			Assert.AreEqual("", lines[4]);
+		}
+	}
+
+	[Test]
+	public void saved_file_could_be_read_correctly_and_without_errors() {
+		var map = IndexMapTestFactory.FromFile(_filename);
+
+		Assert.AreEqual(-1, map.PrepareCheckpoint);
+		Assert.AreEqual(-1, map.CommitCheckpoint);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexVAny/when_opening_ptable_without_right_flag_in_header.cs b/src/KurrentDB.Core.Tests/Index/IndexVAny/when_opening_ptable_without_right_flag_in_header.cs
new file mode 100644
index 00000000000..2a7df6cee5f
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexVAny/when_opening_ptable_without_right_flag_in_header.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Threading.Tasks;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexVAny;
+
+[TestFixture]
+public class when_opening_ptable_without_right_flag_in_header : SpecificationWithFile {
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+		using (var stream = File.OpenWrite(Filename)) {
+			var bytes = new byte[128];
+			bytes[0] = 0x27;
+			stream.Write(bytes, 0, bytes.Length);
+		}
+	}
+
+	[Test]
+	public void the_invalid_file_exception_is_thrown() {
+		var exc = Assert.Throws<CorruptIndexException>(() => PTable.FromFile(Filename, Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault, 16, false));
+		Assert.IsInstanceOf<InvalidFileException>(exc.InnerException);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/IndexVAny/when_opening_v1_indexmap.cs b/src/KurrentDB.Core.Tests/Index/IndexVAny/when_opening_v1_indexmap.cs
new file mode 100644
index 00000000000..8aec2f590b1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/IndexVAny/when_opening_v1_indexmap.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Util;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.IndexVAny;
+
+[TestFixture]
+public class when_opening_v1_indexmap : SpecificationWithDirectoryPerTestFixture {
+	private const string
+		V1FileContents =
+			"6954492497DD64BF751FC6CFA0C9CEE2\r\n1\r\n-1/-1\r\n"; //this doesn't matter because the hash will be calculated from the bytes
+
+	//The hash value will change depending on whether the file was written on windows or some other platform
+	private string V2FileContents = Environment.NewLine + "2" + Environment.NewLine + "-1/-1" +
+									Environment.NewLine + "4" + Environment.NewLine;
+
+	private string _filename;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		var ms = new MemoryStream(Encoding.UTF8.GetBytes(V2FileContents));
+		var md5 = MD5Hash.GetHashFor(ms);
+		V2FileContents = BitConverter.ToString(md5).Replace("-", "") + V2FileContents;
+		await base.TestFixtureSetUp();
+
+		_filename = GetFilePathFor("indexfile");
+		File.WriteAllText(_filename, V1FileContents);
+	}
+
+	[Test]
+	public void should_initialize_auto_merge_level_correctly() {
+		var map = IndexMapTestFactory.FromFile(_filename, loadPTables: false, maxAutoMergeLevel: 4);
+
+		var v2File = GetFilePathFor("v1tov2");
+		map.SaveToFile(v2File);
+		Assert.AreEqual(V2FileContents, File.ReadAllText(v2File));
+	}
+}
+
+[TestFixture]
+public class when_opening_indexmap_with_auto_merge_level_set : SpecificationWithDirectoryPerTestFixture {
+	private string _filename;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_filename = GetFilePathFor("indexfile");
+		var empty = IndexMap.CreateEmpty(2, 4, Constants.PTableMaxReaderCountDefault);
+		empty.SaveToFile(_filename);
+	}
+
+	[Test]
+	public void should_throw_if_max_auto_merge_is_larger_than_map_value() {
+		Assert.Throws<CorruptIndexException>(() => IndexMapTestFactory.FromFile(_filename, maxAutoMergeLevel: 5));
+	}
+
+	[Test]
+	public void can_reduce_max_auto_merge_to_lower_than_map_value() {
+		IndexMap map = null;
+		Assert.DoesNotThrow(() => map = IndexMapTestFactory.FromFile(_filename, maxAutoMergeLevel: 3));
+		var newIndexFile = GetFilePathFor("indexfile2");
+		map?.SaveToFile(newIndexFile);
+		var lines = File.ReadAllLines(newIndexFile);
+		Assert.AreEqual(lines[3], "3");
+	}
+
+	[Test]
+	public void should_open_if_auto_merge_levels_match() {
+		Assert.DoesNotThrow(() => IndexMapTestFactory.FromFile(_filename, maxAutoMergeLevel: 4));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/MemTableTests.cs b/src/KurrentDB.Core.Tests/Index/MemTableTests.cs
new file mode 100644
index 00000000000..e77e93efd2c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/MemTableTests.cs
@@ -0,0 +1,664 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index;
+
+[TestFixture]
+public class HashListMemTableTests : MemTableTestsFixture {
+	public HashListMemTableTests()
+		: base(() => new HashListMemTable(PTableVersions.IndexV2, maxSize: 20)) {
+	}
+}
+
+[TestFixture]
+public abstract class MemTableTestsFixture {
+	private readonly Func<IMemTable> _memTableFactory;
+
+	protected IMemTable MemTable;
+
+	protected MemTableTestsFixture(Func<IMemTable> memTableFactory) {
+		_memTableFactory = memTableFactory;
+		Ensure.NotNull(memTableFactory, "memTableFactory");
+	}
+
+	[SetUp]
+	public void SetUp() {
+		MemTable = _memTableFactory();
+	}
+
+	[Test]
+	public void throw_argumentoutofrangeexception_on_range_query_when_provided_with_negative_start_version() {
+		Assert.Throws<ArgumentOutOfRangeException>(() => MemTable.GetRange(0x0000, -1, int.MaxValue).ToArray());
+	}
+
+	[Test]
+	public void throw_argumentoutofrangeexception_on_range_query_when_provided_with_negative_end_version() {
+		Assert.Throws<ArgumentOutOfRangeException>(() => MemTable.GetRange(0x0000, 0, -1).ToArray());
+	}
+
+	[Test]
+	public void throw_argumentoutofrangeexception_on_get_one_entry_query_when_provided_with_negative_version() {
+		long pos;
+		Assert.Throws<ArgumentOutOfRangeException>(() => MemTable.TryGetOneValue(0x0000, -1, out pos));
+	}
+
+	[Test]
+	public void throw_argumentoutofrangeexception_on_adding_entry_with_negative_version() {
+		Assert.Throws<ArgumentOutOfRangeException>(() => MemTable.Add(0x0000, -1, 0));
+	}
+
+	[Test]
+	public void throw_argumentoutofrangeexception_on_adding_entry_with_negative_position() {
+		Assert.Throws<ArgumentOutOfRangeException>(() => MemTable.Add(0x0000, 0, -1));
+	}
+
+	[Test]
+	public void empty_memtable_has_count_of_zero() {
+		Assert.AreEqual(0, MemTable.Count);
+	}
+
+	[Test]
+	public void adding_an_item_increments_count() {
+		MemTable.Add(0x11, 0x01, 0xffff);
+		Assert.AreEqual(1, MemTable.Count);
+	}
+
+	[Test]
+	public void non_existent_item_is_not_found() {
+		MemTable.Add(0x11, 0x01, 0xffff);
+		long position;
+		Assert.IsFalse(MemTable.TryGetOneValue(0x11, 0x02, out position));
+	}
+
+
+	[Test]
+	public void existing_item_is_found() {
+		MemTable.Add(0x11, 0x01, 0xffff);
+		long position;
+		Assert.IsTrue(MemTable.TryGetOneValue(0x11, 0x01, out position));
+	}
+
+	[Test]
+	public void items_come_out_sorted() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x12, 0x01, 0xfff3);
+		MemTable.Add(0x11, 0x02, 0xfff2);
+		var list = new List<IndexEntry>(MemTable.IterateAllInOrder());
+		Assert.AreEqual(3, list.Count);
+		Assert.AreEqual(0x12, list[0].Stream);
+		Assert.AreEqual(0x01, list[0].Version);
+		Assert.AreEqual(0xfff3, list[0].Position);
+		Assert.AreEqual(0x11, list[1].Stream);
+		Assert.AreEqual(0x02, list[1].Version);
+		Assert.AreEqual(0xfff2, list[1].Position);
+		Assert.AreEqual(0x11, list[2].Stream);
+		Assert.AreEqual(0x01, list[2].Version);
+		Assert.AreEqual(0xfff1, list[2].Position);
+	}
+
+	[Test]
+	public void items_come_out_sorted_with_duplicates_in_descending_order() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x12, 0x01, 0xfff3);
+		MemTable.Add(0x12, 0x01, 0xfff4);
+		var list = new List<IndexEntry>(MemTable.IterateAllInOrder());
+		Assert.AreEqual(3, list.Count);
+		Assert.AreEqual(0x12, list[0].Stream);
+		Assert.AreEqual(0x01, list[0].Version);
+		Assert.AreEqual(0xfff4, list[0].Position);
+		Assert.AreEqual(0x12, list[1].Stream);
+		Assert.AreEqual(0x01, list[1].Version);
+		Assert.AreEqual(0xfff3, list[1].Position);
+		Assert.AreEqual(0x11, list[2].Stream);
+		Assert.AreEqual(0x01, list[2].Version);
+		Assert.AreEqual(0xfff1, list[2].Position);
+	}
+
+	[Test]
+	public void can_do_range_query_of_existing_items() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x12, 0x01, 0xfff3);
+		MemTable.Add(0x11, 0x02, 0xfff2);
+		var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x01, 0x02));
+		Assert.AreEqual(2, list.Count);
+		Assert.AreEqual(0x11, list[0].Stream);
+		Assert.AreEqual(0x02, list[0].Version);
+		Assert.AreEqual(0xfff2, list[0].Position);
+		Assert.AreEqual(0x11, list[1].Stream);
+		Assert.AreEqual(0x01, list[1].Version);
+		Assert.AreEqual(0xfff1, list[1].Position);
+	}
+
+	[Test]
+	public void can_do_range_query_of_existing_items_with_duplicates_on_edges() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x11, 0x01, 0xfff5);
+		MemTable.Add(0x12, 0x01, 0xfff3);
+		MemTable.Add(0x11, 0x02, 0xfff2);
+		MemTable.Add(0x11, 0x02, 0xfff7);
+		var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x01, 0x02));
+		Assert.AreEqual(4, list.Count);
+		Assert.AreEqual(0x11, list[0].Stream);
+		Assert.AreEqual(0x02, list[0].Version);
+		Assert.AreEqual(0xfff7, list[0].Position);
+		Assert.AreEqual(0x11, list[1].Stream);
+		Assert.AreEqual(0x02, list[1].Version);
+		Assert.AreEqual(0xfff2, list[1].Position);
+		Assert.AreEqual(0x11, list[2].Stream);
+		Assert.AreEqual(0x01, list[2].Version);
+		Assert.AreEqual(0xfff5, list[2].Position);
+		Assert.AreEqual(0x11, list[3].Stream);
+		Assert.AreEqual(0x01, list[3].Version);
+		Assert.AreEqual(0xfff1, list[3].Position);
+	}
+
+	[Test]
+	public void range_query_of_non_existing_stream_returns_nothing() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x12, 0x01, 0xfff3);
+		MemTable.Add(0x11, 0x02, 0xfff2);
+		var list = new List<IndexEntry>(MemTable.GetRange(0x14, 0x01, 0x02));
+		Assert.AreEqual(0, list.Count);
+	}
+
+	[Test]
+	public void range_query_of_non_existing_version_returns_nothing() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x12, 0x01, 0xfff3);
+		MemTable.Add(0x11, 0x02, 0xfff2);
+		var list = new List<IndexEntry>(MemTable.GetRange(0x01, 0x03, 0x05));
+		Assert.AreEqual(0, list.Count);
+	}
+
+
+	[Test]
+	public void range_query_with_hole_returns_items_included() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x12, 0x01, 0xfff3);
+		MemTable.Add(0x11, 0x02, 0xfff2);
+		MemTable.Add(0x11, 0x04, 0xfff4);
+		var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x01, 0x04));
+		Assert.AreEqual(3, list.Count);
+		Assert.AreEqual(0x11, list[0].Stream);
+		Assert.AreEqual(0x04, list[0].Version);
+		Assert.AreEqual(0xfff4, list[0].Position);
+		Assert.AreEqual(0x11, list[1].Stream);
+		Assert.AreEqual(0x02, list[1].Version);
+		Assert.AreEqual(0xfff2, list[1].Position);
+		Assert.AreEqual(0x11, list[2].Stream);
+		Assert.AreEqual(0x01, list[2].Version);
+		Assert.AreEqual(0xfff1, list[2].Position);
+	}
+
+	[Test]
+	public void query_with_start_in_range_but_not_end_results_returns_items_included() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x12, 0x01, 0xfff3);
+		MemTable.Add(0x11, 0x02, 0xfff2);
+		var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x01, 0x04));
+		Assert.AreEqual(2, list.Count);
+		Assert.AreEqual(0x11, list[0].Stream);
+		Assert.AreEqual(0x02, list[0].Version);
+		Assert.AreEqual(0xfff2, list[0].Position);
+		Assert.AreEqual(0x11, list[1].Stream);
+		Assert.AreEqual(0x01, list[1].Version);
+		Assert.AreEqual(0xfff1, list[1].Position);
+	}
+
+	[Test]
+	public void query_with_end_in_range_but_not_start_results_returns_items_included() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x12, 0x01, 0xfff3);
+		MemTable.Add(0x11, 0x02, 0xfff2);
+		var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x00, 0x02));
+		Assert.AreEqual(2, list.Count);
+		Assert.AreEqual(0x11, list[0].Stream);
+		Assert.AreEqual(0x02, list[0].Version);
+		Assert.AreEqual(0xfff2, list[0].Position);
+		Assert.AreEqual(0x11, list[1].Stream);
+		Assert.AreEqual(0x01, list[1].Version);
+		Assert.AreEqual(0xfff1, list[1].Position);
+	}
+
+	[Test]
+	public void query_with_end_and_start_exclusive_results_returns_items_included() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x12, 0x01, 0xfff3);
+		MemTable.Add(0x11, 0x02, 0xfff2);
+		var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x00, 0x04));
+		Assert.AreEqual(2, list.Count);
+		Assert.AreEqual(0x11, list[0].Stream);
+		Assert.AreEqual(0x02, list[0].Version);
+		Assert.AreEqual(0xfff2, list[0].Position);
+		Assert.AreEqual(0x11, list[1].Stream);
+		Assert.AreEqual(0x01, list[1].Version);
+		Assert.AreEqual(0xfff1, list[1].Position);
+	}
+
+	[Test]
+	public void query_with_end_inside_the_hole_in_list_returns_items_included() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x11, 0x03, 0xfff3);
+		MemTable.Add(0x11, 0x05, 0xfff5);
+		var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x00, 0x04));
+		Assert.AreEqual(2, list.Count);
+		Assert.AreEqual(0x11, list[0].Stream);
+		Assert.AreEqual(0x03, list[0].Version);
+		Assert.AreEqual(0xfff3, list[0].Position);
+		Assert.AreEqual(0x11, list[1].Stream);
+		Assert.AreEqual(0x01, list[1].Version);
+		Assert.AreEqual(0xfff1, list[1].Position);
+	}
+
+	[Test]
+	public void query_with_end_inside_the_hole_in_list_returns_items_included_with_duplicates() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x11, 0x03, 0xfff3);
+		MemTable.Add(0x11, 0x03, 0xfff2);
+		MemTable.Add(0x11, 0x05, 0xfff5);
+		var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x00, 0x04));
+		Assert.AreEqual(3, list.Count);
+		Assert.AreEqual(0x11, list[0].Stream);
+		Assert.AreEqual(0x03, list[0].Version);
+		Assert.AreEqual(0xfff3, list[0].Position);
+		Assert.AreEqual(0x11, list[1].Stream);
+		Assert.AreEqual(0x03, list[1].Version);
+		Assert.AreEqual(0xfff2, list[1].Position);
+		Assert.AreEqual(0x11, list[2].Stream);
+		Assert.AreEqual(0x01, list[2].Version);
+		Assert.AreEqual(0xfff1, list[2].Position);
+	}
+
+	[Test]
+	public void query_with_start_inside_the_hole_in_list_returns_items_included() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x11, 0x03, 0xfff3);
+		MemTable.Add(0x11, 0x05, 0xfff5);
+		var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x02, 0x06));
+		Assert.AreEqual(2, list.Count);
+		Assert.AreEqual(0x11, list[0].Stream);
+		Assert.AreEqual(0x05, list[0].Version);
+		Assert.AreEqual(0xfff5, list[0].Position);
+		Assert.AreEqual(0x11, list[1].Stream);
+		Assert.AreEqual(0x03, list[1].Version);
+		Assert.AreEqual(0xfff3, list[1].Position);
+	}
+
+	[Test]
+	public void query_with_start_inside_the_hole_in_list_returns_duplicated_items_included() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x11, 0x03, 0xfff3);
+		MemTable.Add(0x11, 0x03, 0xfff2);
+		MemTable.Add(0x11, 0x05, 0xfff5);
+		var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x02, 0x06));
+		Assert.AreEqual(3, list.Count);
+		Assert.AreEqual(0x11, list[0].Stream);
+		Assert.AreEqual(0x05, list[0].Version);
+		Assert.AreEqual(0xfff5, list[0].Position);
+		Assert.AreEqual(0x11, list[1].Stream);
+		Assert.AreEqual(0x03, list[1].Version);
+		Assert.AreEqual(0xfff3, list[1].Position);
+		Assert.AreEqual(0x11, list[2].Stream);
+		Assert.AreEqual(0x03, list[2].Version);
+		Assert.AreEqual(0xfff2, list[2].Position);
+	}
+
+	[Test]
+	public void query_with_start_and_end_inside_the_hole_in_list_returns_items_included() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x11, 0x03, 0xfff3);
+		MemTable.Add(0x11, 0x05, 0xfff5);
+		var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x02, 0x04));
+		Assert.AreEqual(1, list.Count);
+		Assert.AreEqual(0x11, list[0].Stream);
+		Assert.AreEqual(0x03, list[0].Version);
+		Assert.AreEqual(0xfff3, list[0].Position);
+	}
+
+	[Test]
+	public void query_with_start_and_end_inside_the_hole_in_list_returns_items_included_with_duplicates() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x11, 0x01, 0xfff2);
+		MemTable.Add(0x11, 0x03, 0xfff3);
+		MemTable.Add(0x11, 0x03, 0xfff4);
+		MemTable.Add(0x11, 0x05, 0xfff5);
+		var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x02, 0x04));
+		Assert.AreEqual(2, list.Count);
+		Assert.AreEqual(0x11, list[0].Stream);
+		Assert.AreEqual(0x03, list[0].Version);
+		Assert.AreEqual(0xfff4, list[0].Position);
+		Assert.AreEqual(0x11, list[1].Stream);
+		Assert.AreEqual(0x03, list[1].Version);
+		Assert.AreEqual(0xfff3, list[1].Position);
+	}
+
+	[Test]
+	public void query_with_start_and_end_less_than_all_items_returns_nothing() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x11, 0x03, 0xfff3);
+		MemTable.Add(0x11, 0x05, 0xfff5);
+		var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x00, 0x00));
+		Assert.AreEqual(0, list.Count);
+	}
+
+	[Test]
+	public void query_with_start_and_end_greater_than_all_items_returns_nothing() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x11, 0x03, 0xfff3);
+		MemTable.Add(0x11, 0x05, 0xfff5);
+		var list = new List<IndexEntry>(MemTable.GetRange(0x11, 0x06, 0x06));
+		Assert.AreEqual(0, list.Count);
+	}
+
+	[Test]
+	public void try_get_one_value_returns_value_with_highest_position() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x11, 0x01, 0xfff3);
+		MemTable.Add(0x11, 0x05, 0xfff5);
+		long position;
+		Assert.IsTrue(MemTable.TryGetOneValue(0x11, 0x01, out position));
+		Assert.AreEqual(0xfff3, position);
+	}
+
+	[Test]
+	public void get_range_of_same_version_returns_both_values_in_descending_order_when_duplicated() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x11, 0x01, 0xfff3);
+		MemTable.Add(0x11, 0x05, 0xfff5);
+		var entries = MemTable.GetRange(0x11, 0x01, 0x01).ToArray();
+		Assert.AreEqual(2, entries.Length);
+		Assert.AreEqual(0x11, entries[0].Stream);
+		Assert.AreEqual(0x01, entries[0].Version);
+		Assert.AreEqual(0xfff3, entries[0].Position);
+		Assert.AreEqual(0x11, entries[1].Stream);
+		Assert.AreEqual(0x01, entries[1].Version);
+		Assert.AreEqual(0xfff1, entries[1].Position);
+	}
+
+	[Test]
+	public void try_get_one_value_returns_the_value_with_largest_position_when_triduplicated() {
+		MemTable.Add(0x01, 0x05, 0xfff9);
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x11, 0x01, 0xfff3);
+		MemTable.Add(0x11, 0x05, 0xfff5);
+		MemTable.Add(0x11, 0x01, 0xfff2);
+
+		long position;
+		Assert.IsTrue(MemTable.TryGetOneValue(0x11, 0x01, out position));
+		Assert.AreEqual(0xfff3, position);
+	}
+
+	[Test]
+	public void get_range_of_same_version_returns_both_values_in_descending_order_when_triduplicated() {
+		MemTable.Add(0x01, 0x05, 0xfff9);
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x11, 0x01, 0xfff3);
+		MemTable.Add(0x11, 0x05, 0xfff5);
+		MemTable.Add(0x11, 0x01, 0xfff2);
+
+		var entries = MemTable.GetRange(0x11, 0x01, 0x01).ToArray();
+		Assert.AreEqual(3, entries.Length);
+		Assert.AreEqual(0x11, entries[0].Stream);
+		Assert.AreEqual(0x01, entries[0].Version);
+		Assert.AreEqual(0xfff3, entries[0].Position);
+
+		Assert.AreEqual(0x11, entries[1].Stream);
+		Assert.AreEqual(0x01, entries[1].Version);
+		Assert.AreEqual(0xfff2, entries[1].Position);
+
+		Assert.AreEqual(0x11, entries[2].Stream);
+		Assert.AreEqual(0x01, entries[2].Version);
+		Assert.AreEqual(0xfff1, entries[2].Position);
+	}
+
+	[Test]
+	public void try_get_latest_entry_finds_nothing_on_empty_memtable() {
+		IndexEntry entry;
+		Assert.IsFalse(MemTable.TryGetLatestEntry(0x12, out entry));
+	}
+
+	[Test]
+	public void try_get_latest_entry_finds_nothing_on_empty_stream() {
+		MemTable.Add(0x11, 0x01, 0xffff);
+		IndexEntry entry;
+		Assert.IsFalse(MemTable.TryGetLatestEntry(0x12, out entry));
+	}
+
+	[Test]
+	public void single_item_is_latest() {
+		MemTable.Add(0x11, 0x01, 0xffff);
+		IndexEntry entry;
+		Assert.IsTrue(MemTable.TryGetLatestEntry(0x11, out entry));
+		Assert.AreEqual(0x11, entry.Stream);
+		Assert.AreEqual(0x01, entry.Version);
+		Assert.AreEqual(0xffff, entry.Position);
+	}
+
+	[Test]
+	public void try_get_latest_entry_returns_correct_entry() {
+		MemTable.Add(0x11, 0x01, 0xffff);
+		MemTable.Add(0x11, 0x02, 0xfff2);
+		IndexEntry entry;
+		Assert.IsTrue(MemTable.TryGetLatestEntry(0x11, out entry));
+		Assert.AreEqual(0x11, entry.Stream);
+		Assert.AreEqual(0x02, entry.Version);
+		Assert.AreEqual(0xfff2, entry.Position);
+	}
+
+	[Test]
+	public void try_get_latest_entry_when_duplicated_entries_returns_the_one_with_largest_position() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x11, 0x02, 0xfff2);
+		MemTable.Add(0x11, 0x01, 0xfff3);
+		MemTable.Add(0x11, 0x02, 0xfff4);
+		IndexEntry entry;
+		Assert.IsTrue(MemTable.TryGetLatestEntry(0x11, out entry));
+		Assert.AreEqual(0x11, entry.Stream);
+		Assert.AreEqual(0x02, entry.Version);
+		Assert.AreEqual(0xfff4, entry.Position);
+	}
+
+	[Test]
+	public void try_get_latest_entry_returns_the_entry_with_the_largest_position_when_triduplicated() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x11, 0x01, 0xfff3);
+		MemTable.Add(0x11, 0x01, 0xfff5);
+		IndexEntry entry;
+		Assert.IsTrue(MemTable.TryGetLatestEntry(0x11, out entry));
+		Assert.AreEqual(0x11, entry.Stream);
+		Assert.AreEqual(0x01, entry.Version);
+		Assert.AreEqual(0xfff5, entry.Position);
+	}
+
+	[Test]
+	public void try_get_oldest_entry_finds_nothing_on_empty_memtable() {
+		IndexEntry entry;
+		Assert.IsFalse(MemTable.TryGetOldestEntry(0x12, out entry));
+	}
+
+	[Test]
+	public void try_get_oldest_entry_finds_nothing_on_empty_stream() {
+		MemTable.Add(0x11, 0x01, 0xffff);
+		IndexEntry entry;
+		Assert.IsFalse(MemTable.TryGetOldestEntry(0x12, out entry));
+	}
+
+	[Test]
+	public void single_item_is_oldest() {
+		MemTable.Add(0x11, 0x01, 0xffff);
+		IndexEntry entry;
+		Assert.IsTrue(MemTable.TryGetOldestEntry(0x11, out entry));
+		Assert.AreEqual(0x11, entry.Stream);
+		Assert.AreEqual(0x01, entry.Version);
+		Assert.AreEqual(0xffff, entry.Position);
+	}
+
+	[Test]
+	public void try_get_oldest_entry_returns_correct_entry() {
+		MemTable.Add(0x11, 0x01, 0xffff);
+		MemTable.Add(0x11, 0x02, 0xfff2);
+		IndexEntry entry;
+		Assert.IsTrue(MemTable.TryGetOldestEntry(0x11, out entry));
+		Assert.AreEqual(0x11, entry.Stream);
+		Assert.AreEqual(0x01, entry.Version);
+		Assert.AreEqual(0xffff, entry.Position);
+	}
+
+	[Test]
+	public void try_get_oldest_entry_when_duplicated_entries_returns_the_one_with_smallest_position() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x11, 0x02, 0xfff2);
+		MemTable.Add(0x11, 0x01, 0xfff3);
+		MemTable.Add(0x11, 0x02, 0xfff4);
+		IndexEntry entry;
+		Assert.IsTrue(MemTable.TryGetOldestEntry(0x11, out entry));
+		Assert.AreEqual(0x11, entry.Stream);
+		Assert.AreEqual(0x01, entry.Version);
+		Assert.AreEqual(0xfff1, entry.Position);
+	}
+
+	[Test]
+	public void try_get_oldest_entry_returns_the_entry_with_the_smallest_position_when_triduplicated() {
+		MemTable.Add(0x11, 0x01, 0xfff1);
+		MemTable.Add(0x11, 0x01, 0xfff3);
+		MemTable.Add(0x11, 0x01, 0xfff5);
+		IndexEntry entry;
+		Assert.IsTrue(MemTable.TryGetOldestEntry(0x11, out entry));
+		Assert.AreEqual(0x11, entry.Stream);
+		Assert.AreEqual(0x01, entry.Version);
+		Assert.AreEqual(0xfff1, entry.Position);
+	}
+
+
+	[Test]
+	public void the_smallest_items_with_hash_collisions_can_be_found() {
+		MemTable.Add(0, 0, 0x0001);
+		MemTable.Add(0, 0, 0x0002);
+		MemTable.Add(1, 0, 0x0003);
+		MemTable.Add(1, 0, 0x0004);
+		MemTable.Add(1, 0, 0x0005);
+
+		long position;
+		Assert.IsTrue(MemTable.TryGetOneValue(0, 0, out position));
+		Assert.AreEqual(0x0002, position);
+	}
+
+	[Test]
+	public void the_smallest_items_with_hash_collisions_are_returned_in_descending_order() {
+		MemTable.Add(0, 0, 0x0001);
+		MemTable.Add(0, 0, 0x0002);
+		MemTable.Add(1, 0, 0x0003);
+		MemTable.Add(1, 0, 0x0004);
+		MemTable.Add(1, 0, 0x0005);
+
+		var entries = MemTable.GetRange(0, 0, 0).ToArray();
+		Assert.AreEqual(2, entries.Length);
+		Assert.AreEqual(0, entries[0].Stream);
+		Assert.AreEqual(0, entries[0].Version);
+		Assert.AreEqual(0x0002, entries[0].Position);
+		Assert.AreEqual(0, entries[1].Stream);
+		Assert.AreEqual(0, entries[1].Version);
+		Assert.AreEqual(0x0001, entries[1].Position);
+	}
+
+	[Test]
+	public void try_get_latest_entry_for_smallest_hash_with_collisions_returns_correct_index_entry() {
+		MemTable.Add(0, 0, 0x0001);
+		MemTable.Add(0, 0, 0x0002);
+		MemTable.Add(1, 0, 0x0003);
+		MemTable.Add(1, 0, 0x0004);
+		MemTable.Add(1, 0, 0x0005);
+
+		IndexEntry entry;
+		Assert.IsTrue(MemTable.TryGetLatestEntry(0, out entry));
+		Assert.AreEqual(0, entry.Stream);
+		Assert.AreEqual(0, entry.Version);
+		Assert.AreEqual(0x0002, entry.Position);
+	}
+
+	[Test]
+	public void try_get_oldest_entry_for_smallest_hash_with_collisions_returns_correct_index_entry() {
+		MemTable.Add(0, 0, 0x0001);
+		MemTable.Add(0, 0, 0x0002);
+		MemTable.Add(1, 0, 0x0003);
+		MemTable.Add(1, 0, 0x0004);
+		MemTable.Add(1, 0, 0x0005);
+
+		IndexEntry entry;
+		Assert.IsTrue(MemTable.TryGetOldestEntry(0, out entry));
+		Assert.AreEqual(0, entry.Stream);
+		Assert.AreEqual(0, entry.Version);
+		Assert.AreEqual(0x0001, entry.Position);
+	}
+
+	[Test]
+	public void the_largest_items_with_hash_collisions_can_be_found() {
+		MemTable.Add(0, 0, 0x0001);
+		MemTable.Add(0, 0, 0x0002);
+		MemTable.Add(1, 0, 0x0003);
+		MemTable.Add(1, 0, 0x0004);
+		MemTable.Add(1, 0, 0x0005);
+
+		long position;
+		Assert.IsTrue(MemTable.TryGetOneValue(1, 0, out position));
+		Assert.AreEqual(0x0005, position);
+	}
+
+	[Test]
+	public void the_largest_items_with_hash_collisions_are_returned_in_descending_order() {
+		MemTable.Add(0, 0, 0x0001);
+		MemTable.Add(0, 0, 0x0002);
+		MemTable.Add(1, 0, 0x0003);
+		MemTable.Add(1, 0, 0x0004);
+		MemTable.Add(1, 0, 0x0005);
+
+		var entries = MemTable.GetRange(1, 0, 0).ToArray();
+		Assert.AreEqual(3, entries.Length);
+		Assert.AreEqual(1, entries[0].Stream);
+		Assert.AreEqual(0, entries[0].Version);
+		Assert.AreEqual(0x0005, entries[0].Position);
+		Assert.AreEqual(1, entries[1].Stream);
+		Assert.AreEqual(0, entries[1].Version);
+		Assert.AreEqual(0x0004, entries[1].Position);
+		Assert.AreEqual(1, entries[2].Stream);
+		Assert.AreEqual(0, entries[2].Version);
+		Assert.AreEqual(0x0003, entries[2].Position);
+	}
+
+	[Test]
+	public void try_get_latest_entry_for_largest_hash_collision_returns_correct_index_entry() {
+		MemTable.Add(0, 0, 0x0001);
+		MemTable.Add(0, 0, 0x0002);
+		MemTable.Add(1, 0, 0x0003);
+		MemTable.Add(1, 0, 0x0004);
+		MemTable.Add(1, 0, 0x0005);
+
+		IndexEntry entry;
+		Assert.IsTrue(MemTable.TryGetLatestEntry(1, out entry));
+		Assert.AreEqual(1, entry.Stream);
+		Assert.AreEqual(0, entry.Version);
+		Assert.AreEqual(0x0005, entry.Position);
+	}
+
+	[Test]
+	public void try_get_oldest_entry_for_largest_hash_with_collisions_returns_correct_index_entry() {
+		MemTable.Add(0, 0, 0x0001);
+		MemTable.Add(0, 0, 0x0002);
+		MemTable.Add(1, 0, 0x0003);
+		MemTable.Add(1, 0, 0x0004);
+		MemTable.Add(1, 0, 0x0005);
+
+		IndexEntry entry;
+		Assert.IsTrue(MemTable.TryGetOldestEntry(1, out entry));
+		Assert.AreEqual(1, entry.Stream);
+		Assert.AreEqual(0, entry.Version);
+		Assert.AreEqual(0x0003, entry.Position);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/ReverseComparerTests.cs b/src/KurrentDB.Core.Tests/Index/ReverseComparerTests.cs
new file mode 100644
index 00000000000..3c1d9544ebd
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/ReverseComparerTests.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index;
+
+[TestFixture]
+public class ReverseComparerTests {
+	[Test]
+	public void larger_values_return_as_lower() {
+		Assert.AreEqual(-1, new ReverseComparer<int>().Compare(5, 3));
+	}
+
+	[Test]
+	public void smaller_values_return_as_higher() {
+		Assert.AreEqual(1, new ReverseComparer<int>().Compare(3, 5));
+	}
+
+	[Test]
+	public void same_values_are_equal() {
+		Assert.AreEqual(0, new ReverseComparer<int>().Compare(5, 5));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_a_table_index.cs b/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_a_table_index.cs
new file mode 100644
index 00000000000..9f4c602eb19
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_a_table_index.cs
@@ -0,0 +1,130 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.Scavenge;
+
+[TestFixture(false)]
+[TestFixture(true)]
+class when_scavenging_a_table_index : SpecificationWithDirectoryPerTestFixture {
+	private TableIndex<string> _tableIndex;
+	private IHasher<string> _lowHasher;
+	private IHasher<string> _highHasher;
+	private string _indexDir;
+	private FakeTFScavengerLog _log;
+	private static readonly long[] Deleted = { 200, 300, 500 };
+	private readonly bool _skipIndexVerify;
+	private readonly bool _useBloomFilter;
+
+	public when_scavenging_a_table_index(bool skipIndexVerify) {
+		_skipIndexVerify = skipIndexVerify;
+		_useBloomFilter = skipIndexVerify; // bloomfilter orthogonal
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_indexDir = PathName;
+
+		var fakeReader = new TFReaderLease(new FakeIndexReader(l => !Deleted.Contains(l)));
+
+		_lowHasher = new XXHashUnsafe();
+		_highHasher = new Murmur3AUnsafe();
+		_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
+			() => new HashListMemTable(PTableVersions.IndexV4, maxSize: 5),
+			() => fakeReader,
+			PTableVersions.IndexV4,
+			5, Constants.PTableMaxReaderCountDefault,
+			maxSizeForMemory: 2,
+			maxTablesPerLevel: 5, skipIndexVerify: _skipIndexVerify,
+			useBloomFilter: _useBloomFilter);
+		_tableIndex.Initialize(long.MaxValue);
+
+
+		_tableIndex.Add(1, "testStream-1", 0, 0);
+		_tableIndex.Add(1, "testStream-1", 1, 100);
+		_tableIndex.Add(1, "testStream-1", 2, 200);
+		_tableIndex.Add(1, "testStream-1", 3, 300);
+		_tableIndex.Add(1, "testStream-1", 4, 400);
+		_tableIndex.Add(1, "testStream-1", 5, 500);
+
+		_log = new FakeTFScavengerLog();
+		await _tableIndex.Scavenge(_log, CancellationToken.None);
+
+		// Check it's loadable.
+		_tableIndex.Close(false);
+
+		_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
+			() => new HashListMemTable(PTableVersions.IndexV4, maxSize: 5),
+			() => fakeReader,
+			PTableVersions.IndexV4,
+			5, Constants.PTableMaxReaderCountDefault,
+			maxSizeForMemory: 2,
+			maxTablesPerLevel: 5,
+			useBloomFilter: _useBloomFilter);
+
+		_tableIndex.Initialize(long.MaxValue);
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_tableIndex.Close();
+
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void should_have_logged_each_index_table() {
+		Assert.That(_log.ScavengedIndices.Count, Is.EqualTo(3));
+		Assert.That(_log.ScavengedIndices[0].Scavenged, Is.True);
+		Assert.That(_log.ScavengedIndices[0].Error, Is.Null);
+		Assert.That(_log.ScavengedIndices[0].EntriesDeleted, Is.EqualTo(1));
+		Assert.That(_log.ScavengedIndices[1].Scavenged, Is.True);
+		Assert.That(_log.ScavengedIndices[1].Error, Is.Null);
+		Assert.That(_log.ScavengedIndices[1].EntriesDeleted, Is.EqualTo(2));
+		Assert.That(_log.ScavengedIndices[2].Scavenged, Is.False);
+		Assert.That(_log.ScavengedIndices[2].Error, Is.Empty);
+		Assert.That(_log.ScavengedIndices[2].EntriesDeleted, Is.EqualTo(0));
+	}
+
+	[Test]
+	public void should_have_entries_in_sorted_order() {
+		var streamId = "testStream-1";
+		var result = _tableIndex.GetRange(streamId, 0, 5).ToArray();
+		var hash = (ulong)_lowHasher.Hash(streamId) << 32 | _highHasher.Hash(streamId);
+
+		Assert.That(result.Count(), Is.EqualTo(3));
+
+		Assert.That(result[0].Stream, Is.EqualTo(hash));
+		Assert.That(result[0].Version, Is.EqualTo(4));
+		Assert.That(result[0].Position, Is.EqualTo(400));
+
+		Assert.That(result[1].Stream, Is.EqualTo(hash));
+		Assert.That(result[1].Version, Is.EqualTo(1));
+		Assert.That(result[1].Position, Is.EqualTo(100));
+
+		Assert.That(result[2].Stream, Is.EqualTo(hash));
+		Assert.That(result[2].Version, Is.EqualTo(0));
+		Assert.That(result[2].Position, Is.EqualTo(0));
+	}
+
+
+	[Test]
+	public void old_index_tables_are_deleted() {
+		if (_useBloomFilter) {
+			Assert.That(Directory.EnumerateFiles(_indexDir).Count(), Is.EqualTo(7), "Expected IndexMap and 3 tables and 3 bloom filters.");
+		} else {
+			Assert.That(Directory.EnumerateFiles(_indexDir).Count(), Is.EqualTo(4), "Expected IndexMap and 3 tables.");
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_and_another_table_is_completed_during.cs b/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_and_another_table_is_completed_during.cs
new file mode 100644
index 00000000000..1c4275f44ec
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_and_another_table_is_completed_during.cs
@@ -0,0 +1,144 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.Scavenge;
+
+[TestFixture(false)]
+[TestFixture(true)]
+class
+	when_scavenging_a_table_index_and_another_table_is_completed_during : SpecificationWithDirectoryPerTestFixture {
+	private TableIndex<string> _tableIndex;
+	private IHasher<string> _lowHasher;
+	private IHasher<string> _highHasher;
+	private string _indexDir;
+	private FakeTFScavengerLog _log;
+	private readonly bool _useBloomFilter;
+
+	public when_scavenging_a_table_index_and_another_table_is_completed_during(bool useBloomFilter) {
+		_useBloomFilter = useBloomFilter;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_indexDir = PathName;
+
+		var scavengeBlocker = new ManualResetEventSlim(false);
+		var scavengeStarted = new ManualResetEventSlim(false);
+
+		var fakeReader = new TFReaderLease(new FakeIndexReader(l => {
+			scavengeStarted.Set();
+			if (!scavengeBlocker.Wait(5000))
+				throw new Exception("Failed to continue.");
+			return false;
+		}));
+
+		_lowHasher = new XXHashUnsafe();
+		_highHasher = new Murmur3AUnsafe();
+		_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
+			() => new HashListMemTable(PTableVersions.IndexV4, maxSize: 5),
+			() => fakeReader,
+			PTableVersions.IndexV4,
+			5, Constants.PTableMaxReaderCountDefault,
+			maxSizeForMemory: 2,
+			maxTablesPerLevel: 5,
+			useBloomFilter: _useBloomFilter);
+		_tableIndex.Initialize(long.MaxValue);
+
+
+		_tableIndex.Add(1, "testStream-1", 0, 0);
+		_tableIndex.Add(1, "testStream-1", 1, 100);
+		_tableIndex.WaitForBackgroundTasks();
+
+		_log = new FakeTFScavengerLog();
+		var task = Task.Run(() => _tableIndex.Scavenge(_log, CancellationToken.None));
+
+		Assert.That(scavengeStarted.Wait(5000));
+
+		// Add enough for 2 more tables
+		_tableIndex.Add(1, "testStream-1", 2, 200);
+		_tableIndex.Add(1, "testStream-1", 3, 300);
+		_tableIndex.Add(1, "testStream-1", 4, 400);
+		_tableIndex.Add(1, "testStream-1", 5, 500);
+
+		// Release the scavenge process
+		scavengeBlocker.Set();
+		await task;
+
+		// Check it's loadable.
+		_tableIndex.Close(false);
+
+		_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
+			() => new HashListMemTable(PTableVersions.IndexV4, maxSize: 5),
+			() => fakeReader,
+			PTableVersions.IndexV4,
+			5, Constants.PTableMaxReaderCountDefault,
+			maxSizeForMemory: 2,
+			maxTablesPerLevel: 5,
+			useBloomFilter: _useBloomFilter);
+
+		_tableIndex.Initialize(long.MaxValue);
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_tableIndex.Close();
+
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void should_have_logged_each_index_table() {
+		Assert.That(_log.ScavengedIndices.Count, Is.EqualTo(1));
+		Assert.That(_log.ScavengedIndices[0].Scavenged, Is.True);
+		Assert.That(_log.ScavengedIndices[0].Error, Is.Null);
+		Assert.That(_log.ScavengedIndices[0].EntriesDeleted, Is.EqualTo(2));
+	}
+
+	[Test]
+	public void should_still_have_all_entries_in_sorted_order() {
+		var streamId = "testStream-1";
+		var result = _tableIndex.GetRange(streamId, 0, 5).ToArray();
+		var hash = (ulong)_lowHasher.Hash(streamId) << 32 | _highHasher.Hash(streamId);
+
+		Assert.That(result.Count(), Is.EqualTo(4));
+
+		Assert.That(result[0].Stream, Is.EqualTo(hash));
+		Assert.That(result[0].Version, Is.EqualTo(5));
+		Assert.That(result[0].Position, Is.EqualTo(500));
+
+		Assert.That(result[1].Stream, Is.EqualTo(hash));
+		Assert.That(result[1].Version, Is.EqualTo(4));
+		Assert.That(result[1].Position, Is.EqualTo(400));
+
+		Assert.That(result[2].Stream, Is.EqualTo(hash));
+		Assert.That(result[2].Version, Is.EqualTo(3));
+		Assert.That(result[2].Position, Is.EqualTo(300));
+
+		Assert.That(result[3].Stream, Is.EqualTo(hash));
+		Assert.That(result[3].Version, Is.EqualTo(2));
+		Assert.That(result[3].Position, Is.EqualTo(200));
+	}
+
+
+	[Test]
+	public void all_tables_are_written_to_disk() {
+		if (_useBloomFilter) {
+			Assert.That(Directory.EnumerateFiles(_indexDir).Count(), Is.EqualTo(7), "Expected IndexMap and 3 tables and 3 bloom filters.");
+		} else {
+			Assert.That(Directory.EnumerateFiles(_indexDir).Count(), Is.EqualTo(4), "Expected IndexMap and 3 tables.");
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_cancelled_while_scavenging_table.cs b/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_cancelled_while_scavenging_table.cs
new file mode 100644
index 00000000000..1b89424a928
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_cancelled_while_scavenging_table.cs
@@ -0,0 +1,122 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.Scavenge;
+
+[TestFixture]
+class when_scavenging_a_table_index_cancelled_while_scavenging_table : SpecificationWithDirectoryPerTestFixture {
+	private TableIndex<string> _tableIndex;
+	private IHasher<string> _lowHasher;
+	private IHasher<string> _highHasher;
+	private string _indexDir;
+	private FakeTFScavengerLog _log;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_indexDir = PathName;
+
+		var cancellationTokenSource = new CancellationTokenSource();
+
+		var fakeReader = new TFReaderLease(new FakeIndexReader(l => {
+			cancellationTokenSource.Cancel();
+			return true;
+		}));
+
+		_lowHasher = new XXHashUnsafe();
+		_highHasher = new Murmur3AUnsafe();
+		_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
+			() => new HashListMemTable(PTableVersions.IndexV4, maxSize: 5),
+			() => fakeReader,
+			PTableVersions.IndexV4,
+			5, Constants.PTableMaxReaderCountDefault,
+			maxSizeForMemory: 2,
+			maxTablesPerLevel: 5);
+		_tableIndex.Initialize(long.MaxValue);
+
+		_tableIndex.Add(1, "testStream-1", 0, 0);
+		_tableIndex.Add(1, "testStream-1", 1, 100);
+		_tableIndex.Add(1, "testStream-1", 2, 200);
+		_tableIndex.Add(1, "testStream-1", 3, 300);
+		_tableIndex.Add(1, "testStream-1", 4, 400);
+		_tableIndex.Add(1, "testStream-1", 5, 500);
+
+		_log = new FakeTFScavengerLog();
+
+
+		Assert.That(() => _tableIndex.Scavenge(_log, cancellationTokenSource.Token),
+			Throws.InstanceOf<OperationCanceledException>());
+
+		// Check it's loadable still.
+		_tableIndex.Close(false);
+
+		_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
+			() => new HashListMemTable(PTableVersions.IndexV4, maxSize: 5),
+			() => fakeReader,
+			PTableVersions.IndexV4,
+			5, Constants.PTableMaxReaderCountDefault,
+			maxSizeForMemory: 2,
+			maxTablesPerLevel: 5);
+
+		_tableIndex.Initialize(long.MaxValue);
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_tableIndex.Close();
+
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void should_have_logged_a_failure() {
+		Assert.That(_log.ScavengedIndices.Count, Is.EqualTo(1));
+		Assert.That(_log.ScavengedIndices[0].Scavenged, Is.False);
+		Assert.That(_log.ScavengedIndices[0].Error, Is.EqualTo("Scavenge cancelled"));
+		Assert.That(_log.ScavengedIndices[0].EntriesDeleted, Is.EqualTo(0));
+	}
+
+	[Test]
+	public void should_still_have_all_entries_in_sorted_order() {
+		var streamId = "testStream-1";
+		var result = _tableIndex.GetRange(streamId, 0, 5).ToArray();
+		var hash = (ulong)_lowHasher.Hash(streamId) << 32 | _highHasher.Hash(streamId);
+
+		Assert.That(result.Count(), Is.EqualTo(6));
+
+		Assert.That(result[0].Stream, Is.EqualTo(hash));
+		Assert.That(result[0].Version, Is.EqualTo(5));
+		Assert.That(result[0].Position, Is.EqualTo(500));
+
+		Assert.That(result[1].Stream, Is.EqualTo(hash));
+		Assert.That(result[1].Version, Is.EqualTo(4));
+		Assert.That(result[1].Position, Is.EqualTo(400));
+
+		Assert.That(result[2].Stream, Is.EqualTo(hash));
+		Assert.That(result[2].Version, Is.EqualTo(3));
+		Assert.That(result[2].Position, Is.EqualTo(300));
+
+		Assert.That(result[3].Stream, Is.EqualTo(hash));
+		Assert.That(result[3].Version, Is.EqualTo(2));
+		Assert.That(result[3].Position, Is.EqualTo(200));
+
+		Assert.That(result[4].Stream, Is.EqualTo(hash));
+		Assert.That(result[4].Version, Is.EqualTo(1));
+		Assert.That(result[4].Position, Is.EqualTo(100));
+
+		Assert.That(result[5].Stream, Is.EqualTo(hash));
+		Assert.That(result[5].Version, Is.EqualTo(0));
+		Assert.That(result[5].Position, Is.EqualTo(0));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_cancelled_while_waiting_for_lock.cs b/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_cancelled_while_waiting_for_lock.cs
new file mode 100644
index 00000000000..59b532bae38
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_cancelled_while_waiting_for_lock.cs
@@ -0,0 +1,110 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.Scavenge;
+
+[TestFixture]
+class when_scavenging_a_table_index_cancelled_while_waiting_for_lock : SpecificationWithDirectoryPerTestFixture {
+	private TableIndex<string> _tableIndex;
+	private IHasher<string> _lowHasher;
+	private IHasher<string> _highHasher;
+	private string _indexDir;
+	private FakeTFScavengerLog _log;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_indexDir = PathName;
+
+		var fakeReader = new TFReaderLease(new FakeIndexReader());
+		_lowHasher = new XXHashUnsafe();
+		_highHasher = new Murmur3AUnsafe();
+		_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
+			() => new HashListMemTable(PTableVersions.IndexV4, maxSize: 5),
+			() => fakeReader,
+			PTableVersions.IndexV4,
+			5, Constants.PTableMaxReaderCountDefault,
+			maxSizeForMemory: 2,
+			maxTablesPerLevel: 5);
+		_tableIndex.Initialize(long.MaxValue);
+
+		_tableIndex.Add(1, "testStream-1", 0, 0);
+		_tableIndex.Add(1, "testStream-1", 1, 100);
+		_tableIndex.Add(1, "testStream-1", 2, 200);
+		_tableIndex.Add(1, "testStream-1", 3, 300);
+		_tableIndex.Add(1, "testStream-1", 4, 400);
+		_tableIndex.Add(1, "testStream-1", 5, 500);
+
+		_log = new FakeTFScavengerLog();
+
+		var cancellationTokenSource = new CancellationTokenSource();
+		cancellationTokenSource.Cancel();
+
+		Assert.That(() => _tableIndex.Scavenge(_log, cancellationTokenSource.Token),
+			Throws.InstanceOf<OperationCanceledException>());
+
+		// Check it's loadable still.
+		_tableIndex.Close(false);
+
+		_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
+			() => new HashListMemTable(PTableVersions.IndexV4, maxSize: 5),
+			() => fakeReader,
+			PTableVersions.IndexV4,
+			5, Constants.PTableMaxReaderCountDefault,
+			maxSizeForMemory: 2,
+			maxTablesPerLevel: 5);
+
+		_tableIndex.Initialize(long.MaxValue);
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_tableIndex.Close();
+
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void should_still_have_all_entries_in_sorted_order() {
+		var streamId = "testStream-1";
+		var result = _tableIndex.GetRange(streamId, 0, 5).ToArray();
+		var hash = (ulong)_lowHasher.Hash(streamId) << 32 | _highHasher.Hash(streamId);
+
+		Assert.That(result.Count(), Is.EqualTo(6));
+
+		Assert.That(result[0].Stream, Is.EqualTo(hash));
+		Assert.That(result[0].Version, Is.EqualTo(5));
+		Assert.That(result[0].Position, Is.EqualTo(500));
+
+		Assert.That(result[1].Stream, Is.EqualTo(hash));
+		Assert.That(result[1].Version, Is.EqualTo(4));
+		Assert.That(result[1].Position, Is.EqualTo(400));
+
+		Assert.That(result[2].Stream, Is.EqualTo(hash));
+		Assert.That(result[2].Version, Is.EqualTo(3));
+		Assert.That(result[2].Position, Is.EqualTo(300));
+
+		Assert.That(result[3].Stream, Is.EqualTo(hash));
+		Assert.That(result[3].Version, Is.EqualTo(2));
+		Assert.That(result[3].Position, Is.EqualTo(200));
+
+		Assert.That(result[4].Stream, Is.EqualTo(hash));
+		Assert.That(result[4].Version, Is.EqualTo(1));
+		Assert.That(result[4].Position, Is.EqualTo(100));
+
+		Assert.That(result[5].Stream, Is.EqualTo(hash));
+		Assert.That(result[5].Version, Is.EqualTo(0));
+		Assert.That(result[5].Position, Is.EqualTo(0));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_fails.cs b/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_fails.cs
new file mode 100644
index 00000000000..5e4d4c1a6ae
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_a_table_index_fails.cs
@@ -0,0 +1,132 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.Scavenge;
+
+[TestFixture(false)]
+[TestFixture(true)]
+class when_scavenging_a_table_index_fails : SpecificationWithDirectoryPerTestFixture {
+	private TableIndex<string> _tableIndex;
+	private IHasher<string> _lowHasher;
+	private IHasher<string> _highHasher;
+	private string _indexDir;
+	private FakeTFScavengerLog _log;
+	private readonly bool _useBloomFilter;
+
+	public when_scavenging_a_table_index_fails(bool useBloomFilter) {
+		_useBloomFilter = useBloomFilter;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_indexDir = PathName;
+
+		var fakeReader = new TFReaderLease(new FakeIndexReader());
+		_lowHasher = new XXHashUnsafe();
+		_highHasher = new Murmur3AUnsafe();
+		_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
+			() => new HashListMemTable(PTableVersions.IndexV4, maxSize: 5),
+			() => throw new Exception("Expected exception") /* throw an exception when the first PTable scavenge starts and tries to acquire a reader */,
+			PTableVersions.IndexV4,
+			5, Constants.PTableMaxReaderCountDefault,
+			maxSizeForMemory: 2,
+			maxTablesPerLevel: 5,
+			useBloomFilter: _useBloomFilter);
+		_tableIndex.Initialize(long.MaxValue);
+
+		_tableIndex.Add(1, "testStream-1", 0, 0);
+		_tableIndex.Add(1, "testStream-1", 1, 100);
+		_tableIndex.Add(1, "testStream-1", 2, 200);
+		_tableIndex.Add(1, "testStream-1", 3, 300);
+		_tableIndex.Add(1, "testStream-1", 4, 400);
+		_tableIndex.Add(1, "testStream-1", 5, 500);
+
+		_log = new FakeTFScavengerLog();
+		Assert.That(() => _tableIndex.Scavenge(_log, CancellationToken.None),
+			Throws.Exception.With.Message.EqualTo("Expected exception"));
+
+		// Check it's loadable still.
+		_tableIndex.Close(false);
+
+		_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
+			() => new HashListMemTable(PTableVersions.IndexV4, maxSize: 5),
+			() => fakeReader,
+			PTableVersions.IndexV4,
+			5, Constants.PTableMaxReaderCountDefault,
+			maxSizeForMemory: 2,
+			maxTablesPerLevel: 5,
+			useBloomFilter: _useBloomFilter);
+
+		_tableIndex.Initialize(long.MaxValue);
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_tableIndex.Close();
+
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void should_have_logged_a_failure() {
+		Assert.That(_log.ScavengedIndices.Count, Is.EqualTo(1));
+		Assert.That(_log.ScavengedIndices[0].Scavenged, Is.False);
+		Assert.That(_log.ScavengedIndices[0].Error, Is.EqualTo("Expected exception"));
+		Assert.That(_log.ScavengedIndices[0].EntriesDeleted, Is.EqualTo(0));
+	}
+
+	[Test]
+	public void should_still_have_all_entries_in_sorted_order() {
+		var streamId = "testStream-1";
+		var result = _tableIndex.GetRange(streamId, 0, 5).ToArray();
+		var hash = (ulong)_lowHasher.Hash(streamId) << 32 | _highHasher.Hash(streamId);
+
+		Assert.That(result.Count(), Is.EqualTo(6));
+
+		Assert.That(result[0].Stream, Is.EqualTo(hash));
+		Assert.That(result[0].Version, Is.EqualTo(5));
+		Assert.That(result[0].Position, Is.EqualTo(500));
+
+		Assert.That(result[1].Stream, Is.EqualTo(hash));
+		Assert.That(result[1].Version, Is.EqualTo(4));
+		Assert.That(result[1].Position, Is.EqualTo(400));
+
+		Assert.That(result[2].Stream, Is.EqualTo(hash));
+		Assert.That(result[2].Version, Is.EqualTo(3));
+		Assert.That(result[2].Position, Is.EqualTo(300));
+
+		Assert.That(result[3].Stream, Is.EqualTo(hash));
+		Assert.That(result[3].Version, Is.EqualTo(2));
+		Assert.That(result[3].Position, Is.EqualTo(200));
+
+		Assert.That(result[4].Stream, Is.EqualTo(hash));
+		Assert.That(result[4].Version, Is.EqualTo(1));
+		Assert.That(result[4].Position, Is.EqualTo(100));
+
+		Assert.That(result[5].Stream, Is.EqualTo(hash));
+		Assert.That(result[5].Version, Is.EqualTo(0));
+		Assert.That(result[5].Position, Is.EqualTo(0));
+	}
+
+	[Test]
+	public void old_index_tables_are_deleted() {
+		if (_useBloomFilter) {
+			Assert.That(Directory.EnumerateFiles(_indexDir).Count(), Is.EqualTo(7), "Expected IndexMap and 3 tables and 3 bloom filters.");
+		} else {
+			Assert.That(Directory.EnumerateFiles(_indexDir).Count(), Is.EqualTo(4), "Expected IndexMap and 3 tables.");
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_an_index.cs b/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_an_index.cs
new file mode 100644
index 00000000000..a968a75cf7a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_an_index.cs
@@ -0,0 +1,85 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using DotNext;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.Scavenge;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class when_scavenging_an_index : SpecificationWithDirectoryPerTestFixture {
+	private PTable _newtable;
+	private readonly byte _oldVersion;
+	private bool _skipIndexVerify;
+	private PTable _oldTable;
+
+	public when_scavenging_an_index(byte oldVersion, bool skipIndexVerify) {
+		_oldVersion = oldVersion;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var table = new HashListMemTable(_oldVersion, maxSize: 20);
+		table.Add(0x010100000000, 0, 1);
+		table.Add(0x010200000000, 0, 2);
+		table.Add(0x010300000000, 0, 3);
+		table.Add(0x010300000000, 1, 4);
+		_oldTable = PTable.FromMemtable(table, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault);
+
+		Func<IndexEntry, bool> existsAt = x => x.Position % 2 == 0;
+
+		(_newtable, _) = await PTable.Scavenged(_oldTable, GetTempFilePath(),
+			PTableVersions.IndexV4, existsAt.ToAsync(), skipIndexVerify: _skipIndexVerify,
+			initialReaders: Constants.PTableInitialReaderCount, maxReaders: Constants.PTableMaxReaderCountDefault,
+			useBloomFilter: true);
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_oldTable.Dispose();
+		_newtable.Dispose();
+
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void scavenged_ptable_is_newest_version() {
+		Assert.AreEqual(PTableVersions.IndexV4, _newtable.Version);
+	}
+
+	[Test]
+	public void there_are_2_records_in_the_merged_index() {
+		Assert.AreEqual(2, _newtable.Count);
+	}
+
+	[Test]
+	public void a_stream_can_be_found() {
+		var stream = (ulong)0x010300000000;
+		Assert.True(_newtable.TryGetLatestEntry(stream, out var entry));
+		Assert.AreEqual(stream, entry.Stream);
+		Assert.AreEqual(1, entry.Version);
+		Assert.AreEqual(4, entry.Position);
+	}
+
+	[Test]
+	public void the_items_are_sorted() {
+		var last = new IndexEntry(ulong.MaxValue, 0, long.MaxValue);
+		foreach (var item in _newtable.IterateAllInOrder()) {
+			Assert.IsTrue((last.Stream == item.Stream ? last.Version > item.Version : last.Stream > item.Stream) ||
+						  ((last.Stream == item.Stream && last.Version == item.Version) &&
+						   last.Position > item.Position));
+			last = item;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_an_index_fails.cs b/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_an_index_fails.cs
new file mode 100644
index 00000000000..6196abe3aa2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_an_index_fails.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using DotNext;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.Scavenge;
+
+[TestFixture]
+public class when_scavenging_an_index_fails : SpecificationWithDirectoryPerTestFixture {
+	private PTable _oldTable;
+	private string _expectedOutputFile;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var table = new HashListMemTable(PTableVersions.IndexV4, maxSize: 20);
+		table.Add(0x010100000000, 0, 1);
+		table.Add(0x010200000000, 0, 2);
+		table.Add(0x010300000000, 0, 3);
+		table.Add(0x010300000000, 1, 4);
+		_oldTable = PTable.FromMemtable(table, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault);
+
+		Func<IndexEntry, bool> existsAt = x => { throw new Exception("Expected exception"); };
+
+		_expectedOutputFile = GetTempFilePath();
+		var ex = Assert.ThrowsAsync<Exception>(async () => await PTable.Scavenged(_oldTable, _expectedOutputFile,
+			PTableVersions.IndexV4, existsAt.ToAsync(), initialReaders: Constants.PTableInitialReaderCount,
+			maxReaders: Constants.PTableMaxReaderCountDefault,
+			useBloomFilter: true));
+
+		Assert.AreEqual("Expected exception", ex?.Message);
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_oldTable.Dispose();
+
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void the_output_file_is_deleted() {
+		Assert.That(File.Exists(_expectedOutputFile), Is.False);
+		Assert.That(File.Exists(PTable.GenBloomFilterFilename(_expectedOutputFile)), Is.False);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_an_index_is_cancelled.cs b/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_an_index_is_cancelled.cs
new file mode 100644
index 00000000000..3d338eaf58a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_an_index_is_cancelled.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.Scavenge;
+
+[TestFixture]
+public class when_scavenging_an_index_is_cancelled : SpecificationWithDirectoryPerTestFixture {
+	private PTable _oldTable;
+	private string _expectedOutputFile;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var table = new HashListMemTable(PTableVersions.IndexV4, maxSize: 20);
+		table.Add(0x010100000000, 0, 1);
+		table.Add(0x010200000000, 0, 2);
+		table.Add(0x010300000000, 0, 3);
+		table.Add(0x010300000000, 1, 4);
+		_oldTable = PTable.FromMemtable(table, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault);
+
+		var cancellationTokenSource = new CancellationTokenSource();
+		Func<IndexEntry, bool> existsAt = x => {
+			cancellationTokenSource.Cancel();
+			return true;
+		};
+
+		_expectedOutputFile = GetTempFilePath();
+		Assert.ThrowsAsync<TaskCanceledException>(async () => await PTable.Scavenged(_oldTable, _expectedOutputFile,
+			PTableVersions.IndexV4, existsAt.ToAsync(), ct: cancellationTokenSource.Token,
+			initialReaders: Constants.PTableInitialReaderCount, maxReaders: Constants.PTableMaxReaderCountDefault,
+			useBloomFilter: true));
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_oldTable.Dispose();
+
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void the_output_file_is_deleted() {
+		Assert.That(File.Exists(_expectedOutputFile), Is.False);
+		Assert.That(File.Exists(PTable.GenBloomFilterFilename(_expectedOutputFile)), Is.False);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_an_index_removes_nothing.cs b/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_an_index_removes_nothing.cs
new file mode 100644
index 00000000000..d6d1bf7ab7e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Index/Scavenge/when_scavenging_an_index_removes_nothing.cs
@@ -0,0 +1,79 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using DotNext;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Index.Scavenge;
+
+[TestFixture(PTableVersions.IndexV2, false)]
+[TestFixture(PTableVersions.IndexV2, true)]
+[TestFixture(PTableVersions.IndexV3, false)]
+[TestFixture(PTableVersions.IndexV3, true)]
+[TestFixture(PTableVersions.IndexV4, false)]
+[TestFixture(PTableVersions.IndexV4, true)]
+public class when_scavenging_an_index_removes_nothing : SpecificationWithDirectoryPerTestFixture {
+	private PTable _newtable;
+	private readonly byte _oldVersion;
+	private bool _skipIndexVerify;
+	private PTable _oldTable;
+	private string _expectedOutputFile;
+
+	public when_scavenging_an_index_removes_nothing(byte oldVersion, bool skipIndexVerify) {
+		_oldVersion = oldVersion;
+		_skipIndexVerify = skipIndexVerify;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var table = new HashListMemTable(_oldVersion, maxSize: 20);
+		table.Add(0x010100000000, 0, 1);
+		table.Add(0x010200000000, 0, 2);
+		table.Add(0x010300000000, 0, 3);
+		table.Add(0x010300000000, 1, 4);
+		_oldTable = PTable.FromMemtable(table, GetTempFilePath(), Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault);
+
+		Func<IndexEntry, bool> existsAt = x => true;
+
+		_expectedOutputFile = GetTempFilePath();
+		(_newtable, var spaceSaved) = await PTable.Scavenged(_oldTable, _expectedOutputFile,
+			PTableVersions.IndexV4, existsAt.ToAsync(), skipIndexVerify: _skipIndexVerify,
+			initialReaders: Constants.PTableInitialReaderCount, maxReaders: Constants.PTableMaxReaderCountDefault);
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_oldTable.Dispose();
+		_newtable?.Dispose();
+
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void a_null_object_is_returned_if_the_version_is_unchanged() {
+		if (_oldVersion == PTableVersions.IndexV4) {
+			Assert.IsNull(_newtable);
+		}
+	}
+
+	[Test]
+	public void the_output_file_is_deleted_if_version_is_unchanged() {
+		if (_oldVersion == PTableVersions.IndexV4) {
+			Assert.That(File.Exists(_expectedOutputFile), Is.False);
+		}
+	}
+
+	[Test]
+	public void a_table_with_all_items_is_returned_with_a_newer_version() {
+		if (_oldVersion != PTableVersions.IndexV4) {
+			Assert.IsNotNull(_newtable);
+			Assert.That(_newtable.Count, Is.EqualTo(4));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Infrastructure/IRandTestFinishCondition.cs b/src/KurrentDB.Core.Tests/Infrastructure/IRandTestFinishCondition.cs
new file mode 100644
index 00000000000..829c8dddff2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Infrastructure/IRandTestFinishCondition.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Tests.Infrastructure;
+
+public interface IRandTestFinishCondition {
+	bool Done { get; }
+	bool Success { get; }
+
+	void Process(int iteration, RandTestQueueItem item);
+	void Log();
+}
diff --git a/src/KurrentDB.Core.Tests/Infrastructure/IRandTestItemProcessor.cs b/src/KurrentDB.Core.Tests/Infrastructure/IRandTestItemProcessor.cs
new file mode 100644
index 00000000000..7e5bd7315b2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Infrastructure/IRandTestItemProcessor.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+
+namespace KurrentDB.Core.Tests.Infrastructure;
+
+public interface IRandTestItemProcessor {
+	IEnumerable<RandTestQueueItem> ProcessedItems { get; }
+
+	void Process(int iteration, RandTestQueueItem item);
+	void LogMessages();
+}
diff --git a/src/KurrentDB.Core.Tests/Infrastructure/RandTestQueueItem.cs b/src/KurrentDB.Core.Tests/Infrastructure/RandTestQueueItem.cs
new file mode 100644
index 00000000000..7f326efb329
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Infrastructure/RandTestQueueItem.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Tests.Infrastructure;
+
+public class RandTestQueueItem {
+	public readonly int LogicalTime;
+	public readonly int GlobalId;
+	public readonly EndPoint EndPoint;
+	public readonly Message Message;
+	public readonly IPublisher Bus;
+
+	public RandTestQueueItem(int logicalTime, int globalId, EndPoint endPoint, Message message, IPublisher bus) {
+		LogicalTime = logicalTime;
+		GlobalId = globalId;
+		EndPoint = endPoint;
+		Message = message;
+		Bus = bus;
+	}
+
+	public override string ToString() {
+		return string.Format("{0}-{1} :{2} to {3}", LogicalTime, GlobalId, Message, EndPoint.GetPort());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Infrastructure/RandomTestRunner.cs b/src/KurrentDB.Core.Tests/Infrastructure/RandomTestRunner.cs
new file mode 100644
index 00000000000..fb1af66f8dd
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Infrastructure/RandomTestRunner.cs
@@ -0,0 +1,59 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Net;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Tests.Infrastructure;
+
+public class RandomTestRunner {
+	private readonly int _maxIterCnt;
+	private readonly PairingHeap<RandTestQueueItem> _queue;
+
+	private int _iter;
+	private int _curLogicalTime;
+	private int _globalMsgId;
+
+	public RandomTestRunner(int maxIterCnt) {
+		_maxIterCnt = maxIterCnt;
+		_queue = new PairingHeap<RandTestQueueItem>(new GlobalQueueItemComparer());
+	}
+
+	public bool Run(IRandTestFinishCondition finishCondition, params IRandTestItemProcessor[] processors) {
+		Ensure.NotNull(finishCondition, "finishCondition");
+
+		while (++_iter <= _maxIterCnt && _queue.Count > 0) {
+			var item = _queue.DeleteMin();
+			_curLogicalTime = item.LogicalTime;
+			foreach (var processor in processors) {
+				processor.Process(_iter, item);
+			}
+
+			finishCondition.Process(_iter, item);
+			if (finishCondition.Done)
+				break;
+
+			item.Bus.Publish(item.Message);
+		}
+
+		return finishCondition.Success;
+	}
+
+	public void Enqueue(EndPoint endPoint, Message message, IPublisher bus, int timeDelay = 1) {
+		Debug.Assert(timeDelay >= 1);
+		_queue.Add(new RandTestQueueItem(_curLogicalTime + timeDelay, _globalMsgId++, endPoint, message, bus));
+	}
+
+	private class GlobalQueueItemComparer : IComparer<RandTestQueueItem> {
+		public int Compare(RandTestQueueItem x, RandTestQueueItem y) {
+			if (x.LogicalTime == y.LogicalTime)
+				return x.GlobalId - y.GlobalId;
+			return x.LogicalTime - y.LogicalTime;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Integration/Idempotency/when_soft_deleted_stream_is_written_to_idempotently.cs b/src/KurrentDB.Core.Tests/Integration/Idempotency/when_soft_deleted_stream_is_written_to_idempotently.cs
new file mode 100644
index 00000000000..8912c487e6b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Integration/Idempotency/when_soft_deleted_stream_is_written_to_idempotently.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.UserManagement;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Integration.Idempotency;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_soft_deleted_stream_is_written_to_idempotently<TLogFormat, TStreamId> : specification_with_a_single_node<TLogFormat, TStreamId> {
+	private readonly string _streamId;
+	private readonly Event[] _events;
+
+	public when_soft_deleted_stream_is_written_to_idempotently() {
+		_streamId = $"{nameof(when_soft_deleted_stream_is_written_to_idempotently<TLogFormat, TStreamId>)}-{Guid.NewGuid()}";
+		_events = new[] { new Event(Guid.NewGuid(), "event-type", false, new byte[] { }, new byte[] { }) };
+	}
+
+	protected override async Task Given() {
+		var writeEventsCompleted = new TaskCompletionSource<bool>();
+		_node.Node.MainQueue.Publish(new ClientMessage.WriteEvents(Guid.NewGuid(), Guid.NewGuid(),
+			new CallbackEnvelope(
+				_ => {
+					writeEventsCompleted.SetResult(true);
+				}), false, _streamId, ExpectedVersion.NoStream, _events, SystemAccounts.System));
+
+		await writeEventsCompleted.Task
+			.WithTimeout(TimeSpan.FromSeconds(2));
+
+		var deleteStreamCompleted = new TaskCompletionSource<bool>();
+		_node.Node.MainQueue.Publish(new ClientMessage.DeleteStream(Guid.NewGuid(), Guid.NewGuid(),
+			new CallbackEnvelope(
+				_ => {
+					deleteStreamCompleted.SetResult(true);
+				}), false, _streamId, ExpectedVersion.Any, false, SystemAccounts.System));
+
+		await deleteStreamCompleted.Task
+			.WithTimeout(TimeSpan.FromSeconds(2));
+	}
+
+	[Test]
+	public async Task should_return_negative_1_as_log_position() {
+		var writeEventsCompleted = new TaskCompletionSource<ClientMessage.WriteEventsCompleted>();
+
+		_node.Node.MainQueue.Publish(new ClientMessage.WriteEvents(Guid.NewGuid(), Guid.NewGuid(),
+			new CallbackEnvelope(
+				msg => {
+					writeEventsCompleted.SetResult(msg as ClientMessage.WriteEventsCompleted);
+				}), false, _streamId, ExpectedVersion.NoStream, _events, SystemAccounts.System));
+
+		var completed = await writeEventsCompleted.Task
+			.WithTimeout(TimeSpan.FromSeconds(2));
+
+		Assert.AreEqual(-1, completed.CommitPosition);
+		Assert.AreEqual(-1, completed.PreparePosition);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Integration/authenticated_requests_made_from_a_follower.cs b/src/KurrentDB.Core.Tests/Integration/authenticated_requests_made_from_a_follower.cs
new file mode 100644
index 00000000000..72ba40ce402
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Integration/authenticated_requests_made_from_a_follower.cs
@@ -0,0 +1,166 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+using EventStore.Client;
+using EventStore.Client.Streams;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.SystemData;
+using Google.Protobuf;
+using Grpc.Core;
+using Grpc.Net.Client;
+using KurrentDB.Core.Services.Transport.Grpc;
+using NUnit.Framework;
+using ContentType = KurrentDB.Transport.Http.ContentType;
+using StatusCode = Grpc.Core.StatusCode;
+
+namespace KurrentDB.Core.Tests.Integration;
+
+public abstract class authenticated_requests_made_from_a_follower<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
+	private const string ProtectedStream = "$foo";
+
+	private static readonly string AuthorizationHeaderValue =
+		$"Basic {Convert.ToBase64String(Encoding.ASCII.GetBytes("admin:changeit"))}";
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class via_http_should : authenticated_requests_made_from_a_follower<TLogFormat, TStreamId> {
+		private HttpStatusCode _statusCode;
+
+		protected override async Task Given() {
+			var node = GetFollowers()[0];
+			await Task.WhenAll(node.AdminUserCreated, node.Started);
+			using var httpClient = new HttpClient(new SocketsHttpHandler {
+				SslOptions = {
+					RemoteCertificateValidationCallback = delegate { return true; }
+				}
+			}, true) {
+				BaseAddress = new Uri($"https://{node.HttpEndPoint}/"),
+				DefaultRequestHeaders = {
+					Authorization = AuthenticationHeaderValue.Parse(AuthorizationHeaderValue)
+				}
+			};
+
+			var content = JsonSerializer.SerializeToUtf8Bytes(new[] {
+				new {
+					eventId = Guid.NewGuid(),
+					data = new{},
+					metadata = new{},
+					eventType = "-"
+				}
+			}, new JsonSerializerOptions {
+				PropertyNamingPolicy = JsonNamingPolicy.CamelCase
+			});
+
+			using var response = await httpClient.PostAsync($"/streams/{ProtectedStream}",
+				new ReadOnlyMemoryContent(content) {
+					Headers = { ContentType = new MediaTypeHeaderValue(ContentType.EventsJson) }
+				});
+
+			_statusCode = response.StatusCode;
+		}
+
+		[Test]
+		[Retry(5)]
+		public void work() => Assert.AreEqual(HttpStatusCode.Created, _statusCode);
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class via_grpc_should : authenticated_requests_made_from_a_follower<TLogFormat, TStreamId> {
+		private Status _status;
+
+		protected override async Task Given() {
+			var node = GetFollowers()[0];
+			await Task.WhenAll(node.AdminUserCreated, node.Started);
+
+			using var channel = GrpcChannel.ForAddress(new Uri($"https://{node.HttpEndPoint}"),
+				new GrpcChannelOptions {
+					HttpClient = new HttpClient(new SocketsHttpHandler {
+						SslOptions = {
+							RemoteCertificateValidationCallback = delegate { return true; }
+						}
+					}, true)
+				});
+			var streamClient = new Streams.StreamsClient(channel);
+			using var call = streamClient.Append(new CallOptions(
+				credentials: CallCredentials.FromInterceptor((_, metadata) => {
+					metadata.Add("authorization", AuthorizationHeaderValue);
+					return Task.CompletedTask;
+				}),
+				deadline: DateTime.UtcNow.AddSeconds(10)));
+
+			await call.RequestStream.WriteAsync(new AppendReq {
+				Options = new AppendReq.Types.Options {
+					NoStream = new Empty(),
+					StreamIdentifier = new StreamIdentifier {
+						StreamName = ByteString.CopyFromUtf8(ProtectedStream)
+					}
+				}
+			});
+			await call.RequestStream.WriteAsync(new AppendReq {
+				ProposedMessage = new AppendReq.Types.ProposedMessage {
+					Id = new UUID {
+						String = Uuid.FromGuid(Guid.NewGuid()).ToString()
+					},
+					CustomMetadata = ByteString.Empty,
+					Data = ByteString.Empty,
+					Metadata = {
+						{Core.Services.Transport.Grpc.Constants.Metadata.Type, "-"}, {
+							Core.Services.Transport.Grpc.Constants.Metadata.ContentType,
+							Core.Services.Transport.Grpc.Constants.Metadata.ContentTypes
+								.ApplicationOctetStream
+						}
+					}
+				}
+			});
+			await call.RequestStream.CompleteAsync();
+			await call.ResponseHeadersAsync;
+			await call.ResponseAsync;
+			_status = call.GetStatus();
+
+			await base.Given();
+		}
+
+		[Test]
+		[Retry(5)]
+		public void work() => Assert.AreEqual(StatusCode.OK, _status.StatusCode);
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class via_tcp_should : authenticated_requests_made_from_a_follower<TLogFormat, TStreamId> {
+		private Exception _caughtException;
+
+		protected override async Task Given() {
+			var node = GetFollowers()[0];
+			await Task.WhenAll(node.AdminUserCreated, node.Started);
+
+			using var connection = EventStoreConnection.Create(ConnectionSettings.Create()
+					.DisableServerCertificateValidation()
+					.PreferFollowerNode(),
+				node.ExternalTcpEndPoint);
+			await connection.ConnectAsync();
+
+			try {
+				await connection.AppendToStreamAsync(ProtectedStream, ExpectedVersion.NoStream,
+					new UserCredentials("admin", "changeit"),
+					new EventData(Guid.NewGuid(), "-", false, Array.Empty<byte>(), Array.Empty<byte>()));
+			} catch (Exception ex) {
+				_caughtException = ex;
+			}
+
+			await base.Given();
+		}
+
+		[Test]
+		[Retry(5)]
+		public void work() => Assert.Null(_caughtException);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Integration/specification_with_a_single_node.cs b/src/KurrentDB.Core.Tests/Integration/specification_with_a_single_node.cs
new file mode 100644
index 00000000000..fb17317e0e6
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Integration/specification_with_a_single_node.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Integration;
+
+public abstract class specification_with_a_single_node<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	protected MiniNode<TLogFormat, TStreamId> _node;
+
+	protected virtual TimeSpan Timeout { get; } = TimeSpan.FromSeconds(3);
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName, dbPath: Path.Combine(PathName, "db"), inMemDb: false);
+
+		BeforeNodeStarts();
+
+		await _node.Start();
+
+		try {
+			await Given().WithTimeout(Timeout);
+		} catch (Exception ex) {
+			throw new Exception("Given Failed", ex);
+		}
+	}
+
+	protected virtual void BeforeNodeStarts() {
+	}
+
+	protected virtual Task Given() => Task.CompletedTask;
+
+	protected async Task ShutdownNode() {
+		await _node.Shutdown(keepDb: true);
+		_node = null;
+	}
+
+	protected Task StartNode() {
+		if (_node == null)
+			_node = new MiniNode<TLogFormat, TStreamId>(PathName, dbPath: Path.Combine(PathName, "db"), inMemDb: false);
+
+		BeforeNodeStarts();
+
+		return _node.Start();
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await _node.Shutdown();
+		_node = null;
+		await base.TestFixtureTearDown();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Integration/specification_with_cluster.cs b/src/KurrentDB.Core.Tests/Integration/specification_with_cluster.cs
new file mode 100644
index 00000000000..dafde3c988f
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Integration/specification_with_cluster.cs
@@ -0,0 +1,186 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.Plugins.Subsystems;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Integration;
+
+public abstract class specification_with_cluster<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	protected readonly MiniClusterNode<TLogFormat, TStreamId>[] _nodes = new MiniClusterNode<TLogFormat, TStreamId>[3];
+	protected readonly Endpoints[] _nodeEndpoints = new Endpoints[3];
+	protected IEventStoreConnection _conn;
+
+	private readonly Dictionary<int, Func<bool, MiniClusterNode<TLogFormat, TStreamId>>> _nodeCreationFactory = new();
+
+	protected class Endpoints {
+		public readonly IPEndPoint InternalTcp;
+		public readonly IPEndPoint ExternalTcp;
+		public readonly IPEndPoint HttpEndPoint;
+
+		public IEnumerable<int> Ports() {
+			yield return InternalTcp.Port;
+			yield return ExternalTcp.Port;
+			yield return HttpEndPoint.Port;
+		}
+
+		private readonly List<Socket> _sockets;
+
+		public Endpoints() {
+			_sockets = new List<Socket>();
+
+			var defaultLoopBack = new IPEndPoint(IPAddress.Loopback, 0);
+
+			var internalTcp = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+			internalTcp.Bind(defaultLoopBack);
+			_sockets.Add(internalTcp);
+
+			var externalTcp = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+			externalTcp.Bind(defaultLoopBack);
+			_sockets.Add(externalTcp);
+
+			var httpEndPoint = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+			httpEndPoint.Bind(defaultLoopBack);
+			_sockets.Add(httpEndPoint);
+
+			InternalTcp = CopyEndpoint((IPEndPoint)internalTcp.LocalEndPoint);
+			ExternalTcp = CopyEndpoint((IPEndPoint)externalTcp.LocalEndPoint);
+			HttpEndPoint = CopyEndpoint((IPEndPoint)httpEndPoint.LocalEndPoint);
+		}
+
+		public void DisposeSockets() {
+			foreach (var socket in _sockets) {
+				socket.Dispose();
+			}
+		}
+
+		private static IPEndPoint CopyEndpoint(IPEndPoint endpoint) =>
+			new(endpoint.Address, endpoint.Port);
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		MiniNodeLogging.Setup();
+
+		_nodeEndpoints[0] = new Endpoints();
+		_nodeEndpoints[1] = new Endpoints();
+		_nodeEndpoints[2] = new Endpoints();
+
+		_nodeEndpoints[0].DisposeSockets();
+		_nodeEndpoints[1].DisposeSockets();
+		_nodeEndpoints[2].DisposeSockets();
+
+		var duplicates = _nodeEndpoints[0].Ports().Concat(_nodeEndpoints[1].Ports())
+			.Concat(_nodeEndpoints[2].Ports())
+			.GroupBy(x => x)
+			.Where(g => g.Count() > 1)
+			.Select(x => x.Key)
+			.ToList();
+
+		Assert.IsEmpty(duplicates);
+
+		_nodeCreationFactory.Add(0, wait => CreateNode(0,
+			_nodeEndpoints[0], new[] { _nodeEndpoints[1].HttpEndPoint, _nodeEndpoints[2].HttpEndPoint },
+			wait));
+		_nodeCreationFactory.Add(1, wait => CreateNode(1,
+			_nodeEndpoints[1], new[] { _nodeEndpoints[0].HttpEndPoint, _nodeEndpoints[2].HttpEndPoint },
+			wait));
+		_nodeCreationFactory.Add(2, wait => CreateNode(2,
+			_nodeEndpoints[2], new[] { _nodeEndpoints[0].HttpEndPoint, _nodeEndpoints[1].HttpEndPoint },
+			wait));
+
+		_nodes[0] = _nodeCreationFactory[0](true);
+		_nodes[1] = _nodeCreationFactory[1](true);
+		_nodes[2] = _nodeCreationFactory[2](true);
+
+		BeforeNodesStart();
+
+		await _nodes[0].Start();
+		await _nodes[1].Start();
+		await _nodes[2].Start();
+
+		try {
+			await Task.WhenAll(_nodes.Select(x => x.Started)).WithTimeout(TimeSpan.FromSeconds(60));
+		} catch (TimeoutException ex) {
+			if (_nodes.Select(x => x.Started).Count() < 2) {
+				MiniNodeLogging.WriteLogs();
+				throw new TimeoutException($"Cluster nodes did not start. Statuses: {_nodes[0].NodeState}/{_nodes[1].NodeState}/{_nodes[2].NodeState}", ex);
+			}
+		}
+
+		// wait for cluster to be fully operational, tests depend on leader and followers
+		AssertEx.IsOrBecomesTrue(() => _nodes.Any(x => x.NodeState == VNodeState.Leader),
+			timeout: TimeSpan.FromSeconds(30),
+			onFail: MiniNodeLogging.WriteLogs,
+			msg: "Waiting for leader timed out!");
+
+		//flaky: most tests only need 1 follower, waiting for 2 causes timeouts
+		AssertEx.IsOrBecomesTrue(() =>
+				_nodes.Any(x => x.NodeState is VNodeState.Follower or VNodeState.ReadOnlyReplica),
+			timeout: TimeSpan.FromSeconds(90),
+			onFail: MiniNodeLogging.WriteLogs,
+			msg: $"Waiting for followers timed out! States={string.Join(", ", _nodes.Select(n => n.NodeState))}");
+
+		_conn = CreateConnection();
+		await _conn.ConnectAsync();
+
+		await Given().WithTimeout(TimeSpan.FromMinutes(2), onFail: MiniNodeLogging.WriteLogs);
+	}
+
+	protected virtual IEventStoreConnection CreateConnection() =>
+		EventStoreConnection.Create(_nodes[0].ExternalTcpEndPoint);
+
+	protected virtual void BeforeNodesStart() {
+	}
+
+	protected virtual Task Given() => Task.CompletedTask;
+
+	protected Task ShutdownNode(int nodeNum) => _nodes[nodeNum].Shutdown(keepDb: true);
+
+	protected virtual MiniClusterNode<TLogFormat, TStreamId> CreateNode(int index, Endpoints endpoints, EndPoint[] gossipSeeds,
+		bool wait = true) => new(
+		PathName, index, endpoints.InternalTcp,
+		endpoints.ExternalTcp, endpoints.HttpEndPoint,
+		subsystems: Array.Empty<ISubsystem>(), gossipSeeds: gossipSeeds, inMemDb: false);
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		_conn?.Close();
+		await Task.WhenAll(
+			_nodes[0].Shutdown(),
+			_nodes[1].Shutdown(),
+			_nodes[2].Shutdown());
+
+		MiniNodeLogging.Clear();
+
+		await base.TestFixtureTearDown();
+	}
+
+	protected static void WaitIdle() {
+	}
+
+	protected MiniClusterNode<TLogFormat, TStreamId> GetLeader() {
+		var leader = _nodes.First(x => x.NodeState == VNodeState.Leader);
+		Assert.NotNull(leader, "Cluster doesn't have a leader available!");
+
+		return leader;
+	}
+
+	protected MiniClusterNode<TLogFormat, TStreamId>[] GetFollowers() {
+		var followers = _nodes.Where(x => x.NodeState == VNodeState.Follower).ToArray();
+		Assert.IsNotEmpty(followers, "Cluster doesn't have followers available!");
+
+		return followers;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Integration/when_a_leader_is_shutdown.cs b/src/KurrentDB.Core.Tests/Integration/when_a_leader_is_shutdown.cs
new file mode 100644
index 00000000000..35b6cd23d64
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Integration/when_a_leader_is_shutdown.cs
@@ -0,0 +1,85 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Integration;
+
+[Category("LongRunning"), Ignore("Flaky test - e.g. if multiple elections take place")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_a_leader_is_shutdown<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
+	private List<Guid> _epochIds = new List<Guid>();
+	private List<string> _roleAssignments = new List<string>();
+	private CountdownEvent _expectedNumberOfEvents;
+	private object _lock = new object();
+
+	protected override void BeforeNodesStart() {
+		_nodes.ToList().ForEach(x => {
+			x.Node.MainBus.Subscribe(new AdHocHandler<SystemMessage.BecomeLeader>(Handle));
+			x.Node.MainBus.Subscribe(new AdHocHandler<SystemMessage.BecomeFollower>(Handle));
+			x.Node.MainBus.Subscribe(new AdHocHandler<SystemMessage.EpochWritten>(Handle));
+		});
+
+		_expectedNumberOfEvents = new CountdownEvent(3 /*role assignments*/ + 1 /*epoch write*/);
+		base.BeforeNodesStart();
+	}
+
+	protected override async Task Given() {
+		_expectedNumberOfEvents.Wait(5000);
+		var leader = _nodes.First(x => x.NodeState == VNodeState.Leader);
+		await ShutdownNode(leader.DebugIndex);
+		_expectedNumberOfEvents = new CountdownEvent(2 /*role assignments*/ + 1 /*epoch write*/);
+		_expectedNumberOfEvents.Wait(5000);
+		await base.Given();
+	}
+
+	private void Handle(SystemMessage.BecomeLeader msg) {
+		lock (_lock) {
+			_roleAssignments.Add("leader");
+		}
+
+		_expectedNumberOfEvents?.Signal();
+	}
+
+	private void Handle(SystemMessage.BecomeFollower msg) {
+		lock (_lock) {
+			_roleAssignments.Add("follower");
+		}
+
+		_expectedNumberOfEvents?.Signal();
+	}
+
+	private void Handle(SystemMessage.EpochWritten msg) {
+		lock (_lock) {
+			_epochIds.Add(msg.Epoch.EpochId);
+		}
+
+		_expectedNumberOfEvents?.Signal();
+	}
+
+	[Test]
+	public void should_assign_leader_and_follower_roles_correctly() {
+		Assert.AreEqual(5, _roleAssignments.Count());
+
+		Assert.AreEqual(1, _roleAssignments.Take(3).Where(x => x.Equals("leader")).Count());
+		Assert.AreEqual(2, _roleAssignments.Take(3).Where(x => x.Equals("follower")).Count());
+
+		//after shutting down
+		Assert.AreEqual(1, _roleAssignments.Skip(3).Take(2).Where(x => x.Equals("leader")).Count());
+		Assert.AreEqual(1, _roleAssignments.Skip(3).Take(2).Where(x => x.Equals("follower")).Count());
+	}
+
+	[Test]
+	public void should_have_two_unique_epoch_writes() {
+		Assert.AreEqual(2, _epochIds.Distinct().Count());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Integration/when_a_single_node_is_restarted_multiple_times.cs b/src/KurrentDB.Core.Tests/Integration/when_a_single_node_is_restarted_multiple_times.cs
new file mode 100644
index 00000000000..8bdf50b789e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Integration/when_a_single_node_is_restarted_multiple_times.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Integration;
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_a_single_node_is_restarted_multiple_times<TLogFormat, TStreamId> : specification_with_a_single_node<TLogFormat, TStreamId> {
+	private List<Guid> _epochIds = new List<Guid>();
+	private const int _numberOfNodeStarts = 5;
+	private readonly AutoResetEvent _waitForStart = new AutoResetEvent(false);
+
+	protected override TimeSpan Timeout { get; } = TimeSpan.FromMinutes(1);
+
+	protected override void BeforeNodeStarts() {
+		_node.Node.MainBus.Subscribe(new AdHocHandler<SystemMessage.EpochWritten>(Handle));
+		base.BeforeNodeStarts();
+	}
+
+	protected override async Task Given() {
+		for (int i = 0; i < _numberOfNodeStarts - 1; i++) {
+			_waitForStart.WaitOne(5000);
+			await ShutdownNode();
+			await StartNode();
+		}
+
+		_waitForStart.WaitOne(5000);
+		await base.Given();
+	}
+
+	private void Handle(SystemMessage.EpochWritten msg) {
+		_epochIds.Add(msg.Epoch.EpochId);
+		_waitForStart.Set();
+	}
+
+	[Test]
+	public void should_be_a_different_epoch_for_every_startup() {
+		Assert.AreEqual(_numberOfNodeStarts, _epochIds.Distinct().Count());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Integration/when_a_single_node_is_shutdown.cs b/src/KurrentDB.Core.Tests/Integration/when_a_single_node_is_shutdown.cs
new file mode 100644
index 00000000000..7d71f064a66
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Integration/when_a_single_node_is_shutdown.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Integration;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_a_single_node_is_shutdown<TLogFormat, TStreamId> : SpecificationWithDirectory {
+	[Test]
+	public async Task throws_on_timeout() {
+		var node = new MiniNode<TLogFormat, TStreamId>(PathName);
+		try {
+			await node.Start();
+
+			var shutdownTask = node.Node.StopAsync(TimeSpan.FromMilliseconds(1));
+			Assert.ThrowsAsync<TimeoutException>(() => shutdownTask);
+		} finally {
+			await node.Shutdown();
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Integration/when_cluster_nodes_are_restarted.cs b/src/KurrentDB.Core.Tests/Integration/when_cluster_nodes_are_restarted.cs
new file mode 100644
index 00000000000..28e4e281e91
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Integration/when_cluster_nodes_are_restarted.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Integration;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_restarting_one_node_at_a_time<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
+	protected override async Task Given() {
+		await base.Given();
+
+		for (int i = 0; i < 9; i++) {
+			await Task.Delay(2000); //flaky: temporary fix for getting stable cluster
+
+			await _nodes[i % 3].Shutdown(keepDb: true);
+			await Task.Delay(2000);
+
+			var node = CreateNode(i % 3, _nodeEndpoints[i % 3],
+				new[] { _nodeEndpoints[(i + 1) % 3].HttpEndPoint, _nodeEndpoints[(i + 2) % 3].HttpEndPoint });
+			await node.Start();
+			_nodes[i % 3] = node;
+
+			await Task.WhenAll(_nodes.Select(x => x.Started)).WithTimeout(TimeSpan.FromSeconds(30));
+		}
+	}
+
+	[Test]
+	public void cluster_should_stabilize() {
+		var leaders = 0;
+		var followers = 0;
+		var acceptedStates = new[] { VNodeState.Leader, VNodeState.Follower };
+
+		for (int i = 0; i < 3; i++) {
+			AssertEx.IsOrBecomesTrue(() => acceptedStates.Contains(_nodes[i].NodeState),
+				TimeSpan.FromSeconds(5), $"node {i} failed to become a leader/follower");
+
+			var state = _nodes[i].NodeState;
+			if (state == VNodeState.Leader)
+				leaders++;
+			else if (state == VNodeState.Follower)
+				followers++;
+			else
+				throw new Exception($"node {i} in unexpected state {state}");
+		}
+
+		Assert.AreEqual(1, leaders);
+		Assert.AreEqual(2, followers);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Integration/when_node_becomes_leader_with_unindexed_data.cs b/src/KurrentDB.Core.Tests/Integration/when_node_becomes_leader_with_unindexed_data.cs
new file mode 100644
index 00000000000..a8c444f3dcf
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Integration/when_node_becomes_leader_with_unindexed_data.cs
@@ -0,0 +1,309 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+using EventStore.Client.Streams;
+using EventStore.Plugins.Subsystems;
+using Google.Protobuf;
+using Grpc.Core;
+using Grpc.Net.Client;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Transport.Grpc;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+using Empty = EventStore.Client.Empty;
+using GrpcMetadata = KurrentDB.Core.Services.Transport.Grpc.Constants.Metadata;
+using RecordedEvent = EventStore.Client.Streams.ReadResp.Types.ReadEvent.Types.RecordedEvent;
+
+namespace KurrentDB.Core.Tests.Integration;
+
+[Explicit]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_node_becomes_leader_with_unindexed_data<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
+	private const string FakeHostAdvertiseAs = "192.168.123.123";
+	private const string Username = "admin";
+	private const string Password = "changeit";
+
+	private const string AuthenticationScheme = "Basic";
+	private readonly string AuthenticationValue = Convert.ToBase64String(Encoding.ASCII.GetBytes($"{Username}:{Password}"));
+	private class CommitTimeoutException : Exception { }
+	private class WrongExpectedVersionException : Exception { }
+
+	private EndPoint[][] _nodeGossipSeeds;
+	private HttpClient _httpClient;
+
+	protected override async Task Given() {
+		_nodeGossipSeeds = new[] {
+			new EndPoint[] {_nodeEndpoints[1].HttpEndPoint, _nodeEndpoints[2].HttpEndPoint},
+			new EndPoint[] {_nodeEndpoints[0].HttpEndPoint, _nodeEndpoints[2].HttpEndPoint},
+			new EndPoint[] {_nodeEndpoints[0].HttpEndPoint, _nodeEndpoints[1].HttpEndPoint}
+		};
+		_httpClient = new HttpClient(new SocketsHttpHandler {
+			SslOptions = {
+				RemoteCertificateValidationCallback = delegate { return true; }
+			}
+		}, true);
+		await base.Given();
+	}
+
+	private CallOptions GetCallOptions() {
+		return new(
+			credentials: CallCredentials.FromInterceptor((_, metadata) => {
+				metadata.Add("authorization", $"{AuthenticationScheme} {AuthenticationValue}");
+				return Task.CompletedTask;
+			}),
+			deadline: DateTime.UtcNow.AddSeconds(5));
+	}
+
+	private async Task AppendEvent(IPEndPoint endpoint, string stream, long expectedVersion) {
+		using var channel = GrpcChannel.ForAddress(new Uri($"https://{endpoint}"),
+			new GrpcChannelOptions { HttpClient = _httpClient });
+		var streamClient = new Streams.StreamsClient(channel);
+		using var call = streamClient.Append(GetCallOptions());
+
+		var optionsAppendReq = new AppendReq {
+			Options = new() {
+				StreamIdentifier = new() {
+					StreamName = ByteString.CopyFromUtf8(stream)
+				},
+			}
+		};
+		switch (expectedVersion) {
+			case ExpectedVersion.Any:
+				optionsAppendReq.Options.Any = new Empty();
+				break;
+			case ExpectedVersion.NoStream:
+				optionsAppendReq.Options.NoStream = new Empty();
+				break;
+			default:
+				optionsAppendReq.Options.Revision = (ulong)expectedVersion;
+				break;
+		}
+
+		await call.RequestStream.WriteAsync(optionsAppendReq);
+		await call.RequestStream.WriteAsync(new AppendReq {
+			ProposedMessage = new() {
+				Id = new() {
+					String = Uuid.FromGuid(Guid.NewGuid()).ToString()
+				},
+				Data = ByteString.Empty,
+				Metadata = {
+					[GrpcMetadata.Type] = "type",
+					[GrpcMetadata.ContentType] = GrpcMetadata.ContentTypes.ApplicationJson
+				}
+			}
+		});
+
+		await call.RequestStream.CompleteAsync();
+		try {
+			var appendResp = await call.ResponseAsync;
+			switch (appendResp.ResultCase) {
+				case AppendResp.ResultOneofCase.Success:
+					return;
+				case AppendResp.ResultOneofCase.WrongExpectedVersion:
+					throw new WrongExpectedVersionException();
+			}
+		} catch (RpcException ex) when (ex.Status.StatusCode == StatusCode.DeadlineExceeded) {
+			throw new CommitTimeoutException();
+		}
+	}
+
+	private async Task<IEnumerable<RecordedEvent>> ReadAllEvents(IPEndPoint endpoint) {
+		using var channel = GrpcChannel.ForAddress(new Uri($"https://{endpoint}"),
+			new GrpcChannelOptions { HttpClient = _httpClient });
+		var streamClient = new Streams.StreamsClient(channel);
+
+		using var call = streamClient.Read(new ReadReq {
+			Options = new() {
+				All = new() {
+					Start = new Empty()
+				},
+				ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
+				Count = ulong.MaxValue,
+				NoFilter = new Empty(),
+				UuidOption = new() { Structured = new() }
+			}
+		}, GetCallOptions());
+
+		return await (from response in call.ResponseStream.ReadAllAsync() where response.Event != null select response.Event.Event).ToListAsync();
+	}
+
+	private MiniClusterNode<TLogFormat, TStreamId> CreateNode(int index, Endpoints endpoints, EndPoint[] gossipSeeds,
+		int nodePriority, string intHostAdvertiseAs) => new(
+		PathName, index, endpoints.InternalTcp,
+		endpoints.ExternalTcp, endpoints.HttpEndPoint,
+		subsystems: Array.Empty<ISubsystem>(), gossipSeeds: gossipSeeds, inMemDb: false,
+		nodePriority: nodePriority, intHostAdvertiseAs: intHostAdvertiseAs);
+
+	private async Task StartNode(int i, int priority, string intHostAdvertiseAs = null) {
+		_nodes[i] = CreateNode(i, _nodeEndpoints[i], _nodeGossipSeeds[i], priority, intHostAdvertiseAs);
+		await _nodes[i].Start();
+	}
+
+	private async Task<HttpStatusCode> GetLiveStatus(IPEndPoint httpEndPoint) {
+		var response = await _httpClient.GetAsync($"https://{httpEndPoint}/health/live");
+		return response.StatusCode;
+	}
+
+	private async Task WaitForAllNodesToBeLive() {
+		for (int i = 0; i < 3; i++) {
+			await WaitForNodeToBeLive(i);
+		}
+	}
+
+	private async Task WaitForNodeToBeLive(int idx) {
+		while (await GetLiveStatus(_nodes[idx].HttpEndPoint) != HttpStatusCode.NoContent) {
+			await Task.Delay(100);
+		}
+	}
+
+	private async Task WaitForAllNodesToBeCaughtUp(int maxIdx = 3) {
+		while (true) {
+			var prevWriter = long.MinValue;
+			var prevChaser = long.MinValue;
+			var caughtUp = true;
+			for (int i = 0; i < maxIdx; i++) {
+				var writer = _nodes[i].Db.Config.WriterCheckpoint.ReadNonFlushed();
+				var chaser = _nodes[i].Db.Config.ChaserCheckpoint.ReadNonFlushed();
+
+				if (prevWriter == long.MinValue)
+					prevWriter = writer;
+				if (prevChaser == long.MinValue)
+					prevChaser = chaser;
+				if (chaser != writer || writer != prevWriter) {
+					caughtUp = false;
+				}
+			}
+
+			if (caughtUp)
+				break;
+			await Task.Delay(100);
+		}
+	}
+
+	private async Task ShutdownNode(int i, bool keepDb) => await _nodes[i].Shutdown(keepDb: keepDb);
+
+	private async Task ShutdownAllNodes(int maxIdx = 3, bool keepDb = false) {
+		for (int i = 0; i < maxIdx; i++) {
+			await ShutdownNode(i, keepDb);
+		}
+	}
+
+	private async Task ResignLeader(int leaderIdx) {
+		var httpEndPoint = _nodes[leaderIdx].HttpEndPoint;
+		var request = new HttpRequestMessage(HttpMethod.Post, $"https://{httpEndPoint}/admin/node/resign") {
+			Content = new StringContent(""),
+			Headers = {
+				Authorization = new AuthenticationHeaderValue(AuthenticationScheme, AuthenticationValue)
+			}
+		};
+
+		var response = await _httpClient.SendAsync(request);
+		if (response.StatusCode != HttpStatusCode.OK) {
+			throw new Exception($"Unexpected status code: {response.StatusCode}");
+		}
+
+		var start = DateTime.UtcNow;
+		while (_nodes[leaderIdx].NodeState != VNodeState.Unknown && DateTime.UtcNow - start < TimeSpan.FromSeconds(2)) {
+			await Task.Delay(100);
+		}
+	}
+
+	[SetUp]
+	public async Task SetUp() {
+		// reset the node states between tests
+		for (int i = 0; i < 3; i++) {
+			await _nodes[i].Shutdown(keepDb: false);
+		}
+
+		for (int i = 0; i < 3; i++) {
+			_nodes[i] = CreateNode(i, _nodeEndpoints[i], _nodeGossipSeeds[i], 0, null);
+			await _nodes[i].Start();
+		}
+	}
+
+	[TestCase(true)]
+	[TestCase(false)]
+	[Explicit, Category("LongRunning"), Timeout(80000), NonParallelizable]
+	public async Task new_events_should_have_correct_event_numbers(bool appendInitialEvent) {
+		await WaitForAllNodesToBeLive();
+
+		if (appendInitialEvent) {
+			// append event 0@test
+			await AppendEvent(_nodes[0].HttpEndPoint, "test", ExpectedVersion.NoStream);
+		}
+
+		await WaitForAllNodesToBeCaughtUp();
+		await ShutdownAllNodes(keepDb: true);
+
+		// make node 1 become the leader by setting its priority to 1
+		// node 0 can't become a follower since it can't replicate over internal TCP due to the fake --int-host-advertise-as
+		await StartNode(0, priority: 0, intHostAdvertiseAs: FakeHostAdvertiseAs);
+		await StartNode(1, priority: 1, intHostAdvertiseAs: FakeHostAdvertiseAs);
+
+		try {
+			await WaitForNodeToBeLive(1).WithTimeout(TimeSpan.FromSeconds(10));
+			Assert.AreEqual(VNodeState.Leader, _nodes[1].NodeState);
+		} catch (TimeoutException) {
+			// want to get stuck in preleader since replication isn't possible
+			Assert.AreEqual(VNodeState.PreLeader, _nodes[1].NodeState);
+			return;
+		}
+
+		// append event 1@test. Expect a commit timeout since there is no quorum.
+		Assert.ThrowsAsync<CommitTimeoutException>(async () => {
+			await AppendEvent(_nodes[1].HttpEndPoint, "test", appendInitialEvent ? 0 : ExpectedVersion.NoStream);
+		});
+
+		// resign the leader node so that it goes into the Unknown state and to trigger new elections
+		await ResignLeader(1);
+
+		// wait for the node to become Leader again
+		while (_nodes[1].NodeState != VNodeState.Leader) {
+			await Task.Delay(100);
+		}
+
+		// append event 1@test again. Expect a commit timeout since there is no quorum.
+		Assert.ThrowsAsync<CommitTimeoutException>(async () => {
+			await AppendEvent(_nodes[1].HttpEndPoint, "test", appendInitialEvent ? 0 : ExpectedVersion.NoStream);
+		});
+
+		// shut down both nodes
+		await ShutdownAllNodes(maxIdx: 2, keepDb: true);
+
+		// start both nodes again without the fake --int-host-advertise-as so that they can form a cluster
+		await StartNode(0, priority: 0);
+		await StartNode(1, priority: 1);
+		try {
+			await _nodes[0].Started.WithTimeout(TimeSpan.FromSeconds(10));
+			await _nodes[1].Started.WithTimeout(TimeSpan.FromSeconds(10));
+		} catch (TimeoutException) {
+			// this is expected in logv3 because by creating the duplicate events above we also
+			// created duplicate stream records which it will detect and complain about it
+			throw new Exception($"Couldn't start one or more nodes: {_nodes[0].NodeState} {_nodes[1].NodeState}");
+		}
+		Assert.AreEqual(VNodeState.Follower, _nodes[0].NodeState);
+		Assert.AreEqual(VNodeState.Leader, _nodes[1].NodeState);
+
+		// wait for data replication
+		await WaitForAllNodesToBeCaughtUp(maxIdx: 2);
+
+		// read "test" events from $all
+		var events =
+			(await ReadAllEvents(_nodes[1].HttpEndPoint))
+			.Where(x => x.StreamIdentifier!.StreamName.ToStringUtf8() == "test").ToArray();
+
+		Assert.AreEqual(appendInitialEvent ? 3 : 2, events.Length);
+		for (int i = 0; i < (appendInitialEvent ? 3 : 2); i++) {
+			Assert.AreEqual(i, events[i].StreamRevision, $"i = {i}, revision = {events[i].StreamRevision}");
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/KurrentDB.Core.Tests.csproj b/src/KurrentDB.Core.Tests/KurrentDB.Core.Tests.csproj
new file mode 100644
index 00000000000..86a898de7ff
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/KurrentDB.Core.Tests.csproj
@@ -0,0 +1,74 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="EventStore.Client" Version="21.2.0" />
+		<PackageReference Include="FluentAssertions" Version="6.12.0" />
+		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
+		<PackageReference Include="Grpc.Core" Version="2.46.6" />
+		<PackageReference Include="Grpc.Net.Client" Version="2.64.0" />
+		<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
+		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+		<PackageReference Include="NUnit" Version="3.14.0" />
+		<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+		<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.23" />
+		<PackageReference Include="Google.Protobuf" Version="3.27.2" />
+		<PackageReference Include="Grpc.Tools" Version="2.65.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Scrutor" Version="5.0.2" />
+		<PackageReference Include="Serilog.Sinks.InMemory" Version="0.11.0" />
+		<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
+		<!-- Workaround because there's no compiler support for the IgnoresAccessChecksTo attribute. -->
+		<!-- See: https://github.com/aelij/IgnoresAccessChecksToGenerator?tab=readme-ov-file -->
+		<PackageReference Include="IgnoresAccessChecksToGenerator" Version="0.8.0" PrivateAssets="All" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.Common\KurrentDB.Common.csproj" />
+		<ProjectReference Include="..\KurrentDB.Core\KurrentDB.Core.csproj" />
+		<ProjectReference Include="..\KurrentDB.PluginHosting\KurrentDB.PluginHosting.csproj" />
+		<ProjectReference Include="..\KurrentDB.Transport.Http\KurrentDB.Transport.Http.csproj" />
+		<ProjectReference Include="..\KurrentDB.Transport.Tcp\KurrentDB.Transport.Tcp.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Include="Services\Transport\Tcp\test_certificates\**\*.crt" />
+		<EmbeddedResource Include="Services\Transport\Tcp\test_certificates\**\*.key" />
+		<EmbeddedResource Remove="FakePlugin\**" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="..\KurrentDB.Common\Utils\version.properties">
+		  <Link>version.properties</Link>
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Include="TestConfigs\*.yaml">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="TestCertificates\*.*">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="Resources\es-tile.png">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="swagger.yaml">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+	<ItemGroup>
+		<None Remove="FakePlugin\**" />
+		<Compile Remove="FakePlugin\**" />
+		<Content Include="FakePlugin\**" CopyToOutputDirectory="Always" />
+	</ItemGroup>
+	<ItemGroup>
+		<IgnoresAccessChecksTo Include="EventStore.ClientAPI" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.Core.Tests/LogFormatHelper.cs b/src/KurrentDB.Core.Tests/LogFormatHelper.cs
new file mode 100644
index 00000000000..3fb34bab0aa
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/LogFormatHelper.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.LogAbstraction;
+using LogV3StreamId = System.UInt32;
+
+namespace KurrentDB.Core.Tests;
+
+public class LogFormat {
+	public class V2 { }
+	public class V3 { }
+}
+
+public static class LogFormatHelper<TLogFormat, TStreamId> {
+	public static bool IsV2 => typeof(TLogFormat) == typeof(LogFormat.V2);
+	public static bool IsV3 => typeof(TLogFormat) == typeof(LogFormat.V3);
+
+	// static v3 but private so that we can be sure we only hand out stateless parts of it
+	readonly static LogFormatAbstractor<LogV3StreamId> _v3 = new LogV3FormatAbstractorFactory().Create(new() {
+		InMemory = true,
+	});
+
+	readonly static LogFormatAbstractor<string> _v2 = new LogV2FormatAbstractorFactory().Create(new() {
+		InMemory = true,
+	});
+
+	public static T Choose<T>(object v2, object v3) {
+		if (typeof(TLogFormat) == typeof(LogFormat.V2)) {
+			if (typeof(TStreamId) != typeof(string))
+				throw new InvalidOperationException();
+			return (T)v2;
+		}
+		if (typeof(TLogFormat) == typeof(LogFormat.V3)) {
+			if (typeof(TStreamId) != typeof(LogV3StreamId))
+				throw new InvalidOperationException($"TStreamId was {typeof(TStreamId)} but expected {typeof(LogV3StreamId)}");
+			return (T)v3;
+		}
+		throw new InvalidOperationException();
+	}
+
+	private static LogFormatAbstractor<TStreamId> _staticLogFormat =
+		Choose<LogFormatAbstractor<TStreamId>>(_v2, _v3);
+
+	public static ILogFormatAbstractorFactory<TStreamId> LogFormatFactory { get; } =
+		Choose<ILogFormatAbstractorFactory<TStreamId>>(new LogV2FormatAbstractorFactory(), new LogV3FormatAbstractorFactory());
+
+	// safe because stateless
+	public static IRecordFactory<TStreamId> RecordFactory { get; } = _staticLogFormat.RecordFactory;
+
+	// safe because stateless
+	public static bool SupportsExplicitTransactions { get; } = _staticLogFormat.SupportsExplicitTransactions;
+
+	// safe because stateless
+	public static TStreamId EmptyStreamId { get; } = _staticLogFormat.EmptyStreamId;
+
+	/// just a valid stream id
+	public static TStreamId StreamId { get; } = Choose<TStreamId>("stream", 1024U);
+	public static TStreamId StreamId2 { get; } = Choose<TStreamId>("stream2", 1026U);
+
+	public static TStreamId EventTypeId { get; } = Choose<TStreamId>("eventType", 1024U);
+	public static TStreamId EventTypeId2 { get; } = Choose<TStreamId>("eventType2", 1025U);
+	public static TStreamId EmptyEventTypeId { get; } = _staticLogFormat.EmptyEventTypeId;
+
+	public static void CheckIfExplicitTransactionsSupported() {
+		if (typeof(TLogFormat) == typeof(LogFormat.V3)) {
+			throw new InvalidOperationException("Explicit transactions are not supported yet by Log V3");
+		}
+	}
+
+	public static void EnsureV0PrepareSupported() {
+		if (typeof(TLogFormat) == typeof(LogFormat.V3)) {
+			throw new InvalidOperationException("No such thing as a V0 prepare in LogV3");
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/ReadIndexExtensions.cs b/src/KurrentDB.Core.Tests/ReadIndexExtensions.cs
new file mode 100644
index 00000000000..d237967d433
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/ReadIndexExtensions.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+
+namespace KurrentDB.Core.Tests;
+
+// Extensions to perform streamlookups inline
+// mainly to facilitate conversion of existing LogV2 tests.
+public static class IReadIndexExtensions {
+	public static ValueTask<bool> IsStreamDeleted<TStreamId>(this IReadIndex<TStreamId> self, string streamName, CancellationToken token) {
+		var streamId = self.GetStreamId(streamName);
+		return self.IsStreamDeleted(streamId, token);
+	}
+
+	public static ValueTask<long> GetStreamLastEventNumber<TStreamId>(this IReadIndex<TStreamId> self, string streamName, CancellationToken token) {
+		var streamId = self.GetStreamId(streamName);
+		return self.GetStreamLastEventNumber(streamId, token);
+	}
+
+	public static ValueTask<IndexReadEventResult> ReadEvent<TStreamId>(this IReadIndex<TStreamId> self, string streamName, long eventNumber, CancellationToken token) {
+		var streamId = self.GetStreamId(streamName);
+		return self.ReadEvent(streamName, streamId, eventNumber, token);
+	}
+
+	public static ValueTask<IndexReadStreamResult> ReadStreamEventsForward<TStreamId>(this IReadIndex<TStreamId> self, string streamName, long fromEventNumber, int maxCount, CancellationToken token) {
+		var streamId = self.GetStreamId(streamName);
+		return self.ReadStreamEventsForward(streamName, streamId, fromEventNumber, maxCount, token);
+	}
+
+	public static ValueTask<IndexReadStreamResult> ReadStreamEventsBackward<TStreamId>(this IReadIndex<TStreamId> self, string streamName, long fromEventNumber, int maxCount, CancellationToken token) {
+		var streamId = self.GetStreamId(streamName);
+		return self.ReadStreamEventsBackward(streamName, streamId, fromEventNumber, maxCount, token);
+	}
+
+	public static ValueTask<StreamMetadata> GetStreamMetadata<TStreamId>(this IReadIndex<TStreamId> self, string streamName, CancellationToken token) {
+		var streamId = self.GetStreamId(streamName);
+		return self.GetStreamMetadata(streamId, token);
+	}
+
+	public static List<CommitEventRecord> EventRecords(this IndexReadAllResult result) {
+		return result.Records
+			.Where(r => r.Event.EventStreamId != SystemStreams.StreamsCreatedStream
+						&& r.Event.EventStreamId != SystemStreams.EventTypesStream).ToList();
+	}
+}
diff --git a/src/EventStore.ClusterNode.Web/clusternode-web/es-tile.png b/src/KurrentDB.Core.Tests/Resources/es-tile.png
similarity index 100%
rename from src/EventStore.ClusterNode.Web/clusternode-web/es-tile.png
rename to src/KurrentDB.Core.Tests/Resources/es-tile.png
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/ClusterSettings.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/ClusterSettings.cs
new file mode 100644
index 00000000000..57a8fac8099
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/ClusterSettings.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService;
+
+public sealed class ClusterSettings {
+	public string ClusterDns { get; }
+
+	public ClusterVNodeSettings Self { get; }
+	public ClusterVNodeSettings[] GroupMembers { get; }
+
+	public IPEndPoint ClusterManager { get; }
+
+	public int ClusterNodesCount { get; }
+
+	public ClusterSettings(string clusterDns,
+		IPEndPoint clusterManager,
+		ClusterVNodeSettings self,
+		ClusterVNodeSettings[] groupMembers,
+		int expectedNodesCount) {
+		if (string.IsNullOrWhiteSpace(clusterDns))
+			throw new ArgumentException($"Wrong cluster DNS name: {clusterDns}", clusterDns);
+		if (self == null)
+			throw new ArgumentNullException(nameof(self));
+		if (groupMembers == null)
+			throw new ArgumentNullException(nameof(groupMembers));
+		if (clusterManager == null)
+			throw new ArgumentNullException(nameof(clusterManager));
+
+		ClusterDns = clusterDns;
+		Self = self;
+		GroupMembers = groupMembers;
+		ClusterManager = clusterManager;
+		ClusterNodesCount = expectedNodesCount;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/ClusterSettingsFactory.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/ClusterSettingsFactory.cs
new file mode 100644
index 00000000000..4d82438b8ae
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/ClusterSettingsFactory.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Net;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService;
+
+public class ClusterSettingsFactory {
+	private const int ManagerPort = 1001;
+	private const int StartingPort = 1002;
+
+	private static ClusterVNodeSettings CreateVNode(int nodeNumber, bool isReadOnlyReplica) {
+		int tcpIntPort = StartingPort + nodeNumber * 2,
+			tcpExtPort = tcpIntPort + 1,
+			httpPort = tcpIntPort + 11;
+
+		return new ClusterVNodeSettings(Guid.NewGuid(), 0,
+			GetLoopbackForPort(tcpIntPort), null,
+			GetLoopbackForPort(tcpExtPort), null,
+			GetLoopbackForPort(httpPort), 0,
+			isReadOnlyReplica);
+	}
+
+	private static IPEndPoint GetLoopbackForPort(int port) => new(IPAddress.Loopback, port);
+
+	public static ClusterSettings GetClusterSettings(int selfIndex, int nodesCount, bool isSelfReadOnlyReplica) {
+		if (selfIndex < 0 || selfIndex >= nodesCount)
+			throw new ArgumentOutOfRangeException("selfIndex", "Index of self should be in range of created nodes");
+
+		var clusterManager = GetLoopbackForPort(ManagerPort);
+		var nodes = Enumerable.Range(0, nodesCount).Select(x =>
+			x == selfIndex ? CreateVNode(x, isSelfReadOnlyReplica) : CreateVNode(x, false)).ToArray();
+
+		var self = nodes[selfIndex];
+		var others = nodes.Where((_, i) => i != selfIndex).ToArray();
+
+		return new ClusterSettings("test-dns", clusterManager, self, others, nodes.Length);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/ClusterVNodeSettings.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/ClusterVNodeSettings.cs
new file mode 100644
index 00000000000..3ba23a8d23c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/ClusterVNodeSettings.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService;
+
+public class ClusterVNodeSettings {
+	public readonly VNodeInfo NodeInfo;
+
+	public readonly int NodePriority;
+
+	public readonly bool ReadOnlyReplica;
+
+	public ClusterVNodeSettings(Guid instanceId, int debugIndex,
+		IPEndPoint internalTcpEndPoint,
+		IPEndPoint internalSecureTcpEndPoint,
+		IPEndPoint externalTcpEndPoint,
+		IPEndPoint externalSecureTcpEndPoint,
+		IPEndPoint httpEndPoint,
+		int nodePriority,
+		bool readOnlyReplica) {
+		Ensure.NotEmptyGuid(instanceId, "instanceId");
+		Ensure.Equal(false, internalTcpEndPoint == null && internalSecureTcpEndPoint == null, "Both internal TCP endpoints are null");
+
+		Ensure.NotNull(httpEndPoint, nameof(httpEndPoint));
+
+		NodeInfo = new VNodeInfo(instanceId, debugIndex,
+			internalTcpEndPoint, internalSecureTcpEndPoint,
+			externalTcpEndPoint, externalSecureTcpEndPoint,
+			httpEndPoint,
+			readOnlyReplica);
+
+
+		NodePriority = nodePriority;
+		ReadOnlyReplica = readOnlyReplica;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/ElectionServiceUnit.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/ElectionServiceUnit.cs
new file mode 100644
index 00000000000..fefa93f7e91
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/ElectionServiceUnit.cs
@@ -0,0 +1,206 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService;
+
+public class ElectionsServiceUnit {
+	private const int LastCommitPosition = -1;
+	private const int WriterCheckpoint = 0;
+	private const int ChaserCheckpoint = 0;
+	private const int ProposalCheckpoint = -1;
+	private static readonly DateTime InitialDate = new DateTime(2012, 6, 1);
+
+	public ClusterInfo ClusterInfo { get; private set; }
+
+	public EndPoint OwnEndPoint {
+		get { return InitialClusterSettings.Self.NodeInfo.HttpEndPoint; }
+	}
+
+	protected KurrentDB.Core.Services.ElectionsService ElectionsService;
+
+	public readonly FakePublisher Publisher;
+	public readonly List<Message> InputMessages;
+
+	private readonly SynchronousScheduler _bus;
+
+	protected readonly ClusterSettings InitialClusterSettings;
+	protected readonly ClusterInfo InitialClusterInfo;
+
+	public ElectionsServiceUnit(ClusterSettings clusterSettings) {
+		Publisher = new FakePublisher();
+
+		_bus = new(GetType().Name);
+		var memberInfo = MemberInfo.Initial(clusterSettings.Self.NodeInfo.InstanceId, InitialDate,
+			VNodeState.Unknown, true,
+			clusterSettings.Self.NodeInfo.InternalTcp,
+			clusterSettings.Self.NodeInfo.InternalSecureTcp,
+			clusterSettings.Self.NodeInfo.ExternalTcp,
+			clusterSettings.Self.NodeInfo.ExternalSecureTcp,
+			clusterSettings.Self.NodeInfo.HttpEndPoint, null, 0, 0,
+			clusterSettings.Self.NodePriority,
+			clusterSettings.Self.ReadOnlyReplica);
+		ElectionsService = new KurrentDB.Core.Services.ElectionsService(Publisher,
+			memberInfo,
+			clusterSettings.ClusterNodesCount,
+			new InMemoryCheckpoint(WriterCheckpoint),
+			new InMemoryCheckpoint(ChaserCheckpoint),
+			new InMemoryCheckpoint(ProposalCheckpoint),
+			new FakeEpochManager(),
+			() => -1, 0, new FakeTimeProvider(),
+			TimeSpan.FromMilliseconds(1_000));
+		ElectionsService.SubscribeMessages(_bus);
+
+		InputMessages = new List<Message>();
+
+		InitialClusterSettings = clusterSettings;
+		InitialClusterInfo = BuildClusterInfo(clusterSettings);
+		ClusterInfo = new ClusterInfo(InitialClusterInfo.Members);
+	}
+
+	private ClusterInfo BuildClusterInfo(ClusterSettings clusterSettings) {
+		var members =
+			(new[] {
+				MemberInfo.ForManager(Guid.Empty, InitialDate, true, clusterSettings.ClusterManager)
+			})
+			.Union(new[] {
+				MemberInfo.ForVNode(clusterSettings.Self.NodeInfo.InstanceId,
+					InitialDate,
+					VNodeState.Unknown,
+					true,
+					clusterSettings.Self.NodeInfo.InternalTcp,
+					clusterSettings.Self.NodeInfo.InternalSecureTcp,
+					clusterSettings.Self.NodeInfo.ExternalTcp,
+					clusterSettings.Self.NodeInfo.ExternalSecureTcp,
+					clusterSettings.Self.NodeInfo.HttpEndPoint, null, 0, 0,
+					LastCommitPosition, WriterCheckpoint, ChaserCheckpoint,
+					-1,
+					-1,
+					Guid.Empty, 0, false)
+			})
+			.Union(clusterSettings.GroupMembers
+				.Select(x => MemberInfo.ForVNode(x.NodeInfo.InstanceId,
+					InitialDate,
+					VNodeState.Unknown,
+					true,
+					x.NodeInfo.InternalTcp,
+					x.NodeInfo.InternalSecureTcp,
+					x.NodeInfo.ExternalTcp,
+					x.NodeInfo.ExternalSecureTcp,
+					x.NodeInfo.HttpEndPoint, null, 0, 0,
+					LastCommitPosition, WriterCheckpoint, ChaserCheckpoint,
+					-1,
+					-1,
+					Guid.Empty, 0, false)));
+
+		var ordered = members.OrderBy(x =>
+			string.Format("{0}:{1}", x.HttpEndPoint.ToString(), x.HttpEndPoint.GetPort()));
+
+		return new ClusterInfo(ordered.ToArray());
+	}
+
+	public void Publish(Message message) {
+		InputMessages.Add(message);
+		_bus.Publish(message);
+	}
+
+	public void Publish(IEnumerable<Message> messages) {
+		foreach (var message in messages) {
+			Publish(message);
+		}
+	}
+
+	public T[] ClearMessageFromQueue<T>() {
+		return ClearMessageFromQueue(x => (x is T)).Cast<T>().ToArray();
+	}
+
+	public Message[] ClearMessageFromQueue(Func<Message, bool> predicate) {
+		var removedList = new List<Message>();
+		var removedCount = 0;
+		var index = 0;
+		foreach (var message in Publisher.Messages.ToList()) {
+			if (predicate(message)) {
+				removedList.Add(message);
+				Publisher.Messages.RemoveAt(index - removedCount);
+
+				removedCount += 1;
+			}
+
+			index += 1;
+		}
+
+		return removedList.ToArray();
+	}
+
+	public void RepublishFromPublisher(bool skipScheduledMessages = false) {
+		var messages = new List<Message>();
+		messages.AddRange(Publisher.Messages);
+		Publisher.Messages.Clear();
+
+		messages.Where(x => !(x is TimerMessage.Schedule)).ToList()
+			.ForEach(x => {
+				messages.Remove(x);
+				Publish(x);
+			});
+
+		if (skipScheduledMessages == false) {
+			messages.OfType<TimerMessage.Schedule>().ToList()
+				.ForEach(x => {
+					messages.Remove(x);
+					x.Reply();
+				});
+		}
+	}
+
+	public bool IsCurrent(IPEndPoint endPoint) {
+		return InitialClusterSettings.Self.NodeInfo.Is(endPoint);
+	}
+
+	public MemberInfo GetNodeAt(int index) {
+		return InitialClusterInfo.Members.Where(x => x.State != VNodeState.Manager).ElementAt(index);
+	}
+
+	public IEnumerable<MemberInfo> ListMembers(Func<MemberInfo, bool> predicate = null) {
+		predicate = predicate ?? (x => true);
+		return ClusterInfo.Members.Where(predicate).Select(x =>
+			x.State == VNodeState.Manager
+				? MemberInfo.ForManager(x.InstanceId, x.TimeStamp, x.IsAlive,
+					x.HttpEndPoint)
+				: MemberInfo.ForVNode(x.InstanceId, x.TimeStamp, x.State, x.IsAlive,
+					x.InternalTcpEndPoint, x.InternalSecureTcpEndPoint,
+					x.ExternalTcpEndPoint, x.ExternalSecureTcpEndPoint,
+					x.HttpEndPoint, null, 0, 0,
+					x.LastCommitPosition, x.WriterCheckpoint, x.ChaserCheckpoint,
+					x.EpochPosition, x.EpochNumber, x.EpochId, x.NodePriority, x.IsReadOnlyReplica));
+	}
+
+	public IEnumerable<MemberInfo> ListAliveMembers(Func<MemberInfo, bool> predicate = null) {
+		return ListMembers(predicate).Where(x => x.IsAlive);
+	}
+
+	public void UpdateClusterMemberInfo(int nodeIndex,
+		VNodeState? role = null,
+		bool? isAlive = null,
+		long? writerCheckpoint = null,
+		long? chaserCheckpoint = null) {
+		ClusterInfo.Members[nodeIndex] = ClusterInfo.Members[nodeIndex].Updated(
+			DateTime.UtcNow,
+			state: role,
+			isAlive: isAlive,
+			writerCheckpoint: writerCheckpoint,
+			chaserCheckpoint: chaserCheckpoint);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/ElectionsServiceTests.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/ElectionsServiceTests.cs
new file mode 100644
index 00000000000..55bb01bcf3c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/ElectionsServiceTests.cs
@@ -0,0 +1,1507 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Net;
+using FluentAssertions;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService;
+
+public abstract class ElectionsFixture {
+	protected readonly VNodeInfo _node;
+	protected readonly VNodeInfo _nodeTwo;
+	protected readonly VNodeInfo _nodeThree;
+	protected FakeTimeProvider _timeProvider;
+	protected KurrentDB.Core.Services.ElectionsService _sut;
+	private ISubscriber _bus;
+	protected FakePublisher _publisher;
+	protected Guid _epochId;
+	protected TimeSpan LeaderElectionProgressTimeout = TimeSpan.FromMilliseconds(1_000);
+
+	protected static Func<int, VNodeInfo> NodeFactory = (id) => new VNodeInfo(
+		Guid.Parse($"00000000-0000-0000-0000-00000000000{id}"), id,
+		new IPEndPoint(IPAddress.Loopback, id),
+		new IPEndPoint(IPAddress.Loopback, id),
+		new IPEndPoint(IPAddress.Loopback, id),
+		new IPEndPoint(IPAddress.Loopback, id),
+		new IPEndPoint(IPAddress.Loopback, id), false);
+
+	protected static readonly Func<VNodeInfo, DateTime, VNodeState, bool, int, Guid, int, MemberInfo> MemberInfoFromVNode =
+		(nodeInfo, timestamp, state, isAlive, epochNumber, epochId, priority) => MemberInfo.ForVNode(
+			nodeInfo.InstanceId, timestamp, state, isAlive,
+			nodeInfo.InternalTcp,
+			nodeInfo.InternalSecureTcp, nodeInfo.ExternalTcp, nodeInfo.ExternalSecureTcp,
+			nodeInfo.HttpEndPoint, null, 0, 0,
+			0, 0, 0, 0, epochNumber, epochId, priority,
+			nodeInfo.IsReadOnlyReplica);
+
+	protected ElectionsFixture(VNodeInfo node, VNodeInfo nodeTwo, VNodeInfo nodeThree) {
+		_timeProvider = new FakeTimeProvider();
+		_publisher = new FakePublisher();
+		_bus = new InMemoryBus("Test");
+		_epochId = Guid.NewGuid();
+
+		_node = node;
+		_nodeTwo = nodeTwo;
+		_nodeThree = nodeThree;
+		_sut = new KurrentDB.Core.Services.ElectionsService(_publisher,
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0), 3,
+			new InMemoryCheckpoint(0),
+			new InMemoryCheckpoint(0),
+			new InMemoryCheckpoint(-1),
+			new FakeEpochManager(), () => 0L, 0, _timeProvider,
+			LeaderElectionProgressTimeout);
+		_sut.SubscribeMessages(_bus);
+	}
+}
+
+public class when_starting_elections : ElectionsFixture {
+	public when_starting_elections()
+		: base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_send_view_change_to_other_members() {
+		_sut.Handle(new ElectionMessage.StartElections());
+
+		var expected = new Message[] {
+			new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint,
+				new ElectionMessage.ViewChange(_node.InstanceId, _node.HttpEndPoint, 0),
+				_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
+			new GrpcMessage.SendOverGrpc(_nodeThree.HttpEndPoint,
+				new ElectionMessage.ViewChange(_node.InstanceId, _node.HttpEndPoint, 0),
+				_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
+			TimerMessage.Schedule.Create(
+				LeaderElectionProgressTimeout,
+				_publisher,
+				new ElectionMessage.ElectionsTimedOut(0)),
+		};
+
+		_publisher.Messages.Should().BeEquivalentTo(expected);
+	}
+}
+
+public class when_system_init : ElectionsFixture {
+	public when_system_init()
+		: base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new SystemMessage.SystemInit());
+	}
+
+	[Test]
+	public void should_start_view_change_proof_timer() {
+		var expected = new Message[] {
+			TimerMessage.Schedule.Create(
+				KurrentDB.Core.Services.ElectionsService.SendViewChangeProofInterval,
+				_publisher,
+				new ElectionMessage.SendViewChangeProof()),
+		};
+		_publisher.Messages.Should().BeEquivalentTo(expected);
+	}
+}
+
+public class when_starting_elections_after_elections_have_started : ElectionsFixture {
+	public when_starting_elections_after_elections_have_started()
+		: base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_starting_elections() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_publisher.Messages.Clear();
+		_sut.Handle(new ElectionMessage.StartElections());
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_node_is_shutting_down_and_starting_elections : ElectionsFixture {
+	public when_node_is_shutting_down_and_starting_elections()
+		: base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_starting_elections() {
+		_sut.Handle(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), false, false));
+		_sut.Handle(new ElectionMessage.StartElections());
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_node_is_shutting_down_and_elections_timed_out : ElectionsFixture {
+	public when_node_is_shutting_down_and_elections_timed_out() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_elections_timed_out() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_publisher.Messages.Clear();
+		_sut.Handle(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), false, false));
+		_sut.Handle(new ElectionMessage.ElectionsTimedOut(0));
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_elections_timeout_for_a_different_view_than_last_attempted_view : ElectionsFixture {
+	public when_elections_timeout_for_a_different_view_than_last_attempted_view() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_elections_timed_out() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_publisher.Messages.Clear();
+		_sut.Handle(new ElectionMessage.ElectionsTimedOut(1));
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_elections_timeout : ElectionsFixture {
+	public when_elections_timeout() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_send_new_view_change_to_other_members() {
+		var view = 0;
+		var newView = view + 1;
+		_sut.Handle(new ElectionMessage.StartElections());
+		_publisher.Messages.Clear();
+		_sut.Handle(new ElectionMessage.ElectionsTimedOut(view));
+
+		var expected = new Message[] {
+			new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint,
+				new ElectionMessage.ViewChange(_node.InstanceId, _node.HttpEndPoint, newView),
+				_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
+			new GrpcMessage.SendOverGrpc(_nodeThree.HttpEndPoint,
+				new ElectionMessage.ViewChange(_node.InstanceId, _node.HttpEndPoint, newView),
+				_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
+			TimerMessage.Schedule.Create(
+				LeaderElectionProgressTimeout,
+				_publisher,
+				new ElectionMessage.ElectionsTimedOut(1)),
+		};
+		_publisher.Messages.Should().BeEquivalentTo(expected);
+	}
+}
+
+public class when_node_is_shutting_down_and_view_change_proof_is_triggered : ElectionsFixture {
+	public when_node_is_shutting_down_and_view_change_proof_is_triggered() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_view_change_proof() {
+		_sut.Handle(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), false, false));
+		_sut.Handle(new ElectionMessage.SendViewChangeProof());
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_view_change_proof_is_triggered_and_the_first_election_has_not_completed : ElectionsFixture {
+	public when_view_change_proof_is_triggered_and_the_first_election_has_not_completed() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_schedule_another_view_change_proof() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_publisher.Messages.Clear();
+		_sut.Handle(new ElectionMessage.SendViewChangeProof());
+
+		var expected = new Message[] {
+			TimerMessage.Schedule.Create(
+				KurrentDB.Core.Services.ElectionsService.SendViewChangeProofInterval,
+				_publisher,
+				new ElectionMessage.SendViewChangeProof()),
+		};
+		_publisher.Messages.Should().BeEquivalentTo(expected);
+	}
+}
+
+public class when_view_change_proof_is_triggered_and_the_first_election_has_completed : ElectionsFixture {
+	public when_view_change_proof_is_triggered_and_the_first_election_has_completed() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_send_view_change_proof_to_other_members() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0, 0,
+			_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
+		var proposalHttpMessage = _publisher.Messages.OfType<GrpcMessage.SendOverGrpc>()
+			.FirstOrDefault(x => x.Message is ElectionMessage.Proposal);
+		var proposalMessage = (ElectionMessage.Proposal)proposalHttpMessage.Message;
+		_publisher.Messages.Clear();
+		_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+			proposalMessage.LeaderId, proposalMessage.LeaderHttpEndPoint, 0));
+		_publisher.Messages.Clear();
+		_sut.Handle(new ElectionMessage.SendViewChangeProof());
+
+		var expected = new Message[] {
+			new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint,
+				new ElectionMessage.ViewChangeProof(_node.InstanceId, _node.HttpEndPoint, 0),
+				_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
+			new GrpcMessage.SendOverGrpc(_nodeThree.HttpEndPoint,
+				new ElectionMessage.ViewChangeProof(_node.InstanceId, _node.HttpEndPoint, 0),
+				_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
+			TimerMessage.Schedule.Create(
+				KurrentDB.Core.Services.ElectionsService.SendViewChangeProofInterval,
+				_publisher,
+				new ElectionMessage.SendViewChangeProof()),
+		};
+		_publisher.Messages.Should().BeEquivalentTo(expected);
+	}
+}
+
+public class when_receiving_view_change_and_shutting_down : ElectionsFixture {
+	public when_receiving_view_change_and_shutting_down() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_the_view_change() {
+		_publisher.Messages.Clear();
+
+		_sut.Handle(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), false, false));
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, -2));
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_receiving_view_change_and_idle : ElectionsFixture {
+	public when_receiving_view_change_and_idle() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_the_view_change() {
+		_publisher.Messages.Clear();
+
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, -2));
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_receiving_view_change_for_an_earlier_view_than_installed : ElectionsFixture {
+	public when_receiving_view_change_for_an_earlier_view_than_installed() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_the_view_change() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_publisher.Messages.Clear();
+
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, -2));
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_receiving_a_view_change_for_a_later_view_than_last_attempted_view : ElectionsFixture {
+	public when_receiving_a_view_change_for_a_later_view_than_last_attempted_view() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_send_view_change_to_other_members() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_publisher.Messages.Clear();
+
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 10));
+
+		var expected = new Message[] {
+			new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint,
+				new ElectionMessage.ViewChange(_node.InstanceId, _node.HttpEndPoint, 10),
+				_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
+			new GrpcMessage.SendOverGrpc(_nodeThree.HttpEndPoint,
+				new ElectionMessage.ViewChange(_node.InstanceId, _node.HttpEndPoint, 10),
+				_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
+			TimerMessage.Schedule.Create(
+				LeaderElectionProgressTimeout,
+				_publisher,
+				new ElectionMessage.ElectionsTimedOut(10)),
+		};
+
+		_publisher.Messages.Should().BeEquivalentTo(expected);
+	}
+}
+
+public class when_receiving_view_change_from_majority_and_acceptor_of_the_current_view : ElectionsFixture {
+	public when_receiving_view_change_from_majority_and_acceptor_of_the_current_view() :
+		base(NodeFactory(1), NodeFactory(2), NodeFactory(3)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_not_initiate_prepare_phase() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_publisher.Messages.Clear();
+
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_receiving_view_change_from_majority : ElectionsFixture {
+	public when_receiving_view_change_from_majority() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_send_prepares_to_other_members() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_publisher.Messages.Clear();
+
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+
+		var expected = new Message[] {
+			new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint,
+				new ElectionMessage.Prepare(_node.InstanceId, _node.HttpEndPoint, 0),
+				_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
+			new GrpcMessage.SendOverGrpc(_nodeThree.HttpEndPoint,
+				new ElectionMessage.Prepare(_node.InstanceId, _node.HttpEndPoint, 0),
+				_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout))
+		};
+		_publisher.Messages.Should().BeEquivalentTo(expected);
+	}
+}
+
+public class when_receiving_a_prepare_when_node_is_shutting_down : ElectionsFixture {
+	public when_receiving_a_prepare_when_node_is_shutting_down() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_the_prepare() {
+		_sut.Handle(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), false, false));
+		_sut.Handle(new ElectionMessage.Prepare(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_publisher.Messages.Clear();
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_receiving_a_prepare_for_the_same_node : ElectionsFixture {
+	public when_receiving_a_prepare_for_the_same_node() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_the_prepare() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_publisher.Messages.Clear();
+		_sut.Handle(new ElectionMessage.Prepare(_node.InstanceId, _node.HttpEndPoint, 0));
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_receiving_a_prepare_not_for_the_last_attempted_view : ElectionsFixture {
+	public when_receiving_a_prepare_not_for_the_last_attempted_view() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_the_prepare() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_publisher.Messages.Clear();
+		_sut.Handle(new ElectionMessage.Prepare(_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 1));
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_receiving_a_prepare_from_an_unknown_node : ElectionsFixture {
+	public when_receiving_a_prepare_from_an_unknown_node() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_the_prepare() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_publisher.Messages.Clear();
+		_sut.Handle(new ElectionMessage.Prepare(Guid.NewGuid(), new IPEndPoint(IPAddress.Loopback, 1114), 0));
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_receiving_a_prepare : ElectionsFixture {
+	private readonly ClusterInfo _clusterInfo;
+	public when_receiving_a_prepare() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_clusterInfo = new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0));
+		_sut.Handle(new GossipMessage.GossipUpdated(_clusterInfo));
+	}
+
+	[Test]
+	public void should_reply_with_prepare_ok() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_publisher.Messages.Clear();
+		_sut.Handle(new ElectionMessage.Prepare(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+
+		var expected = new Message[] {
+			new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint,
+				new ElectionMessage.PrepareOk(0,
+					_node.InstanceId, _node.HttpEndPoint, -1, -1, Guid.Empty, Guid.Empty, 0, 0, 0, 0, _clusterInfo),
+				_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
+		};
+		_publisher.Messages.Should().BeEquivalentTo(expected);
+	}
+}
+
+public class when_receiving_prepare_ok_and_node_is_shutting_down : ElectionsFixture {
+	public when_receiving_prepare_ok_and_node_is_shutting_down() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_prepare_ok() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_publisher.Messages.Clear();
+		_sut.Handle(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), false, false));
+
+		_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0, 0,
+			_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_receiving_prepare_ok_and_elections_have_not_started : ElectionsFixture {
+	public when_receiving_prepare_ok_and_elections_have_not_started() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_prepare_ok() {
+		_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0, 0,
+			_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_receiving_prepare_ok_for_not_the_current_attempted_view : ElectionsFixture {
+	public when_receiving_prepare_ok_for_not_the_current_attempted_view() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_prepare_ok() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_publisher.Messages.Clear();
+		_sut.Handle(new ElectionMessage.PrepareOk(-1, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0, 0,
+			_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_receiving_a_duplicate_prepare_ok : ElectionsFixture {
+	public when_receiving_a_duplicate_prepare_ok() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_prepare_ok() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_publisher.Messages.Clear();
+
+		_sut.Handle(new ElectionMessage.PrepareOk(0, _node.InstanceId, _node.HttpEndPoint, 0, 0,
+			_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_receiving_majority_prepare_ok : ElectionsFixture {
+	public when_receiving_majority_prepare_ok() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_send_proposal_to_other_members() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_publisher.Messages.Clear();
+
+		_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0, 0,
+			_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
+
+		var proposalHttpMessage = _publisher.Messages.OfType<GrpcMessage.SendOverGrpc>()
+			.FirstOrDefault(x => x.Message is ElectionMessage.Proposal);
+		var proposalMessage = (ElectionMessage.Proposal)proposalHttpMessage.Message;
+
+		var expected = new Message[] {
+			new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint,
+				new ElectionMessage.Proposal(_node.InstanceId, _node.HttpEndPoint,
+					proposalMessage.LeaderId,
+					proposalMessage.LeaderHttpEndPoint, 0, 0, 0, _epochId, Guid.Empty, 0, 0, 0, 0),
+				_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
+			new GrpcMessage.SendOverGrpc(_nodeThree.HttpEndPoint,
+				new ElectionMessage.Proposal(_node.InstanceId, _node.HttpEndPoint,
+					proposalMessage.LeaderId,
+					proposalMessage.LeaderHttpEndPoint, 0, 0, 0, _epochId, Guid.Empty, 0, 0, 0, 0),
+				_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout))
+		};
+		_publisher.Messages.Should().BeEquivalentTo(expected);
+	}
+}
+
+public class when_node_is_shutting_down_and_receive_a_proposal : ElectionsFixture {
+	public when_node_is_shutting_down_and_receive_a_proposal() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_proposal() {
+		_sut.Handle(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), false, false));
+		_sut.Handle(new ElectionMessage.Proposal(_node.InstanceId, _node.HttpEndPoint,
+			_node.InstanceId,
+			_node.HttpEndPoint, 0, 0, 0, _epochId, Guid.Empty, 0, 0, 0, 0));
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_receiving_a_proposal_from_the_same_node : ElectionsFixture {
+	public when_receiving_a_proposal_from_the_same_node() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_proposal() {
+		_sut.Handle(new ElectionMessage.Proposal(_node.InstanceId, _node.HttpEndPoint,
+			_node.InstanceId,
+			_node.HttpEndPoint, 0, 0, 0, _epochId, Guid.Empty, 0, 0, 0, 0));
+
+		Assert.IsEmpty(_publisher.Messages,
+			"Nodes do not send proposals to themselves, they accept their own proposal implicitly.");
+	}
+}
+
+public class when_receiving_a_proposal_as_the_acceptor_of_the_current_view : ElectionsFixture {
+	public when_receiving_a_proposal_as_the_acceptor_of_the_current_view() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_proposal() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0, 0,
+			_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
+		_publisher.Messages.Clear();
+		_sut.Handle(new ElectionMessage.Proposal(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+			_node.InstanceId,
+			_node.HttpEndPoint, 0, 0, 0, _epochId, Guid.Empty, 0, 0, 0, 0));
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_receiving_a_proposal_not_for_the_current_installed_view : ElectionsFixture {
+	public when_receiving_a_proposal_not_for_the_current_installed_view() :
+		base(NodeFactory(1), NodeFactory(2), NodeFactory(3)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_proposal() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_sut.Handle(new ElectionMessage.Prepare(_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
+		_publisher.Messages.Clear();
+		_sut.Handle(new ElectionMessage.Proposal(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+			_node.InstanceId,
+			_node.HttpEndPoint, 1, 0, 0, _epochId, Guid.Empty, 0, 0, 0, 0));
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_receiving_a_proposal_from_an_unknown_node : ElectionsFixture {
+	public when_receiving_a_proposal_from_an_unknown_node() :
+		base(NodeFactory(1), NodeFactory(2), NodeFactory(3)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_proposal() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_sut.Handle(new ElectionMessage.Prepare(_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
+		_publisher.Messages.Clear();
+		_sut.Handle(new ElectionMessage.Proposal(Guid.NewGuid(), new IPEndPoint(IPAddress.Loopback, 4),
+			_node.InstanceId,
+			_node.HttpEndPoint, 0, 0, 0, _epochId, Guid.Empty, 0, 0, 0, 0));
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_receiving_a_proposal_for_an_unknown_node : ElectionsFixture {
+	public when_receiving_a_proposal_for_an_unknown_node() :
+		base(NodeFactory(1), NodeFactory(2), NodeFactory(3)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_proposal() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_sut.Handle(new ElectionMessage.Prepare(_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
+		_publisher.Messages.Clear();
+		_sut.Handle(new ElectionMessage.Proposal(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+			Guid.NewGuid(),
+			new IPEndPoint(IPAddress.Loopback, 4), 0, 0, 0, _epochId, Guid.Empty, 0, 0, 0, 0));
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_receiving_a_proposal_as_acceptor : ElectionsFixture {
+	public when_receiving_a_proposal_as_acceptor() :
+		base(NodeFactory(1), NodeFactory(2), NodeFactory(3)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_send_an_acceptance_to_other_members() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_sut.Handle(new ElectionMessage.Prepare(_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
+		_publisher.Messages.Clear();
+		_sut.Handle(new ElectionMessage.Proposal(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+			_nodeThree.InstanceId,
+			_nodeThree.HttpEndPoint, 0, 0, 0, _epochId, Guid.Empty, 0, 0, 0, 0));
+
+		var expected = new Message[] {
+			new ElectionMessage.ElectionsDone(0,0,
+				MemberInfo.ForVNode(
+					_nodeThree.InstanceId, _timeProvider.UtcNow, VNodeState.Unknown, true,
+					_nodeThree.InternalTcp,
+					_nodeThree.InternalSecureTcp, _nodeThree.ExternalTcp, _nodeThree.ExternalSecureTcp,
+					_nodeThree.HttpEndPoint, null, 0, 0, 0, 0, 0, 0, 0, _epochId, 0,
+					_nodeThree.IsReadOnlyReplica)),
+			new GrpcMessage.SendOverGrpc(_nodeThree.HttpEndPoint,
+				new ElectionMessage.Accept(_node.InstanceId, _node.HttpEndPoint,
+					_nodeThree.InstanceId,
+					_nodeThree.HttpEndPoint, 0),
+				_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
+			new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint,
+				new ElectionMessage.Accept(_node.InstanceId, _node.HttpEndPoint,
+					_nodeThree.InstanceId,
+					_nodeThree.HttpEndPoint, 0),
+				_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
+		};
+		_publisher.Messages.Should().BeEquivalentTo(expected);
+	}
+}
+
+public class when_node_is_shutting_down_and_receiving_accept : ElectionsFixture {
+	public when_node_is_shutting_down_and_receiving_accept() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_accept() {
+		_sut.Handle(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), false, false));
+		_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+			_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_receiving_accept_for_not_the_current_installed_view : ElectionsFixture {
+	public when_receiving_accept_for_not_the_current_installed_view() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_accept() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0, 0,
+			_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
+		_publisher.Messages.Clear();
+
+		_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+			_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 1));
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_receiving_accept_without_a_leader_having_been_proposed : ElectionsFixture {
+	public when_receiving_accept_without_a_leader_having_been_proposed() :
+		base(NodeFactory(1), NodeFactory(2), NodeFactory(3)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_accept() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_sut.Handle(new ElectionMessage.Prepare(_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
+		_publisher.Messages.Clear();
+
+		_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+			_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_receiving_accept_and_leader_proposal_does_not_match_accept_leader : ElectionsFixture {
+	public when_receiving_accept_and_leader_proposal_does_not_match_accept_leader() :
+		base(NodeFactory(1), NodeFactory(2), NodeFactory(3)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_accept() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_sut.Handle(new ElectionMessage.Prepare(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_sut.Handle(new ElectionMessage.Proposal(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+			Guid.NewGuid(),
+			new IPEndPoint(IPAddress.Loopback, 4), 0, 0, 0, _epochId, Guid.Empty, 0, 0, 0, 0));
+		_publisher.Messages.Clear();
+
+		_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+			_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_receiving_majority_accept : ElectionsFixture {
+	public when_receiving_majority_accept() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_complete_elections() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0, 0,
+			_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
+		var proposalHttpMessage = _publisher.Messages.OfType<GrpcMessage.SendOverGrpc>()
+			.FirstOrDefault(x => x.Message is ElectionMessage.Proposal);
+		var proposalMessage = (ElectionMessage.Proposal)proposalHttpMessage.Message;
+		_publisher.Messages.Clear();
+
+		_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+			proposalMessage.LeaderId, proposalMessage.LeaderHttpEndPoint, 0));
+
+		var expected = new Message[] {
+			new ElectionMessage.ElectionsDone(0,0,
+				MemberInfo.ForVNode(
+					_nodeTwo.InstanceId, _timeProvider.UtcNow, VNodeState.Unknown, true,
+					_nodeTwo.InternalTcp,
+					_nodeTwo.InternalSecureTcp, _nodeTwo.ExternalTcp, _nodeTwo.ExternalSecureTcp,
+					_nodeTwo.HttpEndPoint, null, 0, 0, 0, 0, 0, 0, 0, _epochId, 0,
+					_nodeTwo.IsReadOnlyReplica)),
+		};
+		_publisher.Messages.Should().BeEquivalentTo(expected);
+	}
+}
+
+public class when_elections_timeout_and_not_electing_leader : ElectionsFixture {
+	public when_elections_timeout_and_not_electing_leader() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_timeout() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0, 0,
+			_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
+		var proposalHttpMessage = _publisher.Messages.OfType<GrpcMessage.SendOverGrpc>()
+			.FirstOrDefault(x => x.Message is ElectionMessage.Proposal);
+		var proposalMessage = (ElectionMessage.Proposal)proposalHttpMessage.Message;
+		_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+			proposalMessage.LeaderId, proposalMessage.LeaderHttpEndPoint, 0));
+		_publisher.Messages.Clear();
+		_sut.Handle(new ElectionMessage.ElectionsTimedOut(0));
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_updating_node_priority : ElectionsFixture {
+	public when_updating_node_priority() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_broadcast_node_priority_update() {
+		var nodePriority = 5;
+		_sut.Handle(new ClientMessage.SetNodePriority(nodePriority));
+
+		var expected = new Message[] {
+			new GossipMessage.UpdateNodePriority(nodePriority)
+		};
+		_publisher.Messages.Should().BeEquivalentTo(expected);
+	}
+}
+
+public class when_resigning_node_and_node_is_not_the_current_leader : ElectionsFixture {
+	public when_resigning_node_and_node_is_not_the_current_leader() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_ignore_resign_node_message() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0, 0,
+			_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
+		var proposalHttpMessage = _publisher.Messages.OfType<GrpcMessage.SendOverGrpc>()
+			.FirstOrDefault(x => x.Message is ElectionMessage.Proposal);
+		var proposalMessage = (ElectionMessage.Proposal)proposalHttpMessage.Message;
+		_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+			proposalMessage.LeaderId, proposalMessage.LeaderHttpEndPoint, 0));
+		_publisher.Messages.Clear();
+		_sut.Handle(new ClientMessage.ResignNode());
+
+		Assert.IsEmpty(_publisher.Messages);
+	}
+}
+
+public class when_resigning_node_and_is_the_current_leader : ElectionsFixture {
+	public when_resigning_node_and_is_the_current_leader() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_initiate_leader_resignation_and_inform_other_nodes() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, -1, 0,
+			_epochId, Guid.Empty, -1, -1, -1, -1, new ClusterInfo()));
+		_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+			_node.InstanceId, _node.HttpEndPoint, 0));
+		_publisher.Messages.Clear();
+
+		_sut.Handle(new ClientMessage.ResignNode());
+
+		var expected = new Message[] {
+			new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint,
+				new ElectionMessage.LeaderIsResigning(_node.InstanceId, _node.HttpEndPoint),
+				_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
+			new GrpcMessage.SendOverGrpc(_nodeThree.HttpEndPoint,
+				new ElectionMessage.LeaderIsResigning(_node.InstanceId, _node.HttpEndPoint),
+				_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
+		};
+		_publisher.Messages.Should().BeEquivalentTo(expected);
+	}
+}
+
+public class when_receiving_leader_is_resigning : ElectionsFixture {
+	public when_receiving_leader_is_resigning() :
+		base(NodeFactory(1), NodeFactory(2), NodeFactory(3)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_reply_with_leader_is_resigning_ok() {
+		_sut.Handle(new ElectionMessage.LeaderIsResigning(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint));
+
+		var expected = new Message[] {
+			new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint,
+				new ElectionMessage.LeaderIsResigningOk(
+					_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+					_node.InstanceId, _node.HttpEndPoint),
+				_timeProvider.LocalTime.Add(LeaderElectionProgressTimeout)),
+		};
+		_publisher.Messages.Should().BeEquivalentTo(expected);
+	}
+}
+
+public class when_resigning_node_and_majority_resigning_ok_received : ElectionsFixture {
+	public when_resigning_node_and_majority_resigning_ok_received() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_initiate_leader_resignation() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, -1, 0,
+			_epochId, Guid.Empty, -1, -1, -1, -1, new ClusterInfo()));
+		_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+			_node.InstanceId, _node.HttpEndPoint, 0));
+		_sut.Handle(new ClientMessage.ResignNode());
+		_publisher.Messages.Clear();
+
+		_sut.Handle(new ElectionMessage.LeaderIsResigningOk(
+			_node.InstanceId,
+			_node.HttpEndPoint,
+			_nodeTwo.InstanceId,
+			_nodeTwo.HttpEndPoint));
+
+		var expected = new Message[] {
+			new SystemMessage.InitiateLeaderResignation(),
+		};
+		_publisher.Messages.Should().BeEquivalentTo(expected);
+	}
+}
+
+public class when_electing_a_leader_and_leader_node_resigned : ElectionsFixture {
+	public when_electing_a_leader_and_leader_node_resigned() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void should_attempt_not_to_elect_previously_elected_leader() {
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, -1, 0,
+			_epochId, Guid.Empty, -1, -1, -1, -1, new ClusterInfo()));
+		_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+			_node.InstanceId, _node.HttpEndPoint, 0));
+		_publisher.Messages.Clear();
+
+		_sut.Handle(new ClientMessage.ResignNode());
+		_sut.Handle(new ElectionMessage.LeaderIsResigningOk(
+			_node.InstanceId,
+			_node.HttpEndPoint,
+			_nodeTwo.InstanceId,
+			_nodeTwo.HttpEndPoint));
+		_publisher.Messages.Clear();
+
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 3));
+		_sut.Handle(new ElectionMessage.PrepareOk(3, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0, 0,
+			_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
+		var proposalHttpMessage = _publisher.Messages.OfType<GrpcMessage.SendOverGrpc>()
+			.FirstOrDefault(x => x.Message is ElectionMessage.Proposal);
+		var proposalMessage = (ElectionMessage.Proposal)proposalHttpMessage.Message;
+		_publisher.Messages.Clear();
+		_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+			proposalMessage.LeaderId, proposalMessage.LeaderHttpEndPoint, 3));
+
+		var expected = new Message[] {
+			new ElectionMessage.ElectionsDone(3,1,
+				MemberInfo.ForVNode(
+					_nodeTwo.InstanceId, _timeProvider.UtcNow, VNodeState.Unknown, true,
+					_nodeTwo.InternalTcp,
+					_nodeTwo.InternalSecureTcp, _nodeTwo.ExternalTcp, _nodeTwo.ExternalSecureTcp,
+					_nodeTwo.HttpEndPoint, null, 0, 0, 0, 0, 0, 0, 0, _epochId, 0,
+					_nodeTwo.IsReadOnlyReplica)),
+		};
+		_publisher.Messages.Should().BeEquivalentTo(expected);
+	}
+}
+
+public class when_a_leader_is_found_during_leader_discovery : ElectionsFixture {
+	public when_a_leader_is_found_during_leader_discovery() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+		var info = MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0);
+		_sut.Handle(new LeaderDiscoveryMessage.LeaderFound(info));
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			info,
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+	}
+
+	[Test]
+	public void view_change_should_trigger_new_elections() {
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 3));
+		_publisher.Messages.Clear();
+
+		_sut.Handle(new ElectionMessage.PrepareOk(3, _nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0, 0,
+			_epochId, Guid.Empty, 0, 0, 0, 0, new ClusterInfo()));
+
+		Assert.NotNull(_publisher.Messages.OfType<GrpcMessage.SendOverGrpc>().FirstOrDefault());
+	}
+}
+
+public class when_the_elections_service_is_initialized_as_read_only_replica {
+	[Test]
+	public void should_throw_argument_exception() {
+		var endpoint = new IPEndPoint(IPAddress.Loopback, 1234);
+		var nodeInfo = MemberInfo.Initial(Guid.NewGuid(),
+			DateTime.UtcNow, VNodeState.ReadOnlyLeaderless, true,
+			endpoint,
+			endpoint,
+			endpoint,
+			endpoint,
+			endpoint, null, 0, 0,
+			0,
+			true);
+
+		Assert.Throws<ArgumentException>(() => {
+			new KurrentDB.Core.Services.ElectionsService(new FakePublisher(), nodeInfo, 3,
+				new InMemoryCheckpoint(0),
+				new InMemoryCheckpoint(0),
+				new InMemoryCheckpoint(-1),
+				new FakeEpochManager(), () => 0L, 0, new FakeTimeProvider(),
+				TimeSpan.FromMilliseconds(1_000));
+		});
+	}
+}
+public class when_electing_a_leader_and_prepare_ok_is_received_from_previous_leader_in_epoch_record : ElectionsFixture {
+	public when_electing_a_leader_and_prepare_ok_is_received_from_previous_leader_in_epoch_record() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0))));
+
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
+
+		_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeThree.InstanceId, _nodeThree.HttpEndPoint, 10, 0,
+			_epochId, _nodeThree.InstanceId, 0, 0, 0, 0, new ClusterInfo()));
+
+		_publisher.Messages.Clear();
+		_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+			_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
+	}
+
+	[Test]
+	public void previous_leader_should_be_elected() {
+		var expected = new Message[] {
+			new ElectionMessage.ElectionsDone(0,0,
+				MemberInfo.ForVNode(
+					_nodeThree.InstanceId, _timeProvider.UtcNow, VNodeState.Unknown, true,
+					_nodeThree.InternalTcp,
+					_nodeThree.InternalSecureTcp, _nodeThree.ExternalTcp, _nodeThree.ExternalSecureTcp,
+					_nodeThree.HttpEndPoint, null, 0, 0,
+					0, 0, 0, 0, 0, _epochId, 0,
+					_nodeThree.IsReadOnlyReplica)),
+		};
+
+		_publisher.Messages.Should().BeEquivalentTo(expected);
+	}
+}
+
+public class when_electing_a_leader_and_prepare_ok_is_not_received_from_previous_leader_in_epoch_record : ElectionsFixture {
+	public when_electing_a_leader_and_prepare_ok_is_not_received_from_previous_leader_in_epoch_record() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+
+		//we mark the 3rd node as dead in _node's gossip so that it does not affect the results of the elections
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, false, 0, _epochId, 0))));
+
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
+	}
+
+	public class
+		and_previous_leader_is_present_and_alive_in_cluster_info_in_received_prepare_ok :
+			when_electing_a_leader_and_prepare_ok_is_not_received_from_previous_leader_in_epoch_record {
+
+		public and_previous_leader_is_present_and_alive_in_cluster_info_in_received_prepare_ok() {
+			_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 10, 0,
+				_epochId, _nodeThree.InstanceId, 0, 0, 0, 0,
+				new ClusterInfo(
+					MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0)
+				)));
+
+			_publisher.Messages.Clear();
+		}
+
+		[Test]
+		public void previous_leader_should_be_proposed() {
+			Assert.AreEqual(_nodeThree.InstanceId, _sut.LeaderProposalId);
+		}
+	}
+
+	public class
+		and_previous_leader_is_present_and_alive_but_has_lower_priority_in_cluster_info_in_received_prepare_ok :
+			when_electing_a_leader_and_prepare_ok_is_not_received_from_previous_leader_in_epoch_record {
+
+		public and_previous_leader_is_present_and_alive_but_has_lower_priority_in_cluster_info_in_received_prepare_ok() {
+			_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 10, 0,
+				_epochId, _nodeThree.InstanceId, 0, 0, 0, 0,
+				new ClusterInfo(
+					MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, -1)
+				)));
+
+			_publisher.Messages.Clear();
+		}
+
+		[Test]
+		public void previous_leader_should_be_proposed() {
+			Assert.AreEqual(_nodeThree.InstanceId, _sut.LeaderProposalId);
+		}
+	}
+
+	public class
+		and_previous_leader_is_present_and_alive_in_cluster_info_in_received_prepare_ok_but_is_resigning :
+			when_electing_a_leader_and_prepare_ok_is_not_received_from_previous_leader_in_epoch_record {
+
+		public and_previous_leader_is_present_and_alive_in_cluster_info_in_received_prepare_ok_but_is_resigning() {
+			_sut.Handle(new ElectionMessage.LeaderIsResigning(_nodeThree.InstanceId, _nodeThree.HttpEndPoint));
+
+			_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 10, 0,
+				_epochId, _nodeThree.InstanceId, 0, 0, 0, 0,
+				new ClusterInfo(
+					MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0)
+				)));
+
+			_publisher.Messages.Clear();
+			_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+				_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		}
+
+		[Test]
+		public void previous_leader_should_not_be_elected() {
+			var expected = new Message[] {
+				new ElectionMessage.ElectionsDone(0,0,
+					MemberInfo.ForVNode(
+						_nodeTwo.InstanceId, _timeProvider.UtcNow, VNodeState.Unknown, true,
+						_nodeTwo.InternalTcp,
+						_nodeTwo.InternalSecureTcp, _nodeTwo.ExternalTcp, _nodeTwo.ExternalSecureTcp,
+						_nodeTwo.HttpEndPoint, null, 0, 0,
+						0, 0, 0, 0, 0, _epochId, 0,
+						_nodeTwo.IsReadOnlyReplica)),
+			};
+
+			_publisher.Messages.Should().BeEquivalentTo(expected);
+		}
+	}
+
+	public class
+		and_previous_leader_is_present_and_alive_in_cluster_info_in_received_prepare_ok_and_epoch_number_matches_but_not_epoch_id :
+			when_electing_a_leader_and_prepare_ok_is_not_received_from_previous_leader_in_epoch_record {
+
+		public and_previous_leader_is_present_and_alive_in_cluster_info_in_received_prepare_ok_and_epoch_number_matches_but_not_epoch_id() {
+			_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 10, 0,
+				_epochId, _nodeThree.InstanceId, 0, 0, 0, 0,
+				new ClusterInfo(
+					MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 10, Guid.NewGuid(), 0)
+				)));
+
+			_publisher.Messages.Clear();
+			_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+				_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		}
+
+		[Test]
+		public void previous_leader_should_not_be_elected() {
+			var expected = new Message[] {
+				new ElectionMessage.ElectionsDone(0,0,
+					MemberInfo.ForVNode(
+						_nodeTwo.InstanceId, _timeProvider.UtcNow, VNodeState.Unknown, true,
+						_nodeTwo.InternalTcp,
+						_nodeTwo.InternalSecureTcp, _nodeTwo.ExternalTcp, _nodeTwo.ExternalSecureTcp,
+						_nodeTwo.HttpEndPoint, null, 0, 0,
+						0, 0, 0, 0, 0, _epochId, 0,
+						_nodeTwo.IsReadOnlyReplica)),
+			};
+
+			_publisher.Messages.Should().BeEquivalentTo(expected);
+		}
+	}
+
+	public class
+		and_previous_leader_is_present_and_alive_in_cluster_info_in_received_prepare_ok_and_epoch_number_does_not_match :
+			when_electing_a_leader_and_prepare_ok_is_not_received_from_previous_leader_in_epoch_record {
+		private Guid _otherEpochId = Guid.NewGuid();
+
+		public and_previous_leader_is_present_and_alive_in_cluster_info_in_received_prepare_ok_and_epoch_number_does_not_match() {
+			_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 10, 0,
+				_epochId, _nodeThree.InstanceId, 0, 0, 0, 0,
+				new ClusterInfo(
+					MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, true, 9, _otherEpochId, 0)
+				)));
+
+			_publisher.Messages.Clear();
+		}
+
+		[Test]
+		public void previous_leader_should_be_proposed() {
+			Assert.AreEqual(_nodeThree.InstanceId, _sut.LeaderProposalId);
+		}
+	}
+
+	public class
+		and_previous_leader_is_not_present_in_cluster_info_in_received_prepare_ok :
+			when_electing_a_leader_and_prepare_ok_is_not_received_from_previous_leader_in_epoch_record {
+
+		public and_previous_leader_is_not_present_in_cluster_info_in_received_prepare_ok() {
+			_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 10, 0,
+				_epochId, _nodeThree.InstanceId, 0, 0, 0, 0, new ClusterInfo()));
+
+			_publisher.Messages.Clear();
+			_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+				_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		}
+
+		[Test]
+		public void previous_leader_should_not_be_elected() {
+			var expected = new Message[] {
+				new ElectionMessage.ElectionsDone(0,0,
+					MemberInfo.ForVNode(
+						_nodeTwo.InstanceId, _timeProvider.UtcNow, VNodeState.Unknown, true,
+						_nodeTwo.InternalTcp,
+						_nodeTwo.InternalSecureTcp, _nodeTwo.ExternalTcp, _nodeTwo.ExternalSecureTcp,
+						_nodeTwo.HttpEndPoint, null, 0, 0,
+						0, 0, 0, 0, 0, _epochId, 0,
+						_nodeTwo.IsReadOnlyReplica)),
+			};
+
+			_publisher.Messages.Should().BeEquivalentTo(expected);
+		}
+	}
+
+	public class
+		and_previous_leader_is_present_but_dead_in_cluster_info_in_received_prepare_ok :
+			when_electing_a_leader_and_prepare_ok_is_not_received_from_previous_leader_in_epoch_record {
+
+		public and_previous_leader_is_present_but_dead_in_cluster_info_in_received_prepare_ok() {
+			_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 10, 0,
+				_epochId, _nodeThree.InstanceId, 0, 0, 0, 0,
+				new ClusterInfo(
+					MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, false, 0, _epochId, 0)
+				)));
+
+			_publisher.Messages.Clear();
+			_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+				_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint, 0));
+		}
+
+		[Test]
+		public void previous_leader_should_not_be_elected() {
+			var expected = new Message[] {
+				new ElectionMessage.ElectionsDone(0,0,
+					MemberInfo.ForVNode(
+						_nodeTwo.InstanceId, _timeProvider.UtcNow, VNodeState.Unknown, true,
+						_nodeTwo.InternalTcp,
+						_nodeTwo.InternalSecureTcp, _nodeTwo.ExternalTcp, _nodeTwo.ExternalSecureTcp,
+						_nodeTwo.HttpEndPoint, null, 0, 0,
+						0, 0, 0, 0, 0, _epochId, 0,
+						_nodeTwo.IsReadOnlyReplica)),
+			};
+
+			_publisher.Messages.Should().BeEquivalentTo(expected);
+		}
+	}
+}
+
+public class when_electing_a_leader_and_best_candidate_node_is_dead_in_gossip_info_of_leader_of_elections : ElectionsFixture {
+	public when_electing_a_leader_and_best_candidate_node_is_dead_in_gossip_info_of_leader_of_elections() :
+		base(NodeFactory(3), NodeFactory(2), NodeFactory(1)) {
+
+		_sut.Handle(new GossipMessage.GossipUpdated(new ClusterInfo(
+			MemberInfoFromVNode(_node, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeTwo, _timeProvider.UtcNow, VNodeState.Unknown, true, 0, _epochId, 0),
+			MemberInfoFromVNode(_nodeThree, _timeProvider.UtcNow, VNodeState.Unknown, false, 0, _epochId, 0))));
+
+		_sut.Handle(new ElectionMessage.StartElections());
+		_sut.Handle(new ElectionMessage.ViewChange(_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
+
+		_sut.Handle(new ElectionMessage.PrepareOk(0, _nodeThree.InstanceId, _nodeThree.HttpEndPoint, 10, 0,
+			_epochId, _nodeThree.InstanceId, 0, 0, 0, 0, new ClusterInfo()));
+
+		_publisher.Messages.Clear();
+		_sut.Handle(new ElectionMessage.Accept(_nodeTwo.InstanceId, _nodeTwo.HttpEndPoint,
+			_nodeThree.InstanceId, _nodeThree.HttpEndPoint, 0));
+	}
+
+	[Test]
+	public void no_leader_should_be_elected() {
+		Assert.AreEqual(0, _publisher.Messages.ToArray().Length);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/FakeEpochManager.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/FakeEpochManager.cs
new file mode 100644
index 00000000000..2a8ceb39490
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/FakeEpochManager.cs
@@ -0,0 +1,89 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Collections.Generic;
+using DotNext.Threading;
+using KurrentDB.Core.Services.Storage.EpochManager;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService;
+
+internal class FakeEpochManager : IEpochManager {
+	public int LastEpochNumber
+		=> _epochs.LastOrNone().Convert(static epoch => epoch.EpochNumber).Or(-1);
+
+	private readonly AsyncExclusiveLock _lock = new();
+
+	// use copy-on-write to avoid sync-over-async
+	private volatile ImmutableList<EpochRecord> _epochs = ImmutableList<EpochRecord>.Empty;
+
+	public ValueTask Init(CancellationToken token) => ValueTask.CompletedTask;
+
+	public EpochRecord GetLastEpoch() => _epochs.LastOrDefault();
+
+	public ValueTask<IReadOnlyList<EpochRecord>> GetLastEpochs(int maxCount, CancellationToken token) {
+		IReadOnlyList<EpochRecord> epochs = _epochs;
+		return new((maxCount >= epochs.Count
+			? epochs
+			: epochs.Skip(_epochs.Count - maxCount)).ToArray());
+	}
+
+	public ValueTask<EpochRecord> GetEpochAfter(int epochNumber, bool throwIfNotFound, CancellationToken token) {
+		ValueTask<EpochRecord> task;
+		try {
+			ImmutableList<EpochRecord> epochs = _epochs;
+			if (epochs.FirstOrDefault(e => e.EpochNumber == epochNumber) is { } epoch) {
+				var index = epochs.IndexOf(epoch);
+				epoch = null;
+				if (index + 1 < epochs.Count) {
+					epoch = epochs[index + 1];
+				}
+			} else {
+				epoch = null;
+			}
+
+			if (throwIfNotFound && epoch is null)
+				throw new ArgumentOutOfRangeException(nameof(epochNumber), "Epoch not Found");
+
+			task = new(epoch);
+		} catch (Exception e) {
+			task = ValueTask.FromException<EpochRecord>(e);
+		}
+
+		return task;
+	}
+
+	public ValueTask<bool> IsCorrectEpochAt(long epochPosition, int epochNumber, Guid epochId, CancellationToken token) {
+		ValueTask<bool> task;
+		try {
+			task = new(_epochs.FirstOrDefault(e => e.EpochNumber == epochNumber) is { } epoch
+					   && epoch.EpochNumber == epochNumber
+					   && epoch.EpochId == epochId);
+		} catch (Exception e) {
+			task = ValueTask.FromException<bool>(e);
+		}
+
+		return task;
+	}
+
+	public ValueTask WriteNewEpoch(int epochNumber, CancellationToken token)
+		=> ValueTask.FromException(new NotImplementedException());
+
+	public async ValueTask CacheEpoch(EpochRecord epoch, CancellationToken token) {
+		await _lock.AcquireAsync(token);
+		try {
+			_epochs = _epochs.Add(epoch);
+		} finally {
+			_lock.Release();
+		}
+	}
+
+	public ValueTask<EpochRecord> TryTruncateBefore(long position, CancellationToken token)
+		=> ValueTask.FromException<EpochRecord>(new NotImplementedException());
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/LeaderNode/ElectionsServiceUnitTests.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/LeaderNode/ElectionsServiceUnitTests.cs
new file mode 100644
index 00000000000..30505025c93
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/LeaderNode/ElectionsServiceUnitTests.cs
@@ -0,0 +1,427 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Gossip;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using NUnit.Framework;
+using SUT = KurrentDB.Core.Services.ElectionsService;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.LeaderNode;
+
+public class ElectionsServiceUnitTests {
+	private Dictionary<IPEndPoint, IPublisher> _nodes;
+	private List<MemberInfo> _members;
+	private FakeTimeProvider _fakeTimeProvider;
+	private FakeScheduler _scheduler;
+
+	[SetUp]
+	public void Setup() {
+		var address = IPAddress.Loopback;
+		var members = new List<MemberInfo>();
+		var seeds = new List<IPEndPoint>();
+		var seedSource = new ReallyNotSafeFakeGossipSeedSource(seeds);
+		_nodes = new Dictionary<IPEndPoint, IPublisher>();
+		for (int i = 0; i < 3; i++) {
+			var inputBus = new SynchronousScheduler($"ELECTIONS-INPUT-BUS-NODE-{i}", watchSlowMsg: false);
+			var outputBus = new SynchronousScheduler($"ELECTIONS-OUTPUT-BUS-NODE-{i}", watchSlowMsg: false);
+			var endPoint = new IPEndPoint(address, 1000 + i);
+			seeds.Add(endPoint);
+			var instanceId = Guid.Parse($"101EFD13-F9CD-49BE-9C6D-E6AF9AF5540{i}");
+			var memberInfo = MemberInfo.ForVNode(instanceId, DateTime.UtcNow, VNodeState.Unknown, true,
+				endPoint, null, endPoint, null, endPoint, null, 0, 0, -1, 0, 0, -1, -1, Guid.Empty, 0, false);
+			members.Add(memberInfo);
+			_fakeTimeProvider = new FakeTimeProvider();
+			_scheduler = new FakeScheduler(new FakeTimer(), _fakeTimeProvider);
+			var timerService = new TimerService(_scheduler);
+
+			var writerCheckpoint = new InMemoryCheckpoint();
+			var readerCheckpoint = new InMemoryCheckpoint();
+			var proposalCheckpoint = new InMemoryCheckpoint(-1);
+			var epochManager = new FakeEpochManager();
+			Func<long> lastCommitPosition = () => -1;
+			var electionsService = new SUT(outputBus,
+				memberInfo,
+				3,
+				writerCheckpoint,
+				readerCheckpoint,
+				proposalCheckpoint,
+				epochManager,
+				() => -1, 0, new FakeTimeProvider(),
+				TimeSpan.FromMilliseconds(1_000));
+			electionsService.SubscribeMessages(inputBus);
+
+			var nodeId = i;
+			outputBus.Subscribe(new AdHocHandler<Message>(
+				m => {
+					switch (m) {
+						case TimerMessage.Schedule sm:
+							TestContext.WriteLine(
+								$"Node {nodeId} : Delay {sm.TriggerAfter} : {sm.ReplyMessage.GetType()}");
+							timerService.Handle(sm);
+							break;
+						default:
+							TestContext.WriteLine($"Node {nodeId} : EP {m.GetType()}");
+							inputBus.Publish(m);
+							break;
+					}
+				}
+			));
+			_nodes.Add(endPoint, inputBus);
+
+			var gossip = new NodeGossipService(outputBus, 3, seedSource, memberInfo, writerCheckpoint, readerCheckpoint,
+				epochManager, lastCommitPosition, 0, TimeSpan.FromMilliseconds(500), TimeSpan.FromDays(1),
+				TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(1800), _fakeTimeProvider);
+			inputBus.Subscribe<SystemMessage.SystemInit>(gossip);
+			inputBus.Subscribe<GossipMessage.RetrieveGossipSeedSources>(gossip);
+			inputBus.Subscribe<GossipMessage.GotGossipSeedSources>(gossip);
+			inputBus.Subscribe<GossipMessage.Gossip>(gossip);
+			inputBus.Subscribe<GossipMessage.GossipReceived>(gossip);
+			inputBus.Subscribe<SystemMessage.StateChangeMessage>(gossip);
+			inputBus.Subscribe<GossipMessage.GossipSendFailed>(gossip);
+			inputBus.Subscribe<GossipMessage.UpdateNodePriority>(gossip);
+			inputBus.Subscribe<SystemMessage.VNodeConnectionEstablished>(gossip);
+			inputBus.Subscribe<SystemMessage.VNodeConnectionLost>(gossip);
+		}
+
+		_members = members;
+	}
+
+	class ReallyNotSafeFakeGossipSeedSource : IGossipSeedSource {
+		private readonly List<IPEndPoint> _ipEndPoints;
+
+		public ReallyNotSafeFakeGossipSeedSource(List<IPEndPoint> ipEndPoints) {
+			_ipEndPoints = ipEndPoints;
+		}
+
+		public IAsyncResult BeginGetHostEndpoints(AsyncCallback requestCallback, object state) {
+			requestCallback(null);
+			return null;
+		}
+
+		public EndPoint[] EndGetHostEndpoints(IAsyncResult asyncResult) {
+			return _ipEndPoints.ToArray();
+		}
+	}
+}
+
+public class ChoosingLeaderTests {
+	static IEnumerable<TestCase> CreateCases() {
+		// Tiebreaker: If all else is equal, pick the node with the highest server id
+		yield return new TestCase {
+			ExpectedLeaderCandidateNode = 2,
+			ProposingNode = 0,
+		};
+
+		// If checkpoints are equal, pick the node with the highest priority
+		yield return new TestCase {
+			ExpectedLeaderCandidateNode = 0,
+			NodePriorities = new[] { 3, 2, 1 }
+		};
+
+		// Don't pick the last elected leader if it is resigning
+		yield return new TestCase {
+			ExpectedLeaderCandidateNode = 1,
+			NodePriorities = new[] { 0, 0, 0 },
+			LastElectedLeader = new int?[] { 2, 2, 2 },
+			ResigningLeader = 2
+		};
+
+		// Pick the last elected leader if all else is equal
+		yield return new TestCase {
+			ExpectedLeaderCandidateNode = 0,
+			NodePriorities = new[] { int.MinValue, int.MinValue, int.MinValue },
+			LastElectedLeader = new int?[] { 0, 0, 0 },
+		};
+
+		// Pick the non-resigning node with the highest chaser checkpoint
+		// instead of the resigning leader
+		yield return new TestCase {
+			ExpectedLeaderCandidateNode = 0,
+			LastElectedLeader = new int?[] { 2, 2, 2 },
+			ResigningLeader = 2,
+			ChaserCheckpoints = new long[] { 1, 0, 1 },
+			NodePriorities = new[] { 0, 0, 0 },
+		};
+
+		// Pick the non-resigning node with the highest writer checkpoint
+		// instead of the resigning leader
+		yield return new TestCase {
+			ExpectedLeaderCandidateNode = 1,
+			LastElectedLeader = new int?[] { 2, 2, 2 },
+			ResigningLeader = 2,
+			WriterCheckpoints = new long[] { 0, 1, 1 },
+			NodePriorities = new[] { 0, 0, 0 },
+		};
+
+		// Pick the node with the highest chaser checkpoint
+		// regardless of node priority
+		yield return new TestCase {
+			ExpectedLeaderCandidateNode = 0,
+			LastElectedLeader = new int?[] { 0, 0, 0 },
+			ChaserCheckpoints = new long[] { 1, 0, 0 },
+			NodePriorities = new[] { int.MinValue, 0, 0 },
+		};
+
+		// Pick the node with the highest writer checkpoint
+		// regardless of node priority
+		yield return new TestCase {
+			ExpectedLeaderCandidateNode = 1,
+			LastElectedLeader = new int?[] { 1, 1, 1 },
+			WriterCheckpoints = new long[] { 0, 1, 0 },
+			NodePriorities = new[] { 0, int.MinValue, 0 },
+		};
+
+		// Pick the node with the highest priority over the resigning leader
+		yield return new TestCase {
+			ExpectedLeaderCandidateNode = 0,
+			ResigningLeader = 1,
+			LastElectedLeader = new int?[] { 1, 1, 1 },
+			NodePriorities = new[] { 0, int.MinValue, int.MinValue },
+		};
+
+		// Pick the node with the highest priority between non-resigning nodes
+		// over the resigning leader
+		yield return new TestCase {
+			ExpectedLeaderCandidateNode = 2,
+			ResigningLeader = 0,
+			LastElectedLeader = new int?[] { 0, 0, 0 },
+			ChaserCheckpoints = new long[] { 1, 1, 1 },
+			NodePriorities = new[] { int.MaxValue, 0, 1 },
+		};
+
+		// Pick the node with the highest chaser checkpoint
+		// over the resigning leader, despite node priority
+		yield return new TestCase {
+			ExpectedLeaderCandidateNode = 2,
+			ResigningLeader = 0,
+			LastElectedLeader = new int?[] { 0, 0, 0 },
+			ChaserCheckpoints = new long[] { 1, 0, 1 },
+			NodePriorities = new[] { int.MinValue, 0, int.MinValue },
+		};
+
+		// Pick the node with the highest writer checkpoint
+		// over the resigning leader, despite node priority
+		yield return new TestCase {
+			ExpectedLeaderCandidateNode = 2,
+			WriterCheckpoints = new long[] { 1, 0, 1 },
+			NodePriorities = new[] { int.MinValue, 0, int.MinValue },
+			LastElectedLeader = new int?[] { 0, 0, 0 },
+			ResigningLeader = 0
+		};
+
+		// Prefer the majority last leader, highest epoch, chaser, and priority
+		yield return new TestCase {
+			ExpectedLeaderCandidateNode = 2,
+			LastElectedLeader = new int?[] { 0, 2, 2 },
+			EpochNumbers = new[] { 10, 11, 11 },
+			ChaserCheckpoints = new long[] { 0, 0, 5 },
+			NodePriorities = new[] { 0, 0, 1 },
+		};
+
+		// Prefer the majority last leader, highest chaser, and priority
+		yield return new TestCase {
+			ExpectedLeaderCandidateNode = 2,
+			LastElectedLeader = new int?[] { 0, 2, 2 },
+			EpochNumbers = new[] { 5, 5, 5 },
+			ChaserCheckpoints = new long[] { 0, 0, 5 },
+			NodePriorities = new[] { 0, 0, 1 },
+		};
+
+		// Prefer the majority last leader, highest epoch, chaser, writer, and priority
+		yield return new TestCase {
+			ExpectedLeaderCandidateNode = 2,
+			LastElectedLeader = new int?[] { 0, 2, 2 },
+			EpochNumbers = new[] { 10, 11, 11 },
+			WriterCheckpoints = new[] { 10L, 5, 5 },
+			ChaserCheckpoints = new long[] { 0, 5, 5 },
+			NodePriorities = new[] { 0, 0, 1 },
+		};
+
+		// Prefer the majority last leader, highest epoch, chaser, writer
+		// despite priority
+		yield return new TestCase {
+			ExpectedLeaderCandidateNode = 1,
+			LastElectedLeader = new int?[] { 0, 1, 1 },
+			EpochNumbers = new[] { 10, 11, 11 },
+			WriterCheckpoints = new[] { 10L, 5, 5 },
+			ChaserCheckpoints = new long[] { 0, 5, 5 },
+			NodePriorities = new[] { 0, 0, 1 },
+		};
+
+		// Prefer the majority last leader, highest epoch, and chaser,
+		// despite writer checkpoint
+		yield return new TestCase {
+			ExpectedLeaderCandidateNode = 2,
+			LastElectedLeader = new int?[] { 0, 2, 2 },
+			EpochNumbers = new[] { 10, 11, 11 },
+			WriterCheckpoints = new[] { 10L, 5, 5 },
+			ChaserCheckpoints = new long[] { 0, 5, 5 },
+			NodePriorities = new[] { 0, 0, 0 },
+		};
+	}
+
+	[Test, TestCaseSource(nameof(TestCases))]
+	public void should_select_valid_best_leader_candidate(TestCase tc) {
+		var epochId = Guid.NewGuid();
+		var members = new MemberInfo[3];
+		var prepareOks = new Dictionary<Guid, ElectionMessage.PrepareOk>();
+
+		Func<int, long> writerCheckpoint = i => tc.WriterCheckpoints[i];
+		Func<int, long> chaserCheckpoint = i => tc.ChaserCheckpoints[i];
+		Func<int, int> nodePriority = i => tc.NodePriorities[i];
+		Func<int, int> epochNumber = i => tc.EpochNumbers[i];
+
+		for (int index = 0; index < 3; index++) {
+			members[index] = CreateMemberInfo(index, epochId, writerCheckpoint,
+				chaserCheckpoint, nodePriority, epochNumber);
+		}
+
+		var clusterInfo = new ClusterInfo(members);
+		Func<int, Guid> previousLeaderId = i => !tc.LastElectedLeader[i].HasValue ? Guid.Empty : IdForNode(tc.LastElectedLeader[i].Value);
+
+		for (int index = 0; index < 3; index++) {
+			var prepareOk = CreatePrepareOk(index, epochId, writerCheckpoint, chaserCheckpoint,
+				nodePriority, epochNumber, previousLeaderId, clusterInfo);
+			prepareOks.Add(prepareOk.ServerId, prepareOk);
+		}
+
+		var resigningLeadership = tc.ResigningLeader.HasValue
+			? (Guid?)IdForNode(tc.ResigningLeader.Value)
+			: null;
+		var mc = SUT.GetBestLeaderCandidate(prepareOks, members, resigningLeadership, 0);
+
+		Assert.AreEqual(IdForNode(tc.ExpectedLeaderCandidateNode), mc.InstanceId, $"Expected node {tc.ExpectedLeaderCandidateNode} got node {Array.FindIndex(members, 0, m => m.InstanceId == mc.InstanceId) + 1}");
+
+		var ownInfo = CreateLeaderCandidate(1, epochId, writerCheckpoint, chaserCheckpoint,
+			nodePriority, epochNumber, previousLeaderId);
+
+		var isLegit = SUT.IsLegitimateLeader(1, EndpointForNode(tc.ProposingNode),
+			IdForNode(tc.ProposingNode), mc, members, null, members[0].InstanceId,
+			ownInfo, resigningLeadership);
+
+		Assert.True(isLegit);
+	}
+
+
+	static ElectionMessage.PrepareOk CreatePrepareOk(int i, Guid epochId,
+		Func<int, long> writerCheckpoint,
+		Func<int, long> chaserCheckpoint,
+		Func<int, int> nodePriority,
+		Func<int, int> epochNumber,
+		Func<int, Guid> previousLeaderId,
+		ClusterInfo clusterInfo) {
+		var id = IdForNode(i);
+		var ep = EndpointForNode(i);
+		return new ElectionMessage.PrepareOk(1, id, ep, epochNumber(i), 1, epochId, previousLeaderId(i), -1, writerCheckpoint(i),
+			chaserCheckpoint(i), nodePriority(i), clusterInfo);
+	}
+
+	static SUT.LeaderCandidate CreateLeaderCandidate(int i, Guid epochId,
+		Func<int, long> writerCheckpoint,
+		Func<int, long> chaserCheckpoint,
+		Func<int, int> nodePriority,
+		Func<int, int> epochNumber,
+		Func<int, Guid> previousLeaderId) {
+		var id = IdForNode(i);
+		var ep = EndpointForNode(i);
+		return new SUT.LeaderCandidate(id, ep, epochNumber(i), 1, epochId, previousLeaderId(i), -1, writerCheckpoint(i),
+			chaserCheckpoint(i), nodePriority(i));
+	}
+
+	static MemberInfo CreateMemberInfo(int i, Guid epochId,
+		Func<int, long> writerCheckpoint,
+		Func<int, long> chaserCheckpoint,
+		Func<int, int> nodePriority,
+		Func<int, int> epochNumber
+		) {
+		var id = IdForNode(i);
+		var ep = EndpointForNode(i);
+		return MemberInfo.ForVNode(id, DateTime.Now, VNodeState.Follower, true, ep, ep, ep, ep, ep, null, 0, 0,
+			 -1, writerCheckpoint(i), chaserCheckpoint(i), 1, epochNumber(i), epochId, nodePriority(i), false);
+	}
+
+	private static IPEndPoint EndpointForNode(int i) {
+		return new IPEndPoint(IPAddress.Loopback, 1000 + i);
+	}
+
+	private static Guid IdForNode(int i) {
+		return Guid.Parse($"101EFD13-F9CD-49BE-9C6D-E6AF9AF5540{i}");
+	}
+
+	static object[] TestCases() {
+		return CreateCases().Cast<object>().ToArray();
+	}
+
+	public class TestCase {
+		public int ExpectedLeaderCandidateNode { get; set; }
+		public int? ResigningLeader { get; set; }
+		public int ProposingNode { get; set; }
+		public int?[] LastElectedLeader { get; set; } = { null, null, null };
+		public long[] WriterCheckpoints { get; set; } = { 1L, 1, 1 };
+		public long[] ChaserCheckpoints { get; set; } = { 1L, 1, 1 };
+		public int[] NodePriorities { get; set; } = { 1, 1, 1 };
+		public int[] EpochNumbers { get; set; } = { -1, -1, -1 };
+
+		private static int _id = 0;
+		private static string GenerateName(int expectedLeaderCandidateNode, int?[] previousLeader,
+			long[] writerCheckpoints,
+			long[] chaserCheckpoints, int[] nodePriorities, int[] epochNumbers) {
+			var nameBuilder = new StringBuilder();
+			nameBuilder.Append($"{_id++} ");
+			if (writerCheckpoints != null) {
+				if (nameBuilder.Length == 0)
+					nameBuilder.Append("Nodes with ");
+				else
+					nameBuilder.Append(" and ");
+				nameBuilder.AppendFormat("writer checkpoints << {0} >>", string.Join(",",
+					writerCheckpoints.Where(x => x != 1).Select((x, i) => $"{i} : wcp {x}")));
+			}
+
+			if (chaserCheckpoints != null) {
+				if (nameBuilder.Length == 0)
+					nameBuilder.Append("Nodes with ");
+				else
+					nameBuilder.Append(" and ");
+				nameBuilder.AppendFormat("chaser checkpoints << {0} >>", string.Join(",",
+					chaserCheckpoints.Where(x => x != 1).Select((x, i) => $"{i} : ccp {x}")));
+			}
+
+			if (nodePriorities != null) {
+				if (nameBuilder.Length == 0)
+					nameBuilder.Append("Nodes with ");
+				else
+					nameBuilder.Append(" and ");
+				nameBuilder.AppendFormat("node priorities << {0} >>", string.Join(",",
+					nodePriorities.Where(x => x != 0).Select((x, i) => $"{i} : np {x}")));
+			}
+			if (epochNumbers != null) {
+				nameBuilder.Append(nameBuilder.Length == 0 ? "Nodes with " : " and ");
+				nameBuilder.AppendFormat("epoch numbers << {0} >>", string.Join(",",
+					epochNumbers.Where(x => x != 0).Select((x, i) => $"{i} : en {x}")));
+			}
+
+			if (nameBuilder.Length == 0)
+				nameBuilder.AppendFormat("All nodes caught up with the same priority expect {0} to be leader",
+					expectedLeaderCandidateNode);
+			var name = nameBuilder.ToString();
+			return name;
+		}
+
+		public override string ToString() {
+			return GenerateName(ExpectedLeaderCandidateNode, LastElectedLeader, WriterCheckpoints, ChaserCheckpoints,
+				NodePriorities, EpochNumbers);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/ElectionParams.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/ElectionParams.cs
new file mode 100644
index 00000000000..a44a416c153
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/ElectionParams.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+public static class ElectionParams {
+	public const int TestRunCount = 50;
+	public const int MaxIterationCount = 25000;
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/ElectionsInstance.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/ElectionsInstance.cs
new file mode 100644
index 00000000000..c4e76e95c2a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/ElectionsInstance.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using KurrentDB.Core.Bus;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+internal class ElectionsInstance {
+	public readonly Guid InstanceId;
+	public readonly EndPoint EndPoint;
+
+	public readonly IPublisher InputBus;
+	public readonly IPublisher OutputBus;
+
+	public ElectionsInstance(Guid instanceId, EndPoint endPoint, IPublisher inputBus, IPublisher outputBus) {
+		InstanceId = instanceId;
+		EndPoint = endPoint;
+		InputBus = inputBus;
+		OutputBus = outputBus;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/ElectionsLogger.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/ElectionsLogger.cs
new file mode 100644
index 00000000000..ad6928f2171
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/ElectionsLogger.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Tests.Infrastructure;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+internal class ElectionsLogger : IRandTestItemProcessor {
+	public IEnumerable<RandTestQueueItem> ProcessedItems {
+		get { return _items; }
+	}
+
+	public IEnumerable<Message> Messages {
+		get { return _items.Select(x => x.Message); }
+	}
+
+	private readonly List<RandTestQueueItem> _items = new List<RandTestQueueItem>();
+
+	public void Process(int iteration, RandTestQueueItem item) {
+		_items.Add(item);
+	}
+
+	public void LogMessages() {
+		Console.WriteLine("There were a total of {0} messages in this run.", ProcessedItems.Count());
+
+		foreach (var it in ProcessedItems) {
+			Console.WriteLine(it);
+
+			var gossip = it.Message as GossipMessage.GossipUpdated;
+			if (gossip != null) {
+				Console.WriteLine("=== gsp on {0}", it.EndPoint);
+				Console.WriteLine(gossip.ClusterInfo.ToString().Replace("; ", Environment.NewLine));
+				Console.WriteLine("===");
+			}
+
+			var done = it.Message as ElectionMessage.ElectionsDone;
+			if (done != null) {
+				Console.WriteLine("=== leader on {0}: {1}", it.EndPoint, done.Leader);
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/ElectionsProgressCondition.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/ElectionsProgressCondition.cs
new file mode 100644
index 00000000000..fe6e8a11368
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/ElectionsProgressCondition.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Infrastructure;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+internal class ElectionsProgressCondition : IRandTestFinishCondition {
+	public bool Done { get; protected set; }
+
+	public bool Success {
+		get {
+			var byView = ElectionsResults.Values.GroupBy(x => x.Item1)
+				.Select(x => Tuple.Create(x.Count(), x.Select(y => y.Item2).Distinct().Count()))
+				.ToArray();
+			return byView.Count(x => x.Item1 >= _majorityCount && x.Item2 == 1) == 1;
+		}
+	}
+
+	private readonly int _majorityCount;
+
+	protected readonly Dictionary<EndPoint, Tuple<int, EndPoint>> ElectionsResults =
+		new Dictionary<EndPoint, Tuple<int, EndPoint>>();
+
+	public ElectionsProgressCondition(int instancesCount) {
+		_majorityCount = instancesCount / 2 + 1;
+	}
+
+	public virtual void Process(int iteration, RandTestQueueItem item) {
+		var msg = item.Message as ElectionMessage.ElectionsDone;
+		if (msg != null) {
+			var leader = msg.Leader.HttpEndPoint;
+			ElectionsResults[item.EndPoint] = Tuple.Create(msg.InstalledView, leader);
+			Done = ElectionsResults.Values.Count(x => x.Item1 == msg.InstalledView) >= _majorityCount;
+		}
+	}
+
+	public void Log() {
+		Console.WriteLine("Success Condition data:");
+		Console.WriteLine("node - (installed view, leader)");
+		foreach (var electionsResult in ElectionsResults) {
+			Console.WriteLine("{0} - ({1}, {2})",
+				electionsResult.Key.GetPort(),
+				electionsResult.Value.Item1,
+				electionsResult.Value.Item2.GetPort());
+		}
+
+		Console.WriteLine("end.");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/ElectionsSafetyCondition.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/ElectionsSafetyCondition.cs
new file mode 100644
index 00000000000..05af4c1d60c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/ElectionsSafetyCondition.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Infrastructure;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+internal class ElectionsSafetyCondition : IRandTestFinishCondition {
+	public bool Done { get; private set; }
+
+	public bool Success {
+		get {
+			if (_electionsResults.Count == 0)
+				return false;
+			var leader = _electionsResults.First().Value;
+			return _electionsResults.Values.All(x => x.Equals(leader)); // same leader for all
+		}
+	}
+
+	private readonly int _instancesCount;
+
+	private readonly Dictionary<EndPoint, EndPoint>
+		_electionsResults = new Dictionary<EndPoint, EndPoint>();
+
+	public ElectionsSafetyCondition(int instancesCount) {
+		_instancesCount = instancesCount;
+	}
+
+	public void Process(int iteration, RandTestQueueItem item) {
+		var electionsMsg = item.Message as ElectionMessage.ElectionsDone;
+		if (electionsMsg != null) {
+			_electionsResults[item.EndPoint] = electionsMsg.Leader.HttpEndPoint;
+			Done = _electionsResults.Count == _instancesCount;
+		}
+	}
+
+	public void Log() {
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/GossipUpdateParams.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/GossipUpdateParams.cs
new file mode 100644
index 00000000000..724a152f723
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/GossipUpdateParams.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+internal static class GossipUpdateParams {
+	public const int AddNodeProbabilityPercent = 12;
+	public const int KillNodeProbabilityPercent = 5;
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/InnerBusMessagesProcessor.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/InnerBusMessagesProcessor.cs
new file mode 100644
index 00000000000..9d495d6cfed
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/InnerBusMessagesProcessor.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Infrastructure;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+internal class InnerBusMessagesProcessor : IHandle<Message> {
+	private readonly RandomTestRunner _runner;
+	private readonly IPEndPoint _endPoint;
+	private readonly IPublisher _bus;
+
+	public InnerBusMessagesProcessor(RandomTestRunner runner, IPEndPoint endPoint, IPublisher bus) {
+		if (runner == null)
+			throw new ArgumentNullException("runner");
+		if (endPoint == null)
+			throw new ArgumentNullException("endPoint");
+		if (bus == null)
+			throw new ArgumentNullException("bus");
+
+		_runner = runner;
+		_endPoint = endPoint;
+		_bus = bus;
+	}
+
+	public void Handle(Message message) {
+		// timer message and SendOverGrpc is handled differently
+		if (message is TimerMessage.Schedule)
+			return;
+
+		_runner.Enqueue(_endPoint, message, _bus); // process with no delay and no reorderings
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/RandomizedElectionsAndGossipTestCase.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/RandomizedElectionsAndGossipTestCase.cs
new file mode 100644
index 00000000000..505c6914d4c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/RandomizedElectionsAndGossipTestCase.cs
@@ -0,0 +1,89 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Net;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Tests.Infrastructure;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+internal class RandomizedElectionsAndGossipTestCase : RandomizedElectionsTestCase {
+	public delegate MemberInfo[] CreateInitialGossip(ElectionsInstance instance, ElectionsInstance[] allInstances);
+
+	public delegate MemberInfo[] CreateUpdatedGossip(int iteration,
+		RandTestQueueItem item,
+		ElectionsInstance[] instances,
+		MemberInfo[] initialGossip,
+		Dictionary<EndPoint, MemberInfo[]> previousGossip);
+
+	private readonly CreateInitialGossip _createInitialGossip;
+	private readonly CreateUpdatedGossip _createUpdatedGossip;
+
+	private readonly SendOverGrpcBlockingProcessor _sendOverGrpcBlockingProcessor;
+	private readonly UpdateGossipProcessor _updateGossipProcessor;
+
+	public RandomizedElectionsAndGossipTestCase(int maxIterCnt,
+		int instancesCnt,
+		double httpLossProbability,
+		double httpDupProbability,
+		int httpMaxDelay,
+		int timerMinDelay,
+		int timerMaxDelay,
+		CreateInitialGossip createInitialGossip,
+		CreateUpdatedGossip createUpdatedGossip,
+		int? rndSeed = null)
+		: base(maxIterCnt,
+			instancesCnt,
+			httpLossProbability,
+			httpDupProbability,
+			httpMaxDelay,
+			timerMinDelay,
+			timerMaxDelay,
+			rndSeed) {
+		_createInitialGossip = createInitialGossip;
+		_createUpdatedGossip = createUpdatedGossip;
+
+		_sendOverGrpcBlockingProcessor = new SendOverGrpcBlockingProcessor(Rnd,
+			Runner,
+			HttpLossProbability,
+			HttpDupProbability,
+			HttpMaxDelay);
+
+		_updateGossipProcessor = new UpdateGossipProcessor(new ElectionsInstance[0],
+			_sendOverGrpcBlockingProcessor,
+			_createUpdatedGossip,
+			Enqueue
+		);
+	}
+
+	private void Enqueue(RandTestQueueItem item, Message message) {
+		Runner.Enqueue(item.EndPoint, message, item.Bus, 10);
+	}
+
+	protected override IRandTestFinishCondition GetFinishCondition() {
+		return new ElectionsProgressCondition(InstancesCnt);
+	}
+
+	protected override IRandTestItemProcessor[] GetAdditionalProcessors() {
+		return new IRandTestItemProcessor[] { _updateGossipProcessor };
+	}
+
+	protected override GossipMessage.GossipUpdated GetInitialGossipFor(ElectionsInstance instance,
+		List<ElectionsInstance> allInstances) {
+		var members = _createInitialGossip(instance, allInstances.ToArray());
+		_updateGossipProcessor.SetInitialData(allInstances, members);
+
+		return new GossipMessage.GossipUpdated(new ClusterInfo(members));
+	}
+
+	protected override SendOverGrpcProcessor GetSendOverHttpProcessor() {
+		return _sendOverGrpcBlockingProcessor;
+	}
+
+	public int Next(int maxValue) {
+		return Rnd.Next(maxValue);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/RandomizedElectionsTestCase.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/RandomizedElectionsTestCase.cs
new file mode 100644
index 00000000000..9aff73757df
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/RandomizedElectionsTestCase.cs
@@ -0,0 +1,165 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Infrastructure;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+internal class RandomizedElectionsTestCase {
+	protected readonly int RndSeed;
+	protected readonly Random Rnd;
+
+	protected readonly double HttpLossProbability;
+	protected readonly double HttpDupProbability;
+	protected readonly int HttpMaxDelay;
+
+	protected readonly int InstancesCnt;
+
+	private readonly int _maxIterCnt;
+
+	private readonly int _timerMinDelay;
+	private readonly int _timerMaxDelay;
+
+	private static readonly IPEndPoint BaseEndPoint = new IPEndPoint(IPAddress.Loopback, 1000);
+
+	public readonly RandomTestRunner Runner;
+	public readonly IRandTestItemProcessor Logger;
+	public IRandTestFinishCondition FinishCondition;
+
+	private readonly List<ElectionsInstance> _instances = new List<ElectionsInstance>();
+
+	private readonly bool _isReadOnlyReplica;
+
+	public RandomizedElectionsTestCase(int maxIterCnt,
+		int instancesCnt,
+		double httpLossProbability,
+		double httpDupProbability,
+		int httpMaxDelay,
+		int timerMinDelay,
+		int timerMaxDelay,
+		int? rndSeed = null,
+		bool isReadOnlyReplica = false) {
+		RndSeed = rndSeed ?? Math.Abs(Environment.TickCount);
+		Rnd = new Random(RndSeed);
+
+		_maxIterCnt = maxIterCnt;
+		InstancesCnt = instancesCnt;
+		HttpLossProbability = httpLossProbability;
+		HttpDupProbability = httpDupProbability;
+		HttpMaxDelay = httpMaxDelay;
+		_timerMinDelay = timerMinDelay;
+		_timerMaxDelay = timerMaxDelay;
+		_isReadOnlyReplica = isReadOnlyReplica;
+
+		Runner = new RandomTestRunner(_maxIterCnt);
+		Logger = new ElectionsLogger();
+	}
+
+	public virtual void Init() {
+		var sendOverHttpHandler = GetSendOverHttpProcessor();
+
+		for (int i = 0; i < InstancesCnt; ++i) {
+			var inputBus = new SynchronousScheduler($"ELECTIONS-INPUT-BUS-{i}");
+			var outputBus = new SynchronousScheduler($"ELECTIONS-OUTPUT-BUS-{i}");
+			var endPoint = new IPEndPoint(BaseEndPoint.Address, BaseEndPoint.Port + i);
+			var memberInfo = MemberInfo.Initial(Guid.NewGuid(), DateTime.UtcNow, VNodeState.Unknown, true,
+				endPoint, endPoint, endPoint, endPoint, endPoint, null, 0, 0, 0, false);
+			_instances.Add(new ElectionsInstance(memberInfo.InstanceId, endPoint, inputBus, outputBus));
+
+			sendOverHttpHandler.RegisterEndPoint(endPoint, inputBus);
+
+			var electionsService = new KurrentDB.Core.Services.ElectionsService(outputBus,
+				memberInfo,
+				InstancesCnt,
+				new InMemoryCheckpoint(),
+				new InMemoryCheckpoint(),
+				new InMemoryCheckpoint(-1),
+				new FakeEpochManager(),
+				() => -1, 0, new FakeTimeProvider(),
+				TimeSpan.FromMilliseconds(1_000));
+			electionsService.SubscribeMessages(inputBus);
+
+			outputBus.Subscribe(sendOverHttpHandler);
+			outputBus.Subscribe(new TimerMessageProcessor(Rnd,
+				Runner,
+				endPoint,
+				inputBus,
+				_timerMinDelay,
+				_timerMaxDelay));
+			outputBus.Subscribe(new InnerBusMessagesProcessor(Runner, endPoint, inputBus));
+		}
+	}
+
+	protected virtual SendOverGrpcProcessor GetSendOverHttpProcessor() {
+		return new SendOverGrpcProcessor(Rnd,
+			Runner,
+			HttpLossProbability,
+			HttpDupProbability,
+			HttpMaxDelay);
+	}
+
+	protected virtual IRandTestFinishCondition GetFinishCondition() {
+		return new ElectionsProgressCondition(InstancesCnt);
+	}
+
+	protected virtual IRandTestItemProcessor[] GetAdditionalProcessors() {
+		return new IRandTestItemProcessor[] { };
+	}
+
+	protected virtual GossipMessage.GossipUpdated GetInitialGossipFor(ElectionsInstance instance,
+		List<ElectionsInstance> allInstances) {
+		var members = allInstances.Select(
+			x => MemberInfo.ForVNode(x.InstanceId, DateTime.UtcNow, VNodeState.Unknown, true,
+				x.EndPoint, null, x.EndPoint, null,
+				x.EndPoint, null, 0, 0, -1, 0, 0, -1, -1, Guid.Empty, 0, false));
+		var gossip = new GossipMessage.GossipUpdated(new ClusterInfo(members.ToArray()));
+		return gossip;
+	}
+
+	public bool Run() {
+		FinishCondition = GetFinishCondition();
+
+		foreach (var instance in _instances) {
+			Runner.Enqueue(instance.EndPoint, new SystemMessage.SystemInit(), instance.InputBus);
+			Runner.Enqueue(instance.EndPoint, new ElectionMessage.StartElections(), instance.InputBus);
+
+			var gossip = GetInitialGossipFor(instance, _instances);
+			Runner.Enqueue(instance.EndPoint, gossip, instance.InputBus);
+		}
+
+		var additionalProcessors = GetAdditionalProcessors();
+		var processors = new[] { Logger }.Union(additionalProcessors);
+
+		var isGood = Runner.Run(FinishCondition, processors.ToArray());
+
+		if (!isGood) {
+			Console.WriteLine("Unsuccessful run. Parameters:\n"
+							  + "rndSeed: {0}\n"
+							  + "maxIterCnt = {1}\n"
+							  + "instancesCnt = {2}\n"
+							  + "httpLossProbability = {3}\n"
+							  + "httpMaxDelay = {4}\n"
+							  + "timerMinDelay = {5}\n"
+							  + "timerMaxDelay = {6}\n",
+				RndSeed,
+				_maxIterCnt,
+				InstancesCnt,
+				HttpLossProbability,
+				HttpMaxDelay,
+				_timerMinDelay,
+				_timerMaxDelay);
+		}
+
+		return isGood;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/SendOverGrpcBlockingProcessor.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/SendOverGrpcBlockingProcessor.cs
new file mode 100644
index 00000000000..dacff909859
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/SendOverGrpcBlockingProcessor.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Infrastructure;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+internal class SendOverGrpcBlockingProcessor : SendOverGrpcProcessor {
+	private readonly Dictionary<EndPoint, bool> _endpointsToSkip;
+
+	public SendOverGrpcBlockingProcessor(Random rnd,
+		RandomTestRunner runner,
+		double lossProb,
+		double dupProb,
+		int maxDelay) : base(rnd, runner, lossProb, dupProb, maxDelay) {
+		_endpointsToSkip = new Dictionary<EndPoint, bool>();
+	}
+
+	public void RegisterEndpointToSkip(EndPoint endPoint, bool shouldSkip) {
+		_endpointsToSkip[endPoint] = shouldSkip;
+	}
+
+	protected override bool ShouldSkipMessage(GrpcMessage.SendOverGrpc message) {
+		bool shouldSkip;
+		return _endpointsToSkip.TryGetValue(message.DestinationEndpoint, out shouldSkip) && shouldSkip;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/SendOverGrpcProcessor.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/SendOverGrpcProcessor.cs
new file mode 100644
index 00000000000..20ab5884386
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/SendOverGrpcProcessor.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Infrastructure;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+internal class SendOverGrpcProcessor : IHandle<GrpcMessage.SendOverGrpc> {
+	private readonly Random _rnd;
+	private readonly Dictionary<EndPoint, IPublisher> _httpBuses = new Dictionary<EndPoint, IPublisher>();
+	private readonly RandomTestRunner _runner;
+	private readonly double _lossProb;
+	private readonly double _dupProb;
+	private readonly int _maxDelay;
+
+	public SendOverGrpcProcessor(Random rnd, RandomTestRunner runner, double lossProb, double dupProb,
+		int maxDelay) {
+		if (rnd == null)
+			throw new ArgumentNullException("rnd");
+		if (runner == null)
+			throw new ArgumentNullException("runner");
+		if (lossProb < 0.0 || lossProb > 1.0)
+			throw new ArgumentOutOfRangeException("lossProb");
+		if (dupProb < 0.0 || dupProb > 1.0)
+			throw new ArgumentOutOfRangeException("dupProb");
+		if (maxDelay <= 0)
+			throw new ArgumentOutOfRangeException("maxDelay");
+
+		_rnd = rnd;
+		_runner = runner;
+		_lossProb = lossProb;
+		_dupProb = dupProb;
+		_maxDelay = maxDelay;
+	}
+
+	public void RegisterEndPoint(EndPoint endPoint, IPublisher bus) {
+		_httpBuses.Add(endPoint, bus);
+	}
+
+	public void Handle(GrpcMessage.SendOverGrpc message) {
+		if (_rnd.NextDouble() < _lossProb)
+			return;
+
+		if (ShouldSkipMessage(message))
+			return;
+
+		IPublisher publisher;
+		if (!_httpBuses.TryGetValue(message.DestinationEndpoint, out publisher))
+			throw new InvalidOperationException(string.Format("No HTTP bus subscribed for EndPoint: {0}.",
+				message.DestinationEndpoint));
+
+		_runner.Enqueue(message.DestinationEndpoint, message.Message, publisher, 1 + _rnd.Next(_maxDelay));
+
+		if (_rnd.NextDouble() < _dupProb)
+			_runner.Enqueue(message.DestinationEndpoint, message.Message, publisher, 1 + _rnd.Next(_maxDelay));
+	}
+
+	protected virtual bool ShouldSkipMessage(GrpcMessage.SendOverGrpc message) {
+		return false;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/SeqHelpers.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/SeqHelpers.cs
new file mode 100644
index 00000000000..ca1e368b816
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/SeqHelpers.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+public static class SeqHelpers {
+	public static IEnumerable<T> Shuffle<T>(this IEnumerable<T> source, Func<int, int> rndNext) {
+		var array = source.ToArray();
+		var n = array.Length;
+		while (n > 1) {
+			var k = rndNext(n);
+			n--;
+			var temp = array[n];
+			array[n] = array[k];
+			array[k] = temp;
+		}
+
+		return array;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/TimerMessageProcessor.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/TimerMessageProcessor.cs
new file mode 100644
index 00000000000..f1dae28327e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/TimerMessageProcessor.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Infrastructure;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+internal class TimerMessageProcessor : IHandle<TimerMessage.Schedule> {
+	private readonly Random _rnd;
+	private readonly RandomTestRunner _runner;
+	private readonly IPEndPoint _endPoint;
+	private readonly IPublisher _bus;
+	private readonly int _delayMin;
+	private readonly int _delayMax;
+
+	public TimerMessageProcessor(Random rnd,
+		RandomTestRunner runner,
+		IPEndPoint endPoint,
+		IPublisher bus,
+		int delayMin,
+		int delayMax) {
+		if (rnd == null)
+			throw new ArgumentNullException("rnd");
+		if (runner == null)
+			throw new ArgumentNullException("runner");
+		if (endPoint == null)
+			throw new ArgumentNullException("endPoint");
+		if (bus == null)
+			throw new ArgumentNullException("bus");
+		if (delayMin <= 0)
+			throw new ArgumentOutOfRangeException("delayMin");
+		if (delayMin >= delayMax)
+			throw new ArgumentException("DelayMin should be strictly less than DelayMax.");
+
+		_rnd = rnd;
+		_runner = runner;
+		_endPoint = endPoint;
+		_bus = bus;
+		_delayMin = delayMin;
+		_delayMax = delayMax;
+	}
+
+	public void Handle(TimerMessage.Schedule message) {
+		_runner.Enqueue(_endPoint, message.ReplyMessage, _bus, _rnd.Next(_delayMin, _delayMax));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/UpdateGossipProcessor.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/UpdateGossipProcessor.cs
new file mode 100644
index 00000000000..9a9c32a716b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/UpdateGossipProcessor.cs
@@ -0,0 +1,93 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Tests.Infrastructure;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+internal class UpdateGossipProcessor : IRandTestItemProcessor {
+	private readonly SendOverGrpcBlockingProcessor _sendOverGrpcProcessor;
+	private readonly RandomizedElectionsAndGossipTestCase.CreateUpdatedGossip _createUpdatedGossip;
+	private readonly Action<RandTestQueueItem, Message> _enqueue;
+	private ElectionsInstance[] _instances;
+	private readonly List<RandTestQueueItem> _processedItems;
+
+	private MemberInfo[] _initialGossip;
+	private Dictionary<EndPoint, MemberInfo[]> _previousGossip;
+
+	public UpdateGossipProcessor(IEnumerable<ElectionsInstance> allInstances,
+		SendOverGrpcBlockingProcessor sendOverGrpcProcessor,
+		RandomizedElectionsAndGossipTestCase.CreateUpdatedGossip createUpdatedGossip,
+		Action<RandTestQueueItem, Message> enqueue) {
+		_sendOverGrpcProcessor = sendOverGrpcProcessor;
+		_createUpdatedGossip = createUpdatedGossip;
+		_enqueue = enqueue;
+		_instances = allInstances.ToArray();
+
+		_processedItems = new List<RandTestQueueItem>();
+		ProcessedItems = _processedItems;
+	}
+
+	public void SetInitialData(IEnumerable<ElectionsInstance> allInstances,
+		IEnumerable<MemberInfo> initialGossip) {
+		_instances = allInstances.ToArray();
+		_initialGossip = initialGossip.ToArray();
+		_previousGossip = _instances.ToDictionary(x => x.EndPoint, v => _initialGossip);
+	}
+
+	public IEnumerable<RandTestQueueItem> ProcessedItems { get; private set; }
+
+	public void Process(int iteration, RandTestQueueItem item) {
+		var electionsDone = item.Message as ElectionMessage.ElectionsDone;
+		if (electionsDone != null) {
+			MemberInfo[] previousMembers;
+			if (_previousGossip.TryGetValue(item.EndPoint, out previousMembers)) {
+				var leaderIndex = Array.FindIndex(previousMembers,
+					x => x.Is(electionsDone.Leader.HttpEndPoint));
+				if (leaderIndex != -1) {
+					var previousLeaderInfo = previousMembers[leaderIndex];
+					var leaderEndPoint = previousLeaderInfo.HttpEndPoint;
+
+					previousMembers[leaderIndex] =
+						MemberInfo.ForVNode(previousLeaderInfo.InstanceId, DateTime.UtcNow, VNodeState.Leader,
+							previousLeaderInfo.IsAlive, leaderEndPoint, null, leaderEndPoint, null, leaderEndPoint, null, 0, 0,
+							-1, 0, 0, -1, -1, Guid.Empty, 0, false);
+				}
+			}
+		}
+
+		var updatedGossip = _createUpdatedGossip(iteration, item, _instances, _initialGossip, _previousGossip);
+		if (updatedGossip != null) {
+			if (updatedGossip.Length > _instances.Length)
+				throw new InvalidDataException(
+					"Gossip should not contain more items than there are servers in the cluster.");
+
+			_processedItems.Add(item);
+
+			foreach (var memberInfo in updatedGossip) {
+				_sendOverGrpcProcessor.RegisterEndpointToSkip(memberInfo.ExternalTcpEndPoint, !memberInfo.IsAlive);
+			}
+
+			var updateGossipMessage = new GossipMessage.GossipUpdated(new ClusterInfo(updatedGossip));
+
+			_enqueue(item, updateGossipMessage);
+			_previousGossip[item.EndPoint] = updatedGossip;
+
+			var leader = updateGossipMessage.ClusterInfo.Members.FirstOrDefault(x => x.IsAlive && x.State == VNodeState.Leader);
+			if (leader == null)
+				_enqueue(item, new ElectionMessage.StartElections());
+		}
+	}
+
+	public void LogMessages() {
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_3_nodes_full_gossip_no_http_loss_no_dup.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_3_nodes_full_gossip_no_http_loss_no_dup.cs
new file mode 100644
index 00000000000..ce02754aa6e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_3_nodes_full_gossip_no_http_loss_no_dup.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+[TestFixture]
+public class elections_service_3_nodes_full_gossip_no_http_loss_no_dup {
+	private RandomizedElectionsTestCase _randomCase;
+
+	[SetUp]
+	public void SetUp() {
+		_randomCase = new RandomizedElectionsTestCase(ElectionParams.MaxIterationCount,
+			instancesCnt: 3,
+			httpLossProbability: 0.0,
+			httpDupProbability: 0.0,
+			httpMaxDelay: 20,
+			timerMinDelay: 100,
+			timerMaxDelay: 200);
+		_randomCase.Init();
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public void should_always_arrive_at_coherent_results([Range(0, ElectionParams.TestRunCount - 1)]
+		int run) {
+		var success = _randomCase.Run();
+		if (!success)
+			_randomCase.Logger.LogMessages();
+		Console.WriteLine("There were a total of {0} messages in this run.",
+			_randomCase.Logger.ProcessedItems.Count());
+		Assert.True(success);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_3_nodes_full_gossip_some_http_loss_some_dup.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_3_nodes_full_gossip_some_http_loss_some_dup.cs
new file mode 100644
index 00000000000..f8706f1d10f
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_3_nodes_full_gossip_some_http_loss_some_dup.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+[TestFixture]
+public class elections_service_3_nodes_full_gossip_some_http_loss_some_dup {
+	private RandomizedElectionsTestCase _randomCase;
+
+	[SetUp]
+	public void SetUp() {
+		_randomCase = new RandomizedElectionsTestCase(ElectionParams.MaxIterationCount,
+			instancesCnt: 3,
+			httpLossProbability: 0.3,
+			httpDupProbability: 0.3,
+			httpMaxDelay: 20,
+			timerMinDelay: 100,
+			timerMaxDelay: 200);
+		_randomCase.Init();
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public void should_always_arrive_at_coherent_results([Range(0, ElectionParams.TestRunCount - 1)]
+		int run) {
+		var success = _randomCase.Run();
+		if (!success)
+			_randomCase.Logger.LogMessages();
+		Console.WriteLine("There were a total of {0} messages in this run.",
+			_randomCase.Logger.ProcessedItems.Count());
+		Assert.True(success);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_4_nodes_full_gossip_no_http_loss_no_dup.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_4_nodes_full_gossip_no_http_loss_no_dup.cs
new file mode 100644
index 00000000000..416b1993cb6
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_4_nodes_full_gossip_no_http_loss_no_dup.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+[TestFixture]
+public class elections_service_4_nodes_full_gossip_no_http_loss_no_dup {
+	private RandomizedElectionsTestCase _randomCase;
+
+	[SetUp]
+	public void SetUp() {
+		_randomCase = new RandomizedElectionsTestCase(ElectionParams.MaxIterationCount,
+			instancesCnt: 6,
+			httpLossProbability: 0.0,
+			httpDupProbability: 0.0,
+			httpMaxDelay: 20,
+			timerMinDelay: 100,
+			timerMaxDelay: 200);
+		_randomCase.Init();
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public void should_always_arrive_at_coherent_results([Range(0, ElectionParams.TestRunCount - 1)]
+		int run) {
+		var success = _randomCase.Run();
+		if (!success)
+			_randomCase.Logger.LogMessages();
+		Console.WriteLine("There were a total of {0} messages in this run.",
+			_randomCase.Logger.ProcessedItems.Count());
+		Assert.True(success);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_4_nodes_full_gossip_some_http_loss_some_dup.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_4_nodes_full_gossip_some_http_loss_some_dup.cs
new file mode 100644
index 00000000000..458eeb543ec
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_4_nodes_full_gossip_some_http_loss_some_dup.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+[TestFixture]
+public class elections_service_4_nodes_full_gossip_some_http_loss_some_dup {
+	private RandomizedElectionsTestCase _randomCase;
+
+	[SetUp]
+	public void SetUp() {
+		_randomCase = new RandomizedElectionsTestCase(ElectionParams.MaxIterationCount,
+			instancesCnt: 4,
+			httpLossProbability: 0.3,
+			httpDupProbability: 0.3,
+			httpMaxDelay: 20,
+			timerMinDelay: 100,
+			timerMaxDelay: 200);
+		_randomCase.Init();
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public void should_always_arrive_at_coherent_results([Range(0, ElectionParams.TestRunCount - 1)]
+		int run) {
+		var success = _randomCase.Run();
+		if (!success)
+			_randomCase.Logger.LogMessages();
+		Console.WriteLine("There were a total of {0} messages in this run.",
+			_randomCase.Logger.ProcessedItems.Count());
+		Assert.True(success);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_4_nodes_full_gossip_some_http_loss_some_dup_rndseed_20676840.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_4_nodes_full_gossip_some_http_loss_some_dup_rndseed_20676840.cs
new file mode 100644
index 00000000000..c41a318ca25
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_4_nodes_full_gossip_some_http_loss_some_dup_rndseed_20676840.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+[TestFixture]
+public class elections_service_4_nodes_full_gossip_some_http_loss_some_dup_rndseed_20676840 {
+	private RandomizedElectionsTestCase _randomCase;
+
+	[SetUp]
+	public void SetUp() {
+		_randomCase = new RandomizedElectionsTestCase(ElectionParams.MaxIterationCount,
+			instancesCnt: 4,
+			httpLossProbability: 0.5,
+			httpDupProbability: 0.3,
+			httpMaxDelay: 20,
+			timerMinDelay: 100,
+			timerMaxDelay: 200,
+			rndSeed: 20676840);
+
+		_randomCase.Init();
+	}
+
+	[Test]
+	[Category("Network")]
+	public void should_always_arrive_at_coherent_results() {
+		var success = _randomCase.Run();
+		if (!success)
+			_randomCase.Logger.LogMessages();
+		Console.WriteLine("There were a total of {0} messages in this run.",
+			_randomCase.Logger.ProcessedItems.Count());
+		Assert.True(success);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_full_gossip_no_http_loss_no_dup.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_full_gossip_no_http_loss_no_dup.cs
new file mode 100644
index 00000000000..11de99ef9e9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_full_gossip_no_http_loss_no_dup.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+[TestFixture]
+public class elections_service_5_nodes_full_gossip_no_http_loss_no_dup {
+	private RandomizedElectionsTestCase _randomCase;
+
+	[SetUp]
+	public void SetUp() {
+		_randomCase = new RandomizedElectionsTestCase(ElectionParams.MaxIterationCount,
+			instancesCnt: 5,
+			httpLossProbability: 0.0,
+			httpDupProbability: 0.0,
+			httpMaxDelay: 20,
+			timerMinDelay: 100,
+			timerMaxDelay: 200);
+		_randomCase.Init();
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public void should_always_arrive_at_coherent_results([Range(0, ElectionParams.TestRunCount - 1)]
+		int run) {
+		var success = _randomCase.Run();
+		if (!success)
+			_randomCase.Logger.LogMessages();
+		Console.WriteLine("There were a total of {0} messages in this run.",
+			_randomCase.Logger.ProcessedItems.Count());
+		Assert.True(success);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_full_gossip_some_http_loss_some_dup.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_full_gossip_some_http_loss_some_dup.cs
new file mode 100644
index 00000000000..b2a97ade365
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_full_gossip_some_http_loss_some_dup.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+[TestFixture]
+public class elections_service_5_nodes_full_gossip_some_http_loss_some_dup {
+	private RandomizedElectionsTestCase _randomCase;
+
+	[SetUp]
+	public void SetUp() {
+		_randomCase = new RandomizedElectionsTestCase(ElectionParams.MaxIterationCount,
+			instancesCnt: 5,
+			httpLossProbability: 0.3,
+			httpDupProbability: 0.3,
+			httpMaxDelay: 20,
+			timerMinDelay: 100,
+			timerMaxDelay: 200);
+		_randomCase.Init();
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public void should_always_arrive_at_coherent_results([Range(0, ElectionParams.TestRunCount - 1)]
+		int run) {
+		var success = _randomCase.Run();
+		if (!success)
+			_randomCase.Logger.LogMessages();
+		Console.WriteLine("There were a total of {0} messages in this run.",
+			_randomCase.Logger.ProcessedItems.Count());
+		Assert.True(success);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_with_1_known_when_started_and_set_full_imediately.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_with_1_known_when_started_and_set_full_imediately.cs
new file mode 100644
index 00000000000..8487fb1a69f
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_with_1_known_when_started_and_set_full_imediately.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Infrastructure;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+[TestFixture]
+public class elections_service_5_nodes_with_1_known_when_started_and_set_full_imediately {
+	private RandomizedElectionsAndGossipTestCase _randomCase;
+
+	[SetUp]
+	public void SetUp() {
+		_randomCase = new RandomizedElectionsAndGossipTestCase(ElectionParams.MaxIterationCount,
+			instancesCnt: 5,
+			httpLossProbability: 0.3,
+			httpDupProbability: 0.3,
+			httpMaxDelay: 20,
+			timerMinDelay: 100,
+			timerMaxDelay: 200,
+			createInitialGossip: CreateInitialGossip,
+			createUpdatedGossip: CreateUpdatedGossip
+		);
+
+		_randomCase.Init();
+	}
+
+	private MemberInfo[] CreateInitialGossip(ElectionsInstance instance, ElectionsInstance[] allInstances) {
+		return new[] {
+			MemberInfo.ForVNode(instance.InstanceId, DateTime.UtcNow, VNodeState.Unknown, true,
+				instance.EndPoint, null, instance.EndPoint, null, instance.EndPoint, null, 0, 0,
+				-1, 0, 0, -1, -1, Guid.Empty, 0, false)
+		};
+	}
+
+	private MemberInfo[] CreateUpdatedGossip(int iteration,
+		RandTestQueueItem item,
+		ElectionsInstance[] instances,
+		MemberInfo[] initialGossip,
+		Dictionary<EndPoint, MemberInfo[]> previousGossip) {
+		if (previousGossip[item.EndPoint].Length < 5) {
+			Console.WriteLine("Update item: {0} : {1}", iteration, item.EndPoint.GetPort());
+			return instances.Select((x, i) =>
+				MemberInfo.ForVNode(x.InstanceId, DateTime.UtcNow, VNodeState.Unknown, true,
+					x.EndPoint, null, x.EndPoint, null, x.EndPoint, null, 0, 0,
+					-1, 0, 0, -1, -1, Guid.Empty, 0, false)).ToArray();
+		}
+
+		return null;
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public void should_complete_successfully([Range(0, ElectionParams.TestRunCount - 1)]
+		int run) {
+		var success = _randomCase.Run();
+		if (!success)
+			_randomCase.Logger.LogMessages();
+
+		Console.WriteLine("There were a total of {0} messages in this run.",
+			_randomCase.Logger.ProcessedItems.Count());
+		Console.WriteLine("There were {0} GossipUpdated messages in this run.",
+			_randomCase.Logger.ProcessedItems.Count(x => x.Message is GossipMessage.GossipUpdated));
+
+		Assert.True(success);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_with_1_known_when_started_and_set_to_full_later.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_with_1_known_when_started_and_set_to_full_later.cs
new file mode 100644
index 00000000000..6d39ee1437a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/Randomized/elections_service_5_nodes_with_1_known_when_started_and_set_to_full_later.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Infrastructure;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService.Randomized;
+
+[TestFixture, Ignore("Not sure the finish criteria is correct")]
+public class elections_service_5_nodes_with_1_known_when_started_and_set_to_full_later {
+	private RandomizedElectionsAndGossipTestCase _randomCase;
+
+	[SetUp]
+	public void SetUp() {
+		_randomCase = new RandomizedElectionsAndGossipTestCase(ElectionParams.MaxIterationCount,
+			instancesCnt: 5,
+			httpLossProbability: 0.3,
+			httpDupProbability: 0.3,
+			httpMaxDelay: 20,
+			timerMinDelay: 100,
+			timerMaxDelay: 200,
+			createInitialGossip: CreateInitialGossip,
+			createUpdatedGossip: CreateUpdatedGossip
+		);
+
+		_randomCase.Init();
+	}
+
+	private MemberInfo[] CreateInitialGossip(ElectionsInstance instance, ElectionsInstance[] allInstances) {
+		return new[] {
+			MemberInfo.ForVNode(instance.InstanceId, DateTime.UtcNow, VNodeState.Unknown, true,
+				instance.EndPoint, null, instance.EndPoint, null, instance.EndPoint, null, 0, 0,
+				-1, 0, 0, -1, -1, Guid.Empty, 0, false)
+		};
+	}
+
+	private MemberInfo[] CreateUpdatedGossip(int iteration,
+		RandTestQueueItem item,
+		ElectionsInstance[] instances,
+		MemberInfo[] initialGossip,
+		Dictionary<EndPoint, MemberInfo[]> previousGossip) {
+		if (iteration == 1 || (iteration % 100 != (item.EndPoint.GetPort() % 1000) && _randomCase.Next(100) < 30))
+			return null;
+
+		if (previousGossip[item.EndPoint].Length < 5) {
+			return instances.Select((x, i) =>
+					MemberInfo.ForVNode(x.InstanceId, DateTime.UtcNow, VNodeState.Unknown, true,
+						x.EndPoint, null, x.EndPoint, null, x.EndPoint, null, 0, 0,
+						-1, 0, 0, -1, -1, Guid.Empty, 0, false))
+				.ToArray();
+		}
+
+		return null;
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public void should_complete_successfully([Range(0, ElectionParams.TestRunCount - 1)]
+		int run) {
+		var success = _randomCase.Run();
+		if (!success)
+			_randomCase.Logger.LogMessages();
+
+		Console.WriteLine("There were a total of {0} messages in this run.",
+			_randomCase.Logger.ProcessedItems.Count());
+		Console.WriteLine("There were {0} GossipUpdated messages in this run.",
+			_randomCase.Logger.ProcessedItems.Count(x => x.Message is GossipMessage.GossipUpdated));
+
+		Assert.True(success);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/ElectionsService/no_quorum_cases.cs b/src/KurrentDB.Core.Tests/Services/ElectionsService/no_quorum_cases.cs
new file mode 100644
index 00000000000..ceca380c3ce
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/ElectionsService/no_quorum_cases.cs
@@ -0,0 +1,121 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.ElectionsService;
+
+[TestFixture]
+public sealed class elections_service_should_stuck_with_single_node_response {
+	private ElectionsServiceUnit _electionsUnit;
+
+	[SetUp]
+	public void SetUp() {
+		var clusterSettings = ClusterSettingsFactory.GetClusterSettings(1, 3, false);
+
+		_electionsUnit = new ElectionsServiceUnit(clusterSettings);
+
+		ProcessElections();
+	}
+
+	private void ProcessElections() {
+		var gossipUpdate = new GossipMessage.GossipUpdated(_electionsUnit.ClusterInfo);
+		_electionsUnit.Publish(gossipUpdate);
+
+		_electionsUnit.Publish(new ElectionMessage.StartElections());
+
+		_electionsUnit.RepublishFromPublisher();
+	}
+
+	[Test]
+	public void elections_should_time_out() {
+		Assert.That(_electionsUnit.Publisher.Messages.ContainsSingle<ElectionMessage.ElectionsTimedOut>());
+	}
+}
+
+[TestFixture]
+public sealed class elections_service_should_stuck_with_single_node_response_2_iterations {
+	private ElectionsServiceUnit _electionsUnit;
+
+	[SetUp]
+	public void SetUp() {
+		var clusterSettings = ClusterSettingsFactory.GetClusterSettings(1, 3, false);
+
+		_electionsUnit = new ElectionsServiceUnit(clusterSettings);
+
+		ProcessElections();
+	}
+
+	private void ProcessElections() {
+		var gossipUpdate = new GossipMessage.GossipUpdated(_electionsUnit.ClusterInfo);
+		_electionsUnit.Publish(gossipUpdate);
+
+		_electionsUnit.Publish(new ElectionMessage.StartElections());
+
+		_electionsUnit.RepublishFromPublisher();
+
+		_electionsUnit.RepublishFromPublisher();
+		Assert.That(
+			_electionsUnit.Publisher.Messages.All(x => x is GrpcMessage.SendOverGrpc || x is TimerMessage.Schedule),
+			Is.True,
+			"Only SendOverGrpc or Schedule messages are expected.");
+
+		_electionsUnit.RepublishFromPublisher();
+	}
+
+	[Test]
+	public void elections_should_time_out() {
+		Assert.That(_electionsUnit.Publisher.Messages.ContainsSingle<ElectionMessage.ElectionsTimedOut>());
+	}
+}
+
+[TestFixture]
+public sealed class elections_service_should_stuck_with_single_alive_node {
+	private ElectionsServiceUnit _electionsUnit;
+
+	[SetUp]
+	public void SetUp() {
+		var clusterSettings = ClusterSettingsFactory.GetClusterSettings(1, 3, false);
+
+		_electionsUnit = new ElectionsServiceUnit(clusterSettings);
+		_electionsUnit.UpdateClusterMemberInfo(0, isAlive: false);
+		_electionsUnit.UpdateClusterMemberInfo(2, isAlive: false);
+		_electionsUnit.UpdateClusterMemberInfo(3, isAlive: false);
+
+		ProcessElections();
+	}
+
+	private void ProcessElections() {
+		var gossipUpdate = new GossipMessage.GossipUpdated(_electionsUnit.ClusterInfo);
+		_electionsUnit.Publish(gossipUpdate);
+
+		_electionsUnit.Publish(new ElectionMessage.StartElections());
+
+		_electionsUnit.RepublishFromPublisher();
+
+		_electionsUnit.RepublishFromPublisher();
+		Assert.That(
+			_electionsUnit.Publisher.Messages.All(x => x is GrpcMessage.SendOverGrpc || x is TimerMessage.Schedule),
+			Is.True,
+			"Only OverGrpc or Schedule messages are expected.");
+
+		_electionsUnit.RepublishFromPublisher();
+
+		_electionsUnit.RepublishFromPublisher();
+		Assert.That(
+			_electionsUnit.Publisher.Messages.All(x => x is GrpcMessage.SendOverGrpc || x is TimerMessage.Schedule),
+			Is.True,
+			"Only OverGrpc or Schedule messages are expected.");
+
+		_electionsUnit.RepublishFromPublisher();
+	}
+
+	[Test]
+	public void elections_should_time_out() {
+		Assert.That(_electionsUnit.Publisher.Messages.ContainsSingle<ElectionMessage.ElectionsTimedOut>());
+	}
+}
diff --git a/src/EventStore.Core.Tests/Services/GossipService/ClusterMultipleVersionsLoggerTests.cs b/src/KurrentDB.Core.Tests/Services/GossipService/ClusterMultipleVersionsLoggerTests.cs
similarity index 97%
rename from src/EventStore.Core.Tests/Services/GossipService/ClusterMultipleVersionsLoggerTests.cs
rename to src/KurrentDB.Core.Tests/Services/GossipService/ClusterMultipleVersionsLoggerTests.cs
index f92f5a0604c..e32f06776ad 100644
--- a/src/EventStore.Core.Tests/Services/GossipService/ClusterMultipleVersionsLoggerTests.cs
+++ b/src/KurrentDB.Core.Tests/Services/GossipService/ClusterMultipleVersionsLoggerTests.cs
@@ -1,17 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System.Collections.Generic;
 using System.Net;
-using EventStore.Common.Utils;
-using EventStore.Core.Cluster;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.Gossip;
 using FluentAssertions;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Gossip;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Services.GossipService;
+namespace KurrentDB.Core.Tests.Services.GossipService;
 
 public abstract class ClusterMultipleVersionsLoggerTests {
-	
+
 	public class if_gossip_received_has_alive_nodes_on_old_version : NodeGossipServiceTestFixture {
 		protected override Message[] Given() => GivenSystemInitializedWithKnownGossipSeedSources();
 
@@ -53,7 +56,7 @@ public void should_detect_version_mismatch() {
 				ClusterMultipleVersionsLogger.GetIPAddressVsVersion(GetExpectedClusterInfo(),
 					out int numDistinctKnownVersions);
 			ipAddressVsVersion.Should().BeEquivalentTo(GetExpectedEndPointVsVersion());
-			
+
 			Assert.AreEqual(2, numDistinctKnownVersions);
 		}
 
@@ -235,7 +238,7 @@ protected override Message When() =>
 			new GossipMessage.GetGossipReceived(new ClusterInfo(
 					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, epochNumber: 1,
 						esVersion: VersionInfo.DefaultVersion),
-					// nodeThree is dead	
+					// nodeThree is dead
 					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.3",
 						isAlive: false),
 					MemberInfoForVNode(_nodeFour, _timeProvider.UtcNow, epochNumber: 1,
@@ -280,7 +283,7 @@ protected override Message When() =>
 			new GossipMessage.GetGossipReceived(new ClusterInfo(
 					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, epochNumber: 1,
 						esVersion: VersionInfo.DefaultVersion),
-					// nodeThree is dead	
+					// nodeThree is dead
 					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.3",
 						isAlive: false),
 					MemberInfoForVNode(_nodeFour, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.4")),
@@ -324,7 +327,7 @@ protected override Message When() =>
 			new GossipMessage.GetGossipReceived(new ClusterInfo(
 				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, epochNumber: 1,
 					esVersion: VersionInfo.DefaultVersion),
-				// nodeThree is dead	
+				// nodeThree is dead
 				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.3",
 					isAlive: false),
 				MemberInfoForVNode(_nodeFour, _timeProvider.UtcNow, epochNumber: 1,
diff --git a/src/KurrentDB.Core.Tests/Services/GossipService/NodeGossipServiceTests.cs b/src/KurrentDB.Core.Tests/Services/GossipService/NodeGossipServiceTests.cs
new file mode 100644
index 00000000000..73d38a09396
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/GossipService/NodeGossipServiceTests.cs
@@ -0,0 +1,1117 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Net;
+using FluentAssertions;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Gossip;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Services.ElectionsService;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using NUnit.Framework;
+using MemberInfo = KurrentDB.Core.Cluster.MemberInfo;
+
+namespace KurrentDB.Core.Tests.Services.GossipService;
+
+public abstract class NodeGossipServiceTestFixture {
+	protected NodeGossipService SUT;
+	protected FakePublisher _bus;
+	protected VNodeInfo _currentNode;
+	protected VNodeInfo _nodeTwo;
+	protected VNodeInfo _nodeThree;
+	protected VNodeInfo _nodeFour;
+	protected ITimeProvider _timeProvider;
+	protected Func<MemberInfo[], MemberInfo> _getNodeToGossipTo;
+	protected IGossipSeedSource _gossipSeedSource;
+	protected TimeSpan _gossipInterval = TimeSpan.FromMilliseconds(1000);
+	private readonly TimeSpan _allowedTimeDifference = TimeSpan.FromMilliseconds(1000);
+	protected readonly TimeSpan _gossipTimeout = TimeSpan.FromMilliseconds(1000);
+	private readonly TimeSpan _deadMemberRemovalPeriod = TimeSpan.FromSeconds(1800);
+
+
+	public NodeGossipServiceTestFixture() {
+		_bus = new FakePublisher();
+		_timeProvider = new FakeTimeProvider();
+
+		_currentNode = new VNodeInfo(
+			Guid.Parse("00000000-0000-0000-0000-000000000001"), 1,
+			new IPEndPoint(IPAddress.Loopback, 1111),
+			new IPEndPoint(IPAddress.Loopback, 1111),
+			new IPEndPoint(IPAddress.Loopback, 1111),
+			new IPEndPoint(IPAddress.Loopback, 1111),
+			new IPEndPoint(IPAddress.Loopback, 1111), false);
+		_nodeTwo = new VNodeInfo(
+			Guid.Parse("00000000-0000-0000-0000-000000000002"), 2,
+			new IPEndPoint(IPAddress.Loopback, 2222),
+			new IPEndPoint(IPAddress.Loopback, 2222),
+			new IPEndPoint(IPAddress.Loopback, 2222),
+			new IPEndPoint(IPAddress.Loopback, 2222),
+			new IPEndPoint(IPAddress.Loopback, 2222), false);
+		_nodeThree = new VNodeInfo(
+			Guid.Parse("00000000-0000-0000-0000-000000000003"), 3,
+			new IPEndPoint(IPAddress.Loopback, 3333),
+			new IPEndPoint(IPAddress.Loopback, 3333),
+			new IPEndPoint(IPAddress.Loopback, 3333),
+			new IPEndPoint(IPAddress.Loopback, 3333),
+			new IPEndPoint(IPAddress.Loopback, 3333), false);
+		_nodeFour = new VNodeInfo(
+			Guid.Parse("00000000-0000-0000-0000-000000000004"), 4,
+			new IPEndPoint(IPAddress.Loopback, 4444),
+			new IPEndPoint(IPAddress.Loopback, 4444),
+			new IPEndPoint(IPAddress.Loopback, 4444),
+			new IPEndPoint(IPAddress.Loopback, 4444),
+			new IPEndPoint(IPAddress.Loopback, 4444), false);
+
+		_getNodeToGossipTo = infos => infos.First(x => Equals(x.HttpEndPoint, _nodeTwo.HttpEndPoint));
+		_gossipSeedSource = new KnownEndpointGossipSeedSource(new[]
+			{_currentNode.HttpEndPoint, _nodeTwo.HttpEndPoint, _nodeThree.HttpEndPoint});
+	}
+
+	[SetUp]
+	public void Setup() {
+		SUT = new NodeGossipService(_bus, 3, _gossipSeedSource, MemberInfoForVNode(_currentNode, DateTime.UtcNow),
+			new InMemoryCheckpoint(0), new InMemoryCheckpoint(0), new FakeEpochManager(), () => 0L, 0,
+			_gossipInterval, _allowedTimeDifference, _gossipTimeout, _deadMemberRemovalPeriod, _timeProvider, _getNodeToGossipTo);
+
+		foreach (var message in Given()) {
+			SUT.Handle((dynamic)message);
+		}
+
+		_bus.Messages.Clear();
+
+		var when = When();
+		if (when != null) {
+			SUT.Handle((dynamic)when);
+		}
+	}
+
+	protected virtual Message[] Given() => Array.Empty<Message>();
+
+	protected virtual Message When() => null;
+
+	protected void ExpectMessages(params Message[] expected) =>
+		_bus.Messages.Should().BeEquivalentTo(expected);
+
+	protected void ExpectNoMessages() =>
+		Assert.IsEmpty(_bus.Messages);
+
+	protected Message[] GivenSystemInitializedWithKnownGossipSeedSources(params Message[] additionalGivens) {
+		return new Message[] {
+			new SystemMessage.SystemInit(),
+			new GossipMessage.GotGossipSeedSources(new[]
+				{_currentNode.HttpEndPoint, _nodeTwo.HttpEndPoint, _nodeThree.HttpEndPoint})
+		}.Concat(additionalGivens).ToArray();
+	}
+
+	protected static MemberInfo MemberInfoForVNode(VNodeInfo nodeInfo, DateTime utcNow,
+		int? nodePriority = null, int? epochNumber = null, long? writerCheckpoint = null,
+		VNodeState nodeState = VNodeState.Initializing, string esVersion = VersionInfo.DefaultVersion, bool isAlive = true) {
+		return MemberInfo.ForVNode(nodeInfo.InstanceId, utcNow, nodeState, isAlive,
+			nodeInfo.InternalTcp, nodeInfo.InternalSecureTcp, nodeInfo.ExternalTcp,
+			nodeInfo.ExternalSecureTcp, nodeInfo.HttpEndPoint, null, 0, 0,
+			0, writerCheckpoint ?? 0, 0, -1, epochNumber ?? -1, Guid.Empty, nodePriority ?? 0, false, esVersion);
+	}
+
+	/// <summary>
+	/// The initial state for a node currently is represented as a Manager
+	/// </summary>
+	protected static MemberInfo InitialStateForVNode(VNodeInfo nodeInfo, DateTime utcNow, bool isAlive = true, string version = VersionInfo.UnknownVersion) {
+		return MemberInfo.ForManager(Guid.Empty, utcNow, isAlive, nodeInfo.HttpEndPoint, esVersion: version);
+	}
+}
+
+public class when_system_initializes : NodeGossipServiceTestFixture {
+	protected override Message[] Given() =>
+		Array.Empty<Message>();
+
+	protected override Message When() =>
+		new SystemMessage.SystemInit();
+
+	[Test]
+	public void should_get_gossip_sources() {
+		ExpectMessages(
+			new GossipMessage.GotGossipSeedSources(new[]
+				{_currentNode.HttpEndPoint, _nodeTwo.HttpEndPoint, _nodeThree.HttpEndPoint}));
+	}
+}
+
+public class when_system_initializes_twice : NodeGossipServiceTestFixture {
+	protected override Message[] Given() => new Message[] {
+		new SystemMessage.SystemInit()
+	};
+
+	protected override Message When() =>
+		new SystemMessage.SystemInit();
+
+	[Test]
+	public void should_ignore_system_init() {
+		ExpectNoMessages();
+	}
+}
+
+public class when_retrieving_gossip_seed_sources : NodeGossipServiceTestFixture {
+	protected override Message[] Given() => new Message[] {
+		new SystemMessage.SystemInit()
+	};
+
+	protected override Message When() =>
+		new GossipMessage.RetrieveGossipSeedSources();
+
+	[Test]
+	public void should_get_gossip_seeds() {
+		ExpectMessages(
+			new GossipMessage.GotGossipSeedSources(new[]
+				{_currentNode.HttpEndPoint, _nodeTwo.HttpEndPoint, _nodeThree.HttpEndPoint}));
+	}
+}
+
+public class when_retrieving_gossip_seed_sources_and_gossip_seed_source_throws : NodeGossipServiceTestFixture {
+	class ThrowingGossipSeedSource : IGossipSeedSource {
+		public IAsyncResult BeginGetHostEndpoints(AsyncCallback requestCallback, object state) {
+			throw new NotImplementedException();
+		}
+
+		public EndPoint[] EndGetHostEndpoints(IAsyncResult asyncResult) {
+			throw new NotImplementedException();
+		}
+	}
+
+	public when_retrieving_gossip_seed_sources_and_gossip_seed_source_throws() {
+		_gossipSeedSource = new ThrowingGossipSeedSource();
+	}
+
+	protected override Message[] Given() => new Message[] {
+		new SystemMessage.SystemInit()
+	};
+
+	protected override Message When() =>
+		new GossipMessage.RetrieveGossipSeedSources();
+
+	[Test]
+	public void should_schedule_retry_retrieve_gossip_seed_sources() {
+		ExpectMessages(
+			TimerMessage.Schedule.Create(GossipServiceBase.DnsRetryTimeout, _bus,
+				new GossipMessage.RetrieveGossipSeedSources()));
+	}
+}
+
+public class when_got_gossip_seed_sources : NodeGossipServiceTestFixture {
+	protected override Message[] Given() => new Message[] {
+		new SystemMessage.SystemInit()
+	};
+
+	protected override Message When() =>
+		new GossipMessage.GotGossipSeedSources(new[]
+			{_currentNode.HttpEndPoint, _nodeTwo.HttpEndPoint, _nodeThree.HttpEndPoint});
+
+	[Test]
+	public void should_start_gossiping_and_schedule_another_gossip() {
+		ExpectMessages(
+			new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint, new GossipMessage.SendGossip(new ClusterInfo(
+					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+					InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow),
+					InitialStateForVNode(_nodeThree, _timeProvider.UtcNow)),
+				_currentNode.HttpEndPoint), _timeProvider.LocalTime.Add(_gossipTimeout)),
+			TimerMessage.Schedule.Create(GossipServiceBase.GossipStartupInterval, _bus,
+				new GossipMessage.Gossip(1)));
+	}
+}
+
+public class when_gossip : NodeGossipServiceTestFixture {
+	private int _gossipRound = GossipServiceBase.GossipRoundStartupThreshold + 1;
+
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources();
+
+	protected override Message When() =>
+		new GossipMessage.Gossip(_gossipRound);
+
+	[Test]
+	public void should_send_the_gossip_over_http_and_schedule_the_next_gossip() {
+		ExpectMessages(
+			new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint, new GossipMessage.SendGossip(new ClusterInfo(
+					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+					InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow),
+					InitialStateForVNode(_nodeThree, _timeProvider.UtcNow)),
+				_currentNode.HttpEndPoint), _timeProvider.LocalTime.Add(_gossipTimeout)),
+			TimerMessage.Schedule.Create(_gossipInterval, _bus,
+				new GossipMessage.Gossip(++_gossipRound)));
+	}
+}
+
+public class when_gossip_and_no_node_is_selected_to_gossip_to : NodeGossipServiceTestFixture {
+	private int _gossipRound = GossipServiceBase.GossipRoundStartupThreshold + 1;
+
+	public when_gossip_and_no_node_is_selected_to_gossip_to() {
+		_getNodeToGossipTo = infos => null;
+	}
+
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources();
+
+	protected override Message When() =>
+		new GossipMessage.Gossip(_gossipRound);
+
+	[Test]
+	public void should_just_schedule_next_gossip() {
+		ExpectMessages(TimerMessage.Schedule.Create(_gossipInterval, _bus,
+			new GossipMessage.Gossip(_gossipRound)));
+	}
+}
+
+public class when_gossip_and_gossip_service_is_not_in_working_state : NodeGossipServiceTestFixture {
+	protected override Message[] Given() => Array.Empty<Message>();
+
+	protected override Message When() =>
+		new GossipMessage.Gossip(1);
+
+	[Test]
+	public void should_ignore_message() {
+		ExpectNoMessages();
+	}
+}
+
+public class when_gossip_and_gossip_round_less_than_startup_gossip_threshold : NodeGossipServiceTestFixture {
+	private int _gossipRound = new Random().Next(0, GossipServiceBase.GossipRoundStartupThreshold);
+
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources();
+
+	protected override Message When() =>
+		new GossipMessage.Gossip(_gossipRound);
+
+	[Test]
+	public void should_use_startup_gossip_interval() {
+		ExpectMessages(
+			new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint, new GossipMessage.SendGossip(new ClusterInfo(
+					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+					InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow),
+					InitialStateForVNode(_nodeThree, _timeProvider.UtcNow)),
+				_currentNode.HttpEndPoint), _timeProvider.LocalTime.Add(_gossipTimeout)),
+			TimerMessage.Schedule.Create(GossipServiceBase.GossipStartupInterval, _bus,
+				new GossipMessage.Gossip(++_gossipRound)));
+	}
+}
+
+public class when_gossip_and_gossip_round_larger_than_startup_gossip_threshold : NodeGossipServiceTestFixture {
+	private int _gossipRound = new Random().Next(GossipServiceBase.GossipRoundStartupThreshold, int.MaxValue);
+
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources();
+
+	protected override Message When() =>
+		new GossipMessage.Gossip(_gossipRound);
+
+	[Test]
+	public void should_use_provided_gossip_interval_for_next_gossip() {
+		ExpectMessages(
+			new GrpcMessage.SendOverGrpc(_nodeTwo.HttpEndPoint, new GossipMessage.SendGossip(new ClusterInfo(
+					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+					InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow),
+					InitialStateForVNode(_nodeThree, _timeProvider.UtcNow)),
+				_currentNode.HttpEndPoint), _timeProvider.LocalTime.Add(_gossipTimeout)),
+			TimerMessage.Schedule.Create(_gossipInterval, _bus,
+				new GossipMessage.Gossip(++_gossipRound)));
+	}
+}
+
+public class when_gossip_received_with_older_timestamp_about_peer_node :
+	NodeGossipServiceTestFixture {
+	private readonly DateTime _timestamp = DateTime.Now;
+
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources(
+			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+					MemberInfoForVNode(_nodeTwo, _timestamp),
+					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow)),
+				_nodeTwo.HttpEndPoint)
+		);
+
+	protected override Message When() =>
+		new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeTwo, _timestamp.AddMilliseconds(-1)),
+				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow)),
+			_nodeTwo.HttpEndPoint);
+
+	[Test]
+	public void should_accept_the_information_about_the_node_even_if_outdated() {
+		ExpectMessages(
+			new GossipMessage.GossipUpdated(new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeTwo, _timestamp.AddMilliseconds(-1)),
+				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow))));
+	}
+}
+
+public class if_gossip_reply_includes_es_version : NodeGossipServiceTestFixture {
+	private Message _capturedMessage;
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources();
+
+	protected override Message When() =>
+		new GossipMessage.GossipReceived(new CallbackEnvelope(CaptureGossipReply), new ClusterInfo(
+				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.2"),
+				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.3")),
+			_nodeTwo.HttpEndPoint);
+
+	private ClusterInfo GetExpectedClusterInfo() {
+		return new ClusterInfo(MemberInfoForVNode(_currentNode, _timeProvider.UtcNow, esVersion: VersionInfo.DefaultVersion),
+			MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.2"),
+			MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.3"));
+	}
+
+	[Test]
+	public void gossip_update_must_have_es_version() {
+		//updated cluster info should have version info of currentNode, nodeTwo and nodeThree
+		ExpectMessages(new GossipMessage.GossipUpdated(GetExpectedClusterInfo()));
+		//gossip reply should have version info of currentNode, nodeTwo and nodeThree
+		_capturedMessage.Should().BeEquivalentTo(new GossipMessage.SendGossip(GetExpectedClusterInfo(), _currentNode.HttpEndPoint));
+	}
+
+	private void CaptureGossipReply(Message message) => _capturedMessage = message;
+}
+
+public class if_gossip_read_reply_includes_es_version : NodeGossipServiceTestFixture {
+	private Message _capturedMessage;
+
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources(new GossipMessage.GossipReceived(
+			new CallbackEnvelope(CaptureGossipReply), new ClusterInfo(
+				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.2"),
+				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.3")),
+			_nodeTwo.HttpEndPoint));
+
+	protected override Message When() =>
+		new GossipMessage.ReadGossip(new CallbackEnvelope(CaptureGossipReply));
+
+	private ClusterInfo GetExpectedClusterInfo() {
+		return new ClusterInfo(
+			MemberInfoForVNode(_currentNode, _timeProvider.UtcNow, esVersion: VersionInfo.DefaultVersion),
+			MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.2"),
+			MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.3"));
+	}
+
+	[Test]
+	public void reply_should_have_version_info() {
+		_capturedMessage.Should()
+			.BeEquivalentTo(new GossipMessage.SendGossip(GetExpectedClusterInfo(), _currentNode.HttpEndPoint));
+	}
+
+	private void CaptureGossipReply(Message message) => _capturedMessage = message;
+}
+
+public class if_client_gossip_reply_includes_es_version : NodeGossipServiceTestFixture {
+	private Message _capturedMessage;
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources(new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.2"),
+				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.3")),
+			_nodeTwo.HttpEndPoint));
+
+	protected override Message When() =>
+		new GossipMessage.ClientGossip(new CallbackEnvelope(CaptureGossipReply));
+
+	private ClientClusterInfo GetExpectedClusterInfo() {
+		return new ClientClusterInfo(new ClusterInfo(
+			MemberInfoForVNode(_currentNode, _timeProvider.UtcNow, esVersion: VersionInfo.DefaultVersion),
+			MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.2"),
+			MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: 1, esVersion: "1.1.1.3")), _currentNode.HttpEndPoint.GetHost(), _currentNode.HttpEndPoint.GetPort());
+	}
+
+	[Test]
+	public void reply_should_have_version_info() {
+		_capturedMessage.Should()
+			.BeEquivalentTo(new GossipMessage.SendClientGossip(GetExpectedClusterInfo()));
+	}
+
+	private void CaptureGossipReply(Message message) => _capturedMessage = message;
+}
+
+public class when_gossip_received_with_lower_epoch_number_about_peer_node :
+	NodeGossipServiceTestFixture {
+	private readonly int _epochNumber = new Random().Next();
+
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources(
+			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, epochNumber: _epochNumber),
+					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow)),
+				_nodeTwo.HttpEndPoint)
+		);
+
+	protected override Message When() =>
+		new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, epochNumber: _epochNumber - 1),
+				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow)),
+			_nodeTwo.HttpEndPoint);
+
+	[Test]
+	public void should_accept_the_information_about_the_node_even_if_outdated() {
+		ExpectMessages(
+			new GossipMessage.GossipUpdated(new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, epochNumber: _epochNumber - 1),
+				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow))));
+	}
+}
+
+public class when_gossip_received_with_lower_writer_checkpoint_about_peer_node :
+	NodeGossipServiceTestFixture {
+	private readonly int _writerCheckpoint = new Random().Next();
+
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources(
+			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, writerCheckpoint: _writerCheckpoint),
+					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow)),
+				_nodeTwo.HttpEndPoint)
+		);
+
+	protected override Message When() =>
+		new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, writerCheckpoint: _writerCheckpoint - 1),
+				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow)),
+			_nodeTwo.HttpEndPoint);
+
+	[Test]
+	public void should_accept_the_information_about_the_node_even_if_outdated() {
+		ExpectMessages(
+			new GossipMessage.GossipUpdated(new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, writerCheckpoint: _writerCheckpoint - 1),
+				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow))));
+	}
+}
+
+public class when_gossip_received_with_more_recent_timestamp_about_non_peer_node :
+	NodeGossipServiceTestFixture {
+	private readonly DateTime _timestamp = DateTime.Now;
+
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources(
+			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
+					MemberInfoForVNode(_nodeThree, _timestamp)),
+				_nodeTwo.HttpEndPoint)
+		);
+
+	protected override Message When() =>
+		new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeThree, _timestamp.AddMilliseconds(1))),
+			_nodeThree.HttpEndPoint);
+
+	[Test]
+	public void should_accept_the_information_if_its_more_recent() {
+		ExpectMessages(
+			new GossipMessage.GossipUpdated(new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeThree, _timestamp.AddMilliseconds(1)))));
+	}
+}
+
+public class when_gossip_received_with_higher_epoch_number_about_non_peer_node :
+	NodeGossipServiceTestFixture {
+	private readonly int _epochNumber = new Random().Next();
+
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources(
+			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
+					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: _epochNumber)),
+				_nodeTwo.HttpEndPoint)
+		);
+
+	protected override Message When() =>
+		new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: _epochNumber + 1)),
+			_nodeTwo.HttpEndPoint);
+
+	[Test]
+	public void should_accept_the_information_if_its_more_recent() {
+		ExpectMessages(
+			new GossipMessage.GossipUpdated(new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: _epochNumber + 1))));
+	}
+}
+
+public class when_gossip_received_with_higher_writer_checkpoint_about_non_peer_node :
+	NodeGossipServiceTestFixture {
+	private readonly int _writerCheckpoint = new Random().Next();
+
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources(
+			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
+					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, writerCheckpoint: _writerCheckpoint)),
+				_nodeTwo.HttpEndPoint)
+		);
+
+	protected override Message When() =>
+		new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, writerCheckpoint: _writerCheckpoint + 1)),
+			_nodeTwo.HttpEndPoint);
+
+	[Test]
+	public void should_accept_the_information_if_its_more_recent() {
+		ExpectMessages(
+			new GossipMessage.GossipUpdated(new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, writerCheckpoint: _writerCheckpoint + 1))));
+	}
+}
+
+public class when_state_changed_to_leader : NodeGossipServiceTestFixture {
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources(
+			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow, nodeState: VNodeState.Initializing),
+					InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow),
+					InitialStateForVNode(_nodeThree, _timeProvider.UtcNow)),
+				_nodeTwo.HttpEndPoint)
+		);
+
+	protected override Message When() =>
+		new SystemMessage.BecomeLeader(Guid.NewGuid());
+
+	[Test]
+	public void should_update_gossip() {
+		ExpectMessages(
+			new GossipMessage.GossipUpdated(new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow, nodeState: VNodeState.Leader),
+				InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow),
+				InitialStateForVNode(_nodeThree, _timeProvider.UtcNow))));
+	}
+}
+
+public class when_state_changed_to_non_leader : NodeGossipServiceTestFixture {
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources(
+			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow, nodeState: VNodeState.Initializing),
+				InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow),
+				InitialStateForVNode(_nodeThree, _timeProvider.UtcNow)), _nodeTwo.HttpEndPoint)
+		);
+
+	protected override Message When() =>
+		new SystemMessage.BecomeFollower(Guid.NewGuid(), MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow));
+
+	[Test]
+	public void should_update_gossip() {
+		ExpectMessages(
+			new GossipMessage.GossipUpdated(new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow, nodeState: VNodeState.Follower),
+				InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow),
+				InitialStateForVNode(_nodeThree, _timeProvider.UtcNow))));
+	}
+}
+
+public class when_gossip_send_failed : NodeGossipServiceTestFixture {
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources();
+
+	protected override Message When() =>
+		new GossipMessage.GossipSendFailed("failed", _nodeTwo.HttpEndPoint);
+
+	[Test]
+	public void should_mark_the_node_as_dead() {
+		ExpectMessages(
+			new GossipMessage.GossipUpdated(new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow, isAlive: false),
+				InitialStateForVNode(_nodeThree, _timeProvider.UtcNow))));
+	}
+}
+
+public class when_gossip_send_failed_to_a_dead_node : NodeGossipServiceTestFixture {
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources(
+			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow, isAlive: false),
+				InitialStateForVNode(_nodeThree, _timeProvider.UtcNow)), _nodeTwo.HttpEndPoint)
+		);
+
+	protected override Message When() => new GossipMessage.GossipSendFailed("failed",
+		_nodeTwo.HttpEndPoint);
+
+	[Test]
+	public void should_ignore_message() {
+		ExpectNoMessages();
+	}
+}
+
+public class when_gossip_send_failed_to_the_current_leader_node : NodeGossipServiceTestFixture {
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources(
+			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
+					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, nodeState: VNodeState.Leader)),
+				_nodeTwo.HttpEndPoint),
+			new SystemMessage.BecomeFollower(Guid.NewGuid(), MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow))
+		);
+
+	protected override Message When() => new GossipMessage.GossipSendFailed("failed",
+		_nodeTwo.HttpEndPoint);
+
+	[Test]
+	public void should_ignore_message_and_wait_for_tcp_to_decide() {
+		ExpectNoMessages();
+	}
+}
+
+public class when_vnode_connection_lost : NodeGossipServiceTestFixture {
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources(
+			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow),
+				InitialStateForVNode(_nodeThree, _timeProvider.UtcNow)), _nodeTwo.HttpEndPoint)
+		);
+
+	protected override Message When() =>
+		new SystemMessage.VNodeConnectionLost(_currentNode.HttpEndPoint, Guid.NewGuid());
+
+	[Test]
+	public void should_issue_get_gossip() {
+		ExpectMessages(
+			new GrpcMessage.SendOverGrpc(_currentNode.HttpEndPoint, new GossipMessage.GetGossip(),
+				_timeProvider.LocalTime.Add(_gossipTimeout)));
+	}
+}
+
+public class when_vnode_connection_lost_to_dead_node : NodeGossipServiceTestFixture {
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources(
+			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow, isAlive: false),
+				InitialStateForVNode(_nodeThree, _timeProvider.UtcNow)), _nodeTwo.HttpEndPoint)
+		);
+
+	protected override Message When() =>
+		new SystemMessage.VNodeConnectionLost(_nodeTwo.HttpEndPoint, Guid.NewGuid());
+
+	[Test]
+	public void should_ignore_message() {
+		ExpectNoMessages();
+	}
+}
+
+public class when_get_gossip_received_with_more_recent_timestamp_about_non_peer_node :
+	NodeGossipServiceTestFixture {
+	private readonly DateTime _timestamp = DateTime.Now;
+
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources(
+			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
+					MemberInfoForVNode(_nodeThree, _timestamp)),
+				_nodeTwo.HttpEndPoint)
+		);
+
+	protected override Message When() =>
+		new GossipMessage.GetGossipReceived(new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeThree, _timestamp.AddMilliseconds(1))),
+			_nodeThree.HttpEndPoint);
+
+	[Test]
+	public void should_accept_the_information_if_its_more_recent() {
+		ExpectMessages(
+			new GossipMessage.GossipUpdated(new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeThree, _timestamp.AddMilliseconds(1)))));
+	}
+}
+
+public class when_get_gossip_received_with_higher_epoch_number_about_non_peer_node :
+	NodeGossipServiceTestFixture {
+	private readonly int _epochNumber = new Random().Next();
+
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources(
+			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
+					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: _epochNumber)),
+				_nodeTwo.HttpEndPoint)
+		);
+
+	protected override Message When() =>
+		new GossipMessage.GetGossipReceived(new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: _epochNumber + 1)),
+			_nodeTwo.HttpEndPoint);
+
+	[Test]
+	public void should_accept_the_information_if_its_more_recent() {
+		ExpectMessages(
+			new GossipMessage.GossipUpdated(new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, epochNumber: _epochNumber + 1))));
+	}
+}
+
+public class when_get_gossip_received_with_higher_writer_checkpoint_about_non_peer_node :
+	NodeGossipServiceTestFixture {
+	private readonly int _writerCheckpoint = new Random().Next();
+
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources(
+			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
+					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow,
+						writerCheckpoint: _writerCheckpoint)),
+				_nodeTwo.HttpEndPoint)
+		);
+
+	protected override Message When() =>
+		new GossipMessage.GetGossipReceived(new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow,
+					writerCheckpoint: _writerCheckpoint + 1)),
+			_nodeTwo.HttpEndPoint);
+
+	[Test]
+	public void should_accept_the_information_if_its_more_recent() {
+		ExpectMessages(
+			new GossipMessage.GossipUpdated(new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
+				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow,
+					writerCheckpoint: _writerCheckpoint + 1))));
+	}
+}
+
+public class
+	when_get_gossip_received_and_gossip_service_is_not_in_working_state : NodeGossipServiceTestFixture {
+	protected override Message[] Given() => Array.Empty<Message>();
+
+	protected override Message When() =>
+		new GossipMessage.GetGossipReceived(new ClusterInfo(), _nodeTwo.HttpEndPoint);
+
+	[Test]
+	public void should_ignore_message() {
+		ExpectNoMessages();
+	}
+}
+
+public class
+	when_get_gossip_failed_and_gossip_service_is_not_in_working_state : NodeGossipServiceTestFixture {
+	protected override Message[] Given() => Array.Empty<Message>();
+
+	protected override Message When() =>
+		new GossipMessage.GetGossipFailed("failed", _nodeTwo.HttpEndPoint);
+
+	[Test]
+	public void should_ignore_message() {
+		ExpectNoMessages();
+	}
+}
+
+public class when_get_gossip_failed : NodeGossipServiceTestFixture {
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources(
+			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+					InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow, isAlive: true),
+					InitialStateForVNode(_nodeThree, _timeProvider.UtcNow)),
+				_currentNode.HttpEndPoint)
+		);
+
+	protected override Message When() =>
+		new GossipMessage.GetGossipFailed("failed", _nodeTwo.HttpEndPoint);
+
+	[Test]
+	public void should_mark_node_as_dead() {
+		ExpectMessages(
+			new GossipMessage.GossipUpdated(new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow, isAlive: false),
+				InitialStateForVNode(_nodeThree, _timeProvider.UtcNow))));
+	}
+}
+
+public class when_vnode_connection_established : NodeGossipServiceTestFixture {
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources(
+			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+					InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow, isAlive: false),
+					InitialStateForVNode(_nodeThree, _timeProvider.UtcNow)),
+				_currentNode.HttpEndPoint)
+		);
+
+	protected override Message When() =>
+		new SystemMessage.VNodeConnectionEstablished(_nodeTwo.HttpEndPoint, Guid.NewGuid());
+
+	[Test]
+	public void should_mark_node_as_alive() {
+		ExpectMessages(
+			new GossipMessage.GossipUpdated(new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+				InitialStateForVNode(_nodeTwo, _timeProvider.UtcNow, isAlive: true),
+				InitialStateForVNode(_nodeThree, _timeProvider.UtcNow))
+			));
+	}
+}
+
+public class when_elections_are_done : NodeGossipServiceTestFixture {
+	protected override Message[] Given() =>
+		GivenSystemInitializedWithKnownGossipSeedSources(
+			new GossipMessage.GossipReceived(new NoopEnvelope(), new ClusterInfo(
+					MemberInfoForVNode(_currentNode, _timeProvider.UtcNow,
+						nodeState: VNodeState.Initializing),
+					MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, nodeState: VNodeState.Initializing),
+					MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow,
+						nodeState: VNodeState.Initializing)),
+				_nodeTwo.HttpEndPoint)
+		);
+
+	protected override Message When() =>
+		new ElectionMessage.ElectionsDone(0, 0,
+			MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, nodeState: VNodeState.Leader));
+
+	[Test]
+	public void should_set_leader_node_and_other_nodes_to_unknown() {
+		ExpectMessages(
+			new GossipMessage.GossipUpdated(new ClusterInfo(
+				MemberInfoForVNode(_currentNode, _timeProvider.UtcNow, nodeState: VNodeState.Unknown),
+				MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow, nodeState: VNodeState.Leader),
+				MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow, nodeState: VNodeState.Unknown))));
+	}
+}
+
+public class when_updating_node_priority : NodeGossipServiceTestFixture {
+	private readonly int _nodePriority = new Random().Next();
+	protected override Message[] Given() => GivenSystemInitializedWithKnownGossipSeedSources();
+
+	protected override Message When() {
+		return new GossipMessage.UpdateNodePriority(_nodePriority);
+	}
+
+	[Test]
+	public void should_set_node_priority() {
+		var clusterInfo = new ClusterInfo(
+			MemberInfoForVNode(_currentNode, _timeProvider.UtcNow),
+			MemberInfoForVNode(_nodeTwo, _timeProvider.UtcNow),
+			MemberInfoForVNode(_nodeThree, _timeProvider.UtcNow));
+
+		SUT.Handle(new GossipMessage.GossipReceived(new NoopEnvelope(), clusterInfo,
+			_nodeTwo.HttpEndPoint));
+		var memberInfo = _bus.Messages.OfType<GossipMessage.GossipUpdated>().First().ClusterInfo.Members
+			.First(x => x.InstanceId == _currentNode.InstanceId);
+		Assert.AreEqual(memberInfo.NodePriority, _nodePriority);
+	}
+}
+
+public class when_updating_cluster {
+	private static MemberInfo TestNodeFor(int identifier, bool isAlive, DateTime timeStamp) {
+		var ipEndpoint = new IPEndPoint(IPAddress.Loopback, identifier);
+		return MemberInfo.ForVNode(Guid.NewGuid(), timeStamp, VNodeState.Initializing, isAlive,
+			ipEndpoint, ipEndpoint, ipEndpoint, ipEndpoint, ipEndpoint, null, 0, 0,
+			0, 0, 0, -1, -1, Guid.Empty, 0, false);
+	}
+
+	private static object[] AllowedNodeRemovalStates => DeadNodeRemoval.AllowedNodeRemovalStates;
+	private static object[] DisallowedNodeRemovalStates => DeadNodeRemoval.DisallowedNodeRemovalStates;
+
+	[Test]
+	[TestCaseSource(nameof(AllowedNodeRemovalStates))]
+	public void
+		should_remove_dead_members_which_have_timestamps_older_than_the_allowed_dead_member_removal_timeout(VNodeState currentRole) {
+		var timeProvider = new FakeTimeProvider();
+		var deadMemberRemovalTimeout = TimeSpan.FromSeconds(1);
+
+		var nodeToBeRemoved =
+			TestNodeFor(2, isAlive: false, timeProvider.UtcNow.Subtract(deadMemberRemovalTimeout));
+
+		var updatedCluster = GossipServiceBase.UpdateCluster(new ClusterInfo(
+				TestNodeFor(1, isAlive: false, timeProvider.UtcNow),
+				nodeToBeRemoved,
+				TestNodeFor(3, isAlive: false, timeProvider.UtcNow)), info => info,
+			timeProvider, deadMemberRemovalTimeout, currentRole);
+
+		Assert.That(updatedCluster.Members, Has.Length.EqualTo(2));
+		Assert.IsFalse(updatedCluster.Members.Any(x => x.Is(nodeToBeRemoved.HttpEndPoint)));
+	}
+
+	[Test]
+	[TestCaseSource(nameof(AllowedNodeRemovalStates))]
+	public void
+		should_not_remove_alive_members_which_have_timestamps_older_than_the_allowed_dead_member_removal_timeout(VNodeState currentRole) {
+		var timeProvider = new FakeTimeProvider();
+		var deadMemberRemovalTimeout = TimeSpan.FromSeconds(1);
+
+		var nodeToNotBeRemoved =
+			TestNodeFor(2, isAlive: true, timeProvider.UtcNow.Subtract(deadMemberRemovalTimeout));
+
+		var updatedCluster = GossipServiceBase.UpdateCluster(new ClusterInfo(
+				TestNodeFor(1, isAlive: false, timeProvider.UtcNow),
+				nodeToNotBeRemoved,
+				TestNodeFor(3, isAlive: false, timeProvider.UtcNow)), info => info,
+			timeProvider, deadMemberRemovalTimeout, currentRole);
+
+		Assert.That(updatedCluster.Members, Has.Length.EqualTo(3));
+		Assert.IsTrue(updatedCluster.Members.Any(x => x.Is(nodeToNotBeRemoved.HttpEndPoint)));
+	}
+
+	[Test]
+	[TestCaseSource(nameof(DisallowedNodeRemovalStates))]
+	public void
+		should_not_remove_dead_members_which_have_timestamps_older_than_the_allowed_dead_member_removal_timeout_and_the_current_role_is_unknown(VNodeState currentRole) {
+		var timeProvider = new FakeTimeProvider();
+		var deadMemberRemovalTimeout = TimeSpan.FromSeconds(1);
+
+		var nodeToNotBeRemoved =
+			TestNodeFor(2, isAlive: false, timeProvider.UtcNow.Subtract(deadMemberRemovalTimeout));
+
+		var updatedCluster = GossipServiceBase.UpdateCluster(new ClusterInfo(
+				TestNodeFor(1, isAlive: false, timeProvider.UtcNow),
+				nodeToNotBeRemoved,
+				TestNodeFor(3, isAlive: false, timeProvider.UtcNow)), info => info,
+			timeProvider, deadMemberRemovalTimeout, currentRole);
+
+		Assert.That(updatedCluster.Members, Has.Length.EqualTo(3));
+		Assert.IsTrue(updatedCluster.Members.Any(x => x.Is(nodeToNotBeRemoved.HttpEndPoint)));
+	}
+}
+
+public class when_merging_clusters {
+	private static MemberInfo TestNodeFor(int identifier, bool isAlive, DateTime timeStamp, VNodeState nodeState) {
+		var ipEndpoint = new IPEndPoint(IPAddress.Loopback, identifier);
+		return MemberInfo.ForVNode(Guid.NewGuid(), timeStamp, nodeState, isAlive,
+			ipEndpoint, ipEndpoint, ipEndpoint, ipEndpoint, ipEndpoint, null, 0, 0,
+			0, 0, 0, -1, -1, Guid.Empty, 0, false);
+	}
+
+	private static object[] AllowedNodeRemovalStates => DeadNodeRemoval.AllowedNodeRemovalStates;
+	private static object[] DisallowedNodeRemovalStates => DeadNodeRemoval.DisallowedNodeRemovalStates;
+
+	[Test]
+	[TestCaseSource(nameof(AllowedNodeRemovalStates))]
+	public void
+		should_remove_dead_members_which_have_timestamps_older_than_the_allowed_dead_member_removal_timeout(VNodeState currentRole) {
+		var timeProvider = new FakeTimeProvider();
+		var deadMemberRemovalTimeout = TimeSpan.FromSeconds(1);
+		var allowedTimeDifference = TimeSpan.FromMilliseconds(1000);
+
+		var me = TestNodeFor(1, isAlive: false, timeProvider.UtcNow, currentRole);
+		var nodeToBeRemoved =
+			TestNodeFor(2, isAlive: false, timeProvider.UtcNow.Subtract(deadMemberRemovalTimeout), VNodeState.Initializing);
+		var peer = TestNodeFor(3, isAlive: false, timeProvider.UtcNow, VNodeState.Initializing);
+		var cluster = new ClusterInfo(me, nodeToBeRemoved, peer);
+
+		var updatedCluster = GossipServiceBase.MergeClusters(
+			cluster, cluster, me.HttpEndPoint,
+			info => info, timeProvider.UtcNow, me, peer.InstanceId,
+			allowedTimeDifference, deadMemberRemovalTimeout);
+
+		Assert.That(updatedCluster.Members, Has.Length.EqualTo(2));
+		Assert.IsFalse(updatedCluster.Members.Any(x => x.Is(nodeToBeRemoved.HttpEndPoint)));
+	}
+
+	[Test]
+	[TestCaseSource(nameof(AllowedNodeRemovalStates))]
+	public void
+		should_not_remove_alive_members_which_have_timestamps_older_than_the_allowed_dead_member_removal_timeout(VNodeState currentRole) {
+		var timeProvider = new FakeTimeProvider();
+		var deadMemberRemovalTimeout = TimeSpan.FromSeconds(1);
+		var allowedTimeDifference = TimeSpan.FromMilliseconds(1000);
+
+		var me = TestNodeFor(1, isAlive: true, timeProvider.UtcNow, currentRole);
+		var nodeToBeRemoved = TestNodeFor(2, isAlive: true, timeProvider.UtcNow.Subtract(deadMemberRemovalTimeout), VNodeState.Initializing);
+		var peer = TestNodeFor(3, isAlive: true, timeProvider.UtcNow, VNodeState.Initializing);
+		var cluster = new ClusterInfo(me, nodeToBeRemoved, peer);
+
+		var updatedCluster = GossipServiceBase.MergeClusters(
+			cluster, cluster, me.HttpEndPoint,
+			info => info, timeProvider.UtcNow, me, peer.InstanceId,
+			allowedTimeDifference, deadMemberRemovalTimeout);
+
+		Assert.That(updatedCluster.Members, Has.Length.EqualTo(3));
+		Assert.IsTrue(updatedCluster.Members.Any(x => x.Is(nodeToBeRemoved.HttpEndPoint)));
+	}
+
+	[Test]
+	[TestCaseSource(nameof(DisallowedNodeRemovalStates))]
+	public void
+		should_not_remove_dead_members_which_have_timestamps_older_than_the_allowed_dead_member_removal_timeout_and_current_role_is_unknown(
+			VNodeState currentRole) {
+		var timeProvider = new FakeTimeProvider();
+		var deadMemberRemovalTimeout = TimeSpan.FromSeconds(1);
+		var allowedTimeDifference = TimeSpan.FromMilliseconds(1000);
+
+		var me = TestNodeFor(1, isAlive: false, timeProvider.UtcNow, currentRole);
+		var nodeToBeRemoved =
+			TestNodeFor(2, isAlive: false, timeProvider.UtcNow.Subtract(deadMemberRemovalTimeout),
+				VNodeState.Initializing);
+		var peer = TestNodeFor(3, isAlive: false, timeProvider.UtcNow, VNodeState.Initializing);
+		var cluster = new ClusterInfo(me, nodeToBeRemoved, peer);
+
+		var updatedCluster = GossipServiceBase.MergeClusters(
+			cluster, cluster, me.HttpEndPoint,
+			info => info, timeProvider.UtcNow, me, peer.InstanceId,
+			allowedTimeDifference, deadMemberRemovalTimeout);
+
+		Assert.That(updatedCluster.Members, Has.Length.EqualTo(3));
+		Assert.IsTrue(updatedCluster.Members.Any(x => x.Is(nodeToBeRemoved.HttpEndPoint)));
+	}
+}
+
+public class DeadNodeRemoval {
+	public static readonly object[] DisallowedNodeRemovalStates = {
+		new object[] {VNodeState.Initializing},
+		new object[] {VNodeState.DiscoverLeader},
+		new object[] {VNodeState.Unknown},
+		new object[] {VNodeState.ReadOnlyLeaderless}
+	};
+	public static readonly object[] AllowedNodeRemovalStates = {
+		new object[] {VNodeState.PreReplica},
+		new object[] {VNodeState.CatchingUp},
+		new object[] {VNodeState.Clone},
+		new object[] {VNodeState.Follower},
+		new object[] {VNodeState.PreLeader},
+		new object[] {VNodeState.Leader},
+		new object[] {VNodeState.ShuttingDown},
+		new object[] {VNodeState.Shutdown},
+		new object[] {VNodeState.PreReadOnlyReplica},
+		new object[] {VNodeState.ReadOnlyReplica},
+		new object[] {VNodeState.ResigningLeader},
+	};
+}
diff --git a/src/KurrentDB.Core.Tests/Services/GossipService/gossip_service_should.cs b/src/KurrentDB.Core.Tests/Services/GossipService/gossip_service_should.cs
new file mode 100644
index 00000000000..0c9904ac23e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/GossipService/gossip_service_should.cs
@@ -0,0 +1,85 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Tests.Services.GossipService;
+
+class gossip_service_should {
+	//[Test]
+	//public void UpdateListOfKnownBoxesAndSendMergedInformationBackWhenRequestForKnownBoxesReceived()
+	//{
+	//    var now = DateTime.UtcNow;
+
+	//    var boxAOld = new BoxInfo("box_A", now.AddMinutes(-5));
+	//    var boxANew = new BoxInfo("box_A", now.AddMinutes(-1));
+
+	//    var boxB = new BoxInfo("box_B", now.AddMinutes(-7));
+	//    var boxC = new BoxInfo("box_C", now.AddMinutes(-2));
+
+	//    var boxDOld = new BoxInfo("box_D", now.AddMinutes(-10));
+	//    var boxDNew = new BoxInfo("box_D", now.AddMinutes(-3));
+
+	//    var boxE = new BoxInfo("box_E", now.AddMinutes(-2));
+
+	//    var initialKnownBoxes = new List<BoxInfo> { boxAOld, boxDNew, boxE };
+	//    Announcements.BoxData.KnownBoxes.AddRange(initialKnownBoxes);
+
+	//    var externalNodeKnownBoxes = new List<BoxInfo> { boxANew, boxB, boxC, boxDOld };
+	//    Publish(new BoxMessage.BoxesInformationRequest(externalNodeKnownBoxes));
+
+	//    var genericMessage = BoxMessenger.Messages.Last();
+	//    var responseWithUpdatedListofKnownBoxes = (BoxMessage.BoxesInformationResponse)genericMessage;
+
+	//    var expectedBoxes = new List<BoxInfo> { boxANew, boxB, boxC, boxDNew, boxE };
+	//    CollectionAssert.AreEquivalent(expectedBoxes, responseWithUpdatedListofKnownBoxes.Boxes);
+	//}
+
+	//[Test]
+	//public void UpdateListOfKnownBoxesWhenResponseForAnnouncementReceived()
+	//{
+	//    var now = DateTime.UtcNow;
+
+	//    var boxAOld = new BoxInfo("box_A", now.AddMinutes(-5));
+	//    var boxANew = new BoxInfo("box_A", now.AddMinutes(-1));
+
+	//    var boxB = new BoxInfo("box_B", now.AddMinutes(-7));
+	//    var boxC = new BoxInfo("box_C", now.AddMinutes(-2));
+
+	//    var boxDOld = new BoxInfo("box_D", now.AddMinutes(-10));
+	//    var boxDNew = new BoxInfo("box_D", now.AddMinutes(-3));
+
+	//    var boxE = new BoxInfo("box_E", now.AddMinutes(-2));
+
+
+	//    var initialKnownBoxes = new List<BoxInfo> { boxAOld, boxDNew, boxE };
+	//    Announcements.BoxData.KnownBoxes.AddRange(initialKnownBoxes);
+
+	//    var externalNodeKnownBoxes = new List<BoxInfo> { boxANew, boxB, boxC, boxDOld };
+	//    Publish(new BoxMessage.BoxesInformationRequest(externalNodeKnownBoxes));
+
+	//    var expectedBoxes = new List<BoxInfo> { boxANew, boxB, boxC, boxDNew, boxE };
+
+	//    CollectionAssert.AreEquivalent(expectedBoxes, Announcements.BoxData.KnownBoxes);
+	//}
+
+	//[Test]
+	//public void UpdateListOfKnownBoxesWhenBoxesInformationResponseMessageReceived()
+	//{
+	//    var currentlyKnownBoxes = new List<BoxInfo>
+	//                                  {
+	//                                      new BoxInfo("box_A", DateTime.UtcNow.AddMinutes(-5)),
+	//                                      new BoxInfo("box_B", DateTime.UtcNow.AddMinutes(-7))
+	//                                  };
+	//    var receivedKnownBoxes = new List<BoxInfo>
+	//                                  {
+	//                                      new BoxInfo("box_A", DateTime.UtcNow.AddMinutes(-1)),
+	//                                      new BoxInfo("box_B", DateTime.UtcNow.AddMinutes(-3)),
+	//                                      new BoxInfo("box_C", DateTime.UtcNow.AddMinutes(-5))
+	//                                  };
+
+	//    Announcements.BoxData.KnownBoxes.AddRange(currentlyKnownBoxes);
+
+	//    Publish(new BoxMessage.BoxesInformationResponse(receivedKnownBoxes));
+
+	//    CollectionAssert.AreEquivalent(receivedKnownBoxes, Announcements.BoxData.KnownBoxes);
+	//}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/IndexCommitter/when_constructing_index_committer_service.cs b/src/KurrentDB.Core.Tests/Services/IndexCommitter/when_constructing_index_committer_service.cs
new file mode 100644
index 00000000000..60fda130028
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/IndexCommitter/when_constructing_index_committer_service.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Services.Storage;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Services.Storage;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using NUnit.Framework;
+
+// ReSharper disable ObjectCreationAsStatement
+
+namespace KurrentDB.Core.Tests.Services.IndexCommitter;
+
+[TestFixture]
+public class when_creating_index_committer_service {
+	protected ICheckpoint ReplicationCheckpoint = new InMemoryCheckpoint(0);
+	protected ICheckpoint WriterCheckpoint = new InMemoryCheckpoint(0);
+	protected IPublisher Publisher = new FakePublisher();
+	protected FakeIndexCommitter<string> IndexCommitter = new();
+	protected ITableIndex TableIndex = new FakeTableIndex<string>();
+	private readonly QueueStatsManager _queueStatsManager = new();
+
+	[Test]
+	public void null_index_committer_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => new IndexCommitterService<string>(null, Publisher,
+			 WriterCheckpoint, ReplicationCheckpoint, TableIndex, _queueStatsManager));
+	}
+
+	[Test]
+	public void null_publisher_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => new IndexCommitterService<string>(IndexCommitter, null,
+			 WriterCheckpoint, ReplicationCheckpoint, TableIndex, _queueStatsManager));
+	}
+
+	[Test]
+	public void null_writer_checkpoint_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => new IndexCommitterService<string>(IndexCommitter, Publisher,
+			 null, ReplicationCheckpoint, TableIndex, _queueStatsManager));
+	}
+	[Test]
+	public void null_replication_checkpoint_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => new IndexCommitterService<string>(IndexCommitter, Publisher,
+			 WriterCheckpoint, null, TableIndex, _queueStatsManager));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/IndexCommitter/when_index_commiter_service_receives_replicated_to_prepare_post_position.cs b/src/KurrentDB.Core.Tests/Services/IndexCommitter/when_index_commiter_service_receives_replicated_to_prepare_post_position.cs
new file mode 100644
index 00000000000..0d3f3ef49b5
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/IndexCommitter/when_index_commiter_service_receives_replicated_to_prepare_post_position.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.IndexCommitter;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_index_committer_service_receives_replicated_to_prepare_post_position<TLogFormat, TStreamId> : with_index_committer_service<TLogFormat, TStreamId> {
+	private readonly Guid _correlationId = Guid.NewGuid();
+	private readonly long _logPrePosition = 4000;
+	private readonly long _logPostPosition = 4001;
+
+	public override Task TestFixtureSetUp() {
+		ReplicationCheckpoint = new InMemoryCheckpoint(0);
+		return base.TestFixtureSetUp();
+	}
+	public override void Given() { }
+	public override void When() {
+
+		AddPendingPrepare(_logPrePosition, _logPostPosition);
+		Service.Handle(new StorageMessage.CommitAck(_correlationId, _logPrePosition, _logPrePosition, 0, 0));
+		ReplicationCheckpoint.Write(_logPostPosition);
+		ReplicationCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.ReplicatedTo(_logPostPosition));
+	}
+
+	[Test]
+	public void commit_replicated_message_should_have_been_published() {
+		AssertEx.IsOrBecomesTrue(() => 1 == CommitReplicatedMgs.Count);
+		Assert.True(CommitReplicatedMgs.TryDequeue(out var msg));
+		Assert.AreEqual(_logPrePosition, msg.TransactionPosition);
+	}
+	[Test]
+	public void index_written_message_should_have_been_published() {
+		AssertEx.IsOrBecomesTrue(() => 1 == IndexWrittenMgs.Count);
+		Assert.True(IndexWrittenMgs.TryDequeue(out var msg));
+		Assert.AreEqual(_logPrePosition, msg.LogPosition);
+	}
+	[Test]
+	public void index_should_have_been_updated() {
+		AssertEx.IsOrBecomesTrue(() => 1 == IndexCommitter.CommittedPrepares.Count);
+		Assert.True(IndexCommitter.CommittedPrepares.TryDequeue(out var msg));
+		Assert.AreEqual(_logPrePosition, msg.LogPosition);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_duplicate_commit_acks.cs b/src/KurrentDB.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_duplicate_commit_acks.cs
new file mode 100644
index 00000000000..c645e74ce24
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_duplicate_commit_acks.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.IndexCommitter;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_index_committer_service_receives_duplicate_commit_acks<TLogFormat, TStreamId> : with_index_committer_service<TLogFormat, TStreamId> {
+	private readonly long _logPosition = 4000;
+	private readonly Guid _correlationId = Guid.NewGuid();
+	public override void Given() { }
+	public override void When() {
+		AddPendingPrepare(_logPosition);
+
+		Service.Handle(new StorageMessage.CommitAck(_correlationId, _logPosition, _logPosition, 0, 0));
+		Service.Handle(new StorageMessage.CommitAck(_correlationId, _logPosition, _logPosition, 0, 0));
+		Service.Handle(new ReplicationTrackingMessage.ReplicatedTo(_logPosition));
+	}
+
+	[Test]
+	public void commit_replicated_message_should_not_be_sent() {
+		Assert.AreEqual(0, CommitReplicatedMgs.Count);
+	}
+	[Test]
+	public void index_written_message_should_not_have_been_published() {
+		Assert.AreEqual(0, IndexWrittenMgs.Count);
+	}
+	[Test]
+	public void index_should_not_have_been_updated() {
+		Assert.AreEqual(0, IndexCommitter.CommittedPrepares.Count);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_multiple_acks_for_different_positions.cs b/src/KurrentDB.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_multiple_acks_for_different_positions.cs
new file mode 100644
index 00000000000..02d449249f1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_multiple_acks_for_different_positions.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.IndexCommitter;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_index_committer_service_receives_multiple_acks_for_different_positions<TLogFormat, TStreamId> : with_index_committer_service<TLogFormat, TStreamId> {
+
+	private readonly long _logPositionP1 = 1000;
+	private readonly long _logPositionP2 = 2000;
+	private readonly long _logPositionP3 = 3000;
+	private readonly long _logPositionCommit1 = 3100;
+	private readonly long _logPositionCommit2 = 3200;
+	private readonly long _logPositionCommit3 = 3300;
+
+	public override void Given() {
+
+		AddPendingPrepare(_logPositionP1);
+		AddPendingPrepare(_logPositionP2);
+		AddPendingPrepare(_logPositionP3);
+
+		Service.Handle(new StorageMessage.CommitAck(Guid.NewGuid(), _logPositionCommit1, _logPositionP1, 0, 0));
+		Service.Handle(new StorageMessage.CommitAck(Guid.NewGuid(), _logPositionCommit2, _logPositionP2, 0, 0));
+		Service.Handle(new StorageMessage.CommitAck(Guid.NewGuid(), _logPositionCommit3, _logPositionP3, 0, 0));
+	}
+
+	public override void When() {
+		// Reach quorum for middle commit
+		ReplicationCheckpoint.Write(_logPositionCommit2 + 1);
+		ReplicationCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.ReplicatedTo(_logPositionCommit2 + 1));
+
+	}
+
+	[Test]
+	public void commit_replicated_message_should_have_been_published_for_first_two_events() {
+		AssertEx.IsOrBecomesTrue(() => 2 == CommitReplicatedMgs.Count);
+		Assert.True(CommitReplicatedMgs.TryDequeue(out var msg));
+		Assert.AreEqual(_logPositionP1, msg.TransactionPosition);
+		Assert.True(CommitReplicatedMgs.TryDequeue(out msg));
+		Assert.AreEqual(_logPositionP2, msg.TransactionPosition);
+	}
+	[Test]
+	public void index_written_message_should_have_been_published_for_first_two_events() {
+		AssertEx.IsOrBecomesTrue(() => 2 == IndexWrittenMgs.Count);
+		Assert.True(IndexWrittenMgs.TryDequeue(out var msg));
+		Assert.AreEqual(_logPositionCommit1, msg.LogPosition);
+		Assert.True(IndexWrittenMgs.TryDequeue(out msg));
+		Assert.AreEqual(_logPositionCommit2, msg.LogPosition);
+	}
+
+	[Test]
+	public void index_should_have_been_updated() {
+		AssertEx.IsOrBecomesTrue(() => 2 == IndexCommitter.CommittedPrepares.Count);
+		Assert.True(IndexCommitter.CommittedPrepares.TryDequeue(out var msg));
+		Assert.AreEqual(_logPositionP1, msg.LogPosition);
+		Assert.True(IndexCommitter.CommittedPrepares.TryDequeue(out msg));
+		Assert.AreEqual(_logPositionP2, msg.LogPosition);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_multiple_acks_for_different_positions_out_of_order.cs b/src/KurrentDB.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_multiple_acks_for_different_positions_out_of_order.cs
new file mode 100644
index 00000000000..8b5f04e275a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_multiple_acks_for_different_positions_out_of_order.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.IndexCommitter;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_index_committer_service_receives_multiple_acks_for_different_positions_out_of_order<TLogFormat, TStreamId>
+	: with_index_committer_service<TLogFormat, TStreamId> {
+
+	private readonly Guid _correlationId1 = Guid.NewGuid();
+	private readonly Guid _correlationId2 = Guid.NewGuid();
+
+	private readonly long _logPosition1 = 1000;
+	private readonly long _logPosition2 = 2000;
+	private readonly long _logPosition3 = 3000;
+	private readonly long _logPosition4 = 4000;
+
+	public override void Given() { }
+
+	public override void When() {
+
+
+		AddPendingPrepare(_logPosition2);
+		AddPendingPrepare(_logPosition1);
+		Service.Handle(new StorageMessage.CommitAck(_correlationId2, _logPosition4, _logPosition2, 0, 0));
+		Service.Handle(new StorageMessage.CommitAck(_correlationId1, _logPosition3, _logPosition1, 0, 0));
+
+
+		ReplicationCheckpoint.Write(_logPosition4 + 1);
+		ReplicationCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.ReplicatedTo(_logPosition4 + 1));
+	}
+
+	[Test]
+	public void commit_replicated_message_should_have_been_published_for_both_events() {
+		AssertEx.IsOrBecomesTrue(() => 2 == CommitReplicatedMgs.Count);
+		Assert.True(CommitReplicatedMgs.TryDequeue(out var msg));
+		Assert.AreEqual(_correlationId1, msg.CorrelationId);
+		Assert.True(CommitReplicatedMgs.TryDequeue(out msg));
+		Assert.AreEqual(_correlationId2, msg.CorrelationId);
+	}
+	[Test]
+	public void index_written_message_should_have_been_published_for_both_events() {
+		AssertEx.IsOrBecomesTrue(() => 2 == IndexWrittenMgs.Count);
+		Assert.True(IndexWrittenMgs.TryDequeue(out var msg));
+		Assert.AreEqual(_logPosition3, msg.LogPosition);
+		Assert.True(IndexWrittenMgs.TryDequeue(out msg));
+		Assert.AreEqual(_logPosition4, msg.LogPosition);
+	}
+	[Test]
+	public void prepare_ack_message_should_have_been_published_for_both_events() {
+		AssertEx.IsOrBecomesTrue(() => 2 == IndexCommitter.CommittedPrepares.Count);
+		Assert.True(IndexCommitter.CommittedPrepares.TryDequeue(out var msg));
+		Assert.AreEqual(_logPosition1, msg.LogPosition);
+		Assert.True(IndexCommitter.CommittedPrepares.TryDequeue(out msg));
+		Assert.AreEqual(_logPosition2, msg.LogPosition);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_replicated_lower_position.cs b/src/KurrentDB.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_replicated_lower_position.cs
new file mode 100644
index 00000000000..4d047555f22
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_replicated_lower_position.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.IndexCommitter;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_index_committer_service_receives_replicated_lower_position<TLogFormat, TStreamId>
+	: with_index_committer_service<TLogFormat, TStreamId> {
+	private readonly Guid _correlationId = Guid.NewGuid();
+	private readonly long _logPosition = 2000;
+
+	[OneTimeSetUp]
+	public override Task TestFixtureSetUp() {
+		ReplicationCheckpoint = new InMemoryCheckpoint(100);
+		return base.TestFixtureSetUp();
+	}
+	public override void Given() { }
+	public override void When() {
+		Service.Handle(new StorageMessage.CommitAck(_correlationId, _logPosition, _logPosition, 0, 0));
+		ReplicationCheckpoint.Write(_logPosition - 1);
+		ReplicationCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.ReplicatedTo(_logPosition - 1));
+	}
+
+	[Test]
+	public void commit_replicated_message_should_not_have_been_published() {
+		Assert.AreEqual(0, CommitReplicatedMgs.Count);
+	}
+	[Test]
+	public void index_written_message_should_have_not_been_published() {
+		Assert.AreEqual(0, IndexWrittenMgs.Count);
+	}
+	[Test]
+	public void index_written_message_should_not_have_been_published() {
+		Assert.AreEqual(0, IndexWrittenMgs.Count);
+	}
+	[Test]
+	public void index_should_not_have_been_updated() {
+		Assert.AreEqual(0, IndexCommitter.CommittedPrepares.Count);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_replicated_to_prepare_pre_position.cs b/src/KurrentDB.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_replicated_to_prepare_pre_position.cs
new file mode 100644
index 00000000000..f6b1abca32c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/IndexCommitter/when_index_committer_service_receives_replicated_to_prepare_pre_position.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.IndexCommitter;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_index_committer_service_receives_replicated_to_prepare_pre_position<TLogFormat, TStreamId> : with_index_committer_service<TLogFormat, TStreamId> {
+	private readonly Guid _correlationId = Guid.NewGuid();
+	private readonly long _logPrePosition = 4000;
+	private readonly long _logPostPosition = 4001;
+
+	public override Task TestFixtureSetUp() {
+		ReplicationCheckpoint = new InMemoryCheckpoint(0);
+		return base.TestFixtureSetUp();
+	}
+	public override void Given() { }
+	public override void When() {
+
+		AddPendingPrepare(_logPrePosition, _logPostPosition);
+		Service.Handle(new StorageMessage.CommitAck(_correlationId, _logPrePosition, _logPrePosition, 0, 0));
+		ReplicationCheckpoint.Write(_logPrePosition);
+		ReplicationCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.ReplicatedTo(_logPrePosition));
+	}
+
+	[Test]
+	public void commit_replicated_message_should_not_have_been_published() {
+		AssertEx.IsOrBecomesTrue(() => CommitReplicatedMgs.IsEmpty);
+	}
+	[Test]
+	public void index_written_message_should_not_have_been_published() {
+		AssertEx.IsOrBecomesTrue(() => IndexWrittenMgs.IsEmpty);
+	}
+	[Test]
+	public void index_should_not_have_been_updated() {
+		AssertEx.IsOrBecomesTrue(() => IndexCommitter.CommittedPrepares.IsEmpty);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/IndexCommitter/with_index_committer_service.cs b/src/KurrentDB.Core.Tests/Services/IndexCommitter/with_index_committer_service.cs
new file mode 100644
index 00000000000..092d497453a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/IndexCommitter/with_index_committer_service.cs
@@ -0,0 +1,118 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Storage;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.Services.Replication;
+using KurrentDB.Core.Tests.Services.Storage;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.IndexCommitter;
+
+public abstract class with_index_committer_service<TLogFormat, TStreamId> {
+	protected ITableIndex TableIndex;
+
+	protected ICheckpoint ReplicationCheckpoint;
+	protected ICheckpoint WriterCheckpoint;
+	protected SynchronousScheduler Publisher = new("publisher");
+	protected ConcurrentQueue<StorageMessage.CommitIndexed> CommitReplicatedMgs = new ConcurrentQueue<StorageMessage.CommitIndexed>();
+	protected ConcurrentQueue<ReplicationTrackingMessage.IndexedTo> IndexWrittenMgs = new ConcurrentQueue<ReplicationTrackingMessage.IndexedTo>();
+
+	protected IndexCommitterService<TStreamId> Service;
+	protected FakeIndexCommitter<TStreamId> IndexCommitter;
+	protected ITFChunkScavengerLogManager TfChunkScavengerLogManager;
+
+	[OneTimeSetUp]
+	public virtual async Task TestFixtureSetUp() {
+		IndexCommitter = new FakeIndexCommitter<TStreamId>();
+		ReplicationCheckpoint = new InMemoryCheckpoint();
+		WriterCheckpoint = new InMemoryCheckpoint(0);
+		TableIndex = new FakeTableIndex<TStreamId>();
+		TfChunkScavengerLogManager = new FakeTfChunkLogManager();
+		Service = new IndexCommitterService<TStreamId>(IndexCommitter, Publisher, WriterCheckpoint, ReplicationCheckpoint, TableIndex, new QueueStatsManager());
+		await Service.Init(0, CancellationToken.None);
+		Publisher.Subscribe(new AdHocHandler<StorageMessage.CommitIndexed>(m => CommitReplicatedMgs.Enqueue(m)));
+		Publisher.Subscribe(new AdHocHandler<ReplicationTrackingMessage.IndexedTo>(m => IndexWrittenMgs.Enqueue(m)));
+		Publisher.Subscribe<ReplicationTrackingMessage.ReplicatedTo>(Service);
+		Given();
+
+		When();
+	}
+
+	[OneTimeTearDown]
+	public virtual void TestFixtureTearDown() {
+		Service.Stop();
+	}
+	public abstract void Given();
+	public abstract void When();
+
+	protected void AddPendingPrepare(long transactionPosition, long postPosition = -1) {
+		postPosition = postPosition == -1 ? transactionPosition : postPosition;
+		var prepare = CreatePrepare(transactionPosition, transactionPosition);
+		Service.AddPendingPrepare(new[] { prepare }, postPosition);
+	}
+
+	protected void AddPendingPrepares(long transactionPosition, long[] logPositions) {
+		var prepares = new List<IPrepareLogRecord<TStreamId>>();
+		foreach (var pos in logPositions) {
+			prepares.Add(CreatePrepare(transactionPosition, pos));
+		}
+
+		Service.AddPendingPrepare(prepares.ToArray(), logPositions[^1]);
+	}
+
+	private IPrepareLogRecord<TStreamId> CreatePrepare(long transactionPosition, long logPosition) {
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		return LogRecord.Prepare(recordFactory, logPosition, Guid.NewGuid(), Guid.NewGuid(), transactionPosition, 0,
+			streamId, -1, PrepareFlags.None, eventTypeId,
+			new byte[10], new byte[0]);
+	}
+
+
+	protected void AddPendingCommit(long transactionPosition, long logPosition, long postPosition = -1) {
+		postPosition = postPosition == -1 ? logPosition : postPosition;
+		var commit = LogRecord.Commit(logPosition, Guid.NewGuid(), transactionPosition, 0);
+		Service.AddPendingCommit(commit, postPosition);
+	}
+}
+
+public class FakeIndexCommitter<TStreamId> : IIndexCommitter<TStreamId> {
+	public ConcurrentQueue<IPrepareLogRecord<TStreamId>> CommittedPrepares = new();
+	public ConcurrentQueue<CommitLogRecord> CommittedCommits = new();
+
+	public long LastIndexedPosition { get; set; }
+
+	public ValueTask Init(long buildToPosition, CancellationToken token)
+		=> ValueTask.CompletedTask;
+
+	public void Dispose() {
+	}
+
+	public ValueTask<long> Commit(CommitLogRecord commit, bool isTfEof, bool cacheLastEventNumber, CancellationToken token) {
+		CommittedCommits.Enqueue(commit);
+		return new(0L);
+	}
+
+	public ValueTask<long> Commit(IReadOnlyList<IPrepareLogRecord<TStreamId>> committedPrepares, bool isTfEof, bool cacheLastEventNumber, CancellationToken token) {
+		foreach (var prepare in committedPrepares) {
+			CommittedPrepares.Enqueue(prepare);
+		}
+
+		return new(0L);
+	}
+
+	public ValueTask<long> GetCommitLastEventNumber(CommitLogRecord commit, CancellationToken token) => new(0L);
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Monitoring/FormatterTests.cs b/src/KurrentDB.Core.Tests/Services/Monitoring/FormatterTests.cs
new file mode 100644
index 00000000000..cc39f907b41
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Monitoring/FormatterTests.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Common.Utils;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Monitoring;
+
+[TestFixture]
+public class FormatterTests {
+	[Test]
+	[TestCase(0L, ExpectedResult = "0B")]
+	[TestCase(500L, ExpectedResult = "500B")]
+	[TestCase(1023L, ExpectedResult = "1023B")]
+	[TestCase(1024L, ExpectedResult = "1KiB")]
+	[TestCase(2560L, ExpectedResult = "2.5KiB")]
+	[TestCase(1048576L, ExpectedResult = "1MiB")]
+	[TestCase(502792192L, ExpectedResult = "479.5MiB")]
+	[TestCase(1073741824L, ExpectedResult = "1GiB")]
+	[TestCase(79725330432L, ExpectedResult = "74.25GiB")]
+	[TestCase(1099511627776L, ExpectedResult = "1TiB")]
+	[TestCase(1125899906842624L, ExpectedResult = "1024TiB")]
+	[TestCase(long.MaxValue, ExpectedResult = "8388608TiB")]
+	[TestCase(-1L, ExpectedResult = "-1B")]
+	[TestCase(-1023L, ExpectedResult = "-1023B")]
+	[TestCase(-1024, ExpectedResult = "-1KiB")]
+	[TestCase(-1048576L, ExpectedResult = "-1MiB")]
+	public string test_size_multiple_cases_long(long bytes) {
+		return bytes.ToFriendlySizeString();
+	}
+
+	[Test]
+	[TestCase(0UL, ExpectedResult = "0B")]
+	[TestCase(500UL, ExpectedResult = "500B")]
+	[TestCase(1023UL, ExpectedResult = "1023B")]
+	[TestCase(1024UL, ExpectedResult = "1KiB")]
+	[TestCase(2560UL, ExpectedResult = "2.5KiB")]
+	[TestCase(1048576UL, ExpectedResult = "1MiB")]
+	[TestCase(502792192UL, ExpectedResult = "479.5MiB")]
+	[TestCase(1073741824UL, ExpectedResult = "1GiB")]
+	[TestCase(79725330432UL, ExpectedResult = "74.25GiB")]
+	[TestCase(1099511627776UL, ExpectedResult = "1TiB")]
+	[TestCase(1125899906842624UL, ExpectedResult = "1024TiB")]
+	[TestCase(ulong.MaxValue, ExpectedResult = "more than long.MaxValue")] //16777215TiB
+	public string test_size_multiple_cases_ulong(ulong bytes) {
+		return bytes.ToFriendlySizeString();
+	}
+
+
+	[Test]
+	[TestCase(0D, ExpectedResult = "0B/s")]
+	[TestCase(500L, ExpectedResult = "500B/s")]
+	[TestCase(1023L, ExpectedResult = "1023B/s")]
+	[TestCase(1024L, ExpectedResult = "1KiB/s")]
+	[TestCase(2560L, ExpectedResult = "2.5KiB/s")]
+	[TestCase(1048576L, ExpectedResult = "1MiB/s")]
+	[TestCase(502792192L, ExpectedResult = "479.5MiB/s")]
+	[TestCase(1073741824L, ExpectedResult = "1GiB/s")]
+	[TestCase(79725330432L, ExpectedResult = "74.25GiB/s")]
+	[TestCase(-1L, ExpectedResult = "-1B/s")]
+	[TestCase(-1023L, ExpectedResult = "-1023B/s")]
+	[TestCase(-1024, ExpectedResult = "-1KiB/s")]
+	[TestCase(-1048576L, ExpectedResult = "-1MiB/s")]
+	public string test_speed_multiple_cases(double speed) {
+		return speed.ToFriendlySpeedString();
+	}
+
+
+	[Test]
+	[TestCase(0L, ExpectedResult = "0")]
+	[TestCase(500L, ExpectedResult = "500")]
+	[TestCase(1023L, ExpectedResult = "1023")]
+	[TestCase(1024L, ExpectedResult = "1K")]
+	[TestCase(2560L, ExpectedResult = "2.5K")]
+	[TestCase(1048576L, ExpectedResult = "1M")]
+	[TestCase(502792192L, ExpectedResult = "479.5M")]
+	[TestCase(1073741824L, ExpectedResult = "1G")]
+	[TestCase(79725330432L, ExpectedResult = "74.25G")]
+	[TestCase(1099511627776L, ExpectedResult = "1T")]
+	[TestCase(1125899906842624L, ExpectedResult = "1024T")]
+	[TestCase(long.MaxValue, ExpectedResult = "8388608T")]
+	[TestCase(-1L, ExpectedResult = "-1")]
+	[TestCase(-1023L, ExpectedResult = "-1023")]
+	[TestCase(-1024, ExpectedResult = "-1K")]
+	[TestCase(-1048576L, ExpectedResult = "-1M")]
+	public string test_number_multiple_cases_long(long number) {
+		return number.ToFriendlyNumberString();
+	}
+
+	[Test]
+	[TestCase(0UL, ExpectedResult = "0")]
+	[TestCase(500UL, ExpectedResult = "500")]
+	[TestCase(1023UL, ExpectedResult = "1023")]
+	[TestCase(1024UL, ExpectedResult = "1K")]
+	[TestCase(2560UL, ExpectedResult = "2.5K")]
+	[TestCase(1048576UL, ExpectedResult = "1M")]
+	[TestCase(502792192UL, ExpectedResult = "479.5M")]
+	[TestCase(1073741824UL, ExpectedResult = "1G")]
+	[TestCase(79725330432UL, ExpectedResult = "74.25G")]
+	[TestCase(1099511627776UL, ExpectedResult = "1T")]
+	[TestCase(1125899906842624UL, ExpectedResult = "1024T")]
+	[TestCase(ulong.MaxValue, ExpectedResult = "more than long.MaxValue")] //16777215TiB
+	public string test_number_multiple_cases_ulong(ulong number) {
+		return number.ToFriendlyNumberString();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/PeriodicLogs/PeriodicallyLoggingServiceTests.cs b/src/KurrentDB.Core.Tests/Services/PeriodicLogs/PeriodicallyLoggingServiceTests.cs
new file mode 100644
index 00000000000..94dc5b42814
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/PeriodicLogs/PeriodicallyLoggingServiceTests.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.PeriodicLogs;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Fakes;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.PeriodicLogs;
+
+
+public class PeriodicallyLoggingServiceTests {
+
+	private FakePublisher _publisher;
+	private FakeLogger _logger;
+	private string _esVersion;
+
+	[SetUp]
+	public void SetUp() {
+		_publisher = new();
+		_logger = new FakeLogger();
+		_esVersion = "0.0.0.0";
+	}
+
+	[Test]
+	public void on_start() {
+		// given
+		var sut = new PeriodicallyLoggingService(_publisher, _esVersion, _logger);
+
+		// when
+		sut.Handle(new SystemMessage.SystemStart());
+
+		// then
+		Assert.IsInstanceOf<MonitoringMessage.CheckEsVersion>(_publisher.Messages.Single());
+		Assert.IsEmpty(_logger.LogMessages);
+	}
+
+	[Test]
+	public void log_es_version_periodically() {
+		// given
+		var sut = new PeriodicallyLoggingService(_publisher, _esVersion, _logger);
+
+		// when
+		sut.Handle(new MonitoringMessage.CheckEsVersion());
+
+		// then
+		var schedule = (TimerMessage.Schedule)_publisher.Messages.Single();
+		Assert.AreEqual(TimeSpan.FromHours(12), schedule.TriggerAfter);
+		Assert.IsInstanceOf<MonitoringMessage.CheckEsVersion>(schedule.ReplyMessage);
+
+		var logMessage = _logger.LogMessages.Single();
+		Assert.AreEqual($"Current version of KurrentDB is : \"0.0.0.0\" ", logMessage.RenderMessage());
+	}
+
+}
diff --git a/src/KurrentDB.Core.Tests/Services/PersistentSubscription/OutstandingMessageCacheTests.cs b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/OutstandingMessageCacheTests.cs
new file mode 100644
index 00000000000..330f495c47d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/OutstandingMessageCacheTests.cs
@@ -0,0 +1,214 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Services.PersistentSubscription;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.PersistentSubscription;
+
+[TestFixture(EventSource.SingleStream)]
+[TestFixture(EventSource.AllStream)]
+public class OutstandingMessageCacheTests {
+	private EventSource _eventSource;
+	public OutstandingMessageCacheTests(EventSource eventSource) {
+		_eventSource = eventSource;
+	}
+
+	private OutstandingMessage BuildMessageAt(int eventPosition, EventSource eventSource, Guid? forcedEventId = null) {
+		IPersistentSubscriptionStreamPosition previousEventPosition =
+			eventPosition > 0 ? GetStreamPositionFor(eventPosition - 1) : null;
+		var @event = Helper.GetFakeEventFor(eventPosition, eventSource, forcedEventId);
+		return OutstandingMessage.ForPushedEvent(
+			OutstandingMessage.ForNewEvent(@event, GetStreamPositionFor(eventPosition)),
+			eventPosition, previousEventPosition).message;
+	}
+
+	private Guid GetEventIdFor(int position) {
+		return Helper.GetEventIdFor(position);
+	}
+
+	private IPersistentSubscriptionStreamPosition GetStreamPositionFor(int position) {
+		return Helper.GetStreamPositionFor(position, _eventSource);
+	}
+
+	[Test]
+	public void when_created_has_zero_count() {
+		var cache = new OutstandingMessageCache();
+		Assert.AreEqual(0, cache.Count);
+	}
+
+	[Test]
+	public void can_remove_non_existing_item() {
+		var cache = new OutstandingMessageCache();
+		Assert.DoesNotThrow(() => cache.Remove(Guid.NewGuid()));
+	}
+
+	[Test]
+	public void adding_an_item_causes_count_to_go_up() {
+		var cache = new OutstandingMessageCache();
+		cache.StartMessage(BuildMessageAt(0, _eventSource), DateTime.Now);
+		Assert.AreEqual(1, cache.Count);
+		Assert.AreEqual(GetStreamPositionFor(0), cache.GetLowestPosition().message?.EventPosition);
+	}
+
+	[Test]
+	public void can_add_duplicate() {
+		var cache = new OutstandingMessageCache();
+		var id = Guid.NewGuid();
+		var result1 =
+			cache.StartMessage(BuildMessageAt(0, _eventSource, id), DateTime.Now);
+		var result2 =
+			cache.StartMessage(BuildMessageAt(1, _eventSource, id), DateTime.Now);
+		Assert.AreEqual(1, cache.Count);
+		Assert.AreEqual(GetStreamPositionFor(0), cache.GetLowestPosition().message?.EventPosition);
+		Assert.AreEqual(StartMessageResult.Success, result1);
+		Assert.AreEqual(StartMessageResult.SkippedDuplicate, result2);
+	}
+
+	[Test]
+	public void can_remove_duplicate() {
+		var cache = new OutstandingMessageCache();
+		var id = Guid.NewGuid();
+		cache.StartMessage(BuildMessageAt(0, _eventSource, id), DateTime.Now);
+		cache.StartMessage(BuildMessageAt(1, _eventSource, id), DateTime.Now);
+		cache.Remove(id);
+		Assert.AreEqual(0, cache.Count);
+		Assert.IsNull(cache.GetLowestPosition().message);
+		Assert.AreEqual(long.MaxValue, cache.GetLowestPosition().sequenceNumber);
+	}
+
+	[Test]
+	public void can_remove_existing_item() {
+		var cache = new OutstandingMessageCache();
+		cache.StartMessage(BuildMessageAt(0, _eventSource), DateTime.Now);
+		cache.Remove(GetEventIdFor(0));
+		Assert.AreEqual(0, cache.Count);
+		Assert.IsNull(cache.GetLowestPosition().message);
+		Assert.AreEqual(long.MaxValue, cache.GetLowestPosition().sequenceNumber);
+	}
+
+	[Test]
+	public void lowest_works_on_add() {
+		var cache = new OutstandingMessageCache();
+		cache.StartMessage(BuildMessageAt(9, _eventSource), DateTime.Now);
+		Assert.AreEqual(GetStreamPositionFor(9), cache.GetLowestPosition().message?.EventPosition);
+	}
+
+	[Test]
+	public void lowest_works_on_adds_then_remove() {
+		var cache = new OutstandingMessageCache();
+		cache.StartMessage(BuildMessageAt(7, _eventSource), DateTime.Now);
+		cache.StartMessage(BuildMessageAt(8, _eventSource), DateTime.Now);
+		cache.StartMessage(BuildMessageAt(9, _eventSource), DateTime.Now);
+		cache.Remove(GetEventIdFor(7));
+		Assert.AreEqual(GetStreamPositionFor(8), cache.GetLowestPosition().message?.EventPosition);
+	}
+
+	[Test]
+	public void lowest_on_empty_cache_returns_max() {
+		var cache = new OutstandingMessageCache();
+		Assert.IsNull(cache.GetLowestPosition().message);
+		Assert.AreEqual(long.MaxValue, cache.GetLowestPosition().sequenceNumber);
+	}
+
+	[Test]
+	public void lowest_ignores_replayed_events() {
+		var cache = new OutstandingMessageCache();
+		//normal event:
+		cache.StartMessage(BuildMessageAt(5, _eventSource), DateTime.Now);
+		//replayed event:
+		cache.StartMessage(OutstandingMessage.ForParkedEvent(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "$persistentsubscription-name::group-parked", 4)), DateTime.Now);
+		Assert.AreEqual(GetStreamPositionFor(5), cache.GetLowestPosition().message?.EventPosition);
+	}
+
+	[Test]
+	public void get_expired_messages_returns_max_value_on_empty_cache() {
+		var cache = new OutstandingMessageCache();
+		Assert.AreEqual(0, cache.GetMessagesExpiringBefore(DateTime.Now).Count());
+		Assert.IsNull(cache.GetLowestPosition().message);
+		Assert.AreEqual(long.MaxValue, cache.GetLowestPosition().sequenceNumber);
+	}
+
+	[Test]
+	public void message_that_expires_is_included_in_expired_list() {
+		var cache = new OutstandingMessageCache();
+		cache.StartMessage(BuildMessageAt(0, _eventSource),
+			DateTime.Now.AddSeconds(-1));
+		var expired = cache.GetMessagesExpiringBefore(DateTime.Now).ToList();
+		Assert.AreEqual(1, expired.Count());
+		Assert.AreEqual(GetEventIdFor(0), expired.FirstOrDefault().EventId);
+	}
+
+	[Test]
+	public void message_that_expires_is_included_in_expired_list_with_another_that_should_not() {
+		var cache = new OutstandingMessageCache();
+		cache.StartMessage(BuildMessageAt(0, _eventSource), DateTime.Now.AddSeconds(-1));
+		cache.StartMessage(
+			BuildMessageAt(1, _eventSource), DateTime.Now.AddSeconds(1));
+		var expired = cache.GetMessagesExpiringBefore(DateTime.Now).ToList();
+		Assert.AreEqual(1, expired.Count());
+		Assert.AreEqual(GetEventIdFor(0), expired.FirstOrDefault().EventId);
+	}
+
+	[Test]
+	public void message_that_is_removed_does_not_show_up_in_expired_list() {
+		var cache = new OutstandingMessageCache();
+		cache.StartMessage(BuildMessageAt(1, _eventSource),
+			DateTime.Now.AddSeconds(-11));
+		cache.Remove(GetEventIdFor(1));
+		var expired = cache.WaitingTimeMessages();
+		Assert.AreEqual(0, expired.Count());
+	}
+
+	[Test]
+	public void can_remove_non_first_message_and_have_removed_from_time() {
+		var cache = new OutstandingMessageCache();
+		cache.StartMessage(
+			BuildMessageAt(1, _eventSource),
+			DateTime.Now.AddSeconds(-12));
+		cache.StartMessage(
+			BuildMessageAt(2, _eventSource),
+			DateTime.Now.AddSeconds(-11));
+		cache.Remove(GetEventIdFor(2));
+		var expired = cache.WaitingTimeMessages();
+		Assert.AreEqual(1, expired.Count());
+		Assert.AreEqual(GetEventIdFor(1), expired.FirstOrDefault().Item2.MessageId);
+	}
+
+	[Test]
+	public void can_add_multiple_messages_same_time_different_ids() {
+		var cache = new OutstandingMessageCache();
+		var time = DateTime.Now.AddSeconds(-12);
+		cache.StartMessage(
+			BuildMessageAt(1, _eventSource), time);
+		cache.StartMessage(
+			BuildMessageAt(2, _eventSource), time);
+		var expired = cache.WaitingTimeMessages();
+		Assert.AreEqual(2, expired.Count());
+	}
+
+	[Test]
+	public void can_remove_second_message_same_time_different_ids() {
+		var cache = new OutstandingMessageCache();
+		var time = DateTime.Now.AddSeconds(-12);
+		cache.StartMessage(
+			BuildMessageAt(1, _eventSource), time);
+		cache.StartMessage(
+			BuildMessageAt(2, _eventSource), time);
+		cache.Remove(GetEventIdFor(2));
+		var expired = cache.WaitingTimeMessages();
+		Assert.AreEqual(GetEventIdFor(1), expired.FirstOrDefault().Item2.MessageId);
+		Assert.AreEqual(1, expired.Count());
+	}
+
+	[Test]
+	public void message_that_notexpired_is_not_included_in_expired_list() {
+		var cache = new OutstandingMessageCache();
+		cache.StartMessage(BuildMessageAt(0, _eventSource),
+			DateTime.Now.AddSeconds(1));
+		var expired = cache.GetMessagesExpiringBefore(DateTime.Now).ToList();
+		Assert.AreEqual(0, expired.Count());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionCheckpointReaderTests.cs b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionCheckpointReaderTests.cs
new file mode 100644
index 00000000000..7fb39490847
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionCheckpointReaderTests.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.PersistentSubscription;
+using KurrentDB.Core.Tests.Helpers.IODispatcherTests;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.PersistentSubscription;
+
+public class PersistentSubscriptionCheckpointReaderTests {
+	[TestCase("SubscriptionCheckpoint")] // old checkpoints
+	[TestCase("$SubscriptionCheckpoint")] // new checkpoints
+	public void can_read_checkpoints(string checkpointEventType) {
+		var bus = new SynchronousScheduler("persistent subscription test bus");
+
+		bus.Subscribe(new AdHocHandler<ClientMessage.ReadStreamEventsBackward>(msg => {
+			var lastEventNumber = msg.FromEventNumber + 1;
+			var nextEventNumber = lastEventNumber + 1;
+
+			var events = IODispatcherTestHelpers.CreateResolvedEvent<LogFormat.V2, string>(
+				stream: msg.EventStreamId,
+				eventType: checkpointEventType,
+				data: "\"the checkpoint data\"");
+
+			msg.Envelope.ReplyWith(new ClientMessage.ReadStreamEventsBackwardCompleted(
+				correlationId: msg.CorrelationId,
+				eventStreamId: msg.EventStreamId,
+				fromEventNumber: msg.FromEventNumber,
+				maxCount: msg.MaxCount,
+				result: ReadStreamResult.Success,
+				events: events,
+				streamMetadata: null,
+				isCachePublic: false,
+				error: "",
+				nextEventNumber: nextEventNumber,
+				lastEventNumber: lastEventNumber,
+				isEndOfStream: false,
+				tfLastCommitPosition: 0));
+		}));
+
+		var ioDispatcher = new IODispatcher(bus, bus);
+		IODispatcherTestHelpers.SubscribeIODispatcher(ioDispatcher, bus);
+		var sut = new PersistentSubscriptionCheckpointReader(ioDispatcher);
+
+		var loadedState = "";
+		sut.BeginLoadState("subscriptionA", state => {
+			loadedState = state;
+		});
+
+		AssertEx.IsOrBecomesTrue(() => loadedState == "the checkpoint data");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionConfigPersistence.cs b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionConfigPersistence.cs
new file mode 100644
index 00000000000..0bb7ac46f2d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionConfigPersistence.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using KurrentDB.Core.Services.PersistentSubscription;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.PersistentSubscription;
+
+[TestFixture]
+public class PersistentSubscriptionConfigTests {
+	[Test]
+	public void output_can_be_read_as_input_and_keep_same_values() {
+		var config = new PersistentSubscriptionConfig();
+		config.Updated = new DateTime(2014, 08, 14);
+		config.UpdatedBy = "Greg";
+		config.Version = "1";
+		config.Entries = new List<PersistentSubscriptionEntry>();
+		config.Entries.Add(new PersistentSubscriptionEntry() { Group = "foo", ResolveLinkTos = true, Stream = "Stream" });
+		var data = config.GetSerializedForm();
+		var config2 = PersistentSubscriptionConfig.FromSerializedForm(data);
+		Assert.AreEqual(1, config2.Entries.Count);
+		Assert.AreEqual(config.Updated, config2.Updated);
+		Assert.AreEqual(config.UpdatedBy, config2.UpdatedBy);
+	}
+
+	[Test]
+	public void bad_json_causes_bad_config_data_exception() {
+		var bunkdata = Encoding.UTF8.GetBytes("{'some weird stuff' : 'something'}");
+		Assert.Throws<BadConfigDataException>(() => PersistentSubscriptionConfig.FromSerializedForm(bunkdata));
+	}
+
+	[Test]
+	public void random_bad_data_causes_bad_config_data_exception() {
+		var bunkdata = Encoding.UTF8.GetBytes("This ain't even valid json");
+		Assert.Throws<BadConfigDataException>(() => PersistentSubscriptionConfig.FromSerializedForm(bunkdata));
+	}
+
+	[Test]
+	public void event_filter_is_parsed_correctly() {
+		var config = new PersistentSubscriptionConfig();
+		config.Updated = new DateTime(2014, 08, 14);
+		config.UpdatedBy = "admin";
+		config.Version = "1";
+
+		var filter = EventFilter.StreamName.Prefixes(true, "test", "blah");
+		var entry = new PersistentSubscriptionEntry {
+			Group = "foo",
+			Stream = "$all",
+			Filter = EventFilter.ParseToDto(filter)
+		};
+		config.Entries = new List<PersistentSubscriptionEntry> { entry };
+		var data = config.GetSerializedForm();
+		var config2 = PersistentSubscriptionConfig.FromSerializedForm(data);
+		var newFilterDto = config2.Entries[0].Filter;
+		var (success, reason) = EventFilter.TryParse(newFilterDto, out var newFilter);
+		Assert.AreEqual(1, config2.Entries.Count);
+		Assert.IsTrue(success);
+		Assert.AreEqual(filter.ToString(), newFilter.ToString());
+	}
+
+	[Test]
+	public void no_event_filter_is_parsed_correctly() {
+		var config = new PersistentSubscriptionConfig();
+		config.Updated = new DateTime(2014, 08, 14);
+		config.UpdatedBy = "admin";
+		config.Version = "1";
+
+		var entry = new PersistentSubscriptionEntry {
+			Group = "foo",
+			Stream = "$all",
+			Filter = null
+		};
+		config.Entries = new List<PersistentSubscriptionEntry> { entry };
+		var data = config.GetSerializedForm();
+		var config2 = PersistentSubscriptionConfig.FromSerializedForm(data);
+		Assert.AreEqual(1, config2.Entries.Count);
+		Assert.IsNull(config2.Entries[0].Filter);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionMessageParkerTests.cs b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionMessageParkerTests.cs
new file mode 100644
index 00000000000..69bac7f72b8
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionMessageParkerTests.cs
@@ -0,0 +1,384 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.PersistentSubscription;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using IODispatcherDelayedMessage = KurrentDB.Core.Helpers.IODispatcherDelayedMessage;
+
+namespace KurrentDB.Core.Tests.Services.PersistentSubscription;
+
+[TestFixture]
+public class PersistentSubscriptionMessageParkerTests {
+	private static string LinkMetadata =
+		"{\"added\":\"2021-01-19T11:40:46.2592636+01:00\",\"reason\":\"Client explicitly NAK'ed message.\"}";
+
+	private static ResolvedEvent CreateResolvedEvent(long eventNumber, long logPosition) {
+		var record = new EventRecord(eventNumber, logPosition, Guid.NewGuid(), Guid.NewGuid(), 0,
+			0, "foo", ExpectedVersion.Any, DateTime.Now, PrepareFlags.IsCommitted, "test-event",
+			Encoding.UTF8.GetBytes("{\"foo\": \"bar\"}"),
+			new byte[] { });
+		return ResolvedEvent.ForResolvedLink(record, null, 0);
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class given_parked_stream_does_not_exist<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+		private PersistentSubscriptionMessageParker _messageParker;
+		private TaskCompletionSource<bool> _done = new TaskCompletionSource<bool>();
+
+		protected override void Given() {
+			base.Given();
+			NoOtherStreams();
+			_messageParker = new PersistentSubscriptionMessageParker(Guid.NewGuid().ToString(), _ioDispatcher);
+		}
+
+		[Test]
+		public async Task should_have_no_parked_messages() {
+			_messageParker.BeginLoadStats(() => {
+				Assert.Zero(_messageParker.ParkedMessageCount);
+				Assert.Null(_messageParker.GetOldestParkedMessage);
+				_done.TrySetResult(true);
+			});
+			await _done.Task.WithTimeout();
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class given_parked_messages_and_no_truncate_before<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+		private PersistentSubscriptionMessageParker _messageParker;
+		private string _streamId = Guid.NewGuid().ToString();
+		private TaskCompletionSource<bool> _done = new TaskCompletionSource<bool>();
+
+		protected override void Given() {
+			base.Given();
+			_messageParker = new PersistentSubscriptionMessageParker(_streamId, _ioDispatcher);
+			ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "0@foo");
+			ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "1@foo");
+			ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "2@foo");
+			NoOtherStreams();
+		}
+
+		[Test]
+		public async Task should_have_three_parked_messages() {
+			_messageParker.BeginLoadStats(() => {
+				Assert.AreEqual(3, _messageParker.ParkedMessageCount);
+				_done.TrySetResult(true);
+			});
+			await _done.Task.WithTimeout();
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class given_parked_messages_and_no_truncate_before_oldest_parked_message_timestamp<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+		private PersistentSubscriptionMessageParker _messageParker;
+		private string _streamId = Guid.NewGuid().ToString();
+		private TaskCompletionSource<bool> _done = new TaskCompletionSource<bool>();
+		private List<EventRecord> _eventRecords = new List<EventRecord>();
+
+		protected override void Given() {
+			base.Given();
+			_messageParker = new PersistentSubscriptionMessageParker(_streamId, _ioDispatcher);
+			_eventRecords.Add(ExistingEventTimeStamp(_messageParker.ParkedStreamId, "$>", LinkMetadata, "0@foo"));
+			_timeProvider.AddToUtcTime(new TimeSpan(0, 0, 1, 2));
+			_eventRecords.Add(ExistingEventTimeStamp(_messageParker.ParkedStreamId, "$>", LinkMetadata, "1@foo"));
+			_eventRecords.Add(ExistingEventTimeStamp(_messageParker.ParkedStreamId, "$>", LinkMetadata, "2@foo"));
+			NoOtherStreams();
+		}
+
+		[Test]
+		public async Task should_have_the_first_parked_message_timestamp_as_oldest_parked_message_timestamp() {
+			_messageParker.BeginLoadStats(() => {
+				Assert.AreEqual(_eventRecords[0].TimeStamp, _messageParker.GetOldestParkedMessage);
+				_done.TrySetResult(true);
+			});
+			await _done.Task.WithTimeout();
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class given_parked_messages_and_half_are_truncated<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+		private TaskCompletionSource<bool> _done = new TaskCompletionSource<bool>();
+		private PersistentSubscriptionMessageParker _messageParker;
+		private string _streamId = Guid.NewGuid().ToString();
+
+		protected override void Given() {
+			base.Given();
+			_messageParker = new PersistentSubscriptionMessageParker(_streamId, _ioDispatcher);
+			ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "5@foo");
+			ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "6@foo");
+			ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "7@foo");
+			ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "8@foo");
+			ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "9@foo");
+		}
+
+		[Test]
+		public async Task should_have_five_parked_messages() {
+			_messageParker.BeginLoadStats(() => {
+				Assert.AreEqual(5, _messageParker.ParkedMessageCount);
+				_done.TrySetResult(true);
+			});
+			await _done.Task.WithTimeout();
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class given_parked_messages_and_half_are_truncated_oldest_parked_message_timestamp<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+		private TaskCompletionSource<bool> _done = new TaskCompletionSource<bool>();
+		private PersistentSubscriptionMessageParker _messageParker;
+		private string _streamId = Guid.NewGuid().ToString();
+		private List<EventRecord> _eventRecords = new List<EventRecord>();
+
+		protected override void Given() {
+			base.Given();
+			_messageParker = new PersistentSubscriptionMessageParker(_streamId, _ioDispatcher);
+			_eventRecords.Add(ExistingEventTimeStamp(_messageParker.ParkedStreamId, "$>", LinkMetadata, "5@foo"));
+			_timeProvider.AddToUtcTime(new TimeSpan(0, 0, 1, 2));
+			_eventRecords.Add(ExistingEventTimeStamp(_messageParker.ParkedStreamId, "$>", LinkMetadata, "6@foo"));
+			_eventRecords.Add(ExistingEventTimeStamp(_messageParker.ParkedStreamId, "$>", LinkMetadata, "7@foo"));
+			_eventRecords.Add(ExistingEventTimeStamp(_messageParker.ParkedStreamId, "$>", LinkMetadata, "8@foo"));
+			_eventRecords.Add(ExistingEventTimeStamp(_messageParker.ParkedStreamId, "$>", LinkMetadata, "9@foo"));
+		}
+
+		[Test]
+		public async Task should_have_the_first_parked_message_timestamp_as_oldest_parked_message_timestamp() {
+			_messageParker.BeginLoadStats(() => {
+				Assert.AreEqual(_eventRecords[0].TimeStamp,
+					_messageParker.GetOldestParkedMessage);
+				_done.TrySetResult(true);
+			});
+			await _done.Task.WithTimeout();
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class given_parked_messages_and_all_are_truncated<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+		private PersistentSubscriptionMessageParker _messageParker;
+		private string _streamId = Guid.NewGuid().ToString();
+		private TaskCompletionSource<bool> _done = new TaskCompletionSource<bool>();
+
+		protected override void Given() {
+			base.Given();
+			_messageParker = new PersistentSubscriptionMessageParker(_streamId, _ioDispatcher);
+			ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "0@foo");
+			ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "1@foo");
+			ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "2@foo");
+			ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "3@foo");
+			ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "4@foo");
+			ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "5@foo");
+			ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "6@foo");
+			ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "7@foo");
+			ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "8@foo");
+			ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "9@foo");
+			DeletedStream(_messageParker.ParkedStreamId);
+		}
+
+		[Test]
+		public async Task should_have_no_parked_messages() {
+			_messageParker.BeginLoadStats(() => {
+				Assert.Zero(_messageParker.ParkedMessageCount);
+				Assert.Null(_messageParker.GetOldestParkedMessage);
+				_done.TrySetResult(true);
+			});
+			await _done.Task.WithTimeout();
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class given_a_message_is_parked<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+		private PersistentSubscriptionMessageParker _messageParker;
+		private string _streamId = Guid.NewGuid().ToString();
+		private TaskCompletionSource<bool> _done = new TaskCompletionSource<bool>();
+
+		protected override void Given() {
+			base.Given();
+			_messageParker = new PersistentSubscriptionMessageParker(_streamId, _ioDispatcher);
+			NoOtherStreams();
+			AllWritesSucceed();
+		}
+
+		[Test]
+		public async Task should_have_one_parked_message() {
+			_messageParker.BeginParkMessage(CreateResolvedEvent(0, 0), "testing", (_, __) => {
+				Assert.AreEqual(1, _messageParker.ParkedMessageCount);
+				Assert.AreEqual(EventTimeStamps[0], _messageParker.GetOldestParkedMessage);
+				_done.TrySetResult(true);
+			});
+			await _done.Task.WithTimeout();
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class given_messages_are_parked_and_then_replayed<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+		private PersistentSubscriptionMessageParker _messageParker;
+		private string _streamId = Guid.NewGuid().ToString();
+		private TaskCompletionSource<bool> _parked;
+		private TaskCompletionSource<bool> _done = new TaskCompletionSource<bool>();
+
+		protected override void Given() {
+			base.Given();
+
+			AllWritesSucceed();
+
+			_parked = new TaskCompletionSource<bool>();
+			_messageParker = new PersistentSubscriptionMessageParker(_streamId, _ioDispatcher);
+			_messageParker.BeginParkMessage(CreateResolvedEvent(0, 0), "testing", (_, __) => {
+				_messageParker.BeginParkMessage(CreateResolvedEvent(1, 100), "testing", (_, __) => {
+					_parked.SetResult(true);
+				});
+			});
+		}
+
+		[Test]
+		public async Task should_have_no_parked_messages() {
+			await _parked.Task;
+			_messageParker.BeginMarkParkedMessagesReprocessed(2, null, true, () => {
+				Assert.Zero(_messageParker.ParkedMessageCount);
+				Assert.Null(_messageParker.GetOldestParkedMessage);
+				_done.TrySetResult(true);
+			});
+			await _done.Task.WithTimeout();
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class given_message_parked_after_parked_messages_are_replayed<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+		private PersistentSubscriptionMessageParker _messageParker;
+		private string _streamId = Guid.NewGuid().ToString();
+		private TaskCompletionSource<bool> _replayParked;
+		private TaskCompletionSource<bool> _done = new TaskCompletionSource<bool>();
+
+		protected override void Given() {
+			base.Given();
+
+			AllWritesSucceed();
+
+			_replayParked = new TaskCompletionSource<bool>();
+			_messageParker = new PersistentSubscriptionMessageParker(_streamId, _ioDispatcher);
+			_messageParker.BeginParkMessage(CreateResolvedEvent(0, 0), "testing", (_, __) => {
+				_messageParker.BeginParkMessage(CreateResolvedEvent(1, 100), "testing", (_, __) => {
+					_messageParker.BeginMarkParkedMessagesReprocessed(2, null, true, () => {
+						_replayParked.SetResult(true);
+					});
+				});
+			});
+		}
+
+		[Test]
+		public async Task should_have_one_parked_message() {
+			await _replayParked.Task;
+			_timeProvider.AddToUtcTime(new TimeSpan(0, 0, 1, 0));
+			_messageParker.BeginParkMessage(CreateResolvedEvent(2, 200), "testing", (_, __) => {
+				Assert.AreEqual(1, _messageParker.ParkedMessageCount);
+				Assert.AreEqual(EventTimeStamps[2], _messageParker.GetOldestParkedMessage);
+				_done.TrySetResult(true);
+			});
+			await _done.Task.WithTimeout();
+		}
+	}
+
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class given_read_backwards_fails_when_getting_stats<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+		private PersistentSubscriptionMessageParker _messageParker;
+		private string _streamId = Guid.NewGuid().ToString();
+		private TaskCompletionSource<bool> _done = new TaskCompletionSource<bool>();
+
+		private TaskCompletionSource<bool> _timerMessageReceived = new TaskCompletionSource<bool>();
+		private IODispatcherDelayedMessage _timerMessage;
+
+		protected override void Given() {
+			base.Given();
+
+			AllReadsTimeOut();
+
+			_messageParker = new PersistentSubscriptionMessageParker(_streamId, _ioDispatcher);
+
+			_bus.Subscribe(new AdHocHandler<TimerMessage.Schedule>(
+				msg => {
+					_timerMessage = msg.ReplyMessage as IODispatcherDelayedMessage;
+					_timerMessageReceived.TrySetResult(true);
+				}));
+		}
+
+		[Test]
+		public async Task should_not_hang() {
+			_messageParker.BeginLoadStats(() => {
+				Assert.Zero(_messageParker.ParkedMessageCount);
+				_done.TrySetResult(true);
+			});
+
+			await _timerMessageReceived.Task.WithTimeout();
+			_ioDispatcher.Handle(_timerMessage);
+
+			await _done.Task.WithTimeout();
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class given_read_forwards_fails_when_getting_stats<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+		private PersistentSubscriptionMessageParker _messageParker;
+		private string _streamId = Guid.NewGuid().ToString();
+		private TaskCompletionSource<bool> _done = new TaskCompletionSource<bool>();
+
+		private TaskCompletionSource<bool> _timerMessagesReceived = new TaskCompletionSource<bool>();
+		private TaskCompletionSource<bool> _readForwardReceived = new TaskCompletionSource<bool>();
+		private List<IODispatcherDelayedMessage> _timerMessages = new List<IODispatcherDelayedMessage>();
+		private Guid _readForwardCorrelationId;
+
+		protected override void Given() {
+			base.Given();
+
+			_messageParker = new PersistentSubscriptionMessageParker(_streamId, _ioDispatcher);
+			ExistingEvent(_messageParker.ParkedStreamId, "$>", LinkMetadata, "0@foo");
+
+			// Disable the forward reader so it times out
+			_bus.Unsubscribe(_ioDispatcher.ForwardReader);
+			_bus.Subscribe(new AdHocHandler<ClientMessage.ReadStreamEventsForward>(msg => {
+				_readForwardCorrelationId = msg.CorrelationId;
+				_readForwardReceived.TrySetResult(true);
+			}));
+			_bus.Subscribe(new AdHocHandler<TimerMessage.Schedule>(
+				msg => {
+					_timerMessages.Add(msg.ReplyMessage as IODispatcherDelayedMessage);
+					if (_timerMessages.Count == 2)
+						_timerMessagesReceived.TrySetResult(true);
+				}));
+		}
+
+		[Test]
+		public async Task should_not_hang() {
+			_messageParker.BeginLoadStats(() => {
+				Assert.AreEqual(1, _messageParker.ParkedMessageCount);
+				_done.TrySetResult(true);
+			});
+
+			await _readForwardReceived.Task.WithTimeout();
+			await _timerMessagesReceived.Task.WithTimeout();
+
+			_ioDispatcher.Handle(_timerMessages.FirstOrDefault(x => x.MessageCorrelationId == _readForwardCorrelationId));
+
+			await _done.Task.WithTimeout();
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionTests.cs b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionTests.cs
new file mode 100644
index 00000000000..c7eaeb40976
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/PersistentSubscriptionTests.cs
@@ -0,0 +1,2652 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Common;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.PersistentSubscription;
+using KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.ClientAPI;
+using KurrentDB.Core.Tests.Services.Replication;
+using KurrentDB.Core.Tests.TransactionLog;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using EventFilter = KurrentDB.Core.Services.Storage.ReaderIndex.EventFilter;
+using ExpectedVersion = KurrentDB.Core.Data.ExpectedVersion;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+using StreamMetadata = KurrentDB.Core.Data.StreamMetadata;
+
+namespace KurrentDB.Core.Tests.Services.PersistentSubscription;
+
+public enum EventSource {
+	SingleStream,
+	AllStream,
+	FilteredAllStream
+}
+
+[TestFixture(EventSource.SingleStream)]
+[TestFixture(EventSource.AllStream)]
+[TestFixture(EventSource.FilteredAllStream)]
+public class when_creating_persistent_subscription {
+	private KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription _sub;
+	private readonly EventSource _eventSource;
+	private readonly string _streamName;
+
+	public when_creating_persistent_subscription(EventSource eventSource) {
+		_eventSource = eventSource;
+		_streamName = _eventSource switch {
+			EventSource.AllStream => "$all",
+			EventSource.FilteredAllStream => "$all",
+			EventSource.SingleStream => "streamName",
+			_ => throw new InvalidOperationException()
+		};
+	}
+
+	[OneTimeSetUp]
+	public void Setup() {
+		_sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+					.WithEventLoader(new FakeStreamReader())
+					.WithCheckpointReader(new FakeCheckpointReader())
+					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+					.WithMessageParker(new FakeMessageParker()));
+	}
+
+	[Test]
+	public void subscription_id_is_set() {
+		Assert.AreEqual(_streamName + ":groupName", _sub.SubscriptionId);
+	}
+
+	[Test]
+	public void stream_name_is_set() {
+		Assert.AreEqual(_streamName, _sub.EventSource.ToString());
+	}
+
+	[Test]
+	public void group_name_is_set() {
+		Assert.AreEqual("groupName", _sub.GroupName);
+	}
+
+	[Test]
+	public void there_are_no_clients() {
+		Assert.IsFalse(_sub.HasClients);
+		Assert.AreEqual(0, _sub.ClientCount);
+	}
+
+	[Test]
+	public void null_checkpoint_reader_throws_argument_null() {
+		Assert.Throws<ArgumentNullException>(() => {
+			_sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+					.WithEventLoader(new FakeStreamReader())
+					.WithCheckpointReader(null)
+					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+					.WithMessageParker(new FakeMessageParker()));
+		});
+	}
+
+	[Test]
+	public void null_checkpoint_writer_throws_argument_null() {
+		Assert.Throws<ArgumentNullException>(() => {
+			_sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+					.WithEventLoader(new FakeStreamReader())
+					.WithCheckpointReader(new FakeCheckpointReader())
+					.WithCheckpointWriter(null)
+					.WithMessageParker(new FakeMessageParker()));
+		});
+	}
+
+
+	[Test]
+	public void null_event_reader_throws_argument_null() {
+		Assert.Throws<ArgumentNullException>(() => {
+			_sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+				Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+					.WithEventLoader(null)
+					.WithCheckpointReader(new FakeCheckpointReader())
+					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+					.WithMessageParker(new FakeMessageParker()));
+		});
+	}
+
+	[Test]
+	public void null_stream_throws_argument_null() {
+		if (_eventSource != EventSource.SingleStream) {
+			return;
+		}
+
+		Assert.Throws<ArgumentNullException>(() => {
+			_sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+				PersistentSubscriptionToStreamParamsBuilder.CreateFor(null, "groupName")
+					.WithEventLoader(new FakeStreamReader())
+					.WithCheckpointReader(new FakeCheckpointReader())
+					.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+					.WithMessageParker(new FakeMessageParker()));
+		});
+	}
+
+	[Test]
+	public void null_groupname_throws_argument_null() {
+		switch (_eventSource) {
+			case EventSource.SingleStream:
+				Assert.Throws<ArgumentNullException>(() => {
+					_sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+						PersistentSubscriptionToStreamParamsBuilder.CreateFor("streamName", null)
+							.WithEventLoader(new FakeStreamReader())
+							.WithCheckpointReader(new FakeCheckpointReader())
+							.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+							.WithMessageParker(new FakeMessageParker()));
+				});
+				break;
+			case EventSource.AllStream:
+				Assert.Throws<ArgumentNullException>(() => {
+					_sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+						PersistentSubscriptionToAllParamsBuilder.CreateFor(null)
+							.WithEventLoader(new FakeStreamReader())
+							.WithCheckpointReader(new FakeCheckpointReader())
+							.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+							.WithMessageParker(new FakeMessageParker()));
+				});
+				break;
+		}
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_updating_all_stream_subscription_with_filter<TLogFormat, TStreamId> {
+
+	private readonly PersistentSubscriptionService<TStreamId> _sut;
+	private readonly FakeStorage _storage;
+	private ClientMessage.CreatePersistentSubscriptionToAll _create;
+	private IEventFilter _filterWhenCreate = EventFilter.EventType.Prefixes(isAllStream: true, new[] { "prefixFilter" });
+
+	public when_updating_all_stream_subscription_with_filter() {
+		var bus = new SynchronousScheduler();
+		var ioDispatcher = new IODispatcher(bus, bus);
+		var trackers = new Trackers();
+
+		_storage = new FakeStorage(cfgs => cfgs.Count() >= 2);
+
+		bus.Subscribe<ClientMessage.ReadStreamEventsBackward>(_storage);
+		bus.Subscribe<ClientMessage.WriteEvents>(_storage);
+		bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(ioDispatcher.BackwardReader);
+		bus.Subscribe<ClientMessage.WriteEventsCompleted>(ioDispatcher.Writer);
+
+		_sut = new PersistentSubscriptionService<TStreamId>(
+			new QueuedHandlerThreadPool(bus, "test", new QueueStatsManager(), new QueueTrackers()),
+			new FakeReadIndex<TLogFormat, TStreamId>(_ => false, new MetaStreamLookup()),
+			ioDispatcher, bus,
+			new PersistentSubscriptionConsumerStrategyRegistry(bus, bus,
+				Array.Empty<IPersistentSubscriptionConsumerStrategyFactory>()), trackers.PersistentSubscriptionTracker);
+
+		_sut.Start();
+		_sut.Handle(new SystemMessage.BecomeLeader(correlationId: Guid.NewGuid()));
+		_sut.Handle(CreateMessage());
+	}
+
+	[Test]
+	public async Task should_not_overwrite_filter() {
+
+		_sut.Handle(UpdateMessage(_create.GroupName, new NoopEnvelope()));
+
+		await _storage.FinishedWriting.Task;
+
+		var filterWhenCreateDto = EventFilter.ParseToDto(_filterWhenCreate);
+		var allFiltersSet = _storage.Configurtations.All(
+			cfg => cfg.Entries.All(
+				e => (e.Filter is not null
+					&& e.Filter.Data.Equals(filterWhenCreateDto.Data)
+					&& e.Filter.IsAllStream)));
+
+		Assert.True(allFiltersSet, "Expected all filters to be set!");
+	}
+
+	[Test]
+	public async Task non_existent_replies_DoesNotExist() {
+		var envelope = new TcsEnvelope<ClientMessage.UpdatePersistentSubscriptionToAllCompleted>();
+		_sut.Handle(UpdateMessage("nonexistent", envelope));
+
+		var response = await envelope.Task;
+
+		Assert.AreEqual(
+			ClientMessage.UpdatePersistentSubscriptionToAllCompleted.UpdatePersistentSubscriptionToAllResult.DoesNotExist,
+			response.Result);
+
+		Assert.AreEqual("Group 'nonexistent' does not exist.", response.Reason);
+	}
+
+	private ClientMessage.CreatePersistentSubscriptionToAll CreateMessage() {
+		_create = new ClientMessage.CreatePersistentSubscriptionToAll(
+			internalCorrId: Guid.NewGuid(),
+			correlationId: Guid.NewGuid(),
+			envelope: new NoopEnvelope(),
+			groupName: "someGroup",
+			eventFilter: _filterWhenCreate,
+			resolveLinkTos: false,
+			startFrom: new(0, 0),
+			messageTimeoutMilliseconds: -1, false,
+			maxRetryCount: 0,
+			bufferSize: 10,
+			liveBufferSize: 0,
+			readbatchSize: 5,
+			checkPointAfterMilliseconds: 0,
+			minCheckPointCount: 0,
+			maxCheckPointCount: 0,
+			maxSubscriberCount: 0,
+			namedConsumerStrategy: "Pinned",
+			user: ClaimsPrincipal.Current);
+
+		return _create;
+	}
+
+	private ClientMessage.UpdatePersistentSubscriptionToAll UpdateMessage(string name, IEnvelope envelope) => new(
+		internalCorrId: Guid.NewGuid(),
+		correlationId: Guid.NewGuid(),
+		envelope: envelope,
+		groupName: name,
+		resolveLinkTos: _create.ResolveLinkTos,
+		startFrom: _create.StartFrom,
+		messageTimeoutMilliseconds: _create.MessageTimeoutMilliseconds,
+		recordStatistics: _create.RecordStatistics,
+		maxRetryCount: _create.MaxRetryCount,
+		bufferSize: _create.BufferSize,
+		liveBufferSize: _create.LiveBufferSize,
+		readbatchSize: _create.ReadBatchSize,
+		checkPointAfterMilliseconds: _create.CheckPointAfterMilliseconds,
+		minCheckPointCount: _create.MinCheckPointCount,
+		maxCheckPointCount: _create.MaxCheckPointCount,
+		maxSubscriberCount: _create.MaxSubscriberCount,
+		namedConsumerStrategy: _create.NamedConsumerStrategy,
+		user: ClaimsPrincipal.Current);
+
+	private class FakeStorage :
+		IHandle<ClientMessage.ReadStreamEventsBackward>,
+		IHandle<ClientMessage.WriteEvents> {
+		private readonly Func<IEnumerable<PersistentSubscriptionConfig>, bool> _isDoneWriting;
+		private readonly List<PersistentSubscriptionConfig> _configurations = new();
+		private readonly Dictionary<string, List<Event>> _streams = new();
+		private readonly TaskCompletionSource _tcs = new();
+
+		public IEnumerable<PersistentSubscriptionConfig> Configurtations => _configurations;
+		public TaskCompletionSource FinishedWriting => _tcs;
+
+		public FakeStorage(Func<IEnumerable<PersistentSubscriptionConfig>, bool> isDoneWriting) {
+			_isDoneWriting = isDoneWriting;
+		}
+
+		public void Handle(ClientMessage.ReadStreamEventsBackward msg) {
+			ReadStreamResult result = ReadStreamResult.NoStream;
+			List<ResolvedEvent> resolvedEvents = new();
+
+			if (_streams.TryGetValue(msg.EventStreamId, out var events)) {
+				result = ReadStreamResult.Success;
+
+				foreach (var ev in events) {
+					var prepareLogRecord = new PrepareLogRecord(
+						// values of most fields are not used and not important for the test
+						logPosition: 0,
+						correlationId: Guid.NewGuid(),
+						eventId: Guid.NewGuid(),
+						transactionPosition: 0,
+						transactionOffset: 0,
+						eventStreamId: msg.EventStreamId,
+						eventStreamIdSize: null,
+						expectedVersion: 0,
+						timeStamp: DateTime.UtcNow,
+						PrepareFlags.Data,
+						eventType: ev.EventType,
+						eventTypeSize: null,
+						data: Array.Empty<byte>(),
+						metadata: Array.Empty<byte>());
+
+					var evRec = new EventRecord(0, prepareLogRecord, msg.EventStreamId, ev.EventType);
+					resolvedEvents.Add(ResolvedEvent.ForUnresolvedEvent(evRec));
+				}
+			}
+
+			msg.Envelope.ReplyWith(new ClientMessage.ReadStreamEventsBackwardCompleted(
+				// values of most fields are not used and not important for the test
+				correlationId: msg.CorrelationId,
+				eventStreamId: msg.EventStreamId,
+				fromEventNumber: 0,
+				maxCount: msg.MaxCount,
+				result: result,
+				events: resolvedEvents.ToArray(),
+				streamMetadata: new StreamMetadata(),
+				isCachePublic: false,
+				error: null,
+				nextEventNumber: -1,
+				lastEventNumber: 0,
+				isEndOfStream: true,
+				tfLastCommitPosition: 0));
+		}
+
+		public void Handle(ClientMessage.WriteEvents msg) {
+			if (!_streams.TryGetValue(msg.EventStreamId, out var events)) {
+				events = new List<Event>();
+				_streams.Add(msg.EventStreamId, events);
+			}
+
+			events.AddRange(msg.Events);
+
+			if (msg.Events.Any(ee => ee.EventType == "$PersistentConfig")) {
+				var cfg = PersistentSubscriptionConfig.FromSerializedForm(msg.Events[0].Data);
+				_configurations.Add(cfg);
+
+				if (_isDoneWriting(_configurations)) {
+					_tcs.SetResult();
+				}
+			}
+
+			msg.Envelope.ReplyWith(new ClientMessage.WriteEventsCompleted(
+				// values are not used and not important for the test
+				msg.CorrelationId,
+				firstEventNumber: 0,
+				lastEventNumber: 0,
+				preparePosition: 0,
+				commitPosition: 0));
+		}
+	}
+
+	private class MetaStreamLookup : IMetastreamLookup<TStreamId> {
+		public bool IsMetaStream(TStreamId streamId) => throw new NotSupportedException();
+
+		public TStreamId MetaStreamOf(TStreamId streamId) => throw new NotSupportedException();
+
+		public TStreamId OriginalStreamOf(TStreamId streamId) => throw new NotSupportedException();
+	}
+}
+
+
+[TestFixture(EventSource.SingleStream)]
+[TestFixture(EventSource.AllStream)]
+[TestFixture(EventSource.FilteredAllStream)]
+public class LiveTests {
+	private readonly EventSource _eventSource;
+
+	public LiveTests(EventSource eventSource) {
+		_eventSource = eventSource;
+	}
+
+	[Test]
+	public void live_subscription_pushes_events_to_client() {
+		var envelope = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromCurrent());
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope, 10, "foo", "bar");
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource));
+		Assert.AreEqual(1, envelope.Replies.Count);
+	}
+
+	[Test]
+	public void live_subscription_with_round_robin_two_pushes_events_to_both() {
+		var envelope1 = new FakeEnvelope();
+		var envelope2 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.PreferRoundRobin()
+				.StartFromCurrent());
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope2, 10, "foo", "bar");
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(1, _eventSource));
+		Assert.AreEqual(1, envelope1.Replies.Count);
+		Assert.AreEqual(1, envelope2.Replies.Count);
+	}
+
+	[Test]
+	public void live_subscription_with_prefer_one_and_two_pushes_events_to_both() {
+		var envelope1 = new FakeEnvelope();
+		var envelope2 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.PreferDispatchToSingle()
+				.StartFromCurrent());
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope2, 10, "foo", "bar");
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(1, _eventSource));
+		Assert.AreEqual(2, envelope1.Replies.Count);
+	}
+
+
+	[Test]
+	public void subscription_with_pull_sends_data_to_client() {
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromBeginning());
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.HandleReadCompleted(new[] { Helper.GetFakeEventFor(0, _eventSource) }, Helper.GetStreamPositionFor(1, _eventSource), false);
+		Assert.AreEqual(1, envelope1.Replies.Count);
+	}
+
+	[Test]
+	public void subscription_with_pull_does_not_crash_if_not_ready_yet() {
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromBeginning());
+		Assert.DoesNotThrow(() => {
+			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+			sub.HandleReadCompleted(new[] { Helper.GetFakeEventFor(0, _eventSource) }, Helper.GetStreamPositionFor(1, _eventSource),
+				false);
+		});
+	}
+
+	[Test]
+	public void subscription_with_live_data_does_not_crash_if_not_ready_yet() {
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromBeginning());
+		Assert.DoesNotThrow(() => {
+			sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+			sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource));
+		});
+	}
+
+
+	[Test]
+	public void subscription_with_pull_and_round_robin_set_and_two_clients_sends_data_to_client() {
+		var envelope1 = new FakeEnvelope();
+		var envelope2 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.PreferRoundRobin()
+				.StartFromBeginning());
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope2, 10, "foo", "bar");
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource)
+		}, Helper.GetStreamPositionFor(2, _eventSource), false);
+		Assert.AreEqual(1, envelope1.Replies.Count);
+		Assert.AreEqual(1, envelope2.Replies.Count);
+	}
+
+
+	[Test]
+	public void subscription_with_pull_and_prefer_one_set_and_two_clients_sends_data_to_one_client() {
+		var envelope1 = new FakeEnvelope();
+		var envelope2 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.PreferDispatchToSingle()
+				.StartFromBeginning());
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope2, 10, "foo", "bar");
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource)
+		}, Helper.GetStreamPositionFor(2, _eventSource), false);
+		Assert.AreEqual(2, envelope1.Replies.Count);
+	}
+
+	[Test]
+	public async Task
+		when_reading_end_of_stream_and_a_live_event_is_received_subscription_should_read_stream_again() {
+		var eventsFoundSource = new TaskCompletionSource<bool>();
+		var envelope = new FakeEnvelope();
+		var checkpointReader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader(
+					(stream, startEventNumber, countToLoad, batchSize, maxWindowSize, resolveLinkTos, skipFirstEvent, onEventsFound) => {
+						List<ResolvedEvent> events = new List<ResolvedEvent>();
+						int nextPosition;
+						bool isEndOfStream;
+
+						if (startEventNumber.Equals(Helper.GetStreamPositionFor(0, _eventSource))) {
+							//Existing events: #0, #1, #2
+							if (!skipFirstEvent) {
+								events.Add(Helper.GetFakeEventFor(0, _eventSource));
+							}
+							events.Add(Helper.GetFakeEventFor(1, _eventSource));
+							events.Add(Helper.GetFakeEventFor(2, _eventSource));
+							nextPosition = 3;
+							isEndOfStream = true;
+						} else if (startEventNumber.Equals(Helper.GetStreamPositionFor(3, _eventSource))) {
+							//New live event: #3
+							events.Add(Helper.GetFakeEventFor(3, _eventSource));
+							nextPosition = 4;
+							isEndOfStream = true;
+						} else {
+							throw new Exception("Invalid start event number: " + startEventNumber);
+						}
+
+						Task.Delay(100).ContinueWith(action => {
+							onEventsFound(events.ToArray(), Helper.GetStreamPositionFor(nextPosition, _eventSource), isEndOfStream);
+							if (startEventNumber.Equals(Helper.GetStreamPositionFor(3, _eventSource))) {
+								eventsFoundSource.TrySetResult(true);
+							}
+						});
+					}))
+				.WithCheckpointReader(checkpointReader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromBeginning());
+
+		//load the existing checkpoint at event #0
+		//this should trigger reading of events #0, #1 and #2 reaching the end of stream.
+		//the read is handled by the subscription after 100ms
+		checkpointReader.Load(Helper.GetStreamPositionFor(0, _eventSource).ToString());
+
+		//Meanwhile, during this 100ms time window, a new live event #3 comes in and subscription is notified
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(3, _eventSource));
+
+		await eventsFoundSource.Task;
+
+		//the read handled by the subscription after 100ms should trigger a second read to obtain the event #3 (which will be handled after 100ms more)
+
+		//a subscriber coming in a while later, should receive all 3 events
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope, 10, "foo", "bar");
+
+		//all 3 events should be received by the subscriber (except event 0 - the checkpoint which is skipped)
+		Assert.AreEqual(3, envelope.Replies.Count);
+	}
+}
+
+public class FilteredAllTests {
+	private EventSource _eventSource = EventSource.FilteredAllStream;
+	[Test]
+	public void live_subscription_with_stream_prefix_filter_pushes_matching_events_to_client() {
+		var envelope = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var streamFilter = EventFilter.StreamName.Prefixes(true, "test");
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", streamFilter)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromCurrent());
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope, 10, "foo", "bar");
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource, streamPrefix: "test"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(1, _eventSource, streamPrefix: "something"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(2, _eventSource, streamPrefix: "test"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(3, _eventSource, streamPrefix: "foo"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(4, _eventSource, streamPrefix: "bar"));
+		Assert.AreEqual(2, envelope.Replies.Count);
+	}
+
+	[Test]
+	public void live_subscription_with_stream_regex_filter_pushes_matching_events_to_client() {
+		var envelope = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var streamFilter = EventFilter.StreamName.Regex(true, "^te");
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", streamFilter)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromCurrent());
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope, 10, "foo", "bar");
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource, streamPrefix: "test"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(1, _eventSource, streamPrefix: "ttest"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(2, _eventSource, streamPrefix: "team"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(3, _eventSource, streamPrefix: "tteam"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(4, _eventSource, streamPrefix: "bar"));
+		Assert.AreEqual(2, envelope.Replies.Count);
+	}
+
+	[Test]
+	public void live_subscription_with_event_type_prefix_filter_pushes_matching_events_to_client() {
+		var envelope = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var eventFilter = EventFilter.EventType.Prefixes(true, "test");
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", eventFilter)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromCurrent());
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope, 10, "foo", "bar");
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource, eventType: "test"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(1, _eventSource, eventType: "something"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(2, _eventSource, eventType: "test"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(3, _eventSource, eventType: "foo"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(4, _eventSource, eventType: "bar"));
+		Assert.AreEqual(2, envelope.Replies.Count);
+	}
+
+	[Test]
+	public void live_subscription_with_event_type_regex_filter_pushes_matching_events_to_client() {
+		var envelope = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var eventFilter = EventFilter.EventType.Regex(true, "^te");
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", eventFilter)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromCurrent());
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope, 10, "foo", "bar");
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource, eventType: "test"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(1, _eventSource, eventType: "ttest"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(2, _eventSource, eventType: "team"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(3, _eventSource, eventType: "tteam"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(4, _eventSource, eventType: "bar"));
+		Assert.AreEqual(2, envelope.Replies.Count);
+	}
+
+	[Test]
+	public void catching_up_subscription_does_write_checkpoint_on_time_when_min_events_have_been_skipped() {
+		IPersistentSubscriptionStreamPosition cp = null;
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var eventFilter = EventFilter.StreamName.Prefixes(true, "stream");
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", eventFilter)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
+				.PreferDispatchToSingle()
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromBeginning()
+				.MinimumToCheckPoint(1)
+				.MaximumToCheckPoint(5));
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
+
+		sub.HandleSkippedEvents(Helper.GetStreamPositionFor(1, _eventSource), 2);
+		sub.NotifyClockTick(DateTime.UtcNow);
+		Assert.AreEqual(Helper.GetStreamPositionFor(1, _eventSource), cp);
+	}
+
+	[Test]
+	public void catching_up_subscription_does_write_checkpoint_when_max_events_have_been_skipped() {
+		IPersistentSubscriptionStreamPosition cp = null;
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var eventFilter = EventFilter.StreamName.Prefixes(true, "stream");
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", eventFilter)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
+				.PreferDispatchToSingle()
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromBeginning()
+				.MinimumToCheckPoint(1)
+				.MaximumToCheckPoint(5));
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
+
+		sub.HandleSkippedEvents(Helper.GetStreamPositionFor(1, _eventSource), 6);
+
+		Assert.AreEqual(Helper.GetStreamPositionFor(1, _eventSource), cp);
+	}
+
+	[Test]
+	public void catching_up_subscription_does_write_checkpoint_when_max_events_seen_and_some_skipped() {
+		IPersistentSubscriptionStreamPosition cp = null;
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var eventFilter = EventFilter.StreamName.Prefixes(true, "stream");
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", eventFilter)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
+				.PreferDispatchToSingle()
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromBeginning()
+				.MinimumToCheckPoint(1)
+				.MaximumToCheckPoint(5));
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
+
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource)
+		}, Helper.GetStreamPositionFor(2, _eventSource), false);
+		sub.AcknowledgeMessagesProcessed(corrid, new[] {
+			Helper.GetEventIdFor(0),
+			Helper.GetEventIdFor(1),
+		});
+
+		sub.HandleSkippedEvents(Helper.GetStreamPositionFor(2, _eventSource), 3);
+		Assert.AreEqual(Helper.GetStreamPositionFor(2, _eventSource), cp);
+	}
+
+	[Test]
+	public void catching_up_subscription_does_not_write_checkpoint_when_max_events_skipped_and_some_messages_outstanding() {
+		IPersistentSubscriptionStreamPosition cp = null;
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var eventFilter = EventFilter.StreamName.Prefixes(true, "stream");
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", eventFilter)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
+				.PreferDispatchToSingle()
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromBeginning()
+				.MinimumToCheckPoint(1)
+				.MaximumToCheckPoint(5));
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
+
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource)
+		}, Helper.GetStreamPositionFor(2, _eventSource), false);
+
+		sub.HandleSkippedEvents(Helper.GetStreamPositionFor(2, _eventSource), 5);
+		Assert.IsNull(cp);
+	}
+
+	[Test]
+	public void live_subscription_does_write_checkpoint_when_max_events_skipped() {
+		IPersistentSubscriptionStreamPosition cp = null;
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var eventFilter = EventFilter.StreamName.Prefixes(true, "foo");
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", eventFilter)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
+				.PreferDispatchToSingle()
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromBeginning()
+				.MinimumToCheckPoint(1)
+				.MaximumToCheckPoint(5));
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
+
+		sub.HandleReadCompleted(Array.Empty<ResolvedEvent>(), new PersistentSubscriptionAllStreamPosition(0, 0), true);
+
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource, streamPrefix: "test"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(1, _eventSource, streamPrefix: "test"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(2, _eventSource, streamPrefix: "test"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(3, _eventSource, streamPrefix: "test"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(4, _eventSource, streamPrefix: "test"));
+		Assert.AreEqual(Helper.GetStreamPositionFor(4, _eventSource), cp);
+	}
+
+	[Test]
+	public void live_subscription_does_write_checkpoint_on_time_when_min_events_skipped() {
+		IPersistentSubscriptionStreamPosition cp = null;
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var eventFilter = EventFilter.StreamName.Prefixes(true, "foo");
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", eventFilter)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
+				.PreferDispatchToSingle()
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromBeginning()
+				.MinimumToCheckPoint(1)
+				.MaximumToCheckPoint(5));
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
+
+		sub.HandleReadCompleted(Array.Empty<ResolvedEvent>(), new PersistentSubscriptionAllStreamPosition(0, 0), true);
+
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource, streamPrefix: "test"));
+
+		sub.NotifyClockTick(DateTime.UtcNow);
+		Assert.AreEqual(Helper.GetStreamPositionFor(0, _eventSource), cp);
+	}
+
+	[Test]
+	public void live_subscription_does_write_checkpoint_when_max_events_seen_and_some_skipped() {
+		IPersistentSubscriptionStreamPosition cp = null;
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var eventFilter = EventFilter.StreamName.Prefixes(true, "foo");
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", eventFilter)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
+				.PreferDispatchToSingle()
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromBeginning()
+				.MinimumToCheckPoint(1)
+				.MaximumToCheckPoint(5));
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
+
+		sub.HandleReadCompleted(Array.Empty<ResolvedEvent>(), new PersistentSubscriptionAllStreamPosition(0, 0), true);
+
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource, streamPrefix: "foo"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(1, _eventSource, streamPrefix: "foo"));
+		sub.AcknowledgeMessagesProcessed(corrid, new[] {
+			Helper.GetEventIdFor(0),
+			Helper.GetEventIdFor(1),
+		});
+
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(2, _eventSource, streamPrefix: "test"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(3, _eventSource, streamPrefix: "test"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(4, _eventSource, streamPrefix: "test"));
+		Assert.AreEqual(Helper.GetStreamPositionFor(4, _eventSource), cp);
+	}
+
+	[Test]
+	public void live_subscription_does_not_write_checkpoint_when_max_events_skipped_and_some_messages_outstanding() {
+		IPersistentSubscriptionStreamPosition cp = null;
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var eventFilter = EventFilter.StreamName.Prefixes(true, "foo");
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName", eventFilter)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
+				.PreferDispatchToSingle()
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromBeginning()
+				.MinimumToCheckPoint(1)
+				.MaximumToCheckPoint(5));
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
+
+		sub.HandleReadCompleted(Array.Empty<ResolvedEvent>(), new PersistentSubscriptionAllStreamPosition(0, 0), true);
+
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource, streamPrefix: "foo"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(1, _eventSource, streamPrefix: "foo"));
+
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(2, _eventSource, streamPrefix: "test"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(3, _eventSource, streamPrefix: "test"));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(4, _eventSource, streamPrefix: "test"));
+		Assert.IsNull(cp);
+	}
+}
+
+[TestFixture(EventSource.SingleStream)]
+[TestFixture(EventSource.AllStream)]
+[TestFixture(EventSource.FilteredAllStream)]
+public class DeleteTests {
+	private readonly EventSource _eventSource;
+	public DeleteTests(EventSource eventSource) {
+		_eventSource = eventSource;
+	}
+
+	[Test]
+	public void subscription_deletes_checkpoint_when_deleted() {
+		var reader = new FakeCheckpointReader();
+		var deleted = false;
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }, () => { deleted = true; }))
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromCurrent());
+		reader.Load(null);
+		sub.Delete();
+		Assert.IsTrue(deleted);
+	}
+
+	[Test]
+	public void subscription_deletes_parked_messages_when_deleted() {
+		var reader = new FakeCheckpointReader();
+		var deleted = false;
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker(() => { deleted = true; }))
+				.StartFromCurrent());
+		reader.Load(null);
+		sub.Delete();
+		Assert.IsTrue(deleted);
+	}
+}
+
+[TestFixture(EventSource.SingleStream)]
+[TestFixture(EventSource.AllStream)]
+[TestFixture(EventSource.FilteredAllStream)]
+public class SynchronousReadingClient {
+	private readonly EventSource _eventSource;
+	public SynchronousReadingClient(EventSource eventSource) {
+		_eventSource = eventSource;
+	}
+
+	[Test]
+	public void subscription_with_less_than_n_events_returns_less_events_to_the_client() {
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromBeginning());
+		reader.Load(null);
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource)
+		}, Helper.GetStreamPositionFor(2, _eventSource), false);
+		var result = sub.GetNextNOrLessMessages(5).ToArray();
+		Assert.AreEqual(2, result.Length);
+		Assert.AreEqual(Helper.GetEventIdFor(0), result[0].ResolvedEvent.Event.EventId);
+		Assert.AreEqual(Helper.GetEventIdFor(1), result[1].ResolvedEvent.Event.EventId);
+	}
+
+	[Test]
+	public void subscription_with_n_events_returns_n_events_to_the_client() {
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromBeginning());
+		reader.Load(null);
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource)
+		}, Helper.GetStreamPositionFor(2, _eventSource), false);
+		var result = sub.GetNextNOrLessMessages(2).ToArray();
+		Assert.AreEqual(2, result.Length);
+		Assert.AreEqual(Helper.GetEventIdFor(0), result[0].ResolvedEvent.Event.EventId);
+		Assert.AreEqual(Helper.GetEventIdFor(1), result[1].ResolvedEvent.Event.EventId);
+	}
+
+	[Test]
+	public void subscription_with_more_than_n_events_returns_n_events_to_the_client() {
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromBeginning());
+		reader.Load(null);
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource),
+			Helper.GetFakeEventFor(2, _eventSource),
+			Helper.GetFakeEventFor(3, _eventSource),
+		}, Helper.GetStreamPositionFor(4, _eventSource), false);
+		var result = sub.GetNextNOrLessMessages(2).ToArray();
+		Assert.AreEqual(2, result.Length);
+		Assert.AreEqual(Helper.GetEventIdFor(0), result[0].ResolvedEvent.Event.EventId);
+		Assert.AreEqual(Helper.GetEventIdFor(1), result[1].ResolvedEvent.Event.EventId);
+	}
+
+
+	[Test]
+	public void subscription_with_no_events_returns_no_events_to_the_client() {
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromBeginning());
+		reader.Load(null);
+		var result = sub.GetNextNOrLessMessages(5);
+		Assert.AreEqual(0, result.Count());
+	}
+}
+
+[TestFixture(EventSource.SingleStream)]
+[TestFixture(EventSource.AllStream)]
+[TestFixture(EventSource.FilteredAllStream)]
+public class Checkpointing {
+	private readonly EventSource _eventSource;
+	public Checkpointing(EventSource eventSource) {
+		_eventSource = eventSource;
+	}
+
+	[Test]
+	public void subscription_does_not_write_checkpoint_when_max_not_hit() {
+		IPersistentSubscriptionStreamPosition cp = null;
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
+				.WithMessageParker(new FakeMessageParker())
+				.PreferDispatchToSingle()
+				.StartFromBeginning()
+				.MinimumToCheckPoint(5)
+				.MaximumToCheckPoint(20));
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource)
+		}, Helper.GetStreamPositionFor(2, _eventSource), false);
+		sub.AcknowledgeMessagesProcessed(corrid, new[] { Helper.GetEventIdFor(0) });
+		Assert.IsNull(cp);
+	}
+
+	[Test]
+	public void subscription_does_not_write_checkpoint_when_min_hit() {
+		IPersistentSubscriptionStreamPosition cp = null;
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
+				.WithMessageParker(new FakeMessageParker())
+				.PreferDispatchToSingle()
+				.StartFromBeginning()
+				.MinimumToCheckPoint(1)
+				.MaximumToCheckPoint(20));
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource)
+		}, Helper.GetStreamPositionFor(2, _eventSource), false);
+		sub.AcknowledgeMessagesProcessed(corrid, new[] { Helper.GetEventIdFor(0) });
+		Assert.IsNull(cp);
+	}
+
+	[Test]
+	public void subscription_does_write_checkpoint_when_max_is_hit() {
+		IPersistentSubscriptionStreamPosition cp = null;
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
+				.WithMessageParker(new FakeMessageParker())
+				.PreferDispatchToSingle()
+				.StartFromBeginning()
+				.MaximumToCheckPoint(1));
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource),
+			Helper.GetFakeEventFor(2, _eventSource),
+		}, Helper.GetStreamPositionFor(3, _eventSource), false);
+		sub.AcknowledgeMessagesProcessed(corrid, new[] {
+			Helper.GetEventIdFor(0),
+			Helper.GetEventIdFor(1),
+		});
+		Assert.AreEqual(Helper.GetStreamPositionFor(1, _eventSource), cp);
+	}
+
+	[Test]
+	public void subscription_does_not_include_outstanding_messages_when_max_is_hit() {
+		IPersistentSubscriptionStreamPosition cp = null;
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
+				.WithMessageParker(new FakeMessageParker())
+				.PreferDispatchToSingle()
+				.StartFromBeginning()
+				.MaximumToCheckPoint(1));
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource),
+			Helper.GetFakeEventFor(2, _eventSource),
+			Helper.GetFakeEventFor(3, _eventSource),
+		}, Helper.GetStreamPositionFor(4, _eventSource), false);
+		sub.AcknowledgeMessagesProcessed(corrid, new[] {
+			Helper.GetEventIdFor(0),
+			Helper.GetEventIdFor(1),
+		});
+		Assert.AreEqual(Helper.GetStreamPositionFor(1, _eventSource), cp);
+	}
+
+	[Test]
+	public void subscription_can_write_checkpoint_for_event_number_0() {
+		IPersistentSubscriptionStreamPosition cp = null;
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
+				.WithMessageParker(new FakeMessageParker())
+				.PreferDispatchToSingle()
+				.StartFromBeginning()
+				.MaximumToCheckPoint(1));
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource),
+			Helper.GetFakeEventFor(2, _eventSource),
+			Helper.GetFakeEventFor(3, _eventSource),
+		}, Helper.GetStreamPositionFor(4, _eventSource), false);
+		sub.AcknowledgeMessagesProcessed(corrid, new[] {
+			Helper.GetEventIdFor(0),
+		});
+
+		Assert.AreEqual(Helper.GetStreamPositionFor(0, _eventSource), cp);
+	}
+
+	[Test]
+	public void subscription_checkpoints_when_message_parked_and_max_is_hit() {
+		IPersistentSubscriptionStreamPosition cp = null;
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
+				.WithMessageParker(new FakeMessageParker())
+				.PreferDispatchToSingle()
+				.StartFromBeginning()
+				.MaximumToCheckPoint(1));
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource),
+			Helper.GetFakeEventFor(2, _eventSource),
+			Helper.GetFakeEventFor(3, _eventSource),
+		}, Helper.GetStreamPositionFor(4, _eventSource), false);
+		sub.AcknowledgeMessagesProcessed(corrid, new[] { Helper.GetEventIdFor(0), Helper.GetEventIdFor(2) });
+		sub.NotAcknowledgeMessagesProcessed(corrid, new[] { Helper.GetEventIdFor(1) }, NakAction.Park, "test park");
+		Assert.AreEqual(Helper.GetStreamPositionFor(2, _eventSource), cp);
+	}
+
+	[Test]
+	public void subscription_does_not_include_retry_messages_when_max_is_hit() {
+		IPersistentSubscriptionStreamPosition cp = null;
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
+				.WithMessageParker(new FakeMessageParker())
+				.PreferDispatchToSingle()
+				.StartFromBeginning()
+				.MaximumToCheckPoint(1));
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource),
+			Helper.GetFakeEventFor(2, _eventSource),
+			Helper.GetFakeEventFor(3, _eventSource),
+		}, Helper.GetStreamPositionFor(4, _eventSource), false);
+		sub.NotAcknowledgeMessagesProcessed(corrid, new[] {
+			Helper.GetEventIdFor(2)
+		}, NakAction.Retry, "test retry");
+		sub.AcknowledgeMessagesProcessed(corrid, new[] {
+			Helper.GetEventIdFor(0),
+			Helper.GetEventIdFor(1),
+			Helper.GetEventIdFor(3),
+		});
+		Assert.AreEqual(Helper.GetStreamPositionFor(1, _eventSource), cp);
+	}
+
+	[Test]
+	public void subscription_does_include_all_messages_when_no_retries_or_outstanding_and_max_is_hit() {
+		IPersistentSubscriptionStreamPosition cp = null;
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
+				.WithMessageParker(new FakeMessageParker())
+				.PreferDispatchToSingle()
+				.StartFromBeginning()
+				.MaximumToCheckPoint(1));
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource),
+			Helper.GetFakeEventFor(2, _eventSource)
+		}, Helper.GetStreamPositionFor(3, _eventSource), false);
+		sub.AcknowledgeMessagesProcessed(corrid, new[] {
+			Helper.GetEventIdFor(0),
+			Helper.GetEventIdFor(1),
+			Helper.GetEventIdFor(2)
+		});
+		Assert.AreEqual(Helper.GetStreamPositionFor(2, _eventSource), cp);
+	}
+
+	[Test]
+	public void subscription_does_write_checkpoint_on_time_when_min_is_hit() {
+		IPersistentSubscriptionStreamPosition cp = null;
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
+				.PreferDispatchToSingle()
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromBeginning()
+				.MinimumToCheckPoint(1)
+				.MaximumToCheckPoint(5));
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource),
+			Helper.GetFakeEventFor(2, _eventSource)
+		}, Helper.GetStreamPositionFor(3, _eventSource), false);
+		sub.AcknowledgeMessagesProcessed(corrid, new[] {
+			Helper.GetEventIdFor(0),
+			Helper.GetEventIdFor(1),
+		});
+		sub.NotifyClockTick(DateTime.UtcNow);
+		Assert.AreEqual(Helper.GetStreamPositionFor(1, _eventSource), cp);
+	}
+
+	[Test]
+	public void subscription_does_not_write_checkpoint_on_time_when_min_is_not_hit() {
+		IPersistentSubscriptionStreamPosition cp = null;
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
+				.WithMessageParker(new FakeMessageParker())
+				.PreferDispatchToSingle()
+				.StartFromBeginning()
+				.MinimumToCheckPoint(2)
+				.MaximumToCheckPoint(5));
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 10, "foo", "bar");
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource),
+			Helper.GetFakeEventFor(2, _eventSource)
+		}, Helper.GetStreamPositionFor(3, _eventSource), false);
+		sub.AcknowledgeMessagesProcessed(corrid, new[] {
+			Helper.GetEventIdFor(0),
+			Helper.GetEventIdFor(1),
+		});
+		sub.NotifyClockTick(DateTime.UtcNow);
+		Assert.AreEqual(Helper.GetStreamPositionFor(1, _eventSource), cp);
+	}
+
+	[Test]
+	public void subscription_does_write_checkpoint_for_disconnected_clients_on_time_when_min_is_hit() {
+		IPersistentSubscriptionStreamPosition cp = null;
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromBeginning()
+				.MinimumToCheckPoint(1)
+				.MaximumToCheckPoint(5));
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource),
+		}, Helper.GetStreamPositionFor(2, _eventSource), false);
+		sub.GetNextNOrLessMessages(2).ToArray();
+		sub.AcknowledgeMessagesProcessed(corrid, new[] {
+			Helper.GetEventIdFor(0),
+			Helper.GetEventIdFor(1),
+		});
+		sub.NotifyClockTick(DateTime.UtcNow);
+		Assert.AreEqual(Helper.GetStreamPositionFor(1, _eventSource), cp);
+	}
+
+	[Test]
+	public void
+		subscription_writes_correct_checkpoint_when_outstanding_messages_is_empty_and_retry_buffer_is_non_empty() {
+		IPersistentSubscriptionStreamPosition cp = null;
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromBeginning()
+				.MinimumToCheckPoint(1)
+				.MaximumToCheckPoint(1));
+		reader.Load(null);
+
+		var clientConnectionId = Guid.NewGuid();
+		var clientCorrelationId = Guid.NewGuid();
+		sub.AddClient(clientCorrelationId, clientConnectionId, "connection-1", new FakeEnvelope(), 10, "foo", "bar");
+
+		//send events 1-3, ACK event 1 only and Mark checkpoint
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(1, _eventSource),
+			Helper.GetFakeEventFor(2, _eventSource),
+			Helper.GetFakeEventFor(3, _eventSource),
+		}, Helper.GetStreamPositionFor(4, _eventSource), false);
+		sub.GetNextNOrLessMessages(3).ToArray();
+		sub.AcknowledgeMessagesProcessed(clientCorrelationId, new[] {
+			Helper.GetEventIdFor(1)
+		});
+		sub.TryMarkCheckpoint(false);
+
+		//checkpoint should be at event 1
+		Assert.AreEqual(Helper.GetStreamPositionFor(1, _eventSource), cp);
+
+		//events 2 & 3 should still be in _outstandingMessages buffer
+		Assert.AreEqual(sub.OutstandingMessageCount, 2);
+		//retry queue should be empty
+		Assert.True(sub.TryGetStreamBuffer(out var streamBuffer));
+		Assert.AreEqual(streamBuffer.RetryBufferCount, 0);
+
+		//Disconnect the client
+		Assert.IsTrue(sub.RemoveClientByConnectionId(clientConnectionId));
+
+		//this should empty the _outstandingMessages buffer and move events 2 & 3 to the retry queue
+		Assert.AreEqual(sub.OutstandingMessageCount, 0);
+		Assert.AreEqual(streamBuffer.RetryBufferCount, 2);
+
+		//mark the checkpoint which should still be at event 1 although the _lastKnownMessage value is 3.
+		sub.TryMarkCheckpoint(false);
+		Assert.AreEqual(Helper.GetStreamPositionFor(1, _eventSource), cp);
+	}
+
+	[Test]
+	public void
+		subscription_ignores_replayed_events_when_checkpointing() {
+		IPersistentSubscriptionStreamPosition cp = null;
+		var reader = new FakeCheckpointReader();
+		var messageParker = new FakeMessageParker();
+
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => cp = i))
+				.WithMessageParker(messageParker)
+				.StartFromBeginning()
+				.MinimumToCheckPoint(1)
+				.MaximumToCheckPoint(1));
+		reader.Load(null);
+
+		var clientConnectionId = Guid.NewGuid();
+		var clientCorrelationId = Guid.NewGuid();
+		sub.AddClient(clientCorrelationId, clientConnectionId, "connection-1", new FakeEnvelope(), 10, "foo", "bar");
+
+		//handle event number 4@streamName
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(4, _eventSource)
+		}, Helper.GetStreamPositionFor(5, _eventSource), true);
+
+		//get the message and acknowledge receipt
+		sub.GetNextNOrLessMessages(1).ToArray();
+		sub.AcknowledgeMessagesProcessed(clientCorrelationId, new[] { Helper.GetEventIdFor(4) });
+
+		//mark checkpoint and verify that event 4 has been checkpointed
+		sub.TryMarkCheckpoint(false);
+		Assert.AreEqual(Helper.GetStreamPositionFor(4, _eventSource), cp);
+
+		//park an event (this can be done earlier too)
+		var parkedEventId = Guid.NewGuid();
+		var parkedEvent = Helper.BuildFakeEvent(parkedEventId, "type", "$persistentsubscription-streamName::groupName-parked", 15, 15, 15);
+		messageParker.BeginParkMessage(parkedEvent, "parked", (ev, res) => { });
+
+		//retry parked events (this sets correct _state flag so that we can call HandleParkedReadCompleted below)
+		sub.RetryParkedMessages(null);
+
+		//handle parked event 15@$persistentsubscription-streamName::groupName-parked
+		//this should send the parked event to the retry buffer.
+		sub.HandleParkedReadCompleted(new[] {
+			parkedEvent,
+		}, new PersistentSubscriptionSingleStreamPosition(16), true, 17);
+
+		//checkpoint should still be at 4.
+		sub.TryMarkCheckpoint(false);
+		Assert.AreEqual(Helper.GetStreamPositionFor(4, _eventSource), cp);
+
+		//get the message, this should send the parked event to the outstanding message cache
+		sub.GetNextNOrLessMessages(1).ToArray();
+
+		//checkpoint should still be at 4.
+		sub.TryMarkCheckpoint(false);
+		Assert.AreEqual(Helper.GetStreamPositionFor(4, _eventSource), cp);
+
+		//acknowledge receipt of message. the parked event is no longer in retry or outstanding message buffers
+		sub.AcknowledgeMessagesProcessed(clientCorrelationId, new[] { parkedEventId });
+
+		//checkpoint should still be at 4.
+		sub.TryMarkCheckpoint(false);
+		Assert.AreEqual(Helper.GetStreamPositionFor(4, _eventSource), cp);
+	}
+}
+
+[TestFixture(EventSource.SingleStream)]
+[TestFixture(EventSource.AllStream)]
+[TestFixture(EventSource.FilteredAllStream)]
+public class LoadCheckpointTests {
+	private readonly EventSource _eventSource;
+	public LoadCheckpointTests(EventSource eventSource) {
+		_eventSource = eventSource;
+	}
+
+	[Test]
+	public void loading_subscription_from_checkpoint_should_set_the_skip_first_event_flag() {
+		bool skip = false;
+		var reader = new FakeCheckpointReader();
+		var streamReader = new FakeStreamReader(
+			(stream, startPosition, countToLoad, batchSize, maxWindowSize, resolveLinkTos, skipFirstEvent, onEventsFound) => { skip = skipFirstEvent; }
+		);
+		new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(streamReader)
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.PreferDispatchToSingle()
+				.StartFromBeginning()
+				.MaximumToCheckPoint(1));
+		switch (_eventSource) {
+			case EventSource.SingleStream:
+				reader.Load("1");
+				break;
+			case EventSource.AllStream:
+			case EventSource.FilteredAllStream:
+				reader.Load("C:1/P:1");
+				break;
+		}
+		Assert.IsTrue(skip);
+	}
+
+	[Test]
+	public void loading_subscription_from_checkpoint_should_set_the_last_known_event_number() {
+		var reader = new FakeCheckpointReader();
+		var streamReader = new FakeStreamReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(streamReader)
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.PreferDispatchToSingle()
+				.StartFromBeginning()
+				.MaximumToCheckPoint(1));
+		string checkpoint = "";
+		switch (_eventSource) {
+			case EventSource.SingleStream:
+				checkpoint = "1";
+				reader.Load(checkpoint);
+				break;
+			case EventSource.AllStream:
+			case EventSource.FilteredAllStream:
+				checkpoint = "C:1/P:1";
+				reader.Load(checkpoint);
+				break;
+		}
+
+		var info = sub.GetStatistics();
+		Assert.AreEqual(checkpoint, info.LastCheckpointedEventPosition);
+	}
+
+	[Test]
+	public void loading_subscription_from_no_checkpoint_and_no_start_from_should_read_from_beginning_of_stream() {
+		IPersistentSubscriptionStreamPosition actualStart = null;
+		var reader = new FakeCheckpointReader();
+		var streamReader = new FakeStreamReader(
+			(stream, startPosition, countToLoad, batchSize, maxWindowSize, resolveLinkTos, skipFirstEvent, onEventsFound) => {
+				actualStart = startPosition;
+			});
+		new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(streamReader)
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.PreferDispatchToSingle()
+				.StartFromBeginning()
+				.MaximumToCheckPoint(1));
+		reader.Load(null);
+
+		switch (_eventSource) {
+			case EventSource.SingleStream:
+				Assert.AreEqual(new PersistentSubscriptionSingleStreamPosition(0L), actualStart);
+				break;
+			case EventSource.AllStream:
+			case EventSource.FilteredAllStream:
+				Assert.AreEqual(new PersistentSubscriptionAllStreamPosition(0L, 0L), actualStart);
+				break;
+		}
+	}
+
+	[Test]
+	public void loading_subscription_from_no_checkpoint_and_start_from_is_set_should_read_from_start_from() {
+		IPersistentSubscriptionStreamPosition actualStart = null;
+
+		var reader = new FakeCheckpointReader();
+		var streamReader = new FakeStreamReader(
+			(stream, startPosition, countToLoad, batchSize, maxWindowSize, resolveLinkTos, skipFirstEvent, onEventsFound) => {
+				actualStart = startPosition;
+			});
+		IPersistentSubscriptionStreamPosition startFrom = _eventSource switch {
+			EventSource.SingleStream => new PersistentSubscriptionSingleStreamPosition(10),
+			EventSource.AllStream => new PersistentSubscriptionAllStreamPosition(10, 10),
+			EventSource.FilteredAllStream => new PersistentSubscriptionAllStreamPosition(10, 10),
+			_ => null
+		};
+
+		new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(streamReader)
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.PreferDispatchToSingle()
+				.StartFrom(startFrom)
+				.MaximumToCheckPoint(1));
+		reader.Load(null);
+
+		Assert.AreEqual(startFrom, actualStart);
+	}
+}
+
+[TestFixture(EventSource.SingleStream)]
+[TestFixture(EventSource.AllStream)]
+[TestFixture(EventSource.FilteredAllStream)]
+public class TimeoutTests {
+	private readonly EventSource _eventSource;
+	public TimeoutTests(EventSource eventSource) {
+		_eventSource = eventSource;
+	}
+
+	[Test]
+	public void with_no_timeouts_to_happen_no_timeouts_happen() {
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var parker = new FakeMessageParker();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
+				.WithMessageParker(parker)
+				.PreferDispatchToSingle()
+				.StartFromBeginning()
+				.WithMessageTimeoutOf(TimeSpan.FromSeconds(3)));
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource),
+		}, Helper.GetStreamPositionFor(2, _eventSource), false);
+		envelope1.Replies.Clear();
+		sub.NotifyClockTick(DateTime.UtcNow.AddSeconds(1));
+		Assert.AreEqual(0, envelope1.Replies.Count);
+		Assert.AreEqual(0, parker.ParkedEvents.Count);
+	}
+
+	[Test]
+	public void messages_get_timed_out_and_resent_to_clients() {
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var parker = new FakeMessageParker();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
+				.WithMessageParker(parker)
+				.PreferDispatchToSingle()
+				.StartFromBeginning()
+				.WithMessageTimeoutOf(TimeSpan.FromSeconds(1)));
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 1, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", envelope1, 1, "foo", "bar");
+		var id1 = Guid.NewGuid();
+		var id2 = Guid.NewGuid();
+		sub.HandleReadCompleted(new[] {
+			Helper.BuildFakeEvent(id1, "type", "streamName", 0, 1, 1),
+			Helper.BuildLinkEvent(id2, "streamName", 1,
+				Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamSource", 0, 0, 0), false, 2, 2)
+		}, Helper.GetStreamPositionFor(1, _eventSource), false);
+		envelope1.Replies.Clear();
+		sub.NotifyClockTick(DateTime.UtcNow.AddSeconds(3));
+		Assert.AreEqual(2, envelope1.Replies.Count);
+		var msg1 = (ClientMessage.PersistentSubscriptionStreamEventAppeared)envelope1.Replies[0];
+		var msg2 = (ClientMessage.PersistentSubscriptionStreamEventAppeared)envelope1.Replies[1];
+		Assert.IsTrue(id1 == msg1.Event.OriginalEvent.EventId || id1 == msg2.Event.OriginalEvent.EventId);
+		Assert.IsTrue(id2 == msg1.Event.OriginalEvent.EventId || id2 == msg2.Event.OriginalEvent.EventId);
+		Assert.AreEqual(0, parker.ParkedEvents.Count);
+	}
+
+	[Test]
+	public void messages_get_timed_out_on_synchronous_reads() {
+		var reader = new FakeCheckpointReader();
+		var parker = new FakeMessageParker();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
+				.WithMessageParker(parker)
+				.PreferDispatchToSingle()
+				.StartFromBeginning()
+				.WithMessageTimeoutOf(TimeSpan.FromSeconds(1)));
+		reader.Load(null);
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource),
+		}, Helper.GetStreamPositionFor(2, _eventSource), false);
+		sub.GetNextNOrLessMessages(2);
+		sub.NotifyClockTick(DateTime.Now.AddSeconds(3));
+		var retries = sub.GetNextNOrLessMessages(2).ToArray();
+		Assert.AreEqual(Helper.GetEventIdFor(0), retries[0].ResolvedEvent.Event.EventId);
+		Assert.AreEqual(Helper.GetEventIdFor(1), retries[1].ResolvedEvent.Event.EventId);
+		Assert.AreEqual(0, parker.ParkedEvents.Count);
+	}
+
+	[Test]
+	public void messages_dont_get_retried_when_acked_on_synchronous_reads() {
+		var reader = new FakeCheckpointReader();
+		var parker = new FakeMessageParker();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
+				.WithMessageParker(parker)
+				.PreferDispatchToSingle()
+				.StartFromBeginning()
+				.WithMessageTimeoutOf(TimeSpan.FromSeconds(1)));
+		reader.Load(null);
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource),
+		}, Helper.GetStreamPositionFor(2, _eventSource), false);
+		sub.GetNextNOrLessMessages(2).ToArray();
+		sub.AcknowledgeMessagesProcessed(Guid.Empty, new[] {
+			Helper.GetEventIdFor(0),
+			Helper.GetEventIdFor(1),
+		});
+		sub.NotifyClockTick(DateTime.Now.AddSeconds(3));
+		var retries = sub.GetNextNOrLessMessages(2).ToArray();
+		Assert.AreEqual(0, retries.Length);
+		Assert.AreEqual(0, parker.ParkedEvents.Count);
+	}
+
+	[Test]
+	public void message_gets_timed_out_and_parked_after_max_retry_count() {
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var parker = new FakeMessageParker();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
+				.WithMessageParker(parker)
+				.PreferDispatchToSingle()
+				.StartFromBeginning()
+				.WithMaxRetriesOf(0)
+				.WithMessageTimeoutOf(TimeSpan.FromSeconds(1)));
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource)
+		}, Helper.GetStreamPositionFor(1, _eventSource), false);
+		envelope1.Replies.Clear();
+		sub.NotifyClockTick(DateTime.UtcNow.AddSeconds(3));
+		Assert.AreEqual(0, envelope1.Replies.Count);
+		Assert.AreEqual(1, parker.ParkedEvents.Count);
+		Assert.AreEqual(Helper.GetEventIdFor(0), parker.ParkedEvents[0].OriginalEvent.EventId);
+	}
+
+	[Test]
+	public void multiple_messages_get_timed_out_and_parked_after_max_retry_count() {
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var parker = new FakeMessageParker();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
+				.WithMessageParker(parker)
+				.PreferDispatchToSingle()
+				.StartFromBeginning()
+				.WithMaxRetriesOf(0)
+				.WithMessageTimeoutOf(TimeSpan.FromSeconds(1)));
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource)
+		}, Helper.GetStreamPositionFor(2, _eventSource), false);
+		envelope1.Replies.Clear();
+		sub.NotifyClockTick(DateTime.UtcNow.AddSeconds(3));
+		Assert.AreEqual(0, envelope1.Replies.Count);
+		Assert.AreEqual(2, parker.ParkedEvents.Count);
+
+		var id1 = Helper.GetEventIdFor(0);
+		var id2 = Helper.GetEventIdFor(1);
+		Assert.IsTrue(id1 == parker.ParkedEvents[0].OriginalEvent.EventId ||
+					  id1 == parker.ParkedEvents[1].OriginalEvent.EventId);
+		Assert.IsTrue(id2 == parker.ParkedEvents[0].OriginalEvent.EventId ||
+					  id2 == parker.ParkedEvents[1].OriginalEvent.EventId);
+	}
+
+	[Test]
+	public void timeout_park_correctly_tracks_the_available_client_slots() {
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var parker = new FakeMessageParker();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
+				.WithMessageParker(parker)
+				.WithMaxRetriesOf(0)
+				.WithMessageTimeoutOf(TimeSpan.Zero)
+				.StartFromBeginning());
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 2, "foo", "bar");
+
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource)
+		}, Helper.GetStreamPositionFor(2, _eventSource), false);
+
+		Assert.AreEqual(2, envelope1.Replies.Count);
+
+		// Should expire first 2 and send to park.
+		sub.NotifyClockTick(DateTime.UtcNow.AddSeconds(1));
+		parker.ParkMessageCompleted(0, OperationResult.Success);
+		parker.ParkMessageCompleted(1, OperationResult.Success);
+		Assert.AreEqual(2, parker.ParkedEvents.Count);
+
+		// The next 2 should still be sent to client.
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource)
+		}, Helper.GetStreamPositionFor(2, _eventSource), false);
+
+		Assert.AreEqual(4, envelope1.Replies.Count);
+	}
+
+	[Test]
+	public void disable_timeout_doesnt_timeout() {
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var parker = new FakeMessageParker();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
+				.WithMessageParker(parker)
+				.WithMaxRetriesOf(0)
+				.PreferDispatchToSingle()
+				.StartFromBeginning()
+				.DontTimeoutMessages());
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource)
+		}, Helper.GetStreamPositionFor(2, _eventSource), false);
+		envelope1.Replies.Clear();
+		// Default timeout is 30s
+		sub.NotifyClockTick(DateTime.UtcNow.AddMinutes(1));
+		Assert.AreEqual(0, envelope1.Replies.Count);
+		Assert.AreEqual(0, parker.ParkedEvents.Count);
+	}
+}
+
+[TestFixture(EventSource.SingleStream)]
+[TestFixture(EventSource.AllStream)]
+[TestFixture(EventSource.FilteredAllStream)]
+public class NAKTests {
+	private readonly EventSource _eventSource;
+	public NAKTests(EventSource eventSource) {
+		_eventSource = eventSource;
+	}
+
+	[Test]
+	public void explicit_nak_with_park_parks_the_message() {
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var parker = new FakeMessageParker();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
+				.WithMessageParker(parker)
+				.StartFromBeginning());
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource)
+		}, Helper.GetStreamPositionFor(1, _eventSource), false);
+		envelope1.Replies.Clear();
+		sub.NotAcknowledgeMessagesProcessed(corrid, new[] {
+			Helper.GetEventIdFor(0)
+		}, NakAction.Park, "a reason from client.");
+		Assert.AreEqual(0, envelope1.Replies.Count);
+		Assert.AreEqual(1, parker.ParkedEvents.Count);
+		Assert.AreEqual(Helper.GetEventIdFor(0), parker.ParkedEvents[0].OriginalEvent.EventId);
+	}
+
+	[Test]
+	public void explicit_nak_with_skip_skips_the_message() {
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var parker = new FakeMessageParker();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
+				.WithMessageParker(parker)
+				.StartFromBeginning());
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource)
+		}, Helper.GetStreamPositionFor(1, _eventSource), false);
+		envelope1.Replies.Clear();
+		sub.NotAcknowledgeMessagesProcessed(corrid, new[] { Helper.GetEventIdFor(0) }, NakAction.Skip, "a reason from client.");
+		Assert.AreEqual(0, envelope1.Replies.Count);
+		Assert.AreEqual(0, parker.ParkedEvents.Count);
+	}
+
+	[Test]
+	public void explicit_nak_with_default_retries_the_message() {
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var parker = new FakeMessageParker();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
+				.WithMessageParker(parker)
+				.StartFromBeginning());
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource)
+		}, Helper.GetStreamPositionFor(1, _eventSource), false);
+		envelope1.Replies.Clear();
+		sub.NotAcknowledgeMessagesProcessed(corrid, new[] { Helper.GetEventIdFor(0) }, NakAction.Unknown, "a reason from client.");
+		Assert.AreEqual(1, envelope1.Replies.Count);
+		Assert.AreEqual(0, parker.ParkedEvents.Count);
+	}
+
+	[Test]
+	public void explicit_nak_with_retry_retries_the_message() {
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var parker = new FakeMessageParker();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
+				.WithMessageParker(parker)
+				.StartFromBeginning());
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource)
+		}, Helper.GetStreamPositionFor(1, _eventSource), false);
+		envelope1.Replies.Clear();
+		sub.NotAcknowledgeMessagesProcessed(corrid, new[] { Helper.GetEventIdFor(0) }, NakAction.Retry, "a reason from client.");
+		Assert.AreEqual(1, envelope1.Replies.Count);
+		Assert.AreEqual(Helper.GetEventIdFor(0),
+			((ClientMessage.PersistentSubscriptionStreamEventAppeared)envelope1.Replies[0]).Event.Event.EventId);
+		Assert.AreEqual(0, parker.ParkedEvents.Count);
+	}
+
+	[Test]
+	public void explicit_nak_with_retry_correctly_tracks_the_available_client_slots() {
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var parker = new FakeMessageParker();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
+				.WithMaxRetriesOf(10)
+				.WithMessageParker(parker)
+				.StartFromBeginning());
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 10, "foo", "bar");
+		var ev = Helper.GetFakeEventFor(0, _eventSource);
+		sub.HandleReadCompleted(new[] {
+			ev,
+		}, Helper.GetStreamPositionFor(1, _eventSource), false);
+
+		for (int i = 1; i < 11; i++) {
+			sub.NotAcknowledgeMessagesProcessed(corrid, new[] { Helper.GetEventIdFor(0) }, NakAction.Retry, "a reason from client.");
+			Assert.AreEqual(i + 1, envelope1.Replies.Count);
+		}
+
+		Assert.That(parker.ParkedEvents, Has.No.Member(ev));
+
+		//This time should be parked
+		sub.NotAcknowledgeMessagesProcessed(corrid, new[] { Helper.GetEventIdFor(0) }, NakAction.Retry, "a reason from client.");
+		Assert.AreEqual(11, envelope1.Replies.Count);
+		Assert.That(parker.ParkedEvents, Has.Member(ev));
+	}
+
+	[Test]
+	public void explicit_nak_with_park_correctly_tracks_the_available_client_slots() {
+		var envelope1 = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var parker = new FakeMessageParker();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
+				.WithMessageParker(parker)
+				.WithMaxRetriesOf(0)
+				.WithMessageTimeoutOf(TimeSpan.Zero)
+				.StartFromBeginning());
+		reader.Load(null);
+		var corrid = Guid.NewGuid();
+		sub.AddClient(corrid, Guid.NewGuid(), "connection-1", envelope1, 1, "foo", "bar");
+
+		sub.HandleReadCompleted(new[] {
+			Helper.GetFakeEventFor(0, _eventSource),
+			Helper.GetFakeEventFor(1, _eventSource),
+			Helper.GetFakeEventFor(2, _eventSource)
+		}, Helper.GetStreamPositionFor(3, _eventSource), false);
+
+		Assert.AreEqual(1, envelope1.Replies.Count);
+
+		sub.NotAcknowledgeMessagesProcessed(corrid, new[] { Helper.GetEventIdFor(0) }, NakAction.Park, "a reason from client.");
+		Assert.AreEqual(2, envelope1.Replies.Count);
+		Assert.That(parker.ParkedEvents, Has.Exactly(1).Matches<ResolvedEvent>(_ => _.Event.EventId == Helper.GetEventIdFor(0)));
+
+		sub.NotAcknowledgeMessagesProcessed(corrid, new[] { Helper.GetEventIdFor(1) }, NakAction.Park, "a reason from client.");
+		Assert.That(parker.ParkedEvents, Has.Exactly(1).Matches<ResolvedEvent>(_ => _.Event.EventId == Helper.GetEventIdFor(1)));
+		Assert.AreEqual(3, envelope1.Replies.Count);
+	}
+}
+
+[TestFixture(EventSource.SingleStream)]
+[TestFixture(EventSource.AllStream)]
+[TestFixture(EventSource.FilteredAllStream)]
+public class AddingClientTests {
+	private readonly EventSource _eventSource;
+	public AddingClientTests(EventSource eventSource) {
+		_eventSource = eventSource;
+	}
+
+	[Test]
+	public void adding_a_client_adds_the_client() {
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(new FakeCheckpointReader())
+				.WithMessageParker(new FakeMessageParker())
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { })));
+
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", new FakeEnvelope(), 1, "foo", "bar");
+		Assert.IsTrue(sub.HasClients);
+		Assert.AreEqual(1, sub.ClientCount);
+	}
+}
+
+[TestFixture(EventSource.SingleStream)]
+[TestFixture(EventSource.AllStream)]
+[TestFixture(EventSource.FilteredAllStream)]
+public class RemoveClientTests {
+	private readonly EventSource _eventSource;
+	public RemoveClientTests(EventSource eventSource) {
+		_eventSource = eventSource;
+	}
+
+	[Test]
+	public void unsubscribing_a_client_retries_inflight_messages_immediately() {
+		var client1Envelope = new FakeEnvelope();
+		var client2Envelope = new FakeEnvelope();
+
+		var fakeCheckpointReader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(fakeCheckpointReader)
+				.WithMessageParker(new FakeMessageParker())
+				.PreferRoundRobin()
+				.StartFromCurrent()
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { })));
+
+		fakeCheckpointReader.Load(null);
+
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", client1Envelope, 10, "foo", "bar");
+		var client2Id = Guid.NewGuid();
+		sub.AddClient(client2Id, Guid.NewGuid(), "connection-2", client2Envelope, 10, "foo", "bar");
+
+
+		Assert.IsTrue(sub.HasClients);
+		Assert.AreEqual(2, sub.ClientCount);
+
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(1, _eventSource));
+
+		Assert.AreEqual(1, client1Envelope.Replies.Count);
+		Assert.AreEqual(1, client2Envelope.Replies.Count);
+
+		sub.RemoveClientByCorrelationId(client2Id, false);
+		Assert.AreEqual(1, sub.ClientCount);
+
+		// Message 2 should be retried on client 1 as it wasn't acked.
+		Assert.AreEqual(2, client1Envelope.Replies.Count);
+		Assert.AreEqual(1, client2Envelope.Replies.Count);
+
+		// Retry count should have increased
+		Assert.AreEqual(1,
+			((ClientMessage.PersistentSubscriptionStreamEventAppeared)client1Envelope.Replies.Last()).RetryCount);
+	}
+
+	[Test]
+	public void disconnecting_a_client_retries_inflight_messages_immediately() {
+		var client1Envelope = new FakeEnvelope();
+		var client2Envelope = new FakeEnvelope();
+
+		var fakeCheckpointReader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(fakeCheckpointReader)
+				.WithMessageParker(new FakeMessageParker())
+				.PreferRoundRobin()
+				.StartFromCurrent()
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { })));
+
+		fakeCheckpointReader.Load(null);
+
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", client1Envelope, 10, "foo", "bar");
+		var connectionId = Guid.NewGuid();
+		sub.AddClient(Guid.NewGuid(), connectionId, "connection-2", client2Envelope, 10, "foo", "bar");
+
+		Assert.IsTrue(sub.HasClients);
+		Assert.AreEqual(2, sub.ClientCount);
+
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(0, _eventSource));
+		sub.NotifyLiveSubscriptionMessage(Helper.GetFakeEventFor(1, _eventSource));
+
+		Assert.AreEqual(1, client1Envelope.Replies.Count);
+		Assert.AreEqual(1, client2Envelope.Replies.Count);
+
+		Assert.IsTrue(sub.RemoveClientByConnectionId(connectionId));
+
+		Assert.AreEqual(1, sub.ClientCount);
+
+		// Message 2 should be retried on client 1 as it wasn't acked.
+		Assert.AreEqual(2, client1Envelope.Replies.Count);
+		Assert.AreEqual(1, client2Envelope.Replies.Count);
+
+		// Retry count should have increased
+		Assert.AreEqual(1,
+			((ClientMessage.PersistentSubscriptionStreamEventAppeared)client1Envelope.Replies.Last()).RetryCount);
+	}
+
+	[Test]
+	public void disconnecting_a_client_with_no_persistent_subscription() {
+		var fakeCheckpointReader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(fakeCheckpointReader)
+				.WithMessageParker(new FakeMessageParker())
+				.PreferRoundRobin()
+				.StartFromCurrent()
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { })));
+
+		fakeCheckpointReader.Load(null);
+
+		var clientConnectionId = Guid.NewGuid();
+
+		Assert.IsFalse(sub.RemoveClientByConnectionId(clientConnectionId));
+	}
+}
+
+[TestFixture(EventSource.SingleStream)]
+[TestFixture(EventSource.AllStream)]
+[TestFixture(EventSource.FilteredAllStream)]
+public class ParkTests {
+	private readonly EventSource _eventSource;
+	public ParkTests(EventSource eventSource) {
+		_eventSource = eventSource;
+	}
+
+	[Test]
+	public void retrying_parked_messages_with_empty_stream_should_allow_retrying_parked_messages_again() {
+		//setup the persistent subscription
+		var reader = new FakeCheckpointReader();
+		var parker = new FakeMessageParker();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
+				.WithMessageParker(parker)
+				.StartFromBeginning());
+		reader.Load(null);
+
+		Assert.AreEqual(0, parker.BeginReadEndSequenceCount);
+
+		//retry all parked messages
+		sub.RetryParkedMessages(null);
+
+		//this should invoke message parker's BeginReadEndSequence
+		Assert.AreEqual(1, parker.BeginReadEndSequenceCount);
+
+		//retry all parked messages again
+		sub.RetryParkedMessages(null);
+
+		//this should invoke message parker's BeginReadEndSequence again
+		Assert.AreEqual(2, parker.BeginReadEndSequenceCount);
+	}
+
+	[Test]
+	public void retrying_parked_messages_with_stop_at_invokes_readend() {
+		//setup the persistent subscription
+		var reader = new FakeCheckpointReader();
+		var parker = new FakeMessageParker();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
+				.WithMessageParker(parker)
+				.StartFromBeginning());
+		reader.Load(null);
+
+		Assert.AreEqual(0, parker.BeginReadEndSequenceCount);
+
+		//retry parked messages stop at version 5000
+		sub.RetryParkedMessages(5000);
+
+		//this should invoke message parker's BeginReadEndSequence
+		Assert.AreEqual(1, parker.BeginReadEndSequenceCount);
+	}
+
+
+	[Test]
+	public void retrying_parked_messages_without_stop_at_replays_all_parkedEvents() {
+		var messageParker = new FakeMessageParker();
+		var reader = new FakeCheckpointReader();
+
+		List<int> loadCount = new List<int>();
+
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader((stream, startEventNumber, countToLoad, batchSize,
+					maxWindowSize, resolveLinkTos, skipFirstEvent, onEventsFound) => loadCount.Add(countToLoad)))
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
+				.WithMessageParker(messageParker)
+				.StartFromBeginning()
+				.MinimumToCheckPoint(1)
+				.MaximumToCheckPoint(1));
+		reader.Load(null);
+
+		loadCount.Clear(); // clear loads from checkpoint reader
+
+		var clientConnectionId = Guid.NewGuid();
+		var clientCorrelationId = Guid.NewGuid();
+		sub.AddClient(clientCorrelationId, clientConnectionId, "connection-1", new FakeEnvelope(), 50, "foo", "bar");
+
+		//park 19 events
+		var parkedEvents = Enumerable.Range(0, 19)
+			.Select(v => Helper.BuildFakeEvent(Guid.NewGuid(), "type", "$persistentsubscription-streamName::groupName-parked", v, v, v)).ToArray();
+		foreach (var parkedEvent in parkedEvents) {
+			messageParker.BeginParkMessage(parkedEvent, "parked", (ev, res) => { });
+		}
+
+		sub.RetryParkedMessages(null);
+
+		Assert.AreEqual(20, loadCount[0]);
+
+		sub.HandleParkedReadCompleted(
+			parkedEvents,
+			new PersistentSubscriptionSingleStreamPosition(19),
+			true,
+			20);
+
+		Assert.AreEqual(19, messageParker.MarkedAsProcessed);
+		Assert.AreEqual(19, sub.OutstandingMessageCount);
+
+	}
+
+	[Test]
+	public void retrying_parked_messages_with_stop_at_replays_parkedEvents_until_that_version() {
+		var messageParker = new FakeMessageParker();
+		var reader = new FakeCheckpointReader();
+
+		List<int> loadCount = new List<int>();
+
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			Helper.CreatePersistentSubscriptionBuilderFor(_eventSource)
+				.WithEventLoader(new FakeStreamReader((stream, startEventNumber, countToLoad, batchSize, maxWindowSize, resolveLinkTos, skipFirstEvent, onEventsFound) => loadCount.Add(countToLoad)))
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(i => { }))
+				.WithMessageParker(messageParker)
+				.StartFromBeginning()
+				.MinimumToCheckPoint(1)
+				.MaximumToCheckPoint(1));
+		reader.Load(null);
+
+		loadCount.Clear(); // clear loads from checkpoint reader
+
+		var clientConnectionId = Guid.NewGuid();
+		var clientCorrelationId = Guid.NewGuid();
+		sub.AddClient(clientCorrelationId, clientConnectionId, "connection-1", new FakeEnvelope(), 50, "foo", "bar");
+
+		//park 19 events
+		var parkedEvents = Enumerable.Range(0, 19)
+			.Select(v => Helper.BuildFakeEvent(Guid.NewGuid(), "type", "$persistentsubscription-streamName::groupName-parked", v, v, v)).ToArray();
+		foreach (var parkedEvent in parkedEvents) {
+			messageParker.BeginParkMessage(parkedEvent, "parked", (ev, res) => { });
+		}
+
+		var stopAt = 7L;
+		sub.RetryParkedMessages(stopAt);
+
+		// stopAt == Count
+		Assert.AreEqual(stopAt + 1, loadCount[0]);
+
+		sub.HandleParkedReadCompleted(
+			parkedEvents.Where(re => re.OriginalEventNumber < 7).ToArray(),
+			new PersistentSubscriptionSingleStreamPosition(7),
+			false,
+			stopAt);
+
+		Assert.AreEqual(7, messageParker.MarkedAsProcessed);
+
+		Assert.AreEqual(7, sub.OutstandingMessageCount);
+
+	}
+}
+
+[Ignore("very long test")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class DeadlockTest<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	protected override Task Given() {
+		_conn = BuildConnection(_node);
+		return _conn.ConnectAsync();
+	}
+
+	protected override Task When() => Task.CompletedTask;
+
+	[Test]
+	public async Task read_whilst_ack_doesnt_deadlock_with_request_response_dispatcher() {
+		var persistentSubscriptionSettings = PersistentSubscriptionSettings.Create().Build();
+		var userCredentials = DefaultData.AdminCredentials;
+		await _conn.CreatePersistentSubscriptionAsync("TestStream", "TestGroup", persistentSubscriptionSettings,
+			userCredentials);
+
+		const int count = 5000;
+		await _conn.AppendToStreamAsync("TestStream", ExpectedVersion.Any, CreateEvent().Take(count));
+
+
+		var received = 0;
+		var manualResetEventSlim = new ManualResetEventSlim();
+		var sub1 = _conn.ConnectToPersistentSubscription("TestStream", "TestGroup", (sub, ev) => {
+			received++;
+			if (received == count) {
+				manualResetEventSlim.Set();
+			}
+
+			return Task.CompletedTask;
+		},
+			(sub, reason, ex) => { });
+		Assert.IsTrue(manualResetEventSlim.Wait(TimeSpan.FromSeconds(30)),
+			"Failed to receive all events in 2 minutes. Assume event store is deadlocked.");
+		sub1.Stop(TimeSpan.FromSeconds(10));
+		_conn.Close();
+	}
+
+	private static IEnumerable<EventData> CreateEvent() {
+		while (true) {
+			yield return new EventData(Guid.NewGuid(), "testtype", false, new byte[0], new byte[0]);
+		}
+	}
+}
+
+public static class Helper {
+	public static PersistentSubscriptionParamsBuilder CreatePersistentSubscriptionBuilderFor(EventSource eventSource) {
+		switch (eventSource) {
+			case EventSource.SingleStream:
+				return PersistentSubscriptionToStreamParamsBuilder.CreateFor("streamName", "groupName");
+			case EventSource.AllStream:
+				return PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName");
+			case EventSource.FilteredAllStream:
+				return PersistentSubscriptionToAllParamsBuilder.CreateFor("groupName",
+					EventFilter.StreamName.Prefixes(true, "stream"));
+			default:
+				throw new InvalidOperationException();
+		}
+	}
+
+	private static readonly Guid[] eventIds = {
+		//could be generated with a pseudo random number generator but
+		//there's no need for now
+		Guid.Parse("157e9b5a-09b1-49a8-9409-000000000000"),
+		Guid.Parse("e986669f-1845-4a2b-87df-111111111111"),
+		Guid.Parse("c18d692f-ab16-401f-b020-222222222222"),
+		Guid.Parse("2d31ce08-6a5a-48df-b92b-333333333333"),
+		Guid.Parse("aa343d98-41d4-4d9d-8356-444444444444"),
+		Guid.Parse("3bd03065-d0e1-460f-bf2d-555555555555"),
+		Guid.Parse("e18d84f3-72ea-4912-84ac-666666666666"),
+		Guid.Parse("8ee1ee33-07f7-42e7-a64d-777777777777"),
+		Guid.Parse("1594759b-b419-48a4-8a84-888888888888"),
+		Guid.Parse("0a07af23-6b6b-47c7-93c4-999999999999")
+	};
+
+	public static Guid GetEventIdFor(int position) {
+		if (position >= eventIds.Length) {
+			throw new InvalidOperationException();
+		}
+
+		return eventIds[position];
+	}
+
+	public static ResolvedEvent GetFakeEventFor(int position, EventSource eventSource, Guid? forcedEventId = null,
+		string streamPrefix = "", string eventType = "type") {
+		var eventId = forcedEventId ?? GetEventIdFor(position);
+		switch (eventSource) {
+			case EventSource.SingleStream:
+				var streamName = string.IsNullOrEmpty(streamPrefix) ? "streamName" : streamPrefix;
+				return BuildFakeEvent(eventId, eventType, streamName, position, 1234, 1234);
+			case EventSource.AllStream:
+			case EventSource.FilteredAllStream:
+				streamPrefix = string.IsNullOrEmpty(streamPrefix) ? "stream" : streamPrefix;
+				string stream = streamPrefix + (position % 2);
+				int eventNumber = (position / 2) + (position % 2 == 0 ? 2 : 0); //intentionally add offset to make event positions not continuous across all streams
+				var streamPos = GetStreamPositionFor(position, eventSource);
+				return BuildFakeEvent(eventId, eventType, stream, eventNumber, streamPos.TFPosition.Commit, streamPos.TFPosition.Prepare);
+			default:
+				throw new InvalidOperationException();
+		}
+	}
+
+	public static IPersistentSubscriptionStreamPosition GetStreamPositionFor(int position, EventSource eventSource) {
+		return eventSource switch {
+			EventSource.SingleStream => new PersistentSubscriptionSingleStreamPosition(position),
+			EventSource.AllStream => new PersistentSubscriptionAllStreamPosition(1234 + position * 2, 1233 + position * 2),
+			EventSource.FilteredAllStream => new PersistentSubscriptionAllStreamPosition(1234 + position * 2, 1233 + position * 2),
+			_ => throw new InvalidOperationException()
+		};
+	}
+
+	public static ResolvedEvent BuildFakeEvent(Guid id, string type, string stream, long version, long commitPosition = 1234567, long preparePosition = 1234567) {
+		return BuildFakeEventWithMetadata(id, type, stream, version, new byte[0], commitPosition, preparePosition);
+	}
+
+	public static ResolvedEvent BuildFakeEventWithMetadata(Guid id, string type, string stream, long version, byte[] metaData, long commitPosition = 1234567, long preparePosition = 1234567) {
+		return
+			ResolvedEvent.ForUnresolvedEvent(new EventRecord(version, preparePosition, Guid.NewGuid(), id, commitPosition, 1234,
+				stream, version,
+				DateTime.UtcNow, PrepareFlags.SingleWrite, type, new byte[0], metaData), commitPosition);
+	}
+
+	public static ResolvedEvent BuildLinkEvent(Guid id, string stream, long version, ResolvedEvent ev, bool resolved = true, long commitPosition = 1234567, long preparePosition = 1234567) {
+		var link = new EventRecord(version, preparePosition, Guid.NewGuid(), id, commitPosition, 1234, stream, version,
+			DateTime.UtcNow, PrepareFlags.SingleWrite, SystemEventTypes.LinkTo,
+			Encoding.UTF8.GetBytes(string.Format("{0}@{1}", ev.OriginalEventNumber, ev.OriginalStreamId)),
+			new byte[0]);
+		if (resolved)
+			return ResolvedEvent.ForResolvedLink(ev.Event, link, commitPosition);
+		else
+			return ResolvedEvent.ForUnresolvedEvent(link, commitPosition);
+	}
+}
+
+class FakeStreamReader : IPersistentSubscriptionStreamReader {
+	private readonly Action<IPersistentSubscriptionEventSource, IPersistentSubscriptionStreamPosition, int, int, int, bool, bool,
+		Action<ResolvedEvent[], IPersistentSubscriptionStreamPosition, bool>> _action = null;
+
+	public FakeStreamReader() {
+	}
+
+	public FakeStreamReader(Action<IPersistentSubscriptionEventSource, IPersistentSubscriptionStreamPosition, int, int, int, bool, bool, Action<ResolvedEvent[], IPersistentSubscriptionStreamPosition, bool>> action) {
+		_action = action;
+	}
+
+	public void BeginReadEvents(IPersistentSubscriptionEventSource stream, IPersistentSubscriptionStreamPosition startEventNumber,
+		int countToLoad, int batchSize, int maxWindowSize, bool resolveLinkTos, bool skipFirstEvent,
+		Action<IReadOnlyList<ResolvedEvent>, IPersistentSubscriptionStreamPosition, bool> onEventsFound,
+		Action<IPersistentSubscriptionStreamPosition, long> onEventsSkipped,
+		Action<string> onError) {
+		if (_action != null) {
+			_action(stream, startEventNumber, countToLoad, batchSize, maxWindowSize, resolveLinkTos, skipFirstEvent, onEventsFound);
+		}
+	}
+}
+
+class FakeCheckpointReader : IPersistentSubscriptionCheckpointReader {
+	private Action<string> _onStateLoaded;
+
+	public void BeginLoadState(string subscriptionId, Action<string> onStateLoaded) {
+		_onStateLoaded = onStateLoaded;
+	}
+
+	public void Load(string state) {
+		_onStateLoaded(state);
+	}
+}
+
+class FakeMessageParker : IPersistentSubscriptionMessageParker {
+	private Action<ResolvedEvent, OperationResult> _parkMessageCompleted;
+	public List<ResolvedEvent> ParkedEvents = new List<ResolvedEvent>();
+	private readonly Action _deleteAction;
+	private long _lastParkedEventNumber = -1;
+	private long _lastTruncateBefore = -1;
+	public int BeginReadEndSequenceCount { get; private set; } = 0;
+
+	public FakeMessageParker() {
+	}
+
+	public FakeMessageParker(Action deleteAction) {
+		_deleteAction = deleteAction;
+	}
+
+	public long MarkedAsProcessed { get; private set; }
+
+	public void ParkMessageCompleted(int idx, OperationResult result) {
+		_parkMessageCompleted?.Invoke(ParkedEvents[idx], result);
+	}
+
+	public void BeginParkMessage(ResolvedEvent ev, string reason,
+		Action<ResolvedEvent, OperationResult> completed) {
+		ParkedEvents.Add(ev);
+		_lastParkedEventNumber = ev.OriginalEventNumber;
+		_parkMessageCompleted = completed;
+	}
+
+	public void BeginReadEndSequence(Action<long?> completed) {
+		BeginReadEndSequenceCount++;
+		if (_lastParkedEventNumber == -1)
+			completed(null); //NoStream
+		else
+			completed(_lastParkedEventNumber);
+	}
+
+	public void BeginMarkParkedMessagesReprocessed(long sequence, DateTime? dateTime, bool updateOldestParkedMessage) {
+		MarkedAsProcessed = sequence;
+	}
+
+	public void BeginDelete(Action<IPersistentSubscriptionMessageParker> completed) {
+		_deleteAction?.Invoke();
+	}
+
+	public long ParkedMessageCount {
+		get {
+			return _lastParkedEventNumber == -1 ? 0 :
+				_lastTruncateBefore == -1 ? _lastParkedEventNumber + 1 :
+				_lastParkedEventNumber - _lastTruncateBefore + 1;
+		}
+	}
+
+	public void BeginLoadStats(Action completed) {
+		completed();
+	}
+
+	public DateTime? GetOldestParkedMessage { get; }
+}
+
+
+class FakeCheckpointWriter : IPersistentSubscriptionCheckpointWriter {
+	private readonly Action<IPersistentSubscriptionStreamPosition> _action;
+	private readonly Action _deleteAction;
+
+	public FakeCheckpointWriter(Action<IPersistentSubscriptionStreamPosition> action, Action deleteAction = null) {
+		_action = action;
+		_deleteAction = deleteAction;
+	}
+
+	public void BeginWriteState(IPersistentSubscriptionStreamPosition state) {
+		_action(state);
+	}
+
+	public void BeginDelete(Action<IPersistentSubscriptionCheckpointWriter> completed) {
+		_deleteAction?.Invoke();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/PersistentSubscription/PinnedByCorrelationConsumerStrategyTests.cs b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/PinnedByCorrelationConsumerStrategyTests.cs
new file mode 100644
index 00000000000..cc5cb27fbad
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/PinnedByCorrelationConsumerStrategyTests.cs
@@ -0,0 +1,138 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.PersistentSubscription;
+using KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+using KurrentDB.Core.Tests.Services.Replication;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.PersistentSubscription;
+
+[TestFixture]
+public class PinnedByCorrelationConsumerStrategyTests {
+	[Test]
+	public void live_subscription_with_pinned_by_correlation_pushes_events_without_metadata_to_same_client_for_stream_id() {
+		live_subscription_with_pinned_by_correlation_pushes_events_to_same_client_for_stream_id_for_metadata(new byte[0]);
+
+	}
+
+	[Test]
+	public void live_subscription_with_pinned_by_correlation_pushes_events_with_empty_metadata_to_same_client_for_stream_id() {
+		live_subscription_with_pinned_by_correlation_pushes_events_to_same_client_for_stream_id_for_metadata(Encoding.UTF8.GetBytes("{}"));
+	}
+
+	[Test]
+	public void live_subscription_with_pinned_by_correlation_pushes_events_with_metadata_without_closing_brace_to_same_client_for_stream_id() {
+		live_subscription_with_pinned_by_correlation_pushes_events_to_same_client_for_stream_id_for_metadata(Encoding.UTF8.GetBytes("{"));
+	}
+
+	[Test]
+	public void live_subscription_with_pinned_by_correlation_pushes_events_with_metadata_without_correlation_to_same_client_for_stream_id() {
+		live_subscription_with_pinned_by_correlation_pushes_events_to_same_client_for_stream_id_for_metadata(Encoding.UTF8.GetBytes(@"{ ""x"": ""x"" }"));
+	}
+
+
+	[Test]
+	public void live_subscription_with_pinned_by_correlation_pushes_events_with_metadata_with_invalid_correlation_to_same_client_for_stream_id() {
+		live_subscription_with_pinned_by_correlation_pushes_events_to_same_client_for_stream_id_for_metadata(Encoding.UTF8.GetBytes(@"{ ""$correlationId"": 0 }"));
+	}
+
+	private static void
+		live_subscription_with_pinned_by_correlation_pushes_events_to_same_client_for_stream_id_for_metadata(byte[] metaData) {
+		var client1Envelope = new FakeEnvelope();
+		var client2Envelope = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToStreamParamsBuilder.CreateFor("$ce-streamName", "groupName")
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.CustomConsumerStrategy(new PinnedByCorrelationPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
+				.StartFromCurrent());
+
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", client1Envelope, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", client2Envelope, 10, "foo", "bar");
+
+		sub.NotifyLiveSubscriptionMessage(
+			Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-1", 0, metaData));
+		sub.NotifyLiveSubscriptionMessage(
+			Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-1", 1, metaData));
+
+		Assert.AreEqual(2, client1Envelope.Replies.Count);
+		Assert.AreEqual(0, client2Envelope.Replies.Count);
+
+		sub.NotifyLiveSubscriptionMessage(
+			Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-2", 2, metaData));
+		sub.NotifyLiveSubscriptionMessage(
+			Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-2", 3, metaData));
+
+		Assert.AreEqual(2, client1Envelope.Replies.Count);
+		Assert.AreEqual(2, client2Envelope.Replies.Count);
+
+		sub.NotifyLiveSubscriptionMessage(
+			Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-1", 4, metaData));
+
+		Assert.AreEqual(3, client1Envelope.Replies.Count);
+		Assert.AreEqual(2, client2Envelope.Replies.Count);
+
+		sub.NotifyLiveSubscriptionMessage(
+			Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-3", 5, metaData));
+
+		Assert.AreEqual(4, client1Envelope.Replies.Count);
+		Assert.AreEqual(2, client2Envelope.Replies.Count);
+	}
+
+	[Test]
+	public void live_subscription_with_pinned_by_correlation_pushes_events_with_metadata_with_valid_correlation_to_same_client_for_correlation_id() {
+
+		var client1Envelope = new FakeEnvelope();
+		var client2Envelope = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToStreamParamsBuilder.CreateFor("$ce-streamName", "groupName")
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.CustomConsumerStrategy(new PinnedByCorrelationPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
+				.StartFromCurrent());
+
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", client1Envelope, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", client2Envelope, 10, "foo", "bar");
+
+		CorrelationIdPropertyContext.CorrelationIdProperty = "$correlationId2";
+
+		var metaData1 = Encoding.UTF8.GetBytes(@"{ ""x"": ""x"", ""$correlationId2"": ""1234567890"", ""y"": ""y"" }");
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-1", 0, metaData1));
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-1", 1, metaData1));
+
+		Assert.AreEqual(2, client1Envelope.Replies.Count);
+		Assert.AreEqual(0, client2Envelope.Replies.Count);
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-2", 2, metaData1));
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-2", 3, metaData1));
+
+		Assert.AreEqual(4, client1Envelope.Replies.Count);
+		Assert.AreEqual(0, client2Envelope.Replies.Count);
+
+		var metaData2 = Encoding.UTF8.GetBytes(@"{ ""$correlationId2"": ""1234567891"", ""y"": ""y"" }");
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-1", 4, metaData2));
+
+		Assert.AreEqual(4, client1Envelope.Replies.Count);
+		Assert.AreEqual(1, client2Envelope.Replies.Count);
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEventWithMetadata(Guid.NewGuid(), "type", "streamName-3", 5, metaData2));
+
+		Assert.AreEqual(4, client1Envelope.Replies.Count);
+		Assert.AreEqual(2, client2Envelope.Replies.Count);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/PersistentSubscription/PinnedConsumerStrategyTests.cs b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/PinnedConsumerStrategyTests.cs
new file mode 100644
index 00000000000..cf0233db0b3
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/PinnedConsumerStrategyTests.cs
@@ -0,0 +1,508 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.Services.PersistentSubscription;
+using KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+using KurrentDB.Core.Tests.Services.Replication;
+using KurrentDB.Core.Tests.Services.Storage;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.PersistentSubscription;
+
+[TestFixture]
+public class PinnedConsumerStrategyTests {
+	[Test]
+	public void live_subscription_with_pinned_pushes_events_to_same_client_for_stream_id() {
+		var client1Envelope = new FakeEnvelope();
+		var client2Envelope = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToStreamParamsBuilder.CreateFor("$ce-streamName", "groupName")
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
+				.StartFromCurrent());
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", client1Envelope, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", client2Envelope, 10, "foo", "bar");
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 0));
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 1));
+
+		Assert.AreEqual(2, client1Envelope.Replies.Count);
+		Assert.AreEqual(0, client2Envelope.Replies.Count);
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-2", 2));
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-2", 3));
+
+		Assert.AreEqual(2, client1Envelope.Replies.Count);
+		Assert.AreEqual(2, client2Envelope.Replies.Count);
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 4));
+
+		Assert.AreEqual(3, client1Envelope.Replies.Count);
+		Assert.AreEqual(2, client2Envelope.Replies.Count);
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-3", 5));
+
+		Assert.AreEqual(4, client1Envelope.Replies.Count);
+		Assert.AreEqual(2, client2Envelope.Replies.Count);
+	}
+
+	[Test]
+	public void new_stream_is_round_robinned_to_next_consumer() {
+		var client1Envelope = new FakeEnvelope();
+		var client2Envelope = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToStreamParamsBuilder.CreateFor("$ce-streamName", "groupName")
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
+				.StartFromCurrent());
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", client1Envelope, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", client2Envelope, 10, "foo", "bar");
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 0));
+
+		Assert.AreEqual(1, client1Envelope.Replies.Count);
+		Assert.AreEqual(0, client2Envelope.Replies.Count);
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-2", 1));
+
+		Assert.AreEqual(1, client1Envelope.Replies.Count);
+		Assert.AreEqual(1, client2Envelope.Replies.Count);
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-3", 2));
+
+		Assert.AreEqual(2, client1Envelope.Replies.Count);
+		Assert.AreEqual(1, client2Envelope.Replies.Count);
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-4", 4));
+
+		Assert.AreEqual(2, client1Envelope.Replies.Count);
+		Assert.AreEqual(2, client2Envelope.Replies.Count);
+	}
+
+	[Test]
+	public void resolved_link_events_use_event_stream_id() {
+		var client1Envelope = new FakeEnvelope();
+		var client2Envelope = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		const string subsctiptionStream = "$ce-streamName";
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToStreamParamsBuilder.CreateFor(subsctiptionStream, "groupName")
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
+				.StartFromCurrent());
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", client1Envelope, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", client2Envelope, 10, "foo", "bar");
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 0,
+			Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 0)));
+
+		Assert.AreEqual(1, client1Envelope.Replies.Count);
+		Assert.AreEqual(0, client2Envelope.Replies.Count);
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 1,
+			Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-2", 0)));
+
+		Assert.AreEqual(1, client1Envelope.Replies.Count);
+		Assert.AreEqual(1, client2Envelope.Replies.Count);
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 2,
+			Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-3", 0)));
+
+		Assert.AreEqual(2, client1Envelope.Replies.Count);
+		Assert.AreEqual(1, client2Envelope.Replies.Count);
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 3,
+			Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-4", 0)));
+
+		Assert.AreEqual(2, client1Envelope.Replies.Count);
+		Assert.AreEqual(2, client2Envelope.Replies.Count);
+	}
+
+	[Test]
+	public void link_events_use_data_to_detect_stream_id() {
+		var client1Envelope = new FakeEnvelope();
+		var client2Envelope = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		const string subsctiptionStream = "$ce-streamName";
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToStreamParamsBuilder.CreateFor(subsctiptionStream, "groupName")
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
+				.StartFromCurrent());
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", client1Envelope, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", client2Envelope, 10, "foo", "bar");
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 0,
+			Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 0), false));
+
+		Assert.AreEqual(1, client1Envelope.Replies.Count);
+		Assert.AreEqual(0, client2Envelope.Replies.Count);
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 1,
+			Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-2", 0), false));
+
+		Assert.AreEqual(1, client1Envelope.Replies.Count);
+		Assert.AreEqual(1, client2Envelope.Replies.Count);
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 2,
+			Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-3", 0), false));
+
+		Assert.AreEqual(2, client1Envelope.Replies.Count);
+		Assert.AreEqual(1, client2Envelope.Replies.Count);
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 3,
+			Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-4", 0), false));
+
+		Assert.AreEqual(2, client1Envelope.Replies.Count);
+		Assert.AreEqual(2, client2Envelope.Replies.Count);
+	}
+
+	[Test]
+	public void unsubscribed_client_has_assigned_streams_sent_to_another_client() {
+		var client1Envelope = new FakeEnvelope();
+		var client2Envelope = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		const string subsctiptionStream = "$ce-streamName";
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToStreamParamsBuilder.CreateFor(subsctiptionStream, "groupName")
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
+				.StartFromCurrent());
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", client1Envelope, 10, "foo", "bar");
+		var client2Id = Guid.NewGuid();
+		sub.AddClient(client2Id, Guid.NewGuid(), "connection-2", client2Envelope, 10, "foo", "bar");
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 0,
+			Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 0), false));
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 1,
+			Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-2", 0), false));
+
+		Assert.AreEqual(1, client1Envelope.Replies.Count);
+		Assert.AreEqual(1, client2Envelope.Replies.Count);
+
+		sub.RemoveClientByCorrelationId(client2Id, false);
+
+		// Message 2 should be retried on client 1 as it wasn't acked.
+		Assert.AreEqual(2, client1Envelope.Replies.Count);
+		Assert.AreEqual(1, client2Envelope.Replies.Count);
+	}
+
+	[Test]
+	public void new_subscription_gets_work() {
+		var client1Envelope = new FakeEnvelope();
+		var client2Envelope = new FakeEnvelope();
+		var client3Envelope = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		const string subsctiptionStream = "$ce-streamName";
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToStreamParamsBuilder.CreateFor(subsctiptionStream, "groupName")
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new ByLengthHasher()))
+				.StartFromCurrent());
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", client1Envelope, 10, "foo", "bar");
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", client2Envelope, 10, "foo", "bar");
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "1", 0));
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "11", 1));
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "111", 2));
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "1111", 3));
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "11111", 4));
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "111111", 5));
+
+		Assert.AreEqual(3, client1Envelope.Replies.Count);
+		Assert.AreEqual(3, client2Envelope.Replies.Count);
+
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-3", client3Envelope, 10, "foo", "bar");
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "1", 6));
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "11", 7));
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "111", 8));
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "1111", 9));
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "11111", 10));
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "111111", 11));
+
+		Assert.AreEqual(5, client1Envelope.Replies.Count);
+		Assert.AreEqual(5, client2Envelope.Replies.Count);
+		Assert.AreEqual(2, client3Envelope.Replies.Count);
+	}
+
+	[Test]
+	public void bad_availablecapacity_scneanrio_causing_null_reference() {
+		var client1Envelope = new FakeEnvelope();
+		var client2Envelope = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		const string subsctiptionStream = "$ce-streamName";
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToStreamParamsBuilder.CreateFor(subsctiptionStream, "groupName")
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new ByLengthHasher()))
+				.StartFromCurrent());
+		reader.Load(null);
+		var conn1Id = Guid.NewGuid();
+		sub.AddClient(Guid.NewGuid(), conn1Id, "connection-1", client1Envelope, 10, "foo", "bar");
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "1", 0));
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "11", 1));
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildFakeEvent(Guid.NewGuid(), "type", "111", 2));
+
+		Assert.AreEqual(3, client1Envelope.Replies.Count);
+
+		var conn2Id = Guid.NewGuid();
+		sub.AddClient(Guid.NewGuid(), conn2Id, "connection-2", client2Envelope, 10, "foo", "bar");
+
+		Assert.AreEqual(3, client1Envelope.Replies.Count);
+		Assert.AreEqual(0, client2Envelope.Replies.Count);
+
+		Assert.IsTrue(sub.RemoveClientByConnectionId(conn1Id));
+
+		// Used to throw a null reference exception.
+		Assert.That(() => sub.RemoveClientByConnectionId(conn2Id), Throws.Nothing);
+	}
+
+	[Test]
+	public void disconnected_client_has_assigned_streams_sent_to_another_client() {
+		var client1Envelope = new FakeEnvelope();
+		var client2Envelope = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		const string subsctiptionStream = "$ce-streamName";
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToStreamParamsBuilder.CreateFor(subsctiptionStream, "groupName")
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
+				.StartFromCurrent());
+		reader.Load(null);
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-1", client1Envelope, 10, "foo", "bar");
+		var client2Id = Guid.NewGuid();
+		sub.AddClient(Guid.NewGuid(), client2Id, "connection-2", client2Envelope, 10, "foo", "bar");
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 0,
+			Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 0), false));
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 1,
+			Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-2", 0), false));
+
+		Assert.AreEqual(1, client1Envelope.Replies.Count);
+		Assert.AreEqual(1, client2Envelope.Replies.Count);
+
+		Assert.IsTrue(sub.RemoveClientByConnectionId(client2Id));
+
+		// Message 2 should be retried on client 1 as it wasn't acked.
+		Assert.AreEqual(2, client1Envelope.Replies.Count);
+		Assert.AreEqual(1, client2Envelope.Replies.Count);
+	}
+
+	[Test]
+	public void available_capacity_is_tracked() {
+		var client1Envelope = new FakeEnvelope();
+		var client2Envelope = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		const string subsctiptionStream = "$ce-streamName";
+		PersistentSubscriptionParams settings = PersistentSubscriptionToStreamParamsBuilder
+			.CreateFor(subsctiptionStream, "groupName")
+			.WithEventLoader(new FakeStreamReader())
+			.WithCheckpointReader(reader)
+			.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+			.WithMessageParker(new FakeMessageParker())
+			.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
+			.StartFromCurrent();
+		var consumerStrategy = (PinnedPersistentSubscriptionConsumerStrategy)settings.ConsumerStrategy;
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(settings);
+		reader.Load(null);
+		var client1Id = Guid.NewGuid();
+		sub.AddClient(Guid.NewGuid(), client1Id, "connection-1", client1Envelope, 14, "foo", "bar");
+
+		Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(14));
+
+		var client2Id = Guid.NewGuid();
+		sub.AddClient(Guid.NewGuid(), client2Id, "connection-2", client2Envelope, 10, "foo", "bar");
+
+		Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(24));
+
+		Assert.IsTrue(sub.RemoveClientByConnectionId(client2Id));
+
+		Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(14));
+
+		Assert.IsTrue(sub.RemoveClientByConnectionId(client1Id));
+
+		Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(0));
+	}
+
+	[Test]
+	public void available_capacity_is_tracked_with_inflight_messages() {
+		var client1Envelope = new FakeEnvelope();
+		var client2Envelope = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		const string subsctiptionStream = "$ce-streamName";
+		PersistentSubscriptionParams settings = PersistentSubscriptionToStreamParamsBuilder
+			.CreateFor(subsctiptionStream, "groupName")
+			.WithEventLoader(new FakeStreamReader())
+			.WithCheckpointReader(reader)
+			.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+			.WithMessageParker(new FakeMessageParker())
+			.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
+			.StartFromCurrent();
+		var consumerStrategy = (PinnedPersistentSubscriptionConsumerStrategy)settings.ConsumerStrategy;
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(settings);
+		reader.Load(null);
+		var client1Id = Guid.NewGuid();
+		sub.AddClient(Guid.NewGuid(), client1Id, "connection-1", client1Envelope, 14, "foo", "bar");
+		Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(14));
+
+		var client2Id = Guid.NewGuid();
+		sub.AddClient(Guid.NewGuid(), client2Id, "connection-2", client2Envelope, 10, "foo", "bar");
+
+		Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(24));
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 0,
+			Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 0), false));
+
+		Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(23));
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 1,
+			Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-2", 0), false));
+
+		Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(22));
+
+		Assert.IsTrue(sub.RemoveClientByConnectionId(client2Id));
+
+		Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(12));
+
+		Assert.IsTrue(sub.RemoveClientByConnectionId(client1Id));
+
+		Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(0));
+	}
+
+	[Test]
+	public void available_capacity_is_tracked_with_acked_messages() {
+		var client1Envelope = new FakeEnvelope();
+		var client2Envelope = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		const string subsctiptionStream = "$ce-streamName";
+		PersistentSubscriptionParams settings = PersistentSubscriptionToStreamParamsBuilder
+			.CreateFor(subsctiptionStream, "groupName")
+			.WithEventLoader(new FakeStreamReader())
+			.WithCheckpointReader(reader)
+			.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+			.WithMessageParker(new FakeMessageParker())
+			.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
+			.StartFromCurrent();
+		var consumerStrategy = (PinnedPersistentSubscriptionConsumerStrategy)settings.ConsumerStrategy;
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(settings);
+		reader.Load(null);
+		var correlationId1 = Guid.NewGuid();
+		sub.AddClient(correlationId1, Guid.NewGuid(), "connection-1", client1Envelope, 14, "foo", "bar");
+		Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(14));
+
+		var correlationId2 = Guid.NewGuid();
+		sub.AddClient(correlationId2, Guid.NewGuid(), "connection-2", client2Envelope, 10, "foo", "bar");
+
+		Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(24));
+
+		var message1 = Guid.NewGuid();
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(message1, subsctiptionStream, 0,
+			Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 0), false));
+
+		Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(23));
+
+		var message2 = Guid.NewGuid();
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(message2, subsctiptionStream, 1,
+			Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-2", 0), false));
+
+		Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(22));
+
+		sub.AcknowledgeMessagesProcessed(correlationId1, new[] { message1 });
+
+		Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(23));
+
+		sub.AcknowledgeMessagesProcessed(correlationId2, new[] { message2 });
+
+		Assert.That(consumerStrategy.AvailableCapacity, Is.EqualTo(24));
+	}
+
+	[Test]
+	public void events_are_skipped_if_assigned_client_full() {
+		var client1Envelope = new FakeEnvelope();
+		var client2Envelope = new FakeEnvelope();
+		var reader = new FakeCheckpointReader();
+		const string subsctiptionStream = "$ce-streamName";
+		var sub = new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(
+			PersistentSubscriptionToStreamParamsBuilder.CreateFor(subsctiptionStream, "groupName")
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(reader)
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.CustomConsumerStrategy(new PinnedPersistentSubscriptionConsumerStrategy(new XXHashUnsafe()))
+				.StartFromCurrent());
+		reader.Load(null);
+
+		var correlationId = Guid.NewGuid();
+		sub.AddClient(correlationId, Guid.NewGuid(), "connection-1", client1Envelope, 1, "foo", "bar");
+
+		sub.AddClient(Guid.NewGuid(), Guid.NewGuid(), "connection-2", client2Envelope, 1, "foo", "bar");
+
+
+		var message1 = Guid.NewGuid();
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(message1, subsctiptionStream, 0,
+			Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 0), false));
+
+		Assert.That(client1Envelope.Replies.Count, Is.EqualTo(1));
+		Assert.That(client2Envelope.Replies.Count, Is.EqualTo(0));
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 1,
+			Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-1", 0), false));
+
+		Assert.That(client1Envelope.Replies.Count, Is.EqualTo(1));
+		Assert.That(client2Envelope.Replies.Count, Is.EqualTo(0));
+		Assert.True(sub.TryGetStreamBuffer(out var streamBuffer));
+		Assert.That(streamBuffer.BufferCount, Is.EqualTo(1));
+
+		sub.NotifyLiveSubscriptionMessage(Helper.BuildLinkEvent(Guid.NewGuid(), subsctiptionStream, 2,
+			Helper.BuildFakeEvent(Guid.NewGuid(), "type", "streamName-2", 0), false));
+
+		Assert.That(client1Envelope.Replies.Count, Is.EqualTo(1));
+		Assert.That(client2Envelope.Replies.Count, Is.EqualTo(1));
+
+		Assert.That(streamBuffer.BufferCount, Is.EqualTo(1));
+
+		sub.AcknowledgeMessagesProcessed(correlationId, new[] { message1 });
+
+		Assert.That(client1Envelope.Replies.Count, Is.EqualTo(2));
+		Assert.That(client2Envelope.Replies.Count, Is.EqualTo(1));
+
+		Assert.That(streamBuffer.BufferCount, Is.EqualTo(0));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/PersistentSubscription/ReadBatchSizeTests.cs b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/ReadBatchSizeTests.cs
new file mode 100644
index 00000000000..ab2ef458269
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/ReadBatchSizeTests.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Services.PersistentSubscription;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.PersistentSubscription;
+
+[TestFixture]
+public class ReadBatchSizeTests {
+	[TestCase(1, 1)]
+	[TestCase(2, 1)]
+	public void read_batch_size_greater_or_equal_to_buffer_size_throws(int readBatchSize, int bufferSize) {
+		Assert.Throws<ArgumentOutOfRangeException>(() =>
+			new KurrentDB.Core.Services.PersistentSubscription.PersistentSubscription(PersistentSubscriptionToStreamParamsBuilder
+				.CreateFor("stream", "group")
+				.WithEventLoader(new FakeStreamReader())
+				.WithCheckpointReader(new FakeCheckpointReader())
+				.WithCheckpointWriter(new FakeCheckpointWriter(x => { }))
+				.WithMessageParker(new FakeMessageParker())
+				.StartFromCurrent()
+				.WithReadBatchOf(readBatchSize)
+				.WithHistoryBufferSizeOf(bufferSize)));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/PersistentSubscription/RequestStatisticsTests.cs b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/RequestStatisticsTests.cs
new file mode 100644
index 00000000000..8ab3ff43911
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/RequestStatisticsTests.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Services.PersistentSubscription;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.PersistentSubscription;
+
+[TestFixture]
+public class RequestStatisticsTests {
+	[Test]
+	public void DoesNotOverflow() {
+		var elapsedTicks = 0L;
+		var sut = new RequestStatistics(() => elapsedTicks, 1000);
+
+		for (var i = 0; i < 1000; i++) {
+			var id = Guid.NewGuid();
+			sut.StartOperation(id);
+
+			elapsedTicks += TimeSpan.FromMinutes(36).Ticks;
+
+			sut.EndOperation(id);
+		}
+
+		sut.GetMeasurementDetails();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/PersistentSubscription/StreamBufferTests.cs b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/StreamBufferTests.cs
new file mode 100644
index 00000000000..78839137155
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/StreamBufferTests.cs
@@ -0,0 +1,269 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.PersistentSubscription;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.PersistentSubscription;
+
+[TestFixture(EventSource.SingleStream)]
+[TestFixture(EventSource.AllStream)]
+public class StreamBufferTests {
+	private EventSource _eventSource;
+
+	public StreamBufferTests(EventSource eventSource) {
+		_eventSource = eventSource;
+	}
+
+	[Test]
+	public void adding_read_message_in_correct_order() {
+		var buffer = new StreamBuffer(10, 10, null, true);
+		buffer.AddReadMessage(BuildMessageAt(0));
+		Assert.AreEqual(1, buffer.BufferCount);
+		OutstandingMessage message = buffer.Scan().First().Message;
+		Assert.AreEqual(GetEventIdFor(0), message.EventId);
+		Assert.IsFalse(buffer.Live);
+	}
+
+	[Test]
+	public void adding_multiple_read_message_in_correct_order() {
+		var buffer = new StreamBuffer(10, 10, null, true);
+		buffer.AddReadMessage(BuildMessageAt(0));
+		buffer.AddReadMessage(BuildMessageAt(1));
+		Assert.AreEqual(2, buffer.BufferCount);
+		var messagePointer = buffer.Scan().First();
+		Assert.AreEqual(GetEventIdFor(0), messagePointer.Message.EventId);
+		messagePointer.MarkSent();
+		Assert.AreEqual(1, buffer.BufferCount);
+		messagePointer = buffer.Scan().First();
+		Assert.AreEqual(GetEventIdFor(1), messagePointer.Message.EventId);
+		messagePointer.MarkSent();
+		Assert.AreEqual(0, buffer.BufferCount);
+		Assert.IsFalse(buffer.Live);
+	}
+
+
+	[Test]
+	public void adding_multiple_read_message_in_wrong_order() {
+		var buffer = new StreamBuffer(10, 10, null, true);
+		buffer.AddReadMessage(BuildMessageAt(1));
+		buffer.AddReadMessage(BuildMessageAt(0));
+		Assert.AreEqual(2, buffer.BufferCount);
+		var messagePointer = buffer.Scan().First();
+		Assert.AreEqual(GetEventIdFor(1), messagePointer.Message.EventId);
+		messagePointer.MarkSent();
+		Assert.AreEqual(1, buffer.BufferCount);
+		messagePointer = buffer.Scan().First();
+		Assert.AreEqual(GetEventIdFor(0), messagePointer.Message.EventId);
+		messagePointer.MarkSent();
+		Assert.AreEqual(0, buffer.BufferCount);
+		Assert.IsFalse(buffer.Live);
+	}
+
+	[Test]
+	public void adding_multiple_same_read_message() {
+		var buffer = new StreamBuffer(10, 10, null, true);
+		buffer.AddReadMessage(BuildMessageAt(0));
+		buffer.AddReadMessage(BuildMessageAt(0));
+		Assert.AreEqual(2, buffer.BufferCount);
+		var messagePointer = buffer.Scan().First();
+		Assert.AreEqual(GetEventIdFor(0), messagePointer.Message.EventId);
+		messagePointer.MarkSent();
+		Assert.AreEqual(1, buffer.BufferCount);
+		messagePointer = buffer.Scan().First();
+		Assert.AreEqual(GetEventIdFor(0), messagePointer.Message.EventId);
+		messagePointer.MarkSent();
+		Assert.AreEqual(0, buffer.BufferCount);
+		Assert.IsFalse(buffer.Live);
+	}
+
+	[Test]
+	public void adding_messages_to_read_after_same_on_live_switches_to_live() {
+		var buffer = new StreamBuffer(10, 10, null, true);
+		buffer.AddLiveMessage(BuildMessageAt(0));
+		buffer.AddReadMessage(BuildMessageAt(0));
+		Assert.IsTrue(buffer.Live);
+		Assert.AreEqual(1, buffer.BufferCount);
+		var messagePointer = buffer.Scan().First();
+		Assert.AreEqual(GetEventIdFor(0), messagePointer.Message.EventId);
+		messagePointer.MarkSent();
+		Assert.AreEqual(0, buffer.BufferCount);
+	}
+
+	[Test]
+	public void adding_messages_to_read_after_later_live_does_not_switch() {
+		var buffer = new StreamBuffer(10, 10, null, true);
+		buffer.AddLiveMessage(BuildMessageAt(5));
+		buffer.AddReadMessage(BuildMessageAt(0));
+		Assert.IsFalse(buffer.Live);
+		Assert.AreEqual(1, buffer.BufferCount);
+		var messagePointer = buffer.Scan().First();
+		Assert.AreEqual(GetEventIdFor(0), messagePointer.Message.EventId);
+		messagePointer.MarkSent();
+		Assert.AreEqual(0, buffer.BufferCount);
+	}
+
+	[Test]
+	public void adding_messages_to_live_without_start_from_beginning() {
+		var buffer = new StreamBuffer(10, 10, null, false);
+		buffer.AddLiveMessage(BuildMessageAt(6));
+		buffer.AddLiveMessage(BuildMessageAt(7));
+		Assert.IsTrue(buffer.Live);
+		Assert.AreEqual(2, buffer.BufferCount);
+		var messagePointer = buffer.Scan().First();
+		Assert.AreEqual(GetEventIdFor(6), messagePointer.Message.EventId);
+		messagePointer.MarkSent();
+		Assert.AreEqual(1, buffer.BufferCount);
+		messagePointer = buffer.Scan().First();
+		Assert.AreEqual(GetEventIdFor(7), messagePointer.Message.EventId);
+		messagePointer.MarkSent();
+		Assert.AreEqual(0, buffer.BufferCount);
+	}
+
+	[Test]
+	public void adding_messages_with_lower_in_live() {
+		var buffer = new StreamBuffer(10, 10, null, true);
+		var id = Guid.NewGuid();
+		buffer.AddLiveMessage(BuildMessageAt(5));
+		buffer.AddLiveMessage(BuildMessageAt(6));
+		buffer.AddLiveMessage(BuildMessageAt(7, id));
+		buffer.AddReadMessage(BuildMessageAt(7));
+		Assert.IsTrue(buffer.Live);
+		Assert.AreEqual(1, buffer.BufferCount);
+		var messagePointer = buffer.Scan().First();
+		Assert.AreEqual(id, messagePointer.Message.EventId);
+		messagePointer.MarkSent();
+		Assert.AreEqual(0, buffer.BufferCount);
+	}
+
+	[Test]
+	public void skipped_messages_are_not_removed() {
+		var buffer = new StreamBuffer(10, 10, null, true);
+		buffer.AddReadMessage(BuildMessageAt(0));
+		buffer.AddReadMessage(BuildMessageAt(1));
+		buffer.AddReadMessage(BuildMessageAt(2));
+		Assert.AreEqual(3, buffer.BufferCount);
+
+		var messagePointer2 = buffer.Scan().Skip(1).First(); // Skip the first message.
+		Assert.AreEqual(GetEventIdFor(1), messagePointer2.Message.EventId);
+		messagePointer2.MarkSent();
+		Assert.AreEqual(2, buffer.BufferCount);
+
+		var messagePointers = buffer.Scan().ToArray();
+		Assert.AreEqual(GetEventIdFor(0), messagePointers[0].Message.EventId);
+		Assert.AreEqual(GetEventIdFor(2), messagePointers[1].Message.EventId);
+	}
+
+	[Test]
+	public void retried_messages_appear_first() {
+		var buffer = new StreamBuffer(10, 10, null, true);
+		buffer.AddReadMessage(BuildMessageAt(0));
+		buffer.AddRetry(BuildMessageAt(2));
+		Assert.AreEqual(2, buffer.BufferCount);
+		Assert.AreEqual(1, buffer.RetryBufferCount);
+		Assert.AreEqual(1, buffer.ReadBufferCount);
+
+		var messagePointer = buffer.Scan().First();
+		Assert.AreEqual(GetEventIdFor(2), messagePointer.Message.EventId);
+		messagePointer.MarkSent();
+		Assert.AreEqual(1, buffer.BufferCount);
+		Assert.AreEqual(0, buffer.RetryBufferCount);
+		Assert.AreEqual(1, buffer.ReadBufferCount);
+
+		messagePointer = buffer.Scan().First();
+		Assert.AreEqual(GetEventIdFor(0), messagePointer.Message.EventId);
+		messagePointer.MarkSent();
+		Assert.AreEqual(0, buffer.BufferCount);
+		Assert.AreEqual(0, buffer.RetryBufferCount);
+		Assert.AreEqual(0, buffer.ReadBufferCount);
+
+		Assert.IsFalse(buffer.Live);
+	}
+
+	[Test]
+	public void retried_messages_appear_in_version_order() {
+		var buffer = new StreamBuffer(10, 10, null, true);
+		var id2Retry1 = Guid.NewGuid();
+		var id2Retry2 = Guid.NewGuid();
+		buffer.AddReadMessage(BuildMessageAt(0));
+		buffer.AddRetry(BuildMessageAt(2, id2Retry1));
+		buffer.AddRetry(BuildMessageAt(3));
+		buffer.AddRetry(BuildMessageAt(1));
+		buffer.AddRetry(BuildMessageAt(2, id2Retry2));
+
+		var messagePointer = buffer.Scan().First();
+		Assert.AreEqual(GetEventIdFor(1), messagePointer.Message.EventId);
+		messagePointer.MarkSent();
+
+		messagePointer = buffer.Scan().First();
+		Assert.AreEqual(id2Retry1, messagePointer.Message.EventId);
+		messagePointer.MarkSent();
+
+		messagePointer = buffer.Scan().First();
+		Assert.AreEqual(id2Retry2, messagePointer.Message.EventId);
+		messagePointer.MarkSent();
+
+		messagePointer = buffer.Scan().First();
+		Assert.AreEqual(GetEventIdFor(3), messagePointer.Message.EventId);
+		messagePointer.MarkSent();
+	}
+
+	[Test]
+	public void lowest_retry_doesnt_assume_order() {
+		var buffer = new StreamBuffer(10, 10, null, true);
+		buffer.AddRetry(BuildMessageAt(4));
+		buffer.AddRetry(BuildMessageAt(2));
+		buffer.AddRetry(BuildMessageAt(3));
+		Assert.AreEqual(2, buffer.GetLowestRetry().sequenceNumber);
+	}
+
+	[Test]
+	public void lowest_retry_ignores_replayed_events() {
+		var buffer = new StreamBuffer(10, 10, null, true);
+		buffer.AddRetry(BuildMessageAt(4));
+		buffer.AddRetry(BuildMessageAt(2));
+		buffer.AddRetry(BuildMessageAt(3));
+		//add parked events
+		buffer.AddRetry(OutstandingMessage.ForParkedEvent(Helper.BuildFakeEvent(Guid.NewGuid(), "foo", "$persistentsubscription-foo::group-parked", 1)));
+		Assert.AreEqual(2, buffer.GetLowestRetry().sequenceNumber);
+	}
+
+	[Test]
+	public void can_add_retries_after_replayed_events() {
+		var buffer = new StreamBuffer(10, 10, null, true);
+		// add parked events
+		var parkedEvent = BuildMessageAt(1);
+		buffer.AddRetry(OutstandingMessage.ForParkedEvent(Helper.BuildLinkEvent(Guid.NewGuid(), "$persistentsubscription-foo::group-parked", 0, parkedEvent.ResolvedEvent)));
+
+		// add retried events
+		buffer.AddRetry(BuildMessageAt(4));
+		buffer.AddRetry(BuildMessageAt(2));
+		buffer.AddRetry(BuildMessageAt(3));
+
+		Assert.AreEqual(2, buffer.GetLowestRetry().sequenceNumber);
+		var messagePointers = buffer.Scan().ToArray();
+		Assert.AreEqual(GetEventIdFor(1), messagePointers[0].Message.ResolvedEvent.Event.EventId);
+		Assert.AreEqual(GetEventIdFor(2), messagePointers[1].Message.EventId);
+		Assert.AreEqual(GetEventIdFor(3), messagePointers[2].Message.EventId);
+		Assert.AreEqual(GetEventIdFor(4), messagePointers[3].Message.EventId);
+	}
+
+	private OutstandingMessage BuildMessageAt(int position, Guid? forcedEventId = null) {
+		IPersistentSubscriptionStreamPosition previousEventPosition =
+			position > 0 ? Helper.GetStreamPositionFor(position - 1, _eventSource) : null;
+		var @event = BuildEventAt(position, forcedEventId);
+		return OutstandingMessage.ForPushedEvent(
+			OutstandingMessage.ForNewEvent(@event, Helper.GetStreamPositionFor(position, _eventSource)), position, previousEventPosition).message;
+	}
+
+	private Guid GetEventIdFor(int position) {
+		return Helper.GetEventIdFor(position);
+	}
+
+	private ResolvedEvent BuildEventAt(int position, Guid? forcedEventId = null) {
+		return Helper.GetFakeEventFor(position, _eventSource, forcedEventId);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/PersistentSubscription/when_an_error_occurs.cs b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/when_an_error_occurs.cs
new file mode 100644
index 00000000000..855422c1566
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/when_an_error_occurs.cs
@@ -0,0 +1,149 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.PersistentSubscription;
+using KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+using KurrentDB.Core.Tests.TransactionLog;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.PersistentSubscription;
+
+[TestFixture]
+public class PersistentSubscriptionServiceErrorTests {
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public abstract class when_an_error_occurs<TLogFormat, TStreamId, TMessage, TReply, TResult>
+		where TMessage : Message where TReply : Message {
+		private readonly TResult _expectedResult;
+		private readonly PersistentSubscriptionService<TStreamId> _sut;
+		private readonly TaskCompletionSource<Message> _replySource;
+		private readonly CallbackEnvelope _envelope;
+
+		protected when_an_error_occurs(TResult expectedResult) {
+			_expectedResult = expectedResult;
+			_replySource = new TaskCompletionSource<Message>();
+			var bus = new SynchronousScheduler();
+			var trackers = new Trackers();
+			_sut = new PersistentSubscriptionService<TStreamId>(
+				new QueuedHandlerThreadPool(bus, "test",
+					new QueueStatsManager(), new QueueTrackers()),
+				new FakeReadIndex<TLogFormat, TStreamId>(_ => false, new MetaStreamLookup()),
+				new IODispatcher(bus, bus), bus,
+				new PersistentSubscriptionConsumerStrategyRegistry(bus, bus,
+					Array.Empty<IPersistentSubscriptionConsumerStrategyFactory>()), trackers.PersistentSubscriptionTracker);
+			_envelope = new CallbackEnvelope(_replySource.SetResult);
+			_sut.Start();
+		}
+
+		private void Handle(TMessage message) =>
+			typeof(PersistentSubscriptionService<TStreamId>).GetMethod("Handle", new[] { typeof(TMessage) })!
+				.Invoke(_sut, new object[] { message });
+
+		protected abstract TMessage CreateMessage(IEnvelope envelope);
+
+		protected abstract TResult GetResult(TReply reply);
+
+		[Test]
+		public async Task test() {
+			Handle(CreateMessage(_envelope));
+			var result = await _replySource.Task.WithTimeout();
+			Assert.IsInstanceOf<TReply>(result);
+
+			Assert.AreEqual(
+				_expectedResult, GetResult((TReply)result));
+		}
+
+		private class MetaStreamLookup : IMetastreamLookup<TStreamId> {
+			public bool IsMetaStream(TStreamId streamId) => throw new NotSupportedException();
+
+			public TStreamId MetaStreamOf(TStreamId streamId) => throw new NotSupportedException();
+
+			public TStreamId OriginalStreamOf(TStreamId streamId) => throw new NotSupportedException();
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class create_stream<TLogFormat, TStreamId> : when_an_error_occurs<TLogFormat, TStreamId,
+		ClientMessage.CreatePersistentSubscriptionToStream,
+		ClientMessage.CreatePersistentSubscriptionToStreamCompleted,
+		ClientMessage.CreatePersistentSubscriptionToStreamCompleted.CreatePersistentSubscriptionToStreamResult> {
+		public create_stream() : base(ClientMessage.CreatePersistentSubscriptionToStreamCompleted.CreatePersistentSubscriptionToStreamResult.Fail) {
+		}
+
+		protected override ClientMessage.CreatePersistentSubscriptionToStream CreateMessage(IEnvelope envelope) =>
+			new(
+				Guid.NewGuid(), Guid.NewGuid(), envelope, "stream", "group", false, 0L, -1, false, 0, 0, 0, 0, 0, 0,
+				0, 0,
+				null, ClaimsPrincipal.Current);
+
+		protected override
+			ClientMessage.CreatePersistentSubscriptionToStreamCompleted.CreatePersistentSubscriptionToStreamResult
+			GetResult(ClientMessage.CreatePersistentSubscriptionToStreamCompleted reply) => reply.Result;
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class create_all<TLogFormat, TStreamId> : when_an_error_occurs<TLogFormat, TStreamId,
+		ClientMessage.CreatePersistentSubscriptionToAll,
+		ClientMessage.CreatePersistentSubscriptionToAllCompleted,
+		ClientMessage.CreatePersistentSubscriptionToAllCompleted.CreatePersistentSubscriptionToAllResult> {
+		public create_all() : base(ClientMessage.CreatePersistentSubscriptionToAllCompleted.CreatePersistentSubscriptionToAllResult.Fail) {
+		}
+
+		protected override ClientMessage.CreatePersistentSubscriptionToAll CreateMessage(IEnvelope envelope) => new(
+			Guid.NewGuid(), Guid.NewGuid(), envelope, "group", null, false, new(0, 0), -1, false, 0, 0, 0, 0, 0, 0,
+			0, 0, null, ClaimsPrincipal.Current);
+
+		protected override
+			ClientMessage.CreatePersistentSubscriptionToAllCompleted.CreatePersistentSubscriptionToAllResult
+			GetResult(ClientMessage.CreatePersistentSubscriptionToAllCompleted reply) => reply.Result;
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class update_stream<TLogFormat, TStreamId> : when_an_error_occurs<TLogFormat, TStreamId,
+		ClientMessage.UpdatePersistentSubscriptionToStream,
+		ClientMessage.UpdatePersistentSubscriptionToStreamCompleted,
+		ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult> {
+		public update_stream() : base(ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult.Fail) {
+		}
+
+		protected override ClientMessage.UpdatePersistentSubscriptionToStream CreateMessage(IEnvelope envelope) =>
+			new(
+				Guid.NewGuid(), Guid.NewGuid(), envelope, "stream", "group", false, 0L, -1, false, 0, 0, 0, 0, 0, 0,
+				0, 0,
+				null, ClaimsPrincipal.Current);
+
+		protected override
+			ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult
+			GetResult(ClientMessage.UpdatePersistentSubscriptionToStreamCompleted reply) => reply.Result;
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class update_all<TLogFormat, TStreamId> : when_an_error_occurs<TLogFormat, TStreamId,
+		ClientMessage.UpdatePersistentSubscriptionToAll,
+		ClientMessage.UpdatePersistentSubscriptionToAllCompleted,
+		ClientMessage.UpdatePersistentSubscriptionToAllCompleted.UpdatePersistentSubscriptionToAllResult> {
+		public update_all() : base(ClientMessage.UpdatePersistentSubscriptionToAllCompleted.UpdatePersistentSubscriptionToAllResult.Fail) {
+		}
+
+		protected override ClientMessage.UpdatePersistentSubscriptionToAll CreateMessage(IEnvelope envelope) => new(
+			Guid.NewGuid(), Guid.NewGuid(), envelope, "group", false, new(0, 0), -1, false, 0, 0, 0, 0, 0, 0,
+			0, 0, null, ClaimsPrincipal.Current);
+
+		protected override
+			ClientMessage.UpdatePersistentSubscriptionToAllCompleted.UpdatePersistentSubscriptionToAllResult
+			GetResult(ClientMessage.UpdatePersistentSubscriptionToAllCompleted reply) => reply.Result;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/PersistentSubscription/when_restarting.cs b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/when_restarting.cs
new file mode 100644
index 00000000000..2fa847b5660
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/PersistentSubscription/when_restarting.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Tests.Integration;
+using KurrentDB.Core.Tests.Services.Replication;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.PersistentSubscription;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_restarting_with_a_connected_subscription<TLogFormat, TStreamId> : specification_with_a_single_node<TLogFormat, TStreamId> {
+	private readonly ManualResetEvent _subscriptionDropped = new ManualResetEvent(false);
+	private readonly ManualResetEvent _serviceStarted = new ManualResetEvent(false);
+	private readonly ManualResetEvent _serviceStopped = new ManualResetEvent(false);
+
+	protected override Task Given() {
+		var testUser = new ClaimsPrincipal(new ClaimsIdentity(
+			new[] {
+				new Claim(ClaimTypes.Name, "admin"),
+			}, "ES-Test"));
+
+		_node.Node.MainBus.Subscribe(
+			new AdHocHandler<SubscriptionMessage.PersistentSubscriptionsStarted>(_ => _serviceStarted.Set()));
+
+		_node.Node.MainBus.Subscribe(
+			new AdHocHandler<SubscriptionMessage.PersistentSubscriptionsStopped>(_ => _serviceStopped.Set()));
+
+		var streamId = Guid.NewGuid().ToString();
+		var group = Guid.NewGuid().ToString();
+		_node.Node.MainQueue.Handle(new ClientMessage.CreatePersistentSubscriptionToStream(Guid.NewGuid(), Guid.NewGuid(),
+			new FakeEnvelope(), streamId, group, false, 0, 0, false, 0, 20, 20, 10, 1, 1, 10, 1,
+			"RoundRobin",
+			testUser, DateTime.UtcNow));
+
+		_node.Node.MainQueue.Handle(new ClientMessage.ConnectToPersistentSubscriptionToStream(Guid.NewGuid(),
+			Guid.NewGuid(), new CallbackEnvelope(message => {
+				_subscriptionDropped.Set();
+			}), Guid.NewGuid(), Guid.NewGuid().ToString(), group, streamId, 1, "0",
+			testUser));
+
+		_node.Node.MainQueue.Handle(
+			new SubscriptionMessage.PersistentSubscriptionsRestart(new FakeEnvelope()));
+		return base.Given();
+	}
+
+	[Test]
+	public void should_drop_subscription() {
+		Assert.IsTrue(_subscriptionDropped.WaitOne(TimeSpan.FromSeconds(5)));
+	}
+
+	[Test]
+	public void should_have_stopped_the_service() {
+		Assert.IsTrue(_serviceStopped.WaitOne(TimeSpan.FromSeconds(5)));
+	}
+
+	[Test]
+	public void should_have_started_the_service() {
+		Assert.IsTrue(_serviceStarted.WaitOne(TimeSpan.FromSeconds(5)));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RedactionService/EventPositionTests.cs b/src/KurrentDB.Core.Tests/Services/RedactionService/EventPositionTests.cs
new file mode 100644
index 00000000000..9912c125f70
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RedactionService/EventPositionTests.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using FluentAssertions;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data.Redaction;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RedactionService;
+
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class EventPositionTests<TLogFormat, TStreamId> : RedactionServiceTestFixture<TLogFormat, TStreamId> {
+	private const string StreamId = nameof(EventPositionTests<TLogFormat, TStreamId>);
+	private readonly Dictionary<long, List<EventPosition>> _positions = new();
+
+	private async ValueTask WriteEvent(string streamId, long eventNumber, string data, CancellationToken token) {
+		var eventRecord = await WriteSingleEvent(streamId, eventNumber, data, token: token);
+		if (!_positions.ContainsKey(eventNumber))
+			_positions[eventNumber] = new();
+
+		var chunk = await Db.Manager.GetInitializedChunkFor(eventRecord.LogPosition, token);
+		var eventOffset = await chunk.GetActualRawPosition(eventRecord.LogPosition, token);
+		var eventPosition = new EventPosition(
+			eventRecord.LogPosition, Path.GetFileName(chunk.LocalFileName), chunk.ChunkHeader.MinCompatibleVersion, chunk.IsReadOnly, (uint)eventOffset);
+		_positions[eventNumber].Add(eventPosition);
+	}
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteEvent(StreamId, 2, "data 2", token: token);
+		await WriteEvent(StreamId, 0, "data 0", token: token);
+		await WriteEvent(StreamId, 1, "data 1", token: token);
+		await WriteEvent(StreamId, 2, "data 2", token: token); // duplicate
+	}
+
+	private async Task<RedactionMessage.GetEventPositionCompleted> GetEventPosition(long eventNumber) {
+		var e = new TcsEnvelope<RedactionMessage.GetEventPositionCompleted>();
+		await RedactionService.As<IAsyncHandle<RedactionMessage.GetEventPosition>>().HandleAsync(new RedactionMessage.GetEventPosition(e, StreamId, eventNumber), CancellationToken.None);
+		return await e.Task;
+	}
+
+	[Test]
+	public async Task can_get_positions_of_event_0() {
+		var msg = await GetEventPosition(0);
+		Assert.AreEqual(GetEventPositionResult.Success, msg.Result);
+		Assert.AreEqual(1, msg.EventPositions.Length);
+		msg.EventPositions.Should().BeEquivalentTo(_positions[0].ToArray());
+	}
+
+	[Test]
+	public async Task can_get_positions_of_event_1() {
+		var msg = await GetEventPosition(1);
+		Assert.AreEqual(GetEventPositionResult.Success, msg.Result);
+		Assert.AreEqual(1, msg.EventPositions.Length);
+		msg.EventPositions.Should().BeEquivalentTo(_positions[1].ToArray());
+	}
+
+	[Test]
+	public async Task can_get_positions_of_event_2() {
+		var msg = await GetEventPosition(2);
+		Assert.AreEqual(GetEventPositionResult.Success, msg.Result);
+		Assert.AreEqual(2, msg.EventPositions.Length);
+		msg.EventPositions.Should().BeEquivalentTo(_positions[2].ToArray());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RedactionService/LockTests.cs b/src/KurrentDB.Core.Tests/Services/RedactionService/LockTests.cs
new file mode 100644
index 00000000000..9dc86db9dbc
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RedactionService/LockTests.cs
@@ -0,0 +1,79 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data.Redaction;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RedactionService;
+
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class LockTests<TLogFormat, TStreamId> : RedactionServiceTestFixture<TLogFormat, TStreamId> {
+	private async Task<RedactionMessage.AcquireChunksLockCompleted> TryLock() {
+		var e = new TcsEnvelope<RedactionMessage.AcquireChunksLockCompleted>();
+		RedactionService.Handle(new RedactionMessage.AcquireChunksLock(e));
+		return await e.Task;
+	}
+
+	private async Task<RedactionMessage.ReleaseChunksLockCompleted> TryUnlock(Guid lockId) {
+		var e = new TcsEnvelope<RedactionMessage.ReleaseChunksLockCompleted>();
+		RedactionService.Handle(new RedactionMessage.ReleaseChunksLock(e, lockId));
+		return await e.Task;
+	}
+
+	[Test]
+	public async Task can_lock() {
+		var msg = await TryLock();
+		Assert.AreEqual(AcquireChunksLockResult.Success, msg.Result);
+	}
+
+	[Test]
+	public async Task can_unlock() {
+		var lockMsg = await TryLock();
+		Assert.AreEqual(AcquireChunksLockResult.Success, lockMsg.Result);
+
+		var unlockMsg = await TryUnlock(lockMsg.AcquisitionId);
+		Assert.AreEqual(ReleaseChunksLockResult.Success, unlockMsg.Result);
+	}
+
+	[Test]
+	public async Task cannot_unlock_with_wrong_id() {
+		var lockMsg = await TryLock();
+		Assert.AreEqual(AcquireChunksLockResult.Success, lockMsg.Result);
+
+		var unlockMsg = await TryUnlock(Guid.NewGuid());
+		Assert.AreEqual(ReleaseChunksLockResult.Failed, unlockMsg.Result);
+	}
+
+	[Test]
+	public async Task cannot_unlock_twice_with_same_id() {
+		var lockMsg = await TryLock();
+		Assert.AreEqual(AcquireChunksLockResult.Success, lockMsg.Result);
+
+		var unlockMsg1 = await TryUnlock(lockMsg.AcquisitionId);
+		Assert.AreEqual(ReleaseChunksLockResult.Success, unlockMsg1.Result);
+
+		var unlockMsg2 = await TryUnlock(lockMsg.AcquisitionId);
+		Assert.AreEqual(ReleaseChunksLockResult.Failed, unlockMsg2.Result);
+	}
+
+	[Test]
+	public async Task cannot_unlock_when_unlocked() {
+		var msg = await TryUnlock(Guid.NewGuid());
+		Assert.AreEqual(ReleaseChunksLockResult.Failed, msg.Result);
+	}
+
+	[Test]
+	public async Task cannot_lock_when_locked() {
+		var msg = await TryLock();
+		Assert.AreEqual(AcquireChunksLockResult.Success, msg.Result);
+
+		msg = await TryLock();
+		Assert.AreEqual(AcquireChunksLockResult.Failed, msg.Result);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RedactionService/RedactionServiceTestFixture.cs b/src/KurrentDB.Core.Tests/Services/RedactionService/RedactionServiceTestFixture.cs
new file mode 100644
index 00000000000..6da69257343
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RedactionService/RedactionServiceTestFixture.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Synchronization;
+using KurrentDB.Core.Tests.Bus;
+using KurrentDB.Core.Tests.Services.Storage;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RedactionService;
+
+[TestFixture]
+public abstract class RedactionServiceTestFixture<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private SemaphoreSlimLock _switchChunksLock;
+	public RedactionService<TStreamId> RedactionService { get; private set; }
+
+	public RedactionServiceTestFixture() : base(chunkSize: 1024) { }
+
+	[SetUp]
+	public virtual Task SetUp() {
+		_switchChunksLock = new SemaphoreSlimLock();
+		RedactionService = new RedactionService<TStreamId>(new FakeQueuedHandler(), Db, ReadIndex, _switchChunksLock);
+		return Task.CompletedTask;
+	}
+
+	[TearDown]
+	public virtual Task TearDown() {
+		_switchChunksLock?.Dispose();
+		return Task.CompletedTask;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RedactionService/SwitchChunkFailureTests.cs b/src/KurrentDB.Core.Tests/Services/RedactionService/SwitchChunkFailureTests.cs
new file mode 100644
index 00000000000..e75b6192f4c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RedactionService/SwitchChunkFailureTests.cs
@@ -0,0 +1,148 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Core.Data.Redaction;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.Transforms;
+using KurrentDB.Core.Transforms.Identity;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RedactionService;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class SwitchChunkFailureTests<TLogFormat, TStreamId> : SwitchChunkTests<TLogFormat, TStreamId> {
+	[Test]
+	public async Task cannot_switch_invalid_chunk_filename() {
+		var msg = await SwitchChunk("chunk", FakeChunk);
+		Assert.AreEqual(SwitchChunkResult.TargetChunkFileNameInvalid, msg.Result);
+
+		msg = await SwitchChunk("../chunk-000000.000000", FakeChunk);
+		Assert.AreEqual(SwitchChunkResult.TargetChunkFileNameInvalid, msg.Result);
+
+		msg = await SwitchChunk("..chunk-000000.000000", FakeChunk);
+		Assert.AreEqual(SwitchChunkResult.TargetChunkFileNameInvalid, msg.Result);
+
+		msg = await SwitchChunk("/chunk-000000.000000", FakeChunk);
+		Assert.AreEqual(SwitchChunkResult.TargetChunkFileNameInvalid, msg.Result);
+	}
+
+	[Test]
+	public async Task cannot_switch_non_existent_chunk() {
+		var msg = await SwitchChunk(GetChunk(3, 0), FakeChunk);
+		Assert.AreEqual(SwitchChunkResult.TargetChunkFileNotFound, msg.Result);
+	}
+
+	[Test]
+	public async Task cannot_switch_chunk_not_used_by_db() {
+		File.Copy(GetChunk(0, 0, true), GetChunk(10, 0, true));
+		var msg = await SwitchChunk(GetChunk(10, 0), FakeChunk);
+		Assert.AreEqual(SwitchChunkResult.TargetChunkExcessive, msg.Result);
+	}
+
+	[Test]
+	public async Task cannot_switch_inactive_chunk() {
+		File.Copy(GetChunk(0, 0, true), GetChunk(0, 1, true));
+		var msg = await SwitchChunk(GetChunk(0, 1), FakeChunk);
+		Assert.AreEqual(SwitchChunkResult.TargetChunkInactive, msg.Result);
+	}
+
+	[Test]
+	public async Task cannot_switch_incomplete_chunk() {
+		var msg = await SwitchChunk(GetChunk(2, 0), FakeChunk);
+		Assert.AreEqual(SwitchChunkResult.TargetChunkNotCompleted, msg.Result);
+	}
+
+	[Test]
+	public async Task cannot_switch_with_invalid_chunk_filename() {
+		var msg = await SwitchChunk(GetChunk(0, 0), "chunk.wrong_extension");
+		Assert.AreEqual(SwitchChunkResult.NewChunkFileNameInvalid, msg.Result);
+
+		msg = await SwitchChunk(GetChunk(0, 0), "../chunk.tmp");
+		Assert.AreEqual(SwitchChunkResult.NewChunkFileNameInvalid, msg.Result);
+
+		msg = await SwitchChunk(GetChunk(0, 0), "..chunk.tmp");
+		Assert.AreEqual(SwitchChunkResult.NewChunkFileNameInvalid, msg.Result);
+
+		msg = await SwitchChunk(GetChunk(0, 0), "/chunk.tmp");
+		Assert.AreEqual(SwitchChunkResult.NewChunkFileNameInvalid, msg.Result);
+	}
+
+	[Test]
+	public async Task cannot_switch_with_non_existent_chunk() {
+		var msg = await SwitchChunk(GetChunk(0, 0), "no-chunk.tmp");
+		Assert.AreEqual(SwitchChunkResult.NewChunkFileNotFound, msg.Result);
+	}
+
+	[Test]
+	public async Task cannot_switch_with_incomplete_chunk() {
+		var newChunk = Path.Combine(PathName, $"{nameof(cannot_switch_with_incomplete_chunk)}.tmp");
+		File.Copy(GetChunk(0, 0, true), newChunk);
+
+		// zero out the footer & hash to make it an incomplete chunk
+		File.SetAttributes(newChunk, FileAttributes.Normal);
+		await using (var fs = new FileStream(newChunk, FileMode.Open, FileAccess.ReadWrite, FileShare.None)) {
+			fs.Seek(-(ChunkFooter.Size + ChunkFooter.ChecksumSize), SeekOrigin.End);
+			fs.Write(new byte[ChunkFooter.Size + ChunkFooter.ChecksumSize]);
+		}
+
+		var msg = await SwitchChunk(GetChunk(0, 0), Path.GetFileName(newChunk));
+		Assert.AreEqual(SwitchChunkResult.NewChunkNotCompleted, msg.Result);
+	}
+
+	[Test]
+	public async Task cannot_switch_with_chunk_with_invalid_header_or_footer() {
+		var msg = await SwitchChunk(GetChunk(0, 0), FakeChunk);
+		Assert.AreEqual(SwitchChunkResult.NewChunkHeaderOrFooterInvalid, msg.Result);
+	}
+
+	[Test]
+	public async Task cannot_switch_with_chunk_having_invalid_hash() {
+		var newChunk = Path.Combine(PathName, $"{nameof(cannot_switch_with_chunk_having_invalid_hash)}.tmp");
+		File.Copy(GetChunk(0, 0, true), newChunk);
+
+		// corrupt the file
+		File.SetAttributes(newChunk, FileAttributes.Normal);
+		await using (var fs = new FileStream(newChunk, FileMode.Open, FileAccess.ReadWrite, FileShare.None)) {
+			fs.Seek(123, SeekOrigin.Begin);
+			fs.WriteByte(0xFF);
+		}
+
+		var msg = await SwitchChunk(GetChunk(0, 0), Path.GetFileName(newChunk));
+		Assert.AreEqual(SwitchChunkResult.NewChunkHashInvalid, msg.Result);
+	}
+
+	[Test]
+	public async Task cannot_switch_with_chunk_file_in_use() {
+		var newChunk = Path.Combine(PathName, $"{nameof(cannot_switch_with_chunk_file_in_use)}.tmp");
+
+		File.Copy(GetChunk(0, 0, true), newChunk);
+		File.SetAttributes(newChunk, FileAttributes.Normal);
+		await using (new FileStream(newChunk, FileMode.Open, FileAccess.ReadWrite, FileShare.None)) {
+			var msg = await SwitchChunk(GetChunk(0, 0), Path.GetFileName(newChunk));
+			Assert.AreEqual(SwitchChunkResult.NewChunkOpenFailed, msg.Result);
+		}
+	}
+
+	[Test]
+	public async Task cannot_switch_with_chunk_having_mismatched_range() {
+		var newChunk = $"{nameof(cannot_switch_with_chunk_having_mismatched_range)}-chunk0copy.tmp";
+		File.Copy(GetChunk(0, 0, true), Path.Combine(PathName, newChunk));
+		var msg = await SwitchChunk(GetChunk(1, 0), newChunk);
+		Assert.AreEqual(SwitchChunkResult.ChunkRangeDoesNotMatch, msg.Result);
+
+		newChunk = $"{nameof(cannot_switch_with_chunk_having_mismatched_range)}-chunk-0-2.tmp";
+		var chunkHeader = new ChunkHeader(1, 1, 1024, 0, 2, true, Guid.NewGuid(), TransformType.Identity);
+		var chunk = await TFChunk.CreateWithHeader(new ChunkLocalFileSystem(path: ""), Path.Combine(PathName, newChunk), chunkHeader, 1024, false, false, false, false,
+			new TFChunkTracker.NoOp(), new IdentityChunkTransformFactory(), DbTransformManager.Default, ReadOnlyMemory<byte>.Empty, CancellationToken.None);
+		chunk.Dispose();
+		msg = await SwitchChunk(GetChunk(0, 0), newChunk);
+		Assert.AreEqual(SwitchChunkResult.ChunkRangeDoesNotMatch, msg.Result);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RedactionService/SwitchChunkSuccessTests.cs b/src/KurrentDB.Core.Tests/Services/RedactionService/SwitchChunkSuccessTests.cs
new file mode 100644
index 00000000000..b40ba626999
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RedactionService/SwitchChunkSuccessTests.cs
@@ -0,0 +1,86 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data.Redaction;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+using MD5 = KurrentDB.Core.Hashing.MD5;
+
+// successful chunk switching tests have individual classes as they modify the database and thus the test fixture cannot be reused
+
+namespace KurrentDB.Core.Tests.Services.RedactionService;
+
+public class SwitchChunkSuccess<TLogFormat, TStreamId> : SwitchChunkTests<TLogFormat, TStreamId> {
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class CanSwitchWithExactCopy : SwitchChunkSuccess<TLogFormat, TStreamId> {
+		[Test]
+		public async Task can_switch_with_exact_copy() {
+			var newChunk = Path.Combine(PathName, $"{nameof(can_switch_with_exact_copy)}.tmp");
+
+			File.Copy(GetChunk(1, 0, true), newChunk);
+			var msg = await SwitchChunk(GetChunk(1, 0), Path.GetFileName(newChunk));
+			Assert.AreEqual(SwitchChunkResult.Success, msg.Result);
+			Assert.True(!File.Exists(newChunk));
+			Assert.True(!File.Exists(GetChunk(1, 0, true)));
+			Assert.True(File.Exists(GetChunk(1, 1, true)));
+			Assert.AreEqual(1, Db.Manager.FileSystem.LocalNamingStrategy.GetVersionFor(Path.GetFileName((await Db.Manager.GetInitializedChunk(1, CancellationToken.None)).LocalFileName)));
+			Assert.True(File.Exists(GetChunk(0, 0, true)));
+
+			// can switch again
+			File.Copy(GetChunk(1, 1, true), newChunk);
+			msg = await SwitchChunk(GetChunk(1, 1), Path.GetFileName(newChunk));
+			Assert.AreEqual(SwitchChunkResult.Success, msg.Result);
+			Assert.True(!File.Exists(newChunk));
+			Assert.True(!File.Exists(GetChunk(1, 0, true)));
+			Assert.True(!File.Exists(GetChunk(1, 1, true)));
+			Assert.True(File.Exists(GetChunk(1, 2, true)));
+			Assert.AreEqual(2, Db.Manager.FileSystem.LocalNamingStrategy.GetVersionFor(Path.GetFileName((await Db.Manager.GetInitializedChunk(1, CancellationToken.None)).LocalFileName)));
+			Assert.True(File.Exists(GetChunk(0, 0, true)));
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class CanSwitchWithModifiedCopy : SwitchChunkSuccess<TLogFormat, TStreamId> {
+		[Test]
+		public async Task can_switch_with_modified_copy() {
+			var newChunk = Path.Combine(PathName, $"{nameof(can_switch_with_modified_copy)}.tmp");
+
+			File.Copy(GetChunk(1, 0, true), newChunk);
+
+			// edit the chunk file
+			File.SetAttributes(newChunk, FileAttributes.Normal);
+			await using (var fs = new FileStream(newChunk, FileMode.Open, FileAccess.ReadWrite, FileShare.None)) {
+				// jump in the data and make some modifications
+				fs.Seek(ChunkHeader.Size + 123, SeekOrigin.Begin);
+				fs.WriteByte(0xAB);
+				fs.WriteByte(0xCD);
+
+				// truncate the hash
+				fs.SetLength(fs.Length - ChunkFooter.ChecksumSize);
+
+				// recompute the hash
+				byte[] newHash;
+				fs.Seek(0, SeekOrigin.Begin);
+				using (var md5 = MD5.Create())
+					newHash = await md5.ComputeHashAsync(fs);
+
+				// write the new hash
+				fs.Seek(0, SeekOrigin.End);
+				fs.Write(newHash);
+			}
+
+			var msg = await SwitchChunk(GetChunk(1, 0), Path.GetFileName(newChunk));
+			Assert.AreEqual(SwitchChunkResult.Success, msg.Result);
+			Assert.True(!File.Exists(newChunk));
+			Assert.True(!File.Exists(GetChunk(1, 0, true)));
+			Assert.True(File.Exists(GetChunk(1, 1, true)));
+			Assert.AreEqual(1, Db.Manager.FileSystem.LocalNamingStrategy.GetVersionFor(Path.GetFileName((await Db.Manager.GetInitializedChunk(1, CancellationToken.None)).LocalFileName)));
+			Assert.True(File.Exists(GetChunk(0, 0, true)));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RedactionService/SwitchChunkTests.cs b/src/KurrentDB.Core.Tests/Services/RedactionService/SwitchChunkTests.cs
new file mode 100644
index 00000000000..017e8c927bb
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RedactionService/SwitchChunkTests.cs
@@ -0,0 +1,74 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data.Redaction;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RedactionService;
+
+public abstract class SwitchChunkTests<TLogFormat, TStreamId> : RedactionServiceTestFixture<TLogFormat, TStreamId> {
+	private const string StreamId = nameof(SwitchChunkTests<TLogFormat, TStreamId>);
+	protected const string FakeChunk = "fake_chunk.tmp";
+	private Guid _lockId;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		// the writes below create 3 chunks for both V2 & V3 log formats
+		await WriteSingleEvent(StreamId, 0, new string('0', 50), retryOnFail: true, token: token);
+		await WriteSingleEvent(StreamId, 1, new string('1', 50), retryOnFail: true, token: token);
+		await WriteSingleEvent(StreamId, 2, new string('2', 50), retryOnFail: true, token: token);
+		await WriteSingleEvent(StreamId, 3, new string('3', 50), retryOnFail: true, token: token);
+		await WriteSingleEvent(StreamId, 4, new string('4', 50), retryOnFail: true, token: token);
+		await WriteSingleEvent(StreamId, 5, new string('5', 50), retryOnFail: true, token: token);
+		await WriteSingleEvent(StreamId, 6, new string('6', 50), retryOnFail: true, token: token);
+		await WriteSingleEvent(StreamId, 7, new string('7', 50), retryOnFail: true, token: token);
+		await WriteSingleEvent(StreamId, 8, new string('8', 50), retryOnFail: true, token: token);
+
+		var writerPos = Writer.Position;
+		var chunk = Path.GetFileName((await Db.Manager.GetInitializedChunkFor(writerPos, token)).LocalFileName);
+		var chunkNum = Db.Manager.FileSystem.LocalNamingStrategy.GetIndexFor(chunk);
+		Assert.AreEqual(2, chunkNum);
+
+		// create an empty file that can be used in tests that require the target or new chunk files to exist
+		using var fs = File.CreateText(Path.Combine(PathName, FakeChunk));
+	}
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+		var e = new TcsEnvelope<RedactionMessage.AcquireChunksLockCompleted>();
+		RedactionService.Handle(new RedactionMessage.AcquireChunksLock(e));
+		var result = await e.Task;
+		Assert.NotNull(result);
+		Assert.AreEqual(AcquireChunksLockResult.Success, result.Result);
+		_lockId = result.AcquisitionId;
+	}
+
+	[TearDown]
+	public override async Task TearDown() {
+		var e = new TcsEnvelope<RedactionMessage.ReleaseChunksLockCompleted>();
+		RedactionService.Handle(new RedactionMessage.ReleaseChunksLock(e, _lockId));
+		await e.Task;
+
+		await base.TearDown();
+	}
+
+	protected string GetChunk(int chunkNum, int chunkVersion, bool fullPath = false) {
+		var chunkPath = Db.Manager.FileSystem.LocalNamingStrategy.GetFilenameFor(chunkNum, chunkVersion);
+		return fullPath ? chunkPath : Path.GetFileName(chunkPath);
+	}
+
+	protected async Task<RedactionMessage.SwitchChunkCompleted> SwitchChunk(string targetChunk, string newChunk) {
+		var e = new TcsEnvelope<RedactionMessage.SwitchChunkCompleted>();
+		await RedactionService.As<IAsyncHandle<RedactionMessage.SwitchChunk>>()
+			.HandleAsync(new(e, _lockId, targetChunk, newChunk), CancellationToken.None);
+		return await e.Task;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/FakeEnvelope.cs b/src/KurrentDB.Core.Tests/Services/Replication/FakeEnvelope.cs
new file mode 100644
index 00000000000..0dd4ea11a78
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/FakeEnvelope.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Tests.Services.Replication;
+
+public class FakeEnvelope : IEnvelope {
+	public List<Message> Replies = new List<Message>();
+
+	public void ReplyWith<T>(T message) where T : Message {
+		Replies.Add(message);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/FakeTfChunkLogManager.cs b/src/KurrentDB.Core.Tests/Services/Replication/FakeTfChunkLogManager.cs
new file mode 100644
index 00000000000..fa002b7df78
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/FakeTfChunkLogManager.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.Chunks;
+
+namespace KurrentDB.Core.Tests.Services.Replication;
+
+public class FakeTfChunkLogManager : ITFChunkScavengerLogManager {
+	public void Initialise() {
+	}
+
+	public ITFChunkScavengerLog CreateLog() {
+		return new FakeTFScavengerLog();
+	}
+}
+
+public class FakeTfChunkScavengerLog : ITFChunkScavengerLog {
+	public void IndexTableScavenged(int level, int index, TimeSpan elapsed, long entriesDeleted, long entriesKept,
+		long spaceSaved) {
+	}
+
+	public void IndexTableNotScavenged(int level, int index, TimeSpan elapsed, long entriesKept,
+		string errorMessage) {
+	}
+
+	public string ScavengeId { get; }
+	public long SpaceSaved { get; }
+
+	public void ScavengeStarted() {
+	}
+
+	public void ScavengeStarted(bool alwaysKeepScavenged, bool mergeChunks, int startFromChunk, int threads) {
+	}
+
+	public void ChunksScavenged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, long spaceSaved) {
+	}
+
+	public void ChunksNotScavenged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed,
+		string errorMessage) {
+	}
+
+	public void ChunksMerged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, long spaceSaved) {
+	}
+
+	public void ChunksNotMerged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, string errorMessage) {
+	}
+
+	public void ScavengeCompleted(ScavengeResult result, string error, TimeSpan elapsed) {
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/LeaderReplication/when_non_promotable_replica_sends_replica_log_position_ack.cs b/src/KurrentDB.Core.Tests/Services/Replication/LeaderReplication/when_non_promotable_replica_sends_replica_log_position_ack.cs
new file mode 100644
index 00000000000..a70c3c4c655
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/LeaderReplication/when_non_promotable_replica_sends_replica_log_position_ack.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.LeaderReplication;
+
+[TestFixture]
+public class when_non_promotable_replica_sends_replica_log_position_ack : with_replication_service {
+	private long _logPosition;
+
+	public override void When() {
+		_logPosition = 4000;
+		Service.Handle(new ReplicationMessage.ReplicaLogPositionAck(ReadOnlyReplicaId, _logPosition, _logPosition));
+	}
+
+	[Test]
+	public void replica_Log_written_to_should_not_be_published() {
+		Assert.AreEqual(0, ReplicaWriteAcks.Count);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/LeaderReplication/when_replica_subscribes_with_epochs.cs b/src/KurrentDB.Core.Tests/Services/Replication/LeaderReplication/when_replica_subscribes_with_epochs.cs
new file mode 100644
index 00000000000..8e3b36d9dff
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/LeaderReplication/when_replica_subscribes_with_epochs.cs
@@ -0,0 +1,371 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.LeaderReplication;
+
+
+public class when_replica_subscribes_with_no_common_epochs<TLogFormat, TStreamId>
+	: with_replication_service_and_epoch_manager<TLogFormat, TStreamId> {
+	private readonly Guid _replicaId = Guid.NewGuid();
+	private TcpConnectionManager _replicaManager;
+
+	public override async Task When(CancellationToken token) {
+		await EpochManager.WriteNewEpoch(0, token);
+		await Writer.Write(CreateLogRecord(0), token);
+		await Writer.Write(CreateLogRecord(1), token);
+		await Writer.Write(CreateLogRecord(2), token);
+		await Writer.Write(CreateLogRecord(3), token);
+		await Writer.Write(CreateLogRecord(4), token);
+		await EpochManager.WriteNewEpoch(1, token);
+
+		var epochs = new[] {
+			new Epoch(1010, 1, Guid.NewGuid()),
+			new Epoch(999, 2, Guid.NewGuid())
+		};
+
+		(_, _replicaManager) = await AddSubscription(_replicaId, true, epochs, 1010, token);
+	}
+
+	[Test]
+	public void subscription_is_sent_a_replica_subscribed_message_from_start() {
+		var message = GetTcpSendsFor(_replicaManager).Select(x => x.Message).First();
+
+		Assert.IsInstanceOf<ReplicationMessage.ReplicaSubscribed>(message);
+		var subscribed = (ReplicationMessage.ReplicaSubscribed)message;
+		Assert.Zero(subscribed.SubscriptionPosition);
+		Assert.AreEqual(_replicaId, subscribed.SubscriptionId);
+		Assert.AreEqual(LeaderId, subscribed.LeaderId);
+	}
+}
+
+public class when_replica_with_same_epochs_subscribes_from_last_epoch_position<TLogFormat, TStreamId>
+	: with_replication_service_and_epoch_manager<TLogFormat, TStreamId> {
+	private readonly Guid _replicaId = Guid.NewGuid();
+	private TcpConnectionManager _replicaManager;
+	private EpochRecord _lastEpoch;
+
+	public override async Task When(CancellationToken token) {
+		await EpochManager.WriteNewEpoch(0, token);
+		await Writer.Write(CreateLogRecord(0), token);
+		await Writer.Write(CreateLogRecord(1), token);
+		await Writer.Write(CreateLogRecord(2), token);
+		await Writer.Write(CreateLogRecord(3), token);
+		await Writer.Write(CreateLogRecord(4), token);
+		await EpochManager.WriteNewEpoch(1, token);
+
+		_lastEpoch = EpochManager.GetLastEpoch();
+		var epochs = (await EpochManager.GetLastEpochs(10, token))
+			.Select(e => new Epoch(e.EpochPosition, e.EpochNumber, e.EpochId)).ToArray();
+
+		(_, _replicaManager) = await AddSubscription(_replicaId, true, epochs, _lastEpoch.EpochPosition, token);
+	}
+
+	[Test]
+	public void subscription_is_sent_a_replica_subscribed_message_from_last_epoch_position() {
+		var message = GetTcpSendsFor(_replicaManager).Select(x => x.Message).First();
+
+		Assert.IsInstanceOf<ReplicationMessage.ReplicaSubscribed>(message);
+		var subscribed = (ReplicationMessage.ReplicaSubscribed)message;
+		Assert.AreEqual(_lastEpoch.EpochPosition, subscribed.SubscriptionPosition);
+		Assert.AreEqual(_replicaId, subscribed.SubscriptionId);
+		Assert.AreEqual(LeaderId, subscribed.LeaderId);
+	}
+}
+
+public class when_replica_with_same_epochs_subscribes_from_position_less_than_last_epoch_position<TLogFormat, TStreamId>
+	: with_replication_service_and_epoch_manager<TLogFormat, TStreamId> {
+	private readonly Guid _replicaId = Guid.NewGuid();
+	private TcpConnectionManager _replicaManager;
+	private EpochRecord _lastEpoch;
+	private long _subscribedPosition;
+
+	public override async Task When(CancellationToken token) {
+		await EpochManager.WriteNewEpoch(0, token);
+		await Writer.Write(CreateLogRecord(0), token);
+		await Writer.Write(CreateLogRecord(1), token);
+		await Writer.Write(CreateLogRecord(2), token);
+		await Writer.Write(CreateLogRecord(3), token);
+		(_, _subscribedPosition) = await Writer.Write(CreateLogRecord(4), token);
+		await EpochManager.WriteNewEpoch(1, token);
+
+		_lastEpoch = EpochManager.GetLastEpoch();
+		var epochs = (await EpochManager.GetLastEpochs(10, token))
+			.Select(e => new Epoch(e.EpochPosition, e.EpochNumber, e.EpochId)).ToArray();
+
+		(_, _replicaManager) = await AddSubscription(_replicaId, true, epochs, _subscribedPosition, token);
+	}
+
+	[Test]
+	public void subscription_is_sent_a_replica_subscribed_message_from_requested_position() {
+		var message = GetTcpSendsFor(_replicaManager).Select(x => x.Message).First();
+
+		Assert.IsInstanceOf<ReplicationMessage.ReplicaSubscribed>(message);
+		var subscribed = (ReplicationMessage.ReplicaSubscribed)message;
+		Assert.AreEqual(_subscribedPosition, subscribed.SubscriptionPosition);
+		Assert.AreEqual(_replicaId, subscribed.SubscriptionId);
+		Assert.AreEqual(LeaderId, subscribed.LeaderId);
+	}
+}
+
+public class when_replica_with_additional_epochs_subscribes_to_position_past_leaders_last_epoch<TLogFormat, TStreamId>
+	: with_replication_service_and_epoch_manager<TLogFormat, TStreamId> {
+	private readonly Guid _replicaId = Guid.NewGuid();
+	private TcpConnectionManager _replicaManager;
+	private List<Epoch> _replicaEpochs;
+
+	public override async Task When(CancellationToken token) {
+		await EpochManager.WriteNewEpoch(0, token);
+		await Writer.Write(CreateLogRecord(0), token);
+		await Writer.Write(CreateLogRecord(1), token);
+		await Writer.Write(CreateLogRecord(2), token);
+		await Writer.Write(CreateLogRecord(3), token);
+		await Writer.Write(CreateLogRecord(4), token);
+		await EpochManager.WriteNewEpoch(1, token);
+		await Writer.Write(CreateLogRecord(5), token);
+		await Writer.Write(CreateLogRecord(6), token);
+		var (_, lastWritePosition) = await Writer.Write(CreateLogRecord(7), token);
+		await Writer.Flush(token);
+
+		_replicaEpochs = new List<Epoch> {
+			new(lastWritePosition + 2000, 4, Guid.NewGuid()),
+			new(lastWritePosition + 1000, 3, Guid.NewGuid()),
+			new(lastWritePosition, 2, Guid.NewGuid()),
+		};
+		_replicaEpochs.AddRange((await EpochManager.GetLastEpochs(10, token))
+			.Select(e => new Epoch(e.EpochPosition, e.EpochNumber, e.EpochId)).ToList());
+
+		(_, _replicaManager) = await AddSubscription(_replicaId, true, _replicaEpochs.ToArray(),
+			lastWritePosition + 2000, token);
+	}
+
+	[Test]
+	public void subscription_is_sent_replica_subscribed_message_for_epoch_after_common_epoch() {
+		var message = GetTcpSendsFor(_replicaManager).Select(x => x.Message).First();
+
+		Assert.IsInstanceOf<ReplicationMessage.ReplicaSubscribed>(message);
+		var subscribed = (ReplicationMessage.ReplicaSubscribed)message;
+		Assert.AreEqual(_replicaEpochs[2].EpochPosition, subscribed.SubscriptionPosition);
+		Assert.AreEqual(_replicaId, subscribed.SubscriptionId);
+		Assert.AreEqual(LeaderId, subscribed.LeaderId);
+	}
+}
+
+public class when_replica_subscribes_with_epoch_that_doesnt_exist_on_leader_but_is_before_leaders_last_epoch<TLogFormat, TStreamId>
+	: with_replication_service_and_epoch_manager<TLogFormat, TStreamId> {
+	private readonly Guid _replicaId = Guid.NewGuid();
+	private TcpConnectionManager _replicaManager;
+	private List<Epoch> _replicaEpochs;
+
+	public override async Task When(CancellationToken token) {
+		await EpochManager.WriteNewEpoch(0, token);
+		await Writer.Write(CreateLogRecord(0), token);
+		await Writer.Write(CreateLogRecord(1), token);
+		var (_, otherEpochLogPosition) = await Writer.Write(CreateLogRecord(2), token);
+		await Writer.Write(CreateLogRecord(3), token);
+		await Writer.Write(CreateLogRecord(4), token);
+		await EpochManager.WriteNewEpoch(2, token);
+
+		var firstEpoch = (await EpochManager.GetLastEpochs(10, token)).First(e => e.EpochNumber == 0);
+		_replicaEpochs = new List<Epoch> {
+			new(otherEpochLogPosition, 1, Guid.NewGuid()),
+			new(firstEpoch.EpochPosition, firstEpoch.EpochNumber, firstEpoch.EpochId)
+		};
+
+		(_, _replicaManager) = await AddSubscription(_replicaId, true, _replicaEpochs.ToArray(),
+			_replicaEpochs[1].EpochPosition, token);
+	}
+
+	[Test]
+	public void subscription_is_sent_replica_subscribed_message_for_epoch_after_common_epoch() {
+		var message = GetTcpSendsFor(_replicaManager).Select(x => x.Message).First();
+
+		Assert.IsInstanceOf<ReplicationMessage.ReplicaSubscribed>(message);
+		var subscribed = (ReplicationMessage.ReplicaSubscribed)message;
+		Assert.AreEqual(_replicaEpochs[0].EpochPosition, subscribed.SubscriptionPosition);
+		Assert.AreEqual(_replicaId, subscribed.SubscriptionId);
+		Assert.AreEqual(LeaderId, subscribed.LeaderId);
+	}
+}
+
+public class when_replica_subscribes_with_additional_epoch_past_leaders_writer_checkpoint<TLogFormat, TStreamId>
+	: with_replication_service_and_epoch_manager<TLogFormat, TStreamId> {
+	private readonly Guid _replicaId = Guid.NewGuid();
+	private TcpConnectionManager _replicaManager;
+	private List<Epoch> _replicaEpochs;
+
+	public override async Task When(CancellationToken token) {
+		await EpochManager.WriteNewEpoch(0, token);
+		await Writer.Write(CreateLogRecord(0), token);
+		await Writer.Write(CreateLogRecord(1), token);
+		await Writer.Write(CreateLogRecord(2), token);
+		await Writer.Write(CreateLogRecord(3), token);
+		await Writer.Write(CreateLogRecord(4), token);
+		await EpochManager.WriteNewEpoch(1, token);
+
+		var subscribePosition = Writer.Position + 1000;
+		_replicaEpochs = new List<Epoch> {
+			new Epoch(subscribePosition, 2, Guid.NewGuid()),
+		};
+		_replicaEpochs.AddRange((await EpochManager.GetLastEpochs(10, token))
+			.Select(e => new Epoch(e.EpochPosition, e.EpochNumber, e.EpochId)).ToList());
+
+		(_, _replicaManager) =
+			await AddSubscription(_replicaId, true, _replicaEpochs.ToArray(), subscribePosition, token);
+	}
+
+	[Test]
+	public void subscription_is_sent_replica_subscribed_message_for_leaders_writer_checkpoint() {
+		var message = GetTcpSendsFor(_replicaManager).Select(x => x.Message).First();
+
+		Assert.IsInstanceOf<ReplicationMessage.ReplicaSubscribed>(message);
+		var subscribed = (ReplicationMessage.ReplicaSubscribed)message;
+		Assert.AreEqual(Writer.Position, subscribed.SubscriptionPosition);
+		Assert.AreEqual(_replicaId, subscribed.SubscriptionId);
+		Assert.AreEqual(LeaderId, subscribed.LeaderId);
+	}
+}
+
+public class when_replica_subscribes_with_additional_epoch_and_leader_has_epoch_after_common_epoch<TLogFormat, TStreamId>
+	: with_replication_service_and_epoch_manager<TLogFormat, TStreamId> {
+	private readonly Guid _replicaId = Guid.NewGuid();
+	private TcpConnectionManager _replicaManager;
+	private List<Epoch> _replicaEpochs;
+
+	public override async Task When(CancellationToken token) {
+		await EpochManager.WriteNewEpoch(0, token);
+		await Writer.Write(CreateLogRecord(0), token);
+		await Writer.Write(CreateLogRecord(1), token);
+		await Writer.Write(CreateLogRecord(2), token);
+		await EpochManager.WriteNewEpoch(1, token);
+		await Writer.Write(CreateLogRecord(3), token);
+		await Writer.Write(CreateLogRecord(4), token);
+		await EpochManager.WriteNewEpoch(4, token);
+
+		var subscribePosition = Writer.Position + 1000;
+		_replicaEpochs = new List<Epoch> {
+			new Epoch(subscribePosition, 2, Guid.NewGuid()),
+		};
+		_replicaEpochs.AddRange((await EpochManager.GetLastEpochs(10, token))
+			.Where(e => e.EpochNumber < 4)
+			.Select(e => new Epoch(e.EpochPosition, e.EpochNumber, e.EpochId)).ToList());
+
+		(_, _replicaManager) =
+			await AddSubscription(_replicaId, true, _replicaEpochs.ToArray(), subscribePosition, token);
+	}
+
+	[Test]
+	public void subscription_is_sent_replica_subscribed_message_for_leaders_epoch_after_common_epoch() {
+		var message = GetTcpSendsFor(_replicaManager).Select(x => x.Message).First();
+
+		Assert.IsInstanceOf<ReplicationMessage.ReplicaSubscribed>(message);
+		var subscribed = (ReplicationMessage.ReplicaSubscribed)message;
+		Assert.AreEqual(EpochManager.GetLastEpoch().EpochPosition, subscribed.SubscriptionPosition);
+		Assert.AreEqual(_replicaId, subscribed.SubscriptionId);
+		Assert.AreEqual(LeaderId, subscribed.LeaderId);
+	}
+}
+
+public class when_replica_subscribes_with_uncached_epoch<TLogFormat, TStreamId>
+	: with_replication_service_and_epoch_manager<TLogFormat, TStreamId> {
+	private readonly Guid _replicaId = Guid.NewGuid();
+	private TcpConnectionManager _replicaManager;
+	private List<Epoch> _replicaEpochs;
+
+	public override async Task When(CancellationToken token) {
+		await EpochManager.WriteNewEpoch(0, token);
+		await Writer.Write(CreateLogRecord(0), token);
+		await EpochManager.WriteNewEpoch(1, token);
+
+		// The EpochManager for these tests only caches 5 epochs
+		_replicaEpochs = (await EpochManager.GetLastEpochs(2, token))
+			.Select(e => new Epoch(e.EpochPosition, e.EpochNumber, e.EpochId)).ToList();
+
+		await Writer.Write(CreateLogRecord(1), token);
+		await EpochManager.WriteNewEpoch(2, token);
+		await Writer.Write(CreateLogRecord(2), token);
+		await EpochManager.WriteNewEpoch(3, token);
+		await Writer.Write(CreateLogRecord(3), token);
+		await EpochManager.WriteNewEpoch(4, token);
+		await Writer.Write(CreateLogRecord(4), token);
+		await EpochManager.WriteNewEpoch(5, token);
+		await Writer.Write(CreateLogRecord(5), token);
+		await EpochManager.WriteNewEpoch(6, token);
+
+		(_, _replicaManager) = await AddSubscription(_replicaId, true, _replicaEpochs.ToArray(),
+			_replicaEpochs[0].EpochPosition, token);
+	}
+
+	[Test]
+	public void subscription_is_sent_a_replica_subscribed_message_common_epoch() {
+		var message = GetTcpSendsFor(_replicaManager).Select(x => x.Message).First();
+
+		Assert.IsInstanceOf<ReplicationMessage.ReplicaSubscribed>(message);
+		var subscribed = (ReplicationMessage.ReplicaSubscribed)message;
+		Assert.AreEqual(_replicaEpochs[0].EpochPosition, subscribed.SubscriptionPosition);
+		Assert.AreEqual(_replicaId, subscribed.SubscriptionId);
+		Assert.AreEqual(LeaderId, subscribed.LeaderId);
+	}
+}
+
+public class when_replica_subscribes_with_uncached_epoch_that_does_not_exist_on_leader<TLogFormat, TStreamId>
+	: with_replication_service_and_epoch_manager<TLogFormat, TStreamId> {
+	private readonly Guid _replicaId = Guid.NewGuid();
+	private TcpConnectionManager _replicaManager;
+	private List<Epoch> _replicaEpochs;
+	private EpochRecord[] _uncachedLeaderEpochs;
+
+	public override async Task When(CancellationToken token) {
+		// The EpochManager for these tests only caches 5 epochs
+		// Epochs 2 and 3 don't exist
+		await EpochManager.WriteNewEpoch(0, token);
+		await Writer.Write(CreateLogRecord(0), token);
+		await EpochManager.WriteNewEpoch(1, token);
+		await Writer.Write(CreateLogRecord(1), token);
+
+		_uncachedLeaderEpochs = (await EpochManager.GetLastEpochs(2, token)).ToArray();
+
+		await EpochManager.WriteNewEpoch(4, token);
+		await Writer.Write(CreateLogRecord(2), token);
+		await EpochManager.WriteNewEpoch(5, token);
+		await Writer.Write(CreateLogRecord(3), token);
+		await EpochManager.WriteNewEpoch(6, token);
+		await Writer.Write(CreateLogRecord(4), token);
+		await EpochManager.WriteNewEpoch(7, token);
+		await Writer.Write(CreateLogRecord(5), token);
+		await EpochManager.WriteNewEpoch(8, token);
+
+		_replicaEpochs = new List<Epoch> {
+			new Epoch(_uncachedLeaderEpochs[0].EpochPosition + 8000, 3, Guid.NewGuid()),
+			new Epoch(_uncachedLeaderEpochs[0].EpochPosition + 4000, 2, Guid.NewGuid()),
+			new Epoch(_uncachedLeaderEpochs[0].EpochPosition, _uncachedLeaderEpochs[0].EpochNumber,
+				_uncachedLeaderEpochs[0].EpochId),
+			new Epoch(_uncachedLeaderEpochs[1].EpochPosition, _uncachedLeaderEpochs[1].EpochNumber,
+				_uncachedLeaderEpochs[1].EpochId)
+		};
+
+		(_, _replicaManager) = await AddSubscription(_replicaId, true, _replicaEpochs.ToArray(),
+			_replicaEpochs[0].EpochPosition, token);
+	}
+
+	[Test]
+	public async Task subscription_is_sent_a_replica_subscribed_message_to_epoch_position_after_common_epoch() {
+		var message = GetTcpSendsFor(_replicaManager).Select(x => x.Message).First();
+
+		Assert.IsInstanceOf<ReplicationMessage.ReplicaSubscribed>(message);
+		var subscribed = (ReplicationMessage.ReplicaSubscribed)message;
+		Assert.AreEqual((await EpochManager.GetLastEpochs(5, CancellationToken.None)).First(x => x.EpochNumber == 4).EpochPosition, subscribed.SubscriptionPosition);
+		Assert.AreEqual(_replicaId, subscribed.SubscriptionId);
+		Assert.AreEqual(LeaderId, subscribed.LeaderId);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/LeaderReplication/when_replication_service_has_replica_disconnected.cs b/src/KurrentDB.Core.Tests/Services/Replication/LeaderReplication/when_replication_service_has_replica_disconnected.cs
new file mode 100644
index 00000000000..b18cb2c75ee
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/LeaderReplication/when_replication_service_has_replica_disconnected.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.LeaderReplication;
+
+[TestFixture]
+public class when_replication_service_has_replica_disconnected : with_replication_service {
+
+	public override void When() {
+		ReplicaManager1.Stop();
+		AssertEx.IsOrBecomesTrue(() => ReplicaManager1.IsClosed);
+
+		//trigger main processing loop
+		var writePos = DbConfig.WriterCheckpoint.Read();
+		DbConfig.WriterCheckpoint.Write(writePos + 100);
+		DbConfig.WriterCheckpoint.Flush();
+	}
+
+	[Test]
+	public void vnode_disconnected_should_be_published() {
+		AssertEx.IsOrBecomesTrue(() => ReplicaLostMessages.Count == 1, msg: "ReplicaLost msg not received");
+		Assert.True(ReplicaLostMessages.TryDequeue(out var lost));
+
+		Assert.AreEqual(ReplicaId, lost.SubscriptionId);
+	}
+
+	[Test]
+	public void post_disconnect_replica_Log_written_to_should_not_be_published() {
+		AssertEx.IsOrBecomesTrue(() => ReplicaLostMessages.Count == 1, msg: "ReplicaLost msg not received");
+		var replicationLogPosition = DbConfig.WriterCheckpoint.Read() + 200;
+		Service.Handle(new ReplicationMessage.ReplicaLogPositionAck(ReplicaId, replicationLogPosition, replicationLogPosition));
+
+		Assert.True(ReplicaWriteAcks.Count == 0, $"Got unexpected ReplicaLogAck Message");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/LeaderReplication/when_replication_service_recieves_leader_log_commited_to.cs b/src/KurrentDB.Core.Tests/Services/Replication/LeaderReplication/when_replication_service_recieves_leader_log_commited_to.cs
new file mode 100644
index 00000000000..f5315ad79dd
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/LeaderReplication/when_replication_service_recieves_leader_log_commited_to.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.LeaderReplication;
+
+[TestFixture]
+public class when_replication_service_recieves_leader_log_commited_to : with_replication_service {
+	private long _logPosition;
+
+	public override void When() {
+		_logPosition = 4000;
+		Service.Handle(new ReplicationTrackingMessage.ReplicatedTo(_logPosition));
+	}
+
+	[Test]
+	public void replicated_to_should_be_sent_to_subscriptions() {
+		AssertEx.IsOrBecomesTrue(() => TcpSends.Count > 4, msg: "TcpSend msg not recieved");
+		var sends = TcpSends.Where(tcpSend => tcpSend.Message is ReplicationTrackingMessage.ReplicatedTo).ToList();
+		Assert.AreEqual(4 * 2, sends.Count); //one ReplicatedTo message in sent when the subscription is added and the second one in When()
+		Assert.AreEqual(2, sends.Count(msg => msg.ConnectionManager.ConnectionId == ReplicaSubscriptionId));
+		Assert.AreEqual(2, sends.Count(msg => msg.ConnectionManager.ConnectionId == ReplicaSubscriptionId2));
+		Assert.AreEqual(2, sends.Count(msg => msg.ConnectionManager.ConnectionId == ReadOnlyReplicaSubscriptionId));
+		Assert.AreEqual(2, sends.Count(msg => msg.ConnectionManager.ConnectionId == ReplicaSubscriptionIdV0));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/LeaderReplication/when_replication_service_recieves_replica_log_position_ack.cs b/src/KurrentDB.Core.Tests/Services/Replication/LeaderReplication/when_replication_service_recieves_replica_log_position_ack.cs
new file mode 100644
index 00000000000..554fe6c64aa
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/LeaderReplication/when_replication_service_recieves_replica_log_position_ack.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.LeaderReplication;
+
+[TestFixture]
+public class when_replication_service_receives_replica_log_position_ack_subscription_v0 : with_replication_service {
+	private long _replicationLogPosition;
+	private long _writerLogPosition;
+
+	public override void When() {
+		_replicationLogPosition = 4000;
+		_writerLogPosition = 3000;
+		Service.Handle(new ReplicationMessage.ReplicaLogPositionAck(ReplicaIdV0, _replicationLogPosition, _writerLogPosition));
+	}
+
+	[Test]
+	public void replica_Log_written_to_should_be_published() {
+		AssertEx.IsOrBecomesTrue(() => ReplicaWriteAcks.Count == 1, msg: "ReplicaLogWrittenTo msg not received");
+		Assert.True(ReplicaWriteAcks.TryDequeue(out var commit));
+
+		Assert.AreEqual(ReplicaIdV0, commit.SubscriptionId);
+		Assert.AreEqual(_replicationLogPosition, commit.ReplicationLogPosition);
+	}
+}
+
+[TestFixture]
+public class when_replication_service_receives_replica_log_position_ack_subscription_v1 : with_replication_service {
+	private long _replicationLogPosition;
+	private long _writerLogPosition;
+
+	public override void When() {
+		_replicationLogPosition = 4000;
+		_writerLogPosition = 3000;
+		Service.Handle(new ReplicationMessage.ReplicaLogPositionAck(ReplicaId, _replicationLogPosition, _writerLogPosition));
+	}
+
+	[Test]
+	public void replica_Log_written_to_should_be_published() {
+		AssertEx.IsOrBecomesTrue(() => ReplicaWriteAcks.Count == 1, msg: "ReplicaLogWrittenTo msg not received");
+		Assert.True(ReplicaWriteAcks.TryDequeue(out var commit));
+
+		Assert.AreEqual(ReplicaId, commit.SubscriptionId);
+		Assert.AreEqual(_writerLogPosition, commit.ReplicationLogPosition);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/LeaderReplication/with_replication_service.cs b/src/KurrentDB.Core.Tests/Services/Replication/LeaderReplication/with_replication_service.cs
new file mode 100644
index 00000000000..6eb201542d2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/LeaderReplication/with_replication_service.cs
@@ -0,0 +1,157 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext;
+using KurrentDB.Core.Authentication.InternalAuthentication;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Replication;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.Core.Tests.Authentication;
+using KurrentDB.Core.Tests.Authorization;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Tests.Services.ElectionsService;
+using KurrentDB.Core.Tests.Services.Transport.Tcp;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.LeaderReplication;
+
+public abstract class with_replication_service : SpecificationWithDirectoryPerTestFixture {
+	protected string EventStreamId = "test_stream";
+	protected int ClusterSize = 3;
+	protected SynchronousScheduler Publisher = new("publisher");
+	protected SynchronousScheduler TcpSendPublisher = new("tcpSend");
+	protected LeaderReplicationService Service;
+	protected ConcurrentQueue<ReplicationTrackingMessage.ReplicaWriteAck> ReplicaWriteAcks = new ConcurrentQueue<ReplicationTrackingMessage.ReplicaWriteAck>();
+	protected ConcurrentQueue<SystemMessage.VNodeConnectionLost> ReplicaLostMessages = new ConcurrentQueue<SystemMessage.VNodeConnectionLost>();
+	protected ConcurrentQueue<TcpMessage.TcpSend> TcpSends = new ConcurrentQueue<TcpMessage.TcpSend>();
+	private int _connectionPendingSendBytesThreshold = 10 * 1024;
+	private int _connectionQueueSizeThreshold = 50000;
+	protected Guid LeaderId = Guid.NewGuid();
+	protected Guid ReplicaId = Guid.NewGuid();
+	protected Guid ReplicaId2 = Guid.NewGuid();
+	protected Guid ReadOnlyReplicaId = Guid.NewGuid();
+	protected Guid ReplicaIdV0 = Guid.NewGuid();
+
+	protected Guid ReplicaSubscriptionId;
+	protected Guid ReplicaSubscriptionId2;
+	protected Guid ReadOnlyReplicaSubscriptionId;
+	protected Guid ReplicaSubscriptionIdV0;
+
+	protected TcpConnectionManager ReplicaManager1;
+	protected TcpConnectionManager ReplicaManager2;
+	protected TcpConnectionManager ReadOnlyReplicaManager;
+	protected TcpConnectionManager ReplicaManagerV0;
+
+	protected TFChunkDbConfig DbConfig;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		Publisher.Subscribe(new AdHocHandler<ReplicationTrackingMessage.ReplicaWriteAck>(msg => ReplicaWriteAcks.Enqueue(msg)));
+		Publisher.Subscribe(new AdHocHandler<SystemMessage.VNodeConnectionLost>(msg => ReplicaLostMessages.Enqueue(msg)));
+		TcpSendPublisher.Subscribe(new AdHocHandler<TcpMessage.TcpSend>(msg => TcpSends.Enqueue(msg)));
+
+		DbConfig = CreateDbConfig();
+		var db = new TFChunkDb(DbConfig);
+		await db.Open();
+		Service = new LeaderReplicationService(
+			publisher: Publisher,
+			instanceId: LeaderId,
+			db: db,
+			tcpSendPublisher: TcpSendPublisher,
+			epochManager: new FakeEpochManager(),
+			clusterSize: ClusterSize,
+			unsafeAllowSurplusNodes: false,
+			queueStatsManager: new QueueStatsManager());
+
+		Service.Handle(new SystemMessage.SystemStart());
+		Service.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+
+		(ReplicaSubscriptionId, ReplicaManager1) = await AddSubscription(ReplicaId, ReplicationSubscriptionVersions.V_CURRENT, true);
+		(ReplicaSubscriptionId2, ReplicaManager2) = await AddSubscription(ReplicaId2, ReplicationSubscriptionVersions.V_CURRENT, true);
+		(ReadOnlyReplicaSubscriptionId, ReadOnlyReplicaManager) = await AddSubscription(ReadOnlyReplicaId, ReplicationSubscriptionVersions.V_CURRENT, false);
+		(ReplicaSubscriptionIdV0, ReplicaManagerV0) = await AddSubscription(ReplicaIdV0, ReplicationSubscriptionVersions.V0, true);
+
+		When();
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await base.TestFixtureTearDown();
+		Service.Handle(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), true, true));
+	}
+
+	private async ValueTask<(Guid, TcpConnectionManager)> AddSubscription(Guid replicaId, int version, bool isPromotable, CancellationToken token = default) {
+		var tcpConn = new DummyTcpConnection() { ConnectionId = replicaId };
+
+		var manager = new TcpConnectionManager(
+			"Test Subscription Connection manager", TcpServiceType.External, new ClientTcpDispatcher(2000),
+			new SynchronousScheduler(), tcpConn, new SynchronousScheduler(),
+			new InternalAuthenticationProvider(InMemoryBus.CreateTest(),
+				new IODispatcher(new SynchronousScheduler(), new NoopEnvelope()),
+				new StubPasswordHashAlgorithm(), 1, false, DefaultData.DefaultUserOptions),
+			new AuthorizationGateway(new TestAuthorizationProvider()),
+			TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10), (man, err) => { },
+			_connectionPendingSendBytesThreshold, _connectionQueueSizeThreshold);
+		var subRequest = new ReplicationMessage.ReplicaSubscriptionRequest(
+			Guid.NewGuid(),
+			new NoopEnvelope(),
+			manager,
+			version,
+			0,
+			Guid.NewGuid(),
+			new Epoch[0],
+			PortsHelper.GetLoopback(),
+			LeaderId,
+			replicaId,
+			isPromotable);
+		await Service.As<IAsyncHandle<ReplicationMessage.ReplicaSubscriptionRequest>>().HandleAsync(subRequest, token);
+		return (tcpConn.ConnectionId, manager);
+	}
+
+
+	public abstract void When();
+	protected void BecomeLeader() {
+		Service.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+	}
+
+	protected void BecomeUnknown() {
+		Service.Handle(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
+	}
+
+	private TFChunkDbConfig CreateDbConfig() {
+		ICheckpoint writerChk = new InMemoryCheckpoint(Checkpoint.Writer);
+		ICheckpoint chaserChk = new InMemoryCheckpoint(Checkpoint.Chaser);
+		ICheckpoint epochChk = new InMemoryCheckpoint(Checkpoint.Epoch, initValue: -1);
+		ICheckpoint proposalChk = new InMemoryCheckpoint(Checkpoint.Proposal, initValue: -1);
+		ICheckpoint truncateChk = new InMemoryCheckpoint(Checkpoint.Truncate, initValue: -1);
+		ICheckpoint replicationCheckpoint = new InMemoryCheckpoint(-1);
+		ICheckpoint indexCheckpoint = new InMemoryCheckpoint(-1);
+		ICheckpoint streamExistenceFilterCheckpoint = new InMemoryCheckpoint(-1);
+		var nodeConfig = new TFChunkDbConfig(
+			PathName,
+			1000,
+			10000,
+			writerChk,
+			chaserChk,
+			epochChk,
+			proposalChk,
+			truncateChk,
+			replicationCheckpoint,
+			indexCheckpoint,
+			streamExistenceFilterCheckpoint,
+			true);
+		return nodeConfig;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/LeaderReplication/with_replication_service_and_epoch_manager.cs b/src/KurrentDB.Core.Tests/Services/Replication/LeaderReplication/with_replication_service_and_epoch_manager.cs
new file mode 100644
index 00000000000..d694f8fafcf
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/LeaderReplication/with_replication_service_and_epoch_manager.cs
@@ -0,0 +1,182 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext;
+using KurrentDB.Core.Authentication.InternalAuthentication;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Replication;
+using KurrentDB.Core.Services.Storage.EpochManager;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.Core.Tests.Authentication;
+using KurrentDB.Core.Tests.Authorization;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Tests.Services.Transport.Tcp;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.LeaderReplication;
+
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public abstract class with_replication_service_and_epoch_manager<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private const int _connectionPendingSendBytesThreshold = 10 * 1024;
+	private const int _connectionQueueSizeThreshold = 50000;
+
+	protected int ClusterSize = 3;
+	protected SynchronousScheduler Publisher = new("publisher");
+	protected SynchronousScheduler TcpSendPublisher = new("tcpSend");
+	protected LeaderReplicationService Service;
+	protected ConcurrentQueue<TcpMessage.TcpSend> TcpSends = new ConcurrentQueue<TcpMessage.TcpSend>();
+	protected LogFormatAbstractor<TStreamId> _logFormat;
+	protected Guid LeaderId = Guid.NewGuid();
+
+	protected TFChunkDbConfig DbConfig;
+	protected EpochManager<TStreamId> EpochManager;
+	protected TFChunkDb Db;
+	protected TFChunkWriter Writer;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var indexDirectory = GetFilePathFor("index");
+		_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
+			IndexDirectory = indexDirectory,
+		});
+
+		TcpSendPublisher.Subscribe(new AdHocHandler<TcpMessage.TcpSend>(msg => TcpSends.Enqueue(msg)));
+
+		DbConfig = CreateDbConfig();
+		Db = new TFChunkDb(DbConfig);
+		await Db.Open();
+
+		Writer = new TFChunkWriter(Db);
+		await Writer.Open(CancellationToken.None);
+
+		EpochManager = new EpochManager<TStreamId>(
+			Publisher,
+			5,
+			DbConfig.EpochCheckpoint,
+			Writer,
+			1, 1,
+			() => new TFChunkReader(Db, Db.Config.WriterCheckpoint),
+			_logFormat.RecordFactory,
+			_logFormat.StreamNameIndex,
+			_logFormat.EventTypeIndex,
+			_logFormat.CreatePartitionManager(
+				reader: new TFChunkReader(Db, Db.Config.WriterCheckpoint),
+				writer: Writer),
+			Guid.NewGuid());
+		Service = new LeaderReplicationService(
+			Publisher,
+			LeaderId,
+			Db,
+			TcpSendPublisher,
+			EpochManager,
+			ClusterSize,
+			false,
+			new QueueStatsManager());
+
+		Service.Handle(new SystemMessage.SystemStart());
+		Service.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+
+		await When();
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		_logFormat?.Dispose();
+		await base.TestFixtureTearDown();
+		Service.Handle(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), true, true));
+	}
+
+	public IPrepareLogRecord<TStreamId> CreateLogRecord(long eventNumber, string data = "*************") {
+		var tStreamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventType = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		return LogRecord.Prepare(_logFormat.RecordFactory, Writer.Position, Guid.NewGuid(), Guid.NewGuid(), 0, 0,
+			tStreamId, eventNumber, PrepareFlags.None, eventType, Encoding.UTF8.GetBytes(data),
+			null, DateTime.UtcNow);
+	}
+
+	public async ValueTask<(Guid, TcpConnectionManager)> AddSubscription(Guid replicaId, bool isPromotable,
+		Epoch[] epochs, long logPosition, CancellationToken token = default) {
+		var tcpConn = new DummyTcpConnection() { ConnectionId = replicaId };
+
+		var manager = new TcpConnectionManager(
+			"Test Subscription Connection manager", TcpServiceType.External, new ClientTcpDispatcher(2_000),
+			new SynchronousScheduler(), tcpConn, new SynchronousScheduler(),
+			new InternalAuthenticationProvider(InMemoryBus.CreateTest(),
+				new IODispatcher(new SynchronousScheduler(), new NoopEnvelope()),
+				new StubPasswordHashAlgorithm(), 1, false, DefaultData.DefaultUserOptions),
+			new AuthorizationGateway(new TestAuthorizationProvider()),
+			TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10), (man, err) => { },
+			_connectionPendingSendBytesThreshold, _connectionQueueSizeThreshold);
+		var subRequest = new ReplicationMessage.ReplicaSubscriptionRequest(
+			Guid.NewGuid(),
+			new NoopEnvelope(),
+			manager,
+			ReplicationSubscriptionVersions.V_CURRENT,
+			logPosition,
+			Guid.NewGuid(),
+			epochs,
+			PortsHelper.GetLoopback(),
+			LeaderId,
+			replicaId,
+			isPromotable);
+		await Service.As<IAsyncHandle<ReplicationMessage.ReplicaSubscriptionRequest>>()
+			.HandleAsync(subRequest, token);
+		return (tcpConn.ConnectionId, manager);
+	}
+
+	public abstract Task When(CancellationToken token = default);
+
+	public TcpMessage.TcpSend[] GetTcpSendsFor(TcpConnectionManager connection) {
+		var sentMessages = new List<TcpMessage.TcpSend>();
+		while (TcpSends.TryDequeue(out var msg)) {
+			if (msg.ConnectionManager == connection)
+				sentMessages.Add(msg);
+		}
+
+		return sentMessages.ToArray();
+	}
+
+	private TFChunkDbConfig CreateDbConfig() {
+		ICheckpoint writerChk = new InMemoryCheckpoint(Checkpoint.Writer);
+		ICheckpoint chaserChk = new InMemoryCheckpoint(Checkpoint.Chaser);
+		ICheckpoint epochChk = new InMemoryCheckpoint(Checkpoint.Epoch, initValue: -1);
+		ICheckpoint proposalChk = new InMemoryCheckpoint(Checkpoint.Proposal, initValue: -1);
+		ICheckpoint truncateChk = new InMemoryCheckpoint(Checkpoint.Truncate, initValue: -1);
+		ICheckpoint replicationCheckpoint = new InMemoryCheckpoint(-1);
+		ICheckpoint indexCheckpoint = new InMemoryCheckpoint(-1);
+		ICheckpoint streamExistenceFilterCheckpoint = new InMemoryCheckpoint(-1);
+		var nodeConfig = new TFChunkDbConfig(
+			PathName,
+			chunkSize: 1000,
+			maxChunksCacheSize: 10000,
+			writerChk,
+			chaserChk,
+			epochChk,
+			proposalChk,
+			truncateChk,
+			replicationCheckpoint,
+			indexCheckpoint,
+			streamExistenceFilterCheckpoint,
+			inMemDb: true);
+		return nodeConfig;
+	}
+}
diff --git a/src/EventStore.Core.Tests/Services/Replication/LogReplication/AdHocReplicaController.cs b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/AdHocReplicaController.cs
similarity index 91%
rename from src/EventStore.Core.Tests/Services/Replication/LogReplication/AdHocReplicaController.cs
rename to src/KurrentDB.Core.Tests/Services/Replication/LogReplication/AdHocReplicaController.cs
index ecc469a6d84..7f310853bbf 100644
--- a/src/EventStore.Core.Tests/Services/Replication/LogReplication/AdHocReplicaController.cs
+++ b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/AdHocReplicaController.cs
@@ -1,14 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Metrics;
-using EventStore.Core.Services.VNode;
-
-namespace EventStore.Core.Tests.Services.Replication.LogReplication;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.VNode;
+
+namespace KurrentDB.Core.Tests.Services.Replication.LogReplication;
 
 internal class AdHocReplicaController<TStreamId> : IAsyncHandle<Message> {
 	private readonly IQueuedHandler _inputQueue;
diff --git a/src/EventStore.Core.Tests/Services/Replication/LogReplication/InterceptorCheckpoint.cs b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/InterceptorCheckpoint.cs
similarity index 75%
rename from src/EventStore.Core.Tests/Services/Replication/LogReplication/InterceptorCheckpoint.cs
rename to src/KurrentDB.Core.Tests/Services/Replication/LogReplication/InterceptorCheckpoint.cs
index 274cb162466..d9d76e07838 100644
--- a/src/EventStore.Core.Tests/Services/Replication/LogReplication/InterceptorCheckpoint.cs
+++ b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/InterceptorCheckpoint.cs
@@ -1,8 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
-using EventStore.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Checkpoint;
 
-namespace EventStore.Core.Tests.Services.Replication.LogReplication;
+namespace KurrentDB.Core.Tests.Services.Replication.LogReplication;
 
 internal class InterceptorCheckpoint : ICheckpoint {
 	private readonly ICheckpoint _wrapped;
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/LeaderInfo.cs b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/LeaderInfo.cs
new file mode 100644
index 00000000000..b914095e28f
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/LeaderInfo.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Services.Replication;
+using KurrentDB.Core.Services.Storage;
+using KurrentDB.Core.Services.Storage.EpochManager;
+using KurrentDB.Core.TransactionLog.Chunks;
+
+namespace KurrentDB.Core.Tests.Services.Replication.LogReplication;
+
+internal record LeaderInfo<TStreamId> {
+	public TFChunkDb Db { get; init; }
+	public IPublisher Publisher { get; init; }
+	public LeaderReplicationService ReplicationService { get; init; }
+	public IEpochManager EpochManager { get; init; }
+	public MemberInfo MemberInfo { get; init; }
+	public StorageWriterService<TStreamId> Writer { get; init; }
+}
diff --git a/src/EventStore.Core.Tests/Services/Replication/LogReplication/LogReplicationFixture.cs b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/LogReplicationFixture.cs
similarity index 82%
rename from src/EventStore.Core.Tests/Services/Replication/LogReplication/LogReplicationFixture.cs
rename to src/KurrentDB.Core.Tests/Services/Replication/LogReplication/LogReplicationFixture.cs
index cc12f009fbd..73ef00d29db 100644
--- a/src/EventStore.Core.Tests/Services/Replication/LogReplication/LogReplicationFixture.cs
+++ b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/LogReplicationFixture.cs
@@ -1,40 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
-using EventStore.Core.Authentication.PassthroughAuthentication;
-using EventStore.Core.Authorization;
-using EventStore.Core.Bus;
-using EventStore.Core.Cluster;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Metrics;
-using EventStore.Core.Services;
-using EventStore.Core.Services.Replication;
-using EventStore.Core.Services.Storage;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.Tests.Services.ElectionsService;
-using EventStore.Core.Tests.Services.Storage;
-using EventStore.Core.Tests.Services.Storage.ReadIndex;
-using EventStore.Core.Time;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.TransactionLog.LogRecords;
+using DotNext.Runtime.CompilerServices;
+using KurrentDB.Core.Authentication.PassthroughAuthentication;
+using KurrentDB.Core.Authorization;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Replication;
+using KurrentDB.Core.Services.Storage;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Tests.Services.ElectionsService;
+using KurrentDB.Core.Tests.Services.Storage;
+using KurrentDB.Core.Tests.Services.Storage.ReadIndex;
+using KurrentDB.Core.Time;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
 using NUnit.Framework;
 using Serilog;
-using Serilog.Events;
 
-namespace EventStore.Core.Tests.Services.Replication.LogReplication;
+namespace KurrentDB.Core.Tests.Services.Replication.LogReplication;
 
 public abstract class LogReplicationFixture<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
 	private const int ClusterSize = 3;
 	private readonly EndPoint FakeEndPoint = new IPEndPoint(IPAddress.Loopback, 5555);
 
-	private readonly Disposables _disposables = new();
+	private Scope _disposables = new();
 	private LeaderInfo<TStreamId> _leaderInfo;
 	private ReplicaInfo<TStreamId> _replicaInfo;
 
@@ -48,7 +50,6 @@ private TFChunkDb CreateDb(string path) {
 
 		var dbConfig = new TFChunkDbConfig(
 			path: dbPath,
-			fileNamingStrategy: new VersionedPatternFileNamingStrategy(dbPath, "chunk-"),
 			chunkSize: ChunkSize,
 			maxChunksCacheSize: 2 * ChunkSize,
 			writerCheckpoint: new InterceptorCheckpoint(new InMemoryCheckpoint()),
@@ -96,13 +97,11 @@ private StorageWriterService<TStreamId> CreateStorageWriter(TFChunkDb db, ISubsc
 			flushDurationTracker: new ZeroDurationTracker(), // to force a flush on each write to easily detect when a write is complete
 			getLastIndexedPosition: () => -1);
 
-		storageWriterService.Start();
-
 		return storageWriterService;
 	}
 
-	private LeaderInfo<TStreamId> CreateLeader(TFChunkDb db) {
-		db.Open(createNewChunks: true);
+	private async ValueTask<LeaderInfo<TStreamId>> CreateLeader(TFChunkDb db, CancellationToken token) {
+		await db.Open(createNewChunks: true, token: token);
 
 		// we don't need a controller here, so we use the same bus for subscribing and publishing
 		var subscribeBus = new SynchronousScheduler("subscribeBus");
@@ -113,6 +112,8 @@ private LeaderInfo<TStreamId> CreateLeader(TFChunkDb db) {
 			inputBus: subscribeBus,
 			outputBus: publishBus);
 
+		await writer.Start(token);
+
 		var port = PortsHelper.GetAvailablePort(IPAddress.Loopback);
 		var networkSendBus = new SynchronousScheduler("networkSendBus");
 		var dispatcher = new InternalTcpDispatcher(writeTimeout: TimeSpan.FromSeconds(5));
@@ -191,8 +192,8 @@ private LeaderInfo<TStreamId> CreateLeader(TFChunkDb db) {
 		};
 	}
 
-	private ReplicaInfo<TStreamId> CreateReplica(TFChunkDb db, LeaderInfo<TStreamId> leaderInfo) {
-		db.Open(createNewChunks: false);
+	private async ValueTask<ReplicaInfo<TStreamId>> CreateReplica(TFChunkDb db, LeaderInfo<TStreamId> leaderInfo, CancellationToken token) {
+		await db.Open(createNewChunks: false, token: token);
 
 		var subscribeBus = new SynchronousScheduler("subscribeBus");
 		var adhocReplicaController = new AdHocReplicaController<TStreamId>(subscribeBus, leaderInfo);
@@ -204,6 +205,8 @@ private ReplicaInfo<TStreamId> CreateReplica(TFChunkDb db, LeaderInfo<TStreamId>
 			inputBus: replicationInterceptor.Bus,
 			outputBus: publishBus);
 
+		await writer.Start(token);
+
 		var epochManager = new FakeEpochManager();
 		var networkSendBus = new SynchronousScheduler("networkSendBus");
 
@@ -286,21 +289,23 @@ public override Task TestFixtureSetUp() {
 	public virtual async Task SetUp() {
 		var runId = Guid.NewGuid();
 
-		var leaderDb = CreateDb($"leader-{runId}").DisposeWith(_disposables);
-		var replicaDb = CreateDb($"replica-{runId}").DisposeWith(_disposables);
+		var leaderDb = CreateDb($"leader-{runId}");
+		var replicaDb = CreateDb($"replica-{runId}");
+		_disposables.RegisterForDisposeAsync(leaderDb);
+		_disposables.RegisterForDisposeAsync(replicaDb);
 
 		await SetUpDbs(leaderDb, replicaDb);
 
-		_leaderInfo = CreateLeader(leaderDb);
-		_replicaInfo = CreateReplica(replicaDb, _leaderInfo);
+		_leaderInfo = await CreateLeader(leaderDb, CancellationToken.None);
+		_replicaInfo = await CreateReplica(replicaDb, _leaderInfo, CancellationToken.None);
 
-		AddEpoch(epochNumber: 0, epochPosition: 0);
+		await AddEpoch(epochNumber: 0, epochPosition: 0);
 		StartLeader();
 	}
 
 	protected virtual Task SetUpDbs(TFChunkDb leaderDb, TFChunkDb replicaDb) => Task.CompletedTask;
 
-	private void AddEpoch(int epochNumber, long epochPosition) {
+	private async ValueTask AddEpoch(int epochNumber, long epochPosition, CancellationToken token = default) {
 		var epoch = new EpochRecord(
 			epochPosition: epochPosition,
 			epochNumber: epochNumber,
@@ -309,13 +314,13 @@ private void AddEpoch(int epochNumber, long epochPosition) {
 			timeStamp: DateTime.Now,
 			leaderInstanceId: Guid.Empty);
 
-		_leaderInfo.EpochManager.CacheEpoch(epoch);
-		_replicaInfo.EpochManager.CacheEpoch(epoch);
+		await _leaderInfo.EpochManager.CacheEpoch(epoch, token);
+		await _replicaInfo.EpochManager.CacheEpoch(epoch, token);
 	}
 
 	private Event[] CreateEvents(string streamId, string[] eventDatas) {
 		var events = new Event[eventDatas.Length];
-		for(var i = 0; i < events.Length; i++)
+		for (var i = 0; i < events.Length; i++)
 			events[i] = new Event(Guid.NewGuid(), "type", false, eventDatas[i], null);
 
 		return events;
@@ -327,7 +332,7 @@ protected Task<long> WriteEvents(string streamId, params string[] eventDatas) {
 			streamId: streamId,
 			events: events,
 			publisher: _leaderInfo.Publisher,
-			writerChk: (InterceptorCheckpoint) _leaderInfo.Db.Config.WriterCheckpoint,
+			writerChk: (InterceptorCheckpoint)_leaderInfo.Db.Config.WriterCheckpoint,
 			chunkSize: _leaderInfo.Db.Config.ChunkSize);
 	}
 
@@ -337,11 +342,11 @@ protected Task<long> WriteEventsToReplica(string streamId, params string[] event
 			streamId: streamId,
 			events: events,
 			publisher: _replicaInfo.Publisher,
-			writerChk: (InterceptorCheckpoint) _replicaInfo.Db.Config.WriterCheckpoint,
+			writerChk: (InterceptorCheckpoint)_replicaInfo.Db.Config.WriterCheckpoint,
 			chunkSize: _replicaInfo.Db.Config.ChunkSize);
 	}
 
-	private Task<long> WriteEvents (
+	private Task<long> WriteEvents(
 		string streamId,
 		Event[] events,
 		IPublisher publisher,
@@ -460,8 +465,8 @@ protected void VerifyCheckpoints(int expectedCheckpoints) =>
 			expectedReplicaCheckpoints: expectedCheckpoints);
 
 	protected void VerifyCheckpoints(int expectedLeaderCheckpoints, int expectedReplicaCheckpoints) {
-		var leaderCheckpoints = ((InterceptorCheckpoint) _leaderInfo.Db.Config.WriterCheckpoint).Values.ToArray();
-		var replicaCheckpoints = ((InterceptorCheckpoint) _replicaInfo.Db.Config.WriterCheckpoint).Values.ToArray();
+		var leaderCheckpoints = ((InterceptorCheckpoint)_leaderInfo.Db.Config.WriterCheckpoint).Values.ToArray();
+		var replicaCheckpoints = ((InterceptorCheckpoint)_replicaInfo.Db.Config.WriterCheckpoint).Values.ToArray();
 
 		Assert.AreEqual(expectedLeaderCheckpoints, leaderCheckpoints.Length);
 		Assert.AreEqual(expectedReplicaCheckpoints, replicaCheckpoints.Length);
@@ -469,7 +474,7 @@ protected void VerifyCheckpoints(int expectedLeaderCheckpoints, int expectedRepl
 		Assert.AreEqual(leaderCheckpoints[..replicaCheckpoints.Length], replicaCheckpoints);
 	}
 
-	protected void VerifyDB(int expectedLogicalChunks) {
+	protected async ValueTask VerifyDB(int expectedLogicalChunks, CancellationToken token) {
 		var numChunksOnLeader = _leaderInfo.Db.Manager.ChunksCount;
 		var numChunksOnReplica = _replicaInfo.Db.Manager.ChunksCount;
 		var atChunkBoundary = _leaderInfo.Db.Config.WriterCheckpoint.Read() % _leaderInfo.Db.Config.ChunkSize == 0;
@@ -482,22 +487,22 @@ protected void VerifyDB(int expectedLogicalChunks) {
 		Assert.AreEqual(expectedLogicalChunks, numChunksOnReplica);
 
 		for (var chunkNum = 0; chunkNum < expectedLogicalChunks;) {
-			var leaderChunk = _leaderInfo.Db.Manager.GetChunk(chunkNum);
-			var replicaChunk = _replicaInfo.Db.Manager.GetChunk(chunkNum);
+			var leaderChunk = await _leaderInfo.Db.Manager.GetInitializedChunk(chunkNum, token);
+			var replicaChunk = await _replicaInfo.Db.Manager.GetInitializedChunk(chunkNum, token);
 
 			VerifyHeader(leaderChunk.ChunkHeader, replicaChunk.ChunkHeader);
-			var leaderData = ReadChunkData(leaderChunk.FileName, excludeChecksum: leaderChunk.ChunkFooter != null);
-			var replicaData = ReadChunkData(replicaChunk.FileName, excludeChecksum: replicaChunk.ChunkFooter != null);
-			Assert.True(leaderData.SequenceEqual(replicaData));
+			var leaderData = ReadChunkData(leaderChunk.LocalFileName, excludeChecksum: leaderChunk.ChunkFooter != null);
+			var replicaData = ReadChunkData(replicaChunk.LocalFileName, excludeChecksum: replicaChunk.ChunkFooter != null);
+			Assert.True(leaderData.Span.SequenceEqual(replicaData.Span));
 
 			chunkNum = leaderChunk.ChunkHeader.ChunkEndNumber + 1;
 		}
 
 		if (atChunkBoundary) {
 			// verify that the chunk data is empty on the leader
-			var leaderChunk = _leaderInfo.Db.Manager.GetChunk(expectedLogicalChunks);
-			var leaderData = ReadChunkData(leaderChunk.FileName, excludeChecksum: false);
-			Assert.True(leaderData.SequenceEqual(new byte[leaderData.Length]));
+			var leaderChunk = await _leaderInfo.Db.Manager.GetInitializedChunk(expectedLogicalChunks, token);
+			var leaderData = ReadChunkData(leaderChunk.LocalFileName, excludeChecksum: false);
+			Assert.True(leaderData.Span.SequenceEqual(new byte[leaderData.Length]));
 		}
 	}
 
@@ -505,13 +510,14 @@ private void VerifyHeader(ChunkHeader header1, ChunkHeader header2) {
 		Assert.True(header1.AsByteArray().SequenceEqual(header2.AsByteArray()));
 	}
 
-	private static ReadOnlySpan<byte> ReadChunkData(string fileName, bool excludeChecksum) {
+	private static ReadOnlyMemory<byte> ReadChunkData(string fileName, bool excludeChecksum) {
 		using var fs = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, 4096, FileOptions.SequentialScan);
 		var fi = new FileInfo(fileName);
-		var data = new byte[fi.Length].AsSpan();
+		var data = new byte[fi.Length].AsMemory();
 
-		int pos = 0; int read;
-		while ((read = fs.Read(data[pos..])) > 0)
+		int pos = 0;
+		int read;
+		while ((read = fs.Read(data.Span[pos..])) > 0)
 			pos += read;
 
 		return excludeChecksum ? data[TFConsts.ChunkHeaderSize..^ChunkFooter.ChecksumSize] : data[TFConsts.ChunkHeaderSize..];
@@ -527,8 +533,6 @@ public virtual Task TearDown() {
 		_leaderInfo.Publisher.Publish(shutdownMsg);
 		_replicaInfo.Publisher.Publish(shutdownMsg);
 
-		_disposables?.Dispose();
-
-		return Task.CompletedTask;
+		return _disposables.DisposeAsync().AsTask();
 	}
 }
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/LogReplicationWithExistingDbFixture.cs b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/LogReplicationWithExistingDbFixture.cs
new file mode 100644
index 00000000000..75b01377a97
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/LogReplicationWithExistingDbFixture.cs
@@ -0,0 +1,149 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.Transforms;
+using KurrentDB.Core.Transforms.Identity;
+
+namespace KurrentDB.Core.Tests.Services.Replication.LogReplication;
+
+public abstract class LogReplicationWithExistingDbFixture<TLogFormat, TStreamId> : LogReplicationFixture<TLogFormat, TStreamId> {
+	private readonly Random _random = new();
+	protected LogFormatAbstractor<TStreamId> LogFormat;
+	protected const int DataSize = 3333;
+
+	protected override async Task SetUpDbs(TFChunkDb leaderDb, TFChunkDb replicaDb) {
+		await CreateChunks(leaderDb);
+	}
+
+	protected abstract Task CreateChunks(TFChunkDb leaderDb);
+
+	protected static async Task CreateChunk(TFChunkDb db, bool raw, bool complete, int chunkStartNumber, int chunkEndNumber, ILogRecord[] logRecords, CancellationToken token = default) {
+		var filename = db.Manager.FileSystem.LocalNamingStrategy.GetFilenameFor(chunkStartNumber, raw ? 1 : 0);
+
+		if (raw && !complete)
+			throw new InvalidOperationException("A raw chunk must be complete");
+
+		if (!raw && chunkStartNumber != chunkEndNumber)
+			throw new InvalidOperationException(
+				$"{nameof(chunkStartNumber)} should be equal to {nameof(chunkEndNumber)} for non-raw chunks");
+
+		var header = new ChunkHeader(
+			version: TFChunk.CurrentChunkVersion,
+			minCompatibleVersion: TFChunk.CurrentChunkVersion,
+			chunkSize: ChunkSize,
+			chunkStartNumber: chunkStartNumber,
+			chunkEndNumber: chunkEndNumber,
+			isScavenged: raw,
+			chunkId: Guid.NewGuid(),
+			transformType: TransformType.Identity);
+
+		var chunk = await TFChunk.CreateWithHeader(
+			db.Manager.FileSystem,
+			filename: filename,
+			header: header,
+			fileSize: TFChunk.GetAlignedSize(db.Config.ChunkSize + ChunkHeader.Size + ChunkFooter.Size),
+			inMem: false,
+			unbuffered: db.Config.Unbuffered,
+			writethrough: db.Config.WriteThrough,
+			reduceFileCachePressure: db.Config.ReduceFileCachePressure,
+			tracker: new TFChunkTracker.NoOp(),
+			transformFactory: new IdentityChunkTransformFactory(),
+			getTransformFactory: DbTransformManager.Default,
+			transformHeader: ReadOnlyMemory<byte>.Empty,
+			token);
+
+		var posMaps = new List<PosMap>();
+
+		for (var i = 0; i < logRecords.Length; i++) {
+			var logRecord = logRecords[i];
+			var logicalPos = chunk.ChunkHeader.GetLocalLogPosition(logRecord.LogPosition);
+			var actualPos = chunk.RawWriterPosition - ChunkHeader.Size;
+			var writeResult = await chunk.TryAppend(logRecord, token);
+
+			if (!writeResult.Success)
+				throw new Exception("Failed to append log record");
+
+			var writerPos = chunk.ChunkHeader.ChunkStartPosition + writeResult.NewPosition;
+
+			// move the (intercepted) writer checkpoint to the expected positions so that they can be compared with the
+			// replica's writer checkpoints during tests
+			if (!raw &&
+				(logRecord.IsTransactionBoundary() /* complete transaction */
+				 || i == logRecords.Length - 1)) /* incomplete transaction at the end of a chunk - commit for backwards compatibility */
+				db.Config.WriterCheckpoint.Write(writerPos);
+
+			posMaps.Add(new PosMap(logicalPos, actualPos));
+		}
+
+		if (raw)
+			await chunk.CompleteScavenge(posMaps, token);
+		else if (complete)
+			await chunk.Complete(token);
+		else
+			await chunk.Flush(token);
+
+		if (complete)
+			db.Config.WriterCheckpoint.Write(chunk.ChunkHeader.ChunkEndPosition);
+
+		chunk.Dispose();
+		chunk.WaitForDestroy(0);
+	}
+
+	private ILogRecord CreatePrepare(long logPosition, PrepareFlags flags) {
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		var data = new byte[DataSize];
+		_random.NextBytes(data);
+
+		return LogFormat.RecordFactory.CreatePrepare(
+			logPosition: logPosition,
+			correlationId: Guid.NewGuid(),
+			eventId: Guid.NewGuid(),
+			transactionPosition: 0,
+			transactionOffset: 0,
+			eventStreamId: streamId,
+			expectedVersion: 0,
+			timeStamp: DateTime.UtcNow,
+			flags: flags,
+			eventType: eventTypeId,
+			data: data,
+			metadata: ReadOnlyMemory<byte>.Empty
+		);
+	}
+
+	protected ILogRecord[] GenerateLogRecords(int chunkNumber, int[] transactionSizes, out long writerPos) {
+		var logPosition = chunkNumber * ChunkSize;
+
+		var logRecords = new List<ILogRecord>();
+		foreach (var transactionSize in transactionSizes) {
+			// a negative transaction size represents an incomplete transaction
+			var incomplete = transactionSize < 0;
+			var txSize = Math.Abs(transactionSize);
+
+			for (var i = 0; i < txSize; i++) {
+				var flags = PrepareFlags.Data | PrepareFlags.IsCommitted;
+				if (i == 0)
+					flags |= PrepareFlags.TransactionBegin;
+				if (!incomplete && i == txSize - 1)
+					flags |= PrepareFlags.TransactionEnd;
+				var logRecord = CreatePrepare(logPosition, flags);
+				logPosition += logRecord.GetSizeWithLengthPrefixAndSuffix();
+				logRecords.Add(logRecord);
+			}
+		}
+
+		writerPos = logPosition;
+
+		return logRecords.ToArray();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/ReplicaInfo.cs b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/ReplicaInfo.cs
new file mode 100644
index 00000000000..aad3d0f366b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/ReplicaInfo.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Services.Replication;
+using KurrentDB.Core.Services.Storage;
+using KurrentDB.Core.Services.Storage.EpochManager;
+using KurrentDB.Core.TransactionLog.Chunks;
+
+namespace KurrentDB.Core.Tests.Services.Replication.LogReplication;
+
+internal record ReplicaInfo<TStreamId> {
+	public TFChunkDb Db { get; init; }
+	public IPublisher Publisher { get; init; }
+	public ReplicaService ReplicaService { get; init; }
+	public IEpochManager EpochManager { get; init; }
+	public StorageWriterService<TStreamId> Writer { get; init; }
+	public Func<int> GetNumWriterFlushes { get; init; }
+	public ReplicationInterceptor ReplicationInterceptor { get; init; }
+	public AutoResetEvent ConnectionEstablished { get; init; }
+	public Func<long> GetReplicationPosition { get; init; }
+	public Action ResetSubscription { get; init; }
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/ReplicationAck.cs b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/ReplicationAck.cs
new file mode 100644
index 00000000000..0245dbfea5f
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/ReplicationAck.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Tests.Services.Replication.LogReplication;
+
+internal record ReplicationAck {
+	public long ReplicationPosition { get; init; }
+	public long WriterPosition { get; init; }
+}
diff --git a/src/EventStore.Core.Tests/Services/Replication/LogReplication/ReplicationInterceptor.cs b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/ReplicationInterceptor.cs
similarity index 80%
rename from src/EventStore.Core.Tests/Services/Replication/LogReplication/ReplicationInterceptor.cs
rename to src/KurrentDB.Core.Tests/Services/Replication/LogReplication/ReplicationInterceptor.cs
index e425ae97b7f..0b01accb4ff 100644
--- a/src/EventStore.Core.Tests/Services/Replication/LogReplication/ReplicationInterceptor.cs
+++ b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/ReplicationInterceptor.cs
@@ -1,8 +1,11 @@
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
 
-namespace EventStore.Core.Tests.Services.Replication.LogReplication;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Tests.Services.Replication.LogReplication;
 
 internal class ReplicationInterceptor : WriterInterceptor {
 	private record DataChunkInterceptionInfo {
@@ -37,17 +40,16 @@ private void PauseIfConditionsAreMet(Message message, int bytesToAdd) {
 		if (Paused)
 			return;
 
-		switch (message)
-		{
+		switch (message) {
 			case ReplicationMessage.DataChunkBulk dataChunkBulk:
 				if (dataChunkBulk.SubscriptionPosition + dataChunkBulk.DataBytes.Length + bytesToAdd >
-				    _dataInfo.MaxLogPosition)
+					_dataInfo.MaxLogPosition)
 					Pause();
 				break;
 			case ReplicationMessage.RawChunkBulk rawChunkBulk:
 				if (rawChunkBulk.ChunkStartNumber == _rawInfo.ChunkStartNumber &&
-				    rawChunkBulk.ChunkEndNumber == _rawInfo.ChunkEndNumber &&
-				    rawChunkBulk.RawPosition + rawChunkBulk.RawBytes.Length + bytesToAdd > _rawInfo.MaxRawPosition)
+					rawChunkBulk.ChunkEndNumber == _rawInfo.ChunkEndNumber &&
+					rawChunkBulk.RawPosition + rawChunkBulk.RawBytes.Length + bytesToAdd > _rawInfo.MaxRawPosition)
 					Pause();
 				break;
 		}
diff --git a/src/EventStore.Core.Tests/Services/Replication/LogReplication/Tests/data_chunk_replication.cs b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/Tests/data_chunk_replication.cs
similarity index 92%
rename from src/EventStore.Core.Tests/Services/Replication/LogReplication/Tests/data_chunk_replication.cs
rename to src/KurrentDB.Core.Tests/Services/Replication/LogReplication/Tests/data_chunk_replication.cs
index b9dc41512c9..28bc5c9e1c1 100644
--- a/src/EventStore.Core.Tests/Services/Replication/LogReplication/Tests/data_chunk_replication.cs
+++ b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/Tests/data_chunk_replication.cs
@@ -1,10 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
-using EventStore.Core.Services.Replication;
+using KurrentDB.Core.Services.Replication;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Services.Replication.LogReplication.Tests;
+namespace KurrentDB.Core.Tests.Services.Replication.LogReplication.Tests;
 
 [TestFixture(typeof(LogFormat.V2), typeof(string))]
 [TestFixture(typeof(LogFormat.V3), typeof(uint))]
@@ -34,7 +38,7 @@ public async Task correctly_checkpoints_a_transaction_of_one_event() {
 		await ConnectReplica();
 		await Replicated();
 		VerifyCheckpoints(1);
-		VerifyDB(1);
+		await VerifyDB(1, CancellationToken.None);
 	}
 
 	[Test]
@@ -44,7 +48,7 @@ public async Task correctly_checkpoints_a_transaction_of_two_events() {
 		await ConnectReplica();
 		await Replicated();
 		VerifyCheckpoints(1);
-		VerifyDB(1);
+		await VerifyDB(1, CancellationToken.None);
 	}
 
 	[Test]
@@ -55,7 +59,7 @@ public async Task correctly_checkpoints_two_transactions_of_two_events() {
 		await ConnectReplica();
 		await Replicated();
 		VerifyCheckpoints(2);
-		VerifyDB(1);
+		await VerifyDB(1, CancellationToken.None);
 	}
 
 	[Test]
@@ -66,7 +70,7 @@ public async Task correctly_checkpoints_two_transactions_of_two_events_to_differ
 		await ConnectReplica();
 		await Replicated();
 		VerifyCheckpoints(2);
-		VerifyDB(1);
+		await VerifyDB(1, CancellationToken.None);
 	}
 
 	[Test]
@@ -82,7 +86,7 @@ public async Task correctly_checkpoints_when_interrupted_at_chunk_bulk_0_then_re
 		await ReconnectReplica(pauseReplication: false);
 		await Replicated();
 		VerifyCheckpoints(1);
-		VerifyDB(1);
+		await VerifyDB(1, CancellationToken.None);
 	}
 
 	[Test]
@@ -98,7 +102,7 @@ public async Task correctly_checkpoints_when_interrupted_at_chunk_bulk_1_then_re
 		await ReconnectReplica(pauseReplication: false);
 		await Replicated();
 		VerifyCheckpoints(1);
-		VerifyDB(1);
+		await VerifyDB(1, CancellationToken.None);
 	}
 
 	[Test]
@@ -119,7 +123,7 @@ public async Task correctly_checkpoints_when_interrupted_at_chunk_bulk_2_then_re
 		await ReconnectReplica(pauseReplication: false);
 		await Replicated();
 		VerifyCheckpoints(6);
-		VerifyDB(1);
+		await VerifyDB(1, CancellationToken.None);
 	}
 
 	[Test]
@@ -153,7 +157,7 @@ public async Task correctly_checkpoints_when_interrupted_and_resumed_multiple_ti
 		await ReconnectReplica(pauseReplication: false);
 		await Replicated();
 		VerifyCheckpoints(7);
-		VerifyDB(1);
+		await VerifyDB(1, CancellationToken.None);
 	}
 
 	[Test]
@@ -173,7 +177,7 @@ public async Task correctly_checkpoints_when_interrupted_in_the_middle_of_a_tran
 		await ReconnectReplica(pauseReplication: false);
 		await Replicated();
 		VerifyCheckpoints(2);
-		VerifyDB(1);
+		await VerifyDB(1, CancellationToken.None);
 	}
 
 	[Test]
@@ -192,7 +196,7 @@ public async Task correctly_checkpoints_when_replicating_multiple_chunk_files()
 		await ConnectReplica();
 		await Replicated();
 		VerifyCheckpoints(numChunksToFill + numTransactions);
-		VerifyDB(4 + 1);
+		await VerifyDB(4 + 1, CancellationToken.None);
 	}
 
 	[Test]
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/Tests/data_chunk_replication_with_existing_db.cs b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/Tests/data_chunk_replication_with_existing_db.cs
new file mode 100644
index 00000000000..229800aac22
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/Tests/data_chunk_replication_with_existing_db.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.LogReplication.Tests;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class data_chunk_replication_with_existing_db<TLogFormat, TStreamId> : LogReplicationWithExistingDbFixture<TLogFormat, TStreamId> {
+	private const int NumCheckpoints = 5 + /* chunk 0-0 (non-raw): 3 complete transactions, 1 incomplete transaction
+	                                          at end (checkpointed for backwards compatibility), 1 chunk completion */
+									   0   /* chunk 1-1 (non-raw): 0 complete transactions */;
+
+	private const int NumLogicalChunks = 2;
+
+	protected override async Task CreateChunks(TFChunkDb db) {
+		LogFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
+			IndexDirectory = Path.Combine(db.Config.Path, "index")
+		});
+
+		var recs0 = GenerateLogRecords(0, new[] { 1, -3, 2, -1, 3, -5 }, out _);
+		var recs1 = GenerateLogRecords(1, Array.Empty<int>(), out _);
+
+		await CreateChunk(db, raw: false, complete: true, 0, 0, recs0);
+		await CreateChunk(db, raw: false, complete: false, 1, 1, recs1);
+
+		db.Config.WriterCheckpoint.Flush();
+	}
+
+
+	[Test]
+	public async Task can_replicate() {
+		await ConnectReplica();
+		await Replicated();
+
+		VerifyCheckpoints(NumCheckpoints);
+		await VerifyDB(NumLogicalChunks, CancellationToken.None);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/Tests/raw_chunk_replication.cs b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/Tests/raw_chunk_replication.cs
new file mode 100644
index 00000000000..cffd87a96d1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/Tests/raw_chunk_replication.cs
@@ -0,0 +1,147 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.LogReplication.Tests;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class raw_chunk_replication<TLogFormat, TStreamId> : LogReplicationWithExistingDbFixture<TLogFormat, TStreamId> {
+	private const int NumCheckpoints = 1 + /* chunk 0-0 (raw): 1 chunk completion */
+									   1 + /* chunk 1-2 (raw): 1 chunk completion */
+									   4 + /* chunk 3-3 (non-raw): 3 complete transactions, 1 chunk completion */
+									   6 + /* chunk 4-4 (non-raw): 4 complete transactions, 1 incomplete
+	                                          transaction at end (checkpointed for backwards compatibility), 1 chunk completion */
+									   1 + /* chunk 5-5 (raw): 1 chunk completion */
+									   1 + /* chunk 6-9 (raw): 1 chunk completion */
+									   2   /* chunk 10-10 (non-raw): 2 complete transactions */;
+
+	private const int NumLogicalChunks = 11;
+
+	protected override async Task CreateChunks(TFChunkDb db) {
+		LogFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
+			IndexDirectory = Path.Combine(db.Config.Path, "index")
+		});
+
+		var recs0 = GenerateLogRecords(0, new[] { 1, -3, 2, 3 }, out _);
+		var recs1 = GenerateLogRecords(1, new[] { 2, 2, 1, 2, 7, -3 }, out _);
+		var recs3 = GenerateLogRecords(3, new[] { 3, -3, 3, 3 }, out _);
+		var recs4 = GenerateLogRecords(4, new[] { 4, 3, 2, 1, -2 }, out _);
+		var recs5 = GenerateLogRecords(5, new[] { -5 }, out _);
+		var recs6 = GenerateLogRecords(6, new[] { 1, 1, 1, 1, -1 }, out _);
+		var recs10 = GenerateLogRecords(10, new[] { 1, 2 }, out _);
+
+		await CreateChunk(db, raw: true, complete: true, 0, 0, recs0);
+		await CreateChunk(db, raw: true, complete: true, 1, 2, recs1);
+		await CreateChunk(db, raw: false, complete: true, 3, 3, recs3);
+		await CreateChunk(db, raw: false, complete: true, 4, 4, recs4);
+		await CreateChunk(db, raw: true, complete: true, 5, 5, recs5);
+		await CreateChunk(db, raw: true, complete: true, 6, 9, recs6);
+		await CreateChunk(db, raw: false, complete: false, 10, 10, recs10);
+
+		db.Config.WriterCheckpoint.Flush();
+	}
+
+
+	[Test]
+	public async Task can_replicate() {
+		await ConnectReplica();
+		await Replicated();
+
+		VerifyCheckpoints(NumCheckpoints);
+		await VerifyDB(NumLogicalChunks, CancellationToken.None);
+	}
+
+	[Test]
+	public async Task can_replicate_when_interrupted_in_raw_chunk_then_resumed() {
+		await ConnectReplica(pauseReplication: true);
+		await ResumeReplicationUntil(
+			rawChunkStartNumber: 1,
+			rawChunkEndNumber: 2,
+			maxRawPosition: TFConsts.ChunkHeaderSize + DataSize * 3,
+			expectedFlushes: 1);
+
+		VerifyCheckpoints(
+			expectedLeaderCheckpoints: NumCheckpoints,
+			expectedReplicaCheckpoints: 1);
+
+		await ReconnectReplica();
+		await Replicated();
+
+		VerifyCheckpoints(NumCheckpoints);
+		await VerifyDB(NumLogicalChunks, CancellationToken.None);
+	}
+
+	[Test]
+	public async Task can_replicate_when_interrupted_at_boundary_of_raw_chunk_with_complete_transactions_then_resumed() {
+		await ConnectReplica(pauseReplication: true);
+		await ResumeReplicationUntil(
+			rawChunkStartNumber: 1,
+			rawChunkEndNumber: 2,
+			maxRawPosition: 0,
+			expectedFlushes: 1);
+
+		VerifyCheckpoints(
+			expectedLeaderCheckpoints: NumCheckpoints,
+			expectedReplicaCheckpoints: 1);
+
+		await ReconnectReplica();
+		await Replicated();
+
+		VerifyCheckpoints(NumCheckpoints);
+		await VerifyDB(NumLogicalChunks, CancellationToken.None);
+	}
+
+	[Test]
+	public async Task can_replicate_when_interrupted_at_boundary_of_raw_chunk_with_incomplete_transactions_then_resumed() {
+		await ConnectReplica(pauseReplication: true);
+		await ResumeReplicationUntil(maxLogPosition: 3 * ChunkSize, expectedFlushes: 2);
+
+		VerifyCheckpoints(
+			expectedLeaderCheckpoints: NumCheckpoints,
+			expectedReplicaCheckpoints: 2);
+
+		await ReconnectReplica();
+		await Replicated();
+
+		VerifyCheckpoints(NumCheckpoints);
+		await VerifyDB(NumLogicalChunks, CancellationToken.None);
+	}
+
+	[Test]
+	public async Task can_replicate_when_interrupted_at_boundary_of_raw_chunk_with_no_transactions_then_resumed() {
+		await ConnectReplica(pauseReplication: true);
+		await ResumeReplicationUntil(
+			rawChunkStartNumber: 6,
+			rawChunkEndNumber: 9,
+			maxRawPosition: 0,
+			expectedFlushes: 15);
+
+		VerifyCheckpoints(
+			expectedLeaderCheckpoints: NumCheckpoints,
+			expectedReplicaCheckpoints: 13);
+
+		await ReconnectReplica();
+		await Replicated();
+
+		VerifyCheckpoints(NumCheckpoints);
+		await VerifyDB(NumLogicalChunks, CancellationToken.None);
+	}
+
+	[Test]
+	public async Task can_replicate_when_interrupted_in_data_chunk_then_resumed() {
+		await ConnectReplica(pauseReplication: true);
+		await ResumeReplicationUntil(maxLogPosition: 3 * ChunkSize + 5 * DataSize, expectedFlushes: 4);
+
+		await ReconnectReplica();
+		await Replicated();
+
+		VerifyCheckpoints(NumCheckpoints);
+		await VerifyDB(NumLogicalChunks, CancellationToken.None);
+	}
+}
diff --git a/src/EventStore.Core.Tests/Services/Replication/LogReplication/WriterInterceptor.cs b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/WriterInterceptor.cs
similarity index 89%
rename from src/EventStore.Core.Tests/Services/Replication/LogReplication/WriterInterceptor.cs
rename to src/KurrentDB.Core.Tests/Services/Replication/LogReplication/WriterInterceptor.cs
index 2ffc2d85531..91708c4ec5a 100644
--- a/src/EventStore.Core.Tests/Services/Replication/LogReplication/WriterInterceptor.cs
+++ b/src/KurrentDB.Core.Tests/Services/Replication/LogReplication/WriterInterceptor.cs
@@ -1,12 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
 
-namespace EventStore.Core.Tests.Services.Replication.LogReplication;
+namespace KurrentDB.Core.Tests.Services.Replication.LogReplication;
 
-internal class WriterInterceptor:
+internal class WriterInterceptor :
 	IHandle<SystemMessage.SystemInit>,
 	IHandle<SystemMessage.StateChangeMessage>,
 	IHandle<SystemMessage.WriteEpoch>,
@@ -74,7 +77,7 @@ public WriterInterceptor(ISubscriber subscriber) {
 	public void Handle(MonitoringMessage.InternalStatsRequest message) => Process(message);
 	public void Handle(ReplicationMessage.ReplicaSubscribed message) => Process(message);
 	public void Handle(ReplicationMessage.CreateChunk message) => Process(message);
-	public void Handle(ReplicationMessage.RawChunkBulk message)  => Process(message);
+	public void Handle(ReplicationMessage.RawChunkBulk message) => Process(message);
 	public void Handle(ReplicationMessage.DataChunkBulk message) => Process(message);
 
 	protected virtual void Process(Message message) {
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReadOnlyReplica/connecting_to_read_only_replica.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReadOnlyReplica/connecting_to_read_only_replica.cs
new file mode 100644
index 00000000000..ef6cd298cbe
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReadOnlyReplica/connecting_to_read_only_replica.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Tests.Integration;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReadOnlyReplica;
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class connecting_to_read_only_replica<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
+	protected override MiniClusterNode<TLogFormat, TStreamId> CreateNode(int index, Endpoints endpoints, EndPoint[] gossipSeeds,
+		bool wait = true) {
+		var isReadOnly = index == 2;
+		var node = new MiniClusterNode<TLogFormat, TStreamId>(
+			PathName, index, endpoints.InternalTcp,
+			endpoints.ExternalTcp, endpoints.HttpEndPoint, gossipSeeds, inMemDb: false,
+			readOnlyReplica: isReadOnly);
+		if (wait && !isReadOnly)
+			WaitIdle();
+		return node;
+	}
+
+	protected override IEventStoreConnection CreateConnection() {
+		var settings = ConnectionSettings.Create()
+			.DisableServerCertificateValidation()
+			.PerformOnAnyNode();
+		return EventStoreConnection.Create(settings, _nodes[2].ExternalTcpEndPoint);
+	}
+
+	[Test]
+	public async Task append_to_stream_should_fail_with_not_supported_exception() {
+		const string stream = "append_to_stream_should_fail_with_not_supported_exception";
+		await AssertEx.ThrowsAsync<OperationNotSupportedException>(
+			() => _conn.AppendToStreamAsync(stream, ExpectedVersion.Any, TestEvent.NewTestEvent()));
+	}
+
+	[Test]
+	public async Task delete_stream_should_fail_with_not_supported_exception() {
+		const string stream = "delete_stream_should_fail_with_not_supported_exception";
+		await AssertEx.ThrowsAsync<OperationNotSupportedException>(() =>
+			_conn.DeleteStreamAsync(stream, ExpectedVersion.Any));
+	}
+
+	[Test]
+	public async Task start_transaction_should_fail_with_not_supported_exception() {
+		const string stream = "start_transaction_should_fail_with_not_supported_exception";
+		await AssertEx.ThrowsAsync<OperationNotSupportedException>(() =>
+			_conn.StartTransactionAsync(stream, ExpectedVersion.Any));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTestHelper.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTestHelper.cs
new file mode 100644
index 00000000000..acbc8c2e4b2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTestHelper.cs
@@ -0,0 +1,167 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication;
+
+public static class ReplicationTestHelper {
+	private static TimeSpan _timeout = TimeSpan.FromSeconds(20);
+
+	public static ClientMessage.WriteEventsCompleted WriteEvent<TLogFormat, TStreamId>(
+		MiniClusterNode<TLogFormat, TStreamId> node, Event[] events,
+		string streamId) {
+		var resetEvent = new ManualResetEventSlim();
+		ClientMessage.WriteEventsCompleted writeResult = null;
+		node.Node.MainQueue.Publish(new ClientMessage.WriteEvents(Guid.NewGuid(), Guid.NewGuid(),
+			new CallbackEnvelope(msg => {
+				writeResult = (ClientMessage.WriteEventsCompleted)msg;
+				resetEvent.Set();
+			}), false, streamId, -1, events,
+			SystemAccounts.System, new Dictionary<string, string> {
+				["uid"] = SystemUsers.Admin,
+				["pwd"] = SystemUsers.DefaultAdminPassword
+			}));
+		if (!resetEvent.Wait(_timeout)) {
+			Assert.Fail("Timed out waiting for event to be written");
+			return null;
+		}
+
+		return writeResult;
+	}
+
+	public static ClientMessage.ReadAllEventsForwardCompleted ReadAllEventsForward<TLogFormat, TStreamId>(
+		MiniClusterNode<TLogFormat, TStreamId> node,
+		long position) {
+		ClientMessage.ReadAllEventsForwardCompleted readResult = null;
+		var readEvent = new ManualResetEventSlim();
+		var done = false;
+		while (!done) {
+			var read = new ClientMessage.ReadAllEventsForward(Guid.NewGuid(), Guid.NewGuid(), new CallbackEnvelope(
+					msg => {
+						readResult = (ClientMessage.ReadAllEventsForwardCompleted)msg;
+						readEvent.Set();
+					}),
+				0, 0, 100, false, false, null, SystemAccounts.System, replyOnExpired: false);
+			node.Node.MainQueue.Publish(read);
+
+			if (!readEvent.Wait(_timeout)) {
+				Assert.Fail("Timed out waiting for events to be read forward");
+				return null;
+			}
+
+			if (readResult.Result == ReadAllResult.Error) {
+				Assert.Fail("Failed to read forwards. Read result error: {0}", readResult.Error);
+				return null;
+			}
+
+			done = readResult.NextPos.CommitPosition > position;
+			readEvent.Reset();
+		}
+
+		return readResult;
+	}
+
+	public static ClientMessage.ReadAllEventsBackwardCompleted ReadAllEventsBackward<TLogFormat, TStreamId>(
+		MiniClusterNode<TLogFormat, TStreamId> node,
+		long position) {
+		ClientMessage.ReadAllEventsBackwardCompleted readResult = null;
+		var resetEvent = new ManualResetEventSlim();
+		var done = false;
+		while (!done) {
+			resetEvent.Reset();
+			var read = new ClientMessage.ReadAllEventsBackward(Guid.NewGuid(), Guid.NewGuid(), new CallbackEnvelope(
+					msg => {
+						readResult = (ClientMessage.ReadAllEventsBackwardCompleted)msg;
+						resetEvent.Set();
+					}),
+				-1, -1, 100, false, false, null, SystemAccounts.System);
+			node.Node.MainQueue.Publish(read);
+
+			if (!resetEvent.Wait(_timeout)) {
+				Assert.Fail("Timed out waiting for events to be read backward");
+				return null;
+			}
+
+			if (readResult.Result == ReadAllResult.Error) {
+				Assert.Fail("Failed to read backwards. Read result error: {0}", readResult.Error);
+				return null;
+			}
+
+			done = readResult.NextPos.CommitPosition < position;
+		}
+
+		return readResult;
+	}
+
+	public static ClientMessage.ReadStreamEventsForwardCompleted ReadStreamEventsForward<TLogFormat, TStreamId>(
+		MiniClusterNode<TLogFormat, TStreamId> node,
+		string streamId) {
+		ClientMessage.ReadStreamEventsForwardCompleted readResult = null;
+		var resetEvent = new ManualResetEventSlim();
+		var read = new ClientMessage.ReadStreamEventsForward(Guid.NewGuid(), Guid.NewGuid(), new CallbackEnvelope(
+				msg => {
+					readResult = (ClientMessage.ReadStreamEventsForwardCompleted)msg;
+					resetEvent.Set();
+				}), streamId, 0, 10,
+			false, false, null, SystemAccounts.System, replyOnExpired: false);
+		node.Node.MainQueue.Publish(read);
+
+		if (!resetEvent.Wait(_timeout)) {
+			Assert.Fail("Timed out waiting for the stream to be read forward");
+			return null;
+		}
+
+		return readResult;
+	}
+
+	public static ClientMessage.ReadStreamEventsBackwardCompleted ReadStreamEventsBackward<TLogFormat, TStreamId>(
+		MiniClusterNode<TLogFormat, TStreamId> node,
+		string streamId) {
+		ClientMessage.ReadStreamEventsBackwardCompleted readResult = null;
+		var resetEvent = new ManualResetEventSlim();
+		var read = new ClientMessage.ReadStreamEventsBackward(Guid.NewGuid(), Guid.NewGuid(), new CallbackEnvelope(
+				msg => {
+					readResult = (ClientMessage.ReadStreamEventsBackwardCompleted)msg;
+					resetEvent.Set();
+				}), streamId, 9, 10,
+			false, false, null, SystemAccounts.System);
+		node.Node.MainQueue.Publish(read);
+
+		if (!resetEvent.Wait(_timeout)) {
+			Assert.Fail("Timed out waiting for the stream to be read backward");
+			return null;
+		}
+
+		return readResult;
+	}
+
+	public static ClientMessage.ReadEventCompleted ReadEvent<TLogFormat, TStreamId>(
+		MiniClusterNode<TLogFormat, TStreamId> node, string streamId,
+		long eventNumber) {
+		ClientMessage.ReadEventCompleted readResult = null;
+		var resetEvent = new ManualResetEventSlim();
+		var read = new ClientMessage.ReadEvent(Guid.NewGuid(), Guid.NewGuid(), new CallbackEnvelope(msg => {
+			readResult = (ClientMessage.ReadEventCompleted)msg;
+			resetEvent.Set();
+		}), streamId, eventNumber,
+			false, false, SystemAccounts.System);
+		node.Node.MainQueue.Publish(read);
+
+		if (!resetEvent.Wait(_timeout)) {
+			Assert.Fail("Timed out waiting for the event to be read");
+			return null;
+		}
+
+		return readResult;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_does_not_receive_leader_write_notifications.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_does_not_receive_leader_write_notifications.cs
new file mode 100644
index 00000000000..da6ab611f6b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_does_not_receive_leader_write_notifications.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+[TestFixture]
+public class when_3_node_cluster_does_not_receive_leader_write_notifications : with_clustered_replication_tracking_service {
+	private long _logPosition = 4000;
+
+	protected override int ClusterSize => 3;
+
+	public override void When() {
+		BecomeLeader();
+		var replicaId1 = Guid.NewGuid();
+		var replicaId2 = Guid.NewGuid();
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(replicaId1, _logPosition));
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(replicaId2, _logPosition));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+	}
+
+	[Test]
+	public void replicated_to_should_not_be_sent() {
+		Assert.AreEqual(0, ReplicatedTos.Count);
+	}
+	[Test]
+	public void replication_checkpoint_should_not_advance() {
+		Assert.AreEqual(0, ReplicationCheckpoint.Read());
+		Assert.AreEqual(0, ReplicationCheckpoint.ReadNonFlushed());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_1_write_notification.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_1_write_notification.cs
new file mode 100644
index 00000000000..5ee86014be3
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_1_write_notification.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+[TestFixture]
+public class when_3_node_cluster_receives_1_write_notification : with_clustered_replication_tracking_service {
+	private long _logPosition = 4000;
+
+	protected override int ClusterSize => 3;
+
+	public override void When() {
+		BecomeLeader();
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(Guid.NewGuid(), _logPosition));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+	}
+
+	[Test]
+	public void replicated_to_should_not_be_sent() {
+		Assert.AreEqual(0, ReplicatedTos.Count);
+	}
+	[Test]
+	public void replication_checkpoint_should_not_advance() {
+		Assert.AreEqual(0, ReplicationCheckpoint.Read());
+		Assert.AreEqual(0, ReplicationCheckpoint.ReadNonFlushed());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_2_write_notifications.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_2_write_notifications.cs
new file mode 100644
index 00000000000..d5751a83233
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_2_write_notifications.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+[TestFixture]
+public class when_3_node_cluster_receives_2_write_notifications : with_clustered_replication_tracking_service {
+	private long _logPosition = 4000;
+	protected override int ClusterSize => 3;
+
+	public override void When() {
+		BecomeLeader();
+		WriterCheckpoint.Write(_logPosition);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(Guid.NewGuid(), _logPosition));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+	}
+
+	[Test]
+	public void replicated_to_should_be_sent() {
+		AssertEx.IsOrBecomesTrue(() => 1 == ReplicatedTos.Count);
+		Assert.True(ReplicatedTos.TryDequeue(out var msg));
+		Assert.AreEqual(_logPosition, msg.LogPosition);
+	}
+	[Test]
+	public void replication_checkpoint_should_advance() {
+		Assert.AreEqual(_logPosition, ReplicationCheckpoint.Read());
+		Assert.AreEqual(_logPosition, ReplicationCheckpoint.ReadNonFlushed());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_2_write_notifications_out_of_order.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_2_write_notifications_out_of_order.cs
new file mode 100644
index 00000000000..eb736eb2afb
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_2_write_notifications_out_of_order.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+[TestFixture]
+public class when_3_node_cluster_receives_2_write_notifications_out_of_order : with_clustered_replication_tracking_service {
+	private long _logPosition = 4000;
+	protected override int ClusterSize => 3;
+
+	public override void When() {
+		BecomeLeader();
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(Guid.NewGuid(), _logPosition));
+		WriterCheckpoint.Write(_logPosition);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+	}
+
+	[Test]
+	public void replicated_to_should_be_sent() {
+		AssertEx.IsOrBecomesTrue(() => 1 == ReplicatedTos.Count);
+		Assert.True(ReplicatedTos.TryDequeue(out var msg));
+		Assert.AreEqual(_logPosition, msg.LogPosition);
+	}
+	[Test]
+	public void replication_checkpoint_should_advance() {
+		Assert.AreEqual(_logPosition, ReplicationCheckpoint.Read());
+		Assert.AreEqual(_logPosition, ReplicationCheckpoint.ReadNonFlushed());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_duplicate_leader_write_notifications.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_duplicate_leader_write_notifications.cs
new file mode 100644
index 00000000000..e306a6fa5b8
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_duplicate_leader_write_notifications.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+[TestFixture]
+public class when_3_node_cluster_receives_duplicate_leader_write_notifications : with_clustered_replication_tracking_service {
+	private long _logPosition = 4000;
+
+	protected override int ClusterSize => 3;
+	public override void When() {
+		BecomeLeader();
+		WriterCheckpoint.Write(_logPosition);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+	}
+
+	[Test]
+	public void replicated_to_should_not_be_sent() {
+		Assert.AreEqual(0, ReplicatedTos.Count);
+	}
+	[Test]
+	public void replication_checkpoint_should_not_advance() {
+		Assert.AreEqual(0, ReplicationCheckpoint.Read());
+		Assert.AreEqual(0, ReplicationCheckpoint.ReadNonFlushed());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_duplicate_replica_write_notifications.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_duplicate_replica_write_notifications.cs
new file mode 100644
index 00000000000..9b4d96bd206
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_duplicate_replica_write_notifications.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+[TestFixture]
+public class when_3_node_cluster_receives_duplicate_replica_write_notifications : with_clustered_replication_tracking_service {
+	private long _logPosition = 4000;
+
+	protected override int ClusterSize => 3;
+
+	public override void When() {
+		BecomeLeader();
+		var replicaId = Guid.NewGuid();
+
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(replicaId, _logPosition));
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(replicaId, _logPosition));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+	}
+
+	[Test]
+	public void replicated_to_should_not_be_sent() {
+		Assert.AreEqual(0, ReplicatedTos.Count);
+	}
+	[Test]
+	public void replication_checkpoint_should_not_advance() {
+		Assert.AreEqual(0, ReplicationCheckpoint.Read());
+		Assert.AreEqual(0, ReplicationCheckpoint.ReadNonFlushed());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_only_leader_write.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_only_leader_write.cs
new file mode 100644
index 00000000000..9ebf63df9f6
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_only_leader_write.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+[TestFixture]
+public class when_3_node_cluster_receives_only_leader_write : with_clustered_replication_tracking_service {
+	private long _logPosition = 4000;
+
+	protected override int ClusterSize => 3;
+
+	public override void When() {
+		BecomeLeader();
+		WriterCheckpoint.Write(_logPosition);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+	}
+
+	[Test]
+	public void replicated_to_should_not_be_sent() {
+		Assert.AreEqual(0, ReplicatedTos.Count);
+	}
+	[Test]
+	public void replication_checkpoint_should_not_advance() {
+		Assert.AreEqual(0, ReplicationCheckpoint.Read());
+		Assert.AreEqual(0, ReplicationCheckpoint.ReadNonFlushed());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_replica_log_overrun.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_replica_log_overrun.cs
new file mode 100644
index 00000000000..6166fcee008
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_replica_log_overrun.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+[TestFixture]
+public class when_3_node_cluster_receives_replica_log_overrun : with_clustered_replication_tracking_service {
+	private long _logPosition = 4000;
+	private long _overrunPosition = 5000;
+
+	protected override int ClusterSize => 3;
+
+	public override void When() {
+		BecomeLeader();
+		var replicaId = Guid.NewGuid();
+		WriterCheckpoint.Write(_logPosition);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(replicaId, _overrunPosition));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+	}
+
+	[Test]
+	public void replicated_to_should_be_sent() {
+		Assert.AreEqual(1, ReplicatedTos.Count);
+		Assert.True(ReplicatedTos.TryDequeue(out var msg));
+		Assert.AreEqual(_logPosition, msg.LogPosition);
+	}
+	[Test]
+	public void replication_checkpoint_should_advance() {
+		Assert.AreEqual(_logPosition, ReplicationCheckpoint.Read());
+		Assert.AreEqual(_logPosition, ReplicationCheckpoint.ReadNonFlushed());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_replica_log_under_run.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_replica_log_under_run.cs
new file mode 100644
index 00000000000..622d599804a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_replica_log_under_run.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+[TestFixture]
+public class when_3_node_cluster_receives_replica_log_under_run : with_clustered_replication_tracking_service {
+	private long _logPosition = 4000;
+	private long _underRunPosition = 3000;
+
+	protected override int ClusterSize => 3;
+
+	public override void When() {
+		BecomeLeader();
+		var replicaId = Guid.NewGuid();
+		WriterCheckpoint.Write(_logPosition);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(replicaId, _underRunPosition));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+	}
+
+	[Test]
+	public void replicated_to_should_be_sent() {
+		Assert.AreEqual(1, ReplicatedTos.Count);
+		Assert.True(ReplicatedTos.TryDequeue(out var msg));
+		Assert.AreEqual(_underRunPosition, msg.LogPosition);
+	}
+	[Test]
+	public void replication_checkpoint_should_advance() {
+		Assert.AreEqual(_underRunPosition, ReplicationCheckpoint.Read());
+		Assert.AreEqual(_underRunPosition, ReplicationCheckpoint.ReadNonFlushed());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_second_ack_from_first_node.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_second_ack_from_first_node.cs
new file mode 100644
index 00000000000..634bfbf720e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_3_node_cluster_receives_second_ack_from_first_node.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+[TestFixture]
+public class when_3_node_cluster_receives_second_ack_from_first_node :
+	with_clustered_replication_tracking_service {
+	private readonly long _firstLogPosition = 2000;
+	private readonly long _secondLogPosition = 4000;
+	private readonly Guid _follower1 = Guid.NewGuid();
+	private readonly Guid _follower2 = Guid.NewGuid();
+
+	protected override int ClusterSize => 3;
+
+	public override void When() {
+		BecomeLeader();
+		// All of the nodes have acked the first write
+		WriterCheckpoint.Write(_firstLogPosition);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_follower1, _firstLogPosition));
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_follower2, _firstLogPosition));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+
+		ReplicatedTos.Clear();
+
+		// Follower 2 has lost connection and does not ack the write
+		WriterCheckpoint.Write(_secondLogPosition);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_follower1, _secondLogPosition));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+	}
+
+	[Test]
+	public void replicated_to_should_be_sent_for_the_second_position() {
+		Assert.True(ReplicatedTos.TryDequeue(out var msg));
+		Assert.AreEqual(_secondLogPosition, msg.LogPosition);
+	}
+
+	[Test]
+	public void replication_checkpoint_should_advance() {
+		Assert.AreEqual(_secondLogPosition, ReplicationCheckpoint.Read());
+		Assert.AreEqual(_secondLogPosition, ReplicationCheckpoint.ReadNonFlushed());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_has_2_lagging_nodes.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_has_2_lagging_nodes.cs
new file mode 100644
index 00000000000..17b2ca45ed3
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_has_2_lagging_nodes.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+
+[TestFixture]
+public class when_5_node_cluster_has_2_lagging_nodes : with_clustered_replication_tracking_service {
+	private readonly long _firstLogPosition = 2000;
+	private readonly long _secondLogPosition = 4000;
+	private Guid[] _followers;
+
+	protected override int ClusterSize => 5;
+
+	public override void When() {
+		_followers = new[] { Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid() };
+		BecomeLeader();
+		// All of the nodes have acked the first write
+		WriterCheckpoint.Write(_firstLogPosition);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		foreach (var follower in _followers) {
+			Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(follower, _firstLogPosition));
+		}
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+
+		ReplicatedTos.Clear();
+
+		// Followers 3 and 4 are lagging behind, they ack the previous positions
+		WriterCheckpoint.Write(_secondLogPosition);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_followers[0], _secondLogPosition));
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_followers[1], _secondLogPosition));
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_followers[2], _firstLogPosition));
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_followers[3], _firstLogPosition));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+	}
+
+	[Test]
+	public void replicated_to_should_be_sent_for_the_second_position() {
+		Assert.True(ReplicatedTos.TryDequeue(out var msg));
+		Assert.AreEqual(_secondLogPosition, msg.LogPosition);
+	}
+
+	[Test]
+	public void replication_checkpoint_should_advance() {
+		Assert.AreEqual(_secondLogPosition, ReplicationCheckpoint.Read());
+		Assert.AreEqual(_secondLogPosition, ReplicationCheckpoint.ReadNonFlushed());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_2_write_notifications.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_2_write_notifications.cs
new file mode 100644
index 00000000000..2b2e8a461fb
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_2_write_notifications.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+[TestFixture]
+public class when_5_node_cluster_receives_2_write_notifications : with_clustered_replication_tracking_service {
+	private long _logPosition = 4000;
+
+	protected override int ClusterSize => 5;
+
+	public override void When() {
+		BecomeLeader();
+		WriterCheckpoint.Write(_logPosition);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(Guid.NewGuid(), _logPosition));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+	}
+
+	[Test]
+	public void replicated_to_should_not_be_sent() {
+		Assert.AreEqual(0, ReplicatedTos.Count);
+	}
+	[Test]
+	public void replication_checkpoint_should_not_advance() {
+		Assert.AreEqual(0, ReplicationCheckpoint.Read());
+		Assert.AreEqual(0, ReplicationCheckpoint.ReadNonFlushed());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_3_write_notifications.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_3_write_notifications.cs
new file mode 100644
index 00000000000..8d23d1db9cb
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_3_write_notifications.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+[TestFixture]
+public class when_5_node_cluster_receives_3_write_notifications : with_clustered_replication_tracking_service {
+	private long _logPosition = 4000;
+	protected override int ClusterSize => 5;
+
+	public override void When() {
+		BecomeLeader();
+		WriterCheckpoint.Write(_logPosition);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		var replicaId = Guid.NewGuid();
+		var replicaId2 = Guid.NewGuid();
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(replicaId, _logPosition));
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(replicaId2, _logPosition));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+	}
+
+	[Test]
+	public void replicated_to_should_be_sent() {
+		Assert.AreEqual(1, ReplicatedTos.Count);
+		Assert.True(ReplicatedTos.TryDequeue(out var msg));
+		Assert.AreEqual(_logPosition, msg.LogPosition);
+	}
+	[Test]
+	public void replication_checkpoint_should_advance() {
+		Assert.AreEqual(_logPosition, ReplicationCheckpoint.Read());
+		Assert.AreEqual(_logPosition, ReplicationCheckpoint.ReadNonFlushed());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_duplicate_write_notifications.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_duplicate_write_notifications.cs
new file mode 100644
index 00000000000..eabac465c0d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_duplicate_write_notifications.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+[TestFixture]
+public class when_5_node_cluster_receives_duplicate_write_notifications : with_clustered_replication_tracking_service {
+	private long _logPosition = 4000;
+
+	protected override int ClusterSize => 5;
+
+	public override void When() {
+		BecomeLeader();
+		WriterCheckpoint.Write(_logPosition);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		var replicaId = Guid.NewGuid();
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(replicaId, _logPosition));
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(replicaId, _logPosition));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+	}
+
+	[Test]
+	public void replicated_to_should_not_be_sent() {
+		Assert.AreEqual(0, ReplicatedTos.Count);
+	}
+	[Test]
+	public void replication_checkpoint_should_not_advance() {
+		Assert.AreEqual(0, ReplicationCheckpoint.Read());
+		Assert.AreEqual(0, ReplicationCheckpoint.ReadNonFlushed());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_after_quorum.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_after_quorum.cs
new file mode 100644
index 00000000000..55840351f78
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_after_quorum.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+[TestFixture]
+public class when_5_node_cluster_receives_replica_lost_after_quorum : with_clustered_replication_tracking_service {
+	private readonly long _logPosition = 4000;
+	private readonly Guid _replica1 = Guid.NewGuid();
+	private readonly Guid _replica2 = Guid.NewGuid();
+
+
+	protected override int ClusterSize => 5;
+
+	public override void When() {
+		BecomeLeader();
+		WriterCheckpoint.Write(_logPosition);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replica1, _logPosition));
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replica2, _logPosition));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+
+		Service.Handle(new SystemMessage.VNodeConnectionLost(
+				PortsHelper.GetLoopback(),
+				Guid.NewGuid(),
+							_replica1));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+	}
+
+	[Test]
+	public void replicated_to_should_be_sent() {
+		AssertEx.IsOrBecomesTrue(() => 1 == ReplicatedTos.Count);
+		Assert.True(ReplicatedTos.TryDequeue(out var msg));
+		Assert.AreEqual(_logPosition, msg.LogPosition);
+	}
+	[Test]
+	public void replication_checkpoint_should_advance() {
+		Assert.AreEqual(_logPosition, ReplicationCheckpoint.Read());
+		Assert.AreEqual(_logPosition, ReplicationCheckpoint.ReadNonFlushed());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_after_quorum_and_continues.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_after_quorum_and_continues.cs
new file mode 100644
index 00000000000..c9cd65681ea
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_after_quorum_and_continues.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+[TestFixture]
+public class when_5_node_cluster_receives_replica_lost_after_quorum_and_continues : with_clustered_replication_tracking_service {
+	private readonly long _logPosition = 4000;
+	private readonly long _logPosition2 = 5000;
+	private readonly Guid _replica1 = Guid.NewGuid();
+	private readonly Guid _replica2 = Guid.NewGuid();
+	private readonly Guid _replica3 = Guid.NewGuid();
+
+
+	protected override int ClusterSize => 5;
+
+	public override void When() {
+		BecomeLeader();
+		WriterCheckpoint.Write(_logPosition);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replica1, _logPosition));
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replica2, _logPosition));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+
+		Service.Handle(new SystemMessage.VNodeConnectionLost(
+				PortsHelper.GetLoopback(),
+				Guid.NewGuid(),
+							_replica1));
+
+		ReplicatedTos.Clear();
+		WriterCheckpoint.Write(_logPosition2);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replica2, _logPosition2));
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replica3, _logPosition2));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+	}
+
+	[Test]
+	public void replicated_to_should_be_sent() {
+		AssertEx.IsOrBecomesTrue(() => 1 == ReplicatedTos.Count);
+		Assert.True(ReplicatedTos.TryDequeue(out var msg));
+		Assert.AreEqual(_logPosition2, msg.LogPosition);
+	}
+	[Test]
+	public void replication_checkpoint_should_advance() {
+		Assert.AreEqual(_logPosition2, ReplicationCheckpoint.Read());
+		Assert.AreEqual(_logPosition2, ReplicationCheckpoint.ReadNonFlushed());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_and_it_rejoins.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_and_it_rejoins.cs
new file mode 100644
index 00000000000..8a171c252b9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_and_it_rejoins.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+[TestFixture]
+public class when_5_node_cluster_receives_replica_lost_and_it_rejoins : with_clustered_replication_tracking_service {
+	//n.b. the replica may get a new id, but we shouldn't fail if it doesn't
+
+	private readonly long _logPosition = 4000;
+	private readonly long _logPosition2 = 5000;
+	private readonly Guid _replicaId1 = Guid.NewGuid();
+	private readonly Guid _replicaId2 = Guid.NewGuid();
+
+	protected override int ClusterSize => 5;
+
+	public override void When() {
+		BecomeLeader();
+		WriterCheckpoint.Write(_logPosition);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replicaId1, _logPosition));
+		Service.Handle(new SystemMessage.VNodeConnectionLost(
+			PortsHelper.GetLoopback(),
+			Guid.NewGuid(),
+			_replicaId1));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent()); //n.b. we still don't have quorum here
+
+		//moving directly to log position 2 after rejoin
+		WriterCheckpoint.Write(_logPosition2);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replicaId1, _logPosition2));
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replicaId2, _logPosition2));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+	}
+
+	[Test]
+	public void replicated_to_should_be_sent() {
+		AssertEx.IsOrBecomesTrue(() => 1 == ReplicatedTos.Count);
+		Assert.True(ReplicatedTos.TryDequeue(out var msg));
+		Assert.AreEqual(_logPosition2, msg.LogPosition);
+	}
+	[Test]
+	public void replication_checkpoint_should_advance() {
+		Assert.AreEqual(_logPosition2, ReplicationCheckpoint.Read());
+		Assert.AreEqual(_logPosition2, ReplicationCheckpoint.ReadNonFlushed());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_before_quorum.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_before_quorum.cs
new file mode 100644
index 00000000000..5f71d7b562c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_before_quorum.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+[TestFixture]
+public class when_5_node_cluster_receives_replica_lost_before_quorum : with_clustered_replication_tracking_service {
+	private readonly long _logPosition = 4000;
+	private readonly Guid _replicaId1 = Guid.NewGuid();
+	private readonly Guid _replicaId2 = Guid.NewGuid();
+	private readonly Guid _replicaId3 = Guid.NewGuid();
+
+
+	protected override int ClusterSize => 5;
+
+	public override void When() {
+		BecomeLeader();
+		WriterCheckpoint.Write(_logPosition);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replicaId1, _logPosition));
+		Service.Handle(new SystemMessage.VNodeConnectionLost(
+			PortsHelper.GetLoopback(),
+			Guid.NewGuid(),
+			_replicaId1));
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replicaId2, _logPosition));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+	}
+
+	[Test]
+	public void replicated_to_should_not_be_sent() {
+		Assert.AreEqual(0, ReplicatedTos.Count);
+	}
+
+	[Test]
+	public void replication_checkpoint_should_not_advance() {
+		Assert.AreEqual(0, ReplicationCheckpoint.Read());
+		Assert.AreEqual(0, ReplicationCheckpoint.ReadNonFlushed());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_before_quorum_and_continues.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_before_quorum_and_continues.cs
new file mode 100644
index 00000000000..436019c9eb9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_5_node_cluster_receives_replica_lost_before_quorum_and_continues.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+[TestFixture]
+public class when_5_node_cluster_receives_replica_lost_before_quorum_and_continues : with_clustered_replication_tracking_service {
+	private readonly long _logPosition = 4000;
+	private readonly Guid _replicaId1 = Guid.NewGuid();
+	private readonly Guid _replicaId2 = Guid.NewGuid();
+	private readonly Guid _replicaId3 = Guid.NewGuid();
+
+
+	protected override int ClusterSize => 5;
+
+	public override void When() {
+		BecomeLeader();
+		WriterCheckpoint.Write(_logPosition);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replicaId1, _logPosition));
+		Service.Handle(new SystemMessage.VNodeConnectionLost(
+			PortsHelper.GetLoopback(),
+			Guid.NewGuid(),
+			_replicaId1));
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replicaId2, _logPosition));
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replicaId3, _logPosition));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+	}
+
+	[Test]
+	public void replicated_to_should_be_sent() {
+		AssertEx.IsOrBecomesTrue(() => 1 == ReplicatedTos.Count);
+		Assert.True(ReplicatedTos.TryDequeue(out var msg));
+		Assert.AreEqual(_logPosition, msg.LogPosition);
+	}
+	[Test]
+	public void replication_checkpoint_should_advance() {
+		Assert.AreEqual(_logPosition, ReplicationCheckpoint.Read());
+		Assert.AreEqual(_logPosition, ReplicationCheckpoint.ReadNonFlushed());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_cluster_receives_multiple_stale_acks.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_cluster_receives_multiple_stale_acks.cs
new file mode 100644
index 00000000000..d444f029c2a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_cluster_receives_multiple_stale_acks.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+[TestFixture]
+public class when_cluster_receives_multiple_stale_acks :
+	with_clustered_replication_tracking_service {
+	private readonly long _firstLogPosition = 2000;
+	private readonly Guid _replica1 = Guid.NewGuid();
+	private readonly Guid _replica2 = Guid.NewGuid();
+
+	protected override int ClusterSize => 3;
+
+	public override void When() {
+		BecomeLeader();
+		// All of the nodes have acked the first write
+		WriterCheckpoint.Write(_firstLogPosition);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replica1, _firstLogPosition));
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replica2, _firstLogPosition - 100));
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(Guid.NewGuid(), _firstLogPosition - 100));
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(Guid.NewGuid(), _firstLogPosition - 100));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+	}
+
+	[Test]
+	public void replicated_to_should_be_sent_for_the_first_position() {
+		Assert.True(ReplicatedTos.TryDequeue(out var msg));
+		Assert.AreEqual(_firstLogPosition, msg.LogPosition);
+	}
+
+	[Test]
+	public void replication_checkpoint_be_at_the_first_position() {
+		Assert.AreEqual(_firstLogPosition, ReplicationCheckpoint.Read());
+		Assert.AreEqual(_firstLogPosition, ReplicationCheckpoint.ReadNonFlushed());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_cluster_receives_multiple_stale_acks_and_continues.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_cluster_receives_multiple_stale_acks_and_continues.cs
new file mode 100644
index 00000000000..14150c14759
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_cluster_receives_multiple_stale_acks_and_continues.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+[TestFixture]
+public class when_cluster_receives_multiple_stale_acks_and_continues :
+	with_clustered_replication_tracking_service {
+	private readonly long _firstLogPosition = 2000;
+	private readonly long _secondLogPosition = 4000;
+	private readonly Guid _replica1 = Guid.NewGuid();
+	private readonly Guid _replica2 = Guid.NewGuid();
+
+	protected override int ClusterSize => 3;
+
+	public override void When() {
+		BecomeLeader();
+		// All of the nodes have acked the first write
+		WriterCheckpoint.Write(_firstLogPosition);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replica1, _firstLogPosition));
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replica2, _firstLogPosition - 100));
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(Guid.NewGuid(), _firstLogPosition - 100));
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(Guid.NewGuid(), _firstLogPosition - 100));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+
+		ReplicatedTos.Clear();
+
+		WriterCheckpoint.Write(_secondLogPosition);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		Service.Handle(new ReplicationTrackingMessage.ReplicaWriteAck(_replica1, _secondLogPosition));
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+	}
+
+
+
+	[Test]
+	public void replicated_to_can_advance_to_second_position() {
+
+		Assert.True(ReplicatedTos.TryDequeue(out var msg));
+		Assert.AreEqual(_secondLogPosition, msg.LogPosition);
+	}
+
+	[Test]
+	public void replication_checkpoint_can_advance_to_second_position() {
+
+		Assert.AreEqual(_secondLogPosition, ReplicationCheckpoint.Read());
+		Assert.AreEqual(_secondLogPosition, ReplicationCheckpoint.ReadNonFlushed());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_single_node_cluster_receives_1_write_notification.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_single_node_cluster_receives_1_write_notification.cs
new file mode 100644
index 00000000000..ec5c53f9ef6
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/when_single_node_cluster_receives_1_write_notification.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+[TestFixture]
+public class when_single_node_cluster_receives_1_write_notification : with_clustered_replication_tracking_service {
+	private long _logPosition = 4000;
+	protected override int ClusterSize => 1;
+
+	public override void When() {
+		BecomeLeader();
+		WriterCheckpoint.Write(_logPosition);
+		WriterCheckpoint.Flush();
+		Service.Handle(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		AssertEx.IsOrBecomesTrue(() => Service.IsCurrent());
+	}
+
+	[Test]
+	public void replicated_to_should_be_sent() {
+		Assert.AreEqual(1, ReplicatedTos.Count);
+		Assert.True(ReplicatedTos.TryDequeue(out var msg));
+		Assert.AreEqual(_logPosition, msg.LogPosition);
+	}
+	[Test]
+	public void replication_checkpoint_should_advance() {
+		Assert.AreEqual(_logPosition, ReplicationCheckpoint.Read());
+		Assert.AreEqual(_logPosition, ReplicationCheckpoint.ReadNonFlushed());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/with_clustered_replication_tracking_service.cs b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/with_clustered_replication_tracking_service.cs
new file mode 100644
index 00000000000..575b4680909
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/ReplicationTracking/with_clustered_replication_tracking_service.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Replication;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.ReplicationTracking;
+
+public abstract class with_clustered_replication_tracking_service :
+	IHandle<ReplicationTrackingMessage.ReplicatedTo> {
+	protected string EventStreamId = "test_stream";
+	protected SynchronousScheduler Publisher = new("publisher");
+	protected ReplicationTrackingService Service;
+	protected ConcurrentQueue<ReplicationTrackingMessage.ReplicatedTo> ReplicatedTos = new ConcurrentQueue<ReplicationTrackingMessage.ReplicatedTo>();
+	protected ICheckpoint ReplicationCheckpoint = new InMemoryCheckpoint();
+	protected ICheckpoint WriterCheckpoint = new InMemoryCheckpoint();
+
+	protected abstract int ClusterSize { get; }
+
+	[OneTimeSetUp]
+	public virtual void TestFixtureSetUp() {
+		Publisher.Subscribe<ReplicationTrackingMessage.ReplicatedTo>(this);
+
+		Service = new ReplicationTrackingService(Publisher, ClusterSize, ReplicationCheckpoint, WriterCheckpoint);
+		Service.Start();
+		When();
+	}
+
+	[OneTimeTearDown]
+	public virtual void TestFixtureTearDown() {
+		Service.Stop();
+	}
+
+	public abstract void When();
+
+	protected void BecomeLeader() {
+		Service.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+	}
+
+	protected void BecomeUnknown() {
+		Service.Handle(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
+	}
+
+	public void Handle(ReplicationTrackingMessage.ReplicatedTo message) {
+		ReplicatedTos.Enqueue(message);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/Subscriptions/TestSubscription.cs b/src/KurrentDB.Core.Tests/Services/Replication/Subscriptions/TestSubscription.cs
new file mode 100644
index 00000000000..04c38f41f8b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/Subscriptions/TestSubscription.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.Subscriptions;
+
+public class TestSubscription<TLogFormat, TStreamId> {
+	public MiniClusterNode<TLogFormat, TStreamId> Node;
+	public CountdownEvent SubscriptionsConfirmed;
+	public CountdownEvent EventAppeared;
+	public List<ClientMessage.StreamEventAppeared> StreamEvents;
+	public string StreamId;
+
+	public TestSubscription(MiniClusterNode<TLogFormat, TStreamId> node, int expectedEvents, string streamId,
+		CountdownEvent subscriptionsConfirmed) {
+		Node = node;
+		SubscriptionsConfirmed = subscriptionsConfirmed;
+		EventAppeared = new CountdownEvent(expectedEvents);
+		StreamId = streamId;
+	}
+
+	public void CreateSubscription() {
+		var subscribeMsg = new ClientMessage.SubscribeToStream(Guid.NewGuid(), Guid.NewGuid(),
+			new CallbackEnvelope(x => {
+				switch (x.GetType().Name) {
+					case "SubscriptionConfirmation":
+						SubscriptionsConfirmed.Signal();
+						break;
+					case "StreamEventAppeared":
+						EventAppeared.Signal();
+						break;
+					case "SubscriptionDropped":
+						break;
+					default:
+						Assert.Fail("Unexpected message type :" + x.GetType().Name);
+						break;
+				}
+			}), Guid.NewGuid(), StreamId, false, SystemAccounts.System);
+		Node.Node.MainQueue.Publish(subscribeMsg);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Replication/Subscriptions/when_subscribed_to_stream_on_leader_and_event_is_replicated_to_followers.cs b/src/KurrentDB.Core.Tests/Services/Replication/Subscriptions/when_subscribed_to_stream_on_leader_and_event_is_replicated_to_followers.cs
new file mode 100644
index 00000000000..b649e6fa852
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Replication/Subscriptions/when_subscribed_to_stream_on_leader_and_event_is_replicated_to_followers.cs
@@ -0,0 +1,99 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Integration;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Replication.Subscriptions;
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_subscribed_to_stream_on_leader_and_event_is_replicated_to_followers<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
+	private const string _streamId = "test-stream";
+	private CountdownEvent _expectedNumberOfRoleAssignments;
+	private CountdownEvent _subscriptionsConfirmed;
+	private TestSubscription<TLogFormat, TStreamId> _leaderSubscription;
+	private List<TestSubscription<TLogFormat, TStreamId>> _followerSubscriptions;
+
+	private TimeSpan _timeout = TimeSpan.FromSeconds(5);
+
+	protected override void BeforeNodesStart() {
+		_nodes.ToList().ForEach(x =>
+			x.Node.MainBus.Subscribe(new AdHocHandler<SystemMessage.StateChangeMessage>(Handle)));
+		_expectedNumberOfRoleAssignments = new CountdownEvent(3);
+		base.BeforeNodesStart();
+	}
+
+	private void Handle(SystemMessage.StateChangeMessage msg) {
+		switch (msg.State) {
+			case VNodeState.Leader:
+				_expectedNumberOfRoleAssignments.Signal();
+				break;
+			case VNodeState.Follower:
+				_expectedNumberOfRoleAssignments.Signal();
+				break;
+		}
+	}
+
+	protected override async Task Given() {
+		_expectedNumberOfRoleAssignments.Wait(5000);
+
+		var leader = GetLeader();
+		Assert.IsNotNull(leader, "Could not get leader node");
+
+		// Set the checkpoint so the check is not skipped
+		leader.Db.Config.ReplicationCheckpoint.Write(0);
+
+		_subscriptionsConfirmed = new CountdownEvent(3);
+		_leaderSubscription = new TestSubscription<TLogFormat, TStreamId>(leader, 1, _streamId, _subscriptionsConfirmed);
+		_leaderSubscription.CreateSubscription();
+
+		_followerSubscriptions = new List<TestSubscription<TLogFormat, TStreamId>>();
+		var followers = GetFollowers();
+		foreach (var s in followers) {
+			var followerSubscription = new TestSubscription<TLogFormat, TStreamId>(s, 1, _streamId, _subscriptionsConfirmed);
+			_followerSubscriptions.Add(followerSubscription);
+			followerSubscription.CreateSubscription();
+		}
+
+		if (!_subscriptionsConfirmed.Wait(_timeout)) {
+			Assert.Fail($"Timed out waiting for subscriptions to confirm, confirmed {_subscriptionsConfirmed.CurrentCount} need {_subscriptionsConfirmed.InitialCount}.");
+		}
+
+		var events = new Event[] { new Event(Guid.NewGuid(), "test-type", false, new byte[10], new byte[0]) };
+		var writeResult = ReplicationTestHelper.WriteEvent(leader, events, _streamId);
+		Assert.AreEqual(OperationResult.Success, writeResult.Result);
+
+		await base.Given();
+		var replicas = GetFollowers();
+		AssertEx.IsOrBecomesTrue(
+			() => {
+				var leaderIndex = leader.Db.Config.IndexCheckpoint.Read();
+				return replicas[0].Db.Config.IndexCheckpoint.Read() == leaderIndex &&
+					   replicas[1].Db.Config.IndexCheckpoint.Read() == leaderIndex;
+
+			},
+			timeout: TimeSpan.FromSeconds(2));
+	}
+
+	[Test]
+	public void should_receive_event_on_leader() {
+		Assert.IsTrue(_leaderSubscription.EventAppeared.Wait(2000));
+	}
+
+	[Test]
+	public void should_receive_event_on_followers() {
+		if (!(_followerSubscriptions[0].EventAppeared.Wait(2000) && _followerSubscriptions[1].EventAppeared.Wait(2000))) {
+			Assert.Fail("Timed out waiting for follower subscriptions to get events");
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_completes_successfully.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_completes_successfully.cs
new file mode 100644
index 00000000000..e2dccf613f9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_completes_successfully.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.DeleteMgr;
+
+[TestFixture]
+public class when_delete_stream_completes_successfully : RequestManagerSpecification<DeleteStream> {
+	private long commitPosition = 1000;
+	private readonly string _streamId = $"DeleteTest-{Guid.NewGuid()}";
+	protected override DeleteStream OnManager(FakePublisher publisher) {
+		return new DeleteStream(
+			publisher,
+			CommitTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+		   	streamId: _streamId,
+			expectedVersion: ExpectedVersion.Any,
+			hardDelete: false,
+			commitSource: CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield return new StorageMessage.CommitIndexed(InternalCorrId, commitPosition, 2, 3, 3);
+	}
+
+	protected override Message When() {
+		return new ReplicationTrackingMessage.IndexedTo(commitPosition);
+	}
+
+	[Test]
+	public void successful_request_message_is_published() {
+		Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
+			x => x.CorrelationId == InternalCorrId && x.Success));
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to_with_success() {
+		Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.DeleteStreamCompleted>(
+			x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.Success && x.CurrentVersion == 3));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_completes_wrong_expected_version.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_completes_wrong_expected_version.cs
new file mode 100644
index 00000000000..93cd6ebad85
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_completes_wrong_expected_version.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.DeleteMgr;
+
+[TestFixture]
+public class when_delete_stream_completes_wrong_expected_version : RequestManagerSpecification<DeleteStream> {
+	private long commitPosition = 1000;
+	private readonly string _streamId = $"DeleteTest-{Guid.NewGuid()}";
+
+	protected override DeleteStream OnManager(FakePublisher publisher) {
+		return new DeleteStream(
+			publisher,
+			CommitTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			streamId: _streamId,
+			expectedVersion: 10,
+			hardDelete: false,
+			commitSource: CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield return new StorageMessage.CommitIndexed(InternalCorrId, commitPosition, 2, 3, 3);
+	}
+
+	protected override Message When() {
+		return new StorageMessage.WrongExpectedVersion(InternalCorrId, 3);
+	}
+
+	[Test]
+	public void failed_request_message_is_published() {
+		Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
+			x => x.CorrelationId == InternalCorrId && !x.Success));
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to_with_wrong_expected_version() {
+		Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.DeleteStreamCompleted>(
+			x => x.CorrelationId == ClientCorrId &&
+				 x.Result == OperationResult.WrongExpectedVersion &&
+				 x.CurrentVersion == 3));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_already_committed_after_commit.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_already_committed_after_commit.cs
new file mode 100644
index 00000000000..ed7a4c17c0e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_already_committed_after_commit.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.DeleteMgr;
+
+[TestFixture]
+public class when_delete_stream_gets_already_committed_after_commit : RequestManagerSpecification<DeleteStream> {
+	private long commitPosition = 1000;
+	protected override DeleteStream OnManager(FakePublisher publisher) {
+		return new DeleteStream(
+			publisher,
+			CommitTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			"test123",
+			ExpectedVersion.Any,
+			false,
+			CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield return new StorageMessage.CommitIndexed(InternalCorrId, commitPosition, 2, 3, 3);
+		yield return new ReplicationTrackingMessage.ReplicatedTo(commitPosition);
+	}
+
+	protected override Message When() {
+		return new StorageMessage.AlreadyCommitted(InternalCorrId, "test123", 0, 1, commitPosition);
+	}
+
+	[Test]
+	public void successful_request_message_is_not_published() {
+		Assert.That(!Produced.Any());
+	}
+
+	[Test]
+	public void the_envelope_is_not_replied_to_with_success() {
+		Assert.That(!Envelope.Replies.Any());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_already_committed_before_commit.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_already_committed_before_commit.cs
new file mode 100644
index 00000000000..d13912ba040
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_already_committed_before_commit.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.DeleteMgr;
+
+[TestFixture]
+public class when_delete_stream_gets_already_committed_before_commit : RequestManagerSpecification<DeleteStream> {
+	private long _commitPosition = 3000;
+	private readonly string _streamId = $"delete_test-{Guid.NewGuid()}";
+	protected override DeleteStream OnManager(FakePublisher publisher) {
+		return new DeleteStream(
+			publisher,
+			CommitTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			_streamId,
+			ExpectedVersion.Any,
+			false,
+			CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield break;
+	}
+
+	protected override Message When() {
+		return new StorageMessage.AlreadyCommitted(InternalCorrId, _streamId, 0, 1, _commitPosition);
+	}
+
+	[Test]
+	public void successful_request_message_is_published() {
+		Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
+			x => x.CorrelationId == InternalCorrId && x.Success));
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to_with_success() {
+		Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.DeleteStreamCompleted>(
+			x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.Success));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_stream_deleted.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_stream_deleted.cs
new file mode 100644
index 00000000000..19c7bc7d891
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_stream_deleted.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.DeleteMgr;
+
+[TestFixture]
+public class when_delete_stream_gets_stream_deleted : RequestManagerSpecification<DeleteStream> {
+	protected override DeleteStream OnManager(FakePublisher publisher) {
+		return new DeleteStream(
+			publisher,
+			CommitTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			"test123",
+			ExpectedVersion.Any,
+			false,
+			CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield break;
+	}
+
+	protected override Message When() {
+		return new StorageMessage.StreamDeleted(InternalCorrId);
+	}
+
+	[Test]
+	public void failed_request_message_is_published() {
+		Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
+			x => x.CorrelationId == InternalCorrId && x.Success == false));
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to_with_failure() {
+		Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.DeleteStreamCompleted>(
+			x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.StreamDeleted));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_timeout_after_commit.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_timeout_after_commit.cs
new file mode 100644
index 00000000000..842bdce03b1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_timeout_after_commit.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.DeleteMgr;
+
+public class when_delete_stream_gets_timeout_after_commit : RequestManagerSpecification<DeleteStream> {
+	private long _commitPosition = 3000;
+	protected override DeleteStream OnManager(FakePublisher publisher) {
+		return new DeleteStream(
+			publisher,
+			CommitTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			"test123",
+			ExpectedVersion.Any,
+			false,
+			CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield return new StorageMessage.CommitIndexed(InternalCorrId, _commitPosition, 500, 1, 1);
+		yield return new ReplicationTrackingMessage.ReplicatedTo(_commitPosition);
+	}
+
+	protected override Message When() {
+		return new StorageMessage.RequestManagerTimerTick(DateTime.UtcNow + TimeSpan.FromMinutes(1));
+	}
+
+	[Test]
+	public void no_additional_messages_are_published() {
+		Assert.That(!Produced.Any());
+	}
+	[Test]
+	public void the_envelope_has_single_successful_reply() {
+		Assert.AreEqual(0, Envelope.Replies.Count);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_timeout_before_commit.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_timeout_before_commit.cs
new file mode 100644
index 00000000000..a6efb3965d1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/DeleteMgr/when_delete_stream_gets_timeout_before_commit.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.DeleteMgr;
+
+public class when_delete_stream_gets_timeout_before_commit : RequestManagerSpecification<DeleteStream> {
+	protected override DeleteStream OnManager(FakePublisher publisher) {
+		return new DeleteStream(
+			publisher,
+			CommitTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			"test123",
+			ExpectedVersion.Any,
+			false,
+			CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield break;
+	}
+
+	protected override Message When() {
+		return new StorageMessage.RequestManagerTimerTick(
+			DateTime.UtcNow + PrepareTimeout + TimeSpan.FromMinutes(5));
+	}
+
+	[Test]
+	public void failed_request_message_is_published() {
+		Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
+			x => x.CorrelationId == InternalCorrId && x.Success == false));
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to_with_failure() {
+		Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.DeleteStreamCompleted>(
+			x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.CommitTimeout));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/FakeRequestManager.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/FakeRequestManager.cs
new file mode 100644
index 00000000000..b9d2ecf9bb9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/FakeRequestManager.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager;
+using KurrentDB.Core.Services.RequestManager.Managers;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement;
+
+public class FakeRequestManager : RequestManagerBase {
+	public FakeRequestManager(
+			IPublisher publisher,
+			TimeSpan timeout,
+			IEnvelope clientResponseEnvelope,
+			Guid internalCorrId,
+			Guid clientCorrId,
+			long expectedVersion,
+			CommitSource commitSource,
+			int prepareCount = 0,
+			long transactionId = -1,
+			bool waitForCommit = false)
+		: base(
+			 publisher,
+			 timeout,
+			 clientResponseEnvelope,
+			 internalCorrId,
+			 clientCorrId,
+			 expectedVersion,
+			 commitSource,
+			 prepareCount,
+			 transactionId,
+			 waitForCommit) { }
+	protected override Message WriteRequestMsg => throw new NotImplementedException();
+	protected override Message ClientSuccessMsg => throw new NotImplementedException();
+	protected override Message ClientFailMsg => throw new NotImplementedException();
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/ReadMgr/when_reading_an_event_committed_on_leader_and_on_followers.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/ReadMgr/when_reading_an_event_committed_on_leader_and_on_followers.cs
new file mode 100644
index 00000000000..46d5d06af8b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/ReadMgr/when_reading_an_event_committed_on_leader_and_on_followers.cs
@@ -0,0 +1,174 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Integration;
+using KurrentDB.Core.Tests.Services.Replication;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.ReadMgr;
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_reading_an_event_committed_on_leader_and_on_followers<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
+	private CountdownEvent _expectedNumberOfRoleAssignments;
+
+	private string _streamId =
+		"when_reading_an_event_committed_on_leader_and_on_followers-" + Guid.NewGuid().ToString();
+
+	private long _commitPosition;
+	private long _indexPosition;
+
+	protected override void BeforeNodesStart() {
+		_nodes.ToList().ForEach(x =>
+			x.Node.MainBus.Subscribe(new AdHocHandler<SystemMessage.StateChangeMessage>(Handle)));
+		_expectedNumberOfRoleAssignments = new CountdownEvent(3);
+		base.BeforeNodesStart();
+	}
+
+	private void Handle(SystemMessage.StateChangeMessage msg) {
+		switch (msg.State) {
+			case VNodeState.Leader:
+				_expectedNumberOfRoleAssignments.Signal();
+				break;
+			case VNodeState.Follower:
+				_expectedNumberOfRoleAssignments.Signal();
+				break;
+		}
+	}
+
+	protected override async Task Given() {
+		_expectedNumberOfRoleAssignments.Wait(5000);
+
+		var leader = GetLeader();
+		Assert.IsNotNull(leader, "Could not get leader node");
+
+		// Set the checkpoint so the check is not skipped
+		leader.Db.Config.ReplicationCheckpoint.Write(0);
+
+		var events = new Event[] { new Event(Guid.NewGuid(), "test-type", false, new byte[10], new byte[0]) };
+		var writeResult = ReplicationTestHelper.WriteEvent(leader, events, _streamId);
+		Assert.AreEqual(OperationResult.Success, writeResult.Result);
+		_commitPosition = writeResult.CommitPosition;
+		Thread.Sleep(100);
+		Assert.IsTrue(_commitPosition <= GetLeader().Db.Config.ReplicationCheckpoint.Read(),
+			"Replication checkpoint should be greater than event commit position");
+		await base.Given();
+		_indexPosition = leader.Db.Config.IndexCheckpoint.Read();
+	}
+
+	[Test]
+	public void should_be_able_to_read_event_from_all_forward_on_leader() {
+		var readResult = ReplicationTestHelper.ReadAllEventsForward(GetLeader(), _commitPosition);
+		Assert.AreEqual(1, readResult.Events.Count(x => x.OriginalStreamId == _streamId));
+	}
+
+	[Test]
+	public void should_be_able_to_read_event_from_all_backward_on_leader() {
+		var readResult = ReplicationTestHelper.ReadAllEventsBackward(GetLeader(), _commitPosition);
+		Assert.AreEqual(1, readResult.Events.Count(x => x.OriginalStreamId == _streamId));
+	}
+
+	[Test]
+	public void should_be_able_to_read_event_from_stream_forward_on_leader() {
+		var readResult = ReplicationTestHelper.ReadStreamEventsForward(GetLeader(), _streamId);
+		Assert.AreEqual(1, readResult.Events.Count());
+		Assert.AreEqual(ReadStreamResult.Success, readResult.Result);
+	}
+
+	[Test]
+	public void should_be_able_to_read_event_from_stream_backward_on_leader() {
+		var readResult = ReplicationTestHelper.ReadStreamEventsBackward(GetLeader(), _streamId);
+		Assert.AreEqual(ReadStreamResult.Success, readResult.Result);
+		Assert.AreEqual(1, readResult.Events.Count());
+	}
+
+	[Test]
+	public void should_be_able_to_read_event_on_leader() {
+		var readResult = ReplicationTestHelper.ReadEvent(GetLeader(), _streamId, 0);
+		Assert.AreEqual(ReadEventResult.Success, readResult.Result);
+	}
+
+	[Test]
+	[Retry(5)]
+	public void should_be_able_to_read_event_from_all_forward_on_followers() {
+		var followers = GetFollowers();
+		var quorum = (followers.Count() + 1) / 2 + 1;
+		var successfulReads = 0;
+		foreach (var s in followers) {
+			AssertEx.IsOrBecomesTrue(() => s.Db.Config.IndexCheckpoint.Read() >= _indexPosition);
+			var readResult = ReplicationTestHelper.ReadAllEventsForward(s, _commitPosition);
+			successfulReads += readResult.Events.Count(x => x.OriginalStreamId == _streamId);
+		}
+
+		Assert.GreaterOrEqual(successfulReads, quorum - 1);
+	}
+
+	[Test]
+	[Retry(5)]
+	public void should_be_able_to_read_event_from_all_backward_on_followers() {
+		var followers = GetFollowers();
+		var quorum = (followers.Count() + 1) / 2 + 1;
+		var successfulReads = 0;
+		foreach (var s in followers) {
+			AssertEx.IsOrBecomesTrue(() => s.Db.Config.IndexCheckpoint.Read() >= _indexPosition);
+			var readResult = ReplicationTestHelper.ReadAllEventsBackward(s, _commitPosition);
+			successfulReads += readResult.Events.Count(x => x.OriginalStreamId == _streamId);
+		}
+
+		Assert.GreaterOrEqual(successfulReads, quorum - 1);
+	}
+
+	[Test]
+	[Retry(5)]
+	public void should_be_able_to_read_event_from_stream_forward_on_followers() {
+		var followers = GetFollowers();
+		var quorum = (followers.Count() + 1) / 2 + 1;
+		var successfulReads = 0;
+		foreach (var s in followers) {
+			AssertEx.IsOrBecomesTrue(() => s.Db.Config.IndexCheckpoint.Read() >= _indexPosition);
+			var readResult = ReplicationTestHelper.ReadStreamEventsForward(s, _streamId);
+			successfulReads += readResult.Events.Count();
+			Assert.AreEqual(ReadStreamResult.Success, readResult.Result);
+		}
+
+		Assert.GreaterOrEqual(successfulReads, quorum - 1);
+	}
+
+	[Test]
+	[Retry(5)]
+	public void should_be_able_to_read_event_from_stream_backward_on_followers() {
+		var followers = GetFollowers();
+		var quorum = (followers.Count() + 1) / 2 + 1;
+		var successfulReads = 0;
+		foreach (var s in followers) {
+			AssertEx.IsOrBecomesTrue(() => s.Db.Config.IndexCheckpoint.Read() >= _indexPosition);
+			var readResult = ReplicationTestHelper.ReadStreamEventsBackward(s, _streamId);
+			successfulReads += readResult.Events.Count();
+		}
+
+		Assert.GreaterOrEqual(successfulReads, quorum - 1);
+	}
+
+	[Test]
+	[Retry(5)]
+	public void should_be_able_to_read_event_on_followers() {
+		var followers = GetFollowers();
+		var quorum = (followers.Count() + 1) / 2 + 1;
+		var successfulReads = 0;
+		foreach (var s in followers) {
+			AssertEx.IsOrBecomesTrue(() => s.Db.Config.IndexCheckpoint.Read() >= _indexPosition);
+			var readResult = ReplicationTestHelper.ReadEvent(s, _streamId, 0);
+			successfulReads += readResult.Result == ReadEventResult.Success ? 1 : 0;
+		}
+
+		Assert.GreaterOrEqual(successfulReads, quorum - 1);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/ReadMgr/when_reading_an_event_from_a_single_node.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/ReadMgr/when_reading_an_event_from_a_single_node.cs
new file mode 100644
index 00000000000..94c5065e785
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/ReadMgr/when_reading_an_event_from_a_single_node.cs
@@ -0,0 +1,96 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Tests.Integration;
+using KurrentDB.Core.Tests.Services.Replication;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.ReadMgr;
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_reading_an_event_from_a_single_node<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
+	private CountdownEvent _expectedNumberOfRoleAssignments;
+	private string _streamId = "test-stream";
+	private long _commitPosition;
+
+	private MiniClusterNode<TLogFormat, TStreamId> _liveNode;
+
+	protected override void BeforeNodesStart() {
+		_nodes.ToList().ForEach(x =>
+			x.Node.MainBus.Subscribe(new AdHocHandler<SystemMessage.StateChangeMessage>(Handle)));
+		_expectedNumberOfRoleAssignments = new CountdownEvent(3);
+		base.BeforeNodesStart();
+	}
+
+	private void Handle(SystemMessage.StateChangeMessage msg) {
+		switch (msg.State) {
+			case VNodeState.Leader:
+				_expectedNumberOfRoleAssignments.Signal();
+				break;
+			case VNodeState.Follower:
+				_expectedNumberOfRoleAssignments.Signal();
+				break;
+		}
+	}
+
+	protected override async Task Given() {
+		_expectedNumberOfRoleAssignments.Wait(5000);
+
+		_liveNode = GetLeader();
+		Assert.IsNotNull(_liveNode, "Could not get leader node");
+
+		var events = new Event[] { new Event(Guid.NewGuid(), "test-type", false, new byte[10], new byte[0]) };
+		var writeResult = ReplicationTestHelper.WriteEvent(_liveNode, events, _streamId);
+		Assert.AreEqual(OperationResult.Success, writeResult.Result);
+		_commitPosition = writeResult.CommitPosition;
+
+		var followers = GetFollowers();
+		foreach (var s in followers) {
+			await ShutdownNode(s.DebugIndex);
+		}
+
+		await base.Given();
+	}
+
+	[Test]
+	public void should_be_able_to_read_event_from_all_forward() {
+		var readResult = ReplicationTestHelper.ReadAllEventsForward(_liveNode, _commitPosition);
+		Assert.AreEqual(1, readResult.Events.Where(x => x.OriginalStreamId == _streamId).Count());
+	}
+
+	[Test]
+	public void should_be_able_to_read_event_from_all_backward() {
+		var readResult = ReplicationTestHelper.ReadAllEventsBackward(_liveNode, _commitPosition);
+		Assert.AreEqual(1, readResult.Events.Where(x => x.OriginalStreamId == _streamId).Count());
+	}
+
+	[Test]
+	public void should_not_be_able_to_read_event_from_stream_forward() {
+		var readResult = ReplicationTestHelper.ReadStreamEventsForward(_liveNode, _streamId);
+		Assert.AreEqual(1, readResult.Events.Count());
+		Assert.AreEqual(ReadStreamResult.Success, readResult.Result);
+	}
+
+	[Test]
+	public void should_not_be_able_to_read_event_from_stream_backward() {
+		var readResult = ReplicationTestHelper.ReadStreamEventsBackward(_liveNode, _streamId);
+		Assert.AreEqual(1, readResult.Events.Count());
+		Assert.AreEqual(ReadStreamResult.Success, readResult.Result);
+	}
+
+	[Test]
+	public void should_not_be_able_to_read_event() {
+		var readResult = ReplicationTestHelper.ReadEvent(_liveNode, _streamId, 0);
+		Assert.AreEqual(ReadEventResult.Success, readResult.Result);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/RequestManagerSpecification.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/RequestManagerSpecification.cs
new file mode 100644
index 00000000000..8fc096d668e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/RequestManagerSpecification.cs
@@ -0,0 +1,74 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Services.Replication;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement;
+
+public abstract class RequestManagerSpecification<TManager>
+	where TManager : RequestManagerBase {
+	protected readonly TimeSpan PrepareTimeout = TimeSpan.FromMinutes(5);
+	protected readonly TimeSpan CommitTimeout = TimeSpan.FromMinutes(5);
+
+	protected TManager Manager;
+	protected List<Message> Produced;
+	protected FakePublisher Publisher = new();
+	protected Guid InternalCorrId = Guid.NewGuid();
+	protected Guid ClientCorrId = Guid.NewGuid();
+	protected byte[] Metadata = new byte[255];
+	protected byte[] EventData = new byte[255];
+	protected FakeEnvelope Envelope = new();
+	protected CommitSource CommitSource = new();
+	protected SynchronousScheduler Dispatcher = new(nameof(RequestManagerSpecification<TManager>));
+
+	protected abstract TManager OnManager(FakePublisher publisher);
+	protected abstract IEnumerable<Message> WithInitialMessages();
+	protected virtual void Given() { }
+	protected abstract Message When();
+
+	protected Event DummyEvent() {
+		return new Event(Guid.NewGuid(), "test", false, EventData, Metadata);
+	}
+
+	protected RequestManagerSpecification() {
+		Dispatcher.Subscribe<ReplicationTrackingMessage.ReplicatedTo>(CommitSource);
+	}
+	[OneTimeSetUp]
+	public virtual void Setup() {
+		Envelope.Replies.Clear();
+		Publisher.Messages.Clear();
+
+		Manager = OnManager(Publisher);
+		Dispatcher.Subscribe<StorageMessage.PrepareAck>(Manager);
+		Dispatcher.Subscribe<StorageMessage.InvalidTransaction>(Manager);
+		Dispatcher.Subscribe<StorageMessage.StreamDeleted>(Manager);
+		Dispatcher.Subscribe<StorageMessage.WrongExpectedVersion>(Manager);
+		Dispatcher.Subscribe<StorageMessage.AlreadyCommitted>(Manager);
+		Dispatcher.Subscribe<StorageMessage.RequestManagerTimerTick>(Manager);
+		Dispatcher.Subscribe<StorageMessage.CommitIndexed>(Manager);
+		Dispatcher.Subscribe<ReplicationTrackingMessage.IndexedTo>(CommitSource);
+		Dispatcher.Subscribe<ReplicationTrackingMessage.ReplicatedTo>(CommitSource);
+
+		Manager.Start();
+		Given();
+		foreach (var msg in WithInitialMessages()) {
+			Dispatcher.Publish(msg);
+		}
+
+		Publisher.Messages.Clear();
+		Envelope.Replies.Clear();
+		Dispatcher.Publish(When());
+		Produced = new List<Message>(Publisher.Messages);
+	}
+
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/Service/RequestManagerServiceSpecification.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/Service/RequestManagerServiceSpecification.cs
new file mode 100644
index 00000000000..d165c3ebbe1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/Service/RequestManagerServiceSpecification.cs
@@ -0,0 +1,112 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using EventStore.ClientAPI.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.RequestManager;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Services.Replication;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.Service;
+
+public abstract class RequestManagerServiceSpecification :
+	IHandle<StorageMessage.WritePrepares>,
+	IHandle<StorageMessage.RequestCompleted> {
+	protected readonly TimeSpan PrepareTimeout = TimeSpan.FromMinutes(5);
+	protected readonly TimeSpan CommitTimeout = TimeSpan.FromMinutes(5);
+
+	protected List<Message> Produced = new();
+	protected FakePublisher Publisher = new();
+	protected Guid InternalCorrId = Guid.NewGuid();
+	protected Guid ClientCorrId = Guid.NewGuid();
+	protected byte[] Metadata = Helper.UTF8NoBom.GetBytes("{Value:42}");
+	protected byte[] EventData = Helper.UTF8NoBom.GetBytes("{Value:43}");
+	protected FakeEnvelope Envelope = new();
+	protected SynchronousScheduler Dispatcher = new(nameof(RequestManagerServiceSpecification));
+	protected RequestManagementService Service;
+	protected bool GrantAccess = true;
+	protected long LogPosition = 100;
+	protected PrepareFlags PrepareFlags = PrepareFlags.Data;
+	protected string StreamId = $"{nameof(RequestManagerServiceSpecification)}-{Guid.NewGuid()}";
+
+	protected abstract void Given();
+	protected abstract Message When();
+
+
+	protected RequestManagerServiceSpecification() {
+		Dispatcher.Subscribe<StorageMessage.WritePrepares>(this);
+		Dispatcher.Subscribe<StorageMessage.RequestCompleted>(this);
+
+		Service = new RequestManagementService(
+			Dispatcher,
+			TimeSpan.FromSeconds(2),
+			TimeSpan.FromSeconds(2),
+			explicitTransactionsSupported: true);
+		Dispatcher.Subscribe<ClientMessage.WriteEvents>(Service);
+		Dispatcher.Subscribe<StorageMessage.PrepareAck>(Service);
+		Dispatcher.Subscribe<StorageMessage.InvalidTransaction>(Service);
+		Dispatcher.Subscribe<StorageMessage.StreamDeleted>(Service);
+		Dispatcher.Subscribe<StorageMessage.WrongExpectedVersion>(Service);
+		Dispatcher.Subscribe<StorageMessage.AlreadyCommitted>(Service);
+		Dispatcher.Subscribe<StorageMessage.RequestManagerTimerTick>(Service);
+		Dispatcher.Subscribe<StorageMessage.CommitIndexed>(Service);
+		Dispatcher.Subscribe<ReplicationTrackingMessage.IndexedTo>(Service);
+		Dispatcher.Subscribe<ReplicationTrackingMessage.ReplicatedTo>(Service);
+		Dispatcher.Subscribe<SystemMessage.StateChangeMessage>(Service);
+	}
+	[OneTimeSetUp]
+	public virtual void Setup() {
+		Envelope.Replies.Clear();
+		Publisher.Messages.Clear();
+
+		Given();
+		Envelope.Replies.Clear();
+		Publisher.Messages.Clear();
+
+		Dispatcher.Publish(When());
+
+	}
+
+
+	private static readonly StreamAcl PublicStream = new StreamAcl(SystemRoles.All, SystemRoles.All, SystemRoles.All,
+		SystemRoles.All, SystemRoles.All);
+	public void Handle(StorageMessage.EffectiveStreamAclRequest message) {
+		message.Envelope.ReplyWith(new StorageMessage.EffectiveStreamAclResponse(new StorageMessage.EffectiveAcl(
+			PublicStream, PublicStream, PublicStream
+			)));
+	}
+
+	public void Handle(StorageMessage.WritePrepares message) {
+
+		var transactionPosition = LogPosition;
+		foreach (var _ in message.Events) {
+			Dispatcher.Publish(new StorageMessage.PrepareAck(
+									message.CorrelationId,
+									LogPosition,
+									PrepareFlags));
+			LogPosition += 100;
+		}
+		Dispatcher.Publish(new StorageMessage.CommitIndexed(
+								message.CorrelationId,
+								LogPosition,
+								transactionPosition,
+								0,
+								message.Events.Length));
+	}
+
+	protected Event DummyEvent() {
+		return new Event(Guid.NewGuid(), "SomethingHappened", true, EventData, Metadata);
+	}
+
+	public void Handle(StorageMessage.RequestCompleted message) {
+		Produced.Add(message);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/Service/when_handling_write_stream.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/Service/when_handling_write_stream.cs
new file mode 100644
index 00000000000..9f6066d1f39
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/Service/when_handling_write_stream.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.Service;
+
+[TestFixture]
+public class when_handling_write_stream : RequestManagerServiceSpecification {
+	protected override void Given() {
+		Dispatcher.Publish(new ClientMessage.WriteEvents(InternalCorrId, ClientCorrId, Envelope, true, StreamId, ExpectedVersion.Any, new[] { DummyEvent() }, null));
+		Dispatcher.Publish(new StorageMessage.CommitIndexed(InternalCorrId, LogPosition, 2, 3, 3));
+		Dispatcher.Publish(new ReplicationTrackingMessage.ReplicatedTo(LogPosition));
+	}
+
+	protected override Message When() {
+		return new ReplicationTrackingMessage.IndexedTo(LogPosition);
+	}
+
+	[Test]
+	public void successful_request_message_is_published() {
+		Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
+			x => x.CorrelationId == InternalCorrId && x.Success));
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to_with_success() {
+		Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.WriteEventsCompleted>(
+			x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.Success));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/Service/when_writing_and_deposed_as_leader.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/Service/when_writing_and_deposed_as_leader.cs
new file mode 100644
index 00000000000..938518cf3fd
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/Service/when_writing_and_deposed_as_leader.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.Service;
+
+[TestFixture]
+public class when_writing_and_deposed_as_leader : RequestManagerServiceSpecification {
+
+	protected override void Given() {
+		Dispatcher.Publish(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+		Dispatcher.Publish(new ClientMessage.WriteEvents(InternalCorrId, ClientCorrId, Envelope, true, StreamId, ExpectedVersion.Any, new[] { DummyEvent() }, null));
+	}
+
+	protected override Message When() {
+		return new SystemMessage.BecomePreReplica(Guid.NewGuid(), Guid.NewGuid(), FakeMemberInfo());
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to_with_commit_timeout() {
+		Assert.AreEqual(1, Envelope.Replies.Count);
+		Assert.IsInstanceOf<ClientMessage.WriteEventsCompleted>(Envelope.Replies[0]);
+		var response = (ClientMessage.WriteEventsCompleted)Envelope.Replies[0];
+		Assert.AreEqual(OperationResult.CommitTimeout, response.Result);
+		Assert.AreEqual("Request canceled by server", response.Message);
+	}
+
+	private static MemberInfo FakeMemberInfo() {
+		var ipAddress = "127.0.0.1";
+		var port = 1113;
+		return MemberInfo.Initial(Guid.Empty, DateTime.UtcNow,
+			VNodeState.Unknown, true,
+			new IPEndPoint(IPAddress.Parse(ipAddress), port),
+			new IPEndPoint(IPAddress.Parse(ipAddress), port),
+			new IPEndPoint(IPAddress.Parse(ipAddress), port),
+			new IPEndPoint(IPAddress.Parse(ipAddress), port),
+			new IPEndPoint(IPAddress.Parse(ipAddress), port),
+			null, 0, 0, 0, false);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/Service/when_writing_and_deposed_as_leader_and_replica_moves_forward.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/Service/when_writing_and_deposed_as_leader_and_replica_moves_forward.cs
new file mode 100644
index 00000000000..9d989a038e9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/Service/when_writing_and_deposed_as_leader_and_replica_moves_forward.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.Service;
+
+[TestFixture]
+public class when_writing_and_deposed_as_leader_and_replica_moves_forward : RequestManagerServiceSpecification {
+
+	protected override void Given() {
+		Dispatcher.Publish(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+		Dispatcher.Publish(new ClientMessage.WriteEvents(InternalCorrId, ClientCorrId, Envelope, true, StreamId, ExpectedVersion.Any, new[] { DummyEvent() }, null));
+		Dispatcher.Publish(new SystemMessage.BecomePreReplica(Guid.NewGuid(), Guid.NewGuid(), FakeMemberInfo()));
+	}
+
+	protected override Message When() {
+		return new ReplicationTrackingMessage.IndexedTo(LogPosition);
+	}
+
+	[Test]
+	public void the_old_write_is_not_acknowledged() {
+		Assert.AreEqual(0, Envelope.Replies.Count);
+	}
+
+	private static MemberInfo FakeMemberInfo() {
+		var ipAddress = "127.0.0.1";
+		var port = 1113;
+		return MemberInfo.Initial(Guid.Empty, DateTime.UtcNow,
+			VNodeState.Unknown, true,
+			new IPEndPoint(IPAddress.Parse(ipAddress), port),
+			new IPEndPoint(IPAddress.Parse(ipAddress), port),
+			new IPEndPoint(IPAddress.Parse(ipAddress), port),
+			new IPEndPoint(IPAddress.Parse(ipAddress), port),
+			new IPEndPoint(IPAddress.Parse(ipAddress), port),
+			null, 0, 0, 0, false);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_completes_successfully.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_completes_successfully.cs
new file mode 100644
index 00000000000..8d8973a556b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_completes_successfully.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.TransactionMgr;
+
+[TestFixture]
+public class when_transaction_commit_completes_successfully : RequestManagerSpecification<TransactionCommit> {
+	private long _commitPosition = 3000;
+	private long _transactionPosition = 1000;
+	private int transactionId = 2341;
+
+	protected override TransactionCommit OnManager(FakePublisher publisher) {
+		return new TransactionCommit(
+			publisher,
+			PrepareTimeout,
+			CommitTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			transactionId,
+			CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield return new StorageMessage.PrepareAck(InternalCorrId, _transactionPosition, PrepareFlags.TransactionEnd);
+		yield return new StorageMessage.CommitAck(InternalCorrId, _commitPosition, _transactionPosition, 1, 3);
+		yield return new ReplicationTrackingMessage.ReplicatedTo(_commitPosition);
+	}
+
+	protected override Message When() {
+		return new StorageMessage.CommitIndexed(InternalCorrId, _commitPosition, _transactionPosition, 0, 0);
+	}
+
+	[Test]
+	public void successful_request_message_is_published() {
+		Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
+			x => x.CorrelationId == InternalCorrId && x.Success));
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to_with_success() {
+		Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.TransactionCommitCompleted>(
+			x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.Success));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_already_committed_after_committed.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_already_committed_after_committed.cs
new file mode 100644
index 00000000000..1afe61f5954
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_already_committed_after_committed.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.TransactionMgr;
+
+[TestFixture]
+public class when_transaction_commit_gets_already_committed_after_committed : RequestManagerSpecification<TransactionCommit> {
+
+	private int transactionId = 2341;
+	private long commitPosition = 3000;
+	protected override TransactionCommit OnManager(FakePublisher publisher) {
+		return new TransactionCommit(
+			publisher,
+			PrepareTimeout,
+			CommitTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			transactionId,
+			CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield return new StorageMessage.PrepareAck(InternalCorrId, transactionId, PrepareFlags.TransactionEnd);
+		yield return new StorageMessage.CommitIndexed(Guid.NewGuid(), commitPosition, transactionId, 0, 10);
+		yield return new ReplicationTrackingMessage.ReplicatedTo(commitPosition);
+		yield return new StorageMessage.CommitIndexed(InternalCorrId, commitPosition, transactionId, 0, 0);
+	}
+
+	protected override Message When() {
+		return new StorageMessage.AlreadyCommitted(InternalCorrId, "test123", 0, 1, commitPosition);
+	}
+
+	[Test]
+	public void successful_request_message_is_not_republished() {
+		Assert.That(!Produced.Any());
+	}
+
+	[Test]
+	public void the_envelope_is_not_replied_to_again() {
+		Assert.That(!Envelope.Replies.Any());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_already_committed_before_committed.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_already_committed_before_committed.cs
new file mode 100644
index 00000000000..70406105c8e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_already_committed_before_committed.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.TransactionMgr;
+
+[TestFixture]
+public class when_transaction_commit_gets_already_committed_before_committed : RequestManagerSpecification<TransactionCommit> {
+	private long commitPosition = 1000;
+	private int transactionId = 500;
+
+	protected override TransactionCommit OnManager(FakePublisher publisher) {
+		return new TransactionCommit(
+			publisher,
+			PrepareTimeout,
+			CommitTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			transactionId,
+			CommitSource);
+	}
+
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+
+		yield return new StorageMessage.PrepareAck(InternalCorrId, transactionId, PrepareFlags.TransactionEnd);
+	}
+
+	protected override Message When() {
+		return new StorageMessage.AlreadyCommitted(InternalCorrId, "test123", 0, 1, commitPosition);
+	}
+
+	[Test]
+	public void successful_request_message_is_published() {
+		Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
+			x => x.CorrelationId == InternalCorrId && x.Success));
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to_with_success() {
+		Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.TransactionCommitCompleted>(
+			x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.Success));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_prepare_timeout_after_prepares.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_prepare_timeout_after_prepares.cs
new file mode 100644
index 00000000000..841f2b89830
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_prepare_timeout_after_prepares.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.TransactionMgr;
+
+[TestFixture]
+public class when_transaction_commit_gets_prepare_timeout_after_prepares : RequestManagerSpecification<TransactionCommit> {
+
+	private int transactionId = 2341;
+	protected override TransactionCommit OnManager(FakePublisher publisher) {
+		return new TransactionCommit(
+			publisher,
+			PrepareTimeout,
+			CommitTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			transactionId,
+			CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield return new StorageMessage.PrepareAck(InternalCorrId, transactionId, PrepareFlags.SingleWrite);
+	}
+
+	protected override Message When() {
+		return new StorageMessage.RequestManagerTimerTick(
+			DateTime.UtcNow + TimeSpan.FromTicks(CommitTimeout.Ticks / 2));
+	}
+
+	[Test]
+	public void no_messages_are_published() {
+		Assert.That(Produced.Count == 0);
+	}
+
+	[Test]
+	public void the_envelope_is_not_replied_to() {
+		Assert.AreEqual(0, Envelope.Replies.Count);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_prepare_timeout_before_prepares.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_prepare_timeout_before_prepares.cs
new file mode 100644
index 00000000000..383c3e1eb5b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_prepare_timeout_before_prepares.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.TransactionMgr;
+
+[TestFixture]
+public class when_transaction_commit_gets_prepare_timeout_before_prepares : RequestManagerSpecification<TransactionCommit> {
+
+	private int transactionId = 2341;
+	protected override TransactionCommit OnManager(FakePublisher publisher) {
+		return new TransactionCommit(
+			publisher,
+			PrepareTimeout,
+			CommitTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			transactionId,
+			CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield break;
+	}
+
+	protected override Message When() {
+		return new StorageMessage.RequestManagerTimerTick(
+			DateTime.UtcNow + PrepareTimeout + TimeSpan.FromMinutes(5));
+	}
+
+	[Test]
+	public void failed_request_message_is_published() {
+		Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
+			x => x.CorrelationId == InternalCorrId && x.Success == false));
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to_with_failure() {
+		Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.TransactionCommitCompleted>(
+			x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.PrepareTimeout));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_stream_deleted.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_stream_deleted.cs
new file mode 100644
index 00000000000..2be6bcc17b2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_stream_deleted.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.TransactionMgr;
+
+[TestFixture]
+public class when_transaction_commit_gets_stream_deleted : RequestManagerSpecification<TransactionCommit> {
+
+	private int transactionId = 2341;
+	protected override TransactionCommit OnManager(FakePublisher publisher) {
+		return new TransactionCommit(
+			publisher,
+			PrepareTimeout,
+			CommitTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			transactionId,
+			CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield return new ClientMessage.TransactionCommit(InternalCorrId, ClientCorrId, Envelope, true, 4, null);
+	}
+
+	protected override Message When() {
+		return new StorageMessage.StreamDeleted(InternalCorrId);
+	}
+
+	[Test]
+	public void failed_request_message_is_published() {
+		Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
+			x => x.CorrelationId == InternalCorrId && x.Success == false));
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to_with_failure() {
+		Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.TransactionCommitCompleted>(
+			x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.StreamDeleted));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_timeout_before_cluster_commit.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_timeout_before_cluster_commit.cs
new file mode 100644
index 00000000000..d357ea0868c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_commit_gets_timeout_before_cluster_commit.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.TransactionMgr;
+
+public class when_transaction_commit_gets_timeout_before_cluster_commit : RequestManagerSpecification<TransactionCommit> {
+
+	private int transactionId = 2341;
+	protected override TransactionCommit OnManager(FakePublisher publisher) {
+		return new TransactionCommit(
+			publisher,
+			PrepareTimeout,
+			CommitTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			transactionId,
+			CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield return new StorageMessage.PrepareAck(InternalCorrId, 100, PrepareFlags.Data);
+		yield return new StorageMessage.PrepareAck(InternalCorrId, 200, PrepareFlags.Data);
+		yield return new StorageMessage.CommitAck(InternalCorrId, 300, 100, 1, 2);
+	}
+
+	protected override Message When() {
+		return new StorageMessage.RequestManagerTimerTick(
+			DateTime.UtcNow + PrepareTimeout + CommitTimeout + TimeSpan.FromMinutes(5));
+	}
+
+	[Test]
+	public void failed_request_message_is_published() {
+		Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
+			x => x.CorrelationId == InternalCorrId && x.Success == false));
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to_with_failure() {
+		Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.TransactionCommitCompleted>(
+			x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.CommitTimeout));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_multiple_write_completes_successfully.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_multiple_write_completes_successfully.cs
new file mode 100644
index 00000000000..0b4ca8809a0
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_multiple_write_completes_successfully.cs
@@ -0,0 +1,59 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.TransactionMgr;
+
+[TestFixture]
+public class when_transaction_multiple_write_completes_successfully : RequestManagerSpecification<TransactionWrite> {
+
+	private long _transactionId = 1000;
+	private long _event1Position = 1500;
+	private long _event2Position = 2000;
+	private long _event3Position = 2500;
+
+	protected override TransactionWrite OnManager(FakePublisher publisher) {
+		return new TransactionWrite(
+		 	publisher,
+			PrepareTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			new[] { DummyEvent(), DummyEvent(), DummyEvent() },
+			_transactionId,
+			CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield return new StorageMessage.PrepareAck(InternalCorrId, _event1Position, PrepareFlags.Data);
+		yield return new StorageMessage.PrepareAck(InternalCorrId, _event2Position, PrepareFlags.Data);
+		yield return new StorageMessage.PrepareAck(InternalCorrId, _event3Position, PrepareFlags.Data);
+	}
+
+	protected override Message When() {
+		return new ReplicationTrackingMessage.ReplicatedTo(_event3Position);
+	}
+
+	[Test]
+	public void successful_request_message_is_published() {
+		Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
+			x => x.CorrelationId == InternalCorrId && x.Success));
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to_with_success() {
+		Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.TransactionWriteCompleted>(
+			x =>
+				x.CorrelationId == ClientCorrId &&
+				x.Result == OperationResult.Success &&
+				x.TransactionId == _transactionId));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_multiple_write_does_not_get_prepares.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_multiple_write_does_not_get_prepares.cs
new file mode 100644
index 00000000000..ffa537ccadc
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_multiple_write_does_not_get_prepares.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.TransactionMgr;
+
+[TestFixture]
+public class when_transaction_multiple_write_does_not_get_prepares : RequestManagerSpecification<TransactionWrite> {
+
+	private long _transactionId = 1000;
+	private long _event1Position = 1500;
+	private long _event2Position = 2000;
+	private long _event3Position = 2500;
+
+	protected override TransactionWrite OnManager(FakePublisher publisher) {
+		return new TransactionWrite(
+		 	publisher,
+			PrepareTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			new[] { DummyEvent(), DummyEvent(), DummyEvent() },
+			_transactionId,
+			CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield return new StorageMessage.PrepareAck(InternalCorrId, _event1Position, PrepareFlags.Data);
+		yield return new StorageMessage.PrepareAck(InternalCorrId, _event2Position, PrepareFlags.Data);
+	}
+
+	protected override Message When() {
+		return new ReplicationTrackingMessage.ReplicatedTo(_event3Position);
+	}
+
+	[Test]
+	public void successful_request_message_is_not_published() {
+		Assert.That(!Produced.Any());
+	}
+
+	[Test]
+	public void the_envelope_is_not_replied_to_with_success() {
+		Assert.That(!Envelope.Replies.Any());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_single_write_completes_successfully.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_single_write_completes_successfully.cs
new file mode 100644
index 00000000000..5e88823d417
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_single_write_completes_successfully.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.TransactionMgr;
+
+[TestFixture]
+public class when_transaction_single_write_completes_successfully : RequestManagerSpecification<TransactionWrite> {
+
+	private long _transactionId = 1000;
+	private long _event1Position = 1500;
+
+	protected override TransactionWrite OnManager(FakePublisher publisher) {
+		return new TransactionWrite(
+		 	publisher,
+			PrepareTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			new[] { DummyEvent() },
+			_transactionId,
+			CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield return new StorageMessage.PrepareAck(InternalCorrId, _event1Position, PrepareFlags.Data);
+	}
+
+	protected override Message When() {
+		return new ReplicationTrackingMessage.ReplicatedTo(_event1Position);
+	}
+
+	[Test]
+	public void successful_request_message_is_published() {
+		Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
+			x => x.CorrelationId == InternalCorrId && x.Success));
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to_with_success() {
+		Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.TransactionWriteCompleted>(
+			x =>
+				x.CorrelationId == ClientCorrId &&
+				x.Result == OperationResult.Success &&
+				x.TransactionId == _transactionId));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_start_completes_successfully.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_start_completes_successfully.cs
new file mode 100644
index 00000000000..9292df945e5
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/TransactionMgr/when_transaction_start_completes_successfully.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.TransactionMgr;
+
+[TestFixture]
+public class when_transaction_start_completes_successfully : RequestManagerSpecification<TransactionStart> {
+	private long _commitPosition = 3000;
+	private long _transactionPosition = 1564;
+	protected override TransactionStart OnManager(FakePublisher publisher) {
+		return new TransactionStart(
+		 	publisher,
+			PrepareTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			$"testStream-{nameof(when_transaction_commit_completes_successfully)}",
+			0,
+			CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield return new StorageMessage.PrepareAck(InternalCorrId, _transactionPosition, PrepareFlags.TransactionBegin);
+	}
+
+	protected override Message When() {
+		return new ReplicationTrackingMessage.ReplicatedTo(_commitPosition);
+	}
+
+	[Test]
+	public void successful_request_message_is_published() {
+		Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
+			x => x.CorrelationId == InternalCorrId && x.Success));
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to_with_success() {
+		Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.TransactionStartCompleted>(
+			x =>
+				x.CorrelationId == ClientCorrId &&
+				x.Result == OperationResult.Success &&
+				x.TransactionId == _transactionPosition));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_already_committed.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_already_committed.cs
new file mode 100644
index 00000000000..50b64b9ea5e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_already_committed.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.WriteStreamMgr;
+
+[TestFixture]
+public class when_write_stream_gets_already_committed : RequestManagerSpecification<WriteEvents> {
+	private long _prepareLogPosition = 100;
+	private long _commitLogPosition = 100;
+	protected override WriteEvents OnManager(FakePublisher publisher) {
+		return new WriteEvents(
+			publisher,
+			CommitTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			"test123",
+			ExpectedVersion.Any,
+			new[] { DummyEvent() },
+			CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield return new StorageMessage.PrepareAck(InternalCorrId, _prepareLogPosition, PrepareFlags.SingleWrite | PrepareFlags.Data);
+	}
+
+	protected override Message When() {
+		return new StorageMessage.AlreadyCommitted(InternalCorrId, "test123", 0, 1, _commitLogPosition);
+	}
+
+	[Test]
+	public void successful_request_message_is_published() {
+		Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
+			x => x.CorrelationId == InternalCorrId && x.Success));
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to_with_success() {
+		Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.WriteEventsCompleted>(
+			x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.Success));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_already_committed_and_log_is_committed.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_already_committed_and_log_is_committed.cs
new file mode 100644
index 00000000000..c739614c0c2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_already_committed_and_log_is_committed.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.WriteStreamMgr;
+
+[TestFixture]
+public class when_write_stream_gets_already_committed_and_log_is_committed : RequestManagerSpecification<WriteEvents> {
+	private long _prepareLogPosition = 100;
+	private long _commitLogPosition = 100;
+	protected override WriteEvents OnManager(FakePublisher publisher) {
+		return new WriteEvents(
+			publisher,
+			CommitTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			"test123",
+			ExpectedVersion.Any,
+			new[] { DummyEvent() },
+			CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield return new StorageMessage.PrepareAck(InternalCorrId, _prepareLogPosition, PrepareFlags.SingleWrite | PrepareFlags.Data);
+		yield return new ReplicationTrackingMessage.ReplicatedTo(_commitLogPosition);
+	}
+
+	protected override Message When() {
+		return new StorageMessage.AlreadyCommitted(InternalCorrId, "test123", 0, 1, _commitLogPosition);
+	}
+
+	[Test]
+	public void successful_request_message_is_published() {
+		Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
+			x => x.CorrelationId == InternalCorrId && x.Success));
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to_with_success() {
+		Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.WriteEventsCompleted>(
+			x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.Success));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_already_committed_and_log_is_not_committed.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_already_committed_and_log_is_not_committed.cs
new file mode 100644
index 00000000000..322c4a1f7f9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_already_committed_and_log_is_not_committed.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.WriteStreamMgr;
+
+[TestFixture]
+public class when_write_stream_gets_already_committed_and_log_is_not_committed : RequestManagerSpecification<WriteEvents> {
+	private long _commitLogPosition = 1000;
+	protected override WriteEvents OnManager(FakePublisher publisher) {
+		return new WriteEvents(
+			publisher,
+			CommitTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			"test123",
+			ExpectedVersion.Any,
+			new[] { DummyEvent() },
+			CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield return new ReplicationTrackingMessage.ReplicatedTo(_commitLogPosition - 1);
+	}
+
+	protected override Message When() {
+		return new StorageMessage.AlreadyCommitted(InternalCorrId, "test123", 0, 1, _commitLogPosition);
+	}
+
+	[Test]
+	public void successful_request_message_is_published() {
+		Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
+			x => x.CorrelationId == InternalCorrId && x.Success));
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to_with_success() {
+		Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.WriteEventsCompleted>(
+			x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.Success));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_stream_deleted.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_stream_deleted.cs
new file mode 100644
index 00000000000..f9c3f94ab8b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_stream_deleted.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.WriteStreamMgr;
+
+[TestFixture]
+public class when_write_stream_gets_stream_deleted : RequestManagerSpecification<WriteEvents> {
+	protected override WriteEvents OnManager(FakePublisher publisher) {
+		return new WriteEvents(
+		publisher,
+		CommitTimeout,
+		Envelope,
+		InternalCorrId,
+		ClientCorrId,
+		"test123",
+		ExpectedVersion.Any,
+		new[] { DummyEvent() },
+		CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield break;
+	}
+
+	protected override Message When() {
+		return new StorageMessage.StreamDeleted(InternalCorrId);
+	}
+
+	[Test]
+	public void failed_request_message_is_published() {
+		Assert.That(Produced.ContainsSingle<StorageMessage.RequestCompleted>(
+			x => x.CorrelationId == InternalCorrId && x.Success == false));
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to_with_failure() {
+		Assert.That(Envelope.Replies.ContainsSingle<ClientMessage.WriteEventsCompleted>(
+			x => x.CorrelationId == ClientCorrId && x.Result == OperationResult.StreamDeleted));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_timeout_after_cluster_commit.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_timeout_after_cluster_commit.cs
new file mode 100644
index 00000000000..84c83ece13c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_timeout_after_cluster_commit.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.WriteStreamMgr;
+
+[TestFixture]
+public class when_write_stream_gets_timeout_after_cluster_commit : RequestManagerSpecification<WriteEvents> {
+	private long _prepareLogPosition = 100;
+	private long _commitPosition = 100;
+	protected override WriteEvents OnManager(FakePublisher publisher) {
+		return new WriteEvents(
+			publisher,
+			CommitTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			"test123",
+			ExpectedVersion.Any,
+			new[] { DummyEvent() },
+			CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield return new StorageMessage.PrepareAck(InternalCorrId, _prepareLogPosition, PrepareFlags.SingleWrite | PrepareFlags.Data);
+		yield return new StorageMessage.CommitIndexed(InternalCorrId, _commitPosition, 1, 0, 0);
+		yield return new ReplicationTrackingMessage.ReplicatedTo(_commitPosition);
+	}
+
+	protected override Message When() {
+		return new StorageMessage.RequestManagerTimerTick(DateTime.UtcNow + TimeSpan.FromMinutes(1));
+	}
+
+	[Test]
+	public void no_additional_messages_are_published() {
+		Assert.That(Produced.Count == 0);
+	}
+	[Test]
+	public void the_envelope_has_no_additional_replies() {
+		Assert.AreEqual(0, Envelope.Replies.Count);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_timeout_after_local_commit.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_timeout_after_local_commit.cs
new file mode 100644
index 00000000000..aef07328bfb
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_timeout_after_local_commit.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.WriteStreamMgr;
+
+[TestFixture]
+public class when_write_stream_gets_timeout_after_local_commit : RequestManagerSpecification<WriteEvents> {
+	protected override WriteEvents OnManager(FakePublisher publisher) {
+		return new WriteEvents(
+			publisher,
+			CommitTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			"test123",
+			ExpectedVersion.Any,
+			new[] { DummyEvent() },
+			CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield return new StorageMessage.CommitIndexed(InternalCorrId, 1, 1, 0, 0);
+	}
+
+	protected override Message When() {
+		return new StorageMessage.RequestManagerTimerTick(DateTime.UtcNow + CommitTimeout + CommitTimeout);
+	}
+
+	[Test]
+	public void request_completed_as_failed_published() {
+		Assert.AreEqual(1, Produced.Count);
+		Assert.AreEqual(false, ((StorageMessage.RequestCompleted)Produced[0]).Success);
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to() {
+		Assert.AreEqual(1, Envelope.Replies.Count);
+
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_timeout_before_local_commit.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_timeout_before_local_commit.cs
new file mode 100644
index 00000000000..ad42e3b08f3
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/WriteStreamMgr/when_write_stream_gets_timeout_before_local_commit.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Tests.Fakes;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement.WriteStreamMgr;
+
+[TestFixture]
+public class when_write_stream_gets_timeout_before_local_commit : RequestManagerSpecification<WriteEvents> {
+	protected override WriteEvents OnManager(FakePublisher publisher) {
+		return new WriteEvents(
+			publisher,
+			CommitTimeout,
+			Envelope,
+			InternalCorrId,
+			ClientCorrId,
+			"test123",
+			ExpectedVersion.Any,
+			new[] { DummyEvent() },
+			CommitSource);
+	}
+
+	protected override IEnumerable<Message> WithInitialMessages() {
+		yield break;
+	}
+
+	protected override Message When() {
+		return new StorageMessage.RequestManagerTimerTick(DateTime.UtcNow + CommitTimeout + CommitTimeout);
+	}
+
+	[Test]
+	public void request_completed_as_failed_published() {
+		Assert.AreEqual(1, Produced.Count);
+		Assert.AreEqual(false, ((StorageMessage.RequestCompleted)Produced[0]).Success);
+	}
+
+	[Test]
+	public void the_envelope_is_replied_to() {
+		Assert.AreEqual(1, Envelope.Replies.Count);
+
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/RequestManagement/when_creating_stream_request_manager.cs b/src/KurrentDB.Core.Tests/Services/RequestManagement/when_creating_stream_request_manager.cs
new file mode 100644
index 00000000000..66232a3bd28
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/RequestManagement/when_creating_stream_request_manager.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager;
+using NUnit.Framework;
+
+// ReSharper disable ObjectCreationAsStatement
+
+namespace KurrentDB.Core.Tests.Services.RequestManagement;
+
+[TestFixture]
+public class when_creating_stream_request_manager {
+	protected static readonly IPublisher Publisher = new SynchronousScheduler();
+	protected static readonly TimeSpan CommitTimeout = TimeSpan.FromMinutes(5);
+	protected static readonly IEnvelope Envelope = new NoopEnvelope();
+	protected static readonly Guid InternalCorrId = Guid.NewGuid();
+	protected static readonly Guid ClientCorrId = Guid.NewGuid();
+	protected static readonly long ExpectedVersion = 1;
+
+
+
+	[Test]
+	public void null_publisher_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() =>
+			new FakeRequestManager(
+				null,
+				CommitTimeout,
+				Envelope,
+				InternalCorrId,
+				ClientCorrId,
+				ExpectedVersion,
+				new CommitSource()));
+	}
+
+	[Test]
+	public void null_envelope_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() =>
+			new FakeRequestManager(
+				Publisher,
+				CommitTimeout,
+				null,
+				InternalCorrId,
+				ClientCorrId,
+				ExpectedVersion,
+				new CommitSource()));
+	}
+	[Test]
+	public void internal_corrId_empty_guid_throws_argument_exception() {
+		Assert.Throws<ArgumentException>(() =>
+			new FakeRequestManager(
+				Publisher,
+				CommitTimeout,
+				Envelope,
+				Guid.Empty,
+				ClientCorrId,
+				ExpectedVersion,
+				new CommitSource()));
+	}
+	[Test]
+	public void client_corrId_empty_guid_throws_argument_exception() {
+		Assert.Throws<ArgumentException>(() =>
+			new FakeRequestManager(
+				Publisher,
+				CommitTimeout,
+				Envelope,
+				InternalCorrId,
+				Guid.Empty,
+				ExpectedVersion,
+				new CommitSource()));
+	}
+
+	[Test]
+	public void empty_commit_source_throws_null_argument_exception() {
+		Assert.Throws<ArgumentNullException>(() =>
+			new FakeRequestManager(
+				Publisher,
+				CommitTimeout,
+				Envelope,
+				InternalCorrId,
+				ClientCorrId,
+				ExpectedVersion,
+				null));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_a_single_write_before_the_transaction_is_present.cs b/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_a_single_write_before_the_transaction_is_present.cs
new file mode 100644
index 00000000000..fdb278795db
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_a_single_write_before_the_transaction_is_present.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.AllReader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class when_a_single_write_before_the_transaction_is_present<TLogFormat, TStreamId> : RepeatableDbTestScenario<TLogFormat, TStreamId> {
+	[Test]
+	public async Task should_be_able_to_read_the_transactional_writes_when_the_commit_is_present() {
+		await CreateDb([
+			Rec.Prepare(0, "single_write_stream_id_1", prepareFlags: PrepareFlags.Data | PrepareFlags.IsCommitted),
+			Rec.TransSt(1, "transaction_stream_id"),
+			Rec.Prepare(1, "transaction_stream_id"),
+			Rec.TransEnd(1, "transaction_stream_id"),
+			Rec.Prepare(2, "single_write_stream_id_2", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted),
+			Rec.Prepare(3, "single_write_stream_id_3", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted),
+			Rec.Prepare(4, "single_write_stream_id_4", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted)
+			]);
+
+		var firstRead = await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10, CancellationToken.None);
+
+		Assert.AreEqual(4, firstRead.Records.Count);
+		Assert.AreEqual("single_write_stream_id_1", firstRead.Records[0].Event.EventStreamId);
+		Assert.AreEqual("single_write_stream_id_2", firstRead.Records[1].Event.EventStreamId);
+		Assert.AreEqual("single_write_stream_id_3", firstRead.Records[2].Event.EventStreamId);
+		Assert.AreEqual("single_write_stream_id_4", firstRead.Records[3].Event.EventStreamId);
+
+		await CreateDb([
+			Rec.Prepare(0, "single_write_stream_id_1", prepareFlags: PrepareFlags.Data | PrepareFlags.IsCommitted),
+			Rec.TransSt(1, "transaction_stream_id"),
+			Rec.Prepare(1, "transaction_stream_id"),
+			Rec.TransEnd(1, "transaction_stream_id"),
+			Rec.Prepare(2, "single_write_stream_id_2", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted),
+			Rec.Prepare(3, "single_write_stream_id_3", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted),
+			Rec.Prepare(4, "single_write_stream_id_4", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted),
+			Rec.Commit(1, "transaction_stream_id")
+			]);
+
+		var transactionRead = await ReadIndex.ReadAllEventsForward(firstRead.NextPos, 10, CancellationToken.None);
+
+		Assert.AreEqual(1, transactionRead.Records.Count);
+		Assert.AreEqual("transaction_stream_id", transactionRead.Records[0].Event.EventStreamId);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_a_single_write_is_after_transaction_end_but_before_commit_is_present.cs b/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_a_single_write_is_after_transaction_end_but_before_commit_is_present.cs
new file mode 100644
index 00000000000..e92bdae8b0e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_a_single_write_is_after_transaction_end_but_before_commit_is_present.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.AllReader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class when_a_single_write_is_after_transaction_end_but_before_commit_is_present<TLogFormat, TStreamId>
+	: RepeatableDbTestScenario<TLogFormat, TStreamId> {
+	[Test]
+	public async Task should_be_able_to_read_the_transactional_writes_when_the_commit_is_present() {
+		await CreateDb([
+			Rec.TransSt(0, "transaction_stream_id"),
+			Rec.Prepare(0, "transaction_stream_id"),
+			Rec.TransEnd(0, "transaction_stream_id"),
+			Rec.Prepare(1, "single_write_stream_id", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted)
+			]);
+
+		var firstRead = await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10, CancellationToken.None);
+
+		Assert.AreEqual(1, firstRead.Records.Count);
+		Assert.AreEqual("single_write_stream_id", firstRead.Records[0].Event.EventStreamId);
+
+		await CreateDb([Rec.TransSt(0, "transaction_stream_id"),
+			Rec.Prepare(0, "transaction_stream_id"),
+			Rec.TransEnd(0, "transaction_stream_id"),
+			Rec.Prepare(1, "single_write_stream_id", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted),
+			Rec.Commit(0, "transaction_stream_id")
+			]);
+
+		var transactionRead = await ReadIndex.ReadAllEventsForward(firstRead.NextPos, 10, CancellationToken.None);
+
+		Assert.AreEqual(1, transactionRead.Records.Count);
+		Assert.AreEqual("transaction_stream_id", transactionRead.Records[0].Event.EventStreamId);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_multiple_single_writes_are_after_transaction_end_but_before_commit_is_present.cs b/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_multiple_single_writes_are_after_transaction_end_but_before_commit_is_present.cs
new file mode 100644
index 00000000000..da7fa1f184c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_multiple_single_writes_are_after_transaction_end_but_before_commit_is_present.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.AllReader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class
+	when_multiple_single_writes_are_after_transaction_end_but_before_commit_is_present<TLogFormat, TStreamId>
+	: RepeatableDbTestScenario<TLogFormat, TStreamId> {
+	[Test]
+	public async Task should_be_able_to_read_the_transactional_writes_when_the_commit_is_present() {
+		/*
+		 * create a db with a transaction where the commit is not present yet (read happened before the chaser could commit)
+		 * in the following case the read will return the event for the single non-transactional write
+		 * performing a read from the next position returned will fail as the prepares are all less than what we have asked for.
+		 */
+		await CreateDb([
+			Rec.TransSt(0, "transaction_stream_id"),
+			Rec.Prepare(0, "transaction_stream_id"),
+			Rec.TransEnd(0, "transaction_stream_id"),
+			Rec.Prepare(1, "single_write_stream_id_1", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted),
+			Rec.Prepare(2, "single_write_stream_id_2", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted),
+			Rec.Prepare(3, "single_write_stream_id_3", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted)
+			]);
+
+		var firstRead = await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10, CancellationToken.None);
+
+		Assert.AreEqual(3, firstRead.Records.Count);
+		Assert.AreEqual("single_write_stream_id_1", firstRead.Records[0].Event.EventStreamId);
+		Assert.AreEqual("single_write_stream_id_2", firstRead.Records[1].Event.EventStreamId);
+		Assert.AreEqual("single_write_stream_id_3", firstRead.Records[2].Event.EventStreamId);
+
+		//create the exact same db as above but now with the transaction's commit
+		await CreateDb([
+			Rec.TransSt(0, "transaction_stream_id"),
+			Rec.Prepare(0, "transaction_stream_id"),
+			Rec.TransEnd(0, "transaction_stream_id"),
+			Rec.Prepare(1, "single_write_stream_id_1", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted),
+			Rec.Prepare(2, "single_write_stream_id_2", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted),
+			Rec.Prepare(3, "single_write_stream_id_3", prepareFlags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted),
+			Rec.Commit(0, "transaction_stream_id")
+			]);
+
+		var transactionRead = await ReadIndex.ReadAllEventsForward(firstRead.NextPos, 10, CancellationToken.None);
+
+		Assert.AreEqual(1, transactionRead.Records.Count);
+		Assert.AreEqual("transaction_stream_id", transactionRead.Records[0].Event.EventStreamId);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_reading_all_with_disallowed_streams.cs b/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_reading_all_with_disallowed_streams.cs
new file mode 100644
index 00000000000..6b350daf890
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_reading_all_with_disallowed_streams.cs
@@ -0,0 +1,177 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Client.Messages;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.AllReader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string), "$persistentsubscription-$all::group-checkpoint")]
+[TestFixture(typeof(LogFormat.V2), typeof(string), "$persistentsubscription-$all::group-parked")]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), "$persistentsubscription-$all::group-checkpoint")]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), "$persistentsubscription-$all::group-parked")]
+public class when_reading_all_with_disallowed_streams<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	TFPos _forwardReadPos;
+	TFPos _backwardReadPos;
+	private string _disallowedStream;
+	private string _allowedStream1 = "ES1";
+	private string _allowedStream2 = "$persistentsubscription-$all::group-somethingallowed";
+
+	public when_reading_all_with_disallowed_streams(string disallowedStream) {
+		_disallowedStream = disallowedStream;
+	}
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var firstEvent = await WriteSingleEvent(_allowedStream1, 1, new string('.', 3000), eventId: Guid.NewGuid(),
+			eventType: "event-type-1", retryOnFail: true, token: token);
+		await WriteSingleEvent(_disallowedStream, 1, new string('.', 3000), eventId: Guid.NewGuid(), eventType: "event-type-2",
+			retryOnFail: true, token: token); //disallowed
+		await WriteSingleEvent(_allowedStream2, 1, new string('.', 3000), eventId: Guid.NewGuid(), eventType: "event-type-3",
+			retryOnFail: true, token: token); //allowed
+
+		_forwardReadPos = new TFPos(firstEvent.LogPosition, firstEvent.LogPosition);
+		_backwardReadPos = new TFPos(Writer.Position, Writer.Position);
+	}
+
+	[Test]
+	public async Task should_filter_out_disallowed_streams_when_reading_events_forward() {
+		var records = (await ReadIndex.ReadAllEventsForward(_forwardReadPos, 10, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(2, records.Count);
+		Assert.True(records.All(x => x.Event.EventStreamId != _disallowedStream));
+		Assert.True(records.Any(x => x.Event.EventStreamId == _allowedStream1));
+		Assert.True(records.Any(x => x.Event.EventStreamId == _allowedStream2));
+	}
+
+	[Test]
+	public async Task should_filter_out_disallowed_streams_when_reading_events_forward_with_event_type_prefix() {
+		var filter = new Filter(
+			Filter.Types.FilterContext.EventType,
+			Filter.Types.FilterType.Prefix, new[] { "event-type" });
+		var eventFilter = EventFilter.Get(true, filter);
+
+		var result = await ReadIndex.ReadAllEventsForwardFiltered(_forwardReadPos, 10, 10, eventFilter, CancellationToken.None);
+		Assert.AreEqual(2, result.Records.Count);
+		Assert.True(result.Records.All(x => x.Event.EventStreamId != _disallowedStream));
+		Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream1));
+		Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream2));
+	}
+
+	[Test]
+	public async Task should_filter_out_disallowed_streams_when_reading_events_forward_with_event_type_regex() {
+		var filter = new Filter(
+			Filter.Types.FilterContext.EventType,
+			Filter.Types.FilterType.Regex, new[] { @"^.*event-type-.*$" });
+		var eventFilter = EventFilter.Get(true, filter);
+
+		var result = await ReadIndex.ReadAllEventsForwardFiltered(_forwardReadPos, 10, 10, eventFilter, CancellationToken.None);
+		Assert.AreEqual(2, result.Records.Count);
+		Assert.True(result.Records.All(x => x.Event.EventStreamId != _disallowedStream));
+		Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream1));
+		Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream2));
+	}
+
+	[Test]
+	public async Task should_filter_out_disallowed_streams_when_reading_events_forward_with_stream_id_prefix() {
+		var filter = new Filter(
+			Filter.Types.FilterContext.StreamId,
+			Filter.Types.FilterType.Prefix, new[] { "$persistentsubscripti" });
+		var eventFilter = EventFilter.Get(true, filter);
+
+		var result = await ReadIndex.ReadAllEventsForwardFiltered(_forwardReadPos, 10, 10, eventFilter, CancellationToken.None);
+		Assert.AreEqual(1, result.Records.Count);
+		Assert.True(result.Records.All(x => x.Event.EventStreamId != _disallowedStream));
+		Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream2));
+	}
+
+	[Test]
+	public async Task should_filter_out_disallowed_streams_when_reading_events_forward_with_stream_id_regex() {
+		var filter = new Filter(
+			Filter.Types.FilterContext.StreamId,
+			Filter.Types.FilterType.Regex, new[] { @"^.*istentsubsc.*$" });
+		var eventFilter = EventFilter.Get(true, filter);
+
+		var result = await ReadIndex.ReadAllEventsForwardFiltered(_forwardReadPos, 10, 10, eventFilter, CancellationToken.None);
+		Assert.AreEqual(1, result.Records.Count);
+		Assert.True(result.Records.All(x => x.Event.EventStreamId != _disallowedStream));
+		Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream2));
+	}
+
+	[Test]
+	public async Task should_filter_out_disallowed_streams_when_reading_events_backward() {
+		var records = (await ReadIndex.ReadAllEventsBackward(_backwardReadPos, 10, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(2, records.Count);
+		Assert.True(records.All(x => x.Event.EventStreamId != _disallowedStream));
+		Assert.True(records.Any(x => x.Event.EventStreamId == _allowedStream1));
+		Assert.True(records.Any(x => x.Event.EventStreamId == _allowedStream2));
+	}
+
+	[Test]
+	public async Task should_filter_out_disallowed_streams_when_reading_events_backward_with_event_type_prefix() {
+		var filter = new Filter(
+			Filter.Types.FilterContext.EventType,
+			Filter.Types.FilterType.Prefix, ["event-type"]);
+		var eventFilter = EventFilter.Get(true, filter);
+
+		var result =
+			await ReadIndex.ReadAllEventsBackwardFiltered(_backwardReadPos, 10, 10, eventFilter,
+				CancellationToken.None);
+		Assert.AreEqual(2, result.Records.Count);
+		Assert.True(result.Records.All(x => x.Event.EventStreamId != _disallowedStream));
+		Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream1));
+		Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream2));
+	}
+
+	[Test]
+	public async Task should_filter_out_disallowed_streams_when_reading_events_backward_with_event_type_regex() {
+		var filter = new Filter(
+			Filter.Types.FilterContext.EventType,
+			Filter.Types.FilterType.Regex, [@"^.*event-type-.*$"]);
+		var eventFilter = EventFilter.Get(true, filter);
+
+		var result =
+			await ReadIndex.ReadAllEventsBackwardFiltered(_backwardReadPos, 10, 10, eventFilter,
+				CancellationToken.None);
+		Assert.AreEqual(2, result.Records.Count);
+		Assert.True(result.Records.All(x => x.Event.EventStreamId != _disallowedStream));
+		Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream1));
+		Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream2));
+	}
+
+	[Test]
+	public async Task should_filter_out_disallowed_streams_when_reading_events_backward_with_stream_id_prefix() {
+		var filter = new Filter(
+			Filter.Types.FilterContext.StreamId,
+			Filter.Types.FilterType.Prefix, ["$persistentsubscripti"]);
+		var eventFilter = EventFilter.Get(true, filter);
+
+		var result =
+			await ReadIndex.ReadAllEventsBackwardFiltered(_backwardReadPos, 10, 10, eventFilter,
+				CancellationToken.None);
+		Assert.AreEqual(1, result.Records.Count);
+		Assert.True(result.Records.All(x => x.Event.EventStreamId != _disallowedStream));
+		Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream2));
+	}
+
+	[Test]
+	public async Task should_filter_out_disallowed_streams_when_reading_events_backward_with_stream_id_regex() {
+		var filter = new Filter(
+			Filter.Types.FilterContext.StreamId,
+			Filter.Types.FilterType.Regex, [@"^.*istentsubsc.*$"]);
+		var eventFilter = EventFilter.Get(true, filter);
+
+		var result =
+			await ReadIndex.ReadAllEventsBackwardFiltered(_backwardReadPos, 10, 10, eventFilter,
+				CancellationToken.None);
+		Assert.AreEqual(1, result.Records.Count);
+		Assert.True(result.Records.All(x => x.Event.EventStreamId != _disallowedStream));
+		Assert.True(result.Records.Any(x => x.Event.EventStreamId == _allowedStream2));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_reading_all_with_filtering.cs b/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_reading_all_with_filtering.cs
new file mode 100644
index 00000000000..1cb1a700bcc
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_reading_all_with_filtering.cs
@@ -0,0 +1,121 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Client.Messages;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.AllReader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_reading_all_with_filtering<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	TFPos _forwardReadPos;
+	TFPos _backwardReadPos;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var firstEvent = await WriteSingleEvent("ES1", 1, new string('.', 3000), eventId: Guid.NewGuid(),
+			eventType: "event-type-1", retryOnFail: true, token: token);
+		await WriteSingleEvent("ES2", 1, new string('.', 3000), eventId: Guid.NewGuid(), eventType: "other-event-type-2",
+			retryOnFail: true, token: token);
+		await WriteSingleEvent("ES3", 1, new string('.', 3000), eventId: Guid.NewGuid(), eventType: "event-type-3",
+			retryOnFail: true, token: token);
+		await WriteSingleEvent("ES4", 1, new string('.', 3000), eventId: Guid.NewGuid(), eventType: "other-event-type-4",
+			retryOnFail: true, token: token);
+
+		_forwardReadPos = new TFPos(firstEvent.LogPosition, firstEvent.LogPosition);
+		_backwardReadPos = new TFPos(Writer.Position, Writer.Position);
+	}
+
+	[Test]
+	public async Task should_read_only_events_forward_with_event_type_prefix() {
+		var filter = new Filter(
+			Filter.Types.FilterContext.EventType,
+			Filter.Types.FilterType.Prefix, new[] { "event-type" });
+		var eventFilter = EventFilter.Get(true, filter);
+
+		var result = await ReadIndex.ReadAllEventsForwardFiltered(_forwardReadPos, 10, 10, eventFilter, CancellationToken.None);
+		Assert.AreEqual(2, result.Records.Count);
+	}
+
+	[Test]
+	public async Task should_read_only_events_forward_with_event_type_regex() {
+		var filter = new Filter(
+			Filter.Types.FilterContext.EventType,
+			Filter.Types.FilterType.Regex, new[] { @"^.*other-event.*$" });
+		var eventFilter = EventFilter.Get(true, filter);
+
+		var result = await ReadIndex.ReadAllEventsForwardFiltered(_forwardReadPos, 10, 10, eventFilter, CancellationToken.None);
+		Assert.AreEqual(2, result.Records.Count);
+	}
+
+	[Test]
+	public async Task should_read_only_events_forward_with_stream_id_prefix() {
+		var filter = new Filter(
+			Filter.Types.FilterContext.StreamId,
+			Filter.Types.FilterType.Prefix, new[] { "ES2" });
+		var eventFilter = EventFilter.Get(true, filter);
+
+		var result = await ReadIndex.ReadAllEventsForwardFiltered(_forwardReadPos, 10, 10, eventFilter, CancellationToken.None);
+		Assert.AreEqual(1, result.Records.Count);
+	}
+
+	[Test]
+	public async Task should_read_only_events_forward_with_stream_id_regex() {
+		var filter = new Filter(
+			Filter.Types.FilterContext.StreamId,
+			Filter.Types.FilterType.Regex, new[] { @"^.*ES2.*$" });
+		var eventFilter = EventFilter.Get(true, filter);
+
+		var result = await ReadIndex.ReadAllEventsForwardFiltered(_forwardReadPos, 10, 10, eventFilter, CancellationToken.None);
+		Assert.AreEqual(1, result.Records.Count);
+	}
+
+	[Test]
+	public async Task should_read_only_events_backward_with_event_type_prefix() {
+		var filter = new Filter(
+			Filter.Types.FilterContext.EventType,
+			Filter.Types.FilterType.Prefix, new[] { "event-type" });
+		var eventFilter = EventFilter.Get(true, filter);
+
+		var result = await ReadIndex.ReadAllEventsBackwardFiltered(_backwardReadPos, 10, 10, eventFilter, CancellationToken.None);
+		Assert.AreEqual(2, result.Records.Count);
+	}
+
+	[Test]
+	public async Task should_read_only_events_backward_with_event_type_regex() {
+		var filter = new Filter(
+			Filter.Types.FilterContext.EventType,
+			Filter.Types.FilterType.Regex, new[] { @"^.*other-event.*$" });
+		var eventFilter = EventFilter.Get(true, filter);
+
+		var result = await ReadIndex.ReadAllEventsBackwardFiltered(_backwardReadPos, 10, 10, eventFilter, CancellationToken.None);
+		Assert.AreEqual(2, result.Records.Count);
+	}
+
+	[Test]
+	public async Task should_read_only_events_backward_with_stream_id_prefix() {
+		var filter = new Filter(
+			Filter.Types.FilterContext.StreamId,
+			Filter.Types.FilterType.Prefix, new[] { "ES2" });
+		var eventFilter = EventFilter.Get(true, filter);
+
+		var result = await ReadIndex.ReadAllEventsBackwardFiltered(_backwardReadPos, 10, 10, eventFilter, CancellationToken.None);
+		Assert.AreEqual(1, result.Records.Count);
+	}
+
+	[Test]
+	public async Task should_read_only_events_backward_with_stream_id_regex() {
+		var filter = new Filter(
+			Filter.Types.FilterContext.StreamId,
+			Filter.Types.FilterType.Regex, new[] { @"^.*ES2.*$" });
+		var eventFilter = EventFilter.Get(true, filter);
+
+		var result = await ReadIndex.ReadAllEventsBackwardFiltered(_backwardReadPos, 10, 10, eventFilter, CancellationToken.None);
+		Assert.AreEqual(1, result.Records.Count);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_reading_all_with_filtering_and_transactions.cs b/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_reading_all_with_filtering_and_transactions.cs
new file mode 100644
index 00000000000..496df0935da
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_reading_all_with_filtering_and_transactions.cs
@@ -0,0 +1,98 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.AllReader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class when_reading_all_with_filtering_and_transactions<TLogFormat, TStreamId>
+	: RepeatableDbTestScenario<TLogFormat, TStreamId> {
+
+	[Test]
+	public async Task should_receive_all_events_forward() {
+		// create a db with explicit transactions, some of which are filtered out on read.
+		// previously, a bug caused those filtered-out records to prevent the successful
+		// reading of subsequent events that are contained within an explicit transaction.
+
+		static Rec[] ExplicitTransaction(int transaction, string stream) => [
+			Rec.TransSt(transaction, stream),
+			Rec.Prepare(transaction, stream),
+			Rec.TransEnd(transaction, stream),
+			Rec.Commit(transaction, stream),
+		];
+
+		var i = 0;
+		await CreateDb([
+			.. ExplicitTransaction(i++, "excludedStream"),
+			.. ExplicitTransaction(i++, "includedStream0"),
+			.. ExplicitTransaction(i++, "includedStream1"),
+			.. ExplicitTransaction(i++, "includedStream2"),
+			.. ExplicitTransaction(i++, "includedStream3"),
+			.. ExplicitTransaction(i++, "includedStream4"),
+			.. ExplicitTransaction(i++, "includedStream5"),
+			.. ExplicitTransaction(i++, "includedStream6"),
+			.. ExplicitTransaction(i++, "includedStream7"),
+			.. ExplicitTransaction(i++, "includedStream8"),
+			.. ExplicitTransaction(i++, "includedStream9"),
+		]);
+
+		var read = await ReadIndex.ReadAllEventsForwardFiltered(
+			pos: new TFPos(0, 0),
+			maxCount: 10,
+			maxSearchWindow: int.MaxValue,
+			eventFilter: EventFilter.StreamName.Prefixes(false, "included"),
+			CancellationToken.None);
+
+		Assert.AreEqual(10, read.Records.Count);
+		for (int j = 0; j < 10; j++)
+			Assert.AreEqual($"includedStream{j}", read.Records[j].Event.EventStreamId);
+	}
+
+	[Test]
+	public async Task should_receive_all_events_backward() {
+		// create a db with explicit transactions, some of which are filtered out on read.
+		// previously, a bug caused those filtered-out records to prevent the successful
+		// reading of subsequent events that are contained within an explicit transaction.
+
+		static Rec[] ExplicitTransaction(int transaction, string stream) => [
+			Rec.TransSt(transaction, stream),
+			Rec.Prepare(transaction, stream),
+			Rec.TransEnd(transaction, stream),
+			Rec.Commit(transaction, stream),
+		];
+
+		var i = 0;
+		await CreateDb([
+			.. ExplicitTransaction(i++, "includedStream0"),
+			.. ExplicitTransaction(i++, "includedStream1"),
+			.. ExplicitTransaction(i++, "includedStream2"),
+			.. ExplicitTransaction(i++, "includedStream3"),
+			.. ExplicitTransaction(i++, "includedStream4"),
+			.. ExplicitTransaction(i++, "includedStream5"),
+			.. ExplicitTransaction(i++, "includedStream6"),
+			.. ExplicitTransaction(i++, "includedStream7"),
+			.. ExplicitTransaction(i++, "includedStream8"),
+			.. ExplicitTransaction(i++, "includedStream9"),
+			.. ExplicitTransaction(i++, "excludedStream"),
+		]);
+
+		var writerCp = DbRes.Db.Config.WriterCheckpoint.Read();
+		var read = await ReadIndex.ReadAllEventsBackwardFiltered(
+			pos: new TFPos(writerCp, writerCp),
+			maxCount: 10,
+			maxSearchWindow: int.MaxValue,
+			eventFilter: EventFilter.StreamName.Prefixes(false, "included"),
+			CancellationToken.None);
+
+		Assert.AreEqual(10, read.Records.Count);
+		for (int j = 9; j <= 0; j--)
+			Assert.AreEqual($"includedStream{j}", read.Records[j].Event.EventStreamId);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_reading_all_with_last_indexed_set.cs b/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_reading_all_with_last_indexed_set.cs
new file mode 100644
index 00000000000..3575d2931a2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_reading_all_with_last_indexed_set.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.AllReader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_reading_all<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WritePrepare("ES1", 0, Guid.NewGuid(), "event-type", new string('.', 3000), PrepareFlags.IsCommitted, token);
+		await WritePrepare("ES2", 0, Guid.NewGuid(), "event-type", new string('.', 3000), PrepareFlags.IsCommitted, token);
+		await WritePrepare("ES2", 1, Guid.NewGuid(), "event-type", new string('.', 3000), PrepareFlags.IsCommitted, token);
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_all_backwards() {
+		var checkpoint = WriterCheckpoint.Read();
+		var pos = new TFPos(checkpoint, checkpoint);
+		var result = (await ReadIndex.ReadAllEventsBackward(pos, 10, CancellationToken.None)).EventRecords();
+		Assert.AreEqual(3, result.Count);
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_all_forwards() {
+		var result = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(3, result.Count);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_reading_from_stream_which_is_disallowed_from_all.cs b/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_reading_from_stream_which_is_disallowed_from_all.cs
new file mode 100644
index 00000000000..cff559101c6
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/AllReader/when_reading_from_stream_which_is_disallowed_from_all.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.AllReader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string), "$persistentsubscription-$all::group-checkpoint")]
+[TestFixture(typeof(LogFormat.V2), typeof(string), "$persistentsubscription-$all::group-parked")]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), "$persistentsubscription-$all::group-checkpoint")]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), "$persistentsubscription-$all::group-parked")]
+public class when_reading_from_stream_which_is_disallowed_from_all<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private string _stream;
+	public when_reading_from_stream_which_is_disallowed_from_all(string stream) {
+		_stream = stream;
+	}
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteSingleEvent(_stream, 1, new string('.', 3000), eventId: Guid.NewGuid(),
+			eventType: "event-type-1", retryOnFail: true, token: token);
+		await WriteSingleEvent(_stream, 2, new string('.', 3000), eventId: Guid.NewGuid(),
+			eventType: "event-type-1", retryOnFail: true, token: token);
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_stream_events_forward() {
+		var result = await ReadIndex.ReadStreamEventsForward(_stream, 0L, 10, CancellationToken.None);
+		Assert.AreEqual(2, result.Records.Length);
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_stream_events_backward() {
+		var result = await ReadIndex.ReadStreamEventsBackward(_stream, -1, 10, CancellationToken.None);
+		Assert.AreEqual(2, result.Records.Length);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_duplicate_events_in_a_stream.cs b/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_duplicate_events_in_a_stream.cs
new file mode 100644
index 00000000000..008fb72f6db
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_duplicate_events_in_a_stream.cs
@@ -0,0 +1,243 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.TransactionLog;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.Util;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.BuildingIndex;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_building_an_index_off_tfile_with_duplicate_events_in_a_stream<TLogFormat, TStreamId>
+	: DuplicateReadIndexTestScenario<TLogFormat, TStreamId> {
+	private Guid _id1;
+	private Guid _id2;
+	private Guid _id3;
+	private Guid _id4;
+
+	private long pos0, pos1, pos2, pos3, pos4, pos5, pos6, pos7;
+
+	public when_building_an_index_off_tfile_with_duplicate_events_in_a_stream() : base(maxEntriesInMemTable: 3) {
+	}
+
+	protected override async ValueTask SetupDB(CancellationToken token) {
+		_id1 = Guid.NewGuid();
+		_id2 = Guid.NewGuid();
+		_id3 = Guid.NewGuid();
+
+		_logFormat.StreamNameIndex.GetOrReserve(_logFormat.RecordFactory, "duplicate_stream", 0, out var streamId, out var streamRecord);
+		if (streamRecord is not null) {
+			(_, pos0) = await Writer.Write(streamRecord, token);
+		}
+
+		var expectedVersion = ExpectedVersion.NoStream;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		//stream id: duplicate_stream at version: 0
+		(_, pos1) = await Writer.Write(LogRecord.Prepare(_logFormat.RecordFactory, pos0, _id1, _id1, pos0, 0, streamId, expectedVersion++,
+			PrepareFlags.SingleWrite, eventTypeId, new byte[0], new byte[0], DateTime.UtcNow), token);
+		(_, pos2) = await Writer.Write(new CommitLogRecord(pos1, _id1, pos0, DateTime.UtcNow, 0), token);
+
+		//stream id: duplicate_stream at version: 1
+		(_, pos3) = await Writer.Write(LogRecord.Prepare(_logFormat.RecordFactory, pos2, _id2, _id2, pos2, 0, streamId, expectedVersion++,
+			PrepareFlags.SingleWrite, eventTypeId, new byte[0], new byte[0], DateTime.UtcNow), token);
+		(_, pos4) = await Writer.Write(new CommitLogRecord(pos3, _id2, pos2, DateTime.UtcNow, 1), token);
+
+		//stream id: duplicate_stream at version: 2
+		(_, pos5) = await Writer.Write(LogRecord.Prepare(_logFormat.RecordFactory, pos4, _id3, _id3, pos4, 0, streamId, expectedVersion++,
+			PrepareFlags.SingleWrite, eventTypeId, new byte[0], new byte[0], DateTime.UtcNow), token);
+		(_, pos6) = await Writer.Write(new CommitLogRecord(pos5, _id3, pos4, DateTime.UtcNow, 2), token);
+	}
+
+	protected override async ValueTask Given(CancellationToken token) {
+		_id4 = Guid.NewGuid();
+
+		var streamId = _logFormat.StreamIds.LookupValue("duplicate_stream");
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		//stream id: duplicate_stream at version: 0 (duplicate event/index entry)
+		(_, pos7) = await Writer.Write(LogRecord.Prepare(_logFormat.RecordFactory, pos6, _id4, _id4, pos6, 0, streamId, ExpectedVersion.NoStream,
+			PrepareFlags.SingleWrite, eventTypeId, new byte[0], new byte[0], DateTime.UtcNow), token);
+		await Writer.Write(new CommitLogRecord(pos7, _id4, pos6, DateTime.UtcNow, 0), token);
+	}
+
+	[Test]
+	public async Task should_read_the_correct_last_event_number() {
+		var result = await ReadIndex.GetStreamLastEventNumber("duplicate_stream", CancellationToken.None);
+		Assert.AreEqual(2, result);
+	}
+}
+
+public abstract class DuplicateReadIndexTestScenario<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	protected readonly int MaxEntriesInMemTable;
+	protected readonly int MetastreamMaxCount;
+	protected readonly bool PerformAdditionalCommitChecks;
+	protected readonly byte IndexBitnessVersion;
+	protected LogFormatAbstractor<TStreamId> _logFormat;
+	protected TFChunkWriter Writer;
+	protected IReadIndex<TStreamId> ReadIndex;
+
+	private TFChunkDb _db;
+	private TableIndex<TStreamId> _tableIndex;
+
+	protected DuplicateReadIndexTestScenario(int maxEntriesInMemTable = 20, int metastreamMaxCount = 1,
+		byte indexBitnessVersion = Opts.IndexBitnessVersionDefault, bool performAdditionalChecks = false) {
+		Ensure.Positive(maxEntriesInMemTable, "maxEntriesInMemTable");
+		MaxEntriesInMemTable = maxEntriesInMemTable;
+		MetastreamMaxCount = metastreamMaxCount;
+		IndexBitnessVersion = indexBitnessVersion;
+		PerformAdditionalCommitChecks = performAdditionalChecks;
+	}
+
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var indexDirectory = GetFilePathFor("index");
+		_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
+			IndexDirectory = indexDirectory,
+		});
+
+		var writerCheckpoint = new InMemoryCheckpoint(0);
+		var chaserCheckpoint = new InMemoryCheckpoint(0);
+
+		var bus = new SynchronousScheduler();
+		new IODispatcher(bus, bus);
+
+		_db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, writerCheckpoint, chaserCheckpoint));
+
+		await _db.Open();
+		// create db
+		Writer = new TFChunkWriter(_db);
+		await Writer.Open(CancellationToken.None);
+		await SetupDB(CancellationToken.None);
+		await Writer.DisposeAsync();
+		Writer = null;
+
+		writerCheckpoint.Flush();
+		chaserCheckpoint.Write(writerCheckpoint.Read());
+		chaserCheckpoint.Flush();
+
+		var readers = new ObjectPool<ITransactionFileReader>("Readers", 2, 5,
+			() => new TFChunkReader(_db, _db.Config.WriterCheckpoint));
+		var lowHasher = _logFormat.LowHasher;
+		var highHasher = _logFormat.HighHasher;
+		var emptyStreamId = _logFormat.EmptyStreamId;
+		_tableIndex = new TableIndex<TStreamId>(indexDirectory, lowHasher, highHasher, emptyStreamId,
+			() => new HashListMemTable(IndexBitnessVersion, MaxEntriesInMemTable * 2),
+			() => new TFReaderLease(readers),
+			IndexBitnessVersion,
+			int.MaxValue,
+			Constants.PTableMaxReaderCountDefault,
+			MaxEntriesInMemTable);
+		_logFormat.StreamNamesProvider.SetTableIndex(_tableIndex);
+
+		var readIndex = new ReadIndex<TStreamId>(new NoopPublisher(),
+			readers,
+			_tableIndex,
+			_logFormat.StreamNameIndexConfirmer,
+			_logFormat.StreamIds,
+			_logFormat.StreamNamesProvider,
+			_logFormat.EmptyStreamId,
+			_logFormat.StreamIdValidator,
+			_logFormat.StreamIdSizer,
+			_logFormat.StreamExistenceFilter,
+			_logFormat.StreamExistenceFilterReader,
+			_logFormat.EventTypeIndexConfirmer,
+			new LRUCache<TStreamId, IndexBackend<TStreamId>.EventNumberCached>("LastEventNumber", 100_000),
+			new LRUCache<TStreamId, IndexBackend<TStreamId>.MetadataCached>("StreamMetadata", 100_000),
+			additionalCommitChecks: PerformAdditionalCommitChecks,
+			metastreamMaxCount: MetastreamMaxCount,
+			hashCollisionReadLimit: Opts.HashCollisionReadLimitDefault,
+			skipIndexScanOnReads: Opts.SkipIndexScanOnReadsDefault,
+			replicationCheckpoint: _db.Config.ReplicationCheckpoint,
+			indexCheckpoint: _db.Config.IndexCheckpoint,
+			indexStatusTracker: new IndexStatusTracker.NoOp(),
+			indexTracker: new IndexTracker.NoOp(),
+			cacheTracker: new CacheHitsMissesTracker.NoOp());
+
+
+		await readIndex.IndexCommitter.Init(chaserCheckpoint.Read(), CancellationToken.None);
+		ReadIndex = readIndex;
+
+		_tableIndex.Close(false);
+
+		Writer = new TFChunkWriter(_db);
+		await Writer.Open(CancellationToken.None);
+		await Given(CancellationToken.None);
+		await Writer.DisposeAsync();
+		Writer = null;
+
+		writerCheckpoint.Flush();
+		chaserCheckpoint.Write(writerCheckpoint.Read());
+		chaserCheckpoint.Flush();
+
+		_tableIndex = new TableIndex<TStreamId>(indexDirectory, lowHasher, highHasher, emptyStreamId,
+			() => new HashListMemTable(IndexBitnessVersion, MaxEntriesInMemTable * 2),
+			() => new TFReaderLease(readers),
+			IndexBitnessVersion,
+			int.MaxValue,
+			Constants.PTableMaxReaderCountDefault,
+			MaxEntriesInMemTable);
+
+		readIndex = new ReadIndex<TStreamId>(new NoopPublisher(),
+			readers,
+			_tableIndex,
+			_logFormat.StreamNameIndexConfirmer,
+			_logFormat.StreamIds,
+			_logFormat.StreamNamesProvider,
+			_logFormat.EmptyStreamId,
+			_logFormat.StreamIdValidator,
+			_logFormat.StreamIdSizer,
+			_logFormat.StreamExistenceFilter,
+			_logFormat.StreamExistenceFilterReader,
+			_logFormat.EventTypeIndexConfirmer,
+			new LRUCache<TStreamId, IndexBackend<TStreamId>.EventNumberCached>("LastEventNumber", 100_000),
+			new LRUCache<TStreamId, IndexBackend<TStreamId>.MetadataCached>("StreamMetadata", 100_000),
+			additionalCommitChecks: PerformAdditionalCommitChecks,
+			metastreamMaxCount: MetastreamMaxCount,
+			hashCollisionReadLimit: Opts.HashCollisionReadLimitDefault,
+			skipIndexScanOnReads: Opts.SkipIndexScanOnReadsDefault,
+			replicationCheckpoint: _db.Config.ReplicationCheckpoint,
+			indexCheckpoint: _db.Config.IndexCheckpoint,
+			indexStatusTracker: new IndexStatusTracker.NoOp(),
+			indexTracker: new IndexTracker.NoOp(),
+			cacheTracker: new CacheHitsMissesTracker.NoOp());
+
+		await readIndex.IndexCommitter.Init(chaserCheckpoint.Read(), CancellationToken.None);
+		ReadIndex = readIndex;
+	}
+
+	public override async Task TestFixtureTearDown() {
+		_logFormat?.Dispose();
+		ReadIndex.Close();
+		ReadIndex.Dispose();
+
+		_tableIndex.Close();
+
+		await _db.DisposeAsync();
+
+		await base.TestFixtureTearDown();
+	}
+
+	protected abstract ValueTask SetupDB(CancellationToken token);
+
+	protected abstract ValueTask Given(CancellationToken token);
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_multiple_events_in_a_stream.cs b/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_multiple_events_in_a_stream.cs
new file mode 100644
index 00000000000..774dbc33de0
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_multiple_events_in_a_stream.cs
@@ -0,0 +1,133 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.BuildingIndex;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_building_an_index_off_tfile_with_multiple_events_in_a_stream<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private Guid _id1;
+	private Guid _id2;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_id1 = Guid.NewGuid();
+		_id2 = Guid.NewGuid();
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		var (streamId, pos0) = await GetOrReserve("test1", token);
+
+		var (_, pos1) = await Writer.Write(LogRecord.SingleWrite(_recordFactory, pos0, _id1, _id1, streamId,
+			ExpectedVersion.NoStream,
+			eventTypeId, new byte[0], new byte[0], DateTime.UtcNow), token);
+		var (_, pos2) = await Writer.Write(LogRecord.SingleWrite(_recordFactory, pos1, _id2, _id2, streamId, 0,
+			eventTypeId, new byte[0], new byte[0]), token);
+		var (_, pos3) = await Writer.Write(new CommitLogRecord(pos2, _id1, pos0, DateTime.UtcNow, 0), token);
+		await Writer.Write(new CommitLogRecord(pos3, _id2, pos1, DateTime.UtcNow, 1), token);
+	}
+
+	[Test]
+	public async Task no_event_is_returned_when_nonexistent_stream_is_requested() {
+		var result = await ReadIndex.ReadEvent("test2", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task the_first_event_can_be_read() {
+		var result = await ReadIndex.ReadEvent("test1", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_id1, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task the_second_event_can_be_read() {
+		var result = await ReadIndex.ReadEvent("test1", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_id2, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task the_third_event_is_not_found() {
+		var result = await ReadIndex.ReadEvent("test1", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task the_last_event_is_returned() {
+		var result = await ReadIndex.ReadEvent("test1", -1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_id2, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task the_stream_can_be_read_with_two_events_in_right_order_when_starting_from_specified_event_number() {
+		var result = await ReadIndex.ReadStreamEventsBackward("test1", 1, 10, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+
+		Assert.AreEqual(_id1, result.Records[1].EventId);
+		Assert.AreEqual(_id2, result.Records[0].EventId);
+	}
+
+	[Test]
+	public async Task the_stream_can_be_read_with_two_events_backward_from_end() {
+		var result = await ReadIndex.ReadStreamEventsBackward("test1", -1, 10, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+
+		Assert.AreEqual(_id1, result.Records[1].EventId);
+		Assert.AreEqual(_id2, result.Records[0].EventId);
+	}
+
+	[Test]
+	public async Task the_stream_returns_events_with_correct_pagination() {
+		var result = await ReadIndex.ReadStreamEventsBackward("test1", 0, 10, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+
+		Assert.AreEqual(_id1, result.Records[0].EventId);
+	}
+
+	[Test]
+	public async Task the_stream_returns_nothing_for_nonexistent_page() {
+		var result = await ReadIndex.ReadStreamEventsBackward("test1", 100, 10, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task no_events_are_return_if_event_stream_doesnt_exist() {
+		var result = await ReadIndex.ReadStreamEventsBackward("test2", 0, 10, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.IsNotNull(result.Records);
+		Assert.IsEmpty(result.Records);
+	}
+
+	[Test]
+	public async Task read_all_events_forward_returns_all_events_in_correct_order() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10, CancellationToken.None))
+			.EventRecords();
+
+		Assert.AreEqual(2, records.Count);
+		Assert.AreEqual(_id1, records[0].Event.EventId);
+		Assert.AreEqual(_id2, records[1].Event.EventId);
+	}
+
+	[Test]
+	public async Task read_all_events_backward_returns_all_events_in_correct_order() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 10, CancellationToken.None)).EventRecords();
+
+		Assert.AreEqual(2, records.Count);
+		Assert.AreEqual(_id1, records[1].Event.EventId);
+		Assert.AreEqual(_id2, records[0].Event.EventId);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_non_zero_capacity.cs b/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_non_zero_capacity.cs
new file mode 100644
index 00000000000..99e3ec303c0
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_non_zero_capacity.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.BuildingIndex;
+
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_building_an_index_off_tfile_with_non_zero_capacity<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	public when_building_an_index_off_tfile_with_non_zero_capacity() : base(streamInfoCacheCapacity: 20) {
+	}
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await GetOrReserve("test1", token);
+		await GetOrReserve("test2", token);
+		await GetOrReserve("test3", token);
+	}
+
+	[Test]
+	public async Task the_stream_created_records_can_be_read() {
+		var records = (await ReadIndex.ReadStreamEventsForward(SystemStreams.StreamsCreatedStream, 0, 20, CancellationToken.None))
+			.Records;
+		Assert.AreEqual(3, records.Length);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_and_commits.cs b/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_and_commits.cs
new file mode 100644
index 00000000000..f297b4b1f15
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_and_commits.cs
@@ -0,0 +1,130 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.BuildingIndex;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_building_an_index_off_tfile_with_prepares_and_commits<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private Guid _id1;
+	private Guid _id2;
+	private Guid _id3;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_id1 = Guid.NewGuid();
+		_id2 = Guid.NewGuid();
+		_id3 = Guid.NewGuid();
+		var (streamId1, _) = await GetOrReserve("test1", token);
+		var (streamId2, pos0) = await GetOrReserve("test2", token);
+		var expectedVersion1 = ExpectedVersion.NoStream;
+		var expectedVersion2 = ExpectedVersion.NoStream;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		var (_, pos1) = await Writer.Write(LogRecord.Prepare(_logFormat.RecordFactory, pos0, _id1, _id1, pos0, 0, streamId1, expectedVersion1++,
+				PrepareFlags.SingleWrite, eventTypeId, new byte[0], new byte[0], DateTime.UtcNow),
+			token);
+		var (_, pos2) = await Writer.Write(LogRecord.Prepare(_logFormat.RecordFactory, pos1, _id2, _id2, pos1, 0, streamId2, expectedVersion2++,
+				PrepareFlags.SingleWrite, eventTypeId, new byte[0], new byte[0], DateTime.UtcNow),
+			token);
+		var (_, pos3) = await Writer.Write(LogRecord.Prepare(_logFormat.RecordFactory, pos2, _id3, _id3, pos2, 0, streamId2, expectedVersion2++,
+				PrepareFlags.SingleWrite, eventTypeId, new byte[0], new byte[0], DateTime.UtcNow),
+			token);
+		var (_, pos4) = await Writer.Write(new CommitLogRecord(pos3, _id1, pos0, DateTime.UtcNow, 0), token);
+		var (_, pos5) = await Writer.Write(new CommitLogRecord(pos4, _id2, pos1, DateTime.UtcNow, 0), token);
+		await Writer.Write(new CommitLogRecord(pos5, _id3, pos2, DateTime.UtcNow, 1), token);
+	}
+
+	[Test]
+	public async Task the_first_event_can_be_read() {
+		var result = await ReadIndex.ReadEvent("test1", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_id1, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task the_nonexisting_event_can_not_be_read() {
+		var result = await ReadIndex.ReadEvent("test1", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task the_second_event_can_be_read() {
+		var result = await ReadIndex.ReadEvent("test2", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_id2, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task the_last_event_of_first_stream_can_be_read() {
+		var result = await ReadIndex.ReadEvent("test1", -1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_id1, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task the_last_event_of_second_stream_can_be_read() {
+		var result = await ReadIndex.ReadEvent("test2", -1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_id3, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task the_last_event_of_nonexistent_stream_cant_be_read() {
+		var result = await ReadIndex.ReadEvent("test7", -1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task the_stream_can_be_read_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("test1", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_id1, result.Records[0].EventId);
+	}
+
+	[Test]
+	public async Task the_stream_can_be_read_for_second_stream_from_end() {
+		var result = await ReadIndex.ReadStreamEventsBackward("test2", -1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_id3, result.Records[0].EventId);
+	}
+
+	[Test]
+	public async Task the_stream_can_be_read_for_second_stream_from_event_number() {
+		var result = await ReadIndex.ReadStreamEventsBackward("test2", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_id3, result.Records[0].EventId);
+	}
+
+	[Test]
+	public async Task read_all_events_forward_returns_all_events_in_correct_order() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10, CancellationToken.None))
+			.EventRecords();
+
+		Assert.AreEqual(3, records.Count);
+		Assert.AreEqual(_id1, records[0].Event.EventId);
+		Assert.AreEqual(_id2, records[1].Event.EventId);
+		Assert.AreEqual(_id3, records[2].Event.EventId);
+	}
+
+	[Test]
+	public async Task read_all_events_backward_returns_all_events_in_correct_order() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 10, CancellationToken.None)).EventRecords();
+
+		Assert.AreEqual(3, records.Count);
+		Assert.AreEqual(_id1, records[2].Event.EventId);
+		Assert.AreEqual(_id2, records[1].Event.EventId);
+		Assert.AreEqual(_id3, records[0].Event.EventId);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_and_commits_for_events_with_version_numbers_greater_than_int_maxvalue.cs b/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_and_commits_for_events_with_version_numbers_greater_than_int_maxvalue.cs
new file mode 100644
index 00000000000..1c21d809144
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_and_commits_for_events_with_version_numbers_greater_than_int_maxvalue.cs
@@ -0,0 +1,126 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.BuildingIndex;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_building_an_index_off_tfile_with_prepares_and_commits_for_events_with_version_numbers_greater_than_int_maxvalue<TLogFormat, TStreamId>
+	: ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private Guid _id1;
+	private Guid _id2;
+	private Guid _id3;
+
+	private long firstEventNumber = (long)int.MaxValue + 1;
+	private long secondEventNumber = (long)int.MaxValue + 2;
+	private long thirdEventNumber = (long)int.MaxValue + 3;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_id1 = Guid.NewGuid();
+		_id2 = Guid.NewGuid();
+		_id3 = Guid.NewGuid();
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		var (test1StreamId, _) = await GetOrReserve("test1", token);
+		var (test2StreamId, pos0) = await GetOrReserve("test2", token);
+
+		var (_, pos1) = await Writer.Write(LogRecord.SingleWrite(_recordFactory, pos0, _id1, _id1, test1StreamId, firstEventNumber,
+			eventTypeId, new byte[0], new byte[0], DateTime.UtcNow), token);
+		var (_, pos2) = await Writer.Write(LogRecord.SingleWrite(_recordFactory, pos1, _id2, _id2, test2StreamId, secondEventNumber,
+			eventTypeId, new byte[0], new byte[0], DateTime.UtcNow), token);
+		var (_, pos3) = await Writer.Write(LogRecord.SingleWrite(_recordFactory, pos2, _id3, _id3, test2StreamId, thirdEventNumber,
+			eventTypeId, new byte[0], new byte[0], DateTime.UtcNow), token);
+		var (_, pos4) = await Writer.Write(new CommitLogRecord(pos3, _id1, pos0, DateTime.UtcNow, firstEventNumber), token);
+		var (_, pos5) = await Writer.Write(new CommitLogRecord(pos4, _id2, pos1, DateTime.UtcNow, secondEventNumber), token);
+		await Writer.Write(new CommitLogRecord(pos5, _id3, pos2, DateTime.UtcNow, thirdEventNumber), token);
+	}
+
+	[Test]
+	public async Task the_first_event_can_be_read() {
+		var result = await ReadIndex.ReadEvent("test1", firstEventNumber, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_id1, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task the_nonexisting_event_can_not_be_read() {
+		var result = await ReadIndex.ReadEvent("test1", firstEventNumber + 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task the_second_event_can_be_read() {
+		var result = await ReadIndex.ReadEvent("test2", secondEventNumber, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_id2, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task the_last_event_of_first_stream_can_be_read() {
+		var result = await ReadIndex.ReadEvent("test1", -1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_id1, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task the_last_event_of_second_stream_can_be_read() {
+		var result = await ReadIndex.ReadEvent("test2", -1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_id3, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task the_stream_can_be_read_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("test1", firstEventNumber, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_id1, result.Records[0].EventId);
+	}
+
+	[Test]
+	public async Task the_stream_can_be_read_for_second_stream_from_end() {
+		var result = await ReadIndex.ReadStreamEventsBackward("test2", -1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_id3, result.Records[0].EventId);
+	}
+
+	[Test]
+	public async Task the_stream_can_be_read_for_second_stream_from_event_number() {
+		var result = await ReadIndex.ReadStreamEventsBackward("test2", thirdEventNumber, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_id3, result.Records[0].EventId);
+	}
+
+	[Test]
+	public async Task read_all_events_forward_returns_all_events_in_correct_order() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10, CancellationToken.None))
+			.EventRecords();
+
+		Assert.AreEqual(3, records.Count);
+		Assert.AreEqual(_id1, records[0].Event.EventId);
+		Assert.AreEqual(_id2, records[1].Event.EventId);
+		Assert.AreEqual(_id3, records[2].Event.EventId);
+	}
+
+	[Test]
+	public async Task read_all_events_backward_returns_all_events_in_correct_order() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 10, CancellationToken.None)).EventRecords();
+
+		Assert.AreEqual(3, records.Count);
+		Assert.AreEqual(_id1, records[2].Event.EventId);
+		Assert.AreEqual(_id2, records[1].Event.EventId);
+		Assert.AreEqual(_id3, records[0].Event.EventId);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_and_commits_for_log_records_of_mixed_versions.cs b/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_and_commits_for_log_records_of_mixed_versions.cs
new file mode 100644
index 00000000000..f449dc6423c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_and_commits_for_log_records_of_mixed_versions.cs
@@ -0,0 +1,123 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.BuildingIndex;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Not applicable")]
+public class
+	when_building_an_index_off_tfile_with_prepares_and_commits_for_log_records_of_mixed_versions<TLogFormat, TStreamId> :
+		ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private Guid _id1;
+	private Guid _id2;
+	private Guid _id3;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_id1 = Guid.NewGuid();
+		_id2 = Guid.NewGuid();
+		_id3 = Guid.NewGuid();
+		var (_, pos1) = await Writer.Write(new PrepareLogRecord(0, _id1, _id1, 0, 0, "test1", null, 0, DateTime.UtcNow,
+				PrepareFlags.SingleWrite, "type", null, new byte[0], new byte[0], LogRecordVersion.LogRecordV0),
+			token);
+		var (_, pos2) = await Writer.Write(new PrepareLogRecord(pos1, _id2, _id2, pos1, 0, "test2", null, 0, DateTime.UtcNow,
+				PrepareFlags.SingleWrite, "type", null, new byte[0], new byte[0], LogRecordVersion.LogRecordV0),
+			token);
+		var (_, pos3) = await Writer.Write(new PrepareLogRecord(pos2, _id3, _id3, pos2, 0, "test2", null, 1, DateTime.UtcNow,
+				PrepareFlags.SingleWrite, "type", null, new byte[0], new byte[0]),
+			token);
+		var (_, pos4) = await Writer.Write(new CommitLogRecord(pos3, _id1, 0, DateTime.UtcNow, 0, LogRecordVersion.LogRecordV0),
+			token);
+		var (_, pos5) = await Writer.Write(new CommitLogRecord(pos4, _id2, pos1, DateTime.UtcNow, 0, LogRecordVersion.LogRecordV0),
+			token);
+		await Writer.Write(new CommitLogRecord(pos5, _id3, pos2, DateTime.UtcNow, 1), token);
+	}
+
+	[Test]
+	public async Task the_first_event_can_be_read() {
+		var result = await ReadIndex.ReadEvent("test1", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_id1, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task the_nonexisting_event_can_not_be_read() {
+		var result = await ReadIndex.ReadEvent("test1", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task the_second_event_can_be_read() {
+		var result = await ReadIndex.ReadEvent("test2", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_id2, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task the_last_event_of_first_stream_can_be_read() {
+		var result = await ReadIndex.ReadEvent("test1", -1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_id1, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task the_last_event_of_second_stream_can_be_read() {
+		var result = await ReadIndex.ReadEvent("test2", -1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_id3, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task the_stream_can_be_read_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("test1", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_id1, result.Records[0].EventId);
+	}
+
+	[Test]
+	public async Task the_stream_can_be_read_for_second_stream_from_end() {
+		var result = await ReadIndex.ReadStreamEventsBackward("test2", -1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_id3, result.Records[0].EventId);
+	}
+
+	[Test]
+	public async Task the_stream_can_be_read_for_second_stream_from_event_number() {
+		var result = await ReadIndex.ReadStreamEventsBackward("test2", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_id3, result.Records[0].EventId);
+	}
+
+	[Test]
+	public async Task read_all_events_forward_returns_all_events_in_correct_order() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10, CancellationToken.None))
+			.Records;
+
+		Assert.AreEqual(3, records.Count);
+		Assert.AreEqual(_id1, records[0].Event.EventId);
+		Assert.AreEqual(_id2, records[1].Event.EventId);
+		Assert.AreEqual(_id3, records[2].Event.EventId);
+	}
+
+	[Test]
+	public async Task read_all_events_backward_returns_all_events_in_correct_order() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 10, CancellationToken.None)).Records;
+
+		Assert.AreEqual(3, records.Count);
+		Assert.AreEqual(_id1, records[2].Event.EventId);
+		Assert.AreEqual(_id2, records[1].Event.EventId);
+		Assert.AreEqual(_id3, records[0].Event.EventId);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_but_no_commits.cs b/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_but_no_commits.cs
new file mode 100644
index 00000000000..49607e4f7eb
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_prepares_but_no_commits.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.BuildingIndex;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_building_an_index_off_tfile_with_prepares_but_no_commits<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var (streamId1, _) = await GetOrReserve("test1", token);
+		var (streamId2, _) = await GetOrReserve("test2", token);
+		var (streamId3, p0) = await GetOrReserve("test3", token);
+
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		var (_, p1) = await Writer.Write(LogRecord.Prepare(_logFormat.RecordFactory, p0, Guid.NewGuid(), Guid.NewGuid(), p0, 0, streamId1, -1,
+				PrepareFlags.SingleWrite, eventTypeId, new byte[0], new byte[0], DateTime.UtcNow),
+			token);
+		var (_, p2) = await Writer.Write(LogRecord.Prepare(_logFormat.RecordFactory, p1, Guid.NewGuid(), Guid.NewGuid(), p1, 0, streamId2, -1,
+				PrepareFlags.SingleWrite, eventTypeId, new byte[0], new byte[0], DateTime.UtcNow),
+			token);
+
+		await Writer.Write(LogRecord.Prepare(_logFormat.RecordFactory, p2, Guid.NewGuid(), Guid.NewGuid(), p2, 0, streamId3, -1,
+				PrepareFlags.SingleWrite, eventTypeId, new byte[0], new byte[0], DateTime.UtcNow),
+			token);
+	}
+
+	[Test]
+	public async Task the_first_stream_is_not_in_index_yet() {
+		var result = await ReadIndex.ReadEvent("test1", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task the_second_stream_is_not_in_index_yet() {
+		var result = await ReadIndex.ReadEvent("test2", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task the_last_event_is_not_returned_for_stream() {
+		var result = await ReadIndex.ReadEvent("test2", -1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task read_all_events_forward_returns_no_events() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(0, records.Count);
+	}
+
+	[Test]
+	public async Task read_all_events_backward_returns_no_events() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 10, CancellationToken.None)).EventRecords();
+		Assert.AreEqual(0, records.Count);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_two_events_in_stream.cs b/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_two_events_in_stream.cs
new file mode 100644
index 00000000000..66c7746efc2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/BuildingIndex/when_building_an_index_off_tfile_with_two_events_in_stream.cs
@@ -0,0 +1,123 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.BuildingIndex;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_building_an_index_off_tfile_with_two_events_in_stream<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private Guid _id1;
+	private Guid _id2;
+
+	private IPrepareLogRecord<TStreamId> _prepare1;
+	private IPrepareLogRecord<TStreamId> _prepare2;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_id1 = Guid.NewGuid();
+		_id2 = Guid.NewGuid();
+
+		var (streamId1, _) = await GetOrReserve("test1", token);
+		var (eventTypeId, pos0) = await GetOrReserveEventType("eventType", token);
+		_prepare1 = LogRecord.SingleWrite(_recordFactory, pos0, _id1, _id1, streamId1, ExpectedVersion.NoStream, eventTypeId, new byte[0], new byte[0]);
+		var (_, pos1) = await Writer.Write(_prepare1, token);
+		_prepare2 = LogRecord.SingleWrite(_recordFactory, pos1, _id2, _id2, streamId1, 0, eventTypeId, new byte[0], new byte[0]);
+		var (_, pos2) = await Writer.Write(_prepare2, token);
+		var (_, pos3) = await Writer.Write(new CommitLogRecord(pos2, _id1, pos0, DateTime.UtcNow, 0), token);
+		await Writer.Write(new CommitLogRecord(pos3, _id2, pos1, DateTime.UtcNow, 1), token);
+	}
+
+	[Test]
+	public async Task the_first_event_can_be_read() {
+		var result = await ReadIndex.ReadEvent("test1", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(new EventRecord(0, _prepare1, "test1", "eventType"), result.Record);
+	}
+
+	[Test]
+	public async Task the_second_event_can_be_read() {
+		var result = await ReadIndex.ReadEvent("test1", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(new EventRecord(1, _prepare2, "test1", "eventType"), result.Record);
+	}
+
+	[Test]
+	public async Task the_nonexisting_event_can_not_be_read() {
+		var result = await ReadIndex.ReadEvent("test1", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+	}
+
+	[Test]
+	public async Task the_last_event_can_be_read_and_is_correct() {
+		var result = await ReadIndex.ReadEvent("test1", -1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(new EventRecord(1, _prepare2, "test1", "eventType"), result.Record);
+	}
+
+	[Test]
+	public async Task the_first_event_can_be_read_through_range_query() {
+		var result = await ReadIndex.ReadStreamEventsBackward("test1", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(new EventRecord(0, _prepare1, "test1", "eventType"), result.Records[0]);
+	}
+
+	[Test]
+	public async Task the_second_event_can_be_read_through_range_query() {
+		var result = await ReadIndex.ReadStreamEventsBackward("test1", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(new EventRecord(1, _prepare2, "test1", "eventType"), result.Records[0]);
+	}
+
+	[Test]
+	public async Task the_stream_can_be_read_as_a_whole_with_specific_from_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("test1", 1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(new EventRecord(1, _prepare2, "test1", "eventType"), result.Records[0]);
+		Assert.AreEqual(new EventRecord(0, _prepare1, "test1", "eventType"), result.Records[1]);
+	}
+
+	[Test]
+	public async Task the_stream_can_be_read_as_a_whole_with_from_end() {
+		var result = await ReadIndex.ReadStreamEventsBackward("test1", -1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(new EventRecord(1, _prepare2, "test1", "eventType"), result.Records[0]);
+		Assert.AreEqual(new EventRecord(0, _prepare1, "test1", "eventType"), result.Records[1]);
+	}
+
+	[Test]
+	public async Task the_stream_cant_be_read_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("test2", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task read_all_events_forward_returns_all_events_in_correct_order() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10, CancellationToken.None))
+			.EventRecords();
+
+		Assert.AreEqual(2, records.Count);
+		Assert.AreEqual(_id1, records[0].Event.EventId);
+		Assert.AreEqual(_id2, records[1].Event.EventId);
+	}
+
+	[Test]
+	public async Task read_all_events_backward_returns_all_events_in_correct_order() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 10, CancellationToken.None)).EventRecords();
+
+		Assert.AreEqual(2, records.Count);
+		Assert.AreEqual(_id1, records[1].Event.EventId);
+		Assert.AreEqual(_id2, records[0].Event.EventId);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/ByLengthHasher.cs b/src/KurrentDB.Core.Tests/Services/Storage/ByLengthHasher.cs
new file mode 100644
index 00000000000..a226b9afddc
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/ByLengthHasher.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Index.Hashes;
+
+namespace KurrentDB.Core.Tests.Services.Storage;
+
+public class ByLengthHasher : IHasher<string> {
+	public uint Hash(string s) {
+		return (uint)s.Length;
+	}
+
+	public uint Hash(byte[] data) {
+		return (uint)data.Length;
+	}
+
+	public uint Hash(byte[] data, int offset, uint len, uint seed) {
+		return len;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Chaser/when_chaser_reads_commit_event.cs b/src/KurrentDB.Core.Tests/Services/Storage/Chaser/when_chaser_reads_commit_event.cs
new file mode 100644
index 00000000000..287f55a0b53
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Chaser/when_chaser_reads_commit_event.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Chaser;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_chaser_reads_commit_event<TLogFormat, TStreamId> : with_storage_chaser_service<TLogFormat, TStreamId> {
+	private long _logPosition;
+	private Guid _eventId;
+	private Guid _transactionId;
+
+	public override async ValueTask When(CancellationToken token) {
+		_eventId = Guid.NewGuid();
+		_transactionId = Guid.NewGuid();
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		var record = LogRecord.Prepare(
+			factory: recordFactory,
+			logPosition: 0,
+			eventId: _eventId,
+			correlationId: _transactionId,
+			transactionPos: 0xDEAD,
+			transactionOffset: 0xBEEF,
+			eventStreamId: streamId,
+			expectedVersion: 1234,
+			timeStamp: new DateTime(2012, 12, 21),
+			flags: PrepareFlags.Data,
+			eventType: eventTypeId,
+			data: new byte[] { 1, 2, 3, 4, 5 },
+			metadata: new byte[] { 7, 17 });
+
+		(var written, _logPosition) = await Writer.Write(record, token);
+		Assert.True(written);
+		await Writer.Flush(token);
+
+		IndexCommitter.AddPendingPrepare(new[] { record }, _logPosition);
+		var record2 = new CommitLogRecord(
+			logPosition: _logPosition,
+			correlationId: _transactionId,
+			transactionPosition: 0,
+			timeStamp: new DateTime(2012, 12, 21),
+			firstEventNumber: 10);
+
+		(written, _) = await Writer.Write(record2, token);
+		Assert.True(written);
+		await Writer.Flush(token);
+	}
+	[Test]
+	public void commit_ack_should_be_published() {
+		AssertEx.IsOrBecomesTrue(() => CommitAcks.Count == 1, msg: "CommitAck msg not received");
+		Assert.True(CommitAcks.TryDequeue(out var commitAck));
+		Assert.AreEqual(_transactionId, commitAck.CorrelationId);
+	}
+
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Chaser/when_chaser_reads_committed_prepare_event.cs b/src/KurrentDB.Core.Tests/Services/Storage/Chaser/when_chaser_reads_committed_prepare_event.cs
new file mode 100644
index 00000000000..53d1ee0de05
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Chaser/when_chaser_reads_committed_prepare_event.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Chaser;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_chaser_reads_committed_prepare_event<TLogFormat, TStreamId> : with_storage_chaser_service<TLogFormat, TStreamId> {
+	private Guid _eventId;
+	private Guid _transactionId;
+
+	public override async ValueTask When(CancellationToken token) {
+		_eventId = Guid.NewGuid();
+		_transactionId = Guid.NewGuid();
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		var record = LogRecord.Prepare(
+			factory: recordFactory,
+			logPosition: 0,
+			eventId: _eventId,
+			correlationId: _transactionId,
+			transactionPos: 0xDEAD,
+			transactionOffset: 0xBEEF,
+			eventStreamId: streamId,
+			expectedVersion: 1234,
+			timeStamp: new DateTime(2012, 12, 21),
+			flags: PrepareFlags.IsCommitted | PrepareFlags.TransactionEnd,
+			eventType: eventTypeId,
+			data: new byte[] { 1, 2, 3, 4, 5 },
+			metadata: new byte[] { 7, 17 });
+
+		Assert.True(await Writer.Write(record, token) is (true, _));
+		await Writer.Flush(token);
+	}
+	[Test]
+	public void commit_ack_should_be_published() {
+		AssertEx.IsOrBecomesTrue(() => CommitAcks.Count >= 1, msg: "CommitAck msg not received");
+		Assert.True(CommitAcks.TryDequeue(out var commitAck));
+		Assert.AreEqual(_transactionId, commitAck.CorrelationId);
+
+	}
+
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Chaser/when_chaser_reads_prepare_event.cs b/src/KurrentDB.Core.Tests/Services/Storage/Chaser/when_chaser_reads_prepare_event.cs
new file mode 100644
index 00000000000..34e72ad6409
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Chaser/when_chaser_reads_prepare_event.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Chaser;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_chaser_reads_prepare_event<TLogFormat, TStreamId> : with_storage_chaser_service<TLogFormat, TStreamId> {
+	private Guid _eventId;
+	private Guid _transactionId;
+
+	public override async ValueTask When(CancellationToken token) {
+		_eventId = Guid.NewGuid();
+		_transactionId = Guid.NewGuid();
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		var record = LogRecord.Prepare(
+			factory: recordFactory,
+			logPosition: 0,
+			eventId: _eventId,
+			correlationId: _transactionId,
+			transactionPos: 0xDEAD,
+			transactionOffset: 0xBEEF,
+			eventStreamId: streamId,
+			expectedVersion: 1234,
+			timeStamp: new DateTime(2012, 12, 21),
+			flags: PrepareFlags.SingleWrite,
+			eventType: eventTypeId,
+			data: new byte[] { 1, 2, 3, 4, 5 },
+			metadata: new byte[] { 7, 17 });
+
+		Assert.True(await Writer.Write(record, token) is (true, _));
+		await Writer.Flush(token);
+	}
+	[Test]
+	public void prepare_ack_should_be_published() {
+		AssertEx.IsOrBecomesTrue(() => PrepareAcks.Count == 1, msg: "PrepareAck msg not received");
+		Assert.True(PrepareAcks.TryDequeue(out var prepareAck));
+		Assert.AreEqual(_transactionId, prepareAck.CorrelationId);
+
+	}
+
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Chaser/when_chaser_reads_system_event.cs b/src/KurrentDB.Core.Tests/Services/Storage/Chaser/when_chaser_reads_system_event.cs
new file mode 100644
index 00000000000..ea4001f6662
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Chaser/when_chaser_reads_system_event.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Chaser;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_chaser_reads_system_event<TLogFormat, TStreamId> : with_storage_chaser_service<TLogFormat, TStreamId> {
+	private Guid _epochId;
+	private int _epochNumber;
+
+	public override async ValueTask When(CancellationToken token) {
+		_epochId = Guid.NewGuid();
+		_epochNumber = 7;
+		var epoch = new EpochRecord(0, _epochNumber, _epochId, -1, DateTime.UtcNow, Guid.Empty);
+		var rec = new SystemLogRecord(epoch.EpochPosition, epoch.TimeStamp, SystemRecordType.Epoch,
+			SystemRecordSerialization.Json, epoch.AsSerialized());
+
+		Assert.True(await Writer.Write(rec, token) is (true, _));
+		await Writer.Flush(token);
+	}
+	[Test]
+	public void epoch_should_be_updated() {
+		AssertEx.IsOrBecomesTrue(() => EpochManager.GetLastEpoch() != null);
+		Assert.AreEqual(_epochId, EpochManager.GetLastEpoch().EpochId);
+		Assert.AreEqual(_epochNumber, EpochManager.GetLastEpoch().EpochNumber);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Chaser/with_storage_chaser_service.cs b/src/KurrentDB.Core.Tests/Services/Storage/Chaser/with_storage_chaser_service.cs
new file mode 100644
index 00000000000..57dacd2c218
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Chaser/with_storage_chaser_service.cs
@@ -0,0 +1,96 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Storage;
+using KurrentDB.Core.Services.Storage.EpochManager;
+using KurrentDB.Core.Tests.Services.ElectionsService;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Chaser;
+
+public abstract class with_storage_chaser_service<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	readonly ICheckpoint _writerChk = new InMemoryCheckpoint(Checkpoint.Writer);
+	readonly ICheckpoint _chaserChk = new InMemoryCheckpoint(Checkpoint.Chaser);
+	readonly ICheckpoint _epochChk = new InMemoryCheckpoint(Checkpoint.Epoch, initValue: -1);
+	readonly ICheckpoint _proposalChk = new InMemoryCheckpoint(Checkpoint.Proposal, initValue: -1);
+	readonly ICheckpoint _truncateChk = new InMemoryCheckpoint(Checkpoint.Truncate, initValue: -1);
+	readonly ICheckpoint _replicationCheckpoint = new InMemoryCheckpoint(-1);
+	readonly ICheckpoint _indexCheckpoint = new InMemoryCheckpoint(-1);
+	readonly ICheckpoint _streamExistenceFilterCheckpoint = new InMemoryCheckpoint(-1);
+
+	protected SynchronousScheduler Publisher = new("publisher");
+	protected StorageChaser<TStreamId> Service;
+	protected FakeIndexCommitterService<TStreamId> IndexCommitter;
+	protected IEpochManager EpochManager;
+	protected TFChunkDb Db;
+	protected TFChunkChaser Chaser;
+	protected TFChunkWriter Writer;
+
+	protected ConcurrentQueue<StorageMessage.PrepareAck> PrepareAcks = new();
+	protected ConcurrentQueue<StorageMessage.CommitAck> CommitAcks = new();
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		Db = new TFChunkDb(CreateDbConfig());
+		await Db.Open();
+		Chaser = new TFChunkChaser(Db, _writerChk, _chaserChk);
+		Chaser.Open();
+		Writer = new TFChunkWriter(Db);
+		await Writer.Open(CancellationToken.None);
+
+		IndexCommitter = new FakeIndexCommitterService<TStreamId>();
+		EpochManager = new FakeEpochManager();
+
+		Service = new StorageChaser<TStreamId>(
+			Publisher,
+			_writerChk,
+			Chaser,
+			IndexCommitter,
+			EpochManager,
+			new QueueStatsManager());
+
+		Service.Handle(new SystemMessage.SystemStart());
+		Service.Handle(new SystemMessage.SystemInit());
+
+		Publisher.Subscribe(new AdHocHandler<StorageMessage.CommitAck>(CommitAcks.Enqueue));
+		Publisher.Subscribe(new AdHocHandler<StorageMessage.PrepareAck>(PrepareAcks.Enqueue));
+
+		await When(CancellationToken.None);
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await base.TestFixtureTearDown();
+		Service.Handle(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), true, true));
+	}
+
+
+	public abstract ValueTask When(CancellationToken token);
+
+	private TFChunkDbConfig CreateDbConfig() {
+
+		var nodeConfig = new TFChunkDbConfig(
+			PathName,
+			1000,
+			10000,
+			_writerChk,
+			_chaserChk,
+			_epochChk,
+			_proposalChk,
+			_truncateChk,
+			_replicationCheckpoint,
+			_indexCheckpoint,
+			_streamExistenceFilterCheckpoint,
+			true);
+		return nodeConfig;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_few_prepares_and_committing_one.cs b/src/KurrentDB.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_few_prepares_and_committing_one.cs
new file mode 100644
index 00000000000..e0e6abaef4c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_few_prepares_and_committing_one.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.CheckCommitStartingAt;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class when_writing_few_prepares_and_committing_one<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private IPrepareLogRecord _prepare0;
+	private IPrepareLogRecord _prepare1;
+	private IPrepareLogRecord _prepare2;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_prepare0 = await WritePrepare("ES", expectedVersion: -1, token: token);
+		_prepare1 = await WritePrepare("ES", expectedVersion: 0, token: token);
+		_prepare2 = await WritePrepare("ES", expectedVersion: 1, token: token);
+		await WriteCommit(_prepare0.LogPosition, "ES", eventNumber: 0, token: token);
+	}
+
+	[Test]
+	public async Task check_commmit_on_2nd_prepare_should_return_ok_decision() {
+		var res = await ReadIndex.IndexWriter.CheckCommitStartingAt(_prepare1.LogPosition,
+			WriterCheckpoint.ReadNonFlushed(), CancellationToken.None);
+
+		Assert.AreEqual(CommitDecision.Ok, res.Decision);
+		Assert.AreEqual("ES", res.EventStreamId);
+		Assert.AreEqual(0, res.CurrentVersion);
+		Assert.AreEqual(-1, res.StartEventNumber);
+		Assert.AreEqual(-1, res.EndEventNumber);
+	}
+
+	[Test]
+	public async Task check_commmit_on_3rd_prepare_should_return_wrong_expected_version() {
+		var res = await ReadIndex.IndexWriter.CheckCommitStartingAt(_prepare2.LogPosition,
+			WriterCheckpoint.ReadNonFlushed(), CancellationToken.None);
+
+		Assert.AreEqual(CommitDecision.WrongExpectedVersion, res.Decision);
+		Assert.AreEqual("ES", res.EventStreamId);
+		Assert.AreEqual(0, res.CurrentVersion);
+		Assert.AreEqual(-1, res.StartEventNumber);
+		Assert.AreEqual(-1, res.EndEventNumber);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_few_prepares_with_same_expected_version_and_committing_one_of_them.cs b/src/KurrentDB.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_few_prepares_with_same_expected_version_and_committing_one_of_them.cs
new file mode 100644
index 00000000000..3e33d951a8e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_few_prepares_with_same_expected_version_and_committing_one_of_them.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.CheckCommitStartingAt;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class
+	when_writing_few_prepares_with_same_expected_version_and_committing_one_of_them<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private IPrepareLogRecord _prepare0;
+	private IPrepareLogRecord _prepare1;
+	private IPrepareLogRecord _prepare2;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_prepare0 = await WritePrepare("ES", expectedVersion: -1, token: token);
+		_prepare1 = await WritePrepare("ES", expectedVersion: -1, token: token);
+		_prepare2 = await WritePrepare("ES", expectedVersion: -1, token: token);
+		await WriteCommit(_prepare1.LogPosition, "ES", eventNumber: 0, token: token);
+	}
+
+	[Test]
+	public async Task other_prepares_cannot_be_committed() {
+		var res = await ReadIndex.IndexWriter.CheckCommitStartingAt(_prepare0.LogPosition,
+			WriterCheckpoint.ReadNonFlushed(), CancellationToken.None);
+
+		Assert.AreEqual(CommitDecision.WrongExpectedVersion, res.Decision);
+		Assert.AreEqual("ES", res.EventStreamId);
+		Assert.AreEqual(0, res.CurrentVersion);
+		Assert.AreEqual(-1, res.StartEventNumber);
+		Assert.AreEqual(-1, res.EndEventNumber);
+
+		res = await ReadIndex.IndexWriter.CheckCommitStartingAt(_prepare2.LogPosition, WriterCheckpoint.ReadNonFlushed(), CancellationToken.None);
+
+		Assert.AreEqual(CommitDecision.WrongExpectedVersion, res.Decision);
+		Assert.AreEqual("ES", res.EventStreamId);
+		Assert.AreEqual(0, res.CurrentVersion);
+		Assert.AreEqual(-1, res.StartEventNumber);
+		Assert.AreEqual(-1, res.EndEventNumber);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_few_prepares_with_same_expected_version_and_not_committing_them.cs b/src/KurrentDB.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_few_prepares_with_same_expected_version_and_not_committing_them.cs
new file mode 100644
index 00000000000..f2f7f1a8fdc
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_few_prepares_with_same_expected_version_and_not_committing_them.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.CheckCommitStartingAt;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_writing_few_prepares_with_same_expected_version_and_not_committing_them<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private IPrepareLogRecord _prepare0;
+	private IPrepareLogRecord _prepare1;
+	private IPrepareLogRecord _prepare2;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_prepare0 = await WritePrepare("ES", -1, token: token);
+		_prepare1 = await WritePrepare("ES", -1, token: token);
+		_prepare2 = await WritePrepare("ES", -1, token: token);
+	}
+
+	[Test]
+	public async Task every_prepare_can_be_commited() {
+		var res = await ReadIndex.IndexWriter.CheckCommitStartingAt(_prepare0.LogPosition,
+			WriterCheckpoint.ReadNonFlushed(), CancellationToken.None);
+
+		var streamId = _logFormat.StreamIds.LookupValue("ES");
+
+		Assert.AreEqual(CommitDecision.Ok, res.Decision);
+		Assert.AreEqual(streamId, res.EventStreamId);
+		Assert.AreEqual(-1, res.CurrentVersion);
+		Assert.AreEqual(-1, res.StartEventNumber);
+		Assert.AreEqual(-1, res.EndEventNumber);
+
+		res = await ReadIndex.IndexWriter.CheckCommitStartingAt(_prepare1.LogPosition, WriterCheckpoint.ReadNonFlushed(), CancellationToken.None);
+
+		Assert.AreEqual(CommitDecision.Ok, res.Decision);
+		Assert.AreEqual(streamId, res.EventStreamId);
+		Assert.AreEqual(-1, res.CurrentVersion);
+		Assert.AreEqual(-1, res.StartEventNumber);
+		Assert.AreEqual(-1, res.EndEventNumber);
+
+		res = await ReadIndex.IndexWriter.CheckCommitStartingAt(_prepare2.LogPosition, WriterCheckpoint.ReadNonFlushed(), CancellationToken.None);
+
+		Assert.AreEqual(CommitDecision.Ok, res.Decision);
+		Assert.AreEqual(streamId, res.EventStreamId);
+		Assert.AreEqual(-1, res.CurrentVersion);
+		Assert.AreEqual(-1, res.StartEventNumber);
+		Assert.AreEqual(-1, res.EndEventNumber);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_prepares_in_wrong_order_and_committing_in_right_order.cs b/src/KurrentDB.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_prepares_in_wrong_order_and_committing_in_right_order.cs
new file mode 100644
index 00000000000..37bec971f12
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_prepares_in_wrong_order_and_committing_in_right_order.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.CheckCommitStartingAt;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class when_writing_prepares_in_wrong_order_and_committing_in_right_order<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private IPrepareLogRecord _prepare0;
+	private IPrepareLogRecord _prepare1;
+	private IPrepareLogRecord _prepare2;
+	private IPrepareLogRecord _prepare3;
+	private IPrepareLogRecord _prepare4;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_prepare0 = await WritePrepare("ES", expectedVersion: -1, token: token);
+		_prepare1 = await WritePrepare("ES", expectedVersion: 2, token: token);
+		_prepare2 = await WritePrepare("ES", expectedVersion: 0, token: token);
+		_prepare3 = await WritePrepare("ES", expectedVersion: 1, token: token);
+		_prepare4 = await WritePrepare("ES", expectedVersion: 3, token: token);
+		await WriteCommit(_prepare0.LogPosition, "ES", eventNumber: 0, token: token);
+		await WriteCommit(_prepare2.LogPosition, "ES", eventNumber: 1, token: token);
+		await WriteCommit(_prepare3.LogPosition, "ES", eventNumber: 2, token: token);
+	}
+
+	[Test]
+	public async Task check_commmit_on_expected_prepare_should_return_ok_decision() {
+		var res = await ReadIndex.IndexWriter.CheckCommitStartingAt(_prepare1.LogPosition,
+			WriterCheckpoint.ReadNonFlushed(), CancellationToken.None);
+
+		Assert.AreEqual(CommitDecision.Ok, res.Decision);
+		Assert.AreEqual("ES", res.EventStreamId);
+		Assert.AreEqual(2, res.CurrentVersion);
+		Assert.AreEqual(-1, res.StartEventNumber);
+		Assert.AreEqual(-1, res.EndEventNumber);
+	}
+
+	[Test]
+	public async Task check_commmit_on_not_expected_prepare_should_return_wrong_expected_version() {
+		var res = await ReadIndex.IndexWriter.CheckCommitStartingAt(_prepare4.LogPosition,
+			WriterCheckpoint.ReadNonFlushed(), CancellationToken.None);
+
+		Assert.AreEqual(CommitDecision.WrongExpectedVersion, res.Decision);
+		Assert.AreEqual("ES", res.EventStreamId);
+		Assert.AreEqual(2, res.CurrentVersion);
+		Assert.AreEqual(-1, res.StartEventNumber);
+		Assert.AreEqual(-1, res.EndEventNumber);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_single_prepare.cs b/src/KurrentDB.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_single_prepare.cs
new file mode 100644
index 00000000000..13e50ac31b7
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/CheckCommitStartingAt/when_writing_single_prepare.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.CheckCommitStartingAt;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_writing_single_prepare<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private IPrepareLogRecord _prepare;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_prepare = await WritePrepare("ES", -1, token: token);
+	}
+
+	[Test]
+	public async Task check_commmit_should_return_ok_decision() {
+		var res = await ReadIndex.IndexWriter.CheckCommitStartingAt(_prepare.LogPosition,
+			WriterCheckpoint.ReadNonFlushed(), CancellationToken.None);
+
+		var streamId = _logFormat.StreamIds.LookupValue("ES");
+
+		Assert.AreEqual(CommitDecision.Ok, res.Decision);
+		Assert.AreEqual(streamId, res.EventStreamId);
+		Assert.AreEqual(-1, res.CurrentVersion);
+		Assert.AreEqual(-1, res.StartEventNumber);
+		Assert.AreEqual(-1, res.EndEventNumber);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/ChunkBoundary/when_writing_events_at_chunk_boundary.cs b/src/KurrentDB.Core.Tests/Services/Storage/ChunkBoundary/when_writing_events_at_chunk_boundary.cs
new file mode 100644
index 00000000000..7d5352d131b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/ChunkBoundary/when_writing_events_at_chunk_boundary.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.ChunkBoundary;
+
+// Note: this test does not verify the behaviour of the StorageWriterService.
+// It only verifies if TFChunkWriter works properly.
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_writing_events_at_chunk_boundary<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private long _writerChk;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteSingleEvent("ES", 0, new string('.', 4000), token: token);
+		await WriteSingleEvent("ES", 1, new string('.', 4000), token: token);
+		await WriteSingleEvent("ES", 2, new string('.', 4000), retryOnFail: true, token: token); // chunk 1
+
+		// verify that the writer is in the correct chunk
+		var chunk = WriterCheckpoint.ReadNonFlushed() / Db.Config.ChunkSize;
+		Assert.AreEqual(1, chunk);
+
+		_writerChk = WriterCheckpoint.Read();
+	}
+
+	[Test]
+	public void writer_checkpoint_is_flushed() {
+		Assert.AreEqual(Db.Config.ChunkSize, _writerChk);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/deleting_stream_tests_1.cs b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/deleting_stream_tests_1.cs
new file mode 100644
index 00000000000..e380a699161
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/deleting_stream_tests_1.cs
@@ -0,0 +1,59 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.DeletingStream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_deleting_stream_spanning_through_multiple_chunks_and_1_stream_with_same_hash_and_1_stream_with_different_hash_read_index_should<TLogFormat, TStreamId>
+	: ReadIndexTestScenario<TLogFormat, TStreamId> {
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteSingleEvent("ES1", 0, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES1", 1, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES2", 0, new string('.', 3000), token: token);
+
+		await WriteSingleEvent("ES", 0, new string('.', 3000), retryOnFail: true, token: token); // chunk 2
+		await WriteSingleEvent("ES", 1, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES1", 2, new string('.', 3000), token: token);
+
+		await WriteSingleEvent("ES2", 1, new string('.', 3000), retryOnFail: true, token: token); // chunk 3
+		await WriteSingleEvent("ES1", 3, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES1", 4, new string('.', 3000), token: token);
+
+		await WriteSingleEvent("ES2", 2, new string('.', 3000), retryOnFail: true, token: token); // chunk 4
+		await WriteSingleEvent("ES", 2, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES", 3, new string('.', 3000), token: token);
+
+		await WriteDelete("ES1", token);
+	}
+
+	[Test]
+	public async Task indicate_that_stream_is_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ES1", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task indicate_that_nonexisting_stream_with_same_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("XXX", CancellationToken.None), Is.False);
+	}
+
+	[Test]
+	public async Task indicate_that_nonexisting_stream_with_different_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("XXXX", CancellationToken.None), Is.False);
+	}
+
+	[Test]
+	public async Task indicate_that_existing_stream_with_same_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ES2", CancellationToken.None), Is.False);
+	}
+
+	[Test]
+	public async Task indicate_that_existing_stream_with_different_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ES", CancellationToken.None), Is.False);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/deleting_stream_tests_2.cs b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/deleting_stream_tests_2.cs
new file mode 100644
index 00000000000..2c43e1c7bcf
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/deleting_stream_tests_2.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.DeletingStream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_deleting_streams_with_different_hashes_spanning_through_multiple_chunks_in_db_with_1_stream_with_same_hash_read_index_should<TLogFormat, TStreamId> :
+		ReadIndexTestScenario<TLogFormat, TStreamId> {
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteSingleEvent("ES1", 0, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES1", 1, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES2", 0, new string('.', 3000), token: token);
+
+		await WriteSingleEvent("ES", 0, new string('.', 3000), retryOnFail: true, token: token); // chunk 2
+		await WriteSingleEvent("ES", 1, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES1", 2, new string('.', 3000), token: token);
+
+		await WriteSingleEvent("ES2", 1, new string('.', 3000), retryOnFail: true, token: token); // chunk 3
+		await WriteSingleEvent("ES1", 3, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES1", 4, new string('.', 3000), token: token);
+
+		await WriteSingleEvent("ES2", 2, new string('.', 3000), retryOnFail: true, token: token); // chunk 4
+		await WriteSingleEvent("ES", 2, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES", 3, new string('.', 2500), token: token);
+
+		await WriteDelete("ES1", token);
+		await WriteDelete("ES", token);
+	}
+
+	[Test]
+	public async Task indicate_that_streams_are_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ES1", CancellationToken.None));
+		Assert.That(await ReadIndex.IsStreamDeleted("ES", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task indicate_that_nonexisting_streams_with_same_hashes_are_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("XXX", CancellationToken.None), Is.False);
+		Assert.That(await ReadIndex.IsStreamDeleted("XX", CancellationToken.None), Is.False);
+	}
+
+	[Test]
+	public async Task indicate_that_nonexisting_stream_with_different_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("XXXX", CancellationToken.None), Is.False);
+	}
+
+	[Test]
+	public async Task indicate_that_existing_stream_with_different_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ES2", CancellationToken.None), Is.False);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/deleting_stream_tests_3.cs b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/deleting_stream_tests_3.cs
new file mode 100644
index 00000000000..da228c00f46
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/deleting_stream_tests_3.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.DeletingStream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_deleting_streams_with_same_hash_spanning_through_multiple_chunks_in_db_with_1_stream_with_different_hash_read_index_should<TLogFormat, TStreamId> :
+		ReadIndexTestScenario<TLogFormat, TStreamId> {
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteSingleEvent("ES1", 0, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES1", 1, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES2", 0, new string('.', 3000), token: token);
+
+		await WriteSingleEvent("ES", 0, new string('.', 3000), retryOnFail: true, token: token); // chunk 2
+		await WriteSingleEvent("ES", 1, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES1", 2, new string('.', 3000), token: token);
+
+		await WriteSingleEvent("ES2", 1, new string('.', 3000), retryOnFail: true, token: token); // chunk 3
+		await WriteSingleEvent("ES1", 3, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES1", 4, new string('.', 3000), token: token);
+
+		await WriteSingleEvent("ES2", 2, new string('.', 3000), retryOnFail: true, token: token); // chunk 4
+		await WriteSingleEvent("ES", 2, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES", 3, new string('.', 2500), token: token);
+
+		await WriteDelete("ES1", token);
+		await WriteDelete("ES2", token);
+	}
+
+	[Test]
+	public async Task indicate_that_streams_are_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ES1", CancellationToken.None));
+		Assert.That(await ReadIndex.IsStreamDeleted("ES2", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task indicate_that_nonexisting_stream_with_same_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("XXX", CancellationToken.None), Is.False);
+	}
+
+	[Test]
+	public async Task indicate_that_nonexisting_stream_with_different_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("XXXX", CancellationToken.None), Is.False);
+	}
+
+	[Test]
+	public async Task indicate_that_existing_stream_with_different_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ES", CancellationToken.None), Is.False);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/is_stream_deleted_should.cs b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/is_stream_deleted_should.cs
new file mode 100644
index 00000000000..bdf132ed4bf
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/is_stream_deleted_should.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.DeletingStream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class is_stream_deleted_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	[Test]
+	public void crash_on_null_stream_argument() {
+		Assert.ThrowsAsync<ArgumentNullException>(async () => await ReadIndex.IsStreamDeleted(null, CancellationToken.None));
+	}
+
+	[Test]
+	public void throw_on_empty_stream_argument() {
+		Assert.ThrowsAsync<ArgumentNullException>(async () => await ReadIndex.IsStreamDeleted(string.Empty, CancellationToken.None));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_spanning_through_multiple_chunks_in_db_with_other_streams_read_index_should.cs b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_spanning_through_multiple_chunks_in_db_with_other_streams_read_index_should.cs
new file mode 100644
index 00000000000..10aa17c6309
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_spanning_through_multiple_chunks_in_db_with_other_streams_read_index_should.cs
@@ -0,0 +1,59 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.DeletingStream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_deleting_stream_spanning_through_multiple_chunks_in_db_with_other_streams_read_index_should<TLogFormat, TStreamId> :
+		ReadIndexTestScenario<TLogFormat, TStreamId> {
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteSingleEvent("ES1", 0, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES1", 1, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES2", 0, new string('.', 3000), token: token);
+
+		await WriteSingleEvent("ES", 0, new string('.', 3000), retryOnFail: true, token: token); // chunk 2
+		await WriteSingleEvent("ES", 1, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES1", 2, new string('.', 3000), token: token);
+
+		await WriteSingleEvent("ES2", 1, new string('.', 3000), retryOnFail: true, token: token); // chunk 3
+		await WriteSingleEvent("ES1", 3, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES1", 4, new string('.', 3000), token: token);
+
+		await WriteSingleEvent("ES2", 2, new string('.', 3000), retryOnFail: true, token: token); // chunk 4
+		await WriteSingleEvent("ES", 2, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES", 3, new string('.', 3000), token: token);
+
+		await WriteDelete("ES1", token);
+	}
+
+	[Test]
+	public async Task indicate_that_stream_is_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ES1", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task indicate_that_nonexisting_stream_with_same_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("XXX", CancellationToken.None), Is.False);
+	}
+
+	[Test]
+	public async Task indicate_that_nonexisting_stream_with_different_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("XXXX", CancellationToken.None), Is.False);
+	}
+
+	[Test]
+	public async Task indicate_that_existing_stream_with_same_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ES2", CancellationToken.None), Is.False);
+	}
+
+	[Test]
+	public async Task indicate_that_existing_stream_with_different_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ES", CancellationToken.None), Is.False);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_spanning_through_multiple_chunks_read_index_should.cs b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_spanning_through_multiple_chunks_read_index_should.cs
new file mode 100644
index 00000000000..37c81a240fa
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_spanning_through_multiple_chunks_read_index_should.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.DeletingStream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_deleting_stream_spanning_through_multiple_chunks_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteSingleEvent("ES", 0, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES", 1, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES", 2, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES", 3, new string('.', 3000), retryOnFail: true, token: token); // chunk 2
+		await WriteSingleEvent("ES", 4, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES", 5, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES", 6, new string('.', 3000), retryOnFail: true, token: token); // chunk 3
+
+		await WriteDelete("ES", token);
+	}
+
+	[Test]
+	public async Task indicate_that_stream_is_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ES", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task indicate_that_nonexisting_stream_with_same_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ZZ", CancellationToken.None), Is.False);
+	}
+
+	[Test]
+	public async Task indicate_that_nonexisting_stream_with_different_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("XXX", CancellationToken.None), Is.False);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_with_1_hash_collision_and_1_stream_with_other_hash_read_index_should.cs b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_with_1_hash_collision_and_1_stream_with_other_hash_read_index_should.cs
new file mode 100644
index 00000000000..c3584e241b5
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_with_1_hash_collision_and_1_stream_with_other_hash_read_index_should.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.DeletingStream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_deleting_stream_with_1_hash_collision_and_1_stream_with_other_hash_read_index_should<TLogFormat, TStreamId> :
+		ReadIndexTestScenario<TLogFormat, TStreamId> {
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteSingleEvent("S1", 0, "bla1", token: token);
+		await WriteSingleEvent("S1", 1, "bla1", token: token);
+		await WriteSingleEvent("S2", 0, "bla1", token: token);
+		await WriteSingleEvent("S2", 1, "bla1", token: token);
+		await WriteSingleEvent("S1", 2, "bla1", token: token);
+		await WriteSingleEvent("SSS", 0, "bla1", token: token);
+
+		await WriteDelete("S1", token);
+	}
+
+	[Test]
+	public async Task indicate_that_stream_is_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("S1", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task indicate_that_other_stream_with_same_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("S2", CancellationToken.None), Is.False);
+	}
+
+	[Test]
+	public async Task indicate_that_other_stream_with_different_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("SSS", CancellationToken.None), Is.False);
+	}
+
+	[Test]
+	public async Task indicate_that_not_existing_stream_with_same_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("XX", CancellationToken.None), Is.False);
+	}
+
+	[Test]
+	public async Task indicate_that_not_existing_stream_with_different_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("XXX", CancellationToken.None), Is.False);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_with_2_hash_collisions_and_mixed_order_read_index_should.cs b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_with_2_hash_collisions_and_mixed_order_read_index_should.cs
new file mode 100644
index 00000000000..5fdd6499e2a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_with_2_hash_collisions_and_mixed_order_read_index_should.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.DeletingStream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_deleting_stream_with_2_hash_collisions_and_mixed_order_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteSingleEvent("S1", 0, "bla1", token: token);
+		await WriteSingleEvent("S1", 1, "bla1", token: token);
+		await WriteSingleEvent("S2", 0, "bla1", token: token);
+		await WriteSingleEvent("S2", 1, "bla1", token: token);
+		await WriteSingleEvent("S1", 2, "bla1", token: token);
+		await WriteSingleEvent("S3", 0, "bla1", token: token);
+
+		await WriteDelete("S1", token);
+	}
+
+	[Test]
+	public async Task indicate_that_stream_is_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("S1", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task indicate_that_other_streams_with_same_hash_are_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("S2", CancellationToken.None), Is.False);
+		Assert.That(await ReadIndex.IsStreamDeleted("S3", CancellationToken.None), Is.False);
+	}
+
+	[Test]
+	public async Task indicate_that_not_existing_stream_with_same_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("XX", CancellationToken.None), Is.False);
+	}
+
+	[Test]
+	public async Task indicate_that_not_existing_stream_with_different_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("XXX", CancellationToken.None), Is.False);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_with_version_numbers_greater_than_int_maxvalue.cs b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_with_version_numbers_greater_than_int_maxvalue.cs
new file mode 100644
index 00000000000..d55a870e3bf
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_deleting_stream_with_version_numbers_greater_than_int_maxvalue.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.DeletingStream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_deleting_stream_with_version_numbers_greater_than_int_maxvalue<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	long firstEventNumber = (long)int.MaxValue + 1;
+	long secondEventNumber = (long)int.MaxValue + 2;
+	long thirdEventNumber = (long)int.MaxValue + 3;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteSingleEvent("ES", firstEventNumber, new string('.', 3000), token: token);
+		await WriteSingleEvent("KEEP", firstEventNumber, new string('.', 3000), token: token);
+		await WriteSingleEvent("KEEP", secondEventNumber, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES", secondEventNumber, new string('.', 3000), retryOnFail: true, token: token);
+		await WriteSingleEvent("KEEP", thirdEventNumber, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES", thirdEventNumber, new string('.', 3000), token: token);
+
+		await WriteDelete("ES", token);
+	}
+
+	[Test]
+	public async Task indicate_that_stream_is_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ES", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task indicate_that_other_stream_is_not_deleted() {
+		Assert.IsFalse(await ReadIndex.IsStreamDeleted("KEEP", CancellationToken.None));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_deleting_the_only_existing_stream_in_db_read_index_should.cs b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_deleting_the_only_existing_stream_in_db_read_index_should.cs
new file mode 100644
index 00000000000..62f115bd9e0
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_deleting_the_only_existing_stream_in_db_read_index_should.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.DeletingStream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_deleting_the_only_existing_stream_in_db_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteSingleEvent("ES", 0, "bla1", token: token);
+
+		await WriteDelete("ES", token);
+	}
+
+	[Test]
+	public async Task indicate_that_stream_is_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ES", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task indicate_that_nonexisting_stream_with_same_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ZZ", CancellationToken.None), Is.False);
+	}
+
+	[Test]
+	public async Task indicate_that_nonexisting_stream_with_different_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("XXX", CancellationToken.None), Is.False);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_hard_deleting_stream.cs b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_hard_deleting_stream.cs
new file mode 100644
index 00000000000..c75746a331a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_hard_deleting_stream.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.DeletingStream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_hard_deleting_stream<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteSingleEvent("ES1", 0, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES1", 1, new string('.', 3000), token: token);
+		await WriteDelete("ES1", token);
+	}
+
+	[Test]
+	public async Task should_change_expected_version_to_deleted_event_number_when_reading() {
+		var chunk = await Db.Manager.GetInitializedChunk(0, CancellationToken.None);
+		var chunkRecords = new List<ILogRecord>();
+		RecordReadResult result = await chunk.TryReadFirst(CancellationToken.None);
+		while (result.Success) {
+			chunkRecords.Add(result.LogRecord);
+			result = await chunk.TryReadClosestForward(result.NextPosition, CancellationToken.None);
+		}
+
+		Assert.That(chunkRecords.Any(x =>
+			x.RecordType == LogRecordType.Commit && ((CommitLogRecord)x).FirstEventNumber == long.MaxValue));
+		Assert.That(chunkRecords.Any(x =>
+			x.RecordType == LogRecordType.Prepare && ((IPrepareLogRecord<TStreamId>)x).ExpectedVersion == long.MaxValue - 1));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_hard_deleting_stream_with_log_version_0.cs b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_hard_deleting_stream_with_log_version_0.cs
new file mode 100644
index 00000000000..dae01705da3
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_hard_deleting_stream_with_log_version_0.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.DeletingStream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "No such thing as a V0 prepare in LogV3")]
+public class when_hard_deleting_stream_with_log_version_0<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteSingleEvent("ES1", 0, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES1", 1, new string('.', 3000), token: token);
+
+		await WriteV0HardDelete("ES1", token);
+	}
+
+	private async ValueTask WriteV0HardDelete(string eventStreamId, CancellationToken token) {
+		var logPosition = Writer.Position;
+		var prepare = new PrepareLogRecord(logPosition, Guid.NewGuid(), Guid.NewGuid(), logPosition, 0,
+			eventStreamId, null,
+			int.MaxValue - 1, DateTime.UtcNow,
+			PrepareFlags.StreamDelete | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+			SystemEventTypes.StreamDeleted, null,
+			new byte[0], new byte[0],
+			prepareRecordVersion: LogRecordVersion.LogRecordV0);
+		var (_, pos) = await Writer.Write(prepare, token);
+
+		var commit = new CommitLogRecord(pos, prepare.CorrelationId,
+			prepare.LogPosition, DateTime.UtcNow, int.MaxValue,
+			commitRecordVersion: LogRecordVersion.LogRecordV0);
+		await Writer.Write(commit, token);
+	}
+
+	[Test]
+	public async Task should_change_expected_version_to_deleted_event_number_when_reading() {
+		var chunk = await Db.Manager.GetInitializedChunk(0, CancellationToken.None);
+		var chunkRecords = new List<ILogRecord>();
+		RecordReadResult result = await chunk.TryReadFirst(CancellationToken.None);
+		while (result.Success) {
+			chunkRecords.Add(result.LogRecord);
+			result = await chunk.TryReadClosestForward(result.NextPosition, CancellationToken.None);
+		}
+
+		Assert.That(chunkRecords.Any(x =>
+			x.RecordType == LogRecordType.Commit && ((CommitLogRecord)x).FirstEventNumber == long.MaxValue));
+		Assert.That(chunkRecords.Any(x =>
+			x.RecordType == LogRecordType.Prepare && ((PrepareLogRecord)x).ExpectedVersion == long.MaxValue - 1));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_reading_deleted_stream.cs b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_reading_deleted_stream.cs
new file mode 100644
index 00000000000..ff299ada9f4
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_reading_deleted_stream.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.DeletingStream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_reading_deleted_stream<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private Guid _id1;
+	private Guid _id2;
+	private Guid _id3;
+	private Guid _deleteId;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_id1 = Guid.NewGuid();
+		_id2 = Guid.NewGuid();
+		_id3 = Guid.NewGuid();
+		_deleteId = Guid.NewGuid();
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		var (streamId, pos0) = await GetOrReserve("ES", token);
+		var (_, pos1) = await Writer.Write(LogRecord.SingleWrite(_recordFactory, pos0, _id1, _id1, streamId, ExpectedVersion.NoStream,
+			eventTypeId, new byte[0], new byte[0], DateTime.UtcNow, PrepareFlags.IsCommitted), token);
+		var (_, pos2) = await Writer.Write(LogRecord.SingleWrite(_recordFactory, pos1, _id2, _id2, streamId, 0,
+			eventTypeId, new byte[0], new byte[0], DateTime.UtcNow, PrepareFlags.IsCommitted), token);
+		var (_, pos3) = await Writer.Write(LogRecord.SingleWrite(_recordFactory, pos2, _id3, _id3, streamId, 1,
+			eventTypeId, new byte[0], new byte[0], DateTime.UtcNow, PrepareFlags.IsCommitted), token);
+		await Writer.Write(LogRecord.DeleteTombstone(_recordFactory, pos3, _deleteId, _deleteId, streamId,
+			eventTypeId, EventNumber.DeletedStream - 1, PrepareFlags.IsCommitted), token);
+	}
+
+	[Test]
+	public async Task the_stream_is_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ES", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task the_last_event_number_is_deleted_stream() {
+		Assert.AreEqual(EventNumber.DeletedStream, await ReadIndex.GetStreamLastEventNumber("ES", CancellationToken.None));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_reading_deleted_stream_written_with_old_log_record_version.cs b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_reading_deleted_stream_written_with_old_log_record_version.cs
new file mode 100644
index 00000000000..f7ed9d1c3c2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_reading_deleted_stream_written_with_old_log_record_version.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.DeletingStream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "No such thing as a V0 prepare in LogV3")]
+public class when_reading_deleted_stream_written_with_old_log_record_version<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private Guid _id1;
+	private Guid _id2;
+	private Guid _id3;
+	private Guid _deleteId;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_id1 = Guid.NewGuid();
+		_id2 = Guid.NewGuid();
+		_id3 = Guid.NewGuid();
+		_deleteId = Guid.NewGuid();
+
+		var (_, pos1) = await Writer.Write(new PrepareLogRecord(0, _id1, _id1, 0, 0, "ES", null, 0, DateTime.UtcNow,
+				PrepareFlags.SingleWrite, "type", null, new byte[0], new byte[0], LogRecordVersion.LogRecordV0),
+			token);
+		var (_, pos2) = await Writer.Write(new PrepareLogRecord(pos1, _id2, _id2, pos1, 0, "ES", null, 1, DateTime.UtcNow,
+				PrepareFlags.SingleWrite, "type", null, new byte[0], new byte[0], LogRecordVersion.LogRecordV0),
+			token);
+		var (_, pos3) = await Writer.Write(new PrepareLogRecord(pos2, _id3, _id3, pos2, 0, "ES", null, 2, DateTime.UtcNow,
+				PrepareFlags.SingleWrite, "type", null, new byte[0], new byte[0]),
+			token);
+		var (_, pos4) = await Writer.Write(new CommitLogRecord(pos3, _id1, 0, DateTime.UtcNow, 0, LogRecordVersion.LogRecordV0),
+			token);
+		var (_, pos5) = await Writer.Write(new CommitLogRecord(pos4, _id2, pos1, DateTime.UtcNow, 1, LogRecordVersion.LogRecordV0),
+			token);
+		var (_, pos6) = await Writer.Write(new CommitLogRecord(pos5, _id3, pos2, DateTime.UtcNow, 2, LogRecordVersion.LogRecordV0),
+			token);
+
+
+		var (_, pos7) = await Writer.Write(new PrepareLogRecord(pos6, _deleteId, _deleteId, pos6, 0, "ES", null, int.MaxValue - 1,
+				DateTime.UtcNow,
+				PrepareFlags.StreamDelete | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
+				PrepareFlags.None,
+				SystemEventTypes.StreamDeleted, null, Empty.ByteArray, Empty.ByteArray, LogRecordVersion.LogRecordV0),
+			token);
+		await Writer.Write(
+			new CommitLogRecord(pos7, _deleteId, pos6, DateTime.UtcNow, int.MaxValue - 1,
+				LogRecordVersion.LogRecordV0), token);
+	}
+
+	[Test]
+	public async Task the_stream_is_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ES", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task the_last_event_number_is_deleted_stream() {
+		Assert.AreEqual(EventNumber.DeletedStream, await ReadIndex.GetStreamLastEventNumber("ES", CancellationToken.None));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_writing_delete_prepare_but_no_commit_read_index_should.cs b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_writing_delete_prepare_but_no_commit_read_index_should.cs
new file mode 100644
index 00000000000..74ede09aeb4
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_writing_delete_prepare_but_no_commit_read_index_should.cs
@@ -0,0 +1,98 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.DeletingStream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_writing_delete_prepare_but_no_commit_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _event0;
+	private EventRecord _event1;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		_event0 = await WriteSingleEvent("ES", 0, "bla1", token: token);
+		Assert.True(_logFormat.StreamNameIndex.GetOrReserve("ES", out var esStreamId, out _, out _));
+		var prepare = LogRecord.DeleteTombstone(_recordFactory, Writer.Position, Guid.NewGuid(), Guid.NewGuid(),
+			esStreamId, eventTypeId, 1);
+
+		Assert.IsTrue(await Writer.Write(prepare, token) is (true, _));
+
+		_event1 = await WriteSingleEvent("ES", 1, "bla1", token: token);
+	}
+
+	[Test]
+	public async Task indicate_that_stream_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ES", CancellationToken.None), Is.False);
+	}
+
+	[Test]
+	public async Task indicate_that_nonexisting_stream_with_same_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ZZ", CancellationToken.None), Is.False);
+	}
+
+	[Test]
+	public async Task indicate_that_nonexisting_stream_with_different_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("XXX", CancellationToken.None), Is.False);
+	}
+
+	[Test]
+	public async Task read_single_events_should_return_commited_records() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_event0, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_event1, result.Record);
+	}
+
+	[Test]
+	public async Task read_stream_events_forward_should_return_commited_records() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_event0, result.Records[0]);
+		Assert.AreEqual(_event1, result.Records[1]);
+	}
+
+	[Test]
+	public async Task read_stream_events_backward_should_return_commited_records() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_event0, result.Records[1]);
+		Assert.AreEqual(_event1, result.Records[0]);
+	}
+
+	[Test]
+	public async Task read_all_forward_should_return_all_stream_records_except_uncommited() {
+		var events = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(2, events.Length);
+		Assert.AreEqual(_event0, events[0]);
+		Assert.AreEqual(_event1, events[1]);
+	}
+
+	[Test]
+	public async Task read_all_backward_should_return_all_stream_records_except_uncommited() {
+		var events = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(2, events.Length);
+		Assert.AreEqual(_event1, events[0]);
+		Assert.AreEqual(_event0, events[1]);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_writing_few_prepares_on_same_event_number_and_commiting_delete_on_this_version_read_index_should.cs b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_writing_few_prepares_on_same_event_number_and_commiting_delete_on_this_version_read_index_should.cs
new file mode 100644
index 00000000000..b26868e4ab1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/when_writing_few_prepares_on_same_event_number_and_commiting_delete_on_this_version_read_index_should.cs
@@ -0,0 +1,145 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.DeletingStream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_writing_few_prepares_with_same_event_number_and_commiting_delete_on_this_version_read_index_should<TLogFormat, TStreamId> :
+		ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _deleteTombstone;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		string stream = "ES";
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		var (streamId, _) = await GetOrReserve(stream, token);
+		var (streamDeletedEventTypeId, pos) = await GetOrReserveEventType(SystemEventTypes.StreamDeleted, token);
+
+		var prepare1 = LogRecord.SingleWrite(_recordFactory, pos, // prepare1
+			Guid.NewGuid(),
+			Guid.NewGuid(),
+			streamId,
+			-1,
+			eventTypeId,
+			LogRecord.NoData,
+			null,
+			DateTime.UtcNow);
+
+		(var written, pos) = await Writer.Write(prepare1, token);
+		Assert.IsTrue(written);
+
+		var prepare2 = LogRecord.SingleWrite(_recordFactory, pos, // prepare2
+			Guid.NewGuid(),
+			Guid.NewGuid(),
+			streamId,
+			-1,
+			eventTypeId,
+			LogRecord.NoData,
+			null,
+			DateTime.UtcNow);
+
+		(written, pos) = await Writer.Write(prepare2, token);
+		Assert.IsTrue(written);
+
+
+		var deletePrepare = LogRecord.DeleteTombstone(_recordFactory, pos, // delete prepare
+			Guid.NewGuid(), Guid.NewGuid(), streamId, streamDeletedEventTypeId, -1);
+		_deleteTombstone = new EventRecord(EventNumber.DeletedStream, deletePrepare, stream, SystemEventTypes.StreamDeleted);
+
+		(written, pos) = await Writer.Write(deletePrepare, token);
+		Assert.IsTrue(written);
+
+		var prepare3 = LogRecord.SingleWrite(_recordFactory, pos, // prepare3
+			Guid.NewGuid(),
+			Guid.NewGuid(),
+			streamId,
+			-1,
+			eventTypeId,
+			LogRecord.NoData,
+			null,
+			DateTime.UtcNow);
+
+		(written, pos) = await Writer.Write(prepare3, token);
+		Assert.IsTrue(written);
+
+		var commit = LogRecord.Commit(pos, // committing delete
+			deletePrepare.CorrelationId,
+			deletePrepare.LogPosition,
+			EventNumber.DeletedStream);
+		Assert.IsTrue(await Writer.Write(commit, token) is (true, _));
+	}
+
+	[Test]
+	public async Task indicate_that_stream_is_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ES", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task indicate_that_nonexisting_stream_with_same_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ZZ", CancellationToken.None), Is.False);
+	}
+
+	[Test]
+	public async Task indicate_that_nonexisting_stream_with_different_hash_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("XXX", CancellationToken.None), Is.False);
+	}
+
+	[Test]
+	public async Task read_single_events_with_number_0_should_return_stream_deleted() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.StreamDeleted, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task read_single_events_with_number_1_should_return_stream_deleted() {
+		var result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.StreamDeleted, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task read_stream_events_forward_should_return_stream_deleted() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task read_stream_events_backward_should_return_stream_deleted() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task read_all_forward_should_return_all_stream_records_except_uncommited() {
+		var events = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(1, events.Length);
+		Assert.AreEqual(_deleteTombstone, events[0]);
+	}
+
+	[Test]
+	public async Task read_all_backward_should_return_all_stream_records_except_uncommited() {
+		var events = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(1, events.Length);
+		Assert.AreEqual(_deleteTombstone, events[0]);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/with_empty_db_read_index_should.cs b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/with_empty_db_read_index_should.cs
new file mode 100644
index 00000000000..c1e62c95553
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/DeletingStream/with_empty_db_read_index_should.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.DeletingStream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_empty_db_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	[Test]
+	public async Task indicate_that_any_stream_is_not_deleted() {
+		Assert.That(await ReadIndex.IsStreamDeleted("X", CancellationToken.None), Is.False);
+		Assert.That(await ReadIndex.IsStreamDeleted("YY", CancellationToken.None), Is.False);
+		Assert.That(await ReadIndex.IsStreamDeleted("ZZZ", CancellationToken.None), Is.False);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/EpochManager/when_having_TFLog_with_existing_epochs.cs b/src/KurrentDB.Core.Tests/Services/Storage/EpochManager/when_having_TFLog_with_existing_epochs.cs
new file mode 100644
index 00000000000..7eed0e50403
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/EpochManager/when_having_TFLog_with_existing_epochs.cs
@@ -0,0 +1,305 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.LogV3;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Storage.EpochManager;
+using KurrentDB.Core.Tests.TransactionLog;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.EpochManager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_having_TFLog_with_existing_epochs<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture, IDisposable {
+	private TFChunkDb _db;
+	private EpochManager<TStreamId> _epochManager;
+	private LogFormatAbstractor<TStreamId> _logFormat;
+	private LinkedList<EpochRecord> _cache;
+	private TFChunkReader _reader;
+	private TFChunkWriter _writer;
+	private SynchronousScheduler _mainBus;
+	private readonly Guid _instanceId = Guid.NewGuid();
+	private readonly List<Message> _published = new List<Message>();
+	private List<EpochRecord> _epochs;
+
+	private int GetNextEpoch() {
+		return (int)Interlocked.Increment(ref _currentEpoch);
+	}
+	private long _currentEpoch = -1;
+	private EpochManager<TStreamId> GetManager() {
+		return new EpochManager<TStreamId>(_mainBus,
+			10,
+			_db.Config.EpochCheckpoint,
+			_writer,
+			initialReaderCount: 1,
+			maxReaderCount: 5,
+			readerFactory: () => new TFChunkReader(_db, _db.Config.WriterCheckpoint),
+			_logFormat.RecordFactory,
+			_logFormat.StreamNameIndex,
+			_logFormat.EventTypeIndex,
+			_logFormat.CreatePartitionManager(
+				reader: new TFChunkReader(_db, _db.Config.WriterCheckpoint),
+				writer: _writer),
+			_instanceId);
+	}
+	private LinkedList<EpochRecord> GetCache(EpochManager<TStreamId> manager) {
+		return (LinkedList<EpochRecord>)typeof(EpochManager<TStreamId>).GetField("_epochs", BindingFlags.NonPublic | BindingFlags.Instance)
+			.GetValue(_epochManager);
+	}
+
+	private async ValueTask<EpochRecord> WriteEpoch(int epochNumber, long lastPos, Guid instanceId, CancellationToken token) {
+		long pos = _writer.Position;
+		var epoch = new EpochRecord(pos, epochNumber, Guid.NewGuid(), lastPos, DateTime.UtcNow, instanceId);
+		var rec = _logFormat.RecordFactory.CreateEpoch(epoch);
+		await _writer.Write(rec, token);
+		await _writer.Flush(token);
+		return epoch;
+	}
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var indexDirectory = GetFilePathFor("index");
+		_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
+			IndexDirectory = indexDirectory,
+		});
+
+		_mainBus = new(nameof(when_having_an_epoch_manager_and_empty_tf_log<TLogFormat, TStreamId>));
+		_mainBus.Subscribe(new AdHocHandler<SystemMessage.EpochWritten>(m => _published.Add(m)));
+		_db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, 0));
+		await _db.Open();
+		_reader = new TFChunkReader(_db, _db.Config.WriterCheckpoint);
+		_writer = new TFChunkWriter(_db);
+		await _writer.Open(CancellationToken.None);
+
+		_epochManager = GetManager();
+		await _epochManager.Init(CancellationToken.None);
+		_cache = GetCache(_epochManager);
+		Assert.NotNull(_cache);
+		Assert.That(_cache.Count == 0);
+		_epochs = new List<EpochRecord>();
+		var lastPos = 0L;
+		for (int i = 0; i < 30; i++) {
+			var epoch = await WriteEpoch(GetNextEpoch(), lastPos, _instanceId, CancellationToken.None);
+			_epochs.Add(epoch);
+			lastPos = epoch.EpochPosition;
+		}
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		this.Dispose();
+		await base.TestFixtureTearDown();
+	}
+	// epoch manager is stateful with TFLog,
+	// and TFLog is expesive to build fresh for each test
+	// and the tests depend on previous state in the epoch manager
+	// so this test will run through the test cases
+	// in order
+	[Test]
+	public async Task can_add_epochs_to_cache() {
+
+		Assert.That(_cache.Count == 0);
+		//add fist epoch to empty cache
+		await _epochManager.AddEpochToCache(_epochs[3], CancellationToken.None);
+
+		Assert.That(_cache.Count is 4);
+		Assert.That(_cache.First.Value.EpochNumber == _epochs[0].EpochNumber);
+		Assert.That(_cache.Last.Value.EpochNumber == _epochs[3].EpochNumber);
+
+		//add new last epoch
+		await _epochManager.AddEpochToCache(_epochs[4], CancellationToken.None);
+
+		Assert.That(_cache.Count is 5);
+		Assert.That(_cache.First.Value.EpochNumber == _epochs[0].EpochNumber);
+		Assert.That(_cache.Last.Value.EpochNumber == _epochs[4].EpochNumber);
+
+		//idempotent add
+		await _epochManager.AddEpochToCache(_epochs[1], CancellationToken.None);
+		await _epochManager.AddEpochToCache(_epochs[2], CancellationToken.None);
+		await _epochManager.AddEpochToCache(_epochs[3], CancellationToken.None);
+
+		Assert.That(_cache.Count == 5);
+		Assert.That(_cache.First.Value.EpochNumber == _epochs[0].EpochNumber);
+		Assert.That(_cache.Last.Value.EpochNumber == _epochs[4].EpochNumber);
+
+		//add new skip 1 last epoch
+		await _epochManager.AddEpochToCache(_epochs[6], CancellationToken.None);
+
+		Assert.That(_cache.Count == 7);
+		Assert.That(_cache.First.Value.EpochNumber == _epochs[0].EpochNumber);
+		Assert.That(_cache.Last.Value.EpochNumber == _epochs[6].EpochNumber);
+
+		//add new skip 5 last epoch
+		await _epochManager.AddEpochToCache(_epochs[11], CancellationToken.None);
+
+		Assert.That(_cache.Count == 10);
+		Assert.That(_cache.First.Value.EpochNumber == _epochs[2].EpochNumber);
+		Assert.That(_cache.Last.Value.EpochNumber == _epochs[11].EpochNumber);
+
+		//add last rolls cache
+		await _epochManager.AddEpochToCache(_epochs[12], CancellationToken.None);
+
+		Assert.That(_cache.Count == 10);
+		Assert.That(_cache.First.Value.EpochNumber == _epochs[3].EpochNumber);
+		Assert.That(_cache.Last.Value.EpochNumber == _epochs[12].EpochNumber);
+
+
+		//add epoch before cache
+		await _epochManager.AddEpochToCache(_epochs[1], CancellationToken.None);
+
+		Assert.That(_cache.Count == 10);
+		Assert.That(_cache.First.Value.EpochNumber == _epochs[3].EpochNumber);
+		Assert.That(_cache.Last.Value.EpochNumber == _epochs[12].EpochNumber);
+
+		//add idempotent first epoch
+		await _epochManager.AddEpochToCache(_epochs[2], CancellationToken.None);
+
+		Assert.That(_cache.Count == 10);
+		Assert.That(_cache.First.Value.EpochNumber == _epochs[3].EpochNumber);
+		Assert.That(_cache.Last.Value.EpochNumber == _epochs[12].EpochNumber);
+
+		//add idempotent last epoch
+		await _epochManager.AddEpochToCache(_epochs[12], CancellationToken.None);
+
+		Assert.That(_cache.Count == 10);
+		Assert.That(_cache.First.Value.EpochNumber == _epochs[3].EpochNumber);
+		Assert.That(_cache.Last.Value.EpochNumber == _epochs[12].EpochNumber);
+
+		//add disjunct skip epoch
+		await _epochManager.AddEpochToCache(_epochs[24], CancellationToken.None);
+
+		Assert.That(_cache.Count == 10);
+		Assert.That(_cache.First.Value.EpochNumber == _epochs[15].EpochNumber);
+		Assert.That(_cache.Last.Value.EpochNumber == _epochs[24].EpochNumber);
+
+
+		//cannot get epoch ahead of last cached on master
+		var nextEpoch = await _epochManager.GetEpochAfter(_epochs[24].EpochNumber, false, CancellationToken.None);
+		Assert.Null(nextEpoch);
+
+		Assert.That(_cache.Count == 10);
+		Assert.That(_cache.First.Value.EpochNumber == _epochs[15].EpochNumber);
+		Assert.That(_cache.Last.Value.EpochNumber == _epochs[24].EpochNumber);
+
+		//cannot get epoch ahead of cache on master
+		nextEpoch = await _epochManager.GetEpochAfter(_epochs[25].EpochNumber, false, CancellationToken.None);
+		Assert.Null(nextEpoch);
+
+		Assert.That(_cache.Count == 10);
+		Assert.That(_cache.First.Value.EpochNumber == _epochs[15].EpochNumber);
+		Assert.That(_cache.Last.Value.EpochNumber == _epochs[24].EpochNumber);
+
+		//can get next  in cache
+		nextEpoch = await _epochManager.GetEpochAfter(_epochs[20].EpochNumber, false, CancellationToken.None);
+
+		Assert.That(nextEpoch.EpochPosition == _epochs[21].EpochPosition);
+		Assert.That(_cache.Count == 10);
+		Assert.That(_cache.First.Value.EpochNumber == _epochs[15].EpochNumber);
+		Assert.That(_cache.Last.Value.EpochNumber == _epochs[24].EpochNumber);
+
+		//can get next from first
+		nextEpoch = await _epochManager.GetEpochAfter(_epochs[15].EpochNumber, false, CancellationToken.None);
+
+		Assert.That(nextEpoch.EpochPosition == _epochs[16].EpochPosition);
+		Assert.That(_cache.Count == 10);
+		Assert.That(_cache.First.Value.EpochNumber == _epochs[15].EpochNumber);
+		Assert.That(_cache.Last.Value.EpochNumber == _epochs[24].EpochNumber);
+
+		//can get next epoch from just before cache
+		nextEpoch = await _epochManager.GetEpochAfter(_epochs[14].EpochNumber, false, CancellationToken.None);
+
+		Assert.That(nextEpoch.EpochPosition == _epochs[15].EpochPosition);
+		Assert.That(_cache.Count == 10);
+		Assert.That(_cache.First.Value.EpochNumber == _epochs[15].EpochNumber);
+		Assert.That(_cache.Last.Value.EpochNumber == _epochs[24].EpochNumber);
+
+		//can get next epoch from before cache
+		nextEpoch = await _epochManager.GetEpochAfter(_epochs[10].EpochNumber, false, CancellationToken.None);
+
+		Assert.That(nextEpoch.EpochPosition == _epochs[11].EpochPosition);
+		Assert.That(_cache.Count == 10);
+		Assert.That(_cache.First.Value.EpochNumber == _epochs[15].EpochNumber);
+		Assert.That(_cache.Last.Value.EpochNumber == _epochs[24].EpochNumber);
+
+		//can get next epoch from 0 epoch
+		nextEpoch = await _epochManager.GetEpochAfter(_epochs[0].EpochNumber, false, CancellationToken.None);
+
+		Assert.That(nextEpoch.EpochPosition == _epochs[1].EpochPosition);
+		Assert.That(_cache.Count == 10);
+		Assert.That(_cache.First.Value.EpochNumber == _epochs[15].EpochNumber);
+		Assert.That(_cache.Last.Value.EpochNumber == _epochs[24].EpochNumber);
+
+
+		//can add last epoch in log
+		await _epochManager.AddEpochToCache(_epochs[29], CancellationToken.None);
+
+		Assert.That(_cache.Count == 10);
+		Assert.That(_cache.First.Value.EpochNumber == _epochs[20].EpochNumber);
+		Assert.That(_cache.Last.Value.EpochNumber == _epochs[29].EpochNumber);
+
+		// can write an epoch with epoch information (even though previous epochs
+		// dont have epoch information)
+		await _epochManager.WriteNewEpoch(GetNextEpoch(), CancellationToken.None);
+		await _epochManager.WriteNewEpoch(GetNextEpoch(), CancellationToken.None);
+		var epochsWritten = _published.OfType<SystemMessage.EpochWritten>().ToArray();
+		Assert.AreEqual(2, epochsWritten.Length);
+		for (int i = 0; i < epochsWritten.Length; i++) {
+			_reader.Reposition(epochsWritten[i].Epoch.EpochPosition);
+			await _reader.TryReadNext(CancellationToken.None); // read epoch
+			IPrepareLogRecord<TStreamId> epochInfo;
+			while (true) {
+				var result = await _reader.TryReadNext(CancellationToken.None);
+				Assert.True(result.Success);
+				if (result.LogRecord is IPrepareLogRecord<TStreamId> prepare) {
+					epochInfo = prepare;
+					break;
+				}
+			}
+			var expectedStreamId = LogFormatHelper<TLogFormat, TStreamId>.Choose<TStreamId>(
+				SystemStreams.EpochInformationStream,
+				LogV3SystemStreams.EpochInformationStreamNumber);
+			var expectedEventType = LogFormatHelper<TLogFormat, TStreamId>.Choose<TStreamId>(
+				SystemEventTypes.EpochInformation,
+				LogV3SystemEventTypes.EpochInformationNumber);
+			Assert.AreEqual(expectedStreamId, epochInfo.EventStreamId);
+			Assert.AreEqual(expectedEventType, epochInfo.EventType);
+			Assert.AreEqual(i - 1, epochInfo.ExpectedVersion);
+			Assert.AreEqual(_instanceId, epochInfo.Data.ParseJson<EpochDto>().LeaderInstanceId);
+		}
+	}
+
+	public class EpochDto {
+		public Guid LeaderInstanceId { get; set; }
+	}
+
+	public void Dispose() {
+		//epochManager?.Dispose();
+		//reader?.Dispose();
+		try {
+			_logFormat?.Dispose();
+			using var task = _writer?.DisposeAsync().AsTask() ?? Task.CompletedTask;
+			task.Wait();
+		} catch {
+			//workaround for TearDown error
+		}
+
+		using (var task = _db?.DisposeAsync().AsTask() ?? Task.CompletedTask) {
+			task.Wait();
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/EpochManager/when_having_an_epoch_manager_and_empty_tf_log.cs b/src/KurrentDB.Core.Tests/Services/Storage/EpochManager/when_having_an_epoch_manager_and_empty_tf_log.cs
new file mode 100644
index 00000000000..4757d6990d1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/EpochManager/when_having_an_epoch_manager_and_empty_tf_log.cs
@@ -0,0 +1,180 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.LogV3;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Storage.EpochManager;
+using KurrentDB.Core.Tests.TransactionLog;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.EpochManager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_having_an_epoch_manager_and_empty_tf_log<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private TFChunkDb _db;
+	private EpochManager<TStreamId> _epochManager;
+	private LogFormatAbstractor<TStreamId> _logFormat;
+	private LinkedList<EpochRecord> _cache;
+	private TFChunkReader _reader;
+	private TFChunkWriter _writer;
+	private SynchronousScheduler _mainBus;
+	private readonly Guid _instanceId = Guid.NewGuid();
+	private readonly List<Message> _published = new();
+
+	private int GetNextEpoch() {
+		return (int)Interlocked.Increment(ref _currentEpoch);
+	}
+	private long _currentEpoch = -1;
+	private EpochManager<TStreamId> GetManager() {
+		return new EpochManager<TStreamId>(_mainBus,
+			10,
+			_db.Config.EpochCheckpoint,
+			_writer,
+			initialReaderCount: 1,
+			maxReaderCount: 5,
+			readerFactory: () => new TFChunkReader(_db, _db.Config.WriterCheckpoint),
+			_logFormat.RecordFactory,
+			_logFormat.StreamNameIndex,
+			_logFormat.EventTypeIndex,
+			_logFormat.CreatePartitionManager(
+				reader: new TFChunkReader(_db, _db.Config.WriterCheckpoint),
+				writer: _writer),
+			_instanceId);
+	}
+	private LinkedList<EpochRecord> GetCache(EpochManager<TStreamId> manager) {
+		return (LinkedList<EpochRecord>)typeof(EpochManager<TStreamId>).GetField("_epochs", BindingFlags.NonPublic | BindingFlags.Instance)
+			.GetValue(_epochManager);
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var indexDirectory = GetFilePathFor("index");
+		_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
+			IndexDirectory = indexDirectory,
+		});
+
+		_mainBus = new(nameof(when_having_an_epoch_manager_and_empty_tf_log<TLogFormat, TStreamId>));
+		_mainBus.Subscribe(new AdHocHandler<SystemMessage.EpochWritten>(m => _published.Add(m)));
+		_db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, 0));
+		await _db.Open();
+		_reader = new TFChunkReader(_db, _db.Config.WriterCheckpoint);
+		_writer = new TFChunkWriter(_db);
+		await _writer.Open(CancellationToken.None);
+
+		_epochManager = GetManager();
+		await _epochManager.Init(CancellationToken.None);
+		_cache = GetCache(_epochManager);
+		Assert.NotNull(_cache);
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		_logFormat?.Dispose();
+		await (_writer?.DisposeAsync() ?? ValueTask.CompletedTask);
+		await (_db?.DisposeAsync() ?? ValueTask.CompletedTask);
+		await base.TestFixtureTearDown();
+	}
+
+	// epoch manager is stateful with TFLog,
+	// and TFLog is expesive to build fresh for each test
+	// and the tests depend on previous state in the epoch manager
+	// so this test will run through the test cases
+	// in order
+	[Test]
+	public async Task can_write_epochs() {
+
+		//can write first epoch
+		_published.Clear();
+		var beforeWrite = DateTime.UtcNow;
+		await _epochManager.WriteNewEpoch(GetNextEpoch(), CancellationToken.None);
+		Assert.That(_published.Count == 1);
+		var epochWritten = _published[0] as SystemMessage.EpochWritten;
+		Assert.NotNull(epochWritten);
+		Assert.That(epochWritten.Epoch.EpochNumber == 0);
+		Assert.That(epochWritten.Epoch.PrevEpochPosition == -1);
+		Assert.That(epochWritten.Epoch.EpochPosition == 0);
+		Assert.That(epochWritten.Epoch.LeaderInstanceId == _instanceId);
+		Assert.That(epochWritten.Epoch.TimeStamp < DateTime.UtcNow);
+		Assert.That(epochWritten.Epoch.TimeStamp >= beforeWrite);
+
+		// will_cache_epochs_written() {
+
+		for (int i = 0; i < 4; i++) {
+			await _epochManager.WriteNewEpoch(GetNextEpoch(), CancellationToken.None);
+		}
+		Assert.That(_cache.Count == 5);
+		Assert.That(_cache.First.Value.EpochNumber == 0);
+		Assert.That(_cache.Last.Value.EpochNumber == 4);
+		var epochs = new List<int>();
+		var epoch = _cache.First;
+		while (epoch != null) {
+			epochs.Add(epoch.Value.EpochNumber);
+			epoch = epoch.Next;
+		}
+		CollectionAssert.IsOrdered(epochs);
+
+		// can_write_more_epochs_than_cache_size
+
+		for (int i = 0; i < 16; i++) {
+			await _epochManager.WriteNewEpoch(GetNextEpoch(), CancellationToken.None);
+		}
+		Assert.That(_cache.Count == 10);
+		Assert.That(_cache.First.Value.EpochNumber == 11);
+		Assert.That(_cache.Last.Value.EpochNumber == 20);
+		epochs = new List<int>();
+		epoch = _cache.First;
+		while (epoch != null) {
+			epochs.Add(epoch.Value.EpochNumber);
+			epoch = epoch.Next;
+		}
+		CollectionAssert.IsOrdered(epochs);
+
+		// has written epoch information
+		var epochsWritten = _published.OfType<SystemMessage.EpochWritten>().ToArray();
+		Assert.AreEqual(1 + 4 + 16, epochsWritten.Length);
+		for (int i = 0; i < epochsWritten.Length; i++) {
+			_reader.Reposition(epochsWritten[i].Epoch.EpochPosition);
+			await _reader.TryReadNext(CancellationToken.None); // read epoch
+			IPrepareLogRecord<TStreamId> epochInfo;
+			while (true) {
+				var result = await _reader.TryReadNext(CancellationToken.None);
+				Assert.True(result.Success);
+				if (result.LogRecord is IPrepareLogRecord<TStreamId> prepare) {
+					epochInfo = prepare;
+					break;
+				}
+			}
+			var expectedStreamId = LogFormatHelper<TLogFormat, TStreamId>.Choose<TStreamId>(
+				SystemStreams.EpochInformationStream,
+				LogV3SystemStreams.EpochInformationStreamNumber);
+			var expectedEventType = LogFormatHelper<TLogFormat, TStreamId>.Choose<TStreamId>(
+				SystemEventTypes.EpochInformation,
+				LogV3SystemEventTypes.EpochInformationNumber);
+			Assert.AreEqual(expectedStreamId, epochInfo.EventStreamId);
+			Assert.AreEqual(expectedEventType, epochInfo.EventType);
+			Assert.AreEqual(i - 1, epochInfo.ExpectedVersion);
+			Assert.AreEqual(_instanceId, epochInfo.Data.ParseJson<EpochDto>().LeaderInstanceId);
+		}
+		_published.Clear();
+	}
+
+	public class EpochDto {
+		public Guid LeaderInstanceId { get; set; }
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/EpochManager/when_starting_having_TFLog_with_existing_epochs.cs b/src/KurrentDB.Core.Tests/Services/Storage/EpochManager/when_starting_having_TFLog_with_existing_epochs.cs
new file mode 100644
index 00000000000..8d011a07180
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/EpochManager/when_starting_having_TFLog_with_existing_epochs.cs
@@ -0,0 +1,154 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Storage.EpochManager;
+using KurrentDB.Core.Tests.TransactionLog;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.EpochManager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public sealed class when_starting_having_TFLog_with_existing_epochs<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture, IDisposable {
+	private TFChunkDb _db;
+	private EpochManager<TStreamId> _epochManager;
+	private LogFormatAbstractor<TStreamId> _logFormat;
+	private LinkedList<EpochRecord> _cache;
+	private TFChunkReader _reader;
+	private TFChunkWriter _writer;
+	private SynchronousScheduler _mainBus;
+	private readonly Guid _instanceId = Guid.NewGuid();
+	private readonly List<Message> _published = new List<Message>();
+	private List<EpochRecord> _epochs;
+
+	private static int GetNextEpoch() {
+		return (int)Interlocked.Increment(ref _currentEpoch);
+	}
+	private static long _currentEpoch = -1;
+
+	private EpochManager<TStreamId> GetManager() {
+		return new EpochManager<TStreamId>(_mainBus,
+			10,
+			_db.Config.EpochCheckpoint,
+			_writer,
+			initialReaderCount: 1,
+			maxReaderCount: 5,
+			readerFactory: () => new TFChunkReader(_db, _db.Config.WriterCheckpoint),
+			_logFormat.RecordFactory,
+			_logFormat.StreamNameIndex,
+			_logFormat.EventTypeIndex,
+			_logFormat.CreatePartitionManager(
+				reader: new TFChunkReader(_db, _db.Config.WriterCheckpoint),
+				writer: _writer),
+			_instanceId);
+	}
+	private LinkedList<EpochRecord> GetCache(EpochManager<TStreamId> manager) {
+		return (LinkedList<EpochRecord>)typeof(EpochManager<TStreamId>).GetField("_epochs", BindingFlags.NonPublic | BindingFlags.Instance)
+			.GetValue(_epochManager);
+	}
+	private async ValueTask<EpochRecord> WriteEpoch(int epochNumber, long lastPos, Guid instanceId, CancellationToken token) {
+		long pos = _writer.Position;
+		var epoch = new EpochRecord(pos, epochNumber, Guid.NewGuid(), lastPos, DateTime.UtcNow, instanceId);
+		var rec = new SystemLogRecord(epoch.EpochPosition, epoch.TimeStamp, SystemRecordType.Epoch,
+			SystemRecordSerialization.Json, epoch.AsSerialized());
+		await _writer.Write(rec, token);
+		await _writer.Flush(token);
+		return epoch;
+	}
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var indexDirectory = GetFilePathFor("index");
+		_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
+			IndexDirectory = indexDirectory,
+		});
+
+		_mainBus = new(nameof(when_starting_having_TFLog_with_existing_epochs<TLogFormat, TStreamId>));
+		_mainBus.Subscribe(new AdHocHandler<SystemMessage.EpochWritten>(m => _published.Add(m)));
+		_db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, 0));
+		await _db.Open();
+		_reader = new TFChunkReader(_db, _db.Config.WriterCheckpoint);
+		_writer = new TFChunkWriter(_db);
+		await _writer.Open(CancellationToken.None);
+		_epochs = new List<EpochRecord>();
+		var lastPos = 0L;
+		for (int i = 0; i < 30; i++) {
+			var epoch = await WriteEpoch(GetNextEpoch(), lastPos, _instanceId, CancellationToken.None);
+			_epochs.Add(epoch);
+			lastPos = epoch.EpochPosition;
+		}
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		this.Dispose();
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public async Task starting_epoch_manager_loads_epochs() {
+
+		_epochManager = GetManager();
+		await _epochManager.Init(CancellationToken.None);
+		_cache = GetCache(_epochManager);
+		Assert.NotNull(_cache);
+
+		Assert.That(_cache.Count == 10);
+		Assert.That(_cache.First.Value.EpochNumber == _epochs[20].EpochNumber);
+		Assert.That(_cache.Last.Value.EpochNumber == _epochs[29].EpochNumber);
+
+	}
+	[Test]
+	public async Task starting_epoch_manager_with_cache_larger_than_epoch_count_loads_all_epochs() {
+
+		_epochManager = new EpochManager<TStreamId>(_mainBus,
+			1000,
+			_db.Config.EpochCheckpoint,
+			_writer,
+			initialReaderCount: 1,
+			maxReaderCount: 5,
+			readerFactory: () => new TFChunkReader(_db, _db.Config.WriterCheckpoint),
+			_logFormat.RecordFactory,
+			_logFormat.StreamNameIndex,
+			_logFormat.EventTypeIndex,
+			_logFormat.CreatePartitionManager(
+				reader: new TFChunkReader(_db, _db.Config.WriterCheckpoint),
+				writer: _writer),
+			_instanceId);
+		await _epochManager.Init(CancellationToken.None);
+		_cache = GetCache(_epochManager);
+		Assert.NotNull(_cache);
+
+		Assert.That(_cache.Count == 30);
+		Assert.That(_cache.First.Value.EpochNumber == _epochs[0].EpochNumber);
+		Assert.That(_cache.Last.Value.EpochNumber == _epochs[29].EpochNumber);
+
+	}
+	public void Dispose() {
+		//epochManager?.Dispose();
+		//reader?.Dispose();
+		try {
+			_logFormat?.Dispose();
+			using var task = _writer?.DisposeAsync().AsTask() ?? Task.CompletedTask;
+			task.Wait();
+		} catch {
+			//workaround for TearDown error
+		}
+
+		using (var task = _db?.DisposeAsync().AsTask() ?? Task.CompletedTask) {
+			task.Wait();
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/EpochManager/when_starting_having_TFLog_with_no_epochs.cs b/src/KurrentDB.Core.Tests/Services/Storage/EpochManager/when_starting_having_TFLog_with_no_epochs.cs
new file mode 100644
index 00000000000..1838ce36a3c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/EpochManager/when_starting_having_TFLog_with_no_epochs.cs
@@ -0,0 +1,120 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Storage.EpochManager;
+using KurrentDB.Core.Tests.TransactionLog;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.EpochManager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public sealed class when_starting_having_TFLog_with_no_epochs<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture, IDisposable {
+	private TFChunkDb _db;
+	private EpochManager<TStreamId> _epochManager;
+	private LogFormatAbstractor<TStreamId> _logFormat;
+	private LinkedList<EpochRecord> _cache;
+	private TFChunkReader _reader;
+	private TFChunkWriter _writer;
+	private SynchronousScheduler _mainBus;
+	private readonly Guid _instanceId = Guid.NewGuid();
+	private readonly List<Message> _published = new List<Message>();
+	public when_starting_having_TFLog_with_no_epochs() {
+	}
+
+	private static int GetNextEpoch() {
+		return (int)Interlocked.Increment(ref _currentEpoch);
+	}
+	private static long _currentEpoch = -1;
+	private EpochManager<TStreamId> GetManager() {
+		return new EpochManager<TStreamId>(_mainBus,
+			10,
+			_db.Config.EpochCheckpoint,
+			_writer,
+			initialReaderCount: 1,
+			maxReaderCount: 5,
+			readerFactory: () => new TFChunkReader(_db, _db.Config.WriterCheckpoint),
+			_logFormat.RecordFactory,
+			_logFormat.StreamNameIndex,
+			_logFormat.EventTypeIndex,
+			_logFormat.CreatePartitionManager(
+				reader: new TFChunkReader(_db, _db.Config.WriterCheckpoint),
+				writer: _writer),
+			_instanceId);
+	}
+	private LinkedList<EpochRecord> GetCache(EpochManager<TStreamId> manager) {
+		return (LinkedList<EpochRecord>)typeof(EpochManager<TStreamId>).GetField("_epochs", BindingFlags.NonPublic | BindingFlags.Instance)
+			.GetValue(_epochManager);
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var indexDirectory = GetFilePathFor("index");
+		_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
+			IndexDirectory = indexDirectory,
+		});
+
+		_mainBus = new(nameof(when_starting_having_TFLog_with_no_epochs<TLogFormat, TStreamId>));
+		_mainBus.Subscribe(new AdHocHandler<SystemMessage.EpochWritten>(m => _published.Add(m)));
+		_db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, 0));
+		await _db.Open();
+		_reader = new TFChunkReader(_db, _db.Config.WriterCheckpoint);
+		_writer = new TFChunkWriter(_db);
+		await _writer.Open(CancellationToken.None);
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		this.Dispose();
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public async Task starting_epoch_manager_loads_without_epochs() {
+
+		_epochManager = GetManager();
+		await _epochManager.Init(CancellationToken.None);
+		_cache = GetCache(_epochManager);
+		Assert.NotNull(_cache);
+
+		Assert.That(_cache.Count is 0);
+		Assert.That(_cache?.First?.Value is null);
+		Assert.That(_cache?.Last?.Value is null);
+		Assert.That(_epochManager.LastEpochNumber == -1);
+		await _epochManager.WriteNewEpoch(0, CancellationToken.None);
+		Assert.That(_cache.Count is 1);
+		Assert.That(_cache.First.Value.EpochNumber is 0);
+		Assert.That(_cache.Last.Value.EpochNumber is 0);
+		Assert.That(_epochManager.LastEpochNumber is 0);
+
+	}
+
+	public void Dispose() {
+		//epochManager?.Dispose();
+		//reader?.Dispose();
+		try {
+			_logFormat?.Dispose();
+			using var task = _writer?.DisposeAsync().AsTask() ?? Task.CompletedTask;
+			task.Wait();
+		} catch {
+			//workaround for TearDown error
+		}
+
+		using (var task = _db?.DisposeAsync().AsTask() ?? Task.CompletedTask) {
+			task.Wait();
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/EpochManager/when_truncating_the_epoch_checkpoint.cs b/src/KurrentDB.Core.Tests/Services/Storage/EpochManager/when_truncating_the_epoch_checkpoint.cs
new file mode 100644
index 00000000000..d4bc2f1d553
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/EpochManager/when_truncating_the_epoch_checkpoint.cs
@@ -0,0 +1,249 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Services.Storage.EpochManager;
+using KurrentDB.Core.Tests.TransactionLog;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.EpochManager;
+
+public abstract class
+	when_truncating_the_epoch_checkpoint<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private TFChunkDb _db;
+	private EpochManager<TStreamId> _epochManager;
+	private LogFormatAbstractor<TStreamId> _logFormat;
+	private TFChunkWriter _writer;
+	private SynchronousScheduler _mainBus;
+	private List<EpochRecord> _epochs;
+	private readonly Guid _instanceId = Guid.NewGuid();
+	private readonly int _numEpochs;
+	private const int CachedEpochCount = 10;
+
+	private async ValueTask<EpochRecord> WriteEpoch(int epochNumber, long lastPos, Guid instanceId, CancellationToken token) {
+		long pos = _writer.Position;
+		var epoch = new EpochRecord(pos, epochNumber, Guid.NewGuid(), lastPos, DateTime.UtcNow, instanceId);
+		var rec = _logFormat.RecordFactory.CreateEpoch(epoch);
+		await _writer.Write(rec, token);
+		await _writer.Flush(token);
+		return epoch;
+	}
+
+	public when_truncating_the_epoch_checkpoint(int numEpochs) {
+		_numEpochs = numEpochs;
+	}
+
+	[SetUp]
+	public async Task SetUp() {
+		_mainBus = new(nameof(when_having_an_epoch_manager_and_empty_tf_log<TLogFormat, TStreamId>));
+
+		var indexDirectory = GetFilePathFor("index");
+		_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
+			IndexDirectory = indexDirectory,
+		});
+
+		_db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, 0));
+		await _db.Open();
+		_writer = new TFChunkWriter(_db);
+		await _writer.Open(CancellationToken.None);
+		_epochManager = new EpochManager<TStreamId>(_mainBus,
+			CachedEpochCount,
+			_db.Config.EpochCheckpoint,
+			_writer,
+			initialReaderCount: 1,
+			maxReaderCount: 5,
+			readerFactory: () => new TFChunkReader(_db, _db.Config.WriterCheckpoint),
+			_logFormat.RecordFactory,
+			_logFormat.StreamNameIndex,
+			_logFormat.EventTypeIndex,
+			_logFormat.CreatePartitionManager(
+				reader: new TFChunkReader(_db, _db.Config.WriterCheckpoint),
+				writer: _writer),
+			_instanceId);
+
+		await _epochManager.Init(CancellationToken.None);
+		_epochs = new List<EpochRecord>();
+
+		var lastPos = 0L;
+		for (int i = 0; i < _numEpochs; i++) {
+			var epoch = await WriteEpoch(i, lastPos, _instanceId, CancellationToken.None);
+			await _epochManager.AddEpochToCache(epoch, CancellationToken.None);
+			_epochs.Add(epoch);
+			lastPos = epoch.EpochPosition;
+		}
+	}
+
+
+	[TearDown]
+	public async Task TearDown() {
+		try {
+			_logFormat?.Dispose();
+			await (_writer?.DisposeAsync() ?? ValueTask.CompletedTask);
+		} catch {
+			//workaround for TearDown error
+		}
+
+		await (_db?.DisposeAsync() ?? ValueTask.CompletedTask);
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class with_no_epochs : when_truncating_the_epoch_checkpoint<TLogFormat, TStreamId> {
+		public with_no_epochs() : base(0) { }
+
+		[Test]
+		public async Task cannot_truncate_before_position_zero() {
+			Assert.Null(await _epochManager.TryTruncateBefore(0, CancellationToken.None));
+		}
+
+		[Test]
+		public async Task cannot_truncate_before_arbitrary_position() {
+			Assert.Null(await _epochManager.TryTruncateBefore(12, CancellationToken.None));
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class with_two_epochs : when_truncating_the_epoch_checkpoint<TLogFormat, TStreamId> {
+		public with_two_epochs() : base(2) { }
+
+		[Test]
+		public async Task cannot_truncate_before_first_epoch_position() {
+			Assert.Null(await _epochManager.TryTruncateBefore(_epochs[0].EpochPosition, CancellationToken.None));
+		}
+
+		[Test]
+		public async Task can_truncate_before_first_epoch_position_plus_one() {
+			var epoch = await _epochManager.TryTruncateBefore(_epochs[0].EpochPosition + 1, CancellationToken.None);
+			Assert.NotNull(epoch);
+			Assert.AreEqual(_epochs[0].EpochNumber, epoch.EpochNumber);
+		}
+
+		[Test]
+		public async Task can_truncate_before_second_epoch_position() {
+			var epoch = await _epochManager.TryTruncateBefore(_epochs[1].EpochPosition, CancellationToken.None);
+			Assert.NotNull(epoch);
+			Assert.AreEqual(_epochs[0].EpochNumber, epoch.EpochNumber);
+		}
+
+		[Test]
+		public async Task can_truncate_before_second_epoch_position_plus_one() {
+			var epoch = await _epochManager.TryTruncateBefore(_epochs[1].EpochPosition + 1, CancellationToken.None);
+			Assert.NotNull(epoch);
+			Assert.AreEqual(_epochs[1].EpochNumber, epoch.EpochNumber);
+		}
+
+		[Test]
+		public async Task checkpoint_is_changed_after_truncation() {
+			var epoch = await _epochManager.TryTruncateBefore(_epochs[0].EpochPosition + 1, CancellationToken.None);
+			Assert.NotNull(epoch);
+			Assert.AreEqual(_epochs[0].EpochPosition, _db.Config.EpochCheckpoint.Read());
+		}
+
+		[Test]
+		public async Task checkpoint_is_unchanged_after_no_truncation() {
+			Assert.Null(await _epochManager.TryTruncateBefore(_epochs[0].EpochPosition, CancellationToken.None));
+			Assert.AreEqual(_epochs[1].EpochPosition, _db.Config.EpochCheckpoint.Read());
+		}
+
+		[Test]
+		public async Task cannot_read_checkpoint_even_if_no_truncation() {
+			Assert.Null(await _epochManager.TryTruncateBefore(_epochs[0].EpochPosition, CancellationToken.None));
+			Assert.ThrowsAsync<InvalidOperationException>(async () => {
+				await _epochManager.Init(CancellationToken.None); // triggers a checkpoint read internally
+			});
+		}
+
+		[Test]
+		public async Task cannot_read_checkpoint_after_truncation() {
+			Assert.NotNull(await _epochManager.TryTruncateBefore(_epochs[0].EpochPosition + 1, CancellationToken.None));
+			Assert.ThrowsAsync<InvalidOperationException>(async () => {
+				await _epochManager.Init(CancellationToken.None); // triggers a checkpoint read internally
+			});
+		}
+
+		[Test]
+		public async Task cannot_write_checkpoint_even_if_no_truncation() {
+			Assert.Null(await _epochManager.TryTruncateBefore(_epochs[0].EpochPosition, CancellationToken.None));
+			Assert.ThrowsAsync<InvalidOperationException>(async () => {
+				await _epochManager.WriteNewEpoch(2, CancellationToken.None); // triggers a checkpoint write internally
+			});
+		}
+
+		[Test]
+		public async Task cannot_write_checkpoint_after_truncation() {
+			Assert.NotNull(await _epochManager.TryTruncateBefore(_epochs[0].EpochPosition + 1, CancellationToken.None));
+			Assert.ThrowsAsync<InvalidOperationException>(async () => {
+				await _epochManager.WriteNewEpoch(2, CancellationToken.None); // triggers a checkpoint write internally
+			});
+		}
+
+		[Test]
+		public async Task cannot_truncate_twice() {
+			Assert.NotNull(await _epochManager.TryTruncateBefore(_epochs[0].EpochPosition + 1, CancellationToken.None));
+			Assert.ThrowsAsync<InvalidOperationException>(async () => {
+				await _epochManager.TryTruncateBefore(_epochs[0].EpochPosition + 1, CancellationToken.None);
+			});
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class with_cache_size_minus_three_epochs : when_truncating_the_epoch_checkpoint<TLogFormat, TStreamId> {
+		public with_cache_size_minus_three_epochs() : base(CachedEpochCount - 3) { }
+
+		[Test]
+		public async Task cannot_truncate_before_first_epoch_position() {
+			Assert.Null(await _epochManager.TryTruncateBefore(_epochs[0].EpochPosition, CancellationToken.None));
+		}
+
+		[Test]
+		public async Task can_truncate_before_first_epoch_position_plus_one() {
+			var epoch = await _epochManager.TryTruncateBefore(_epochs[0].EpochPosition + 1, CancellationToken.None);
+			Assert.NotNull(epoch);
+			Assert.AreEqual(_epochs[0].EpochNumber, epoch.EpochNumber);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class with_cache_size_epochs : when_truncating_the_epoch_checkpoint<TLogFormat, TStreamId> {
+		public with_cache_size_epochs() : base(CachedEpochCount) { }
+		[Test]
+		public async Task cannot_truncate_before_first_epoch_position() {
+			Assert.Null(await _epochManager.TryTruncateBefore(_epochs[0].EpochPosition, CancellationToken.None));
+		}
+
+		[Test]
+		public async Task can_truncate_before_first_epoch_position_plus_one() {
+			var epoch = await _epochManager.TryTruncateBefore(_epochs[0].EpochPosition + 1, CancellationToken.None);
+			Assert.NotNull(epoch);
+			Assert.AreEqual(_epochs[0].EpochNumber, epoch.EpochNumber);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class with_cache_size_plus_two_epochs : when_truncating_the_epoch_checkpoint<TLogFormat, TStreamId> {
+		public with_cache_size_plus_two_epochs() : base(CachedEpochCount + 2) { }
+
+		[Test]
+		public async Task cannot_truncate_before_third_epoch_position() {
+			Assert.Null(await _epochManager.TryTruncateBefore(_epochs[2].EpochPosition, CancellationToken.None));
+		}
+
+		[Test]
+		public async Task can_truncate_before_third_epoch_position_plus_one() {
+			var epoch = await _epochManager.TryTruncateBefore(_epochs[2].EpochPosition + 1, CancellationToken.None);
+			Assert.NotNull(epoch);
+			Assert.AreEqual(_epochs[2].EpochNumber, epoch.EpochNumber);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/FakeInMemoryTFReader.cs b/src/KurrentDB.Core.Tests/Services/Storage/FakeInMemoryTFReader.cs
new file mode 100644
index 00000000000..1d1c7955abe
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/FakeInMemoryTFReader.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.Tests.Services.Storage;
+
+public class FakeInMemoryTfReader : ITransactionFileReader {
+	private Dictionary<long, ILogRecord> _records = new();
+	private long _curPosition = 0;
+	private int _recordOffset;
+
+	public int NumReads { get; private set; }
+
+	public FakeInMemoryTfReader(int recordOffset) {
+		_recordOffset = recordOffset;
+	}
+
+	public void AddRecord(ILogRecord record, long position) {
+		_records.Add(position, record);
+	}
+
+	public void Reposition(long position) {
+		_curPosition = position;
+	}
+
+	public ValueTask<SeqReadResult> TryReadNext(CancellationToken token) {
+		NumReads++;
+
+		SeqReadResult result;
+		if (_records.ContainsKey(_curPosition)) {
+			var pos = _curPosition;
+			_curPosition += _recordOffset;
+			result = new(true, false, _records[pos], _recordOffset, pos, pos + _recordOffset);
+		} else {
+			result = new(false, false, null, 0, 0, 0);
+		}
+
+		return new(result);
+	}
+
+	public ValueTask<SeqReadResult> TryReadPrev(CancellationToken token)
+		=> ValueTask.FromException<SeqReadResult>(new NotImplementedException());
+
+	public ValueTask<RecordReadResult> TryReadAt(long position, bool couldBeScavenged, CancellationToken token) {
+		NumReads++;
+
+		RecordReadResult result;
+		if (_records.ContainsKey(position)) {
+			result = new RecordReadResult(true, 0, _records[position], 0);
+		} else {
+			result = new RecordReadResult(false, 0, _records[position], 0);
+		}
+
+		return new(result);
+	}
+
+	public ValueTask<bool> ExistsAt(long position, CancellationToken token)
+		=> token.IsCancellationRequested
+			? ValueTask.FromCanceled<bool>(token)
+			: ValueTask.FromResult(_records.ContainsKey(position));
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/FakeInMemoryTableIndex.cs b/src/KurrentDB.Core.Tests/Services/Storage/FakeInMemoryTableIndex.cs
new file mode 100644
index 00000000000..36eaceed2ee
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/FakeInMemoryTableIndex.cs
@@ -0,0 +1,115 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+
+namespace KurrentDB.Core.Tests.Services.Storage;
+
+public class FakeInMemoryTableIndex<TStreamId> : ITableIndex<TStreamId> {
+	public long CommitCheckpoint => throw new NotImplementedException();
+
+	public long PrepareCheckpoint => throw new NotImplementedException();
+
+	public bool IsBackgroundTaskRunning => throw new NotImplementedException();
+
+	private Dictionary<TStreamId, List<IndexKey<TStreamId>>> _indexEntries = new Dictionary<TStreamId, List<IndexKey<TStreamId>>>();
+	public void Add(long commitPos, TStreamId streamId, long version, long position) {
+		throw new NotImplementedException();
+	}
+
+	public void AddEntries(long commitPos, IList<IndexKey<TStreamId>> entries) {
+		foreach (var entry in entries) {
+			if (!_indexEntries.ContainsKey(entry.StreamId))
+				_indexEntries[entry.StreamId] = new List<IndexKey<TStreamId>>();
+			_indexEntries[entry.StreamId].Add(entry);
+		}
+	}
+
+	public void Close(bool removeFiles = true) {
+	}
+
+	public IEnumerable<ISearchTable> IterateAllInOrder() => throw new NotImplementedException();
+
+	public IReadOnlyList<IndexEntry> GetRange(TStreamId streamId, long startVersion, long endVersion, int? limit = null) {
+		var entries = new List<IndexEntry>();
+		if (_indexEntries.ContainsKey(streamId)) {
+			foreach (var entry in _indexEntries[streamId]) {
+				if (startVersion <= entry.Version && entry.Version <= endVersion)
+					entries.Add(new IndexEntry(entry.Hash, entry.Version, entry.Position));
+			}
+		}
+		return entries;
+	}
+
+	public IReadOnlyList<IndexEntry> GetRange(ulong stream, long startVersion, long endVersion, int? limit = null) {
+		throw new NotImplementedException();
+	}
+
+	public void Initialize(long chaserCheckpoint) {
+	}
+
+	public Task MergeIndexes() {
+		throw new NotImplementedException();
+	}
+
+	public ValueTask Scavenge(IIndexScavengerLog log, CancellationToken ct)
+		=> ValueTask.FromException(new NotImplementedException());
+
+	public ValueTask Scavenge(
+		Func<IndexEntry, CancellationToken, ValueTask<bool>> shouldKeep,
+		IIndexScavengerLog log,
+		CancellationToken ct)
+		=> ValueTask.FromException(new NotImplementedException());
+
+	public bool TryGetLatestEntry(TStreamId streamId, out IndexEntry entry) {
+		if (_indexEntries.ContainsKey(streamId)) {
+			var entries = _indexEntries[streamId];
+			var lastEntry = entries[entries.Count - 1];
+			entry = new IndexEntry(lastEntry.Hash, lastEntry.Version, lastEntry.Position);
+			return true;
+		} else {
+			entry = new IndexEntry();
+			return false;
+		}
+	}
+
+	public ValueTask<IndexEntry?> TryGetLatestEntry(ulong stream, long beforePosition,
+		Func<IndexEntry, CancellationToken, ValueTask<bool>> isForThisStream, CancellationToken token)
+		=> ValueTask.FromException<IndexEntry?>(new NotImplementedException());
+
+	public ValueTask<IndexEntry?> TryGetLatestEntry(TStreamId stream, long beforePosition,
+		Func<IndexEntry, CancellationToken, ValueTask<bool>> isForThisStream, CancellationToken token)
+		=> ValueTask.FromException<IndexEntry?>(new NotImplementedException());
+
+	public bool TryGetNextEntry(TStreamId streamId, long afterVersion, out IndexEntry entry) {
+		throw new NotImplementedException();
+	}
+
+	public bool TryGetNextEntry(ulong stream, long afterVersion, out IndexEntry entry) {
+		throw new NotImplementedException();
+	}
+
+	public bool TryGetPreviousEntry(TStreamId streamId, long beforeVersion, out IndexEntry entry) {
+		throw new NotImplementedException();
+	}
+
+	public bool TryGetPreviousEntry(ulong stream, long beforeVersion, out IndexEntry entry) {
+		throw new NotImplementedException();
+	}
+
+	public bool TryGetOldestEntry(TStreamId streamId, out IndexEntry entry) {
+		throw new NotImplementedException();
+	}
+
+	public bool TryGetOneValue(TStreamId streamId, long version, out long position) {
+		throw new NotImplementedException();
+	}
+
+	public void WaitForBackgroundTasks(int millisecondsTimeout) {
+		throw new NotImplementedException();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/FakeIndexCommitterService.cs b/src/KurrentDB.Core.Tests/Services/Storage/FakeIndexCommitterService.cs
new file mode 100644
index 00000000000..aa1026dda69
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/FakeIndexCommitterService.cs
@@ -0,0 +1,74 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Storage;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.Tests.Services.Storage;
+
+public class FakeIndexCommitterService<TStreamId> : IIndexCommitterService<TStreamId> {
+	public Dictionary<Guid, Transaction> Transactions = new();
+	public List<ILogRecord> Records = new();
+
+	public void AddPendingCommit(CommitLogRecord commit, long postPosition) {
+		if (commit == null)
+			throw new InvalidOperationException("Cannot commit a null transaction");
+		if (Transactions.TryGetValue(commit.CorrelationId, out var transaction)) {
+			transaction.CommitTransaction(commit);
+			Records.Add(commit);
+		} else {
+			throw new InvalidOperationException("Cannot commit an unknown transaction");
+		}
+	}
+
+	public void AddPendingPrepare(IPrepareLogRecord<TStreamId>[] prepares, long postPosition) {
+		if (prepares == null)
+			throw new InvalidOperationException("Cannot commit a null transaction");
+		if (prepares.Length <= 0)
+			return;
+		if (!Transactions.TryGetValue(prepares[0].CorrelationId, out var transaction)) {
+			transaction = new Transaction(prepares[0].CorrelationId);
+			Transactions.Add(prepares[0].CorrelationId, transaction);
+			Records.AddRange(prepares);
+		}
+		transaction.AddPrepares(prepares);
+	}
+
+	public ValueTask<long> GetCommitLastEventNumber(CommitLogRecord record, CancellationToken token) {
+		if (Transactions.TryGetValue(record.CorrelationId, out var transaction)) {
+			return ValueTask.FromResult(record.FirstEventNumber + transaction.Prepares.Count);
+		} else {
+			return ValueTask.FromException<long>(
+				new InvalidOperationException("Cannot get last event number for an unknown transaction"));
+		}
+	}
+
+	public ValueTask Init(long checkpointPosition, CancellationToken token) => ValueTask.CompletedTask;
+
+	public void Stop() { }
+
+	public class Transaction {
+		public Guid Id { get; }
+		public bool IsCommitted => Commit != null;
+		public CommitLogRecord Commit { get; private set; }
+		public ReadOnlyCollection<IPrepareLogRecord<TStreamId>> Prepares => _prepares.AsReadOnly();
+		private List<IPrepareLogRecord<TStreamId>> _prepares = new List<IPrepareLogRecord<TStreamId>>();
+
+		public Transaction(Guid id, ICollection<IPrepareLogRecord<TStreamId>> prepares = null) {
+			Id = id;
+			if (prepares != null) { AddPrepares(prepares); }
+		}
+		public void CommitTransaction(CommitLogRecord commit) {
+			Commit = commit;
+		}
+		public void AddPrepares(ICollection<IPrepareLogRecord<TStreamId>> prepares) {
+			if (IsCommitted) { throw new InvalidOperationException("Cannot add data to a committed transation"); }
+			_prepares.AddRange(prepares);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/FakeIndexWriter.cs b/src/KurrentDB.Core.Tests/Services/Storage/FakeIndexWriter.cs
new file mode 100644
index 00000000000..b7fde13bf29
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/FakeIndexWriter.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.Tests.Services.Storage;
+
+public class FakeIndexWriter<TStreamId> : IIndexWriter<TStreamId> {
+	public long CachedTransInfo => 0;
+	public long NotCachedTransInfo => 0;
+	public void Reset() { }
+
+	private TStreamId GetFakeStreamId() {
+		if (typeof(TStreamId) == typeof(long)) {
+			return (TStreamId)(object)0L;
+		}
+
+		if (typeof(TStreamId) == typeof(string)) {
+			return (TStreamId)(object)string.Empty;
+		}
+
+		throw new NotSupportedException();
+	}
+
+	public ValueTask<CommitCheckResult<TStreamId>> CheckCommitStartingAt(long transactionPosition, long commitPosition, CancellationToken token) {
+		return ValueTask.FromResult(new CommitCheckResult<TStreamId>(CommitDecision.Ok, GetFakeStreamId(), -1, -1, -1, false));
+	}
+
+	public ValueTask<CommitCheckResult<TStreamId>> CheckCommit(TStreamId streamId, long expectedVersion, IEnumerable<Guid> eventIds, bool streamMightExist, CancellationToken token) {
+		return ValueTask.FromResult(new CommitCheckResult<TStreamId>(CommitDecision.Ok, streamId, expectedVersion, -1, -1, false));
+	}
+
+	public ValueTask PreCommit(CommitLogRecord commit, CancellationToken token)
+		=> token.IsCancellationRequested ? ValueTask.FromCanceled(token) : ValueTask.CompletedTask;
+
+	public void PreCommit(ReadOnlySpan<IPrepareLogRecord<TStreamId>> committedPrepares) { }
+
+	public void UpdateTransactionInfo(long transactionId, long logPosition, TransactionInfo<TStreamId> transactionInfo) { }
+
+	public ValueTask<TransactionInfo<TStreamId>> GetTransactionInfo(long writerCheckpoint, long transactionId,
+		CancellationToken token)
+		=> ValueTask.FromResult<TransactionInfo<TStreamId>>(default);
+
+	public void PurgeNotProcessedCommitsTill(long checkpoint) { }
+
+	public void PurgeNotProcessedTransactions(long checkpoint) { }
+
+	public ValueTask<bool> IsSoftDeleted(TStreamId streamId, CancellationToken token) => new(false);
+
+	public ValueTask<long> GetStreamLastEventNumber(TStreamId streamId, CancellationToken token) => new(-1L);
+
+	public ValueTask<StreamMetadata> GetStreamMetadata(TStreamId streamId, CancellationToken token) =>
+		new(StreamMetadata.Empty);
+
+	public ValueTask<RawMetaInfo> GetStreamRawMeta(TStreamId streamId, CancellationToken token)
+		=> ValueTask.FromResult(new RawMetaInfo());
+
+	public TStreamId GetStreamId(string streamName) => GetFakeStreamId();
+
+	public ValueTask<string> GetStreamName(TStreamId streamId, CancellationToken token) => new(string.Empty);
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/FakeTableIndex.cs b/src/KurrentDB.Core.Tests/Services/Storage/FakeTableIndex.cs
new file mode 100644
index 00000000000..f17cc2f052a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/FakeTableIndex.cs
@@ -0,0 +1,112 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+
+namespace KurrentDB.Core.Tests.Services.Storage;
+
+public class FakeTableIndex<TStreamId> : ITableIndex<TStreamId> {
+	internal static readonly IndexEntry InvalidIndexEntry = new IndexEntry(0, -1, -1);
+	public int ScavengeCount { get; private set; }
+
+	public long PrepareCheckpoint {
+		get { throw new NotImplementedException(); }
+	}
+
+	public long CommitCheckpoint {
+		get { throw new NotImplementedException(); }
+	}
+
+	public void Initialize(long chaserCheckpoint) {
+	}
+
+	public void Close(bool removeFiles = true) {
+	}
+
+	public void Add(long commitPos, TStreamId streamId, long version, long position) {
+		throw new NotImplementedException();
+	}
+
+	public void AddEntries(long commitPos, IList<IndexKey<TStreamId>> entries) {
+		throw new NotImplementedException();
+	}
+
+	public bool TryGetOneValue(TStreamId streamId, long version, out long position) {
+		position = -1;
+		return false;
+	}
+
+	public bool TryGetLatestEntry(TStreamId streamId, out IndexEntry entry) {
+		entry = InvalidIndexEntry;
+		return false;
+	}
+
+	public ValueTask<IndexEntry?> TryGetLatestEntry(ulong stream, long beforePosition,
+		Func<IndexEntry, CancellationToken, ValueTask<bool>> isForThisStream, CancellationToken token)
+		=> ValueTask.FromException<IndexEntry?>(new NotImplementedException());
+
+	public ValueTask<IndexEntry?> TryGetLatestEntry(TStreamId streamId, long beforePosition,
+		Func<IndexEntry, CancellationToken, ValueTask<bool>> isForThisStream, CancellationToken token)
+		=> ValueTask.FromException<IndexEntry?>(new NotImplementedException());
+
+	public bool TryGetOldestEntry(TStreamId streamId, out IndexEntry entry) {
+		entry = InvalidIndexEntry;
+		return false;
+	}
+
+	public bool TryGetNextEntry(TStreamId streamId, long afterVersion, out IndexEntry entry) {
+		throw new NotImplementedException();
+	}
+
+	public bool TryGetNextEntry(ulong stream, long afterVersion, out IndexEntry entry) {
+		throw new NotImplementedException();
+	}
+
+	public bool TryGetPreviousEntry(TStreamId streamId, long beforeVersion, out IndexEntry entry) {
+		throw new NotImplementedException();
+	}
+
+	public bool TryGetPreviousEntry(ulong stream, long beforeVersion, out IndexEntry entry) {
+		throw new NotImplementedException();
+	}
+
+	public IEnumerable<ISearchTable> IterateAllInOrder() => throw new NotImplementedException();
+
+	public IReadOnlyList<IndexEntry> GetRange(TStreamId streamId, long startVersion, long endVersion,
+		int? limit = null) {
+		return Array.Empty<IndexEntry>();
+	}
+
+	public IReadOnlyList<IndexEntry> GetRange(ulong stream, long startVersion, long endVersion, int? limit = null) {
+		throw new NotImplementedException();
+	}
+
+	public ValueTask Scavenge(IIndexScavengerLog log, CancellationToken ct) {
+		ScavengeCount++;
+		return ValueTask.CompletedTask;
+	}
+
+	public ValueTask Scavenge(
+		Func<IndexEntry, CancellationToken, ValueTask<bool>> shouldKeep,
+		IIndexScavengerLog log,
+		CancellationToken ct) {
+
+		return Scavenge(log, ct);
+	}
+
+	public Task MergeIndexes() {
+		return Task.CompletedTask;
+	}
+
+	public void WaitForBackgroundTasks(int millisecondsTimeout) {
+		throw new NotImplementedException();
+	}
+
+	public bool IsBackgroundTaskRunning {
+		get { return false; }
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/GetStreamLastEventNumber_NoCollisions.cs b/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/GetStreamLastEventNumber_NoCollisions.cs
new file mode 100644
index 00000000000..18d0705a296
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/GetStreamLastEventNumber_NoCollisions.cs
@@ -0,0 +1,148 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.Index.Hashers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.HashCollisions;
+
+[TestFixture]
+public abstract class GetStreamLastEventNumber_NoCollisions : ReadIndexTestScenario<LogFormat.V2, string> {
+	private const string Stream = "ab-1";
+	private const ulong Hash = 98;
+	private const string NonCollidingStream = "cd-1";
+
+	private string GetStreamId(ulong hash) => hash == Hash ? Stream : throw new ArgumentException();
+
+	protected GetStreamLastEventNumber_NoCollisions() : base(
+		maxEntriesInMemTable: 3,
+		lowHasher: new ConstantHasher(0),
+		highHasher: new HumanReadableHasher32()) { }
+
+	public class VerifyNoCollision : GetStreamLastEventNumber_NoCollisions {
+		[Test]
+		public void verify_that_streams_do_not_collide() {
+			Assert.AreNotEqual(Hasher.Hash(Stream), Hasher.Hash(NonCollidingStream));
+		}
+	}
+
+	public class WithNoEvents : GetStreamLastEventNumber_NoCollisions {
+		[Test]
+		public async Task with_no_events() {
+			Assert.AreEqual(ExpectedVersion.NoStream,
+				await ReadIndex.GetStreamLastEventNumber_NoCollisions(
+					Hash,
+					GetStreamId,
+					long.MaxValue,
+					CancellationToken.None));
+		}
+	}
+
+	public class WithOneEvent : GetStreamLastEventNumber_NoCollisions {
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			await WriteSingleEvent(Stream, 0, "test data", token: token);
+		}
+
+		[Test]
+		public async Task with_one_event() {
+			Assert.AreEqual(0,
+				await ReadIndex.GetStreamLastEventNumber_NoCollisions(
+					Hash,
+					GetStreamId,
+					long.MaxValue,
+					CancellationToken.None));
+		}
+	}
+
+	public class WithMultipleEvents : GetStreamLastEventNumber_NoCollisions {
+		private EventRecord _zeroth, _first, _second, _third;
+
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			// PTable 1
+			await WriteSingleEvent(NonCollidingStream, 0, string.Empty, token: token);
+			await WriteSingleEvent(NonCollidingStream, 1, string.Empty, token: token);
+			_zeroth = await WriteSingleEvent(Stream, 0, string.Empty, token: token);
+
+			// PTable 2
+			_first = await WriteSingleEvent(Stream, 1, string.Empty, token: token);
+			_second = await WriteSingleEvent(Stream, 2, string.Empty, token: token);
+			await WriteSingleEvent(NonCollidingStream, 2, string.Empty, token: token);
+
+			// MemTable
+			_third = await WriteSingleEvent(Stream, 3, string.Empty, token: token);
+			await WriteSingleEvent(NonCollidingStream, 3, string.Empty, token: token);
+		}
+
+		[Test]
+		public async Task with_multiple_events() {
+			Assert.AreEqual(3,
+				await ReadIndex.GetStreamLastEventNumber_NoCollisions(
+					Hash,
+					GetStreamId,
+					long.MaxValue,
+					CancellationToken.None));
+		}
+
+		[Test]
+		public async Task with_multiple_events_and_before_position() {
+			Assert.AreEqual(3,
+				await ReadIndex.GetStreamLastEventNumber_NoCollisions(
+					Hash,
+					GetStreamId,
+					_third.LogPosition + 1,
+					CancellationToken.None));
+
+			Assert.AreEqual(2,
+				await ReadIndex.GetStreamLastEventNumber_NoCollisions(
+					Hash,
+					GetStreamId,
+					_third.LogPosition,
+					CancellationToken.None));
+
+			Assert.AreEqual(1,
+				await ReadIndex.GetStreamLastEventNumber_NoCollisions(
+					Hash,
+					GetStreamId,
+					_second.LogPosition,
+					CancellationToken.None));
+
+			Assert.AreEqual(0,
+				await ReadIndex.GetStreamLastEventNumber_NoCollisions(
+					Hash,
+					GetStreamId,
+					_first.LogPosition,
+					CancellationToken.None));
+
+			Assert.AreEqual(ExpectedVersion.NoStream,
+				await ReadIndex.GetStreamLastEventNumber_NoCollisions(
+					Hash,
+					GetStreamId,
+					_zeroth.LogPosition,
+					CancellationToken.None));
+		}
+	}
+
+	public class WithDeletedStream : GetStreamLastEventNumber_NoCollisions {
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			await WriteSingleEvent(Stream, 0, "test data", token: token);
+			await WriteSingleEvent(Stream, 1, "test data", token: token);
+
+			var prepare = await WriteDeletePrepare(Stream, token);
+			await WriteDeleteCommit(prepare, token);
+		}
+
+		[Test]
+		public async Task with_deleted_stream() {
+			Assert.AreEqual(EventNumber.DeletedStream,
+				await ReadIndex.GetStreamLastEventNumber_NoCollisions(
+					Hash,
+					GetStreamId,
+					long.MaxValue,
+					CancellationToken.None));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_hash_collisions.cs b/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_hash_collisions.cs
new file mode 100644
index 00000000000..848ac1e4a3b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_hash_collisions.cs
@@ -0,0 +1,491 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.Index.Hashers;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
+
+namespace KurrentDB.Core.Tests.Services.Storage.HashCollisions;
+
+// both the stream names hash to the same value using XXHash.
+// they are different for Murmur3 so we use only XXHashUnsafe here.
+// we use a fake TransactionFileReader that attributes:
+//    odd  positions to LPN-FC002_LPK51001
+//    even positions to account--696193173
+[TestFixture]
+public class HashCollisionTestFixture : SpecificationWithDirectoryPerTestFixture {
+	protected int _hashCollisionReadLimit = 5;
+	protected int _maxMemTableSize = 5;
+	protected TableIndex<string> _tableIndex;
+	protected IIndexReader<string> _indexReader;
+	protected IIndexBackend<string> _indexBackend;
+	protected IHasher<string> _lowHasher;
+	protected IHasher<string> _highHasher;
+	protected string _indexDir;
+	protected TFReaderLease _fakeReader;
+	protected LogFormatAbstractor<string> _logFormat;
+
+	protected virtual void given() {
+	}
+
+	protected virtual void when() {
+	}
+
+	[OneTimeSetUp]
+	public void Setup() {
+		given();
+		_indexDir = PathName;
+		_fakeReader = new TFReaderLease(new FakeReader());
+		_indexBackend = new FakeIndexBackend<string>(_fakeReader);
+
+		_logFormat = LogFormatHelper<LogFormat.V2, string>.LogFormatFactory.Create(new() {
+			InMemory = true,
+			LowHasher = new XXHashUnsafe(),
+			HighHasher = new ConstantHasher(0),
+		});
+
+		_lowHasher = _logFormat.LowHasher;
+		_highHasher = _logFormat.HighHasher;
+		_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, _logFormat.EmptyStreamId,
+			() => new HashListMemTable(PTableVersions.IndexV4, maxSize: _maxMemTableSize),
+			() => _fakeReader,
+			PTableVersions.IndexV4,
+			5, Constants.PTableMaxReaderCountDefault,
+			maxSizeForMemory: _maxMemTableSize,
+			maxTablesPerLevel: 2);
+		_logFormat.StreamNamesProvider.SetTableIndex(_tableIndex);
+		_tableIndex.Initialize(long.MaxValue);
+		_indexReader = new IndexReader<string>(_indexBackend, _tableIndex,
+			_logFormat.StreamNamesProvider,
+			_logFormat.StreamIdValidator,
+			_logFormat.StreamExistenceFilterReader,
+			new StreamMetadata(),
+			_hashCollisionReadLimit, skipIndexScanOnRead: false);
+
+		when();
+		//wait for the mem table to be dumped
+		Thread.Sleep(500);
+	}
+
+	public override Task TestFixtureTearDown() {
+		_logFormat.Dispose();
+		_tableIndex.Close();
+		return base.TestFixtureTearDown();
+	}
+}
+
+class UseMaxAgeFixtureArgs : IEnumerable {
+	public IEnumerator GetEnumerator() {
+		yield return true;
+		yield return false;
+	}
+}
+
+[TestFixture]
+public class when_stream_does_not_exist : HashCollisionTestFixture {
+	protected override void given() {
+		_hashCollisionReadLimit = 5;
+	}
+
+	protected override void when() {
+		//mem table
+		_tableIndex.Add(1, "LPN-FC002_LPK51001", 0, 3);
+		_tableIndex.Add(1, "LPN-FC002_LPK51001", 1, 5);
+	}
+
+	[Test]
+	public async Task should_return_no_stream() {
+		Assert.AreEqual(ExpectedVersion.NoStream, await _indexReader.GetStreamLastEventNumber("account--696193173", CancellationToken.None));
+	}
+}
+
+[TestFixture]
+[TestFixtureSource(typeof(UseMaxAgeFixtureArgs))]
+public class when_stream_is_out_of_range_of_read_limit : HashCollisionTestFixture {
+	private readonly bool _useMaxAge;
+	private readonly string stream1Id = "account--696193173";
+	private readonly string stream2Id = "LPN-FC002_LPK51001";
+
+	public when_stream_is_out_of_range_of_read_limit(bool useMaxAge) {
+		_useMaxAge = useMaxAge;
+	}
+
+	protected override void given() {
+		_hashCollisionReadLimit = 1;
+	}
+
+	protected override void when() {
+		if (_useMaxAge) {
+			_indexBackend.SetStreamMetadata(stream1Id, new StreamMetadata(maxAge: TimeSpan.FromDays(1)));
+			_indexBackend.SetStreamMetadata(stream2Id, new StreamMetadata(maxAge: TimeSpan.FromDays(1)));
+		}
+		//ptable 1
+		_tableIndex.Add(1, stream1Id, 0, 0);
+		_tableIndex.Add(1, stream2Id, 0, 3);
+		_tableIndex.Add(1, stream2Id, 1, 5);
+		_tableIndex.Add(1, stream2Id, 2, 7);
+		_tableIndex.Add(1, stream2Id, 3, 9);
+		//mem table
+		_tableIndex.Add(1, stream2Id, 4, 13);
+	}
+
+	[Test]
+	public async Task should_return_invalid_event_number() {
+		Assert.AreEqual(EventNumber.Invalid,
+			await _indexReader.GetStreamLastEventNumber(stream1Id, CancellationToken.None));
+	}
+}
+
+[TestFixture]
+[TestFixtureSource(typeof(UseMaxAgeFixtureArgs))]
+public class when_stream_is_in_of_range_of_read_limit : HashCollisionTestFixture {
+	private readonly bool _useMaxAge;
+	private readonly string stream1Id = "account--696193173";
+	private readonly string stream2Id = "LPN-FC002_LPK51001";
+
+	public when_stream_is_in_of_range_of_read_limit(bool useMaxAge) {
+		_useMaxAge = useMaxAge;
+	}
+
+	protected override void given() {
+		_hashCollisionReadLimit = 5;
+	}
+
+	protected override void when() {
+		if (_useMaxAge) {
+			_indexBackend.SetStreamMetadata(stream1Id, new StreamMetadata(maxAge: TimeSpan.FromDays(1)));
+			_indexBackend.SetStreamMetadata(stream2Id, new StreamMetadata(maxAge: TimeSpan.FromDays(1)));
+		}
+		//ptable 1
+		_tableIndex.Add(1, stream1Id, 0, 0);
+		_tableIndex.Add(1, stream2Id, 0, 3);
+		_tableIndex.Add(1, stream2Id, 1, 5);
+		_tableIndex.Add(1, stream2Id, 2, 7);
+		_tableIndex.Add(1, stream2Id, 3, 9);
+		//mem table
+		_tableIndex.Add(1, stream2Id, 4, 13);
+	}
+
+	[Test]
+	public async Task should_return_last_event_number() {
+		Assert.AreEqual(0, await _indexReader.GetStreamLastEventNumber(stream1Id, CancellationToken.None));
+	}
+}
+
+[TestFixture]
+[TestFixtureSource(typeof(UseMaxAgeFixtureArgs))]
+public class when_hash_read_limit_is_not_reached : HashCollisionTestFixture {
+	private readonly bool _useMaxAge;
+
+	public when_hash_read_limit_is_not_reached(bool useMaxAge) {
+		_useMaxAge = useMaxAge;
+	}
+
+	protected override void given() {
+		_hashCollisionReadLimit = 3;
+	}
+
+	protected override void when() {
+		string stream1Id = "account--696193173";
+		string stream2Id = "LPN-FC002_LPK51001";
+		if (_useMaxAge) {
+			_indexBackend.SetStreamMetadata(stream1Id, new StreamMetadata(maxAge: TimeSpan.FromDays(1)));
+			_indexBackend.SetStreamMetadata(stream2Id, new StreamMetadata(maxAge: TimeSpan.FromDays(1)));
+		}
+		//ptable 1
+		_tableIndex.Add(1, stream1Id, 0, 0);
+		_tableIndex.Add(1, stream2Id, 0, 3);
+		_tableIndex.Add(1, stream2Id, 1, 5);
+		_tableIndex.Add(1, stream2Id, 2, 7);
+		_tableIndex.Add(1, stream2Id, 3, 9);
+	}
+
+	[Test]
+	public async Task should_return_invalid_event_number() {
+		Assert.AreEqual(EventNumber.Invalid,
+			await _indexReader.GetStreamLastEventNumber("account--696193173", CancellationToken.None));
+	}
+}
+
+[TestFixture]
+[TestFixtureSource(typeof(UseMaxAgeFixtureArgs))]
+public class when_index_contains_duplicate_entries : HashCollisionTestFixture {
+	private readonly string streamId = "account--696193173";
+	private readonly bool _useMaxAge;
+
+	public when_index_contains_duplicate_entries(bool useMaxAge) {
+		_useMaxAge = useMaxAge;
+	}
+	protected override void given() {
+		_hashCollisionReadLimit = 5;
+	}
+
+	protected override void when() {
+		if (_useMaxAge) {
+			_indexBackend.SetStreamMetadata(streamId, new StreamMetadata(maxAge: TimeSpan.FromDays(1)));
+		}
+		//ptable 1
+		_tableIndex.Add(1, streamId, 0, 2);
+		_tableIndex.Add(1, streamId, 0, 4);
+		_tableIndex.Add(1, streamId, 1, 6);
+		_tableIndex.Add(1, streamId, 2, 8);
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_stream_events_forward_and_exclude_duplicates() {
+		var result = await _indexReader.ReadStreamEventsForward(streamId, 0, int.MaxValue, CancellationToken.None);
+		Assert.AreEqual(3, result.Records.Length);
+
+		Assert.AreEqual(streamId, result.Records[0].EventStreamId);
+		Assert.AreEqual(0, result.Records[0].EventNumber);
+		Assert.AreEqual(2, result.Records[0].LogPosition);
+
+		Assert.AreEqual(streamId, result.Records[1].EventStreamId);
+		Assert.AreEqual(1, result.Records[1].EventNumber);
+		Assert.AreEqual(6, result.Records[1].LogPosition);
+
+		Assert.AreEqual(streamId, result.Records[2].EventStreamId);
+		Assert.AreEqual(2, result.Records[2].EventNumber);
+		Assert.AreEqual(8, result.Records[2].LogPosition);
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_stream_events_backward_and_exclude_duplicates() {
+		var result = await _indexReader.ReadStreamEventsBackward(streamId, 2, int.MaxValue, CancellationToken.None);
+		Assert.AreEqual(3, result.Records.Length);
+
+		Assert.AreEqual(streamId, result.Records[2].EventStreamId);
+		Assert.AreEqual(0, result.Records[2].EventNumber);
+		Assert.AreEqual(2, result.Records[2].LogPosition);
+
+		Assert.AreEqual(streamId, result.Records[1].EventStreamId);
+		Assert.AreEqual(1, result.Records[1].EventNumber);
+		Assert.AreEqual(6, result.Records[1].LogPosition);
+
+		Assert.AreEqual(streamId, result.Records[0].EventStreamId);
+		Assert.AreEqual(2, result.Records[0].EventNumber);
+		Assert.AreEqual(8, result.Records[0].LogPosition);
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_single_event_and_exclude_duplicates() {
+		var result = await _indexReader.ReadEvent(streamId, 0, CancellationToken.None);
+
+		Assert.AreEqual(streamId, result.Record.EventStreamId);
+		Assert.AreEqual(0, result.Record.EventNumber);
+		Assert.AreEqual(2, result.Record.LogPosition);
+	}
+}
+
+[TestFixture]
+[TestFixtureSource(typeof(UseMaxAgeFixtureArgs))]
+public class
+	when_index_contains_duplicate_entries_and_the_duplicate_is_a_64bit_index_entry : HashCollisionTestFixture {
+	private readonly string streamId = "account--696193173";
+	private readonly bool _useMaxAge;
+
+	public when_index_contains_duplicate_entries_and_the_duplicate_is_a_64bit_index_entry(bool useMaxAge) {
+		_useMaxAge = useMaxAge;
+	}
+
+	protected override void given() {
+		_maxMemTableSize = 3;
+		_hashCollisionReadLimit = 5;
+	}
+
+	protected override void when() {
+		if (_useMaxAge) {
+			_indexBackend.SetStreamMetadata(streamId, new StreamMetadata(maxAge: TimeSpan.FromDays(1)));
+		}
+		//ptable 1 with 32bit indexes
+		_tableIndex.Add(1, streamId, 0, 2);
+		_tableIndex.Add(1, streamId, 1, 4);
+		_tableIndex.Add(1, streamId, 2, 6);
+		Thread.Sleep(500);
+		_tableIndex.Close(false);
+		_tableIndex = new TableIndex<string>(_indexDir, _lowHasher, _highHasher, "",
+			() => new HashListMemTable(PTableVersions.IndexV2, maxSize: _maxMemTableSize),
+			() => _fakeReader,
+			PTableVersions.IndexV2,
+			5, Constants.PTableMaxReaderCountDefault,
+			maxSizeForMemory: _maxMemTableSize,
+			maxTablesPerLevel: 2);
+		_tableIndex.Initialize(long.MaxValue);
+		_indexReader = new IndexReader<string>(
+			_indexBackend, _tableIndex,
+			_logFormat.StreamNamesProvider,
+			_logFormat.StreamIdValidator,
+			_logFormat.StreamExistenceFilterReader,
+			new StreamMetadata(),
+			_hashCollisionReadLimit, skipIndexScanOnRead: false);
+		//memtable with 64bit indexes
+		_tableIndex.Add(1, streamId, 0, 8);
+	}
+
+	[Test]
+	public async Task should_return_the_correct_last_event_number() {
+		var result = await _indexReader.GetStreamLastEventNumber(streamId, CancellationToken.None);
+		Assert.AreEqual(2, result);
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_stream_events_forward_and_exclude_duplicates() {
+		var result = await _indexReader.ReadStreamEventsForward(streamId, 0, int.MaxValue, CancellationToken.None);
+		Assert.AreEqual(3, result.Records.Length);
+
+		Assert.AreEqual(streamId, result.Records[0].EventStreamId);
+		Assert.AreEqual(0, result.Records[0].EventNumber);
+		Assert.AreEqual(2, result.Records[0].LogPosition);
+
+		Assert.AreEqual(streamId, result.Records[1].EventStreamId);
+		Assert.AreEqual(1, result.Records[1].EventNumber);
+		Assert.AreEqual(4, result.Records[1].LogPosition);
+
+		Assert.AreEqual(streamId, result.Records[2].EventStreamId);
+		Assert.AreEqual(2, result.Records[2].EventNumber);
+		Assert.AreEqual(6, result.Records[2].LogPosition);
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_stream_events_backward_and_exclude_duplicates() {
+		var result = await _indexReader.ReadStreamEventsBackward(streamId, 2, int.MaxValue, CancellationToken.None);
+		Assert.AreEqual(3, result.Records.Length);
+
+		Assert.AreEqual(streamId, result.Records[2].EventStreamId);
+		Assert.AreEqual(0, result.Records[2].EventNumber);
+		Assert.AreEqual(2, result.Records[2].LogPosition);
+
+		Assert.AreEqual(streamId, result.Records[1].EventStreamId);
+		Assert.AreEqual(1, result.Records[1].EventNumber);
+		Assert.AreEqual(4, result.Records[1].LogPosition);
+
+		Assert.AreEqual(streamId, result.Records[0].EventStreamId);
+		Assert.AreEqual(2, result.Records[0].EventNumber);
+		Assert.AreEqual(6, result.Records[0].LogPosition);
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_single_event_and_exclude_duplicates() {
+		var result = await _indexReader.ReadEvent(streamId, 0, CancellationToken.None);
+
+		Assert.AreEqual(streamId, result.Record.EventStreamId);
+		Assert.AreEqual(0, result.Record.EventNumber);
+		Assert.AreEqual(2, result.Record.LogPosition);
+	}
+}
+
+[TestFixture]
+public class when_stream_has_max_age : HashCollisionTestFixture {
+	private readonly string _oddStream = "LPN-FC002_LPK51001";
+	private readonly string _evenStream = "account--696193173";
+
+	protected override void when() {
+		_indexBackend.SetStreamMetadata(
+			_evenStream,
+			new StreamMetadata(maxAge: TimeSpan.FromDays(1)));
+
+		_tableIndex.Add(1, _evenStream, 5, 0);
+		_tableIndex.Add(1, _evenStream, 6, 2);
+		_tableIndex.Add(1, _oddStream, 5, 3);
+		_tableIndex.Add(1, _oddStream, 6, 5);
+		_tableIndex.Add(1, _oddStream, 7, 7);
+	}
+
+	[Test]
+	public async Task can_read() {
+		var result = await _indexReader.ReadStreamEventsForward(
+			streamName: _evenStream,
+			fromEventNumber: 0,
+			maxCount: 2,
+			CancellationToken.None);
+
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(5, result.Records[0].EventNumber);
+		Assert.AreEqual(6, result.Records[1].EventNumber);
+	}
+}
+
+public class FakeIndexBackend<TStreamId> : IIndexBackend<TStreamId> {
+	private readonly TFReaderLease _readerLease;
+	private readonly Dictionary<TStreamId, IndexBackend<TStreamId>.MetadataCached> _streamMetadata =
+		new();
+
+	public FakeIndexBackend(TFReaderLease readerLease) {
+		_readerLease = readerLease;
+	}
+
+	public TFReaderLease BorrowReader() {
+		return _readerLease;
+	}
+
+	public IndexBackend<TStreamId>.EventNumberCached TryGetStreamLastEventNumber(TStreamId streamId) {
+		return new IndexBackend<TStreamId>.EventNumberCached(-1, null); //always return uncached
+	}
+
+	public IndexBackend<TStreamId>.MetadataCached TryGetStreamMetadata(TStreamId streamId) {
+		if (_streamMetadata.TryGetValue(streamId, out var metadata))
+			return metadata;
+		return new IndexBackend<TStreamId>.MetadataCached();
+	}
+
+	public long? UpdateStreamLastEventNumber(int cacheVersion, TStreamId streamId, long? lastEventNumber) {
+		return null;
+	}
+
+	public StreamMetadata UpdateStreamMetadata(int cacheVersion, TStreamId streamId,
+		StreamMetadata metadata) {
+		_streamMetadata[streamId] = new IndexBackend<TStreamId>.MetadataCached(1, metadata);
+		return metadata;
+	}
+
+	public long? SetStreamLastEventNumber(TStreamId streamId, long lastEventNumber) {
+		return null;
+	}
+
+	public StreamMetadata SetStreamMetadata(TStreamId streamId,
+		StreamMetadata metadata) {
+		_streamMetadata[streamId] = new IndexBackend<TStreamId>.MetadataCached(1, metadata);
+		return metadata;
+	}
+
+	public void SetSystemSettings(SystemSettings systemSettings) {
+	}
+
+	public SystemSettings GetSystemSettings() {
+		return null;
+	}
+}
+
+public class FakeReader : ITransactionFileReader {
+	public void Reposition(long position) {
+		throw new NotImplementedException();
+	}
+
+	public ValueTask<SeqReadResult> TryReadNext(CancellationToken token)
+		=> ValueTask.FromException<SeqReadResult>(new NotImplementedException());
+
+	public ValueTask<SeqReadResult> TryReadPrev(CancellationToken token)
+		=> ValueTask.FromException<SeqReadResult>(new NotImplementedException());
+
+	public ValueTask<RecordReadResult> TryReadAt(long position, bool couldBeScavenged, CancellationToken token) {
+		var record = (LogRecord)new PrepareLogRecord(position, Guid.NewGuid(), Guid.NewGuid(), 0, 0,
+			position % 2 == 0 ? "account--696193173" : "LPN-FC002_LPK51001", null, -1, DateTime.UtcNow, PrepareFlags.None,
+			"type", null, new byte[0], null);
+		return new(new RecordReadResult(true, position + 1, record, 1));
+	}
+
+	public ValueTask<bool> ExistsAt(long position, CancellationToken token)
+		=> token.IsCancellationRequested ? ValueTask.FromCanceled<bool>(token) : ValueTask.FromResult(true);
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_no_hash_collisions_read_index_should.cs b/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_no_hash_collisions_read_index_should.cs
new file mode 100644
index 00000000000..5f6e87dda39
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_no_hash_collisions_read_index_should.cs
@@ -0,0 +1,208 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.HashCollisions;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_no_hash_collisions_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _prepare1;
+	private EventRecord _prepare2;
+	private EventRecord _prepare3;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_prepare1 = await WriteSingleEvent("ES", 0, "test1", token: token);
+
+		_prepare2 = await WriteSingleEvent("ESES", 0, "test2", token: token);
+		_prepare3 = await WriteSingleEvent("ESES", 1, "test3", token: token);
+	}
+
+	[Test]
+	public async Task return_minus_one_for_nonexistent_stream_as_last_event_version() {
+		Assert.AreEqual(-1, await ReadIndex.GetStreamLastEventNumber("ES-NONEXISTENT", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_not_found_for_get_record_from_non_existing_stream() {
+		var result = await ReadIndex.ReadEvent("ES-NONEXISTING", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_try_get_records_from_start_for_nonexistent_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES-NONEXISTING", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_try_get_records_from_end_for_nonexisting_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES-NONEXISTING", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_existing_stream_with_single_event() {
+		Assert.AreEqual(0, await ReadIndex.GetStreamLastEventNumber("ES", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_record_for_event_stream_with_single_event() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_prepare1, result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_try_get_records_from_start_for_event_stream_with_single_event() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_prepare1, result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_try_get_records_from_end_for_event_stream_with_single_event() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_prepare1, result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_nonexistent_stream_with_same_hash_as_existing_one() {
+		Assert.AreEqual(-1, await ReadIndex.GetStreamLastEventNumber("AB", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task not_find_record_for_nonexistent_event_stream_with_same_hash_as_existing_one() {
+		var result = await ReadIndex.ReadEvent("AB", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task
+		return_empty_range_on_try_get_records_from_start_for_nonexisting_event_stream_with_same_hash_as_existing_one() {
+		var result = await ReadIndex.ReadStreamEventsForward("HG", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task
+		return_empty_range_on_try_get_records_from_end_for_nonexisting_event_stream_with_same_hash_as_existing_one() {
+		var result = await ReadIndex.ReadStreamEventsBackward("HG", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task not_find_record_with_nonexistent_version_for_event_stream_with_single_event() {
+		var result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task not_find_record_with_non_existing_version_for_event_stream_with_same_hash_as_existing_one() {
+		var result = await ReadIndex.ReadEvent("CL", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_existing_stream_with_two_events() {
+		Assert.AreEqual(1, await ReadIndex.GetStreamLastEventNumber("ESES", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_first_record_for_event_stream_with_two_events() {
+		var result = await ReadIndex.ReadEvent("ESES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_prepare2, result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_second_record_for_event_stream_with_two_events() {
+		var result = await ReadIndex.ReadEvent("ESES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_prepare3, result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_event_stream_with_two_events() {
+		var result = await ReadIndex.ReadStreamEventsForward("ESES", 0, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_prepare2, result.Records[0]);
+		Assert.AreEqual(_prepare3, result.Records[1]);
+	}
+
+	[Test]
+	public async Task
+		return_correct_range_on_from_end_range_query_for_event_stream_with_two_events_with_specific_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ESES", 1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_prepare3, result.Records[0]);
+		Assert.AreEqual(_prepare2, result.Records[1]);
+	}
+
+	[Test]
+	public async Task
+		return_correct_range_on_from_end_range_query_for_event_stream_with_two_events_with_from_end_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ESES", -1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_prepare3, result.Records[0]);
+		Assert.AreEqual(_prepare2, result.Records[1]);
+	}
+
+	[Test]
+	public async Task not_find_record_with_nonexistent_version_for_event_stream_with_two_events() {
+		var result = await ReadIndex.ReadEvent("ESES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task
+		not_find_record_with_non_existing_version_for_non_existing_event_stream_with_same_hash_as_stream_with_two_events() {
+		var result = await ReadIndex.ReadEvent("NONE", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task
+		not_return_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_stream_with_two_events() {
+		var result = await ReadIndex.ReadStreamEventsForward("NONE", 0, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task
+		not_return_range_on_from_end_query_for_non_existing_stream_with_same_hash_as_stream_with_two_events() {
+		var result = await ReadIndex.ReadStreamEventsBackward("NONE", 0, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task
+		not_return_range_on_from_end_query_with_from_end_version_for_non_existing_stream_with_same_hash_as_stream_with_two_events() {
+		var result = await ReadIndex.ReadStreamEventsBackward("NONE", -1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_single_deleted_event_stream_read_index_should.cs b/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_single_deleted_event_stream_read_index_should.cs
new file mode 100644
index 00000000000..8fbf429eeaf
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_single_deleted_event_stream_read_index_should.cs
@@ -0,0 +1,138 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.HashCollisions;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_single_deleted_event_stream_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _prepare1;
+	private EventRecord _delete1;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_prepare1 = await WriteSingleEvent("ES", 0, "test1", token: token);
+		_delete1 = await WriteDelete("ES", token);
+	}
+
+	[Test]
+	public async Task return_minus_one_for_nonexistent_stream_as_last_event_version() {
+		Assert.AreEqual(-1, await ReadIndex.GetStreamLastEventNumber("ES-NONEXISTENT", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_start_range_query_for_non_existing_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES-NONEXISTING", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_end_range_query_for_non_existing_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES-NONEXISTING", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_not_found_for_get_record_from_non_existing_stream() {
+		var result = await ReadIndex.ReadEvent("ES-NONEXISTING", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_event_version_for_deleted_stream() {
+		Assert.AreEqual(EventNumber.DeletedStream, await ReadIndex.GetStreamLastEventNumber("ES", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_stream_deleted_result_for_deleted_event_stream() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.StreamDeleted, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_start_range_query_for_deleted_event_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_end_range_query_for_deleted_event_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_nonexistent_stream_with_same_hash_as_deleted_one() {
+		Assert.AreEqual(-1, await ReadIndex.GetStreamLastEventNumber("AB", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task not_find_record_for_nonexistent_event_stream_with_same_hash_as_deleted_one() {
+		var result = await ReadIndex.ReadEvent("AB", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task
+		return_empty_range_on_from_start_query_for_nonexisting_event_stream_with_same_hash_as_deleted_one() {
+		var result = await ReadIndex.ReadStreamEventsForward("HG", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_on_from_end_query_for_nonexisting_event_stream_with_same_hash_as_deleted_one() {
+		var result = await ReadIndex.ReadStreamEventsBackward("HG", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task not_find_record_with_nonexistent_version_for_deleted_event_stream() {
+		var result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.StreamDeleted, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task not_find_record_with_non_existing_version_for_event_stream_with_same_hash_as_deleted_one() {
+		var result = await ReadIndex.ReadEvent("CL", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_all_events_on_read_all_forward() {
+		var events = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(2, events.Length);
+		Assert.AreEqual(_prepare1, events[0]);
+		Assert.AreEqual(_delete1, events[1]);
+	}
+
+	[Test]
+	public async Task return_all_events_on_read_all_backward() {
+		var events = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(2, events.Length);
+		Assert.AreEqual(_delete1, events[0]);
+		Assert.AreEqual(_prepare1, events[1]);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_one_event_each_read_index_should.cs b/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_one_event_each_read_index_should.cs
new file mode 100644
index 00000000000..1eb125fcb6b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_one_event_each_read_index_should.cs
@@ -0,0 +1,197 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.HashCollisions;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_three_collisioned_streams_one_event_each_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _prepare1;
+	private EventRecord _prepare2;
+	private EventRecord _prepare3;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_prepare1 = await WriteSingleEvent("AB", 0, "test1", token: token);
+		_prepare2 = await WriteSingleEvent("CD", 0, "test2", token: token);
+		_prepare3 = await WriteSingleEvent("EF", 0, "test3", token: token);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_first_stream() {
+		Assert.AreEqual(0, await ReadIndex.GetStreamLastEventNumber("AB", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_log_record_for_first_stream() {
+		var result = await ReadIndex.ReadEvent("AB", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_prepare1, result.Record);
+	}
+
+	[Test]
+	public async Task not_find_record_with_index_1_in_first_stream() {
+		var result = await ReadIndex.ReadEvent("AB", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("AB", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_prepare1, result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("AB", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_prepare1, result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_second_stream() {
+		Assert.AreEqual(0, await ReadIndex.GetStreamLastEventNumber("CD", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_log_record_for_second_stream() {
+		var result = await ReadIndex.ReadEvent("CD", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_prepare2, result.Record);
+	}
+
+	[Test]
+	public async Task not_find_record_with_index_1_in_second_stream() {
+		var result = await ReadIndex.ReadEvent("CD", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("CD", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_prepare2, result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("CD", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_prepare2, result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_third_stream() {
+		Assert.AreEqual(0, await ReadIndex.GetStreamLastEventNumber("EF", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_log_record_for_third_stream() {
+		var result = await ReadIndex.ReadEvent("EF", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_prepare3, result.Record);
+	}
+
+	[Test]
+	public async Task not_find_record_with_index_1_in_third_stream() {
+		var result = await ReadIndex.ReadEvent("EF", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("EF", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_prepare3, result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("EF", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_prepare3, result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_empty_range_when_asked_to_get_few_events_from_start_starting_from_1_in_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("AB", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_when_asked_to_get_few_events_from_start_starting_from_1_in_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("CD", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_when_asked_to_get_few_events_from_start_starting_from_1_in_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("EF", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_when_asked_to_get_few_events_from_end_starting_from_1_in_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("AB", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_when_asked_to_get_few_events_from_end_starting_from_1_in_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("CD", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_when_asked_to_get_few_events_from_end_starting_from_1_in_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("EF", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_nonexistent_stream_with_same_hash() {
+		Assert.AreEqual(-1, await ReadIndex.GetStreamLastEventNumber("ZZ", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task not_find_log_record_for_nonexistent_stream_with_same_hash() {
+		var result = await ReadIndex.ReadEvent("ZZ", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_start_range_query_for_non_existing_stream_with_same_hash() {
+		var result = await ReadIndex.ReadStreamEventsForward("ZZ", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_end_range_query_for_non_existing_stream_with_same_hash() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ZZ", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_one_event_each_with_second_stream_deleted_read_index_should.cs b/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_one_event_each_with_second_stream_deleted_read_index_should.cs
new file mode 100644
index 00000000000..b3a3162858e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_one_event_each_with_second_stream_deleted_read_index_should.cs
@@ -0,0 +1,226 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.HashCollisions;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	with_three_collisioned_streams_one_event_each_with_second_stream_deleted_read_index_should<TLogFormat, TStreamId> :
+		ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _prepare1;
+	private EventRecord _prepare2;
+	private EventRecord _delete2;
+	private EventRecord _prepare3;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_prepare1 = await WriteSingleEvent("AB", 0, "test1", token: token);
+
+		_prepare2 = await WriteSingleEvent("CD", 0, "test2", token: token);
+		_delete2 = await WriteDelete("CD", token);
+
+		_prepare3 = await WriteSingleEvent("EF", 0, "test3", token: token);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_first_stream() {
+		Assert.AreEqual(0, await ReadIndex.GetStreamLastEventNumber("AB", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_log_record_for_first_stream() {
+		var result = await ReadIndex.ReadEvent("AB", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_prepare1, result.Record);
+	}
+
+	[Test]
+	public async Task not_find_record_with_index_1_in_first_stream() {
+		var result = await ReadIndex.ReadEvent("AB", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("AB", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_prepare1, result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("AB", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_prepare1, result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_second_stream() {
+		Assert.AreEqual(EventNumber.DeletedStream, await ReadIndex.GetStreamLastEventNumber("CD", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task not_find_log_record_for_second_stream() {
+		var result = await ReadIndex.ReadEvent("CD", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.StreamDeleted, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task not_find_record_with_index_1_in_second_stream() {
+		var result = await ReadIndex.ReadEvent("CD", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.StreamDeleted, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_start_range_query_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("CD", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_end_range_query_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("CD", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_third_stream() {
+		Assert.AreEqual(0, await ReadIndex.GetStreamLastEventNumber("EF", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_log_record_for_third_stream() {
+		var result = await ReadIndex.ReadEvent("EF", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_prepare3, result.Record);
+	}
+
+	[Test]
+	public async Task not_find_record_with_index_1_in_third_stream() {
+		var result = await ReadIndex.ReadEvent("EF", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("EF", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_prepare3, result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("EF", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_prepare3, result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_empty_range_when_asked_to_get_few_events_from_start_starting_from_1_in_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("AB", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_when_asked_to_get_few_events_from_start_starting_from_1_in_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("CD", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_when_asked_to_get_few_events_from_start_starting_from_1_in_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("EF", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_when_asked_to_get_few_events_from_end_starting_from_1_in_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("AB", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_when_asked_to_get_few_events_from_end_starting_from_1_in_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("CD", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_when_asked_to_get_few_events_from_end_starting_from_1_in_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("EF", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_nonexistent_stream_with_same_hash() {
+		Assert.AreEqual(-1, await ReadIndex.GetStreamLastEventNumber("ZZ", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task not_find_log_record_for_nonexistent_stream_with_same_hash() {
+		var result = await ReadIndex.ReadEvent("ZZ", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_start_range_query_for_non_existing_stream_with_same_hash() {
+		var result = await ReadIndex.ReadStreamEventsForward("ZZ", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_end_range_query_for_non_existing_stream_with_same_hash() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ZZ", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_all_events_on_read_all_forward() {
+		var events = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(4, events.Length);
+		Assert.AreEqual(_prepare1, events[0]);
+		Assert.AreEqual(_prepare2, events[1]);
+		Assert.AreEqual(_delete2, events[2]);
+		Assert.AreEqual(_prepare3, events[3]);
+	}
+
+	[Test]
+	public async Task return_all_events_on_read_all_backward() {
+		var events = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(4, events.Length);
+		Assert.AreEqual(_prepare1, events[3]);
+		Assert.AreEqual(_prepare2, events[2]);
+		Assert.AreEqual(_delete2, events[1]);
+		Assert.AreEqual(_prepare3, events[0]);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_with_different_number_of_events_each_read_index_should.cs b/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_with_different_number_of_events_each_read_index_should.cs
new file mode 100644
index 00000000000..93507438e9e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_with_different_number_of_events_each_read_index_should.cs
@@ -0,0 +1,628 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.HashCollisions;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	with_three_collisioned_streams_with_different_number_of_events_each_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord[] _prepares1;
+	private EventRecord[] _prepares2;
+	private EventRecord[] _prepares3;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_prepares1 = new EventRecord[3];
+		for (int i = 0; i < _prepares1.Length; i++) {
+			_prepares1[i] = await WriteSingleEvent("AB", i, "test" + i, token: token);
+		}
+
+		_prepares2 = new EventRecord[5];
+		for (int i = 0; i < _prepares2.Length; i++) {
+			_prepares2[i] = await WriteSingleEvent("CD", i, "test" + i, token: token);
+		}
+
+		_prepares3 = new EventRecord[7];
+		for (int i = 0; i < _prepares3.Length; i++) {
+			_prepares3[i] = await WriteSingleEvent("EF", i, "test" + i, token: token);
+		}
+	}
+
+	#region first
+
+	[Test]
+	public async Task return_correct_last_event_version_for_first_stream() {
+		Assert.AreEqual(2, await ReadIndex.GetStreamLastEventNumber("AB", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_minus_one_when_asked_for_last_version_for_stream_with_same_hash_as_first() {
+		Assert.AreEqual(-1, await ReadIndex.GetStreamLastEventNumber("FY", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_first_record_for_first_stream() {
+		var result = await ReadIndex.ReadEvent("AB", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_prepares1[0], result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_last_log_record_for_first_stream() {
+		var result = await ReadIndex.ReadEvent("AB", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_prepares1[2], result.Record);
+	}
+
+	[Test]
+	public async Task not_find_record_with_version_3_in_first_stream() {
+		var result = await ReadIndex.ReadEvent("AB", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_not_found_for_record_version_3_for_stream_with_same_hash_as_first_stream() {
+		var result = await ReadIndex.ReadEvent("FY", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_not_found_for_record_version_2_for_stream_with_same_hash_as_first_stream() {
+		var result = await ReadIndex.ReadEvent("FY", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_not_found_for_record_version_0_for_stream_with_same_hash_as_first_stream() {
+		var result = await ReadIndex.ReadEvent("FY", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("AB", 0, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+
+		for (int i = 0; i < _prepares1.Length; i++) {
+			Assert.AreEqual(_prepares1[i], result.Records[i]);
+		}
+	}
+
+	[Test]
+	public async Task return_correct_0_1_range_on_from_start_range_query_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("AB", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+
+		Assert.AreEqual(_prepares1[0], result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_1_1_range_on_from_start_range_query_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("AB", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+
+		Assert.AreEqual(_prepares1[1], result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_empty_range_for_3_1_range_on_from_start_range_query_request_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("AB", 3, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
+		var result = await ReadIndex.ReadStreamEventsForward("FY", 0, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task
+		return_empty_1_1_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
+		var result = await ReadIndex.ReadStreamEventsForward("FY", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task
+		return_empty_3_1_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
+		var result = await ReadIndex.ReadStreamEventsForward("FY", 3, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_first_stream_with_specific_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("AB", 2, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+
+		var records = result.Records.Reverse().ToArray();
+
+		for (int i = 0; i < _prepares1.Length; i++) {
+			Assert.AreEqual(_prepares1[i], records[i]);
+		}
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_first_stream_with_from_end_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("AB", -1, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+
+		var records = result.Records.Reverse().ToArray();
+
+		for (int i = 0; i < _prepares1.Length; i++) {
+			Assert.AreEqual(_prepares1[i], records[i]);
+		}
+	}
+
+	[Test]
+	public async Task return_correct_0_1_range_on_from_end_range_query_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("AB", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+
+		Assert.AreEqual(_prepares1[0], result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_from_end_1_range_on_from_end_range_query_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("AB", -1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+
+		Assert.AreEqual(_prepares1[2], result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_1_1_range_on_from_end_range_query_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("AB", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+
+		Assert.AreEqual(_prepares1[1], result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_empty_range_for_3_1_range_on_from_end_range_query_request_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("AB", 3, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
+		var result = await ReadIndex.ReadStreamEventsBackward("FY", 0, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task
+		return_empty_1_1_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
+		var result = await ReadIndex.ReadStreamEventsBackward("FY", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task
+		return_empty_3_1_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
+		var result = await ReadIndex.ReadStreamEventsBackward("FY", 3, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	#endregion
+
+	#region second
+
+	[Test]
+	public async Task return_correct_last_event_version_for_second_stream() {
+		Assert.AreEqual(4, await ReadIndex.GetStreamLastEventNumber("CD", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_minus_one_when_aked_for_last_version_for_stream_with_same_hash_as_second() {
+		Assert.AreEqual(-1, await ReadIndex.GetStreamLastEventNumber("FY", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_first_record_for_second_stream() {
+		var result = await ReadIndex.ReadEvent("CD", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_prepares2[0], result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_last_log_record_for_second_stream() {
+		var result = await ReadIndex.ReadEvent("CD", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_prepares2[4], result.Record);
+	}
+
+	[Test]
+	public async Task not_find_record_with_version_5_in_second_stream() {
+		var result = await ReadIndex.ReadEvent("CD", 5, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+	}
+
+	[Test]
+	public async Task return_not_found_for_record_version_5_for_stream_with_same_hash_as_second_stream() {
+		var result = await ReadIndex.ReadEvent("FY", 5, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_not_found_for_record_version_4_for_stream_with_same_hash_as_second_stream() {
+		var result = await ReadIndex.ReadEvent("FY", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_not_found_for_record_version_0_for_stream_with_same_hash_as_second_stream() {
+		var result = await ReadIndex.ReadEvent("FY", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("CD", 0, 5, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+
+		for (int i = 0; i < _prepares2.Length; i++) {
+			Assert.AreEqual(_prepares2[i], result.Records[i]);
+		}
+	}
+
+	[Test]
+	public async Task return_correct_0_2_range_on_from_start_range_query_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("CD", 0, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+
+		Assert.AreEqual(_prepares2[0], result.Records[0]);
+		Assert.AreEqual(_prepares2[1], result.Records[1]);
+	}
+
+	[Test]
+	public async Task return_correct_2_2_range_on_from_start_range_query_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("CD", 2, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+
+		Assert.AreEqual(_prepares2[2], result.Records[0]);
+		Assert.AreEqual(_prepares2[3], result.Records[1]);
+	}
+
+	[Test]
+	public async Task return_empty_range_for_5_1_range_on_from_start_range_query_request_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("CD", 5, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task
+		return_empty_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_second_one() {
+		var result = await ReadIndex.ReadStreamEventsForward("FY", 0, 5, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task
+		return_empty_5_1_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_second_one() {
+		var result = await ReadIndex.ReadStreamEventsForward("FY", 5, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_second_stream_with_from_end_vesion() {
+		var result = await ReadIndex.ReadStreamEventsBackward("CD", -1, 5, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+
+		var records = result.Records.Reverse().ToArray();
+
+		for (int i = 0; i < _prepares2.Length; i++) {
+			Assert.AreEqual(_prepares2[i], records[i]);
+		}
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_second_stream_with_specific_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("CD", 4, 5, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+
+		var records = result.Records.Reverse().ToArray();
+
+		for (int i = 0; i < _prepares2.Length; i++) {
+			Assert.AreEqual(_prepares2[i], records[i]);
+		}
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_second_stream_with_from_end_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("CD", -1, 5, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+
+		var records = result.Records.Reverse().ToArray();
+
+		for (int i = 0; i < _prepares2.Length; i++) {
+			Assert.AreEqual(_prepares2[i], records[i]);
+		}
+	}
+
+	[Test]
+	public async Task return_correct_0_1_range_on_from_end_range_query_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("CD", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+
+		Assert.AreEqual(_prepares2[0], result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_from_end_1_range_on_from_end_range_query_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("CD", -1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+
+		Assert.AreEqual(_prepares2[4], result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_1_1_range_on_from_end_range_query_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("CD", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+
+		Assert.AreEqual(_prepares2[1], result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_from_end_2_range_on_from_end_range_query_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("CD", -1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+
+		Assert.AreEqual(_prepares2[4], result.Records[0]);
+		Assert.AreEqual(_prepares2[3], result.Records[1]);
+	}
+
+	[Test]
+	public async Task return_empty_range_for_5_1_range_on_from_end_range_query_request_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("CD", 5, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_second_one() {
+		var result = await ReadIndex.ReadStreamEventsBackward("FY", 0, 5, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task
+		return_empty_5_1_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_second_one() {
+		var result = await ReadIndex.ReadStreamEventsBackward("FY", 5, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	#endregion
+
+	#region third
+
+	[Test]
+	public async Task return_correct_last_event_version_for_third_stream() {
+		Assert.AreEqual(6, await ReadIndex.GetStreamLastEventNumber("EF", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_minus_one_when_aked_for_last_version_for_stream_with_same_hash_as_third() {
+		Assert.AreEqual(-1, await ReadIndex.GetStreamLastEventNumber("FY", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_first_record_for_third_stream() {
+		var result = await ReadIndex.ReadEvent("EF", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_prepares3[0], result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_last_log_record_for_third_stream() {
+		var result = await ReadIndex.ReadEvent("EF", 6, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_prepares3[6], result.Record);
+	}
+
+	[Test]
+	public async Task not_find_record_with_version_7_in_third_stream() {
+		var result = await ReadIndex.ReadEvent("EF", 7, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_not_found_for_record_version_7_for_stream_with_same_hash_as_third_stream() {
+		var result = await ReadIndex.ReadEvent("FY", 7, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("EF", 0, 7, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(7, result.Records.Length);
+
+		for (int i = 0; i < _prepares3.Length; i++) {
+			Assert.AreEqual(_prepares3[i], result.Records[i]);
+		}
+	}
+
+	[Test]
+	public async Task return_correct_0_7_range_on_from_start_range_query_for_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("EF", 0, 7, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(7, result.Records.Length);
+
+		Assert.AreEqual(_prepares3[0], result.Records[0]);
+		Assert.AreEqual(_prepares3[1], result.Records[1]);
+		Assert.AreEqual(_prepares3[2], result.Records[2]);
+		Assert.AreEqual(_prepares3[3], result.Records[3]);
+		Assert.AreEqual(_prepares3[4], result.Records[4]);
+		Assert.AreEqual(_prepares3[5], result.Records[5]);
+		Assert.AreEqual(_prepares3[6], result.Records[6]);
+	}
+
+	[Test]
+	public async Task return_correct_2_3_range_on_from_start_range_query_for_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("EF", 2, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+
+		Assert.AreEqual(_prepares3[2], result.Records[0]);
+		Assert.AreEqual(_prepares3[3], result.Records[1]);
+		Assert.AreEqual(_prepares3[4], result.Records[2]);
+	}
+
+	[Test]
+	public async Task return_empty_range_for_7_1_range_on_from_start_range_query_request_for_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("EF", 7, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_third_one() {
+		var result = await ReadIndex.ReadStreamEventsForward("FY", 0, 7, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task
+		return_empty_7_1_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_third_one() {
+		var result = await ReadIndex.ReadStreamEventsForward("EF", 7, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_third_stream_from_specific_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("EF", 6, 7, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(7, result.Records.Length);
+
+		var records = result.Records.Reverse().ToArray();
+
+		for (int i = 0; i < _prepares3.Length; i++) {
+			Assert.AreEqual(_prepares3[i], records[i]);
+		}
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_third_stream_with_from_end_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("EF", -1, 7, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(7, result.Records.Length);
+
+		var records = result.Records.Reverse().ToArray();
+
+		for (int i = 0; i < _prepares3.Length; i++) {
+			Assert.AreEqual(_prepares3[i], records[i]);
+		}
+	}
+
+	[Test]
+	public async Task return_correct_0_1_range_on_from_end_range_query_for_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("EF", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+
+		Assert.AreEqual(_prepares3[0], result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_from_end_1_range_on_from_end_range_query_for_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("EF", -1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+
+		Assert.AreEqual(_prepares3[6], result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_1_1_range_on_from_end_range_query_for_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("EF", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+
+		Assert.AreEqual(_prepares3[1], result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_from_end_2_range_on_from_end_range_query_for_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("EF", -1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+
+		Assert.AreEqual(_prepares3[6], result.Records[0]);
+		Assert.AreEqual(_prepares3[5], result.Records[1]);
+	}
+
+	[Test]
+	public async Task return_empty_range_for_7_1_range_on_from_end_range_query_request_for_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("EF", 7, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_third_one() {
+		var result = await ReadIndex.ReadStreamEventsBackward("FY", 0, 7, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task
+		return_empty_7_1_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_third_one() {
+		var result = await ReadIndex.ReadStreamEventsBackward("EF", 7, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	#endregion
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_with_different_number_of_events_third_one_deleted_each_read_index_should.cs b/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_with_different_number_of_events_third_one_deleted_each_read_index_should.cs
new file mode 100644
index 00000000000..e9f527e60f1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_three_collisioned_streams_with_different_number_of_events_third_one_deleted_each_read_index_should.cs
@@ -0,0 +1,621 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.HashCollisions;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	with_three_collisioned_streams_with_different_number_of_events_third_one_deleted_each_read_index_should<TLogFormat, TStreamId> :
+		ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord[] _prepares1;
+	private EventRecord[] _prepares2;
+	private EventRecord[] _prepares3;
+	private EventRecord _delete3;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_prepares1 = new EventRecord[3];
+		for (int i = 0; i < _prepares1.Length; i++) {
+			_prepares1[i] = await WriteSingleEvent("AB", i, "test" + i, token: token);
+		}
+
+		_prepares2 = new EventRecord[5];
+		for (int i = 0; i < _prepares2.Length; i++) {
+			_prepares2[i] = await WriteSingleEvent("CD", i, "test" + i, token: token);
+		}
+
+		_prepares3 = new EventRecord[7];
+		for (int i = 0; i < _prepares3.Length; i++) {
+			_prepares3[i] = await WriteSingleEvent("EF", i, "test" + i, token: token);
+		}
+
+		_delete3 = await WriteDelete("EF", token);
+	}
+
+	#region first
+
+	[Test]
+	public async Task return_correct_last_event_version_for_first_stream() {
+		Assert.AreEqual(2, await ReadIndex.GetStreamLastEventNumber("AB", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_minus_one_when_asked_for_last_version_for_stream_with_same_hash_as_first() {
+		Assert.AreEqual(-1, await ReadIndex.GetStreamLastEventNumber("FY", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_first_record_for_first_stream() {
+		var result = await ReadIndex.ReadEvent("AB", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_prepares1[0], result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_last_log_record_for_first_stream() {
+		var result = await ReadIndex.ReadEvent("AB", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_prepares1[2], result.Record);
+	}
+
+	[Test]
+	public async Task not_find_record_with_version_3_in_first_stream() {
+		var result = await ReadIndex.ReadEvent("AB", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_not_found_for_record_version_3_for_stream_with_same_hash_as_first_stream() {
+		var result = await ReadIndex.ReadEvent("FY", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_not_found_for_record_version_2_for_stream_with_same_hash_as_first_stream() {
+		var result = await ReadIndex.ReadEvent("FY", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_not_found_for_record_version_0_for_stream_with_same_hash_as_first_stream() {
+		var result = await ReadIndex.ReadEvent("FY", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("AB", 0, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+
+		for (int i = 0; i < _prepares1.Length; i++) {
+			Assert.AreEqual(_prepares1[i], result.Records[i]);
+		}
+	}
+
+	[Test]
+	public async Task return_correct_0_1_range_on_from_start_range_query_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("AB", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+
+		Assert.AreEqual(_prepares1[0], result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_1_1_range_on_from_start_range_query_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("AB", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+
+		Assert.AreEqual(_prepares1[1], result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_empty_range_for_3_1_range_on_from_start_range_query_request_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("AB", 3, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
+		var result = await ReadIndex.ReadStreamEventsForward("FY", 0, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task
+		return_empty_1_1_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
+		var result = await ReadIndex.ReadStreamEventsForward("FY", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task
+		return_empty_3_1_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
+		var result = await ReadIndex.ReadStreamEventsForward("FY", 3, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_first_stream_with_specific_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("AB", 2, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+
+		var records = result.Records.Reverse().ToArray();
+
+		for (int i = 0; i < _prepares1.Length; i++) {
+			Assert.AreEqual(_prepares1[i], records[i]);
+		}
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_first_stream_with_from_end_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("AB", -1, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+
+		var records = result.Records.Reverse().ToArray();
+
+		for (int i = 0; i < _prepares1.Length; i++) {
+			Assert.AreEqual(_prepares1[i], records[i]);
+		}
+	}
+
+	[Test]
+	public async Task return_correct_0_1_range_on_from_end_range_query_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("AB", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+
+		Assert.AreEqual(_prepares1[0], result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_from_end_1_range_on_from_end_range_query_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("AB", -1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+
+		Assert.AreEqual(_prepares1[2], result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_1_1_range_on_from_end_range_query_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("AB", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+
+		Assert.AreEqual(_prepares1[1], result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_empty_range_for_3_1_range_on_from_end_range_query_request_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("AB", 3, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
+		var result = await ReadIndex.ReadStreamEventsBackward("FY", 0, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task
+		return_empty_1_1_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
+		var result = await ReadIndex.ReadStreamEventsBackward("FY", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task
+		return_empty_3_1_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_first_one() {
+		var result = await ReadIndex.ReadStreamEventsBackward("FY", 3, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	#endregion
+
+	#region second
+
+	[Test]
+	public async Task return_correct_last_event_version_for_second_stream() {
+		Assert.AreEqual(4, await ReadIndex.GetStreamLastEventNumber("CD", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_minus_one_when_aked_for_last_version_for_stream_with_same_hash_as_second() {
+		Assert.AreEqual(-1, await ReadIndex.GetStreamLastEventNumber("FY", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_first_record_for_second_stream() {
+		var result = await ReadIndex.ReadEvent("CD", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_prepares2[0], result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_last_log_record_for_second_stream() {
+		var result = await ReadIndex.ReadEvent("CD", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_prepares2[4], result.Record);
+	}
+
+	[Test]
+	public async Task not_find_record_with_version_5_in_second_stream() {
+		var result = await ReadIndex.ReadEvent("CD", 5, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_not_found_for_record_version_5_for_stream_with_same_hash_as_second_stream() {
+		var result = await ReadIndex.ReadEvent("FY", 5, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_not_found_for_record_version_4_for_stream_with_same_hash_as_second_stream() {
+		var result = await ReadIndex.ReadEvent("FY", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_not_found_for_record_version_0_for_stream_with_same_hash_as_second_stream() {
+		var result = await ReadIndex.ReadEvent("FY", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("CD", 0, 5, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+
+		for (int i = 0; i < _prepares2.Length; i++) {
+			Assert.AreEqual(_prepares2[i], result.Records[i]);
+		}
+	}
+
+	[Test]
+	public async Task return_correct_0_2_range_on_from_start_range_query_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("CD", 0, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+
+		Assert.AreEqual(_prepares2[0], result.Records[0]);
+		Assert.AreEqual(_prepares2[1], result.Records[1]);
+	}
+
+	[Test]
+	public async Task return_correct_2_2_range_on_from_start_range_query_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("CD", 2, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+
+		Assert.AreEqual(_prepares2[2], result.Records[0]);
+		Assert.AreEqual(_prepares2[3], result.Records[1]);
+	}
+
+	[Test]
+	public async Task return_empty_range_for_5_1_range_on_from_start_range_query_request_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("CD", 5, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task
+		return_empty_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_second_one() {
+		var result = await ReadIndex.ReadStreamEventsForward("FY", 0, 5, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task
+		return_empty_5_1_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_second_one() {
+		var result = await ReadIndex.ReadStreamEventsForward("FY", 5, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_second_stream_with_specific_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("CD", 4, 5, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+
+		var records = result.Records.Reverse().ToArray();
+
+		for (int i = 0; i < _prepares2.Length; i++) {
+			Assert.AreEqual(_prepares2[i], records[i]);
+		}
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_second_stream_with_from_end_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("CD", -1, 5, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+
+		var records = result.Records.Reverse().ToArray();
+
+		for (int i = 0; i < _prepares2.Length; i++) {
+			Assert.AreEqual(_prepares2[i], records[i]);
+		}
+	}
+
+	[Test]
+	public async Task return_correct_0_1_range_on_from_end_range_query_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("CD", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+
+		Assert.AreEqual(_prepares2[0], result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_from_end_1_range_on_from_end_range_query_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("CD", -1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+
+		Assert.AreEqual(_prepares2[4], result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_1_1_range_on_from_end_range_query_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("CD", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+
+		Assert.AreEqual(_prepares2[1], result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_from_end_2_range_on_from_end_range_query_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("CD", -1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+
+		Assert.AreEqual(_prepares2[4], result.Records[0]);
+		Assert.AreEqual(_prepares2[3], result.Records[1]);
+	}
+
+	[Test]
+	public async Task return_empty_range_for_5_1_range_on_from_end_range_query_request_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("CD", 5, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_second_one() {
+		var result = await ReadIndex.ReadStreamEventsBackward("FY", 0, 5, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task
+		return_empty_5_1_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_second_one() {
+		var result = await ReadIndex.ReadStreamEventsBackward("FY", 5, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	#endregion
+
+	#region third
+
+	[Test]
+	public async Task return_correct_last_event_version_for_third_stream() {
+		Assert.AreEqual(EventNumber.DeletedStream, await ReadIndex.GetStreamLastEventNumber("EF", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_minus_one_when_aked_for_last_version_for_stream_with_same_hash_as_third() {
+		Assert.AreEqual(-1, await ReadIndex.GetStreamLastEventNumber("FY", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task not_find_first_record_for_third_stream() {
+		var result = await ReadIndex.ReadEvent("EF", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.StreamDeleted, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task not_find_last_log_record_for_third_stream() {
+		var result = await ReadIndex.ReadEvent("EF", 6, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.StreamDeleted, result.Result);
+	}
+
+	[Test]
+	public async Task not_find_record_with_version_7_in_third_stream() {
+		var result = await ReadIndex.ReadEvent("EF", 7, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.StreamDeleted, result.Result);
+	}
+
+	[Test]
+	public async Task return_not_found_for_record_version_7_for_stream_with_same_hash_as_third_stream() {
+		var result = await ReadIndex.ReadEvent("FY", 7, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_start_range_query_for_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("EF", 0, 7, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_0_7_range_on_from_start_range_query_for_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("EF", 0, 7, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_2_3_range_on_from_start_range_query_for_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("EF", 2, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_for_7_1_range_on_from_start_range_query_request_for_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("EF", 7, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_third_one() {
+		var result = await ReadIndex.ReadStreamEventsForward("FY", 0, 7, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task
+		return_empty_7_1_range_on_from_start_range_query_for_non_existing_stream_with_same_hash_as_third_one() {
+		var result = await ReadIndex.ReadStreamEventsForward("EF", 7, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_end_range_query_for_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("EF", 0, 7, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_0_1_range_on_from_end_range_query_for_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("EF", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_1_1_range_on_from_end_range_query_for_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("EF", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_for_7_1_range_on_from_end_range_query_request_for_third_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("EF", 7, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_third_one() {
+		var result = await ReadIndex.ReadStreamEventsBackward("FY", 0, 7, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task
+		return_empty_7_1_range_on_from_end_range_query_for_non_existing_stream_with_same_hash_as_third_one() {
+		var result = await ReadIndex.ReadStreamEventsBackward("EF", 7, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	#endregion
+
+	#region all
+
+	[Test]
+	public async Task return_all_prepares_on_read_all_forward() {
+		var events = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(3 + 5 + 7 + 1, events.Length);
+
+		Assert.AreEqual(_prepares1[0], events[0]);
+		Assert.AreEqual(_prepares1[1], events[1]);
+		Assert.AreEqual(_prepares1[2], events[2]);
+
+		Assert.AreEqual(_prepares2[0], events[3]);
+		Assert.AreEqual(_prepares2[1], events[4]);
+		Assert.AreEqual(_prepares2[2], events[5]);
+		Assert.AreEqual(_prepares2[3], events[6]);
+		Assert.AreEqual(_prepares2[4], events[7]);
+
+		Assert.AreEqual(_prepares3[0], events[8]);
+		Assert.AreEqual(_prepares3[1], events[9]);
+		Assert.AreEqual(_prepares3[2], events[10]);
+		Assert.AreEqual(_prepares3[3], events[11]);
+		Assert.AreEqual(_prepares3[4], events[12]);
+		Assert.AreEqual(_prepares3[5], events[13]);
+		Assert.AreEqual(_prepares3[6], events[14]);
+
+		Assert.AreEqual(_delete3, events[15]);
+	}
+
+	[Test]
+	public async Task return_all_prepares_on_read_all_backward() {
+		var events = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(3 + 5 + 7 + 1, events.Length);
+
+		Assert.AreEqual(_prepares1[0], events[15]);
+		Assert.AreEqual(_prepares1[1], events[14]);
+		Assert.AreEqual(_prepares1[2], events[13]);
+
+		Assert.AreEqual(_prepares2[0], events[12]);
+		Assert.AreEqual(_prepares2[1], events[11]);
+		Assert.AreEqual(_prepares2[2], events[10]);
+		Assert.AreEqual(_prepares2[3], events[9]);
+		Assert.AreEqual(_prepares2[4], events[8]);
+
+		Assert.AreEqual(_prepares3[0], events[7]);
+		Assert.AreEqual(_prepares3[1], events[6]);
+		Assert.AreEqual(_prepares3[2], events[5]);
+		Assert.AreEqual(_prepares3[3], events[4]);
+		Assert.AreEqual(_prepares3[4], events[3]);
+		Assert.AreEqual(_prepares3[5], events[2]);
+		Assert.AreEqual(_prepares3[6], events[1]);
+
+		Assert.AreEqual(_delete3, events[0]);
+	}
+
+	#endregion
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_two_collisioned_streams_one_event_each_first_stream_deleted_read_index_should.cs b/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_two_collisioned_streams_one_event_each_first_stream_deleted_read_index_should.cs
new file mode 100644
index 00000000000..1e115b38921
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_two_collisioned_streams_one_event_each_first_stream_deleted_read_index_should.cs
@@ -0,0 +1,137 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.HashCollisions;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	with_two_collisioned_streams_one_event_each_first_stream_deleted_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _prepare1;
+	private EventRecord _delete1;
+	private EventRecord _prepare2;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_prepare1 = await WriteSingleEvent("AB", 0, "test1", token: token);
+		_delete1 = await WriteDelete("AB", token);
+
+		_prepare2 = await WriteSingleEvent("CD", 0, "test2", token: token);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_first_stream() {
+		Assert.AreEqual(EventNumber.DeletedStream, await ReadIndex.GetStreamLastEventNumber("AB", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task not_find_log_record_for_first_stream() {
+		var result = await ReadIndex.ReadEvent("AB", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.StreamDeleted, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_start_range_query_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("AB", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_end_range_query_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("AB", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_start_range_query_for_invalid_arguments_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("AB", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_end_range_query_for_invalid_arguments_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("AB", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_second_stream() {
+		Assert.AreEqual(0, await ReadIndex.GetStreamLastEventNumber("CD", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_log_record_for_second_stream() {
+		var result = await ReadIndex.ReadEvent("CD", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_prepare2, result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("CD", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(_prepare2, result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("CD", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_prepare2, result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_nonexistent_stream_with_same_hash() {
+		Assert.AreEqual(-1, await ReadIndex.GetStreamLastEventNumber("EF", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task not_find_log_record_for_nonexistent_stream_with_same_hash() {
+		var result = await ReadIndex.ReadEvent("EF", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task not_return_range_for_non_existing_stream_with_same_hash() {
+		var result = await ReadIndex.ReadStreamEventsBackward("EF", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_all_events_on_read_all_forward() {
+		var events = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(3, events.Length);
+		Assert.AreEqual(_prepare1, events[0]);
+		Assert.AreEqual(_delete1, events[1]);
+		Assert.AreEqual(_prepare2, events[2]);
+	}
+
+	[Test]
+	public async Task return_all_events_on_read_all_backward() {
+		var events = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(3, events.Length);
+		Assert.AreEqual(_prepare1, events[2]);
+		Assert.AreEqual(_delete1, events[1]);
+		Assert.AreEqual(_prepare2, events[0]);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_two_collisioned_streams_one_event_each_read_index_should.cs b/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_two_collisioned_streams_one_event_each_read_index_should.cs
new file mode 100644
index 00000000000..a4665573889
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/HashCollisions/with_two_collisioned_streams_one_event_each_read_index_should.cs
@@ -0,0 +1,111 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.HashCollisions;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_two_collisioned_streams_one_event_each_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _prepare1;
+	private EventRecord _prepare2;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_prepare1 = await WriteSingleEvent("AB", 0, "test1", token: token);
+		_prepare2 = await WriteSingleEvent("CD", 0, "test2", token: token);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_first_stream() {
+		Assert.AreEqual(0, await ReadIndex.GetStreamLastEventNumber("AB", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_log_record_for_first_stream() {
+		var result = await ReadIndex.ReadEvent("AB", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_prepare1, result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("AB", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_prepare1, result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("AB", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_prepare1, result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_start_range_query_for_invalid_arguments_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("AB", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_empty_range_on_from_end_range_query_for_invalid_arguments_for_first_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("AB", 1, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_second_stream() {
+		Assert.AreEqual(0, await ReadIndex.GetStreamLastEventNumber("CD", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_log_record_for_second_stream() {
+		var result = await ReadIndex.ReadEvent("CD", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_prepare2, result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("CD", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_prepare2, result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_second_stream() {
+		var result = await ReadIndex.ReadStreamEventsBackward("CD", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(1, result.Records.Length);
+		Assert.AreEqual(_prepare2, result.Records[0]);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_nonexistent_stream_with_same_hash() {
+		Assert.AreEqual(-1, await ReadIndex.GetStreamLastEventNumber("EF", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task not_find_log_record_for_nonexistent_stream_with_same_hash() {
+		var result = await ReadIndex.ReadEvent("EF", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task not_return_range_for_non_existing_stream_with_same_hash() {
+		var result = await ReadIndex.ReadStreamEventsBackward("EF", 0, 1, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_batch_of_events_after_the_first_batch_has_been_replicated.cs b/src/KurrentDB.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_batch_of_events_after_the_first_batch_has_been_replicated.cs
new file mode 100644
index 00000000000..8730d94f332
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_batch_of_events_after_the_first_batch_has_been_replicated.cs
@@ -0,0 +1,96 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Idempotency;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_writing_a_second_batch_of_events_after_the_first_batch_has_been_replicated<TLogFormat, TStreamId> : WriteEventsToIndexScenario<TLogFormat, TStreamId> {
+	private const int _numEvents = 10;
+	private List<Guid> _eventIds = new List<Guid>();
+	private TStreamId _streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+
+	public override async ValueTask WriteEvents(CancellationToken token) {
+		var expectedEventNumber = -1;
+		var transactionPosition = 1000;
+		var eventTypes = new List<TStreamId>();
+
+		for (var i = 0; i < _numEvents; i++) {
+			_eventIds.Add(Guid.NewGuid());
+			eventTypes.Add(LogFormatHelper<TLogFormat, TStreamId>.EventTypeId);
+		}
+
+		var prepares = CreatePrepareLogRecords(_streamId, expectedEventNumber, eventTypes, _eventIds, transactionPosition);
+		var commit = CreateCommitLogRecord(transactionPosition + 1000 * _numEvents, transactionPosition, expectedEventNumber + _numEvents);
+
+		/*First batch write: committed to db and index*/
+		WriteToDB(prepares);
+		PreCommitToIndex(prepares);
+
+		WriteToDB(commit);
+		await PreCommitToIndex(commit, token);
+
+		await CommitToIndex(prepares, token);
+		await CommitToIndex(commit, token);
+	}
+
+	[Test]
+	public async Task check_commit_with_same_expectedversion_should_return_idempotent_decision() {
+		/*Second, idempotent write*/
+		var commitCheckResult = await _indexWriter.CheckCommit(_streamId, -1, _eventIds, streamMightExist: true, CancellationToken.None);
+		Assert.AreEqual(CommitDecision.Idempotent, commitCheckResult.Decision);
+	}
+
+	[Test]
+	public async Task check_commit_with_expectedversion_any_should_return_idempotent_decision() {
+		/*Second, idempotent write*/
+		var commitCheckResult = await _indexWriter.CheckCommit(_streamId, ExpectedVersion.Any, _eventIds, streamMightExist: true, CancellationToken.None);
+		Assert.AreEqual(CommitDecision.Idempotent, commitCheckResult.Decision);
+	}
+
+	[Test]
+	public async Task check_commit_with_next_expectedversion_should_return_ok_decision() {
+		var commitCheckResult = await _indexWriter.CheckCommit(_streamId, _numEvents - 1, _eventIds, streamMightExist: true, CancellationToken.None);
+		Assert.AreEqual(CommitDecision.Ok, commitCheckResult.Decision);
+	}
+
+	[Test]
+	public async Task check_commit_with_incorrect_expectedversion_should_return_wrongexpectedversion_decision() {
+		var commitCheckResult = await _indexWriter.CheckCommit(_streamId, _numEvents, _eventIds, streamMightExist: true, CancellationToken.None);
+		Assert.AreEqual(CommitDecision.WrongExpectedVersion, commitCheckResult.Decision);
+	}
+
+	[Test]
+	public async Task check_commit_with_same_expectedversion_but_different_non_first_event_id_should_return_corruptedidempotency_decision() {
+		/*Second, idempotent write but one of the event ids is different*/
+		var ids = new List<Guid>();
+		foreach (var id in _eventIds)
+			ids.Add(id);
+
+		ids[ids.Count - 2] = Guid.NewGuid();
+
+		var commitCheckResult = await _indexWriter.CheckCommit(_streamId, -1, ids, streamMightExist: true, CancellationToken.None);
+		Assert.AreEqual(CommitDecision.CorruptedIdempotency, commitCheckResult.Decision);
+	}
+
+	[Test]
+	public async Task check_commit_with_same_expectedversion_but_different_first_event_id_should_return_wrongexpectedversion_decision() {
+		/*Second, idempotent write but one of the event ids is different*/
+		var ids = new List<Guid>();
+		foreach (var id in _eventIds)
+			ids.Add(id);
+
+		ids[0] = Guid.NewGuid();
+
+		var commitCheckResult = await _indexWriter.CheckCommit(_streamId, -1, ids, streamMightExist: true, CancellationToken.None);
+		Assert.AreEqual(CommitDecision.WrongExpectedVersion, commitCheckResult.Decision);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_batch_of_events_after_the_first_batch_has_not_yet_been_replicated.cs b/src/KurrentDB.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_batch_of_events_after_the_first_batch_has_not_yet_been_replicated.cs
new file mode 100644
index 00000000000..61ef9907de7
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_batch_of_events_after_the_first_batch_has_not_yet_been_replicated.cs
@@ -0,0 +1,93 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Idempotency;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_writing_a_second_batch_of_events_after_the_first_batch_has_not_yet_been_replicated<TLogFormat, TStreamId> : WriteEventsToIndexScenario<TLogFormat, TStreamId> {
+	private const int _numEvents = 10;
+	private List<Guid> _eventIds = new List<Guid>();
+	private TStreamId _streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+
+	public override ValueTask WriteEvents(CancellationToken token) {
+		var expectedEventNumber = -1;
+		var transactionPosition = 1000;
+		var eventTypes = new List<TStreamId>();
+
+		for (var i = 0; i < _numEvents; i++) {
+			_eventIds.Add(Guid.NewGuid());
+			eventTypes.Add(LogFormatHelper<TLogFormat, TStreamId>.EventTypeId);
+		}
+
+		var prepares = CreatePrepareLogRecords(_streamId, expectedEventNumber, eventTypes, _eventIds, transactionPosition);
+		var commit = CreateCommitLogRecord(transactionPosition + 1000 * _numEvents, transactionPosition, expectedEventNumber + _numEvents);
+
+		/*First batch write: committed to db and pre-committed to index but not yet committed to index*/
+		WriteToDB(prepares);
+		PreCommitToIndex(prepares);
+
+		WriteToDB(commit);
+		return PreCommitToIndex(commit, token);
+	}
+
+	[Test]
+	public async Task check_commit_with_same_expectedversion_should_return_idempotentnotready_decision() {
+		/*Second, idempotent write*/
+		var commitCheckResult = await _indexWriter.CheckCommit(_streamId, -1, _eventIds, streamMightExist: true, CancellationToken.None);
+		Assert.AreEqual(CommitDecision.IdempotentNotReady, commitCheckResult.Decision);
+	}
+
+	[Test]
+	public async Task check_commit_with_expectedversion_any_should_return_idempotentnotready_decision() {
+		/*Second, idempotent write*/
+		var commitCheckResult = await _indexWriter.CheckCommit(_streamId, ExpectedVersion.Any, _eventIds, streamMightExist: true, CancellationToken.None);
+		Assert.AreEqual(CommitDecision.IdempotentNotReady, commitCheckResult.Decision);
+	}
+
+	[Test]
+	public async Task check_commit_with_next_expectedversion_should_return_ok_decision() {
+		var commitCheckResult = await _indexWriter.CheckCommit(_streamId, _numEvents - 1, _eventIds, streamMightExist: true, CancellationToken.None);
+		Assert.AreEqual(CommitDecision.Ok, commitCheckResult.Decision);
+	}
+
+	[Test]
+	public async Task check_commit_with_incorrect_expectedversion_should_return_wrongexpectedversion_decision() {
+		var commitCheckResult = await _indexWriter.CheckCommit(_streamId, _numEvents, _eventIds, streamMightExist: true, CancellationToken.None);
+		Assert.AreEqual(CommitDecision.WrongExpectedVersion, commitCheckResult.Decision);
+	}
+
+	[Test]
+	public async Task check_commit_with_same_expectedversion_but_different_non_first_event_id_should_return_corruptedidempotency_decision() {
+		/*Second, idempotent write but one of the event ids is different*/
+		var ids = new List<Guid>();
+		foreach (var id in _eventIds)
+			ids.Add(id);
+
+		ids[ids.Count - 2] = Guid.NewGuid();
+
+		var commitCheckResult = await _indexWriter.CheckCommit(_streamId, -1, ids, streamMightExist: true, CancellationToken.None);
+		Assert.AreEqual(CommitDecision.CorruptedIdempotency, commitCheckResult.Decision);
+	}
+
+	[Test]
+	public async Task check_commit_with_same_expectedversion_but_different_first_event_id_should_return_wrongexpectedversion_decision() {
+		/*Second, idempotent write but one of the event ids is different*/
+		var ids = new List<Guid>();
+		foreach (var id in _eventIds)
+			ids.Add(id);
+
+		ids[0] = Guid.NewGuid();
+
+		var commitCheckResult = await _indexWriter.CheckCommit(_streamId, -1, ids, streamMightExist: true, CancellationToken.None);
+		Assert.AreEqual(CommitDecision.WrongExpectedVersion, commitCheckResult.Decision);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_event_after_the_first_event_has_been_replicated.cs b/src/KurrentDB.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_event_after_the_first_event_has_been_replicated.cs
new file mode 100644
index 00000000000..3174d7fbed7
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_event_after_the_first_event_has_been_replicated.cs
@@ -0,0 +1,62 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Idempotency;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_writing_a_second_event_after_the_first_event_has_been_replicated<TLogFormat, TStreamId> : WriteEventsToIndexScenario<TLogFormat, TStreamId> {
+	private Guid _eventId = Guid.NewGuid();
+	private TStreamId _streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+
+	public override async ValueTask WriteEvents(CancellationToken token) {
+		var expectedEventNumber = -1;
+		var transactionPosition = 1000;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		var prepares = CreatePrepareLogRecord(_streamId, expectedEventNumber, eventTypeId, _eventId, transactionPosition);
+		var commit = CreateCommitLogRecord(transactionPosition + RecordOffset, transactionPosition, expectedEventNumber + 1);
+
+		/*First write: committed to db and index*/
+		WriteToDB(prepares);
+		PreCommitToIndex(prepares);
+
+		WriteToDB(commit);
+		await PreCommitToIndex(commit, token);
+
+		await CommitToIndex(prepares, token);
+		await CommitToIndex(commit, token);
+	}
+
+	[Test]
+	public async Task check_commit_with_same_expectedversion_should_return_idempotent_decision() {
+		/*Second, idempotent write*/
+		var commitCheckResult = await _indexWriter.CheckCommit(_streamId, -1, [_eventId], streamMightExist: true, CancellationToken.None);
+		Assert.AreEqual(CommitDecision.Idempotent, commitCheckResult.Decision);
+	}
+
+	[Test]
+	public async Task check_commit_with_expectedversion_any_should_return_idempotent_decision() {
+		/*Second, idempotent write*/
+		var commitCheckResult = await _indexWriter.CheckCommit(_streamId, ExpectedVersion.Any, [_eventId], streamMightExist: true, CancellationToken.None);
+		Assert.AreEqual(CommitDecision.Idempotent, commitCheckResult.Decision);
+	}
+
+	[Test]
+	public async Task check_commit_with_next_expectedversion_should_return_ok_decision() {
+		var commitCheckResult = await _indexWriter.CheckCommit(_streamId, 0, [_eventId], streamMightExist: true, CancellationToken.None);
+		Assert.AreEqual(CommitDecision.Ok, commitCheckResult.Decision);
+	}
+
+	[Test]
+	public async Task check_commit_with_incorrect_expectedversion_should_return_wrongexpectedversion_decision() {
+		var commitCheckResult = await _indexWriter.CheckCommit(_streamId, 1, [_eventId], streamMightExist: true, CancellationToken.None);
+		Assert.AreEqual(CommitDecision.WrongExpectedVersion, commitCheckResult.Decision);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_event_after_the_first_event_has_not_yet_been_replicated.cs b/src/KurrentDB.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_event_after_the_first_event_has_not_yet_been_replicated.cs
new file mode 100644
index 00000000000..db0d55a0847
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Idempotency/when_writing_a_second_event_after_the_first_event_has_not_yet_been_replicated.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Idempotency;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_writing_a_second_event_after_the_first_event_has_not_yet_been_replicated<TLogFormat, TStreamId> : WriteEventsToIndexScenario<TLogFormat, TStreamId> {
+	private Guid _eventId = Guid.NewGuid();
+	private TStreamId _streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+
+	public override ValueTask WriteEvents(CancellationToken token) {
+		var expectedEventNumber = -1;
+		var transactionPosition = 1000;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		var prepares = CreatePrepareLogRecord(_streamId, expectedEventNumber, eventTypeId, _eventId, transactionPosition);
+		var commit = CreateCommitLogRecord(transactionPosition + RecordOffset, transactionPosition, expectedEventNumber + 1);
+
+		/*First write: committed to db and pre-committed to index but not yet committed to index*/
+		WriteToDB(prepares);
+		PreCommitToIndex(prepares);
+
+		WriteToDB(commit);
+		return PreCommitToIndex(commit, token);
+	}
+
+	[Test]
+	public async Task check_commit_with_same_expectedversion_should_return_idempotentnotready_decision() {
+		/*Second, idempotent write*/
+		var commitCheckResult = await _indexWriter.CheckCommit(_streamId, -1, [_eventId], streamMightExist: true, CancellationToken.None);
+		Assert.AreEqual(CommitDecision.IdempotentNotReady, commitCheckResult.Decision);
+	}
+
+	[Test]
+	public async Task check_commit_with_expectedversion_any_should_return_idempotentnotready_decision() {
+		/*Second, idempotent write*/
+		var commitCheckResult = await _indexWriter.CheckCommit(_streamId, ExpectedVersion.Any, [_eventId], streamMightExist: true, CancellationToken.None);
+		Assert.AreEqual(CommitDecision.IdempotentNotReady, commitCheckResult.Decision);
+	}
+
+	[Test]
+	public async Task check_commit_with_next_expectedversion_should_return_ok_decision() {
+		/*Second, idempotent write*/
+		var commitCheckResult = await _indexWriter.CheckCommit(_streamId, 0, [_eventId], streamMightExist: true, CancellationToken.None);
+		Assert.AreEqual(CommitDecision.Ok, commitCheckResult.Decision);
+	}
+
+	[Test]
+	public async Task check_commit_with_incorrect_expectedversion_should_return_wrongexpectedversion_decision() {
+		/*Second, idempotent write*/
+		var commitCheckResult = await _indexWriter.CheckCommit(_streamId, 1, [_eventId], streamMightExist: true, CancellationToken.None);
+		Assert.AreEqual(CommitDecision.WrongExpectedVersion, commitCheckResult.Decision);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/FilteredTableIndex.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/FilteredTableIndex.cs
new file mode 100644
index 00000000000..2b82c06ae04
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/FilteredTableIndex.cs
@@ -0,0 +1,153 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount.AfterScavenge;
+
+// simulates particular entries having been removed from the index by scavenge
+public class FilteredTableIndex<TStreamId> : ITableIndex<TStreamId> {
+	private readonly ITableIndex<TStreamId> _wrapped;
+	private readonly Func<IndexEntry, bool> _condition;
+	public FilteredTableIndex(ITableIndex<TStreamId> wrapped, Func<IndexEntry, bool> condition) {
+		_wrapped = wrapped;
+		_condition = condition;
+	}
+
+	public long CommitCheckpoint => _wrapped.CommitCheckpoint;
+
+	public long PrepareCheckpoint => _wrapped.PrepareCheckpoint;
+
+	public bool IsBackgroundTaskRunning => _wrapped.IsBackgroundTaskRunning;
+
+	public void Add(long commitPos, TStreamId streamId, long version, long position) {
+		_wrapped.Add(commitPos, streamId, version, position);
+	}
+
+	public void AddEntries(long commitPos, IList<IndexKey<TStreamId>> entries) {
+		_wrapped.AddEntries(commitPos, entries);
+	}
+
+	public void Close(bool removeFiles = true) {
+		_wrapped.Close(removeFiles);
+	}
+
+	public IReadOnlyList<IndexEntry> GetRange(TStreamId streamId, long startVersion, long endVersion, int? limit = null) {
+		return _wrapped
+			.GetRange(streamId, startVersion, endVersion, limit)
+			.Where(_condition)
+			.ToList();
+	}
+
+	public IReadOnlyList<IndexEntry> GetRange(ulong stream, long startVersion, long endVersion, int? limit = null) {
+		return _wrapped
+			.GetRange(stream, startVersion, endVersion, limit)
+			.Where(_condition)
+			.ToList();
+	}
+
+	public void Initialize(long chaserCheckpoint) {
+		_wrapped.Initialize(chaserCheckpoint);
+	}
+
+	public IEnumerable<ISearchTable> IterateAllInOrder() {
+		return _wrapped.IterateAllInOrder();
+	}
+
+	public Task MergeIndexes() {
+		return _wrapped.MergeIndexes();
+	}
+
+	public ValueTask Scavenge(IIndexScavengerLog log, CancellationToken ct)
+		=> ValueTask.FromException(new NotImplementedException());
+
+	public ValueTask Scavenge(Func<IndexEntry, CancellationToken, ValueTask<bool>> shouldKeep, IIndexScavengerLog log, CancellationToken ct)
+		=> ValueTask.FromException(new NotImplementedException());
+
+	public bool TryGetLatestEntry(TStreamId streamId, out IndexEntry entry) {
+		var got = _wrapped.TryGetLatestEntry(streamId, out entry);
+		if (!got)
+			return false;
+		if (_condition(entry))
+			return true;
+
+		// we got the latest entry from the wrapped but it doesn't pass our condition
+		var range = GetRange(streamId, 0, long.MaxValue);
+		if (range.Count == 0)
+			return false;
+		entry = range[0];
+		return true;
+	}
+
+	public ValueTask<IndexEntry?> TryGetLatestEntry(ulong stream, long beforePosition, Func<IndexEntry, CancellationToken, ValueTask<bool>> isForThisStream, CancellationToken token)
+		=> ValueTask.FromException<IndexEntry?>(new NotImplementedException());
+
+	public ValueTask<IndexEntry?> TryGetLatestEntry(TStreamId stream, long beforePosition, Func<IndexEntry, CancellationToken, ValueTask<bool>> isForThisStream, CancellationToken token)
+		=> ValueTask.FromException<IndexEntry?>(new NotImplementedException());
+
+	public bool TryGetNextEntry(TStreamId streamId, long afterVersion, out IndexEntry entry) {
+		var got = _wrapped.TryGetNextEntry(streamId, afterVersion, out entry);
+		if (!got)
+			return false;
+		if (_condition(entry))
+			return true;
+
+		// we got the next entry from wrapped but it doesn't pass our condition
+		var range = GetRange(streamId, afterVersion, long.MaxValue);
+		if (range.Count == 0)
+			return false;
+		entry = range[^1];
+		return true;
+	}
+
+	public bool TryGetNextEntry(ulong stream, long afterVersion, out IndexEntry entry) {
+		var got = _wrapped.TryGetNextEntry(stream, afterVersion, out entry);
+		if (!got)
+			return false;
+		if (_condition(entry))
+			return true;
+
+		// we got the next entry from wrapped but it doesn't pass our condition
+		var range = GetRange(stream, afterVersion, long.MaxValue);
+		if (range.Count == 0)
+			return false;
+		entry = range[^1];
+		return true;
+	}
+
+	public bool TryGetOldestEntry(TStreamId streamId, out IndexEntry entry) {
+		var got = _wrapped.TryGetOldestEntry(streamId, out entry);
+		if (!got)
+			return false;
+		if (_condition(entry))
+			return true;
+
+		// we got the oldest entry from the wrapped but it doesn't pass our condition
+		var range = GetRange(streamId, 0, long.MaxValue);
+		if (range.Count == 0)
+			return false;
+		entry = range[^1];
+		return true;
+	}
+
+	public bool TryGetOneValue(TStreamId streamId, long version, out long position) {
+		throw new NotImplementedException();
+	}
+
+	public bool TryGetPreviousEntry(TStreamId streamId, long beforeVersion, out IndexEntry entry) {
+		throw new NotImplementedException();
+	}
+
+	public bool TryGetPreviousEntry(ulong stream, long beforeVersion, out IndexEntry entry) {
+		throw new NotImplementedException();
+	}
+
+	public void WaitForBackgroundTasks(int millisecondsTimeout) {
+		_wrapped.WaitForBackgroundTasks(millisecondsTimeout);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_gaps_in_index.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_gaps_in_index.cs
new file mode 100644
index 00000000000..87b50fcb77d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_gaps_in_index.cs
@@ -0,0 +1,115 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount.AfterScavenge;
+
+public abstract class MaxAgeIterationTests : ReadIndexTestScenario<LogFormat.V2, string> {
+	public ulong _esHash;
+
+	protected abstract long[] ExtantIndexEntries { get; }
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+		var expired = now.AddMinutes(-50);
+
+		var metadata = string.Format(@"{{""$maxAge"":{0}}}", (int)TimeSpan.FromMinutes(10).TotalSeconds);
+
+		await WriteStreamMetadata("ES", 0, metadata, token: token);
+
+		// the stream had ten events in it but 8 of them have expired leaving only the last two.
+		await WriteSingleEvent("ES", 0, "data", expired, token: token);
+		await WriteSingleEvent("ES", 1, "data", expired, token: token);
+		await WriteSingleEvent("ES", 2, "data", expired, token: token);
+		await WriteSingleEvent("ES", 3, "data", expired, token: token);
+		await WriteSingleEvent("ES", 4, "data", expired, token: token);
+		await WriteSingleEvent("ES", 5, "data", expired, token: token);
+		await WriteSingleEvent("ES", 6, "data", expired, token: token);
+		await WriteSingleEvent("ES", 7, "data", expired, token: token);
+		await WriteSingleEvent("ES", 8, "data", now, token: token);
+		await WriteSingleEvent("ES", 9, "data", now, token: token);
+		_esHash = Hasher.Hash("ES");
+
+		// dont scavenge the index because we want to keep most of the entries
+		// simulate removal by using FilteredTableIndex
+		Scavenge(completeLast: true, mergeChunks: false, scavengeIndex: false);
+	}
+
+	protected override ITableIndex<string> TransformTableIndex(ITableIndex<string> tableIndex) {
+		return new FilteredTableIndex<string>(
+			tableIndex,
+			// keep everything from other streams, but only the ExtantEntries of "ES"
+			entry => entry.Stream != _esHash || ExtantIndexEntries.Contains(entry.Version));
+	}
+
+	// repeatedly issue reads, each one starting from the previous `nextEventNumber`
+	// until we find the event we are looking for.
+	protected async ValueTask ReadOneStartingFrom(long fromEventNumber, long expectedEventNumber, CancellationToken token) {
+		for (int i = 0; i < 20; i++) {
+			var result = await ReadIndex.ReadStreamEventsForward("ES", fromEventNumber, maxCount: 1, token);
+
+			if (result.Records.Length != 0) {
+				Assert.AreEqual(expectedEventNumber, result.Records[0].EventNumber);
+				return;
+			}
+
+			fromEventNumber = result.NextEventNumber;
+		}
+
+		throw new Exception("iterated too many times. infinite loop?");
+	}
+
+	protected async ValueTask ReadOneStartingFromEach(CancellationToken token = default) {
+		await ReadOneStartingFrom(0, 8, token);
+		await ReadOneStartingFrom(1, 8, token);
+		await ReadOneStartingFrom(2, 8, token);
+		await ReadOneStartingFrom(3, 8, token);
+		await ReadOneStartingFrom(4, 8, token);
+		await ReadOneStartingFrom(5, 8, token);
+		await ReadOneStartingFrom(6, 8, token);
+		await ReadOneStartingFrom(7, 8, token);
+		await ReadOneStartingFrom(8, 8, token);
+		await ReadOneStartingFrom(9, 9, token);
+	}
+}
+
+public class when_having_gaps_in_index_on_maxage_fast_path : MaxAgeIterationTests {
+	protected override long[] ExtantIndexEntries { get; } = new long[] { 0, 1, 2, 3, 4, 5, 6, 8, 9 };
+
+	[Test]
+	public async Task works() => await ReadOneStartingFromEach();
+}
+
+public class when_having_gaps_in_index_on_maxage_fast_path2 : MaxAgeIterationTests {
+	protected override long[] ExtantIndexEntries { get; } = new long[] { 0, 8, 9 };
+
+	[Test]
+	public async Task works() => await ReadOneStartingFromEach();
+}
+
+public class when_having_gaps_in_index_on_maxage_fast_path3 : MaxAgeIterationTests {
+	protected override long[] ExtantIndexEntries { get; } = new long[] { 2, 8, 9 };
+
+	[Test]
+	public async Task works() => await ReadOneStartingFromEach();
+}
+
+public class when_having_gaps_in_index_on_maxage_fast_path4 : MaxAgeIterationTests {
+	protected override long[] ExtantIndexEntries { get; } = new long[] { 1, 3, 5, 7, 8, 9 };
+
+	[Test]
+	public async Task works() => await ReadOneStartingFromEach();
+}
+
+public class when_having_gaps_in_index_on_maxage_fast_path5 : MaxAgeIterationTests {
+	protected override long[] ExtantIndexEntries { get; } = new long[] { 0, 2, 4, 6, 8, 9 };
+
+	[Test]
+	public async Task works() => await ReadOneStartingFromEach();
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_both_maxage_and_maxcount_specified_with_maxage_more_strict.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_both_maxage_and_maxcount_specified_with_maxage_more_strict.cs
new file mode 100644
index 00000000000..b4c08b81899
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_both_maxage_and_maxcount_specified_with_maxage_more_strict.cs
@@ -0,0 +1,95 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount.AfterScavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_having_stream_both_maxage_and_maxcount_specified_with_maxage_more_strict<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r1;
+	private EventRecord _r5;
+	private EventRecord _r6;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+
+		var metadata = string.Format(@"{{""$maxAge"":{0},""$maxCount"":4}}",
+			(int)TimeSpan.FromMinutes(10).TotalSeconds);
+		_r1 = await WriteStreamMetadata("ES", 0, metadata, token: token);
+		await WriteSingleEvent("ES", 0, "bla1", now.AddMinutes(-50), token: token);
+		await WriteSingleEvent("ES", 1, "bla1", now.AddMinutes(-20), token: token);
+		await WriteSingleEvent("ES", 2, "bla1", now.AddMinutes(-11), token: token);
+		_r5 = await WriteSingleEvent("ES", 3, "bla1", now.AddMinutes(-5), token: token);
+		_r6 = await WriteSingleEvent("ES", 4, "bla1", now.AddMinutes(-1), token: token);
+
+		Scavenge(completeLast: true, mergeChunks: false);
+	}
+
+	[Test]
+	public async Task single_event_read_doesnt_return_expired_events_and_returns_all_actual_ones() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r5, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r6, result.Record);
+	}
+
+	[Test]
+	public async Task forward_range_read_doesnt_return_expired_records() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_r5, result.Records[0]);
+		Assert.AreEqual(_r6, result.Records[1]);
+	}
+
+	[Test]
+	public async Task backward_range_read_doesnt_return_expired_records() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_r6, result.Records[0]);
+		Assert.AreEqual(_r5, result.Records[1]);
+	}
+
+	[Test]
+	public async Task read_all_forward_doesnt_return_expired_records() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(3, records.Count);
+		Assert.AreEqual(_r1, records[0].Event);
+		Assert.AreEqual(_r5, records[1].Event);
+		Assert.AreEqual(_r6, records[2].Event);
+	}
+
+	[Test]
+	public async Task read_all_backward_doesnt_return_expired_records() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(3, records.Count);
+		Assert.AreEqual(_r6, records[0].Event);
+		Assert.AreEqual(_r5, records[1].Event);
+		Assert.AreEqual(_r1, records[2].Event);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_both_maxage_and_maxcount_specified_with_maxcount_more_strict.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_both_maxage_and_maxcount_specified_with_maxcount_more_strict.cs
new file mode 100644
index 00000000000..79881abb937
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_both_maxage_and_maxcount_specified_with_maxcount_more_strict.cs
@@ -0,0 +1,102 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount.AfterScavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_having_stream_both_maxage_and_maxcount_specified_with_maxcount_more_strict<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r1;
+	private EventRecord _r4;
+	private EventRecord _r5;
+	private EventRecord _r6;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+
+		var metadata = string.Format(@"{{""$maxAge"":{0},""$maxCount"":3}}",
+			(int)TimeSpan.FromMinutes(60).TotalSeconds);
+
+		_r1 = await WriteStreamMetadata("ES", 0, metadata, token: token);
+		await WriteSingleEvent("ES", 0, "bla1", now.AddMinutes(-100), token: token);
+		await WriteSingleEvent("ES", 1, "bla1", now.AddMinutes(-20), token: token);
+		_r4 = await WriteSingleEvent("ES", 2, "bla1", now.AddMinutes(-11), token: token);
+		_r5 = await WriteSingleEvent("ES", 3, "bla1", now.AddMinutes(-5), token: token);
+		_r6 = await WriteSingleEvent("ES", 4, "bla1", now.AddMinutes(-1), token: token);
+
+		Scavenge(completeLast: true, mergeChunks: false);
+	}
+
+	[Test]
+	public async Task single_event_read_doesnt_return_expired_events_and_returns_all_actual_ones() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r4, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r5, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r6, result.Record);
+	}
+
+	[Test]
+	public async Task forward_range_read_doesnt_return_expired_records() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_r4, result.Records[0]);
+		Assert.AreEqual(_r5, result.Records[1]);
+		Assert.AreEqual(_r6, result.Records[2]);
+	}
+
+	[Test]
+	public async Task backward_range_read_doesnt_return_expired_records() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_r6, result.Records[0]);
+		Assert.AreEqual(_r5, result.Records[1]);
+		Assert.AreEqual(_r4, result.Records[2]);
+	}
+
+	[Test]
+	public async Task read_all_forward_doesnt_return_expired_records() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(4, records.Count);
+		Assert.AreEqual(_r1, records[0].Event);
+		Assert.AreEqual(_r4, records[1].Event);
+		Assert.AreEqual(_r5, records[2].Event);
+		Assert.AreEqual(_r6, records[3].Event);
+	}
+
+	[Test]
+	public async Task read_all_backward_doesnt_return_expired_records() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(4, records.Count);
+		Assert.AreEqual(_r6, records[0].Event);
+		Assert.AreEqual(_r5, records[1].Event);
+		Assert.AreEqual(_r4, records[2].Event);
+		Assert.AreEqual(_r1, records[3].Event);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_with_maxage_specified.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_with_maxage_specified.cs
new file mode 100644
index 00000000000..9907362f6cb
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_with_maxage_specified.cs
@@ -0,0 +1,94 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount.AfterScavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_having_stream_with_maxage_specified<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r1;
+	private EventRecord _r5;
+	private EventRecord _r6;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+
+		var metadata = string.Format(@"{{""$maxAge"":{0}}}", (int)TimeSpan.FromMinutes(10).TotalSeconds);
+
+		_r1 = await WriteStreamMetadata("ES", 0, metadata, token: token);
+		await WriteSingleEvent("ES", 0, "bla1", now.AddMinutes(-50), token: token);
+		await WriteSingleEvent("ES", 1, "bla1", now.AddMinutes(-20), token: token);
+		await WriteSingleEvent("ES", 2, "bla1", now.AddMinutes(-11), token: token);
+		_r5 = await WriteSingleEvent("ES", 3, "bla1", now.AddMinutes(-5), token: token);
+		_r6 = await WriteSingleEvent("ES", 4, "bla1", now.AddMinutes(-1), token: token);
+
+		Scavenge(completeLast: true, mergeChunks: false);
+	}
+
+	[Test]
+	public async Task single_event_read_doesnt_return_expired_events_and_returns_all_actual_ones() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r5, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r6, result.Record);
+	}
+
+	[Test]
+	public async Task forward_range_read_doesnt_return_expired_records() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_r5, result.Records[0]);
+		Assert.AreEqual(_r6, result.Records[1]);
+	}
+
+	[Test]
+	public async Task backward_range_read_doesnt_return_expired_records() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_r6, result.Records[0]);
+		Assert.AreEqual(_r5, result.Records[1]);
+	}
+
+	[Test]
+	public async Task read_all_forward_doesnt_return_expired_records() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(3, records.Count);
+		Assert.AreEqual(_r1, records[0].Event);
+		Assert.AreEqual(_r5, records[1].Event);
+		Assert.AreEqual(_r6, records[2].Event);
+	}
+
+	[Test]
+	public async Task read_all_backward_doesnt_return_expired_records() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None)).EventRecords();
+		Assert.AreEqual(3, records.Count);
+		Assert.AreEqual(_r6, records[0].Event);
+		Assert.AreEqual(_r5, records[1].Event);
+		Assert.AreEqual(_r1, records[2].Event);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_with_maxcount_specified.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_with_maxcount_specified.cs
new file mode 100644
index 00000000000..3efe0d2c5f2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_with_maxcount_specified.cs
@@ -0,0 +1,102 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount.AfterScavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_having_stream_with_maxcount_specified<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r1;
+	private EventRecord _r3;
+	private EventRecord _r4;
+	private EventRecord _r5;
+	private EventRecord _r6;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		const string metadata = @"{""$maxCount"":4}";
+
+		_r1 = await WriteStreamMetadata("ES", 0, metadata, token: token);
+		await WriteSingleEvent("ES", 0, "bla1", token: token);
+		_r3 = await WriteSingleEvent("ES", 1, "bla1", token: token);
+		_r4 = await WriteSingleEvent("ES", 2, "bla1", token: token);
+		_r5 = await WriteSingleEvent("ES", 3, "bla1", token: token);
+		_r6 = await WriteSingleEvent("ES", 4, "bla1", token: token);
+
+		Scavenge(completeLast: true, mergeChunks: false);
+	}
+
+	[Test]
+	public async Task single_event_read_doesnt_return_old_events_and_return_actual_ones() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r3, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r4, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r5, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r6, result.Record);
+	}
+
+	[Test]
+	public async Task forward_range_read_doesnt_return_old_records() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(4, result.Records.Length);
+		Assert.AreEqual(_r3, result.Records[0]);
+		Assert.AreEqual(_r4, result.Records[1]);
+		Assert.AreEqual(_r5, result.Records[2]);
+		Assert.AreEqual(_r6, result.Records[3]);
+	}
+
+	[Test]
+	public async Task backward_range_read_doesnt_return_expired_records() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(4, result.Records.Length);
+		Assert.AreEqual(_r6, result.Records[0]);
+		Assert.AreEqual(_r5, result.Records[1]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r3, result.Records[3]);
+	}
+
+	[Test]
+	public async Task read_all_forward_doesnt_return_expired_records() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(5, records.Count);
+		Assert.AreEqual(_r1, records[0].Event);
+		Assert.AreEqual(_r3, records[1].Event);
+		Assert.AreEqual(_r4, records[2].Event);
+		Assert.AreEqual(_r5, records[3].Event);
+		Assert.AreEqual(_r6, records[4].Event);
+	}
+
+	[Test]
+	public async Task read_all_backward_doesnt_return_expired_records() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(5, records.Count);
+		Assert.AreEqual(_r6, records[0].Event);
+		Assert.AreEqual(_r5, records[1].Event);
+		Assert.AreEqual(_r4, records[2].Event);
+		Assert.AreEqual(_r3, records[3].Event);
+		Assert.AreEqual(_r1, records[4].Event);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_with_truncatebefore_specified.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_with_truncatebefore_specified.cs
new file mode 100644
index 00000000000..9f97805ea08
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/AfterScavenge/when_having_stream_with_truncatebefore_specified.cs
@@ -0,0 +1,102 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount.AfterScavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_having_stream_with_truncatebefore_specified<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r1;
+	private EventRecord _r3;
+	private EventRecord _r4;
+	private EventRecord _r5;
+	private EventRecord _r6;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		const string metadata = @"{""$tb"":1}";
+
+		_r1 = await WriteStreamMetadata("ES", 0, metadata, token: token);
+		await WriteSingleEvent("ES", 0, "bla1", token: token);
+		_r3 = await WriteSingleEvent("ES", 1, "bla1", token: token);
+		_r4 = await WriteSingleEvent("ES", 2, "bla1", token: token);
+		_r5 = await WriteSingleEvent("ES", 3, "bla1", token: token);
+		_r6 = await WriteSingleEvent("ES", 4, "bla1", token: token);
+
+		Scavenge(completeLast: true, mergeChunks: false);
+	}
+
+	[Test]
+	public async Task single_event_read_doesnt_return_old_events_and_return_actual_ones() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r3, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r4, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r5, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r6, result.Record);
+	}
+
+	[Test]
+	public async Task forward_range_read_doesnt_return_old_records() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(4, result.Records.Length);
+		Assert.AreEqual(_r3, result.Records[0]);
+		Assert.AreEqual(_r4, result.Records[1]);
+		Assert.AreEqual(_r5, result.Records[2]);
+		Assert.AreEqual(_r6, result.Records[3]);
+	}
+
+	[Test]
+	public async Task backward_range_read_doesnt_return_expired_records() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(4, result.Records.Length);
+		Assert.AreEqual(_r6, result.Records[0]);
+		Assert.AreEqual(_r5, result.Records[1]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r3, result.Records[3]);
+	}
+
+	[Test]
+	public async Task read_all_forward_doesnt_return_expired_records() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(5, records.Count);
+		Assert.AreEqual(_r1, records[0].Event);
+		Assert.AreEqual(_r3, records[1].Event);
+		Assert.AreEqual(_r4, records[2].Event);
+		Assert.AreEqual(_r5, records[3].Event);
+		Assert.AreEqual(_r6, records[4].Event);
+	}
+
+	[Test]
+	public async Task read_all_backward_doesnt_return_expired_records() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(5, records.Count);
+		Assert.AreEqual(_r6, records[0].Event);
+		Assert.AreEqual(_r5, records[1].Event);
+		Assert.AreEqual(_r4, records[2].Event);
+		Assert.AreEqual(_r3, records[3].Event);
+		Assert.AreEqual(_r1, records[4].Event);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_age.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_age.cs
new file mode 100644
index 00000000000..51bac4d2648
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_age.cs
@@ -0,0 +1,201 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount.ReadRangeAndNextEventNumber;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_reading_stream_with_max_age<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _event2;
+	private EventRecord _event3;
+	private EventRecord _event4;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+
+		var metadata = string.Format(@"{{""$maxAge"":{0}}}", (int)TimeSpan.FromMinutes(20).TotalSeconds);
+		await WriteStreamMetadata("ES", 0, metadata, now.AddMinutes(-100), token: token);
+		await WriteSingleEvent("ES", 0, "bla", now.AddMinutes(-50), token: token); // expired
+		await WriteSingleEvent("ES", 1, "bla", now.AddMinutes(-25), token: token); // expired
+		_event2 = await WriteSingleEvent("ES", 2, "bla", now.AddMinutes(-15), token: token); // active
+		_event3 = await WriteSingleEvent("ES", 3, "bla", now.AddMinutes(-11), token: token); // active
+		_event4 = await WriteSingleEvent("ES", 4, "bla", now.AddMinutes(-3), token: token); // active
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_start_to_expired_next_event_number_is_expired_plus_1_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 0, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(2, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_start_to_active_next_event_number_is_last_read_event_plus_1_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 0, 4, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(4, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(2, records.Length);
+		Assert.AreEqual(_event2, records[0]);
+		Assert.AreEqual(_event3, records[1]);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_expired_to_active_next_event_number_is_last_read_event_plus_1_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(3, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(1, records.Length);
+		Assert.AreEqual(_event2, records[0]);
+	}
+
+	[Test]
+	public async Task on_read_forward_from_expired_to_end_next_event_number_is_end_plus_1_and_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 1, 4, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(5, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event2, records[0]);
+		Assert.AreEqual(_event3, records[1]);
+		Assert.AreEqual(_event4, records[2]);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_expired_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 1, 6, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(5, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event2, records[0]);
+		Assert.AreEqual(_event3, records[1]);
+		Assert.AreEqual(_event4, records[2]);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_out_of_bounds_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 7, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(5, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+
+	[Test]
+	public async Task
+		on_read_backward_from_end_to_active_next_event_number_is_last_read_event_minus_1_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 4, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(2, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(2, records.Length);
+		Assert.AreEqual(_event4, records[0]);
+		Assert.AreEqual(_event3, records[1]);
+	}
+
+	[Test]
+	public async Task
+		on_read_backward_from_end_to_maxage_bound_next_event_number_is_maxage_bound_minus_1_and_its_not_end_of_stream() // just no simple way to tell this
+	{
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 4, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(1, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event4, records[0]);
+		Assert.AreEqual(_event3, records[1]);
+		Assert.AreEqual(_event2, records[2]);
+	}
+
+	[Test]
+	public async Task on_read_backward_from_active_to_expired_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 3, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(-1, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(2, records.Length);
+		Assert.AreEqual(_event3, records[0]);
+		Assert.AreEqual(_event2, records[1]);
+	}
+
+	[Test]
+	public async Task on_read_backward_from_expired_to_expired_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(-1, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+	[Test]
+	public async Task on_read_backward_from_expired_to_before_start_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 1, 5, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(-1, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+	[Test]
+	public async Task
+		on_read_backward_from_out_of_bounds_to_out_of_bounds_next_event_number_is_end_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 10, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(4, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_age_and_max_count_and_max_age_is_more_strict.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_age_and_max_count_and_max_age_is_more_strict.cs
new file mode 100644
index 00000000000..d143c298136
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_age_and_max_count_and_max_age_is_more_strict.cs
@@ -0,0 +1,277 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount.ReadRangeAndNextEventNumber;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_reading_stream_with_max_age_and_max_count_and_max_age_is_more_strict<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _event3;
+	private EventRecord _event4;
+	private EventRecord _event5;
+
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+
+		var metadata = string.Format(@"{{""$maxAge"":{0},""$maxCount"":5}}",
+			(int)TimeSpan.FromMinutes(20).TotalSeconds);
+
+		await WriteStreamMetadata("ES", 0, metadata, token: token);
+		await WriteSingleEvent("ES", 0, "bla", now.AddMinutes(-100), token: token); // expired: maxcount & maxage
+		await WriteSingleEvent("ES", 1, "bla", now.AddMinutes(-50), token: token); // expired: maxage
+		await WriteSingleEvent("ES", 2, "bla", now.AddMinutes(-25), token: token); // expired: maxage
+		_event3 = await WriteSingleEvent("ES", 3, "bla", now.AddMinutes(-15), token: token); // active
+		_event4 = await WriteSingleEvent("ES", 4, "bla", now.AddMinutes(-11), token: token); // active
+		_event5 = await WriteSingleEvent("ES", 5, "bla", now.AddMinutes(-3), token: token); // active
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_start_to_expired_next_event_number_is_expired_by_age_plus_1_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 0, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(3, res.NextEventNumber); // new path fast forwards to here
+		Assert.AreEqual(5, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_start_to_active_next_event_number_is_last_read_event_plus_1_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 0, 5, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(5, res.NextEventNumber);
+		Assert.AreEqual(5, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(2, records.Length);
+		Assert.AreEqual(_event3, records[0]);
+		Assert.AreEqual(_event4, records[1]);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_expired_to_active_next_event_number_is_last_read_event_plus_1_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 2, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(4, res.NextEventNumber);
+		Assert.AreEqual(5, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(1, records.Length);
+		Assert.AreEqual(_event3, records[0]);
+	}
+
+	[Test]
+	public async Task on_read_forward_from_expired_to_end_next_event_number_is_end_plus_1_and_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 2, 4, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(6, res.NextEventNumber);
+		Assert.AreEqual(5, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event3, records[0]);
+		Assert.AreEqual(_event4, records[1]);
+		Assert.AreEqual(_event5, records[2]);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_expired_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 2, 6, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(6, res.NextEventNumber);
+		Assert.AreEqual(5, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event3, records[0]);
+		Assert.AreEqual(_event4, records[1]);
+		Assert.AreEqual(_event5, records[2]);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_out_of_bounds_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 7, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(6, res.NextEventNumber);
+		Assert.AreEqual(5, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+
+	[Test]
+	public async Task
+		on_read_backward_from_end_to_active_next_event_number_is_last_read_event_minus_1_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 5, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(3, res.NextEventNumber);
+		Assert.AreEqual(5, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(2, records.Length);
+		Assert.AreEqual(_event5, records[0]);
+		Assert.AreEqual(_event4, records[1]);
+	}
+
+	[Test]
+	public async Task
+		on_read_backward_from_end_to_maxage_bound_next_event_number_is_maxage_bound_minus_1_and_its_not_end_of_stream() // just no simple way to tell this
+	{
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 5, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(2, res.NextEventNumber);
+		Assert.AreEqual(5, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event5, records[0]);
+		Assert.AreEqual(_event4, records[1]);
+		Assert.AreEqual(_event3, records[2]);
+	}
+
+	[Test]
+	public async Task on_read_backward_from_active_to_expired_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 4, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(-1, res.NextEventNumber);
+		Assert.AreEqual(5, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(2, records.Length);
+		Assert.AreEqual(_event4, records[0]);
+		Assert.AreEqual(_event3, records[1]);
+	}
+
+	[Test]
+	public async Task on_read_backward_from_expired_to_expired_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 2, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(-1, res.NextEventNumber);
+		Assert.AreEqual(5, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+	[Test]
+	public async Task on_read_backward_from_expired_to_before_start_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 2, 5, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(-1, res.NextEventNumber);
+		Assert.AreEqual(5, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+	[Test]
+	public async Task
+		on_read_backward_from_out_of_bounds_to_out_of_bounds_next_event_number_is_end_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 10, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(5, res.NextEventNumber);
+		Assert.AreEqual(5, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_reading_stream_with_max_age_and_a_mostly_expired<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat,
+		TStreamId> {
+
+	public when_reading_stream_with_max_age_and_a_mostly_expired() : base(maxEntriesInMemTable: 50,
+		chunkSize: 100000) {
+
+	}
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+
+		var metadata = string.Format(@"{{""$maxAge"":{0}}}",
+			(int)TimeSpan.FromMinutes(20).TotalSeconds);
+
+		await WriteStreamMetadata("ES", 0, metadata, token: token);
+		var start = 0;
+		var end = 1008;
+		for (int i = start; i < end; i++) {
+			await WriteSingleEvent("ES", i, "bla", now.AddMinutes(-100), retryOnFail: true, token: token);
+		}
+
+		start = end;
+		end += 5;
+		for (int i = start; i < end; i++) {
+			await WriteSingleEvent("ES", i, "bla", now, retryOnFail: true, token: token);
+		}
+
+	}
+
+	[Test]
+	public async Task reading_forward_should_match_reading_backwards_in_reverse() {
+		var backwardsCollected = new List<EventRecord>();
+		var forwardsCollected = new List<EventRecord>();
+		var from = long.MaxValue;
+		while (true) {
+			var backwards = await ReadIndex.ReadStreamEventsBackward("ES", from, 7, CancellationToken.None);
+			for (int i = 0; i < backwards.Records.Length; i++) {
+				backwardsCollected.Add(backwards.Records[i]);
+			}
+
+			from = backwards.NextEventNumber;
+			if (backwards.IsEndOfStream)
+				break;
+		}
+
+		from = 0;
+		while (true) {
+			var forwards = await ReadIndex.ReadStreamEventsForward("ES", from, 7, CancellationToken.None);
+			for (int i = 0; i < forwards.Records.Length; i++) {
+				forwardsCollected.Add(forwards.Records[i]);
+			}
+
+			from = forwards.NextEventNumber;
+			if (forwards.IsEndOfStream)
+				break;
+		}
+
+		Assert.AreEqual(forwardsCollected.Count, backwardsCollected.Count);
+		backwardsCollected.Reverse();
+		for (int i = 0; i < backwardsCollected.Count; i++) {
+			Assert.AreEqual(backwardsCollected[i].EventId, forwardsCollected[i].EventId);
+			Assert.AreEqual(backwardsCollected[i].EventType, forwardsCollected[i].EventType);
+			Assert.AreEqual(backwardsCollected[i].ExpectedVersion, forwardsCollected[i].ExpectedVersion);
+			Assert.AreEqual(backwardsCollected[i].EventNumber, forwardsCollected[i].EventNumber);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_age_and_max_count_and_max_count_is_more_strict.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_age_and_max_count_and_max_count_is_more_strict.cs
new file mode 100644
index 00000000000..4732ac7b93a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_age_and_max_count_and_max_count_is_more_strict.cs
@@ -0,0 +1,201 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount.ReadRangeAndNextEventNumber;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_reading_stream_with_max_age_and_max_count_and_max_count_is_more_strict<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _event2;
+	private EventRecord _event3;
+	private EventRecord _event4;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+
+		var metadata = string.Format(@"{{""$maxAge"":{0},""$maxCount"":3}}",
+			(int)TimeSpan.FromMinutes(61).TotalSeconds);
+		await WriteStreamMetadata("ES", 0, metadata, now.AddMinutes(-100), token: token);
+
+		await WriteSingleEvent("ES", 0, "bla", now.AddMinutes(-50), token: token);
+		await WriteSingleEvent("ES", 1, "bla", now.AddMinutes(-25), token: token);
+		_event2 = await WriteSingleEvent("ES", 2, "bla", now.AddMinutes(-15), token: token);
+		_event3 = await WriteSingleEvent("ES", 3, "bla", now.AddMinutes(-11), token: token);
+		_event4 = await WriteSingleEvent("ES", 4, "bla", now.AddMinutes(-3), token: token);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_start_to_expired_next_event_number_is_first_active_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 0, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(2, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_start_to_active_next_event_number_is_last_read_event_plus_1_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 0, 4, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(4, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(2, records.Length);
+		Assert.AreEqual(_event2, records[0]);
+		Assert.AreEqual(_event3, records[1]);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_expired_to_active_next_event_number_is_last_read_event_plus_1_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(3, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(1, records.Length);
+		Assert.AreEqual(_event2, records[0]);
+	}
+
+	[Test]
+	public async Task on_read_forward_from_expired_to_end_next_event_number_is_end_plus_1_and_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 1, 4, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(5, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event2, records[0]);
+		Assert.AreEqual(_event3, records[1]);
+		Assert.AreEqual(_event4, records[2]);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_expired_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 1, 6, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(5, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event2, records[0]);
+		Assert.AreEqual(_event3, records[1]);
+		Assert.AreEqual(_event4, records[2]);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_out_of_bounds_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 7, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(5, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+
+	[Test]
+	public async Task
+		on_read_backward_from_end_to_active_next_event_number_is_last_read_event_minus_1_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 4, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(2, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(2, records.Length);
+		Assert.AreEqual(_event4, records[0]);
+		Assert.AreEqual(_event3, records[1]);
+	}
+
+	[Test]
+	public async Task on_read_backward_from_end_to_maxcount_bound_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 4, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(-1, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event4, records[0]);
+		Assert.AreEqual(_event3, records[1]);
+		Assert.AreEqual(_event2, records[2]);
+	}
+
+	[Test]
+	public async Task on_read_backward_from_active_to_expired_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 3, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(-1, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(2, records.Length);
+		Assert.AreEqual(_event3, records[0]);
+		Assert.AreEqual(_event2, records[1]);
+	}
+
+	[Test]
+	public async Task on_read_backward_from_expired_to_expired_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(-1, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+	[Test]
+	public async Task on_read_backward_from_expired_to_before_start_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 1, 5, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(-1, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+	[Test]
+	public async Task
+		on_read_backward_from_out_of_bounds_to_out_of_bounds_next_event_number_is_end_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 10, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(4, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_count.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_count.cs
new file mode 100644
index 00000000000..71b45a384f1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_max_count.cs
@@ -0,0 +1,195 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount.ReadRangeAndNextEventNumber;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_reading_stream_with_max_count<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _event3;
+	private EventRecord _event4;
+	private EventRecord _event5;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteStreamMetadata("ES", 0, @"{""$maxCount"":3}", token: token);
+		await WriteSingleEvent("ES", 0, "bla", token: token);
+		await WriteSingleEvent("ES", 1, "bla", token: token);
+		_event3 = await WriteSingleEvent("ES", 2, "bla", token: token);
+		_event4 = await WriteSingleEvent("ES", 3, "bla", token: token);
+		_event5 = await WriteSingleEvent("ES", 4, "bla", token: token);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_start_to_expired_next_event_number_is_first_active_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 0, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(2, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_start_to_active_next_event_number_is_last_read_event_plus_1_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 0, 4, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(4, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(2, records.Length);
+		Assert.AreEqual(_event3, records[0]);
+		Assert.AreEqual(_event4, records[1]);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_expired_to_active_next_event_number_is_last_read_event_plus_1_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(3, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(1, records.Length);
+		Assert.AreEqual(_event3, records[0]);
+	}
+
+	[Test]
+	public async Task on_read_forward_from_expired_to_end_next_event_number_is_end_plus_1_and_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 1, 4, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(5, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event3, records[0]);
+		Assert.AreEqual(_event4, records[1]);
+		Assert.AreEqual(_event5, records[2]);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_expired_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 1, 6, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(5, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event3, records[0]);
+		Assert.AreEqual(_event4, records[1]);
+		Assert.AreEqual(_event5, records[2]);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_out_of_bounds_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 7, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(5, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+
+	[Test]
+	public async Task
+		on_read_backward_from_end_to_active_next_event_number_is_last_read_event_minus_1_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 4, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(2, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(2, records.Length);
+		Assert.AreEqual(_event5, records[0]);
+		Assert.AreEqual(_event4, records[1]);
+	}
+
+	[Test]
+	public async Task on_read_backward_from_end_to_maxcount_bound_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 4, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(-1, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event5, records[0]);
+		Assert.AreEqual(_event4, records[1]);
+		Assert.AreEqual(_event3, records[2]);
+	}
+
+	[Test]
+	public async Task on_read_backward_from_active_to_expired_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 3, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(-1, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(2, records.Length);
+		Assert.AreEqual(_event4, records[0]);
+		Assert.AreEqual(_event3, records[1]);
+	}
+
+	[Test]
+	public async Task on_read_backward_from_expired_to_expired_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(-1, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+	[Test]
+	public async Task on_read_backward_from_expired_to_before_start_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 1, 5, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(-1, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+	[Test]
+	public async Task
+		on_read_backward_from_out_of_bounds_to_out_of_bounds_next_event_number_is_end_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 10, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(4, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_no_max_age_max_count.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_no_max_age_max_count.cs
new file mode 100644
index 00000000000..598ad54909b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_no_max_age_max_count.cs
@@ -0,0 +1,166 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount.ReadRangeAndNextEventNumber;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_reading_stream_with_no_max_age_max_count<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _event0;
+	private EventRecord _event1;
+	private EventRecord _event2;
+	private EventRecord _event3;
+	private EventRecord _event4;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_event0 = await WriteSingleEvent("ES", 0, "bla", token: token);
+		_event1 = await WriteSingleEvent("ES", 1, "bla", token: token);
+		_event2 = await WriteSingleEvent("ES", 2, "bla", token: token);
+		_event3 = await WriteSingleEvent("ES", 3, "bla", token: token);
+		_event4 = await WriteSingleEvent("ES", 4, "bla", token: token);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_start_to_middle_next_event_number_is_middle_plus_1_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 0, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(3, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event0, records[0]);
+		Assert.AreEqual(_event1, records[1]);
+		Assert.AreEqual(_event2, records[2]);
+	}
+
+	[Test]
+	public async Task on_read_forward_from_the_middle_to_end_next_event_number_is_end_plus_1_and_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 1, 4, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(5, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(4, records.Length);
+		Assert.AreEqual(_event1, records[0]);
+		Assert.AreEqual(_event2, records[1]);
+		Assert.AreEqual(_event3, records[2]);
+		Assert.AreEqual(_event4, records[3]);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_the_middle_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 1, 5, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(5, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(4, records.Length);
+		Assert.AreEqual(_event1, records[0]);
+		Assert.AreEqual(_event2, records[1]);
+		Assert.AreEqual(_event3, records[2]);
+		Assert.AreEqual(_event4, records[3]);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_the_out_of_bounds_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 6, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(5, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+
+	[Test]
+	public async Task
+		on_read_backward_from_the_end_to_middle_next_event_number_is_middle_minus_1_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 4, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(1, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event4, records[0]);
+		Assert.AreEqual(_event3, records[1]);
+		Assert.AreEqual(_event2, records[2]);
+	}
+
+	[Test]
+	public async Task on_read_backward_from_middle_to_start_next_event_number_is_minus_1_and_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 2, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(-1, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event2, records[0]);
+		Assert.AreEqual(_event1, records[1]);
+		Assert.AreEqual(_event0, records[2]);
+	}
+
+	[Test]
+	public async Task on_read_backward_from_middle_to_before_start_next_event_number_is_minus_1_and_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 2, 5, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(-1, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event2, records[0]);
+		Assert.AreEqual(_event1, records[1]);
+		Assert.AreEqual(_event0, records[2]);
+	}
+
+	[Test]
+	public async Task
+		on_read_backward_from_out_of_bounds_to_middle_next_event_number_is_middle_minus_1_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 6, 5, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(1, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event4, records[0]);
+		Assert.AreEqual(_event3, records[1]);
+		Assert.AreEqual(_event2, records[2]);
+	}
+
+	[Test]
+	public async Task
+		on_read_backward_from_out_of_bounds_to_out_of_bounds_next_event_number_is_end_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 10, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(4, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_start_from.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_start_from.cs
new file mode 100644
index 00000000000..484bc4da9bc
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_stream_with_start_from.cs
@@ -0,0 +1,195 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount.ReadRangeAndNextEventNumber;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_reading_stream_with_truncatebefore<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _event3;
+	private EventRecord _event4;
+	private EventRecord _event5;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteStreamMetadata("ES", 0, @"{""$tb"":2}", token: token);
+		await WriteSingleEvent("ES", 0, "bla", token: token);
+		await WriteSingleEvent("ES", 1, "bla", token: token);
+		_event3 = await WriteSingleEvent("ES", 2, "bla", token: token);
+		_event4 = await WriteSingleEvent("ES", 3, "bla", token: token);
+		_event5 = await WriteSingleEvent("ES", 4, "bla", token: token);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_start_to_expired_next_event_number_is_first_active_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 0, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(2, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_start_to_active_next_event_number_is_last_read_event_plus_1_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 0, 4, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(4, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(2, records.Length);
+		Assert.AreEqual(_event3, records[0]);
+		Assert.AreEqual(_event4, records[1]);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_expired_to_active_next_event_number_is_last_read_event_plus_1_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(3, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(1, records.Length);
+		Assert.AreEqual(_event3, records[0]);
+	}
+
+	[Test]
+	public async Task on_read_forward_from_expired_to_end_next_event_number_is_end_plus_1_and_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 1, 4, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(5, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event3, records[0]);
+		Assert.AreEqual(_event4, records[1]);
+		Assert.AreEqual(_event5, records[2]);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_expired_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 1, 6, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(5, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event3, records[0]);
+		Assert.AreEqual(_event4, records[1]);
+		Assert.AreEqual(_event5, records[2]);
+	}
+
+	[Test]
+	public async Task
+		on_read_forward_from_out_of_bounds_to_out_of_bounds_next_event_number_is_end_plus_1_and_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 7, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(5, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+
+	[Test]
+	public async Task
+		on_read_backward_from_end_to_active_next_event_number_is_last_read_event_minus_1_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 4, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(2, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(2, records.Length);
+		Assert.AreEqual(_event5, records[0]);
+		Assert.AreEqual(_event4, records[1]);
+	}
+
+	[Test]
+	public async Task on_read_backward_from_end_to_maxcount_bound_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 4, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(-1, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event5, records[0]);
+		Assert.AreEqual(_event4, records[1]);
+		Assert.AreEqual(_event3, records[2]);
+	}
+
+	[Test]
+	public async Task on_read_backward_from_active_to_expired_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 3, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(-1, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(2, records.Length);
+		Assert.AreEqual(_event4, records[0]);
+		Assert.AreEqual(_event3, records[1]);
+	}
+
+	[Test]
+	public async Task on_read_backward_from_expired_to_expired_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(-1, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+	[Test]
+	public async Task on_read_backward_from_expired_to_before_start_its_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 1, 5, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(-1, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsTrue(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+	[Test]
+	public async Task
+		on_read_backward_from_out_of_bounds_to_out_of_bounds_next_event_number_is_end_and_its_not_end_of_stream() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", 10, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(4, res.NextEventNumber);
+		Assert.AreEqual(4, res.LastEventNumber);
+		Assert.IsFalse(res.IsEndOfStream);
+
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_very_long_stream_with_max_age_and_mostly_expired_events.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_very_long_stream_with_max_age_and_mostly_expired_events.cs
new file mode 100644
index 00000000000..00792bb0ea1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_very_long_stream_with_max_age_and_mostly_expired_events.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount.ReadRangeAndNextEventNumber;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_reading_very_long_stream_with_max_age_and_mostly_expired_events<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	public when_reading_very_long_stream_with_max_age_and_mostly_expired_events() : base(maxEntriesInMemTable: 500_000, chunkSize: TFConsts.ChunkSize) {
+
+	}
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+		var metadata = string.Format(@"{{""$maxAge"":{0}}}", (int)TimeSpan.FromMinutes(20).TotalSeconds);
+		await WriteStreamMetadata("ES", 0, metadata, now.AddMinutes(-100), token: token);
+		for (int i = 0; i < 1_000_000; i++) {
+			await WriteSingleEvent("ES", i, "bla", now.AddMinutes(-50), retryOnFail: true, token: token);
+		}
+
+		for (int i = 1_000_000; i < 1_000_015; i++) {
+			await WriteSingleEvent("ES", i, "bla", now.AddMinutes(-1), retryOnFail: true, token: token);
+		}
+	}
+
+	[Test, Explicit, Category("LongRunning")]
+	public async Task on_read_from_beginning() {
+		Stopwatch sw = Stopwatch.StartNew();
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 1, 10, CancellationToken.None);
+		var elapsed = sw.Elapsed;
+
+		Assert.AreEqual(1_000_000, res.NextEventNumber);
+		Assert.AreEqual(0, res.Records.Length);
+		Assert.AreEqual(false, res.IsEndOfStream);
+
+		res = await ReadIndex.ReadStreamEventsForward("ES", res.NextEventNumber, 10, CancellationToken.None);
+
+		Assert.AreEqual(1_000_010, res.NextEventNumber);
+		Assert.AreEqual(10, res.Records.Length);
+		Assert.AreEqual(false, res.IsEndOfStream);
+
+		res = await ReadIndex.ReadStreamEventsForward("ES", res.NextEventNumber, 10, CancellationToken.None);
+
+		Assert.AreEqual(1_000_015, res.NextEventNumber);
+		Assert.AreEqual(5, res.Records.Length);
+		Assert.AreEqual(true, res.IsEndOfStream);
+
+		Assert.Less(elapsed, TimeSpan.FromSeconds(1));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_very_long_stream_with_max_age_and_some_expired_events.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_very_long_stream_with_max_age_and_some_expired_events.cs
new file mode 100644
index 00000000000..a607d13b897
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/ReadRangeAndNextEventNumber/when_reading_very_long_stream_with_max_age_and_some_expired_events.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount.ReadRangeAndNextEventNumber;
+
+// test the binary chop where it has to repeatedly lower the high bound
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_reading_very_long_stream_with_max_age_and_some_expired_events<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	public when_reading_very_long_stream_with_max_age_and_some_expired_events() : base(
+		maxEntriesInMemTable: 500_000, chunkSize: TFConsts.ChunkSize) {
+	}
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+		var metadata = string.Format(@"{{""$maxAge"":{0}}}", (int)TimeSpan.FromMinutes(20).TotalSeconds);
+		await WriteStreamMetadata("ES", 0, metadata, now.AddMinutes(-100), token: token);
+		for (int i = 0; i < 20; i++) {
+			await WriteSingleEvent("ES", i, "bla", now.AddMinutes(-50), retryOnFail: true, token: token);
+		}
+
+		for (int i = 20; i < 1_000_000; i++) {
+			await WriteSingleEvent("ES", i, "bla", now.AddMinutes(-1), retryOnFail: true, token: token);
+		}
+	}
+
+	[Test, Explicit, Category("LongRunning")]
+	public async Task on_read_from_beginning() {
+		Stopwatch sw = Stopwatch.StartNew();
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 1, 10, CancellationToken.None);
+		var elapsed = sw.Elapsed;
+
+		Assert.AreEqual(20, res.NextEventNumber);
+		Assert.AreEqual(0, res.Records.Length);
+		Assert.AreEqual(false, res.IsEndOfStream);
+
+		res = await ReadIndex.ReadStreamEventsForward("ES", res.NextEventNumber, 10, CancellationToken.None);
+
+		Assert.AreEqual(30, res.NextEventNumber);
+		Assert.AreEqual(10, res.Records.Length);
+		Assert.AreEqual(false, res.IsEndOfStream);
+
+		Assert.Less(elapsed, TimeSpan.FromSeconds(1));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_one_stream_with_maxage_and_other_stream_with_maxcount_and_streams_have_same_hash.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_one_stream_with_maxage_and_other_stream_with_maxcount_and_streams_have_same_hash.cs
new file mode 100644
index 00000000000..18d89d94a14
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_one_stream_with_maxage_and_other_stream_with_maxcount_and_streams_have_same_hash.cs
@@ -0,0 +1,200 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_having_one_stream_with_maxage_and_other_stream_with_maxcount_and_streams_have_same_hash<TLogFormat, TStreamId> :
+		ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r11;
+	private EventRecord _r12;
+	private EventRecord _r13;
+	private EventRecord _r14;
+	private EventRecord _r15;
+	private EventRecord _r16;
+
+	private EventRecord _r21;
+	private EventRecord _r22;
+	private EventRecord _r23;
+	private EventRecord _r24;
+	private EventRecord _r25;
+	private EventRecord _r26;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+
+		var metadata1 = string.Format(@"{{""$maxAge"":{0}}}", (int)TimeSpan.FromMinutes(25).TotalSeconds);
+		const string metadata2 = @"{""$maxCount"":2}";
+
+		_r11 = await WriteStreamMetadata("ES1", 0, metadata1, token: token);
+		_r21 = await WriteStreamMetadata("ES2", 0, metadata2, token: token);
+
+		_r12 = await WriteSingleEvent("ES1", 0, "bla1", now.AddMinutes(-100), token: token);
+		_r13 = await WriteSingleEvent("ES1", 1, "bla1", now.AddMinutes(-20), token: token);
+
+		_r22 = await WriteSingleEvent("ES2", 0, "bla1", now.AddMinutes(-100), token: token);
+		_r23 = await WriteSingleEvent("ES2", 1, "bla1", now.AddMinutes(-20), token: token);
+
+		_r14 = await WriteSingleEvent("ES1", 2, "bla1", now.AddMinutes(-11), token: token);
+		_r24 = await WriteSingleEvent("ES2", 2, "bla1", now.AddMinutes(-10), token: token);
+
+		_r15 = await WriteSingleEvent("ES1", 3, "bla1", now.AddMinutes(-5), token: token);
+		_r16 = await WriteSingleEvent("ES1", 4, "bla1", now.AddMinutes(-2), token: token);
+
+		_r25 = await WriteSingleEvent("ES2", 3, "bla1", now.AddMinutes(-1), token: token);
+		_r26 = await WriteSingleEvent("ES2", 4, "bla1", now.AddMinutes(-1), token: token);
+	}
+
+	[Test]
+	public async Task single_event_read_doesnt_return_stream_created_event_for_both_streams() {
+		var result = await ReadIndex.ReadEvent("ES1", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES2", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task single_event_read_doesnt_return_expired_events_and_returns_all_actual_ones_for_stream_1() {
+		var result = await ReadIndex.ReadEvent("ES1", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES1", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r13, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES1", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r14, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES1", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r15, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES1", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r16, result.Record);
+	}
+
+	[Test]
+	public async Task single_event_read_doesnt_return_expired_events_and_returns_all_actual_ones_for_stream_2() {
+		var result = await ReadIndex.ReadEvent("ES2", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES2", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES2", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES2", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r25, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES2", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r26, result.Record);
+	}
+
+	[Test]
+	public async Task forward_range_read_doesnt_return_expired_records_for_stream_1() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES1", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(4, result.Records.Length);
+		Assert.AreEqual(_r13, result.Records[0]);
+		Assert.AreEqual(_r14, result.Records[1]);
+		Assert.AreEqual(_r15, result.Records[2]);
+		Assert.AreEqual(_r16, result.Records[3]);
+	}
+
+	[Test]
+	public async Task forward_range_read_doesnt_return_expired_records_for_stream_2() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES2", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_r25, result.Records[0]);
+		Assert.AreEqual(_r26, result.Records[1]);
+	}
+
+	[Test]
+	public async Task backward_range_read_doesnt_return_expired_records_for_stream_1() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES1", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(4, result.Records.Length);
+		Assert.AreEqual(_r16, result.Records[0]);
+		Assert.AreEqual(_r15, result.Records[1]);
+		Assert.AreEqual(_r14, result.Records[2]);
+		Assert.AreEqual(_r13, result.Records[3]);
+	}
+
+	[Test]
+	public async Task backward_range_read_doesnt_return_expired_records_for_stream_2() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES2", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_r26, result.Records[0]);
+		Assert.AreEqual(_r25, result.Records[1]);
+	}
+
+	[Test]
+	public async Task read_all_forward_returns_all_records_including_expired_ones() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(12, records.Count);
+		Assert.AreEqual(_r11, records[0].Event);
+		Assert.AreEqual(_r21, records[1].Event);
+
+		Assert.AreEqual(_r12, records[2].Event);
+		Assert.AreEqual(_r13, records[3].Event);
+
+		Assert.AreEqual(_r22, records[4].Event);
+		Assert.AreEqual(_r23, records[5].Event);
+
+		Assert.AreEqual(_r14, records[6].Event);
+		Assert.AreEqual(_r24, records[7].Event);
+
+		Assert.AreEqual(_r15, records[8].Event);
+		Assert.AreEqual(_r16, records[9].Event);
+
+		Assert.AreEqual(_r25, records[10].Event);
+		Assert.AreEqual(_r26, records[11].Event);
+	}
+
+	[Test]
+	public async Task read_all_backward_returns_all_records_including_expired_ones() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None)).EventRecords();
+		Assert.AreEqual(12, records.Count);
+		Assert.AreEqual(_r11, records[11].Event);
+		Assert.AreEqual(_r21, records[10].Event);
+
+		Assert.AreEqual(_r12, records[9].Event);
+		Assert.AreEqual(_r13, records[8].Event);
+
+		Assert.AreEqual(_r22, records[7].Event);
+		Assert.AreEqual(_r23, records[6].Event);
+
+		Assert.AreEqual(_r14, records[5].Event);
+		Assert.AreEqual(_r24, records[4].Event);
+
+		Assert.AreEqual(_r15, records[3].Event);
+		Assert.AreEqual(_r16, records[2].Event);
+
+		Assert.AreEqual(_r25, records[1].Event);
+		Assert.AreEqual(_r26, records[0].Event);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_both_maxage_and_maxcount_specified_with_maxage_more_strict.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_both_maxage_and_maxcount_specified_with_maxage_more_strict.cs
new file mode 100644
index 00000000000..b86947adaa2
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_both_maxage_and_maxcount_specified_with_maxage_more_strict.cs
@@ -0,0 +1,102 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_having_stream_both_maxage_and_maxcount_specified_with_maxage_more_strict<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r1;
+	private EventRecord _r2;
+	private EventRecord _r3;
+	private EventRecord _r4;
+	private EventRecord _r5;
+	private EventRecord _r6;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+
+		var metadata = string.Format(@"{{""$maxAge"":{0},""$maxCount"":4}}",
+			(int)TimeSpan.FromMinutes(10).TotalSeconds);
+		_r1 = await WriteStreamMetadata("ES", 0, metadata, token: token);
+		_r2 = await WriteSingleEvent("ES", 0, "bla1", now.AddMinutes(-50), token: token);
+		_r3 = await WriteSingleEvent("ES", 1, "bla1", now.AddMinutes(-20), token: token);
+		_r4 = await WriteSingleEvent("ES", 2, "bla1", now.AddMinutes(-11), token: token);
+		_r5 = await WriteSingleEvent("ES", 3, "bla1", now.AddMinutes(-5), token: token);
+		_r6 = await WriteSingleEvent("ES", 4, "bla1", now.AddMinutes(-1), token: token);
+	}
+
+	[Test]
+	public async Task single_event_read_doesnt_return_expired_events_and_returns_all_actual_ones() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r5, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r6, result.Record);
+	}
+
+	[Test]
+	public async Task forward_range_read_doesnt_return_expired_records() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_r5, result.Records[0]);
+		Assert.AreEqual(_r6, result.Records[1]);
+	}
+
+	[Test]
+	public async Task backward_range_read_doesnt_return_expired_records() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_r6, result.Records[0]);
+		Assert.AreEqual(_r5, result.Records[1]);
+	}
+
+	[Test]
+	public async Task read_all_forward_returns_all_records_including_expired_ones() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r1, records[0].Event);
+		Assert.AreEqual(_r2, records[1].Event);
+		Assert.AreEqual(_r3, records[2].Event);
+		Assert.AreEqual(_r4, records[3].Event);
+		Assert.AreEqual(_r5, records[4].Event);
+		Assert.AreEqual(_r6, records[5].Event);
+	}
+
+	[Test]
+	public async Task read_all_backward_returns_all_records_including_expired_ones() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r6, records[0].Event);
+		Assert.AreEqual(_r5, records[1].Event);
+		Assert.AreEqual(_r4, records[2].Event);
+		Assert.AreEqual(_r3, records[3].Event);
+		Assert.AreEqual(_r2, records[4].Event);
+		Assert.AreEqual(_r1, records[5].Event);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_both_maxage_and_maxcount_specified_with_maxcount_more_strict.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_both_maxage_and_maxcount_specified_with_maxcount_more_strict.cs
new file mode 100644
index 00000000000..5144c55f08e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_both_maxage_and_maxcount_specified_with_maxcount_more_strict.cs
@@ -0,0 +1,104 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_having_stream_both_maxage_and_maxcount_specified_with_maxcount_more_strict<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r1;
+	private EventRecord _r2;
+	private EventRecord _r3;
+	private EventRecord _r4;
+	private EventRecord _r5;
+	private EventRecord _r6;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+		var metadata = string.Format(@"{{""$maxAge"":{0},""$maxCount"":3}}",
+			(int)TimeSpan.FromMinutes(60).TotalSeconds);
+		_r1 = await WriteStreamMetadata("ES", 0, metadata, token: token);
+		_r2 = await WriteSingleEvent("ES", 0, "bla1", now.AddMinutes(-100), token: token);
+		_r3 = await WriteSingleEvent("ES", 1, "bla1", now.AddMinutes(-20), token: token);
+		_r4 = await WriteSingleEvent("ES", 2, "bla1", now.AddMinutes(-11), token: token);
+		_r5 = await WriteSingleEvent("ES", 3, "bla1", now.AddMinutes(-5), token: token);
+		_r6 = await WriteSingleEvent("ES", 4, "bla1", now.AddMinutes(-1), token: token);
+	}
+
+	[Test]
+	public async Task single_event_read_doesnt_return_expired_events_and_returns_all_actual_ones() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r4, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r5, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r6, result.Record);
+	}
+
+	[Test]
+	public async Task forward_range_read_doesnt_return_expired_records() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_r4, result.Records[0]);
+		Assert.AreEqual(_r5, result.Records[1]);
+		Assert.AreEqual(_r6, result.Records[2]);
+	}
+
+	[Test]
+	public async Task backward_range_read_doesnt_return_expired_records() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_r6, result.Records[0]);
+		Assert.AreEqual(_r5, result.Records[1]);
+		Assert.AreEqual(_r4, result.Records[2]);
+	}
+
+	[Test]
+	public async Task read_all_forward_returns_all_records_including_expired_ones() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r1, records[0].Event);
+		Assert.AreEqual(_r2, records[1].Event);
+		Assert.AreEqual(_r3, records[2].Event);
+		Assert.AreEqual(_r4, records[3].Event);
+		Assert.AreEqual(_r5, records[4].Event);
+		Assert.AreEqual(_r6, records[5].Event);
+	}
+
+	[Test]
+	public async Task read_all_backward_returns_all_records_including_expired_ones() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r6, records[0].Event);
+		Assert.AreEqual(_r5, records[1].Event);
+		Assert.AreEqual(_r4, records[2].Event);
+		Assert.AreEqual(_r3, records[3].Event);
+		Assert.AreEqual(_r2, records[4].Event);
+		Assert.AreEqual(_r1, records[5].Event);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_maxage_specified.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_maxage_specified.cs
new file mode 100644
index 00000000000..78af3e871cc
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_maxage_specified.cs
@@ -0,0 +1,100 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_having_stream_with_maxage_specified<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r1;
+	private EventRecord _r2;
+	private EventRecord _r3;
+	private EventRecord _r4;
+	private EventRecord _r5;
+	private EventRecord _r6;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+
+		var metadata = string.Format(@"{{""$maxAge"":{0}}}", (int)TimeSpan.FromMinutes(10).TotalSeconds);
+		_r1 = await WriteStreamMetadata("ES", 0, metadata, token: token);
+		_r2 = await WriteSingleEvent("ES", 0, "bla1", now.AddMinutes(-50), token: token);
+		_r3 = await WriteSingleEvent("ES", 1, "bla1", now.AddMinutes(-20), token: token);
+		_r4 = await WriteSingleEvent("ES", 2, "bla1", now.AddMinutes(-11), token: token);
+		_r5 = await WriteSingleEvent("ES", 3, "bla1", now.AddMinutes(-5), token: token);
+		_r6 = await WriteSingleEvent("ES", 4, "bla1", now.AddMinutes(-1), token: token);
+	}
+
+	[Test]
+	public async Task single_event_read_doesnt_return_expired_events_and_returns_all_actual_ones() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r5, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r6, result.Record);
+	}
+
+	[Test]
+	public async Task forward_range_read_doesnt_return_expired_records() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_r5, result.Records[0]);
+		Assert.AreEqual(_r6, result.Records[1]);
+	}
+
+	[Test]
+	public async Task backward_range_read_doesnt_return_expired_records() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_r6, result.Records[0]);
+		Assert.AreEqual(_r5, result.Records[1]);
+	}
+
+	[Test]
+	public async Task read_all_forward_returns_all_records_including_expired_ones() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r1, records[0].Event);
+		Assert.AreEqual(_r2, records[1].Event);
+		Assert.AreEqual(_r3, records[2].Event);
+		Assert.AreEqual(_r4, records[3].Event);
+		Assert.AreEqual(_r5, records[4].Event);
+		Assert.AreEqual(_r6, records[5].Event);
+	}
+
+	[Test]
+	public async Task read_all_backward_returns_all_records_including_expired_ones() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None)).EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r6, records[0].Event);
+		Assert.AreEqual(_r5, records[1].Event);
+		Assert.AreEqual(_r4, records[2].Event);
+		Assert.AreEqual(_r3, records[3].Event);
+		Assert.AreEqual(_r2, records[4].Event);
+		Assert.AreEqual(_r1, records[5].Event);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_maxcount_specified.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_maxcount_specified.cs
new file mode 100644
index 00000000000..c50cdd57874
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_maxcount_specified.cs
@@ -0,0 +1,103 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_having_stream_with_maxcount_specified<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r1;
+	private EventRecord _r2;
+	private EventRecord _r3;
+	private EventRecord _r4;
+	private EventRecord _r5;
+	private EventRecord _r6;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		const string metadata = @"{""$maxCount"":4}";
+
+		_r1 = await WriteStreamMetadata("ES", 0, metadata, token: token);
+		_r2 = await WriteSingleEvent("ES", 0, "bla1", token: token);
+		_r3 = await WriteSingleEvent("ES", 1, "bla1", token: token);
+		_r4 = await WriteSingleEvent("ES", 2, "bla1", token: token);
+		_r5 = await WriteSingleEvent("ES", 3, "bla1", token: token);
+		_r6 = await WriteSingleEvent("ES", 4, "bla1", token: token);
+	}
+
+	[Test]
+	public async Task single_event_read_doesnt_return_old_events_and_return_actual_ones() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r3, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r4, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r5, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r6, result.Record);
+	}
+
+	[Test]
+	public async Task forward_range_read_doesnt_return_old_records() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(4, result.Records.Length);
+		Assert.AreEqual(_r3, result.Records[0]);
+		Assert.AreEqual(_r4, result.Records[1]);
+		Assert.AreEqual(_r5, result.Records[2]);
+		Assert.AreEqual(_r6, result.Records[3]);
+	}
+
+	[Test]
+	public async Task backward_range_read_doesnt_return_expired_records() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(4, result.Records.Length);
+		Assert.AreEqual(_r6, result.Records[0]);
+		Assert.AreEqual(_r5, result.Records[1]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r3, result.Records[3]);
+	}
+
+	[Test]
+	public async Task read_all_forward_returns_all_records_including_expired_ones() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r1, records[0].Event);
+		Assert.AreEqual(_r2, records[1].Event);
+		Assert.AreEqual(_r3, records[2].Event);
+		Assert.AreEqual(_r4, records[3].Event);
+		Assert.AreEqual(_r5, records[4].Event);
+		Assert.AreEqual(_r6, records[5].Event);
+	}
+
+	[Test]
+	public async Task read_all_backward_returns_all_records_including_expired_ones() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r6, records[0].Event);
+		Assert.AreEqual(_r5, records[1].Event);
+		Assert.AreEqual(_r4, records[2].Event);
+		Assert.AreEqual(_r3, records[3].Event);
+		Assert.AreEqual(_r2, records[4].Event);
+		Assert.AreEqual(_r1, records[5].Event);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_maxcount_specified_and_long_transactions_written.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_maxcount_specified_and_long_transactions_written.cs
new file mode 100644
index 00000000000..95f3c82b893
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_maxcount_specified_and_long_transactions_written.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class when_having_stream_with_maxcount_specified_and_long_transactions_written<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord[] _records;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		const string metadata = @"{""$maxCount"":2}";
+
+		_records = new EventRecord[9]; // 3 + 2 + 4
+		await WriteStreamMetadata("ES", 0, metadata, token: token);
+
+		await WriteTransaction(-1, 3, token);
+		await WriteTransaction(2, 2, token);
+		await WriteTransaction(-1 + 3 + 2, 4, token);
+	}
+
+	private async ValueTask WriteTransaction(long expectedVersion, int transactionLength, CancellationToken token) {
+		var begin = await WriteTransactionBegin("ES", expectedVersion, token);
+		for (int i = 0; i < transactionLength; ++i) {
+			var eventNumber = expectedVersion + i + 1;
+			_records[eventNumber] = await WriteTransactionEvent(Guid.NewGuid(), begin.LogPosition, i, "ES", eventNumber,
+				"data" + i, PrepareFlags.Data, token: token);
+		}
+
+		await WriteTransactionEnd(Guid.NewGuid(), begin.LogPosition, "ES", token);
+		await WriteCommit(Guid.NewGuid(), begin.LogPosition, "ES", expectedVersion + 1, token);
+	}
+
+	[Test]
+	public async Task forward_range_read_returns_last_transaction_events_and_doesnt_return_expired_ones() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_records[7], result.Records[0]);
+		Assert.AreEqual(_records[8], result.Records[1]);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_truncatebefore_specified.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_truncatebefore_specified.cs
new file mode 100644
index 00000000000..a691f4674f0
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/when_having_stream_with_truncatebefore_specified.cs
@@ -0,0 +1,101 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_having_stream_with_truncatebefore_specified<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r1;
+	private EventRecord _r2;
+	private EventRecord _r3;
+	private EventRecord _r4;
+	private EventRecord _r5;
+	private EventRecord _r6;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		const string metadata = @"{""$tb"":2}";
+
+		_r1 = await WriteStreamMetadata("ES", 0, metadata, token: token);
+		_r2 = await WriteSingleEvent("ES", 0, "bla1", token: token);
+		_r3 = await WriteSingleEvent("ES", 1, "bla1", token: token);
+		_r4 = await WriteSingleEvent("ES", 2, "bla1", token: token);
+		_r5 = await WriteSingleEvent("ES", 3, "bla1", token: token);
+		_r6 = await WriteSingleEvent("ES", 4, "bla1", token: token);
+	}
+
+	[Test]
+	public async Task single_event_read_doesnt_return_old_events_and_return_actual_ones() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r4, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r5, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r6, result.Record);
+	}
+
+	[Test]
+	public async Task forward_range_read_doesnt_return_old_records() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_r4, result.Records[0]);
+		Assert.AreEqual(_r5, result.Records[1]);
+		Assert.AreEqual(_r6, result.Records[2]);
+	}
+
+	[Test]
+	public async Task backward_range_read_doesnt_return_expired_records() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_r6, result.Records[0]);
+		Assert.AreEqual(_r5, result.Records[1]);
+		Assert.AreEqual(_r4, result.Records[2]);
+	}
+
+	[Test]
+	public async Task read_all_forward_returns_all_records_including_expired_ones() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r1, records[0].Event);
+		Assert.AreEqual(_r2, records[1].Event);
+		Assert.AreEqual(_r3, records[2].Event);
+		Assert.AreEqual(_r4, records[3].Event);
+		Assert.AreEqual(_r5, records[4].Event);
+		Assert.AreEqual(_r6, records[5].Event);
+	}
+
+	[Test]
+	public async Task read_all_backward_returns_all_records_including_expired_ones() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r6, records[0].Event);
+		Assert.AreEqual(_r5, records[1].Event);
+		Assert.AreEqual(_r4, records[2].Event);
+		Assert.AreEqual(_r3, records[3].Event);
+		Assert.AreEqual(_r2, records[4].Event);
+		Assert.AreEqual(_r1, records[5].Event);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_big_max_age.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_big_max_age.cs
new file mode 100644
index 00000000000..0afd1a07359
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_big_max_age.cs
@@ -0,0 +1,116 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_big_max_age<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r1;
+	private EventRecord _r2;
+	private EventRecord _r3;
+	private EventRecord _r4;
+	private EventRecord _r5;
+	private EventRecord _r6;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+
+		const string metadata = @"{""$maxAge"":2147483647}"; //int.maxValue
+
+		_r1 = await WriteStreamMetadata("ES", 0, metadata, now.AddSeconds(-100), token: token);
+		_r2 = await WriteSingleEvent("ES", 0, "bla1", now.AddSeconds(-50), token: token);
+		_r3 = await WriteSingleEvent("ES", 1, "bla1", now.AddSeconds(-20), token: token);
+		_r4 = await WriteSingleEvent("ES", 2, "bla1", now.AddSeconds(-11), token: token);
+		_r5 = await WriteSingleEvent("ES", 3, "bla1", now.AddSeconds(-5), token: token);
+		_r6 = await WriteSingleEvent("ES", 4, "bla1", now.AddSeconds(-1), token: token);
+	}
+
+	[Test]
+	public async Task metastream_read_returns_metaevent() {
+		var result = await ReadIndex.ReadEvent(SystemStreams.MetastreamOf("ES"), 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r1, result.Record);
+	}
+
+	[Test]
+	public async Task single_event_read_returns_all_records() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r2, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r3, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r4, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r5, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r6, result.Record);
+	}
+
+	[Test]
+	public async Task forward_range_read_returns_all_records() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+		Assert.AreEqual(_r2, result.Records[0]);
+		Assert.AreEqual(_r3, result.Records[1]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r5, result.Records[3]);
+		Assert.AreEqual(_r6, result.Records[4]);
+	}
+
+	[Test]
+	public async Task backward_range_read_returns_all_records() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+		Assert.AreEqual(_r2, result.Records[4]);
+		Assert.AreEqual(_r3, result.Records[3]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r5, result.Records[1]);
+		Assert.AreEqual(_r6, result.Records[0]);
+	}
+
+	[Test]
+	public async Task read_all_forward_returns_all_records() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r1, records[0].Event);
+		Assert.AreEqual(_r2, records[1].Event);
+		Assert.AreEqual(_r3, records[2].Event);
+		Assert.AreEqual(_r4, records[3].Event);
+		Assert.AreEqual(_r5, records[4].Event);
+		Assert.AreEqual(_r6, records[5].Event);
+	}
+
+	[Test]
+	public async Task read_all_backward_returns_all_records() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r6, records[0].Event);
+		Assert.AreEqual(_r5, records[1].Event);
+		Assert.AreEqual(_r4, records[2].Event);
+		Assert.AreEqual(_r3, records[3].Event);
+		Assert.AreEqual(_r2, records[4].Event);
+		Assert.AreEqual(_r1, records[5].Event);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_big_max_count.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_big_max_count.cs
new file mode 100644
index 00000000000..d7496f6a9b1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_big_max_count.cs
@@ -0,0 +1,115 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_big_max_count<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r1;
+	private EventRecord _r2;
+	private EventRecord _r3;
+	private EventRecord _r4;
+	private EventRecord _r5;
+	private EventRecord _r6;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+
+		const string metadata = @"{""$maxCount"":2147483647}"; //int.maxValue
+
+		_r1 = await WriteStreamMetadata("ES", 0, metadata, now.AddSeconds(-100), token: token);
+		_r2 = await WriteSingleEvent("ES", 0, "bla1", now.AddSeconds(-50), token: token);
+		_r3 = await WriteSingleEvent("ES", 1, "bla1", now.AddSeconds(-20), token: token);
+		_r4 = await WriteSingleEvent("ES", 2, "bla1", now.AddSeconds(-11), token: token);
+		_r5 = await WriteSingleEvent("ES", 3, "bla1", now.AddSeconds(-5), token: token);
+		_r6 = await WriteSingleEvent("ES", 4, "bla1", now.AddSeconds(-1), token: token);
+	}
+
+	[Test]
+	public async Task metastream_read_returns_metaevent() {
+		var result = await ReadIndex.ReadEvent(SystemStreams.MetastreamOf("ES"), 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r1, result.Record);
+	}
+
+	[Test]
+	public async Task single_event_read_returns_all_records() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r2, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r3, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r4, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r5, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r6, result.Record);
+	}
+
+	[Test]
+	public async Task forward_range_read_returns_all_records() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+		Assert.AreEqual(_r2, result.Records[0]);
+		Assert.AreEqual(_r3, result.Records[1]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r5, result.Records[3]);
+		Assert.AreEqual(_r6, result.Records[4]);
+	}
+
+	[Test]
+	public async Task backward_range_read_returns_all_records() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+		Assert.AreEqual(_r2, result.Records[4]);
+		Assert.AreEqual(_r3, result.Records[3]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r5, result.Records[1]);
+		Assert.AreEqual(_r6, result.Records[0]);
+	}
+
+	[Test]
+	public async Task read_all_forward_returns_all_records() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r1, records[0].Event);
+		Assert.AreEqual(_r2, records[1].Event);
+		Assert.AreEqual(_r3, records[2].Event);
+		Assert.AreEqual(_r4, records[3].Event);
+		Assert.AreEqual(_r5, records[4].Event);
+		Assert.AreEqual(_r6, records[5].Event);
+	}
+
+	[Test]
+	public async Task read_all_backward_returns_all_records() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None)).EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r6, records[0].Event);
+		Assert.AreEqual(_r5, records[1].Event);
+		Assert.AreEqual(_r4, records[2].Event);
+		Assert.AreEqual(_r3, records[3].Event);
+		Assert.AreEqual(_r2, records[4].Event);
+		Assert.AreEqual(_r1, records[5].Event);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_big_start_from.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_big_start_from.cs
new file mode 100644
index 00000000000..af49b2e9305
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_big_start_from.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_softdelete_truncatebefore<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r1;
+	private EventRecord _r2;
+	private EventRecord _r3;
+	private EventRecord _r4;
+	private EventRecord _r5;
+	private EventRecord _r6;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+
+		const string metadata = @"{""$tb"":9223372036854775807}"; //long.maxValue
+
+		_r1 = await WriteStreamMetadata("ES", 0, metadata, now.AddSeconds(-100), token: token);
+		_r2 = await WriteSingleEvent("ES", 0, "bla1", now.AddSeconds(-50), token: token);
+		_r3 = await WriteSingleEvent("ES", 1, "bla1", now.AddSeconds(-20), token: token);
+		_r4 = await WriteSingleEvent("ES", 2, "bla1", now.AddSeconds(-11), token: token);
+		_r5 = await WriteSingleEvent("ES", 3, "bla1", now.AddSeconds(-5), token: token);
+		_r6 = await WriteSingleEvent("ES", 4, "bla1", now.AddSeconds(-1), token: token);
+	}
+
+	[Test]
+	public async Task metastream_read_returns_metaevent() {
+		var result = await ReadIndex.ReadEvent(SystemStreams.MetastreamOf("ES"), 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r1, result.Record);
+	}
+
+	[Test]
+	public async Task single_event_read_returns_no_records() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task forward_range_read_returns_no_records() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task backward_range_read_returns_no_records() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.NoStream, result.Result);
+		Assert.AreEqual(0, result.Records.Length);
+	}
+
+	[Test]
+	public async Task read_all_forward_returns_all_records() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r1, records[0].Event);
+		Assert.AreEqual(_r2, records[1].Event);
+		Assert.AreEqual(_r3, records[2].Event);
+		Assert.AreEqual(_r4, records[3].Event);
+		Assert.AreEqual(_r5, records[4].Event);
+		Assert.AreEqual(_r6, records[5].Event);
+	}
+
+	[Test]
+	public async Task read_all_backward_returns_all_records() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r6, records[0].Event);
+		Assert.AreEqual(_r5, records[1].Event);
+		Assert.AreEqual(_r4, records[2].Event);
+		Assert.AreEqual(_r3, records[3].Event);
+		Assert.AreEqual(_r2, records[4].Event);
+		Assert.AreEqual(_r1, records[5].Event);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_invalid_max_age_and_normal_max_count.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_invalid_max_age_and_normal_max_count.cs
new file mode 100644
index 00000000000..524c1f13623
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_invalid_max_age_and_normal_max_count.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount;
+
+[TestFixture]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_invalid_max_age_and_normal_max_count<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r1;
+	private EventRecord _r2;
+	private EventRecord _r3;
+	private EventRecord _r4;
+	private EventRecord _r5;
+	private EventRecord _r6;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+
+		const string metadata = @"{""$maxAge"": 1.5, ""$maxCount"":4}";
+
+		_r1 = await WriteStreamMetadata("ES", 0, metadata, token: token);
+		_r2 = await WriteSingleEvent("ES", 0, "bla1", now.AddSeconds(-50), token: token);
+		_r3 = await WriteSingleEvent("ES", 1, "bla1", now.AddSeconds(-20), token: token);
+		_r4 = await WriteSingleEvent("ES", 2, "bla1", now.AddSeconds(-11), token: token);
+		_r5 = await WriteSingleEvent("ES", 3, "bla1", now.AddSeconds(-5), token: token);
+		_r6 = await WriteSingleEvent("ES", 4, "bla1", now.AddSeconds(-1), token: token);
+	}
+
+	[Test]
+	public async Task on_single_event_read_all_metadata_is_ignored() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r2, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r3, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r4, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r5, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r6, result.Record);
+	}
+
+	[Test]
+	public async Task on_forward_range_read_metadata_is_ignored() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+		Assert.AreEqual(_r2, result.Records[0]);
+		Assert.AreEqual(_r3, result.Records[1]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r5, result.Records[3]);
+		Assert.AreEqual(_r6, result.Records[4]);
+	}
+
+	[Test]
+	public async Task on_backward_range_read_metadata_is_ignored() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+		Assert.AreEqual(_r6, result.Records[0]);
+		Assert.AreEqual(_r5, result.Records[1]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r3, result.Records[3]);
+		Assert.AreEqual(_r2, result.Records[4]);
+	}
+
+	[Test]
+	public async Task on_read_all_forward_metadata_is_ignored() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.Records;
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
+			Assert.AreEqual(6, records.Count);
+			Assert.AreEqual(_r1, records[0].Event);
+			Assert.AreEqual(_r2, records[1].Event);
+			Assert.AreEqual(_r3, records[2].Event);
+			Assert.AreEqual(_r4, records[3].Event);
+			Assert.AreEqual(_r5, records[4].Event);
+			Assert.AreEqual(_r6, records[5].Event);
+		} else {
+			Assert.AreEqual(8, records.Count);
+			Assert.AreEqual("$stream", records[0].Event.EventType);
+			Assert.AreEqual(_r1, records[1].Event); // metadata
+			Assert.AreEqual("$event-type", records[2].Event.EventType);
+			Assert.AreEqual(_r2, records[3].Event);
+			Assert.AreEqual(_r3, records[4].Event);
+			Assert.AreEqual(_r4, records[5].Event);
+			Assert.AreEqual(_r5, records[6].Event);
+			Assert.AreEqual(_r6, records[7].Event);
+		}
+	}
+
+	[Test]
+	public async Task on_read_all_backward_metadata_is_ignored() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.Records;
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
+			Assert.AreEqual(6, records.Count);
+			Assert.AreEqual(_r6, records[0].Event);
+			Assert.AreEqual(_r5, records[1].Event);
+			Assert.AreEqual(_r4, records[2].Event);
+			Assert.AreEqual(_r3, records[3].Event);
+			Assert.AreEqual(_r2, records[4].Event);
+			Assert.AreEqual(_r1, records[5].Event);
+		} else {
+			Assert.AreEqual(8, records.Count);
+			Assert.AreEqual(_r6, records[0].Event);
+			Assert.AreEqual(_r5, records[1].Event);
+			Assert.AreEqual(_r4, records[2].Event);
+			Assert.AreEqual(_r3, records[3].Event);
+			Assert.AreEqual(_r2, records[4].Event);
+			Assert.AreEqual("$event-type", records[5].Event.EventType);
+			Assert.AreEqual(_r1, records[6].Event); // metadata
+			Assert.AreEqual("$stream", records[7].Event.EventType);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_invalid_max_count_and_normal_max_age.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_invalid_max_count_and_normal_max_age.cs
new file mode 100644
index 00000000000..326ac16d1fa
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_invalid_max_count_and_normal_max_age.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount;
+
+[TestFixture]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_invalid_max_count_and_normal_max_age<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r1;
+	private EventRecord _r2;
+	private EventRecord _r3;
+	private EventRecord _r4;
+	private EventRecord _r5;
+	private EventRecord _r6;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+
+		const string metadata = @"{""$maxAge"":21,""$maxCount"":2.1}";
+
+		_r1 = await WriteStreamMetadata("ES", 0, metadata, token: token);
+		_r2 = await WriteSingleEvent("ES", 0, "bla1", now.AddSeconds(-50), token: token);
+		_r3 = await WriteSingleEvent("ES", 1, "bla1", now.AddSeconds(-20), token: token);
+		_r4 = await WriteSingleEvent("ES", 2, "bla1", now.AddSeconds(-11), token: token);
+		_r5 = await WriteSingleEvent("ES", 3, "bla1", now.AddSeconds(-5), token: token);
+		_r6 = await WriteSingleEvent("ES", 4, "bla1", now.AddSeconds(-1), token: token);
+	}
+
+	[Test]
+	public async Task on_single_event_read_metadata_is_ignored() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r2, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r3, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r4, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r5, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r6, result.Record);
+	}
+
+	[Test]
+	public async Task on_forward_range_read_metadata_is_ignored() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+		Assert.AreEqual(_r2, result.Records[0]);
+		Assert.AreEqual(_r3, result.Records[1]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r5, result.Records[3]);
+		Assert.AreEqual(_r6, result.Records[4]);
+	}
+
+	[Test]
+	public async Task on_backward_range_read_metadata_is_ignored() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+		Assert.AreEqual(_r6, result.Records[0]);
+		Assert.AreEqual(_r5, result.Records[1]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r3, result.Records[3]);
+		Assert.AreEqual(_r2, result.Records[4]);
+	}
+
+	[Test]
+	public async Task on_read_all_forward_metadata_is_ignored() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.Records;
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
+			Assert.AreEqual(6, records.Count);
+			Assert.AreEqual(_r1, records[0].Event);
+			Assert.AreEqual(_r2, records[1].Event);
+			Assert.AreEqual(_r3, records[2].Event);
+			Assert.AreEqual(_r4, records[3].Event);
+			Assert.AreEqual(_r5, records[4].Event);
+			Assert.AreEqual(_r6, records[5].Event);
+		} else {
+			Assert.AreEqual(8, records.Count);
+			Assert.AreEqual("$stream", records[0].Event.EventType);
+			Assert.AreEqual(_r1, records[1].Event); // metadata
+			Assert.AreEqual("$event-type", records[2].Event.EventType);
+			Assert.AreEqual(_r2, records[3].Event);
+			Assert.AreEqual(_r3, records[4].Event);
+			Assert.AreEqual(_r4, records[5].Event);
+			Assert.AreEqual(_r5, records[6].Event);
+			Assert.AreEqual(_r6, records[7].Event);
+		}
+	}
+
+	[Test]
+	public async Task on_read_all_backward_metadata_is_ignored() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.Records;
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
+			Assert.AreEqual(6, records.Count);
+			Assert.AreEqual(_r6, records[0].Event);
+			Assert.AreEqual(_r5, records[1].Event);
+			Assert.AreEqual(_r4, records[2].Event);
+			Assert.AreEqual(_r3, records[3].Event);
+			Assert.AreEqual(_r2, records[4].Event);
+			Assert.AreEqual(_r1, records[5].Event);
+		} else {
+			Assert.AreEqual(8, records.Count);
+			Assert.AreEqual(_r6, records[0].Event);
+			Assert.AreEqual(_r5, records[1].Event);
+			Assert.AreEqual(_r4, records[2].Event);
+			Assert.AreEqual(_r3, records[3].Event);
+			Assert.AreEqual(_r2, records[4].Event);
+			Assert.AreEqual("$event-type", records[5].Event.EventType);
+			Assert.AreEqual(_r1, records[6].Event); // metadata
+			Assert.AreEqual("$stream", records[7].Event.EventType);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_invalid_metadata.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_invalid_metadata.cs
new file mode 100644
index 00000000000..51c872b8f38
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_invalid_metadata.cs
@@ -0,0 +1,108 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_invalid_metadata<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r1;
+	private EventRecord _r2;
+	private EventRecord _r3;
+	private EventRecord _r4;
+	private EventRecord _r5;
+	private EventRecord _r6;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+
+		const string metadata = @"{""$maxCount"":4,,""$maxAge"":}";
+
+		_r1 = await WriteStreamMetadata("ES", 0, metadata, now.AddSeconds(-100), token: token);
+		_r2 = await WriteSingleEvent("ES", 0, "bla1", now.AddSeconds(-50), token: token);
+		_r3 = await WriteSingleEvent("ES", 1, "bla1", now.AddSeconds(-20), token: token);
+		_r4 = await WriteSingleEvent("ES", 2, "bla1", now.AddSeconds(-11), token: token);
+		_r5 = await WriteSingleEvent("ES", 3, "bla1", now.AddSeconds(-5), token: token);
+		_r6 = await WriteSingleEvent("ES", 4, "bla1", now.AddSeconds(-1), token: token);
+	}
+
+	[Test]
+	public async Task on_single_event_read_all_metadata_is_ignored() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r2, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r3, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r4, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r5, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r6, result.Record);
+	}
+
+	[Test]
+	public async Task on_forward_range_read_all_metadata_is_ignored() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+		Assert.AreEqual(_r2, result.Records[0]);
+		Assert.AreEqual(_r3, result.Records[1]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r5, result.Records[3]);
+		Assert.AreEqual(_r6, result.Records[4]);
+	}
+
+	[Test]
+	public async Task on_backward_range_read_all_metadata_is_ignored() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+		Assert.AreEqual(_r2, result.Records[4]);
+		Assert.AreEqual(_r3, result.Records[3]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r5, result.Records[1]);
+		Assert.AreEqual(_r6, result.Records[0]);
+	}
+
+	[Test]
+	public async Task on_read_all_forward_all_metadata_is_ignored() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r1, records[0].Event);
+		Assert.AreEqual(_r2, records[1].Event);
+		Assert.AreEqual(_r3, records[2].Event);
+		Assert.AreEqual(_r4, records[3].Event);
+		Assert.AreEqual(_r5, records[4].Event);
+		Assert.AreEqual(_r6, records[5].Event);
+	}
+
+	[Test]
+	public async Task on_read_all_backward_all_metadata_is_ignored() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r6, records[0].Event);
+		Assert.AreEqual(_r5, records[1].Event);
+		Assert.AreEqual(_r4, records[2].Event);
+		Assert.AreEqual(_r3, records[3].Event);
+		Assert.AreEqual(_r2, records[4].Event);
+		Assert.AreEqual(_r1, records[5].Event);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_age.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_age.cs
new file mode 100644
index 00000000000..daa47e2d519
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_age.cs
@@ -0,0 +1,108 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_too_big_max_age<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r1;
+	private EventRecord _r2;
+	private EventRecord _r3;
+	private EventRecord _r4;
+	private EventRecord _r5;
+	private EventRecord _r6;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+
+		const string metadata = @"{""$maxAge"":2147483648}"; //int.maxValue + 1
+
+		_r1 = await WriteStreamMetadata("ES", 0, metadata, now.AddSeconds(-100), token: token);
+		_r2 = await WriteSingleEvent("ES", 0, "bla1", now.AddSeconds(-50), token: token);
+		_r3 = await WriteSingleEvent("ES", 1, "bla1", now.AddSeconds(-20), token: token);
+		_r4 = await WriteSingleEvent("ES", 2, "bla1", now.AddSeconds(-11), token: token);
+		_r5 = await WriteSingleEvent("ES", 3, "bla1", now.AddSeconds(-5), token: token);
+		_r6 = await WriteSingleEvent("ES", 4, "bla1", now.AddSeconds(-1), token: token);
+	}
+
+	[Test]
+	public async Task single_event_read_returns_all_records() {
+		var result = (await ReadIndex.ReadEvent("ES", 0, CancellationToken.None));
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r2, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r3, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r4, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r5, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r6, result.Record);
+	}
+
+	[Test]
+	public async Task forward_range_read_returns_all_records() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+		Assert.AreEqual(_r2, result.Records[0]);
+		Assert.AreEqual(_r3, result.Records[1]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r5, result.Records[3]);
+		Assert.AreEqual(_r6, result.Records[4]);
+	}
+
+	[Test]
+	public async Task backward_range_read_returns_all_records() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+		Assert.AreEqual(_r2, result.Records[4]);
+		Assert.AreEqual(_r3, result.Records[3]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r5, result.Records[1]);
+		Assert.AreEqual(_r6, result.Records[0]);
+	}
+
+	[Test]
+	public async Task read_all_forward_returns_all_records() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r1, records[0].Event);
+		Assert.AreEqual(_r2, records[1].Event);
+		Assert.AreEqual(_r3, records[2].Event);
+		Assert.AreEqual(_r4, records[3].Event);
+		Assert.AreEqual(_r5, records[4].Event);
+		Assert.AreEqual(_r6, records[5].Event);
+	}
+
+	[Test]
+	public async Task read_all_backward_returns_all_records() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r6, records[0].Event);
+		Assert.AreEqual(_r5, records[1].Event);
+		Assert.AreEqual(_r4, records[2].Event);
+		Assert.AreEqual(_r3, records[3].Event);
+		Assert.AreEqual(_r2, records[4].Event);
+		Assert.AreEqual(_r1, records[5].Event);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_age_and_normal_max_count.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_age_and_normal_max_count.cs
new file mode 100644
index 00000000000..145eb280b45
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_age_and_normal_max_count.cs
@@ -0,0 +1,109 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_too_big_max_age_and_normal_max_count<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r1;
+	private EventRecord _r2;
+	private EventRecord _r3;
+	private EventRecord _r4;
+	private EventRecord _r5;
+	private EventRecord _r6;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+
+		//i.e. if you pass value > int.maxValue all metadata will be ignored
+		const string metadata = @"{""$maxCount"":2147483648,,""$maxAge"":10}"; //int.maxValue + 1
+
+		_r1 = await WriteStreamMetadata("ES", 0, metadata, now.AddSeconds(-100), token: token);
+		_r2 = await WriteSingleEvent("ES", 0, "bla1", now.AddSeconds(-50), token: token);
+		_r3 = await WriteSingleEvent("ES", 1, "bla1", now.AddSeconds(-20), token: token);
+		_r4 = await WriteSingleEvent("ES", 2, "bla1", now.AddSeconds(-11), token: token);
+		_r5 = await WriteSingleEvent("ES", 3, "bla1", now.AddSeconds(-5), token: token);
+		_r6 = await WriteSingleEvent("ES", 4, "bla1", now.AddSeconds(-1), token: token);
+	}
+
+	[Test]
+	public async Task on_single_event_read_all_metadata_is_ignored() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r2, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r3, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r4, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r5, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r6, result.Record);
+	}
+
+	[Test]
+	public async Task on_forward_range_read_all_metadata_is_ignored() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+		Assert.AreEqual(_r2, result.Records[0]);
+		Assert.AreEqual(_r3, result.Records[1]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r5, result.Records[3]);
+		Assert.AreEqual(_r6, result.Records[4]);
+	}
+
+	[Test]
+	public async Task on_backward_range_read_all_metadata_is_ignored() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+		Assert.AreEqual(_r2, result.Records[4]);
+		Assert.AreEqual(_r3, result.Records[3]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r5, result.Records[1]);
+		Assert.AreEqual(_r6, result.Records[0]);
+	}
+
+	[Test]
+	public async Task on_read_all_forward_all_metadata_is_ignored() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r1, records[0].Event);
+		Assert.AreEqual(_r2, records[1].Event);
+		Assert.AreEqual(_r3, records[2].Event);
+		Assert.AreEqual(_r4, records[3].Event);
+		Assert.AreEqual(_r5, records[4].Event);
+		Assert.AreEqual(_r6, records[5].Event);
+	}
+
+	[Test]
+	public async Task on_read_all_backward_all_metadata_is_ignored() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r6, records[0].Event);
+		Assert.AreEqual(_r5, records[1].Event);
+		Assert.AreEqual(_r4, records[2].Event);
+		Assert.AreEqual(_r3, records[3].Event);
+		Assert.AreEqual(_r2, records[4].Event);
+		Assert.AreEqual(_r1, records[5].Event);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_count.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_count.cs
new file mode 100644
index 00000000000..b1c791bf9f3
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_count.cs
@@ -0,0 +1,108 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_too_big_max_count<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r1;
+	private EventRecord _r2;
+	private EventRecord _r3;
+	private EventRecord _r4;
+	private EventRecord _r5;
+	private EventRecord _r6;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+
+		const string metadata = @"{""$maxCount"":9223372036854775808}"; //long.maxValue + 1
+
+		_r1 = await WriteStreamMetadata("ES", 0, metadata, now.AddSeconds(-100), token: token);
+		_r2 = await WriteSingleEvent("ES", 0, "bla1", now.AddSeconds(-50), token: token);
+		_r3 = await WriteSingleEvent("ES", 1, "bla1", now.AddSeconds(-20), token: token);
+		_r4 = await WriteSingleEvent("ES", 2, "bla1", now.AddSeconds(-11), token: token);
+		_r5 = await WriteSingleEvent("ES", 3, "bla1", now.AddSeconds(-5), token: token);
+		_r6 = await WriteSingleEvent("ES", 4, "bla1", now.AddSeconds(-1), token: token);
+	}
+
+	[Test]
+	public async Task single_event_read_returns_all_records() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r2, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r3, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r4, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r5, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r6, result.Record);
+	}
+
+	[Test]
+	public async Task forward_range_read_returns_all_records() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+		Assert.AreEqual(_r2, result.Records[0]);
+		Assert.AreEqual(_r3, result.Records[1]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r5, result.Records[3]);
+		Assert.AreEqual(_r6, result.Records[4]);
+	}
+
+	[Test]
+	public async Task backward_range_read_returns_all_records() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+		Assert.AreEqual(_r2, result.Records[4]);
+		Assert.AreEqual(_r3, result.Records[3]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r5, result.Records[1]);
+		Assert.AreEqual(_r6, result.Records[0]);
+	}
+
+	[Test]
+	public async Task read_all_forward_returns_all_records() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r1, records[0].Event);
+		Assert.AreEqual(_r2, records[1].Event);
+		Assert.AreEqual(_r3, records[2].Event);
+		Assert.AreEqual(_r4, records[3].Event);
+		Assert.AreEqual(_r5, records[4].Event);
+		Assert.AreEqual(_r6, records[5].Event);
+	}
+
+	[Test]
+	public async Task read_all_backward_returns_all_records() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r6, records[0].Event);
+		Assert.AreEqual(_r5, records[1].Event);
+		Assert.AreEqual(_r4, records[2].Event);
+		Assert.AreEqual(_r3, records[3].Event);
+		Assert.AreEqual(_r2, records[4].Event);
+		Assert.AreEqual(_r1, records[5].Event);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_count_and_normal_max_age.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_count_and_normal_max_age.cs
new file mode 100644
index 00000000000..8a6e6db0bc3
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_max_count_and_normal_max_age.cs
@@ -0,0 +1,111 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_too_big_max_count_and_normal_max_age<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r1;
+	private EventRecord _r2;
+	private EventRecord _r3;
+	private EventRecord _r4;
+	private EventRecord _r5;
+	private EventRecord _r6;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+
+		//i.e. if you pass value > int.maxValue all metadata will be ignored
+		const string
+			metadata =
+				@"{""$maxCount"":4,,""$maxAge"":2147483648}"; //int.maxValue + 1 , js maxvalue is 9007199254740992
+
+		_r1 = await WriteStreamMetadata("ES", 0, metadata, now.AddSeconds(-100), token: token);
+		_r2 = await WriteSingleEvent("ES", 0, "bla1", now.AddSeconds(-50), token: token);
+		_r3 = await WriteSingleEvent("ES", 1, "bla1", now.AddSeconds(-20), token: token);
+		_r4 = await WriteSingleEvent("ES", 2, "bla1", now.AddSeconds(-11), token: token);
+		_r5 = await WriteSingleEvent("ES", 3, "bla1", now.AddSeconds(-5), token: token);
+		_r6 = await WriteSingleEvent("ES", 4, "bla1", now.AddSeconds(-1), token: token);
+	}
+
+	[Test]
+	public async Task on_single_event_read_all_metadata_is_ignored() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r2, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r3, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r4, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r5, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r6, result.Record);
+	}
+
+	[Test]
+	public async Task on_forward_range_read_all_metadata_is_ignored() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+		Assert.AreEqual(_r2, result.Records[0]);
+		Assert.AreEqual(_r3, result.Records[1]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r5, result.Records[3]);
+		Assert.AreEqual(_r6, result.Records[4]);
+	}
+
+	[Test]
+	public async Task on_backward_range_read_all_metadata_is_ignored() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+		Assert.AreEqual(_r2, result.Records[4]);
+		Assert.AreEqual(_r3, result.Records[3]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r5, result.Records[1]);
+		Assert.AreEqual(_r6, result.Records[0]);
+	}
+
+	[Test]
+	public async Task on_read_all_forward_all_metadata_is_ignored() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r1, records[0].Event);
+		Assert.AreEqual(_r2, records[1].Event);
+		Assert.AreEqual(_r3, records[2].Event);
+		Assert.AreEqual(_r4, records[3].Event);
+		Assert.AreEqual(_r5, records[4].Event);
+		Assert.AreEqual(_r6, records[5].Event);
+	}
+
+	[Test]
+	public async Task on_read_all_backward_all_metadata_is_ignored() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r6, records[0].Event);
+		Assert.AreEqual(_r5, records[1].Event);
+		Assert.AreEqual(_r4, records[2].Event);
+		Assert.AreEqual(_r3, records[3].Event);
+		Assert.AreEqual(_r2, records[4].Event);
+		Assert.AreEqual(_r1, records[5].Event);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_start_from.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_start_from.cs
new file mode 100644
index 00000000000..3222c2fcc68
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_too_big_start_from.cs
@@ -0,0 +1,108 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_too_big_truncatebefore<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r1;
+	private EventRecord _r2;
+	private EventRecord _r3;
+	private EventRecord _r4;
+	private EventRecord _r5;
+	private EventRecord _r6;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+
+		const string metadata = @"{""$tb"":9223372036854775808}"; //long.maxValue + 1
+
+		_r1 = await WriteStreamMetadata("ES", 0, metadata, now.AddSeconds(-100), token: token);
+		_r2 = await WriteSingleEvent("ES", 0, "bla1", now.AddSeconds(-50), token: token);
+		_r3 = await WriteSingleEvent("ES", 1, "bla1", now.AddSeconds(-20), token: token);
+		_r4 = await WriteSingleEvent("ES", 2, "bla1", now.AddSeconds(-11), token: token);
+		_r5 = await WriteSingleEvent("ES", 3, "bla1", now.AddSeconds(-5), token: token);
+		_r6 = await WriteSingleEvent("ES", 4, "bla1", now.AddSeconds(-1), token: token);
+	}
+
+	[Test]
+	public async Task single_event_read_returns_all_records() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r2, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r3, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r4, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r5, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r6, result.Record);
+	}
+
+	[Test]
+	public async Task forward_range_read_returns_all_records() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+		Assert.AreEqual(_r2, result.Records[0]);
+		Assert.AreEqual(_r3, result.Records[1]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r5, result.Records[3]);
+		Assert.AreEqual(_r6, result.Records[4]);
+	}
+
+	[Test]
+	public async Task backward_range_read_returns_all_records() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(5, result.Records.Length);
+		Assert.AreEqual(_r2, result.Records[4]);
+		Assert.AreEqual(_r3, result.Records[3]);
+		Assert.AreEqual(_r4, result.Records[2]);
+		Assert.AreEqual(_r5, result.Records[1]);
+		Assert.AreEqual(_r6, result.Records[0]);
+	}
+
+	[Test]
+	public async Task read_all_forward_returns_all_records() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r1, records[0].Event);
+		Assert.AreEqual(_r2, records[1].Event);
+		Assert.AreEqual(_r3, records[2].Event);
+		Assert.AreEqual(_r4, records[3].Event);
+		Assert.AreEqual(_r5, records[4].Event);
+		Assert.AreEqual(_r6, records[5].Event);
+	}
+
+	[Test]
+	public async Task read_all_backward_returns_all_records() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r6, records[0].Event);
+		Assert.AreEqual(_r5, records[1].Event);
+		Assert.AreEqual(_r4, records[2].Event);
+		Assert.AreEqual(_r3, records[3].Event);
+		Assert.AreEqual(_r2, records[4].Event);
+		Assert.AreEqual(_r1, records[5].Event);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_truncatebefore_greater_than_int_maxvalue.cs b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_truncatebefore_greater_than_int_maxvalue.cs
new file mode 100644
index 00000000000..df07f5fc4c8
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/MaxAgeMaxCount/with_truncatebefore_greater_than_int_maxvalue.cs
@@ -0,0 +1,117 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.MaxAgeMaxCount;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_truncatebefore_greater_than_int_maxvalue<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _r1;
+	private EventRecord _r2;
+	private EventRecord _r3;
+	private EventRecord _r4;
+	private EventRecord _r5;
+	private EventRecord _r6;
+
+	private const long first = (long)int.MaxValue + 1;
+	private const long second = (long)int.MaxValue + 2;
+	private const long third = (long)int.MaxValue + 3;
+	private const long fourth = (long)int.MaxValue + 4;
+	private const long fifth = (long)int.MaxValue + 5;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var now = DateTime.UtcNow;
+
+		string metadata = @"{""$tb"":" + third + "}";
+
+		_r1 = await WriteStreamMetadata("ES", 0, metadata, now.AddSeconds(-100), token: token);
+		_r2 = await WriteSingleEvent("ES", first, "bla1", now.AddSeconds(-50), token: token);
+		_r3 = await WriteSingleEvent("ES", second, "bla1", now.AddSeconds(-20), token: token);
+		_r4 = await WriteSingleEvent("ES", third, "bla1", now.AddSeconds(-11), token: token);
+		_r5 = await WriteSingleEvent("ES", fourth, "bla1", now.AddSeconds(-5), token: token);
+		_r6 = await WriteSingleEvent("ES", fifth, "bla1", now.AddSeconds(-1), token: token);
+	}
+
+	[Test]
+	public async Task metastream_read_returns_metaevent() {
+		var result = await ReadIndex.ReadEvent(SystemStreams.MetastreamOf("ES"), 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r1, result.Record);
+	}
+
+	[Test]
+	public async Task single_event_read_returns_records_after_truncate_before() {
+		var result = await ReadIndex.ReadEvent("ES", first, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", second, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", third, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r4, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", fourth, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r5, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", fifth, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_r6, result.Record);
+	}
+
+	[Test]
+	public async Task forward_range_read_returns_records_after_truncate_before() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", first, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_r4, result.Records[0]);
+		Assert.AreEqual(_r5, result.Records[1]);
+		Assert.AreEqual(_r6, result.Records[2]);
+	}
+
+	[Test]
+	public async Task backward_range_read_returns_records_after_truncate_before() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_r6, result.Records[0]);
+		Assert.AreEqual(_r5, result.Records[1]);
+		Assert.AreEqual(_r4, result.Records[2]);
+	}
+
+	[Test]
+	public async Task read_all_forward_returns_all_records() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None)).EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r1, records[0].Event);
+		Assert.AreEqual(_r2, records[1].Event);
+		Assert.AreEqual(_r3, records[2].Event);
+		Assert.AreEqual(_r4, records[3].Event);
+		Assert.AreEqual(_r5, records[4].Event);
+		Assert.AreEqual(_r6, records[5].Event);
+	}
+
+	[Test]
+	public async Task read_all_backward_returns_all_records() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords();
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_r6, records[0].Event);
+		Assert.AreEqual(_r5, records[1].Event);
+		Assert.AreEqual(_r4, records[2].Event);
+		Assert.AreEqual(_r3, records[3].Event);
+		Assert.AreEqual(_r2, records[4].Event);
+		Assert.AreEqual(_r1, records[5].Event);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Metastreams/read_index_result_original_stream_exists_tests.cs b/src/KurrentDB.Core.Tests/Services/Storage/Metastreams/read_index_result_original_stream_exists_tests.cs
new file mode 100644
index 00000000000..e1d7ee7855b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Metastreams/read_index_result_original_stream_exists_tests.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Metastreams;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	read_index_result_original_stream_exists_tests<TLogFormat, TStreamId>
+	: SimpleDbTestScenario<TLogFormat, TStreamId> {
+
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator.Chunk(
+			Rec.Prepare(0, "existing_stream"),
+			Rec.Commit(0, "existing_stream"),
+			Rec.Prepare(1, "$existing_stream"),
+			Rec.Commit(1, "$existing_stream")
+		).CreateDb(token: token);
+	}
+
+	[Test]
+	public async Task original_stream_exists_is_true_when_reading_metastream_for_existing_stream() {
+		var metaStreamName = SystemStreams.MetastreamOf("existing_stream");
+		var metaStreamId = _logFormat.StreamIds.LookupValue(metaStreamName);
+		var read = await ReadIndex.ReadEvent(IndexReader.UnspecifiedStreamName, metaStreamId, 0, CancellationToken.None);
+		Assert.True(read.OriginalStreamExists);
+	}
+
+	[Test]
+	public async Task original_stream_exists_is_false_when_reading_metastream_for_non_existent_stream() {
+		var metaStreamName = SystemStreams.MetastreamOf("non_existent_stream");
+		var metaStreamId = _logFormat.StreamIds.LookupValue(metaStreamName);
+		var read = await ReadIndex.ReadEvent(IndexReader.UnspecifiedStreamName, metaStreamId, 0, CancellationToken.None);
+		Assert.False(read.OriginalStreamExists);
+	}
+
+	[Test]
+	public async Task original_stream_exists_is_null_when_reading_existing_stream() {
+		var streamId = _logFormat.StreamIds.LookupValue("existing_stream");
+		var read = await ReadIndex.ReadEvent(IndexReader.UnspecifiedStreamName, streamId, 0, CancellationToken.None);
+		Assert.IsNull(read.OriginalStreamExists);
+	}
+
+	[Test]
+	public async Task original_stream_exists_is_null_when_reading_non_existent_stream() {
+		var streamId = _logFormat.StreamIds.LookupValue("non_existent_stream");
+		var read = await ReadIndex.ReadEvent(IndexReader.UnspecifiedStreamName, streamId, 0, CancellationToken.None);
+		Assert.IsNull(read.OriginalStreamExists);
+	}
+
+	[Test]
+	public async Task original_stream_exists_is_true_when_reading_metastream_for_existing_system_stream() {
+		var metaStreamName = SystemStreams.MetastreamOf("$existing_stream");
+		var metaStreamId = _logFormat.StreamIds.LookupValue(metaStreamName);
+		var read = await ReadIndex.ReadEvent(IndexReader.UnspecifiedStreamName, metaStreamId, 0, CancellationToken.None);
+		Assert.True(read.OriginalStreamExists);
+	}
+
+	[Test]
+	public async Task original_stream_exists_is_false_when_reading_metastream_for_non_existent_system_stream() {
+		var metaStreamName = SystemStreams.MetastreamOf("$non_existent_stream");
+		var metaStreamId = _logFormat.StreamIds.LookupValue(metaStreamName);
+		var read = await ReadIndex.ReadEvent(IndexReader.UnspecifiedStreamName, metaStreamId, 0, CancellationToken.None);
+		Assert.False(read.OriginalStreamExists);
+	}
+
+	[Test]
+	public async Task original_stream_exists_is_null_when_reading_existing_system_stream() {
+		var streamId = _logFormat.StreamIds.LookupValue("$existing_stream");
+		var read = await ReadIndex.ReadEvent(IndexReader.UnspecifiedStreamName, streamId, 0, CancellationToken.None);
+		Assert.IsNull(read.OriginalStreamExists);
+	}
+
+	[Test]
+	public async Task original_stream_exists_is_null_when_reading_non_existent_system_stream() {
+		var streamId = _logFormat.StreamIds.LookupValue("$non_existent_stream");
+		var read = await ReadIndex.ReadEvent(IndexReader.UnspecifiedStreamName, streamId, 0, CancellationToken.None);
+		Assert.IsNull(read.OriginalStreamExists);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Metastreams/when_having_deleted_stream_and_no_metastream_metastream_is_declared_deleted_as_well.cs b/src/KurrentDB.Core.Tests/Services/Storage/Metastreams/when_having_deleted_stream_and_no_metastream_metastream_is_declared_deleted_as_well.cs
new file mode 100644
index 00000000000..2a4b3911a17
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Metastreams/when_having_deleted_stream_and_no_metastream_metastream_is_declared_deleted_as_well.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Metastreams;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_having_deleted_stream_and_no_metastream_metastream_is_declared_deleted_as_well<TLogFormat, TStreamId>
+	: SimpleDbTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator.Chunk(Rec.Prepare(0, "test"),
+				Rec.Commit(0, "test"),
+				Rec.Delete(2, "test"),
+				Rec.Commit(2, "test"))
+			.CreateDb(token: token);
+	}
+
+	[Test]
+	public async Task the_stream_is_deleted() {
+		Assert.IsTrue(await ReadIndex.IsStreamDeleted("test", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task the_metastream_is_deleted() {
+		Assert.IsTrue(await ReadIndex.IsStreamDeleted("$$test", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task get_last_event_number_reports_deleted_metastream() {
+		Assert.AreEqual(EventNumber.DeletedStream, await ReadIndex.GetStreamLastEventNumber("$$test", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task single_event_read_reports_deleted_metastream() {
+		Assert.AreEqual(ReadEventResult.StreamDeleted, (await ReadIndex.ReadEvent("$$test", 0, CancellationToken.None)).Result);
+	}
+
+	[Test]
+	public async Task last_event_read_reports_deleted_metastream() {
+		Assert.AreEqual(ReadEventResult.StreamDeleted, (await ReadIndex.ReadEvent("$$test", -1, CancellationToken.None)).Result);
+	}
+
+	[Test]
+	public async Task read_stream_events_forward_reports_deleted_metastream() {
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, (await ReadIndex.ReadStreamEventsForward("$$test", 0, 100, CancellationToken.None)).Result);
+	}
+
+	[Test]
+	public async Task read_stream_events_backward_reports_deleted_metastream() {
+		Assert.AreEqual(ReadStreamResult.StreamDeleted,
+			(await ReadIndex.ReadStreamEventsBackward("$$test", 0, 100, CancellationToken.None)).Result);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Metastreams/when_having_deleted_stream_its_metastream_is_deleted_as_well.cs b/src/KurrentDB.Core.Tests/Services/Storage/Metastreams/when_having_deleted_stream_its_metastream_is_deleted_as_well.cs
new file mode 100644
index 00000000000..c723ddf4526
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Metastreams/when_having_deleted_stream_its_metastream_is_deleted_as_well.cs
@@ -0,0 +1,62 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Metastreams;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_having_deleted_stream_its_metastream_is_deleted_as_well<TLogFormat, TStreamId>
+	: SimpleDbTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator.Chunk(Rec.Prepare(0, "test"),
+				Rec.Commit(0, "test"),
+				Rec.Prepare(1, "$$test", metadata: new StreamMetadata(2, null, null, null, null)),
+				Rec.Commit(1, "$$test"),
+				Rec.Delete(2, "test"),
+				Rec.Commit(2, "test"))
+			.CreateDb(token: token);
+	}
+
+	[Test]
+	public async Task the_stream_is_deleted() {
+		Assert.IsTrue(await ReadIndex.IsStreamDeleted("test", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task the_metastream_is_deleted() {
+		Assert.IsTrue(await ReadIndex.IsStreamDeleted("$$test", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task get_last_event_number_reports_deleted_metastream() {
+		Assert.AreEqual(EventNumber.DeletedStream, await ReadIndex.GetStreamLastEventNumber("$$test", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task single_event_read_reports_deleted_metastream() {
+		Assert.AreEqual(ReadEventResult.StreamDeleted, (await ReadIndex.ReadEvent("$$test", 0, CancellationToken.None)).Result);
+	}
+
+	[Test]
+	public async Task last_event_read_reports_deleted_metastream() {
+		Assert.AreEqual(ReadEventResult.StreamDeleted, (await ReadIndex.ReadEvent("$$test", -1, CancellationToken.None)).Result);
+	}
+
+	[Test]
+	public async Task read_stream_events_forward_reports_deleted_metastream() {
+		Assert.AreEqual(ReadStreamResult.StreamDeleted, (await ReadIndex.ReadStreamEventsForward("$$test", 0, 100, CancellationToken.None)).Result);
+	}
+
+	[Test]
+	public async Task read_stream_events_backward_reports_deleted_metastream() {
+		Assert.AreEqual(ReadStreamResult.StreamDeleted,
+			(await ReadIndex.ReadStreamEventsBackward("$$test", 0, 100, CancellationToken.None)).Result);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Metastreams/when_having_multiple_metaevents_in_metastream_and_read_index_is_set_to_keep_just_last.cs b/src/KurrentDB.Core.Tests/Services/Storage/Metastreams/when_having_multiple_metaevents_in_metastream_and_read_index_is_set_to_keep_just_last.cs
new file mode 100644
index 00000000000..50b6ac6af34
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Metastreams/when_having_multiple_metaevents_in_metastream_and_read_index_is_set_to_keep_just_last.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Metastreams;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_having_multiple_metaevents_in_metastream_and_read_index_is_set_to_keep_just_last<TLogFormat, TStreamId>
+	: SimpleDbTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator.Chunk(Rec.Prepare(0, "$$test", "0", metadata: new StreamMetadata(maxCount: 10)),
+				Rec.Prepare(0, "$$test", "1", metadata: new StreamMetadata(maxCount: 9)),
+				Rec.Prepare(0, "$$test", "2", metadata: new StreamMetadata(maxCount: 8)),
+				Rec.Prepare(0, "$$test", "3", metadata: new StreamMetadata(maxCount: 7)),
+				Rec.Prepare(0, "$$test", "4", metadata: new StreamMetadata(maxCount: 6)),
+				Rec.Commit(0, "$$test"))
+			.CreateDb(token: token);
+	}
+
+	[Test]
+	public async Task last_event_read_returns_correct_event() {
+		var res = await ReadIndex.ReadEvent("$$test", -1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, res.Result);
+		Assert.AreEqual("4", res.Record.EventType);
+	}
+
+	[Test]
+	public async Task last_event_stream_number_is_correct() {
+		Assert.AreEqual(4, await ReadIndex.GetStreamLastEventNumber("$$test", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task single_event_read_returns_only_last_event() {
+		Assert.AreEqual(ReadEventResult.NotFound, (await ReadIndex.ReadEvent("$$test", 0, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadEventResult.NotFound, (await ReadIndex.ReadEvent("$$test", 1, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadEventResult.NotFound, (await ReadIndex.ReadEvent("$$test", 2, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadEventResult.NotFound, (await ReadIndex.ReadEvent("$$test", 3, CancellationToken.None)).Result);
+
+		var res = await ReadIndex.ReadEvent("$$test", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, res.Result);
+		Assert.AreEqual("4", res.Record.EventType);
+	}
+
+	[Test]
+	public async Task stream_read_forward_returns_only_last_event() {
+		var res = await ReadIndex.ReadStreamEventsForward("$$test", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(1, res.Records.Length);
+		Assert.AreEqual("4", res.Records[0].EventType);
+	}
+
+	[Test]
+	public async Task stream_read_backward_returns_only_last_event() {
+		var res = await ReadIndex.ReadStreamEventsBackward("$$test", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(1, res.Records.Length);
+		Assert.AreEqual("4", res.Records[0].EventType);
+	}
+
+	[Test]
+	public async Task metastream_metadata_is_correct() {
+		var metadata = await ReadIndex.GetStreamMetadata("$$test", CancellationToken.None);
+		Assert.AreEqual(1, metadata.MaxCount);
+		Assert.AreEqual(null, metadata.MaxAge);
+	}
+
+	[Test]
+	public async Task original_stream_metadata_is_taken_from_last_metaevent() {
+		var metadata = await ReadIndex.GetStreamMetadata("test", CancellationToken.None);
+		Assert.AreEqual(6, metadata.MaxCount);
+		Assert.AreEqual(null, metadata.MaxAge);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Metastreams/when_having_multiple_metaevents_in_metastream_and_read_index_is_set_to_keep_last_2.cs b/src/KurrentDB.Core.Tests/Services/Storage/Metastreams/when_having_multiple_metaevents_in_metastream_and_read_index_is_set_to_keep_last_2.cs
new file mode 100644
index 00000000000..7f0b04975a9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Metastreams/when_having_multiple_metaevents_in_metastream_and_read_index_is_set_to_keep_last_2.cs
@@ -0,0 +1,90 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Metastreams;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_having_multiple_metaevents_in_metastream_and_read_index_is_set_to_keep_last_2<TLogFormat, TStreamId> : SimpleDbTestScenario<TLogFormat, TStreamId> {
+	public when_having_multiple_metaevents_in_metastream_and_read_index_is_set_to_keep_last_2()
+		: base(metastreamMaxCount: 2) {
+	}
+
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator.Chunk(
+				Rec.Prepare(0, "$$test", "0", metadata: new StreamMetadata(10, null, null, null, null)),
+				Rec.Prepare(0, "$$test", "1", metadata: new StreamMetadata(9, null, null, null, null)),
+				Rec.Prepare(0, "$$test", "2", metadata: new StreamMetadata(8, null, null, null, null)),
+				Rec.Prepare(0, "$$test", "3", metadata: new StreamMetadata(7, null, null, null, null)),
+				Rec.Prepare(0, "$$test", "4", metadata: new StreamMetadata(6, null, null, null, null)),
+				Rec.Commit(0, "$$test"))
+			.CreateDb(token: token);
+	}
+
+	[Test]
+	public async Task last_event_read_returns_correct_event() {
+		var res = await ReadIndex.ReadEvent("$$test", -1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, res.Result);
+		Assert.AreEqual("4", res.Record.EventType);
+	}
+
+	[Test]
+	public async Task last_event_stream_number_is_correct() {
+		Assert.AreEqual(4, await ReadIndex.GetStreamLastEventNumber("$$test", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task single_event_read_returns_last_two_events() {
+		Assert.AreEqual(ReadEventResult.NotFound, (await ReadIndex.ReadEvent("$$test", 0, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadEventResult.NotFound, (await ReadIndex.ReadEvent("$$test", 1, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadEventResult.NotFound, (await ReadIndex.ReadEvent("$$test", 2, CancellationToken.None)).Result);
+
+		var res = await ReadIndex.ReadEvent("$$test", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, res.Result);
+		Assert.AreEqual("3", res.Record.EventType);
+
+		res = await ReadIndex.ReadEvent("$$test", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, res.Result);
+		Assert.AreEqual("4", res.Record.EventType);
+	}
+
+	[Test]
+	public async Task stream_read_forward_returns_last_two_events() {
+		var res = await ReadIndex.ReadStreamEventsForward("$$test", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(2, res.Records.Length);
+		Assert.AreEqual("3", res.Records[0].EventType);
+		Assert.AreEqual("4", res.Records[1].EventType);
+	}
+
+	[Test]
+	public async Task stream_read_backward_returns_last_two_events() {
+		var res = await ReadIndex.ReadStreamEventsBackward("$$test", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, res.Result);
+		Assert.AreEqual(2, res.Records.Length);
+		Assert.AreEqual("4", res.Records[0].EventType);
+		Assert.AreEqual("3", res.Records[1].EventType);
+	}
+
+	[Test]
+	public async Task metastream_metadata_is_correct() {
+		var metadata = await ReadIndex.GetStreamMetadata("$$test", CancellationToken.None);
+		Assert.AreEqual(2, metadata.MaxCount);
+		Assert.AreEqual(null, metadata.MaxAge);
+	}
+
+	[Test]
+	public async Task original_stream_metadata_is_taken_from_last_metaevent() {
+		var metadata = await ReadIndex.GetStreamMetadata("test", CancellationToken.None);
+		Assert.AreEqual(6, metadata.MaxCount);
+		Assert.AreEqual(null, metadata.MaxAge);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/FakeIndexReader.cs b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/FakeIndexReader.cs
new file mode 100644
index 00000000000..7be04aacdac
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/FakeIndexReader.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.Tests.Services.Storage.ReadIndex;
+
+class FakeIndexReader<TStreamId> : IIndexReader<TStreamId> {
+	public long CachedStreamInfo { get; }
+	public long NotCachedStreamInfo { get; }
+	public long HashCollisions { get; }
+
+	public ValueTask<IndexReadEventResult> ReadEvent(string streamName, TStreamId streamId, long eventNumber,
+		CancellationToken token)
+		=> ValueTask.FromException<IndexReadEventResult>(new NotImplementedException());
+
+	public ValueTask<IndexReadStreamResult>
+		ReadStreamEventsForward(string streamName, TStreamId streamId, long fromEventNumber, int maxCount,
+			CancellationToken token)
+		=> ValueTask.FromException<IndexReadStreamResult>(new NotImplementedException());
+
+	public ValueTask<IndexReadStreamResult> ReadStreamEventsBackward(string streamName, TStreamId streamId,
+		long fromEventNumber,
+		int maxCount, CancellationToken token)
+		=> ValueTask.FromException<IndexReadStreamResult>(new NotImplementedException());
+
+	public ValueTask<StorageMessage.EffectiveAcl> GetEffectiveAcl(TStreamId streamId, CancellationToken token)
+		=> ValueTask.FromException<StorageMessage.EffectiveAcl>(new NotImplementedException());
+
+	public ValueTask<IndexReadEventInfoResult> ReadEventInfo_KeepDuplicates(TStreamId streamId, long eventNumber,
+		CancellationToken token)
+		=> ValueTask.FromException<IndexReadEventInfoResult>(new NotImplementedException());
+
+	public ValueTask<IndexReadEventInfoResult> ReadEventInfoForward_KnownCollisions(TStreamId streamId,
+		long fromEventNumber, int maxCount,
+		long beforePosition, CancellationToken token)
+		=> ValueTask.FromException<IndexReadEventInfoResult>(new NotImplementedException());
+
+	public ValueTask<IndexReadEventInfoResult> ReadEventInfoForward_NoCollisions(ulong stream, long fromEventNumber, int maxCount,
+		long beforePosition, CancellationToken token)
+		=> ValueTask.FromException<IndexReadEventInfoResult>(new NotImplementedException());
+
+	public ValueTask<IndexReadEventInfoResult> ReadEventInfoBackward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount,
+		long beforePosition, CancellationToken token)
+		=> ValueTask.FromException<IndexReadEventInfoResult>(new NotImplementedException());
+
+	public ValueTask<IndexReadEventInfoResult> ReadEventInfoBackward_NoCollisions(ulong stream, Func<ulong, TStreamId> getStreamId, long fromEventNumber,
+		int maxCount, long beforePosition, CancellationToken token)
+		=> ValueTask.FromException<IndexReadEventInfoResult>(new NotImplementedException());
+
+	public ValueTask<IPrepareLogRecord<TStreamId>> ReadPrepare(TStreamId streamId, long eventNumber,
+		CancellationToken token)
+		=> ValueTask.FromException<IPrepareLogRecord<TStreamId>>(new NotImplementedException());
+
+	public ValueTask<TStreamId> GetEventStreamIdByTransactionId(long transactionId, CancellationToken token)
+		=> ValueTask.FromException<TStreamId>(new NotImplementedException());
+
+	public ValueTask<StreamMetadata> GetStreamMetadata(TStreamId streamId, CancellationToken token)
+		=> ValueTask.FromException<StreamMetadata>(new NotImplementedException());
+
+	public ValueTask<long> GetStreamLastEventNumber(TStreamId streamId, CancellationToken token)
+		=> ValueTask.FromException<long>(new NotImplementedException());
+
+	public ValueTask<long> GetStreamLastEventNumber_KnownCollisions(TStreamId streamId, long beforePosition, CancellationToken token)
+		=> ValueTask.FromException<long>(new NotImplementedException());
+
+	public ValueTask<long> GetStreamLastEventNumber_NoCollisions(ulong stream, Func<ulong, TStreamId> getStreamId, long beforePosition, CancellationToken token)
+		=> ValueTask.FromException<long>(new NotImplementedException());
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/GetStreamLastEventNumber_KnownCollisions.cs b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/GetStreamLastEventNumber_KnownCollisions.cs
new file mode 100644
index 00000000000..653fec73dfd
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/GetStreamLastEventNumber_KnownCollisions.cs
@@ -0,0 +1,167 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.Index.Hashers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.ReadIndex;
+
+public abstract class GetStreamLastEventNumber_KnownCollisions : ReadIndexTestScenario<LogFormat.V2, string> {
+	private const string Stream = "ab-1";
+	private const string CollidingStream = "cb-1";
+	private const string CollidingStream1 = "db-1";
+
+	protected GetStreamLastEventNumber_KnownCollisions() : base(
+		maxEntriesInMemTable: 3,
+		lowHasher: new ConstantHasher(0),
+		highHasher: new HumanReadableHasher32()) { }
+
+	public class VerifyCollision : GetStreamLastEventNumber_KnownCollisions {
+		[Test]
+		public void verify_that_streams_collide() {
+			Assert.AreEqual(Hasher.Hash(Stream), Hasher.Hash(CollidingStream));
+			Assert.AreEqual(Hasher.Hash(Stream), Hasher.Hash(CollidingStream1));
+		}
+	}
+
+	public class WithNoEvents : GetStreamLastEventNumber_KnownCollisions {
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			await WriteSingleEvent(CollidingStream, 0, "test data", token: token);
+			await WriteSingleEvent(CollidingStream1, 0, "test data", token: token);
+		}
+
+		[Test]
+		public async Task with_no_events() {
+			Assert.AreEqual(ExpectedVersion.NoStream,
+				await ReadIndex.GetStreamLastEventNumber_KnownCollisions(
+					Stream,
+					long.MaxValue,
+					CancellationToken.None));
+		}
+	}
+
+	public class WithOneEvent : GetStreamLastEventNumber_KnownCollisions {
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			await WriteSingleEvent(Stream, 2, "test data", token: token);
+			await WriteSingleEvent(CollidingStream, 3, "test data", token: token);
+		}
+
+		[Test]
+		public async Task with_one_event() {
+			Assert.AreEqual(2,
+				await ReadIndex.GetStreamLastEventNumber_KnownCollisions(
+					Stream,
+					long.MaxValue,
+					CancellationToken.None));
+
+			Assert.AreEqual(3,
+				await ReadIndex.GetStreamLastEventNumber_KnownCollisions(
+					CollidingStream,
+					long.MaxValue,
+					CancellationToken.None));
+
+		}
+	}
+
+	public class WithMultipleEvents : GetStreamLastEventNumber_KnownCollisions {
+		private EventRecord _zeroth, _first, _second, _third;
+
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			// PTable 1
+			await WriteSingleEvent(CollidingStream, 0, string.Empty, token: token);
+			await WriteSingleEvent(CollidingStream1, 0, string.Empty, token: token);
+			_zeroth = await WriteSingleEvent(Stream, 0, string.Empty, token: token);
+
+			// PTable 2
+			_first = await WriteSingleEvent(Stream, 1, string.Empty, token: token);
+			_second = await WriteSingleEvent(Stream, 2, string.Empty, token: token);
+			await WriteSingleEvent(CollidingStream, 1, string.Empty, token: token);
+
+			// MemTable
+			_third = await WriteSingleEvent(Stream, 3, string.Empty, token: token);
+			await WriteSingleEvent(CollidingStream, 2, string.Empty, token: token);
+		}
+
+		[Test]
+		public async Task with_multiple_events() {
+			Assert.AreEqual(3,
+				await ReadIndex.GetStreamLastEventNumber_KnownCollisions(
+					Stream,
+					long.MaxValue,
+					CancellationToken.None));
+
+			Assert.AreEqual(2,
+				await ReadIndex.GetStreamLastEventNumber_KnownCollisions(
+					CollidingStream,
+					long.MaxValue,
+					CancellationToken.None));
+
+			Assert.AreEqual(0,
+				await ReadIndex.GetStreamLastEventNumber_KnownCollisions(
+					CollidingStream1,
+					long.MaxValue,
+					CancellationToken.None));
+		}
+
+		[Test]
+		public async Task with_multiple_events_and_before_position() {
+			Assert.AreEqual(3,
+				await ReadIndex.GetStreamLastEventNumber_KnownCollisions(
+					Stream,
+					_third.LogPosition + 1,
+					CancellationToken.None));
+
+			Assert.AreEqual(2,
+				await ReadIndex.GetStreamLastEventNumber_KnownCollisions(
+					Stream,
+					_third.LogPosition,
+					CancellationToken.None));
+
+			Assert.AreEqual(1,
+				await ReadIndex.GetStreamLastEventNumber_KnownCollisions(
+					Stream,
+					_second.LogPosition,
+					CancellationToken.None));
+
+			Assert.AreEqual(0,
+				await ReadIndex.GetStreamLastEventNumber_KnownCollisions(
+					Stream,
+					_first.LogPosition,
+					CancellationToken.None));
+
+			Assert.AreEqual(ExpectedVersion.NoStream,
+				await ReadIndex.GetStreamLastEventNumber_KnownCollisions(
+					Stream,
+					_zeroth.LogPosition,
+					CancellationToken.None));
+		}
+	}
+
+	public class WithDeletedStream : GetStreamLastEventNumber_KnownCollisions {
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			await WriteSingleEvent(Stream, 0, "test data", token: token);
+			await WriteSingleEvent(CollidingStream, 1, "test data", token: token);
+
+			var prepare = await WriteDeletePrepare(Stream, token);
+			await WriteDeleteCommit(prepare, token);
+		}
+
+		[Test]
+		public async Task with_deleted_stream() {
+			Assert.AreEqual(EventNumber.DeletedStream,
+				await ReadIndex.GetStreamLastEventNumber_KnownCollisions(
+					Stream,
+					long.MaxValue,
+					CancellationToken.None));
+
+			Assert.AreEqual(1,
+				await ReadIndex.GetStreamLastEventNumber_KnownCollisions(
+					CollidingStream,
+					long.MaxValue,
+					CancellationToken.None));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/GetStreamLastEventNumber_KnownCollisions_Randomized.cs b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/GetStreamLastEventNumber_KnownCollisions_Randomized.cs
new file mode 100644
index 00000000000..ec1dbef86c9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/GetStreamLastEventNumber_KnownCollisions_Randomized.cs
@@ -0,0 +1,70 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.Index.Hashers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.ReadIndex;
+
+[TestFixture(3)]
+[TestFixture(33)]
+[TestFixture(123)]
+[TestFixture(523)]
+public class GetStreamLastEventNumber_KnownCollisions_Randomized : ReadIndexTestScenario<LogFormat.V2, string> {
+	private const string Stream = "ab-1";
+	private const string CollidingStream = "cb-1";
+
+	private readonly Random _random = new Random();
+	private readonly int _numEvents;
+	private readonly List<EventRecord> _events;
+
+	public GetStreamLastEventNumber_KnownCollisions_Randomized(int maxEntriesInMemTable) : base(
+		chunkSize: 1_000_000,
+		maxEntriesInMemTable: maxEntriesInMemTable,
+		lowHasher: new ConstantHasher(0),
+		highHasher: new HumanReadableHasher32()) {
+		_numEvents = _random.Next(100, 400);
+		_events = new List<EventRecord>(_numEvents);
+	}
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var streamLast = 0L;
+		var collidingStreamLast = 0L;
+
+		for (int i = 0; i < _numEvents; i++) {
+			if (_random.Next(2) == 0) {
+				_events.Add(await WriteSingleEvent(Stream, streamLast++, "test data", token: token));
+			} else {
+				_events.Add(await WriteSingleEvent(CollidingStream, collidingStreamLast++, "testing", token: token));
+			}
+		}
+	}
+
+	[Test]
+	public async Task returns_correct_last_event_number_before_position() {
+		var streamLast = ExpectedVersion.NoStream;
+		var collidingStreamLast = ExpectedVersion.NoStream;
+
+		foreach (var @event in _events) {
+			Assert.AreEqual(streamLast,
+				await ReadIndex.GetStreamLastEventNumber_KnownCollisions(Stream, @event.LogPosition, CancellationToken.None));
+
+			Assert.AreEqual(collidingStreamLast,
+				await ReadIndex.GetStreamLastEventNumber_KnownCollisions(CollidingStream, @event.LogPosition, CancellationToken.None));
+
+			switch (@event.EventStreamId) {
+				case Stream:
+					streamLast = @event.EventNumber;
+					break;
+				case CollidingStream:
+					collidingStreamLast = @event.EventNumber;
+					break;
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/GetStreamLastEventNumber_NoCollisions_Randomized.cs b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/GetStreamLastEventNumber_NoCollisions_Randomized.cs
new file mode 100644
index 00000000000..1249edd13ca
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/GetStreamLastEventNumber_NoCollisions_Randomized.cs
@@ -0,0 +1,62 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.Index.Hashers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.ReadIndex;
+
+[TestFixture(3)]
+[TestFixture(33)]
+[TestFixture(123)]
+[TestFixture(523)]
+public class GetStreamLastEventNumber_NoCollisions_Randomized : ReadIndexTestScenario<LogFormat.V2, string> {
+	private const string Stream = "ab-1";
+	private const ulong Hash = 98;
+	private const string NonCollidingStream = "cd-1";
+	private string GetStreamId(ulong hash) => hash == Hash ? Stream : throw new ArgumentException();
+
+	private readonly Random _random = new Random();
+	private readonly int _numEvents;
+	private readonly List<EventRecord> _events;
+
+	public GetStreamLastEventNumber_NoCollisions_Randomized(int maxEntriesInMemTable) : base(
+		chunkSize: 1_000_000,
+		maxEntriesInMemTable: maxEntriesInMemTable,
+		lowHasher: new ConstantHasher(0),
+		highHasher: new HumanReadableHasher32()) {
+		_numEvents = _random.Next(100, 400);
+		_events = new List<EventRecord>(_numEvents);
+	}
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var streamLast = 0L;
+		var nonCollidingStreamLast = 0L;
+
+		for (int i = 0; i < _numEvents; i++) {
+			if (_random.Next(2) == 0) {
+				_events.Add(await WriteSingleEvent(Stream, streamLast++, "test data", token: token));
+			} else {
+				_events.Add(await WriteSingleEvent(NonCollidingStream, nonCollidingStreamLast++, "testing", token: token));
+			}
+		}
+	}
+
+	[Test]
+	public async Task returns_correct_last_event_number_before_position() {
+		var expectedLastEventNumber = ExpectedVersion.NoStream;
+
+		foreach (var @event in _events) {
+			Assert.AreEqual(expectedLastEventNumber,
+				await ReadIndex.GetStreamLastEventNumber_NoCollisions(Hash, GetStreamId, @event.LogPosition, CancellationToken.None));
+
+			if (@event.EventStreamId == Stream)
+				expectedLastEventNumber = @event.EventNumber;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_KnownCollisions.cs b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_KnownCollisions.cs
new file mode 100644
index 00000000000..a4a99b6330a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_KnownCollisions.cs
@@ -0,0 +1,361 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.Index.Hashers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.ReadIndex;
+
+[TestFixture]
+public abstract class ReadEventInfoBackward_KnownCollisions : ReadIndexTestScenario<LogFormat.V2, string> {
+	private const string Stream = "ab-1";
+	private const string CollidingStream = "cb-1";
+	private const string CollidingStream1 = "db-1";
+
+	protected ReadEventInfoBackward_KnownCollisions() : base(
+		maxEntriesInMemTable: 3,
+		lowHasher: new ConstantHasher(0),
+		highHasher: new HumanReadableHasher32()) { }
+
+	private static void CheckResult(EventRecord[] events, IndexReadEventInfoResult result) {
+		var eventInfos = result.EventInfos.Reverse().ToArray();
+		Assert.AreEqual(events.Length, eventInfos.Length);
+		for (int i = 0; i < events.Length; i++) {
+			Assert.AreEqual(events[i].EventNumber, eventInfos[i].EventNumber);
+			Assert.AreEqual(events[i].LogPosition, eventInfos[i].LogPosition);
+		}
+	}
+
+	public class VerifyCollision : ReadEventInfoBackward_KnownCollisions {
+		[Test]
+		public void verify_that_streams_collide() {
+			Assert.AreEqual(Hasher.Hash(Stream), Hasher.Hash(CollidingStream));
+			Assert.AreEqual(Hasher.Hash(Stream), Hasher.Hash(CollidingStream1));
+		}
+	}
+
+	public class WithNoEvents : ReadEventInfoBackward_KnownCollisions {
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			await WriteSingleEvent(CollidingStream, 0, "test data", token: token);
+			await WriteSingleEvent(CollidingStream1, 0, "test data", token: token);
+		}
+
+		[Test]
+		public async Task with_no_events() {
+			var result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(
+				Stream,
+				0,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(0, result.EventInfos.Length);
+			Assert.True(result.IsEndOfStream);
+
+			result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(
+				Stream,
+				-1,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(0, result.EventInfos.Length);
+			Assert.True(result.IsEndOfStream);
+
+		}
+	}
+
+	public class WithOneEvent : ReadEventInfoBackward_KnownCollisions {
+		private EventRecord _event;
+
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			_event = await WriteSingleEvent(Stream, 0, "test data", token: token);
+			await WriteSingleEvent(CollidingStream, 1, "test data", token: token);
+		}
+
+		[Test]
+		public async Task with_one_event() {
+			var result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(
+				Stream,
+				0,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(1, result.EventInfos.Length);
+			CheckResult(new[] { _event }, result);
+			Assert.True(result.IsEndOfStream);
+
+			result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(
+				Stream,
+				1,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(new[] { _event }, result);
+			Assert.True(result.IsEndOfStream);
+
+			result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(
+				Stream,
+				-1,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(1, result.EventInfos.Length);
+			CheckResult(new[] { _event }, result);
+			Assert.True(result.IsEndOfStream);
+		}
+	}
+
+	public class WithMultipleEvents : ReadEventInfoBackward_KnownCollisions {
+		private readonly List<EventRecord> _events = new();
+
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			// PTable 1
+			await WriteSingleEvent(CollidingStream, 0, string.Empty, token: token);
+			await WriteSingleEvent(CollidingStream, 1, string.Empty, token: token);
+			_events.Add(await WriteSingleEvent(Stream, 0, string.Empty, token: token));
+
+			// PTable 2
+			_events.Add(await WriteSingleEvent(Stream, 1, string.Empty, token: token));
+			_events.Add(await WriteSingleEvent(Stream, 2, string.Empty, token: token));
+			await WriteSingleEvent(CollidingStream, 2, string.Empty, token: token);
+
+			// MemTable
+			_events.Add(await WriteSingleEvent(Stream, 3, string.Empty, token: token));
+			await WriteSingleEvent(CollidingStream, 3, string.Empty, token: token);
+		}
+
+		[Test]
+		public async Task with_multiple_events() {
+			for (int fromEventNumber = 0; fromEventNumber <= 4; fromEventNumber++) {
+				var result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(
+					Stream,
+					fromEventNumber,
+					int.MaxValue,
+					long.MaxValue,
+					CancellationToken.None);
+
+				CheckResult(_events.Take(fromEventNumber + 1).ToArray(), result);
+				Assert.True(result.IsEndOfStream);
+			}
+		}
+
+		[Test]
+		public async Task with_multiple_events_and_max_count() {
+			for (int fromEventNumber = 0; fromEventNumber <= 4; fromEventNumber++) {
+				var result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(
+					Stream,
+					fromEventNumber,
+					2,
+					long.MaxValue,
+					CancellationToken.None);
+
+				CheckResult(_events.Take(fromEventNumber + 1).Skip(fromEventNumber + 1 - 2).ToArray(), result);
+				if (fromEventNumber - 2 < 0)
+					Assert.True(result.IsEndOfStream);
+				else
+					Assert.AreEqual(fromEventNumber - 2, result.NextEventNumber);
+			}
+		}
+
+		[Test]
+		public async Task with_multiple_events_and_before_position() {
+			for (int fromEventNumber = 0; fromEventNumber + 1 < _events.Count; fromEventNumber++) {
+				var result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(
+					Stream,
+					fromEventNumber,
+					int.MaxValue,
+					_events[fromEventNumber + 1].LogPosition,
+					CancellationToken.None);
+
+				CheckResult(_events.Take(fromEventNumber + 1).ToArray(), result);
+				Assert.True(result.IsEndOfStream);
+
+				result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(
+					Stream,
+					-1,
+					int.MaxValue,
+					_events[fromEventNumber + 1].LogPosition,
+					CancellationToken.None);
+
+				CheckResult(_events.Take(fromEventNumber + 1).ToArray(), result);
+				Assert.True(result.IsEndOfStream);
+			}
+		}
+	}
+
+	public class WithDeletedStream : ReadEventInfoBackward_KnownCollisions {
+		private readonly List<EventRecord> _events = new();
+
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			_events.Add(await WriteSingleEvent(Stream, 0, "test data", token: token));
+			await WriteSingleEvent(CollidingStream, 1, "test data", token: token);
+			_events.Add(await WriteSingleEvent(Stream, 1, "test", token: token));
+
+			var prepare = await WriteDeletePrepare(Stream, token);
+			await WriteDeleteCommit(prepare, token);
+		}
+
+		[Test]
+		public async Task can_read_events() {
+			var result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(
+				Stream,
+				1,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(_events.ToArray(), result);
+			Assert.True(result.IsEndOfStream);
+		}
+
+		[Test]
+		public async Task can_read_tombstone_event() {
+			var result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(
+				Stream,
+				EventNumber.DeletedStream,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(1, result.EventInfos.Length);
+			Assert.AreEqual(EventNumber.DeletedStream, result.EventInfos[0].EventNumber);
+			Assert.AreEqual(long.MaxValue - int.MaxValue, result.NextEventNumber);
+
+			result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(
+				Stream,
+				-1,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(1, result.EventInfos.Length);
+			Assert.AreEqual(EventNumber.DeletedStream, result.EventInfos[0].EventNumber);
+			Assert.AreEqual(long.MaxValue - int.MaxValue, result.NextEventNumber);
+
+			result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(
+				Stream,
+				EventNumber.DeletedStream - 1,
+				1,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(0, result.EventInfos.Length);
+			Assert.AreEqual(1, result.NextEventNumber);
+		}
+	}
+
+	public class WithGapsBetweenEvents : ReadEventInfoBackward_KnownCollisions {
+		private readonly List<EventRecord> _events = new();
+
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			// PTable 1
+			await WriteSingleEvent(CollidingStream, 0, string.Empty, token: token);
+			await WriteSingleEvent(CollidingStream, 1, string.Empty, token: token);
+			_events.Add(await WriteSingleEvent(Stream, 0, string.Empty, token: token));
+
+			// PTable 2
+			_events.Add(await WriteSingleEvent(Stream, 4, string.Empty));
+			_events.Add(await WriteSingleEvent(Stream, 5, string.Empty));
+			await WriteSingleEvent(CollidingStream, 2, string.Empty);
+
+			// MemTable
+			_events.Add(await WriteSingleEvent(Stream, 7, string.Empty, token: token));
+			await WriteSingleEvent(CollidingStream, 3, string.Empty, token: token);
+		}
+
+		[Test]
+		public async Task strictly_returns_up_to_max_count_consecutive_events_from_start_event_number() {
+			var result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(
+				Stream,
+				7,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(_events.ToArray(), result);
+			Assert.True(result.IsEndOfStream);
+
+			result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(
+				Stream,
+				7,
+				4,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(_events.Skip(1).ToArray(), result);
+			Assert.AreEqual(3, result.NextEventNumber);
+
+			result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(
+				Stream,
+				3,
+				1,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(0, result.EventInfos.Length);
+			Assert.AreEqual(2, result.NextEventNumber); // from colliding stream, but doesn't matter much
+
+			result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(
+				Stream,
+				2,
+				1,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(0, result.EventInfos.Length);
+			Assert.AreEqual(1, result.NextEventNumber); // from colliding stream, but doesn't matter much
+
+		}
+	}
+
+
+	public class WithDuplicateEvents : ReadEventInfoBackward_KnownCollisions {
+		private readonly List<EventRecord> _events = new();
+
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			// PTable 1
+			await WriteSingleEvent(CollidingStream, 0, string.Empty, token: token);
+			await WriteSingleEvent(CollidingStream, 1, string.Empty, token: token);
+			_events.Add(await WriteSingleEvent(Stream, 0, string.Empty, token: token));
+
+			// PTable 2
+			_events.Add(await WriteSingleEvent(Stream, 1, string.Empty, token: token));
+			_events.Add(await WriteSingleEvent(Stream, 1, string.Empty, token: token));
+			await WriteSingleEvent(CollidingStream, 2, string.Empty, token: token);
+
+			// MemTable
+			_events.Add(await WriteSingleEvent(Stream, 2, string.Empty, token: token));
+			_events.Add(await WriteSingleEvent(Stream, 2, string.Empty, token: token));
+			_events.Add(await WriteSingleEvent(Stream, 2, string.Empty, token: token));
+		}
+
+		[Test]
+		public async Task result_is_deduplicated_keeping_oldest_duplicates() {
+			var result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(
+				Stream,
+				3,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(
+				_events
+					.GroupBy(x => x.EventNumber)
+					.Select(x => x.First())
+					.OrderBy(x => x.EventNumber)
+					.ToArray(),
+				result);
+			Assert.True(result.IsEndOfStream);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_KnownCollisions_Randomized.cs b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_KnownCollisions_Randomized.cs
new file mode 100644
index 00000000000..b1c1bc4c9f3
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_KnownCollisions_Randomized.cs
@@ -0,0 +1,121 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.Index.Hashers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.ReadIndex;
+
+[TestFixture(3)]
+[TestFixture(33)]
+[TestFixture(123)]
+[TestFixture(523)]
+public class ReadEventInfoBackward_KnownCollisions_Randomized : ReadIndexTestScenario<LogFormat.V2, string> {
+	private const string Stream = "ab-1";
+	private const string CollidingStream = "cb-1";
+
+	private readonly Random _random = new Random();
+	private readonly int _numEvents;
+	private readonly List<EventRecord> _events;
+
+	public ReadEventInfoBackward_KnownCollisions_Randomized(int maxEntriesInMemTable) : base(
+		chunkSize: 1_000_000,
+		maxEntriesInMemTable: maxEntriesInMemTable,
+		lowHasher: new ConstantHasher(0),
+		highHasher: new HumanReadableHasher32()) {
+		_numEvents = _random.Next(100, 400);
+		_events = new List<EventRecord>(_numEvents);
+	}
+
+	private static void CheckResult(EventRecord[] events, IndexReadEventInfoResult result) {
+		var eventInfos = result.EventInfos.Reverse().ToArray();
+		Assert.AreEqual(events.Length, eventInfos.Length);
+		for (int i = 0; i < events.Length; i++) {
+			Assert.AreEqual(events[i].EventNumber, eventInfos[i].EventNumber);
+			Assert.AreEqual(events[i].LogPosition, eventInfos[i].LogPosition);
+		}
+	}
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var streamLast = 0L;
+		var collidingStreamLast = 0L;
+
+		for (int i = 0; i < _numEvents; i++) {
+			if (_random.Next(2) == 0) {
+				_events.Add(await WriteSingleEvent(Stream, streamLast++, "test data", token: token));
+			} else {
+				_events.Add(await WriteSingleEvent(CollidingStream, collidingStreamLast++, "testing", token: token));
+			}
+		}
+	}
+
+	[Test]
+	public async Task returns_correct_events_before_position() {
+		var curEvents = new List<EventRecord>();
+
+		foreach (var @event in _events) {
+			IndexReadEventInfoResult result;
+			if (@event.EventStreamId == Stream) {
+				result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(Stream,
+					@event.EventNumber - 1, int.MaxValue, @event.LogPosition,
+					CancellationToken.None);
+				CheckResult(curEvents.ToArray(), result);
+				Assert.True(result.IsEndOfStream);
+
+				// events >= @event.EventNumber should be filtered out
+				result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(Stream,
+					@event.EventNumber, int.MaxValue, @event.LogPosition,
+					CancellationToken.None);
+				CheckResult(curEvents.ToArray(), result);
+				Assert.True(result.IsEndOfStream);
+
+				result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(Stream,
+					@event.EventNumber + 1, int.MaxValue, @event.LogPosition,
+					CancellationToken.None);
+				CheckResult(curEvents.ToArray(), result);
+				Assert.True(result.IsEndOfStream);
+			}
+
+			result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(Stream, -1, int.MaxValue, @event.LogPosition,
+				CancellationToken.None);
+			CheckResult(curEvents.ToArray(), result);
+			Assert.True(result.IsEndOfStream);
+
+			if (@event.EventStreamId == Stream)
+				curEvents.Add(@event);
+		}
+	}
+
+	[Test]
+	public async Task returns_correct_events_with_max_count() {
+		var curEvents = new List<EventRecord>();
+
+		foreach (var @event in _events) {
+			if (@event.EventStreamId != Stream)
+				continue;
+			curEvents.Add(@event);
+
+			int maxCount = Math.Min((int)@event.EventNumber + 1, _random.Next(10, 100));
+			var fromEventNumber = @event.EventNumber;
+
+			Assert.Greater(maxCount, 0);
+			Assert.GreaterOrEqual(fromEventNumber, 0);
+
+			var result = await ReadIndex.ReadEventInfoBackward_KnownCollisions(
+				Stream, fromEventNumber, maxCount, long.MaxValue, CancellationToken.None);
+			CheckResult(curEvents.Skip(curEvents.Count - maxCount).ToArray(), result);
+
+			if (fromEventNumber - maxCount < 0)
+				Assert.True(result.IsEndOfStream);
+			else
+				Assert.AreEqual(fromEventNumber - maxCount, result.NextEventNumber);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_NoCollisions.cs b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_NoCollisions.cs
new file mode 100644
index 00000000000..56fa21e89f8
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_NoCollisions.cs
@@ -0,0 +1,362 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.Index.Hashers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.ReadIndex;
+
+[TestFixture]
+public abstract class ReadEventInfoBackward_NoCollisions : ReadIndexTestScenario<LogFormat.V2, string> {
+	private const string Stream = "ab-1";
+	private const ulong Hash = 98;
+	private const string NonCollidingStream = "cd-1";
+
+	private string GetStreamId(ulong hash) => hash == Hash ? Stream : throw new ArgumentException();
+
+	protected ReadEventInfoBackward_NoCollisions() : base(
+		maxEntriesInMemTable: 3,
+		lowHasher: new ConstantHasher(0),
+		highHasher: new HumanReadableHasher32()) { }
+
+	private static void CheckResult(EventRecord[] events, IndexReadEventInfoResult result) {
+		var eventInfos = result.EventInfos.Reverse().ToArray();
+		Assert.AreEqual(events.Length, eventInfos.Length);
+		for (int i = 0; i < events.Length; i++) {
+			Assert.AreEqual(events[i].EventNumber, eventInfos[i].EventNumber);
+			Assert.AreEqual(events[i].LogPosition, eventInfos[i].LogPosition);
+		}
+	}
+
+	public class VerifyNoCollision : ReadEventInfoBackward_NoCollisions {
+		[Test]
+		public void verify_that_streams_do_not_collide() {
+			Assert.AreNotEqual(Hasher.Hash(Stream), Hasher.Hash(NonCollidingStream));
+		}
+	}
+
+	public class WithNoEvents : ReadEventInfoBackward_NoCollisions {
+		[Test]
+		public async Task with_no_events() {
+			var result = await ReadIndex.ReadEventInfoBackward_NoCollisions(
+				Hash,
+				GetStreamId,
+				0,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(0, result.EventInfos.Length);
+			Assert.True(result.IsEndOfStream);
+
+			result = await ReadIndex.ReadEventInfoBackward_NoCollisions(
+				Hash,
+				GetStreamId,
+				-1,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(0, result.EventInfos.Length);
+			Assert.True(result.IsEndOfStream);
+		}
+	}
+
+	public class WithOneEvent : ReadEventInfoBackward_NoCollisions {
+		private EventRecord _event;
+
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			_event = await WriteSingleEvent(Stream, 0, "test data", token: token);
+		}
+
+		[Test]
+		public async Task with_one_event() {
+			var result = await ReadIndex.ReadEventInfoBackward_NoCollisions(
+				Hash,
+				GetStreamId,
+				0,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(1, result.EventInfos.Length);
+			CheckResult(new[] { _event }, result);
+			Assert.True(result.IsEndOfStream);
+
+			result = await ReadIndex.ReadEventInfoBackward_NoCollisions(
+				Hash,
+				GetStreamId,
+				1,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(new[] { _event }, result);
+			Assert.True(result.IsEndOfStream);
+
+			result = await ReadIndex.ReadEventInfoBackward_NoCollisions(
+				Hash,
+				GetStreamId,
+				-1,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(1, result.EventInfos.Length);
+			CheckResult(new[] { _event }, result);
+			Assert.True(result.IsEndOfStream);
+		}
+	}
+
+	public class WithMultipleEvents : ReadEventInfoBackward_NoCollisions {
+		private readonly List<EventRecord> _events = new();
+
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			// PTable 1
+			await WriteSingleEvent(NonCollidingStream, 0, string.Empty, token: token);
+			await WriteSingleEvent(NonCollidingStream, 1, string.Empty, token: token);
+			_events.Add(await WriteSingleEvent(Stream, 0, string.Empty, token: token));
+
+			// PTable 2
+			_events.Add(await WriteSingleEvent(Stream, 1, string.Empty, token: token));
+			_events.Add(await WriteSingleEvent(Stream, 2, string.Empty, token: token));
+			await WriteSingleEvent(NonCollidingStream, 2, string.Empty, token: token);
+
+			// MemTable
+			_events.Add(await WriteSingleEvent(Stream, 3, string.Empty, token: token));
+			await WriteSingleEvent(NonCollidingStream, 3, string.Empty, token: token);
+		}
+
+		[Test]
+		public async Task with_multiple_events() {
+			for (int fromEventNumber = 0; fromEventNumber <= 4; fromEventNumber++) {
+				var result = await ReadIndex.ReadEventInfoBackward_NoCollisions(
+					Hash,
+					GetStreamId,
+					fromEventNumber,
+					int.MaxValue,
+					long.MaxValue,
+					CancellationToken.None);
+
+				CheckResult(_events.Take(fromEventNumber + 1).ToArray(), result);
+				Assert.True(result.IsEndOfStream);
+			}
+		}
+
+		[Test]
+		public async Task with_multiple_events_and_max_count() {
+			for (int fromEventNumber = 0; fromEventNumber <= 4; fromEventNumber++) {
+				var result = await ReadIndex.ReadEventInfoBackward_NoCollisions(
+					Hash,
+					GetStreamId,
+					fromEventNumber,
+					2,
+					long.MaxValue,
+					CancellationToken.None);
+
+				CheckResult(_events.Take(fromEventNumber + 1).Skip(fromEventNumber + 1 - 2).ToArray(), result);
+				if (fromEventNumber - 2 < 0)
+					Assert.True(result.IsEndOfStream);
+				else
+					Assert.AreEqual(fromEventNumber - 2, result.NextEventNumber);
+			}
+		}
+
+		[Test]
+		public async Task with_multiple_events_and_before_position() {
+			for (int fromEventNumber = 0; fromEventNumber + 1 < _events.Count; fromEventNumber++) {
+				var result = await ReadIndex.ReadEventInfoBackward_NoCollisions(
+					Hash,
+					GetStreamId,
+					fromEventNumber,
+					int.MaxValue,
+					_events[fromEventNumber + 1].LogPosition,
+					CancellationToken.None);
+
+				CheckResult(_events.Take(fromEventNumber + 1).ToArray(), result);
+				Assert.True(result.IsEndOfStream);
+
+				result = await ReadIndex.ReadEventInfoBackward_NoCollisions(
+					Hash,
+					GetStreamId,
+					-1,
+					int.MaxValue,
+					_events[fromEventNumber + 1].LogPosition,
+					CancellationToken.None);
+
+				CheckResult(_events.Take(fromEventNumber + 1).ToArray(), result);
+				Assert.True(result.IsEndOfStream);
+			}
+		}
+	}
+
+	public class WithDeletedStream : ReadEventInfoBackward_NoCollisions {
+		private readonly List<EventRecord> _events = new();
+
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			_events.Add(await WriteSingleEvent(Stream, 0, "test data", token: token));
+			_events.Add(await WriteSingleEvent(Stream, 1, "test data", token: token));
+
+			var prepare = await WriteDeletePrepare(Stream, token);
+			await WriteDeleteCommit(prepare, token);
+		}
+
+		[Test]
+		public async Task can_read_events() {
+			var result = await ReadIndex.ReadEventInfoBackward_NoCollisions(
+				Hash,
+				GetStreamId,
+				1,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(_events.ToArray(), result);
+			Assert.True(result.IsEndOfStream);
+		}
+
+		[Test]
+		public async Task can_read_tombstone_event() {
+			var result = await ReadIndex.ReadEventInfoBackward_NoCollisions(
+				Hash,
+				GetStreamId,
+				EventNumber.DeletedStream,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(1, result.EventInfos.Length);
+			Assert.AreEqual(EventNumber.DeletedStream, result.EventInfos[0].EventNumber);
+			Assert.AreEqual(long.MaxValue - int.MaxValue, result.NextEventNumber);
+
+			result = await ReadIndex.ReadEventInfoBackward_NoCollisions(
+				Hash,
+				GetStreamId,
+				-1,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(1, result.EventInfos.Length);
+			Assert.AreEqual(EventNumber.DeletedStream, result.EventInfos[0].EventNumber);
+			Assert.AreEqual(long.MaxValue - int.MaxValue, result.NextEventNumber);
+
+			result = await ReadIndex.ReadEventInfoBackward_NoCollisions(
+				Hash,
+				GetStreamId,
+				EventNumber.DeletedStream - 1,
+				1,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(0, result.EventInfos.Length);
+			Assert.AreEqual(1, result.NextEventNumber);
+		}
+	}
+
+	public class WithGapsBetweenEvents : ReadEventInfoBackward_NoCollisions {
+		private readonly List<EventRecord> _events = new();
+
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			// PTable 1
+			await WriteSingleEvent(NonCollidingStream, 0, string.Empty, token: token);
+			await WriteSingleEvent(NonCollidingStream, 1, string.Empty, token: token);
+			_events.Add(await WriteSingleEvent(Stream, 0, string.Empty, token: token));
+
+			// PTable 2
+			_events.Add(await WriteSingleEvent(Stream, 4, string.Empty, token: token));
+			_events.Add(await WriteSingleEvent(Stream, 5, string.Empty, token: token));
+			await WriteSingleEvent(NonCollidingStream, 2, string.Empty, token: token);
+
+			// MemTable
+			_events.Add(await WriteSingleEvent(Stream, 7, string.Empty, token: token));
+			await WriteSingleEvent(NonCollidingStream, 3, string.Empty, token: token);
+		}
+
+		[Test]
+		public async Task strictly_returns_up_to_max_count_consecutive_events_from_start_event_number() {
+			var result = await ReadIndex.ReadEventInfoBackward_NoCollisions(
+				Hash,
+				GetStreamId,
+				7,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(_events.ToArray(), result);
+			Assert.True(result.IsEndOfStream);
+
+			result = await ReadIndex.ReadEventInfoBackward_NoCollisions(
+				Hash,
+				GetStreamId,
+				7,
+				4,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(_events.Skip(1).ToArray(), result);
+			Assert.AreEqual(3, result.NextEventNumber);
+
+
+			result = await ReadIndex.ReadEventInfoBackward_NoCollisions(
+				Hash,
+				GetStreamId,
+				3,
+				1,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(0, result.EventInfos.Length);
+			Assert.AreEqual(0, result.NextEventNumber);
+		}
+	}
+
+
+	public class WithDuplicateEvents : ReadEventInfoBackward_NoCollisions {
+		private readonly List<EventRecord> _events = new();
+
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			// PTable 1
+			await WriteSingleEvent(NonCollidingStream, 0, string.Empty, token: token);
+			await WriteSingleEvent(NonCollidingStream, 1, string.Empty, token: token);
+			_events.Add(await WriteSingleEvent(Stream, 0, string.Empty, token: token));
+
+			// PTable 2
+			_events.Add(await WriteSingleEvent(Stream, 1, string.Empty, token: token));
+			_events.Add(await WriteSingleEvent(Stream, 1, string.Empty, token: token));
+			await WriteSingleEvent(NonCollidingStream, 2, string.Empty, token: token);
+
+			// MemTable
+			_events.Add(await WriteSingleEvent(Stream, 2, string.Empty, token: token));
+			_events.Add(await WriteSingleEvent(Stream, 2, string.Empty, token: token));
+			_events.Add(await WriteSingleEvent(Stream, 2, string.Empty, token: token));
+		}
+
+		[Test]
+		public async Task result_is_deduplicated_keeping_oldest_duplicates() {
+			var result = await ReadIndex.ReadEventInfoBackward_NoCollisions(
+				Hash,
+				GetStreamId,
+				3,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(
+				_events
+					.GroupBy(x => x.EventNumber)
+					.Select(x => x.First())
+					.OrderBy(x => x.EventNumber)
+					.ToArray(),
+				result);
+			Assert.True(result.IsEndOfStream);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_NoCollisions_Randomized.cs b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_NoCollisions_Randomized.cs
new file mode 100644
index 00000000000..2e85cc0a0ea
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoBackward_NoCollisions_Randomized.cs
@@ -0,0 +1,122 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.Index.Hashers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.ReadIndex;
+
+[TestFixture(3)]
+[TestFixture(33)]
+[TestFixture(123)]
+[TestFixture(523)]
+public class ReadEventInfoBackward_NoCollisions_Randomized : ReadIndexTestScenario<LogFormat.V2, string> {
+	private const string Stream = "ab-1";
+	private const ulong Hash = 98;
+	private const string NonCollidingStream = "cd-1";
+
+	private string GetStreamId(ulong hash) => hash == Hash ? Stream : throw new ArgumentException();
+
+	private readonly Random _random = new Random();
+	private readonly int _numEvents;
+	private readonly List<EventRecord> _events;
+
+	public ReadEventInfoBackward_NoCollisions_Randomized(int maxEntriesInMemTable) : base(
+		chunkSize: 1_000_000,
+		maxEntriesInMemTable: maxEntriesInMemTable,
+		lowHasher: new ConstantHasher(0),
+		highHasher: new HumanReadableHasher32()) {
+		_numEvents = _random.Next(100, 400);
+		_events = new List<EventRecord>(_numEvents);
+	}
+
+	private static void CheckResult(EventRecord[] events, IndexReadEventInfoResult result) {
+		var eventInfos = result.EventInfos.Reverse().ToArray();
+		Assert.AreEqual(events.Length, eventInfos.Length);
+		for (int i = 0; i < events.Length; i++) {
+			Assert.AreEqual(events[i].EventNumber, eventInfos[i].EventNumber);
+			Assert.AreEqual(events[i].LogPosition, eventInfos[i].LogPosition);
+		}
+	}
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var streamLast = 0L;
+		var nonCollidingStreamLast = 0L;
+
+		for (int i = 0; i < _numEvents; i++) {
+			if (_random.Next(2) == 0) {
+				_events.Add(await WriteSingleEvent(Stream, streamLast++, "test data", token: token));
+			} else {
+				_events.Add(await WriteSingleEvent(NonCollidingStream, nonCollidingStreamLast++, "testing", token: token));
+			}
+		}
+	}
+
+	[Test]
+	public async Task returns_correct_events_before_position() {
+		var curEvents = new List<EventRecord>();
+
+		foreach (var @event in _events) {
+			IndexReadEventInfoResult result;
+			if (@event.EventStreamId == Stream) {
+				result = await ReadIndex.ReadEventInfoBackward_NoCollisions(Hash, GetStreamId,
+					@event.EventNumber - 1, int.MaxValue, @event.LogPosition, CancellationToken.None);
+				CheckResult(curEvents.ToArray(), result);
+				Assert.True(result.IsEndOfStream);
+
+				// events >= @event.EventNumber should be filtered out
+				result = await ReadIndex.ReadEventInfoBackward_NoCollisions(Hash, GetStreamId,
+					@event.EventNumber, int.MaxValue, @event.LogPosition, CancellationToken.None);
+				CheckResult(curEvents.ToArray(), result);
+				Assert.True(result.IsEndOfStream);
+
+				result = await ReadIndex.ReadEventInfoBackward_NoCollisions(Hash, GetStreamId,
+					@event.EventNumber + 1, int.MaxValue, @event.LogPosition, CancellationToken.None);
+				CheckResult(curEvents.ToArray(), result);
+				Assert.True(result.IsEndOfStream);
+			}
+
+			result = await ReadIndex.ReadEventInfoBackward_NoCollisions(Hash, GetStreamId, -1, int.MaxValue,
+				@event.LogPosition, CancellationToken.None);
+			CheckResult(curEvents.ToArray(), result);
+			Assert.True(result.IsEndOfStream);
+
+			if (@event.EventStreamId == Stream)
+				curEvents.Add(@event);
+		}
+	}
+
+	[Test]
+	public async Task returns_correct_events_with_max_count() {
+		var curEvents = new List<EventRecord>();
+
+		foreach (var @event in _events) {
+			if (@event.EventStreamId != Stream)
+				continue;
+			curEvents.Add(@event);
+
+			int maxCount = Math.Min((int)@event.EventNumber + 1, _random.Next(10, 100));
+			var fromEventNumber = @event.EventNumber;
+
+			Assert.Greater(maxCount, 0);
+			Assert.GreaterOrEqual(fromEventNumber, 0);
+
+			var result =
+				await ReadIndex.ReadEventInfoBackward_NoCollisions(
+					Hash, GetStreamId, fromEventNumber, maxCount, long.MaxValue, CancellationToken.None);
+			CheckResult(curEvents.Skip(curEvents.Count - maxCount).ToArray(), result);
+
+			if (fromEventNumber - maxCount < 0)
+				Assert.True(result.IsEndOfStream);
+			else
+				Assert.AreEqual(fromEventNumber - maxCount, result.NextEventNumber);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_KnownCollisions.cs b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_KnownCollisions.cs
new file mode 100644
index 00000000000..a96bbbae516
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_KnownCollisions.cs
@@ -0,0 +1,374 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.Index.Hashers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.ReadIndex;
+
+[TestFixture]
+public abstract class ReadEventInfoForward_KnownCollisions : ReadIndexTestScenario<LogFormat.V2, string> {
+	private const string Stream = "ab-1";
+	private const string CollidingStream = "cb-1";
+	private const string CollidingStream1 = "db-1";
+
+	protected ReadEventInfoForward_KnownCollisions() : base(
+		maxEntriesInMemTable: 3,
+		lowHasher: new ConstantHasher(0),
+		highHasher: new HumanReadableHasher32()) { }
+
+	private static void CheckResult(EventRecord[] events, IndexReadEventInfoResult result) {
+		Assert.AreEqual(events.Length, result.EventInfos.Length);
+		for (int i = 0; i < events.Length; i++) {
+			Assert.AreEqual(events[i].EventNumber, result.EventInfos[i].EventNumber);
+			Assert.AreEqual(events[i].LogPosition, result.EventInfos[i].LogPosition);
+		}
+	}
+
+	public class VerifyCollision : ReadEventInfoForward_KnownCollisions {
+		[Test]
+		public void verify_that_streams_collide() {
+			Assert.AreEqual(Hasher.Hash(Stream), Hasher.Hash(CollidingStream));
+			Assert.AreEqual(Hasher.Hash(Stream), Hasher.Hash(CollidingStream1));
+		}
+	}
+
+	public class WithNoEvents : ReadEventInfoForward_KnownCollisions {
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			await WriteSingleEvent(CollidingStream, 0, "test data", token: token);
+			await WriteSingleEvent(CollidingStream1, 0, "test data", token: token);
+		}
+
+		[Test]
+		public async Task with_no_events() {
+			var result = await ReadIndex.ReadEventInfoForward_KnownCollisions(
+				Stream,
+				0,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(0, result.EventInfos.Length);
+			Assert.True(result.IsEndOfStream);
+		}
+	}
+
+	public class WithOneEvent : ReadEventInfoForward_KnownCollisions {
+		private EventRecord _event, _collidingEvent;
+
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			_event = await WriteSingleEvent(Stream, 0, "test data", token: token);
+			_collidingEvent = await WriteSingleEvent(CollidingStream, 0, "test data", token: token);
+		}
+
+		[Test]
+		public async Task with_one_event() {
+			var result = await ReadIndex.ReadEventInfoForward_KnownCollisions(
+				Stream,
+				0,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(1, result.EventInfos.Length);
+			CheckResult(new[] { _event }, result);
+			Assert.AreEqual(int.MaxValue, result.NextEventNumber);
+
+			result = await ReadIndex.ReadEventInfoForward_KnownCollisions(
+				Stream,
+				1,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(new EventRecord[] { }, result);
+			Assert.True(result.IsEndOfStream);
+
+			result = await ReadIndex.ReadEventInfoForward_KnownCollisions(
+				CollidingStream,
+				0,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(1, result.EventInfos.Length);
+			CheckResult(new[] { _collidingEvent }, result);
+			Assert.AreEqual(int.MaxValue, result.NextEventNumber);
+
+			result = await ReadIndex.ReadEventInfoForward_KnownCollisions(
+				CollidingStream,
+				1,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(new EventRecord[] { }, result);
+			Assert.True(result.IsEndOfStream);
+		}
+	}
+
+	public class WithMultipleEvents : ReadEventInfoForward_KnownCollisions {
+		private readonly List<EventRecord> _events = new();
+
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			// PTable 1
+			await WriteSingleEvent(CollidingStream, 0, string.Empty);
+			await WriteSingleEvent(CollidingStream, 1, string.Empty);
+			_events.Add(await WriteSingleEvent(Stream, 0, string.Empty));
+
+			// PTable 2
+			_events.Add(await WriteSingleEvent(Stream, 1, string.Empty, token: token));
+			_events.Add(await WriteSingleEvent(Stream, 2, string.Empty, token: token));
+			await WriteSingleEvent(CollidingStream, 2, string.Empty, token: token);
+
+			// MemTable
+			_events.Add(await WriteSingleEvent(Stream, 3, string.Empty, token: token));
+			await WriteSingleEvent(CollidingStream, 3, string.Empty, token: token);
+		}
+
+		[Test]
+		public async Task with_multiple_events() {
+			for (int fromEventNumber = 0; fromEventNumber <= 4; fromEventNumber++) {
+				var result = await ReadIndex.ReadEventInfoForward_KnownCollisions(
+					Stream,
+					fromEventNumber,
+					int.MaxValue,
+					long.MaxValue,
+					CancellationToken.None);
+
+				CheckResult(_events.Skip(fromEventNumber).ToArray(), result);
+				if (fromEventNumber > 3)
+					Assert.True(result.IsEndOfStream);
+				else
+					Assert.AreEqual((long)fromEventNumber + int.MaxValue, result.NextEventNumber);
+			}
+		}
+
+		[Test]
+		public async Task with_multiple_events_and_max_count() {
+			for (int fromEventNumber = 0; fromEventNumber <= 4; fromEventNumber++) {
+				var result = await ReadIndex.ReadEventInfoForward_KnownCollisions(
+					Stream,
+					fromEventNumber,
+					2,
+					long.MaxValue,
+					CancellationToken.None);
+
+				CheckResult(_events.Skip(fromEventNumber).Take(2).ToArray(), result);
+				if (fromEventNumber > 3)
+					Assert.True(result.IsEndOfStream);
+				else
+					Assert.AreEqual((long)fromEventNumber + 2, result.NextEventNumber);
+			}
+		}
+
+		[Test]
+		public async Task with_multiple_events_and_before_position() {
+			for (int fromEventNumber = 0; fromEventNumber + 1 < _events.Count; fromEventNumber++) {
+				var result = await ReadIndex.ReadEventInfoForward_KnownCollisions(
+					Stream,
+					fromEventNumber,
+					int.MaxValue,
+					_events[fromEventNumber + 1].LogPosition,
+					CancellationToken.None);
+
+				CheckResult(_events.Skip(fromEventNumber).Take(1).ToArray(), result);
+				Assert.AreEqual((long)fromEventNumber + int.MaxValue, result.NextEventNumber);
+			}
+		}
+	}
+
+	public class WithDeletedStream : ReadEventInfoForward_KnownCollisions {
+		private readonly List<EventRecord> _events = new();
+
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			_events.Add(await WriteSingleEvent(Stream, 0, "test data", token: token));
+			await WriteSingleEvent(CollidingStream, 1, "test data", token: token);
+			_events.Add(await WriteSingleEvent(Stream, 1, "test", token: token));
+
+			var prepare = await WriteDeletePrepare(Stream, token);
+			await WriteDeleteCommit(prepare, token);
+		}
+
+		[Test]
+		public async Task can_read_events_and_tombstone_event_not_returned() {
+			var result = await ReadIndex.ReadEventInfoForward_KnownCollisions(
+				Stream,
+				0,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(_events.ToArray(), result);
+			Assert.AreEqual(int.MaxValue, result.NextEventNumber);
+		}
+
+		[Test]
+		public async Task next_event_number_set_correctly() {
+			var result = await ReadIndex.ReadEventInfoForward_KnownCollisions(
+				Stream,
+				2,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(0, result.EventInfos.Length);
+			Assert.AreEqual(EventNumber.DeletedStream, result.NextEventNumber);
+		}
+
+		[Test]
+		public async Task can_read_tombstone_event() {
+			var result = await ReadIndex.ReadEventInfoForward_KnownCollisions(
+				Stream,
+				EventNumber.DeletedStream,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(1, result.EventInfos.Length);
+			Assert.AreEqual(EventNumber.DeletedStream, result.EventInfos[0].EventNumber);
+			Assert.True(result.IsEndOfStream);
+		}
+	}
+
+	public class WithGapsBetweenEvents : ReadEventInfoForward_KnownCollisions {
+		private readonly List<EventRecord> _events = new();
+
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			// PTable 1
+			await WriteSingleEvent(CollidingStream, 0, string.Empty, token: token);
+			await WriteSingleEvent(CollidingStream, 1, string.Empty, token: token);
+			_events.Add(await WriteSingleEvent(Stream, 0, string.Empty, token: token));
+
+			// PTable 2
+			_events.Add(await WriteSingleEvent(Stream, 4, string.Empty, token: token));
+			_events.Add(await WriteSingleEvent(Stream, 5, string.Empty, token: token));
+			await WriteSingleEvent(CollidingStream, 2, string.Empty, token: token);
+
+			// MemTable
+			_events.Add(await WriteSingleEvent(Stream, 11, string.Empty, token: token));
+			await WriteSingleEvent(CollidingStream, 3, string.Empty, token: token);
+			await WriteSingleEvent(CollidingStream1, 15, string.Empty, token: token);
+		}
+
+		[Test]
+		public async Task strictly_returns_up_to_max_count_consecutive_events_from_start_event_number() {
+			var result = await ReadIndex.ReadEventInfoForward_KnownCollisions(
+				Stream,
+				0,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(_events.ToArray(), result);
+			Assert.AreEqual(int.MaxValue, result.NextEventNumber);
+
+			result = await ReadIndex.ReadEventInfoForward_KnownCollisions(
+				Stream,
+				0,
+				3,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(_events.Take(1).ToArray(), result);
+			Assert.AreEqual(3, result.NextEventNumber);
+
+			result = await ReadIndex.ReadEventInfoForward_KnownCollisions(
+				Stream,
+				3,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(_events.Skip(1).ToArray(), result);
+			Assert.AreEqual((long)3 + int.MaxValue, result.NextEventNumber);
+
+			result = await ReadIndex.ReadEventInfoForward_KnownCollisions(
+				Stream,
+				4,
+				3,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(_events.Skip(1).Take(2).ToArray(), result);
+			Assert.AreEqual(7, result.NextEventNumber);
+
+			result = await ReadIndex.ReadEventInfoForward_KnownCollisions(
+				Stream,
+				7,
+				3,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(0, result.EventInfos.Length);
+			Assert.AreEqual(11, result.NextEventNumber);
+
+			result = await ReadIndex.ReadEventInfoForward_KnownCollisions(
+				Stream,
+				12,
+				1,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(0, result.EventInfos.Length);
+			Assert.AreEqual(15, result.NextEventNumber); // from colliding stream, but doesn't matter much
+
+			result = await ReadIndex.ReadEventInfoForward_KnownCollisions(
+				Stream,
+				12,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(0, result.EventInfos.Length);
+			Assert.True(result.IsEndOfStream);
+		}
+	}
+
+
+	public class WithDuplicateEvents : ReadEventInfoForward_KnownCollisions {
+		private readonly List<EventRecord> _events = new();
+
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			// PTable 1
+			await WriteSingleEvent(CollidingStream, 0, string.Empty, token: token);
+			await WriteSingleEvent(CollidingStream, 1, string.Empty, token: token);
+			_events.Add(await WriteSingleEvent(Stream, 0, string.Empty, token: token));
+
+			// PTable 2
+			_events.Add(await WriteSingleEvent(Stream, 1, string.Empty, token: token));
+			_events.Add(await WriteSingleEvent(Stream, 1, string.Empty, token: token));
+			await WriteSingleEvent(CollidingStream, 2, string.Empty, token: token);
+
+			// MemTable
+			_events.Add(await WriteSingleEvent(Stream, 2, string.Empty, token: token));
+			_events.Add(await WriteSingleEvent(Stream, 2, string.Empty, token: token));
+			_events.Add(await WriteSingleEvent(Stream, 2, string.Empty, token: token));
+		}
+
+		[Test]
+		public async Task result_is_deduplicated_keeping_oldest_duplicates() {
+			var result = await ReadIndex.ReadEventInfoForward_KnownCollisions(
+				Stream,
+				0,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(
+				_events
+					.GroupBy(x => x.EventNumber)
+					.Select(x => x.First())
+					.OrderBy(x => x.EventNumber)
+					.ToArray(),
+				result);
+			Assert.AreEqual(int.MaxValue, result.NextEventNumber);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_KnownCollisions_Randomized.cs b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_KnownCollisions_Randomized.cs
new file mode 100644
index 00000000000..679738187ca
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_KnownCollisions_Randomized.cs
@@ -0,0 +1,96 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.Index.Hashers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.ReadIndex;
+
+[TestFixture(3)]
+[TestFixture(33)]
+[TestFixture(123)]
+[TestFixture(523)]
+public class ReadEventInfoForward_KnownCollisions_Randomized : ReadIndexTestScenario<LogFormat.V2, string> {
+	private const string Stream = "ab-1";
+	private const string CollidingStream = "cb-1";
+
+	private readonly Random _random = new Random();
+	private readonly int _numEvents;
+	private readonly List<EventRecord> _events;
+
+	public ReadEventInfoForward_KnownCollisions_Randomized(int maxEntriesInMemTable) : base(
+		chunkSize: 1_000_000,
+		maxEntriesInMemTable: maxEntriesInMemTable,
+		lowHasher: new ConstantHasher(0),
+		highHasher: new HumanReadableHasher32()) {
+		_numEvents = _random.Next(100, 400);
+		_events = new List<EventRecord>(_numEvents);
+	}
+
+	private static void CheckResult(EventRecord[] events, IndexReadEventInfoResult result) {
+		Assert.AreEqual(events.Length, result.EventInfos.Length);
+		for (int i = 0; i < events.Length; i++) {
+			Assert.AreEqual(events[i].EventNumber, result.EventInfos[i].EventNumber);
+			Assert.AreEqual(events[i].LogPosition, result.EventInfos[i].LogPosition);
+		}
+	}
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var streamLast = 0L;
+		var collidingStreamLast = 0L;
+
+		for (int i = 0; i < _numEvents; i++) {
+			if (_random.Next(2) == 0) {
+				_events.Add(await WriteSingleEvent(Stream, streamLast++, "test data", token: token));
+			} else {
+				_events.Add(await WriteSingleEvent(CollidingStream, collidingStreamLast++, "testing", token: token));
+			}
+		}
+	}
+
+	[Test]
+	public async Task returns_correct_events_before_position() {
+		var curEvents = new List<EventRecord>();
+		foreach (var @event in _events) {
+			var result =
+				await ReadIndex.ReadEventInfoForward_KnownCollisions(Stream, 0, int.MaxValue, @event.LogPosition, CancellationToken.None);
+			CheckResult(curEvents.ToArray(), result);
+			if (curEvents.Count == 0)
+				Assert.True(result.IsEndOfStream);
+			else
+				Assert.AreEqual(int.MaxValue, result.NextEventNumber);
+
+			if (@event.EventStreamId == Stream)
+				curEvents.Add(@event);
+		}
+	}
+
+	[Test]
+	public async Task returns_correct_events_with_max_count() {
+		var curEvents = new List<EventRecord>();
+
+		foreach (var @event in _events) {
+			if (@event.EventStreamId != Stream)
+				continue;
+			curEvents.Add(@event);
+
+			int maxCount = Math.Min((int)@event.EventNumber + 1, _random.Next(10, 100));
+			var fromEventNumber = @event.EventNumber - maxCount + 1;
+
+			Assert.Greater(maxCount, 0);
+			Assert.GreaterOrEqual(fromEventNumber, 0);
+
+			var result = await ReadIndex.ReadEventInfoForward_KnownCollisions(
+				Stream, fromEventNumber, maxCount, long.MaxValue, CancellationToken.None);
+			CheckResult(curEvents.Skip(curEvents.Count - maxCount).ToArray(), result);
+			Assert.AreEqual(@event.EventNumber + 1, result.NextEventNumber);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_NoCollisions.cs b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_NoCollisions.cs
new file mode 100644
index 00000000000..a1485a3e436
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_NoCollisions.cs
@@ -0,0 +1,324 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.Index.Hashers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.ReadIndex;
+
+[TestFixture]
+public abstract class ReadEventInfoForward_NoCollisions : ReadIndexTestScenario<LogFormat.V2, string> {
+	private const string Stream = "ab-1";
+	private const ulong Hash = 98;
+	private const string NonCollidingStream = "cd-1";
+
+	protected ReadEventInfoForward_NoCollisions() : base(
+		maxEntriesInMemTable: 3,
+		lowHasher: new ConstantHasher(0),
+		highHasher: new HumanReadableHasher32()) { }
+
+	private static void CheckResult(EventRecord[] events, IndexReadEventInfoResult result) {
+		Assert.AreEqual(events.Length, result.EventInfos.Length);
+		for (int i = 0; i < events.Length; i++) {
+			Assert.AreEqual(events[i].EventNumber, result.EventInfos[i].EventNumber);
+			Assert.AreEqual(events[i].LogPosition, result.EventInfos[i].LogPosition);
+		}
+	}
+
+	public class VerifyNoCollision : ReadEventInfoForward_NoCollisions {
+		[Test]
+		public void verify_that_streams_do_not_collide() {
+			Assert.AreNotEqual(Hasher.Hash(Stream), Hasher.Hash(NonCollidingStream));
+		}
+	}
+
+	public class WithNoEvents : ReadEventInfoForward_NoCollisions {
+		[Test]
+		public async Task with_no_events() {
+			var result = await ReadIndex.ReadEventInfoForward_NoCollisions(
+				Hash,
+				0,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(0, result.EventInfos.Length);
+			Assert.True(result.IsEndOfStream);
+		}
+	}
+
+	public class WithOneEvent : ReadEventInfoForward_NoCollisions {
+		private EventRecord _event;
+
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			_event = await WriteSingleEvent(Stream, 0, "test data", token: token);
+		}
+
+		[Test]
+		public async Task with_one_event() {
+			var result = await ReadIndex.ReadEventInfoForward_NoCollisions(
+				Hash,
+				0,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(1, result.EventInfos.Length);
+			Assert.AreEqual(int.MaxValue, result.NextEventNumber);
+			CheckResult(new[] { _event }, result);
+
+			result = await ReadIndex.ReadEventInfoForward_NoCollisions(
+				Hash,
+				1,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+			Assert.True(result.IsEndOfStream);
+			CheckResult(new EventRecord[] { }, result);
+		}
+	}
+
+	public class WithMultipleEvents : ReadEventInfoForward_NoCollisions {
+		private readonly List<EventRecord> _events = new();
+
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			// PTable 1
+			await WriteSingleEvent(NonCollidingStream, 0, string.Empty, token: token);
+			await WriteSingleEvent(NonCollidingStream, 1, string.Empty, token: token);
+			_events.Add(await WriteSingleEvent(Stream, 0, string.Empty, token: token));
+
+			// PTable 2
+			_events.Add(await WriteSingleEvent(Stream, 1, string.Empty, token: token));
+			_events.Add(await WriteSingleEvent(Stream, 2, string.Empty, token: token));
+			await WriteSingleEvent(NonCollidingStream, 2, string.Empty, token: token);
+
+			// MemTable
+			_events.Add(await WriteSingleEvent(Stream, 3, string.Empty, token: token));
+			await WriteSingleEvent(NonCollidingStream, 3, string.Empty, token: token);
+		}
+
+		[Test]
+		public async Task with_multiple_events() {
+			for (int fromEventNumber = 0; fromEventNumber <= 4; fromEventNumber++) {
+				var result = await ReadIndex.ReadEventInfoForward_NoCollisions(
+					Hash,
+					fromEventNumber,
+					int.MaxValue,
+					long.MaxValue,
+					CancellationToken.None);
+
+				CheckResult(_events.Skip(fromEventNumber).ToArray(), result);
+
+				if (fromEventNumber > 3)
+					Assert.True(result.IsEndOfStream);
+				else
+					Assert.AreEqual((long)fromEventNumber + int.MaxValue, result.NextEventNumber);
+			}
+		}
+
+		[Test]
+		public async Task with_multiple_events_and_max_count() {
+			for (int fromEventNumber = 0; fromEventNumber <= 4; fromEventNumber++) {
+				var result = await ReadIndex.ReadEventInfoForward_NoCollisions(
+					Hash,
+					fromEventNumber,
+					2,
+					long.MaxValue,
+					CancellationToken.None);
+
+				CheckResult(_events.Skip(fromEventNumber).Take(2).ToArray(), result);
+				if (fromEventNumber > 3)
+					Assert.True(result.IsEndOfStream);
+				else
+					Assert.AreEqual(fromEventNumber + 2, result.NextEventNumber);
+			}
+		}
+
+		[Test]
+		public async Task with_multiple_events_and_before_position() {
+			for (int fromEventNumber = 0; fromEventNumber + 1 < _events.Count; fromEventNumber++) {
+				var result = await ReadIndex.ReadEventInfoForward_NoCollisions(
+					Hash,
+					fromEventNumber,
+					int.MaxValue,
+					_events[fromEventNumber + 1].LogPosition,
+					CancellationToken.None);
+
+				CheckResult(_events.Skip(fromEventNumber).Take(1).ToArray(), result);
+				Assert.AreEqual((long)fromEventNumber + int.MaxValue, result.NextEventNumber);
+			}
+		}
+	}
+
+	public class WithDeletedStream : ReadEventInfoForward_NoCollisions {
+		private readonly List<EventRecord> _events = new();
+
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			_events.Add(await WriteSingleEvent(Stream, 0, "test data", token: token));
+			_events.Add(await WriteSingleEvent(Stream, 1, "test data", token: token));
+
+			var prepare = await WriteDeletePrepare(Stream, token);
+			await WriteDeleteCommit(prepare, token);
+		}
+
+		[Test]
+		public async Task can_read_events_and_tombstone_event_not_returned() {
+			var result = await ReadIndex.ReadEventInfoForward_NoCollisions(
+				Hash,
+				0,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(_events.ToArray(), result);
+			Assert.AreEqual(int.MaxValue, result.NextEventNumber);
+		}
+
+		[Test]
+		public async Task next_event_number_set_correctly() {
+			var result = await ReadIndex.ReadEventInfoForward_NoCollisions(
+				Hash,
+				2,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(0, result.EventInfos.Length);
+			Assert.AreEqual(EventNumber.DeletedStream, result.NextEventNumber);
+		}
+
+		[Test]
+		public async Task can_read_tombstone_event() {
+			var result = await ReadIndex.ReadEventInfoForward_NoCollisions(
+				Hash,
+				EventNumber.DeletedStream,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(1, result.EventInfos.Length);
+			Assert.AreEqual(EventNumber.DeletedStream, result.EventInfos[0].EventNumber);
+			Assert.True(result.IsEndOfStream);
+		}
+	}
+
+	public class WithGapsBetweenEvents : ReadEventInfoForward_NoCollisions {
+		private readonly List<EventRecord> _events = new();
+
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			// PTable 1
+			await WriteSingleEvent(NonCollidingStream, 0, string.Empty, token: token);
+			await WriteSingleEvent(NonCollidingStream, 1, string.Empty, token: token);
+			_events.Add(await WriteSingleEvent(Stream, 0, string.Empty, token: token));
+
+			// PTable 2
+			_events.Add(await WriteSingleEvent(Stream, 4, string.Empty, token: token));
+			_events.Add(await WriteSingleEvent(Stream, 5, string.Empty, token: token));
+			await WriteSingleEvent(NonCollidingStream, 2, string.Empty, token: token);
+
+			// MemTable
+			_events.Add(await WriteSingleEvent(Stream, 11, string.Empty, token: token));
+			await WriteSingleEvent(NonCollidingStream, 3, string.Empty, token: token);
+		}
+
+		[Test]
+		public async Task strictly_returns_up_to_max_count_consecutive_events_from_start_event_number() {
+			var result = await ReadIndex.ReadEventInfoForward_NoCollisions(
+				Hash,
+				0,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(_events.ToArray(), result);
+			Assert.AreEqual(int.MaxValue, result.NextEventNumber);
+
+			result = await ReadIndex.ReadEventInfoForward_NoCollisions(
+				Hash,
+				0,
+				3,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(_events.Take(1).ToArray(), result);
+			Assert.AreEqual(3, result.NextEventNumber);
+
+			result = await ReadIndex.ReadEventInfoForward_NoCollisions(
+				Hash,
+				3,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(_events.Skip(1).ToArray(), result);
+			Assert.AreEqual((long)3 + int.MaxValue, result.NextEventNumber);
+
+			result = await ReadIndex.ReadEventInfoForward_NoCollisions(
+				Hash,
+				4,
+				3,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(_events.Skip(1).Take(2).ToArray(), result);
+			Assert.AreEqual(7, result.NextEventNumber);
+
+			result = await ReadIndex.ReadEventInfoForward_NoCollisions(
+				Hash,
+				7,
+				3,
+				long.MaxValue,
+				CancellationToken.None);
+
+			Assert.AreEqual(0, result.EventInfos.Length);
+			Assert.AreEqual(11, result.NextEventNumber);
+		}
+	}
+
+
+	public class WithDuplicateEvents : ReadEventInfoForward_NoCollisions {
+		private readonly List<EventRecord> _events = new();
+
+		protected override async ValueTask WriteTestScenario(CancellationToken token) {
+			// PTable 1
+			await WriteSingleEvent(NonCollidingStream, 0, string.Empty, token: token);
+			await WriteSingleEvent(NonCollidingStream, 1, string.Empty, token: token);
+			_events.Add(await WriteSingleEvent(Stream, 0, string.Empty, token: token));
+
+			// PTable 2
+			_events.Add(await WriteSingleEvent(Stream, 1, string.Empty, token: token));
+			_events.Add(await WriteSingleEvent(Stream, 1, string.Empty, token: token));
+			await WriteSingleEvent(NonCollidingStream, 2, string.Empty, token: token);
+
+			// MemTable
+			_events.Add(await WriteSingleEvent(Stream, 2, string.Empty, token: token));
+			_events.Add(await WriteSingleEvent(Stream, 2, string.Empty, token: token));
+			_events.Add(await WriteSingleEvent(Stream, 2, string.Empty, token: token));
+		}
+
+		[Test]
+		public async Task result_is_deduplicated_keeping_oldest_duplicates() {
+			var result = await ReadIndex.ReadEventInfoForward_NoCollisions(
+				Hash,
+				0,
+				int.MaxValue,
+				long.MaxValue,
+				CancellationToken.None);
+
+			CheckResult(
+				_events
+					.GroupBy(x => x.EventNumber)
+					.Select(x => x.First())
+					.OrderBy(x => x.EventNumber)
+					.ToArray(),
+				result);
+			Assert.AreEqual(int.MaxValue, result.NextEventNumber);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_NoCollisions_Randomized.cs b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_NoCollisions_Randomized.cs
new file mode 100644
index 00000000000..79c440bf1b4
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfoForward_NoCollisions_Randomized.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.Index.Hashers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.ReadIndex;
+
+[TestFixture(3)]
+[TestFixture(33)]
+[TestFixture(123)]
+[TestFixture(523)]
+public class ReadEventInfoForward_NoCollisions_Randomized : ReadIndexTestScenario<LogFormat.V2, string> {
+	private const string Stream = "ab-1";
+	private const ulong Hash = 98;
+	private const string NonCollidingStream = "cd-1";
+
+	private readonly Random _random = new Random();
+	private readonly int _numEvents;
+	private readonly List<EventRecord> _events;
+
+	public ReadEventInfoForward_NoCollisions_Randomized(int maxEntriesInMemTable) : base(
+		chunkSize: 1_000_000,
+		maxEntriesInMemTable: maxEntriesInMemTable,
+		lowHasher: new ConstantHasher(0),
+		highHasher: new HumanReadableHasher32()) {
+		_numEvents = _random.Next(100, 400);
+		_events = new List<EventRecord>(_numEvents);
+	}
+
+	private static void CheckResult(EventRecord[] events, IndexReadEventInfoResult result) {
+		Assert.AreEqual(events.Length, result.EventInfos.Length);
+		for (int i = 0; i < events.Length; i++) {
+			Assert.AreEqual(events[i].EventNumber, result.EventInfos[i].EventNumber);
+			Assert.AreEqual(events[i].LogPosition, result.EventInfos[i].LogPosition);
+		}
+	}
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var streamLast = 0L;
+		var nonCollidingStreamLast = 0L;
+
+		for (int i = 0; i < _numEvents; i++) {
+			if (_random.Next(2) == 0) {
+				_events.Add(await WriteSingleEvent(Stream, streamLast++, "test data", token: token));
+			} else {
+				_events.Add(await WriteSingleEvent(NonCollidingStream, nonCollidingStreamLast++, "testing", token: token));
+			}
+		}
+	}
+
+	[Test]
+	public async Task returns_correct_events_before_position() {
+		var curEvents = new List<EventRecord>();
+
+		foreach (var @event in _events) {
+			var result = await ReadIndex.ReadEventInfoForward_NoCollisions(Hash, 0, int.MaxValue, @event.LogPosition, CancellationToken.None);
+			CheckResult(curEvents.ToArray(), result);
+			if (curEvents.Count == 0)
+				Assert.True(result.IsEndOfStream);
+			else
+				Assert.AreEqual(int.MaxValue, result.NextEventNumber);
+
+			if (@event.EventStreamId == Stream)
+				curEvents.Add(@event);
+		}
+	}
+
+	[Test]
+	public async Task returns_correct_events_with_max_count() {
+		var curEvents = new List<EventRecord>();
+
+		foreach (var @event in _events) {
+			if (@event.EventStreamId != Stream)
+				continue;
+			curEvents.Add(@event);
+
+			int maxCount = Math.Min((int)@event.EventNumber + 1, _random.Next(10, 100));
+			var fromEventNumber = @event.EventNumber - maxCount + 1;
+
+			Assert.Greater(maxCount, 0);
+			Assert.GreaterOrEqual(fromEventNumber, 0);
+
+			var result = await ReadIndex.ReadEventInfoForward_NoCollisions(
+				Hash, fromEventNumber, maxCount, long.MaxValue, CancellationToken.None);
+			CheckResult(curEvents.Skip(curEvents.Count - maxCount).ToArray(), result);
+			Assert.AreEqual(@event.EventNumber + 1, result.NextEventNumber);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfo_KeepDuplicates.cs b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfo_KeepDuplicates.cs
new file mode 100644
index 00000000000..96ba404aaf1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndex/ReadEventInfo_KeepDuplicates.cs
@@ -0,0 +1,153 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.Index.Hashers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.ReadIndex;
+
+[TestFixture]
+public class ReadEventInfo_KeepDuplicates : ReadIndexTestScenario<LogFormat.V2, string> {
+	private const string Stream = "ab-1";
+	private const string CollidingStream = "cb-1";
+	private const string SoftDeletedStream = "de-1";
+	private const string HardDeletedStream = "fg-1";
+
+	private readonly List<EventRecord> _events = new();
+
+	public ReadEventInfo_KeepDuplicates() : base(
+		maxEntriesInMemTable: 3,
+		lowHasher: new ConstantHasher(0),
+		highHasher: new HumanReadableHasher32()) { }
+
+	private static void CheckResult(EventRecord[] events, IndexReadEventInfoResult result) {
+		Assert.AreEqual(events.Length, result.EventInfos.Length);
+		for (int i = 0; i < events.Length; i++) {
+			Assert.AreEqual(events[i].EventNumber, result.EventInfos[i].EventNumber);
+			Assert.AreEqual(events[i].LogPosition, result.EventInfos[i].LogPosition);
+		}
+	}
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		// PTable 1
+		_events.Add(await WriteSingleEvent(Stream, 0, string.Empty, token: token));
+		_events.Add(await WriteSingleEvent(Stream, 1, string.Empty, token: token));
+		_events.Add(await WriteSingleEvent(Stream, 2, string.Empty, token: token));
+
+		// PTable 2
+		_events.Add(await WriteSingleEvent(Stream, 3, string.Empty, token: token));
+		_events.Add(await WriteSingleEvent(Stream, 2, string.Empty, token: token)); // duplicate
+		_events.Add(await WriteSingleEvent(CollidingStream, 3, string.Empty, token: token)); // colliding stream
+
+		// PTable 3
+		_events.Add(await WriteSingleEvent(Stream, 2, string.Empty, token: token)); // duplicate
+		_events.Add(await WriteSingleEvent(SoftDeletedStream, 10, string.Empty, token: token)); // soft deleted stream
+		_events.Add(await WriteSingleEvent(HardDeletedStream, 20, string.Empty, token: token)); // hard deleted stream
+
+		// MemTable
+		await WriteStreamMetadata(SoftDeletedStream, 0, @"{""$tb"":11}", token: token);
+		await WriteDelete(HardDeletedStream, token);
+	}
+
+	[Test]
+	public async Task returns_correct_info_for_normal_event() {
+		var result = await ReadIndex.ReadEventInfo_KeepDuplicates(Stream, 1, CancellationToken.None);
+		var events = _events
+			.Where(x => x.EventStreamId == Stream && x.EventNumber == 1)
+			.ToArray();
+
+		Assert.AreEqual(1, events.Length);
+		Assert.AreEqual(-1, result.NextEventNumber);
+		Assert.AreEqual(true, result.IsEndOfStream);
+		CheckResult(events, result);
+	}
+
+	[Test]
+	public async Task returns_correct_info_for_duplicate_events() {
+		var result = await ReadIndex.ReadEventInfo_KeepDuplicates(Stream, 2, CancellationToken.None);
+		var events = _events
+			.Where(x => x.EventStreamId == Stream && x.EventNumber == 2)
+			.ToArray();
+
+		Assert.AreEqual(3, events.Length);
+		Assert.AreEqual(-1, result.NextEventNumber);
+		Assert.AreEqual(true, result.IsEndOfStream);
+		CheckResult(events, result);
+	}
+
+	[Test]
+	public async Task returns_correct_info_for_colliding_stream() {
+		var result = await ReadIndex.ReadEventInfo_KeepDuplicates(Stream, 3, CancellationToken.None);
+		var events = _events
+			.Where(x => x.EventStreamId == Stream && x.EventNumber == 3)
+			.ToArray();
+
+		Assert.AreEqual(1, events.Length);
+		Assert.AreEqual(-1, result.NextEventNumber);
+		Assert.AreEqual(true, result.IsEndOfStream);
+		CheckResult(events, result);
+
+		result = await ReadIndex.ReadEventInfo_KeepDuplicates(CollidingStream, 3, CancellationToken.None);
+		events = _events
+			.Where(x => x.EventStreamId == CollidingStream && x.EventNumber == 3)
+			.ToArray();
+
+		Assert.AreEqual(1, events.Length);
+		Assert.AreEqual(-1, result.NextEventNumber);
+		Assert.AreEqual(true, result.IsEndOfStream);
+		CheckResult(events, result);
+	}
+
+	[Test]
+	public async Task returns_correct_info_for_soft_deleted_stream() {
+		var result = await ReadIndex.ReadEventInfo_KeepDuplicates(SoftDeletedStream, 10, CancellationToken.None);
+		var events = _events
+			.Where(x => x.EventStreamId == SoftDeletedStream && x.EventNumber == 10)
+			.ToArray();
+
+		Assert.AreEqual(1, events.Length);
+		Assert.AreEqual(-1, result.NextEventNumber);
+		Assert.AreEqual(true, result.IsEndOfStream);
+		CheckResult(events, result);
+	}
+
+	[Test]
+	public async Task returns_correct_info_for_hard_deleted_stream() {
+		var result = await ReadIndex.ReadEventInfo_KeepDuplicates(HardDeletedStream, 20, CancellationToken.None);
+		var events = _events
+			.Where(x => x.EventStreamId == HardDeletedStream && x.EventNumber == 20)
+			.ToArray();
+
+		Assert.AreEqual(1, events.Length);
+		Assert.AreEqual(-1, result.NextEventNumber);
+		Assert.AreEqual(true, result.IsEndOfStream);
+		CheckResult(events, result);
+	}
+
+	[Test]
+	public async Task returns_empty_info_when_event_does_not_exist() {
+		var result = await ReadIndex.ReadEventInfo_KeepDuplicates(Stream, 6, CancellationToken.None);
+		var events = _events
+			.Where(x => x.EventStreamId == Stream && x.EventNumber == 6)
+			.ToArray();
+
+		Assert.AreEqual(0, events.Length);
+		Assert.AreEqual(-1, result.NextEventNumber);
+		Assert.AreEqual(true, result.IsEndOfStream);
+
+		result = await ReadIndex.ReadEventInfo_KeepDuplicates(CollidingStream, 4, CancellationToken.None);
+		events = _events
+			.Where(x => x.EventStreamId == CollidingStream && x.EventNumber == 4)
+			.ToArray();
+
+		Assert.AreEqual(0, events.Length);
+		Assert.AreEqual(-1, result.NextEventNumber);
+		Assert.AreEqual(true, result.IsEndOfStream);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/ReadIndexTestScenario.cs b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndexTestScenario.cs
new file mode 100644
index 00000000000..8b48e70bf14
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/ReadIndexTestScenario.cs
@@ -0,0 +1,509 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.TransactionLog;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.Util;
+using KurrentDB.LogCommon;
+using NUnit.Framework;
+using Serilog;
+
+namespace KurrentDB.Core.Tests.Services.Storage;
+
+public abstract class ReadIndexTestScenario<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	protected readonly int MaxEntriesInMemTable;
+	protected readonly int StreamInfoCacheCapacity;
+	protected readonly long MetastreamMaxCount;
+	protected readonly bool PerformAdditionalCommitChecks;
+	protected readonly byte IndexBitnessVersion;
+	protected LogFormatAbstractor<TStreamId> _logFormat;
+	protected IRecordFactory<TStreamId> _recordFactory;
+	protected INameIndex<TStreamId> _streamNameIndex;
+	protected INameIndex<TStreamId> _eventTypeIndex;
+	protected ITableIndex<TStreamId> TableIndex;
+	protected IReadIndex<TStreamId> ReadIndex;
+
+	protected IHasher<TStreamId> LowHasher { get; private set; }
+	protected IHasher<TStreamId> HighHasher { get; private set; }
+	protected ILongHasher<TStreamId> Hasher { get; private set; }
+
+	protected TFChunkDb Db;
+	protected TFChunkWriter Writer;
+	protected ICheckpoint WriterCheckpoint;
+	protected ICheckpoint ChaserCheckpoint;
+
+	private readonly int _chunkSize;
+	private TFChunkScavenger<TStreamId> _scavenger;
+	private bool _scavenge;
+	private bool _completeLastChunkOnScavenge;
+	private bool _mergeChunks;
+	private bool _scavengeIndex;
+
+	protected ReadIndexTestScenario(
+		int maxEntriesInMemTable = 20,
+		long metastreamMaxCount = 1,
+		int streamInfoCacheCapacity = 0,
+		byte indexBitnessVersion = Opts.IndexBitnessVersionDefault,
+		bool performAdditionalChecks = true,
+		int chunkSize = 10_000,
+		IHasher<TStreamId> lowHasher = null,
+		IHasher<TStreamId> highHasher = null) {
+
+		Ensure.Positive(maxEntriesInMemTable, "maxEntriesInMemTable");
+		MaxEntriesInMemTable = maxEntriesInMemTable;
+		StreamInfoCacheCapacity = streamInfoCacheCapacity;
+		MetastreamMaxCount = metastreamMaxCount;
+		IndexBitnessVersion = indexBitnessVersion;
+		PerformAdditionalCommitChecks = performAdditionalChecks;
+		LowHasher = lowHasher;
+		HighHasher = highHasher;
+		_chunkSize = chunkSize;
+	}
+
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var indexDirectory = GetFilePathFor("index");
+		_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
+			IndexDirectory = indexDirectory,
+		});
+		_recordFactory = _logFormat.RecordFactory;
+		_streamNameIndex = _logFormat.StreamNameIndex;
+		_eventTypeIndex = _logFormat.EventTypeIndex;
+		LowHasher ??= _logFormat.LowHasher;
+		HighHasher ??= _logFormat.HighHasher;
+		Hasher = new CompositeHasher<TStreamId>(LowHasher, HighHasher);
+
+		WriterCheckpoint = new InMemoryCheckpoint(0);
+		ChaserCheckpoint = new InMemoryCheckpoint(0);
+
+		Db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, WriterCheckpoint, ChaserCheckpoint,
+			replicationCheckpoint: new InMemoryCheckpoint(-1), chunkSize: _chunkSize));
+
+		await Db.Open();
+		// create db
+		Writer = new TFChunkWriter(Db);
+		await Writer.Open(CancellationToken.None);
+		await WriteTestScenario(CancellationToken.None);
+		await Writer.DisposeAsync();
+		Writer = null;
+
+		WriterCheckpoint.Flush();
+		ChaserCheckpoint.Write(WriterCheckpoint.Read());
+		ChaserCheckpoint.Flush();
+
+		var readers = new ObjectPool<ITransactionFileReader>("Readers", 2, 5,
+			() => new TFChunkReader(Db, Db.Config.WriterCheckpoint));
+		var emptyStreamId = _logFormat.EmptyStreamId;
+		TableIndex = TransformTableIndex(new TableIndex<TStreamId>(indexDirectory, LowHasher, HighHasher, emptyStreamId,
+			() => new HashListMemTable(IndexBitnessVersion, MaxEntriesInMemTable * 2),
+			() => new TFReaderLease(readers),
+			IndexBitnessVersion,
+			int.MaxValue,
+			Constants.PTableMaxReaderCountDefault,
+			MaxEntriesInMemTable));
+		_logFormat.StreamNamesProvider.SetTableIndex(TableIndex);
+
+		var readIndex = new ReadIndex<TStreamId>(new NoopPublisher(),
+			readers,
+			TableIndex,
+			_logFormat.StreamNameIndexConfirmer,
+			_logFormat.StreamIds,
+			_logFormat.StreamNamesProvider,
+			_logFormat.EmptyStreamId,
+			_logFormat.StreamIdValidator,
+			_logFormat.StreamIdSizer,
+			_logFormat.StreamExistenceFilter,
+			_logFormat.StreamExistenceFilterReader,
+			_logFormat.EventTypeIndexConfirmer,
+			new LRUCache<TStreamId, IndexBackend<TStreamId>.EventNumberCached>("LastEventNumber", StreamInfoCacheCapacity),
+			new LRUCache<TStreamId, IndexBackend<TStreamId>.MetadataCached>("StreamMetadata", StreamInfoCacheCapacity),
+			additionalCommitChecks: PerformAdditionalCommitChecks,
+			metastreamMaxCount: MetastreamMaxCount,
+			hashCollisionReadLimit: Opts.HashCollisionReadLimitDefault,
+			skipIndexScanOnReads: Opts.SkipIndexScanOnReadsDefault,
+			replicationCheckpoint: Db.Config.ReplicationCheckpoint,
+			indexCheckpoint: Db.Config.IndexCheckpoint,
+			indexStatusTracker: new IndexStatusTracker.NoOp(),
+			indexTracker: new IndexTracker.NoOp(),
+			cacheTracker: new CacheHitsMissesTracker.NoOp());
+
+		await readIndex.IndexCommitter.Init(ChaserCheckpoint.Read(), CancellationToken.None);
+		ReadIndex = readIndex;
+
+		// wait for tables to be merged
+		TableIndex.WaitForBackgroundTasks(16_000);
+
+		// scavenge must run after readIndex is built
+		if (_scavenge) {
+			if (_completeLastChunkOnScavenge)
+				await (await Db.Manager.GetInitializedChunk(Db.Manager.ChunksCount - 1, CancellationToken.None))
+					.Complete(CancellationToken.None);
+			_scavenger = new TFChunkScavenger<TStreamId>(Log.Logger, Db, new FakeTFScavengerLog(), TableIndex,
+				ReadIndex, _logFormat.Metastreams);
+			await _scavenger.Scavenge(alwaysKeepScavenged: true, mergeChunks: _mergeChunks,
+				scavengeIndex: _scavengeIndex);
+		}
+	}
+
+	public override async Task TestFixtureTearDown() {
+		_logFormat?.Dispose();
+		ReadIndex?.Close();
+		ReadIndex?.Dispose();
+
+		TableIndex?.Close();
+
+		await (Db?.DisposeAsync() ?? ValueTask.CompletedTask);
+		await base.TestFixtureTearDown();
+	}
+
+	protected virtual ITableIndex<TStreamId> TransformTableIndex(ITableIndex<TStreamId> tableIndex) {
+		return tableIndex;
+	}
+
+	protected virtual ValueTask WriteTestScenario(CancellationToken token)
+		=> token.IsCancellationRequested ? ValueTask.FromCanceled(token) : ValueTask.CompletedTask;
+
+	protected async ValueTask<(TStreamId, long)> GetOrReserve(string eventStreamName, CancellationToken token) {
+		var newPos = Writer.Position;
+		_streamNameIndex.GetOrReserve(_logFormat.RecordFactory, eventStreamName, newPos, out var eventStreamId, out var streamRecord);
+		if (streamRecord is not null) {
+			(_, newPos) = await Writer.Write(streamRecord, token);
+		}
+
+		return (eventStreamId, newPos);
+	}
+
+	protected async ValueTask<(TStreamId, long)> GetOrReserveEventType(string eventType, CancellationToken token) {
+		var newPos = Writer.Position;
+		_eventTypeIndex.GetOrReserveEventType(_logFormat.RecordFactory, eventType, newPos, out var eventTypeId, out var eventTypeRecord);
+		if (eventTypeRecord is not null) {
+			(_, newPos) = await Writer.Write(eventTypeRecord, token);
+		}
+
+		return (eventTypeId, newPos);
+	}
+
+	protected async ValueTask<EventRecord> WriteSingleEvent(string eventStreamName,
+		long eventNumber,
+		string data,
+		DateTime? timestamp = null,
+		Guid eventId = default,
+		bool retryOnFail = false,
+		string eventType = "some-type",
+		CancellationToken token = default) {
+		var (eventStreamId, _) = await GetOrReserve(eventStreamName, token);
+		var (eventTypeId, pos) = await GetOrReserveEventType(eventType, token);
+
+		var prepare = LogRecord.SingleWrite(_recordFactory, pos,
+			eventId == default(Guid) ? Guid.NewGuid() : eventId,
+			Guid.NewGuid(),
+			eventStreamId,
+			eventNumber - 1,
+			eventTypeId,
+			Helper.UTF8NoBom.GetBytes(data),
+			null,
+			timestamp);
+
+		if (!retryOnFail) {
+			Assert.IsTrue(await Writer.Write(prepare, token) is (true, _));
+		} else {
+			long firstPos = prepare.LogPosition;
+			(var success, pos) = await Writer.Write(prepare, token);
+			if (!success) {
+				prepare = LogRecord.SingleWrite(_recordFactory, pos,
+					prepare.CorrelationId,
+					prepare.EventId,
+					prepare.EventStreamId,
+					prepare.ExpectedVersion,
+					prepare.EventType,
+					prepare.Data,
+					prepare.Metadata,
+					prepare.TimeStamp);
+
+				if (await Writer.Write(prepare, token) is (false, _))
+					Assert.Fail("Second write try failed when first writing prepare at {0}, then at {1}.", firstPos,
+						prepare.LogPosition);
+			}
+		}
+
+
+		var commit = LogRecord.Commit(Writer.Position, prepare.CorrelationId, prepare.LogPosition,
+			eventNumber);
+		if (!retryOnFail) {
+			Assert.IsTrue(await Writer.Write(commit, token) is (true, _));
+		} else {
+			var firstPos = commit.LogPosition;
+			(var success, pos) = await Writer.Write(commit, token);
+			if (!success) {
+				commit = LogRecord.Commit(pos, prepare.CorrelationId, prepare.LogPosition,
+					eventNumber);
+				if (await Writer.Write(commit, token) is (false, _))
+					Assert.Fail("Second write try failed when first writing prepare at {0}, then at {1}.", firstPos,
+						prepare.LogPosition);
+			}
+		}
+		Assert.AreEqual(eventStreamId, prepare.EventStreamId);
+
+		var eventRecord = new EventRecord(eventNumber, prepare, eventStreamName, eventType);
+		return eventRecord;
+	}
+
+	protected async ValueTask<EventRecord> WriteStreamMetadata(string eventStreamName, long eventNumber, string metadata,
+		DateTime? timestamp = null,
+		CancellationToken token = default) {
+		var (eventStreamId, _) = await GetOrReserve(SystemStreams.MetastreamOf(eventStreamName), token);
+		var (eventTypeId, pos) = await GetOrReserveEventType(SystemEventTypes.StreamMetadata, token);
+		var prepare = LogRecord.SingleWrite(_recordFactory, pos,
+			Guid.NewGuid(),
+			Guid.NewGuid(),
+			eventStreamId,
+			eventNumber - 1,
+			eventTypeId,
+			Helper.UTF8NoBom.GetBytes(metadata),
+			null,
+			timestamp ?? DateTime.UtcNow,
+			PrepareFlags.IsJson);
+		Assert.IsTrue(await Writer.Write(prepare, token) is (true, _));
+
+		var commit = LogRecord.Commit(Writer.Position, prepare.CorrelationId, prepare.LogPosition,
+			eventNumber);
+		Assert.IsTrue(await Writer.Write(commit, token) is (true, _));
+		Assert.AreEqual(eventStreamId, prepare.EventStreamId);
+
+		var eventRecord = new EventRecord(eventNumber, prepare, SystemStreams.MetastreamOf(eventStreamName), SystemEventTypes.StreamMetadata);
+		return eventRecord;
+	}
+
+	protected async ValueTask<EventRecord> WriteTransactionBegin(string eventStreamName, long expectedVersion, long eventNumber,
+		string eventData, CancellationToken token) {
+		LogFormatHelper<TLogFormat, TStreamId>.CheckIfExplicitTransactionsSupported();
+		var (eventStreamId, _) = await GetOrReserve(eventStreamName, token);
+		var (eventTypeId, pos) = await GetOrReserveEventType("some-type", token);
+		var prepare = LogRecord.Prepare(_recordFactory, pos,
+			Guid.NewGuid(),
+			Guid.NewGuid(),
+			Writer.Position,
+			0,
+			eventStreamId,
+			expectedVersion,
+			PrepareFlags.Data | PrepareFlags.TransactionBegin,
+			eventTypeId,
+			Helper.UTF8NoBom.GetBytes(eventData),
+			null);
+		Assert.IsTrue(await Writer.Write(prepare, token) is (true, _));
+		Assert.AreEqual(eventStreamId, prepare.EventStreamId);
+
+		return new EventRecord(eventNumber, prepare, eventStreamName, "some-type");
+	}
+
+	protected async ValueTask<IPrepareLogRecord<TStreamId>> WriteTransactionBegin(string eventStreamName, long expectedVersion, CancellationToken token) {
+		LogFormatHelper<TLogFormat, TStreamId>.CheckIfExplicitTransactionsSupported();
+		var (eventStreamId, pos) = await GetOrReserve(eventStreamName, token);
+		var prepare = LogRecord.TransactionBegin(_recordFactory, pos, Guid.NewGuid(), eventStreamId,
+			expectedVersion);
+		Assert.IsTrue(await Writer.Write(prepare, token) is (true, _));
+		return prepare;
+	}
+
+	protected async ValueTask<EventRecord> WriteTransactionEvent(Guid correlationId,
+		long transactionPos,
+		int transactionOffset,
+		string eventStreamName,
+		long eventNumber,
+		string eventData,
+		PrepareFlags flags,
+		bool retryOnFail = false,
+		string eventType = "some-type",
+		CancellationToken token = default) {
+		LogFormatHelper<TLogFormat, TStreamId>.CheckIfExplicitTransactionsSupported();
+
+		var (eventStreamId, _) = await GetOrReserve(eventStreamName, token);
+		var (eventTypeId, pos) = await GetOrReserveEventType(eventType, token);
+
+		var prepare = LogRecord.Prepare(_recordFactory, pos,
+			correlationId,
+			Guid.NewGuid(),
+			transactionPos,
+			transactionOffset,
+			eventStreamId,
+			ExpectedVersion.Any,
+			flags,
+			eventTypeId,
+			Helper.UTF8NoBom.GetBytes(eventData),
+			null);
+
+		if (retryOnFail) {
+			long firstPos = prepare.LogPosition;
+			var (success, newPos) = await Writer.Write(prepare, token);
+			if (!success) {
+				var tPos = prepare.TransactionPosition == prepare.LogPosition
+					? newPos
+					: prepare.TransactionPosition;
+				prepare = prepare.CopyForRetry(
+					logPosition: newPos,
+					transactionPosition: tPos);
+				if (await Writer.Write(prepare, token) is (false, _))
+					Assert.Fail("Second write try failed when first writing prepare at {0}, then at {1}.", firstPos,
+						prepare.LogPosition);
+			}
+
+			Assert.AreEqual(eventStreamId, prepare.EventStreamId);
+			return new EventRecord(eventNumber, prepare, eventStreamName, eventType);
+		}
+
+		Assert.IsTrue(await Writer.Write(prepare, token) is (true, _));
+
+		Assert.AreEqual(eventStreamId, prepare.EventStreamId);
+		return new EventRecord(eventNumber, prepare, eventStreamName, eventType);
+	}
+
+	protected async ValueTask<IPrepareLogRecord<TStreamId>> WriteTransactionEnd(Guid correlationId, long transactionId, string eventStreamName, CancellationToken token) {
+		LogFormatHelper<TLogFormat, TStreamId>.CheckIfExplicitTransactionsSupported();
+		var (eventStreamId, _) = await GetOrReserve(eventStreamName, token);
+		return await WriteTransactionEnd(correlationId, transactionId, eventStreamId, token);
+	}
+
+	protected async ValueTask<IPrepareLogRecord<TStreamId>> WriteTransactionEnd(Guid correlationId, long transactionId, TStreamId eventStreamId, CancellationToken token) {
+		LogFormatHelper<TLogFormat, TStreamId>.CheckIfExplicitTransactionsSupported();
+		var prepare = LogRecord.TransactionEnd(_recordFactory, Writer.Position,
+			correlationId,
+			Guid.NewGuid(),
+			transactionId,
+			eventStreamId);
+		Assert.IsTrue(await Writer.Write(prepare, token) is (true, _));
+		return prepare;
+	}
+
+	protected async ValueTask<IPrepareLogRecord<TStreamId>> WritePrepare(string eventStreamName,
+		long expectedVersion,
+		Guid eventId = default,
+		string eventType = null,
+		string data = null,
+		PrepareFlags additionalFlags = PrepareFlags.None,
+		CancellationToken token = default) {
+		var (eventStreamId, _) = await GetOrReserve(eventStreamName, token);
+		var (eventTypeId, pos) = await GetOrReserveEventType(eventType.IsEmptyString() ? "some-type" : eventType, token);
+		var prepare = LogRecord.SingleWrite(_recordFactory, pos,
+			Guid.NewGuid(),
+			eventId == default ? Guid.NewGuid() : eventId,
+			eventStreamId,
+			expectedVersion,
+			eventTypeId,
+			data.IsEmptyString() ? LogRecord.NoData : Helper.UTF8NoBom.GetBytes(data),
+			LogRecord.NoData,
+			DateTime.UtcNow,
+			additionalFlags);
+		Assert.IsTrue(await Writer.Write(prepare, token) is (true, _));
+
+		return prepare;
+	}
+
+	protected async ValueTask<CommitLogRecord> WriteCommit(long preparePos, string eventStreamName, long eventNumber, CancellationToken token) {
+		LogFormatHelper<TLogFormat, TStreamId>.CheckIfExplicitTransactionsSupported();
+		var commit = LogRecord.Commit(Writer.Position, Guid.NewGuid(), preparePos, eventNumber);
+		Assert.IsTrue(await Writer.Write(commit, token) is (true, _));
+		return commit;
+	}
+
+	protected async ValueTask<long> WriteCommit(Guid correlationId, long transactionId, string eventStreamName,
+		long eventNumber, CancellationToken token) {
+		LogFormatHelper<TLogFormat, TStreamId>.CheckIfExplicitTransactionsSupported();
+		var (eventStreamId, _) = await GetOrReserve(eventStreamName, token);
+		return await WriteCommit(correlationId, transactionId, eventStreamId, eventNumber, token);
+	}
+
+	protected async ValueTask<long> WriteCommit(Guid correlationId, long transactionId, TStreamId eventStreamId, long eventNumber, CancellationToken token) {
+		LogFormatHelper<TLogFormat, TStreamId>.CheckIfExplicitTransactionsSupported();
+		var commit = LogRecord.Commit(Writer.Position, correlationId, transactionId, eventNumber);
+		Assert.IsTrue(await Writer.Write(commit, token) is (true, _));
+		return commit.LogPosition;
+	}
+
+	protected async ValueTask<EventRecord> WriteDelete(string eventStreamName, CancellationToken token) {
+		var (eventStreamId, _) = await GetOrReserve(eventStreamName, token);
+		var (streamDeletedEventTypeId, pos) = await GetOrReserveEventType(SystemEventTypes.StreamDeleted, token);
+		var prepare = LogRecord.DeleteTombstone(_recordFactory, pos,
+			Guid.NewGuid(), Guid.NewGuid(), eventStreamId, streamDeletedEventTypeId, EventNumber.DeletedStream - 1);
+		Assert.IsTrue(await Writer.Write(prepare, token) is (true, _));
+		var commit = LogRecord.Commit(Writer.Position,
+			prepare.CorrelationId,
+			prepare.LogPosition,
+			EventNumber.DeletedStream);
+		Assert.IsTrue(await Writer.Write(commit, token) is (true, _));
+		Assert.AreEqual(eventStreamId, prepare.EventStreamId);
+
+		return new EventRecord(EventNumber.DeletedStream, prepare, eventStreamName, SystemEventTypes.StreamDeleted);
+	}
+
+	protected async ValueTask<IPrepareLogRecord<TStreamId>> WriteDeletePrepare(string eventStreamName, CancellationToken token) {
+		var (eventStreamId, _) = await GetOrReserve(eventStreamName, token);
+		var (streamDeletedEventTypeId, pos) = await GetOrReserveEventType(SystemEventTypes.StreamDeleted, token);
+		var prepare = LogRecord.DeleteTombstone(_recordFactory, pos,
+			Guid.NewGuid(), Guid.NewGuid(), eventStreamId, streamDeletedEventTypeId, ExpectedVersion.Any);
+		Assert.IsTrue(await Writer.Write(prepare, token) is (true, _));
+
+		return prepare;
+	}
+
+	protected async ValueTask<CommitLogRecord> WriteDeleteCommit(IPrepareLogRecord prepare, CancellationToken token) {
+		LogFormatHelper<TLogFormat, TStreamId>.CheckIfExplicitTransactionsSupported();
+		var commit = LogRecord.Commit(Writer.Position,
+			prepare.CorrelationId,
+			prepare.LogPosition,
+			EventNumber.DeletedStream);
+		Assert.IsTrue(await Writer.Write(commit, token) is (true, _));
+
+		return commit;
+	}
+
+	// This is LogV2 specific
+	protected async ValueTask<PrepareLogRecord> WriteSingleEventWithLogVersion0(Guid id, string streamId,
+		long position,
+		long expectedVersion, PrepareFlags? flags = null,
+		CancellationToken token = default) {
+		if (!flags.HasValue) {
+			flags = PrepareFlags.SingleWrite;
+		}
+
+		var record = new PrepareLogRecord(position, id, id, position, 0, streamId, null, expectedVersion,
+			DateTime.UtcNow,
+			flags.Value, "type", null, new byte[10], new byte[0], LogRecordVersion.LogRecordV0);
+		var (_, pos) = await Writer.Write(record, token);
+		await Writer.Write(
+			new CommitLogRecord(pos, id, position, DateTime.UtcNow, expectedVersion, LogRecordVersion.LogRecordV0),
+			token);
+		return record;
+	}
+
+	protected TFPos GetBackwardReadPos() {
+		var pos = new TFPos(WriterCheckpoint.ReadNonFlushed(), WriterCheckpoint.ReadNonFlushed());
+		return pos;
+	}
+
+	protected void Scavenge(bool completeLast, bool mergeChunks, bool scavengeIndex = true) {
+		if (_scavenge)
+			throw new InvalidOperationException("Scavenge can be executed only once in ReadIndexTestScenario");
+		_scavenge = true;
+		_completeLastChunkOnScavenge = completeLast;
+		_mergeChunks = mergeChunks;
+		_scavengeIndex = scavengeIndex;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/RepeatableDbTestScenario.cs b/src/KurrentDB.Core.Tests/Services/Storage/RepeatableDbTestScenario.cs
new file mode 100644
index 00000000000..f5fd2375f03
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/RepeatableDbTestScenario.cs
@@ -0,0 +1,107 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.TransactionLog;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.Util;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage;
+
+[TestFixture]
+public abstract class RepeatableDbTestScenario<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	protected readonly int MaxEntriesInMemTable;
+	protected TableIndex<TStreamId> TableIndex;
+	protected IReadIndex<TStreamId> ReadIndex;
+	protected LogFormatAbstractor<TStreamId> _logFormat;
+
+	protected DbResult DbRes;
+	protected TFChunkDbCreationHelper<TLogFormat, TStreamId> DbCreationHelper;
+
+	private readonly int _metastreamMaxCount;
+
+	protected RepeatableDbTestScenario(int maxEntriesInMemTable = 20, int metastreamMaxCount = 1) {
+		Ensure.Positive(maxEntriesInMemTable, "maxEntriesInMemTable");
+		MaxEntriesInMemTable = maxEntriesInMemTable;
+		_metastreamMaxCount = metastreamMaxCount;
+	}
+
+	public async ValueTask CreateDb(Rec[] records, CancellationToken token = default) {
+		if (DbRes is not null) {
+			await DbRes.Db.DisposeAsync();
+		}
+
+		var indexDirectory = GetFilePathFor("index");
+		_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
+			IndexDirectory = indexDirectory,
+		});
+
+		var dbConfig = TFChunkHelper.CreateSizedDbConfig(PathName, 0, chunkSize: 1024 * 1024);
+		var dbHelper = await TFChunkDbCreationHelper<TLogFormat, TStreamId>.CreateAsync(dbConfig, _logFormat, token: token);
+
+		DbRes = await dbHelper.Chunk(records).CreateDb(token: token);
+
+		DbRes.Db.Config.WriterCheckpoint.Flush();
+		DbRes.Db.Config.ChaserCheckpoint.Write(DbRes.Db.Config.WriterCheckpoint.Read());
+		DbRes.Db.Config.ChaserCheckpoint.Flush();
+
+		var readers = new ObjectPool<ITransactionFileReader>(
+			"Readers", 2, 2, () => new TFChunkReader(DbRes.Db, DbRes.Db.Config.WriterCheckpoint));
+
+		var lowHasher = _logFormat.LowHasher;
+		var highHasher = _logFormat.HighHasher;
+		var emptyStreamId = _logFormat.EmptyStreamId;
+		TableIndex = new TableIndex<TStreamId>(indexDirectory, lowHasher, highHasher, emptyStreamId,
+			() => new HashListMemTable(PTableVersions.IndexV3, MaxEntriesInMemTable * 2),
+			() => new TFReaderLease(readers),
+			PTableVersions.IndexV3,
+			int.MaxValue,
+			Constants.PTableMaxReaderCountDefault,
+			MaxEntriesInMemTable);
+		_logFormat.StreamNamesProvider.SetTableIndex(TableIndex);
+
+		var readIndex = new ReadIndex<TStreamId>(new NoopPublisher(),
+			readers,
+			TableIndex,
+			_logFormat.StreamNameIndexConfirmer,
+			_logFormat.StreamIds,
+			_logFormat.StreamNamesProvider,
+			_logFormat.EmptyStreamId,
+			_logFormat.StreamIdValidator,
+			_logFormat.StreamIdSizer,
+			_logFormat.StreamExistenceFilter,
+			_logFormat.StreamExistenceFilterReader,
+			_logFormat.EventTypeIndexConfirmer,
+			new NoLRUCache<TStreamId, IndexBackend<TStreamId>.EventNumberCached>(),
+			new NoLRUCache<TStreamId, IndexBackend<TStreamId>.MetadataCached>(),
+			additionalCommitChecks: true,
+			metastreamMaxCount: _metastreamMaxCount,
+			hashCollisionReadLimit: Opts.HashCollisionReadLimitDefault,
+			skipIndexScanOnReads: Opts.SkipIndexScanOnReadsDefault,
+			replicationCheckpoint: DbRes.Db.Config.ReplicationCheckpoint,
+			indexCheckpoint: DbRes.Db.Config.IndexCheckpoint,
+			indexStatusTracker: new IndexStatusTracker.NoOp(),
+			indexTracker: new IndexTracker.NoOp(),
+			cacheTracker: new CacheHitsMissesTracker.NoOp());
+
+		await readIndex.IndexCommitter.Init(DbRes.Db.Config.ChaserCheckpoint.Read(), CancellationToken.None);
+		ReadIndex = readIndex;
+	}
+
+	public override async Task TestFixtureTearDown() {
+		_logFormat?.Dispose();
+		await DbRes.Db.DisposeAsync();
+		await base.TestFixtureTearDown();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/ScavengeLogManager/ScavengeLogHelper.cs b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/ScavengeLogManager/ScavengeLogHelper.cs
new file mode 100644
index 00000000000..0f0363394c1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/ScavengeLogManager/ScavengeLogHelper.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.TransactionLog.Chunks;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Scavenge.ScavengeLogManager;
+
+public static class ScavengerLogHelper {
+	public static string ScavengeStreamId(Guid scavengeId) {
+		return $"{SystemStreams.ScavengesStream}-{scavengeId}";
+	}
+
+	public static StreamMetadata CreateScavengeMetadata(TimeSpan scavengeHistoryMaxAge) {
+		return new StreamMetadata(maxAge: scavengeHistoryMaxAge, acl: new(
+			new[] { "$ops" },
+			new string[] { },
+			new string[] { },
+			new string[] { },
+			new string[] { }
+		));
+	}
+
+	public static Dictionary<string, object> CreateScavengeStarted(Guid scavengeId, string nodeEndpoint,
+		int startFromChunk = 0) {
+		return new Dictionary<string, object> {
+			{ "scavengeId", scavengeId },
+			{ "nodeEndpoint", nodeEndpoint },
+			{ "alwaysKeepScavenged", false },
+			{ "mergeChunks", true },
+			{ "startFromChunk", startFromChunk },
+			{ "threads", 1 },
+		};
+	}
+
+	public static Dictionary<string, object> CreateScavengeInterruptedByRestart
+		(Guid scavengeId, string nodeEndpoint, TimeSpan timeTaken, long spaceSaved = 0, int maxChunkScavenged = 0) {
+		return new Dictionary<string, object> {
+			{ "scavengeId", scavengeId },
+			{ "nodeEndpoint", nodeEndpoint },
+			{ "result", ScavengeResult.Interrupted },
+			{ "error", "The node was restarted." },
+			{ "timeTaken", timeTaken },
+			{ "spaceSaved", spaceSaved },
+			{ "maxChunkScavenged", maxChunkScavenged }
+		};
+	}
+
+	public static Dictionary<string, object> CreateScavengeChunkCompleted
+		(Guid scavengeId, string nodeEndpoint, int chunkStart, int chunkEnd, TimeSpan elapsed, long spaceSaved) {
+		return new Dictionary<string, object> {
+			{ "scavengeId", scavengeId },
+			{ "chunkStartNumber", chunkStart },
+			{ "chunkEndNumber", chunkEnd },
+			{ "timeTaken", elapsed },
+			{ "wasScavenged", true },
+			{ "spaceSaved", spaceSaved },
+			{ "nodeEndpoint", nodeEndpoint },
+			{ "errorMessage", "" }
+		};
+	}
+
+	public static Dictionary<string, object> CreateScavengeCompletedSuccessfully(
+		Guid scavengeId, string nodeEndpoint, TimeSpan elapsed, long spaceSaved, int maxChunkScavenged) {
+		return new Dictionary<string, object> {
+			{ "scavengeId", scavengeId },
+			{ "nodeEndpoint", nodeEndpoint },
+			{ "result", ScavengeResult.Success },
+			{ "error", "" },
+			{ "timeTaken", elapsed },
+			{ "spaceSaved", spaceSaved },
+			{ "maxChunkScavenged", maxChunkScavenged }
+		};
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/ScavengeLogManager/when_initialising.cs b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/ScavengeLogManager/when_initialising.cs
new file mode 100644
index 00000000000..cbc337d58ed
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/ScavengeLogManager/when_initialising.cs
@@ -0,0 +1,257 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Scavenge.ScavengeLogManager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_scavenges_stream_does_not_exist<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private TFChunkScavengerLogManager _logManager;
+	private TaskCompletionSource<ClientMessage.WriteEvents> eventWritten = new();
+	private StreamMetadata _metadata;
+
+	protected override void Given1() {
+		NoOtherStreams();
+		AllWritesSucceed();
+
+		var scavengeHistoryMaxAge = TimeSpan.FromMinutes(5);
+		_metadata = ScavengerLogHelper.CreateScavengeMetadata(scavengeHistoryMaxAge);
+		_bus.Subscribe(new AdHocHandler<ClientMessage.WriteEvents>(m => eventWritten.TrySetResult(m)));
+
+		_logManager = new TFChunkScavengerLogManager("localhost:2113", scavengeHistoryMaxAge, _ioDispatcher);
+		_logManager.Initialise();
+	}
+
+	[Test]
+	public async Task should_write_scavenge_stream_metadata() {
+		var evnt = await eventWritten.Task.WithTimeout();
+		Assert.AreEqual(SystemStreams.MetastreamOf(SystemStreams.ScavengesStream), evnt.EventStreamId);
+		Assert.AreEqual(_metadata.ToJsonBytes(), evnt.Events[0].Data);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_scavenges_stream_has_different_metadata<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private TFChunkScavengerLogManager _logManager;
+	private TaskCompletionSource<ClientMessage.WriteEvents> eventWritten = new();
+	private TimeSpan _scavengeHistoryMaxAge = TimeSpan.FromMinutes(5);
+
+	protected override void Given1() {
+		NoOtherStreams();
+		AllWritesSucceed();
+
+		_bus.Subscribe(new AdHocHandler<ClientMessage.WriteEvents>(m => eventWritten.TrySetResult(m)));
+
+		// Create the existing metadata event with a max age of 30 days
+		var metadata = ScavengerLogHelper.CreateScavengeMetadata(TimeSpan.FromDays(30));
+		ExistingStreamMetadata(SystemStreams.MetastreamOf(SystemStreams.ScavengesStream), metadata.ToJsonString());
+
+		_logManager = new TFChunkScavengerLogManager("localhost:2113", _scavengeHistoryMaxAge, _ioDispatcher);
+		_logManager.Initialise();
+	}
+
+	[Test]
+	public async Task should_write_new_scavenge_stream_metadata() {
+		var evnt = await eventWritten.Task.WithTimeout();
+		Assert.AreEqual(SystemStreams.MetastreamOf(SystemStreams.ScavengesStream), evnt.EventStreamId);
+		var expectedMetadata = ScavengerLogHelper.CreateScavengeMetadata(_scavengeHistoryMaxAge);
+		Assert.AreEqual(expectedMetadata.ToJsonBytes(), evnt.Events[0].Data);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_scavenges_stream_has_correct_metadata<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private TFChunkScavengerLogManager _logManager;
+	private TaskCompletionSource<ClientMessage.ReadStreamEventsBackward> _eventRead = new();
+	private List<ClientMessage.WriteEvents> _writeRequests = new();
+	private TimeSpan _scavengeHistoryMaxAge = TimeSpan.FromMinutes(5);
+
+	protected override void Given1() {
+		NoOtherStreams();
+		AllWritesSucceed();
+
+		_bus.Subscribe(new AdHocHandler<ClientMessage.WriteEvents>(m => _writeRequests.Add(m)));
+		_bus.Subscribe(new AdHocHandler<ClientMessage.ReadStreamEventsBackward>(m => _eventRead.TrySetResult(m)));
+
+		// Create the existing metadata event with the correct max age
+		var metadata = ScavengerLogHelper.CreateScavengeMetadata(_scavengeHistoryMaxAge);
+		ExistingStreamMetadata(SystemStreams.ScavengesStream, metadata.ToJsonString());
+
+		_logManager = new TFChunkScavengerLogManager("localhost:2113", _scavengeHistoryMaxAge, _ioDispatcher);
+		_logManager.Initialise();
+	}
+
+	[Test]
+	public async Task should_not_write_new_metadata() {
+		var evnt = await _eventRead.Task.WithTimeout();
+		await Task.Delay(100); // Give it time to finish any writes if there are any
+		Assert.AreEqual(SystemStreams.MetastreamOf(SystemStreams.ScavengesStream), evnt.EventStreamId);
+		Assert.IsEmpty(_writeRequests);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_previous_scavenge_was_interrupted_but_scavenge_stream_not_written<TLogFormat, TStreamId>
+	: TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private const string _nodeEndpoint = "localhost:2113";
+	private Guid _scavengeId = Guid.NewGuid();
+	private TFChunkScavengerLogManager _logManager;
+	private TaskCompletionSource<ClientMessage.WriteEvents> _eventWritten = new();
+	private string _scavengeStreamId;
+
+	protected override void Given1() {
+		NoOtherStreams();
+		AllWritesSucceed();
+		_scavengeStreamId = ScavengerLogHelper.ScavengeStreamId(_scavengeId);
+
+		_bus.Subscribe(new AdHocHandler<ClientMessage.WriteEvents>(m => {
+			if (m.EventStreamId == _scavengeStreamId
+				&& m.Events[0].EventType == SystemEventTypes.ScavengeCompleted) {
+				_eventWritten.SetResult(m);
+			}
+		}));
+
+		// Create the existing scavenge
+		var scavengeHistoryMaxAge = TimeSpan.FromMinutes(5);
+		ExistingStreamMetadata(SystemStreams.ScavengesStream,
+			ScavengerLogHelper.CreateScavengeMetadata(scavengeHistoryMaxAge).ToJsonString());
+		var startedData = ScavengerLogHelper.CreateScavengeStarted(_scavengeId, _nodeEndpoint);
+		// This should be a linkTo event pointing to the scavenge stream
+		ExistingEvent(SystemStreams.ScavengesStream, SystemEventTypes.ScavengeStarted, "", startedData.ToJson(), true);
+
+		_logManager = new TFChunkScavengerLogManager(_nodeEndpoint, scavengeHistoryMaxAge, _ioDispatcher);
+		_logManager.Initialise();
+	}
+
+	[Test]
+	public async Task should_complete_the_scavenge_as_faulted() {
+		var evnt = await _eventWritten.Task.WithTimeout();
+		var expectedData = ScavengerLogHelper.CreateScavengeInterruptedByRestart(_scavengeId, _nodeEndpoint, TimeSpan.Zero);
+		Assert.AreEqual(expectedData.ToJson(), Encoding.UTF8.GetString(evnt.Events[0].Data));
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_previous_scavenge_was_interrupted_and_some_data_was_scavenged<TLogFormat, TStreamId>
+	: TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private const string _nodeEndpoint = "localhost:2113";
+	private Guid _scavengeId = Guid.NewGuid();
+	private TFChunkScavengerLogManager _logManager;
+	private TaskCompletionSource<ClientMessage.WriteEvents> _eventWritten = new();
+	private string _scavengeStreamId;
+
+	protected override void Given1() {
+		NoOtherStreams();
+		AllWritesSucceed();
+		_scavengeStreamId = ScavengerLogHelper.ScavengeStreamId(_scavengeId);
+
+		_bus.Subscribe(new AdHocHandler<ClientMessage.WriteEvents>(m => {
+			if (m.EventStreamId == _scavengeStreamId
+				&& m.Events[0].EventType == SystemEventTypes.ScavengeCompleted) {
+				_eventWritten.SetResult(m);
+			}
+		}));
+
+		// Create the existing scavenge
+		var scavengeHistoryMaxAge = TimeSpan.FromMinutes(5);
+		var metadata = ScavengerLogHelper.CreateScavengeMetadata(scavengeHistoryMaxAge);
+		ExistingStreamMetadata(SystemStreams.ScavengesStream, metadata.ToJsonString());
+		var startedData = ScavengerLogHelper.CreateScavengeStarted(_scavengeId, _nodeEndpoint);
+		// This should be a linkTo event pointing to the scavenge stream
+		ExistingEvent(SystemStreams.ScavengesStream, SystemEventTypes.ScavengeStarted, "", startedData.ToJson(), true);
+
+		var firstChunk = ScavengerLogHelper.CreateScavengeChunkCompleted(
+			_scavengeId, _nodeEndpoint, 0, 0, TimeSpan.FromSeconds(1), int.MaxValue).ToJson();
+		ExistingEvent(_scavengeStreamId, SystemEventTypes.ScavengeChunksCompleted, "", firstChunk, true);
+
+		var secondChunk = ScavengerLogHelper.CreateScavengeChunkCompleted(
+			_scavengeId, _nodeEndpoint, 1, 1, TimeSpan.FromSeconds(1), int.MaxValue).ToJson();
+		ExistingEvent(_scavengeStreamId, SystemEventTypes.ScavengeChunksCompleted, "", secondChunk, true);
+
+		_logManager = new TFChunkScavengerLogManager(_nodeEndpoint, scavengeHistoryMaxAge, _ioDispatcher);
+		_logManager.Initialise();
+	}
+
+	[Test]
+	public async Task should_complete_the_scavenge_as_faulted() {
+		var evnt = await _eventWritten.Task.WithTimeout();
+		long spaceSavedPerChunk = int.MaxValue;
+		var expectedData = ScavengerLogHelper.CreateScavengeInterruptedByRestart(
+			_scavengeId, _nodeEndpoint, TimeSpan.FromSeconds(2), spaceSavedPerChunk * 2, 1);
+		Assert.AreEqual(expectedData.ToJson(), Encoding.UTF8.GetString(evnt.Events[0].Data));
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_previous_scavenge_was_completed<TLogFormat, TStreamId>
+	: TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private const string _nodeEndpoint = "localhost:2113";
+	private Guid _scavengeId = Guid.NewGuid();
+	private TFChunkScavengerLogManager _logManager;
+	private TaskCompletionSource<ClientMessage.ReadStreamEventsBackward> _eventRead = new();
+	private List<ClientMessage.WriteEvents> _writtenEvents = new();
+	private string _scavengeStreamId;
+
+	protected override void Given1() {
+		NoOtherStreams();
+		AllWritesSucceed();
+		_scavengeStreamId = ScavengerLogHelper.ScavengeStreamId(_scavengeId);
+
+		_bus.Subscribe(new AdHocHandler<ClientMessage.WriteEvents>(m => _writtenEvents.Add(m)));
+		_bus.Subscribe(new AdHocHandler<ClientMessage.ReadStreamEventsBackward>(m => {
+			if (m.EventStreamId == SystemStreams.ScavengesStream) {
+				_eventRead.SetResult(m);
+			}
+		}));
+
+		// Create the existing scavenge
+		var scavengeHistoryMaxAge = TimeSpan.FromMinutes(5);
+		var metadata = ScavengerLogHelper.CreateScavengeMetadata(scavengeHistoryMaxAge);
+		ExistingStreamMetadata(SystemStreams.ScavengesStream, metadata.ToJsonString());
+		var startedData = ScavengerLogHelper.CreateScavengeStarted(_scavengeId, _nodeEndpoint);
+		// This should be a linkTo event pointing to the scavenge stream
+		ExistingEvent(SystemStreams.ScavengesStream, SystemEventTypes.ScavengeStarted, "", startedData.ToJson(), true);
+
+		var firstChunk = ScavengerLogHelper.CreateScavengeChunkCompleted(
+			_scavengeId, _nodeEndpoint, 0, 0, TimeSpan.FromSeconds(1), 10).ToJson();
+		ExistingEvent(_scavengeStreamId, SystemEventTypes.ScavengeChunksCompleted, "", firstChunk, true);
+
+		var secondChunk = ScavengerLogHelper.CreateScavengeChunkCompleted(
+			_scavengeId, _nodeEndpoint, 1, 1, TimeSpan.FromSeconds(1), 10).ToJson();
+		ExistingEvent(_scavengeStreamId, SystemEventTypes.ScavengeChunksCompleted, "", secondChunk, true);
+
+		var scavengeCompleted = ScavengerLogHelper.CreateScavengeCompletedSuccessfully(
+			_scavengeId, _nodeEndpoint, TimeSpan.FromSeconds(2), 20, 1).ToJson();
+		// This should be a linkTo event pointing to the scavenge stream
+		ExistingEvent(SystemStreams.ScavengesStream, SystemEventTypes.ScavengeCompleted, "", scavengeCompleted, true);
+
+		_logManager = new TFChunkScavengerLogManager(_nodeEndpoint, scavengeHistoryMaxAge, _ioDispatcher);
+		_logManager.Initialise();
+	}
+
+	[Test]
+	public async Task should_not_write_any_new_events() {
+		await _eventRead.Task.WithTimeout();
+		await Task.Delay(100); // Give it some time to write any events
+		Assert.IsEmpty(_writtenEvents.Where(x => x.EventStreamId == _scavengeStreamId));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_deleting_duplicate_events.cs b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_deleting_duplicate_events.cs
new file mode 100644
index 00000000000..516a9e47166
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_deleting_duplicate_events.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Index;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Scavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Investigate: Failing because index v1 is not supported")]
+public class when_deleting_duplicate_events<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _event1;
+	private EventRecord _event2;
+	private EventRecord _event3;
+	private EventRecord _event4;
+	private EventRecord _event5;
+	private EventRecord _event6;
+	private EventRecord _event7;
+	private EventRecord _event8;
+
+	public when_deleting_duplicate_events() : base(
+		indexBitnessVersion: PTableVersions.IndexV1, performAdditionalChecks: false) {
+	}
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_event1 = await WriteSingleEvent("account--696193173", 0, new string('.', 3000), retryOnFail: true, token: token);
+		await WriteSingleEvent("account--696193173", 0, new string('.', 3000), retryOnFail: true, token: token);
+
+		_event2 = await WriteSingleEvent("LPN-FC002_LPK51001", 0, new string('.', 3000), retryOnFail: true, token: token);
+		await WriteSingleEvent("LPN-FC002_LPK51001", 0, new string('.', 3000), retryOnFail: true, token: token);
+
+		_event3 = await WriteSingleEvent("account--696193173", 1, new string('.', 3000), retryOnFail: true, token: token);
+		await WriteSingleEvent("account--696193173", 1, new string('.', 3000), retryOnFail: true, token: token);
+
+		_event4 = await WriteSingleEvent("LPN-FC002_LPK51001", 1, new string('.', 3000), retryOnFail: true, token: token);
+		await WriteSingleEvent("LPN-FC002_LPK51001", 1, new string('.', 3000), retryOnFail: true, token: token);
+
+		_event5 = await WriteSingleEvent("account--696193173", 2, new string('.', 3000), retryOnFail: true, token: token);
+		await WriteSingleEvent("account--696193173", 2, new string('.', 3000), retryOnFail: true, token: token);
+
+		_event6 = await WriteSingleEvent("LPN-FC002_LPK51001", 2, new string('.', 3000), retryOnFail: true);
+		await WriteSingleEvent("LPN-FC002_LPK51001", 2, new string('.', 3000), retryOnFail: true);
+
+		_event7 = await WriteSingleEvent("account--696193173", 3, new string('.', 3000), retryOnFail: true);
+		await WriteSingleEvent("account--696193173", 3, new string('.', 3000), retryOnFail: true);
+
+		_event8 = await WriteSingleEvent("LPN-FC002_LPK51001", 3, new string('.', 3000), retryOnFail: true);
+		await WriteSingleEvent("LPN-FC002_LPK51001", 3, new string('.', 3000), retryOnFail: true);
+
+		await WriteSingleEvent("RandomStream", 0, new string('.', 3000), retryOnFail: true);
+		await WriteSingleEvent("RandomStream", 1, new string('.', 3000), retryOnFail: true);
+
+		Scavenge(completeLast: false, mergeChunks: false);
+	}
+
+	[Test]
+	public async Task read_all_events_forward_does_not_return_duplicate() {
+		var events = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(11, events.Length);
+		Assert.AreEqual(_event1, events[0]);
+		Assert.AreEqual(_event2, events[1]);
+		Assert.AreEqual(_event3, events[2]);
+		Assert.AreEqual(_event4, events[3]);
+		Assert.AreEqual(_event5, events[4]);
+		Assert.AreEqual(_event6, events[5]);
+		Assert.AreEqual(_event7, events[6]);
+		Assert.AreEqual(_event8, events[7]);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_deleting_single_stream_spanning_through_2_chunks_in_2nd_chunk__in_db_with_3_chunks.cs b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_deleting_single_stream_spanning_through_2_chunks_in_2nd_chunk__in_db_with_3_chunks.cs
new file mode 100644
index 00000000000..4c331a287c1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_deleting_single_stream_spanning_through_2_chunks_in_2nd_chunk__in_db_with_3_chunks.cs
@@ -0,0 +1,108 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Scavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_deleting_single_stream_spanning_through_2_chunks_in_2nd_chunk_in_db_with_3_chunks<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _event7;
+	private EventRecord _event9;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteSingleEvent("ES", 0, new string('.', 3000), token: token); // chunk 1
+		await WriteSingleEvent("ES", 1, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES", 2, new string('.', 3000), token: token);
+
+		await WriteSingleEvent("ES", 3, new string('.', 3000), retryOnFail: true, token: token); // chunk 2
+		await WriteSingleEvent("ES", 4, new string('.', 3000), token: token);
+
+		_event7 = await WriteDelete("ES", token);
+		_event9 = await WriteSingleEvent("ES2", 0, new string('.', 5000), retryOnFail: true, token: token); //chunk 3
+
+		Scavenge(completeLast: false, mergeChunks: false);
+	}
+
+	[Test]
+	public async Task read_all_forward_does_not_return_scavenged_deleted_stream_events_and_return_remaining() {
+		var events = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(2, events.Length);
+		Assert.AreEqual(_event7, events[0]);
+		Assert.AreEqual(_event9, events[1]);
+	}
+
+	[Test]
+	public async Task read_all_backward_does_not_return_scavenged_deleted_stream_events_and_return_remaining() {
+		var events = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(2, events.Length);
+		Assert.AreEqual(_event7, events[1]);
+		Assert.AreEqual(_event9, events[0]);
+	}
+
+	[Test]
+	public async Task read_all_backward_from_beginning_of_second_chunk_returns_no_records() {
+		var pos = new TFPos(10000, 10000);
+		var events = (await ReadIndex.ReadAllEventsBackward(pos, 100, CancellationToken.None)).EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(0, events.Length);
+	}
+
+	[Test]
+	public async Task
+		read_all_forward_from_beginning_of_2nd_chunk_with_max_2_record_returns_delete_record_and_record_from_3rd_chunk() {
+		var events = (await ReadIndex.ReadAllEventsForward(new TFPos(10000, 10000), 100, CancellationToken.None))
+			.EventRecords()
+			.Take(2)
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(2, events.Length);
+		Assert.AreEqual(_event7, events[0]);
+		Assert.AreEqual(_event9, events[1]);
+	}
+
+	[Test]
+	public async Task read_all_forward_with_max_5_records_returns_2_records_from_2nd_chunk() {
+		var events = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 5, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(2, events.Length);
+		Assert.AreEqual(_event7, events[0]);
+		Assert.AreEqual(_event9, events[1]);
+	}
+
+	[Test]
+	public async Task is_stream_deleted_returns_true() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ES", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task last_event_number_returns_stream_deleted() {
+		Assert.AreEqual(EventNumber.DeletedStream, await ReadIndex.GetStreamLastEventNumber("ES", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task last_physical_record_from_scavenged_stream_should_remain() {
+		// cannot use readIndex here as it doesn't return deleteTombstone
+
+		var chunk = await Db.Manager.GetInitializedChunk(1, CancellationToken.None);
+		var chunkPos = (int)(_event7.LogPosition % Db.Config.ChunkSize);
+		var res = await chunk.TryReadAt(chunkPos, couldBeScavenged: false, CancellationToken.None);
+
+		Assert.IsTrue(res.Success);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_deleting_single_stream_spanning_through_2_chunks_in_db_with_2_chunks.cs b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_deleting_single_stream_spanning_through_2_chunks_in_db_with_2_chunks.cs
new file mode 100644
index 00000000000..063061f451d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_deleting_single_stream_spanning_through_2_chunks_in_db_with_2_chunks.cs
@@ -0,0 +1,95 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Scavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_deleting_single_stream_spanning_through_2_chunks_in_db_with_2_chunks<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _event3;
+	private EventRecord _event4;
+	private EventRecord _delete;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteSingleEvent("ES", 0, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES", 1, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES", 2, new string('.', 3000), token: token);
+
+		_event3 = await WriteSingleEvent("ES", 3, new string('.', 3000), retryOnFail: true, token: token); // chunk 2
+		_event4 = await WriteSingleEvent("ES", 4, new string('.', 3000), token: token);
+
+		_delete = await WriteDelete("ES", token);
+		Scavenge(completeLast: false, mergeChunks: false);
+	}
+
+	[Test]
+	public async Task read_all_forward_returns_events_only_from_uncompleted_chunk_and_delete_record() {
+		var events = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(3, events.Length);
+		Assert.AreEqual(_event3, events[0]);
+		Assert.AreEqual(_event4, events[1]);
+		Assert.AreEqual(_delete, events[2]);
+	}
+
+	[Test]
+	public async Task read_all_backward_returns_events_only_from_uncompleted_chunk_and_delete_record() {
+		var events = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(3, events.Length);
+		Assert.AreEqual(_event3, events[2]);
+		Assert.AreEqual(_event4, events[1]);
+		Assert.AreEqual(_delete, events[0]);
+	}
+
+	[Test]
+	public async Task read_all_backward_from_beginning_of_second_chunk_returns_no_records() {
+		var pos = new TFPos(10000, 10000);
+		var events = (await ReadIndex.ReadAllEventsBackward(pos, 100, CancellationToken.None)).EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(0, events.Length);
+	}
+
+	[Test]
+	public async Task read_all_forward_from_beginning_of_second_chunk_with_max_1_record_returns_5th_record() {
+		var events = (await ReadIndex.ReadAllEventsForward(new TFPos(10000, 10000), 1, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(1, events.Length);
+		Assert.AreEqual(_event3, events[0]);
+	}
+
+	[Test]
+	public async Task read_all_forward_with_max_5_records_returns_3_records_from_second_chunk_and_delete_record() {
+		var events = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 5, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(3, events.Length);
+		Assert.AreEqual(_event3, events[0]);
+		Assert.AreEqual(_event4, events[1]);
+		Assert.AreEqual(_delete, events[2]);
+	}
+
+	[Test]
+	public async Task is_stream_deleted_returns_true() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ES", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task last_event_number_returns_stream_deleted() {
+		Assert.AreEqual(EventNumber.DeletedStream, await ReadIndex.GetStreamLastEventNumber("ES", CancellationToken.None));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_deleting_single_stream_spanning_through_2_chunks_in_db_with_3_chunks.cs b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_deleting_single_stream_spanning_through_2_chunks_in_db_with_3_chunks.cs
new file mode 100644
index 00000000000..6226ab4c2bf
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_deleting_single_stream_spanning_through_2_chunks_in_db_with_3_chunks.cs
@@ -0,0 +1,96 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Scavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_deleting_single_stream_spanning_through_2_chunks_in_db_with_3_chunks<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _event8;
+	private EventRecord _delete;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteSingleEvent("ES", 0, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES", 1, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES", 2, new string('.', 3000), token: token);
+
+		await WriteSingleEvent("ES", 3, new string('.', 3000), retryOnFail: true, token: token); // chunk 2
+		await WriteSingleEvent("ES", 4, new string('.', 3000), token: token);
+
+		_event8 = await WriteSingleEvent("ES2", 0, new string('.', 5000), retryOnFail: true, token: token); //chunk 3
+
+		_delete = await WriteDelete("ES", token: token);
+		Scavenge(completeLast: false, mergeChunks: false);
+	}
+
+	[Test]
+	public async Task
+		read_all_forward_does_not_return_scavenged_deleted_stream_events_and_return_remaining_plus_delete_record() {
+		var events = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(2, events.Length);
+		Assert.AreEqual(_event8, events[0]);
+		Assert.AreEqual(_delete, events[1]);
+	}
+
+	[Test]
+	public async Task
+		read_all_backward_does_not_return_scavenged_deleted_stream_events_and_return_remaining_plus_delete_record() {
+		var events = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(2, events.Length);
+		Assert.AreEqual(_event8, events[1]);
+		Assert.AreEqual(_delete, events[0]);
+	}
+
+	[Test]
+	public async Task read_all_backward_from_beginning_of_second_chunk_returns_no_records() {
+		var pos = new TFPos(10000, 10000);
+		var events = (await ReadIndex.ReadAllEventsBackward(pos, 100, CancellationToken.None)).EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(0, events.Length);
+	}
+
+	[Test]
+	public async Task read_all_forward_from_beginning_of_2nd_chunk_with_max_1_record_returns_1st_record_from_3rd_chunk() {
+		var events = (await ReadIndex.ReadAllEventsForward(new TFPos(10000, 10000), 100, CancellationToken.None))
+			.EventRecords()
+			.Take(1)
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(1, events.Length);
+		Assert.AreEqual(_event8, events[0]);
+	}
+
+	[Test]
+	public async Task read_all_forward_with_max_5_records_returns_2_records_from_2nd_chunk_plus_delete_record() {
+		var events = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 5, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(2, events.Length);
+		Assert.AreEqual(_event8, events[0]);
+		Assert.AreEqual(_delete, events[1]);
+	}
+
+	[Test]
+	public async Task is_stream_deleted_returns_true() {
+		Assert.That(await ReadIndex.IsStreamDeleted("ES", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task last_event_number_returns_stream_deleted() {
+		Assert.AreEqual(EventNumber.DeletedStream, await ReadIndex.GetStreamLastEventNumber("ES", CancellationToken.None));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_having_commit_spanning_multiple_chunks.cs b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_having_commit_spanning_multiple_chunks.cs
new file mode 100644
index 00000000000..8cb54c93fea
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_having_commit_spanning_multiple_chunks.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Scavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class when_having_commit_spanning_multiple_chunks<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private List<ILogRecord> _survivors;
+	private List<ILogRecord> _scavenged;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_survivors = new List<ILogRecord>();
+		_scavenged = new List<ILogRecord>();
+
+		var (s1StreamId, _) = await GetOrReserve("s1", token);
+		var (eventTypeId, _) = await GetOrReserveEventType("event-type", token);
+		var transPos = Writer.Position;
+
+		for (int i = 0; i < 10; ++i) {
+			var r = LogRecord.Prepare(_recordFactory, Writer.Position,
+				Guid.NewGuid(),
+				Guid.NewGuid(),
+				transPos,
+				i,
+				s1StreamId,
+				i == 0 ? -1 : -2,
+				PrepareFlags.Data | (i == 9 ? PrepareFlags.TransactionEnd : PrepareFlags.None),
+				eventTypeId,
+				new byte[3],
+				new byte[3]);
+			Assert.IsTrue(await Writer.Write(r, token) is (true, _));
+			await Writer.CompleteChunk(token);
+			await Writer.AddNewChunk(token: token);
+
+			_scavenged.Add(r);
+		}
+
+		var r2 = await WriteCommit(transPos, "s1", 0, token);
+		_survivors.Add(r2);
+
+		await Writer.CompleteChunk(token);
+		await Writer.AddNewChunk(token: token);
+
+		var r3 = await WriteDeletePrepare("s1", token);
+		_survivors.Add(r3);
+
+		await Writer.CompleteChunk(token);
+		await Writer.AddNewChunk(token: token);
+
+		var r4 = await WriteDeleteCommit(r3, token);
+		_survivors.Add(r4);
+
+		await Writer.CompleteChunk(token);
+		await Writer.AddNewChunk(token: token);
+
+		Scavenge(completeLast: false, mergeChunks: true);
+
+		Assert.AreEqual(13, _survivors.Count + _scavenged.Count);
+	}
+
+	[Test]
+	public async Task all_chunks_are_merged_and_scavenged() {
+		foreach (var rec in _scavenged) {
+			var chunk = await Db.Manager.GetInitializedChunkFor(rec.LogPosition, CancellationToken.None);
+			Assert.IsTrue(await chunk.TryReadAt(rec.LogPosition, couldBeScavenged: true, CancellationToken.None) is { Success: false });
+		}
+
+		foreach (var rec in _survivors) {
+			var chunk = await Db.Manager.GetInitializedChunkFor(rec.LogPosition, CancellationToken.None);
+			var res = await chunk.TryReadAt(rec.LogPosition, couldBeScavenged: false, CancellationToken.None);
+			Assert.IsTrue(res.Success);
+			Assert.AreEqual(rec, res.LogRecord);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_running_a_scavenge_from_storage_scavenger.cs b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_running_a_scavenge_from_storage_scavenger.cs
new file mode 100644
index 00000000000..df16f0047a0
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_running_a_scavenge_from_storage_scavenger.cs
@@ -0,0 +1,95 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Scavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), IgnoreReason = "new scavenge in logv3 later")]
+public class when_running_scavenge_from_storage_scavenger<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private static readonly ILogger Log = Serilog.Log.ForContext<when_running_scavenge_from_storage_scavenger<TLogFormat, TStreamId>>();
+	private static readonly TimeSpan Timeout = TimeSpan.FromSeconds(60);
+	private MiniNode<TLogFormat, TStreamId> _node;
+	private List<ResolvedEvent> _result;
+
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName, inMemDb: false);
+		await _node.Start();
+
+		var scavengeMessage =
+			new ClientMessage.ScavengeDatabase(new NoopEnvelope(), Guid.NewGuid(), SystemAccounts.System, 0, 1, null, null, false);
+		_node.Node.MainQueue.Publish(scavengeMessage);
+
+		try {
+			await When().WithTimeout();
+		} catch (Exception ex) {
+			throw new Exception("When Failed", ex);
+		}
+	}
+
+	[TearDown]
+	public async Task TearDown() {
+		await _node.Shutdown();
+	}
+
+	public async Task When() {
+		using (var conn = TestConnection.Create(_node.TcpEndPoint, TcpType.Ssl, DefaultData.AdminCredentials)) {
+			await conn.ConnectAsync();
+			var countdown = new CountdownEvent(2);
+			_result = new List<ResolvedEvent>();
+
+			conn.SubscribeToStreamFrom(SystemStreams.ScavengesStream, null, CatchUpSubscriptionSettings.Default,
+				(x, y) => {
+					_result.Add(y);
+					countdown.Signal();
+					return Task.CompletedTask;
+				},
+				_ => Log.Information("Processing events started."),
+				(x, y, z) => { Log.Information("Subscription dropped: {0}, {1}.", y, z); }
+			);
+
+			if (!countdown.Wait(Timeout)) {
+				Assert.Fail("Timeout expired while waiting for events.");
+			}
+		}
+	}
+
+	[Test]
+	public void should_create_scavenge_started_event_on_index_stream() {
+		var scavengeStartedEvent =
+			_result.FirstOrDefault(x => x.Event.EventType == SystemEventTypes.ScavengeStarted);
+		Assert.IsNotNull(scavengeStartedEvent);
+	}
+
+	[Test]
+	public void should_create_scavenge_completed_event_on_index_stream() {
+		var scavengeCompletedEvent =
+			_result.FirstOrDefault(x => x.Event.EventType == SystemEventTypes.ScavengeCompleted);
+		Assert.IsNotNull(scavengeCompletedEvent);
+	}
+
+	[Test]
+	public void should_link_started_and_completed_events_to_the_same_stream() {
+		var scavengeStartedEvent =
+			_result.FirstOrDefault(x => x.Event.EventType == SystemEventTypes.ScavengeStarted);
+		var scavengeCompletedEvent =
+			_result.FirstOrDefault(x => x.Event.EventType == SystemEventTypes.ScavengeCompleted);
+		Assert.AreEqual(scavengeStartedEvent.Event.EventStreamId, scavengeCompletedEvent.Event.EventStreamId);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_deleted_records.cs b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_deleted_records.cs
new file mode 100644
index 00000000000..44821a10230
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_deleted_records.cs
@@ -0,0 +1,90 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Scavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_scavenging_tfchunk_with_deleted_records<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private const string _eventStreamId = "ES";
+	private const string _deletedEventStreamId = "Deleted-ES";
+	private EventRecord _event1, _event2, _event3, _event4, _deleted;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		// Stream that will be kept
+		_event1 = await WriteSingleEvent(_eventStreamId, 0, "bla1", token: token);
+		_event2 = await WriteSingleEvent(_eventStreamId, 1, "bla1", token: token);
+
+		// Stream that will be deleted
+		await WriteSingleEvent(_deletedEventStreamId, 0, "bla1", token: token);
+		await WriteSingleEvent(_deletedEventStreamId, 1, "bla1", token: token);
+		_deleted = await WriteDelete(_deletedEventStreamId, token);
+
+		// Stream that will be kept
+		_event3 = await WriteSingleEvent(_eventStreamId, 2, "bla1", token: token);
+		_event4 = await WriteSingleEvent(_eventStreamId, 3, "bla1", token: token);
+
+		await Writer.CompleteChunk(token);
+		await Writer.AddNewChunk(token: token);
+
+		Scavenge(completeLast: false, mergeChunks: true);
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_the_all_stream() {
+		var events = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(5, events.Count());
+		Assert.AreEqual(_event1.EventId, events[0].EventId);
+		Assert.AreEqual(_event2.EventId, events[1].EventId);
+		Assert.AreEqual(_deleted.EventId, events[2].EventId);
+		Assert.AreEqual(_event3.EventId, events[3].EventId);
+		Assert.AreEqual(_event4.EventId, events[4].EventId);
+	}
+
+	[Test]
+	public async Task should_have_updated_deleted_stream_event_number() {
+		var chunk = await Db.Manager.GetInitializedChunk(0, CancellationToken.None);
+		var chunkRecords = new List<ILogRecord>();
+		RecordReadResult result = await chunk.TryReadFirst(CancellationToken.None);
+		while (result.Success) {
+			chunkRecords.Add(result.LogRecord);
+			result = await chunk.TryReadClosestForward(result.NextPosition, CancellationToken.None);
+		}
+
+		var id = _logFormat.StreamIds.LookupValue(_deletedEventStreamId);
+		var deletedRecord = (IPrepareLogRecord<TStreamId>)chunkRecords.First(
+			x => x.RecordType == LogRecordType.Prepare
+				 && EqualityComparer<TStreamId>.Default.Equals(((IPrepareLogRecord<TStreamId>)x).EventStreamId, id));
+
+		Assert.AreEqual(EventNumber.DeletedStream - 1, deletedRecord.ExpectedVersion);
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_the_stream() {
+		var events = await ReadIndex.ReadStreamEventsForward(_eventStreamId, 0, 10, CancellationToken.None);
+		Assert.AreEqual(4, events.Records.Length);
+		Assert.AreEqual(_event1.EventId, events.Records[0].EventId);
+		Assert.AreEqual(_event2.EventId, events.Records[1].EventId);
+		Assert.AreEqual(_event3.EventId, events.Records[2].EventId);
+		Assert.AreEqual(_event4.EventId, events.Records[3].EventId);
+	}
+
+	[Test]
+	public async Task the_deleted_stream_should_be_deleted() {
+		var lastNumber = await ReadIndex.GetStreamLastEventNumber(_deletedEventStreamId, CancellationToken.None);
+		Assert.AreEqual(EventNumber.DeletedStream, lastNumber);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_incomplete_chunk.cs b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_incomplete_chunk.cs
new file mode 100644
index 00000000000..8b19c5669f3
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_incomplete_chunk.cs
@@ -0,0 +1,79 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Scavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string), LogRecordVersion.LogRecordV0)]
+[TestFixture(typeof(LogFormat.V2), typeof(string), LogRecordVersion.LogRecordV1)]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), LogRecordVersion.LogRecordV1)]
+public class when_scavenging_tfchunk_with_incomplete_chunk<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	private readonly byte _version = LogRecordVersion.LogRecordV0;
+
+	public when_scavenging_tfchunk_with_incomplete_chunk(byte version) {
+		_version = version;
+	}
+
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator
+			.Chunk(
+				Rec.Prepare(0, "ES1", version: _version),
+				Rec.Commit(0, "ES1", version: _version),
+				Rec.Prepare(1, "ES1", version: _version),
+				Rec.Commit(1, "ES1", version: _version))
+			.Chunk(
+				Rec.Prepare(2, "ES2", version: _version),
+				Rec.Commit(2, "ES2", version: _version),
+				Rec.Prepare(3, "ES2", version: _version),
+				Rec.Commit(3, "ES2", version: _version))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
+			return new[] {
+				new[] {
+					dbResult.Recs[0][0],
+					dbResult.Recs[0][1],
+					dbResult.Recs[0][2],
+					dbResult.Recs[0][3],
+				},
+				new[] {
+					dbResult.Recs[1][0],
+					dbResult.Recs[1][1],
+					dbResult.Recs[1][2],
+					dbResult.Recs[1][3],
+				}
+			};
+		}
+
+		return new[] {
+			new[] {
+				dbResult.Recs[0][0], // "ES1" created
+				dbResult.Recs[0][1],
+				dbResult.Recs[0][2],
+				dbResult.Recs[0][3],
+				dbResult.Recs[0][4],
+			},
+			new[] {
+				dbResult.Recs[1][0], // "ES2" created
+				dbResult.Recs[1][1],
+				dbResult.Recs[1][2],
+				dbResult.Recs[1][3],
+				dbResult.Recs[1][4],
+			}
+		};
+	}
+
+	[Test]
+	public async Task should_not_have_changed_any_records() {
+		await CheckRecords();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_transactions.cs b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_transactions.cs
new file mode 100644
index 00000000000..3a8c64bbf1a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_transactions.cs
@@ -0,0 +1,365 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Scavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class when_scavenging_tfchunk_with_transactions<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private const string _streamIdOne = "ES-1";
+	private const string _streamIdTwo = "ES-2";
+	private EventRecord _p1, _p2, _p3, _p4, _p5, _random1;
+	private long _t2CommitPos, _t1CommitPos, _postCommitPos;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var t1 = await WriteTransactionBegin(_streamIdOne, ExpectedVersion.NoStream, token);
+		var t2 = await WriteTransactionBegin(_streamIdTwo, ExpectedVersion.NoStream, token);
+
+		_p1 = await WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 0,
+			_streamIdOne, 0, "es1", PrepareFlags.Data, token: token);
+		_p2 = await WriteTransactionEvent(t2.CorrelationId, t2.LogPosition, 0,
+			_streamIdTwo, 0, "abc1", PrepareFlags.Data, token: token);
+		_p3 = await WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 1,
+			_streamIdOne, 1, "es1", PrepareFlags.Data, token: token);
+		_p4 = await WriteTransactionEvent(t2.CorrelationId, t2.LogPosition, 1,
+			_streamIdTwo, 1, "abc1", PrepareFlags.Data, token: token);
+		_p5 = await WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 2,
+			_streamIdOne, 2, "es1", PrepareFlags.Data, token: token);
+
+		await WriteTransactionEnd(t2.CorrelationId, t2.TransactionPosition, _streamIdTwo, token: token);
+		await WriteTransactionEnd(t1.CorrelationId, t1.TransactionPosition, _streamIdOne, token: token);
+
+		var t2Commit = await WriteCommit(t2.TransactionPosition, _streamIdTwo, 0, token);
+		_t2CommitPos = t2Commit.LogPosition;
+		var t1Commit = await WriteCommit(t1.TransactionPosition, _streamIdOne, 0, token);
+		_t1CommitPos = t1Commit.LogPosition;
+		_postCommitPos =
+			t1Commit.GetNextLogPosition(t1Commit.LogPosition, t1Commit.GetSizeWithLengthPrefixAndSuffix() - 2 * sizeof(int));
+
+		await Writer.CompleteChunk(token);
+		await Writer.AddNewChunk(token: token);
+
+		// Need to have a second chunk as otherwise the checkpoints will be off
+		_random1 = await WriteSingleEvent("random-stream", 0, "bla", token: token);
+
+		Scavenge(completeLast: false, mergeChunks: true);
+	}
+
+	[Test]
+	public async Task the_log_records_are_in_first_chunk() {
+		var chunk = await Db.Manager.GetInitializedChunk(0, CancellationToken.None);
+
+		var chunkRecords = new List<ILogRecord>();
+		RecordReadResult result = await chunk.TryReadFirst(CancellationToken.None);
+		while (result.Success) {
+			chunkRecords.Add(result.LogRecord);
+			result = await chunk.TryReadClosestForward(result.NextPosition, CancellationToken.None);
+		}
+
+		Assert.AreEqual(7, chunkRecords.Count);
+	}
+
+	[Test]
+	public async Task the_log_records_are_unchanged_in_second_chunk() {
+		var chunk = await Db.Manager.GetInitializedChunk(1, CancellationToken.None);
+
+		var chunkRecords = new List<ILogRecord>();
+		RecordReadResult result = await chunk.TryReadFirst(CancellationToken.None);
+		while (result.Success) {
+			chunkRecords.Add(result.LogRecord);
+			result = await chunk.TryReadClosestForward(result.NextPosition, CancellationToken.None);
+		}
+
+		Assert.AreEqual(2, chunkRecords.Count);
+	}
+
+	public async Task return_correct_last_event_version_for_larger_stream() {
+		Assert.AreEqual(2, await ReadIndex.GetStreamLastEventNumber(_streamIdOne, CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_first_record_for_larger_stream() {
+		var result = await ReadIndex.ReadEvent(_streamIdOne, 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p1.EventId, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task return_correct_second_record_for_larger_stream() {
+		var result = await ReadIndex.ReadEvent(_streamIdOne, 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p3.EventId, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task return_correct_third_record_for_larger_stream() {
+		var result = await ReadIndex.ReadEvent(_streamIdOne, 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p5.EventId, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task not_find_record_with_nonexistent_version_for_larger_stream() {
+		var result = await ReadIndex.ReadEvent(_streamIdOne, 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_larger_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward(_streamIdOne, 0, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_p1.EventId, result.Records[0].EventId);
+		Assert.AreEqual(_p3.EventId, result.Records[1].EventId);
+		Assert.AreEqual(_p5.EventId, result.Records[2].EventId);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_larger_stream_with_specific_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward(_streamIdOne, 2, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_p5.EventId, result.Records[0].EventId);
+		Assert.AreEqual(_p3.EventId, result.Records[1].EventId);
+		Assert.AreEqual(_p1.EventId, result.Records[2].EventId);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_larger_stream_with_from_end_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward(_streamIdOne, -1, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_p5.EventId, result.Records[0].EventId);
+		Assert.AreEqual(_p3.EventId, result.Records[1].EventId);
+		Assert.AreEqual(_p1.EventId, result.Records[2].EventId);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_smaller_stream() {
+		Assert.AreEqual(1, await ReadIndex.GetStreamLastEventNumber(_streamIdTwo, CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_first_record_for_smaller_stream() {
+		var result = await ReadIndex.ReadEvent(_streamIdTwo, 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p2.EventId, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task return_correct_second_record_for_smaller_stream() {
+		var result = await ReadIndex.ReadEvent(_streamIdTwo, 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p4.EventId, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task not_find_record_with_nonexistent_version_for_smaller_stream() {
+		var result = await ReadIndex.ReadEvent(_streamIdTwo, 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_smaller_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward(_streamIdTwo, 0, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_p2.EventId, result.Records[0].EventId);
+		Assert.AreEqual(_p4.EventId, result.Records[1].EventId);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_smaller_stream_with_specific_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward(_streamIdTwo, 1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_p4.EventId, result.Records[0].EventId);
+		Assert.AreEqual(_p2.EventId, result.Records[1].EventId);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_smaller_stream_with_from_end_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward(_streamIdTwo, -1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_p4.EventId, result.Records[0].EventId);
+		Assert.AreEqual(_p2.EventId, result.Records[1].EventId);
+	}
+
+	[Test]
+	public async Task read_all_events_forward_returns_all_events_in_correct_order() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10, CancellationToken.None))
+			.Records;
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_p2.EventId, records[0].Event.EventId);
+		Assert.AreEqual(_p4.EventId, records[1].Event.EventId);
+		Assert.AreEqual(_p1.EventId, records[2].Event.EventId);
+		Assert.AreEqual(_p3.EventId, records[3].Event.EventId);
+		Assert.AreEqual(_p5.EventId, records[4].Event.EventId);
+		Assert.AreEqual(_random1.EventId, records[5].Event.EventId);
+	}
+
+	[Test]
+	public async Task read_all_events_backward_returns_all_events_in_correct_order() {
+		var pos = GetBackwardReadPos();
+		var records = (await ReadIndex.ReadAllEventsBackward(pos, 10, CancellationToken.None)).Records;
+
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_random1.EventId, records[0].Event.EventId);
+		Assert.AreEqual(_p5.EventId, records[1].Event.EventId);
+		Assert.AreEqual(_p3.EventId, records[2].Event.EventId);
+		Assert.AreEqual(_p1.EventId, records[3].Event.EventId);
+		Assert.AreEqual(_p4.EventId, records[4].Event.EventId);
+		Assert.AreEqual(_p2.EventId, records[5].Event.EventId);
+	}
+
+	[Test]
+	public async Task
+		read_all_events_forward_returns_no_transaction_records_when_prepare_position_is_greater_than_last_prepare_in_commit() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(_t1CommitPos, _t1CommitPos), 10, CancellationToken.None))
+			.Records;
+		Assert.AreEqual(1, records.Count);
+		Assert.AreEqual(_random1.EventId, records[0].Event.EventId);
+	}
+
+	[Test]
+	public async Task
+		read_all_events_backwards_returns_nothing_when_prepare_position_is_smaller_than_first_prepare_in_commit() {
+		var records = (await ReadIndex.ReadAllEventsBackward(new TFPos(_t2CommitPos, 0), 10, CancellationToken.None)).Records;
+		Assert.AreEqual(0, records.Count);
+	}
+
+	[Test]
+	public async Task read_all_events_forward_returns_correct_events_starting_in_the_middle_of_tf() {
+		var res1 = await ReadIndex.ReadAllEventsForward(new TFPos(_t2CommitPos, _p4.LogPosition),
+			10, CancellationToken.None); // end of first commit
+		Assert.AreEqual(5, res1.Records.Count);
+		Assert.AreEqual(_p4.EventId, res1.Records[0].Event.EventId);
+		Assert.AreEqual(_p1.EventId, res1.Records[1].Event.EventId);
+		Assert.AreEqual(_p3.EventId, res1.Records[2].Event.EventId);
+		Assert.AreEqual(_p5.EventId, res1.Records[3].Event.EventId);
+		Assert.AreEqual(_random1.EventId, res1.Records[4].Event.EventId);
+
+		var res2 = await ReadIndex.ReadAllEventsBackward(res1.PrevPos, 10, CancellationToken.None);
+		Assert.AreEqual(1, res2.Records.Count);
+		Assert.AreEqual(_p2.EventId, res2.Records[0].Event.EventId);
+	}
+
+	[Test]
+	public async Task read_all_events_backward_returns_correct_events_starting_in_the_middle_of_tf() {
+		var pos = new TFPos(_postCommitPos, _p4.LogPosition); // p3 post position
+		var res1 = await ReadIndex.ReadAllEventsBackward(pos, 10, CancellationToken.None);
+
+		Assert.AreEqual(4, res1.Records.Count);
+		Assert.AreEqual(_p3.EventId, res1.Records[0].Event.EventId);
+		Assert.AreEqual(_p1.EventId, res1.Records[1].Event.EventId);
+		Assert.AreEqual(_p4.EventId, res1.Records[2].Event.EventId);
+		Assert.AreEqual(_p2.EventId, res1.Records[3].Event.EventId);
+
+		var res2 = await ReadIndex.ReadAllEventsForward(res1.PrevPos, 10, CancellationToken.None);
+		Assert.AreEqual(2, res2.Records.Count);
+		Assert.AreEqual(_p5.EventId, res2.Records[0].Event.EventId);
+	}
+
+	[Test]
+	public async Task all_records_can_be_read_sequentially_page_by_page_in_forward_pass() {
+		var recs = new[] { _p2, _p4, _p1, _p3, _p5, _random1 }; // in committed order
+
+		int count = 0;
+		var pos = new TFPos(0, 0);
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsForward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count].EventId, result.Records[0].Event.EventId);
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task all_records_can_be_read_sequentially_page_by_page_in_backward_pass() {
+		var recs = new[] { _random1, _p5, _p3, _p1, _p4, _p2 }; // in reverse committed order
+
+		int count = 0;
+		var pos = GetBackwardReadPos();
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsBackward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count].EventId, result.Records[0].Event.EventId);
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task position_returned_for_prev_page_when_traversing_forward_allow_to_traverse_backward_correctly() {
+		var recs = new[] { _p2, _p4, _p1, _p3, _p5, _random1 }; // in committed order
+
+		int count = 0;
+		var pos = new TFPos(0, 0);
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsForward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count].EventId, result.Records[0].Event.EventId);
+
+			var localPos = result.PrevPos;
+			int localCount = 0;
+			IndexReadAllResult localResult;
+			while ((localResult = await ReadIndex.ReadAllEventsBackward(localPos, 1, CancellationToken.None)).Records.Count != 0) {
+				Assert.AreEqual(1, localResult.Records.Count);
+				Assert.AreEqual(recs[count - 1 - localCount].EventId, localResult.Records[0].Event.EventId);
+				localPos = localResult.NextPos;
+				localCount += 1;
+			}
+
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task position_returned_for_prev_page_when_traversing_backward_allow_to_traverse_forward_correctly() {
+		var recs = new[] { _random1, _p5, _p3, _p1, _p4, _p2 }; // in reverse committed order
+
+		int count = 0;
+		var pos = GetBackwardReadPos();
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsBackward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count].EventId, result.Records[0].Event.EventId);
+
+			var localPos = result.PrevPos;
+			int localCount = 0;
+			IndexReadAllResult localResult;
+			while ((localResult = await ReadIndex.ReadAllEventsForward(localPos, 1, CancellationToken.None)).Records.Count != 0) {
+				Assert.AreEqual(1, localResult.Records.Count);
+				Assert.AreEqual(recs[count - 1 - localCount].EventId, localResult.Records[0].Event.EventId);
+				localPos = localResult.NextPos;
+				localCount += 1;
+			}
+
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_version0_log_records_and_deleted_records.cs b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_version0_log_records_and_deleted_records.cs
new file mode 100644
index 00000000000..4f8993779fb
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_version0_log_records_and_deleted_records.cs
@@ -0,0 +1,114 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Scavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "No such thing as a V0 prepare in LogV3")]
+public class when_scavenging_tfchunk_with_version0_log_records_and_deleted_records<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+
+	private const string _eventStreamId = "ES";
+	private const string _deletedEventStreamId = "Deleted-ES";
+	private PrepareLogRecord _event1, _event2, _event3, _event4, _deleted;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		// Stream that will be kept
+		_event1 = await WriteSingleEventWithLogVersion0(Guid.NewGuid(), _eventStreamId, Writer.Position,
+			0, token: token);
+		_event2 = await WriteSingleEventWithLogVersion0(Guid.NewGuid(), _eventStreamId, Writer.Position,
+			1, token: token);
+
+		// Stream that will be deleted
+		await WriteSingleEventWithLogVersion0(Guid.NewGuid(), _deletedEventStreamId, Writer.Position,
+			0, token: token);
+		await WriteSingleEventWithLogVersion0(Guid.NewGuid(), _deletedEventStreamId, Writer.Position,
+			1, token: token);
+		_deleted = await WriteSingleEventWithLogVersion0(Guid.NewGuid(), _deletedEventStreamId,
+			Writer.Position, int.MaxValue - 1,
+			PrepareFlags.StreamDelete | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd, token);
+
+		// Stream that will be kept
+		_event3 = await WriteSingleEventWithLogVersion0(Guid.NewGuid(), _eventStreamId, Writer.Position,
+			2, token: token);
+		_event4 = await WriteSingleEventWithLogVersion0(Guid.NewGuid(), _eventStreamId, Writer.Position,
+			3, token: token);
+
+		await Writer.CompleteChunk(token);
+		await Writer.AddNewChunk(token: token);
+
+		Scavenge(completeLast: false, mergeChunks: true);
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_the_all_stream() {
+		var events = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.Records
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(5, events.Count());
+		Assert.AreEqual(_event1.EventId, events[0].EventId);
+		Assert.AreEqual(_event2.EventId, events[1].EventId);
+		Assert.AreEqual(_deleted.EventId, events[2].EventId);
+		Assert.AreEqual(_event3.EventId, events[3].EventId);
+		Assert.AreEqual(_event4.EventId, events[4].EventId);
+	}
+
+	[Test]
+	public async Task should_have_updated_deleted_stream_event_number() {
+		var chunk = await Db.Manager.GetInitializedChunk(0, CancellationToken.None);
+		var chunkRecords = new List<ILogRecord>();
+		RecordReadResult result = await chunk.TryReadFirst(CancellationToken.None);
+		while (result.Success) {
+			chunkRecords.Add(result.LogRecord);
+			result = await chunk.TryReadClosestForward(result.NextPosition, CancellationToken.None);
+		}
+
+		var deletedRecord = (PrepareLogRecord)chunkRecords.First(x => x.RecordType == LogRecordType.Prepare
+																	  && ((PrepareLogRecord)x).EventStreamId ==
+																	  _deletedEventStreamId);
+
+
+		Assert.AreEqual(EventNumber.DeletedStream - 1, deletedRecord.ExpectedVersion);
+	}
+
+	[Test]
+	public async Task the_log_records_are_still_version_0() {
+		var chunk = await Db.Manager.GetInitializedChunk(0, CancellationToken.None);
+		var chunkRecords = new List<ILogRecord>();
+		RecordReadResult result = await chunk.TryReadFirst(CancellationToken.None);
+		while (result.Success) {
+			chunkRecords.Add(result.LogRecord);
+			result = await chunk.TryReadClosestForward(result.NextPosition, CancellationToken.None);
+		}
+
+		Assert.IsTrue(chunkRecords.All(x => x.Version == LogRecordVersion.LogRecordV0));
+		Assert.AreEqual(10, chunkRecords.Count);
+	}
+
+	[Test]
+	public async Task should_be_able_to_read_the_stream() {
+		var events = await ReadIndex.ReadStreamEventsForward(_eventStreamId, 0, 10, CancellationToken.None);
+		Assert.AreEqual(4, events.Records.Length);
+		Assert.AreEqual(_event1.EventId, events.Records[0].EventId);
+		Assert.AreEqual(_event2.EventId, events.Records[1].EventId);
+		Assert.AreEqual(_event3.EventId, events.Records[2].EventId);
+		Assert.AreEqual(_event4.EventId, events.Records[3].EventId);
+	}
+
+	[Test]
+	public async Task the_deleted_stream_should_be_deleted() {
+		var lastNumber = await ReadIndex.GetStreamLastEventNumber(_deletedEventStreamId, CancellationToken.None);
+		Assert.AreEqual(EventNumber.DeletedStream, lastNumber);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_version0_log_records_using_transactions.cs b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_version0_log_records_using_transactions.cs
new file mode 100644
index 00000000000..a76a0b864ba
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_scavenging_tfchunk_with_version0_log_records_using_transactions.cs
@@ -0,0 +1,419 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Scavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "No such thing as a V0 prepare in LogV3")]
+public class when_scavenging_tfchunk_with_version0_log_records_using_transactions<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+
+	private const string _streamIdOne = "ES-1";
+	private const string _streamIdTwo = "ES-2";
+	private PrepareLogRecord _p1, _p2, _p3, _p4, _p5, _random1;
+	private long _t2CommitPos, _t1CommitPos, _postCommitPos;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var t1 = await WriteTransactionBeginV0(Guid.NewGuid(), Writer.Position, _streamIdOne,
+			ExpectedVersion.NoStream, token);
+		var t2 = await WriteTransactionBeginV0(Guid.NewGuid(), Writer.Position, _streamIdTwo,
+			ExpectedVersion.NoStream, token);
+
+		_p1 = await WriteTransactionEventV0(t1.CorrelationId, Writer.Position, t1.LogPosition, 0,
+			t1.EventStreamId, 0, "es1", PrepareFlags.Data, token);
+		_p2 = await WriteTransactionEventV0(t2.CorrelationId, Writer.Position, t2.LogPosition, 0,
+			t2.EventStreamId, 0, "abc1", PrepareFlags.Data, token);
+		_p3 = await WriteTransactionEventV0(t1.CorrelationId, Writer.Position, t1.LogPosition, 1,
+			t1.EventStreamId, 1, "es1", PrepareFlags.Data, token);
+		_p4 = await WriteTransactionEventV0(t2.CorrelationId, Writer.Position, t2.LogPosition, 1,
+			t2.EventStreamId, 1, "abc1", PrepareFlags.Data, token);
+		_p5 = await WriteTransactionEventV0(t1.CorrelationId, Writer.Position, t1.LogPosition, 2,
+			t1.EventStreamId, 2, "es1", PrepareFlags.Data, token);
+
+		await WriteTransactionEndV0(t2.CorrelationId, Writer.Position, t2.TransactionPosition,
+			t2.EventStreamId, token);
+		await WriteTransactionEndV0(t1.CorrelationId, Writer.Position, t1.TransactionPosition,
+			t1.EventStreamId, token);
+
+		(_t2CommitPos, _postCommitPos) = await WriteCommitV0(t2.CorrelationId, Writer.Position, t2.TransactionPosition,
+			t2.EventStreamId, 0, token);
+		(_t1CommitPos, _postCommitPos) = await WriteCommitV0(t1.CorrelationId, Writer.Position, t1.TransactionPosition,
+			t1.EventStreamId, 0, token);
+
+		await Writer.CompleteChunk(token);
+		await Writer.AddNewChunk(token: token);
+
+		// Need to have a second chunk as otherwise the checkpoints will be off
+		_random1 = await WriteSingleEventWithLogVersion0(Guid.NewGuid(), "random-stream",
+			Writer.Position, 0, token: token);
+
+		Scavenge(completeLast: false, mergeChunks: true);
+	}
+
+	private async ValueTask<PrepareLogRecord> WriteTransactionBeginV0(Guid id, long logPosition, string eventStreamId,
+		long expectedVersion, CancellationToken token) {
+		var prepare = new PrepareLogRecord(logPosition, id, Guid.NewGuid(), logPosition, -1,
+			eventStreamId, null, expectedVersion,
+			DateTime.UtcNow, PrepareFlags.TransactionBegin, null, null, new byte[0], new byte[0],
+			LogRecordVersion.LogRecordV0);
+
+		Assert.IsTrue(await Writer.Write(prepare, token) is (true, _));
+		return prepare;
+	}
+
+	private async ValueTask<PrepareLogRecord> WriteTransactionEventV0(Guid correlationId, long logPosition, long transactionPosition,
+		int transactionOffset, string eventStreamId, long eventNumber, string eventData, PrepareFlags flags,
+		CancellationToken token) {
+		var prepare = new PrepareLogRecord(logPosition, correlationId, Guid.NewGuid(), transactionPosition,
+			transactionOffset,
+			eventStreamId, null, ExpectedVersion.Any, DateTime.UtcNow, flags,
+			"testEventType", null, Encoding.UTF8.GetBytes(eventData), new byte[0],
+			LogRecordVersion.LogRecordV0);
+
+		await Writer.Write(prepare, token);
+		return prepare;
+	}
+
+	private async ValueTask WriteTransactionEndV0(Guid correlationId, long logPosition, long transactionId,
+		string eventStreamId, CancellationToken token) {
+		var prepare = new PrepareLogRecord(logPosition, correlationId, Guid.NewGuid(), transactionId, -1,
+			eventStreamId, null, ExpectedVersion.Any,
+			DateTime.UtcNow, PrepareFlags.TransactionEnd, null, null, new byte[0], new byte[0],
+			LogRecordVersion.LogRecordV0);
+
+		await Writer.Write(prepare, token);
+	}
+
+	private async ValueTask<(long, long)> WriteCommitV0(Guid correlationId, long logPosition, long transactionPosition, string eventStreamId,
+		long eventNumber, CancellationToken token) {
+		var commit = new CommitLogRecord(logPosition, correlationId, transactionPosition, DateTime.UtcNow,
+			eventNumber,
+			LogRecordVersion.LogRecordV0);
+
+		var (_, pos) = await Writer.Write(commit, token);
+		return (commit.LogPosition, pos);
+	}
+
+	[Test]
+	public async Task the_log_records_are_still_version_0_in_first_chunk() {
+		var chunk = await Db.Manager.GetInitializedChunk(0, CancellationToken.None);
+
+		var chunkRecords = new List<ILogRecord>();
+		RecordReadResult result = await chunk.TryReadFirst(CancellationToken.None);
+		while (result.Success) {
+			chunkRecords.Add(result.LogRecord);
+			result = await chunk.TryReadClosestForward(result.NextPosition, CancellationToken.None);
+		}
+
+		Assert.IsTrue(chunkRecords.All(x => x.Version == LogRecordVersion.LogRecordV0));
+		Assert.AreEqual(7, chunkRecords.Count);
+	}
+
+	[Test]
+	public async Task the_log_records_are_unchanged_in_second_chunk() {
+		var chunk = await Db.Manager.GetInitializedChunk(1, CancellationToken.None);
+
+		var chunkRecords = new List<ILogRecord>();
+		RecordReadResult result = await chunk.TryReadFirst(CancellationToken.None);
+		while (result.Success) {
+			chunkRecords.Add(result.LogRecord);
+			result = await chunk.TryReadClosestForward(result.NextPosition, CancellationToken.None);
+		}
+
+		Assert.IsTrue(chunkRecords.All(x => x.Version == LogRecordVersion.LogRecordV0));
+		Assert.AreEqual(2, chunkRecords.Count);
+	}
+
+	public async Task return_correct_last_event_version_for_larger_stream() {
+		Assert.AreEqual(2, (await ReadIndex.GetStreamLastEventNumber(_streamIdOne, CancellationToken.None)));
+	}
+
+	[Test]
+	public async Task return_correct_first_record_for_larger_stream() {
+		var result = await ReadIndex.ReadEvent(_streamIdOne, 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p1.EventId, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task return_correct_second_record_for_larger_stream() {
+		var result = await ReadIndex.ReadEvent(_streamIdOne, 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p3.EventId, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task return_correct_third_record_for_larger_stream() {
+		var result = await ReadIndex.ReadEvent(_streamIdOne, 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p5.EventId, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task not_find_record_with_nonexistent_version_for_larger_stream() {
+		var result = await ReadIndex.ReadEvent(_streamIdOne, 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_larger_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward(_streamIdOne, 0, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_p1.EventId, result.Records[0].EventId);
+		Assert.AreEqual(_p3.EventId, result.Records[1].EventId);
+		Assert.AreEqual(_p5.EventId, result.Records[2].EventId);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_larger_stream_with_specific_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward(_streamIdOne, 2, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_p5.EventId, result.Records[0].EventId);
+		Assert.AreEqual(_p3.EventId, result.Records[1].EventId);
+		Assert.AreEqual(_p1.EventId, result.Records[2].EventId);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_larger_stream_with_from_end_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward(_streamIdOne, -1, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_p5.EventId, result.Records[0].EventId);
+		Assert.AreEqual(_p3.EventId, result.Records[1].EventId);
+		Assert.AreEqual(_p1.EventId, result.Records[2].EventId);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_smaller_stream() {
+		Assert.AreEqual(1, await ReadIndex.GetStreamLastEventNumber(_streamIdTwo, CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_first_record_for_smaller_stream() {
+		var result = await ReadIndex.ReadEvent(_streamIdTwo, 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p2.EventId, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task return_correct_second_record_for_smaller_stream() {
+		var result = await ReadIndex.ReadEvent(_streamIdTwo, 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p4.EventId, result.Record.EventId);
+	}
+
+	[Test]
+	public async Task not_find_record_with_nonexistent_version_for_smaller_stream() {
+		var result = await ReadIndex.ReadEvent(_streamIdTwo, 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_smaller_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward(_streamIdTwo, 0, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_p2.EventId, result.Records[0].EventId);
+		Assert.AreEqual(_p4.EventId, result.Records[1].EventId);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_smaller_stream_with_specific_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward(_streamIdTwo, 1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_p4.EventId, result.Records[0].EventId);
+		Assert.AreEqual(_p2.EventId, result.Records[1].EventId);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_smaller_stream_with_from_end_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward(_streamIdTwo, -1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_p4.EventId, result.Records[0].EventId);
+		Assert.AreEqual(_p2.EventId, result.Records[1].EventId);
+	}
+
+	[Test]
+	public async Task read_all_events_forward_returns_all_events_in_correct_order() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10, CancellationToken.None)).Records;
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_p2.EventId, records[0].Event.EventId);
+		Assert.AreEqual(_p4.EventId, records[1].Event.EventId);
+		Assert.AreEqual(_p1.EventId, records[2].Event.EventId);
+		Assert.AreEqual(_p3.EventId, records[3].Event.EventId);
+		Assert.AreEqual(_p5.EventId, records[4].Event.EventId);
+		Assert.AreEqual(_random1.EventId, records[5].Event.EventId);
+	}
+
+	[Test]
+	public async Task read_all_events_backward_returns_all_events_in_correct_order() {
+		var pos = GetBackwardReadPos();
+		var records = (await ReadIndex.ReadAllEventsBackward(pos, 10, CancellationToken.None)).Records;
+
+		Assert.AreEqual(6, records.Count);
+		Assert.AreEqual(_random1.EventId, records[0].Event.EventId);
+		Assert.AreEqual(_p5.EventId, records[1].Event.EventId);
+		Assert.AreEqual(_p3.EventId, records[2].Event.EventId);
+		Assert.AreEqual(_p1.EventId, records[3].Event.EventId);
+		Assert.AreEqual(_p4.EventId, records[4].Event.EventId);
+		Assert.AreEqual(_p2.EventId, records[5].Event.EventId);
+	}
+
+	[Test]
+	public async Task
+		read_all_events_forward_returns_no_transaction_records_when_prepare_position_is_greater_than_last_prepare_in_commit() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(_t1CommitPos, _t1CommitPos), 10, CancellationToken.None))
+			.Records;
+		Assert.AreEqual(1, records.Count);
+		Assert.AreEqual(_random1.EventId, records[0].Event.EventId);
+	}
+
+	[Test]
+	public async Task
+		read_all_events_backwards_returns_nothing_when_prepare_position_is_smaller_than_first_prepare_in_commit() {
+		var records =
+			(await ReadIndex.ReadAllEventsBackward(new TFPos(_t2CommitPos, 0), 10, CancellationToken.None)).Records;
+		Assert.AreEqual(0, records.Count);
+	}
+
+	[Test]
+	public async Task read_all_events_forward_returns_correct_events_starting_in_the_middle_of_tf() {
+		var res1 = await ReadIndex.ReadAllEventsForward(new TFPos(_t2CommitPos, _p4.LogPosition),
+			10, CancellationToken.None); // end of first commit
+		Assert.AreEqual(5, res1.Records.Count);
+		Assert.AreEqual(_p4.EventId, res1.Records[0].Event.EventId);
+		Assert.AreEqual(_p1.EventId, res1.Records[1].Event.EventId);
+		Assert.AreEqual(_p3.EventId, res1.Records[2].Event.EventId);
+		Assert.AreEqual(_p5.EventId, res1.Records[3].Event.EventId);
+		Assert.AreEqual(_random1.EventId, res1.Records[4].Event.EventId);
+
+		var res2 = await ReadIndex.ReadAllEventsBackward(res1.PrevPos, 10, CancellationToken.None);
+		Assert.AreEqual(1, res2.Records.Count);
+		Assert.AreEqual(_p2.EventId, res2.Records[0].Event.EventId);
+	}
+
+	[Test]
+	public async Task read_all_events_backward_returns_correct_events_starting_in_the_middle_of_tf() {
+		var pos = new TFPos(_postCommitPos, _p4.LogPosition); // p3 post position
+		var res1 = await ReadIndex.ReadAllEventsBackward(pos, 10, CancellationToken.None);
+
+		Assert.AreEqual(4, res1.Records.Count);
+		Assert.AreEqual(_p3.EventId, res1.Records[0].Event.EventId);
+		Assert.AreEqual(_p1.EventId, res1.Records[1].Event.EventId);
+		Assert.AreEqual(_p4.EventId, res1.Records[2].Event.EventId);
+		Assert.AreEqual(_p2.EventId, res1.Records[3].Event.EventId);
+
+		var res2 = await ReadIndex.ReadAllEventsForward(res1.PrevPos, 10, CancellationToken.None);
+		Assert.AreEqual(2, res2.Records.Count);
+		Assert.AreEqual(_p5.EventId, res2.Records[0].Event.EventId);
+	}
+
+	[Test]
+	public async Task all_records_can_be_read_sequentially_page_by_page_in_forward_pass() {
+		var recs = new[] { _p2, _p4, _p1, _p3, _p5, _random1 }; // in committed order
+
+		int count = 0;
+		var pos = new TFPos(0, 0);
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsForward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count].EventId, result.Records[0].Event.EventId);
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task all_records_can_be_read_sequentially_page_by_page_in_backward_pass() {
+		var recs = new[] { _random1, _p5, _p3, _p1, _p4, _p2 }; // in reverse committed order
+
+		int count = 0;
+		var pos = GetBackwardReadPos();
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsBackward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count].EventId, result.Records[0].Event.EventId);
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task position_returned_for_prev_page_when_traversing_forward_allow_to_traverse_backward_correctly() {
+		var recs = new[] { _p2, _p4, _p1, _p3, _p5, _random1 }; // in committed order
+
+		int count = 0;
+		var pos = new TFPos(0, 0);
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsForward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count].EventId, result.Records[0].Event.EventId);
+
+			var localPos = result.PrevPos;
+			int localCount = 0;
+			IndexReadAllResult localResult;
+			while ((localResult = await ReadIndex.ReadAllEventsBackward(localPos, 1, CancellationToken.None)).Records.Count != 0) {
+				Assert.AreEqual(1, localResult.Records.Count);
+				Assert.AreEqual(recs[count - 1 - localCount].EventId, localResult.Records[0].Event.EventId);
+				localPos = localResult.NextPos;
+				localCount += 1;
+			}
+
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task position_returned_for_prev_page_when_traversing_backward_allow_to_traverse_forward_correctly() {
+		var recs = new[] { _random1, _p5, _p3, _p1, _p4, _p2 }; // in reverse committed order
+
+		int count = 0;
+		var pos = GetBackwardReadPos();
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsBackward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count].EventId, result.Records[0].Event.EventId);
+
+			var localPos = result.PrevPos;
+			int localCount = 0;
+			IndexReadAllResult localResult;
+			while ((localResult = await ReadIndex.ReadAllEventsForward(localPos, 1, CancellationToken.None)).Records.Count != 0) {
+				Assert.AreEqual(1, localResult.Records.Count);
+				Assert.AreEqual(recs[count - 1 - localCount].EventId, localResult.Records[0].Event.EventId);
+				localPos = localResult.NextPos;
+				localCount += 1;
+			}
+
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_and_all_events_and_metaevents_are_in_one_chunk.cs b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_and_all_events_and_metaevents_are_in_one_chunk.cs
new file mode 100644
index 00000000000..c409734e632
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_and_all_events_and_metaevents_are_in_one_chunk.cs
@@ -0,0 +1,82 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Scavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_stream_is_softdeleted_and_temp_and_all_events_and_metaevents_are_in_one_chunk<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator
+			.Chunk(
+				Rec.Prepare(0, "$$test", metadata: new StreamMetadata(tempStream: true)),
+				Rec.Commit(0, "$$test"),
+				Rec.Prepare(1, "test"),
+				Rec.Commit(1, "test"),
+				Rec.Prepare(2, "test"),
+				Rec.Commit(2, "test"),
+				Rec.Prepare(3, "$$test", metadata: new StreamMetadata(truncateBefore: EventNumber.DeletedStream, tempStream: true)),
+				Rec.Commit(3, "$$test"))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
+			return new[] { new ILogRecord[0] };
+		}
+
+		return new[] {
+			new[] {
+				dbResult.Recs[0][0], // "test" created
+			}
+		};
+	}
+
+	[Test]
+	public async Task scavenging_goes_as_expected() {
+		await CheckRecords();
+	}
+
+	[Test]
+	public async Task the_stream_is_absent_logically() {
+		Assert.AreEqual(ReadEventResult.NoStream, (await ReadIndex.ReadEvent("test", 0, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.NoStream, (await ReadIndex.ReadStreamEventsForward("test", 0, 100, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.NoStream, (await ReadIndex.ReadStreamEventsBackward("test", -1, 100, CancellationToken.None)).Result);
+	}
+
+	[Test]
+	public async Task the_metastream_is_absent_logically() {
+		Assert.AreEqual(ReadEventResult.NotFound, (await ReadIndex.ReadEvent("$$test", 0, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.Success, (await ReadIndex.ReadStreamEventsForward("$$test", 0, 100, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.Success, (await ReadIndex.ReadStreamEventsBackward("$$test", -1, 100, CancellationToken.None)).Result);
+	}
+
+	[Test]
+	public async Task the_stream_is_absent_physically() {
+		var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
+		Assert.IsEmpty((await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000, CancellationToken.None)).Records
+			.Where(x => x.Event.EventStreamId == "test"));
+		Assert.IsEmpty((await ReadIndex.ReadAllEventsBackward(headOfTf, 1000, CancellationToken.None)).Records
+			.Where(x => x.Event.EventStreamId == "test"));
+	}
+
+	[Test]
+	public async Task the_metastream_is_absent_physically() {
+		var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
+		Assert.IsEmpty((await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000, CancellationToken.None)).Records
+			.Where(x => x.Event.EventStreamId == "$$test"));
+		Assert.IsEmpty((await ReadIndex.ReadAllEventsBackward(headOfTf, 1000, CancellationToken.None)).Records
+			.Where(x => x.Event.EventStreamId == "$$test"));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_but_some_events_are_in_multiple_chunks.cs b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_but_some_events_are_in_multiple_chunks.cs
new file mode 100644
index 00000000000..e3efd5c73c1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_but_some_events_are_in_multiple_chunks.cs
@@ -0,0 +1,100 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Scavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_stream_is_softdeleted_and_temp_but_some_events_are_in_multiple_chunks_2<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator
+			.Chunk(
+				Rec.Prepare(0, "test"),
+				Rec.Commit(0, "test"))
+			.Chunk(
+				Rec.Prepare(1, "test"),
+				Rec.Commit(1, "test"),
+				Rec.Prepare(2, "$$test", metadata: new StreamMetadata(null, null, EventNumber.DeletedStream, true, null, null)),
+				Rec.Commit(2, "$$test"))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
+			return new[] {
+				new ILogRecord[0],
+				new[] {
+					dbResult.Recs[1][0],
+					dbResult.Recs[1][1],
+					dbResult.Recs[1][2],
+					dbResult.Recs[1][3]
+				}
+			};
+		}
+
+		return new[] {
+			new[] {
+				dbResult.Recs[0][0], // "test" created
+			},
+			new[] {
+				dbResult.Recs[1][0],
+				dbResult.Recs[1][1],
+				dbResult.Recs[1][2],
+				dbResult.Recs[1][3]
+			}
+		};
+	}
+
+	[Test]
+	public async Task scavenging_goes_as_expected() {
+		await CheckRecords();
+	}
+
+	[Test]
+	public async Task the_stream_is_absent_logically() {
+		Assert.AreEqual(ReadEventResult.NoStream, (await ReadIndex.ReadEvent("test", 0, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.NoStream, (await ReadIndex.ReadStreamEventsForward("test", 0, 100, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.NoStream, (await ReadIndex.ReadStreamEventsBackward("test", -1, 100, CancellationToken.None)).Result);
+	}
+
+	[Test]
+	public async Task the_metastream_is_present_logically() {
+		Assert.AreEqual(ReadEventResult.Success, (await ReadIndex.ReadEvent("$$test", -1, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.Success, (await ReadIndex.ReadStreamEventsForward("$$test", 0, 100, CancellationToken.None)).Result);
+		Assert.AreEqual(1, (await ReadIndex.ReadStreamEventsForward("$$test", 0, 100, CancellationToken.None)).Records.Length);
+		Assert.AreEqual(ReadStreamResult.Success, (await ReadIndex.ReadStreamEventsBackward("$$test", -1, 100, CancellationToken.None)).Result);
+		Assert.AreEqual(1, (await ReadIndex.ReadStreamEventsBackward("$$test", -1, 100, CancellationToken.None)).Records.Length);
+	}
+
+	[Test]
+	public async Task the_stream_is_present_physically() {
+		var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
+		Assert.AreEqual(1,
+			(await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000, CancellationToken.None))
+				.Records
+				.Count(x => x.Event.EventStreamId == "test"));
+		Assert.AreEqual(1,
+			(await ReadIndex.ReadAllEventsBackward(headOfTf, 1000, CancellationToken.None)).Records.Count(x => x.Event.EventStreamId == "test"));
+	}
+
+	[Test]
+	public async Task the_metastream_is_present_physically() {
+		var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
+		Assert.AreEqual(1,
+			(await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000, CancellationToken.None))
+				.Records
+				.Count(x => x.Event.EventStreamId == "$$test"));
+		Assert.AreEqual(1,
+			(await ReadIndex.ReadAllEventsBackward(headOfTf, 1000, CancellationToken.None)).Records.Count(x => x.Event.EventStreamId == "$$test"));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_but_some_events_are_in_multiple_chunks_2.cs b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_but_some_events_are_in_multiple_chunks_2.cs
new file mode 100644
index 00000000000..a6b9e795354
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_but_some_events_are_in_multiple_chunks_2.cs
@@ -0,0 +1,102 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Scavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_stream_is_softdeleted_and_temp_but_some_events_are_in_multiple_chunks<TLogFormat, TStreamId> :
+		ScavengeTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator
+			.Chunk(
+				Rec.Prepare(0, "test"),
+				Rec.Commit(0, "test"))
+			.Chunk(
+				Rec.Prepare(1, "test"),
+				Rec.Commit(1, "test"),
+				Rec.Prepare(2, "$$test", metadata: new StreamMetadata(null, null, EventNumber.DeletedStream, true, null, null)),
+				Rec.Commit(2, "$$test"))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
+			return new[] {
+				new ILogRecord[0],
+				new[] {
+					dbResult.Recs[1][0],
+					dbResult.Recs[1][1],
+					dbResult.Recs[1][2],
+					dbResult.Recs[1][3]
+				}
+			};
+		}
+
+		return new[] {
+			new[] {
+				dbResult.Recs[0][0], // "test" created
+			},
+			new[] {
+				dbResult.Recs[1][0],
+				dbResult.Recs[1][1],
+				dbResult.Recs[1][2],
+				dbResult.Recs[1][3]
+			}
+		};
+	}
+
+	[Test]
+	public async Task scavenging_goes_as_expected() {
+		await CheckRecords();
+	}
+
+	[Test]
+	public async Task the_stream_is_absent_logically() {
+		Assert.AreEqual(ReadEventResult.NoStream, (await ReadIndex.ReadEvent("test", 0, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.NoStream, (await ReadIndex.ReadStreamEventsForward("test", 0, 100, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.NoStream, (await ReadIndex.ReadStreamEventsBackward("test", -1, 100, CancellationToken.None)).Result);
+	}
+
+	[Test]
+	public async Task the_metastream_is_present_logically() {
+		Assert.AreEqual(ReadEventResult.Success, (await ReadIndex.ReadEvent("$$test", -1, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.Success, (await ReadIndex.ReadStreamEventsForward("$$test", 0, 100, CancellationToken.None)).Result);
+		Assert.AreEqual(1, (await ReadIndex.ReadStreamEventsForward("$$test", 0, 100, CancellationToken.None)).Records.Length);
+		Assert.AreEqual(ReadStreamResult.Success, (await ReadIndex.ReadStreamEventsBackward("$$test", -1, 100, CancellationToken.None)).Result);
+		Assert.AreEqual(1, (await ReadIndex.ReadStreamEventsBackward("$$test", -1, 100, CancellationToken.None)).Records.Length);
+	}
+
+	[Test]
+	public async Task the_stream_is_present_physically() {
+		var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
+		Assert.AreEqual(1,
+			(await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000, CancellationToken.None))
+				.Records
+				.Count(x => x.Event.EventStreamId == "test"));
+		Assert.AreEqual(1,
+			(await ReadIndex.ReadAllEventsBackward(headOfTf, 1000, CancellationToken.None)).Records.Count(x => x.Event.EventStreamId == "test"));
+	}
+
+	[Test]
+	public async Task the_metastream_is_present_physically() {
+		var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
+		Assert.AreEqual(1,
+			(await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000, CancellationToken.None))
+				.Records
+				.Count(x => x.Event.EventStreamId == "$$test"));
+		Assert.AreEqual(1,
+			(await ReadIndex.ReadAllEventsBackward(headOfTf, 1000, CancellationToken.None)).Records.Count(x => x.Event.EventStreamId == "$$test"));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_but_some_metaevents_are_in_multiple_chunks.cs b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_but_some_metaevents_are_in_multiple_chunks.cs
new file mode 100644
index 00000000000..99bdd88ed63
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_but_some_metaevents_are_in_multiple_chunks.cs
@@ -0,0 +1,100 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Scavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_stream_is_softdeleted_and_temp_but_some_metaevents_are_in_multiple_chunks<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator
+			.Chunk(
+				Rec.Prepare(0, "$$test", metadata: new StreamMetadata(tempStream: true)),
+				Rec.Commit(0, "$$test"))
+			.Chunk(
+				Rec.Prepare(1, "test"),
+				Rec.Commit(1, "test"),
+				Rec.Prepare(2, "test"),
+				Rec.Commit(2, "test"),
+				Rec.Prepare(3, "$$test", metadata: new StreamMetadata(truncateBefore: EventNumber.DeletedStream, tempStream: true)),
+				Rec.Commit(3, "$$test"))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
+			return new[] {
+				new ILogRecord[0],
+				new[] {
+					dbResult.Recs[1][2],
+					dbResult.Recs[1][3],
+					dbResult.Recs[1][4],
+					dbResult.Recs[1][5]
+				}
+			};
+		}
+
+		return new[] {
+			new[] {
+				dbResult.Recs[0][0], // "test" created
+			},
+			new[] {
+				dbResult.Recs[1][2],
+				dbResult.Recs[1][3],
+				dbResult.Recs[1][4],
+				dbResult.Recs[1][5]
+			}
+		};
+	}
+
+	[Test]
+	public async Task scavenging_goes_as_expected() {
+		await CheckRecords();
+	}
+
+	[Test]
+	public async Task the_stream_is_absent_logically() {
+		Assert.AreEqual(ReadEventResult.NoStream, (await ReadIndex.ReadEvent("test", 0, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.NoStream, (await ReadIndex.ReadStreamEventsForward("test", 0, 100, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.NoStream, (await ReadIndex.ReadStreamEventsBackward("test", -1, 100, CancellationToken.None)).Result);
+	}
+
+	[Test]
+	public async Task the_metastream_is_present_logically() {
+		Assert.AreEqual(ReadEventResult.Success, (await ReadIndex.ReadEvent("$$test", -1, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.Success, (await ReadIndex.ReadStreamEventsForward("$$test", 0, 100, CancellationToken.None)).Result);
+		Assert.AreEqual(1, (await ReadIndex.ReadStreamEventsForward("$$test", 0, 100, CancellationToken.None)).Records.Length);
+		Assert.AreEqual(ReadStreamResult.Success, (await ReadIndex.ReadStreamEventsBackward("$$test", -1, 100, CancellationToken.None)).Result);
+		Assert.AreEqual(1, (await ReadIndex.ReadStreamEventsBackward("$$test", -1, 100, CancellationToken.None)).Records.Length);
+	}
+
+	[Test]
+	public async Task the_stream_is_present_physically() {
+		var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
+		Assert.AreEqual(1,
+			(await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000, CancellationToken.None)).Records
+				.Count(x => x.Event.EventStreamId == "test"));
+		Assert.AreEqual(1,
+			(await ReadIndex.ReadAllEventsBackward(headOfTf, 1000, CancellationToken.None)).Records.Count(x => x.Event.EventStreamId == "test"));
+	}
+
+	[Test]
+	public async Task the_metastream_is_present_physically() {
+		var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
+		Assert.AreEqual(1,
+			(await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000, CancellationToken.None)).Records
+				.Count(x => x.Event.EventStreamId == "$$test"));
+		Assert.AreEqual(1,
+			(await ReadIndex.ReadAllEventsBackward(headOfTf, 1000, CancellationToken.None)).Records.Count(x => x.Event.EventStreamId == "$$test"));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_with_log_version_0_but_some_events_are_in_multiple_chunks.cs b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_with_log_version_0_but_some_events_are_in_multiple_chunks.cs
new file mode 100644
index 00000000000..e6d54c08e54
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_and_temp_with_log_version_0_but_some_events_are_in_multiple_chunks.cs
@@ -0,0 +1,99 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Scavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "No such thing as a V0 prepare in LogV3")]
+public class
+	when_stream_is_softdeleted_and_temp_with_log_version_0_but_some_events_are_in_multiple_chunks<TLogFormat, TStreamId> :
+		ScavengeTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		var version = LogRecordVersion.LogRecordV0;
+		return dbCreator.Chunk(Rec.Prepare(0, "test", version: version),
+				Rec.Commit(0, "test", version: version))
+			.Chunk(Rec.Prepare(1, "test", version: version),
+				Rec.Commit(1, "test", version: version),
+				Rec.Prepare(2, "$$test", metadata: new StreamMetadata(null, null, int.MaxValue, true, null, null),
+					version: version),
+				Rec.Commit(2, "$$test", version: version))
+			.Chunk(
+				Rec.Prepare(3, "random",
+					version: version), // Need an incomplete chunk to ensure writer checkpoints are correct
+				Rec.Commit(3, "random", version: version))
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		return new[] {
+			new ILogRecord[0],
+			new[] {
+				dbResult.Recs[1][0],
+				dbResult.Recs[1][1],
+				dbResult.Recs[1][2],
+				dbResult.Recs[1][3]
+			},
+			new[] {
+				dbResult.Recs[2][0],
+				dbResult.Recs[2][1]
+			}
+		};
+	}
+
+	[Test]
+	public async Task scavenging_goes_as_expected() {
+		await CheckRecords();
+	}
+
+	[Test]
+	public async Task the_stream_is_absent_logically() {
+		Assert.AreEqual(ReadStreamResult.NoStream, (await ReadIndex.ReadStreamEventsForward("test", 0, 100, CancellationToken.None)).Result,
+			"Read test stream forward");
+		Assert.AreEqual(ReadStreamResult.NoStream, (await ReadIndex.ReadStreamEventsBackward("test", -1, 100, CancellationToken.None)).Result,
+			"Read test stream backward");
+		Assert.AreEqual(ReadEventResult.NoStream, (await ReadIndex.ReadEvent("test", 0, CancellationToken.None)).Result,
+			"Read single event from test stream");
+	}
+
+	[Test]
+	public async Task the_metastream_is_present_logically() {
+		Assert.AreEqual(ReadEventResult.Success, (await ReadIndex.ReadEvent("$$test", -1, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.Success, (await ReadIndex.ReadStreamEventsForward("$$test", 0, 100, CancellationToken.None)).Result);
+		Assert.AreEqual(1, (await ReadIndex.ReadStreamEventsForward("$$test", 0, 100, CancellationToken.None)).Records.Length);
+		Assert.AreEqual(ReadStreamResult.Success, (await ReadIndex.ReadStreamEventsBackward("$$test", -1, 100, CancellationToken.None)).Result);
+		Assert.AreEqual(1, (await ReadIndex.ReadStreamEventsBackward("$$test", -1, 100, CancellationToken.None)).Records.Length);
+	}
+
+	[Test]
+	public async Task the_stream_is_present_physically() {
+		var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
+		Assert.AreEqual(1,
+			(await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000, CancellationToken.None)).Records
+				.Count(x => x.Event.EventStreamId == "test"));
+		Assert.AreEqual(1,
+			(await ReadIndex.ReadAllEventsBackward(headOfTf, 1000, CancellationToken.None)).Records.Count(x =>
+				x.Event.EventStreamId == "test"));
+	}
+
+	[Test]
+	public async Task the_metastream_is_present_physically() {
+		var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
+		Assert.AreEqual(1,
+			(await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000, CancellationToken.None)).Records
+				.Count(x => x.Event.EventStreamId == "$$test"), "Read $$test stream forward");
+		Assert.AreEqual(1,
+			(await ReadIndex.ReadAllEventsBackward(headOfTf, 10, CancellationToken.None)).Records.Count(x =>
+				x.Event.EventStreamId == "$$test"),
+			"Read $$test stream backward");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_with_log_record_version_0.cs b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_with_log_record_version_0.cs
new file mode 100644
index 00000000000..adcd5a18d3c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_with_log_record_version_0.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Scavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "No such thing as a V0 prepare in LogV3")]
+public class when_stream_is_softdeleted_with_log_record_version_0<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator.Chunk(
+				Rec.Prepare(0, "$$test", metadata: new StreamMetadata(tempStream: true),
+					version: LogRecordVersion.LogRecordV0),
+				Rec.Commit(0, "$$test", version: LogRecordVersion.LogRecordV0),
+				Rec.Prepare(1, "test", version: LogRecordVersion.LogRecordV0),
+				Rec.Commit(1, "test", version: LogRecordVersion.LogRecordV0),
+				Rec.Prepare(2, "test", version: LogRecordVersion.LogRecordV0),
+				Rec.Commit(2, "test", version: LogRecordVersion.LogRecordV0),
+				Rec.Prepare(3, "$$test",
+					metadata: new StreamMetadata(truncateBefore: int.MaxValue, tempStream: true),
+					version: LogRecordVersion.LogRecordV0),
+				Rec.Commit(3, "$$test", version: LogRecordVersion.LogRecordV0))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		return new[] { new ILogRecord[0] };
+	}
+
+	[Test]
+	public async Task scavenging_goes_as_expected() {
+		await CheckRecords();
+	}
+
+	[Test]
+	public async Task the_stream_is_absent_logically() {
+		Assert.AreEqual(ReadEventResult.NoStream, (await ReadIndex.ReadEvent("test", 0, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.NoStream, (await ReadIndex.ReadStreamEventsForward("test", 0, 100, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.NoStream, (await ReadIndex.ReadStreamEventsBackward("test", -1, 100, CancellationToken.None)).Result);
+	}
+
+	[Test]
+	public async Task the_metastream_is_absent_logically() {
+		Assert.AreEqual(ReadEventResult.NotFound, (await ReadIndex.ReadEvent("$$test", 0, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.Success, (await ReadIndex.ReadStreamEventsForward("$$test", 0, 100, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.Success, (await ReadIndex.ReadStreamEventsBackward("$$test", -1, 100, CancellationToken.None)).Result);
+	}
+
+	[Test]
+	public async Task the_stream_is_absent_physically() {
+		var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
+		Assert.IsEmpty((await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000, CancellationToken.None)).Records
+			.Where(x => x.Event.EventStreamId == "test"));
+		Assert.IsEmpty((await ReadIndex.ReadAllEventsBackward(headOfTf, 1000, CancellationToken.None)).Records
+			.Where(x => x.Event.EventStreamId == "test"));
+	}
+
+	[Test]
+	public async Task the_metastream_is_absent_physically() {
+		var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
+		Assert.IsEmpty((await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000, CancellationToken.None)).Records
+			.Where(x => x.Event.EventStreamId == "$$test"));
+		Assert.IsEmpty((await ReadIndex.ReadAllEventsBackward(headOfTf, 1000, CancellationToken.None)).Records
+			.Where(x => x.Event.EventStreamId == "$$test"));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_with_mixed_log_record_version_0_and_version_1.cs b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_with_mixed_log_record_version_0_and_version_1.cs
new file mode 100644
index 00000000000..be77a028cee
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_stream_is_softdeleted_with_mixed_log_record_version_0_and_version_1.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Scavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "No such thing as a V0 prepare in LogV3")]
+public class when_stream_is_softdeleted_with_mixed_log_record_version_0_and_version_1<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	private const string _deletedStream = "test";
+	private const string _deletedMetaStream = "$$test";
+	private const string _keptStream = "other";
+
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator.Chunk(
+				Rec.Prepare(0, _deletedMetaStream, metadata: new StreamMetadata(tempStream: true),
+					version: LogRecordVersion.LogRecordV0),
+				Rec.Commit(0, _deletedMetaStream, version: LogRecordVersion.LogRecordV0),
+				Rec.Prepare(1, _keptStream, version: LogRecordVersion.LogRecordV1),
+				Rec.Commit(1, _keptStream, version: LogRecordVersion.LogRecordV1),
+				Rec.Prepare(2, _keptStream, version: LogRecordVersion.LogRecordV0),
+				Rec.Commit(2, _keptStream, version: LogRecordVersion.LogRecordV0),
+				Rec.Prepare(3, _deletedStream, version: LogRecordVersion.LogRecordV1),
+				Rec.Commit(3, _deletedStream, version: LogRecordVersion.LogRecordV0),
+				Rec.Prepare(4, _deletedStream, version: LogRecordVersion.LogRecordV0),
+				Rec.Commit(4, _deletedStream, version: LogRecordVersion.LogRecordV1),
+				Rec.Prepare(5, _keptStream, version: LogRecordVersion.LogRecordV1),
+				Rec.Commit(5, _keptStream, version: LogRecordVersion.LogRecordV1),
+				Rec.Prepare(6, _deletedMetaStream,
+					metadata: new StreamMetadata(truncateBefore: EventNumber.DeletedStream, tempStream: true),
+					version: LogRecordVersion.LogRecordV1),
+				Rec.Commit(6, _deletedMetaStream, version: LogRecordVersion.LogRecordV0))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		return new[] {
+			new[] {
+				dbResult.Recs[0][2],
+				dbResult.Recs[0][3],
+				dbResult.Recs[0][4],
+				dbResult.Recs[0][5],
+				dbResult.Recs[0][10],
+				dbResult.Recs[0][11]
+			}
+		};
+	}
+
+	[Test]
+	public async Task scavenging_goes_as_expected() {
+		await CheckRecords();
+	}
+
+	[Test]
+	public async Task the_stream_is_absent_logically() {
+		Assert.AreEqual(ReadEventResult.NoStream, (await ReadIndex.ReadEvent(_deletedStream, 0, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.NoStream,
+			(await ReadIndex.ReadStreamEventsForward(_deletedStream, 0, 100, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.NoStream,
+			(await ReadIndex.ReadStreamEventsBackward(_deletedStream, -1, 100, CancellationToken.None)).Result);
+	}
+
+	[Test]
+	public async Task the_metastream_is_absent_logically() {
+		Assert.AreEqual(ReadEventResult.NotFound, (await ReadIndex.ReadEvent(_deletedMetaStream, 0, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.Success,
+			(await ReadIndex.ReadStreamEventsForward(_deletedMetaStream, 0, 100, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.Success,
+			(await ReadIndex.ReadStreamEventsBackward(_deletedMetaStream, -1, 100, CancellationToken.None)).Result);
+	}
+
+	[Test]
+	public async Task the_stream_is_absent_physically() {
+		var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
+		Assert.IsEmpty((await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000, CancellationToken.None)).Records
+			.Where(x => x.Event.EventStreamId == _deletedStream));
+		Assert.IsEmpty((await ReadIndex.ReadAllEventsBackward(headOfTf, 1000, CancellationToken.None)).Records
+			.Where(x => x.Event.EventStreamId == _deletedStream));
+	}
+
+	[Test]
+	public async Task the_metastream_is_absent_physically() {
+		var headOfTf = new TFPos(Db.Config.WriterCheckpoint.Read(), Db.Config.WriterCheckpoint.Read());
+		Assert.IsEmpty((await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 1000, CancellationToken.None)).Records
+			.Where(x => x.Event.EventStreamId == _deletedMetaStream));
+		Assert.IsEmpty((await ReadIndex.ReadAllEventsBackward(headOfTf, 1000, CancellationToken.None)).Records
+			.Where(x => x.Event.EventStreamId == _deletedMetaStream));
+	}
+
+	[Test]
+	public async Task the_kept_stream_is_present() {
+		Assert.AreEqual(ReadEventResult.Success, (await ReadIndex.ReadEvent(_keptStream, 0, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.Success, (await ReadIndex.ReadStreamEventsForward(_keptStream, 0, 100, CancellationToken.None)).Result);
+		Assert.AreEqual(ReadStreamResult.Success, (await ReadIndex.ReadStreamEventsBackward(_keptStream, -1, 100, CancellationToken.None)).Result);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_writing_delete_prepare_without_commit_on_stream_spanning_through_2_chunks_in_db_with_2_chunks.cs b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_writing_delete_prepare_without_commit_on_stream_spanning_through_2_chunks_in_db_with_2_chunks.cs
new file mode 100644
index 00000000000..84650009ae1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Scavenge/when_writing_delete_prepare_without_commit_on_stream_spanning_through_2_chunks_in_db_with_2_chunks.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Scavenge;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_writing_delete_prepare_without_commit_and_scavenging<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _event0;
+	private EventRecord _event1;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_event0 = await WriteSingleEvent("ES", 0, "bla1", token: token);
+		var (esStreamId, _) = await GetOrReserve("ES", token);
+		var (streamDeletedEventTypeId, pos) = await GetOrReserveEventType(SystemEventTypes.StreamDeleted, token);
+		var prepare = LogRecord.DeleteTombstone(_recordFactory, pos, Guid.NewGuid(), Guid.NewGuid(),
+			esStreamId, streamDeletedEventTypeId, 2);
+		Assert.IsTrue(await Writer.Write(prepare, token) is (true, _));
+
+		_event1 = await WriteSingleEvent("ES", 1, "bla1", token: token);
+		Scavenge(completeLast: false, mergeChunks: false);
+	}
+
+	[Test]
+	public async Task read_one_by_one_returns_all_commited_events() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_event0, result.Record);
+
+		result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_event1, result.Record);
+	}
+
+	[Test]
+	public async Task read_stream_events_forward_should_return_all_events() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_event0, result.Records[0]);
+		Assert.AreEqual(_event1, result.Records[1]);
+	}
+
+	[Test]
+	public async Task read_stream_events_backward_should_return_stream_deleted() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_event1, result.Records[0]);
+		Assert.AreEqual(_event0, result.Records[1]);
+	}
+
+	[Test]
+	public async Task read_all_forward_returns_all_events() {
+		var events = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(2, events.Length);
+		Assert.AreEqual(_event0, events[0]);
+		Assert.AreEqual(_event1, events[1]);
+	}
+
+	[Test]
+	public async Task read_all_backward_returns_all_events() {
+		var events = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(2, events.Length);
+		Assert.AreEqual(_event1, events[0]);
+		Assert.AreEqual(_event0, events[1]);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/SimpleDbTestScenario.cs b/src/KurrentDB.Core.Tests/Services/Storage/SimpleDbTestScenario.cs
new file mode 100644
index 00000000000..52108bbca7c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/SimpleDbTestScenario.cs
@@ -0,0 +1,107 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.TransactionLog;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.Util;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage;
+
+[TestFixture]
+public abstract class SimpleDbTestScenario<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	protected readonly int MaxEntriesInMemTable;
+	protected LogFormatAbstractor<TStreamId> _logFormat;
+	protected TableIndex<TStreamId> TableIndex;
+	protected IReadIndex<TStreamId> ReadIndex;
+
+	protected DbResult DbRes;
+
+	protected abstract ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token);
+
+	private readonly long _metastreamMaxCount;
+
+	protected SimpleDbTestScenario(int maxEntriesInMemTable = 20, long metastreamMaxCount = 1) {
+		Ensure.Positive(maxEntriesInMemTable, "maxEntriesInMemTable");
+		MaxEntriesInMemTable = maxEntriesInMemTable;
+		_metastreamMaxCount = metastreamMaxCount;
+	}
+
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var indexDirectory = GetFilePathFor("index");
+		_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
+			IndexDirectory = indexDirectory,
+		});
+
+		var dbConfig = TFChunkHelper.CreateSizedDbConfig(PathName, 0, chunkSize: 1024 * 1024);
+		var dbCreationHelper = await TFChunkDbCreationHelper<TLogFormat, TStreamId>.CreateAsync(dbConfig, _logFormat);
+
+		DbRes = await CreateDb(dbCreationHelper, CancellationToken.None);
+
+		DbRes.Db.Config.WriterCheckpoint.Flush();
+		DbRes.Db.Config.ChaserCheckpoint.Write(DbRes.Db.Config.WriterCheckpoint.Read());
+		DbRes.Db.Config.ChaserCheckpoint.Flush();
+
+		var readers = new ObjectPool<ITransactionFileReader>(
+			"Readers", 2, 2, () => new TFChunkReader(DbRes.Db, DbRes.Db.Config.WriterCheckpoint));
+
+		var lowHasher = _logFormat.LowHasher;
+		var highHasher = _logFormat.HighHasher;
+		var emptyStreamId = _logFormat.EmptyStreamId;
+		TableIndex = new TableIndex<TStreamId>(indexDirectory, lowHasher, highHasher, emptyStreamId,
+			() => new HashListMemTable(PTableVersions.IndexV2, MaxEntriesInMemTable * 2),
+			() => new TFReaderLease(readers),
+			PTableVersions.IndexV2,
+			int.MaxValue,
+			Constants.PTableMaxReaderCountDefault,
+			MaxEntriesInMemTable);
+		_logFormat.StreamNamesProvider.SetTableIndex(TableIndex);
+
+		var readIndex = new ReadIndex<TStreamId>(new NoopPublisher(),
+			readers,
+			TableIndex,
+			_logFormat.StreamNameIndexConfirmer,
+			_logFormat.StreamIds,
+			_logFormat.StreamNamesProvider,
+			_logFormat.EmptyStreamId,
+			_logFormat.StreamIdValidator,
+			_logFormat.StreamIdSizer,
+			_logFormat.StreamExistenceFilter,
+			_logFormat.StreamExistenceFilterReader,
+			_logFormat.EventTypeIndexConfirmer,
+			new NoLRUCache<TStreamId, IndexBackend<TStreamId>.EventNumberCached>(),
+			new NoLRUCache<TStreamId, IndexBackend<TStreamId>.MetadataCached>(),
+			additionalCommitChecks: true,
+			metastreamMaxCount: _metastreamMaxCount,
+			hashCollisionReadLimit: Opts.HashCollisionReadLimitDefault,
+			skipIndexScanOnReads: Opts.SkipIndexScanOnReadsDefault,
+			replicationCheckpoint: DbRes.Db.Config.ReplicationCheckpoint,
+			indexCheckpoint: DbRes.Db.Config.IndexCheckpoint,
+			indexStatusTracker: new IndexStatusTracker.NoOp(),
+			indexTracker: new IndexTracker.NoOp(),
+			cacheTracker: new CacheHitsMissesTracker.NoOp());
+
+		await readIndex.IndexCommitter.Init(DbRes.Db.Config.ChaserCheckpoint.Read(), CancellationToken.None);
+		ReadIndex = readIndex;
+	}
+
+	public override async Task TestFixtureTearDown() {
+		_logFormat?.Dispose();
+		await DbRes.Db.DisposeAsync();
+
+		await base.TestFixtureTearDown();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Transactions/when_having_multievent_sequential_write_request_read_index_should.cs b/src/KurrentDB.Core.Tests/Services/Storage/Transactions/when_having_multievent_sequential_write_request_read_index_should.cs
new file mode 100644
index 00000000000..97d404e6d9f
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Transactions/when_having_multievent_sequential_write_request_read_index_should.cs
@@ -0,0 +1,114 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Transactions;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class when_having_multievent_sequential_write_request_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _p1;
+	private EventRecord _p2;
+	private EventRecord _p3;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_p1 = await WriteTransactionBegin("ES", ExpectedVersion.NoStream, 0, "test1", token: token);
+		_p2 = await WriteTransactionEvent(_p1.CorrelationId, _p1.LogPosition, 1, _p1.EventStreamId, 1, "test2",
+			PrepareFlags.Data, token: token);
+		_p3 = await WriteTransactionEvent(_p1.CorrelationId, _p1.LogPosition, 2, _p1.EventStreamId, 2, "test3",
+			PrepareFlags.TransactionEnd | PrepareFlags.Data, token: token);
+
+		await WriteCommit(_p1.CorrelationId, _p1.LogPosition, _p1.EventStreamId, _p1.EventNumber, token);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_stream() {
+		Assert.AreEqual(2, await ReadIndex.GetStreamLastEventNumber("ES", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_first_record_for_stream() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p1, result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_second_record_for_stream() {
+		var result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p2, result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_third_record_for_stream() {
+		var result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p3, result.Record);
+	}
+
+	[Test]
+	public async Task not_find_record_with_nonexistent_version() {
+		var result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_p1, result.Records[0]);
+		Assert.AreEqual(_p2, result.Records[1]);
+		Assert.AreEqual(_p3, result.Records[2]);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_stream_with_specific_event_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", 2, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_p3, result.Records[0]);
+		Assert.AreEqual(_p2, result.Records[1]);
+		Assert.AreEqual(_p1, result.Records[2]);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_stream_with_from_end_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_p3, result.Records[0]);
+		Assert.AreEqual(_p2, result.Records[1]);
+		Assert.AreEqual(_p1, result.Records[2]);
+	}
+
+	[Test]
+	public async Task read_all_events_forward_returns_all_events_in_correct_order() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10, CancellationToken.None))
+			.Records;
+
+		Assert.AreEqual(3, records.Count);
+		Assert.AreEqual(_p1, records[0].Event);
+		Assert.AreEqual(_p2, records[1].Event);
+		Assert.AreEqual(_p3, records[2].Event);
+	}
+
+	[Test]
+	public async Task read_all_events_backward_returns_all_events_in_correct_order() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None))
+			.Records;
+
+		Assert.AreEqual(3, records.Count);
+		Assert.AreEqual(_p1, records[2].Event);
+		Assert.AreEqual(_p2, records[1].Event);
+		Assert.AreEqual(_p3, records[0].Event);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_and_some_uncommited_prepares_in_the_end_read_index_should.cs b/src/KurrentDB.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_and_some_uncommited_prepares_in_the_end_read_index_should.cs
new file mode 100644
index 00000000000..cbb55f5b510
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_and_some_uncommited_prepares_in_the_end_read_index_should.cs
@@ -0,0 +1,306 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Transactions;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class
+	when_having_two_intermingled_transactions_and_some_uncommited_prepares_in_the_end_read_index_should<TLogFormat, TStreamId> :
+		ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _p1;
+	private EventRecord _p2;
+	private EventRecord _p3;
+	private EventRecord _p4;
+	private EventRecord _p5;
+
+	private long _pos6, _pos7, _pos8;
+
+	private long _t1CommitPos;
+	private long _t2CommitPos;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		const string streamId1 = "ES";
+		const string streamId2 = "ABC";
+		var t1 = await WriteTransactionBegin(streamId1, ExpectedVersion.NoStream, token);
+		var t2 = await WriteTransactionBegin(streamId2, ExpectedVersion.NoStream, token);
+
+		_p1 = await WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 0, streamId1, 0, "es1",
+			PrepareFlags.Data, token: token);
+		_p2 = await WriteTransactionEvent(t2.CorrelationId, t2.LogPosition, 0, streamId2, 0, "abc1",
+			PrepareFlags.Data, token: token);
+		_p3 = await WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 1, streamId1, 1, "es1",
+			PrepareFlags.Data, token: token);
+		_p4 = await WriteTransactionEvent(t2.CorrelationId, t2.LogPosition, 1, streamId2, 1, "abc1",
+			PrepareFlags.Data, token: token);
+		_p5 = await WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 2, streamId1, 2, "es1",
+			PrepareFlags.Data, token: token);
+
+		await WriteTransactionEnd(t2.CorrelationId, t2.TransactionPosition, streamId2, token);
+		await WriteTransactionEnd(t1.CorrelationId, t1.TransactionPosition, streamId1, token);
+
+		_t2CommitPos = await WriteCommit(t2.CorrelationId, t2.TransactionPosition, streamId2, _p2.EventNumber, token);
+		_t1CommitPos = await WriteCommit(t1.CorrelationId, t1.TransactionPosition, streamId1, _p1.EventNumber, token);
+
+		var (t1StreamId, _) = await GetOrReserve("t1", token);
+		(var eventTypeId, _pos6) = await GetOrReserveEventType("et", token);
+		var r6 = LogRecord.Prepare(_recordFactory, _pos6, Guid.NewGuid(), Guid.NewGuid(), _pos6, 0, t1StreamId, -1,
+			PrepareFlags.SingleWrite, eventTypeId, LogRecord.NoData, LogRecord.NoData);
+		(_, _pos7) = await Writer.Write(r6, token);
+		var r7 = LogRecord.Prepare(_recordFactory, _pos7, Guid.NewGuid(), Guid.NewGuid(), _pos7, 0, t1StreamId, -1,
+			PrepareFlags.SingleWrite, eventTypeId, LogRecord.NoData, LogRecord.NoData);
+		(_, _pos8) = await Writer.Write(r7, token);
+		var r8 = LogRecord.Prepare(_recordFactory, _pos8, Guid.NewGuid(), Guid.NewGuid(), _pos8, 0, t1StreamId, -1,
+			PrepareFlags.SingleWrite, eventTypeId, LogRecord.NoData, LogRecord.NoData);
+		await Writer.Write(r8, token);
+	}
+
+	[Test]
+	public async Task read_all_events_forward_returns_all_events_in_correct_order() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10, CancellationToken.None))
+			.Records;
+
+		Assert.AreEqual(5, records.Count);
+		Assert.AreEqual(_p2, records[0].Event);
+		Assert.AreEqual(_p4, records[1].Event);
+		Assert.AreEqual(_p1, records[2].Event);
+		Assert.AreEqual(_p3, records[3].Event);
+		Assert.AreEqual(_p5, records[4].Event);
+	}
+
+	[Test]
+	public async Task read_all_events_backward_returns_all_events_in_correct_order() {
+		var records = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 10, CancellationToken.None)).Records;
+
+		Assert.AreEqual(5, records.Count);
+		Assert.AreEqual(_p5, records[0].Event);
+		Assert.AreEqual(_p3, records[1].Event);
+		Assert.AreEqual(_p1, records[2].Event);
+		Assert.AreEqual(_p4, records[3].Event);
+		Assert.AreEqual(_p2, records[4].Event);
+	}
+
+	[Test]
+	public async Task
+		read_all_events_forward_returns_nothing_when_prepare_position_is_greater_than_last_prepare_in_commit() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(_t1CommitPos, _t1CommitPos), 10, CancellationToken.None))
+			.Records;
+		Assert.AreEqual(0, records.Count);
+	}
+
+	[Test]
+	public async Task
+		read_all_events_backwards_returns_nothing_when_prepare_position_is_smaller_than_first_prepare_in_commit() {
+		var records =
+			(await ReadIndex.ReadAllEventsBackward(new TFPos(_t2CommitPos, 0), 10, CancellationToken.None)).Records;
+		Assert.AreEqual(0, records.Count);
+	}
+
+	[Test]
+	public async Task read_all_events_forward_returns_correct_events_starting_in_the_middle_of_tf() {
+		var res1 = await ReadIndex.ReadAllEventsForward(new TFPos(_t2CommitPos, _p4.LogPosition), 10, CancellationToken.None);
+
+		Assert.AreEqual(4, res1.Records.Count);
+		Assert.AreEqual(_p4, res1.Records[0].Event);
+		Assert.AreEqual(_p1, res1.Records[1].Event);
+		Assert.AreEqual(_p3, res1.Records[2].Event);
+		Assert.AreEqual(_p5, res1.Records[3].Event);
+
+		var res2 = await ReadIndex.ReadAllEventsBackward(res1.PrevPos, 10, CancellationToken.None);
+		Assert.AreEqual(1, res2.Records.Count);
+		Assert.AreEqual(_p2, res2.Records[0].Event);
+	}
+
+	[Test]
+	public async Task read_all_events_backward_returns_correct_events_starting_in_the_middle_of_tf() {
+		var pos = new TFPos(_pos6, _p4.LogPosition); // p3 post-pos
+		var res1 = await ReadIndex.ReadAllEventsBackward(pos, 10, CancellationToken.None);
+
+		Assert.AreEqual(4, res1.Records.Count);
+		Assert.AreEqual(_p3, res1.Records[0].Event);
+		Assert.AreEqual(_p1, res1.Records[1].Event);
+		Assert.AreEqual(_p4, res1.Records[2].Event);
+		Assert.AreEqual(_p2, res1.Records[3].Event);
+
+		var res2 = await ReadIndex.ReadAllEventsForward(res1.PrevPos, 10, CancellationToken.None);
+		Assert.AreEqual(1, res2.Records.Count);
+		Assert.AreEqual(_p5, res2.Records[0].Event);
+	}
+
+	[Test]
+	public async Task all_records_can_be_read_sequentially_page_by_page_in_forward_pass() {
+		var recs = new[] { _p2, _p4, _p1, _p3, _p5 }; // in committed order
+
+		int count = 0;
+		var pos = new TFPos(0, 0);
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsForward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task all_records_can_be_read_sequentially_page_by_page_in_backward_pass() {
+		var recs = new[] { _p5, _p3, _p1, _p4, _p2 }; // in reverse committed order
+
+		int count = 0;
+		var pos = GetBackwardReadPos();
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsBackward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task position_returned_for_prev_page_when_traversing_forward_allow_to_traverse_backward_correctly() {
+		var recs = new[] { _p2, _p4, _p1, _p3, _p5 }; // in committed order
+
+		int count = 0;
+		var pos = new TFPos(0, 0);
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsForward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+
+			var localPos = result.PrevPos;
+			int localCount = 0;
+			IndexReadAllResult localResult;
+			while ((localResult = await ReadIndex.ReadAllEventsBackward(localPos, 1, CancellationToken.None)).Records.Count != 0) {
+				Assert.AreEqual(1, localResult.Records.Count);
+				Assert.AreEqual(recs[count - 1 - localCount], localResult.Records[0].Event);
+				localPos = localResult.NextPos;
+				localCount += 1;
+			}
+
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task position_returned_for_prev_page_when_traversing_backward_allow_to_traverse_forward_correctly() {
+		var recs = new[] { _p5, _p3, _p1, _p4, _p2 }; // in reverse committed order
+
+		int count = 0;
+		var pos = GetBackwardReadPos();
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsBackward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+
+			var localPos = result.PrevPos;
+			int localCount = 0;
+			IndexReadAllResult localResult;
+			while ((localResult = await ReadIndex.ReadAllEventsForward(localPos, 1, CancellationToken.None)).Records.Count != 0) {
+				Assert.AreEqual(1, localResult.Records.Count);
+				Assert.AreEqual(recs[count - 1 - localCount], localResult.Records[0].Event);
+				localPos = localResult.NextPos;
+				localCount += 1;
+			}
+
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task
+		reading_all_forward_at_position_with_no_commits_after_returns_prev_pos_that_allows_to_traverse_back() {
+		var res1 = await ReadIndex.ReadAllEventsForward(new TFPos(_pos6, 0), 100, CancellationToken.None);
+		Assert.AreEqual(0, res1.Records.Count);
+
+		var recs = new[] { _p5, _p3, _p1, _p4, _p2 }; // in reverse committed order
+		int count = 0;
+		IndexReadAllResult result;
+		TFPos pos = res1.PrevPos;
+		while ((result = await ReadIndex.ReadAllEventsBackward(pos, 1, CancellationToken.None)).Records.Count !=
+			   0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task reading_all_forward_at_the_very_end_returns_prev_pos_that_allows_to_traverse_back() {
+		var res1 = await ReadIndex.ReadAllEventsForward(new TFPos(Db.Config.WriterCheckpoint.Read(), 0), 100, CancellationToken.None);
+		Assert.AreEqual(0, res1.Records.Count);
+
+		var recs = new[] { _p5, _p3, _p1, _p4, _p2 }; // in reverse committed order
+		int count = 0;
+		IndexReadAllResult result;
+		TFPos pos = res1.PrevPos;
+		while ((result = await ReadIndex.ReadAllEventsBackward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task
+		reading_all_backward_at_position_with_no_commits_before_returns_prev_pos_that_allows_to_traverse_forward() {
+		var res1 = await ReadIndex.ReadAllEventsBackward(new TFPos(_t2CommitPos, int.MaxValue), 100, CancellationToken.None);
+		Assert.AreEqual(0, res1.Records.Count);
+
+		var recs = new[] { _p2, _p4, _p1, _p3, _p5 };
+		int count = 0;
+		IndexReadAllResult result;
+		TFPos pos = res1.PrevPos;
+		while ((result = await ReadIndex.ReadAllEventsForward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task reading_all_backward_at_the_very_beginning_returns_prev_pos_that_allows_to_traverse_forward() {
+		var res1 = await ReadIndex.ReadAllEventsBackward(new TFPos(0, int.MaxValue), 100, CancellationToken.None);
+		Assert.AreEqual(0, res1.Records.Count);
+
+		var recs = new[] { _p2, _p4, _p1, _p3, _p5 };
+		int count = 0;
+		IndexReadAllResult result;
+		TFPos pos = res1.PrevPos;
+		while ((result = await ReadIndex.ReadAllEventsForward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_and_some_uncommited_prepares_spanning_few_chunks_read_index_should.cs b/src/KurrentDB.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_and_some_uncommited_prepares_spanning_few_chunks_read_index_should.cs
new file mode 100644
index 00000000000..7bb37f25525
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_and_some_uncommited_prepares_spanning_few_chunks_read_index_should.cs
@@ -0,0 +1,308 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Transactions;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class
+	when_having_two_intermingled_transactions_and_some_uncommited_prepares_spanning_few_chunks_read_index_should<TLogFormat, TStreamId> :
+		ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _p1;
+	private EventRecord _p2;
+	private EventRecord _p3;
+	private EventRecord _p4;
+	private EventRecord _p5;
+
+	private long _pos6, _pos7, _pos8;
+
+	private long _t1CommitPos;
+	private long _t2CommitPos;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		const string streamId1 = "ES";
+		const string streamId2 = "ABC";
+
+		var t1 = await WriteTransactionBegin(streamId1, ExpectedVersion.NoStream, token);
+		var t2 = await WriteTransactionBegin(streamId2, ExpectedVersion.NoStream, token);
+
+		_p1 = await WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 0, streamId1, 0,
+			"es1" + new string('.', 3000), PrepareFlags.Data, token: token);
+		_p2 = await WriteTransactionEvent(t2.CorrelationId, t2.LogPosition, 0, streamId2, 0,
+			"abc1" + new string('.', 3000), PrepareFlags.Data, token: token);
+		_p3 = await WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 1, streamId1, 1,
+			"es1" + new string('.', 3000), PrepareFlags.Data, token: token);
+		_p4 = await WriteTransactionEvent(t2.CorrelationId, t2.LogPosition, 1, streamId2, 1,
+			"abc1" + new string('.', 3000), PrepareFlags.Data, retryOnFail: true, token: token);
+		_p5 = await WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 2, streamId1, 2,
+			"es1" + new string('.', 3000), PrepareFlags.Data, token: token);
+
+		await WriteTransactionEnd(t2.CorrelationId, t2.TransactionPosition, streamId2, token);
+		await WriteTransactionEnd(t1.CorrelationId, t1.TransactionPosition, streamId1, token);
+
+		_t2CommitPos = await WriteCommit(t2.CorrelationId, t2.TransactionPosition, streamId2, _p2.EventNumber, token: token);
+		_t1CommitPos = await WriteCommit(t1.CorrelationId, t1.TransactionPosition, streamId1, _p1.EventNumber, token: token);
+
+		var (t1StreamId, _) = await GetOrReserve("t1", token);
+		(var eventTypeId, _pos6) = await GetOrReserveEventType("et", token);
+		var r6 = LogRecord.Prepare(_recordFactory, _pos6, Guid.NewGuid(), Guid.NewGuid(), _pos6, 0, t1StreamId, -1,
+			PrepareFlags.SingleWrite, eventTypeId, LogRecord.NoData, LogRecord.NoData);
+		(_, _pos7) = await Writer.Write(r6, token);
+		var r7 = LogRecord.Prepare(_recordFactory, _pos7, Guid.NewGuid(), Guid.NewGuid(), _pos7, 0, t1StreamId, -1,
+			PrepareFlags.SingleWrite, eventTypeId, LogRecord.NoData, LogRecord.NoData);
+		(_, _pos8) = await Writer.Write(r7, token);
+		var r8 = LogRecord.Prepare(_recordFactory, _pos8, Guid.NewGuid(), Guid.NewGuid(), _pos8, 0, t1StreamId, -1,
+			PrepareFlags.SingleWrite, eventTypeId, LogRecord.NoData, LogRecord.NoData);
+
+		await Writer.Write(r8, token);
+	}
+
+	[Test]
+	public async Task read_all_events_forward_returns_all_events_in_correct_order() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10, CancellationToken.None))
+			.Records;
+
+		Assert.AreEqual(5, records.Count);
+		Assert.AreEqual(_p2, records[0].Event);
+		Assert.AreEqual(_p4, records[1].Event);
+		Assert.AreEqual(_p1, records[2].Event);
+		Assert.AreEqual(_p3, records[3].Event);
+		Assert.AreEqual(_p5, records[4].Event);
+	}
+
+	[Test]
+	public async Task read_all_events_backward_returns_all_events_in_correct_order() {
+		var pos = GetBackwardReadPos();
+		var records = (await ReadIndex.ReadAllEventsBackward(pos, 10, CancellationToken.None)).Records;
+
+		Assert.AreEqual(5, records.Count);
+		Assert.AreEqual(_p5, records[0].Event);
+		Assert.AreEqual(_p3, records[1].Event);
+		Assert.AreEqual(_p1, records[2].Event);
+		Assert.AreEqual(_p4, records[3].Event);
+		Assert.AreEqual(_p2, records[4].Event);
+	}
+
+	[Test]
+	public async Task
+		read_all_events_forward_returns_nothing_when_prepare_position_is_greater_than_last_prepare_in_commit() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(_t1CommitPos, _t1CommitPos), 10, CancellationToken.None))
+			.Records;
+		Assert.AreEqual(0, records.Count);
+	}
+
+	[Test]
+	public async Task
+		read_all_events_backwards_returns_nothing_when_prepare_position_is_smaller_than_first_prepare_in_commit() {
+		var records =
+			(await ReadIndex.ReadAllEventsBackward(new TFPos(_t2CommitPos, 0), 10, CancellationToken.None)).Records;
+		Assert.AreEqual(0, records.Count);
+	}
+
+	[Test]
+	public async Task read_all_events_forward_returns_correct_events_starting_in_the_middle_of_tf() {
+		var res1 = await ReadIndex.ReadAllEventsForward(new TFPos(_t2CommitPos, _p4.LogPosition), 10, CancellationToken.None);
+
+		Assert.AreEqual(4, res1.Records.Count);
+		Assert.AreEqual(_p4, res1.Records[0].Event);
+		Assert.AreEqual(_p1, res1.Records[1].Event);
+		Assert.AreEqual(_p3, res1.Records[2].Event);
+		Assert.AreEqual(_p5, res1.Records[3].Event);
+
+		var res2 = await ReadIndex.ReadAllEventsBackward(res1.PrevPos, 10, CancellationToken.None);
+		Assert.AreEqual(1, res2.Records.Count);
+		Assert.AreEqual(_p2, res2.Records[0].Event);
+	}
+
+	[Test]
+	public async Task read_all_events_backward_returns_correct_events_starting_in_the_middle_of_tf() {
+		var pos = new TFPos(_pos6, _p4.LogPosition); // p3 post-pos
+		var res1 = await ReadIndex.ReadAllEventsBackward(pos, 10, CancellationToken.None);
+
+		Assert.AreEqual(4, res1.Records.Count);
+		Assert.AreEqual(_p3, res1.Records[0].Event);
+		Assert.AreEqual(_p1, res1.Records[1].Event);
+		Assert.AreEqual(_p4, res1.Records[2].Event);
+		Assert.AreEqual(_p2, res1.Records[3].Event);
+
+		var res2 = await ReadIndex.ReadAllEventsForward(res1.PrevPos, 10, CancellationToken.None);
+		Assert.AreEqual(1, res2.Records.Count);
+		Assert.AreEqual(_p5, res2.Records[0].Event);
+	}
+
+	[Test]
+	public async Task all_records_can_be_read_sequentially_page_by_page_in_forward_pass() {
+		var recs = new[] { _p2, _p4, _p1, _p3, _p5 }; // in committed order
+
+		int count = 0;
+		var pos = new TFPos(0, 0);
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsForward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task all_records_can_be_read_sequentially_page_by_page_in_backward_pass() {
+		var recs = new[] { _p5, _p3, _p1, _p4, _p2 }; // in reverse committed order
+
+		int count = 0;
+		var pos = GetBackwardReadPos();
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsBackward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task position_returned_for_prev_page_when_traversing_forward_allow_to_traverse_backward_correctly() {
+		var recs = new[] { _p2, _p4, _p1, _p3, _p5 }; // in committed order
+
+		int count = 0;
+		var pos = new TFPos(0, 0);
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsForward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+
+			var localPos = result.PrevPos;
+			int localCount = 0;
+			IndexReadAllResult localResult;
+			while ((localResult = await ReadIndex.ReadAllEventsBackward(localPos, 1, CancellationToken.None)).Records.Count != 0) {
+				Assert.AreEqual(1, localResult.Records.Count);
+				Assert.AreEqual(recs[count - 1 - localCount], localResult.Records[0].Event);
+				localPos = localResult.NextPos;
+				localCount += 1;
+			}
+
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task position_returned_for_prev_page_when_traversing_backward_allow_to_traverse_forward_correctly() {
+		var recs = new[] { _p5, _p3, _p1, _p4, _p2 }; // in reverse committed order
+
+		int count = 0;
+		var pos = GetBackwardReadPos();
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsBackward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+
+			var localPos = result.PrevPos;
+			int localCount = 0;
+			IndexReadAllResult localResult;
+			while ((localResult = await ReadIndex.ReadAllEventsForward(localPos, 1, CancellationToken.None)).Records.Count != 0) {
+				Assert.AreEqual(1, localResult.Records.Count);
+				Assert.AreEqual(recs[count - 1 - localCount], localResult.Records[0].Event);
+				localPos = localResult.NextPos;
+				localCount += 1;
+			}
+
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task
+		reading_all_forward_at_position_with_no_commits_after_returns_prev_pos_that_allows_to_traverse_back() {
+		var res1 = await ReadIndex.ReadAllEventsForward(new TFPos(_pos6, 0), 100, CancellationToken.None);
+		Assert.AreEqual(0, res1.Records.Count);
+
+		var recs = new[] { _p5, _p3, _p1, _p4, _p2 }; // in reverse committed order
+		int count = 0;
+		IndexReadAllResult result;
+		TFPos pos = res1.PrevPos;
+		while ((result = await ReadIndex.ReadAllEventsBackward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task reading_all_forward_at_the_very_end_returns_prev_pos_that_allows_to_traverse_back() {
+		var res1 = await ReadIndex.ReadAllEventsForward(new TFPos(Db.Config.WriterCheckpoint.Read(), 0), 100, CancellationToken.None);
+		Assert.AreEqual(0, res1.Records.Count);
+
+		var recs = new[] { _p5, _p3, _p1, _p4, _p2 }; // in reverse committed order
+		int count = 0;
+		IndexReadAllResult result;
+		TFPos pos = res1.PrevPos;
+		while ((result = await ReadIndex.ReadAllEventsBackward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task
+		reading_all_backward_at_position_with_no_commits_before_returns_prev_pos_that_allows_to_traverse_forward() {
+		var res1 = await ReadIndex.ReadAllEventsBackward(new TFPos(_t2CommitPos, int.MaxValue), 100, CancellationToken.None);
+		Assert.AreEqual(0, res1.Records.Count);
+
+		var recs = new[] { _p2, _p4, _p1, _p3, _p5 };
+		int count = 0;
+		IndexReadAllResult result;
+		TFPos pos = res1.PrevPos;
+		while ((result = await ReadIndex.ReadAllEventsForward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task reading_all_backward_at_the_very_beginning_returns_prev_pos_that_allows_to_traverse_forward() {
+		var res1 = await ReadIndex.ReadAllEventsBackward(new TFPos(0, int.MaxValue), 100, CancellationToken.None);
+		Assert.AreEqual(0, res1.Records.Count);
+
+		var recs = new[] { _p2, _p4, _p1, _p3, _p5 };
+		int count = 0;
+		IndexReadAllResult result;
+		TFPos pos = res1.PrevPos;
+		while ((result = await ReadIndex.ReadAllEventsForward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_read_index_should.cs b/src/KurrentDB.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_read_index_should.cs
new file mode 100644
index 00000000000..46c68f9079c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_read_index_should.cs
@@ -0,0 +1,329 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Transactions;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class when_having_two_intermingled_transactions_read_index_should<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _p1;
+	private EventRecord _p2;
+	private EventRecord _p3;
+	private EventRecord _p4;
+	private EventRecord _p5;
+
+	private long _t1CommitPos;
+	private long _t2CommitPos;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		const string streamId1 = "ES";
+		const string streamId2 = "ABC";
+
+		var t1 = await WriteTransactionBegin(streamId1, ExpectedVersion.NoStream, token);
+		var t2 = await WriteTransactionBegin(streamId2, ExpectedVersion.NoStream, token);
+
+		_p1 = await WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 0, streamId1, 0, "es1",
+			PrepareFlags.Data, token: token);
+		_p2 = await WriteTransactionEvent(t2.CorrelationId, t2.LogPosition, 0, streamId2, 0, "abc1",
+			PrepareFlags.Data, token: token);
+		_p3 = await WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 1, streamId1, 1, "es1",
+			PrepareFlags.Data, token: token);
+		_p4 = await WriteTransactionEvent(t2.CorrelationId, t2.LogPosition, 1, streamId2, 1, "abc1",
+			PrepareFlags.Data, token: token);
+		_p5 = await WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 2, streamId1, 2, "es1",
+			PrepareFlags.Data, token: token);
+
+		await WriteTransactionEnd(t2.CorrelationId, t2.TransactionPosition, streamId2, token: token);
+		await WriteTransactionEnd(t1.CorrelationId, t1.TransactionPosition, streamId1, token: token);
+
+		_t2CommitPos = await WriteCommit(t2.CorrelationId, t2.TransactionPosition, streamId2, _p2.EventNumber, token);
+		_t1CommitPos = await WriteCommit(t1.CorrelationId, t1.TransactionPosition, streamId1, _p1.EventNumber, token);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_larger_stream() {
+		Assert.AreEqual(2, await ReadIndex.GetStreamLastEventNumber("ES", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_first_record_for_larger_stream() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p1, result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_second_record_for_larger_stream() {
+		var result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p3, result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_third_record_for_larger_stream() {
+		var result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p5, result.Record);
+	}
+
+	[Test]
+	public async Task not_find_record_with_nonexistent_version_for_larger_stream() {
+		var result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_larger_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_p1, result.Records[0]);
+		Assert.AreEqual(_p3, result.Records[1]);
+		Assert.AreEqual(_p5, result.Records[2]);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_larger_stream_with_specific_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", 2, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_p5, result.Records[0]);
+		Assert.AreEqual(_p3, result.Records[1]);
+		Assert.AreEqual(_p1, result.Records[2]);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_larger_stream_with_from_end_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_p5, result.Records[0]);
+		Assert.AreEqual(_p3, result.Records[1]);
+		Assert.AreEqual(_p1, result.Records[2]);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_smaller_stream() {
+		Assert.AreEqual(1, await ReadIndex.GetStreamLastEventNumber("ABC", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_first_record_for_smaller_stream() {
+		var result = await ReadIndex.ReadEvent("ABC", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p2, result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_second_record_for_smaller_stream() {
+		var result = await ReadIndex.ReadEvent("ABC", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p4, result.Record);
+	}
+
+	[Test]
+	public async Task not_find_record_with_nonexistent_version_for_smaller_stream() {
+		var result = await ReadIndex.ReadEvent("ABC", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_smaller_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("ABC", 0, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_p2, result.Records[0]);
+		Assert.AreEqual(_p4, result.Records[1]);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_smaller_stream_with_specific_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ABC", 1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_p4, result.Records[0]);
+		Assert.AreEqual(_p2, result.Records[1]);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_smaller_stream_with_from_end_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ABC", -1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_p4, result.Records[0]);
+		Assert.AreEqual(_p2, result.Records[1]);
+	}
+
+	[Test]
+	public async Task read_all_events_forward_returns_all_events_in_correct_order() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10, CancellationToken.None))
+			.Records;
+
+		Assert.AreEqual(5, records.Count);
+		Assert.AreEqual(_p2, records[0].Event);
+		Assert.AreEqual(_p4, records[1].Event);
+		Assert.AreEqual(_p1, records[2].Event);
+		Assert.AreEqual(_p3, records[3].Event);
+		Assert.AreEqual(_p5, records[4].Event);
+	}
+
+	[Test]
+	public async Task read_all_events_backward_returns_all_events_in_correct_order() {
+		var pos = GetBackwardReadPos();
+		var records = (await ReadIndex.ReadAllEventsBackward(pos, 10, CancellationToken.None)).Records;
+
+		Assert.AreEqual(5, records.Count);
+		Assert.AreEqual(_p5, records[0].Event);
+		Assert.AreEqual(_p3, records[1].Event);
+		Assert.AreEqual(_p1, records[2].Event);
+		Assert.AreEqual(_p4, records[3].Event);
+		Assert.AreEqual(_p2, records[4].Event);
+	}
+
+	[Test]
+	public async Task
+		read_all_events_forward_returns_nothing_when_prepare_position_is_greater_than_last_prepare_in_commit() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(_t1CommitPos, _t1CommitPos), 10, CancellationToken.None))
+			.Records;
+		Assert.AreEqual(0, records.Count);
+	}
+
+	[Test]
+	public async Task
+		read_all_events_backwards_returns_nothing_when_prepare_position_is_smaller_than_first_prepare_in_commit() {
+		var records =
+			(await ReadIndex.ReadAllEventsBackward(new TFPos(_t2CommitPos, 0), 10, CancellationToken.None)).Records;
+		Assert.AreEqual(0, records.Count);
+	}
+
+	[Test]
+	public async Task read_all_events_forward_returns_correct_events_starting_in_the_middle_of_tf() {
+		var res1 = await ReadIndex.ReadAllEventsForward(new TFPos(_t2CommitPos, _p4.LogPosition), 10, CancellationToken.None);
+
+		Assert.AreEqual(4, res1.Records.Count);
+		Assert.AreEqual(_p4, res1.Records[0].Event);
+		Assert.AreEqual(_p1, res1.Records[1].Event);
+		Assert.AreEqual(_p3, res1.Records[2].Event);
+		Assert.AreEqual(_p5, res1.Records[3].Event);
+
+		var res2 = await ReadIndex.ReadAllEventsBackward(res1.PrevPos, 10, CancellationToken.None);
+		Assert.AreEqual(1, res2.Records.Count);
+		Assert.AreEqual(_p2, res2.Records[0].Event);
+	}
+
+	[Test]
+	public async Task read_all_events_backward_returns_correct_events_starting_in_the_middle_of_tf() {
+		var pos = new TFPos(Db.Config.WriterCheckpoint.Read(), _p4.LogPosition); // p3 post-pos
+		var res1 = await ReadIndex.ReadAllEventsBackward(pos, 10, CancellationToken.None);
+
+		Assert.AreEqual(4, res1.Records.Count);
+		Assert.AreEqual(_p3, res1.Records[0].Event);
+		Assert.AreEqual(_p1, res1.Records[1].Event);
+		Assert.AreEqual(_p4, res1.Records[2].Event);
+		Assert.AreEqual(_p2, res1.Records[3].Event);
+
+		var res2 = await ReadIndex.ReadAllEventsForward(res1.PrevPos, 10, CancellationToken.None);
+		Assert.AreEqual(1, res2.Records.Count);
+		Assert.AreEqual(_p5, res2.Records[0].Event);
+	}
+
+	[Test]
+	public async Task all_records_can_be_read_sequentially_page_by_page_in_forward_pass() {
+		var recs = new[] { _p2, _p4, _p1, _p3, _p5 }; // in committed order
+
+		int count = 0;
+		var pos = new TFPos(0, 0);
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsForward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task all_records_can_be_read_sequentially_page_by_page_in_backward_pass() {
+		var recs = new[] { _p5, _p3, _p1, _p4, _p2 }; // in reverse committed order
+
+		int count = 0;
+		var pos = GetBackwardReadPos();
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsBackward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task position_returned_for_prev_page_when_traversing_forward_allow_to_traverse_backward_correctly() {
+		var recs = new[] { _p2, _p4, _p1, _p3, _p5 }; // in committed order
+
+		int count = 0;
+		var pos = new TFPos(0, 0);
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsForward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+
+			var localPos = result.PrevPos;
+			int localCount = 0;
+			IndexReadAllResult localResult;
+			while ((localResult = await ReadIndex.ReadAllEventsBackward(localPos, 1, CancellationToken.None)).Records.Count != 0) {
+				Assert.AreEqual(1, localResult.Records.Count);
+				Assert.AreEqual(recs[count - 1 - localCount], localResult.Records[0].Event);
+				localPos = localResult.NextPos;
+				localCount += 1;
+			}
+
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task position_returned_for_prev_page_when_traversing_backward_allow_to_traverse_forward_correctly() {
+		var recs = new[] { _p5, _p3, _p1, _p4, _p2 }; // in reverse committed order
+
+		int count = 0;
+		var pos = GetBackwardReadPos();
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsBackward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+
+			var localPos = result.PrevPos;
+			int localCount = 0;
+			IndexReadAllResult localResult;
+			while ((localResult = await ReadIndex.ReadAllEventsForward(localPos, 1, CancellationToken.None)).Records.Count != 0) {
+				Assert.AreEqual(1, localResult.Records.Count);
+				Assert.AreEqual(recs[count - 1 - localCount], localResult.Records[0].Event);
+				localPos = localResult.NextPos;
+				localCount += 1;
+			}
+
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_spanning_few_chunks_read_index_should.cs b/src/KurrentDB.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_spanning_few_chunks_read_index_should.cs
new file mode 100644
index 00000000000..cd78b500b30
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Transactions/when_having_two_intermingled_transactions_spanning_few_chunks_read_index_should.cs
@@ -0,0 +1,330 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Services.Storage.ReaderIndex.ReadStreamResult;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Transactions;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class
+	when_having_two_intermingled_transactions_spanning_few_chunks_read_index_should<TLogFormat, TStreamId>
+	: ReadIndexTestScenario<TLogFormat, TStreamId> {
+	private EventRecord _p1;
+	private EventRecord _p2;
+	private EventRecord _p3;
+	private EventRecord _p4;
+	private EventRecord _p5;
+
+	private long _t1CommitPos;
+	private long _t2CommitPos;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		const string streamId1 = "ES";
+		const string streamId2 = "ABC";
+
+		var t1 = await WriteTransactionBegin(streamId1, ExpectedVersion.NoStream, token);
+		var t2 = await WriteTransactionBegin(streamId2, ExpectedVersion.NoStream, token);
+
+		_p1 = await WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 0, streamId1, 0,
+			"es1" + new string('.', 3000), PrepareFlags.Data, token: token);
+		_p2 = await WriteTransactionEvent(t2.CorrelationId, t2.LogPosition, 0, streamId2, 0,
+			"abc1" + new string('.', 3000), PrepareFlags.Data, token: token);
+		_p3 = await WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 1, streamId1, 1,
+			"es1" + new string('.', 3000), PrepareFlags.Data, token: token);
+		_p4 = await WriteTransactionEvent(t2.CorrelationId, t2.LogPosition, 1, streamId2, 1,
+			"abc1" + new string('.', 3000), PrepareFlags.Data, retryOnFail: true, token: token);
+		_p5 = await WriteTransactionEvent(t1.CorrelationId, t1.LogPosition, 2, streamId1, 2,
+			"es1" + new string('.', 3000), PrepareFlags.Data, token: token);
+
+		await WriteTransactionEnd(t2.CorrelationId, t2.TransactionPosition, streamId2, token: token);
+		await WriteTransactionEnd(t1.CorrelationId, t1.TransactionPosition, streamId1, token: token);
+
+		_t2CommitPos = await WriteCommit(t2.CorrelationId, t2.TransactionPosition, streamId2, _p2.EventNumber, token);
+		_t1CommitPos = await WriteCommit(t1.CorrelationId, t1.TransactionPosition, streamId1, _p1.EventNumber, token);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_larger_stream() {
+		Assert.AreEqual(2, await ReadIndex.GetStreamLastEventNumber("ES", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_first_record_for_larger_stream() {
+		var result = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p1, result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_second_record_for_larger_stream() {
+		var result = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p3, result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_third_record_for_larger_stream() {
+		var result = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p5, result.Record);
+	}
+
+	[Test]
+	public async Task not_find_record_with_nonexistent_version_for_larger_stream() {
+		var result = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_larger_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("ES", 0, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_p1, result.Records[0]);
+		Assert.AreEqual(_p3, result.Records[1]);
+		Assert.AreEqual(_p5, result.Records[2]);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_larger_stream_with_specific_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", 2, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_p5, result.Records[0]);
+		Assert.AreEqual(_p3, result.Records[1]);
+		Assert.AreEqual(_p1, result.Records[2]);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_larger_stream_with_from_end_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ES", -1, 3, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(3, result.Records.Length);
+		Assert.AreEqual(_p5, result.Records[0]);
+		Assert.AreEqual(_p3, result.Records[1]);
+		Assert.AreEqual(_p1, result.Records[2]);
+	}
+
+	[Test]
+	public async Task return_correct_last_event_version_for_smaller_stream() {
+		Assert.AreEqual(1, await ReadIndex.GetStreamLastEventNumber("ABC", CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_correct_first_record_for_smaller_stream() {
+		var result = await ReadIndex.ReadEvent("ABC", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p2, result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_second_record_for_smaller_stream() {
+		var result = await ReadIndex.ReadEvent("ABC", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, result.Result);
+		Assert.AreEqual(_p4, result.Record);
+	}
+
+	[Test]
+	public async Task not_find_record_with_nonexistent_version_for_smaller_stream() {
+		var result = await ReadIndex.ReadEvent("ABC", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, result.Result);
+		Assert.IsNull(result.Record);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_start_range_query_for_smaller_stream() {
+		var result = await ReadIndex.ReadStreamEventsForward("ABC", 0, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_p2, result.Records[0]);
+		Assert.AreEqual(_p4, result.Records[1]);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_smaller_stream_with_specific_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ABC", 1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_p4, result.Records[0]);
+		Assert.AreEqual(_p2, result.Records[1]);
+	}
+
+	[Test]
+	public async Task return_correct_range_on_from_end_range_query_for_smaller_stream_with_from_end_version() {
+		var result = await ReadIndex.ReadStreamEventsBackward("ABC", -1, 2, CancellationToken.None);
+		Assert.AreEqual(ReadStreamResult.Success, result.Result);
+		Assert.AreEqual(2, result.Records.Length);
+		Assert.AreEqual(_p4, result.Records[0]);
+		Assert.AreEqual(_p2, result.Records[1]);
+	}
+
+	[Test]
+	public async Task read_all_events_forward_returns_all_events_in_correct_order() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 10, CancellationToken.None))
+			.Records;
+
+		Assert.AreEqual(5, records.Count);
+		Assert.AreEqual(_p2, records[0].Event);
+		Assert.AreEqual(_p4, records[1].Event);
+		Assert.AreEqual(_p1, records[2].Event);
+		Assert.AreEqual(_p3, records[3].Event);
+		Assert.AreEqual(_p5, records[4].Event);
+	}
+
+	[Test]
+	public async Task read_all_events_backward_returns_all_events_in_correct_order() {
+		var pos = GetBackwardReadPos();
+		var records = (await ReadIndex.ReadAllEventsBackward(pos, 10, CancellationToken.None)).Records;
+
+		Assert.AreEqual(5, records.Count);
+		Assert.AreEqual(_p5, records[0].Event);
+		Assert.AreEqual(_p3, records[1].Event);
+		Assert.AreEqual(_p1, records[2].Event);
+		Assert.AreEqual(_p4, records[3].Event);
+		Assert.AreEqual(_p2, records[4].Event);
+	}
+
+	[Test]
+	public async Task
+		read_all_events_forward_returns_nothing_when_prepare_position_is_greater_than_last_prepare_in_commit() {
+		var records = (await ReadIndex.ReadAllEventsForward(new TFPos(_t1CommitPos, _t1CommitPos), 10, CancellationToken.None))
+			.Records;
+		Assert.AreEqual(0, records.Count);
+	}
+
+	[Test]
+	public async Task
+		read_all_events_backwards_returns_nothing_when_prepare_position_is_smaller_than_first_prepare_in_commit() {
+		var records = (await ReadIndex.ReadAllEventsBackward(new TFPos(_t2CommitPos, 0), 10, CancellationToken.None)).Records;
+		Assert.AreEqual(0, records.Count);
+	}
+
+	[Test]
+	public async Task read_all_events_forward_returns_correct_events_starting_in_the_middle_of_tf() {
+		var res1 = await ReadIndex.ReadAllEventsForward(new TFPos(_t2CommitPos, _p4.LogPosition), 10, CancellationToken.None);
+
+		Assert.AreEqual(4, res1.Records.Count);
+		Assert.AreEqual(_p4, res1.Records[0].Event);
+		Assert.AreEqual(_p1, res1.Records[1].Event);
+		Assert.AreEqual(_p3, res1.Records[2].Event);
+		Assert.AreEqual(_p5, res1.Records[3].Event);
+
+		var res2 = await ReadIndex.ReadAllEventsBackward(res1.PrevPos, 10, CancellationToken.None);
+		Assert.AreEqual(1, res2.Records.Count);
+		Assert.AreEqual(_p2, res2.Records[0].Event);
+	}
+
+	[Test]
+	public async Task read_all_events_backward_returns_correct_events_starting_in_the_middle_of_tf() {
+		var pos = new TFPos(Db.Config.WriterCheckpoint.Read(), _p4.LogPosition); // p3 post-pos
+		var res1 = await ReadIndex.ReadAllEventsBackward(pos, 10, CancellationToken.None);
+
+		Assert.AreEqual(4, res1.Records.Count);
+		Assert.AreEqual(_p3, res1.Records[0].Event);
+		Assert.AreEqual(_p1, res1.Records[1].Event);
+		Assert.AreEqual(_p4, res1.Records[2].Event);
+		Assert.AreEqual(_p2, res1.Records[3].Event);
+
+		var res2 = await ReadIndex.ReadAllEventsForward(res1.PrevPos, 10, CancellationToken.None);
+		Assert.AreEqual(1, res2.Records.Count);
+		Assert.AreEqual(_p5, res2.Records[0].Event);
+	}
+
+	[Test]
+	public async Task all_records_can_be_read_sequentially_page_by_page_in_forward_pass() {
+		var recs = new[] { _p2, _p4, _p1, _p3, _p5 }; // in committed order
+
+		int count = 0;
+		var pos = new TFPos(0, 0);
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsForward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task all_records_can_be_read_sequentially_page_by_page_in_backward_pass() {
+		var recs = new[] { _p5, _p3, _p1, _p4, _p2 }; // in reverse committed order
+
+		int count = 0;
+		var pos = GetBackwardReadPos();
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsBackward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task position_returned_for_prev_page_when_traversing_forward_allow_to_traverse_backward_correctly() {
+		var recs = new[] { _p2, _p4, _p1, _p3, _p5 }; // in committed order
+
+		int count = 0;
+		var pos = new TFPos(0, 0);
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsForward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+
+			var localPos = result.PrevPos;
+			int localCount = 0;
+			IndexReadAllResult localResult;
+			while ((localResult = await ReadIndex.ReadAllEventsBackward(localPos, 1, CancellationToken.None)).Records.Count != 0) {
+				Assert.AreEqual(1, localResult.Records.Count);
+				Assert.AreEqual(recs[count - 1 - localCount], localResult.Records[0].Event);
+				localPos = localResult.NextPos;
+				localCount += 1;
+			}
+
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+
+	[Test]
+	public async Task position_returned_for_prev_page_when_traversing_backward_allow_to_traverse_forward_correctly() {
+		var recs = new[] { _p5, _p3, _p1, _p4, _p2 }; // in reverse committed order
+
+		int count = 0;
+		var pos = GetBackwardReadPos();
+		IndexReadAllResult result;
+		while ((result = await ReadIndex.ReadAllEventsBackward(pos, 1, CancellationToken.None)).Records.Count != 0) {
+			Assert.AreEqual(1, result.Records.Count);
+			Assert.AreEqual(recs[count], result.Records[0].Event);
+
+			var localPos = result.PrevPos;
+			int localCount = 0;
+			IndexReadAllResult localResult;
+			while ((localResult = await ReadIndex.ReadAllEventsForward(localPos, 1, CancellationToken.None)).Records.Count != 0) {
+				Assert.AreEqual(1, localResult.Records.Count);
+				Assert.AreEqual(recs[count - 1 - localCount], localResult.Records[0].Event);
+				localPos = localResult.NextPos;
+				localCount += 1;
+			}
+
+			pos = result.NextPos;
+			count += 1;
+		}
+
+		Assert.AreEqual(recs.Length, count);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/Transactions/when_rebuilding_index_for_partially_persisted_transaction.cs b/src/KurrentDB.Core.Tests/Services/Storage/Transactions/when_rebuilding_index_for_partially_persisted_transaction.cs
new file mode 100644
index 00000000000..601ddeccb7c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/Transactions/when_rebuilding_index_for_partially_persisted_transaction.cs
@@ -0,0 +1,91 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.Util;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage.Transactions;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class when_rebuilding_index_for_partially_persisted_transaction<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	public when_rebuilding_index_for_partially_persisted_transaction() : base(maxEntriesInMemTable: 10) {
+	}
+
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		ReadIndex.Close();
+		ReadIndex.Dispose();
+		TableIndex.Close(removeFiles: false);
+
+		var readers =
+			new ObjectPool<ITransactionFileReader>("Readers", 2, 2, () => new TFChunkReader(Db, WriterCheckpoint));
+		var lowHasher = _logFormat.LowHasher;
+		var highHasher = _logFormat.HighHasher;
+		var emptyStreamId = _logFormat.EmptyStreamId;
+		TableIndex = new TableIndex<TStreamId>(GetFilePathFor("index"), lowHasher, highHasher, emptyStreamId,
+			() => new HashListMemTable(PTableVersions.IndexV2, maxSize: MaxEntriesInMemTable * 2),
+			() => new TFReaderLease(readers),
+			PTableVersions.IndexV2,
+			5, Constants.PTableMaxReaderCountDefault,
+			MaxEntriesInMemTable);
+		var readIndex = new ReadIndex<TStreamId>(new NoopPublisher(),
+			readers,
+			TableIndex,
+			_logFormat.StreamNameIndexConfirmer,
+			_logFormat.StreamIds,
+			_logFormat.StreamNamesProvider,
+			_logFormat.EmptyStreamId,
+			_logFormat.StreamIdValidator,
+			_logFormat.StreamIdSizer,
+			_logFormat.StreamExistenceFilter,
+			_logFormat.StreamExistenceFilterReader,
+			_logFormat.EventTypeIndexConfirmer,
+			new NoLRUCache<TStreamId, IndexBackend<TStreamId>.EventNumberCached>(),
+			new NoLRUCache<TStreamId, IndexBackend<TStreamId>.MetadataCached>(),
+			additionalCommitChecks: true,
+			metastreamMaxCount: 1,
+			hashCollisionReadLimit: Opts.HashCollisionReadLimitDefault,
+			skipIndexScanOnReads: Opts.SkipIndexScanOnReadsDefault,
+			replicationCheckpoint: Db.Config.ReplicationCheckpoint,
+			indexCheckpoint: Db.Config.IndexCheckpoint,
+			indexStatusTracker: new IndexStatusTracker.NoOp(),
+			indexTracker: new IndexTracker.NoOp(),
+			cacheTracker: new CacheHitsMissesTracker.NoOp());
+		await readIndex.IndexCommitter.Init(ChaserCheckpoint.Read(), CancellationToken.None);
+		ReadIndex = readIndex;
+	}
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		var begin = await WriteTransactionBegin("ES", ExpectedVersion.Any, token);
+		for (int i = 0; i < 15; ++i) {
+			await WriteTransactionEvent(Guid.NewGuid(), begin.LogPosition, i, "ES", i, "data" + i, PrepareFlags.Data, token: token);
+		}
+
+		await WriteTransactionEnd(Guid.NewGuid(), begin.LogPosition, "ES", token);
+		await WriteCommit(Guid.NewGuid(), begin.LogPosition, "ES", 0, token);
+	}
+
+	[Test]
+	public async Task sequence_numbers_are_not_broken() {
+		for (int i = 0; i < 15; ++i) {
+			var result = await ReadIndex.ReadEvent("ES", i, CancellationToken.None);
+			Assert.AreEqual(ReadEventResult.Success, result.Result);
+			Assert.AreEqual(Helper.UTF8NoBom.GetBytes("data" + i), result.Record.Data.ToArray());
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Storage/WriteEventsToIndexScenario.cs b/src/KurrentDB.Core.Tests/Services/Storage/WriteEventsToIndexScenario.cs
new file mode 100644
index 00000000000..bb3e6bf452d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Storage/WriteEventsToIndexScenario.cs
@@ -0,0 +1,170 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Storage;
+
+[TestFixture]
+public abstract class WriteEventsToIndexScenario<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	protected SynchronousScheduler _publisher;
+	protected ITransactionFileReader _tfReader;
+	protected ITableIndex<TStreamId> _tableIndex;
+	protected IIndexBackend<TStreamId> _indexBackend;
+	protected IValueLookup<TStreamId> _streamIds;
+	protected INameLookup<TStreamId> _streamNames;
+	protected ISystemStreamLookup<TStreamId> _systemStreams;
+	protected IStreamNamesProvider<TStreamId> _provider;
+	protected IValidator<TStreamId> _validator;
+	protected ISizer<TStreamId> _sizer;
+	protected IIndexReader<TStreamId> _indexReader;
+	protected IIndexWriter<TStreamId> _indexWriter;
+	protected IIndexCommitter<TStreamId> _indexCommitter;
+	protected ObjectPool<ITransactionFileReader> _readerPool;
+	protected LogFormatAbstractor<TStreamId> _logFormat;
+	protected const int RecordOffset = 1000;
+	public IReadOnlyList<IPrepareLogRecord<TStreamId>> CreatePrepareLogRecord(TStreamId streamId, int expectedVersion, TStreamId eventType, Guid eventId, long transactionPosition) {
+		return new[]{
+			PrepareLogRecord.SingleWrite (
+				_logFormat.RecordFactory,
+				transactionPosition,
+				Guid.NewGuid(),
+				eventId,
+				streamId,
+				expectedVersion,
+				eventType,
+				new byte[0],
+				new byte[0],
+				DateTime.Now,
+				PrepareFlags.IsCommitted
+			)
+		};
+	}
+
+	public IReadOnlyList<IPrepareLogRecord<TStreamId>> CreatePrepareLogRecords(TStreamId streamId, int expectedVersion, IList<TStreamId> eventTypes, IList<Guid> eventIds, long transactionPosition) {
+		if (eventIds.Count != eventTypes.Count)
+			throw new Exception("eventType and eventIds length mismatch!");
+		if (eventIds.Count == 0)
+			throw new Exception("eventIds is empty");
+		if (eventIds.Count == 1)
+			return CreatePrepareLogRecord(streamId, expectedVersion, eventTypes[0], eventIds[0], transactionPosition);
+
+		var numEvents = eventTypes.Count;
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+
+		var prepares = new List<IPrepareLogRecord<TStreamId>>();
+		for (var i = 0; i < numEvents; i++) {
+			PrepareFlags flags = PrepareFlags.Data | PrepareFlags.IsCommitted;
+			if (i == 0)
+				flags |= PrepareFlags.TransactionBegin;
+			if (i == numEvents - 1)
+				flags |= PrepareFlags.TransactionEnd;
+
+			prepares.Add(
+				PrepareLogRecord.Prepare(
+					recordFactory,
+					transactionPosition + RecordOffset * i,
+					Guid.NewGuid(),
+					eventIds[i],
+					transactionPosition,
+					i,
+					streamId,
+					expectedVersion + i,
+					flags,
+					eventTypes[i],
+					new byte[0],
+					new byte[0],
+					DateTime.Now
+			));
+		}
+
+		return prepares;
+	}
+
+	public CommitLogRecord CreateCommitLogRecord(long logPosition, long transactionPosition, long firstEventNumber) {
+		return new CommitLogRecord(logPosition, Guid.NewGuid(), transactionPosition, DateTime.Now, 0);
+	}
+
+	public void WriteToDB(IEnumerable<IPrepareLogRecord<TStreamId>> prepares) {
+		foreach (var prepare in prepares) {
+			((FakeInMemoryTfReader)_tfReader).AddRecord(prepare, prepare.LogPosition);
+		}
+	}
+
+	public void WriteToDB(CommitLogRecord commit) {
+		((FakeInMemoryTfReader)_tfReader).AddRecord(commit, commit.LogPosition);
+	}
+
+	public void PreCommitToIndex(IEnumerable<IPrepareLogRecord<TStreamId>> prepares) {
+		_indexWriter.PreCommit(prepares.ToArray());
+	}
+
+	public ValueTask PreCommitToIndex(CommitLogRecord commitLogRecord, CancellationToken token) {
+		return _indexWriter.PreCommit(commitLogRecord, token);
+	}
+
+	public async ValueTask CommitToIndex(IReadOnlyList<IPrepareLogRecord<TStreamId>> prepares, CancellationToken token) {
+		await _indexCommitter.Commit(prepares, false, false, token);
+	}
+
+	public async ValueTask CommitToIndex(CommitLogRecord commitLogRecord, CancellationToken token) {
+		await _indexCommitter.Commit(commitLogRecord, false, false, token);
+	}
+
+	public abstract ValueTask WriteEvents(CancellationToken token);
+
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
+			IndexDirectory = GetFilePathFor("index"),
+		});
+		_provider = _logFormat.StreamNamesProvider;
+		_publisher = new("publisher");
+		_tfReader = new FakeInMemoryTfReader(RecordOffset);
+		_tableIndex = new FakeInMemoryTableIndex<TStreamId>();
+		_provider.SetTableIndex(_tableIndex);
+		_readerPool = new ObjectPool<ITransactionFileReader>(
+			"ReadIndex readers pool", 5, 100,
+			() => _tfReader);
+		_indexBackend = new IndexBackend<TStreamId>(_readerPool,
+			new LRUCache<TStreamId, IndexBackend<TStreamId>.EventNumberCached>("LastEventNumber", 100_000),
+			new LRUCache<TStreamId, IndexBackend<TStreamId>.MetadataCached>("StreamMetadata", 100_000));
+		_streamIds = _logFormat.StreamIds;
+		_validator = _logFormat.StreamIdValidator;
+		var emptyStreamId = _logFormat.EmptyStreamId;
+		_sizer = _logFormat.StreamIdSizer;
+		_indexReader = new IndexReader<TStreamId>(_indexBackend, _tableIndex, _provider, _validator,
+			_logFormat.StreamExistenceFilterReader, new StreamMetadata(maxCount: 100000), 100, false);
+		_streamNames = _logFormat.StreamNames;
+		_systemStreams = _logFormat.SystemStreams;
+		_indexWriter = new IndexWriter<TStreamId>(_indexBackend, _indexReader, _streamIds, _streamNames,
+			_systemStreams, emptyStreamId, _sizer);
+		_indexCommitter = new IndexCommitter<TStreamId>(_publisher, _indexBackend, _indexReader, _tableIndex,
+			_logFormat.StreamNameIndexConfirmer, _streamNames, _logFormat.EventTypeIndexConfirmer, _logFormat.EventTypes,
+			_systemStreams, _logFormat.StreamExistenceFilter, _logFormat.StreamExistenceFilterInitializer, new InMemoryCheckpoint(-1), new IndexStatusTracker.NoOp(), new IndexTracker.NoOp(), false);
+
+		await WriteEvents(CancellationToken.None);
+	}
+
+	public override Task TestFixtureTearDown() {
+		_logFormat?.Dispose();
+		_readerPool.Dispose();
+		return base.TestFixtureTearDown();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/TimeService/time_service_should.cs b/src/KurrentDB.Core.Tests/Services/TimeService/time_service_should.cs
new file mode 100644
index 00000000000..962b85e412a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/TimeService/time_service_should.cs
@@ -0,0 +1,193 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.TimeService;
+
+public class FakeScheduler : TimerBasedScheduler {
+	public FakeScheduler(ITimer timer, ITimeProvider timeProvider) : base(timer, timeProvider) {
+	}
+
+	public void TriggerProcessing() {
+		ProcessOperations();
+	}
+}
+
+public class FakeTimeProvider : ITimeProvider {
+	public DateTime UtcNow { get; private set; }
+	public DateTime LocalTime { get; private set; }
+
+	public FakeTimeProvider() {
+		UtcNow = DateTime.UtcNow;
+		LocalTime = DateTime.Now;
+	}
+
+	public void SetNewUtcTime(DateTime newTime) {
+		UtcNow = newTime;
+	}
+
+	public void AddToUtcTime(TimeSpan timeSpan) {
+		UtcNow = UtcNow.Add(timeSpan);
+	}
+
+	public void AddToLocalTime(TimeSpan timeSpan) {
+		UtcNow = LocalTime.Add(timeSpan);
+	}
+}
+
+public class FakeTimer : ITimer {
+	public void FireIn(int milliseconds, Action callback) {
+		// do smth
+	}
+
+	public void Dispose() {
+	}
+}
+
+public class TestResponseMessage : Message {
+	public int Id { get; }
+
+	public TestResponseMessage(int id) {
+		Id = id;
+	}
+}
+
+[TestFixture]
+public class time_service_should : IHandle<TestResponseMessage> {
+	private Action<int, int> _startTimeout;
+	private List<TestResponseMessage> _timerMessages;
+
+	private FakeTimeProvider _timeProvider;
+	private FakeScheduler _scheduler;
+
+	[SetUp]
+	public void SetUp() {
+		_timerMessages = new List<TestResponseMessage>();
+
+		_timeProvider = new FakeTimeProvider();
+		var timer = new FakeTimer();
+		_scheduler = new FakeScheduler(timer, _timeProvider);
+		var timeService = new TimerService(_scheduler);
+
+		_startTimeout = (ms, id) => timeService.Handle(
+			TimerMessage.Schedule.Create(TimeSpan.FromMilliseconds(ms),
+				new SendToThisEnvelope(this),
+				new TestResponseMessage(id)));
+	}
+
+	public void Handle(TestResponseMessage message) {
+		_timerMessages.Add(message);
+	}
+
+	[TearDown]
+	public void TearDown() {
+	}
+
+	[Test]
+	public void respond_with_correct_message() {
+		const int id = 101;
+
+		_startTimeout(0, id);
+		_scheduler.TriggerProcessing();
+
+		Assert.That(_timerMessages.ContainsSingle<TestResponseMessage>(msg => msg != null && msg.Id == id));
+	}
+
+	[Test]
+	public void respond_even_if_fired_too_late() {
+		_startTimeout(-5, 100);
+		_scheduler.TriggerProcessing();
+
+		Assert.That(_timerMessages.ContainsSingle<TestResponseMessage>());
+	}
+
+	[Test]
+	public void not_respond_until_time_elapses() {
+		_startTimeout(5, 100);
+
+		_timeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(4));
+		_scheduler.TriggerProcessing();
+
+		Assert.That(_timerMessages.ContainsNo<TestResponseMessage>());
+	}
+
+	[Test]
+	public void respond_in_correct_time() {
+		_startTimeout(5, 100);
+
+		_timeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(5));
+		_scheduler.TriggerProcessing();
+
+		Assert.That(_timerMessages.ContainsSingle<TestResponseMessage>());
+	}
+
+	[Test]
+	public void fire_timeouts_gradually() {
+		_startTimeout(5, 100);
+		_startTimeout(25, 102);
+		_startTimeout(45, 104);
+		_startTimeout(35, 103);
+		_startTimeout(15, 101);
+
+		_timeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(10)); // 10
+		_scheduler.TriggerProcessing();
+
+		Assert.That(_timerMessages.ContainsSingle<TestResponseMessage>(msg => msg.Id == 100) &&
+					_timerMessages.ContainsNo<TestResponseMessage>(msg => msg.Id.IsBetween(101, 104)));
+
+		_timeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(10)); // 20
+		_scheduler.TriggerProcessing();
+
+		Assert.That(_timerMessages.ContainsSingle<TestResponseMessage>(msg => msg.Id == 101) &&
+					_timerMessages.ContainsNo<TestResponseMessage>(msg => msg.Id.IsBetween(102, 104)));
+
+		_timeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(10)); //30
+		_scheduler.TriggerProcessing();
+
+		Assert.That(_timerMessages.ContainsSingle<TestResponseMessage>(msg => msg.Id == 102) &&
+					_timerMessages.ContainsNo<TestResponseMessage>(msg => msg.Id.IsBetween(103, 104)));
+
+		_timeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(10)); //40
+		_scheduler.TriggerProcessing();
+
+		Assert.That(_timerMessages.ContainsSingle<TestResponseMessage>(msg => msg.Id == 103) &&
+					_timerMessages.ContainsNo<TestResponseMessage>(msg => msg.Id == 104));
+
+		_timeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(10)); //50
+		_scheduler.TriggerProcessing();
+
+		Assert.That(_timerMessages.ContainsSingle<TestResponseMessage>(msg => msg.Id == 104));
+	}
+
+	[Test]
+	public void fire_all_timeouts_that_are_scheduled_at_same_time() {
+		_startTimeout(5, 100);
+		_startTimeout(5, 101);
+		_startTimeout(5, 102);
+
+		_timeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(5));
+		_scheduler.TriggerProcessing();
+
+		Assert.That(_timerMessages.ContainsN<TestResponseMessage>(3, msg => msg.Id.IsBetween(100, 102)));
+	}
+
+	[Test]
+	public void fire_all_timeouts_after_long_pause() {
+		for (int i = 0; i < 20; i++)
+			_startTimeout(10 + i, 100 + i);
+
+		Assert.That(_timerMessages.ContainsNo<TestResponseMessage>());
+
+		_timeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(1000));
+		_scheduler.TriggerProcessing();
+
+		Assert.That(_timerMessages.ContainsN<TestResponseMessage>(20, msg => msg.Id.IsBetween(100, 119)));
+	}
+}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscription.CombinationTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscription.CombinationTests.cs
similarity index 94%
rename from src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscription.CombinationTests.cs
rename to src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscription.CombinationTests.cs
index ac17b1427e9..71ba145fd25 100644
--- a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscription.CombinationTests.cs
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscription.CombinationTests.cs
@@ -1,18 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
 using EventStore.ClientAPI;
 using EventStore.ClientAPI.Common;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Transport.Enumerators;
-using EventStore.Core.Services.UserManagement;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Transport.Enumerators;
+using KurrentDB.Core.Services.UserManagement;
 using NUnit.Framework;
 using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
-using Position = EventStore.Core.Services.Transport.Common.Position;
+using Position = KurrentDB.Core.Services.Transport.Common.Position;
 using ResolvedEvent = EventStore.ClientAPI.ResolvedEvent;
 
-namespace EventStore.Core.Tests.Services.Transport.Enumerators;
+namespace KurrentDB.Core.Tests.Services.Transport.Enumerators;
 
 [TestFixture]
 public partial class EnumeratorTests {
@@ -163,7 +166,7 @@ private async Task WriteEvent(string stream, string eventType, string data, stri
 			await NodeConnection.AppendToStreamAsync(stream, ExpectedVersion.Any, eventData);
 		}
 		private Task WriteEvent() => WriteEvent(_streamPrefix + _streamSuffix++, "type", "{}", null);
-		private Task RevokeAccessWithStreamAcl() => WriteEvent(SystemStreams.MetastreamOf(Core.Services.SystemStreams.AllStream), "$metadata", @"{ ""$acl"": { ""$r"": [] } }", null);
+		private Task RevokeAccessWithStreamAcl() => WriteEvent(SystemStreams.MetastreamOf(KurrentDB.Core.Services.SystemStreams.AllStream), "$metadata", @"{ ""$acl"": { ""$r"": [] } }", null);
 		private Task RevokeAccessWithDefaultAcl() => WriteEvent(SystemStreams.SettingsStream, "update-default-acl", @"{ ""$systemStreamAcl"" : { ""$r"" : [] } }", null);
 
 		private async Task<(int numEventsAdded, bool accessRevoked, bool fallBehindThenCatchup)> ApplyLiveProperties() {
@@ -258,7 +261,7 @@ private async Task<int> ReadExpectedEvents(EnumeratorWrapper sub, int nextEventI
 						break;
 					default:
 						Assert.Fail($"Unexpected response: {response}");
-						break ;
+						break;
 				}
 			}
 
diff --git a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscription.Tests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscription.Tests.cs
similarity index 87%
rename from src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscription.Tests.cs
rename to src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscription.Tests.cs
index 8ad005ad63f..e84cc7a7eb5 100644
--- a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscription.Tests.cs
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscription.Tests.cs
@@ -1,18 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Core.Services.Transport.Enumerators;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.Tests.Helpers;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Enumerators;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Tests.Helpers;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Services.Transport.Enumerators;
+namespace KurrentDB.Core.Tests.Services.Transport.Enumerators;
 
 [TestFixture]
 public partial class EnumeratorTests {
diff --git a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscriptionFiltered.CombinationTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscriptionFiltered.CombinationTests.cs
similarity index 87%
rename from src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscriptionFiltered.CombinationTests.cs
rename to src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscriptionFiltered.CombinationTests.cs
index cefecddd3db..880eb4f07ca 100644
--- a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscriptionFiltered.CombinationTests.cs
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscriptionFiltered.CombinationTests.cs
@@ -1,20 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using EventStore.ClientAPI;
 using EventStore.ClientAPI.Common;
 using EventStore.ClientAPI.Messages;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.Transport.Enumerators;
-using EventStore.Core.Services.UserManagement;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.Transport.Enumerators;
+using KurrentDB.Core.Services.UserManagement;
 using NUnit.Framework;
 using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
-using Position = EventStore.Core.Services.Transport.Common.Position;
+using Position = KurrentDB.Core.Services.Transport.Common.Position;
 using ResolvedEvent = EventStore.ClientAPI.ResolvedEvent;
 
-namespace EventStore.Core.Tests.Services.Transport.Enumerators;
+namespace KurrentDB.Core.Tests.Services.Transport.Enumerators;
 
 [TestFixture]
 public partial class EnumeratorTests {
@@ -55,7 +59,7 @@ public enum EventFilterType {
 		private const int NumEventsToFallBehind = 3 * 32;
 		private const int CheckpointInterval = 16;
 
-		public static object[] TestCases = {
+		public static object[] TestCases = [
 			// STREAM PREFIX FILTER
 			CreateTestData(
 				"subscribe to $all with stream prefix filter from start",
@@ -331,6 +335,13 @@ public enum EventFilterType {
 				new SubscriptionProperties(CheckpointType.Start, EventFilterType.StreamPrefix),
 				new LiveProperties()
 			),
+			.. Enumerable.Range(0, Enumerator.ReadBatchSize).Select(i => CreateTestData(
+				$"subscription to filtered $all receives checkpoints during catch-up (6-{i})",
+				new StreamProperties(NumEvents: i),
+				new SubscriptionProperties(CheckpointType.Start, EventFilterType.StreamPrefix),
+				new LiveProperties(NumEventsToAdd: 5)
+			)),
+
 			// CHECKPOINTS WHEN LIVE
 			CreateTestData(
 				"subscription to filtered $all receives checkpoints when live (1)",
@@ -362,7 +373,7 @@ public enum EventFilterType {
 				new SubscriptionProperties(CheckpointType.End, EventFilterType.StreamPrefix),
 				new LiveProperties(CheckpointInterval * 2 + 1)
 			),
-		};
+		];
 
 		private readonly TestData _testData;
 		private StreamProperties StreamProps => _testData.StreamProperties;
@@ -408,10 +419,10 @@ private async Task PopulateExistingEvents() {
 
 			var filter = SubscriptionProps.EventFilterType switch {
 				EventFilterType.None => null,
-				EventFilterType.StreamPrefix => new Filter(ClientMessage.Filter.FilterContext.StreamId, ClientMessage.Filter.FilterType.Prefix, new [] {$"stream-{_testGuid}"}),
-				EventFilterType.StreamRegex => new Filter(ClientMessage.Filter.FilterContext.StreamId, ClientMessage.Filter.FilterType.Regex, new [] {$"(.*?){_testGuid}(.*?)"}),
-				EventFilterType.EventTypePrefix => new Filter(ClientMessage.Filter.FilterContext.EventType, ClientMessage.Filter.FilterType.Prefix, new [] { $"type-{_testGuid}"}),
-				EventFilterType.EventTypeRegex => new Filter(ClientMessage.Filter.FilterContext.EventType, ClientMessage.Filter.FilterType.Regex, new [] { $"(.*?){_testGuid}(.*?)"}),
+				EventFilterType.StreamPrefix => new Filter(ClientMessage.Filter.FilterContext.StreamId, ClientMessage.Filter.FilterType.Prefix, new[] { $"stream-{_testGuid}" }),
+				EventFilterType.StreamRegex => new Filter(ClientMessage.Filter.FilterContext.StreamId, ClientMessage.Filter.FilterType.Regex, new[] { $"(.*?){_testGuid}(.*?)" }),
+				EventFilterType.EventTypePrefix => new Filter(ClientMessage.Filter.FilterContext.EventType, ClientMessage.Filter.FilterType.Prefix, new[] { $"type-{_testGuid}" }),
+				EventFilterType.EventTypeRegex => new Filter(ClientMessage.Filter.FilterContext.EventType, ClientMessage.Filter.FilterType.Regex, new[] { $"(.*?){_testGuid}(.*?)" }),
 				_ => throw new ArgumentOutOfRangeException()
 			};
 
@@ -432,7 +443,7 @@ private async Task WriteEvent(string stream, string eventType, string data, stri
 			await NodeConnection.AppendToStreamAsync(stream, ExpectedVersion.Any, eventData);
 		}
 		private Task WriteEvent() => WriteEvent(_streamPrefix + _streamSuffix++ + "-filtered", $"type-{_testGuid}-filtered", "{}", null);
-		private Task RevokeAccessWithStreamAcl() => WriteEvent(SystemStreams.MetastreamOf(Core.Services.SystemStreams.AllStream), "$metadata", @"{ ""$acl"": { ""$r"": [] } }", null);
+		private Task RevokeAccessWithStreamAcl() => WriteEvent(SystemStreams.MetastreamOf(KurrentDB.Core.Services.SystemStreams.AllStream), "$metadata", @"{ ""$acl"": { ""$r"": [] } }", null);
 		private Task RevokeAccessWithDefaultAcl() => WriteEvent(SystemStreams.SettingsStream, "update-default-acl", @"{ ""$systemStreamAcl"" : { ""$r"" : [] } }", null);
 
 		private async Task<(int numEventsAdded, bool accessRevoked, bool fallBehindThenCatchup)> ApplyLiveProperties() {
@@ -509,7 +520,7 @@ private EnumeratorWrapper Subscribe() {
 				user: SystemAccounts.Anonymous);
 		}
 
-		private async Task<int> ReadExpectedEvents(EnumeratorWrapper sub, int nextEventIndex, int lastEventIndex, bool catchingUp, bool shouldFallBehindThenCatchUp = false) {
+		private async Task<(Position?, int)> ReadExpectedEvents(EnumeratorWrapper sub, Position? checkpointPosition, int nextEventIndex, int lastEventIndex, bool catchingUp, bool shouldFallBehindThenCatchUp = false) {
 			var fellBehind = false;
 			var caughtUp = false;
 			var lastEventOrCheckpointPos = new TFPos(-1, -1);
@@ -528,6 +539,19 @@ private async Task<int> ReadExpectedEvents(EnumeratorWrapper sub, int nextEventI
 						lastEventOrCheckpointPos = evtTfPos;
 						numEventsSinceLastCheckpoint++;
 						Assert.AreEqual(evtTfPos, evt.EventPosition!.Value);
+
+						// The event received must strictly advance the checkpoint (otherwise it was not a valid checkpoint)
+						var newCheckpointPosition = Position.FromInt64(evtTfPos.CommitPosition, evtTfPos.PreparePosition);
+
+						Assert.True(!checkpointPosition.HasValue || checkpointPosition.Value < newCheckpointPosition,
+							$"event at pos {newCheckpointPosition} should have advanced the checkpoint {checkpointPosition} but did not");
+
+						// Since there are no explicit transactions here the event should also strictly advance the commit position of the checkpoint
+						// in case any user knows that their system contains no explicit transactions and are only storing the commit position.
+						Assert.True(!checkpointPosition.HasValue || checkpointPosition.Value.CommitPosition < newCheckpointPosition.CommitPosition,
+							$"event at pos {newCheckpointPosition} should have advanced the commit position of checkpoint {checkpointPosition} but did not");
+
+						checkpointPosition = newCheckpointPosition;
 						break;
 					case FellBehind:
 						if (!shouldFallBehindThenCatchUp)
@@ -549,6 +573,11 @@ private async Task<int> ReadExpectedEvents(EnumeratorWrapper sub, int nextEventI
 						// not always straightforward to calculate how many checkpoints we will receive.
 						numResponsesExpected++;
 
+						// checkpoint must not move backwards
+						Assert.True(checkpoint.CheckpointPosition >= checkpointPosition);
+						Assert.True(checkpoint.CheckpointPosition < Position.End);
+
+						checkpointPosition = checkpoint.CheckpointPosition;
 						var checkpointPos = checkpoint.CheckpointPosition.ToInt64();
 						var checkpointTfPos = new TFPos(checkpointPos.commitPosition, checkpointPos.preparePosition);
 
@@ -560,7 +589,7 @@ private async Task<int> ReadExpectedEvents(EnumeratorWrapper sub, int nextEventI
 						break;
 					default:
 						Assert.Fail($"Unexpected response: {response}");
-						break ;
+						break;
 				}
 			}
 
@@ -577,7 +606,8 @@ CheckpointType.AtZero or
 
 			// then expect a final checkpoint
 			if (shouldCheckpoint) {
-				Assert.True(await sub.GetNext() is Checkpoint);
+				var checkpoint = AssertEx.IsType<Checkpoint>(await sub.GetNext());
+				Assert.True(checkpoint.CheckpointPosition < Position.End);
 				numEventsSinceLastCheckpoint = 0;
 			}
 
@@ -591,7 +621,7 @@ CheckpointType.AtZero or
 					Assert.Fail("Subscription fell behind but did not catch up.");
 			}
 
-			return nextEventIndex;
+			return (checkpointPosition, nextEventIndex);
 		}
 
 		[SetUp]
@@ -612,13 +642,19 @@ public async Task enumeration_is_correct() {
 				return;
 			}
 
-			_nextEventIndex = await ReadExpectedEvents(sub, _nextEventIndex, _events.Count - 1, catchingUp: true);
+			(var checkpoint, _nextEventIndex) = await ReadExpectedEvents(sub, checkpointPosition: null, _nextEventIndex, _events.Count - 1, catchingUp: true);
 
-			Assert.True(await sub.GetNext() is CaughtUp);
+			// Should be caught up. There may be a checkpoint first.
+			var m = await sub.GetNext();
+			if (m is Checkpoint c) {
+				checkpoint = c.CheckpointPosition;
+				m = await sub.GetNext();
+			}
+			Assert.IsInstanceOf<CaughtUp>(m);
 
 			var (numEventsAdded, accessRevoked, shouldFallBehindThenCatchup) = await ApplyLiveProperties();
 
-			_nextEventIndex = await ReadExpectedEvents(sub, _nextEventIndex, _nextEventIndex + numEventsAdded - 1, catchingUp: false, shouldFallBehindThenCatchup);
+			(checkpoint, _nextEventIndex) = await ReadExpectedEvents(sub, checkpoint, _nextEventIndex, _nextEventIndex + numEventsAdded - 1, catchingUp: false, shouldFallBehindThenCatchup);
 
 			if (accessRevoked) {
 				Assert.ThrowsAsync<ReadResponseException.AccessDenied>(async () => await sub.GetNext());
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscriptionFiltered.Tests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscriptionFiltered.Tests.cs
new file mode 100644
index 00000000000..023f64fa006
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.AllSubscriptionFiltered.Tests.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Enumerators;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Enumerators;
+
+[TestFixture]
+public partial class EnumeratorTests {
+	private static EnumeratorWrapper CreateAllSubscriptionFiltered(
+		IPublisher publisher,
+		Position? checkpoint,
+		IEventFilter eventFilter = null,
+		uint? maxSearchWindow = null,
+		uint checkpointIntervalMultiplier = 1,
+		ClaimsPrincipal user = null) {
+
+		return new EnumeratorWrapper(new Enumerator.AllSubscriptionFiltered(
+			bus: publisher,
+			expiryStrategy: new DefaultExpiryStrategy(),
+			checkpoint: checkpoint,
+			resolveLinks: false,
+			eventFilter: eventFilter,
+			user: user ?? SystemAccounts.System,
+			requiresLeader: false,
+			maxSearchWindow: maxSearchWindow,
+			checkpointIntervalMultiplier: checkpointIntervalMultiplier,
+			cancellationToken: CancellationToken.None));
+	}
+
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class subscribe_filtered_all_from_start<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+		private readonly List<Guid> _eventIds = new();
+
+		protected override void Given() {
+			EnableReadAll();
+			_eventIds.Add(WriteEvent("test-stream", "type1", "{}", "{Data: 1}").Item1.EventId);
+			WriteEvent("test-stream", "type2", "{}", "{Data: 2}");
+			WriteEvent("test-stream", "type3", "{}", "{Data: 3}");
+		}
+
+		[Test]
+		public async Task should_receive_live_caught_up_message_after_reading_existing_events() {
+			await using var sub = CreateAllSubscriptionFiltered(
+				_publisher, null, EventFilter.EventType.Prefixes(false, "type1"));
+
+			Assert.True(await sub.GetNext() is SubscriptionConfirmation);
+			Assert.AreEqual(_eventIds[0], ((Event)await sub.GetNext()).Id);
+			var c = AssertEx.IsType<Checkpoint>(await sub.GetNext());
+			Assert.True(c.CheckpointPosition < Position.End);
+			Assert.True(await sub.GetNext() is CaughtUp);
+		}
+
+		[Test]
+		public async Task when_matching_nothing_transition_to_live_checkpoint_should_be_valid() {
+			await using var sub = CreateAllSubscriptionFiltered(
+				_publisher, null, EventFilter.EventType.Prefixes(false, "match-nothing"));
+
+			Assert.True(await sub.GetNext() is SubscriptionConfirmation);
+			var checkpoint = AssertEx.IsType<Checkpoint>(await sub.GetNext());
+			Assert.True(checkpoint.CheckpointPosition < Position.End);
+			Assert.True(await sub.GetNext() is CaughtUp);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class subscribe_filtered_all_from_end<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+		protected override void Given() {
+			EnableReadAll();
+			WriteEvent("test-stream", "type1", "{}", "{Data: 1}");
+			WriteEvent("test-stream", "type2", "{}", "{Data: 2}");
+			WriteEvent("test-stream", "type3", "{}", "{Data: 3}");
+		}
+
+		[Test]
+		public async Task should_receive_live_caught_up_message_immediately() {
+			await using var sub = CreateAllSubscriptionFiltered(
+				_publisher, Position.End, EventFilter.EventType.Prefixes(false, "type1"));
+
+			Assert.True(await sub.GetNext() is SubscriptionConfirmation);
+			Assert.True(await sub.GetNext() is CaughtUp);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class subscribe_filtered_all_from_position<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+		private readonly List<Guid> _eventIds = new();
+		private TFPos _subscribeFrom;
+
+		protected override void Given() {
+			EnableReadAll();
+			WriteEvent("test-stream", "theType", "{}", "{Data: 1}");
+			WriteEvent("test-stream", "type2", "{}", "{Data: 2}");
+			(_, _subscribeFrom) = WriteEvent("test-stream", "theType", "{}", "{Data: 2}");
+			_eventIds.Add(WriteEvent("test-stream", "theType", "{}", "{Data: 3}").Item1.EventId);
+			WriteEvent("test-stream", "type3", "{}", "{Data: 3}");
+			WriteEvent("test-stream", "type4", "{}", "{Data: 4}");
+		}
+
+		[Test]
+		public async Task should_receive_matching_events_after_start_position() {
+			await using var sub = CreateAllSubscriptionFiltered(
+				_publisher,
+				new Position((ulong)_subscribeFrom.CommitPosition, (ulong)_subscribeFrom.PreparePosition),
+				EventFilter.EventType.Prefixes(false, "theType"));
+
+			Assert.True(await sub.GetNext() is SubscriptionConfirmation);
+			Assert.AreEqual(_eventIds[0], ((Event)await sub.GetNext()).Id);
+			var c = AssertEx.IsType<Checkpoint>(await sub.GetNext());
+			Assert.True(c.CheckpointPosition < Position.End);
+			Assert.True(await sub.GetNext() is CaughtUp);
+		}
+
+		[Test]
+		public async Task when_matching_nothing_transition_to_live_checkpoint_should_be_valid() {
+			await using var sub = CreateAllSubscriptionFiltered(
+				_publisher,
+				new Position((ulong)_subscribeFrom.CommitPosition, (ulong)_subscribeFrom.PreparePosition),
+				EventFilter.EventType.Prefixes(false, "match-nothing"));
+
+			Assert.True(await sub.GetNext() is SubscriptionConfirmation);
+			var checkpoint = AssertEx.IsType<Checkpoint>(await sub.GetNext());
+			Assert.True(checkpoint.CheckpointPosition < Position.End);
+			Assert.True(await sub.GetNext() is CaughtUp);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.CombinationTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.CombinationTests.cs
new file mode 100644
index 00000000000..a87be07ae44
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.CombinationTests.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Enumerators;
+
+public partial class EnumeratorTests {
+	[TestFixture]
+	public class TestFixtureWithMiniNodeConnection : SpecificationWithDirectoryPerTestFixture {
+		protected MiniNode<LogFormat.V2, string> Node { get; private set; }
+		protected IEventStoreConnection NodeConnection { get; private set; }
+
+		[OneTimeSetUp]
+		public override async Task TestFixtureSetUp() {
+			await base.TestFixtureSetUp();
+			Node = new MiniNode<LogFormat.V2, string>(PathName);
+			await Node.Start();
+			NodeConnection = TestConnection.To(Node, TcpType.Ssl, new UserCredentials("admin", "changeit"));
+			await NodeConnection.ConnectAsync();
+		}
+
+		[OneTimeTearDown]
+		public override async Task TestFixtureTearDown() {
+			NodeConnection?.Dispose();
+			await Node.Shutdown();
+			await base.TestFixtureTearDown();
+		}
+	}
+}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllBackwards.Tests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllBackwards.Tests.cs
similarity index 78%
rename from src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllBackwards.Tests.cs
rename to src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllBackwards.Tests.cs
index 600c50e13de..e14f81eb0d1 100644
--- a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllBackwards.Tests.cs
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllBackwards.Tests.cs
@@ -1,15 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Core.Services.Transport.Enumerators;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.Tests.Helpers;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Enumerators;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Tests.Helpers;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Services.Transport.Enumerators;
+namespace KurrentDB.Core.Tests.Services.Transport.Enumerators;
 
 [TestFixture]
 public partial class EnumeratorTests {
diff --git a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllBackwardsFiltered.Tests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllBackwardsFiltered.Tests.cs
similarity index 78%
rename from src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllBackwardsFiltered.Tests.cs
rename to src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllBackwardsFiltered.Tests.cs
index fbe842b51ac..fda98b3443e 100644
--- a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllBackwardsFiltered.Tests.cs
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllBackwardsFiltered.Tests.cs
@@ -1,16 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Core.Services.Transport.Enumerators;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.Tests.Helpers;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Enumerators;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Tests.Helpers;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Services.Transport.Enumerators;
+namespace KurrentDB.Core.Tests.Services.Transport.Enumerators;
 
 [TestFixture]
 public partial class EnumeratorTests {
diff --git a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllForwards.Tests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllForwards.Tests.cs
similarity index 78%
rename from src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllForwards.Tests.cs
rename to src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllForwards.Tests.cs
index 1b5fd223b78..86026e4ef4c 100644
--- a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllForwards.Tests.cs
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllForwards.Tests.cs
@@ -1,15 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Core.Services.Transport.Enumerators;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.Tests.Helpers;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Enumerators;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Tests.Helpers;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Services.Transport.Enumerators;
+namespace KurrentDB.Core.Tests.Services.Transport.Enumerators;
 
 [TestFixture]
 public partial class EnumeratorTests {
diff --git a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllForwardsFiltered.Tests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllForwardsFiltered.Tests.cs
similarity index 77%
rename from src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllForwardsFiltered.Tests.cs
rename to src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllForwardsFiltered.Tests.cs
index 3545fd2e1f6..094055a98f6 100644
--- a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllForwardsFiltered.Tests.cs
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadAllForwardsFiltered.Tests.cs
@@ -1,16 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Core.Services.Transport.Enumerators;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.Tests.Helpers;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Enumerators;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Tests.Helpers;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Services.Transport.Enumerators;
+namespace KurrentDB.Core.Tests.Services.Transport.Enumerators;
 
 [TestFixture]
 public partial class EnumeratorTests {
diff --git a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadStreamBackwards.Tests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadStreamBackwards.Tests.cs
similarity index 78%
rename from src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadStreamBackwards.Tests.cs
rename to src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadStreamBackwards.Tests.cs
index 57e1152fd2d..af95f0c7aff 100644
--- a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadStreamBackwards.Tests.cs
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadStreamBackwards.Tests.cs
@@ -1,15 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Core.Services.Transport.Enumerators;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.Tests.Helpers;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Enumerators;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Tests.Helpers;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Services.Transport.Enumerators;
+namespace KurrentDB.Core.Tests.Services.Transport.Enumerators;
 
 [TestFixture]
 public partial class EnumeratorTests {
diff --git a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadStreamForwards.Tests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadStreamForwards.Tests.cs
similarity index 78%
rename from src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadStreamForwards.Tests.cs
rename to src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadStreamForwards.Tests.cs
index 218b4c73f8b..275cec26d88 100644
--- a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadStreamForwards.Tests.cs
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.ReadStreamForwards.Tests.cs
@@ -1,15 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Core.Services.Transport.Enumerators;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.Tests.Helpers;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Enumerators;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Tests.Helpers;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Services.Transport.Enumerators;
+namespace KurrentDB.Core.Tests.Services.Transport.Enumerators;
 
 [TestFixture]
 public partial class EnumeratorTests {
diff --git a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.StreamSubscription.CombinationTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.StreamSubscription.CombinationTests.cs
similarity index 96%
rename from src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.StreamSubscription.CombinationTests.cs
rename to src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.StreamSubscription.CombinationTests.cs
index 4556166d14c..e96e79a77ad 100644
--- a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.StreamSubscription.CombinationTests.cs
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.StreamSubscription.CombinationTests.cs
@@ -1,16 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Text;
 using System.Threading.Tasks;
 using EventStore.ClientAPI;
-using EventStore.Core.Data;
-using EventStore.Core.Services;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Core.Services.Transport.Enumerators;
-using EventStore.Core.Services.UserManagement;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Enumerators;
+using KurrentDB.Core.Services.UserManagement;
 using NUnit.Framework;
 using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
 
-namespace EventStore.Core.Tests.Services.Transport.Enumerators;
+namespace KurrentDB.Core.Tests.Services.Transport.Enumerators;
 
 [TestFixture]
 public partial class EnumeratorTests {
@@ -656,8 +659,8 @@ private async Task WriteEvent(string stream, string eventType, string data, stri
 			await NodeConnection.AppendToStreamAsync(stream, ExpectedVersion.Any, eventData);
 		}
 		private Task WriteEvent() => WriteEvent(_stream, "type", "{}", null);
-		private async Task SoftDelete() => await NodeConnection.DeleteStreamAsync(_stream, Data.ExpectedVersion.Any, hardDelete: false);
-		private async Task Tombstone() => await NodeConnection.DeleteStreamAsync(_stream, Data.ExpectedVersion.Any, hardDelete: true);
+		private async Task SoftDelete() => await NodeConnection.DeleteStreamAsync(_stream, KurrentDB.Core.Data.ExpectedVersion.Any, hardDelete: false);
+		private async Task Tombstone() => await NodeConnection.DeleteStreamAsync(_stream, KurrentDB.Core.Data.ExpectedVersion.Any, hardDelete: true);
 		private async Task RevokeAccessWithStreamAcl() => await WriteEvent(SystemStreams.MetastreamOf(_stream), "$metadata", @"{ ""$acl"": { ""$r"": [] } }", null);
 		private async Task RevokeAccessWithDefaultAcl() => await WriteEvent(SystemStreams.SettingsStream, "update-default-acl", @"{ ""$userStreamAcl"" : { ""$r"" : [] } }", null);
 
@@ -670,9 +673,9 @@ private Task WriteMetadata(string metadata) {
 		private Task Truncate(long tb) => WriteMetadata(@$"{{""$tb"":{tb}}}");
 		private Task MaxCount(long maxCount) => WriteMetadata(@$"{{""$maxCount"":{maxCount}}}");
 		private async Task ExpiredMaxAge() {
-			// a max age of zero doesn't do anything, so we're forced to introduce a delay of 1 second
-			await WriteMetadata(@"{""$maxAge"": 1 }");
-			await Task.Delay(TimeSpan.FromMilliseconds(1001));
+			// a max age of zero doesn't do anything, so we're forced to introduce a delay of 1 second. Make it 2 to be sure.
+			await WriteMetadata(@"{""$maxAge"": 1 }"); // seconds
+			await Task.Delay(TimeSpan.FromMilliseconds(2000));
 		}
 
 		private Task ApplyTruncation() {
@@ -815,7 +818,7 @@ private static async Task<long> ReadExpectedEvents(EnumeratorWrapper sub, long n
 						break;
 					default:
 						Assert.Fail($"Unexpected response: {response}");
-						break ;
+						break;
 				}
 			}
 
@@ -847,11 +850,21 @@ public async Task enumeration_is_correct() {
 				return;
 			}
 
-			Assert.True(await sub.GetNext() is SubscriptionConfirmation);
+			var current = await sub.GetNext();
+			Assert.True(
+				current is SubscriptionConfirmation,
+				"Case \"{0}\": Expected SubscriptionConfirmation but was {1}",
+				_testData.TestCase,
+				current.GetType().FullName);
 
 			_nextEventNumber = await ReadExpectedEvents(sub, _nextEventNumber, LastEventNumber);
 
-			Assert.True(await sub.GetNext() is CaughtUp);
+			current = await sub.GetNext();
+			Assert.True(
+				current is CaughtUp,
+				"Case \"{0}\": Expected CaughtUp but was {1}",
+				_testData.TestCase,
+				current.GetType().FullName);
 
 			var (numEventsAdded, softDeleted, hardDeleted, accessRevoked, shouldFallBehindThenCatchup) = await ApplyLiveProperties();
 
diff --git a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.StreamSubscription.Tests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.StreamSubscription.Tests.cs
similarity index 83%
rename from src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.StreamSubscription.Tests.cs
rename to src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.StreamSubscription.Tests.cs
index 892ed5041bf..ca5ce73f45d 100644
--- a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.StreamSubscription.Tests.cs
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.StreamSubscription.Tests.cs
@@ -1,17 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Core.Services.Transport.Enumerators;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.Tests.Helpers;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Enumerators;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Tests.Helpers;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Services.Transport.Enumerators;
+namespace KurrentDB.Core.Tests.Services.Transport.Enumerators;
 
 [TestFixture]
 public partial class EnumeratorTests {
diff --git a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.Tests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.Tests.cs
similarity index 81%
rename from src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.Tests.cs
rename to src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.Tests.cs
index 2180a3c508c..0e6ae5bb7ad 100644
--- a/src/EventStore.Core.Tests/Services/Transport/Enumerators/Enumerator.Tests.cs
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Enumerators/Enumerator.Tests.cs
@@ -1,12 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Services.Transport.Common;
-using EventStore.Core.Services.Transport.Enumerators;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Enumerators;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Services.Transport.Enumerators;
+namespace KurrentDB.Core.Tests.Services.Transport.Enumerators;
 
 [TestFixture]
 public partial class EnumeratorTests {
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/AnyStreamRevisionTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/AnyStreamRevisionTests.cs
new file mode 100644
index 00000000000..40cb7a5bda1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/AnyStreamRevisionTests.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Services.Transport.Grpc;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc;
+
+[TestFixture]
+public class AnyStreamRevisionTests {
+	[Test]
+	public void Equality() {
+		var sut = AnyStreamRevision.NoStream;
+		Assert.AreEqual(AnyStreamRevision.NoStream, sut);
+	}
+
+	[Test]
+	public void Inequality() {
+		var sut = AnyStreamRevision.NoStream;
+		Assert.AreNotEqual(AnyStreamRevision.Any, sut);
+	}
+
+	[Test]
+	public void EqualityOperator() {
+		var sut = AnyStreamRevision.NoStream;
+		Assert.True(AnyStreamRevision.NoStream == sut);
+	}
+
+	[Test]
+	public void InequalityOperator() {
+		var sut = AnyStreamRevision.NoStream;
+		Assert.True(AnyStreamRevision.Any != sut);
+	}
+
+	public static IEnumerable<object[]> ArgumentOutOfRangeTestCases() {
+		yield return new object[] { 0 };
+		yield return new object[] { int.MaxValue };
+		yield return new object[] { -3 };
+	}
+
+	[TestCaseSource(nameof(ArgumentOutOfRangeTestCases))]
+	public void ArgumentOutOfRange(int value) {
+		var ex = Assert.Throws<ArgumentOutOfRangeException>(() => new AnyStreamRevision(value));
+		Assert.AreEqual(nameof(value), ex.ParamName);
+	}
+
+
+	public static IEnumerable<object[]> Int64TestCases() {
+		yield return new object[] { -1L, AnyStreamRevision.NoStream };
+		yield return new object[] { -2L, AnyStreamRevision.Any };
+		yield return new object[] { -4L, AnyStreamRevision.StreamExists };
+	}
+
+	[TestCaseSource(nameof(Int64TestCases))]
+	public void FromInt64ExpectedResult(long value, AnyStreamRevision expected)
+		=> Assert.AreEqual(expected, AnyStreamRevision.FromInt64(value));
+
+	[TestCaseSource(nameof(Int64TestCases))]
+	public void ToInt64ExpectedResult(long expected, AnyStreamRevision value)
+		=> Assert.AreEqual(expected, value.ToInt64());
+
+	[Test]
+	public void ExplicitConversionExpectedResult() {
+		const int expected = 1;
+		var actual = (int)new AnyStreamRevision(expected);
+		Assert.AreEqual(expected, actual);
+	}
+
+	[Test]
+	public void ImplicitConversionExpectedResult() {
+		const int expected = 1;
+		int actual = new AnyStreamRevision(expected);
+		Assert.AreEqual(expected, actual);
+	}
+
+	public static IEnumerable<object[]> ToStringTestCases() {
+		yield return new object[] { AnyStreamRevision.Any, nameof(AnyStreamRevision.Any) };
+		yield return new object[] { AnyStreamRevision.NoStream, nameof(AnyStreamRevision.NoStream) };
+		yield return new object[] { AnyStreamRevision.StreamExists, nameof(AnyStreamRevision.StreamExists) };
+	}
+
+	[TestCaseSource(nameof(ToStringTestCases))]
+	public void ToStringExpectedResult(AnyStreamRevision sut, string expected) {
+		Assert.AreEqual(expected, sut.ToString());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/MonitoringTests/StatsTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/MonitoringTests/StatsTests.cs
new file mode 100644
index 00000000000..ecd942e9746
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/MonitoringTests/StatsTests.cs
@@ -0,0 +1,62 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Client.Monitoring;
+using Grpc.Net.Client;
+using KurrentDB.Core.Tests.Integration;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc.MonitoringTests;
+
+public class StatsTests {
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_reading_stats<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
+
+		private const int _expected = 3;
+		private const int _refreshTimePeriodInMs = 250;
+		private readonly List<StatsResp> _stats;
+
+		public when_reading_stats() {
+			_stats = new List<StatsResp>();
+		}
+
+		protected override async Task Given() {
+			var node = GetLeader();
+			await Task.WhenAll(node.AdminUserCreated, node.Started);
+
+			using var channel = GrpcChannel.ForAddress(new Uri($"https://{node.HttpEndPoint}"),
+				new GrpcChannelOptions {
+					HttpClient = new HttpClient(new SocketsHttpHandler {
+						SslOptions = {
+							RemoteCertificateValidationCallback = delegate { return true; }
+						}
+					}, true)
+				});
+			var client = new EventStore.Client.Monitoring.Monitoring.MonitoringClient(channel);
+			var request = new StatsReq {
+				RefreshTimePeriodInMs = _refreshTimePeriodInMs
+			};
+
+			using var resp = client.Stats(request);
+
+			var count = 0;
+			var cts = new CancellationTokenSource(_refreshTimePeriodInMs * _expected * 2);
+			while (count < _expected && await resp.ResponseStream.MoveNext(cts.Token)) {
+				_stats.Add(resp.ResponseStream.Current);
+				count++;
+			}
+		}
+
+		[Test]
+		public void should_receive_expected_amount_of_stats_messages() {
+			Assert.AreEqual(_expected, _stats.Count);
+		}
+
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/CreateTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/CreateTests.cs
new file mode 100644
index 00000000000..9ba5937fa42
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/CreateTests.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.Client;
+using EventStore.Client.PersistentSubscriptions;
+using Google.Protobuf;
+using KurrentDB.Core.Tests.Services.Transport.Grpc.StreamsTests;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc.PersistentSubscriptionTests;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string), false)]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), false)]
+[TestFixture(typeof(LogFormat.V2), typeof(string), true)]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), true)]
+public class CreateTests<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
+	private readonly bool _legacy;
+
+	public CreateTests(bool legacy) {
+		_legacy = legacy;
+	}
+	protected override Task Given() => Task.CompletedTask;
+
+	protected override Task When() => Task.CompletedTask;
+
+	[Test]
+	public async Task can_create_persistent_subscription() {
+		var client = new PersistentSubscriptions.PersistentSubscriptionsClient(Channel);
+
+		var settings = new CreateReq.Types.Settings {
+			CheckpointAfterMs = 10000,
+			ExtraStatistics = true,
+			MaxCheckpointCount = 20,
+			MinCheckpointCount = 10,
+			MaxRetryCount = 30,
+			MaxSubscriberCount = 40,
+			MessageTimeoutMs = 20000,
+			HistoryBufferSize = 60,
+			LiveBufferSize = 10,
+			ReadBatchSize = 50
+		};
+
+		if (_legacy) {
+#pragma warning disable 612
+			settings.NamedConsumerStrategy = CreateReq.Types.ConsumerStrategy.Pinned;
+#pragma warning restore 612
+		} else {
+			settings.ConsumerStrategy = "Pinned";
+		}
+
+		await client.CreateAsync(
+			new CreateReq {
+				Options = new CreateReq.Types.Options {
+					GroupName = "group",
+					Stream = new CreateReq.Types.StreamOptions {
+						Start = new Empty(),
+						StreamIdentifier = new StreamIdentifier {
+							StreamName = ByteString.CopyFromUtf8("stream")
+						}
+					},
+					Settings = settings
+				}
+			},
+			GetCallOptions(AdminCredentials));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/GetInfoTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/GetInfoTests.cs
new file mode 100644
index 00000000000..38922d52124
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/GetInfoTests.cs
@@ -0,0 +1,432 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.Client;
+using EventStore.Client.PersistentSubscriptions;
+using EventStore.Client.Streams;
+using Google.Protobuf;
+using Grpc.Core;
+using KurrentDB.Core.Tests.Services.Transport.Grpc.StreamsTests;
+using NUnit.Framework;
+using ReadReq = EventStore.Client.PersistentSubscriptions.ReadReq;
+using ReadResp = EventStore.Client.PersistentSubscriptions.ReadResp;
+using StreamsReadReq = EventStore.Client.Streams.ReadReq;
+using StreamsReadResp = EventStore.Client.Streams.ReadResp;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc.PersistentSubscriptionTests;
+
+public class GetInfoTests {
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class
+		when_getting_info_for_persistent_subscription_group_on_stream<TLogFormat, TStreamId>
+			: GrpcSpecification<TLogFormat, TStreamId> {
+		private string _groupName = "test-group";
+		private string _streamName = "test-stream";
+		private SubscriptionInfo _actualSubscriptionInfo;
+		private SubscriptionInfo _expectedSubscriptionInfo;
+		private PersistentSubscriptions.PersistentSubscriptionsClient _persistentSubscriptionsClient;
+
+		protected override async Task Given() {
+			_persistentSubscriptionsClient = new PersistentSubscriptions.PersistentSubscriptionsClient(Channel);
+
+			var settings = WithoutExtraStatistics(TestPersistentSubscriptionSettings);
+
+			await _persistentSubscriptionsClient.CreateAsync(new CreateReq {
+				Options = new CreateReq.Types.Options {
+					GroupName = _groupName,
+					Stream = new CreateReq.Types.StreamOptions {
+						Start = new Empty(),
+						StreamIdentifier = new StreamIdentifier {
+							StreamName = ByteString.CopyFromUtf8(_streamName)
+						}
+					},
+					Settings = settings
+				}
+			}, GetCallOptions(AdminCredentials));
+
+			// create a connection to the persistent subscription
+			var call = _persistentSubscriptionsClient.Read(GetCallOptions(AdminCredentials));
+			await call.RequestStream.WriteAsync(new ReadReq {
+				Options = new ReadReq.Types.Options {
+					GroupName = _groupName,
+					StreamIdentifier = new StreamIdentifier {
+						StreamName = ByteString.CopyFromUtf8(_streamName)
+					},
+					UuidOption = new ReadReq.Types.Options.Types.UUIDOption { Structured = new Empty() },
+					BufferSize = 10
+				}
+			});
+
+			await call.ResponseStream.MoveNext();
+
+			Assert.IsTrue(call.ResponseStream.Current.ContentCase == ReadResp.ContentOneofCase.SubscriptionConfirmation);
+
+			var expectedConnection = new SubscriptionInfo.Types.ConnectionInfo() {
+				Username = "admin",
+				AvailableSlots = 10,
+				ConnectionName = "\u003cunknown\u003e"
+			};
+			_expectedSubscriptionInfo = GetSubscriptionInfoFromSettings(settings,
+				_groupName, _streamName, "0", string.Empty, new[] { expectedConnection });
+		}
+
+		private CreateReq.Types.Settings WithoutExtraStatistics(CreateReq.Types.Settings settings) {
+			settings.ExtraStatistics = false;
+			return settings;
+		}
+
+		protected override async Task When() {
+			await WaitForSubscriptionsToBeLive(_persistentSubscriptionsClient, GetCallOptions(AdminCredentials));
+
+			var resp = await _persistentSubscriptionsClient.GetInfoAsync(new GetInfoReq {
+				Options = new GetInfoReq.Types.Options {
+					GroupName = _groupName,
+					StreamIdentifier = new StreamIdentifier {
+						StreamName = ByteString.CopyFromUtf8(_streamName)
+					}
+				}
+			}, GetCallOptions(AdminCredentials));
+			_actualSubscriptionInfo = resp.SubscriptionInfo;
+		}
+
+		[Test]
+		public void should_receive_the_correct_stats() {
+			Assert.AreEqual(_expectedSubscriptionInfo, _actualSubscriptionInfo);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class
+		when_listing_persistent_subscriptions_on_stream<TLogFormat, TStreamId>
+			: GrpcSpecification<TLogFormat, TStreamId> {
+		private string _streamName = "test-stream";
+		private List<SubscriptionInfo> _actualSubscriptionInfo;
+		private List<SubscriptionInfo> _expectedSubscriptionInfo = new();
+		private PersistentSubscriptions.PersistentSubscriptionsClient _persistentSubscriptionsClient;
+
+		protected override async Task Given() {
+			_persistentSubscriptionsClient = new PersistentSubscriptions.PersistentSubscriptionsClient(Channel);
+
+			var groupNames = new[] { "groupA", "groupB", "groupC" };
+			foreach (var group in groupNames) {
+				await _persistentSubscriptionsClient.CreateAsync(new CreateReq {
+					Options = new CreateReq.Types.Options {
+						GroupName = group,
+						Stream = new CreateReq.Types.StreamOptions {
+							Start = new Empty(),
+							StreamIdentifier = new StreamIdentifier {
+								StreamName = ByteString.CopyFromUtf8(_streamName)
+							}
+						},
+						Settings = TestPersistentSubscriptionSettings
+					}
+				}, GetCallOptions(AdminCredentials));
+				_expectedSubscriptionInfo.Add(GetSubscriptionInfoFromSettings(
+					TestPersistentSubscriptionSettings, group, _streamName, "0", string.Empty));
+			}
+		}
+
+		protected override async Task When() {
+			await WaitForSubscriptionsToBeLive(_persistentSubscriptionsClient, GetCallOptions(AdminCredentials));
+
+			ListResp resp = await _persistentSubscriptionsClient.ListAsync(new ListReq {
+				Options = new ListReq.Types.Options {
+					ListForStream = new ListReq.Types.StreamOption {
+						Stream = new StreamIdentifier {
+							StreamName = ByteString.CopyFromUtf8(_streamName)
+						}
+					}
+				}
+			}, GetCallOptions(AdminCredentials));
+			_actualSubscriptionInfo = resp.Subscriptions.ToList();
+		}
+
+		[Test]
+		public void should_receive_the_correct_stats() {
+			CollectionAssert.AreEquivalent(_expectedSubscriptionInfo, _actualSubscriptionInfo);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class
+		when_listing_persistent_subscriptions_on_all_stream<TLogFormat, TStreamId>
+			: GrpcSpecification<TLogFormat, TStreamId> {
+		private List<SubscriptionInfo> _actualSubscriptionInfo;
+		private List<SubscriptionInfo> _expectedSubscriptionInfo = new();
+		private PersistentSubscriptions.PersistentSubscriptionsClient _persistentSubscriptionsClient;
+
+		protected override async Task Given() {
+			_persistentSubscriptionsClient = new PersistentSubscriptions.PersistentSubscriptionsClient(Channel);
+
+			var groupNames = new[] { "groupA", "groupB", "groupC" };
+			foreach (var group in groupNames) {
+				await _persistentSubscriptionsClient.CreateAsync(new CreateReq {
+					Options = new CreateReq.Types.Options {
+						GroupName = group,
+						All = new CreateReq.Types.AllOptions {
+							Start = new Empty()
+						},
+						Settings = TestPersistentSubscriptionSettings
+					}
+				}, GetCallOptions(AdminCredentials));
+			}
+
+			var events = await GetAllEvents(StreamsClient, GetCallOptions(AdminCredentials));
+
+			var lastPosition = (long)events.Last().Event.CommitPosition;
+			_expectedSubscriptionInfo = groupNames.Select(x =>
+				GetSubscriptionInfoFromSettings(TestPersistentSubscriptionSettings, x, "$all", "C:0/P:0",
+					$"C:{lastPosition}/P:{lastPosition}")).ToList();
+		}
+
+		protected override async Task When() {
+			await WaitForSubscriptionsToBeLive(_persistentSubscriptionsClient, GetCallOptions(AdminCredentials));
+
+			// Get the subscription info
+			ListResp resp = await _persistentSubscriptionsClient.ListAsync(new ListReq {
+				Options = new ListReq.Types.Options {
+					ListForStream = new ListReq.Types.StreamOption {
+						All = new Empty()
+					}
+				}
+			}, GetCallOptions(AdminCredentials));
+			_actualSubscriptionInfo = resp.Subscriptions.ToList();
+		}
+
+		[Test]
+		public void should_receive_the_correct_stats() {
+			// Set the buffer counts to 0 to make comparison easier
+			_actualSubscriptionInfo.ForEach(x => x.LiveBufferCount = 0);
+			_actualSubscriptionInfo.ForEach(x => x.ReadBufferCount = 0);
+			CollectionAssert.AreEquivalent(_expectedSubscriptionInfo, _actualSubscriptionInfo);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class
+		when_listing_all_persistent_subscriptions<TLogFormat, TStreamId>
+			: GrpcSpecification<TLogFormat, TStreamId> {
+		private List<SubscriptionInfo> _actualSubscriptionInfo;
+		private List<SubscriptionInfo> _expectedSubscriptionInfo = new();
+		private PersistentSubscriptions.PersistentSubscriptionsClient _persistentSubscriptionsClient;
+
+		protected override async Task Given() {
+			_persistentSubscriptionsClient = new PersistentSubscriptions.PersistentSubscriptionsClient(Channel);
+
+			var subscriptionNames = new Dictionary<string, string[]> {
+				{"streamA", new[] {"groupA"}},
+				{"streamB", new[] {"groupB-1", "groupB-2"}},
+				{"streamC", new[] {"groupC"}},
+			};
+			foreach (var (stream, groupNames) in subscriptionNames) {
+				foreach (var group in groupNames) {
+					await _persistentSubscriptionsClient.CreateAsync(new CreateReq {
+						Options = new CreateReq.Types.Options {
+							GroupName = group,
+							Stream = new CreateReq.Types.StreamOptions {
+								Start = new Empty(),
+								StreamIdentifier = new StreamIdentifier {
+									StreamName = ByteString.CopyFromUtf8(stream)
+								}
+							},
+							Settings = TestPersistentSubscriptionSettings
+						}
+					}, GetCallOptions(AdminCredentials));
+					_expectedSubscriptionInfo.Add(GetSubscriptionInfoFromSettings(
+						TestPersistentSubscriptionSettings, group, stream, "0", string.Empty));
+				}
+			}
+			await _persistentSubscriptionsClient.CreateAsync(new CreateReq {
+				Options = new CreateReq.Types.Options {
+					GroupName = "groupD",
+					All = new CreateReq.Types.AllOptions {
+						Start = new Empty()
+					},
+					Settings = TestPersistentSubscriptionSettings
+				}
+			}, GetCallOptions(AdminCredentials));
+
+			var events = await GetAllEvents(StreamsClient, GetCallOptions(AdminCredentials));
+
+			var lastPosition = (long)events.Last().Event.CommitPosition;
+			_expectedSubscriptionInfo.Add(GetSubscriptionInfoFromSettings(
+				TestPersistentSubscriptionSettings, "groupD", "$all", "C:0/P:0",
+				$"C:{lastPosition}/P:{lastPosition}"));
+		}
+
+		protected override async Task When() {
+			await WaitForSubscriptionsToBeLive(_persistentSubscriptionsClient, GetCallOptions(AdminCredentials));
+
+			var resp = await _persistentSubscriptionsClient.ListAsync(new ListReq {
+				Options = new ListReq.Types.Options {
+					ListAllSubscriptions = new Empty()
+				}
+			}, GetCallOptions(AdminCredentials));
+
+			_actualSubscriptionInfo = resp.Subscriptions.ToList();
+		}
+
+		[Test]
+		public void should_receive_the_correct_stats() {
+			// Set the buffer counts to 0 to make comparison easier
+			_actualSubscriptionInfo.ForEach(x => x.LiveBufferCount = 0);
+			_actualSubscriptionInfo.ForEach(x => x.ReadBufferCount = 0);
+			CollectionAssert.AreEquivalent(_expectedSubscriptionInfo, _actualSubscriptionInfo);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class
+		when_getting_info_for_persistent_subscription_group_on_all<TLogFormat, TStreamId>
+			: GrpcSpecification<TLogFormat, TStreamId> {
+		private string _groupName = "test-group";
+		private SubscriptionInfo _actualSubscriptionInfo;
+		private SubscriptionInfo _expectedSubscriptionInfo;
+		private PersistentSubscriptions.PersistentSubscriptionsClient _persistentSubscriptionsClient;
+
+		protected override async Task Given() {
+			_persistentSubscriptionsClient = new PersistentSubscriptions.PersistentSubscriptionsClient(Channel);
+
+			await _persistentSubscriptionsClient.CreateAsync(new CreateReq {
+				Options = new CreateReq.Types.Options {
+					GroupName = _groupName,
+					All = new CreateReq.Types.AllOptions {
+						Start = new Empty()
+					},
+					Settings = TestPersistentSubscriptionSettings
+				}
+			}, GetCallOptions(AdminCredentials));
+
+			var events = await GetAllEvents(StreamsClient, GetCallOptions(AdminCredentials));
+
+			var lastPosition = (long)events.Last().Event.CommitPosition;
+			_expectedSubscriptionInfo =
+				GetSubscriptionInfoFromSettings(TestPersistentSubscriptionSettings, _groupName,
+					"$all", "C:0/P:0", $"C:{lastPosition}/P:{lastPosition}");
+		}
+
+		protected override async Task When() {
+			await WaitForSubscriptionsToBeLive(_persistentSubscriptionsClient, GetCallOptions(AdminCredentials));
+
+			var resp = await _persistentSubscriptionsClient.GetInfoAsync(new GetInfoReq {
+				Options = new GetInfoReq.Types.Options {
+					GroupName = _groupName,
+					All = new Empty()
+				}
+			}, GetCallOptions(AdminCredentials));
+			_actualSubscriptionInfo = resp.SubscriptionInfo;
+		}
+
+		[Test]
+		public void should_receive_the_correct_stats() {
+			// Set the buffer counts to 0 to make comparison easier
+			_actualSubscriptionInfo.LiveBufferCount = 0;
+			_actualSubscriptionInfo.ReadBufferCount = 0;
+			Assert.AreEqual(_expectedSubscriptionInfo, _actualSubscriptionInfo);
+		}
+	}
+
+	private static async Task<List<StreamsReadResp>> GetAllEvents(Streams.StreamsClient client, CallOptions callOptions) {
+		var call = client.Read(new() {
+			Options = new() {
+				ReadDirection = StreamsReadReq.Types.Options.Types.ReadDirection.Forwards,
+				Count = 100,
+				NoFilter = new(),
+				UuidOption = new() { Structured = new() },
+				All = new() {
+					Start = new()
+				}
+			}
+		}, callOptions);
+
+		var events = new List<StreamsReadResp>();
+		await foreach (var evnt in call.ResponseStream.ReadAllAsync()) {
+			if (evnt.ContentCase is StreamsReadResp.ContentOneofCase.Event) {
+				events.Add(evnt);
+
+			}
+		}
+		return events;
+	}
+
+	private static CreateReq.Types.Settings TestPersistentSubscriptionSettings => new CreateReq.Types.Settings {
+		CheckpointAfterMs = 10000,
+		ExtraStatistics = true,
+		MaxCheckpointCount = 20,
+		MinCheckpointCount = 10,
+		MaxRetryCount = 30,
+		MaxSubscriberCount = 40,
+		MessageTimeoutMs = 20000,
+		HistoryBufferSize = 60,
+		LiveBufferSize = 10,
+		ConsumerStrategy = "Pinned",
+		ReadBatchSize = 50
+	};
+
+	private static SubscriptionInfo GetSubscriptionInfoFromSettings(
+		CreateReq.Types.Settings settings, string groupName, string streamName, string startFrom,
+		string lastKnownEvent, SubscriptionInfo.Types.ConnectionInfo[] connections = null) {
+		var info = new SubscriptionInfo() {
+			EventSource = streamName,
+			GroupName = groupName,
+			Status = "Live",
+			AveragePerSecond = 0,
+			TotalItems = 0,
+			CountSinceLastMeasurement = 0,
+			LastCheckpointedEventPosition = string.Empty,
+			LastKnownEventPosition = lastKnownEvent,
+			ResolveLinkTos = settings.ResolveLinks,
+			StartFrom = startFrom,
+			MessageTimeoutMilliseconds = settings.MessageTimeoutMs,
+			ExtraStatistics = settings.ExtraStatistics,
+			MaxRetryCount = settings.MaxRetryCount,
+			LiveBufferSize = settings.LiveBufferSize,
+			BufferSize = settings.HistoryBufferSize,
+			ReadBatchSize = settings.ReadBatchSize,
+			CheckPointAfterMilliseconds = settings.CheckpointAfterMs,
+			MinCheckPointCount = settings.MinCheckpointCount,
+			MaxCheckPointCount = settings.MaxCheckpointCount,
+			ReadBufferCount = 0,
+			LiveBufferCount = 0,
+			RetryBufferCount = 0,
+			TotalInFlightMessages = 0,
+			OutstandingMessagesCount = 0,
+			NamedConsumerStrategy = "Pinned",
+			MaxSubscriberCount = settings.MaxSubscriberCount,
+			ParkedMessageCount = 0
+		};
+
+		if (connections != null) {
+			info.Connections.AddRange(connections);
+		}
+
+		return info;
+	}
+
+	private static async Task WaitForSubscriptionsToBeLive(PersistentSubscriptions.PersistentSubscriptionsClient client, CallOptions callOptions) {
+		var resp = await GetSubscriptions();
+
+		for (int i = 0; resp.Subscriptions.Any(s => s.Status != "Live"); i++) {
+			Assert.AreNotEqual(5, i, "Reached too many retries to get all subscriptions live!");
+
+			await Task.Delay(500);
+			resp = await GetSubscriptions();
+		}
+
+		async Task<ListResp> GetSubscriptions() {
+			return await client.ListAsync(new ListReq {
+				Options = new ListReq.Types.Options {
+					ListAllSubscriptions = new Empty()
+				}
+			}, callOptions);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/ReplayParkedTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/ReplayParkedTests.cs
new file mode 100644
index 00000000000..5f4f3e6dd33
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/ReplayParkedTests.cs
@@ -0,0 +1,352 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.Client;
+using EventStore.Client.PersistentSubscriptions;
+using EventStore.Client.Streams;
+using Google.Protobuf;
+using Grpc.Core;
+using KurrentDB.Core.Services.Transport.Grpc;
+using KurrentDB.Core.Tests.Services.Transport.Grpc.StreamsTests;
+using NUnit.Framework;
+using ReadReq = EventStore.Client.PersistentSubscriptions.ReadReq;
+using ReadResp = EventStore.Client.PersistentSubscriptions.ReadResp;
+using StreamsReadReq = EventStore.Client.Streams.ReadReq;
+using StreamsReadResp = EventStore.Client.Streams.ReadResp;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc.PersistentSubscriptionTests;
+
+public class ReplayParkedTests {
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class
+		when_replaying_parked_messages_with_no_limit_for_existing_subscription<TLogFormat, TStreamId>
+			: GrpcSpecification<TLogFormat, TStreamId> {
+		private string _groupName = "test-group";
+		private string _streamName = "test-stream";
+		private int _eventCount = 10;
+		private PersistentSubscriptions.PersistentSubscriptionsClient _persistentSubscriptionsClient;
+		private AsyncDuplexStreamingCall<ReadReq, ReadResp> _subscriptionStream;
+		private List<ulong> _expectedEventVersions = new List<ulong>();
+		private List<ulong> _actualEventVersions = new List<ulong>();
+
+		protected override async Task Given() {
+			_persistentSubscriptionsClient = new PersistentSubscriptions.PersistentSubscriptionsClient(Channel);
+
+			await CreateTestPersistentSubscription(_persistentSubscriptionsClient, _streamName, _groupName, GetCallOptions(AdminCredentials));
+
+			_subscriptionStream = await SubscribeToPersistentSubscription(
+				_persistentSubscriptionsClient, _groupName, _streamName, GetCallOptions(AdminCredentials));
+
+			// Write events to the subscription
+			var writeRes = await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) }
+				},
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(_eventCount) },
+				CorrelationId = Uuid.NewUuid().ToDto(),
+			});
+			Assert.NotNull(writeRes.Success);
+
+			// Park all of the messages
+			for (var i = 0; i < _eventCount; i++) {
+				Assert.True(await _subscriptionStream.ResponseStream.MoveNext());
+				Assert.AreEqual(ReadResp.ContentOneofCase.Event, _subscriptionStream.ResponseStream.Current.ContentCase);
+				var evnt = _subscriptionStream.ResponseStream.Current.Event;
+				await _subscriptionStream.RequestStream.WriteAsync(new ReadReq {
+					Nack = new ReadReq.Types.Nack {
+						Action = ReadReq.Types.Nack.Types.Action.Park,
+						Ids = {
+						evnt.Event.Id
+					},
+						Reason = "testing"
+					}
+				});
+			}
+
+			// Check that the events were parked
+			await WaitForEventsInStream(
+				StreamsClient, $"$persistentsubscription-{_streamName}::{_groupName}-parked", _eventCount, GetCallOptions(AdminCredentials));
+		}
+
+		protected override async Task When() {
+			await _persistentSubscriptionsClient.ReplayParkedAsync(new ReplayParkedReq {
+				Options = new ReplayParkedReq.Types.Options {
+					GroupName = _groupName,
+					StreamIdentifier = new StreamIdentifier {
+						StreamName = ByteString.CopyFromUtf8(_streamName)
+					},
+					NoLimit = new()
+				}
+			}, GetCallOptions(AdminCredentials));
+			for (var i = 0; i < _eventCount; i++) {
+				Assert.True(await _subscriptionStream.ResponseStream.MoveNext());
+				var curr = _subscriptionStream.ResponseStream.Current;
+				Assert.AreEqual(ReadResp.ContentOneofCase.Event, curr.ContentCase);
+				_actualEventVersions.Add(curr.Event.Event.StreamRevision);
+
+				// Ack the event otherwise the test can throw an error
+				await _subscriptionStream.RequestStream.WriteAsync(new ReadReq {
+					Ack = new ReadReq.Types.Ack {
+						Ids = {
+							curr.Event.Event.Id
+						},
+					}
+				});
+			}
+		}
+
+		[Test]
+		public void should_receive_replayed_messages() {
+			_expectedEventVersions = Enumerable.Range(0, _eventCount).Select(x => (ulong)x).ToList();
+			CollectionAssert.AreEqual(_expectedEventVersions, _actualEventVersions);
+		}
+
+		[TearDown]
+		public void Teardown() {
+			_subscriptionStream.Dispose();
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class
+		when_replaying_parked_messages_with_a_replay_limit_for_existing_subscription<TLogFormat, TStreamId>
+			: GrpcSpecification<TLogFormat, TStreamId> {
+		private string _groupName = "test-group";
+		private string _streamName = "test-stream";
+		private int _eventCount = 10;
+		private PersistentSubscriptions.PersistentSubscriptionsClient _persistentSubscriptionsClient;
+		private AsyncDuplexStreamingCall<ReadReq, ReadResp> _subscriptionStream;
+		private List<ulong> _expectedEventVersions = new List<ulong>();
+		private List<ulong> _actualEventVersions = new List<ulong>();
+
+		protected override async Task Given() {
+			_persistentSubscriptionsClient = new PersistentSubscriptions.PersistentSubscriptionsClient(Channel);
+
+			await CreateTestPersistentSubscription(_persistentSubscriptionsClient, _streamName, _groupName, GetCallOptions(AdminCredentials));
+
+			_subscriptionStream = await SubscribeToPersistentSubscription(
+				_persistentSubscriptionsClient, _groupName, _streamName, GetCallOptions(AdminCredentials));
+
+			// Write events to the subscription
+			var writeRes = await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) }
+				},
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(_eventCount) },
+				CorrelationId = Uuid.NewUuid().ToDto(),
+			});
+			Assert.NotNull(writeRes.Success);
+
+			// Park all of the messages
+			for (var i = 0; i < _eventCount; i++) {
+				Assert.True(await _subscriptionStream.ResponseStream.MoveNext());
+				Assert.AreEqual(ReadResp.ContentOneofCase.Event, _subscriptionStream.ResponseStream.Current.ContentCase);
+				var evnt = _subscriptionStream.ResponseStream.Current.Event;
+				//_allEventIds.Add(Uuid.FromDto(evnt.Event.Id));
+				await _subscriptionStream.RequestStream.WriteAsync(new ReadReq {
+					Nack = new ReadReq.Types.Nack {
+						Action = ReadReq.Types.Nack.Types.Action.Park,
+						Ids = {
+						evnt.Event.Id
+					},
+						Reason = "testing"
+					}
+				});
+			}
+
+			// Check that the events were parked
+			await WaitForEventsInStream(
+				StreamsClient, $"$persistentsubscription-{_streamName}::{_groupName}-parked", _eventCount, GetCallOptions(AdminCredentials));
+		}
+
+		protected override async Task When() {
+			await _persistentSubscriptionsClient.ReplayParkedAsync(new ReplayParkedReq {
+				Options = new ReplayParkedReq.Types.Options {
+					GroupName = _groupName,
+					StreamIdentifier = new StreamIdentifier {
+						StreamName = ByteString.CopyFromUtf8(_streamName)
+					},
+					StopAt = 1
+				}
+			}, GetCallOptions(AdminCredentials));
+
+			Assert.True(await _subscriptionStream.ResponseStream.MoveNext());
+			var evnt = _subscriptionStream.ResponseStream.Current.Event.Event;
+			_actualEventVersions.Add(evnt.StreamRevision);
+			// Ack the event otherwise the test can throw an error
+			await _subscriptionStream.RequestStream.WriteAsync(new ReadReq {
+				Ack = new ReadReq.Types.Ack {
+					Ids = {
+						evnt.Id
+					},
+				}
+			});
+
+			// Write one more event so we can be sure the other parked messages aren't being replayed
+			var writeRes = await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) }
+				},
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(1) },
+				CorrelationId = Uuid.NewUuid().ToDto(),
+			});
+			Assert.NotNull(writeRes.Success);
+
+			Assert.True(await _subscriptionStream.ResponseStream.MoveNext());
+			evnt = _subscriptionStream.ResponseStream.Current.Event.Event;
+			_actualEventVersions.Add(evnt.StreamRevision);
+
+			// Ack the event otherwise the test can throw an error
+			await _subscriptionStream.RequestStream.WriteAsync(new ReadReq {
+				Ack = new ReadReq.Types.Ack {
+					Ids = {
+						evnt.Id
+					},
+				}
+			});
+		}
+
+		[Test]
+		public void should_receive_one_replayed_message_and_new_message() {
+			_expectedEventVersions = new List<ulong> { 0, 10 };
+			CollectionAssert.AreEqual(_expectedEventVersions, _actualEventVersions);
+		}
+
+		[TearDown]
+		public void Teardown() {
+			_subscriptionStream.Dispose();
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class
+		when_replaying_parked_messages_for_non_existent_subscription<TLogFormat, TStreamId>
+			: GrpcSpecification<TLogFormat, TStreamId> {
+		private string _groupName = "test-group";
+		private string _streamName = "test-stream";
+		private PersistentSubscriptions.PersistentSubscriptionsClient _persistentSubscriptionsClient;
+		private Exception _exception;
+
+		protected override Task Given() {
+			_persistentSubscriptionsClient = new PersistentSubscriptions.PersistentSubscriptionsClient(Channel);
+			return Task.CompletedTask;
+		}
+
+		protected override async Task When() {
+			try {
+				await _persistentSubscriptionsClient.ReplayParkedAsync(new ReplayParkedReq {
+					Options = new ReplayParkedReq.Types.Options {
+						GroupName = _groupName,
+						StreamIdentifier = new StreamIdentifier {
+							StreamName = ByteString.CopyFromUtf8(_streamName)
+						},
+						NoLimit = new()
+					}
+				}, GetCallOptions(AdminCredentials));
+			} catch (Exception e) {
+				_exception = e;
+			}
+		}
+
+		[Test]
+		public void should_receive_not_found_error() {
+			Assert.IsInstanceOf<RpcException>(_exception);
+			Assert.AreEqual(StatusCode.NotFound, ((RpcException)_exception).Status.StatusCode);
+		}
+	}
+
+	private static async Task<AsyncDuplexStreamingCall<ReadReq, ReadResp>> SubscribeToPersistentSubscription(
+		PersistentSubscriptions.PersistentSubscriptionsClient client, string groupName, string streamName, CallOptions callOptions) {
+		var call = client.Read(callOptions);
+
+		await call.RequestStream.WriteAsync(new ReadReq {
+			Options = new ReadReq.Types.Options {
+				GroupName = groupName,
+				StreamIdentifier = new StreamIdentifier {
+					StreamName = ByteString.CopyFromUtf8(streamName)
+				},
+				BufferSize = 10,
+				UuidOption = new ReadReq.Types.Options.Types.UUIDOption {
+					Structured = new Empty()
+				}
+			}
+		});
+		if (!await call.ResponseStream.MoveNext() ||
+			call.ResponseStream.Current.ContentCase != ReadResp.ContentOneofCase.SubscriptionConfirmation) {
+			throw new InvalidOperationException();
+		}
+
+		return call;
+	}
+
+	private static async Task<StreamsReadResp[]> WaitForEventsInStream(
+		Streams.StreamsClient streamsClient, string streamName, int count, CallOptions callOptions) {
+		using var call = streamsClient.Read(new() {
+			Options = new() {
+				Subscription = new(),
+				NoFilter = new(),
+				ReadDirection = StreamsReadReq.Types.Options.Types.ReadDirection.Forwards,
+				UuidOption = new() { Structured = new() },
+				Stream = new() {
+					StreamIdentifier = new() {
+						StreamName = ByteString.CopyFromUtf8(streamName)
+					},
+					Start = new()
+				}
+			}
+		}, callOptions);
+
+		var events = new List<StreamsReadResp>();
+		await foreach (var evnt in call.ResponseStream.ReadAllAsync()) {
+			if (evnt.ContentCase is StreamsReadResp.ContentOneofCase.Event) {
+				events.Add(evnt);
+				if (events.Count >= count)
+					break;
+			}
+		}
+		return events.ToArray();
+	}
+
+	private static async Task CreateTestPersistentSubscription(
+		PersistentSubscriptions.PersistentSubscriptionsClient client, string streamName, string groupName, CallOptions callOptions) {
+		var settings = new CreateReq.Types.Settings {
+			CheckpointAfterMs = 10000,
+			ExtraStatistics = true,
+			MaxCheckpointCount = 20,
+			MinCheckpointCount = 10,
+			MaxRetryCount = 30,
+			MaxSubscriberCount = 40,
+			MessageTimeoutMs = 20000,
+			HistoryBufferSize = 60,
+			LiveBufferSize = 10,
+			ConsumerStrategy = "Pinned",
+			ReadBatchSize = 50
+		};
+
+		await client.CreateAsync(new CreateReq {
+			Options = new CreateReq.Types.Options {
+				GroupName = groupName,
+				Stream = new CreateReq.Types.StreamOptions {
+					Start = new Empty(),
+					StreamIdentifier = new StreamIdentifier {
+						StreamName = ByteString.CopyFromUtf8(streamName)
+					}
+				},
+				Settings = settings
+			}
+		}, callOptions);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/RestartSubsystemTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/RestartSubsystemTests.cs
new file mode 100644
index 00000000000..8462418dbaa
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/PersistentSubscriptionTests/RestartSubsystemTests.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.Client;
+using EventStore.Client.PersistentSubscriptions;
+using KurrentDB.Core.Tests.Services.Transport.Grpc.StreamsTests;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc.PersistentSubscriptionTests;
+
+internal class RestartSubsystemTests {
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class
+		when_restarting_the_persistent_subscription_subsystem<TLogFormat, TStreamId>
+			: GrpcSpecification<TLogFormat, TStreamId> {
+		private PersistentSubscriptions.PersistentSubscriptionsClient _persistentSubscriptionsClient;
+		private Exception _exception;
+
+		protected override Task Given() {
+			_persistentSubscriptionsClient = new PersistentSubscriptions.PersistentSubscriptionsClient(Channel);
+			return Task.CompletedTask;
+		}
+
+		protected override async Task When() {
+			try {
+				await _persistentSubscriptionsClient.RestartSubsystemAsync(new Empty(), GetCallOptions(AdminCredentials));
+			} catch (Exception e) {
+				_exception = e;
+			}
+		}
+
+		[Test]
+		public void should_not_throw_an_exception() {
+			Assert.IsNull(_exception);
+		}
+	}
+
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/PositionTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/PositionTests.cs
new file mode 100644
index 00000000000..895d99409b7
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/PositionTests.cs
@@ -0,0 +1,94 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Services.Transport.Common;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc;
+
+public class PositionTests {
+	[Test]
+	public void Equality() {
+		var sut = new Position(6, 5);
+
+		Assert.AreEqual(new Position(6, 5), sut);
+	}
+
+	[Test]
+	public void Inequality() {
+		var sut = new Position(6, 5);
+
+		Assert.AreNotEqual(new Position(7, 6), sut);
+	}
+
+	[Test]
+	public void EqualityOperator() {
+		var sut = new Position(6, 5);
+
+		Assert.True(new Position(6, 5) == sut);
+	}
+
+	[Test]
+	public void InequalityOperator() {
+		var sut = new Position(6, 5);
+
+		Assert.True(new Position(7, 6) != sut);
+	}
+
+	public static IEnumerable<object[]> ArgumentOutOfRangeTestCases() {
+		const string commitPosition = nameof(commitPosition);
+		const string preparePosition = nameof(preparePosition);
+
+		yield return new object[] { 5UL, 6UL, commitPosition };
+		yield return new object[] { ulong.MaxValue - 1, 6UL, commitPosition };
+		yield return new object[] { ulong.MaxValue, ulong.MaxValue - 1, preparePosition };
+		yield return new object[] { (ulong)long.MaxValue + 1, (ulong)long.MaxValue, commitPosition };
+	}
+
+	[TestCaseSource(nameof(ArgumentOutOfRangeTestCases))]
+	public void ArgumentOutOfRange(ulong commitPosition, ulong preparePosition, string name) {
+		var ex = Assert.Throws<ArgumentOutOfRangeException>(() => new Position(commitPosition, preparePosition));
+		Assert.AreEqual(name, ex.ParamName);
+	}
+
+	public static IEnumerable<object[]> GreaterThanTestCases() {
+		yield return new object[] { new Position(6, 6), new Position(6, 5) };
+		yield return new object[] { Position.End, new Position(ulong.MaxValue, 0), };
+	}
+
+	[TestCaseSource(nameof(GreaterThanTestCases))]
+	public void GreaterThan(Position left, Position right) => Assert.True(left > right);
+
+	public static IEnumerable<object[]> GreaterThanOrEqualToTestCases()
+		=> GreaterThanTestCases().Concat(new[] { new object[] { Position.Start, Position.Start } });
+
+	[TestCaseSource(nameof(GreaterThanOrEqualToTestCases))]
+	public void GreaterThanOrEqualTo(Position left, Position right) => Assert.True(left >= right);
+
+	public static IEnumerable<object[]> LessThanTestCases() {
+		yield return new object[] { new Position(6, 5), new Position(6, 6) };
+		yield return new object[] { new Position(ulong.MaxValue, 0), Position.End, };
+	}
+
+	[TestCaseSource(nameof(LessThanTestCases))]
+	public void LessThan(Position left, Position right) => Assert.True(left < right);
+
+	public static IEnumerable<object[]> LessThanOrEqualToTestCases()
+		=> LessThanTestCases().Concat(new[] { new object[] { Position.End, Position.End } });
+
+	[TestCaseSource(nameof(LessThanOrEqualToTestCases))]
+	public void LessThanOrEqualTo(Position left, Position right) => Assert.True(left <= right);
+
+	public static IEnumerable<object[]> CompareToTestCases() {
+		yield return new object[] { new Position(6, 5), new Position(6, 6), -1 };
+		yield return new object[] { new Position(6, 6), new Position(6, 5), 1 };
+		yield return new object[] { new Position(6, 6), new Position(6, 6), 0 };
+	}
+
+	[TestCaseSource(nameof(CompareToTestCases))]
+	public void CompareTo(Position left, Position right, int expected) =>
+		Assert.AreEqual(expected, left.CompareTo(right));
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/ServerFeaturesTests/ServerFeaturesTest.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/ServerFeaturesTests/ServerFeaturesTest.cs
new file mode 100644
index 00000000000..b9482dd2809
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/ServerFeaturesTests/ServerFeaturesTest.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using EventStore.Client.Gossip;
+using EventStore.Client.Operations;
+using EventStore.Client.PersistentSubscriptions;
+using EventStore.Client.ServerFeatures;
+using EventStore.Client.Streams;
+using EventStore.Client.Users;
+using Google.Protobuf.Reflection;
+using Grpc.Net.Client;
+using Kurrent.Client.Redaction;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Tests.Integration;
+using NUnit.Framework;
+using Empty = EventStore.Client.Empty;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc.ServerFeaturesTests;
+
+public class ServerFeaturesTest {
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class
+		when_getting_supported_methods<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
+
+		private List<SupportedMethod> _supportedEndPoints = new();
+		private List<SupportedMethod> _expectedEndPoints = new();
+		private string _expectedServerVersion;
+		private string _serverVersion;
+
+		protected override async Task Given() {
+			var streamEndPoints = GetEndPoints(Streams.Descriptor);
+			foreach (var ep in streamEndPoints) {
+				if (ep.MethodName.Contains("read"))
+					ep.Features.AddRange(new[] { "position", "events" });
+				else if (ep.MethodName.Contains("batchappend"))
+					ep.Features.Add("deadline_duration");
+			}
+
+			var psubEndPoints = GetEndPoints(PersistentSubscriptions.Descriptor);
+			foreach (var ep in psubEndPoints) {
+				ep.Features.AddRange(new[] { "stream", "all" });
+			}
+
+			_expectedEndPoints.AddRange(streamEndPoints);
+			_expectedEndPoints.AddRange(psubEndPoints);
+			_expectedEndPoints.AddRange(GetEndPoints(Operations.Descriptor));
+			_expectedEndPoints.AddRange(GetEndPoints(Users.Descriptor));
+			_expectedEndPoints.AddRange(GetEndPoints(Gossip.Descriptor));
+			_expectedEndPoints.AddRange(GetEndPoints(EventStore.Client.Monitoring.Monitoring.Descriptor));
+			_expectedEndPoints.AddRange(GetEndPoints(Redaction.Descriptor));
+			_expectedEndPoints.AddRange(GetEndPoints(ServerFeatures.Descriptor));
+
+			var versionParts = VersionInfo.Version.Split('.');
+			_expectedServerVersion = string.Join('.', versionParts.Take(3));
+
+			var node = GetLeader();
+			await Task.WhenAll(node.AdminUserCreated, node.Started);
+
+			using var channel = GrpcChannel.ForAddress(new Uri($"https://{node.HttpEndPoint}"),
+				new GrpcChannelOptions {
+					HttpClient = new HttpClient(new SocketsHttpHandler {
+						SslOptions = {
+							RemoteCertificateValidationCallback = delegate { return true; }
+						}
+					}, true)
+				});
+			var client = new ServerFeatures.ServerFeaturesClient(channel);
+
+			var resp = await client.GetSupportedMethodsAsync(new Empty());
+			_supportedEndPoints = resp.Methods.ToList();
+			_serverVersion = resp.EventStoreServerVersion;
+
+		}
+		private SupportedMethod[] GetEndPoints(ServiceDescriptor desc) =>
+			desc.Methods.Select(x => new SupportedMethod {
+				MethodName = x.Name.ToLower(),
+				ServiceName = x.Service.FullName.ToLower()
+			}).ToArray();
+
+		[Test]
+		public void should_receive_expected_endpoints() {
+			CollectionAssert.AreEquivalent(_expectedEndPoints, _supportedEndPoints);
+		}
+
+		[Test]
+		public void should_receive_the_correct_eventstore_version() {
+			Assert.AreEqual(_expectedServerVersion, _serverVersion);
+		}
+	}
+}
+
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamRevisionTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamRevisionTests.cs
new file mode 100644
index 00000000000..2970b832a68
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamRevisionTests.cs
@@ -0,0 +1,141 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Services.Transport.Common;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc;
+
+public class StreamRevisionTests {
+	[Test]
+	public void Equality() {
+		var sut = new StreamRevision(1);
+		Assert.AreEqual(new StreamRevision(1), sut);
+	}
+
+	[Test]
+	public void Inequality() {
+		var sut = new StreamRevision(1);
+		Assert.AreNotEqual(new StreamRevision(2), sut);
+	}
+
+	[Test]
+	public void EqualityOperator() {
+		var sut = new StreamRevision(1);
+		Assert.True(new StreamRevision(1) == sut);
+	}
+
+	[Test]
+	public void InequalityOperator() {
+		var sut = new StreamRevision(1);
+		Assert.True(new StreamRevision(2) != sut);
+	}
+
+	[Test]
+	public void AdditionOperator() {
+		var sut = StreamRevision.Start;
+		Assert.AreEqual(new StreamRevision(1), sut + 1);
+		Assert.AreEqual(new StreamRevision(1), 1 + sut);
+	}
+
+	public static IEnumerable<object[]> AdditionOutOfBoundsCases() {
+		yield return new object[] { StreamRevision.End, 1UL };
+		yield return new object[] { new StreamRevision(long.MaxValue), long.MaxValue + 2UL };
+	}
+
+	[TestCaseSource(nameof(AdditionOutOfBoundsCases))]
+	public void AdditionOutOfBoundsThrows(StreamRevision streamRevision, ulong operand) {
+		Assert.Throws<OverflowException>(() => {
+			var _ = streamRevision + operand;
+		});
+		Assert.Throws<OverflowException>(() => {
+			var _ = operand + streamRevision;
+		});
+	}
+
+	[Test]
+	public void SubtractionOperator() {
+		var sut = new StreamRevision(1);
+		Assert.AreEqual(new StreamRevision(0), sut - 1);
+		Assert.AreEqual(new StreamRevision(0), 1 - sut);
+	}
+
+	public static IEnumerable<object[]> SubtractionOutOfBoundsCases() {
+		yield return new object[] { new StreamRevision(1), 2UL };
+		yield return new object[] { StreamRevision.Start, 1UL };
+	}
+
+	[TestCaseSource(nameof(SubtractionOutOfBoundsCases))]
+	public void SubtractionOutOfBoundsThrows(StreamRevision streamRevision, ulong operand) {
+		Assert.Throws<OverflowException>(() => {
+			var _ = streamRevision - operand;
+		});
+		Assert.Throws<OverflowException>(() => {
+			var _ = (ulong)streamRevision - new StreamRevision(operand);
+		});
+	}
+
+	public static IEnumerable<object[]> ArgumentOutOfRangeTestCases() {
+		yield return new object[] { long.MaxValue + 1UL };
+		yield return new object[] { ulong.MaxValue - 1UL };
+	}
+
+	[TestCaseSource(nameof(ArgumentOutOfRangeTestCases))]
+	public void ArgumentOutOfRange(ulong value) {
+		var ex = Assert.Throws<ArgumentOutOfRangeException>(() => new StreamRevision(value));
+		Assert.AreEqual(nameof(value), ex.ParamName);
+	}
+
+	public static IEnumerable<object[]> ComparableTestCases() {
+		yield return new object[] { StreamRevision.Start, StreamRevision.Start, 0 };
+		yield return new object[] { StreamRevision.Start, StreamRevision.End, -1 };
+		yield return new object[] { StreamRevision.End, StreamRevision.Start, 1 };
+	}
+
+	[TestCaseSource(nameof(ComparableTestCases))]
+	public void Comparability(StreamRevision left, StreamRevision right, int expected)
+		=> Assert.AreEqual(expected, left.CompareTo(right));
+
+	public static IEnumerable<object[]> Int64TestCases() {
+		yield return new object[] { -1L, StreamRevision.End };
+		yield return new object[] { 0L, StreamRevision.Start };
+	}
+
+	[TestCaseSource(nameof(Int64TestCases))]
+	public void FromInt64ExpectedResult(long value, StreamRevision expected)
+		=> Assert.AreEqual(expected, StreamRevision.FromInt64(value));
+
+	[TestCaseSource(nameof(Int64TestCases))]
+	public void ToInt64ExpectedResult(long expected, StreamRevision value)
+		=> Assert.AreEqual(expected, value.ToInt64());
+
+	[Test]
+	public void ExplicitConversionExpectedResult() {
+		const ulong expected = 0UL;
+		var actual = (ulong)new StreamRevision(expected);
+		Assert.AreEqual(expected, actual);
+	}
+
+	[Test]
+	public void ImplicitConversionExpectedResult() {
+		const ulong expected = 0UL;
+		ulong actual = new StreamRevision(expected);
+		Assert.AreEqual(expected, actual);
+	}
+
+	[Test]
+	public void ToStringExpectedResult() {
+		var expected = 0UL.ToString();
+
+		Assert.AreEqual(expected, new StreamRevision(0UL).ToString());
+	}
+
+	[Test]
+	public void ToUInt64ExpectedResult() {
+		var expected = 0UL;
+
+		Assert.AreEqual(expected, new StreamRevision(expected).ToUInt64());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/AppendBatchToStreamTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/AppendBatchToStreamTests.cs
new file mode 100644
index 00000000000..0b08739d958
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/AppendBatchToStreamTests.cs
@@ -0,0 +1,284 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.Client;
+using EventStore.Client.Streams;
+using Google.Protobuf;
+using Google.Protobuf.WellKnownTypes;
+using Google.Rpc;
+using KurrentDB.Core.Services.Transport.Grpc;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc.StreamsTests;
+
+[TestFixture]
+public class AppendBatchToStreamTests {
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class single_batch<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
+		private BatchAppendResp _response;
+		private readonly Uuid _correlationId;
+
+		public single_batch() {
+			_correlationId = Uuid.NewUuid();
+		}
+
+		protected override Task Given() => Task.CompletedTask;
+
+		protected override async Task When() {
+			_response = await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8("stream") }
+				},
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(1) },
+				CorrelationId = _correlationId.ToDto()
+			});
+		}
+
+		[Test]
+		public void is_success() {
+			Assert.AreEqual(_response.ResultCase, BatchAppendResp.ResultOneofCase.Success);
+		}
+
+		[Test]
+		public void is_correlated() {
+			Assert.AreEqual(_correlationId.ToDto(), _response.CorrelationId);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	public class single_batch_with_too_large_events<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
+		private BatchAppendResp _response;
+		private readonly Uuid _correlationId;
+		private const int MaxAppendEventSize = 1024;
+		private BatchAppendReq.Types.ProposedMessage _tooLargeEvent;
+
+		public single_batch_with_too_large_events() : base(maxAppendEventSize: MaxAppendEventSize) {
+			_correlationId = Uuid.NewUuid();
+		}
+
+		protected override Task Given() => Task.CompletedTask;
+
+		protected override async Task When() {
+			_tooLargeEvent = CreateEvent(dataSize: MaxAppendEventSize, metadataSize: MaxAppendEventSize);
+			_response = await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8("stream") }
+				},
+				IsFinal = true,
+				ProposedMessages = { CreateEvent(), _tooLargeEvent, CreateEvent() },
+				CorrelationId = _correlationId.ToDto()
+			});
+		}
+
+		[Test]
+		public void is_error() {
+			Assert.AreEqual(BatchAppendResp.ResultOneofCase.Error, _response.ResultCase);
+			Assert.AreEqual(Code.InvalidArgument, _response.Error.Code);
+		}
+
+		[Test]
+		public void is_correlated() {
+			Assert.AreEqual(_correlationId.ToDto(), _response.CorrelationId);
+		}
+
+		[Test]
+		public void contains_error_details() {
+			Assert.True(_response.Error.Details.Is(MaximumAppendEventSizeExceeded.Descriptor));
+			var details = _response.Error.Details.Unpack<MaximumAppendEventSizeExceeded>();
+			Assert.AreEqual(Uuid.FromDto(_tooLargeEvent.Id).ToString(), details.EventId);
+			Assert.AreEqual(MaxAppendEventSize * 2 + 2, details.ProposedEventSize);
+			Assert.AreEqual(MaxAppendEventSize, details.MaxAppendEventSize);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class single_batch_non_structured_uuid<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
+		private BatchAppendResp _response;
+		private readonly Uuid _correlationId;
+
+		public single_batch_non_structured_uuid() {
+			_correlationId = Uuid.NewUuid();
+		}
+
+		protected override Task Given() => Task.CompletedTask;
+
+		protected override async Task When() {
+			_response = await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8("stream") }
+				},
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(1) },
+				CorrelationId = new() { String = _correlationId.ToString() }
+			});
+		}
+
+		[Test]
+		public void is_success() {
+			Assert.AreEqual(_response.ResultCase, BatchAppendResp.ResultOneofCase.Success);
+		}
+
+		[Test]
+		public void is_correlated() {
+			Assert.AreEqual(new UUID() { String = _correlationId.ToString() }, _response.CorrelationId);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	public class multiple_batches_with_one_having_too_large_events<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
+		private BatchAppendResp _response;
+		private const int MaxAppendEventSize = 1024;
+		private BatchAppendReq.Types.ProposedMessage _tooLargeEvent;
+
+		public multiple_batches_with_one_having_too_large_events()
+			: base(maxAppendEventSize: MaxAppendEventSize) {
+		}
+
+		protected override Task Given() => Task.CompletedTask;
+
+		protected override async Task When() {
+			_tooLargeEvent = CreateEvent(dataSize: MaxAppendEventSize, metadataSize: MaxAppendEventSize);
+			var correlationId = Uuid.NewUuid();
+			_response = await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8("stream") }
+				},
+				IsFinal = false,
+				ProposedMessages = { CreateEvents(1) },
+				CorrelationId = correlationId.ToDto(),
+			}, new() {
+				IsFinal = true,
+				ProposedMessages = { _tooLargeEvent },
+				CorrelationId = correlationId.ToDto()
+			});
+		}
+
+		[Test]
+		public void is_error() {
+			Assert.AreEqual(BatchAppendResp.ResultOneofCase.Error, _response.ResultCase);
+			Assert.AreEqual(Code.InvalidArgument, _response.Error.Code);
+		}
+
+		[Test]
+		public void contains_error_details() {
+			Assert.True(_response.Error.Details.Is(MaximumAppendEventSizeExceeded.Descriptor));
+			var details = _response.Error.Details.Unpack<MaximumAppendEventSizeExceeded>();
+			Assert.AreEqual(Uuid.FromDto(_tooLargeEvent.Id).ToString(), details.EventId);
+			Assert.AreEqual(MaxAppendEventSize * 2 + 2, details.ProposedEventSize);
+			Assert.AreEqual(MaxAppendEventSize, details.MaxAppendEventSize);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class multiple_batches<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
+		private BatchAppendResp _response;
+		protected override Task Given() => Task.CompletedTask;
+
+		protected override async Task When() {
+			var correlationId = Uuid.NewUuid();
+			_response = await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8("stream") }
+				},
+				IsFinal = false,
+				ProposedMessages = { CreateEvents(1) },
+				CorrelationId = correlationId.ToDto(),
+			}, new() {
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(1) },
+				CorrelationId = correlationId.ToDto()
+			});
+		}
+
+		[Test]
+		public void is_success() {
+			Assert.AreEqual(_response.ResultCase, BatchAppendResp.ResultOneofCase.Success);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class exceeded_deadline<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
+		private BatchAppendResp _response;
+		private readonly Uuid _correlationId;
+
+		public exceeded_deadline() {
+			_correlationId = Uuid.NewUuid();
+		}
+
+		protected override Task Given() => Task.CompletedTask;
+
+		protected override async Task When() {
+			_response = await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8("stream") },
+					Deadline = Duration.FromTimeSpan(TimeSpan.Zero)
+				},
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(1) },
+				CorrelationId = _correlationId.ToDto()
+			});
+		}
+
+		[Test]
+		public void is_error() {
+			Assert.AreEqual(_response.ResultCase, BatchAppendResp.ResultOneofCase.Error);
+			Assert.AreEqual(_response.Error.Code, Code.DeadlineExceeded);
+		}
+
+		[Test]
+		public void is_correlated() {
+			Assert.AreEqual(_correlationId.ToDto(), _response.CorrelationId);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class exceeded_deadline_timestamp<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
+		private BatchAppendResp _response;
+		private readonly Uuid _correlationId;
+
+		public exceeded_deadline_timestamp() {
+			_correlationId = Uuid.NewUuid();
+		}
+
+		protected override Task Given() => Task.CompletedTask;
+
+		protected override async Task When() {
+			_response = await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8("stream") },
+					Deadline21100 = Timestamp.FromDateTime(DateTime.UtcNow)
+				},
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(1) },
+				CorrelationId = _correlationId.ToDto()
+			});
+		}
+
+		[Test]
+		public void is_error() {
+			Assert.AreEqual(_response.ResultCase, BatchAppendResp.ResultOneofCase.Error);
+			Assert.AreEqual(_response.Error.Code, Code.DeadlineExceeded);
+		}
+
+		[Test]
+		public void is_correlated() {
+			Assert.AreEqual(_correlationId.ToDto(), _response.CorrelationId);
+		}
+	}
+
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/DeleteTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/DeleteTests.cs
new file mode 100644
index 00000000000..5ec1d36c100
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/DeleteTests.cs
@@ -0,0 +1,204 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.Client.Streams;
+using EventStore.ClientAPI;
+using Google.Protobuf;
+using Grpc.Core;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Grpc;
+using NUnit.Framework;
+using ExpectedVersion = KurrentDB.Core.Data.ExpectedVersion;
+using Metadata = KurrentDB.Core.Services.Transport.Grpc.Constants.Metadata;
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc.StreamsTests;
+
+[TestFixture]
+public class DeleteTests {
+	private const string StreamName = nameof(DeleteTests);
+
+	public abstract class DeleteExistingStreamSpecification<TLogFormat, TStreamId>
+		: GrpcSpecification<TLogFormat, TStreamId> {
+		private readonly DeleteReq.Types.Options _options;
+		private Exception _caughtException;
+
+		private DeleteExistingStreamSpecification(DeleteReq.Types.Options options) {
+			_options = new(options) {
+				StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamName) }
+			};
+		}
+
+		protected DeleteExistingStreamSpecification(StreamRevision expectedStreamRevision) : this(
+			new DeleteReq.Types.Options {
+				Revision = expectedStreamRevision.ToUInt64(),
+			}) {
+		}
+
+		protected DeleteExistingStreamSpecification(long expectedStreamState) : this(expectedStreamState switch {
+			ExpectedVersion.Any => new DeleteReq.Types.Options { Any = new() },
+			ExpectedVersion.NoStream => new DeleteReq.Types.Options { NoStream = new() },
+			ExpectedVersion.StreamExists => new DeleteReq.Types.Options { StreamExists = new() },
+			_ => throw new InvalidOperationException()
+		}) {
+		}
+
+		[Test]
+		public void no_exception_is_thrown() {
+			Assert.Null(_caughtException);
+		}
+
+		[Test]
+		public async Task the_stream_is_deleted() {
+			using var call = StreamsClient.Read(new() {
+				Options = new() {
+					UuidOption = new() { Structured = new() },
+					NoFilter = new(),
+					ResolveLinks = false,
+					ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
+					Count = 1,
+					Stream = new() {
+						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamName) },
+						Start = new()
+					}
+				}
+			}, GetCallOptions());
+
+			var responses = await call.ResponseStream.ReadAllAsync().ToArrayAsync();
+
+			Assert.AreEqual(1, responses.Length);
+			Assert.AreEqual(new ReadResp {
+				StreamNotFound = new() {
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamName) }
+				}
+			}, responses[0]);
+		}
+
+		protected override async Task Given() => await AppendToStreamBatch(new BatchAppendReq {
+			Options = new() {
+				NoStream = new(),
+				StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamName) }
+			},
+			CorrelationId = Uuid.NewUuid().ToDto(),
+			IsFinal = true,
+			ProposedMessages = { CreateEvents(1) }
+		});
+
+		protected override async Task When() {
+			using var call = StreamsClient.DeleteAsync(new() {
+				Options = _options
+			}, GetCallOptions());
+
+			try {
+				await call.ResponseAsync;
+			} catch (Exception ex) {
+				_caughtException = ex;
+			}
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class DeleteExistingStreamExpectedRevision<TLogFormat, TStreamId>
+		: DeleteExistingStreamSpecification<TLogFormat, TStreamId> {
+		public DeleteExistingStreamExpectedRevision() : base(StreamRevision.Start) { }
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class DeleteExistingStreamAny<TLogFormat, TStreamId>
+		: DeleteExistingStreamSpecification<TLogFormat, TStreamId> {
+		public DeleteExistingStreamAny() : base(ExpectedVersion.Any) { }
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class DeleteExistingStreamExists<TLogFormat, TStreamId>
+		: DeleteExistingStreamSpecification<TLogFormat, TStreamId> {
+		public DeleteExistingStreamExists() : base(ExpectedVersion.StreamExists) { }
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class DeleteNoStream<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
+		private Exception _caughtException;
+		protected override Task Given() => Task.CompletedTask;
+
+		protected override async Task When() {
+			using var call = StreamsClient.DeleteAsync(new() {
+				Options = new() {
+					NoStream = new(),
+					StreamIdentifier = new() {
+						StreamName = ByteString.CopyFromUtf8(Guid.NewGuid().ToString())
+					}
+				}
+			}, GetCallOptions());
+
+			try {
+				await call.ResponseAsync;
+			} catch (Exception ex) {
+				_caughtException = ex;
+			}
+		}
+
+		[Test]
+		public void an_exception_is_thrown() {
+			Assert.IsInstanceOf<RpcException>(_caughtException);
+			var ex = _caughtException as RpcException;
+			Assert.AreEqual(StatusCode.FailedPrecondition, ex.StatusCode);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class DeleteWithExistingMetadata<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
+		private Exception _caughtException;
+		private readonly string _streamName;
+		private readonly string _metadataStreamName;
+
+		public DeleteWithExistingMetadata() {
+			_streamName = Guid.NewGuid().ToString();
+			_metadataStreamName = SystemStreams.MetastreamOf(_streamName);
+		}
+
+		protected override async Task Given() {
+			using var call = StreamsClient.Append(GetCallOptions());
+			await call.RequestStream.WriteAsync(new() {
+				Options = new() { NoStream = new(), StreamIdentifier = _metadataStreamName }
+			});
+			await call.RequestStream.WriteAsync(new() {
+				ProposedMessage = new() {
+					Id = Uuid.NewUuid().ToDto(),
+					Metadata = {
+						{ Metadata.Type, SystemEventTypes.StreamMetadata },
+						{ Metadata.ContentType, Metadata.ContentTypes.ApplicationJson }
+					},
+					Data = ByteString.CopyFromUtf8(StreamMetadata.Build().Build().AsJsonString())
+				}
+			});
+
+			await call.RequestStream.CompleteAsync();
+
+			await call.ResponseAsync;
+		}
+
+		protected override async Task When() {
+			using var call = StreamsClient.DeleteAsync(new() {
+				Options = new() { NoStream = new(), StreamIdentifier = _streamName }
+			}, GetCallOptions());
+
+			try {
+				await call.ResponseAsync;
+			} catch (Exception ex) {
+				_caughtException = ex;
+			}
+		}
+
+		[Test]
+		public void no_exception_is_thrown() {
+			Assert.Null(_caughtException);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/GrpcSpecification.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/GrpcSpecification.cs
new file mode 100644
index 00000000000..35bc1aa6217
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/GrpcSpecification.cs
@@ -0,0 +1,176 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using EventStore.Client.Streams;
+using Google.Protobuf;
+using Grpc.Core;
+using Grpc.Net.Client;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.Transport.Grpc;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+using Convert = System.Convert;
+using GrpcMetadata = KurrentDB.Core.Services.Transport.Grpc.Constants.Metadata;
+using Streams = EventStore.Client.Streams.Streams;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc.StreamsTests;
+
+public abstract class GrpcSpecification<TLogFormat, TStreamId> {
+	protected GrpcChannel Channel;
+	private readonly MiniNode<TLogFormat, TStreamId> _node;
+	internal Streams.StreamsClient StreamsClient { get; set; }
+	private BatchAppender _batchAppender;
+
+	protected GrpcSpecification(IExpiryStrategy expiryStrategy = null,
+		int maxAppendEventSize = TFConsts.EffectiveMaxLogRecordSize) {
+		_node = new MiniNode<TLogFormat, TStreamId>(GetType().FullName,
+			inMemDb: true,
+			expiryStrategy: expiryStrategy,
+			maxAppendEventSize: maxAppendEventSize);
+	}
+
+	protected abstract Task Given();
+
+	protected abstract Task When();
+
+	[OneTimeSetUp]
+	public async Task SetUp() {
+		await _node.Start();
+		await _node.AdminUserCreated;
+
+		Channel = GrpcChannel.ForAddress(
+			new UriBuilder { Scheme = Uri.UriSchemeHttps }.Uri,
+			new() {
+				HttpClient = _node.HttpClient,
+				DisposeHttpClient = false,
+			});
+		StreamsClient = new(Channel);
+		_batchAppender = new(StreamsClient);
+		_batchAppender.Start();
+		try {
+			await Given().WithTimeout(TimeSpan.FromSeconds(30));
+		} catch (Exception ex) {
+			throw new Exception("Given Failed", ex);
+		}
+
+		try {
+			await When().WithTimeout(TimeSpan.FromSeconds(30));
+		} catch (Exception ex) {
+			throw new Exception("When Failed", ex);
+		}
+	}
+
+	[OneTimeTearDown]
+	public async Task TearDown() {
+		await _batchAppender.DisposeAsync();
+		Channel?.Dispose();
+		await _node.Shutdown();
+	}
+
+	private static CallCredentials CallCredentialsFromUser((string userName, string password) credentials) =>
+		CallCredentials.FromInterceptor((_, metadata) => {
+			metadata.Add(new Metadata.Entry("authorization",
+				$"Basic {Convert.ToBase64String(Encoding.ASCII.GetBytes($"{credentials.userName}:{credentials.password}"))}"));
+
+			return Task.CompletedTask;
+		});
+
+	protected static (string userName, string password) AdminCredentials => ("admin", "changeit");
+
+	protected virtual (string userName, string password) DefaultCredentials => default;
+
+	protected CallOptions GetCallOptions((string userName, string password) credentials = default) =>
+		new(credentials: GetCredentials(credentials == default ? DefaultCredentials : credentials),
+			deadline: Debugger.IsAttached
+				? DateTime.UtcNow.AddDays(1)
+				: new DateTime?());
+
+	private static CallCredentials GetCredentials((string userName, string password) credentials) =>
+		credentials == default ? null : CallCredentialsFromUser(credentials);
+
+	internal ValueTask<BatchAppendResp> AppendToStreamBatch(params BatchAppendReq[] requests) =>
+		_batchAppender.Call(requests);
+
+	internal static IEnumerable<BatchAppendReq.Types.ProposedMessage> CreateEvents(int count) =>
+		Enumerable.Range(0, count).Select(_ => CreateEvent());
+
+	internal static BatchAppendReq.Types.ProposedMessage CreateEvent(string type = "-", int? dataSize = null, int? metadataSize = null) {
+		var data = dataSize is null
+			? ByteString.Empty
+			: ByteString.CopyFrom(Encoding.UTF8.GetBytes(new string('*', dataSize.Value)));
+		var metadata = metadataSize is null
+			? ByteString.Empty
+			: ByteString.CopyFrom(Encoding.UTF8.GetBytes(new string('*', metadataSize.Value)));
+		return new BatchAppendReq.Types.ProposedMessage {
+			Data = data,
+			Id = Uuid.NewUuid().ToDto(),
+			CustomMetadata = metadata,
+			Metadata = {
+				{ GrpcMetadata.ContentType, GrpcMetadata.ContentTypes.ApplicationOctetStream },
+				{ GrpcMetadata.Type, type }
+			}
+		};
+	}
+
+	private class BatchAppender : IAsyncDisposable {
+		private readonly Lazy<AsyncDuplexStreamingCall<BatchAppendReq, BatchAppendResp>> _batchAppendLazy;
+		private AsyncDuplexStreamingCall<BatchAppendReq, BatchAppendResp> BatchAppend => _batchAppendLazy.Value;
+		private readonly ConcurrentDictionary<Uuid, TaskCompletionSource<BatchAppendResp>> _responses;
+
+		public BatchAppender(Streams.StreamsClient streamsClient) {
+			_batchAppendLazy = new Lazy<AsyncDuplexStreamingCall<BatchAppendReq, BatchAppendResp>>(() =>
+				streamsClient.BatchAppend(new CallOptions(credentials: GetCredentials(default),
+					deadline: DateTime.UtcNow.AddDays(1))));
+			_responses = new();
+		}
+
+		public void Start() =>
+			Task.Run(async () => {
+				while (await BatchAppend.ResponseStream.MoveNext()) {
+					var response = BatchAppend.ResponseStream.Current;
+					var correlationId = Uuid.FromDto(response.CorrelationId);
+
+					if (_responses.TryRemove(correlationId, out var tcs)) {
+						tcs.TrySetResult(response);
+					}
+				}
+			});
+
+		public ValueTask DisposeAsync() =>
+			_batchAppendLazy.IsValueCreated
+				? new(_batchAppendLazy.Value.RequestStream.CompleteAsync())
+				: new(Task.CompletedTask);
+
+		public async ValueTask<BatchAppendResp> Call(params BatchAppendReq[] requests) {
+			if (requests.Length == 0) {
+				throw new ArgumentException($"Must have at least one {nameof(BatchAppendReq)}.",
+					nameof(requests));
+			}
+
+			if (requests.Select(r => r.CorrelationId).Distinct().Count() > 1) {
+				throw new ArgumentException($"All {nameof(BatchAppendReq)} must have same CorrelationId.",
+					nameof(requests));
+			}
+			var tcs = new TaskCompletionSource<BatchAppendResp>();
+			var correlationId = Uuid.FromDto(requests[0].CorrelationId);
+
+			if (!_responses.TryAdd(correlationId, tcs)) {
+				throw new ArgumentException("CorrelationId is already reserved.", nameof(correlationId));
+			}
+
+			foreach (var request in requests) {
+				await BatchAppend.RequestStream.WriteAsync(request);
+			}
+
+			return await tcs.Task;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/LotsOfExpiriesStrategy.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/LotsOfExpiriesStrategy.cs
new file mode 100644
index 00000000000..334a7489708
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/LotsOfExpiriesStrategy.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc.StreamsTests;
+
+public class LotsOfExpiriesStrategy : IExpiryStrategy {
+	private int _counter;
+
+	public DateTime? GetExpiry() {
+		_counter++;
+		if (_counter % 10 == 0) {
+			// ok
+			return null;
+		} else {
+			// expired already
+			return DateTime.UtcNow - TimeSpan.FromSeconds(1);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadAllBackwardsFilteredTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadAllBackwardsFilteredTests.cs
new file mode 100644
index 00000000000..1f72f66df57
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadAllBackwardsFilteredTests.cs
@@ -0,0 +1,164 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.Client.Streams;
+using Google.Protobuf;
+using Grpc.Core;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Grpc;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc.StreamsTests;
+
+[TestFixture]
+public class ReadAllBackwardsFilteredTests {
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_reading_all_backwards_filtered<TLogFormat, TStreamId>
+	  : GrpcSpecification<TLogFormat, TStreamId> {
+		private const string StreamId = nameof(when_reading_all_backwards_filtered<TLogFormat, TStreamId>);
+
+		private Position _positionOfLastWrite;
+		private readonly List<ReadResp> _responses = new();
+
+		protected override async Task Given() {
+			var response = await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamId) },
+					Any = new()
+				},
+				CorrelationId = Uuid.NewUuid().ToDto(),
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(50) }
+			});
+
+			_positionOfLastWrite = new Position(response.Success.Position.CommitPosition,
+				response.Success.Position.PreparePosition);
+		}
+
+		protected override async Task When() {
+			using var call = StreamsClient.Read(new() {
+				Options = new() {
+					UuidOption = new() { Structured = new() },
+					Count = 20,
+					ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Backwards,
+					ResolveLinks = true,
+					All = new() {
+						Position = new() {
+							CommitPosition = _positionOfLastWrite.CommitPosition,
+							PreparePosition = _positionOfLastWrite.PreparePosition
+						}
+					},
+					Filter = new() {
+						Max = 32,
+						CheckpointIntervalMultiplier = 4,
+						StreamIdentifier = new() { Prefix = { StreamId } }
+					}
+				}
+			}, GetCallOptions(AdminCredentials));
+			_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
+		}
+
+		[Test]
+		public void should_not_receive_null_events() {
+			Assert.False(_responses
+				.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
+				.Any(x => x.Event is null));
+		}
+
+		[Test]
+		public void should_read_a_number_of_events_equal_to_the_max_count() {
+			Assert.AreEqual(20, _responses.Count(x => x.Event is not null));
+		}
+
+		[Test]
+		public void should_read_the_correct_events() {
+			Assert.True(_responses
+				.Where(x => x.Event is not null)
+				.All(x =>
+					new Position(x.Event.Event.CommitPosition, x.Event.Event.PreparePosition) <=
+					_positionOfLastWrite));
+
+			Assert.AreEqual(48, _responses.First(x => x.Event is not null).Event.Event.StreamRevision);
+			Assert.AreEqual(29, _responses.Last(x => x.Event is not null).Event.Event.StreamRevision);
+
+			Assert.True(_responses
+				.Where(x => x.Event is not null)
+				.All(x => x.Event.Event.StreamIdentifier.StreamName.ToStringUtf8() == StreamId));
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_reading_all_backwards_filtered_from_end<TLogFormat, TStreamId>
+	  : GrpcSpecification<TLogFormat, TStreamId> {
+		private const string StreamId = nameof(when_reading_all_backwards_filtered<TLogFormat, TStreamId>);
+
+		private Position _positionOfLastWrite;
+		private readonly List<ReadResp> _responses = new();
+
+		protected override async Task Given() {
+			var response = await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamId) },
+					Any = new()
+				},
+				CorrelationId = Uuid.NewUuid().ToDto(),
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(50) }
+			});
+
+			_positionOfLastWrite = new Position(response.Success.Position.CommitPosition,
+				response.Success.Position.PreparePosition);
+		}
+
+		protected override async Task When() {
+			using var call = StreamsClient.Read(new() {
+				Options = new() {
+					UuidOption = new() { Structured = new() },
+					Count = 20,
+					ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Backwards,
+					ResolveLinks = true,
+					All = new() { End = new() },
+					Filter = new() {
+						Max = 32,
+						CheckpointIntervalMultiplier = 4,
+						StreamIdentifier = new() { Prefix = { StreamId } }
+					}
+				}
+			}, GetCallOptions(AdminCredentials));
+			_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
+		}
+
+		[Test]
+		public void should_not_receive_null_events() {
+			Assert.False(_responses
+				.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
+				.Any(x => x.Event is null));
+		}
+
+		[Test]
+		public void should_read_a_number_of_events_equal_to_the_max_count() {
+			Assert.AreEqual(20, _responses.Count(x => x.Event is not null));
+		}
+
+		[Test]
+		public void should_read_the_correct_events() {
+			Assert.True(_responses
+				.Where(x => x.Event is not null)
+				.All(x =>
+					new Position(x.Event.Event.CommitPosition, x.Event.Event.PreparePosition) <=
+					_positionOfLastWrite));
+
+			Assert.AreEqual(49, _responses.First(x => x.Event is not null).Event.Event.StreamRevision);
+			Assert.AreEqual(30, _responses.Last(x => x.Event is not null).Event.Event.StreamRevision);
+
+			Assert.True(_responses
+				.Where(x => x.Event is not null)
+				.All(x => x.Event.Event.StreamIdentifier.StreamName.ToStringUtf8() == StreamId));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadAllBackwardsTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadAllBackwardsTests.cs
new file mode 100644
index 00000000000..007058e6cc3
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadAllBackwardsTests.cs
@@ -0,0 +1,133 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.Client.Streams;
+using Google.Protobuf;
+using Grpc.Core;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Grpc;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc.StreamsTests;
+
+[TestFixture]
+public class ReadAllBackwardsTests {
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_reading_all_backwards<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
+		private const string StreamId = nameof(when_reading_all_backwards<TLogFormat, TStreamId>);
+
+		private readonly List<ReadResp> _responses = new();
+		private Position _positionOfLastWrite;
+
+		protected override async Task Given() {
+			var response = await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamId) },
+					Any = new()
+				},
+				CorrelationId = Uuid.NewUuid().ToDto(),
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(50) }
+			});
+
+			_positionOfLastWrite = new Position(response.Success.Position.CommitPosition,
+				response.Success.Position.PreparePosition);
+		}
+
+		protected override async Task When() {
+			using var call = StreamsClient.Read(new() {
+				Options = new() {
+					UuidOption = new() { Structured = new() },
+					Count = 20,
+					ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Backwards,
+					ResolveLinks = false,
+					All = new() {
+						Position = new() {
+							CommitPosition = _positionOfLastWrite.CommitPosition,
+							PreparePosition = _positionOfLastWrite.PreparePosition
+						}
+					},
+					NoFilter = new()
+				}
+			}, GetCallOptions(AdminCredentials));
+			_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
+		}
+
+		[Test]
+		public void should_not_receive_null_events() {
+			Assert.False(_responses
+				.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
+				.Any(x => x.Event is null));
+		}
+
+		[Test]
+		public void should_read_a_number_of_events_equal_to_the_max_count() {
+			Assert.AreEqual(20, _responses.Count(x => x.Event is not null));
+		}
+
+		[Test]
+		public void should_read_the_correct_events() {
+			Assert.True(_responses
+				.Where(x => x.Event is not null)
+				.All(x =>
+					new Position(x.Event.Event.CommitPosition, x.Event.Event.PreparePosition) <=
+					_positionOfLastWrite));
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class
+		when_reading_all_backwards_from_end<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
+		private readonly List<ReadResp> _responses = new();
+		private const string StreamId = nameof(when_reading_all_backwards_from_end<TLogFormat, TStreamId>);
+
+		protected override async Task Given() {
+			await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamId) },
+					Any = new()
+				},
+				CorrelationId = Uuid.NewUuid().ToDto(),
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(50) }
+			});
+		}
+
+		protected override async Task When() {
+			using var call = StreamsClient.Read(new() {
+				Options = new() {
+					UuidOption = new() { Structured = new() },
+					Count = 20,
+					ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Backwards,
+					ResolveLinks = false,
+					All = new() { End = new() },
+					NoFilter = new()
+				}
+			}, GetCallOptions(AdminCredentials));
+			_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
+		}
+
+		[Test]
+		public void should_not_receive_null_events() {
+			Assert.False(_responses
+				.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
+				.Any(x => x.Event is null));
+		}
+
+		[Test]
+		public void should_read_a_number_of_events_equal_to_the_max_count() {
+			Assert.AreEqual(20, _responses.Count(x => x.Event is not null));
+		}
+
+		[Test]
+		public void should_read_the_correct_events() {
+			Assert.AreEqual(49, _responses.First(x => x.Event is not null).Event.Event.StreamRevision);
+			Assert.AreEqual(30, _responses.Last(x => x.Event is not null).Event.Event.StreamRevision);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadAllForwardsFilteredTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadAllForwardsFilteredTests.cs
new file mode 100644
index 00000000000..786b252a2a5
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadAllForwardsFilteredTests.cs
@@ -0,0 +1,90 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.Client.Streams;
+using Google.Protobuf;
+using Grpc.Core;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Grpc;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc.StreamsTests;
+
+[TestFixture]
+public class ReadAllForwardsFilteredTests {
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_reading_all_forwards_filtered<TLogFormat, TStreamId>
+	  : GrpcSpecification<TLogFormat, TStreamId> {
+		private const string StreamId = nameof(when_reading_all_forwards_filtered<TLogFormat, TStreamId>);
+
+		private Position _positionOfLastWrite;
+		private readonly List<ReadResp> _responses = new();
+
+		protected override async Task Given() {
+			var response = await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamId) },
+					Any = new()
+				},
+				CorrelationId = Uuid.NewUuid().ToDto(),
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(50) }
+			});
+
+			_positionOfLastWrite = new Position(response.Success.Position.CommitPosition,
+				response.Success.Position.PreparePosition);
+		}
+
+		protected override async Task When() {
+			using var call = StreamsClient.Read(new() {
+				Options = new() {
+					UuidOption = new() { Structured = new() },
+					Count = 20,
+					ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
+					ResolveLinks = true,
+					All = new() {
+						Start = new()
+					},
+					Filter = new() {
+						Max = 32,
+						CheckpointIntervalMultiplier = 4,
+						StreamIdentifier = new() { Prefix = { StreamId } }
+					}
+				}
+			}, GetCallOptions(AdminCredentials));
+			_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
+		}
+
+		[Test]
+		public void should_not_receive_null_events() {
+			Assert.False(_responses
+				.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
+				.Any(x => x.Event is null));
+		}
+
+		[Test]
+		public void should_read_a_number_of_events_equal_to_the_max_count() {
+			Assert.AreEqual(20, _responses.Count(x => x.Event is not null));
+		}
+
+		[Test]
+		public void should_read_the_correct_events() {
+			Assert.True(_responses
+				.Where(x => x.Event is not null)
+				.All(x =>
+					new Position(x.Event.Event.CommitPosition, x.Event.Event.PreparePosition) <=
+					_positionOfLastWrite));
+
+			Assert.AreEqual(0, _responses.First(x => x.Event is not null).Event.Event.StreamRevision);
+			Assert.AreEqual(19, _responses.Last(x => x.Event is not null).Event.Event.StreamRevision);
+
+			Assert.True(_responses
+				.Where(x => x.Event is not null)
+				.All(x => x.Event.Event.StreamIdentifier.StreamName.ToStringUtf8() == StreamId));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadStreamsBackwardTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadStreamsBackwardTests.cs
new file mode 100644
index 00000000000..c32632350b9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadStreamsBackwardTests.cs
@@ -0,0 +1,253 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.Client.Streams;
+using Google.Protobuf;
+using Grpc.Core;
+using KurrentDB.Core.Services.Transport.Grpc;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc.StreamsTests;
+
+[TestFixture]
+public class ReadStreamsBackwardTests {
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_reading_backward_from_past_the_end_of_the_stream<TLogFormat, TStreamId>
+		: GrpcSpecification<TLogFormat, TStreamId> {
+		private readonly string _streamName = Guid.NewGuid().ToString();
+		private readonly List<ReadResp> _responses = new();
+		private const ulong MaxCount = 20;
+		private const int EventCount = 30;
+
+		protected override async Task Given() {
+			await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) }
+				},
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(EventCount) },
+				CorrelationId = Uuid.NewUuid().ToDto()
+			});
+		}
+
+		protected override async Task When() {
+			using var call = StreamsClient.Read(new() {
+				Options = new() {
+					Count = MaxCount,
+					Stream = new() {
+						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) },
+						Revision = 60
+					},
+					ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Backwards,
+					UuidOption = new() { Structured = new() },
+					NoFilter = new(),
+					ControlOption = new() { Compatibility = 1 }
+				}
+			});
+			_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
+		}
+
+		[Test]
+		public void should_not_receive_null_events() {
+			Assert.False(_responses
+				.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
+				.Any(x => x.Event is null));
+		}
+
+		[Test]
+		public void should_read_a_number_of_events_equal_to_the_max_count() {
+			Assert.AreEqual(20, _responses.Count(x => x.Event is not null));
+		}
+
+		[Test]
+		public void should_read_the_correct_events() {
+			Assert.AreEqual(29, _responses.First(x => x.Event is not null).Event.Event.StreamRevision);
+			Assert.AreEqual(10, _responses.Last(x => x.Event is not null).Event.Event.StreamRevision);
+		}
+
+		[Test]
+		public void should_indicate_last_position_of_stream() {
+			var streamPosition =
+				_responses.Single(x => x.ContentCase == ReadResp.ContentOneofCase.LastStreamPosition);
+			Assert.AreEqual(29, streamPosition.LastStreamPosition);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_reading_backward_from_the_end_of_the_stream<TLogFormat, TStreamId>
+		: GrpcSpecification<TLogFormat, TStreamId> {
+		private readonly string _streamName = Guid.NewGuid().ToString();
+		private readonly List<ReadResp> _responses = new();
+		private const ulong MaxCount = 20;
+		private const int EventCount = 30;
+
+		protected override async Task Given() {
+			await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) }
+				},
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(EventCount) },
+				CorrelationId = Uuid.NewUuid().ToDto()
+			});
+		}
+
+		protected override async Task When() {
+			using var call = StreamsClient.Read(new() {
+				Options = new() {
+					Count = MaxCount,
+					Stream = new() {
+						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) },
+						End = new()
+					},
+					ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Backwards,
+					UuidOption = new() { Structured = new() },
+					NoFilter = new(),
+					ControlOption = new() { Compatibility = 21 }
+				}
+			});
+			_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
+		}
+
+		[Test]
+		public void should_not_receive_null_events() {
+			Assert.False(_responses
+				.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
+				.Any(x => x.Event is null));
+		}
+
+		[Test]
+		public void should_read_a_number_of_events_equal_to_the_max_count() {
+			Assert.AreEqual(20, _responses.Count(x => x.Event is not null));
+		}
+
+		[Test]
+		public void should_read_the_correct_events() {
+			Assert.AreEqual(29, _responses.First(x => x.Event is not null).Event.Event.StreamRevision);
+			Assert.AreEqual(10, _responses.Last(x => x.Event is not null).Event.Event.StreamRevision);
+		}
+
+		[Test]
+		public void should_indicate_last_position_of_stream() {
+			var streamPosition =
+				_responses.Single(x => x.ContentCase == ReadResp.ContentOneofCase.LastStreamPosition);
+			Assert.AreEqual(29, streamPosition.LastStreamPosition);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_reading_backward_from_the_middle_of_the_stream<TLogFormat, TStreamId>
+		: GrpcSpecification<TLogFormat, TStreamId> {
+		private readonly string _streamName = Guid.NewGuid().ToString();
+		private readonly List<ReadResp> _responses = new();
+		private const ulong MaxCount = 20;
+		private const int EventCount = 100;
+
+		protected override async Task Given() {
+			await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) },
+				},
+				CorrelationId = Uuid.NewUuid().ToDto(),
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(EventCount) }
+			});
+		}
+
+		protected override async Task When() {
+			using var call = StreamsClient.Read(new ReadReq {
+				Options = new() {
+					Count = MaxCount,
+					Stream = new() {
+						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) },
+						Revision = 60
+					},
+					ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Backwards,
+					UuidOption = new() { Structured = new() },
+					NoFilter = new(),
+					ControlOption = new() { Compatibility = 1 }
+				}
+			});
+			_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
+		}
+
+		[Test]
+		public void should_not_receive_null_events() {
+			Assert.False(_responses
+				.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
+				.Any(x => x.Event is null));
+		}
+
+		[Test]
+		public void should_read_a_number_of_events_equal_to_the_max_count() {
+			Assert.AreEqual(MaxCount, _responses.Count(x => x.Event is not null));
+		}
+
+		[Test]
+		public void should_read_the_correct_events() {
+			Assert.AreEqual(60, _responses.First(x => x.Event is not null).Event.Event.StreamRevision);
+			Assert.AreEqual(41, _responses.Last(x => x.Event is not null).Event.Event.StreamRevision);
+		}
+
+		[Test]
+		public void should_indicate_last_position_of_stream() {
+			var streamPosition =
+				_responses.Single(x => x.ContentCase == ReadResp.ContentOneofCase.LastStreamPosition);
+			Assert.AreEqual(99, streamPosition.LastStreamPosition);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_reading_backward_from_the_start_of_the_stream<TLogFormat, TStreamId>
+		: GrpcSpecification<TLogFormat, TStreamId> {
+		private readonly string _streamName = Guid.NewGuid().ToString();
+		private readonly List<ReadResp> _responses = new();
+		private const ulong _maxCount = 20;
+		private const int EventCount = 10;
+
+		protected override async Task Given() {
+			await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) },
+				},
+				CorrelationId = Uuid.NewUuid().ToDto(),
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(EventCount) }
+			});
+		}
+
+		protected override async Task When() {
+			using var call = StreamsClient.Read(new ReadReq {
+				Options = new() {
+					Count = _maxCount,
+					Stream = new() {
+						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) },
+						Start = new()
+					},
+					ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Backwards,
+					UuidOption = new() { Structured = new() },
+					NoFilter = new()
+				}
+			});
+			_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
+		}
+
+		[Test]
+		public void should_receive_the_first_event() {
+			Assert.AreEqual(1, _responses.Count(x => x.Event is not null));
+			Assert.AreEqual(0, _responses.First(x => x.Event is not null).Event.Event.StreamRevision);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadStreamsForwardTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadStreamsForwardTests.cs
new file mode 100644
index 00000000000..80bee192a66
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/ReadStreamsForwardTests.cs
@@ -0,0 +1,318 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.Client.Streams;
+using EventStore.ClientAPI;
+using Google.Protobuf;
+using Grpc.Core;
+using KurrentDB.Core.Services.Transport.Grpc;
+using NUnit.Framework;
+using GrpcMetadata = KurrentDB.Core.Services.Transport.Grpc.Constants.Metadata;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc.StreamsTests;
+
+[TestFixture]
+public class ReadStreamsForwardTests {
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_reading_forward_from_stream_that_has_been_truncated<TLogFormat, TStreamId>
+		: GrpcSpecification<TLogFormat, TStreamId> {
+		private readonly string _streamName = Guid.NewGuid().ToString();
+		private readonly List<ReadResp> _responses = new();
+		private const ulong MaxCount = 10;
+		private const int EventCount = 100;
+
+		protected override async Task Given() {
+			await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() {
+						StreamName = ByteString.CopyFromUtf8(_streamName)
+					}
+				},
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(EventCount) },
+				CorrelationId = Uuid.NewUuid().ToDto()
+			});
+
+			using var call = StreamsClient.Append(GetCallOptions(AdminCredentials));
+			await call.RequestStream.WriteAsync(new() {
+				Options = new() {
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8($"$${_streamName}") },
+					Any = new()
+				}
+			});
+
+			await call.RequestStream.WriteAsync(new() {
+				ProposedMessage = new() {
+					Id = Uuid.NewUuid().ToDto(),
+					Metadata = {
+						[GrpcMetadata.Type] = "$metadata",
+						[GrpcMetadata.ContentType] = GrpcMetadata.ContentTypes.ApplicationJson
+					},
+					Data = ByteString.CopyFrom(StreamMetadata.Build().SetTruncateBefore(81).Build()
+						.AsJsonBytes())
+				}
+			});
+
+			await call.RequestStream.CompleteAsync();
+
+			await call.ResponseAsync;
+		}
+
+		protected override async Task When() {
+			using var call = StreamsClient.Read(new() {
+				Options = new() {
+					Count = MaxCount,
+					Stream = new() {
+						StreamIdentifier = new() {
+							StreamName = ByteString.CopyFromUtf8(_streamName)
+						},
+						Start = new()
+					},
+					UuidOption = new() { Structured = new() },
+					ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
+					NoFilter = new(),
+					ControlOption = new() {
+						Compatibility = 21
+					}
+				}
+			});
+			_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
+		}
+
+		[Test]
+		public void should_not_receive_null_events() {
+			Assert.False(_responses
+				.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
+				.Any(x => x.Event is null));
+		}
+
+		[Test]
+		public void should_read_a_number_of_events_equal_to_the_max_count() {
+			Assert.AreEqual(MaxCount, _responses.Count(x => x.Event is not null));
+		}
+
+		[Test]
+		public void should_start_from_the_truncation_position() {
+			Assert.AreEqual(81, _responses.First(x => x.Event is not null).Event.Event.StreamRevision);
+			Assert.AreEqual(90, _responses.Last(x => x.Event is not null).Event.Event.StreamRevision);
+		}
+
+		[Test]
+		public void should_indicate_first_position_of_stream() {
+			Assert.AreEqual(81,
+				_responses.Single(x => x.ContentCase == ReadResp.ContentOneofCase.FirstStreamPosition)
+					.FirstStreamPosition);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_reading_forward_from_the_start_of_the_stream<TLogFormat, TStreamId>
+		: GrpcSpecification<TLogFormat, TStreamId> {
+		private readonly string _streamName = Guid.NewGuid().ToString();
+		private readonly List<ReadResp> _responses = new();
+		private const ulong MaxCount = 50;
+		private const int EventCount = 100;
+
+		protected override async Task Given() {
+			await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() {
+						StreamName = ByteString.CopyFromUtf8(_streamName)
+					}
+				},
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(EventCount) },
+				CorrelationId = Uuid.NewUuid().ToDto()
+			});
+		}
+
+		protected override async Task When() {
+			using var call = StreamsClient.Read(new() {
+				Options = new ReadReq.Types.Options {
+					Count = MaxCount,
+					Stream = new() {
+						StreamIdentifier = new() {
+							StreamName = ByteString.CopyFromUtf8(_streamName)
+						},
+						Start = new()
+					},
+					UuidOption = new() { Structured = new() },
+					ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
+					NoFilter = new(),
+					ControlOption = new() { Compatibility = 21 }
+				}
+			});
+			_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
+		}
+
+		[Test]
+		public void should_not_receive_null_events() {
+			Assert.False(_responses
+				.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
+				.Any(x => x.Event is null));
+		}
+
+		[Test]
+		public void should_read_a_number_of_events_equal_to_the_max_count() {
+			Assert.AreEqual(MaxCount, _responses.Count(x => x.Event is not null));
+		}
+
+		[Test]
+		public void should_read_the_correct_events() {
+			Assert.AreEqual(50, _responses.Count(x => x.Event != null));
+			Assert.AreEqual(49, _responses.Last(x => x.Event is not null).Event.Event.StreamRevision);
+		}
+
+		[Test]
+		public async Task should_have_all_positions() {
+			// each (non transaction) event can be looked up in the all stream using its position
+			var events = _responses
+				.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
+				.Select(x => x.Event.Event);
+
+			foreach (var evt in events) {
+				Assert.AreEqual(evt.CommitPosition, evt.PreparePosition);
+
+				using var call = StreamsClient.Read(new() {
+					Options = new() {
+						UuidOption = new() { Structured = new() },
+						Count = 1,
+						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
+						ResolveLinks = true,
+						All = new() {
+							Position = new() {
+								CommitPosition = evt.CommitPosition,
+								PreparePosition = evt.PreparePosition,
+							}
+						},
+						NoFilter = new(),
+					}
+				}, GetCallOptions(AdminCredentials));
+
+				var readEvents = await call.ResponseStream.ReadAllAsync().ToArrayAsync();
+				Assert.AreEqual(1, readEvents.Length);
+				Assert.AreEqual(evt, readEvents[0].Event.Event);
+			}
+		}
+
+		[Test]
+		public void should_indicate_last_position_of_stream() {
+			var streamPosition =
+				_responses.Single(x => x.ContentCase == ReadResp.ContentOneofCase.LastStreamPosition);
+			Assert.AreEqual(99, streamPosition.LastStreamPosition);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_reading_forward_from_the_middle_of_the_stream<TLogFormat, TStreamId>
+		: GrpcSpecification<TLogFormat, TStreamId> {
+		private readonly string _streamName = Guid.NewGuid().ToString();
+		private readonly List<ReadResp> _responses = new();
+		private const ulong MaxCount = 20;
+		private const int EventCount = 100;
+
+		protected override async Task Given() {
+			await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() {
+						StreamName = ByteString.CopyFromUtf8(_streamName)
+					}
+				},
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(EventCount) },
+				CorrelationId = Uuid.NewUuid().ToDto()
+			});
+		}
+
+		protected override async Task When() {
+			using var call = StreamsClient.Read(new() {
+				Options = new ReadReq.Types.Options {
+					Count = MaxCount,
+					Stream = new() {
+						StreamIdentifier = new() {
+							StreamName = ByteString.CopyFromUtf8(_streamName)
+						},
+						Revision = 60
+					},
+					UuidOption = new() { Structured = new() },
+					ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
+					NoFilter = new(),
+					ControlOption = new() { Compatibility = 1 }
+				}
+			});
+			_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
+		}
+
+		[Test]
+		public void should_not_receive_null_events() {
+			Assert.False(_responses
+				.Where(x => x.ContentCase == ReadResp.ContentOneofCase.Event)
+				.Any(x => x.Event is null));
+		}
+
+		[Test]
+		public void should_read_a_number_of_events_equal_to_the_max_count() {
+			Assert.AreEqual(MaxCount, _responses.Count(x => x.Event is not null));
+		}
+
+		[Test]
+		public void should_read_the_correct_events() {
+			Assert.AreEqual(20, _responses.Count(x => x.Event != null));
+			Assert.AreEqual(79, _responses.Last(x => x.Event is not null).Event.Event.StreamRevision);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_reading_forward_from_stream_with_no_events_after_position<TLogFormat, TStreamId>
+		: GrpcSpecification<TLogFormat, TStreamId> {
+		private readonly string _streamName = Guid.NewGuid().ToString();
+		private readonly List<ReadResp> _responses = new();
+		private const ulong MaxCount = 50;
+
+		protected override async Task Given() {
+			await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() {
+						StreamName = ByteString.CopyFromUtf8(_streamName)
+					}
+				},
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(10) },
+				CorrelationId = Uuid.NewUuid().ToDto()
+			});
+		}
+
+		protected override async Task When() {
+			using var call = StreamsClient.Read(new() {
+				Options = new ReadReq.Types.Options {
+					Count = MaxCount,
+					Stream = new() {
+						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(_streamName) },
+						Revision = 11
+					},
+					UuidOption = new() { Structured = new() },
+					ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
+					NoFilter = new()
+				}
+			});
+			_responses.AddRange(await call.ResponseStream.ReadAllAsync().ToArrayAsync());
+		}
+
+		[Test]
+		public void should_not_receive_events() {
+			Assert.IsEmpty(_responses.Where(x => x.Event is not null));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/SubscribeToAllFilteredTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/SubscribeToAllFilteredTests.cs
new file mode 100644
index 00000000000..3a6bb151e2a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/SubscribeToAllFilteredTests.cs
@@ -0,0 +1,481 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Client;
+using EventStore.Client.Streams;
+using Google.Protobuf;
+using Grpc.Core;
+using KurrentDB.Core.Services.Transport.Grpc;
+using NUnit.Framework;
+using GrpcMetadata = KurrentDB.Core.Services.Transport.Grpc.Constants.Metadata;
+using LogV3StreamId = System.UInt32;
+using Position = KurrentDB.Core.Services.Transport.Common.Position;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc.StreamsTests;
+
+[TestFixture]
+public class SubscribeToAllFilteredTests {
+	public static IEnumerable<object[]> TestCases() {
+		var checkpointIntervalMultipliers = new uint[] { 2, 4, 8 };
+
+		var maxSearchWindows = new uint[] { 1, 32, 64 };
+
+		var filteredEventCount = checkpointIntervalMultipliers.Max() * maxSearchWindows.Max();
+
+		var logFormats = new[] {
+			(typeof(LogFormat.V2), typeof(string)),
+			(typeof(LogFormat.V3), typeof(LogV3StreamId)),
+		};
+
+		return from checkpointInterval in checkpointIntervalMultipliers
+			   from maxSearchWindow in maxSearchWindows
+			   from logFormat in logFormats
+			   select new object[] {
+				logFormat.Item1,
+				logFormat.Item2,
+				checkpointInterval,
+				maxSearchWindow,
+				(int)filteredEventCount
+			};
+	}
+
+	[TestFixtureSource(typeof(SubscribeToAllFilteredTests), nameof(TestCases))]
+	public class when_subscribing_to_all_with_a_filter<TLogFormat, TStreamId>
+		: GrpcSpecification<TLogFormat, TStreamId> {
+		private const string StreamName = "test";
+
+		private int CheckpointCount => _positions.Count;
+
+		private readonly uint _maxSearchWindow;
+		private readonly int _filteredEventCount;
+		private readonly uint _checkpointIntervalMultiplier;
+		private readonly List<Position> _positions;
+		private readonly uint _checkpointInterval;
+
+		private Position _position;
+		private long _expected;
+
+		public when_subscribing_to_all_with_a_filter(uint checkpointIntervalMultiplier, uint maxSearchWindow,
+			int filteredEventCount)
+			: base(new LotsOfExpiriesStrategy()) {
+			_maxSearchWindow = maxSearchWindow;
+			_checkpointIntervalMultiplier = checkpointIntervalMultiplier;
+			_checkpointInterval = checkpointIntervalMultiplier * maxSearchWindow;
+			_filteredEventCount = filteredEventCount;
+			_positions = new List<Position>();
+			_position = Position.End;
+		}
+
+		protected override async Task Given() {
+			await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8("abcd") }
+				},
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(_filteredEventCount) },
+				CorrelationId = Uuid.NewUuid().ToDto()
+			});
+		}
+
+		protected override async Task When() {
+			var success = (await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamName) }
+				},
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(1) },
+				CorrelationId = Uuid.NewUuid().ToDto()
+			})).Success;
+
+			_position = new Position(success.Position.CommitPosition, success.Position.PreparePosition);
+
+			using var skippedEventCall = StreamsClient.Read(new ReadReq {
+				Options = new ReadReq.Types.Options {
+					Count = 4096,
+					All = new() { Start = new() },
+					UuidOption = new() { Structured = new() },
+					ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
+					NoFilter = new()
+				}
+			}, GetCallOptions(AdminCredentials));
+			var skippedEventCount = await skippedEventCall.ResponseStream.ReadAllAsync().CountAsync(response =>
+				response.Event is not null &&
+				new Position(response.Event.Event.CommitPosition, response.Event.Event.PreparePosition) <=
+				_position &&
+				response.Event.Event.StreamIdentifier.StreamName.ToStringUtf8() != StreamName);
+
+			// skip the epochinfo - which isn't in unfiltered all reads so we haven't accounted for it above
+			skippedEventCount += 1;
+			_expected = skippedEventCount / _checkpointInterval;
+
+			using var call = StreamsClient.Read(new ReadReq {
+				Options = new ReadReq.Types.Options {
+					Subscription = new(),
+					All = new() { Start = new() },
+					Filter = new() {
+						Max = _maxSearchWindow,
+						CheckpointIntervalMultiplier = _checkpointIntervalMultiplier,
+						StreamIdentifier = new() { Prefix = { StreamName } }
+					},
+					UuidOption = new() { Structured = new() },
+					ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards
+				}
+			}, GetCallOptions(AdminCredentials));
+
+			var receivedTheEvent = false;
+			await foreach (var response in call.ResponseStream.ReadAllAsync()) {
+				if (response.ContentCase == ReadResp.ContentOneofCase.CaughtUp) {
+					// we have successfully transitioned to live (and will receive no more events)
+					break;
+				}
+
+				if (response.ContentCase == ReadResp.ContentOneofCase.Checkpoint) {
+					if (receivedTheEvent) {
+						break;
+					}
+					_positions.Add(new Position(response.Checkpoint.CommitPosition,
+						response.Checkpoint.PreparePosition));
+					continue;
+				}
+
+				if (response.ContentCase == ReadResp.ContentOneofCase.Event) {
+					Assert.AreEqual(StreamName, response.Event.Event.StreamIdentifier.StreamName.ToStringUtf8());
+					receivedTheEvent = true;
+				}
+			}
+		}
+
+		[Test]
+		public void receives_the_correct_number_of_checkpoints() {
+			Assert.AreEqual(_expected, CheckpointCount);
+		}
+
+		[Test]
+		public void no_duplicate_checkpoints_received() {
+			Assert.AreEqual(_positions.Distinct().Count(), _positions.Count);
+		}
+	}
+
+	[TestFixtureSource(typeof(SubscribeToAllFilteredTests), nameof(TestCases))]
+	public class when_subscribing_to_all_with_a_filter_live<TLogFormat, TStreamId>
+		: GrpcSpecification<TLogFormat, TStreamId> {
+		private const string StreamName = "test";
+
+		private int CheckpointCount => _positions.Count;
+
+		private readonly uint _maxSearchWindow;
+		private readonly int _filteredEventCount;
+		private readonly uint _checkpointIntervalMultiplier;
+		private readonly List<Position> _positions;
+		private readonly uint _checkpointInterval;
+
+		private Position _position;
+
+		public when_subscribing_to_all_with_a_filter_live(uint checkpointIntervalMultiplier, uint maxSearchWindow,
+			int filteredEventCount) {
+			_maxSearchWindow = maxSearchWindow;
+			_checkpointIntervalMultiplier = checkpointIntervalMultiplier;
+			_checkpointInterval = checkpointIntervalMultiplier * maxSearchWindow;
+			_filteredEventCount = filteredEventCount;
+			_positions = new List<Position>();
+			_position = Position.End;
+		}
+
+		protected override async Task Given() {
+			await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8("abcd") }
+				},
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(_filteredEventCount) },
+				CorrelationId = Uuid.NewUuid().ToDto()
+			});
+		}
+
+		protected override async Task When() {
+			for (int i = 1; i <= 5; i++) {
+				try {
+					await WhenWhichMightConsumeTooSlow(i);
+					return;
+				} catch (RpcException ex) when (ex.Message.Contains("too slow")) {
+					_positions.Clear();
+					await Task.Delay(500);
+				}
+			}
+		}
+
+		private async Task WhenWhichMightConsumeTooSlow(int attempt) {
+			var streamName = attempt + StreamName;
+			using var call = StreamsClient.Read(new ReadReq {
+				Options = new ReadReq.Types.Options {
+					Subscription = new(),
+					All = new() { End = new() },
+					Filter = new() {
+						Max = _maxSearchWindow,
+						CheckpointIntervalMultiplier = _checkpointIntervalMultiplier,
+						StreamIdentifier = new() { Prefix = { streamName } }
+					},
+					UuidOption = new() { Structured = new() },
+					ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards
+				}
+			}, GetCallOptions(AdminCredentials));
+
+			Assert.True(await call.ResponseStream.MoveNext());
+
+			Assert.AreEqual(ReadResp.ContentOneofCase.Confirmation, call.ResponseStream.Current.ContentCase);
+
+			var success = new BatchAppendResp.Types.Success();
+			for (int i = 0; i <= _checkpointInterval; i++) {
+				success = (await AppendToStreamBatch(new BatchAppendReq {
+					Options = new() {
+						Any = new(),
+						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(streamName) }
+					},
+					IsFinal = true,
+					ProposedMessages = { CreateEvents(1) },
+					CorrelationId = Uuid.NewUuid().ToDto()
+				})).Success;
+			}
+
+			_position = new Position(success.Position.CommitPosition, success.Position.PreparePosition);
+
+			while (await call.ResponseStream.MoveNext()) {
+				var response = call.ResponseStream.Current;
+				if (response.ContentCase == ReadResp.ContentOneofCase.Checkpoint) {
+					_positions.Add(new Position(response.Checkpoint.CommitPosition,
+						response.Checkpoint.PreparePosition));
+					continue;
+				}
+
+				if (response.ContentCase == ReadResp.ContentOneofCase.Event) {
+					Assert.AreEqual(streamName,
+						response.Event.Event.StreamIdentifier.StreamName.ToStringUtf8());
+					if (!(response.Event.CommitPosition < _position.CommitPosition)) {
+						return;
+					}
+				}
+			}
+		}
+
+		[Test]
+		public void receives_the_correct_number_of_checkpoints() {
+			Assert.AreEqual(1, CheckpointCount);
+		}
+
+		[Test]
+		public void no_duplicate_checkpoints_received() {
+			Assert.AreEqual(_positions.Distinct().Count(), _positions.Count);
+		}
+
+		[Test]
+		public void checkpoint_is_before_last_written_event() {
+			Assert.True(_positions[0] < _position);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string), 8, 6)]
+	[TestFixture(typeof(LogFormat.V2), typeof(string), 32, 6)]
+	[TestFixture(typeof(LogFormat.V2), typeof(string), 36, 6)]
+	public class when_subscribing_to_all_with_a_filter_and_transitioning_to_live<TLogFormat, TStreamId>
+		: GrpcSpecification<TLogFormat, TStreamId> {
+
+		private const string StreamA = nameof(StreamA);
+		private const string MarkerStream = nameof(MarkerStream);
+		private const string FinishEventType = nameof(FinishEventType);
+		private const int CheckpointIntervalMultiplier = 2;
+		private const int CheckpointInterval = CheckpointIntervalMultiplier * 32;
+
+		private int _expectedEventCount;
+		private AllStreamPosition _markerPosition;
+		private readonly int _numberOfEventsToCatchUp;
+		private readonly int _expectedCheckpoints;
+		private readonly List<int> _checkpointPositions = new();
+		private readonly Dictionary<ReadResp.ContentOneofCase, int> _contentCaseCounts = new();
+
+		public when_subscribing_to_all_with_a_filter_and_transitioning_to_live(int catchupCount, int expectedCheckpoints)
+			: base(new LotsOfExpiriesStrategy()) {
+
+			_expectedCheckpoints = expectedCheckpoints;
+			_numberOfEventsToCatchUp = catchupCount;
+
+			foreach (var c in Enum.GetValues<ReadResp.ContentOneofCase>()) {
+				_contentCaseCounts.Add(c, 0);
+			}
+		}
+
+		protected override async Task Given() {
+			// marker stream, start subscription after this
+			var result = await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(MarkerStream) }
+				},
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(1) },
+				CorrelationId = Uuid.NewUuid().ToDto()
+			});
+
+			_markerPosition = result.Success.Position;
+
+			// initial events used for catching-up the subscription
+			await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamA) }
+				},
+				IsFinal = true,
+				ProposedMessages = { ExpectEvents(CreateEvents(_numberOfEventsToCatchUp)) },
+				CorrelationId = Uuid.NewUuid().ToDto()
+			});
+		}
+
+		protected override async Task When() {
+			var caughtUp = new TaskCompletionSource();
+			var cancelSubscription = new TaskCompletionSource();
+			var _ = Task.Run(async () => {
+				// subscribe
+				using var call = StreamsClient.Read(new ReadReq {
+					Options = new ReadReq.Types.Options {
+						Subscription = new(),
+						All = new() {
+							Position = new ReadReq.Types.Options.Types.Position() {
+								CommitPosition = _markerPosition.CommitPosition,
+								PreparePosition = _markerPosition.PreparePosition
+							}
+						},
+						Filter = new() {
+							Count = new Empty(),
+							CheckpointIntervalMultiplier = CheckpointIntervalMultiplier,
+							EventType = new ReadReq.Types.Options.Types.FilterOptions.Types.Expression() {
+								Regex = "^[^$].*" // exclude system events
+							},
+						},
+						UuidOption = new() { Structured = new() },
+						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards
+					}
+				}, GetCallOptions(AdminCredentials));
+
+				// consume
+				var cts = new CancellationTokenSource();
+				var sw = Stopwatch.StartNew();
+				var maxResponseTimeMs = TimeSpan.Zero.TotalMilliseconds;
+				try {
+					await foreach (var response in call.ResponseStream.ReadAllAsync(cts.Token)) {
+						maxResponseTimeMs = Math.Max(maxResponseTimeMs, sw.Elapsed.TotalMilliseconds);
+
+						_contentCaseCounts[response.ContentCase]++;
+
+						switch (response.ContentCase) {
+							case ReadResp.ContentOneofCase.Checkpoint:
+								_checkpointPositions.Add(_contentCaseCounts[ReadResp.ContentOneofCase.Event]);
+								break;
+							case ReadResp.ContentOneofCase.CaughtUp:
+								caughtUp.TrySetResult();
+								break;
+							case ReadResp.ContentOneofCase.Event: {
+								if (response.Event.Event.Metadata[GrpcMetadata.Type] == FinishEventType) {
+									// allow some time for final events, like checkpoints, to arrive
+									cts.CancelAfter(TimeSpan.FromMilliseconds(maxResponseTimeMs * 10));
+								}
+								break;
+							}
+						}
+
+						sw.Restart();
+					}
+				} catch (RpcException ex) when (ex.StatusCode == StatusCode.Cancelled) {
+					// expected
+				}
+
+				cancelSubscription.TrySetResult();
+			});
+
+			// wait for initial events to be caught-up and subscription transitions to live
+			await caughtUp.Task;
+
+			for (int i = 0; i < 18; i++) {
+				await AppendToStreamBatch(new BatchAppendReq {
+					Options = new() {
+						Any = new(),
+						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamA) }
+					},
+					IsFinal = true,
+					ProposedMessages = { ExpectEvents(CreateEvents(20)) },
+					CorrelationId = Uuid.NewUuid().ToDto()
+				});
+
+				await Task.Delay(10);
+			}
+
+			await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					Any = new(),
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamA) }
+				},
+				IsFinal = true,
+				ProposedMessages = {
+					ExpectEvents(CreateEvents(15)),
+					ExpectEvents(CreateEvent(FinishEventType))
+				},
+				CorrelationId = Uuid.NewUuid().ToDto()
+			});
+
+			await cancelSubscription.Task;
+		}
+
+		private IEnumerable<BatchAppendReq.Types.ProposedMessage> ExpectEvents(
+			IEnumerable<BatchAppendReq.Types.ProposedMessage> events) => ExpectEvents(events.ToArray());
+
+		private IEnumerable<BatchAppendReq.Types.ProposedMessage> ExpectEvents(params BatchAppendReq.Types.ProposedMessage[] events) {
+			_expectedEventCount += events.Length;
+			return events;
+		}
+
+		[Test]
+		public void receives_the_correct_number_of_confirmations() {
+			Assert.AreEqual(1, _contentCaseCounts[ReadResp.ContentOneofCase.Confirmation]);
+		}
+
+		[Test]
+		public void receives_the_correct_number_of_events() {
+			Assert.AreEqual(_expectedEventCount, _contentCaseCounts[ReadResp.ContentOneofCase.Event]);
+		}
+
+		[Test]
+		public void receives_the_correct_number_of_checkpoints() {
+			Assert.AreEqual(_expectedCheckpoints, _contentCaseCounts[ReadResp.ContentOneofCase.Checkpoint]);
+		}
+
+		[Test]
+		public void receives_the_checkpoints_on_correct_interval() {
+			// ideally the checkpoints should be issued after exactly every `CheckpointInterval` events.
+			// this is how things worked previously but the way the enumerator works has changed for more efficiency:
+			// the enumerator now starts a _permanent_ live subscription to the subscriptions service before catch up starts.
+			// this causes the checkpoints received from the subscriptions service to be offset.
+			// in this test it turns out that it's offset by exactly the number of events to catch up but this is not a strict requirement -
+			// the important thing being verified here is that the checkpoints are received after the correct interval when live.
+
+			var factor = 0L;
+			_checkpointPositions.ForEach(p => Assert.AreEqual(factor++ * CheckpointInterval + _numberOfEventsToCatchUp, p, $"checkpoint at: {p}"));
+		}
+
+		[Test]
+		public void receives_the_subscription_was_caught_up() {
+			Assert.AreEqual(1, _contentCaseCounts[ReadResp.ContentOneofCase.CaughtUp]);
+		}
+
+		[Test]
+		public void does_not_receive_the_subscription_fell_behind() {
+			Assert.Zero(_contentCaseCounts[ReadResp.ContentOneofCase.FellBehind]);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/SubscribeToAllTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/SubscribeToAllTests.cs
new file mode 100644
index 00000000000..5e707f360d3
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/SubscribeToAllTests.cs
@@ -0,0 +1,138 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.Client.Streams;
+using Google.Protobuf;
+using Grpc.Core;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Grpc;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc.StreamsTests;
+
+[TestFixture]
+public class SubscribeToAllTests {
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_subscribing_to_all<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
+		private const string StreamId = nameof(when_subscribing_to_all<TLogFormat, TStreamId>);
+		private readonly List<ReadResp> _responses = new();
+		private Position _positionOfLastWrite;
+
+		public when_subscribing_to_all() : base(new LotsOfExpiriesStrategy()) {
+		}
+
+		protected override async Task Given() {
+			var response = await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamId) },
+					Any = new(),
+				},
+				CorrelationId = Uuid.NewUuid().ToDto(),
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(120) }
+			});
+			_positionOfLastWrite = new Position(response.Success.Position.CommitPosition,
+				response.Success.Position.PreparePosition);
+		}
+
+		protected override async Task When() {
+			using var call = StreamsClient.Read(new() {
+				Options = new() {
+					Subscription = new(),
+					NoFilter = new(),
+					ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
+					UuidOption = new() { Structured = new() },
+					All = new() {
+						Start = new()
+						// Position = new() {
+						// 	CommitPosition = _positionOfLastWrite.CommitPosition,
+						// 	PreparePosition = _positionOfLastWrite.PreparePosition
+						// }
+					}
+				}
+			}, GetCallOptions(AdminCredentials));
+
+			_responses.AddRange(await call.ResponseStream.ReadAllAsync()
+				.TakeWhile(response => response.ContentCase != ReadResp.ContentOneofCase.CaughtUp)
+				.ToArrayAsync());
+		}
+
+		[Test]
+		public void subscription_confirmed() {
+			Assert.AreEqual(ReadResp.ContentOneofCase.Confirmation, _responses[0].ContentCase);
+			Assert.NotNull(_responses[0].Confirmation.SubscriptionId);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_subscribing_to_all_live<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
+		private const string StreamId = nameof(when_subscribing_to_all_live<TLogFormat, TStreamId>);
+		private readonly List<ReadResp> _responses = new();
+
+		protected override async Task Given() {
+			await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamId) },
+					Any = new(),
+				},
+				CorrelationId = Uuid.NewUuid().ToDto(),
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(120) }
+			});
+		}
+
+		protected override async Task When() {
+			using var call = StreamsClient.Read(new() {
+				Options = new() {
+					Subscription = new(),
+					NoFilter = new(),
+					ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
+					UuidOption = new() { Structured = new() },
+					All = new() { End = new() }
+				}
+			}, GetCallOptions(AdminCredentials));
+
+			var positionOfLastWrite = Position.End;
+
+			await foreach (var response in call.ResponseStream.ReadAllAsync()) {
+				if (response.ContentCase == ReadResp.ContentOneofCase.Confirmation) {
+					var success = (await AppendToStreamBatch(new BatchAppendReq {
+						Options = new() {
+							Any = new(),
+							StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamId) }
+						},
+						CorrelationId = Uuid.NewUuid().ToDto(),
+						IsFinal = true,
+						ProposedMessages = { CreateEvents(1) }
+					})).Success;
+
+					positionOfLastWrite = new Position(success.Position.CommitPosition, success.Position.PreparePosition);
+					_responses.Add(response);
+				} else if (response.ContentCase == ReadResp.ContentOneofCase.Event) {
+					_responses.Add(response);
+					if (positionOfLastWrite <= new Position(response.Event.Event.CommitPosition, response.Event.Event.PreparePosition)) {
+						break;
+					}
+				}
+			}
+		}
+
+		[Test]
+		public void subscription_confirmed() {
+			Assert.AreEqual(ReadResp.ContentOneofCase.Confirmation, _responses[0].ContentCase);
+			Assert.NotNull(_responses[0].Confirmation.SubscriptionId);
+		}
+
+		[Test]
+		public void reads_all_the_live_events() {
+			Assert.AreEqual(1,
+				_responses.Count(x => x.ContentCase == ReadResp.ContentOneofCase.Event
+									  && !x.Event.Event.Metadata["type"].StartsWith("$")));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/SubscribeToStreamTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/SubscribeToStreamTests.cs
new file mode 100644
index 00000000000..6118f7c5481
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/SubscribeToStreamTests.cs
@@ -0,0 +1,85 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using EventStore.Client.Streams;
+using Google.Protobuf;
+using Grpc.Core;
+using KurrentDB.Core.Services.Transport.Grpc;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc.StreamsTests;
+
+[TestFixture]
+public class SubscribeToStreamTests {
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_subscribing_to_stream<TLogFormat, TStreamId> : GrpcSpecification<TLogFormat, TStreamId> {
+		private const string StreamId = nameof(when_subscribing_to_stream<TLogFormat, TStreamId>);
+		private readonly List<ReadResp> _responses = new();
+		private ulong _positionOfLastWrite;
+
+		public when_subscribing_to_stream() : base(new LotsOfExpiriesStrategy()) {
+		}
+
+		protected override async Task Given() {
+			var response = await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamId) },
+					Any = new(),
+				},
+				CorrelationId = Uuid.NewUuid().ToDto(),
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(120) }
+			});
+			_positionOfLastWrite = response.Success.CurrentRevision;
+		}
+
+		protected override async Task When() {
+			using var call = StreamsClient.Read(new() {
+				Options = new() {
+					Subscription = new(),
+					NoFilter = new(),
+					ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
+					UuidOption = new() { Structured = new() },
+					Stream = new() {
+						Start = new(),
+						StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamId) },
+					},
+				}
+			}, GetCallOptions(AdminCredentials));
+
+			while (await call.ResponseStream.MoveNext()) {
+				var response = call.ResponseStream.Current;
+				if (response.ContentCase == ReadResp.ContentOneofCase.Event &&
+					_positionOfLastWrite == response.Event.Event.StreamRevision) {
+					break;
+				}
+
+				_responses.Add(response);
+			}
+
+			// caught up, now add one more event
+
+			await AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamId) },
+					Any = new(),
+				},
+				CorrelationId = Uuid.NewUuid().ToDto(),
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(1) }
+			});
+
+			// and consume it. this makes sure we didnt fail while transitioning to live
+			Assert.True(await call.ResponseStream.MoveNext());
+		}
+
+		[Test]
+		public void subscription_confirmed() {
+			Assert.AreEqual(ReadResp.ContentOneofCase.Confirmation, _responses[0].ContentCase);
+			Assert.NotNull(_responses[0].Confirmation.SubscriptionId);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/TombstoneTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/TombstoneTests.cs
new file mode 100644
index 00000000000..cda7e7e2579
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/StreamsTests/TombstoneTests.cs
@@ -0,0 +1,129 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.Client.Streams;
+using Google.Protobuf;
+using Grpc.Core;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Grpc;
+using NUnit.Framework;
+using GrpcConstants = KurrentDB.Core.Services.Transport.Grpc.Constants;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc.StreamsTests;
+
+[TestFixture]
+public class TombstoneTests {
+	private const string StreamName = nameof(TombstoneTests);
+
+	public abstract class TombstoneExistingStreamSpecification<TLogFormat, TStreamId>
+		: GrpcSpecification<TLogFormat, TStreamId> {
+		private readonly TombstoneReq.Types.Options _options;
+		private Exception _caughtException;
+
+		private TombstoneExistingStreamSpecification(TombstoneReq.Types.Options options) {
+			_options = new(options) {
+				StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamName) }
+			};
+		}
+
+		protected TombstoneExistingStreamSpecification(StreamRevision expectedStreamRevision) : this(
+			new TombstoneReq.Types.Options {
+				Revision = expectedStreamRevision.ToUInt64(),
+			}) { }
+
+		protected TombstoneExistingStreamSpecification(long expectedStreamState) : this(expectedStreamState switch {
+			ExpectedVersion.Any => new TombstoneReq.Types.Options { Any = new() },
+			ExpectedVersion.NoStream => new TombstoneReq.Types.Options { NoStream = new() },
+			ExpectedVersion.StreamExists => new TombstoneReq.Types.Options { StreamExists = new() },
+			_ => throw new InvalidOperationException()
+		}) { }
+
+		[Test]
+		public void no_exception_is_thrown() {
+			Assert.Null(_caughtException);
+		}
+
+		[Test]
+		public void the_stream_is_deleted() {
+			var ex = Assert.ThrowsAsync<RpcException>(async () => {
+				using var call = StreamsClient.Read(new() {
+					Options = new() {
+						UuidOption = new() { Structured = new() },
+						NoFilter = new(),
+						ResolveLinks = false,
+						ReadDirection = ReadReq.Types.Options.Types.ReadDirection.Forwards,
+						Count = 1,
+						Stream = new() {
+							StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamName) },
+							Start = new()
+						}
+					}
+				}, GetCallOptions());
+
+				await call.ResponseStream.ReadAllAsync().ToArrayAsync();
+			});
+
+			Assert.NotNull(ex);
+			Assert.AreEqual(StatusCode.FailedPrecondition, ex.Status.StatusCode);
+			Assert.Contains((GrpcConstants.Exceptions.ExceptionKey, GrpcConstants.Exceptions.StreamDeleted),
+				ex.Trailers.Select(x => (x.Key, x.Value)).ToArray());
+		}
+
+		protected override Task Given() => _options.ExpectedStreamRevisionCase switch {
+			TombstoneReq.Types.Options.ExpectedStreamRevisionOneofCase.NoStream => Task.CompletedTask,
+			_ => AppendToStreamBatch(new BatchAppendReq {
+				Options = new() {
+					NoStream = new(),
+					StreamIdentifier = new() { StreamName = ByteString.CopyFromUtf8(StreamName) }
+				},
+				CorrelationId = Uuid.NewUuid().ToDto(),
+				IsFinal = true,
+				ProposedMessages = { CreateEvents(1) }
+			}).AsTask()
+		};
+
+		protected override async Task When() {
+			using var call = StreamsClient.TombstoneAsync(new() {
+				Options = _options
+			}, GetCallOptions());
+
+			try {
+				await call.ResponseAsync;
+			} catch (Exception ex) {
+				_caughtException = ex;
+			}
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class TombstoneExistingStreamExpectedRevision<TLogFormat, TStreamId>
+		: TombstoneExistingStreamSpecification<TLogFormat, TStreamId> {
+		public TombstoneExistingStreamExpectedRevision() : base(StreamRevision.Start) { }
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class TombstoneExistingStreamAny<TLogFormat, TStreamId>
+		: TombstoneExistingStreamSpecification<TLogFormat, TStreamId> {
+		public TombstoneExistingStreamAny() : base(ExpectedVersion.Any) { }
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class TombstoneExistingStreamNoStream<TLogFormat, TStreamId>
+		: TombstoneExistingStreamSpecification<TLogFormat, TStreamId> {
+		public TombstoneExistingStreamNoStream() : base(ExpectedVersion.NoStream) { }
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class TombstoneExistingStreamExists<TLogFormat, TStreamId>
+		: TombstoneExistingStreamSpecification<TLogFormat, TStreamId> {
+		public TombstoneExistingStreamExists() : base(ExpectedVersion.StreamExists) { }
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Grpc/UuidTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/UuidTests.cs
new file mode 100644
index 00000000000..d0af5d73e1d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Grpc/UuidTests.cs
@@ -0,0 +1,103 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Services.Transport.Grpc;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Grpc;
+
+public class UuidTests {
+	[Test]
+	public void Equality() {
+		var sut = Uuid.NewUuid();
+		Assert.AreEqual(Uuid.FromGuid(sut.ToGuid()), sut);
+	}
+
+	[Test]
+	public void Inequality() {
+		var sut = Uuid.NewUuid();
+		Assert.AreNotEqual(Uuid.NewUuid(), sut);
+	}
+
+	[Test]
+	public void EqualityOperator() {
+		var sut = Uuid.NewUuid();
+		Assert.True(Uuid.FromGuid(sut.ToGuid()) == sut);
+	}
+
+	[Test]
+	public void InequalityOperator() {
+		var sut = Uuid.NewUuid();
+		Assert.True(Uuid.NewUuid() != sut);
+	}
+
+	[Test]
+	public void ArgumentNullException() {
+		var ex = Assert.Throws<ArgumentNullException>(() => Uuid.Parse(null));
+		Assert.AreEqual("value", ex.ParamName);
+	}
+
+	[Test]
+	public void ToGuidReturnsExpectedResult() {
+		var guid = Guid.NewGuid();
+		var sut = Uuid.FromGuid(guid);
+
+		Assert.AreEqual(sut.ToGuid(), guid);
+	}
+
+	[Test]
+	public void ToStringProducesExpectedResult() {
+		var sut = Uuid.NewUuid();
+
+		Assert.AreEqual(sut.ToGuid().ToString(), sut.ToString());
+	}
+
+	[Test]
+	public void ToFormattedStringProducesExpectedResult() {
+		var sut = Uuid.NewUuid();
+
+		Assert.AreEqual(sut.ToGuid().ToString("n"), sut.ToString("n"));
+	}
+
+
+	[Test]
+	public void ToDtoReturnsExpectedResult() {
+		var msb = GetRandomInt64();
+		var lsb = GetRandomInt64();
+
+		var sut = Uuid.FromInt64(msb, lsb);
+
+		var result = sut.ToDto();
+
+		Assert.NotNull(result.Structured);
+		Assert.AreEqual(lsb, result.Structured.LeastSignificantBits);
+		Assert.AreEqual(msb, result.Structured.MostSignificantBits);
+	}
+
+	[Test]
+	public void ParseReturnsExpectedResult() {
+		var guid = Guid.NewGuid();
+
+		var sut = Uuid.Parse(guid.ToString());
+
+		Assert.AreEqual(Uuid.FromGuid(guid), sut);
+	}
+
+	[Test]
+	public void FromInt64ReturnsExpectedResult() {
+		var guid = Guid.Parse("65678f9b-d139-4786-8305-b9166922b378");
+		var sut = Uuid.FromInt64(7306966819824813958L, -9005588373953137800L);
+		var expected = Uuid.FromGuid(guid);
+
+		Assert.AreEqual(expected, sut);
+	}
+
+	private static long GetRandomInt64() {
+		var buffer = new byte[sizeof(long)];
+
+		new Random().NextBytes(buffer);
+
+		return BitConverter.ToInt64(buffer, 0);
+	}
+}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Http/Authentication/basic_http_authentication_provider.cs b/src/KurrentDB.Core.Tests/Services/Transport/Http/Authentication/basic_http_authentication_provider.cs
similarity index 93%
rename from src/EventStore.Core.Tests/Services/Transport/Http/Authentication/basic_http_authentication_provider.cs
rename to src/KurrentDB.Core.Tests/Services/Transport/Http/Authentication/basic_http_authentication_provider.cs
index d8c50dda86f..e1e39640d51 100644
--- a/src/EventStore.Core.Tests/Services/Transport/Http/Authentication/basic_http_authentication_provider.cs
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Http/Authentication/basic_http_authentication_provider.cs
@@ -1,22 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Security.Claims;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Transport.Http.Authentication;
-using EventStore.Core.Services.Transport.Http.Messages;
-using EventStore.Core.Tests.Authentication;
-using EventStore.Transport.Http.EntityManagement;
-using NUnit.Framework;
-using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using EventStore.Plugins.Authentication;
+using KurrentDB.Core.Services.Transport.Http.Authentication;
+using KurrentDB.Core.Tests.Authentication;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Primitives;
+using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Services.Transport.Http.Authentication {
+namespace KurrentDB.Core.Tests.Services.Transport.Http.Authentication {
 	namespace basic_http_authentication_provider {
 		public abstract class TestFixtureWithBasicHttpAuthenticationProvider<TLogFormat, TStreamId> : with_internal_authentication_provider<TLogFormat, TStreamId> {
 			protected BasicHttpAuthenticationProvider _provider;
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Http/Authentication/node_certificate_authentication_provider.cs b/src/KurrentDB.Core.Tests/Services/Transport/Http/Authentication/node_certificate_authentication_provider.cs
new file mode 100644
index 00000000000..045ec2f1e3c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Http/Authentication/node_certificate_authentication_provider.cs
@@ -0,0 +1,378 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Net;
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authentication;
+using KurrentDB.Core.Services.Transport.Http.Authentication;
+using KurrentDB.Core.Services.UserManagement;
+using Microsoft.AspNetCore.Http;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Http.Authentication;
+
+public class TestFixtureWithNodeCertificateHttpAuthenticationProvider {
+	protected NodeCertificateAuthenticationProvider _provider;
+
+	protected void SetUpProvider() {
+		_provider = new NodeCertificateAuthenticationProvider(() => "eventstoredb-node");
+	}
+}
+
+[TestFixture]
+public class
+	when_handling_a_request_without_a_client_certificate :
+		TestFixtureWithNodeCertificateHttpAuthenticationProvider {
+	private bool _authenticateResult;
+
+	[SetUp]
+	public void SetUp() {
+		SetUpProvider();
+		var context = new DefaultHttpContext();
+		Assert.IsNull(context.Connection.ClientCertificate);
+		_authenticateResult = _provider.Authenticate(context, out _);
+	}
+
+	[Test]
+	public void returns_false() {
+		Assert.IsFalse(_authenticateResult);
+	}
+}
+
+[TestFixture]
+public class
+	when_handling_a_request_with_a_client_certificate_having_no_san :
+		TestFixtureWithNodeCertificateHttpAuthenticationProvider {
+	private HttpAuthenticationRequest _authenticateRequest;
+	private bool _authenticateResult;
+	private HttpContext _context;
+
+	[SetUp]
+	public void SetUp() {
+		SetUpProvider();
+		_context = new DefaultHttpContext();
+		using (var rsa = RSA.Create()) {
+			var certRequest = new CertificateRequest("CN=test", rsa, HashAlgorithmName.SHA256,
+				RSASignaturePadding.Pkcs1);
+			_context.Connection.ClientCertificate = certRequest.CreateSelfSigned(DateTimeOffset.UtcNow.AddMonths(-1), DateTimeOffset.UtcNow.AddMonths(1));
+		}
+
+		_authenticateResult = _provider.Authenticate(_context, out _authenticateRequest);
+	}
+
+	[Test]
+	public void returns_false() {
+		Assert.IsFalse(_authenticateResult);
+	}
+
+	[Test]
+	public void authentication_request_is_null() {
+		Assert.IsNull(_authenticateRequest);
+	}
+
+	[Test]
+	public void no_roles_are_assigned() {
+		Assert.AreEqual(0, _context.User.Claims.Count());
+	}
+}
+
+[TestFixture]
+public class
+	when_handling_a_request_with_a_client_certificate_having_an_ip_san_but_without_node_cn :
+		TestFixtureWithNodeCertificateHttpAuthenticationProvider {
+	private HttpAuthenticationRequest _authenticateRequest;
+	private bool _authenticateResult;
+	private HttpContext _context;
+
+	[SetUp]
+	public void SetUp() {
+		SetUpProvider();
+		_context = new DefaultHttpContext();
+		X509Certificate2 certificate;
+
+		using (RSA rsa = RSA.Create()) {
+			var certReq = new CertificateRequest("CN=hello", rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
+			var sanBuilder = new SubjectAlternativeNameBuilder();
+			sanBuilder.AddIpAddress(IPAddress.Loopback);
+			certReq.CertificateExtensions.Add(sanBuilder.Build());
+			certificate = certReq.CreateSelfSigned(DateTimeOffset.UtcNow.AddMonths(-1), DateTimeOffset.UtcNow.AddMonths(1));
+		}
+
+		_context.Connection.ClientCertificate = certificate;
+		_authenticateResult = _provider.Authenticate(_context, out _authenticateRequest);
+	}
+
+	[Test]
+	public void returns_false() {
+		Assert.IsFalse(_authenticateResult);
+	}
+
+	[Test]
+	public void authentication_request_is_null() {
+		Assert.IsNull(_authenticateRequest);
+	}
+
+	[Test]
+	public void no_roles_are_assigned() {
+		Assert.AreEqual(0, _context.User.Claims.Count());
+	}
+}
+
+[TestFixture]
+public class
+	when_handling_a_request_with_a_client_certificate_having_an_ip_san_and_node_cn :
+		TestFixtureWithNodeCertificateHttpAuthenticationProvider {
+	private HttpAuthenticationRequest _authenticateRequest;
+	private bool _authenticateResult;
+	private HttpContext _context;
+
+	[SetUp]
+	public void SetUp() {
+		SetUpProvider();
+		_context = new DefaultHttpContext();
+		X509Certificate2 certificate;
+
+		using (RSA rsa = RSA.Create()) {
+			var certReq = new CertificateRequest("CN=eventstoredb-node", rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
+
+			var sanBuilder = new SubjectAlternativeNameBuilder();
+			sanBuilder.AddIpAddress(IPAddress.Loopback);
+			certReq.CertificateExtensions.Add(sanBuilder.Build());
+
+			certReq.CertificateExtensions.Add(new X509KeyUsageExtension(
+				X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.KeyEncipherment, critical: false));
+
+			certReq.CertificateExtensions.Add(new X509EnhancedKeyUsageExtension(
+				[
+					new("1.3.6.1.5.5.7.3.1"), // serverAuth
+					new("1.3.6.1.5.5.7.3.2"), // clientAuth
+				],
+				critical: false));
+
+			certificate = certReq.CreateSelfSigned(DateTimeOffset.UtcNow.AddMonths(-1), DateTimeOffset.UtcNow.AddMonths(1));
+		}
+
+		_context.Connection.ClientCertificate = certificate;
+		_authenticateResult = _provider.Authenticate(_context, out _authenticateRequest);
+	}
+
+	[Test]
+	public void returns_true() {
+		Assert.IsTrue(_authenticateResult);
+	}
+
+	[Test]
+	public async Task passes_authentication() {
+		var (status, _) = await _authenticateRequest.AuthenticateAsync();
+		Assert.AreEqual(HttpAuthenticationRequestStatus.Authenticated, status);
+	}
+
+	[Test]
+	public async Task sets_user_to_system_user() {
+		var (_, user) = await _authenticateRequest.AuthenticateAsync();
+		Assert.AreEqual(SystemAccounts.System.Claims, user.Claims);
+	}
+}
+
+[TestFixture]
+public class
+	when_handling_a_request_with_a_client_certificate_having_an_ip_san_and_node_cn_with_additional_subject_details :
+		TestFixtureWithNodeCertificateHttpAuthenticationProvider {
+	private HttpAuthenticationRequest _authenticateRequest;
+	private bool _authenticateResult;
+	private HttpContext _context;
+
+	[SetUp]
+	public void SetUp() {
+		SetUpProvider();
+		_context = new DefaultHttpContext();
+		X509Certificate2 certificate;
+
+		using (RSA rsa = RSA.Create()) {
+			var certReq = new CertificateRequest("C=UK, O=Event Store Ltd, CN=eventstoredb-node", rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
+
+			var sanBuilder = new SubjectAlternativeNameBuilder();
+			sanBuilder.AddIpAddress(IPAddress.Loopback);
+			certReq.CertificateExtensions.Add(sanBuilder.Build());
+
+			certReq.CertificateExtensions.Add(new X509KeyUsageExtension(
+				X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.KeyEncipherment, critical: false));
+
+			certReq.CertificateExtensions.Add(new X509EnhancedKeyUsageExtension(
+				[
+					new("1.3.6.1.5.5.7.3.1"), // serverAuth
+					new("1.3.6.1.5.5.7.3.2"), // clientAuth
+				],
+				critical: false));
+
+			certificate = certReq.CreateSelfSigned(DateTimeOffset.UtcNow.AddMonths(-1), DateTimeOffset.UtcNow.AddMonths(1));
+		}
+
+		_context.Connection.ClientCertificate = certificate;
+		_authenticateResult = _provider.Authenticate(_context, out _authenticateRequest);
+	}
+
+	[Test]
+	public void returns_true() {
+		Assert.IsTrue(_authenticateResult);
+	}
+
+	[Test]
+	public async Task passes_authentication() {
+		var (status, _) = await _authenticateRequest.AuthenticateAsync();
+		Assert.AreEqual(HttpAuthenticationRequestStatus.Authenticated, status);
+	}
+
+	[Test]
+	public async Task sets_user_to_system_user() {
+		var (_, user) = await _authenticateRequest.AuthenticateAsync();
+		Assert.AreEqual(SystemAccounts.System.Claims, user.Claims);
+	}
+}
+
+
+[TestFixture]
+public class
+	when_handling_a_request_with_a_client_certificate_having_a_dns_san_but_without_node_cn :
+		TestFixtureWithNodeCertificateHttpAuthenticationProvider {
+	private HttpAuthenticationRequest _authenticateRequest;
+	private bool _authenticateResult;
+	private HttpContext _context;
+
+	[SetUp]
+	public void SetUp() {
+		SetUpProvider();
+		_context = new DefaultHttpContext();
+		X509Certificate2 certificate;
+
+		using (RSA rsa = RSA.Create()) {
+			var certReq = new CertificateRequest("CN=hello", rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
+			var sanBuilder = new SubjectAlternativeNameBuilder();
+			sanBuilder.AddDnsName("localhost");
+			certReq.CertificateExtensions.Add(sanBuilder.Build());
+			certificate = certReq.CreateSelfSigned(DateTimeOffset.UtcNow.AddMonths(-1), DateTimeOffset.UtcNow.AddMonths(1));
+		}
+
+		_context.Connection.ClientCertificate = certificate;
+		_authenticateResult = _provider.Authenticate(_context, out _authenticateRequest);
+	}
+
+	[Test]
+	public void returns_false() {
+		Assert.IsFalse(_authenticateResult);
+	}
+
+	[Test]
+	public void authentication_request_is_null() {
+		Assert.IsNull(_authenticateRequest);
+	}
+
+	[Test]
+	public void no_roles_are_assigned() {
+		Assert.AreEqual(0, _context.User.Claims.Count());
+	}
+}
+
+[TestFixture]
+public class
+	when_handling_a_request_with_a_client_certificate_having_a_dns_san_and_node_cn :
+		TestFixtureWithNodeCertificateHttpAuthenticationProvider {
+	private HttpAuthenticationRequest _authenticateRequest;
+	private bool _authenticateResult;
+	private HttpContext _context;
+
+	[SetUp]
+	public void SetUp() {
+		SetUpProvider();
+		_context = new DefaultHttpContext();
+		X509Certificate2 certificate;
+
+		using (RSA rsa = RSA.Create()) {
+			var certReq = new CertificateRequest("CN=eventstoredb-node", rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
+
+			var sanBuilder = new SubjectAlternativeNameBuilder();
+			sanBuilder.AddDnsName("localhost");
+			certReq.CertificateExtensions.Add(sanBuilder.Build());
+
+			certReq.CertificateExtensions.Add(new X509KeyUsageExtension(
+				X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.KeyEncipherment, critical: false));
+
+			certReq.CertificateExtensions.Add(new X509EnhancedKeyUsageExtension(
+				[
+					new("1.3.6.1.5.5.7.3.1"), // serverAuth
+					new("1.3.6.1.5.5.7.3.2"), // clientAuth
+				],
+				critical: false));
+
+			certificate = certReq.CreateSelfSigned(DateTimeOffset.UtcNow.AddMonths(-1), DateTimeOffset.UtcNow.AddMonths(1));
+		}
+
+		_context.Connection.ClientCertificate = certificate;
+		_authenticateResult = _provider.Authenticate(_context, out _authenticateRequest);
+	}
+
+	[Test]
+	public void returns_true() {
+		Assert.IsTrue(_authenticateResult);
+	}
+
+	[Test]
+	public async Task passes_authentication() {
+		var (status, _) = await _authenticateRequest.AuthenticateAsync();
+		Assert.AreEqual(HttpAuthenticationRequestStatus.Authenticated, status);
+	}
+
+	[Test]
+	public async Task sets_user_to_system_user() {
+		var (_, user) = await _authenticateRequest.AuthenticateAsync();
+		Assert.AreEqual(SystemAccounts.System.Claims, user.Claims);
+	}
+}
+
+[TestFixture]
+public class
+	when_handling_a_request_with_a_client_certificate_having_a_non_dns_or_ip_san_with_node_cn :
+		TestFixtureWithNodeCertificateHttpAuthenticationProvider {
+	private HttpAuthenticationRequest _authenticateRequest;
+	private bool _authenticateResult;
+	private HttpContext _context;
+
+	[SetUp]
+	public void SetUp() {
+		SetUpProvider();
+		_context = new DefaultHttpContext();
+		X509Certificate2 certificate;
+
+		using (RSA rsa = RSA.Create()) {
+			var certReq = new CertificateRequest("CN=eventstoredb-node", rsa, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
+			var sanBuilder = new SubjectAlternativeNameBuilder();
+			sanBuilder.AddEmailAddress("hello@hello.org");
+			sanBuilder.AddUserPrincipalName("test@test.com");
+			sanBuilder.AddUri(new Uri("http://localhost"));
+			certReq.CertificateExtensions.Add(sanBuilder.Build());
+			certificate = certReq.CreateSelfSigned(DateTimeOffset.UtcNow.AddMonths(-1), DateTimeOffset.UtcNow.AddMonths(1));
+		}
+
+		_context.Connection.ClientCertificate = certificate;
+		_authenticateResult = _provider.Authenticate(_context, out _authenticateRequest);
+	}
+
+	[Test]
+	public void returns_false() {
+		Assert.IsFalse(_authenticateResult);
+	}
+
+	[Test]
+	public void authentication_request_is_null() {
+		Assert.IsNull(_authenticateRequest);
+	}
+
+	[Test]
+	public void no_roles_are_assigned() {
+		Assert.AreEqual(0, _context.User.Claims.Count());
+	}
+}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Http/Authentication/rfc_2898_password_hash_algorithm.cs b/src/KurrentDB.Core.Tests/Services/Transport/Http/Authentication/rfc_2898_password_hash_algorithm.cs
similarity index 85%
rename from src/EventStore.Core.Tests/Services/Transport/Http/Authentication/rfc_2898_password_hash_algorithm.cs
rename to src/KurrentDB.Core.Tests/Services/Transport/Http/Authentication/rfc_2898_password_hash_algorithm.cs
index 858b844dce5..22830498cda 100644
--- a/src/EventStore.Core.Tests/Services/Transport/Http/Authentication/rfc_2898_password_hash_algorithm.cs
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Http/Authentication/rfc_2898_password_hash_algorithm.cs
@@ -1,7 +1,10 @@
-using EventStore.Core.Services.Transport.Http.Authentication;
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Services.Transport.Http.Authentication;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Services.Transport.Http.Authentication {
+namespace KurrentDB.Core.Tests.Services.Transport.Http.Authentication {
 	namespace rfc_2898_password_hash_algorithm {
 		[TestFixture]
 		public class when_hashing_a_password {
@@ -55,7 +58,7 @@ public void generates_different_hashes() {
 				Assert.That(_hash1 != _hash2);
 			}
 		}
-		
+
 		[TestFixture]
 		public class when_upgrading_the_hashes {
 			private Rfc2898PasswordHashAlgorithm _algorithm;
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Http/Authentication/unix_socket_authentication_provider.cs b/src/KurrentDB.Core.Tests/Services/Transport/Http/Authentication/unix_socket_authentication_provider.cs
new file mode 100644
index 00000000000..6eefe0f1a09
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Http/Authentication/unix_socket_authentication_provider.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authentication;
+using KurrentDB.Core.Services.Transport.Http;
+using KurrentDB.Core.Services.Transport.Http.Authentication;
+using KurrentDB.Core.Services.UserManagement;
+using Microsoft.AspNetCore.Connections.Features;
+using Microsoft.AspNetCore.Http;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Http.Authentication;
+
+public class TestFixtureWithUnixSocketAuthenticationProvider {
+	protected UnixSocketAuthenticationProvider _provider;
+
+	protected void SetUpProvider() {
+		_provider = new UnixSocketAuthenticationProvider();
+	}
+}
+
+class ConnectionItemsFeature : IConnectionItemsFeature {
+	public IDictionary<object, object> Items { get; set; }
+
+	public ConnectionItemsFeature() {
+		Items = new Dictionary<object, object>();
+	}
+}
+
+[TestFixture]
+public class when_handling_a_request_not_having_the_unix_socket_connection_item : TestFixtureWithUnixSocketAuthenticationProvider {
+	private bool _authenticateResult;
+
+	[SetUp]
+	public void SetUp() {
+		SetUpProvider();
+		var context = new DefaultHttpContext();
+		_authenticateResult = _provider.Authenticate(context, out _);
+	}
+
+	[Test]
+	public void returns_false() {
+		Assert.IsFalse(_authenticateResult);
+	}
+}
+
+[TestFixture]
+public class when_handling_a_request_having_the_unix_socket_connection_item : TestFixtureWithUnixSocketAuthenticationProvider {
+	private bool _authenticateResult;
+	private HttpAuthenticationRequest _authenticateRequest;
+
+	[SetUp]
+	public void SetUp() {
+		SetUpProvider();
+		var context = new DefaultHttpContext();
+		var connectionItemsFeature = new ConnectionItemsFeature();
+		connectionItemsFeature.Items.Add(UnixSocketConnectionMiddleware.UnixSocketConnectionKey, true);
+		context.Features.Set<IConnectionItemsFeature>(connectionItemsFeature);
+
+		_authenticateResult = _provider.Authenticate(context, out _authenticateRequest);
+	}
+
+	[Test]
+	public void returns_true() {
+		Assert.IsTrue(_authenticateResult);
+	}
+
+	[Test]
+	public async Task passes_authentication() {
+		var (status, _) = await _authenticateRequest.AuthenticateAsync();
+		Assert.AreEqual(HttpAuthenticationRequestStatus.Authenticated, status);
+	}
+
+	[Test]
+	public async Task sets_user_to_system_user() {
+		var (_, user) = await _authenticateRequest.AuthenticateAsync();
+		Assert.AreEqual(SystemAccounts.System.Claims, user.Claims);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Http/Authorization/authorization_tests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Http/Authorization/authorization_tests.cs
new file mode 100644
index 00000000000..1aade6507f0
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Http/Authorization/authorization_tests.cs
@@ -0,0 +1,273 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.Integration;
+using NUnit.Framework;
+using ContentType = KurrentDB.Transport.Http.ContentType;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Http.Authorization;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class Authorization<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
+	private readonly Dictionary<string, HttpClient> _httpClients = new Dictionary<string, HttpClient>();
+	private TimeSpan _timeout = TimeSpan.FromSeconds(5);
+	private int _leaderId;
+
+
+	private HttpClient CreateHttpClient(string username, string password) {
+		var client = new HttpClient(new HttpClientHandler {
+			AllowAutoRedirect = false,
+			ServerCertificateCustomValidationCallback = delegate { return true; }
+		}) {
+			Timeout = _timeout
+		};
+
+		if (!string.IsNullOrEmpty(username)) {
+			client.DefaultRequestHeaders.Authorization =
+				new AuthenticationHeaderValue(
+					"Basic", Convert.ToBase64String(
+						Encoding.ASCII.GetBytes(
+							$"{username}:{password}")));
+		}
+
+		return client;
+	}
+
+	private async Task<int> SendRequest(HttpClient client, HttpMethod method, string url, string body, string contentType) {
+		var request = new HttpRequestMessage();
+		request.Method = method;
+		request.RequestUri = new Uri(url);
+
+		if (body != null) {
+			var bodyBytes = Helper.UTF8NoBom.GetBytes(body);
+			var stream = new MemoryStream(bodyBytes);
+			var content = new StreamContent(stream);
+			content.Headers.ContentLength = bodyBytes.Length;
+			if (contentType != null)
+				content.Headers.ContentType = new MediaTypeHeaderValue(contentType);
+			request.Content = content;
+		}
+
+		var result = await client.SendAsync(request);
+		return (int)result.StatusCode;
+	}
+
+	private HttpMethod GetHttpMethod(string method) {
+		switch (method) {
+			case "GET":
+				return HttpMethod.Get;
+			case "POST":
+				return HttpMethod.Post;
+			case "PUT":
+				return HttpMethod.Put;
+			case "DELETE":
+				return HttpMethod.Delete;
+			default:
+				throw new Exception("Unknown Http Method");
+		}
+	}
+
+	private int GetAuthLevel(string userAuthorizationLevel) {
+		switch (userAuthorizationLevel) {
+			case "None":
+				return 0;
+			case "User":
+				return 1;
+			case "Ops":
+				return 2;
+			case "Admin":
+				return 3;
+			default:
+				throw new Exception("Unknown authorization level");
+		}
+	}
+	public async Task CreateUser(string username, string password) {
+		for (int trial = 1; trial <= 5; trial++) {
+			try {
+				var dataStr = string.Format("{{loginName: '{0}', fullName: '{1}', password: '{2}', groups: []}}", username, username, password);
+				var data = Helper.UTF8NoBom.GetBytes(dataStr);
+				var stream = new MemoryStream(data);
+				var content = new StreamContent(stream);
+				content.Headers.Add("Content-Type", ContentType.Json);
+
+				var res = await _httpClients["Admin"].PostAsync(
+					string.Format("https://{0}/users/", _nodes[_leaderId].HttpEndPoint),
+					content
+				);
+				res.EnsureSuccessStatusCode();
+				break;
+			} catch (HttpRequestException) {
+				if (trial == 5) {
+					throw new Exception(string.Format("Error creating user: {0}", username));
+				}
+				await Task.Delay(1000);
+			}
+		}
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		//find the leader node
+		for (int i = 0; i < _nodes.Length; i++) {
+			if (_nodes[i].NodeState == VNodeState.Leader) {
+				_leaderId = i;
+				break;
+			}
+		}
+
+		_httpClients["Admin"] = CreateHttpClient("admin", "changeit");
+		_httpClients["Ops"] = CreateHttpClient("ops", "changeit");
+		await CreateUser("user", "changeit");
+		_httpClients["User"] = CreateHttpClient("user", "changeit");
+		_httpClients["None"] = CreateHttpClient(null, null);
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		foreach (var kvp in _httpClients) {
+			kvp.Value.Dispose();
+		}
+		return base.TestFixtureTearDown();
+	}
+
+	[Test, Combinatorial]
+	public async Task authorization_tests(
+		[Values(
+			"None",
+			"User",
+			"Ops",
+			"Admin"
+		)] string userAuthorizationLevel,
+		[Values(
+			"/admin/shutdown;POST;Ops", /* this test is not executed for Ops and Admin to prevent the node from shutting down */
+			"/admin/scavenge?startFromChunk={startFromChunk}&threads={threads};POST;Ops",
+			"/admin/scavenge/{scavengeId};DELETE;Ops",
+			"/admin/scavenge/current;GET;Ops",
+			"/admin/scavenge/last;GET;Ops",
+			"/admin/mergeindexes;POST;Ops",
+			"/ping;GET;None",
+			"/info;GET;None",
+			"/info/options;GET;Ops",
+			"/stats;GET;None",
+			"/stats/replication;GET;None",
+			"/stats/tcp;GET;None",
+			"/stats/{*statPath};GET;None",
+			"/streams/{stream};POST;None",
+			"/streams/{stream};DELETE;None",
+			"/streams/{stream}/incoming/{C38FC5D7-C0B6-4F47-A60D-9BF3D1B76BDF};POST;None",
+			"/streams/{stream}/;POST;None",
+			"/streams/{stream}/;DELETE;None",
+			"/streams/{stream}/;GET;None",
+			//These are not valid urls, and by default all users can perform all operations on streams
+			//"/streams/{stream}?embed={embed};GET;User",
+			//"/streams/{stream}/{event}?embed={embed};GET;User",
+			//"/streams/{stream}/{event}/{count}?embed={embed};GET;User",
+			//"/streams/{stream}/{event}/backward/{count}?embed={embed};GET;User",
+			//"/streams/{stream}/metadata;POST;User",
+			//"/streams/{stream}/metadata/;POST;User",
+			//"/streams/{stream}/metadata?embed={embed};GET;User",
+			//"/streams/{stream}/metadata/?embed={embed};GET;User",
+			//"/streams/{stream}/metadata/{event}?embed={embed};GET;User",
+			//"/streams/{stream}/metadata/{event}/{count}?embed={embed};GET;User",
+			//"/streams/{stream}/metadata/{event}/backward/{count}?embed={embed};GET;User",
+			"/streams/$all/;GET;User", /* only redirects, so "User" is allowed */
+			"/streams/%24all/;GET;User", /* only redirects, so "User" is allowed */
+			/* -- with default ACLs, only Admin should be able to read $all -- */
+			"/streams/$all?embed={embed};GET;Admin",
+			"/streams/$all/00000000000000000000000000000000/10?embed={embed};GET;Admin", /* /streams/$all/{position}/{count}?embed={embed} */
+			"/streams/$all/head/backward/10?embed={embed};GET;Admin", /* /streams/$all/{position}/backward/{count}?embed={embed} */
+			"/streams/%24all?embed={embed};GET;Admin",
+			"/streams/%24all/00000000000000000000000000000000/10?embed={embed};GET;Admin", /* /streams/%24all/{position}/{count}?embed={embed} */
+			"/streams/%24all/head/backward/10?embed={embed};GET;Admin", /* /streams/%24all/{position}/backward/{count}?embed={embed} */
+			/* ------------------------------------------------------------- */
+			"/subscriptions;GET;User",
+			"/subscriptions/{stream};GET;User",
+			"/subscriptions/{stream}/{subscription};PUT;Ops",
+			"/subscriptions/{stream}/{subscription};POST;Ops",
+			"/subscriptions/{stream}/{subscription};DELETE;Ops",
+			"/subscriptions/{stream}/{subscription};GET;User",
+			"/subscriptions/{stream}/{subscription}?embed={embed};GET;User",
+			"/subscriptions/{stream}/{subscription}/{count}?embed={embed};GET;User",
+			"/subscriptions/{stream}/{subscription}/info;GET;User",
+			"/subscriptions/{stream}/{subscription}/ack/{messageid};POST;User",
+			"/subscriptions/{stream}/{subscription}/nack/{messageid}?action={action};POST;User",
+			"/subscriptions/{stream}/{subscription}/ack?ids={messageids};POST;User",
+			"/subscriptions/{stream}/{subscription}/nack?ids={messageids}&action={action};POST;User",
+			"/subscriptions/{stream}/{subscription}/replayParked?stopAt=1;POST;Ops",
+			"/users;GET;Admin",
+			"/users/;GET;Admin",
+			"/users/{login};GET;Admin",
+			"/users/$current;GET;User",
+			"/users;POST;Admin",
+			"/users/;POST;Admin",
+			"/users/{login};PUT;Admin",
+			"/users/{login};DELETE;Admin",
+			"/users/{login}/command/enable;POST;Admin",
+			"/users/{login}/command/disable;POST;Admin",
+			"/users/{login}/command/reset-password;POST;Admin",
+			//"/users/{login}/command/change-password;POST;User", Users can only change their own password, so this url won't be correct in these tests
+			"/web/{*remaining_path};GET;None",
+			";GET;None",
+			"/web;GET;None"
+		)] string httpEndpointDetails
+	) {
+		/*use the leader node endpoint to avoid any redirects*/
+		var nodeEndpoint = _nodes[_leaderId].HttpEndPoint;
+		var httpEndpointTokens = httpEndpointDetails.Split(';');
+		var endpointUrl = httpEndpointTokens[0];
+		var httpMethod = GetHttpMethod(httpEndpointTokens[1]);
+		var requiredMinAuthorizationLevel = httpEndpointTokens[2];
+
+		/* this test was done manually for Admin and Ops */
+		if (endpointUrl == "/admin/shutdown" && (userAuthorizationLevel == "Admin" || userAuthorizationLevel == "Ops")) {
+			return;
+		}
+
+		var url = $"https://{nodeEndpoint}{endpointUrl}";
+		var body = GetData(httpMethod, endpointUrl);
+		var contentType = httpMethod == HttpMethod.Post || httpMethod == HttpMethod.Put || httpMethod == HttpMethod.Delete ? ContentType.Json : null;
+		var statusCode = await SendRequest(_httpClients[userAuthorizationLevel], httpMethod, url, body, contentType);
+
+		if (GetAuthLevel(userAuthorizationLevel) >= GetAuthLevel(requiredMinAuthorizationLevel)) {
+			Assert.AreNotEqual(401, statusCode);
+		} else {
+			if (statusCode >= 300 && statusCode < 400) {
+				//Redirects are always allowed because authorization is done on the canonical url
+				Assert.GreaterOrEqual(statusCode, 300);
+				Assert.LessOrEqual(statusCode, 307);
+			} else {
+				if (userAuthorizationLevel == "None") {
+					Assert.GreaterOrEqual(statusCode, 401);
+					Assert.LessOrEqual(statusCode, 403);
+				} else {
+					Assert.AreEqual(401, statusCode);
+				}
+			}
+		}
+	}
+
+	private string GetData(HttpMethod httpMethod, string url) {
+		if (httpMethod == HttpMethod.Post || httpMethod == HttpMethod.Put || httpMethod == HttpMethod.Delete) {
+			if (url.Equals("/users/{login}/command/change-password") || url.Equals("/users/{login}/command/reset-password")) {
+				return "{newPassword: \"changeit\"}";
+			} else if (url.Equals("/users") || url.Equals("/users/")) {
+				return "{loginName: \"test\", fullName: \"test\", password: \"changeit\", groups: []}";
+			}
+			return "{}";
+		} else {
+			return null;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Http/HttpBootstrap.cs b/src/KurrentDB.Core.Tests/Services/Transport/Http/HttpBootstrap.cs
new file mode 100644
index 00000000000..7d8be02e41d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Http/HttpBootstrap.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Transport.Http;
+using KurrentDB.Core.Services.Transport.Http.Controllers;
+using KurrentDB.Core.Tests.Fakes;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Http;
+
+public class HttpBootstrap {
+	public static void Subscribe(ISubscriber bus, KestrelHttpService service) {
+		bus.Subscribe<SystemMessage.SystemInit>(service);
+		bus.Subscribe<SystemMessage.BecomeShuttingDown>(service);
+	}
+
+	public static void Unsubscribe(ISubscriber bus, KestrelHttpService service) {
+		bus.Unsubscribe<SystemMessage.SystemInit>(service);
+		bus.Unsubscribe<SystemMessage.BecomeShuttingDown>(service);
+	}
+
+	public static void RegisterPing(IHttpService service) {
+		service.SetupController(new PingController());
+	}
+
+	public static void RegisterStat(IHttpService service) {
+		service.SetupController(new StatController(new FakePublisher(), new FakePublisher()));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Http/TestAuthenticationProviderFactory.cs b/src/KurrentDB.Core.Tests/Services/Transport/Http/TestAuthenticationProviderFactory.cs
new file mode 100644
index 00000000000..52d42717727
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Http/TestAuthenticationProviderFactory.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Security.Claims;
+using EventStore.Plugins.Authentication;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Http;
+
+public class TestAuthenticationProviderFactory : IAuthenticationProviderFactory {
+	public IAuthenticationProvider Build(bool logFailedAuthenticationAttempts) =>
+		new TestAuthenticationProvider();
+}
+
+public class TestAuthenticationProvider() : AuthenticationProviderBase(name: "test") {
+	public override void Authenticate(AuthenticationRequest authenticationRequest) =>
+		authenticationRequest.Authenticated(
+			new(new ClaimsIdentity(new[] { new Claim(ClaimTypes.Name, authenticationRequest.Name) }))
+		);
+
+	public override IReadOnlyList<string> GetSupportedAuthenticationSchemes() => ["Basic"];
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Http/atom_specs.cs b/src/KurrentDB.Core.Tests/Services/Transport/Http/atom_specs.cs
new file mode 100644
index 00000000000..1eaba328156
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Http/atom_specs.cs
@@ -0,0 +1,232 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Xml;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.Atom;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Http;
+
+[TestFixture]
+public class feed_element_must {
+	private const string FeedUrl = "http://127.0.0.1/streams/test";
+	private FeedElement _feed;
+	private XmlWriter _writer;
+
+	[SetUp]
+	public void SetUp() {
+		_feed = new FeedElement();
+		_writer = XmlWriter.Create(new MemoryStream());
+	}
+
+	[TearDown]
+	public void TearDown() {
+		_writer.Close();
+	}
+
+	[Test]
+	public void have_non_empty_title() {
+		//_feed.SetTitle("Event stream 'test'");
+		_feed.SetId(FeedUrl);
+		_feed.SetUpdated(DateTime.UtcNow);
+		_feed.SetAuthor(AtomSpecs.Author);
+		_feed.AddLink("self", FeedUrl, null);
+
+		Assert.Throws<ArgumentNullException>(() => _feed.SetTitle(null));
+		Assert.Throws<AtomSpecificationViolationException>(() => _feed.WriteXml(_writer));
+	}
+
+	[Test]
+	public void have_non_empty_id() {
+		_feed.SetTitle("Event stream 'test'");
+		//_feed.SetId(FeedUrl);
+		_feed.SetUpdated(DateTime.UtcNow);
+		_feed.SetAuthor(AtomSpecs.Author);
+		_feed.AddLink("self", FeedUrl, null);
+
+		Assert.Throws<ArgumentNullException>(() => _feed.SetId(null));
+		Assert.Throws<AtomSpecificationViolationException>(() => _feed.WriteXml(_writer));
+	}
+
+	[Test]
+	public void have_non_empty_updated() {
+		_feed.SetTitle("Event stream 'test'");
+		_feed.SetId(FeedUrl);
+		//_feed.SetUpdated(DateTime.UtcNow);
+		_feed.SetAuthor(AtomSpecs.Author);
+		_feed.AddLink("self", FeedUrl, null);
+
+		Assert.Throws<AtomSpecificationViolationException>(() => _feed.WriteXml(_writer));
+	}
+
+	[Test]
+	public void format_dates_in_RFC_3339() {
+		_feed.SetTitle("Event stream 'test'");
+		_feed.SetId(FeedUrl);
+		_feed.SetUpdated(DateTime.UtcNow);
+		_feed.SetAuthor(AtomSpecs.Author);
+		_feed.AddLink("self", FeedUrl, null);
+
+		Assert.DoesNotThrow(() => _feed.WriteXml(_writer));
+	}
+
+	[Test]
+	public void be_treated_as_valid_with_empty_entries_list() {
+		_feed.SetTitle("Event stream 'test'");
+		_feed.SetId(FeedUrl);
+		_feed.SetUpdated(DateTime.UtcNow);
+		_feed.SetAuthor(AtomSpecs.Author);
+		_feed.AddLink("self", FeedUrl, null);
+
+		Assert.DoesNotThrow(() => _feed.WriteXml(_writer));
+	}
+
+	[Test]
+	public void have_non_empty_author() {
+		_feed.SetTitle("Event stream 'test'");
+		_feed.SetId(FeedUrl);
+		_feed.SetUpdated(DateTime.UtcNow);
+		//_feed.SetAuthor(AtomSpecs.Author);
+		_feed.AddLink("self", FeedUrl, null);
+
+		Assert.Throws<ArgumentNullException>(() => _feed.SetAuthor(null));
+		Assert.Throws<AtomSpecificationViolationException>(() => _feed.WriteXml(_writer));
+	}
+
+	[Test]
+	public void have_at_least_one_link() {
+		_feed.SetTitle("Event stream 'test'");
+		_feed.SetId(FeedUrl);
+		_feed.SetUpdated(DateTime.UtcNow);
+		_feed.SetAuthor(AtomSpecs.Author);
+		//_feed.AddLink("self", FeedUrl, null);
+
+		Assert.Throws<AtomSpecificationViolationException>(() => _feed.WriteXml(_writer));
+	}
+}
+
+[TestFixture]
+public class entry_element_must {
+	[Test]
+	public void have_all_fields_filled() {
+		var writer = XmlWriter.Create(new MemoryStream());
+
+		var entry = new EntryElement();
+		Assert.Throws<AtomSpecificationViolationException>(() => entry.WriteXml(writer));
+
+		entry.SetTitle("test #0");
+		Assert.Throws<AtomSpecificationViolationException>(() => entry.WriteXml(writer));
+
+		entry.SetId("guid");
+		Assert.Throws<AtomSpecificationViolationException>(() => entry.WriteXml(writer));
+
+		entry.SetUpdated(DateTime.UtcNow);
+		Assert.Throws<AtomSpecificationViolationException>(() => entry.WriteXml(writer));
+
+		entry.SetAuthor(AtomSpecs.Author);
+		Assert.Throws<AtomSpecificationViolationException>(() => entry.WriteXml(writer));
+
+		entry.SetSummary("Entry #0");
+
+		Assert.DoesNotThrow(() => entry.WriteXml(writer));
+		writer.Close();
+	}
+}
+
+[TestFixture]
+public class link_element_must {
+	[Test]
+	public void have_href_attribute() {
+		var link = new LinkElement(null);
+		var writer = XmlWriter.Create(new MemoryStream());
+
+		Assert.Throws<AtomSpecificationViolationException>(() => link.WriteXml(writer));
+		writer.Close();
+	}
+}
+
+[TestFixture]
+public class person_element_must {
+	[Test]
+	public void have_exactly_one_name_attribute() {
+		var person = new PersonElement(null);
+		var writer = XmlWriter.Create(new MemoryStream());
+
+		Assert.Throws<AtomSpecificationViolationException>(() => person.WriteXml(writer));
+		writer.Close();
+	}
+}
+
+[TestFixture]
+public class service_document_must {
+	[Test]
+	public void have_at_least_one_workspace() {
+		var writer = XmlWriter.Create(new MemoryStream());
+		var doc = new ServiceDocument();
+
+		Assert.Throws<AtomSpecificationViolationException>(() => doc.WriteXml(writer));
+		writer.Close();
+	}
+}
+
+[TestFixture]
+public class workspace_must {
+	[Test]
+	public void contain_title() {
+		var writer = XmlWriter.Create(new MemoryStream());
+		var workspace = new WorkspaceElement();
+
+		Assert.Throws<AtomSpecificationViolationException>(() => workspace.WriteXml(writer));
+		writer.Close();
+	}
+}
+
+[TestFixture]
+public class collection_element_must {
+	private CollectionElement _collection;
+	private XmlWriter _writer;
+
+	[SetUp]
+	public void SetUp() {
+		_writer = XmlWriter.Create(new MemoryStream());
+		_collection = new CollectionElement();
+	}
+
+	[TearDown]
+	public void TearDown() {
+		_writer.Close();
+	}
+
+	[Test]
+	public void contain_title() {
+		//_collection.SetTitle("title");
+		_collection.SetUri("http://127.0.0.1/streams/test");
+		_collection.AddAcceptType(ContentType.Atom);
+
+		Assert.Throws<AtomSpecificationViolationException>(() => _collection.WriteXml(_writer));
+	}
+
+	[Test]
+	public void contain_uri() {
+		_collection.SetTitle("title");
+		//_collection.SetUri("http://127.0.0.1/streams/test");
+		_collection.AddAcceptType(ContentType.Atom);
+
+		Assert.Throws<AtomSpecificationViolationException>(() => _collection.WriteXml(_writer));
+	}
+}
+
+[TestFixture]
+public class accept_element_must {
+	[Test]
+	public void contain_value() {
+		var writer = XmlWriter.Create(new MemoryStream());
+		var accept = new AcceptElement(null);
+
+		Assert.Throws<AtomSpecificationViolationException>(() => accept.WriteXml(writer));
+		writer.Close();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Http/auto_convertion.cs b/src/KurrentDB.Core.Tests/Services/Transport/Http/auto_convertion.cs
new file mode 100644
index 00000000000..efc7f4b7a61
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Http/auto_convertion.cs
@@ -0,0 +1,635 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Transport.Http;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Transport.Http.Codecs;
+using Newtonsoft.Json;
+using NUnit.Framework;
+using ContentType = KurrentDB.Transport.Http.ContentType;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Http;
+
+internal static class ByteArrayExtensions {
+	public static string AsString(this byte[] data) {
+		return Helper.UTF8NoBom.GetString(data ?? new byte[0]);
+	}
+}
+
+internal static class FakeRequest {
+	internal const string JsonData = "{\"field1\":\"value1\",\"field2\":\"value2\"}";
+	internal const string JsonMetadata = "{\"meta-field1\":\"meta-value1\"}";
+	internal const string JsonData2 = "{\"field1\":\"value1\",\"field2\":\"value2\"}";
+	internal const string JsonMetadata2 = "{\"meta-field1\":\"meta-value1\"}";
+
+	internal const string XmlData = "<field1>value1</field1><field2>value2</field2>";
+	internal const string XmlMetadata = "<meta-field1>meta-value1</meta-field1>";
+	internal const string XmlData2 = "<field1>value1</field1><field2>value2</field2>";
+	internal const string XmlMetadata2 = "<meta-field1>meta-value1</meta-field1>";
+
+	private static string JsonEventWriteFormat {
+		get { return "{{\"eventId\":{0},\"eventType\":{1},\"data\":{2},\"metadata\":{3}}}"; }
+	}
+
+	private static string JsonEventReadFormat {
+		get {
+			return
+				"{{\"eventStreamId\":{0},\"eventNumber\":{1},\"eventType\":{2},\"eventId\":{3},\"data\":{4},\"metadata\":{5}}}";
+		}
+	}
+
+	private static string XmlEventWriteFormat {
+		get {
+			return
+				"<event><eventId>{0}</eventId><eventType>{1}</eventType><data>{2}</data><metadata>{3}</metadata></event>";
+		}
+	}
+
+	private static string XmlEventReadFormat {
+		get {
+			return
+				"<event><eventStreamId>{0}</eventStreamId><eventNumber>{1}</eventNumber><eventType>{2}</eventType><eventId>{3}</eventId><data>{4}</data><metadata>{5}</metadata></event>";
+		}
+	}
+
+	public static string GetJsonWrite(string data, string metadata) {
+		return GetJsonWrite(new[] { Tuple.Create(data, metadata) });
+	}
+
+	public static string GetJsonWrite(params Tuple<string, string>[] events) {
+		return string.Format("[{0}]",
+			string.Join(",", events.Select(x =>
+				string.Format(JsonEventWriteFormat, string.Format("\"{0}\"", Guid.NewGuid()), "\"type\"", x.Item1,
+					x.Item2))));
+	}
+
+	public static string
+		GetJsonEventReadResult(ResolvedEvent evnt, bool dataJson = true, bool metadataJson = true) {
+		return string.Format(JsonEventReadFormat,
+			WrapIntoQuotes(evnt.Event.EventStreamId),
+			evnt.Event.EventNumber,
+			WrapIntoQuotes(evnt.Event.EventType),
+			WrapIntoQuotes(evnt.Event.EventId.ToString()),
+			dataJson ? JsonData : WrapIntoQuotes(AsString(evnt.Event.Data)),
+			metadataJson ? JsonMetadata : WrapIntoQuotes(AsString(evnt.Event.Metadata)));
+	}
+
+	public static string GetJsonEventsReadResult(IEnumerable<ResolvedEvent> events, bool dataJson = true,
+		bool metadataJson = true) {
+		return string.Format("[{0}]",
+			string.Join(",", events.Select(x => GetJsonEventReadResult(x, dataJson, metadataJson))));
+	}
+
+	public static string GetXmlWrite(string data, string metadata) {
+		return GetXmlWrite(new[] { Tuple.Create(data, metadata) });
+	}
+
+	public static string GetXmlWrite(params Tuple<string, string>[] events) {
+		return string.Format("<events>{0}</events>",
+			string.Join("\n", events.Select(x =>
+				string.Format(XmlEventWriteFormat, Guid.NewGuid(), "type", x.Item1, x.Item2))));
+	}
+
+	public static string GetXmlEventReadResult(ResolvedEvent evnt, bool dataJson = true, bool metadataJson = true) {
+		return string.Format(XmlEventReadFormat,
+			evnt.Event.EventStreamId,
+			evnt.Event.EventNumber,
+			evnt.Event.EventType,
+			evnt.Event.EventId,
+			dataJson ? XmlData : AsString(evnt.Event.Data),
+			metadataJson ? XmlMetadata : AsString(evnt.Event.Metadata));
+	}
+
+	public static string GetXmlEventsReadResult(IEnumerable<ResolvedEvent> events, bool dataJson = true,
+		bool metadataJson = true) {
+		return string.Format("<events>{0}</events>",
+			string.Join("\n", events.Select(x => GetXmlEventReadResult(x, dataJson, metadataJson))));
+	}
+
+	public static string AsString(byte[] bytes) {
+		return Helper.UTF8NoBom.GetString(bytes ?? new byte[0]);
+	}
+
+	public static string AsString(ReadOnlyMemory<byte> bytes) {
+		return Helper.UTF8NoBom.GetString(bytes.Span);
+	}
+
+	private static string WrapIntoQuotes(string s) {
+		return string.Format("\"{0}\"", s);
+	}
+}
+
+internal abstract class do_not_use_indentation_for_json {
+	[OneTimeSetUp]
+	public void SetUp() {
+		JsonCodec.Formatting = Formatting.None;
+	}
+
+	[OneTimeTearDown]
+	public void TearDown() {
+		JsonCodec.Formatting = Formatting.Indented;
+	}
+
+	internal CustomCodec GetCustomCodecForContentType(string contentType) =>
+		contentType switch {
+			ContentType.EventsJson => Codec.EventsJson,
+			ContentType.LegacyEventsJson => Codec.LegacyEventsJson,
+			ContentType.EventJson => Codec.EventJson,
+			ContentType.LegacyEventJson => Codec.EventJson,
+			_ => throw new ArgumentException()
+		};
+
+}
+
+[TestFixture]
+internal class when_writing_events_and_content_type_is_json : do_not_use_indentation_for_json {
+	[Test]
+	public void should_just_count_as_body_if_just_json() {
+		var codec = Codec.Json;
+		var request = FakeRequest.JsonData;
+		var id = Guid.NewGuid();
+		var type = "EventType";
+		var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, id, type);
+		Assert.NotNull(events);
+		Assert.That(events.Length, Is.EqualTo(1));
+
+		Assert.IsTrue(events[0].IsJson);
+		Assert.AreEqual(events[0].EventId, id);
+		Assert.AreEqual(events[0].EventType, type);
+		Assert.That(events[0].Data.AsString(), Is.EqualTo(FakeRequest.JsonData));
+		Assert.That(events[0].Metadata.AsString(), Is.EqualTo(string.Empty));
+	}
+}
+
+[TestFixture]
+internal class when_writing_events_and_content_type_is_xml {
+	[Test]
+	public void should_just_count_as_body_if_just_xml() {
+		var codec = Codec.Xml;
+		var request = FakeRequest.XmlData;
+		var id = Guid.NewGuid();
+		var type = "EventType";
+		var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, id, type);
+		Assert.NotNull(events);
+		Assert.That(events.Length, Is.EqualTo(1));
+
+		Assert.IsFalse(events[0].IsJson);
+		Assert.AreEqual(events[0].EventId, id);
+		Assert.AreEqual(events[0].EventType, type);
+		Assert.That(events[0].Data.AsString(), Is.EqualTo(FakeRequest.XmlData));
+		Assert.That(events[0].Metadata.AsString(), Is.EqualTo(string.Empty));
+	}
+}
+
+[TestFixture(ContentType.EventsJson)]
+[TestFixture(ContentType.LegacyEventsJson)]
+internal class when_writing_events_and_content_type_is_events_json(string contentType) : do_not_use_indentation_for_json {
+	[Test]
+	public void should_store_data_as_json_if_valid_and_metadata_as_string_if_not() {
+		var codec = GetCustomCodecForContentType(contentType);
+		var request = FakeRequest.GetJsonWrite(new[] {
+			Tuple.Create(FakeRequest.JsonData, "\"metadata\""),
+			Tuple.Create(FakeRequest.JsonData2, "\"metadata2\"")
+		});
+
+		var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
+		Assert.That(events.Length, Is.EqualTo(2));
+
+		Assert.IsTrue(events[0].IsJson);
+		Assert.That(events[0].Data.AsString(), Is.EqualTo(FakeRequest.JsonData));
+		Assert.That(events[0].Metadata.AsString(), Is.EqualTo("metadata"));
+
+		Assert.IsTrue(events[1].IsJson);
+		Assert.That(events[1].Data.AsString(), Is.EqualTo(FakeRequest.JsonData2));
+		Assert.That(events[1].Metadata.AsString(), Is.EqualTo("metadata2"));
+	}
+
+	[Test]
+	public void should_store_metadata_as_json_if_its_valid_and_data_as_string_if_its_not() {
+		var codec = GetCustomCodecForContentType(contentType);
+		var request = FakeRequest.GetJsonWrite(new[] {
+			Tuple.Create("\"data\"", FakeRequest.JsonMetadata),
+			Tuple.Create("\"data2\"", FakeRequest.JsonMetadata2)
+		});
+
+		var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
+		Assert.That(events.Length, Is.EqualTo(2));
+
+		Assert.IsTrue(events[0].IsJson);
+		Assert.That(events[0].Data.AsString(), Is.EqualTo("data"));
+		Assert.That(events[0].Metadata.AsString(), Is.EqualTo(FakeRequest.JsonMetadata));
+
+		Assert.IsTrue(events[1].IsJson);
+		Assert.That(events[1].Data.AsString(), Is.EqualTo("data2"));
+		Assert.That(events[1].Metadata.AsString(), Is.EqualTo(FakeRequest.JsonMetadata2));
+	}
+
+	[Test]
+	public void should_store_both_data_and_metadata_as_json_if_both_are_valid_json_objects() {
+		var codec = GetCustomCodecForContentType(contentType);
+		var request = FakeRequest.GetJsonWrite(new[] {
+			Tuple.Create(FakeRequest.JsonData, FakeRequest.JsonMetadata),
+			Tuple.Create(FakeRequest.JsonData2, FakeRequest.JsonMetadata2)
+		});
+
+		var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
+		Assert.That(events.Length, Is.EqualTo(2));
+
+		Assert.IsTrue(events[0].IsJson);
+		Assert.That(events[0].Data.AsString(), Is.EqualTo(FakeRequest.JsonData));
+		Assert.That(events[0].Metadata.AsString(), Is.EqualTo(FakeRequest.JsonMetadata));
+
+		Assert.IsTrue(events[1].IsJson);
+		Assert.That(events[1].Data.AsString(), Is.EqualTo(FakeRequest.JsonData2));
+		Assert.That(events[1].Metadata.AsString(), Is.EqualTo(FakeRequest.JsonMetadata2));
+	}
+
+	[Test]
+	public void should_store_both_data_and_metadata_as_string_if_both_are_not_valid_json_objects() {
+		var codec = GetCustomCodecForContentType(contentType);
+		var request = FakeRequest.GetJsonWrite(new[] {
+			Tuple.Create("\"data\"", "\"metadata\""),
+			Tuple.Create("\"data2\"", "\"metadata2\"")
+		});
+
+		var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
+		Assert.That(events.Length, Is.EqualTo(2));
+
+		Assert.IsFalse(events[0].IsJson);
+		Assert.That(events[0].Data.AsString(), Is.EqualTo("data"));
+		Assert.That(events[0].Metadata.AsString(), Is.EqualTo("metadata"));
+
+		Assert.IsFalse(events[1].IsJson);
+		Assert.That(events[1].Data.AsString(), Is.EqualTo("data2"));
+		Assert.That(events[1].Metadata.AsString(), Is.EqualTo("metadata2"));
+	}
+
+	[Test]
+	public void should_do_its_best_at_preserving_data_format_with_multiple_events() {
+		var codec = GetCustomCodecForContentType(contentType);
+		var request = FakeRequest.GetJsonWrite(new[] {
+			Tuple.Create(FakeRequest.JsonData, FakeRequest.JsonMetadata),
+			Tuple.Create("\"data2\"", "\"metadata2\"")
+		});
+
+		var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
+		Assert.That(events.Length, Is.EqualTo(2));
+
+		Assert.IsTrue(events[0].IsJson);
+		Assert.That(events[0].Data.AsString(), Is.EqualTo(FakeRequest.JsonData));
+		Assert.That(events[0].Metadata.AsString(), Is.EqualTo(FakeRequest.JsonMetadata));
+
+		Assert.IsFalse(events[1].IsJson);
+		Assert.That(events[1].Data.AsString(), Is.EqualTo("data2"));
+		Assert.That(events[1].Metadata.AsString(), Is.EqualTo("metadata2"));
+	}
+}
+
+[TestFixture]
+internal class when_writing_events_and_content_type_is_events_xml : do_not_use_indentation_for_json {
+	[Test]
+	public void should_convert_data_to_json_if_its_valid_xobject_and_metadata_as_string_if_its_not() {
+		var codec = Codec.EventsXml;
+		var request = FakeRequest.GetXmlWrite(FakeRequest.XmlData, "metadata");
+
+		var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
+		var converted = events.Single();
+
+		Assert.That(converted.IsJson);
+		Assert.That(converted.Data.AsString(), Is.EqualTo(FakeRequest.JsonData));
+		Assert.That(converted.Metadata.AsString(), Is.EqualTo("metadata"));
+	}
+
+	[Test]
+	public void should_convert_metadata_to_json_if_its_valid_xobject_and_data_as_string_if_its_not() {
+		var codec = Codec.EventsXml;
+		var request = FakeRequest.GetXmlWrite("data", FakeRequest.XmlMetadata);
+
+		var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
+		var converted = events.Single();
+
+		Assert.That(converted.IsJson);
+		Assert.That(converted.Data.AsString(), Is.EqualTo("data"));
+		Assert.That(converted.Metadata.AsString(), Is.EqualTo(FakeRequest.JsonMetadata));
+	}
+
+	[Test]
+	public void should_convert_data_and_metadata_to_json_if_both_are_valid_xobjects() {
+		var codec = Codec.EventsXml;
+		var request = FakeRequest.GetXmlWrite(FakeRequest.XmlData, FakeRequest.XmlMetadata);
+
+		var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
+		var converted = events.Single();
+
+		Assert.That(converted.IsJson);
+		Assert.That(converted.Data.AsString(), Is.EqualTo(FakeRequest.JsonData));
+		Assert.That(converted.Metadata.AsString(), Is.EqualTo(FakeRequest.JsonMetadata));
+	}
+
+	[Test]
+	public void should_store_both_data_and_metadata_as_string_if_both_are_not_valid_xobjects_objects() {
+		var codec = Codec.EventsXml;
+		var request = FakeRequest.GetXmlWrite("data", "metadata");
+
+		var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
+		var converted = events.Single();
+
+		Assert.That(!converted.IsJson);
+		Assert.That(converted.Data.AsString(), Is.EqualTo("data"));
+		Assert.That(converted.Metadata.AsString(), Is.EqualTo("metadata"));
+	}
+
+	[Test]
+	public void should_do_its_best_at_preserving_data_format_with_multiple_events() {
+		var codec = Codec.EventsXml;
+		var request = FakeRequest.GetXmlWrite(new[] {
+			Tuple.Create(FakeRequest.XmlData, FakeRequest.XmlMetadata),
+			Tuple.Create("data2", "metadata2")
+		});
+
+		var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
+		Assert.That(events.Length, Is.EqualTo(2));
+
+		Assert.IsTrue(events[0].IsJson);
+		Assert.That(events[0].Data.AsString(), Is.EqualTo(FakeRequest.JsonData));
+		Assert.That(events[0].Metadata.AsString(), Is.EqualTo(FakeRequest.JsonMetadata));
+
+		Assert.IsFalse(events[1].IsJson);
+		Assert.That(events[1].Data.AsString(), Is.EqualTo("data2"));
+		Assert.That(events[1].Metadata.AsString(), Is.EqualTo("metadata2"));
+	}
+}
+
+[TestFixture(ContentType.EventJson)]
+[TestFixture(ContentType.LegacyEventJson)]
+internal class when_reading_events_and_accept_type_is_json(string contentType) : do_not_use_indentation_for_json {
+	[Test]
+	public void should_return_json_data_if_data_was_originally_written_as_xobject_and_metadata_as_string() {
+		var codec = GetCustomCodecForContentType(contentType);
+		var request = FakeRequest.GetXmlWrite(FakeRequest.XmlData, "metadata");
+
+		var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsXml, Guid.Empty);
+		var evnt = events.Single();
+		var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
+		var expected = FakeRequest.GetJsonEventReadResult(resolvedEvent, dataJson: true, metadataJson: false);
+		var converted = AutoEventConverter.SmartFormat(resolvedEvent, codec);
+
+		Assert.That(converted, Is.EqualTo(expected));
+	}
+
+	[Test]
+	[TestCase(ContentType.EventsJson)]
+	[TestCase(ContentType.LegacyEventsJson)]
+	public void should_return_json_data_if_data_was_originally_written_as_jobject_and_metadata_as_string(string writtenContentType) {
+		var writtenCodec = GetCustomCodecForContentType(writtenContentType);
+		var requestCodec = GetCustomCodecForContentType(contentType);
+		var request = FakeRequest.GetJsonWrite(FakeRequest.JsonData, "\"metadata\"");
+
+		var events =
+			AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), writtenCodec, Guid.Empty);
+		var evnt = events.Single();
+		var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
+		var expected = FakeRequest.GetJsonEventReadResult(resolvedEvent, dataJson: true, metadataJson: false);
+		var converted = AutoEventConverter.SmartFormat(resolvedEvent, requestCodec);
+
+		Assert.That(converted, Is.EqualTo(expected));
+	}
+
+	[Test]
+	public void should_return_json_metadata_if_metadata_was_originally_written_as_xobject_and_data_as_string() {
+		var codec = GetCustomCodecForContentType(contentType);
+		var request = FakeRequest.GetXmlWrite("data", FakeRequest.XmlMetadata);
+
+		var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsXml, Guid.Empty);
+		var evnt = events.Single();
+
+		var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
+
+		var expected = FakeRequest.GetJsonEventReadResult(resolvedEvent, dataJson: false, metadataJson: true);
+		var converted = AutoEventConverter.SmartFormat(resolvedEvent, codec);
+
+		Assert.That(converted, Is.EqualTo(expected));
+	}
+
+	[Test]
+	[TestCase(ContentType.EventsJson)]
+	[TestCase(ContentType.LegacyEventsJson)]
+	public void should_return_json_metadata_if_metadata_was_originally_written_as_jobject_and_data_as_string(string writtenContentType) {
+		var writtenCodec = GetCustomCodecForContentType(writtenContentType);
+		var requestCodec = GetCustomCodecForContentType(contentType);
+		var request = FakeRequest.GetJsonWrite("\"data\"", FakeRequest.JsonMetadata);
+
+		var events =
+			AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), writtenCodec, Guid.Empty);
+		var evnt = events.Single();
+		var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
+		var expected = FakeRequest.GetJsonEventReadResult(resolvedEvent, dataJson: false, metadataJson: true);
+		var converted = AutoEventConverter.SmartFormat(resolvedEvent, requestCodec);
+
+		Assert.That(converted, Is.EqualTo(expected));
+	}
+
+	[Test]
+	public void should_return_json_data_and_json_metadata_if_both_were_written_as_xobjects() {
+		var codec = GetCustomCodecForContentType(contentType);
+		var request = FakeRequest.GetXmlWrite(FakeRequest.XmlData, FakeRequest.XmlMetadata);
+
+		var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsXml, Guid.Empty);
+		var evnt = events.Single();
+		var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
+		var expected = FakeRequest.GetJsonEventReadResult(resolvedEvent, dataJson: true, metadataJson: true);
+		var converted = AutoEventConverter.SmartFormat(resolvedEvent, codec);
+
+		Assert.That(converted, Is.EqualTo(expected));
+	}
+
+	[Test]
+	[TestCase(ContentType.EventsJson)]
+	[TestCase(ContentType.LegacyEventsJson)]
+	public void should_return_json_data_and_json_metadata_if_both_were_written_as_jobjects(string writtenContentType) {
+		var writtenCodec = GetCustomCodecForContentType(writtenContentType);
+		var requestCodec = GetCustomCodecForContentType(contentType);
+		var request = FakeRequest.GetJsonWrite(FakeRequest.JsonData, FakeRequest.JsonMetadata);
+
+		var events =
+			AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), writtenCodec, Guid.Empty);
+		var evnt = events.Single();
+		var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
+		var expected = FakeRequest.GetJsonEventReadResult(resolvedEvent, dataJson: true, metadataJson: true);
+		var converted = AutoEventConverter.SmartFormat(resolvedEvent, requestCodec);
+
+		Assert.That(converted, Is.EqualTo(expected));
+	}
+
+	[Test]
+	[TestCase(ContentType.EventsJson)]
+	[TestCase(ContentType.LegacyEventsJson)]
+	public void should_return_string_data_and_string_metadata_if_both_were_written_as_string_using_json_write(string writtenContentType) {
+		var writtenCodec = GetCustomCodecForContentType(writtenContentType);
+		var requestCodec = GetCustomCodecForContentType(contentType);
+		var request = FakeRequest.GetJsonWrite("\"data\"", "\"metadata\"");
+
+		var events =
+			AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), writtenCodec, Guid.Empty);
+		var evnt = events.Single();
+		var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
+		var expected = FakeRequest.GetJsonEventReadResult(resolvedEvent, dataJson: false, metadataJson: false);
+		var converted = AutoEventConverter.SmartFormat(resolvedEvent, requestCodec);
+
+		Assert.That(converted, Is.EqualTo(expected));
+	}
+
+	[Test]
+	public void should_return_string_data_and_string_metadata_if_both_were_written_as_string_using_xml_write() {
+		var codec = GetCustomCodecForContentType(contentType);
+		var request = FakeRequest.GetXmlWrite("data", "metadata");
+
+		var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsXml, Guid.Empty);
+		var evnt = events.Single();
+		var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
+		var expected = FakeRequest.GetJsonEventReadResult(resolvedEvent, dataJson: false, metadataJson: false);
+		var converted = AutoEventConverter.SmartFormat(resolvedEvent, codec);
+
+		Assert.That(converted, Is.EqualTo(expected));
+	}
+
+	private ResolvedEvent GenerateResolvedEvent(byte[] data, byte[] metadata) {
+		return ResolvedEvent.ForUnresolvedEvent(new EventRecord(0, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0,
+			"stream", 0,
+			DateTime.MinValue, PrepareFlags.IsJson, "type", data, metadata));
+	}
+}
+
+[TestFixture]
+internal class when_reading_events_and_accept_type_is_xml : do_not_use_indentation_for_json {
+	[Test]
+	public void should_return_xml_data_if_data_was_originally_written_as_xobject_and_metadata_as_string() {
+		var request = FakeRequest.GetXmlWrite(FakeRequest.XmlData, "metadata");
+
+		var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsXml, Guid.Empty);
+		var evnt = events.Single();
+		var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
+		var expected = FakeRequest.GetXmlEventReadResult(resolvedEvent, dataJson: true, metadataJson: false);
+		var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventXml);
+
+		Assert.That(converted, Is.EqualTo(expected));
+	}
+
+	[Test]
+	[TestCase(ContentType.EventsJson)]
+	[TestCase(ContentType.LegacyEventsJson)]
+	public void should_return_xml_data_if_data_was_originally_written_as_jobject_and_metadata_as_string(string contentType) {
+		var codec = GetCustomCodecForContentType(contentType);
+		var request = FakeRequest.GetJsonWrite(FakeRequest.JsonData, "\"metadata\"");
+
+		var events =
+			AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
+		var evnt = events.Single();
+		var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
+		var expected = FakeRequest.GetXmlEventReadResult(resolvedEvent, dataJson: true, metadataJson: false);
+		var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventXml);
+
+		Assert.That(converted, Is.EqualTo(expected));
+	}
+
+	[Test]
+	public void should_return_xml_metadata_if_metadata_was_originally_written_as_xobject_and_data_as_string() {
+		var request = FakeRequest.GetXmlWrite("data", FakeRequest.XmlMetadata);
+
+		var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsXml, Guid.Empty);
+		var evnt = events.Single();
+		var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
+		var expected = FakeRequest.GetXmlEventReadResult(resolvedEvent, dataJson: false, metadataJson: true);
+		var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventXml);
+
+		Assert.That(converted, Is.EqualTo(expected));
+	}
+
+	[Test]
+	[TestCase(ContentType.EventsJson)]
+	[TestCase(ContentType.LegacyEventsJson)]
+	public void should_return_xml_metadata_if_metadata_was_originally_written_as_jobject_and_data_as_string(string contentType) {
+		var codec = GetCustomCodecForContentType(contentType);
+		var request = FakeRequest.GetJsonWrite("\"data\"", FakeRequest.JsonMetadata);
+
+		var events =
+			AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
+		var evnt = events.Single();
+		var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
+		var expected = FakeRequest.GetXmlEventReadResult(resolvedEvent, dataJson: false, metadataJson: true);
+		var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventXml);
+
+		Assert.That(converted, Is.EqualTo(expected));
+	}
+
+	[Test]
+	public void should_return_xml_data_and_xml_metadata_if_both_were_written_as_xobjects() {
+		var request = FakeRequest.GetXmlWrite(FakeRequest.XmlData, FakeRequest.XmlMetadata);
+
+		var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsXml, Guid.Empty);
+		var evnt = events.Single();
+		var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
+		var expected = FakeRequest.GetXmlEventReadResult(resolvedEvent, dataJson: true, metadataJson: true);
+		var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventXml);
+
+		Assert.That(converted, Is.EqualTo(expected));
+	}
+
+	[Test]
+	[TestCase(ContentType.EventsJson)]
+	[TestCase(ContentType.LegacyEventsJson)]
+	public void should_return_xml_data_and_xml_metadata_if_both_were_written_as_jobjects(string contentType) {
+		var codec = GetCustomCodecForContentType(contentType);
+		var request = FakeRequest.GetJsonWrite(FakeRequest.JsonData, FakeRequest.JsonMetadata);
+
+		var events =
+			AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
+		var evnt = events.Single();
+		var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
+		var expected = FakeRequest.GetXmlEventReadResult(resolvedEvent, dataJson: true, metadataJson: true);
+		var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventXml);
+
+		Assert.That(converted, Is.EqualTo(expected));
+	}
+
+	[Test]
+	[TestCase(ContentType.EventsJson)]
+	[TestCase(ContentType.LegacyEventsJson)]
+	public void should_return_string_data_and_string_metadata_if_both_were_written_as_string_using_json_events_write(string contentType) {
+		var codec = GetCustomCodecForContentType(contentType);
+		var request = FakeRequest.GetJsonWrite("\"data\"", "\"metadata\"");
+
+		var events =
+			AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), codec, Guid.Empty);
+		var evnt = events.Single();
+		var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
+		var expected = FakeRequest.GetXmlEventReadResult(resolvedEvent, dataJson: false, metadataJson: false);
+		var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventXml);
+
+		Assert.That(converted, Is.EqualTo(expected));
+	}
+
+	[Test]
+	public void should_return_string_data_and_string_metadata_if_both_were_written_as_string_using_xml_events_write() {
+		var request = FakeRequest.GetXmlWrite("data", "metadata");
+
+		var events = AutoEventConverter.SmartParse(Helper.UTF8NoBom.GetBytes(request), Codec.EventsXml, Guid.Empty);
+		var evnt = events.Single();
+		var resolvedEvent = GenerateResolvedEvent(evnt.Data, evnt.Metadata);
+		var expected = FakeRequest.GetXmlEventReadResult(resolvedEvent, dataJson: false, metadataJson: false);
+		var converted = AutoEventConverter.SmartFormat(resolvedEvent, Codec.EventXml);
+
+		Assert.That(converted, Is.EqualTo(expected));
+	}
+
+	private ResolvedEvent GenerateResolvedEvent(byte[] data, byte[] metadata) {
+		return ResolvedEvent.ForUnresolvedEvent(new EventRecord(0, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0,
+			"stream", 0,
+			DateTime.MinValue, PrepareFlags.IsJson, "type", data, metadata));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Http/build_requested_url_should.cs b/src/KurrentDB.Core.Tests/Services/Transport/Http/build_requested_url_should.cs
new file mode 100644
index 00000000000..e754480c779
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Http/build_requested_url_should.cs
@@ -0,0 +1,169 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.IO;
+using System.Net;
+using KurrentDB.Transport.Http.EntityManagement;
+using Microsoft.Extensions.Primitives;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Http;
+
+[TestFixture]
+class build_requested_url_should {
+	private Uri inputUri = new Uri("http://www.example.com:1234/path/?key=value#anchor");
+
+	[Test]
+	public void with_no_advertise_as_or_headers_uri_is_unchanged() {
+		var requestedUri =
+			HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri,
+				new NameValueCollection()), null, 0);
+
+		Assert.AreEqual(inputUri, requestedUri);
+	}
+
+	[Test]
+	public void with_advertise_http_port_set_only_port_is_changed() {
+		var requestedUri =
+			HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri,
+				new NameValueCollection()), null, 2116);
+
+		Assert.AreEqual(new Uri("http://www.example.com:2116/path/?key=value#anchor"), requestedUri);
+	}
+
+	[Test]
+	public void with_advertise_ip_set_only_host_is_changed() {
+		var requestedUri =
+			HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri,
+				new NameValueCollection()), "127.0.1.13", 0);
+
+		Assert.AreEqual(new Uri("http://127.0.1.13:1234/path/?key=value#anchor"), requestedUri);
+	}
+
+	[Test]
+	public void with_advertise_ip_and_http_port_set_both_host_and_port_is_changed() {
+		var requestedUri =
+			HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri,
+				new NameValueCollection()), "127.0.1.13", 2116);
+
+		Assert.AreEqual(new Uri("http://127.0.1.13:2116/path/?key=value#anchor"), requestedUri);
+	}
+
+	[Test]
+	public void with_port_forward_header_only_port_is_changed() {
+		var headers = new NameValueCollection { { "X-Forwarded-Port", "4321" } };
+		var requestedUri =
+			HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri, headers), null, 0);
+
+		Assert.AreEqual(new Uri("http://www.example.com:4321/path/?key=value#anchor"), requestedUri);
+	}
+
+	[Test]
+	public void non_integer_port_forward_header_is_ignored() {
+		var headers = new NameValueCollection { { "X-Forwarded-Port", "abc" } };
+		var requestedUri =
+			HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri, headers), null, 0);
+
+		Assert.AreEqual(inputUri, requestedUri);
+	}
+
+	[Test]
+	public void with_proto_forward_header_only_scheme_is_changed() {
+		var headers = new NameValueCollection { { "X-Forwarded-Proto", "https" } };
+		var requestedUri =
+			HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri, headers), null, 0);
+
+		Assert.AreEqual(new Uri("https://www.example.com:1234/path/?key=value#anchor"), requestedUri);
+	}
+
+	[Test]
+	public void with_proto_forward_host_only_host_is_changed() {
+		string host = "www.my-host.com";
+		var headers = new NameValueCollection { { "X-Forwarded-Host", host } };
+		var requestedUri =
+			HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri, headers), null, 0);
+		Assert.AreEqual(new Uri("http://www.my-host.com:1234/path/?key=value#anchor"), requestedUri);
+	}
+
+	[Test, Category("prefix")]
+	public void with_forward_prefix_adds_prefix_when_already_prefix() {
+		string prefix = "prefix";
+		var headers = new NameValueCollection { { "X-Forwarded-Prefix", prefix } };
+		var requestedUri =
+			HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri, headers), null, 0);
+		Assert.AreEqual(new Uri("http://www.example.com:1234/prefix/path/?key=value#anchor"), requestedUri);
+	}
+
+
+	[Test, Category("prefix")]
+	public void with_forward_prefix_adds_prefix_when_not_prefix() {
+		var start = new Uri("http://www.my-host.com:1234/?key=value#anchor");
+		string prefix = "prefix";
+		var headers = new NameValueCollection { { "X-Forwarded-Prefix", prefix } };
+		var requestedUri =
+			HttpEntity.BuildRequestedUrl(new FakeHttpRequest(start, headers), null, 0);
+		Assert.AreEqual(new Uri("http://www.my-host.com:1234/prefix/?key=value#anchor"), requestedUri);
+	}
+
+	[Test]
+	public void with_proto_forward_host_and_advertised_ip_forwarded_host_is_used() {
+		string host = "www.my-host.com";
+		var headers = new NameValueCollection { { "X-Forwarded-Host", host } };
+		var requestedUri =
+			HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri, headers), "127.0.10.13",
+				0);
+		Assert.AreEqual(new Uri("http://www.my-host.com:1234/path/?key=value#anchor"), requestedUri);
+	}
+
+	[Test]
+	public void with_proto_forward_host_containing_comma_delimited_list_first_forwarded_host_is_used() {
+		var headers = new NameValueCollection {
+			{"X-Forwarded-Host", "www.my-first-host.com"},
+			{"X-Forwarded-Host", "www.my-second-host.com"}
+		};
+		var requestedUri =
+			HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri, headers), null, 0);
+		Assert.AreEqual(new Uri("http://www.my-first-host.com:1234/path/?key=value#anchor"), requestedUri);
+	}
+
+	[Test]
+	public void with_proto_forward_host_containing_hosts_with_ports_host_and_port_is_used() {
+		string host = "127.0.10.13:2231";
+		var headers = new NameValueCollection { { "X-Forwarded-Host", host } };
+		var requestedUri =
+			HttpEntity.BuildRequestedUrl(new FakeHttpRequest(inputUri, headers), null, 0);
+		Assert.AreEqual(new Uri("http://127.0.10.13:2231/path/?key=value#anchor"), requestedUri);
+	}
+
+	class FakeHttpRequest : IHttpRequest {
+		private readonly NameValueCollection _headers;
+		public string[] AcceptTypes { get; }
+		public long ContentLength64 { get; }
+		public string ContentType { get; }
+		public string HttpMethod { get; }
+		public Stream InputStream { get; }
+		public string RawUrl { get; }
+		public IPEndPoint RemoteEndPoint { get; }
+		public Uri Url { get; }
+
+		public FakeHttpRequest(Uri url, NameValueCollection headers = default) {
+			_headers = headers ?? new NameValueCollection();
+			Url = url;
+		}
+
+		public IEnumerable<string> GetHeaderKeys() => _headers.AllKeys;
+
+		public StringValues GetHeaderValues(string key) => _headers.GetValues(key);
+
+		public IEnumerable<string> GetQueryStringKeys() {
+			throw new NotImplementedException();
+		}
+
+		public StringValues GetQueryStringValues(string key) {
+			throw new NotImplementedException();
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Http/compress_response_should.cs b/src/KurrentDB.Core.Tests/Services/Transport/Http/compress_response_should.cs
new file mode 100644
index 00000000000..9761f3dbe00
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Http/compress_response_should.cs
@@ -0,0 +1,108 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.IO.Compression;
+using System.Text;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.EntityManagement;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Http;
+
+[TestFixture]
+class compress_response_should {
+	private string inputData = "my test string 123456.";
+
+	[Test]
+	public void with_gzip_compression_algo_data_is_gzipped() {
+		var response =
+			HttpEntityManager.CompressResponse(Encoding.ASCII.GetBytes(inputData), CompressionAlgorithms.Gzip);
+
+		String uncompressed;
+
+		using (var inputStream = new MemoryStream(response))
+		using (var uncompressedStream = new GZipStream(inputStream, CompressionMode.Decompress))
+		using (var outputStream = new MemoryStream()) {
+			uncompressedStream.CopyTo(outputStream);
+			uncompressed = Encoding.UTF8.GetString(outputStream.ToArray());
+		}
+
+		Assert.AreEqual(uncompressed, inputData);
+	}
+
+	[Test]
+	public void with_gzip_compression_algo_and_string_larger_than_50kb_data_is_gzipped() {
+		StringBuilder sb = new StringBuilder();
+		for (int i = 0; i < 60 * 1024; i++)
+			sb.Append("A");
+		String testString = sb.ToString();
+
+		var response =
+			HttpEntityManager.CompressResponse(Encoding.ASCII.GetBytes(testString), CompressionAlgorithms.Gzip);
+
+		String uncompressed;
+
+		using (var inputStream = new MemoryStream(response))
+		using (var uncompressedStream = new GZipStream(inputStream, CompressionMode.Decompress))
+		using (var outputStream = new MemoryStream()) {
+			uncompressedStream.CopyTo(outputStream);
+			uncompressed = Encoding.UTF8.GetString(outputStream.ToArray());
+		}
+
+		Assert.AreEqual(uncompressed, testString);
+	}
+
+	[Test]
+	public void with_deflate_compression_algo_data_is_deflated() {
+		var response =
+			HttpEntityManager.CompressResponse(Encoding.ASCII.GetBytes(inputData), CompressionAlgorithms.Deflate);
+
+		String uncompressed;
+
+		using (var inputStream = new MemoryStream(response))
+		using (var uncompressedStream = new DeflateStream(inputStream, CompressionMode.Decompress))
+		using (var outputStream = new MemoryStream()) {
+			uncompressedStream.CopyTo(outputStream);
+			uncompressed = Encoding.UTF8.GetString(outputStream.ToArray());
+		}
+
+		Assert.AreEqual(uncompressed, inputData);
+	}
+
+	[Test]
+	public void with_deflate_compression_algo_and_string_larger_than_50kb_data_is_deflated() {
+		StringBuilder sb = new StringBuilder();
+		for (int i = 0; i < 60 * 1024; i++)
+			sb.Append("A");
+		String testString = sb.ToString();
+
+		var response =
+			HttpEntityManager.CompressResponse(Encoding.ASCII.GetBytes(testString), CompressionAlgorithms.Deflate);
+
+		String uncompressed;
+
+		using (var inputStream = new MemoryStream(response))
+		using (var uncompressedStream = new DeflateStream(inputStream, CompressionMode.Decompress))
+		using (var outputStream = new MemoryStream()) {
+			uncompressedStream.CopyTo(outputStream);
+			uncompressed = Encoding.UTF8.GetString(outputStream.ToArray());
+		}
+
+		Assert.AreEqual(uncompressed, testString);
+	}
+
+	[Test]
+	public void with_invalid_compression_algo_data_remains_the_same() {
+		var response =
+			HttpEntityManager.CompressResponse(Encoding.ASCII.GetBytes(inputData), "invalid_compression_algo");
+		Assert.AreEqual(Encoding.ASCII.GetString(response), inputData);
+	}
+
+	[Test]
+	public void with_null_compression_algo_data_remains_the_same() {
+		var response = HttpEntityManager.CompressResponse(Encoding.ASCII.GetBytes(inputData), null);
+		Assert.AreEqual(Encoding.ASCII.GetString(response), inputData);
+	}
+}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Http/http_service_should.cs b/src/KurrentDB.Core.Tests/Services/Transport/Http/http_service_should.cs
similarity index 76%
rename from src/EventStore.Core.Tests/Services/Transport/Http/http_service_should.cs
rename to src/KurrentDB.Core.Tests/Services/Transport/Http/http_service_should.cs
index ba4c3e126a4..e07d11489cc 100644
--- a/src/EventStore.Core.Tests/Services/Transport/Http/http_service_should.cs
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Http/http_service_should.cs
@@ -1,18 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests.Helpers;
-using NUnit.Framework;
 using System.Threading.Tasks;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
 using HttpStatusCode = System.Net.HttpStatusCode;
 
-namespace EventStore.Core.Tests.Services.Transport.Http;
+namespace KurrentDB.Core.Tests.Services.Transport.Http;
 
 [TestFixture, Category("LongRunning")]
 public class http_service_should : SpecificationWithDirectory {
 	[Test]
 	[Category("Network")]
 	public async Task start_after_system_message_system_init_published() {
-		await using var node = new MiniNode<LogFormat.V2,string>(PathName);
+		await using var node = new MiniNode<LogFormat.V2, string>(PathName);
+		await node.StartTestServer();
 
 		Assert.IsFalse(node.Node.HttpService.IsListening);
 		node.Node.MainQueue.Publish(new SystemMessage.SystemInit());
@@ -22,7 +26,8 @@ public async Task start_after_system_message_system_init_published() {
 	[Test]
 	[Category("Network")]
 	public async Task ignore_shutdown_message_that_does_not_say_shut_down() {
-		await using var node = new MiniNode<LogFormat.V2,string>(PathName);
+		await using var node = new MiniNode<LogFormat.V2, string>(PathName);
+		await node.StartTestServer();
 		node.Node.MainQueue.Publish(new SystemMessage.SystemInit());
 
 		AssertEx.IsOrBecomesTrue(() => node.Node.HttpService.IsListening);
@@ -36,7 +41,8 @@ public async Task ignore_shutdown_message_that_does_not_say_shut_down() {
 	[Test]
 	[Category("Network")]
 	public async Task react_to_shutdown_message_that_cause_process_exit() {
-		await using var node = new MiniNode<LogFormat.V2,string>(PathName);
+		await using var node = new MiniNode<LogFormat.V2, string>(PathName);
+		await node.StartTestServer();
 		node.Node.MainQueue.Publish(new SystemMessage.SystemInit());
 
 		AssertEx.IsOrBecomesTrue(() => node.Node.HttpService.IsListening);
@@ -50,7 +56,8 @@ public async Task react_to_shutdown_message_that_cause_process_exit() {
 	[Test]
 	[Category("Network")]
 	public async Task handle_invalid_characters_in_url() {
-		await using var node = new MiniNode<LogFormat.V2,string>(PathName);
+		await using var node = new MiniNode<LogFormat.V2, string>(PathName);
+		await node.StartTestServer();
 		node.Node.MainQueue.Publish(new SystemMessage.SystemInit());
 
 		var result = await node.HttpClient.GetAsync("/ping^\"");
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Http/media_type.cs b/src/KurrentDB.Core.Tests/Services/Transport/Http/media_type.cs
new file mode 100644
index 00000000000..128fc0fca6a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Http/media_type.cs
@@ -0,0 +1,127 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Common.Utils;
+using KurrentDB.Transport.Http;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Http;
+
+[TestFixture]
+public class media_type {
+	[Test]
+	public void parses_generic_wildcard() {
+		var c = MediaType.Parse("*/*");
+
+		Assert.AreEqual("*", c.Type);
+		Assert.AreEqual("*", c.Subtype);
+		Assert.AreEqual("*/*", c.Range);
+		Assert.AreEqual(1.0f, c.Priority);
+		Assert.IsFalse(c.EncodingSpecified);
+		Assert.IsNull(c.Encoding);
+	}
+
+	[Test]
+	public void parses_generic_wildcard_with_priority() {
+		var c = MediaType.Parse("*/*;q=0.4");
+
+		Assert.AreEqual("*", c.Type);
+		Assert.AreEqual("*", c.Subtype);
+		Assert.AreEqual("*/*", c.Range);
+		Assert.AreEqual(0.4f, c.Priority);
+		Assert.IsFalse(c.EncodingSpecified);
+		Assert.IsNull(c.Encoding);
+	}
+
+	[Test]
+	public void parses_generic_wildcard_with_priority_and_other_param() {
+		var c = MediaType.Parse("*/*;q=0.4;z=7");
+
+		Assert.AreEqual("*", c.Type);
+		Assert.AreEqual("*", c.Subtype);
+		Assert.AreEqual("*/*", c.Range);
+		Assert.AreEqual(0.4f, c.Priority);
+		Assert.IsFalse(c.EncodingSpecified);
+		Assert.IsNull(c.Encoding);
+	}
+
+	[Test]
+	public void parses_partial_wildcard() {
+		var c = MediaType.Parse("text/*");
+
+		Assert.AreEqual("text", c.Type);
+		Assert.AreEqual("*", c.Subtype);
+		Assert.AreEqual("text/*", c.Range);
+		Assert.AreEqual(1f, c.Priority);
+		Assert.IsFalse(c.EncodingSpecified);
+		Assert.IsNull(c.Encoding);
+	}
+
+	[Test]
+	public void parses_specific_media_range_with_priority() {
+		var c = MediaType.Parse("application/xml;q=0.7");
+
+		Assert.AreEqual("application", c.Type);
+		Assert.AreEqual("xml", c.Subtype);
+		Assert.AreEqual("application/xml", c.Range);
+		Assert.AreEqual(0.7f, c.Priority);
+		Assert.IsFalse(c.EncodingSpecified);
+		Assert.IsNull(c.Encoding);
+	}
+
+	[Test]
+	public void parses_with_encoding() {
+		var c = MediaType.Parse($"{ContentType.Json};charset=utf-8");
+
+		Assert.AreEqual("application", c.Type);
+		Assert.AreEqual("json", c.Subtype);
+		Assert.AreEqual(ContentType.Json, c.Range);
+		Assert.IsTrue(c.EncodingSpecified);
+		Assert.AreEqual(Helper.UTF8NoBom, c.Encoding);
+	}
+
+	[Test]
+	public void parses_with_encoding_and_priority() {
+		var c = MediaType.Parse($"{ContentType.Json};q=0.3;charset=utf-8");
+
+		Assert.AreEqual("application", c.Type);
+		Assert.AreEqual("json", c.Subtype);
+		Assert.AreEqual(ContentType.Json, c.Range);
+		Assert.AreEqual(0.3f, c.Priority);
+		Assert.IsTrue(c.EncodingSpecified);
+		Assert.AreEqual(Helper.UTF8NoBom, c.Encoding);
+	}
+
+	[Test]
+	public void parses_unknown_encoding() {
+		var c = MediaType.Parse($"{ContentType.Json};charset=woftam");
+
+		Assert.AreEqual("application", c.Type);
+		Assert.AreEqual("json", c.Subtype);
+		Assert.AreEqual(ContentType.Json, c.Range);
+		Assert.IsTrue(c.EncodingSpecified);
+		Assert.IsNull(c.Encoding);
+	}
+
+	[Test]
+	public void parses_with_spaces_between_parameters() {
+		var c = MediaType.Parse($"{ContentType.Json}; charset=woftam");
+
+		Assert.AreEqual("application", c.Type);
+		Assert.AreEqual("json", c.Subtype);
+		Assert.AreEqual(ContentType.Json, c.Range);
+		Assert.IsTrue(c.EncodingSpecified);
+		Assert.IsNull(c.Encoding);
+	}
+
+	[Test]
+	public void parses_upper_case_parameters() {
+		var c = MediaType.Parse($"{ContentType.Json}; charset=UTF-8");
+
+		Assert.AreEqual("application", c.Type);
+		Assert.AreEqual("json", c.Subtype);
+		Assert.AreEqual(ContentType.Json, c.Range);
+		Assert.IsTrue(c.EncodingSpecified);
+		Assert.AreEqual(Helper.UTF8NoBom, c.Encoding);
+	}
+}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Http/open_api_document.cs b/src/KurrentDB.Core.Tests/Services/Transport/Http/open_api_document.cs
similarity index 77%
rename from src/EventStore.Core.Tests/Services/Transport/Http/open_api_document.cs
rename to src/KurrentDB.Core.Tests/Services/Transport/Http/open_api_document.cs
index 4f8a8b00958..bf3a953434a 100644
--- a/src/EventStore.Core.Tests/Services/Transport/Http/open_api_document.cs
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Http/open_api_document.cs
@@ -1,19 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using EventStore.Core.Services.Transport.Http;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.Tests.Integration;
+using KurrentDB.Core.Services.Transport.Http;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Tests.Integration;
+using Microsoft.OpenApi.Readers;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Services.Transport.Http;
+namespace KurrentDB.Core.Tests.Services.Transport.Http;
 
 [TestFixture(typeof(LogFormat.V2), typeof(string))]
 public class open_api_document<TLogFormat, TStreamId> : specification_with_a_single_node<TLogFormat, TStreamId> {
 
 	[Test]
 	public async Task should_document_the_actions_of_all_controllers() {
-		var skipActionPaths = new [] {
+		var skipActionPaths = new[] {
 			"/admin/login",
 			"/users/$current",
 			// handled by: /stats/{statPath}
@@ -36,7 +40,7 @@ public async Task should_document_the_actions_of_all_controllers() {
 
 		var absoluteSwaggerPath = HelperExtensions.GetFilePathFromAssembly("swagger.yaml");
 
-		var openApiReader = new Microsoft.OpenApi.Readers.OpenApiTextReaderReader();
+		var openApiReader = new OpenApiTextReaderReader();
 		var openApiDoc = File.OpenText(absoluteSwaggerPath);
 		var result = await openApiReader.ReadAsync(openApiDoc);
 
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Http/ping_controller_should.cs b/src/KurrentDB.Core.Tests/Services/Transport/Http/ping_controller_should.cs
new file mode 100644
index 00000000000..e7efe51776d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Http/ping_controller_should.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.Codecs;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Http;
+
+[TestFixture, Category("LongRunning")]
+public class ping_controller_should : SpecificationWithDirectory {
+	private MiniNode<LogFormat.V2, string> _node;
+
+	[OneTimeSetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+
+		_node = new MiniNode<LogFormat.V2, string>(PathName);
+		await _node.Start();
+	}
+
+	[OneTimeTearDown]
+	public override async Task TearDown() {
+		await base.TearDown();
+		await _node.Shutdown();
+	}
+
+	[Test]
+	public async Task respond_with_httpmessage_text_message() {
+		var result = await _node.HttpClient.GetAsync("/ping?format=json");
+
+		Assert.True(result.IsSuccessStatusCode);
+
+		var body = await result.Content.ReadAsStringAsync();
+		Assert.NotNull(Codec.Json.From<HttpMessage.TextMessage>(body));
+	}
+
+	[Test]
+	public async Task return_response_in_json_if_requested_by_query_param_and_set_content_type_header() {
+		var result = await _node.HttpClient.GetAsync("/ping?format=json");
+
+		Assert.AreEqual(ContentType.Json, result.Content.Headers.ContentType!.MediaType);
+	}
+
+	[Test]
+	public async Task return_response_in_xml_if_requested_by_query_param_and_set_content_type_header() {
+		var result = await _node.HttpClient.GetAsync("/ping?format=xml");
+
+		Assert.AreEqual(ContentType.Xml, result.Content.Headers.ContentType!.MediaType);
+	}
+
+	[Test]
+	public async Task return_response_in_plaintext_if_requested_by_query_param_and_set_content_type_header() {
+		var result = await _node.HttpClient.GetAsync("/ping?format=text");
+
+		Assert.AreEqual(ContentType.PlainText, result.Content.Headers.ContentType!.MediaType);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Http/speed_test.cs b/src/KurrentDB.Core.Tests/Services/Transport/Http/speed_test.cs
new file mode 100644
index 00000000000..b21e7963baf
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Http/speed_test.cs
@@ -0,0 +1,125 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Services.Transport.Http;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.Codecs;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Http;
+
+public class FakeController : IHttpController {
+	private readonly IUriRouter _router;
+
+	public static readonly ICodec[] SupportedCodecs = new ICodec[]
+		{Codec.Json, Codec.Xml, Codec.ApplicationXml, Codec.Text};
+
+	private IHttpService _http;
+
+	public readonly List<Tuple<string, string>> BoundRoutes = new List<Tuple<string, string>>();
+	public readonly CountdownEvent CountdownEvent;
+
+	public FakeController(int reqCount, IUriRouter router) {
+		_router = router;
+		CountdownEvent = new CountdownEvent(reqCount);
+	}
+
+	public void Subscribe(IHttpService http) {
+		_http = http;
+
+		Register("/", HttpMethod.Get);
+		Register("/ping", HttpMethod.Get);
+		Register("/halt", HttpMethod.Get);
+		Register("/shutdown", HttpMethod.Get);
+		Register("/streams/{stream}", HttpMethod.Post);
+		Register("/streams/{stream}", HttpMethod.Delete);
+		Register("/streams/{stream}?embed={embed}", HttpMethod.Get);
+		Register("/streams/{stream}/{event}?embed={embed}", HttpMethod.Get);
+		Register("/streams/{stream}/{event}/{count}?embed={embed}", HttpMethod.Get);
+		Register("/streams/{stream}/{event}/backward/{count}?embed={embed}", HttpMethod.Get);
+		Register("/streams/{stream}/{event}/forward/{count}?embed={embed}", HttpMethod.Get);
+		Register("/streams/{stream}/{event}/data", HttpMethod.Get);
+		Register("/streams/{stream}/{event}/metadata", HttpMethod.Get);
+		Register("/streams/{stream}/metadata", HttpMethod.Post);
+		Register("/streams/{stream}/metadata?embed={embed}", HttpMethod.Get);
+		Register("/streams/{stream}/metadata/{event}?embed={embed}", HttpMethod.Get);
+		Register("/streams/{stream}/metadata/{event}/{count}?embed={embed}", HttpMethod.Get);
+		Register("/streams/{stream}/metadata/{event}/backward/{count}?embed={embed}", HttpMethod.Get);
+		Register("/streams/{stream}/metadata/{event}/forward/{count}?embed={embed}", HttpMethod.Get);
+		Register("/streams/{stream}/metadata/data", HttpMethod.Get);
+		Register("/streams/{stream}/metadata/metadata", HttpMethod.Get);
+		Register("/streams/{stream}/metadata/{event}/data", HttpMethod.Get);
+		Register("/streams/{stream}/metadata/{event}/metadata", HttpMethod.Get);
+		Register("/streams/$all?embed={embed}", HttpMethod.Get);
+		Register("/streams/$all/{position}/{count}?embed={embed}", HttpMethod.Get);
+		Register("/streams/$all/{position}/backward/{count}?embed={embed}", HttpMethod.Get);
+		Register("/streams/$all/{position}/forward/{count}?embed={embed}", HttpMethod.Get);
+		Register("/projections", HttpMethod.Get);
+		Register("/projections/any", HttpMethod.Get);
+		Register("/projections/all-non-transient", HttpMethod.Get);
+		Register("/projections/transient", HttpMethod.Get);
+		Register("/projections/onetime", HttpMethod.Get);
+		Register("/projections/continuous", HttpMethod.Get);
+		Register("/projections/transient?name={name}&type={type}&enabled={enabled}", HttpMethod.Post);
+		Register(
+			"/projections/onetime?name={name}&type={type}&enabled={enabled}&checkpoints={checkpoints}&emit={emit}",
+			HttpMethod.Post);
+		Register("/projections/continuous?name={name}&type={type}&enabled={enabled}&emit={emit}", HttpMethod.Post);
+		Register("/projection/{name}/query?config={config}", HttpMethod.Get);
+		Register("/projection/{name}/query?type={type}&emit={emit}", HttpMethod.Put);
+		Register("/projection/{name}", HttpMethod.Get);
+		Register(
+			"/projection/{name}?deleteStateStream={deleteStateStream}&deleteCheckpointStream={deleteCheckpointStream}",
+			HttpMethod.Delete);
+		Register("/projection/{name}/statistics", HttpMethod.Get);
+		Register("/projection/{name}/debug", HttpMethod.Get);
+		Register("/projection/{name}/state?partition={partition}", HttpMethod.Get);
+		Register("/projection/{name}/result?partition={partition}", HttpMethod.Get);
+		Register("/projection/{name}/command/disable", HttpMethod.Post);
+		Register("/projection/{name}/command/enable", HttpMethod.Post);
+		Register("/projection/{name}/command/reset", HttpMethod.Post);
+		Register("/stats", HttpMethod.Get);
+		Register("/stats/{*statPath}", HttpMethod.Get);
+		Register("/users/", HttpMethod.Get);
+		Register("/users/{login}", HttpMethod.Get);
+		Register("/users/", HttpMethod.Post);
+		Register("/users/{login}", HttpMethod.Put);
+		Register("/users/{login}", HttpMethod.Delete);
+		Register("/users/{login}/command/enable", HttpMethod.Post);
+		Register("/users/{login}/command/disable", HttpMethod.Post);
+		Register("/users/{login}/command/reset-password", HttpMethod.Post);
+		Register("/users/{login}/command/change-password", HttpMethod.Post);
+	}
+
+	private void Register(string route, string verb) {
+		if (_router == null) {
+			_http.RegisterAction(
+				new ControllerAction(route, verb, Codec.NoCodecs, SupportedCodecs, new Operation()),
+				(x, y) => {
+					x.Reply(new byte[0], 200, "", "", Helper.UTF8NoBom, null, e => new Exception());
+					CountdownEvent.Signal();
+				});
+		} else {
+			_router.RegisterAction(
+				new ControllerAction(route, verb, Codec.NoCodecs, SupportedCodecs, new Operation()),
+				(x, y) => {
+					CountdownEvent.Signal();
+					return new RequestParams(TimeSpan.Zero);
+				});
+		}
+
+		var uriTemplate = new UriTemplate(route);
+		var bound = uriTemplate.BindByPosition(new Uri("http://localhost:12345/"),
+			Enumerable.Range(0,
+					uriTemplate.PathSegmentVariableNames.Count +
+					uriTemplate.QueryValueVariableNames.Count)
+				.Select(x => "abacaba")
+				.ToArray());
+		BoundRoutes.Add(Tuple.Create(bound.AbsoluteUri, verb));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Http/uri_router_should.cs b/src/KurrentDB.Core.Tests/Services/Transport/Http/uri_router_should.cs
new file mode 100644
index 00000000000..ddb7026606b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Http/uri_router_should.cs
@@ -0,0 +1,289 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Services.Transport.Http;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.Codecs;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Http;
+
+[TestFixture]
+public class naive_uri_router_should : uri_router_should {
+	public naive_uri_router_should() : base(() => new NaiveUriRouter()) {
+	}
+}
+
+[TestFixture]
+public class trie_uri_router_should : uri_router_should {
+	public trie_uri_router_should()
+		: base(() => new TrieUriRouter()) {
+	}
+}
+
+public abstract class uri_router_should {
+	private readonly Func<IUriRouter> _uriRouterFactory;
+
+	private IUriRouter _router;
+
+	protected uri_router_should(Func<IUriRouter> uriRouterFactory) {
+		Ensure.NotNull(uriRouterFactory, "uriRouterFactory");
+		_uriRouterFactory = uriRouterFactory;
+	}
+
+	[SetUp]
+	public void SetUp() {
+		_router = _uriRouterFactory();
+
+		var p = new RequestParams(TimeSpan.Zero);
+		_router.RegisterAction(
+			new ControllerAction("/", HttpMethod.Get, Codec.NoCodecs, FakeController.SupportedCodecs, new Operation()), (x, y) => p);
+		_router.RegisterAction(
+			new ControllerAction("/{placeholder}", HttpMethod.Get, Codec.NoCodecs, FakeController.SupportedCodecs, new Operation()),
+			(x, y) => p);
+		_router.RegisterAction(
+			new ControllerAction("/halt", HttpMethod.Get, Codec.NoCodecs, FakeController.SupportedCodecs, new Operation()),
+			(x, y) => p);
+		_router.RegisterAction(
+			new ControllerAction("/streams/{stream}/{event}/backward/{count}?embed={embed}", HttpMethod.Get,
+				Codec.NoCodecs, FakeController.SupportedCodecs, new Operation()), (x, y) => p);
+		_router.RegisterAction(
+			new ControllerAction(
+				"/projection/{name}?deleteStateStream={deleteStateStream}&deleteCheckpointStream={deleteCheckpointStream}",
+				HttpMethod.Get, Codec.NoCodecs, FakeController.SupportedCodecs, new Operation()), (x, y) => p);
+		_router.RegisterAction(
+			new ControllerAction("/s/stats/{*statPath}", HttpMethod.Get, Codec.NoCodecs,
+				FakeController.SupportedCodecs, new Operation()), (x, y) => p);
+		_router.RegisterAction(
+			new ControllerAction("/streams/$all/", HttpMethod.Get, Codec.NoCodecs, FakeController.SupportedCodecs, new Operation()),
+			(x, y) => p);
+		_router.RegisterAction(
+			new ControllerAction("/streams/$$all", HttpMethod.Get, Codec.NoCodecs, FakeController.SupportedCodecs, new Operation()),
+			(x, y) => p);
+		_router.RegisterAction(
+			new ControllerAction("/streams/$mono?param={param}", HttpMethod.Get, Codec.NoCodecs,
+				FakeController.SupportedCodecs, new Operation()), (x, y) => p);
+
+		_router.RegisterAction(
+			new ControllerAction("/streams/test", HttpMethod.Get, Codec.NoCodecs, FakeController.SupportedCodecs, new Operation()),
+			(x, y) => p);
+		_router.RegisterAction(
+			new ControllerAction("/streams/test", HttpMethod.Post, Codec.NoCodecs, FakeController.SupportedCodecs, new Operation()),
+			(x, y) => p);
+
+		_router.RegisterAction(
+			new ControllerAction("/t/{placeholder1}/{placholder2}/{placeholder3}", HttpMethod.Get, Codec.NoCodecs,
+				FakeController.SupportedCodecs, new Operation()), (x, y) => p);
+		_router.RegisterAction(
+			new ControllerAction("/t/{placeholder1}/{placholder2}/something", HttpMethod.Get, Codec.NoCodecs,
+				FakeController.SupportedCodecs, new Operation()), (x, y) => p);
+		_router.RegisterAction(
+			new ControllerAction("/t/{placeholder1}/something/{placeholder3}", HttpMethod.Get, Codec.NoCodecs,
+				FakeController.SupportedCodecs, new Operation()), (x, y) => p);
+		_router.RegisterAction(
+			new ControllerAction("/t/{placeholder1}/something/something", HttpMethod.Get, Codec.NoCodecs,
+				FakeController.SupportedCodecs, new Operation()), (x, y) => p);
+		_router.RegisterAction(
+			new ControllerAction("/t/something/{placholder2}/{placeholder3}", HttpMethod.Get, Codec.NoCodecs,
+				FakeController.SupportedCodecs, new Operation()), (x, y) => p);
+		_router.RegisterAction(
+			new ControllerAction("/t/something/{placholder2}/something", HttpMethod.Get, Codec.NoCodecs,
+				FakeController.SupportedCodecs, new Operation()), (x, y) => p);
+		_router.RegisterAction(
+			new ControllerAction("/t/something/something/{placeholder3}", HttpMethod.Get, Codec.NoCodecs,
+				FakeController.SupportedCodecs, new Operation()), (x, y) => p);
+		_router.RegisterAction(
+			new ControllerAction("/t/something/something/something", HttpMethod.Get, Codec.NoCodecs,
+				FakeController.SupportedCodecs, new Operation()), (x, y) => p);
+	}
+
+	[Test]
+	public void detect_duplicate_route() {
+		Assert.That(() =>
+				_router.RegisterAction(
+					new ControllerAction("/halt", HttpMethod.Get, Codec.NoCodecs, FakeController.SupportedCodecs, new Operation()),
+					(x, y) => new RequestParams(TimeSpan.Zero)),
+			Throws.Exception.InstanceOf<ArgumentException>().With.Message.EqualTo("Duplicate route."));
+	}
+
+	[Test]
+	public void match_root() {
+		var match = _router.GetAllUriMatches(Uri("/"));
+		Assert.AreEqual(1, match.Count);
+		Assert.AreEqual("/", match[0].ControllerAction.UriTemplate);
+		Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
+	}
+
+	[Test]
+	public void match_single_segment_path() {
+		var match = _router.GetAllUriMatches(Uri("/halt"));
+		Assert.AreEqual(2, match.Count);
+		Assert.AreEqual("/{placeholder}", match[0].ControllerAction.UriTemplate);
+		Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
+		Assert.AreEqual("/halt", match[1].ControllerAction.UriTemplate);
+		Assert.AreEqual(HttpMethod.Get, match[1].ControllerAction.HttpMethod);
+	}
+
+	[Test, Ignore("ignore")]
+	public void not_care_about_trailing_slash() {
+		var match = _router.GetAllUriMatches(Uri("/streams/$all"));
+		Assert.AreEqual(1, match.Count);
+		Assert.AreEqual("/streams/$all/", match[0].ControllerAction.UriTemplate);
+		Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
+
+		match = _router.GetAllUriMatches(Uri("/streams/$all/"));
+		Assert.AreEqual(1, match.Count);
+		Assert.AreEqual("/streams/$all/", match[0].ControllerAction.UriTemplate);
+		Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
+	}
+
+	[Test, Ignore("ignore")]
+	public void not_care_about_trailing_slash2() {
+		var match = _router.GetAllUriMatches(Uri("/streams/$$all"));
+		Assert.AreEqual(1, match.Count);
+		Assert.AreEqual("/streams/$$all", match[0].ControllerAction.UriTemplate);
+		Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
+
+		match = _router.GetAllUriMatches(Uri("/streams/$$all/"));
+		Assert.AreEqual(1, match.Count);
+		Assert.AreEqual("/streams/$$all", match[0].ControllerAction.UriTemplate);
+		Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
+	}
+
+	[Test]
+	public void care_about_trailing_slash() {
+		var match = _router.GetAllUriMatches(Uri("/streams/$all/"));
+		Assert.AreEqual(1, match.Count);
+		Assert.AreEqual("/streams/$all/", match[0].ControllerAction.UriTemplate);
+		Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
+
+		match = _router.GetAllUriMatches(Uri("/streams/$all"));
+		Assert.AreEqual(0, match.Count);
+	}
+
+	[Test]
+	public void care_about_trailing_slash2() {
+		var match = _router.GetAllUriMatches(Uri("/streams/$$all"));
+		Assert.AreEqual(1, match.Count);
+		Assert.AreEqual("/streams/$$all", match[0].ControllerAction.UriTemplate);
+		Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
+
+		match = _router.GetAllUriMatches(Uri("/streams/$$all/"));
+		Assert.AreEqual(0, match.Count);
+	}
+
+	[Test]
+	public void match_route_with_dollar_sign() {
+		var match = _router.GetAllUriMatches(Uri("/streams/$mono"));
+		Assert.AreEqual(1, match.Count);
+		Assert.AreEqual("/streams/$mono?param={param}", match[0].ControllerAction.UriTemplate);
+		Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
+
+		match = _router.GetAllUriMatches(Uri("/streams/$mono?param=bla"));
+		Assert.AreEqual(1, match.Count);
+		Assert.AreEqual("/streams/$mono?param={param}", match[0].ControllerAction.UriTemplate);
+		Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
+	}
+
+	[Test]
+	public void match_complex_route_with_placeholders_and_query_params() {
+		var match = _router.GetAllUriMatches(Uri("/streams/test-stream/10/backward/20?embed=true"));
+		Assert.AreEqual(1, match.Count);
+		Assert.AreEqual("/streams/{stream}/{event}/backward/{count}?embed={embed}",
+			match[0].ControllerAction.UriTemplate);
+		Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
+	}
+
+	[Test]
+	public void match_complex_route_with_placeholders_and_query_params_when_no_query_params_are_set() {
+		var match = _router.GetAllUriMatches(Uri("/streams/test-stream/head/backward/20"));
+		Assert.AreEqual(1, match.Count);
+		Assert.AreEqual("/streams/{stream}/{event}/backward/{count}?embed={embed}",
+			match[0].ControllerAction.UriTemplate);
+		Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
+	}
+
+	[Test]
+	public void not_match_partial_route_match() {
+		var match = _router.GetAllUriMatches(Uri("/projection/proj/something"));
+		Assert.AreEqual(0, match.Count);
+	}
+
+	[Test]
+	public void match_all_possible_alternatives() {
+		var match = _router.GetAllUriMatches(Uri("/t/something/something/something"));
+		Assert.AreEqual(8, match.Count);
+		Assert.AreEqual(new[] {
+				"/t/{placeholder1}/{placholder2}/{placeholder3}",
+				"/t/{placeholder1}/{placholder2}/something",
+				"/t/{placeholder1}/something/{placeholder3}",
+				"/t/{placeholder1}/something/something",
+				"/t/something/{placholder2}/{placeholder3}",
+				"/t/something/{placholder2}/something",
+				"/t/something/something/{placeholder3}",
+				"/t/something/something/something"
+			},
+			match.Select(x => x.ControllerAction.UriTemplate).ToArray());
+	}
+
+	[Test]
+	public void match_same_routes_with_different_http_methods() {
+		var match = _router.GetAllUriMatches(Uri("/streams/test"));
+		Assert.AreEqual(2, match.Count);
+		Assert.AreEqual("/streams/test", match[0].ControllerAction.UriTemplate);
+		Assert.AreEqual(HttpMethod.Get, match[0].ControllerAction.HttpMethod);
+		Assert.AreEqual("/streams/test", match[1].ControllerAction.UriTemplate);
+		Assert.AreEqual(HttpMethod.Post, match[1].ControllerAction.HttpMethod);
+	}
+
+	[Test]
+	public void match_greedy_route_with_bare_minimum_of_uri() {
+		var match = _router.GetAllUriMatches(Uri("/s/stats/test"));
+		Assert.AreEqual(1, match.Count);
+		Assert.AreEqual("/s/stats/{*statPath}", match[0].ControllerAction.UriTemplate);
+	}
+
+	[Test]
+	public void match_greedy_route_and_catch_long_uri() {
+		var match = _router.GetAllUriMatches(Uri("/s/stats/some/long/stat/path"));
+		Assert.AreEqual(1, match.Count);
+		Assert.AreEqual("/s/stats/{*statPath}", match[0].ControllerAction.UriTemplate);
+	}
+
+	[Test]
+	public void match_greedy_route_with_empty_path_part_starting_with_slash() {
+		var match = _router.GetAllUriMatches(Uri("/s/stats/"));
+		Assert.AreEqual(1, match.Count);
+		Assert.AreEqual("/s/stats/{*statPath}", match[0].ControllerAction.UriTemplate);
+	}
+
+	[Test]
+	public void not_match_greedy_route_with_empty_path_part_without_slash() {
+		var match = _router.GetAllUriMatches(Uri("/s/stats"));
+		Assert.AreEqual(0, match.Count);
+	}
+
+	[Test]
+	public void match_greedy_route_in_the_root_to_any_path() {
+		var tmpRouter = _uriRouterFactory();
+		tmpRouter.RegisterAction(
+			new ControllerAction("/{*greedy}", HttpMethod.Get, Codec.NoCodecs, FakeController.SupportedCodecs, new Operation()),
+			(x, y) => new RequestParams(TimeSpan.Zero));
+
+		var match = tmpRouter.GetAllUriMatches(Uri("/"));
+		Assert.AreEqual(1, match.Count);
+		Assert.AreEqual("/{*greedy}", match[0].ControllerAction.UriTemplate);
+
+		match = tmpRouter.GetAllUriMatches(Uri("/something"));
+		Assert.AreEqual(1, match.Count);
+		Assert.AreEqual("/{*greedy}", match[0].ControllerAction.UriTemplate);
+	}
+
+	private Uri Uri(string relativePath) {
+		return new Uri("http://localhost:12345" + relativePath);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Http/when_getting_tcp_stats_from_stat_controller.cs b/src/KurrentDB.Core.Tests/Services/Transport/Http/when_getting_tcp_stats_from_stat_controller.cs
new file mode 100644
index 00000000000..deda8b56db4
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Http/when_getting_tcp_stats_from_stat_controller.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.ClientAPI;
+using KurrentDB.Transport.Http.Codecs;
+using NUnit.Framework;
+using HttpMethod = System.Net.Http.HttpMethod;
+using HttpStatusCode = System.Net.HttpStatusCode;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Http;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_getting_tcp_stats_from_stat_controller<TLogFormat, TStreamId>
+	: SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	private IEventStoreConnection _connection;
+	private string _url;
+	private string _clientConnectionName = "test-connection";
+
+	private List<MonitoringMessage.TcpConnectionStats> _results = new List<MonitoringMessage.TcpConnectionStats>();
+	private HttpResponseMessage _response;
+
+	protected override async Task Given() {
+		_url = _node.HttpEndPoint.ToHttpUrl(EndpointExtensions.HTTP_SCHEMA, "/stats/tcp");
+
+		var settings = ConnectionSettings.Create().DisableServerCertificateValidation();
+		_connection = EventStoreConnection.Create(settings, _node.TcpEndPoint, _clientConnectionName);
+		await _connection.ConnectAsync();
+
+		var testEvent = new EventData(Guid.NewGuid(), "TestEvent", true,
+			Encoding.ASCII.GetBytes("{'Test' : 'OneTwoThree'}"), null);
+		await _connection.AppendToStreamAsync("tests", ExpectedVersion.Any, testEvent);
+	}
+
+	protected override async Task When() {
+		_response = await _node.HttpClient.SendAsync(new HttpRequestMessage(HttpMethod.Get, _url));
+		_results = Codec.Json.From<List<MonitoringMessage.TcpConnectionStats>>(
+			await _response.Content.ReadAsStringAsync());
+	}
+
+	[Test]
+	public void should_have_succeeded() {
+		Assert.AreEqual(HttpStatusCode.OK, _response.StatusCode);
+	}
+
+	[Test]
+	public void should_return_the_external_connections() {
+		Assert.AreEqual(2, _results.Count(r => r.IsExternalConnection));
+	}
+
+	[Test]
+	public void should_return_the_total_number_of_bytes_sent_for_external_connections() {
+		Assert.Greater(_results.Sum(r => r.IsExternalConnection ? r.TotalBytesSent : 0), 0);
+	}
+
+	[Test]
+	public void should_return_the_total_number_of_bytes_received_from_external_connections() {
+		Assert.Greater(_results.Sum(r => r.IsExternalConnection ? r.TotalBytesReceived : 0), 0);
+	}
+
+	[Test]
+	public void should_have_set_the_client_connection_name() {
+		Assert.IsTrue(_results.Any(x => x.ClientConnectionName == _clientConnectionName));
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		_connection.Dispose();
+		return base.TestFixtureTearDown();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Tcp/TcpClientDispatcherTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/TcpClientDispatcherTests.cs
new file mode 100644
index 00000000000..7ee647ccfcb
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/TcpClientDispatcherTests.cs
@@ -0,0 +1,301 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Text;
+using EventStore.Client.Messages;
+using KurrentDB.Core.Authentication.InternalAuthentication;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.LogV2;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.Core.Tests.Authentication;
+using KurrentDB.Core.Tests.Authorization;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.Util;
+using NUnit.Framework;
+using EventRecord = KurrentDB.Core.Data.EventRecord;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Tcp;
+
+[TestFixture]
+public class TcpClientDispatcherTests {
+	private readonly NoopEnvelope _envelope = new NoopEnvelope();
+
+	private ClientTcpDispatcher _dispatcher;
+	private TcpConnectionManager _connection;
+
+	[OneTimeSetUp]
+	public void Setup() {
+		_dispatcher = new ClientTcpDispatcher(2000);
+
+		var dummyConnection = new DummyTcpConnection();
+		_connection = new TcpConnectionManager(
+			Guid.NewGuid().ToString(), TcpServiceType.External, new ClientTcpDispatcher(2000),
+			new SynchronousScheduler(), dummyConnection, new SynchronousScheduler(), new InternalAuthenticationProvider(
+				InMemoryBus.CreateTest(), new IODispatcher(new SynchronousScheduler(), new NoopEnvelope()),
+				new StubPasswordHashAlgorithm(), 1, false, DefaultData.DefaultUserOptions),
+			new AuthorizationGateway(new TestAuthorizationProvider()),
+			TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10), (man, err) => { },
+			Opts.ConnectionPendingSendBytesThresholdDefault, Opts.ConnectionQueueSizeThresholdDefault);
+	}
+
+	[Test]
+	public void
+		when_wrapping_read_stream_events_forward_and_stream_was_deleted_should_not_downgrade_last_event_number_for_v2_clients() {
+		var msg = new ClientMessage.ReadStreamEventsForwardCompleted(Guid.NewGuid(), "test-stream", 0, 100,
+			ReadStreamResult.StreamDeleted, new ResolvedEvent[0], new StreamMetadata(),
+			true, "", -1, long.MaxValue, true, 1000);
+
+		var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
+		Assert.IsNotNull(package, "Package is null");
+		Assert.AreEqual(TcpCommand.ReadStreamEventsForwardCompleted, package.Value.Command, "TcpCommand");
+
+		var dto = package.Value.Data.Deserialize<ReadStreamEventsCompleted>();
+		Assert.IsNotNull(dto, "DTO is null");
+
+		Assert.AreEqual(long.MaxValue, dto.LastEventNumber, "Last Event Number");
+	}
+
+	[Test]
+	public void
+		when_wrapping_read_stream_events_backward_and_stream_was_deleted_should_not_downgrade_last_event_number_for_v2_clients() {
+		var msg = new ClientMessage.ReadStreamEventsBackwardCompleted(Guid.NewGuid(), "test-stream", 0, 100,
+			ReadStreamResult.StreamDeleted, new ResolvedEvent[0], new StreamMetadata(),
+			true, "", -1, long.MaxValue, true, 1000);
+
+		var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
+		Assert.IsNotNull(package, "Package is null");
+		Assert.AreEqual(TcpCommand.ReadStreamEventsBackwardCompleted, package.Value.Command, "TcpCommand");
+
+		var dto = package.Value.Data.Deserialize<ReadStreamEventsCompleted>();
+		Assert.IsNotNull(dto, "DTO is null");
+
+		Assert.AreEqual(long.MaxValue, dto.LastEventNumber, "Last Event Number");
+	}
+
+	[Test]
+	public void
+		when_wrapping_read_all_events_forward_completed_with_deleted_event_should_not_downgrade_last_event_number_for_v2_clients() {
+		var events = new ResolvedEvent[] {
+			ResolvedEvent.ForUnresolvedEvent(CreateDeletedEventRecord(), 0),
+		};
+		var msg = new ClientMessage.ReadAllEventsForwardCompleted(Guid.NewGuid(), ReadAllResult.Success, "", events,
+			new StreamMetadata(), true, 10, new TFPos(0, 0),
+			new TFPos(200, 200), new TFPos(0, 0), 100);
+
+		var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
+		Assert.IsNotNull(package, "Package is null");
+		Assert.AreEqual(TcpCommand.ReadAllEventsForwardCompleted, package.Value.Command, "TcpCommand");
+
+		var dto = package.Value.Data.Deserialize<ReadAllEventsCompleted>();
+		Assert.IsNotNull(dto, "DTO is null");
+		Assert.AreEqual(1, dto.Events.Count(), "Number of events");
+
+		Assert.AreEqual(long.MaxValue, dto.Events[0].Event.EventNumber, "Event Number");
+	}
+
+	[Test]
+	public void
+		when_wrapping_read_all_events_forward_completed_with_link_to_deleted_event_should_not_downgrade_version_for_v2_clients() {
+		var events = new ResolvedEvent[] {
+			ResolvedEvent.ForResolvedLink(CreateLinkEventRecord(), CreateDeletedEventRecord(), 100)
+		};
+		var msg = new ClientMessage.ReadAllEventsForwardCompleted(Guid.NewGuid(), ReadAllResult.Success, "", events,
+			new StreamMetadata(), true, 10, new TFPos(0, 0),
+			new TFPos(200, 200), new TFPos(0, 0), 100);
+
+		var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
+		Assert.IsNotNull(package, "Package is null");
+		Assert.AreEqual(TcpCommand.ReadAllEventsForwardCompleted, package.Value.Command, "TcpCommand");
+
+		var dto = package.Value.Data.Deserialize<ReadAllEventsCompleted>();
+		Assert.IsNotNull(dto, "DTO is null");
+		Assert.AreEqual(1, dto.Events.Count(), "Number of events");
+
+		Assert.AreEqual(0, dto.Events[0].Event.EventNumber, "Event Number");
+		Assert.AreEqual(long.MaxValue, dto.Events[0].Link.EventNumber, "Link Event Number");
+	}
+
+	[Test]
+	public void
+		when_wrapping_read_all_events_backward_completed_with_deleted_event_should_not_downgrade_version_for_v2_clients() {
+		var events = new ResolvedEvent[] {
+			ResolvedEvent.ForUnresolvedEvent(CreateDeletedEventRecord(), 0),
+		};
+		var msg = new ClientMessage.ReadAllEventsBackwardCompleted(Guid.NewGuid(), ReadAllResult.Success, "",
+			events,
+			new StreamMetadata(), true, 10, new TFPos(0, 0),
+			new TFPos(200, 200), new TFPos(0, 0), 100);
+
+		var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
+		Assert.IsNotNull(package, "Package is null");
+		Assert.AreEqual(TcpCommand.ReadAllEventsBackwardCompleted, package.Value.Command, "TcpCommand");
+
+		var dto = package.Value.Data.Deserialize<ReadAllEventsCompleted>();
+		Assert.IsNotNull(dto, "DTO is null");
+		Assert.AreEqual(1, dto.Events.Count(), "Number of events");
+
+		Assert.AreEqual(long.MaxValue, dto.Events[0].Event.EventNumber, "Event Number");
+	}
+
+	[Test]
+	public void
+		when_wrapping_read_all_events_backward_completed_with_link_to_deleted_event_should_not_downgrade_version_for_v2_clients() {
+		var events = new ResolvedEvent[] {
+			ResolvedEvent.ForResolvedLink(CreateLinkEventRecord(), CreateDeletedEventRecord(), 100)
+		};
+		var msg = new ClientMessage.ReadAllEventsBackwardCompleted(Guid.NewGuid(), ReadAllResult.Success, "",
+			events,
+			new StreamMetadata(), true, 10, new TFPos(0, 0),
+			new TFPos(200, 200), new TFPos(0, 0), 100);
+
+		var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
+		Assert.IsNotNull(package, "Package is null");
+		Assert.AreEqual(TcpCommand.ReadAllEventsBackwardCompleted, package.Value.Command, "TcpCommand");
+
+		var dto = package.Value.Data.Deserialize<ReadAllEventsCompleted>();
+		Assert.IsNotNull(dto, "DTO is null");
+		Assert.AreEqual(1, dto.Events.Count(), "Number of events");
+
+		Assert.AreEqual(0, dto.Events[0].Event.EventNumber, "Event Number");
+		Assert.AreEqual(long.MaxValue, dto.Events[0].Link.EventNumber, "Link Event Number");
+	}
+
+	[Test]
+	public void
+		when_wrapping_stream_event_appeared_with_deleted_event_should_not_downgrade_version_for_v2_clients() {
+		var msg = new ClientMessage.StreamEventAppeared(Guid.NewGuid(),
+			ResolvedEvent.ForUnresolvedEvent(CreateDeletedEventRecord(), 0));
+
+		var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
+		Assert.IsNotNull(package, "Package is null");
+		Assert.AreEqual(TcpCommand.StreamEventAppeared, package.Value.Command, "TcpCommand");
+
+		var dto = package.Value.Data.Deserialize<StreamEventAppeared>();
+		Assert.IsNotNull(dto, "DTO is null");
+		Assert.AreEqual(long.MaxValue, dto.Event.Event.EventNumber, "Event Number");
+	}
+
+	[Test]
+	public void
+		when_wrapping_subscribe_to_stream_confirmation_when_stream_deleted_should_not_downgrade_version_for_v2_clients() {
+		var msg = new ClientMessage.SubscriptionConfirmation(Guid.NewGuid(), 100, long.MaxValue);
+		var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
+		Assert.IsNotNull(package, "Package is null");
+		Assert.AreEqual(TcpCommand.SubscriptionConfirmation, package.Value.Command, "TcpCommand");
+
+		var dto = package.Value.Data.Deserialize<SubscriptionConfirmation>();
+		Assert.IsNotNull(dto, "DTO is null");
+		Assert.AreEqual(long.MaxValue, dto.LastEventNumber, "Last Event Number");
+	}
+
+	[Test]
+	public void
+		when_wrapping_subscribe_to_stream_confirmation_when_stream_deleted_should_not_downgrade_last_event_number_for_v2_clients() {
+		var msg = new ClientMessage.SubscriptionConfirmation(Guid.NewGuid(), 100, long.MaxValue);
+		var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
+		Assert.IsNotNull(package, "Package is null");
+		Assert.AreEqual(TcpCommand.SubscriptionConfirmation, package.Value.Command, "TcpCommand");
+
+		var dto = package.Value.Data.Deserialize<SubscriptionConfirmation>();
+		Assert.IsNotNull(dto, "DTO is null");
+		Assert.AreEqual(long.MaxValue, dto.LastEventNumber, "Last Event Number");
+	}
+
+	[Test]
+	public void
+		when_wrapping_stream_event_appeared_with_link_to_deleted_event_should_not_downgrade_version_for_v2_clients() {
+		var msg = new ClientMessage.StreamEventAppeared(Guid.NewGuid(),
+			ResolvedEvent.ForResolvedLink(CreateLinkEventRecord(), CreateDeletedEventRecord(), 0));
+
+		var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
+		Assert.IsNotNull(package, "Package is null");
+		Assert.AreEqual(TcpCommand.StreamEventAppeared, package.Value.Command, "TcpCommand");
+
+		var dto = package.Value.Data.Deserialize<StreamEventAppeared>();
+		Assert.IsNotNull(dto, "DTO is null");
+		Assert.AreEqual(0, dto.Event.Event.EventNumber, "Event Number");
+		Assert.AreEqual(long.MaxValue, dto.Event.Link.EventNumber, "Link Event Number");
+	}
+
+	[Test]
+	public void
+		when_wrapping_persistent_subscription_confirmation_when_stream_deleted_should_not_downgrade_last_event_number_for_v2_clients() {
+		var msg = new ClientMessage.PersistentSubscriptionConfirmation("subscription", Guid.NewGuid(), 100,
+			long.MaxValue);
+		var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
+		Assert.IsNotNull(package, "Package is null");
+		Assert.AreEqual(TcpCommand.PersistentSubscriptionConfirmation, package.Value.Command, "TcpCommand");
+
+		var dto = package.Value.Data.Deserialize<PersistentSubscriptionConfirmation>();
+		Assert.IsNotNull(dto, "DTO is null");
+		Assert.AreEqual(long.MaxValue, dto.LastEventNumber, "Last event number");
+	}
+
+	[Test]
+	public void
+		when_wrapping_scavenge_started_response_should_return_result_and_scavengeId_for_v2_clients() {
+		var scavengeId = Guid.NewGuid().ToString();
+		var msg = new ClientMessage.ScavengeDatabaseStartedResponse(Guid.NewGuid(), scavengeId);
+
+		var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
+		Assert.IsNotNull(package, "Package is null");
+		Assert.AreEqual(TcpCommand.ScavengeDatabaseResponse, package.Value.Command, "TcpCommand");
+
+		var dto = package.Value.Data.Deserialize<ScavengeDatabaseResponse>();
+		Assert.IsNotNull(dto, "DTO is null");
+		Assert.AreEqual(dto.Result, ScavengeDatabaseResponse.Types.ScavengeResult.Started);
+		Assert.AreEqual(dto.ScavengeId, scavengeId);
+	}
+
+	[Test]
+	public void
+		when_wrapping_scavenge_inprogress_response_should_return_result_and_scavengeId_for_v2_clients() {
+		var scavengeId = Guid.NewGuid().ToString();
+		var msg = new ClientMessage.ScavengeDatabaseInProgressResponse(Guid.NewGuid(), scavengeId, reason: "In Progress");
+
+		var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
+		Assert.IsNotNull(package, "Package is null");
+		Assert.AreEqual(TcpCommand.ScavengeDatabaseResponse, package.Value.Command, "TcpCommand");
+
+		var dto = package.Value.Data.Deserialize<ScavengeDatabaseResponse>();
+		Assert.IsNotNull(dto, "DTO is null");
+		Assert.AreEqual(dto.Result, ScavengeDatabaseResponse.Types.ScavengeResult.InProgress);
+		Assert.AreEqual(dto.ScavengeId, scavengeId);
+	}
+
+	[Test]
+	public void
+		when_wrapping_scavenge_unauthorized_response_should_return_result_and_scavengeId_for_v2_clients() {
+		var scavengeId = Guid.NewGuid().ToString();
+		var msg = new ClientMessage.ScavengeDatabaseUnauthorizedResponse(Guid.NewGuid(), scavengeId, "Unauthorized");
+
+		var package = _dispatcher.WrapMessage(msg, (byte)ClientVersion.V2);
+		Assert.IsNotNull(package, "Package is null");
+		Assert.AreEqual(TcpCommand.ScavengeDatabaseResponse, package.Value.Command, "TcpCommand");
+
+		var dto = package.Value.Data.Deserialize<ScavengeDatabaseResponse>();
+		Assert.IsNotNull(dto, "DTO is null");
+		Assert.AreEqual(dto.Result, ScavengeDatabaseResponse.Types.ScavengeResult.Unauthorized);
+		Assert.AreEqual(dto.ScavengeId, scavengeId);
+	}
+
+	private EventRecord CreateDeletedEventRecord() {
+		return new EventRecord(long.MaxValue,
+			LogRecord.DeleteTombstone(new LogV2RecordFactory(), 0, Guid.NewGuid(), Guid.NewGuid(),
+				"test-stream", "test-type", long.MaxValue), "test-stream", SystemEventTypes.StreamDeleted);
+	}
+
+	private EventRecord CreateLinkEventRecord() {
+		return new EventRecord(0, LogRecord.Prepare(new LogV2RecordFactory(), 100, Guid.NewGuid(), Guid.NewGuid(), 0, 0,
+			"link-stream", -1, PrepareFlags.SingleWrite | PrepareFlags.Data, SystemEventTypes.LinkTo,
+			Encoding.UTF8.GetBytes(string.Format("{0}@test-stream", long.MaxValue)), new byte[0]), "link-stream", SystemEventTypes.LinkTo);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Tcp/TcpConnectionManagerTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/TcpConnectionManagerTests.cs
new file mode 100644
index 00000000000..03dbb9fc8c6
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/TcpConnectionManagerTests.cs
@@ -0,0 +1,325 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using EventStore.Client.Messages;
+using KurrentDB.Core.Authentication.InternalAuthentication;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.Core.Settings;
+using KurrentDB.Core.Tests.Authentication;
+using KurrentDB.Core.Tests.Authorization;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Transport.Tcp;
+using NUnit.Framework;
+using EventRecord = KurrentDB.Core.Data.EventRecord;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Tcp;
+
+[TestFixture]
+public class TcpConnectionManagerTests {
+	private int _connectionPendingSendBytesThreshold = 10 * 1024;
+	private int _connectionQueueSizeThreshold = 50000;
+
+	[Test]
+	public void when_handling_trusted_write_on_external_service() {
+		var package = new TcpPackage(TcpCommand.WriteEvents, TcpFlags.TrustedWrite, Guid.NewGuid(), null, null,
+			new byte[] { });
+
+		var dummyConnection = new DummyTcpConnection();
+
+		var tcpConnectionManager = new TcpConnectionManager(
+			Guid.NewGuid().ToString(), TcpServiceType.External, new ClientTcpDispatcher(2000),
+			new SynchronousScheduler(), dummyConnection, new SynchronousScheduler(),
+			new InternalAuthenticationProvider(
+				InMemoryBus.CreateTest(), new IODispatcher(new SynchronousScheduler(), new NoopEnvelope()),
+				new StubPasswordHashAlgorithm(), 1, false, DefaultData.DefaultUserOptions),
+			new AuthorizationGateway(new TestAuthorizationProvider()),
+			TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10), (man, err) => { },
+			_connectionPendingSendBytesThreshold, _connectionQueueSizeThreshold);
+
+		tcpConnectionManager.ProcessPackage(package);
+
+		var data = dummyConnection.ReceivedData.Last();
+		var receivedPackage = TcpPackage.FromArraySegment(data);
+
+		Assert.AreEqual(receivedPackage.Command, TcpCommand.BadRequest, "Expected Bad Request but got {0}",
+			receivedPackage.Command);
+	}
+
+	[Test]
+	public void when_handling_trusted_write_on_internal_service() {
+		ManualResetEvent waiter = new ManualResetEvent(false);
+		ClientMessage.WriteEvents publishedWrite = null;
+		var evnt = new Event(Guid.NewGuid(), "TestEventType", true, new byte[] { }, new byte[] { });
+		var write = new WriteEvents(
+			Guid.NewGuid().ToString(),
+			ExpectedVersion.Any,
+			new[] {
+				new NewEvent(evnt.EventId.ToByteArray(), evnt.EventType, evnt.IsJson ? 1 : 0, 0,
+					evnt.Data, evnt.Metadata)
+			},
+			false);
+
+		var package = new TcpPackage(TcpCommand.WriteEvents, Guid.NewGuid(), write.Serialize());
+		var dummyConnection = new DummyTcpConnection();
+		var publisher = new SynchronousScheduler();
+
+		publisher.Subscribe(new AdHocHandler<ClientMessage.WriteEvents>(x => {
+			publishedWrite = x;
+			waiter.Set();
+		}));
+
+		var tcpConnectionManager = new TcpConnectionManager(
+			Guid.NewGuid().ToString(), TcpServiceType.Internal, new ClientTcpDispatcher(2000),
+			publisher, dummyConnection, publisher,
+			new InternalAuthenticationProvider(publisher, new IODispatcher(publisher, new NoopEnvelope()),
+				new StubPasswordHashAlgorithm(), 1, false, DefaultData.DefaultUserOptions),
+			new AuthorizationGateway(new TestAuthorizationProvider()),
+			TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10), (man, err) => { },
+			_connectionPendingSendBytesThreshold, _connectionQueueSizeThreshold);
+
+		tcpConnectionManager.ProcessPackage(package);
+
+		if (!waiter.WaitOne(TimeSpan.FromSeconds(5))) {
+			throw new Exception("Timed out waiting for events.");
+		}
+
+		Assert.AreEqual(evnt.EventId, publishedWrite.Events.First().EventId,
+			"Expected the published write to be the event that was sent through the tcp connection manager to be the event {0} but got {1}",
+			evnt.EventId, publishedWrite.Events.First().EventId);
+	}
+
+	[Test]
+	public void
+		when_limit_pending_and_sending_message_smaller_than_threshold_and_pending_bytes_over_threshold_should_close_connection() {
+		var mre = new ManualResetEventSlim();
+
+		var messageSize = _connectionPendingSendBytesThreshold / 2;
+		var evnt = new EventRecord(0, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, "testStream", 0, DateTime.Now,
+			PrepareFlags.None, "eventType", new byte[messageSize], new byte[0]);
+		var record = ResolvedEvent.ForUnresolvedEvent(evnt, null);
+		var message = new ClientMessage.ReadEventCompleted(Guid.NewGuid(), "testStream", ReadEventResult.Success,
+			record, StreamMetadata.Empty, false, "");
+
+		var dummyConnection = new DummyTcpConnection();
+		dummyConnection.PendingSendBytes = _connectionPendingSendBytesThreshold + 1000;
+
+		var tcpConnectionManager = new TcpConnectionManager(
+			Guid.NewGuid().ToString(), TcpServiceType.External, new ClientTcpDispatcher(2000),
+			new SynchronousScheduler(), dummyConnection, new SynchronousScheduler(),
+			new InternalAuthenticationProvider(
+				InMemoryBus.CreateTest(), new IODispatcher(new SynchronousScheduler(),
+					new NoopEnvelope()), null, 1, false, DefaultData.DefaultUserOptions),
+			new AuthorizationGateway(new TestAuthorizationProvider()),
+			TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10), (man, err) => { mre.Set(); },
+			_connectionPendingSendBytesThreshold, _connectionQueueSizeThreshold);
+
+		tcpConnectionManager.SendMessage(message);
+
+		if (!mre.Wait(2000)) {
+			Assert.Fail("Timed out waiting for connection to close");
+		}
+	}
+
+	[Test]
+	public void
+		when_limit_pending_and_sending_message_larger_than_pending_bytes_threshold_but_no_bytes_pending_should_not_close_connection() {
+		var messageSize = _connectionPendingSendBytesThreshold + 1000;
+		var evnt = new EventRecord(0, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, "testStream", 0, DateTime.Now,
+			PrepareFlags.None, "eventType", new byte[messageSize], new byte[0]);
+		var record = ResolvedEvent.ForUnresolvedEvent(evnt, null);
+		var message = new ClientMessage.ReadEventCompleted(Guid.NewGuid(), "testStream", ReadEventResult.Success,
+			record, StreamMetadata.Empty, false, "");
+
+		var dummyConnection = new DummyTcpConnection();
+		dummyConnection.PendingSendBytes = 0;
+
+		var tcpConnectionManager = new TcpConnectionManager(
+			Guid.NewGuid().ToString(), TcpServiceType.External, new ClientTcpDispatcher(2000),
+			new SynchronousScheduler(), dummyConnection, new SynchronousScheduler(),
+			new InternalAuthenticationProvider(InMemoryBus.CreateTest(),
+				new IODispatcher(new SynchronousScheduler(), new NoopEnvelope()), null, 1, false, DefaultData.DefaultUserOptions),
+			new AuthorizationGateway(new TestAuthorizationProvider()),
+			TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10), (man, err) => { },
+			_connectionPendingSendBytesThreshold, _connectionQueueSizeThreshold);
+
+		tcpConnectionManager.SendMessage(message);
+
+		var data = dummyConnection.ReceivedData.Last();
+		var receivedPackage = TcpPackage.FromArraySegment(data);
+
+		Assert.AreEqual(receivedPackage.Command, TcpCommand.ReadEventCompleted,
+			"Expected ReadEventCompleted but got {0}", receivedPackage.Command);
+	}
+
+	[Test]
+	public void
+		when_not_limit_pending_and_sending_message_smaller_than_threshold_and_pending_bytes_over_threshold_should_not_close_connection() {
+		var mre = new ManualResetEventSlim();
+
+		var messageSize = _connectionPendingSendBytesThreshold / 2;
+		var evnt = new EventRecord(0, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, "testStream", 0, DateTime.Now,
+			PrepareFlags.None, "eventType", new byte[messageSize], new byte[0]);
+		var record = ResolvedEvent.ForUnresolvedEvent(evnt, null);
+		var message = new ClientMessage.ReadEventCompleted(Guid.NewGuid(), "testStream", ReadEventResult.Success,
+			record, StreamMetadata.Empty, false, "");
+
+		var dummyConnection = new DummyTcpConnection();
+		dummyConnection.PendingSendBytes = _connectionPendingSendBytesThreshold + 1000;
+
+		var tcpConnectionManager = new TcpConnectionManager(
+			Guid.NewGuid().ToString(), TcpServiceType.External, new ClientTcpDispatcher(2000),
+			new SynchronousScheduler(), dummyConnection, new SynchronousScheduler(),
+			new InternalAuthenticationProvider(InMemoryBus.CreateTest(),
+				new IODispatcher(new SynchronousScheduler(), new NoopEnvelope()), null, 1, false, DefaultData.DefaultUserOptions),
+			new AuthorizationGateway(new TestAuthorizationProvider()),
+			TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10), (man, err) => { mre.Set(); },
+			ESConsts.UnrestrictedPendingSendBytes, ESConsts.MaxConnectionQueueSize);
+
+		tcpConnectionManager.SendMessage(message);
+
+		var data = dummyConnection.ReceivedData.Last();
+		var receivedPackage = TcpPackage.FromArraySegment(data);
+
+		Assert.AreEqual(receivedPackage.Command, TcpCommand.ReadEventCompleted,
+			"Expected ReadEventCompleted but got {0}", receivedPackage.Command);
+	}
+
+	[Test]
+	public void
+		when_send_queue_size_is_smaller_than_threshold_should_not_close_connection() {
+		var mre = new ManualResetEventSlim();
+
+		var messageSize = _connectionPendingSendBytesThreshold;
+		var evnt = new EventRecord(0, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, "testStream", 0, DateTime.Now,
+			PrepareFlags.None, "eventType", new byte[messageSize], new byte[0]);
+		var record = ResolvedEvent.ForUnresolvedEvent(evnt, null);
+		var message = new ClientMessage.ReadEventCompleted(Guid.NewGuid(), "testStream", ReadEventResult.Success,
+			record, StreamMetadata.Empty, false, "");
+
+		var dummyConnection = new DummyTcpConnection();
+		dummyConnection.SendQueueSize = ESConsts.MaxConnectionQueueSize - 1;
+
+		var tcpConnectionManager = new TcpConnectionManager(
+			Guid.NewGuid().ToString(), TcpServiceType.External, new ClientTcpDispatcher(2000),
+			new SynchronousScheduler(), dummyConnection, new SynchronousScheduler(),
+			new InternalAuthenticationProvider(InMemoryBus.CreateTest(),
+				new IODispatcher(new SynchronousScheduler(), new NoopEnvelope()), null, 1, false, DefaultData.DefaultUserOptions),
+			new AuthorizationGateway(new TestAuthorizationProvider()),
+			TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10), (man, err) => { mre.Set(); },
+			ESConsts.UnrestrictedPendingSendBytes, ESConsts.MaxConnectionQueueSize);
+
+		tcpConnectionManager.SendMessage(message);
+
+		var data = dummyConnection.ReceivedData.Last();
+		var receivedPackage = TcpPackage.FromArraySegment(data);
+
+		Assert.AreEqual(receivedPackage.Command, TcpCommand.ReadEventCompleted,
+			"Expected ReadEventCompleted but got {0}", receivedPackage.Command);
+	}
+
+	[Test]
+	public void
+		when_send_queue_size_is_larger_than_threshold_should_close_connection() {
+		var mre = new ManualResetEventSlim();
+
+		var messageSize = _connectionPendingSendBytesThreshold;
+		var evnt = new EventRecord(0, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, "testStream", 0, DateTime.Now,
+			PrepareFlags.None, "eventType", new byte[messageSize], new byte[0]);
+		var record = ResolvedEvent.ForUnresolvedEvent(evnt, null);
+		var message = new ClientMessage.ReadEventCompleted(Guid.NewGuid(), "testStream", ReadEventResult.Success,
+			record, StreamMetadata.Empty, false, "");
+
+		var dummyConnection = new DummyTcpConnection();
+		dummyConnection.SendQueueSize = ESConsts.MaxConnectionQueueSize + 1;
+
+		var tcpConnectionManager = new TcpConnectionManager(
+			Guid.NewGuid().ToString(), TcpServiceType.External, new ClientTcpDispatcher(2000),
+			new SynchronousScheduler(), dummyConnection, new SynchronousScheduler(),
+			new InternalAuthenticationProvider(InMemoryBus.CreateTest(),
+				new IODispatcher(new SynchronousScheduler(), new NoopEnvelope()), null, 1, false, DefaultData.DefaultUserOptions),
+			new AuthorizationGateway(new TestAuthorizationProvider()),
+			TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10), (man, err) => { mre.Set(); },
+			ESConsts.UnrestrictedPendingSendBytes, ESConsts.MaxConnectionQueueSize);
+
+		tcpConnectionManager.SendMessage(message);
+
+		if (!mre.Wait(2000)) {
+			Assert.Fail("Timed out waiting for connection to close");
+		}
+	}
+}
+
+internal class DummyTcpConnection : ITcpConnection {
+	public Guid ConnectionId {
+		get { return _connectionId; }
+		set { _connectionId = value; }
+	}
+	private Guid _connectionId = Guid.NewGuid();
+	public string ClientConnectionName {
+		get { return _clientConnectionName; }
+	}
+
+	public long TotalBytesSent { get; }
+	public long TotalBytesReceived { get; }
+
+	public bool IsClosed {
+		get { return false; }
+	}
+
+	public IPEndPoint LocalEndPoint {
+		get { return new IPEndPoint(IPAddress.Loopback, 2); }
+	}
+
+	public IPEndPoint RemoteEndPoint {
+		get { return new IPEndPoint(IPAddress.Loopback, 1); }
+	}
+
+	private int _sendQueueSize;
+	public int SendQueueSize {
+		get { return _sendQueueSize; }
+		set { _sendQueueSize = value; }
+	}
+
+	private int _pendingSendBytes;
+
+	public int PendingSendBytes {
+		get { return _pendingSendBytes; }
+		set { _pendingSendBytes = value; }
+	}
+
+	public event Action<ITcpConnection, SocketError> ConnectionClosed;
+	private string _clientConnectionName;
+
+	public void Close(string reason) {
+		var handler = ConnectionClosed;
+		if (handler != null)
+			handler(this, SocketError.Shutdown);
+	}
+
+	public IEnumerable<ArraySegment<byte>> ReceivedData;
+
+	public void EnqueueSend(IEnumerable<ArraySegment<byte>> data) {
+		ReceivedData = data;
+	}
+
+	public void ReceiveAsync(Action<ITcpConnection, IEnumerable<ArraySegment<byte>>> callback) {
+		throw new NotImplementedException();
+	}
+
+	public void SetClientConnectionName(string clientConnectionName) {
+		_clientConnectionName = clientConnectionName;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Tcp/TcpConnectionSslTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/TcpConnectionSslTests.cs
new file mode 100644
index 00000000000..3b27c84c7b6
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/TcpConnectionSslTests.cs
@@ -0,0 +1,146 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Transport.Tcp;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Tcp;
+
+[TestFixture]
+public class TcpConnectionSslTests {
+	protected static Socket CreateListeningSocket() {
+		var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+		listener.Bind(new IPEndPoint(IPAddress.Loopback, 0));
+		listener.Listen(1);
+		return listener;
+	}
+
+	private IEnumerable<ArraySegment<byte>> GenerateData() {
+		var data = new List<ArraySegment<byte>>();
+		data.Add(new ArraySegment<byte>(new byte[100]));
+		return data;
+	}
+
+	[Test, Timeout(120000)]
+	public async Task no_data_should_be_dispatched_after_tcp_connection_closed() {
+		for (int i = 0; i < 1000; i++) {
+			bool closed = false;
+			bool dataReceivedAfterClose = false;
+			var listeningSocket = CreateListeningSocket();
+
+			var mre = new ManualResetEventSlim(false);
+			var clientTcpConnection = TcpConnectionSsl.CreateConnectingConnection(
+				Guid.NewGuid(),
+				listeningSocket.LocalEndPoint.GetHost(),
+				null,
+				(IPEndPoint)listeningSocket.LocalEndPoint,
+				delegate { return (true, null); },
+				null,
+				new TcpClientConnector(),
+				TimeSpan.FromSeconds(5),
+				(conn) => mre.Set(),
+				(conn, error) => {
+					Assert.Fail($"Connection failed: {error}");
+				},
+				false);
+
+			var serverSocket = listeningSocket.Accept();
+			var serverTcpConnection = TcpConnectionSsl.CreateServerFromSocket(Guid.NewGuid(),
+				(IPEndPoint)serverSocket.RemoteEndPoint, serverSocket, ssl_connections.GetServerCertificate,
+				null, delegate { return (true, null); }, false);
+
+			mre.Wait(TimeSpan.FromSeconds(3));
+			try {
+				clientTcpConnection.ConnectionClosed += (connection, error) => {
+					Volatile.Write(ref closed, true);
+				};
+
+				clientTcpConnection.ReceiveAsync((connection, data) => {
+					if (Volatile.Read(ref closed)) {
+						dataReceivedAfterClose = true;
+					}
+				});
+
+				using (var b = new Barrier(2)) {
+					Task sendData = Task.Factory.StartNew(() => {
+						b.SignalAndWait();
+						for (int i = 0; i < 1000; i++)
+							serverTcpConnection.EnqueueSend(GenerateData());
+					}, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default);
+
+					Task closeConnection = Task.Factory.StartNew(() => {
+						b.SignalAndWait();
+						serverTcpConnection.Close("Intentional close");
+					}, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default);
+
+					await Task.WhenAll(sendData, closeConnection);
+					Assert.False(dataReceivedAfterClose);
+				}
+			} finally {
+				clientTcpConnection.Close("Shut down");
+				serverTcpConnection.Close("Shut down");
+				listeningSocket.Dispose();
+			}
+		}
+	}
+
+	[Test, Timeout(120000)]
+	public void when_connection_closed_quickly_socket_should_be_properly_disposed() {
+		for (int i = 0; i < 1000; i++) {
+			var listeningSocket = CreateListeningSocket();
+			ITcpConnection clientTcpConnection = null;
+			ITcpConnection serverTcpConnection = null;
+			Socket serverSocket = null;
+			try {
+				ManualResetEventSlim mre = new ManualResetEventSlim(false);
+
+				clientTcpConnection = TcpConnectionSsl.CreateConnectingConnection(
+					Guid.NewGuid(),
+					listeningSocket.LocalEndPoint.GetHost(),
+					null,
+					(IPEndPoint)listeningSocket.LocalEndPoint,
+					delegate { return (true, null); },
+					null,
+					new TcpClientConnector(),
+					TimeSpan.FromSeconds(5),
+					(conn) => { },
+					(conn, error) => { },
+					false);
+
+				clientTcpConnection.ConnectionClosed += (conn, error) => {
+					mre.Set();
+				};
+
+				serverSocket = listeningSocket.Accept();
+				clientTcpConnection.Close("Intentional close");
+				serverTcpConnection = TcpConnectionSsl.CreateServerFromSocket(Guid.NewGuid(),
+					(IPEndPoint)serverSocket.RemoteEndPoint, serverSocket, ssl_connections.GetServerCertificate,
+					null, delegate { return (true, null); }, false);
+
+				mre.Wait(TimeSpan.FromSeconds(10));
+				SpinWait.SpinUntil(() => serverTcpConnection.IsClosed, TimeSpan.FromSeconds(10));
+
+				var disposed = false;
+				try {
+					int x = serverSocket.Available;
+				} catch (ObjectDisposedException) {
+					disposed = true;
+				}
+
+				Assert.AreEqual(true, disposed);
+			} finally {
+				clientTcpConnection?.Close("Shut down");
+				serverTcpConnection?.Close("Shut down");
+				listeningSocket.Dispose();
+				serverSocket?.Dispose();
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Tcp/TcpConnectionTests.cs b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/TcpConnectionTests.cs
new file mode 100644
index 00000000000..eba46c626d6
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/TcpConnectionTests.cs
@@ -0,0 +1,134 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Transport.Tcp;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Tcp;
+
+[TestFixture]
+public class TcpConnectionTests {
+	protected static Socket CreateListeningSocket() {
+		var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+		listener.Bind(new IPEndPoint(IPAddress.Loopback, 0));
+		listener.Listen(1);
+		return listener;
+	}
+
+	private IEnumerable<ArraySegment<byte>> GenerateData() {
+		var data = new List<ArraySegment<byte>>();
+		data.Add(new ArraySegment<byte>(new byte[100]));
+		return data;
+	}
+
+	[Test, Timeout(120000)]
+	public async Task no_data_should_be_dispatched_after_tcp_connection_closed() {
+		for (int i = 0; i < 1000; i++) {
+			bool closed = false;
+			bool dataReceivedAfterClose = false;
+			var listeningSocket = CreateListeningSocket();
+			TaskCompletionSource<SocketError> connectionResult = new(TaskCreationOptions.RunContinuationsAsynchronously);
+
+			var clientTcpConnection = TcpConnection.CreateConnectingTcpConnection(
+				Guid.NewGuid(),
+				(IPEndPoint)listeningSocket.LocalEndPoint,
+				new TcpClientConnector(),
+				TimeSpan.FromSeconds(5),
+				(conn) => connectionResult.TrySetResult(SocketError.Success),
+				(conn, error) => connectionResult.TrySetResult(error),
+				false);
+
+			var serverSocket = listeningSocket.Accept();
+			var serverTcpConnection = TcpConnection.CreateAcceptedTcpConnection(Guid.NewGuid(),
+				(IPEndPoint)serverSocket.RemoteEndPoint, serverSocket, false);
+
+			SocketError error = await connectionResult.Task.WithTimeout();
+			Assert.AreEqual(SocketError.Success, error);
+			try {
+				clientTcpConnection.ConnectionClosed += (connection, error) => {
+					Volatile.Write(ref closed, true);
+				};
+
+				clientTcpConnection.ReceiveAsync((connection, data) => {
+					if (Volatile.Read(ref closed)) {
+						dataReceivedAfterClose = true;
+					}
+				});
+
+				using (var b = new Barrier(2)) {
+					Task sendData = Task.Factory.StartNew(() => {
+						b.SignalAndWait();
+						for (int i = 0; i < 1000; i++)
+							serverTcpConnection.EnqueueSend(GenerateData());
+					}, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default);
+
+					Task closeConnection = Task.Factory.StartNew(() => {
+						b.SignalAndWait();
+						serverTcpConnection.Close("Intentional close");
+					}, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default);
+
+					await Task.WhenAll(sendData, closeConnection);
+					Assert.False(dataReceivedAfterClose);
+				}
+			} finally {
+				clientTcpConnection.Close("Shut down");
+				serverTcpConnection.Close("Shut down");
+				listeningSocket.Dispose();
+			}
+		}
+	}
+
+	[Test, Timeout(120000)]
+	public void when_connection_closed_quickly_socket_should_be_properly_disposed() {
+		for (int i = 0; i < 1000; i++) {
+			var listeningSocket = CreateListeningSocket();
+			ITcpConnection clientTcpConnection = null;
+			ITcpConnection serverTcpConnection = null;
+			Socket serverSocket = null;
+			try {
+				ManualResetEventSlim mre = new ManualResetEventSlim(false);
+
+				clientTcpConnection = TcpConnection.CreateConnectingTcpConnection(
+				Guid.NewGuid(),
+				(IPEndPoint)listeningSocket.LocalEndPoint,
+				new TcpClientConnector(),
+				TimeSpan.FromSeconds(5),
+				(conn) => { },
+				(conn, error) => { },
+				false);
+
+				clientTcpConnection.ConnectionClosed += (conn, error) => {
+					mre.Set();
+				};
+
+				serverSocket = listeningSocket.Accept();
+				clientTcpConnection.Close("Intentional close");
+				serverTcpConnection = TcpConnection.CreateAcceptedTcpConnection(Guid.NewGuid(),
+					(IPEndPoint)serverSocket.RemoteEndPoint, serverSocket, false);
+
+				mre.Wait(TimeSpan.FromSeconds(10));
+				SpinWait.SpinUntil(() => serverTcpConnection.IsClosed, TimeSpan.FromSeconds(10));
+
+				var disposed = false;
+				try {
+					int x = serverSocket.Available;
+				} catch (ObjectDisposedException) {
+					disposed = true;
+				}
+
+				Assert.AreEqual(true, disposed);
+			} finally {
+				clientTcpConnection?.Close("Shut down");
+				serverTcpConnection?.Close("Shut down");
+				listeningSocket.Dispose();
+				serverSocket?.Dispose();
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Tcp/core_tcp_package.cs b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/core_tcp_package.cs
new file mode 100644
index 00000000000..6e2a122111f
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/core_tcp_package.cs
@@ -0,0 +1,186 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Services.Transport.Tcp;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Tcp;
+
+[TestFixture]
+public class core_tcp_package {
+	[Test]
+	public void should_throw_argument_null_exception_when_created_as_authorized_but_login_not_provided() {
+		Assert.Throws<ArgumentNullException>(() =>
+			new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, Guid.NewGuid(), null, "pa$$",
+				new byte[] { 1, 2, 3 }));
+	}
+
+	[Test]
+	public void should_throw_argument_null_exception_when_created_as_authorized_but_password_not_provided() {
+		Assert.Throws<ArgumentNullException>(() =>
+			new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, Guid.NewGuid(), "login", null,
+				new byte[] { 1, 2, 3 }));
+	}
+
+	[Test]
+	public void should_throw_argument_null_exception_when_created_as_authorized_but_token_not_provided() {
+		Assert.Throws<ArgumentNullException>(() =>
+			new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, Guid.NewGuid(), null,
+				new byte[] { 1, 2, 3 }));
+	}
+
+	[Test]
+	public void should_throw_argument_exception_when_created_as_not_authorized_but_login_is_provided() {
+		Assert.Throws<ArgumentException>(() =>
+			new TcpPackage(TcpCommand.BadRequest, TcpFlags.None, Guid.NewGuid(), "login", null,
+				new byte[] { 1, 2, 3 }));
+	}
+
+	[Test]
+	public void should_throw_argument_exception_when_created_as_not_authorized_but_password_is_provided() {
+		Assert.Throws<ArgumentException>(() =>
+			new TcpPackage(TcpCommand.BadRequest, TcpFlags.None, Guid.NewGuid(), null, "pa$$",
+				new byte[] { 1, 2, 3 }));
+	}
+
+	[Test]
+	public void should_throw_argument_exception_when_created_as_not_authorized_but_token_is_provided() {
+		Assert.Throws<ArgumentException>(() =>
+			new TcpPackage(TcpCommand.BadRequest, TcpFlags.None, Guid.NewGuid(), "token",
+				new byte[] { 1, 2, 3 }));
+	}
+
+	[Test]
+	public void not_authorized_with_data_should_serialize_and_deserialize_correctly() {
+		var corrId = Guid.NewGuid();
+		var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.None, corrId, null, null, new byte[] { 1, 2, 3 });
+		var bytes = refPkg.AsArraySegment();
+
+		var pkg = TcpPackage.FromArraySegment(bytes);
+		Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
+		Assert.AreEqual(TcpFlags.None, pkg.Flags);
+		Assert.AreEqual(corrId, pkg.CorrelationId);
+		Assert.False(pkg.Tokens.TryGetValue("uid", out _));
+		Assert.False(pkg.Tokens.TryGetValue("pwd", out _));
+		Assert.False(pkg.Tokens.TryGetValue("jwt", out _));
+
+		Assert.AreEqual(3, pkg.Data.Count);
+		Assert.AreEqual(1, pkg.Data.Array[pkg.Data.Offset + 0]);
+		Assert.AreEqual(2, pkg.Data.Array[pkg.Data.Offset + 1]);
+		Assert.AreEqual(3, pkg.Data.Array[pkg.Data.Offset + 2]);
+	}
+
+	[Test]
+	public void not_authorized_with_empty_data_should_serialize_and_deserialize_correctly() {
+		var corrId = Guid.NewGuid();
+		var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.None, corrId, null, null, new byte[0]);
+		var bytes = refPkg.AsArraySegment();
+
+		var pkg = TcpPackage.FromArraySegment(bytes);
+		Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
+		Assert.AreEqual(TcpFlags.None, pkg.Flags);
+		Assert.AreEqual(corrId, pkg.CorrelationId);
+		Assert.False(pkg.Tokens.TryGetValue("uid", out _));
+		Assert.False(pkg.Tokens.TryGetValue("pwd", out _));
+		Assert.False(pkg.Tokens.TryGetValue("jwt", out _));
+
+		Assert.AreEqual(0, pkg.Data.Count);
+	}
+
+	[Test]
+	public void authorized_with_data_should_serialize_and_deserialize_correctly() {
+		var corrId = Guid.NewGuid();
+		var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, corrId, "login", "pa$$",
+			new byte[] { 1, 2, 3 });
+		var bytes = refPkg.AsArraySegment();
+
+		var pkg = TcpPackage.FromArraySegment(bytes);
+		Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
+		Assert.AreEqual(TcpFlags.Authenticated, pkg.Flags);
+		Assert.AreEqual(corrId, pkg.CorrelationId);
+		Assert.AreEqual("login", pkg.Tokens["uid"]);
+		Assert.AreEqual("pa$$", pkg.Tokens["pwd"]);
+		Assert.False(pkg.Tokens.TryGetValue("jwt", out _));
+
+		Assert.AreEqual(3, pkg.Data.Count);
+		Assert.AreEqual(1, pkg.Data.Array[pkg.Data.Offset + 0]);
+		Assert.AreEqual(2, pkg.Data.Array[pkg.Data.Offset + 1]);
+		Assert.AreEqual(3, pkg.Data.Array[pkg.Data.Offset + 2]);
+	}
+
+	[Test]
+	public void authorized_with_empty_data_should_serialize_and_deserialize_correctly() {
+		var corrId = Guid.NewGuid();
+		var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, corrId, "login", "pa$$",
+			new byte[0]);
+		var bytes = refPkg.AsArraySegment();
+
+		var pkg = TcpPackage.FromArraySegment(bytes);
+		Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
+		Assert.AreEqual(TcpFlags.Authenticated, pkg.Flags);
+		Assert.AreEqual(corrId, pkg.CorrelationId);
+		Assert.AreEqual("login", pkg.Tokens["uid"]);
+		Assert.AreEqual("pa$$", pkg.Tokens["pwd"]);
+		Assert.False(pkg.Tokens.TryGetValue("jwt", out _));
+
+		Assert.AreEqual(0, pkg.Data.Count);
+	}
+
+	[Test]
+	public void token_authorized_with_data_should_serialize_and_deserialize_correctly() {
+		var corrId = Guid.NewGuid();
+		var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, corrId, "token",
+			new byte[] { 1, 2, 3 });
+		var bytes = refPkg.AsArraySegment();
+
+		var pkg = TcpPackage.FromArraySegment(bytes);
+		Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
+		Assert.AreEqual(TcpFlags.Authenticated, pkg.Flags);
+		Assert.AreEqual(corrId, pkg.CorrelationId);
+		Assert.AreEqual("token", pkg.Tokens["jwt"]);
+		Assert.False(pkg.Tokens.TryGetValue("uid", out _));
+		Assert.False(pkg.Tokens.TryGetValue("pwd", out _));
+
+		Assert.AreEqual(3, pkg.Data.Count);
+		Assert.AreEqual(1, pkg.Data.Array[pkg.Data.Offset + 0]);
+		Assert.AreEqual(2, pkg.Data.Array[pkg.Data.Offset + 1]);
+		Assert.AreEqual(3, pkg.Data.Array[pkg.Data.Offset + 2]);
+	}
+
+	[Test]
+	public void token_authorized_with_empty_data_should_serialize_and_deserialize_correctly() {
+		var corrId = Guid.NewGuid();
+		var refPkg = new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated, corrId, "token",
+			new byte[0]);
+		var bytes = refPkg.AsArraySegment();
+
+		var pkg = TcpPackage.FromArraySegment(bytes);
+		Assert.AreEqual(TcpCommand.BadRequest, pkg.Command);
+		Assert.AreEqual(TcpFlags.Authenticated, pkg.Flags);
+		Assert.AreEqual(corrId, pkg.CorrelationId);
+		Assert.AreEqual("token", pkg.Tokens["jwt"]);
+		Assert.False(pkg.Tokens.TryGetValue("uid", out _));
+		Assert.False(pkg.Tokens.TryGetValue("pwd", out _));
+
+		Assert.AreEqual(0, pkg.Data.Count);
+	}
+
+	[Test]
+	public void should_throw_argument_exception_when_login_too_long() {
+		Assert.Throws<ArgumentException>(() => new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated,
+			Guid.NewGuid(), new string('*', TcpPackage.MaxLoginLength + 1), "pa$$", new byte[] { 1, 2, 3 }));
+	}
+
+	[Test]
+	public void should_throw_argument_exception_when_password_too_long() {
+		Assert.Throws<ArgumentException>(() => new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated,
+			Guid.NewGuid(), "login", new string('*', TcpPackage.MaxPasswordLength + 1), new byte[] { 1, 2, 3 }));
+	}
+
+	[Test]
+	public void should_throw_argument_exception_when_token_too_long() {
+		Assert.Throws<ArgumentException>(() => new TcpPackage(TcpCommand.BadRequest, TcpFlags.Authenticated,
+			Guid.NewGuid(), new string('*', TcpPackage.MaxTokenLength + 1), new byte[] { 1, 2, 3 }));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Tcp/ssl_connection.cs b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/ssl_connection.cs
new file mode 100644
index 00000000000..40e7303f72d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/ssl_connection.cs
@@ -0,0 +1,152 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Reflection;
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+using System.Text;
+using System.Threading;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Transport.Tcp;
+using NUnit.Framework;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Tcp;
+
+[TestFixture]
+public class ssl_connections {
+	private static readonly ILogger Log = Serilog.Log.ForContext<ssl_connections>();
+	private IPAddress _ip;
+	private int _port;
+
+	[SetUp]
+	public void SetUp() {
+		_ip = IPAddress.Loopback;
+		_port = PortsHelper.GetAvailablePort(_ip);
+	}
+
+	[Test]
+	public void should_connect_to_each_other_and_send_data() {
+		var serverEndPoint = new IPEndPoint(_ip, _port);
+		X509Certificate2 cert = GetServerCertificate();
+
+		var sent = new byte[1000];
+		new Random().NextBytes(sent);
+
+		using var received = new MemoryStream();
+
+		var done = new ManualResetEventSlim();
+
+		var listener = new TcpServerListener(serverEndPoint);
+		listener.StartListening((endPoint, socket) => {
+			var ssl = TcpConnectionSsl.CreateServerFromSocket(Guid.NewGuid(), endPoint, socket,
+				() => cert, null, delegate { return (true, null); },
+				verbose: true);
+			ssl.ConnectionClosed += (x, y) => done.Set();
+			if (ssl.IsClosed)
+				done.Set();
+
+			Action<ITcpConnection, IEnumerable<ArraySegment<byte>>> callback = null;
+			callback = (x, y) => {
+				foreach (var arraySegment in y) {
+					received.Write(arraySegment.Array, arraySegment.Offset, arraySegment.Count);
+					Log.Information("Received: {0} bytes, total: {1}.", arraySegment.Count, received.Length);
+				}
+
+				if (received.Length >= sent.Length) {
+					Log.Information("Done receiving...");
+					done.Set();
+				} else {
+					Log.Information("Receiving...");
+					ssl.ReceiveAsync(callback);
+				}
+			};
+			Log.Information("Receiving...");
+			ssl.ReceiveAsync(callback);
+		}, "Secure");
+
+		var clientSsl = TcpConnectionSsl.CreateConnectingConnection(
+			Guid.NewGuid(),
+			serverEndPoint.GetHost(),
+			null,
+			serverEndPoint,
+			delegate { return (true, null); },
+			null,
+			new TcpClientConnector(),
+			TcpConnectionManager.ConnectionTimeout,
+			conn => {
+				Log.Information("Sending bytes...");
+				conn.EnqueueSend(new[] { new ArraySegment<byte>(sent) });
+			},
+			(conn, err) => {
+				Log.Error("Connecting failed: {0}.", err);
+				done.Set();
+			},
+			verbose: true);
+
+		Assert.IsTrue(done.Wait(20000), "Took too long to receive completion.");
+
+		Log.Information("Stopping listener...");
+		listener.Stop();
+		Log.Information("Closing client TLS connection...");
+		clientSsl.Close("Normal close.");
+		Log.Information("Checking received data...");
+		Assert.AreEqual(sent, received.ToArray());
+	}
+
+	private static X509Certificate2 _root, _server, _otherServer, _untrusted;
+	public static X509Certificate2 GetRootCertificate() {
+		_root ??= GetCertificate("ca", loadKey: false);
+		return new X509Certificate2(_root);
+	}
+
+	public static X509Certificate2 GetServerCertificate() {
+		_server ??= GetCertificate("node1");
+		return new X509Certificate2(_server);
+	}
+
+	public static X509Certificate2 GetOtherServerCertificate() {
+		_otherServer ??= GetCertificate("node2");
+		return new X509Certificate2(_otherServer);
+	}
+
+	public static X509Certificate2 GetUntrustedCertificate() {
+		_untrusted ??= GetCertificate("untrusted");
+		return new X509Certificate2(_untrusted);
+	}
+
+	private static X509Certificate2 GetCertificate(string name, bool loadKey = true) {
+		const string resourcePath = "KurrentDB.Core.Tests.Services.Transport.Tcp.test_certificates";
+
+		var certBytes = LoadResource($"{resourcePath}.{name}.{name}.crt");
+		var certificate = X509Certificate2.CreateFromPem(Encoding.UTF8.GetString(certBytes));
+
+		if (!loadKey)
+			return certificate;
+
+		var keyBytes = LoadResource($"{resourcePath}.{name}.{name}.key");
+		using var rsa = RSA.Create();
+		rsa.ImportFromPem(Encoding.UTF8.GetString(keyBytes));
+
+		using X509Certificate2 certWithKey = certificate.CopyWithPrivateKey(rsa);
+
+		// recreate the certificate from a PKCS #12 bundle to work around: https://github.com/dotnet/runtime/issues/23749
+		return new X509Certificate2(certWithKey.ExportToPkcs12(), string.Empty, X509KeyStorageFlags.Exportable);
+	}
+
+	private static byte[] LoadResource(string resource) {
+		using var resourceStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(resource);
+		if (resourceStream == null)
+			return null;
+
+		using var memStream = new MemoryStream();
+		resourceStream.CopyTo(memStream);
+		return memStream.ToArray();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Tcp/ssl_connections_mutual_auth.cs b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/ssl_connections_mutual_auth.cs
new file mode 100644
index 00000000000..9ecb9029b09
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/ssl_connections_mutual_auth.cs
@@ -0,0 +1,132 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Transport.Tcp;
+using NUnit.Framework;
+using Serilog;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Tcp;
+
+[TestFixture]
+public class ssl_connections_mutual_auth {
+	private static readonly ILogger Log = Serilog.Log.ForContext<ssl_connections_mutual_auth>();
+	private IPAddress _ip;
+	private int _port;
+
+	[SetUp]
+	public void SetUp() {
+		_ip = IPAddress.Loopback;
+		_port = PortsHelper.GetAvailablePort(_ip);
+	}
+
+	[TestCase(true, true, true, true, true)] //require valid server and client certificate
+	[TestCase(true, false, true, true, false)] //require valid server and client certificate
+	[TestCase(false, true, true, true, false)] //require valid server and client certificate
+	[TestCase(false, false, true, true, false)] //require valid server and client certificate
+	[TestCase(true, true, true, false, true)] //require valid server certificate only
+	[TestCase(true, false, true, false, true)] //require valid server certificate only
+	[TestCase(false, true, true, false, false)] //require valid server certificate only
+	[TestCase(false, false, true, false, false)] //require valid server certificate only
+	[TestCase(true, true, false, true, true)] //require valid client certificate only
+	[TestCase(true, false, false, true, false)] //require valid client certificate only
+	[TestCase(false, true, false, true, true)] //require valid client certificate only
+	[TestCase(false, false, false, true, false)] //require valid client certificate only
+	[TestCase(true, true, false, false, true)] //do not require valid client or server certificate
+	[TestCase(true, false, false, false, true)] //do not require valid client or server certificate
+	[TestCase(false, true, false, false, true)] //do not require valid client or server certificate
+	[TestCase(false, false, false, false, true)] //do not require valid client or server certificate
+	public void should_connect_to_each_other_and_send_data_depending_on_certificate_validity_and_settings(
+		bool useValidServerCertificate,
+		bool useValidClientCertificate,
+		bool validateServerCertificate,
+		bool validateClientCertificate,
+		bool shouldConnectSuccessfully
+	) {
+		var serverEndPoint = new IPEndPoint(_ip, _port);
+		var serverCertificate = useValidServerCertificate
+			? ssl_connections.GetServerCertificate()
+			: ssl_connections.GetUntrustedCertificate();
+		var clientCertificate = useValidClientCertificate
+			? ssl_connections.GetOtherServerCertificate()
+			: ssl_connections.GetUntrustedCertificate();
+		var rootCertificates = new X509Certificate2Collection(ssl_connections.GetRootCertificate());
+
+
+		var sent = new byte[1000];
+		new Random().NextBytes(sent);
+
+		var received = new MemoryStream();
+
+		var done = new ManualResetEventSlim();
+
+		var listener = new TcpServerListener(serverEndPoint);
+		listener.StartListening((endPoint, socket) => {
+			var ssl = TcpConnectionSsl.CreateServerFromSocket(Guid.NewGuid(), endPoint, socket, () => serverCertificate,
+				null, (cert, chain, err) => validateClientCertificate ?
+					ClusterVNode<string>.ValidateClientCertificate(cert, chain, err, () => null, () => rootCertificates) : (true, null),
+				verbose: true);
+			ssl.ConnectionClosed += (x, y) => done.Set();
+			if (ssl.IsClosed)
+				done.Set();
+
+			Action<ITcpConnection, IEnumerable<ArraySegment<byte>>> callback = null;
+			callback = (x, y) => {
+				foreach (var arraySegment in y) {
+					received.Write(arraySegment.Array, arraySegment.Offset, arraySegment.Count);
+					Log.Information("Received: {0} bytes, total: {1}.", arraySegment.Count, received.Length);
+				}
+
+				if (received.Length >= sent.Length) {
+					Log.Information("Done receiving...");
+					done.Set();
+				} else {
+					Log.Information("Receiving...");
+					ssl.ReceiveAsync(callback);
+				}
+			};
+			Log.Information("Receiving...");
+			ssl.ReceiveAsync(callback);
+		}, "Secure");
+
+		var clientSsl = TcpConnectionSsl.CreateConnectingConnection(
+			Guid.NewGuid(),
+			serverEndPoint.GetHost(),
+			null,
+			serverEndPoint,
+			(cert, chain, err, _) => validateServerCertificate ? ClusterVNode<string>.ValidateServerCertificate(cert, chain, err, () => null, () => rootCertificates, null) : (true, null),
+			() => new X509CertificateCollection { clientCertificate },
+			new TcpClientConnector(),
+			TcpConnectionManager.ConnectionTimeout,
+			conn => {
+				Log.Information("Sending bytes...");
+				conn.EnqueueSend(new[] { new ArraySegment<byte>(sent) });
+			},
+			(conn, err) => {
+				Log.Error("Connecting failed: {0}.", err);
+				done.Set();
+			},
+			verbose: true);
+
+		Assert.IsTrue(done.Wait(20000), "Took too long to receive completion.");
+
+		Log.Information("Stopping listener...");
+		listener.Stop();
+		Log.Information("Closing client TLS connection...");
+		clientSsl.Close("Normal close.");
+		Log.Information("Checking received data...");
+
+		if (shouldConnectSuccessfully)
+			Assert.AreEqual(sent, received.ToArray());
+		else
+			Assert.AreEqual(new byte[0], received.ToArray());
+	}
+}
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/ca/ca.crt b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/ca/ca.crt
similarity index 100%
rename from src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/ca/ca.crt
rename to src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/ca/ca.crt
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/ca/ca.key b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/ca/ca.key
similarity index 100%
rename from src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/ca/ca.key
rename to src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/ca/ca.key
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/ca_untrusted/ca.crt b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/ca_untrusted/ca.crt
similarity index 100%
rename from src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/ca_untrusted/ca.crt
rename to src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/ca_untrusted/ca.crt
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/ca_untrusted/ca.key b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/ca_untrusted/ca.key
similarity index 100%
rename from src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/ca_untrusted/ca.key
rename to src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/ca_untrusted/ca.key
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/generate_ca.sh b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/generate_ca.sh
old mode 100755
new mode 100644
similarity index 100%
rename from src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/generate_ca.sh
rename to src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/generate_ca.sh
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/generate_cert.sh b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/generate_cert.sh
old mode 100755
new mode 100644
similarity index 100%
rename from src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/generate_cert.sh
rename to src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/generate_cert.sh
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/node1/node1.crt b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/node1/node1.crt
similarity index 100%
rename from src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/node1/node1.crt
rename to src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/node1/node1.crt
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/node1/node1.key b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/node1/node1.key
similarity index 100%
rename from src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/node1/node1.key
rename to src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/node1/node1.key
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/node2/node2.crt b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/node2/node2.crt
similarity index 100%
rename from src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/node2/node2.crt
rename to src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/node2/node2.crt
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/node2/node2.key b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/node2/node2.key
similarity index 100%
rename from src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/node2/node2.key
rename to src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/node2/node2.key
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/node3/node3.crt b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/node3/node3.crt
similarity index 100%
rename from src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/node3/node3.crt
rename to src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/node3/node3.crt
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/node3/node3.key b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/node3/node3.key
similarity index 100%
rename from src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/node3/node3.key
rename to src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/node3/node3.key
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/untrusted/untrusted.crt b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/untrusted/untrusted.crt
similarity index 100%
rename from src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/untrusted/untrusted.crt
rename to src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/untrusted/untrusted.crt
diff --git a/src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/untrusted/untrusted.key b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/untrusted/untrusted.key
similarity index 100%
rename from src/EventStore.Core.Tests/Services/Transport/Tcp/test_certificates/untrusted/untrusted.key
rename to src/KurrentDB.Core.Tests/Services/Transport/Tcp/test_certificates/untrusted/untrusted.key
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Tcp/when_invalid_data_is_sent_over_tcp.cs b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/when_invalid_data_is_sent_over_tcp.cs
new file mode 100644
index 00000000000..be6e32cb9ec
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/when_invalid_data_is_sent_over_tcp.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Tests.Integration;
+using KurrentDB.Transport.Tcp;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Tcp;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_invalid_data_is_sent_over_tcp<TLogFormat, TStreamId> : specification_with_cluster<TLogFormat, TStreamId> {
+
+	[Timeout(15000)]
+	[TestCase("InternalTcpEndPoint", false)]
+	[TestCase("ExternalTcpEndPoint", false)]
+	public async Task connection_should_be_closed_by_remote_party(string endpointProperty, bool secure) {
+		IPEndPoint endpoint = (IPEndPoint)_nodes[0].GetType().GetProperty(endpointProperty).GetValue(_nodes[0], null);
+		var closedEvent = new ManualResetEventSlim();
+		TaskCompletionSource<SocketError> connectionResult = new(TaskCreationOptions.RunContinuationsAsynchronously);
+
+		ITcpConnection connection;
+		if (!secure) {
+			connection = TcpConnection.CreateConnectingTcpConnection(
+				Guid.NewGuid(),
+				endpoint,
+				new TcpClientConnector(),
+				TimeSpan.FromSeconds(5),
+				(conn) => connectionResult.TrySetResult(SocketError.Success),
+				(conn, error) => connectionResult.TrySetResult(error),
+				false);
+		} else {
+			connection = TcpConnectionSsl.CreateConnectingConnection(
+				Guid.NewGuid(),
+				endpoint.GetHost(),
+				null,
+				endpoint,
+				delegate { return (true, null); },
+				null,
+				new TcpClientConnector(),
+				TimeSpan.FromSeconds(5),
+				(conn) => connectionResult.TrySetResult(SocketError.Success),
+				(conn, error) => connectionResult.TrySetResult(error),
+				false);
+		}
+
+		connection.ConnectionClosed += (conn, error) => closedEvent.Set();
+
+		SocketError result = await connectionResult.Task.WithTimeout();
+		Assert.AreEqual(SocketError.Success, result);
+		var data = new List<ArraySegment<byte>> {
+			new ArraySegment<byte>(new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
+		};
+		connection.EnqueueSend(data);
+		Assert.True(closedEvent.Wait(10000));
+		connection.Close("intentional close");
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/Transport/Tcp/with_intermediate_certificates.cs b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/with_intermediate_certificates.cs
new file mode 100644
index 00000000000..39bd2032a06
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/Transport/Tcp/with_intermediate_certificates.cs
@@ -0,0 +1,142 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using System.Net.Security;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.Core.Tests.Certificates;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Transport.Tcp;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.Transport.Tcp;
+
+[TestFixture]
+public class with_intermediate_certificates : with_certificate_chain_of_length_3 {
+	private TcpServerListener _listener;
+	private IPEndPoint _serverEndPoint;
+	private ITcpConnection _client;
+	private Func<X509Certificate, X509Chain, SslPolicyErrors, (bool, string)> _clientCertValidator;
+	private X509Certificate2 _cert;
+
+	[SetUp]
+	public void SetUp() {
+		// certificate exported to PKCS #12 due to this issue on Windows: https://github.com/dotnet/runtime/issues/45680
+		_cert = new X509Certificate2(_leaf.ExportToPkcs12());
+
+		_clientCertValidator = (_, _, _) => (true, null);
+		_serverEndPoint = new IPEndPoint(IPAddress.Loopback, PortsHelper.GetAvailablePort(IPAddress.Loopback));
+		_listener = new TcpServerListener(_serverEndPoint);
+		_listener.StartListening((endPoint, socket) => {
+			TcpConnectionSsl.CreateServerFromSocket(
+				Guid.NewGuid(),
+				endPoint,
+				socket,
+				() => _cert,
+				() => new X509Certificate2Collection(_intermediate),
+				(cert, chain, errors) => _clientCertValidator(cert, chain, errors),
+				verbose: true);
+		}, "Secure");
+	}
+
+	[Test]
+	public void server_should_send_intermediate_certificate_during_handshake() {
+		var done = new ManualResetEventSlim(false);
+
+		bool gotLeaf = false;
+		bool gotIntermediate = false;
+
+		_client = TcpConnectionSsl.CreateConnectingConnection(
+			Guid.NewGuid(),
+			_serverEndPoint.GetHost(),
+			null,
+			_serverEndPoint,
+			(certificate, chain, _, _) => {
+				gotLeaf = _leaf.Equals(certificate);
+				foreach (var chainElement in chain.ChainElements) {
+					if (chainElement.Certificate.Equals(_intermediate)) {
+						gotIntermediate = true;
+					}
+				}
+
+				done.Set();
+				return (true, null);
+			},
+			null,
+			new TcpClientConnector(),
+			TcpConnectionManager.ConnectionTimeout,
+			conn => { },
+			(conn, err) => { },
+			verbose: true);
+
+		Assert.True(done.Wait(20000), "Took too long to receive completion.");
+		Assert.True(gotLeaf);
+		Assert.True(gotIntermediate);
+	}
+
+	[Test, Ignore("Skipped since it adds an intermediate certificate to the current user's store")]
+	public void client_should_send_intermediate_certificate_during_handshake() {
+		try {
+			// see: https://github.com/dotnet/runtime/issues/47680#issuecomment-771093045
+			AddIntermediateCertificateToStore();
+
+			var done = new ManualResetEventSlim(false);
+
+			bool gotLeaf = false;
+			bool gotIntermediate = false;
+
+			_clientCertValidator = (certificate, chain, _) => {
+				gotLeaf = _leaf.Equals(certificate);
+				foreach (var chainElement in chain.ChainElements) {
+					if (chainElement.Certificate.Equals(_intermediate)) {
+						gotIntermediate = true;
+					}
+				}
+
+				done.Set();
+				return (true, null);
+			};
+
+			_client = TcpConnectionSsl.CreateConnectingConnection(
+				Guid.NewGuid(),
+				_serverEndPoint.GetHost(),
+				null,
+				_serverEndPoint,
+				(_, _, _, _) => (true, null),
+				() => new X509Certificate2Collection(_cert),
+				new TcpClientConnector(),
+				TcpConnectionManager.ConnectionTimeout,
+				conn => { },
+				(conn, err) => { },
+				verbose: true);
+
+			Assert.True(done.Wait(20000), "Took too long to receive completion.");
+			Assert.True(gotLeaf);
+			Assert.True(gotIntermediate);
+		} finally {
+			RemoveIntermediateCertificateFromStore();
+		}
+	}
+
+	private void AddIntermediateCertificateToStore() {
+		using var intermediateStore = new X509Store(StoreName.CertificateAuthority, StoreLocation.CurrentUser);
+		intermediateStore.Open(OpenFlags.ReadWrite);
+		intermediateStore.Add(_intermediate);
+	}
+
+	private void RemoveIntermediateCertificateFromStore() {
+		using var intermediateStore = new X509Store(StoreName.CertificateAuthority, StoreLocation.CurrentUser);
+		intermediateStore.Open(OpenFlags.ReadWrite);
+		intermediateStore.Remove(_intermediate);
+	}
+
+	[TearDown]
+	public void TearDown() {
+		_listener.Stop();
+		_client.Close("Normal close.");
+	}
+}
diff --git a/src/EventStore.Core.Tests/Services/UserManagementService/password_change_notification_reader.cs b/src/KurrentDB.Core.Tests/Services/UserManagementService/password_change_notification_reader.cs
similarity index 75%
rename from src/EventStore.Core.Tests/Services/UserManagementService/password_change_notification_reader.cs
rename to src/KurrentDB.Core.Tests/Services/UserManagementService/password_change_notification_reader.cs
index 669e6263d54..e442428a0e8 100644
--- a/src/EventStore.Core.Tests/Services/UserManagementService/password_change_notification_reader.cs
+++ b/src/KurrentDB.Core.Tests/Services/UserManagementService/password_change_notification_reader.cs
@@ -1,14 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System.Collections.Generic;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Transport.Http.Authentication;
-using EventStore.Core.Services.UserManagement;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Transport.Http.Authentication;
+using KurrentDB.Core.Services.UserManagement;
 using NUnit.Framework;
-using System.Linq;
 
-namespace EventStore.Core.Tests.Services.UserManagementService {
+namespace KurrentDB.Core.Tests.Services.UserManagementService {
 	namespace password_change_notification_reader {
-		public abstract class with_password_change_notification_reader<TLogFormat, TStreamId> :
-			user_management_service.TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
+		public abstract class with_password_change_notification_reader<TLogFormat, TStreamId> : user_management_service.TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
 			protected PasswordChangeNotificationReader _passwordChangeNotificationReader;
 
 			protected override void Given() {
@@ -18,7 +19,8 @@ protected override void Given() {
 			}
 
 			protected override IEnumerable<WhenStep> PreWhen() {
-				foreach (var m in base.PreWhen()) yield return m;
+				foreach (var m in base.PreWhen())
+					yield return m;
 				yield return new SystemMessage.SystemStart();
 				yield return
 					new UserManagementMessage.Create(
diff --git a/src/KurrentDB.Core.Tests/Services/UserManagementService/user_management_service.cs b/src/KurrentDB.Core.Tests/Services/UserManagementService/user_management_service.cs
new file mode 100644
index 00000000000..103636bf206
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/UserManagementService/user_management_service.cs
@@ -0,0 +1,960 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using EventStore.ClientAPI.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Tests.Authentication;
+using KurrentDB.Core.Tests.Helpers;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.UserManagementService;
+
+public static class user_management_service {
+	public abstract class TestFixtureWithUserManagementService<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+		protected KurrentDB.Core.Authentication.InternalAuthentication.UserManagementService _users;
+		protected readonly ClaimsPrincipal _ordinaryUser = new ClaimsPrincipal(new ClaimsIdentity(
+				new[] {
+					new Claim(ClaimTypes.Name,"user1"),
+					new Claim(ClaimTypes.Role,"role1")
+				}
+				, "ES-Test"));
+
+		protected override void Given() {
+			base.Given();
+			NoStream("$user-user1");
+			NoStream("$user-user2");
+			NoStream("$user-user3");
+			NoOtherStreams();
+			AllWritesSucceed();
+
+			_users = new KurrentDB.Core.Authentication.InternalAuthentication.UserManagementService(
+				_ioDispatcher, new StubPasswordHashAlgorithm(), skipInitializeStandardUsersCheck: true,
+				new TaskCompletionSource<bool>(), DefaultData.DefaultUserOptions);
+
+			_bus.Subscribe<UserManagementMessage.Get>(_users);
+			_bus.Subscribe<UserManagementMessage.GetAll>(_users);
+			_bus.Subscribe<UserManagementMessage.Create>(_users);
+			_bus.Subscribe<UserManagementMessage.Update>(_users);
+			_bus.Subscribe<UserManagementMessage.Enable>(_users);
+			_bus.Subscribe<UserManagementMessage.Disable>(_users);
+			_bus.Subscribe<UserManagementMessage.ResetPassword>(_users);
+			_bus.Subscribe<UserManagementMessage.ChangePassword>(_users);
+			_bus.Subscribe<UserManagementMessage.Delete>(_users);
+			_bus.Subscribe<SystemMessage.BecomeLeader>(_users);
+			_bus.Subscribe<SystemMessage.BecomeFollower>(_users);
+			_bus.Subscribe<SystemMessage.BecomeReadOnlyReplica>(_users);
+		}
+
+		protected override ManualQueue GiveInputQueue() {
+			return new ManualQueue(_bus, _timeProvider);
+		}
+
+		[SetUp]
+		public void SetUp() {
+			WhenLoop(GivenCommands());
+			_queue.Process();
+			HandledMessages.Clear();
+			WhenLoop();
+		}
+
+		protected virtual IEnumerable<WhenStep> GivenCommands() {
+			yield break;
+		}
+
+		protected ClientMessage.WriteEvents[] HandledPasswordChangedNotificationWrites() {
+			return HandledMessages.OfType<ClientMessage.WriteEvents>()
+				.Where(
+					v =>
+						v.EventStreamId
+						== KurrentDB.Core.Authentication.InternalAuthentication.UserManagementService
+							.UserPasswordNotificationsStreamId).ToArray();
+		}
+
+		protected ClientMessage.WriteEvents[] HandledPasswordChangedNotificationMetaStreamWrites() {
+			return
+				HandledMessages.OfType<ClientMessage.WriteEvents>()
+					.Where(
+						v =>
+							v.EventStreamId
+							== SystemStreams.MetastreamOf(
+								KurrentDB.Core.Authentication.InternalAuthentication.UserManagementService
+									.UserPasswordNotificationsStreamId))
+					.ToArray();
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_creating_a_user<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> When() {
+			yield return
+				new UserManagementMessage.Create(
+					Envelope, SystemAccounts.System, "user1", "John Doe", new[] { "admin", "other" }, "Johny123!");
+		}
+
+		[Test]
+		public void replies_success() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.IsTrue(updateResults[0].Success);
+		}
+
+		[Test]
+		public void reply_has_the_correct_login_name() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.AreEqual("user1", updateResults[0].LoginName);
+		}
+
+		[Test]
+		public void creates_an_enabled_user_account_with_correct_details() {
+			_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
+			_queue.Process();
+			var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
+			Assert.NotNull(user);
+			Assert.AreEqual("John Doe", user.Data.FullName);
+			Assert.AreEqual("user1", user.Data.LoginName);
+			Assert.NotNull(user.Data.Groups);
+			Assert.That(user.Data.Groups.Any(v => v == "admin"));
+			Assert.That(user.Data.Groups.Any(v => v == "other"));
+			Assert.AreEqual(false, user.Data.Disabled);
+		}
+
+		[Test]
+		public void creates_an_enabled_user_account_with_the_correct_password() {
+			HandledMessages.Clear();
+			_users.Handle(
+				new UserManagementMessage.ChangePassword(
+					Envelope, SystemAccounts.System, "user1", "Johny123!", "new-password"));
+			_queue.Process();
+			var updateResult = HandledMessages.OfType<UserManagementMessage.UpdateResult>().Last();
+			Assert.NotNull(updateResult);
+			Assert.IsTrue(updateResult.Success);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_ordinary_user_attempts_to_create_a_user<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> When() {
+			yield return
+				new UserManagementMessage.Create(
+					Envelope, _ordinaryUser, "user1", "John Doe", new[] { "admin", "other" }, "Johny123!");
+		}
+
+		[Test]
+		public void replies_unauthorized() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.IsFalse(updateResults[0].Success);
+			Assert.AreEqual(UserManagementMessage.Error.Unauthorized, updateResults[0].Error);
+		}
+
+		[Test]
+		public void does_not_create_a_user_account() {
+			_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
+			_queue.Process();
+			var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
+			Assert.NotNull(user);
+			Assert.IsFalse(user.Success);
+			Assert.AreEqual(UserManagementMessage.Error.NotFound, user.Error);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_creating_an_already_existing_user_account<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> GivenCommands() {
+			yield return
+				new UserManagementMessage.Create(
+					Envelope, SystemAccounts.System, "user1", "Existing John", new[] { "admin", "other" },
+					"existing!");
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			yield return
+				new UserManagementMessage.Create(
+					Envelope, SystemAccounts.System, "user1", "John Doe", new[] { "bad" }, "Johny123!");
+		}
+
+		[Test]
+		public void replies_conflict() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.IsFalse(updateResults[0].Success);
+			Assert.AreEqual(UserManagementMessage.Error.Conflict, updateResults[0].Error);
+		}
+
+		[Test]
+		public void does_not_override_user_details() {
+			_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
+			_queue.Process();
+			var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
+			Assert.NotNull(user);
+			Assert.AreEqual("Existing John", user.Data.FullName);
+			Assert.AreEqual("user1", user.Data.LoginName);
+			Assert.NotNull(user.Data.Groups);
+			Assert.That(user.Data.Groups.Any(v => v == "admin"));
+			Assert.That(user.Data.Groups.Any(v => v == "other"));
+			Assert.AreEqual(false, user.Data.Disabled);
+		}
+
+		[Test]
+		public void does_not_override_user_password() {
+			HandledMessages.Clear();
+			_users.Handle(
+				new UserManagementMessage.ChangePassword(
+					Envelope, SystemAccounts.System, "user1", "existing!", "new-password"));
+			_queue.Process();
+			var updateResult = HandledMessages.OfType<UserManagementMessage.UpdateResult>().Last();
+			Assert.NotNull(updateResult);
+			Assert.IsTrue(updateResult.Success);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_updating_user_details<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> GivenCommands() {
+			yield return
+				new UserManagementMessage.Create(
+					Envelope, SystemAccounts.System, "user1", "John Doe", new[] { "admin", "other" }, "Johny123!");
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			yield return
+				new UserManagementMessage.Update(
+					Envelope, SystemAccounts.System, "user1", "Doe John", new[] { "good" });
+		}
+
+		[Test]
+		public void replies_success() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.IsTrue(updateResults[0].Success);
+		}
+
+		[Test]
+		public void reply_has_the_correct_login_name() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.AreEqual("user1", updateResults[0].LoginName);
+		}
+
+		[Test]
+		public void updates_details() {
+			_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
+			_queue.Process();
+			var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
+			Assert.NotNull(user);
+			Assert.AreEqual("Doe John", user.Data.FullName);
+			Assert.AreEqual("user1", user.Data.LoginName);
+			Assert.NotNull(user.Data.Groups);
+			Assert.That(user.Data.Groups.All(v => v != "admin"));
+			Assert.That(user.Data.Groups.All(v => v != "other"));
+			Assert.That(user.Data.Groups.Any(v => v == "good"));
+			Assert.AreEqual(false, user.Data.Disabled);
+		}
+
+		[Test]
+		public void does_not_update_enabled() {
+			_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
+			_queue.Process();
+			var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
+			Assert.NotNull(user);
+			Assert.AreEqual(false, user.Data.Disabled);
+		}
+
+		[Test]
+		public void does_not_change_password() {
+			HandledMessages.Clear();
+			_users.Handle(
+				new UserManagementMessage.ChangePassword(
+					Envelope, SystemAccounts.System, "user1", "Johny123!", "new-password"));
+			_queue.Process();
+			var updateResult = HandledMessages.OfType<UserManagementMessage.UpdateResult>().Last();
+			Assert.NotNull(updateResult);
+			Assert.IsTrue(updateResult.Success);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_ordinary_user_attempts_to_update_its_own_details<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> GivenCommands() {
+			yield return
+				new UserManagementMessage.Create(
+					Envelope, SystemAccounts.System, "user1", "John Doe", new[] { "admin", "other" }, "Johny123!");
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			yield return
+				new UserManagementMessage.Update(Envelope, _ordinaryUser, "user1", "Doe John", new[] { "good" });
+		}
+
+		[Test]
+		public void replies_unauthorized() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.IsFalse(updateResults[0].Success);
+			Assert.AreEqual(UserManagementMessage.Error.Unauthorized, updateResults[0].Error);
+		}
+
+		[Test]
+		public void details_are_not_changed() {
+			_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
+			_queue.Process();
+			var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
+			Assert.NotNull(user);
+			Assert.AreEqual("John Doe", user.Data.FullName);
+			Assert.AreEqual("user1", user.Data.LoginName);
+			Assert.NotNull(user.Data.Groups);
+			Assert.That(user.Data.Groups.Any(v => v == "admin"));
+			Assert.That(user.Data.Groups.Any(v => v == "other"));
+			Assert.AreEqual(false, user.Data.Disabled);
+		}
+
+		[Test]
+		public void does_not_update_enabled() {
+			_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
+			_queue.Process();
+			var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
+			Assert.NotNull(user);
+			Assert.AreEqual(false, user.Data.Disabled);
+		}
+
+		[Test]
+		public void does_not_change_password() {
+			HandledMessages.Clear();
+			_users.Handle(
+				new UserManagementMessage.ChangePassword(
+					Envelope, SystemAccounts.System, "user1", "Johny123!", "new-password"));
+			_queue.Process();
+			var updateResult = HandledMessages.OfType<UserManagementMessage.UpdateResult>().Last();
+			Assert.NotNull(updateResult);
+			Assert.IsTrue(updateResult.Success);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_updating_non_existing_user_details<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> GivenCommands() {
+			yield break;
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			yield return
+				new UserManagementMessage.Update(
+					Envelope, SystemAccounts.System, "user1", "Doe John", new[] { "admin", "other" });
+		}
+
+		[Test]
+		public void replies_not_found() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.IsFalse(updateResults[0].Success);
+			Assert.AreEqual(UserManagementMessage.Error.NotFound, updateResults[0].Error);
+		}
+
+		[Test]
+		public void reply_has_the_correct_login_name() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.AreEqual("user1", updateResults[0].LoginName);
+		}
+
+		[Test]
+		public void does_not_create_a_user_account() {
+			_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
+			_queue.Process();
+			var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
+			Assert.NotNull(user);
+			Assert.IsFalse(user.Success);
+			Assert.AreEqual(UserManagementMessage.Error.NotFound, user.Error);
+			Assert.Null(user.Data);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_updating_a_disabled_user_account_details<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> GivenCommands() {
+			var replyTo = Envelope;
+			yield return
+				new UserManagementMessage.Create(
+					replyTo, SystemAccounts.System, "user1", "John Doe", new[] { "admin", "other" }, "Johny123!");
+			yield return new UserManagementMessage.Disable(replyTo, SystemAccounts.System, "user1");
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			yield return
+				new UserManagementMessage.Update(
+					Envelope, SystemAccounts.System, "user1", "Doe John", new[] { "good" });
+		}
+
+		[Test]
+		public void replies_success() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.IsTrue(updateResults[0].Success);
+		}
+
+		[Test]
+		public void does_not_update_enabled() {
+			_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
+			_queue.Process();
+			var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
+			Assert.NotNull(user);
+			Assert.AreEqual(true, user.Data.Disabled);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_disabling_an_enabled_user_account<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> GivenCommands() {
+			yield return
+				new UserManagementMessage.Create(
+					Envelope, SystemAccounts.System, "user1", "John Doe", new[] { "admin", "other" }, "Johny123!");
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			yield return new UserManagementMessage.Disable(Envelope, SystemAccounts.System, "user1");
+		}
+
+		[Test]
+		public void replies_success_with_correct_login_name_set() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.IsTrue(updateResults[0].Success);
+			Assert.AreEqual("user1", updateResults[0].LoginName);
+		}
+
+		[Test]
+		public void disables_user_account() {
+			_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
+			_queue.Process();
+			var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
+			Assert.NotNull(user);
+			Assert.AreEqual(true, user.Data.Disabled);
+		}
+
+		[Test]
+		public void writes_password_changed_event() {
+			var writePasswordChanged = HandledPasswordChangedNotificationWrites();
+			Assert.AreEqual(1, writePasswordChanged.Length);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_an_ordinary_user_attempts_to_disable_a_user_account<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> GivenCommands() {
+			yield return
+				new UserManagementMessage.Create(
+					Envelope, SystemAccounts.System, "user1", "John Doe", new[] { "admin", "other" }, "Johny123!");
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			yield return new UserManagementMessage.Disable(Envelope, _ordinaryUser, "user1");
+		}
+
+		[Test]
+		public void replies_unauthorized() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.IsFalse(updateResults[0].Success);
+			Assert.AreEqual(UserManagementMessage.Error.Unauthorized, updateResults[0].Error);
+		}
+
+		[Test]
+		public void user_account_is_not_disabled() {
+			_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
+			_queue.Process();
+			var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
+			Assert.NotNull(user);
+			Assert.AreEqual(false, user.Data.Disabled);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_disabling_a_disabled_user_account<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> GivenCommands() {
+			var replyTo = Envelope;
+			yield return
+				new UserManagementMessage.Create(
+					replyTo, SystemAccounts.System, "user1", "John Doe", new[] { "admin", "other" }, "Johny123!");
+			yield return new UserManagementMessage.Disable(replyTo, SystemAccounts.System, "user1");
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			yield return new UserManagementMessage.Disable(Envelope, SystemAccounts.System, "user1");
+		}
+
+		[Test]
+		public void replies_success_with_correct_login_name_set() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.IsTrue(updateResults[0].Success);
+			Assert.AreEqual("user1", updateResults[0].LoginName);
+		}
+
+		[Test]
+		public void keeps_disabled() {
+			_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
+			_queue.Process();
+			var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
+			Assert.NotNull(user);
+			Assert.AreEqual(true, user.Data.Disabled);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_enabling_a_disabled_user_account<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> GivenCommands() {
+			var replyTo = Envelope;
+			yield return
+				new UserManagementMessage.Create(
+					replyTo, SystemAccounts.System, "user1", "John Doe", new[] { "admin", "other" }, "Johny123!");
+			yield return new UserManagementMessage.Disable(replyTo, SystemAccounts.System, "user1");
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			yield return new UserManagementMessage.Enable(Envelope, SystemAccounts.System, "user1");
+		}
+
+		[Test]
+		public void replies_success_with_correct_login_name_set() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.IsTrue(updateResults[0].Success);
+			Assert.AreEqual("user1", updateResults[0].LoginName);
+		}
+
+		[Test]
+		public void enables_user_account() {
+			_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
+			_queue.Process();
+			var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
+			Assert.NotNull(user);
+			Assert.AreEqual(false, user.Data.Disabled);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_an_ordinary_user_attempts_to_enable_a_user_account<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> GivenCommands() {
+			var replyTo = Envelope;
+			yield return
+				new UserManagementMessage.Create(
+					replyTo, SystemAccounts.System, "user1", "John Doe", new[] { "admin", "other" }, "Johny123!");
+			yield return new UserManagementMessage.Disable(replyTo, SystemAccounts.System, "user1");
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			yield return new UserManagementMessage.Enable(Envelope, _ordinaryUser, "user1");
+		}
+
+		[Test]
+		public void replies_unauthorized() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.IsFalse(updateResults[0].Success);
+			Assert.AreEqual(UserManagementMessage.Error.Unauthorized, updateResults[0].Error);
+		}
+
+		[Test]
+		public void user_account_is_not_enabled() {
+			_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
+			_queue.Process();
+			var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
+			Assert.NotNull(user);
+			Assert.AreEqual(true, user.Data.Disabled);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_enabling_an_enabled_user_account<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> GivenCommands() {
+			yield return
+				new UserManagementMessage.Create(
+					Envelope, SystemAccounts.System, "user1", "John Doe", new[] { "admin", "other" }, "Johny123!");
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			yield return new UserManagementMessage.Enable(Envelope, SystemAccounts.System, "user1");
+		}
+
+		[Test]
+		public void replies_success_with_correct_login_name_set() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.IsTrue(updateResults[0].Success);
+			Assert.AreEqual("user1", updateResults[0].LoginName);
+		}
+
+		[Test]
+		public void keeps_enabled() {
+			_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
+			_queue.Process();
+			var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
+			Assert.NotNull(user);
+			Assert.AreEqual(false, user.Data.Disabled);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_resetting_the_password<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> GivenCommands() {
+			yield return
+				new UserManagementMessage.Create(
+					Envelope, SystemAccounts.System, "user1", "John Doe", new[] { "admin", "other" }, "Johny123!");
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			yield return
+				new UserManagementMessage.ResetPassword(Envelope, SystemAccounts.System, "user1", "new-password");
+		}
+
+		[Test]
+		public void replies_success() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.IsTrue(updateResults[0].Success);
+		}
+
+		[Test]
+		public void reply_has_the_correct_login_name() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.AreEqual("user1", updateResults[0].LoginName);
+		}
+
+		[Test]
+		public void does_not_update_details() {
+			_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
+			_queue.Process();
+			var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
+			Assert.NotNull(user);
+			Assert.AreEqual("John Doe", user.Data.FullName);
+			Assert.AreEqual("user1", user.Data.LoginName);
+			Assert.AreEqual(false, user.Data.Disabled);
+		}
+
+		[Test]
+		public void changes_password() {
+			HandledMessages.Clear();
+			_users.Handle(
+				new UserManagementMessage.ChangePassword(
+					Envelope, SystemAccounts.System, "user1", "new-password", "other-password"));
+			_queue.Process();
+			var updateResult = HandledMessages.OfType<UserManagementMessage.UpdateResult>().Last();
+			Assert.NotNull(updateResult);
+			Assert.IsTrue(updateResult.Success);
+		}
+
+		[Test]
+		public void writes_password_changed_event() {
+			var writePasswordChanged = HandledPasswordChangedNotificationWrites();
+			Assert.AreEqual(1, writePasswordChanged.Length);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_resetting_the_password_twice<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> GivenCommands() {
+			yield return
+				new UserManagementMessage.Create(
+					Envelope, SystemAccounts.System, "user1", "John Doe", new[] { "admin", "other" }, "Johny123!");
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			var replyTo = Envelope;
+			yield return
+				new UserManagementMessage.ResetPassword(replyTo, SystemAccounts.System, "user1", "new-password");
+			yield return
+				new UserManagementMessage.ResetPassword(replyTo, SystemAccounts.System, "user1", "new-password");
+		}
+
+		[Test]
+		public void replies_success() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(2, updateResults.Count);
+			Assert.IsTrue(updateResults[0].Success);
+			Assert.IsTrue(updateResults[1].Success);
+		}
+
+		[Test]
+		public void configures_password_changed_notification_system_stream_only_once() {
+			var writePasswordChanged = HandledPasswordChangedNotificationMetaStreamWrites();
+			Assert.AreEqual(1, writePasswordChanged.Length);
+			var passwordChangedEvent = writePasswordChanged[0].Events.Single();
+			HelperExtensions.AssertJson(new { ___maxAge = 3600 }, passwordChangedEvent.Data.ParseJson<JObject>());
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_ordinary_user_attempts_to_reset_its_own_password<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> GivenCommands() {
+			yield return
+				new UserManagementMessage.Create(
+					Envelope, SystemAccounts.System, "user1", "John Doe", new[] { "admin", "other" }, "Johny123!");
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			yield return
+				new UserManagementMessage.ResetPassword(Envelope, _ordinaryUser, "user1", "new-password");
+		}
+
+		[Test]
+		public void replies_unauthorized() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.IsFalse(updateResults[0].Success);
+			Assert.AreEqual(UserManagementMessage.Error.Unauthorized, updateResults[0].Error);
+		}
+
+		[Test]
+		public void password_is_not_changed() {
+			HandledMessages.Clear();
+			_users.Handle(
+				new UserManagementMessage.ChangePassword(
+					Envelope, SystemAccounts.System, "user1", "Johny123!", "other-password"));
+			_queue.Process();
+			var updateResult = HandledMessages.OfType<UserManagementMessage.UpdateResult>().Last();
+			Assert.NotNull(updateResult);
+			Assert.IsTrue(updateResult.Success);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_changing_a_password_with_correct_current_password<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> GivenCommands() {
+			yield return
+				new UserManagementMessage.Create(
+					Envelope, SystemAccounts.System, "user1", "John Doe", new[] { "admin", "other" }, "Johny123!");
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			yield return
+				new UserManagementMessage.ChangePassword(
+					Envelope, SystemAccounts.System, "user1", "Johny123!", "new-password");
+		}
+
+		[Test]
+		public void replies_success() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.IsTrue(updateResults[0].Success);
+		}
+
+		[Test]
+		public void reply_has_the_correct_login_name() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.AreEqual("user1", updateResults[0].LoginName);
+		}
+
+		[Test]
+		public void does_not_update_details() {
+			_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
+			_queue.Process();
+			var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
+			Assert.NotNull(user);
+			Assert.AreEqual("John Doe", user.Data.FullName);
+			Assert.AreEqual("user1", user.Data.LoginName);
+			Assert.AreEqual(false, user.Data.Disabled);
+		}
+
+		[Test]
+		public void changes_password() {
+			HandledMessages.Clear();
+			_users.Handle(
+				new UserManagementMessage.ChangePassword(
+					Envelope, SystemAccounts.System, "user1", "new-password", "other-password"));
+			_queue.Process();
+			var updateResult = HandledMessages.OfType<UserManagementMessage.UpdateResult>().Last();
+			Assert.NotNull(updateResult);
+			Assert.IsTrue(updateResult.Success);
+		}
+
+		[Test]
+		public void writes_password_changed_event() {
+			var writePasswordChanged = HandledPasswordChangedNotificationWrites();
+			Assert.AreEqual(1, writePasswordChanged.Length);
+		}
+
+		[Test]
+		public void configures_password_changed_notification_system_stream() {
+			var writePasswordChanged = HandledPasswordChangedNotificationMetaStreamWrites();
+			Assert.AreEqual(1, writePasswordChanged.Length);
+			var passwordChangedEvent = writePasswordChanged[0].Events.Single();
+			HelperExtensions.AssertJson(new { ___maxAge = 3600 }, passwordChangedEvent.Data.ParseJson<JObject>());
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_changing_a_password_with_incorrect_current_password<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> GivenCommands() {
+			yield return
+				new UserManagementMessage.Create(
+					Envelope, SystemAccounts.System, "user1", "John Doe", new[] { "admin", "other" }, "Johny123!");
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			yield return
+				new UserManagementMessage.ChangePassword(
+					Envelope, SystemAccounts.System, "user1", "incorrect", "new-password");
+		}
+
+		[Test]
+		public void replies_unauthorized() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.IsFalse(updateResults[0].Success);
+			Assert.AreEqual(UserManagementMessage.Error.Unauthorized, updateResults[0].Error);
+		}
+
+		[Test]
+		public void reply_has_the_correct_login_name() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.AreEqual("user1", updateResults[0].LoginName);
+		}
+
+		[Test]
+		public void does_not_update_details() {
+			_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
+			_queue.Process();
+			var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
+			Assert.NotNull(user);
+			Assert.AreEqual("John Doe", user.Data.FullName);
+			Assert.AreEqual("user1", user.Data.LoginName);
+			Assert.AreEqual(false, user.Data.Disabled);
+		}
+
+		[Test]
+		public void does_not_change_the_password() {
+			HandledMessages.Clear();
+			_users.Handle(
+				new UserManagementMessage.ChangePassword(
+					Envelope, SystemAccounts.System, "user1", "Johny123!", "other-password"));
+			_queue.Process();
+			var updateResult = HandledMessages.OfType<UserManagementMessage.UpdateResult>().Last();
+			Assert.NotNull(updateResult);
+			Assert.IsTrue(updateResult.Success);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_deleting_an_existing_user_account<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> GivenCommands() {
+			yield return
+				new UserManagementMessage.Create(
+					Envelope, SystemAccounts.System, "user1", "John Doe", new[] { "admin", "other" }, "Johny123!");
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			yield return new UserManagementMessage.Delete(Envelope, SystemAccounts.System, "user1");
+		}
+
+		[Test]
+		public void replies_success() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.IsTrue(updateResults[0].Success);
+		}
+
+		[Test]
+		public void reply_has_the_correct_login_name() {
+			var updateResults = HandledMessages.OfType<UserManagementMessage.UpdateResult>().ToList();
+			Assert.AreEqual(1, updateResults.Count);
+			Assert.AreEqual("user1", updateResults[0].LoginName);
+		}
+
+		[Test]
+		public void deletes_the_user_account() {
+			_users.Handle(new UserManagementMessage.Get(Envelope, SystemAccounts.System, "user1"));
+			_queue.Process();
+			var user = HandledMessages.OfType<UserManagementMessage.UserDetailsResult>().SingleOrDefault();
+			Assert.NotNull(user);
+			Assert.IsFalse(user.Success);
+			Assert.AreEqual(UserManagementMessage.Error.NotFound, user.Error);
+			Assert.Null(user.Data);
+		}
+
+		[Test]
+		public void writes_password_changed_event() {
+			var writePasswordChanged = HandledPasswordChangedNotificationWrites();
+			Assert.AreEqual(1, writePasswordChanged.Length);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_getting_all_users<TLogFormat, TStreamId> : TestFixtureWithUserManagementService<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> GivenCommands() {
+			var replyTo = Envelope;
+			yield return
+				new UserManagementMessage.Create(
+					replyTo, SystemAccounts.System, "user1", "John Doe 1", new[] { "admin1", "other" },
+					"Johny123!");
+			yield return
+				new UserManagementMessage.Create(
+					replyTo, SystemAccounts.System, "user2", "John Doe 2", new[] { "admin2", "other" },
+					"Johny123!");
+			yield return
+				new UserManagementMessage.Create(
+					replyTo, SystemAccounts.System, "user3", "Another Doe 1", new[] { "admin3", "other" },
+					"Johny123!");
+			yield return
+				new UserManagementMessage.Create(
+					replyTo, SystemAccounts.System, "another_user", "Another Doe 2", new[] { "admin4", "other" },
+					"Johny123!");
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			yield return new UserManagementMessage.GetAll(Envelope, SystemAccounts.System);
+		}
+
+		[Test]
+		public void returns_all_user_accounts() {
+			var users = HandledMessages.OfType<UserManagementMessage.AllUserDetailsResult>().Single().Data;
+
+			Assert.AreEqual(4, users.Length);
+		}
+
+		[Test]
+		public void returns_in_the_login_name_order() {
+			var users = HandledMessages.OfType<UserManagementMessage.AllUserDetailsResult>().Single().Data;
+
+			Assert.That(
+				new[] { "another_user", "user1", "user2", "user3" }.SequenceEqual(users.Select(v => v.LoginName)));
+		}
+
+		[Test]
+		public void returns_full_names() {
+			var users = HandledMessages.OfType<UserManagementMessage.AllUserDetailsResult>().Single().Data;
+
+			Assert.That(users.Any(v => v.LoginName == "user2" && v.FullName == "John Doe 2"));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/VNode/InaugurationManager/InaugurationManagerTests.cs b/src/KurrentDB.Core.Tests/Services/VNode/InaugurationManager/InaugurationManagerTests.cs
new file mode 100644
index 00000000000..8f2a8ade4e8
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/VNode/InaugurationManager/InaugurationManagerTests.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.VNode;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.VNode.InaugurationManager;
+
+public abstract class InaugurationManagerTests {
+	protected readonly Guid _correlationId1 = Guid.Parse("00000000-0000-0000-0000-0000000000c1");
+	protected readonly Guid _correlationId2 = Guid.Parse("00000000-0000-0000-0000-0000000000c2");
+	protected readonly Guid _correlationId3 = Guid.Parse("00000000-0000-0000-0000-0000000000c3");
+	protected readonly int _epochNumber = 15;
+	protected readonly MemberInfo _leader =
+		MemberInfo.ForVNode(
+			default, default, default, default,
+			new DnsEndPoint("localhost", default), default, default, default,
+			new DnsEndPoint("localhost", default), default, default, default,
+			default, default, default, default, default, default, default, default);
+	protected readonly long _replicationTarget = 400;
+	protected readonly long _indexTarget = 400;
+
+	protected KurrentDB.Core.Services.VNode.InaugurationManager _sut;
+	protected FakePublisher _publisher;
+	protected InMemoryCheckpoint _replicationCheckpoint;
+	protected InMemoryCheckpoint _indexCheckpoint;
+
+	[SetUp]
+	public void SetUp() {
+		_publisher = new FakePublisher();
+		_replicationCheckpoint = new InMemoryCheckpoint();
+		_indexCheckpoint = new InMemoryCheckpoint();
+		_sut = new KurrentDB.Core.Services.VNode.InaugurationManager(_publisher, _replicationCheckpoint, _indexCheckpoint, new NodeStatusTracker.NoOp());
+		Given();
+	}
+
+	protected abstract void Given();
+
+	protected void When(Message m) {
+		_sut.Handle((dynamic)m);
+	}
+
+	protected SystemMessage.EpochWritten GenEpoch(int epochNumber) {
+		var epoch = new SystemMessage.EpochWritten(new EpochRecord(
+						epochPosition: _replicationTarget - 1,
+						epochNumber: epochNumber,
+						epochId: Guid.NewGuid(),
+						prevEpochPosition: _replicationTarget - 20,
+						timeStamp: DateTime.UtcNow,
+						leaderInstanceId: Guid.NewGuid()));
+		return epoch;
+	}
+
+	protected void ProgressReplication() {
+		_replicationCheckpoint.Write(_replicationTarget / 2);
+		_replicationCheckpoint.Flush();
+	}
+
+	protected void CompleteReplication() {
+		_replicationCheckpoint.Write(_replicationTarget);
+		_replicationCheckpoint.Flush();
+	}
+
+	protected void ProgressIndexing() {
+		_indexCheckpoint.Write(_indexTarget / 2);
+		_indexCheckpoint.Flush();
+	}
+
+	protected void CompleteIndexing() {
+		_indexCheckpoint.Write(_indexTarget);
+		_indexCheckpoint.Flush();
+	}
+
+	// check that we have reset to initial state, do this by checking we can
+	// proceed forward from it
+	protected void AssertInitial() {
+		Assert.IsEmpty(_publisher.Messages);
+		_sut.Handle(new SystemMessage.BecomePreLeader(_correlationId3));
+		AssertWaitingForChaser(_correlationId3);
+	}
+
+	// check that we have reset to waiting fo chaser, do this by checking we can
+	// proceed forward from it
+	protected void AssertWaitingForChaser(Guid expectedCorrelationId) {
+		Assert.IsEmpty(_publisher.Messages);
+		_sut.Handle(new SystemMessage.ChaserCaughtUp(expectedCorrelationId));
+		Assert.AreEqual(1, _publisher.Messages.Count);
+		Assert.IsInstanceOf<SystemMessage.WriteEpoch>(_publisher.Messages[0]);
+	}
+
+	protected void AssertSentBecomeLeader() {
+		Assert.AreEqual(1, _publisher.Messages.Count);
+		var becomeLeader = AssertEx.IsType<SystemMessage.BecomeLeader>(_publisher.Messages[0]);
+		Assert.AreEqual(_correlationId1, becomeLeader.CorrelationId);
+		_publisher.Messages.Clear();
+		AssertInitial();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/VNode/InaugurationManager/given_initial_state.cs b/src/KurrentDB.Core.Tests/Services/VNode/InaugurationManager/given_initial_state.cs
new file mode 100644
index 00000000000..b5212a728e5
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/VNode/InaugurationManager/given_initial_state.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.VNode.InaugurationManager;
+
+[TestFixture]
+public class given_initial_state : InaugurationManagerTests {
+	protected override void Given() {
+		_publisher.Messages.Clear();
+	}
+
+	[Test]
+	public void when_become_pre_leader() {
+		When(new SystemMessage.BecomePreLeader(_correlationId1));
+		AssertWaitingForChaser(_correlationId1);
+	}
+
+	[Test]
+	public void when_become_other_node_state() {
+		When(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
+		AssertInitial();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/VNode/InaugurationManager/given_waiting_for_chaser.cs b/src/KurrentDB.Core.Tests/Services/VNode/InaugurationManager/given_waiting_for_chaser.cs
new file mode 100644
index 00000000000..cf05dae1003
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/VNode/InaugurationManager/given_waiting_for_chaser.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.VNode.InaugurationManager;
+
+
+[TestFixture]
+public class given_waiting_for_chaser : InaugurationManagerTests {
+	protected override void Given() {
+		_sut.Handle(new ElectionMessage.ElectionsDone(123, _epochNumber, _leader));
+		_sut.Handle(new SystemMessage.BecomePreLeader(_correlationId1));
+		_publisher.Messages.Clear();
+	}
+
+	[Test]
+	public void when_chaser_caught_up() {
+		When(new SystemMessage.ChaserCaughtUp(_correlationId1));
+		Assert.AreEqual(1, _publisher.Messages.Count);
+		var writeEpoch = AssertEx.IsType<SystemMessage.WriteEpoch>(_publisher.Messages[0]);
+		Assert.AreEqual(_epochNumber, writeEpoch.EpochNumber);
+	}
+
+	[Test]
+	public void when_chaser_caught_up_with_unknown_correlation_id() {
+		When(new SystemMessage.ChaserCaughtUp(_correlationId2));
+		Assert.IsEmpty(_publisher.Messages);
+	}
+
+	[Test]
+	public void when_become_pre_leader() {
+		When(new SystemMessage.BecomePreLeader(_correlationId2));
+		AssertWaitingForChaser(_correlationId2);
+	}
+
+	[Test]
+	public void when_become_other_node_state() {
+		When(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
+		AssertInitial();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/VNode/InaugurationManager/given_waiting_for_conditions.cs b/src/KurrentDB.Core.Tests/Services/VNode/InaugurationManager/given_waiting_for_conditions.cs
new file mode 100644
index 00000000000..52bbe7fe3ce
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/VNode/InaugurationManager/given_waiting_for_conditions.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.VNode.InaugurationManager;
+
+[TestFixture]
+public class given_waiting_for_conditions : InaugurationManagerTests {
+	protected override void Given() {
+		_sut.Handle(new ElectionMessage.ElectionsDone(123, _epochNumber, _leader));
+		_sut.Handle(new SystemMessage.BecomePreLeader(_correlationId1));
+		_sut.Handle(new SystemMessage.ChaserCaughtUp(_correlationId1));
+		_sut.Handle(GenEpoch(_epochNumber));
+		_publisher.Messages.Clear();
+	}
+
+	[Test]
+	public void when_transition_triggered_by_indexedto() {
+		ProgressReplication();
+		ProgressIndexing();
+		CompleteReplication();
+		CompleteIndexing();
+		Assert.IsEmpty(_publisher.Messages);
+
+		When(new ReplicationTrackingMessage.IndexedTo(_indexCheckpoint.Read()));
+
+		AssertSentBecomeLeader();
+	}
+
+	[Test]
+	public void when_transition_triggered_by_replicatedto() {
+		ProgressReplication();
+		ProgressIndexing();
+		CompleteReplication();
+		CompleteIndexing();
+		Assert.IsEmpty(_publisher.Messages);
+
+		When(new ReplicationTrackingMessage.ReplicatedTo(_replicationCheckpoint.Read()));
+
+		AssertSentBecomeLeader();
+	}
+
+	[Test]
+	public void when_transition_triggered_by_checkconditions() {
+		CompleteReplication();
+		CompleteIndexing();
+		Assert.IsEmpty(_publisher.Messages);
+
+		When(new SystemMessage.CheckInaugurationConditions());
+
+		Assert.AreEqual(2, _publisher.Messages.Count);
+		Assert.IsInstanceOf<TimerMessage.Schedule>(_publisher.Messages[0]);
+		_publisher.Messages.RemoveAt(0);
+
+		AssertSentBecomeLeader();
+	}
+
+	[Test]
+	public void cant_become_leader_twice() {
+		CompleteReplication();
+		CompleteIndexing();
+		Assert.IsEmpty(_publisher.Messages);
+
+		When(new ReplicationTrackingMessage.ReplicatedTo(_replicationCheckpoint.Read()));
+		When(new SystemMessage.CheckInaugurationConditions());
+
+		AssertSentBecomeLeader();
+	}
+
+	[Test]
+	public void when_epoch_written() {
+		When(GenEpoch(_epochNumber));
+		Assert.IsEmpty(_publisher.Messages);
+	}
+
+	[Test]
+	public void when_chaser_caught_up() {
+		When(new SystemMessage.ChaserCaughtUp(_correlationId1));
+		Assert.IsEmpty(_publisher.Messages);
+	}
+
+	[Test]
+	public void when_become_pre_leader() {
+		When(new SystemMessage.BecomePreLeader(_correlationId2));
+		AssertWaitingForChaser(_correlationId2);
+	}
+
+	[Test]
+	public void when_become_other_node_state() {
+		When(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
+		AssertInitial();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/VNode/InaugurationManager/given_writing_epoch.cs b/src/KurrentDB.Core.Tests/Services/VNode/InaugurationManager/given_writing_epoch.cs
new file mode 100644
index 00000000000..c946776c9dc
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/VNode/InaugurationManager/given_writing_epoch.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.VNode.InaugurationManager;
+
+[TestFixture]
+public class given_writing_epoch : InaugurationManagerTests {
+	protected override void Given() {
+		_sut.Handle(new ElectionMessage.ElectionsDone(123, _epochNumber, _leader));
+		_sut.Handle(new SystemMessage.BecomePreLeader(_correlationId1));
+		_sut.Handle(new SystemMessage.ChaserCaughtUp(_correlationId1));
+		_publisher.Messages.Clear();
+	}
+
+	[Test]
+	public void when_epoch_written() {
+		When(GenEpoch(_epochNumber));
+		Assert.AreEqual(2, _publisher.Messages.Count);
+		Assert.IsInstanceOf<SystemMessage.EnablePreLeaderReplication>(_publisher.Messages[0]);
+		var schedule = AssertEx.IsType<TimerMessage.Schedule>(_publisher.Messages[1]);
+		Assert.IsInstanceOf<SystemMessage.CheckInaugurationConditions>(schedule.ReplyMessage);
+	}
+
+	[Test]
+	public void when_epoch_written_with_unexpected_number() {
+		When(GenEpoch(_epochNumber + 1));
+		Assert.IsEmpty(_publisher.Messages);
+	}
+
+	[Test]
+	public void when_epoch_written_and_conditions_instantly_met() {
+		CompleteReplication();
+		CompleteIndexing();
+		When(GenEpoch(_epochNumber));
+
+		Assert.AreEqual(3, _publisher.Messages.Count);
+		Assert.IsInstanceOf<SystemMessage.EnablePreLeaderReplication>(_publisher.Messages[0]);
+		Assert.IsInstanceOf<SystemMessage.BecomeLeader>(_publisher.Messages[1]);
+		Assert.IsInstanceOf<TimerMessage.Schedule>(_publisher.Messages[2]);
+	}
+
+	[Test]
+	public void when_chaser_caught_up() {
+		When(new SystemMessage.ChaserCaughtUp(_correlationId1));
+		Assert.IsEmpty(_publisher.Messages);
+	}
+
+	[Test]
+	public void when_become_pre_leader() {
+		When(new SystemMessage.BecomePreLeader(_correlationId2));
+		AssertWaitingForChaser(_correlationId2);
+	}
+
+	[Test]
+	public void when_become_other_node_state() {
+		When(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
+		AssertInitial();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/VNode/ShutdownServiceTests.cs b/src/KurrentDB.Core.Tests/Services/VNode/ShutdownServiceTests.cs
new file mode 100644
index 00000000000..44a34f04670
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/VNode/ShutdownServiceTests.cs
@@ -0,0 +1,71 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using DotNext.Net.Http;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Bus.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.VNode;
+
+public class ShutdownServiceTests {
+	private VNodeInfo BogusNodeInfo { get; }
+		= new VNodeInfo(
+			Guid.NewGuid(),
+			0,
+			new IPEndPoint(0, 0),
+			new IPEndPoint(IPAddress.Loopback, 1),
+			new IPEndPoint(IPAddress.Loopback, 2),
+			new IPEndPoint(IPAddress.Loopback, 3),
+			new HttpEndPoint(new Uri("http://www.eventstore.com")), true);
+
+	[Test]
+	public void should_graceful_shutdown() {
+		var queue = new FakeCollectingQueuedHandler();
+		var sut = new ShutdownService(queue, BogusNodeInfo);
+		var terminated = false;
+
+		sut.Handle(new SystemMessage.RegisterForGracefulTermination("foo", () => terminated = true));
+		sut.Handle(new ClientMessage.RequestShutdown(true, true));
+		sut.Handle(new SystemMessage.ComponentTerminated("foo"));
+
+		Assert.True(terminated);
+		Assert.IsInstanceOf<TimerMessage.Schedule>(queue.PublishedMessages[0]);
+		Assert.IsInstanceOf<SystemMessage.BecomeShuttingDown>(queue.PublishedMessages[1]);
+	}
+
+	[Test]
+	public void should_shutdown_even_if_component_reported_earlier_than_shutdown_was_initiated() {
+		var queue = new FakeCollectingQueuedHandler();
+		var sut = new ShutdownService(queue, BogusNodeInfo);
+		var notCalled = true;
+
+		sut.Handle(new SystemMessage.RegisterForGracefulTermination("foo", () => notCalled = false));
+		sut.Handle(new SystemMessage.ComponentTerminated("foo"));
+		sut.Handle(new ClientMessage.RequestShutdown(true, true));
+
+		// Proof that callback in the RegisterForGraceFulTermination message was never called.
+		Assert.True(notCalled);
+		Assert.IsInstanceOf<SystemMessage.BecomeShuttingDown>(queue.PublishedMessages[0]);
+	}
+
+	[Test]
+	public void should_shutdown_when_component_did_not_report_termination() {
+		var queue = new FakeCollectingQueuedHandler();
+		var sut = new ShutdownService(queue, BogusNodeInfo);
+		var called = false;
+
+		sut.Handle(new SystemMessage.RegisterForGracefulTermination("foo", () => called = true));
+		sut.Handle(new ClientMessage.RequestShutdown(true, true));
+		sut.Handle(new SystemMessage.PeripheralShutdownTimeout());
+
+		Assert.True(called);
+		Assert.IsInstanceOf<TimerMessage.Schedule>(queue.PublishedMessages[0]);
+		Assert.IsInstanceOf<SystemMessage.BecomeShuttingDown>(queue.PublishedMessages[1]);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Services/VNode/ShutdownServiceWithMiniNodeTests.cs b/src/KurrentDB.Core.Tests/Services/VNode/ShutdownServiceWithMiniNodeTests.cs
new file mode 100644
index 00000000000..b83853a8a8c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/VNode/ShutdownServiceWithMiniNodeTests.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Subsystems;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Tests.Helpers;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.VNode;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class ShutdownServiceWithMiniNodeTests<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private readonly CancellationTokenSource _cts = new();
+	private readonly TaskCompletionSource _tcs = new();
+	private MiniNode<TLogFormat, TStreamId> _node;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_node = new MiniNode<TLogFormat, TStreamId>(PathName, subsystems: [new FakePlugin(_tcs)]);
+		await _node.Start();
+	}
+
+	[Test]
+	public async Task should_graceful_shutdown_with_mininode() {
+		await using var _ = _cts.Token.Register(() => _tcs.TrySetCanceled(_cts.Token));
+		_cts.CancelAfter(TimeSpan.FromSeconds(15));
+		await _node.Shutdown();
+		await _tcs.Task;
+	}
+
+	private class FakePlugin(TaskCompletionSource source) : ISubsystem {
+		private IPublisher _publisher;
+		public void ConfigureServices(IServiceCollection services, IConfiguration configuration) { }
+
+		public void ConfigureApplication(IApplicationBuilder builder, IConfiguration configuration) {
+			_publisher = builder.ApplicationServices.GetRequiredService<IPublisher>();
+			_publisher.Publish(new SystemMessage.RegisterForGracefulTermination("foobar", () => {
+				var envelope = new CallbackEnvelope(msg => {
+					if (msg is not ClientMessage.ReadStreamEventsForwardCompleted resp)
+						return;
+
+					if (resp.Result != ReadStreamResult.NoStream)
+						return;
+
+					source.TrySetResult();
+					_publisher.Publish(new SystemMessage.ComponentTerminated("foobar"));
+				});
+
+				_publisher.Publish(
+					new ClientMessage.ReadStreamEventsForward(
+						Guid.NewGuid(),
+						Guid.NewGuid(),
+						envelope,
+						"foobar",
+						0,
+						1,
+						false,
+						false,
+						null,
+						SystemAccounts.System,
+						true));
+			}));
+		}
+
+		public string Name => "foobar";
+		public string DiagnosticsName => "foobar";
+		public KeyValuePair<string, object>[] DiagnosticsTags { get; }
+		public string Version => "version";
+		public bool Enabled => true;
+		public string LicensePublicKey { get; }
+		public Task Start() => Task.CompletedTask;
+
+		public Task Stop() => Task.CompletedTask;
+	}
+}
diff --git a/src/EventStore.Core.Tests/Services/VNode/auth_providers_should.cs b/src/KurrentDB.Core.Tests/Services/VNode/auth_providers_should.cs
similarity index 85%
rename from src/EventStore.Core.Tests/Services/VNode/auth_providers_should.cs
rename to src/KurrentDB.Core.Tests/Services/VNode/auth_providers_should.cs
index e8ef7fcb6bb..ec3d2f1f7b1 100644
--- a/src/EventStore.Core.Tests/Services/VNode/auth_providers_should.cs
+++ b/src/KurrentDB.Core.Tests/Services/VNode/auth_providers_should.cs
@@ -1,17 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
-using EventStore.Core.Tests.Helpers;
 using EventStore.Plugins.Authentication;
 using EventStore.Plugins.Authorization;
+using KurrentDB.Core.Tests.Helpers;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Services.VNode;
+namespace KurrentDB.Core.Tests.Services.VNode;
 
 [TestFixture]
 public class auth_providers_should : SpecificationWithDirectory {
@@ -34,19 +37,19 @@ public async Task be_registered_with_di() {
 		await authorizationConfigured.Task.WithTimeout(TimeSpan.FromSeconds(5));
 		await authorizationServicesConfigured.Task.WithTimeout(TimeSpan.FromSeconds(5));
 	}
-	
+
 	class FakeAuthenticationProviderFactory(TaskCompletionSource configureAppTcs, TaskCompletionSource configureServicesTcs) : IAuthenticationProviderFactory {
 		public IAuthenticationProvider Build(bool logFailedAuthenticationAttempts) =>
 			new FakeAuthenticationProvider(configureAppTcs, configureServicesTcs);
 
 		class FakeAuthenticationProvider(TaskCompletionSource configureAppTcs, TaskCompletionSource configureServicesTcs) : AuthenticationProviderBase {
-			public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) => 
+			public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) =>
 				configureServicesTcs.TrySetResult();
 
-			public override void ConfigureApplication(IApplicationBuilder app, IConfiguration configuration) => 
+			public override void ConfigureApplication(IApplicationBuilder app, IConfiguration configuration) =>
 				configureAppTcs.TrySetResult();
 
-			public override void Authenticate(AuthenticationRequest authenticationRequest) => 
+			public override void Authenticate(AuthenticationRequest authenticationRequest) =>
 				throw new NotImplementedException();
 
 			public override IReadOnlyList<string> GetSupportedAuthenticationSchemes() =>
@@ -58,13 +61,13 @@ class FakeAuthorizationProviderFactory(TaskCompletionSource configureAppTcs, Tas
 		public IAuthorizationProvider Build() => new FakeAuthorizationProvider(configureAppTcs, configureServicesTcs);
 
 		class FakeAuthorizationProvider(TaskCompletionSource configureAppTcs, TaskCompletionSource configureServicesTcs) : AuthorizationProviderBase {
-			public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) => 
+			public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) =>
 				configureServicesTcs.TrySetResult();
 
-			public override void ConfigureApplication(IApplicationBuilder app, IConfiguration configuration) => 
+			public override void ConfigureApplication(IApplicationBuilder app, IConfiguration configuration) =>
 				configureAppTcs.TrySetResult();
 
-			public override ValueTask<bool> CheckAccessAsync(ClaimsPrincipal cp, Operation operation, CancellationToken ct) => 
+			public override ValueTask<bool> CheckAccessAsync(ClaimsPrincipal cp, Operation operation, CancellationToken ct) =>
 				throw new NotImplementedException();
 		}
 	}
diff --git a/src/EventStore.Core.Tests/Services/VNode/http_pipeline_should.cs b/src/KurrentDB.Core.Tests/Services/VNode/http_pipeline_should.cs
similarity index 77%
rename from src/EventStore.Core.Tests/Services/VNode/http_pipeline_should.cs
rename to src/KurrentDB.Core.Tests/Services/VNode/http_pipeline_should.cs
index 54189b60eee..0244216f6cb 100644
--- a/src/EventStore.Core.Tests/Services/VNode/http_pipeline_should.cs
+++ b/src/KurrentDB.Core.Tests/Services/VNode/http_pipeline_should.cs
@@ -1,13 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
 using System.Threading.Tasks;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests.Helpers;
 using EventStore.Plugins;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Helpers;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Mvc;
@@ -15,7 +18,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Services.VNode;
+namespace KurrentDB.Core.Tests.Services.VNode;
 
 [TestFixture]
 public class http_pipeline_should : SpecificationWithDirectory {
@@ -23,13 +26,14 @@ public class http_pipeline_should : SpecificationWithDirectory {
 	private const string SubsystemProtectedEndpoint = "/my-subsystem/protected";
 	private const string ControllerProtectedEndpoint = "/my-controller/protected";
 	private const string ControllerUnprotectedEndpoint = "/my-controller/unprotected";
+	private const string MappedProtectedEndpoint = "/my-plugin/protected";
 
 	[Test]
 	public async Task allow_subsystems_to_protect_their_endpoints() {
 		var tcs = new TaskCompletionSource();
 
-		await using var node = new MiniNode<LogFormat.V2,string>(PathName, subsystems: [ new FakeProtectedSubSystem() ]);
-		node.Node.MainBus.Subscribe(new AdHocHandler<SystemMessage.SystemReady>( t => {
+		await using var node = new MiniNode<LogFormat.V2, string>(PathName, subsystems: [new FakeProtectedSubSystem()]);
+		node.Node.MainBus.Subscribe(new AdHocHandler<SystemMessage.SystemReady>(t => {
 			tcs.TrySetResult();
 		}));
 
@@ -42,6 +46,13 @@ public async Task allow_subsystems_to_protect_their_endpoints() {
 		result = await SendAuthenticatedGetAsync(SubsystemProtectedEndpoint);
 		Assert.AreEqual(HttpStatusCode.OK, result.StatusCode);
 
+		// subsystem endpoint protected with auth policy
+		result = await node.HttpClient.GetAsync(MappedProtectedEndpoint);
+		Assert.AreEqual(HttpStatusCode.Unauthorized, result.StatusCode);
+
+		result = await SendAuthenticatedGetAsync(MappedProtectedEndpoint);
+		Assert.AreEqual(HttpStatusCode.OK, result.StatusCode);
+
 		// subsystem unprotected endpoint
 		result = await node.HttpClient.GetAsync(SubsystemUnprotectedEndpoint);
 		Assert.AreEqual(HttpStatusCode.OK, result.StatusCode);
@@ -66,11 +77,11 @@ Task<HttpResponseMessage> SendAuthenticatedGetAsync(string endpoint) => node
 					Authorization = new AuthenticationHeaderValue("Basic",
 						Convert.ToBase64String(Encoding.ASCII.GetBytes("admin:changeit")))
 				}
-		});
+			});
 	}
 
 	class FakeProtectedSubSystem() : SubsystemsPlugin(name: "FakeProtectedSubSystem") {
-		public override void ConfigureServices(IServiceCollection services, IConfiguration _) => 
+		public override void ConfigureServices(IServiceCollection services, IConfiguration _) =>
 			services.AddControllers().AddApplicationPart(typeof(FakeController).Assembly);
 
 		public override void ConfigureApplication(IApplicationBuilder app, IConfiguration _) =>
@@ -80,8 +91,7 @@ public override void ConfigureApplication(IApplicationBuilder app, IConfiguratio
 				ep.MapGet(SubsystemProtectedEndpoint, context => {
 					if (context.User.IsInRole("$ops") || context.User.IsInRole("$admins")) {
 						context.Response.StatusCode = (int)HttpStatusCode.OK;
-					}
-					else {
+					} else {
 						context.Response.StatusCode = (int)HttpStatusCode.Unauthorized;
 					}
 
@@ -92,6 +102,8 @@ public override void ConfigureApplication(IApplicationBuilder app, IConfiguratio
 					context.Response.StatusCode = (int)HttpStatusCode.OK;
 					return Task.CompletedTask;
 				});
+
+				ep.MapGet(MappedProtectedEndpoint, () => "Pong").RequireAuthorization(p => p.RequireRole("$admins"));
 			});
 	}
 }
diff --git a/src/EventStore.Core.Tests/Services/VNode/leader_info_provider.cs b/src/KurrentDB.Core.Tests/Services/VNode/leader_info_provider.cs
similarity index 90%
rename from src/EventStore.Core.Tests/Services/VNode/leader_info_provider.cs
rename to src/KurrentDB.Core.Tests/Services/VNode/leader_info_provider.cs
index 4fd3170dfed..b2626a70c0a 100644
--- a/src/EventStore.Core.Tests/Services/VNode/leader_info_provider.cs
+++ b/src/KurrentDB.Core.Tests/Services/VNode/leader_info_provider.cs
@@ -1,14 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-using EventStore.Common.Utils;
-using EventStore.Core.Cluster;
-using EventStore.Core.Data;
-using EventStore.Core.Services.VNode;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.VNode;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Services.VNode;
+namespace KurrentDB.Core.Tests.Services.VNode;
 
 [TestFixture]
 public class leader_info_provider {
@@ -147,20 +150,20 @@ public record Given(MemberInfo LeaderInfo, GossipAdvertiseInfo GossipInfo);
 	public record Expected(EndPoint TcpEndPoint, bool IsSecure, EndPoint HttpEndPoint);
 
 	public record LeaderInput(
-		string TcpEndPoint=null,
-		string SecureTcpEndPoint=null,
-		string HttpEndPoint=null,
-		int AdvertiseTcpPort=0,
-		int AdvertiseHttpPort=0,
-		string AdvertiseHost=null);
+		string TcpEndPoint = null,
+		string SecureTcpEndPoint = null,
+		string HttpEndPoint = null,
+		int AdvertiseTcpPort = 0,
+		int AdvertiseHttpPort = 0,
+		string AdvertiseHost = null);
 
 	public record GossipInput(
-		string TcpEndPoint=null,
-		string SecureTcpEndPoint=null,
-		string HttpEndPoint=null,
-		int AdvertiseTcpPort=0,
-		int AdvertiseHttpPort=0,
-		string AdvertiseHost=null);
+		string TcpEndPoint = null,
+		string SecureTcpEndPoint = null,
+		string HttpEndPoint = null,
+		int AdvertiseTcpPort = 0,
+		int AdvertiseHttpPort = 0,
+		string AdvertiseHost = null);
 
 	public record GivenInput(
 		LeaderInput Leader = null,
@@ -180,7 +183,7 @@ public MemberInfo BuildLeaderInfo() {
 				internalSecureTcpEndPoint: IPEndPoint.Parse("4.4.5.5:6"),
 				externalTcpEndPoint: Leader.TcpEndPoint == null ? null : IPEndPoint.Parse(Leader.TcpEndPoint),
 				externalSecureTcpEndPoint: Leader.SecureTcpEndPoint == null ? null : IPEndPoint.Parse(Leader.SecureTcpEndPoint),
-				httpEndPoint: IPEndPoint.Parse(Leader.HttpEndPoint ?? DefaultHttpEndPoint), 
+				httpEndPoint: IPEndPoint.Parse(Leader.HttpEndPoint ?? DefaultHttpEndPoint),
 				advertiseHostToClientAs: Leader.AdvertiseHost,
 				advertiseHttpPortToClientAs: Leader.AdvertiseHttpPort,
 				advertiseTcpPortToClientAs: Leader.AdvertiseTcpPort,
@@ -199,8 +202,8 @@ public GossipAdvertiseInfo BuildGossipInfo() {
 				internalTcp: new DnsEndPoint("internal.tcp", 1),
 				internalSecureTcp: new DnsEndPoint("secure.tcp", 2),
 				advertiseInternalHostAs: null,
-                advertiseExternalHostAs: null,
-                advertiseHttpPortAs: 0);
+				advertiseExternalHostAs: null,
+				advertiseHttpPortAs: 0);
 		}
 
 		public Given Build() {
@@ -210,7 +213,7 @@ public Given Build() {
 		}
 	}
 
-	public record ExpectedInput(string TcpEndPoint=null, string HttpEndPoint=null, bool IsTcpSecure=false) {
+	public record ExpectedInput(string TcpEndPoint = null, string HttpEndPoint = null, bool IsTcpSecure = false) {
 		public Expected Build() {
 			return new Expected(
 				ParseEndPoint(TcpEndPoint),
diff --git a/src/KurrentDB.Core.Tests/Services/VNode/subsystem_should.cs b/src/KurrentDB.Core.Tests/Services/VNode/subsystem_should.cs
new file mode 100644
index 00000000000..18b00a765c5
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/VNode/subsystem_should.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.Plugins;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.VNode;
+
+[TestFixture]
+public class subsystem_should : SpecificationWithDirectory {
+	[Test]
+	public async Task report_as_initialised_after_being_started_successfully() {
+		var tcs = new TaskCompletionSource();
+
+		await using var node = new MiniNode<LogFormat.V2, string>(PathName, subsystems: [new FakeSubSystem()]);
+		node.Node.MainBus.Subscribe(new AdHocHandler<SystemMessage.SystemReady>(t => {
+			tcs.TrySetResult();
+		}));
+
+		_ = node.Start();
+
+		// SystemReady is received after all subsystems have started.
+		await tcs.Task.WithTimeout(TimeSpan.FromSeconds(5));
+	}
+
+	class FakeSubSystem() : SubsystemsPlugin("FakeSubSystem");
+}
diff --git a/src/KurrentDB.Core.Tests/Services/VNode/vnode_fsm_should.cs b/src/KurrentDB.Core.Tests/Services/VNode/vnode_fsm_should.cs
new file mode 100644
index 00000000000..f98c35c3638
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Services/VNode/vnode_fsm_should.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using DotNext.Runtime;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.VNode;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Services.VNode;
+
+internal abstract class P : Message {
+}
+
+internal class A : P {
+}
+
+internal class B : P {
+}
+
+internal class C : Message {
+}
+
+[TestFixture]
+public class vnode_fsm_should {
+	[Test]
+	public async Task allow_ignoring_messages_by_common_ancestor() {
+		var fsm = new VNodeFSMBuilder(new ValueReference<VNodeState>(VNodeState.Leader))
+			.InAnyState()
+			.When<P>().Ignore()
+			.WhenOther().Do(x => Assert.Fail("{0} slipped through", x.GetType().Name))
+			.Build();
+
+		await fsm.HandleAsync(new A());
+		await fsm.HandleAsync(new B());
+	}
+
+	[Test]
+	public async Task handle_specific_message_even_if_base_message_is_ignored() {
+		bool aHandled = false;
+		var fsm = new VNodeFSMBuilder(new ValueReference<VNodeState>(VNodeState.Leader))
+			.InAnyState()
+			.When<P>().Ignore()
+			.When<A>().Do(x => aHandled = true)
+			.WhenOther().Do(x => Assert.Fail("{0} slipped through", x.GetType().Name))
+			.Build();
+
+		await fsm.HandleAsync(new A());
+		await fsm.HandleAsync(new B());
+
+		Assert.IsTrue(aHandled);
+	}
+
+	[Test]
+	public async Task ignore_base_handler_if_derived_message_published() {
+		var fsm = new VNodeFSMBuilder(new ValueReference<VNodeState>(VNodeState.Leader))
+			.InAnyState()
+			.When<P>()
+			.Do(x => Assert.Fail("shouldn't call this"))
+
+			.InState(VNodeState.Leader)
+			.When<A>()
+			.Ignore()
+			.Build();
+
+		await fsm.HandleAsync(new A());
+	}
+
+	[Test]
+	public async Task ignore_base_handler_if_derived_message_published_diff_reg_order() {
+		var fsm = new VNodeFSMBuilder(new ValueReference<VNodeState>(VNodeState.Leader))
+			.InState(VNodeState.Leader)
+			.When<A>()
+			.Ignore()
+
+			.InAnyState()
+			.When<P>()
+			.Do(x => Assert.Fail("shouldn't call this"))
+			.Build();
+
+		await fsm.HandleAsync(new A());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Settings/ReaderThreadCountCalculatorTests.cs b/src/KurrentDB.Core.Tests/Settings/ReaderThreadCountCalculatorTests.cs
new file mode 100644
index 00000000000..b3f4fa0f038
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Settings/ReaderThreadCountCalculatorTests.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Settings;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Settings;
+
+[TestFixture]
+public class ReaderThreadCountCalculatorTests {
+	[TestCase]
+	public void configured_takes_precedence() => Test(configuredCount: 1, processorCount: 4, isRunningInContainer: false, expected: 1);
+
+	[TestCase]
+	public void enforces_minimum() => Test(configuredCount: 0, processorCount: 1, isRunningInContainer: false, expected: 4);
+
+	[TestCase]
+	public void enforces_maximum() => Test(configuredCount: 0, processorCount: 20, isRunningInContainer: false, expected: 16);
+
+	[TestCase]
+	public void at_3_cores() => Test(configuredCount: 0, processorCount: 3, isRunningInContainer: false, expected: 6);
+
+	[TestCase]
+	public void at_4_cores() => Test(configuredCount: 0, processorCount: 4, isRunningInContainer: false, expected: 8);
+
+	[TestCase]
+	public void at_6_cores() => Test(configuredCount: 0, processorCount: 6, isRunningInContainer: false, expected: 12);
+
+	[TestCase]
+	public void running_in_docker_container_at_6_cores() => Test(configuredCount: 0, processorCount: 6, isRunningInContainer: true, expected: 4);
+
+	[TestCase]
+	public void running_in_docker_container_configured_takes_precedence() => Test(configuredCount: 1, processorCount: 4, isRunningInContainer: true, expected: 1);
+
+	public static void Test(int configuredCount, int processorCount, bool isRunningInContainer, int expected) =>
+		Assert.AreEqual(expected, ThreadCountCalculator.CalculateReaderThreadCount(configuredCount, processorCount, isRunningInContainer));
+}
diff --git a/src/KurrentDB.Core.Tests/Settings/WorkerThreadCountCalculatorTests.cs b/src/KurrentDB.Core.Tests/Settings/WorkerThreadCountCalculatorTests.cs
new file mode 100644
index 00000000000..a59d603f58a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Settings/WorkerThreadCountCalculatorTests.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Settings;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.Settings;
+
+[TestFixture]
+public class WorkerThreadCountCalculatorTests {
+	[TestCase]
+	public void configured_takes_precedence() => Test(configuredCount: 1, readerCount: 10, isRunningInContainer: false, expected: 1);
+
+	[TestCase]
+	public void enforces_minimum() => Test(configuredCount: 0, readerCount: 1, isRunningInContainer: false, expected: 5);
+
+	[TestCase]
+	public void enforces_maximum() => Test(configuredCount: 0, readerCount: 1000, isRunningInContainer: false, expected: 10);
+
+	[TestCase]
+	public void at_4_reader_threads() => Test(configuredCount: 0, readerCount: 4, isRunningInContainer: false, expected: 5);
+
+	[TestCase]
+	public void at_increased_reader_threads() => Test(configuredCount: 0, readerCount: 8, isRunningInContainer: false, expected: 10);
+
+	[TestCase]
+	public void running_in_docker_container_configured_takes_precedence() => Test(configuredCount: 1, readerCount: 4, isRunningInContainer: true, expected: 1);
+
+	[TestCase]
+	public void running_in_docker_container_at_4_reader_threads() => Test(configuredCount: 0, readerCount: 4, isRunningInContainer: true, expected: 5);
+
+	public static void Test(int configuredCount, int readerCount, bool isRunningInContainer, int expected) =>
+		Assert.AreEqual(expected, ThreadCountCalculator.CalculateWorkerThreadCount(configuredCount, readerCount, isRunningInContainer));
+
+}
diff --git a/src/KurrentDB.Core.Tests/SpecificationWithDirectory.cs b/src/KurrentDB.Core.Tests/SpecificationWithDirectory.cs
new file mode 100644
index 00000000000..ebec65c4d3f
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/SpecificationWithDirectory.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests;
+
+public class SpecificationWithDirectory {
+	protected string PathName;
+
+	protected string GetTempFilePath() {
+		return Path.Combine(PathName, string.Format("{0}-{1}", Guid.NewGuid(), GetType().FullName));
+	}
+
+	protected string GetFilePathFor(string fileName) {
+		return Path.Combine(PathName, fileName);
+	}
+
+	[SetUp]
+	public virtual Task SetUp() {
+		var typeName = GetType().Name.Length > 30 ? GetType().Name.Substring(0, 30) : GetType().Name;
+		PathName = Path.Combine(Path.GetTempPath(), string.Format("ES-{0}-{1}", Guid.NewGuid(), typeName));
+		Directory.CreateDirectory(PathName);
+
+		return Task.CompletedTask;
+	}
+
+	[TearDown]
+	public virtual async Task TearDown() {
+		// kill whole tree
+		await DirectoryDeleter.TryForceDeleteDirectoryAsync(PathName, retries: 10);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/SpecificationWithDirectoryPerTestFixture.cs b/src/KurrentDB.Core.Tests/SpecificationWithDirectoryPerTestFixture.cs
new file mode 100644
index 00000000000..ad8031ebe3b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/SpecificationWithDirectoryPerTestFixture.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests;
+
+public class SpecificationWithDirectoryPerTestFixture {
+	protected internal string PathName;
+
+	protected string GetTempFilePath() {
+		var typeName = GetType().Name.Length > 30 ? GetType().Name.Substring(0, 30) : GetType().Name;
+		return Path.Combine(PathName, string.Format("{0}-{1}", Guid.NewGuid(), typeName));
+	}
+
+	protected string GetFilePathFor(string fileName) {
+		return Path.Combine(PathName, fileName);
+	}
+
+	[OneTimeSetUp]
+	public virtual Task TestFixtureSetUp() {
+		ThreadPool.SetMinThreads(100, 1000);
+		var typeName = GetType().Name.Length > 30 ? GetType().Name.Substring(0, 30) : GetType().Name;
+		PathName = Path.Combine(Path.GetTempPath(), string.Format("ES-{0}-{1}", Guid.NewGuid(), typeName));
+		Directory.CreateDirectory(PathName);
+
+		return Task.CompletedTask;
+	}
+
+	[OneTimeTearDown]
+	public virtual async Task TestFixtureTearDown() {
+		// kill whole tree
+		await DirectoryDeleter.TryForceDeleteDirectoryAsync(PathName, retries: 10);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/SpecificationWithFile.cs b/src/KurrentDB.Core.Tests/SpecificationWithFile.cs
new file mode 100644
index 00000000000..6e6a8a7368d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/SpecificationWithFile.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests;
+
+public class SpecificationWithFile {
+	protected string Filename;
+
+	[SetUp]
+	public virtual Task SetUp() {
+		var typeName = GetType().Name.Length > 30 ? GetType().Name.Substring(0, 30) : GetType().Name;
+		Filename = Path.Combine(Path.GetTempPath(), string.Format("ES-{0}-{1}", Guid.NewGuid(), typeName));
+		return Task.CompletedTask;
+	}
+
+	[TearDown]
+	public virtual void TearDown() {
+		if (File.Exists(Filename))
+			File.Delete(Filename);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/SpecificationWithFilePerTestFixture.cs b/src/KurrentDB.Core.Tests/SpecificationWithFilePerTestFixture.cs
new file mode 100644
index 00000000000..8c19bc52eef
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/SpecificationWithFilePerTestFixture.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests;
+
+public class SpecificationWithFilePerTestFixture {
+	protected string Filename;
+
+	[OneTimeSetUp]
+	public virtual Task TestFixtureSetUp() {
+		var typeName = GetType().Name.Length > 30 ? GetType().Name.Substring(0, 30) : GetType().Name;
+		Filename = Path.Combine(Path.GetTempPath(), string.Format("ES-{0}-{1}", Guid.NewGuid(), typeName));
+		return Task.CompletedTask;
+	}
+
+	[OneTimeTearDown]
+	public virtual void TestFixtureTearDown() {
+		if (File.Exists(Filename))
+			File.Delete(Filename);
+	}
+}
diff --git a/src/EventStore.Core.Tests/Synchronization/SemaphoreSlimLockTests.cs b/src/KurrentDB.Core.Tests/Synchronization/SemaphoreSlimLockTests.cs
similarity index 83%
rename from src/EventStore.Core.Tests/Synchronization/SemaphoreSlimLockTests.cs
rename to src/KurrentDB.Core.Tests/Synchronization/SemaphoreSlimLockTests.cs
index 73613da8523..f7f51cec4b4 100644
--- a/src/EventStore.Core.Tests/Synchronization/SemaphoreSlimLockTests.cs
+++ b/src/KurrentDB.Core.Tests/Synchronization/SemaphoreSlimLockTests.cs
@@ -1,8 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
-using EventStore.Core.Synchronization;
+using KurrentDB.Core.Synchronization;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Synchronization;
+namespace KurrentDB.Core.Tests.Synchronization;
 
 [TestFixture]
 public class SemaphoreSlimLockTests {
diff --git a/src/KurrentDB.Core.Tests/TaskExtensions.cs b/src/KurrentDB.Core.Tests/TaskExtensions.cs
new file mode 100644
index 00000000000..3b41e93ce76
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TaskExtensions.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using DotNext;
+using static System.Threading.Timeout;
+
+namespace KurrentDB.Core.Tests;
+
+public static class TaskExtensions {
+	public static async Task WithTimeout(this Task task, TimeSpan timeout, Action onFail = null,
+		[CallerMemberName] string memberName = "", [CallerFilePath] string sourceFilePath = "",
+		[CallerLineNumber] int sourceLineNumber = 0) {
+		Debug.Assert(task is not null);
+
+		if (Debugger.IsAttached) {
+			timeout = InfiniteTimeSpan;
+		}
+
+		await task
+			.WaitAsync(timeout)
+			.ConfigureAwait(ConfigureAwaitOptions.SuppressThrowing | ConfigureAwaitOptions.ContinueOnCapturedContext);
+
+		if (!task.IsCompleted) {
+			onFail?.Invoke();
+			throw new TimeoutException($"Timed out waiting for task at: {memberName} {sourceFilePath}:{sourceLineNumber}");
+		}
+
+		await task;
+	}
+
+	public static Task WithTimeout(this Task task, int timeoutMs = 10000, Action onFail = null,
+		[CallerMemberName] string memberName = "", [CallerFilePath] string sourceFilePath = "",
+		[CallerLineNumber] int sourceLineNumber = 0)
+		=> WithTimeout(task, TimeSpan.FromMilliseconds(timeoutMs), onFail, memberName, sourceFilePath,
+			sourceLineNumber);
+
+	public static async Task<T> WithTimeout<T>(this Task<T> task, TimeSpan timeout, Action onFail = null,
+		[CallerMemberName] string memberName = "", [CallerFilePath] string sourceFilePath = "",
+		[CallerLineNumber] int sourceLineNumber = 0) {
+
+		if (Debugger.IsAttached) {
+			timeout = InfiniteTimeSpan;
+		}
+
+		await task.As<Task>()
+			.WaitAsync(timeout)
+			.ConfigureAwait(ConfigureAwaitOptions.SuppressThrowing | ConfigureAwaitOptions.ContinueOnCapturedContext);
+
+		if (!task.IsCompleted) {
+			onFail?.Invoke();
+			throw new TimeoutException(
+				$"Timed out waiting for task at: {memberName} {sourceFilePath}:{sourceLineNumber}");
+		}
+
+		return await task;
+	}
+
+	public static Task<T> WithTimeout<T>(this Task<T> task, int timeoutMs = 10000, Action onFail = null,
+		[CallerMemberName] string memberName = "", [CallerFilePath] string sourceFilePath = "",
+		[CallerLineNumber] int sourceLineNumber = 0)
+		=> WithTimeout<T>(task, TimeSpan.FromMilliseconds(timeoutMs), onFail, memberName, sourceFilePath,
+			sourceLineNumber);
+}
diff --git a/src/EventStore.Core.Tests/TcpApiTestPlugin/PublicTcpApiTestService.cs b/src/KurrentDB.Core.Tests/TcpApiTestPlugin/PublicTcpApiTestService.cs
similarity index 84%
rename from src/EventStore.Core.Tests/TcpApiTestPlugin/PublicTcpApiTestService.cs
rename to src/KurrentDB.Core.Tests/TcpApiTestPlugin/PublicTcpApiTestService.cs
index 9b978f411b1..3de8ba4dd78 100644
--- a/src/EventStore.Core.Tests/TcpApiTestPlugin/PublicTcpApiTestService.cs
+++ b/src/KurrentDB.Core.Tests/TcpApiTestPlugin/PublicTcpApiTestService.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 #nullable enable
 
 using System;
@@ -5,17 +8,16 @@
 using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
-using EventStore.Core;
-using EventStore.Core.Bus;
-using EventStore.Core.Certificates;
-using EventStore.Core.Messages;
-using EventStore.Core.Services;
-using EventStore.Core.Services.Transport.Tcp;
 using EventStore.Plugins.Authentication;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Certificates;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Transport.Tcp;
 using Microsoft.Extensions.Hosting;
 using Serilog;
 
-namespace EventStore.TcpUnitTestPlugin;
+namespace KurrentDB.Core.Tests.TcpApiTestPlugin;
 
 public class PublicTcpApiTestService : IHostedService {
 	static readonly ILogger Logger = Log.ForContext<PublicTcpApiTestService>();
@@ -33,9 +35,9 @@ public class PublicTcpApiTestService : IHostedService {
 	}
 
 	public static PublicTcpApiTestService Insecure(
-		TcpApiTestOptions options, 
+		TcpApiTestOptions options,
 		IAuthenticationProvider authProvider,
-		AuthorizationGateway authGateway, 
+		AuthorizationGateway authGateway,
 		StandardComponents components
 	) {
 		var endpoint = new IPEndPoint(IPAddress.Loopback, options.NodeTcpPort);
@@ -61,10 +63,10 @@ StandardComponents components
 	}
 
 	public static PublicTcpApiTestService Secure(
-		TcpApiTestOptions options, 
-		IAuthenticationProvider authProvider, 
-		AuthorizationGateway authGateway, 
-		StandardComponents components, 
+		TcpApiTestOptions options,
+		IAuthenticationProvider authProvider,
+		AuthorizationGateway authGateway,
+		StandardComponents components,
 		CertificateProvider? certificateProvider
 	) {
 		var endpoint = new IPEndPoint(IPAddress.Loopback, options.NodeTcpPort);
diff --git a/src/KurrentDB.Core.Tests/TcpApiTestPlugin/TcpApiTestOptions.cs b/src/KurrentDB.Core.Tests/TcpApiTestPlugin/TcpApiTestOptions.cs
new file mode 100644
index 00000000000..f480614df7d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TcpApiTestPlugin/TcpApiTestOptions.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Tests.TcpApiTestPlugin;
+
+public class TcpApiTestOptions {
+	public int NodeTcpPort { get; init; } = 1113;
+	public int NodeHeartbeatInterval { get; init; } = 2_000;
+	public int NodeHeartbeatTimeout { get; init; } = 1_000;
+	public int ConnectionPendingSendBytesThreshold { get; set; } = 10 * 1_024 * 1_024;
+	public int ConnectionQueueSizeThreshold { get; set; } = 50_000;
+	public int WriteTimeoutMs { get; set; } = 2_000;
+	public bool Insecure { get; init; } = false;
+}
diff --git a/src/KurrentDB.Core.Tests/TcpApiTestPlugin/TcpApiTestPlugin.cs b/src/KurrentDB.Core.Tests/TcpApiTestPlugin/TcpApiTestPlugin.cs
new file mode 100644
index 00000000000..e335cfedc17
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TcpApiTestPlugin/TcpApiTestPlugin.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.Plugins;
+using EventStore.Plugins.Authentication;
+using KurrentDB.Core.Certificates;
+using KurrentDB.Core.Configuration.Sources;
+using KurrentDB.Core.Services;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Serilog;
+
+namespace KurrentDB.Core.Tests.TcpApiTestPlugin;
+
+public class TcpApiTestPlugin() : SubsystemsPlugin(name: "TcpTestApi") {
+	static readonly ILogger Logger = Log.ForContext<TcpApiTestPlugin>();
+
+	public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) {
+		var options = configuration.GetSection($"{KurrentConfigurationKeys.Prefix}:TcpUnitTestPlugin").Get<TcpApiTestOptions>() ?? new();
+
+		services.AddHostedService<PublicTcpApiTestService>(serviceProvider => {
+			var components = serviceProvider.GetRequiredService<StandardComponents>();
+			var authGateway = serviceProvider.GetRequiredService<AuthorizationGateway>();
+			var authProvider = serviceProvider.GetRequiredService<IAuthenticationProvider>();
+
+			return options.Insecure
+				? PublicTcpApiTestService.Insecure(options, authProvider, authGateway, components)
+				: PublicTcpApiTestService.Secure(options, authProvider, authGateway, components, serviceProvider.GetService<CertificateProvider>());
+		});
+	}
+
+	public override Task Start() {
+		Logger.Debug("{Name}-{Version} test plugin is loaded", Name, Version);
+		return Task.CompletedTask;
+	}
+}
diff --git a/src/EventStore.Core.Tests/TestConfigs/invalid_format_config.yaml b/src/KurrentDB.Core.Tests/TestConfigs/invalid_format_config.yaml
similarity index 100%
rename from src/EventStore.Core.Tests/TestConfigs/invalid_format_config.yaml
rename to src/KurrentDB.Core.Tests/TestConfigs/invalid_format_config.yaml
diff --git a/src/EventStore.Core.Tests/TestConfigs/test_config.yaml b/src/KurrentDB.Core.Tests/TestConfigs/test_config.yaml
similarity index 100%
rename from src/EventStore.Core.Tests/TestConfigs/test_config.yaml
rename to src/KurrentDB.Core.Tests/TestConfigs/test_config.yaml
diff --git a/src/EventStore.Core.Tests/TestConfigs/test_config_with_incorrectly_cased_option.yaml b/src/KurrentDB.Core.Tests/TestConfigs/test_config_with_incorrectly_cased_option.yaml
similarity index 100%
rename from src/EventStore.Core.Tests/TestConfigs/test_config_with_incorrectly_cased_option.yaml
rename to src/KurrentDB.Core.Tests/TestConfigs/test_config_with_incorrectly_cased_option.yaml
diff --git a/src/EventStore.Core.Tests/TestConfigs/test_config_with_unknown_option.yaml b/src/KurrentDB.Core.Tests/TestConfigs/test_config_with_unknown_option.yaml
similarity index 100%
rename from src/EventStore.Core.Tests/TestConfigs/test_config_with_unknown_option.yaml
rename to src/KurrentDB.Core.Tests/TestConfigs/test_config_with_unknown_option.yaml
diff --git a/src/KurrentDB.Core.Tests/TestsInitFixture.cs b/src/KurrentDB.Core.Tests/TestsInitFixture.cs
new file mode 100644
index 00000000000..0334a1c653a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TestsInitFixture.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+using Serilog;
+using RuntimeInformation = System.Runtime.RuntimeInformation;
+
+namespace KurrentDB.Core.Tests;
+
+[SetUpFixture]
+public class TestsInitFixture {
+	[OneTimeSetUp]
+	public void SetUp() {
+		ServicePointManager.DefaultConnectionLimit = 1000;
+		LogEnvironmentInfo();
+	}
+
+	private void LogEnvironmentInfo() {
+		var log = Log.ForContext<TestsInitFixture>();
+
+		log.Information("\n{0,-25} {1} ({2}/{3}, {4})\n"
+				 + "{5,-25} {6} ({7})\n"
+				 + "{8,-25} {9} ({10}-bit)\n"
+				 + "{11,-25} {12}\n\n",
+			"ES VERSION:", VersionInfo.Version, VersionInfo.Edition, VersionInfo.CommitSha, VersionInfo.Timestamp,
+			"OS:", RuntimeInformation.OsPlatform, Environment.OSVersion,
+			"RUNTIME:", RuntimeInformation.RuntimeVersion, RuntimeInformation.RuntimeMode,
+			"GC:",
+			GC.MaxGeneration == 0
+				? "NON-GENERATION (PROBABLY BOEHM)"
+				: $"{GC.MaxGeneration + 1} GENERATIONS"
+			);
+	}
+
+	[OneTimeTearDown]
+	public void TearDown() {
+		var runCount = Math.Max(1, MiniNode<LogFormat.V2, string>.RunCount);
+		var msg = string.Format("Total running time of MiniNode (Log V2): {0} (mean {1})\n" +
+								"Total starting time of MiniNode (Log V2): {2} (mean {3})\n" +
+								"Total stopping time of MiniNode (Log V2): {4} (mean {5})\n" +
+								"Total run count (Log V2): {6}",
+			MiniNode<LogFormat.V2, string>.RunningTime.Elapsed, TimeSpan.FromTicks(MiniNode<LogFormat.V2, string>.RunningTime.Elapsed.Ticks / runCount),
+			MiniNode<LogFormat.V2, string>.StartingTime.Elapsed, TimeSpan.FromTicks(MiniNode<LogFormat.V2, string>.StartingTime.Elapsed.Ticks / runCount),
+			MiniNode<LogFormat.V2, string>.StoppingTime.Elapsed, TimeSpan.FromTicks(MiniNode<LogFormat.V2, string>.StoppingTime.Elapsed.Ticks / runCount),
+			MiniNode<LogFormat.V2, string>.RunCount);
+
+		Console.WriteLine(msg);
+		Console.WriteLine();
+
+		runCount = Math.Max(1, MiniNode<LogFormat.V3, long>.RunCount);
+		msg = string.Format("Total running time of MiniNode (Log V3): {0} (mean {1})\n" +
+								"Total starting time of MiniNode (Log V3): {2} (mean {3})\n" +
+								"Total stopping time of MiniNode (Log V3): {4} (mean {5})\n" +
+								"Total run count (Log V3): {6}",
+			MiniNode<LogFormat.V3, long>.RunningTime.Elapsed, TimeSpan.FromTicks(MiniNode<LogFormat.V3, long>.RunningTime.Elapsed.Ticks / runCount),
+			MiniNode<LogFormat.V3, long>.StartingTime.Elapsed, TimeSpan.FromTicks(MiniNode<LogFormat.V3, long>.StartingTime.Elapsed.Ticks / runCount),
+			MiniNode<LogFormat.V3, long>.StoppingTime.Elapsed, TimeSpan.FromTicks(MiniNode<LogFormat.V3, long>.StoppingTime.Elapsed.Ticks / runCount),
+			MiniNode<LogFormat.V3, long>.RunCount);
+
+		Console.WriteLine(msg);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/FakeReadIndex.cs b/src/KurrentDB.Core.Tests/TransactionLog/FakeReadIndex.cs
new file mode 100644
index 00000000000..93417e91466
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/FakeReadIndex.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+public class FakeReadIndex<TLogFormat, TStreamId> : IReadIndex<TStreamId> {
+	private readonly IMetastreamLookup<TStreamId> _metastreams;
+
+	public long LastIndexedPosition {
+		get { return 0; }
+	}
+
+	public IIndexWriter<TStreamId> IndexWriter {
+		get { throw new NotImplementedException(); }
+	}
+
+	private readonly Func<TStreamId, bool> _isStreamDeleted;
+
+	public FakeReadIndex(
+		Func<TStreamId, bool> isStreamDeleted,
+		IMetastreamLookup<TStreamId> metastreams) {
+
+		Ensure.NotNull(isStreamDeleted, "isStreamDeleted");
+		_isStreamDeleted = isStreamDeleted;
+		_metastreams = metastreams;
+	}
+
+	public void Init(long buildToPosition) {
+		throw new NotImplementedException();
+	}
+
+	public void Commit(CommitLogRecord record) {
+		throw new NotImplementedException();
+	}
+
+	public void Commit(IList<IPrepareLogRecord<TStreamId>> commitedPrepares) {
+		throw new NotImplementedException();
+	}
+
+	public ReadIndexStats GetStatistics() {
+		throw new NotImplementedException();
+	}
+
+	public ValueTask<IndexReadEventResult> ReadEvent(string streamName, TStreamId streamId, long eventNumber,
+		CancellationToken token)
+		=> ValueTask.FromException<IndexReadEventResult>(new NotImplementedException());
+
+	public ValueTask<IndexReadStreamResult> ReadStreamEventsBackward(string streamName, TStreamId streamId, long fromEventNumber, int maxCount, CancellationToken token)
+		=> ValueTask.FromException<IndexReadStreamResult>(new NotImplementedException());
+
+	public ValueTask<IndexReadStreamResult> ReadStreamEventsForward(string streamName, TStreamId streamId,
+		long fromEventNumber, int maxCount, CancellationToken token)
+		=> ValueTask.FromException<IndexReadStreamResult>(new NotImplementedException());
+
+	public ValueTask<IndexReadEventInfoResult> ReadEventInfo_KeepDuplicates(TStreamId streamId, long eventNumber, CancellationToken token)
+		=> ValueTask.FromException<IndexReadEventInfoResult>(new NotImplementedException());
+
+	public ValueTask<IndexReadEventInfoResult> ReadEventInfoForward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount,
+		long beforePosition, CancellationToken token)
+		=> ValueTask.FromException<IndexReadEventInfoResult>(new NotImplementedException());
+
+	public ValueTask<IndexReadEventInfoResult> ReadEventInfoForward_NoCollisions(ulong stream, long fromEventNumber, int maxCount, long beforePosition, CancellationToken token)
+		=> ValueTask.FromException<IndexReadEventInfoResult>(new NotImplementedException());
+
+	public ValueTask<IndexReadEventInfoResult> ReadEventInfoBackward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount,
+		long beforePosition, CancellationToken token)
+		=> ValueTask.FromException<IndexReadEventInfoResult>(new NotImplementedException());
+
+	public ValueTask<IndexReadEventInfoResult> ReadEventInfoBackward_NoCollisions(ulong stream, Func<ulong, TStreamId> getStreamId, long fromEventNumber,
+		int maxCount, long beforePosition, CancellationToken token)
+		=> ValueTask.FromException<IndexReadEventInfoResult>(new NotImplementedException());
+
+	public ValueTask<IndexReadAllResult> ReadAllEventsForward(TFPos pos, int maxCount, CancellationToken token)
+		=> ValueTask.FromException<IndexReadAllResult>(new NotImplementedException());
+
+	public ValueTask<IndexReadAllResult> ReadAllEventsBackward(TFPos pos, int maxCount, CancellationToken token)
+		=> ValueTask.FromException<IndexReadAllResult>(new NotImplementedException());
+
+	public ValueTask<IndexReadAllResult> ReadAllEventsForwardFiltered(TFPos pos, int maxCount, int maxSearchWindow,
+		IEventFilter eventFilter, CancellationToken token)
+		=> ValueTask.FromException<IndexReadAllResult>(new NotImplementedException());
+
+	public ValueTask<IndexReadAllResult> ReadAllEventsBackwardFiltered(TFPos pos, int maxCount, int maxSearchWindow,
+		IEventFilter eventFilter, CancellationToken token)
+		=> ValueTask.FromException<IndexReadAllResult>(new NotImplementedException());
+
+	public ValueTask<bool> IsStreamDeleted(TStreamId streamId, CancellationToken token) {
+		return new(_isStreamDeleted(streamId));
+	}
+
+	public ValueTask<long> GetStreamLastEventNumber(TStreamId streamId, CancellationToken token) {
+		if (_metastreams.IsMetaStream(streamId))
+			return GetStreamLastEventNumber(_metastreams.OriginalStreamOf(streamId), token);
+
+		return new(_isStreamDeleted(streamId) ? EventNumber.DeletedStream : 1000000);
+	}
+
+	public ValueTask<long> GetStreamLastEventNumber_KnownCollisions(TStreamId streamId, long beforePosition, CancellationToken token)
+		=> ValueTask.FromException<long>(new NotImplementedException());
+
+	public ValueTask<long> GetStreamLastEventNumber_NoCollisions(ulong stream, Func<ulong, TStreamId> getStreamId, long beforePosition, CancellationToken token)
+		=> ValueTask.FromException<long>(new NotImplementedException());
+
+	public ValueTask<StorageMessage.EffectiveAcl> GetEffectiveAcl(TStreamId streamId, CancellationToken token)
+		=> ValueTask.FromException<StorageMessage.EffectiveAcl>(new NotImplementedException());
+
+	public ValueTask<TStreamId> GetEventStreamIdByTransactionId(long transactionId, CancellationToken token)
+		=> ValueTask.FromException<TStreamId>(new NotImplementedException());
+
+	public StreamAccess CheckStreamAccess(TStreamId streamId, StreamAccessType streamAccessType, ClaimsPrincipal user) {
+		throw new NotImplementedException();
+	}
+
+	public ValueTask<StreamMetadata> GetStreamMetadata(TStreamId streamId, CancellationToken token)
+		=> ValueTask.FromException<StreamMetadata>(new NotImplementedException());
+
+	public TStreamId GetStreamId(string streamName) {
+		throw new NotImplementedException();
+	}
+
+	public ValueTask<string> GetStreamName(TStreamId streamId, CancellationToken token)
+		=> ValueTask.FromException<string>(new NotImplementedException());
+
+	public void Close() {
+		throw new NotImplementedException();
+	}
+
+	public void Dispose() {
+		throw new NotImplementedException();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/FlushTimeMeter.cs b/src/KurrentDB.Core.Tests/TransactionLog/FlushTimeMeter.cs
new file mode 100644
index 00000000000..abd7f7bfbfa
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/FlushTimeMeter.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using KurrentDB.Common.Utils;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class FlushTimeMeter : SpecificationWithFile {
+	[Test, Ignore("long running")]
+	public void Test() {
+		var rnd = new Random();
+		var sw = Stopwatch.StartNew();
+		var gw = Stopwatch.StartNew();
+		using (var fs = new FileStream(Filename, FileMode.OpenOrCreate)) {
+			const int iter = 1000;
+			for (int bytes = 100; bytes < 1000000; bytes *= 2) {
+				var arr = new byte[bytes];
+				rnd.NextBytes(arr);
+
+				TimeSpan min = TimeSpan.FromHours(1);
+				TimeSpan max = TimeSpan.Zero;
+
+				gw.Restart();
+				for (int i = 0; i < iter; ++i) {
+					fs.Write(arr, 0, arr.Length);
+
+					sw.Restart();
+					fs.FlushToDisk();
+					var elapsed = sw.Elapsed;
+
+					min = elapsed < min ? elapsed : min;
+					max = elapsed > max ? elapsed : max;
+				}
+
+				gw.Stop();
+
+				Console.WriteLine("{0} bytes, Min: {1}, Max: {2}, Avg: {3}",
+					bytes,
+					min,
+					max,
+					TimeSpan.FromTicks(gw.Elapsed.Ticks / iter));
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/Helpers/FakeTFScavengerLog.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/Helpers/FakeTFScavengerLog.cs
new file mode 100644
index 00000000000..b89908b5f52
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/Helpers/FakeTFScavengerLog.cs
@@ -0,0 +1,121 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.TransactionLog.Chunks;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+
+public class FakeTFScavengerLog : ITFChunkScavengerLog {
+	public string ScavengeId { get; } = "FakeScavenge";
+
+	public long SpaceSaved { get; } = 0;
+
+	public bool AlwaysKeepScavenged { get; private set; }
+	public bool MergeChunks { get; private set; }
+	public int StartFromChunk { get; private set; }
+	public int Threads { get; private set; }
+	public bool Started { get; private set; }
+
+	public bool Completed { get; private set; }
+
+	public string Error { get; private set; }
+
+	public ScavengeResult Result { get; private set; }
+
+	public event EventHandler<EventArgs> StartedCallback;
+	public event EventHandler<ScavengedLog> ChunkScavenged;
+	public event EventHandler<IndexScavengedLog> IndexScavenged;
+	public event EventHandler<EventArgs> CompletedCallback;
+
+	public IList<ScavengedLog> Scavenged { get; } = new List<ScavengedLog>();
+	public IList<ScavengedLog> Merged { get; } = new List<ScavengedLog>();
+	public IList<IndexScavengedLog> ScavengedIndices { get; } = new List<IndexScavengedLog>();
+
+	public void ScavengeStarted() {
+		Started = true;
+		StartedCallback?.Invoke(this, EventArgs.Empty);
+	}
+
+	public void ScavengeStarted(bool alwaysKeepScavenged, bool mergeChunks, int startFromChunk, int threads) {
+		AlwaysKeepScavenged = alwaysKeepScavenged;
+		MergeChunks = mergeChunks;
+		StartFromChunk = startFromChunk;
+		Threads = threads;
+		Started = true;
+		StartedCallback?.Invoke(this, EventArgs.Empty);
+	}
+
+	public void ChunksScavenged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, long spaceSaved) {
+		var scavengedLog = new ScavengedLog(chunkStartNumber, chunkEndNumber, true, "");
+		Scavenged.Add(scavengedLog);
+		ChunkScavenged?.Invoke(this, scavengedLog);
+	}
+
+	public void ChunksNotScavenged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed,
+		string errorMessage) {
+		var scavengedLog = new ScavengedLog(chunkStartNumber, chunkEndNumber, false, "");
+		Scavenged.Add(scavengedLog);
+		ChunkScavenged?.Invoke(this, scavengedLog);
+	}
+
+	public void ChunksMerged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, long spaceSaved) {
+		var scavengedLog = new ScavengedLog(chunkStartNumber, chunkEndNumber, true, "");
+		Merged.Add(scavengedLog);
+		ChunkScavenged?.Invoke(this, scavengedLog);
+	}
+
+	public void ChunksNotMerged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, string errorMessage) {
+		var scavengedLog = new ScavengedLog(chunkStartNumber, chunkEndNumber, false, "");
+		Merged.Add(scavengedLog);
+		ChunkScavenged?.Invoke(this, scavengedLog);
+	}
+
+	public void IndexTableScavenged(int level, int index, TimeSpan elapsed, long entriesDeleted, long entriesKept,
+		long spaceSaved) {
+		var indexScavenged = new IndexScavengedLog(true, null, entriesDeleted);
+		ScavengedIndices.Add(indexScavenged);
+		IndexScavenged?.Invoke(this, indexScavenged);
+	}
+
+	public void IndexTableNotScavenged(int level, int index, TimeSpan elapsed, long entriesKept,
+		string errorMessage) {
+		var indexScavenged = new IndexScavengedLog(false, errorMessage, 0);
+		ScavengedIndices.Add(indexScavenged);
+		IndexScavenged?.Invoke(this, indexScavenged);
+	}
+
+	public void ScavengeCompleted(ScavengeResult result, string error, TimeSpan elapsed) {
+		Completed = true;
+		Result = result;
+		Error = error;
+		CompletedCallback?.Invoke(this, EventArgs.Empty);
+	}
+
+	public class ScavengedLog {
+		public int ChunkStart { get; }
+		public int ChunkEnd { get; }
+		public bool Scavenged { get; }
+		public string Error { get; }
+
+		public ScavengedLog(int chunkStart, int chunkEnd, bool scavenged, string error) {
+			ChunkStart = chunkStart;
+			ChunkEnd = chunkEnd;
+			Scavenged = scavenged;
+			Error = error;
+		}
+	}
+
+	public class IndexScavengedLog {
+		public bool Scavenged { get; }
+		public string Error { get; }
+		public long EntriesDeleted { get; }
+
+		public IndexScavengedLog(bool scavenged, string error, long entriesDeleted) {
+			Scavenged = scavenged;
+			Error = error;
+			EntriesDeleted = entriesDeleted;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/Helpers/ScavengeLifeCycleScenario.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/Helpers/ScavengeLifeCycleScenario.cs
new file mode 100644
index 00000000000..3b9bd92ca15
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/Helpers/ScavengeLifeCycleScenario.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Tests.Services.Storage;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+
+[TestFixture]
+abstract public class ScavengeLifeCycleScenario<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	protected TFChunkDb Db {
+		get { return _dbResult.Db; }
+	}
+
+	private DbResult _dbResult;
+	protected TFChunkScavenger<TStreamId> TfChunkScavenger;
+	protected FakeTFScavengerLog Log;
+	protected FakeTableIndex<TStreamId> FakeTableIndex;
+	protected LogFormatAbstractor<TStreamId> _logFormat;
+
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var indexDirectory = GetFilePathFor("index");
+		_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
+			IndexDirectory = indexDirectory,
+		});
+
+		var dbConfig = TFChunkHelper.CreateSizedDbConfig(PathName, 0, chunkSize: 1024 * 1024);
+		var dbCreationHelper = await TFChunkDbCreationHelper<TLogFormat, TStreamId>.CreateAsync(dbConfig, _logFormat, token: CancellationToken.None);
+
+		_dbResult = await dbCreationHelper
+			.Chunk().CompleteLastChunk()
+			.Chunk().CompleteLastChunk()
+			.Chunk()
+			.CreateDb(commit: true);
+
+		_dbResult.Db.Config.WriterCheckpoint.Flush();
+		_dbResult.Db.Config.ChaserCheckpoint.Write(_dbResult.Db.Config.WriterCheckpoint.Read());
+		_dbResult.Db.Config.ChaserCheckpoint.Flush();
+
+		Log = new FakeTFScavengerLog();
+		FakeTableIndex = new FakeTableIndex<TStreamId>();
+		TfChunkScavenger = new TFChunkScavenger<TStreamId>(Serilog.Log.Logger, _dbResult.Db, Log, FakeTableIndex, new FakeReadIndex<TLogFormat, TStreamId>(_ => false, _logFormat.Metastreams),
+			_logFormat.Metastreams);
+
+		try {
+			await When().WithTimeout(TimeSpan.FromMinutes(1));
+		} catch (Exception ex) {
+			throw new Exception("When Failed", ex);
+		}
+	}
+
+	public override async Task TestFixtureTearDown() {
+		_logFormat?.Dispose();
+		await _dbResult.Db.DisposeAsync();
+
+		await base.TestFixtureTearDown();
+	}
+
+	protected abstract Task When();
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/Helpers/ScavengeTestScenario.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/Helpers/ScavengeTestScenario.cs
new file mode 100644
index 00000000000..6ed7f26f14a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/Helpers/ScavengeTestScenario.cs
@@ -0,0 +1,140 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.Util;
+using NUnit.Framework;
+using Serilog;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+
+[TestFixture]
+public abstract class ScavengeTestScenario<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	protected IReadIndex<TStreamId> ReadIndex;
+
+	protected TFChunkDb Db {
+		get { return _dbResult.Db; }
+	}
+
+	private readonly int _metastreamMaxCount;
+	private DbResult _dbResult;
+	private ILogRecord[][] _keptRecords;
+	private bool _checked;
+	private LogFormatAbstractor<TStreamId> _logFormat;
+
+	protected virtual bool UnsafeIgnoreHardDelete() {
+		return false;
+	}
+
+	protected ScavengeTestScenario(int metastreamMaxCount = 1) {
+		_metastreamMaxCount = metastreamMaxCount;
+	}
+
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var indexDirectory = GetFilePathFor("index");
+		_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
+			IndexDirectory = indexDirectory,
+		});
+
+		var dbConfig = TFChunkHelper.CreateSizedDbConfig(PathName, 0, chunkSize: 1024 * 1024);
+		var dbCreationHelper = await TFChunkDbCreationHelper<TLogFormat, TStreamId>.CreateAsync(dbConfig, _logFormat);
+		_dbResult = await CreateDb(dbCreationHelper, CancellationToken.None);
+		_keptRecords = KeptRecords(_dbResult);
+
+		_dbResult.Db.Config.WriterCheckpoint.Flush();
+		_dbResult.Db.Config.ChaserCheckpoint.Write(_dbResult.Db.Config.WriterCheckpoint.Read());
+		_dbResult.Db.Config.ChaserCheckpoint.Flush();
+
+		var readerPool = new ObjectPool<ITransactionFileReader>(
+			"ReadIndex readers pool", Constants.PTableInitialReaderCount, Constants.PTableMaxReaderCountDefault,
+			() => new TFChunkReader(_dbResult.Db, _dbResult.Db.Config.WriterCheckpoint));
+		var lowHasher = _logFormat.LowHasher;
+		var highHasher = _logFormat.HighHasher;
+		var emptyStreamId = _logFormat.EmptyStreamId;
+		var tableIndex = new TableIndex<TStreamId>(indexDirectory, lowHasher, highHasher, emptyStreamId,
+			() => new HashListMemTable(PTableVersions.IndexV3, maxSize: 200),
+			() => new TFReaderLease(readerPool),
+			PTableVersions.IndexV3,
+			5, Constants.PTableMaxReaderCountDefault,
+			maxSizeForMemory: 100,
+			maxTablesPerLevel: 2);
+		_logFormat.StreamNamesProvider.SetTableIndex(tableIndex);
+		var readIndex = new ReadIndex<TStreamId>(new NoopPublisher(), readerPool, tableIndex,
+			_logFormat.StreamNameIndexConfirmer,
+			_logFormat.StreamIds,
+			_logFormat.StreamNamesProvider,
+			_logFormat.EmptyStreamId,
+			_logFormat.StreamIdValidator,
+			_logFormat.StreamIdSizer,
+			_logFormat.StreamExistenceFilter,
+			_logFormat.StreamExistenceFilterReader,
+			_logFormat.EventTypeIndexConfirmer,
+			new LRUCache<TStreamId, IndexBackend<TStreamId>.EventNumberCached>("LastEventNumber", 100),
+			new LRUCache<TStreamId, IndexBackend<TStreamId>.MetadataCached>("StreamMetadata", 100),
+			true, _metastreamMaxCount,
+			Opts.HashCollisionReadLimitDefault, Opts.SkipIndexScanOnReadsDefault,
+			_dbResult.Db.Config.ReplicationCheckpoint, _dbResult.Db.Config.IndexCheckpoint,
+			new IndexStatusTracker.NoOp(),
+			new IndexTracker.NoOp(),
+			new CacheHitsMissesTracker.NoOp());
+		await readIndex.IndexCommitter.Init(_dbResult.Db.Config.WriterCheckpoint.Read(), CancellationToken.None);
+		ReadIndex = readIndex;
+
+		var scavenger = new TFChunkScavenger<TStreamId>(Log.Logger, _dbResult.Db, new FakeTFScavengerLog(), tableIndex, ReadIndex,
+			_logFormat.Metastreams,
+			unsafeIgnoreHardDeletes: UnsafeIgnoreHardDelete());
+		await scavenger.Scavenge(alwaysKeepScavenged: true, mergeChunks: false);
+	}
+
+	public override async Task TestFixtureTearDown() {
+		_logFormat?.Dispose();
+		ReadIndex.Close();
+		await _dbResult.Db.DisposeAsync();
+
+		await base.TestFixtureTearDown();
+
+		if (!_checked)
+			throw new Exception("Records were not checked. Probably you forgot to call CheckRecords() method.");
+	}
+
+	protected abstract ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token);
+
+	protected abstract ILogRecord[][] KeptRecords(DbResult dbResult);
+
+	protected async Task CheckRecords(CancellationToken token = default) {
+		_checked = true;
+		Assert.AreEqual(_keptRecords.Length, _dbResult.Db.Manager.ChunksCount, "Wrong chunks count.");
+
+		for (int i = 0; i < _keptRecords.Length; ++i) {
+			var chunk = await _dbResult.Db.Manager.GetInitializedChunk(i, token);
+
+			var chunkRecords = new List<ILogRecord>();
+			RecordReadResult result = await chunk.TryReadFirst(token);
+			while (result.Success) {
+				chunkRecords.Add(result.LogRecord);
+				result = await chunk.TryReadClosestForward((int)result.NextPosition, CancellationToken.None);
+			}
+
+			Assert.AreEqual(_keptRecords[i].Length, chunkRecords.Count, "Wrong number of records in chunk #{0}", i);
+
+			for (int j = 0; j < _keptRecords[i].Length; ++j) {
+				Assert.AreEqual(_keptRecords[i][j], chunkRecords[j], "Wrong log record #{0} read from chunk #{1}",
+					j, i);
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/Helpers/TFChunkDbCreationHelper.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/Helpers/TFChunkDbCreationHelper.cs
new file mode 100644
index 00000000000..0eeadd11687
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/Helpers/TFChunkDbCreationHelper.cs
@@ -0,0 +1,558 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+
+public class TFChunkDbCreationHelper<TLogFormat, TStreamId> {
+	private static EqualityComparer<TStreamId> StreamIdComparer { get; } = EqualityComparer<TStreamId>.Default;
+
+	private readonly TFChunkDbConfig _dbConfig;
+	private readonly TFChunkDb _db;
+
+	private readonly List<Rec[]> _chunkRecs = [];
+	private readonly HashSet<int> _remoteChunks = [];
+
+	private bool _completeLast;
+
+	private readonly LogFormatAbstractor<TStreamId> _logFormat;
+	private readonly TStreamId _scavengePointEventTypeId;
+
+	private TFChunkDbCreationHelper(TFChunkDbConfig dbConfig, LogFormatAbstractor<TStreamId> logFormat,
+		IChunkFileSystem fileSystem = null) {
+
+		Ensure.NotNull(dbConfig, "dbConfig");
+
+		_dbConfig = dbConfig;
+		_logFormat = logFormat;
+		_scavengePointEventTypeId = logFormat.EventTypeIndex.GetExisting(SystemEventTypes.ScavengePoint);
+
+		_db = new TFChunkDb(_dbConfig, fileSystem: fileSystem);
+	}
+
+	public static async ValueTask<TFChunkDbCreationHelper<TLogFormat, TStreamId>> CreateAsync(
+		TFChunkDbConfig dbConfig,
+		LogFormatAbstractor<TStreamId> logFormat,
+		IChunkFileSystem fileSystem = null,
+		CancellationToken token = default) {
+
+		var result = new TFChunkDbCreationHelper<TLogFormat, TStreamId>(dbConfig, logFormat, fileSystem);
+
+		await result._db.Open(token: token);
+
+		if (result._db.Config.WriterCheckpoint.ReadNonFlushed() > 0)
+			throw new Exception("The DB already contains some data.");
+
+		return result;
+	}
+
+	public TFChunkDbCreationHelper<TLogFormat, TStreamId> Chunk(params Rec[] records) {
+		_chunkRecs.Add(records);
+		return this;
+	}
+
+	public TFChunkDbCreationHelper<TLogFormat, TStreamId> RemoteChunk(params Rec[] records) {
+		_remoteChunks.Add(_chunkRecs.Count);
+		_chunkRecs.Add(records);
+		return this;
+	}
+
+	public TFChunkDbCreationHelper<TLogFormat, TStreamId> CompleteLastChunk() {
+		_completeLast = true;
+		return this;
+	}
+
+	public async ValueTask<DbResult> CreateDb(bool commit = false, CancellationToken token = default) {
+		var records = new List<ILogRecord>[_chunkRecs.Count];
+		for (int i = 0; i < records.Length; ++i) {
+			records[i] = new();
+		}
+
+		var transactions = new Dictionary<int, TransactionInfo>();
+		var streams = new Dictionary<string, StreamInfo>();
+		var streamUncommitedVersion = new Dictionary<string, long>();
+
+		// for each chunk i
+		for (int i = 0; i < _chunkRecs.Count; ++i) {
+			// for each record j in chunk i
+			for (int j = 0; j < _chunkRecs[i].Length; ++j) {
+				var rec = _chunkRecs[i][j];
+
+				TransactionInfo transInfo;
+				bool transCreate = transactions.TryGetValue(rec.Transaction, out transInfo);
+				if (!transCreate) {
+					if (rec.Type == Rec.RecType.Commit)
+						throw new Exception("Commit for non-existing transaction.");
+
+					transactions[rec.Transaction] = transInfo = new TransactionInfo(rec.StreamId, rec.Id, rec.Id);
+
+					streams[rec.StreamId] = new StreamInfo(-1);
+					streamUncommitedVersion[rec.StreamId] = -1;
+				} else {
+					if (rec.Type == Rec.RecType.TransStart)
+						throw new Exception(string.Format("Unexpected record type: {0}.", rec.Type));
+				}
+
+				if (transInfo.StreamId != rec.StreamId) {
+					throw new Exception(string.Format(
+						"Wrong stream id for transaction. Transaction StreamId: {0}, record StreamId: {1}.",
+						transInfo.StreamId,
+						rec.StreamId));
+				}
+
+				if (rec.Type != Rec.RecType.Commit && transInfo.IsDelete)
+					throw new Exception("Transaction with records after delete record.");
+
+				if (rec.Type == Rec.RecType.Delete)
+					transInfo.IsDelete = true;
+
+				transInfo.LastPrepareId = rec.Id;
+			}
+		}
+
+		long logPos = 0;
+
+		// convert the Recs into LogRecords and write them to the database.
+		// for each chunk i
+		for (int i = 0; i < _chunkRecs.Count; ++i) {
+			var chunk = await (i is 0
+				? _db.Manager.GetInitializedChunk(0, token)
+				: _db.Manager.AddNewChunk(token));
+			logPos = i * (long)_db.Config.ChunkSize;
+
+			var completedChunk = false;
+			// for each record j in chunk i
+			for (int j = 0; j < _chunkRecs[i].Length; ++j) {
+				if (completedChunk)
+					throw new InvalidOperationException("Don't try to write more data to completed chunk");
+				var rec = _chunkRecs[i][j];
+				var transInfo = transactions[rec.Transaction];
+
+				_logFormat.StreamNameIndex.GetOrReserve(_logFormat.RecordFactory, rec.StreamId, logPos, out var streamNumber, out var streamRecord);
+				if (streamRecord != null) {
+					logPos = await Write(i, chunk, streamRecord, false, token);
+					records[i].Add(streamRecord);
+				}
+
+				_logFormat.EventTypeIndex.GetOrReserveEventType(_logFormat.RecordFactory, rec.EventType, logPos, out var eventTypeNumber, out var eventTypeRecord);
+				if (eventTypeRecord != null) {
+					logPos = await Write(i, chunk, eventTypeRecord, false, token);
+					records[i].Add(eventTypeRecord);
+				}
+
+				long streamVersion = streamUncommitedVersion[rec.StreamId];
+
+				if (rec.EventNumber.HasValue && rec.EventNumber > streamVersion + 1) {
+					// advance the stream
+					streamVersion = rec.EventNumber.Value - 1;
+					streamUncommitedVersion[rec.StreamId] = streamVersion;
+				}
+
+				if (streamVersion == -1
+					&& rec.Type != Rec.RecType.TransStart
+					&& rec.Type != Rec.RecType.Prepare
+					&& rec.Type != Rec.RecType.Delete) {
+					throw new Exception(string.Format("Stream {0} is empty.", rec.StreamId));
+				}
+
+				if (streamVersion == EventNumber.DeletedStream && rec.Type != Rec.RecType.Commit)
+					throw new Exception(string.Format(
+						"Stream {0} was deleted, but we need to write some more prepares.", rec.StreamId));
+
+				if (transInfo.FirstPrepareId == rec.Id) {
+					transInfo.TransactionPosition = logPos;
+					transInfo.TransactionEventNumber = streamVersion + 1;
+					transInfo.TransactionOffset = 0;
+				}
+
+				ILogRecord record;
+
+				var logFormatDefaultExpectedVersion = LogFormatHelper<TLogFormat, TStreamId>.IsV2
+					? ExpectedVersion.Any // V2 transaction writes have expected version: -2, event number: -1
+					: ExpectedVersion.NoStream; // V3 doesn't have transactions so cant have a negative event number
+
+				var expectedVersion =
+				  (rec.EventNumber - 1) ??
+				  (transInfo.FirstPrepareId == rec.Id ? streamVersion : logFormatDefaultExpectedVersion);
+
+				switch (rec.Type) {
+					case Rec.RecType.Prepare: {
+						record = CreateLogRecord(rec, streamNumber, eventTypeNumber, transInfo, logPos, expectedVersion);
+
+						if (SystemStreams.IsMetastream(rec.StreamId))
+							transInfo.StreamMetadata = rec.Metadata;
+
+						streamUncommitedVersion[rec.StreamId] += 1;
+						break;
+					}
+
+					case Rec.RecType.Delete: {
+						if (rec.PrepareFlags.HasAnyOf(PrepareFlags.IsCommitted)) {
+							// modern style tombstone has IsCommitted flag and max event number.
+							// introduced in 19f7cd351329f7bd2be0f6c00b4beee45e2a4777
+							expectedVersion = rec.Version == LogRecordVersion.LogRecordV0
+								? int.MaxValue - 1
+								: EventNumber.DeletedStream - 1;
+						} else {
+							// legacy style tombstone has 'normal' expected version in the log record
+							// (probably -1 because it is committed separately)
+							// a subsequent commit record to commit it
+							// special handling in indexcommitter to give it a max event number in
+							// the index.
+						}
+
+						record = CreateLogRecord(rec, streamNumber, eventTypeNumber, transInfo, logPos, expectedVersion);
+
+						streamUncommitedVersion[rec.StreamId] = rec.Version == LogRecordVersion.LogRecordV0
+							? int.MaxValue
+							: EventNumber.DeletedStream;
+						break;
+					}
+
+					case Rec.RecType.TransStart:
+					case Rec.RecType.TransEnd: {
+						record = CreateLogRecord(rec, streamNumber, eventTypeNumber, transInfo, logPos, expectedVersion);
+						break;
+					}
+					case Rec.RecType.Commit: {
+						record = CreateLogRecord(rec, streamNumber, eventTypeNumber, transInfo, logPos, expectedVersion);
+
+						if (transInfo.StreamMetadata != null) {
+							var streamId = SystemStreams.OriginalStreamOf(rec.StreamId);
+							if (!streams.ContainsKey(streamId))
+								streams.Add(streamId, new StreamInfo(-1));
+							streams[streamId].StreamMetadata = transInfo.StreamMetadata;
+						}
+
+						if (transInfo.IsDelete)
+							streams[rec.StreamId].StreamVersion = EventNumber.DeletedStream;
+						else
+							streams[rec.StreamId].StreamVersion =
+								transInfo.TransactionEventNumber + transInfo.TransactionOffset - 1;
+						break;
+					}
+					default:
+						throw new ArgumentOutOfRangeException();
+				}
+
+				logPos = await Write(i, chunk, record, rec.CommitWrite, token);
+				records[i].Add(record);
+				if (record is IPrepareLogRecord<TStreamId> prepare &&
+					StreamIdComparer.Equals(prepare.EventType, _scavengePointEventTypeId)) {
+					await chunk.Complete(token);
+					completedChunk = true;
+				}
+			}
+
+			if (!completedChunk) {
+				if (i < _chunkRecs.Count - 1 || (_completeLast && i == _chunkRecs.Count - 1)) {
+					await chunk.Complete(token);
+				} else {
+					await chunk.Flush(token);
+				}
+			}
+		}
+
+		if (commit)
+			_db.Config.WriterCheckpoint.Write(logPos);
+
+		_db.Config.WriterCheckpoint.Flush();
+		return new DbResult(_db, records.Select(rs => rs.ToArray()).ToArray(), _remoteChunks, streams);
+	}
+
+	async ValueTask<long> Write(int chunkNum, TFChunk chunk, ILogRecord record, bool commitWrite, CancellationToken token) {
+		var writerRes = await chunk.TryAppend(record, token);
+		if (!writerRes.Success)
+			throw new Exception(string.Format("Could not write log record: {0}", record));
+
+		var newPos = chunkNum * (long)_db.Config.ChunkSize + writerRes.NewPosition;
+
+		if (commitWrite)
+			_db.Config.WriterCheckpoint.Write(newPos);
+
+		return newPos;
+	}
+
+	private byte[] FormatData(Rec rec) {
+		return rec.Data ?? rec.Metadata?.ToJsonBytes() ?? rec.Id.ToByteArray();
+	}
+
+	private ILogRecord CreateLogRecord(Rec rec, TStreamId streamId, TStreamId eventTypeId, TransactionInfo transInfo, long logPos, long expectedVersion) {
+		switch (rec.Type) {
+			case Rec.RecType.Prepare: {
+				int transOffset = transInfo.TransactionOffset;
+				transInfo.TransactionOffset += 1;
+
+				if (rec.Version == LogRecordVersion.LogRecordV0) {
+					return CreateLogRecordV0(rec, transInfo, transOffset, logPos, expectedVersion,
+						FormatData(rec),
+						rec.PrepareFlags
+						| PrepareFlags.Data
+						| (transInfo.FirstPrepareId == rec.Id ? PrepareFlags.TransactionBegin : PrepareFlags.None)
+						| (transInfo.LastPrepareId == rec.Id ? PrepareFlags.TransactionEnd : PrepareFlags.None)
+						| (rec.Metadata == null ? PrepareFlags.None : PrepareFlags.IsJson));
+				}
+
+				return LogRecord.Prepare(_logFormat.RecordFactory, logPos,
+					Guid.NewGuid(),
+					rec.Id,
+					transInfo.TransactionPosition,
+					transOffset,
+					streamId,
+					expectedVersion,
+					rec.PrepareFlags
+					| (transInfo.FirstPrepareId == rec.Id ? PrepareFlags.TransactionBegin : PrepareFlags.None)
+					| (transInfo.LastPrepareId == rec.Id ? PrepareFlags.TransactionEnd : PrepareFlags.None)
+					| (rec.Metadata == null ? PrepareFlags.None : PrepareFlags.IsJson),
+					eventTypeId,
+					FormatData(rec),
+					null,
+					rec.TimeStamp);
+			}
+
+			case Rec.RecType.Delete: {
+				int transOffset = transInfo.TransactionOffset;
+				transInfo.TransactionOffset += 1;
+
+				if (rec.Version == LogRecordVersion.LogRecordV0) {
+					return CreateLogRecordV0(rec, transInfo, transOffset, logPos, expectedVersion,
+						LogRecord.NoData,
+						rec.PrepareFlags
+						| PrepareFlags.StreamDelete
+						| (transInfo.FirstPrepareId == rec.Id ? PrepareFlags.TransactionBegin : PrepareFlags.None)
+						| (transInfo.LastPrepareId == rec.Id ? PrepareFlags.TransactionEnd : PrepareFlags.None));
+				}
+
+				return LogRecord.Prepare(_logFormat.RecordFactory, logPos,
+					Guid.NewGuid(),
+					rec.Id,
+					transInfo.TransactionPosition,
+					transOffset,
+					streamId,
+					expectedVersion,
+					rec.PrepareFlags
+					| PrepareFlags.StreamDelete
+					| (transInfo.FirstPrepareId == rec.Id ? PrepareFlags.TransactionBegin : PrepareFlags.None)
+					| (transInfo.LastPrepareId == rec.Id ? PrepareFlags.TransactionEnd : PrepareFlags.None),
+					eventTypeId,
+					LogRecord.NoData,
+					null,
+					rec.TimeStamp);
+			}
+
+			case Rec.RecType.TransStart:
+			case Rec.RecType.TransEnd: {
+				if (rec.Version == LogRecordVersion.LogRecordV0) {
+					return CreateLogRecordV0(rec, transInfo, -1, logPos, expectedVersion,
+						LogRecord.NoData,
+						(transInfo.FirstPrepareId == rec.Id ? PrepareFlags.TransactionBegin : PrepareFlags.None)
+						| (transInfo.LastPrepareId == rec.Id ? PrepareFlags.TransactionEnd : PrepareFlags.None));
+				}
+
+				return LogRecord.Prepare(_logFormat.RecordFactory, logPos,
+					Guid.NewGuid(),
+					rec.Id,
+					transInfo.TransactionPosition,
+					-1,
+					streamId,
+					expectedVersion,
+					(transInfo.FirstPrepareId == rec.Id ? PrepareFlags.TransactionBegin : PrepareFlags.None)
+					| (transInfo.LastPrepareId == rec.Id ? PrepareFlags.TransactionEnd : PrepareFlags.None),
+					eventTypeId,
+					LogRecord.NoData,
+					null,
+					rec.TimeStamp);
+			}
+			case Rec.RecType.Commit: {
+				if (rec.Version == LogRecordVersion.LogRecordV0) {
+					return new CommitLogRecord(logPos, Guid.NewGuid(), transInfo.TransactionPosition,
+						DateTime.UtcNow, transInfo.TransactionEventNumber, LogRecordVersion.LogRecordV0);
+				}
+
+				return LogRecord.Commit(logPos, Guid.NewGuid(), transInfo.TransactionPosition,
+					transInfo.TransactionEventNumber);
+			}
+			default:
+				throw new ArgumentOutOfRangeException();
+		}
+	}
+
+	private LogRecord CreateLogRecordV0(Rec rec, TransactionInfo transInfo, int transOffset, long logPos,
+		long expectedVersion, ReadOnlyMemory<byte> data, PrepareFlags flags) {
+
+		LogFormatHelper<TLogFormat, TStreamId>.EnsureV0PrepareSupported();
+
+		return new PrepareLogRecord(logPos,
+			Guid.NewGuid(),
+			rec.Id,
+			transInfo.TransactionPosition,
+			transOffset,
+			rec.StreamId,
+			null,
+			expectedVersion,
+			rec.TimeStamp,
+			flags,
+			rec.EventType,
+			null,
+			data,
+			null,
+			LogRecordVersion.LogRecordV0);
+	}
+}
+
+public class TransactionInfo {
+	public readonly string StreamId;
+	public readonly Guid FirstPrepareId;
+	public Guid LastPrepareId;
+	public long TransactionPosition = -1;
+	public int TransactionOffset = 0;
+	public long TransactionEventNumber = -1;
+	public bool IsDelete = false;
+	public StreamMetadata StreamMetadata;
+
+	public TransactionInfo(string streamId, Guid firstPrepareId, Guid lastPrepareId) {
+		StreamId = streamId;
+		FirstPrepareId = firstPrepareId;
+		LastPrepareId = lastPrepareId;
+	}
+}
+
+public class StreamInfo {
+	public long StreamVersion;
+	public StreamMetadata StreamMetadata;
+
+	public StreamInfo(long streamVersion) {
+		StreamVersion = streamVersion;
+	}
+}
+
+public sealed class DbResult : IAsyncDisposable {
+	public TFChunkDb Db { get; }
+	public ILogRecord[][] Recs { get; }
+	public HashSet<int> RemoteChunks { get; }
+	public Dictionary<string, StreamInfo> Streams { get; }
+
+	public DbResult(TFChunkDb db, ILogRecord[][] recs,
+		HashSet<int> remoteChunks,
+		Dictionary<string, StreamInfo> streams) {
+
+		Ensure.NotNull(db, "db");
+		Ensure.NotNull(recs, "recs");
+		Ensure.NotNull(remoteChunks, nameof(remoteChunks));
+		Ensure.NotNull(streams, "streams");
+
+		Db = db;
+		Recs = recs;
+		RemoteChunks = remoteChunks;
+		Streams = streams;
+	}
+
+	public async ValueTask DisposeAsync() {
+		await Db.DisposeAsync();
+	}
+}
+
+public class Rec {
+	public enum RecType {
+		Prepare,
+		Delete,
+		TransStart,
+		TransEnd,
+		Commit
+	}
+
+	public readonly RecType Type;
+	public readonly Guid Id;
+	public readonly int Transaction;
+	public readonly string StreamId;
+	public readonly string EventType;
+	public readonly DateTime TimeStamp;
+	public readonly long? EventNumber;
+	public readonly byte[] Data;
+	public readonly StreamMetadata Metadata;
+	public readonly PrepareFlags PrepareFlags;
+	public readonly byte Version;
+
+	// commit all writes except incomplete implicit transactions
+	public bool CommitWrite => !(Type == RecType.Prepare &&
+								 PrepareFlags.HasFlag(PrepareFlags.IsCommitted) &&
+								 !PrepareFlags.HasFlag(PrepareFlags.TransactionEnd));
+
+	public Rec(RecType type, int transaction, string streamId, string eventType, DateTime? timestamp, byte version,
+		long? eventNumber = null,
+		byte[] data = null,
+		StreamMetadata metadata = null, PrepareFlags prepareFlags = PrepareFlags.Data) {
+		Ensure.NotNullOrEmpty(streamId, "streamId");
+		Ensure.Nonnegative(transaction, "transaction");
+
+		if (data != null && metadata != null)
+			throw new Exception("two kinds of data were specified");
+
+		Type = type;
+		Id = Guid.NewGuid();
+		Transaction = transaction;
+		StreamId = streamId;
+		EventType = eventType ?? string.Empty;
+		TimeStamp = timestamp ?? DateTime.UtcNow;
+		Version = version;
+		EventNumber = eventNumber;
+		Data = data;
+		Metadata = metadata;
+		PrepareFlags = prepareFlags;
+	}
+
+	public static Rec Delete(int transaction, string stream, DateTime? timestamp = null,
+		byte version = PrepareLogRecord.PrepareRecordVersion) {
+		return new Rec(RecType.Delete, transaction, stream, SystemEventTypes.StreamDeleted, timestamp, version);
+	}
+
+	public static Rec CommittedDelete(int transaction, string stream, DateTime? timestamp = null,
+		byte version = PrepareLogRecord.PrepareRecordVersion) {
+		return new Rec(RecType.Delete, transaction, stream, SystemEventTypes.StreamDeleted, timestamp, version,
+			prepareFlags: PrepareFlags.IsCommitted);
+	}
+
+	public static Rec TransSt(int transaction, string stream, DateTime? timestamp = null,
+		byte version = PrepareLogRecord.PrepareRecordVersion) {
+		return new Rec(RecType.TransStart, transaction, stream, null, timestamp, version);
+	}
+
+	public static Rec Prepare(int transaction, string stream, string eventType = null, DateTime? timestamp = null,
+		long? eventNumber = null,
+		byte[] data = null,
+		StreamMetadata metadata = null, PrepareFlags prepareFlags = PrepareFlags.Data,
+		byte version = PrepareLogRecord.PrepareRecordVersion) {
+		return new Rec(RecType.Prepare, transaction, stream, eventType, timestamp, version, eventNumber, data, metadata, prepareFlags);
+	}
+
+	public static Rec Write(int transaction, string stream, string eventType = null, DateTime? timestamp = null,
+		long? eventNumber = null,
+		byte[] data = null,
+		StreamMetadata metadata = null, PrepareFlags prepareFlags = PrepareFlags.SingleWrite | PrepareFlags.IsCommitted,
+		byte version = PrepareLogRecord.PrepareRecordVersion) {
+		return new Rec(RecType.Prepare, transaction, stream, eventType, timestamp, version, eventNumber, data, metadata, prepareFlags);
+	}
+
+	public static Rec TransEnd(int transaction, string stream, DateTime? timestamp = null,
+		byte version = PrepareLogRecord.PrepareRecordVersion) {
+		return new Rec(RecType.TransEnd, transaction, stream, null, timestamp, version);
+	}
+
+	public static Rec Commit(int transaction, string stream, DateTime? timestamp = null,
+		byte version = CommitLogRecord.CommitRecordVersion) {
+		return new Rec(RecType.Commit, transaction, stream, null, timestamp, version);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/scavenged_chunk.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/scavenged_chunk.cs
new file mode 100644
index 00000000000..527f3336cc9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/scavenged_chunk.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.Transforms;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture]
+public class scavenged_chunk : SpecificationWithFile {
+	[Test]
+	public async Task is_fully_resident_in_memory_when_cached() {
+		var map = new List<PosMap>();
+		var chunk = await TFChunk.CreateNew(new ChunkLocalFileSystem(path: ""), Filename, 1024 * 1024, 0, 0, true, false, false, false,
+			false,
+			new TFChunkTracker.NoOp(),
+			DbTransformManager.Default,
+			CancellationToken.None);
+		long logPos = 0;
+		for (int i = 0, n = ChunkFooter.Size / PosMap.FullSize + 1; i < n; ++i) {
+			map.Add(new PosMap(logPos, (int)logPos));
+			var res = await chunk.TryAppend(LogRecord.Commit(logPos, Guid.NewGuid(), logPos, 0), CancellationToken.None);
+			Assert.IsTrue(res.Success);
+			logPos = res.NewPosition;
+		}
+
+		await chunk.CompleteScavenge(map, CancellationToken.None);
+
+		await chunk.CacheInMemory(CancellationToken.None);
+
+		Assert.IsTrue(chunk.IsCached);
+
+		var last = await chunk.TryReadLast(CancellationToken.None);
+		Assert.IsTrue(last.Success);
+		Assert.AreEqual(map[map.Count - 1].ActualPos, last.LogRecord.LogPosition);
+
+		chunk.MarkForDeletion();
+		chunk.WaitForDestroy(1000);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_deleted_stream_with_a_lot_of_data_is_scavenged.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_deleted_stream_with_a_lot_of_data_is_scavenged.cs
new file mode 100644
index 00000000000..a15d1bc8076
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_deleted_stream_with_a_lot_of_data_is_scavenged.cs
@@ -0,0 +1,85 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_deleted_stream_with_a_lot_of_data_is_scavenged<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator
+			.Chunk(Rec.Prepare(0, "bla"),
+				Rec.Prepare(0, "bla"),
+				Rec.Commit(0, "bla"),
+				Rec.Prepare(1, "bla"),
+				Rec.Prepare(1, "bla"),
+				Rec.Prepare(1, "bla"),
+				Rec.Prepare(1, "bla"),
+				Rec.Commit(1, "bla"),
+				Rec.Delete(2, "bla"),
+				Rec.Commit(2, "bla"))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		var keep = LogFormatHelper<TLogFormat, TStreamId>.IsV2
+			? new int[] { 8, 9 }
+			: new int[] { 0, 9, 10 }; // "bla" created
+
+		return new[] {
+			dbResult.Recs[0].Where((x, i) => keep.Contains(i)).ToArray(),
+		};
+	}
+
+	[Test]
+	public async Task only_delete_tombstone_records_with_their_commits_are_kept() {
+		await CheckRecords();
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_deleted_stream_with_a_lot_of_data_is_scavenged_with_ingore_harddelete<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	protected override bool UnsafeIgnoreHardDelete() {
+		return true;
+	}
+
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator
+			.Chunk(Rec.Prepare(0, "bla"),
+				Rec.Prepare(0, "bla"),
+				Rec.Commit(0, "bla"),
+				Rec.Prepare(1, "bla"),
+				Rec.Prepare(1, "bla"),
+				Rec.Prepare(1, "bla"),
+				Rec.Prepare(1, "bla"),
+				Rec.Commit(1, "bla"),
+				Rec.Delete(2, "bla"),
+				Rec.Commit(2, "bla"))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		var keep = LogFormatHelper<TLogFormat, TStreamId>.IsV2
+			? new int[] { }
+			: new int[] { 0 }; // "bla" created
+
+		return new[] {
+			dbResult.Recs[0].Where((x, i) => keep.Contains(i)).ToArray(),
+		};
+	}
+
+	[Test]
+	public async Task only_delete_tombstone_records_with_their_commits_are_kept() {
+		await CheckRecords();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_deleted_stream_with_explicit_transaction_is_scavenged.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_deleted_stream_with_explicit_transaction_is_scavenged.cs
new file mode 100644
index 00000000000..6eb652aef26
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_deleted_stream_with_explicit_transaction_is_scavenged.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class when_deleted_stream_with_explicit_transaction_is_scavenged<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator
+			.Chunk(Rec.TransSt(0, "bla"),
+				Rec.Prepare(0, "bla"),
+				Rec.Prepare(0, "bla"),
+				Rec.Prepare(0, "bla"),
+				Rec.Prepare(0, "bla"),
+				Rec.TransEnd(0, "bla"),
+				Rec.Commit(0, "bla"),
+				Rec.Delete(1, "bla"),
+				Rec.Commit(1, "bla"))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		return new[] {
+			dbResult.Recs[0].Where((x, i) => new[] {7, 8}.Contains(i)).ToArray(),
+		};
+	}
+
+	[Test]
+	public async Task only_delete_tombstone_records_with_their_commits_are_kept() {
+		await CheckRecords();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_deleted_stream_with_metadata_is_scavenged.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_deleted_stream_with_metadata_is_scavenged.cs
new file mode 100644
index 00000000000..7c548259a42
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_deleted_stream_with_metadata_is_scavenged.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_deleted_stream_with_metadata_is_scavenged<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator
+			.Chunk(Rec.Prepare(0, "$$bla", metadata: new StreamMetadata(10, null, null, null, null)),
+				Rec.Prepare(0, "$$bla", metadata: new StreamMetadata(2, null, null, null, null)),
+				Rec.Commit(0, "$$bla"),
+				Rec.Delete(1, "bla"),
+				Rec.Commit(1, "bla"))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		return LogFormatHelper<TLogFormat, TStreamId>.IsV2
+			? new[] { dbResult.Recs[0].Where((x, i) => i >= 3).ToArray() }
+			: new[] { dbResult.Recs[0].Where((x, i) => i == 0 || i >= 4).ToArray() };
+	}
+
+	[Test]
+	public async Task metastream_is_scavenged_as_well() {
+		await CheckRecords();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_having_nothing_to_scavenge.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_having_nothing_to_scavenge.cs
new file mode 100644
index 00000000000..70bece035b3
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_having_nothing_to_scavenge.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_having_nothing_to_scavenge<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator
+			.Chunk(Rec.Prepare(0, "bla"),
+				Rec.Prepare(1, "bla"),
+				Rec.Commit(0, "bla"))
+			.Chunk(Rec.Prepare(2, "bla3"),
+				Rec.Prepare(2, "bla3"),
+				Rec.Commit(1, "bla"),
+				Rec.Commit(2, "bla3"))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		return dbResult.Recs;
+	}
+
+	[Test]
+	public async Task all_records_are_kept_untouched() {
+		await CheckRecords();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_both_max_age_and_max_count_with_stricted_max_age_specified.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_both_max_age_and_max_count_with_stricted_max_age_specified.cs
new file mode 100644
index 00000000000..a1f2e2c956e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_both_max_age_and_max_count_with_stricted_max_age_specified.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_having_stream_with_both_max_age_and_max_count_with_stricter_max_age_specified<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator
+			.Chunk(
+				Rec.Prepare(3, "$$bla", metadata: new StreamMetadata(5, TimeSpan.FromMinutes(5), null, null, null)),
+				Rec.Commit(3, "$$bla"),
+				Rec.Prepare(0, "bla"),
+				Rec.Commit(0, "bla"),
+				Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(100)),
+				Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(90)),
+				Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(60)),
+				Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(40)),
+				Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(30)),
+				Rec.Commit(1, "bla"),
+				Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(20)),
+				Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(3)),
+				Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(2)),
+				Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(1)),
+				Rec.Commit(2, "bla"))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		var keep = LogFormatHelper<TLogFormat, TStreamId>.IsV2
+			? new int[] { 0, 1, 11, 12, 13, 14 }
+			: new int[] { 0, 1, 2, 12, 13, 14, 15 };
+
+		return new[] {
+			dbResult.Recs[0].Where((x, i) => keep.Contains(i)).ToArray(),
+		};
+	}
+
+	[Test]
+	public async Task expired_prepares_are_scavenged() {
+		await CheckRecords();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_both_max_age_and_max_count_with_stricted_max_count_specified.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_both_max_age_and_max_count_with_stricted_max_count_specified.cs
new file mode 100644
index 00000000000..30ac9fa6088
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_both_max_age_and_max_count_with_stricted_max_count_specified.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_having_stream_with_both_max_age_and_max_count_with_stricter_max_count_specified<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator
+			.Chunk(
+				Rec.Prepare(0, "$$bla",
+					metadata: new StreamMetadata(3, TimeSpan.FromMinutes(50), null, null, null)),
+				Rec.Commit(0, "$$bla"),
+				Rec.Prepare(3, "bla"),
+				Rec.Commit(3, "bla"),
+				Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(100)),
+				Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(90)),
+				Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(60)),
+				Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(40)),
+				Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(30)),
+				Rec.Commit(1, "bla"),
+				Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(20)),
+				Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(3)),
+				Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(2)),
+				Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(1)),
+				Rec.Commit(2, "bla"))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		var keep = LogFormatHelper<TLogFormat, TStreamId>.IsV2
+			? new int[] { 0, 1, 11, 12, 13, 14 }
+			: new int[] { 0, 1, 2, 12, 13, 14, 15 };
+
+		return new[] {
+			dbResult.Recs[0].Where((x, i) => keep.Contains(i)).ToArray(),
+		};
+	}
+
+	[Test]
+	public async Task expired_prepares_are_scavenged() {
+		await CheckRecords();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_max_age_specified.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_max_age_specified.cs
new file mode 100644
index 00000000000..36e518286b7
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_max_age_specified.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_having_stream_with_max_age_specified<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator
+			.Chunk(
+				Rec.Prepare(0, "$$bla",
+					metadata: new StreamMetadata(null, TimeSpan.FromMinutes(5), null, null, null)),
+				Rec.Commit(0, "$$bla"),
+				Rec.Prepare(3, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(110)),
+				Rec.Commit(3, "bla"),
+				Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(100)),
+				Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(90)),
+				Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(60)),
+				Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(40)),
+				Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(30)),
+				Rec.Commit(1, "bla"),
+				Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(20)),
+				Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(3)),
+				Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(2)),
+				Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(1)),
+				Rec.Commit(2, "bla"))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		var keep = LogFormatHelper<TLogFormat, TStreamId>.IsV2
+			? new int[] { 0, 1, 11, 12, 13, 14 }
+			: new int[] { 0, 1, 2, 12, 13, 14, 15 };
+
+		return new[] {
+			dbResult.Recs[0].Where((x, i) => keep.Contains(i)).ToArray(),
+		};
+	}
+
+	[Test]
+	public async Task expired_prepares_are_scavenged() {
+		await CheckRecords();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_max_count_specified.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_max_count_specified.cs
new file mode 100644
index 00000000000..5a3379700ca
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_max_count_specified.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_having_stream_with_max_count_specified<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator
+			.Chunk(Rec.Prepare(0, "$$bla", metadata: new StreamMetadata(maxCount: 3)),
+				Rec.Commit(0, "$$bla"),
+				Rec.Prepare(1, "bla"),
+				Rec.Commit(1, "bla"),
+				Rec.Prepare(2, "bla"),
+				Rec.Prepare(2, "bla"),
+				Rec.Prepare(2, "bla"),
+				Rec.Prepare(2, "bla"),
+				Rec.Prepare(2, "bla"),
+				Rec.Commit(2, "bla"),
+				Rec.Prepare(3, "bla"),
+				Rec.Prepare(3, "bla"),
+				Rec.Prepare(3, "bla"),
+				Rec.Prepare(3, "bla"),
+				Rec.Commit(3, "bla"))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		var keep = LogFormatHelper<TLogFormat, TStreamId>.IsV2
+			? new int[] { 0, 1, 11, 12, 13, 14 }
+			: new int[] { 0, 1, 2, 12, 13, 14, 15 };
+
+		return new[] {
+			dbResult.Recs[0].Where((x, i) => keep.Contains(i)).ToArray(),
+		};
+	}
+
+	[Test]
+	public async Task expired_prepares_are_scavenged() {
+		await CheckRecords();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_start_from_specified.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_start_from_specified.cs
new file mode 100644
index 00000000000..1010bc901f6
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_start_from_specified.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_having_stream_with_truncatebefore_specified<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator
+			.Chunk(Rec.Prepare(0, "$$bla", metadata: new StreamMetadata(truncateBefore: 7)),
+				Rec.Commit(0, "$$bla"),
+				Rec.Prepare(1, "bla"), // event 0
+				Rec.Commit(1, "bla"),
+				Rec.Prepare(2, "bla"), // event 1
+				Rec.Prepare(2, "bla"), // event 2
+				Rec.Prepare(2, "bla"), // event 3
+				Rec.Prepare(2, "bla"), // event 4
+				Rec.Prepare(2, "bla"), // event 5
+				Rec.Commit(2, "bla"),
+				Rec.Prepare(3, "bla"), // event 6
+				Rec.Prepare(3, "bla"), // event 7
+				Rec.Prepare(3, "bla"), // event 8
+				Rec.Prepare(3, "bla"), // event 9
+				Rec.Commit(3, "bla"))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		var keep = LogFormatHelper<TLogFormat, TStreamId>.IsV2
+			? new int[] { 0, 1, 11, 12, 13, 14 }
+			: new int[] { 0, 1, 2, 12, 13, 14, 15 };
+
+		return new[] {
+			dbResult.Recs[0].Where((x, i) => keep.Contains(i)).ToArray(),
+		};
+	}
+
+	[Test]
+	public async Task expired_prepares_are_scavenged() {
+		await CheckRecords();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_strict_max_age_leaving_no_events_in_stream.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_strict_max_age_leaving_no_events_in_stream.cs
new file mode 100644
index 00000000000..37beb31cd09
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_having_stream_with_strict_max_age_leaving_no_events_in_stream.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_having_stream_with_strict_max_age_leaving_no_events_in_stream<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator
+			.Chunk(
+				Rec.Prepare(0, "$$bla",
+					metadata: new StreamMetadata(null, TimeSpan.FromMinutes(1), null, null, null)),
+				Rec.Commit(0, "$$bla"),
+				Rec.Prepare(1, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(25)),
+				Rec.Commit(1, "bla"),
+				Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(20)),
+				Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(10)),
+				Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(5)),
+				Rec.Prepare(2, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(3)),
+				Rec.Commit(2, "bla"))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		var keep = LogFormatHelper<TLogFormat, TStreamId>.IsV2
+			? new int[] { 0, 1, 7, 8 }
+			: new int[] { 0, 1, 2, 8, 9 };
+
+		return new[] {
+			dbResult.Recs[0].Where((x, i) => keep.Contains(i)).ToArray(),
+		};
+	}
+
+	[Test]
+	public async Task expired_prepares_are_scavenged_but_the_last_in_stream_is_physically_kept() {
+		await CheckRecords();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_metastream_is_scavenged_and_read_index_is_set_to_keep_just_last_metaevent.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_metastream_is_scavenged_and_read_index_is_set_to_keep_just_last_metaevent.cs
new file mode 100644
index 00000000000..8eed57c5d10
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_metastream_is_scavenged_and_read_index_is_set_to_keep_just_last_metaevent.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_metastream_is_scavenged_and_read_index_is_set_to_keep_just_last_metaevent<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator
+			.Chunk(Rec.Prepare(0, "$$bla", metadata: new StreamMetadata(10, null, null, null, null)),
+				Rec.Prepare(0, "$$bla", metadata: new StreamMetadata(5, null, null, null, null)),
+				Rec.Prepare(0, "$$bla", metadata: new StreamMetadata(3, null, null, null, null)),
+				Rec.Prepare(0, "$$bla", metadata: new StreamMetadata(2, null, null, null, null)),
+				Rec.Commit(0, "$$bla"))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		return LogFormatHelper<TLogFormat, TStreamId>.IsV2
+			? new[] { dbResult.Recs[0].Where((x, i) => i >= 3).ToArray() }
+			: new[] { dbResult.Recs[0].Where((x, i) => i == 0 || i >= 4).ToArray() };
+	}
+
+	[Test]
+	public async Task only_last_metaevent_is_left() {
+		await CheckRecords();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_metastream_is_scavenged_and_read_index_is_set_to_keep_last_3_metaevents.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_metastream_is_scavenged_and_read_index_is_set_to_keep_last_3_metaevents.cs
new file mode 100644
index 00000000000..81ea09f7b84
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_metastream_is_scavenged_and_read_index_is_set_to_keep_last_3_metaevents.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_metastream_is_scavenged_and_read_index_is_set_to_keep_last_3_metaevents<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	public when_metastream_is_scavenged_and_read_index_is_set_to_keep_last_3_metaevents() :
+		base(metastreamMaxCount: 3) {
+	}
+
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator
+			.Chunk(Rec.Prepare(0, "$$bla"),
+				Rec.Prepare(0, "$$bla"),
+				Rec.Prepare(0, "$$bla"),
+				Rec.Prepare(0, "$$bla"),
+				Rec.Prepare(0, "$$bla"),
+				Rec.Commit(0, "$$bla"))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		return LogFormatHelper<TLogFormat, TStreamId>.IsV2
+			? new[] { dbResult.Recs[0].Where((x, i) => i >= 2).ToArray() }
+			: new[] { dbResult.Recs[0].Where((x, i) => i == 0 || i >= 3).ToArray() };
+	}
+
+	[Test]
+	public async Task metastream_is_scavenged_correctly() {
+		await CheckRecords();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_after_chunck_scavenged.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_after_chunck_scavenged.cs
new file mode 100644
index 00000000000..9db1d67090e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_after_chunck_scavenged.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_scavenge_cancelled_after_chunck_scavenged<TLogFormat, TStreamId> : ScavengeLifeCycleScenario<TLogFormat, TStreamId> {
+	protected override async Task When() {
+		var cancellationTokenSource = new CancellationTokenSource();
+
+		Log.ChunkScavenged += (sender, args) => cancellationTokenSource.Cancel();
+		await TfChunkScavenger.Scavenge(true, true, 0, ct: cancellationTokenSource.Token);
+	}
+
+	[Test]
+	public void completed_logged_with_stopped_result() {
+		Assert.That(Log.Completed);
+		Assert.That(Log.Result, Is.EqualTo(ScavengeResult.Stopped));
+	}
+
+	[Test]
+	public void scavenge_record_for_first_and_cancelled_chunk() {
+		Assert.That(Log.Scavenged, Has.Count.EqualTo(1));
+		Assert.That(Log.Scavenged[0].Scavenged, Is.True);
+	}
+
+
+	[Test]
+	public void doesnt_call_scavenge_on_the_table_index() {
+		Assert.That(FakeTableIndex.ScavengeCount, Is.EqualTo(0));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_after_completed.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_after_completed.cs
new file mode 100644
index 00000000000..6a1d6918f82
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_after_completed.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_scavenge_cancelled_after_completed<TLogFormat, TStreamId> : ScavengeLifeCycleScenario<TLogFormat, TStreamId> {
+	protected override async Task When() {
+		var cancellationTokenSource = new CancellationTokenSource();
+
+		Log.CompletedCallback += (sender, args) => cancellationTokenSource.Cancel();
+		await TfChunkScavenger.Scavenge(true, true, 0, ct: cancellationTokenSource.Token);
+	}
+
+	[Test]
+	public void completed_logged_with_success_result() {
+		Assert.That(Log.Completed);
+		Assert.That(Log.Result, Is.EqualTo(ScavengeResult.Success));
+	}
+
+	[Test]
+	public void scavenge_record_for_all_completed_chunks() {
+		Assert.That(Log.Scavenged, Has.Count.EqualTo(2));
+		Assert.That(Log.Scavenged[0].Scavenged, Is.True);
+		Assert.That(Log.Scavenged[1].Scavenged, Is.True);
+	}
+
+
+	[Test]
+	public void merge_record_for_all_completed_merged() {
+		Assert.That(Log.Merged, Has.Count.EqualTo(1));
+		Assert.That(Log.Merged[0].Scavenged, Is.True);
+	}
+
+
+	[Test]
+	public void calls_scavenge_on_the_table_index() {
+		Assert.That(FakeTableIndex.ScavengeCount, Is.EqualTo(1));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_after_started.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_after_started.cs
new file mode 100644
index 00000000000..ae6d6734bb6
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_after_started.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_scavenge_cancelled_after_started<TLogFormat, TStreamId> : ScavengeLifeCycleScenario<TLogFormat, TStreamId> {
+	protected override async Task When() {
+		var cancellationTokenSource = new CancellationTokenSource();
+
+		Log.StartedCallback += (sender, args) => cancellationTokenSource.Cancel();
+		await TfChunkScavenger.Scavenge(false, true, 0, ct: cancellationTokenSource.Token);
+	}
+
+	[Test]
+	public void completed_logged_with_stopped_result() {
+		Assert.That(Log.Completed);
+		Assert.That(Log.Result, Is.EqualTo(ScavengeResult.Stopped));
+	}
+
+	[Test]
+	public void no_chunks_scavenged() {
+		Assert.That(Log.Scavenged, Is.Empty);
+	}
+
+	[Test]
+	public void doesnt_call_scavenge_on_the_table_index() {
+		Assert.That(FakeTableIndex.ScavengeCount, Is.EqualTo(0));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_before_started.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_before_started.cs
new file mode 100644
index 00000000000..bf61c7d694b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_cancelled_before_started.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_scavenge_cancelled_before_started<TLogFormat, TStreamId> : ScavengeLifeCycleScenario<TLogFormat, TStreamId> {
+	protected override async Task When() {
+		var cancellationTokenSource = new CancellationTokenSource();
+		cancellationTokenSource.Cancel();
+		await TfChunkScavenger.Scavenge(false, true, 0, ct: cancellationTokenSource.Token);
+	}
+
+	[Test]
+	public void completed_logged_with_stopped_result() {
+		Assert.That(Log.Completed);
+		Assert.That(Log.Result, Is.EqualTo(ScavengeResult.Stopped));
+	}
+
+	[Test]
+	public void no_chunks_scavenged() {
+		Assert.That(Log.Scavenged, Is.Empty);
+	}
+
+	[Test]
+	public void doesnt_call_scavenge_on_the_table_index() {
+		Assert.That(FakeTableIndex.ScavengeCount, Is.EqualTo(0));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_from_chunk_number.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_from_chunk_number.cs
new file mode 100644
index 00000000000..9e74417fcea
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_from_chunk_number.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_scavenge_from_chunk_number<TLogFormat, TStreamId> : ScavengeLifeCycleScenario<TLogFormat, TStreamId> {
+	protected override Task When() {
+		var cancellationTokenSource = new CancellationTokenSource();
+		return TfChunkScavenger.Scavenge(true, true, 1, ct: cancellationTokenSource.Token);
+	}
+
+	[Test]
+	public void log_started() {
+		Assert.That(Log.Started);
+	}
+
+	[Test]
+	public void log_completed_with_success() {
+		Assert.That(Log.Completed);
+		Assert.That(Log.Result, Is.EqualTo(ScavengeResult.Success));
+	}
+
+	[Test]
+	public void scavenge_record_for_chunks_1_plus() {
+		Assert.That(Log.Scavenged, Has.Count.EqualTo(1));
+		Assert.That(Log.Scavenged[0].Scavenged, Is.True);
+		Assert.That(Log.Scavenged[0].ChunkStart, Is.EqualTo(1));
+		Assert.That(Log.Scavenged[0].ChunkEnd, Is.EqualTo(1));
+	}
+
+	[Test]
+	public void scavenge_record_for_chunks_all() {
+		Assert.That(Log.Merged, Has.Count.EqualTo(1));
+		Assert.That(Log.Merged[0].Scavenged, Is.True);
+		Assert.That(Log.Merged[0].ChunkStart, Is.EqualTo(0));
+		Assert.That(Log.Merged[0].ChunkEnd, Is.EqualTo(1));
+	}
+
+	[Test]
+	public void calls_scavenge_on_the_table_index() {
+		Assert.That(FakeTableIndex.ScavengeCount, Is.EqualTo(1));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_succeeds_without_error.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_succeeds_without_error.cs
new file mode 100644
index 00000000000..de2b68668f6
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_succeeds_without_error.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_scavenge_succeeds_without_error<TLogFormat, TStreamId> : ScavengeLifeCycleScenario<TLogFormat, TStreamId> {
+	protected override Task When() {
+		var cancellationTokenSource = new CancellationTokenSource();
+		return TfChunkScavenger.Scavenge(true, true, 0, ct: cancellationTokenSource.Token);
+	}
+
+	[Test]
+	public void log_started() {
+		Assert.That(Log.Started);
+	}
+
+	[Test]
+	public void log_completed_with_success() {
+		Assert.That(Log.Completed);
+		Assert.That(Log.Result, Is.EqualTo(ScavengeResult.Success));
+	}
+
+	[Test]
+	public void scavenge_record_for_all_completed_chunks() {
+		Assert.That(Log.Scavenged, Has.Count.EqualTo(2));
+		Assert.That(Log.Scavenged[0].Scavenged, Is.True);
+		Assert.That(Log.Scavenged[0].ChunkStart, Is.EqualTo(0));
+		Assert.That(Log.Scavenged[0].ChunkEnd, Is.EqualTo(0));
+		Assert.That(Log.Scavenged[1].Scavenged, Is.True);
+		Assert.That(Log.Scavenged[1].ChunkStart, Is.EqualTo(1));
+		Assert.That(Log.Scavenged[1].ChunkEnd, Is.EqualTo(1));
+	}
+
+	[Test]
+	public void merge_record_for_all_completed_merges() {
+		Assert.That(Log.Merged, Has.Count.EqualTo(1));
+		Assert.That(Log.Merged[0].Scavenged, Is.True);
+		Assert.That(Log.Merged[0].ChunkStart, Is.EqualTo(0));
+		Assert.That(Log.Merged[0].ChunkEnd, Is.EqualTo(1));
+	}
+
+	[Test]
+	public void calls_scavenge_on_the_table_index() {
+		Assert.That(FakeTableIndex.ScavengeCount, Is.EqualTo(1));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_throws_exception_on_completed.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_throws_exception_on_completed.cs
new file mode 100644
index 00000000000..ef18aae2ea4
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_throws_exception_on_completed.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_scavenge_throws_exception_on_completed<TLogFormat, TStreamId> : ScavengeLifeCycleScenario<TLogFormat, TStreamId> {
+	protected override Task When() {
+		var cancellationTokenSource = new CancellationTokenSource();
+
+		Log.CompletedCallback += (sender, args) => { throw new Exception("Expected exception."); };
+		return TfChunkScavenger.Scavenge(true, true, 0, ct: cancellationTokenSource.Token);
+	}
+
+	[Test]
+	public void no_exception_is_thrown() {
+		Assert.That(Log.Completed);
+		Assert.That(Log.Result, Is.EqualTo(ScavengeResult.Success));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_throws_exception_processing_chunk.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_throws_exception_processing_chunk.cs
new file mode 100644
index 00000000000..c15126b93bb
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_scavenge_throws_exception_processing_chunk.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_scavenge_throws_exception_processing_chunk<TLogFormat, TStreamId> : ScavengeLifeCycleScenario<TLogFormat, TStreamId> {
+	protected override Task When() {
+		var cancellationTokenSource = new CancellationTokenSource();
+
+		Log.ChunkScavenged += (sender, args) => {
+			if (args.Scavenged)
+				throw new Exception("Expected exception.");
+		};
+
+		return TfChunkScavenger.Scavenge(true, true, 0, ct: cancellationTokenSource.Token);
+	}
+
+	[Test]
+	public void no_exception_is_thrown_to_caller() {
+		Assert.That(Log.Completed);
+		Assert.That(Log.Result, Is.EqualTo(ScavengeResult.Errored));
+	}
+
+	[Test]
+	public void doesnt_call_scavenge_on_the_table_index() {
+		Assert.That(FakeTableIndex.ScavengeCount, Is.EqualTo(0));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_stream_is_deleted.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_stream_is_deleted.cs
new file mode 100644
index 00000000000..2642fa285ff
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_stream_is_deleted.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_stream_is_deleted<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator
+			.Chunk(Rec.Prepare(0, "bla"), Rec.Prepare(0, "bla"), Rec.Commit(0, "bla"))
+			.Chunk(Rec.Delete(1, "bla"), Rec.Commit(1, "bla"))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
+			return new[] {
+				new ILogRecord[0],
+				dbResult.Recs[1]
+			};
+		}
+
+		return new[] {
+			new[] {
+				dbResult.Recs[0][0], // "bla" created
+			},
+			dbResult.Recs[1]
+		};
+	}
+
+	[Test]
+	public async Task stream_created_and_delete_tombstone_with_corresponding_commits_are_kept() {
+		await CheckRecords();
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_stream_is_deleted_with_ignore_hard_deletes<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	protected override bool UnsafeIgnoreHardDelete() {
+		return true;
+	}
+
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator
+			.Chunk(Rec.Prepare(0, "bla"), Rec.Prepare(0, "bla"), Rec.Commit(0, "bla"))
+			.Chunk(Rec.Delete(1, "bla"), Rec.Commit(1, "bla"))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
+			return new[] {
+				new ILogRecord[0],
+				new ILogRecord[0]
+			};
+		}
+
+		return new[] {
+			new[] {
+				dbResult.Recs[0][0], // "bla" created
+			},
+			new ILogRecord[0]
+		};
+	}
+
+	[Test]
+	public async Task stream_created_and_delete_tombstone_with_corresponding_commits_are_kept() {
+		await CheckRecords();
+	}
+}
+
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_stream_is_deleted_and_bulk_transaction_spans_chunks_boundary.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_stream_is_deleted_and_bulk_transaction_spans_chunks_boundary.cs
new file mode 100644
index 00000000000..8f991bc4082
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_stream_is_deleted_and_bulk_transaction_spans_chunks_boundary.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class when_stream_is_deleted_and_bulk_transaction_spans_chunks_boundary<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator
+			.Chunk(Rec.Prepare(0, "bla"),
+				Rec.Commit(0, "bla"),
+				Rec.Prepare(1, "bla"),
+				Rec.Prepare(1, "bla"),
+				Rec.Prepare(1, "bla"),
+				Rec.Prepare(1, "bla"))
+			.Chunk(Rec.Prepare(1, "bla"),
+				Rec.Prepare(1, "bla"),
+				Rec.Prepare(1, "bla"),
+				Rec.Commit(1, "bla"),
+				Rec.Delete(2, "bla"),
+				Rec.Commit(2, "bla"))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		return new[] {
+			new[] {dbResult.Recs[0][2]}, // first prepare in commit that is in different chunk
+			dbResult.Recs[1].Where((x, i) => i >= 3).ToArray(),
+		};
+	}
+
+	[Test]
+	public async Task first_prepare_of_transaction_is_preserved() {
+		await CheckRecords();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_stream_is_deleted_and_explicit_transaction_spans_chunks_boundary.cs b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_stream_is_deleted_and_explicit_transaction_spans_chunks_boundary.cs
new file mode 100644
index 00000000000..141ba85ace6
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Scavenging/when_stream_is_deleted_and_explicit_transaction_spans_chunks_boundary.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Scavenging;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), Ignore = "Explicit transactions are not supported yet by Log V3")]
+public class when_stream_is_deleted_and_explicit_transaction_spans_chunks_boundary<TLogFormat, TStreamId> : ScavengeTestScenario<TLogFormat, TStreamId> {
+	protected override ValueTask<DbResult> CreateDb(TFChunkDbCreationHelper<TLogFormat, TStreamId> dbCreator, CancellationToken token) {
+		return dbCreator
+			.Chunk(Rec.Prepare(0, "bla"),
+				Rec.Commit(0, "bla"),
+				Rec.TransSt(1, "bla"),
+				Rec.Prepare(1, "bla"),
+				Rec.Prepare(1, "bla"),
+				Rec.Prepare(1, "bla"),
+				Rec.Prepare(1, "bla"))
+			.Chunk(Rec.Prepare(1, "bla"),
+				Rec.Prepare(1, "bla"),
+				Rec.Prepare(1, "bla"),
+				Rec.Prepare(1, "bla"),
+				Rec.Prepare(1, "bla"),
+				Rec.TransEnd(1, "bla"),
+				Rec.Commit(1, "bla"))
+			.Chunk(Rec.Delete(2, "bla"),
+				Rec.Commit(2, "bla"))
+			.CompleteLastChunk()
+			.CreateDb(token: token);
+	}
+
+	protected override ILogRecord[][] KeptRecords(DbResult dbResult) {
+		return new[] {
+			new[] {dbResult.Recs[0][2]},
+			new[] {dbResult.Recs[1][6]}, // commit
+			dbResult.Recs[2]
+		};
+	}
+
+	[Test]
+	public async Task first_prepare_of_transaction_is_preserved() {
+		await CheckRecords();
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/TFChunkHelper.cs b/src/KurrentDB.Core.Tests/TransactionLog/TFChunkHelper.cs
new file mode 100644
index 00000000000..2bf22803ef9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/TFChunkHelper.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.Transforms;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+public static class TFChunkHelper {
+	public static TFChunkDbConfig CreateDbConfig(
+		string pathName,
+		long writerCheckpointPosition) {
+		return CreateDbConfigEx(pathName, writerCheckpointPosition, 0, -1, -1, -1, 10000, -1);
+	}
+	public static TFChunkDbConfig CreateSizedDbConfig(
+		string pathName,
+		long writerCheckpointPosition,
+		int chunkSize) {
+		return CreateDbConfigEx(pathName, writerCheckpointPosition, 0, -1, -1, -1, chunkSize, -1);
+	}
+	public static TFChunkDbConfig CreateDbConfigEx(
+		string pathName,
+		long writerCheckpointPosition,
+		long chaserCheckpointPosition,// Default 0
+		long epochCheckpointPosition,// Default -1
+		long proposalCheckpointPosition,// Default -1
+		long truncateCheckpoint,// Default -1
+		int chunkSize,// Default 10000
+		long maxTruncation // Default -1
+		) {
+		return new TFChunkDbConfig(pathName,
+			chunkSize,
+			0,
+			new InMemoryCheckpoint(writerCheckpointPosition),
+			new InMemoryCheckpoint(chaserCheckpointPosition),
+			new InMemoryCheckpoint(epochCheckpointPosition),
+			new InMemoryCheckpoint(proposalCheckpointPosition),
+			new InMemoryCheckpoint(truncateCheckpoint),
+			new InMemoryCheckpoint(-1),
+			new InMemoryCheckpoint(-1),
+			new InMemoryCheckpoint(-1),
+			maxTruncation: maxTruncation);
+	}
+
+	public static TFChunkDbConfig CreateDbConfig(
+		string pathName,
+		ICheckpoint writerCheckpoint,
+		ICheckpoint chaserCheckpoint,
+		int chunkSize = 10000,
+		ICheckpoint replicationCheckpoint = null) {
+		if (replicationCheckpoint == null)
+			replicationCheckpoint = new InMemoryCheckpoint(-1);
+		return new TFChunkDbConfig(
+			pathName,
+			chunkSize,
+			0,
+			writerCheckpoint,
+			chaserCheckpoint,
+			new InMemoryCheckpoint(-1),
+			new InMemoryCheckpoint(-1),
+			new InMemoryCheckpoint(-1),
+			replicationCheckpoint,
+			new InMemoryCheckpoint(-1),
+			new InMemoryCheckpoint(-1));
+	}
+
+	public static ValueTask<TFChunk> CreateNewChunk(
+		string fileName,
+		int chunkSize = 4096,
+		bool isScavenged = false,
+		int chunkStartNumber = 0,
+		int chunkEndNumber = 0,
+		CancellationToken token = default) {
+		return TFChunk.CreateNew(new ChunkLocalFileSystem(path: ""), fileName, chunkSize,
+			chunkStartNumber, chunkEndNumber, isScavenged: isScavenged, inMem: false, unbuffered: false,
+			writethrough: false, reduceFileCachePressure: false, tracker: new TFChunkTracker.NoOp(),
+			getTransformFactory: DbTransformManager.Default,
+			token);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Truncation/TruncateAndReOpenDbScenario.cs b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/TruncateAndReOpenDbScenario.cs
new file mode 100644
index 00000000000..2c0db780016
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/TruncateAndReOpenDbScenario.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.Util;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Truncation;
+
+public abstract class TruncateAndReOpenDbScenario<TLogFormat, TStreamId> : TruncateScenario<TLogFormat, TStreamId> {
+	protected TruncateAndReOpenDbScenario(int maxEntriesInMemTable = 100, int metastreamMaxCount = 1)
+		: base(maxEntriesInMemTable, metastreamMaxCount) {
+	}
+
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		await ReOpenDb(CancellationToken.None);
+	}
+
+	private async ValueTask ReOpenDb(CancellationToken token) {
+		Db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, WriterCheckpoint, ChaserCheckpoint));
+
+		await Db.Open(token: token);
+
+		var indexDirectory = GetFilePathFor("index");
+		_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
+			IndexDirectory = indexDirectory,
+		});
+		var readers = new ObjectPool<ITransactionFileReader>("Readers", 2, 5,
+			() => new TFChunkReader(Db, Db.Config.WriterCheckpoint));
+		var lowHasher = _logFormat.LowHasher;
+		var highHasher = _logFormat.HighHasher;
+		var emptyStreamId = _logFormat.EmptyStreamId;
+		TableIndex = new TableIndex<TStreamId>(indexDirectory, lowHasher, highHasher, emptyStreamId,
+			() => new HashListMemTable(PTableVersions.IndexV3, MaxEntriesInMemTable * 2),
+			() => new TFReaderLease(readers),
+			PTableVersions.IndexV3,
+			int.MaxValue,
+			Constants.PTableMaxReaderCountDefault,
+			MaxEntriesInMemTable);
+		_logFormat.StreamNamesProvider.SetTableIndex(TableIndex);
+		var readIndex = new ReadIndex<TStreamId>(new NoopPublisher(),
+			readers,
+			TableIndex,
+			_logFormat.StreamNameIndexConfirmer,
+			_logFormat.StreamIds,
+			_logFormat.StreamNamesProvider,
+			_logFormat.EmptyStreamId,
+			_logFormat.StreamIdValidator,
+			_logFormat.StreamIdSizer,
+			_logFormat.StreamExistenceFilter,
+			_logFormat.StreamExistenceFilterReader,
+			_logFormat.EventTypeIndexConfirmer,
+			new NoLRUCache<TStreamId, IndexBackend<TStreamId>.EventNumberCached>(),
+			new NoLRUCache<TStreamId, IndexBackend<TStreamId>.MetadataCached>(),
+			additionalCommitChecks: true,
+			metastreamMaxCount: MetastreamMaxCount,
+			hashCollisionReadLimit: Opts.HashCollisionReadLimitDefault,
+			skipIndexScanOnReads: Opts.SkipIndexScanOnReadsDefault,
+			replicationCheckpoint: Db.Config.ReplicationCheckpoint,
+			indexCheckpoint: Db.Config.IndexCheckpoint,
+			indexStatusTracker: new IndexStatusTracker.NoOp(),
+			indexTracker: new IndexTracker.NoOp(),
+			cacheTracker: new CacheHitsMissesTracker.NoOp());
+		await readIndex.IndexCommitter.Init(ChaserCheckpoint.Read(), token);
+		ReadIndex = readIndex;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Truncation/TruncateScenario.cs b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/TruncateScenario.cs
new file mode 100644
index 00000000000..0a589a28df9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/TruncateScenario.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.Services.Storage;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.Transforms.Identity;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Truncation;
+
+public abstract class TruncateScenario<TLogFormat, TStreamId> : ReadIndexTestScenario<TLogFormat, TStreamId> {
+	protected TFChunkDbTruncator Truncator;
+	protected long TruncateCheckpoint = long.MinValue;
+
+	protected TruncateScenario(int maxEntriesInMemTable = 100, int metastreamMaxCount = 1)
+		: base(maxEntriesInMemTable, metastreamMaxCount) {
+	}
+
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		if (TruncateCheckpoint == long.MinValue)
+			throw new InvalidOperationException("AckCheckpoint must be set in WriteTestScenario.");
+
+		OnBeforeTruncating();
+
+		// need to close db before truncator can delete files
+
+		ReadIndex.Close();
+		ReadIndex.Dispose();
+
+		TableIndex.Close(removeFiles: false);
+
+		await Db.DisposeAsync();
+
+		var truncator = new TFChunkDbTruncator(Db.Config, new ChunkLocalFileSystem(Db.Config.Path), static _ => new IdentityChunkTransformFactory());
+		await truncator.TruncateDb(TruncateCheckpoint, CancellationToken.None);
+	}
+
+	protected virtual void OnBeforeTruncating() {
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_against_max_truncation_config.cs b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_against_max_truncation_config.cs
new file mode 100644
index 00000000000..0b8c7aeebb7
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_against_max_truncation_config.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Validation;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.Transforms.Identity;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Truncation;
+
+[TestFixture]
+public class when_truncating_against_max_truncation_config : SpecificationWithDirectoryPerTestFixture {
+	private TFChunkDbConfig _config;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		// writer checkpoint = 5500, truncate to 0, max truncation = 1000
+		_config = TFChunkHelper.CreateDbConfigEx(PathName, 5500, 5500, 5500, -1, 0, 1000, maxTruncation: 1000);
+
+		DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000001"));
+		DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000002"));
+		DbUtil.CreateMultiChunk(_config, 3, 10, GetFilePathFor("chunk-000003.000001"));
+		DbUtil.CreateMultiChunk(_config, 3, 10, GetFilePathFor("chunk-000003.000002"));
+		DbUtil.CreateMultiChunk(_config, 7, 8, GetFilePathFor("chunk-000007.000001"));
+		DbUtil.CreateOngoingChunk(_config, 11, GetFilePathFor("chunk-000011.000000"));
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		return base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void truncate_above_max_throws_exception() {
+		Assert.ThrowsAsync<Exception>(async () => {
+			var truncator = new TFChunkDbTruncator(_config, new ChunkLocalFileSystem(_config.Path), static _ => new IdentityChunkTransformFactory());
+			await truncator.TruncateDb(0, CancellationToken.None);
+		});
+	}
+
+	[Test]
+	public void truncate_within_max_does_not_throw_exception() {
+
+		Assert.DoesNotThrowAsync(async () => {
+			var truncator = new TFChunkDbTruncator(_config, new ChunkLocalFileSystem(_config.Path), static _ => new IdentityChunkTransformFactory());
+			await truncator.TruncateDb(4800, CancellationToken.None);
+		});
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_database.cs b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_database.cs
new file mode 100644
index 00000000000..d76b5878915
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_database.cs
@@ -0,0 +1,144 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Truncation;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_truncating_database<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	[Test, Category("LongRunning")]
+	public async Task everything_should_go_fine() {
+		var miniNode = new MiniNode<TLogFormat, TStreamId>(PathName, inMemDb: false);
+		await miniNode.Start();
+
+		var tcpPort = miniNode.TcpEndPoint.Port;
+		var httpPort = miniNode.HttpEndPoint.Port;
+		const int cnt = 50;
+		var countdown = new CountdownEvent(cnt);
+
+		// --- first part of events
+		WriteEvents(cnt, miniNode, countdown);
+		Assert.IsTrue(countdown.Wait(TimeSpan.FromSeconds(10)), "Took too long writing first part of events.");
+		countdown.Reset();
+
+		// -- set up truncation
+		var truncatePosition = miniNode.Db.Config.WriterCheckpoint.ReadNonFlushed();
+		miniNode.Db.Config.TruncateCheckpoint.Write(truncatePosition);
+		miniNode.Db.Config.TruncateCheckpoint.Flush();
+
+		// --- second part of events
+		WriteEvents(cnt, miniNode, countdown);
+		Assert.IsTrue(countdown.Wait(TimeSpan.FromSeconds(10)), "Took too long writing second part of events.");
+		countdown.Reset();
+
+		await miniNode.Shutdown(keepDb: true);
+
+		// --- first restart and truncation
+		miniNode = new MiniNode<TLogFormat, TStreamId>(PathName, tcpPort, httpPort, inMemDb: false);
+		await miniNode.Start();
+		await miniNode.Shutdown(keepDb: true);
+
+		// --- second restart after truncation
+		miniNode = new MiniNode<TLogFormat, TStreamId>(PathName, tcpPort, httpPort, inMemDb: false);
+		await miniNode.Start();
+		Assert.AreEqual(-1, miniNode.Db.Config.TruncateCheckpoint.Read());
+		Assert.That(miniNode.Db.Config.WriterCheckpoint.Read(), Is.GreaterThanOrEqualTo(truncatePosition));
+
+		// -- third part of events
+		WriteEvents(cnt, miniNode, countdown);
+		Assert.IsTrue(countdown.Wait(TimeSpan.FromSeconds(10)), "Took too long writing third part of events.");
+		countdown.Reset();
+
+		await miniNode.Shutdown(keepDb: true);
+
+		// -- third restart
+		miniNode = new MiniNode<TLogFormat, TStreamId>(PathName, tcpPort, httpPort, inMemDb: false);
+		Assert.AreEqual(-1, miniNode.Db.Config.TruncateCheckpoint.Read());
+		await miniNode.Start();
+
+		// -- if we get here -- then everything is ok
+		await miniNode.Shutdown();
+	}
+
+	[Test, Category("LongRunning"), Category("Network")]
+	public async Task with_truncate_position_in_completed_chunk_everything_should_go_fine() {
+		const int chunkSize = 1024 * 1024;
+		const int cachedSize = chunkSize * 3;
+
+		var miniNode = new MiniNode<TLogFormat, TStreamId>(PathName, chunkSize: chunkSize, cachedChunkSize: cachedSize, inMemDb: false);
+		await miniNode.Start();
+
+		var httpPort = miniNode.HttpEndPoint.Port;
+		const int cnt = 1;
+		var countdown = new CountdownEvent(cnt);
+
+		// --- first part of events
+		WriteEvents(cnt, miniNode, countdown, MiniNode<TLogFormat, TStreamId>.ChunkSize / 5 * 3);
+		Assert.IsTrue(countdown.Wait(TimeSpan.FromSeconds(10)), "Took too long writing first part of events.");
+		countdown.Reset();
+
+		// -- set up truncation
+		var truncatePosition = miniNode.Db.Config.WriterCheckpoint.ReadNonFlushed();
+		miniNode.Db.Config.TruncateCheckpoint.Write(truncatePosition);
+		miniNode.Db.Config.TruncateCheckpoint.Flush();
+
+		// --- second part of events
+		WriteEvents(cnt, miniNode, countdown, MiniNode<TLogFormat, TStreamId>.ChunkSize / 2);
+		Assert.IsTrue(countdown.Wait(TimeSpan.FromSeconds(10)), "Took too long writing second part of events.");
+		countdown.Reset();
+
+		await miniNode.Shutdown(keepDb: true);
+
+		var tcpPort = miniNode.TcpEndPoint.Port;
+
+		// --- first restart and truncation
+		miniNode = new MiniNode<TLogFormat, TStreamId>(PathName, tcpPort, httpPort, chunkSize: chunkSize,
+			cachedChunkSize: cachedSize, inMemDb: false);
+		await miniNode.Start();
+		await miniNode.Shutdown(keepDb: true);
+
+		// --- second restart after truncation
+		miniNode = new MiniNode<TLogFormat, TStreamId>(PathName, tcpPort, httpPort, chunkSize: chunkSize,
+			cachedChunkSize: cachedSize, inMemDb: false);
+		await miniNode.Start();
+		Assert.AreEqual(-1, miniNode.Db.Config.TruncateCheckpoint.Read());
+		Assert.That(miniNode.Db.Config.WriterCheckpoint.Read(), Is.GreaterThanOrEqualTo(truncatePosition));
+
+		// -- third part of events
+		WriteEvents(cnt, miniNode, countdown, MiniNode<TLogFormat, TStreamId>.ChunkSize / 5);
+		Assert.IsTrue(countdown.Wait(TimeSpan.FromSeconds(10)), "Took too long writing third part of events.");
+		countdown.Reset();
+
+		// -- if we get here -- then everything is ok
+		await miniNode.Shutdown();
+	}
+
+	private static void WriteEvents(int cnt, MiniNode<TLogFormat, TStreamId> miniNode, CountdownEvent countdown, int dataSize = 4000) {
+		for (int i = 0; i < cnt; ++i) {
+			miniNode.Node.MainQueue.Publish(
+				new ClientMessage.WriteEvents(Guid.NewGuid(), Guid.NewGuid(),
+					new CallbackEnvelope(m => {
+						Assert.IsInstanceOf<ClientMessage.WriteEventsCompleted>(m);
+						var msg = (ClientMessage.WriteEventsCompleted)m;
+						Assert.AreEqual(OperationResult.Success, msg.Result);
+						countdown.Signal();
+					}),
+					true,
+					"test-stream",
+					ExpectedVersion.Any,
+					new[] {
+						new Event(Guid.NewGuid(), "test-event-type", false, new byte[dataSize], null)
+					},
+					null));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_few_chunks_with_index_on_disk.cs b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_few_chunks_with_index_on_disk.cs
new file mode 100644
index 00000000000..48516922cb9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_few_chunks_with_index_on_disk.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Collections.Generic;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Truncation;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_truncating_few_chunks_with_index_on_disk<TLogFormat, TStreamId> : TruncateScenario<TLogFormat, TStreamId> {
+	private EventRecord _event4;
+
+	private string _chunk0;
+	private string _chunk1;
+	private string _chunk2;
+	private string _chunk3;
+
+	public when_truncating_few_chunks_with_index_on_disk()
+		: base(maxEntriesInMemTable: 3) {
+	}
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteSingleEvent("ES", 0, new string('.', 4000), token: token);
+		await WriteSingleEvent("ES", 1, new string('.', 4000), token: token);
+		await WriteSingleEvent("ES", 2, new string('.', 4000), retryOnFail: true, token: token); // ptable 1, chunk 1
+		_event4 = await WriteSingleEvent("ES", 3, new string('.', 4000), token: token);
+		await WriteSingleEvent("ES", 4, new string('.', 4000), retryOnFail: true, token: token); // chunk 2
+		await WriteSingleEvent("ES", 5, new string('.', 4000), token: token); // ptable 2
+		await WriteSingleEvent("ES", 6, new string('.', 4000), retryOnFail: true, token: token); // chunk 3
+
+		TruncateCheckpoint = _event4.LogPosition;
+
+		_chunk0 = GetChunkName(0);
+		_chunk1 = GetChunkName(1);
+		_chunk2 = GetChunkName(2);
+		_chunk3 = GetChunkName(3);
+
+		Assert.IsTrue(File.Exists(_chunk0));
+		Assert.IsTrue(File.Exists(_chunk1));
+		Assert.IsTrue(File.Exists(_chunk2));
+		Assert.IsTrue(File.Exists(_chunk3));
+	}
+
+	private string GetChunkName(int chunkNumber) {
+		var allVersions = Db.Manager.FileSystem.LocalNamingStrategy.GetAllVersionsFor(chunkNumber);
+		Assert.AreEqual(1, allVersions.Length);
+		return allVersions[0];
+	}
+
+	[Test]
+	public void checksums_should_be_equal_to_ack_checksum() {
+		Assert.AreEqual(TruncateCheckpoint, WriterCheckpoint.Read());
+		Assert.AreEqual(TruncateCheckpoint, ChaserCheckpoint.Read());
+	}
+
+	[Test]
+	public void truncated_chunks_should_be_deleted() {
+		Assert.IsFalse(File.Exists(_chunk2));
+		Assert.IsFalse(File.Exists(_chunk3));
+	}
+
+	[Test]
+	public async Task not_truncated_chunks_should_survive() {
+		var chunks = await Db.Manager.FileSystem.GetChunks().ToArrayAsync();
+		Assert.AreEqual(2, chunks.Length);
+
+		Assert.AreEqual(_chunk0, GetChunkName(0));
+		Assert.AreEqual(_chunk0, chunks[0].FileName);
+
+		Assert.AreEqual(_chunk1, GetChunkName(1));
+		Assert.AreEqual(_chunk1, chunks[1].FileName);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_few_chunks_with_index_on_disk_and_then_reopening_db.cs b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_few_chunks_with_index_on_disk_and_then_reopening_db.cs
new file mode 100644
index 00000000000..66283b098c3
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_few_chunks_with_index_on_disk_and_then_reopening_db.cs
@@ -0,0 +1,166 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Truncation;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_truncating_few_chunks_with_index_on_disk_and_then_reopening_db<TLogFormat, TStreamId> : TruncateAndReOpenDbScenario<TLogFormat, TStreamId> {
+	private EventRecord _event1;
+	private EventRecord _event2;
+	private EventRecord _event3;
+	private EventRecord _event4;
+	private EventRecord _event7;
+
+	private string _chunk0;
+	private string _chunk1;
+	private string _chunk2;
+	private string _chunk3;
+
+	public when_truncating_few_chunks_with_index_on_disk_and_then_reopening_db()
+		: base(maxEntriesInMemTable: 3) {
+	}
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_event1 = await WriteSingleEvent("ES", 0, new string('.', 4000), token: token); // chunk 0
+		_event2 = await WriteSingleEvent("ES", 1, new string('.', 4000), token: token);
+		_event3 = await WriteSingleEvent("ES", 2, new string('.', 4000), retryOnFail: true, token: token); // ptable 1, chunk 1
+		_event4 = await WriteSingleEvent("ES", 3, new string('.', 4000), token: token);
+		await WriteSingleEvent("ES", 4, new string('.', 4000), retryOnFail: true, token: token); // chunk 2
+		await WriteSingleEvent("ES", 5, new string('.', 4000), token: token); // ptable 2
+		_event7 = await WriteSingleEvent("ES", 6, new string('.', 4000), retryOnFail: true, token: token); // chunk 3
+
+		TruncateCheckpoint = _event4.LogPosition;
+
+		_chunk0 = GetChunkName(0);
+		_chunk1 = GetChunkName(1);
+		_chunk2 = GetChunkName(2);
+		_chunk3 = GetChunkName(3);
+
+		Assert.IsTrue(File.Exists(_chunk0));
+		Assert.IsTrue(File.Exists(_chunk1));
+		Assert.IsTrue(File.Exists(_chunk2));
+		Assert.IsTrue(File.Exists(_chunk3));
+	}
+
+	private string GetChunkName(int chunkNumber) {
+		var allVersions = Db.Manager.FileSystem.LocalNamingStrategy.GetAllVersionsFor(chunkNumber);
+		Assert.AreEqual(1, allVersions.Length);
+		return allVersions[0];
+	}
+
+	[Test]
+	public void checksums_should_be_equal_to_ack_checksum() {
+		Assert.AreEqual(TruncateCheckpoint, WriterCheckpoint.Read());
+		Assert.AreEqual(TruncateCheckpoint, ChaserCheckpoint.Read());
+	}
+
+	[Test]
+	public void truncated_chunks_should_be_deleted() {
+		Assert.IsFalse(File.Exists(_chunk2));
+		Assert.IsFalse(File.Exists(_chunk3));
+	}
+
+	[Test]
+	public async Task not_truncated_chunks_should_survive() {
+		var chunks = await Db.Manager.FileSystem.GetChunks().ToArrayAsync();
+		Assert.AreEqual(2, chunks.Length);
+
+		Assert.AreEqual(_chunk0, GetChunkName(0));
+		Assert.AreEqual(_chunk0, chunks[0].FileName);
+
+		Assert.AreEqual(_chunk1, GetChunkName(1));
+		Assert.AreEqual(_chunk1, chunks[1].FileName);
+	}
+
+	[Test]
+	public async Task read_one_by_one_doesnt_return_truncated_records() {
+		var res = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, res.Result);
+		Assert.AreEqual(_event1, res.Record);
+		res = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, res.Result);
+		Assert.AreEqual(_event2, res.Record);
+		res = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, res.Result);
+		Assert.AreEqual(_event3, res.Record);
+
+		res = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, res.Result);
+		Assert.IsNull(res.Record);
+		res = await ReadIndex.ReadEvent("ES", 4, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, res.Result);
+		Assert.IsNull(res.Record);
+		res = await ReadIndex.ReadEvent("ES", 5, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, res.Result);
+		Assert.IsNull(res.Record);
+		res = await ReadIndex.ReadEvent("ES", 6, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, res.Result);
+		Assert.IsNull(res.Record);
+		res = await ReadIndex.ReadEvent("ES", 7, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, res.Result);
+		Assert.IsNull(res.Record);
+	}
+
+	[Test]
+	public async Task read_stream_forward_doesnt_return_truncated_records() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		var records = res.Records;
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event1, records[0]);
+		Assert.AreEqual(_event2, records[1]);
+		Assert.AreEqual(_event3, records[2]);
+	}
+
+	[Test]
+	public async Task read_stream_backward_doesnt_return_truncated_records() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		var records = res.Records;
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event1, records[2]);
+		Assert.AreEqual(_event2, records[1]);
+		Assert.AreEqual(_event3, records[0]);
+	}
+
+	[Test]
+	public async Task read_all_returns_only_survived_events() {
+		var res = await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None);
+		var records = res.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event1, records[0]);
+		Assert.AreEqual(_event2, records[1]);
+		Assert.AreEqual(_event3, records[2]);
+	}
+
+	[Test]
+	public async Task read_all_backward_doesnt_return_truncated_records() {
+		var res = (await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None));
+		var records = res.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(3, records.Length);
+		Assert.AreEqual(_event1, records[2]);
+		Assert.AreEqual(_event2, records[1]);
+		Assert.AreEqual(_event3, records[0]);
+	}
+
+	[Test]
+	public async Task read_all_backward_from_last_truncated_record_returns_no_records() {
+		var pos = new TFPos(_event7.LogPosition, _event3.LogPosition);
+		var res = await ReadIndex.ReadAllEventsForward(pos, 100, CancellationToken.None);
+		var records = res.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(0, records.Length);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_completed_chunk.cs b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_completed_chunk.cs
new file mode 100644
index 00000000000..f3f879438e0
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_completed_chunk.cs
@@ -0,0 +1,121 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Validation;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.Transforms.Identity;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Truncation;
+
+[TestFixture]
+public class when_truncating_into_the_middle_of_completed_chunk : SpecificationWithDirectoryPerTestFixture {
+	private TFChunkDbConfig _config;
+	private byte[] _file1Contents;
+	private byte[] _file2Contents;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_config = TFChunkHelper.CreateDbConfigEx(PathName, 3711, 5500, 5500, -1, 1111, 1000, -1);
+
+		var rnd = new Random();
+		_file1Contents = new byte[_config.ChunkSize];
+		_file2Contents = new byte[_config.ChunkSize];
+		rnd.NextBytes(_file1Contents);
+		rnd.NextBytes(_file2Contents);
+
+		DbUtil.CreateSingleChunk(_config, 0, GetFilePathFor("chunk-000000.000001"), contents: _file1Contents);
+		DbUtil.CreateSingleChunk(_config, 1, GetFilePathFor("chunk-000001.000002"), contents: _file2Contents);
+		DbUtil.CreateSingleChunk(_config, 2, GetFilePathFor("chunk-000002.000000"));
+		DbUtil.CreateSingleChunk(_config, 3, GetFilePathFor("chunk-000003.000000"));
+
+		var truncator = new TFChunkDbTruncator(_config, new ChunkLocalFileSystem(_config.Path), static _ => new IdentityChunkTransformFactory());
+		await truncator.TruncateDb(_config.TruncateCheckpoint.ReadNonFlushed(), CancellationToken.None);
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await using (var db = new TFChunkDb(_config)) {
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+		}
+
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000001")));
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000002")));
+		Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
+
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void writer_checkpoint_should_be_set_to_exactly_truncation_checkpoint() {
+		Assert.AreEqual(1111, _config.WriterCheckpoint.Read());
+		Assert.AreEqual(1111, _config.WriterCheckpoint.ReadNonFlushed());
+	}
+
+	[Test]
+	public void chaser_checkpoint_should_be_adjusted_if_less_than_actual_truncate_checkpoint() {
+		Assert.AreEqual(1111, _config.ChaserCheckpoint.Read());
+		Assert.AreEqual(1111, _config.ChaserCheckpoint.ReadNonFlushed());
+	}
+
+	[Test]
+	public void epoch_checkpoint_should_be_reset_if_less_than_actual_truncate_checkpoint() {
+		Assert.AreEqual(-1, _config.EpochCheckpoint.Read());
+		Assert.AreEqual(-1, _config.EpochCheckpoint.ReadNonFlushed());
+	}
+
+	[Test]
+	public void truncate_checkpoint_should_be_reset_after_truncation() {
+		Assert.AreEqual(-1, _config.TruncateCheckpoint.Read());
+		Assert.AreEqual(-1, _config.TruncateCheckpoint.ReadNonFlushed());
+	}
+
+	[Test]
+	public void chunks_after_truncation_point_are_deleted() {
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000001")));
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000002")));
+		Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
+	}
+
+	[Test]
+	public void contents_of_first_chunk_should_be_untouched() {
+		var contents = new byte[_config.ChunkSize];
+		using (var fs = File.OpenRead(GetFilePathFor("chunk-000000.000001"))) {
+			fs.Position = ChunkHeader.Size;
+			fs.Read(contents, 0, contents.Length);
+			Assert.AreEqual(_file1Contents, contents);
+		}
+	}
+
+	[Test]
+	public void ongoing_chunk_should_have_full_size_and_filled_with_zeros_after_writer_checkpoint() {
+		var fileInfo = new FileInfo(GetFilePathFor("chunk-000001.000002"));
+		Assert.AreEqual(TFChunk.GetAlignedSize(ChunkHeader.Size + 1000 + ChunkFooter.Size), fileInfo.Length);
+
+		using (var fs = File.OpenRead(fileInfo.FullName)) {
+			var leftDataSize = (int)(_config.WriterCheckpoint.Read() % _config.ChunkSize);
+			var leftData = new byte[leftDataSize];
+			var shouldBeZeros = new byte[_config.ChunkSize - leftDataSize + ChunkFooter.Size];
+
+			fs.Position = ChunkHeader.Size;
+			fs.Read(leftData, 0, leftData.Length);
+
+			var shouldBeLeft = new byte[leftDataSize];
+			Buffer.BlockCopy(_file2Contents, 0, shouldBeLeft, 0, leftDataSize);
+			Assert.AreEqual(shouldBeLeft, leftData);
+
+			fs.Position = ChunkHeader.Size + _config.WriterCheckpoint.Read() % _config.ChunkSize;
+			fs.Read(shouldBeZeros, 0, shouldBeZeros.Length);
+
+			Assert.IsTrue(shouldBeZeros.All(x => x == 0), "Chunk is not zeroed.");
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_multichunk.cs b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_multichunk.cs
new file mode 100644
index 00000000000..347df135e86
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_multichunk.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Validation;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.Transforms.Identity;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Truncation;
+
+[TestFixture]
+public class when_truncating_into_the_middle_of_multichunk : SpecificationWithDirectoryPerTestFixture {
+	private TFChunkDbConfig _config;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_config = TFChunkHelper.CreateDbConfigEx(PathName, 11111, 5500, 5500, -1, 5757, 1000, -1);
+
+		DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000001"));
+		DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000002"));
+		DbUtil.CreateSingleChunk(_config, 3, GetFilePathFor("chunk-000003.000000"));
+		DbUtil.CreateMultiChunk(_config, 3, 10, GetFilePathFor("chunk-000003.000001"));
+		DbUtil.CreateMultiChunk(_config, 3, 10, GetFilePathFor("chunk-000003.000002"));
+		DbUtil.CreateSingleChunk(_config, 4, GetFilePathFor("chunk-000004.000000"));
+		DbUtil.CreateMultiChunk(_config, 4, 4, GetFilePathFor("chunk-000004.000002"));
+		DbUtil.CreateMultiChunk(_config, 5, 7, GetFilePathFor("chunk-000005.000001"));
+		DbUtil.CreateMultiChunk(_config, 8, 9, GetFilePathFor("chunk-000008.000001"));
+		DbUtil.CreateOngoingChunk(_config, 11, GetFilePathFor("chunk-000011.000000"));
+
+		var truncator = new TFChunkDbTruncator(_config, new ChunkLocalFileSystem(_config.Path), static _ => new IdentityChunkTransformFactory());
+		await truncator.TruncateDb(_config.TruncateCheckpoint.ReadNonFlushed(), CancellationToken.None);
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await using (var db = new TFChunkDb(_config)) {
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+		}
+
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000002")));
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000003.000000")));
+		Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
+
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void writer_checkpoint_should_be_set_to_start_of_new_chunk() {
+		Assert.AreEqual(3000, _config.WriterCheckpoint.Read());
+		Assert.AreEqual(3000, _config.WriterCheckpoint.ReadNonFlushed());
+	}
+
+	[Test]
+	public void chaser_checkpoint_should_be_adjusted_if_less_than_actual_truncate_checkpoint() {
+		Assert.AreEqual(3000, _config.ChaserCheckpoint.Read());
+		Assert.AreEqual(3000, _config.ChaserCheckpoint.ReadNonFlushed());
+	}
+
+	[Test]
+	public void epoch_checkpoint_should_be_reset_if_less_than_actual_truncate_checkpoint() {
+		Assert.AreEqual(-1, _config.EpochCheckpoint.Read());
+		Assert.AreEqual(-1, _config.EpochCheckpoint.ReadNonFlushed());
+	}
+
+	[Test]
+	public void truncate_checkpoint_should_be_reset_after_truncation() {
+		Assert.AreEqual(-1, _config.TruncateCheckpoint.Read());
+		Assert.AreEqual(-1, _config.TruncateCheckpoint.ReadNonFlushed());
+	}
+
+	[Test]
+	public void all_excessive_chunks_should_be_deleted() {
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000001")));
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000002")));
+		Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_ongoing_chunk.cs b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_ongoing_chunk.cs
new file mode 100644
index 00000000000..addcd4eca5f
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_ongoing_chunk.cs
@@ -0,0 +1,119 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Validation;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.Transforms.Identity;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Truncation;
+
+[TestFixture]
+public class when_truncating_into_the_middle_of_ongoing_chunk : SpecificationWithDirectoryPerTestFixture {
+	private TFChunkDbConfig _config;
+	private byte[] _file1Contents;
+	private byte[] _file2Contents;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_config = TFChunkHelper.CreateDbConfigEx(PathName, 1711, 5500, 5500, -1, 1111, 1000, -1);
+
+		var rnd = new Random();
+		_file1Contents = new byte[_config.ChunkSize];
+		_file2Contents = new byte[_config.ChunkSize];
+		rnd.NextBytes(_file1Contents);
+		rnd.NextBytes(_file2Contents);
+
+		DbUtil.CreateSingleChunk(_config, 0, GetFilePathFor("chunk-000000.000001"), contents: _file1Contents);
+		DbUtil.CreateOngoingChunk(_config, 1, GetFilePathFor("chunk-000001.000002"), contents: _file2Contents);
+
+		var truncator = new TFChunkDbTruncator(_config, new ChunkLocalFileSystem(_config.Path), static _ => new IdentityChunkTransformFactory());
+		await truncator.TruncateDb(_config.TruncateCheckpoint.ReadNonFlushed(), CancellationToken.None);
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await using (var db = new TFChunkDb(_config)) {
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+		}
+
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000001")));
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000002")));
+		Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
+
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void writer_checkpoint_should_be_set_to_exactly_truncation_checkpoint() {
+		Assert.AreEqual(1111, _config.WriterCheckpoint.Read());
+		Assert.AreEqual(1111, _config.WriterCheckpoint.ReadNonFlushed());
+	}
+
+	[Test]
+	public void chaser_checkpoint_should_be_adjusted_if_less_than_actual_truncate_checkpoint() {
+		Assert.AreEqual(1111, _config.ChaserCheckpoint.Read());
+		Assert.AreEqual(1111, _config.ChaserCheckpoint.ReadNonFlushed());
+	}
+
+	[Test]
+	public void epoch_checkpoint_should_be_reset_if_less_than_actual_truncate_checkpoint() {
+		Assert.AreEqual(-1, _config.EpochCheckpoint.Read());
+		Assert.AreEqual(-1, _config.EpochCheckpoint.ReadNonFlushed());
+	}
+
+	[Test]
+	public void truncate_checkpoint_should_be_reset_after_truncation() {
+		Assert.AreEqual(-1, _config.TruncateCheckpoint.Read());
+		Assert.AreEqual(-1, _config.TruncateCheckpoint.ReadNonFlushed());
+	}
+
+	[Test]
+	public void all_chunks_are_preserved() {
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000001")));
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000002")));
+		Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
+	}
+
+	[Test]
+	public void contents_of_first_chunk_should_be_untouched() {
+		var contents = new byte[_config.ChunkSize];
+		using (var fs = File.OpenRead(GetFilePathFor("chunk-000000.000001"))) {
+			fs.Position = ChunkHeader.Size;
+			fs.Read(contents, 0, contents.Length);
+			Assert.AreEqual(_file1Contents, contents);
+		}
+	}
+
+	[Test]
+	public void ongoing_chunk_should_have_full_size_and_filled_with_zeros_after_writer_checkpoint() {
+		var fileInfo = new FileInfo(GetFilePathFor("chunk-000001.000002"));
+		Assert.AreEqual(TFChunk.GetAlignedSize(ChunkHeader.Size + 1000 + ChunkFooter.Size), fileInfo.Length);
+
+		using (var fs = File.OpenRead(fileInfo.FullName)) {
+			var leftDataSize = (int)(_config.WriterCheckpoint.Read() % _config.ChunkSize);
+			var leftData = new byte[leftDataSize];
+			var shouldBeZeros = new byte[_config.ChunkSize - leftDataSize + ChunkFooter.Size];
+
+			fs.Position = ChunkHeader.Size;
+			fs.Read(leftData, 0, leftData.Length);
+
+			var shouldBeLeft = new byte[leftDataSize];
+			Buffer.BlockCopy(_file2Contents, 0, shouldBeLeft, 0, leftDataSize);
+			Assert.AreEqual(shouldBeLeft, leftData);
+
+			fs.Position = ChunkHeader.Size + _config.WriterCheckpoint.Read() % _config.ChunkSize;
+			fs.Read(shouldBeZeros, 0, shouldBeZeros.Length);
+
+			Assert.IsTrue(shouldBeZeros.All(x => x == 0), "Chunk is not zeroed!");
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_scavenged_chunk_with_index_in_memory.cs b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_scavenged_chunk_with_index_in_memory.cs
new file mode 100644
index 00000000000..35e24250d91
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_scavenged_chunk_with_index_in_memory.cs
@@ -0,0 +1,86 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Collections.Generic;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Truncation;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_truncating_into_the_middle_of_scavenged_chunk_with_index_in_memory<TLogFormat, TStreamId> : TruncateScenario<TLogFormat, TStreamId> {
+	private string chunk0;
+	private string chunk1;
+	private string chunk2;
+	private string chunk3;
+
+	private EventRecord chunkEdge;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteSingleEvent("ES1", 0, new string('.', 3000), token: token); // chunk 0
+		await WriteSingleEvent("ES1", 1, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES2", 0, new string('.', 3000), token: token);
+		chunkEdge = await WriteSingleEvent("ES1", 2, new string('.', 3000), retryOnFail: true, token: token); // chunk 1
+		var ackRec = await WriteSingleEvent("ES1", 3, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES1", 4, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES1", 5, new string('.', 3000), retryOnFail: true, token: token); // chunk 2
+		await WriteSingleEvent("ES1", 6, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES1", 7, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES1", 8, new string('.', 3000), retryOnFail: true, token: token); // chunk 3
+
+		await WriteDelete("ES1", token);
+		Scavenge(completeLast: false, mergeChunks: false);
+
+		TruncateCheckpoint = ackRec.LogPosition;
+	}
+
+	protected override void OnBeforeTruncating() {
+		// scavenged chunk names
+		// TODO MM: avoid this complexity - try scavenging exactly at where its invoked and not wait for readIndex to rebuild
+		chunk0 = GetChunkName(0);
+		chunk1 = GetChunkName(1);
+		chunk2 = GetChunkName(2);
+		chunk3 = GetChunkName(3);
+
+		Assert.IsTrue(File.Exists(chunk0));
+		Assert.IsTrue(File.Exists(chunk1));
+		Assert.IsTrue(File.Exists(chunk2));
+		Assert.IsTrue(File.Exists(chunk3));
+	}
+
+	private string GetChunkName(int chunkNumber) {
+		var allVersions = Db.Manager.FileSystem.LocalNamingStrategy.GetAllVersionsFor(chunkNumber);
+		Assert.AreEqual(1, allVersions.Length);
+		return allVersions[0];
+	}
+
+	[Test]
+	public void checksums_should_be_equal_to_beginning_of_intersected_scavenged_chunk() {
+		Assert.AreEqual(chunkEdge.TransactionPosition, WriterCheckpoint.Read());
+		Assert.AreEqual(chunkEdge.TransactionPosition, ChaserCheckpoint.Read());
+	}
+
+	[Test]
+	public void truncated_chunks_should_be_deleted() {
+		Assert.IsFalse(File.Exists(chunk2));
+		Assert.IsFalse(File.Exists(chunk3));
+	}
+
+	[Test]
+	public void intersecting_chunk_should_be_deleted() {
+		Assert.IsFalse(File.Exists(chunk1));
+	}
+
+	[Test]
+	public async Task untouched_chunk_should_survive() {
+		var chunks = await Db.Manager.FileSystem.GetChunks().ToArrayAsync();
+		Assert.AreEqual(1, chunks.Length);
+
+		Assert.AreEqual(chunk0, GetChunkName(0));
+		Assert.AreEqual(chunk0, chunks[0].FileName);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_scavenged_chunk_with_index_in_memory_and_then_reopening_db.cs b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_scavenged_chunk_with_index_in_memory_and_then_reopening_db.cs
new file mode 100644
index 00000000000..0802e5fe745
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_into_the_middle_of_scavenged_chunk_with_index_in_memory_and_then_reopening_db.cs
@@ -0,0 +1,154 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Truncation;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_truncating_into_the_middle_of_scavenged_chunk_with_index_in_memory_and_then_reopening_db<TLogFormat, TStreamId> :
+		TruncateAndReOpenDbScenario<TLogFormat, TStreamId> {
+	// actually this case is not fully handled by EventStore. When some records have been scavenged, but truncated in a middle of chunk,
+	// we lose the delete record, so we don't consider this stream as deleted, but still we have scavenged a lot of records, that are not scavenged in other replicas.
+	// nonetheless this scenario is very very unlikely to happen, that's why it is not handled. if it still does happen - a whole db on truncated node should be deleted
+
+	private string _chunk0;
+	private string _chunk1;
+	private string _chunk2;
+	private string _chunk3;
+	private EventRecord _event2;
+	private EventRecord _chunkEdge;
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteSingleEvent("ES1", 0, new string('.', 3000), token: token); // chunk 0
+		await WriteSingleEvent("ES1", 1, new string('.', 3000), token: token);
+		_event2 = await WriteSingleEvent("ES2", 0, new string('.', 3000), token: token);
+		_chunkEdge = await WriteSingleEvent("ES1", 2, new string('.', 3000), retryOnFail: true, token: token); // chunk 1
+		var rec = await WriteSingleEvent("ES1", 3, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES1", 4, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES1", 5, new string('.', 3000), retryOnFail: true, token: token); // chunk 2
+		await WriteSingleEvent("ES1", 6, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES1", 7, new string('.', 3000), token: token);
+		await WriteSingleEvent("ES1", 8, new string('.', 3000), retryOnFail: true, token: token); // chunk 3
+
+		await WriteDelete("ES1", token);
+		Scavenge(completeLast: false, mergeChunks: false);
+
+		TruncateCheckpoint = rec.LogPosition;
+	}
+
+	protected override void OnBeforeTruncating() {
+		// scavenged chunk names
+		// TODO MM: avoid this complexity - try scavenging exactly at where its invoked and not wait for readIndex to rebuild
+		_chunk0 = GetChunkName(0);
+		_chunk1 = GetChunkName(1);
+		_chunk2 = GetChunkName(2);
+		_chunk3 = GetChunkName(3);
+
+		Assert.IsTrue(File.Exists(_chunk0));
+		Assert.IsTrue(File.Exists(_chunk1));
+		Assert.IsTrue(File.Exists(_chunk2));
+		Assert.IsTrue(File.Exists(_chunk3));
+	}
+
+	private string GetChunkName(int chunkNumber) {
+		var allVersions = Db.Manager.FileSystem.LocalNamingStrategy.GetAllVersionsFor(chunkNumber);
+		Assert.AreEqual(1, allVersions.Length);
+		return allVersions[0];
+	}
+
+	[Test]
+	public void truncated_chunks_should_be_deleted() {
+		Assert.IsFalse(File.Exists(_chunk2));
+		Assert.IsFalse(File.Exists(_chunk3));
+	}
+
+	[Test]
+	public void intersecting_chunk_should_be_deleted() {
+		Assert.IsFalse(File.Exists(_chunk1));
+	}
+
+	[Test]
+	public void untouched_chunk_should_survive() {
+		Assert.AreEqual(_chunk0, GetChunkName(0));
+	}
+
+	[Test]
+	public void checksums_should_be_equal_to_beginning_of_intersected_scavenged_chunk() {
+		Assert.AreEqual(_chunkEdge.TransactionPosition, WriterCheckpoint.Read());
+		Assert.AreEqual(_chunkEdge.TransactionPosition, ChaserCheckpoint.Read());
+	}
+
+	[Test]
+	public async Task read_one_by_one_returns_survived_records() {
+		var res = await ReadIndex.ReadEvent("ES2", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, res.Result);
+		Assert.AreEqual(_event2, res.Record);
+	}
+
+	[Test]
+	public async Task there_is_no_previously_scavenged_stream_which_delete_record_was_truncated() {
+		var res = await ReadIndex.ReadEvent("ES1", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NoStream, res.Result);
+		Assert.IsNull(res.Record);
+	}
+
+	[Test]
+	public async Task read_stream_forward_doesnt_return_untouched_records() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES2", 0, 100, CancellationToken.None);
+		var records = res.Records;
+		Assert.AreEqual(1, records.Length);
+		Assert.AreEqual(_event2, records[0]);
+	}
+
+	[Test]
+	public async Task read_stream_forward_doesnt_return_truncated_or_scavenged_records_but_returns_stream_created() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES1", 0, 100, CancellationToken.None);
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+	[Test]
+	public async Task read_stream_backward_doesnt_return_untoucned_records() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES2", -1, 100, CancellationToken.None);
+		var records = res.Records;
+		Assert.AreEqual(1, records.Length);
+		Assert.AreEqual(_event2, records[0]);
+	}
+
+	[Test]
+	public async Task read_stream_backward_doesnt_return_truncated_records() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES1", -1, 100, CancellationToken.None);
+		var records = res.Records;
+		Assert.AreEqual(0, records.Length);
+	}
+
+	[Test]
+	public async Task read_all_forward_returns_only_survived_events() {
+		var res = await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None);
+		var records = res.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+
+		Assert.AreEqual(1, records.Length);
+		Assert.AreEqual(_event2, records[0]);
+	}
+
+	[Test]
+	public async Task read_all_backward_doesnt_return_truncated_records() {
+		var res = await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None);
+		var records = res.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+
+		Assert.AreEqual(1, records.Length);
+		Assert.AreEqual(_event2, records[0]);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_right_at_the_end_of_multichunk.cs b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_right_at_the_end_of_multichunk.cs
new file mode 100644
index 00000000000..5a0ea0dfd49
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_right_at_the_end_of_multichunk.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Validation;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.Transforms.Identity;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Truncation;
+
+[TestFixture]
+public class when_truncating_right_at_the_end_of_multichunk : SpecificationWithDirectoryPerTestFixture {
+	private TFChunkDbConfig _config;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_config = TFChunkHelper.CreateDbConfigEx(PathName, 13500, 5500, 5500, -1, 11000, 1000, -1);
+
+		DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000001"));
+		DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000002"));
+		DbUtil.CreateMultiChunk(_config, 3, 10, GetFilePathFor("chunk-000003.000001"));
+		DbUtil.CreateMultiChunk(_config, 3, 10, GetFilePathFor("chunk-000003.000002"));
+		DbUtil.CreateMultiChunk(_config, 7, 8, GetFilePathFor("chunk-000007.000001"));
+		DbUtil.CreateMultiChunk(_config, 11, 12, GetFilePathFor("chunk-000011.000001"));
+		DbUtil.CreateOngoingChunk(_config, 13, GetFilePathFor("chunk-000013.000000"));
+
+		var truncator = new TFChunkDbTruncator(_config, new ChunkLocalFileSystem(_config.Path), static _ => new IdentityChunkTransformFactory());
+		await truncator.TruncateDb(_config.TruncateCheckpoint.ReadNonFlushed(), CancellationToken.None);
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await using (var db = new TFChunkDb(_config)) {
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+		}
+
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000002")));
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000003.000002")));
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000011.000000")));
+		Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
+
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void writer_checkpoint_should_be_set_to_truncate_checkpoint() {
+		Assert.AreEqual(11000, _config.WriterCheckpoint.Read());
+		Assert.AreEqual(11000, _config.WriterCheckpoint.ReadNonFlushed());
+	}
+
+	[Test]
+	public void chaser_checkpoint_should_be_left_as_is_if_less_than_truncate_checkpoint() {
+		Assert.AreEqual(5500, _config.ChaserCheckpoint.Read());
+		Assert.AreEqual(5500, _config.ChaserCheckpoint.ReadNonFlushed());
+	}
+
+	[Test]
+	public void epoch_checkpoint_should_be_left_as_is_if_less_than_truncate_checkpoint() {
+		Assert.AreEqual(5500, _config.EpochCheckpoint.Read());
+		Assert.AreEqual(5500, _config.EpochCheckpoint.ReadNonFlushed());
+	}
+
+	[Test]
+	public void truncate_checkpoint_should_be_reset_after_truncation() {
+		Assert.AreEqual(-1, _config.TruncateCheckpoint.Read());
+		Assert.AreEqual(-1, _config.TruncateCheckpoint.ReadNonFlushed());
+	}
+
+	[Test]
+	public void every_chunk_that_end_by_the_truncation_checkpoint_is_preserved() {
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000001")));
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000002")));
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000003.000001")));
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000003.000002")));
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000007.000001")));
+		Assert.AreEqual(5, Directory.GetFiles(PathName, "*").Length);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_single_uncompleted_chunk_with_index_in_memory_and_then_reopening_db.cs b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_single_uncompleted_chunk_with_index_in_memory_and_then_reopening_db.cs
new file mode 100644
index 00000000000..39b22fa31c3
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_single_uncompleted_chunk_with_index_in_memory_and_then_reopening_db.cs
@@ -0,0 +1,103 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Truncation;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_truncating_single_uncompleted_chunk_with_index_in_memory_and_then_reopening_db<TLogFormat, TStreamId> :
+		TruncateAndReOpenDbScenario<TLogFormat, TStreamId> {
+	private EventRecord _event1;
+	private EventRecord _event2;
+	private EventRecord _event3;
+
+	public when_truncating_single_uncompleted_chunk_with_index_in_memory_and_then_reopening_db()
+		: base(20000) {
+	}
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		_event1 = await WriteSingleEvent("ES", 0, new string('.', 500), token: token);
+		_event2 = await WriteSingleEvent("ES", 1, new string('.', 500), token: token); // truncated
+		_event3 = await WriteSingleEvent("ES", 2, new string('.', 500), token: token); // truncated
+
+		TruncateCheckpoint = _event2.LogPosition;
+	}
+
+	[Test]
+	public void checksums_should_be_equal_to_ack_checksum() {
+		Assert.AreEqual(TruncateCheckpoint, WriterCheckpoint.Read());
+		Assert.AreEqual(TruncateCheckpoint, ChaserCheckpoint.Read());
+	}
+
+	[Test]
+	public async Task read_one_by_one_doesnt_return_truncated_records() {
+		var res = await ReadIndex.ReadEvent("ES", 0, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.Success, res.Result);
+		Assert.AreEqual(_event1, res.Record);
+
+		res = await ReadIndex.ReadEvent("ES", 1, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, res.Result);
+		Assert.IsNull(res.Record);
+
+		res = await ReadIndex.ReadEvent("ES", 2, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, res.Result);
+		Assert.IsNull(res.Record);
+
+		res = await ReadIndex.ReadEvent("ES", 3, CancellationToken.None);
+		Assert.AreEqual(ReadEventResult.NotFound, res.Result);
+		Assert.IsNull(res.Record);
+	}
+
+	[Test]
+	public async Task read_stream_forward_doesnt_return_truncated_records() {
+		var res = await ReadIndex.ReadStreamEventsForward("ES", 0, 100, CancellationToken.None);
+		var records = res.Records;
+		Assert.AreEqual(1, records.Length);
+		Assert.AreEqual(_event1, records[0]);
+	}
+
+	[Test]
+	public async Task read_stream_backward_doesnt_return_truncated_records() {
+		var res = await ReadIndex.ReadStreamEventsBackward("ES", -1, 100, CancellationToken.None);
+		var records = res.Records;
+		Assert.AreEqual(1, records.Length);
+		Assert.AreEqual(_event1, records[0]);
+	}
+
+	[Test]
+	public async Task read_all_forward_doesnt_return_truncated_records() {
+		var res = await ReadIndex.ReadAllEventsForward(new TFPos(0, 0), 100, CancellationToken.None);
+		var records = res.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(1, records.Length);
+		Assert.AreEqual(_event1, records[0]);
+	}
+
+	[Test]
+	public async Task read_all_backward_doesnt_return_truncated_records() {
+		var res = await ReadIndex.ReadAllEventsBackward(GetBackwardReadPos(), 100, CancellationToken.None);
+		var records = res.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(1, records.Length);
+		Assert.AreEqual(_event1, records[0]);
+	}
+
+	[Test]
+	public async Task read_all_backward_from_last_truncated_record_returns_no_records() {
+		var pos = new TFPos(_event3.LogPosition, _event3.LogPosition);
+		var res = await ReadIndex.ReadAllEventsForward(pos, 100, CancellationToken.None);
+		var records = res.EventRecords()
+			.Select(r => r.Event)
+			.ToArray();
+		Assert.AreEqual(0, records.Length);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_single_uncompleted_chunk_with_index_on_disk.cs b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_single_uncompleted_chunk_with_index_on_disk.cs
new file mode 100644
index 00000000000..d0bd94ef324
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_single_uncompleted_chunk_with_index_on_disk.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Truncation;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_truncating_single_uncompleted_chunk_with_index_on_disk<TLogFormat, TStreamId> : TruncateScenario<TLogFormat, TStreamId> {
+	private EventRecord _event2;
+
+	public when_truncating_single_uncompleted_chunk_with_index_on_disk()
+		: base(maxEntriesInMemTable: 3) {
+	}
+
+	protected override async ValueTask WriteTestScenario(CancellationToken token) {
+		await WriteSingleEvent("ES", 0, new string('.', 500), token: token);
+		_event2 = await WriteSingleEvent("ES", 1, new string('.', 500), token: token);
+		await WriteSingleEvent("ES", 2, new string('.', 500), token: token); // index goes to disk
+		await WriteSingleEvent("ES", 3, new string('.', 500), token: token);
+
+		TruncateCheckpoint = _event2.LogPosition;
+	}
+
+	[Test]
+	public void checksums_should_be_equal_to_ack_checksum() {
+		Assert.AreEqual(TruncateCheckpoint, WriterCheckpoint.Read());
+		Assert.AreEqual(TruncateCheckpoint, ChaserCheckpoint.Read());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_to_a_data_chunk_boundary.cs b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_to_a_data_chunk_boundary.cs
new file mode 100644
index 00000000000..a1f48ded7d1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_to_a_data_chunk_boundary.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Validation;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.Transforms.Identity;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Truncation;
+
+[TestFixture]
+public class when_truncating_to_a_data_chunk_boundary : SpecificationWithDirectoryPerTestFixture {
+	private TFChunkDbConfig _config;
+
+	private const int ChunkSize = 1000;
+	private const long TruncateChk = ChunkSize * 3;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_config = TFChunkHelper.CreateDbConfigEx(PathName, 11111, 5500, 5500, -1, TruncateChk, ChunkSize, -1);
+
+		DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000001"));
+		DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000002"));
+		DbUtil.CreateSingleChunk(_config, 3, GetFilePathFor("chunk-000003.000000"));
+		DbUtil.CreateSingleChunk(_config, 4, GetFilePathFor("chunk-000004.000000"));
+		DbUtil.CreateOngoingChunk(_config, 5, GetFilePathFor("chunk-000005.000000"));
+
+		var truncator = new TFChunkDbTruncator(_config, new ChunkLocalFileSystem(_config.Path), static _ => new IdentityChunkTransformFactory());
+		await truncator.TruncateDb(_config.TruncateCheckpoint.ReadNonFlushed(), CancellationToken.None);
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await using (var db = new TFChunkDb(_config)) {
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+		}
+
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000002")));
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000003.000000")));
+		Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
+
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void chunk_at_boundary_should_be_deleted() {
+		var files = Directory.GetFiles(PathName, "*").Select(Path.GetFileName).Order().ToArray();
+		Assert.AreEqual(new[] { "chunk-000000.000001", "chunk-000000.000002" }, files);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_to_a_scavenged_chunk_boundary.cs b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_to_a_scavenged_chunk_boundary.cs
new file mode 100644
index 00000000000..21536a8a72c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_to_a_scavenged_chunk_boundary.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Validation;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.Transforms.Identity;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Truncation;
+
+[TestFixture]
+public class when_truncating_to_a_scavenged_chunk_boundary : SpecificationWithDirectoryPerTestFixture {
+	private TFChunkDbConfig _config;
+
+	private const int ChunkSize = 1000;
+	private const long TruncateChk = ChunkSize * 3;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_config = TFChunkHelper.CreateDbConfigEx(PathName, 11111, 5500, 5500, -1, TruncateChk, ChunkSize, -1);
+
+		DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000001"));
+		DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000002"));
+		DbUtil.CreateMultiChunk(_config, 3, 3, GetFilePathFor("chunk-000003.000001"));
+		DbUtil.CreateSingleChunk(_config, 4, GetFilePathFor("chunk-000004.000000"));
+		DbUtil.CreateOngoingChunk(_config, 5, GetFilePathFor("chunk-000005.000000"));
+
+		var truncator = new TFChunkDbTruncator(_config, new ChunkLocalFileSystem(_config.Path), static _ => new IdentityChunkTransformFactory());
+		await truncator.TruncateDb(_config.TruncateCheckpoint.ReadNonFlushed(), CancellationToken.None);
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await using (var db = new TFChunkDb(_config)) {
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+		}
+
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000002")));
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000003.000000")));
+		Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
+
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void chunk_at_boundary_should_be_deleted() {
+		var files = Directory.GetFiles(PathName, "*").Select(Path.GetFileName).Order().ToArray();
+		Assert.AreEqual(new[] { "chunk-000000.000001", "chunk-000000.000002" }, files);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_to_the_very_beginning_of_db.cs b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_to_the_very_beginning_of_db.cs
new file mode 100644
index 00000000000..187a06e5de5
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Truncation/when_truncating_to_the_very_beginning_of_db.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.TransactionLog.Validation;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.Transforms.Identity;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Truncation;
+
+[TestFixture]
+public class when_truncating_to_the_very_beginning_of_multichunk_db : SpecificationWithDirectoryPerTestFixture {
+	private TFChunkDbConfig _config;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_config = TFChunkHelper.CreateDbConfigEx(PathName, 11111, 5500, 5500, -1, 0, 1000, -1);
+
+		DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000001"));
+		DbUtil.CreateMultiChunk(_config, 0, 2, GetFilePathFor("chunk-000000.000002"));
+		DbUtil.CreateMultiChunk(_config, 3, 10, GetFilePathFor("chunk-000003.000001"));
+		DbUtil.CreateMultiChunk(_config, 3, 10, GetFilePathFor("chunk-000003.000002"));
+		DbUtil.CreateMultiChunk(_config, 7, 8, GetFilePathFor("chunk-000007.000001"));
+		DbUtil.CreateOngoingChunk(_config, 11, GetFilePathFor("chunk-000011.000000"));
+
+		var truncator = new TFChunkDbTruncator(_config, new ChunkLocalFileSystem(_config.Path), static _ => new IdentityChunkTransformFactory());
+		await truncator.TruncateDb(_config.TruncateCheckpoint.ReadNonFlushed(), CancellationToken.None);
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await using (var db = new TFChunkDb(_config)) {
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+		}
+
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
+		Assert.AreEqual(1, Directory.GetFiles(PathName, "*").Length);
+
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void writer_checkpoint_should_be_set_to_start_of_new_chunk() {
+		Assert.AreEqual(0, _config.WriterCheckpoint.Read());
+		Assert.AreEqual(0, _config.WriterCheckpoint.ReadNonFlushed());
+	}
+
+	[Test]
+	public void chaser_checkpoint_should_be_adjusted_if_less_than_actual_truncate_checkpoint() {
+		Assert.AreEqual(0, _config.ChaserCheckpoint.Read());
+		Assert.AreEqual(0, _config.ChaserCheckpoint.ReadNonFlushed());
+	}
+
+	[Test]
+	public void epoch_checkpoint_should_be_reset_if_less_than_actual_truncate_checkpoint() {
+		Assert.AreEqual(-1, _config.EpochCheckpoint.Read());
+		Assert.AreEqual(-1, _config.EpochCheckpoint.ReadNonFlushed());
+	}
+
+	[Test]
+	public void truncate_checkpoint_should_be_reset_after_truncation() {
+		Assert.AreEqual(-1, _config.TruncateCheckpoint.Read());
+		Assert.AreEqual(-1, _config.TruncateCheckpoint.ReadNonFlushed());
+	}
+
+	[Test]
+	public void all_chunks_should_be_deleted() {
+		Assert.AreEqual(0, Directory.GetFiles(PathName, "*").Length);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Unbuffered/UnbufferedTests.cs b/src/KurrentDB.Core.Tests/TransactionLog/Unbuffered/UnbufferedTests.cs
new file mode 100644
index 00000000000..d4d5c0c3808
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Unbuffered/UnbufferedTests.cs
@@ -0,0 +1,706 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using KurrentDB.Core.TransactionLog.Unbuffered;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Unbuffered;
+
+[TestFixture]
+public class UnbufferedTests : SpecificationWithDirectory {
+	[Test]
+	public void when_resizing_a_file() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+
+		var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096);
+		stream.SetLength(4096 * 1024);
+		stream.Close();
+		Assert.AreEqual(4096 * 1024, new FileInfo(filename).Length);
+	}
+
+	[Test]
+	public void when_expanding_an_aligned_file_by_one_page() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+
+		var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096);
+
+		var initialFileSize = 4096 * 1024;
+		stream.SetLength(initialFileSize); //initial size of 4MB
+
+		stream.Seek(0, SeekOrigin.End);
+
+		Assert.AreEqual(initialFileSize, stream.Position); //verify position
+		stream.SetLength(initialFileSize + 4096); //expand file by 4KB
+		Assert.AreEqual(initialFileSize, stream.Position); //position should not change
+
+		stream.Close();
+
+		Assert.AreEqual(initialFileSize + 4096, new FileInfo(filename).Length); //file size should increase by 4KB
+	}
+
+	[Test]
+	public void when_expanding_an_aligned_file_by_one_byte_less_than_one_page() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+
+		var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096);
+
+		var initialFileSize = 4096 * 1024;
+		stream.SetLength(initialFileSize); //initial size of 4MB
+
+		stream.Seek(0, SeekOrigin.End);
+
+		Assert.AreEqual(initialFileSize, stream.Position); //verify position
+		stream.SetLength(initialFileSize + 4095); //expand file by 4KB - 1
+		Assert.AreEqual(initialFileSize, stream.Position); //position should not change
+
+		stream.Close();
+
+		Assert.AreEqual(initialFileSize + 4096, new FileInfo(filename).Length); //file size should increase by 4KB
+	}
+
+	[Test]
+	public void when_expanding_an_aligned_file_by_one_byte_more_than_one_page() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+
+		var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096);
+
+		var initialFileSize = 4096 * 1024;
+		stream.SetLength(initialFileSize); //initial size of 4MB
+
+		stream.Seek(0, SeekOrigin.End);
+
+		Assert.AreEqual(initialFileSize, stream.Position); //verify position
+		stream.SetLength(initialFileSize + 4097); //expand file by 4KB + 1
+		Assert.AreEqual(initialFileSize, stream.Position); //position should not change
+
+		stream.Close();
+
+		Assert.AreEqual(initialFileSize + 4096 * 2, new FileInfo(filename).Length); //file size should increase by 4KB x 2
+	}
+
+	[Test]
+	public void when_expanding_an_aligned_file_by_one_byte() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+
+		var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096);
+
+		var initialFileSize = 4096 * 1024;
+		stream.SetLength(initialFileSize); //initial size of 4MB
+
+		stream.Seek(0, SeekOrigin.End);
+
+		Assert.AreEqual(initialFileSize, stream.Position); //verify position
+		stream.SetLength(initialFileSize + 1); //expand file by 1 byte
+		Assert.AreEqual(initialFileSize, stream.Position); //position should not change
+
+		stream.Close();
+
+		Assert.AreEqual(initialFileSize + 4096, new FileInfo(filename).Length); //file size should increase by 4KB
+	}
+
+	[Test]
+	public void when_truncating_an_aligned_file_by_one_page() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+
+		var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096);
+
+		var initialFileSize = 4096 * 1024;
+		stream.SetLength(initialFileSize); //initial size of 4MB
+
+		stream.Seek(0, SeekOrigin.End);
+
+		Assert.AreEqual(initialFileSize, stream.Position); //verify position
+		stream.SetLength(initialFileSize - 4096); //truncate file by 4KB
+		Assert.AreEqual(initialFileSize - 4096, stream.Position); //position should decrease by 4KB
+
+		stream.Close();
+
+		Assert.AreEqual(initialFileSize - 4096, new FileInfo(filename).Length); //file size should decrease by 4KB
+	}
+
+	[Test]
+	public void when_truncating_an_aligned_file_by_one_page_and_position_one_page_from_eof() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+
+		var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096);
+
+		var initialFileSize = 4096 * 1024;
+		stream.SetLength(initialFileSize); //initial size of 4MB
+
+		stream.Seek(-4096, SeekOrigin.End);
+
+		Assert.AreEqual(initialFileSize - 4096, stream.Position); //verify position
+		stream.SetLength(initialFileSize - 4096); //truncate file by 4KB
+		Assert.AreEqual(initialFileSize - 4096, stream.Position); //position should not change
+
+		stream.Close();
+
+		Assert.AreEqual(initialFileSize - 4096, new FileInfo(filename).Length); //file size should decrease by 4KB
+	}
+
+	[Test]
+	public void when_truncating_an_aligned_file_by_one_byte_less_than_a_page() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+
+		var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096);
+
+		var initialFileSize = 4096 * 1024;
+		stream.SetLength(initialFileSize); //initial size of 4MB
+
+		stream.Seek(0, SeekOrigin.End);
+
+		Assert.AreEqual(initialFileSize, stream.Position); //verify position
+		stream.SetLength(initialFileSize - 4095); //truncate file by 4KB - 1
+		Assert.AreEqual(initialFileSize, stream.Position); //position should not change
+
+		stream.Close();
+
+		Assert.AreEqual(initialFileSize, new FileInfo(filename).Length); //file size should not change
+	}
+
+	[Test]
+	public void when_truncating_an_aligned_file_by_one_byte_more_than_a_page() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+
+		var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096);
+
+		var initialFileSize = 4096 * 1024;
+		stream.SetLength(initialFileSize); //initial size of 4MB
+
+		stream.Seek(0, SeekOrigin.End);
+
+		Assert.AreEqual(initialFileSize, stream.Position); //verify position
+		stream.SetLength(initialFileSize - 4097); //truncate file by 4KB + 1
+		Assert.AreEqual(initialFileSize - 4096, stream.Position); //position should decrease by 4KB
+
+		stream.Close();
+
+		Assert.AreEqual(initialFileSize - 4096, new FileInfo(filename).Length); //file size should decrease by 4KB
+	}
+
+	[Test]
+	public void when_truncating_an_aligned_file_by_one_byte() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+
+		var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096);
+
+		var initialFileSize = 4096 * 1024;
+		stream.SetLength(initialFileSize); //initial size of 4MB
+
+		stream.Seek(0, SeekOrigin.End);
+
+		Assert.AreEqual(initialFileSize, stream.Position); //verify position
+		stream.SetLength(initialFileSize - 1); //truncate file by 1 byte
+		Assert.AreEqual(initialFileSize, stream.Position); //position should not change
+
+		stream.Close();
+
+		Assert.AreEqual(initialFileSize, new FileInfo(filename).Length); //file size should not change
+	}
+
+	[Test]
+	public void when_writing_less_than_buffer() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+		var bytes = GetBytes(255);
+		using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+			stream.Write(bytes, 0, bytes.Length);
+			Assert.AreEqual(bytes.Length, stream.Position);
+			Assert.AreEqual(0, new FileInfo(filename).Length);
+		}
+	}
+
+	[Test]
+	public void when_writing_more_than_buffer() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+		var bytes = GetBytes(9000);
+		using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+			stream.Write(bytes, 0, bytes.Length);
+			Assert.AreEqual(4096 * 2, new FileInfo(filename).Length);
+			var read = ReadAllBytesShared(filename);
+			for (var i = 0; i < 4096 * 2; i++) {
+				Assert.AreEqual(i % 256, read[i]);
+			}
+		}
+	}
+
+	[Test]
+	public void when_writing_less_than_buffer_and_closing() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+		var bytes = GetBytes(255);
+		using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+			stream.Write(bytes, 0, bytes.Length);
+		}
+
+		Assert.AreEqual(4096, new FileInfo(filename).Length);
+		var read = ReadAllBytesShared(filename);
+
+		for (var i = 0; i < 255; i++) {
+			Assert.AreEqual(i % 256, read[i]);
+		}
+	}
+
+	[Test, Ignore("Requires a 4gb file")]
+	public void when_seeking_greater_than_2gb() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+		var GIGABYTE = 1024L * 1024L * 1024L;
+		try {
+			using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+				FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+				stream.SetLength(4L * GIGABYTE);
+				stream.Seek(3L * GIGABYTE, SeekOrigin.Begin);
+			}
+		} finally {
+			File.Delete(filename);
+		}
+	}
+
+	[Test]
+	public void when_writing_less_than_buffer_and_seeking() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+		var bytes = GetBytes(255);
+		using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+			stream.Write(bytes, 0, bytes.Length);
+			stream.Seek(0, SeekOrigin.Begin);
+			Assert.AreEqual(0, stream.Position);
+			Assert.AreEqual(4096, new FileInfo(filename).Length);
+			var read = ReadAllBytesShared(filename);
+
+			for (var i = 0; i < 255; i++) {
+				Assert.AreEqual(i % 256, read[i]);
+			}
+		}
+	}
+
+	[Test]
+	public void when_writing_exact_to_alignment_and_writing_again() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+		var bytes = GetBytes(4096);
+		using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+			stream.Write(bytes, 0, bytes.Length);
+			Assert.AreEqual(4096, stream.Position);
+			bytes = GetBytes(15);
+			stream.Write(bytes, 0, bytes.Length);
+			Assert.AreEqual(4111, stream.Position);
+			stream.Flush();
+			Assert.AreEqual(4111, stream.Position);
+			Assert.AreEqual(8192, new FileInfo(filename).Length);
+			var read = ReadAllBytesShared(filename);
+
+			for (var i = 0; i < 255; i++) {
+				Assert.AreEqual(i % 256, read[i]);
+			}
+		}
+	}
+
+	[Test]
+	public void when_writing_then_seeking_exact_to_alignment_and_writing_again() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+		var bytes = GetBytes(8192);
+		using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+			stream.Write(bytes, 0, 5012);
+			Assert.AreEqual(5012, stream.Position);
+			stream.Seek(4096, SeekOrigin.Begin);
+			Assert.AreEqual(4096, stream.Position);
+			bytes = GetBytes(15);
+			stream.Write(bytes, 0, bytes.Length);
+			Assert.AreEqual(4111, stream.Position);
+			stream.Flush();
+			Assert.AreEqual(4111, stream.Position);
+			Assert.AreEqual(8192, new FileInfo(filename).Length);
+			var read = ReadAllBytesShared(filename);
+
+			for (var i = 0; i < 255; i++) {
+				Assert.AreEqual(i % 256, read[i]);
+			}
+		}
+	}
+
+
+	[Test]
+	public void when_seeking_non_exact_to_zero_block_and_writing() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+		MakeFile(filename, 4096 * 64);
+		var bytes = GetBytes(512);
+		using (var stream = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+			stream.Seek(128, SeekOrigin.Begin);
+			stream.Write(bytes, 0, bytes.Length);
+			stream.Flush();
+		}
+
+		using (var stream = new FileStream(filename, FileMode.Open)) {
+			var read = new byte[128];
+			stream.Read(read, 0, 128);
+			for (var i = 0; i < read.Length; i++) {
+				Assert.AreEqual(i, read[i]);
+			}
+		}
+	}
+
+	[Test]
+	public void when_writing_multiple_times() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+		var bytes = GetBytes(256);
+		using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+			stream.Write(bytes, 0, bytes.Length);
+			Assert.AreEqual(256, stream.Position);
+			stream.Flush();
+			Assert.AreEqual(256, stream.Position);
+			stream.Write(bytes, 0, bytes.Length);
+			Assert.AreEqual(512, stream.Position);
+			stream.Flush();
+			Assert.AreEqual(512, stream.Position);
+			Assert.AreEqual(4096, new FileInfo(filename).Length);
+			var read = ReadAllBytesShared(filename);
+
+			for (var i = 0; i < 512; i++) {
+				Assert.AreEqual(i % 256, read[i]);
+			}
+		}
+	}
+
+
+	[Test]
+	public void when_reading_multiple_times() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+		MakeFile(filename, 20000);
+		using (var stream = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+			stream.Seek(4096 + 15, SeekOrigin.Begin);
+			var read = new byte[1000];
+			stream.Read(read, 0, 500);
+			Assert.AreEqual(4096 + 15 + 500, stream.Position);
+			stream.Read(read, 500, 500);
+			Assert.AreEqual(4096 + 15 + 1000, stream.Position);
+			for (var i = 0; i < read.Length; i++) {
+				Assert.AreEqual((i + 15) % 256, read[i]);
+			}
+		}
+	}
+
+	[Test]
+	public void when_reading_multiple_times_no_seek() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+		MakeFile(filename, 20000);
+		using (var stream = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+			var read = new byte[1000];
+			stream.Read(read, 0, 500);
+			Assert.AreEqual(500, stream.Position);
+			stream.Read(read, 500, 500);
+			Assert.AreEqual(1000, stream.Position);
+			for (var i = 0; i < read.Length; i++) {
+				Assert.AreEqual(i % 256, read[i]);
+			}
+		}
+	}
+
+	[Test]
+	public void when_reading_multiple_times_over_page_size() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+		MakeFile(filename, 20000);
+		using (var stream = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+			var read = new byte[6000];
+			stream.Read(read, 0, 3000);
+			Assert.AreEqual(3000, stream.Position);
+			var total = stream.Read(read, 3000, 3000);
+			Assert.AreEqual(3000, total);
+			Assert.AreEqual(6000, stream.Position);
+			for (var i = 0; i < read.Length; i++) {
+				Assert.AreEqual(i % 256, read[i]);
+			}
+		}
+	}
+
+	[Test]
+	public void when_reading_multiple_times_on_page_size() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+		MakeFile(filename, 20000);
+		using (var stream = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+			var read = new byte[6000];
+			stream.Read(read, 0, 3000);
+			Assert.AreEqual(3000, stream.Position);
+			var total = stream.Read(read, 3000, 1096);
+			Assert.AreEqual(1096, total);
+			total = stream.Read(read, 4096, read.Length - 4096);
+			Assert.AreEqual(read.Length - 4096, total);
+			Assert.AreEqual(6000, stream.Position);
+			for (var i = 0; i < read.Length; i++) {
+				Assert.AreEqual(i % 256, read[i]);
+			}
+		}
+	}
+
+
+	[Test]
+	public void when_reading_multiple_times_exact_page_size() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+		MakeFile(filename, 4096 * 100 + 50);
+		Span<byte> expected = GetBytes(4096);
+		using (var stream = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+			var read = new byte[4096];
+			for (var i = 0; i < 100; i++) {
+				var total = stream.Read(read, 0, 4096);
+				Assert.AreEqual(4096 * (i + 1), stream.Position);
+				Assert.AreEqual(4096, total);
+				if (!expected.SequenceEqual(read)) {
+					for (var j = 0; j < read.Length; j++) {
+						Assert.AreEqual(j % 256, read[j]);
+					}
+				}
+			}
+
+			expected = expected.Slice(0, 50);
+			var total2 = stream.Read(read, 0, 50);
+			Assert.AreEqual(409600 + 50, stream.Position);
+			Assert.AreEqual(50, total2);
+			if (!expected.SequenceEqual(read)) {
+				for (var j = 0; j < 50; j++) {
+					Assert.AreEqual(j % 256, read[j]);
+				}
+			}
+		}
+	}
+
+	[Test]
+	public void when_reading_multiple_times_offset_page_size() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+		MakeFile(filename, 4096 * 100 + 50);
+		Span<byte> expected = GetBytes(4096 + 50);
+		expected = expected[50..];
+		using (var stream = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+			stream.Seek(50, SeekOrigin.Begin);
+			var read = new byte[4096];
+			for (var i = 0; i < 100; i++) {
+				var total = stream.Read(read, 0, 4096);
+				Assert.AreEqual(4096 * (i + 1) + 50, stream.Position);
+				Assert.AreEqual(4096, total);
+				if (!expected.SequenceEqual(read)) {
+					for (var j = 0; j < read.Length; j++) {
+						Assert.AreEqual((j + 50) % 256, read[j]);
+					}
+				}
+			}
+
+			Assert.AreEqual(4096 * 100 + 50, stream.Position);
+		}
+	}
+
+	[Test]
+	public void when_writing_more_than_buffer_and_closing() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+		var bytes = GetBytes(9000);
+		using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+			stream.Write(bytes, 0, bytes.Length);
+			stream.Close();
+			Assert.AreEqual(4096 * 3, new FileInfo(filename).Length);
+			var read = File.ReadAllBytes(filename);
+			for (var i = 0; i < 9000; i++) {
+				Assert.AreEqual(i % 256, read[i]);
+			}
+		}
+	}
+
+	[Test]
+	public void when_reading_on_aligned_buffer() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+		MakeFile(filename, 20000);
+		using (var stream = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+			var read = new byte[4096];
+			stream.Read(read, 0, 4096);
+			for (var i = 0; i < 4096; i++) {
+				Assert.AreEqual(i % 256, read[i]);
+			}
+		}
+	}
+
+	[Test]
+	public void when_reading_on_unaligned_buffer() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+		MakeFile(filename, 20000);
+		using (var stream = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+			stream.Seek(15, SeekOrigin.Begin);
+			var read = new byte[999];
+			stream.Read(read, 0, read.Length);
+			for (var i = 0; i < read.Length; i++) {
+				Assert.AreEqual((i + 15) % 256, read[i]);
+			}
+		}
+	}
+
+	[Test]
+	public void seek_and_read_on_unaligned_buffer() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+		MakeFile(filename, 20000);
+		using (var stream = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+			stream.Seek(4096 + 15, SeekOrigin.Begin);
+			Assert.AreEqual(4096 + 15, stream.Position);
+			var read = new byte[999];
+			stream.Read(read, 0, read.Length);
+			Assert.AreEqual(4096 + 15 + 999, stream.Position);
+			for (var i = 0; i < read.Length; i++) {
+				Assert.AreEqual((i + 15) % 256, read[i]);
+			}
+		}
+	}
+
+	[Test]
+	public void seek_end_of_file() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+
+		using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+			stream.Seek(0, SeekOrigin.End);
+			Assert.AreEqual(stream.Length, stream.Position);
+		}
+	}
+
+	[Test]
+	public void seek_origin_end_to_mid_of_file() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+
+		using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+			stream.Seek(-30, SeekOrigin.End);
+			Assert.AreEqual(stream.Length - 30, stream.Position);
+		}
+	}
+
+
+	[Test]
+	public void seek_current_unimplemented() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+
+		using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+			Assert.Throws<NotImplementedException>(() => stream.Seek(0, SeekOrigin.Current));
+		}
+	}
+
+
+	[Test]
+	public void seek_write_seek_read_in_buffer() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+		using (var stream = UnbufferedFileStream.Create(filename, FileMode.CreateNew, FileAccess.ReadWrite,
+			FileShare.ReadWrite, 4096, 4096, false, 4096)) {
+			var buffer = GetBytes(255);
+			stream.Seek(4096 + 15, SeekOrigin.Begin);
+			stream.Write(buffer, 0, buffer.Length);
+			stream.Seek(4096 + 15, SeekOrigin.Begin);
+			var read = new byte[255];
+			stream.Read(read, 0, read.Length);
+			for (var i = 0; i < read.Length; i++) {
+				Assert.AreEqual(i % 255, read[i]);
+			}
+		}
+	}
+
+	[Test]
+	public void same_as_file_stream_on_reads() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+		var bytes = BuildBytes(4096 * 128);
+		File.WriteAllBytes(filename, bytes);
+		using (var f = new FileStream(filename, FileMode.Open, FileAccess.Read)) {
+			using (var b = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.Read, FileShare.Read,
+				4096, 4096, false, 4096)) {
+				Span<byte> readf = new byte[4096];
+				var readb = new byte[4096];
+				for (var i = 0; i < 128; i++) {
+					var totalf = f.Read(readf);
+					var totalb = b.Read(readb, 0, 4096);
+
+					if (!readf[..totalf].SequenceEqual(readb[..totalb])) {
+						for (var j = 0; j < 4096; j++) {
+							Assert.AreEqual(totalf, totalb);
+							Assert.AreEqual(readf[j], readb[j]);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	[Test]
+	public void same_as_file_stream_on_reads_with_bigger_buffer() {
+		var filename = GetFilePathFor(Guid.NewGuid().ToString());
+		var bytes = BuildBytes(4096 * 128);
+		File.WriteAllBytes(filename, bytes);
+		using (var f = new FileStream(filename, FileMode.Open, FileAccess.Read)) {
+			using (var b = UnbufferedFileStream.Create(filename, FileMode.Open, FileAccess.Read, FileShare.Read,
+				4096, 4096 * 4, false, 4096)) {
+				Span<byte> readf = new byte[4096];
+				var readb = new byte[4096];
+				for (var i = 0; i < 128; i++) {
+					var totalf = f.Read(readf);
+					var totalb = b.Read(readb, 0, 4096);
+
+					if (!readf[..totalf].SequenceEqual(readb[..totalb])) {
+						for (var j = 0; j < 4096; j++) {
+							Assert.AreEqual(totalf, totalb);
+							Assert.AreEqual(readf[j], readb[j]);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	private byte[] BuildBytes(int count) {
+		using var ret = new MemoryStream();
+		for (int i = 0; i < count / 16; i++) {
+			ret.Write(Guid.NewGuid().ToByteArray(), 0, 16);
+		}
+
+		return ret.ToArray();
+	}
+
+
+	private byte[] ReadAllBytesShared(string filename) {
+		using (var fs = File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) {
+			var ret = new byte[fs.Length];
+			fs.Read(ret, 0, (int)fs.Length);
+			return ret;
+		}
+	}
+
+	private void MakeFile(string filename, int size) {
+		var bytes = GetBytes(size);
+		File.WriteAllBytes(filename, bytes);
+	}
+
+	private byte[] GetBytes(int size) {
+		var ret = new byte[size];
+		for (var i = 0; i < size; i++) {
+			ret[i] = (byte)(i % 256);
+		}
+
+		return ret;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Validation/TFChunkDbCreationTestBase.cs b/src/KurrentDB.Core.Tests/TransactionLog/Validation/TFChunkDbCreationTestBase.cs
new file mode 100644
index 00000000000..765f59876b3
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Validation/TFChunkDbCreationTestBase.cs
@@ -0,0 +1,70 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Validation;
+
+public static class DbUtil {
+	public static void CreateSingleChunk(TFChunkDbConfig config, int chunkNum, string filename,
+		int? actualDataSize = null, bool isScavenged = false, byte[] contents = null) {
+		var chunkHeader = new ChunkHeader(TFChunk.CurrentChunkVersion, TFChunk.CurrentChunkVersion,
+			config.ChunkSize, chunkNum, chunkNum, isScavenged, Guid.NewGuid(), TransformType.Identity);
+		var chunkBytes = chunkHeader.AsByteArray();
+		var dataSize = actualDataSize ?? config.ChunkSize;
+		var buf = new byte[ChunkHeader.Size + dataSize + ChunkFooter.Size];
+		Buffer.BlockCopy(chunkBytes, 0, buf, 0, chunkBytes.Length);
+		var chunkFooter = new ChunkFooter(true, true, dataSize, dataSize, 0);
+		chunkBytes = chunkFooter.AsByteArray();
+		Buffer.BlockCopy(chunkBytes, 0, buf, buf.Length - ChunkFooter.Size, chunkBytes.Length);
+
+		if (contents != null) {
+			if (contents.Length != dataSize)
+				throw new Exception("Wrong contents size.");
+			Buffer.BlockCopy(contents, 0, buf, ChunkHeader.Size, contents.Length);
+		}
+
+		File.WriteAllBytes(filename, buf);
+	}
+
+	public static void CreateMultiChunk(TFChunkDbConfig config, int chunkStartNum, int chunkEndNum, string filename,
+		int? physicalSize = null, long? logicalSize = null) {
+		if (chunkStartNum > chunkEndNum)
+			throw new ArgumentException("chunkStartNum");
+
+		var chunkHeader = new ChunkHeader(TFChunk.CurrentChunkVersion, TFChunk.CurrentChunkVersion,
+			config.ChunkSize, chunkStartNum, chunkEndNum, true, Guid.NewGuid(), TransformType.Identity);
+		var chunkBytes = chunkHeader.AsByteArray();
+		var physicalDataSize = physicalSize ?? config.ChunkSize;
+		var logicalDataSize = logicalSize ?? (chunkEndNum - chunkStartNum + 1) * config.ChunkSize;
+		var buf = new byte[ChunkHeader.Size + physicalDataSize + ChunkFooter.Size];
+		Buffer.BlockCopy(chunkBytes, 0, buf, 0, chunkBytes.Length);
+		var chunkFooter = new ChunkFooter(true, true, physicalDataSize, logicalDataSize, 0);
+		chunkBytes = chunkFooter.AsByteArray();
+		Buffer.BlockCopy(chunkBytes, 0, buf, buf.Length - ChunkFooter.Size, chunkBytes.Length);
+		File.WriteAllBytes(filename, buf);
+	}
+
+	public static void CreateOngoingChunk(TFChunkDbConfig config, int chunkNum, string filename,
+		int? actualSize = null, byte[] contents = null) {
+		var chunkHeader = new ChunkHeader(TFChunk.CurrentChunkVersion, TFChunk.CurrentChunkVersion,
+			config.ChunkSize, chunkNum, chunkNum, false,
+			Guid.NewGuid(), TransformType.Identity);
+		var chunkBytes = chunkHeader.AsByteArray();
+		var dataSize = actualSize ?? config.ChunkSize;
+		var buf = new byte[ChunkHeader.Size + dataSize + ChunkFooter.Size];
+		Buffer.BlockCopy(chunkBytes, 0, buf, 0, chunkBytes.Length);
+
+		if (contents != null) {
+			if (contents.Length != dataSize)
+				throw new Exception("Wrong contents size.");
+			Buffer.BlockCopy(contents, 0, buf, ChunkHeader.Size, contents.Length);
+		}
+
+		File.WriteAllBytes(filename, buf);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Validation/when_validating_tfchunk_db.cs b/src/KurrentDB.Core.Tests/TransactionLog/Validation/when_validating_tfchunk_db.cs
new file mode 100644
index 00000000000..7ec0b57340e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Validation/when_validating_tfchunk_db.cs
@@ -0,0 +1,591 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+using Serilog;
+using Serilog.Core;
+using Serilog.Events;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Validation;
+
+[TestFixture]
+public class when_validating_tfchunk_db : SpecificationWithDirectory {
+	[Test]
+	public async Task detect_no_database() {
+		var config = TFChunkHelper.CreateSizedDbConfig(PathName, 4000, chunkSize: 1000);
+		await using (var db = new TFChunkDb(config)) {
+			var ex = Assert.ThrowsAsync<CorruptDatabaseException>(async () => await db.Open(verifyHash: false));
+			Assert.True(ex?.InnerException is ChunkNotFoundException);
+		}
+	}
+
+	[Test]
+	public async Task with_file_of_wrong_size_database_corruption_is_detected() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 500);
+		await using (var db = new TFChunkDb(config)) {
+			File.WriteAllText(GetFilePathFor("chunk-000000.000000"), "this is just some test blahbydy blah");
+			var ex = Assert.ThrowsAsync<CorruptDatabaseException>(async () => await db.Open(verifyHash: false));
+			Assert.True(ex?.InnerException is BadChunkInDatabaseException);
+		}
+	}
+
+	[Test]
+	public async Task with_not_enough_files_to_reach_checksum_throws() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 15000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			var ex = Assert.ThrowsAsync<CorruptDatabaseException>(async () => await db.Open(verifyHash: false));
+			Assert.True(ex?.InnerException is ChunkNotFoundException);
+		}
+	}
+
+	[Test]
+	public async Task allows_with_exactly_enough_file_to_reach_checksum() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 10000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+		}
+	}
+
+	[Test]
+	public async Task does_not_allow_not_completed_not_last_chunks() {
+		var config = TFChunkHelper.CreateSizedDbConfig(PathName, 4000, chunkSize: 1000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateOngoingChunk(config, 1, GetFilePathFor("chunk-000001.000000"));
+			DbUtil.CreateOngoingChunk(config, 2, GetFilePathFor("chunk-000002.000000"));
+			DbUtil.CreateOngoingChunk(config, 3, GetFilePathFor("chunk-000003.000000"));
+			var ex = Assert.ThrowsAsync<CorruptDatabaseException>(async () => await db.Open(verifyHash: false));
+			Assert.True(ex?.InnerException is BadChunkInDatabaseException);
+		}
+	}
+
+	[Test]
+	public async Task allows_next_new_chunk_when_checksum_is_exactly_in_between_two_chunks() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 10000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateOngoingChunk(config, 1, GetFilePathFor("chunk-000001.000000"));
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+		}
+	}
+
+	[Test, Ignore("Due to truncation such situation can happen, so must be considered valid.")]
+	public async Task does_not_allow_next_new_completed_chunk_when_checksum_is_exactly_in_between_two_chunks() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 10000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000000"));
+			var ex = Assert.ThrowsAsync<CorruptDatabaseException>(async () => await db.Open(verifyHash: false));
+			Assert.True(ex?.InnerException is BadChunkInDatabaseException);
+		}
+	}
+
+	[Test]
+	public async Task
+		allows_last_chunk_to_be_not_completed_when_checksum_is_exactly_in_between_two_chunks_and_no_next_chunk_exists() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 10000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateOngoingChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+		}
+	}
+
+	[Test]
+	public async Task
+		does_not_allow_pre_last_chunk_to_be_not_completed_when_checksum_is_exactly_in_between_two_chunks_and_next_chunk_exists() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 10000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateOngoingChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateOngoingChunk(config, 1, GetFilePathFor("chunk-000001.000000"));
+			var ex = Assert.ThrowsAsync<CorruptDatabaseException>(async () => await db.Open(verifyHash: false));
+			Assert.True(ex?.InnerException is BadChunkInDatabaseException);
+		}
+	}
+
+	[Test, Ignore("Not valid test now after disabling size validation on ongoing TFChunk ")]
+	public async Task with_wrong_size_file_less_than_checksum_throws() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 15000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000000"),
+				actualDataSize: config.ChunkSize - 1000);
+			var ex = Assert.ThrowsAsync<CorruptDatabaseException>(async () => await db.Open(verifyHash: false));
+			Assert.True(ex?.InnerException is BadChunkInDatabaseException);
+		}
+	}
+
+	[Test]
+	public async Task one_sequential_extraneous_file_does_not_throw_corrupt_database_exception() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 9000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateOngoingChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000000"));
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+		}
+	}
+
+	[Test]
+	public async Task one_sequential_extraneous_file_with_non_zero_version_throws_corrupt_database_exception() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 9000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateOngoingChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000001"));
+			var ex = Assert.ThrowsAsync<CorruptDatabaseException>(async () => await db.Open(verifyHash: false));
+			Assert.True(ex?.InnerException is ExtraneousFileFoundException);
+		}
+	}
+
+	[Test]
+	public async Task one_non_sequential_extraneous_file_throws_corrupt_database_exception() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 9000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateOngoingChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateSingleChunk(config, 2, GetFilePathFor("chunk-000002.000000"));
+			var ex = Assert.ThrowsAsync<CorruptDatabaseException>(async () => await db.Open(verifyHash: false));
+			Assert.True(ex?.InnerException is ExtraneousFileFoundException);
+		}
+	}
+
+	[Test]
+	public async Task when_in_multiple_extraneous_latest_version_of_files_throws_corrupt_database_exception() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 15000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateOngoingChunk(config, 1, GetFilePathFor("chunk-000001.000000"));
+			DbUtil.CreateSingleChunk(config, 2, GetFilePathFor("chunk-000002.000000")); // extraneous file, but valid case
+			DbUtil.CreateSingleChunk(config, 3, GetFilePathFor("chunk-000003.000000")); // extraneous file
+			var ex = Assert.ThrowsAsync<CorruptDatabaseException>(async () => await db.Open(verifyHash: false));
+			Assert.True(ex?.InnerException is ExtraneousFileFoundException);
+			Assert.True(ex.InnerException.Message.Contains("chunk-000003.000000"));
+		}
+	}
+
+	[Test]
+	public async Task when_in_multiple_extraneous_old_version_of_files_throws_corrupt_database_exception() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 15000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateOngoingChunk(config, 1, GetFilePathFor("chunk-000001.000000"));
+			DbUtil.CreateSingleChunk(config, 2, GetFilePathFor("chunk-000002.000000"));
+			DbUtil.CreateSingleChunk(config, 2, GetFilePathFor("chunk-000002.000001"));
+			var ex = Assert.ThrowsAsync<CorruptDatabaseException>(async () => await db.Open(verifyHash: false));
+			Assert.True(ex?.InnerException is ExtraneousFileFoundException);
+			Assert.True(ex.InnerException.Message.Contains("chunk-000002.000000"));
+		}
+	}
+
+	[Test]
+	public async Task when_in_multiple_missing_file_throws_corrupt_database_exception() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 25000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateOngoingChunk(config, 2, GetFilePathFor("chunk-000002.000000"));
+			var ex = Assert.ThrowsAsync<CorruptDatabaseException>(async () => await db.Open(verifyHash: false));
+			Assert.True(ex?.InnerException is ChunkNotFoundException);
+		}
+	}
+
+	[Test]
+	public async Task when_in_brand_new_extraneous_files_throws_corrupt_database_exception() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 0);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 4, GetFilePathFor("chunk-000004.000000"));
+			var ex = Assert.ThrowsAsync<CorruptDatabaseException>(async () => await db.Open(verifyHash: false));
+			Assert.True(ex?.InnerException is ExtraneousFileFoundException);
+		}
+	}
+
+	[Test]
+	public async Task when_a_chaser_checksum_is_ahead_of_writer_checksum_throws_corrupt_database_exception() {
+		var config = TFChunkHelper.CreateDbConfigEx(PathName, 0, 11, -1, -1, -1, 1000, -1);
+		await using (var db = new TFChunkDb(config)) {
+			var ex = Assert.ThrowsAsync<CorruptDatabaseException>(async () => await db.Open(verifyHash: false));
+			Assert.True(ex?.InnerException is ReaderCheckpointHigherThanWriterException);
+		}
+	}
+
+	[Test]
+	public async Task when_an_epoch_checksum_is_ahead_of_writer_checksum_throws_corrupt_database_exception() {
+		var config = TFChunkHelper.CreateDbConfigEx(PathName, 0, 0, 11, -1, -1, 1000, -1);
+		await using (var db = new TFChunkDb(config)) {
+			var ex = Assert.ThrowsAsync<CorruptDatabaseException>(async () => await db.Open(verifyHash: false));
+			Assert.True(ex?.InnerException is ReaderCheckpointHigherThanWriterException);
+		}
+	}
+
+	[Test]
+	public async Task allows_no_files_when_checkpoint_is_zero() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 0);
+		await using (var db = new TFChunkDb(config)) {
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
+		}
+	}
+
+	[Test]
+	public async Task allows_first_correct_ongoing_chunk_when_checkpoint_is_zero() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 0);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateOngoingChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+		}
+	}
+
+	[Test, Ignore("Due to truncation such situation can happen, so must be considered valid.")]
+	public async Task does_not_allow_first_completed_chunk_when_checkpoint_is_zero() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 0);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			var ex = Assert.ThrowsAsync<CorruptDatabaseException>(async () => await db.Open(verifyHash: false));
+			Assert.True(ex?.InnerException is BadChunkInDatabaseException);
+		}
+	}
+
+	[Test]
+	public async Task allows_checkpoint_to_point_into_the_middle_of_completed_chunk_when_enough_actual_data_in_chunk() {
+		var config = TFChunkHelper.CreateSizedDbConfig(PathName, 1500, chunkSize: 1000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000001"), actualDataSize: 500);
+
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
+			Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
+		}
+	}
+
+	[Test, Ignore("We do not check this as it is too erroneous to read ChunkFooter from ongoing chunk...")]
+	public async Task
+		does_not_allow_checkpoint_to_point_into_the_middle_of_completed_chunk_when_not_enough_actual_data() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 1500);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000001"), actualDataSize: 499);
+
+			var ex = Assert.ThrowsAsync<CorruptDatabaseException>(async () => await db.Open(verifyHash: false));
+			Assert.True(ex?.InnerException is BadChunkInDatabaseException);
+		}
+	}
+
+	[Test]
+	public async Task does_not_allow_checkpoint_to_point_into_the_middle_of_scavenged_chunk() {
+		var config = TFChunkHelper.CreateSizedDbConfig(PathName, 1500, chunkSize: 1000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000001"), isScavenged: true,
+				actualDataSize: 1000);
+
+			var ex = Assert.ThrowsAsync<CorruptDatabaseException>(async () => await db.Open(verifyHash: false));
+			Assert.True(ex?.InnerException is BadChunkInDatabaseException);
+		}
+	}
+
+	[Test]
+	public async Task old_version_of_chunks_are_removed() {
+		File.Create(GetFilePathFor("foo")).Close();
+		File.Create(GetFilePathFor("bla")).Close();
+
+		var config = TFChunkHelper.CreateSizedDbConfig(PathName, 350, chunkSize: 100);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000002"));
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000005"));
+			DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000000"));
+			DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000001"));
+			DbUtil.CreateSingleChunk(config, 2, GetFilePathFor("chunk-000002.000000"));
+			DbUtil.CreateSingleChunk(config, 3, GetFilePathFor("chunk-000003.000007"));
+			DbUtil.CreateOngoingChunk(config, 3, GetFilePathFor("chunk-000003.000008"));
+
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+
+			Assert.IsTrue(File.Exists(GetFilePathFor("foo")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("bla")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000005")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000002.000000")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000003.000008")));
+			Assert.AreEqual(6, Directory.GetFiles(PathName, "*").Length);
+		}
+	}
+
+	[Test]
+	public async Task when_checkpoint_is_on_boundary_of_chunk_last_chunk_is_preserved() {
+		var config = TFChunkHelper.CreateSizedDbConfig(PathName, 200, chunkSize: 100);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000001"));
+			DbUtil.CreateOngoingChunk(config, 2, GetFilePathFor("chunk-000002.000005"));
+
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000002.000005")));
+			Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
+		}
+	}
+
+	[Test]
+	public async Task
+		when_checkpoint_is_on_boundary_of_new_chunk_last_chunk_is_preserved_and_excessive_versions_are_removed_if_present() {
+		var config = TFChunkHelper.CreateSizedDbConfig(PathName, 200, chunkSize: 100);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000001"));
+			DbUtil.CreateSingleChunk(config, 2, GetFilePathFor("chunk-000002.000000"));
+			DbUtil.CreateOngoingChunk(config, 2, GetFilePathFor("chunk-000002.000001"));
+
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000002.000001")));
+			Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
+		}
+	}
+
+	[Test]
+	public async Task
+		when_checkpoint_is_exactly_on_the_boundary_of_chunk_the_last_chunk_could_be_not_present_but_should_be_created() {
+		var config = TFChunkHelper.CreateSizedDbConfig(PathName, 200, chunkSize: 100);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000001"));
+
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+			Assert.IsNotNull(await db.Manager.GetInitializedChunk(2, CancellationToken.None));
+
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000002.000000")));
+			Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
+		}
+	}
+
+	[Test]
+	public async Task when_checkpoint_is_exactly_on_the_boundary_of_chunk_the_last_chunk_could_be_present() {
+		var config = TFChunkHelper.CreateSizedDbConfig(PathName, 200, chunkSize: 100);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000001"));
+			DbUtil.CreateOngoingChunk(config, 2, GetFilePathFor("chunk-000002.000000"));
+
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+			Assert.IsNotNull(await db.Manager.GetInitializedChunk(2, CancellationToken.None));
+
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000002.000000")));
+			Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
+		}
+	}
+
+	[Test]
+	public async Task when_checkpoint_is_on_boundary_of_new_chunk_and_last_chunk_is_truncated_no_exception_is_thrown() {
+		var config = TFChunkHelper.CreateSizedDbConfig(PathName, 200, chunkSize: 100);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000001"),
+				actualDataSize: config.ChunkSize - 10);
+
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+			Assert.IsNotNull(await db.Manager.GetInitializedChunk(2, CancellationToken.None));
+
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000002.000000")));
+			Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
+		}
+	}
+
+	[Test, Ignore("Not valid test now after disabling size validation on ongoing TFChunk ")]
+	public async Task
+		when_checkpoint_is_on_boundary_of_new_chunk_and_last_chunk_is_truncated_but_not_completed_exception_is_thrown() {
+		var config = TFChunkHelper.CreateSizedDbConfig(PathName, 200, chunkSize: 100);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateOngoingChunk(config, 1, GetFilePathFor("chunk-000001.000001"),
+				actualSize: config.ChunkSize - 10);
+
+			var ex = Assert.ThrowsAsync<CorruptDatabaseException>(async () => await db.Open(verifyHash: false));
+			Assert.True(ex?.InnerException is BadChunkInDatabaseException);
+		}
+	}
+
+	[Test]
+	public async Task when_last_chunk_is_scavenged_and_checkpoint_is_on_boundary_of_new_chunk() {
+		var config = TFChunkHelper.CreateSizedDbConfig(PathName, 300, chunkSize: 100);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateMultiChunk(config, 0, 2, GetFilePathFor("chunk-000000.000001"));
+
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+
+			Assert.IsNotNull(await db.Manager.GetInitializedChunk(3, CancellationToken.None));
+			Assert.AreEqual(300, db.Config.WriterCheckpoint.Read());
+
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000001")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000003.000000")));
+			Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
+		}
+	}
+
+	[Test]
+	public async Task when_last_chunk_is_scavenged_and_checkpoint_is_at_the_start_of_the_scavenged_chunk() {
+		var config = TFChunkHelper.CreateSizedDbConfig(PathName, 100, chunkSize: 100);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateMultiChunk(config, 1, 3, GetFilePathFor("chunk-000001.000001"));
+
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+
+			Assert.IsNotNull(await db.Manager.GetInitializedChunk(4, CancellationToken.None));
+			Assert.AreEqual(400, db.Config.WriterCheckpoint.Read());
+
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000004.000000")));
+			Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
+		}
+	}
+
+	[Test]
+	public async Task when_last_chunk_is_scavenged_and_checkpoint_is_at_the_start_of_the_scavenged_chunk_and_new_chunk_already_exists() {
+		var config = TFChunkHelper.CreateSizedDbConfig(PathName, 100, chunkSize: 100);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateMultiChunk(config, 1, 3, GetFilePathFor("chunk-000001.000001"));
+			DbUtil.CreateSingleChunk(config, 4, GetFilePathFor("chunk-000004.000000"));
+
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+
+			Assert.IsNotNull(await db.Manager.GetInitializedChunk(4, CancellationToken.None));
+			Assert.AreEqual(400, db.Config.WriterCheckpoint.Read());
+
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000004.000000")));
+			Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
+		}
+	}
+
+	[Test]
+	public async Task when_last_chunk_is_scavenged_and_checkpoint_is_in_the_middle_of_the_scavenged_chunk() {
+		var config = TFChunkHelper.CreateSizedDbConfig(PathName, 150, chunkSize: 100);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateMultiChunk(config, 1, 3, GetFilePathFor("chunk-000001.000001"));
+
+			Assert.ThrowsAsync<CorruptDatabaseException>(async () => await db.Open(verifyHash: false));
+
+			Assert.ThrowsAsync<ArgumentOutOfRangeException>(async () => await db.Manager.GetInitializedChunk(4, CancellationToken.None));
+			Assert.AreEqual(150, db.Config.WriterCheckpoint.Read());
+
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
+			Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
+		}
+	}
+
+	[Test]
+	public async Task temporary_files_are_removed() {
+		var config = TFChunkHelper.CreateSizedDbConfig(PathName, 150, chunkSize: 100);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateOngoingChunk(config, 1, GetFilePathFor("chunk-000001.000001"));
+
+			File.Create(GetFilePathFor("bla")).Close();
+			File.Create(GetFilePathFor("bla.scavenge.tmp")).Close();
+			File.Create(GetFilePathFor("bla.tmp")).Close();
+
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("bla")));
+			Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
+		}
+	}
+
+	[Test]
+	public async Task when_prelast_chunk_corrupted_throw_hash_validation_exception() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 15000);
+		var sink = new TestLogEventSink();
+		using (var log = new LoggerConfiguration()
+			.WriteTo.Sink(sink)
+			.MinimumLevel.Verbose()
+			.CreateLogger())
+		await using (var db = new TFChunkDb(config, new TFChunkTracker.NoOp(), log)) {
+			byte[] contents = new byte[config.ChunkSize];
+			for (var i = 0; i < config.ChunkSize; i++) {
+				contents[i] = 0;
+			}
+
+			/*
+			Create a completed chunk and an ongoing chunk
+			 */
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"),
+				actualDataSize: config.ChunkSize,
+				contents: contents);
+			DbUtil.CreateOngoingChunk(config, 1, GetFilePathFor("chunk-000001.000000"));
+			/**
+			Corrupt the prelast completed chunk by modifying bytes of its content
+			 */
+			using (Stream stream = File.Open(GetFilePathFor("chunk-000000.000000"), FileMode.Open)) {
+				var data = new byte[3];
+				data[0] = 1;
+				data[1] = 2;
+				data[2] = 3;
+				stream.Position = ChunkHeader.Size + 15; //arbitrary choice of position to modify
+				stream.Write(data, 0, data.Length);
+			}
+
+			/**
+			Exception being thrown in another thread, using the output to check for the exception
+			 */
+			await db.Open(verifyHash: true);
+			//arbitrary wait
+			await Task.Delay(2000);
+		}
+
+		var thrownException = sink.LogEventReceived.WithTimeout().Result;
+
+		Assert.IsInstanceOf<HashValidationException>(thrownException);
+
+		var output = sink.Output;
+
+		Assert.AreEqual(@"Verification of chunk ""#0-0 (chunk-000000.000000)"" failed, terminating server...",
+			output);
+	}
+
+	private class TestLogEventSink : ILogEventSink {
+		private readonly StringBuilder _output;
+
+		private readonly TaskCompletionSource<Exception> _logEventReceived;
+		public Task<Exception> LogEventReceived => _logEventReceived.Task;
+
+		public string Output => _output.ToString();
+
+		public TestLogEventSink() {
+			_output = new StringBuilder();
+			_logEventReceived = new TaskCompletionSource<Exception>();
+		}
+
+		public void Emit(LogEvent logEvent) {
+			if (logEvent.Exception is null)
+				return;
+			_output.Append(logEvent.RenderMessage());
+			_logEventReceived.TrySetResult(logEvent.Exception);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Validation/when_validating_tfchunk_db_with_multi_chunks.cs b/src/KurrentDB.Core.Tests/TransactionLog/Validation/when_validating_tfchunk_db_with_multi_chunks.cs
new file mode 100644
index 00000000000..e34b336167d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Validation/when_validating_tfchunk_db_with_multi_chunks.cs
@@ -0,0 +1,187 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Validation;
+
+[TestFixture]
+public class when_validating_tfchunk_db_with_multi_chunks : SpecificationWithDirectory {
+	[Test]
+	public async Task with_not_enough_files_to_reach_checksum_throws() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 25000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateMultiChunk(config, 0, 1, GetFilePathFor("chunk-000000.000000"));
+			Assert.That(() => db.Open(verifyHash: false),
+				Throws.Exception.InstanceOf<CorruptDatabaseException>()
+					.With.InnerException.InstanceOf<ChunkNotFoundException>());
+		}
+	}
+
+	[Test]
+	public async Task with_checksum_inside_multi_chunk_throws() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 25000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateMultiChunk(config, 0, 2, GetFilePathFor("chunk-000000.000000"));
+			Assert.That(() => db.Open(verifyHash: false),
+				Throws.Exception.InstanceOf<CorruptDatabaseException>()
+					.With.InnerException.InstanceOf<ChunkNotFoundException>());
+		}
+	}
+
+	[Test]
+	public async Task allows_with_exactly_enough_file_to_reach_checksum_while_last_is_multi_chunk() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 30000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateMultiChunk(config, 1, 2, GetFilePathFor("chunk-000001.000001"));
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000003.000000")));
+			Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
+		}
+	}
+
+	[Test]
+	public async Task allows_next_new_chunk_when_checksum_is_exactly_in_between_two_chunks_if_last_is_ongoing_chunk() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 20000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateMultiChunk(config, 0, 1, GetFilePathFor("chunk-000000.000001"));
+			DbUtil.CreateOngoingChunk(config, 2, GetFilePathFor("chunk-000002.000000"));
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000001")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000002.000000")));
+			Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
+		}
+	}
+
+	[Test, Ignore("Due to truncation such situation can happen, so must be considered valid.")]
+	public async Task
+		does_not_allow_next_new_chunk_when_checksum_is_exactly_in_between_two_chunks_and_last_is_multi_chunk() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 10000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateMultiChunk(config, 1, 2, GetFilePathFor("chunk-000001.000000"));
+
+			Assert.That(() => db.Open(verifyHash: false),
+				Throws.Exception.InstanceOf<CorruptDatabaseException>()
+					.With.InnerException.InstanceOf<BadChunkInDatabaseException>());
+		}
+	}
+
+	[Test]
+	public async Task old_version_of_chunks_are_removed() {
+		File.Create(GetFilePathFor("foo")).Close();
+		File.Create(GetFilePathFor("bla")).Close();
+
+		var config = TFChunkHelper.CreateSizedDbConfig(PathName, 450, chunkSize: 100);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000002"));
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000005"));
+			DbUtil.CreateSingleChunk(config, 1, GetFilePathFor("chunk-000001.000000"));
+			DbUtil.CreateMultiChunk(config, 1, 3, GetFilePathFor("chunk-000001.000001"));
+			DbUtil.CreateSingleChunk(config, 2, GetFilePathFor("chunk-000002.000000"));
+			DbUtil.CreateSingleChunk(config, 3, GetFilePathFor("chunk-000003.000000"));
+			DbUtil.CreateSingleChunk(config, 3, GetFilePathFor("chunk-000003.000001"));
+			DbUtil.CreateSingleChunk(config, 4, GetFilePathFor("chunk-000004.000007"));
+			DbUtil.CreateOngoingChunk(config, 4, GetFilePathFor("chunk-000004.000008"));
+
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+
+			Assert.IsTrue(File.Exists(GetFilePathFor("foo")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("bla")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000005")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000004.000008")));
+			Assert.AreEqual(5, Directory.GetFiles(PathName, "*").Length);
+		}
+	}
+
+	[Test]
+	public async Task
+		when_checkpoint_is_exactly_on_the_boundary_of_chunk_the_last_chunk_could_be_not_present_but_should_be_created() {
+		var config = TFChunkHelper.CreateSizedDbConfig(PathName, 200, chunkSize: 100);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateMultiChunk(config, 0, 1, GetFilePathFor("chunk-000000.000001"));
+
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+			Assert.IsNotNull(await db.Manager.GetInitializedChunk(2, CancellationToken.None));
+
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000001")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000002.000000")));
+			Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
+		}
+	}
+
+	[Test]
+	public async Task when_checkpoint_is_exactly_on_the_boundary_of_chunk_the_last_chunk_could_be_present() {
+		var config = TFChunkHelper.CreateSizedDbConfig(PathName, 200, chunkSize: 100);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateMultiChunk(config, 0, 1, GetFilePathFor("chunk-000000.000002"));
+			DbUtil.CreateOngoingChunk(config, 2, GetFilePathFor("chunk-000002.000001"));
+
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+			Assert.IsNotNull(await db.Manager.GetInitializedChunk(2, CancellationToken.None));
+
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000002")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000002.000001")));
+			Assert.AreEqual(2, Directory.GetFiles(PathName, "*").Length);
+		}
+	}
+
+	[Test]
+	public async Task when_checkpoint_is_on_boundary_of_new_chunk_and_last_chunk_is_truncated_no_exception_is_thrown() {
+		var config = TFChunkHelper.CreateSizedDbConfig(PathName, 300, chunkSize: 100);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateMultiChunk(config, 1, 2, GetFilePathFor("chunk-000001.000001"), physicalSize: 50,
+				logicalSize: 150);
+
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+			Assert.IsNotNull(await db.Manager.GetInitializedChunk(2, CancellationToken.None));
+
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000003.000000")));
+			Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
+		}
+	}
+
+	[Test]
+	public async Task does_not_allow_checkpoint_to_point_into_the_middle_of_multichunk_chunk() {
+		var config = TFChunkHelper.CreateSizedDbConfig(PathName, 1500, chunkSize: 1000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateMultiChunk(config, 1, 10, GetFilePathFor("chunk-000001.000001"));
+
+			Assert.That(() => db.Open(verifyHash: false),
+				Throws.Exception.InstanceOf<CorruptDatabaseException>()
+					.With.InnerException.InstanceOf<BadChunkInDatabaseException>());
+		}
+	}
+
+	[Test]
+	public async Task allows_last_chunk_to_be_multichunk_when_checkpoint_point_at_the_start_of_next_chunk() {
+		var config = TFChunkHelper.CreateSizedDbConfig(PathName, 4000, chunkSize: 1000);
+		await using (var db = new TFChunkDb(config)) {
+			DbUtil.CreateSingleChunk(config, 0, GetFilePathFor("chunk-000000.000000"));
+			DbUtil.CreateMultiChunk(config, 1, 3, GetFilePathFor("chunk-000001.000001"));
+
+			Assert.DoesNotThrowAsync(async () => await db.Open(verifyHash: false));
+
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000001.000001")));
+			Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000004.000000")));
+			Assert.AreEqual(3, Directory.GetFiles(PathName, "*").Length);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/Validation/when_validating_tfchunkdb_without_previous_files.cs b/src/KurrentDB.Core.Tests/TransactionLog/Validation/when_validating_tfchunkdb_without_previous_files.cs
new file mode 100644
index 00000000000..b34d963e6c1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/Validation/when_validating_tfchunkdb_without_previous_files.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog.Validation;
+
+[TestFixture]
+public class when_validating_tfchunkdb_without_previous_files : SpecificationWithDirectory {
+	[Test]
+	public async Task with_a_writer_checksum_of_nonzero_and_no_files_a_corrupted_database_exception_is_thrown() {
+		await using var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, 500));
+		var exc = Assert.ThrowsAsync<CorruptDatabaseException>(async () => await db.Open());
+		Assert.IsInstanceOf<ChunkNotFoundException>(exc.InnerException);
+	}
+
+	[Test]
+	public async Task with_a_writer_checksum_of_zero_and_no_files_is_valid() {
+		await using var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, 0));
+		Assert.DoesNotThrowAsync(async () => await db.Open());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/commit_log_record_should.cs b/src/KurrentDB.Core.Tests/TransactionLog/commit_log_record_should.cs
new file mode 100644
index 00000000000..a0228c048d3
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/commit_log_record_should.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class commit_log_record_should {
+	[Test]
+	public void throw_argumentoutofrangeexception_when_given_negative_logposition() {
+		Assert.Throws<ArgumentOutOfRangeException>(() => {
+			new CommitLogRecord(-1, Guid.Empty, 0, DateTime.UtcNow, 0);
+		});
+	}
+
+	[Test]
+	public void throw_argumentexception_when_given_empty_correlationid() {
+		Assert.Throws<ArgumentException>(() => { new CommitLogRecord(0, Guid.Empty, 0, DateTime.UtcNow, 0); });
+	}
+
+	[Test]
+	public void throw_argumentoutofrangeexception_when_given_negative_preparestartposition() {
+		Assert.Throws<ArgumentOutOfRangeException>(() => {
+			new CommitLogRecord(0, Guid.NewGuid(), -1, DateTime.UtcNow, 0);
+		});
+	}
+
+	[Test]
+	public void throw_argumentoutofrangeexception_when_given_negative_eventversion() {
+		Assert.Throws<ArgumentOutOfRangeException>(() => {
+			new CommitLogRecord(0, Guid.NewGuid(), 0, DateTime.UtcNow, -1);
+		});
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/prepare_log_record_should.cs b/src/KurrentDB.Core.Tests/TransactionLog/prepare_log_record_should.cs
new file mode 100644
index 00000000000..6ebc4930fd6
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/prepare_log_record_should.cs
@@ -0,0 +1,158 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using DotNext.Buffers;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class prepare_log_record_should<TLogFormat, TStreamId> {
+	private readonly IRecordFactory<TStreamId> _recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+	private readonly TStreamId _streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+
+	public prepare_log_record_should() {
+	}
+
+	[Test]
+	public void throw_argumentoutofrangeexception_when_given_negative_logposition() {
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		Assert.Throws<ArgumentOutOfRangeException>(() => {
+			LogRecord.Prepare(_recordFactory, -1, Guid.NewGuid(), Guid.NewGuid(), 0, 0, _streamId, 0,
+				PrepareFlags.None, eventTypeId, new byte[0], null, DateTime.UtcNow);
+		});
+	}
+
+	[Test]
+	public void throw_argumentoutofrangeexception_when_given_negative_transactionposition() {
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		Assert.Throws<ArgumentOutOfRangeException>(() => {
+			LogRecord.Prepare(_recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), -1, 0, _streamId, 0,
+				PrepareFlags.None, eventTypeId, new byte[0], null, DateTime.UtcNow);
+		});
+	}
+
+	[Test]
+	public void throw_argumentoutofrangeexception_when_given_transaction_offset_less_than_minus_one() {
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		Assert.Throws<ArgumentOutOfRangeException>(() => {
+			LogRecord.Prepare(_recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), 0, -2, _streamId, 0,
+				PrepareFlags.None, eventTypeId, new byte[0], null, DateTime.UtcNow);
+		});
+	}
+
+	[Test]
+	public void throw_argumentexception_when_given_empty_correlationid() {
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		Assert.Throws<ArgumentException>(() => {
+			LogRecord.Prepare(_recordFactory, 0, Guid.Empty, Guid.NewGuid(), 0, 0, _streamId, 0,
+				PrepareFlags.None, eventTypeId, new byte[0], null, DateTime.UtcNow);
+		});
+	}
+
+	[Test]
+	public void throw_argumentexception_when_given_empty_eventid() {
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		Assert.Throws<ArgumentException>(() => {
+			LogRecord.Prepare(_recordFactory, 0, Guid.NewGuid(), Guid.Empty, 0, 0, _streamId, 0,
+				PrepareFlags.None, eventTypeId, new byte[0], null, DateTime.UtcNow);
+		});
+	}
+
+	[Test]
+	public void throw_argumentnullexception_when_given_null_eventstreamid() {
+		TStreamId nullStreamId = default;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		var expectedExceptionType = LogFormatHelper<TLogFormat, TStreamId>.Choose<Type>(
+			typeof(ArgumentNullException),
+			typeof(ArgumentOutOfRangeException));
+
+		Assert.Throws(expectedExceptionType, () => {
+			LogRecord.Prepare(_recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, nullStreamId, 0,
+				PrepareFlags.None, eventTypeId, new byte[0], null, DateTime.UtcNow);
+		});
+	}
+
+	[Test]
+	public void throw_argumentexception_when_given_empty_eventstreamid() {
+		var emptyStreamId = LogFormatHelper<TLogFormat, TStreamId>.EmptyStreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		var expectedExceptionType = LogFormatHelper<TLogFormat, TStreamId>.Choose<Type>(
+			typeof(ArgumentNullException),
+			typeof(ArgumentOutOfRangeException));
+
+		Assert.Throws(expectedExceptionType, () => {
+			LogRecord.Prepare(_recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, emptyStreamId, 0,
+				PrepareFlags.None, eventTypeId, new byte[0], null, DateTime.UtcNow);
+		});
+	}
+
+	[Test]
+	public void throw_argumentoutofrangeexception_when_given_incorrect_expectedversion() {
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		Assert.Throws<ArgumentOutOfRangeException>(() => {
+			LogRecord.Prepare(_recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, _streamId, -3,
+				PrepareFlags.None, eventTypeId, new byte[0], null, DateTime.UtcNow);
+		});
+	}
+
+	[Test, Ignore("ReadOnlyMemory will always convert back to empty array if initialized with null array.")]
+	public void throw_argumentnullexception_when_given_null_data() {
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		Assert.Throws<ArgumentNullException>(() => {
+			LogRecord.Prepare(_recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, _streamId, 0,
+				PrepareFlags.None, eventTypeId, null, null, DateTime.UtcNow);
+		});
+	}
+
+	[Test]
+	public void throw_argumentnullexception_when_given_null_eventtype() {
+		Assert.DoesNotThrow(() =>
+			LogRecord.Prepare(_recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, _streamId, 0,
+				PrepareFlags.None, default, new byte[0], null, DateTime.UtcNow));
+	}
+
+	[Test]
+	public void throw_argumentexception_when_given_empty_eventtype() {
+		var emptyEventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		Assert.DoesNotThrow(() =>
+			LogRecord.Prepare(_recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, _streamId, 0,
+				PrepareFlags.None, emptyEventTypeId, new byte[0], null, DateTime.UtcNow));
+	}
+
+	[Test]
+	public void return_empty_data_when_event_is_redacted() {
+		if (typeof(TLogFormat) == typeof(LogFormat.V3)) {
+			Assert.Ignore("Log V3 does not handle redacted events yet");
+			return;
+		}
+
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		var prepare = LogRecord.Prepare(_recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, _streamId, 0,
+			PrepareFlags.IsRedacted, eventTypeId, new byte[100], null, DateTime.UtcNow);
+		Assert.AreEqual(0, prepare.Data.Length);
+	}
+
+	[Test]
+	public void write_redacted_data_when_event_is_redacted() {
+		if (typeof(TLogFormat) == typeof(LogFormat.V3)) {
+			Assert.Ignore("Log V3 does not handle redacted events yet");
+			return;
+		}
+
+		var binaryWriter = new BufferWriterSlim<byte>();
+
+		const int dataSize = 10000;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		var prepare = LogRecord.Prepare(_recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), 0, 0, _streamId, 0,
+			PrepareFlags.IsRedacted, eventTypeId, new byte[dataSize], null, DateTime.UtcNow);
+
+		prepare.WriteTo(ref binaryWriter);
+		Assert.True(binaryWriter.WrittenCount >= dataSize);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/tfchunk_get_actual_raw_position_should.cs b/src/KurrentDB.Core.Tests/TransactionLog/tfchunk_get_actual_raw_position_should.cs
new file mode 100644
index 00000000000..82398ccdfe7
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/tfchunk_get_actual_raw_position_should.cs
@@ -0,0 +1,179 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class tfchunk_get_actual_raw_position_should<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private readonly TStreamId _streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+	private readonly TStreamId _eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+	private readonly IRecordFactory<TStreamId> _recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+	private readonly Random _random = new();
+
+	private IPrepareLogRecord<TStreamId> CreateRecord(long logPosition, int dataSize) {
+		return LogRecord.Prepare(_recordFactory, logPosition, Guid.NewGuid(), Guid.NewGuid(), 0, 0, _streamId, 1,
+			PrepareFlags.None, _eventTypeId, new byte[dataSize], Array.Empty<byte>(), new DateTime(2000, 1, 1, 12, 0, 0));
+	}
+
+	private async ValueTask<TFChunk> CreateChunk(int numEvents, bool completed, bool scavenged,
+		List<long> logicalPositions, List<PosMap> posMap, CancellationToken token = default) {
+		if (scavenged && !completed)
+			throw new ArgumentException("scavenged chunk must be completed");
+
+		var chunk = await TFChunkHelper.CreateNewChunk(Path.Combine(PathName, $"{Guid.NewGuid()}.chunk"), 4096, scavenged, token: token);
+
+		var actualPos = 0;
+		for (int i = 0; i < numEvents; i++) {
+			long logicalPos;
+			if (!scavenged) {
+				logicalPos = actualPos;
+			} else {
+				logicalPos = actualPos + _random.Next(0, 100);
+				posMap.Add(new PosMap(logicalPos, actualPos));
+			}
+			logicalPositions.Add(logicalPos);
+
+			var result = await chunk.TryAppend(CreateRecord(chunk.ChunkHeader.GetGlobalLogPosition(logicalPos), _random.Next(10, 100)), CancellationToken.None);
+			Assert.True(result.Success);
+			actualPos = (int)result.NewPosition;
+		}
+
+		await chunk.Flush(token);
+
+		if (scavenged)
+			await chunk.CompleteScavenge(posMap, token);
+		else if (completed)
+			await chunk.Complete(token);
+
+		return chunk;
+	}
+
+	[Test]
+	[Repeat(10)]
+	public async Task return_correct_positions_for_an_incomplete_unscavenged_chunk() {
+		var numEvents = _random.Next(10, 20);
+		var logPositions = new List<long>();
+		var posMap = new List<PosMap>();
+
+		using var chunk = await CreateChunk(
+			numEvents: numEvents,
+			completed: false,
+			scavenged: false,
+			logPositions,
+			posMap);
+
+		Assert.AreEqual(numEvents, logPositions.Count);
+		foreach (var logPos in logPositions)
+			Assert.AreEqual(ChunkHeader.Size + logPos, await chunk.GetActualRawPosition(logPos, CancellationToken.None));
+		Assert.IsEmpty(posMap);
+	}
+
+	[Test]
+	[Repeat(10)]
+	public async Task return_correct_positions_for_a_complete_unscavenged_chunk() {
+		var numEvents = _random.Next(10, 20);
+		var logPositions = new List<long>();
+		var posMap = new List<PosMap>();
+
+		using var chunk = await CreateChunk(
+			numEvents: numEvents,
+			completed: true,
+			scavenged: false,
+			logPositions,
+			posMap);
+
+		Assert.AreEqual(numEvents, logPositions.Count);
+		foreach (var logPos in logPositions)
+			Assert.AreEqual(ChunkHeader.Size + logPos, await chunk.GetActualRawPosition(logPos, CancellationToken.None));
+		Assert.IsEmpty(posMap);
+	}
+
+	[Test]
+	[Repeat(10)]
+	public async Task return_correct_positions_for_a_scavenged_chunk() {
+		var numEvents = _random.Next(10, 20);
+		var logPositions = new List<long>();
+		var posMap = new List<PosMap>();
+
+		using var chunk = await CreateChunk(
+			numEvents: numEvents,
+			completed: true,
+			scavenged: true,
+			logPositions,
+			posMap);
+
+		Assert.AreEqual(numEvents, logPositions.Count);
+		Assert.AreEqual(numEvents, posMap.Count);
+		for (int i = 0; i < numEvents; i++) {
+			Assert.AreEqual(posMap[i].LogPos, logPositions[i]);
+			Assert.AreEqual(ChunkHeader.Size + posMap[i].ActualPos, await chunk.GetActualRawPosition(logPositions[i], CancellationToken.None));
+		}
+	}
+
+	[Test]
+	public async Task return_minus_one_for_positions_that_are_outside_the_range_of_an_unscavenged_chunk() {
+		var logPositions = new List<long>();
+		var posMap = new List<PosMap>();
+
+		using var chunk = await CreateChunk(
+			numEvents: 1,
+			completed: true,
+			scavenged: false,
+			logPositions,
+			posMap);
+
+		Assert.AreEqual(1, logPositions.Count);
+		Assert.IsEmpty(posMap);
+
+		Assert.AreEqual(chunk.LogicalDataSize, chunk.PhysicalDataSize);
+		Assert.AreEqual(ChunkHeader.Size + chunk.LogicalDataSize - 1, await chunk.GetActualRawPosition(chunk.LogicalDataSize - 1, CancellationToken.None));
+		Assert.AreEqual(-1, await chunk.GetActualRawPosition(chunk.LogicalDataSize, CancellationToken.None));
+		Assert.AreEqual(-1, await chunk.GetActualRawPosition(chunk.LogicalDataSize + 1, CancellationToken.None));
+	}
+
+	[Test]
+	public async Task return_minus_one_for_positions_that_do_not_exist_in_a_scavenged_chunk() {
+		var logPositions = new List<long>();
+		var posMap = new List<PosMap>();
+
+		using var chunk = await CreateChunk(
+			numEvents: 1,
+			completed: true,
+			scavenged: true,
+			logPositions,
+			posMap);
+
+		Assert.AreEqual(1, logPositions.Count);
+		Assert.AreEqual(1, posMap.Count);
+
+		Assert.AreEqual(ChunkHeader.Size + posMap[0].ActualPos, await chunk.GetActualRawPosition(logPositions[0], CancellationToken.None));
+		Assert.AreEqual(-1, await chunk.GetActualRawPosition(logPositions[0] + 1, CancellationToken.None));
+	}
+
+	[Test]
+	public async Task throw_argument_out_of_range_exception_for_negative_positions() {
+		var logPositions = new List<long>();
+		var posMap = new List<PosMap>();
+
+		using var chunk = await CreateChunk(
+			numEvents: 1,
+			completed: false,
+			scavenged: false,
+			logPositions,
+			posMap);
+
+		Assert.ThrowsAsync<ArgumentOutOfRangeException>(async () => await chunk.GetActualRawPosition(-1, CancellationToken.None));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/versioned_pattern_filenaming_strategy.cs b/src/KurrentDB.Core.Tests/TransactionLog/versioned_pattern_filenaming_strategy.cs
new file mode 100644
index 00000000000..1f344f5808d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/versioned_pattern_filenaming_strategy.cs
@@ -0,0 +1,186 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using KurrentDB.Core.TransactionLog.FileNamingStrategy;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class versioned_pattern_filenaming_strategy : SpecificationWithDirectory {
+	[Test]
+	public void when_constructed_with_null_path_should_throws_argumentnullexception() {
+		Assert.Throws<ArgumentNullException>(() => new VersionedPatternFileNamingStrategy(null, "prefix"));
+	}
+
+	[Test]
+	public void when_constructed_with_null_prefix_should_throws_argumentnullexception() {
+		Assert.Throws<ArgumentNullException>(() => new VersionedPatternFileNamingStrategy("path", null));
+	}
+
+	[Test]
+	public void when_getting_file_for_positive_index_and_no_version_appends_index_to_name_with_zero_version() {
+		var strategy = new VersionedPatternFileNamingStrategy("path", "prefix-");
+		Assert.AreEqual("path" + Path.DirectorySeparatorChar + "prefix-000001.000000",
+			strategy.GetFilenameFor(1, 0));
+	}
+
+	[Test]
+	public void when_getting_file_for_nonnegative_index_and_version_appends_value_and_provided_version() {
+		var strategy = new VersionedPatternFileNamingStrategy("path", "prefix-");
+		Assert.AreEqual("path" + Path.DirectorySeparatorChar + "prefix-000001.000007",
+			strategy.GetFilenameFor(1, 7));
+	}
+
+	[Test]
+	public void when_getting_file_for_negative_index_throws_argumentoutofrangeexception() {
+		var strategy = new VersionedPatternFileNamingStrategy("Path", "prefix");
+		Assert.Throws<ArgumentOutOfRangeException>(() => strategy.GetFilenameFor(-1, 0));
+	}
+
+	[Test]
+	public void when_getting_file_for_negative_version_throws_argumentoutofrangeexception() {
+		var strategy = new VersionedPatternFileNamingStrategy("Path", "prefix");
+		Assert.Throws<ArgumentOutOfRangeException>(() => strategy.GetFilenameFor(0, -1));
+	}
+
+	[Test]
+	public void returns_all_existing_versions_of_the_same_chunk_in_descending_order_of_versions() {
+		File.Create(GetFilePathFor("foo")).Close();
+		File.Create(GetFilePathFor("bla")).Close();
+
+		File.Create(GetFilePathFor("chunk-000001.000000")).Close();
+		File.Create(GetFilePathFor("chunk-000002.000000")).Close();
+		File.Create(GetFilePathFor("chunk-000003.000000")).Close();
+
+		File.Create(GetFilePathFor("chunk-000005.000000")).Close();
+		File.Create(GetFilePathFor("chunk-000005.000007")).Close();
+		File.Create(GetFilePathFor("chunk-000005.000002")).Close();
+		File.Create(GetFilePathFor("chunk-000005.000005")).Close();
+
+		var strategy = new VersionedPatternFileNamingStrategy(PathName, "chunk-");
+		var versions = strategy.GetAllVersionsFor(5);
+		Assert.AreEqual(4, versions.Length);
+		Assert.AreEqual(GetFilePathFor("chunk-000005.000007"), versions[0]);
+		Assert.AreEqual(GetFilePathFor("chunk-000005.000005"), versions[1]);
+		Assert.AreEqual(GetFilePathFor("chunk-000005.000002"), versions[2]);
+		Assert.AreEqual(GetFilePathFor("chunk-000005.000000"), versions[3]);
+	}
+
+	[Test]
+	public void returns_all_existing_not_temporary_files_with_correct_pattern() {
+		File.Create(GetFilePathFor("foo")).Close();
+		File.Create(GetFilePathFor("bla")).Close();
+		File.Create(GetFilePathFor("chunk-000001.000000.tmp")).Close();
+		File.Create(GetFilePathFor("chunk-001.000")).Close();
+
+		File.Create(GetFilePathFor("chunk-000001.000000")).Close();
+		File.Create(GetFilePathFor("chunk-000002.000000")).Close();
+		File.Create(GetFilePathFor("chunk-000003.000000")).Close();
+
+		File.Create(GetFilePathFor("chunk-000005.000000")).Close();
+		File.Create(GetFilePathFor("chunk-000005.000007")).Close();
+		File.Create(GetFilePathFor("chunk-000005.000002")).Close();
+		File.Create(GetFilePathFor("chunk-000005.000005")).Close();
+
+		var strategy = new VersionedPatternFileNamingStrategy(PathName, "chunk-");
+		var versions = strategy.GetAllPresentFiles();
+		Array.Sort(versions, StringComparer.CurrentCultureIgnoreCase);
+		Assert.AreEqual(7, versions.Length);
+		Assert.AreEqual(GetFilePathFor("chunk-000001.000000"), versions[0]);
+		Assert.AreEqual(GetFilePathFor("chunk-000002.000000"), versions[1]);
+		Assert.AreEqual(GetFilePathFor("chunk-000003.000000"), versions[2]);
+		Assert.AreEqual(GetFilePathFor("chunk-000005.000000"), versions[3]);
+		Assert.AreEqual(GetFilePathFor("chunk-000005.000002"), versions[4]);
+		Assert.AreEqual(GetFilePathFor("chunk-000005.000005"), versions[5]);
+		Assert.AreEqual(GetFilePathFor("chunk-000005.000007"), versions[6]);
+	}
+
+	[Test]
+	public void returns_all_temp_files_in_directory() {
+		File.Create(GetFilePathFor("bla")).Close();
+		File.Create(GetFilePathFor("bla.tmp")).Close();
+		File.Create(GetFilePathFor("bla.temp")).Close();
+
+		File.Create(GetFilePathFor("chunk-000005.000007.tmp")).Close();
+
+		File.Create(GetFilePathFor("foo.tmp")).Close();
+
+		var strategy = new VersionedPatternFileNamingStrategy(PathName, "chunk-");
+		var tempFiles = strategy.GetAllTempFiles();
+
+		Assert.AreEqual(3, tempFiles.Length);
+		Assert.Contains(GetFilePathFor("bla.tmp"), tempFiles);
+		Assert.Contains(GetFilePathFor("chunk-000005.000007.tmp"), tempFiles);
+		Assert.Contains(GetFilePathFor("foo.tmp"), tempFiles);
+	}
+
+	[Test]
+	public void does_not_return_temp_file_that_is_named_as_chunk() {
+		File.Create(GetFilePathFor("chunk-000000.000000.tmp")).Close();
+
+		var strategy = new VersionedPatternFileNamingStrategy(PathName, "chunk-");
+		var tempFiles = strategy.GetAllVersionsFor(0);
+
+		Assert.AreEqual(0, tempFiles.Length);
+	}
+
+	[Test]
+	public void returns_temp_filenames_detectable_by_getalltempfiles_method() {
+		var strategy = new VersionedPatternFileNamingStrategy(PathName, "chunk-");
+		Assert.AreEqual(0, strategy.GetAllTempFiles().Length);
+
+		var tmp1 = strategy.CreateTempFilename();
+		var tmp2 = strategy.CreateTempFilename();
+		File.Create(tmp1).Close();
+		File.Create(tmp2).Close();
+		var tmp = new[] { tmp1, tmp2 };
+		Array.Sort(tmp);
+
+		var tempFiles = strategy.GetAllTempFiles();
+		Array.Sort(tempFiles);
+		Assert.AreEqual(2, tempFiles.Length);
+		Assert.AreEqual(tmp[0], tempFiles[0]);
+		Assert.AreEqual(tmp[1], tempFiles[1]);
+	}
+
+	[Test]
+	public void returns_file_index_for_correctly_formatted_filename() {
+		var strategy = new VersionedPatternFileNamingStrategy(PathName, "chunk-");
+		Assert.AreEqual(0, strategy.GetIndexFor("chunk-000000.000000"));
+		Assert.AreEqual(1, strategy.GetIndexFor("chunk-000001.000000"));
+		Assert.AreEqual(999999, strategy.GetIndexFor("chunk-999999.000000"));
+	}
+
+	[Test]
+	public void returns_file_version_for_correctly_formatted_filename() {
+		var strategy = new VersionedPatternFileNamingStrategy(PathName, "chunk-");
+		Assert.AreEqual(0, strategy.GetVersionFor("chunk-000002.000000"));
+		Assert.AreEqual(1, strategy.GetVersionFor("chunk-000002.000001"));
+		Assert.AreEqual(999999, strategy.GetVersionFor("chunk-000002.999999"));
+	}
+
+	[Test]
+	public void throws_for_incorrectly_formatted_filename() {
+		var strategy = new VersionedPatternFileNamingStrategy(PathName, "chunk-");
+		Assert.Throws<ArgumentException>(() => strategy.GetIndexFor("chunk-000000.a"));
+		Assert.Throws<ArgumentException>(() => strategy.GetIndexFor("chunk-00000a.000000"));
+		Assert.Throws<ArgumentException>(() => strategy.GetIndexFor("chunk-a.000000"));
+		Assert.Throws<ArgumentException>(() => strategy.GetIndexFor("chunk-000000.00000a"));
+		Assert.Throws<ArgumentException>(() => strategy.GetIndexFor("chunks-000000.00000a"));
+		Assert.Throws<ArgumentException>(() => strategy.GetVersionFor("chunk-000000.a"));
+		Assert.Throws<ArgumentException>(() => strategy.GetVersionFor("chunk-00000a.000000"));
+		Assert.Throws<ArgumentException>(() => strategy.GetVersionFor("chunk-a.000000"));
+		Assert.Throws<ArgumentException>(() => strategy.GetVersionFor("chunk-000000.00000a"));
+		Assert.Throws<ArgumentException>(() => strategy.GetVersionFor("chunks-000000.00000a"));
+		Assert.Throws<ArgumentException>(() => strategy.GetVersionFor("chunks-000000.000000"));
+	}
+
+	[Test]
+	public void returns_correct_prefix() {
+		var strategy = new VersionedPatternFileNamingStrategy(PathName, "chunk-");
+		Assert.AreEqual("chunk-", strategy.Prefix);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_appending_past_end_of_a_tfchunk.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_appending_past_end_of_a_tfchunk.cs
new file mode 100644
index 00000000000..9243938043b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_appending_past_end_of_a_tfchunk.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_appending_past_end_of_a_tfchunk<TLogFormat, TStreamId> : SpecificationWithFile {
+	private TFChunk _chunk;
+	private readonly Guid _corrId = Guid.NewGuid();
+	private readonly Guid _eventId = Guid.NewGuid();
+	private bool _written;
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		var record = LogRecord.Prepare(recordFactory, 15556, _corrId, _eventId, 15556, 0, streamId, 1,
+			PrepareFlags.None, eventTypeId, new byte[12], new byte[15], new DateTime(2000, 1, 1, 12, 0, 0));
+		_chunk = await TFChunkHelper.CreateNewChunk(Filename, 20);
+		_written = (await _chunk.TryAppend(record, CancellationToken.None)).Success;
+	}
+
+	[TearDown]
+	public override void TearDown() {
+		_chunk.Dispose();
+		base.TearDown();
+	}
+
+	[Test]
+	public void the_record_is_not_appended() {
+		Assert.IsFalse(_written);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_appending_to_a_tfchunk_and_flushing.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_appending_to_a_tfchunk_and_flushing.cs
new file mode 100644
index 00000000000..62b4ffcad8b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_appending_to_a_tfchunk_and_flushing.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_appending_to_a_tfchunk_and_flushing<TLogFormat, TStreamId> : SpecificationWithFilePerTestFixture {
+	private TFChunk _chunk;
+	private readonly Guid _corrId = Guid.NewGuid();
+	private readonly Guid _eventId = Guid.NewGuid();
+	private RecordWriteResult _result;
+	private IPrepareLogRecord<TStreamId> _record;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		_record = LogRecord.Prepare(recordFactory, 0, _corrId, _eventId, 0, 0, streamId, 1,
+			PrepareFlags.None, eventTypeId, new byte[12], new byte[15], new DateTime(2000, 1, 1, 12, 0, 0));
+		_chunk = await TFChunkHelper.CreateNewChunk(Filename);
+		_result = await _chunk.TryAppend(_record, CancellationToken.None);
+		await _chunk.Flush(CancellationToken.None);
+	}
+
+	[OneTimeTearDown]
+	public override void TestFixtureTearDown() {
+		_chunk.Dispose();
+		base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void the_write_result_is_correct() {
+		Assert.IsTrue(_result.Success);
+		Assert.AreEqual(0, _result.OldPosition);
+		Assert.AreEqual(_record.GetSizeWithLengthPrefixAndSuffix(), _result.NewPosition);
+	}
+
+	[Test]
+	public void the_record_is_appended() {
+		Assert.IsTrue(_result.Success);
+	}
+
+	[Test]
+	public void correct_old_position_is_returned() {
+		//position without header (logical position).
+		Assert.AreEqual(0, _result.OldPosition);
+	}
+
+	[Test]
+	public void the_updated_position_is_returned() {
+		//position without header (logical position).
+		Assert.AreEqual(_record.GetSizeWithLengthPrefixAndSuffix(), _result.NewPosition);
+	}
+
+	[Test]
+	public async Task the_record_can_be_read_at_exact_position() {
+		var res = await _chunk.TryReadAt(0, couldBeScavenged: false, CancellationToken.None);
+		Assert.IsTrue(res.Success);
+		Assert.AreEqual(_record, res.LogRecord);
+		Assert.AreEqual(_result.OldPosition, res.LogRecord.LogPosition);
+	}
+
+	[Test]
+	public async Task the_record_can_be_read_as_first_one() {
+		var res = await _chunk.TryReadFirst(CancellationToken.None);
+		Assert.IsTrue(res.Success);
+		Assert.AreEqual(_record, res.LogRecord);
+		Assert.AreEqual(_record.GetSizeWithLengthPrefixAndSuffix(), res.NextPosition);
+	}
+
+	[Test]
+	public async Task the_record_can_be_read_as_closest_forward_to_pos_zero() {
+		var res = await _chunk.TryReadClosestForward(0, CancellationToken.None);
+		Assert.IsTrue(res.Success);
+		Assert.AreEqual(_record, res.LogRecord);
+		Assert.AreEqual(_record.GetSizeWithLengthPrefixAndSuffix(), res.NextPosition);
+	}
+
+	[Test]
+	public async Task the_record_can_be_read_as_closest_backward_from_end() {
+		var res = await _chunk.TryReadClosestBackward(_record.GetSizeWithLengthPrefixAndSuffix(), CancellationToken.None);
+		Assert.IsTrue(res.Success);
+		Assert.AreEqual(_record, res.LogRecord);
+		Assert.AreEqual(0, res.NextPosition);
+	}
+
+	[Test]
+	public async Task the_record_can_be_read_as_last_one() {
+		var res = await _chunk.TryReadLast(CancellationToken.None);
+		Assert.IsTrue(res.Success);
+		Assert.AreEqual(_record, res.LogRecord);
+		Assert.AreEqual(0, res.NextPosition);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_appending_to_a_tfchunk_without_flush.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_appending_to_a_tfchunk_without_flush.cs
new file mode 100644
index 00000000000..814d523fae1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_appending_to_a_tfchunk_without_flush.cs
@@ -0,0 +1,59 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_appending_to_a_tfchunk_without_flush<TLogFormat, TStreamId> : SpecificationWithFilePerTestFixture {
+	private TFChunk _chunk;
+	private readonly Guid _corrId = Guid.NewGuid();
+	private readonly Guid _eventId = Guid.NewGuid();
+	private RecordWriteResult _result;
+	private IPrepareLogRecord<TStreamId> _record;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		_record = LogRecord.Prepare(recordFactory, 0, _corrId, _eventId, 0, 0, streamId, 1,
+			PrepareFlags.None, eventTypeId, new byte[12], new byte[15], new DateTime(2000, 1, 1, 12, 0, 0));
+		_chunk = await TFChunkHelper.CreateNewChunk(Filename);
+		_result = await _chunk.TryAppend(_record, CancellationToken.None);
+	}
+
+	[OneTimeTearDown]
+	public override void TestFixtureTearDown() {
+		_chunk.Dispose();
+		base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void the_record_is_appended() {
+		Assert.IsTrue(_result.Success);
+	}
+
+	[Test]
+	public void the_old_position_is_returned() {
+		//position without header.
+		Assert.AreEqual(0, _result.OldPosition);
+	}
+
+	[Test]
+	public void the_updated_position_is_returned() {
+		//position without header.
+		Assert.AreEqual(_record.GetSizeWithLengthPrefixAndSuffix(), _result.NewPosition);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_chasing_a_chunked_transaction_log.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_chasing_a_chunked_transaction_log.cs
new file mode 100644
index 00000000000..9463b2441b0
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_chasing_a_chunked_transaction_log.cs
@@ -0,0 +1,346 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Buffers;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+public static class LogRecordExtensions {
+	public static void WriteWithLengthPrefixAndSuffixTo(this ILogRecord record, BinaryWriter writer) {
+		var localWriter = new BufferWriterSlim<byte>();
+		try {
+			record.WriteTo(ref localWriter);
+
+			writer.Write(localWriter.WrittenCount);
+			writer.Write(localWriter.WrittenSpan);
+			writer.Write(localWriter.WrittenCount);
+		} finally {
+			localWriter.Dispose();
+		}
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_chasing_a_chunked_transaction_log<TLogFormat, TStreamId> : SpecificationWithDirectory {
+	private readonly Guid _correlationId = Guid.NewGuid();
+	private readonly Guid _eventId = Guid.NewGuid();
+
+	[Test]
+	public async Task try_read_returns_false_when_writer_checkpoint_is_zero() {
+		var writerchk = new InMemoryCheckpoint(0);
+		var chaserchk = new InMemoryCheckpoint();
+		await using var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, writerchk, chaserchk));
+		await db.Open();
+
+		var chaser = new TFChunkChaser(db, writerchk, new InMemoryCheckpoint());
+		chaser.Open();
+
+		Assert.IsTrue(await chaser.TryReadNext(CancellationToken.None) is { LogRecord: null });
+
+		chaser.Close();
+	}
+
+	[Test]
+	public async Task try_read_returns_false_when_writer_checksum_is_equal_to_reader_checksum() {
+		var writerchk = new InMemoryCheckpoint();
+		var chaserchk = new InMemoryCheckpoint(Checkpoint.Chaser, 0);
+		await using var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, writerchk, chaserchk));
+		await db.Open();
+		writerchk.Write(12);
+		writerchk.Flush();
+		chaserchk.Write(12);
+		chaserchk.Flush();
+
+		var chaser = new TFChunkChaser(db, writerchk, chaserchk);
+		chaser.Open();
+
+		Assert.IsTrue(await chaser.TryReadNext(CancellationToken.None) is { LogRecord: null });
+		Assert.AreEqual(12, chaserchk.Read());
+
+		chaser.Close();
+	}
+
+	[Test]
+	public async Task try_read_returns_record_when_writerchecksum_ahead() {
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		var recordToWrite = LogRecord.Prepare(
+			factory: recordFactory,
+			logPosition: 0,
+			correlationId: _correlationId,
+			eventId: _eventId,
+			transactionPos: 0,
+			transactionOffset: 0,
+			eventStreamId: streamId,
+			expectedVersion: 1234,
+			timeStamp: new DateTime(2012, 12, 21),
+			flags: PrepareFlags.None,
+			eventType: eventTypeId,
+			data: new byte[] { 1, 2, 3, 4, 5 },
+			metadata: new byte[] { 7, 17 });
+
+		using (var fs = new FileStream(GetFilePathFor("chunk-000000.000000"), FileMode.CreateNew,
+			FileAccess.Write)) {
+			fs.SetLength(ChunkHeader.Size + ChunkFooter.Size + 10000);
+			var chunkHeader = new ChunkHeader(TFChunk.CurrentChunkVersion, TFChunk.CurrentChunkVersion, 10000, 0, 0, false, Guid.NewGuid(), TransformType.Identity)
+				.AsByteArray();
+			var writer = new BinaryWriter(fs);
+			writer.Write(chunkHeader);
+			recordToWrite.WriteWithLengthPrefixAndSuffixTo(writer);
+			fs.Close();
+		}
+
+		var writerchk = new InMemoryCheckpoint(recordToWrite.GetSizeWithLengthPrefixAndSuffix() + 16);
+		var chaserchk = new InMemoryCheckpoint(Checkpoint.Chaser, 0);
+		await using var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, writerchk, chaserchk));
+		await db.Open();
+
+		var chaser = new TFChunkChaser(db, writerchk, chaserchk);
+		chaser.Open();
+
+		var recordRead = await chaser.TryReadNext(CancellationToken.None);
+		chaser.Close();
+
+		Assert.AreEqual(recordRead.LogRecord.GetSizeWithLengthPrefixAndSuffix(), chaserchk.Read());
+		Assert.IsTrue(recordRead.Success);
+		Assert.AreEqual(recordToWrite, recordRead.LogRecord);
+	}
+
+
+	[Test]
+	public async Task try_read_returns_record_when_record_bigger_than_internal_buffer() {
+		var writerchk = new InMemoryCheckpoint(0);
+		var chaserchk = new InMemoryCheckpoint(Checkpoint.Chaser, 0);
+
+		await using var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, writerchk, chaserchk));
+		await db.Open();
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		var recordToWrite = LogRecord.Prepare(
+			factory: recordFactory,
+			logPosition: 0,
+			correlationId: _correlationId,
+			eventId: _eventId,
+			transactionPos: 0,
+			transactionOffset: 0,
+			eventStreamId: streamId,
+			expectedVersion: 1234,
+			timeStamp: new DateTime(2012, 12, 21),
+			flags: PrepareFlags.None,
+			eventType: eventTypeId,
+			data: new byte[9000],
+			metadata: new byte[] { 7, 17 });
+		var writer = new TFChunkWriter(db);
+		await writer.Open(CancellationToken.None);
+
+		Assert.IsTrue(await writer.Write(recordToWrite, CancellationToken.None) is (true, _));
+		await writer.DisposeAsync();
+
+		writerchk.Write(recordToWrite.GetSizeWithLengthPrefixAndSuffix());
+
+		var reader = new TFChunkChaser(db, writerchk, chaserchk);
+		reader.Open();
+
+		var readRecord = await reader.TryReadNext(CancellationToken.None);
+		reader.Close();
+
+		Assert.IsTrue(readRecord.Success);
+		Assert.AreEqual(readRecord.LogRecord.GetSizeWithLengthPrefixAndSuffix(), chaserchk.Read());
+		Assert.AreEqual(recordToWrite, readRecord.LogRecord);
+	}
+
+	[Test]
+	public async Task try_read_returns_record_when_writerchecksum_equal() {
+		var writerchk = new InMemoryCheckpoint(0);
+		var chaserchk = new InMemoryCheckpoint(Checkpoint.Chaser, 0);
+		await using var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, writerchk, chaserchk));
+		await db.Open();
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		var recordToWrite = LogRecord.Prepare(
+			factory: recordFactory,
+			logPosition: 0,
+			correlationId: _correlationId,
+			eventId: _eventId,
+			transactionPos: 0,
+			transactionOffset: 0,
+			eventStreamId: streamId,
+			expectedVersion: 1234,
+			timeStamp: new DateTime(2012, 12, 21),
+			flags: PrepareFlags.None,
+			eventType: eventTypeId,
+			data: new byte[] { 1, 2, 3, 4, 5 },
+			metadata: new byte[] { 7, 17 });
+		var writer = new TFChunkWriter(db);
+		await writer.Open(CancellationToken.None);
+
+		Assert.IsTrue(await writer.Write(recordToWrite, CancellationToken.None) is (true, _));
+		await writer.DisposeAsync();
+
+		writerchk.Write(recordToWrite.GetSizeWithLengthPrefixAndSuffix());
+
+		var chaser = new TFChunkChaser(db, writerchk, chaserchk);
+		chaser.Open();
+
+		var readRecord = await chaser.TryReadNext(CancellationToken.None);
+		chaser.Close();
+
+		Assert.IsTrue(readRecord.Success);
+		Assert.AreEqual(readRecord.LogRecord.GetSizeWithLengthPrefixAndSuffix(), chaserchk.Read());
+		Assert.AreEqual(recordToWrite, readRecord.LogRecord);
+	}
+
+	/*   [Test]
+	   public void try_read_returns_false_when_writer_checksum_is_ahead_but_not_enough_to_read_record()
+	   {
+	       var writerchk = new InMemoryCheckpoint(50);
+	       var readerchk = new InMemoryCheckpoint("reader", 0);
+	       var config = new TransactionFileDatabaseConfig(PathName, "prefix.tf", 10000, writerchk, new[] { readerchk });
+	       var recordToWrite = LogRecord.Prepare(logPosition: 0,
+	                                                correlationId: _correlationId,
+	                                                eventId: _eventId,
+	                                                transactionPosition: 0,
+	                                                eventStreamId: "WorldEnding",
+	                                                expectedVersion: 1234,
+	                                                timeStamp: new DateTime(2012, 12, 21),
+	                                                flags: PrepareFlags.None,
+	                                                eventType: "type",
+	                                                data: new byte[] { 1, 2, 3, 4, 5 },
+	                                                metadata: new byte[] { 7, 17 });
+	       using (var fs = new FileStream(GetFilePathFor("prefix.tf0"), FileMode.CreateNew, FileAccess.Write))
+	       {
+	           var writer = new BinaryWriter(fs);
+	           recordToWrite.WriteWithLengthPrefixAndSuffixTo(writer);
+	           fs.Close();
+	       }
+
+	       var reader = new MultifileTransactionFileChaser(config, "reader");
+	       reader.Open();
+	       LogRecord record = null;
+	       var readRecord = reader.TryReadNext(out record);
+	       reader.Close();
+
+	       Assert.IsFalse(readRecord);
+	       Assert.AreEqual(0, readerchk.Read());
+	   }
+
+	   [Test]
+	   public void try_read_returns_false_when_writer_checksum_is_ahead_but_not_enough_to_read_length()
+	   {
+	       var writerchk = new InMemoryCheckpoint(3);
+	       var readerchk = new InMemoryCheckpoint("reader", 0);
+	       var config = new TransactionFileDatabaseConfig(PathName, "prefix.tf", 10000, writerchk,
+	                                                      new List<ICheckpoint> { readerchk });
+	       var recordToWrite = LogRecord.Prepare(logPosition: 0,
+	                                                correlationId: _correlationId,
+	                                                eventId: _eventId,
+	                                                transactionPosition: 0,
+	                                                eventStreamId: "WorldEnding",
+	                                                expectedVersion: 1234,
+	                                                timeStamp: new DateTime(2012, 12, 21),
+	                                                flags: PrepareFlags.None,
+	                                                eventType: "type",
+	                                                data: new byte[] { 1, 2, 3, 4, 5 },
+	                                                metadata: new byte[] { 7, 17 });
+	       using (var fs = new FileStream(GetFilePathFor("prefix.tf0"), FileMode.CreateNew, FileAccess.Write))
+	       {
+	           var writer = new BinaryWriter(fs);
+	           recordToWrite.WriteWithLengthPrefixAndSuffixTo(writer);
+	           fs.Close();
+	       }
+
+	       var reader = new MultifileTransactionFileChaser(config, "reader");
+	       reader.Open();
+	       LogRecord record = null;
+	       var readRecord = reader.TryReadNext(out record);
+	       reader.Close();
+	       Assert.IsFalse(readRecord);
+	       Assert.AreEqual(0, readerchk.Read());
+	   }
+
+	   [Test]
+	   public void try_read_returns_properly_when_writer_is_written_to_while_chasing()
+	   {
+	       var writerchk = new InMemoryCheckpoint(0);
+	       var readerchk = new InMemoryCheckpoint("reader", 0);
+	       var config = new TransactionFileDatabaseConfig(PathName, "prefix.tf", 10000, writerchk, new[] { readerchk });
+
+	       var fileName = GetFilePathFor("prefix.tf0");
+	       File.Create(fileName).Close();
+
+	       var reader = new MultifileTransactionFileChaser(config, "reader");
+	       reader.Open();
+
+	       LogRecord record;
+	       Assert.IsFalse(reader.TryReadNext(out record));
+
+	       var recordToWrite = LogRecord.Prepare(logPosition: 0,
+	                                                correlationId: _correlationId,
+	                                                eventId: _eventId,
+	                                                transactionPosition: 0,
+	                                                eventStreamId: "WorldEnding",
+	                                                expectedVersion: 1234,
+	                                                timeStamp: new DateTime(2012, 12, 21),
+	                                                flags: PrepareFlags.None,
+	                                                eventType: "type",
+	                                                data: new byte[] { 1, 2, 3, 4, 5 },
+	                                                metadata: new byte[] { 7, 17 });
+	       var memstream = new MemoryStream();
+	       var writer = new BinaryWriter(memstream);
+	       recordToWrite.WriteWithLengthPrefixAndSuffixTo(writer);
+
+	       using (var fs = new FileStream(fileName, FileMode.Append, FileAccess.Write, FileShare.ReadWrite))
+	       {
+	           fs.Write(memstream.ToArray(), 0, (int)memstream.Length);
+	           fs.Flush(flushToDisk: true);
+	       }
+	       writerchk.Write(memstream.Length);
+
+	       Assert.IsTrue(reader.TryReadNext(out record));
+	       Assert.AreEqual(record, recordToWrite);
+
+	       var recordToWrite2 = LogRecord.Prepare(logPosition: 0,
+	                                                 correlationId: _correlationId,
+	                                                 eventId: _eventId,
+	                                                 transactionPosition: 0,
+	                                                 eventStreamId: "WorldEnding",
+	                                                 expectedVersion: 4321,
+	                                                 timeStamp: new DateTime(2012, 12, 21),
+	                                                 flags: PrepareFlags.None,
+	                                                 eventType: "type",
+	                                                 data: new byte[] { 3, 2, 1 },
+	                                                 metadata: new byte[] { 9 });
+	       memstream.SetLength(0);
+	       recordToWrite2.WriteWithLengthPrefixAndSuffixTo(writer);
+
+	       using (var fs = new FileStream(fileName, FileMode.Append, FileAccess.Write, FileShare.ReadWrite))
+	       {
+	           fs.Write(memstream.ToArray(), 0, (int)memstream.Length);
+	           fs.Flush(flushToDisk: true);
+	       }
+	       writerchk.Write(writerchk.Read() + memstream.Length);
+
+	       Assert.IsTrue(reader.TryReadNext(out record));
+	       Assert.AreEqual(record, recordToWrite2);
+
+	       reader.Close();
+	   }*/
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_closing_the_database.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_closing_the_database.cs
new file mode 100644
index 00000000000..e1cd8b1bfed
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_closing_the_database.cs
@@ -0,0 +1,102 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_closing_the_database<TLogFormat, TStreamId> : SpecificationWithDirectory {
+
+	private TFChunkDb _db;
+
+	private static void CreateChunk(string path, int size) {
+		var chunkHeader = new ChunkHeader(TFChunk.CurrentChunkVersion, TFChunk.CurrentChunkVersion, size, 0, 0, false, Guid.NewGuid(), TransformType.Identity);
+		var chunkBytes = chunkHeader.AsByteArray();
+		var buf = new byte[ChunkHeader.Size + ChunkFooter.Size + chunkHeader.ChunkSize];
+		Buffer.BlockCopy(chunkBytes, 0, buf, 0, chunkBytes.Length);
+		File.WriteAllBytes(path, buf);
+	}
+
+	private static IPrepareLogRecord<TStreamId> CreateRecord() {
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		return LogRecord.Prepare(
+			factory: recordFactory,
+			logPosition: 0,
+			correlationId: Guid.NewGuid(),
+			eventId: Guid.NewGuid(),
+			transactionPos: 0,
+			transactionOffset: 0,
+			eventStreamId: streamId,
+			expectedVersion: -1,
+			timeStamp: new DateTime(2012, 12, 21),
+			flags: PrepareFlags.SingleWrite,
+			eventType: eventTypeId,
+			data: new byte[123],
+			metadata: new byte[] { 0x13, 0x37 });
+	}
+
+	private static ICheckpoint OpenCheckpoint(string path) =>
+		new FileCheckpoint(path, Path.GetFileName(path));
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+
+		CreateChunk(GetFilePathFor("chunk-000000.000000"), 10_000);
+
+		_db = new TFChunkDb(TFChunkHelper.CreateDbConfig(
+			PathName,
+			OpenCheckpoint(GetFilePathFor("writer.chk")),
+			OpenCheckpoint(GetFilePathFor("chaser.chk")),
+			10_000));
+		await _db.Open();
+
+		await Task.CompletedTask;
+	}
+
+	[TestCase(true)]
+	[TestCase(false)]
+	public async Task checkpoints_should_be_flushed_only_when_chunks_are_properly_closed(bool chunksClosed) {
+		if (!chunksClosed) {
+			// acquire a reader to prevent the chunk from being properly closed
+			await (await _db.Manager.GetInitializedChunk(0, CancellationToken.None)).AcquireDataReader(CancellationToken.None);
+		}
+
+		var writer = new TFChunkWriter(_db);
+		await writer.Open(CancellationToken.None);
+		Assert.IsTrue(await writer.Write(CreateRecord(), CancellationToken.None) is (true, _));
+
+		_db.Config.ChaserCheckpoint.Write(1); // any non-zero value just to test if the checkpoint is flushed
+
+		await _db.DisposeAsync();
+
+		// reopen the checkpoints
+		var writerChk = OpenCheckpoint(GetFilePathFor("writer.chk"));
+		var chaserChk = OpenCheckpoint(GetFilePathFor("chaser.chk"));
+
+		if (chunksClosed) {
+			Assert.Greater(writerChk.Read(), 0L);
+			Assert.Greater(chaserChk.Read(), 0L);
+		} else {
+			Assert.AreEqual(0L, writerChk.Read());
+			Assert.AreEqual(0L, chaserChk.Read());
+		}
+
+		writerChk.Close(flush: false);
+		chaserChk.Close(flush: false);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_creating_chunked_transaction_chaser.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_creating_chunked_transaction_chaser.cs
new file mode 100644
index 00000000000..db9121181ba
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_creating_chunked_transaction_chaser.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class when_creating_chunked_transaction_chaser : SpecificationWithDirectory {
+	[Test]
+	public void a_null_file_config_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(
+			() => new TFChunkChaser(null, new InMemoryCheckpoint(0), new InMemoryCheckpoint(0)));
+	}
+
+	[Test]
+	public async Task a_null_writer_checksum_throws_argument_null_exception() {
+		await using var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, 0));
+		Assert.Throws<ArgumentNullException>(() => new TFChunkChaser(db, null, new InMemoryCheckpoint()));
+	}
+
+	[Test]
+	public async Task a_null_chaser_checksum_throws_argument_null_exception() {
+		await using var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, 0));
+		Assert.Throws<ArgumentNullException>(() => new TFChunkChaser(db, new InMemoryCheckpoint(), null));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_creating_chunked_transaction_file_database.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_creating_chunked_transaction_file_database.cs
new file mode 100644
index 00000000000..535572d6623
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_creating_chunked_transaction_file_database.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class when_creating_chunked_transaction_file_database {
+	[Test]
+	public void a_null_config_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => new TFChunkDb(null));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_creating_chunked_transaction_file_reader.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_creating_chunked_transaction_file_reader.cs
new file mode 100644
index 00000000000..b0da8e03bae
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_creating_chunked_transaction_file_reader.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class when_creating_chunked_transaction_file_reader : SpecificationWithDirectory {
+	[Test]
+	public void a_null_db_config_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => new TFChunkReader(null, new InMemoryCheckpoint(0)));
+	}
+
+	[Test]
+	public async Task a_null_checkpoint_throws_argument_null_exception() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 0);
+		await using var db = new TFChunkDb(config);
+		Assert.Throws<ArgumentNullException>(() => new TFChunkReader(db, null));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_creating_chunked_transaction_file_writer.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_creating_chunked_transaction_file_writer.cs
new file mode 100644
index 00000000000..9dc12eb317d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_creating_chunked_transaction_file_writer.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class when_creating_chunked_transaction_file_writer {
+	[Test]
+	public void a_null_config_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => new TFChunkWriter(null));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_creating_tfchunk_from_empty_file.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_creating_tfchunk_from_empty_file.cs
new file mode 100644
index 00000000000..4b3d98c03eb
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_creating_tfchunk_from_empty_file.cs
@@ -0,0 +1,79 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class when_creating_tfchunk_from_empty_file : SpecificationWithFile {
+	private TFChunk _chunk;
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+		_chunk = await TFChunkHelper.CreateNewChunk(Filename, 1024);
+	}
+
+	[TearDown]
+	public override void TearDown() {
+		_chunk.Dispose();
+		base.TearDown();
+	}
+
+	[Test]
+	public void the_chunk_is_cached() {
+		Assert.IsTrue(_chunk.IsCached);
+	}
+
+	[Test]
+	public void the_file_is_created() {
+		Assert.IsTrue(File.Exists(Filename));
+	}
+
+	[Test]
+	public void the_chunk_is_not_readonly() {
+		Assert.IsFalse(_chunk.IsReadOnly);
+	}
+
+	[Test]
+	public void append_does_not_throw_exception() {
+		Assert.DoesNotThrowAsync(async () => await _chunk.TryAppend(new CommitLogRecord(0, Guid.NewGuid(), 0, DateTime.UtcNow, 0), CancellationToken.None));
+	}
+
+	[Test]
+	public async Task there_is_no_record_at_pos_zero() {
+		var res = await _chunk.TryReadAt(0, couldBeScavenged: true, CancellationToken.None);
+		Assert.IsFalse(res.Success);
+	}
+
+	[Test]
+	public async Task there_is_no_first_record() {
+		var res = await _chunk.TryReadFirst(CancellationToken.None);
+		Assert.IsFalse(res.Success);
+	}
+
+	[Test]
+	public async Task there_is_no_closest_forward_record_to_pos_zero() {
+		var res = await _chunk.TryReadClosestForward(0, CancellationToken.None);
+		Assert.IsFalse(res.Success);
+	}
+
+	[Test]
+	public async Task there_is_no_closest_backward_record_from_end() {
+		var res = await _chunk.TryReadClosestForward(0, CancellationToken.None);
+		Assert.IsFalse(res.Success);
+	}
+
+	[Test]
+	public async Task there_is_no_last_record() {
+		var res = await _chunk.TryReadLast(CancellationToken.None);
+		Assert.IsFalse(res.Success);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_destroying_a_tfchunk.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_destroying_a_tfchunk.cs
new file mode 100644
index 00000000000..95c7ae6a819
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_destroying_a_tfchunk.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class when_destroying_a_tfchunk : SpecificationWithFile {
+	private TFChunk _chunk;
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+		_chunk = await TFChunkHelper.CreateNewChunk(Filename, 1000);
+		_chunk.MarkForDeletion();
+	}
+
+	[Test]
+	public void the_file_is_deleted() {
+		Assert.IsFalse(File.Exists(Filename));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_destroying_a_tfchunk_that_is_locked.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_destroying_a_tfchunk_that_is_locked.cs
new file mode 100644
index 00000000000..33d7ef172de
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_destroying_a_tfchunk_that_is_locked.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class when_destroying_a_tfchunk_that_is_locked : SpecificationWithFile {
+	private TFChunk _chunk;
+	private TFChunkBulkReader _reader;
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+		_chunk = await TFChunkHelper.CreateNewChunk(Filename, 1000);
+		await _chunk.Complete(CancellationToken.None);
+		await _chunk.UnCacheFromMemory(CancellationToken.None);
+		_reader = await _chunk.AcquireRawReader(CancellationToken.None);
+		_chunk.MarkForDeletion();
+	}
+
+	[TearDown]
+	public override void TearDown() {
+		_reader.Release();
+		_chunk.MarkForDeletion();
+		_chunk.WaitForDestroy(2000);
+		base.TearDown();
+	}
+
+	[Test]
+	public void the_file_is_not_deleted() {
+		Assert.IsTrue(File.Exists(Filename));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_having_scavenged_tfchunk_with_all_records_removed.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_having_scavenged_tfchunk_with_all_records_removed.cs
new file mode 100644
index 00000000000..4d768fc42bb
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_having_scavenged_tfchunk_with_all_records_removed.cs
@@ -0,0 +1,186 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Tests.Services.Storage;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+using Serilog;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_having_scavenged_tfchunk_with_all_records_removed<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private LogFormatAbstractor<TStreamId> _logFormat;
+	private TFChunkDb _db;
+	private TFChunk _scavengedChunk;
+	private int _originalFileSize;
+	private IPrepareLogRecord _p1, _p2, _p3;
+	private CommitLogRecord _c1, _c2, _c3;
+	private RecordWriteResult _res1, _res2, _res3;
+	private RecordWriteResult _cres1, _cres2, _cres3;
+
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
+			IndexDirectory = GetFilePathFor("index"),
+		});
+
+		_db = new TFChunkDb(TFChunkHelper.CreateSizedDbConfig(PathName, 0, chunkSize: 16 * 1024));
+		await _db.Open();
+
+		var chunk = await _db.Manager.GetInitializedChunkFor(0, CancellationToken.None);
+		var streamName = "es-to-scavenge";
+		var pos = 0L;
+		_logFormat.StreamNameIndex.GetOrReserve(_logFormat.RecordFactory, streamName, 0, out var streamId, out var streamRecord);
+		if (streamRecord is not null) {
+			var res = await chunk.TryAppend(streamRecord, CancellationToken.None);
+			pos = res.NewPosition;
+		}
+
+		_logFormat.EventTypeIndex.GetOrReserveEventType(_logFormat.RecordFactory, "et1", pos, out var eventTypeId, out var eventTypeRecord);
+		if (eventTypeRecord is not null) {
+			var res = await chunk.TryAppend(eventTypeRecord, CancellationToken.None);
+			pos = res.NewPosition;
+		}
+
+		var expectedVersion = ExpectedVersion.NoStream;
+		_p1 = LogRecord.SingleWrite(_logFormat.RecordFactory, pos, Guid.NewGuid(), Guid.NewGuid(), streamId, expectedVersion++, eventTypeId,
+			new byte[2048], new byte[] { 5, 7 });
+		_res1 = await chunk.TryAppend(_p1, CancellationToken.None);
+
+		_c1 = LogRecord.Commit(_res1.NewPosition, Guid.NewGuid(), _p1.LogPosition, 0);
+		_cres1 = await chunk.TryAppend(_c1, CancellationToken.None);
+
+		_p2 = LogRecord.SingleWrite(_logFormat.RecordFactory, _cres1.NewPosition,
+			Guid.NewGuid(), Guid.NewGuid(), streamId, expectedVersion++, eventTypeId,
+			new byte[2048], new byte[] { 5, 7 });
+		_res2 = await chunk.TryAppend(_p2, CancellationToken.None);
+
+		_c2 = LogRecord.Commit(_res2.NewPosition, Guid.NewGuid(), _p2.LogPosition, 1);
+		_cres2 = await chunk.TryAppend(_c2, CancellationToken.None);
+
+		_p3 = LogRecord.SingleWrite(_logFormat.RecordFactory, _cres2.NewPosition,
+			Guid.NewGuid(), Guid.NewGuid(), streamId, expectedVersion++, eventTypeId,
+			new byte[2048], new byte[] { 5, 7 });
+		_res3 = await chunk.TryAppend(_p3, CancellationToken.None);
+
+		_c3 = LogRecord.Commit(_res3.NewPosition, Guid.NewGuid(), _p3.LogPosition, 2);
+		_cres3 = await chunk.TryAppend(_c3, CancellationToken.None);
+
+		await chunk.Complete(CancellationToken.None);
+		_originalFileSize = chunk.FileSize;
+
+		_db.Config.WriterCheckpoint.Write(chunk.ChunkHeader.ChunkEndPosition);
+		_db.Config.WriterCheckpoint.Flush();
+		_db.Config.ChaserCheckpoint.Write(chunk.ChunkHeader.ChunkEndPosition);
+		_db.Config.ChaserCheckpoint.Flush();
+
+		var scavenger = new TFChunkScavenger<TStreamId>(Log.Logger, _db, new FakeTFScavengerLog(), new FakeTableIndex<TStreamId>(),
+			new FakeReadIndex<TLogFormat, TStreamId>(x => EqualityComparer<TStreamId>.Default.Equals(x, streamId), _logFormat.Metastreams),
+			_logFormat.Metastreams);
+		await scavenger.Scavenge(alwaysKeepScavenged: true, mergeChunks: false);
+
+		_scavengedChunk = await _db.Manager.GetInitializedChunk(0, CancellationToken.None);
+	}
+
+	public override async Task TestFixtureTearDown() {
+		_logFormat?.Dispose();
+		await _db.DisposeAsync();
+
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void first_record_was_written() {
+		Assert.IsTrue(_res1.Success);
+		Assert.IsTrue(_cres1.Success);
+	}
+
+	[Test]
+	public void second_record_was_written() {
+		Assert.IsTrue(_res2.Success);
+		Assert.IsTrue(_cres2.Success);
+	}
+
+	[Test]
+	public void third_record_was_written() {
+		Assert.IsTrue(_res3.Success);
+		Assert.IsTrue(_cres3.Success);
+	}
+
+	[Test]
+	public async Task prepare1_cant_be_read_at_position() {
+		var res = await _scavengedChunk.TryReadAt((int)_p1.LogPosition, couldBeScavenged: true, CancellationToken.None);
+		Assert.IsFalse(res.Success);
+	}
+
+	[Test]
+	public async Task commit1_cant_be_read_at_position() {
+		var res = await _scavengedChunk.TryReadAt((int)_c1.LogPosition, couldBeScavenged: true, CancellationToken.None);
+		Assert.IsFalse(res.Success);
+	}
+
+	[Test]
+	public async Task prepare2_cant_be_read_at_position() {
+		var res = await _scavengedChunk.TryReadAt((int)_p2.LogPosition, couldBeScavenged: true, CancellationToken.None);
+		Assert.IsFalse(res.Success);
+	}
+
+	[Test]
+	public async Task commit2_cant_be_read_at_position() {
+		var res = await _scavengedChunk.TryReadAt((int)_c2.LogPosition, couldBeScavenged: true, CancellationToken.None);
+		Assert.IsFalse(res.Success);
+	}
+
+	[Test]
+	public async Task prepare3_cant_be_read_at_position() {
+		var res = await _scavengedChunk.TryReadAt((int)_p3.LogPosition, couldBeScavenged: true, CancellationToken.None);
+		Assert.IsFalse(res.Success);
+	}
+
+	[Test]
+	public async Task commit3_cant_be_read_at_position() {
+		var res = await _scavengedChunk.TryReadAt((int)_c3.LogPosition, couldBeScavenged: true, CancellationToken.None);
+		Assert.IsFalse(res.Success);
+	}
+
+	[Test]
+	public async Task sequencial_read_returns_no_records() {
+		var records = new List<ILogRecord>();
+		RecordReadResult res = await _scavengedChunk.TryReadFirst(CancellationToken.None);
+		while (res.Success) {
+			records.Add(res.LogRecord);
+			res = await _scavengedChunk.TryReadClosestForward((int)res.NextPosition, CancellationToken.None);
+		}
+
+		if (LogFormatHelper<TLogFormat, TStreamId>.IsV2) {
+			Assert.AreEqual(0, records.Count);
+		} else {
+			Assert.AreEqual(2, records.Count);
+		}
+	}
+
+	[Test]
+	public void scavenged_chunk_should_have_saved_space() {
+		Assert.IsTrue(_scavengedChunk.FileSize < _originalFileSize,
+			String.Format("Expected scavenged file size ({0}) to be less than original file size ({1})",
+				_scavengedChunk.FileSize, _originalFileSize));
+	}
+
+	[Test]
+	public void scavenged_chunk_should_be_aligned() {
+		Assert.IsTrue(_scavengedChunk.FileSize % 4096 == 0);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_marking_for_deletion_a_tfchunk_that_has_been_locked_and_unlocked.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_marking_for_deletion_a_tfchunk_that_has_been_locked_and_unlocked.cs
new file mode 100644
index 00000000000..3a5dcd17813
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_marking_for_deletion_a_tfchunk_that_has_been_locked_and_unlocked.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class when_marking_for_deletion_a_tfchunk_that_has_been_locked_and_unlocked : SpecificationWithFile {
+	private TFChunk _chunk;
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+		_chunk = await TFChunkHelper.CreateNewChunk(Filename, 1000);
+		var reader = await _chunk.AcquireDataReader(CancellationToken.None);
+		_chunk.MarkForDeletion();
+		reader.Release();
+	}
+
+	[Test]
+	public void the_file_is_deleted() {
+		Assert.IsFalse(File.Exists(Filename));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_opening_chunked_transaction_file_db_without_previous_files.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_opening_chunked_transaction_file_db_without_previous_files.cs
new file mode 100644
index 00000000000..8ab8a243582
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_opening_chunked_transaction_file_db_without_previous_files.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class when_opening_chunked_transaction_file_db_without_previous_files : SpecificationWithDirectory {
+	[Test]
+	public async Task with_a_writer_checksum_of_zero_the_first_chunk_is_created_with_correct_name_and_is_aligned() {
+		var config = TFChunkHelper.CreateDbConfig(PathName, 0);
+		var db = new TFChunkDb(config);
+		await db.Open();
+		await db.DisposeAsync();
+
+		Assert.AreEqual(1, Directory.GetFiles(PathName).Length);
+		Assert.IsTrue(File.Exists(GetFilePathFor("chunk-000000.000000")));
+		var fileInfo = new FileInfo(GetFilePathFor("chunk-000000.000000"));
+		Assert.AreEqual(12288, fileInfo.Length);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_opening_existing_tfchunk.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_opening_existing_tfchunk.cs
new file mode 100644
index 00000000000..d71873a00bb
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_opening_existing_tfchunk.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.Transforms;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class when_opening_existing_tfchunk : SpecificationWithFilePerTestFixture {
+	private TFChunk _chunk;
+	private TFChunk _testChunk;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_chunk = await TFChunkHelper.CreateNewChunk(Filename);
+		await _chunk.Complete(CancellationToken.None);
+		_testChunk = await TFChunk.FromCompletedFile(new ChunkLocalFileSystem(Path.GetDirectoryName(Filename)), Filename, true, false,
+			reduceFileCachePressure: false, tracker: new TFChunkTracker.NoOp(),
+			getTransformFactory: DbTransformManager.Default);
+	}
+
+	[TearDown]
+	public override void TestFixtureTearDown() {
+		_chunk.Dispose();
+		_testChunk.Dispose();
+		base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void the_chunk_is_not_cached() {
+		Assert.IsFalse(_testChunk.IsCached);
+	}
+
+	[Test]
+	public void the_chunk_is_readonly() {
+		Assert.IsTrue(_testChunk.IsReadOnly);
+	}
+
+	[Test]
+	public void append_throws_invalid_operation_exception() {
+		Assert.ThrowsAsync<InvalidOperationException>(async () =>
+			await _testChunk.TryAppend(new CommitLogRecord(0, Guid.NewGuid(), 0, DateTime.UtcNow, 0), CancellationToken.None));
+	}
+
+	[Test]
+	public void flush_does_not_throw_any_exception() {
+		Assert.DoesNotThrowAsync(async () => await _testChunk.Flush(CancellationToken.None));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_opening_tfchunk_from_non_existing_file.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_opening_tfchunk_from_non_existing_file.cs
new file mode 100644
index 00000000000..bbedff2cf3c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_opening_tfchunk_from_non_existing_file.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.Transforms;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class when_opening_tfchunk_from_non_existing_file : SpecificationWithFile {
+	[Test]
+	public void it_should_throw_a_file_not_found_exception() {
+		Assert.ThrowsAsync<CorruptDatabaseException>(async () => await TFChunk.FromCompletedFile(new ChunkLocalFileSystem(Path.GetDirectoryName(Filename)), Filename, verifyHash: true,
+			unbufferedRead: false, reduceFileCachePressure: false, tracker: new TFChunkTracker.NoOp(),
+			getTransformFactory: DbTransformManager.Default));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_reading_a_single_record.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_reading_a_single_record.cs
new file mode 100644
index 00000000000..fd4b687bc69
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_reading_a_single_record.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_reading_a_single_record<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private const int RecordsCount = 8;
+
+	private TFChunkDb _db;
+	private ILogRecord[] _records;
+	private RecordWriteResult[] _results;
+
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_db = new TFChunkDb(TFChunkHelper.CreateSizedDbConfig(PathName, 0, chunkSize: 4096));
+		await _db.Open();
+
+		var chunk = await _db.Manager.GetInitializedChunk(0, CancellationToken.None);
+		_records = new ILogRecord[RecordsCount];
+		_results = new RecordWriteResult[RecordsCount];
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		var expectedVersion = ExpectedVersion.NoStream;
+		var pos = 0;
+		for (int i = 0; i < RecordsCount; ++i) {
+			if (i > 0 && i % 3 == 0) {
+				pos = i / 3 * _db.Config.ChunkSize;
+				await chunk.Complete(CancellationToken.None);
+				chunk = await _db.Manager.AddNewChunk(CancellationToken.None);
+			}
+
+			_records[i] = LogRecord.SingleWrite(recordFactory, pos,
+				Guid.NewGuid(), Guid.NewGuid(), streamId, expectedVersion++, eventTypeId,
+				new byte[1200], new byte[] { 5, 7 });
+			_results[i] = await chunk.TryAppend(_records[i], CancellationToken.None);
+
+			pos += _records[i].GetSizeWithLengthPrefixAndSuffix();
+		}
+
+		await chunk.Flush(CancellationToken.None);
+		_db.Config.WriterCheckpoint.Write((RecordsCount / 3) * _db.Config.ChunkSize +
+										  _results[RecordsCount - 1].NewPosition);
+		_db.Config.WriterCheckpoint.Flush();
+	}
+
+	public override async Task TestFixtureTearDown() {
+		await _db.DisposeAsync();
+
+		await base.TestFixtureTearDown();
+	}
+
+	private TFChunkReader GetTFChunkReader(long from) {
+		return new TFChunkReader(_db, _db.Config.WriterCheckpoint, from);
+	}
+
+	[Test]
+	public void all_records_were_written() {
+		var pos = 0;
+		for (int i = 0; i < RecordsCount; ++i) {
+			if (i % 3 == 0)
+				pos = 0;
+
+			Assert.IsTrue(_results[i].Success);
+			Assert.AreEqual(pos, _results[i].OldPosition);
+
+			pos += _records[i].GetSizeWithLengthPrefixAndSuffix();
+			Assert.AreEqual(pos, _results[i].NewPosition);
+		}
+	}
+
+	[Test]
+	public async Task all_records_can_be_read() {
+		var reader = GetTFChunkReader(0);
+
+		RecordReadResult res;
+		for (var i = 0; i < RecordsCount; i++) {
+			var rec = _records[i];
+			res = await reader.TryReadAt(rec.LogPosition, couldBeScavenged: true, CancellationToken.None);
+
+			Assert.IsTrue(res.Success);
+			Assert.AreEqual(rec, res.LogRecord);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_reading_an_empty_chunked_transaction_log.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_reading_an_empty_chunked_transaction_log.cs
new file mode 100644
index 00000000000..5ab152ad300
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_reading_an_empty_chunked_transaction_log.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_reading_an_empty_chunked_transaction_log<TLogFormat, TStreamId> : SpecificationWithDirectory {
+	[Test]
+	public async Task try_read_returns_false_when_writer_checksum_is_zero() {
+		var writerchk = new InMemoryCheckpoint(0);
+		var chaserchk = new InMemoryCheckpoint(0);
+		await using var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, writerchk, chaserchk));
+		await db.Open();
+
+		var reader = new TFChunkReader(db, writerchk, 0);
+		Assert.IsTrue(await reader.TryReadNext(CancellationToken.None) is { Success: false });
+	}
+
+	[Test]
+	public async Task try_read_does_not_cache_anything_and_returns_record_once_it_is_written_later() {
+		var writerchk = new InMemoryCheckpoint(0);
+		var chaserchk = new InMemoryCheckpoint(0);
+		await using var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, writerchk, chaserchk));
+		await db.Open();
+
+		var writer = new TFChunkWriter(db);
+		await writer.Open(CancellationToken.None);
+
+		var reader = new TFChunkReader(db, writerchk, 0);
+
+		Assert.IsTrue(await reader.TryReadNext(CancellationToken.None) is { Success: false });
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		var rec = LogRecord.SingleWrite(recordFactory, 0, Guid.NewGuid(), Guid.NewGuid(), streamId, -1, eventTypeId, new byte[] { 7 }, null);
+
+		Assert.IsTrue(await writer.Write(rec, CancellationToken.None) is (true, _));
+		await writer.DisposeAsync();
+
+		var res = await reader.TryReadNext(CancellationToken.None);
+		Assert.IsTrue(res.Success);
+		Assert.AreEqual(rec, res.LogRecord);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_reading_cached_empty_scavenged_tfchunk.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_reading_cached_empty_scavenged_tfchunk.cs
new file mode 100644
index 00000000000..d019342ae19
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_reading_cached_empty_scavenged_tfchunk.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class when_reading_cached_empty_scavenged_tfchunk : SpecificationWithFilePerTestFixture {
+	private TFChunk _chunk;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_chunk = await TFChunkHelper.CreateNewChunk(Filename, isScavenged: true);
+		await _chunk.CompleteScavenge(new PosMap[0], CancellationToken.None);
+		await _chunk.CacheInMemory(CancellationToken.None);
+	}
+
+	[OneTimeTearDown]
+	public override void TestFixtureTearDown() {
+		_chunk.Dispose();
+		base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public async Task no_record_at_exact_position_can_be_read() {
+		Assert.IsTrue(await _chunk.TryReadAt(0, couldBeScavenged: true, CancellationToken.None) is { Success: false });
+	}
+
+	[Test]
+	public async Task no_record_can_be_read_as_first_record() {
+		Assert.IsFalse((await _chunk.TryReadFirst(CancellationToken.None)).Success);
+	}
+
+	[Test]
+	public async Task no_record_can_be_read_as_closest_forward_record() {
+		Assert.IsTrue(await _chunk.TryReadClosestForward(0, CancellationToken.None) is { Success: false });
+	}
+
+	[Test]
+	public async Task no_record_can_be_read_as_closest_backward_record() {
+		Assert.IsFalse((await _chunk.TryReadClosestBackward(0, CancellationToken.None)).Success);
+	}
+
+	[Test]
+	public async Task no_record_can_be_read_as_last_record() {
+		Assert.IsFalse((await _chunk.TryReadLast(CancellationToken.None)).Success);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_reading_file_checkpoints.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_reading_file_checkpoints.cs
new file mode 100644
index 00000000000..9b44d5d88c0
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_reading_file_checkpoints.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class when_reading_file_checkpoints : SpecificationWithFile {
+	[Test]
+	public void mem_mapped_file_checkpoint_can_be_read_as_file_checkpoint() {
+		var memoryMapped = new MemoryMappedFileCheckpoint(Filename);
+		memoryMapped.Write(0xDEAD);
+		memoryMapped.Close(flush: true);
+
+		var fileCheckpoint = new FileCheckpoint(Filename);
+		var read = fileCheckpoint.Read();
+		fileCheckpoint.Close(flush: true);
+		Assert.AreEqual(0xDEAD, read);
+	}
+
+	[Test]
+	public void file_checkpoint_can_be_read_as_mem_mapped_file_checkpoint() {
+		var fileCheckpoint = new FileCheckpoint(Filename);
+		fileCheckpoint.Write(0xDEAD);
+		fileCheckpoint.Close(flush: true);
+
+		var memoryMapped = new MemoryMappedFileCheckpoint(Filename);
+		var read = memoryMapped.Read();
+		memoryMapped.Close(flush: true);
+		Assert.AreEqual(0xDEAD, read);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_reading_from_a_cached_tfchunk.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_reading_from_a_cached_tfchunk.cs
new file mode 100644
index 00000000000..3ec60b602ee
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_reading_from_a_cached_tfchunk.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.Transforms;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_reading_from_a_cached_tfchunk<TLogFormat, TStreamId> : SpecificationWithFilePerTestFixture {
+	private TFChunk _chunk;
+	private readonly Guid _corrId = Guid.NewGuid();
+	private readonly Guid _eventId = Guid.NewGuid();
+	private TFChunk _cachedChunk;
+	private IPrepareLogRecord<TStreamId> _record;
+	private RecordWriteResult _result;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		_record = LogRecord.Prepare(recordFactory, 0, _corrId, _eventId, 0, 0, streamId, 1,
+			PrepareFlags.None, eventTypeId, new byte[12], new byte[15], new DateTime(2000, 1, 1, 12, 0, 0));
+		_chunk = await TFChunkHelper.CreateNewChunk(Filename);
+		_result = await _chunk.TryAppend(_record, CancellationToken.None);
+		await _chunk.Flush(CancellationToken.None);
+		await _chunk.Complete(CancellationToken.None);
+		_cachedChunk = await TFChunk.FromCompletedFile(new ChunkLocalFileSystem(Path.GetDirectoryName(Filename)), Filename, verifyHash: true, unbufferedRead: false,
+			reduceFileCachePressure: false, tracker: new TFChunkTracker.NoOp(),
+			getTransformFactory: DbTransformManager.Default);
+		await _cachedChunk.CacheInMemory(CancellationToken.None);
+	}
+
+	[OneTimeTearDown]
+	public override void TestFixtureTearDown() {
+		_chunk.Dispose();
+		_cachedChunk.Dispose();
+		base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void the_write_result_is_correct() {
+		Assert.IsTrue(_result.Success);
+		Assert.AreEqual(0, _result.OldPosition);
+		Assert.AreEqual(_record.GetSizeWithLengthPrefixAndSuffix(), _result.NewPosition);
+	}
+
+	[Test]
+	public void the_chunk_is_cached() {
+		Assert.IsTrue(_cachedChunk.IsCached);
+	}
+
+	[Test]
+	public async Task the_record_can_be_read_at_exact_position() {
+		var res = await _cachedChunk.TryReadAt(0, couldBeScavenged: true, CancellationToken.None);
+		Assert.IsTrue(res.Success);
+		Assert.AreEqual(_record, res.LogRecord);
+		Assert.AreEqual(_result.OldPosition, res.LogRecord.LogPosition);
+	}
+
+	[Test]
+	public async Task the_record_can_be_read_as_first_record() {
+		var res = await _cachedChunk.TryReadFirst(CancellationToken.None);
+		Assert.IsTrue(res.Success);
+		Assert.AreEqual(_record.GetSizeWithLengthPrefixAndSuffix(), res.NextPosition);
+		Assert.AreEqual(_record, res.LogRecord);
+		Assert.AreEqual(_result.OldPosition, res.LogRecord.LogPosition);
+	}
+
+	[Test]
+	public async Task the_record_can_be_read_as_closest_forward_to_zero_pos() {
+		var res = await _cachedChunk.TryReadClosestForward(0, CancellationToken.None);
+		Assert.IsTrue(res.Success);
+		Assert.AreEqual(_record.GetSizeWithLengthPrefixAndSuffix(), res.NextPosition);
+		Assert.AreEqual(_record, res.LogRecord);
+		Assert.AreEqual(_result.OldPosition, res.LogRecord.LogPosition);
+	}
+
+	[Test]
+	public async Task the_record_can_be_read_as_closest_backward_from_end() {
+		var res = await _cachedChunk.TryReadClosestBackward(_record.GetSizeWithLengthPrefixAndSuffix(), CancellationToken.None);
+		Assert.IsTrue(res.Success);
+		Assert.AreEqual(0, res.NextPosition);
+		Assert.AreEqual(_record, res.LogRecord);
+	}
+
+	[Test]
+	public async Task the_record_can_be_read_as_last() {
+		var res = await _cachedChunk.TryReadLast(CancellationToken.None);
+		Assert.IsTrue(res.Success);
+		Assert.AreEqual(0, res.NextPosition);
+		Assert.AreEqual(_record, res.LogRecord);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_reading_logical_bytes_bulk_from_a_chunk.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_reading_logical_bytes_bulk_from_a_chunk.cs
new file mode 100644
index 00000000000..f469990046e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_reading_logical_bytes_bulk_from_a_chunk.cs
@@ -0,0 +1,134 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_reading_logical_bytes_bulk_from_a_chunk<TLogFormat, TStreamId> : SpecificationWithDirectory {
+	[Test]
+	public async Task the_file_will_not_be_deleted_until_reader_released() {
+		var chunk = await TFChunkHelper.CreateNewChunk(GetFilePathFor("file1"), 2000);
+		using (var reader = await chunk.AcquireDataReader(CancellationToken.None)) {
+			chunk.MarkForDeletion();
+			var buffer = new byte[1024];
+			var result = await reader.ReadNextBytes(buffer, CancellationToken.None);
+			Assert.IsFalse(result.IsEOF);
+			Assert.AreEqual(0, result.BytesRead); // no data yet
+		}
+
+		chunk.WaitForDestroy(5000);
+	}
+
+	[Test]
+	public async Task a_read_on_new_file_can_be_performed_but_returns_nothing() {
+		var chunk = await TFChunkHelper.CreateNewChunk(GetFilePathFor("file1"), 2000);
+		using (var reader = await chunk.AcquireDataReader(CancellationToken.None)) {
+			var buffer = new byte[1024];
+			var result = await reader.ReadNextBytes(buffer, CancellationToken.None);
+			Assert.IsFalse(result.IsEOF);
+			Assert.AreEqual(0, result.BytesRead);
+		}
+
+		chunk.MarkForDeletion();
+		chunk.WaitForDestroy(5000);
+	}
+
+	[Test]
+	public async Task a_read_past_end_of_completed_chunk_does_not_include_footer() {
+		var chunk = await TFChunkHelper.CreateNewChunk(GetFilePathFor("file1"), 300);
+		await chunk.Complete(CancellationToken.None); // chunk has 0 bytes of actual data
+		using (var reader = await chunk.AcquireDataReader(CancellationToken.None)) {
+			var buffer = new byte[1024];
+			var result = await reader.ReadNextBytes(buffer, CancellationToken.None);
+			Assert.IsTrue(result.IsEOF);
+			Assert.AreEqual(0, result.BytesRead);
+		}
+
+		chunk.MarkForDeletion();
+		chunk.WaitForDestroy(5000);
+	}
+
+	[Test]
+	public async Task a_read_on_scavenged_chunk_does_not_include_map() {
+		var chunk = await TFChunkHelper.CreateNewChunk(GetFilePathFor("afile"), 200, isScavenged: true);
+		await chunk.CompleteScavenge([new PosMap(0, 0), new PosMap(1, 1)], CancellationToken.None);
+		using (var reader = await chunk.AcquireDataReader(CancellationToken.None)) {
+			var buffer = new byte[1024];
+			var result = await reader.ReadNextBytes(buffer, CancellationToken.None);
+			Assert.IsTrue(result.IsEOF);
+			Assert.AreEqual(0, result.BytesRead); //header 128 + footer 128 + map 16
+		}
+
+		chunk.MarkForDeletion();
+		chunk.WaitForDestroy(5000);
+	}
+
+	[Test]
+	public async Task if_asked_for_more_than_buffer_size_will_only_read_buffer_size() {
+		var chunk = await TFChunkHelper.CreateNewChunk(GetFilePathFor("file1"), 3000);
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		var rec = LogRecord.Prepare(recordFactory, 0, Guid.NewGuid(),
+			Guid.NewGuid(), 0, 0, streamId, -1, PrepareFlags.None, eventTypeId,
+			new byte[2000], null);
+		Assert.IsTrue((await chunk.TryAppend(rec, CancellationToken.None)).Success, "Record was not appended");
+
+		using (var reader = await chunk.AcquireDataReader(CancellationToken.None)) {
+			var buffer = new byte[1024];
+			var result = await reader.ReadNextBytes(buffer, CancellationToken.None);
+			Assert.IsFalse(result.IsEOF);
+			Assert.AreEqual(1024, result.BytesRead);
+		}
+
+		chunk.MarkForDeletion();
+		chunk.WaitForDestroy(5000);
+	}
+
+	[Test]
+	public async Task a_read_past_eof_doesnt_return_eof_if_chunk_is_not_yet_completed() {
+		var chunk = await TFChunkHelper.CreateNewChunk(GetFilePathFor("file1"), 300);
+		var rec = LogRecord.Commit(0, Guid.NewGuid(), 0, 0);
+		Assert.IsTrue((await chunk.TryAppend(rec, CancellationToken.None)).Success, "Record was not appended");
+		using (var reader = await chunk.AcquireDataReader(CancellationToken.None)) {
+			var buffer = new byte[1024];
+			var result = await reader.ReadNextBytes(buffer, CancellationToken.None);
+			Assert.IsFalse(result.IsEOF, "EOF was returned.");
+			//does not include header and footer space
+			Assert.AreEqual(rec.GetSizeWithLengthPrefixAndSuffix(), result.BytesRead,
+				"Read wrong number of bytes.");
+		}
+
+		chunk.MarkForDeletion();
+		chunk.WaitForDestroy(5000);
+	}
+
+	[Test]
+	public async Task a_read_past_eof_returns_eof_if_chunk_is_completed() {
+		var chunk = await TFChunkHelper.CreateNewChunk(GetFilePathFor("file1"), 300);
+
+		var rec = LogRecord.Commit(0, Guid.NewGuid(), 0, 0);
+		Assert.IsTrue((await chunk.TryAppend(rec, CancellationToken.None)).Success, "Record was not appended");
+		await chunk.Complete(CancellationToken.None);
+
+		using (var reader = await chunk.AcquireDataReader(CancellationToken.None)) {
+			var buffer = new byte[1024];
+			var result = await reader.ReadNextBytes(buffer, CancellationToken.None);
+			Assert.IsTrue(result.IsEOF, "EOF was not returned.");
+			//does not include header and footer space
+			Assert.AreEqual(rec.GetSizeWithLengthPrefixAndSuffix(), result.BytesRead,
+				"Read wrong number of bytes.");
+		}
+
+		chunk.MarkForDeletion();
+		chunk.WaitForDestroy(5000);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_reading_physical_bytes_bulk_from_a_chunk.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_reading_physical_bytes_bulk_from_a_chunk.cs
new file mode 100644
index 00000000000..af26fd764d7
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_reading_physical_bytes_bulk_from_a_chunk.cs
@@ -0,0 +1,133 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class when_reading_physical_bytes_bulk_from_a_chunk : SpecificationWithDirectory {
+	[Test]
+	public async Task the_file_will_not_be_deleted_until_reader_released() {
+		var chunk = await TFChunkHelper.CreateNewChunk(GetFilePathFor("file1"), 2000);
+		await chunk.Complete(CancellationToken.None);
+		using (var reader = await chunk.AcquireRawReader(CancellationToken.None)) {
+			chunk.MarkForDeletion();
+			var buffer = new byte[1024];
+			var result = await reader.ReadNextBytes(buffer, CancellationToken.None);
+			Assert.IsFalse(result.IsEOF);
+			Assert.AreEqual(1024, result.BytesRead);
+		}
+
+		chunk.WaitForDestroy(5000);
+	}
+
+	[Test]
+	public async Task a_raw_read_on_new_file_cannot_be_performed() {
+		var chunk = await TFChunkHelper.CreateNewChunk(GetFilePathFor("file1"), 2000);
+
+		Assert.ThrowsAsync<Exception>(async () => {
+			await chunk.AcquireRawReader(CancellationToken.None);
+		});
+
+		chunk.MarkForDeletion();
+		chunk.WaitForDestroy(5000);
+	}
+
+	[TestCase(false)]
+	[TestCase(true)]
+	public async Task a_raw_read_on_newly_completed_file_can_be_performed(bool cached) {
+		var chunk = await TFChunkHelper.CreateNewChunk(GetFilePathFor("file1"), 2000);
+		await chunk.Complete(CancellationToken.None);
+
+		Assert.True(chunk.IsCached);
+		if (!cached) {
+			await chunk.UnCacheFromMemory(CancellationToken.None);
+			Assert.True(chunk.IsUncached);
+		}
+
+		using (var reader = await chunk.AcquireRawReader(CancellationToken.None)) {
+			var buffer = new byte[1024];
+			var result = await reader.ReadNextBytes(buffer, CancellationToken.None);
+			Assert.IsFalse(result.IsEOF);
+			Assert.AreEqual(1024, result.BytesRead);
+
+			var header = new ChunkHeader(buffer);
+			Assert.AreEqual(2000, header.ChunkSize);
+		}
+
+		await chunk.UnCacheFromMemory(CancellationToken.None);
+		Assert.True(chunk.IsUncached);
+
+		chunk.MarkForDeletion();
+		chunk.WaitForDestroy(5000);
+	}
+
+	/*
+			[Test]
+			public void a_read_on_scavenged_chunk_includes_map()
+			{
+				var chunk = TFChunk.CreateNew(GetFilePathFor("afile"), 200, 0, 0, isScavenged: true, inMem: false, unbuffered: false, writethrough: false);
+				chunk.CompleteScavenge(new [] {new PosMap(0, 0), new PosMap(1,1) }, false);
+				using (var reader = chunk.AcquireRawReader())
+				{
+					var buffer = new byte[1024];
+					var result = reader.ReadNextBytes(1024, buffer);
+					Assert.IsFalse(result.IsEOF);
+					Assert.AreEqual(ChunkHeader.Size + ChunkHeader.Size + 2 * PosMap.FullSize, result.BytesRead);
+				}
+				chunk.MarkForDeletion();
+				chunk.WaitForDestroy(5000);
+			}
+
+			[Test]
+			public void a_read_past_end_of_completed_chunk_does_include_header_or_footer()
+			{
+				var chunk = TFChunk.CreateNew(GetFilePathFor("File1"), 300, 0, 0, isScavenged: false, inMem: false, unbuffered: false, writethrough: false);
+				chunk.Complete();
+				using (var reader = chunk.AcquireRawReader())
+				{
+					var buffer = new byte[1024];
+					var result = reader.ReadNextBytes(1024, buffer);
+					Assert.IsTrue(result.IsEOF);
+					Assert.AreEqual(ChunkHeader.Size + ChunkFooter.Size, result.BytesRead); //just header + footer = 256
+				}
+				chunk.MarkForDeletion();
+				chunk.WaitForDestroy(5000);
+			}
+	*/
+
+	[Test]
+	public async Task if_asked_for_more_than_buffer_size_will_only_read_buffer_size() {
+		var chunk = await TFChunkHelper.CreateNewChunk(GetFilePathFor("file1"), 3000);
+		await chunk.Complete(CancellationToken.None);
+		using (var reader = await chunk.AcquireRawReader(CancellationToken.None)) {
+			var buffer = new byte[1024];
+			var result = await reader.ReadNextBytes(buffer, CancellationToken.None);
+			Assert.IsFalse(result.IsEOF);
+			Assert.AreEqual(1024, result.BytesRead);
+		}
+
+		chunk.MarkForDeletion();
+		chunk.WaitForDestroy(5000);
+	}
+
+	[Test]
+	public async Task a_read_past_eof_returns_eof_and_no_footer() {
+		var chunk = await TFChunkHelper.CreateNewChunk(GetFilePathFor("file1"), 300);
+		await chunk.Complete(CancellationToken.None);
+		using (var reader = await chunk.AcquireRawReader(CancellationToken.None)) {
+			var buffer = new byte[8092];
+			var result = await reader.ReadNextBytes(buffer, CancellationToken.None);
+			Assert.IsTrue(result.IsEOF);
+			Assert.AreEqual(4096, result.BytesRead); //does not includes header and footer space
+		}
+
+		chunk.MarkForDeletion();
+		chunk.WaitForDestroy(5000);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_reading_uncached_empty_scavenged_tfchunk.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_reading_uncached_empty_scavenged_tfchunk.cs
new file mode 100644
index 00000000000..68c679e2be9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_reading_uncached_empty_scavenged_tfchunk.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class when_reading_uncached_empty_scavenged_tfchunk : SpecificationWithFilePerTestFixture {
+	private TFChunk _chunk;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_chunk = await TFChunkHelper.CreateNewChunk(Filename, isScavenged: true);
+		await _chunk.CompleteScavenge(Array.Empty<PosMap>(), CancellationToken.None);
+	}
+
+	[OneTimeTearDown]
+	public override void TestFixtureTearDown() {
+		_chunk.Dispose();
+		base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public async Task no_record_at_exact_position_can_be_read() {
+		Assert.IsTrue(await _chunk.TryReadAt(0, couldBeScavenged: true, CancellationToken.None) is { Success: false });
+	}
+
+	[Test]
+	public async Task no_record_can_be_read_as_first_record() {
+		Assert.IsFalse((await _chunk.TryReadFirst(CancellationToken.None)).Success);
+	}
+
+	[Test]
+	public async Task no_record_can_be_read_as_closest_forward_record() {
+		Assert.IsTrue(await _chunk.TryReadClosestForward(0, CancellationToken.None) is { Success: false });
+	}
+
+	[Test]
+	public async Task no_record_can_be_read_as_closest_backward_record() {
+		Assert.IsFalse((await _chunk.TryReadClosestBackward(0, CancellationToken.None)).Success);
+	}
+
+	[Test]
+	public async Task no_record_can_be_read_as_last_record() {
+		Assert.IsFalse((await _chunk.TryReadLast(CancellationToken.None)).Success);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_sequentially_reading_db_with_few_chunks.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_sequentially_reading_db_with_few_chunks.cs
new file mode 100644
index 00000000000..03f0ddfbf24
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_sequentially_reading_db_with_few_chunks.cs
@@ -0,0 +1,185 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_sequentially_reading_db_with_few_chunks<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private const int RecordsCount = 8;
+
+	private TFChunkDb _db;
+	private ILogRecord[] _records;
+	private RecordWriteResult[] _results;
+
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_db = new TFChunkDb(TFChunkHelper.CreateSizedDbConfig(PathName, 0, chunkSize: 4096));
+		await _db.Open();
+
+		var chunk = await _db.Manager.GetInitializedChunk(0, CancellationToken.None);
+
+		_records = new ILogRecord[RecordsCount];
+		_results = new RecordWriteResult[RecordsCount];
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		var expectedVersion = ExpectedVersion.NoStream;
+
+		var pos = 0;
+		for (int i = 0; i < RecordsCount; ++i) {
+			if (i > 0 && i % 3 == 0) {
+				pos = i / 3 * _db.Config.ChunkSize;
+				await chunk.Complete(CancellationToken.None);
+				chunk = await _db.Manager.AddNewChunk(CancellationToken.None);
+			}
+
+			_records[i] = LogRecord.SingleWrite(recordFactory, pos,
+				Guid.NewGuid(), Guid.NewGuid(), streamId, expectedVersion++, eventTypeId,
+				new byte[1200], new byte[] { 5, 7 });
+			_results[i] = await chunk.TryAppend(_records[i], CancellationToken.None);
+
+			pos += _records[i].GetSizeWithLengthPrefixAndSuffix();
+		}
+
+		await chunk.Flush(CancellationToken.None);
+		_db.Config.WriterCheckpoint.Write((RecordsCount / 3) * _db.Config.ChunkSize +
+										  _results[RecordsCount - 1].NewPosition);
+		_db.Config.WriterCheckpoint.Flush();
+	}
+
+	public override async Task TestFixtureTearDown() {
+		await _db.DisposeAsync();
+
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void all_records_were_written() {
+		var pos = 0;
+		for (int i = 0; i < RecordsCount; ++i) {
+			if (i % 3 == 0)
+				pos = 0;
+
+			Assert.IsTrue(_results[i].Success);
+			Assert.AreEqual(pos, _results[i].OldPosition);
+
+			pos += _records[i].GetSizeWithLengthPrefixAndSuffix();
+			Assert.AreEqual(pos, _results[i].NewPosition);
+		}
+	}
+
+	[Test]
+	public async Task all_records_could_be_read_with_forward_pass() {
+		var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, 0);
+
+		int count = 0;
+		while (await seqReader.TryReadNext(CancellationToken.None) is { Success: true } res) {
+			var rec = _records[count];
+			Assert.AreEqual(rec, res.LogRecord);
+			Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
+			Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
+
+			++count;
+		}
+
+		Assert.AreEqual(RecordsCount, count);
+	}
+
+	[Test]
+	public async Task all_records_could_be_read_with_backward_pass() {
+		var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, _db.Config.WriterCheckpoint.Read());
+
+		SeqReadResult res;
+		int count = 0;
+		while ((res = await seqReader.TryReadPrev(CancellationToken.None)).Success) {
+			var rec = _records[RecordsCount - count - 1];
+			Assert.AreEqual(rec, res.LogRecord);
+			Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
+			Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
+
+			++count;
+		}
+
+		Assert.AreEqual(RecordsCount, count);
+	}
+
+	[Test]
+	public async Task all_records_could_be_read_doing_forward_backward_pass() {
+		var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, 0);
+
+		int count1 = 0;
+		while (await seqReader.TryReadNext(CancellationToken.None) is { Success: true } res) {
+			var rec = _records[count1];
+			Assert.AreEqual(rec, res.LogRecord);
+			Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
+			Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
+
+			++count1;
+		}
+
+		Assert.AreEqual(RecordsCount, count1);
+
+		int count2 = 0;
+		while (await seqReader.TryReadPrev(CancellationToken.None) is { Success: true } res) {
+			var rec = _records[RecordsCount - count2 - 1];
+			Assert.AreEqual(rec, res.LogRecord);
+			Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
+			Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
+
+			++count2;
+		}
+
+		Assert.AreEqual(RecordsCount, count2);
+	}
+
+	[Test]
+	public async Task records_can_be_read_forward_starting_from_any_position() {
+		for (int i = 0; i < RecordsCount; ++i) {
+			var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, _records[i].LogPosition);
+
+			int count = 0;
+			while (await seqReader.TryReadNext(CancellationToken.None) is { Success: true } res) {
+				var rec = _records[i + count];
+				Assert.AreEqual(rec, res.LogRecord);
+				Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
+				Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
+
+				++count;
+			}
+
+			Assert.AreEqual(RecordsCount - i, count);
+		}
+	}
+
+	[Test]
+	public async Task records_can_be_read_backward_starting_from_any_position() {
+		for (int i = 0; i < RecordsCount; ++i) {
+			var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, _records[i].LogPosition);
+
+			SeqReadResult res;
+			int count = 0;
+			while ((res = await seqReader.TryReadPrev(CancellationToken.None)).Success) {
+				var rec = _records[i - count - 1];
+				Assert.AreEqual(rec, res.LogRecord);
+				Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
+				Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
+
+				++count;
+			}
+
+			Assert.AreEqual(i, count);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_sequentially_reading_db_with_one_chunk.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_sequentially_reading_db_with_one_chunk.cs
new file mode 100644
index 00000000000..c0afa97597b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_sequentially_reading_db_with_one_chunk.cs
@@ -0,0 +1,185 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_sequentially_reading_db_with_one_chunk<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private const int RecordsCount = 3;
+
+	private TFChunkDb _db;
+	private ILogRecord[] _records;
+	private RecordWriteResult[] _results;
+
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_db = new TFChunkDb(TFChunkHelper.CreateSizedDbConfig(PathName, 0, chunkSize: 4096));
+		await _db.Open();
+
+		var chunk = await _db.Manager.GetInitializedChunk(0, CancellationToken.None);
+
+		_records = new ILogRecord[RecordsCount];
+		_results = new RecordWriteResult[RecordsCount];
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		var expectedVersion = ExpectedVersion.NoStream;
+
+		for (int i = 0; i < _records.Length; ++i) {
+			_records[i] = LogRecord.SingleWrite(recordFactory, i == 0 ? 0 : _results[i - 1].NewPosition,
+				Guid.NewGuid(), Guid.NewGuid(), streamId, expectedVersion++, eventTypeId,
+				new byte[] { 0, 1, 2 }, new byte[] { 5, 7 });
+			_results[i] = await chunk.TryAppend(_records[i], CancellationToken.None);
+		}
+
+		await chunk.Flush(CancellationToken.None);
+		_db.Config.WriterCheckpoint.Write(_results[RecordsCount - 1].NewPosition);
+		_db.Config.WriterCheckpoint.Flush();
+	}
+
+	public override async Task TestFixtureTearDown() {
+		await _db.DisposeAsync();
+
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void all_records_were_written() {
+		var pos = 0;
+		for (int i = 0; i < RecordsCount; ++i) {
+			Assert.IsTrue(_results[i].Success);
+			Assert.AreEqual(pos, _results[i].OldPosition);
+
+			pos += _records[i].GetSizeWithLengthPrefixAndSuffix();
+			Assert.AreEqual(pos, _results[i].NewPosition);
+		}
+	}
+
+	[Test]
+	public async Task all_records_could_be_read_with_forward_pass() {
+		var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, 0);
+
+		int count = 0;
+		while (await seqReader.TryReadNext(CancellationToken.None) is { Success: true } res) {
+			var rec = _records[count];
+			Assert.AreEqual(rec, res.LogRecord);
+			Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
+			Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
+
+			++count;
+		}
+
+		Assert.AreEqual(RecordsCount, count);
+	}
+
+	[Test]
+	public async Task only_the_last_record_is_marked_eof() {
+		var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, 0);
+
+		int count = 0;
+		while (await seqReader.TryReadNext(CancellationToken.None) is { Success: true } res) {
+			++count;
+			Assert.AreEqual(count == RecordsCount, res.Eof);
+		}
+
+		Assert.AreEqual(RecordsCount, count);
+	}
+
+	[Test]
+	public async Task all_records_could_be_read_with_backward_pass() {
+		var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, _db.Config.WriterCheckpoint.Read());
+
+		SeqReadResult res;
+		int count = 0;
+		while ((res = await seqReader.TryReadPrev(CancellationToken.None)).Success) {
+			var rec = _records[RecordsCount - count - 1];
+			Assert.AreEqual(rec, res.LogRecord);
+			Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
+			Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
+
+			++count;
+		}
+
+		Assert.AreEqual(RecordsCount, count);
+	}
+
+	[Test]
+	public async Task all_records_could_be_read_doing_forward_backward_pass() {
+		var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, 0);
+
+		int count1 = 0;
+		while (await seqReader.TryReadNext(CancellationToken.None) is { Success: true } res) {
+			var rec = _records[count1];
+			Assert.AreEqual(rec, res.LogRecord);
+			Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
+			Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
+
+			++count1;
+		}
+
+		Assert.AreEqual(RecordsCount, count1);
+
+		int count2 = 0;
+		while (await seqReader.TryReadPrev(CancellationToken.None) is { Success: true } res) {
+			var rec = _records[RecordsCount - count2 - 1];
+			Assert.AreEqual(rec, res.LogRecord);
+			Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
+			Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
+
+			++count2;
+		}
+
+		Assert.AreEqual(RecordsCount, count2);
+	}
+
+	[Test]
+	public async Task records_can_be_read_forward_starting_from_any_position() {
+		for (int i = 0; i < RecordsCount; ++i) {
+			var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, _records[i].LogPosition);
+
+			int count = 0;
+			while (await seqReader.TryReadNext(CancellationToken.None) is { Success: true } res) {
+				var rec = _records[i + count];
+				Assert.AreEqual(rec, res.LogRecord);
+				Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
+				Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
+
+				++count;
+			}
+
+			Assert.AreEqual(RecordsCount - i, count);
+		}
+	}
+
+	[Test]
+	public async Task records_can_be_read_backward_starting_from_any_position() {
+		for (int i = 0; i < RecordsCount; ++i) {
+			var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, _records[i].LogPosition);
+
+			SeqReadResult res;
+			int count = 0;
+			while ((res = await seqReader.TryReadPrev(CancellationToken.None)).Success) {
+				var rec = _records[i - count - 1];
+				Assert.AreEqual(rec, res.LogRecord);
+				Assert.AreEqual(rec.LogPosition, res.RecordPrePosition);
+				Assert.AreEqual(rec.LogPosition + rec.GetSizeWithLengthPrefixAndSuffix(), res.RecordPostPosition);
+
+				++count;
+			}
+
+			Assert.AreEqual(i, count);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_sequentially_reading_db_with_one_chunk_ending_with_prepare.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_sequentially_reading_db_with_one_chunk_ending_with_prepare.cs
new file mode 100644
index 00000000000..0663d1793eb
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_sequentially_reading_db_with_one_chunk_ending_with_prepare.cs
@@ -0,0 +1,93 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_sequentially_reading_db_with_one_chunk_ending_with_prepare<TLogFormat, TStreamId> :
+	SpecificationWithDirectoryPerTestFixture {
+	private const int RecordsCount = 3;
+
+	private TFChunkDb _db;
+	private ILogRecord[] _records;
+	private RecordWriteResult[] _results;
+
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		_db = new TFChunkDb(
+			TFChunkHelper.CreateSizedDbConfig(PathName, 0, chunkSize: 4096));
+		await _db.Open();
+
+		var chunk = await _db.Manager.GetInitializedChunk(0, CancellationToken.None);
+
+		_records = new ILogRecord[RecordsCount];
+		_results = new RecordWriteResult[RecordsCount];
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		var expectedVersion = ExpectedVersion.NoStream;
+
+		for (int i = 0; i < _records.Length - 1; ++i) {
+			_records[i] = LogRecord.SingleWrite(
+				recordFactory,
+				i == 0 ? 0 : _results[i - 1].NewPosition,
+				Guid.NewGuid(),
+				Guid.NewGuid(),
+				streamId,
+				expectedVersion++,
+				eventTypeId,
+				new byte[] { 0, 1, 2 },
+				new byte[] { 5, 7 });
+			_results[i] = await chunk.TryAppend(_records[i], CancellationToken.None);
+		}
+
+		_records[_records.Length - 1] = LogRecord.Prepare(
+			recordFactory,
+			_results[_records.Length - 1 - 1].NewPosition,
+			Guid.NewGuid(),
+			Guid.NewGuid(),
+			_results[_records.Length - 1 - 1].NewPosition,
+			0,
+			streamId,
+			expectedVersion++,
+			PrepareFlags.Data,
+			eventTypeId,
+			new byte[] { 0, 1, 2 },
+			new byte[] { 5, 7 });
+		_results[_records.Length - 1] = await chunk.TryAppend(_records[^1], CancellationToken.None);
+
+		await chunk.Flush(CancellationToken.None);
+		_db.Config.WriterCheckpoint.Write(_results[RecordsCount - 1].NewPosition);
+		_db.Config.WriterCheckpoint.Flush();
+	}
+
+	public override async Task TestFixtureTearDown() {
+		await _db.DisposeAsync();
+
+		await base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public async Task only_the_last_record_is_marked_eof() {
+		var seqReader = new TFChunkReader(_db, _db.Config.WriterCheckpoint, 0);
+
+		int count = 0;
+		while (await seqReader.TryReadNext(CancellationToken.None) is { Success: true } res) {
+			++count;
+			Assert.AreEqual(count == RecordsCount, res.Eof);
+		}
+
+		Assert.AreEqual(RecordsCount, count);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_uncaching_a_tfchunk.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_uncaching_a_tfchunk.cs
new file mode 100644
index 00000000000..2904f4ee659
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_uncaching_a_tfchunk.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.Transforms;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_uncaching_a_tfchunk<TLogFormat, TStreamId> : SpecificationWithFilePerTestFixture {
+	private TFChunk _chunk;
+	private readonly Guid _corrId = Guid.NewGuid();
+	private readonly Guid _eventId = Guid.NewGuid();
+	private RecordWriteResult _result;
+	private IPrepareLogRecord<TStreamId> _record;
+	private TFChunk _uncachedChunk;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		_record = LogRecord.Prepare(recordFactory, 0, _corrId, _eventId, 0, 0, streamId, 1,
+			PrepareFlags.None, eventTypeId, new byte[12], new byte[15], new DateTime(2000, 1, 1, 12, 0, 0));
+		_chunk = await TFChunkHelper.CreateNewChunk(Filename);
+		_result = await _chunk.TryAppend(_record, CancellationToken.None);
+		await _chunk.Flush(CancellationToken.None);
+		await _chunk.Complete(CancellationToken.None);
+		_uncachedChunk = await TFChunk.FromCompletedFile(new ChunkLocalFileSystem(Path.GetDirectoryName(Filename)), Filename, verifyHash: true, unbufferedRead: false,
+			reduceFileCachePressure: false, tracker: new TFChunkTracker.NoOp(),
+			getTransformFactory: DbTransformManager.Default);
+		await _uncachedChunk.CacheInMemory(CancellationToken.None);
+		await _uncachedChunk.UnCacheFromMemory(CancellationToken.None);
+	}
+
+	[OneTimeTearDown]
+	public override void TestFixtureTearDown() {
+		_chunk.Dispose();
+		_uncachedChunk.Dispose();
+		base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void the_write_result_is_correct() {
+		Assert.IsTrue(_result.Success);
+		Assert.AreEqual(0, _result.OldPosition);
+		Assert.AreEqual(_record.GetSizeWithLengthPrefixAndSuffix(), _result.NewPosition);
+	}
+
+	[Test]
+	public void the_chunk_is_not_cached() {
+		Assert.IsFalse(_uncachedChunk.IsCached);
+	}
+
+	[Test]
+	public void the_record_was_written() {
+		Assert.IsTrue(_result.Success);
+	}
+
+	[Test]
+	public void the_correct_position_is_returned() {
+		Assert.AreEqual(0, _result.OldPosition);
+	}
+
+	[Test]
+	public async Task the_record_can_be_read() {
+		var res = await _uncachedChunk.TryReadAt(0, couldBeScavenged: true, CancellationToken.None);
+		Assert.IsTrue(res.Success);
+		Assert.AreEqual(_record, res.LogRecord);
+		Assert.AreEqual(_result.OldPosition, res.LogRecord.LogPosition);
+		//Assert.AreEqual(_result.NewPosition, res.NewPosition);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_unlocking_a_tfchunk_that_has_been_marked_for_deletion.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_unlocking_a_tfchunk_that_has_been_marked_for_deletion.cs
new file mode 100644
index 00000000000..cc411c9bb07
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_unlocking_a_tfchunk_that_has_been_marked_for_deletion.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class when_unlocking_a_tfchunk_that_has_been_marked_for_deletion : SpecificationWithFile {
+	private TFChunk _chunk;
+
+	[SetUp]
+	public override async Task SetUp() {
+		await base.SetUp();
+		_chunk = await TFChunkHelper.CreateNewChunk(Filename, 1000);
+		await _chunk.Complete(CancellationToken.None);
+		var reader = await _chunk.AcquireRawReader(CancellationToken.None);
+		_chunk.MarkForDeletion();
+		reader.Release();
+	}
+
+	[Test]
+	public void the_file_is_deleted() {
+		Assert.IsFalse(File.Exists(Filename));
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_unmerging_a_tfchunk.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_unmerging_a_tfchunk.cs
new file mode 100644
index 00000000000..7e1660faa64
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_unmerging_a_tfchunk.cs
@@ -0,0 +1,124 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.TransactionLog.Scavenging.DbAccess;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_unmerging_a_tfchunk<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private string Filename => Path.Combine(PathName, Guid.NewGuid().ToString());
+
+	[Test]
+	public async Task throws_when_unmerging_a_single_logical_chunk() {
+		using var chunk = await TFChunkHelper.CreateNewChunk(Filename, chunkStartNumber: 2, chunkEndNumber: 2, isScavenged: true);
+		await chunk.CompleteScavenge(Array.Empty<PosMap>(), CancellationToken.None);
+
+		Assert.ThrowsAsync<InvalidOperationException>(async () => {
+			await foreach (var _ in chunk.UnmergeAsync(CancellationToken.None)) { }
+		});
+	}
+
+
+	[Test]
+	public async Task throws_when_unmerging_a_non_scavenged_chunk() {
+		using var chunk = await TFChunkHelper.CreateNewChunk(Filename, chunkStartNumber: 2, chunkEndNumber: 3, isScavenged: false);
+		await chunk.Complete(CancellationToken.None);
+
+		Assert.ThrowsAsync<InvalidOperationException>(async () => {
+			await foreach (var _ in chunk.UnmergeAsync(CancellationToken.None)) { }
+		});
+	}
+
+	[Test]
+	public async Task throws_when_unmerging_an_incomplete_chunk() {
+		using var chunk = await TFChunkHelper.CreateNewChunk(Filename, chunkStartNumber: 2, chunkEndNumber: 3, isScavenged: true);
+
+		Assert.ThrowsAsync<InvalidOperationException>(async () => {
+			await foreach (var _ in chunk.UnmergeAsync(CancellationToken.None)) { }
+		});
+	}
+
+	[Test]
+	public async Task can_unmerge_a_merged_chunk() {
+		var chunkSize = 4096;
+		using var chunk = await TFChunkHelper.CreateNewChunk(
+			Filename,
+			chunkStartNumber: 2,
+			chunkEndNumber: 5,
+			chunkSize: chunkSize,
+			isScavenged: true);
+
+		var writer = new ScavengedChunkWriter(chunk);
+		var recordPositions = new long[] {
+			3 * chunkSize,
+			3 * chunkSize + 200,
+			3 * chunkSize + 400,
+			5 * chunkSize,
+			5 * chunkSize + 200,
+			5 * chunkSize + 400
+		};
+
+		var token = CancellationToken.None;
+
+		await WriteRecords(writer, recordPositions, token);
+		await writer.Complete(token);
+
+		var chunkNumberCounter = 2;
+		var readRecordPositions = new List<long>();
+		await foreach (var unmerged in chunk.UnmergeAsync(token)) {
+			Assert.AreEqual(chunkNumberCounter, unmerged.ChunkHeader.ChunkStartNumber);
+			Assert.AreEqual(chunkNumberCounter, unmerged.ChunkHeader.ChunkEndNumber);
+			var records = await ReadAllRecords(unmerged as TFChunk, token).ToArrayAsync(token);
+			Assert.True(records.All(logPosition => logPosition / chunkSize == chunkNumberCounter));
+			readRecordPositions.AddRange(records);
+			chunkNumberCounter++;
+		}
+
+		Assert.AreEqual(recordPositions, readRecordPositions);
+		Assert.AreEqual(6, chunkNumberCounter);
+	}
+
+	private async ValueTask WriteRecords(ScavengedChunkWriter writer, long[] logPositions, CancellationToken token) {
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		foreach (var logPosition in logPositions) {
+			var record = LogRecord.Prepare(
+				factory: recordFactory,
+				logPosition: logPosition,
+				correlationId: Guid.NewGuid(),
+				eventId: Guid.NewGuid(),
+				transactionPos: 0,
+				transactionOffset: 0,
+				eventStreamId: streamId,
+				expectedVersion: 0,
+				flags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted,
+				eventType: eventTypeId,
+				data: Array.Empty<byte>(),
+				metadata: Array.Empty<byte>());
+
+			await writer.WriteRecord(record, token);
+		}
+	}
+
+	private async IAsyncEnumerable<long> ReadAllRecords(TFChunk chunk, [EnumeratorCancellation] CancellationToken token) {
+		var result = await chunk.TryReadClosestForward(0L, token);
+		while (result.Success) {
+			yield return result.LogRecord.LogPosition;
+			result = await chunk.TryReadClosestForward(result.NextPosition, token);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_writing_a_file_checksum_to_a_file.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_writing_a_file_checksum_to_a_file.cs
new file mode 100644
index 00000000000..37455457e8e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_writing_a_file_checksum_to_a_file.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class when_writing_a_file_checksum_to_a_file : SpecificationWithFile {
+	[Test]
+	public void a_null_file_throws_argumentnullexception() {
+		Assert.Throws<ArgumentNullException>(() => new FileCheckpoint(null));
+	}
+
+	[Test]
+	public void name_is_set() {
+		var checksum = new FileCheckpoint(HelperExtensions.GetFilePathFromAssembly("filename"), "test");
+		Assert.AreEqual("test", checksum.Name);
+		checksum.Close(flush: true);
+	}
+
+	[Test]
+	public void reading_off_same_instance_gives_most_up_to_date_info() {
+		var checkSum = new FileCheckpoint(Filename);
+		checkSum.Write(0xDEAD);
+		checkSum.Flush();
+		var read = checkSum.Read();
+		checkSum.Close(flush: true);
+		Assert.AreEqual(0xDEAD, read);
+	}
+
+	[Test]
+	public void can_read_existing_checksum() {
+		var checksum = new FileCheckpoint(Filename);
+		checksum.Write(0xDEAD);
+		checksum.Close(flush: true);
+		checksum = new FileCheckpoint(Filename);
+		var val = checksum.Read();
+		checksum.Close(flush: true);
+		Assert.AreEqual(0xDEAD, val);
+	}
+
+	[Test]
+	public async Task the_new_value_is_not_accessible_if_not_flushed_even_with_delay() {
+		var checkSum = new FileCheckpoint(Filename);
+		checkSum.Write(1011);
+		await Task.Delay(200);
+		Assert.AreEqual(0, checkSum.Read());
+		checkSum.Close(flush: true);
+	}
+
+	[Test]
+	public void the_new_value_is_accessible_after_flush() {
+		var checkSum = new FileCheckpoint(Filename);
+		checkSum.Write(1011);
+		checkSum.Flush();
+		Assert.AreEqual(1011, checkSum.Read());
+		checkSum.Close(flush: true);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_writing_a_memorymappedpoint_to_a_file.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_writing_a_memorymappedpoint_to_a_file.cs
new file mode 100644
index 00000000000..c7edb9c77f9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_writing_a_memorymappedpoint_to_a_file.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using NUnit.Framework;
+using RuntimeInformation = System.Runtime.RuntimeInformation;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class when_writing_a_memorymappedpoint_to_a_file : SpecificationWithFile {
+	public override async Task SetUp() {
+		await base.SetUp();
+		if (!RuntimeInformation.IsWindows) {
+			Assert.Ignore($"{nameof(MemoryMappedFileCheckpoint)} is for windows only.");
+		}
+	}
+
+	[Test]
+	public void a_null_file_throws_argumentnullexception() {
+		Assert.Throws<ArgumentNullException>(() => new MemoryMappedFileCheckpoint(null));
+	}
+
+	[Test]
+	public void name_is_set() {
+		var checksum = new MemoryMappedFileCheckpoint(Filename, "test");
+		Assert.AreEqual("test", checksum.Name);
+		checksum.Close(flush: true);
+	}
+
+	[Test]
+	public void reading_off_same_instance_gives_most_up_to_date_info() {
+		var checkSum = new MemoryMappedFileCheckpoint(Filename);
+		checkSum.Write(0xDEAD);
+		checkSum.Flush();
+		var read = checkSum.Read();
+		checkSum.Close(flush: true);
+		Assert.AreEqual(0xDEAD, read);
+	}
+
+	[Test]
+	public void can_read_existing_checksum() {
+		var checksum = new MemoryMappedFileCheckpoint(Filename);
+		checksum.Write(0xDEAD);
+		checksum.Close(flush: true);
+		checksum = new MemoryMappedFileCheckpoint(Filename);
+		var val = checksum.Read();
+		checksum.Close(flush: true);
+		Assert.AreEqual(0xDEAD, val);
+	}
+
+	[Test]
+	public async Task the_new_value_is_not_accessible_if_not_flushed_even_with_delay() {
+		var checkSum = new MemoryMappedFileCheckpoint(Filename);
+		checkSum.Write(1011);
+		await Task.Delay(200);
+		Assert.AreEqual(0, checkSum.Read());
+		checkSum.Close(flush: true);
+	}
+
+	[Test]
+	public async Task the_new_value_is_accessible_after_flush() {
+		var checkSum = new MemoryMappedFileCheckpoint(Filename);
+		checkSum.Write(1011);
+		checkSum.Flush();
+		Assert.AreEqual(1011, checkSum.Read());
+		checkSum.Close(flush: true);
+		await Task.Delay(100);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_writing_a_new_chunked_transaction_file.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_writing_a_new_chunked_transaction_file.cs
new file mode 100644
index 00000000000..d5ee845323c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_writing_a_new_chunked_transaction_file.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.IO;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_writing_a_new_chunked_transaction_file<TLogFormat, TStreamId> : SpecificationWithDirectory {
+	private readonly Guid _eventId = Guid.NewGuid();
+	private readonly Guid _correlationId = Guid.NewGuid();
+	private InMemoryCheckpoint _checkpoint;
+
+	[Test]
+	public async Task a_record_can_be_written() {
+		_checkpoint = new InMemoryCheckpoint(0);
+		var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, _checkpoint, new InMemoryCheckpoint()));
+		await db.Open();
+		var tf = new TFChunkWriter(db);
+		await tf.Open(CancellationToken.None);
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		var record = LogRecord.Prepare(
+			factory: recordFactory,
+			logPosition: 0,
+			correlationId: _correlationId,
+			eventId: _eventId,
+			transactionPos: 0,
+			transactionOffset: 0,
+			eventStreamId: streamId,
+			expectedVersion: 1234,
+			timeStamp: new DateTime(2012, 12, 21),
+			flags: PrepareFlags.None,
+			eventType: eventTypeId,
+			data: new byte[] { 1, 2, 3, 4, 5 },
+			metadata: new byte[] { 7, 17 });
+
+		await tf.Write(record, CancellationToken.None);
+		await tf.DisposeAsync();
+		await db.DisposeAsync();
+
+		Assert.AreEqual(record.GetSizeWithLengthPrefixAndSuffix(), _checkpoint.Read());
+		await using var filestream = File.Open(GetFilePathFor("chunk-000000.000000"), FileMode.Open, FileAccess.Read);
+		filestream.Position = ChunkHeader.Size;
+
+		var recordLength = await filestream.ReadLittleEndianAsync<int>(new byte[sizeof(int)]);
+		var buffer = new byte[recordLength];
+		await filestream.ReadExactlyAsync(buffer);
+
+		var reader = new SequenceReader(new(buffer));
+		var read = LogRecord.ReadFrom(ref reader);
+		Assert.AreEqual(record, read);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_writing_an_existing_chunked_transaction_file_with_checksum.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_writing_an_existing_chunked_transaction_file_with_checksum.cs
new file mode 100644
index 00000000000..3d423b25c0a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_writing_an_existing_chunked_transaction_file_with_checksum.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.IO;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_writing_an_existing_chunked_transaction_file_with_checksum<TLogFormat, TStreamId> : SpecificationWithDirectory {
+	private readonly Guid _correlationId = Guid.NewGuid();
+	private readonly Guid _eventId = Guid.NewGuid();
+	private InMemoryCheckpoint _checkpoint;
+
+	[Test]
+	public async Task a_record_can_be_written() {
+		var filename = GetFilePathFor("chunk-000000.000000");
+		var chunkHeader = new ChunkHeader(TFChunk.CurrentChunkVersion, TFChunk.CurrentChunkVersion, 10000, 0, 0, false,
+			chunkId: Guid.NewGuid(), TransformType.Identity);
+		var chunkBytes = chunkHeader.AsByteArray();
+		var bytes = new byte[ChunkHeader.Size + 10000 + ChunkFooter.Size];
+		Buffer.BlockCopy(chunkBytes, 0, bytes, 0, chunkBytes.Length);
+		File.WriteAllBytes(filename, bytes);
+
+		_checkpoint = new InMemoryCheckpoint(137);
+		var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, _checkpoint, new InMemoryCheckpoint()));
+		await db.Open();
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		var tf = new TFChunkWriter(db);
+		await tf.Open(CancellationToken.None);
+		var record = LogRecord.Prepare(
+			factory: recordFactory,
+			logPosition: _checkpoint.Read(),
+			correlationId: _correlationId,
+			eventId: _eventId,
+			expectedVersion: 1234,
+			transactionPos: 0,
+			transactionOffset: 0,
+			eventStreamId: streamId,
+			timeStamp: new DateTime(2012, 12, 21),
+			flags: PrepareFlags.None,
+			eventType: eventTypeId,
+			data: new byte[] { 1, 2, 3, 4, 5 },
+			metadata: new byte[] { 7, 17 });
+
+		await tf.Write(record, CancellationToken.None);
+		await tf.DisposeAsync();
+		await db.DisposeAsync();
+
+		Assert.AreEqual(record.GetSizeWithLengthPrefixAndSuffix() + 137,
+			_checkpoint.Read()); //137 is fluff assigned to beginning of checkpoint
+		await using var filestream = File.Open(filename, new FileStreamOptions { Mode = FileMode.Open, Access = FileAccess.Read, Options = FileOptions.Asynchronous });
+		filestream.Seek(ChunkHeader.Size + 137 + sizeof(int), SeekOrigin.Begin);
+		var recordLength = filestream.Length - filestream.Position;
+
+		var buffer = new byte[recordLength];
+		await filestream.ReadExactlyAsync(buffer);
+
+		var reader = new SequenceReader(new(buffer));
+		var read = LogRecord.ReadFrom(ref reader);
+		Assert.AreEqual(record, read);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_writing_an_existing_chunked_transaction_file_with_checksum_and_data_bigger_than_buffer.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_writing_an_existing_chunked_transaction_file_with_checksum_and_data_bigger_than_buffer.cs
new file mode 100644
index 00000000000..c0d9ef9384a
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_writing_an_existing_chunked_transaction_file_with_checksum_and_data_bigger_than_buffer.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.IO;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_writing_an_existing_chunked_transaction_file_with_checksum_and_data_bigger_than_buffer<TLogFormat, TStreamId> :
+		SpecificationWithDirectory {
+	private readonly Guid _correlationId = Guid.NewGuid();
+	private readonly Guid _eventId = Guid.NewGuid();
+	private InMemoryCheckpoint _checkpoint;
+
+	[Test]
+	public async Task a_record_can_be_written() {
+		var filename = GetFilePathFor("chunk-000000.000000");
+		var chunkHeader = new ChunkHeader(TFChunk.CurrentChunkVersion, TFChunk.CurrentChunkVersion, 10000, 0, 0, false, Guid.NewGuid(), TransformType.Identity);
+		var chunkBytes = chunkHeader.AsByteArray();
+		var buf = new byte[ChunkHeader.Size + ChunkFooter.Size + chunkHeader.ChunkSize];
+		Buffer.BlockCopy(chunkBytes, 0, buf, 0, chunkBytes.Length);
+		File.WriteAllBytes(filename, buf);
+
+		_checkpoint = new InMemoryCheckpoint(137);
+		var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, _checkpoint, new InMemoryCheckpoint(),
+			chunkSize: chunkHeader.ChunkSize));
+		await db.Open();
+
+		var
+			bytes = new byte[3994]; // this gives exactly 4097 size of record, with 3993 (rec size 4096) everything works fine!
+		Random.Shared.NextBytes(bytes);
+		var writer = new TFChunkWriter(db);
+		await writer.Open(CancellationToken.None);
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		var record = LogRecord.Prepare(
+			factory: recordFactory,
+			logPosition: 137,
+			correlationId: _correlationId,
+			eventId: _eventId,
+			transactionPos: 789,
+			transactionOffset: 543,
+			eventStreamId: streamId,
+			expectedVersion: 1234,
+			timeStamp: new DateTime(2012, 12, 21),
+			flags: PrepareFlags.SingleWrite,
+			eventType: eventTypeId,
+			data: bytes,
+			metadata: new byte[] { 0x07, 0x17 });
+
+		Assert.IsTrue(await writer.Write(record, CancellationToken.None) is (true, _));
+		await writer.DisposeAsync();
+		await db.DisposeAsync();
+
+		Assert.AreEqual(record.GetSizeWithLengthPrefixAndSuffix() + 137, _checkpoint.Read());
+		await using var filestream = File.Open(filename,
+			new FileStreamOptions { Mode = FileMode.Open, Access = FileAccess.Read, Options = FileOptions.Asynchronous });
+		filestream.Seek(ChunkHeader.Size + 137 + sizeof(int), SeekOrigin.Begin);
+
+		var recordLength = filestream.Length - filestream.Position;
+		var buffer = new byte[recordLength];
+		await filestream.ReadExactlyAsync(buffer);
+
+		var reader = new SequenceReader(new(buffer));
+		var read = LogRecord.ReadFrom(ref reader);
+		Assert.AreEqual(record, read);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_writing_an_existing_chunked_transaction_file_with_not_enough_space_in_chunk.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_writing_an_existing_chunked_transaction_file_with_not_enough_space_in_chunk.cs
new file mode 100644
index 00000000000..ba314360d75
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_writing_an_existing_chunked_transaction_file_with_not_enough_space_in_chunk.cs
@@ -0,0 +1,115 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.IO;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_writing_an_existing_chunked_transaction_file_with_not_enough_space_in_chunk<TLogFormat, TStreamId> : SpecificationWithDirectory {
+	private readonly Guid _correlationId = Guid.NewGuid();
+	private readonly Guid _eventId = Guid.NewGuid();
+	private InMemoryCheckpoint _checkpoint;
+
+	[Test]
+	public async Task a_record_is_not_written_at_first_but_written_on_second_try() {
+		var filename1 = GetFilePathFor("chunk-000000.000000");
+		var filename2 = GetFilePathFor("chunk-000001.000000");
+		var chunkHeader = new ChunkHeader(TFChunk.CurrentChunkVersion, TFChunk.CurrentChunkVersion, 10000, 0, 0, false,
+			Guid.NewGuid(), TransformType.Identity);
+		var chunkBytes = chunkHeader.AsByteArray();
+		var bytes = new byte[ChunkHeader.Size + 10000 + ChunkFooter.Size];
+		Buffer.BlockCopy(chunkBytes, 0, bytes, 0, chunkBytes.Length);
+		File.WriteAllBytes(filename1, bytes);
+
+		_checkpoint = new InMemoryCheckpoint(0);
+		var db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, _checkpoint, new InMemoryCheckpoint()));
+		await db.Open();
+		var tf = new TFChunkWriter(db);
+		await tf.Open(CancellationToken.None);
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		var record1 = LogRecord.Prepare(
+			factory: recordFactory,
+			logPosition: 0,
+			correlationId: _correlationId,
+			eventId: _eventId,
+			expectedVersion: 1234,
+			transactionPos: 0,
+			transactionOffset: 0,
+			eventStreamId: streamId,
+			timeStamp: new DateTime(2012, 12, 21),
+			flags: PrepareFlags.None,
+			eventType: eventTypeId,
+			data: new byte[] { 1, 2, 3, 4, 5 },
+			metadata: new byte[8000]);
+
+		var (written, pos) = await tf.Write(record1, CancellationToken.None);
+		Assert.IsTrue(written); // almost fill up first chunk
+
+		var record2 = LogRecord.Prepare(
+			factory: recordFactory,
+			logPosition: pos,
+			correlationId: _correlationId,
+			eventId: _eventId,
+			expectedVersion: 1234,
+			transactionPos: pos,
+			transactionOffset: 0,
+			eventStreamId: streamId,
+			timeStamp: new DateTime(2012, 12, 21),
+			flags: PrepareFlags.None,
+			eventType: eventTypeId,
+			data: new byte[] { 1, 2, 3, 4, 5 },
+			metadata: new byte[8000]);
+
+		(written, pos) = await tf.Write(record2, CancellationToken.None);
+		Assert.IsFalse(written); // chunk has too small space
+
+		var record3 = LogRecord.Prepare(
+			factory: recordFactory,
+			logPosition: pos,
+			correlationId: _correlationId,
+			eventId: _eventId,
+			expectedVersion: 1234,
+			transactionPos: pos,
+			transactionOffset: 0,
+			eventStreamId: streamId,
+			timeStamp: new DateTime(2012, 12, 21),
+			flags: PrepareFlags.None,
+			eventType: eventTypeId,
+			data: new byte[] { 1, 2, 3, 4, 5 },
+			metadata: new byte[2000]);
+
+		(written, _) = await tf.Write(record3, CancellationToken.None);
+		Assert.IsTrue(written);
+		await tf.DisposeAsync();
+		await db.DisposeAsync();
+
+		Assert.AreEqual(record3.GetSizeWithLengthPrefixAndSuffix() + 10000, _checkpoint.Read());
+		await using var filestream = File.Open(filename2, new FileStreamOptions { Mode = FileMode.Open, Access = FileAccess.Read, Options = FileOptions.Asynchronous });
+		filestream.Seek(ChunkHeader.Size + sizeof(int), SeekOrigin.Begin);
+
+		var recordLength = filestream.Length - filestream.Position;
+		var buffer = new byte[recordLength];
+		await filestream.ReadExactlyAsync(buffer);
+
+		var reader = new SequenceReader(new(buffer));
+		var read = LogRecord.ReadFrom(ref reader);
+		Assert.AreEqual(record3, read);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_writing_commit_record_to_file.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_writing_commit_record_to_file.cs
new file mode 100644
index 00000000000..8cbcf0df41e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_writing_commit_record_to_file.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class when_writing_commit_record_to_file : SpecificationWithDirectoryPerTestFixture {
+	private ITransactionFileWriter _writer;
+	private InMemoryCheckpoint _writerCheckpoint;
+	private readonly Guid _eventId = Guid.NewGuid();
+	private CommitLogRecord _record;
+	private TFChunkDb _db;
+
+	[OneTimeSetUp]
+	public async Task SetUp() {
+		_writerCheckpoint = new InMemoryCheckpoint();
+		_db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, _writerCheckpoint, new InMemoryCheckpoint(),
+			1024));
+		await _db.Open();
+		_writer = new TFChunkWriter(_db);
+		await _writer.Open(CancellationToken.None);
+		_record = new CommitLogRecord(logPosition: 0,
+			correlationId: _eventId,
+			transactionPosition: 4321,
+			timeStamp: new DateTime(2012, 12, 21),
+			firstEventNumber: 10);
+
+		await _writer.Write(_record, CancellationToken.None);
+		await _writer.Flush(CancellationToken.None);
+	}
+
+	[OneTimeTearDown]
+	public async Task Teardown() {
+		await _writer.DisposeAsync();
+		await _db.DisposeAsync();
+	}
+
+	[Test]
+	public async Task the_data_is_written() {
+		using (var reader = new TFChunkChaser(_db, _writerCheckpoint, _db.Config.ChaserCheckpoint)) {
+			reader.Open();
+			ILogRecord r = await reader.TryReadNext(CancellationToken.None) is { Success: true } res
+				? res.LogRecord
+				: null;
+			Assert.NotNull(r);
+
+			Assert.True(r is CommitLogRecord);
+			var c = (CommitLogRecord)r;
+			Assert.AreEqual(c.RecordType, LogRecordType.Commit);
+			Assert.AreEqual(c.LogPosition, 0);
+			Assert.AreEqual(c.CorrelationId, _eventId);
+			Assert.AreEqual(c.TransactionPosition, 4321);
+			Assert.AreEqual(c.TimeStamp, new DateTime(2012, 12, 21));
+		}
+	}
+
+	[Test]
+	public void the_checksum_is_updated() {
+		Assert.AreEqual(_record.GetSizeWithLengthPrefixAndSuffix(), _writerCheckpoint.Read());
+	}
+
+	[Test]
+	public async Task trying_to_read_past_writer_checksum_returns_false() {
+		var reader = new TFChunkReader(_db, _writerCheckpoint);
+		Assert.IsFalse((await reader.TryReadAt(_writerCheckpoint.Read(), couldBeScavenged: true, CancellationToken.None)).Success);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_writing_multiple_records_to_a_tfchunk.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_writing_multiple_records_to_a_tfchunk.cs
new file mode 100644
index 00000000000..cc5f2d8890e
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_writing_multiple_records_to_a_tfchunk.cs
@@ -0,0 +1,136 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_writing_multiple_records_to_a_tfchunk<TLogFormat, TStreamId> : SpecificationWithFilePerTestFixture {
+	private TFChunk _chunk;
+	private readonly Guid _corrId = Guid.NewGuid();
+	private readonly Guid _eventId = Guid.NewGuid();
+	private long _position1;
+	private long _position2;
+	private bool _written1;
+	private bool _written2;
+
+	private IPrepareLogRecord<TStreamId> _prepare1;
+	private IPrepareLogRecord<TStreamId> _prepare2;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_chunk = await TFChunkHelper.CreateNewChunk(Filename);
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId1 = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var streamId2 = LogFormatHelper<TLogFormat, TStreamId>.StreamId2;
+		var eventTypeId1 = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+		var eventTypeId2 = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId2;
+
+		_prepare1 = LogRecord.Prepare(recordFactory, 0, _corrId, _eventId, 0, 0, streamId1, 1,
+			PrepareFlags.None, eventTypeId1, new byte[12], new byte[15], new DateTime(2000, 1, 1, 12, 0, 0));
+		var r1 = await _chunk.TryAppend(_prepare1, CancellationToken.None);
+		_written1 = r1.Success;
+		_position1 = r1.OldPosition;
+
+		_prepare2 = LogRecord.Prepare(recordFactory, r1.NewPosition, _corrId, _eventId, 0, 0, streamId2, 2,
+			PrepareFlags.None, eventTypeId2, new byte[12], new byte[15], new DateTime(2000, 1, 1, 12, 0, 0));
+		var r2 = await _chunk.TryAppend(_prepare2, CancellationToken.None);
+		_written2 = r2.Success;
+		_position2 = r2.OldPosition;
+		await _chunk.Flush(CancellationToken.None);
+	}
+
+	[OneTimeTearDown]
+	public override void TestFixtureTearDown() {
+		_chunk.Dispose();
+		base.TestFixtureTearDown();
+	}
+
+	[Test]
+	public void the_chunk_is_cached() {
+		Assert.IsTrue(_chunk.IsCached);
+	}
+
+	[Test]
+	public void the_first_record_was_written() {
+		Assert.IsTrue(_written1);
+	}
+
+	[Test]
+	public void the_second_record_was_written() {
+		Assert.IsTrue(_written2);
+	}
+
+	[Test]
+	public async Task the_first_record_can_be_read_at_position() {
+		var res = await _chunk.TryReadAt((int)_position1, couldBeScavenged: true, CancellationToken.None);
+		Assert.IsTrue(res.Success);
+		Assert.IsTrue(res.LogRecord is IPrepareLogRecord<TStreamId>);
+		Assert.AreEqual(_prepare1, res.LogRecord);
+	}
+
+	[Test]
+	public async Task the_second_record_can_be_read_at_position() {
+		var res = await _chunk.TryReadAt((int)_position2, couldBeScavenged: true, CancellationToken.None);
+		Assert.IsTrue(res.Success);
+		Assert.IsTrue(res.LogRecord is IPrepareLogRecord<TStreamId>);
+		Assert.AreEqual(_prepare2, res.LogRecord);
+	}
+
+	[Test]
+	public async Task the_first_record_can_be_read() {
+		var res = await _chunk.TryReadFirst(CancellationToken.None);
+		Assert.IsTrue(res.Success);
+		Assert.AreEqual(_prepare1.GetSizeWithLengthPrefixAndSuffix(), res.NextPosition);
+		Assert.IsTrue(res.LogRecord is IPrepareLogRecord<TStreamId>);
+		Assert.AreEqual(_prepare1, res.LogRecord);
+	}
+
+	[Test]
+	public async Task the_second_record_can_be_read_as_closest_forward_after_first() {
+		var res = await _chunk.TryReadClosestForward(_prepare1.GetSizeWithLengthPrefixAndSuffix(), CancellationToken.None);
+		Assert.IsTrue(res.Success);
+		Assert.AreEqual(_prepare1.GetSizeWithLengthPrefixAndSuffix()
+						+ _prepare2.GetSizeWithLengthPrefixAndSuffix(), res.NextPosition);
+		Assert.IsTrue(res.LogRecord is IPrepareLogRecord<TStreamId>);
+		Assert.AreEqual(_prepare2, res.LogRecord);
+	}
+
+	[Test]
+	public async Task cannot_read_past_second_record_with_closest_forward_method() {
+		var res = await _chunk.TryReadClosestForward(_prepare1.GetSizeWithLengthPrefixAndSuffix()
+											   + _prepare2.GetSizeWithLengthPrefixAndSuffix(), CancellationToken.None);
+		Assert.IsFalse(res.Success);
+	}
+
+	[Test]
+	public async Task the_seconds_record_can_be_read_as_last() {
+		var res = await _chunk.TryReadLast(CancellationToken.None);
+		Assert.IsTrue(res.Success);
+		Assert.AreEqual(_prepare1.GetSizeWithLengthPrefixAndSuffix(), res.NextPosition);
+		Assert.AreEqual(_prepare2, res.LogRecord);
+	}
+
+	[Test]
+	public async Task the_first_record_can_be_read_as_closest_backward_after_last() {
+		var res = await _chunk.TryReadClosestBackward(_prepare1.GetSizeWithLengthPrefixAndSuffix(), CancellationToken.None);
+		Assert.IsTrue(res.Success);
+		Assert.AreEqual(0, res.NextPosition);
+		Assert.AreEqual(_prepare1, res.LogRecord);
+	}
+
+	[Test]
+	public async Task cannot_read_backward_from_zero_pos() {
+		var res = await _chunk.TryReadClosestBackward(0, CancellationToken.None);
+		Assert.IsFalse(res.Success);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/when_writing_prepare_record_to_file.cs b/src/KurrentDB.Core.Tests/TransactionLog/when_writing_prepare_record_to_file.cs
new file mode 100644
index 00000000000..9da4c892cf1
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/when_writing_prepare_record_to_file.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_writing_prepare_record_to_file<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	private ITransactionFileWriter _writer;
+	private InMemoryCheckpoint _writerCheckpoint;
+	private readonly Guid _eventId = Guid.NewGuid();
+	private readonly Guid _correlationId = Guid.NewGuid();
+	private IPrepareLogRecord<TStreamId> _record;
+	private TFChunkDb _db;
+
+	[OneTimeSetUp]
+	public async Task SetUp() {
+		_writerCheckpoint = new InMemoryCheckpoint();
+		_db = new TFChunkDb(TFChunkHelper.CreateDbConfig(PathName, _writerCheckpoint, new InMemoryCheckpoint(),
+			1024));
+		await _db.Open();
+		_writer = new TFChunkWriter(_db);
+		await _writer.Open(CancellationToken.None);
+
+		var recordFactory = LogFormatHelper<TLogFormat, TStreamId>.RecordFactory;
+		var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+		var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+		_record = LogRecord.Prepare(
+			factory: recordFactory,
+			logPosition: 0,
+			eventId: _eventId,
+			correlationId: _correlationId,
+			transactionPos: 0xDEAD,
+			transactionOffset: 0xBEEF,
+			eventStreamId: streamId,
+			expectedVersion: 1234,
+			timeStamp: new DateTime(2012, 12, 21),
+			flags: PrepareFlags.SingleWrite,
+			eventType: eventTypeId,
+			data: new byte[] { 1, 2, 3, 4, 5 },
+			metadata: new byte[] { 7, 17 });
+
+		await _writer.Write(_record, CancellationToken.None);
+		await _writer.Flush(CancellationToken.None);
+	}
+
+	[OneTimeTearDown]
+	public async Task Teardown() {
+		await _writer.DisposeAsync();
+		await _db.DisposeAsync();
+	}
+
+	[Test]
+	public async Task the_data_is_written() {
+		//TODO MAKE THIS ACTUALLY ASSERT OFF THE FILE AND READER FROM KNOWN FILE
+		using (var reader = new TFChunkChaser(_db, _writerCheckpoint, _db.Config.ChaserCheckpoint)) {
+			reader.Open();
+			ILogRecord r = await reader.TryReadNext(CancellationToken.None) is { Success: true } res
+				? res.LogRecord
+				: null;
+
+			Assert.NotNull(r);
+
+			var streamId = LogFormatHelper<TLogFormat, TStreamId>.StreamId;
+			var eventTypeId = LogFormatHelper<TLogFormat, TStreamId>.EventTypeId;
+
+			Assert.True(r is IPrepareLogRecord<TStreamId>);
+			var p = (IPrepareLogRecord<TStreamId>)r;
+			Assert.AreEqual(p.RecordType, LogRecordType.Prepare);
+			Assert.AreEqual(p.LogPosition, 0);
+			Assert.AreEqual(p.TransactionPosition, 0xDEAD);
+			Assert.AreEqual(p.TransactionOffset, 0xBEEF);
+			Assert.AreEqual(p.CorrelationId, _correlationId);
+			Assert.AreEqual(p.EventId, _eventId);
+			Assert.AreEqual(p.EventStreamId, streamId);
+			Assert.AreEqual(p.ExpectedVersion, 1234);
+			Assert.That(p.TimeStamp, Is.EqualTo(new DateTime(2012, 12, 21)).Within(7).Milliseconds);
+			Assert.AreEqual(p.Flags, PrepareFlags.SingleWrite);
+			Assert.AreEqual(p.EventType, eventTypeId);
+			Assert.AreEqual(p.Data.Length, 5);
+			Assert.AreEqual(p.Metadata.Length, 2);
+		}
+	}
+
+	[Test]
+	public void the_checksum_is_updated() {
+		Assert.AreEqual(_record.GetSizeWithLengthPrefixAndSuffix(), _writerCheckpoint.Read());
+	}
+
+	[Test]
+	public async Task trying_to_read_past_writer_checksum_returns_false() {
+		var reader = new TFChunkReader(_db, _writerCheckpoint);
+		Assert.IsFalse((await reader.TryReadAt(_writerCheckpoint.Read(), couldBeScavenged: true, CancellationToken.None)).Success);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/TransactionLog/with_tfchunk_enumerator.cs b/src/KurrentDB.Core.Tests/TransactionLog/with_tfchunk_enumerator.cs
new file mode 100644
index 00000000000..5c70867f8b9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/TransactionLog/with_tfchunk_enumerator.cs
@@ -0,0 +1,115 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Archive.Storage;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests.TransactionLog;
+
+[TestFixture]
+public class with_tfchunk_enumerator : SpecificationWithDirectory {
+
+	[Test]
+	public async Task iterates_chunks_with_correct_callback_order() {
+		File.Create(GetFilePathFor("foo")).Close(); // should be ignored
+		File.Create(GetFilePathFor("bla")).Close(); // should be ignored
+		File.Create(GetFilePathFor("chunk-000001.000000.tmp")).Close(); // should be ignored
+		File.Create(GetFilePathFor("chunk-001.000")).Close(); // should be ignored
+
+		// chunk 0 is archived
+		File.Create(GetFilePathFor("chunk-000001.000000")).Close(); // chunks 1 - 1 (latest)
+		File.Create(GetFilePathFor("chunk-000002.000001")).Close(); // chunks 2 - 2 (latest)
+																	// chunk 3 is archived
+																	// chunk 4 is missing
+		File.Create(GetFilePathFor("chunk-000005.000000")).Close(); // chunks 5 - 5 (old)
+		File.Create(GetFilePathFor("chunk-000005.000001")).Close(); // chunks 5 - 6 (old)
+		File.Create(GetFilePathFor("chunk-000005.000002")).Close(); // chunks 5 - 7 (latest)
+		File.Create(GetFilePathFor("chunk-000006.000000")).Close(); // chunks 6 - 6 (old)
+																	// chunk 7 is not missing - it's merged with chunk 5
+		File.Create(GetFilePathFor("chunk-000008.000007")).Close(); // chunks 8 - 8 (latest)
+																	// chunk 9 is missing
+		File.Create(GetFilePathFor("chunk-000010.000005")).Close(); // chunks 10 - 14 (latest)
+																	// chunks 15 & 16 are missing
+
+		var result = new List<string>();
+		static ValueTask<int> GetNextFileNumber(string chunk, int chunkNumber, int chunkVersion, CancellationToken token) {
+			return Path.GetFileName(chunk) switch {
+				"chunk-000001.000000" => new(2),
+				"chunk-000002.000001" => new(3),
+				"chunk-000005.000000" => new(6),
+				"chunk-000005.000001" => new(7),
+				"chunk-000005.000002" => new(8),
+				"chunk-000006.000000" => new(7),
+				"chunk-000008.000007" => new(9),
+				"chunk-000010.000005" => new(15),
+				_ => ValueTask.FromException<int>(new Exception($"Unexpected file: {chunk}"))
+			};
+		}
+
+		var locatorCodec = new PrefixingLocatorCodec();
+		var chunkEnumerator = new FileSystemWithArchive(
+			chunkSize: 1000,
+			locatorCodec: locatorCodec,
+			localFileSystem: new ChunkLocalFileSystem(PathName) {
+				ChunkNumberProvider = GetNextFileNumber,
+			},
+			archive: new FakeArchiveStorageReader(checkpoint: 4000)).GetChunks();
+
+		chunkEnumerator.LastChunkNumber = 16;
+		await foreach (var chunkInfo in chunkEnumerator) {
+			switch (chunkInfo) {
+				case LatestVersion(var fileName, var start, var end): {
+					result.Add($"latest {Path.GetFileName(fileName)} {start}-{end}");
+					break;
+				}
+				case OldVersion(var fileName, var start): {
+					result.Add($"old {Path.GetFileName(fileName)} {start}");
+					break;
+				}
+				case MissingVersion(var fileName, var chunkNum): {
+					result.Add($"missing {Path.GetFileName(fileName)} {chunkNum}");
+					break;
+				}
+				default:
+					throw new ArgumentOutOfRangeException(nameof(chunkInfo));
+			}
+		}
+
+		var expectedResult = new List<string> {
+			"latest archived-chunk-0 0-0",
+			"latest chunk-000001.000000 1-1",
+			"latest chunk-000002.000001 2-2",
+			"latest archived-chunk-3 3-3",
+			"missing chunk-000004.000000 4",
+			"old chunk-000005.000000 5",
+			"old chunk-000005.000001 5",
+			"latest chunk-000005.000002 5-7",
+			"old chunk-000006.000000 6",
+			"latest chunk-000008.000007 8-8",
+			"missing chunk-000009.000000 9",
+			"latest chunk-000010.000005 10-14",
+			"missing chunk-000015.000000 15",
+			"missing chunk-000016.000000 16"
+		};
+		Assert.AreEqual(expectedResult, result);
+	}
+
+	public class FakeArchiveStorageReader(long checkpoint) : IArchiveStorageReader {
+		public ValueTask<long> GetCheckpoint(CancellationToken ct) => new(checkpoint);
+
+		public ValueTask<int> ReadAsync(int logicalChunkNumber, Memory<byte> buffer, long offset, CancellationToken ct) {
+			throw new NotImplementedException();
+		}
+
+		public ValueTask<ArchivedChunkMetadata> GetMetadataAsync(int logicalChunkNumber, CancellationToken token) {
+			throw new NotImplementedException();
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Transforms/BitFlip/BitFlipChunkReadStream.cs b/src/KurrentDB.Core.Tests/Transforms/BitFlip/BitFlipChunkReadStream.cs
new file mode 100644
index 00000000000..3089dbfb626
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Transforms/BitFlip/BitFlipChunkReadStream.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Tests.Transforms.BitFlip;
+
+public class BitFlipChunkReadStream(ChunkDataReadStream stream)
+	: ChunkDataReadStream(stream.ChunkFileStream) {
+	public override int Read(Span<byte> buffer) {
+		var bytesRead = base.Read(buffer);
+
+		FlipBits(buffer.Slice(0, bytesRead));
+		return bytesRead;
+	}
+
+	public override async ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken token = default) {
+		var bytesRead = await base.ReadAsync(buffer, token);
+
+		FlipBits(buffer.Span.Slice(0, bytesRead));
+		return bytesRead;
+	}
+
+	private static void FlipBits(Span<byte> buffer) {
+		for (int i = 0; i < buffer.Length; i++)
+			buffer[i] ^= 0xFF;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Transforms/BitFlip/BitFlipChunkReadTransform.cs b/src/KurrentDB.Core.Tests/Transforms/BitFlip/BitFlipChunkReadTransform.cs
new file mode 100644
index 00000000000..fbb9f84410b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Transforms/BitFlip/BitFlipChunkReadTransform.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Tests.Transforms.BitFlip;
+
+public class BitFlipChunkReadTransform : IChunkReadTransform {
+	public ChunkDataReadStream TransformData(ChunkDataReadStream dataStream) =>
+		new BitFlipChunkReadStream(dataStream);
+}
diff --git a/src/KurrentDB.Core.Tests/Transforms/BitFlip/BitFlipChunkTransform.cs b/src/KurrentDB.Core.Tests/Transforms/BitFlip/BitFlipChunkTransform.cs
new file mode 100644
index 00000000000..9bdf738d091
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Transforms/BitFlip/BitFlipChunkTransform.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Tests.Transforms.BitFlip;
+
+public class BitFlipChunkTransform : IChunkTransform {
+	public IChunkReadTransform Read { get; } = new BitFlipChunkReadTransform();
+	public IChunkWriteTransform Write { get; } = new BitFlipChunkWriteTransform();
+}
diff --git a/src/KurrentDB.Core.Tests/Transforms/BitFlip/BitFlipChunkTransformFactory.cs b/src/KurrentDB.Core.Tests/Transforms/BitFlip/BitFlipChunkTransformFactory.cs
new file mode 100644
index 00000000000..754d3841f5c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Transforms/BitFlip/BitFlipChunkTransformFactory.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Tests.Transforms.BitFlip;
+
+public class BitFlipChunkTransformFactory : IChunkTransformFactory {
+	public TransformType Type => (TransformType)0xFF;
+	public int TransformDataPosition(int dataPosition) => dataPosition;
+	public void CreateTransformHeader(Span<byte> transformHeader) => transformHeader.Clear();
+	public ValueTask ReadTransformHeader(Stream stream, Memory<byte> transformHeader, CancellationToken token)
+		=> token.IsCancellationRequested ? ValueTask.FromCanceled(token) : ValueTask.CompletedTask;
+
+	public IChunkTransform CreateTransform(ReadOnlySpan<byte> transformHeader) => new BitFlipChunkTransform();
+
+	public int TransformHeaderLength => 0;
+}
diff --git a/src/KurrentDB.Core.Tests/Transforms/BitFlip/BitFlipChunkWriteStream.cs b/src/KurrentDB.Core.Tests/Transforms/BitFlip/BitFlipChunkWriteStream.cs
new file mode 100644
index 00000000000..cf7c045c59c
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Transforms/BitFlip/BitFlipChunkWriteStream.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Tests.Transforms.BitFlip;
+
+public class BitFlipChunkWriteStream(ChunkDataWriteStream stream) :
+	ChunkDataWriteStream(stream.ChunkFileStream, stream.ChecksumAlgorithm) {
+
+	public override void Write(ReadOnlySpan<byte> buffer) {
+		var tmp = new byte[buffer.Length];
+		FlipBits(buffer, tmp);
+
+		base.Write(tmp);
+	}
+
+	public override ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken token = default) {
+		var tmp = new byte[buffer.Length];
+		FlipBits(buffer.Span, tmp);
+
+		return base.WriteAsync(tmp, token);
+	}
+
+	private static void FlipBits(ReadOnlySpan<byte> source, Span<byte> destination) {
+		for (int i = 0; i < source.Length; i++)
+			destination[i] = (byte)(source[i] ^ 0xFF);
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Transforms/BitFlip/BitFlipChunkWriteTransform.cs b/src/KurrentDB.Core.Tests/Transforms/BitFlip/BitFlipChunkWriteTransform.cs
new file mode 100644
index 00000000000..98afc7a9f6b
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Transforms/BitFlip/BitFlipChunkWriteTransform.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Tests.Transforms.BitFlip;
+
+public class BitFlipChunkWriteTransform : IChunkWriteTransform {
+	private BitFlipChunkWriteStream _transformedStream;
+
+	public ChunkDataWriteStream TransformData(ChunkDataWriteStream dataStream) {
+		_transformedStream = new BitFlipChunkWriteStream(dataStream);
+		return _transformedStream;
+	}
+
+	public ValueTask CompleteData(int footerSize, int alignmentSize, CancellationToken token = default) {
+		var chunkHeaderAndDataSize = (int)_transformedStream.ChunkFileStream.Position;
+		var alignedSize = GetAlignedSize(chunkHeaderAndDataSize + footerSize, alignmentSize);
+		var paddingSize = alignedSize - chunkHeaderAndDataSize - footerSize;
+
+		return paddingSize > 0
+			? _transformedStream.WriteAsync(new byte[paddingSize], token)
+			: ValueTask.CompletedTask;
+	}
+
+	public async ValueTask<int> WriteFooter(ReadOnlyMemory<byte> footer, CancellationToken token) {
+		await _transformedStream.ChunkFileStream.WriteAsync(footer, token);
+		await _transformedStream.ChunkFileStream.FlushAsync(token);
+		return (int)_transformedStream.Position;
+	}
+
+	private static int GetAlignedSize(int size, int alignmentSize) {
+		if (size % alignmentSize == 0)
+			return size;
+		return (size / alignmentSize + 1) * alignmentSize;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Transforms/BitFlip/BitFlipDbTransform.cs b/src/KurrentDB.Core.Tests/Transforms/BitFlip/BitFlipDbTransform.cs
new file mode 100644
index 00000000000..e1634978a52
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Transforms/BitFlip/BitFlipDbTransform.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Tests.Transforms.BitFlip;
+
+public class BitFlipDbTransform : IDbTransform {
+	public string Name => "bitflip";
+	public TransformType Type => (TransformType)0xFF;
+	public IChunkTransformFactory ChunkFactory { get; } = new BitFlipChunkTransformFactory();
+}
diff --git a/src/KurrentDB.Core.Tests/Transforms/ByteDup/ByteDupChunkReadStream.cs b/src/KurrentDB.Core.Tests/Transforms/ByteDup/ByteDupChunkReadStream.cs
new file mode 100644
index 00000000000..6e186003d72
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Transforms/ByteDup/ByteDupChunkReadStream.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Tests.Transforms.ByteDup;
+
+public class ByteDupChunkReadStream(ChunkDataReadStream stream)
+	: ChunkDataReadStream(stream.ChunkFileStream) {
+	private const int HeaderSize = 128;
+
+	public override int Read(Span<byte> buffer) {
+		var buf = new byte[buffer.Length * 2];
+		int numRead = base.Read(buf);
+
+		for (int i = 0; i < buffer.Length; i++)
+			buffer[i] = buf[i * 2];
+
+		return numRead / 2;
+	}
+
+	public override async ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken token = default) {
+		var buf = new byte[buffer.Length * 2];
+		int numRead = await base.ReadAsync(buf, token);
+
+		for (int i = 0; i < buffer.Length; i++)
+			buffer.Span[i] = buf[i * 2];
+
+		return numRead / 2;
+	}
+
+	public override long Seek(long offset, SeekOrigin origin) {
+		if (origin is not SeekOrigin.Begin)
+			throw new NotSupportedException();
+
+		Position = offset;
+		return offset;
+	}
+
+	public override long Position {
+		get => HeaderSize + (base.Position - HeaderSize) / 2L;
+		set => base.Position = HeaderSize + (value - HeaderSize) * 2L;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Transforms/ByteDup/ByteDupChunkReadTransform.cs b/src/KurrentDB.Core.Tests/Transforms/ByteDup/ByteDupChunkReadTransform.cs
new file mode 100644
index 00000000000..e4f6a6eb896
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Transforms/ByteDup/ByteDupChunkReadTransform.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Tests.Transforms.ByteDup;
+public class ByteDupChunkReadTransform : IChunkReadTransform {
+	public ChunkDataReadStream TransformData(ChunkDataReadStream dataStream) =>
+		new ByteDupChunkReadStream(dataStream);
+}
diff --git a/src/KurrentDB.Core.Tests/Transforms/ByteDup/ByteDupChunkTransform.cs b/src/KurrentDB.Core.Tests/Transforms/ByteDup/ByteDupChunkTransform.cs
new file mode 100644
index 00000000000..32b83ddd1c9
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Transforms/ByteDup/ByteDupChunkTransform.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Tests.Transforms.ByteDup;
+public class ByteDupChunkTransform : IChunkTransform {
+	public IChunkReadTransform Read { get; } = new ByteDupChunkReadTransform();
+	public IChunkWriteTransform Write { get; } = new ByteDupChunkWriteTransform();
+}
diff --git a/src/KurrentDB.Core.Tests/Transforms/ByteDup/ByteDupChunkTransformFactory.cs b/src/KurrentDB.Core.Tests/Transforms/ByteDup/ByteDupChunkTransformFactory.cs
new file mode 100644
index 00000000000..e941238d93d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Transforms/ByteDup/ByteDupChunkTransformFactory.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Tests.Transforms.ByteDup;
+public class ByteDupChunkTransformFactory : IChunkTransformFactory {
+	public TransformType Type => (TransformType)0xFE;
+	public int TransformDataPosition(int dataPosition) => dataPosition * 2;
+	public void CreateTransformHeader(Span<byte> transformHeader) => transformHeader.Clear();
+	public ValueTask ReadTransformHeader(Stream stream, Memory<byte> transformHeader, CancellationToken token)
+		=> token.IsCancellationRequested ? ValueTask.FromCanceled(token) : ValueTask.CompletedTask;
+
+	public IChunkTransform CreateTransform(ReadOnlySpan<byte> transformHeader) => new ByteDupChunkTransform();
+
+	public int TransformHeaderLength => 0;
+}
diff --git a/src/KurrentDB.Core.Tests/Transforms/ByteDup/ByteDupChunkWriteStream.cs b/src/KurrentDB.Core.Tests/Transforms/ByteDup/ByteDupChunkWriteStream.cs
new file mode 100644
index 00000000000..510580c45eb
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Transforms/ByteDup/ByteDupChunkWriteStream.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Tests.Transforms.ByteDup;
+public class ByteDupChunkWriteStream(ChunkDataWriteStream stream) :
+	ChunkDataWriteStream(stream.ChunkFileStream, stream.ChecksumAlgorithm) {
+	private const int HeaderSize = 128;
+
+	public override void Write(ReadOnlySpan<byte> buffer) {
+		var buf = new byte[buffer.Length * 2];
+		for (int i = 0; i < buffer.Length; i++)
+			buf[i * 2] = buf[i * 2 + 1] = buffer[i];
+
+		base.Write(buf);
+	}
+
+	public override ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken token = default) {
+		var buf = new byte[buffer.Length * 2];
+		for (int i = 0; i < buffer.Length; i++)
+			buf[i * 2] = buf[i * 2 + 1] = buffer.Span[i];
+
+		return base.WriteAsync(buf, token);
+	}
+
+	private static long TransformPosition(long position) => HeaderSize + (position - HeaderSize) * 2L;
+	private static long UntransformPosition(long position) => HeaderSize + (position - HeaderSize) / 2L;
+	public override long Position {
+		get => UntransformPosition(base.Position);
+		set => base.Position = TransformPosition(value);
+	}
+
+	public override void SetLength(long value) => ChunkFileStream.SetLength(TransformPosition(value));
+	public override long Length => UntransformPosition(ChunkFileStream.Length);
+}
diff --git a/src/KurrentDB.Core.Tests/Transforms/ByteDup/ByteDupChunkWriteTransform.cs b/src/KurrentDB.Core.Tests/Transforms/ByteDup/ByteDupChunkWriteTransform.cs
new file mode 100644
index 00000000000..82c1c68dcb7
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Transforms/ByteDup/ByteDupChunkWriteTransform.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Tests.Transforms.ByteDup;
+public class ByteDupChunkWriteTransform : IChunkWriteTransform {
+	private ByteDupChunkWriteStream _transformedStream;
+
+	public ChunkDataWriteStream TransformData(ChunkDataWriteStream dataStream) {
+		_transformedStream = new ByteDupChunkWriteStream(dataStream);
+		return _transformedStream;
+	}
+
+	public async ValueTask CompleteData(int footerSize, int alignmentSize, CancellationToken token) {
+		var chunkHeaderAndDataSize = (int)_transformedStream.ChunkFileStream.Position;
+		var alignedSize = GetAlignedSize(chunkHeaderAndDataSize + footerSize, alignmentSize);
+		var paddingSize = alignedSize - chunkHeaderAndDataSize - footerSize;
+
+		if (paddingSize > 0) {
+			var padding = new byte[paddingSize];
+			await _transformedStream.ChunkFileStream.WriteAsync(padding, token);
+			_transformedStream.ChecksumAlgorithm.AppendData(padding);
+		}
+	}
+
+	public async ValueTask<int> WriteFooter(ReadOnlyMemory<byte> footer, CancellationToken token) {
+		await _transformedStream.ChunkFileStream.WriteAsync(footer, token);
+		await _transformedStream.ChunkFileStream.FlushAsync(token);
+		return (int)_transformedStream.Position;
+	}
+
+	private static int GetAlignedSize(int size, int alignmentSize) {
+		if (size % alignmentSize == 0)
+			return size;
+		return (size / alignmentSize + 1) * alignmentSize;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Transforms/ByteDup/ByteDupDbTransform.cs b/src/KurrentDB.Core.Tests/Transforms/ByteDup/ByteDupDbTransform.cs
new file mode 100644
index 00000000000..d3ad330f2b5
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Transforms/ByteDup/ByteDupDbTransform.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Tests.Transforms.ByteDup;
+public class ByteDupDbTransform : IDbTransform {
+	public string Name => "bytedup";
+	public TransformType Type => (TransformType)0xFE;
+	public IChunkTransformFactory ChunkFactory { get; } = new ByteDupChunkTransformFactory();
+}
diff --git a/src/EventStore.Core.Tests/Transforms/TransformTests.cs b/src/KurrentDB.Core.Tests/Transforms/TransformTests.cs
similarity index 76%
rename from src/EventStore.Core.Tests/Transforms/TransformTests.cs
rename to src/KurrentDB.Core.Tests/Transforms/TransformTests.cs
index ee21315296c..05974f2321f 100644
--- a/src/EventStore.Core.Tests/Transforms/TransformTests.cs
+++ b/src/KurrentDB.Core.Tests/Transforms/TransformTests.cs
@@ -1,25 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using EventStore.ClientAPI;
-using EventStore.Core.Tests.ClientAPI.Helpers;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.Tests.Transforms.BitFlip;
-using EventStore.Core.Tests.Transforms.ByteDup;
-using EventStore.Core.Tests.Transforms.WithHeader;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.Chunks.TFChunk;
-using EventStore.Core.Transforms.Identity;
 using EventStore.Plugins.Transforms;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Tests.Transforms.BitFlip;
+using KurrentDB.Core.Tests.Transforms.ByteDup;
+using KurrentDB.Core.Tests.Transforms.WithHeader;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.Transforms.Identity;
 using NUnit.Framework;
 
-namespace EventStore.Core.Tests.Transforms;
+namespace KurrentDB.Core.Tests.Transforms;
 
 [TestFixture(typeof(LogFormat.V2), typeof(string))]
 [TestFixture(typeof(LogFormat.V3), typeof(uint))]
-public class TransformTests<TLogFormat, TStreamId>: SpecificationWithDirectoryPerTestFixture {
+public class TransformTests<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
 	private const int NumEvents = 1000;
 	private const int BatchSize = 50;
 
@@ -49,7 +53,7 @@ public async Task transform_works(string transform, bool memDb) {
 			(node, connection) = await CreateNode(dbPath, transform, memDb: false);
 
 			// then verify the chunk checksums
-			VerifyChecksums(node);
+			await VerifyChecksums(node);
 
 			// and verify the events again
 			await VerifyEvents(connection, writtenIds);
@@ -58,11 +62,11 @@ public async Task transform_works(string transform, bool memDb) {
 		}
 	}
 
-	private void VerifyChecksums(MiniNode<TLogFormat,TStreamId> node) {
+	private async ValueTask VerifyChecksums(MiniNode<TLogFormat, TStreamId> node, CancellationToken token = default) {
 		var completedChunks = new List<TFChunk>();
-		for (var i = 0 ; ; i++) {
+		for (var i = 0; ; i++) {
 			try {
-				var chunk = node.Db.Manager.GetChunk(i);
+				var chunk = await node.Db.Manager.GetInitializedChunk(i, CancellationToken.None);
 				if (chunk.IsReadOnly)
 					completedChunks.Add(chunk);
 			} catch (ArgumentOutOfRangeException) {
@@ -70,11 +74,11 @@ private void VerifyChecksums(MiniNode<TLogFormat,TStreamId> node) {
 			}
 		}
 
-		foreach(var chunk in completedChunks)
-			chunk.VerifyFileHash();
+		foreach (var chunk in completedChunks)
+			await chunk.VerifyFileHash(token);
 	}
 
-	private async Task<(MiniNode<TLogFormat,TStreamId>, IEventStoreConnection)> CreateNode(string dbPath, string transform, bool memDb) {
+	private async Task<(MiniNode<TLogFormat, TStreamId>, IEventStoreConnection)> CreateNode(string dbPath, string transform, bool memDb) {
 		IDbTransform dbTransform = transform switch {
 			"identity" => new IdentityDbTransform(),
 			"bitflip" => new BitFlipDbTransform(),
diff --git a/src/KurrentDB.Core.Tests/Transforms/WithHeader/WithHeaderChunkReadStream.cs b/src/KurrentDB.Core.Tests/Transforms/WithHeader/WithHeaderChunkReadStream.cs
new file mode 100644
index 00000000000..9b773484f77
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Transforms/WithHeader/WithHeaderChunkReadStream.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Tests.Transforms.WithHeader;
+
+public class WithHeaderChunkReadStream(ChunkDataReadStream stream, int transformHeaderSize)
+	: ChunkDataReadStream(stream.ChunkFileStream) {
+
+	public override long Seek(long offset, SeekOrigin origin) {
+		if (origin != SeekOrigin.Begin)
+			throw new NotSupportedException();
+		Position = offset;
+		return offset;
+	}
+
+	public override long Position {
+		get => ChunkFileStream.Position - transformHeaderSize;
+		set => ChunkFileStream.Position = value + transformHeaderSize;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Transforms/WithHeader/WithHeaderChunkReadTransform.cs b/src/KurrentDB.Core.Tests/Transforms/WithHeader/WithHeaderChunkReadTransform.cs
new file mode 100644
index 00000000000..6ce952c9758
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Transforms/WithHeader/WithHeaderChunkReadTransform.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Tests.Transforms.WithHeader;
+public class WithHeaderChunkReadTransform(int transformHeaderSize) : IChunkReadTransform {
+	public ChunkDataReadStream TransformData(ChunkDataReadStream dataStream) =>
+		new WithHeaderChunkReadStream(dataStream, transformHeaderSize);
+}
diff --git a/src/KurrentDB.Core.Tests/Transforms/WithHeader/WithHeaderChunkTransform.cs b/src/KurrentDB.Core.Tests/Transforms/WithHeader/WithHeaderChunkTransform.cs
new file mode 100644
index 00000000000..a4cd1ba82aa
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Transforms/WithHeader/WithHeaderChunkTransform.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Tests.Transforms.WithHeader;
+public class WithHeaderChunkTransform(int transformHeaderSize) : IChunkTransform {
+	public IChunkReadTransform Read { get; } = new WithHeaderChunkReadTransform(transformHeaderSize);
+	public IChunkWriteTransform Write { get; } = new WithHeaderChunkWriteTransform(transformHeaderSize);
+}
diff --git a/src/KurrentDB.Core.Tests/Transforms/WithHeader/WithHeaderChunkTransformFactory.cs b/src/KurrentDB.Core.Tests/Transforms/WithHeader/WithHeaderChunkTransformFactory.cs
new file mode 100644
index 00000000000..8cf58d24a67
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Transforms/WithHeader/WithHeaderChunkTransformFactory.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Security.Cryptography;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Tests.Transforms.WithHeader;
+public class WithHeaderChunkTransformFactory : IChunkTransformFactory {
+	private const int TransformHeaderSize = 133;
+	private readonly byte[] _header;
+
+	public TransformType Type => (TransformType)0xFD;
+	public int TransformDataPosition(int dataPosition) => TransformHeaderSize + dataPosition;
+
+	public WithHeaderChunkTransformFactory() {
+		_header = new byte[TransformHeaderSize];
+		RandomNumberGenerator.Fill(_header);
+	}
+
+	public void CreateTransformHeader(Span<byte> transformHeader) => _header.CopyTo(transformHeader);
+
+	public ValueTask ReadTransformHeader(Stream stream, Memory<byte> transformHeader, CancellationToken token) {
+		return stream.ReadExactlyAsync(transformHeader, token);
+	}
+
+	public IChunkTransform CreateTransform(ReadOnlySpan<byte> transformHeader) =>
+		new WithHeaderChunkTransform(transformHeader.Length);
+
+	public int TransformHeaderLength => _header.Length;
+}
diff --git a/src/KurrentDB.Core.Tests/Transforms/WithHeader/WithHeaderChunkWriteStream.cs b/src/KurrentDB.Core.Tests/Transforms/WithHeader/WithHeaderChunkWriteStream.cs
new file mode 100644
index 00000000000..37663731dde
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Transforms/WithHeader/WithHeaderChunkWriteStream.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Tests.Transforms.WithHeader;
+
+public class WithHeaderChunkWriteStream(ChunkDataWriteStream stream, int transformHeaderSize) :
+	ChunkDataWriteStream(stream.ChunkFileStream, stream.ChecksumAlgorithm) {
+	public override long Position {
+		get => ChunkFileStream.Position - transformHeaderSize;
+		set => ChunkFileStream.Position = value + transformHeaderSize;
+	}
+
+	public override void SetLength(long value) => ChunkFileStream.SetLength(value + transformHeaderSize);
+	public override long Length => ChunkFileStream.Length + transformHeaderSize;
+}
diff --git a/src/KurrentDB.Core.Tests/Transforms/WithHeader/WithHeaderChunkWriteTransform.cs b/src/KurrentDB.Core.Tests/Transforms/WithHeader/WithHeaderChunkWriteTransform.cs
new file mode 100644
index 00000000000..cc89135aaa5
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Transforms/WithHeader/WithHeaderChunkWriteTransform.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Tests.Transforms.WithHeader;
+public class WithHeaderChunkWriteTransform(int transformHeaderSize) : IChunkWriteTransform {
+	private ChunkDataWriteStream _transformedStream;
+
+	public ChunkDataWriteStream TransformData(ChunkDataWriteStream stream) {
+		_transformedStream = new WithHeaderChunkWriteStream(stream, transformHeaderSize);
+		return _transformedStream;
+	}
+
+	public async ValueTask CompleteData(int footerSize, int alignmentSize, CancellationToken token) {
+		var chunkHeaderAndDataSize = (int)_transformedStream.ChunkFileStream.Position;
+		var alignedSize = GetAlignedSize(chunkHeaderAndDataSize + footerSize, alignmentSize);
+		var paddingSize = alignedSize - chunkHeaderAndDataSize - footerSize;
+		if (paddingSize > 0) {
+			var padding = new byte[paddingSize];
+			await _transformedStream.ChunkFileStream.WriteAsync(padding, token);
+			_transformedStream.ChecksumAlgorithm.AppendData(padding);
+		}
+	}
+
+	public async ValueTask<int> WriteFooter(ReadOnlyMemory<byte> footer, CancellationToken token) {
+		await _transformedStream.ChunkFileStream.WriteAsync(footer, token);
+		await _transformedStream.FlushAsync(token);
+		return (int)_transformedStream.Position;
+	}
+
+	private static int GetAlignedSize(int size, int alignmentSize) {
+		if (size % alignmentSize == 0)
+			return size;
+		return (size / alignmentSize + 1) * alignmentSize;
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/Transforms/WithHeader/WithHeaderDbTransform.cs b/src/KurrentDB.Core.Tests/Transforms/WithHeader/WithHeaderDbTransform.cs
new file mode 100644
index 00000000000..7fd180ea296
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/Transforms/WithHeader/WithHeaderDbTransform.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Tests.Transforms.WithHeader;
+public class WithHeaderDbTransform : IDbTransform {
+	public string Name => "withheader";
+	public TransformType Type => (TransformType)0xFD;
+	public IChunkTransformFactory ChunkFactory { get; } = new WithHeaderChunkTransformFactory();
+}
diff --git a/src/KurrentDB.Core.Tests/VerifyIntPtrSize.cs b/src/KurrentDB.Core.Tests/VerifyIntPtrSize.cs
new file mode 100644
index 00000000000..5eda3448ea0
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/VerifyIntPtrSize.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests;
+
+[TestFixture]
+public class VerifyIntPtrSize {
+	[Test]
+	public void TestIntPtrSize() {
+		Assert.AreEqual(8, IntPtr.Size);
+	}
+}
+
+public static class WebHostBuilderExtensions {
+	public static IWebHostBuilder UseStartup(this IWebHostBuilder builder, IStartup startup)
+		=> builder
+			.ConfigureServices(services => services.AddSingleton(startup));
+}
diff --git a/src/KurrentDB.Core.Tests/copying_metadata.cs b/src/KurrentDB.Core.Tests/copying_metadata.cs
new file mode 100644
index 00000000000..7695bcf998d
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/copying_metadata.cs
@@ -0,0 +1,74 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using EventStore.ClientAPI;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests;
+
+[TestFixture]
+public class copying_metadata {
+	[Test]
+	public void copies_empty_metadata() {
+		var empty = StreamMetadata.Build().Build();
+		var copied = empty.Copy().Build();
+		Assert.AreEqual(empty.AsJsonString(), copied.AsJsonString());
+	}
+
+	[Test]
+	public void copies_all_values() {
+		var source = StreamMetadata.Build()
+			.SetCacheControl(TimeSpan.FromDays(1))
+			.SetCustomProperty("Test", "Value")
+			.SetReadRole("foo")
+			.SetWriteRole("bar")
+			.SetDeleteRole("baz")
+			.SetMetadataReadRole("qux")
+			.SetMetadataWriteRole("quux")
+			.SetMaxAge(TimeSpan.FromHours(1))
+			.SetMaxCount(2)
+			.SetTruncateBefore(4)
+			.Build();
+		var copied = source.Copy().Build();
+		Assert.AreEqual(source.AsJsonString(), copied.AsJsonString());
+	}
+
+	[Test]
+	public void can_mutate_copy() {
+		var source = StreamMetadata.Build()
+			.SetCacheControl(TimeSpan.FromDays(1))
+			.SetCustomProperty("Test", "Value")
+			.SetReadRole("foo")
+			.SetWriteRole("bar")
+			.SetDeleteRole("baz")
+			.SetMetadataReadRole("qux")
+			.SetMetadataWriteRole("quux")
+			.SetMaxAge(TimeSpan.FromHours(1))
+			.SetMaxCount(2)
+			.SetTruncateBefore(4)
+			.Build();
+
+		var expected = StreamMetadata.Build()
+			.SetCacheControl(TimeSpan.FromDays(1))
+			.SetCustomProperty("Test", "Value")
+			.SetCustomProperty("Test2", "Value2")
+			.SetReadRole("foo")
+			.SetWriteRole("bar")
+			.SetDeleteRole("baz")
+			.SetMetadataReadRole("qux")
+			.SetMetadataWriteRole("quux")
+			.SetMaxAge(TimeSpan.FromHours(1))
+			.SetMaxCount(4)
+			.SetTruncateBefore(4)
+			.Build();
+
+
+		var copied = source.Copy()
+			.SetMaxCount(4)
+			.SetCustomProperty("Test2", "Value2")
+			.Build();
+
+		Assert.AreEqual(expected.AsJsonString(), copied.AsJsonString());
+	}
+}
diff --git a/src/KurrentDB.Core.Tests/mono_filestream_bug.cs b/src/KurrentDB.Core.Tests/mono_filestream_bug.cs
new file mode 100644
index 00000000000..b29ce571067
--- /dev/null
+++ b/src/KurrentDB.Core.Tests/mono_filestream_bug.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.Tests;
+
+[TestFixture]
+public class mono_uritemplate_bug {
+	[Test]
+	public void when_validating_a_uri_template_with_url_encoded_chars() {
+		var template = new UriTemplate("/streams/$all?embed={embed}");
+		var uri = new Uri("http://127.0.0.1/streams/$all");
+		var baseaddress = new Uri("http://127.0.0.1");
+		Assert.IsTrue(template.Match(baseaddress, uri) != null);
+	}
+}
+
+
+[TestFixture, Ignore("Known bug in Mono, waiting for fix.")]
+public class mono_filestream_bug {
+	[Test]
+	public void show_time() {
+		const int pos = 1;
+		const int bufferSize = 128;
+
+		var filename = Path.GetTempFileName();
+		File.WriteAllBytes(filename, new byte[pos + 1]); // init file with zeros
+
+		var bytes = new byte[bufferSize + 1 /* THIS IS WHAT MAKES A BIG DIFFERENCE */];
+		new Random().NextBytes(bytes);
+
+		using (var file = new FileStream(filename, FileMode.Open, FileAccess.ReadWrite, FileShare.Read,
+			bufferSize, FileOptions.SequentialScan)) {
+			file.Read(new byte[pos], 0, pos); // THIS READ IS CRITICAL, WITHOUT IT EVERYTHING WORKS
+			Assert.AreEqual(pos,
+				file.Position); // !!! here it says position is correct, but writes at different position !!!
+								// file.Position = pos; // !!! this fixes test !!!
+			file.Write(bytes, 0, bytes.Length);
+
+			//Assert.AreEqual(pos + bytes.Length, file.Length); -- fails
+		}
+
+		using (var filestream = File.Open(filename, FileMode.Open, FileAccess.Read)) {
+			var bb = new byte[bytes.Length];
+			filestream.Position = pos;
+			filestream.Read(bb, 0, bb.Length);
+			Assert.AreEqual(bytes, bb);
+		}
+	}
+}
diff --git a/src/EventStore.Core.Tests/swagger.yaml b/src/KurrentDB.Core.Tests/swagger.yaml
similarity index 100%
rename from src/EventStore.Core.Tests/swagger.yaml
rename to src/KurrentDB.Core.Tests/swagger.yaml
diff --git a/src/KurrentDB.Core.XUnit.Tests/AssertEx.cs b/src/KurrentDB.Core.XUnit.Tests/AssertEx.cs
new file mode 100644
index 00000000000..d736e10e9b3
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/AssertEx.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests;
+
+public static class AssertEx {
+	public static void IsOrBecomesTrue(
+		Func<bool> func,
+		TimeSpan? timeout = null,
+		string msg = "AssertEx.IsOrBecomesTrue() timed out",
+		[CallerMemberName] string memberName = "",
+		[CallerFilePath] string sourceFilePath = "",
+		[CallerLineNumber] int sourceLineNumber = 0) {
+
+		Assert.True(
+			SpinWait.SpinUntil(func, timeout ?? TimeSpan.FromMilliseconds(1000)),
+			$"{msg} in {memberName} {sourceFilePath}:{sourceLineNumber}");
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Authorization/FakePolicySelectorPlugin.cs b/src/KurrentDB.Core.XUnit.Tests/Authorization/FakePolicySelectorPlugin.cs
new file mode 100644
index 00000000000..f9045a2f551
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Authorization/FakePolicySelectorPlugin.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+using System;
+using System.Threading.Tasks;
+using DotNext.Threading;
+using KurrentDB.Core.Authorization;
+using KurrentDB.Core.Authorization.AuthorizationPolicies;
+using KurrentDB.Core.Bus;
+
+namespace KurrentDB.Core.XUnit.Tests.Authorization;
+
+public class FakePolicySelectorPlugin : IPolicySelectorFactory {
+	private readonly string _name;
+	private readonly bool _canBeEnabled;
+	public readonly AsyncManualResetEvent OnEnabled;
+	public readonly AsyncManualResetEvent OnDisabled;
+	public string CommandLineName => _name;
+
+	public FakePolicySelectorPlugin(string name, bool canBeEnabled) {
+		_name = name;
+		_canBeEnabled = canBeEnabled;
+		OnEnabled = new AsyncManualResetEvent(false);
+		OnDisabled = new AsyncManualResetEvent(false);
+	}
+	public IPolicySelector Create(IPublisher publisher) {
+		return new FakePolicySelector(_name);
+	}
+
+	public Task<bool> Enable() {
+		OnEnabled.Set();
+		return Task.FromResult(_canBeEnabled);
+	}
+
+	public Task Disable() {
+		OnDisabled.Set();
+		return Task.CompletedTask;
+	}
+}
+public class FakePolicySelector : IPolicySelector {
+	private readonly string _name;
+	public FakePolicySelector(string name) {
+		_name = name;
+	}
+	public ReadOnlyPolicy Select() {
+		return new Policy(_name, 1, DateTimeOffset.MaxValue).AsReadOnly();
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Authorization/FallbackStreamAccessPolicyVerification.cs b/src/KurrentDB.Core.XUnit.Tests/Authorization/FallbackStreamAccessPolicyVerification.cs
new file mode 100644
index 00000000000..110c0896385
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Authorization/FallbackStreamAccessPolicyVerification.cs
@@ -0,0 +1,152 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Collections.Generic;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Core.Authorization;
+using KurrentDB.Core.Authorization.AuthorizationPolicies;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Authorization;
+
+public class FallbackStreamAccessPolicyVerification {
+	private const string StreamId = "test-stream";
+	private const string StreamsResource = "streams";
+	private const string SubscriptionsResource = "subscriptions";
+
+	private readonly ClaimsPrincipal _claimsPrincipal = new(new ClaimsIdentity(
+		new[] { new Claim(ClaimTypes.Name, "test-user") }));
+
+	private MultiPolicyEvaluator CreateSut() {
+		var fallback = new FallbackStreamAccessPolicySelector();
+		var dummy = new DummyStreamAccess().Create(SampleOperations);
+		return new MultiPolicyEvaluator(new StaticAuthorizationPolicyRegistry([fallback, dummy]));
+	}
+
+	// This is not an extensive list of all operations
+	// Just a sample of the different resources
+	private static OperationDefinition[] SampleOperations => [
+		Operations.Streams.Read,
+		Operations.Streams.Write,
+		Operations.Streams.Delete,
+		Operations.Streams.MetadataRead,
+		Operations.Streams.MetadataWrite,
+		Operations.Node.Gossip.Update,
+		Operations.Node.Elections.Proposal,
+		Operations.Node.MergeIndexes,
+		Operations.Node.Login,
+		Operations.Node.Ping,
+		Operations.Node.Shutdown,
+		Operations.Node.Redirect,
+		Operations.Projections.List,
+		Operations.Projections.Create,
+		Operations.Projections.Abort,
+		Operations.Projections.Delete,
+		Operations.Projections.Restart,
+		Operations.Subscriptions.ProcessMessages,
+		Operations.Subscriptions.Restart,
+		Operations.Subscriptions.Delete,
+		Operations.Subscriptions.ReplayParked,
+		Operations.Users.CurrentUser,
+		Operations.Users.Enable,
+		Operations.Users.Read,
+		Operations.Users.ChangePassword
+	];
+
+	public static TheoryData<OperationDefinition> SubscriptionOperations() {
+		var data = new TheoryData<OperationDefinition>();
+		SampleOperations.Where(x => x.Resource == SubscriptionsResource)
+		.ForEach(x => data.Add(x));
+
+		return data;
+	}
+
+	public static TheoryData<OperationDefinition> StreamOperations() {
+		var data = new TheoryData<OperationDefinition>();
+		SampleOperations.Where(x => x.Resource == StreamsResource)
+			.ForEach(x => data.Add(x));
+
+		return data;
+	}
+
+	public static TheoryData<OperationDefinition> OtherOperations() {
+		var data = new TheoryData<OperationDefinition>();
+		SampleOperations.Where(x => x.Resource != StreamsResource && x.Resource != SubscriptionsResource)
+			.ForEach(x => data.Add(x));
+
+		return data;
+	}
+
+	[Theory]
+	[MemberData(nameof(StreamOperations))]
+	public async Task restricts_stream_access(OperationDefinition operationDefinition) {
+		var sut = CreateSut();
+
+		var operation = new Operation(operationDefinition)
+			.WithParameter(Operations.Streams.Parameters.StreamId(StreamId));
+		var res = await sut.EvaluateAsync(_claimsPrincipal, operation, CancellationToken.None);
+
+		Assert.Equal(Grant.Deny, res.Grant);
+		Assert.Contains("restricted to system or admin users only", res.ToString());
+	}
+
+	[Theory]
+	[MemberData(nameof(SubscriptionOperations))]
+	public async Task restricts_processing_subscription_messages(OperationDefinition operationDefinition) {
+		var sut = CreateSut();
+
+		var operation = new Operation(operationDefinition)
+			.WithParameter(Operations.Subscriptions.Parameters.StreamId(StreamId));
+		var res = await sut.EvaluateAsync(_claimsPrincipal, operation, CancellationToken.None);
+
+		if (operation.Action == Operations.Subscriptions.ProcessMessages.Action) {
+			Assert.Equal(Grant.Deny, res.Grant);
+			Assert.Contains("restricted to system or admin users only", res.ToString());
+		} else {
+			Assert.Equal(Grant.Allow, res.Grant);
+		}
+	}
+
+	[Theory]
+	[MemberData(nameof(OtherOperations))]
+	public async Task does_not_restrict_other_operations(OperationDefinition operationDefinition) {
+		var sut = CreateSut();
+
+		var operation = new Operation(operationDefinition);
+		var res = await sut.EvaluateAsync(_claimsPrincipal, operation, CancellationToken.None);
+
+		Assert.Equal(Grant.Allow, res.Grant);
+	}
+
+	private class DummyStreamAccess {
+		public StaticPolicySelector Create(OperationDefinition[] operations) {
+			var policy = new Policy("dummy", 1, DateTimeOffset.MinValue);
+			foreach (var op in operations) {
+				policy.Add(op, new NonStreamAssertion($"{op.Resource}.{op.Action}"));
+			}
+
+			return new StaticPolicySelector(policy.AsReadOnly());
+		}
+
+		private class NonStreamAssertion(string resource) : IAssertion {
+			public Grant Grant { get; } = Grant.Allow;
+			public AssertionInformation Information { get; } = new("dummy", resource, Grant.Allow);
+
+			public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+				EvaluationContext context) {
+				if (operation.Resource.Contains(StreamsResource)) {
+					Assert.Fail("Should not assert on stream operations");
+				} else {
+					context.Add(new AssertionMatch(policy, Information, []));
+				}
+
+				return ValueTask.FromResult(true);
+			}
+		}
+	}
+}
diff --git a/src/EventStore.Core.XUnit.Tests/Authorization/MultiPolicyEvaluatorTests.cs b/src/KurrentDB.Core.XUnit.Tests/Authorization/MultiPolicyEvaluatorTests.cs
similarity index 89%
rename from src/EventStore.Core.XUnit.Tests/Authorization/MultiPolicyEvaluatorTests.cs
rename to src/KurrentDB.Core.XUnit.Tests/Authorization/MultiPolicyEvaluatorTests.cs
index 73b126736e5..4943c29e5bb 100644
--- a/src/EventStore.Core.XUnit.Tests/Authorization/MultiPolicyEvaluatorTests.cs
+++ b/src/KurrentDB.Core.XUnit.Tests/Authorization/MultiPolicyEvaluatorTests.cs
@@ -1,13 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
-using EventStore.Core.Authorization;
 using EventStore.Plugins.Authorization;
+using KurrentDB.Core.Authorization;
+using KurrentDB.Core.Authorization.AuthorizationPolicies;
 using Xunit;
 
-namespace EventStore.Core.XUnit.Tests.Authorization;
+namespace KurrentDB.Core.XUnit.Tests.Authorization;
 
 public class MultiPolicyEvaluatorTests {
 	private CancellationToken _ct = CancellationToken.None;
@@ -18,7 +22,7 @@ private MultiPolicyEvaluator CreateSut(Policy[] policies) {
 		var selectors = policies
 			.Select(x => new StaticPolicySelector(x.AsReadOnly()))
 			.ToArray<IPolicySelector>();
-		return new MultiPolicyEvaluator(selectors);
+		return new MultiPolicyEvaluator(new StaticAuthorizationPolicyRegistry(selectors));
 	}
 
 	private Policy CreatePolicy(string policyName, TestAssertion[] assertions) {
diff --git a/src/KurrentDB.Core.XUnit.Tests/Authorization/StreamBasedAuthPolicyRegistryTests.cs b/src/KurrentDB.Core.XUnit.Tests/Authorization/StreamBasedAuthPolicyRegistryTests.cs
new file mode 100644
index 00000000000..bd9d1be9e81
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Authorization/StreamBasedAuthPolicyRegistryTests.cs
@@ -0,0 +1,441 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+using DotNext.Threading;
+using KurrentDB.Common.Exceptions;
+using KurrentDB.Core.Authorization;
+using KurrentDB.Core.Authorization.AuthorizationPolicies;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using Xunit;
+using EventRecord = KurrentDB.Core.Data.EventRecord;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Core.XUnit.Tests.Authorization;
+
+public class StreamBasedAuthPolicyRegistryTests {
+	private const string AclsPolicy = LegacyPolicySelectorFactory.LegacyPolicySelectorName;
+	private const string FallbackPolicy = FallbackStreamAccessPolicySelector.FallbackPolicyName;
+
+	private List<ReadOnlyPolicy[]> _policyUpdates = new();
+	private AsyncManualResetEvent _policyUpdated = new(false);
+	private TaskCompletionSource<ClientMessage.SubscribeToStream> _subscribed = new();
+
+	private static readonly JsonSerializerOptions SerializerOptions = new() { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
+	private static readonly TimeSpan Timeout = TimeSpan.FromSeconds(1);
+
+	private StreamBasedAuthorizationPolicyRegistry CreateSut(
+		FakePolicySelectorPlugin[] plugins, AuthorizationPolicySettings defaultSettings, Action<ClientMessage.ReadStreamEventsBackward> onReadBackwards) {
+		var publisher = new AuthRegistryTestPublisher(onReadBackwards);
+		_subscribed = publisher.Subscribed;
+		_policyUpdated = new AsyncManualResetEvent(false);
+		_policyUpdates = [];
+
+		var legacySelector = new LegacyPolicySelectorFactory(false, false, false).Create(publisher);
+		// ReSharper disable once CoVariantArrayConversion
+		var sut = new StreamBasedAuthorizationPolicyRegistry(publisher, legacySelector, plugins, defaultSettings);
+		sut.PolicyChanged += (_, args) => {
+			_policyUpdates.Add(args.EffectivePolicies);
+			_policyUpdated.Set();
+		};
+		return sut;
+	}
+
+	public static TheoryData<DefaultSettingsTestCase> DefaultSettingsCases => new() {
+		new DefaultSettingsTestCase(AclsPolicy, new AuthorizationPolicySettings(AclsPolicy), [AclsPolicy], null),
+		new DefaultSettingsTestCase(FallbackPolicy, new AuthorizationPolicySettings(FallbackPolicy), [FallbackPolicy, AclsPolicy], null),
+		new DefaultSettingsTestCase("valid", new AuthorizationPolicySettings("valid"), ["valid", AclsPolicy], new FakePolicySelectorPlugin("valid", true)),
+		new DefaultSettingsTestCase("not found", new AuthorizationPolicySettings("not found"), [FallbackPolicy, AclsPolicy], new FakePolicySelectorPlugin("valid", true)),
+		new DefaultSettingsTestCase("disabled", new AuthorizationPolicySettings("disabled"), [FallbackPolicy, AclsPolicy], new FakePolicySelectorPlugin("disabled", false)),
+	};
+
+	[Theory]
+	[MemberData(nameof(DefaultSettingsCases))]
+	public async Task when_starting_with_no_existing_settings_events_the_default_is_used(DefaultSettingsTestCase testCase) {
+		var sut = CreateSut(
+			testCase.CustomPlugin is null ? [] : [testCase.CustomPlugin], testCase.DefaultSettings,
+			m => {
+				m.Envelope.ReplyWith(ErrorResponse(m, ReadStreamResult.NoStream));
+			});
+
+		await sut.Start();
+		Assert.True(await _policyUpdated.WaitAsync(Timeout));
+
+		// The expected policies are applied
+		Assert.Equal(testCase.AppliesPolicies, sut.EffectivePolicies.Select(x => x.Information.Name).ToArray());
+
+		// It should subscribe
+		var subscribeMsg = await _subscribed.Task.WaitAsync(Timeout);
+		Assert.Equal(SystemStreams.AuthorizationPolicyRegistryStream, subscribeMsg.EventStreamId);
+	}
+
+	[Fact]
+	public void when_starting_and_read_backwards_has_not_completed_yet() {
+		var sut = CreateSut([], new AuthorizationPolicySettings(AclsPolicy), _ => { });
+
+		// It uses the fallback policy for stream access, and the legacy policy for endpoint access
+		Assert.Equal(2, sut.EffectivePolicies.Length);
+		Assert.Equal(FallbackPolicy, sut.EffectivePolicies[0].Information.Name);
+		Assert.Equal(AclsPolicy, sut.EffectivePolicies[1].Information.Name);
+	}
+
+	[Theory]
+	[InlineData(ClientMessage.NotHandled.Types.NotHandledReason.NotReady)]
+	[InlineData(ClientMessage.NotHandled.Types.NotHandledReason.TooBusy)]
+	public async Task when_starting_and_the_read_backwards_is_not_handled(
+		ClientMessage.NotHandled.Types.NotHandledReason notHandledReason) {
+		var longerTimeout = TimeSpan.FromSeconds(20); // Retries have a delay
+		var failed = false;
+
+		var sut = CreateSut(
+			[new FakePolicySelectorPlugin("plugin", true)], new AuthorizationPolicySettings(AclsPolicy),
+			m => {
+				if (!failed) {
+					failed = true;
+					m.Envelope.ReplyWith(new ClientMessage.NotHandled(m.CorrelationId, notHandledReason, ""));
+				} else
+					m.Envelope.ReplyWith(CreateReadCompleted(m, [
+						CreateResolvedEvent(new AuthorizationPolicySettings("plugin"), 0)
+					]));
+			});
+
+		await sut.Start();
+
+		// It retries and eventually updates the policy
+		Assert.True(await _policyUpdated.WaitAsync(longerTimeout));
+		Assert.Equal("plugin", sut.EffectivePolicies[0].Information.Name);
+		Assert.Equal(AclsPolicy, sut.EffectivePolicies[1].Information.Name);
+
+		// It should subscribe
+		var subscribeMsg = await _subscribed.Task.WaitAsync(longerTimeout);
+		Assert.Equal(SystemStreams.AuthorizationPolicyRegistryStream, subscribeMsg.EventStreamId);
+	}
+
+	[Theory]
+	[InlineData(ReadStreamResult.AccessDenied, true, AclsPolicy)]
+	[InlineData(ReadStreamResult.Error, true, AclsPolicy)]
+	[InlineData(ReadStreamResult.StreamDeleted, false, AclsPolicy)]
+	[InlineData(ReadStreamResult.NoStream, false, AclsPolicy)]
+	[InlineData(ReadStreamResult.StreamDeleted, false, "plugin")]
+	[InlineData(ReadStreamResult.NoStream, false, "plugin")]
+	public async Task when_starting_and_the_read_backwards_fails_and_cannot_be_retried(
+		ReadStreamResult readResult, bool fatal, string defaultPolicy) {
+		var longerTimeout = TimeSpan.FromSeconds(20);
+		Exception? actualException = null;
+
+		var sut = CreateSut(
+			[new FakePolicySelectorPlugin("plugin", true)], new AuthorizationPolicySettings(defaultPolicy),
+			m => {
+				m.Envelope.ReplyWith(ErrorResponse(m, readResult));
+			});
+
+		try {
+			await sut.Start();
+		} catch (Exception ex) {
+			actualException = ex;
+		}
+
+		if (fatal) {
+			// It throws a fatal exception
+			Assert.NotNull(actualException);
+			Assert.IsType<ApplicationInitializationException>(actualException);
+
+			// It uses the fallback policy
+			Assert.Equal(new[] { FallbackPolicy, AclsPolicy },
+				sut.EffectivePolicies.Select(x => x.Information.Name).ToArray());
+		} else {
+			// It does not throw an exception
+			Assert.Null(actualException);
+
+			// It uses the default policy
+			Assert.True(await _policyUpdated.WaitAsync(Timeout));
+			Assert.Equal(defaultPolicy == AclsPolicy ? [AclsPolicy] : [defaultPolicy, AclsPolicy],
+				sut.EffectivePolicies.Select(x => x.Information.Name).ToArray());
+
+			// It subscribes
+			var subscribeMsg = await _subscribed.Task.WaitAsync(longerTimeout);
+			Assert.Equal(SystemStreams.AuthorizationPolicyRegistryStream, subscribeMsg.EventStreamId);
+		}
+	}
+
+	public static TheoryData<SettingsEventTestCase> SettingsTestCases => new() {
+		new SettingsEventTestCase("disabled", shouldCallEnable: true, shouldCallDisable: false, [], new FakePolicySelectorPlugin("disabled", false)),
+		new SettingsEventTestCase("valid", shouldCallEnable: true, shouldCallDisable: true, ["valid", AclsPolicy], new FakePolicySelectorPlugin("valid", true)),
+		new SettingsEventTestCase(AclsPolicy, shouldCallEnable: false, shouldCallDisable: false, [AclsPolicy], null),
+		new SettingsEventTestCase(FallbackPolicy, shouldCallEnable: false, shouldCallDisable: false, [FallbackPolicy, AclsPolicy], null),
+		new SettingsEventTestCase("not found", shouldCallEnable: false, shouldCallDisable: false, [], new FakePolicySelectorPlugin("custom", true)),
+		new SettingsEventTestCase("invalid", "invalid", "invalid", shouldCallEnable: false, shouldCallDisable: false, [], new FakePolicySelectorPlugin("invalid", true)),
+		new SettingsEventTestCase("invalid json", SystemEventTypes.AuthorizationPolicyChanged, "invalid", shouldCallEnable: false, shouldCallDisable: false, [], new FakePolicySelectorPlugin("invalid json", true)),
+		new SettingsEventTestCase("invalid event type", "invalid", JsonSerializer.Serialize(new AuthorizationPolicySettings(AclsPolicy)), shouldCallEnable: false, shouldCallDisable: false, [], new FakePolicySelectorPlugin("invalid event type", true)),
+		new SettingsEventTestCase("empty json object", SystemEventTypes.AuthorizationPolicyChanged, "{}", shouldCallEnable: false, shouldCallDisable: false, [FallbackPolicy, AclsPolicy], new FakePolicySelectorPlugin("empty json object", true)),
+		new SettingsEventTestCase("valid json without policyType", SystemEventTypes.AuthorizationPolicyChanged, "{}", shouldCallEnable: false, shouldCallDisable: false, [FallbackPolicy, AclsPolicy], new FakePolicySelectorPlugin("valid json without policyType", true)),
+		new SettingsEventTestCase("empty policyType", SystemEventTypes.AuthorizationPolicyChanged, "{}", shouldCallEnable: false, shouldCallDisable: false, [FallbackPolicy, AclsPolicy], new FakePolicySelectorPlugin("valid json without policyType", true)),
+	};
+
+	[Theory]
+	[MemberData(nameof(SettingsTestCases))]
+	public async Task when_settings_events_exist_in_the_stream(SettingsEventTestCase testCase) {
+		var finishedEvent = CreateResolvedEvent(new AuthorizationPolicySettings("finished"), 3);
+
+		// Set up expected policies
+		var appliesPolicies = testCase.AppliesPolicies.Length > 0
+			? testCase.AppliesPolicies
+			: [FallbackPolicy, AclsPolicy];
+		var expectedPolicies = new[] {
+			appliesPolicies,
+			["finished", AclsPolicy]
+		};
+
+		// Set up available plugins
+		var availablePlugins = new Dictionary<string, FakePolicySelectorPlugin> {
+			{ "finished", new FakePolicySelectorPlugin("finished", true) },
+		};
+		if (testCase.CustomPlugin is not null) {
+			availablePlugins.Add(testCase.CustomPlugin.CommandLineName, testCase.CustomPlugin);
+		}
+
+		var sut = CreateSut(
+			availablePlugins.Values.ToArray(), new AuthorizationPolicySettings(AclsPolicy),
+			m => {
+				m.Envelope.ReplyWith(CreateReadCompleted(m, [testCase.Event]));
+			});
+		await sut.Start();
+
+		// Wait for the policy to be updated
+		Assert.True(await _policyUpdated.WaitAsync(Timeout));
+		_policyUpdated.Reset();
+
+		if (testCase.ShouldCallEnable) {
+			// It attempted to enable the policy
+			Assert.True(await availablePlugins[testCase.PolicyName].OnEnabled.WaitAsync(Timeout));
+		}
+
+		if (testCase.AppliesPolicies.Length > 0) {
+			// The correct policies are in effect
+			for (var i = 0; i < testCase.AppliesPolicies.Length; i++) {
+				Assert.Equal(testCase.AppliesPolicies[i], sut.EffectivePolicies[i].Information.Name);
+			}
+		} else {
+			// All events are invalid or cannot be enabled
+			// The fallback policy should be used
+			Assert.Equal(FallbackPolicy, sut.EffectivePolicies[0].Information.Name);
+			Assert.Equal(AclsPolicy, sut.EffectivePolicies[1].Information.Name);
+		}
+
+		// It should subscribe
+		var subscribeMsg = await _subscribed.Task.WaitAsync(Timeout);
+
+		// Send the finished event
+		subscribeMsg.Envelope.ReplyWith(
+			new ClientMessage.StreamEventAppeared(subscribeMsg.CorrelationId, finishedEvent));
+
+		// The finished policy is applied
+		Assert.True(await _policyUpdated.WaitAsync(Timeout));
+		Assert.Equal("finished", sut.EffectivePolicies[0].Information.Name);
+
+		if (testCase.ShouldCallDisable) {
+			// The previous policy is disabled
+			Assert.True(await availablePlugins[testCase.PolicyName].OnDisabled.WaitAsync(Timeout));
+		}
+
+		// The policy updates contain the expected policies
+		for (var i = 0; i < expectedPolicies.Length; i++) {
+			Assert.Equal(expectedPolicies[i], _policyUpdates[i].Select(x => x.Information.Name));
+		}
+	}
+
+	[Theory]
+	[MemberData(nameof(SettingsTestCases))]
+	public async Task when_settings_events_are_received_by_the_subscription(SettingsEventTestCase testCase) {
+		var finishedEvent = CreateResolvedEvent(new AuthorizationPolicySettings("finished"), 3);
+
+		// Set up expected policies
+		var expectedPolicies = new List<string[]>();
+		expectedPolicies.Add(["start", AclsPolicy]);
+		if (testCase.AppliesPolicies.Length > 0) {
+			expectedPolicies.Add(testCase.AppliesPolicies);
+		}
+		expectedPolicies.Add(["finished", AclsPolicy]);
+
+		// Set up available plugins
+		var availablePlugins = new Dictionary<string, FakePolicySelectorPlugin> {
+			{ "start", new FakePolicySelectorPlugin("start", true) },
+			{ "finished", new FakePolicySelectorPlugin("finished", true) },
+		};
+		if (testCase.CustomPlugin is not null) {
+			availablePlugins.Add(testCase.CustomPlugin.CommandLineName, testCase.CustomPlugin);
+		}
+
+		var sut = CreateSut(
+			availablePlugins.Values.ToArray(), new AuthorizationPolicySettings(AclsPolicy),
+			m => {
+				m.Envelope.ReplyWith(CreateReadCompleted(m,
+					[CreateResolvedEvent(new AuthorizationPolicySettings("start"), 0)]));
+			});
+		await sut.Start();
+
+		// Load the start policy
+		Assert.True(await _policyUpdated.WaitAsync(Timeout));
+		_policyUpdated.Reset();
+		Assert.Equal("start", sut.EffectivePolicies[0].Information.Name);
+
+		// Wait for the subscription
+		var subscribeMsg = await _subscribed.Task.WaitAsync(Timeout);
+
+		// Send the new settings
+		subscribeMsg.Envelope.ReplyWith(
+			new ClientMessage.StreamEventAppeared(subscribeMsg.CorrelationId, testCase.Event));
+
+		if (testCase.ShouldCallEnable) {
+			// Attempt to enable the new policy
+			Assert.True(await availablePlugins[testCase.PolicyName].OnEnabled.WaitAsync(Timeout));
+		}
+
+		if (testCase.AppliesPolicies.Length > 0) {
+			// The policy was updated
+			Assert.True(await _policyUpdated.WaitAsync(Timeout));
+			_policyUpdated.Reset();
+
+			// The start policy was disabled
+			Assert.True(await availablePlugins["start"].OnDisabled.WaitAsync(Timeout));
+
+			// The correct policies are in effect
+			Assert.Equal(testCase.AppliesPolicies, sut.EffectivePolicies.Select(x => x.Information.Name).ToArray());
+		}
+
+		// Send the finished settings event
+		subscribeMsg.Envelope.ReplyWith(
+			new ClientMessage.StreamEventAppeared(subscribeMsg.CorrelationId, finishedEvent));
+
+		// The finished policy was applied
+		Assert.True(await _policyUpdated.WaitAsync(Timeout));
+		_policyUpdated.Reset();
+		Assert.Equal("finished", sut.EffectivePolicies[0].Information.Name);
+
+		if (testCase.ShouldCallDisable) {
+			// The policy was disabled
+			Assert.True(await availablePlugins[testCase.PolicyName].OnDisabled.WaitAsync(Timeout));
+		}
+
+		// The policy updates contain the expected policies
+		for (var i = 0; i < expectedPolicies.Count; i++) {
+			Assert.Equal(expectedPolicies[i], _policyUpdates[i].Select(x => x.Information.Name));
+		}
+	}
+
+	private static ClientMessage.ReadStreamEventsBackwardCompleted
+		ErrorResponse(ClientMessage.ReadStreamEventsBackward msg, ReadStreamResult result) =>
+		new(
+			msg.CorrelationId, msg.EventStreamId, msg.FromEventNumber, msg.MaxCount,
+			result, [], StreamMetadata.Empty, true, "",
+			msg.FromEventNumber, msg.FromEventNumber, true, 0L);
+
+	private static ResolvedEvent CreateResolvedEvent(AuthorizationPolicySettings settings, long eventNumber) {
+		var data = JsonSerializer.SerializeToUtf8Bytes(settings, SerializerOptions);
+		return CreateResolvedEvent(SystemEventTypes.AuthorizationPolicyChanged, data, eventNumber);
+	}
+
+	private static ResolvedEvent CreateResolvedEvent(string eventType, byte[] data, long eventNumber) {
+		var logPosition = eventNumber * 100;
+		var prepare = new PrepareLogRecord(logPosition, Guid.NewGuid(), Guid.NewGuid(),
+			transactionPosition: logPosition,
+			transactionOffset: 0,
+			SystemStreams.AuthorizationPolicyRegistryStream,
+			eventStreamIdSize: null,
+			expectedVersion: eventNumber, DateTime.Now, PrepareFlags.Data,
+			eventType, eventTypeSize: null, data, ReadOnlyMemory<byte>.Empty);
+		var eventRecord = new EventRecord(eventNumber, prepare, SystemStreams.AuthorizationPolicyRegistryStream, eventType);
+		return ResolvedEvent.ForUnresolvedEvent(eventRecord, logPosition);
+	}
+
+	private ClientMessage.ReadStreamEventsBackwardCompleted CreateReadCompleted(
+		ClientMessage.ReadStreamEventsBackward msg, ResolvedEvent[] events) =>
+		new(msg.CorrelationId, msg.EventStreamId, msg.FromEventNumber, msg.MaxCount,
+			ReadStreamResult.Success, events, StreamMetadata.Empty, true, "",
+			msg.FromEventNumber, msg.FromEventNumber, true, 1000L);
+
+	public readonly struct DefaultSettingsTestCase(
+		string policyName,
+		AuthorizationPolicySettings defaultSettings,
+		string[] appliesPolicies,
+		FakePolicySelectorPlugin? customPlugin) {
+		public readonly string PolicyName = policyName;
+		public readonly AuthorizationPolicySettings DefaultSettings = defaultSettings;
+		public readonly string[] AppliesPolicies = appliesPolicies;
+		public readonly FakePolicySelectorPlugin? CustomPlugin = customPlugin;
+
+		public override string ToString() {
+			return $"default: '{PolicyName}' applies [{string.Join(", ", AppliesPolicies)}]";
+		}
+	}
+
+	public readonly struct SettingsEventTestCase {
+		public readonly ResolvedEvent Event;
+		public readonly string PolicyName;
+		public readonly bool ShouldCallEnable;
+		public readonly bool ShouldCallDisable;
+		public readonly string[] AppliesPolicies;
+		public readonly FakePolicySelectorPlugin? CustomPlugin;
+
+		public SettingsEventTestCase(string policyName, bool shouldCallEnable, bool shouldCallDisable, string[] appliesPolicies, FakePolicySelectorPlugin? customPlugin) {
+			PolicyName = policyName;
+			// EventNumber hardcoded to 2. Allows for a default and start event
+			Event = CreateResolvedEvent(new AuthorizationPolicySettings(policyName), 2);
+			ShouldCallEnable = shouldCallEnable;
+			ShouldCallDisable = shouldCallDisable;
+			AppliesPolicies = appliesPolicies;
+			CustomPlugin = customPlugin;
+		}
+
+		public SettingsEventTestCase(string policyName, string eventType, string data, bool shouldCallEnable, bool shouldCallDisable, string[] appliesPolicies, FakePolicySelectorPlugin? customPlugin) {
+			PolicyName = policyName;
+			// EventNumber hardcoded to 2. Allows for a default and start event
+			Event = CreateResolvedEvent(eventType, Encoding.UTF8.GetBytes(data), 2);
+			ShouldCallEnable = shouldCallEnable;
+			ShouldCallDisable = shouldCallDisable;
+			AppliesPolicies = appliesPolicies;
+			CustomPlugin = customPlugin;
+		}
+
+		public override string ToString() {
+			return AppliesPolicies.Length > 0
+				? $"'{PolicyName}' policy applies [{string.Join(", ", AppliesPolicies)}]"
+				: $"'{PolicyName}' policy does not update the policies";
+		}
+	}
+
+	private class AuthRegistryTestPublisher : IPublisher {
+		private readonly Action<ClientMessage.ReadStreamEventsBackward> _onReadBackward;
+		private readonly Action<ClientMessage.SubscribeToStream> _onSubscribed;
+		public readonly TaskCompletionSource<ClientMessage.SubscribeToStream> Subscribed = new();
+
+		public AuthRegistryTestPublisher(Action<ClientMessage.ReadStreamEventsBackward> onReadBackward) {
+			_onReadBackward = onReadBackward;
+			_onSubscribed = m => {
+				m.Envelope.ReplyWith(new ClientMessage.SubscriptionConfirmation(m.CorrelationId, 100, 0));
+				Subscribed.TrySetResult(m);
+			};
+		}
+		public void Publish(Message message) {
+			switch (message) {
+				case ClientMessage.ReadStreamEventsBackward read:
+					_onReadBackward(read);
+					break;
+				case ClientMessage.SubscribeToStream subscribe:
+					_onSubscribed(subscribe);
+					break;
+			}
+		}
+	}
+}
diff --git a/src/EventStore.Core.XUnit.Tests/Authorization/TestAssertion.cs b/src/KurrentDB.Core.XUnit.Tests/Authorization/TestAssertion.cs
similarity index 84%
rename from src/EventStore.Core.XUnit.Tests/Authorization/TestAssertion.cs
rename to src/KurrentDB.Core.XUnit.Tests/Authorization/TestAssertion.cs
index 55ea40c2d3f..cedbadf3eca 100644
--- a/src/EventStore.Core.XUnit.Tests/Authorization/TestAssertion.cs
+++ b/src/KurrentDB.Core.XUnit.Tests/Authorization/TestAssertion.cs
@@ -1,9 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System.Security.Claims;
 using System.Threading.Tasks;
-using EventStore.Core.Authorization;
 using EventStore.Plugins.Authorization;
+using KurrentDB.Core.Authorization;
 
-namespace EventStore.Core.XUnit.Tests.Authorization;
+namespace KurrentDB.Core.XUnit.Tests.Authorization;
 
 public class TestAssertion : IAssertion {
 	public Grant Grant => Grant.Deny;
diff --git a/src/EventStore.Core.XUnit.Tests/Certificates/client_name_matching.cs b/src/KurrentDB.Core.XUnit.Tests/Certificates/client_name_matching.cs
similarity index 91%
rename from src/EventStore.Core.XUnit.Tests/Certificates/client_name_matching.cs
rename to src/KurrentDB.Core.XUnit.Tests/Certificates/client_name_matching.cs
index 4c07dfc40ba..267b2c3b2b0 100644
--- a/src/EventStore.Core.XUnit.Tests/Certificates/client_name_matching.cs
+++ b/src/KurrentDB.Core.XUnit.Tests/Certificates/client_name_matching.cs
@@ -1,10 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
-using EventStore.Common.Utils;
+using KurrentDB.Common.Utils;
 using Xunit;
 
-namespace EventStore.Core.XUnit.Tests.Certificates;
+namespace KurrentDB.Core.XUnit.Tests.Certificates;
 
 public class client_name_matching {
 	private static X509Certificate2 GenSut(string subjectName) {
diff --git a/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/ClusterVNodeOptionsScenarios.cs b/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/ClusterVNodeOptionsScenarios.cs
new file mode 100644
index 00000000000..cc5e7888961
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/ClusterVNodeOptionsScenarios.cs
@@ -0,0 +1,113 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Cryptography.X509Certificates;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Core.Authentication;
+using KurrentDB.Core.Authentication.InternalAuthentication;
+using KurrentDB.Core.Authorization;
+using KurrentDB.Core.Authorization.AuthorizationPolicies;
+using KurrentDB.Core.Certificates;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.Transport.Tcp;
+using KurrentDB.Core.Transforms.Identity;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.XUnit.Tests.Configuration.ClusterNodeOptionsTests;
+
+[TestFixture]
+public abstract class SingleNodeScenario<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	protected ClusterVNode _node;
+	protected ClusterVNodeOptions _options;
+	private ILogFormatAbstractorFactory<TStreamId> _logFormatFactory;
+	private readonly bool _disableMemoryOptimization;
+
+	public SingleNodeScenario(bool disableMemoryOptimization = false) {
+		_disableMemoryOptimization = disableMemoryOptimization;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_logFormatFactory = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory;
+
+		var options = _disableMemoryOptimization
+			? new ClusterVNodeOptions()
+			: new ClusterVNodeOptions().ReduceMemoryUsageForTests();
+
+		_options = WithOptions(options
+			.RunInMemory()
+			.Secure(new X509Certificate2Collection(ssl_connections.GetRootCertificate()),
+				ssl_connections.GetServerCertificate()));
+		_node = new ClusterVNode<TStreamId>(_options, _logFormatFactory,
+			new AuthenticationProviderFactory(c =>
+				new InternalAuthenticationProviderFactory(c, _options.DefaultUser)),
+			new AuthorizationProviderFactory(c => new InternalAuthorizationProviderFactory(
+				new StaticAuthorizationPolicyRegistry([new LegacyPolicySelectorFactory(
+					options.Application.AllowAnonymousEndpointAccess,
+					options.Application.AllowAnonymousStreamAccess,
+					options.Application.OverrideAnonymousEndpointAccessForGossip).Create(c.MainQueue)]))),
+			certificateProvider: new OptionsCertificateProvider());
+
+		_node.Db.TransformManager.LoadTransforms([new IdentityDbTransform()]);
+		_node.Db.TransformManager.SetActiveTransform(TransformType.Identity);
+
+		await _node.StartAsync(waitUntilReady: true, CancellationToken.None);
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		await (_node?.StopAsync() ?? Task.CompletedTask);
+		await base.TestFixtureTearDown();
+	}
+
+	protected abstract ClusterVNodeOptions WithOptions(ClusterVNodeOptions options);
+
+}
+
+[TestFixture, Category("LongRunning")]
+public abstract class ClusterMemberScenario<TLogFormat, TStreamId> {
+	protected ClusterVNode _node;
+	protected int _clusterSize = 3;
+	protected int _quorumSize;
+	protected ClusterVNodeOptions _options;
+	protected ILogFormatAbstractorFactory<TStreamId> _logFormatFactory;
+
+	[OneTimeSetUp]
+	public virtual async Task TestFixtureSetUp() {
+		_logFormatFactory = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory;
+		_quorumSize = _clusterSize / 2 + 1;
+
+		_options = WithOptions(new ClusterVNodeOptions()
+			.ReduceMemoryUsageForTests()
+			.InCluster(_clusterSize)
+			.RunInMemory()
+			.Secure(new X509Certificate2Collection(ssl_connections.GetRootCertificate()),
+				ssl_connections.GetServerCertificate()));
+		_node = new ClusterVNode<TStreamId>(_options, _logFormatFactory,
+			new AuthenticationProviderFactory(_ =>
+				new InternalAuthenticationProviderFactory(_, _options.DefaultUser)),
+			new AuthorizationProviderFactory(c => new InternalAuthorizationProviderFactory(
+				new StaticAuthorizationPolicyRegistry([new LegacyPolicySelectorFactory(
+					_options.Application.AllowAnonymousEndpointAccess,
+					_options.Application.AllowAnonymousStreamAccess,
+					_options.Application.OverrideAnonymousEndpointAccessForGossip).Create(c.MainQueue)]))),
+			certificateProvider: new OptionsCertificateProvider());
+
+		_node.Db.TransformManager.LoadTransforms([new IdentityDbTransform()]);
+		_node.Db.TransformManager.SetActiveTransform(TransformType.Identity);
+
+		// we do not wait until ready because in some cases we will never become ready.
+		// becoming ready involves writing the admin user, which we will never in the test
+		// cases that a node that is configured to be part of a cluster.
+		await _node.StartAsync(waitUntilReady: false, CancellationToken.None);
+	}
+
+	[OneTimeTearDown]
+	public virtual Task TestFixtureTearDown() => _node?.StopAsync() ?? Task.CompletedTask;
+
+	protected abstract ClusterVNodeOptions WithOptions(ClusterVNodeOptions options);
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_cluster_node_and_custom_settings.cs b/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_cluster_node_and_custom_settings.cs
new file mode 100644
index 00000000000..146136f196f
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_cluster_node_and_custom_settings.cs
@@ -0,0 +1,276 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Net;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Certificates;
+using KurrentDB.Core.Configuration.Sources;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests;
+using Microsoft.Extensions.Configuration;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.XUnit.Tests.Configuration.ClusterNodeOptionsTests.when_building;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_cluster_dns_name<TLogFormat, TStreamId> : ClusterMemberScenario<TLogFormat, TStreamId> {
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) =>
+		options with {
+			Cluster = options.Cluster with {
+				ClusterDns = "ClusterDns"
+			}
+		};
+
+	[Test]
+	public void should_set_discover_via_dns_to_true() {
+		Assert.IsTrue(_options.Cluster.DiscoverViaDns);
+	}
+
+	[Test]
+	public void should_set_cluster_dns_name() {
+		Assert.AreEqual("ClusterDns", _options.Cluster.ClusterDns);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_dns_discovery_disabled_and_no_gossip_seeds<TLogFormat, TStreamId> {
+	private Exception _caughtException;
+	protected ClusterVNodeOptions _options;
+
+	[OneTimeSetUp]
+	public void TestFixtureSetUp() {
+		_options = new ClusterVNodeOptions {
+			Cluster = new() {
+				DiscoverViaDns = false
+			}
+		}
+			.ReduceMemoryUsageForTests()
+			.RunInMemory();
+		try {
+			_ = new ClusterVNode<TStreamId>(_options, LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory,
+				certificateProvider: new OptionsCertificateProvider());
+		} catch (Exception e) {
+			_caughtException = e;
+		}
+	}
+
+	[Test]
+	public void should_throw_an_exception() {
+		Assert.IsNotNull(_caughtException);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_dns_discovery_disabled_and_gossip_seeds_defined<TLogFormat, TStreamId> : ClusterMemberScenario<TLogFormat, TStreamId> {
+	private EndPoint[] _gossipSeeds = {
+		new DnsEndPoint("127.0.1.10", 1111),
+		new DnsEndPoint("127.0.1.10", 1112),
+	};
+
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) =>
+		options.WithGossipSeeds(_gossipSeeds);
+
+	[Test]
+	public void should_set_discover_via_dns_to_false() {
+		Assert.IsFalse(_options.Cluster.DiscoverViaDns);
+	}
+
+	[Test]
+	public void should_set_the_gossip_seeds() {
+		CollectionAssert.AreEqual(_gossipSeeds, _options.Cluster.GossipSeed);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_custom_gossip_seeds<TLogFormat, TStreamId> : ClusterMemberScenario<TLogFormat, TStreamId> {
+	private readonly DnsEndPoint[] _gossipSeeds = { new("127.0.1.15", 2112), new("127.0.1.15", 3112) };
+
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) =>
+		options.WithGossipSeeds(_gossipSeeds);
+
+	[Test]
+	public void should_turn_off_discovery_by_dns() {
+		Assert.IsFalse(_options.Cluster.DiscoverViaDns);
+	}
+
+	[Test]
+	public void should_set_the_gossip_seeds() {
+		CollectionAssert.AreEqual(_gossipSeeds, _options.Cluster.GossipSeed);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_custom_external_ip_address_as_advertise_info<TLogFormat, TStreamId> : ClusterMemberScenario<TLogFormat, TStreamId> {
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) {
+		return options
+			.Insecure()
+			.WithExternalTcpOn(new IPEndPoint(IPAddress.Loopback, 11130))
+			.WithReplicationEndpointOn(new IPEndPoint(IPAddress.Loopback, 11120))
+			.AdvertiseExternalHostAs(new DnsEndPoint("196.168.1.1", 11131))
+			.AdvertiseNodeAs(new DnsEndPoint("196.168.1.1", 21130));
+	}
+
+	[Test]
+	public void should_set_the_custom_advertise_info_for_external() {
+		Assert.AreEqual(new DnsEndPoint("196.168.1.1", 21130),
+			_node.GossipAdvertiseInfo.HttpEndPoint);
+	}
+
+	[Test]
+	public void should_set_the_loopback_address_as_advertise_info_for_internal() {
+		Assert.AreEqual(new DnsEndPoint(IPAddress.Loopback.ToString(), 11120), _node.GossipAdvertiseInfo.InternalTcp);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_0_0_0_0_as_external_ip_address_and_custom_advertise_info<TLogFormat, TStreamId> : ClusterMemberScenario<TLogFormat, TStreamId> {
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) {
+		return options
+			.Insecure()
+			.WithReplicationEndpointOn(new IPEndPoint(IPAddress.Any, 11120))
+			.WithExternalTcpOn(new IPEndPoint(IPAddress.Any, 11130))
+			.AdvertiseExternalHostAs(new DnsEndPoint("10.0.0.1", 11131));
+	}
+
+	[Test]
+	public void should_set_the_custom_advertise_info_for_external() {
+		Assert.AreEqual(new DnsEndPoint("10.0.0.1", 2113),
+			_node.GossipAdvertiseInfo.HttpEndPoint);
+	}
+
+	[Test]
+	public void should_set_the_non_loopback_address_as_advertise_info_for_internal() {
+		Assert.AreEqual(new DnsEndPoint(IPFinder.GetNonLoopbackAddress().ToString(), 11120),
+			_node.GossipAdvertiseInfo.InternalTcp);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_0_0_0_0_as_external_ip_address_with_no_explicit_advertise_info_set<TLogFormat, TStreamId> : ClusterMemberScenario<TLogFormat, TStreamId> {
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) {
+		return options
+			.Insecure()
+			.WithNodeEndpointOn(new IPEndPoint(IPAddress.Any, 21130))
+			.WithExternalTcpOn(new IPEndPoint(IPAddress.Any, 11130))
+			.WithReplicationEndpointOn(new IPEndPoint(IPAddress.Loopback, 11120));
+	}
+
+	[Test]
+	public void should_use_the_non_default_loopback_ip_as_advertise_info_for_external() {
+		Assert.AreEqual(new DnsEndPoint(IPFinder.GetNonLoopbackAddress().ToString(), 21130),
+			_node.GossipAdvertiseInfo.HttpEndPoint);
+	}
+
+	[Test]
+	public void should_use_loopback_ip_as_advertise_info_for_internal() {
+		Assert.AreEqual(new DnsEndPoint(IPAddress.Loopback.ToString(), 11120), _node.GossipAdvertiseInfo.InternalTcp);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	with_0_0_0_0_for_internal_and_external_ips_with_advertise_info_set_for_external<TLogFormat, TStreamId> : ClusterMemberScenario<TLogFormat, TStreamId> {
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) {
+		return options
+			.Insecure()
+			.WithNodeEndpointOn(new IPEndPoint(IPAddress.Loopback, 21130))
+			.WithExternalTcpOn(new IPEndPoint(IPAddress.Loopback, 11130))
+			.WithReplicationEndpointOn(new IPEndPoint(IPAddress.Any, 11120))
+			.AdvertiseExternalHostAs(new DnsEndPoint("10.0.0.1", 11131))
+			.AdvertiseNodeAs(new DnsEndPoint("10.0.0.1", 21131));
+	}
+
+	[Test]
+	public void should_set_the_custom_advertise_info_for_external() {
+		Assert.AreEqual(new DnsEndPoint("10.0.0.1", 21131),
+			_node.GossipAdvertiseInfo.HttpEndPoint);
+	}
+
+	[Test]
+	public void should_use_the_non_default_loopback_ip_as_advertise_info_for_internal() {
+		Assert.AreEqual(new DnsEndPoint(IPFinder.GetNonLoopbackAddress().ToString(), 11120),
+			_node.GossipAdvertiseInfo.InternalTcp);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_cluster_custom_password_for_admin_and_ops_user<TLogFormat, TStreamId> : ClusterMemberScenario<TLogFormat, TStreamId> {
+	private const string _adminPassword = "Admin";
+	private const string _opsPassword = "Ops";
+
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) =>
+		options with {
+			DefaultUser = new ClusterVNodeOptions.DefaultUserOptions { DefaultAdminPassword = _adminPassword, DefaultOpsPassword = _opsPassword }
+		};
+
+	[Test]
+	public void should_set_the_custom_admin_and_ops_user_password() {
+		Assert.AreEqual(_adminPassword, _options.DefaultUser.DefaultAdminPassword);
+		Assert.AreEqual(_opsPassword, _options.DefaultUser.DefaultOpsPassword);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_cluster_custom_settings_check_for_environment_only_options<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat,
+		TStreamId> {
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) =>
+		options with {
+		};
+
+	private IConfigurationRoot _configurationRoot;
+
+	[Test]
+	public void should_return_error_when_default_password_options_pass_through_command_line() {
+		var args = new[] {
+			"--DefaultAdminPassword=Admin2023#",
+			"--DefaultOpsPassword=Ops2023#"
+		};
+
+		_configurationRoot = new ConfigurationBuilder()
+			.AddKurrentDefaultValues(new Dictionary<string, object> {
+				[nameof(ClusterVNodeOptions.DefaultUser.DefaultAdminPassword)] = SystemUsers.DefaultAdminPassword,
+				[nameof(ClusterVNodeOptions.DefaultUser.DefaultOpsPassword)] = SystemUsers.DefaultOpsPassword
+			})
+			.AddKurrentCommandLine(args)
+			.Build();
+
+		var clusterVNodeOptions = ClusterVNodeOptions.FromConfiguration(_configurationRoot);
+
+		Assert.NotNull(clusterVNodeOptions.CheckForEnvironmentOnlyOptions());
+	}
+
+	[Test]
+	public void should_return_null_when_default_password_options_pass_through_environment_variables() {
+		var prefix = KurrentConfigurationKeys.Prefix.ToUpper();
+		var args = Array.Empty<string>();
+		IDictionary environmentVariables = new Dictionary<string, string>();
+		environmentVariables.Add($"{prefix}_DEFAULT_ADMIN_PASSWORD", "Admin#");
+		environmentVariables.Add($"{prefix}_DEFAULT_OPS_PASSWORD", "Ops#");
+
+		_configurationRoot = new ConfigurationBuilder()
+			.AddKurrentDefaultValues(new Dictionary<string, object> {
+				[nameof(ClusterVNodeOptions.DefaultUser.DefaultAdminPassword)] = SystemUsers.DefaultAdminPassword,
+				[nameof(ClusterVNodeOptions.DefaultUser.DefaultOpsPassword)] = SystemUsers.DefaultOpsPassword
+			})
+			.AddKurrentCommandLine(args)
+			.AddKurrentEnvironmentVariables(environmentVariables)
+			.Build();
+
+		var clusterVNodeOptions = ClusterVNodeOptions.FromConfiguration(_configurationRoot);
+
+		Assert.Null(clusterVNodeOptions.CheckForEnvironmentOnlyOptions());
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_default_settings.cs b/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_default_settings.cs
new file mode 100644
index 00000000000..e6b7ef6a471
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_default_settings.cs
@@ -0,0 +1,132 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net;
+using KurrentDB.Common.Options;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Authentication.DelegatedAuthentication;
+using KurrentDB.Core.Services.Monitoring;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.Chunks;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.XUnit.Tests.Configuration.ClusterNodeOptionsTests.when_building;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_default_node_as_single_node<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat, TStreamId> {
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) {
+		return options;
+	}
+
+	public with_default_node_as_single_node() : base(disableMemoryOptimization: true) {
+	}
+
+	[Test]
+	public void should_create_single_cluster_node() {
+		Assert.IsNotNull(_node);
+		Assert.AreEqual(1, _options.Cluster.ClusterSize, "ClusterNodeCount");
+		Assert.IsInstanceOf<DelegatedAuthenticationProvider>(_node.AuthenticationProvider);
+		Assert.AreEqual(StatsStorage.File, _options.Database.StatsStorage);
+	}
+
+	[Test]
+	public void should_have_default_endpoints() {
+		Assert.AreEqual(new IPEndPoint(IPAddress.Loopback, 1112), _node.NodeInfo.InternalSecureTcp);
+		Assert.AreEqual(new IPEndPoint(IPAddress.Loopback, 2113), _node.NodeInfo.HttpEndPoint);
+	}
+
+	[Test]
+	public void should_set_command_line_args_to_default_values() {
+		Assert.AreEqual(false, _options.Interface.EnableTrustedAuth, "EnableTrustedAuth");
+		Assert.AreEqual(false, _options.Application.LogHttpRequests, "LogHttpRequests");
+		Assert.AreEqual(0, _options.Application.WorkerThreads, "WorkerThreads");
+		Assert.AreEqual(true, _options.Cluster.DiscoverViaDns, "DiscoverViaDns");
+		Assert.AreEqual(30, _options.Application.StatsPeriodSec, "StatsPeriod");
+		Assert.AreEqual(false, _options.Application.DisableHttpCaching, "DisableHTTPCaching");
+		Assert.AreEqual(false, _options.Database.SkipDbVerify, "VerifyDbHash");
+		Assert.AreEqual(TFConsts.MinFlushDelayMs.TotalMilliseconds, _options.Database.MinFlushDelayMs, "MinFlushDelay");
+		Assert.AreEqual(30, _options.Database.ScavengeHistoryMaxAge,
+			"ScavengeHistoryMaxAge");
+		Assert.AreEqual(false, _options.Database.DisableScavengeMerging,
+			"DisableScavengeMerging");
+		Assert.AreEqual(false, _options.Interface.DisableAdminUi, "AdminOnPublic");
+		Assert.AreEqual(false, _options.Interface.DisableStatsOnHttp, "StatsOnPublic");
+		Assert.AreEqual(false, _options.Interface.DisableGossipOnHttp, "GossipOnPublic");
+		Assert.AreEqual(1_000_000, _options.Database.MaxMemTableSize, "MaxMemtableEntryCount");
+		Assert.AreEqual(false, _options.Projection.RunProjections > ProjectionType.System,
+			"StartStandardProjections");
+		Assert.AreEqual(false, _options.Database.UnsafeIgnoreHardDelete,
+			"UnsafeIgnoreHardDeletes");
+		Assert.That(string.IsNullOrEmpty(_options.Database.Index), "IndexPath");
+		Assert.AreEqual(2000, _options.Database.PrepareTimeoutMs, "PrepareTimeout");
+		Assert.AreEqual(2000, _options.Database.CommitTimeoutMs, "CommitTimeout");
+		Assert.AreEqual(2000, _options.Database.WriteTimeoutMs, "WriteTimeout");
+
+		Assert.AreEqual(700, _options.Interface.ReplicationHeartbeatInterval, "ReplicationHeartbeatInterval");
+
+		Assert.AreEqual(700, _options.Interface.ReplicationHeartbeatTimeout,
+			"ReplicationHeartbeatTimeout");
+
+		Assert.AreEqual(TFConsts.ChunkSize, _node.Db.Config.ChunkSize, "ChunkSize");
+		Assert.AreEqual(TFConsts.ChunksCacheSize, _node.Db.Config.MaxChunksCacheSize, "MaxChunksCacheSize");
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_default_node_as_node_in_a_cluster<TLogFormat, TStreamId> : ClusterMemberScenario<TLogFormat, TStreamId> {
+	[Test]
+	public void should_create_single_cluster_node() {
+		Assert.IsNotNull(_node);
+		Assert.AreEqual(_clusterSize, _options.Cluster.ClusterSize, "ClusterNodeCount");
+		Assert.IsInstanceOf<DelegatedAuthenticationProvider>(_node.AuthenticationProvider);
+		Assert.AreEqual(StatsStorage.File, _options.Database.StatsStorage);
+	}
+
+	[Test]
+	public void should_have_default_secure_endpoints() {
+		var internalTcp = new IPEndPoint(IPAddress.Loopback, 1112);
+		var externalTcp = new IPEndPoint(IPAddress.Loopback, 1113);
+		var httpEndPoint = new IPEndPoint(IPAddress.Loopback, 2113);
+
+		Assert.AreEqual(internalTcp, _node.NodeInfo.InternalSecureTcp);
+		Assert.AreEqual(httpEndPoint, _node.NodeInfo.HttpEndPoint);
+
+		Assert.AreEqual(internalTcp.ToDnsEndPoint(), _node.GossipAdvertiseInfo.InternalSecureTcp);
+		Assert.AreEqual(httpEndPoint.ToDnsEndPoint(), _node.GossipAdvertiseInfo.HttpEndPoint);
+	}
+
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) {
+		return options;
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_default_node_as_node_in_an_insecure_cluster<TLogFormat, TStreamId> : ClusterMemberScenario<TLogFormat, TStreamId> {
+	[Test]
+	public void should_create_single_cluster_node() {
+		Assert.IsNotNull(_node);
+		Assert.AreEqual(_clusterSize, _options.Cluster.ClusterSize, "ClusterNodeCount");
+		Assert.IsInstanceOf<DelegatedAuthenticationProvider>(_node.AuthenticationProvider);
+		Assert.AreEqual(StatsStorage.File, _options.Database.StatsStorage);
+	}
+
+	[Test]
+	public void should_have_default_endpoints() {
+		var internalTcp = new IPEndPoint(IPAddress.Loopback, 1112);
+		var externalTcp = new IPEndPoint(IPAddress.Loopback, 1113);
+		var httpEndPoint = new IPEndPoint(IPAddress.Loopback, 2113);
+
+		Assert.AreEqual(internalTcp, _node.NodeInfo.InternalTcp);
+		Assert.AreEqual(httpEndPoint, _node.NodeInfo.HttpEndPoint);
+
+		Assert.AreEqual(internalTcp.ToDnsEndPoint(), _node.GossipAdvertiseInfo.InternalTcp);
+		Assert.AreEqual(httpEndPoint.ToDnsEndPoint(), _node.GossipAdvertiseInfo.HttpEndPoint);
+	}
+
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) {
+		return options.Insecure();
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_legacy_eventstore_settings.cs b/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_legacy_eventstore_settings.cs
new file mode 100644
index 00000000000..c5e0614f14d
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_legacy_eventstore_settings.cs
@@ -0,0 +1,134 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using FluentAssertions;
+using KurrentDB.Core.Configuration.Sources;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.FileProviders;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.XUnit.Tests.Configuration.ClusterNodeOptionsTests.when_building;
+
+[TestFixture]
+public class with_legacy_eventstore_settings : SingleNodeScenario<LogFormat.V2, string> {
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) =>
+		options with {
+		};
+
+	private IConfigurationRoot _configurationRoot;
+
+	[Test]
+	public void should_return_error_when_default_password_options_pass_through_eventstore_command_line() {
+		var args = new[] {
+			$"--{KurrentConfigurationKeys.LegacyEventStorePrefix}:DefaultAdminPassword=Admin2023#",
+			$"--{KurrentConfigurationKeys.LegacyEventStorePrefix}:DefaultOpsPassword=Ops2023#"
+		};
+
+		_configurationRoot = new ConfigurationBuilder()
+			.AddKurrentDefaultValues(new Dictionary<string, object> {
+				[nameof(ClusterVNodeOptions.DefaultUser.DefaultAdminPassword)] = SystemUsers.DefaultAdminPassword,
+				[nameof(ClusterVNodeOptions.DefaultUser.DefaultOpsPassword)] = SystemUsers.DefaultOpsPassword
+			})
+			.AddLegacyEventStoreCommandLine(args)
+			.Build();
+
+		var clusterVNodeOptions = ClusterVNodeOptions.FromConfiguration(_configurationRoot);
+
+		Assert.NotNull(clusterVNodeOptions.CheckForEnvironmentOnlyOptions());
+	}
+
+	[Test]
+	public void should_return_warnings_when_options_are_provided_by_legacy_eventstore_sources() {
+		var eventStorePrefix = KurrentConfigurationKeys.LegacyEventStorePrefix;
+		var kurrentPrefix = KurrentConfigurationKeys.Prefix;
+
+		// json config file
+		var fileName = "test.eventstore.json";
+		var filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Configuration", fileName);
+		var directory = Path.GetDirectoryName(filePath);
+		Assert.NotNull(directory);
+
+		// environment variables
+		IDictionary environmentVariables = new Dictionary<string, string>();
+		environmentVariables.Add($"{eventStorePrefix.ToUpper()}_NODE_PORT", "111");
+		environmentVariables.Add($"{kurrentPrefix.ToUpper()}_REPLICATION_PORT", "333");
+
+		// command line
+		var args = new[] { $"--{eventStorePrefix}:RunProjections=All", $"--{kurrentPrefix}:MemDb=true" };
+
+		_configurationRoot = new ConfigurationBuilder()
+			.AddKurrentDefaultValues()
+			.AddLegacyEventStoreJsonFile(config => {
+				config.FileProvider = new PhysicalFileProvider(directory) {
+					UseActivePolling = false,
+					UsePollingFileWatcher = false
+				};
+				config.OnLoadException = _ =>
+					Assert.Fail($"Could not find test config file '{fileName}' in '{directory}'");
+				config.Path = fileName;
+			})
+			.AddLegacyEventStoreEnvironmentVariables(environmentVariables)
+			.AddLegacyEventStoreCommandLine(args)
+			.Build();
+
+		var clusterVNodeOptions = ClusterVNodeOptions.FromConfiguration(_configurationRoot);
+		var warnings = clusterVNodeOptions.CheckForLegacyEventStoreConfiguration();
+		var expected = new[] {
+			$"\"Autoscavenge\" Provided by: Event Store Json File. The \"EventStore\" configuration root has been deprecated, use \"{kurrentPrefix}\" instead.",
+			$"\"Connectors\" Provided by: Event Store Json File. The \"EventStore\" configuration root has been deprecated, use \"{kurrentPrefix}\" instead.",
+			$"\"Licensing\" Provided by: Event Store Json File. The \"EventStore\" configuration root has been deprecated, use \"{kurrentPrefix}\" instead.",
+			$"\"NodePort\" Provided by: Event Store Environment Variables. The \"EventStore\" configuration root has been deprecated, use \"{kurrentPrefix}\" instead.",
+			$"\"RunProjections\" Provided by: Event Store Command Line. The \"EventStore\" configuration root has been deprecated, use \"{kurrentPrefix}\" instead."
+		};
+		Assert.AreEqual(expected, warnings);
+	}
+
+	[Test]
+	public void should_return_null_when_default_password_options_pass_through_environment_variables() {
+		var prefix = KurrentConfigurationKeys.LegacyEventStorePrefix.ToUpper();
+		var args = Array.Empty<string>();
+		IDictionary environmentVariables = new Dictionary<string, string>();
+		environmentVariables.Add($"{prefix}_DEFAULT_ADMIN_PASSWORD", "Admin#");
+		environmentVariables.Add($"{prefix}_DEFAULT_OPS_PASSWORD", "Ops#");
+
+		_configurationRoot = new ConfigurationBuilder()
+			.AddKurrentDefaultValues(new Dictionary<string, object> {
+				[nameof(ClusterVNodeOptions.DefaultUser.DefaultAdminPassword)] = SystemUsers.DefaultAdminPassword,
+				[nameof(ClusterVNodeOptions.DefaultUser.DefaultOpsPassword)] = SystemUsers.DefaultOpsPassword
+			})
+			.AddKurrentCommandLine(args)
+			.AddLegacyEventStoreEnvironmentVariables(environmentVariables)
+			.Build();
+
+		var clusterVNodeOptions = ClusterVNodeOptions.FromConfiguration(_configurationRoot);
+
+		Assert.Null(clusterVNodeOptions.CheckForEnvironmentOnlyOptions());
+	}
+
+	[Test]
+	public void ignores_subsection_arguments() {
+		var prefix = KurrentConfigurationKeys.LegacyEventStorePrefix;
+		var configuration = new ConfigurationBuilder()
+			// we should be able to stop doing this soon as long as we bind the options automatically
+			.AddKurrentDefaultValues()
+			.AddLegacyEventStoreEnvironmentVariables(
+				($"{prefix.ToUpper()}__METRICS__X", "xxx"),
+				($"{prefix.ToUpper()}__PLUGINS__Y", "yyy")
+			)
+			.AddLegacyEventStoreCommandLine(
+				$"--{prefix}:Metrics:A aaa " +
+				$"--{prefix}:Plugins:B bbb"
+			)
+			.Build();
+
+		var options = ClusterVNodeOptions.FromConfiguration(configuration);
+
+		options.Unknown.Options.Should().BeEmpty();
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_secure_tcp.cs b/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_secure_tcp.cs
new file mode 100644
index 00000000000..ac9cd51960a
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_secure_tcp.cs
@@ -0,0 +1,108 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Net;
+using System.Security.Cryptography.X509Certificates;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Certificates;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.Transport.Tcp;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.XUnit.Tests.Configuration.ClusterNodeOptionsTests.when_building;
+
+[Category("LongRunning")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_ssl_enabled_and_using_a_security_certificate_from_file<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat, TStreamId> {
+	private readonly IPEndPoint _internalSecTcp = new(IPAddress.Parse("127.0.1.15"), 1114);
+	private readonly IPEndPoint _externalSecTcp = new(IPAddress.Parse("127.0.1.15"), 1115);
+
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) {
+
+		return options.WithReplicationEndpointOn(_internalSecTcp).WithExternalTcpOn(_externalSecTcp) with {
+			CertificateFile = new() {
+				CertificateFile = GetCertificatePath(),
+				CertificatePrivateKeyFile = string.Empty,
+				CertificatePassword = "password"
+			}
+		};
+	}
+
+	[Test]
+	public void should_set_certificate() {
+		Assert.AreNotEqual("n/a", _options.Certificate == null ? "n/a" : _options.Certificate.ToString());
+	}
+
+	[Test]
+	public void should_set_internal_secure_tcp_endpoint() {
+		Assert.AreEqual(_internalSecTcp, _node.NodeInfo.InternalSecureTcp);
+	}
+
+	private string GetCertificatePath() {
+		var filePath = Path.Combine(PathName, $"ES-cert-{Guid.NewGuid()}.p12");
+		var cert = ssl_connections.GetUntrustedCertificate();
+
+		using var fileStream = File.Create(filePath);
+		fileStream.Write(cert.ExportToPkcs12());
+
+		return filePath;
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_ssl_enabled_and_using_a_security_certificate<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat, TStreamId> {
+	private readonly IPEndPoint _internalSecTcp = new(IPAddress.Parse("127.0.1.15"), 1114);
+	private readonly IPEndPoint _externalSecTcp = new(IPAddress.Parse("127.0.1.15"), 1115);
+	private readonly X509Certificate2 _certificate = ssl_connections.GetServerCertificate();
+
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) {
+		return options
+			.WithReplicationEndpointOn(_internalSecTcp)
+			.WithExternalTcpOn(_externalSecTcp)
+			.Secure(new X509Certificate2Collection(ssl_connections.GetRootCertificate()), _certificate);
+	}
+
+	[Test]
+	public void should_set_certificate() {
+		Assert.AreNotEqual("n/a", _options.Certificate == null ? "n/a" : _options.Certificate.ToString());
+	}
+
+	[Test]
+	public void should_set_internal_secure_tcp_endpoint() {
+		Assert.AreEqual(_internalSecTcp, _node.NodeInfo.InternalSecureTcp);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_secure_tcp_endpoints_and_no_certificates<TLogFormat, TStreamId> {
+	private ClusterVNodeOptions _options;
+	private Exception _caughtException;
+
+	[OneTimeSetUp]
+	public void SetUp() {
+		var baseIpAddress = IPAddress.Parse("127.0.1.15");
+		var internalSecTcp = new IPEndPoint(baseIpAddress, 1114);
+		var externalSecTcp = new IPEndPoint(baseIpAddress, 1115);
+		_options = new ClusterVNodeOptions()
+			.ReduceMemoryUsageForTests()
+			.RunInMemory()
+			.WithReplicationEndpointOn(internalSecTcp)
+			.WithExternalTcpOn(externalSecTcp);
+		try {
+			_ = new ClusterVNode<TStreamId>(_options, LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory,
+				certificateProvider: new OptionsCertificateProvider());
+		} catch (Exception ex) {
+			_caughtException = ex;
+		}
+	}
+
+	[Test]
+	public void should_throw_an_exception() {
+		Assert.IsNotNull(_caughtException);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_single_node_and_custom_settings.cs b/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_single_node_and_custom_settings.cs
new file mode 100644
index 00000000000..4739f777b48
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterNodeOptionsTests/when_building/with_single_node_and_custom_settings.cs
@@ -0,0 +1,236 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+using System.Net;
+using FluentAssertions;
+using KurrentDB.Core.Configuration.Sources;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.Chunks;
+using Microsoft.Extensions.Configuration;
+using NUnit.Framework;
+
+namespace KurrentDB.Core.XUnit.Tests.Configuration.ClusterNodeOptionsTests.when_building;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_run_on_disk<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat, TStreamId> {
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) => options.RunOnDisk(PathName);
+
+	[Test]
+	public void should_set_memdb_to_false() {
+		Assert.IsFalse(_node.Db.Config.InMemDb);
+	}
+
+	[Test]
+	public void should_set_the_db_path() {
+		Assert.AreEqual(PathName, _node.Db.Config.Path);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_run_in_memory<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat, TStreamId> {
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) =>
+		options.RunInMemory();
+
+	[Test]
+	public void should_set_memdb_to_true() {
+		Assert.IsTrue(_node.Db.Config.InMemDb);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_custom_ip_endpoints<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat, TStreamId> {
+	private readonly IPEndPoint _httpEndPoint = new(IPAddress.Parse("127.0.1.15"), 1113);
+	private readonly IPEndPoint _internalTcp = new(IPAddress.Parse("127.0.1.15"), 1114);
+	private readonly IPEndPoint _externalTcp = new(IPAddress.Parse("127.0.1.15"), 1115);
+
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) {
+		return options
+			.WithNodeEndpointOn(_httpEndPoint)
+			.WithExternalTcpOn(_externalTcp)
+			.WithReplicationEndpointOn(_internalTcp);
+	}
+
+	[Test]
+	public void should_set_http_endpoint() {
+		Assert.AreEqual(_httpEndPoint, _node.NodeInfo.HttpEndPoint);
+	}
+
+	[Test]
+	public void should_set_internal_tcp_endpoint() {
+		Assert.AreEqual(_internalTcp, _node.NodeInfo.InternalSecureTcp);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_custom_chunk_size<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat, TStreamId> {
+	private readonly int _chunkSize = 268435;
+
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) => options with {
+		Database = options.Database with {
+			ChunkSize = _chunkSize
+		}
+	};
+
+	[Test]
+	public void should_set_chunk_size() {
+		Assert.AreEqual(_chunkSize, _node.Db.Config.ChunkSize);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_custom_chunk_cache_size<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat, TStreamId> {
+	private readonly long _chunkCacheSize = 268435712;
+
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) => options with {
+		Database = options.Database with {
+			ChunksCacheSize = _chunkCacheSize
+		}
+	};
+
+	[Test]
+	public void should_set_max_chunk_cache_size() {
+		Assert.AreEqual(_chunkCacheSize, _node.Db.Config.MaxChunksCacheSize);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	with_custom_number_of_cached_chunks<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat, TStreamId> {
+	private readonly int _cachedChunks = 10;
+
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) => options with {
+		Database = options.Database with {
+			CachedChunks = _cachedChunks
+		}
+	};
+
+	[Test]
+	public void should_set_max_chunk_size_to_the_size_of_the_number_of_cached_chunks() {
+		var chunkSizeResult = _cachedChunks * (long)(_node.Db.Config.ChunkSize + ChunkHeader.Size + ChunkFooter.Size);
+		Assert.AreEqual(chunkSizeResult, _node.Db.Config.MaxChunksCacheSize);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_custom_advertise_as<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat, TStreamId> {
+	private readonly IPEndPoint _intTcpEndpoint = new(IPAddress.Parse(InternalIp), 1111);
+	private readonly IPEndPoint _extTcpEndpoint = new(IPAddress.Parse(ExternalIp), 1113);
+	private readonly IPEndPoint _httpEndpoint = new(IPAddress.Parse(ExternalIp), 1116);
+	const string InternalIp = "127.0.1.1";
+	const string ExternalIp = "127.0.1.2";
+
+
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) {
+		return options
+			.WithNodeEndpointOn(_httpEndpoint)
+			.WithExternalTcpOn(_extTcpEndpoint)
+			.WithReplicationEndpointOn(_intTcpEndpoint)
+			.AdvertiseInternalHostAs(new DnsEndPoint($"{InternalIp}.com", _intTcpEndpoint.Port + 1000))
+			.AdvertiseExternalHostAs(new DnsEndPoint($"{ExternalIp}.com", _extTcpEndpoint.Port + 1000))
+			.AdvertiseNodeAs(new DnsEndPoint($"{ExternalIp}.com", _httpEndpoint.Port + 1000));
+	}
+
+	[Test]
+	public void should_set_the_advertise_as_info_to_the_specified() {
+		Assert.AreEqual(null, _node.GossipAdvertiseInfo.InternalTcp);
+		Assert.AreEqual(null, _node.GossipAdvertiseInfo.ExternalTcp);
+		Assert.AreEqual(new DnsEndPoint($"{InternalIp}.com", _intTcpEndpoint.Port + 1000),
+			_node.GossipAdvertiseInfo.InternalSecureTcp);
+		Assert.AreEqual(new DnsEndPoint($"{ExternalIp}.com", _httpEndpoint.Port + 1000),
+			_node.GossipAdvertiseInfo.HttpEndPoint);
+		Assert.AreEqual($"{InternalIp}.com", _node.GossipAdvertiseInfo.AdvertiseInternalHostAs);
+		Assert.AreEqual($"{ExternalIp}.com", _node.GossipAdvertiseInfo.AdvertiseExternalHostAs);
+		Assert.AreEqual(_httpEndpoint.Port + 1000, _node.GossipAdvertiseInfo.AdvertiseHttpPortAs);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	with_custom_password_for_admin_and_ops_user<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat, TStreamId> {
+	private const string _adminPassword = "Admin";
+	private const string _opsPassword = "Ops";
+
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) =>
+		options with {
+			DefaultUser = new ClusterVNodeOptions.DefaultUserOptions { DefaultAdminPassword = _adminPassword, DefaultOpsPassword = _opsPassword }
+		};
+
+	[Test]
+	public void should_set_the_custom_admin_and_ops_user_password() {
+		Assert.AreEqual(_adminPassword, _options.DefaultUser.DefaultAdminPassword);
+		Assert.AreEqual(_opsPassword, _options.DefaultUser.DefaultOpsPassword);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	with_custom_settings_check_for_environment_only_options<TLogFormat, TStreamId> : SingleNodeScenario<TLogFormat,
+	TStreamId> {
+	protected override ClusterVNodeOptions WithOptions(ClusterVNodeOptions options) => options with { };
+
+	[Test]
+	public void should_return_error_when_default_password_options_pass_through_command_line() {
+		var configuration = new ConfigurationBuilder()
+			.AddKurrentDefaultValues()
+			.AddKurrentCommandLine(
+				"--DefaultAdminPassword=Admin#",
+				"--DefaultOpsPassword=Ops#")
+			.Build();
+
+		var options = ClusterVNodeOptions.FromConfiguration(configuration);
+
+		var result = options.CheckForEnvironmentOnlyOptions();
+
+		result.Should().NotBeNull();
+	}
+
+	[Test]
+	public void should_return_null_when_default_password_options_pass_through_environment_variables() {
+		var prefix = KurrentConfigurationKeys.Prefix.ToUpper();
+		var configuration = new ConfigurationBuilder()
+			.AddKurrentDefaultValues()
+			.AddKurrentEnvironmentVariables(
+				($"{prefix}_DEFAULT_ADMIN_PASSWORD", "Admin#"),
+				($"{prefix}_DEFAULT_OPS_PASSWORD", "Ops#")
+			)
+			.AddKurrentCommandLine()
+			.Build();
+
+		var options = ClusterVNodeOptions.FromConfiguration(configuration);
+
+		var result = options.CheckForEnvironmentOnlyOptions();
+
+		result.Should().BeNull();
+	}
+
+	[Test]
+	public void ignores_subsection_arguments() {
+		var prefix = KurrentConfigurationKeys.Prefix;
+		var configuration = new ConfigurationBuilder()
+			// we should be able to stop doing this soon as long as we bind the options automatically
+			.AddKurrentDefaultValues()
+			.AddKurrentEnvironmentVariables(
+				($"{prefix.ToUpper()}__METRICS__X", "xxx"),
+				($"{prefix.ToUpper()}__PLUGINS__Y", "yyy")
+			)
+			.AddKurrentCommandLine(
+				$"--{prefix}:Metrics:A aaa " +
+				$"--{prefix}:Plugins:B bbb"
+			)
+			.Build();
+
+		var options = ClusterVNodeOptions.FromConfiguration(configuration);
+
+		options.Unknown.Options.Should().BeEmpty();
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterVNodeOptionsPrinterTests.cs b/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterVNodeOptionsPrinterTests.cs
new file mode 100644
index 00000000000..9f0ac5c8f21
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterVNodeOptionsPrinterTests.cs
@@ -0,0 +1,167 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using FluentAssertions;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Configuration;
+using KurrentDB.Core.Configuration.Sources;
+using Microsoft.Extensions.Configuration;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Configuration;
+
+public class ClusterVNodeOptionsPrinterTests {
+	[Fact]
+	public void prints_options() {
+		var kurrentPrefix = KurrentConfigurationKeys.Prefix.ToUpper();
+		var eventStorePrefix = KurrentConfigurationKeys.LegacyEventStorePrefix.ToUpper();
+		var config = new ConfigurationBuilder()
+			.AddKurrentDefaultValues(new Dictionary<string, string?> {
+				{ "ChunkSize", "10000"},
+				{ "ChunksCacheSize", "20000" },
+				{ "ClusterSize", "1" },
+				{ "UnsafeAllowSurplusNodes", "false" },
+			})
+			.AddLegacyEventStoreEnvironmentVariables(
+				($"{eventStorePrefix}_WORKER_THREADS", "5"),
+				($"{eventStorePrefix}_NODE_PRIORITY", "6"),
+				($"{eventStorePrefix}_ANOTHER_UNKNOWN_OPTIONS", "7"))
+			.AddKurrentEnvironmentVariables(
+				($"{kurrentPrefix}_SOME_UNKNOWN_OPTION", "77"),
+				($"{kurrentPrefix}_CLUSTER_GOSSIP_PORT", "99"),
+				($"{kurrentPrefix}_UNSAFE_ALLOW_SURPLUS_NODES", "true"),
+				($"{kurrentPrefix}_CONFIG", "/path/to/config/envvar"),
+				($"{kurrentPrefix}_RUN_PROJECTIONS", "All"))
+			.AddKurrentCommandLine(
+				"--config", "/path/to/config/commandline",
+				"--cluster-gossip-port=88",
+				$"--default-ops-password={Guid.NewGuid()}")
+			.Build();
+
+		var loadedOptions = ClusterVNodeOptions.GetLoadedOptions(config);
+
+		var output = ClusterVNodeOptionsPrinter.Print(loadedOptions);
+
+		output.Should().Be(@"
+MODIFIED OPTIONS:
+    APPLICATION OPTIONS:
+         CONFIG:                            /path/to/config/commandline (Command Line)
+         WORKER THREADS:                    5 (Event Store Environment Variables)
+
+    CLUSTER OPTIONS:
+         CLUSTER GOSSIP PORT:               88 (Command Line)
+         NODE PRIORITY:                     6 (Event Store Environment Variables)
+         UNSAFE ALLOW SURPLUS NODES:        true (Environment Variables)
+
+    DEFAULT USER OPTIONS:
+         DEFAULT OPS PASSWORD:              ******** (Command Line)
+
+    PROJECTION OPTIONS:
+         RUN PROJECTIONS:                   All (Environment Variables)
+
+
+DEFAULT OPTIONS:
+    CLUSTER OPTIONS:
+         CLUSTER SIZE:                      1 (<DEFAULT>)
+
+    DATABASE OPTIONS:
+         CHUNK SIZE:                        10000 (<DEFAULT>)
+         CHUNKS CACHE SIZE:                 20000 (<DEFAULT>)
+");
+	}
+
+	[Fact]
+	public void loaded_options_do_not_contain_sensitive_values() {
+		var secretText = Guid.NewGuid().ToString();
+
+		var config = new ConfigurationBuilder()
+			.AddKurrentDefaultValues()
+			.AddLegacyEventStoreEnvironmentVariables(
+				($"{KurrentConfigurationKeys.LegacyEventStorePrefix.ToUpper()}_DEFAULT_ADMIN_PASSWORD", secretText))
+			.AddLegacyEventStoreCommandLine(
+				$"--{KurrentConfigurationKeys.LegacyEventStorePrefix}:CertificatePassword", secretText)
+			.AddKurrentCommandLine($"--default-ops-password={secretText}")
+			.Build();
+
+		var loadedOptions = ClusterVNodeOptions.GetLoadedOptions(config);
+
+		var opsPassword = loadedOptions[$"{KurrentConfigurationKeys.Prefix}:DefaultOpsPassword"];
+		var adminPassword = loadedOptions[$"{KurrentConfigurationKeys.Prefix}:DefaultAdminPassword"];
+		var certPassword = loadedOptions[$"{KurrentConfigurationKeys.Prefix}:CertificatePassword"];
+
+		opsPassword.DisplayValue.Should().BeEquivalentTo("********");
+		adminPassword.DisplayValue.Should().BeEquivalentTo("********");
+		certPassword.DisplayValue.Should().BeEquivalentTo("********");
+	}
+
+	[Fact]
+	public void loaded_options_show_allowed_values() {
+		var config = new ConfigurationBuilder()
+			.AddKurrentDefaultValues()
+			.Build();
+
+		var loadedOptions = ClusterVNodeOptions.GetLoadedOptions(config);
+
+		var option = loadedOptions[$"{KurrentConfigurationKeys.Prefix}:DbLogFormat"];
+
+		option.Metadata.AllowedValues.Should().BeEquivalentTo(Enum.GetNames(typeof(DbLogFormat)));
+	}
+
+	[Fact]
+	public void loaded_option_provided_by_another_source_shows_the_correct_source() {
+		var kurrentPrefix = KurrentConfigurationKeys.Prefix;
+		var eventStorePrefix = KurrentConfigurationKeys.LegacyEventStorePrefix;
+		var config = new ConfigurationBuilder()
+			.AddKurrentDefaultValues()
+			.AddLegacyEventStoreEnvironmentVariables(
+				($"{eventStorePrefix.ToUpper()}_CLUSTER_SIZE", "10"),
+				($"{eventStorePrefix.ToUpper()}_NODE_PRIORITY", "11"))
+			.AddKurrentEnvironmentVariables(
+				($"{kurrentPrefix.ToUpper()}_CLUSTER_SIZE", "15"),
+				($"{kurrentPrefix.ToUpper()}_LOG_LEVEL", "Fatal"),
+				($"{kurrentPrefix.ToUpper()}_LOG_FORMAT", "json"))
+			.AddLegacyEventStoreCommandLine(
+				$"--{eventStorePrefix}:NodePort=17",
+				$"--{eventStorePrefix}:ReadOnlyReplica=true")
+			.AddKurrentCommandLine(
+				$"--log-level=Information",
+				$"--{kurrentPrefix}:NodePort=18")
+			.Build();
+
+		var loadedOptions = ClusterVNodeOptions.GetLoadedOptions(config);
+
+		// default
+		var insecure = loadedOptions[$"{kurrentPrefix}:Insecure"];
+		insecure.DisplayValue.Should().BeEquivalentTo("false");
+		insecure.SourceDisplayName.Should().BeEquivalentTo("<DEFAULT>");
+
+		// legacy EventStore environment variables
+		var nodePriority = loadedOptions[$"{kurrentPrefix}:NodePriority"];
+		nodePriority.DisplayValue.Should().BeEquivalentTo("11");
+		nodePriority.SourceDisplayName.Should().BeEquivalentTo("Event Store Environment Variables");
+
+		// environment variables
+		var clusterSize = loadedOptions[$"{kurrentPrefix}:ClusterSize"];
+		clusterSize.DisplayValue.Should().BeEquivalentTo("15");
+		clusterSize.SourceDisplayName.Should().BeEquivalentTo("Environment Variables");
+
+		// legacy EventStore command line
+		var readOnly = loadedOptions[$"{kurrentPrefix}:ReadOnlyReplica"];
+		readOnly.DisplayValue.Should().BeEquivalentTo("true");
+		readOnly.SourceDisplayName.Should().BeEquivalentTo("Event Store Command Line");
+
+		// command line
+		var logLevel = loadedOptions[$"{kurrentPrefix}:LogLevel"];
+		logLevel.DisplayValue.Should().BeEquivalentTo("Information");
+		logLevel.SourceDisplayName.Should().BeEquivalentTo("Command Line");
+
+		// command line - override legacy EventStore
+		var nodePort = loadedOptions[$"{kurrentPrefix}:NodePort"];
+		nodePort.DisplayValue.Should().BeEquivalentTo("18");
+		nodePort.SourceDisplayName.Should().BeEquivalentTo("Command Line");
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterVNodeOptionsTests.cs b/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterVNodeOptionsTests.cs
new file mode 100644
index 00000000000..859049c99d4
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterVNodeOptionsTests.cs
@@ -0,0 +1,362 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Net;
+using FluentAssertions;
+using KurrentDB.Common.Exceptions;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Configuration;
+using KurrentDB.Core.Configuration.Sources;
+using Microsoft.Extensions.Configuration;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Configuration;
+
+public class ClusterVNodeOptionsTests {
+	private const string KurrentPrefix = KurrentConfigurationKeys.Prefix;
+	private string KurrentEnvVarPrefix => KurrentConfigurationKeys.Prefix.ToUpper();
+	private const string EventStorePrefix = KurrentConfigurationKeys.LegacyEventStorePrefix;
+	private string EventStoreEnvVarPrefix => KurrentConfigurationKeys.LegacyEventStorePrefix.ToUpper();
+	static ClusterVNodeOptions GetOptions(string args) {
+		var configuration = KurrentConfiguration.Build(
+			LocationOptionWithLegacyDefault.SupportedLegacyLocations, args.Split());
+		return ClusterVNodeOptions.FromConfiguration(configuration);
+	}
+
+	[Fact]
+	public void builds_proper() {
+		var options = new ClusterVNodeOptions();
+	}
+
+	[Fact]
+	public void confirm_suggested_option() {
+		var options = GetOptions("--cluster-sze 3");
+
+		var (key, value) = options.Unknown.Options[0];
+		Assert.Equal("ClusterSze", key);
+		Assert.Equal("ClusterSize", value);
+	}
+
+	[Fact]
+	public void when_we_dont_have_that_option() {
+		var options = GetOptions("--something-that-is-wildly-off 3");
+
+		var (key, value) = options.Unknown.Options[0];
+		Assert.Equal("SomethingThatIsWildlyOff", key);
+		Assert.Equal("", value);
+	}
+
+	[Fact]
+	public void valid_parameters() {
+		var options = GetOptions("--cluster-size 3");
+
+		var values = options.Unknown.Options;
+		Assert.Empty(values);
+	}
+
+	[Fact]
+	public void unknown_options_suggests_option_with_four_characters_off() {
+		var options = GetOptions("--cluse-ie 3");
+
+		var (key, value) = options.Unknown.Options[0];
+		Assert.Equal("CluseIe", key);
+		Assert.Equal("ClusterSize", value);
+	}
+
+	[Fact]
+	public void print_help_text() {
+		var helpText = ClusterVNodeOptions.HelpText;
+		helpText.Should().NotBeEmpty();
+	}
+
+	[Fact]
+	public void unknown_options_ignores_subsection_arguments() {
+		var configuration = new ConfigurationBuilder()
+			.AddKurrentDefaultValues()
+			.AddLegacyEventStoreEnvironmentVariables(
+				($"{EventStoreEnvVarPrefix}__METRICS__Q", "qqq"),
+				($"{EventStoreEnvVarPrefix}__PLUGINS__R", "rrr")
+			)
+			.AddKurrentEnvironmentVariables(
+				($"{KurrentEnvVarPrefix}__METRICS__X", "xxx"),
+				($"{KurrentEnvVarPrefix}__PLUGINS__Y", "yyy")
+			)
+			.AddLegacyEventStoreCommandLine(
+				$"--{EventStorePrefix}:Metrics:A aaa " +
+				$"--{EventStorePrefix}:Plugins:B bbb"
+				)
+			.AddKurrentCommandLine(
+				$"--{KurrentPrefix}:Metrics:C ccc " +
+				$"--{KurrentPrefix}:Plugins:D ddd"
+			)
+			.Build();
+
+		var options = ClusterVNodeOptions.FromConfiguration(configuration);
+
+		options.Unknown.Options.Should().BeEmpty();
+	}
+
+	[Fact]
+	public void unknown_options_ignores_repeated_keys_from_other_sources() {
+		Environment.SetEnvironmentVariable($"{KurrentEnvVarPrefix}__CLUSTER_SIZE", "3");
+
+		var configuration = new ConfigurationBuilder()
+			.AddEnvironmentVariables()
+			.AddKurrentEnvironmentVariables()
+			.Build();
+
+		var options = ClusterVNodeOptions.FromConfiguration(configuration);
+
+		options.Unknown.Options.Should().BeEmpty();
+	}
+
+	[Fact]
+	public void validation_should_return_error_when_default_password_options_pass_through_command_line() {
+		var configuration = new ConfigurationBuilder()
+			.AddKurrentDefaultValues()
+			.AddLegacyEventStoreCommandLine(
+				$"--{EventStorePrefix}:DefaultAdminPassword=Admin#")
+			.AddKurrentCommandLine(
+				"--DefaultOpsPassword=Ops#")
+			.Build();
+
+		var options = ClusterVNodeOptions.FromConfiguration(configuration);
+
+		var result = options.CheckForEnvironmentOnlyOptions();
+
+		result.Should().BeEquivalentTo(
+			"\"DefaultAdminPassword\" Provided by: Event Store Command Line. " +
+			"The Admin user password can only be set using Environment Variables" + Environment.NewLine +
+			"\"DefaultOpsPassword\" Provided by: Command Line. " +
+			"The Ops user password can only be set using Environment Variables" + Environment.NewLine);
+	}
+
+	[Fact]
+	public void validation_should_return_null_when_default_password_options_pass_through_environment_variables() {
+		var configuration = new ConfigurationBuilder()
+			.AddKurrentDefaultValues()
+			.AddKurrentEnvironmentVariables(
+				($"{KurrentEnvVarPrefix}_DEFAULT_ADMIN_PASSWORD", "Admin#"),
+				($"{KurrentEnvVarPrefix}_DEFAULT_OPS_PASSWORD", "Ops#")
+			)
+			.AddKurrentCommandLine()
+			.Build();
+
+		var options = ClusterVNodeOptions.FromConfiguration(configuration);
+
+		var result = options.CheckForEnvironmentOnlyOptions();
+
+		result.Should().BeNull();
+	}
+
+	[Fact]
+	public void validation_should_return_null_when_default_password_options_pass_through_legacy_eventstore_environment_variables() {
+		var configuration = new ConfigurationBuilder()
+			.AddKurrentDefaultValues()
+			.AddLegacyEventStoreEnvironmentVariables(
+				($"{EventStoreEnvVarPrefix}_DEFAULT_ADMIN_PASSWORD", "Admin#"),
+				($"{EventStoreEnvVarPrefix}_DEFAULT_OPS_PASSWORD", "Ops#")
+			)
+			.AddKurrentCommandLine()
+			.Build();
+
+		var options = ClusterVNodeOptions.FromConfiguration(configuration);
+
+		var result = options.CheckForEnvironmentOnlyOptions();
+
+		result.Should().BeNull();
+	}
+
+	[Theory]
+	[InlineData(true)]
+	[InlineData(false)]
+	public void can_set_gossip_seed_values(bool useEventStorePrefix) {
+		EndPoint[] endpoints = [
+			new IPEndPoint(IPAddress.Loopback, 1113),
+			new DnsEndPoint("some-host", 1114),
+			new DnsEndPoint("127.0.1.15", 1115)
+		];
+
+		var values = string.Join(",", endpoints.Select(x => $"{x}"));
+
+		var builder = new ConfigurationBuilder();
+		if (useEventStorePrefix)
+			builder.AddLegacyEventStoreEnvironmentVariables(($"{EventStoreEnvVarPrefix}_GOSSIP_SEED", values));
+		else
+			builder.AddKurrentEnvironmentVariables(($"{KurrentEnvVarPrefix}_GOSSIP_SEED", values));
+		var config = builder.Build();
+
+		var options = ClusterVNodeOptions.FromConfiguration(config);
+
+		options.Cluster.GossipSeed.Should().BeEquivalentTo(endpoints);
+	}
+
+	[Fact]
+	public void can_set_gossip_seed_values_via_array() {
+		var config = new ConfigurationBuilder()
+			.AddInMemoryCollection([
+				new($"{KurrentPrefix}:GossipSeed:0", "127.0.0.1:1113"),
+				new($"{KurrentPrefix}:GossipSeed:1", "some-host:1114"),
+			])
+			.Build();
+
+		var options = ClusterVNodeOptions.FromConfiguration(config);
+
+		options.Cluster.GossipSeed.Should().BeEquivalentTo(new EndPoint[] {
+			new IPEndPoint(IPAddress.Loopback, 1113),
+			new DnsEndPoint("some-host", 1114),
+		});
+	}
+
+	[Theory]
+	[InlineData(true, "127.0.0.1", "You must specify the ports in the gossip seed.")]
+	[InlineData(true, "127.0.0.1:3.1415", "Invalid format for gossip seed port: 3.1415.")]
+	[InlineData(true, "hostA;hostB", "Invalid delimiter for gossip seed value: hostA;hostB.")]
+	[InlineData(true, "hostA\thostB", "Invalid delimiter for gossip seed value: hostA\thostB.")]
+	[InlineData(false, "127.0.0.1", "You must specify the ports in the gossip seed.")]
+	[InlineData(false, "127.0.0.1:3.1415", "Invalid format for gossip seed port: 3.1415.")]
+	[InlineData(false, "hostA;hostB", "Invalid delimiter for gossip seed value: hostA;hostB.")]
+	[InlineData(false, "hostA\thostB", "Invalid delimiter for gossip seed value: hostA\thostB.")]
+	public void reports_gossip_seed_errors(bool useEventStorePrefix, string gossipSeed, string expectedError) {
+		var builder = new ConfigurationBuilder();
+		if (useEventStorePrefix)
+			builder.AddLegacyEventStoreEnvironmentVariables(($"{EventStoreEnvVarPrefix}_GOSSIP_SEED", gossipSeed));
+		else
+			builder.AddKurrentEnvironmentVariables(($"{KurrentEnvVarPrefix}_GOSSIP_SEED", gossipSeed));
+		var config = builder.Build();
+
+		var ex = Assert.Throws<InvalidConfigurationException>(() =>
+			ClusterVNodeOptions.FromConfiguration(config));
+
+		Assert.Equal(
+			$"Failed to convert configuration value at '{KurrentPrefix}:GossipSeed' to type 'System.Net.EndPoint[]'. " + expectedError,
+			ex.Message);
+	}
+
+	[Theory]
+	[InlineData(true, "127.0.0.1.0", "An invalid IP address was specified.")]
+	[InlineData(false, "127.0.0.1.0", "An invalid IP address was specified.")]
+	public void reports_ip_address_errors(bool useEventStorePrefix, string nodeIp, string expectedError) {
+		var builder = new ConfigurationBuilder();
+		if (useEventStorePrefix)
+			builder.AddLegacyEventStoreEnvironmentVariables(($"{EventStoreEnvVarPrefix}_NODE_IP", nodeIp));
+		else
+			builder.AddKurrentEnvironmentVariables(($"{KurrentEnvVarPrefix}_NODE_IP", nodeIp));
+		var config = builder.Build();
+
+		var ex = Assert.Throws<InvalidConfigurationException>(() =>
+			ClusterVNodeOptions.FromConfiguration(config));
+
+		Assert.Equal(
+			$"Failed to convert configuration value at '{KurrentPrefix}:NodeIp' to type 'System.Net.IPAddress'. " + expectedError,
+			ex.Message);
+	}
+
+	[Theory]
+	[InlineData(true)]
+	[InlineData(false)]
+	public void can_set_node_ip(bool useEventStorePrefix) {
+		var builder = new ConfigurationBuilder();
+		if (useEventStorePrefix)
+			builder.AddLegacyEventStoreEnvironmentVariables(($"{EventStoreEnvVarPrefix}_NODE_IP", "192.168.0.1"));
+		else
+			builder.AddKurrentEnvironmentVariables(($"{KurrentEnvVarPrefix}_NODE_IP", "192.168.0.1"));
+		var config = builder.Build();
+
+		var options = ClusterVNodeOptions.FromConfiguration(config);
+
+		options.Interface.NodeIp.Should().Be(IPAddress.Parse("192.168.0.1"));
+	}
+
+	[Theory]
+	[InlineData(true)]
+	[InlineData(false)]
+	public void can_set_cluster_size_from_env_vars(bool useEventStorePrefix) {
+		var builder = new ConfigurationBuilder();
+		if (useEventStorePrefix)
+			builder.AddLegacyEventStoreEnvironmentVariables(($"{EventStoreEnvVarPrefix}_CLUSTER_SIZE", "23"));
+		else
+			builder.AddKurrentEnvironmentVariables(($"{KurrentEnvVarPrefix}_CLUSTER_SIZE", "23"));
+		var config = builder.Build();
+
+		var options = ClusterVNodeOptions.FromConfiguration(config);
+
+		options.Cluster.ClusterSize.Should().Be(23);
+	}
+
+	[Theory]
+	[InlineData(true)]
+	[InlineData(false)]
+	public void can_set_cluster_size_from_args(bool useEventStorePrefix) {
+		var builder = new ConfigurationBuilder();
+		if (useEventStorePrefix)
+			builder.AddLegacyEventStoreCommandLine($"--{EventStorePrefix}:CLUSTER-SIZE=23");
+		else
+			builder.AddKurrentCommandLine("--CLUSTER-SIZE=23");
+		var config = builder.Build();
+
+		var options = ClusterVNodeOptions.FromConfiguration(config);
+
+		options.Cluster.ClusterSize.Should().Be(23);
+	}
+
+	[Fact]
+	public void can_set_cluster_size_from_config_file() {
+		var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Configuration", "test.kurrentdb.conf");
+
+		var config = new ConfigurationBuilder()
+			.AddKurrentYamlConfigFile(path, optional: false)
+			.Build();
+
+		var options = ClusterVNodeOptions.FromConfiguration(config);
+
+		options.Cluster.ClusterSize.Should().Be(23);
+	}
+
+	[Theory]
+	[InlineData(true)]
+	[InlineData(false)]
+	public void can_set_log_level_from_env_vars(bool useEventStorePrefix) {
+		var builder = new ConfigurationBuilder();
+		if (useEventStorePrefix)
+			builder.AddLegacyEventStoreEnvironmentVariables(($"{EventStoreEnvVarPrefix}_LOG_LEVEL", LogLevel.Fatal.ToString()));
+		else
+			builder.AddKurrentEnvironmentVariables(($"{KurrentEnvVarPrefix}_LOG_LEVEL", LogLevel.Fatal.ToString()));
+		var config = builder.Build();
+
+		var options = ClusterVNodeOptions.FromConfiguration(config);
+
+		options.Logging.LogLevel.Should().Be(LogLevel.Fatal);
+	}
+
+	[Fact]
+	public void no_defaults_are_deprecated() {
+		var config = new ConfigurationBuilder()
+			.AddKurrentDefaultValues()
+			.Build();
+
+		var options = ClusterVNodeOptions.FromConfiguration(config);
+		options.GetDeprecationWarnings().Should().BeNullOrEmpty();
+	}
+
+	[Fact]
+	public void can_get_deprecation_warnings() {
+		var config = new ConfigurationBuilder()
+			.AddKurrentDefaultValues()
+			.AddLegacyEventStoreEnvironmentVariables(($"{EventStoreEnvVarPrefix}_ENABLE_HISTOGRAMS", "true"))
+			.AddKurrentEnvironmentVariables(($"{KurrentEnvVarPrefix}_ENABLE_ATOM_PUB_OVER_HTTP", "true"))
+			.Build();
+
+		var options = ClusterVNodeOptions.FromConfiguration(config);
+		options.GetDeprecationWarnings().Should().Be(
+			"The EnableHistograms setting has been deprecated as of version 24.10.0 and currently has no effect. Please contact Kurrent if this feature is of interest to you." +
+			Environment.NewLine +
+			"AtomPub over HTTP Interface has been deprecated as of version 20.6.0. It is recommended to use gRPC instead" +
+			Environment.NewLine);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterVNodeOptionsValidatorTests.cs b/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterVNodeOptionsValidatorTests.cs
new file mode 100644
index 00000000000..64f47b4be35
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Configuration/ClusterVNodeOptionsValidatorTests.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Common.Exceptions;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Configuration;
+
+// Some other tests are in ClusterNodeOptionsTests/when_building
+public class ClusterVNodeOptionsValidatorTests {
+	[Theory]
+	[InlineData(false, false, true)]
+	[InlineData(false, true, true)]
+	[InlineData(true, false, false)]
+	[InlineData(true, true, true)]
+	public void archiver_requires_read_only_replica(bool archiver, bool readOnlyReplica, bool expectedValid) {
+		// given
+		var options = new ClusterVNodeOptions {
+			Cluster = new() {
+				Archiver = archiver,
+				ClusterSize = 3,
+				ReadOnlyReplica = readOnlyReplica,
+			}
+		};
+
+		// when
+		void When() {
+			ClusterVNodeOptionsValidator.Validate(options);
+		}
+
+		// then
+		if (expectedValid) {
+			When();
+		} else {
+			Assert.Throws<InvalidConfigurationException>(When);
+		}
+	}
+
+	[Fact]
+	public void archiver_not_compatible_with_unsafe_ignore_hard_delete() {
+		// because the archive is not scavenged at the moment and so the tombstones will not be removed
+		var options = new ClusterVNodeOptions {
+			Cluster = new() {
+				Archiver = true,
+				ClusterSize = 3,
+				ReadOnlyReplica = true,
+			},
+			Database = new() {
+				UnsafeIgnoreHardDelete = true,
+			}
+		};
+
+		Assert.Throws<InvalidConfigurationException>(() => {
+			ClusterVNodeOptionsValidator.Validate(options);
+		});
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Configuration/KurrentConfigurationKeysTests.cs b/src/KurrentDB.Core.XUnit.Tests/Configuration/KurrentConfigurationKeysTests.cs
new file mode 100644
index 00000000000..c6abcc4e441
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Configuration/KurrentConfigurationKeysTests.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+// ReSharper disable CheckNamespace
+
+using FluentAssertions;
+using KurrentDB.Core.Configuration.Sources;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Configuration;
+
+public class KurrentConfigurationKeysTests {
+	[Theory]
+	[InlineData("KURRENTDB_StreamInfoCacheCapacity", "KurrentDB:StreamInfoCacheCapacity")]
+	[InlineData("KURRENTDB_STREAM_INFO_CACHE_CAPACITY", "KurrentDB:StreamInfoCacheCapacity")]
+	[InlineData("KURRENTDB__STREAM_INFO_CACHE_CAPACITY", "KurrentDB:StreamInfoCacheCapacity")]
+	[InlineData("KURRENTDB__CLUSTER__STREAM_INFO_CACHE_CAPACITY", "KurrentDB:Cluster:StreamInfoCacheCapacity")]
+	[InlineData("KURRENTDB__KEY_WITH_UNDERSCORES__ANOTHER_ONE", "KurrentDB:KeyWithUnderscores:AnotherOne")]
+	[InlineData("StreamInfoCacheCapacity", "KurrentDB:StreamInfoCacheCapacity")]
+	[InlineData("stream-info-cache-capacity", "KurrentDB:StreamInfoCacheCapacity")]
+	[InlineData("KurrentDB:Cluster:StreamInfoCacheCapacity", "KurrentDB:Cluster:StreamInfoCacheCapacity")]
+	[InlineData("GossipSeed", "KurrentDB:GossipSeed")]
+	[InlineData("KURRENTDB_GOSSIP_SEED", "KurrentDB:GossipSeed")]
+	[InlineData("KURRENTDB_GOSSIPSEED", "KurrentDB:GossipSeed")]
+	public void NormalizesKurrentKeys(string key, string normalizedKey) {
+		KurrentConfigurationKeys.Normalize(key).Should().Be(normalizedKey);
+	}
+
+	[Theory]
+	[InlineData("EVENTSTORE_StreamInfoCacheCapacity", "KurrentDB:StreamInfoCacheCapacity")]
+	[InlineData("EVENTSTORE_STREAM_INFO_CACHE_CAPACITY", "KurrentDB:StreamInfoCacheCapacity")]
+	[InlineData("EVENTSTORE__STREAM_INFO_CACHE_CAPACITY", "KurrentDB:StreamInfoCacheCapacity")]
+	[InlineData("EVENTSTORE__CLUSTER__STREAM_INFO_CACHE_CAPACITY", "KurrentDB:Cluster:StreamInfoCacheCapacity")]
+	[InlineData("EVENTSTORE__KEY_WITH_UNDERSCORES__ANOTHER_ONE", "KurrentDB:KeyWithUnderscores:AnotherOne")]
+	[InlineData("StreamInfoCacheCapacity", "KurrentDB:StreamInfoCacheCapacity")]
+	[InlineData("stream-info-cache-capacity", "KurrentDB:StreamInfoCacheCapacity")]
+	[InlineData("EventStore:Cluster:StreamInfoCacheCapacity", "KurrentDB:Cluster:StreamInfoCacheCapacity")]
+	[InlineData("GossipSeed", "KurrentDB:GossipSeed")]
+	[InlineData("EVENTSTORE_GOSSIP_SEED", "KurrentDB:GossipSeed")]
+	[InlineData("EVENTSTORE_GOSSIPSEED", "KurrentDB:GossipSeed")]
+	public void TransformsEventStoreEnvVars(string key, string normalizedKey) {
+		KurrentConfigurationKeys.Normalize(
+			KurrentConfigurationKeys.LegacyEventStorePrefix, KurrentConfigurationKeys.Prefix, key).Should().Be(normalizedKey);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/CommandLineConfigurationSourceTests.cs b/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/CommandLineConfigurationSourceTests.cs
new file mode 100644
index 00000000000..0533cc539df
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/CommandLineConfigurationSourceTests.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using FluentAssertions;
+using KurrentDB.Core.Configuration.Sources;
+using Microsoft.Extensions.Configuration;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Configuration.Sources;
+
+public class CommandLineConfigurationSourceTests {
+	[Theory]
+	[InlineData(new[] { "--stream_info_cache_capacity=99" }, "KurrentDB:StreamInfoCacheCapacity", "99")]
+	[InlineData(new[] { "--stream_info_cache_capacity", "99" }, "KurrentDB:StreamInfoCacheCapacity", "99")]
+	[InlineData(new[] { "--stream-info-cache-capacity=99" }, "KurrentDB:StreamInfoCacheCapacity", "99")]
+	[InlineData(new[] { "--stream-info-cache-capacity", "99" }, "KurrentDB:StreamInfoCacheCapacity", "99")]
+	[InlineData(new[] { "--KurrentDB:StreamInfoCacheCapacity=99" }, "KurrentDB:StreamInfoCacheCapacity", "99")]
+	[InlineData(new[] { "--KurrentDB:StreamInfoCacheCapacity", "99" }, "KurrentDB:StreamInfoCacheCapacity", "99")]
+	[InlineData(new[] { "--KurrentDB:Stream-Info-Cache-Capacity=99" }, "KurrentDB:StreamInfoCacheCapacity", "99")]
+	[InlineData(new[] { "--KurrentDB:Stream-Info-Cache-Capacity", "99" }, "KurrentDB:StreamInfoCacheCapacity", "99")]
+	[InlineData(new[] { "--KurrentDB:Stream_Info_Cache_Capacity=99" }, "KurrentDB:StreamInfoCacheCapacity", "99")]
+	[InlineData(new[] { "--KurrentDB:Stream_Info_Cache_Capacity", "99" }, "KurrentDB:StreamInfoCacheCapacity", "99")]
+	[InlineData(new[] { "--Kurrentdb:Stream_Info_Cache_Capacity=99" }, "KurrentDB:StreamInfoCacheCapacity", "99")]
+	public void AddsArguments(string[] arguments, string normalizedKey, string expectedValue) {
+		// Act
+		var configuration = new ConfigurationBuilder()
+			.AddKurrentCommandLine(arguments)
+			.Build();
+
+		// Assert
+		configuration.GetValue<string>(normalizedKey).Should().Be(expectedValue);
+	}
+
+	static IConfiguration BuildConfiguration(params string[] args) =>
+		new ConfigurationBuilder()
+			.AddKurrentCommandLine(args)
+			.Build()
+			.GetSection(KurrentConfigurationKeys.Prefix);
+
+	[Fact]
+	public void normalize_keys() {
+		var configuration = BuildConfiguration("--cluster-size", "3", "--log", "/tmp/kurrentdb/logs");
+		Assert.Equal(3, configuration.GetValue<int>("ClusterSize"));
+		Assert.Equal("/tmp/kurrentdb/logs", configuration.GetValue<string>("Log"));
+	}
+
+	[Fact]
+	public void normalize_keys_boolean_plus_sign() {
+		var configuration = BuildConfiguration("--whatever+");
+		Assert.Equal("true", configuration.GetValue<string>("Whatever"));
+	}
+
+	[Fact]
+	public void normalize_keys_boolean_negative_sign() {
+		var configuration = BuildConfiguration("--whatever-");
+		Assert.Equal("false", configuration.GetValue<string>("Whatever"));
+	}
+
+	[Fact]
+	public void normalize_keys_boolean_no_value() {
+		var configuration = BuildConfiguration("--whatever");
+		Assert.Equal("true", configuration.GetValue<string>("Whatever"));
+	}
+
+	[Fact]
+	public void normalize_keys_equals() {
+		var configuration = BuildConfiguration("--cluster-size=3");
+		Assert.Equal(3, configuration.GetValue<int>("ClusterSize"));
+	}
+
+	[Fact]
+	public void normalize_keys_one_dash() {
+		var configuration = BuildConfiguration("-cluster-size=3");
+		Assert.Equal(3, configuration.GetValue<int>("ClusterSize"));
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/DefaultValuesConfigurationSourceTests.cs b/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/DefaultValuesConfigurationSourceTests.cs
new file mode 100644
index 00000000000..6fc8476a6ba
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/DefaultValuesConfigurationSourceTests.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using FluentAssertions;
+using KurrentDB.Core.Configuration.Sources;
+using Microsoft.Extensions.Configuration;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Configuration.Sources;
+
+public class DefaultValuesConfigurationSourceTests {
+	[Fact]
+	public void Adds() {
+		// Arrange
+		var defaults = ClusterVNodeOptions.DefaultValues.OrderBy(x => x.Key).ToList();
+
+		// Act
+		var configuration = new ConfigurationBuilder()
+			.AddKurrentDefaultValues()
+			.Build()
+			.GetSection(KurrentConfigurationKeys.Prefix);
+
+		// Assert
+		foreach (var (key, expectedValue) in defaults) {
+			configuration.GetValue<object>(key)
+				.Should()
+				.BeEquivalentTo(expectedValue?.ToString(), $"because {key} should be {expectedValue}");
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/EnvironmentVariablesConfigurationSourceTests.cs b/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/EnvironmentVariablesConfigurationSourceTests.cs
new file mode 100644
index 00000000000..431a92e3d84
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/EnvironmentVariablesConfigurationSourceTests.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using FluentAssertions;
+using KurrentDB.Core.Configuration.Sources;
+using Microsoft.Extensions.Configuration;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Configuration.Sources;
+
+public class KurrentDbEnvironmentVariablesSourceTests {
+	[Theory]
+	[InlineData("KURRENTDB_STREAM_INFO_CACHE_CAPACITY", "KurrentDB:StreamInfoCacheCapacity")]
+	[InlineData("KURRENTDB__STREAM_INFO_CACHE_CAPACITY", "KurrentDB:StreamInfoCacheCapacity")]
+	public void AddsKurrentEnvVars(string key, string normalizedKey) {
+		// Arrange
+		var environment = new Dictionary<string, string> { { key, key } };
+
+		// Act
+		var configuration = new ConfigurationBuilder()
+			.AddKurrentEnvironmentVariables(environment)
+			.Build();
+
+		// Assert
+		configuration
+			.AsEnumerable()
+			.Any(x => x.Key == normalizedKey)
+			.Should().BeTrue();
+	}
+
+	[Theory]
+	[InlineData("StreamInfoCacheCapacity")]
+	[InlineData("stream-info-cache-capacity")]
+	[InlineData("KurrentDB:Cluster:StreamInfoCacheCapacity")]
+	[InlineData("UNSUPPORTED_KURRENTDB_TCP_API_ENABLED")]
+	public void IgnoresOtherEnvVars(string key) {
+		// Arrange
+		var environment = new Dictionary<string, string> { { key, key } };
+
+		// Act
+		var configuration = new ConfigurationBuilder()
+			.AddKurrentEnvironmentVariables(environment)
+			.Build();
+
+		// Assert
+		configuration.AsEnumerable()
+			.Any().Should().BeFalse();
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/JsonFileConfigurationTests.cs b/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/JsonFileConfigurationTests.cs
new file mode 100644
index 00000000000..e71ba2b02d7
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/JsonFileConfigurationTests.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using FluentAssertions;
+using KurrentDB.Core.Configuration.Sources;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.FileProviders;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Configuration.Sources;
+
+public class JsonFileConfigurationTests {
+	[Fact]
+	public void LoadsConfigFromKurrentJsonFile() {
+		// Arrange
+		var fileName = "test.kurrentdb.json";
+		var filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Configuration", fileName);
+		var directory = Path.GetDirectoryName(filePath);
+		Assert.NotNull(directory);
+
+		// Act
+		var config = new ConfigurationBuilder()
+			.AddJsonFile(config => {
+				config.FileProvider = new PhysicalFileProvider(directory) {
+					UseActivePolling = false,
+					UsePollingFileWatcher = false
+				};
+				config.OnLoadException = _ =>
+					Assert.Fail($"Could not find test config file '{fileName}' in '{directory}'");
+				config.Path = fileName;
+			}).Build();
+
+		// Assert
+		config.GetValue<bool>($"{KurrentConfigurationKeys.Prefix}:AutoScavenge:Enabled").Should().Be(false);
+		config.GetValue<string>($"{KurrentConfigurationKeys.Prefix}:Licensing:LicenseKey").Should().Be("valid");
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/Legacy/CommandLineConfigurationSourceTests.cs b/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/Legacy/CommandLineConfigurationSourceTests.cs
new file mode 100644
index 00000000000..9ba01c6a7cf
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/Legacy/CommandLineConfigurationSourceTests.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using FluentAssertions;
+using KurrentDB.Core.Configuration.Sources;
+using Microsoft.Extensions.Configuration;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Configuration.Sources.Legacy;
+
+public class CommandLineConfigurationSourceTests {
+	[Theory]
+	[InlineData(new[] { "--stream_info_cache_capacity=99" }, "KurrentDB:StreamInfoCacheCapacity", "")]
+	[InlineData(new[] { "--stream_info_cache_capacity", "99" }, "KurrentDB:StreamInfoCacheCapacity", "")]
+	[InlineData(new[] { "--stream-info-cache-capacity=99" }, "KurrentDB:StreamInfoCacheCapacity", "")]
+	[InlineData(new[] { "--stream-info-cache-capacity", "99" }, "KurrentDB:StreamInfoCacheCapacity", "")]
+	[InlineData(new[] { "--EventStore:StreamInfoCacheCapacity=99" }, "KurrentDB:StreamInfoCacheCapacity", "99")]
+	[InlineData(new[] { "--EventStore:StreamInfoCacheCapacity", "99" }, "KurrentDB:StreamInfoCacheCapacity", "99")]
+	[InlineData(new[] { "--EventStore:Stream-Info-Cache-Capacity=99" }, "KurrentDB:StreamInfoCacheCapacity", "99")]
+	[InlineData(new[] { "--EventStore:Stream-Info-Cache-Capacity", "99" }, "KurrentDB:StreamInfoCacheCapacity", "99")]
+	[InlineData(new[] { "--EventStore:Stream_Info_Cache_Capacity=99" }, "KurrentDB:StreamInfoCacheCapacity", "99")]
+	[InlineData(new[] { "--EventStore:Stream_Info_Cache_Capacity", "99" }, "KurrentDB:StreamInfoCacheCapacity", "99")]
+	public void AddsEventStoreArguments(string[] arguments, string normalizedKey, string expectedValue) {
+		// Act
+		var configuration = new ConfigurationBuilder()
+			.AddLegacyEventStoreCommandLine(arguments)
+			.Build();
+
+		// Assert
+		if (string.IsNullOrEmpty(expectedValue)) {
+			configuration.GetValue<string>(normalizedKey).Should().BeNull();
+		} else {
+			configuration.GetValue<string>(normalizedKey).Should().Be(expectedValue);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/Legacy/EnvironmentVariablesSourceTests.cs b/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/Legacy/EnvironmentVariablesSourceTests.cs
new file mode 100644
index 00000000000..0b3821e8e7e
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/Legacy/EnvironmentVariablesSourceTests.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using FluentAssertions;
+using KurrentDB.Core.Configuration.Sources;
+using Microsoft.Extensions.Configuration;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Configuration.Sources.Legacy;
+
+public class EnvironmentVariablesSourceTests {
+	[Theory]
+	[InlineData("EVENTSTORE_STREAM_INFO_CACHE_CAPACITY", "KurrentDB:StreamInfoCacheCapacity")]
+	public void TransformsEventStoreEnvVars(string key, string normalizedKey) {
+		// Arrange
+		var environment = new Dictionary<string, string> { { key, key } };
+
+		// Act
+		var configuration = new ConfigurationBuilder()
+			.AddLegacyEventStoreEnvironmentVariables(environment)
+			.Build();
+
+		// Assert
+		configuration
+			.AsEnumerable()
+			.Any(x => x.Key == normalizedKey)
+			.Should().BeTrue();
+	}
+
+	[Theory]
+	[InlineData("StreamInfoCacheCapacity")]
+	[InlineData("stream-info-cache-capacity")]
+	[InlineData("EventStore:Cluster:StreamInfoCacheCapacity")]
+	[InlineData("UNSUPPORTED_EVENTSTORE_TCP_API_ENABLED")]
+	public void IgnoresOtherEnvVars(string key) {
+		// Arrange
+		var environment = new Dictionary<string, string> { { key, key } };
+
+		// Act
+		var configuration = new ConfigurationBuilder()
+			.AddLegacyEventStoreEnvironmentVariables(environment)
+			.Build();
+
+		// Assert
+		configuration.AsEnumerable()
+			.Any().Should().BeFalse();
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/Legacy/EventStoreDefaultLocationsSourceTests.cs b/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/Legacy/EventStoreDefaultLocationsSourceTests.cs
new file mode 100644
index 00000000000..5412d6dfa8a
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/Legacy/EventStoreDefaultLocationsSourceTests.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System.Collections.Generic;
+using System.IO.Abstractions.TestingHelpers;
+using System.Linq;
+using FluentAssertions;
+using KurrentDB.Core.Configuration.Sources;
+using Microsoft.Extensions.Configuration;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Configuration.Sources.Legacy;
+
+public class EventStoreDefaultLocationsSourceTests {
+	[Fact]
+	public void ContainsNoConfigurationIfNoFilesOrDirectoriesAreFound() {
+		// Arrange
+		var fileSystem = new MockFileSystem(new Dictionary<string, MockFileData>());
+		// Act
+		var configuration = new ConfigurationBuilder()
+			.AddLegacyDefaultLocations(LocationOptionWithLegacyDefault.SupportedLegacyLocations, fileSystem)
+			.Build();
+
+		// Assert
+		configuration.AsEnumerable().Should().BeEmpty();
+	}
+
+	[Theory]
+	[InlineData(new[] { "kurrentdb.conf" }, null)]
+	[InlineData(new[] { "kurrentdb.conf", "eventstore.conf" }, null)]
+	[InlineData(new[] { "eventstore.conf" }, "eventstore.conf")]
+	[InlineData(new string[] { }, null)]
+	public void ProvidesDefaultConfigPath(string[] existingFiles, string? expected) {
+		// Arrange
+		var mockFiles =
+			existingFiles.ToDictionary(x => x, _ => new MockFileData("config"));
+		var fileSystem = new MockFileSystem(mockFiles);
+
+		// Act
+		var configuration = new ConfigurationBuilder()
+			.AddLegacyDefaultLocations([new LocationOptionWithLegacyDefault(
+					$"{KurrentConfigurationKeys.Prefix}:Config",
+					"kurrentdb.conf",
+					"eventstore.conf",
+					true)], fileSystem)
+			.Build();
+
+		// Assert
+		var configPath = configuration.GetValue<string>($"{KurrentConfigurationKeys.Prefix}:Config");
+		configPath.Should().Be(expected);
+	}
+
+	[Theory]
+	[InlineData(new[] { "/kurrentdb_data/" }, null)]
+	[InlineData(new[] { "/kurrentdb_data/", "/eventstore_data/" }, null)]
+	[InlineData(new[] { "/eventstore_data/" }, "/eventstore_data/")]
+	[InlineData(new string[] { }, null)]
+	public void ProvidesDefaultDataPath(string[] existingDirs, string? expected) {
+		// Arrange
+		var fileSystem = new MockFileSystem();
+		foreach (var dir in existingDirs) {
+			fileSystem.AddDirectory(dir);
+		}
+
+		// Act
+		var configuration = new ConfigurationBuilder()
+			.AddLegacyDefaultLocations([new LocationOptionWithLegacyDefault(
+				$"{KurrentConfigurationKeys.Prefix}:Db",
+				"/kurrentdb_data/",
+				"/eventstore_data/",
+				false)], fileSystem)
+			.Build();
+
+		// Assert
+		var configPath = configuration.GetValue<string>($"{KurrentConfigurationKeys.Prefix}:Db");
+		configPath.Should().Be(expected);
+	}
+
+	[Theory]
+	[InlineData(new[] { "/kurrentdb_log/" }, null)]
+	[InlineData(new[] { "/kurrentdb_log/", "/eventstore_log/" }, null)]
+	[InlineData(new[] { "/eventstore_log/" }, "/eventstore_log/")]
+	[InlineData(new string[] { }, null)]
+	public void ProvidesDefaultLogPath(string[] existingDirs, string? expected) {
+		// Arrange
+		var fileSystem = new MockFileSystem();
+		foreach (var dir in existingDirs) {
+			fileSystem.AddDirectory(dir);
+		}
+
+		// Act
+		var configuration = new ConfigurationBuilder()
+			.AddLegacyDefaultLocations([new LocationOptionWithLegacyDefault(
+				$"{KurrentConfigurationKeys.Prefix}:Log",
+				"/kurrentdb_log/",
+				"/eventstore_log/",
+				false)], fileSystem)
+			.Build();
+
+		// Assert
+		var configPath = configuration.GetValue<string>($"{KurrentConfigurationKeys.Prefix}:Log");
+		configPath.Should().Be(expected);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/Legacy/JsonFileConfigurationTests.cs b/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/Legacy/JsonFileConfigurationTests.cs
new file mode 100644
index 00000000000..c08d7b81813
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Configuration/Sources/Legacy/JsonFileConfigurationTests.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using FluentAssertions;
+using KurrentDB.Core.Configuration.Sources;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.FileProviders;
+using Xunit;
+using Assert = NUnit.Framework.Assert;
+
+namespace KurrentDB.Core.XUnit.Tests.Configuration.Sources.Legacy;
+
+public class JsonFileConfigurationTests {
+	public const string KurrentConfigFile = "test.kurrentdb.json";
+	public const string EventStoreConfigFile = "test.eventstore.json";
+
+	private static string GetDirectoryForConfigFile(string fileName) {
+		var filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Configuration", fileName);
+		var directory = Path.GetDirectoryName(filePath);
+		Assert.NotNull(directory);
+		return directory;
+	}
+
+	[Fact]
+	public void LoadsConfigFromEventStoreJsonFile() {
+		// Arrange
+		var directory = GetDirectoryForConfigFile(EventStoreConfigFile);
+
+		// Act
+		var config = new ConfigurationBuilder()
+			.AddLegacyEventStoreJsonFile(config => {
+				config.FileProvider = new PhysicalFileProvider(directory) {
+					UseActivePolling = false,
+					UsePollingFileWatcher = false
+				};
+				config.OnLoadException = _ =>
+					Assert.Fail($"Could not find test config file '{EventStoreConfigFile}' in '{directory}'");
+				config.Path = EventStoreConfigFile;
+			}).Build();
+
+		// Assert
+		config.GetValue<bool>($"{KurrentConfigurationKeys.Prefix}:AutoScavenge:Enabled").Should().Be(true);
+		config.GetValue<bool>($"{KurrentConfigurationKeys.Prefix}:Connectors:Enabled").Should().Be(false);
+		config.GetValue<string>($"{KurrentConfigurationKeys.Prefix}:Licensing:LicenseKey").Should().Be("invalid");
+	}
+
+	[Fact]
+	public void KurrentConfigOverridesEventStoreConfig() {
+		// Arrange
+		var eventStoreDirectory = GetDirectoryForConfigFile(EventStoreConfigFile);
+		var kurrentDirectory = GetDirectoryForConfigFile(KurrentConfigFile);
+
+		// Act
+		var config = new ConfigurationBuilder()
+			.AddLegacyEventStoreJsonFile(config => {
+				config.FileProvider = new PhysicalFileProvider(eventStoreDirectory) {
+					UseActivePolling = false,
+					UsePollingFileWatcher = false
+				};
+				config.OnLoadException = _ =>
+					Assert.Fail($"Could not find test config file '{EventStoreConfigFile}' in '{eventStoreDirectory}'");
+				config.Path = EventStoreConfigFile;
+			}).AddJsonFile(config => {
+				config.FileProvider = new PhysicalFileProvider(kurrentDirectory) {
+					UseActivePolling = false,
+					UsePollingFileWatcher = false
+				};
+				config.OnLoadException = _ =>
+					Assert.Fail($"Could not find test config file '{KurrentConfigFile}' in '{kurrentDirectory}'");
+				config.Path = KurrentConfigFile;
+			}).Build();
+
+		// Assert
+		config.GetValue<bool>($"{KurrentConfigurationKeys.Prefix}:AutoScavenge:Enabled").Should().Be(false);
+		config.GetValue<string>($"{KurrentConfigurationKeys.Prefix}:Licensing:LicenseKey").Should().Be("valid");
+		config.GetValue<bool>($"{KurrentConfigurationKeys.Prefix}:Connectors:Enabled").Should().Be(false);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Configuration/test.eventstore.json b/src/KurrentDB.Core.XUnit.Tests/Configuration/test.eventstore.json
new file mode 100644
index 00000000000..8dcf0bff037
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Configuration/test.eventstore.json
@@ -0,0 +1,13 @@
+{
+	"EventStore": {
+		"Connectors": {
+			"Enabled": false
+		},
+		"AutoScavenge": {
+			"Enabled": true
+		},
+		"Licensing": {
+			"LicenseKey": "invalid"
+		}
+	}
+}
diff --git a/src/EventStore.Core.XUnit.Tests/Configuration/test.eventstore.conf b/src/KurrentDB.Core.XUnit.Tests/Configuration/test.kurrentdb.conf
similarity index 100%
rename from src/EventStore.Core.XUnit.Tests/Configuration/test.eventstore.conf
rename to src/KurrentDB.Core.XUnit.Tests/Configuration/test.kurrentdb.conf
diff --git a/src/KurrentDB.Core.XUnit.Tests/Configuration/test.kurrentdb.json b/src/KurrentDB.Core.XUnit.Tests/Configuration/test.kurrentdb.json
new file mode 100644
index 00000000000..003fd6030b3
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Configuration/test.kurrentdb.json
@@ -0,0 +1,10 @@
+{
+	"KurrentDB": {
+		"AutoScavenge": {
+			"Enabled": false
+		},
+		"Licensing": {
+			"LicenseKey": "valid"
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/DataStructures/ProbabilisticFilter/AlignedMemoryTests.cs b/src/KurrentDB.Core.XUnit.Tests/DataStructures/ProbabilisticFilter/AlignedMemoryTests.cs
new file mode 100644
index 00000000000..bfd4e49a92f
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/DataStructures/ProbabilisticFilter/AlignedMemoryTests.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.DataStructures.ProbabilisticFilter;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.DataStructures.ProbabilisticFilter;
+
+public unsafe class AlignedMemoryTests {
+	[Theory]
+	[InlineData(1, 1)]
+	[InlineData(3, 8)]
+	[InlineData(8, 3)]
+	[InlineData(30_000, 8 * 1024)]
+	[InlineData(int.MaxValue + 8L, 8 * 1024)]
+	public void Works(long size, int alignTo) {
+		using var sut = new AlignedMemory(size, alignTo);
+
+		Assert.True((long)sut.Pointer % alignTo == 0);
+
+		if (size <= int.MaxValue) {
+			Assert.Equal(size, sut.AsSpan().Length);
+			sut.AsSpan().Clear(); // can write to the span
+		}
+	}
+
+	[Fact]
+	public void finalizer_does_not_crash_process_when_oom() {
+		Assert.Throws<OutOfMemoryException>(() => new AlignedMemory(1_000_000_000_000, 1));
+		GC.Collect();
+		GC.WaitForPendingFinalizers();
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/DataStructures/ProbabilisticFilter/BloomFilterAccessorTests.cs b/src/KurrentDB.Core.XUnit.Tests/DataStructures/ProbabilisticFilter/BloomFilterAccessorTests.cs
new file mode 100644
index 00000000000..e9273a71c48
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/DataStructures/ProbabilisticFilter/BloomFilterAccessorTests.cs
@@ -0,0 +1,185 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.DataStructures.ProbabilisticFilter;
+using Serilog;
+using Xunit;
+
+#pragma warning disable xUnit1026 // Theory methods should use all of their parameters
+namespace KurrentDB.Core.XUnit.Tests.DataStructures.ProbabilisticFilter;
+
+public unsafe class BloomFilterAccessorTests {
+	BloomFilterAccessor GenSut(long logicalFilterSize, BloomFilterAccessor.OnPageDirty onPageDirty = null) {
+		return new BloomFilterAccessor(
+			logicalFilterSize: logicalFilterSize,
+			cacheLineSize: BloomFilterIntegrity.CacheLineSize,
+			hashSize: BloomFilterIntegrity.HashSize,
+			pageSize: BloomFilterIntegrity.PageSize,
+			onPageDirty: onPageDirty ?? (pageNumber => { }),
+			log: Log.Logger);
+	}
+
+	[Fact]
+	public void CorrectProperties() {
+		var sut = GenSut(10 * 1024);
+		Assert.Equal(BloomFilterIntegrity.CacheLineSize, sut.CacheLineSize);
+		Assert.Equal(BloomFilterIntegrity.HashSize, sut.HashSize);
+		Assert.Equal(BloomFilterIntegrity.PageSize, sut.PageSize);
+	}
+
+	[Theory]
+	[InlineData(10_000)]
+	[InlineData(10_001)]
+	[InlineData(256_000_000)]
+	public void CalculatesLogicalSize(int size) {
+		var sut = GenSut(size);
+
+		Assert.Equal(size, sut.LogicalFilterSize);
+		Assert.Equal(size * 8, sut.LogicalFilterSizeBits);
+	}
+
+	[Theory]
+	// we have a 64 bytes in the file for every 60 bytes of logical filter.
+	// plus 64 bytes for the header
+	// and another 64 bytes since it hits the boundary (unnecessary but change would be breaking)
+	[InlineData(60 * 500, 64 * 500 + 64 + 64, "")]
+	[InlineData(60 * 500 - 1, 64 * 500 + 64, "one less byte would need one less cache line")]
+	[InlineData(60 * 500 + 59, 64 * 500 + 64 + 64, "adding 59 more bytes still fits")]
+	[InlineData(60 * 500 + 60, 64 * 500 + 64 + 64 + 64, "but a 60th byte requires an extra cache line")]
+	public void CalculatesFileSize(int size, int expected, string detail) {
+		var sut = GenSut(size);
+		Assert.Equal(expected, sut.FileSize);
+		Assert.True(sut.FileSize % 64 == 0);
+		Assert.Equal(expected / 64, sut.NumCacheLines);
+	}
+
+	// we don't mind how many pages there are (within reason) as long as there are enough
+	[Fact]
+	public void CanGetPageForLastBit() {
+		for (int size = 10_000; size < 40_000; size++) {
+			var sut = GenSut(size);
+			var lastBit = size * 8 - 1;
+			var lastByte = sut.GetBytePositionInFile(lastBit);
+			var pageOfLastBit = sut.GetPageNumber(lastByte);
+			Assert.True(lastByte < sut.FileSize);
+			Assert.True(pageOfLastBit < sut.NumPages);
+			Assert.True(pageOfLastBit >= sut.NumPages - 2);
+		}
+	}
+
+	[Fact]
+	public void CalculatesBytePositionInFile() {
+		var sut = GenSut(10_000);
+		Assert.Equal(64, sut.GetBytePositionInFile(0));
+		Assert.Equal(64, sut.GetBytePositionInFile(1));
+		Assert.Equal(64, sut.GetBytePositionInFile(7));
+		Assert.Equal(65, sut.GetBytePositionInFile(8));
+		// jumps over the 4 bytes for the hash
+		Assert.Equal(64 + 59, sut.GetBytePositionInFile(60 * 8 - 1));
+		Assert.Equal(64 + 64, sut.GetBytePositionInFile(60 * 8));
+	}
+
+	[Fact]
+	public void CalculatesPagePositionInFile() {
+		var sut = GenSut(10_000);
+		var expectedFirstPageSize = 8 * 1024 - 64;
+		var expectedLastPageSize = 2560;
+		Assert.Equal((64, expectedFirstPageSize), sut.GetPagePositionInFile(0));
+		Assert.Equal((8 * 1024, expectedLastPageSize), sut.GetPagePositionInFile(1));
+		Assert.Equal(sut.FileSize, 64 + expectedFirstPageSize + expectedLastPageSize);
+		Assert.Throws<ArgumentOutOfRangeException>(() => sut.GetPagePositionInFile(2));
+	}
+
+	[Fact]
+	public void CalculatesPagePositionInFileLarge() {
+		var sut = GenSut(4_000_000_000);
+		Assert.Equal((64, 8 * 1024 - 64), sut.GetPagePositionInFile(0));
+		Assert.Equal((4_266_663_936, 2816), sut.GetPagePositionInFile(520_833));
+	}
+
+	[Fact]
+	public void CalculatesPageNumber() {
+		var sut = GenSut(10_000);
+		Assert.Equal(0, sut.GetPageNumber(0));
+		Assert.Equal(0, sut.GetPageNumber(8 * 1024 - 1));
+		Assert.Equal(1, sut.GetPageNumber(8 * 1024));
+		Assert.Equal(1, sut.GetPageNumber(sut.FileSize));
+	}
+
+	[Fact]
+	public void CanSetAndTestBits() {
+		var dirtyPage = -1L;
+		var sut = GenSut(10_000, pageNumber => dirtyPage = pageNumber);
+		using var mem = new AlignedMemory(sut.FileSize, 64);
+		sut.Pointer = mem.Pointer;
+		sut.FillWithZeros();
+
+		Assert.False(sut.IsBitSet(0));
+		sut.SetBit(0);
+		Assert.True(sut.IsBitSet(0));
+		Assert.False(sut.IsBitSet(1));
+		Assert.Equal(0, dirtyPage);
+	}
+
+	[Fact]
+	public void CanSetAndTestBitsLargeFile() {
+		var dirtyPage = -1L;
+		var sut = GenSut(4_000_000_000, pageNumber => dirtyPage = pageNumber);
+		using var mem = new AlignedMemory(sut.FileSize, 64);
+		sut.Pointer = mem.Pointer;
+
+		sut.SetBit(0);
+		Assert.True(sut.IsBitSet(0));
+		Assert.Equal(0, dirtyPage);
+
+		sut.SetBit(4_000_000_000L * 8);
+		Assert.True(sut.IsBitSet(4_000_000_000L * 8));
+		Assert.Equal(520_833, dirtyPage);
+	}
+
+	[Fact]
+	public void CanVerifySuccessfully() {
+		var sut = GenSut(10_000);
+		using var mem = new AlignedMemory(sut.FileSize, 64);
+		sut.Pointer = mem.Pointer;
+		sut.FillWithZeros();
+
+		sut.SetBit(0);
+		sut.Verify(0, 0);
+	}
+
+	[Fact]
+	public void CanFailToVerify() {
+		var sut = GenSut(10_000);
+		using var mem = new AlignedMemory(sut.FileSize, 64);
+		sut.Pointer = mem.Pointer;
+		sut.FillWithZeros();
+
+		ref var b = ref sut.ReadBytes(bytePositionInFile: 64, count: 1)[0];
+		Assert.False(b.IsBitSet(0));
+		sut.SetBit(0); // set the bit through the filter
+		Assert.True(b.IsBitSet(0)); // affected our reference
+
+		sut.Verify(0, 0);
+
+		b = b.SetBit(2); // setting the bit directly not through the accessor
+		b = b.SetBit(3);
+
+		// corruption doesn't meet 5% threshold
+		sut.Verify(corruptionRebuildCount: 0, corruptionThreshold: 5);
+
+		Assert.Throws<CorruptedHashException>(() => {
+			// corruption does meet 0% threshold
+			sut.Verify(0, 0);
+		});
+
+	}
+
+	[Fact]
+	public void ComplainsAboutUnalignedPointer() {
+		var sut = GenSut(10_000);
+		var ex = Assert.Throws<InvalidOperationException>(() => sut.Pointer = (byte*)123);
+		Assert.Equal("Pointer 123 is not aligned to a cacheline (64)", ex.Message);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/DataStructures/ProbabilisticFilter/PersistenceStrategyTests.cs b/src/KurrentDB.Core.XUnit.Tests/DataStructures/ProbabilisticFilter/PersistenceStrategyTests.cs
new file mode 100644
index 00000000000..2145acfc01d
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/DataStructures/ProbabilisticFilter/PersistenceStrategyTests.cs
@@ -0,0 +1,93 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.DataStructures.ProbabilisticFilter;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.DataStructures.ProbabilisticFilter;
+
+public abstract class PersistenceStrategyTests : DirectoryPerTest<PersistenceStrategyTests> {
+	protected abstract IPersistenceStrategy GenSut(
+		long size, bool create, string fileName);
+
+	protected IPersistenceStrategy CreateSut(long size, string fileName = "thefilter") {
+		var sut = GenSut(size, create: true, fileName);
+		sut.Init();
+		sut.WriteHeader(new Header { NumBits = size * 8, Version = Header.CurrentVersion });
+		return sut;
+	}
+
+	protected IPersistenceStrategy OpenSut(long size, string fileName = "thefilter") {
+		var sut = GenSut(size, create: false, fileName);
+		sut.Init();
+		var header = sut.ReadHeader();
+		Assert.Equal(size * 8, header.NumBits);
+		return sut;
+	}
+
+	[Fact]
+	public void AfterInitializationIsFilledWithZeroes() {
+		using (var sut = CreateSut(10_000)) {
+			for (var bitPosition = 0; bitPosition < 10_000 * 8; bitPosition++) {
+				Assert.False(sut.DataAccessor.IsBitSet(bitPosition));
+			}
+
+			sut.Flush();
+		}
+
+		// and after reopening
+		using (var sut = OpenSut(10_000)) {
+			for (var bitPosition = 0; bitPosition < 10_000 * 8; bitPosition++) {
+				Assert.False(sut.DataAccessor.IsBitSet(bitPosition));
+			}
+		}
+	}
+
+	[Fact]
+	public void FlushesEntireLogicalFilter() {
+		using (var sut = CreateSut(10_000)) {
+			for (var bitPosition = 0; bitPosition < 10_000 * 8; bitPosition++) {
+				Assert.False(sut.DataAccessor.IsBitSet(bitPosition));
+				sut.DataAccessor.SetBit(bitPosition);
+			}
+
+			sut.Flush();
+		}
+
+		// and after reopening
+		using (var sut = OpenSut(10_000)) {
+			for (var bitPosition = 0; bitPosition < 10_000 * 8; bitPosition++) {
+				Assert.True(sut.DataAccessor.IsBitSet(bitPosition));
+			}
+		}
+	}
+
+	public class MemoryMappedFilePersistenceTests : PersistenceStrategyTests {
+		protected override IPersistenceStrategy GenSut(
+			long size, bool create, string fileName) {
+
+			return new MemoryMappedFilePersistence(
+				size, Fixture.GetFilePathFor(fileName), create);
+		}
+	}
+
+	public class FileStreamFilePersistenceTests : PersistenceStrategyTests {
+		protected override FileStreamPersistence GenSut(
+			long size, bool create, string fileName) {
+
+			return new FileStreamPersistence(
+				size, Fixture.GetFilePathFor(fileName), create);
+		}
+
+		[Theory]
+		[InlineData(10_000, 96)]
+		[InlineData(256_000_000, 96)]
+		[InlineData(4_000_000_000, 1120, Skip = "big")]
+		public void CalculatesIntendedFlushSize(long size, long expectedFlushBatchSize) {
+			var sut = GenSut(size, create: true, "thefilter");
+			sut.Init();
+			Assert.Equal(128, sut.FlushBatchDelay);
+			Assert.Equal(expectedFlushBatchSize, sut.FlushBatchSize);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/DirectoryFixture.cs b/src/KurrentDB.Core.XUnit.Tests/DirectoryFixture.cs
new file mode 100644
index 00000000000..968c983aa3e
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/DirectoryFixture.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests;
+
+public class DirectoryFixture<T> : IAsyncLifetime {
+	public string Directory;
+
+	public DirectoryFixture() {
+		var typeName = typeof(T).Name.Length > 30 ? typeof(T).Name.Substring(0, 30) : typeof(T).Name;
+		Directory = Path.Combine(Path.GetTempPath(), string.Format("ESX-{0}-{1}", Guid.NewGuid(), typeName));
+		System.IO.Directory.CreateDirectory(Directory);
+	}
+
+	~DirectoryFixture() {
+		DirectoryDeleter.TryForceDeleteDirectoryAsync(Directory).Wait();
+	}
+
+	public string GetTempFilePath() {
+		return Path.Combine(Directory, string.Format("{0}-{1}", Guid.NewGuid(), typeof(T).FullName));
+	}
+
+	public string GetFilePathFor(string fileName) {
+		return Path.Combine(Directory, fileName);
+	}
+
+	public Task InitializeAsync() {
+		return Task.CompletedTask;
+	}
+
+	public async Task DisposeAsync() {
+		await DirectoryDeleter.TryForceDeleteDirectoryAsync(Directory);
+#pragma warning disable CA1816 // Dispose methods should call SuppressFinalize
+		GC.SuppressFinalize(this);
+#pragma warning restore CA1816 // Dispose methods should call SuppressFinalize
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/DirectoryPerTest.cs b/src/KurrentDB.Core.XUnit.Tests/DirectoryPerTest.cs
new file mode 100644
index 00000000000..8ce4be3e034
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/DirectoryPerTest.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests;
+
+public class DirectoryPerTest<T> : IAsyncLifetime {
+	protected DirectoryFixture<T> Fixture { get; private set; } = new();
+
+	public virtual async Task InitializeAsync() {
+		await Fixture.InitializeAsync();
+	}
+
+	public virtual async Task DisposeAsync() {
+		await Fixture.DisposeAsync();
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/EnvelopePublisher.cs b/src/KurrentDB.Core.XUnit.Tests/EnvelopePublisher.cs
new file mode 100644
index 00000000000..906edd6da95
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/EnvelopePublisher.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.XUnit.Tests;
+
+class EnvelopePublisher : IPublisher {
+	private readonly IEnvelope _envelope;
+
+	public EnvelopePublisher(IEnvelope envelope) {
+		_envelope = envelope;
+	}
+
+	public void Publish(Message message) {
+		_envelope.ReplyWith(message);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Helpers/FakeDisposable.cs b/src/KurrentDB.Core.XUnit.Tests/Helpers/FakeDisposable.cs
new file mode 100644
index 00000000000..7ab3cf6cb6c
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Helpers/FakeDisposable.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.XUnit.Tests.Helpers;
+
+public class FakeDisposable : IDisposable {
+	private readonly Action _disposeAction;
+
+	public FakeDisposable(Action disposeAction) {
+		_disposeAction = disposeAction;
+	}
+
+	public void Dispose() => _disposeAction?.Invoke();
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Helpers/ReusableBufferTests.cs b/src/KurrentDB.Core.XUnit.Tests/Helpers/ReusableBufferTests.cs
new file mode 100644
index 00000000000..c922e4bdd14
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Helpers/ReusableBufferTests.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Helpers;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Helpers;
+
+public class ReusableBufferTests {
+	private readonly ReusableBuffer _reusableBuffer;
+
+	public ReusableBufferTests() {
+		_reusableBuffer = new ReusableBuffer(defaultSize: 10);
+	}
+
+	[Theory]
+	[InlineData(1)]
+	[InlineData(3)]
+	[InlineData(10)]
+	[InlineData(14)]
+	public void can_acquire_buffer_as_byte_array(int numBytes) {
+		var buffer = _reusableBuffer.AcquireAsByteArray(numBytes);
+		Assert.True(buffer.Length >= numBytes);
+	}
+
+	[Theory]
+	[InlineData(1)]
+	[InlineData(3)]
+	[InlineData(10)]
+	[InlineData(14)]
+	public void can_acquire_buffer_as_span(int numBytes) {
+		var buffer = _reusableBuffer.AcquireAsSpan(numBytes);
+		Assert.Equal(numBytes, buffer.Length);
+	}
+
+	[Theory]
+	[InlineData(1)]
+	[InlineData(3)]
+	[InlineData(10)]
+	[InlineData(14)]
+	public void can_acquire_buffer_as_memory(int numBytes) {
+		var buffer = _reusableBuffer.AcquireAsMemory(numBytes);
+		Assert.Equal(numBytes, buffer.Length);
+	}
+
+	[Fact]
+	public void can_reacquire_buffer_if_released() {
+		_reusableBuffer.AcquireAsByteArray(5);
+		_reusableBuffer.Release();
+		_reusableBuffer.AcquireAsByteArray(5);
+	}
+
+	[Fact]
+	public void cannot_acquire_buffer_if_not_released() {
+		_reusableBuffer.AcquireAsByteArray(5);
+		Assert.Throws<InvalidOperationException>(() => _reusableBuffer.AcquireAsByteArray(5));
+	}
+
+	[Fact]
+	public void cannot_release_buffer_if_not_acquired() {
+		Assert.Throws<InvalidOperationException>(() => _reusableBuffer.Release());
+	}
+
+	[Fact]
+	public void throws_when_size_zero_or_negative() {
+		Assert.Throws<ArgumentOutOfRangeException>(() => _reusableBuffer.AcquireAsByteArray(-1));
+		Assert.Throws<ArgumentOutOfRangeException>(() => _reusableBuffer.AcquireAsByteArray(0));
+		Assert.Throws<ArgumentOutOfRangeException>(() => new ReusableBuffer(0));
+		Assert.Throws<ArgumentOutOfRangeException>(() => new ReusableBuffer(-1));
+	}
+
+	[Fact]
+	public void can_acquire_buffer_of_different_lengths() {
+		for (int i = 1; i <= 100; i++) {
+			var buffer = _reusableBuffer.AcquireAsByteArray(i);
+			Assert.True(buffer.Length >= i);
+			_reusableBuffer.Release();
+		}
+
+		for (int i = 100; i >= 1; i--) {
+			var buffer = _reusableBuffer.AcquireAsByteArray(i);
+			Assert.True(buffer.Length >= i);
+			_reusableBuffer.Release();
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Index/IndexStatusTrackerTests.cs b/src/KurrentDB.Core.XUnit.Tests/Index/IndexStatusTrackerTests.cs
new file mode 100644
index 00000000000..c40830195f1
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Index/IndexStatusTrackerTests.cs
@@ -0,0 +1,124 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics.Metrics;
+using System.Linq;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.XUnit.Tests.Metrics;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Index;
+
+public class IndexStatusTrackerTests : IDisposable {
+	private readonly TestMeterListener<long> _listener;
+	private readonly FakeClock _clock = new();
+	private readonly StatusMetric _metric;
+	private readonly IndexStatusTracker _sut;
+
+	public IndexStatusTrackerTests() {
+		var meter = new Meter($"{typeof(IndexStatusTrackerTests)}");
+		_listener = new TestMeterListener<long>(meter);
+		_metric = new StatusMetric(
+			meter,
+			"eventstore-statuses",
+			legacyNames: false,
+			_clock);
+		_sut = new IndexStatusTracker(_metric);
+	}
+
+	public void Dispose() {
+		_listener.Dispose();
+	}
+
+	[Fact]
+	public void can_observe_opening() {
+		_clock.SecondsSinceEpoch = 500;
+		AssertMeasurements("Idle", 500);
+
+		using (_sut.StartOpening()) {
+			_clock.SecondsSinceEpoch = 501;
+			AssertMeasurements("Opening", 501);
+		}
+
+		_clock.SecondsSinceEpoch = 502;
+		AssertMeasurements("Idle", 502);
+	}
+
+	[Fact]
+	public void can_observe_rebuilding() {
+		_clock.SecondsSinceEpoch = 500;
+		AssertMeasurements("Idle", 500);
+
+		using (_sut.StartRebuilding()) {
+			_clock.SecondsSinceEpoch = 501;
+			AssertMeasurements("Rebuilding", 501);
+		}
+
+		_clock.SecondsSinceEpoch = 502;
+		AssertMeasurements("Idle", 502);
+	}
+
+	[Fact]
+	public void can_observe_initializing() {
+		_clock.SecondsSinceEpoch = 500;
+		AssertMeasurements("Idle", 500);
+
+		using (_sut.StartInitializing()) {
+			_clock.SecondsSinceEpoch = 501;
+			AssertMeasurements("Initializing", 501);
+		}
+
+		_clock.SecondsSinceEpoch = 502;
+		AssertMeasurements("Idle", 502);
+	}
+
+	[Fact]
+	public void can_observe_merging() {
+		_clock.SecondsSinceEpoch = 500;
+		AssertMeasurements("Idle", 500);
+
+		using (_sut.StartMerging()) {
+			_clock.SecondsSinceEpoch = 501;
+			AssertMeasurements("Merging", 501);
+		}
+
+		_clock.SecondsSinceEpoch = 502;
+		AssertMeasurements("Idle", 502);
+	}
+
+	[Fact]
+	public void can_observe_scavenging() {
+		_clock.SecondsSinceEpoch = 500;
+		AssertMeasurements("Idle", 500);
+
+		using (_sut.StartScavenging()) {
+			_clock.SecondsSinceEpoch = 501;
+			AssertMeasurements("Scavenging", 501);
+		}
+
+		_clock.SecondsSinceEpoch = 502;
+		AssertMeasurements("Idle", 502);
+	}
+
+	void AssertMeasurements(string expectedStatus, int expectedValue) {
+		_listener.Observe();
+
+		Assert.Collection(
+			_listener.RetrieveMeasurements("eventstore-statuses"),
+			m => {
+				Assert.Equal(expectedValue, m.Value);
+				Assert.Collection(
+					m.Tags.ToArray(),
+					t => {
+						Assert.Equal("name", t.Key);
+						Assert.Equal("Index", t.Value);
+					},
+					t => {
+						Assert.Equal("status", t.Key);
+						Assert.Equal(expectedStatus, t.Value);
+					});
+			});
+	}
+}
diff --git a/src/EventStore.Core.XUnit.Tests/Index/IndexTrackerTests.cs b/src/KurrentDB.Core.XUnit.Tests/Index/IndexTrackerTests.cs
similarity index 75%
rename from src/EventStore.Core.XUnit.Tests/Index/IndexTrackerTests.cs
rename to src/KurrentDB.Core.XUnit.Tests/Index/IndexTrackerTests.cs
index 221ea321643..ae93c7a7030 100644
--- a/src/EventStore.Core.XUnit.Tests/Index/IndexTrackerTests.cs
+++ b/src/KurrentDB.Core.XUnit.Tests/Index/IndexTrackerTests.cs
@@ -1,14 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Metrics;
 using System.Linq;
-using EventStore.Core.Index;
-using EventStore.Core.Metrics;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.XUnit.Tests.Metrics;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.XUnit.Tests.Metrics;
 using Xunit;
 
-namespace EventStore.Core.XUnit.Tests.Index;
+namespace KurrentDB.Core.XUnit.Tests.Index;
 
 public class IndexTrackerTests : IDisposable {
 	private readonly TestMeterListener<long> _listener;
@@ -18,8 +21,8 @@ public IndexTrackerTests() {
 		var meter = new Meter($"{typeof(IndexTrackerTests)}");
 		_listener = new TestMeterListener<long>(meter);
 
-		var eventMetric = new CounterMetric(meter, "eventstore-io", "events");
-		_sut = new IndexTracker(new CounterSubMetric(eventMetric, new[] {new KeyValuePair<string, object>("activity", "written")}));
+		var eventMetric = new CounterMetric(meter, "eventstore-io", "events", legacyNames: false);
+		_sut = new IndexTracker(new CounterSubMetric(eventMetric, new[] { new KeyValuePair<string, object>("activity", "written") }));
 	}
 
 	public void Dispose() {
diff --git a/src/EventStore.Core.XUnit.Tests/Index/MidpointIndexCalculatorTests.cs b/src/KurrentDB.Core.XUnit.Tests/Index/MidpointIndexCalculatorTests.cs
similarity index 86%
rename from src/EventStore.Core.XUnit.Tests/Index/MidpointIndexCalculatorTests.cs
rename to src/KurrentDB.Core.XUnit.Tests/Index/MidpointIndexCalculatorTests.cs
index 46830ef37fb..69aacaa9ba9 100644
--- a/src/EventStore.Core.XUnit.Tests/Index/MidpointIndexCalculatorTests.cs
+++ b/src/KurrentDB.Core.XUnit.Tests/Index/MidpointIndexCalculatorTests.cs
@@ -1,8 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System.Collections.Generic;
-using EventStore.Core.Index;
+using KurrentDB.Core.Index;
 using Xunit;
 
-namespace EventStore.Core.XUnit.Tests.Index;
+namespace KurrentDB.Core.XUnit.Tests.Index;
 
 public class MidpointIndexCalculatorTests {
 	[Fact]
diff --git a/src/KurrentDB.Core.XUnit.Tests/KurrentDB.Core.XUnit.Tests.csproj b/src/KurrentDB.Core.XUnit.Tests/KurrentDB.Core.XUnit.Tests.csproj
new file mode 100644
index 00000000000..6c3a9124377
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/KurrentDB.Core.XUnit.Tests.csproj
@@ -0,0 +1,51 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<!--uncomment to run various cloud-based storage tests-->
+		<!--<DefineConstants>RUN_S3_TESTS</DefineConstants>-->
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+		<PackageReference Include="System.Linq.Async" Version="6.0.1" />
+		<PackageReference Include="TestableIO.System.IO.Abstractions" Version="21.3.1" />
+		<PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="21.3.1" />
+		<PackageReference Include="xunit" Version="2.9.3" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="coverlet.collector" Version="6.0.4">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" Version="9.1.0" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.Core.Tests\KurrentDB.Core.Tests.csproj" />
+		<ProjectReference Include="..\KurrentDB.Core\KurrentDB.Core.csproj" />
+		<ProjectReference Include="..\KurrentDB.SourceGenerators\KurrentDB.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Update="Metrics\Conf\test-metrics-config.json">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Update="xunit.runner.json">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Update="Configuration\test.kurrentdb.conf">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Update="Configuration\test.eventstore.json">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Update="Configuration\test.kurrentdb.json">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Include="..\KurrentDB.Common\Utils\version.properties">
+		  <Link>version.properties</Link>
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/CombinedHasherTests.cs b/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/CombinedHasherTests.cs
new file mode 100644
index 00000000000..335a6d5031c
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/CombinedHasherTests.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.LogAbstraction;
+using Xunit;
+using LogV3StreamId = System.UInt32;
+
+namespace KurrentDB.Core.XUnit.Tests.LogAbstraction;
+
+public class CombinedHasherTests {
+	[Theory]
+	[InlineData(0)]
+	[InlineData(5)]
+	[InlineData(LogV3StreamId.MaxValue)]
+	[InlineData(LogV3StreamId.MinValue)]
+	public void identity(LogV3StreamId x) {
+		var low = (long)new IdentityLowHasher().Hash(x);
+		var high = (long)new IdentityHighHasher().Hash(x);
+		long actual = (high << 32) | low;
+		Assert.Equal(x, actual);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/Common/NoExistenceFilterReaderTests.cs b/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/Common/NoExistenceFilterReaderTests.cs
new file mode 100644
index 00000000000..465e0ee26aa
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/Common/NoExistenceFilterReaderTests.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.LogAbstraction.Common;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.LogAbstraction.Common;
+
+public class NoExistenceFilterReaderTests {
+	[Fact]
+	public void might_contain_anything() {
+		var sut = new NoExistenceFilterReader();
+		Assert.True(sut.MightContain(4)); // chosen by fair dice roll
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/Common/NoNameExistenceFilterTests.cs b/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/Common/NoNameExistenceFilterTests.cs
new file mode 100644
index 00000000000..1ac37fbc42a
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/Common/NoNameExistenceFilterTests.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.LogAbstraction.Common;
+
+namespace KurrentDB.Core.XUnit.Tests.LogAbstraction.Common;
+
+public class NoNameExistenceFilterTests : INameExistenceFilterTests {
+	protected override INameExistenceFilter Sut { get; set; } =
+		new NoNameExistenceFilter();
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/Common/StreamExistenceFilterTests.cs b/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/Common/StreamExistenceFilterTests.cs
new file mode 100644
index 00000000000..8ea20c3ebbf
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/Common/StreamExistenceFilterTests.cs
@@ -0,0 +1,222 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.LogAbstraction.Common;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.XUnit.Tests.Helpers;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.LogAbstraction.Common;
+
+public class StreamExistenceFilterTests :
+	INameExistenceFilterTests,
+	IAsyncLifetime,
+	IClassFixture<DirectoryFixture<StreamExistenceFilterTests>> {
+	private readonly DirectoryFixture<StreamExistenceFilterTests> _fixture;
+
+	public StreamExistenceFilterTests(DirectoryFixture<StreamExistenceFilterTests> fixture) {
+		_fixture = fixture;
+	}
+
+	async Task IAsyncLifetime.InitializeAsync() {
+		Sut = GenSut();
+		await Sut.Initialize(new MockExistenceFilterInitializer(), 0, CancellationToken.None);
+	}
+
+	Task IAsyncLifetime.DisposeAsync() {
+		var task = Task.CompletedTask;
+		try {
+			Dispose();
+		} catch (Exception e) {
+			task = Task.FromException(e);
+		}
+
+		return task;
+	}
+
+	protected override INameExistenceFilter Sut { get; set; }
+
+	private StreamExistenceFilter GenSut(
+		[CallerMemberName] string name = "",
+		TimeSpan? checkpointInterval = null,
+		long size = 10_000,
+		bool useHasher = true) {
+
+		checkpointInterval ??= TimeSpan.FromMilliseconds(10);
+		var checkpointPath = Path.Combine(_fixture.Directory, $"{name}.chk");
+		var checkpoint = new FileCheckpoint(checkpointPath, name, initValue: -1);
+		var filter = new StreamExistenceFilter(
+			directory: _fixture.Directory,
+			checkpoint: checkpoint,
+			filterName: name,
+			size: size,
+			checkpointInterval: checkpointInterval.Value,
+			checkpointDelay: TimeSpan.Zero,
+			hasher: useHasher ? Hasher : null);
+		DisposeLater(new FakeDisposable(() => checkpoint.Close(flush: true)));
+		DisposeLater(filter);
+		return filter;
+	}
+
+	[Fact]
+	public void can_add() {
+		var name = "can_add";
+		Assert.False(Sut.MightContain(name));
+		Sut.Add(name);
+		Assert.True(Sut.MightContain(name));
+		Sut.Verify(corruptionThreshold: 0);
+	}
+
+	[Fact]
+	public async Task can_add_without_hasher() {
+		var sut = GenSut(useHasher: false);
+		await sut.Initialize(new MockExistenceFilterInitializer(), 0, CancellationToken.None);
+		var name = "can_add_without_hasher";
+		Assert.False(sut.MightContain(name));
+		sut.Add(name);
+		Assert.True(sut.MightContain(name));
+		sut.Verify(corruptionThreshold: 0);
+	}
+
+	[Fact]
+	public void ensures_initialized() {
+		var sut = GenSut();
+		Assert.Throws<InvalidOperationException>(() => {
+			sut.MightContain("something");
+		});
+		sut.Verify(corruptionThreshold: 0);
+	}
+
+	[Fact]
+	public async Task can_truncate() {
+		var sut = GenSut();
+		await sut.Initialize(new MockExistenceFilterInitializer("0", "1", "2"), 0, CancellationToken.None);
+		Assert.Equal(2L, sut.CurrentCheckpoint);
+		// wait for flush so that we have something to truncate (or it will do nothing)
+		AssertEx.IsOrBecomesTrue(() => sut.CurrentCheckpointFlushed == 2, TimeSpan.FromSeconds(20));
+
+		// truncate works
+		sut.Dispose();
+		sut = GenSut();
+		sut.TruncateTo(1);
+		Assert.Equal(1L, sut.CurrentCheckpoint);
+
+		// even after restart
+		sut.Dispose();
+		sut = GenSut();
+		Assert.Equal(1L, sut.CurrentCheckpoint);
+	}
+
+	[Fact]
+	public async Task on_restart_checkpoint_does_not_exceed_data() {
+		var sut = GenSut();
+		await sut.Initialize(new MockExistenceFilterInitializer(), 0, CancellationToken.None);
+
+		Assert.Equal(-1, sut.CurrentCheckpoint);
+		Assert.False(sut.MightContain("0"));
+		Assert.False(sut.MightContain("1"));
+
+		sut.Add("0");
+		sut.CurrentCheckpoint = 0;
+
+		Assert.Equal(0, sut.CurrentCheckpoint);
+		Assert.True(sut.MightContain("0"));
+		Assert.False(sut.MightContain("1"));
+
+		// wait for flush of 0
+		AssertEx.IsOrBecomesTrue(() => sut.CurrentCheckpointFlushed == 0, TimeSpan.FromSeconds(20));
+
+		sut.Add("1");
+		sut.CurrentCheckpoint = 1;
+
+		Assert.Equal(1, sut.CurrentCheckpoint);
+		Assert.True(sut.MightContain("0"));
+		Assert.True(sut.MightContain("1"));
+
+		// do not wait for flush of 1
+
+		// when restart
+		sut.Dispose();
+		sut = GenSut();
+		await sut.Initialize(new MockExistenceFilterInitializer(), 0, CancellationToken.None);
+
+		// then
+		Assert.Equal(0, sut.CurrentCheckpoint);
+		Assert.True(sut.MightContain("0"));
+		// "1" will have been flushed when disposing
+		// Assert.False(sut.MightContain("1"));
+		sut.Verify(corruptionThreshold: 0);
+	}
+
+	[Fact]
+	public async Task when_flushed_then_checkpoint_is_persisted() {
+		var sut = GenSut();
+		await sut.Initialize(new MockExistenceFilterInitializer("0", "1", "2"), 0, CancellationToken.None);
+
+		// wait for flush, then close
+		AssertEx.IsOrBecomesTrue(() => sut.CurrentCheckpointFlushed == 2, TimeSpan.FromSeconds(20));
+		sut.Dispose();
+
+		// reopen, checkpoint should still be the same
+		sut = GenSut();
+		Assert.Equal(2L, sut.CurrentCheckpoint);
+		sut.Verify(corruptionThreshold: 0);
+	}
+
+	[Fact]
+	public async Task when_missing_dat_then_reset_checkpoint() {
+		var sut = GenSut();
+		await sut.Initialize(new MockExistenceFilterInitializer("0", "1", "2"), 0, CancellationToken.None);
+
+		// wait for flush, then close
+		AssertEx.IsOrBecomesTrue(() => sut.CurrentCheckpointFlushed == 2, TimeSpan.FromSeconds(20));
+		sut.Dispose();
+
+		// delete dat file. on reopening checkpoint must be reset
+		File.Delete(sut.DataFilePath);
+		sut = GenSut();
+		Assert.Equal(-1L, sut.CurrentCheckpoint);
+		sut.Verify(corruptionThreshold: 0);
+	}
+
+	[Fact]
+	public async Task when_changing_size_then_reset_checkpoint() {
+		var sut = GenSut(size: 10_000);
+		await sut.Initialize(new MockExistenceFilterInitializer("0", "1", "2"), 0, CancellationToken.None);
+
+		// wait for flush, then close
+		AssertEx.IsOrBecomesTrue(() => sut.CurrentCheckpointFlushed == 2, TimeSpan.FromSeconds(20));
+		sut.Dispose();
+
+		// change size. on reopening checkpoint must be reset
+		sut = GenSut(size: 20_000);
+		Assert.Equal(-1L, sut.CurrentCheckpoint);
+		sut.Verify(corruptionThreshold: 0);
+	}
+
+	[Fact]
+	public async Task writes_can_be_read_by_another_thread() {
+		var sut = GenSut();
+		await sut.Initialize(new MockExistenceFilterInitializer(), 0, CancellationToken.None);
+
+		var theValue = 12345;
+
+		var reader = new Thread(() => {
+			var x = 0;
+			while (!sut.MightContain($"{theValue}")) {
+				x = x * 1;
+			}
+		});
+
+		reader.Start();
+		Thread.Sleep(100);
+		sut.Add($"{theValue}");
+		Assert.True(reader.Join(TimeSpan.FromSeconds(1)));
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/INameExistenceFilterTests.cs b/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/INameExistenceFilterTests.cs
new file mode 100644
index 00000000000..1c82337ff15
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/INameExistenceFilterTests.cs
@@ -0,0 +1,74 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.LogAbstraction;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.LogAbstraction;
+
+public abstract class INameExistenceFilterTests : IDisposable {
+	private readonly List<IDisposable> _disposables = new();
+
+	protected abstract INameExistenceFilter Sut { get; set; }
+	protected virtual ILongHasher<string> Hasher { get; set; } =
+		new CompositeHasher<string>(new XXHashUnsafe(), new Murmur3AUnsafe());
+
+	protected void DisposeLater(IDisposable disposable) {
+		_disposables.Add(disposable);
+	}
+
+	public void Dispose() {
+		Sut?.Dispose();
+		foreach (var disposable in _disposables)
+			disposable.Dispose();
+	}
+
+	[Fact]
+	public async Task can_initialize() {
+		var names = new[] { "can_initialize" };
+		var initializer = new MockExistenceFilterInitializer(names);
+		await Sut.Initialize(initializer, 0, CancellationToken.None);
+
+		foreach (var name in names)
+			Assert.True(Sut.MightContain(name));
+		Sut.Verify(corruptionThreshold: 0);
+	}
+
+	[Fact]
+	public void can_add_name() {
+		var name = "can_add_name";
+		Sut.Add(name);
+		Assert.True(Sut.MightContain(name));
+		Sut.Verify(corruptionThreshold: 0);
+	}
+
+	[Fact]
+	public void can_add_hash() {
+		var name = "can_add_hash";
+		Sut.Add(Hasher.Hash(name));
+		Assert.True(Sut.MightContain(name));
+		Sut.Verify(corruptionThreshold: 0);
+	}
+
+	[Fact]
+	public void can_add_many() {
+		for (int i = 0; i < 1000; i++)
+			Sut.Add($"{i}");
+		for (int i = 0; i < 1000; i++)
+			Assert.True(Sut.MightContain($"{i}"));
+		Sut.Verify(corruptionThreshold: 0);
+	}
+
+	[Fact]
+	public void can_checkpoint() {
+		Assert.Equal(-1L, Sut.CurrentCheckpoint);
+		Sut.CurrentCheckpoint = 5;
+		Assert.Equal(5, Sut.CurrentCheckpoint);
+		Sut.Verify(corruptionThreshold: 0);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/IdentityHighHasherTests.cs b/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/IdentityHighHasherTests.cs
new file mode 100644
index 00000000000..44edfaeb4d0
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/IdentityHighHasherTests.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.LogAbstraction;
+using Xunit;
+using LogV3StreamId = System.UInt32;
+
+namespace KurrentDB.Core.XUnit.Tests.LogAbstraction;
+
+public class IdentityHighHasherTests {
+	[Theory]
+	[InlineData(0, 0)]
+	[InlineData(5, 0)]
+	[InlineData(0xAAAA_BBBB, 0)]
+	[InlineData(0xFFFF_FFFF, 0)]
+	public void hashes_correctly(LogV3StreamId x, uint expected) {
+		var sut = new IdentityHighHasher();
+		Assert.Equal(expected, sut.Hash(x));
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/IdentityLowHasherTests.cs b/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/IdentityLowHasherTests.cs
new file mode 100644
index 00000000000..1e920bcbb84
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/IdentityLowHasherTests.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.LogAbstraction;
+using Xunit;
+using LogV3StreamId = System.UInt32;
+
+namespace KurrentDB.Core.XUnit.Tests.LogAbstraction;
+
+public class IdentityLowHasherTests {
+	[Theory]
+	[InlineData(0, 0)]
+	[InlineData(5, 5)]
+	[InlineData(0xAAAA_BBBB, 0xAAAA_BBBB)]
+	[InlineData(0xFFFF_FFFF, 0xFFFF_FFFF)]
+	public void hashes_correctly(LogV3StreamId x, uint expected) {
+		var sut = new IdentityLowHasher();
+		Assert.Equal(expected, sut.Hash(x));
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/LogFormatAbstractorV2Tests.cs b/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/LogFormatAbstractorV2Tests.cs
new file mode 100644
index 00000000000..b5f700d45fd
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/LogFormatAbstractorV2Tests.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.LogAbstraction;
+
+// checks the abstractor wires things up properly
+public class LogFormatAbstractorV2Tests :
+	DirectoryPerTest<LogFormatAbstractorV2Tests>,
+	IDisposable {
+
+	private readonly DirectoryFixture<LogFormatAbstractorV2Tests> _fixture = new();
+	private readonly LogFormatAbstractor<string> _sut;
+
+	public LogFormatAbstractorV2Tests() {
+		_sut = new LogV2FormatAbstractorFactory().Create(new() {
+			IndexDirectory = _fixture.Directory,
+			InMemory = false,
+			StreamExistenceFilterSize = 1_000_000,
+			StreamExistenceFilterCheckpoint = new InMemoryCheckpoint(),
+		});
+	}
+
+	public void Dispose() {
+		_sut.Dispose();
+	}
+
+	[Fact]
+	public async Task can_init() {
+		await _sut.StreamExistenceFilter.Initialize(new MockExistenceFilterInitializer("1"), 0, CancellationToken.None);
+		Assert.True(_sut.StreamExistenceFilterReader.MightContain("1"));
+	}
+
+	[Fact]
+	public async Task can_confirm() {
+		await _sut.StreamExistenceFilter.Initialize(new MockExistenceFilterInitializer(), 0, CancellationToken.None);
+
+		var prepare = LogRecord.SingleWrite(
+			factory: _sut.RecordFactory,
+			logPosition: 100,
+			correlationId: Guid.NewGuid(),
+			eventId: Guid.NewGuid(),
+			eventStreamId: "streamA",
+			expectedVersion: -1,
+			eventType: "eventType",
+			data: ReadOnlyMemory<byte>.Empty,
+			metadata: ReadOnlyMemory<byte>.Empty);
+
+		Assert.False(_sut.StreamExistenceFilterReader.MightContain("streamA"));
+
+		_sut.StreamNameIndexConfirmer.Confirm(
+			new[] { prepare },
+			catchingUp: false,
+			backend: null);
+
+		Assert.True(_sut.StreamExistenceFilterReader.MightContain("streamA"));
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/LogFormatAbstractorV3Tests.cs b/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/LogFormatAbstractorV3Tests.cs
new file mode 100644
index 00000000000..c12ffaa2626
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/LogFormatAbstractorV3Tests.cs
@@ -0,0 +1,437 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.LogV3;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using Xunit;
+using EventTypeId = System.UInt32;
+using StreamId = System.UInt32;
+
+namespace KurrentDB.Core.XUnit.Tests.LogAbstraction;
+
+// check that lookups of the various combinations of virtual/normal/meta
+// work in both directions and in the stream index.
+public class LogFormatAbstractorV3Tests : IAsyncLifetime {
+	readonly static string _outputDir = $"testoutput/{nameof(LogFormatAbstractorV3Tests)}";
+	readonly LogFormatAbstractor<StreamId> _sut = new LogV3FormatAbstractorFactory().Create(new() {
+		IndexDirectory = _outputDir,
+		InMemory = false,
+		StreamExistenceFilterSize = 1_000_000,
+		StreamExistenceFilterCheckpoint = new InMemoryCheckpoint(),
+	});
+
+	readonly string _stream = "account-abc";
+	readonly string _systemStream = "$something-parked";
+	StreamId _streamId;
+	StreamId _systemStreamId;
+	readonly string _eventType = "some-event";
+	EventTypeId _eventTypeId;
+	readonly MockIndexReader _mockIndexReader = new();
+	int _numStreams;
+	int _numEventTypes;
+
+	async Task IAsyncLifetime.InitializeAsync() {
+		TryDeleteDirectory();
+		_sut.StreamNamesProvider.SetReader(_mockIndexReader);
+		await _sut.StreamExistenceFilter.Initialize(_sut.StreamExistenceFilterInitializer, 0, CancellationToken.None);
+		Assert.False(GetOrReserve(_stream, out _streamId, out _, out _));
+		Assert.False(GetOrReserve(_systemStream, out _systemStreamId, out _, out _));
+		Assert.False(GetOrReserveEventType(_eventType, out _eventTypeId, out _, out _));
+
+		_numStreams = 2;
+		_numEventTypes = 1;
+	}
+
+	Task IAsyncLifetime.DisposeAsync() {
+		var task = Task.CompletedTask;
+		try {
+			_sut.Dispose();
+			TryDeleteDirectory();
+		} catch (Exception e) {
+			task = Task.FromException(e);
+		}
+
+		return task;
+	}
+
+	void TryDeleteDirectory() {
+		try {
+			Directory.Delete(_outputDir, recursive: true);
+		} catch { }
+	}
+
+	// it is up to the user of the V3 abstractor to index created streams, simulate that here.
+	// this is because we are currently using the normal event index to look up the stream names
+	bool GetOrReserve(string streamName, out StreamId streamId, out StreamId createdId, out string createdName) {
+		_sut.StreamNameIndex.GetOrReserve(
+			recordFactory: _sut.RecordFactory,
+			streamName: streamName,
+			logPosition: 123,
+			streamId: out streamId,
+			streamRecord: out var record);
+
+		if (record is LogV3StreamRecord streamRecord) {
+			createdId = streamRecord.Record.SubHeader.ReferenceNumber;
+			createdName = streamRecord.StreamName;
+			_mockIndexReader.Add(streamRecord.ExpectedVersion + 1, streamRecord);
+			_sut.StreamNameIndexConfirmer.Confirm(
+				replicatedPrepares: new[] { streamRecord },
+				catchingUp: false,
+				backend: new MockIndexBackend<StreamId>());
+			return false;
+		} else {
+			createdId = default;
+			createdName = default;
+			return true;
+		}
+	}
+
+	bool GetOrReserveEventType(string eventType, out StreamId eventTypeId, out EventTypeId createdId, out string createdName) {
+		_sut.EventTypeIndex.GetOrReserveEventType(
+			recordFactory: _sut.RecordFactory,
+			eventType: eventType,
+			logPosition: 456,
+			eventTypeId: out eventTypeId,
+			eventTypeRecord: out var record);
+
+		if (record is LogV3EventTypeRecord eventTypeRecord) {
+			createdId = eventTypeRecord.Record.SubHeader.ReferenceNumber;
+			createdName = eventTypeRecord.EventTypeName;
+			_mockIndexReader.Add(eventTypeRecord.ExpectedVersion + 1, eventTypeRecord);
+			_sut.EventTypeIndexConfirmer.Confirm(
+				replicatedPrepares: new[] { eventTypeRecord },
+				catchingUp: false,
+				backend: new MockIndexBackend<EventTypeId>());
+			return false;
+		} else {
+			createdId = default;
+			createdName = default;
+			return true;
+		}
+	}
+
+	[Fact]
+	public void can_add_another_event_type() {
+		Assert.False(GetOrReserveEventType("new-event-type-1", out var newEventTypeId1, out var createdId1, out var createdName1));
+		Assert.False(GetOrReserveEventType("new-event-type-2", out var newEventTypeId2, out var createdId2, out var createdName2));
+		Assert.Equal(newEventTypeId1 + 1, newEventTypeId2);
+		Assert.Equal(newEventTypeId1, createdId1);
+		Assert.Equal(newEventTypeId2, createdId2);
+		Assert.Equal("new-event-type-1", createdName1);
+		Assert.Equal("new-event-type-2", createdName2);
+		Assert.Equal(_numEventTypes + 2, _mockIndexReader.EventTypeCount);
+	}
+
+	[Fact]
+	public async Task can_find_existing_event_type() {
+		Assert.True(GetOrReserveEventType(_eventType, out var eventTypeId, out _, out _));
+		Assert.Equal(_numEventTypes, _mockIndexReader.EventTypeCount);
+		Assert.Equal(_eventTypeId, eventTypeId);
+		await _sut.EventTypes.LookupName(_eventTypeId, CancellationToken.None);
+		Assert.Equal(_eventType, await _sut.EventTypes.LookupName(_eventTypeId, CancellationToken.None));
+	}
+
+	[Theory]
+	[InlineData(0, ""/* empty event type */)]
+	[InlineData(1, "$event-type")]
+	[InlineData(2, "$stream")]
+	[InlineData(3, "$metadata")]
+	[InlineData(4, "$streamDeleted")]
+	public async Task can_find_virtual_event_type(EventTypeId expectedId, string name) {
+		Assert.True(GetOrReserveEventType(name, out var eventTypeId, out _, out _));
+		Assert.Equal(_numEventTypes, _mockIndexReader.EventTypeCount);
+		Assert.Equal(expectedId, eventTypeId);
+		Assert.Equal(name, await _sut.EventTypes.LookupName(expectedId, CancellationToken.None));
+	}
+
+	[Fact]
+	public async Task uses_correct_event_type_interval() {
+		var expectedEventTypeNumber1 = LogV3SystemEventTypes.FirstRealEventTypeNumber + _numEventTypes;
+		Assert.False(GetOrReserveEventType("new-event-type-1", out var newEventTypeId1, out var createdId1, out var createdName1));
+		Assert.False(GetOrReserveEventType("new-event-type-2", out var newEventTypeId2, out var createdId2, out var createdName2));
+		Assert.Equal(expectedEventTypeNumber1, newEventTypeId1);
+		Assert.Equal(expectedEventTypeNumber1 + 1, newEventTypeId2);
+		Assert.True(await _sut.EventTypes.LookupName((uint)expectedEventTypeNumber1, CancellationToken.None) is { Length: > 0 });
+		Assert.True(await _sut.EventTypes.LookupName((uint)expectedEventTypeNumber1 + 1, CancellationToken.None) is { Length: > 0 });
+	}
+
+	[Fact]
+	public void can_add_another_stream() {
+		Assert.False(GetOrReserve("new-stream-1", out var newStreamId1, out var createdId1, out var createdName1));
+		Assert.False(GetOrReserve("new-stream-2", out var newStreamId2, out var createdId2, out var createdName2));
+		Assert.Equal(newStreamId1 + 2, newStreamId2);
+		Assert.Equal(newStreamId1, createdId1);
+		Assert.Equal(newStreamId2, createdId2);
+		Assert.Equal("new-stream-1", createdName1);
+		Assert.Equal("new-stream-2", createdName2);
+		Assert.Equal(_numStreams + 2, _mockIndexReader.StreamCount);
+	}
+
+	[Fact]
+	public void can_add_another_meta_stream() {
+		Assert.False(GetOrReserve("$$new-stream-3", out var newStreamId1, out var createdId1, out var createdName1));
+		Assert.False(GetOrReserve("$$new-stream-4", out var newStreamId2, out var createdId2, out var createdName2));
+		Assert.Equal(_numStreams + 2, _mockIndexReader.StreamCount);
+
+		// ids should be 2 apart to leave room for meta
+		Assert.Equal(newStreamId1 + 2, newStreamId2);
+
+		// the stream actually created is not the meta but the main counterpart of it
+		Assert.Equal("new-stream-3", createdName1);
+		Assert.Equal("new-stream-4", createdName2);
+		Assert.Equal(newStreamId1 - 1, createdId1);
+		Assert.Equal(newStreamId2 - 1, createdId2);
+	}
+
+	[Fact]
+	public void can_add_another_system_stream() {
+		Assert.False(GetOrReserve("$new-stream-5", out var newStreamId1, out var createdId1, out var createdName1));
+		Assert.False(GetOrReserve("$new-stream-6", out var newStreamId2, out var createdId2, out var createdName2));
+		Assert.Equal(_numStreams + 2, _mockIndexReader.StreamCount);
+
+		// ids should be 2 apart to leave room for meta
+		Assert.Equal(newStreamId1 + 2, newStreamId2);
+
+		// the stream actually created is the system stream
+		Assert.Equal("$new-stream-5", createdName1);
+		Assert.Equal("$new-stream-6", createdName2);
+		Assert.Equal(newStreamId1, createdId1);
+		Assert.Equal(newStreamId2, createdId2);
+	}
+
+	[Fact]
+	public void can_add_another_system_meta_stream() {
+		Assert.False(GetOrReserve("$$$new-stream-7", out var newStreamId1, out var createdId1, out var createdName1));
+		Assert.False(GetOrReserve("$$$new-stream-8", out var newStreamId2, out var createdId2, out var createdName2));
+		Assert.Equal(_numStreams + 2, _mockIndexReader.StreamCount);
+
+		// ids should be 2 apart to leave room for meta
+		Assert.Equal(newStreamId1 + 2, newStreamId2);
+
+		// the stream actually created is not the meta but the main counterpart of it
+		Assert.Equal("$new-stream-7", createdName1);
+		Assert.Equal("$new-stream-8", createdName2);
+		Assert.Equal(newStreamId1 - 1, createdId1);
+		Assert.Equal(newStreamId2 - 1, createdId2);
+	}
+
+	[Fact]
+	public async Task can_find_existing_stream() {
+		Assert.True(GetOrReserve(_stream, out var streamId, out _, out _));
+		Assert.Equal(_numStreams, _mockIndexReader.StreamCount);
+		Assert.Equal(_streamId, streamId);
+		Assert.Equal(_streamId, _sut.StreamIds.LookupValue(_stream));
+		Assert.Equal(_stream, await _sut.StreamNames.LookupName(_streamId, CancellationToken.None));
+		Assert.False(_sut.SystemStreams.IsMetaStream(streamId));
+		Assert.False(await _sut.SystemStreams.IsSystemStream(streamId, CancellationToken.None));
+		Assert.True(_sut.StreamExistenceFilter.MightContain(_stream));
+	}
+
+	[Fact]
+	public async Task can_find_existing_meta_stream() {
+		var metaStreamName = "$$" + _stream;
+		var expectedMetaStreamId = _streamId + 1;
+		Assert.True(GetOrReserve(metaStreamName, out var streamId, out _, out _));
+		Assert.Equal(_numStreams, _mockIndexReader.StreamCount);
+		Assert.Equal(expectedMetaStreamId, streamId);
+		Assert.Equal(expectedMetaStreamId, _sut.StreamIds.LookupValue(metaStreamName));
+		Assert.Equal(metaStreamName, await _sut.StreamNames.LookupName(expectedMetaStreamId, CancellationToken.None));
+		Assert.True(_sut.SystemStreams.IsMetaStream(streamId));
+		Assert.True(await _sut.SystemStreams.IsSystemStream(streamId, CancellationToken.None));
+	}
+
+	[Fact]
+	public async Task can_find_existing_system_stream() {
+		Assert.True(GetOrReserve(_systemStream, out var streamId, out _, out _));
+		Assert.Equal(_numStreams, _mockIndexReader.StreamCount);
+		Assert.Equal(_systemStreamId, streamId);
+		Assert.Equal(_systemStreamId, _sut.StreamIds.LookupValue(_systemStream));
+		Assert.Equal(_systemStream, await _sut.StreamNames.LookupName(_systemStreamId, CancellationToken.None));
+		Assert.False(_sut.SystemStreams.IsMetaStream(streamId));
+		Assert.True(await _sut.SystemStreams.IsSystemStream(streamId, CancellationToken.None));
+	}
+
+	[Fact]
+	public async Task can_find_existing_system_meta_stream() {
+		var metaStreamName = "$$" + _systemStream;
+		var expectedMetaStreamId = _systemStreamId + 1;
+		Assert.True(GetOrReserve(metaStreamName, out var streamId, out _, out _));
+		Assert.Equal(_numStreams, _mockIndexReader.StreamCount);
+		Assert.Equal(expectedMetaStreamId, streamId);
+		Assert.Equal(expectedMetaStreamId, _sut.StreamIds.LookupValue(metaStreamName));
+		Assert.Equal(metaStreamName, await _sut.StreamNames.LookupName(expectedMetaStreamId, CancellationToken.None));
+		Assert.True(_sut.SystemStreams.IsMetaStream(streamId));
+		Assert.True(await _sut.SystemStreams.IsSystemStream(streamId, CancellationToken.None));
+	}
+
+	[Theory]
+	[InlineData(4, "$all")]
+	[InlineData(6, "$streams-created")]
+	[InlineData(8, "$settings")]
+	public async Task can_find_virtual_stream(StreamId expectedId, string name) {
+		Assert.True(GetOrReserve(name, out var streamId, out _, out _));
+		Assert.Equal(_numStreams, _mockIndexReader.StreamCount);
+		Assert.Equal(expectedId, streamId);
+		Assert.Equal(expectedId, _sut.StreamIds.LookupValue(name));
+		Assert.Equal(name, await _sut.StreamNames.LookupName(expectedId, CancellationToken.None));
+		Assert.False(_sut.SystemStreams.IsMetaStream(streamId));
+		Assert.True(await _sut.SystemStreams.IsSystemStream(streamId, CancellationToken.None));
+	}
+
+	[Fact]
+	public async Task can_find_virtual_meta_stream() {
+		Assert.True(GetOrReserve("$$$all", out var streamId, out _, out _));
+		Assert.Equal(_numStreams, _mockIndexReader.StreamCount);
+		Assert.Equal(5U, streamId);
+		Assert.Equal(5U, _sut.StreamIds.LookupValue("$$$all"));
+		Assert.Equal("$$$all", await _sut.StreamNames.LookupName(5, CancellationToken.None));
+		Assert.True(_sut.SystemStreams.IsMetaStream(streamId));
+		Assert.True(await _sut.SystemStreams.IsSystemStream(streamId, CancellationToken.None));
+	}
+
+	[Theory]
+	[InlineData(LogV3SystemStreams.NoUserStream, false, false, "new-user-stream")]
+	[InlineData(LogV3SystemStreams.NoUserMetastream, true, true, "$$new-user-stream")]
+	[InlineData(LogV3SystemStreams.NoSystemStream, false, true, "$new-system-stream")]
+	[InlineData(LogV3SystemStreams.NoSystemMetastream, true, true, "$$$new-system-stream")]
+	public async Task can_attempt_to_lookup_non_existent_streams(StreamId expectedId, bool expectedIsMeta, bool expectedIsSystem, string name) {
+		Assert.Equal(expectedId, _sut.StreamIds.LookupValue(name));
+		Assert.Equal(expectedIsMeta, _sut.SystemStreams.IsMetaStream(expectedId));
+		Assert.Equal(expectedIsSystem, await _sut.SystemStreams.IsSystemStream(expectedId, CancellationToken.None));
+	}
+
+	[Theory]
+	[InlineData("")]
+	[InlineData("$$new-user-stream")]
+	[InlineData("$all")]
+	public void cannot_add_certain_kinds_of_streams_to_filter(string name) {
+		Assert.Throws<ArgumentException>(() => _sut.StreamExistenceFilter.Add(name));
+	}
+
+	class MockIndexReader : IIndexReader<StreamId> {
+		private Dictionary<StreamId, Dictionary<long, IPrepareLogRecord<StreamId>>> _index = new() {
+			{LogV3SystemStreams.StreamsCreatedStreamNumber, new()},
+			{LogV3SystemStreams.EventTypesStreamNumber, new()}
+		};
+
+		public void Add(long eventNumber, IPrepareLogRecord<StreamId> record) => _index[record.EventStreamId].Add(eventNumber, record);
+
+		public int StreamCount => _index[LogV3SystemStreams.StreamsCreatedStreamNumber].Count;
+		public int EventTypeCount => _index[LogV3SystemStreams.EventTypesStreamNumber].Count;
+
+		public ValueTask<IPrepareLogRecord<StreamId>> ReadPrepare(StreamId streamId, long eventNumber, CancellationToken token) {
+			// simulates what would be in the index.
+			return new(_index[streamId][eventNumber]);
+		}
+
+		public long CachedStreamInfo => throw new NotImplementedException();
+
+		public long NotCachedStreamInfo => throw new NotImplementedException();
+
+		public long HashCollisions => throw new NotImplementedException();
+
+		public ValueTask<StorageMessage.EffectiveAcl> GetEffectiveAcl(StreamId streamId, CancellationToken token) =>
+			ValueTask.FromException<StorageMessage.EffectiveAcl>(new NotImplementedException());
+
+		public ValueTask<IndexReadEventInfoResult> ReadEventInfo_KeepDuplicates(uint streamId, long eventNumber,
+			CancellationToken token)
+			=> ValueTask.FromException<IndexReadEventInfoResult>(new NotImplementedException());
+
+		public ValueTask<StreamId> GetEventStreamIdByTransactionId(long transactionId, CancellationToken token) =>
+			ValueTask.FromException<StreamId>(new NotImplementedException());
+
+		public ValueTask<long> GetStreamLastEventNumber(StreamId streamId, CancellationToken token) {
+			return streamId is LogV3SystemStreams.StreamsCreatedStreamNumber
+				? ValueTask.FromResult(_index[streamId].Count - 1L)
+				: ValueTask.FromException<long>(new NotImplementedException());
+		}
+
+		public ValueTask<StreamMetadata> GetStreamMetadata(StreamId streamId, CancellationToken token) =>
+			ValueTask.FromException<StreamMetadata>(new NotImplementedException());
+
+		public ValueTask<IndexReadEventResult> ReadEvent(string streamName, StreamId streamId, long eventNumber, CancellationToken token) =>
+			ValueTask.FromException<IndexReadEventResult>(new NotImplementedException());
+
+		public ValueTask<IndexReadStreamResult> ReadStreamEventsBackward(string streamName, StreamId streamId,
+			long fromEventNumber, int maxCount, CancellationToken token) =>
+			ValueTask.FromException<IndexReadStreamResult>(new NotImplementedException());
+
+		public ValueTask<IndexReadStreamResult> ReadStreamEventsForward(string streamName, StreamId streamId,
+			long fromEventNumber, int maxCount, CancellationToken token) =>
+			ValueTask.FromException<IndexReadStreamResult>(new NotImplementedException());
+
+		public ValueTask<IndexReadEventInfoResult> ReadEventInfoForward_KnownCollisions(uint streamId,
+			long fromEventNumber, int maxCount, long beforePosition, CancellationToken token) =>
+			ValueTask.FromException<IndexReadEventInfoResult>(new NotImplementedException());
+
+		public ValueTask<IndexReadEventInfoResult> ReadEventInfoForward_NoCollisions(ulong stream, long fromEventNumber,
+			int maxCount, long beforePosition, CancellationToken token) =>
+			ValueTask.FromException<IndexReadEventInfoResult>(new NotImplementedException());
+
+		public ValueTask<IndexReadEventInfoResult> ReadEventInfoBackward_KnownCollisions(uint streamId,
+			long fromEventNumber, int maxCount, long beforePosition, CancellationToken token) =>
+			ValueTask.FromException<IndexReadEventInfoResult>(new NotImplementedException());
+
+		public ValueTask<IndexReadEventInfoResult> ReadEventInfoBackward_NoCollisions(ulong stream,
+			Func<ulong, uint> getStreamId, long fromEventNumber, int maxCount, long beforePosition,
+			CancellationToken token) =>
+			ValueTask.FromException<IndexReadEventInfoResult>(new NotImplementedException());
+
+		public ValueTask<long> GetStreamLastEventNumber_KnownCollisions(uint streamId, long beforePosition,
+			CancellationToken token) =>
+			ValueTask.FromException<long>(new NotImplementedException());
+
+		public ValueTask<long> GetStreamLastEventNumber_NoCollisions(ulong stream, Func<ulong, uint> getStreamId,
+			long beforePosition, CancellationToken token) =>
+			ValueTask.FromException<long>(new NotImplementedException());
+	}
+}
+
+public class MockIndexBackend<TStreamId> : IIndexBackend<TStreamId> {
+	public TFReaderLease BorrowReader() {
+		throw new NotImplementedException();
+	}
+
+	public SystemSettings GetSystemSettings() {
+		throw new NotImplementedException();
+	}
+
+	public long? SetStreamLastEventNumber(TStreamId streamId, long lastEventNumber) {
+		return null;
+	}
+
+	public StreamMetadata SetStreamMetadata(TStreamId streamId, StreamMetadata metadata) {
+		throw new NotImplementedException();
+	}
+
+	public void SetSystemSettings(SystemSettings systemSettings) {
+		throw new NotImplementedException();
+	}
+
+	public IndexBackend<TStreamId>.EventNumberCached TryGetStreamLastEventNumber(TStreamId streamId) {
+		throw new NotImplementedException();
+	}
+
+	public IndexBackend<TStreamId>.MetadataCached TryGetStreamMetadata(TStreamId streamId) {
+		throw new NotImplementedException();
+	}
+
+	public long? UpdateStreamLastEventNumber(int cacheVersion, TStreamId streamId, long? lastEventNumber) {
+		throw new NotImplementedException();
+	}
+
+	public StreamMetadata UpdateStreamMetadata(int cacheVersion, TStreamId streamId, StreamMetadata metadata) {
+		throw new NotImplementedException();
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/MockExistenceFilterInitializer.cs b/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/MockExistenceFilterInitializer.cs
new file mode 100644
index 00000000000..e5796c2f23e
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/LogAbstraction/MockExistenceFilterInitializer.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.LogAbstraction;
+
+namespace KurrentDB.Core.XUnit.Tests.LogAbstraction;
+
+public class MockExistenceFilterInitializer : INameExistenceFilterInitializer {
+	private readonly string[] _names;
+
+	public MockExistenceFilterInitializer(params string[] names) {
+		_names = names;
+	}
+
+	public ValueTask Initialize(INameExistenceFilter filter, long truncateToPosition, CancellationToken token) {
+		int checkpoint = 0;
+		foreach (var name in _names) {
+			filter.Add(name);
+			filter.CurrentCheckpoint = checkpoint++;
+		}
+
+		return ValueTask.CompletedTask;
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/LogV2/LogV2StreamExistenceFilterInitializerTests.cs b/src/KurrentDB.Core.XUnit.Tests/LogV2/LogV2StreamExistenceFilterInitializerTests.cs
new file mode 100644
index 00000000000..05fccbf2f89
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/LogV2/LogV2StreamExistenceFilterInitializerTests.cs
@@ -0,0 +1,210 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.LogV2;
+using KurrentDB.Core.Tests.Services.Storage;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.LogV2;
+
+public class LogV2StreamExistenceFilterInitializerTests : DirectoryPerTest<LogV2StreamExistenceFilterInitializerTests> {
+	private readonly TableIndex<string> _tableIndex;
+	private readonly LogV2StreamExistenceFilterInitializer _sut;
+	private readonly FakeInMemoryTfReader _log;
+	private readonly MockExistenceFilter _filter;
+	private readonly int _recordOffset = 100;
+	private long _nextLogPosition = 0;
+
+	public LogV2StreamExistenceFilterInitializerTests() {
+		_log = new FakeInMemoryTfReader(recordOffset: _recordOffset);
+		_tableIndex = new TableIndex<string>(
+			directory: Fixture.Directory,
+			lowHasher: new XXHashUnsafe(),
+			highHasher: new Murmur3AUnsafe(),
+			emptyStreamId: string.Empty,
+			memTableFactory: () => new HashListMemTable(
+				version: PTableVersions.IndexV4,
+				maxSize: 1_000_000 * 2),
+			maxSizeForMemory: 100_000,
+			tfReaderFactory: () => new TFReaderLease(_log),
+			ptableVersion: PTableVersions.IndexV4,
+			maxAutoMergeIndexLevel: int.MaxValue,
+			pTableMaxReaderCount: 5);
+		_tableIndex.Initialize(0);
+
+		_sut = new LogV2StreamExistenceFilterInitializer(
+			tfReaderFactory: () => new TFReaderLease(_log),
+			tableIndex: _tableIndex);
+		var hasher = new CompositeHasher<string>(new XXHashUnsafe(), new Murmur3AUnsafe());
+		_filter = new MockExistenceFilter(hasher);
+
+	}
+
+	private void AddEventToSut(string stream, int eventNumber) {
+		var record = LogRecord.SingleWrite(
+			factory: new LogV2RecordFactory(),
+			logPosition: _nextLogPosition,
+			correlationId: Guid.NewGuid(),
+			eventId: Guid.NewGuid(),
+			eventStreamId: stream,
+			expectedVersion: eventNumber - 1,
+			eventType: "eventType",
+			data: ReadOnlyMemory<byte>.Empty,
+			metadata: ReadOnlyMemory<byte>.Empty);
+
+		_log.AddRecord(record, _nextLogPosition);
+		_tableIndex.Add(
+			commitPos: _nextLogPosition,
+			streamId: stream,
+			version: record.ExpectedVersion + 1,
+			position: _nextLogPosition);
+
+		_nextLogPosition += _recordOffset;
+	}
+
+	[Fact]
+	public async Task can_initialize_empty() {
+		Assert.Equal(-1, _filter.CurrentCheckpoint);
+		await _sut.Initialize(_filter, 0, CancellationToken.None);
+		Assert.Equal(-1, _filter.CurrentCheckpoint);
+		Assert.Empty(_filter.Hashes);
+		Assert.Equal(1, _log.NumReads);
+	}
+
+	[Theory]
+	[InlineData(100, 600)] // if we do truncate (to 100)
+	[InlineData(1000, 1000)] // if we dont truncate
+	[InlineData(2000, 1000)] // if we dont truncate
+	public async Task can_truncate(long truncateTo, long expectedCheckpoint) {
+		_filter.CurrentCheckpoint = 1000;
+
+		AddEventToSut("1", 0);
+		AddEventToSut("2", 0);
+		AddEventToSut("3", 0);
+		AddEventToSut("4", 0);
+		AddEventToSut("5", 0);
+		AddEventToSut("6", 0);
+
+		await _sut.Initialize(_filter, truncateTo, CancellationToken.None);
+
+		Assert.Equal(expectedCheckpoint, _filter.CurrentCheckpoint);
+	}
+
+	[Fact]
+	public async Task can_initialize_from_beginning() {
+		// (implementation detail: initializes from index)
+		AddEventToSut("1", 0);
+		AddEventToSut("1", 1);
+		AddEventToSut("2", 0);
+		AddEventToSut("2", 1);
+		AddEventToSut("3", 0);
+		AddEventToSut("3", 1);
+
+		await _sut.Initialize(_filter, 0, CancellationToken.None);
+
+		Assert.Equal(600, _filter.CurrentCheckpoint);
+		Assert.Equal(3, _filter.Hashes.Count);
+		Assert.Equal(2, _log.NumReads);
+	}
+
+	// this ensures every record is processed because each stream has 1 record
+	[Fact]
+	public async Task can_initialize_from_beginning_unique() {
+		// (implementation detail: initializes from index)
+		AddEventToSut("1", 0);
+		AddEventToSut("2", 0);
+		AddEventToSut("3", 0);
+		AddEventToSut("4", 0);
+		AddEventToSut("5", 0);
+		AddEventToSut("6", 0);
+
+		await _sut.Initialize(_filter, 0, CancellationToken.None);
+
+		Assert.Equal(600, _filter.CurrentCheckpoint);
+		Assert.Equal(6, _filter.Hashes.Count);
+		Assert.Equal(2, _log.NumReads);
+	}
+
+	[Fact]
+	public async Task can_initialize_incremental() {
+		// (implementation detail: initializes from log)
+		_filter.CurrentCheckpoint = 0;
+
+		AddEventToSut("1", 0);
+		AddEventToSut("1", 1);
+		AddEventToSut("2", 0);
+		AddEventToSut("2", 1);
+		AddEventToSut("3", 0);
+		AddEventToSut("3", 1);
+
+		await _sut.Initialize(_filter, 0, CancellationToken.None);
+
+		Assert.Equal(600, _filter.CurrentCheckpoint);
+		Assert.Equal(3, _filter.Hashes.Count);
+		Assert.Equal(7, _log.NumReads);
+	}
+
+	// while initialising from the index there might be an index merge causing a filedeletedexception
+	// before the fix this test fairly reliably fails on my machine due to the indexes being deleted.
+	// after the fix the window for getting the filedeletedexception is small so the test
+	// is unlikely to exercise it.
+	[Fact(Skip = "manual")]
+	public async Task can_initalize_during_merge() {
+		var eventsPerStream = 1_000;
+		var numStreams = 1_000;
+		var numEvents = eventsPerStream * numStreams;
+		for (int i = 0; i < numStreams; i++) {
+			for (int j = 0; j < eventsPerStream; j++) {
+				AddEventToSut(stream: $"stream-{i}", eventNumber: j);
+			}
+		}
+
+		var hasher = new CompositeHasher<string>(new XXHashUnsafe(), new Murmur3AUnsafe());
+		// addDelayMs: we want to initialize the filter slowly, to give the ptables longer to move around
+		var slowFilter = new MockExistenceFilter(hasher, addDelayMs: 1);
+		await _sut.Initialize(slowFilter, 0, CancellationToken.None);
+
+		Assert.Equal(numEvents * _recordOffset, slowFilter.CurrentCheckpoint);
+		Assert.Equal(numStreams, slowFilter.Hashes.Count);
+		Assert.Equal(2, _log.NumReads);
+	}
+
+	[Fact]
+	public async Task cannot_initialize_with_v1_indexes() {
+		var tableIndex = new TableIndex<string>(
+			directory: Fixture.Directory,
+			lowHasher: new XXHashUnsafe(),
+			highHasher: new Murmur3AUnsafe(),
+			emptyStreamId: string.Empty,
+			memTableFactory: () => new HashListMemTable(
+				version: PTableVersions.IndexV1,
+				maxSize: 1_000_000 * 2),
+			tfReaderFactory: () => throw new Exception("index tried to read the log"),
+			ptableVersion: PTableVersions.IndexV1,
+			maxAutoMergeIndexLevel: int.MaxValue,
+			pTableMaxReaderCount: 5);
+		tableIndex.Initialize(0);
+
+		var sut = new LogV2StreamExistenceFilterInitializer(
+			tfReaderFactory: () => throw new Exception("initializer tried to read the log"),
+			tableIndex: tableIndex);
+
+		var filter = new MockExistenceFilter(hasher: null);
+
+		var ex = await Assert.ThrowsAsync<NotSupportedException>(async () => {
+			await sut.Initialize(filter, 0, CancellationToken.None);
+		});
+		Assert.Equal(
+			"The Stream Existence Filter is not supported with V1 index files. " +
+			"Please disable the filter by setting StreamExistenceFilterSize to 0, or rebuild the indexes.",
+			ex.Message);
+		Assert.Equal(0, _log.NumReads);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/LogV2/MockExistenceFilter.cs b/src/KurrentDB.Core.XUnit.Tests/LogV2/MockExistenceFilter.cs
new file mode 100644
index 00000000000..ec285691984
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/LogV2/MockExistenceFilter.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.LogAbstraction;
+
+namespace KurrentDB.Core.XUnit.Tests.LogV2;
+
+public class MockExistenceFilter : INameExistenceFilter {
+	private readonly ILongHasher<string> _hasher;
+	private readonly int _addDelayMs;
+
+	public MockExistenceFilter(ILongHasher<string> hasher, int addDelayMs = 0) {
+		_hasher = hasher;
+		_addDelayMs = addDelayMs;
+	}
+
+	public HashSet<ulong> Hashes { get; } = new();
+
+	public long CurrentCheckpoint { get; set; } = -1;
+
+	public void Add(string name) {
+		if (_addDelayMs > 0)
+			Thread.Sleep(_addDelayMs);
+		Hashes.Add(_hasher.Hash(name));
+	}
+
+	public void Add(ulong hash) {
+		if (_addDelayMs > 0)
+			Thread.Sleep(_addDelayMs);
+		Hashes.Add(hash);
+	}
+
+	public void Dispose() {
+	}
+
+	public ValueTask Initialize(INameExistenceFilterInitializer source, long truncateToPosition,
+		CancellationToken token)
+		=> source.Initialize(this, truncateToPosition, token);
+
+	public void TruncateTo(long checkpoint) {
+		CurrentCheckpoint = checkpoint;
+	}
+
+	public void Verify(double corruptionThreshold) { }
+
+	public bool MightContain(string name) {
+		return Hashes.Contains(_hasher.Hash(name));
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/LogV3/EventTypeIdConverterTests.cs b/src/KurrentDB.Core.XUnit.Tests/LogV3/EventTypeIdConverterTests.cs
new file mode 100644
index 00000000000..322df1ebea9
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/LogV3/EventTypeIdConverterTests.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.LogV3;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.LogV3;
+
+public class EventTypeIdConverterTests {
+
+	[Fact]
+	public void returns_expected_event_type_id() {
+		// guards against unexpected interval change
+
+		var index = 0;
+		Assert.Equal(GetExpectedEventId(index), EventTypeIdConverter.ToEventTypeId(index));
+
+		index = 9;
+		Assert.Equal(GetExpectedEventId(index), EventTypeIdConverter.ToEventTypeId(index));
+	}
+
+	[Fact]
+	public void returns_expected_event_number() {
+		// guards against unexpected interval change
+
+		var eventTypeId = 3000U;
+		Assert.Equal(GetExpectedEventNumber(eventTypeId), EventTypeIdConverter.ToEventNumber(eventTypeId));
+
+		eventTypeId = 3001U;
+		Assert.Equal(GetExpectedEventNumber(eventTypeId), EventTypeIdConverter.ToEventNumber(eventTypeId));
+	}
+
+	private long GetExpectedEventId(int index) {
+		var offset = LogV3SystemEventTypes.FirstRealEventTypeNumber;
+		return index * LogV3SystemEventTypes.EventTypeInterval + offset;
+	}
+
+	private long GetExpectedEventNumber(uint eventTypeId) {
+		var offset = LogV3SystemEventTypes.FirstRealEventTypeNumber;
+		return (eventTypeId - offset) / LogV3SystemEventTypes.EventTypeInterval;
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/LogV3/EventTypeIndexTests.cs b/src/KurrentDB.Core.XUnit.Tests/LogV3/EventTypeIndexTests.cs
new file mode 100644
index 00000000000..ec8c0aae6d4
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/LogV3/EventTypeIndexTests.cs
@@ -0,0 +1,71 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using KurrentDB.Core.LogAbstraction.Common;
+using KurrentDB.Core.LogV3;
+using KurrentDB.Core.LogV3.FASTER;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.LogV3;
+
+public class EventTypeIndexTests : IDisposable {
+	readonly string _outputDir = $"testoutput/{nameof(EventTypeIndexTests)}";
+	FASTERNameIndexPersistence _persistence;
+	NameIndex _sut;
+
+	public EventTypeIndexTests() {
+		TryDeleteDirectory();
+		GenSut();
+	}
+
+	void TryDeleteDirectory() {
+		try {
+			Directory.Delete(_outputDir, recursive: true);
+		} catch { }
+	}
+
+	void GenSut() {
+		_sut?.CancelReservations();
+		_persistence?.Dispose();
+		_persistence = new FASTERNameIndexPersistence(
+			indexName: "EventTypeIndexPersistence",
+			logDir: _outputDir,
+			firstValue: LogV3SystemEventTypes.FirstRealEventTypeNumber,
+			valueInterval: LogV3SystemEventTypes.EventTypeInterval,
+			initialReaderCount: 1,
+			maxReaderCount: 1,
+			enableReadCache: true,
+			checkpointInterval: Timeout.InfiniteTimeSpan);
+
+		_sut = new(
+			indexName: "EventTypeIndex",
+			firstValue: LogV3SystemEventTypes.FirstRealEventTypeNumber,
+			valueInterval: LogV3SystemEventTypes.EventTypeInterval,
+			existenceFilter: new NoNameExistenceFilter(),
+			persistence: _persistence,
+			metastreams: null,
+			recordTypeToHandle: typeof(LogV3EventTypeRecord));
+	}
+
+	public void Dispose() {
+		_persistence?.Dispose();
+		TryDeleteDirectory();
+	}
+
+	[Fact]
+	public void uses_correct_interval() {
+		Assert.False(_sut.GetOrReserve("eventTypeA", out var eventTypeNumberA, out var newNumberA, out var newNameA));
+		Assert.Equal("eventTypeA", newNameA);
+		Assert.Equal(LogV3SystemEventTypes.FirstRealEventTypeNumber, eventTypeNumberA);
+		Assert.Equal(LogV3SystemEventTypes.FirstRealEventTypeNumber, newNumberA);
+
+		Assert.False(_sut.GetOrReserve("eventTypeB", out var eventTypeNumberB, out var newNumberB, out var newNameB));
+		Assert.Equal("eventTypeB", newNameB);
+		Assert.Equal(LogV3SystemEventTypes.FirstRealEventTypeNumber + 1, eventTypeNumberB);
+		Assert.Equal(LogV3SystemEventTypes.FirstRealEventTypeNumber + 1, newNumberB);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/LogV3/LogV3RecordFactoryTests.cs b/src/KurrentDB.Core.XUnit.Tests/LogV3/LogV3RecordFactoryTests.cs
new file mode 100644
index 00000000000..82ca6d10399
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/LogV3/LogV3RecordFactoryTests.cs
@@ -0,0 +1,109 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Runtime.InteropServices;
+using KurrentDB.Core.LogV3;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.LogV3;
+
+// we dont want too many tests here, rather pass this factory into the higher up
+// integration tests like we do for the v2 factory.
+public class LogV3RecordFactoryTests {
+	readonly Guid _guid1 = Guid.Parse("00000000-0000-0000-0000-000000000001");
+	readonly Guid _guid2 = Guid.Parse("00000000-0000-0000-0000-000000000002");
+	readonly DateTime _dateTime1 = new(0x08_D9_15_80_C3_A1_00_00);
+	readonly long _long1 = 1;
+	readonly long _long2 = 2;
+	readonly long _long4 = 4;
+	readonly uint _uint3000 = 3000;
+	readonly ushort _ushort = 5;
+	readonly string _string1 = "string-one";
+	readonly LogV3RecordFactory _sut = new();
+	readonly PrepareFlags _prepareflags = PrepareFlags.SingleWrite;
+	readonly ReadOnlyMemory<byte> _bytes1 = new byte[] { 0x10 };
+	readonly ReadOnlyMemory<byte> _bytes2 = new byte[] { 0x20, 0x01 };
+
+	[Fact]
+	public void can_create_epoch() {
+		var epochNumber = 5;
+		var epochIn = new EpochRecord(
+			epochPosition: _long1,
+			epochNumber: epochNumber,
+			epochId: _guid1,
+			prevEpochPosition: _long2,
+			timeStamp: _dateTime1,
+			leaderInstanceId: _guid2);
+
+		var systemEpoch = _sut.CreateEpoch(epochIn);
+
+		var epochOut = systemEpoch.GetEpochRecord();
+
+		Assert.Equal(_long1, systemEpoch.LogPosition);
+		Assert.Equal(LogRecordType.System, systemEpoch.RecordType);
+		Assert.Equal(SystemRecordType.Epoch, systemEpoch.SystemRecordType);
+		Assert.Equal(_long1, systemEpoch.Version);
+
+		Assert.Equal(epochIn.EpochPosition, epochOut.EpochPosition);
+		Assert.Equal(epochIn.TimeStamp, epochOut.TimeStamp);
+		Assert.Equal(epochIn.EpochId, epochOut.EpochId);
+		Assert.Equal(epochIn.EpochNumber, epochOut.EpochNumber);
+		Assert.Equal(epochIn.PrevEpochPosition, epochOut.PrevEpochPosition);
+		Assert.Equal(epochIn.LeaderInstanceId, epochOut.LeaderInstanceId);
+	}
+
+	[Fact]
+	public void can_create_prepare() {
+		var prepare = _sut.CreatePrepare(
+			logPosition: _long1,
+			correlationId: _guid1,
+			eventId: _guid2,
+			// must be same as logPosition
+			transactionPosition: _long1,
+			// must be 0 since only one event is supported at the moment
+			transactionOffset: 0,
+			eventStreamId: _uint3000,
+			expectedVersion: _long4,
+			timeStamp: _dateTime1,
+			flags: _prepareflags,
+			eventType: _uint3000,
+			data: _bytes1,
+			metadata: _bytes2);
+
+		Assert.Equal(_long1, prepare.LogPosition);
+		Assert.Equal(_guid1, prepare.CorrelationId);
+		Assert.Equal(_guid2, prepare.EventId);
+		Assert.Equal(_long1, prepare.TransactionPosition);
+		Assert.Equal(0, prepare.TransactionOffset);
+		Assert.Equal(_uint3000, prepare.EventStreamId);
+		Assert.Equal(_long4, prepare.ExpectedVersion);
+		Assert.Equal(_dateTime1, prepare.TimeStamp);
+		Assert.Equal(_prepareflags, prepare.Flags);
+		Assert.Equal(_uint3000, prepare.EventType);
+		Assert.Equal(MemoryMarshal.ToEnumerable(_bytes1), MemoryMarshal.ToEnumerable(prepare.Data));
+		Assert.Equal(MemoryMarshal.ToEnumerable(_bytes2), MemoryMarshal.ToEnumerable(prepare.Metadata));
+	}
+
+	[Fact]
+	public void can_create_event_type() {
+		var eventType = (LogV3EventTypeRecord)_sut.CreateEventTypeRecord(
+			eventTypeId: _guid1,
+			parentEventTypeId: _guid2,
+			eventType: _string1,
+			eventTypeNumber: _uint3000,
+			eventTypeVersion: _ushort,
+			logPosition: _long1,
+			timeStamp: _dateTime1);
+
+		Assert.Equal(_guid1, eventType.EventId);
+		Assert.Equal(_guid2, eventType.ParentEventId);
+		Assert.Equal(_string1, eventType.EventTypeName);
+		Assert.Equal(_uint3000, eventType.EventTypeNumber);
+		Assert.Equal(_ushort, eventType.EventTypeVersion);
+		Assert.Equal(_long1, eventType.LogPosition);
+		Assert.Equal(_dateTime1, eventType.TimeStamp);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/LogV3/LogV3SizerTests.cs b/src/KurrentDB.Core.XUnit.Tests/LogV3/LogV3SizerTests.cs
new file mode 100644
index 00000000000..4ae42108e29
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/LogV3/LogV3SizerTests.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.LogV3;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.LogV3;
+
+public class LogV3SizerTests {
+	[Fact]
+	public void can_get_size() {
+		var sut = new LogV3Sizer();
+		Assert.Equal(4, sut.GetSizeInBytes(12345));
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/LogV3/LogV3StreamExistenceFilterInitializerTests.cs b/src/KurrentDB.Core.XUnit.Tests/LogV3/LogV3StreamExistenceFilterInitializerTests.cs
new file mode 100644
index 00000000000..b5a25c0f40f
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/LogV3/LogV3StreamExistenceFilterInitializerTests.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.LogV3;
+using Xunit;
+using StreamId = System.UInt32;
+
+namespace KurrentDB.Core.XUnit.Tests.LogV3;
+
+public class LogV3StreamExistenceFilterInitializerTests {
+	[Fact]
+	public async Task can_initialize_empty() {
+		var sut = new LogV3StreamExistenceFilterInitializer(new MockNameLookup(new()));
+
+		var filter = new MockExistenceFilter();
+		await filter.Initialize(sut, 0, CancellationToken.None);
+
+		Assert.Equal(-1, filter.CurrentCheckpoint);
+		Assert.Empty(filter.Streams);
+	}
+
+	[Fact]
+	public async Task can_initialize_non_empty() {
+		var sut = new LogV3StreamExistenceFilterInitializer(new MockNameLookup(
+			new Dictionary<StreamId, string> {
+				{ 1024, "1024" },
+				{ 1026, "1026" },
+		}));
+
+		var filter = new MockExistenceFilter();
+		await filter.Initialize(sut, 0, CancellationToken.None);
+
+		Assert.Equal(1026, filter.CurrentCheckpoint);
+		Assert.True(filter.MightContain("1024"));
+		Assert.True(filter.MightContain("1026"));
+		Assert.False(filter.MightContain("1028"));
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/LogV3/LogV3StreamIdValidatorTests.cs b/src/KurrentDB.Core.XUnit.Tests/LogV3/LogV3StreamIdValidatorTests.cs
new file mode 100644
index 00000000000..368bca569c8
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/LogV3/LogV3StreamIdValidatorTests.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.LogV3;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.LogV3;
+
+public class LogV3StreamIdValidatorTests {
+	readonly LogV3StreamIdValidator _sut = new();
+
+	[Fact]
+	public void accepts_positive() {
+		_sut.Validate(1);
+	}
+
+	[Fact]
+	public void accepts_zero() {
+		_sut.Validate(0);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/LogV3/MockExistenceFilter.cs b/src/KurrentDB.Core.XUnit.Tests/LogV3/MockExistenceFilter.cs
new file mode 100644
index 00000000000..206f6533b5f
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/LogV3/MockExistenceFilter.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.LogAbstraction;
+
+namespace KurrentDB.Core.XUnit.Tests.LogV3;
+
+public class MockExistenceFilter : INameExistenceFilter {
+	public HashSet<string> Streams { get; } = new();
+
+	public long CurrentCheckpoint { get; set; } = -1;
+
+	public void Add(string name) {
+		Streams.Add(name);
+	}
+
+	public void Add(ulong hash) {
+		throw new NotImplementedException();
+	}
+
+	public void Dispose() {
+	}
+
+	public ValueTask Initialize(INameExistenceFilterInitializer source, long truncateToPosition, CancellationToken token)
+		=> source.Initialize(this, truncateToPosition, token);
+
+	public void TruncateTo(long checkpoint) {
+		CurrentCheckpoint = checkpoint;
+	}
+
+	public void Verify(double corruptionThreshold) { }
+
+	public bool MightContain(string item) {
+		return Streams.Contains(item);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/LogV3/MockNameLookup.cs b/src/KurrentDB.Core.XUnit.Tests/LogV3/MockNameLookup.cs
new file mode 100644
index 00000000000..fad3d18a33a
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/LogV3/MockNameLookup.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext;
+using KurrentDB.Core.LogAbstraction;
+using StreamId = System.UInt32;
+
+namespace KurrentDB.Core.XUnit.Tests.LogV3;
+
+class MockNameLookup : INameLookup<StreamId> {
+	private readonly Dictionary<StreamId, string> _dict;
+
+	public MockNameLookup(Dictionary<StreamId, string> dict) {
+		_dict = dict;
+	}
+
+	public ValueTask<Optional<StreamId>> TryGetLastValue(CancellationToken token) {
+		return new(_dict.Count > 0
+			? _dict.Keys.Max()
+			: Optional.None<StreamId>());
+	}
+
+	public ValueTask<string> LookupName(StreamId key, CancellationToken token) {
+		return new(_dict.TryGetValue(key, out var name)
+			? name
+			: null);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/LogV3/PartitionManagerTests.cs b/src/KurrentDB.Core.XUnit.Tests/LogV3/PartitionManagerTests.cs
new file mode 100644
index 00000000000..c7cb84adc50
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/LogV3/PartitionManagerTests.cs
@@ -0,0 +1,242 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.LogV3;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.LogV3;
+
+
+public class PartitionManagerTests {
+
+	[Fact]
+	public async Task creates_new_root_partition_on_first_epoch() {
+		var reader = new FakeReader(withoutRecords: true);
+		var writer = new FakeWriter();
+
+		IPartitionManager partitionManager = new PartitionManager(reader, writer, new LogV3RecordFactory());
+
+		await partitionManager.Initialize(CancellationToken.None);
+
+		Assert.Collection(writer.WrittenRecords,
+			r => {
+				Assert.Equal(LogRecordType.PartitionType, r.RecordType);
+				Assert.IsType<PartitionTypeLogRecord>(r);
+				Assert.Equal("Root", ((PartitionTypeLogRecord)r).Record.StringPayload);
+				Assert.Equal(partitionManager.RootTypeId, ((PartitionTypeLogRecord)r).Record.Header.RecordId);
+				Assert.Equal(Guid.Empty, ((PartitionTypeLogRecord)r).Record.SubHeader.PartitionId);
+			},
+			r => {
+				Assert.Equal(LogRecordType.Partition, r.RecordType);
+				Assert.IsType<PartitionLogRecord>(r);
+				Assert.Equal("Root", ((PartitionLogRecord)r).Record.StringPayload);
+				Assert.Equal(partitionManager.RootId, ((PartitionLogRecord)r).Record.Header.RecordId);
+				Assert.Equal(partitionManager.RootTypeId, ((PartitionLogRecord)r).Record.SubHeader.PartitionTypeId);
+				Assert.Equal(Guid.Empty, ((PartitionLogRecord)r).Record.SubHeader.ParentPartitionId);
+			});
+
+		Assert.True(writer.IsFlushed);
+	}
+
+	[Fact]
+	public async Task configures_record_factory_with_root_partition_id() {
+		var reader = new FakeReader();
+		var recordFactory = new LogV3RecordFactory();
+
+		IPartitionManager partitionManager = new PartitionManager(reader, new FakeWriter(), recordFactory);
+
+		await partitionManager.Initialize(CancellationToken.None);
+
+		var streamRecord = (LogV3StreamRecord)recordFactory.CreateStreamRecord(Guid.NewGuid(), 1, DateTime.UtcNow, 1, "stream-1");
+		Assert.Equal(partitionManager.RootId, streamRecord.Record.SubHeader.PartitionId);
+	}
+
+	[Fact]
+	public async Task reads_root_partition_once_initialized() {
+		var rootPartitionId = Guid.NewGuid();
+		var rootPartitionTypeId = Guid.NewGuid();
+		var reader = new FakeReader(rootPartitionId, rootPartitionTypeId);
+		var writer = new FakeWriter();
+
+		IPartitionManager partitionManager = new PartitionManager(reader, writer, new LogV3RecordFactory());
+
+		await partitionManager.Initialize(CancellationToken.None);
+
+		Assert.Empty(writer.WrittenRecords);
+		Assert.Equal(rootPartitionId, partitionManager.RootId);
+		Assert.Equal(rootPartitionTypeId, partitionManager.RootTypeId);
+	}
+
+	[Fact]
+	public async Task reads_root_partition_only_once() {
+		var reader = new FakeReader();
+		var writer = new FakeWriter();
+
+		IPartitionManager partitionManager = new PartitionManager(reader, writer, new LogV3RecordFactory());
+
+		await partitionManager.Initialize(CancellationToken.None);
+		await partitionManager.Initialize(CancellationToken.None);
+
+		Assert.Empty(writer.WrittenRecords);
+		Assert.Equal(2, reader.ReadCount);
+	}
+
+	[Fact]
+	public async Task creates_root_partition_in_case_it_partially_failed_previously() {
+		var rootPartitionTypeId = Guid.NewGuid();
+		var reader = new FakeReader(rootPartitionId: null, rootPartitionTypeId);
+		var writer = new FakeWriter();
+
+		IPartitionManager partitionManager = new PartitionManager(reader, writer, new LogV3RecordFactory());
+
+		await partitionManager.Initialize(CancellationToken.None);
+
+		Assert.True(partitionManager.RootId.HasValue);
+		Assert.Equal(rootPartitionTypeId, partitionManager.RootTypeId);
+		Assert.Collection(writer.WrittenRecords,
+			r => {
+				Assert.Equal(LogRecordType.Partition, r.RecordType);
+				Assert.IsType<PartitionLogRecord>(r);
+				Assert.Equal("Root", ((PartitionLogRecord)r).Record.StringPayload);
+				Assert.Equal(partitionManager.RootId, ((PartitionLogRecord)r).Record.Header.RecordId);
+				Assert.Equal(partitionManager.RootTypeId, ((PartitionLogRecord)r).Record.SubHeader.PartitionTypeId);
+				Assert.Equal(Guid.Empty, ((PartitionLogRecord)r).Record.SubHeader.ParentPartitionId);
+			});
+	}
+
+	[Fact]
+	public async Task throws_on_unexpected_log_record_type() {
+		var reader = new FakeReader(UnexpectedLogRecord);
+
+		IPartitionManager partitionManager = new PartitionManager(reader, new FakeWriter(), new LogV3RecordFactory());
+
+		await Assert.ThrowsAsync<ArgumentOutOfRangeException>(() => partitionManager.Initialize(CancellationToken.None).AsTask());
+	}
+
+	[Fact]
+	public async Task throws_on_unexpected_system_log_record_type() {
+		var reader = new FakeReader(UnexpectedSystemLogRecord);
+
+		IPartitionManager partitionManager = new PartitionManager(reader, new FakeWriter(), new LogV3RecordFactory());
+
+		await Assert.ThrowsAsync<ArgumentOutOfRangeException>(() => partitionManager.Initialize(CancellationToken.None).AsTask());
+	}
+
+	private LogV3StreamRecord UnexpectedLogRecord => new LogV3StreamRecord(
+		streamId: Guid.NewGuid(),
+		logPosition: 0,
+		timeStamp: DateTime.UtcNow,
+		streamNumber: 1,
+		streamName: "unexpected-stream",
+		partitionId: Guid.NewGuid());
+
+	private SystemLogRecord UnexpectedSystemLogRecord => new SystemLogRecord(
+		logPosition: 0,
+		timeStamp: DateTime.UtcNow,
+		systemRecordType: SystemRecordType.Invalid,
+		systemRecordSerialization: SystemRecordSerialization.Invalid,
+		data: new byte[0]);
+}
+
+class FakeWriter : ITransactionFileWriter {
+	public long Position { get; }
+	public long FlushedPosition { get; }
+
+	public FakeWriter() {
+		WrittenRecords = new List<ILogRecord>();
+	}
+
+	public bool IsFlushed { get; private set; }
+	public List<ILogRecord> WrittenRecords { get; }
+
+	public ValueTask Open(CancellationToken token)
+		=> token.IsCancellationRequested ? ValueTask.FromCanceled(token) : ValueTask.CompletedTask;
+
+	public bool CanWrite(int numBytes) => true;
+
+	public ValueTask<(bool, long)> Write(ILogRecord record, CancellationToken token) {
+		WrittenRecords.Add(record);
+		return new((true, record.LogPosition + 1));
+	}
+
+	public void OpenTransaction() => throw new NotImplementedException();
+
+	public ValueTask<long?> WriteToTransaction(ILogRecord record, CancellationToken token)
+		=> ValueTask.FromException<long?>(new NotImplementedException());
+
+	public void CommitTransaction() => throw new NotImplementedException();
+
+	public bool HasOpenTransaction() => throw new NotImplementedException();
+
+	public ValueTask Flush(CancellationToken token) {
+		IsFlushed = true;
+		return ValueTask.CompletedTask;
+	}
+
+	public ValueTask DisposeAsync() => ValueTask.CompletedTask;
+}
+
+class FakeReader : ITransactionFileReader {
+	private readonly List<SeqReadResult> _results = new();
+	private int _resultIndex = 0;
+	private int _readCount = 0;
+
+	public int ReadCount => _readCount;
+
+	public FakeReader(ILogRecord record) {
+		_results.Add(new SeqReadResult(true, false, record, 0, 0, 0));
+	}
+
+	public FakeReader(bool withoutRecords = false) : this(Guid.NewGuid(), Guid.NewGuid(), withoutRecords) {
+	}
+
+	public FakeReader(Guid? rootPartitionId, Guid? rootPartitionTypeId, bool withoutRecords = false) {
+		if (withoutRecords) {
+			_results.Add(SeqReadResult.Failure);
+			return;
+		}
+
+		if (rootPartitionTypeId.HasValue) {
+			var rootPartitionType = new PartitionTypeLogRecord(
+					DateTime.UtcNow, 2, rootPartitionTypeId.Value, Guid.Empty, "Root");
+
+			_results.Add(new SeqReadResult(true, false, rootPartitionType, 0, 0, 0));
+		}
+
+		if (rootPartitionId.HasValue && rootPartitionTypeId.HasValue) {
+			var rootPartition = new PartitionLogRecord(
+					DateTime.UtcNow, 3, rootPartitionId.Value, rootPartitionTypeId.Value, Guid.Empty, 0, 0, "Root");
+
+			_results.Add(new SeqReadResult(true, false, rootPartition, 0, 0, 0));
+		}
+	}
+
+	public void Reposition(long position) {
+		_resultIndex = (int)position;
+	}
+
+	public ValueTask<SeqReadResult> TryReadNext(CancellationToken token) {
+		_readCount++;
+
+		return new(_resultIndex < _results.Count
+			? _results[_resultIndex++]
+			: SeqReadResult.Failure);
+	}
+
+	public ValueTask<SeqReadResult> TryReadPrev(CancellationToken token)
+		=> ValueTask.FromException<SeqReadResult>(new NotImplementedException());
+
+	public ValueTask<RecordReadResult> TryReadAt(long position, bool couldBeScavenged, CancellationToken token)
+		=> ValueTask.FromException<RecordReadResult>(new NotImplementedException());
+
+	public ValueTask<bool> ExistsAt(long position, CancellationToken token)
+		=> new(true);
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/LogV3/StreamNameIndexTests.cs b/src/KurrentDB.Core.XUnit.Tests/LogV3/StreamNameIndexTests.cs
new file mode 100644
index 00000000000..07e7dc29fad
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/LogV3/StreamNameIndexTests.cs
@@ -0,0 +1,396 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.LogAbstraction.Common;
+using KurrentDB.Core.LogV3;
+using KurrentDB.Core.LogV3.FASTER;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using Xunit;
+using StreamId = System.UInt32;
+
+namespace KurrentDB.Core.XUnit.Tests.LogV3;
+
+public class StreamNameIndexTests : IDisposable {
+	readonly string _outputDir = $"testoutput/{nameof(StreamNameIndexTests)}";
+	FASTERNameIndexPersistence _persistence;
+	NameIndex _sut;
+
+	public StreamNameIndexTests() {
+		TryDeleteDirectory();
+		GenSut();
+	}
+
+	void TryDeleteDirectory() {
+		try {
+			Directory.Delete(_outputDir, recursive: true);
+		} catch { }
+	}
+
+	void GenSut() {
+		_sut?.CancelReservations();
+		_persistence?.Dispose();
+		_persistence = new FASTERNameIndexPersistence(
+			indexName: "StreamNameIndexPersistence",
+			logDir: _outputDir,
+			firstValue: LogV3SystemStreams.FirstRealStream,
+			valueInterval: LogV3SystemStreams.StreamInterval,
+			initialReaderCount: 1,
+			maxReaderCount: 1,
+			enableReadCache: true,
+			checkpointInterval: Timeout.InfiniteTimeSpan);
+
+		_sut = new(
+			indexName: "StreamNameIndex",
+			firstValue: LogV3SystemStreams.FirstRealStream,
+			valueInterval: LogV3SystemStreams.StreamInterval,
+			existenceFilter: new NoNameExistenceFilter(),
+			persistence: _persistence,
+			metastreams: new LogV3Metastreams(),
+			recordTypeToHandle: typeof(LogV3StreamRecord));
+	}
+
+	public void Dispose() {
+		_persistence?.Dispose();
+		TryDeleteDirectory();
+	}
+
+	[Fact]
+	public void can_handle_slightly_larger_name() {
+		// fails if we copy the spanbyte returned from GetKey in scan (!)
+		var name = "abcdefghijklmopqrstuv";
+		_persistence.Add(name, 1024);
+		Assert.Collection(
+			_persistence.Scan(),
+			x => {
+				Assert.Equal(name, x.Name);
+				Assert.Equal(1024U, x.Value);
+			});
+	}
+
+	[Fact]
+	public void can_reserve_and_confirm() {
+		// reserve streamA
+		Assert.False(_sut.GetOrReserve("streamA", out var streamNumber, out var newNumber, out var newName));
+		Assert.Equal("streamA", newName);
+		Assert.Equal(LogV3SystemStreams.FirstRealStream, streamNumber);
+		Assert.Equal(LogV3SystemStreams.FirstRealStream, newNumber);
+
+		// can be found by writer
+		Assert.True(_sut.GetOrReserve("streamA", out streamNumber, out _, out _));
+		Assert.Equal(LogV3SystemStreams.FirstRealStream, streamNumber);
+
+		// cannot be found by reader
+		Assert.False(_persistence.TryGetValue("streamA", out _));
+
+		// confirm (i.e. it has now has been replicated)
+		_sut.Confirm("streamA", streamNumber);
+
+		// can be found by writer and reader
+		Assert.True(_sut.GetOrReserve("streamA", out streamNumber, out _, out _));
+		Assert.Equal(LogV3SystemStreams.FirstRealStream, streamNumber);
+		Assert.True(_persistence.TryGetValue("streamA", out streamNumber));
+		Assert.Equal(LogV3SystemStreams.FirstRealStream, streamNumber);
+	}
+
+	[Fact]
+	public void can_unsolicited_confirm() {
+		_sut.Confirm("streamA", 1024);
+		_sut.Confirm("streamB", 1026);
+		Assert.False(_sut.GetOrReserve("streamC", out var numberC, out _, out _));
+		Assert.Equal(1028U, numberC);
+	}
+
+	[Fact]
+	public void can_cancel_reservations() {
+		Assert.False(_sut.GetOrReserve("streamA", out var numberA, out _, out _));
+		Assert.Equal(1024U, numberA);
+		_sut.CancelReservations();
+		Assert.False(_sut.GetOrReserve("streamC", out var numberC, out _, out _));
+		Assert.Equal(numberA, numberC);
+	}
+
+	[Fact]
+	public async Task can_checkpoint_log() {
+		// reserve A and B
+		Assert.False(_sut.GetOrReserve("streamA", out var numberA, out _, out _));
+		Assert.False(_sut.GetOrReserve("streamB", out var numberB, out _, out _));
+
+		// persist A
+		_sut.Confirm("streamA", numberA);
+
+		// checkpoint (persists to disk)
+		await _persistence.CheckpointLogAsync();
+
+		// simulate restart
+		GenSut();
+
+		// A can be found by writer and reader
+		Assert.True(_sut.GetOrReserve("streamA", out var numberAAfterRecovery, out _, out _));
+		Assert.Equal(numberA, numberAAfterRecovery);
+		Assert.True(_persistence.TryGetValue("streamA", out numberAAfterRecovery));
+		Assert.Equal(numberA, numberAAfterRecovery);
+
+		// B cannot be found by writer or reader
+		Assert.False(_sut.GetOrReserve("streamB", out var _, out _, out _));
+		Assert.False(_persistence.TryGetValue("streamB", out _));
+	}
+
+	[Fact]
+	public async Task can_truncate_then_catchup() {
+		// put a stream into the index and persist it
+		_sut.GetOrReserve("streamA", out var streamAId, out _, out _);
+		await _persistence.CheckpointLogAsync();
+
+		// call init with an empty source, removing streamA.
+		await _sut.InitializeWithConfirmed(new MockNameLookup(new()), CancellationToken.None);
+
+		// simulate restart
+		GenSut();
+
+		// when adding new stream
+		_sut.GetOrReserve("streamB", out var streamBId, out _, out _);
+
+		// expect that it has the same id as A, since that was truncated.
+		Assert.Equal(streamAId, streamBId);
+	}
+
+	static readonly IEnumerable<(StreamId StreamId, string StreamName)> _streamsSource =
+		Enumerable
+			.Range(0, int.MaxValue)
+			.Select(x => {
+				var streamId = StreamIdConverter.ToStreamId(x);
+				return (StreamId: streamId, StreamName: $"stream{streamId}");
+			});
+
+	// populate the sut with a given number of confirmed streams.
+	void PopulateSut(int numStreams) {
+		var xs = _streamsSource.Take(numStreams).ToList();
+
+		foreach (var (streamId, streamName) in xs) {
+			_sut.GetOrReserve(streamName, out var outStreamId, out var _, out var _);
+			Assert.Equal(streamId, outStreamId);
+			_sut.Confirm(streamName, streamId);
+		}
+	}
+
+	ValueTask DeleteStreams(int numTotalStreams, int numToDelete, CancellationToken token) {
+		var streamsStream = GenerateStreamsStream(numTotalStreams - numToDelete);
+		var source = new MockNameLookup(streamsStream.ToDictionary(x => x.StreamId, x => x.StreamName));
+		return _sut.InitializeWithConfirmed(source, token);
+	}
+
+	static IList<(StreamId StreamId, string StreamName)> GenerateStreamsStream(int numStreams) {
+		return _streamsSource.Take(numStreams).ToList();
+	}
+
+	async ValueTask TestInit(int numInStreamNameIndex, int numInStandardIndex, CancellationToken token = default) {
+		// given: sut populated with x streams
+		PopulateSut(numInStreamNameIndex);
+
+		// when: initialisting with source populated with y streams
+		var streamsStream = GenerateStreamsStream(numInStandardIndex);
+		var source = new MockNameLookup(streamsStream.ToDictionary(x => x.StreamId, x => x.StreamName));
+		await _sut.InitializeWithConfirmed(source, token);
+
+		// then: after initialisation sut should contains the same as source.
+		// check that all of the streams stream is in the stream name index
+		var i = 0;
+		for (; i < streamsStream.Count; i++) {
+			var (streamId, streamName) = streamsStream[i];
+			Assert.True(_sut.GetOrReserve(streamName, out var outStreamId, out var _, out var _));
+			Assert.Equal(streamId, outStreamId);
+		}
+
+		// check that the streamnameindex doesn't contain anything extra.
+		foreach (var (name, value) in _persistence.Scan()) {
+			var outName = await source.LookupName(value, token);
+			Assert.NotEmpty(outName);
+			Assert.Equal(name, outName);
+		}
+
+		// and the next created stream has the right number
+		Assert.False(_sut.GetOrReserve($"{Guid.NewGuid()}", out var newStreamId, out var _, out var _));
+		Assert.Equal(streamsStream.Last().StreamId + 2, newStreamId);
+	}
+
+	[Fact]
+	public async Task on_init_can_catchup() {
+		await TestInit(
+			numInStreamNameIndex: 3000,
+			numInStandardIndex: 5000);
+	}
+
+	[Fact]
+	public async Task on_init_can_catchup_from_0() {
+		await TestInit(
+			numInStreamNameIndex: 0,
+			numInStandardIndex: 5000);
+	}
+
+	[Fact]
+	public async Task on_init_can_truncate() {
+		await TestInit(
+			numInStreamNameIndex: 5000,
+			numInStandardIndex: 3000);
+	}
+
+	[Fact]
+	void can_use_read_cache_for_getoradd() {
+		GenSut();
+		var numStreams = 100_000;
+		PopulateSut(numStreams);
+
+		void GetOrReserve() {
+			Assert.True(_sut.GetOrReserve("stream2000", out var streamId, out _, out _));
+			Assert.Equal(2000U, streamId);
+		}
+
+		GetOrReserve();
+
+		var sw = new Stopwatch();
+		sw.Start();
+		for (int i = 0; i < 100_000; i++)
+			GetOrReserve();
+		Assert.True(sw.ElapsedMilliseconds < 1000);
+	}
+
+	[Fact]
+	void can_use_read_cache_for_lookup() {
+		GenSut();
+		var numStreams = 100_000;
+		PopulateSut(numStreams);
+
+		Assert.Equal(2000U, _persistence.LookupValue("stream2000"));
+
+		var sw = new Stopwatch();
+		sw.Start();
+		for (int i = 0; i < 100_000; i++)
+			Assert.Equal(2000U, _persistence.LookupValue("stream2000"));
+		Assert.True(sw.ElapsedMilliseconds < 1000);
+	}
+
+	[Fact]
+	public void can_scan() {
+		var numStreams = 5000;
+		PopulateSut(numStreams);
+
+		var scanned = _persistence.Scan().ToList();
+
+		Assert.Equal(numStreams, scanned.Count);
+
+		var expectedStreamId = LogV3SystemStreams.FirstRealStream;
+		for (int i = 0; i < numStreams; i++) {
+			Assert.Equal(expectedStreamId, scanned[i].Value);
+			Assert.Equal($"stream{expectedStreamId}", scanned[i].Name);
+			expectedStreamId += LogV3SystemStreams.StreamInterval;
+		}
+	}
+
+	[Fact]
+	public void can_scan_backwards() {
+		var numStreams = 5000;
+		PopulateSut(numStreams);
+
+		var scanned = _persistence.ScanBackwards().ToList();
+		scanned.Reverse();
+
+		Assert.Equal(numStreams, scanned.Count);
+
+		var expectedStreamId = LogV3SystemStreams.FirstRealStream;
+		for (int i = 0; i < numStreams; i++) {
+			Assert.Equal(expectedStreamId, scanned[i].Value);
+			Assert.Equal($"stream{expectedStreamId}", scanned[i].Name);
+			expectedStreamId += LogV3SystemStreams.StreamInterval;
+		}
+	}
+
+	[Fact]
+	public void can_scan_empty_range() {
+		var numStreams = 10000;
+		PopulateSut(numStreams);
+
+		var scanned = _persistence.Scan(0, 0).ToList();
+		Assert.Empty(scanned);
+	}
+
+	[Fact]
+	public async Task can_scan_forwards_skipping_truncated() {
+		var numStreams = 10000;
+		var deletedStreams = 500;
+		var remainingStreams = numStreams - deletedStreams;
+		PopulateSut(numStreams);
+		await DeleteStreams(numStreams, deletedStreams, CancellationToken.None);
+
+		var scanned = _persistence.Scan().ToList();
+
+		Assert.Equal(remainingStreams, scanned.Count);
+
+		var expectedStreamId = LogV3SystemStreams.FirstRealStream;
+		for (int i = 0; i < remainingStreams; i++) {
+			Assert.Equal(expectedStreamId, scanned[i].Value);
+			Assert.Equal($"stream{expectedStreamId}", scanned[i].Name);
+			expectedStreamId += LogV3SystemStreams.StreamInterval;
+		}
+	}
+
+	[Fact]
+	public async Task can_scan_backwards_skipping_truncated() {
+		var numStreams = 10000;
+		var deletedStreams = 500;
+		var remainingStreams = numStreams - deletedStreams;
+		PopulateSut(numStreams);
+		await DeleteStreams(numStreams, deletedStreams, CancellationToken.None);
+
+		var scanned = _persistence.ScanBackwards().ToList();
+		scanned.Reverse();
+
+		Assert.Equal(remainingStreams, scanned.Count);
+
+		var expectedStreamId = LogV3SystemStreams.FirstRealStream;
+		for (int i = 0; i < remainingStreams; i++) {
+			Assert.Equal(expectedStreamId, scanned[i].Value);
+			Assert.Equal($"stream{expectedStreamId}", scanned[i].Name);
+			expectedStreamId += LogV3SystemStreams.StreamInterval;
+		}
+	}
+
+	[Fact(Skip = "slow ~10s")]
+	//[Fact]
+	public void can_have_multiple_readers() {
+		var numStreams = 100_000;
+		PopulateSut(numStreams);
+
+		var mres = new ManualResetEventSlim();
+		void RunThread() {
+			try {
+				var expectedStreamId = LogV3SystemStreams.FirstRealStream;
+				for (int i = 0; i < numStreams; i++) {
+					var streamId = _persistence.LookupValue($"stream{expectedStreamId}");
+					if (streamId != expectedStreamId)
+						mres.Set();
+					expectedStreamId += LogV3SystemStreams.StreamInterval;
+				}
+			} catch {
+				mres.Set();
+			}
+		}
+
+		var t1 = new Thread(RunThread);
+		var t2 = new Thread(RunThread);
+
+		t1.Start();
+		t2.Start();
+
+		t1.Join();
+		t2.Join();
+
+		Assert.False(mres.IsSet);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Messages/ClientMessageTests/WriteEventsTests.cs b/src/KurrentDB.Core.XUnit.Tests/Messages/ClientMessageTests/WriteEventsTests.cs
new file mode 100644
index 00000000000..257cf8c3eef
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Messages/ClientMessageTests/WriteEventsTests.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Messages.ClientMessageTests;
+
+public class WriteEventsTests {
+	static ClientMessage.WriteEvents CreateSut(
+		string eventStreamId = default,
+		long expectedVersion = default) =>
+
+		new(internalCorrId: Guid.NewGuid(),
+			correlationId: Guid.NewGuid(),
+			envelope: new NoopEnvelope(),
+			requireLeader: false,
+			eventStreamId: eventStreamId,
+			expectedVersion: expectedVersion,
+			events: [],
+			user: default);
+
+	[Theory]
+	[InlineData("normal")]
+	[InlineData("  not normal  ")] // doubtful that this is a good idea. would be a breaking change to reject though
+	[InlineData("$$normal")]
+	public void accepts_valid_stream_ids(string streamId) {
+		CreateSut(eventStreamId: streamId);
+	}
+
+	[Theory]
+	[InlineData(null)]
+	[InlineData("")]
+	[InlineData("$$")] // "" is an invalid name, and so metadata cannot be set for it
+	public void rejects_invalid_stream_ids(string streamId) {
+		var ex = Assert.Throws<ArgumentOutOfRangeException>(() => {
+			CreateSut(eventStreamId: streamId);
+		});
+
+		Assert.Contains("eventStreamId", ex.Message);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Messaging/MessageTests.cs b/src/KurrentDB.Core.XUnit.Tests/Messaging/MessageTests.cs
new file mode 100644
index 00000000000..69b40bc475b
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Messaging/MessageTests.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Messages;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.Codecs;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Messaging;
+
+public class MessageTests {
+	public MessageTests() {
+		HttpMessage.TextMessage.LabelStatic = "Http";
+	}
+
+	private static void Encode(ICodec codec, string expectedString) {
+		var actualString = codec.To(new HttpMessage.TextMessage("Hello World!"));
+		Assert.Equal(expectedString, actualString);
+	}
+
+	private static void Decode(ICodec codec, string encoded) {
+		var m = codec.From<HttpMessage.TextMessage>(encoded);
+		Assert.Equal("Hello World!", m.Text);
+	}
+
+	private static void RoundTrip(ICodec codec, string expectedString) {
+		Encode(codec, expectedString);
+		Decode(codec, expectedString);
+	}
+
+	[Fact]
+	public void can_round_trip_to_json() => RoundTrip(
+		Codec.Json,
+		"""
+		{
+		  "text": "Hello World!",
+		  "label": "Http"
+		}
+		""");
+
+	[Fact]
+	public void can_encode_to_text() => Encode(
+		Codec.Text,
+		"Text: Hello World!");
+
+	[Fact]
+	public void can_round_trip_to_xml() => RoundTrip(
+		Codec.Xml,
+		"""
+		<?xml version="1.0" encoding="utf-8"?>
+		<TextMessage
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+		<Text>Hello World!</Text>
+		</TextMessage>
+		""".ReplaceLineEndings(""));
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Metrics/AverageMetricTests.cs b/src/KurrentDB.Core.XUnit.Tests/Metrics/AverageMetricTests.cs
new file mode 100644
index 00000000000..7062e4d916b
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Metrics/AverageMetricTests.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Diagnostics.Metrics;
+using KurrentDB.Core.Metrics;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Metrics;
+
+public class AverageMetricTests {
+	[Fact]
+	public void calculates_average() {
+		using var meter = new Meter($"{typeof(QueueProcessingTrackerTests)}");
+		using var listener = new TestMeterListener<double>(meter);
+		var sut = new AverageMetric(meter, "the-metric", "seconds", label => new("queue", label), legacyNames: false);
+		sut.Register("readers", () => 1);
+		sut.Register("readers", () => 2);
+		sut.Register("writer", () => 3);
+		listener.Observe();
+
+		Assert.Collection(
+			listener.RetrieveMeasurements("the-metric-seconds"),
+			m => {
+				Assert.Equal(1.5, m.Value);
+				Assert.Collection(
+					m.Tags,
+					t => {
+						Assert.Equal("queue", t.Key);
+						Assert.Equal("readers", t.Value);
+					});
+			},
+			m => {
+				Assert.Equal(3, m.Value);
+				Assert.Collection(
+					m.Tags,
+					t => {
+						Assert.Equal("queue", t.Key);
+						Assert.Equal("writer", t.Value);
+					});
+			});
+	}
+}
diff --git a/src/EventStore.Core.XUnit.Tests/Metrics/CacheHitsMiseesTrackerTests.cs b/src/KurrentDB.Core.XUnit.Tests/Metrics/CacheHitsMiseesTrackerTests.cs
similarity index 79%
rename from src/EventStore.Core.XUnit.Tests/Metrics/CacheHitsMiseesTrackerTests.cs
rename to src/KurrentDB.Core.XUnit.Tests/Metrics/CacheHitsMiseesTrackerTests.cs
index 6d7598d4f21..5e502fd2141 100644
--- a/src/EventStore.Core.XUnit.Tests/Metrics/CacheHitsMiseesTrackerTests.cs
+++ b/src/KurrentDB.Core.XUnit.Tests/Metrics/CacheHitsMiseesTrackerTests.cs
@@ -1,33 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Diagnostics.Metrics;
 using System.Linq;
 using System.Runtime.CompilerServices;
-using EventStore.Core.Metrics;
-using EventStore.Core.Tests;
+using DotNext.Runtime.CompilerServices;
+using KurrentDB.Core.Metrics;
 using Xunit;
+using static KurrentDB.Common.Configuration.MetricsConfiguration;
 
-using static EventStore.Common.Configuration.MetricsConfiguration;
-
-namespace EventStore.Core.XUnit.Tests.Metrics;
+namespace KurrentDB.Core.XUnit.Tests.Metrics;
 
 public sealed class CacheHitsMissesTrackerTests : IDisposable {
-	private readonly Disposables _disposables = new();
+	private Scope _disposables = new();
 
 	public void Dispose() {
-		_disposables?.Dispose();
+		_disposables.Dispose();
 	}
 
 	private (CacheHitsMissesTracker, TestMeterListener<long>) GenSut(
 		Cache[] enabledCaches,
 		[CallerMemberName] string callerName = "") {
 
-		var meter = new Meter($"{typeof(CacheHitsMissesTrackerTests)}-{callerName}").DisposeWith(_disposables);
-		var listener = new TestMeterListener<long>(meter).DisposeWith(_disposables);
+		var meter = new Meter($"{typeof(CacheHitsMissesTrackerTests)}-{callerName}");
+		_disposables.RegisterForDispose(meter);
+
+		var listener = new TestMeterListener<long>(meter);
+		_disposables.RegisterForDispose(listener);
+
 		var metric = new CacheHitsMissesMetric(meter, enabledCaches, "the-metric", new() {
 			{ Cache.StreamInfo, "stream-info" },
 			{ Cache.Chunk, "chunk" },
 		});
-		var sut =  new CacheHitsMissesTracker(metric);
+		var sut = new CacheHitsMissesTracker(metric);
 		return (sut, listener);
 	}
 
diff --git a/src/KurrentDB.Core.XUnit.Tests/Metrics/CacheResourcesTrackerTests.cs b/src/KurrentDB.Core.XUnit.Tests/Metrics/CacheResourcesTrackerTests.cs
new file mode 100644
index 00000000000..f4a3695cafe
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Metrics/CacheResourcesTrackerTests.cs
@@ -0,0 +1,93 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics.Metrics;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using DotNext.Runtime.CompilerServices;
+using KurrentDB.Core.Caching;
+using KurrentDB.Core.Metrics;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Metrics;
+
+public sealed class CacheResourcesTrackerTests : IDisposable {
+	private Scope _disposables = new();
+
+	public void Dispose() {
+		_disposables.Dispose();
+	}
+
+	private (CacheResourcesTracker, TestMeterListener<long>) GenSut(
+		[CallerMemberName] string callerName = "") {
+
+		var meter = new Meter($"{typeof(CacheResourcesTrackerTests)}-{callerName}");
+		_disposables.RegisterForDispose(meter);
+
+		var listener = new TestMeterListener<long>(meter);
+		_disposables.RegisterForDispose(listener);
+
+		var metrics = new CacheResourcesMetrics(meter, "the-metric", legacyNames: false);
+		var sut = new CacheResourcesTracker(metrics);
+		return (sut, listener);
+	}
+
+	[Fact]
+	public void observes_all_caches() {
+		var (sut, listener) = GenSut();
+
+		sut.Register("cacheA", ResizerUnit.Entries, () => new("", "",
+			capacity: 1,
+			size: 2,
+			count: 3,
+			numChildren: 0));
+
+		sut.Register("cacheB", ResizerUnit.Bytes, () => new("", "",
+			capacity: 4,
+			size: 5,
+			count: 6,
+			numChildren: 0));
+
+		listener.Observe();
+		// here we look up -entries-entries, but both the exporters (Prometheus and OTEL) deduplicate
+		// the fact that the metric name ends with the unit. we avoid having two metrics with the same
+		// name but different units.
+		AssertMeasurements(listener, "the-metric-entries-entries",
+			AssertMeasurement("cacheA", "capacity", 1),
+			AssertMeasurement("cacheA", "size", 2),
+			AssertMeasurement("cacheA", "count", 3),
+			AssertMeasurement("cacheB", "count", 6));
+
+		AssertMeasurements(listener, "the-metric-bytes-bytes",
+			AssertMeasurement("cacheB", "capacity", 4),
+			AssertMeasurement("cacheB", "size", 5));
+	}
+
+	static Action<TestMeterListener<long>.TestMeasurement> AssertMeasurement(
+		string cacheKey,
+		string kind,
+		long expectedValue) =>
+
+		actualMeasurement => {
+			Assert.Equal(expectedValue, actualMeasurement.Value);
+			Assert.Collection(
+				actualMeasurement.Tags.ToArray(),
+				tag => {
+					Assert.Equal("cache", tag.Key);
+					Assert.Equal(cacheKey, tag.Value);
+				},
+				tag => {
+					Assert.Equal("kind", tag.Key);
+					Assert.Equal(kind, tag.Value);
+				});
+		};
+
+	static void AssertMeasurements(
+		TestMeterListener<long> listener,
+		string metric,
+		params Action<TestMeterListener<long>.TestMeasurement>[] actions) {
+
+		Assert.Collection(listener.RetrieveMeasurements(metric), actions);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Metrics/Conf/test-metrics-config.json b/src/KurrentDB.Core.XUnit.Tests/Metrics/Conf/test-metrics-config.json
new file mode 100644
index 00000000000..f1ec65d9e88
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Metrics/Conf/test-metrics-config.json
@@ -0,0 +1,245 @@
+{
+	// must be 0, 1, 5, 10 or a multiple of 15
+	"ExpectedScrapeIntervalSeconds": 15,
+
+	"Meters": [
+		"KurrentDB.Core",
+		"KurrentDB.Projections.Core"
+	],
+
+	"Statuses": {
+		"Index": true,
+		"Node": true,
+		"Scavenge": true
+	},
+
+	"ElectionsCount": true,
+
+	"ProjectionStats": true,
+
+	"PersistentSubscriptionStats": true,
+
+	"Checkpoints": {
+		"Writer": true,
+		"Index": true,
+		"Replication": true
+	},
+
+	"Events": {
+		"Read": true,
+		"Written": true
+	},
+
+	// maps grpc methods to labels that they are to be recorded under
+	"GrpcMethods": {
+		"StreamRead": "read",
+		"StreamAppend": "append",
+		"StreamBatchAppend": "append",
+		"StreamDelete": "",
+		"StreamTombstone": ""
+	},
+
+	"IncomingGrpcCalls": {
+		"Current": true,
+		"Total": true,
+		"Failed": true,
+		"Unimplemented": true,
+		"DeadlineExceeded": true
+	},
+
+	"Gossip": {
+		"PullFromPeer": true,
+		"PushToPeer": true,
+		"ProcessingPushFromPeer": true,
+		"ProcessingRequestFromPeer": true,
+		"ProcessingRequestFromGrpcClient": true,
+		"ProcessingRequestFromHttpClient": true
+	},
+
+	"Writer": {
+		"FlushSize": true,
+		"FlushDuration": true
+	},
+
+	"CacheHitsMisses": {
+		"StreamInfo": true,
+		"Chunk": true
+	},
+
+	"CacheResources": true,
+
+	"Kestrel": {
+		"ConnectionCount": true
+	},
+
+	"System": {
+		"Cpu": true,
+		"LoadAverage1m": true,
+		"LoadAverage5m": true,
+		"LoadAverage15m": true,
+		"FreeMem": true,
+		"TotalMem": true,
+		"DriveTotalBytes": true,
+		"DriveUsedBytes": true
+	},
+
+	"Process": {
+		"UpTime": true,
+		"Cpu": true,
+		"MemWorkingSet": true,
+		"MemPagedBytes": true,
+		"MemVirtualBytes": true,
+		"ThreadCount": true,
+		"ThreadPoolPendingWorkItemCount": true,
+		"LockContentionCount": true,
+		"ExceptionCount": true,
+		"Gen0CollectionCount": true,
+		"Gen1CollectionCount": true,
+		"Gen2CollectionCount": true,
+		"Gen0Size": true,
+		"Gen1Size": true,
+		"Gen2Size": true,
+		"LohSize": true,
+		"TimeInGc": true,
+		"GcPauseDuration": true,
+		"HeapSize": true,
+		"HeapFragmentation": true,
+		"TotalAllocatedBytes": true,
+		"DiskReadBytes": true,
+		"DiskReadOps": true,
+		"DiskWrittenBytes": true,
+		"DiskWrittenOps": true
+	},
+
+	"Queues": {
+		"Busy": true,
+		"Length": true,
+		// this is the most expensive metric, creating a histogram for each
+		// queue grouping and message type grouping as defined in the config below
+		"Processing": true
+	},
+
+	// this specifies what name to track each queue under, according to regular expressions to
+	// match the queue names against
+	"QueueLabels": [
+		{
+			"Regex": "MainQueue",
+			"Label": "Main"
+		},
+		{
+			"Regex": "MonitoringQueue",
+			"Label": "Monitoring"
+		},
+		{
+			"Regex": "Timer",
+			"Label": "Timer"
+		},
+		{
+			"Regex": "StorageReaderQueue #.*",
+			"Label": "Readers"
+		},
+		{
+			"Regex": "StorageWriterQueue",
+			"Label": "Writer"
+		},
+		{
+			"Regex": "Subscriptions",
+			"Label": "Subscriptions"
+		},
+		{
+			"Regex": "PersistentSubscriptions",
+			"Label": "Persistent Subscriptions"
+		},
+		{
+			"Regex": "Projections Leader",
+			"Label": "Projections Leader"
+		},
+		{
+			"Regex": "Projection Core #.*",
+			"Label": "Projections Core"
+		},
+		{
+			"Regex": "Worker #.*",
+			"Label": "Workers"
+		},
+		{
+			"Regex": ".*",
+			"Label": "Others"
+		}
+	],
+
+	"MessageTypes": [
+		{
+			"Regex": "CoreMessage-Authentication-.*",
+			"Label": "Authentication"
+		},
+		{
+			"Regex": "CoreMessage-Client-.*Completed",
+			"Label": "ClientMessageCompleted"
+		},
+		{
+			"Regex": "CoreMessage-Client-ReadEvent",
+			"Label": "ReadEvent"
+		},
+		{
+			"Regex": "CoreMessage-Client-.*ReadAllEvents.*",
+			"Label": "ReadAll"
+		},
+		{
+			"Regex": "CoreMessage-Client-.*ReadStreamEvents.*",
+			"Label": "ReadStream"
+		},
+		{
+			"Regex": "CoreMessage-Client-.*",
+			"Label": "OtherClientMessage"
+		},
+		{
+			"Regex": "CoreMessage-Election-.*",
+			"Label": "Election"
+		},
+		{
+			"Regex": "CoreMessage-Gossip-.*",
+			"Label": "Gossip"
+		},
+		{
+			"Regex": "CoreMessage-Grpc-.*",
+			"Label": "Grpc"
+		},
+		{
+			"Regex": "CoreMessage-Http-.*",
+			"Label": "Http"
+		},
+		{
+			"Regex": "CoreMessage-Replication-.*",
+			"Label": "Replication"
+		},
+		{
+			"Regex": "CoreMessage-ReplicationTracking-.*",
+			"Label": "Replication"
+		},
+		{
+			"Regex": "CoreMessage-Storage-.*",
+			"Label": "Storage"
+		},
+		{
+			"Regex": "CoreMessage-Subscription-.*",
+			"Label": "Subscription"
+		},
+		{
+			"Regex": "CoreMessage-System-.*",
+			"Label": "System"
+		},
+		{
+			"Regex": "CoreMessage-Tcp-.*",
+			"Label": "Tcp"
+		},
+		{
+			"Regex": "ProjectionMessage-.*",
+			"Label": "Projections"
+		},
+		{
+			"Regex": ".*",
+			"Label": "Other"
+		}
+	]
+}
diff --git a/src/EventStore.Core.XUnit.Tests/Metrics/DurationMaxTrackerTests.cs b/src/KurrentDB.Core.XUnit.Tests/Metrics/DurationMaxTrackerTests.cs
similarity index 91%
rename from src/EventStore.Core.XUnit.Tests/Metrics/DurationMaxTrackerTests.cs
rename to src/KurrentDB.Core.XUnit.Tests/Metrics/DurationMaxTrackerTests.cs
index 31a425ee325..bc3e6ebc07b 100644
--- a/src/EventStore.Core.XUnit.Tests/Metrics/DurationMaxTrackerTests.cs
+++ b/src/KurrentDB.Core.XUnit.Tests/Metrics/DurationMaxTrackerTests.cs
@@ -1,10 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Diagnostics.Metrics;
 using System.Linq;
-using EventStore.Core.Metrics;
+using KurrentDB.Core.Metrics;
 using Xunit;
 
-namespace EventStore.Core.XUnit.Tests.Metrics;
+namespace KurrentDB.Core.XUnit.Tests.Metrics;
 
 public class DurationMaxTrackerTests : IDisposable {
 	private readonly TestMeterListener<double> _listener;
@@ -14,7 +17,7 @@ public class DurationMaxTrackerTests : IDisposable {
 	public DurationMaxTrackerTests() {
 		var meter = new Meter($"{typeof(DurationMaxTrackerTests)}");
 		_listener = new TestMeterListener<double>(meter);
-		var metric = new DurationMaxMetric(meter, "the-metric");
+		var metric = new DurationMaxMetric(meter, "the-metric", legacyNames: false);
 		_sut = new DurationMaxTracker(
 			metric: metric,
 			name: "the-tracker",
@@ -152,7 +155,7 @@ public void removes_stale_data_incrementally() {
 
 		_clock.SecondsSinceEpoch = 530;
 		_sut.RecordNow(start5); // record a 5s duration
-		// original measurement has become stale
+								// original measurement has become stale
 		AssertMeasurements(9);
 	}
 
@@ -181,7 +184,7 @@ public void no_name() {
 		using var meter = new Meter($"{typeof(DurationMaxTrackerTests)}");
 		using var listener = new TestMeterListener<double>(meter);
 		var sut = new DurationMaxTracker(
-			metric: new DurationMaxMetric(meter, "the-metric"),
+			metric: new DurationMaxMetric(meter, "the-metric", legacyNames: false),
 			name: null,
 			expectedScrapeIntervalSeconds: 15);
 
diff --git a/src/KurrentDB.Core.XUnit.Tests/Metrics/DurationTrackerTests.cs b/src/KurrentDB.Core.XUnit.Tests/Metrics/DurationTrackerTests.cs
new file mode 100644
index 00000000000..ce960fc0b8e
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Metrics/DurationTrackerTests.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics.Metrics;
+using KurrentDB.Core.Metrics;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Metrics;
+
+public class DurationTrackerTests : IDisposable {
+	private readonly TestMeterListener<double> _listener;
+	private readonly FakeClock _clock = new();
+	private readonly DurationTracker _sut;
+
+	public DurationTrackerTests() {
+		var meter = new Meter($"{typeof(DurationTrackerTests)}");
+		_listener = new TestMeterListener<double>(meter);
+		var durationMetric = new DurationMetric(meter, "the-histogram", legacyNames: false, _clock);
+		_sut = new DurationTracker(durationMetric, "the-duration");
+	}
+
+	public void Dispose() {
+		_listener.Dispose();
+	}
+
+	[Fact]
+	public void records_success() {
+		_clock.SecondsSinceEpoch = 500;
+		using (_sut.Start()) {
+			_clock.SecondsSinceEpoch = 501;
+		}
+
+		AssertMeasurements("successful", 1);
+	}
+
+	[Fact]
+	public void records_failure() {
+		_clock.SecondsSinceEpoch = 500;
+		using (var duration = _sut.Start()) {
+			_clock.SecondsSinceEpoch = 501;
+			duration.SetException(new Exception("failed"));
+		}
+
+		AssertMeasurements("failed", 1);
+	}
+
+	void AssertMeasurements(
+		string expectedStatus,
+		int expectedValue) {
+
+		Assert.Collection(
+			_listener.RetrieveMeasurements("the-histogram-seconds"),
+			m => {
+				Assert.Equal(expectedValue, m.Value);
+				Assert.Collection(
+					m.Tags,
+					t => {
+						Assert.Equal("activity", t.Key);
+						Assert.Equal("the-duration", t.Value);
+					},
+					t => {
+						Assert.Equal("status", t.Key);
+						Assert.Equal(expectedStatus, t.Value);
+					});
+			});
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Metrics/ElectionsCounterTrackerTests.cs b/src/KurrentDB.Core.XUnit.Tests/Metrics/ElectionsCounterTrackerTests.cs
new file mode 100644
index 00000000000..a529b102f85
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Metrics/ElectionsCounterTrackerTests.cs
@@ -0,0 +1,82 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics.Metrics;
+using System.Net;
+using System.Runtime.CompilerServices;
+using DotNext.Runtime.CompilerServices;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Metrics;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Metrics;
+
+public class ElectionsCounterTrackerTests : IDisposable {
+	private Scope _disposables = new();
+	private readonly ElectionMessage.ElectionsDone _electionsDoneMessage;
+
+	public ElectionsCounterTrackerTests() {
+		var endPoint = new DnsEndPoint("127.0.0.1", 1113);
+		var memberInfo = MemberInfo.Initial(Guid.Empty, DateTime.UtcNow,
+			VNodeState.Unknown, true,
+			endPoint, endPoint, endPoint, endPoint, endPoint,
+			null, 0, 0, 0, false);
+		_electionsDoneMessage = new ElectionMessage.ElectionsDone(1, 1, memberInfo);
+	}
+
+	public void Dispose() {
+		_disposables.Dispose();
+	}
+
+	private (ElectionsCounterTracker, TestMeterListener<long>) GenSut(
+		[CallerMemberName] string callerName = "") {
+
+		var meter = new Meter($"{typeof(ElectionsCounterTrackerTests)}--{callerName}");
+		_disposables.RegisterForDispose(meter);
+
+		var listener = new TestMeterListener<long>(meter);
+		_disposables.RegisterForDispose(meter);
+
+		var metric = new CounterMetric(meter, "test-metric", unit: "", legacyNames: false);
+		var sut = new ElectionsCounterTracker(new CounterSubMetric(metric, []));
+
+		return (sut, listener);
+	}
+
+	[Fact]
+	public void test_election_count_for_one_election() {
+		var (sut, listener) = GenSut();
+		sut.Handle(_electionsDoneMessage);
+
+		AssertMeasurements(listener, AssertMeasurement(1));
+	}
+
+	[Fact]
+	public void test_election_count_for_five_elections() {
+		var (sut, listener) = GenSut();
+		sut.Handle(_electionsDoneMessage);
+		sut.Handle(_electionsDoneMessage);
+		sut.Handle(_electionsDoneMessage);
+		sut.Handle(_electionsDoneMessage);
+		sut.Handle(_electionsDoneMessage);
+
+		AssertMeasurements(listener, AssertMeasurement(5));
+	}
+
+	static Action<TestMeterListener<long>.TestMeasurement> AssertMeasurement(
+		int expectedValue) =>
+		actualMeasurement => {
+			Assert.Equal(expectedValue, actualMeasurement.Value);
+		};
+
+	static void AssertMeasurements(
+		TestMeterListener<long> listener,
+		params Action<TestMeterListener<long>.TestMeasurement>[] actions) {
+
+		listener.Observe();
+		Assert.Collection(listener.RetrieveMeasurements("test-metric"), actions);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Metrics/FakeClock.cs b/src/KurrentDB.Core.XUnit.Tests/Metrics/FakeClock.cs
new file mode 100644
index 00000000000..aba6d31ebb3
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Metrics/FakeClock.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Time;
+
+namespace KurrentDB.Core.XUnit.Tests.Metrics;
+
+internal class FakeClock : IClock {
+	public Instant Now => Instant.FromSeconds(SecondsSinceEpoch);
+
+	public long SecondsSinceEpoch { get; set; }
+
+	public void AdvanceSeconds(long seconds) {
+		SecondsSinceEpoch += seconds;
+	}
+}
diff --git a/src/EventStore.Core.XUnit.Tests/Metrics/IncomingGrpcCallsMetricTests.cs b/src/KurrentDB.Core.XUnit.Tests/Metrics/IncomingGrpcCallsMetricTests.cs
similarity index 94%
rename from src/EventStore.Core.XUnit.Tests/Metrics/IncomingGrpcCallsMetricTests.cs
rename to src/KurrentDB.Core.XUnit.Tests/Metrics/IncomingGrpcCallsMetricTests.cs
index 1c5f0526ca1..cbc4381e3a9 100644
--- a/src/EventStore.Core.XUnit.Tests/Metrics/IncomingGrpcCallsMetricTests.cs
+++ b/src/KurrentDB.Core.XUnit.Tests/Metrics/IncomingGrpcCallsMetricTests.cs
@@ -1,12 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Diagnostics.Metrics;
 using System.Diagnostics.Tracing;
 using System.Linq;
-using EventStore.Core.Metrics;
+using KurrentDB.Core.Metrics;
 using Xunit;
-using Conf = EventStore.Common.Configuration.MetricsConfiguration;
+using Conf = KurrentDB.Common.Configuration.MetricsConfiguration;
 
-namespace EventStore.Core.XUnit.Tests.Metrics;
+namespace KurrentDB.Core.XUnit.Tests.Metrics;
 
 public class IncomingGrpcCallsMetricTests {
 	[EventSource(Name = nameof(IncomingGrpcCallsMetricTests))]
diff --git a/src/KurrentDB.Core.XUnit.Tests/Metrics/InstantTests.cs b/src/KurrentDB.Core.XUnit.Tests/Metrics/InstantTests.cs
new file mode 100644
index 00000000000..91941396233
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Metrics/InstantTests.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Time;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Metrics;
+
+public class InstantTests {
+	[Fact]
+	public void can_measure_elapsed_seconds() {
+		var x = Instant.FromSeconds(4);
+		var y = Instant.FromSeconds(6);
+		Assert.Equal(2, y.ElapsedSecondsSince(x));
+	}
+
+	[Theory]
+	[InlineData(4, 4, 0)]
+	[InlineData(4, 6, 2_000_000)]
+	[InlineData(123, 1_000_000_000, 999_999_877_000_000)]
+	public void can_measure_elapsed_time(int startSecs, int endSecs, long elapsedMicroseconds) {
+		var x = Instant.FromSeconds(startSecs);
+		var y = Instant.FromSeconds(endSecs);
+		Assert.Equal(elapsedMicroseconds, y.ElapsedTimeSince(x).TotalMicroseconds);
+	}
+
+	[Fact]
+	public void rounds_up_elapsed_time() {
+		var x = Instant.Now;
+		var y = new Instant(x.Ticks + 1);
+		Assert.True(y.ElapsedTimeSince(x).Ticks > 0);
+	}
+
+	[Fact]
+	public void add() {
+		Assert.Equal(
+			Instant.FromSeconds(4),
+			Instant.FromSeconds(3).Add(TimeSpan.FromSeconds(1)));
+	}
+
+	[Fact]
+	public void equal_to() {
+		Assert.False(Instant.FromSeconds(3) == Instant.FromSeconds(4));
+		Assert.True(Instant.FromSeconds(3) == Instant.FromSeconds(3));
+	}
+
+	[Fact]
+	public void not_equal_to() {
+		Assert.True(Instant.FromSeconds(3) != Instant.FromSeconds(4));
+		Assert.False(Instant.FromSeconds(3) != Instant.FromSeconds(3));
+	}
+
+	[Fact]
+	public void less_than() {
+		Assert.True(Instant.FromSeconds(3) < Instant.FromSeconds(4));
+		Assert.False(Instant.FromSeconds(3) < Instant.FromSeconds(3));
+		Assert.False(Instant.FromSeconds(3) < Instant.FromSeconds(2));
+	}
+
+	[Fact]
+	public void greater_than() {
+		Assert.False(Instant.FromSeconds(3) > Instant.FromSeconds(4));
+		Assert.False(Instant.FromSeconds(3) > Instant.FromSeconds(3));
+		Assert.True(Instant.FromSeconds(3) > Instant.FromSeconds(2));
+	}
+
+	[Fact]
+	public void less_than_or_equal_to() {
+		Assert.True(Instant.FromSeconds(3) <= Instant.FromSeconds(4));
+		Assert.True(Instant.FromSeconds(3) <= Instant.FromSeconds(3));
+		Assert.False(Instant.FromSeconds(3) <= Instant.FromSeconds(2));
+	}
+
+	[Fact]
+	public void greater_than_or_equal_to() {
+		Assert.False(Instant.FromSeconds(3) >= Instant.FromSeconds(4));
+		Assert.True(Instant.FromSeconds(3) >= Instant.FromSeconds(3));
+		Assert.True(Instant.FromSeconds(3) >= Instant.FromSeconds(2));
+	}
+}
diff --git a/src/EventStore.Core.XUnit.Tests/Metrics/MaxTrackerTests.cs b/src/KurrentDB.Core.XUnit.Tests/Metrics/MaxTrackerTests.cs
similarity index 89%
rename from src/EventStore.Core.XUnit.Tests/Metrics/MaxTrackerTests.cs
rename to src/KurrentDB.Core.XUnit.Tests/Metrics/MaxTrackerTests.cs
index 68a3f7e8412..a12c4cdeefb 100644
--- a/src/EventStore.Core.XUnit.Tests/Metrics/MaxTrackerTests.cs
+++ b/src/KurrentDB.Core.XUnit.Tests/Metrics/MaxTrackerTests.cs
@@ -1,10 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Diagnostics.Metrics;
 using System.Linq;
-using EventStore.Core.Metrics;
+using KurrentDB.Core.Metrics;
 using Xunit;
 
-namespace EventStore.Core.XUnit.Tests.Metrics;
+namespace KurrentDB.Core.XUnit.Tests.Metrics;
 
 public class MaxTrackerTests : IDisposable {
 	private readonly TestMeterListener<long> _listener;
diff --git a/src/EventStore.Core.XUnit.Tests/Metrics/MessageLabelConfiguratorTests.cs b/src/KurrentDB.Core.XUnit.Tests/Metrics/MessageLabelConfiguratorTests.cs
similarity index 92%
rename from src/EventStore.Core.XUnit.Tests/Metrics/MessageLabelConfiguratorTests.cs
rename to src/KurrentDB.Core.XUnit.Tests/Metrics/MessageLabelConfiguratorTests.cs
index e678b5c7b7d..a661d7c47c8 100644
--- a/src/EventStore.Core.XUnit.Tests/Metrics/MessageLabelConfiguratorTests.cs
+++ b/src/KurrentDB.Core.XUnit.Tests/Metrics/MessageLabelConfiguratorTests.cs
@@ -1,11 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Reflection;
-using EventStore.Common.Configuration;
-using EventStore.Core.Messaging;
-using EventStore.Core.Metrics;
+using KurrentDB.Common.Configuration;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Metrics;
 using Xunit;
 
-namespace EventStore.Core.XUnit.Tests.Metrics;
+namespace KurrentDB.Core.XUnit.Tests.Metrics;
 
 enum TestGroup {
 	Reads,
@@ -26,6 +29,7 @@ partial class ReadStreamForward : ReadMessage { }
 [DerivedMessage(TestGroup.Reads)]
 partial class ReadStreamBackward : ReadMessage { }
 
+[Collection("MetricsLabelTests")] // labels are static
 public class MessageLabelConfiguratorTests {
 	private readonly Type[] _messageTypes;
 
diff --git a/src/KurrentDB.Core.XUnit.Tests/Metrics/MetricsEndpointTests.cs b/src/KurrentDB.Core.XUnit.Tests/Metrics/MetricsEndpointTests.cs
new file mode 100644
index 00000000000..66ded19da1e
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Metrics/MetricsEndpointTests.cs
@@ -0,0 +1,233 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Net;
+using System.Threading.Tasks;
+using KurrentDB.Common.Configuration;
+using KurrentDB.Core.Configuration.Sources;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Helpers;
+using Microsoft.Extensions.Configuration;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Metrics;
+
+[Collection("MetricsLabelTests")]
+public class MetricsEndpointTests : DirectoryPerTest<MetricsEndpointTests> {
+	[Fact]
+	public async Task can_produce_kurrent_metrics() {
+		var content = await Query(legacy: false);
+		foreach (var expected in KurrentMetrics)
+			Assert.Contains(expected, content);
+	}
+
+	[Fact]
+	public async Task can_produce_legacy_metrics() {
+		var content = await Query(legacy: true);
+		foreach (var expected in EventStoreMetrics)
+			Assert.Contains(expected, content);
+	}
+
+	async Task<string> Query(bool legacy) {
+		var configuration = new ConfigurationBuilder()
+			.AddSection($"{KurrentConfigurationKeys.Prefix}:Metrics", x => x
+				.AddJsonFile("./Metrics/Conf/test-metrics-config.json")
+				.AddInMemoryCollection([
+					new("Meters:0", legacy
+						? "EventStore.Core"
+						: "KurrentDB.Core"),
+					new("Meters:1", legacy
+						? "EventStore.Projections.Core"
+						: "KurrentDB.Projections.Core"),
+				]))
+			.Build();
+		await using var sut = new MiniNode<LogFormat.V2, string>(Fixture.Directory, configuration: configuration);
+		await sut.Start();
+		sut.HttpClient.DefaultRequestHeaders.Add(
+			"Accept",
+			"application/openmetrics-text;version=1.0.0,application/openmetrics-text;version=0.0.1;q=0.75,text/plain;version=0.0.4;q=0.5,*/*;q=0.1");
+		var result = await sut.HttpClient.GetAsync("/metrics");
+		Assert.Equal(HttpStatusCode.OK, result.StatusCode);
+
+		Assert.Equal(
+			legacy
+				? "text/plain; charset=utf-8; version=0.0.4"
+				: "application/openmetrics-text; version=1.0.0; charset=utf-8",
+			$"{result.Content.Headers.ContentType}");
+
+		var content = await result.Content.ReadAsStringAsync();
+		return content;
+	}
+
+	static IEnumerable<string> KurrentMetrics => [
+		"# TYPE kurrentdb_cache_hits_misses counter",
+		"# TYPE kurrentdb_cache_resources_entries gauge",
+		"# TYPE kurrentdb_checkpoints gauge",
+		"# TYPE kurrentdb_current_incoming_grpc_calls gauge",
+		"# TYPE kurrentdb_disk_io_bytes counter",
+		"# TYPE kurrentdb_disk_io_operations counter",
+		"# TYPE kurrentdb_elections_count counter",
+		"# TYPE kurrentdb_gc_allocated_bytes counter",
+		"# TYPE kurrentdb_gc_collection_count counter",
+		"# TYPE kurrentdb_gc_generation_size_bytes gauge",
+		"# TYPE kurrentdb_gc_heap_fragmentation gauge",
+		"# TYPE kurrentdb_gc_heap_size_bytes gauge",
+		"# TYPE kurrentdb_gc_pause_duration_max_seconds gauge",
+		"# TYPE kurrentdb_gc_time_in_gc gauge",
+		"# TYPE kurrentdb_incoming_grpc_calls counter",
+		"# TYPE kurrentdb_io_bytes counter",
+		"# TYPE kurrentdb_io_events counter",
+		"# TYPE kurrentdb_io_record_read_duration_seconds histogram",
+		"# TYPE kurrentdb_logical_chunk_read_distribution histogram",
+		"# TYPE kurrentdb_proc_contention_count counter",
+		"# TYPE kurrentdb_proc_cpu gauge",
+		"# TYPE kurrentdb_proc_exception_count counter",
+		"# TYPE kurrentdb_proc_mem_bytes gauge",
+		"# TYPE kurrentdb_proc_thread_count gauge",
+		"# TYPE kurrentdb_proc_thread_pool_pending_work_item_count gauge",
+		"# TYPE kurrentdb_proc_up_time_seconds counter",
+		"# TYPE kurrentdb_queue_busy_seconds counter",
+		"# TYPE kurrentdb_queue_processing_duration_seconds histogram",
+		"# TYPE kurrentdb_queue_queueing_duration_max_seconds gauge",
+		"# TYPE kurrentdb_statuses gauge",
+		"# TYPE kurrentdb_sys_cpu gauge",
+		"# TYPE kurrentdb_sys_disk_bytes gauge",
+		"# TYPE kurrentdb_sys_mem_bytes gauge",
+		"# TYPE kurrentdb_writer_flush_duration_max_seconds gauge",
+		"# TYPE kurrentdb_writer_flush_size_max gauge",
+
+		"# UNIT kurrentdb_cache_resources_entries entries",
+		"# UNIT kurrentdb_disk_io_bytes bytes",
+		"# UNIT kurrentdb_disk_io_operations operations",
+		"# UNIT kurrentdb_gc_allocated_bytes bytes",
+		"# UNIT kurrentdb_gc_generation_size_bytes bytes",
+		"# UNIT kurrentdb_gc_heap_size_bytes bytes",
+		"# UNIT kurrentdb_gc_pause_duration_max_seconds seconds",
+		"# UNIT kurrentdb_io_bytes bytes",
+		"# UNIT kurrentdb_io_events events",
+		"# UNIT kurrentdb_io_record_read_duration_seconds seconds",
+		"# UNIT kurrentdb_proc_mem_bytes bytes",
+		"# UNIT kurrentdb_proc_up_time_seconds seconds",
+		"# UNIT kurrentdb_queue_busy_seconds seconds",
+		"# UNIT kurrentdb_queue_processing_duration_seconds seconds",
+		"# UNIT kurrentdb_queue_queueing_duration_max_seconds seconds",
+		"# UNIT kurrentdb_sys_disk_bytes bytes",
+		"# UNIT kurrentdb_sys_mem_bytes bytes",
+		"# UNIT kurrentdb_writer_flush_duration_max_seconds seconds",
+
+		"kurrentdb_cache_hits_misses_total{",
+		"kurrentdb_cache_resources_entries{",
+		"kurrentdb_checkpoints{",
+		"kurrentdb_current_incoming_grpc_calls{",
+		"kurrentdb_disk_io_bytes_total{",
+		"kurrentdb_disk_io_operations_total{",
+		"kurrentdb_elections_count_total{",
+		"kurrentdb_gc_allocated_bytes_total{",
+		"kurrentdb_gc_collection_count_total{",
+		"kurrentdb_gc_generation_size_bytes{",
+		"kurrentdb_gc_heap_fragmentation{",
+		"kurrentdb_gc_heap_size_bytes{",
+		"kurrentdb_gc_pause_duration_max_seconds{",
+		"kurrentdb_gc_time_in_gc{",
+		"kurrentdb_incoming_grpc_calls_total{",
+		"kurrentdb_io_bytes_total{",
+		"kurrentdb_io_events_total{",
+		"kurrentdb_io_record_read_duration_seconds_bucket{",
+		"kurrentdb_io_record_read_duration_seconds_count{",
+		"kurrentdb_io_record_read_duration_seconds_sum{",
+		"kurrentdb_logical_chunk_read_distribution_bucket{",
+		"kurrentdb_logical_chunk_read_distribution_count{",
+		"kurrentdb_logical_chunk_read_distribution_sum{",
+		"kurrentdb_proc_contention_count_total{",
+		"kurrentdb_proc_cpu{",
+		"kurrentdb_proc_exception_count_total{",
+		"kurrentdb_proc_mem_bytes{",
+		"kurrentdb_proc_thread_count{",
+		"kurrentdb_proc_thread_pool_pending_work_item_count{",
+		"kurrentdb_proc_up_time_seconds_total{",
+		"kurrentdb_queue_busy_seconds_total{",
+		"kurrentdb_queue_processing_duration_seconds_bucket{",
+		"kurrentdb_queue_processing_duration_seconds_count{",
+		"kurrentdb_queue_processing_duration_seconds_sum{",
+		"kurrentdb_queue_queueing_duration_max_seconds{",
+		"kurrentdb_statuses{",
+		"kurrentdb_sys_cpu{",
+		"kurrentdb_sys_disk_bytes{",
+		"kurrentdb_sys_mem_bytes{",
+		"kurrentdb_writer_flush_duration_max_seconds{",
+		"kurrentdb_writer_flush_size_max{",
+	];
+
+	static IEnumerable<string> EventStoreMetrics => [
+		"# TYPE eventstore_cache_hits_misses counter",
+		"# TYPE eventstore_cache_resources_entries gauge",
+		"# TYPE eventstore_checkpoints gauge",
+		"# TYPE eventstore_current_incoming_grpc_calls gauge",
+		"# TYPE eventstore_disk_io_bytes counter",
+		"# TYPE eventstore_disk_io_operations counter",
+		"# TYPE eventstore_elections_count counter",
+		"# TYPE eventstore_gc_collection_count counter",
+		"# TYPE eventstore_gc_generation_size_bytes gauge",
+		"# TYPE eventstore_gc_heap_fragmentation gauge",
+		"# TYPE eventstore_gc_heap_size_bytes gauge",
+		"# TYPE eventstore_gc_pause_duration_max_seconds gauge",
+		"# TYPE eventstore_gc_time_in_gc gauge",
+		"# TYPE eventstore_gc_total_allocated counter",
+		"# TYPE eventstore_incoming_grpc_calls counter",
+		"# TYPE eventstore_io_bytes counter",
+		"# TYPE eventstore_io_events counter",
+		"# TYPE eventstore_logical_chunk_read_distribution histogram",
+		"# TYPE eventstore_proc_contention_count counter",
+		"# TYPE eventstore_proc_cpu gauge",
+		"# TYPE eventstore_proc_exception_count counter",
+		"# TYPE eventstore_proc_mem_bytes gauge",
+		"# TYPE eventstore_proc_thread_count gauge",
+		"# TYPE eventstore_proc_thread_pool_pending_work_item_count gauge",
+		"# TYPE eventstore_proc_up_time counter",
+		"# TYPE eventstore_queue_busy_seconds counter",
+		"# TYPE eventstore_queue_queueing_duration_max_seconds gauge",
+		"# TYPE eventstore_statuses counter",
+		"# TYPE eventstore_sys_cpu gauge",
+		"# TYPE eventstore_sys_disk_bytes gauge",
+		"# TYPE eventstore_sys_mem_bytes gauge",
+		"# TYPE eventstore_writer_flush_duration_max_seconds gauge",
+		"# TYPE eventstore_writer_flush_size_max gauge",
+
+		"eventstore_cache_hits_misses{",
+		"eventstore_cache_resources_entries{",
+		"eventstore_checkpoints{",
+		"eventstore_current_incoming_grpc_calls{",
+		"eventstore_disk_io_bytes{",
+		"eventstore_disk_io_operations{",
+		"eventstore_elections_count{",
+		"eventstore_gc_collection_count{",
+		"eventstore_gc_generation_size_bytes{",
+		"eventstore_gc_heap_fragmentation{",
+		"eventstore_gc_heap_size_bytes{",
+		"eventstore_gc_pause_duration_max_seconds{",
+		"eventstore_gc_time_in_gc{",
+		"eventstore_gc_total_allocated{",
+		"eventstore_incoming_grpc_calls{",
+		"eventstore_io_bytes{",
+		"eventstore_io_events{",
+		"eventstore_logical_chunk_read_distribution_bucket{",
+		"eventstore_logical_chunk_read_distribution_count{",
+		"eventstore_logical_chunk_read_distribution_sum{",
+		"eventstore_proc_contention_count{",
+		"eventstore_proc_cpu{",
+		"eventstore_proc_exception_count{",
+		"eventstore_proc_mem_bytes{",
+		"eventstore_proc_thread_count{",
+		"eventstore_proc_thread_pool_pending_work_item_count{",
+		"eventstore_proc_up_time{",
+		"eventstore_queue_busy_seconds{",
+		"eventstore_queue_queueing_duration_max_seconds{",
+		"eventstore_statuses{",
+		"eventstore_sys_cpu{",
+		"eventstore_sys_disk_bytes{",
+		"eventstore_sys_mem_bytes{",
+		"eventstore_writer_flush_duration_max_seconds{",
+		"eventstore_writer_flush_size_max{",
+	];
+}
diff --git a/src/EventStore.Core.XUnit.Tests/Metrics/PersistentSubscriptionMetricsTests.cs b/src/KurrentDB.Core.XUnit.Tests/Metrics/PersistentSubscriptionMetricsTests.cs
similarity index 93%
rename from src/EventStore.Core.XUnit.Tests/Metrics/PersistentSubscriptionMetricsTests.cs
rename to src/KurrentDB.Core.XUnit.Tests/Metrics/PersistentSubscriptionMetricsTests.cs
index b79eb9f02cb..2526656d511 100644
--- a/src/EventStore.Core.XUnit.Tests/Metrics/PersistentSubscriptionMetricsTests.cs
+++ b/src/KurrentDB.Core.XUnit.Tests/Metrics/PersistentSubscriptionMetricsTests.cs
@@ -1,12 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Diagnostics.Metrics;
 using System.Linq;
-using EventStore.Core.Messages;
-using EventStore.Core.Metrics;
-using EventStore.Core.Services.PersistentSubscription;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.PersistentSubscription;
 using Xunit;
 
-namespace EventStore.Core.XUnit.Tests.Metrics;
+namespace KurrentDB.Core.XUnit.Tests.Metrics;
 
 public class PersistentSubscriptionMetricsTests {
 	readonly PersistentSubscriptionTracker _sut = new();
diff --git a/src/EventStore.Core.XUnit.Tests/Metrics/ProcessMetricsTests.cs b/src/KurrentDB.Core.XUnit.Tests/Metrics/ProcessMetricsTests.cs
similarity index 96%
rename from src/EventStore.Core.XUnit.Tests/Metrics/ProcessMetricsTests.cs
rename to src/KurrentDB.Core.XUnit.Tests/Metrics/ProcessMetricsTests.cs
index 6861c9e3c91..1a9f2640751 100644
--- a/src/EventStore.Core.XUnit.Tests/Metrics/ProcessMetricsTests.cs
+++ b/src/KurrentDB.Core.XUnit.Tests/Metrics/ProcessMetricsTests.cs
@@ -1,13 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Metrics;
 using System.Threading;
-using EventStore.Common.Configuration;
-using EventStore.Core.Metrics;
+using KurrentDB.Common.Configuration;
+using KurrentDB.Core.Metrics;
 using Xunit;
 using Xunit.Sdk;
 
-namespace EventStore.Core.XUnit.Tests.Metrics;
+namespace KurrentDB.Core.XUnit.Tests.Metrics;
 
 public class ProcessMetricsTests : IDisposable {
 	private readonly TestMeterListener<int> _intListener;
@@ -27,7 +30,7 @@ public ProcessMetricsTests() {
 			config[value] = true;
 		}
 
-		_sut = new ProcessMetrics(meter, TimeSpan.FromSeconds(42), scrapingPeriodInSeconds: 15, config);
+		_sut = new ProcessMetrics(meter, TimeSpan.FromSeconds(42), scrapingPeriodInSeconds: 15, config, legacyNames: false);
 		_sut.CreateObservableMetrics(new() {
 			{ MetricsConfiguration.ProcessTracker.UpTime, "eventstore-proc-up-time" },
 			{ MetricsConfiguration.ProcessTracker.Cpu, "eventstore-proc-cpu" },
@@ -88,7 +91,7 @@ public void Dispose() {
 	[Fact]
 	public void can_collect_proc_up_time() {
 		Assert.Collection(
-			_doubleListener.RetrieveMeasurements("eventstore-proc-up-time"),
+			_doubleListener.RetrieveMeasurements("eventstore-proc-up-time-seconds"),
 			m => {
 				Assert.True(m.Value > 0);
 				Assert.Collection(
@@ -143,7 +146,7 @@ public void can_collect_proc_exception_count() {
 	[Fact]
 	public void can_collect_gc_total_allocated() {
 		Assert.Collection(
-			_longListener.RetrieveMeasurements("eventstore-gc-total-allocated"),
+			_longListener.RetrieveMeasurements("eventstore-gc-total-allocated-bytes"),
 			m => {
 				Assert.True(m.Value > 0);
 				Assert.Empty(m.Tags);
diff --git a/src/KurrentDB.Core.XUnit.Tests/Metrics/QueueBusyTrackerTests.cs b/src/KurrentDB.Core.XUnit.Tests/Metrics/QueueBusyTrackerTests.cs
new file mode 100644
index 00000000000..0972c759ee7
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Metrics/QueueBusyTrackerTests.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Diagnostics.Metrics;
+using System.Threading.Tasks;
+using KurrentDB.Core.Metrics;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Metrics;
+
+public class QueueBusyTrackerTests {
+	[Fact]
+	public async Task records() {
+		using var meter = new Meter($"{typeof(QueueProcessingTrackerTests)}");
+		using var listener = new TestMeterListener<double>(meter);
+		var metric = new AverageMetric(meter, "the-metric", "seconds", label => new("queue", label), legacyNames: false);
+		var sut = new QueueBusyTracker(metric, "the-queue");
+
+		sut.EnterBusy();
+		await Task.Delay(1);
+		sut.EnterIdle();
+		listener.Observe();
+
+		Assert.Collection(
+			listener.RetrieveMeasurements("the-metric-seconds"),
+			m => {
+				Assert.True(m.Value > 0.0001);
+				Assert.Collection(
+					m.Tags,
+					t => {
+						Assert.Equal("queue", t.Key);
+						Assert.Equal("the-queue", t.Value);
+					});
+			});
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Metrics/QueueProcessingTrackerTests.cs b/src/KurrentDB.Core.XUnit.Tests/Metrics/QueueProcessingTrackerTests.cs
new file mode 100644
index 00000000000..8c3880fb092
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Metrics/QueueProcessingTrackerTests.cs
@@ -0,0 +1,70 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics.Metrics;
+using System.Threading.Tasks;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Time;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Metrics;
+
+public class QueueProcessingTrackerTests : IDisposable {
+	private readonly TestMeterListener<double> _listener;
+	private readonly FakeClock _clock = new();
+	private readonly QueueProcessingTracker _sut;
+
+	public QueueProcessingTrackerTests() {
+		var meter = new Meter($"{typeof(QueueProcessingTrackerTests)}");
+		var metric = new DurationMetric(meter, "the-metric", legacyNames: false, _clock);
+		_listener = new TestMeterListener<double>(meter);
+		_sut = new(metric, "the-queue");
+	}
+
+	public void Dispose() {
+		_listener.Dispose();
+	}
+
+	[Fact]
+	public void records() {
+		_clock.SecondsSinceEpoch = 500;
+		var start = _clock.Now;
+		_clock.SecondsSinceEpoch = 501;
+		var end = _sut.RecordNow(start, "the-message-type");
+		var elapsedSeconds = end.ElapsedSecondsSince(start);
+		Assert.Equal(1.000, elapsedSeconds);
+		AssertMeasurements(1);
+	}
+
+	void AssertMeasurements(int expectedValue) {
+
+		Assert.Collection(
+			_listener.RetrieveMeasurements("the-metric-seconds"),
+			m => {
+				Assert.Equal(expectedValue, m.Value);
+				Assert.Collection(
+					m.Tags,
+					t => {
+						Assert.Equal("queue", t.Key);
+						Assert.Equal("the-queue", t.Value);
+					},
+					t => {
+						Assert.Equal("message-type", t.Key);
+						Assert.Equal("the-message-type", t.Value);
+					});
+			});
+	}
+}
+
+public class QueueProcessingTrackerNoOpTests {
+	// the noop tracker doesn't track anything but it still needs to return the current time
+	[Fact]
+	public async Task noop_returns_current_time() {
+		var sut = new QueueProcessingTracker.NoOp();
+		var start = Instant.Now;
+		await Task.Delay(1);
+		var end = sut.RecordNow(start, "some message type");
+		Assert.True(start < end);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Metrics/QueueTrackersTests.cs b/src/KurrentDB.Core.XUnit.Tests/Metrics/QueueTrackersTests.cs
new file mode 100644
index 00000000000..e10fa215a64
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Metrics/QueueTrackersTests.cs
@@ -0,0 +1,129 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Time;
+using Xunit;
+using Conf = KurrentDB.Common.Configuration.MetricsConfiguration;
+
+namespace KurrentDB.Core.XUnit.Tests.Metrics;
+
+public class QueueTrackersTests {
+	[Fact]
+	public void default_trackers_yields_noop_tracker() {
+		var sut = new QueueTrackers();
+		var tracker = sut.GetTrackerForQueue("MainQueue");
+		Assert.Equal("NoOp", tracker.Name);
+	}
+
+	[Fact]
+	public void not_matched_yields_noop_tracker() {
+		var sut = GenSut(
+			new Conf.LabelMappingCase {
+				Regex = "MainQueue",
+				Label = "MainQueue",
+			});
+
+
+		var tracker = sut.GetTrackerForQueue("MainQueue");
+		Assert.Equal("MainQueue", tracker.Name);
+
+		tracker = sut.GetTrackerForQueue("WriterQueue");
+		Assert.Equal("NoOp", tracker.Name);
+	}
+
+	[Fact]
+	public void empty_tracker_yields_no_op() {
+		var sut = GenSut(
+			new Conf.LabelMappingCase {
+				Regex = "MainQueue",
+				Label = "",
+			},
+			new Conf.LabelMappingCase {
+				Regex = "WriterQueue",
+				Label = "WriterQueue",
+			});
+
+
+		var tracker = sut.GetTrackerForQueue("WriterQueue");
+		Assert.Equal("WriterQueue", tracker.Name);
+
+		tracker = sut.GetTrackerForQueue("MainQueue");
+		Assert.Equal("NoOp", tracker.Name);
+	}
+
+	[Fact]
+	public void unspecified_label_yields_no_op() {
+		var sut = GenSut(
+			new Conf.LabelMappingCase {
+				Regex = "MainQueue",
+				// no Label
+			});
+
+		var tracker = sut.GetTrackerForQueue("MainQueue");
+		Assert.Equal("NoOp", tracker.Name);
+	}
+
+	[Fact]
+	public void unspecified_regex_does_not_match() {
+		var sut = GenSut(
+			new Conf.LabelMappingCase {
+				// no Regex
+				Label = "MainQueue",
+			});
+
+		var tracker = sut.GetTrackerForQueue("MainQueue");
+		Assert.Equal("NoOp", tracker.Name);
+	}
+
+	[Fact]
+	public void patterns_applied_in_order() {
+		var sut = GenSut(
+			new Conf.LabelMappingCase {
+				Regex = "MainQueue",
+				Label = "MainQueue",
+			},
+			new Conf.LabelMappingCase {
+				Regex = ".*",
+				Label = "OtherQueue",
+			});
+
+		var tracker = sut.GetTrackerForQueue("MainQueue");
+		Assert.Equal("MainQueue", tracker.Name);
+
+		tracker = sut.GetTrackerForQueue("WriterQueue");
+		Assert.Equal("OtherQueue", tracker.Name);
+	}
+
+	[Fact]
+	public void matches_groups() {
+		var sut = GenSut(
+			new Conf.LabelMappingCase {
+				Regex = "Worker #(.*)",
+				Label = "Worker Queue $1",
+			});
+
+		var tracker = sut.GetTrackerForQueue("Worker #3");
+		Assert.Equal("Worker Queue 3", tracker.Name);
+	}
+
+	QueueTrackers GenSut(params Conf.LabelMappingCase[] map) =>
+		new(map,
+			x => new FakeTracker { Name = x },
+			x => new FakeTracker { Name = x },
+			x => new FakeTracker { Name = x });
+
+	class FakeTracker : IDurationMaxTracker, IQueueProcessingTracker, IQueueBusyTracker {
+		public string Name { get; init; }
+
+		public void EnterBusy() {
+		}
+
+		public void EnterIdle() {
+		}
+
+		public Instant RecordNow(Instant start) => start;
+
+		public Instant RecordNow(Instant start, string messageType) => start;
+	}
+}
diff --git a/src/EventStore.Core.XUnit.Tests/Metrics/RecentMaxTests.cs b/src/KurrentDB.Core.XUnit.Tests/Metrics/RecentMaxTests.cs
similarity index 92%
rename from src/EventStore.Core.XUnit.Tests/Metrics/RecentMaxTests.cs
rename to src/KurrentDB.Core.XUnit.Tests/Metrics/RecentMaxTests.cs
index aaa072e6cd2..3f1b0ad4aa3 100644
--- a/src/EventStore.Core.XUnit.Tests/Metrics/RecentMaxTests.cs
+++ b/src/KurrentDB.Core.XUnit.Tests/Metrics/RecentMaxTests.cs
@@ -1,9 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
-using EventStore.Core.Metrics;
-using EventStore.Core.Time;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Time;
 using Xunit;
 
-namespace EventStore.Core.XUnit.Tests.Metrics;
+namespace KurrentDB.Core.XUnit.Tests.Metrics;
 
 public class RecentMaxTests {
 	private readonly RecentMax<long> _sut;
diff --git a/src/EventStore.Core.XUnit.Tests/Metrics/SystemMetricsTests.cs b/src/KurrentDB.Core.XUnit.Tests/Metrics/SystemMetricsTests.cs
similarity index 82%
rename from src/EventStore.Core.XUnit.Tests/Metrics/SystemMetricsTests.cs
rename to src/KurrentDB.Core.XUnit.Tests/Metrics/SystemMetricsTests.cs
index 8ad4418b286..9b1f8588bd1 100644
--- a/src/EventStore.Core.XUnit.Tests/Metrics/SystemMetricsTests.cs
+++ b/src/KurrentDB.Core.XUnit.Tests/Metrics/SystemMetricsTests.cs
@@ -1,14 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Metrics;
 using System.Runtime;
-using EventStore.Common.Configuration;
-using EventStore.Core.Metrics;
 using FluentAssertions;
+using KurrentDB.Common.Configuration;
+using KurrentDB.Core.Metrics;
 using Microsoft.Extensions.Diagnostics.Metrics.Testing;
 using Xunit;
 
-namespace EventStore.Core.XUnit.Tests.Metrics;
+namespace KurrentDB.Core.XUnit.Tests.Metrics;
 
 public class SystemMetricsTests : IDisposable {
 	private readonly TestMeterListener<float> _floatListener;
@@ -16,9 +19,9 @@ public class SystemMetricsTests : IDisposable {
 	private readonly TestMeterListener<long> _longListener;
 	private readonly FakeClock _clock = new();
 	private readonly SystemMetrics _sut;
-    private readonly Meter _meter;
+	private readonly Meter _meter;
 	public SystemMetricsTests() {
-        _meter = new Meter($"{typeof(ProcessMetricsTests)}");
+		_meter = new Meter($"{typeof(ProcessMetricsTests)}");
 		_floatListener = new TestMeterListener<float>(_meter);
 		_doubleListener = new TestMeterListener<double>(_meter);
 		_longListener = new TestMeterListener<long>(_meter);
@@ -28,7 +31,7 @@ public SystemMetricsTests() {
 		foreach (var value in Enum.GetValues<MetricsConfiguration.SystemTracker>()) {
 			config[value] = true;
 		}
-		_sut = new SystemMetrics(_meter, TimeSpan.FromSeconds(42), config);
+		_sut = new SystemMetrics(_meter, TimeSpan.FromSeconds(42), config, legacyNames: false);
 		_sut.CreateLoadAverageMetric("eventstore-sys-load-avg", new() {
 			{ MetricsConfiguration.SystemTracker.LoadAverage1m, "1m" },
 			{ MetricsConfiguration.SystemTracker.LoadAverage5m, "5m" },
@@ -97,29 +100,29 @@ public void can_collect_sys_load_avg() {
 	[Fact]
 	public void can_collect_sys_cpu() {
 		Assert.Collection(
-            _doubleListener.RetrieveMeasurements("eventstore-sys-cpu"),
+			_doubleListener.RetrieveMeasurements("eventstore-sys-cpu"),
 			m => {
 				Assert.True(m.Value >= 0);
 				Assert.Empty(m.Tags);
 			});
 	}
-    
-    [Fact]
-    public void can_collect_sys_cpu_using_metrics_collector() {
-        // Arrange
-        using var collector = new MetricCollector<double>(
-            null, _meter.Name, "eventstore-sys-cpu"
-        );
-
-        // Act
-        collector.RecordObservableInstruments();
-        
-        // Assert
-        collector.LastMeasurement.Should().NotBeNull();
-        collector.LastMeasurement!.Value.Should().BeGreaterOrEqualTo(0);
-    }
-    
-   
+
+	[Fact]
+	public void can_collect_sys_cpu_using_metrics_collector() {
+		// Arrange
+		using var collector = new MetricCollector<double>(
+			null, _meter.Name, "eventstore-sys-cpu"
+		);
+
+		// Act
+		collector.RecordObservableInstruments();
+
+		// Assert
+		collector.LastMeasurement.Should().NotBeNull();
+		collector.LastMeasurement!.Value.Should().BeGreaterOrEqualTo(0);
+	}
+
+
 
 	[Fact]
 	public void can_collect_sys_mem() {
diff --git a/src/KurrentDB.Core.XUnit.Tests/Metrics/TestMeterListener.cs b/src/KurrentDB.Core.XUnit.Tests/Metrics/TestMeterListener.cs
new file mode 100644
index 00000000000..8960c64bb6e
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Metrics/TestMeterListener.cs
@@ -0,0 +1,71 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Metrics;
+
+namespace KurrentDB.Core.XUnit.Tests.Metrics;
+
+public class TestMeterListener<T> : IDisposable where T : struct {
+	private readonly MeterListener _listener;
+	private readonly Dictionary<string, List<TestMeasurement>> _measurementsByInstrument;
+
+	public TestMeterListener(Meter meter) {
+		_measurementsByInstrument = new();
+		_listener = new MeterListener {
+			InstrumentPublished = (instrument, listener) => {
+				if (instrument.Meter == meter) {
+					listener.EnableMeasurementEvents(instrument);
+				}
+			}
+		};
+		_listener.SetMeasurementEventCallback<T>(OnMeasurement);
+		_listener.Start();
+	}
+
+	public void Dispose() {
+		_listener?.Dispose();
+	}
+
+	public void Observe() {
+		_listener.RecordObservableInstruments();
+	}
+
+	// gets the measurements for a given instrument and clears them
+	public IReadOnlyList<TestMeasurement> RetrieveMeasurements(string instrumentName) {
+		if (!_measurementsByInstrument.Remove(instrumentName, out var measurements)) {
+			return Array.Empty<TestMeasurement>();
+		}
+
+		return measurements;
+	}
+
+	private void OnMeasurement(
+		Instrument instrument,
+		T value,
+		ReadOnlySpan<KeyValuePair<string, object>> tags,
+		object state) {
+
+		var instrumentName = GenName(instrument);
+		if (!_measurementsByInstrument.TryGetValue(instrumentName, out var measurements)) {
+			measurements = new();
+			_measurementsByInstrument[instrumentName] = measurements;
+		}
+
+		measurements.Add(new TestMeasurement {
+			Value = value,
+			Tags = tags.ToArray(),
+		});
+	}
+
+	private static string GenName(Instrument instrument) =>
+		string.IsNullOrWhiteSpace(instrument.Unit)
+		? instrument.Name
+		: instrument.Name + "-" + instrument.Unit;
+
+	public class TestMeasurement {
+		public T Value { get; init; }
+		public KeyValuePair<string, object>[] Tags { get; init; }
+	}
+}
diff --git a/src/EventStore.Core.XUnit.Tests/PluginLoaderTests.cs b/src/KurrentDB.Core.XUnit.Tests/PluginLoaderTests.cs
similarity index 92%
rename from src/EventStore.Core.XUnit.Tests/PluginLoaderTests.cs
rename to src/KurrentDB.Core.XUnit.Tests/PluginLoaderTests.cs
index 4f48ddb4fe6..415c065c685 100644
--- a/src/EventStore.Core.XUnit.Tests/PluginLoaderTests.cs
+++ b/src/KurrentDB.Core.XUnit.Tests/PluginLoaderTests.cs
@@ -1,14 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Runtime.Loader;
 using System.Threading.Tasks;
-using EventStore.Core.XUnit.Tests;
+using KurrentDB.Core.XUnit.Tests;
 using Xunit;
 
-namespace EventStore.PluginHosting.Tests;
+// ReSharper disable CheckNamespace
+
+namespace KurrentDB.PluginHosting.Tests;
 
 public class PluginLoaderTests : IAsyncLifetime {
 	private readonly DirectoryFixture<PluginLoaderTests> _fixture = new();
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/AdvancingCheckpointTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/AdvancingCheckpointTests.cs
new file mode 100644
index 00000000000..d7c4266eeb8
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/AdvancingCheckpointTests.cs
@@ -0,0 +1,74 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Scavenging;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class AdvancingCheckpointTests {
+	readonly AdvancingCheckpoint _sut;
+
+	int _readCount;
+	long _checkpoint;
+
+	public AdvancingCheckpointTests() {
+		_sut = new AdvancingCheckpoint(_ => {
+			_readCount++;
+			return new(_checkpoint);
+		});
+	}
+
+	[Fact]
+	public async Task compares_correctly() {
+		_checkpoint = 4;
+		Assert.True(await _sut.IsGreaterThanOrEqualTo(3, CancellationToken.None));
+		Assert.True(await _sut.IsGreaterThanOrEqualTo(4, CancellationToken.None));
+		Assert.False(await _sut.IsGreaterThanOrEqualTo(5, CancellationToken.None));
+		Assert.False(await _sut.IsGreaterThanOrEqualTo(6, CancellationToken.None));
+
+		_checkpoint = 5;
+		Assert.True(await _sut.IsGreaterThanOrEqualTo(3, CancellationToken.None));
+		Assert.True(await _sut.IsGreaterThanOrEqualTo(4, CancellationToken.None));
+		Assert.True(await _sut.IsGreaterThanOrEqualTo(5, CancellationToken.None));
+		Assert.False(await _sut.IsGreaterThanOrEqualTo(6, CancellationToken.None));
+	}
+
+	[Fact]
+	public async Task makes_use_of_cache() {
+		_checkpoint = 5;
+
+		Assert.Equal(0, _readCount);
+
+		// initially needs to check the backing store
+		Assert.True(await _sut.IsGreaterThanOrEqualTo(4, CancellationToken.None));
+		Assert.Equal(1, _readCount);
+
+		// cached
+		Assert.True(await _sut.IsGreaterThanOrEqualTo(5, CancellationToken.None));
+		Assert.Equal(1, _readCount);
+
+		// check the backing store in case it has advanced
+		Assert.False(await _sut.IsGreaterThanOrEqualTo(6, CancellationToken.None));
+		Assert.Equal(2, _readCount);
+
+		// check the backing store in case it has advanced
+		Assert.False(await _sut.IsGreaterThanOrEqualTo(6, CancellationToken.None));
+		Assert.Equal(3, _readCount);
+	}
+
+	[Fact]
+	public async Task can_reset() {
+		_checkpoint = 5;
+
+		Assert.True(await _sut.IsGreaterThanOrEqualTo(4, CancellationToken.None));
+		Assert.Equal(1, _readCount);
+
+		_sut.Reset();
+
+		Assert.True(await _sut.IsGreaterThanOrEqualTo(4, CancellationToken.None));
+		Assert.Equal(2, _readCount);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/ArchiverTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ArchiverTests.cs
new file mode 100644
index 00000000000..cf481d05ca1
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ArchiverTests.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class ArchiverTests : SqliteDbPerTest<ArchiverTests> {
+	[Fact]
+	public async Task archiver_does_not_execute_chunks() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.IsArchiver()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				// chunks not scavenged
+				x => [
+					x.Recs[0],
+					x.Recs[1],
+				],
+				// indexes still scavenged
+				x => [
+					x.Recs[0].KeepIndexes(3, 4),
+					x.Recs[1],
+				]);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/ArrayExtensions.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ArrayExtensions.cs
new file mode 100644
index 00000000000..9aca17017d1
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ArrayExtensions.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public static class ArrayExtensions {
+	// keep records at the specified indexes in the chunk
+	public static T[] KeepIndexes<T>(this T[] self, params int[] indexes) {
+		foreach (var i in indexes) {
+			Assert.True(i < self.Length, $"error in test: index {i} does not exist");
+		}
+
+		return self.Where((x, i) => indexes.Contains(i)).ToArray();
+	}
+
+	public static T[] KeepNone<T>(this T[] _) => [];
+
+	public static T[] KeepAll<T>(this T[] self) => self;
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/CalculationStatusTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/CalculationStatusTests.cs
new file mode 100644
index 00000000000..459936cf534
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/CalculationStatusTests.cs
@@ -0,0 +1,160 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class CalculationStatusTests : SqliteDbPerTest<CalculationStatusTests> {
+	async Task RunAsync(
+		CalculationStatus expected,
+		StreamMetadata metadata,
+		int numEvents,
+		bool isTombstoned) {
+
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", metadata: metadata))
+				.Chunk(Enumerable
+					.Range(0, numEvents)
+					.Select(_ => Rec.Write(t++, "ab-1"))
+					.ToArray())
+				.Chunk(isTombstoned
+					? Rec.CommittedDelete(t++, "ab-1")
+					: Rec.Write(t++, "cd-2"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertState(state => {
+				if (expected == CalculationStatus.Spent) {
+					// it should be deleted
+					Assert.False(state.TryGetOriginalStreamData("ab-1", out _));
+				} else {
+					// it should be present with the expected status
+					Assert.True(state.TryGetOriginalStreamData("ab-1", out var data));
+					Assert.Equal(expected, data.Status);
+				}
+			})
+			.RunAsync();
+
+	}
+
+	[Fact]
+	public async Task max_age() {
+		await RunAsync(
+			expected: CalculationStatus.Active,
+			metadata: new StreamMetadata(maxAge: TimeSpan.FromMinutes(1)),
+			numEvents: 1,
+			isTombstoned: false);
+	}
+
+	[Fact]
+	public async Task max_count() {
+		await RunAsync(
+			expected: CalculationStatus.Active,
+			metadata: new StreamMetadata(maxCount: 1),
+			numEvents: 1,
+			isTombstoned: false);
+	}
+
+	[Fact]
+	public async Task truncate_before_active() {
+		await RunAsync(
+			expected: CalculationStatus.Active,
+			metadata: new StreamMetadata(truncateBefore: 5),
+			numEvents: 5,
+			isTombstoned: false);
+	}
+
+	[Fact]
+	public async Task truncate_before_spent() {
+		await RunAsync(
+			expected: CalculationStatus.Spent,
+			metadata: new StreamMetadata(truncateBefore: 5),
+			numEvents: 6,
+			isTombstoned: false);
+	}
+
+	[Fact]
+	public async Task truncate_before_max() {
+		await RunAsync(
+			expected: CalculationStatus.Spent,
+			metadata: SoftDelete,
+			numEvents: 6,
+			isTombstoned: false);
+	}
+
+	[Fact]
+	public async Task tombstoned() {
+		await RunAsync(
+			expected: CalculationStatus.Archived,
+			metadata: new StreamMetadata(),
+			numEvents: 1,
+			isTombstoned: true);
+	}
+
+	[Fact]
+	public async Task tombstoned_and_max_age() {
+		await RunAsync(
+			expected: CalculationStatus.Archived,
+			metadata: new StreamMetadata(maxAge: TimeSpan.FromMinutes(1)),
+			numEvents: 1,
+			isTombstoned: true);
+	}
+
+	[Fact]
+	public async Task tombstoned_and_max_count() {
+		await RunAsync(
+			expected: CalculationStatus.Archived,
+			metadata: new StreamMetadata(maxCount: 1),
+			numEvents: 1,
+			isTombstoned: true);
+	}
+
+	[Fact]
+	public async Task tombstoned_and_truncate_before_active() {
+		await RunAsync(
+			expected: CalculationStatus.Archived,
+			metadata: new StreamMetadata(truncateBefore: 5),
+			numEvents: 5,
+			isTombstoned: true);
+	}
+
+	[Fact]
+	public async Task tombstoned_and_truncate_before_spent() {
+		await RunAsync(
+			expected: CalculationStatus.Archived,
+			metadata: new StreamMetadata(truncateBefore: 5),
+			numEvents: 6,
+			isTombstoned: true);
+	}
+
+	[Fact]
+	public async Task tombstoned_and_truncate_before_max() {
+		await RunAsync(
+			expected: CalculationStatus.Archived,
+			metadata: SoftDelete,
+			numEvents: 6,
+			isTombstoned: true);
+	}
+
+	[Fact]
+	public async Task blank() {
+		await RunAsync(
+			expected: CalculationStatus.Spent,
+			metadata: new StreamMetadata(),
+			numEvents: 1,
+			isTombstoned: false);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/CancellationAndContinuationTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/CancellationAndContinuationTests.cs
new file mode 100644
index 00000000000..ef45adc0cd9
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/CancellationAndContinuationTests.cs
@@ -0,0 +1,928 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class CancellationAndContinuationTests : SqliteDbPerTest<CancellationAndContinuationTests> {
+	// in these tests we we want to
+	// - run a scavenge
+	// - have a log record trigger the cancellation of that scavenge at a particular point
+	// - check that the checkpoint has been set correctly in the scavenge state
+	// - complete the scavenge
+	// - check it continued from the checkpoint
+	// - check it produced the right results
+
+	[Fact]
+	public async Task accumulator_checkpoints_immediately() {
+		var t = 0;
+		var logger = new FakeTFScavengerLog();
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$cd-cancel-accumulation"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.WithLogger(logger)
+			.CancelWhenAccumulatingMetaRecordFor("cd-cancel-accumulation")
+			.AssertTrace(
+				Tracer.Line("Accumulating from start to SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 0"),
+				Tracer.Line("    Rollback"),
+				Tracer.Line("Exception accumulating"))
+			.AssertState(state => {
+				Assert.Equal(ScavengeResult.Stopped, logger.Result);
+				Assert.True(state.TryGetCheckpoint(out var checkpoint));
+				var accumulating = Assert.IsType<ScavengeCheckpoint.Accumulating>(checkpoint);
+				Assert.Null(accumulating.DoneLogicalChunkNumber);
+			})
+			.RunAsync();
+	}
+
+	[Fact]
+	public async Task calculator_checkpoints_immediately() {
+		var t = 0;
+		var logger = new FakeTFScavengerLog();
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "cd-cancel-calculation"),
+					Rec.Write(t++, "$$cd-cancel-calculation", metadata: MaxCount1))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.WithLogger(logger)
+			.CancelWhenCalculatingOriginalStream("cd-cancel-calculation")
+			.AssertTrace(
+				Tracer.Line("Accumulating from start to SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 0"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 1"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Calculating SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("    Rollback"),
+				Tracer.Line("Exception calculating"))
+			.AssertState(state => {
+				Assert.Equal(ScavengeResult.Stopped, logger.Result);
+				Assert.True(state.TryGetCheckpoint(out var checkpoint));
+				var calculating = Assert.IsType<ScavengeCheckpoint.Calculating<string>>(checkpoint);
+				Assert.Equal("None", calculating.DoneStreamHandle.ToString());
+			})
+			.RunAsync();
+	}
+
+	[Fact]
+	public async Task chunk_executor_checkpoints_immediately() {
+		var t = 0;
+		var logger = new FakeTFScavengerLog();
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "$$ab-1", metadata: MaxCount1),
+					Rec.Write(t++, "cd-cancel-chunk-execution"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.WithLogger(logger)
+			.CancelWhenExecutingChunk("cd-cancel-chunk-execution")
+			.AssertTrace(
+				Tracer.Line("Accumulating from start to SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 0"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 1"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Calculating SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        SetDiscardPoints(98, Active, Discard before 1, Discard before 1)"),
+				Tracer.Line("        Checkpoint: Calculating SP-0 done Hash: 98"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing chunks for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 0-0"),
+				Tracer.Line("    Opening Chunk 0-0"),
+				Tracer.Line("Exception executing chunks"))
+			.AssertState(state => {
+				Assert.Equal(ScavengeResult.Stopped, logger.Result);
+				Assert.True(state.TryGetCheckpoint(out var checkpoint));
+				var executing = Assert.IsType<ScavengeCheckpoint.ExecutingChunks>(checkpoint);
+				Assert.Null(executing.DoneLogicalChunkNumber);
+			})
+			.RunAsync();
+	}
+
+	[Fact]
+	public async Task index_executor_checkpoints_immediately() {
+		var t = 0;
+		var logger = new FakeTFScavengerLog();
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "cd-cancel-index-execution"),
+					Rec.Write(t++, "ab-1"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.WithLogger(logger)
+			.CancelWhenExecutingIndexEntry("cd-cancel-index-execution")
+			.AssertTrace(
+				Tracer.Line("Accumulating from start to SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 0"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 1"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Calculating SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing chunks for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 0-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Merging chunks for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Merging chunks for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing index for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing index for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Exception executing index"))
+			.AssertState(state => {
+				Assert.Equal(ScavengeResult.Stopped, logger.Result);
+				Assert.True(state.TryGetCheckpoint(out var checkpoint));
+				var executing = Assert.IsType<ScavengeCheckpoint.ExecutingIndex>(checkpoint);
+			})
+			.RunAsync();
+	}
+
+	[Fact]
+	public async Task cleaner_checkpoints_immediately() {
+		var t = 0;
+		var logger = new FakeTFScavengerLog();
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(Rec.Write(t++, "ab-1"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.WithLogger(logger)
+			.CancelWhenCheckpointing<ScavengeCheckpoint.Cleaning>()
+			.AssertTrace(
+				Tracer.Line("Accumulating from start to SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 0"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 1"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Calculating SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing chunks for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 0-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Merging chunks for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Merging chunks for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing index for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing index for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Cleaning for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Cleaning for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Exception cleaning"))
+			.AssertState(state => {
+				Assert.Equal(ScavengeResult.Stopped, logger.Result);
+				Assert.True(state.TryGetCheckpoint(out var checkpoint));
+				var executing = Assert.IsType<ScavengeCheckpoint.Cleaning>(checkpoint);
+			})
+			.RunAsync();
+	}
+
+	[Fact]
+	public async Task can_cancel_during_accumulation_and_resume() {
+		var t = 0;
+		var logger = new FakeTFScavengerLog();
+		var scenario = new Scenario<LogFormat.V2, string>();
+		var db = await scenario
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount2),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"))
+				.Chunk(
+					Rec.Write(t++, "$$cd-cancel-accumulation"))
+				.Chunk(
+					Rec.Write(t++, "ab-1"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.WithLogger(logger)
+			.CancelWhenAccumulatingMetaRecordFor("cd-cancel-accumulation")
+			.AssertTrace(
+				Tracer.Line("Accumulating from start to SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 0"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 1"),
+				Tracer.Line("    Rollback"),
+				Tracer.Line("Exception accumulating"))
+			.AssertState(state => {
+				Assert.Equal(ScavengeResult.Stopped, logger.Result);
+				Assert.True(state.TryGetCheckpoint(out var checkpoint));
+				var accumulating = Assert.IsType<ScavengeCheckpoint.Accumulating>(checkpoint);
+				Assert.Equal(0, accumulating.DoneLogicalChunkNumber);
+			})
+			.RunAndKeepDbAsync();
+
+		// now complete the scavenge
+		await new Scenario<LogFormat.V2, string>()
+			.WithTracerFrom(scenario)
+			.WithDbPath(Fixture.Directory)
+			.WithDb(db)
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertTrace(
+				// accumulation continues from checkpoint
+				Tracer.Line("Accumulating from checkpoint: Accumulating SP-0 done Chunk 0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 1"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 2"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 2"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 3"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 3"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				// the rest is fresh for SP-0
+				Tracer.Line("Calculating SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        SetDiscardPoints(98, Active, Discard before 1, Discard before 1)"),
+				Tracer.Line("        SetDiscardPoints(100, Spent, Keep all, Keep all)"),
+				Tracer.Line("        Checkpoint: Calculating SP-0 done Hash: 100"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing chunks for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 0-0"),
+				Tracer.Line("    Opening Chunk 0-0"),
+				Tracer.Line("    Switched in chunk-000000.000001"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 1-1"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 2-2"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 2"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Merging chunks for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Merging chunks for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing index for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing index for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Cleaning for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Cleaning for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Cleaning for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Begin"),
+				Tracer.Line("    Checkpoint: Done SP-0"),
+				Tracer.Line("Commit"))
+			.AssertState(state => {
+				// scavenge completed
+				Assert.True(state.TryGetCheckpoint(out var checkpoint));
+				var done = Assert.IsType<ScavengeCheckpoint.Done>(checkpoint);
+				Assert.Equal("SP-0", done.ScavengePoint.GetName());
+			})
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(0, 2),
+				x.Recs[1].KeepIndexes(0),
+				x.Recs[2].KeepIndexes(0),
+				x.Recs[3],
+			});
+	}
+
+	[Fact]
+	public async Task can_cancel_during_calculation_and_resume() {
+		var t = 0;
+		var scenario = new Scenario<LogFormat.V2, string>();
+		var logger = new FakeTFScavengerLog();
+		var db = await scenario
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"))
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "cd-cancel-calculation"),
+					Rec.Write(t++, "$$cd-cancel-calculation", metadata: MaxCount1))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.WithLogger(logger)
+			.CancelWhenCalculatingOriginalStream("cd-cancel-calculation")
+			.AssertTrace(
+				Tracer.Line("Accumulating from start to SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 0"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 1"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 2"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 2"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Calculating SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        SetDiscardPoints(98, Active, Discard before 2, Discard before 2)"),
+				// throw while calculating 100
+				Tracer.Line("    Rollback"),
+				Tracer.Line("Exception calculating"))
+			.AssertState(state => {
+				Assert.Equal(ScavengeResult.Stopped, logger.Result);
+				Assert.True(state.TryGetCheckpoint(out var checkpoint));
+				var calculating = Assert.IsType<ScavengeCheckpoint.Calculating<string>>(checkpoint);
+				Assert.Equal("None", calculating.DoneStreamHandle.ToString());
+			})
+			.RunAndKeepDbAsync();
+
+		// now complete the scavenge
+		await new Scenario<LogFormat.V2, string>()
+			.WithTracerFrom(scenario)
+			.WithDbPath(Fixture.Directory)
+			.WithDb(db)
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertTrace(
+				// no accumulation
+				// calculation continues from checkpoint
+				Tracer.Line("Calculating from checkpoint: Calculating SP-0 done None"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        SetDiscardPoints(98, Active, Discard before 2, Discard before 2)"),
+				Tracer.Line("        Checkpoint: Calculating SP-0 done Hash: 100"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				// the rest is fresh for SP-0
+				Tracer.Line("Executing chunks for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 0-0"),
+				Tracer.Line("    Opening Chunk 0-0"),
+				Tracer.Line("    Switched in chunk-000000.000001"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 1-1"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Merging chunks for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Merging chunks for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing index for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing index for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Cleaning for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Cleaning for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Cleaning for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Begin"),
+				Tracer.Line("    Checkpoint: Done SP-0"),
+				Tracer.Line("Commit"))
+			.AssertState(state => {
+				// scavenge completed
+				Assert.True(state.TryGetCheckpoint(out var checkpoint));
+				var done = Assert.IsType<ScavengeCheckpoint.Done>(checkpoint);
+			})
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(0),
+				x.Recs[1].KeepIndexes(0, 1, 2),
+				x.Recs[2],
+			});
+	}
+
+	[Fact]
+	public async Task can_cancel_during_chunk_execution_and_resume() {
+		var t = 0;
+		var logger = new FakeTFScavengerLog();
+		var scenario = new Scenario<LogFormat.V2, string>();
+		var db = await scenario
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "$$ab-2", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "cd-cancel-chunk-execution"),
+					Rec.Write(t++, "ab-2"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.WithLogger(logger)
+			.CancelWhenExecutingChunk("cd-cancel-chunk-execution")
+			.AssertTrace(
+				Tracer.Line("Accumulating from start to SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 0"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 1"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 2"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 2"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Calculating SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        SetDiscardPoints(ab-1, Active, Discard before 1, Discard before 1)"),
+				// no discard points to set for ab-2
+				Tracer.Line("        Checkpoint: Calculating SP-0 done Id: ab-2"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing chunks for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 0-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 1-1"),
+				Tracer.Line("    Opening Chunk 1-1"),
+				Tracer.Line("Exception executing chunks"))
+			.AssertState(state => {
+				Assert.Equal(ScavengeResult.Stopped, logger.Result);
+				Assert.True(state.TryGetCheckpoint(out var checkpoint));
+				var executing = Assert.IsType<ScavengeCheckpoint.ExecutingChunks>(checkpoint);
+				Assert.Equal(0, executing.DoneLogicalChunkNumber);
+			})
+			.RunAndKeepDbAsync();
+
+		// now complete the scavenge
+		await new Scenario<LogFormat.V2, string>()
+			.WithTracerFrom(scenario)
+			.WithDbPath(Fixture.Directory)
+			.WithDb(db)
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertTrace(
+				// no accumulation
+				// no calculation
+				// chunk execution continues from checkpoint
+				Tracer.Line("Executing chunks from checkpoint: Executing chunks for SP-0 done Chunk 0"),
+				Tracer.Line("    Retaining Chunk 1-1"),
+				Tracer.Line("    Opening Chunk 1-1"),
+				Tracer.Line("    Switched in chunk-000001.000001"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				// the rest is fresh for SP-0
+				Tracer.Line("Merging chunks for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Merging chunks for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing index for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing index for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Cleaning for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Cleaning for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Cleaning for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Begin"),
+				Tracer.Line("    Checkpoint: Done SP-0"),
+				Tracer.Line("Commit"))
+			.AssertState(state => {
+				// scavenge completed
+				Assert.True(state.TryGetCheckpoint(out var checkpoint));
+				var done = Assert.IsType<ScavengeCheckpoint.Done>(checkpoint);
+			})
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(0),
+				x.Recs[1].KeepIndexes(1, 2, 3, 4),
+				x.Recs[2],
+			});
+	}
+
+	[Fact]
+	public async Task can_cancel_during_index_execution_and_resume() {
+		var t = 0;
+		var logger = new FakeTFScavengerLog();
+		var scenario = new Scenario<LogFormat.V2, string>();
+		var db = await scenario
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"))
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "cd-cancel-index-execution"),
+					Rec.Write(t++, "ab-1"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.WithLogger(logger)
+			.CancelWhenExecutingIndexEntry("cd-cancel-index-execution")
+			.AssertTrace(
+				Tracer.Line("Accumulating from start to SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 0"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 1"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 2"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 2"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Calculating SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        SetDiscardPoints(98, Active, Discard before 3, Discard before 3)"),
+				Tracer.Line("        Checkpoint: Calculating SP-0 done Hash: 98"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing chunks for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 0-0"),
+				Tracer.Line("    Opening Chunk 0-0"),
+				Tracer.Line("    Switched in chunk-000000.000001"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 1-1"),
+				Tracer.Line("    Opening Chunk 1-1"),
+				Tracer.Line("    Switched in chunk-000001.000001"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Merging chunks for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Merging chunks for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing index for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing index for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Exception executing index"))
+			.AssertState(state => {
+				Assert.Equal(ScavengeResult.Stopped, logger.Result);
+				Assert.True(state.TryGetCheckpoint(out var checkpoint));
+				var executing = Assert.IsType<ScavengeCheckpoint.ExecutingIndex>(checkpoint);
+			})
+			.RunAndKeepDbAsync();
+
+		// now complete the scavenge
+		await new Scenario<LogFormat.V2, string>()
+			.WithTracerFrom(scenario)
+			.WithDbPath(Fixture.Directory)
+			.WithDb(db)
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			// makes sure we dont reaccumulate
+			.CancelWhenAccumulatingMetaRecordFor("ab-1")
+			// make sure we dont recalculate
+			.CancelWhenCalculatingOriginalStream("ab-1")
+			// make sure we dont rescavenge the chunks
+			.CancelWhenExecutingChunk("ab-1")
+			.AssertTrace(
+				Tracer.Line("Executing index from checkpoint: Executing index for SP-0"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Cleaning for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Cleaning for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Cleaning for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Begin"),
+				Tracer.Line("    Checkpoint: Done SP-0"),
+				Tracer.Line("Commit"))
+			.AssertState(state => {
+				// scavenge completed
+				Assert.True(state.TryGetCheckpoint(out var checkpoint));
+				var done = Assert.IsType<ScavengeCheckpoint.Done>(checkpoint);
+			})
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(0),
+				x.Recs[1].KeepIndexes(1, 2),
+				x.Recs[2],
+			});
+	}
+
+	[Fact]
+	public async Task can_cancel_during_cleaning_and_resume() {
+		var t = 0;
+		var scenario = new Scenario<LogFormat.V2, string>();
+		var logger = new FakeTFScavengerLog();
+		var db = await scenario
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: TruncateBefore1),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.WithLogger(logger)
+			.CancelWhenCheckpointing<ScavengeCheckpoint.Cleaning>()
+			.AssertState(state => {
+				Assert.Equal(ScavengeResult.Stopped, logger.Result);
+				Assert.True(state.TryGetCheckpoint(out var checkpoint));
+				var executing = Assert.IsType<ScavengeCheckpoint.Cleaning>(checkpoint);
+			})
+			.RunAndKeepDbAsync();
+
+		// now complete the scavenge
+		await new Scenario<LogFormat.V2, string>()
+			.WithTracerFrom(scenario)
+			.WithDbPath(Fixture.Directory)
+			.WithDb(db)
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertTrace(
+				Tracer.Line("Cleaning from checkpoint Cleaning for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Cleaning for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Begin"),
+				Tracer.Line("    Checkpoint: Done SP-0"),
+				Tracer.Line("Commit"))
+			.AssertState(state => {
+				// scavenge completed
+				Assert.True(state.TryGetCheckpoint(out var checkpoint));
+				var done = Assert.IsType<ScavengeCheckpoint.Done>(checkpoint);
+
+				Assert.False(state.TryGetOriginalStreamData("ab-1", out _));
+				Assert.False(state.TryGetMetastreamData("$$ab-1", out _));
+			})
+			.RunAsync();
+	}
+
+	[Fact]
+	public async Task can_complete() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertTrace(
+				Tracer.Line("Accumulating from start to SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 0"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 1"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Calculating SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        SetDiscardPoints(98, Active, Discard before 1, Discard before 1)"),
+				Tracer.Line("        Checkpoint: Calculating SP-0 done Hash: 98"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing chunks for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 0-0"),
+				Tracer.Line("    Opening Chunk 0-0"),
+				Tracer.Line("    Switched in chunk-000000.000001"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Merging chunks for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Merging chunks for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing index for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing index for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Cleaning for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Cleaning for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Cleaning for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Begin"),
+				Tracer.Line("    Checkpoint: Done SP-0"),
+				Tracer.Line("Commit"))
+			.AssertState(state => {
+				Assert.True(state.TryGetCheckpoint(out var checkpoint));
+				var executing = Assert.IsType<ScavengeCheckpoint.Done>(checkpoint);
+			})
+			.RunAsync();
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/ChunkMergingTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ChunkMergingTests.cs
new file mode 100644
index 00000000000..548cc7e8fee
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ChunkMergingTests.cs
@@ -0,0 +1,79 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class ChunkMergingTests : SqliteDbPerTest<ChunkMergingTests> {
+	[Fact]
+	public async Task can_merge() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithMergeChunks(true)
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "cd-2")) // keep
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"), // keep
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1)) // keep
+				.Chunk(ScavengePointRec(t++))) // keep
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new ILogRecord[][] {
+					// chunk 0, 1 and 2 are the same chunk now
+					new[] {
+						x.Recs[0][1],
+						x.Recs[1][1],
+						x.Recs[1][2],
+						x.Recs[2][0],
+					},
+					new[] {
+						x.Recs[0][1],
+						x.Recs[1][1],
+						x.Recs[1][2],
+						x.Recs[2][0],
+					},
+					new[] {
+						x.Recs[0][1],
+						x.Recs[1][1],
+						x.Recs[1][2],
+						x.Recs[2][0],
+					}
+				},
+				x => null);
+	}
+
+	[Fact]
+	public async Task can_not_merge() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "cd-2"))
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				// chunks not merged
+				x.Recs[0].KeepIndexes(1),
+				x.Recs[1].KeepIndexes(1, 2),
+				x.Recs[2].KeepIndexes(0),
+			});
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/ChunkRemoverTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ChunkRemoverTests.cs
new file mode 100644
index 00000000000..7028f919d3b
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ChunkRemoverTests.cs
@@ -0,0 +1,187 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests.Index.Hashers;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.TransactionLog.Scavenging;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.InMemory;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using KurrentDB.Core.TransactionLog.Scavenging.Stages;
+using Serilog;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class ChunkRemoverTests {
+	readonly IScavengeStateBackend<string> _backend;
+	readonly ScavengeStateForChunkWorker<string> _scavengeState;
+	readonly FakeChunkManager _chunkManager = new();
+
+	public ChunkRemoverTests() {
+		_backend = new InMemoryScavengeBackend();
+		_scavengeState = new ScavengeStateForChunkWorker<string>(
+			hasher: new HumanReadableHasher(),
+			backend: _backend,
+			collisions: [],
+			onDispose: () => { });
+	}
+
+	ChunkRemover<string, ILogRecord> GenSut(
+		int retainDays,
+		long retainBytes,
+		Func<long> readArchiveCheckpoint) {
+
+		var sut = new ChunkRemover<string, ILogRecord>(
+			logger: Log.Logger,
+			archiveCheckpoint: new AdvancingCheckpoint(_ => new(readArchiveCheckpoint())),
+			chunkManager: _chunkManager,
+			locatorCodec: new PrefixingLocatorCodec(),
+			retainPeriod: TimeSpan.FromDays(retainDays),
+			retainBytes: retainBytes);
+		return sut;
+	}
+
+	static ScavengePoint GenScavengePoint(long position, DateTime effectiveNow) {
+		var scavengePoint = new ScavengePoint(
+			position: position,
+			eventNumber: 0,
+			effectiveNow: effectiveNow,
+			threshold: 0);
+		return scavengePoint;
+	}
+
+	public enum ExpectedOutcome {
+		Removed,
+		Retained,
+	}
+
+	[Theory]
+	[InlineData(1000, 10, true, ExpectedOutcome.Removed, "can be removed")]
+	[InlineData(1000, 10, false, ExpectedOutcome.Retained, "retain because not present in archive")]
+	[InlineData(1000, 11, true, ExpectedOutcome.Retained, "retain because of retention period (in archive)")]
+	[InlineData(1000, 11, false, ExpectedOutcome.Retained, "retain because of retention period (not in archive)")]
+	[InlineData(1001, 10, true, ExpectedOutcome.Retained, "retain because of retention bytes (in archive)")]
+	[InlineData(1001, 10, false, ExpectedOutcome.Retained, "retain because of retention bytes (not in archive)")]
+	[InlineData(1001, 11, true, ExpectedOutcome.Retained, "retain because of both (in archive)")]
+	[InlineData(1001, 11, false, ExpectedOutcome.Retained, "retain because of both (not in archive)")]
+	public async Task simple_cases(
+		int retainBytes,
+		int retainDays,
+		bool isInArchive,
+		ExpectedOutcome expectedOutcome,
+		string name) {
+
+		_ = name;
+		var minDateInChunk = new DateTime(2024, 1, 1);
+		var maxDateInChunk = new DateTime(2024, 12, 1);
+		_backend.ChunkTimeStampRanges[1] = new(minDateInChunk, maxDateInChunk);
+
+		// chunk 1 contains records with positions 1000-3000
+		var chunk = new FakeChunk(chunkStartNumber: 1, chunkEndNumber: 2, chunkSize: 1_000);
+
+		var sut = GenSut(
+			retainDays: retainDays,
+			retainBytes: retainBytes,
+			readArchiveCheckpoint: () => isInArchive
+				? chunk.ChunkEndPosition
+				: chunk.ChunkEndPosition - 1);
+
+		var when = async () => {
+			var removing = await sut.StartRemovingIfNotRetained(
+				scavengePoint: GenScavengePoint(
+					// scavenging > 1000 bytes after the end of the chunk
+					position: chunk.ChunkEndPosition + 1001,
+					// scavenging > 10 days after the last record in the chunk
+					effectiveNow: maxDateInChunk + TimeSpan.FromDays(10.1)),
+				concurrentState: _scavengeState,
+				physicalChunk: chunk,
+				CancellationToken.None);
+			return removing;
+		};
+
+		var removing = await when();
+		if (expectedOutcome == ExpectedOutcome.Removed) {
+			Assert.True(removing);
+			Assert.Equal<string>(_chunkManager.InterceptedLocators, [
+				"archived-chunk-1",
+				"archived-chunk-2",
+			]);
+		} else if (expectedOutcome == ExpectedOutcome.Retained) {
+			Assert.False(removing);
+			Assert.Equal(_chunkManager.InterceptedLocators, []);
+		} else {
+			throw new InvalidOperationException();
+		}
+	}
+
+	[Fact]
+	public async Task when_chunk_has_no_prepares() {
+		// chunk 1 contains records with positions 1000-2000
+		var chunk = new FakeChunk(isRemote: false, chunkStartNumber: 1, chunkEndNumber: 1, chunkSize: 1_000);
+
+		var sut = GenSut(
+			retainDays: 10,
+			retainBytes: 1000,
+			readArchiveCheckpoint: () =>
+				// present in archive
+				chunk.ChunkEndPosition);
+
+		var removing = await sut.StartRemovingIfNotRetained(
+			scavengePoint: GenScavengePoint(
+				// scavenging > 1000 bytes after the end of the chunk
+				position: chunk.ChunkEndPosition + 1001,
+				// doesn't matter when, no dates are populated in the ChunkTimeStampRanges
+				effectiveNow: DateTime.Now),
+			concurrentState: _scavengeState,
+			physicalChunk: chunk,
+			CancellationToken.None);
+
+		Assert.True(removing);
+	}
+
+	class FakeChunkManager : IChunkManagerForChunkRemover {
+		public IReadOnlyList<string> InterceptedLocators { get; private set; } = [];
+
+		public ValueTask<bool> SwitchInChunks(IReadOnlyList<string> locators, CancellationToken token) {
+			InterceptedLocators = locators;
+			return new(true);
+		}
+	}
+
+	class FakeChunk(
+		int chunkStartNumber,
+		int chunkEndNumber,
+		int chunkSize = 1_000,
+		bool isRemote = false)
+		: IChunkReaderForExecutor<string, ILogRecord> {
+
+		public string Name => $"Chunk {chunkStartNumber}-{chunkEndNumber}";
+
+		public int FileSize => throw new NotImplementedException();
+
+		public int ChunkStartNumber => chunkStartNumber;
+
+		public int ChunkEndNumber => chunkEndNumber;
+
+		public bool IsReadOnly => throw new NotImplementedException();
+
+		public bool IsRemote => isRemote;
+
+		public long ChunkStartPosition => chunkStartNumber * chunkSize;
+
+		public long ChunkEndPosition => (chunkEndNumber + 1) * chunkSize;
+
+		public IAsyncEnumerable<bool> ReadInto(
+			RecordForExecutor<string, ILogRecord>.NonPrepare nonPrepare,
+			RecordForExecutor<string, ILogRecord>.Prepare prepare,
+			CancellationToken token) {
+			throw new NotImplementedException();
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/ChunkRetentionTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ChunkRetentionTests.cs
new file mode 100644
index 00000000000..29b10d1bbf9
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ChunkRetentionTests.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class ChunkRetentionTests : SqliteDbPerTest<MaxAgeTests> {
+	[Fact]
+	public async Task chunks_get_removed() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithArchive(chunksInArchive: 1, retainBytes: 20)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"))
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					ScavengePointRec(t++, timeStamp: DateTime.UtcNow)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertTrace(
+				Tracer.Line("Accumulating from start to SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 0"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 1"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Calculating SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing chunks for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Removing Chunk 0-0"),        // <---------
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 1-1"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Merging chunks for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Merging chunks for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing index for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing index for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Cleaning for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Cleaning for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Cleaning for SP-0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Begin"),
+				Tracer.Line("    Checkpoint: Done SP-0"),
+				Tracer.Line("Commit"))
+
+			.RunAsync(
+				x => [
+					[],        // archived chunks considered empty (ArchiveReaderEmptyChunks)
+					x.Recs[1], // chunk 1 untouched
+				],
+				// index remains the same as before
+				x => [
+					x.Recs[0],
+					x.Recs[1],
+				]);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/ChunkWeightTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ChunkWeightTests.cs
new file mode 100644
index 00000000000..0d2218d29f1
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ChunkWeightTests.cs
@@ -0,0 +1,189 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+
+#pragma warning disable CS0162 // Unreachable code detected
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class ChunkWeightTests : SqliteDbPerTest<ChunkWeightTests> {
+	[Fact]
+	public async Task simple() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "ab-1"), // weight: 2
+					Rec.Write(t++, "ab-1"), // weight: 2
+					Rec.Write(t++, "ab-1"))
+				.Chunk(
+					ScavengePointRec(t++, threshold: 1000)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertState(state => {
+				Assert.Equal(4, state.SumChunkWeights(0, 0));
+				Assert.Equal(0, state.SumChunkWeights(1, 1));
+			})
+			.RunAsync();
+	}
+
+	[Fact]
+	public async Task max_age_maybe_discard() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1", timestamp: Expired), // weight: 1
+					Rec.Write(t++, "ab-1", timestamp: Expired), // weight: 1
+					Rec.Write(t++, "ab-1", timestamp: Active), // weight: 1
+					Rec.Write(t++, "ab-1", timestamp: Active), // weight: 0 - last event
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxAgeMetadata))
+				.Chunk(
+					ScavengePointRec(t++, threshold: 1000)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertState(state => {
+				Assert.Equal(3, state.SumChunkWeights(0, 0));
+				Assert.Equal(0, state.SumChunkWeights(1, 1));
+				Assert.True(state.TryGetOriginalStreamData("ab-1", out var data));
+				Assert.Equal(DiscardPoint.DiscardBefore(0), data.DiscardPoint);
+				Assert.Equal(DiscardPoint.DiscardBefore(3), data.MaybeDiscardPoint);
+			})
+			.RunAsync();
+	}
+
+	[Fact]
+	public async Task non_contiguous_events() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1", eventNumber: 0), // weight: 2
+					Rec.Write(t++, "ab-1", eventNumber: 1), // weight: 2
+					Rec.Write(t++, "ab-1", eventNumber: 5), // weight: 2
+					Rec.Write(t++, "ab-1", eventNumber: 6), // weight: 2
+					Rec.Write(t++, "ab-1", eventNumber: 7), // weight: 0 - last event
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
+				.Chunk(
+					ScavengePointRec(t++, threshold: 1000)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertState(state => {
+				Assert.Equal(8, state.SumChunkWeights(0, 0));
+				Assert.Equal(0, state.SumChunkWeights(1, 1));
+				Assert.True(state.TryGetOriginalStreamData("ab-1", out var data));
+				Assert.Equal(DiscardPoint.DiscardBefore(7), data.DiscardPoint);
+				Assert.Equal(DiscardPoint.DiscardBefore(7), data.MaybeDiscardPoint);
+			})
+			.RunAsync();
+	}
+
+	[Fact]
+	public async Task long_stream() {
+		if (Scenario.CollideEverything) {
+			// TODO: something weird happens here, possibly the system doesn't properly handle
+			// $$$settings (or any metadatastream?) colliding with a long stream, which this scenario
+			// causes.
+			return;
+		}
+
+		var t = 0;
+
+		var numRecords = 260;
+
+		var records = new Rec[numRecords];
+		for (var i = 0; i < numRecords; i++) {
+			records[i] = Rec.Write(t++, "ab-1");
+		}
+
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					records)
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					ScavengePointRec(t++, threshold: 1000)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertState(state => {
+				Assert.Equal(numRecords * 2, state.SumChunkWeights(0, 0));
+				Assert.Equal(0, state.SumChunkWeights(1, 1));
+				Assert.True(state.TryGetOriginalStreamData("ab-1", out var data));
+				Assert.Equal(DiscardPoint.DiscardBefore(numRecords), data.DiscardPoint);
+				Assert.Equal(DiscardPoint.DiscardBefore(numRecords), data.MaybeDiscardPoint);
+			})
+			.RunAsync();
+	}
+
+	[Fact]
+	public async Task metadata_replaced_by_metadata() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1)) // weight: 2
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					ScavengePointRec(t++, threshold: 1000)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertState(state => {
+				Assert.Equal(2, state.SumChunkWeights(0, 0));
+				Assert.Equal(0, state.SumChunkWeights(1, 1));
+			})
+			.RunAsync();
+	}
+
+	[Fact]
+	public async Task metadata_replaced_by_tombstone() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1)) // weight: 2
+				.Chunk(
+					Rec.CommittedDelete(t++, "ab-1"),
+					ScavengePointRec(t++, threshold: 1000)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertState(state => {
+				Assert.Equal(2, state.SumChunkWeights(0, 0));
+				Assert.Equal(0, state.SumChunkWeights(1, 1));
+			})
+			.RunAsync();
+	}
+
+	[Fact]
+	public async Task metadata_replaced_multiple_times() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1)) // weight: 2
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1), // weight: 2
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1)) // weight: 2
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1), // weight: 2
+					Rec.CommittedDelete(t++, "ab-1"),
+					ScavengePointRec(t++, threshold: 1000)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertState(state => {
+				Assert.Equal(2, state.SumChunkWeights(0, 0));
+				Assert.Equal(4, state.SumChunkWeights(1, 1));
+				Assert.Equal(2, state.SumChunkWeights(2, 2));
+			})
+			.RunAsync();
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/CollisionDetectorTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/CollisionDetectorTests.cs
new file mode 100644
index 00000000000..6a867489691
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/CollisionDetectorTests.cs
@@ -0,0 +1,138 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Tests.Index.Hashers;
+using KurrentDB.Core.TransactionLog.Scavenging;
+using KurrentDB.Core.TransactionLog.Scavenging.CollisionManagement;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Serilog;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class CollisionDetectorTests : SqliteDbPerTest<CollisionDetectorTests> {
+	public static IEnumerable<object[]> TheCases() {
+		var none = Array.Empty<string>();
+
+		// the first letter of the stream name determines the hash
+		// each row represents a record but here the only thing we need to know about it is
+		// its stream name and the collisions it generates when we add it.
+		yield return Case(
+			"seen stream before. was a collision first time we saw it",
+			("a-stream1", CollisionResult.NoCollision, "", none),
+			("a-streamOfInterest", CollisionResult.NewCollision, "a-stream1", new[] { "a-stream1", "a-streamOfInterest" }),
+			("b-stream2", CollisionResult.NoCollision, "", none),
+			("a-streamOfInterest", CollisionResult.OldCollision, "", none));
+
+		yield return Case(
+			"seen stream before. was not a collision but has since been collided with",
+			("a-streamOfInterest", CollisionResult.NoCollision, "", none),
+			("a-stream1", CollisionResult.NewCollision, "a-streamOfInterest", new[] { "a-stream1", "a-streamOfInterest" }),
+			("b-stream2", CollisionResult.NoCollision, "", none),
+			("a-streamOfInterest", CollisionResult.OldCollision, "", none));
+
+		yield return Case(
+			"seen stream before. was not a collision and still isnt",
+			("a-streamOfInterest", CollisionResult.NoCollision, "", none),
+			("b-stream2", CollisionResult.NoCollision, "", none),
+			("a-streamOfInterest", CollisionResult.NoCollision, "", none));
+
+		yield return Case(
+			"first time seeing stream. no collision",
+			("a-stream1", CollisionResult.NoCollision, "", none),
+			("b-stream2", CollisionResult.NoCollision, "", none),
+			("c-streamOfInterest", CollisionResult.NoCollision, "", none));
+
+		yield return Case(
+			"first time seeing stream. collides with previous stream",
+			("a-stream1", CollisionResult.NoCollision, "", none),
+			("b-stream2", CollisionResult.NoCollision, "", none),
+			("a-streamOfInterest", CollisionResult.NewCollision, "a-stream1", new[] { "a-stream1", "a-streamOfInterest" }));
+
+		yield return Case(
+			"three way collision",
+			("a-stream1", CollisionResult.NoCollision, "", none),
+			("a-stream2", CollisionResult.NewCollision, "a-stream1", new[] { "a-stream1", "a-stream2" }),
+			("a-stream3", CollisionResult.NewCollision, "a-stream1", new[] { "a-stream3" }));
+
+		yield return Case(
+			"in combination",
+			("a-stream1", CollisionResult.NoCollision, "", none), // 2b
+			("a-stream2", CollisionResult.NewCollision, "a-stream1", new[] { "a-stream1", "a-stream2" }), // 2a
+			("b-stream3", CollisionResult.NoCollision, "", none),
+			("a-stream4", CollisionResult.NewCollision, "a-stream1", new[] { "a-stream4" }),
+			("b-stream3", CollisionResult.NoCollision, "", none), // 1c
+			("a-stream1", CollisionResult.OldCollision, "", none), // 1b
+			("a-stream2", CollisionResult.OldCollision, "", none)); // 1a
+
+		object[] Case(string name, params (string, CollisionResult, string oldUser, string[])[] data) {
+			return new object[] {
+				name, data
+			};
+		}
+	}
+
+	[Theory]
+	[MemberData(nameof(TheCases))]
+	public void Works(
+		string caseName,
+		(string StreamName, Core.TransactionLog.Scavenging.Data.CollisionResult CollisionResult, string ExpectedOldUser, string[] NewCollisions)[] data) {
+
+		Assert.NotNull(caseName);
+
+		var log = data.Select(x => x.StreamName).ToArray();
+		var hasher = new FirstCharacterHasher();
+
+		// index maps hashes to lists of log positions
+		var index = new Dictionary<ulong, List<int>>();
+
+		// populate the index
+		for (var i = 0; i < log.Length; i++) {
+			var streamName = log[i];
+			var hash = hasher.Hash(streamName);
+			if (!index.TryGetValue(hash, out var entries)) {
+				entries = new List<int>();
+				index[hash] = entries;
+			}
+
+			// which order is more realistic? this way shows the need for filtering by position anyway
+			entries.Insert(0, i);
+		}
+
+		var hashes = new SqliteScavengeMap<ulong, string>("hashes");
+		hashes.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var collisions = new SqliteCollisionScavengeMap<string>();
+		collisions.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var sut = new CollisionDetector<string>(
+			Log.Logger,
+			new LruCachingScavengeMap<ulong, string>(
+				"HashUsers",
+				hashes,
+				cacheMaxCount: 1000),
+			collisions,
+			hasher);
+
+		var expectedCollisions = new HashSet<string>();
+
+		for (var i = 0; i < data.Length; i++) {
+			foreach (var newCollision in data[i].NewCollisions)
+				expectedCollisions.Add(newCollision);
+
+			var result = sut.DetectCollisions(data[i].StreamName, out var oldUser);
+			Assert.Equal(result, data[i].CollisionResult);
+			Assert.Equal(
+				expectedCollisions.OrderBy(x => x),
+				sut.AllCollisions());
+
+			if (result == CollisionResult.NewCollision)
+				Assert.Equal(data[i].ExpectedOldUser, oldUser);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/CollisionMapTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/CollisionMapTests.cs
new file mode 100644
index 00000000000..448ed1217b9
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/CollisionMapTests.cs
@@ -0,0 +1,122 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Tests.Index.Hashers;
+using KurrentDB.Core.TransactionLog.Scavenging.CollisionManagement;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+// generally the properties we need of the CollisionManager are tested at a higher
+// level. but a couple of fiddly bits are checked in here
+public class CollisionMapTests : SqliteDbPerTest<CollisionMapTests> {
+	[Fact]
+	public void sanity() {
+		var collisions = new SqliteCollisionScavengeMap<string>();
+		collisions.Initialize(new SqliteBackend(Fixture.DbConnection));
+		var sut = GenSut(collisions);
+
+		// add a non-collision for ab-1
+		sut["ab-1"] = "foo";
+
+		// value can be retrieved
+		Assert.True(sut.TryGetValue("ab-1", out var actual));
+		Assert.Equal("foo", actual);
+
+		// "a-1" collides with "a-2".
+		collisions["ab-1"] = Unit.Instance;
+		collisions["ab-2"] = Unit.Instance;
+		sut.NotifyCollision("ab-1");
+
+		// value for "a-1" can still be retrieved
+		Assert.True(sut.TryGetValue("ab-1", out actual));
+		Assert.Equal("foo", actual);
+
+		// "a-2" not retrieveable since we never set it
+		Assert.False(sut.TryGetValue("ab-2", out _));
+	}
+
+	private CollisionMap<string, string> GenSut(IScavengeMap<string, Unit> collisions) {
+		var nonCollisionsMap = new SqliteScavengeMap<ulong, string>("non_collisions");
+		nonCollisionsMap.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var collisionsMap = new SqliteScavengeMap<string, string>("collisions");
+		collisionsMap.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var sut = new CollisionMap<string, string>(
+			new HumanReadableHasher(),
+			x => collisionsMap.TryGetValue(x, out _),
+			nonCollisionsMap,
+			collisionsMap);
+
+		return sut;
+	}
+}
+
+public class OriginalStreamCollisionMapTests : SqliteDbPerTest<OriginalStreamCollisionMapTests> {
+	[Fact]
+	public void can_enumerate() {
+		var collisions = new SqliteCollisionScavengeMap<string>();
+		collisions.Initialize(new SqliteBackend(Fixture.DbConnection));
+		var sut = GenSut(collisions);
+
+		collisions["ac-1"] = Unit.Instance;
+		collisions["ac-2"] = Unit.Instance;
+		collisions["ac-3"] = Unit.Instance;
+
+		// non collisions
+		sut["ad-4"] = new OriginalStreamData { MaxCount = 4, Status = CalculationStatus.Active };
+		sut["ae-5"] = new OriginalStreamData { MaxCount = 5, Status = CalculationStatus.Active };
+		sut["af-6"] = new OriginalStreamData { MaxCount = 6, Status = CalculationStatus.Active };
+		// collisions
+		sut["ac-1"] = new OriginalStreamData { MaxCount = 1, Status = CalculationStatus.Active };
+		sut["ac-2"] = new OriginalStreamData { MaxCount = 2, Status = CalculationStatus.Active };
+		sut["ac-3"] = new OriginalStreamData { MaxCount = 3, Status = CalculationStatus.Active };
+
+		// no checkpoint
+		Assert.Collection(
+			sut.EnumerateActive(checkpoint: default),
+			x => Assert.Equal("(Id: ac-1, 1)", $"({x.Item1}, {x.Item2.MaxCount})"),
+			x => Assert.Equal("(Id: ac-2, 2)", $"({x.Item1}, {x.Item2.MaxCount})"),
+			x => Assert.Equal("(Id: ac-3, 3)", $"({x.Item1}, {x.Item2.MaxCount})"),
+			x => Assert.Equal("(Hash: 100, 4)", $"({x.Item1}, {x.Item2.MaxCount})"),
+			x => Assert.Equal("(Hash: 101, 5)", $"({x.Item1}, {x.Item2.MaxCount})"),
+			x => Assert.Equal("(Hash: 102, 6)", $"({x.Item1}, {x.Item2.MaxCount})"));
+
+		// id checkpoint
+		Assert.Collection(
+			sut.EnumerateActive(checkpoint: StreamHandle.ForStreamId("ac-2")),
+			x => Assert.Equal("(Id: ac-3, 3)", $"({x.Item1}, {x.Item2.MaxCount})"),
+			x => Assert.Equal("(Hash: 100, 4)", $"({x.Item1}, {x.Item2.MaxCount})"),
+			x => Assert.Equal("(Hash: 101, 5)", $"({x.Item1}, {x.Item2.MaxCount})"),
+			x => Assert.Equal("(Hash: 102, 6)", $"({x.Item1}, {x.Item2.MaxCount})"));
+
+		// hash checkpoint
+		Assert.Collection(
+			sut.EnumerateActive(checkpoint: StreamHandle.ForHash<string>(101)),
+			x => Assert.Equal("(Hash: 102, 6)", $"({x.Item1}, {x.Item2.MaxCount})"));
+
+		// end checkpoint
+		Assert.Empty(sut.EnumerateActive(checkpoint: StreamHandle.ForHash<string>(102)));
+	}
+
+	private OriginalStreamCollisionMap<string> GenSut(IScavengeMap<string, Unit> collisions) {
+		var nonCollisionsMap = new SqliteOriginalStreamScavengeMap<ulong>("non_collisions");
+		nonCollisionsMap.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var collisionsMap = new SqliteOriginalStreamScavengeMap<string>("collisions");
+		collisionsMap.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var sut = new OriginalStreamCollisionMap<string>(
+			new HumanReadableHasher(),
+			x => collisions.TryGetValue(x, out _),
+			nonCollisionsMap,
+			collisionsMap);
+
+		return sut;
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/CombinationCriteriaTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/CombinationCriteriaTests.cs
new file mode 100644
index 00000000000..0e146ccd2c7
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/CombinationCriteriaTests.cs
@@ -0,0 +1,276 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+#pragma warning disable CS0162 // Unreachable code detected
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class CombinationCriteriaTests : SqliteDbPerTest<CombinationCriteriaTests> {
+	// in combination, we discard the event if any of the criteria says we can discard it.
+	// 'then' means the latter taking priority
+	[Fact]
+	public async Task max_count_then_tombstone() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount2),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.CommittedDelete(t++, "ab-1"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(3),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task max_count_discards_more_than_max_age() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1", timestamp: Expired), // 0
+					Rec.Write(t++, "ab-1", timestamp: Expired), // 1 <-- maxage discard
+					Rec.Write(t++, "ab-1", timestamp: Active), // 2
+					Rec.Write(t++, "ab-1", timestamp: Active), // 3 <-- maxcount discard
+					Rec.Write(t++, "ab-1", timestamp: Active), // 4 <-- keep
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: new StreamMetadata(
+						maxAge: MaxAgeTimeSpan,
+						maxCount: 1)))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(4, 5),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task max_count_discards_more_than_truncate_before() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"), // 0
+					Rec.Write(t++, "ab-1"), // 1 <-- tb discard
+					Rec.Write(t++, "ab-1"), // 2
+					Rec.Write(t++, "ab-1"), // 3 <-- maxcount discard
+					Rec.Write(t++, "ab-1"), // 4 <-- keep
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: new StreamMetadata(
+						truncateBefore: 2,
+						maxCount: 1)))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(4, 5),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task max_count_discards_more_than_max_age_and_truncate_before() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1", timestamp: Expired), // 0
+					Rec.Write(t++, "ab-1", timestamp: Expired), // 1 <-- maxage discard
+					Rec.Write(t++, "ab-1", timestamp: Active), // 2
+					Rec.Write(t++, "ab-1", timestamp: Active), // 3 <-- tb discard
+					Rec.Write(t++, "ab-1", timestamp: Active), // 4
+					Rec.Write(t++, "ab-1", timestamp: Active), // 5 <-- maxcount discard
+					Rec.Write(t++, "ab-1", timestamp: Active), // 6 <-- keep
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: new StreamMetadata(
+						maxAge: MaxAgeTimeSpan,
+						truncateBefore: 4,
+						maxCount: 1)))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(6, 7),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task truncate_before_discards_more_than_max_count() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"), // 0
+					Rec.Write(t++, "ab-1"), // 1 <-- maxcount discard
+					Rec.Write(t++, "ab-1"), // 2
+					Rec.Write(t++, "ab-1"), // 3 <-- tb discard
+					Rec.Write(t++, "ab-1"), // 4 <-- keep
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: new StreamMetadata(
+						maxCount: 3,
+						truncateBefore: 4)))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(4, 5),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task truncate_before_discards_more_than_max_age() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1", timestamp: Expired), // 0
+					Rec.Write(t++, "ab-1", timestamp: Expired), // 1 <-- maxage discard
+					Rec.Write(t++, "ab-1", timestamp: Active), // 2
+					Rec.Write(t++, "ab-1", timestamp: Active), // 3 <-- tb discard
+					Rec.Write(t++, "ab-1", timestamp: Active), // 4 <-- keep
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: new StreamMetadata(
+						maxAge: MaxAgeTimeSpan,
+						truncateBefore: 4)))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(4, 5),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task truncate_before_discards_more_than_max_age_and_max_count() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1", timestamp: Expired), // 0
+					Rec.Write(t++, "ab-1", timestamp: Expired), // 1 <-- maxage discard
+					Rec.Write(t++, "ab-1", timestamp: Active), // 2
+					Rec.Write(t++, "ab-1", timestamp: Active), // 3 <-- maxcount discard
+					Rec.Write(t++, "ab-1", timestamp: Active), // 4
+					Rec.Write(t++, "ab-1", timestamp: Active), // 5 <-- tb discard
+					Rec.Write(t++, "ab-1", timestamp: Active), // 6 <-- keep
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: new StreamMetadata(
+						maxAge: MaxAgeTimeSpan,
+						maxCount: 3,
+						truncateBefore: 6)))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(6, 7),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task max_age_discards_more_than_max_count() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1", timestamp: Expired), // 0
+					Rec.Write(t++, "ab-1", timestamp: Expired), // 1 <-- maxcount discard
+					Rec.Write(t++, "ab-1", timestamp: Expired), // 2
+					Rec.Write(t++, "ab-1", timestamp: Expired), // 3 <-- maxage discard
+					Rec.Write(t++, "ab-1", timestamp: Active), // 4 <-- keep
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: new StreamMetadata(
+						maxCount: 3,
+						maxAge: MaxAgeTimeSpan)))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(4, 5),
+					x.Recs[1],
+				},
+				Scenario.CollideEverything
+					? default(Func<DbResult, LogRecord[][]>)
+					: x => new[] {
+						x.Recs[0].KeepIndexes(2, 3, 4, 5),
+						x.Recs[1],
+					});
+	}
+
+	[Fact]
+	public async Task max_age_discards_more_than_truncate_before() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1", timestamp: Expired), // 0
+					Rec.Write(t++, "ab-1", timestamp: Expired), // 1 <-- tb discard
+					Rec.Write(t++, "ab-1", timestamp: Expired), // 2
+					Rec.Write(t++, "ab-1", timestamp: Expired), // 3 <-- maxage discard
+					Rec.Write(t++, "ab-1", timestamp: Active), // 4 <-- keep
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: new StreamMetadata(
+						truncateBefore: 2,
+						maxAge: MaxAgeTimeSpan)))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(4, 5),
+					x.Recs[1],
+				},
+				Scenario.CollideEverything
+					? default(Func<DbResult, LogRecord[][]>)
+					: x => new[] {
+						x.Recs[0].KeepIndexes(2, 3, 4, 5),
+						x.Recs[1],
+					});
+	}
+
+	[Fact]
+	public async Task max_age_discards_more_than_truncate_before_and_max_count() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1", timestamp: Expired), // 0
+					Rec.Write(t++, "ab-1", timestamp: Expired), // 1 <-- maxcount discard
+					Rec.Write(t++, "ab-1", timestamp: Expired), // 2
+					Rec.Write(t++, "ab-1", timestamp: Expired), // 3 <-- tb discard
+					Rec.Write(t++, "ab-1", timestamp: Expired), // 4
+					Rec.Write(t++, "ab-1", timestamp: Expired), // 5 <-- maxage discard
+					Rec.Write(t++, "ab-1", timestamp: Active), // 6 <-- keep
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: new StreamMetadata(
+						maxCount: 5,
+						truncateBefore: 4,
+						maxAge: MaxAgeTimeSpan)))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(6, 7),
+					x.Recs[1],
+				},
+				Scenario.CollideEverything
+					? default(Func<DbResult, LogRecord[][]>)
+					: x => new[] {
+						x.Recs[0].KeepIndexes(4, 5, 6, 7),
+						x.Recs[1],
+					});
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/DiscardPointTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/DiscardPointTests.cs
new file mode 100644
index 00000000000..13cb0c639fa
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/DiscardPointTests.cs
@@ -0,0 +1,86 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class DiscardPointTests {
+	[Fact]
+	public void can_keep_all() {
+		var sut = DiscardPoint.KeepAll;
+
+		Assert.False(sut.ShouldDiscard(0));
+		Assert.False(sut.ShouldDiscard(1));
+		Assert.False(sut.ShouldDiscard(long.MaxValue));
+	}
+
+	[Fact]
+	public void can_discard_before() {
+		var sut = DiscardPoint.DiscardBefore(500);
+
+		Assert.True(sut.ShouldDiscard(0));
+		Assert.True(sut.ShouldDiscard(499));
+		Assert.False(sut.ShouldDiscard(500));
+	}
+
+	[Fact]
+	public void can_discard_including() {
+		var sut = DiscardPoint.DiscardIncluding(500);
+
+		Assert.True(sut.ShouldDiscard(0));
+		Assert.True(sut.ShouldDiscard(500));
+		Assert.False(sut.ShouldDiscard(501));
+	}
+
+	[Fact]
+	public void can_discard_any_of() {
+		var sut = DiscardPoint.DiscardBefore(50)
+			.Or(DiscardPoint.DiscardBefore(500));
+
+		Assert.True(sut.ShouldDiscard(0));
+		Assert.True(sut.ShouldDiscard(499));
+		Assert.False(sut.ShouldDiscard(500));
+	}
+
+	[Fact]
+	public void equals() {
+		Assert.Equal(DiscardPoint.DiscardBefore(3), DiscardPoint.DiscardBefore(3));
+		Assert.Equal(DiscardPoint.DiscardBefore(3), DiscardPoint.DiscardIncluding(2));
+		Assert.NotEqual(DiscardPoint.DiscardBefore(3), DiscardPoint.DiscardBefore(4));
+	}
+
+	[Fact]
+	public void equals_operator() {
+		Assert.True(DiscardPoint.DiscardBefore(3) == DiscardPoint.DiscardBefore(3));
+		Assert.True(DiscardPoint.DiscardBefore(3) == DiscardPoint.DiscardIncluding(2));
+		Assert.False(DiscardPoint.DiscardBefore(3) == DiscardPoint.DiscardBefore(4));
+	}
+
+	[Fact]
+	public void not_equals_operator() {
+		Assert.False(DiscardPoint.DiscardBefore(3) != DiscardPoint.DiscardBefore(3));
+		Assert.False(DiscardPoint.DiscardBefore(3) != DiscardPoint.DiscardIncluding(2));
+		Assert.True(DiscardPoint.DiscardBefore(3) != DiscardPoint.DiscardBefore(4));
+	}
+
+	[Fact]
+	public void less_than_operator() {
+		Assert.False(DiscardPoint.DiscardBefore(3) < DiscardPoint.DiscardBefore(3));
+		Assert.False(DiscardPoint.DiscardBefore(3) < DiscardPoint.DiscardBefore(2));
+		Assert.True(DiscardPoint.DiscardBefore(3) < DiscardPoint.DiscardBefore(4));
+	}
+
+	[Fact]
+	public void greater_than_operator() {
+		Assert.False(DiscardPoint.DiscardBefore(3) > DiscardPoint.DiscardBefore(3));
+		Assert.True(DiscardPoint.DiscardBefore(3) > DiscardPoint.DiscardBefore(2));
+		Assert.False(DiscardPoint.DiscardBefore(3) > DiscardPoint.DiscardBefore(4));
+	}
+
+	[Fact]
+	public void get_hash_code() {
+		Assert.Equal(3.GetHashCode(), DiscardPoint.DiscardBefore(3).GetHashCode());
+	}
+}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/EmptyScavengedChunksTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/EmptyScavengedChunksTests.cs
similarity index 94%
rename from src/EventStore.Core.XUnit.Tests/Scavenge/EmptyScavengedChunksTests.cs
rename to src/KurrentDB.Core.XUnit.Tests/Scavenge/EmptyScavengedChunksTests.cs
index 92f8d08081d..ed8f6d1c3cf 100644
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/EmptyScavengedChunksTests.cs
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/EmptyScavengedChunksTests.cs
@@ -1,14 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Threading.Tasks;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.TransactionLog.Scavenging.Helpers;
-using EventStore.Core.TransactionLog.Scavenging;
-using EventStore.Core.XUnit.Tests.Scavenge.Sqlite;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
 using Xunit;
-using static EventStore.Core.XUnit.Tests.Scavenge.StreamMetadatas;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
 
-namespace EventStore.Core.XUnit.Tests.Scavenge;
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
 
 // the old scavenger can leave behind empty, scavenged chunks when
 // all events from a chunk are deleted. if the scavenger is interrupted
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/IndexExecutorTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/IndexExecutorTests.cs
new file mode 100644
index 00000000000..2edd843eb14
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/IndexExecutorTests.cs
@@ -0,0 +1,74 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+// these systemtically exercise the cases in the IndexExecutor
+// we still do so by testing high level scavenge cases because we are well geared up
+// for that and testing the IndexExeecutor directly would involve more mocks than it is worth.
+public class IndexExecutorTests : SqliteDbPerTest<IndexExecutorTests> {
+	[Fact]
+	public async Task nothing_to_scavenge() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(0, 1, 2),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task simple_scavenge() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount2))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(1, 2, 3),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task with_collision() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "cb-2"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount2))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(1, 2, 3, 4),
+				x.Recs[1],
+			});
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocIndexReaderInterceptor.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocIndexReaderInterceptor.cs
new file mode 100644
index 00000000000..f55b9c54865
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocIndexReaderInterceptor.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class AdHocIndexReaderInterceptor<TStreamId> : IIndexReaderForCalculator<TStreamId> {
+	private readonly IIndexReaderForCalculator<TStreamId> _wrapped;
+	private readonly Func<
+		Func<StreamHandle<TStreamId>, long, int, ScavengePoint, CancellationToken, ValueTask<IndexReadEventInfoResult>>,
+		StreamHandle<TStreamId>, long, int, ScavengePoint, CancellationToken, ValueTask<IndexReadEventInfoResult>> _f;
+
+
+	public AdHocIndexReaderInterceptor(
+		IIndexReaderForCalculator<TStreamId> wrapped,
+		Func<
+			Func<StreamHandle<TStreamId>, long, int, ScavengePoint, CancellationToken, ValueTask<IndexReadEventInfoResult>>,
+			StreamHandle<TStreamId>, long, int, ScavengePoint, CancellationToken, ValueTask<IndexReadEventInfoResult>> f) {
+
+		_wrapped = wrapped;
+		_f = f;
+	}
+
+	public ValueTask<long> GetLastEventNumber(
+		StreamHandle<TStreamId> streamHandle,
+		ScavengePoint scavengePoint,
+		CancellationToken token) {
+
+		return _wrapped.GetLastEventNumber(streamHandle, scavengePoint, token);
+	}
+
+	public ValueTask<IndexReadEventInfoResult> ReadEventInfoForward(
+		StreamHandle<TStreamId> stream,
+		long fromEventNumber,
+		int maxCount,
+		ScavengePoint scavengePoint,
+		CancellationToken token) {
+
+		return _f(_wrapped.ReadEventInfoForward, stream, fromEventNumber, maxCount, scavengePoint, token);
+	}
+
+	public ValueTask<bool> IsTombstone(long logPosition, CancellationToken token) {
+		return _wrapped.IsTombstone(logPosition, token);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocIndexScavengerInterceptor.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocIndexScavengerInterceptor.cs
new file mode 100644
index 00000000000..751639d9c5a
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocIndexScavengerInterceptor.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class AdHocIndexScavengerInterceptor : IIndexScavenger {
+	private readonly IIndexScavenger _wrapped;
+	private readonly Func<Func<IndexEntry, CancellationToken, ValueTask<bool>>, Func<IndexEntry, CancellationToken, ValueTask<bool>>> _f;
+
+	public AdHocIndexScavengerInterceptor(
+		IIndexScavenger wrapped,
+		Func<Func<IndexEntry, CancellationToken, ValueTask<bool>>, Func<IndexEntry, CancellationToken, ValueTask<bool>>> f) {
+
+		_wrapped = wrapped;
+		_f = f;
+	}
+
+	public ValueTask ScavengeIndex(
+		long scavengePoint,
+		Func<IndexEntry, CancellationToken, ValueTask<bool>> shouldKeep,
+		IIndexScavengerLog log,
+		CancellationToken cancellationToken) {
+
+		return _wrapped.ScavengeIndex(scavengePoint, _f(shouldKeep), log, cancellationToken);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocMetastreamLookupInterceptor.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocMetastreamLookupInterceptor.cs
new file mode 100644
index 00000000000..4afc92e7a30
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocMetastreamLookupInterceptor.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.LogAbstraction;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class AdHocMetastreamLookupInterceptor<TStreamId> : IMetastreamLookup<TStreamId> {
+	private readonly IMetastreamLookup<TStreamId> _wrapped;
+	private readonly Func<Func<TStreamId, bool>, TStreamId, bool> _f;
+
+	public AdHocMetastreamLookupInterceptor(
+		IMetastreamLookup<TStreamId> wrapped,
+		Func<Func<TStreamId, bool>, TStreamId, bool> f) {
+
+		_wrapped = wrapped;
+		_f = f;
+	}
+
+	public bool IsMetaStream(TStreamId streamId) =>
+		_f(_wrapped.IsMetaStream, streamId);
+
+	public TStreamId MetaStreamOf(TStreamId streamId) =>
+		_wrapped.MetaStreamOf(streamId);
+
+	public TStreamId OriginalStreamOf(TStreamId streamId) =>
+		_wrapped.OriginalStreamOf(streamId);
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocScavengeBackendInterceptor.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocScavengeBackendInterceptor.cs
new file mode 100644
index 00000000000..97b6f0d653c
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocScavengeBackendInterceptor.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class AdHocScavengeBackendInterceptor<TStreamId> : IScavengeStateBackend<TStreamId> {
+	private readonly IScavengeStateBackend<TStreamId> _wrapped;
+	public AdHocScavengeBackendInterceptor(IScavengeStateBackend<TStreamId> wrapped) {
+		_wrapped = wrapped;
+		CollisionStorage = wrapped.CollisionStorage;
+		Hashes = wrapped.Hashes;
+		MetaStorage = wrapped.MetaStorage;
+		MetaCollisionStorage = wrapped.MetaCollisionStorage;
+		OriginalStorage = wrapped.OriginalStorage;
+		OriginalCollisionStorage = wrapped.OriginalCollisionStorage;
+		CheckpointStorage = wrapped.CheckpointStorage;
+		ChunkTimeStampRanges = wrapped.ChunkTimeStampRanges;
+		ChunkWeights = wrapped.ChunkWeights;
+		TransactionManager = wrapped.TransactionManager;
+	}
+
+	public void Dispose() => _wrapped.Dispose();
+	public void LogStats() => _wrapped.LogStats();
+	public IScavengeMap<TStreamId, Unit> CollisionStorage { get; set; }
+	public IScavengeMap<ulong, TStreamId> Hashes { get; set; }
+	public IMetastreamScavengeMap<ulong> MetaStorage { get; set; }
+	public IMetastreamScavengeMap<TStreamId> MetaCollisionStorage { get; set; }
+	public IOriginalStreamScavengeMap<ulong> OriginalStorage { get; set; }
+	public IOriginalStreamScavengeMap<TStreamId> OriginalCollisionStorage { get; set; }
+	public IScavengeMap<Unit, ScavengeCheckpoint> CheckpointStorage { get; set; }
+	public IScavengeMap<int, ChunkTimeStampRange> ChunkTimeStampRanges { get; set; }
+	public IChunkWeightScavengeMap ChunkWeights { get; set; }
+	public ITransactionManager TransactionManager { get; set; }
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocTransactionManager.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocTransactionManager.cs
new file mode 100644
index 00000000000..c19c24e2120
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/AdHocTransactionManager.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class AdHocTransactionManager : ITransactionManager {
+	private readonly ITransactionManager _wrapped;
+	private readonly Action<Action<ScavengeCheckpoint>, ScavengeCheckpoint> _f;
+
+	public AdHocTransactionManager(
+		ITransactionManager wrapped,
+		Action<Action<ScavengeCheckpoint>, ScavengeCheckpoint> f) {
+
+		_wrapped = wrapped;
+		_f = f;
+	}
+
+	public void RegisterOnRollback(Action onRollback) {
+		_wrapped.RegisterOnRollback(onRollback);
+	}
+
+	public void UnregisterOnRollback() {
+		_wrapped.UnregisterOnRollback();
+	}
+
+	public void Begin() {
+		_wrapped.Begin();
+	}
+
+	public void Commit(ScavengeCheckpoint checkpoint) {
+		_f(_wrapped.Commit, checkpoint);
+	}
+
+	public void Rollback() {
+		_wrapped.Rollback();
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/ArchiveReaderEmptyChunks.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/ArchiveReaderEmptyChunks.cs
new file mode 100644
index 00000000000..edd98cac338
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/ArchiveReaderEmptyChunks.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext;
+using DotNext.Buffers;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Core.Services.Archive.Storage;
+using KurrentDB.Core.TransactionLog.Chunks;
+using static KurrentDB.Core.TransactionLog.Chunks.TFChunk.TFChunk;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+// A virtual archive that stores only headers and footers.
+// We can imagine that all the records have been scavenged away.
+// This is used by the scavenge tests, which are not concerned with the contents of the chunks in the
+// archive because the scavenge is not responsible for populating the archive.
+class ArchiveReaderEmptyChunks(long chunkSize, long chunksInArchive) : IArchiveStorageReader {
+	const int FileSize = TFConsts.ChunkHeaderSize + TFConsts.ChunkFooterSize;
+
+	public ValueTask<long> GetCheckpoint(CancellationToken ct) => new(chunkSize * chunksInArchive);
+
+	public ValueTask<ArchivedChunkMetadata> GetMetadataAsync(int logicalChunkNumber, CancellationToken token) =>
+		ValueTask.FromResult<ArchivedChunkMetadata>(new(PhysicalSize: FileSize));
+
+	public ValueTask<int> ReadAsync(int logicalChunkNumber, Memory<byte> buffer, long offset, CancellationToken ct) {
+		if (ct.IsCancellationRequested)
+			return ValueTask.FromCanceled<int>(ct);
+		try {
+			return ValueTask.FromResult(Read(logicalChunkNumber, buffer, offset));
+		} catch (Exception ex) {
+			return ValueTask.FromException<int>(ex);
+		}
+	}
+
+	private int Read(int logicalChunkNumber, Memory<byte> buffer, long offset) {
+		if (logicalChunkNumber >= chunksInArchive)
+			throw new InvalidOperationException();
+
+		var header = new ChunkHeader(
+			version: (byte)ChunkVersions.Transformed,
+			minCompatibleVersion: (byte)ChunkVersions.Transformed,
+			chunkSize: 1,
+			chunkStartNumber: logicalChunkNumber,
+			chunkEndNumber: logicalChunkNumber,
+			isScavenged: true,
+			chunkId: Guid.NewGuid(),
+			transformType: TransformType.Identity);
+
+		var footer = new ChunkFooter(
+			isCompleted: true,
+			isMap12Bytes: true,
+			physicalDataSize: 0,
+			logicalDataSize: chunkSize,
+			mapSize: 0);
+
+		using var wholeChunkFile = Memory.AllocateExactly<byte>(FileSize);
+		SpanWriter<byte> writer = new(wholeChunkFile.Span);
+		writer.Write(header);
+		writer.Write(footer);
+
+		wholeChunkFile.Span[(int)offset..].CopyTo(buffer.Span, out var writtenCount);
+		return writtenCount;
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/MockScavengePointSource.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/MockScavengePointSource.cs
new file mode 100644
index 00000000000..c8d00151c72
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/MockScavengePointSource.cs
@@ -0,0 +1,92 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+// The real ScavengePointSource is a bit awkward to use in the tests because it uses the IODispatcher
+// Also even if we plumbed in the necessary components to the test to get that to work, it would
+// still have to write the scavengepoint to the chunks and also to the index in order to behave in
+// reasonable way.
+public class MockScavengePointSource : IScavengePointSource {
+	private readonly ILogRecord[][] _log;
+	private readonly DateTime _effectiveNow;
+	private readonly List<ScavengePoint> _added;
+
+	public MockScavengePointSource(
+		DbResult dbResult,
+		DateTime effectiveNow,
+		List<ScavengePoint> added) {
+
+		_log = dbResult.Recs;
+		_effectiveNow = effectiveNow;
+		_added = added;
+	}
+
+	public Task<ScavengePoint> GetLatestScavengePointOrDefaultAsync(
+		CancellationToken cancellationToken) {
+
+		ScavengePoint scavengePoint = default;
+
+		foreach (var record in AllRecords()) {
+			if (record is PrepareLogRecord prepare &&
+				prepare.EventType == SystemEventTypes.ScavengePoint) {
+
+				var payload = ScavengePointPayload.FromBytes(prepare.Data);
+
+				scavengePoint = new ScavengePoint(
+					position: record.LogPosition,
+					eventNumber: prepare.ExpectedVersion + 1,
+					effectiveNow: prepare.TimeStamp,
+					threshold: payload.Threshold);
+			}
+		}
+
+		return Task.FromResult(scavengePoint);
+	}
+
+	public async Task<ScavengePoint> AddScavengePointAsync(
+		long expectedVersion,
+		int threshold,
+		CancellationToken cancellationToken) {
+
+		var latestScavengePoint = await GetLatestScavengePointOrDefaultAsync(cancellationToken);
+		var actualVersion = latestScavengePoint != null
+			? latestScavengePoint.EventNumber
+			: -1;
+
+		if (actualVersion != expectedVersion) {
+			throw new InvalidOperationException(
+				$"wrong version number {expectedVersion} vs {actualVersion}");
+		}
+
+		// this is only used in a specific way, when CancelOnNewScavengePoint is called.
+		// the scavenge point isn't used for a scavenge, we just assert that the scavenge
+		// created it properly
+		var scavengePoint = new ScavengePoint(
+			position: -1,
+			eventNumber: expectedVersion + 1,
+			effectiveNow: _effectiveNow,
+			threshold: threshold);
+
+		_added.Add(scavengePoint);
+		throw new OperationCanceledException();
+	}
+
+	private IEnumerable<ILogRecord> AllRecords() {
+		for (var chunkIndex = 0; chunkIndex < _log.Length; chunkIndex++) {
+			for (var recordIndex = 0; recordIndex < _log[chunkIndex].Length; recordIndex++) {
+				yield return _log[chunkIndex][recordIndex];
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/ScavengeStateBuilder.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/ScavengeStateBuilder.cs
new file mode 100644
index 00000000000..d3dc50042f1
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/ScavengeStateBuilder.cs
@@ -0,0 +1,129 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Threading;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Scavenging;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+using Microsoft.Data.Sqlite;
+using Serilog;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class ScavengeStateBuilder<TStreamId> {
+	private readonly ILongHasher<TStreamId> _hasher;
+	private readonly IMetastreamLookup<TStreamId> _metastreamLookup;
+
+	private Tracer _tracer;
+	private ObjectPool<SqliteConnection> _connectionPool;
+	private Type _cancelWhenCheckpointingType;
+	private CancellationTokenSource _cancellationTokenSource;
+	private Action<ScavengeState<TStreamId>> _mutateState;
+
+	public ScavengeStateBuilder(
+		ILongHasher<TStreamId> hasher,
+		IMetastreamLookup<TStreamId> metastreamLookup) {
+
+		_hasher = hasher;
+		_metastreamLookup = metastreamLookup;
+		_mutateState = x => { };
+	}
+
+	public ScavengeStateBuilder<TStreamId> TransformBuilder(
+		Func<ScavengeStateBuilder<TStreamId>, ScavengeStateBuilder<TStreamId>> f) =>
+		f(this);
+
+	public ScavengeStateBuilder<TStreamId> CancelWhenCheckpointing(Type type, CancellationTokenSource cts) {
+		_cancelWhenCheckpointingType = type;
+		_cancellationTokenSource = cts;
+		return this;
+	}
+
+	public ScavengeStateBuilder<TStreamId> MutateState(Action<ScavengeState<TStreamId>> f) {
+		var wrapped = _mutateState;
+		_mutateState = state => {
+			wrapped(state);
+			f(state);
+		};
+		return this;
+	}
+
+	public ScavengeStateBuilder<TStreamId> WithTracer(Tracer tracer) {
+		_tracer = tracer;
+		return this;
+	}
+
+	public ScavengeStateBuilder<TStreamId> WithConnectionPool(ObjectPool<SqliteConnection> connectionPool) {
+		_connectionPool = connectionPool;
+		return this;
+	}
+
+	public ScavengeState<TStreamId> Build() {
+		var state = BuildInternal();
+		state.Init();
+		_mutateState(state);
+		return state;
+	}
+
+	private ScavengeState<TStreamId> BuildInternal() {
+		if (_connectionPool == null)
+			throw new Exception("call WithConnectionPool(...)");
+
+		var map = new ConcurrentDictionary<IScavengeStateBackend<TStreamId>, SqliteConnection>();
+		var backendPool = new ObjectPool<IScavengeStateBackend<TStreamId>>(
+			objectPoolName: "scavenge backend pool",
+			initialCount: 1,
+			maxCount: TFChunkScavenger.MaxThreadCount + 1,
+			factory: () => {
+				var connection = _connectionPool.Get();
+				var sqlite = new SqliteScavengeBackend<TStreamId>(Log.Logger);
+				sqlite.Initialize(connection);
+
+				var backend = new AdHocScavengeBackendInterceptor<TStreamId>(sqlite);
+
+				var transactionFactory = sqlite.TransactionFactory;
+
+				if (_tracer != null)
+					transactionFactory = new TracingTransactionFactory<SqliteTransaction>(transactionFactory, _tracer);
+
+				ITransactionManager transactionManager = new TransactionManager<SqliteTransaction>(
+					transactionFactory,
+					backend.CheckpointStorage);
+
+				transactionManager = new AdHocTransactionManager(
+					transactionManager,
+					(continuation, checkpoint) => {
+						if (checkpoint.GetType() == _cancelWhenCheckpointingType) {
+							_cancellationTokenSource.Cancel();
+						}
+						continuation(checkpoint);
+					});
+
+				if (_tracer != null) {
+					backend.TransactionManager = new TracingTransactionManager(transactionManager, _tracer);
+					backend.OriginalStorage =
+						new TracingOriginalStreamScavengeMap<ulong>(backend.OriginalStorage, _tracer);
+					backend.OriginalCollisionStorage =
+						new TracingOriginalStreamScavengeMap<TStreamId>(backend.OriginalCollisionStorage, _tracer);
+				}
+				map[backend] = connection;
+				return backend;
+			},
+			dispose: backend => _connectionPool.Return(map[backend]));
+
+		var scavengeState = new ScavengeState<TStreamId>(
+			Log.Logger,
+			_hasher,
+			_metastreamLookup,
+			backendPool,
+			100_000);
+
+		return scavengeState;
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/Scenario.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/Scenario.cs
new file mode 100644
index 00000000000..89aafd1b7e4
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/Scenario.cs
@@ -0,0 +1,824 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.Archive.Storage;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Settings;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Index.Hashers;
+using KurrentDB.Core.Tests.TransactionLog;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.TransactionLog.Scavenging;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.DbAccess;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using KurrentDB.Core.TransactionLog.Scavenging.Stages;
+using KurrentDB.Core.Transforms;
+using KurrentDB.Core.Util;
+using Serilog;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+using ScavengeResult = KurrentDB.Core.TransactionLog.Chunks.ScavengeResult;
+using Type = System.Type;
+
+#pragma warning disable CS0162 // Unreachable code detected
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class Scenario {
+	public const bool CollideEverything = false;
+}
+
+// sort of similar to ScavengeTestScenario
+public class Scenario<TLogFormat, TStreamId> : Scenario {
+	private static EqualityComparer<TStreamId> StreamIdComparer { get; } =
+		EqualityComparer<TStreamId>.Default;
+
+	private Func<TFChunkDbConfig, LogFormatAbstractor<TStreamId>, IChunkFileSystem, ValueTask<DbResult>> _getDb;
+	private Func<ScavengeStateBuilder<TStreamId>, ScavengeStateBuilder<TStreamId>> _stateTransform;
+	private Action<ScavengeState<TStreamId>> _assertState;
+	private List<ScavengePoint> _newScavengePoint;
+	private ITFChunkScavengerLog _logger;
+
+	private int _threads = 1;
+	private bool _isArchiver;
+	private bool _skipIndexCheck;
+	private bool _mergeChunks;
+	private bool _syncOnly;
+	private string _dbPath;
+	private IArchiveStorageReader _archiveReader = NoArchiveReader.Instance;
+	private int _retainDays = TimeSpan.MaxValue.Days;
+	private long _retainBytes = long.MaxValue;
+	private TStreamId _accumulatingCancellationTrigger;
+	private TStreamId _calculatingCancellationTrigger;
+	private TStreamId _executingChunkCancellationTrigger;
+	private TStreamId _executingIndexEntryCancellationTrigger;
+	private Type _cancelWhenCheckpointingType;
+	private (string Message, int Line)[] _expectedTrace;
+	private bool _unsafeIgnoreHardDeletes;
+	private readonly HashSet<int> _chunkNumsToEmpty = new();
+
+	protected Tracer Tracer { get; set; }
+
+	public Scenario() {
+		_getDb = (_, _, _) => throw new Exception("db not configured. call WithDb");
+		_stateTransform = x => x;
+		Tracer = new Tracer();
+	}
+
+	public Scenario<TLogFormat, TStreamId> WithTracerFrom(Scenario<TLogFormat, TStreamId> scenario) {
+		Tracer = scenario.Tracer;
+		return this;
+	}
+
+	public Scenario<TLogFormat, TStreamId> WithUnsafeIgnoreHardDeletes(
+		bool unsafeIgnoreHardDeletes = true) {
+
+		_unsafeIgnoreHardDeletes = unsafeIgnoreHardDeletes;
+		return this;
+	}
+
+	public Scenario<TLogFormat, TStreamId> WithArchive(
+		long chunksInArchive,
+		long? retainBytes = null,
+		int? retainDays = null) {
+
+		_archiveReader = new ArchiveReaderEmptyChunks(chunkSize: ChunkSize, chunksInArchive);
+		_retainBytes = retainBytes ?? 0;
+		_retainDays = retainDays ?? 0;
+		return this;
+	}
+
+	public Scenario<TLogFormat, TStreamId> WithThreads(int threads) {
+		_threads = threads;
+		return this;
+	}
+
+	public Scenario<TLogFormat, TStreamId> IsArchiver(bool isArchiver = true) {
+		_isArchiver = isArchiver;
+		return this;
+	}
+
+	public Scenario<TLogFormat, TStreamId> SkipIndexCheck() {
+		_skipIndexCheck = true;
+		return this;
+	}
+
+	public Scenario<TLogFormat, TStreamId> WithDbPath(string path) {
+		_dbPath = path;
+		return this;
+	}
+
+	public Scenario<TLogFormat, TStreamId> WithDb(DbResult db) {
+		_getDb = (_, _, _) => new(db);
+		return this;
+	}
+
+	public Scenario<TLogFormat, TStreamId> WithDb(
+		Func<
+			TFChunkDbCreationHelper<TLogFormat, TStreamId>,
+			TFChunkDbCreationHelper<TLogFormat, TStreamId>> f) {
+
+		_getDb = async (dbConfig, logFormat, fileSystem) => {
+			var dbCreationHelper = await TFChunkDbCreationHelper<TLogFormat, TStreamId>.CreateAsync(
+				dbConfig, logFormat, fileSystem, CancellationToken.None);
+			dbCreationHelper = f(dbCreationHelper);
+			var db = await dbCreationHelper.CreateDb();
+			return db;
+		};
+		return this;
+	}
+
+	public Scenario<TLogFormat, TStreamId> WithLogger(ITFChunkScavengerLog logger) {
+		_logger = logger;
+		return this;
+	}
+
+	public Scenario<TLogFormat, TStreamId> WithState(
+		Func<ScavengeStateBuilder<TStreamId>, ScavengeStateBuilder<TStreamId>> f) {
+
+		var wrapped = _stateTransform;
+		_stateTransform = builder => builder
+			.TransformBuilder(wrapped)
+			.TransformBuilder(f);
+		return this;
+	}
+
+	public Scenario<TLogFormat, TStreamId> AssertState(Action<ScavengeState<TStreamId>> f) {
+		_assertState = f;
+		return this;
+	}
+
+	public Scenario<TLogFormat, TStreamId> MutateState(Action<ScavengeState<TStreamId>> f) {
+		var wrapped = _stateTransform;
+		_stateTransform = builder => builder
+			.TransformBuilder(wrapped)
+			.MutateState(f);
+		return this;
+	}
+
+	public Scenario<TLogFormat, TStreamId> WithMergeChunks(bool mergeChunks = true) {
+		_mergeChunks = mergeChunks;
+		return this;
+	}
+
+	public Scenario<TLogFormat, TStreamId> WithSyncOnly(bool syncOnly = true) {
+		_syncOnly = syncOnly;
+		return this;
+	}
+
+	public Scenario<TLogFormat, TStreamId> CancelOnNewScavengePoint(
+		List<ScavengePoint> newScavengePoint) {
+
+		_newScavengePoint = newScavengePoint;
+		return this;
+	}
+
+	public Scenario<TLogFormat, TStreamId> CancelWhenAccumulatingMetaRecordFor(TStreamId trigger) {
+		_accumulatingCancellationTrigger = trigger;
+		return this;
+	}
+
+	// note for this to work the trigger stream needs metadata so it will be calculated
+	// and it needs to have at least one record
+	public Scenario<TLogFormat, TStreamId> CancelWhenCalculatingOriginalStream(TStreamId trigger) {
+		_calculatingCancellationTrigger = trigger;
+		return this;
+	}
+
+	public Scenario<TLogFormat, TStreamId> CancelWhenExecutingChunk(TStreamId trigger) {
+		_executingChunkCancellationTrigger = trigger;
+		return this;
+	}
+
+	public Scenario<TLogFormat, TStreamId> CancelWhenExecutingIndexEntry(TStreamId trigger) {
+		_executingIndexEntryCancellationTrigger = trigger;
+		return this;
+	}
+
+	public Scenario<TLogFormat, TStreamId> CancelWhenCheckpointing<TCheckpoint>() {
+		_cancelWhenCheckpointingType = typeof(TCheckpoint);
+		return this;
+	}
+
+	// Assert methods can be used to input checks that are internal to the scavenge
+	// This is not black box testing, handle with care.
+	public delegate Scenario<TLogFormat, TStreamId> TraceDelegate(params string[] expected);
+
+	public Scenario<TLogFormat, TStreamId> AssertTrace(params (string, int)[] expected) {
+		_expectedTrace = expected;
+		return this;
+	}
+
+	public Scenario<TLogFormat, TStreamId> EmptyChunk(int chunkNumber) {
+		_chunkNumsToEmpty.Add(chunkNumber);
+		return this;
+	}
+
+	// if getExpectedKeptIndexEntries is null then it is the same as getExpectedKeptRecords
+	public async Task RunAsync(
+		Func<DbResult, ILogRecord[][]> getExpectedKeptRecords = null,
+		Func<DbResult, ILogRecord[][]> getExpectedKeptIndexEntries = null) {
+
+		await using var x = await RunInternalAsync(
+			getExpectedKeptRecords,
+			getExpectedKeptIndexEntries);
+	}
+
+	// caller disposes DbResult
+	public async Task<DbResult> RunAndKeepDbAsync(
+		Func<DbResult, ILogRecord[][]> getExpectedKeptRecords = null,
+		Func<DbResult, ILogRecord[][]> getExpectedKeptIndexEntries = null) {
+
+		return await RunInternalAsync(
+			getExpectedKeptRecords,
+			getExpectedKeptIndexEntries);
+	}
+
+	private async Task<DbResult> RunInternalAsync(
+		Func<DbResult, ILogRecord[][]> getExpectedKeptRecords,
+		Func<DbResult, ILogRecord[][]> getExpectedKeptIndexEntries) {
+
+		if (string.IsNullOrEmpty(_dbPath))
+			throw new Exception("call WithDbPath");
+
+		var indexPath = Path.Combine(_dbPath, "index");
+		var logFormat = LogFormatHelper<TLogFormat, TStreamId>.LogFormatFactory.Create(new() {
+			IndexDirectory = indexPath,
+		});
+
+		var dbConfig = TFChunkHelper.CreateSizedDbConfig(_dbPath, 0, chunkSize: 1024 * 1024);
+		var dbTransformManager = DbTransformManager.Default;
+
+		var locatorCodec = new PrefixingLocatorCodec();
+		var fileSystem = new FileSystemWithArchive(
+			chunkSize: dbConfig.ChunkSize,
+			locatorCodec: locatorCodec,
+			localFileSystem: new ChunkLocalFileSystem(dbConfig.Path),
+			archive: _archiveReader);
+
+		var dbResult = await _getDb(dbConfig, logFormat, fileSystem);
+		var keptRecords = getExpectedKeptRecords != null
+			? getExpectedKeptRecords(dbResult)
+			: null;
+
+		var keptIndexEntries = getExpectedKeptIndexEntries != null
+			? getExpectedKeptIndexEntries(dbResult)
+			: keptRecords;
+
+		dbResult.Db.Config.WriterCheckpoint.Flush();
+		dbResult.Db.Config.ChaserCheckpoint.Write(dbResult.Db.Config.WriterCheckpoint.Read());
+		dbResult.Db.Config.ChaserCheckpoint.Flush();
+		dbResult.Db.Config.ReplicationCheckpoint.Write(dbResult.Db.Config.WriterCheckpoint.Read());
+		dbResult.Db.Config.ReplicationCheckpoint.Flush();
+
+		var readerPool = new ObjectPool<ITransactionFileReader>(
+			objectPoolName: "ReadIndex readers pool",
+			initialCount: ESConsts.PTableInitialReaderCount,
+			maxCount: ESConsts.PTableInitialReaderCount,
+			factory: () => new TFChunkReader(dbResult.Db, dbResult.Db.Config.WriterCheckpoint));
+
+		var lowHasher = logFormat.LowHasher;
+		var highHasher = logFormat.HighHasher;
+
+		var humanHashers = true;
+		if (CollideEverything) {
+			if (LogFormatHelper<TLogFormat, TStreamId>.IsV3)
+				throw new Exception("Cant cause collisions in V3");
+			lowHasher = new ConstantHasher(0) as IHasher<TStreamId>;
+			highHasher = new ConstantHasher(0) as IHasher<TStreamId>;
+		} else if (humanHashers) {
+			if (LogFormatHelper<TLogFormat, TStreamId>.IsV3)
+				throw new Exception("Cant cause collisions in V3");
+			lowHasher = new ConstantHasher(0) as IHasher<TStreamId>;
+			highHasher = new HumanReadableHasher32() as IHasher<TStreamId>;
+		}
+
+		var hasher = new CompositeHasher<TStreamId>(lowHasher, highHasher);
+
+		var tableIndex = new TableIndex<TStreamId>(
+			directory: indexPath,
+			lowHasher: lowHasher,
+			highHasher: highHasher,
+			emptyStreamId: logFormat.EmptyStreamId,
+			memTableFactory: () => new HashListMemTable(PTableVersions.IndexV4, maxSize: 200),
+			tfReaderFactory: () => new TFReaderLease(readerPool),
+			ptableVersion: PTableVersions.IndexV4,
+			maxAutoMergeIndexLevel: int.MaxValue,
+			pTableMaxReaderCount: ESConsts.PTableInitialReaderCount,
+			maxSizeForMemory: _skipIndexCheck
+				? 1_000_000 // we aren't going to check the index so no need to convert to ptables
+				: 1, // convert everything to ptables immediately so we can check the index
+			maxTablesPerLevel: 2,
+			inMem: false);
+		logFormat.StreamNamesProvider.SetTableIndex(tableIndex);
+
+		var readIndex = new ReadIndex<TStreamId>(
+			bus: new NoopPublisher(),
+			readerPool: readerPool,
+			tableIndex: tableIndex,
+			logFormat.StreamNameIndexConfirmer,
+			logFormat.StreamIds,
+			logFormat.StreamNamesProvider,
+			logFormat.EmptyStreamId,
+			logFormat.StreamIdValidator,
+			logFormat.StreamIdSizer,
+			logFormat.StreamExistenceFilter,
+			logFormat.StreamExistenceFilterReader,
+			logFormat.EventTypeIndexConfirmer,
+			new LRUCache<TStreamId, IndexBackend<TStreamId>.EventNumberCached>("LastEventNumber", 100),
+			new LRUCache<TStreamId, IndexBackend<TStreamId>.MetadataCached>("StreamMetadata", 100),
+			additionalCommitChecks: true,
+			metastreamMaxCount: 1,
+			hashCollisionReadLimit: Opts.HashCollisionReadLimitDefault,
+			skipIndexScanOnReads: Opts.SkipIndexScanOnReadsDefault,
+			replicationCheckpoint: dbResult.Db.Config.ReplicationCheckpoint,
+			indexCheckpoint: dbResult.Db.Config.IndexCheckpoint,
+			indexStatusTracker: new IndexStatusTracker.NoOp(),
+			indexTracker: new IndexTracker.NoOp(),
+			cacheTracker: new CacheHitsMissesTracker.NoOp());
+
+		await readIndex.IndexCommitter.Init(dbResult.Db.Config.WriterCheckpoint.Read(), CancellationToken.None);
+		// wait for tables to be merged. for one of the tests this takes a while
+		for (int i = 0; i < 10; i++) {
+			try {
+				tableIndex.WaitForBackgroundTasks();
+				break;
+			} catch {
+			}
+		}
+
+		await EmptyRequestedChunks(dbResult.Db, CancellationToken.None);
+
+		Scavenger<TStreamId> sut = null;
+		try {
+			var cancellationTokenSource = new CancellationTokenSource();
+			var metastreamLookup = logFormat.Metastreams;
+
+			var scavengeState = new ScavengeStateBuilder<TStreamId>(hasher, metastreamLookup)
+				.TransformBuilder(_stateTransform)
+				.CancelWhenCheckpointing(_cancelWhenCheckpointingType, cancellationTokenSource)
+				.WithTracer(Tracer)
+				.Build();
+
+			IChunkReaderForAccumulator<TStreamId> chunkReader = new ChunkReaderForAccumulator<TStreamId>(
+				dbResult.Db.Manager,
+				metastreamLookup,
+				logFormat.StreamIdConverter,
+				dbResult.Db.Config.ReplicationCheckpoint,
+				dbConfig.ChunkSize);
+
+			var indexReader = new IndexReaderForAccumulator<TStreamId>(readIndex);
+
+			var accumulatorMetastreamLookup = new AdHocMetastreamLookupInterceptor<TStreamId>(
+				metastreamLookup,
+				(continuation, streamId) => {
+					if (StreamIdComparer.Equals(streamId, _accumulatingCancellationTrigger))
+						cancellationTokenSource.Cancel();
+					return continuation(streamId);
+				});
+
+			var calculatorIndexReader = new AdHocIndexReaderInterceptor<TStreamId>(
+				new IndexReaderForCalculator<TStreamId>(
+					readIndex,
+					() => new TFReaderLease(readerPool),
+					scavengeState.LookupUniqueHashUser),
+				(f, handle, from, maxCount, x, token) => {
+					if (_calculatingCancellationTrigger != null)
+						if ((handle.Kind == StreamHandle.Kind.Hash && handle.StreamHash == hasher.Hash(_calculatingCancellationTrigger)) ||
+							(handle.Kind == StreamHandle.Kind.Id && StreamIdComparer.Equals(handle.StreamId, _calculatingCancellationTrigger))) {
+
+							cancellationTokenSource.Cancel();
+						}
+
+					return f(handle, from, maxCount, x, token);
+				});
+
+			var chunkExecutorMetastreamLookup = new AdHocMetastreamLookupInterceptor<TStreamId>(
+				metastreamLookup,
+				(continuation, streamId) => {
+					if (StreamIdComparer.Equals(streamId, _executingChunkCancellationTrigger))
+						cancellationTokenSource.Cancel();
+					return continuation(streamId);
+				});
+
+			var indexScavenger = new IndexScavenger(tableIndex);
+			var cancellationWrappedIndexScavenger = new AdHocIndexScavengerInterceptor(
+				indexScavenger,
+				f => (entry, token) => {
+					if (token.IsCancellationRequested)
+						return ValueTask.FromCanceled<bool>(token);
+
+					if (_executingIndexEntryCancellationTrigger is not null &&
+						entry.Stream == hasher.Hash(_executingIndexEntryCancellationTrigger)) {
+
+						cancellationTokenSource.Cancel();
+					}
+					return f(entry, token);
+				});
+
+			var cancellationCheckPeriod = 1;
+			var checkpointPeriod = 2;
+			var restPeriod = 5;
+
+			// add tracing
+			chunkReader = new TracingChunkReaderForAccumulator<TStreamId>(chunkReader, Tracer.Trace);
+
+			var logger = Log.Logger;
+
+			var throttle = new Throttle(
+				logger,
+				TimeSpan.FromMilliseconds(1000),
+				TimeSpan.FromMilliseconds(1000),
+				activePercent: 100);
+
+			IAccumulator<TStreamId> accumulator = new Accumulator<TStreamId>(
+				logger: logger,
+				chunkSize: dbConfig.ChunkSize,
+				metastreamLookup: accumulatorMetastreamLookup,
+				chunkReader: chunkReader,
+				index: indexReader,
+				cancellationCheckPeriod: cancellationCheckPeriod,
+				throttle: throttle);
+
+			ICalculator<TStreamId> calculator = new Calculator<TStreamId>(
+				logger: logger,
+				index: calculatorIndexReader,
+				chunkSize: dbConfig.ChunkSize,
+				cancellationCheckPeriod: cancellationCheckPeriod,
+				buffer: new(checkpointPeriod),
+				throttle: throttle);
+
+			IChunkExecutor<TStreamId> chunkExecutor = new ChunkExecutor<TStreamId, ILogRecord>(
+				logger: logger,
+				metastreamLookup: chunkExecutorMetastreamLookup,
+				chunkRemover: new TracingChunkRemover<TStreamId, ILogRecord>(
+					new ChunkRemover<TStreamId, ILogRecord>(
+						logger: logger,
+						archiveCheckpoint: new AdvancingCheckpoint(_archiveReader.GetCheckpoint),
+						chunkManager: new ChunkManagerForChunkRemover(dbResult.Db.Manager),
+						locatorCodec: locatorCodec,
+						retainPeriod: TimeSpan.FromDays(_retainDays),
+						retainBytes: _retainBytes),
+					Tracer),
+				chunkManager: new TracingChunkManagerForChunkExecutor<TStreamId, ILogRecord>(
+					new ChunkManagerForExecutor<TStreamId>(
+						logger,
+						dbResult.Db.Manager,
+						dbConfig,
+						dbTransformManager),
+					dbResult.RemoteChunks,
+					Tracer),
+				chunkSize: dbConfig.ChunkSize,
+				unsafeIgnoreHardDeletes: _unsafeIgnoreHardDeletes,
+				cancellationCheckPeriod: cancellationCheckPeriod,
+				threads: _threads,
+				isArchiver: _isArchiver,
+				throttle: throttle);
+
+			IChunkMerger chunkMerger = new ChunkMerger(
+				logger: logger,
+				mergeChunks: _mergeChunks,
+				new OldScavengeChunkMergerBackend(logger, dbResult.Db),
+				throttle: throttle);
+
+			IIndexExecutor<TStreamId> indexExecutor = new IndexExecutor<TStreamId>(
+				logger: logger,
+				indexScavenger: cancellationWrappedIndexScavenger,
+				streamLookup: new ChunkReaderForIndexExecutor<TStreamId>(() => new TFReaderLease(readerPool)),
+				unsafeIgnoreHardDeletes: _unsafeIgnoreHardDeletes,
+				restPeriod: restPeriod,
+				throttle: throttle);
+
+			ICleaner cleaner = new Cleaner(logger, unsafeIgnoreHardDeletes: _unsafeIgnoreHardDeletes);
+
+			accumulator = new TracingAccumulator<TStreamId>(accumulator, Tracer);
+			calculator = new TracingCalculator<TStreamId>(calculator, Tracer);
+			chunkExecutor = new TracingChunkExecutor<TStreamId>(chunkExecutor, Tracer);
+			chunkMerger = new TracingChunkMerger(chunkMerger, Tracer);
+			indexExecutor = new TracingIndexExecutor<TStreamId>(indexExecutor, Tracer);
+			cleaner = new TracingCleaner(cleaner, Tracer);
+
+			// if test provided its own logger it can check its own status
+			var expectSuccess = _logger == null;
+			var successLogger = expectSuccess ? new FakeTFScavengerLog() : null;
+
+			sut = new Scavenger<TStreamId>(
+				logger: logger,
+				checkPreconditions: () => { },
+				scavengeState,
+				accumulator,
+				calculator,
+				chunkExecutor,
+				chunkMerger,
+				indexExecutor,
+				cleaner,
+				new MockScavengePointSource(
+					dbResult,
+					EffectiveNow,
+					_newScavengePoint ?? new List<ScavengePoint>()),
+				_logger ?? successLogger,
+				statusTracker: new ScavengeStatusTracker.NoOp(),
+				thresholdForNewScavenge: 0,
+				syncOnly: _syncOnly,
+				throttle.PrettyPrint);
+
+			Tracer.Reset();
+			await sut.ScavengeAsync(cancellationTokenSource.Token);
+
+			// check if successful
+			if (_logger == null) {
+				Assert.True(successLogger.Completed);
+				Assert.True(
+					successLogger.Result == ScavengeResult.Success,
+					$"Status: {successLogger.Result}. Error: {successLogger.Error}");
+			}
+
+			// check the trace. only when _threads == 1, otherwise the order isn't guaranteed.
+			// only when not colliding everything, because the collisions will change the trace
+			if (_expectedTrace != null && _threads == 1 && !CollideEverything) {
+				var expected = _expectedTrace;
+				var actual = Tracer.ToArray();
+				for (var i = 0; i < Math.Max(expected.Length, actual.Length); i++) {
+
+					if (expected[i] == Tracer.AnythingElse) {
+						// actual can be anything it likes from this point on
+						break;
+					}
+
+					var line = expected[i].Line;
+					Assert.True(
+						i < expected.Length,
+						i < actual.Length
+							? $"Actual trace contains extra entries starting with: {actual[i]}"
+							: "impossible");
+
+					Assert.True(
+						i < actual.Length,
+						$"Expected trace contains extra entries starting from line {line}: {expected[i].Message}");
+
+					Assert.True(
+						expected[i].Message == actual[i],
+						$"Trace mismatch at line {line}. \r\n" +
+						$" Expected: {expected[i].Message} \r\n" +
+						$" Actual:   {actual[i]}");
+				}
+			}
+
+			// See a list of the stream collisions
+			//   - naively calculate list of collisions
+			var hashesInUse = new Dictionary<ulong, TStreamId>();
+			var collidingStreams = new HashSet<TStreamId>();
+
+			void RegisterUse(TStreamId streamId) {
+				var hash = hasher.Hash(streamId);
+				if (hashesInUse.TryGetValue(hash, out var user)) {
+					if (StreamIdComparer.Equals(user, streamId)) {
+						// in use by us. not a collision.
+					} else {
+						// collision. register both as collisions.
+						collidingStreams.Add(streamId);
+						collidingStreams.Add(user);
+					}
+				} else {
+					// hash was not in use. so it isn't a collision.
+					hashesInUse[hash] = streamId;
+				}
+			}
+
+			foreach (var chunk in dbResult.Recs) {
+				foreach (var record in chunk) {
+					if (record is not IPrepareLogRecord<TStreamId> prepare)
+						continue;
+
+					RegisterUse(prepare.EventStreamId);
+
+					if (prepare.Flags.HasAnyOf(PrepareFlags.StreamDelete)) {
+						RegisterUse(metastreamLookup.MetaStreamOf(prepare.EventStreamId));
+					}
+
+					if (metastreamLookup.IsMetaStream(prepare.EventStreamId)) {
+						RegisterUse(metastreamLookup.OriginalStreamOf(prepare.EventStreamId));
+					}
+				}
+			}
+
+			if (CollideEverything) {
+				// collidingStreams is all collisions in the log, not just up to the scavenge point
+				// so can contains extra collisions, which becomes apparent when everything collides.
+			} else {
+				//   - Assert list of collisions.
+				Assert.Equal(collidingStreams.OrderBy(x => x), scavengeState.AllCollisions().OrderBy(x => x));
+			}
+
+			// The records we expected to keep are kept
+			// The index entries we expected to be kept are kept
+			if (keptRecords != null) {
+				await CheckRecords(keptRecords, dbResult, cancellationTokenSource.Token);
+				if (!_skipIndexCheck)
+					await CheckIndex(keptIndexEntries, readIndex, collidingStreams, hasher, cancellationTokenSource.Token);
+			}
+
+			_assertState?.Invoke(scavengeState);
+
+			return dbResult;
+
+		} finally {
+			sut?.Dispose();
+			readIndex.Close();
+		}
+	}
+
+	// nicked from scavengetestscenario
+	private static async ValueTask CheckRecords(ILogRecord[][] expected, DbResult actual, CancellationToken token = default) {
+		Assert.True(
+			expected.Length == actual.Db.Manager.ChunksCount,
+			"Wrong number of chunks. " +
+			$"Expected {expected.Length}. Actual {actual.Db.Manager.ChunksCount}");
+
+		for (int i = 0; i < expected.Length; ++i) {
+			var chunk = await actual.Db.Manager.GetInitializedChunk(i, token);
+
+			var chunkRecords = new List<ILogRecord>();
+			var result = await chunk.TryReadFirst(token);
+			while (result.Success) {
+				chunkRecords.Add(result.LogRecord);
+				result = await chunk.TryReadClosestForward((int)result.NextPosition, token);
+			}
+
+			Assert.True(
+				expected[i].Length == chunkRecords.Count,
+				$"Wrong number of records in chunk #{i}. " +
+				$"Expected {expected[i].Length}. Actual {chunkRecords.Count}");
+
+			for (int j = 0; j < expected[i].Length; ++j) {
+				Assert.True(
+					expected[i][j].Equals(chunkRecords[j]),
+					$"Wrong log record #{j} read from chunk #{i}. " +
+					$"Expected {expected[i][j]}.\r\n" +
+					$"Actual   {chunkRecords[j]}");
+			}
+		}
+	}
+
+	// we want to check that the index contains everything it is supposed to
+	// and we want to check that the index doesn't contain anything extra.
+	private static async ValueTask CheckIndex(
+		ILogRecord[][] expected,
+		IReadIndex<TStreamId> actual,
+		HashSet<TStreamId> collisions,
+		ILongHasher<TStreamId> hasher,
+		CancellationToken token) {
+
+		if (expected == null) {
+			// test didn't ask us to check the index
+			return;
+		}
+
+		// check we have everything we are supposed to
+		// cant use normal stream reads because they will apply metadata etc.
+		var minEventNumbers = new Dictionary<TStreamId, long>();
+		var maxEventNumbers = new Dictionary<TStreamId, long>();
+
+		foreach (var chunk in expected) {
+			foreach (var record in chunk) {
+				if (record is not IPrepareLogRecord<TStreamId> prepare)
+					throw new Exception("expected to find commit record in index but this is impossible");
+
+				var streamId = prepare.EventStreamId;
+				var eventNumber = prepare.ExpectedVersion + 1;
+
+				// indexcommitter blesses tombstones with EventNumber.DeletedStream when they are
+				// committed with an explicit commit record
+				if (prepare.Flags.HasAnyOf(PrepareFlags.StreamDelete) &&
+					prepare.Flags.HasNoneOf(PrepareFlags.IsCommitted))
+					eventNumber = EventNumber.DeletedStream;
+
+				if (!minEventNumbers.TryGetValue(streamId, out var min))
+					min = eventNumber;
+				minEventNumbers[streamId] = Math.Min(eventNumber, min);
+
+				if (!maxEventNumbers.TryGetValue(streamId, out var max))
+					max = eventNumber;
+				maxEventNumbers[streamId] = Math.Max(eventNumber, max);
+
+				var result = await (collisions.Contains(streamId)
+					? actual.ReadEventInfoForward_KnownCollisions(
+						streamId: streamId,
+						fromEventNumber: eventNumber,
+						maxCount: 1,
+						beforePosition: long.MaxValue,
+						token)
+					: actual.ReadEventInfoForward_NoCollisions(
+						stream: hasher.Hash(streamId),
+						fromEventNumber: eventNumber,
+						maxCount: 1,
+					beforePosition: long.MaxValue,
+						token));
+
+				if (result.EventInfos.Length != 1) {
+					// remember this applies metadata, so is of limited use
+					var wholeStream = await actual.ReadStreamEventsForward($"{streamId}", streamId, fromEventNumber: 0, maxCount: 100, token);
+					Assert.True(result.EventInfos.Length == 1, $"Couldn't find {streamId}:{eventNumber} in index.");
+				}
+
+
+				var info = result.EventInfos[0];
+				Assert.Equal(prepare.LogPosition, info.LogPosition);
+				Assert.Equal(eventNumber, info.EventNumber);
+			}
+		}
+
+		// check we don't have anything extra
+		// (we can't easily check that there aren't unexpected streams in the index, but risk of this
+		// is low)
+		// nothing before the min, or after the max that we found in the log.
+		foreach (var kvp in minEventNumbers) {
+			var streamId = kvp.Key;
+			var min = kvp.Value;
+			var max = maxEventNumbers[streamId];
+
+			var result = await (collisions.Contains(streamId)
+				? actual.ReadEventInfoForward_KnownCollisions(
+					streamId: streamId,
+					fromEventNumber: 0,
+					maxCount: 1000,
+					beforePosition: long.MaxValue,
+					token)
+				: actual.ReadEventInfoForward_NoCollisions(
+					stream: hasher.Hash(streamId),
+					fromEventNumber: 0,
+					maxCount: 1000,
+					beforePosition: long.MaxValue,
+					token));
+
+			if (result.EventInfos.Length > 10_000)
+				throw new Exception("wasn't expecting a stream this long in the tests");
+
+			Assert.All(result.EventInfos, info => {
+				Assert.True(info.EventNumber >= min);
+				Assert.True(info.EventNumber <= max);
+			});
+		}
+	}
+
+	private async ValueTask EmptyRequestedChunks(TFChunkDb db, CancellationToken token) {
+		foreach (var chunkNum in _chunkNumsToEmpty) {
+			var chunk = await db.Manager.GetInitializedChunk(chunkNum, token);
+			var header = chunk.ChunkHeader;
+
+			var newChunkHeader = new ChunkHeader(
+				version: header.Version,
+				minCompatibleVersion: header.MinCompatibleVersion,
+				chunkSize: header.ChunkSize,
+				chunkStartNumber: header.ChunkStartNumber,
+				chunkEndNumber: header.ChunkEndNumber,
+				isScavenged: true,
+				chunkId: Guid.NewGuid(),
+				transformType: header.TransformType);
+
+			var transformFactory = db.TransformManager.GetFactoryForExistingChunk(header.TransformType);
+
+			var transformHeader = transformFactory.TransformHeaderLength > 0
+				? new byte[transformFactory.TransformHeaderLength]
+				: [];
+
+			transformFactory.CreateTransformHeader(transformHeader);
+			var newChunk = await TFChunk.CreateWithHeader(
+				db.Manager.FileSystem,
+				filename: $"{chunk.LocalFileName}.tmp",
+				header: newChunkHeader,
+				fileSize: ChunkHeader.Size,
+				inMem: false,
+				unbuffered: false,
+				writethrough: false,
+				reduceFileCachePressure: false,
+				tracker: new TFChunkTracker.NoOp(),
+				transformFactory: transformFactory,
+				getTransformFactory: db.TransformManager,
+				transformHeader: transformHeader,
+				token);
+
+			await newChunk.CompleteScavenge(null, token);
+
+			await db.Manager.SwitchInTempChunk(newChunk, false, false, token);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/StreamMetadatas.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/StreamMetadatas.cs
new file mode 100644
index 00000000000..d8162bae9b2
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/StreamMetadatas.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class StreamMetadatas {
+	public static StreamMetadata TruncateBefore1 { get; } = new StreamMetadata(truncateBefore: 1);
+	public static StreamMetadata TruncateBefore2 { get; } = new StreamMetadata(truncateBefore: 2);
+	public static StreamMetadata TruncateBefore3 { get; } = new StreamMetadata(truncateBefore: 3);
+	public static StreamMetadata TruncateBefore4 { get; } = new StreamMetadata(truncateBefore: 4);
+
+	public static StreamMetadata MaxCount1 { get; } = new StreamMetadata(maxCount: 1);
+	public static StreamMetadata MaxCount2 { get; } = new StreamMetadata(maxCount: 2);
+	public static StreamMetadata MaxCount3 { get; } = new StreamMetadata(maxCount: 3);
+	public static StreamMetadata MaxCount4 { get; } = new StreamMetadata(maxCount: 4);
+	public static StreamMetadata MaxCount50 { get; } = new StreamMetadata(maxCount: 50);
+
+	public static TimeSpan MaxAgeTimeSpan { get; } = TimeSpan.FromDays(2);
+	public static StreamMetadata MaxAgeMetadata { get; } =
+		new StreamMetadata(maxAge: MaxAgeTimeSpan);
+
+	public static StreamMetadata SoftDelete { get; } =
+		new StreamMetadata(truncateBefore: EventNumber.DeletedStream);
+
+	public static DateTime EffectiveNow { get; } = new DateTime(2022, 1, 5, 00, 00, 00);
+	public static DateTime Expired { get; } = EffectiveNow - TimeSpan.FromDays(3);
+	public static DateTime Cutoff { get; } = EffectiveNow - MaxAgeTimeSpan;
+	public static DateTime Active { get; } = EffectiveNow - TimeSpan.FromDays(1);
+
+	public static Rec ScavengePointRec(int transaction, int threshold = 0, DateTime? timeStamp = null) => Rec.Write(
+		transaction: transaction,
+		stream: SystemStreams.ScavengePointsStream,
+		eventType: SystemEventTypes.ScavengePoint,
+		timestamp: timeStamp ?? EffectiveNow,
+		data: new ScavengePointPayload {
+			Threshold = threshold,
+		}.ToJsonBytes());
+
+	public static ScavengePoint ScavengePoint(int chunk, long eventNumber) => new ScavengePoint(
+		position: PositionOfChunk(chunk),
+		eventNumber: eventNumber,
+		effectiveNow: EffectiveNow,
+		threshold: 0);
+
+	public const long ChunkSize = 1024 * 1024;
+	public static long PositionOfChunk(int logicalChunkNumber) => ChunkSize * logicalChunkNumber;
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/Tracer.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/Tracer.cs
new file mode 100644
index 00000000000..f4f95318262
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/Tracer.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class Tracer {
+	private readonly List<string> _traces = new List<string>();
+	private int _depth;
+
+	public Tracer() {
+	}
+
+	public string[] ToArray() => _traces.ToArray();
+
+	public void Reset() {
+		_traces.Clear();
+	}
+
+	public void Trace(string x) {
+		_traces.Add(new string(' ', _depth * 4) + x);
+	}
+
+	public void TraceIn(string x) {
+		Trace(x);
+		_depth++;
+	}
+
+	public void TraceOut(string x) {
+		_depth--;
+		Trace(x);
+	}
+
+	public static (string, int) Line(string x, [CallerLineNumber] int sourceLineNumber = 0) =>
+		(x, sourceLineNumber);
+
+	// :S
+	public static (string, int) AnythingElse { get; } = ("ANYTHING_ELSE", 0);
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingAccumulator.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingAccumulator.cs
new file mode 100644
index 00000000000..b99ef191c25
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingAccumulator.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class TracingAccumulator<TStreamId> : IAccumulator<TStreamId> {
+	private readonly IAccumulator<TStreamId> _wrapped;
+	private readonly Tracer _tracer;
+
+	public TracingAccumulator(IAccumulator<TStreamId> wrapped, Tracer tracer) {
+		_wrapped = wrapped;
+		_tracer = tracer;
+	}
+
+	public async ValueTask Accumulate(
+		ScavengePoint prevScavengePoint,
+		ScavengePoint scavengePoint,
+		IScavengeStateForAccumulator<TStreamId> state,
+		CancellationToken cancellationToken) {
+
+		_tracer.TraceIn($"Accumulating from {prevScavengePoint?.GetName() ?? "start"} to {scavengePoint.GetName()}");
+		try {
+			await _wrapped.Accumulate(prevScavengePoint, scavengePoint, state, cancellationToken);
+			_tracer.TraceOut("Done");
+		} catch {
+			_tracer.TraceOut("Exception accumulating");
+			throw;
+		}
+	}
+
+	public async ValueTask Accumulate(
+		ScavengeCheckpoint.Accumulating checkpoint,
+		IScavengeStateForAccumulator<TStreamId> state,
+		CancellationToken cancellationToken) {
+
+		_tracer.TraceIn($"Accumulating from checkpoint: {checkpoint}");
+		try {
+			await _wrapped.Accumulate(checkpoint, state, cancellationToken);
+			_tracer.TraceOut("Done");
+		} catch {
+			_tracer.TraceOut("Exception accumulating");
+			throw;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingCalculator.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingCalculator.cs
new file mode 100644
index 00000000000..6e2253bb9ec
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingCalculator.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class TracingCalculator<TStreamId> : ICalculator<TStreamId> {
+	private readonly ICalculator<TStreamId> _wrapped;
+	private readonly Tracer _tracer;
+
+	public TracingCalculator(ICalculator<TStreamId> wrapped, Tracer tracer) {
+		_wrapped = wrapped;
+		_tracer = tracer;
+	}
+
+	public async ValueTask Calculate(
+		ScavengePoint scavengePoint,
+		IScavengeStateForCalculator<TStreamId> source,
+		CancellationToken cancellationToken) {
+
+		_tracer.TraceIn($"Calculating {scavengePoint.GetName()}");
+		try {
+			await _wrapped.Calculate(scavengePoint, source, cancellationToken);
+			_tracer.TraceOut("Done");
+		} catch {
+			_tracer.TraceOut("Exception calculating");
+			throw;
+		}
+	}
+
+	public async ValueTask Calculate(ScavengeCheckpoint.Calculating<TStreamId> checkpoint,
+		IScavengeStateForCalculator<TStreamId> source,
+		CancellationToken cancellationToken) {
+
+		_tracer.TraceIn($"Calculating from checkpoint: {checkpoint}");
+		try {
+			await _wrapped.Calculate(checkpoint, source, cancellationToken);
+			_tracer.TraceOut("Done");
+		} catch {
+			_tracer.TraceOut("Exception calculating");
+			throw;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkExecutor.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkExecutor.cs
new file mode 100644
index 00000000000..898f2b50271
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkExecutor.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class TracingChunkExecutor<TStreamId> : IChunkExecutor<TStreamId> {
+	private readonly IChunkExecutor<TStreamId> _wrapped;
+	private readonly Tracer _tracer;
+
+	public TracingChunkExecutor(IChunkExecutor<TStreamId> wrapped, Tracer tracer) {
+		_wrapped = wrapped;
+		_tracer = tracer;
+	}
+
+	public async ValueTask Execute(
+		ScavengePoint scavengePoint,
+		IScavengeStateForChunkExecutor<TStreamId> state,
+		ITFChunkScavengerLog scavengerLogger,
+		CancellationToken cancellationToken) {
+
+		_tracer.TraceIn($"Executing chunks for {scavengePoint.GetName()}");
+		try {
+			await _wrapped.Execute(scavengePoint, state, scavengerLogger, cancellationToken);
+			_tracer.TraceOut("Done");
+		} catch {
+			_tracer.TraceOut("Exception executing chunks");
+			throw;
+		}
+	}
+
+	public async ValueTask Execute(
+		ScavengeCheckpoint.ExecutingChunks checkpoint,
+		IScavengeStateForChunkExecutor<TStreamId> state,
+		ITFChunkScavengerLog scavengerLogger,
+		CancellationToken cancellationToken) {
+
+		_tracer.TraceIn($"Executing chunks from checkpoint: {checkpoint}");
+		try {
+			await _wrapped.Execute(checkpoint, state, scavengerLogger, cancellationToken);
+			_tracer.TraceOut("Done");
+		} catch {
+			_tracer.TraceOut("Exception executing chunks");
+			throw;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkManagerForChunkExecutor.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkManagerForChunkExecutor.cs
new file mode 100644
index 00000000000..fa84c88861f
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkManagerForChunkExecutor.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class TracingChunkManagerForChunkExecutor<TStreamId, TRecord> :
+	IChunkManagerForChunkExecutor<TStreamId, TRecord> {
+
+	private readonly IChunkManagerForChunkExecutor<TStreamId, TRecord> _wrapped;
+	private readonly HashSet<int> _remoteChunks;
+	private readonly Tracer _tracer;
+
+	public TracingChunkManagerForChunkExecutor(
+		IChunkManagerForChunkExecutor<TStreamId, TRecord> wrapped,
+		HashSet<int> remoteChunks,
+		Tracer tracer) {
+
+		_wrapped = wrapped;
+		_remoteChunks = remoteChunks;
+		_tracer = tracer;
+	}
+
+	public IChunkFileSystem FileSystem => _wrapped.FileSystem;
+
+	public async ValueTask<IChunkWriterForExecutor<TStreamId, TRecord>> CreateChunkWriter(
+		IChunkReaderForExecutor<TStreamId, TRecord> sourceChunk,
+		CancellationToken token) {
+
+		return new TracingChunkWriterForExecutor<TStreamId, TRecord>(
+			await _wrapped.CreateChunkWriter(sourceChunk, token),
+			_tracer);
+	}
+
+	public async ValueTask<IChunkReaderForExecutor<TStreamId, TRecord>> GetChunkReaderFor(long position, CancellationToken token) {
+		var reader = await _wrapped.GetChunkReaderFor(position, token);
+		var isRemote = _remoteChunks.Contains(reader.ChunkStartNumber);
+		return new TrackingChunkReaderForExecutor<TStreamId, TRecord>(reader, isRemote, _tracer);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkMerger.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkMerger.cs
new file mode 100644
index 00000000000..7d8e6508a8f
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkMerger.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class TracingChunkMerger : IChunkMerger {
+	private readonly IChunkMerger _wrapped;
+	private readonly Tracer _tracer;
+
+	public TracingChunkMerger(IChunkMerger wrapped, Tracer tracer) {
+		_wrapped = wrapped;
+		_tracer = tracer;
+	}
+
+	public async ValueTask MergeChunks(
+		ScavengePoint scavengePoint,
+		IScavengeStateForChunkMerger state,
+		ITFChunkScavengerLog scavengerLogger,
+		CancellationToken cancellationToken) {
+
+		_tracer.TraceIn($"Merging chunks for {scavengePoint.GetName()}");
+		try {
+			await _wrapped.MergeChunks(scavengePoint, state, scavengerLogger, cancellationToken);
+			_tracer.TraceOut("Done");
+		} catch {
+			_tracer.TraceOut("Exception merging chunks");
+			throw;
+		}
+	}
+
+	public async ValueTask MergeChunks(
+		ScavengeCheckpoint.MergingChunks checkpoint,
+		IScavengeStateForChunkMerger state,
+		ITFChunkScavengerLog scavengerLogger,
+		CancellationToken cancellationToken) {
+
+		_tracer.TraceIn($"Merging chunks from checkpoint: {checkpoint}");
+		try {
+			await _wrapped.MergeChunks(checkpoint, state, scavengerLogger, cancellationToken);
+			_tracer.TraceOut("Done");
+		} catch {
+			_tracer.TraceOut("Exception merging chunks");
+			throw;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkReaderForAccumulator.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkReaderForAccumulator.cs
new file mode 100644
index 00000000000..4a34ada047e
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkReaderForAccumulator.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using KurrentDB.Core.TransactionLog.Scavenging;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class TracingChunkReaderForAccumulator<TStreamId> : IChunkReaderForAccumulator<TStreamId> {
+	private readonly IChunkReaderForAccumulator<TStreamId> _wrapped;
+	private readonly Action<string> _trace;
+
+	public TracingChunkReaderForAccumulator(
+		IChunkReaderForAccumulator<TStreamId> wrapped,
+		Action<string> trace) {
+
+		_wrapped = wrapped;
+		_trace = trace;
+	}
+
+	public IAsyncEnumerable<AccumulatorRecordType> ReadChunkInto(
+		int logicalChunkNumber,
+		RecordForAccumulator<TStreamId>.OriginalStreamRecord originalStreamRecord,
+		RecordForAccumulator<TStreamId>.MetadataStreamRecord metadataStreamRecord,
+		RecordForAccumulator<TStreamId>.TombStoneRecord tombStoneRecord,
+		CancellationToken token) {
+
+		var ret = _wrapped.ReadChunkInto(
+			logicalChunkNumber,
+			originalStreamRecord,
+			metadataStreamRecord,
+			tombStoneRecord,
+			token);
+
+		_trace($"Reading Chunk {logicalChunkNumber}");
+		return ret;
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkRemover.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkRemover.cs
new file mode 100644
index 00000000000..6ca95ce0c87
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkRemover.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class TracingChunkRemover<TStreamId, TRecord> :
+	IChunkRemover<TStreamId, TRecord> {
+
+	private readonly IChunkRemover<TStreamId, TRecord> _wrapped;
+	private readonly Tracer _tracer;
+
+	public TracingChunkRemover(IChunkRemover<TStreamId, TRecord> wrapped, Tracer tracer) {
+		_wrapped = wrapped;
+		_tracer = tracer;
+	}
+
+	public async ValueTask<bool> StartRemovingIfNotRetained(
+		ScavengePoint scavengePoint,
+		IScavengeStateForChunkExecutorWorker<TStreamId> concurrentState,
+		IChunkReaderForExecutor<TStreamId, TRecord> physicalChunk,
+		CancellationToken ct) {
+
+		var removing = await _wrapped.StartRemovingIfNotRetained(scavengePoint, concurrentState, physicalChunk, ct);
+		var decision = removing ? "Removing" : "Retaining";
+		_tracer.Trace($"{decision} Chunk {physicalChunk.ChunkStartNumber}-{physicalChunk.ChunkEndNumber}");
+		return removing;
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkWriterForExecutor.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkWriterForExecutor.cs
new file mode 100644
index 00000000000..b9aa2efa37c
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingChunkWriterForExecutor.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class TracingChunkWriterForExecutor<TStreamId, TRecord> :
+	IChunkWriterForExecutor<TStreamId, TRecord> {
+
+	private readonly IChunkWriterForExecutor<TStreamId, TRecord> _wrapped;
+	private readonly Tracer _tracer;
+
+	public TracingChunkWriterForExecutor(
+		IChunkWriterForExecutor<TStreamId, TRecord> wrapped,
+		Tracer tracer) {
+
+		_wrapped = wrapped;
+		_tracer = tracer;
+	}
+
+	public string LocalFileName => _wrapped.LocalFileName;
+
+	public ValueTask WriteRecord(RecordForExecutor<TStreamId, TRecord> record, CancellationToken token)
+		=> _wrapped.WriteRecord(record, token);
+
+	public async ValueTask<(string, long)> Complete(CancellationToken token) {
+		var result = await _wrapped.Complete(token);
+		_tracer.Trace($"Switched in {Path.GetFileName(result.NewFileName)}");
+
+		return result;
+	}
+
+	public void Abort(bool deleteImmediately) {
+		_wrapped.Abort(deleteImmediately);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingCleaner.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingCleaner.cs
new file mode 100644
index 00000000000..f6d66cd76ee
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingCleaner.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class TracingCleaner : ICleaner {
+	private readonly ICleaner _wrapped;
+	private readonly Tracer _tracer;
+
+	public TracingCleaner(ICleaner wrapped, Tracer tracer) {
+		_wrapped = wrapped;
+		_tracer = tracer;
+	}
+
+	public void Clean(
+		ScavengePoint scavengePoint,
+		IScavengeStateForCleaner state,
+		CancellationToken cancellationToken) {
+
+		_tracer.TraceIn($"Cleaning for {scavengePoint.GetName()}");
+		try {
+			_wrapped.Clean(scavengePoint, state, cancellationToken);
+			_tracer.TraceOut("Done");
+		} catch {
+			_tracer.TraceOut("Exception cleaning");
+			throw;
+		}
+	}
+
+	public void Clean(
+		ScavengeCheckpoint.Cleaning checkpoint,
+		IScavengeStateForCleaner state,
+		CancellationToken cancellationToken) {
+
+		_tracer.TraceIn($"Cleaning from checkpoint {checkpoint}");
+		try {
+			_wrapped.Clean(checkpoint, state, cancellationToken);
+			_tracer.TraceOut("Done");
+		} catch {
+			_tracer.TraceOut("Exception cleaning");
+			throw;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingIndexExecutor.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingIndexExecutor.cs
new file mode 100644
index 00000000000..1b9aa752e28
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingIndexExecutor.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class TracingIndexExecutor<TStreamId> : IIndexExecutor<TStreamId> {
+	private readonly IIndexExecutor<TStreamId> _wrapped;
+	private readonly Tracer _tracer;
+
+	public TracingIndexExecutor(IIndexExecutor<TStreamId> wrapped, Tracer tracer) {
+		_wrapped = wrapped;
+		_tracer = tracer;
+	}
+
+	public async ValueTask Execute(
+		ScavengePoint scavengePoint,
+		IScavengeStateForIndexExecutor<TStreamId> state,
+		IIndexScavengerLog scavengerLogger,
+		CancellationToken cancellationToken) {
+
+		_tracer.TraceIn($"Executing index for {scavengePoint.GetName()}");
+		try {
+			await _wrapped.Execute(scavengePoint, state, scavengerLogger, cancellationToken);
+			_tracer.TraceOut("Done");
+		} catch {
+			_tracer.TraceOut("Exception executing index");
+			throw;
+		}
+	}
+
+	public async ValueTask Execute(
+		ScavengeCheckpoint.ExecutingIndex checkpoint,
+		IScavengeStateForIndexExecutor<TStreamId> state,
+		IIndexScavengerLog scavengerLogger,
+		CancellationToken cancellationToken) {
+
+		_tracer.TraceIn($"Executing index from checkpoint: {checkpoint}");
+		try {
+			await _wrapped.Execute(checkpoint, state, scavengerLogger, cancellationToken);
+			_tracer.TraceOut("Done");
+		} catch {
+			_tracer.TraceOut("Exception executing index");
+			throw;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingOriginalStreamScavengeMap.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingOriginalStreamScavengeMap.cs
new file mode 100644
index 00000000000..bce22c339f8
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingOriginalStreamScavengeMap.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class TracingOriginalStreamScavengeMap<TKey> : IOriginalStreamScavengeMap<TKey> {
+	private readonly IOriginalStreamScavengeMap<TKey> _wrapped;
+	private readonly Tracer _tracer;
+
+	public TracingOriginalStreamScavengeMap(
+		IOriginalStreamScavengeMap<TKey> wrapped,
+		Tracer tracer) {
+
+		_wrapped = wrapped;
+		_tracer = tracer;
+	}
+
+	public OriginalStreamData this[TKey key] { set => _wrapped[key] = value; }
+
+	public void DeleteMany(bool deleteArchived) {
+		_wrapped.DeleteMany(deleteArchived);
+	}
+
+	public IEnumerable<KeyValuePair<TKey, OriginalStreamData>> AllRecords() =>
+		_wrapped.AllRecords();
+
+	public IEnumerable<KeyValuePair<TKey, OriginalStreamData>> ActiveRecords() =>
+		_wrapped.ActiveRecords();
+
+	public IEnumerable<KeyValuePair<TKey, OriginalStreamData>> ActiveRecordsFromCheckpoint(TKey checkpoint) =>
+		_wrapped.ActiveRecordsFromCheckpoint(checkpoint);
+
+	public void SetDiscardPoints(
+		TKey key,
+		CalculationStatus status,
+		DiscardPoint discardPoint,
+		DiscardPoint maybeDiscardPoint) {
+
+		_tracer.Trace($"SetDiscardPoints({key}, {status}, {discardPoint}, {maybeDiscardPoint})");
+		_wrapped.SetDiscardPoints(key, status, discardPoint, maybeDiscardPoint);
+	}
+
+	public void SetMetadata(TKey key, StreamMetadata metadata) {
+		_wrapped.SetMetadata(key, metadata);
+	}
+
+	public void SetTombstone(TKey key) {
+		_wrapped.SetTombstone(key);
+	}
+
+	public bool TryGetChunkExecutionInfo(TKey key, out ChunkExecutionInfo details) {
+		return _wrapped.TryGetChunkExecutionInfo(key, out details);
+	}
+
+	public bool TryGetValue(TKey key, out OriginalStreamData value) {
+		return _wrapped.TryGetValue(key, out value);
+	}
+
+	public bool TryRemove(TKey key, out OriginalStreamData value) {
+		return _wrapped.TryRemove(key, out value);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingTransactionFactory.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingTransactionFactory.cs
new file mode 100644
index 00000000000..fbcb45dd0f3
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingTransactionFactory.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class TracingTransactionFactory<TTransaction> : ITransactionFactory<TTransaction> {
+	private readonly ITransactionFactory<TTransaction> _wrapped;
+	private readonly Tracer _tracer;
+
+	public TracingTransactionFactory(ITransactionFactory<TTransaction> wrapped, Tracer tracer) {
+		_wrapped = wrapped;
+		_tracer = tracer;
+	}
+
+	public TTransaction Begin() {
+		_tracer.TraceIn("Begin");
+		return _wrapped.Begin();
+	}
+
+	public void Commit(TTransaction transaction) {
+		_wrapped.Commit(transaction);
+		_tracer.TraceOut("Commit");
+	}
+
+	public void Rollback(TTransaction transaction) {
+		_wrapped.Rollback(transaction);
+		_tracer.TraceOut("Rollback");
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingTransactionManager.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingTransactionManager.cs
new file mode 100644
index 00000000000..90f40ac8284
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TracingTransactionManager.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class TracingTransactionManager : ITransactionManager {
+	private readonly ITransactionManager _wrapped;
+	private readonly Tracer _tracer;
+
+	public TracingTransactionManager(ITransactionManager wrapped, Tracer tracer) {
+		_wrapped = wrapped;
+		_tracer = tracer;
+	}
+
+	public void RegisterOnRollback(Action onRollback) {
+		_wrapped.RegisterOnRollback(onRollback);
+	}
+
+	public void UnregisterOnRollback() {
+		_wrapped.UnregisterOnRollback();
+	}
+
+	public void Begin() {
+		_wrapped.Begin();
+	}
+
+	public void Commit(ScavengeCheckpoint checkpoint) {
+		_tracer.Trace($"Checkpoint: {checkpoint}");
+		_wrapped.Commit(checkpoint);
+	}
+
+	public void Rollback() {
+		_wrapped.Rollback();
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TrackingChunkReaderForExecutor.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TrackingChunkReaderForExecutor.cs
new file mode 100644
index 00000000000..a96b95e3995
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Infrastructure/TrackingChunkReaderForExecutor.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Threading;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+
+public class TrackingChunkReaderForExecutor<TStreamId, TRecord> :
+	IChunkReaderForExecutor<TStreamId, TRecord> {
+
+	private readonly IChunkReaderForExecutor<TStreamId, TRecord> _wrapped;
+	private readonly bool _isRemote;
+	private readonly Tracer _tracer;
+
+	public TrackingChunkReaderForExecutor(
+		IChunkReaderForExecutor<TStreamId, TRecord> wrapped,
+		bool isRemote,
+		Tracer tracer) {
+
+		_wrapped = wrapped;
+		_isRemote = isRemote;
+		_tracer = tracer;
+	}
+
+	public string Name => _wrapped.Name;
+
+	public int FileSize => _wrapped.FileSize;
+
+	public int ChunkStartNumber => _wrapped.ChunkStartNumber;
+
+	public int ChunkEndNumber => _wrapped.ChunkEndNumber;
+
+	public bool IsReadOnly => _wrapped.IsReadOnly;
+
+	public bool IsRemote => _isRemote;
+
+	public long ChunkStartPosition => _wrapped.ChunkStartPosition;
+
+	public long ChunkEndPosition => _wrapped.ChunkEndPosition;
+
+	public IAsyncEnumerable<bool> ReadInto(
+		RecordForExecutor<TStreamId, TRecord>.NonPrepare nonPrepare,
+		RecordForExecutor<TStreamId, TRecord>.Prepare prepare,
+		CancellationToken token) {
+
+		_tracer.Trace($"Opening Chunk {ChunkStartNumber}-{ChunkEndNumber}");
+		return _wrapped.ReadInto(nonPrepare, prepare, token);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/LogOrderingTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/LogOrderingTests.cs
new file mode 100644
index 00000000000..35c1c18fbf5
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/LogOrderingTests.cs
@@ -0,0 +1,254 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class LogDisorderingTests : SqliteDbPerTest<LogDisorderingTests> {
+	// if a metadata was ever written with the wrong event number (e.g. 0) due to old bugs
+	// the rest of the system will not respect it, so scavenge must not either
+	[Fact]
+	public async Task wrong_order_metadata_does_not_apply() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(Rec.Write(t++, "ab-1"))
+				.Chunk(Rec.Write(t++, "ab-1"))
+				.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 5, metadata: MaxCount2))
+				.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 0, metadata: MaxCount1))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+					x.Recs[0],
+					x.Recs[1],
+					x.Recs[2],
+					x.Recs[3].KeepNone(),
+					x.Recs[4],
+				});
+	}
+
+	[Fact]
+	public async Task wrong_order_metadata_does_not_apply_a() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(Rec.Write(t++, "ab-1")) // 0
+				.Chunk(Rec.Write(t++, "ab-1")) // 1
+				.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 0, metadata: MaxCount2)) // 2 apply
+				.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 0, metadata: MaxCount1)) // 3 skip
+				.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 0, metadata: MaxCount1)) // 4 skip
+				.Chunk(ScavengePointRec(t++, threshold: 1000)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertState(state => {
+				Assert.Equal(0, state.SumChunkWeights(0, 0));
+				Assert.Equal(0, state.SumChunkWeights(1, 1));
+				Assert.Equal(0, state.SumChunkWeights(2, 2));
+				Assert.Equal(2, state.SumChunkWeights(3, 3));
+				Assert.Equal(2, state.SumChunkWeights(4, 4));
+
+				Assert.True(state.TryGetOriginalStreamData("ab-1", out var originalStreamData));
+				// not present because there is nothing to discard
+				Assert.False(state.TryGetMetastreamData("$$ab-1", out var metastreamData));
+
+				Assert.Equal(DiscardPoint.KeepAll, originalStreamData.DiscardPoint);
+				Assert.Equal(DiscardPoint.KeepAll, metastreamData.DiscardPoint);
+			})
+			.RunAsync();
+	}
+
+	[Fact]
+	public async Task wrong_order_metadata_does_not_apply_b() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(Rec.Write(t++, "ab-1")) // 0
+				.Chunk(Rec.Write(t++, "ab-1")) // 1
+				.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 3, metadata: MaxCount1)) // 2 apply
+				.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 4, metadata: MaxCount2)) // 3 apply
+				.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 4, metadata: MaxCount1)) // 4 skip
+				.Chunk(ScavengePointRec(t++, threshold: 1000)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertState(state => {
+				Assert.Equal(0, state.SumChunkWeights(0, 0));
+				Assert.Equal(0, state.SumChunkWeights(1, 1));
+				Assert.Equal(2, state.SumChunkWeights(2, 2));
+				Assert.Equal(0, state.SumChunkWeights(3, 3));
+				Assert.Equal(2, state.SumChunkWeights(4, 4));
+
+				Assert.True(state.TryGetOriginalStreamData("ab-1", out var originalStreamData));
+				Assert.True(state.TryGetMetastreamData("$$ab-1", out var metastreamData));
+
+				Assert.Equal(DiscardPoint.KeepAll, originalStreamData.DiscardPoint);
+				Assert.Equal(DiscardPoint.DiscardBefore(4), metastreamData.DiscardPoint);
+			})
+			.RunAsync();
+	}
+
+	[Fact]
+	public async Task wrong_order_metadata_does_not_apply_c() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(Rec.Write(t++, "ab-1")) // 0
+				.Chunk(Rec.Write(t++, "ab-1")) // 1
+				.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 3, metadata: MaxCount1)) // 2 apply
+				.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 4, metadata: MaxCount2)) // 3 apply
+				.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 0, metadata: MaxCount1)) // 4 skip
+				.Chunk(ScavengePointRec(t++, threshold: 1000)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertState(state => {
+				Assert.Equal(0, state.SumChunkWeights(0, 0));
+				Assert.Equal(0, state.SumChunkWeights(1, 1));
+				Assert.Equal(2, state.SumChunkWeights(2, 2));
+				Assert.Equal(0, state.SumChunkWeights(3, 3));
+				Assert.Equal(2, state.SumChunkWeights(4, 4));
+
+				Assert.True(state.TryGetOriginalStreamData("ab-1", out var originalStreamData));
+				Assert.True(state.TryGetMetastreamData("$$ab-1", out var metastreamData));
+
+				Assert.Equal(DiscardPoint.KeepAll, originalStreamData.DiscardPoint);
+				Assert.Equal(DiscardPoint.DiscardBefore(4), metastreamData.DiscardPoint);
+			})
+			.RunAsync();
+	}
+
+	[Fact]
+	public async Task wrong_order_metadata_does_not_apply_d() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(Rec.Write(t++, "ab-1")) // 0
+				.Chunk(Rec.Write(t++, "ab-1")) // 1
+				.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 4, metadata: MaxCount2)) // 2 apply
+				.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 2, metadata: MaxCount1)) // 3 skip
+				.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 0, metadata: MaxCount1)) // 4 skip
+				.Chunk(ScavengePointRec(t++, threshold: 1000)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertState(state => {
+				Assert.Equal(0, state.SumChunkWeights(0, 0));
+				Assert.Equal(0, state.SumChunkWeights(1, 1));
+				Assert.Equal(0, state.SumChunkWeights(2, 2));
+				Assert.Equal(2, state.SumChunkWeights(3, 3));
+				Assert.Equal(2, state.SumChunkWeights(4, 4));
+
+				Assert.True(state.TryGetOriginalStreamData("ab-1", out var originalStreamData));
+				Assert.True(state.TryGetMetastreamData("$$ab-1", out var metastreamData));
+
+				Assert.Equal(DiscardPoint.KeepAll, originalStreamData.DiscardPoint);
+				Assert.Equal(DiscardPoint.DiscardBefore(4), metastreamData.DiscardPoint);
+			})
+			.RunAsync();
+	}
+
+	[Fact]
+	public async Task wrong_order_metadata_does_not_apply_e() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(Rec.Write(t++, "ab-1")) // 0
+				.Chunk(Rec.Write(t++, "ab-1")) // 1
+				.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 4, metadata: MaxCount2)) // 2 apply
+				.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 2, metadata: MaxCount1)) // 3 skip
+				.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 3, metadata: MaxCount1)) // 4 skip
+				.Chunk(ScavengePointRec(t++, threshold: 1000)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertState(state => {
+				Assert.Equal(0, state.SumChunkWeights(0, 0));
+				Assert.Equal(0, state.SumChunkWeights(1, 1));
+				Assert.Equal(0, state.SumChunkWeights(2, 2));
+				Assert.Equal(2, state.SumChunkWeights(3, 3));
+				Assert.Equal(2, state.SumChunkWeights(4, 4));
+
+				Assert.True(state.TryGetOriginalStreamData("ab-1", out var originalStreamData));
+				Assert.True(state.TryGetMetastreamData("$$ab-1", out var metastreamData));
+
+				Assert.Equal(DiscardPoint.KeepAll, originalStreamData.DiscardPoint);
+				Assert.Equal(DiscardPoint.DiscardBefore(4), metastreamData.DiscardPoint);
+			})
+			.RunAsync();
+	}
+
+	[Fact]
+	public async Task wrong_order_metadata_then_right_does_apply() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(Rec.Write(t++, "ab-1"))
+				.Chunk(Rec.Write(t++, "ab-1"))
+				.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 5, metadata: MaxCount1))
+				.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 0, metadata: MaxCount3))
+				.Chunk(Rec.Write(t++, "$$ab-1", "$metadata", eventNumber: 6, metadata: MaxCount2))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+					x.Recs[0],
+					x.Recs[1],
+					x.Recs[2].KeepNone(),
+					x.Recs[3].KeepNone(),
+					x.Recs[4],
+					x.Recs[5],
+				});
+	}
+
+	[Fact]
+	public async Task wrong_order_in_original_stream_a() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1", eventNumber: 0),
+					Rec.Write(t++, "ab-1", eventNumber: 1),
+					Rec.Write(t++, "ab-1", eventNumber: 2),
+					Rec.Write(t++, "ab-1", eventNumber: 0),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(2, 4),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task wrong_order_in_original_stream_b() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1", eventNumber: 0),
+					Rec.Write(t++, "ab-1", eventNumber: 0),
+					Rec.Write(t++, "ab-1", eventNumber: 0),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new[] {
+					// they all have the same eventnumber so they will all be kept
+					x.Recs[0].KeepIndexes(0, 1, 2, 3),
+					x.Recs[1],
+				},
+				x => new[] {
+					// however, only 0 and 3 can be found in the index when looking up by eventNumber
+					// since 0, 1 and 2 all have event number 0.
+					x.Recs[0].KeepIndexes(0, 3),
+					x.Recs[1],
+				});
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/LruCachingScavengeMapTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/LruCachingScavengeMapTests.cs
new file mode 100644
index 00000000000..1f53c312272
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/LruCachingScavengeMapTests.cs
@@ -0,0 +1,130 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.TransactionLog.Scavenging;
+using KurrentDB.Core.TransactionLog.Scavenging.InMemory;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class LruCachingScavengeMapTests {
+	[Fact]
+	public void writing_writes_through() {
+		var wrapped = new InMemoryScavengeMap<string, int>();
+		var sut = new LruCachingScavengeMap<string, int>("", wrapped, cacheMaxCount: 100);
+
+		// given empty wrapped
+
+		// when we write
+		sut["3"] = 3;
+
+		// then it writes through
+		Assert.True(wrapped.TryGetValue("3", out var v));
+		Assert.Equal(3, v);
+	}
+
+	[Fact]
+	public void reading_reads_through() {
+		var wrapped = new InMemoryScavengeMap<string, int>();
+		var sut = new LruCachingScavengeMap<string, int>("", wrapped, cacheMaxCount: 100);
+
+		// given some data in the wrapped
+		wrapped["3"] = 3;
+
+		// then we can read that data
+		Assert.True(sut.TryGetValue("3", out var v));
+		Assert.Equal(3, v);
+	}
+
+	[Fact]
+	public void reading_populates_cache() {
+		var wrapped = new InMemoryScavengeMap<string, int>();
+		var sut = new LruCachingScavengeMap<string, int>("", wrapped, cacheMaxCount: 100);
+
+		// given some data in the wrapped
+		wrapped["3"] = 3;
+
+		// when we read that data
+		sut.TryGetValue("3", out _);
+
+		// then subsequent read comes from cache
+		wrapped["3"] = 4;
+		Assert.True(sut.TryGetValue("3", out var v));
+		Assert.Equal(3, v);
+	}
+
+	[Fact]
+	public void writing_populates_cache() {
+		var wrapped = new InMemoryScavengeMap<string, int>();
+		var sut = new LruCachingScavengeMap<string, int>("", wrapped, cacheMaxCount: 100);
+
+		// given empty wrapped
+
+		// when we write
+		sut["3"] = 3;
+
+		// then subsequent read comes from cache
+		wrapped["3"] = 4;
+		Assert.True(sut.TryGetValue("3", out var v));
+		Assert.Equal(3, v);
+	}
+
+	[Fact]
+	public void can_tryget_non_existent() {
+		var wrapped = new InMemoryScavengeMap<string, int>();
+		var sut = new LruCachingScavengeMap<string, int>("", wrapped, cacheMaxCount: 100);
+
+		// given empty wrapped
+
+		// then reading returns false
+		Assert.False(sut.TryGetValue("3", out var _));
+	}
+
+	[Fact]
+	public void can_tryremove_uncached() {
+		var wrapped = new InMemoryScavengeMap<string, int>();
+		var sut = new LruCachingScavengeMap<string, int>("", wrapped, cacheMaxCount: 100);
+
+		// given some data in the wrapped
+		wrapped["3"] = 3;
+
+		// then we can remove it
+		Assert.True(sut.TryRemove("3", out var v));
+		Assert.Equal(3, v);
+
+		// and can no longer find it
+		Assert.False(sut.TryGetValue("3", out _));
+		Assert.False(wrapped.TryGetValue("3", out _));
+	}
+
+	[Fact]
+	public void can_tryremove_cached() {
+		var wrapped = new InMemoryScavengeMap<string, int>();
+		var sut = new LruCachingScavengeMap<string, int>("", wrapped, cacheMaxCount: 100);
+
+		// given some data in the wrapped
+		wrapped["3"] = 3;
+
+		// when we read it
+		sut.TryGetValue("3", out _);
+
+		// then we can remove it
+		Assert.True(sut.TryRemove("3", out var v));
+		Assert.Equal(3, v);
+
+		// and can no longer find it
+		Assert.False(sut.TryGetValue("3", out _));
+		Assert.False(wrapped.TryGetValue("3", out _));
+	}
+
+	[Fact]
+	public void can_tryremove_non_existent() {
+		var wrapped = new InMemoryScavengeMap<string, int>();
+		var sut = new LruCachingScavengeMap<string, int>("", wrapped, cacheMaxCount: 100);
+
+		// given empty wrapped
+
+		// then removing returns false
+		Assert.False(sut.TryRemove("3", out var _));
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/MaxAgeTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/MaxAgeTests.cs
new file mode 100644
index 00000000000..230114de888
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/MaxAgeTests.cs
@@ -0,0 +1,144 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+#pragma warning disable CS0162 // Unreachable code detected
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+// for testing the maxage functionality specifically
+public class MaxAgeTests : SqliteDbPerTest<MaxAgeTests> {
+	[Fact]
+	public async Task simple_maxage() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1", timestamp: Expired),
+					Rec.Write(t++, "ab-1", timestamp: Expired),
+					Rec.Write(t++, "ab-1", timestamp: Active),
+					Rec.Write(t++, "ab-1", timestamp: Active),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxAgeMetadata))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(2, 3, 4),
+					x.Recs[1],
+				},
+				Scenario.CollideEverything
+					// index is the same as the log because it tries to find the log records
+					// and fails, so must remove the index entries.
+					? default(Func<DbResult, LogRecord[][]>)
+					// records kept in the index because they are 'maybe' expired
+					: x => new[] {
+						x.Recs[0],
+						x.Recs[1],
+					});
+	}
+
+	[Fact]
+	public async Task keep_last_event() {
+		// records kept in the index because they are 'maybe' expired
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1", timestamp: Expired),
+					Rec.Write(t++, "ab-1", timestamp: Expired),
+					Rec.Write(t++, "ab-1", timestamp: Expired),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxAgeMetadata))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(2, 3),
+					x.Recs[1],
+				},
+				Scenario.CollideEverything
+					? default(Func<DbResult, LogRecord[][]>)
+					: x => new[] {
+						x.Recs[0],
+						x.Recs[1],
+					});
+	}
+
+	[Fact]
+	public async Task whole_chunk_expired() {
+		// the records can be removed from the chunks and the index
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1", timestamp: Expired),
+					Rec.Write(t++, "ab-1", timestamp: Expired),
+					Rec.Write(t++, "ab-1", timestamp: Expired))
+				.Chunk(
+					Rec.Write(t++, "ab-1", timestamp: Active),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxAgeMetadata))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(),
+					x.Recs[1].KeepIndexes(0, 1),
+					x.Recs[2],
+				});
+	}
+
+	[Fact]
+	public async Task whole_chunk_expired_keep_last_event() {
+		// the records can be removed from the chunks and the index
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1", timestamp: Expired),
+					Rec.Write(t++, "ab-1", timestamp: Expired),
+					Rec.Write(t++, "ab-1", timestamp: Expired))
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxAgeMetadata))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(2),
+					x.Recs[1].KeepIndexes(0),
+					x.Recs[2],
+				});
+	}
+
+	[Fact]
+	public async Task whole_chunk_active() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1", timestamp: Active),
+					Rec.Write(t++, "ab-1", timestamp: Active),
+					Rec.Write(t++, "ab-1", timestamp: Active))
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxAgeMetadata))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new[] {
+					x.Recs[0],
+					x.Recs[1],
+					x.Recs[2],
+				});
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/MaxCountTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/MaxCountTests.cs
new file mode 100644
index 00000000000..c5238eb7cf9
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/MaxCountTests.cs
@@ -0,0 +1,71 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+// for testing the maxcount functionality specifically
+public class MaxCountTests : SqliteDbPerTest<MaxCountTests> {
+	[Fact]
+	public async Task simple_maxcount() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(3, 4),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task no_stream() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0],
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task large_maxcount() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount50))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0],
+				x.Recs[1],
+			});
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/MiscellaneousTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/MiscellaneousTests.cs
new file mode 100644
index 00000000000..dcbbd13a744
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/MiscellaneousTests.cs
@@ -0,0 +1,462 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+// for testing functionality that isn't specific to particular discard criteria
+public class MiscellaneousTests : SqliteDbPerTest<MiscellaneousTests> {
+	[Fact]
+	public async Task Trivial() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					// the first letter of the stream name determines its hash value
+					// ab-1: a stream called "ab-1" which hashes to "b"
+					Rec.Write(t++, "ab-1"),
+
+					// setting metadata for ab-1, which hashes to "a" and does not collide with "b"
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(0, 1),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task seen_stream_before() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(0, 1),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task collision() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-2"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(0, 1),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task metadata_non_colliding() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(0, 1),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task metadata_colliding() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "aa-1"),
+					Rec.Write(t++, "$$aa-1", "$metadata", metadata: MaxCount1))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(0, 1),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task metadata_applies_to_correct_stream_in_hidden_collision() {
+		// metastream sets metadata for stream ab-1 (which hashes to b)
+		// but that stream doesn't exist.
+		// make sure that cb-2 (which also hashes to b) does not pick up that metadata.
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "cb-2"),
+					Rec.Write(t++, "cb-2"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(0, 1, 2),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task metadatas_for_different_streams_non_colliding() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "$$cd-2", "$metadata", metadata: MaxCount2),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount3),
+					Rec.Write(t++, "$$cd-2", "$metadata", metadata: MaxCount4))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(2, 3),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task metadatas_for_different_streams_all_colliding() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$aa-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "$$aa-2", "$metadata", metadata: MaxCount2),
+					Rec.Write(t++, "$$aa-1", "$metadata", metadata: MaxCount3),
+					Rec.Write(t++, "$$aa-2", "$metadata", metadata: MaxCount4))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(2, 3),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task metadatas_for_different_streams_original_streams_colliding() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "$$cb-2", "$metadata", metadata: MaxCount2),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount3),
+					Rec.Write(t++, "$$cb-2", "$metadata", metadata: MaxCount4))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(2, 3),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task metadatas_for_different_streams_meta_streams_colliding() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "$$ac-2", "$metadata", metadata: MaxCount2),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount3),
+					Rec.Write(t++, "$$ac-2", "$metadata", metadata: MaxCount4))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(2, 3),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task metadatas_for_different_streams_original_and_meta_colliding() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "$$ab-2", "$metadata", metadata: MaxCount2),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount3),
+					Rec.Write(t++, "$$ab-2", "$metadata", metadata: MaxCount4))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(2, 3),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task metadatas_for_different_streams_cross_colliding() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "$$ba-2", "$metadata", metadata: MaxCount2),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount3),
+					Rec.Write(t++, "$$ba-2", "$metadata", metadata: MaxCount4))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(2, 3),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task metadatas_for_same_stream() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount2))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(1),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task metadata_first() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+					x.Recs[0].KeepIndexes(0, 4),
+					x.Recs[1],
+				});
+	}
+
+	[Fact]
+	public async Task nonexistent_stream() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+					x.Recs[0].KeepIndexes(0),
+					x.Recs[1],
+				});
+	}
+
+	[Fact]
+	public async Task multiple_streams() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "cd-2"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "cd-2"),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "$$cd-2", "$metadata", metadata: MaxCount1))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+					x.Recs[0].KeepIndexes(2, 3, 4, 5),
+					x.Recs[1],
+				});
+	}
+
+	[Fact]
+	public async Task metadata_gets_scavenged() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount2))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+					x.Recs[0].KeepIndexes(1),
+					x.Recs[1],
+				});
+	}
+
+	[Fact]
+	public async Task metadata_for_metadata_stream_gets_scavenged() {
+		// currently requires a threshold = -1 scavenge to force this.
+		// see comments in accumulator.cs
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "$$$$ab-1", "$metadata", metadata: MaxCount2))
+				.Chunk(ScavengePointRec(t++, threshold: -1)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+					x.Recs[0].KeepIndexes(1),
+					x.Recs[1],
+				});
+	}
+
+	[Fact]
+	public async Task metadata_for_metadata_stream_does_not_apply() {
+		// e.g. can't increase the maxcount to three
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$$$ab-1", "$metadata", metadata: MaxCount3),
+					Rec.Write(t++, "$$ab-1"),
+					Rec.Write(t++, "$$ab-1"),
+					Rec.Write(t++, "$$ab-1"),
+					Rec.Write(t++, "$$ab-1"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+					x.Recs[0].KeepIndexes(0, 4),
+					x.Recs[1],
+				});
+	}
+
+	[Fact]
+	public async Task unusual_metadata_still_takes_effect() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					// this 'metadata' record has a strange type, and does not parse to metadata
+					// still, its effect is to reset the metadata of the stream.
+					Rec.Write(
+						transaction: t++,
+						stream: "$$ab-1",
+						eventType: "sneaky",
+						data: BitConverter.GetBytes(0xBAD_1DEA)))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+					x.Recs[0].KeepIndexes(1, 2, 3),
+					x.Recs[1],
+				});
+	}
+
+	[Fact]
+	public async Task metadata_in_normal_stream_is_ignored() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+					x.Recs[0],
+					x.Recs[1],
+				});
+	}
+
+	[Fact]
+	public async Task metadata_in_transaction_not_supported() {
+		var logger = new FakeTFScavengerLog();
+
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.TransSt(0, "$$ab-1"),
+					Rec.Prepare(0, "$$ab-1", "$metadata", metadata: MaxCount1))
+				.Chunk(ScavengePointRec(1)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.WithLogger(logger)
+			.RunAsync();
+
+		Assert.True(logger.Completed);
+		Assert.Equal(ScavengeResult.Errored, logger.Result);
+		Assert.Equal("Error while scavenging DB: Found metadata in transaction in stream $$ab-1.", logger.Error);
+	}
+
+	[Fact]
+	public async Task transactions_not_scavenged() {
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(0, "ab-1"),
+					Rec.TransSt(1, "ab-1"),
+					Rec.Prepare(1, "ab-1"),
+					Rec.TransEnd(1, "ab-1"),
+					Rec.Commit(1, "ab-1"),
+					Rec.Write(2, "ab-1"),
+					Rec.Write(3, "$$ab-1", "$metadata", metadata: MaxCount1))
+				.Chunk(ScavengePointRec(4)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(1, 2, 3, 4, 5, 6),
+					x.Recs[1],
+				},
+				// still removed from the index
+				x => new[] {
+					x.Recs[0].KeepIndexes(5, 6),
+					x.Recs[1],
+				});
+	}
+}
diff --git a/src/EventStore.Core.XUnit.Tests/Scavenge/ParallelLoopTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ParallelLoopTests.cs
similarity index 92%
rename from src/EventStore.Core.XUnit.Tests/Scavenge/ParallelLoopTests.cs
rename to src/KurrentDB.Core.XUnit.Tests/Scavenge/ParallelLoopTests.cs
index b332b7ef50f..35910db9d81 100644
--- a/src/EventStore.Core.XUnit.Tests/Scavenge/ParallelLoopTests.cs
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ParallelLoopTests.cs
@@ -1,13 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using DotNext.Threading;
-using EventStore.Core.TransactionLog.Scavenging;
+using KurrentDB.Core.TransactionLog.Scavenging;
 using Xunit;
 
-namespace EventStore.Core.XUnit.Tests.Scavenge;
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
 
 public class ParallelLoopTests {
 	static async Task RunAsync(
@@ -44,7 +46,7 @@ static async Task RunAsync(
 		var completedItems = new List<int>();
 
 		await ParallelLoop.RunWithTrailingCheckpointAsync(
-			source: source,
+			source: source.ToAsyncEnumerable(),
 			degreeOfParallelism: degreeOfParallelism,
 			getCheckpointInclusive: x => x,
 			getCheckpointExclusive: x => {
@@ -138,7 +140,7 @@ public async Task empty_source() => await RunAsync(
 	public async Task exception_during_processing_is_propagated_async() {
 		var ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => {
 			await ParallelLoop.RunWithTrailingCheckpointAsync(
-				source: new int[] { 10 },
+				source: new[] { 10 }.ToAsyncEnumerable(),
 				degreeOfParallelism: 2,
 				getCheckpointInclusive: x => x,
 				getCheckpointExclusive: x => x,
@@ -154,7 +156,7 @@ await ParallelLoop.RunWithTrailingCheckpointAsync(
 	public async Task exception_during_emit_is_propagated_async() {
 		var ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => {
 			await ParallelLoop.RunWithTrailingCheckpointAsync(
-				source: new int[] { 10 },
+				source: new[] { 10 }.ToAsyncEnumerable(),
 				degreeOfParallelism: 2,
 				getCheckpointInclusive: x => x,
 				getCheckpointExclusive: x => x,
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/PortedFromOldScavenge/ScavengeTestScenarioPortedScavengeTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/PortedFromOldScavenge/ScavengeTestScenarioPortedScavengeTests.cs
new file mode 100644
index 00000000000..dff4b38d2d5
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/PortedFromOldScavenge/ScavengeTestScenarioPortedScavengeTests.cs
@@ -0,0 +1,502 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using KurrentDB.LogCommon;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+#pragma warning disable CS0162 // Unreachable code detected
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.PortedFromOldScavenge;
+
+// old scavenge tests that derived from ScavengeTestScenario
+public class ScavengeTestScenarioPortedScavengeTests : SqliteDbPerTest<ScavengeTestScenarioPortedScavengeTests> {
+	[Fact]
+	public async Task when_scavenging_tfchunk_with_version0_log_records_and_incomplete_chunk() {
+		const byte version = LogRecordVersion.LogRecordV0;
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ES1", version: version),
+					Rec.Write(t++, "ES1", version: version))
+				.CompleteLastChunk()
+				.Chunk(
+					Rec.Write(t++, "ES2", version: version),
+					Rec.Write(t++, "ES2", version: version))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepAll(),
+				x.Recs[1].KeepAll(),
+				x.Recs[2].KeepAll(),
+			});
+	}
+
+	// temp streams not supported:
+	// when_stream_is_softdeleted_and_temp_and_all_events_and_metaevents_are_in_one_chunk
+	// when_stream_is_softdeleted_and_temp_but_some_events_are_in_multiple_chunks
+	// when_stream_is_softdeleted_and_temp_but_some_metaevents_are_in_multiple_chunks
+	// when_stream_is_softdeleted_and_temp_with_log_version_0_but_some_events_are_in_multiple_chunks
+	// when_stream_is_softdeleted_with_log_record_version_0
+	// when_stream_is_softdeleted_with_mixed_log_record_version_0_and_version_1
+	//
+	// not applicable:
+	// when_metastream_is_scavenged_and_read_index_is_set_to_keep_last_3_metaevents
+
+
+	[Fact]
+	public async Task when_deleted_stream_with_a_lot_of_data_is_scavenged() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.CommittedDelete(t++, "bla"))
+				.CompleteLastChunk()
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(9),
+				x.Recs[1].KeepAll(),
+			});
+	}
+
+	[Fact]
+	public async Task when_deleted_stream_with_a_lot_of_data_is_scavenged_with_ingore_harddelete() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithUnsafeIgnoreHardDeletes(true)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.CommittedDelete(t++, "bla"))
+				.CompleteLastChunk()
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepNone(),
+				x.Recs[1].KeepAll(),
+			});
+	}
+
+	[Fact]
+	public async Task when_deleted_stream_with_explicit_transaction_is_scavenged() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithUnsafeIgnoreHardDeletes(true)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.CommittedDelete(t++, "bla"))
+				.CompleteLastChunk()
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepNone(),
+				x.Recs[1].KeepAll(),
+			});
+	}
+
+	[Fact]
+	public async Task when_deleted_stream_with_metadata_is_scavenged() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$bla", metadata: new StreamMetadata(10, null, null, null, null)),
+					Rec.Write(t++, "$$bla", metadata: new StreamMetadata(2, null, null, null, null)),
+					Rec.CommittedDelete(t++, "bla"))
+				.CompleteLastChunk()
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(2),
+				x.Recs[1].KeepAll(),
+			});
+	}
+
+	[Fact]
+	public async Task when_having_nothing_to_scavenge() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"))
+				.Chunk(
+					Rec.Write(t++, "bla3"),
+					Rec.Write(t++, "bla3"))
+				.CompleteLastChunk()
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepAll(),
+				x.Recs[1].KeepAll(),
+				x.Recs[2].KeepAll(),
+			});
+	}
+
+	[Fact]
+	public async Task when_having_stream_with_both_max_age_and_max_count_with_stricter_max_age_specified() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$bla", metadata: new StreamMetadata(5, TimeSpan.FromMinutes(5), null, null, null)),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(100)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(90)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(60)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(40)),
+
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(30)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(20)),
+
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(3)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(2)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(1)))
+				.CompleteLastChunk()
+				.Chunk(ScavengePointRec(t++, timeStamp: DateTime.UtcNow)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(0, 8, 9, 10),
+					x.Recs[1].KeepAll(),
+				},
+				Scenario.CollideEverything
+					? default(Func<DbResult, LogRecord[][]>)
+					: x => new[] {
+						x.Recs[0].KeepIndexes(0, 6, 7, 8, 9, 10),
+						x.Recs[1],
+					});
+	}
+
+	[Fact]
+	public async Task when_having_stream_with_both_max_age_and_max_count_with_stricter_max_count_specified() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$bla", metadata: new StreamMetadata(3, TimeSpan.FromMinutes(50), null, null, null)),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(100)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(90)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(60)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(40)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(30)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(20)),
+
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(3)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(2)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(1)))
+				.CompleteLastChunk()
+				.Chunk(ScavengePointRec(t++, timeStamp: DateTime.UtcNow)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(0, 8, 9, 10),
+				x.Recs[1].KeepAll(),
+			});
+	}
+
+	[Fact]
+	public async Task when_having_stream_with_max_age_specified() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$bla", metadata: new StreamMetadata(null, TimeSpan.FromMinutes(5), null, null, null)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(110)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(100)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(90)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(60)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(40)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(30)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(20)),
+
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(3)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(2)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(1)))
+				.CompleteLastChunk()
+				.Chunk(ScavengePointRec(t++, timeStamp: DateTime.UtcNow)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(0, 8, 9, 10),
+					x.Recs[1].KeepAll(),
+				},
+				Scenario.CollideEverything
+					? default(Func<DbResult, LogRecord[][]>)
+					: x => new[] {
+						x.Recs[0].KeepIndexes(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10),
+						x.Recs[1],
+					});
+	}
+
+	[Fact]
+	public async Task when_having_stream_with_max_count_specified() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$bla", metadata: new StreamMetadata(maxCount: 3)),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"))
+				.CompleteLastChunk()
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(0, 8, 9, 10),
+				x.Recs[1].KeepAll(),
+			});
+	}
+
+	[Fact]
+	public async Task when_having_stream_with_truncatebefore_specified() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$bla", metadata: new StreamMetadata(truncateBefore: 7)),
+					Rec.Write(t++, "bla"), // event 0
+					Rec.Write(t++, "bla"), // event 1
+					Rec.Write(t++, "bla"), // event 2
+					Rec.Write(t++, "bla"), // event 3
+					Rec.Write(t++, "bla"), // event 4
+					Rec.Write(t++, "bla"), // event 5
+					Rec.Write(t++, "bla"), // event 6
+					Rec.Write(t++, "bla"), // event 7
+					Rec.Write(t++, "bla"), // event 8
+					Rec.Write(t++, "bla")) // event 9
+				.CompleteLastChunk()
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(0, 8, 9, 10),
+				x.Recs[1].KeepAll(),
+			});
+	}
+
+	[Fact]
+	public async Task when_having_stream_with_strict_max_age_leaving_no_events_in_stream() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$bla", metadata: new StreamMetadata(null, TimeSpan.FromMinutes(1), null, null, null)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(25)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(20)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(10)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(5)),
+					Rec.Write(t++, "bla", timestamp: DateTime.UtcNow - TimeSpan.FromMinutes(3)))
+				.CompleteLastChunk()
+				.Chunk(ScavengePointRec(t++, timeStamp: DateTime.UtcNow)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(0, 5),
+					x.Recs[1].KeepAll(),
+				},
+				Scenario.CollideEverything
+					? default(Func<DbResult, LogRecord[][]>)
+					: x => new[] {
+						x.Recs[0].KeepIndexes(0, 1, 2, 3, 4, 5),
+						x.Recs[1],
+					});
+	}
+
+	[Fact]
+	public async Task when_metastream_is_scavenged_and_read_index_is_set_to_keep_just_last_metaevent() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$bla", metadata: new StreamMetadata(10, null, null, null, null)),
+					Rec.Write(t++, "$$bla", metadata: new StreamMetadata(5, null, null, null, null)),
+					Rec.Write(t++, "$$bla", metadata: new StreamMetadata(3, null, null, null, null)),
+					Rec.Write(t++, "$$bla", metadata: new StreamMetadata(2, null, null, null, null)))
+				.CompleteLastChunk()
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(3),
+				x.Recs[1].KeepAll(),
+			});
+	}
+
+	[Fact]
+	public async Task when_stream_is_deleted() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"))
+				.Chunk(
+					Rec.CommittedDelete(t++, "bla"))
+				.CompleteLastChunk()
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepNone(),
+				x.Recs[1].KeepAll(),
+				x.Recs[2].KeepAll(),
+			});
+	}
+
+	[Fact]
+	public async Task when_stream_is_deleted_with_ignore_hard_deletes() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithUnsafeIgnoreHardDeletes(true)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "bla"),
+					Rec.Write(t++, "bla"))
+				.Chunk(
+					Rec.CommittedDelete(t++, "bla"))
+				.CompleteLastChunk()
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepNone(),
+				x.Recs[1].KeepNone(),
+				x.Recs[2].KeepAll(),
+			});
+	}
+
+	// old scavenge removes transaction 0 entirely because it is contained within one chunk
+	// old scavenge keeps the begin and commit for transaction 1 because it spans chunks
+	// new scavenge has less transaction handling and treats both transactions the same.
+	[Fact]
+	public async Task when_stream_is_deleted_and_bulk_transaction_spans_chunks_boundary() {
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Prepare(0, "bla"), // keep (old would discard)
+					Rec.Commit(0, "bla"), // keep (old would discard)
+					Rec.Prepare(1, "bla"), // keep
+					Rec.Prepare(1, "bla"),
+					Rec.Prepare(1, "bla"),
+					Rec.Prepare(1, "bla"))
+				.Chunk(
+					Rec.Prepare(1, "bla"),
+					Rec.Prepare(1, "bla"),
+					Rec.Prepare(1, "bla"),
+					Rec.Commit(1, "bla"), // keep
+					Rec.Delete(2, "bla"), // keep
+					Rec.Commit(2, "bla")) // keep
+				.CompleteLastChunk()
+				.Chunk(ScavengePointRec(3)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(0, 1, 2),
+					x.Recs[1].KeepIndexes(3, 4, 5),
+					x.Recs[2].KeepAll(),
+				},
+				x => new[] {
+					x.Recs[0].KeepIndexes(),
+					x.Recs[1].KeepIndexes(4),
+					x.Recs[2].KeepAll(),
+				});
+	}
+
+	[Fact]
+	public async Task when_stream_is_deleted_and_explicit_transaction_spans_chunks_boundary() {
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Prepare(0, "bla"), // keep (old would discard)
+					Rec.Commit(0, "bla"), // keep (old would discard)
+					Rec.TransSt(1, "bla"), // keep
+					Rec.Prepare(1, "bla"),
+					Rec.Prepare(1, "bla"),
+					Rec.Prepare(1, "bla"),
+					Rec.Prepare(1, "bla"))
+				.Chunk(
+					Rec.Prepare(1, "bla"),
+					Rec.Prepare(1, "bla"),
+					Rec.Prepare(1, "bla"),
+					Rec.Prepare(1, "bla"),
+					Rec.Prepare(1, "bla"),
+					Rec.TransEnd(1, "bla"),
+					Rec.Commit(1, "bla")) // keep
+				.Chunk(
+					Rec.Delete(2, "bla"), // keep
+					Rec.Commit(2, "bla")) // keep
+				.CompleteLastChunk()
+				.Chunk(ScavengePointRec(3)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(0, 1, 2),
+					x.Recs[1].KeepIndexes(6),
+					x.Recs[2].KeepIndexes(0, 1),
+					x.Recs[3].KeepAll(),
+				},
+				x => new[] {
+					x.Recs[0].KeepIndexes(),
+					x.Recs[1].KeepIndexes(),
+					x.Recs[2].KeepIndexes(0),
+					x.Recs[3].KeepAll(),
+				});
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/RemoteChunkTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/RemoteChunkTests.cs
new file mode 100644
index 00000000000..67b23f2f98c
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/RemoteChunkTests.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class RemoteChunkTests : SqliteDbPerTest<RemoteChunkTests> {
+	[Fact]
+	public async Task remote_chunks_are_not_executed() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.RemoteChunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"))
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
+				.Chunk(
+					ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => [
+					x.Recs[0], // remote chunk still has its records
+					x.Recs[1].KeepIndexes(1, 2),
+					x.Recs[2],
+				],
+				x => [
+					x.Recs[0].KeepNone(), // index entries for remote chunk are still removed
+					x.Recs[1].KeepIndexes(1, 2),
+					x.Recs[2],
+				]);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/ScavengeCheckpointTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ScavengeCheckpointTests.cs
new file mode 100644
index 00000000000..8532a48b4c3
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ScavengeCheckpointTests.cs
@@ -0,0 +1,98 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.TransactionLog.Scavenging;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class ScavengeCheckpointTests {
+	private T RoundTrip<T>(T input, string expectedJson) where T : ScavengeCheckpoint {
+		var json = ScavengeCheckpointJsonPersistence<string>.Serialize(input);
+		Assert.True(ScavengeCheckpointJsonPersistence<string>.TryDeserialize(
+			json,
+			out var deserialized));
+		Assert.Equal(expectedJson, json);
+		Assert.Equal(input.ScavengePoint.Position, deserialized.ScavengePoint.Position);
+		Assert.Equal(input.ScavengePoint.EffectiveNow, deserialized.ScavengePoint.EffectiveNow);
+		return Assert.IsType<T>(deserialized);
+	}
+
+	private readonly ScavengePoint _scavengePoint = new ScavengePoint(
+		position: 1234,
+		eventNumber: 5,
+		effectiveNow: EffectiveNow,
+		threshold: 567);
+
+	[Theory]
+	[InlineData(null, @"{""scavengePoint"":{""position"":1234,""eventNumber"":5,""effectiveNow"":""2022-01-05T00:00:00"",""threshold"":567},""schemaVersion"":""V0"",""checkpointStage"":""Accumulating""}")]
+	[InlineData(5, @"{""scavengePoint"":{""position"":1234,""eventNumber"":5,""effectiveNow"":""2022-01-05T00:00:00"",""threshold"":567},""schemaVersion"":""V0"",""checkpointStage"":""Accumulating"",""doneLogicalChunkNumber"":5}")]
+	public void can_round_trip_accumulating(int? x, string expectedJson) {
+		var cp = RoundTrip(new ScavengeCheckpoint.Accumulating(_scavengePoint, x), expectedJson);
+		Assert.Equal(x, cp.DoneLogicalChunkNumber);
+	}
+
+	[Fact]
+	public void can_round_trip_calculating_default() {
+		var cp = RoundTrip(
+			new ScavengeCheckpoint.Calculating<string>(_scavengePoint, default),
+			@"{""scavengePoint"":{""position"":1234,""eventNumber"":5,""effectiveNow"":""2022-01-05T00:00:00"",""threshold"":567},""schemaVersion"":""V0"",""checkpointStage"":""Calculating""}");
+		Assert.Equal(default, cp.DoneStreamHandle);
+	}
+
+	[Fact]
+	public void can_round_trip_calculating_streamid() {
+		var cp = RoundTrip(
+			new ScavengeCheckpoint.Calculating<string>(_scavengePoint, StreamHandle.ForStreamId("stream1")),
+			@"{""scavengePoint"":{""position"":1234,""eventNumber"":5,""effectiveNow"":""2022-01-05T00:00:00"",""threshold"":567},""schemaVersion"":""V0"",""checkpointStage"":""Calculating""," +
+			@"""doneStreamHandle"":{""kind"":""Id"",""streamId"":""stream1""}}");
+		Assert.Equal("Id: stream1", cp.DoneStreamHandle.ToString());
+	}
+
+	[Fact]
+	public void can_round_trip_calculating_hash() {
+		var cp = RoundTrip(
+			new ScavengeCheckpoint.Calculating<string>(_scavengePoint, StreamHandle.ForHash<string>(97)),
+			@"{""scavengePoint"":{""position"":1234,""eventNumber"":5,""effectiveNow"":""2022-01-05T00:00:00"",""threshold"":567},""schemaVersion"":""V0"",""checkpointStage"":""Calculating""," +
+			@"""doneStreamHandle"":{""kind"":""Hash"",""streamHash"":97}}");
+		Assert.Equal("Hash: 97", cp.DoneStreamHandle.ToString());
+	}
+
+	[Theory]
+	[InlineData(null, @"{""scavengePoint"":{""position"":1234,""eventNumber"":5,""effectiveNow"":""2022-01-05T00:00:00"",""threshold"":567},""schemaVersion"":""V0"",""checkpointStage"":""ExecutingChunks""}")]
+	[InlineData(5, @"{""scavengePoint"":{""position"":1234,""eventNumber"":5,""effectiveNow"":""2022-01-05T00:00:00"",""threshold"":567},""schemaVersion"":""V0"",""checkpointStage"":""ExecutingChunks"",""doneLogicalChunkNumber"":5}")]
+	public void can_round_trip_executing_chunks(int? x, string expectedJson) {
+		var cp = RoundTrip(new ScavengeCheckpoint.ExecutingChunks(_scavengePoint, x), expectedJson);
+		Assert.Equal(x, cp.DoneLogicalChunkNumber);
+	}
+
+	[Fact]
+	public void can_round_trip_merging_chunks() {
+		var cp = RoundTrip(
+			new ScavengeCheckpoint.MergingChunks(_scavengePoint),
+			@"{""scavengePoint"":{""position"":1234,""eventNumber"":5,""effectiveNow"":""2022-01-05T00:00:00"",""threshold"":567},""schemaVersion"":""V0"",""checkpointStage"":""MergingChunks""}");
+	}
+
+	[Fact]
+	public void can_round_trip_executing_index() {
+		var cp = RoundTrip(
+			new ScavengeCheckpoint.ExecutingIndex(_scavengePoint),
+			@"{""scavengePoint"":{""position"":1234,""eventNumber"":5,""effectiveNow"":""2022-01-05T00:00:00"",""threshold"":567},""schemaVersion"":""V0"",""checkpointStage"":""ExecutingIndex""}");
+	}
+
+	[Fact]
+	public void can_round_trip_cleaning() {
+		var cp = RoundTrip(
+			new ScavengeCheckpoint.Cleaning(_scavengePoint),
+			@"{""scavengePoint"":{""position"":1234,""eventNumber"":5,""effectiveNow"":""2022-01-05T00:00:00"",""threshold"":567},""schemaVersion"":""V0"",""checkpointStage"":""Cleaning""}");
+	}
+
+	[Fact]
+	public void can_round_trip_done() {
+		var cp = RoundTrip(
+			new ScavengeCheckpoint.Done(_scavengePoint),
+			@"{""scavengePoint"":{""position"":1234,""eventNumber"":5,""effectiveNow"":""2022-01-05T00:00:00"",""threshold"":567},""schemaVersion"":""V0"",""checkpointStage"":""Done""}");
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/ScavengeOptionsCalculatorTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ScavengeOptionsCalculatorTests.cs
new file mode 100644
index 00000000000..dbcbd111fbe
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ScavengeOptionsCalculatorTests.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Configuration.Sources;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Archive;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.TransactionLog.Scavenging;
+using Microsoft.Extensions.Configuration;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class ScavengeOptionsCalculatorTests {
+	private const string SectionName = KurrentConfigurationKeys.Prefix;
+	private static ScavengeOptionsCalculator GenSut(
+		KeyValuePair<string, string?>[]? vNodeOptions = null,
+		int? threshold = null) {
+
+		vNodeOptions ??= [];
+		var message = new ClientMessage.ScavengeDatabase(
+			envelope: IEnvelope.NoOp,
+			correlationId: Guid.NewGuid(),
+			user: SystemAccounts.Anonymous,
+			startFromChunk: 0,
+			threads: 1,
+			threshold: threshold,
+			throttlePercent: 100,
+			syncOnly: false);
+
+		var config = new ConfigurationBuilder().AddInMemoryCollection(
+				vNodeOptions.Append(new($"{SectionName}:ClusterSize", "1")))
+			.Build();
+		var options = ClusterVNodeOptions.FromConfiguration(config);
+		var archiveOptions = config.GetSection($"{SectionName}:Archive").Get<ArchiveOptions>() ?? new();
+		var sut = new ScavengeOptionsCalculator(options, archiveOptions, message);
+		return sut;
+	}
+
+	[Fact]
+	public void merging_enabled_by_default() {
+		var sut = GenSut([
+		]);
+
+		Assert.True(sut.MergeChunks);
+	}
+
+	[Fact]
+	public void merging_can_be_disabled() {
+		var sut = GenSut([
+			new($"{SectionName}:DisableScavengeMerging", "true"),
+		]);
+
+		Assert.False(sut.MergeChunks);
+	}
+
+	[Fact]
+	public void merging_is_disabled_when_archiving_is_enabled() {
+		var sut = GenSut(
+			vNodeOptions: [
+				new($"{SectionName}:Archive:Enabled", "true"),
+			]);
+
+		Assert.False(sut.MergeChunks);
+	}
+
+	[Theory]
+	[InlineData(null, 0)]
+	[InlineData(-5, -5)]
+	[InlineData(0, 0)]
+	[InlineData(5, 5)]
+	public void threshold_can_be_set(int? configuredThreshold, int expectedThreshold) {
+		var sut = GenSut(threshold: configuredThreshold);
+
+		Assert.Equal(expectedThreshold, sut.ChunkExecutionThreshold);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/ScavengeStateTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ScavengeStateTests.cs
new file mode 100644
index 00000000000..dadeecfe0bb
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ScavengeStateTests.cs
@@ -0,0 +1,185 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.LogV2;
+using KurrentDB.Core.Tests.Index.Hashers;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+// generally the properties we need of the ScavengeState are tested at a higher
+// level. but a couple of fiddly bits are checked in here
+public class ScavengeStateTests : SqliteDbPerTest<ScavengeStateTests> {
+	[Fact]
+	public void pending_changes_are_still_read() {
+		var hasher = new HumanReadableHasher();
+		var metastreamLookup = new LogV2SystemStreams();
+		var sut = new ScavengeStateBuilder<string>(hasher, metastreamLookup)
+			.WithConnectionPool(Fixture.DbConnectionPool)
+			.Build();
+
+		var trans = sut.BeginTransaction();
+
+		sut.IncreaseChunkWeight(5, 20);
+		sut.IncreaseChunkWeight(6, 40);
+		sut.SetMetastreamDiscardPoint("$$ab-1", DiscardPoint.DiscardBefore(20));
+
+		Assert.Equal(60, sut.SumChunkWeights(5, 6));
+		Assert.True(sut.TryGetMetastreamData("$$ab-1", out var actual));
+		Assert.Equal(DiscardPoint.DiscardBefore(20), actual.DiscardPoint);
+		trans.Commit(new ScavengeCheckpoint.Accumulating(
+			new ScavengePoint(default, default, default, default),
+			20));
+		sut.Dispose();
+	}
+
+	[Fact]
+	public void transaction_rollback_undoes_pending_changes() {
+		var hasher = new HumanReadableHasher();
+		var metastreamLookup = new LogV2SystemStreams();
+		var sut = new ScavengeStateBuilder<string>(hasher, metastreamLookup)
+			.WithConnectionPool(Fixture.DbConnectionPool)
+			.Build();
+
+		sut.IncreaseChunkWeight(5, 20);
+		sut.DetectCollisions("$$ab-1");
+		sut.SetMetastreamDiscardPoint("$$ab-1", DiscardPoint.DiscardBefore(20));
+
+		var trans = sut.BeginTransaction();
+
+		sut.IncreaseChunkWeight(6, 40);
+		sut.SetMetastreamDiscardPoint("$$ab-1", DiscardPoint.DiscardBefore(50));
+		sut.DetectCollisions("$$ab-2");
+		sut.SetMetastreamDiscardPoint("$$ab-2", DiscardPoint.DiscardBefore(50));
+		sut.DetectCollisions("$$cd-3");
+		sut.SetMetastreamDiscardPoint("$$cd-3", DiscardPoint.DiscardBefore(50));
+
+		trans.Rollback();
+
+		Assert.Equal(20, sut.SumChunkWeights(5, 6));
+		Assert.True(sut.TryGetMetastreamData("$$ab-1", out var actual));
+		Assert.Equal(DiscardPoint.DiscardBefore(20), actual.DiscardPoint);
+		sut.DetectCollisions("$$ab-2");
+		Assert.False(sut.TryGetMetastreamData("$$ab-2", out _));
+		sut.DetectCollisions("$$cd-3");
+		Assert.False(sut.TryGetMetastreamData("$$cd-3", out _));
+		sut.Dispose();
+	}
+
+	[Fact]
+	public void active_iteration_no_checkpoint() {
+		var hasher = new CompositeHasher<string>(
+			new XXHashUnsafe(),
+			new Murmur3AUnsafe());
+
+		var metastreamLookup = new LogV2SystemStreams();
+		var sut = new ScavengeStateBuilder<string>(hasher, metastreamLookup)
+			.WithConnectionPool(Fixture.DbConnectionPool)
+			.Build();
+
+		var numStreams = 100;
+
+		// 'accumulate'
+		for (var i = 0; i < numStreams; i++) {
+			var streamId = $"s-{i}";
+			var metastreamId = $"$$s-{i}";
+			sut.DetectCollisions(streamId);
+			sut.DetectCollisions(metastreamId);
+			sut.SetOriginalStreamMetadata(streamId, metadata: new StreamMetadata(maxCount: i + 1));
+		}
+
+		Assert.Empty(sut.AllCollisions());
+
+		// 'calculate'
+		var processed = 0;
+		long? lastHash = null;
+
+		var xs = sut.OriginalStreamsToCalculate(default);
+		foreach (var (handle, data) in xs) {
+			processed++;
+			Assert.Equal(StreamHandle.Kind.Hash, handle.Kind);
+			if (lastHash >= (long)handle.StreamHash) {
+				throw new Exception("repeated");
+			}
+			lastHash = (long)handle.StreamHash;
+
+			sut.SetOriginalStreamDiscardPoints(
+				handle,
+				CalculationStatus.Spent,
+				DiscardPoint.KeepAll,
+				DiscardPoint.KeepAll);
+		}
+
+		// processedd each stream exactly once
+		Assert.Equal(numStreams, processed);
+		sut.Dispose();
+	}
+
+	[Fact]
+	public void active_iteration_with_checkpoint() {
+		var hasher = new CompositeHasher<string>(
+			new XXHashUnsafe(),
+			new Murmur3AUnsafe());
+
+		var metastreamLookup = new LogV2SystemStreams();
+		var sut = new ScavengeStateBuilder<string>(hasher, metastreamLookup)
+			.WithConnectionPool(Fixture.DbConnectionPool)
+			.Build();
+
+		var numStreams = 100;
+		var stopAfter = 50;
+
+		// 'accumulate'
+		for (var i = 0; i < numStreams; i++) {
+			var streamId = $"s-{i}";
+			var metastreamId = $"$$s-{i}";
+			sut.DetectCollisions(streamId);
+			sut.DetectCollisions(metastreamId);
+			sut.SetOriginalStreamMetadata(streamId, metadata: new StreamMetadata(maxCount: i + 1));
+		}
+
+		Assert.Empty(sut.AllCollisions());
+
+		// 'calculate'
+		var processed = 0;
+		var checkpoint = new StreamHandle<string>();
+		long? lastHash = null;
+
+		void Calculate(IEnumerable<(StreamHandle<string>, OriginalStreamData)> xs) {
+			foreach (var (handle, data) in xs) {
+				processed++;
+				Assert.Equal(StreamHandle.Kind.Hash, handle.Kind);
+				if (lastHash >= (long)handle.StreamHash) {
+					throw new Exception("repeated");
+				}
+				lastHash = (long)handle.StreamHash;
+
+				sut.SetOriginalStreamDiscardPoints(
+					handle,
+					CalculationStatus.Spent,
+					DiscardPoint.KeepAll,
+					DiscardPoint.KeepAll);
+
+				checkpoint = handle;
+
+				if (processed == stopAfter)
+					break;
+			}
+		}
+
+		Calculate(sut.OriginalStreamsToCalculate(checkpoint));
+		Assert.Equal(50, processed);
+		Calculate(sut.OriginalStreamsToCalculate(checkpoint));
+
+		// processedd each stream exactly once
+		Assert.Equal(numStreams, processed);
+		sut.Dispose();
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/ScavengeStatusTrackerTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ScavengeStatusTrackerTests.cs
new file mode 100644
index 00000000000..0a9ac5b36ff
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ScavengeStatusTrackerTests.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics.Metrics;
+using System.Linq;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.TransactionLog.Scavenging;
+using KurrentDB.Core.XUnit.Tests.Metrics;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class ScavengeStatusTrackerTests : IDisposable {
+	private readonly TestMeterListener<long> _listener;
+	private readonly FakeClock _clock = new();
+	private readonly StatusMetric _metric;
+	private readonly ScavengeStatusTracker _sut;
+
+	public ScavengeStatusTrackerTests() {
+		var meter = new Meter($"{typeof(ScavengeStatusTrackerTests)}");
+		_listener = new TestMeterListener<long>(meter);
+		_metric = new StatusMetric(
+			meter,
+			"eventstore-statuses",
+			legacyNames: false,
+			_clock);
+		_sut = new ScavengeStatusTracker(_metric);
+	}
+
+	public void Dispose() {
+		_listener?.Dispose();
+	}
+
+	[Fact]
+	public void can_observe_activity() {
+		_clock.SecondsSinceEpoch = 500;
+		AssertMeasurements("Idle", 500);
+
+		using (_sut.StartActivity("Accumulation")) {
+			_clock.SecondsSinceEpoch = 501;
+			AssertMeasurements("Accumulation Phase", 501);
+		}
+
+		_clock.SecondsSinceEpoch = 502;
+		AssertMeasurements("Idle", 502);
+	}
+
+	void AssertMeasurements(string expectedStatus, int expectedValue) {
+		_listener.Observe();
+
+		Assert.Collection(
+			_listener.RetrieveMeasurements("eventstore-statuses"),
+			m => {
+				Assert.Equal(expectedValue, m.Value);
+				Assert.Collection(
+					m.Tags.ToArray(),
+					t => {
+						Assert.Equal("name", t.Key);
+						Assert.Equal("Scavenge", t.Value);
+					},
+					t => {
+						Assert.Equal("status", t.Key);
+						Assert.Equal(expectedStatus, t.Value);
+					});
+			});
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/ScavengeTransactionTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ScavengeTransactionTests.cs
new file mode 100644
index 00000000000..a2a8aeb7a7f
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ScavengeTransactionTests.cs
@@ -0,0 +1,187 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.TransactionLog.Scavenging;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.InMemory;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class ScavengeTransactionTests {
+	class MockTransactionFactory : ITransactionFactory<int> {
+		public int BeginCount { get; private set; }
+		public int CommitCount { get; private set; }
+		public int RollbackCount { get; private set; }
+
+		public int Begin() {
+			return BeginCount++;
+		}
+
+		public void Commit(int transaction) {
+			CommitCount++;
+		}
+
+		public void Rollback(int transaction) {
+			RollbackCount++;
+		}
+	}
+
+	[Fact]
+	public void can_commit_then_begin() {
+		var storage = new InMemoryScavengeMap<Unit, ScavengeCheckpoint>();
+		var backend = new MockTransactionFactory();
+		var sut = new TransactionManager<int>(backend, storage);
+
+		var expectedCheckpoint = new ScavengeCheckpoint.Accumulating(
+			new ScavengePoint(default, default, default, default),
+			5);
+
+		Assert.Equal(0, backend.BeginCount);
+		Assert.Equal(0, backend.CommitCount);
+		Assert.Equal(0, backend.RollbackCount);
+
+		sut.Begin();
+
+		Assert.Equal(1, backend.BeginCount);
+		Assert.Equal(0, backend.CommitCount);
+		Assert.Equal(0, backend.RollbackCount);
+
+		sut.Commit(expectedCheckpoint);
+		Assert.True(storage.TryGetValue(Unit.Instance, out var actualCheckpoint));
+		Assert.Equal(expectedCheckpoint, actualCheckpoint);
+
+		Assert.Equal(1, backend.BeginCount);
+		Assert.Equal(1, backend.CommitCount);
+		Assert.Equal(0, backend.RollbackCount);
+
+		sut.Begin();
+
+		Assert.Equal(2, backend.BeginCount);
+		Assert.Equal(1, backend.CommitCount);
+		Assert.Equal(0, backend.RollbackCount);
+	}
+
+	[Fact]
+	public void can_rollback_then_begin() {
+		var backend = new MockTransactionFactory();
+		var sut = new TransactionManager<int>(
+			backend,
+			new InMemoryScavengeMap<Unit, ScavengeCheckpoint>());
+
+		Assert.Equal(0, backend.BeginCount);
+		Assert.Equal(0, backend.CommitCount);
+		Assert.Equal(0, backend.RollbackCount);
+
+		sut.Begin();
+
+		Assert.Equal(1, backend.BeginCount);
+		Assert.Equal(0, backend.CommitCount);
+		Assert.Equal(0, backend.RollbackCount);
+
+		sut.Rollback();
+
+		Assert.Equal(1, backend.BeginCount);
+		Assert.Equal(0, backend.CommitCount);
+		Assert.Equal(1, backend.RollbackCount);
+
+		sut.Begin();
+
+		Assert.Equal(2, backend.BeginCount);
+		Assert.Equal(0, backend.CommitCount);
+		Assert.Equal(1, backend.RollbackCount);
+	}
+
+	[Fact]
+	public void cannot_begin_twice() {
+		var sut = new TransactionManager<int>(
+			new MockTransactionFactory(),
+			new InMemoryScavengeMap<Unit, ScavengeCheckpoint>());
+
+		sut.Begin();
+
+		Assert.Throws<InvalidOperationException>(() => {
+			sut.Begin();
+		});
+	}
+
+	[Fact]
+	public void cannot_commit_twice() {
+		var sut = new TransactionManager<int>(
+			new MockTransactionFactory(),
+			new InMemoryScavengeMap<Unit, ScavengeCheckpoint>());
+
+		sut.Begin();
+		sut.Commit(null);
+
+		Assert.Throws<InvalidOperationException>(() => {
+			sut.Commit(null);
+		});
+	}
+
+	[Fact]
+	public void cannot_commit_then_rollback() {
+		var sut = new TransactionManager<int>(
+			new MockTransactionFactory(),
+			new InMemoryScavengeMap<Unit, ScavengeCheckpoint>());
+
+		sut.Begin();
+		sut.Commit(null);
+
+		Assert.Throws<InvalidOperationException>(() => {
+			sut.Rollback();
+		});
+	}
+
+	[Fact]
+	public void cannot_rollback_twice() {
+		var sut = new TransactionManager<int>(
+			new MockTransactionFactory(),
+			new InMemoryScavengeMap<Unit, ScavengeCheckpoint>());
+
+		sut.Begin();
+		sut.Rollback();
+
+		Assert.Throws<InvalidOperationException>(() => {
+			sut.Rollback();
+		});
+	}
+
+	[Fact]
+	public void cannot_rollback_then_commit() {
+		var sut = new TransactionManager<int>(
+			new MockTransactionFactory(),
+			new InMemoryScavengeMap<Unit, ScavengeCheckpoint>());
+
+		sut.Begin();
+		sut.Rollback();
+
+		Assert.Throws<InvalidOperationException>(() => {
+			sut.Commit(null);
+		});
+	}
+
+	[Fact]
+	public void cannot_commit_without_beginning() {
+		var sut = new TransactionManager<int>(
+			new MockTransactionFactory(),
+			new InMemoryScavengeMap<Unit, ScavengeCheckpoint>());
+
+		Assert.Throws<InvalidOperationException>(() => {
+			sut.Commit(null);
+		});
+	}
+
+	[Fact]
+	public void cannot_rollback_without_beginning() {
+		var sut = new TransactionManager<int>(
+			new MockTransactionFactory(),
+			new InMemoryScavengeMap<Unit, ScavengeCheckpoint>());
+
+		Assert.Throws<InvalidOperationException>(() => {
+			sut.Rollback();
+		});
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/ScavengedChunkReadingTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ScavengedChunkReadingTests.cs
new file mode 100644
index 00000000000..3d89297b50b
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ScavengedChunkReadingTests.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class ScavengedChunkReadingTests : SqliteDbPerTest<ScavengedChunkReadingTests> {
+	// This test produces a scavenged chunk that used to have a missing midpoint
+	// (and, like in all the scavenge tests, verifies all the records can be read from it)
+	// It turns out that the missing midpoint only made the midpoints less effective and did not cause
+	// incorrect reads. The midpoints are accessed twice in LocatePosRange, once to get the lower bound
+	// and once to get the upper bound.
+	// If we hit the missing midpoint while finding the upper bound it will push the upper bound higher.
+	// If we hit the missing midpoint while finding the lower bound it will set the lower bound to 0
+	// because that was the value of the missing midpoint.
+	// In both cases it makes the search wider.
+	[Fact]
+	public async Task missing_midpoint() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.SkipIndexCheck() // for speed
+			.WithDb(x => x
+				.Chunk([
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					..Enumerable.Range(0, 2738)
+						.Select(_ => Rec.Write(t++, "cd-1")),
+				])
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: SoftDelete),
+					ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => [
+				x.Recs[0][1..],
+				x.Recs[1],
+			]);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/SoftDeleteTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/SoftDeleteTests.cs
new file mode 100644
index 00000000000..79dcb55e77e
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/SoftDeleteTests.cs
@@ -0,0 +1,208 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.Scavenging;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class SoftDeleteTests : SqliteDbPerTest<SoftDeleteTests> {
+	[Fact]
+	public async Task undelete_when_soft_delete_across_chunk_boundary() {
+		// accumulation has to go up to the scavenge point and not stop at the end of the chunk
+		// before, otherwise we could accidentally scavenge the new stream.
+		// the important point is that the scavenge point can't 'appear' to be between the
+		// new records and the new metadata. this could cause problems any time
+		// the scavenge point operates as if it were in the middle of events supposed to be written
+		// transactionally.
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					// stream before deletion
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					// delete
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: SoftDelete),
+					// new write that undeletes the stream, but the metadata lands
+					// in the next chunk
+					Rec.Write(t++, "ab-1"))
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: TruncateBefore3),
+					ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(4),
+					x.Recs[1].KeepIndexes(0, 1),
+				});
+	}
+
+	[Fact]
+	public async Task simple_soft_delete() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: SoftDelete))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertState(state => {
+				Assert.False(state.TryGetOriginalStreamData("ab-1", out _));
+				Assert.False(state.TryGetMetastreamData("$$ab-1", out _));
+			})
+			.RunAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(2, 3), // keep the last event
+					x.Recs[1],
+				});
+	}
+
+	[Fact]
+	public async Task soft_delete_and_recreate() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: SoftDelete),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: TruncateBefore3))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(4, 5),
+					x.Recs[1],
+				});
+	}
+
+	[Fact]
+	public async Task can_recreate_soft_deleted_stream_after_scavenge() {
+		var t = 0;
+
+		// SP-0 scavenge
+		var scenario = new Scenario<LogFormat.V2, string>();
+		var db = await scenario
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					// stream before deletion
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					// delete
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: SoftDelete))
+				.Chunk(ScavengePointRec(t++)) // SP-0
+				.Chunk(
+					// recreate
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: TruncateBefore3))
+				.Chunk(ScavengePointRec(t++))) // SP-1
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.MutateState(x => {
+				// make it scavenge SP-0
+				x.SetCheckpoint(new ScavengeCheckpoint.Accumulating(
+					ScavengePoint(
+						chunk: 1,
+						eventNumber: 0),
+					doneLogicalChunkNumber: null));
+			})
+			.AssertTrace(
+				Tracer.Line("Accumulating from checkpoint: Accumulating SP-0 done None"),
+				Tracer.AnythingElse)
+			.AssertState(state => {
+				Assert.False(state.TryGetOriginalStreamData("ab-1", out _));
+				Assert.False(state.TryGetMetastreamData("$$ab-1", out _));
+			})
+			.RunAndKeepDbAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(2, 3),
+					x.Recs[1],
+					x.Recs[2],
+					x.Recs[3],
+				});
+
+		// SP-1 scavenge
+		await new Scenario<LogFormat.V2, string>()
+			.WithTracerFrom(scenario)
+			.WithDbPath(Fixture.Directory)
+			.WithDb(db)
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertTrace(
+				Tracer.Line("Accumulating from SP-0 to SP-1"),
+				Tracer.AnythingElse)
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(),
+				x.Recs[1],
+				x.Recs[2].KeepIndexes(0, 1),
+				x.Recs[3],
+			});
+	}
+
+	[Fact]
+	public async Task can_soft_delete_recreate_and_hard_delete() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					// soft delete
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: SoftDelete),
+					// recreate
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: TruncateBefore3),
+					// hard delete
+					Rec.CommittedDelete(t++, "ab-1"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(6),
+					x.Recs[1],
+				});
+	}
+
+	[Fact]
+	public async Task can_soft_delete_and_hard_delete() {
+		// this might not actually be supported by the database
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					// soft delete
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: SoftDelete),
+					// hard delete
+					Rec.CommittedDelete(t++, "ab-1"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(4),
+					x.Recs[1],
+				});
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteChunkTimeStampRangeScavengeMapTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteChunkTimeStampRangeScavengeMapTests.cs
new file mode 100644
index 00000000000..d19838b439e
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteChunkTimeStampRangeScavengeMapTests.cs
@@ -0,0 +1,113 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+
+public class SqliteChunkTimeStampRangeScavengeMapTests : SqliteDbPerTest<SqliteChunkTimeStampRangeScavengeMapTests> {
+
+	[Fact]
+	public void can_set_chunk_time_stamp_range() {
+		var sut = new SqliteChunkTimeStampRangeScavengeMap();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var data = new ChunkTimeStampRange(Min: DateTime.Now, DateTime.Now.AddDays(1));
+
+		sut[33] = data;
+
+		Assert.True(sut.TryGetValue(33, out var v));
+		Assert.Equal(data, v);
+	}
+
+	[Fact]
+	public void can_overwrite_existing() {
+		var sut = new SqliteChunkTimeStampRangeScavengeMap();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		sut[33] = new ChunkTimeStampRange(Min: DateTime.Now, DateTime.Now.AddDays(1));
+
+		var data = new ChunkTimeStampRange(Min: DateTime.Now.AddDays(1), DateTime.Now.AddDays(2));
+
+		sut[33] = data;
+
+		Assert.True(sut.TryGetValue(33, out var v));
+		Assert.Equal(data, v);
+	}
+
+	[Fact]
+	public void can_get_all_records() {
+		var sut = new SqliteChunkTimeStampRangeScavengeMap();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var osd = GetChunkTimeStampRangeTestData();
+
+		sut[0] = osd[0];
+		sut[1] = osd[1];
+		sut[2] = osd[2];
+		sut[3] = osd[3];
+		sut[4] = osd[4];
+
+		Assert.Collection(sut.AllRecords(),
+			item => {
+				Assert.Equal(0, item.Key);
+				Assert.Equal(osd[0], item.Value);
+			},
+			item => {
+				Assert.Equal(1, item.Key);
+				Assert.Equal(osd[1], item.Value);
+			},
+			item => {
+				Assert.Equal(2, item.Key);
+				Assert.Equal(osd[2], item.Value);
+			},
+			item => {
+				Assert.Equal(3, item.Key);
+				Assert.Equal(osd[3], item.Value);
+			},
+			item => {
+				Assert.Equal(4, item.Key);
+				Assert.Equal(osd[4], item.Value);
+			});
+	}
+
+	[Fact]
+	public void can_remove_value_from_map() {
+		var sut = new SqliteChunkTimeStampRangeScavengeMap();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var osd = GetChunkTimeStampRangeTestData();
+
+		sut[33] = osd[0];
+		sut[1] = osd[1];
+
+		Assert.True(sut.TryGetValue(33, out _));
+		Assert.True(sut.TryRemove(33, out var removedValue));
+		Assert.Equal(osd[0], removedValue);
+		Assert.False(sut.TryGetValue(33, out _));
+
+		Assert.True(sut.TryGetValue(1, out var v));
+		Assert.Equal(osd[1], v);
+	}
+
+	[Fact]
+	public void can_try_remove_value_from_map() {
+		var sut = new SqliteChunkTimeStampRangeScavengeMap();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		Assert.False(sut.TryRemove(33, out _));
+	}
+
+	private ChunkTimeStampRange[] GetChunkTimeStampRangeTestData() {
+		return new[] {
+			new ChunkTimeStampRange(Min: DateTime.MinValue, DateTime.UtcNow.AddDays(2)),
+			new ChunkTimeStampRange(Min: DateTime.UtcNow.AddDays(2), DateTime.UtcNow.AddDays(3)),
+			new ChunkTimeStampRange(Min: DateTime.UtcNow.AddDays(3), DateTime.UtcNow.AddDays(4)),
+			new ChunkTimeStampRange(Min: DateTime.UtcNow.AddDays(4), DateTime.UtcNow.AddDays(5)),
+			new ChunkTimeStampRange(Min: DateTime.UtcNow.AddDays(5), DateTime.MaxValue)
+		};
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteChunkWeightScavengeMapTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteChunkWeightScavengeMapTests.cs
new file mode 100644
index 00000000000..36b221d418d
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteChunkWeightScavengeMapTests.cs
@@ -0,0 +1,116 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+
+public class SqliteChunkWeightScavengeMapTests : SqliteDbPerTest<SqliteChunkWeightScavengeMapTests> {
+
+	[Fact]
+	public void can_increase_existing_chunk_weight() {
+		var sut = new SqliteChunkWeightScavengeMap();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		sut[3] = 0.5f;
+
+		sut.IncreaseWeight(3, 0.1f);
+
+		Assert.True(sut.TryGetValue(3, out var v1));
+		Assert.Equal(0.6f, v1);
+	}
+
+	[Fact]
+	public void can_decrease_existing_chunk_weight() {
+		var sut = new SqliteChunkWeightScavengeMap();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		sut[3] = 0.5f;
+
+		sut.IncreaseWeight(3, -0.1f);
+
+		Assert.True(sut.TryGetValue(3, out var v));
+		Assert.Equal(0.4f, v);
+	}
+
+	[Fact]
+	public void can_increase_non_existing_chunk_weight() {
+		var sut = new SqliteChunkWeightScavengeMap();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		sut.IncreaseWeight(13, 0.33f);
+
+		Assert.True(sut.TryGetValue(13, out var v));
+		Assert.Equal(0.33f, v);
+	}
+
+	[Fact]
+	public void can_see_if_all_weights_zero_false() {
+		var sut = new SqliteChunkWeightScavengeMap();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+		sut[2] = 0.1f;
+		sut[4] = -0.1f;
+		Assert.False(sut.AllWeightsAreZero());
+	}
+
+	[Fact]
+	public void can_see_if_all_weights_zero_true() {
+		var sut = new SqliteChunkWeightScavengeMap();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+		sut[2] = 0.0f;
+		Assert.True(sut.AllWeightsAreZero());
+	}
+
+	[Fact]
+	public void can_see_if_all_weights_zero_true_empty() {
+		var sut = new SqliteChunkWeightScavengeMap();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+		Assert.True(sut.AllWeightsAreZero());
+	}
+
+	[Fact]
+	public void can_sum_chunk_weights() {
+		var sut = new SqliteChunkWeightScavengeMap();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		sut[0] = 0.1f;
+		sut[1] = 0.1f;
+		sut[2] = 0.1f;
+		sut[3] = 0.1f;
+		sut[4] = 0.1f;
+
+		var value = sut.SumChunkWeights(1, 3);
+
+		Assert.Equal(0.3f, value);
+	}
+
+	[Fact]
+	public void can_sum_non_existing_chunk_weights() {
+		var sut = new SqliteChunkWeightScavengeMap();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var value = sut.SumChunkWeights(1, 3);
+
+		Assert.Equal(0.0f, value);
+	}
+
+	[Fact]
+	public void can_reset_chunk_weights() {
+		var sut = new SqliteChunkWeightScavengeMap();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		sut[0] = 0.1f;
+		sut[1] = 0.1f;
+		sut[2] = 0.1f;
+		sut[3] = 0.1f;
+		sut[4] = 0.1f;
+
+		sut.ResetChunkWeights(1, 3);
+
+		Assert.Collection(sut.AllRecords(),
+			item => Assert.Equal(new KeyValuePair<int, float>(0, 0.1f), item),
+			item => Assert.Equal(new KeyValuePair<int, float>(4, 0.1f), item));
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteCollisionScavengeMapTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteCollisionScavengeMapTests.cs
new file mode 100644
index 00000000000..6c4454b7cf7
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteCollisionScavengeMapTests.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+
+public class SqliteCollisionScavengeMapTests : SqliteDbPerTest<SqliteCollisionScavengeMapTests> {
+
+	[Fact]
+	public void can_set_value() {
+		var sut = new SqliteCollisionScavengeMap<int>();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		sut[33] = Unit.Instance;
+
+		Assert.True(sut.TryGetValue(33, out var v));
+		Assert.Equal(Unit.Instance, v);
+	}
+
+	[Fact]
+	public void can_overwrite_value() {
+		var sut = new SqliteCollisionScavengeMap<string>();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		sut["33"] = Unit.Instance;
+		sut["33"] = Unit.Instance;
+
+		Assert.True(sut.TryGetValue("33", out var v));
+		Assert.Equal(Unit.Instance, v);
+	}
+
+	[Fact]
+	public void can_get_all_records() {
+		var sut = new SqliteCollisionScavengeMap<int>();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		sut[0] = Unit.Instance;
+		sut[1] = Unit.Instance;
+		sut[2] = Unit.Instance;
+		sut[3] = Unit.Instance;
+		sut[4] = Unit.Instance;
+
+		Assert.Collection(sut.AllRecords(),
+			item => Assert.Equal(new KeyValuePair<int, Unit>(0, Unit.Instance), item),
+			item => Assert.Equal(new KeyValuePair<int, Unit>(1, Unit.Instance), item),
+			item => Assert.Equal(new KeyValuePair<int, Unit>(2, Unit.Instance), item),
+			item => Assert.Equal(new KeyValuePair<int, Unit>(3, Unit.Instance), item),
+			item => Assert.Equal(new KeyValuePair<int, Unit>(4, Unit.Instance), item));
+	}
+
+	[Fact]
+	public void can_try_get_value_of_non_existing() {
+		var sut = new SqliteCollisionScavengeMap<int>();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		Assert.False(sut.TryGetValue(33, out var v));
+		Assert.Equal(default, v);
+	}
+
+	[Fact]
+	public void can_remove_value() {
+		var sut = new SqliteCollisionScavengeMap<int>();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		sut[0] = Unit.Instance;
+
+		Assert.True(sut.TryRemove(0, out var v));
+		Assert.Equal(Unit.Instance, v);
+	}
+
+	[Fact]
+	public void can_try_remove_value() {
+		var sut = new SqliteCollisionScavengeMap<string>();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		Assert.False(sut.TryRemove("0", out var v));
+		Assert.Equal(default, v);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteDbFixture.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteDbFixture.cs
new file mode 100644
index 00000000000..acdd1ca49c3
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteDbFixture.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Threading.Tasks;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.TransactionLog.Chunks;
+using Microsoft.Data.Sqlite;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+
+public class SqliteDbFixture<T> : IAsyncLifetime {
+	private readonly string _connectionString;
+
+	public SqliteConnection DbConnection { get; set; }
+	public ObjectPool<SqliteConnection> DbConnectionPool { get; set; }
+
+	public string Directory { get; }
+
+	public SqliteDbFixture(string dir) {
+		Directory = dir;
+		var fileName = typeof(T).Name + ".db";
+		var connectionStringBuilder = new SqliteConnectionStringBuilder();
+		connectionStringBuilder.Pooling = false; // prevents the db files from being locked
+		connectionStringBuilder.DataSource = Path.Combine(dir, fileName);
+		_connectionString = connectionStringBuilder.ConnectionString;
+	}
+
+	public Task InitializeAsync() {
+		DbConnection = new SqliteConnection(_connectionString);
+		DbConnectionPool = new ObjectPool<SqliteConnection>(
+			objectPoolName: "sqlite connections",
+			initialCount: 0,
+			maxCount: TFChunkScavenger.MaxThreadCount + 1,
+			factory: () => {
+				var dbConnection = new SqliteConnection(_connectionString);
+				dbConnection.Open();
+				return dbConnection;
+			},
+			dispose: dbConnection => {
+				dbConnection.Close();
+				dbConnection.Dispose();
+			});
+		return DbConnection.OpenAsync();
+	}
+
+	public Task DisposeAsync() {
+		DbConnection.Close();
+		DbConnection.Dispose();
+		DbConnectionPool.Dispose();
+		return Task.CompletedTask;
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteDbPerTest.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteDbPerTest.cs
new file mode 100644
index 00000000000..ed878ec1cb5
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteDbPerTest.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+
+public class SqliteDbPerTest<T> : IAsyncLifetime {
+	protected SqliteDbFixture<T> Fixture { get; }
+	private DirectoryFixture<T> DirFixture { get; }
+
+	public SqliteDbPerTest() {
+		DirFixture = new DirectoryFixture<T>();
+		Fixture = new SqliteDbFixture<T>(DirFixture.Directory);
+	}
+
+	public async Task InitializeAsync() {
+		await DirFixture.InitializeAsync();
+		await Fixture.InitializeAsync();
+	}
+
+	public async Task DisposeAsync() {
+		await Fixture.DisposeAsync();
+		await DirFixture.DisposeAsync();
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteMetastreamScavengeMapTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteMetastreamScavengeMapTests.cs
new file mode 100644
index 00000000000..51fde99695f
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteMetastreamScavengeMapTests.cs
@@ -0,0 +1,186 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+
+public class SqliteMetastreamScavengeMapTests : SqliteDbPerTest<SqliteMetastreamScavengeMapTests> {
+
+	[Fact]
+	public void can_set_metastream_data() {
+		var sut = new SqliteMetastreamScavengeMap<ulong>("SetData");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var data = new MetastreamData(isTombstoned: true, DiscardPoint.DiscardIncluding(5));
+
+		sut[33] = data;
+
+		Assert.True(sut.TryGetValue(33, out var v));
+		Assert.Equal(data, v);
+	}
+
+	[Fact]
+	public void can_overwrite_existing() {
+		var sut = new SqliteMetastreamScavengeMap<ulong>("Overwrite");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		sut[33] = new MetastreamData(isTombstoned: true, DiscardPoint.DiscardIncluding(5));
+
+		var data = new MetastreamData(isTombstoned: false, DiscardPoint.DiscardIncluding(15));
+
+		sut[33] = data;
+
+		Assert.True(sut.TryGetValue(33, out var v));
+		Assert.Equal(data, v);
+	}
+
+	[Fact]
+	public void can_set_tombstone_of_existing() {
+		var sut = new SqliteMetastreamScavengeMap<ulong>("TombstoneSetExisting");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var data = new MetastreamData(isTombstoned: false, DiscardPoint.DiscardIncluding(5));
+
+		sut[33] = data;
+
+		sut.SetTombstone(33);
+		data = new MetastreamData(isTombstoned: true, data.DiscardPoint);
+
+		Assert.True(sut.TryGetValue(33, out var v));
+		Assert.Equal(data, v);
+	}
+
+	[Fact]
+	public void can_set_tombstone_of_non_existing() {
+		var sut = new SqliteMetastreamScavengeMap<ulong>("TombstoneSetNonExisting");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		sut.SetTombstone(33);
+
+		Assert.True(sut.TryGetValue(33, out var v));
+		Assert.Equal(new MetastreamData(isTombstoned: true, DiscardPoint.KeepAll), v);
+	}
+
+	[Fact]
+	public void can_set_discard_point_of_existing() {
+		var sut = new SqliteMetastreamScavengeMap<ulong>("DiscardPointExisting");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var data = new MetastreamData(isTombstoned: false, DiscardPoint.DiscardIncluding(5));
+		sut[33] = data;
+
+		var discardPoint = DiscardPoint.DiscardIncluding(55);
+		sut.SetDiscardPoint(33, discardPoint);
+
+		Assert.True(sut.TryGetValue(33, out var v));
+		Assert.Equal(data.IsTombstoned, v.IsTombstoned);
+		Assert.Equal(discardPoint, v.DiscardPoint);
+	}
+
+	[Fact]
+	public void can_set_discard_point_of_non_existing() {
+		var sut = new SqliteMetastreamScavengeMap<ulong>("DiscardPointNonExisting");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var discardPoint = DiscardPoint.DiscardIncluding(12);
+		sut.SetDiscardPoint(33, discardPoint);
+
+		Assert.True(sut.TryGetValue(33, out var v));
+		Assert.False(v.IsTombstoned);
+		Assert.Equal(discardPoint, v.DiscardPoint);
+	}
+
+	[Fact]
+	public void can_get_all_records() {
+		var sut = new SqliteMetastreamScavengeMap<ulong>("EnumerateAll");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var osd = GetMetastreamTestData();
+
+		sut[0] = osd[0];
+		sut[1] = osd[1];
+		sut[2] = osd[2];
+		sut[3] = osd[3];
+		sut[4] = osd[4];
+
+		Assert.Collection(sut.AllRecords(),
+			item => {
+				Assert.Equal(0ul, item.Key);
+				Assert.Equal(osd[0], item.Value);
+			},
+			item => {
+				Assert.Equal(1ul, item.Key);
+				Assert.Equal(osd[1], item.Value);
+			},
+			item => {
+				Assert.Equal(2ul, item.Key);
+				Assert.Equal(osd[2], item.Value);
+			},
+			item => {
+				Assert.Equal(3ul, item.Key);
+				Assert.Equal(osd[3], item.Value);
+			},
+			item => {
+				Assert.Equal(4ul, item.Key);
+				Assert.Equal(osd[4], item.Value);
+			});
+	}
+
+	[Fact]
+	public void can_remove_value_from_map() {
+		var sut = new SqliteMetastreamScavengeMap<ulong>("Remove");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var osd = GetMetastreamTestData();
+
+		sut[33] = osd[0];
+		sut[1] = osd[1];
+
+		Assert.True(sut.TryGetValue(33, out _));
+		Assert.True(sut.TryRemove(33, out var removedValue));
+		Assert.Equal(osd[0], removedValue);
+		Assert.False(sut.TryGetValue(33, out _));
+
+		Assert.True(sut.TryGetValue(1, out var v));
+		Assert.Equal(osd[1], v);
+	}
+
+	[Fact]
+	public void can_try_remove_value_from_map() {
+		var sut = new SqliteMetastreamScavengeMap<ulong>("OriginalStreamScavengeMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		Assert.False(sut.TryRemove(33, out _));
+	}
+
+	[Fact]
+	public void can_remove_all() {
+		var sut = new SqliteMetastreamScavengeMap<ulong>("EnumerateAll");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var osd = GetMetastreamTestData();
+
+		sut[0] = osd[0];
+		sut[1] = osd[1];
+		sut[2] = osd[2];
+		sut[3] = osd[3];
+		sut[4] = osd[4];
+
+		sut.DeleteAll();
+
+		Assert.Empty(sut.AllRecords());
+	}
+
+	private MetastreamData[] GetMetastreamTestData() {
+		return new[] {
+			new MetastreamData(isTombstoned: false, DiscardPoint.DiscardIncluding(5)),
+			new MetastreamData(isTombstoned: false, DiscardPoint.DiscardIncluding(50)),
+			new MetastreamData(isTombstoned: true, DiscardPoint.DiscardIncluding(15)),
+			new MetastreamData(isTombstoned: false, DiscardPoint.DiscardIncluding(25)),
+			new MetastreamData(isTombstoned: true, DiscardPoint.DiscardIncluding(53))
+		};
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteOriginalStreamScavengeMapTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteOriginalStreamScavengeMapTests.cs
new file mode 100644
index 00000000000..a9c8d809f09
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteOriginalStreamScavengeMapTests.cs
@@ -0,0 +1,529 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+
+public class SqliteOriginalStreamScavengeMapTests : SqliteDbPerTest<SqliteOriginalStreamScavengeMapTests> {
+
+	[Fact]
+	public void can_set_original_stream_data() {
+		var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var data = new OriginalStreamData {
+			DiscardPoint = DiscardPoint.DiscardIncluding(5),
+			IsTombstoned = true,
+			MaxAge = TimeSpan.FromDays(13),
+			MaxCount = 33,
+			MaybeDiscardPoint = DiscardPoint.DiscardBefore(long.MaxValue - 1),
+			TruncateBefore = 43,
+			Status = CalculationStatus.Archived
+		};
+
+		sut[33] = data;
+
+		Assert.True(sut.TryGetValue(33, out var v));
+		Assert.Equal(data, v, OriginalStreamDataComparer.Default);
+	}
+
+	[Fact]
+	public void can_overwrite_existing() {
+		var sut = new SqliteOriginalStreamScavengeMap<int>("OverwriteOriginalStreamScavengeMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		sut[33] = new OriginalStreamData {
+			DiscardPoint = DiscardPoint.DiscardIncluding(5),
+			IsTombstoned = true,
+			MaxAge = TimeSpan.FromDays(13),
+			MaxCount = 33,
+			MaybeDiscardPoint = DiscardPoint.DiscardBefore(long.MaxValue - 1),
+			TruncateBefore = 43,
+			Status = CalculationStatus.Active
+		};
+
+		var data = new OriginalStreamData {
+			DiscardPoint = DiscardPoint.DiscardIncluding(50),
+			IsTombstoned = true,
+			MaxAge = TimeSpan.FromDays(30),
+			MaxCount = 303,
+			MaybeDiscardPoint = DiscardPoint.DiscardBefore(long.MaxValue - 100),
+			TruncateBefore = 430,
+			Status = CalculationStatus.Archived
+		};
+
+		sut[33] = data;
+
+		Assert.True(sut.TryGetValue(33, out var v));
+		Assert.Equal(data, v, OriginalStreamDataComparer.Default);
+	}
+
+	[Fact]
+	public void can_set_tombstone_of_existing() {
+		var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var data = new OriginalStreamData {
+			DiscardPoint = DiscardPoint.DiscardIncluding(5),
+			MaxAge = TimeSpan.FromDays(13),
+			MaxCount = 33,
+			MaybeDiscardPoint = DiscardPoint.DiscardBefore(12),
+			TruncateBefore = 43,
+			Status = CalculationStatus.Archived
+		};
+
+		sut[33] = data;
+
+		sut.SetTombstone(33);
+		data.IsTombstoned = true;
+		data.Status = CalculationStatus.Active;
+
+		Assert.True(sut.TryGetValue(33, out var v));
+		Assert.Equal(data, v, OriginalStreamDataComparer.Default);
+	}
+
+	[Fact]
+	public void can_set_tombstone_of_non_existing() {
+		var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		sut.SetTombstone(33);
+
+		Assert.True(sut.TryGetValue(33, out var v));
+		Assert.Equal(new OriginalStreamData {
+			IsTombstoned = true,
+			Status = CalculationStatus.Active
+		}, v, OriginalStreamDataComparer.Default);
+	}
+
+	[Fact]
+	public void can_set_stream_metadata_of_existing() {
+		var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var data = new OriginalStreamData() {
+			DiscardPoint = DiscardPoint.DiscardIncluding(5),
+			MaybeDiscardPoint = DiscardPoint.DiscardBefore(12),
+			Status = CalculationStatus.Archived
+		};
+
+		sut[33] = data;
+
+		var metadata = new StreamMetadata(
+			maxAge: TimeSpan.FromDays(13),
+			maxCount: 33,
+			truncateBefore: 43);
+
+		sut.SetMetadata(33, metadata);
+		data.MaxAge = metadata.MaxAge;
+		data.MaxCount = metadata.MaxCount;
+		data.TruncateBefore = metadata.TruncateBefore;
+		data.Status = CalculationStatus.Active;
+
+		Assert.True(sut.TryGetValue(33, out var v));
+		Assert.Equal(data, v, OriginalStreamDataComparer.Default);
+	}
+
+	[Fact]
+	public void can_set_stream_metadata_without_max_age() {
+		var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var metadata = new StreamMetadata(
+			maxCount: 33,
+			truncateBefore: 43);
+
+		sut.SetMetadata(33, metadata);
+
+		Assert.True(sut.TryGetValue(33, out var v));
+		Assert.Equal(new OriginalStreamData() {
+			MaxCount = metadata.MaxCount,
+			TruncateBefore = metadata.TruncateBefore,
+			Status = CalculationStatus.Active
+		}, v, OriginalStreamDataComparer.Default);
+	}
+
+	[Fact]
+	public void can_set_stream_metadata_without_max_count() {
+		var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var metadata = new StreamMetadata(
+			maxAge: TimeSpan.FromDays(13),
+			truncateBefore: 43);
+
+		sut.SetMetadata(33, metadata);
+
+		Assert.True(sut.TryGetValue(33, out var v));
+		Assert.Equal(new OriginalStreamData() {
+			MaxAge = metadata.MaxAge,
+			TruncateBefore = metadata.TruncateBefore,
+			Status = CalculationStatus.Active
+		}, v, OriginalStreamDataComparer.Default);
+	}
+
+	[Fact]
+	public void can_set_stream_metadata_without_truncating() {
+		var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var metadata = new StreamMetadata(
+			maxAge: TimeSpan.FromDays(13),
+			maxCount: 33);
+
+		sut.SetMetadata(33, metadata);
+
+		Assert.True(sut.TryGetValue(33, out var v));
+		Assert.Equal(new OriginalStreamData() {
+			MaxAge = metadata.MaxAge,
+			MaxCount = metadata.MaxCount,
+			Status = CalculationStatus.Active
+		}, v, OriginalStreamDataComparer.Default);
+	}
+
+	[Fact]
+	public void can_set_stream_metadata_of_non_existing() {
+		var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var metadata = new StreamMetadata(
+			maxAge: TimeSpan.FromDays(13),
+			maxCount: 33,
+			truncateBefore: 43);
+
+		sut.SetMetadata(33, metadata);
+
+		Assert.True(sut.TryGetValue(33, out var v));
+		Assert.Equal(new OriginalStreamData() {
+			MaxAge = metadata.MaxAge,
+			MaxCount = metadata.MaxCount,
+			TruncateBefore = metadata.TruncateBefore,
+			Status = CalculationStatus.Active
+		}, v, OriginalStreamDataComparer.Default);
+	}
+
+	[Fact]
+	public void can_set_discard_points_of_existing() {
+		var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var data = new OriginalStreamData() {
+			MaxAge = TimeSpan.FromDays(13),
+			MaxCount = 33,
+			TruncateBefore = 43,
+		};
+
+		sut[33] = data;
+
+		data.Status = CalculationStatus.Spent;
+		data.DiscardPoint = DiscardPoint.DiscardIncluding(5);
+		data.MaybeDiscardPoint = DiscardPoint.DiscardIncluding(12);
+		sut.SetDiscardPoints(33, data.Status, data.DiscardPoint, data.MaybeDiscardPoint);
+
+		Assert.True(sut.TryGetValue(33, out var v));
+		Assert.Equal(data, v, OriginalStreamDataComparer.Default);
+	}
+
+	[Fact]
+	public void can_set_discard_points_of_non_existing() {
+		var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var discardPoint = DiscardPoint.DiscardIncluding(5);
+		var maybeDiscardPoint = DiscardPoint.DiscardIncluding(12);
+		sut.SetDiscardPoints(33, CalculationStatus.Archived, discardPoint, maybeDiscardPoint);
+
+		Assert.True(sut.TryGetValue(33, out var v));
+		Assert.Equal(new OriginalStreamData() {
+			DiscardPoint = discardPoint,
+			MaybeDiscardPoint = maybeDiscardPoint,
+			Status = CalculationStatus.Archived
+		}, v, OriginalStreamDataComparer.Default);
+	}
+
+	[Fact]
+	public void can_get_chunk_execution_info() {
+		var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var data = new OriginalStreamData() {
+			DiscardPoint = DiscardPoint.DiscardIncluding(5),
+			MaybeDiscardPoint = DiscardPoint.DiscardIncluding(43),
+			MaxAge = TimeSpan.FromDays(13),
+			IsTombstoned = true
+		};
+
+		sut[33] = data;
+
+		Assert.True(sut.TryGetChunkExecutionInfo(33, out var v));
+		Assert.Equal(new ChunkExecutionInfo(
+			data.IsTombstoned,
+			data.DiscardPoint,
+			data.MaybeDiscardPoint,
+			data.MaxAge), v);
+	}
+
+	[Fact]
+	public void can_try_get_chunk_execution_info_when_only_tombstoned() {
+		var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		sut.SetTombstone(33);
+
+		Assert.True(sut.TryGetChunkExecutionInfo(33, out var v));
+		Assert.True(v.IsTombstoned);
+		Assert.Null(v.MaxAge);
+		Assert.Equal(DiscardPoint.KeepAll, v.DiscardPoint);
+		Assert.Equal(DiscardPoint.KeepAll, v.MaybeDiscardPoint);
+	}
+
+	[Fact]
+	public void can_try_get_chunk_execution_info_of_non_existing() {
+		var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		Assert.False(sut.TryGetChunkExecutionInfo(33, out var v));
+		Assert.Equal(default, v);
+	}
+
+	[Fact]
+	public void can_get_all_records() {
+		var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var osd = GetOriginalStreamTestData();
+
+		sut[0] = osd[0];
+		sut[1] = osd[1];
+		sut[2] = osd[2];
+		sut[3] = osd[3];
+		sut[4] = osd[4];
+
+		Assert.Collection(sut.AllRecords(),
+			item => {
+				Assert.Equal(0, item.Key);
+				Assert.Equal(osd[0], item.Value, OriginalStreamDataComparer.Default);
+			},
+			item => {
+				Assert.Equal(1, item.Key);
+				Assert.Equal(osd[1], item.Value, OriginalStreamDataComparer.Default);
+			},
+			item => {
+				Assert.Equal(2, item.Key);
+				Assert.Equal(osd[2], item.Value, OriginalStreamDataComparer.Default);
+			},
+			item => {
+				Assert.Equal(3, item.Key);
+				Assert.Equal(osd[3], item.Value, OriginalStreamDataComparer.Default);
+			},
+			item => {
+				Assert.Equal(4, item.Key);
+				Assert.Equal(osd[4], item.Value, OriginalStreamDataComparer.Default);
+			});
+	}
+
+	[Fact]
+	public void can_get_active_records() {
+		var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var osd = GetOriginalStreamTestData();
+
+		osd[0].Status = CalculationStatus.Archived;
+		osd[1].Status = CalculationStatus.Spent;
+		osd[2].Status = CalculationStatus.Active;
+		osd[3].Status = CalculationStatus.Active;
+		osd[4].Status = CalculationStatus.None;
+
+		sut[0] = osd[0];
+		sut[1] = osd[1];
+		sut[2] = osd[2];
+		sut[3] = osd[3];
+		sut[4] = osd[4];
+
+		Assert.Collection(sut.ActiveRecords(),
+			item => {
+				Assert.Equal(2, item.Key);
+				Assert.Equal(osd[2], item.Value, OriginalStreamDataComparer.Default);
+			},
+			item => {
+				Assert.Equal(3, item.Key);
+				Assert.Equal(osd[3], item.Value, OriginalStreamDataComparer.Default);
+			});
+	}
+
+	[Fact]
+	public void can_get_all_active_records_from_checkpoint() {
+		var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var osd = GetOriginalStreamTestData();
+
+		osd[0].Status = CalculationStatus.Active;
+		osd[1].Status = CalculationStatus.Active;
+		osd[2].Status = CalculationStatus.Active;
+		osd[3].Status = CalculationStatus.Active;
+		osd[4].Status = CalculationStatus.Archived;
+
+		sut[0] = osd[0];
+		sut[1] = osd[1];
+		sut[2] = osd[2];
+		sut[3] = osd[3];
+		sut[4] = osd[4];
+
+		Assert.Collection(sut.ActiveRecordsFromCheckpoint(1),
+			item => {
+				Assert.Equal(2, item.Key);
+				Assert.Equal(osd[2], item.Value, OriginalStreamDataComparer.Default);
+			},
+			item => {
+				Assert.Equal(3, item.Key);
+				Assert.Equal(osd[3], item.Value, OriginalStreamDataComparer.Default);
+			});
+	}
+
+	[Fact]
+	public void can_remove_value_from_map() {
+		var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var osd = GetOriginalStreamTestData();
+
+		sut[33] = osd[0];
+		sut[1] = osd[1];
+
+		Assert.True(sut.TryGetValue(33, out _));
+		Assert.True(sut.TryRemove(33, out var removedValue));
+		Assert.Equal(osd[0], removedValue, OriginalStreamDataComparer.Default);
+		Assert.False(sut.TryGetValue(33, out _));
+
+		Assert.True(sut.TryGetValue(1, out var v));
+		Assert.Equal(osd[1], v, OriginalStreamDataComparer.Default);
+	}
+
+	[Fact]
+	public void can_try_remove_value_from_map() {
+		var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		Assert.False(sut.TryRemove(33, out _));
+	}
+
+	[Fact]
+	public void can_remove_multiple_records_at_once() {
+		var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var osd = GetOriginalStreamTestData();
+
+		osd[0].Status = CalculationStatus.Archived;
+		osd[1].Status = CalculationStatus.Spent;
+		osd[2].Status = CalculationStatus.Spent;
+		osd[3].Status = CalculationStatus.Active;
+		osd[4].Status = CalculationStatus.Archived;
+
+		sut[0] = osd[0];
+		sut[1] = osd[1];
+		sut[2] = osd[2];
+		sut[3] = osd[3];
+		sut[4] = osd[4];
+
+		sut.DeleteMany(deleteArchived: false);
+
+		Assert.Collection(sut.AllRecords(),
+			item => { Assert.Equal(CalculationStatus.Archived, item.Value.Status); },
+			item => { Assert.Equal(CalculationStatus.Active, item.Value.Status); },
+			item => { Assert.Equal(CalculationStatus.Archived, item.Value.Status); });
+	}
+
+	[Fact]
+	public void can_remove_multiple_records_at_once_including_archived() {
+		var sut = new SqliteOriginalStreamScavengeMap<int>("OriginalStreamScavengeMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var osd = GetOriginalStreamTestData();
+
+		osd[0].Status = CalculationStatus.Archived;
+		osd[1].Status = CalculationStatus.Spent;
+		osd[2].Status = CalculationStatus.Spent;
+		osd[3].Status = CalculationStatus.Active;
+		osd[4].Status = CalculationStatus.Archived;
+
+		sut[0] = osd[0];
+		sut[1] = osd[1];
+		sut[2] = osd[2];
+		sut[3] = osd[3];
+		sut[4] = osd[4];
+
+		sut.DeleteMany(deleteArchived: true);
+
+		Assert.Collection(sut.AllRecords(),
+			item => { Assert.Equal(CalculationStatus.Active, item.Value.Status); });
+	}
+
+	private OriginalStreamData[] GetOriginalStreamTestData() {
+		return new[] {
+			new OriginalStreamData() {
+				IsTombstoned = false,
+				MaxAge = TimeSpan.FromDays(3),
+				MaxCount = 10,
+				TruncateBefore = 1
+			},
+			new OriginalStreamData() {
+				DiscardPoint = DiscardPoint.DiscardBefore(10),
+				IsTombstoned = true,
+				MaxAge = TimeSpan.FromDays(3),
+				MaxCount = 100,
+				TruncateBefore = 13,
+				MaybeDiscardPoint = DiscardPoint.DiscardBefore(21)
+			},
+			new OriginalStreamData() {
+				DiscardPoint = DiscardPoint.DiscardBefore(20),
+				MaxAge = TimeSpan.FromHours(12),
+				MaybeDiscardPoint = DiscardPoint.DiscardBefore(21)
+			},
+			new OriginalStreamData() {
+				DiscardPoint = DiscardPoint.DiscardBefore(10),
+				IsTombstoned = true,
+				MaxAge = TimeSpan.FromDays(33),
+				TruncateBefore = 11,
+			},
+			new OriginalStreamData() {
+				DiscardPoint = DiscardPoint.DiscardBefore(300),
+				MaxAge = TimeSpan.FromDays(300),
+				MaxCount = 1000,
+				TruncateBefore = 1333,
+				MaybeDiscardPoint = DiscardPoint.DiscardBefore(500)
+			}
+		};
+	}
+
+	public class OriginalStreamDataComparer : IEqualityComparer<OriginalStreamData> {
+
+		public static readonly OriginalStreamDataComparer Default = new OriginalStreamDataComparer();
+
+		public bool Equals(OriginalStreamData x, OriginalStreamData y) {
+			if (x is null || y is null) {
+				return false;
+			}
+
+			return x.MaxCount == y.MaxCount &&
+				   x.MaxAge == y.MaxAge &&
+				   x.TruncateBefore == y.TruncateBefore &&
+				   x.IsTombstoned == y.IsTombstoned &&
+				   x.DiscardPoint == y.DiscardPoint &&
+				   x.MaybeDiscardPoint == y.MaybeDiscardPoint &&
+				   x.Status == y.Status;
+		}
+
+		public int GetHashCode(OriginalStreamData obj) {
+			throw new NotImplementedException();
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteScavengeBackendTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteScavengeBackendTests.cs
new file mode 100644
index 00000000000..0b08f9b7d20
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteScavengeBackendTests.cs
@@ -0,0 +1,305 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+using Serilog;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+
+public class SqliteScavengeBackendTests : SqliteDbPerTest<SqliteScavengeBackendTests> {
+	private readonly ITestOutputHelper _testOutputHelper;
+
+	public SqliteScavengeBackendTests(ITestOutputHelper testOutputHelper) {
+		_testOutputHelper = testOutputHelper;
+	}
+
+	[Fact]
+	public void should_successfully_enable_features_on_initialization() {
+		var sut = new SqliteScavengeBackend<string>(Log.Logger);
+		var result = Record.Exception(() => sut.Initialize(Fixture.DbConnection));
+		Assert.Null(result);
+	}
+
+	[Fact]
+	public void should_initialize_multiple_times_without_error() {
+		var sut = new SqliteScavengeBackend<string>(Log.Logger);
+		var result = Record.Exception(() => sut.Initialize(Fixture.DbConnection));
+		Assert.Null(result);
+
+		result = Record.Exception(() => sut.Initialize(Fixture.DbConnection));
+		Assert.Null(result);
+	}
+
+	[Fact]
+	public void should_commit_and_read_in_a_transaction_successfully() {
+		var sut = new SqliteScavengeBackend<string>(Log.Logger);
+		sut.Initialize(Fixture.DbConnection);
+
+		var add = sut.TransactionFactory.Begin();
+		sut.CheckpointStorage[Unit.Instance] = new ScavengeCheckpoint.ExecutingIndex(
+			new ScavengePoint(1, 1, DateTime.UtcNow, 1));
+		sut.ChunkTimeStampRanges[0] = new ChunkTimeStampRange(DateTime.Now, DateTime.Now.AddMinutes(1));
+		sut.ChunkWeights[0] = 1f;
+		sut.CollisionStorage["collision-1"] = Unit.Instance;
+		sut.Hashes[0] = "hash-one";
+		sut.MetaCollisionStorage["collision-1"] = MetastreamData.Empty;
+		sut.MetaStorage[0] = MetastreamData.Empty;
+		sut.OriginalStorage[0] = new OriginalStreamData() {
+			Status = CalculationStatus.Active,
+			DiscardPoint = DiscardPoint.KeepAll,
+			IsTombstoned = true,
+			MaxAge = TimeSpan.FromSeconds(30),
+			MaxCount = 10,
+			TruncateBefore = 5,
+			MaybeDiscardPoint = DiscardPoint.DiscardBefore(2)
+		};
+		sut.TransactionFactory.Commit(add);
+
+		var read = sut.TransactionFactory.Begin();
+		Assert.True(sut.CheckpointStorage.TryGetValue(Unit.Instance, out _));
+		Assert.True(sut.ChunkTimeStampRanges.TryGetValue(0, out _));
+		Assert.True(sut.ChunkWeights.TryGetValue(0, out _));
+		Assert.True(sut.CollisionStorage.TryGetValue("collision-1", out _));
+		Assert.True(sut.Hashes.TryGetValue(0, out _));
+		Assert.True(sut.MetaCollisionStorage.TryGetValue("collision-1", out _));
+		Assert.True(sut.MetaStorage.TryGetValue(0, out _));
+		Assert.True(sut.OriginalStorage.TryGetValue(0, out _));
+		sut.TransactionFactory.Commit(read);
+	}
+
+	[Fact]
+	public void should_commit_and_read_all_in_a_transaction_successfully() {
+		var sut = new SqliteScavengeBackend<string>(Log.Logger);
+		sut.Initialize(Fixture.DbConnection);
+
+		var add = sut.TransactionFactory.Begin();
+		sut.ChunkTimeStampRanges[0] = new ChunkTimeStampRange(DateTime.Now, DateTime.Now.AddMinutes(1));
+		sut.ChunkWeights[0] = 1f;
+		sut.CollisionStorage["collision-1"] = Unit.Instance;
+		sut.Hashes[0] = "hash-one";
+		sut.MetaCollisionStorage["collision-1"] = MetastreamData.Empty;
+		sut.MetaStorage[0] = MetastreamData.Empty;
+		sut.OriginalStorage[0] = new OriginalStreamData() {
+			Status = CalculationStatus.Active,
+			DiscardPoint = DiscardPoint.KeepAll,
+			IsTombstoned = true,
+			MaxAge = TimeSpan.FromSeconds(30),
+			MaxCount = 10,
+			TruncateBefore = 5,
+			MaybeDiscardPoint = DiscardPoint.DiscardBefore(2)
+		};
+		sut.TransactionFactory.Commit(add);
+
+		var read = sut.TransactionFactory.Begin();
+		Assert.NotEmpty(sut.ChunkTimeStampRanges.AllRecords());
+		Assert.NotEmpty(sut.ChunkWeights.AllRecords());
+		Assert.NotEmpty(sut.CollisionStorage.AllRecords());
+		Assert.NotEmpty(sut.Hashes.AllRecords());
+		Assert.NotEmpty(sut.MetaCollisionStorage.AllRecords());
+		Assert.NotEmpty(sut.MetaStorage.AllRecords());
+		Assert.NotEmpty(sut.OriginalStorage.AllRecords());
+		sut.TransactionFactory.Commit(read);
+	}
+
+	[Fact]
+	public void should_commit_and_delete_in_a_transaction_successfully() {
+		var sut = new SqliteScavengeBackend<string>(Log.Logger);
+		sut.Initialize(Fixture.DbConnection);
+
+		var checkpoint = new ScavengeCheckpoint.ExecutingIndex(new ScavengePoint(1, 1, DateTime.UtcNow, 1));
+
+		var add = sut.TransactionFactory.Begin();
+		sut.CheckpointStorage[Unit.Instance] = checkpoint;
+		sut.ChunkTimeStampRanges[0] = new ChunkTimeStampRange(DateTime.Now, DateTime.Now.AddMinutes(1));
+		sut.ChunkWeights[0] = 1f;
+		sut.CollisionStorage["collision-1"] = Unit.Instance;
+		sut.Hashes[0] = "hash-one";
+		sut.MetaCollisionStorage["collision-1"] = MetastreamData.Empty;
+		sut.MetaStorage[0] = MetastreamData.Empty;
+		sut.OriginalStorage[0] = new OriginalStreamData() {
+			Status = CalculationStatus.Active,
+			DiscardPoint = DiscardPoint.KeepAll,
+			IsTombstoned = true,
+			MaxAge = TimeSpan.FromSeconds(30),
+			MaxCount = 10,
+			TruncateBefore = 5,
+			MaybeDiscardPoint = DiscardPoint.DiscardBefore(2)
+		};
+		sut.TransactionFactory.Commit(add);
+
+		var delete = sut.TransactionFactory.Begin();
+		Assert.True(sut.CheckpointStorage.TryRemove(Unit.Instance, out _));
+		Assert.True(sut.ChunkTimeStampRanges.TryRemove(0, out _));
+		Assert.True(sut.ChunkWeights.TryRemove(0, out _));
+		Assert.True(sut.CollisionStorage.TryRemove("collision-1", out _));
+		Assert.True(sut.Hashes.TryRemove(0, out _));
+		Assert.True(sut.MetaCollisionStorage.TryRemove("collision-1", out _));
+		Assert.True(sut.MetaStorage.TryRemove(0, out _));
+		Assert.True(sut.OriginalStorage.TryRemove(0, out _));
+		sut.TransactionFactory.Commit(delete);
+	}
+
+	[Fact]
+	public void should_restore_previous_state_on_rollback() {
+		var sut = new SqliteScavengeBackend<string>(Log.Logger);
+		sut.Initialize(Fixture.DbConnection);
+
+		// Setup
+		var tx1 = sut.TransactionFactory.Begin();
+		sut.ChunkWeights[0] = 1f;
+		sut.ChunkWeights[1] = 1f;
+		sut.ChunkWeights[2] = 1f;
+
+		sut.Hashes[0] = "hash-one";
+		sut.Hashes[1] = "hash-two";
+		sut.Hashes[2] = "hash-three";
+		sut.TransactionFactory.Commit(tx1);
+
+		// Rollback
+		var tx2 = sut.TransactionFactory.Begin();
+		sut.ChunkWeights[3] = 2f;
+		sut.ChunkWeights[4] = 2f;
+
+		sut.Hashes[3] = "hash-four";
+		sut.Hashes[4] = "hash-five";
+
+		Assert.Equal(5, sut.ChunkWeights.AllRecords().Count());
+		Assert.Equal(5, sut.Hashes.AllRecords().Count());
+
+		sut.TransactionFactory.Rollback(tx2);
+
+		Assert.Equal(3, sut.ChunkWeights.AllRecords().Count());
+		Assert.Equal(3, sut.Hashes.AllRecords().Count());
+	}
+
+	[Fact(Skip = "Long running, run manually")]
+	public void test_memory_usage() {
+		const ulong streamCount = 1_000_000;
+		const int chunkCount = 100;
+		const int collisionStorageCount = 5;
+		const int cacheSizeInBytes = 4 * 1024 * 1024;
+
+		var sut = new SqliteScavengeBackend<string>(Log.Logger, cacheSizeInBytes);
+		sut.Initialize(Fixture.DbConnection);
+
+		var stopwatch = new Stopwatch();
+		stopwatch.Start();
+
+		var transaction = sut.TransactionFactory.Begin();
+		for (ulong i = 0; i < streamCount; i++) {
+			var streamId = Guid.NewGuid().ToString();
+			sut.Hashes[i] = streamId;
+			sut.MetaStorage[i] = new MetastreamData(false, DiscardPoint.KeepAll);
+			sut.OriginalStorage[i] = new OriginalStreamData() {
+				Status = CalculationStatus.Active,
+				DiscardPoint = DiscardPoint.KeepAll,
+				IsTombstoned = false,
+				MaxAge = TimeSpan.FromHours(1),
+				MaxCount = 10,
+				MaybeDiscardPoint = DiscardPoint.KeepAll,
+				TruncateBefore = 15
+			};
+		}
+
+		for (int i = 0; i < chunkCount; i++) {
+			sut.ChunkWeights[i] = 0.5f;
+			sut.ChunkTimeStampRanges[i] = new ChunkTimeStampRange(DateTime.Today, DateTime.Today.AddHours(1 * i));
+		}
+
+		for (int i = 0; i < collisionStorageCount; i++) {
+			sut.CollisionStorage[$"stream-collision-{i}"] = Unit.Instance;
+			sut.MetaCollisionStorage[$"meta-stream-collision-{i}"] = new MetastreamData(isTombstoned: true, DiscardPoint.KeepAll);
+			sut.OriginalCollisionStorage[$"stream-collision-{i}"] = new OriginalStreamData() {
+				Status = CalculationStatus.Archived,
+				DiscardPoint = DiscardPoint.KeepAll,
+				IsTombstoned = false,
+				MaxAge = TimeSpan.FromHours(1),
+				MaxCount = 10,
+				MaybeDiscardPoint = DiscardPoint.KeepAll,
+				TruncateBefore = 15
+			};
+		}
+
+		sut.TransactionFactory.Commit(transaction);
+		stopwatch.Stop();
+
+		var stats = sut.GetStats();
+		_testOutputHelper.WriteLine(
+			$"SQLite Memory Usage: {stats.MemoryUsage:N0} " +
+			$"Db Size: {stats.DatabaseSize:N0} " +
+			$"Cache Size: {stats.CacheSize:N0} for {streamCount:N0} streams in {stopwatch.Elapsed}");
+	}
+
+	[Fact(Skip = "Long running, run manually")]
+	public void test_index_with_archived() {
+		const ulong archivedCount = 50_000_000;
+		const ulong streamCount = 1_000_000;
+		const int chunkCount = 100;
+		const int collisionStorageCount = 5;
+		const int cacheSizeInBytes = 4 * 1024 * 1024;
+
+		var sut = new SqliteScavengeBackend<string>(Log.Logger, cacheSizeInBytes);
+		sut.Initialize(Fixture.DbConnection);
+
+		var insert = new Stopwatch();
+		insert.Start();
+
+		var transaction = sut.TransactionFactory.Begin();
+		for (ulong i = 0; i < archivedCount + streamCount; i++) {
+			var streamId = Guid.NewGuid().ToString();
+			sut.Hashes[i] = streamId;
+			sut.MetaStorage[i] = new MetastreamData(false, DiscardPoint.KeepAll);
+			sut.OriginalStorage[i] = new OriginalStreamData() {
+				Status = i < archivedCount ? CalculationStatus.Archived : CalculationStatus.Active,
+				DiscardPoint = DiscardPoint.KeepAll,
+				IsTombstoned = false,
+				MaxAge = TimeSpan.FromHours(1),
+				MaxCount = 10,
+				MaybeDiscardPoint = DiscardPoint.KeepAll,
+				TruncateBefore = 15
+			};
+		}
+
+		for (int i = 0; i < chunkCount; i++) {
+			sut.ChunkWeights[i] = 0.5f;
+			sut.ChunkTimeStampRanges[i] = new ChunkTimeStampRange(DateTime.Today, DateTime.Today.AddHours(1 * i));
+		}
+
+		for (int i = 0; i < collisionStorageCount; i++) {
+			sut.CollisionStorage[$"stream-collision-{i}"] = Unit.Instance;
+			sut.MetaCollisionStorage[$"meta-stream-collision-{i}"] = new MetastreamData(isTombstoned: true, DiscardPoint.KeepAll);
+			sut.OriginalCollisionStorage[$"stream-collision-{i}"] = new OriginalStreamData() {
+				Status = CalculationStatus.Archived,
+				DiscardPoint = DiscardPoint.KeepAll,
+				IsTombstoned = false,
+				MaxAge = TimeSpan.FromHours(1),
+				MaxCount = 10,
+				MaybeDiscardPoint = DiscardPoint.KeepAll,
+				TruncateBefore = 15
+			};
+		}
+
+		sut.TransactionFactory.Commit(transaction);
+		insert.Stop();
+
+		var readStopwatch = new Stopwatch();
+		readStopwatch.Start();
+		ulong k = 0;
+		foreach (var active in sut.OriginalStorage.ActiveRecordsFromCheckpoint(1_000_000)) {
+			k += active.Key;
+		}
+		readStopwatch.Stop();
+
+		var stats = sut.GetStats();
+		_testOutputHelper.WriteLine(
+			$"Read all active records from checkpoint in: {readStopwatch.Elapsed} " +
+			$"with {archivedCount:N0} archived & {streamCount:N0} active, inserted in {insert.Elapsed}. " +
+			$"DB Size: {stats.DatabaseSize:N0}");
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteScavengeCheckpointMapTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteScavengeCheckpointMapTests.cs
new file mode 100644
index 00000000000..9db69cf6dea
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteScavengeCheckpointMapTests.cs
@@ -0,0 +1,94 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+
+public class SqliteScavengeCheckpointMapTests : SqliteDbPerTest<SqliteScavengeCheckpointMapTests> {
+
+	[Fact]
+	public void can_store_checkpoint() {
+		var sut = new SqliteScavengeCheckpointMap<int>();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var scavengePoint = new ScavengePoint(
+			position: 303,
+			eventNumber: 5,
+			effectiveNow: DateTime.UtcNow,
+			threshold: 6);
+		sut[Unit.Instance] = new ScavengeCheckpoint.Accumulating(scavengePoint, 22);
+
+		Assert.True(sut.TryGetValue(Unit.Instance, out var v));
+		Assert.NotNull(v);
+		Assert.IsType<ScavengeCheckpoint.Accumulating>(v);
+		Assert.Equal(22, ((ScavengeCheckpoint.Accumulating)v).DoneLogicalChunkNumber);
+		Assert.Equal(scavengePoint.Position, v.ScavengePoint.Position);
+		Assert.Equal(scavengePoint.EventNumber, v.ScavengePoint.EventNumber);
+		Assert.Equal(scavengePoint.EffectiveNow, v.ScavengePoint.EffectiveNow);
+		Assert.Equal(scavengePoint.Threshold, v.ScavengePoint.Threshold);
+	}
+
+	[Fact]
+	public void can_overwrite_current_checkpoint() {
+		var sut = new SqliteScavengeCheckpointMap<int>();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		sut[Unit.Instance] = new ScavengeCheckpoint.Accumulating(
+			new ScavengePoint(
+				position: 303,
+				eventNumber: 5,
+				effectiveNow: DateTime.UtcNow.AddHours(-1),
+				threshold: 6),
+			22);
+
+		var scavengePoint = new ScavengePoint(
+			position: 909,
+			eventNumber: 6,
+			effectiveNow: DateTime.UtcNow,
+			threshold: 7);
+
+		sut[Unit.Instance] = new ScavengeCheckpoint.ExecutingChunks(scavengePoint, 43);
+
+		Assert.True(sut.TryGetValue(Unit.Instance, out var v));
+		Assert.NotNull(v);
+		Assert.IsType<ScavengeCheckpoint.ExecutingChunks>(v);
+		Assert.Equal(43, ((ScavengeCheckpoint.ExecutingChunks)v).DoneLogicalChunkNumber);
+		Assert.Equal(scavengePoint.Position, v.ScavengePoint.Position);
+		Assert.Equal(scavengePoint.EventNumber, v.ScavengePoint.EventNumber);
+		Assert.Equal(scavengePoint.EffectiveNow, v.ScavengePoint.EffectiveNow);
+		Assert.Equal(scavengePoint.Threshold, v.ScavengePoint.Threshold);
+	}
+
+	[Fact]
+	public void can_remove_current_checkpoint() {
+		var sut = new SqliteScavengeCheckpointMap<int>();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		var scavengePoint = new ScavengePoint(
+			position: 303,
+			eventNumber: 5,
+			effectiveNow: DateTime.UtcNow,
+			threshold: 6);
+		sut[Unit.Instance] = new ScavengeCheckpoint.Accumulating(scavengePoint, 22);
+
+		Assert.True(sut.TryRemove(Unit.Instance, out var v));
+		Assert.NotNull(v);
+		Assert.IsType<ScavengeCheckpoint.Accumulating>(v);
+		Assert.Equal(scavengePoint.Position, v.ScavengePoint.Position);
+		Assert.Equal(scavengePoint.EventNumber, v.ScavengePoint.EventNumber);
+		Assert.Equal(scavengePoint.EffectiveNow, v.ScavengePoint.EffectiveNow);
+		Assert.Equal(scavengePoint.Threshold, v.ScavengePoint.Threshold);
+	}
+
+	[Fact]
+	public void can_try_remove_checkpoint() {
+		var sut = new SqliteScavengeCheckpointMap<int>();
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		Assert.False(sut.TryRemove(Unit.Instance, out _));
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteScavengeMapTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteScavengeMapTests.cs
new file mode 100644
index 00000000000..9d690c4f6bb
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteScavengeMapTests.cs
@@ -0,0 +1,129 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+
+public class SqliteScavengeMapTests : SqliteDbPerTest<SqliteScavengeMapTests> {
+
+	[Fact]
+	public void throws_on_unsupported_type() {
+		Assert.Throws<ArgumentException>(
+			() => new SqliteScavengeMap<byte, int>("UnsupportedKeyTypeMap"));
+
+		Assert.Throws<ArgumentException>(
+			() => new SqliteScavengeMap<int, byte>("UnsupportedValueTypeMap"));
+	}
+
+	[Fact]
+	public void initializes_table_only_once() {
+		var sut = new SqliteScavengeMap<int, int>("SomeMap");
+		var sqliteBackend = new SqliteBackend(Fixture.DbConnection);
+
+		sut.Initialize(sqliteBackend);
+
+		sut[33] = 1;
+
+		Assert.Null(Record.Exception(() => sut.Initialize(sqliteBackend)));
+		Assert.True(sut.TryGetValue(33, out var value));
+		Assert.Equal(1, value);
+	}
+
+	[Fact]
+	public void can_use_int_float_map() {
+		var sut = new SqliteScavengeMap<int, float>("IntFloatMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		sut[33] = 1;
+		sut[1] = 33;
+
+		Assert.True(sut.TryGetValue(33, out var v1));
+		Assert.Equal(1, v1);
+
+		Assert.True(sut.TryGetValue(1, out var v2));
+		Assert.Equal(33, v2);
+	}
+
+	[Fact]
+	public void can_use_string_map() {
+		var sut = new SqliteScavengeMap<string, string>("StringMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		sut["string"] = "string";
+
+		Assert.True(sut.TryGetValue("string", out var v));
+		Assert.Equal("string", v);
+	}
+
+	[Fact]
+	public void can_overwrite_value() {
+		var sut = new SqliteScavengeMap<string, string>("OverwriteStringMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		sut["string"] = "string-one";
+		sut["string"] = "string-two";
+
+		Assert.True(sut.TryGetValue("string", out var v));
+		Assert.Equal("string-two", v);
+	}
+
+	[Fact]
+	public void can_store_max_unsigned_long() {
+		var sut = new SqliteScavengeMap<ulong, ulong>("UnsignedLongMaxValueMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		sut[ulong.MaxValue] = ulong.MaxValue;
+
+		Assert.True(sut.TryGetValue(ulong.MaxValue, out var v));
+		Assert.Equal(ulong.MaxValue, v);
+	}
+
+	[Fact]
+	public void can_remove_value_from_map() {
+		var sut = new SqliteScavengeMap<int, int>("RemoveValueMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		sut[33] = 1;
+		sut[1] = 33;
+
+		Assert.True(sut.TryGetValue(33, out _));
+		Assert.True(sut.TryRemove(33, out var removedValue));
+		Assert.Equal(1, removedValue);
+		Assert.False(sut.TryGetValue(33, out _));
+
+		Assert.True(sut.TryGetValue(1, out var v));
+		Assert.Equal(33, v);
+	}
+
+	[Fact]
+	public void can_try_remove_value_from_map() {
+		var sut = new SqliteScavengeMap<int, int>("TryRemoveValueMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+
+		Assert.False(sut.TryRemove(33, out _));
+	}
+
+	[Fact]
+	public void can_get_all_records() {
+		var sut = new SqliteScavengeMap<int, int>("EnumerateMap");
+		sut.Initialize(new SqliteBackend(Fixture.DbConnection));
+
+		sut[0] = 4;
+		sut[1] = 3;
+		sut[2] = 2;
+		sut[3] = 1;
+		sut[4] = 0;
+
+		Assert.Collection(sut.AllRecords(),
+			item => Assert.Equal(new KeyValuePair<int, int>(0, 4), item),
+			item => Assert.Equal(new KeyValuePair<int, int>(1, 3), item),
+			item => Assert.Equal(new KeyValuePair<int, int>(2, 2), item),
+			item => Assert.Equal(new KeyValuePair<int, int>(3, 1), item),
+			item => Assert.Equal(new KeyValuePair<int, int>(4, 0), item));
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteTypeMappingTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteTypeMappingTests.cs
new file mode 100644
index 00000000000..c3a85969d88
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/Sqlite/SqliteTypeMappingTests.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+using Microsoft.Data.Sqlite;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+
+public class SqliteTypeMappingTests {
+	[Fact]
+	public void can_map() {
+		Assert.Equal(SqliteType.Integer, SqliteTypeMapping.Map<int>());
+		Assert.Equal(SqliteType.Real, SqliteTypeMapping.Map<float>());
+		Assert.Equal(SqliteType.Integer, SqliteTypeMapping.Map<long>());
+		Assert.Equal(SqliteType.Integer, SqliteTypeMapping.Map<ulong>());
+		Assert.Equal(SqliteType.Text, SqliteTypeMapping.Map<string>());
+	}
+
+	[Fact]
+	public void can_get_type_name() {
+		Assert.Equal("INTEGER", SqliteTypeMapping.GetTypeName<int>());
+		Assert.Equal("REAL", SqliteTypeMapping.GetTypeName<float>());
+		Assert.Equal("INTEGER", SqliteTypeMapping.GetTypeName<long>());
+		Assert.Equal("INTEGER", SqliteTypeMapping.GetTypeName<ulong>());
+		Assert.Equal("TEXT", SqliteTypeMapping.GetTypeName<string>());
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/StreamHandleTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/StreamHandleTests.cs
new file mode 100644
index 00000000000..c291315fb83
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/StreamHandleTests.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class StreamHandleTests {
+	[Fact]
+	public void equals_int() {
+		Assert.Equal(new StreamHandle<int>(), new StreamHandle<int>());
+		Assert.Equal(StreamHandle.ForStreamId(5), StreamHandle.ForStreamId(5));
+		Assert.Equal(StreamHandle.ForHash<int>(5), StreamHandle.ForHash<int>(5));
+
+		Assert.NotEqual(StreamHandle.ForStreamId(5), StreamHandle.ForStreamId(6));
+		Assert.NotEqual(StreamHandle.ForHash<int>(5), StreamHandle.ForHash<int>(6));
+
+		Assert.NotEqual(StreamHandle.ForStreamId(5), StreamHandle.ForHash<int>(5));
+
+		Assert.NotEqual(new StreamHandle<int>(), StreamHandle.ForHash<int>(5));
+		Assert.NotEqual(new StreamHandle<int>(), StreamHandle.ForStreamId(5));
+	}
+
+	[Fact]
+	public void equals_string() {
+		Assert.Equal(new StreamHandle<string>(), new StreamHandle<string>());
+		Assert.Equal(StreamHandle.ForStreamId("5"), StreamHandle.ForStreamId("5"));
+		Assert.Equal(StreamHandle.ForHash<string>(5), StreamHandle.ForHash<string>(5));
+
+		Assert.NotEqual(StreamHandle.ForStreamId("5"), StreamHandle.ForStreamId("6"));
+		Assert.NotEqual(StreamHandle.ForHash<string>(5), StreamHandle.ForHash<string>(6));
+
+		Assert.NotEqual(StreamHandle.ForStreamId("5"), StreamHandle.ForHash<string>(5));
+
+		Assert.NotEqual(new StreamHandle<string>(), StreamHandle.ForHash<string>(5));
+		Assert.NotEqual(new StreamHandle<string>(), StreamHandle.ForStreamId("5"));
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/SubsequentScavengeTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/SubsequentScavengeTests.cs
new file mode 100644
index 00000000000..7cca926395f
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/SubsequentScavengeTests.cs
@@ -0,0 +1,577 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Scavenging;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+#pragma warning disable CS0162 // Unreachable code detected
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+// these tests test that the right steps happen and the right results are obtained when scavenge is
+// run on a database that has already been scavenged.
+// a new scavenge point may need to be created, but not necessarily.
+public class SubsequentScavengeTests : SqliteDbPerTest<SubsequentScavengeTests> {
+	[Fact]
+	public async Task can_create_first_scavenge_point() {
+		// first scavenge creates the first scavenge point SP-1
+		var newScavengePoint = new List<ScavengePoint>();
+		var t = 0;
+		var logger = new FakeTFScavengerLog();
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"))
+				.Chunk())
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.WithLogger(logger)
+			.CancelOnNewScavengePoint(newScavengePoint)
+			.RunAsync();
+
+		Assert.Equal(ScavengeResult.Stopped, logger.Result);
+		Assert.Collection(
+			newScavengePoint,
+			sp => {
+				Assert.Equal(EffectiveNow, sp.EffectiveNow);
+				Assert.Equal(0, sp.EventNumber);
+				Assert.Equal(0, sp.Threshold);
+			});
+	}
+
+	[Fact]
+	public async Task can_create_subsequent_scavenge_point() {
+		// set up some state and some chunks simulating a scavenge that has been completed
+		// and then some new records added. it should create a new SP
+		var newScavengePoint = new List<ScavengePoint>();
+		var t = 0;
+		var logger = new FakeTFScavengerLog();
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					// events 0-4 removed in a previous scavenge
+					Rec.Write(t++, "ab-1", eventNumber: 5))
+				.Chunk(
+					ScavengePointRec(t++))
+				.Chunk(
+					// two new records written since the previous scavenge
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"))
+				.Chunk())
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.WithLogger(logger)
+			.MutateState(x => {
+				x.SetOriginalStreamMetadata("ab-1", MaxCount1);
+				x.SetOriginalStreamDiscardPoints(
+					StreamHandle.ForHash<string>(98),
+					CalculationStatus.Active,
+					DiscardPoint.DiscardBefore(5),
+					DiscardPoint.DiscardBefore(5));
+				x.SetCheckpoint(new ScavengeCheckpoint.Done(ScavengePoint(
+					chunk: 1,
+					eventNumber: 0)));
+			})
+			.CancelOnNewScavengePoint(newScavengePoint)
+			.RunAsync();
+
+		Assert.Equal(ScavengeResult.Stopped, logger.Result);
+		Assert.Collection(
+			newScavengePoint,
+			sp => {
+				Assert.Equal(EffectiveNow, sp.EffectiveNow);
+				Assert.Equal(1, sp.EventNumber);
+				Assert.Equal(0, sp.Threshold);
+			});
+	}
+
+	[Fact]
+	public async Task can_find_existing_scavenge_point() {
+		// set up some state and some chunks simulating a scavenge that has been completed
+		// and then some new records added including a SP. it should perform an an incremental
+		// scavenge using that SP.
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					// events 0-4 removed in a previous scavenge
+					Rec.Write(t++, "ab-1", eventNumber: 5))
+				.Chunk(
+					ScavengePointRec(t++)) // <-- SP-0 scavenged previously
+				.Chunk(
+					// five new records written since the previous scavenge
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"))
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					ScavengePointRec(t++)) // <-- SP-1 added by another node
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					ScavengePointRec(t++)) // <-- SP-2 added by another node
+				.Chunk(
+					Rec.Write(t++, "ab-1"))
+				.CompleteLastChunk())
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.MutateState(x => {
+				x.SetOriginalStreamMetadata("ab-1", MaxCount1);
+				x.SetOriginalStreamDiscardPoints(
+					StreamHandle.ForHash<string>(98),
+					CalculationStatus.Active,
+					DiscardPoint.DiscardBefore(5),
+					DiscardPoint.DiscardBefore(5));
+				x.SetCheckpoint(new ScavengeCheckpoint.Done(ScavengePoint(
+					chunk: 1,
+					eventNumber: 0)));
+				for (int i = 0; i < 6; i++)
+					x.SetChunkTimeStampRange(i, new ChunkTimeStampRange(DateTime.UtcNow, DateTime.UtcNow));
+			})
+			.AssertTrace(
+				Tracer.Line("Accumulating from SP-0 to SP-2"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Accumulating SP-2 done Chunk 1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 2"),
+				Tracer.Line("        Checkpoint: Accumulating SP-2 done Chunk 2"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 3"),
+				Tracer.Line("        Checkpoint: Accumulating SP-2 done Chunk 3"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 4"),
+				Tracer.Line("        Checkpoint: Accumulating SP-2 done Chunk 4"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Calculating SP-2"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Calculating SP-2 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        SetDiscardPoints(98, Active, Discard before 9, Discard before 9)"),
+				Tracer.Line("        Checkpoint: Calculating SP-2 done Hash: 98"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing chunks for SP-2"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-2 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 0-0"),
+				Tracer.Line("    Opening Chunk 0-0"),
+				Tracer.Line("    Switched in chunk-000000.000001"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-2 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 1-1"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-2 done Chunk 1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 2-2"),
+				Tracer.Line("    Opening Chunk 2-2"),
+				Tracer.Line("    Switched in chunk-000002.000001"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-2 done Chunk 2"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 3-3"),
+				Tracer.Line("    Opening Chunk 3-3"),
+				Tracer.Line("    Switched in chunk-000003.000001"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-2 done Chunk 3"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 4-4"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-2 done Chunk 4"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Merging chunks for SP-2"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Merging chunks for SP-2"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing index for SP-2"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing index for SP-2"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Cleaning for SP-2"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Cleaning for SP-2"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Cleaning for SP-2"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Begin"),
+				Tracer.Line("    Checkpoint: Done SP-2"),
+				Tracer.Line("Commit"))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(0),
+				x.Recs[1].KeepIndexes(0),
+				x.Recs[2].KeepIndexes(),
+				x.Recs[3].KeepIndexes(1),
+				x.Recs[4].KeepIndexes(0, 1),
+				x.Recs[5].KeepIndexes(0),
+			});
+	}
+
+	// syncOnly prevents a new scavenge point from being created, it only scavenges an existing one.
+	// so we need to check
+	// - that it scavenges as normal if there is one to do
+	// - that it stops successfully if there isn't one at all
+	// - that it stops successfully if it has done all of them.
+	[Fact]
+	public async Task can_sync_only_with_scavenge_point_to_do() {
+		// first scavenge creates the first scavenge point SP-1
+		var newScavengePoint = new List<ScavengePoint>();
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"))
+				.Chunk(ScavengePointRec(t++))) // SP-0
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.WithSyncOnly(true)
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(0, 2),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task can_sync_only_with_no_scavenge_point() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1")))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.WithSyncOnly(true)
+			.AssertTrace()
+			.RunAsync(x => new[] {
+				x.Recs[0], // not scavenged
+			});
+	}
+
+	[Fact]
+	public async Task can_sync_only_with_completed_scavenge_point() {
+		var newScavengePoint = new List<ScavengePoint>();
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(ScavengePointRec(t++)) // SP-0
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1")))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.MutateState(x => {
+				x.SetCheckpoint(new ScavengeCheckpoint.Done(ScavengePoint(
+					chunk: 0,
+					eventNumber: 0)));
+			})
+			.WithSyncOnly(true)
+			.AssertTrace()
+			.RunAsync(x => new[] {
+				x.Recs[0],
+				x.Recs[1], // not scavenged
+			});
+	}
+
+	[Fact]
+	public async Task can_subsequent_scavenge_without_state() {
+		// say we deleted the state, or old scavenge has been run but not new scavenge
+		// so there is no state.
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					// events 0-4 removed in a previous scavenge
+					Rec.Write(t++, "ab-1", eventNumber: 5))
+				.Chunk(
+					ScavengePointRec(t++)) // <-- SP-0 previous scavenge
+				.Chunk(
+					// five new records written since the previous scavenge
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"))
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					ScavengePointRec(t++)) // <-- SP-1 added by another node
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					ScavengePointRec(t++)) // <-- SP-2 added by another node
+				.Chunk(
+					Rec.Write(t++, "ab-1"))
+				.CompleteLastChunk())
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.MutateState(x => {
+			})
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(0),
+				x.Recs[1].KeepIndexes(0),
+				x.Recs[2].KeepIndexes(),
+				x.Recs[3].KeepIndexes(1),
+				x.Recs[4].KeepIndexes(0, 1),
+				x.Recs[5].KeepIndexes(0),
+			});
+	}
+
+	[Fact]
+	public async Task accumulates_from_right_place_sp_in_chunk_0() {
+		// set up as if we have done a scavenge with a SP in chunk 0
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(ScavengePointRec(t++)) // SP-0
+				.Chunk(ScavengePointRec(t++, threshold: 1))) // SP-1
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.MutateState(x => {
+				x.SetCheckpoint(new ScavengeCheckpoint.Done(ScavengePoint(
+					chunk: 0,
+					eventNumber: 0)));
+			})
+			.AssertTrace(
+				Tracer.Line("Accumulating from SP-0 to SP-1"),
+				// the important bit: we start accumulation from the chunk after the SP is in
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Accumulating SP-1 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 1"),
+				Tracer.Line("        Checkpoint: Accumulating SP-1 done Chunk 1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Calculating SP-1"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Calculating SP-1 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing chunks for SP-1"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-1 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 0-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-1 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Merging chunks for SP-1"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Merging chunks for SP-1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing index for SP-1"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing index for SP-1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Cleaning for SP-1"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Cleaning for SP-1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Cleaning for SP-1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Begin"),
+				Tracer.Line("    Checkpoint: Done SP-1"),
+				Tracer.Line("Commit"))
+			.RunAsync(x => new[] {
+				x.Recs[0],
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task accumulates_from_right_place_sp_in_chunk_2() {
+		// set up as if we have done a scavenge with a SP in chunk 2
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(ScavengePointRec(t++)) // SP-0
+				.Chunk(ScavengePointRec(t++)) // SP-1
+				.Chunk(ScavengePointRec(t++)) // SP-2
+				.Chunk(ScavengePointRec(t++, threshold: 1))) // SP-3
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.MutateState(x => {
+				x.SetCheckpoint(new ScavengeCheckpoint.Done(ScavengePoint(
+					chunk: 2,
+					eventNumber: 2)));
+			})
+			.AssertTrace(
+				Tracer.Line("Accumulating from SP-2 to SP-3"),
+				// the important bit: we start accumulation from the chunk after the prev SP is in
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Accumulating SP-3 done Chunk 2"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 3"),
+				Tracer.Line("        Checkpoint: Accumulating SP-3 done Chunk 3"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Calculating SP-3"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Calculating SP-3 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing chunks for SP-3"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-3 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 0-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-3 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 1-1"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-3 done Chunk 1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 2-2"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-3 done Chunk 2"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Merging chunks for SP-3"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Merging chunks for SP-3"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing index for SP-3"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing index for SP-3"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Cleaning for SP-3"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Cleaning for SP-3"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Cleaning for SP-3"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Begin"),
+				Tracer.Line("    Checkpoint: Done SP-3"),
+				Tracer.Line("Commit"))
+			.RunAsync(x => new[] {
+				x.Recs[0],
+				x.Recs[1],
+				x.Recs[2],
+				x.Recs[3],
+			});
+	}
+
+	[Fact]
+	public async Task cannot_move_discard_points_backward() {
+		// scavenge where SP-0 has been run. about to run SP-1
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.Write(t++, "ab-1"), // 0
+					Rec.Write(t++, "ab-1"), // 1
+					Rec.Write(t++, "ab-1")) // 2
+				.Chunk(
+					ScavengePointRec(t++)) // <-- SP-0
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount4),
+					Rec.Write(t++, "ab-1"), // 3
+					Rec.Write(t++, "ab-1")) // 4
+				.Chunk(
+					ScavengePointRec(t++))) // <-- SP-1
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.MutateState(x => {
+				x.DetectCollisions("$$ab-1");
+				x.DetectCollisions("ab-1");
+				x.SetOriginalStreamMetadata("ab-1", MaxCount1);
+				x.SetOriginalStreamDiscardPoints(
+					Scenario.CollideEverything
+						? StreamHandle.ForStreamId("ab-1")
+						: StreamHandle.ForHash<string>(98),
+					CalculationStatus.Active,
+					DiscardPoint.DiscardBefore(2),
+					DiscardPoint.DiscardBefore(2));
+				x.SetCheckpoint(new ScavengeCheckpoint.Done(ScavengePoint(
+					chunk: 1,
+					eventNumber: 0)));
+
+				for (int i = 0; i < 4; i++)
+					x.SetChunkTimeStampRange(i, new ChunkTimeStampRange(DateTime.UtcNow, DateTime.UtcNow));
+			})
+			.AssertState(state => {
+				// we changed the maxcount to 4, but we expect the discard points to remain
+				// where they are rather than moving back to DiscardBefore(1)
+				Assert.True(state.TryGetOriginalStreamData("ab-1", out var data));
+				Assert.Equal(DiscardPoint.DiscardBefore(2), data.DiscardPoint);
+				Assert.Equal(DiscardPoint.DiscardBefore(2), data.MaybeDiscardPoint);
+			})
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(3),
+				x.Recs[1],
+				x.Recs[2],
+				x.Recs[3],
+			});
+	}
+
+	[Fact]
+	public async Task stream_starts_after_scavenge_point() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: TruncateBefore4),
+					ScavengePointRec(t++))
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1")))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0],
+				x.Recs[1],
+			});
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/ThreadCountTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ThreadCountTests.cs
new file mode 100644
index 00000000000..4b9a3677591
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ThreadCountTests.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class ThreadCountTests : SqliteDbPerTest<ThreadCountTests> {
+	[Theory]
+	[InlineData(-1)]
+	[InlineData(0)]
+	[InlineData(1)]
+	[InlineData(TFChunkScavenger.MaxThreadCount)]
+	[InlineData(TFChunkScavenger.MaxThreadCount + 1)]
+	public async Task runs_when_thread_count_too_high_or_low(int threads) {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithThreads(threads)
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				// lots of chunks so there is possibility of parallel execution of them
+				.Chunk(
+					Rec.Write(t++, "ab-1"))
+				.Chunk(
+					Rec.Write(t++, "ab-1"))
+				.Chunk(
+					Rec.Write(t++, "ab-1"))
+				.Chunk(
+					Rec.Write(t++, "ab-1"))
+				.Chunk(
+					Rec.Write(t++, "ab-1"))
+				.Chunk(
+					Rec.Write(t++, "ab-1"))
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1))
+				.Chunk(
+					ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => [
+				x.Recs[0].KeepNone(),
+				x.Recs[1].KeepNone(),
+				x.Recs[2].KeepNone(),
+				x.Recs[3].KeepNone(),
+				x.Recs[4].KeepNone(),
+				x.Recs[5].KeepIndexes(0),
+				x.Recs[6].KeepIndexes(0),
+				x.Recs[7].KeepIndexes(0),
+			]);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/ThresholdTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ThresholdTests.cs
new file mode 100644
index 00000000000..be21ec532fd
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/ThresholdTests.cs
@@ -0,0 +1,227 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class ThresholdTests : SqliteDbPerTest<ThresholdTests> {
+	[Fact]
+	public async Task negative_threshold_executes_all_chunks() {
+		var threshold = -1;
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				// chunk 0: weight 2
+				.Chunk(
+					Rec.Write(t++, "ab-1"))
+				// chunk 1: weight 4
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"))
+				// chunk 2: weight 0
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					ScavengePointRec(t++, threshold: threshold))
+				.CompleteLastChunk())
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertTrace(
+				Tracer.Line("Accumulating from start to SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 0"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 1"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 2"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 2"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Calculating SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        SetDiscardPoints(98, Active, Discard before 3, Discard before 3)"),
+				Tracer.Line("        Checkpoint: Calculating SP-0 done Hash: 98"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing chunks for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 0-0"),
+				Tracer.Line("    Opening Chunk 0-0"),
+				Tracer.Line("    Switched in chunk-000000.000001"), // executed
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 0"),
+				Tracer.Line("    Commit"),
+
+				Tracer.Line("    Retaining Chunk 1-1"),
+				Tracer.Line("    Opening Chunk 1-1"),
+				Tracer.Line("    Switched in chunk-000001.000001"), // executed
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 1"),
+				Tracer.Line("    Commit"),
+
+				Tracer.Line("    Retaining Chunk 2-2"),
+				Tracer.Line("    Opening Chunk 2-2"),
+				Tracer.Line("    Switched in chunk-000002.000001"), // executed
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 2"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.AnythingElse)
+			.RunAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(), // executed
+					x.Recs[1].KeepIndexes(), // executed
+					x.Recs[2], // executed
+				},
+				x => new[] {
+					x.Recs[0].KeepIndexes(),
+					x.Recs[1].KeepIndexes(),
+					x.Recs[2],
+				});
+	}
+
+	[Fact]
+	public async Task zero_threshold_executes_all_chunks_with_positive_weight() {
+		var threshold = 0;
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				// chunk 0: weight 2
+				.Chunk(
+					Rec.Write(t++, "ab-1"))
+				// chunk 1: weight 4
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"))
+				// chunk 2: weight 0
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					ScavengePointRec(t++, threshold: threshold))
+				.CompleteLastChunk())
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertTrace(
+				Tracer.Line("Accumulating from start to SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 0"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 0"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 1"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 1"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Reading Chunk 2"),
+				Tracer.Line("        Checkpoint: Accumulating SP-0 done Chunk 2"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Calculating SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Calculating SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        SetDiscardPoints(98, Active, Discard before 3, Discard before 3)"),
+				Tracer.Line("        Checkpoint: Calculating SP-0 done Hash: 98"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.Line("Executing chunks for SP-0"),
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done None"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("    Retaining Chunk 0-0"),
+				Tracer.Line("    Opening Chunk 0-0"),
+				Tracer.Line("    Switched in chunk-000000.000001"), // executed
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 0"),
+				Tracer.Line("    Commit"),
+
+				Tracer.Line("    Retaining Chunk 1-1"),
+				Tracer.Line("    Opening Chunk 1-1"),
+				Tracer.Line("    Switched in chunk-000001.000001"), // executed
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 1"),
+				Tracer.Line("    Commit"),
+
+				Tracer.Line("    Retaining Chunk 2-2"),
+				//               no opening or switch, not executed.
+				Tracer.Line("    Begin"),
+				Tracer.Line("        Checkpoint: Executing chunks for SP-0 done Chunk 2"),
+				Tracer.Line("    Commit"),
+				Tracer.Line("Done"),
+
+				Tracer.AnythingElse)
+			.RunAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(), // executed
+					x.Recs[1].KeepIndexes(), // executed
+					x.Recs[2], // not executed
+				},
+				x => new[] {
+					x.Recs[0].KeepIndexes(),
+					x.Recs[1].KeepIndexes(),
+					x.Recs[2],
+				});
+	}
+
+	[Fact]
+	public async Task positive_threshold_executes_all_chunks_that_exceed_it() {
+		var threshold = 2;
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				// chunk 0: weight 2
+				.Chunk(
+					Rec.Write(t++, "ab-1"))
+				// chunk 1: weight 4
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"))
+				// chunk 2: weight 0
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: MaxCount1),
+					ScavengePointRec(t++, threshold: threshold))
+				.CompleteLastChunk())
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new[] {
+					x.Recs[0], // not executed so still has its records
+					x.Recs[1].KeepIndexes(), // executed
+					x.Recs[2], // not executed
+				},
+				x => new[] {
+					x.Recs[0].KeepIndexes(),
+					x.Recs[1].KeepIndexes(),
+					x.Recs[2],
+				});
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/TombstoneTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/TombstoneTests.cs
new file mode 100644
index 00000000000..6feb1a68da9
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/TombstoneTests.cs
@@ -0,0 +1,236 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class TombstoneTests : SqliteDbPerTest<TombstoneTests> {
+	[Fact]
+	public async Task simple_tombstone() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.CommittedDelete(t++, "ab-1"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(1),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task single_tombstone() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.CommittedDelete(t++, "ab-1"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(0),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task tombstone_with_metadata() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", metadata: MaxCount1),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.CommittedDelete(t++, "ab-1"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertState(state => {
+				Assert.True(state.TryGetOriginalStreamData("ab-1", out _));
+				Assert.False(state.TryGetMetastreamData("$$ab-1", out _));
+			})
+			.RunAsync(x => new[] {
+				// when the stream is hard deleted we can get rid of _all_ the metadata too
+				// do not keep the last metadata record
+				x.Recs[0].KeepIndexes(3),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task tombstone_with_meta_collision() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					// ab-1 has metadata but not tombstone
+					Rec.Write(t++, "$$ab-1", metadata: MaxCount1),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"))
+				.Chunk(
+					// ab-2 is tombstoned
+					Rec.Write(t++, "ab-2"),
+					Rec.Write(t++, "ab-2"),
+					Rec.CommittedDelete(t++, "ab-2"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(0, 2), // "ab-1" keep last event and metadata
+				x.Recs[1].KeepIndexes(2), // "ab-2" keeps tombstone
+				x.Recs[2],
+			});
+	}
+
+	[Fact]
+	public async Task tombstone_in_metadata_stream_not_supported() {
+		// eventstore refuses denies access to write such a tombstone in the first place,
+		// including in ESv5
+		var logger = new FakeTFScavengerLog();
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.CommittedDelete(t++, "$$ab-1"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.WithLogger(logger)
+			.RunAsync();
+
+		Assert.True(logger.Completed);
+		Assert.Equal(ScavengeResult.Errored, logger.Result);
+		Assert.Equal("Error while scavenging DB: Found Tombstone in metadata stream $$ab-1.", logger.Error);
+	}
+
+	[Fact]
+	public async Task tombstone_in_transaction_not_supported() {
+		// if we wanted to support this we would have to apply the tombstone at the point that it
+		// gets committed. also chunkexecutor would have to be careful not to discard the tombstone
+		// of a tombstoned stream even though it can discard pretty much everything in transactions
+		// in that case
+		var logger = new FakeTFScavengerLog();
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.TransSt(0, "ab-1"),
+					Rec.Delete(0, "ab-1"))
+				.Chunk(ScavengePointRec(1)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.WithLogger(logger)
+			.RunAsync();
+
+		Assert.True(logger.Completed);
+		Assert.Equal(ScavengeResult.Errored, logger.Result);
+		Assert.Equal("Error while scavenging DB: Found Tombstone in transaction in stream ab-1.", logger.Error);
+	}
+
+	[Fact]
+	public async Task tombstone_stream_with_transaction() {
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(0, "ab-1"),
+					Rec.TransSt(1, "ab-1"), // <-- keep transaction start
+					Rec.Prepare(1, "ab-1"),
+					Rec.TransEnd(1, "ab-1"),
+					Rec.Commit(1, "ab-1"), // <-- keep comit
+					Rec.Write(2, "ab-1"),
+					Rec.Write(3, "$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.CommittedDelete(4, "ab-1")) // <-- keep tombstone
+				.Chunk(ScavengePointRec(5)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(1, 4, 7),
+					x.Recs[1],
+				},
+				x => new[] {
+					x.Recs[0].KeepIndexes(7),
+					x.Recs[1],
+				});
+	}
+
+	[Fact]
+	public async Task tombstone_stream_with_transaction_and_unsafe_ignore_hard_deletes() {
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithUnsafeIgnoreHardDeletes(true)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(0, "ab-1"),
+					Rec.TransSt(1, "ab-1"),
+					Rec.Prepare(1, "ab-1"),
+					Rec.TransEnd(1, "ab-1"),
+					Rec.Commit(1, "ab-1"), // <-- keep commit only
+					Rec.Write(2, "ab-1"),
+					Rec.Write(3, "$$ab-1", "$metadata", metadata: MaxCount1),
+					Rec.CommittedDelete(4, "ab-1"))
+				.Chunk(ScavengePointRec(5)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(
+				x => new[] {
+					x.Recs[0].KeepIndexes(4),
+					x.Recs[1],
+				},
+				x => new[] {
+					x.Recs[0].KeepIndexes(),
+					x.Recs[1],
+				});
+	}
+
+	// see comments in EventCalculator.cs
+	[Fact]
+	public async Task int32max_tombstone_with_subsequent_events() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					// old data
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+
+					// int32max tombstone that has not been upgraded in the index
+					Rec.Write(t++, "ab-1",
+						eventType: "$streamDeleted",
+						eventNumber: int.MaxValue,
+						prepareFlags:
+							PrepareFlags.StreamDelete |
+							PrepareFlags.TransactionBegin |
+							PrepareFlags.TransactionEnd |
+							PrepareFlags.IsCommitted),
+
+					// additional data
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertState(state => {
+				// still counted as tombstoned by scavenge
+				Assert.True(state.TryGetOriginalStreamData("ab-1", out var data));
+				Assert.True(data.IsTombstoned);
+			})
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(2, 3, 4), // keep the int32max tombstone
+				x.Recs[1],
+			});
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/TruncateBeforeTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/TruncateBeforeTests.cs
new file mode 100644
index 00000000000..c8b18b9b66e
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/TruncateBeforeTests.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+// for testing the truncatebefore functionality specifically
+public class TruncateBeforeTests : SqliteDbPerTest<TruncateBeforeTests> {
+	[Fact]
+	public async Task simple_truncatebefore() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: TruncateBefore3))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(3, 4),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task keep_last_event() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "$$ab-1", "$metadata", metadata: TruncateBefore4))
+				.Chunk(ScavengePointRec(t++)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(1,2),
+				x.Recs[1],
+			});
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/UnsafeIgnoreHardDeletesTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/UnsafeIgnoreHardDeletesTests.cs
new file mode 100644
index 00000000000..b6159eaa676
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/UnsafeIgnoreHardDeletesTests.cs
@@ -0,0 +1,151 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.Scavenging;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Sqlite;
+using Xunit;
+using static KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure.StreamMetadatas;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class UnsafeIgnoreHardDeletesTests : SqliteDbPerTest<UnsafeIgnoreHardDeletesTests> {
+	[Fact]
+	public async Task simple_tombstone() {
+		var t = 0;
+		await new Scenario<LogFormat.V2, string>()
+			.WithUnsafeIgnoreHardDeletes()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", metadata: MaxCount1),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.CommittedDelete(t++, "ab-1"))
+				.Chunk(ScavengePointRec(t++, threshold: 1000)))
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.AssertState(state => {
+				Assert.False(state.TryGetOriginalStreamData("ab-1", out _));
+				Assert.False(state.TryGetMetastreamData("$$ab-1", out _));
+			})
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(),
+				x.Recs[1],
+			});
+	}
+
+	[Fact]
+	public async Task tombstone_then_normal_scavenge_then_unsafeharddeletes() {
+		// after the normal scavenge of a tombstoned stream we still need to be
+		// able to remove the tombstone with a unsafeharddeletes scavenge
+
+		// the normal scavenge with the tombstone
+		var t = 0;
+		var scenario = new Scenario<LogFormat.V2, string>();
+		var db = await scenario
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", metadata: MaxCount1),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"),
+					Rec.CommittedDelete(t++, "ab-1"))
+				.Chunk(ScavengePointRec(t++)) // SP-0
+				.Chunk(ScavengePointRec(t++))) // SP-1
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.MutateState(x => {
+				// make it scavenge SP-0
+				x.SetCheckpoint(new ScavengeCheckpoint.Accumulating(
+					ScavengePoint(
+						chunk: 1,
+						eventNumber: 0),
+					doneLogicalChunkNumber: null));
+			})
+			.RunAndKeepDbAsync(x => new[] {
+				x.Recs[0].KeepIndexes(3), // only the tombstone is kept
+				x.Recs[1],
+				x.Recs[2],
+			});
+
+		// the second scavenge with unsafeharddeletes should remove the tombstone
+		await new Scenario<LogFormat.V2, string>()
+			.WithDbPath(Fixture.Directory)
+			.WithDb(db)
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.WithUnsafeIgnoreHardDeletes()
+			.AssertState(state => {
+				Assert.False(state.TryGetOriginalStreamData("ab-1", out _));
+				Assert.False(state.TryGetMetastreamData("$$ab-1", out _));
+			})
+			.RunAsync(x => new[] {
+					x.Recs[0].KeepIndexes(), // tombstone has gone
+					x.Recs[1],
+					x.Recs[2],
+				});
+	}
+
+	[Fact]
+	public async Task normal_scavenge_then_tombstone_then_unsafeharddeletes() {
+		// after the normal scavenge runs and clears the metastreamdatas,
+		// we need to be able to tombstone a stream and still be able to remove
+		// the leftover metadata record.
+
+		// the normal scavenge with the tombstone
+		var t = 0;
+		var scenario = new Scenario<LogFormat.V2, string>();
+		var db = await scenario
+			.WithDbPath(Fixture.Directory)
+			.WithDb(x => x
+				.Chunk(
+					Rec.Write(t++, "$$ab-1", metadata: MaxCount1),
+					Rec.Write(t++, "ab-1"),
+					Rec.Write(t++, "ab-1"))
+				.Chunk(ScavengePointRec(t++)) // SP-0
+				.Chunk(Rec.CommittedDelete(t++, "ab-1"))
+				.Chunk(ScavengePointRec(t++))) // SP-1
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.MutateState(x => {
+				// make it scavenge SP-0
+				x.SetCheckpoint(new ScavengeCheckpoint.Accumulating(
+					ScavengePoint(
+						chunk: 1,
+						eventNumber: 0),
+					doneLogicalChunkNumber: null));
+			})
+			.AssertTrace(
+				Tracer.Line("Accumulating from checkpoint: Accumulating SP-0 done None"),
+				Tracer.AnythingElse)
+			// result of scavenging SP-0
+			.RunAndKeepDbAsync(x => new[] {
+				x.Recs[0].KeepIndexes(0, 2),
+				x.Recs[1],
+				x.Recs[2],
+				x.Recs[3],
+			});
+
+		// the second scavenge with unsafeharddeletes
+		await new Scenario<LogFormat.V2, string>()
+			.WithTracerFrom(scenario)
+			.WithDbPath(Fixture.Directory)
+			.WithDb(db)
+			.WithState(x => x.WithConnectionPool(Fixture.DbConnectionPool))
+			.WithUnsafeIgnoreHardDeletes()
+			.AssertTrace(
+				Tracer.Line("Accumulating from SP-0 to SP-1"),
+				Tracer.AnythingElse)
+			.AssertState(state => {
+				Assert.False(state.TryGetOriginalStreamData("ab-1", out _));
+				Assert.False(state.TryGetMetastreamData("$$ab-1", out _));
+			})
+			.RunAsync(x => new[] {
+				x.Recs[0].KeepIndexes(), // metadata record has gone
+				x.Recs[1],
+				x.Recs[2].KeepIndexes(), // tombstone has gone
+				x.Recs[3],
+			});
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Scavenge/WeightAccumulatorTests.cs b/src/KurrentDB.Core.XUnit.Tests/Scavenge/WeightAccumulatorTests.cs
new file mode 100644
index 00000000000..652d08947a6
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Scavenge/WeightAccumulatorTests.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using KurrentDB.Core.TransactionLog.Scavenging.Stages;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Scavenge;
+
+public class WeightAccumulatorTests {
+	private readonly WeightAccumulator _sut;
+	private readonly MockIncreaseChunkWeights _state;
+
+	class MockIncreaseChunkWeights : IIncreaseChunkWeights {
+		private readonly Dictionary<int, float> _weights = new Dictionary<int, float>();
+
+		public void IncreaseChunkWeight(int logicalChunkNumber, float extraWeight) {
+			if (!_weights.TryGetValue(logicalChunkNumber, out var w))
+				w = 0;
+			_weights[logicalChunkNumber] = w + extraWeight;
+		}
+
+		public float SumChunkWeights(int from, int to) =>
+			_weights
+				.Where(x => from <= x.Key && x.Key <= to)
+				.Select(x => x.Value)
+				.Sum();
+	}
+
+	public WeightAccumulatorTests() {
+		_state = new MockIncreaseChunkWeights();
+		_sut = new WeightAccumulator(_state);
+	}
+
+	[Fact]
+	public void sanity() {
+		_sut.OnDiscard(0);
+		_sut.OnDiscard(1);
+		_sut.OnMaybeDiscard(0);
+
+		Assert.Equal(0, _state.SumChunkWeights(0, 0));
+		Assert.Equal(0, _state.SumChunkWeights(1, 1));
+
+		_sut.Flush();
+		Assert.Equal(3, _state.SumChunkWeights(0, 0));
+		Assert.Equal(2, _state.SumChunkWeights(1, 1));
+
+		_sut.OnMaybeDiscard(1);
+		_sut.Flush();
+		Assert.Equal(3, _state.SumChunkWeights(0, 0));
+		Assert.Equal(3, _state.SumChunkWeights(1, 1));
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Services/Archive/ArchiveCatchup/ArchiveCatchupTests.cs b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/ArchiveCatchup/ArchiveCatchupTests.cs
new file mode 100644
index 00000000000..77b3183ad7a
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/ArchiveCatchup/ArchiveCatchupTests.cs
@@ -0,0 +1,215 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Archive.Naming;
+using KurrentDB.Core.Services.Archive.Storage.Exceptions;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.FileNamingStrategy;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Services.Archive.ArchiveCatchup;
+
+using ArchiveCatchup = Core.Services.Archive.ArchiveCatchup.ArchiveCatchup;
+
+public class ArchiveCatchupTests : DirectoryPerTest<ArchiveCatchupTests> {
+	private const int ChunkSize = 1000;
+	private string DbPath => Path.Combine(Fixture.Directory, "db");
+
+	public ArchiveCatchupTests() {
+		Directory.CreateDirectory(DbPath);
+	}
+
+	private struct Sut {
+		public ArchiveCatchup Catchup { get; init; }
+		public FakeArchiveStorage Archive { get; init; }
+		public ICheckpoint WriterCheckpoint { get; init; }
+		public ICheckpoint ChaserCheckpoint { get; init; }
+		public ICheckpoint EpochCheckpoint { get; init; }
+	}
+
+	private Sut CreateSut(
+		long? dbCheckpoint = null,
+		long? archiveCheckpoint = null,
+		string[] dbChunks = null,
+		Action<int> onGetChunk = null) {
+		var namingStrategy = new VersionedPatternFileNamingStrategy(string.Empty, "chunk-");
+		var archiveNamingStrategy = new ArchiveNamingStrategy(namingStrategy);
+
+		dbCheckpoint ??= 0L;
+		archiveCheckpoint ??= 0L;
+		dbChunks ??= CreateChunkListForDb(dbCheckpoint.Value, namingStrategy);
+
+		foreach (var dbChunk in dbChunks) {
+			using var _ = File.CreateText(Path.Combine(DbPath, dbChunk));
+		}
+
+		var archive = new FakeArchiveStorage(
+			chunkSize: ChunkSize,
+			archiveCheckpoint.Value,
+			onGetChunk);
+
+		var writerCheckpoint = new InMemoryCheckpoint(dbCheckpoint.Value);
+		var chaserCheckpoint = new InMemoryCheckpoint(dbCheckpoint.Value);
+		var epochCheckpoint = new InMemoryCheckpoint(123);
+		var catchup = new ArchiveCatchup(
+			dbPath: DbPath,
+			writerCheckpoint: writerCheckpoint,
+			chaserCheckpoint: chaserCheckpoint,
+			epochCheckpoint: epochCheckpoint,
+			chunkSize: ChunkSize,
+			archiveStorageReader: archive,
+			namingStrategy: archiveNamingStrategy
+		);
+
+		return new Sut {
+			Catchup = catchup,
+			Archive = archive,
+			WriterCheckpoint = writerCheckpoint,
+			ChaserCheckpoint = chaserCheckpoint,
+			EpochCheckpoint = epochCheckpoint
+		};
+	}
+
+	private string[] CreateChunkListForDb(long checkpoint, IVersionedFileNamingStrategy namingStrategy) {
+		var chunks = new List<string>();
+
+		var numChunks = checkpoint / ChunkSize;
+		if (checkpoint % ChunkSize != 0)
+			numChunks++;
+
+		for (var i = 0; i < numChunks; i++)
+			chunks.Add(namingStrategy.GetFilenameFor(i, 0));
+
+		return chunks.ToArray();
+	}
+
+	[Theory]
+	[InlineData(0L, 0L)]       // db is in sync with archive, both have no data
+	[InlineData(1000L, 1000L)] // db is in sync with archive, both have one chunk
+	[InlineData(3000L, 3000L)] // db is in sync with archive, both have multiple chunks
+	[InlineData(1005L, 0L)]    // db is ahead of archive, archive is empty
+	[InlineData(1005L, 1000L)] // db is ahead of archive by some data
+	[InlineData(4000L, 1000L)] // db is ahead of archive by multiple chunks
+	[InlineData(4005L, 1000L)] // db is ahead of archive by multiple chunks & some data
+	public async Task doesnt_catch_up_if_db_is_ahead_or_in_sync_with_archive(long dbCheckpoint, long archiveCheckpoint) {
+		var sut = CreateSut(dbCheckpoint: dbCheckpoint, archiveCheckpoint: archiveCheckpoint);
+
+		await sut.Catchup.Run(CancellationToken.None);
+
+		Assert.Empty(sut.Archive.ChunkGets);
+		Assert.Equal(dbCheckpoint, sut.WriterCheckpoint.Read());
+		Assert.Equal(dbCheckpoint, sut.ChaserCheckpoint.Read());
+		Assert.Equal(archiveCheckpoint, await sut.Archive.GetCheckpoint(CancellationToken.None));
+	}
+
+	[Theory]
+	[InlineData(0L, 1000L)]    // db is empty, archive has a single chunk
+	[InlineData(0L, 3000L)]    // db is empty, archive has multiple chunks
+	[InlineData(5L, 1000L)]    // db has a single, incomplete, chunk, archive has a single chunk
+	[InlineData(5L, 3000L)]    // db has a single, incomplete, chunk, archive has multiple chunks
+	[InlineData(2005L, 5000L)] // db has multiple chunks (including an incomplete one), archive has multiple chunks
+	[InlineData(2000L, 5000L)] // db has multiple complete chunks, archive has multiple chunks
+	[InlineData(3000L, 4000L)] // db is exactly one chunk behind archive
+	[InlineData(3005L, 4000L)] // db is less than one chunk behind archive
+	public async Task catches_up_if_db_is_behind_archive(long dbCheckpoint, long archiveCheckpoint) {
+		var sut = CreateSut(
+			dbCheckpoint: dbCheckpoint,
+			archiveCheckpoint: archiveCheckpoint);
+
+		await sut.Catchup.Run(CancellationToken.None);
+
+		var chunksToGet = new List<int>();
+		for (var i = (int)(dbCheckpoint / ChunkSize); i < (int)(archiveCheckpoint / ChunkSize); i++)
+			chunksToGet.Add(i);
+
+		// there are no chunks to backup as the chunk file names downloaded from the archive don't conflict with the
+		// chunk files in the database
+		var chunksToBackup = Array.Empty<string>();
+
+		await VerifyCatchUp(sut, dbCheckpoint, archiveCheckpoint, chunksToGet.ToArray(), chunksToBackup);
+	}
+
+	[Theory]
+	// scenario: a scavenged chunk was replicated but the writer checkpoint wasn't moved forward yet.
+	// the node died then later came back online and is now catching up with the archive.
+	[InlineData(0L, 4000L, new[] { "chunk-000000.000001" }, new[] { 0, 1, 2, 3 }, new[] { "chunk-000000.000001.archive.bkup" })]
+	[InlineData(1000L, 5000L, new[] { "chunk-000000.000001", "chunk-000001.000001" }, new[] { 1, 2, 3, 4 }, new[] { "chunk-000001.000001.archive.bkup" })]
+	public async Task backs_up_chunks_that_are_replaced_during_catchup_with_the_archive(
+		long dbCheckpoint,
+		long archiveCheckpoint,
+		string[] dbChunks,
+		int[] expectedChunksToFetch,
+		string[] expectedChunksToBackup) {
+
+		var sut = CreateSut(
+			dbCheckpoint: dbCheckpoint,
+			archiveCheckpoint: archiveCheckpoint,
+			dbChunks: dbChunks);
+
+		await sut.Catchup.Run(CancellationToken.None);
+		await VerifyCatchUp(sut, dbCheckpoint, archiveCheckpoint, expectedChunksToFetch, expectedChunksToBackup);
+	}
+
+	[Fact]
+	public async Task retries_if_a_chunk_is_deleted_from_the_archive_when_catching_up() {
+		// scenario: there is an ongoing scavenge on the archive, so while catching up,
+		// chunks in the archive listing may no longer be present.
+
+		bool exceptionThrown = false;
+
+		var sut = CreateSut(
+			dbCheckpoint: 0L,
+			archiveCheckpoint: 2000L,
+			onGetChunk: OnGetChunk);
+
+		await sut.Catchup.Run(CancellationToken.None);
+
+		Assert.Equal(2000L, sut.WriterCheckpoint.Read());
+
+		return;
+
+		// we just want to test retries here. for simplicity, we just throw an exception the first time chunk-1 is
+		// fetched, then we don't throw on the second fetch. but in practice, it would be slightly different: the
+		// archive's directory listing would change on retry.
+		void OnGetChunk(int logicalChunkNumber) {
+			if (logicalChunkNumber == 1 && !exceptionThrown) {
+				exceptionThrown = true;
+				throw new ChunkDeletedException();
+			}
+		}
+	}
+
+	private async Task VerifyCatchUp(Sut sut, long dbCheckpoint, long archiveCheckpoint, int[] expectedChunkGets, string[] expectedChunkBackups) {
+		// fetches the expected chunks
+		Assert.Equal(expectedChunkGets, sut.Archive.ChunkGets);
+
+		// moves the writer checkpoint
+		Assert.Equal(archiveCheckpoint, sut.WriterCheckpoint.Read());
+
+		// moves the chaser checkpoint
+		Assert.Equal(archiveCheckpoint, sut.ChaserCheckpoint.Read());
+
+		// doesn't move the archive checkpoint
+		Assert.Equal(archiveCheckpoint, await sut.Archive.GetCheckpoint(CancellationToken.None));
+
+		// resets the epoch checkpoint
+		Assert.Equal(-1, sut.EpochCheckpoint.Read());
+
+		// backs up the expected chunks
+		Assert.Equal(expectedChunkBackups, ListBackedUpChunks());
+	}
+
+	private IEnumerable<string> ListBackedUpChunks() {
+		return Directory.EnumerateFiles(DbPath)
+			.Where(x => x.EndsWith(".bkup"))
+			.Select(Path.GetFileName)
+			.Order();
+	}
+}
+
diff --git a/src/KurrentDB.Core.XUnit.Tests/Services/Archive/ArchiveCatchup/FakeArchiveStorage.cs b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/ArchiveCatchup/FakeArchiveStorage.cs
new file mode 100644
index 00000000000..db4fee85e21
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/ArchiveCatchup/FakeArchiveStorage.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Core.Services.Archive.Storage;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+namespace KurrentDB.Core.XUnit.Tests.Services.Archive.ArchiveCatchup;
+
+internal class FakeArchiveStorage : IArchiveStorage {
+	private readonly int _chunkSize;
+	private readonly int _fileSize;
+	private readonly long _checkpoint;
+
+	private readonly Action<int> _onGetChunk;
+
+	public int[] ChunkGets {
+		get {
+			lock (_chunkGets) {
+				return _chunkGets.Order().ToArray();
+			}
+		}
+	}
+	private readonly List<int> _chunkGets;
+
+	public FakeArchiveStorage(int chunkSize, long checkpoint, Action<int> onGetChunk) {
+		_chunkSize = chunkSize;
+		_fileSize = ChunkHeader.Size + _chunkSize;
+		_checkpoint = checkpoint;
+		_onGetChunk = onGetChunk;
+		_chunkGets = [];
+	}
+
+	public ValueTask StoreChunk(IChunkBlob chunk, CancellationToken ct) => throw new NotImplementedException();
+	public ValueTask SetCheckpoint(long checkpoint, CancellationToken ct) => throw new NotImplementedException();
+
+	public ValueTask<long> GetCheckpoint(CancellationToken ct) {
+		return ValueTask.FromResult(_checkpoint);
+	}
+
+	private ChunkHeader CreateChunkHeader(int chunkStartNumber, int chunkEndNumber) {
+		return new ChunkHeader(
+			version: (int)TFChunk.ChunkVersions.Transformed,
+			minCompatibleVersion: (int)TFChunk.ChunkVersions.Transformed,
+			chunkSize: _chunkSize,
+			chunkStartNumber,
+			chunkEndNumber,
+			isScavenged: false,
+			chunkId: Guid.NewGuid(),
+			transformType: TransformType.Identity);
+	}
+
+	public ValueTask<int> ReadAsync(int logicalChunkNumber, Memory<byte> buffer, long offset, CancellationToken ct) {
+		if (offset == _fileSize)
+			return new(0); // end of stream
+
+		// we expect to read the chunk in one shot
+		if (offset != 0)
+			throw new NotImplementedException();
+
+		if (buffer.Length < _fileSize)
+			throw new NotImplementedException();
+
+		lock (_chunkGets) {
+			_chunkGets.Add(logicalChunkNumber);
+		}
+
+		_onGetChunk?.Invoke(logicalChunkNumber);
+		var header = CreateChunkHeader(logicalChunkNumber, logicalChunkNumber);
+		header.Format(buffer.Span[..ChunkHeader.Size]);
+
+		return new(_fileSize);
+	}
+
+	public ValueTask<ArchivedChunkMetadata> GetMetadataAsync(int logicalChunkNumber, CancellationToken token) {
+		return ValueTask.FromResult<ArchivedChunkMetadata>(new(PhysicalSize: _fileSize));
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Services/Archive/ArchiveOptionsTests.cs b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/ArchiveOptionsTests.cs
new file mode 100644
index 00000000000..00e106483b0
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/ArchiveOptionsTests.cs
@@ -0,0 +1,126 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Common.Exceptions;
+using KurrentDB.Core.Services.Archive;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Services.Archive;
+public class ArchiveOptionsTests {
+	[Fact]
+	public void default_is_valid() {
+		var sut = new ArchiveOptions();
+		sut.Validate();
+	}
+
+	[Fact]
+	public void unspecified_storage_type_is_invalid() {
+		var sut = new ArchiveOptions {
+			Enabled = true,
+			StorageType = StorageType.Unspecified,
+		};
+		var ex = Assert.Throws<InvalidConfigurationException>(sut.Validate);
+		Assert.Contains("StorageType", ex.Message);
+	}
+
+	[Fact]
+	public void can_use_file_system_options() {
+		var sut = new ArchiveOptions {
+			Enabled = true,
+			RetainAtLeast = new() {
+				Days = 5,
+				LogicalBytes = 500,
+			},
+			StorageType = StorageType.FileSystemDevelopmentOnly,
+			FileSystem = new() {
+				Path = "c:/archive",
+			},
+		};
+		sut.Validate();
+	}
+
+	[Fact]
+	public void can_use_s3_options() {
+		var sut = new ArchiveOptions {
+			Enabled = true,
+			RetainAtLeast = new() {
+				Days = 5,
+				LogicalBytes = 500,
+			},
+			StorageType = StorageType.S3,
+			S3 = new() {
+				Bucket = "bouquet",
+				Region = "the-region",
+			},
+		};
+		sut.Validate();
+	}
+
+	[Fact]
+	public void file_system_options_require_path() {
+		var sut = new ArchiveOptions {
+			Enabled = true,
+			StorageType = StorageType.FileSystemDevelopmentOnly,
+		};
+		var ex = Assert.Throws<InvalidConfigurationException>(sut.Validate);
+		Assert.Contains("Path", ex.Message);
+	}
+
+	[Fact]
+	public void s3_options_require_bucket() {
+		var sut = new ArchiveOptions {
+			Enabled = true,
+			StorageType = StorageType.S3,
+			S3 = new() {
+				Region = "the-region",
+			}
+		};
+		var ex = Assert.Throws<InvalidConfigurationException>(sut.Validate);
+		Assert.Contains("Bucket", ex.Message);
+	}
+
+	[Fact]
+	public void s3_options_require_region() {
+		var sut = new ArchiveOptions {
+			Enabled = true,
+			StorageType = StorageType.S3,
+			S3 = new() {
+				Bucket = "the-bucket",
+			}
+		};
+		var ex = Assert.Throws<InvalidConfigurationException>(sut.Validate);
+		Assert.Contains("Region", ex.Message);
+	}
+
+	[Fact]
+	public void retention_options_require_days() {
+		var sut = new ArchiveOptions {
+			Enabled = true,
+			StorageType = StorageType.FileSystemDevelopmentOnly,
+			FileSystem = new() {
+				Path = "c:/archive",
+			},
+			RetainAtLeast = new() {
+				LogicalBytes = 50,
+			}
+		};
+		var ex = Assert.Throws<InvalidConfigurationException>(sut.Validate);
+		Assert.Contains("Days", ex.Message);
+	}
+
+	[Fact]
+	public void retention_options_require_logical_bytes() {
+		var sut = new ArchiveOptions {
+			Enabled = true,
+			StorageType = StorageType.FileSystemDevelopmentOnly,
+			FileSystem = new() {
+				Path = "c:/archive",
+			},
+			RetainAtLeast = new() {
+				Days = 50,
+			}
+		};
+		var ex = Assert.Throws<InvalidConfigurationException>(sut.Validate);
+		Assert.Contains("LogicalBytes", ex.Message);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Services/Archive/ArchivePlugableComponentTests.cs b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/ArchivePlugableComponentTests.cs
new file mode 100644
index 00000000000..73834ba8640
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/ArchivePlugableComponentTests.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using EventStore.Plugins;
+using EventStore.Plugins.Licensing;
+using KurrentDB.Core.Configuration.Sources;
+using KurrentDB.Core.Services.Archive;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Services.Archive;
+
+public class ArchivePlugableComponentTests {
+	[Theory]
+	[InlineData(true, true, "ARCHIVE", false)]
+	[InlineData(true, false, "ARCHIVE", true)]
+	[InlineData(false, true, "ARCHIVE", false)]
+	[InlineData(false, false, "ARCHIVE", false)]
+	[InlineData(true, true, "NONE", true)]
+	[InlineData(true, false, "NONE", true)]
+	[InlineData(false, true, "NONE", false)]
+	[InlineData(false, false, "NONE", false)]
+	public void respects_license(bool enabled, bool licensePresent, string entitlement, bool expectedException) {
+		// given
+		var sut = new ArchivePlugableComponent(isArchiver: false);
+
+		IConfigurationBuilder configBuilder = new ConfigurationBuilder();
+
+		if (enabled)
+			configBuilder = configBuilder.AddInMemoryCollection(new Dictionary<string, string> {
+				{$"{KurrentConfigurationKeys.Prefix}:Archive:Enabled", "true"},
+			});
+
+		var config = configBuilder.Build();
+
+		var builder = WebApplication.CreateBuilder();
+
+		var licenseService = new FakeLicenseService(licensePresent, entitlement);
+		builder.Services.AddSingleton<ILicenseService>(licenseService);
+		builder.Services.AddSingleton<IReadOnlyList<IClusterVNodeStartupTask>>([]);
+
+		((IPlugableComponent)sut).ConfigureServices(
+			builder.Services,
+			config);
+
+		var app = builder.Build();
+
+		// when
+		((IPlugableComponent)sut).ConfigureApplication(app, config);
+
+		// then
+		if (expectedException) {
+			Assert.NotNull(licenseService.RejectionException);
+		} else {
+			Assert.Null(licenseService.RejectionException);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Archiver/ArchiverServiceTests.cs b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Archiver/ArchiverServiceTests.cs
new file mode 100644
index 00000000000..ecd61e0facc
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Archiver/ArchiverServiceTests.cs
@@ -0,0 +1,200 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Threading;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Archive.Archiver;
+using KurrentDB.Core.Services.Archive.Storage;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.TransactionLog;
+using KurrentDB.Core.Tests.TransactionLog.Scavenging.Helpers;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Services.Archive.Archiver;
+
+public sealed class ArchiverServiceTests : DirectoryPerTest<ArchiverServiceTests> {
+
+	[Fact]
+	public async Task chunk_order_preserved() {
+		var indexDirectory = Fixture.GetFilePathFor("index");
+		using var logFormat = LogFormatHelper<LogFormat.V2, string>.LogFormatFactory.Create(new() {
+			IndexDirectory = indexDirectory,
+		});
+		var dbConfig = TFChunkHelper.CreateSizedDbConfig(Fixture.Directory, 0, chunkSize: 1024 * 1024);
+		var dbCreator = await TFChunkDbCreationHelper<LogFormat.V2, string>.CreateAsync(dbConfig, logFormat);
+		await using var result = await dbCreator
+			.Chunk(Rec.Write(0, "test"))
+			.Chunk(Rec.Write(1, "test"))
+			.Chunk(Rec.Write(2, "test"))
+			.CreateDb();
+
+		var storage = new FakeArchiveStorage();
+
+		await using (var archiver = new ArchiverService(new FakeSubscriber(), storage, result.Db.Manager)) {
+			archiver.Handle(new SystemMessage.SystemStart()); // start archiving background task
+			archiver.Handle(new ReplicationTrackingMessage.ReplicatedTo(result.Db.Config.WriterCheckpoint.Read()));
+
+			var timeout = TimeSpan.FromSeconds(20);
+			while (storage.NumStores < 2) {
+				Assert.True(await storage.StoreChunkEvent.WaitAsync(timeout));
+			}
+		}
+
+		Assert.True(storage.Checkpoint > 0L);
+		Assert.Equal<int>([0, 1], storage.Chunks);
+	}
+
+	[Fact]
+	public async Task switched_chunk_archived() {
+		var indexDirectory = Fixture.GetFilePathFor("index");
+		using var logFormat = LogFormatHelper<LogFormat.V2, string>.LogFormatFactory.Create(new() {
+			IndexDirectory = indexDirectory,
+		});
+		var dbConfig = TFChunkHelper.CreateSizedDbConfig(Fixture.Directory, 0, chunkSize: 1024 * 1024);
+		var dbCreator = await TFChunkDbCreationHelper<LogFormat.V2, string>.CreateAsync(dbConfig, logFormat);
+		await using var result = await dbCreator
+			.Chunk(Rec.Write(0, "test"))
+			.Chunk(Rec.Write(1, "test"))
+			.Chunk(Rec.Write(2, "test"))
+			.CreateDb();
+
+		var storage = new FakeArchiveStorage();
+		await using (var archiver = new ArchiverService(new FakeSubscriber(), storage, result.Db.Manager)) {
+			archiver.Handle(new SystemMessage.SystemStart()); // start archiving background task
+			archiver.Handle(new ReplicationTrackingMessage.ReplicatedTo(result.Db.Config.WriterCheckpoint.Read()));
+
+			// ensure that chunks archived
+			var timeout = TimeSpan.FromSeconds(20);
+			while (storage.NumStores < 2) {
+				Assert.True(await storage.StoreChunkEvent.WaitAsync(timeout));
+			}
+
+			// triggers chunk switch
+			storage.StoreChunkEvent.Reset();
+			var chunk = await result.Db.Manager.GetInitializedChunk(0, CancellationToken.None);
+			archiver.Handle(new SystemMessage.ChunkSwitched(chunk.ChunkInfo));
+			Assert.True(await storage.StoreChunkEvent.WaitAsync(timeout));
+		}
+
+		Assert.Equal(3, storage.NumStores);
+	}
+
+	[Fact]
+	public async Task switched_chunk_not_archived_when_not_replicated() {
+		var indexDirectory = Fixture.GetFilePathFor("index");
+		using var logFormat = LogFormatHelper<LogFormat.V2, string>.LogFormatFactory.Create(new() {
+			IndexDirectory = indexDirectory,
+		});
+		var dbConfig = TFChunkHelper.CreateSizedDbConfig(Fixture.Directory, 0, chunkSize: 1024 * 1024);
+		var dbCreator = await TFChunkDbCreationHelper<LogFormat.V2, string>.CreateAsync(dbConfig, logFormat);
+		await using var result = await dbCreator
+			.Chunk(Rec.Write(0, "test"))
+			.Chunk(Rec.Write(1, "test"))
+			.Chunk(Rec.Write(2, "test"))
+			.CreateDb();
+
+		var storage = new FakeArchiveStorage();
+		await using (var archiver = new ArchiverService(new FakeSubscriber(), storage, result.Db.Manager)) {
+			archiver.Handle(new SystemMessage.SystemStart()); // start archiving background task
+
+			// archive chunk #0
+			archiver.Handle(new ReplicationTrackingMessage.ReplicatedTo((await result.Db.Manager.GetInitializedChunk(0, CancellationToken.None)).ChunkHeader.ChunkEndPosition));
+
+			// switch chunk #1
+			archiver.Handle(new SystemMessage.ChunkSwitched((await result.Db.Manager.GetInitializedChunk(1, CancellationToken.None)).ChunkInfo));
+
+			// ensure that just one chunk is archived
+			var timeout = TimeSpan.FromSeconds(20);
+			await storage.StoreChunkEvent.WaitAsync(timeout);
+		}
+
+		Assert.Equal(1, storage.NumStores);
+		Assert.Contains(0, storage.Chunks);
+	}
+
+	[Fact]
+	public async Task switched_chunk_not_archived_when_its_remote() {
+		var indexDirectory = Fixture.GetFilePathFor("index");
+		using var logFormat = LogFormatHelper<LogFormat.V2, string>.LogFormatFactory.Create(new() {
+			IndexDirectory = indexDirectory,
+		});
+		var dbConfig = TFChunkHelper.CreateSizedDbConfig(Fixture.Directory, 0, chunkSize: 1024 * 1024);
+		var dbCreator = await TFChunkDbCreationHelper<LogFormat.V2, string>.CreateAsync(dbConfig, logFormat);
+		await using var result = await dbCreator
+			.Chunk(Rec.Write(0, "test"))
+			.Chunk(Rec.Write(1, "test"))
+			.Chunk(Rec.Write(2, "test"))
+			.CreateDb();
+
+		var storage = new FakeArchiveStorage();
+		await using (var archiver = new ArchiverService(new FakeSubscriber(), storage, result.Db.Manager)) {
+			archiver.Handle(new SystemMessage.SystemStart()); // start archiving background task
+			archiver.Handle(new ReplicationTrackingMessage.ReplicatedTo(result.Db.Config.WriterCheckpoint.Read()));
+
+			// ensure that chunks archived
+			var timeout = TimeSpan.FromSeconds(20);
+			while (storage.NumStores < 2) {
+				Assert.True(await storage.StoreChunkEvent.WaitAsync(timeout));
+			}
+
+			// triggers chunk switch
+			storage.StoreChunkEvent.Reset();
+			var chunk = await result.Db.Manager.GetInitializedChunk(0, CancellationToken.None);
+			archiver.Handle(new SystemMessage.ChunkSwitched(chunk.ChunkInfo with { IsRemote = true }));
+
+			await storage.StoreChunkEvent.WaitAsync(timeout: TimeSpan.FromSeconds(1));
+		}
+
+		Assert.Equal(2, storage.NumStores);
+	}
+}
+
+file sealed class FakeSubscriber : ISubscriber {
+	public void Subscribe<T>(IAsyncHandle<T> handler) where T : Message { }
+	public void Unsubscribe<T>(IAsyncHandle<T> handler) where T : Message { }
+}
+
+file sealed class FakeArchiveStorage : IArchiveStorage {
+	public readonly List<int> Chunks;
+	public readonly AsyncAutoResetEvent StoreChunkEvent;
+	public volatile int NumStores;
+
+	public long Checkpoint;
+
+	public FakeArchiveStorage(long existingCheckpoint = 0L) {
+		Checkpoint = existingCheckpoint;
+		Chunks = [];
+		StoreChunkEvent = new(initialState: false);
+	}
+
+	public ValueTask StoreChunk(IChunkBlob chunk, CancellationToken ct) {
+		Chunks.Add(chunk.ChunkHeader.ChunkStartNumber);
+		Interlocked.Increment(ref NumStores);
+		StoreChunkEvent.Set();
+		return ValueTask.CompletedTask;
+	}
+
+	public ValueTask<long> GetCheckpoint(CancellationToken ct) {
+		return ValueTask.FromResult(Checkpoint);
+	}
+
+	public ValueTask SetCheckpoint(long checkpoint, CancellationToken ct) {
+		Checkpoint = checkpoint;
+		return ValueTask.CompletedTask;
+	}
+
+	public ValueTask<int> ReadAsync(int logicalChunkNumber, Memory<byte> buffer, long offset, CancellationToken ct) {
+		throw new NotImplementedException();
+	}
+
+	public ValueTask<ArchivedChunkMetadata> GetMetadataAsync(int logicalChunkNumber, CancellationToken token) {
+		throw new NotImplementedException();
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Services/Archive/FakeLicensingService.cs b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/FakeLicensingService.cs
new file mode 100644
index 00000000000..2466b300a87
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/FakeLicensingService.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Reactive.Subjects;
+using EventStore.Plugins.Licensing;
+using Microsoft.IdentityModel.JsonWebTokens;
+
+namespace KurrentDB.Core.XUnit.Tests.Services.Archive;
+
+public class FakeLicenseService : ILicenseService {
+	static readonly Dictionary<string, string> _hardCodedTokens = new() {
+		{ "ARCHIVE", "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJlc2RiIiwiaXNzIjoiZXNkYiIsImV4cCI6MTgyNjAwODExMiwianRpIjoiYWFjNDJiZjctMmU3Mi00ZjkxLWE5Y2EtNTcyNDVhOTYxMmRjIiwic3ViIjoiRVNEQiBUZXN0cyIsIklzVHJpYWwiOiJUcnVlIiwiSXNFeHBpcmVkIjoiRmFsc2UiLCJJc1ZhbGlkIjoiVHJ1ZSIsIklzRmxvYXRpbmciOiJUcnVlIiwiRGF5c1JlbWFpbmluZyI6IjEiLCJTdGFydERhdGUiOiI0LzI2LzIwMjQgMTI6MDA6MDAgQU0gKzA0OjAwIiwiQVJDSElWRSI6InRydWUiLCJpYXQiOjE3MzE0MDAxMTMsIm5iZiI6MTczMTQwMDExM30.a1shRx8Z1AaOS6owhs3TgCr4jlBTir7qgV52QcoHmUhO9QZzPsEocDASPPrIiefitpVq-A7tpjiXR214xaSwqAtZjVCv0xWtsHxQ_ciO5Whyuw4TjyTlvuIziolfwhopmX0bOX0GJOkpKOW_HRU1nHhwiAyqtbV5o7vecG8btEZlWaAm4CvWEQZEAPW-1bj65lIU0dzcZJGBGuckeIeuZXZynFHsO_5KJNhmO7ZQKm-RkvRG-8aVQb8L9jkR3FM6COxcNJl6JWEdt3q_jUJ45T57PZ-sJ3bG64EkhbJtTrCD-3msgCWF0-QcV7TqOakA5ClyedsgtoB6Qonb-m5iAg" },
+		{ "NONE", "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJlc2RiIiwiaXNzIjoiZXNkYiIsImV4cCI6MTgyNDQ1NjgyOSwianRpIjoiOTVmZTY2YzAtMDRkMi00MjExLWI1ZGQtNTAyM2MyYTAxMGFiIiwic3ViIjoiRVNEQiBUZXN0cyIsIklzVHJpYWwiOiJUcnVlIiwiSXNFeHBpcmVkIjoiRmFsc2UiLCJJc1ZhbGlkIjoiVHJ1ZSIsIklzRmxvYXRpbmciOiJUcnVlIiwiRGF5c1JlbWFpbmluZyI6IjEiLCJTdGFydERhdGUiOiIyNi8wNC8yMDI0IDAwOjAwOjAwICswMTowMCIsIk5PTkUiOiJ0cnVlIiwiaWF0IjoxNzI5ODQ4ODI5LCJuYmYiOjE3Mjk4NDg4Mjl9.R24i-ZAow3BhRaST3n25Uc_nQ184k83YRZZ0oRcWbU9B9XNLRH0Iegj0HmkyzkT50I4gcIJOIfcO6mIPp4Y959CP7aTAlt7XEnXoGF0GwsfXatAxy4iXG8Gpya7INgMoWEeN0v8eDH8_OVmnieOxeba9ex5j1oAW_FtQDMzcFjAeErpW__8zmkCsn6GzvlhdLE4e3r2wjshvrTTcS_1fvSVjQZov5ce2sVBJPegjCLO_QGiIBK9QTnpHrhe6KCYje6fSTjgty0V1Qj22bftvrXreYzQijPrnC_ek1BwV-A1JvacZugMCPIy8WvE5jE3hVYRWGGUzQZ-CibPGsjudYA" },
+	};
+
+	public FakeLicenseService(bool createLicense = true, string? entitlement = null) {
+		var license = new License(new JsonWebToken(_hardCodedTokens[entitlement ?? "NONE"]));
+		SelfLicense = license;
+
+		if (createLicense) {
+			CurrentLicense = license;
+			Licenses = new BehaviorSubject<License>(license);
+		} else {
+			var licenses = new Subject<License>();
+			licenses.OnError(new Exception("no license"));
+			Licenses = licenses;
+		}
+	}
+
+	public License SelfLicense { get; }
+
+	public License? CurrentLicense { get; }
+
+	public IObservable<License> Licenses { get; }
+
+	public void RejectLicense(Exception ex) {
+		RejectionException = ex;
+	}
+
+	public Exception? RejectionException { get; private set; }
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Naming/ArchiveNamingStrategyTests.cs b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Naming/ArchiveNamingStrategyTests.cs
new file mode 100644
index 00000000000..8179700d339
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Naming/ArchiveNamingStrategyTests.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Services.Archive.Naming;
+using KurrentDB.Core.TransactionLog.FileNamingStrategy;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Services.Archive.Naming;
+
+public class ArchiveNamingStrategyTests {
+	private static ArchiveNamingStrategy CreateSut() {
+		var namingStrategy = new VersionedPatternFileNamingStrategy(string.Empty, "chunk-");
+		return new ArchiveNamingStrategy(namingStrategy);
+	}
+
+	[Theory]
+	[InlineData(0, "chunk-000000.000001")]
+	[InlineData(1, "chunk-000001.000001")]
+	[InlineData(1000, "chunk-001000.000001")]
+	public void returns_correct_file_name(int logicalChunkNumber, string expectedFileName) {
+		var sut = CreateSut();
+		Assert.Equal(expectedFileName, sut.GetBlobNameFor(logicalChunkNumber));
+	}
+
+	[Fact]
+	public void throws_if_chunk_number_is_negative() {
+		var sut = CreateSut();
+		Assert.Throws<ArgumentOutOfRangeException>(() => sut.GetBlobNameFor(-1));
+		Assert.Throws<ArgumentOutOfRangeException>(() => sut.GetBlobNameFor(-2));
+	}
+
+	[Fact]
+	public void returns_correct_prefix() {
+		var sut = CreateSut();
+		Assert.Equal("chunk-", sut.Prefix);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/ArchiveChunkHandleTests.cs b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/ArchiveChunkHandleTests.cs
new file mode 100644
index 00000000000..24a894919a0
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/ArchiveChunkHandleTests.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Archive;
+using KurrentDB.Core.Services.Archive.Storage;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Services.Archive.Storage;
+
+[Collection("ArchiveStorageTests")]
+public class ArchiveChunkHandleTests : ArchiveStorageTestsBase<ArchiveChunkHandleTests> {
+	[Theory]
+	[StorageData.S3]
+	[StorageData.FileSystem]
+	public async Task can_read_chunk_via_stream(StorageType storageType) {
+		var archive = CreateSut(storageType);
+
+		// create a chunk and upload it
+		await using var chunk = await CreateLocalChunk(0, 0);
+		await archive.StoreChunk(chunk, CancellationToken.None);
+
+		// read the local chunk
+		var localContent = await chunk.ReadAllBytes();
+
+		// read the uploaded chunk
+		using var sut = await ArchivedChunkHandle.OpenForReadAsync(archive, 0, CancellationToken.None);
+		await using var inputStream = sut.CreateStream();
+		var outputStream = new MemoryStream();
+		await inputStream.CopyToAsync(outputStream, CancellationToken.None);
+
+		// then
+		Assert.Equal(localContent, outputStream.ToArray());
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/ArchiveStorageTests.cs b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/ArchiveStorageTests.cs
new file mode 100644
index 00000000000..292443dfd8b
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/ArchiveStorageTests.cs
@@ -0,0 +1,147 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Buffers;
+using KurrentDB.Core.Services.Archive;
+using KurrentDB.Core.Services.Archive.Storage.Exceptions;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Services.Archive.Storage;
+
+[Collection("ArchiveStorageTests")]
+public class ArchiveStorageTests : ArchiveStorageTestsBase<ArchiveStorageTests> {
+	[Theory]
+	[StorageData.S3]
+	[StorageData.FileSystem]
+	public async Task can_read_chunk_entirely(StorageType storageType) {
+		var sut = CreateSut(storageType);
+
+		// create a chunk and upload it
+		await using var chunk = await CreateLocalChunk(0, 0);
+		await sut.StoreChunk(chunk, CancellationToken.None);
+
+		// read the local chunk
+		var localContent = await chunk.ReadAllBytes();
+
+		// read the uploaded chunk
+		using var buffer = Memory.AllocateExactly<byte>(1048);
+		var read = await sut.ReadAsync(0, buffer.Memory, offset: 0, CancellationToken.None);
+
+		// then
+		Assert.Equal(localContent, buffer.Memory[..read].ToArray());
+	}
+
+	[Theory]
+	[StorageData.S3]
+	[StorageData.FileSystem]
+	public async Task can_read_chunk_partially(StorageType storageType) {
+		var sut = CreateSut(storageType);
+
+		// create a chunk and upload it
+		await using var chunk = await CreateLocalChunk(0, 0);
+		await sut.StoreChunk(chunk, CancellationToken.None);
+
+		// read the local chunk
+		var localContent = await chunk.ReadAllBytes();
+
+		// read the uploaded chunk partially
+		var start = localContent.Length / 2;
+		var end = localContent.Length;
+		using var buffer = Memory.AllocateExactly<byte>(1048);
+		var read = await sut.ReadAsync(0, buffer.Memory, offset: start, CancellationToken.None);
+
+		// then
+		Assert.Equal(localContent[start..end], buffer.Memory[..read].ToArray());
+	}
+
+	[Theory]
+	[StorageData.S3]
+	[StorageData.FileSystem]
+	public async Task can_read_outside_of_range(StorageType storageType) {
+		var sut = CreateSut(storageType);
+
+		// create a chunk and upload it
+		await using var chunk = await CreateLocalChunk(0, 0);
+		await sut.StoreChunk(chunk, CancellationToken.None);
+
+		// read the uploaded chunk partially
+		using var buffer = Memory.AllocateExactly<byte>(1048);
+		Assert.Equal(0, await sut.ReadAsync(0, buffer.Memory, offset: 1_000, CancellationToken.None));
+		Assert.Equal(0, await sut.ReadAsync(0, buffer.Memory, offset: 1_000_000, CancellationToken.None));
+	}
+
+	// not useful in practice but to ensure consistency across the implementations
+	[Theory]
+	[StorageData.S3]
+	[StorageData.FileSystem]
+	public async Task can_read_with_zero_length_buffer(StorageType storageType) {
+		var sut = CreateSut(storageType);
+
+		// create a chunk and upload it
+		await using var chunk = await CreateLocalChunk(0, 0);
+		await sut.StoreChunk(chunk, CancellationToken.None);
+
+		// read the uploaded chunk partially
+		using var buffer = Memory.AllocateExactly<byte>(0);
+		Assert.Equal(0, await sut.ReadAsync(0, buffer.Memory, offset: 0, CancellationToken.None));
+	}
+
+	[Theory]
+	[StorageData.S3]
+	[StorageData.FileSystem]
+	public async Task read_with_negative_offset_throws(StorageType storageType) {
+		var sut = CreateSut(storageType);
+
+		// create a chunk and upload it
+		await using var chunk = await CreateLocalChunk(0, 0);
+		await sut.StoreChunk(chunk, CancellationToken.None);
+
+		// read the uploaded chunk partially
+		using var buffer = Memory.AllocateExactly<byte>(0);
+		await Assert.ThrowsAsync<ArgumentOutOfRangeException>(async () => {
+			await sut.ReadAsync(0, buffer.Memory, offset: -1, CancellationToken.None);
+		});
+	}
+
+	[Theory]
+	[StorageData.S3]
+	[StorageData.FileSystem]
+	public async Task read_missing_chunk_throws_ChunkDeletedException(StorageType storageType) {
+		var sut = CreateSut(storageType);
+
+		await Assert.ThrowsAsync<ChunkDeletedException>(async () => {
+			await sut.ReadAsync(33, Memory<byte>.Empty, offset: 0, CancellationToken.None);
+		});
+	}
+
+	[Theory]
+	[StorageData.S3]
+	[StorageData.FileSystem]
+	public async Task can_store_a_chunk(StorageType storageType) {
+		var sut = CreateSut(storageType);
+		await using var localChunk = await CreateLocalChunk(0, 0);
+		await sut.StoreChunk(localChunk, CancellationToken.None);
+
+		var localChunkContent = await localChunk.ReadAllBytes();
+
+		using var buffer = Memory.AllocateExactly<byte>(1048);
+		var read = await sut.ReadAsync(0, buffer.Memory, offset: 0, CancellationToken.None);
+		Assert.Equal(localChunkContent, buffer.Memory[..read].ToArray());
+	}
+
+	[Theory]
+	[StorageData.S3]
+	[StorageData.FileSystem]
+	public async Task can_write_and_read_checkpoint(StorageType storageType) {
+		var checkpoint = Random.Shared.NextInt64();
+		var sut = CreateSut(storageType);
+
+		var writerSut = CreateSut(storageType);
+		await writerSut.SetCheckpoint(checkpoint, CancellationToken.None);
+
+		Assert.Equal(checkpoint, await sut.GetCheckpoint(CancellationToken.None));
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/ArchiveStorageTestsBase.cs b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/ArchiveStorageTestsBase.cs
new file mode 100644
index 00000000000..0197e5ecf8e
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/ArchiveStorageTestsBase.cs
@@ -0,0 +1,116 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Security.Cryptography;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Core.Services.Archive;
+using KurrentDB.Core.Services.Archive.Naming;
+using KurrentDB.Core.Services.Archive.Storage;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.FileNamingStrategy;
+
+namespace KurrentDB.Core.XUnit.Tests.Services.Archive.Storage;
+
+public abstract class ArchiveStorageTestsBase<T> : DirectoryPerTest<T> {
+	protected const string AwsRegion = "eu-west-1";
+	protected const string AwsBucket = "archiver-unit-tests";
+
+	protected const string ChunkPrefix = "chunk-";
+	protected string ArchivePath => Path.Combine(Fixture.Directory, "archive");
+	protected string DbPath => Path.Combine(Fixture.Directory, "db");
+
+	public ArchiveStorageTestsBase() {
+		Directory.CreateDirectory(ArchivePath);
+		Directory.CreateDirectory(DbPath);
+	}
+
+	protected IArchiveStorage CreateSut(StorageType storageType) {
+		var namingStrategy = new VersionedPatternFileNamingStrategy(ArchivePath, ChunkPrefix);
+		var archiveNamingStrategy = new ArchiveNamingStrategy(namingStrategy);
+		var archiveStorage = ArchiveStorageFactory.Create(
+				new() {
+					StorageType = storageType,
+					FileSystem = new() {
+						Path = ArchivePath
+					},
+					S3 = new() {
+						Bucket = AwsBucket,
+						Region = AwsRegion,
+					}
+				},
+				archiveNamingStrategy);
+		return archiveStorage;
+	}
+
+	protected static async ValueTask<FakeChunkBlob> CreateChunk(string path, int chunkStartNumber, byte chunkVersion) {
+		var namingStrategy = new VersionedPatternFileNamingStrategy(path, ChunkPrefix);
+
+		var chunk = Path.Combine(path, namingStrategy.GetFilenameFor(chunkStartNumber, chunkVersion));
+		var content = new byte[1000];
+		RandomNumberGenerator.Fill(content);
+		var result = new FakeChunkBlob(chunk, chunkStartNumber, chunkVersion);
+		await result.WriteAsync(content);
+		await result.FlushAsync();
+		result.Seek(0, SeekOrigin.Begin);
+		return result;
+	}
+
+	protected ValueTask<FakeChunkBlob> CreateArchiveChunk(int chunkStartNumber, byte chunkVersion) => CreateChunk(ArchivePath, chunkStartNumber, chunkVersion);
+	protected ValueTask<FakeChunkBlob> CreateLocalChunk(int chunkStartNumber, byte chunkVersion) => CreateChunk(DbPath, chunkStartNumber, chunkVersion);
+
+	protected sealed class FakeChunkBlob(string chunkPath, int chunkStartNumber, byte chunkVersion, FileMode mode = FileMode.Create) : FileStream(chunkPath, mode, FileAccess.ReadWrite, FileShare.None, 1024, FileOptions.Asynchronous), IChunkBlob {
+		private ChunkHeader _header;
+		private ChunkFooter _footer;
+
+		public string ChunkLocator => Name;
+
+		ValueTask IChunkBlob.EnsureInitialized(CancellationToken token)
+			=> token.IsCancellationRequested ? ValueTask.FromCanceled(token) : ValueTask.CompletedTask;
+
+		public ValueTask<IChunkRawReader> AcquireRawReader(CancellationToken token)
+			=> token.IsCancellationRequested
+				? ValueTask.FromCanceled<IChunkRawReader>(token)
+				: ValueTask.FromResult<IChunkRawReader>(new StreamReader(this));
+
+		public IAsyncEnumerable<IChunkBlob> UnmergeAsync(CancellationToken token) {
+			throw new NotImplementedException();
+		}
+
+		public void MarkForDeletion() {
+			throw new NotImplementedException();
+		}
+
+		public async ValueTask<byte[]> ReadAllBytes() {
+			var buffer = new byte[Length];
+			Position = 0L;
+			await ReadExactlyAsync(buffer);
+			return buffer;
+		}
+
+		public ChunkHeader ChunkHeader {
+			get {
+				return _header ??= new(chunkVersion, chunkVersion, (int)Length, chunkStartNumber,
+					chunkStartNumber, false, Guid.NewGuid(), TransformType.Identity);
+			}
+		}
+
+		public ChunkFooter ChunkFooter {
+			get {
+				return _footer ??= new(isCompleted: true, isMap12Bytes: false, (int)Length, Length, mapSize: 0);
+			}
+		}
+	}
+
+	private sealed class StreamReader(Stream stream) : IChunkRawReader {
+		void IDisposable.Dispose() {
+		}
+
+		Stream IChunkRawReader.Stream => stream;
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/AwsCliDirectoryNotFoundException.cs b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/AwsCliDirectoryNotFoundException.cs
new file mode 100644
index 00000000000..4988960b6c6
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/AwsCliDirectoryNotFoundException.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+
+namespace KurrentDB.Core.XUnit.Tests.Services.Archive.Storage;
+
+public sealed class AwsCliDirectoryNotFoundException(string path)
+	: DirectoryNotFoundException($"Directory '{path}' with config files for AWS CLI doesn't exist");
diff --git a/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/BlobStorageTests.cs b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/BlobStorageTests.cs
new file mode 100644
index 00000000000..d63e4c4147c
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/BlobStorageTests.cs
@@ -0,0 +1,136 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Security.Cryptography;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Buffers;
+using KurrentDB.Core.Services.Archive;
+using KurrentDB.Core.Services.Archive.Storage;
+using KurrentDB.Core.Services.Archive.Storage.S3;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Services.Archive.Storage;
+
+// some of the behavior of the blob storage implementations is covered by ArchiveStorageTests.cs
+[Collection("ArchiveStorageTests")]
+public class BlobStorageTests : DirectoryPerTest<BlobStorageTests> {
+	protected const string AwsRegion = "eu-west-1";
+	protected const string AwsBucket = "archiver-unit-tests";
+
+	protected string ArchivePath => Path.Combine(Fixture.Directory, "archive");
+	protected string LocalPath => Path.Combine(Fixture.Directory, "local");
+
+	public BlobStorageTests() {
+		Directory.CreateDirectory(ArchivePath);
+		Directory.CreateDirectory(LocalPath);
+	}
+
+	IBlobStorage CreateSut(StorageType storageType) => storageType switch {
+		StorageType.FileSystemDevelopmentOnly =>
+			new FileSystemBlobStorage(new() {
+				Path = ArchivePath
+			}),
+		StorageType.S3 =>
+			new S3BlobStorage(new() {
+				Bucket = AwsBucket,
+				Region = AwsRegion,
+			}),
+		_ => throw new NotImplementedException(),
+	};
+
+	private async ValueTask<FileStream> CreateFile(string fileName, int fileSize) {
+		var path = Path.Combine(LocalPath, fileName);
+		using var content = Memory.AllocateExactly<byte>(fileSize);
+		RandomNumberGenerator.Fill(content.Span);
+		var fs = new FileStream(path, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.None, 512,
+			FileOptions.Asynchronous);
+		await fs.WriteAsync(content.Memory);
+		fs.Position = 0L;
+		return fs;
+	}
+
+	[Theory]
+	[StorageData.S3]
+	[StorageData.FileSystem]
+	public async Task can_read_file_entirely(StorageType storageType) {
+		var sut = CreateSut(storageType);
+
+		// create a file and upload it
+		const int fileSize = 1000;
+		string localPath;
+		await using (var fs = await CreateFile("local.file", fileSize)) {
+			await sut.StoreAsync(fs, "output.file", CancellationToken.None);
+			localPath = fs.Name;
+		}
+
+		// read the local file
+		var localContent = await File.ReadAllBytesAsync(localPath);
+
+		// read the uploaded file
+		using var buffer = Memory.AllocateExactly<byte>(fileSize);
+		await sut.ReadAsync("output.file", buffer.Memory, offset: 0, CancellationToken.None);
+
+		// then
+		Assert.Equal(localContent, buffer.Span);
+	}
+
+	[Theory]
+	[StorageData.S3]
+	[StorageData.FileSystem]
+	public async Task can_store_and_read_file_partially(StorageType storageType) {
+		var sut = CreateSut(storageType);
+
+		// create a file and upload it
+		string localPath;
+		await using (var fs = await CreateFile("local.file", fileSize: 1024)) {
+			await sut.StoreAsync(fs, "output.file", CancellationToken.None);
+			localPath = fs.Name;
+		}
+
+		// read the local file
+		var localContent = await File.ReadAllBytesAsync(localPath);
+
+		// read the uploaded file partially
+		var start = localContent.Length / 2;
+		var end = localContent.Length;
+		var length = end - start;
+		using var buffer = Memory.AllocateExactly<byte>(length);
+		await sut.ReadAsync("output.file", buffer.Memory, offset: start, CancellationToken.None);
+
+		// then
+		Assert.Equal(localContent.AsSpan(start..end), buffer.Span);
+	}
+
+	[Theory]
+	[StorageData.S3]
+	[StorageData.FileSystem]
+	public async Task can_retrieve_metadata(StorageType storageType) {
+		var sut = CreateSut(storageType);
+
+		// create a file and upload it
+		var fileSize = 345;
+		await using (var fs = await CreateFile("local.file", fileSize)) {
+			await sut.StoreAsync(fs, "output.file", CancellationToken.None);
+		}
+
+		// when
+		var metadata = await sut.GetMetadataAsync("output.file", CancellationToken.None);
+
+		// then
+		Assert.Equal(fileSize, metadata.Size);
+	}
+
+	[Theory]
+	[StorageData.S3]
+	[StorageData.FileSystem]
+	public async Task read_missing_file_throws_FileNotFoundException(StorageType storageType) {
+		var sut = CreateSut(storageType);
+
+		await Assert.ThrowsAsync<FileNotFoundException>(async () => {
+			await sut.ReadAsync("missing-from-archive.file", Memory<byte>.Empty, offset: 0, CancellationToken.None);
+		});
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/NoArchiveReaderTests.cs b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/NoArchiveReaderTests.cs
new file mode 100644
index 00000000000..9640b564371
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/NoArchiveReaderTests.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Archive.Storage;
+using KurrentDB.Core.Services.Archive.Storage.Exceptions;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Services.Archive.Storage;
+
+public class NoArchiveReaderTests {
+	private readonly NoArchiveReader _sut = NoArchiveReader.Instance;
+
+	[Fact]
+	public async Task checkpoint_is_zero() {
+		Assert.Equal(0, await _sut.GetCheckpoint(CancellationToken.None));
+	}
+
+	[Fact]
+	public async Task read_throws_chunk_deleted_exception() {
+		await Assert.ThrowsAsync<ChunkDeletedException>(async () => {
+			await _sut.ReadAsync(0, Memory<byte>.Empty, offset: 0, CancellationToken.None);
+		});
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/RemoteFileSystemTests.cs b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/RemoteFileSystemTests.cs
new file mode 100644
index 00000000000..500b810521e
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/RemoteFileSystemTests.cs
@@ -0,0 +1,149 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.LogV2;
+using KurrentDB.Core.Services.Archive;
+using KurrentDB.Core.Tests.TransactionLog;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.Transforms;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Services.Archive.Storage;
+
+[Collection("ArchiveStorageTests")]
+public sealed class RemoteFileSystemTests : ArchiveStorageTestsBase<RemoteFileSystemTests> {
+	// this is an integration test to check that the chunks are able to read through to remote storage
+	[Theory]
+	[StorageData.S3]
+	[StorageData.FileSystem]
+	public async Task chunk_can_read_record_from_object_storage(StorageType storageType) {
+		const int recordsCount = 10;
+		const int logicalChunkNumber = 42;
+
+		var archive = CreateSut(storageType);
+
+		// setup local chunk first
+		var localChunkName = "my-chunk";
+		var chunkLocalPath = Path.Combine(DbPath, localChunkName);
+		IReadOnlyList<ILogRecord> expectedRecords;
+		using (var localChunk = await TFChunkHelper.CreateNewChunk(chunkLocalPath)) {
+			expectedRecords = await WriteRecords(recordsCount, localChunk);
+
+			await localChunk.Complete(CancellationToken.None);
+		}
+
+		// upload the chunk
+		await using (var localChunk = new FakeChunkBlob(chunkLocalPath, logicalChunkNumber, 0, FileMode.Open)) {
+			await archive.StoreChunk(localChunk, CancellationToken.None);
+		}
+
+		// read the remote chunk
+		var codec = new PrefixingLocatorCodec();
+		var remoteChunkName = codec.EncodeRemote(logicalChunkNumber);
+		var fs = new FileSystemWithArchive(chunkSize: 4096, codec, new ChunkLocalFileSystem(DbPath), archive);
+		var actualRecords = new List<ILogRecord>(recordsCount);
+		using var remoteChunk = await TFChunk.FromCompletedFile(
+			fs, remoteChunkName, verifyHash: false,
+			reduceFileCachePressure: false,
+			unbufferedRead: false, tracker: new TFChunkTracker.NoOp(),
+			getTransformFactory: DbTransformManager.Default);
+
+		var logPosition = 0L;
+		for (var i = 0; i < recordsCount; i++) {
+			var result = await remoteChunk.TryReadClosestForward(logPosition, CancellationToken.None);
+			Assert.True(result.Success);
+			actualRecords.Add(result.LogRecord);
+			logPosition = result.NextPosition;
+		}
+
+		Assert.Equal<ILogRecord>(expectedRecords, actualRecords);
+	}
+
+	[Theory]
+	[StorageData.S3]
+	[StorageData.FileSystem]
+	public async Task chunk_can_bulk_read_record_from_object_storage(StorageType storageType) {
+		const int recordsCount = 10;
+		const int logicalChunkNumber = 43;
+
+		var archive = CreateSut(storageType);
+
+		// setup local chunk first
+		var localChunkName = "my-chunk";
+		var chunkLocalPath = Path.Combine(DbPath, localChunkName);
+		long payloadSize;
+		using (var localChunk = await TFChunkHelper.CreateNewChunk(chunkLocalPath)) {
+			var records = await WriteRecords(recordsCount, localChunk);
+			payloadSize = records.Aggregate(0L,
+				static (size, record) => size + record.GetSizeWithLengthPrefixAndSuffix());
+
+			await localChunk.Complete(CancellationToken.None);
+		}
+
+		// upload the chunk
+		await using (var localChunk = new FakeChunkBlob(chunkLocalPath, logicalChunkNumber, 0, FileMode.Open)) {
+			await archive.StoreChunk(localChunk, CancellationToken.None);
+		}
+
+		// read the remote chunk
+		var codec = new PrefixingLocatorCodec();
+		var remoteChunkName = codec.EncodeRemote(logicalChunkNumber);
+		var fs = new FileSystemWithArchive(chunkSize: 4096, codec, new ChunkLocalFileSystem(DbPath), archive);
+		using var remoteChunk = await TFChunk.FromCompletedFile(
+			fs, remoteChunkName, verifyHash: false,
+			reduceFileCachePressure: false,
+			unbufferedRead: false, tracker: new TFChunkTracker.NoOp(),
+			getTransformFactory: DbTransformManager.Default);
+
+		// make sure that chunks are equivalent
+		using (var localChunk = File.OpenHandle(chunkLocalPath, options: FileOptions.Asynchronous)) {
+			using var remoteReader = await remoteChunk.AcquireDataReader(CancellationToken.None);
+			Assert.False(remoteReader.IsMemory);
+			remoteReader.SetPosition(0L);
+
+			var expected = new byte[payloadSize];
+			await RandomAccess.ReadAsync(localChunk, expected, fileOffset: ChunkHeader.Size);
+
+			var actual = new byte[payloadSize];
+			await remoteReader.ReadNextBytes(actual, CancellationToken.None);
+
+			Assert.Equal(expected, actual);
+		}
+	}
+
+	private static async ValueTask<IReadOnlyList<ILogRecord>> WriteRecords(int count, TFChunk chunk, CancellationToken token = default) {
+		var records = new ILogRecord[count];
+
+		var recordFactory = new LogV2RecordFactory();
+		var logPosition = 0L;
+		for (var i = 0; i < count; i++) {
+			var record = records[i] = recordFactory.CreatePrepare(
+				logPosition: logPosition,
+				correlationId: Guid.NewGuid(),
+				eventId: Guid.NewGuid(),
+				transactionPosition: logPosition,
+				transactionOffset: 0,
+				eventStreamId: "my-stream",
+				expectedVersion: i,
+				timeStamp: DateTime.Now,
+				flags: PrepareFlags.SingleWrite,
+				eventType: "my-event-type",
+				data: Encoding.UTF8.GetBytes($"my-data-{i}"),
+				metadata: Encoding.UTF8.GetBytes($"my-metadata-{i}"));
+			var result = await chunk.TryAppend(record, token);
+			Assert.True(result.Success);
+			logPosition = result.NewPosition;
+		}
+
+		return records;
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/RemoteStorageTheoryAttribute.cs b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/RemoteStorageTheoryAttribute.cs
new file mode 100644
index 00000000000..c0429ff862b
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/RemoteStorageTheoryAttribute.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using KurrentDB.Core.Services.Archive;
+using Xunit.Sdk;
+
+namespace KurrentDB.Core.XUnit.Tests.Services.Archive.Storage;
+
+// if no symbol is required for the storage type then run the test (or not, according to skip).
+// else a symbol is required
+//    if required symbol is defined then check the prereqs, which throws if they are not present
+//    else the required symbol is not defined -> skip
+public static class StorageData {
+	public abstract class RemoteStorageDataAttribute : DataAttribute {
+		private readonly StorageType _storageType;
+		private readonly object[] _extraArgs;
+
+		protected RemoteStorageDataAttribute(StorageType storageType, object[] args, string symbol, PrerequisiteChecker checker) {
+			var symbolSet = false;
+			checker(ref symbolSet);
+			if (!symbolSet)
+				Skip = $"This remote storage test is disabled. Enable with {symbol} symbol.";
+
+			_extraArgs = args;
+			_storageType = storageType;
+		}
+
+		public sealed override IEnumerable<object[]> GetData(MethodInfo testMethod) => [[_storageType, .. _extraArgs]];
+
+		protected delegate void PrerequisiteChecker(ref bool symbolSet);
+	}
+
+
+	public sealed class S3Attribute(params object[] args) : RemoteStorageDataAttribute(
+		StorageType.S3,
+		args,
+		Symbol,
+		static (ref bool isSet) => CheckPrerequisites(ref isSet)) {
+		const string Symbol = "RUN_S3_TESTS";
+
+		[Conditional(Symbol)]
+		private static void CheckPrerequisites(ref bool symbolSet) {
+			symbolSet = true;
+			const string awsDirectoryName = ".aws";
+			var homeDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+			homeDir = Path.Combine(homeDir, awsDirectoryName);
+			if (!Directory.Exists(homeDir))
+				throw new AwsCliDirectoryNotFoundException(homeDir);
+		}
+	}
+
+	public sealed class FileSystemAttribute(params object[] args) : RemoteStorageDataAttribute(
+		StorageType.FileSystemDevelopmentOnly,
+		args,
+		string.Empty,
+		static (ref bool isSet) => isSet = true) {
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/ResilientArchiveStorageTests.cs b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/ResilientArchiveStorageTests.cs
new file mode 100644
index 00000000000..b0ddb8538f9
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Services/Archive/Storage/ResilientArchiveStorageTests.cs
@@ -0,0 +1,93 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Archive.Storage;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using Polly;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Services.Archive.Storage;
+
+public class ResilientArchiveStorageTests {
+	private readonly IArchiveStorage _sut;
+	private readonly FakeArchiveStorage _wrapped;
+
+	public ResilientArchiveStorageTests() {
+		var pipeline = new ResiliencePipelineBuilder()
+			.AddRetry(new() {
+				MaxRetryAttempts = 1,
+				Delay = TimeSpan.FromSeconds(0),
+			})
+			.Build();
+
+		_wrapped = new FakeArchiveStorage();
+		_sut = new ResilientArchiveStorage(pipeline, _wrapped);
+	}
+
+	[Fact]
+	public async Task can_get_checkpoint() {
+		Assert.Equal(123, await _sut.GetCheckpoint(CancellationToken.None));
+		Assert.Equal(2, _wrapped.Calls);
+	}
+
+	[Fact]
+	public async Task can_get_metadata() {
+		var metadata = await _sut.GetMetadataAsync(1, CancellationToken.None);
+		Assert.Equal(1000, metadata.PhysicalSize);
+		Assert.Equal(2, _wrapped.Calls);
+	}
+
+	[Fact]
+	public async Task can_read() {
+		Assert.Equal(10, await _sut.ReadAsync(1, Memory<byte>.Empty, 0, CancellationToken.None));
+		Assert.Equal(2, _wrapped.Calls);
+	}
+
+	[Fact]
+	public async Task can_set_checkpoint() {
+		await _sut.SetCheckpoint(123, CancellationToken.None);
+		Assert.Equal(2, _wrapped.Calls);
+	}
+
+	[Fact]
+	public async Task can_store_chunk() {
+		await _sut.StoreChunk(null, CancellationToken.None);
+		Assert.Equal(2, _wrapped.Calls);
+	}
+
+	// throws an exception on the first call
+	class FakeArchiveStorage : IArchiveStorage {
+		public int Calls { get; private set; }
+
+		private ValueTask OnCall() =>
+			Calls++ == 0
+				? ValueTask.FromException(new Exception("some exception"))
+				: ValueTask.CompletedTask;
+
+		public async ValueTask<long> GetCheckpoint(CancellationToken ct) {
+			await OnCall();
+			return 123;
+		}
+
+		public async ValueTask<ArchivedChunkMetadata> GetMetadataAsync(int logicalChunkNumber, CancellationToken token) {
+			await OnCall();
+			return new(PhysicalSize: logicalChunkNumber * 1000);
+		}
+
+		public async ValueTask<int> ReadAsync(int logicalChunkNumber, Memory<byte> buffer, long offset, CancellationToken ct) {
+			await OnCall();
+			return logicalChunkNumber * 10;
+		}
+
+		public async ValueTask SetCheckpoint(long checkpoint, CancellationToken ct) {
+			await OnCall();
+		}
+
+		public async ValueTask StoreChunk(IChunkBlob chunk, CancellationToken ct) {
+			await OnCall();
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Services/PersistentSubscriptions/GetAllPersistentSubscriptionStatsTests.cs b/src/KurrentDB.Core.XUnit.Tests/Services/PersistentSubscriptions/GetAllPersistentSubscriptionStatsTests.cs
new file mode 100644
index 00000000000..c759381c024
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Services/PersistentSubscriptions/GetAllPersistentSubscriptionStatsTests.cs
@@ -0,0 +1,207 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.LogV2;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.PersistentSubscription;
+using KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Services.Replication;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.Tests.TransactionLog;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using Xunit;
+using OperationStatus = KurrentDB.Core.Messages.MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus;
+
+namespace KurrentDB.Core.XUnit.Tests.Services.PersistentSubscriptions;
+
+public class GetAllPersistentSubscriptionStatsTests {
+	private readonly FakePublisher _publisher = new();
+	private readonly FakeTimeProvider _timeProvider = new();
+	private readonly IODispatcher _ioDispatcher;
+
+	public GetAllPersistentSubscriptionStatsTests() {
+		var bus = new SynchronousScheduler();
+		_ioDispatcher = new IODispatcher(_publisher, bus);
+		bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_ioDispatcher.BackwardReader);
+	}
+
+	private PersistentSubscriptionService<string> CreateSut() {
+		_publisher.Messages.Clear();
+		var subscriber = new SynchronousScheduler();
+		var queuedHandler =
+			new QueuedHandlerThreadPool(subscriber, "test", new QueueStatsManager(), new QueueTrackers());
+		var index = new FakeReadIndex<LogFormat.V2, string>(_ => false, new LogV2SystemStreams());
+		var strategyRegistry = new PersistentSubscriptionConsumerStrategyRegistry(_publisher, subscriber,
+			Array.Empty<IPersistentSubscriptionConsumerStrategyFactory>());
+		return new PersistentSubscriptionService<string>(
+			queuedHandler, index, _ioDispatcher, _publisher, strategyRegistry, IPersistentSubscriptionTracker.NoOp);
+	}
+
+	[Fact]
+	public void when_not_ready() {
+		var responseEnvelope = new FakeEnvelope();
+		var sut = CreateSut();
+
+		sut.Handle(new MonitoringMessage.GetAllPersistentSubscriptionStats(responseEnvelope));
+		Assert.Single(responseEnvelope.Replies);
+		var response =
+			responseEnvelope.Replies.FirstOrDefault() as MonitoringMessage.GetPersistentSubscriptionStatsCompleted;
+		Assert.NotNull(response);
+		Assert.Equal(OperationStatus.NotReady, response.Result);
+		Assert.Equal(0, response.Total);
+	}
+
+	[Fact]
+	public void when_there_are_no_persistent_subscriptions() {
+		// Arrange
+		var responseEnvelope = new FakeEnvelope();
+		var sut = CreateSut();
+		sut.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+		// Get the read request and give an empty response
+		var read = _publisher.Messages.OfType<ClientMessage.ReadStreamEventsBackward>().FirstOrDefault();
+		Assert.NotNull(read);
+		read.Envelope.ReplyWith(new ClientMessage.ReadStreamEventsBackwardCompleted(read.CorrelationId,
+			read.EventStreamId, read.FromEventNumber, read.MaxCount, ReadStreamResult.NoStream, [],
+			new StreamMetadata(), true, "", -1, -1, true, 1000));
+
+		// Act
+		sut.Handle(new MonitoringMessage.GetAllPersistentSubscriptionStats(responseEnvelope));
+		var response = responseEnvelope.Replies.OfType<MonitoringMessage.GetPersistentSubscriptionStatsCompleted>()
+			.FirstOrDefault();
+
+		// Assert
+		Assert.NotNull(response);
+		Assert.Equal(OperationStatus.Success, response.Result);
+		Assert.Empty(response.SubscriptionStats);
+		Assert.Equal(0, response.Total);
+	}
+
+	[Fact]
+	public void when_a_persistent_subscription_exists() {
+		// Arrange
+		var responseEnvelope = new FakeEnvelope();
+		var sut = CreateSut();
+		var psubEntry = new PersistentSubscriptionEntry {
+			Group = "test-group",
+			Stream = "test-stream",
+			HistoryBufferSize = 20,
+			LiveBufferSize = 20,
+			ReadBatchSize = 10,
+			NamedConsumerStrategy = SystemConsumerStrategies.RoundRobin
+		};
+		var psubConfig = new PersistentSubscriptionConfig {
+			Version = "2",
+			Updated = _timeProvider.UtcNow,
+			UpdatedBy = "admin",
+			Entries = [psubEntry]
+		};
+
+		sut.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+		// Get the read request and respond with the config
+		var read = _publisher.Messages.OfType<ClientMessage.ReadStreamEventsBackward>().FirstOrDefault();
+		Assert.NotNull(read);
+		read.Envelope.ReplyWith(ReadPersistentSubscriptionConfigCompleted(read, psubConfig));
+
+		// Act
+		sut.Handle(new MonitoringMessage.GetAllPersistentSubscriptionStats(responseEnvelope));
+		var response = responseEnvelope.Replies.OfType<MonitoringMessage.GetPersistentSubscriptionStatsCompleted>()
+			.FirstOrDefault();
+
+		// Assert
+		Assert.NotNull(response);
+		Assert.Equal(OperationStatus.Success, response.Result);
+		Assert.Single(response.SubscriptionStats);
+		Assert.Equal(0, response.RequestedOffset);
+		Assert.Equal(1, response.Total);
+		var responseEntry = response.SubscriptionStats[0];
+		Assert.Equal(psubEntry.Group, responseEntry.GroupName);
+		Assert.Equal(psubEntry.Stream, responseEntry.EventSource);
+		Assert.Equal(psubEntry.NamedConsumerStrategy, responseEntry.NamedConsumerStrategy);
+		Assert.Empty(responseEntry.Connections);
+	}
+
+	[Theory]
+	[InlineData(0, 0, new string[] { })]
+	[InlineData(10, 0, new string[] { })]
+	[InlineData(0, 2, new[] { "stream-1", "stream-2" })]
+	[InlineData(2, 2, new[] { "stream-3", "stream-4" })]
+	[InlineData(3, 2, new[] { "stream-4" })]
+	[InlineData(4, 2, new string[] { })]
+	public void when_getting_all_stats_from_multiple_subscriptions_paged(int offset, int count, string[] expectedTopics) {
+		// Arrange
+		var responseEnvelope = new FakeEnvelope();
+		var sut = CreateSut();
+		var psubs = new List<PersistentSubscriptionEntry>();
+		var topics = new int[] { 3, 2, 0, 1 }; // no particular order
+		foreach (var topic in topics) {
+			for (var group = 0; group < 2; group++) {
+				psubs.Add(new PersistentSubscriptionEntry {
+					Group = $"{group + 1}",
+					Stream = $"stream-{topic + 1}",
+					HistoryBufferSize = 20,
+					LiveBufferSize = 20,
+					ReadBatchSize = 10,
+					NamedConsumerStrategy = SystemConsumerStrategies.RoundRobin
+				});
+			}
+		}
+
+		var psubConfig = new PersistentSubscriptionConfig {
+			Version = "2",
+			Updated = _timeProvider.UtcNow,
+			UpdatedBy = "admin",
+			Entries = psubs
+		};
+
+		sut.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+		// Get the read request and respond with the config
+		var read = _publisher.Messages.OfType<ClientMessage.ReadStreamEventsBackward>().FirstOrDefault();
+		Assert.NotNull(read);
+		read.Envelope.ReplyWith(ReadPersistentSubscriptionConfigCompleted(read, psubConfig));
+
+		// Act
+		sut.Handle(new MonitoringMessage.GetAllPersistentSubscriptionStats(responseEnvelope, offset, count));
+		var response = responseEnvelope.Replies.OfType<MonitoringMessage.GetPersistentSubscriptionStatsCompleted>()
+			.SingleOrDefault();
+
+		// Assert
+		Assert.NotNull(response);
+		Assert.Equal(OperationStatus.Success, response.Result);
+		Assert.Equal(offset, response.RequestedOffset);
+		Assert.Equal(4, response.Total);
+
+		var actualTopics = response.SubscriptionStats
+			.GroupBy(x => x.EventSource)
+			.Select(x => x.Key)
+			.Order();
+		Assert.Equal(expectedTopics, actualTopics);
+	}
+
+	private ClientMessage.ReadStreamEventsBackwardCompleted ReadPersistentSubscriptionConfigCompleted(
+		ClientMessage.ReadStreamEventsBackward message, PersistentSubscriptionConfig config) {
+		var streamId = SystemStreams.PersistentSubscriptionConfig;
+		var eventType = SystemEventTypes.PersistentSubscriptionConfig;
+		var eventData = config.GetSerializedForm();
+
+		var record = new EventRecord(0, LogRecord.Prepare(
+				LogFormatHelper<LogFormat.V2, string>.RecordFactory,
+				100, Guid.NewGuid(), Guid.NewGuid(), 100, 0, streamId, -1,
+				PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd | PrepareFlags.IsJson,
+				eventType, eventData, Array.Empty<byte>(), _timeProvider.UtcNow), streamId, eventType);
+
+		return new ClientMessage.ReadStreamEventsBackwardCompleted(message.CorrelationId, message.EventStreamId,
+			message.FromEventNumber, message.MaxCount, ReadStreamResult.Success,
+			[ResolvedEvent.ForUnresolvedEvent(record, 100)], new StreamMetadata(),
+			true, "", 1, 0, true, 1000);
+	}
+}
diff --git a/src/EventStore.Core.XUnit.Tests/Services/Storage/InMemory/GossipListenerServiceTests.cs b/src/KurrentDB.Core.XUnit.Tests/Services/Storage/InMemory/GossipListenerServiceTests.cs
similarity index 83%
rename from src/EventStore.Core.XUnit.Tests/Services/Storage/InMemory/GossipListenerServiceTests.cs
rename to src/KurrentDB.Core.XUnit.Tests/Services/Storage/InMemory/GossipListenerServiceTests.cs
index 3c181815d1b..638189fdaa0 100644
--- a/src/EventStore.Core.XUnit.Tests/Services/Storage/InMemory/GossipListenerServiceTests.cs
+++ b/src/KurrentDB.Core.XUnit.Tests/Services/Storage/InMemory/GossipListenerServiceTests.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Net;
 using System.Text;
@@ -5,14 +8,15 @@
 using System.Text.Json.Serialization;
 using System.Threading.Channels;
 using System.Threading.Tasks;
-using EventStore.Core.Cluster;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Core.Services.Storage.InMemory;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Storage.InMemory;
 using Xunit;
 
-namespace EventStore.Core.XUnit.Tests.Services.Storage.InMemory;
+namespace KurrentDB.Core.XUnit.Tests.Services.Storage.InMemory;
 
 public class GossipListenerServiceTests {
 	private readonly GossipListenerService _sut;
@@ -41,7 +45,7 @@ public async Task notify_state_change() {
 		var member = MemberInfo.ForVNode(
 				instanceId: Guid.NewGuid(),
 				timeStamp: DateTime.Now,
-				state: Data.VNodeState.DiscoverLeader,
+				state: VNodeState.DiscoverLeader,
 				isAlive: true,
 				internalTcpEndPoint: default,
 				internalSecureTcpEndPoint: new DnsEndPoint("myhost", random()),
diff --git a/src/EventStore.Core.XUnit.Tests/Services/Storage/InMemory/InMemoryStreamReaderTests.cs b/src/KurrentDB.Core.XUnit.Tests/Services/Storage/InMemory/InMemoryStreamReaderTests.cs
similarity index 96%
rename from src/EventStore.Core.XUnit.Tests/Services/Storage/InMemory/InMemoryStreamReaderTests.cs
rename to src/KurrentDB.Core.XUnit.Tests/Services/Storage/InMemory/InMemoryStreamReaderTests.cs
index ef3ecec3048..4c678ad6a42 100644
--- a/src/EventStore.Core.XUnit.Tests/Services/Storage/InMemory/InMemoryStreamReaderTests.cs
+++ b/src/KurrentDB.Core.XUnit.Tests/Services/Storage/InMemory/InMemoryStreamReaderTests.cs
@@ -1,15 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Security.Claims;
 using System.Threading.Channels;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Core.Services.Storage.InMemory;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Storage.InMemory;
 using Xunit;
 
-namespace EventStore.Core.XUnit.Tests.Services.Storage.InMemory;
+namespace KurrentDB.Core.XUnit.Tests.Services.Storage.InMemory;
 
 public class InMemoryStreamReaderTests {
 	private readonly InMemoryStreamReader _sut;
diff --git a/src/KurrentDB.Core.XUnit.Tests/Services/Storage/InMemory/NodeStateListenerServiceTests.cs b/src/KurrentDB.Core.XUnit.Tests/Services/Storage/InMemory/NodeStateListenerServiceTests.cs
new file mode 100644
index 00000000000..18589b76d2c
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Services/Storage/InMemory/NodeStateListenerServiceTests.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text.Json;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Storage.InMemory;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Services.Storage.InMemory;
+
+public class NodeStateListenerServiceTests {
+	private readonly NodeStateListenerService _sut;
+	private readonly ChannelReader<Message> _channelReader;
+
+	public NodeStateListenerServiceTests() {
+		var channel = Channel.CreateUnbounded<Message>();
+		_channelReader = channel.Reader;
+		_sut = new NodeStateListenerService(
+			new EnvelopePublisher(new ChannelEnvelope(channel)),
+			new InMemoryLog());
+	}
+
+	[Fact]
+	public async Task notify_state_change() {
+		_sut.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+		var @event = Assert.IsType<StorageMessage.InMemoryEventCommitted>(await _channelReader.ReadAsync());
+
+		Assert.Equal(SystemStreams.NodeStateStream, @event.Event.EventStreamId);
+		Assert.Equal(NodeStateListenerService.EventType, @event.Event.EventType);
+		Assert.Equal(0, @event.Event.EventNumber);
+		Assert.Equal(JsonSerializer.SerializeToUtf8Bytes(new {
+			State = VNodeState.Leader.ToString(),
+		}), @event.Event.Data.ToArray());
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Services/VNode/NodeStatusTrackerTests.cs b/src/KurrentDB.Core.XUnit.Tests/Services/VNode/NodeStatusTrackerTests.cs
new file mode 100644
index 00000000000..cc9e4862114
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Services/VNode/NodeStatusTrackerTests.cs
@@ -0,0 +1,127 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics.Metrics;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.VNode;
+using KurrentDB.Core.XUnit.Tests.Metrics;
+using Xunit;
+
+// Resharper disable CheckNamespace
+
+namespace KurrentDB.Core.TransactionLog.Services.VNode;
+
+public class NodeStatusTrackerTests : IDisposable {
+	private readonly TestMeterListener<long> _listener;
+	private readonly FakeClock _clock = new();
+	private readonly StatusMetric _metric;
+	private readonly NodeStatusTracker _sut;
+
+	public NodeStatusTrackerTests() {
+		var meter = new Meter($"{typeof(NodeStatusTrackerTests)}");
+		_listener = new TestMeterListener<long>(meter);
+		_metric = new StatusMetric(
+			meter,
+			"eventstore-statuses",
+			legacyNames: false,
+			_clock);
+		_sut = new NodeStatusTracker(_metric);
+	}
+
+	public void Dispose() {
+		_listener?.Dispose();
+	}
+
+	[Fact]
+	public void can_observe_state_change() {
+		_clock.SecondsSinceEpoch = 500;
+		AssertMeasurements("Initializing", 500);
+
+		_sut.OnStateChange(VNodeState.PreReplica);
+		_clock.SecondsSinceEpoch = 501;
+		AssertMeasurements("PreReplica", 501);
+
+		_sut.OnStateChange(VNodeState.Follower);
+		_clock.SecondsSinceEpoch = 502;
+		AssertMeasurements("Follower", 502);
+	}
+
+	[Fact]
+	public void can_observe_initial() {
+		_clock.SecondsSinceEpoch = 500;
+		_sut.OnStateChange(VNodeState.PreLeader);
+		_sut.OnStateChange(InaugurationManager.ManagerState.BecomingLeader);
+		AssertMeasurements("PreLeader - BecomingLeader", 500);
+
+		_clock.SecondsSinceEpoch = 502;
+		_sut.OnStateChange(InaugurationManager.ManagerState.Idle);
+		AssertMeasurements("PreLeader", 502);
+	}
+
+	[Fact]
+	public void can_observe_waiting_for_chaser() {
+		_clock.SecondsSinceEpoch = 500;
+		_sut.OnStateChange(VNodeState.PreLeader);
+		AssertMeasurements("PreLeader", 500);
+
+		_clock.SecondsSinceEpoch = 502;
+		_sut.OnStateChange(InaugurationManager.ManagerState.WaitingForChaser);
+		AssertMeasurements("PreLeader - WaitingForChaser", 502);
+	}
+
+	[Fact]
+	public void can_observe_writing_epoch() {
+		_clock.SecondsSinceEpoch = 500;
+		_sut.OnStateChange(VNodeState.PreLeader);
+		AssertMeasurements("PreLeader", 500);
+
+		_clock.SecondsSinceEpoch = 502;
+		_sut.OnStateChange(InaugurationManager.ManagerState.WritingEpoch);
+		AssertMeasurements("PreLeader - WritingEpoch", 502);
+	}
+
+	[Fact]
+	public void can_observe_waiting_for_conditions() {
+		_clock.SecondsSinceEpoch = 500;
+		_sut.OnStateChange(VNodeState.PreLeader);
+		AssertMeasurements("PreLeader", 500);
+
+		_clock.SecondsSinceEpoch = 502;
+		_sut.OnStateChange(InaugurationManager.ManagerState.WaitingForConditions);
+		AssertMeasurements("PreLeader - WaitingForConditions", 502);
+	}
+
+	[Fact]
+	public void can_observe_becoming_leader() {
+		_clock.SecondsSinceEpoch = 500;
+		_sut.OnStateChange(VNodeState.PreLeader);
+		AssertMeasurements("PreLeader", 500);
+
+		_clock.SecondsSinceEpoch = 502;
+		_sut.OnStateChange(InaugurationManager.ManagerState.BecomingLeader);
+		AssertMeasurements("PreLeader - BecomingLeader", 502);
+	}
+
+	void AssertMeasurements(string expectedStatus, int expectedValue) {
+		_listener.Observe();
+
+		Assert.Collection(
+			_listener.RetrieveMeasurements("eventstore-statuses"),
+			m => {
+				Assert.Equal(expectedValue, m.Value);
+				Assert.Collection(
+					m.Tags.ToArray(),
+					t => {
+						Assert.Equal("name", t.Key);
+						Assert.Equal("Node", t.Value);
+					},
+					t => {
+						Assert.Equal("status", t.Key);
+						Assert.Equal(expectedStatus, t.Value);
+					});
+			});
+	}
+}
diff --git a/src/EventStore.Core.XUnit.Tests/Telemetry/TelemetryServiceTests.cs b/src/KurrentDB.Core.XUnit.Tests/Telemetry/TelemetryServiceTests.cs
similarity index 82%
rename from src/EventStore.Core.XUnit.Tests/Telemetry/TelemetryServiceTests.cs
rename to src/KurrentDB.Core.XUnit.Tests/Telemetry/TelemetryServiceTests.cs
index 0cd74eab867..edeab8e9996 100644
--- a/src/EventStore.Core.XUnit.Tests/Telemetry/TelemetryServiceTests.cs
+++ b/src/KurrentDB.Core.XUnit.Tests/Telemetry/TelemetryServiceTests.cs
@@ -1,23 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
+using System.Collections.Generic;
 using System.Net;
 using System.Runtime.InteropServices;
 using System.Text.Json.Nodes;
 using System.Threading.Channels;
 using System.Threading.Tasks;
-using EventStore.Core.Cluster;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Telemetry;
-using EventStore.Core.Tests.TransactionLog;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.Chunks;
 using EventStore.Plugins;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Configuration.Sources;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Telemetry;
+using KurrentDB.Core.Tests.TransactionLog;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using Microsoft.Extensions.Configuration;
 using Xunit;
 using static EventStore.Plugins.Diagnostics.PluginDiagnosticsDataCollectionMode;
 
-namespace EventStore.Core.XUnit.Tests.Telemetry;
+namespace KurrentDB.Core.XUnit.Tests.Telemetry;
 
 public sealed class TelemetryServiceTests : IAsyncLifetime {
 	private readonly TelemetryService _sut;
@@ -31,7 +37,10 @@ public sealed class TelemetryServiceTests : IAsyncLifetime {
 	public TelemetryServiceTests() {
 		var config = TFChunkHelper.CreateSizedDbConfig(_fixture.Directory, 0, chunkSize: 4096);
 		_db = new TFChunkDb(config);
-		_db.Open(false);
+		using (var task = _db.Open(false).AsTask()) {
+			task.Wait();
+		}
+
 		var channel = Channel.CreateUnbounded<Message>();
 		_channelReader = channel.Reader;
 		_sink = new InMemoryTelemetrySink();
@@ -41,6 +50,9 @@ public TelemetryServiceTests() {
 		_sut = new TelemetryService(
 			_db.Manager,
 			new ClusterVNodeOptions().WithPlugableComponent(_plugin),
+			new ConfigurationBuilder().AddInMemoryCollection(new Dictionary<string, string>() {
+				{ $"{KurrentConfigurationKeys.Prefix}:Telemetry:CloudIdentifier", "abc"},
+			}).Build(),
 			new EnvelopePublisher(new ChannelEnvelope(channel)),
 			_sink,
 			new InMemoryCheckpoint(0),
@@ -51,8 +63,8 @@ public TelemetryServiceTests() {
 
 	public async Task DisposeAsync() {
 		_plugin.Dispose();
-		_sut.Dispose();
-		_db.Close();
+		await _sut.DisposeAsync();
+		await _db.DisposeAsync();
 		await _fixture.DisposeAsync();
 	}
 
@@ -122,17 +134,23 @@ public async Task can_collect_and_flush_telemetry() {
 		Assert.NotNull(_sink.Data["foo"]);
 		Assert.Equal(new JsonObject { ["bar"] = 42 }.ToString(), _sink.Data["foo"].ToString());
 
-		Assert.NotNull(_sink.Data["plugins"]);
+		Assert.NotNull(_sink.Data["fakeComponent"]);
 		Assert.Equal("""
 			{
-			  "fakeComponent": {
-			    "foo": "bar"
-			  }
+			  "baz": "qux"
 			}
 			""",
-			_sink.Data["plugins"].ToString());
+			_sink.Data["fakeComponent"].ToString());
 
 		Assert.Equal(_sink.Data["environment"]!["os"]!.ToString(), RuntimeInformation.OSDescription);
+
+		Assert.NotNull(_sink.Data["telemetry"]);
+		Assert.Equal("""
+			{
+			  "cloudIdentifier": "abc"
+			}
+			""",
+			_sink.Data["telemetry"].ToString());
 	}
 
 	[Fact]
@@ -156,7 +174,7 @@ public async Task check_for_leaderid_and_epochid() {
 		var gossipRequest = Assert.IsType<GossipMessage.ReadGossip>(await _channelReader.ReadAsync());
 		gossipRequest.Envelope.ReplyWith(new GossipMessage.SendGossip(
 			new ClusterInfo(
-				mem1 , mem2),
+				mem1, mem2),
 			new DnsEndPoint("localhost", 123)));
 
 		// receive usage request and send response
@@ -187,17 +205,17 @@ public async Task check_for_leaderid_and_epochid() {
 		Assert.Equal(Guid.Parse(_sink.Data["cluster"]["leaderId"].ToString()), _replicaStateMessage.Leader.InstanceId);
 		Assert.Equal(Int32.Parse(_sink.Data["database"]["epochNumber"].ToString()), _replicaStateMessage.Leader.EpochNumber);
 
-		Assert.NotNull(_sink.Data["plugins"]);
+		Assert.NotNull(_sink.Data["fakeComponent"]);
 	}
 
-	class FakePlugableComponent(string name = "fakeComponent") : Plugin(name) {
+	class FakePlugableComponent(string name = "FakeComponent") : Plugin(name) {
 		public void PublishSomeTelemetry() {
 			PublishDiagnosticsData(new() {
 				["enabled"] = Enabled
 			}, Snapshot);
 
 			PublishDiagnosticsData(new() {
-				["foo"] = "bar"
+				["Baz"] = "qux"
 			}, Snapshot);
 		}
 	}
diff --git a/src/KurrentDB.Core.XUnit.Tests/TransactionLog/Checkpoint/CheckpointMetricTests.cs b/src/KurrentDB.Core.XUnit.Tests/TransactionLog/Checkpoint/CheckpointMetricTests.cs
new file mode 100644
index 00000000000..28e104f5538
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/TransactionLog/Checkpoint/CheckpointMetricTests.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Diagnostics.Metrics;
+using System.Linq;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.XUnit.Tests.Metrics;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.TransactionLog.Checkpoint;
+
+public class CheckpointMetricTests {
+	[Fact]
+	public void can_collect() {
+		using var meter = new Meter($"{typeof(CheckpointMetricTests)}");
+		using var listener = new TestMeterListener<long>(meter);
+		var metric = new CheckpointMetric(
+			meter,
+			"eventstore-checkpoints",
+			new InMemoryCheckpoint("checkpoint", 5));
+
+		listener.Observe();
+		Assert.Collection(
+			listener.RetrieveMeasurements("eventstore-checkpoints"),
+			measurement => {
+				Assert.Equal(5, measurement.Value);
+				Assert.Collection(
+					measurement.Tags.ToArray(),
+					tag => {
+						Assert.Equal("name", tag.Key);
+						Assert.Equal("checkpoint", tag.Value);
+					},
+					tag => {
+						Assert.Equal("read", tag.Key);
+						Assert.Equal("non-flushed", tag.Value);
+					});
+			});
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/TransactionLog/Chunks/ChunkFooterTests.cs b/src/KurrentDB.Core.XUnit.Tests/TransactionLog/Chunks/ChunkFooterTests.cs
new file mode 100644
index 00000000000..ad09841a987
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/TransactionLog/Chunks/ChunkFooterTests.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.TransactionLog.Chunks;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.TransactionLog.Chunks;
+
+public class ChunkFooterTests {
+	[Theory]
+	[InlineData(false, false)]
+	[InlineData(false, true)]
+	[InlineData(true, false)]
+	[InlineData(true, true)]
+	public void can_round_trip(bool isCompleted, bool isMap12Bytes) {
+		Span<byte> hash = stackalloc byte[ChunkFooter.ChecksumSize];
+		Random.Shared.NextBytes(hash);
+
+		var source = new ChunkFooter(
+			isCompleted: isCompleted,
+			isMap12Bytes: isMap12Bytes,
+			physicalDataSize: Random.Shared.Next(500, 600),
+			logicalDataSize: Random.Shared.Next(600, 700),
+			mapSize: Random.Shared.Next(500, 600).RoundUpToMultipleOf(24)) {
+			MD5Hash = hash
+		};
+
+		var destination = new ChunkFooter(source.AsByteArray());
+
+		Assert.Equal(source.IsCompleted, destination.IsCompleted);
+		Assert.Equal(source.IsMap12Bytes, destination.IsMap12Bytes);
+		Assert.Equal(source.PhysicalDataSize, destination.PhysicalDataSize);
+		Assert.Equal(source.LogicalDataSize, destination.LogicalDataSize);
+		Assert.Equal(source.MapSize, destination.MapSize);
+		Assert.Equal(source.MD5Hash, destination.MD5Hash);
+	}
+}
diff --git a/src/EventStore.Core.XUnit.Tests/TransactionLog/Chunks/ChunkHeaderTests.cs b/src/KurrentDB.Core.XUnit.Tests/TransactionLog/Chunks/ChunkHeaderTests.cs
similarity index 79%
rename from src/EventStore.Core.XUnit.Tests/TransactionLog/Chunks/ChunkHeaderTests.cs
rename to src/KurrentDB.Core.XUnit.Tests/TransactionLog/Chunks/ChunkHeaderTests.cs
index b16f4eb0479..d6858a9b630 100644
--- a/src/EventStore.Core.XUnit.Tests/TransactionLog/Chunks/ChunkHeaderTests.cs
+++ b/src/KurrentDB.Core.XUnit.Tests/TransactionLog/Chunks/ChunkHeaderTests.cs
@@ -1,9 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
-using EventStore.Core.TransactionLog.Chunks;
 using EventStore.Plugins.Transforms;
+using KurrentDB.Core.TransactionLog.Chunks;
 using Xunit;
 
-namespace EventStore.Core.XUnit.Tests.TransactionLog.Chunks;
+namespace KurrentDB.Core.XUnit.Tests.TransactionLog.Chunks;
 
 public class ChunkHeaderTests {
 	[Theory]
diff --git a/src/KurrentDB.Core.XUnit.Tests/TransactionLog/Chunks/PrefixingLocatorCodecTests.cs b/src/KurrentDB.Core.XUnit.Tests/TransactionLog/Chunks/PrefixingLocatorCodecTests.cs
new file mode 100644
index 00000000000..83eab822739
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/TransactionLog/Chunks/PrefixingLocatorCodecTests.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.TransactionLog.Chunks;
+
+public class PrefixingLocatorCodecTests {
+	private readonly PrefixingLocatorCodec _sut = new();
+
+	[Fact]
+	public void can_encode_local() {
+		Assert.Equal("chunk-123.456", _sut.EncodeLocal("chunk-123.456"));
+	}
+
+	[Fact]
+	public void can_encode_remote() {
+		Assert.Equal("archived-chunk-123", _sut.EncodeRemote(123));
+	}
+
+	[Fact]
+	public void can_decode_local() {
+		Assert.False(_sut.Decode("chunk-123.456", out _, out var fileName));
+		Assert.Equal("chunk-123.456", fileName);
+	}
+
+	[Fact]
+	public void can_decode_remote() {
+		Assert.True(_sut.Decode("archived-chunk-123", out var chunkNumber, out _));
+		Assert.Equal(123, chunkNumber);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/TransactionLog/Chunks/TFChunkManagerTests.cs b/src/KurrentDB.Core.XUnit.Tests/TransactionLog/Chunks/TFChunkManagerTests.cs
new file mode 100644
index 00000000000..bbe117936d4
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/TransactionLog/Chunks/TFChunkManagerTests.cs
@@ -0,0 +1,305 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.TransactionLog;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.Transforms;
+using KurrentDB.Core.XUnit.Tests.Scavenge.Infrastructure;
+using Xunit;
+using static KurrentDB.Core.TransactionLog.Chunks.TFChunk.TFChunk;
+
+namespace KurrentDB.Core.XUnit.Tests.TransactionLog.Chunks;
+public class TFChunkManagerTests : DirectoryPerTest<TFChunkManagerTests> {
+	private readonly TFChunkManager _sut;
+	private readonly ILocatorCodec _locatorCodec;
+	private readonly List<ChunkInfo> _onSwitched = [];
+
+	public TFChunkManagerTests() {
+		var dbConfig = TFChunkHelper.CreateDbConfig(pathName: Fixture.Directory, writerCheckpointPosition: 0);
+		_locatorCodec = new PrefixingLocatorCodec();
+
+		var fileSystem = new FileSystemWithArchive(
+			chunkSize: dbConfig.ChunkSize,
+			locatorCodec: _locatorCodec,
+			localFileSystem: new ChunkLocalFileSystem(dbConfig.Path),
+			archive: new ArchiveReaderEmptyChunks(dbConfig.ChunkSize, chunksInArchive: 20));
+
+		_sut = new TFChunkManager(dbConfig, fileSystem,
+			new TFChunkTracker.NoOp(),
+			DbTransformManager.Default) {
+			OnChunkSwitched = info => _onSwitched.Add(info),
+		};
+	}
+
+	public override async Task DisposeAsync() {
+		await _sut.TryClose(CancellationToken.None);
+		await Fixture.DisposeAsync();
+	}
+
+	static ChunkHeader CreateHeader(int start, int end) {
+		var header = new ChunkHeader(
+			version: (byte)ChunkVersions.Transformed,
+			minCompatibleVersion: (byte)ChunkVersions.Transformed,
+			chunkSize: 1,
+			chunkStartNumber: start,
+			chunkEndNumber: end,
+			isScavenged: true,
+			chunkId: Guid.NewGuid(),
+			transformType: TransformType.Identity);
+		return header;
+	}
+
+	async ValueTask<TFChunk> AddNewChunk(int start, int end) {
+		return await _sut.AddNewChunk(CreateHeader(start, end), ReadOnlyMemory<byte>.Empty, 1000, CancellationToken.None);
+	}
+
+	async ValueTask<TFChunk> CreateNewChunk(int start, int end) {
+		var newChunk = await _sut.CreateTempChunk(CreateHeader(start, end), fileSize: 1000, CancellationToken.None);
+		await newChunk.CompleteScavenge([], CancellationToken.None);
+		return newChunk;
+	}
+
+	IAsyncEnumerable<string> ActualChunks => Enumerable
+		.Range(0, _sut.ChunksCount)
+		.ToAsyncEnumerable()
+		.SelectAwaitWithCancellation(async (chunkNum, ct) => (await _sut.GetInitializedChunk(chunkNum, ct)).ChunkLocator);
+
+	[Theory]
+	[InlineData(1, 4, "too big")]
+	[InlineData(2, 3, "too small")]
+	[InlineData(2, 4, "misaligned")]
+	public async Task one_chunk_replaces_no_chunks(int start, int end, string explanation) {
+		// given
+		var chunks = new[] {
+			await AddNewChunk(0, 0),
+			await AddNewChunk(1, 3),
+			await AddNewChunk(4, 5),
+		};
+
+		// when
+		using var newChunk = await CreateNewChunk(start, end);
+
+		var switched = await _sut.SwitchInCompletedChunks([newChunk.ChunkLocator], CancellationToken.None);
+
+		// then
+		var expectedChunks = new[] {
+			chunks[0],
+			chunks[1], chunks[1],chunks[1],
+			chunks[2], chunks[2],
+		};
+
+		Assert.False(switched);
+		Assert.Equal(expectedChunks.ToAsyncEnumerable().Select(chunk => chunk.ChunkLocator), ActualChunks);
+		Assert.Empty(_onSwitched);
+		_ = explanation;
+	}
+
+	[Fact]
+	public async Task one_chunk_replaces_one_chunk() {
+		// given
+		var chunks = new[] {
+			await AddNewChunk(0, 0),
+			await AddNewChunk(1, 3), // <-- will replace this one
+			await AddNewChunk(4, 5),
+		};
+
+		// when
+		using var newChunk = await CreateNewChunk(1, 3);
+
+		var switched = await _sut.SwitchInCompletedChunks([newChunk.ChunkLocator], CancellationToken.None);
+
+		// then
+		var expectedChunks = new[] {
+			chunks[0],
+			newChunk, newChunk, newChunk,
+			chunks[2], chunks[2],
+		};
+
+		Assert.True(switched);
+		Assert.Equal(expectedChunks.Select(chunk => chunk.ChunkLocator), ActualChunks);
+		Assert.Single(_onSwitched);
+	}
+
+	[Fact]
+	public async Task one_chunk_replaces_many_chunks() {
+		// given
+		var chunks = new[] {
+			await AddNewChunk(0, 0),
+			await AddNewChunk(1, 3), // <-- will replace this one
+			await AddNewChunk(4, 5), // <-- and this one
+		};
+
+		// when
+		using var newChunk = await CreateNewChunk(1, 5);
+
+		var switched = await _sut.SwitchInCompletedChunks([newChunk.ChunkLocator], CancellationToken.None);
+
+		// then
+		var expectedChunks = new[] {
+			chunks[0],
+			newChunk, newChunk, newChunk, newChunk, newChunk,
+		};
+
+		Assert.True(switched);
+		Assert.Equal(expectedChunks.Select(chunk => chunk.ChunkLocator), ActualChunks);
+		Assert.Single(_onSwitched);
+	}
+
+	[Fact]
+	public async Task many_non_contiguous_chunks_replace_no_chunks() {
+		// given
+		var chunks = new[] {
+			await AddNewChunk(0, 0),
+			await AddNewChunk(1, 3),
+			await AddNewChunk(4, 5),
+		};
+
+		// when
+		var newChunks = new[] {
+			_locatorCodec.EncodeRemote(1),
+			_locatorCodec.EncodeRemote(3),
+		};
+
+		var switched = await _sut.SwitchInCompletedChunks(newChunks, CancellationToken.None);
+
+		// then
+		var expectedChunks = new[] {
+			chunks[0],
+			chunks[1], chunks[1],chunks[1],
+			chunks[2], chunks[2],
+		};
+
+		Assert.False(switched);
+		Assert.Equal(expectedChunks.Select(chunk => chunk.ChunkLocator), ActualChunks);
+		Assert.Empty(_onSwitched);
+	}
+
+	[Theory]
+	[InlineData(1, 4, "too big")]
+	[InlineData(2, 3, "too small")]
+	[InlineData(2, 4, "misaligned")]
+	public async Task many_chunks_replace_no_chunks(int start, int end, string explanation) {
+		// given
+		var chunks = new[] {
+			await AddNewChunk(0, 0),
+			await AddNewChunk(1, 3),
+			await AddNewChunk(4, 5),
+		};
+
+		// when
+		var newChunks = Enumerable
+			.Range(start, end - start + 1)
+			.Select(_locatorCodec.EncodeRemote)
+			.ToArray();
+
+		var switched = await _sut.SwitchInCompletedChunks(newChunks, CancellationToken.None);
+
+		// then
+		var expectedChunks = new[] {
+			chunks[0],
+			chunks[1], chunks[1],chunks[1],
+			chunks[2], chunks[2],
+		};
+
+		Assert.False(switched);
+		Assert.Equal(expectedChunks.Select(chunk => chunk.ChunkLocator), ActualChunks);
+		Assert.Empty(_onSwitched);
+		_ = explanation;
+	}
+
+	[Fact]
+	public async Task many_chunks_replace_one_chunk() {
+		// given
+		var chunks = new[] {
+			await AddNewChunk(0, 0),
+			await AddNewChunk(1, 3), // <-- will replace this one
+			await AddNewChunk(4, 5),
+		}.Select(chunk => chunk.ChunkLocator).ToArray();
+
+		// when
+		var newChunks = new[] {
+			_locatorCodec.EncodeRemote(1),
+			_locatorCodec.EncodeRemote(2),
+			_locatorCodec.EncodeRemote(3),
+		};
+
+		var switched = await _sut.SwitchInCompletedChunks(newChunks, CancellationToken.None);
+
+		// then
+		var expectedChunks = new[] {
+			chunks[0],
+			newChunks[0],
+			newChunks[1],
+			newChunks[2],
+			chunks[2], chunks[2],
+		};
+
+		Assert.True(switched);
+		Assert.Equal(expectedChunks, ActualChunks);
+		Assert.Equal(3, _onSwitched.Count);
+	}
+
+	[Fact]
+	public async Task many_chunks_replace_many_chunks() {
+		// given
+		var chunks = new[] {
+			await AddNewChunk(0, 0),
+			await AddNewChunk(1, 3), // <-- will replace this one
+			await AddNewChunk(4, 5), // <-- and this one
+		}.Select(chunk => chunk.ChunkLocator).ToArray();
+
+		// when
+		var newChunks = new[] {
+			_locatorCodec.EncodeRemote(1),
+			_locatorCodec.EncodeRemote(2),
+			_locatorCodec.EncodeRemote(3),
+			_locatorCodec.EncodeRemote(4),
+			_locatorCodec.EncodeRemote(5),
+		};
+
+		var switched = await _sut.SwitchInCompletedChunks(newChunks, CancellationToken.None);
+
+		// then
+		var expectedChunks = new[] {
+			chunks[0],
+			newChunks[0],
+			newChunks[1],
+			newChunks[2],
+			newChunks[3],
+			newChunks[4],
+		};
+
+		Assert.True(switched);
+		Assert.Equal(expectedChunks, ActualChunks);
+		Assert.Equal(5, _onSwitched.Count);
+	}
+
+	[Fact]
+	public async Task ensure_lazy_chunk_initialized() {
+		const int chunkNumber = 0;
+		var expectedChunk = await FromCompletedFile(
+			_sut.FileSystem,
+			_locatorCodec.EncodeRemote(chunkNumber),
+			verifyHash: false,
+			unbufferedRead: false,
+			new TFChunkTracker.NoOp(),
+			DbTransformManager.Default,
+			reduceFileCachePressure: false,
+			chunkNumber);
+
+		await _sut.AddChunk(expectedChunk, CancellationToken.None);
+		Assert.False(expectedChunk.Initialized);
+
+		var actualChunk = await _sut.GetInitializedChunk(chunkNumber, CancellationToken.None);
+		Assert.Same(expectedChunk, actualChunk);
+		Assert.True(actualChunk.Initialized);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/TransactionLog/Chunks/TFChunkTrackerTests.cs b/src/KurrentDB.Core.XUnit.Tests/TransactionLog/Chunks/TFChunkTrackerTests.cs
new file mode 100644
index 00000000000..bc3469ce625
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/TransactionLog/Chunks/TFChunkTrackerTests.cs
@@ -0,0 +1,178 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Metrics;
+using System.Linq;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.XUnit.Tests.Metrics;
+using Xunit;
+using static KurrentDB.Core.TransactionLog.ITransactionFileTracker;
+
+namespace KurrentDB.Core.XUnit.Tests.TransactionLog.Chunks;
+
+public sealed class TFChunkTrackerTests : IDisposable {
+	const long WriterCheckpoint = 4_500;
+	const int ChunkSize = 1_000;
+
+	private readonly TFChunkTracker _sut;
+	private readonly TestMeterListener<long> _listener;
+	private readonly TestMeterListener<double> _doubleListener;
+	private readonly FakeClock _clock = new();
+
+	public TFChunkTrackerTests() {
+		var meter = new Meter($"{typeof(TFChunkTrackerTests)}");
+		_listener = new TestMeterListener<long>(meter);
+		_doubleListener = new TestMeterListener<double>(meter);
+		var byteMetric = new CounterMetric(meter, "eventstore-io", unit: "bytes", legacyNames: false);
+		var eventMetric = new CounterMetric(meter, "eventstore-io", unit: "events", legacyNames: false);
+		var writerCheckpoint = new InMemoryCheckpoint(WriterCheckpoint);
+
+		var readTag = new KeyValuePair<string, object>("activity", "read");
+		_sut = new TFChunkTracker(
+			readDistribution: new LogicalChunkReadDistributionMetric(meter, "chunk-read-distribution", writerCheckpoint, ChunkSize),
+			readDurationMetric: new DurationMetric(meter, "record-read-duration", legacyNames: false, _clock),
+			readBytes: new CounterSubMetric(byteMetric, [readTag]),
+			readEvents: new CounterSubMetric(eventMetric, [readTag]));
+	}
+
+	public void Dispose() {
+		_listener.Dispose();
+		_doubleListener.Dispose();
+	}
+
+	[Fact]
+	public void can_observe_prepare_log() {
+		var prepare = CreatePrepare(
+			data: new byte[5],
+			meta: new byte[5]);
+
+		_sut.OnRead(_clock.Now, prepare, Source.Unknown);
+		_listener.Observe();
+
+		AssertEventsRead(1);
+		AssertBytesRead(10);
+	}
+
+	[Fact]
+	public void disregard_system_log() {
+		var system = CreateSystemRecord();
+		_sut.OnRead(_clock.Now, system, Source.Unknown);
+		_listener.Observe();
+
+		AssertEventsRead(0);
+		AssertBytesRead(0);
+	}
+
+	[Fact]
+	public void disregard_commit_log() {
+		var system = CreateCommit();
+		_sut.OnRead(_clock.Now, system, Source.Unknown);
+		_listener.Observe();
+
+		AssertEventsRead(0);
+		AssertBytesRead(0);
+	}
+
+	[Theory]
+	[InlineData(Source.ChunkCache)]
+	public void records_record_read_duration(Source source) {
+		var prepare = CreatePrepare(
+			data: new byte[5],
+			meta: new byte[5]);
+
+		var start = _clock.Now;
+		_clock.AdvanceSeconds(3);
+
+		// when
+		_sut.OnRead(start, prepare, source);
+
+		// then
+		_doubleListener.Observe();
+		var actual = _doubleListener.RetrieveMeasurements("record-read-duration-seconds");
+		Assert.Collection(
+			actual,
+			m => {
+				Assert.Equal(3, m.Value);
+				Assert.Collection(
+					m.Tags,
+					t => {
+						Assert.Equal("source", t.Key);
+						Assert.Equal(source, t.Value);
+					},
+					t => {
+						Assert.Equal("user", t.Key);
+						Assert.Equal("", t.Value);
+					});
+			});
+	}
+
+	[Theory]
+	[InlineData(5_500, -1)]
+	[InlineData(4_501, 0)]
+	[InlineData(4_500, 0)]
+	[InlineData(4_000, 0)]
+	[InlineData(3_999, 1)]
+	[InlineData(3_000, 1)]
+	[InlineData(2_000, 2)]
+	[InlineData(1_000, 3)]
+	[InlineData(999, 4)]
+	[InlineData(1, 4)]
+	[InlineData(0, 4)]
+	public void records_read_distribution(long logPosition, long expectedChunk) {
+		_sut.OnRead(
+			_clock.Now,
+			CreatePrepare(data: new byte[5], meta: new byte[5], logPosition: logPosition),
+			Source.Unknown);
+
+		_listener.Observe();
+		var actual = _listener.RetrieveMeasurements("chunk-read-distribution");
+		Assert.Collection(
+			actual,
+			m => {
+				Assert.Equal(expectedChunk, m.Value);
+				Assert.Empty(m.Tags);
+			});
+	}
+
+	private void AssertEventsRead(long? expectedEventsRead) =>
+		AssertMeasurements("eventstore-io-events", expectedEventsRead);
+
+	private void AssertBytesRead(long? expectedBytesRead) =>
+		AssertMeasurements("eventstore-io-bytes", expectedBytesRead);
+
+	private void AssertMeasurements(string instrumentName, long? expectedValue) {
+		var actual = _listener.RetrieveMeasurements(instrumentName);
+
+		if (expectedValue is null) {
+			Assert.Empty(actual);
+		} else {
+			Assert.Collection(
+				actual,
+				m => {
+					Assert.Equal(expectedValue, m.Value);
+					Assert.Collection(m.Tags.ToArray(), t => {
+						Assert.Equal("activity", t.Key);
+						Assert.Equal("read", t.Value);
+					});
+				});
+		}
+	}
+
+	private static PrepareLogRecord CreatePrepare(byte[] data, byte[] meta, long logPosition = 42) {
+		return new PrepareLogRecord(logPosition, Guid.NewGuid(), Guid.NewGuid(), 42, 42, "tests", null, 42, DateTime.Now,
+			PrepareFlags.Data, "type-test", null, data, meta);
+	}
+
+	private static SystemLogRecord CreateSystemRecord() {
+		return new SystemLogRecord(42, DateTime.Now, SystemRecordType.Epoch, SystemRecordSerialization.Binary, Array.Empty<byte>());
+	}
+
+	private static CommitLogRecord CreateCommit() {
+		return new CommitLogRecord(42, Guid.NewGuid(), 42, DateTime.Now, 42);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/TransactionLog/LogRecords/PrepareLogRecordViewTests.cs b/src/KurrentDB.Core.XUnit.Tests/TransactionLog/LogRecords/PrepareLogRecordViewTests.cs
new file mode 100644
index 00000000000..b9f8c92ac05
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/TransactionLog/LogRecords/PrepareLogRecordViewTests.cs
@@ -0,0 +1,70 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+using DotNext.Buffers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.TransactionLog.LogRecords;
+
+public class PrepareLogRecordViewTests {
+	private PrepareLogRecordView _prepare;
+	private const long LogPosition = 123;
+	private readonly Guid _correlationId = Guid.NewGuid();
+	private readonly Guid _eventId = Guid.NewGuid();
+	private const long TransactionPosition = 456;
+	private const int TransactionOffset = 321;
+	private const string EventStreamId = "test_stream";
+	private const long ExpectedVersion = 789;
+	private readonly DateTime _timestamp = DateTime.Now;
+	private const PrepareFlags Flags = PrepareFlags.SingleWrite;
+	private const string EventType = "test_event_type";
+	private readonly byte[] _data = { 0xDE, 0XAD, 0xC0, 0XDE };
+	private readonly byte[] _metadata = { 0XC0, 0xDE };
+	private const byte Version = 1;
+
+	public PrepareLogRecordViewTests() {
+		var prepare = new PrepareLogRecord(
+			LogPosition,
+			_correlationId,
+			_eventId,
+			TransactionPosition,
+			TransactionOffset,
+			EventStreamId,
+			null,
+			ExpectedVersion,
+			_timestamp,
+			Flags,
+			EventType,
+			null,
+			_data,
+			_metadata,
+			Version);
+
+		var writer = new BufferWriterSlim<byte>();
+		prepare.WriteTo(ref writer);
+
+		using var recordBuffer = writer.DetachOrCopyBuffer();
+		var record = recordBuffer.Memory.ToArray();
+
+		_prepare = new PrepareLogRecordView(record, record.Length);
+	}
+
+	[Fact]
+	public void should_have_correct_properties() {
+		Assert.Equal(LogPosition, _prepare.LogPosition);
+		Assert.Equal(_correlationId, _prepare.CorrelationId);
+		Assert.Equal(_eventId, _prepare.EventId);
+		Assert.Equal(TransactionPosition, _prepare.TransactionPosition);
+		Assert.Equal(TransactionOffset, _prepare.TransactionOffset);
+		Assert.True(_prepare.EventStreamId.SequenceEqual(Encoding.UTF8.GetBytes(EventStreamId)));
+		Assert.Equal(ExpectedVersion, _prepare.ExpectedVersion);
+		Assert.Equal(_timestamp, _prepare.TimeStamp);
+		Assert.Equal(Flags, _prepare.Flags);
+		Assert.True(_prepare.Data.SequenceEqual(_data));
+		Assert.True(_prepare.Metadata.SequenceEqual(_metadata));
+		Assert.Equal(Version, _prepare.Version);
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/TransactionLog/LogRecords/SizeOnDiskTests.cs b/src/KurrentDB.Core.XUnit.Tests/TransactionLog/LogRecords/SizeOnDiskTests.cs
new file mode 100644
index 00000000000..88f5247d9e8
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/TransactionLog/LogRecords/SizeOnDiskTests.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using DotNext.Buffers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.TransactionLog.LogRecords;
+
+public class SizeOnDiskTests {
+	public static TheoryData<ILogRecord> GetLogRecords() {
+		return [
+			CreatePrepareLogRecord(1),
+			CreatePrepareLogRecord(127), // just before needing an extra byte for the 7bit encoding
+			CreatePrepareLogRecord(128), // just after
+			CreatePrepareLogRecord(100_000),
+			CreateCommitLogRecord(),
+			CreateSystemLogRecord()
+		];
+
+		static PrepareLogRecord CreatePrepareLogRecord(int stringLength) {
+			var theString = new string('a', stringLength);
+
+			return new(
+				logPosition: 123,
+				correlationId: Guid.NewGuid(),
+				eventId: Guid.NewGuid(),
+				transactionPosition: 456,
+				transactionOffset: 321,
+				eventStreamId: theString,
+				eventStreamIdSize: null,
+				expectedVersion: 789,
+				timeStamp: DateTime.Now,
+				flags: PrepareFlags.SingleWrite,
+				eventType: theString,
+				eventTypeSize: null,
+				data: new byte[] { 0xDE, 0XAD, 0xC0, 0XDE },
+				metadata: new byte[] { 0XC0, 0xDE },
+				prepareRecordVersion: 1);
+		}
+
+		static CommitLogRecord CreateCommitLogRecord() => new(
+			logPosition: 123,
+			correlationId: Guid.NewGuid(),
+			transactionPosition: 456,
+			timeStamp: DateTime.Now,
+			firstEventNumber: 789,
+			commitRecordVersion: 1);
+
+		static SystemLogRecord CreateSystemLogRecord() => new(logPosition: 123,
+			timeStamp: DateTime.Now,
+			systemRecordType: SystemRecordType.Epoch,
+			systemRecordSerialization: SystemRecordSerialization.Binary,
+			data: [0xDE, 0XAD, 0xC0, 0XDE]);
+	}
+
+	[Theory]
+	[MemberData(nameof(GetLogRecords))]
+	public void size_on_disk_is_correct(ILogRecord record) {
+
+		var writer = new BufferWriterSlim<byte>(record.GetSizeWithLengthPrefixAndSuffix());
+		try {
+			const int dummyLength = 111;
+
+			writer.WriteLittleEndian(dummyLength);
+			record.WriteTo(ref writer);
+			writer.WriteLittleEndian(dummyLength);
+
+			Assert.Equal(writer.WrittenCount, record.GetSizeWithLengthPrefixAndSuffix());
+		} finally {
+			writer.Dispose();
+		}
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Transforms/Identity/IdentityDbTransformTests.cs b/src/KurrentDB.Core.XUnit.Tests/Transforms/Identity/IdentityDbTransformTests.cs
new file mode 100644
index 00000000000..ce6b41bbdbd
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Transforms/Identity/IdentityDbTransformTests.cs
@@ -0,0 +1,128 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Core.Transforms.Identity;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Transforms.Identity;
+
+public class IdentityDbTransformTests {
+	private readonly IdentityDbTransform _dbTransform;
+	private readonly IChunkTransform _chunkTransform;
+
+	public IdentityDbTransformTests() {
+		_dbTransform = new IdentityDbTransform();
+		_chunkTransform = _dbTransform.ChunkFactory.CreateTransform(ReadOnlySpan<byte>.Empty);
+	}
+
+	[Fact]
+	public void db_transform_has_correct_type() => Assert.Equal(TransformType.Identity, _dbTransform.Type);
+
+	[Fact]
+	public void db_transform_has_correct_name() => Assert.Equal("identity", _dbTransform.Name);
+
+	[Fact]
+	public void chunk_factory_has_correct_type() => Assert.Equal(TransformType.Identity, _dbTransform.ChunkFactory.Type);
+
+	[Fact]
+	public void chunk_factory_provides_correct_header_length() => Assert.Equal(0, _dbTransform.ChunkFactory.TransformHeaderLength);
+
+	[Fact]
+	public async Task chunk_factory_reads_correct_header() {
+		await _dbTransform.ChunkFactory.ReadTransformHeader(Stream.Null, Memory<byte>.Empty);
+	}
+
+	[Fact]
+	public void chunk_transform_properly_transforms_reads() {
+		const int dataSize = 1024;
+
+		var data = new byte[dataSize];
+		RandomNumberGenerator.Fill(data);
+		using var memStream = new MemoryStream(data);
+
+		var transformedStream = _chunkTransform.Read.TransformData(new ChunkDataReadStream(memStream));
+		var transformedData = new byte[dataSize];
+		transformedStream.ReadExactly(transformedData, 0, dataSize);
+
+		Assert.True(data.SequenceEqual(transformedData));
+	}
+
+	[Fact]
+	public async Task chunk_transform_properly_transforms_writes() {
+		const int dataSize = 2000;
+		const int footerSize = 10;
+		const int alignmentSize = 1024;
+
+		var data = new byte[dataSize];
+		RandomNumberGenerator.Fill(data);
+
+		var footer = new byte[footerSize];
+		RandomNumberGenerator.Fill(footer);
+
+		var alignedSize = GetAlignedSize(dataSize + footerSize, alignmentSize);
+		var paddingSize = alignedSize - dataSize - footerSize;
+
+		using var md5 = IncrementalHash.CreateHash(HashAlgorithmName.MD5);
+		var transformedData = new byte[alignedSize];
+		using var stream = new MemoryStream(transformedData);
+		var transformedStream = _chunkTransform.Write.TransformData(new ChunkDataWriteStream(stream, md5));
+
+		transformedStream.Write(data);
+		await _chunkTransform.Write.CompleteData(footerSize, alignmentSize);
+		var fileSize = await _chunkTransform.Write.WriteFooter(footer);
+		md5.AppendData(footer);
+
+		Assert.Equal(alignedSize, fileSize);
+		Assert.True(data.SequenceEqual(transformedData[..dataSize]));
+		Assert.True(new byte[paddingSize].SequenceEqual(transformedData[dataSize..^footerSize]));
+		Assert.True(footer.SequenceEqual(transformedData[^footerSize..]));
+
+		Assert.Equal(MD5.HashData(transformedData), md5.GetHashAndReset());
+	}
+
+	[Fact]
+	public async Task chunk_transform_properly_transforms_writes_async() {
+		const int dataSize = 2000;
+		const int footerSize = 10;
+		const int alignmentSize = 1024;
+
+		var data = new byte[dataSize];
+		RandomNumberGenerator.Fill(data);
+
+		var footer = new byte[footerSize];
+		RandomNumberGenerator.Fill(footer);
+
+		var alignedSize = GetAlignedSize(dataSize + footerSize, alignmentSize);
+		var paddingSize = alignedSize - dataSize - footerSize;
+
+		using var md5 = IncrementalHash.CreateHash(HashAlgorithmName.MD5);
+		var transformedData = new byte[alignedSize];
+		using var stream = new MemoryStream(transformedData);
+		var transformedStream = _chunkTransform.Write.TransformData(new ChunkDataWriteStream(stream, md5));
+
+		await transformedStream.WriteAsync(data);
+		await _chunkTransform.Write.CompleteData(footerSize, alignmentSize);
+		var fileSize = await _chunkTransform.Write.WriteFooter(footer);
+		md5.AppendData(footer);
+
+		Assert.Equal(alignedSize, fileSize);
+		Assert.True(data.SequenceEqual(transformedData[..dataSize]));
+		Assert.True(new byte[paddingSize].SequenceEqual(transformedData[dataSize..^footerSize]));
+		Assert.True(footer.SequenceEqual(transformedData[^footerSize..]));
+
+		Assert.Equal(MD5.HashData(transformedData), md5.GetHashAndReset());
+	}
+
+	private static int GetAlignedSize(int size, int alignment) {
+		if (size % alignment == 0)
+			return size;
+
+		return ((size / alignment) + 1) * alignment;
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Util/FunctionsTests.cs b/src/KurrentDB.Core.XUnit.Tests/Util/FunctionsTests.cs
new file mode 100644
index 00000000000..5db2862a405
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Util/FunctionsTests.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Util;
+using KurrentDB.Core.XUnit.Tests.Metrics;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Util;
+
+public class FunctionsTests {
+	[Fact]
+	public void sanity_check() {
+		var clock = new FakeClock();
+		clock.SecondsSinceEpoch = 12345;
+		var calls = 0;
+		var f = () => ++calls;
+		var debounced = f.Debounce(TimeSpan.FromSeconds(5), clock);
+
+		// no calls to begin with
+		Assert.Equal(0, calls);
+
+		// calls in the first place
+		Assert.Equal(1, debounced());
+
+
+		// cached for second call
+		Assert.Equal(1, debounced());
+
+		// still cached after some time has passed
+		clock.AdvanceSeconds(3);
+		Assert.Equal(1, debounced());
+
+		// called again after more time has passed.
+		clock.AdvanceSeconds(3);
+		Assert.Equal(2, debounced());
+	}
+}
diff --git a/src/KurrentDB.Core.XUnit.Tests/Utils/NumberExtensionsTests.cs b/src/KurrentDB.Core.XUnit.Tests/Utils/NumberExtensionsTests.cs
new file mode 100644
index 00000000000..2320d21509c
--- /dev/null
+++ b/src/KurrentDB.Core.XUnit.Tests/Utils/NumberExtensionsTests.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Common.Utils;
+using Xunit;
+
+namespace KurrentDB.Core.XUnit.Tests.Utils;
+
+public class NumberExtensionsTests {
+	[Fact]
+	public void CanRoundUp() {
+		Assert.Equal(0, 0L.RoundUpToMultipleOf(4));
+		Assert.Equal(4, 1L.RoundUpToMultipleOf(4));
+		Assert.Equal(4, 2L.RoundUpToMultipleOf(4));
+		Assert.Equal(4, 3L.RoundUpToMultipleOf(4));
+		Assert.Equal(4, 4L.RoundUpToMultipleOf(4));
+		Assert.Equal(8, 5L.RoundUpToMultipleOf(4));
+	}
+
+	[Fact]
+	public void CanRoundDown() {
+		Assert.Equal(0, 3L.RoundDownToMultipleOf(4));
+		Assert.Equal(4, 4L.RoundDownToMultipleOf(4));
+		Assert.Equal(4, 5L.RoundDownToMultipleOf(4));
+		Assert.Equal(4, 6L.RoundDownToMultipleOf(4));
+		Assert.Equal(4, 7L.RoundDownToMultipleOf(4));
+		Assert.Equal(8, 8L.RoundDownToMultipleOf(4));
+	}
+}
diff --git a/src/EventStore.Core.XUnit.Tests/xunit.runner.json b/src/KurrentDB.Core.XUnit.Tests/xunit.runner.json
similarity index 100%
rename from src/EventStore.Core.XUnit.Tests/xunit.runner.json
rename to src/KurrentDB.Core.XUnit.Tests/xunit.runner.json
diff --git a/src/KurrentDB.Core/Authentication/AuthenticationProviderFactory.cs b/src/KurrentDB.Core/Authentication/AuthenticationProviderFactory.cs
new file mode 100644
index 00000000000..aeef7c132c7
--- /dev/null
+++ b/src/KurrentDB.Core/Authentication/AuthenticationProviderFactory.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using EventStore.Plugins.Authentication;
+
+namespace KurrentDB.Core.Authentication;
+
+public class AuthenticationProviderFactory {
+	private readonly Func<AuthenticationProviderFactoryComponents, IAuthenticationProviderFactory>
+		_authenticationProviderFactory;
+
+	public AuthenticationProviderFactory(
+		Func<AuthenticationProviderFactoryComponents, IAuthenticationProviderFactory>
+			authenticationProviderFactory) {
+		_authenticationProviderFactory = authenticationProviderFactory;
+	}
+
+	public IAuthenticationProviderFactory GetFactory(
+		AuthenticationProviderFactoryComponents authenticationProviderFactoryComponents) =>
+		_authenticationProviderFactory(authenticationProviderFactoryComponents);
+}
diff --git a/src/KurrentDB.Core/Authentication/AuthenticationProviderFactoryComponents.cs b/src/KurrentDB.Core/Authentication/AuthenticationProviderFactoryComponents.cs
new file mode 100644
index 00000000000..97ec8f49c1b
--- /dev/null
+++ b/src/KurrentDB.Core/Authentication/AuthenticationProviderFactoryComponents.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Transport.Http;
+
+namespace KurrentDB.Core.Authentication;
+
+public record AuthenticationProviderFactoryComponents {
+	public IPublisher MainQueue { get; init; }
+	public ISubscriber MainBus { get; init; }
+	public IPublisher WorkersQueue { get; init; }
+	public InMemoryBus[] WorkerBuses { get; init; }
+	public HttpSendService HttpSendService { get; init; }
+	public IHttpService HttpService { get; init; }
+}
diff --git a/src/EventStore.Core/Authentication/DelegatedAuthentication/DelegatedAuthenticationProvider.cs b/src/KurrentDB.Core/Authentication/DelegatedAuthentication/DelegatedAuthenticationProvider.cs
similarity index 89%
rename from src/EventStore.Core/Authentication/DelegatedAuthentication/DelegatedAuthenticationProvider.cs
rename to src/KurrentDB.Core/Authentication/DelegatedAuthentication/DelegatedAuthenticationProvider.cs
index cfa91fac069..52a9b1387e8 100644
--- a/src/EventStore.Core/Authentication/DelegatedAuthentication/DelegatedAuthenticationProvider.cs
+++ b/src/KurrentDB.Core/Authentication/DelegatedAuthentication/DelegatedAuthenticationProvider.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
@@ -8,7 +11,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace EventStore.Core.Authentication.DelegatedAuthentication;
+namespace KurrentDB.Core.Authentication.DelegatedAuthentication;
 
 public class DelegatedAuthenticationProvider(IAuthenticationProvider inner) : AuthenticationProviderBase(new() {
 	Name = inner.Name,
@@ -16,7 +19,7 @@ public class DelegatedAuthenticationProvider(IAuthenticationProvider inner) : Au
 	LicensePublicKey = inner.LicensePublicKey,
 	DiagnosticsName = inner.DiagnosticsName,
 	DiagnosticsTags = inner.DiagnosticsTags
-})  {
+}) {
 	public IAuthenticationProvider Inner { get; } = inner;
 
 	public override Task Initialize() => Inner.Initialize();
@@ -29,10 +32,10 @@ public override IEnumerable<KeyValuePair<string, string>> GetPublicProperties()
 
 	public override void ConfigureEndpoints(IEndpointRouteBuilder endpointRouteBuilder) =>
 		Inner.ConfigureEndpoints(endpointRouteBuilder);
-	
+
 	public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) =>
 		Inner.ConfigureServices(services, configuration);
-	
+
 	public override void ConfigureApplication(IApplicationBuilder app, IConfiguration configuration) =>
 		Inner.ConfigureApplication(app, configuration);
 
diff --git a/src/KurrentDB.Core/Authentication/DelegatedAuthentication/DelegatedClaimsIdentity.cs b/src/KurrentDB.Core/Authentication/DelegatedAuthentication/DelegatedClaimsIdentity.cs
new file mode 100644
index 00000000000..3ad266a84cc
--- /dev/null
+++ b/src/KurrentDB.Core/Authentication/DelegatedAuthentication/DelegatedClaimsIdentity.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+
+namespace KurrentDB.Core.Authentication.DelegatedAuthentication;
+
+public class DelegatedClaimsIdentity(IReadOnlyDictionary<string, string> tokens) :
+	ClaimsIdentity(tokens.Select(pair => new Claim(pair.Key, pair.Value)));
diff --git a/src/KurrentDB.Core/Authentication/InternalAuthentication/AllUsersReader.cs b/src/KurrentDB.Core/Authentication/InternalAuthentication/AllUsersReader.cs
new file mode 100644
index 00000000000..05f1408cf66
--- /dev/null
+++ b/src/KurrentDB.Core/Authentication/InternalAuthentication/AllUsersReader.cs
@@ -0,0 +1,128 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.UserManagement;
+
+namespace KurrentDB.Core.Authentication.InternalAuthentication;
+
+public class AllUsersReader {
+	private const string UserEventType = "$User";
+	private const string UserStreamPrefix = "$user-";
+	private readonly IODispatcher _ioDispatcher;
+	private readonly List<UserManagementMessage.UserData> _results = new List<UserManagementMessage.UserData>();
+	private Action<UserManagementMessage.Error, UserManagementMessage.UserData[]> _onCompleted;
+	private bool _aborted;
+
+	public AllUsersReader(IODispatcher ioDispatcher) {
+		_ioDispatcher = ioDispatcher;
+	}
+
+	public void Run(Action<UserManagementMessage.Error, UserManagementMessage.UserData[]> completed) {
+		if (completed == null)
+			throw new ArgumentNullException(nameof(completed));
+		if (_onCompleted != null)
+			throw new InvalidOperationException("AllUsersReader cannot be re-used");
+
+		_onCompleted = completed;
+
+		BeginReadForward(0);
+	}
+
+	private void BeginReadForward(long fromEventNumber) {
+		_ioDispatcher.ReadForward(
+			"$users", fromEventNumber, 1, false, SystemAccounts.System, ReadUsersForwardCompleted);
+	}
+
+	private void ReadUsersForwardCompleted(ClientMessage.ReadStreamEventsForwardCompleted result) {
+		if (_aborted)
+			return;
+		switch (result.Result) {
+			case ReadStreamResult.Success:
+				foreach (var loginName in from eventData in result.Events
+										  let @event = eventData.Event
+										  where @event.EventType == UserEventType
+										  let stringData = Helper.UTF8NoBom.GetString(@event.Data.Span)
+										  select stringData)
+					BeginReadUserDetails(loginName, () => {
+						if (!result.IsEndOfStream)
+							BeginReadForward(result.NextEventNumber);
+						else
+							TryComplete();
+					});
+
+				break;
+			case ReadStreamResult.NoStream:
+				Abort(UserManagementMessage.Error.NotFound);
+				break;
+			default:
+				Abort(UserManagementMessage.Error.Error);
+				break;
+		}
+	}
+
+	private void Abort(UserManagementMessage.Error error) {
+		_onCompleted(error, null);
+		_onCompleted = null;
+		_aborted = true;
+	}
+
+	private void BeginReadUserDetails(string loginName, Action next) {
+		_ioDispatcher.ReadBackward(
+			UserStreamPrefix + loginName, -1, 1, false, SystemAccounts.System,
+			result => {
+				ReadUserDetailsBackwardCompleted(loginName, result);
+				next();
+			});
+	}
+
+	private void ReadUserDetailsBackwardCompleted(
+		string loginName, ClientMessage.ReadStreamEventsBackwardCompleted result) {
+		if (_aborted)
+			return;
+		switch (result.Result) {
+			case ReadStreamResult.Success:
+				if (_results.Any(x => x.LoginName == loginName))
+					break;
+				if (result.Events.Count is not 1) {
+					AddLoadedUserDetails(loginName, "", [], true, null);
+				} else {
+					try {
+						var eventRecord = result.Events[0].Event;
+						var userData = eventRecord.Data.ParseJson<UserData>();
+						AddLoadedUserDetails(
+							userData.LoginName, userData.FullName, userData.Groups, userData.Disabled,
+							new DateTimeOffset(eventRecord.TimeStamp, TimeSpan.FromHours(0)));
+					} catch {
+						Abort(UserManagementMessage.Error.Error);
+					}
+				}
+
+				break;
+			case ReadStreamResult.NoStream:
+				break;
+			case ReadStreamResult.StreamDeleted:
+				// ignore - deleted
+				break;
+			default:
+				Abort(UserManagementMessage.Error.Error);
+				break;
+		}
+	}
+
+	private void TryComplete() {
+		if (!_aborted)
+			_onCompleted(UserManagementMessage.Error.Success, _results.ToArray());
+	}
+
+	private void AddLoadedUserDetails(
+		string loginName, string fullName, string[] groups, bool disabled, DateTimeOffset? dateLastUpdated) {
+		_results.Add(new UserManagementMessage.UserData(loginName, fullName, groups, disabled, dateLastUpdated));
+	}
+}
diff --git a/src/EventStore.Core/Authentication/InternalAuthentication/InternalAuthenticationProvider.cs b/src/KurrentDB.Core/Authentication/InternalAuthentication/InternalAuthenticationProvider.cs
similarity index 85%
rename from src/EventStore.Core/Authentication/InternalAuthentication/InternalAuthenticationProvider.cs
rename to src/KurrentDB.Core/Authentication/InternalAuthentication/InternalAuthenticationProvider.cs
index 6e0d667c846..46fcfba5303 100644
--- a/src/EventStore.Core/Authentication/InternalAuthentication/InternalAuthenticationProvider.cs
+++ b/src/KurrentDB.Core/Authentication/InternalAuthentication/InternalAuthenticationProvider.cs
@@ -1,35 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.DataStructures;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.UserManagement;
 using EventStore.Plugins.Authentication;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.UserManagement;
+using Serilog;
 using ILogger = Serilog.ILogger;
 
-namespace EventStore.Core.Authentication.InternalAuthentication;
+namespace KurrentDB.Core.Authentication.InternalAuthentication;
 
 public class InternalAuthenticationProvider : AuthenticationProviderBase, IHandle<InternalAuthenticationProviderMessages.ResetPasswordCache> {
-	static readonly ILogger Logger = Serilog.Log.ForContext<InternalAuthenticationProvider>();
+	static readonly ILogger Logger = Log.ForContext<InternalAuthenticationProvider>();
 
 	readonly IODispatcher _ioDispatcher;
 	readonly bool _logFailedAuthenticationAttempts;
 	readonly PasswordHashAlgorithm _passwordHashAlgorithm;
 
 	readonly LRUCache<string, (string hash, string salt, ClaimsPrincipal principal)> _userPasswordsCache;
-	
+
 	readonly TaskCompletionSource<bool> _tcs = new();
-	
+
 	public InternalAuthenticationProvider(
 		ISubscriber subscriber, IODispatcher ioDispatcher,
 		PasswordHashAlgorithm passwordHashAlgorithm,
-		int cacheSize, bool logFailedAuthenticationAttempts, 
+		int cacheSize, bool logFailedAuthenticationAttempts,
 		ClusterVNodeOptions.DefaultUserOptions defaultUserOptions
 	) : base(name: "internal", diagnosticsName: "InternalAuthentication") {
 		_ioDispatcher = ioDispatcher;
@@ -38,13 +42,13 @@ ClusterVNodeOptions.DefaultUserOptions defaultUserOptions
 		_logFailedAuthenticationAttempts = logFailedAuthenticationAttempts;
 
 		var userManagement = new UserManagementService(
-			ioDispatcher: ioDispatcher, 
-			passwordHashAlgorithm: _passwordHashAlgorithm, 
-			skipInitializeStandardUsersCheck: false, 
-			tcs: _tcs, 
+			ioDispatcher: ioDispatcher,
+			passwordHashAlgorithm: _passwordHashAlgorithm,
+			skipInitializeStandardUsersCheck: false,
+			tcs: _tcs,
 			defaultUserOptions: defaultUserOptions
 		);
-		
+
 		subscriber.Subscribe<UserManagementMessage.Create>(userManagement);
 		subscriber.Subscribe<UserManagementMessage.Update>(userManagement);
 		subscriber.Subscribe<UserManagementMessage.Enable>(userManagement);
@@ -59,7 +63,7 @@ ClusterVNodeOptions.DefaultUserOptions defaultUserOptions
 		subscriber.Subscribe<SystemMessage.BecomeReadOnlyReplica>(userManagement);
 	}
 
-	public void Handle(InternalAuthenticationProviderMessages.ResetPasswordCache message) => 
+	public void Handle(InternalAuthenticationProviderMessages.ResetPasswordCache message) =>
 		_userPasswordsCache.Remove(message.LoginName);
 
 	public override void Authenticate(AuthenticationRequest authenticationRequest) {
@@ -97,11 +101,11 @@ static ClaimsPrincipal CreatePrincipal(UserData userData) {
 			.Select(role => new Claim(ClaimTypes.Role, role))
 			.Prepend(new(ClaimTypes.Name, userData.LoginName))
 			.ToList();
-		
+
 		return new(new ClaimsIdentity(claims, "ES-Legacy"));
 	}
 
-	void CachePassword(string loginName, string hash, string salt, ClaimsPrincipal principal) => 
+	void CachePassword(string loginName, string hash, string salt, ClaimsPrincipal principal) =>
 		_userPasswordsCache.Put(loginName, (hash, salt, principal));
 
 	void AuthenticateCached(AuthenticationRequest authenticationRequest, string passwordHash, string passwordSalt, ClaimsPrincipal principal) {
@@ -120,7 +124,7 @@ bool AuthenticateImpl(AuthenticationRequest authenticationRequest, string passwo
 			return true;
 
 		// otherwise default to password authentication
-		if (_passwordHashAlgorithm.Verify(authenticationRequest.SuppliedPassword, passwordHash, passwordSalt)) 
+		if (_passwordHashAlgorithm.Verify(authenticationRequest.SuppliedPassword, passwordHash, passwordSalt))
 			return true;
 
 		if (_logFailedAuthenticationAttempts)
@@ -138,8 +142,8 @@ class AuthReadResponseHandler(InternalAuthenticationProvider self, Authenticatio
 		public void Handle(ClientMessage.ReadStreamEventsBackwardCompleted completed) {
 			try {
 				if (completed.Result == ReadStreamResult.StreamDeleted ||
-				    completed.Result == ReadStreamResult.NoStream ||
-				    completed.Result == ReadStreamResult.AccessDenied) {
+					completed.Result == ReadStreamResult.NoStream ||
+					completed.Result == ReadStreamResult.AccessDenied) {
 					if (self._logFailedAuthenticationAttempts)
 						Logger.Warning("Authentication Failed for {Id}: {Reason}", request.Id, "Invalid user.");
 					request.Unauthorized();
@@ -162,14 +166,12 @@ public void Handle(ClientMessage.ReadStreamEventsBackwardCompleted completed) {
 				if (userData.Disabled) {
 					if (self._logFailedAuthenticationAttempts)
 						Logger.Warning("Authentication Failed for {Id}: {Reason}", request.Id, "The account is disabled.");
-					
+
 					request.Unauthorized();
-				}
-				else {
+				} else {
 					self.AuthenticateUncached(request, userData);
 				}
-			}
-			catch {
+			} catch {
 				request.Unauthorized();
 			}
 		}
@@ -177,17 +179,17 @@ public void Handle(ClientMessage.ReadStreamEventsBackwardCompleted completed) {
 		public void Handle(ClientMessage.NotHandled notHandled) {
 			if (self._logFailedAuthenticationAttempts)
 				Logger.Warning(
-					"Authentication Failed for {Id}: {Reason}. {Description}", 
+					"Authentication Failed for {Id}: {Reason}. {Description}",
 					request.Id, notHandled.Reason, notHandled.Description
 				);
-			
+
 			request.NotReady();
 		}
 
 		public void Timeout() {
 			if (self._logFailedAuthenticationAttempts)
 				Logger.Warning("Authentication Failed for {Id}: {Reason}", request.Id, "Timeout.");
-			
+
 			request.NotReady();
 		}
 	}
diff --git a/src/EventStore.Core/Authentication/InternalAuthentication/InternalAuthenticationProviderFactory.cs b/src/KurrentDB.Core/Authentication/InternalAuthentication/InternalAuthenticationProviderFactory.cs
similarity index 81%
rename from src/EventStore.Core/Authentication/InternalAuthentication/InternalAuthenticationProviderFactory.cs
rename to src/KurrentDB.Core/Authentication/InternalAuthentication/InternalAuthenticationProviderFactory.cs
index 184895e5169..3a7dbf5373e 100644
--- a/src/EventStore.Core/Authentication/InternalAuthentication/InternalAuthenticationProviderFactory.cs
+++ b/src/KurrentDB.Core/Authentication/InternalAuthentication/InternalAuthenticationProviderFactory.cs
@@ -1,11 +1,15 @@
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.Transport.Http.Authentication;
-using EventStore.Core.Services.Transport.Http.Controllers;
-using EventStore.Core.Settings;
-using EventStore.Plugins.Authentication;
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
 
-namespace EventStore.Core.Authentication.InternalAuthentication;
+using EventStore.Plugins.Authentication;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Transport.Http.Authentication;
+using KurrentDB.Core.Services.Transport.Http.Controllers;
+using KurrentDB.Core.Settings;
+using IODispatcherDelayedMessage = KurrentDB.Core.Helpers.IODispatcherDelayedMessage;
+
+namespace KurrentDB.Core.Authentication.InternalAuthentication;
 
 public class InternalAuthenticationProviderFactory : IAuthenticationProviderFactory {
 	private readonly AuthenticationProviderFactoryComponents _components;
diff --git a/src/KurrentDB.Core/Authentication/InternalAuthentication/PasswordHashAlgorithm.cs b/src/KurrentDB.Core/Authentication/InternalAuthentication/PasswordHashAlgorithm.cs
new file mode 100644
index 00000000000..45bad30401a
--- /dev/null
+++ b/src/KurrentDB.Core/Authentication/InternalAuthentication/PasswordHashAlgorithm.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Authentication.InternalAuthentication;
+
+public abstract class PasswordHashAlgorithm {
+	public abstract void Hash(string password, out string hash, out string salt);
+	public abstract bool Verify(string password, string hash, string salt);
+}
diff --git a/src/EventStore.Core/Authentication/InternalAuthentication/UserManagementService.cs b/src/KurrentDB.Core/Authentication/InternalAuthentication/UserManagementService.cs
similarity index 90%
rename from src/EventStore.Core/Authentication/InternalAuthentication/UserManagementService.cs
rename to src/KurrentDB.Core/Authentication/InternalAuthentication/UserManagementService.cs
index dcf9d50ca03..4c75423dab6 100644
--- a/src/EventStore.Core/Authentication/InternalAuthentication/UserManagementService.cs
+++ b/src/KurrentDB.Core/Authentication/InternalAuthentication/UserManagementService.cs
@@ -1,23 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services;
-using EventStore.Core.Services.UserManagement;
 using JetBrains.Annotations;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.UserManagement;
+using Serilog;
 using ILogger = Serilog.ILogger;
-using ReadStreamResult = EventStore.Core.Data.ReadStreamResult;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
 
-namespace EventStore.Core.Authentication.InternalAuthentication;
+namespace KurrentDB.Core.Authentication.InternalAuthentication;
 
 [PublicAPI]
-public class UserManagementService : 
+public class UserManagementService :
 	IHandle<UserManagementMessage.Get>,
 	IHandle<UserManagementMessage.GetAll>,
 	IHandle<UserManagementMessage.Create>,
@@ -30,8 +34,8 @@ public class UserManagementService :
 	IHandle<SystemMessage.BecomeLeader>,
 	IHandle<SystemMessage.BecomeFollower>,
 	IHandle<SystemMessage.BecomeReadOnlyReplica> {
-	static readonly ILogger Logger = Serilog.Log.ForContext<UserManagementService>();
-		
+	static readonly ILogger Logger = Log.ForContext<UserManagementService>();
+
 	public const string UserUpdated = "$UserUpdated";
 	public const string PasswordChanged = "$PasswordChanged";
 	public const string UserPasswordNotificationsStreamId = "$users-password-notifications";
@@ -47,7 +51,7 @@ public class UserManagementService :
 
 	public UserManagementService(
 		IODispatcher ioDispatcher,
-		PasswordHashAlgorithm passwordHashAlgorithm, 
+		PasswordHashAlgorithm passwordHashAlgorithm,
 		bool skipInitializeStandardUsersCheck,
 		TaskCompletionSource<bool> tcs,
 		ClusterVNodeOptions.DefaultUserOptions defaultUserOptions
@@ -72,7 +76,7 @@ public void Handle(UserManagementMessage.Create message) {
 
 		var userData = CreateUserData(message);
 		BeginReadUserDetails(message.LoginName, read => {
-			if (read.Events.Length > 0) {
+			if (read.Events.Count > 0) {
 				var data = read.Events[^1].Event.Data.ParseJson<UserData>();
 				if (VerifyPassword(message.Password, data)) {
 					ReplyUpdated(message);
@@ -136,14 +140,14 @@ public void Handle(UserManagementMessage.ResetPassword message) {
 	public void Handle(UserManagementMessage.ChangePassword message) {
 		_passwordHashAlgorithm.Hash(message.NewPassword, out var hash, out var salt);
 		ReadUpdateWriteReply(
-			message, 
+			message,
 			data => {
 				if (_passwordHashAlgorithm.Verify(message.CurrentPassword, data.Hash, data.Salt))
 					return data.SetPassword(hash, salt);
 
 				ReplyUnauthorized(message);
 				return null;
-			}, 
+			},
 			resetPasswordCache: true
 		);
 	}
@@ -158,10 +162,10 @@ public void Handle(UserManagementMessage.Delete message) {
 			message,
 			(completed, _) =>
 				_ioDispatcher.DeleteStream(
-					$"$user-{message.LoginName}", 
-					completed.FromEventNumber, 
-					false, 
-					SystemAccounts.System, 
+					$"$user-{message.LoginName}",
+					completed.FromEventNumber,
+					false,
+					SystemAccounts.System,
 					streamCompleted => WritePasswordChangedEventConditionalAnd(message, true, () => ReplyByWriteResult(message, streamCompleted.Result))
 				)
 		);
@@ -170,7 +174,7 @@ public void Handle(UserManagementMessage.Delete message) {
 	public void Handle(UserManagementMessage.Get message) {
 		ReadUserDetailsAnd(
 			message, (completed, data) => {
-				if (completed.Result == ReadStreamResult.Success && completed.Events.Length == 1)
+				if (completed.Result == ReadStreamResult.Success && completed.Events.Count is 1)
 					message.Envelope.ReplyWith(
 						new UserManagementMessage.UserDetailsResult(
 							new UserManagementMessage.UserData(
@@ -223,18 +227,19 @@ public void Handle(SystemMessage.BecomeLeader message) {
 			_tcs.TrySetResult(true);
 	}
 
-	public void Handle(SystemMessage.BecomeFollower message) => 
+	public void Handle(SystemMessage.BecomeFollower message) =>
 		_tcs.TrySetResult(true);
 
-	public void Handle(SystemMessage.BecomeReadOnlyReplica message) => 
+	public void Handle(SystemMessage.BecomeReadOnlyReplica message) =>
 		_tcs.TrySetResult(true);
 
 	void NotifyInitialized() {
 		var remainingUsers = Interlocked.Decrement(ref _numberOfStandardUsersToBeCreated);
-		if (remainingUsers == 0) _tcs.TrySetResult(true);
+		if (remainingUsers == 0)
+			_tcs.TrySetResult(true);
 	}
 
-	UserData CreateUserData(UserManagementMessage.Create message) => 
+	UserData CreateUserData(UserManagementMessage.Create message) =>
 		CreateUserData(message.LoginName, message.FullName, message.Groups, message.Password);
 
 	UserData CreateUserData(string loginName, string fullName, string[] groups, string password) {
@@ -256,7 +261,7 @@ void ReadUserDetailsAnd(
 						ReplyNotFound(message);
 						break;
 					case ReadStreamResult.Success:
-						if (completed.Events.Length == 0)
+						if (completed.Events is [])
 							ReplyNotFound(message);
 						else {
 							var data1 = completed.Events[0].Event.Data.ParseJson<UserData>();
@@ -271,7 +276,7 @@ void ReadUserDetailsAnd(
 			});
 	}
 
-	void BeginReadUserDetails(string loginName, Action<ClientMessage.ReadStreamEventsBackwardCompleted> completed) => 
+	void BeginReadUserDetails(string loginName, Action<ClientMessage.ReadStreamEventsBackwardCompleted> completed) =>
 		_ioDispatcher.ReadBackward($"$user-{loginName}", -1, 1, false, SystemAccounts.System, completed);
 
 	void ReadUpdateWriteReply(UserManagementMessage.UserManagementRequestMessage message, Func<UserData, UserData> update, bool resetPasswordCache) {
@@ -295,12 +300,12 @@ void WritePasswordChangedEventConditionalAnd(
 			);
 		else
 			onCompleted();
-		
+
 		return;
 
 		static void WritePasswordChangedEventCompleted(
-			UserManagementMessage.UserManagementRequestMessage message, 
-			ClientMessage.WriteEventsCompleted eventsCompleted, 
+			UserManagementMessage.UserManagementRequestMessage message,
+			ClientMessage.WriteEventsCompleted eventsCompleted,
 			Action onCompleted
 		) {
 			switch (eventsCompleted.Result) {
@@ -333,8 +338,8 @@ void BeginWritePasswordChangedEvent(string loginName, Action<ClientMessage.Write
 		);
 	}
 
-	static Event CreatePasswordChangedEvent(string loginName) => 
-		new(Guid.NewGuid(), PasswordChanged, true, new {LoginName = loginName}.ToJsonBytes(), null);
+	static Event CreatePasswordChangedEvent(string loginName) =>
+		new(Guid.NewGuid(), PasswordChanged, true, new { LoginName = loginName }.ToJsonBytes(), null);
 
 	void ReadUpdateCheckAnd(UserManagementMessage.UserManagementRequestMessage message,
 		Action<ClientMessage.ReadStreamEventsBackwardCompleted, UserData> action) {
@@ -410,24 +415,24 @@ static void WriteUsersStreamCompleted(ClientMessage.WriteEventsCompleted complet
 		ReplyByWriteResult(message, completed.Result);
 	}
 
-	static void ReplyInternalError(UserManagementMessage.UserManagementRequestMessage message) => 
+	static void ReplyInternalError(UserManagementMessage.UserManagementRequestMessage message) =>
 		ReplyError(message, UserManagementMessage.Error.Error);
 
-	static void ReplyNotFound(UserManagementMessage.UserManagementRequestMessage message) => 
+	static void ReplyNotFound(UserManagementMessage.UserManagementRequestMessage message) =>
 		ReplyError(message, UserManagementMessage.Error.NotFound);
 
-	static void ReplyConflict(UserManagementMessage.UserManagementRequestMessage message) => 
+	static void ReplyConflict(UserManagementMessage.UserManagementRequestMessage message) =>
 		ReplyError(message, UserManagementMessage.Error.Conflict);
 
-	//NOTE: probably unauthorized iis not correct reply here.  
+	//NOTE: probably unauthorized iis not correct reply here.
 	// been converted to http 401 status code it will prompt for authorization
-	static void ReplyUnauthorized(UserManagementMessage.UserManagementRequestMessage message) => 
+	static void ReplyUnauthorized(UserManagementMessage.UserManagementRequestMessage message) =>
 		ReplyError(message, UserManagementMessage.Error.Unauthorized);
 
-	static void ReplyTryAgain(UserManagementMessage.UserManagementRequestMessage message) => 
+	static void ReplyTryAgain(UserManagementMessage.UserManagementRequestMessage message) =>
 		ReplyError(message, UserManagementMessage.Error.TryAgain);
 
-	static void ReplyUpdated(UserManagementMessage.UserManagementRequestMessage message) => 
+	static void ReplyUpdated(UserManagementMessage.UserManagementRequestMessage message) =>
 		message.Envelope.ReplyWith(new UserManagementMessage.UpdateResult(message.LoginName));
 
 	static void ReplyError(UserManagementMessage.UserManagementRequestMessage message, UserManagementMessage.Error error) {
@@ -460,12 +465,12 @@ static void ReplyByWriteResult(UserManagementMessage.UserManagementRequestMessag
 
 	void CreateAdminUser() {
 		var userData = CreateUserData(
-			SystemUsers.Admin, 
-			"Event Store Administrator", 
+			SystemUsers.Admin,
+			"KurrentDB Administrator",
 			[SystemRoles.Admins],
 			_defaultUserOptions.DefaultAdminPassword
 		);
-			
+
 		WriteStreamAcl(
 			SystemUsers.Admin, completed1 => {
 				switch (completed1.Result) {
@@ -511,12 +516,12 @@ void CreateAdminUser() {
 
 	void CreateOperationsUser() {
 		var userData = CreateUserData(
-			SystemUsers.Operations, 
-			"Event Store Operations", 
+			SystemUsers.Operations,
+			"KurrentDB Operations",
 			[SystemRoles.Operations],
 			_defaultUserOptions.DefaultOpsPassword
 		);
-			
+
 		WriteStreamAcl(
 			SystemUsers.Operations, completed1 => {
 				switch (completed1.Result) {
@@ -560,6 +565,6 @@ void CreateOperationsUser() {
 			});
 	}
 
-	static bool IsAdmin(ClaimsPrincipal principal) => 
+	static bool IsAdmin(ClaimsPrincipal principal) =>
 		principal?.LegacyRoleCheck(SystemRoles.Admins) == true;
 }
diff --git a/src/KurrentDB.Core/Authentication/PassthroughAuthentication/PassthroughAuthenticationProvider.cs b/src/KurrentDB.Core/Authentication/PassthroughAuthentication/PassthroughAuthenticationProvider.cs
new file mode 100644
index 00000000000..e2f99463018
--- /dev/null
+++ b/src/KurrentDB.Core/Authentication/PassthroughAuthentication/PassthroughAuthenticationProvider.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System.Collections.Generic;
+using EventStore.Plugins.Authentication;
+using KurrentDB.Core.Services.UserManagement;
+
+namespace KurrentDB.Core.Authentication.PassthroughAuthentication;
+
+public class PassthroughAuthenticationProvider() : AuthenticationProviderBase(name: "insecure", diagnosticsName: "PassthroughAuthentication") {
+	public override void Authenticate(AuthenticationRequest authenticationRequest) =>
+		authenticationRequest.Authenticated(SystemAccounts.System);
+
+	public override IReadOnlyList<string> GetSupportedAuthenticationSchemes() => ["Insecure"];
+}
diff --git a/src/KurrentDB.Core/Authentication/PassthroughAuthentication/PassthroughAuthenticationProviderFactory.cs b/src/KurrentDB.Core/Authentication/PassthroughAuthentication/PassthroughAuthenticationProviderFactory.cs
new file mode 100644
index 00000000000..c08a6cc32a9
--- /dev/null
+++ b/src/KurrentDB.Core/Authentication/PassthroughAuthentication/PassthroughAuthenticationProviderFactory.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Authentication;
+
+namespace KurrentDB.Core.Authentication.PassthroughAuthentication;
+
+public class PassthroughAuthenticationProviderFactory : IAuthenticationProviderFactory {
+	public IAuthenticationProvider Build(bool logFailedAuthenticationAttempts) => new PassthroughAuthenticationProvider();
+}
diff --git a/src/KurrentDB.Core/Authorization/AllowAnonymousAssertion.cs b/src/KurrentDB.Core/Authorization/AllowAnonymousAssertion.cs
new file mode 100644
index 00000000000..475a63f2b39
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/AllowAnonymousAssertion.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Claims;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Core.Authorization;
+
+internal class AllowAnonymousAssertion : IAssertion {
+	public Grant Grant { get; } = Grant.Allow;
+
+	public AssertionInformation Information { get; } =
+		new AssertionInformation("authenticated", "not anonymous", Grant.Unknown);
+
+	public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context) {
+		context.Add(new AssertionMatch(policy, new AssertionInformation("match", "allow anonymous", Grant.Allow)));
+		return new ValueTask<bool>(true);
+	}
+}
diff --git a/src/KurrentDB.Core/Authorization/AndAssertion.cs b/src/KurrentDB.Core/Authorization/AndAssertion.cs
new file mode 100644
index 00000000000..1d4362b6913
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/AndAssertion.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Core.Authorization;
+
+internal class AndAssertion : IAssertion {
+	private readonly ReadOnlyMemory<IAssertion> _assertions;
+	private readonly AssertionInformation _failedToMatchAllSubAssertions;
+
+	public AndAssertion(params IAssertion[] assertions) {
+		_assertions = assertions.OrderBy(x => x.Grant).ToArray();
+		_failedToMatchAllSubAssertions = new AssertionInformation("and",
+			$"({string.Join(",", _assertions.Span.ToArray().Select(x => x.ToString()))})", Grant.Deny);
+		Information = new AssertionInformation("and",
+			$"({string.Join(",", _assertions.ToArray().Select(x => x.ToString()))})", Grant.Unknown);
+	}
+
+	public AssertionInformation Information { get; }
+
+	public Grant Grant { get; } = Grant.Unknown;
+
+	public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context) {
+		var remaining = _assertions;
+		while (!remaining.IsEmpty && context.Grant != Grant.Deny) {
+			var pending = remaining.Span[0].Evaluate(cp, operation, policy, context);
+			remaining = remaining.Slice(1);
+			if (!pending.IsCompleted)
+				return EvaluateAsync(pending, remaining, cp, operation, policy, context);
+			if (!pending.Result) {
+				context.Add(new AssertionMatch(policy, _failedToMatchAllSubAssertions));
+				return new ValueTask<bool>(false);
+			}
+		}
+
+		return new ValueTask<bool>(true);
+	}
+
+	private async ValueTask<bool> EvaluateAsync(ValueTask<bool> pending, ReadOnlyMemory<IAssertion> remaining,
+		ClaimsPrincipal cp, Operation operation, PolicyInformation policy, EvaluationContext result) {
+		bool evaluated;
+		while ((evaluated = await pending) && !remaining.IsEmpty) {
+			pending = remaining.Span[0].Evaluate(cp, operation, policy, result);
+			remaining = remaining.Slice(1);
+		}
+
+		if (!evaluated)
+			result.Add(new AssertionMatch(policy, _failedToMatchAllSubAssertions));
+		return evaluated;
+	}
+}
diff --git a/src/KurrentDB.Core/Authorization/AssertionComparer.cs b/src/KurrentDB.Core/Authorization/AssertionComparer.cs
new file mode 100644
index 00000000000..2cc878a16e6
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/AssertionComparer.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace KurrentDB.Core.Authorization;
+
+public sealed class AssertionComparer : IComparer<IAssertion> {
+	private static readonly MethodInfo OpenTypeComparer =
+		new Func<IAssertion, IAssertion, int>(Compare<object>).Method.GetGenericMethodDefinition();
+
+	private AssertionComparer() { }
+
+	public static IComparer<IAssertion> Instance { get; } = new AssertionComparer();
+
+	public int Compare(IAssertion x, IAssertion y) {
+		var grant = x.Grant.CompareTo(y.Grant);
+		if (grant != 0)
+			return grant * -1;
+
+		var type = Comparer<Type>.Default.Compare(x.GetType(), y.GetType());
+		if (type != 0)
+			return type;
+
+		var closed = (Func<IAssertion, IAssertion, int>)OpenTypeComparer.MakeGenericMethod(x.GetType())
+			.CreateDelegate(typeof(Func<IAssertion, IAssertion, int>));
+		return closed(x, y);
+	}
+
+	private static int Compare<T>(IAssertion x, IAssertion y) {
+		if (x is IComparable<T> comparable)
+			return comparable.CompareTo((T)y);
+		throw new NotSupportedException(
+			"Assertion classes must implement IComparable<T> where T is the Assertion class");
+	}
+}
diff --git a/src/KurrentDB.Core/Authorization/AssertionInformation.cs b/src/KurrentDB.Core/Authorization/AssertionInformation.cs
new file mode 100644
index 00000000000..b1b1a3d20c1
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/AssertionInformation.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Authorization;
+
+public struct AssertionInformation {
+	public Grant Grant { get; }
+	private readonly string _assertion;
+
+	public AssertionInformation(string type, string assertion, Grant grant) {
+		Grant = grant;
+		_assertion = $"{type}:{assertion}:{grant}";
+	}
+
+	public override string ToString() {
+		return _assertion;
+	}
+}
diff --git a/src/KurrentDB.Core/Authorization/AssertionMatch.cs b/src/KurrentDB.Core/Authorization/AssertionMatch.cs
new file mode 100644
index 00000000000..386a6aca313
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/AssertionMatch.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+
+namespace KurrentDB.Core.Authorization;
+
+public readonly struct AssertionMatch {
+	public readonly PolicyInformation Policy;
+	public readonly AssertionInformation Assertion;
+	public readonly IReadOnlyList<Claim> Matches;
+
+	public AssertionMatch(PolicyInformation policy, AssertionInformation assertion, params Claim[] matches) : this(
+		policy, assertion, (IReadOnlyList<Claim>)matches) {
+	}
+
+	public AssertionMatch(PolicyInformation policy, AssertionInformation assertion, IReadOnlyList<Claim> matches) {
+		Policy = policy;
+		Assertion = assertion;
+		Matches = matches;
+	}
+
+	public override string ToString() {
+		return $"{Policy} : {Assertion}, ${string.Join(Environment.NewLine + "\t", Matches)}";
+	}
+}
diff --git a/src/KurrentDB.Core/Authorization/AuthorizationPolicies/AuthorizationPolicySettings.cs b/src/KurrentDB.Core/Authorization/AuthorizationPolicies/AuthorizationPolicySettings.cs
new file mode 100644
index 00000000000..9659937b2e8
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/AuthorizationPolicies/AuthorizationPolicySettings.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Authorization.AuthorizationPolicies;
+
+public class AuthorizationPolicySettings {
+	public string StreamAccessPolicyType { get; set; }
+
+	public AuthorizationPolicySettings() {
+		StreamAccessPolicyType = FallbackStreamAccessPolicySelector.FallbackPolicyName;
+	}
+
+	public AuthorizationPolicySettings(string streamAccessPolicyType) {
+		StreamAccessPolicyType = streamAccessPolicyType;
+	}
+	public override string ToString() => $"{nameof(StreamAccessPolicyType)}: '{StreamAccessPolicyType}'";
+}
diff --git a/src/KurrentDB.Core/Authorization/AuthorizationPolicies/FallbackStreamAccessPolicySelector.cs b/src/KurrentDB.Core/Authorization/AuthorizationPolicies/FallbackStreamAccessPolicySelector.cs
new file mode 100644
index 00000000000..727595b7e2b
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/AuthorizationPolicies/FallbackStreamAccessPolicySelector.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Core.Authorization.AuthorizationPolicies;
+
+/// <summary>
+/// This policy selector is used if there are entries in the settings stream
+/// but none of them are valid or can be started.
+/// Only admins have stream access to prevent falling back to a more permissive policy.
+/// </summary>
+public class FallbackStreamAccessPolicySelector : IPolicySelector {
+	public const string FallbackPolicyName = "system-fallback";
+
+	public ReadOnlyPolicy Select() {
+		var restrictedAccess = new RestrictedAccessAssertion();
+		var policy = new Policy(FallbackPolicyName, 1, DateTimeOffset.MinValue);
+		// Streams
+		policy.Add(Operations.Streams.Read, restrictedAccess);
+		policy.Add(Operations.Streams.Write, restrictedAccess);
+		policy.Add(Operations.Streams.Delete, restrictedAccess);
+		policy.Add(Operations.Streams.MetadataRead, restrictedAccess);
+		policy.Add(Operations.Streams.MetadataWrite, restrictedAccess);
+		// Persistent Subscriptions
+		policy.Add(Operations.Subscriptions.ProcessMessages, restrictedAccess);
+		return policy.AsReadOnly();
+	}
+}
+
+public class RestrictedAccessAssertion : IStreamPermissionAssertion {
+	public Grant Grant => Grant.Deny;
+	public AssertionInformation Information { get; } = new("stream", "restricted access", Grant.Deny);
+
+	public async ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context) {
+		if (await WellKnownAssertions.System.Evaluate(cp, operation, policy, context) ||
+			await WellKnownAssertions.Admin.Evaluate(cp, operation, policy, context))
+			return true;
+		context.Add(new AssertionMatch(policy,
+			new AssertionInformation("stream", $"operation {operation} restricted to system or admin users only", Grant.Deny)));
+		return true;
+	}
+}
diff --git a/src/KurrentDB.Core/Authorization/AuthorizationPolicies/IAuthorizationPolicyRegistry.cs b/src/KurrentDB.Core/Authorization/AuthorizationPolicies/IAuthorizationPolicyRegistry.cs
new file mode 100644
index 00000000000..a0aa791e9a1
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/AuthorizationPolicies/IAuthorizationPolicyRegistry.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core.Authorization.AuthorizationPolicies;
+
+public interface IAuthorizationPolicyRegistry {
+	public ReadOnlyPolicy[] EffectivePolicies { get; }
+	public Task Start();
+	public Task Stop();
+}
diff --git a/src/KurrentDB.Core/Authorization/AuthorizationPolicies/IPolicySelector.cs b/src/KurrentDB.Core/Authorization/AuthorizationPolicies/IPolicySelector.cs
new file mode 100644
index 00000000000..b3ec216867d
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/AuthorizationPolicies/IPolicySelector.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+namespace KurrentDB.Core.Authorization.AuthorizationPolicies;
+
+public interface IPolicySelector {
+	ReadOnlyPolicy Select();
+}
diff --git a/src/KurrentDB.Core/Authorization/AuthorizationPolicies/IPolicySelectorFactory.cs b/src/KurrentDB.Core/Authorization/AuthorizationPolicies/IPolicySelectorFactory.cs
new file mode 100644
index 00000000000..e91f8662881
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/AuthorizationPolicies/IPolicySelectorFactory.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+
+namespace KurrentDB.Core.Authorization.AuthorizationPolicies;
+
+// TODO: Move this to EventStore.Plugins when we're decoupling the StreamPolicies Plugin
+public interface IPolicySelectorFactory {
+	string CommandLineName { get; }
+	IPolicySelector Create(IPublisher publisher);
+	Task<bool> Enable();
+	Task Disable();
+}
diff --git a/src/EventStore.Core/Authorization/LegacyPolicySelectorFactory.cs b/src/KurrentDB.Core/Authorization/AuthorizationPolicies/LegacyPolicySelectorFactory.cs
similarity index 91%
rename from src/EventStore.Core/Authorization/LegacyPolicySelectorFactory.cs
rename to src/KurrentDB.Core/Authorization/AuthorizationPolicies/LegacyPolicySelectorFactory.cs
index 81ea34cca53..310534b8378 100644
--- a/src/EventStore.Core/Authorization/LegacyPolicySelectorFactory.cs
+++ b/src/KurrentDB.Core/Authorization/AuthorizationPolicies/LegacyPolicySelectorFactory.cs
@@ -1,28 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Linq;
 using System.Security.Claims;
-using EventStore.Core.Bus;
-using EventStore.Core.Services;
-using EventStore.Core.Services.UserManagement;
+using System.Threading.Tasks;
 using EventStore.Plugins.Authorization;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.UserManagement;
 
-namespace EventStore.Core.Authorization;
+namespace KurrentDB.Core.Authorization.AuthorizationPolicies;
 
 public class LegacyPolicySelectorFactory : IPolicySelectorFactory {
-	public string CommandLineName { get; } = "legacy";
-	public string Name { get; } = "legacy";
-	public string Version { get; } = "1";
 	private readonly bool _allowAnonymousEndpointAccess;
 	private readonly bool _allowAnonymousStreamAccess;
 	private readonly bool _overrideAnonymousGossipEndpointAccess;
-
-	private static readonly Claim[] Admins =
-		{new Claim(ClaimTypes.Role, SystemRoles.Admins), new Claim(ClaimTypes.Name, SystemUsers.Admin)};
-
-	private static readonly Claim[] OperationsOrAdmins = {
-		new Claim(ClaimTypes.Role, SystemRoles.Admins), new Claim(ClaimTypes.Name, SystemUsers.Admin),
-		new Claim(ClaimTypes.Role, SystemRoles.Operations), new Claim(ClaimTypes.Name, SystemUsers.Operations)
-	};
+	public const string LegacyPolicySelectorName = "acl";
+	public string CommandLineName => LegacyPolicySelectorName;
 
 	public LegacyPolicySelectorFactory(
 		bool allowAnonymousEndpointAccess,
@@ -33,8 +28,20 @@ public LegacyPolicySelectorFactory(
 		_overrideAnonymousGossipEndpointAccess = overrideAnonymousGossipEndpointAccess;
 	}
 
-	public IPolicySelector Create(IPublisher publisher, ISubscriber subscriber) {
-		var policy = new Policy("Legacy", 1, DateTimeOffset.MinValue);
+	private static readonly Claim[] Admins =
+		{new Claim(ClaimTypes.Role, SystemRoles.Admins), new Claim(ClaimTypes.Name, SystemUsers.Admin)};
+
+	private static readonly Claim[] OperationsOrAdmins = {
+		new Claim(ClaimTypes.Role, SystemRoles.Admins), new Claim(ClaimTypes.Name, SystemUsers.Admin),
+		new Claim(ClaimTypes.Role, SystemRoles.Operations), new Claim(ClaimTypes.Name, SystemUsers.Operations)
+	};
+
+	public Task<bool> Enable() => Task.FromResult(true);
+
+	public Task Disable() => Task.CompletedTask;
+
+	public IPolicySelector Create(IPublisher publisher) {
+		var policy = new Policy(LegacyPolicySelectorName, 1, DateTimeOffset.MinValue);
 		var legacyStreamAssertion = new LegacyStreamPermissionAssertion(publisher);
 
 		// The Node.Ping is set to allow anonymous as it does not disclose any secure information.
diff --git a/src/KurrentDB.Core/Authorization/AuthorizationPolicies/StaticAuthorizationPolicyRegistry.cs b/src/KurrentDB.Core/Authorization/AuthorizationPolicies/StaticAuthorizationPolicyRegistry.cs
new file mode 100644
index 00000000000..718eb1030cc
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/AuthorizationPolicies/StaticAuthorizationPolicyRegistry.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core.Authorization.AuthorizationPolicies;
+
+public class StaticAuthorizationPolicyRegistry : IAuthorizationPolicyRegistry {
+	public Task Start() => Task.CompletedTask;
+	public Task Stop() => Task.CompletedTask;
+	private readonly IPolicySelector[] _policySelectors;
+	public ReadOnlyPolicy[] EffectivePolicies => _policySelectors.Select(x => x.Select()).ToArray();
+
+	public StaticAuthorizationPolicyRegistry(IPolicySelector[] policySelectors) {
+		_policySelectors = policySelectors;
+	}
+}
diff --git a/src/KurrentDB.Core/Authorization/AuthorizationPolicies/StaticPolicySelector.cs b/src/KurrentDB.Core/Authorization/AuthorizationPolicies/StaticPolicySelector.cs
new file mode 100644
index 00000000000..9eea03fd00c
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/AuthorizationPolicies/StaticPolicySelector.cs
@@ -0,0 +1,8 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Authorization.AuthorizationPolicies;
+
+public class StaticPolicySelector(ReadOnlyPolicy policy) : IPolicySelector {
+	public ReadOnlyPolicy Select() => policy;
+}
diff --git a/src/KurrentDB.Core/Authorization/AuthorizationPolicies/StreamBasedAuthorizationPolicyRegistry.cs b/src/KurrentDB.Core/Authorization/AuthorizationPolicies/StreamBasedAuthorizationPolicyRegistry.cs
new file mode 100644
index 00000000000..8f0c5357b50
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/AuthorizationPolicies/StreamBasedAuthorizationPolicyRegistry.cs
@@ -0,0 +1,259 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+using System;
+using System.Linq;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Exceptions;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Enumerators;
+using KurrentDB.Core.Services.UserManagement;
+using Serilog;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Core.Authorization.AuthorizationPolicies;
+
+public class StreamBasedAuthorizationPolicyRegistry :
+	IAuthorizationPolicyRegistry {
+	private readonly string _stream = SystemStreams.AuthorizationPolicyRegistryStream;
+	private readonly ILogger _logger = Log.ForContext<StreamBasedAuthorizationPolicyRegistry>();
+	private readonly IPublisher _publisher;
+
+	private readonly FallbackStreamAccessPolicySelector _fallbackStreamAccessPolicySelector = new();
+	private readonly IPolicySelector _legacyPolicySelector;
+	private readonly IPolicySelectorFactory[] _pluginSelectorFactories;
+	private readonly AuthorizationPolicySettings _defaultSettings;
+	public event EventHandler<PolicyChangedEventArgs>? PolicyChanged;
+
+	private CancellationTokenSource? _cts;
+	private IPolicySelector[] _effectivePolicySelectors = [];
+
+	private static readonly JsonSerializerOptions SerializeOptions = new() {
+		PropertyNamingPolicy = JsonNamingPolicy.CamelCase
+	};
+
+	public class PolicyChangedEventArgs : EventArgs {
+		public ReadOnlyPolicy[] EffectivePolicies { get; }
+
+		public PolicyChangedEventArgs(ReadOnlyPolicy[] effectivePolicies) {
+			EffectivePolicies = effectivePolicies;
+		}
+	}
+
+	public StreamBasedAuthorizationPolicyRegistry(IPublisher publisher, IPolicySelector legacyPolicySelector, IPolicySelectorFactory[] pluginSelectorFactories, AuthorizationPolicySettings defaultSettings) {
+		_publisher = publisher;
+		_legacyPolicySelector = legacyPolicySelector;
+		_pluginSelectorFactories = pluginSelectorFactories;
+		_defaultSettings = defaultSettings;
+	}
+
+	public ReadOnlyPolicy[] EffectivePolicies {
+		get {
+			return _effectivePolicySelectors.Length != 0
+				? _effectivePolicySelectors.Select(x => x.Select()).ToArray()
+				: [_fallbackStreamAccessPolicySelector.Select(), _legacyPolicySelector.Select()];
+		}
+	}
+
+	public async Task Start() {
+		_cts = new CancellationTokenSource();
+		do {
+			try {
+				var checkpoint = await LoadSettings(_cts.Token);
+				_ = StartSubscription(checkpoint, _cts.Token);
+				return;
+			} catch (ReadResponseException.NotHandled.ServerNotReady) {
+				_logger.Verbose("Subscription to {settingsStream}: server is not ready, retrying...", _stream);
+				await Task.Delay(TimeSpan.FromSeconds(3), _cts.Token);
+			} catch (ReadResponseException.NotHandled.ServerBusy) {
+				_logger.Verbose("Subscription to {settingsStream}: server is too busy, retrying...", _stream);
+				await Task.Delay(TimeSpan.FromSeconds(3), _cts.Token);
+			} catch (ReadResponseException.Timeout) {
+				_logger.Verbose("Subscription to {settingsStream}: timeout, retrying...", _stream);
+				await Task.Delay(TimeSpan.FromSeconds(3), _cts.Token);
+			} catch (Exception exc) {
+				_logger.Fatal(exc, "Fatal error starting the subscription to {settingsStream}", _stream);
+				throw new ApplicationInitializationException($"Fatal error starting the subscription to {_stream}");
+			}
+		} while (true);
+	}
+
+	public async Task Stop() {
+		foreach (var factory in _pluginSelectorFactories) {
+			_logger.Information("Stopping policy selector factory {name}", factory.CommandLineName);
+			await factory.Disable();
+		}
+		if (_cts is not null)
+			await _cts.CancelAsync();
+	}
+
+	private async Task StartSubscription(ulong? checkpoint, CancellationToken ct) {
+		var start = checkpoint.HasValue
+			? new StreamRevision(checkpoint.GetValueOrDefault())
+			: (StreamRevision?)null;
+		await using var sub = new Enumerator.StreamSubscription<string>(
+			bus: _publisher,
+			expiryStrategy: new DefaultExpiryStrategy(),
+			streamName: _stream,
+			resolveLinks: false,
+			user: SystemAccounts.System,
+			checkpoint: start,
+			requiresLeader: false,
+			cancellationToken: ct);
+
+		while (await sub.MoveNextAsync()) {
+			var response = sub.Current;
+			switch (response) {
+				case ReadResponse.EventReceived evnt:
+					_logger.Information("New Authorization Policy Settings event received");
+					var (success, settings) = TryParseAuthorizationPolicySettings(evnt.Event);
+					if (!success) {
+						_logger.Warning("New authorization settings could not be applied. Settings were not updated.");
+					} else {
+						await TryApplyAuthorizationPolicySettings(settings);
+					}
+					break;
+			}
+		}
+	}
+
+	private async ValueTask ApplyFallbackPolicySelector() {
+		_logger.Debug("Applying fallback stream access policy.");
+		_effectivePolicySelectors = [];
+		foreach (var factory in _pluginSelectorFactories) {
+			await factory.Disable();
+		}
+
+		PolicyChanged?.Invoke(this, new PolicyChangedEventArgs(EffectivePolicies));
+	}
+
+	private async ValueTask ApplyLegacyPolicySelector() {
+		_logger.Debug("Applying ACL stream access policy.");
+		_effectivePolicySelectors = [_legacyPolicySelector];
+		foreach (var factory in _pluginSelectorFactories) {
+			await factory.Disable();
+		}
+
+		PolicyChanged?.Invoke(this, new PolicyChangedEventArgs(EffectivePolicies));
+	}
+
+	private (bool success, AuthorizationPolicySettings settings) TryParseAuthorizationPolicySettings(ResolvedEvent evnt) {
+		if (evnt.Event.EventType != SystemEventTypes.AuthorizationPolicyChanged) {
+			_logger.Error(
+				"Invalid authorization policy settings event. Expected event type {expectedType} but got {actualType}",
+				SystemEventTypes.AuthorizationPolicyChanged, evnt.Event.EventType);
+			return (false, new AuthorizationPolicySettings());
+		}
+
+		try {
+			var settings = JsonSerializer.Deserialize<AuthorizationPolicySettings>(evnt.Event.Data.Span, SerializeOptions);
+			if (settings is not null)
+				return (true, settings);
+			_logger.Error("Could not parse authorization policy settings");
+		} catch (Exception ex) {
+			_logger.Error(ex, "Could not parse authorization policy settings");
+		}
+		return (false, new AuthorizationPolicySettings());
+	}
+
+	private async ValueTask<bool> TryApplyPluginPolicySelector(IPolicySelectorFactory pluginFactory) {
+		_logger.Information("Starting authorization policy factory {factory}", pluginFactory.CommandLineName);
+		if (!await pluginFactory.Enable()) {
+			_logger.Error("Failed to enable policy selector plugin {pluginName}. " +
+						  "Authorization settings will not be applied", pluginFactory.CommandLineName);
+			return false;
+		}
+
+		var selector = pluginFactory.Create(_publisher);
+		_effectivePolicySelectors = [selector, _legacyPolicySelector];
+		foreach (var otherFactory in _pluginSelectorFactories) {
+			try {
+				if (otherFactory.CommandLineName != pluginFactory.CommandLineName) {
+					await otherFactory.Disable();
+				}
+			} catch (Exception ex) {
+				_logger.Warning(ex, "Failed to disable policy selector plugin {pluginName}", otherFactory.CommandLineName);
+			}
+		}
+
+		PolicyChanged?.Invoke(this, new PolicyChangedEventArgs(EffectivePolicies));
+		return true;
+	}
+
+	private async ValueTask<bool> TryApplyAuthorizationPolicySettings(AuthorizationPolicySettings settings) {
+		switch (settings.StreamAccessPolicyType) {
+			case FallbackStreamAccessPolicySelector.FallbackPolicyName:
+				await ApplyFallbackPolicySelector();
+				return true;
+			case LegacyPolicySelectorFactory.LegacyPolicySelectorName:
+				await ApplyLegacyPolicySelector();
+				return true;
+			default:
+				var factory =
+					_pluginSelectorFactories.FirstOrDefault(x =>
+						x.CommandLineName == settings.StreamAccessPolicyType);
+				if (factory is not null)
+					return await TryApplyPluginPolicySelector(factory);
+
+				_logger.Error("Could not find policy {commandLineName} in registered authorization policy plugins.",
+					settings.StreamAccessPolicyType);
+				return false;
+		}
+	}
+
+	private async ValueTask<ulong?> LoadSettings(CancellationToken ct) {
+		ulong? checkpoint = null;
+		try {
+			await using var read = new Enumerator.ReadStreamBackwards(_publisher, _stream,
+				StreamRevision.End, ulong.MaxValue, false, SystemAccounts.System, false, DateTime.MaxValue, 1, ct);
+			while (await read.MoveNextAsync()) {
+				var readResponse = read.Current;
+				switch (readResponse) {
+					case ReadResponse.EventReceived evnt:
+						checkpoint ??= (ulong)evnt.Event.OriginalEventNumber;
+						var (success, settings) = TryParseAuthorizationPolicySettings(evnt.Event);
+						if (!success) {
+							Log.Error(
+								"Could not load authorization policy settings from event {eventNumber}@{eventStream}",
+								evnt.Event.OriginalEventNumber, evnt.Event.OriginalStreamId);
+						} else {
+							if (await TryApplyAuthorizationPolicySettings(settings)) {
+								Log.Information("Authorization settings successfully loaded.");
+								return checkpoint;
+							}
+
+							Log.Error("Could not apply authorization settings.");
+						}
+
+						break;
+				}
+			}
+		} catch (ReadResponseException.StreamDeleted) {
+			_logger.Warning("Authorization policy settings stream {stream} has been deleted.", _stream);
+		} catch (ReadResponseException.StreamNotFound) {
+			// ignore
+		}
+
+		if (checkpoint is null) {
+			// There are no events in the stream.
+			// Use the default.
+			Log.Information("No existing authorization policy settings were found in {stream}. Using the default", _stream);
+			if (await TryApplyAuthorizationPolicySettings(_defaultSettings)) {
+				_logger.Verbose("Successfully applied default settings");
+				return checkpoint;
+			}
+		}
+
+		// There are events in the stream, but none of the policy selectors can be enabled.
+		// Fall back to restricted access.
+		_logger.Warning("Could not load authorization policy settings. Restricting access to admins only.");
+		await ApplyFallbackPolicySelector();
+		return checkpoint;
+	}
+}
diff --git a/src/KurrentDB.Core/Authorization/AuthorizationProviderFactory.cs b/src/KurrentDB.Core/Authorization/AuthorizationProviderFactory.cs
new file mode 100644
index 00000000000..ed9dc43d3a1
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/AuthorizationProviderFactory.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Core.Authorization;
+
+public class AuthorizationProviderFactory {
+	private readonly Func<AuthorizationProviderFactoryComponents, IAuthorizationProviderFactory>
+		_authorizationProviderFactory;
+
+	public AuthorizationProviderFactory(
+		Func<AuthorizationProviderFactoryComponents, IAuthorizationProviderFactory>
+			authorizationProviderFactory) {
+		_authorizationProviderFactory = authorizationProviderFactory;
+	}
+
+	public IAuthorizationProviderFactory GetFactory(
+		AuthorizationProviderFactoryComponents authorizationProviderFactoryComponents) =>
+		_authorizationProviderFactory(authorizationProviderFactoryComponents);
+}
diff --git a/src/KurrentDB.Core/Authorization/AuthorizationProviderFactoryComponents.cs b/src/KurrentDB.Core/Authorization/AuthorizationProviderFactoryComponents.cs
new file mode 100644
index 00000000000..948b04e0795
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/AuthorizationProviderFactoryComponents.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Bus;
+
+namespace KurrentDB.Core.Authorization;
+
+public class AuthorizationProviderFactoryComponents {
+	public IPublisher MainQueue { get; set; }
+	public ISubscriber MainBus { get; set; }
+}
diff --git a/src/KurrentDB.Core/Authorization/ClaimMatchAssertion.cs b/src/KurrentDB.Core/Authorization/ClaimMatchAssertion.cs
new file mode 100644
index 00000000000..f1a59b35185
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/ClaimMatchAssertion.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Core.Authorization;
+
+public class ClaimMatchAssertion : IComparable<ClaimMatchAssertion>, IAssertion {
+	private readonly Claim _claim;
+
+	public ClaimMatchAssertion(Grant grant, Claim claim) {
+		_claim = claim;
+		Grant = grant;
+		Information = new AssertionInformation("equal", _claim.ToString(), grant);
+	}
+
+	public AssertionInformation Information { get; }
+
+	public Grant Grant { get; }
+
+	public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context) {
+		// ReSharper disable once PatternAlwaysOfType
+		if (cp.FindFirst(x =>
+			string.Equals(x.Type, _claim.Type, StringComparison.Ordinal) &&
+			string.Equals(x.Value, _claim.Value, StringComparison.Ordinal)) is Claim matched) {
+			context.Add(new AssertionMatch(policy, Information, matched));
+			return new ValueTask<bool>(true);
+		}
+
+		return new ValueTask<bool>(false);
+	}
+
+	public int CompareTo(ClaimMatchAssertion other) {
+		if (other == null)
+			throw new ArgumentNullException(nameof(other));
+
+		var grant = Grant.CompareTo(other.Grant);
+		if (grant != 0)
+			return grant * -1;
+		var type = string.CompareOrdinal(_claim.Type, other._claim.Type);
+		if (type != 0)
+			return type;
+		return string.CompareOrdinal(_claim.Value, other._claim.Value);
+	}
+}
diff --git a/src/KurrentDB.Core/Authorization/ClaimValueMatchesParameterValueAssertion.cs b/src/KurrentDB.Core/Authorization/ClaimValueMatchesParameterValueAssertion.cs
new file mode 100644
index 00000000000..5a91d149fd8
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/ClaimValueMatchesParameterValueAssertion.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Core.Authorization;
+
+public class ClaimValueMatchesParameterValueAssertion : IAssertion {
+	private readonly string _claimType;
+	private readonly string _parameterName;
+
+	public ClaimValueMatchesParameterValueAssertion(string claimType, string parameterName, Grant grant) {
+		_claimType = claimType;
+		_parameterName = parameterName;
+		Grant = grant;
+		Information = new AssertionInformation("match", $"{_claimType} : {_parameterName}", Grant);
+	}
+
+	public AssertionInformation Information { get; }
+	public Grant Grant { get; }
+
+	public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context) {
+		if (cp.FindFirst(_claimType) is Claim matchedClaim &&
+			operation.Parameters.Span.Contains(new Parameter(_parameterName, matchedClaim.Value))) {
+			context.Add(new AssertionMatch(policy, Information, matchedClaim));
+			return new ValueTask<bool>(true);
+		}
+
+		return new ValueTask<bool>(false);
+	}
+}
diff --git a/src/KurrentDB.Core/Authorization/EvaluationContext.cs b/src/KurrentDB.Core/Authorization/EvaluationContext.cs
new file mode 100644
index 00000000000..589c2ed46ce
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/EvaluationContext.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Threading;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Core.Authorization;
+
+public class EvaluationContext {
+	private readonly List<AssertionMatch> _matches;
+	private readonly Operation _operation;
+
+	public EvaluationContext(Operation operation, CancellationToken cancellationToken) {
+		CancellationToken = cancellationToken;
+		_operation = operation;
+		_matches = new List<AssertionMatch>();
+		Grant = Grant.Unknown;
+	}
+
+	public CancellationToken CancellationToken { get; }
+	public Grant Grant { get; private set; }
+
+	public void Add(AssertionMatch match) {
+		if (match.Assertion.Grant > Grant)
+			Grant = match.Assertion.Grant;
+		_matches.Add(match);
+	}
+
+	public EvaluationResult ToResult() {
+		return new EvaluationResult(_operation, Grant, _matches);
+	}
+}
diff --git a/src/KurrentDB.Core/Authorization/EvaluationResult.cs b/src/KurrentDB.Core/Authorization/EvaluationResult.cs
new file mode 100644
index 00000000000..36399c5c0ba
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/EvaluationResult.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Core.Authorization;
+
+public readonly struct EvaluationResult {
+	public readonly Grant Grant;
+	public readonly Operation Operation;
+	public readonly IReadOnlyList<AssertionMatch> Matches;
+
+	public EvaluationResult(Operation operation, Grant grant, params AssertionMatch[] matches) : this(operation,
+		grant, (IReadOnlyList<AssertionMatch>)matches) {
+	}
+
+	public EvaluationResult(Operation operation, Grant grant, IReadOnlyList<AssertionMatch> matches) {
+		Grant = grant;
+		Matches = matches;
+		Operation = operation;
+	}
+
+	public override string ToString() {
+		return $"{Operation} {Grant} : {string.Join(Environment.NewLine, Matches)}";
+	}
+}
diff --git a/src/KurrentDB.Core/Authorization/Grant.cs b/src/KurrentDB.Core/Authorization/Grant.cs
new file mode 100644
index 00000000000..c232f1402eb
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/Grant.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Authorization;
+
+public enum Grant {
+	Unknown = 0,
+	Allow = 1,
+	Deny = 2
+}
diff --git a/src/KurrentDB.Core/Authorization/IAssertion.cs b/src/KurrentDB.Core/Authorization/IAssertion.cs
new file mode 100644
index 00000000000..f035976d0ba
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/IAssertion.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Claims;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Core.Authorization;
+
+public interface IAssertion {
+	Grant Grant { get; }
+	AssertionInformation Information { get; }
+
+	ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context);
+}
diff --git a/src/KurrentDB.Core/Authorization/IPolicyEvaluator.cs b/src/KurrentDB.Core/Authorization/IPolicyEvaluator.cs
new file mode 100644
index 00000000000..f552804acad
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/IPolicyEvaluator.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Core.Authorization;
+
+public interface IPolicyEvaluator {
+	ValueTask<EvaluationResult> EvaluateAsync(ClaimsPrincipal cp, Operation operation,
+		CancellationToken cancellationToken);
+}
diff --git a/src/KurrentDB.Core/Authorization/IStreamPermissionAssertion.cs b/src/KurrentDB.Core/Authorization/IStreamPermissionAssertion.cs
new file mode 100644
index 00000000000..fd8f06e4ab4
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/IStreamPermissionAssertion.cs
@@ -0,0 +1,7 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Authorization;
+
+public interface IStreamPermissionAssertion : IAssertion {
+}
diff --git a/src/KurrentDB.Core/Authorization/InternalAuthorizationProviderFactory.cs b/src/KurrentDB.Core/Authorization/InternalAuthorizationProviderFactory.cs
new file mode 100644
index 00000000000..751ddcb74f1
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/InternalAuthorizationProviderFactory.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Authorization;
+using KurrentDB.Core.Authorization.AuthorizationPolicies;
+
+namespace KurrentDB.Core.Authorization;
+
+public class InternalAuthorizationProviderFactory : IAuthorizationProviderFactory {
+	private readonly IAuthorizationPolicyRegistry _registry;
+
+	public InternalAuthorizationProviderFactory(IAuthorizationPolicyRegistry registry) {
+		_registry = registry;
+	}
+
+	public IAuthorizationProvider Build() {
+		return new PolicyAuthorizationProvider(
+		new MultiPolicyEvaluator(_registry), logAuthorization: true, logSuccesses: false);
+	}
+}
diff --git a/src/KurrentDB.Core/Authorization/LegacyStreamPermissionAssertion.cs b/src/KurrentDB.Core/Authorization/LegacyStreamPermissionAssertion.cs
new file mode 100644
index 00000000000..759dc568373
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/LegacyStreamPermissionAssertion.cs
@@ -0,0 +1,202 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+
+namespace KurrentDB.Core.Authorization;
+
+public class
+	LegacyStreamPermissionAssertion : IStreamPermissionAssertion {
+	private readonly IPublisher _publisher;
+
+	public LegacyStreamPermissionAssertion(IPublisher publisher) {
+		_publisher = publisher;
+	}
+
+	public AssertionInformation Information { get; } =
+		new AssertionInformation("stream", "legacy acl", Grant.Unknown);
+
+	public Grant Grant { get; } = Grant.Unknown;
+
+	public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context) {
+		var streamId = FindStreamId(operation.Parameters.Span, context.CancellationToken);
+
+		if (streamId.IsCompleted)
+			return CheckStreamAccess(cp, operation, policy, context, streamId.Result);
+		return CheckStreamAccessAsync(streamId, cp, operation, policy, context);
+	}
+
+	private async ValueTask<bool> CheckStreamAccessAsync(ValueTask<string> pending, ClaimsPrincipal cp,
+		Operation operation, PolicyInformation policy, EvaluationContext result) {
+		var streamId = await pending;
+		return await CheckStreamAccess(cp, operation, policy, result, streamId);
+	}
+
+	private ValueTask<bool> CheckStreamAccess(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context, string streamId) {
+		if (streamId == null) {
+			context.Add(new AssertionMatch(policy,
+				new AssertionInformation("streamId", "streamId is null", Grant.Deny)));
+			return new ValueTask<bool>(true);
+		}
+
+		if (streamId == "")
+			streamId = SystemStreams.AllStream;
+		if (streamId == SystemStreams.AllStream &&
+			(operation == Operations.Streams.Delete || operation == Operations.Streams.Write)) {
+			context.Add(new AssertionMatch(policy,
+				new AssertionInformation("streamId", $"{operation.Action} denied on $all", Grant.Deny)));
+			return new ValueTask<bool>(true);
+		}
+
+		var action = operation.Action;
+		if (SystemStreams.IsMetastream(streamId)) {
+			action = operation.Action switch {
+				"read" => "metadataRead",
+				"write" => "metadataWrite",
+				_ => null
+			};
+			streamId = SystemStreams.OriginalStreamOf(streamId);
+		}
+
+		return action switch {
+			"read" => Check(cp, operation, action, streamId, policy, context),
+			"write" => Check(cp, operation, action, streamId, policy, context),
+			"delete" => Check(cp, operation, action, streamId, policy, context),
+			"metadataWrite" => Check(cp, operation, action, streamId, policy, context),
+			"metadataRead" => Check(cp, operation, action, streamId, policy, context),
+			null => InvalidMetadataOperation(operation, policy, context),
+			_ => throw new ArgumentOutOfRangeException(nameof(operation.Action), action)
+		};
+	}
+
+	private ValueTask<bool> Check(ClaimsPrincipal cp, Operation operation, string action, string streamId,
+		PolicyInformation policy, EvaluationContext context) {
+#pragma warning disable CA2012
+		var preChecks = IsSystemOrAdmin(cp, operation, policy, context);
+#pragma warning restore CA2012
+		if (preChecks.IsCompleted && preChecks.Result)
+			return preChecks;
+
+		return CheckAsync(preChecks, cp, action, streamId, policy, context);
+	}
+
+	private ValueTask<bool> IsSystemOrAdmin(ClaimsPrincipal cp, Operation operation,
+		PolicyInformation policy, EvaluationContext context) {
+		var isSystem = WellKnownAssertions.System.Evaluate(cp, operation, policy, context);
+		if (isSystem.IsCompleted) {
+			if (isSystem.Result)
+				return isSystem;
+			return WellKnownAssertions.Admin.Evaluate(cp, operation, policy, context);
+		}
+
+		// This should never be run, but is required for the compilation to be reasonable
+		return IsSystemOrAdminAsync(isSystem, cp, operation, policy, context);
+	}
+
+	private async ValueTask<bool> IsSystemOrAdminAsync(ValueTask<bool> isSystem, ClaimsPrincipal cp,
+		Operation operation,
+		PolicyInformation policy, EvaluationContext context) {
+		if (await isSystem)
+			return true;
+
+		return await WellKnownAssertions.Admin.Evaluate(cp, operation, policy, context);
+	}
+
+	private async ValueTask<bool> CheckAsync(ValueTask<bool> preChecks, ClaimsPrincipal cp, string action,
+		string streamId, PolicyInformation policy, EvaluationContext context) {
+		var isSystemOrAdmin = await preChecks;
+		if (isSystemOrAdmin)
+			return true;
+		var acl = await StorageMessage.EffectiveAcl.LoadAsync(_publisher, streamId, context.CancellationToken);
+		var roles = RolesFor(action, acl);
+		if (roles.Any(x => x == SystemRoles.All)) {
+			context.Add(new AssertionMatch(policy,
+				new AssertionInformation("stream", "public stream", Grant.Allow)));
+			return true;
+		}
+
+		for (int i = 0; i < roles.Length; i++) {
+			var role = roles[i];
+			if (cp.FindFirst(x => (x.Type == ClaimTypes.Name || x.Type == ClaimTypes.Role) && x.Value == role)
+				is Claim matched) {
+				context.Add(new AssertionMatch(policy, new AssertionInformation("role match", role, Grant.Allow),
+					matched));
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	private ValueTask<bool> InvalidMetadataOperation(Operation operation, PolicyInformation policy,
+		EvaluationContext result) {
+		result.Add(new AssertionMatch(policy,
+			new AssertionInformation("metadata", $"invalid metadata operation {operation.Action}",
+				Grant.Deny)));
+		return new ValueTask<bool>(true);
+	}
+
+	private ValueTask<string> FindStreamId(ReadOnlySpan<Parameter> parameters,
+		CancellationToken cancellationToken) {
+		string transactionId = null;
+		for (int i = 0; i < parameters.Length; i++) {
+			if (parameters[i].Name == "streamId")
+				return new ValueTask<string>(parameters[i].Value);
+			if (parameters[i].Name == "transactionId")
+				transactionId = parameters[i].Value;
+		}
+
+		if (transactionId != null)
+			return FindStreamFromTransactionId(long.Parse(transactionId), cancellationToken);
+		return new ValueTask<string>((string)null);
+	}
+
+	private ValueTask<string> FindStreamFromTransactionId(long transactionId, CancellationToken cancellationToken) {
+		var envelope = new StreamIdFromTransactionIdEnvelope();
+		_publisher.Publish(
+			new StorageMessage.StreamIdFromTransactionIdRequest(transactionId, envelope, cancellationToken));
+		return new ValueTask<string>(envelope.Task);
+	}
+
+	private string[] RolesFor(string action, StorageMessage.EffectiveAcl acl) {
+		return action switch {
+			"read" => acl.Stream?.ReadRoles ?? acl.System?.ReadRoles ?? acl.Default?.ReadRoles,
+			"write" => acl.Stream?.WriteRoles ?? acl.System?.WriteRoles ?? acl.Default?.WriteRoles,
+			"delete" => acl.Stream?.DeleteRoles ?? acl.System?.DeleteRoles ?? acl.Default?.DeleteRoles,
+			"metadataRead" => acl.Stream?.MetaReadRoles ?? acl.System?.MetaReadRoles ?? acl.Default?.MetaReadRoles,
+			"metadataWrite" => acl.Stream?.MetaWriteRoles ??
+							   acl.System?.MetaWriteRoles ?? acl.Default?.MetaWriteRoles,
+			_ => Array.Empty<string>()
+		};
+	}
+
+	private class StreamIdFromTransactionIdEnvelope : IEnvelope {
+		private readonly TaskCompletionSource<string> _tcs;
+
+		public StreamIdFromTransactionIdEnvelope() {
+			_tcs = new TaskCompletionSource<string>();
+		}
+
+		public Task<string> Task => _tcs.Task;
+
+		public void ReplyWith<T>(T message) where T : Message {
+			if (message is StorageMessage.StreamIdFromTransactionIdResponse response)
+				_tcs.TrySetResult(response.StreamId);
+			else if (message is StorageMessage.OperationCancelledMessage cancelled)
+				_tcs.TrySetCanceled(cancelled.CancellationToken);
+			else
+				_tcs.TrySetException(new InvalidOperationException($"Wrong message type {message.GetType()}"));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Authorization/MultiPolicyEvaluator.cs b/src/KurrentDB.Core/Authorization/MultiPolicyEvaluator.cs
new file mode 100644
index 00000000000..87441bed3d4
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/MultiPolicyEvaluator.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Core.Authorization.AuthorizationPolicies;
+
+namespace KurrentDB.Core.Authorization;
+
+public class MultiPolicyEvaluator : IPolicyEvaluator {
+	private static readonly AssertionInformation DeniedByDefault = new("default", "denied by default", Grant.Deny);
+
+	private readonly IAuthorizationPolicyRegistry _registry;
+	private readonly PolicyInformation _policyInfo;
+
+	public MultiPolicyEvaluator(IAuthorizationPolicyRegistry registry) {
+		_registry = registry;
+		_policyInfo = new PolicyInformation("multi-policy", 1, DateTimeOffset.MinValue);
+	}
+
+	public async ValueTask<EvaluationResult>
+		EvaluateAsync(ClaimsPrincipal cp, Operation operation, CancellationToken ct) {
+		var evaluationContext = new EvaluationContext(operation, ct);
+		foreach (var policy in _registry.EffectivePolicies) {
+			var policyInfo = policy.Information;
+			if (policy.TryGetAssertions(operation, out var assertions)) {
+				while (!assertions.IsEmpty && evaluationContext.Grant != Grant.Deny) {
+					if (ct.IsCancellationRequested)
+						break;
+					var assertion = assertions.Span[0];
+					assertions = assertions.Slice(1);
+					await assertion.Evaluate(cp, operation, policyInfo, evaluationContext);
+				}
+			}
+
+			if (evaluationContext.Grant != Grant.Unknown) {
+				return evaluationContext.ToResult();
+			}
+		}
+
+		evaluationContext.Add(new AssertionMatch(_policyInfo, DeniedByDefault));
+		return evaluationContext.ToResult();
+	}
+}
diff --git a/src/KurrentDB.Core/Authorization/MultipleClaimMatchAssertion.cs b/src/KurrentDB.Core/Authorization/MultipleClaimMatchAssertion.cs
new file mode 100644
index 00000000000..24e7f6d6644
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/MultipleClaimMatchAssertion.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Text;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Core.Authorization;
+
+public class MultipleClaimMatchAssertion : IComparable<MultipleClaimMatchAssertion>, IAssertion {
+	private readonly IReadOnlyList<Claim> _claims;
+	private readonly MultipleMatchMode _mode;
+
+	public MultipleClaimMatchAssertion(Grant grant, MultipleMatchMode mode, params Claim[] claims) {
+		if (claims.Length == 0)
+			throw new ArgumentException("Value cannot be an empty collection.", nameof(claims));
+
+
+		_mode = mode;
+		Grant = grant;
+		_claims = claims.OrderBy(x => x.Type).ToArray();
+		var sb = new StringBuilder();
+		foreach (var claim in _claims)
+			sb.AppendLine($"{claim.Type} {claim.Value}");
+
+		var assertion = sb.ToString();
+		Information = mode switch {
+			MultipleMatchMode.All => new AssertionInformation("all", assertion, grant),
+			MultipleMatchMode.Any => new AssertionInformation("any", assertion, Grant),
+			MultipleMatchMode.None => new AssertionInformation("none", assertion, Grant),
+			_ => throw new ArgumentOutOfRangeException(nameof(mode))
+		};
+	}
+
+	public AssertionInformation Information { get; }
+
+	public Grant Grant { get; }
+
+	public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context) {
+		var matches = new List<Claim>(_claims.Count);
+
+		foreach (var claim in _claims)
+			if (cp.FindFirst(x =>
+				string.Equals(x.Type, claim.Type, StringComparison.Ordinal) &&
+				string.Equals(x.Value, claim.Value, StringComparison.Ordinal)) is Claim matched) {
+				matches.Add(matched);
+				if (_mode != MultipleMatchMode.All)
+					break;
+			}
+
+		var matchFound = false;
+		switch (_mode) {
+			case MultipleMatchMode.All:
+				if (matches.Count == _claims.Count) {
+					context.Add(new AssertionMatch(policy, Information, matches));
+					matchFound = true;
+				}
+
+				break;
+			case MultipleMatchMode.Any:
+				if (matches.Count > 0) {
+					context.Add(new AssertionMatch(policy, Information, matches));
+					matchFound = true;
+				}
+
+				break;
+			case MultipleMatchMode.None:
+				if (matches.Count == 0) {
+					context.Add(new AssertionMatch(policy, Information, matches));
+					matchFound = true;
+				}
+
+				break;
+			default:
+				throw new ArgumentOutOfRangeException();
+		}
+
+
+		return new ValueTask<bool>(matchFound);
+	}
+
+
+	public int CompareTo(MultipleClaimMatchAssertion other) {
+		var grant = Grant.CompareTo(other.Grant);
+		if (grant != 0)
+			return grant * -1;
+		var length = Comparer<int>.Default.Compare(_claims.Count, other._claims.Count);
+		if (length != 0)
+			return length;
+		for (int i = 0; i < _claims.Count; i++) {
+			var type = string.CompareOrdinal(_claims[i].Type, other._claims[i].Type);
+			if (type != 0)
+				return type;
+			var value = string.CompareOrdinal(_claims[i].Value, other._claims[i].Value);
+			if (value != 0)
+				return value;
+		}
+
+		return 0;
+	}
+}
diff --git a/src/KurrentDB.Core/Authorization/MultipleMatchMode.cs b/src/KurrentDB.Core/Authorization/MultipleMatchMode.cs
new file mode 100644
index 00000000000..391e97be895
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/MultipleMatchMode.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Authorization;
+
+public enum MultipleMatchMode {
+	All,
+	Any,
+	None
+}
diff --git a/src/KurrentDB.Core/Authorization/OrAssertion.cs b/src/KurrentDB.Core/Authorization/OrAssertion.cs
new file mode 100644
index 00000000000..5ccedaf9343
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/OrAssertion.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Core.Authorization;
+
+internal class OrAssertion : IAssertion {
+	private readonly ReadOnlyMemory<IAssertion> _assertions;
+
+	public OrAssertion(params IAssertion[] assertions) {
+		_assertions = assertions.OrderBy(x => x.Grant).ToArray();
+		Information = new AssertionInformation("or", $"({string.Join(",", _assertions)})", Grant.Unknown);
+	}
+
+	public AssertionInformation Information { get; }
+
+	public Grant Grant { get; } = Grant.Unknown;
+
+	public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context) {
+		var remaining = _assertions;
+		while (!remaining.IsEmpty && context.Grant != Grant.Deny) {
+			var pending = remaining.Span[0].Evaluate(cp, operation, policy, context);
+			remaining = remaining.Slice(1);
+			if (!pending.IsCompleted)
+				return EvaluateAsync(pending, remaining, cp, operation, policy, context);
+			if (pending.Result)
+				return new ValueTask<bool>(true);
+		}
+
+		return new ValueTask<bool>(false);
+	}
+
+	private async ValueTask<bool> EvaluateAsync(ValueTask<bool> pending, ReadOnlyMemory<IAssertion> remaining,
+		ClaimsPrincipal cp, Operation operation, PolicyInformation policy, EvaluationContext result) {
+		bool evaluated;
+		while (!(evaluated = await pending) && !remaining.IsEmpty) {
+			pending = remaining.Span[0].Evaluate(cp, operation, policy, result);
+			remaining = remaining.Slice(1);
+		}
+
+		return evaluated;
+	}
+}
diff --git a/src/KurrentDB.Core/Authorization/PassthroughAuthorizationProvider.cs b/src/KurrentDB.Core/Authorization/PassthroughAuthorizationProvider.cs
new file mode 100644
index 00000000000..096eccbcad4
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/PassthroughAuthorizationProvider.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Core.Authorization;
+
+public class PassthroughAuthorizationProvider : AuthorizationProviderBase {
+	public override ValueTask<bool> CheckAccessAsync(ClaimsPrincipal principal, Operation operation, CancellationToken cancellationToken) =>
+		ValueTask.FromResult(true);
+}
diff --git a/src/KurrentDB.Core/Authorization/PassthroughAuthorizationProviderFactory.cs b/src/KurrentDB.Core/Authorization/PassthroughAuthorizationProviderFactory.cs
new file mode 100644
index 00000000000..80a06ac737b
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/PassthroughAuthorizationProviderFactory.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Core.Authorization;
+
+public class PassthroughAuthorizationProviderFactory : IAuthorizationProviderFactory {
+	public IAuthorizationProvider Build() => new PassthroughAuthorizationProvider();
+}
diff --git a/src/KurrentDB.Core/Authorization/Policy.cs b/src/KurrentDB.Core/Authorization/Policy.cs
new file mode 100644
index 00000000000..11307967d5e
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/Policy.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Core.Authorization;
+
+public class Policy {
+	private readonly Dictionary<OperationDefinition, List<IAssertion>> _assertions;
+	private readonly long _version;
+	private bool _sealed;
+
+	public Policy(string name, long version, DateTimeOffset validFrom) {
+		_version = version;
+		Name = name;
+		ValidFrom = validFrom;
+		_assertions = new Dictionary<OperationDefinition, List<IAssertion>>();
+		_sealed = false;
+	}
+
+	public string Name { get; }
+	public DateTimeOffset ValidFrom { get; }
+
+	public void AddMatchAnyAssertion(OperationDefinition operation, Grant grant, params Claim[] claims) {
+		var assertion = new MultipleClaimMatchAssertion(grant, MultipleMatchMode.Any, claims);
+		Add(operation, assertion);
+	}
+
+	public void AddClaimMatchAssertion(OperationDefinition operation, Grant grant, Claim claim) {
+		var assertion = new ClaimMatchAssertion(grant, claim);
+		Add(operation, assertion);
+	}
+
+	public void Add(OperationDefinition operation, IAssertion assertion) {
+		if (_sealed)
+			throw new InvalidOperationException("policy has been sealed and no further changes can be made");
+		if (!_assertions.TryGetValue(operation, out var assertions))
+			_assertions[operation] = assertions = new List<IAssertion>();
+		var insertAt = assertions.BinarySearch(assertion, AssertionComparer.Instance);
+		if (insertAt >= 0)
+			throw new InvalidOperationException("Assertion already exists");
+		assertions.Insert(~insertAt, assertion);
+	}
+
+	public ReadOnlyPolicy AsReadOnly() {
+		_sealed = true;
+		return new ReadOnlyPolicy(Name, _version, ValidFrom,
+			_assertions
+				.ToDictionary<KeyValuePair<OperationDefinition, List<IAssertion>>, OperationDefinition,
+					ReadOnlyMemory<IAssertion>>(x => x.Key, x => x.Value.ToArray()));
+	}
+
+	public void AllowAnonymous(in OperationDefinition operation) {
+		Add(operation, new AllowAnonymousAssertion());
+	}
+
+	public void RequireAuthenticated(in OperationDefinition operation) {
+		Add(operation, new RequireAuthenticatedAssertion());
+	}
+}
diff --git a/src/EventStore.Core/Authorization/PolicyAuthorizationProvider.cs b/src/KurrentDB.Core/Authorization/PolicyAuthorizationProvider.cs
similarity index 87%
rename from src/EventStore.Core/Authorization/PolicyAuthorizationProvider.cs
rename to src/KurrentDB.Core/Authorization/PolicyAuthorizationProvider.cs
index 78b8c990618..e89e303deab 100644
--- a/src/EventStore.Core/Authorization/PolicyAuthorizationProvider.cs
+++ b/src/KurrentDB.Core/Authorization/PolicyAuthorizationProvider.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 #nullable enable
 
 using System;
@@ -7,13 +10,13 @@
 using EventStore.Plugins.Authorization;
 using Serilog;
 
-namespace EventStore.Core.Authorization;
+namespace KurrentDB.Core.Authorization;
 
 public class PolicyAuthorizationProvider(IPolicyEvaluator policyEvaluator, bool logAuthorization = true, bool logSuccesses = false) : AuthorizationProviderBase {
 	static readonly ILogger Logger = Log.ForContext<PolicyAuthorizationProvider>();
 	static readonly TimeProvider Time = TimeProvider.System;
 
-	bool LogAccessDenied  => logAuthorization;
+	bool LogAccessDenied => logAuthorization;
 	bool LogAccessGranted => LogAccessDenied && logSuccesses;
 
 	public override ValueTask<bool> CheckAccessAsync(ClaimsPrincipal principal, Operation operation, CancellationToken ct) {
@@ -54,8 +57,7 @@ static async ValueTask<bool> EnforceCheck(
 		) {
 			try {
 				return HasAccess(await evaluate, principal, startedAt, logAccessDenied, logAccessGranted);
-			}
-			catch (Exception ex) when (ex is not OperationCanceledException) {
+			} catch (Exception ex) when (ex is not OperationCanceledException) {
 				Logger.Error(ex, "Error performing permission check for {Identity}", GetIdentity(principal));
 				return false;
 			}
diff --git a/src/KurrentDB.Core/Authorization/PolicyInformation.cs b/src/KurrentDB.Core/Authorization/PolicyInformation.cs
new file mode 100644
index 00000000000..cebeb9767d4
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/PolicyInformation.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Authorization;
+
+public class PolicyInformation {
+	public readonly DateTimeOffset Expires;
+	public readonly string Name;
+
+	public PolicyInformation(string name, long version, DateTimeOffset expires) {
+		Version = version;
+		Name = name;
+		Expires = expires;
+	}
+
+	public long Version { get; }
+
+	public override string ToString() {
+		return $"Policy : {Name} {Version} {Expires}";
+	}
+}
diff --git a/src/KurrentDB.Core/Authorization/ReadOnlyPolicy.cs b/src/KurrentDB.Core/Authorization/ReadOnlyPolicy.cs
new file mode 100644
index 00000000000..c39ce9d025a
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/ReadOnlyPolicy.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Core.Authorization;
+
+public class ReadOnlyPolicy {
+	private readonly IReadOnlyDictionary<OperationDefinition, ReadOnlyMemory<IAssertion>> _assertions;
+	private readonly string _name;
+	private readonly DateTimeOffset _validFrom;
+	private readonly long _version;
+
+	public ReadOnlyPolicy(string name, long version, DateTimeOffset validFrom,
+		IReadOnlyDictionary<OperationDefinition, ReadOnlyMemory<IAssertion>> assertions) {
+		_name = name;
+		_version = version;
+		_validFrom = validFrom;
+		_assertions = assertions;
+	}
+
+	public PolicyInformation Information => new PolicyInformation(_name, _version, DateTimeOffset.MaxValue);
+
+	public bool TryGetAssertions(OperationDefinition operation, out ReadOnlyMemory<IAssertion> assertions) {
+		return _assertions.TryGetValue(operation, out assertions);
+	}
+}
diff --git a/src/KurrentDB.Core/Authorization/RequireAuthenticatedAssertion.cs b/src/KurrentDB.Core/Authorization/RequireAuthenticatedAssertion.cs
new file mode 100644
index 00000000000..1866a590cfd
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/RequireAuthenticatedAssertion.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Core.Authorization;
+
+internal class RequireAuthenticatedAssertion : IAssertion {
+	public Grant Grant { get; } = Grant.Unknown;
+
+	public AssertionInformation Information { get; } =
+		new AssertionInformation("match", "authenticated", Grant.Unknown);
+
+	public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context) {
+		if (!cp.Claims.Any() ||
+			cp.Claims.Any(x => string.Equals(x.Type, ClaimTypes.Anonymous, StringComparison.Ordinal)))
+			context.Add(new AssertionMatch(policy, new AssertionInformation("match", "authenticated", Grant.Deny)));
+		else
+			context.Add(new AssertionMatch(policy,
+				new AssertionInformation("match", "authenticated", Grant.Allow)));
+		return new ValueTask<bool>(true);
+	}
+}
diff --git a/src/KurrentDB.Core/Authorization/RequireStreamReadAssertion.cs b/src/KurrentDB.Core/Authorization/RequireStreamReadAssertion.cs
new file mode 100644
index 00000000000..d69966d79d7
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/RequireStreamReadAssertion.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+
+namespace KurrentDB.Core.Authorization;
+
+public class RequireStreamReadAssertion : IAssertion {
+	private static readonly Operation StreamRead = new Operation(Operations.Streams.Read);
+	private readonly IStreamPermissionAssertion _streamAssertion;
+
+	public RequireStreamReadAssertion(IStreamPermissionAssertion streamAssertion) {
+		_streamAssertion = streamAssertion;
+		Information = streamAssertion.Information;
+	}
+
+	public AssertionInformation Information { get; }
+	public Grant Grant { get; } = Grant.Unknown;
+
+	public ValueTask<bool> Evaluate(ClaimsPrincipal cp, Operation operation, PolicyInformation policy,
+		EvaluationContext context) {
+		if (operation == Operations.Subscriptions.ProcessMessages ||
+			operation == Operations.Subscriptions.ReplayParked) {
+			var stream = FindStreamId(operation.Parameters.Span);
+			return _streamAssertion.Evaluate(cp,
+				StreamRead.WithParameter(Operations.Streams.Parameters.StreamId(stream)), policy, context);
+		}
+
+		return new ValueTask<bool>(false);
+	}
+
+	private string FindStreamId(ReadOnlySpan<Parameter> parameters) {
+		for (int i = 0; i < parameters.Length; i++)
+			if (parameters[i].Name == "streamId")
+				return parameters[i].Value;
+
+		return null;
+	}
+}
diff --git a/src/KurrentDB.Core/Authorization/WellKnownAssertions.cs b/src/KurrentDB.Core/Authorization/WellKnownAssertions.cs
new file mode 100644
index 00000000000..54ae0d85cf8
--- /dev/null
+++ b/src/KurrentDB.Core/Authorization/WellKnownAssertions.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Claims;
+using KurrentDB.Core.Services;
+
+namespace KurrentDB.Core.Authorization;
+
+public static class WellKnownAssertions {
+	public static readonly IAssertion System = new MultipleClaimMatchAssertion(Grant.Allow, MultipleMatchMode.All,
+		new Claim(ClaimTypes.Name, "system"), new Claim(ClaimTypes.Authentication, "ES-Legacy"));
+
+	public static readonly IAssertion Admin = new MultipleClaimMatchAssertion(Grant.Allow, MultipleMatchMode.Any,
+		new Claim(ClaimTypes.Name, "admin"), new Claim(ClaimTypes.Role, SystemRoles.Admins));
+}
diff --git a/src/KurrentDB.Core/Bus/AdHocHandler.cs b/src/KurrentDB.Core/Bus/AdHocHandler.cs
new file mode 100644
index 00000000000..decff491b69
--- /dev/null
+++ b/src/KurrentDB.Core/Bus/AdHocHandler.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Bus;
+
+public sealed class AdHocHandler<T>(Func<T, CancellationToken, ValueTask> handle) : IAsyncHandle<T> where T : Message {
+	public AdHocHandler(Action<T> handle) : this(handle.ToAsync()) {
+	}
+
+	ValueTask IAsyncHandle<T>.HandleAsync(T message, CancellationToken token) => handle.Invoke(message, token);
+}
+
+public struct AdHocHandlerStruct<T> : IHandle<T>, IHandleTimeout where T : Message {
+	private readonly Action<T> _handle;
+	private readonly Action _timeout;
+
+	public AdHocHandlerStruct(Action<T> handle, Action timeout) {
+		Ensure.NotNull(handle, "handle");
+
+		HandlesTimeout = timeout is not null;
+		_handle = handle;
+		_timeout = timeout.OrNoOp();
+	}
+
+	public bool HandlesTimeout { get; }
+
+	public void Handle(T response) {
+		_handle(response);
+	}
+
+	public void Timeout() {
+		_timeout();
+	}
+}
diff --git a/src/KurrentDB.Core/Bus/IHandle.cs b/src/KurrentDB.Core/Bus/IHandle.cs
new file mode 100644
index 00000000000..27663e09c03
--- /dev/null
+++ b/src/KurrentDB.Core/Bus/IHandle.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Bus;
+
+public interface IAsyncHandle<in T> where T : Message {
+	ValueTask HandleAsync(T message, CancellationToken token);
+}
+
+public interface IHandle<in T> : IAsyncHandle<T> where T : Message {
+	void Handle(T message);
+
+	ValueTask IAsyncHandle<T>.HandleAsync(T message, CancellationToken token) {
+		var task = ValueTask.CompletedTask;
+		try {
+			Handle(message);
+		} catch (Exception e) {
+			task = ValueTask.FromException(e);
+		}
+
+		return task;
+	}
+}
diff --git a/src/KurrentDB.Core/Bus/IHandleAlt.cs b/src/KurrentDB.Core/Bus/IHandleAlt.cs
new file mode 100644
index 00000000000..5a7859ad1ca
--- /dev/null
+++ b/src/KurrentDB.Core/Bus/IHandleAlt.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Bus;
+
+public interface IHandleAlt<T> : IHandle<T> where T : Message {
+	bool HandlesAlt { get; }
+}
diff --git a/src/KurrentDB.Core/Bus/IHandleTimeout.cs b/src/KurrentDB.Core/Bus/IHandleTimeout.cs
new file mode 100644
index 00000000000..09075fcec31
--- /dev/null
+++ b/src/KurrentDB.Core/Bus/IHandleTimeout.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Bus;
+
+public interface IHandleTimeout {
+	bool HandlesTimeout { get; }
+	void Timeout();
+}
diff --git a/src/KurrentDB.Core/Bus/IMonitoredQueue.cs b/src/KurrentDB.Core/Bus/IMonitoredQueue.cs
new file mode 100644
index 00000000000..4e485334fb1
--- /dev/null
+++ b/src/KurrentDB.Core/Bus/IMonitoredQueue.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Services.Monitoring.Stats;
+
+namespace KurrentDB.Core.Bus;
+
+public interface IMonitoredQueue {
+	//NOTE: This interface provides direct access to a queue internals breaking encapsulation of these objects.
+	//      This is implemented this way to minimize impact on performance and to allow monitor detect problems
+
+	//      The monitored queue can be represented as IHandle<PollQueueStatistics> unless this impl can interfere
+	//      with queue message handling itself
+	string Name { get; }
+	QueueStats GetStatistics();
+}
diff --git a/src/KurrentDB.Core/Bus/IPublisher.cs b/src/KurrentDB.Core/Bus/IPublisher.cs
new file mode 100644
index 00000000000..8303ce31194
--- /dev/null
+++ b/src/KurrentDB.Core/Bus/IPublisher.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Bus;
+
+public interface IPublisher : IHandle<Message>, IEnvelope {
+	void Publish(Message message);
+
+	void IHandle<Message>.Handle(Message message) => Publish(message);
+
+	void IEnvelope<Message>.ReplyWith<T>(T message) => Publish(message);
+}
diff --git a/src/KurrentDB.Core/Bus/IQueuedHandler.cs b/src/KurrentDB.Core/Bus/IQueuedHandler.cs
new file mode 100644
index 00000000000..3683c6a1b3c
--- /dev/null
+++ b/src/KurrentDB.Core/Bus/IQueuedHandler.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core.Bus;
+
+public interface IQueuedHandler : IPublisher {
+	void Start();
+	Task Stop();
+	void RequestStop();
+}
diff --git a/src/KurrentDB.Core/Bus/ISubscriber.cs b/src/KurrentDB.Core/Bus/ISubscriber.cs
new file mode 100644
index 00000000000..0b1d3e8329a
--- /dev/null
+++ b/src/KurrentDB.Core/Bus/ISubscriber.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Bus;
+
+public interface ISubscriber {
+	void Subscribe<T>(IAsyncHandle<T> handler) where T : Message;
+	void Unsubscribe<T>(IAsyncHandle<T> handler) where T : Message;
+}
diff --git a/src/EventStore.Core/Bus/InMemoryBus.MessageHierarchy.cs b/src/KurrentDB.Core/Bus/InMemoryBus.MessageHierarchy.cs
similarity index 93%
rename from src/EventStore.Core/Bus/InMemoryBus.MessageHierarchy.cs
rename to src/KurrentDB.Core/Bus/InMemoryBus.MessageHierarchy.cs
index 69a17a930dc..66eea2fbd3b 100644
--- a/src/EventStore.Core/Bus/InMemoryBus.MessageHierarchy.cs
+++ b/src/KurrentDB.Core/Bus/InMemoryBus.MessageHierarchy.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Frozen;
 using System.Collections.Generic;
@@ -8,9 +11,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 using DotNext.Reflection;
-using EventStore.Core.Messaging;
+using KurrentDB.Core.Messaging;
 
-namespace EventStore.Core.Bus;
+namespace KurrentDB.Core.Bus;
 
 public partial class InMemoryBus {
 
@@ -133,7 +136,7 @@ internal void AddHandler(IAsyncHandle<T> handler) {
 
 			// loop retries lock-free until successful
 			Func<T, CancellationToken, ValueTask> devirtHandler = handler.HandleAsync;
-			for (Func<T, CancellationToken, ValueTask>[] newArray;; Array.Clear(newArray)) {
+			for (Func<T, CancellationToken, ValueTask>[] newArray; ; Array.Clear(newArray)) {
 				var currentArray = _handlers;
 
 				// Perf: array is preferred over ImmutableHashSet because enumeration speed is much more important
@@ -163,13 +166,13 @@ internal void RemoveHandler(IAsyncHandle<T> handler) {
 			Debug.Assert(handler is not null);
 
 			// loop retries lock-free until successful
-			for (var currentArray = _handlers;;) {
+			for (var currentArray = _handlers; ;) {
 				var index = IndexOf(currentArray, handler);
 				if (index < 0 || currentArray.Length is 0)
 					break;
 
 				// fast path loop - no need to search over array
-				for (Func<T, CancellationToken, ValueTask>[] newArray;; Array.Clear(newArray)) {
+				for (Func<T, CancellationToken, ValueTask>[] newArray; ; Array.Clear(newArray)) {
 
 					if (currentArray.Length > 1) {
 						newArray = new Func<T, CancellationToken, ValueTask>[currentArray.Length - 1];
diff --git a/src/EventStore.Core/Bus/InMemoryBus.cs b/src/KurrentDB.Core/Bus/InMemoryBus.cs
similarity index 91%
rename from src/EventStore.Core/Bus/InMemoryBus.cs
rename to src/KurrentDB.Core/Bus/InMemoryBus.cs
index 4b3dbad7053..e869c6f1853 100644
--- a/src/EventStore.Core/Bus/InMemoryBus.cs
+++ b/src/KurrentDB.Core/Bus/InMemoryBus.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Frozen;
 using System.Diagnostics;
@@ -6,11 +9,11 @@
 using System.Threading.Tasks;
 using DotNext;
 using DotNext.Diagnostics;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
 using ILogger = Serilog.ILogger;
 
-namespace EventStore.Core.Bus;
+namespace KurrentDB.Core.Bus;
 
 /// <summary>
 /// Synchronously dispatches messages to zero or more subscribers.
@@ -82,7 +85,7 @@ private async ValueTask DispatchAndWatchSlowMsg(MessageTypeHandler handlers, Mes
 			Log.Debug("SLOW BUS MSG [{bus}]: {message} - {elapsed}ms.",
 				Name, message.GetType().Name, (int)elapsedMs);
 			if (elapsedMs > QueuedHandlerThreadPool.VerySlowMsgThreshold.TotalMilliseconds &&
-			    message is not SystemMessage.SystemInit)
+				message is not SystemMessage.SystemInit)
 				Log.Error("---!!! VERY SLOW BUS MSG [{bus}]: {message} - {elapsed}ms.",
 					Name, message.GetType().Name, (int)elapsedMs);
 		}
diff --git a/src/KurrentDB.Core/Bus/MultiQueuedHandler.cs b/src/KurrentDB.Core/Bus/MultiQueuedHandler.cs
new file mode 100644
index 00000000000..4b2cfacfbb5
--- /dev/null
+++ b/src/KurrentDB.Core/Bus/MultiQueuedHandler.cs
@@ -0,0 +1,59 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Bus;
+
+public class MultiQueuedHandler : IPublisher {
+	private readonly ReadOnlyMemory<IQueuedHandler> _queues;
+	private int _nextQueueNum = -1;
+
+	public MultiQueuedHandler(int queueCount,
+		Func<int, IQueuedHandler> queueFactory) {
+		Ensure.Positive(queueCount, "queueCount");
+		Ensure.NotNull(queueFactory, "queueFactory");
+
+		var queues = new IQueuedHandler[queueCount];
+		for (int i = 0; i < queues.Length; ++i) {
+			queues[i] = queueFactory(i);
+		}
+
+		_queues = queues;
+	}
+
+	private int NextQueueHash() => Interlocked.Increment(ref _nextQueueNum);
+
+	public void Start() {
+		foreach (var t in _queues.Span) {
+			t.Start();
+		}
+	}
+
+	public Task Stop() {
+		var stopTasks = new Task[_queues.Length];
+		var queues = _queues.Span;
+		for (int i = 0; i < queues.Length; ++i) {
+			stopTasks[i] = Task.Run(queues[i].Stop);
+		}
+
+		return Task.WhenAll(stopTasks);
+	}
+
+	public void Publish(Message message) {
+		int queueHash = (message as IQueueAffineMessage)?.QueueId ?? NextQueueHash();
+		var queueNum = (int)((uint)queueHash % _queues.Length);
+		_queues.Span[queueNum].Publish(message);
+	}
+
+	public void PublishToAll(Message message) {
+		foreach (var queue in _queues.Span) {
+			queue.Publish(message);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Bus/QueueBatchDequeueResult.cs b/src/KurrentDB.Core/Bus/QueueBatchDequeueResult.cs
new file mode 100644
index 00000000000..30afbe9f62b
--- /dev/null
+++ b/src/KurrentDB.Core/Bus/QueueBatchDequeueResult.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Bus;
+
+/// <summary>
+/// A struct providing information for <see cref="ISingleConsumerMessageQueue.TryDequeue"/> result.
+/// </summary>
+public struct QueueBatchDequeueResult {
+	public int DequeueCount;
+	public int EstimateCurrentQueueCount;
+}
diff --git a/src/KurrentDB.Core/Bus/QueueItem.cs b/src/KurrentDB.Core/Bus/QueueItem.cs
new file mode 100644
index 00000000000..d1f6e28db50
--- /dev/null
+++ b/src/KurrentDB.Core/Bus/QueueItem.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Time;
+
+namespace KurrentDB.Core.Bus;
+
+public struct QueueItem {
+	public QueueItem(Instant enqueuedAt, Message message) {
+		EnqueuedAt = enqueuedAt;
+		Message = message;
+	}
+
+	public Instant EnqueuedAt { get; }
+	public Message Message { get; }
+}
diff --git a/src/KurrentDB.Core/Bus/QueueMonitor.cs b/src/KurrentDB.Core/Bus/QueueMonitor.cs
new file mode 100644
index 00000000000..77d1acbe44e
--- /dev/null
+++ b/src/KurrentDB.Core/Bus/QueueMonitor.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Concurrent;
+using System.Linq;
+using KurrentDB.Core.Services.Monitoring.Stats;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Bus;
+
+public class QueueMonitor {
+	private static readonly ILogger Log = Serilog.Log.ForContext<QueueMonitor>();
+	public static readonly QueueMonitor Default = new QueueMonitor();
+
+	private readonly ConcurrentDictionary<IMonitoredQueue, IMonitoredQueue> _queues =
+		new ConcurrentDictionary<IMonitoredQueue, IMonitoredQueue>();
+
+	private QueueMonitor() {
+	}
+
+	public void Register(IMonitoredQueue monitoredQueue) {
+		_queues[monitoredQueue] = monitoredQueue;
+	}
+
+	public void Unregister(IMonitoredQueue monitoredQueue) {
+		IMonitoredQueue v;
+		_queues.TryRemove(monitoredQueue, out v);
+	}
+
+	public QueueStats[] GetStats() {
+		var stats = _queues.Keys.OrderBy(x => x.Name).Select(queue => queue.GetStatistics()).ToArray();
+		return stats;
+	}
+}
diff --git a/src/KurrentDB.Core/Bus/QueueStatsCollector.cs b/src/KurrentDB.Core/Bus/QueueStatsCollector.cs
new file mode 100644
index 00000000000..8f87f08075f
--- /dev/null
+++ b/src/KurrentDB.Core/Bus/QueueStatsCollector.cs
@@ -0,0 +1,211 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Monitoring.Stats;
+
+namespace KurrentDB.Core.Bus;
+
+public class QueueStatsCollector {
+	private static readonly TimeSpan MinRefreshPeriod = TimeSpan.FromMilliseconds(100);
+
+	public readonly string Name;
+	public readonly string GroupName;
+
+	public Type InProgressMessage {
+		get { return _inProgressMsgType; }
+	}
+
+	private readonly object
+		_statisticsLock =
+			new object(); // this lock is mostly acquired from a single thread (+ rarely to get statistics), so performance penalty is not too high
+
+	private readonly Stopwatch _busyWatch = new Stopwatch();
+	private readonly Stopwatch _idleWatch = new Stopwatch();
+	private readonly Stopwatch _totalIdleWatch = new Stopwatch();
+	private readonly Stopwatch _totalBusyWatch = new Stopwatch();
+	private readonly Stopwatch _totalTimeWatch = new Stopwatch();
+	private TimeSpan _lastTotalIdleTime;
+	private TimeSpan _lastTotalBusyTime;
+	private TimeSpan _lastTotalTime;
+
+	private long _totalItems;
+	private long _lastTotalItems;
+	private int _lifetimeQueueLengthPeak;
+	private int _currentQueueLengthPeak;
+	private Type _lastProcessedMsgType;
+	private Type _inProgressMsgType;
+
+	private bool _wasIdle;
+
+#if DEBUG
+	private volatile bool _started;
+	private volatile bool _stopped;
+	private int _length;
+#endif
+	public QueueStatsCollector(string name, string groupName = null) {
+		Ensure.NotNull(name, "name");
+
+		Name = name;
+		GroupName = groupName;
+	}
+
+	public void Start() {
+		_totalTimeWatch.Start();
+#if DEBUG
+		Debug.Assert(!_started,
+			string.Format("QueueStatsCollector [{0}] was already started when Start() entered", Name));
+		Debug.Assert(!_stopped,
+			string.Format("QueueStatsCollector [{0}] was stopped when Start() entered", Name));
+		_started = true;
+#endif
+		EnterIdle();
+	}
+
+	public void Stop() {
+#if DEBUG
+		Debug.Assert(_started,
+			string.Format("QueueStatsCollector [{0}] was not started when Stop() entered", Name));
+		Debug.Assert(!_stopped,
+			string.Format("QueueStatsCollector [{0}] was already stopped when Stop() entered", Name));
+#endif
+		EnterIdle();
+		_totalTimeWatch.Stop();
+#if DEBUG
+		_stopped = true;
+#endif
+	}
+
+	public void ProcessingStarted<T>(int queueLength) {
+		ProcessingStarted(typeof(T), queueLength);
+	}
+
+	public void ProcessingStarted(Type msgType, int queueLength) {
+		_lifetimeQueueLengthPeak = _lifetimeQueueLengthPeak > queueLength ? _lifetimeQueueLengthPeak : queueLength;
+		_currentQueueLengthPeak = _currentQueueLengthPeak > queueLength ? _currentQueueLengthPeak : queueLength;
+
+		_inProgressMsgType = msgType;
+	}
+
+	public void ProcessingEnded(int itemsProcessed) {
+		Interlocked.Add(ref _totalItems, itemsProcessed);
+		_lastProcessedMsgType = _inProgressMsgType;
+		_inProgressMsgType = null;
+	}
+
+	public void EnterIdle() {
+#if DEBUG
+		Debug.Assert(_started,
+			string.Format("QueueStatsCollector [{0}] was not started when EnterIdle() entered", Name));
+#endif
+		if (_wasIdle)
+			return;
+		_wasIdle = true;
+
+		//NOTE: the following locks are primarily acquired in main thread,
+		//      so not too high performance penalty
+		lock (_statisticsLock) {
+			_totalIdleWatch.Start();
+			_idleWatch.Restart();
+
+			_totalBusyWatch.Stop();
+			_busyWatch.Reset();
+		}
+	}
+
+	public void EnterBusy() {
+#if DEBUG
+		Debug.Assert(_started,
+			string.Format("QueueStatsCollector [{0}] was not started when EnterBusy() entered", Name));
+#endif
+		if (!_wasIdle)
+			return;
+		_wasIdle = false;
+
+		lock (_statisticsLock) {
+			_totalIdleWatch.Stop();
+			_idleWatch.Reset();
+
+			_totalBusyWatch.Start();
+			_busyWatch.Restart();
+		}
+	}
+
+	public QueueStats GetStatistics(int currentQueueLength) {
+		lock (_statisticsLock) {
+			var totalTime = _totalTimeWatch.Elapsed;
+			var totalIdleTime = _totalIdleWatch.Elapsed;
+			var totalBusyTime = _totalBusyWatch.Elapsed;
+			var totalItems = Interlocked.Read(ref _totalItems);
+
+			var lastRunMs = totalTime - _lastTotalTime;
+			var lastItems = totalItems - _lastTotalItems;
+			var avgItemsPerSecond = lastRunMs.Ticks != 0
+				? (int)(TimeSpan.TicksPerSecond * lastItems / lastRunMs.Ticks)
+				: 0;
+			var avgProcessingTime =
+				lastItems != 0 ? (totalBusyTime - _lastTotalBusyTime).TotalMilliseconds / lastItems : 0;
+			var idleTimePercent = Math.Min(100.0,
+				lastRunMs.Ticks != 0 ? 100.0 * (totalIdleTime - _lastTotalIdleTime).Ticks / lastRunMs.Ticks : 100);
+
+			var stats = new QueueStats(
+				Name,
+				GroupName,
+				currentQueueLength,
+				avgItemsPerSecond,
+				avgProcessingTime,
+				idleTimePercent,
+				_busyWatch.IsRunning ? _busyWatch.Elapsed : (TimeSpan?)null,
+				_idleWatch.IsRunning ? _idleWatch.Elapsed : (TimeSpan?)null,
+				totalItems,
+				_currentQueueLengthPeak,
+				_lifetimeQueueLengthPeak,
+				_lastProcessedMsgType,
+				_inProgressMsgType);
+
+			if (totalTime - _lastTotalTime >= MinRefreshPeriod) {
+				_lastTotalTime = totalTime;
+				_lastTotalIdleTime = totalIdleTime;
+				_lastTotalBusyTime = totalBusyTime;
+				_lastTotalItems = totalItems;
+
+				_currentQueueLengthPeak = 0;
+			}
+
+			return stats;
+		}
+	}
+
+	[Conditional("DEBUG")]
+	public void Enqueued() {
+#if DEBUG
+		Interlocked.Increment(ref _length);
+#endif
+	}
+
+	[Conditional("DEBUG")]
+	public void Dequeued(Message msg) {
+#if DEBUG
+		Debug.Assert(_started,
+			string.Format("QueueStatsCollector [{0}] was not started when Dequeued() entered", Name));
+		Debug.Assert(!_stopped,
+			string.Format("QueueStatsCollector [{0}] was stopped when Dequeued() entered", Name));
+		Interlocked.Decrement(ref _length);
+#endif
+	}
+
+#if DEBUG
+	public bool IsIdle() {
+		var curLength = Interlocked.CompareExchange(ref _length, 0, 0);
+		return !_started || _stopped || curLength == 0;
+	}
+
+	public bool IsStopped() {
+		return _stopped;
+	}
+#endif
+}
diff --git a/src/KurrentDB.Core/Bus/QueueStatsManager.cs b/src/KurrentDB.Core/Bus/QueueStatsManager.cs
new file mode 100644
index 00000000000..22fc24e81d2
--- /dev/null
+++ b/src/KurrentDB.Core/Bus/QueueStatsManager.cs
@@ -0,0 +1,90 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Threading;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+
+namespace KurrentDB.Core.Bus;
+
+public class QueueStatsManager {
+#if DEBUG
+	private IReadOnlyCheckpoint _writerCheckpoint;
+	private IReadOnlyCheckpoint _chaserCheckpoint;
+	private ConcurrentDictionary<QueueStatsCollector, bool> _queueStatsCollectors = new ConcurrentDictionary<QueueStatsCollector, bool>();
+#endif
+	public QueueStatsManager() {
+	}
+
+	public QueueStatsCollector CreateQueueStatsCollector(string name, string groupName = null) {
+		var statsCollector = new QueueStatsCollector(name, groupName);
+#if DEBUG
+		_queueStatsCollectors.AddOrUpdate(statsCollector, (statsCollector) => true,
+			(statsCollector, curValue) => throw new Exception("This should never happen"));
+#endif
+		return statsCollector;
+	}
+
+#if DEBUG
+	private void WaitStop(int multiplier = 1) {
+		var counter = 0;
+		foreach (var kvp in _queueStatsCollectors) {
+			var queueStatsCollector = kvp.Key;
+			while (!queueStatsCollector.IsStopped()) {
+				Console.WriteLine($"Waiting for STOP state for queue {queueStatsCollector.Name}...");
+				counter++;
+				if (counter > 150 * multiplier)
+					throw new ApplicationException($"Infinite WaitStop() loop for queue {queueStatsCollector.Name}?");
+				Thread.Sleep(100);
+			}
+		}
+	}
+
+	public void WaitIdle(bool waitForCheckpoints = true, bool waitForNonEmptyTf = false,
+		int multiplier = 1) {
+		var counter = 0;
+
+		var singlePass = false;
+		do {
+			singlePass = true;
+			foreach (var kvp in _queueStatsCollectors) {
+				var queueStatsCollector = kvp.Key;
+				while (!queueStatsCollector.IsIdle()) {
+					Console.WriteLine($"Waiting for IDLE state for queue {queueStatsCollector.Name}...");
+					counter++;
+					singlePass = false;
+					if (counter > 150 * multiplier)
+						throw new ApplicationException($"Infinite WaitIdle() loop for queue: {queueStatsCollector.Name}?");
+					Thread.Sleep(100);
+				}
+			}
+		} while (!singlePass);
+
+		var successes = 0;
+		do {
+			if ((waitForCheckpoints && AreCheckpointsDifferent()) ||
+				(waitForNonEmptyTf && _writerCheckpoint.Read() == 0)) {
+				Console.WriteLine("Waiting for IDLE state on checkpoints...");
+				counter++;
+				if (counter > 150 * multiplier)
+					throw new ApplicationException("Infinite WaitIdle() loop on checkpoints?");
+				Thread.Sleep(100);
+			} else {
+				successes++;
+			}
+		} while (successes < 2);
+	}
+
+	private bool AreCheckpointsDifferent() {
+		return _writerCheckpoint != null && _chaserCheckpoint != null && _writerCheckpoint.ReadNonFlushed() != _chaserCheckpoint.Read();
+	}
+
+	public void InitializeCheckpoints(
+		IReadOnlyCheckpoint writerCheckpoint,
+		IReadOnlyCheckpoint chaserCheckpoint) {
+		_writerCheckpoint = writerCheckpoint;
+		_chaserCheckpoint = chaserCheckpoint;
+	}
+#endif
+}
diff --git a/src/KurrentDB.Core/Bus/QueuedHandlerThreadPool.cs b/src/KurrentDB.Core/Bus/QueuedHandlerThreadPool.cs
new file mode 100644
index 00000000000..ad819ddcebc
--- /dev/null
+++ b/src/KurrentDB.Core/Bus/QueuedHandlerThreadPool.cs
@@ -0,0 +1,217 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.Monitoring.Stats;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Bus;
+
+/// <summary>
+/// Lightweight in-memory queue with a separate thread in which it passes messages
+/// to the consumer. It also tracks statistics about the message processing to help
+/// in identifying bottlenecks
+/// </summary>
+public class QueuedHandlerThreadPool : IQueuedHandler, IMonitoredQueue, IThreadPoolWorkItem {
+	private static readonly TimeSpan DefaultStopWaitTimeout = TimeSpan.FromSeconds(10);
+	public static readonly TimeSpan VerySlowMsgThreshold = TimeSpan.FromSeconds(7);
+	private static readonly ILogger Log = Serilog.Log.ForContext<QueuedHandlerThreadPool>();
+
+	public int MessageCount {
+		get { return _queue.Count; }
+	}
+
+	public string Name {
+		get { return _queueStats.Name; }
+	}
+
+	private readonly Func<Message, CancellationToken, ValueTask> _consumer;
+
+	private readonly bool _watchSlowMsg;
+	private readonly TimeSpan _slowMsgThreshold;
+
+	private readonly ConcurrentQueueWrapper<QueueItem> _queue = new();
+
+	private CancellationTokenSource _lifetimeSource;
+	private readonly CancellationToken _lifetimeToken; // cached to avoid ObjectDisposedException
+	private readonly TimeSpan _threadStopWaitTimeout;
+
+	// monitoring
+	private readonly QueueMonitor _queueMonitor;
+	private readonly QueueStatsCollector _queueStats;
+	private readonly QueueTracker _tracker;
+
+	private int _isRunning;
+	private int _queueStatsState; //0 - never started, 1 - started, 2 - stopped
+
+	private readonly TaskCompletionSource _tcs = new();
+
+	public QueuedHandlerThreadPool(IAsyncHandle<Message> consumer,
+		string name,
+		QueueStatsManager queueStatsManager,
+		QueueTrackers trackers,
+		bool watchSlowMsg = true,
+		TimeSpan? slowMsgThreshold = null,
+		TimeSpan? threadStopWaitTimeout = null,
+		string groupName = null) {
+		Ensure.NotNull(consumer, "consumer");
+		Ensure.NotNull(name, "name");
+
+		// Pef: devirt interface
+		_consumer = consumer.HandleAsync;
+
+		_lifetimeSource = new();
+		_lifetimeToken = _lifetimeSource.Token;
+
+		_watchSlowMsg = watchSlowMsg;
+		_slowMsgThreshold = slowMsgThreshold ?? InMemoryBus.DefaultSlowMessageThreshold;
+		_threadStopWaitTimeout = threadStopWaitTimeout ?? DefaultStopWaitTimeout;
+
+		_queueMonitor = QueueMonitor.Default;
+		_queueStats = queueStatsManager.CreateQueueStatsCollector(name, groupName);
+		_tracker = trackers.GetTrackerForQueue(name);
+	}
+
+	public void Start() {
+		_queueMonitor.Register(this);
+	}
+
+	private void Cancel() {
+		if (Interlocked.Exchange(ref _lifetimeSource, null) is { } cts) {
+			using (cts) {
+				cts.Cancel();
+			}
+		}
+	}
+
+	public async Task Stop() {
+		RequestStop();
+
+		var timeoutSource = new CancellationTokenSource(_threadStopWaitTimeout);
+		try {
+			await _tcs.Task.WaitAsync(timeoutSource.Token);
+		} catch (OperationCanceledException ex) when (ex.CancellationToken == timeoutSource.Token) {
+			throw new TimeoutException($"Unable to stop thread '{Name}'.");
+		} catch (Exception) {
+			// ignore any other exceptions
+		}
+	}
+
+	public void RequestStop() {
+		Cancel();
+		if (TryStopQueueStats()) {
+			_tcs.TrySetResult();
+		}
+		_queueMonitor.Unregister(this);
+	}
+
+	private bool TryStopQueueStats() {
+		if (Interlocked.CompareExchange(ref _isRunning, 1, 0) == 0) {
+			if (Interlocked.CompareExchange(ref _queueStatsState, 2, 1) == 1)
+				_queueStats.Stop();
+			return Interlocked.CompareExchange(ref _isRunning, 0, 1) is 1;
+		}
+
+		return false;
+	}
+
+	async void IThreadPoolWorkItem.Execute() {
+		try {
+			if (Interlocked.CompareExchange(ref _queueStatsState, 1, 0) == 0)
+				_queueStats.Start();
+
+			bool proceed = true;
+			while (proceed) {
+				_queueStats.EnterBusy();
+				_tracker.EnterBusy();
+
+				while (!_lifetimeToken.IsCancellationRequested && _queue.TryDequeue(out var item)) {
+					var start = _tracker.RecordMessageDequeued(item.EnqueuedAt);
+					var msg = item.Message;
+#if DEBUG
+					_queueStats.Dequeued(msg);
+#endif
+					try {
+						var queueCnt = _queue.Count;
+						_queueStats.ProcessingStarted(msg.GetType(), queueCnt);
+
+						if (_watchSlowMsg) {
+							await _consumer.Invoke(msg, _lifetimeToken);
+
+							var end = _tracker.RecordMessageProcessed(start, msg.Label);
+							var elapsed = TimeSpan.FromSeconds(end.ElapsedSecondsSince(start));
+
+							if (elapsed > _slowMsgThreshold) {
+								Log.Debug(
+									"SLOW QUEUE MSG [{queue}]: {message} - {elapsed}ms. Q: {prevQueueCount}/{curQueueCount}. {messageDetail}.",
+									_queueStats.Name, _queueStats.InProgressMessage.Name,
+									(int)elapsed.TotalMilliseconds, queueCnt, _queue.Count, msg);
+								if (elapsed > VerySlowMsgThreshold &&
+									!(msg is SystemMessage.SystemInit))
+									Log.Error(
+										"---!!! VERY SLOW QUEUE MSG [{queue}]: {message} - {elapsed}ms. Q: {prevQueueCount}/{curQueueCount}.",
+										_queueStats.Name, _queueStats.InProgressMessage.Name,
+										(int)elapsed.TotalMilliseconds, queueCnt, _queue.Count);
+							}
+						} else {
+							await _consumer.Invoke(msg, _lifetimeToken);
+							_tracker.RecordMessageProcessed(start, msg.Label);
+						}
+
+						_queueStats.ProcessingEnded(1);
+					} catch (OperationCanceledException ex) when (
+							ex.CancellationToken.IsOneOf([_lifetimeToken, msg.CancellationToken])) {
+						break;
+					} catch (Exception ex) {
+						Log.Error(ex,
+							"Error while processing message {message} in queued handler '{queue}'.", msg,
+							_queueStats.Name);
+#if DEBUG
+						throw;
+#endif
+					}
+				}
+
+				_queueStats.EnterIdle();
+				_tracker.EnterIdle();
+				Interlocked.CompareExchange(ref _isRunning, 0, 1);
+				if (_lifetimeToken.IsCancellationRequested) {
+					TryStopQueueStats();
+					_tcs.TrySetCanceled(_lifetimeToken);
+				}
+
+				// try to reacquire lock if needed
+				proceed = !_lifetimeToken.IsCancellationRequested
+						  && _queue.Count > 0
+						  && Interlocked.CompareExchange(ref _isRunning, 1, 0) == 0;
+			}
+		} catch (OperationCanceledException e) when (e.CancellationToken == _lifetimeToken) {
+			_tcs.TrySetCanceled(e.CancellationToken);
+		} catch (Exception ex) {
+			_tcs.TrySetException(ex);
+			throw;
+		}
+	}
+
+	public void Publish(Message message) {
+		//Ensure.NotNull(message, "message");
+#if DEBUG
+		_queueStats.Enqueued();
+#endif
+		_queue.Enqueue(new(_tracker.Now, message));
+		if (!_lifetimeToken.IsCancellationRequested && Interlocked.CompareExchange(ref _isRunning, 1, 0) == 0) {
+			ThreadPool.UnsafeQueueUserWorkItem(this, preferLocal: false);
+		}
+	}
+
+	public QueueStats GetStatistics() {
+		return _queueStats.GetStatistics(_queue.Count);
+	}
+}
diff --git a/src/KurrentDB.Core/Caching/CacheResizer.cs b/src/KurrentDB.Core/Caching/CacheResizer.cs
new file mode 100644
index 00000000000..a68b1088159
--- /dev/null
+++ b/src/KurrentDB.Core/Caching/CacheResizer.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.Caching;
+
+public abstract class CacheResizer {
+	public string Name => Cache.Name;
+	public long Size => Cache.Size;
+	public long Count => Cache.Count;
+	public long FreedSize => Cache.FreedSize;
+	protected IDynamicCache Cache { get; }
+	public ResizerUnit Unit { get; }
+
+	protected CacheResizer(
+		ResizerUnit unit,
+		IDynamicCache cache) {
+		Ensure.NotNull(cache, nameof(cache));
+
+		Cache = cache;
+		Unit = unit;
+	}
+
+	protected string BuildStatsKey(string parentKey) =>
+		parentKey.Length == 0 ? Name : $"{parentKey}-{Name}";
+
+	protected static string GetParentKey(string key) {
+		var index = key.LastIndexOf('-');
+		return index < 0 ? null : key[..index];
+	}
+}
diff --git a/src/KurrentDB.Core/Caching/CacheStats.cs b/src/KurrentDB.Core/Caching/CacheStats.cs
new file mode 100644
index 00000000000..16970594d5d
--- /dev/null
+++ b/src/KurrentDB.Core/Caching/CacheStats.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Caching;
+
+public struct CacheStats {
+	public string Key { get; }
+	public string Name { get; }
+	public long Capacity { get; }
+	public long Size { get; }
+	public long Count { get; }
+	public int NumChildren { get; }
+	public double UtilizationPercent => Capacity != 0 ? 100.0 * Size / Capacity : 0;
+
+	public CacheStats(string key, string name, long capacity, long size, long count, int numChildren) {
+		Key = key;
+		Name = name;
+		Capacity = capacity;
+		Size = size;
+		Count = count;
+		NumChildren = numChildren;
+	}
+}
diff --git a/src/KurrentDB.Core/Caching/CompositeCacheResizer.cs b/src/KurrentDB.Core/Caching/CompositeCacheResizer.cs
new file mode 100644
index 00000000000..aa6d1f144e1
--- /dev/null
+++ b/src/KurrentDB.Core/Caching/CompositeCacheResizer.cs
@@ -0,0 +1,103 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.Caching;
+
+public class CompositeCacheResizer : CacheResizer, ICacheResizer {
+	private readonly ICacheResizer[] _children;
+
+	public CompositeCacheResizer(string name, int weight, params ICacheResizer[] children)
+		: base(GetUniqueUnit(children), new CompositeCache(name, children)) {
+		Weight = weight;
+		_children = children;
+		ReservedCapacity = _children.Sum(x => x.ReservedCapacity);
+	}
+
+	public int Weight { get; }
+
+	public long ReservedCapacity { get; }
+
+	public void CalcCapacity(long unreservedCapacity, int totalWeight) {
+		var totalCapacity = unreservedCapacity + ReservedCapacity;
+		Cache.SetCapacity(totalCapacity.ScaleByWeight(Weight, totalWeight));
+	}
+
+	public void ResetFreedSize() {
+		Cache.ResetFreedSize();
+	}
+
+	public IEnumerable<CacheStats> GetStats(string parentKey) {
+		var key = BuildStatsKey(parentKey);
+		var size = 0L;
+		var count = 0L;
+		var numChildren = 0;
+
+		foreach (var child in _children) {
+			foreach (var childStats in child.GetStats(key)) {
+				if (GetParentKey(childStats.Key) == key) {
+					size += childStats.Size;
+					count += childStats.Count;
+					numChildren++;
+				}
+
+				yield return childStats;
+			}
+		}
+
+		yield return new CacheStats(key, Name, Cache.Capacity, size, count, numChildren);
+	}
+
+	private static ResizerUnit GetUniqueUnit(ICacheResizer[] children) {
+		if (children.Length < 1)
+			throw new ArgumentException("There must be at least one child", nameof(children));
+
+		var unit = children[0].Unit;
+
+		if (children.Any(x => x.Unit != unit))
+			throw new ArgumentException("All children must have the same unit", nameof(children));
+
+		return unit;
+	}
+
+	class CompositeCache : IDynamicCache {
+		private readonly ICacheResizer[] _children;
+		private readonly int _childrenWeight;
+		private readonly long _reservedCapacity;
+
+		public CompositeCache(string name, params ICacheResizer[] children) {
+			Ensure.NotNullOrEmpty(name, nameof(name));
+			Name = name;
+			_children = children;
+			_childrenWeight = children.Sum(static x => x.Weight);
+			_reservedCapacity = children.Sum(static x => x.ReservedCapacity);
+		}
+
+		public string Name { get; }
+
+		public long Capacity { get; private set; }
+
+		public void SetCapacity(long value) {
+			// todo: could consider taking into account capacity not used by children because
+			// they took their maximum values
+			Capacity = value;
+			var unreservedCapacity = Math.Max(Capacity - _reservedCapacity, 0);
+			foreach (var child in _children) {
+				child.CalcCapacity(unreservedCapacity, _childrenWeight);
+			}
+		}
+
+		public void ResetFreedSize() {
+			foreach (var child in _children)
+				child.ResetFreedSize();
+		}
+
+		public long Size => _children.Sum(static x => x.Size);
+		public long Count => _children.Sum(static x => x.Count);
+		public long FreedSize => _children.Sum(static x => x.FreedSize);
+	}
+}
diff --git a/src/KurrentDB.Core/Caching/DynamicCacheManager.cs b/src/KurrentDB.Core/Caching/DynamicCacheManager.cs
new file mode 100644
index 00000000000..1513fb4dc36
--- /dev/null
+++ b/src/KurrentDB.Core/Caching/DynamicCacheManager.cs
@@ -0,0 +1,243 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Util;
+using Serilog;
+
+namespace KurrentDB.Core.Caching;
+
+public class DynamicCacheManager :
+	IHandle<MonitoringMessage.DynamicCacheManagerTick>,
+	IHandle<MonitoringMessage.InternalStatsRequest> {
+
+	protected static readonly ILogger Log = Serilog.Log.ForContext<DynamicCacheManager>();
+
+	private readonly IPublisher _bus;
+	private readonly Func<long> _getFreeSystemMem;
+	private readonly Func<long> _getFreeHeapMem;
+	private readonly Func<int> _getGcCollectionCount;
+	private readonly long _totalMem;
+	private readonly int _keepFreeMemPercent;
+	private readonly long _keepFreeMemBytes;
+	private readonly long _keepFreeMem;
+	private readonly TimeSpan _minResizeInterval;
+	private readonly long _minResizeThreshold;
+	private readonly ICacheResizer _rootCacheResizer;
+	private readonly Message _scheduleTick;
+	private readonly Func<Dictionary<string, CacheStats>> _fetchOrGetCachedStats;
+	private readonly ICacheResourcesTracker _cacheResourcesTracker;
+
+	private DateTime _lastResize = DateTime.UtcNow;
+	private long _lastAvailableMem;
+	private long _lastGcCount;
+
+	public DynamicCacheManager(
+		IPublisher bus,
+		Func<long> getFreeSystemMem,
+		Func<long> getFreeHeapMem,
+		Func<int> getGcCollectionCount,
+		long totalMem,
+		int keepFreeMemPercent,
+		long keepFreeMemBytes,
+		TimeSpan monitoringInterval,
+		TimeSpan minResizeInterval,
+		long minResizeThreshold,
+		ICacheResizer rootCacheResizer,
+		ICacheResourcesTracker cacheResourcesTracker) {
+
+		if (keepFreeMemPercent is < 0 or > 100)
+			throw new ArgumentException($"{nameof(keepFreeMemPercent)} must be between 0 to 100 inclusive.");
+
+		if (keepFreeMemBytes < 0)
+			throw new ArgumentException($"{nameof(keepFreeMemBytes)} must be non-negative.");
+
+		_bus = bus;
+		_getFreeSystemMem = getFreeSystemMem;
+		_getFreeHeapMem = getFreeHeapMem;
+		_getGcCollectionCount = getGcCollectionCount;
+		_totalMem = totalMem;
+		_keepFreeMemPercent = keepFreeMemPercent;
+		_keepFreeMemBytes = keepFreeMemBytes;
+		_keepFreeMem = Math.Max(_keepFreeMemBytes, _totalMem.ScaleByPercent(_keepFreeMemPercent));
+		_minResizeInterval = minResizeInterval;
+		_minResizeThreshold = minResizeThreshold;
+		_rootCacheResizer = rootCacheResizer;
+		_scheduleTick = TimerMessage.Schedule.Create(
+			monitoringInterval,
+			_bus,
+			new MonitoringMessage.DynamicCacheManagerTick());
+		_cacheResourcesTracker = cacheResourcesTracker;
+		_fetchOrGetCachedStats = Functions.Debounce(
+			() => _rootCacheResizer.GetStats(string.Empty).ToDictionary(stats => stats.Key),
+			TimeSpan.FromSeconds(1));
+	}
+
+	private readonly struct AvailableMemoryInfo {
+		public long AvailableMem { get; } // available memory for static and dynamic caches
+		public long FreeSystemMem { get; } // free memory on the system
+		public long FreeHeapMem { get; } // free memory within the heap
+		public long CachedMem { get; } // approximate amount of memory used by static and dynamic caches
+		public long FreedMem { get; } // approximate amount of managed memory freed by caches but not yet collected
+		public long TotalFreeMem => FreeSystemMem + FreeHeapMem + FreedMem;
+
+		public AvailableMemoryInfo(long availableMem, long freeSystemMem, long freeHeapMem, long cachedMem, long freedMem) {
+			AvailableMem = availableMem;
+			FreeSystemMem = freeSystemMem;
+			FreeHeapMem = freeHeapMem;
+			CachedMem = cachedMem;
+			FreedMem = freedMem;
+		}
+	}
+
+	public void Start() {
+		if (_rootCacheResizer.Unit == ResizerUnit.Entries) {
+			_rootCacheResizer.CalcCapacityTopLevel(_rootCacheResizer.ReservedCapacity);
+		} else {
+			var availableMem = GetAvailableMemoryInfo().AvailableMem;
+			_lastAvailableMem = availableMem;
+			ResizeCaches(availableMem);
+
+			Thread.MemoryBarrier();
+
+			Tick();
+		}
+
+		var allStats = _fetchOrGetCachedStats();
+		foreach (var stat in allStats.Values) {
+			var key = stat.Key;
+			Log.Information("Cache {key} capacity initialized to {capacity:N0} {unit}",
+				key, stat.Capacity, _rootCacheResizer.Unit);
+
+			if (stat.NumChildren == 0)
+				_cacheResourcesTracker.Register(stat.Name, _rootCacheResizer.Unit, () => _fetchOrGetCachedStats()[key]);
+		}
+	}
+
+	public void Handle(MonitoringMessage.DynamicCacheManagerTick message) {
+		ThreadPool.QueueUserWorkItem(_ => {
+			try {
+				Thread.MemoryBarrier();
+				ResizeCachesIfNeeded();
+				Thread.MemoryBarrier();
+			} finally {
+				Tick();
+			}
+		});
+	}
+
+	public void Handle(MonitoringMessage.InternalStatsRequest message) {
+		Thread.MemoryBarrier(); // just to ensure we're seeing latest values
+
+		var stats = new Dictionary<string, object>();
+		var cachesStats = _rootCacheResizer.GetStats(string.Empty);
+
+		foreach (var cacheStat in cachesStats) {
+			var statNamePrefix = $"es-{cacheStat.Key}-";
+			stats[statNamePrefix + "name"] = cacheStat.Name;
+			stats[statNamePrefix + "count"] = cacheStat.Count;
+			stats[statNamePrefix + "size" + _rootCacheResizer.Unit] = cacheStat.Size;
+			stats[statNamePrefix + "capacity" + _rootCacheResizer.Unit] = cacheStat.Capacity;
+			stats[statNamePrefix + "utilizationPercent"] = cacheStat.UtilizationPercent;
+		}
+
+		message.Envelope.ReplyWith(new MonitoringMessage.InternalStatsRequestResponse(stats));
+	}
+
+	private bool ResizeConditionsMet(out AvailableMemoryInfo availableMemInfo) {
+		availableMemInfo = GetAvailableMemoryInfo();
+
+		// not much has changed since the last resize, don't resize again.
+		if (Math.Abs(availableMemInfo.AvailableMem - _lastAvailableMem) < _minResizeThreshold)
+			return false;
+
+		// we're low on memory, resize.
+		if (availableMemInfo.TotalFreeMem < _keepFreeMem)
+			return true;
+
+		// we've not resized for a while now, resize.
+		if (DateTime.UtcNow - _lastResize >= _minResizeInterval)
+			return true;
+
+		return false;
+	}
+
+	private void ResizeCachesIfNeeded() {
+		if (FullGcHasRun())
+			_rootCacheResizer.ResetFreedSize();
+
+		if (!ResizeConditionsMet(out var availableMemInfo))
+			return;
+
+		Log.Debug("Resizing caches.");
+
+		if (availableMemInfo.TotalFreeMem < _keepFreeMem)
+			Log.Verbose("Total free memory is lower than "
+					  + "{thresholdPercent}% or {thresholdBytes:N0} bytes.\n"
+					  + "Free system memory: {freeSystemMem:N0} bytes.\n"
+					  + "Free heap memory: {freeHeapMem:N0} bytes.\n"
+					  + "Freed memory: {freedMem:N0} bytes.\n\n"
+					  + "Total free memory: {totalFreeMem:N0} bytes.\n",
+				_keepFreeMemPercent,
+				_keepFreeMemBytes,
+				availableMemInfo.FreeSystemMem,
+				availableMemInfo.FreeHeapMem,
+				availableMemInfo.FreedMem,
+				availableMemInfo.TotalFreeMem);
+
+		try {
+			ResizeCaches(availableMemInfo.AvailableMem);
+		} catch (Exception ex) {
+			Log.Error(ex, "Error while resizing caches");
+		} finally {
+			_lastResize = DateTime.UtcNow;
+			_lastAvailableMem = availableMemInfo.AvailableMem;
+		}
+	}
+
+	private bool FullGcHasRun() =>
+		_lastGcCount < (_lastGcCount = _getGcCollectionCount());
+
+	private void ResizeCaches(long availableMem) {
+		_rootCacheResizer.CalcCapacityTopLevel(availableMem);
+	}
+
+	private AvailableMemoryInfo GetAvailableMemoryInfo() {
+		do {
+			var freeSystemMem = _getFreeSystemMem();
+			var freeHeapMem = _getFreeHeapMem();
+			var cachedMem = _rootCacheResizer.Size;
+			var freedMem = _rootCacheResizer.FreedSize;
+
+			var availableMem = Math.Max(0L, freeSystemMem + freeHeapMem + cachedMem + freedMem - _keepFreeMem);
+
+			Log.Verbose("Calculating memory available for caching based on:\n" +
+						"Total memory: {totalMem:N0} bytes\n" +
+						"Free system memory: {freeSystemMem:N0} bytes\n" +
+						"Free heap memory: {freeHeapMem:N0} bytes\n" +
+						"Cached memory: ~{cachedMem:N0} bytes\n" +
+						"Freed memory: ~{freedMem:N0} bytes\n" +
+						"Keep free memory: {keepFreeMem:N0} bytes (higher of {keepFreeMemPercent}% total mem & {keepFreeMemBytes:N0} bytes)\n\n" +
+						"Memory available for caching: ~{availableMem:N0} bytes\n",
+				_totalMem, freeSystemMem, freeHeapMem, cachedMem, freedMem,
+				_keepFreeMem, _keepFreeMemPercent, _keepFreeMemBytes,
+				availableMem);
+
+			if (FullGcHasRun())
+				_rootCacheResizer.ResetFreedSize();
+			else
+				return new AvailableMemoryInfo(availableMem, freeSystemMem, freeHeapMem, cachedMem, freedMem);
+		} while (true);
+	}
+
+	private void Tick() => _bus.Publish(_scheduleTick);
+}
diff --git a/src/KurrentDB.Core/Caching/DynamicCacheResizer.cs b/src/KurrentDB.Core/Caching/DynamicCacheResizer.cs
new file mode 100644
index 00000000000..76b608f4f13
--- /dev/null
+++ b/src/KurrentDB.Core/Caching/DynamicCacheResizer.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using KurrentDB.Common.Utils;
+using Serilog;
+
+namespace KurrentDB.Core.Caching;
+
+public class DynamicCacheResizer : CacheResizer, ICacheResizer {
+	private readonly long _minCapacity;
+	private readonly long _maxCapacity;
+
+	public DynamicCacheResizer(ResizerUnit unit, long minCapacity, long maxCapacity, int weight, IDynamicCache cache)
+		: base(unit, cache) {
+		Ensure.Positive(weight, nameof(weight));
+		Ensure.Nonnegative(minCapacity, nameof(minCapacity));
+		Ensure.Nonnegative(maxCapacity, nameof(maxCapacity));
+
+		Weight = weight;
+		_minCapacity = minCapacity;
+		_maxCapacity = maxCapacity;
+	}
+
+	public int Weight { get; }
+
+	public long ReservedCapacity => 0;
+
+	public void CalcCapacity(long unreservedCapacity, int totalWeight) {
+		var sw = Stopwatch.StartNew();
+
+		var oldCapacity = Cache.Capacity;
+		var capacity = Math.Clamp(
+			value: unreservedCapacity.ScaleByWeight(Weight, totalWeight),
+			min: _minCapacity,
+			max: _maxCapacity);
+		Cache.SetCapacity(capacity);
+
+		sw.Stop();
+
+		var diff = capacity - oldCapacity;
+		Log.Debug(
+			"{name} dynamically allotted {capacity:N0} " + Unit + " ({diff:+#,#;-#,#;+0}). Took {elapsed:N0} ms.",
+			Name, Cache.Capacity, diff, sw.ElapsedMilliseconds);
+	}
+
+	public void ResetFreedSize() {
+		Cache.ResetFreedSize();
+	}
+
+	public IEnumerable<CacheStats> GetStats(string parentKey) {
+		yield return new CacheStats(BuildStatsKey(parentKey), Name, Cache.Capacity, Size, Count, numChildren: 0);
+	}
+}
diff --git a/src/KurrentDB.Core/Caching/ICacheResizer.cs b/src/KurrentDB.Core/Caching/ICacheResizer.cs
new file mode 100644
index 00000000000..f8e7a7ee444
--- /dev/null
+++ b/src/KurrentDB.Core/Caching/ICacheResizer.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+
+namespace KurrentDB.Core.Caching;
+
+// The resizer is responsible for resizing its associated cache.
+// The resizer can be part of a hierarchy of resizers.
+// Children can _reserve_ capacity, making it unavailable to be distributed by weight.
+//     Capacity = ReservedCapacity + UnreservedCapacity
+// To trigger resizing, the parent calls the CalcCapacity method, passing in
+//   - its unreserved capacity (i.e. the capacity to be shared among the children by weight)
+//   - total weight of the children (so that they can draw the correct amount according to their weight)
+public interface ICacheResizer {
+	string Name { get; }
+
+	ResizerUnit Unit { get; }
+
+	// How much of the capacity given to this resizer is reserved.
+	// The remaining (unreserved) capacity can be allotted by weight among the children.
+	long ReservedCapacity { get; }
+
+	// Weight relative to siblings when drawing from the unreserved capacity
+	int Weight { get; }
+
+	// How much of the capacity is currently utilized
+	long Size { get; }
+
+	// Number of items in cache
+	long Count { get; }
+
+	// Approximate amount freed but not yet garbage collected
+	long FreedSize { get; }
+
+	void CalcCapacity(long unreservedCapacity, int totalWeight);
+
+	void ResetFreedSize();
+
+	IEnumerable<CacheStats> GetStats(string parentKey);
+}
+
+// We support Entries for backwards compatibility. In the future all cache
+// sizes will likely be specified in bytes and we can remove this enum.
+public enum ResizerUnit {
+	Bytes,
+	Entries,
+}
+
+public static class CacheResizerExtensions {
+	// Helper for the top level to just pass in the totalCapacity
+	public static void CalcCapacityTopLevel(this ICacheResizer self, long totalCapacity) {
+		self.CalcCapacity(
+			unreservedCapacity: totalCapacity - self.ReservedCapacity,
+			totalWeight: self.Weight);
+	}
+}
diff --git a/src/KurrentDB.Core/Caching/IDynamicCache.cs b/src/KurrentDB.Core/Caching/IDynamicCache.cs
new file mode 100644
index 00000000000..0686e6dc5ce
--- /dev/null
+++ b/src/KurrentDB.Core/Caching/IDynamicCache.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Caching;
+
+// This has its capacity adjusted by the ICacheResizer
+public interface IDynamicCache {
+	string Name { get; }
+	long Capacity { get; }
+	long Size { get; }
+	// Number of items in cache
+	long Count { get; }
+	// Approximate amount freed but not yet garbage collected
+	long FreedSize { get; }
+	void SetCapacity(long capacity);
+	void ResetFreedSize();
+	// todo: hits and misses
+}
diff --git a/src/KurrentDB.Core/Caching/MemSizer.cs b/src/KurrentDB.Core/Caching/MemSizer.cs
new file mode 100644
index 00000000000..913566e7354
--- /dev/null
+++ b/src/KurrentDB.Core/Caching/MemSizer.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.Caching;
+
+public class MemSizer {
+	public const int ObjectHeaderSize = 16;
+	public const int ArraySize = 24;
+	public const int StringSize = 20;
+	private const int DictionaryEntryOverhead = 12;
+	private const int LinkedListNodeOverhead = 40;
+	public const int LinkedListEntrySize = 0;
+
+	public static int SizeOf(string s) {
+		if (string.IsNullOrEmpty(s))
+			return 0;
+		return (StringSize + s.Length * 2 + 1).RoundUpToMultipleOf(IntPtr.Size);
+	}
+
+	public static int SizeOf(string[] arr) {
+		if (arr == null)
+			return 0;
+
+		var size = 0;
+		size += ArraySize; // string array
+		size += arr.Length * Unsafe.SizeOf<string>(); // string refs
+		size += arr.Sum(static x => SizeOf(x)); // strings
+		return size;
+	}
+
+	public static int SizeOfDictionaryEntry<TKey, TValue>() =>
+		DictionaryEntryOverhead + (Unsafe.SizeOf<TKey>() + Unsafe.SizeOf<TValue>()).RoundUpToMultipleOf(IntPtr.Size);
+
+	public static int SizeOfLinkedListNode<T>() =>
+		LinkedListNodeOverhead + Unsafe.SizeOf<T>().RoundUpToMultipleOf(IntPtr.Size);
+}
diff --git a/src/KurrentDB.Core/Caching/StaticCacheResizer.cs b/src/KurrentDB.Core/Caching/StaticCacheResizer.cs
new file mode 100644
index 00000000000..b34a690eb03
--- /dev/null
+++ b/src/KurrentDB.Core/Caching/StaticCacheResizer.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Common.Utils;
+using Serilog;
+
+namespace KurrentDB.Core.Caching;
+
+public class StaticCacheResizer : CacheResizer, ICacheResizer {
+	private readonly long _capacity;
+
+	public StaticCacheResizer(ResizerUnit unit, long capacity, IDynamicCache cache)
+		: base(unit, cache) {
+		Ensure.Nonnegative(capacity, nameof(capacity));
+		_capacity = capacity;
+	}
+
+	public int Weight => 0;
+
+	public long ReservedCapacity => _capacity;
+
+	public void CalcCapacity(long unreservedCapacity, int totalWeight) {
+		Cache.SetCapacity(_capacity);
+		Log.Debug(
+			"{name} statically allotted {capacity:N0} " + Unit,
+			Name, Cache.Capacity);
+	}
+
+	public void ResetFreedSize() {
+		Cache.ResetFreedSize();
+	}
+
+	public IEnumerable<CacheStats> GetStats(string parentKey) {
+		yield return new CacheStats(BuildStatsKey(parentKey), Name, Cache.Capacity, Size, Count, numChildren: 0);
+	}
+}
diff --git a/src/EventStore.Core/Certificates/CertificateExpiryMonitor.cs b/src/KurrentDB.Core/Certificates/CertificateExpiryMonitor.cs
similarity index 82%
rename from src/EventStore.Core/Certificates/CertificateExpiryMonitor.cs
rename to src/KurrentDB.Core/Certificates/CertificateExpiryMonitor.cs
index 0df77db499d..de226a7a0eb 100644
--- a/src/EventStore.Core/Certificates/CertificateExpiryMonitor.cs
+++ b/src/KurrentDB.Core/Certificates/CertificateExpiryMonitor.cs
@@ -1,12 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Security.Cryptography.X509Certificates;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
-using EventStore.Core.Services.TimerService;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
 using Serilog;
 
-namespace EventStore.Core.Certificates;
+namespace KurrentDB.Core.Certificates;
 
 public class CertificateExpiryMonitor :
 	IHandle<SystemMessage.SystemStart>,
diff --git a/src/KurrentDB.Core/Certificates/CertificateProvider.cs b/src/KurrentDB.Core/Certificates/CertificateProvider.cs
new file mode 100644
index 00000000000..c00e5151d7c
--- /dev/null
+++ b/src/KurrentDB.Core/Certificates/CertificateProvider.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Cryptography.X509Certificates;
+
+namespace KurrentDB.Core.Certificates;
+
+public abstract class CertificateProvider {
+	public X509Certificate2 Certificate;
+	public X509Certificate2Collection IntermediateCerts;
+	public X509Certificate2Collection TrustedRootCerts;
+	public abstract LoadCertificateResult LoadCertificates(ClusterVNodeOptions options);
+	public abstract string GetReservedNodeCommonName();
+}
+
+public enum LoadCertificateResult {
+	Success = 1,
+	VerificationFailed,
+	Skipped
+}
diff --git a/src/KurrentDB.Core/Certificates/CertificateUtils.cs b/src/KurrentDB.Core/Certificates/CertificateUtils.cs
new file mode 100644
index 00000000000..7c603ebdc83
--- /dev/null
+++ b/src/KurrentDB.Core/Certificates/CertificateUtils.cs
@@ -0,0 +1,317 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Security.Cryptography.Pkcs;
+using System.Security.Cryptography.X509Certificates;
+using System.Text;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Exceptions;
+
+namespace KurrentDB.Core.Certificates;
+
+public static class CertificateUtils {
+	public static X509Certificate2 LoadFromStore(StoreLocation storeLocation, StoreName storeName,
+		string certificateSubjectName, string certificateThumbprint) {
+		var store = new X509Store(storeName, storeLocation);
+		return GetCertificateFromStore(store, certificateSubjectName, certificateThumbprint);
+	}
+
+	public static X509Certificate2 LoadFromStore(StoreName storeName, string certificateSubjectName,
+		string certificateThumbprint) {
+		var store = new X509Store(storeName);
+		return GetCertificateFromStore(store, certificateSubjectName, certificateThumbprint);
+	}
+
+	private static bool TryReadPkcs12CertificateBundle
+		(string certificatePath,
+		string password,
+		out X509Certificate2 certificate,
+		out X509Certificate2Collection intermediates) {
+		var pkcs12Info = Pkcs12Info.Decode(File.ReadAllBytes(certificatePath), out _);
+
+		var certs = new X509Certificate2Collection();
+		using var rsa = RSA.Create();
+		var privateKeyFound = false;
+
+		foreach (var safeContents in pkcs12Info.AuthenticatedSafe) {
+			if (safeContents.ConfidentialityMode == Pkcs12ConfidentialityMode.Password) {
+				safeContents.Decrypt(password);
+			}
+
+			foreach (var bag in safeContents.GetBags()) {
+				switch (bag) {
+					case Pkcs12CertBag certBag:
+						certs.Add(certBag.GetCertificate());
+						break;
+					case Pkcs12ShroudedKeyBag shroudedKeyBag: {
+						if (privateKeyFound) {
+							throw new Exception("Multiple private keys found");
+						}
+						var encryptedKey = shroudedKeyBag.EncryptedPkcs8PrivateKey;
+						rsa.ImportEncryptedPkcs8PrivateKey(password.AsSpan(), encryptedKey.Span, out _);
+						privateKeyFound = true;
+						break;
+					}
+				}
+			}
+		}
+
+		if (certs.Count == 0) {
+			throw new Exception("No certificates found");
+		}
+
+		if (!privateKeyFound) {
+			throw new Exception("No private keys found");
+		}
+
+		using var publicCertificate = certs[0];
+		using var publicWithPrivate = publicCertificate.CopyWithPrivateKey(rsa);
+		certs.RemoveAt(0);
+		certificate = new X509Certificate2(publicWithPrivate.ExportToPkcs12());
+		intermediates = certs.Count == 0 ? null : certs;
+		return true;
+	}
+
+	public static (X509Certificate2 certificate, X509Certificate2Collection intermediates) LoadFromFile(
+		string certificatePath,
+		string privateKeyPath,
+		string certificatePassword, string certificatePrivateKeyPassword = null) {
+
+		if (string.IsNullOrEmpty(privateKeyPath)) {
+			// no private key file - assume PKCS12 format
+			// the check is done on the private key file since an empty password may still be valid
+
+			try {
+				if (TryReadPkcs12CertificateBundle(
+					certificatePath,
+					certificatePassword,
+					out var nodeCertificate,
+					out var intermediateCertificates)) {
+					return (nodeCertificate, intermediateCertificates);
+				}
+			} catch (CryptographicException) {
+				// ignored
+			}
+
+			// if the above attempt failed, try to load the certificate via the standard constructor
+			var certificate = new X509Certificate2(certificatePath, certificatePassword);
+			if (!certificate.HasPrivateKey)
+				throw new NoCertificatePrivateKeyException();
+			return (certificate, null);
+		}
+
+		string[] allLines = File.ReadAllLines(privateKeyPath);
+		var header = allLines[0].Replace("-", "");
+		var privateKey = Convert.FromBase64String(string.Join(string.Empty, allLines.Skip(1).SkipLast(1)));
+
+		using var rsa = RSA.Create();
+		switch (header) {
+			case "BEGIN PRIVATE KEY":
+				rsa.ImportPkcs8PrivateKey(new ReadOnlySpan<byte>(privateKey), out _);
+				break;
+			case "BEGIN RSA PRIVATE KEY":
+				rsa.ImportRSAPrivateKey(new ReadOnlySpan<byte>(privateKey), out _);
+				break;
+			case "BEGIN ENCRYPTED PRIVATE KEY":
+				if (certificatePrivateKeyPassword is null) {
+					throw new ArgumentException(
+						"A password is required to read the certificate's private key file.");
+				}
+				try {
+					rsa.ImportEncryptedPkcs8PrivateKey(new ReadOnlySpan<byte>(Encoding.UTF8.GetBytes(certificatePrivateKeyPassword)), new ReadOnlySpan<byte>(privateKey), out _);
+				} catch (CryptographicException e) {
+					throw new ArgumentException(
+						"Failed to read the certificate's private key file. The password may be incorrect or the private key may not be an RSA key.", e);
+				}
+				break;
+			default:
+				throw new NotSupportedException($"Unsupported private key file format: {header}");
+
+		}
+
+
+		// assume it's a PEM bundle
+		var certificateBundle = new X509Certificate2Collection();
+		var bundleLoadSucceeded = false;
+		try {
+			certificateBundle.ImportFromPemFile(certificatePath);
+			bundleLoadSucceeded = true;
+		} catch {
+			// ignored
+		}
+
+		if (!bundleLoadSucceeded || certificateBundle.Count == 0) {
+			// make a last attempt to open the certificate, leaving the file format guess-work to the library
+			certificateBundle.Add(new X509Certificate2(certificatePath, certificatePassword));
+		}
+
+		using var publicCertificate = certificateBundle[0];
+		using var publicWithPrivate = publicCertificate.CopyWithPrivateKey(rsa);
+		var serverCertificate = new X509Certificate2(publicWithPrivate.ExportToPkcs12());
+		certificateBundle.RemoveAt(0);
+		var intermediates = certificateBundle.Count == 0 ? null : certificateBundle;
+
+		return (serverCertificate, intermediates);
+	}
+
+	private static X509Certificate2 GetCertificateFromStore(X509Store store, string certificateSubjectName,
+		string certificateThumbprint) {
+		try {
+			store.Open(OpenFlags.OpenExistingOnly);
+		} catch (Exception exc) {
+			throw new Exception(
+				string.Format("Could not open certificate store '{0}' in location {1}'.", store.Name,
+					store.Location), exc);
+		}
+
+		if (!string.IsNullOrWhiteSpace(certificateThumbprint)) {
+			var certificates = store.Certificates.Find(X509FindType.FindByThumbprint, certificateThumbprint, true);
+			if (certificates.Count == 0)
+				throw new Exception($"Could not find valid certificate with thumbprint '{certificateThumbprint}'.");
+
+			if (certificates.Count > 1)
+				throw new Exception(
+					$"Could not determine a unique certificate from thumbprint '{certificateThumbprint}'.");
+
+			return certificates[0];
+		}
+
+		if (!string.IsNullOrWhiteSpace(certificateSubjectName)) {
+			var certificates =
+				store.Certificates.Find(X509FindType.FindBySubjectName, certificateSubjectName, true);
+			if (certificates.Count == 0)
+				throw new Exception(
+					$"Could not find valid certificate with subject name '{certificateSubjectName}'.");
+
+			if (certificates.Count == 1) {
+				return certificates[0];
+			}
+
+			// If we get multiple of the same certificate, pick the one which expires last to allow rolling certificates
+			var certs = certificates.GetEnumerator();
+			X509Certificate2 mostRecentCert = null;
+			while (certs.MoveNext()) {
+				if (certs.Current is null) {
+					continue;
+				}
+
+				if (mostRecentCert is null) {
+					mostRecentCert = certs.Current;
+				} else if (certs.Current.NotAfter > mostRecentCert.NotAfter) {
+					mostRecentCert = certs.Current;
+				}
+			}
+
+			return mostRecentCert;
+		}
+
+		throw new ArgumentException(
+			"No thumbprint or subject name was specified for a certificate, but a certificate store was specified.");
+	}
+
+	public static IEnumerable<(string fileName, X509Certificate2 certificate)> LoadAllCertificates(string path) {
+		var files = Directory.GetFiles(path);
+		var acceptedExtensions = new[] { ".crt", ".cert", ".cer", ".pem", ".der" };
+		foreach (var file in files) {
+			var fileInfo = new FileInfo(file);
+			var extension = fileInfo.Extension;
+			if (acceptedExtensions.Contains(extension)) {
+				X509Certificate2 cert;
+				try {
+					cert = new X509Certificate2(File.ReadAllBytes(file));
+				} catch (Exception exc) {
+					throw new AggregateException($"Error loading certificate file: {file}", exc);
+				}
+				yield return (file, cert);
+			}
+		}
+	}
+
+	public static StoreLocation GetCertificateStoreLocation(string certificateStoreLocation) {
+		if (!Enum.TryParse(certificateStoreLocation, out StoreLocation location))
+			throw new Exception($"Could not find certificate store location '{certificateStoreLocation}'");
+		return location;
+	}
+
+	public static StoreName GetCertificateStoreName(string certificateStoreName) {
+		if (!Enum.TryParse(certificateStoreName, out StoreName name))
+			throw new Exception($"Could not find certificate store name '{certificateStoreName}'");
+		return name;
+	}
+
+	public static X509ChainStatusFlags BuildChain(X509Certificate certificate,
+		X509Certificate2Collection intermediateCerts, X509Certificate2Collection trustedRootCerts,
+		out List<string> statusInformation) {
+		using var chain = new X509Chain {
+			ChainPolicy = {
+				RevocationMode = X509RevocationMode.NoCheck,
+				TrustMode = X509ChainTrustMode.CustomRootTrust,
+				DisableCertificateDownloads = true
+			}
+		};
+
+		if (trustedRootCerts != null) {
+			foreach (var cert in trustedRootCerts) {
+				chain.ChainPolicy.CustomTrustStore.Add(cert);
+			}
+		}
+
+		if (intermediateCerts != null) {
+			foreach (var cert in intermediateCerts) {
+				chain.ChainPolicy.ExtraStore.Add(cert);
+			}
+		}
+
+		chain.Build(new X509Certificate2(certificate));
+
+		var chainStatus = X509ChainStatusFlags.NoError;
+		statusInformation = new List<string>();
+
+		var cn = ((X509Certificate2)certificate).GetCommonName();
+
+		foreach (var status in chain.ChainStatus) {
+			chainStatus |= status.Status;
+			statusInformation.Add($"{cn} : {status.StatusInformation}");
+		}
+
+		return chainStatus;
+	}
+
+	public static bool IsValidNodeCertificate(X509Certificate2 certificate, out string error) {
+		if (certificate.HasPrivateKey) {
+			error = null;
+			return true;
+		}
+
+		error = $"Node's certificate with thumbprint '{certificate.Thumbprint}' has no associated private key.";
+		return false;
+	}
+
+	public static bool IsValidIntermediateCertificate(X509Certificate2 certificate, out string error) {
+		if (certificate.SubjectName.Name != certificate.IssuerName.Name) {
+			error = null;
+			return true;
+		}
+
+		error = $"Certificate with thumbprint '{certificate.Thumbprint}' does not appear to be a valid intermediate certificate " +
+				$"since it is self-signed (subject = {certificate.SubjectName.Name}, issuer = {certificate.IssuerName.Name}).";
+		return false;
+	}
+
+	public static bool IsValidRootCertificate(X509Certificate2 certificate, out string error) {
+		if (certificate.SubjectName.Name == certificate.IssuerName.Name) {
+			error = null;
+			return true;
+		}
+
+		error =
+			$"Certificate with thumbprint '{certificate.Thumbprint}' does not appear to be a valid root certificate " +
+			$"since it is not self-signed (subject = {certificate.SubjectName.Name}, issuer = {certificate.IssuerName.Name}).";
+		return false;
+	}
+}
diff --git a/src/KurrentDB.Core/Certificates/DevCertificateProvider.cs b/src/KurrentDB.Core/Certificates/DevCertificateProvider.cs
new file mode 100644
index 00000000000..335a6e63200
--- /dev/null
+++ b/src/KurrentDB.Core/Certificates/DevCertificateProvider.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Cryptography.X509Certificates;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.Certificates;
+
+public class DevCertificateProvider : CertificateProvider {
+	public DevCertificateProvider(X509Certificate2 certificate) {
+		Certificate = certificate;
+		TrustedRootCerts = new X509Certificate2Collection(certificate);
+	}
+	public override LoadCertificateResult LoadCertificates(ClusterVNodeOptions options) {
+		return LoadCertificateResult.Skipped;
+	}
+
+	public override string GetReservedNodeCommonName() {
+		return Certificate.GetCommonName();
+	}
+}
diff --git a/src/KurrentDB.Core/Certificates/OptionsCertificateProvider.cs b/src/KurrentDB.Core/Certificates/OptionsCertificateProvider.cs
new file mode 100644
index 00000000000..43dab522394
--- /dev/null
+++ b/src/KurrentDB.Core/Certificates/OptionsCertificateProvider.cs
@@ -0,0 +1,154 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Runtime;
+using System.Security.Cryptography.X509Certificates;
+using KurrentDB.Common.Utils;
+using Serilog;
+
+namespace KurrentDB.Core.Certificates;
+
+public class OptionsCertificateProvider : CertificateProvider {
+	private static readonly ILogger Log = Serilog.Log.ForContext<ClusterVNode>();
+	private string _cachedReservedNodeCN;
+
+	public override LoadCertificateResult LoadCertificates(ClusterVNodeOptions options) {
+		if (options.Application.Insecure) {
+			Log.Information("Skipping reload of certificates since TLS is disabled.");
+			return LoadCertificateResult.Skipped;
+		}
+
+		var (certificate, intermediates) = options.LoadNodeCertificate();
+
+		string reservedNodeCN;
+		var reservedNodeCNOption = nameof(options.Certificate.CertificateReservedNodeCommonName);
+
+		if (options.Certificate.CertificateReservedNodeCommonName.IsNotEmptyString()) {
+			reservedNodeCN = options.Certificate.CertificateReservedNodeCommonName;
+			if (!certificate.ClientCertificateMatchesName(reservedNodeCN)) {
+				var certificateCN = certificate.GetCommonName();
+				Log.Error(
+					"Certificate CN: {certificateCN} does not match with the {reservedNodeCNOption} configuration setting: {reservedNodeCN}",
+					certificateCN, reservedNodeCNOption, reservedNodeCN);
+				return LoadCertificateResult.VerificationFailed;
+			}
+			Log.Information("{reservedNodeCNOption} configured to: {reservedNodeCN}",
+				reservedNodeCNOption, reservedNodeCN);
+		} else {
+			reservedNodeCN = certificate.GetCommonName();
+			Log.Information("{reservedNodeCNOption} auto-configured to: {reservedNodeCN} based on certificate",
+				reservedNodeCNOption, reservedNodeCN);
+		}
+
+		var previousThumbprint = Certificate?.Thumbprint;
+		var newThumbprint = certificate.Thumbprint;
+		Log.Information("Loading the node's certificate. Subject: {subject}, Previous thumbprint: {previousThumbprint}, New thumbprint: {newThumbprint}",
+			certificate.SubjectName.Name, previousThumbprint, newThumbprint);
+
+		if (intermediates != null) {
+			foreach (var intermediateCert in intermediates) {
+				Log.Information("Loading intermediate certificate. Subject: {subject}, Thumbprint: {thumbprint}", intermediateCert.SubjectName.Name, intermediateCert.Thumbprint);
+			}
+		}
+
+		var trustedRootCerts = options.LoadTrustedRootCertificates();
+
+		foreach (var trustedRootCert in trustedRootCerts) {
+			Log.Information("Loading trusted root certificate. Subject: {subject}, Thumbprint: {thumbprint}", trustedRootCert.SubjectName.Name, trustedRootCert.Thumbprint);
+		}
+
+		if (!VerifyCertificates(certificate, intermediates, trustedRootCerts)) {
+			return LoadCertificateResult.VerificationFailed;
+		}
+
+		// no need for a lock here since reference assignment is atomic. however, other threads may not immediately
+		// see the changes and the order in which they see the changes is also not guaranteed as we don't have any
+		// memory barriers here. this is not a problem as in the worst case, it will cause the certificate verifications
+		// to fail when establishing/receiving a connection and the next connection retries will succeed.
+		Certificate = certificate;
+		IntermediateCerts = intermediates;
+		TrustedRootCerts = trustedRootCerts;
+		_cachedReservedNodeCN = reservedNodeCN;
+
+		Log.Information("All certificates successfully loaded.");
+		return LoadCertificateResult.Success;
+	}
+
+	public override string GetReservedNodeCommonName() {
+		return _cachedReservedNodeCN ?? throw new InvalidOperationException("Certificates are not loaded.");
+	}
+
+	private static bool VerifyCertificates(X509Certificate2 nodeCertificate, X509Certificate2Collection intermediates, X509Certificate2Collection trustedRoots) {
+		bool error = false;
+
+		if (!CertificateUtils.IsValidNodeCertificate(nodeCertificate, out var errorMsg)) {
+			Log.Error(errorMsg);
+			error = true;
+		}
+
+		if (intermediates != null) {
+			foreach (var cert in intermediates) {
+				if (!CertificateUtils.IsValidIntermediateCertificate(cert, out errorMsg)) {
+					Log.Error($"{errorMsg} Please bundle only intermediate certificates (if any) and not root certificates with the node's certificate.");
+					error = true;
+				}
+			}
+		}
+
+		if (trustedRoots != null && trustedRoots.Count > 0) {
+			foreach (var cert in trustedRoots) {
+				if (!CertificateUtils.IsValidRootCertificate(cert, out errorMsg)) {
+					Log.Error($"{errorMsg} If you have intermediate certificates, please bundle them with the node's certificate (in PEM or PKCS #12 format).");
+					error = true;
+				}
+			}
+		} else {
+			Log.Error("No trusted root certificates loaded");
+			error = true;
+		}
+
+		if (error)
+			return false;
+
+		var chainStatus = CertificateUtils.BuildChain(nodeCertificate, intermediates, trustedRoots, out var chainStatusInformation);
+
+		if (chainStatus != X509ChainStatusFlags.NoError) {
+			Log.Error(
+				"Failed to build the certificate chain with the node's own certificate up to the root. " +
+				"If you have intermediate certificates, please bundle them with the node's certificate (in PEM or PKCS #12 format). Errors:-");
+			foreach (var status in chainStatusInformation) {
+				Log.Error(status);
+			}
+
+			error = true;
+		}
+
+		if (!error && intermediates != null) {
+			chainStatus = CertificateUtils.BuildChain(nodeCertificate, null, trustedRoots, out chainStatusInformation);
+
+			// Adding the intermediate certificates to the store is required so that
+			// i)  the full certificate chain (excluding the root) is sent from client to server (on both Windows/Linux)
+			//     and from server to client (on Windows only) during the TLS connection establishment
+			// ii) to prevent AIA certificate downloads
+			//
+			// see: https://github.com/dotnet/runtime/issues/47680#issuecomment-771093045
+			// and https://github.com/dotnet/runtime/issues/59979
+
+			if (chainStatus != X509ChainStatusFlags.NoError) {
+				Log.Warning(
+					"For correct functioning and optimal performance, please add your intermediate certificates to the current user's " +
+						(RuntimeInformation.IsWindows ?
+						"'Intermediate Certification Authorities' certificate store." :
+						"'CertificateAuthority' certificate store using the dotnet-certificate-tool.")
+				);
+			}
+		}
+
+		if (!error) {
+			Log.Information("Certificate chain verification successful.");
+		}
+
+		return !error;
+	}
+}
diff --git a/src/KurrentDB.Core/Cluster/ClientClusterInfo.cs b/src/KurrentDB.Core/Cluster/ClientClusterInfo.cs
new file mode 100644
index 00000000000..420f4971247
--- /dev/null
+++ b/src/KurrentDB.Core/Cluster/ClientClusterInfo.cs
@@ -0,0 +1,130 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+
+namespace KurrentDB.Core.Cluster;
+
+public class ClientClusterInfo {
+	public ClientMemberInfo[] Members { get; set; }
+	public string ServerIp { get; set; }
+	public int ServerPort { get; set; }
+
+	public ClientClusterInfo() {
+	}
+
+	public ClientClusterInfo(ClusterInfo clusterInfo, string serverIp, int serverPort) {
+		Members = clusterInfo.Members.Select(x => new ClientMemberInfo(x)).ToArray();
+		ServerIp = serverIp;
+		ServerPort = serverPort;
+	}
+
+	public override string ToString() {
+		return string.Format("Server: {0}:{1}, Members: [{2}]",
+			ServerIp, ServerPort,
+			Members != null ? string.Join(",", Members.Select(m => m.ToString())) : "null");
+	}
+
+	public class ClientMemberInfo {
+		public Guid InstanceId { get; set; }
+
+		public DateTime TimeStamp { get; set; }
+		public VNodeState State { get; set; }
+		public bool IsAlive { get; set; }
+
+		public string InternalTcpIp { get; set; }
+		public int InternalTcpPort { get; set; }
+		public int InternalSecureTcpPort { get; set; }
+
+		public string ExternalTcpIp { get; set; }
+		public int ExternalTcpPort { get; set; }
+		public int ExternalSecureTcpPort { get; set; }
+
+		public string InternalHttpEndPointIp { get; set; }
+		public int InternalHttpEndPointPort { get; set; }
+
+		public string HttpEndPointIp { get; set; }
+		public int HttpEndPointPort { get; set; }
+
+		public long LastCommitPosition { get; set; }
+		public long WriterCheckpoint { get; set; }
+		public long ChaserCheckpoint { get; set; }
+
+		public long EpochPosition { get; set; }
+		public int EpochNumber { get; set; }
+		public Guid EpochId { get; set; }
+
+		public int NodePriority { get; set; }
+		public bool IsReadOnlyReplica { get; set; }
+
+		public string ESVersion { get; set; }
+
+		public ClientMemberInfo() {
+		}
+
+		public ClientMemberInfo(MemberInfo member) {
+			InstanceId = member.InstanceId;
+
+			TimeStamp = member.TimeStamp;
+			State = member.State;
+			IsAlive = member.IsAlive;
+
+			InternalTcpIp = member.InternalTcpEndPoint is null
+				? member.InternalSecureTcpEndPoint.GetHost()
+				: member.InternalTcpEndPoint.GetHost();
+			InternalSecureTcpPort = member.InternalSecureTcpEndPoint?.GetPort() ?? 0;
+			InternalTcpPort = member.InternalTcpEndPoint?.GetPort() ?? 0;
+
+			InternalHttpEndPointIp = member.HttpEndPoint.GetHost();
+			InternalHttpEndPointPort = member.HttpEndPoint.GetPort();
+
+			HttpEndPointIp = string.IsNullOrEmpty(member.AdvertiseHostToClientAs)
+				? member.HttpEndPoint.GetHost()
+				: member.AdvertiseHostToClientAs;
+			HttpEndPointPort = member.AdvertiseHttpPortToClientAs == 0
+				? member.HttpEndPoint.GetPort()
+				: member.AdvertiseHttpPortToClientAs;
+
+			ExternalTcpIp = string.IsNullOrEmpty(member.AdvertiseHostToClientAs)
+				? member.ExternalSecureTcpEndPoint?.GetHost() ??
+				  member.ExternalTcpEndPoint?.GetHost() ?? member.HttpEndPoint.GetHost()
+				: member.AdvertiseHostToClientAs;
+
+			ExternalTcpPort = member.AdvertiseTcpPortToClientAs == 0
+				? member.ExternalTcpEndPoint?.GetPort() ?? 0
+				: member.AdvertiseTcpPortToClientAs;
+			ExternalSecureTcpPort = member.AdvertiseTcpPortToClientAs == 0
+				? member.ExternalSecureTcpEndPoint?.GetPort() ?? 0
+				: member.AdvertiseTcpPortToClientAs;
+
+			LastCommitPosition = member.LastCommitPosition;
+			WriterCheckpoint = member.WriterCheckpoint;
+			ChaserCheckpoint = member.ChaserCheckpoint;
+
+			EpochPosition = member.EpochPosition;
+			EpochNumber = member.EpochNumber;
+			EpochId = member.EpochId;
+
+			NodePriority = member.NodePriority;
+			IsReadOnlyReplica = member.IsReadOnlyReplica;
+
+			ESVersion = member.ESVersion;
+		}
+
+		public override string ToString() {
+			return
+				$"InstanceId: {InstanceId:B}, TimeStamp: {TimeStamp:yyyy-MM-dd HH:mm:ss.fff}, State: {State}, IsAlive: {IsAlive}, " +
+				$"InternalTcpIp: {InternalTcpIp}, InternalTcpPort: {InternalTcpPort}, InternalSecureTcpPort: {InternalSecureTcpPort}, " +
+				$"ExternalTcpIp: {ExternalTcpIp}, ExternalTcpPort: {ExternalTcpPort}, ExternalSecureTcpPort: {ExternalSecureTcpPort}, " +
+				$"InternalHttpEndPointIp: {InternalHttpEndPointIp}, InternalHttpEndPointPort: {InternalHttpEndPointPort}, " +
+				$"HttpEndPointIp: {HttpEndPointIp}, HttpEndPointPort: {HttpEndPointPort}, " +
+				$"LastCommitPosition: {LastCommitPosition}, WriterCheckpoint: {WriterCheckpoint}, ChaserCheckpoint: {ChaserCheckpoint}, " +
+				$"EpochPosition: {EpochPosition}, EpochNumber: {EpochNumber}, EpochId: {EpochId:B}, NodePriority: {NodePriority}, " +
+				$"IsReadOnlyReplica: {IsReadOnlyReplica}, DBVersion: ${ESVersion}";
+		}
+	}
+}
+
diff --git a/src/KurrentDB.Core/Cluster/ClusterInfo.cs b/src/KurrentDB.Core/Cluster/ClusterInfo.cs
new file mode 100644
index 00000000000..3c0088a3236
--- /dev/null
+++ b/src/KurrentDB.Core/Cluster/ClusterInfo.cs
@@ -0,0 +1,119 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Transport.Grpc;
+
+namespace KurrentDB.Core.Cluster;
+
+public class ClusterInfo {
+	private static readonly EndPointComparer Comparer = new EndPointComparer();
+
+	public readonly MemberInfo[] Members;
+
+	public ClusterInfo(params MemberInfo[] members) : this((IEnumerable<MemberInfo>)members) {
+	}
+
+	public ClusterInfo(IEnumerable<MemberInfo> members) {
+		Members = members.Safe().OrderByDescending<MemberInfo, EndPoint>(x => x.HttpEndPoint, Comparer)
+			.ToArray();
+	}
+
+	public ClusterInfo(ClusterInfoDto dto) {
+		Members = dto.Members.Safe().Select(x => new MemberInfo(x))
+			.OrderByDescending<MemberInfo, EndPoint>(x => x.HttpEndPoint, Comparer).ToArray();
+	}
+
+	public override string ToString() {
+		return string.Join("\n", Members.Select(s => s.ToString()));
+	}
+
+	public bool HasChangedSince(ClusterInfo other) {
+		if (ReferenceEquals(null, other))
+			return true;
+		if (ReferenceEquals(this, other))
+			return false;
+
+		if (other.Members.Length != Members.Length)
+			return true;
+
+		for (int i = 0; i < Members.Length; i++) {
+			if (!Members[i].Equals(other.Members[i]))
+				return true;
+		}
+
+		return false;
+	}
+
+	internal static ClusterInfo FromGrpcClusterInfo(EventStore.Cluster.ClusterInfo grpcCluster, string clusterDns) {
+		var receivedMembers = Array.ConvertAll(grpcCluster.Members.ToArray(), x =>
+			new MemberInfo(
+				Uuid.FromDto(x.InstanceId).ToGuid(), x.TimeStamp.FromTicksSinceEpoch(), (VNodeState)x.State,
+				x.IsAlive,
+				!x.InternalTcpUsesTls ? new DnsEndPoint(x.InternalTcp.Address, (int)x.InternalTcp.Port).WithClusterDns(clusterDns) : null,
+				x.InternalTcpUsesTls ? new DnsEndPoint(x.InternalTcp.Address, (int)x.InternalTcp.Port).WithClusterDns(clusterDns) : null,
+				!x.ExternalTcpUsesTls && x.ExternalTcp != null
+					? new DnsEndPoint(x.ExternalTcp.Address, (int)x.ExternalTcp.Port).WithClusterDns(clusterDns)
+					: null,
+				x.ExternalTcpUsesTls && x.ExternalTcp != null
+					? new DnsEndPoint(x.ExternalTcp.Address, (int)x.ExternalTcp.Port).WithClusterDns(clusterDns)
+					: null,
+				new DnsEndPoint(x.HttpEndPoint.Address, (int)x.HttpEndPoint.Port).WithClusterDns(clusterDns),
+				x.AdvertiseHostToClientAs, (int)x.AdvertiseHttpPortToClientAs, (int)x.AdvertiseTcpPortToClientAs,
+				x.LastCommitPosition, x.WriterCheckpoint, x.ChaserCheckpoint,
+				x.EpochPosition, x.EpochNumber, Uuid.FromDto(x.EpochId).ToGuid(), x.NodePriority,
+				x.IsReadOnlyReplica, x.EsVersion == String.Empty ? null : x.EsVersion
+			)).ToArray();
+		return new ClusterInfo(receivedMembers);
+	}
+
+	internal static EventStore.Cluster.ClusterInfo ToGrpcClusterInfo(ClusterInfo cluster) {
+		var members = Array.ConvertAll(cluster.Members, x => new EventStore.Cluster.MemberInfo {
+			InstanceId = Uuid.FromGuid(x.InstanceId).ToDto(),
+			TimeStamp = x.TimeStamp.ToTicksSinceEpoch(),
+			State = (EventStore.Cluster.MemberInfo.Types.VNodeState)x.State,
+			IsAlive = x.IsAlive,
+			HttpEndPoint = new EventStore.Cluster.EndPoint(
+				x.HttpEndPoint.GetHost(),
+				(uint)x.HttpEndPoint.GetPort()),
+			InternalTcp = x.InternalSecureTcpEndPoint != null ?
+				new EventStore.Cluster.EndPoint(
+					x.InternalSecureTcpEndPoint.GetHost(),
+					(uint)x.InternalSecureTcpEndPoint.GetPort()) :
+				new EventStore.Cluster.EndPoint(
+				x.InternalTcpEndPoint.GetHost(),
+				(uint)x.InternalTcpEndPoint.GetPort()),
+			InternalTcpUsesTls = x.InternalSecureTcpEndPoint != null,
+			ExternalTcp = x.ExternalSecureTcpEndPoint != null ?
+				new EventStore.Cluster.EndPoint(
+					x.ExternalSecureTcpEndPoint.GetHost(),
+					(uint)x.ExternalSecureTcpEndPoint.GetPort()) :
+				x.ExternalTcpEndPoint != null ?
+				new EventStore.Cluster.EndPoint(
+				x.ExternalTcpEndPoint.GetHost(),
+				(uint)x.ExternalTcpEndPoint.GetPort()) : null,
+			ExternalTcpUsesTls = x.ExternalSecureTcpEndPoint != null,
+			LastCommitPosition = x.LastCommitPosition,
+			WriterCheckpoint = x.WriterCheckpoint,
+			ChaserCheckpoint = x.ChaserCheckpoint,
+			EpochPosition = x.EpochPosition,
+			EpochNumber = x.EpochNumber,
+			EpochId = Uuid.FromGuid(x.EpochId).ToDto(),
+			NodePriority = x.NodePriority,
+			IsReadOnlyReplica = x.IsReadOnlyReplica,
+			AdvertiseHostToClientAs = x.AdvertiseHostToClientAs ?? "",
+			AdvertiseHttpPortToClientAs = (uint)x.AdvertiseHttpPortToClientAs,
+			AdvertiseTcpPortToClientAs = (uint)x.AdvertiseTcpPortToClientAs,
+			EsVersion = x.ESVersion ?? String.Empty
+		}).ToArray();
+		var info = new EventStore.Cluster.ClusterInfo();
+		info.Members.AddRange(members);
+		return info;
+	}
+}
diff --git a/src/KurrentDB.Core/Cluster/EndPoint.cs b/src/KurrentDB.Core/Cluster/EndPoint.cs
new file mode 100644
index 00000000000..904f12e2654
--- /dev/null
+++ b/src/KurrentDB.Core/Cluster/EndPoint.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Cluster;
+
+public partial class EndPoint {
+	public EndPoint(string address, uint port) {
+		address_ = address;
+		port_ = port;
+	}
+}
diff --git a/src/KurrentDB.Core/Cluster/EventStoreClusterClient.Elections.cs b/src/KurrentDB.Core/Cluster/EventStoreClusterClient.Elections.cs
new file mode 100644
index 00000000000..71f8eab4578
--- /dev/null
+++ b/src/KurrentDB.Core/Cluster/EventStoreClusterClient.Elections.cs
@@ -0,0 +1,205 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.Cluster;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Transport.Grpc;
+using ClusterInfo = KurrentDB.Core.Cluster.ClusterInfo;
+using EndPoint = System.Net.EndPoint;
+using GossipEndPoint = EventStore.Cluster.EndPoint;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Cluster;
+
+public partial class EventStoreClusterClient {
+	public void SendViewChange(ElectionMessage.ViewChange msg, EndPoint destinationEndpoint, DateTime deadline) {
+		SendViewChangeAsync(msg.ServerId, msg.ServerHttpEndPoint, msg.AttemptedView, deadline).ContinueWith(r => {
+			if (r.Exception != null) {
+				Log.Information(r.Exception, "View Change Send Failed to {Server}", destinationEndpoint);
+			}
+		});
+	}
+
+	public void SendViewChangeProof(ElectionMessage.ViewChangeProof msg, EndPoint destinationEndpoint,
+		DateTime deadline) {
+		SendViewChangeProofAsync(msg.ServerId, msg.ServerHttpEndPoint, msg.InstalledView, deadline).ContinueWith(
+			r => {
+				if (r.Exception != null) {
+					Log.Information(r.Exception, "View Change Proof Send Failed to {Server}",
+						destinationEndpoint);
+				}
+			});
+	}
+
+	public void SendPrepare(ElectionMessage.Prepare msg, EndPoint destinationEndpoint, DateTime deadline) {
+		SendPrepareAsync(msg.ServerId, msg.ServerHttpEndPoint, msg.View, deadline).ContinueWith(r => {
+			if (r.Exception != null) {
+				Log.Information(r.Exception, "Prepare Send Failed to {Server}", destinationEndpoint);
+			}
+		});
+	}
+
+	public void SendPrepareOk(ElectionMessage.PrepareOk prepareOk, EndPoint destinationEndpoint,
+		DateTime deadline) {
+		SendPrepareOkAsync(prepareOk.View, prepareOk.ServerId, prepareOk.ServerHttpEndPoint, prepareOk.EpochNumber,
+				prepareOk.EpochPosition, prepareOk.EpochId, prepareOk.EpochLeaderInstanceId, prepareOk.LastCommitPosition,
+				prepareOk.WriterCheckpoint,
+				prepareOk.ChaserCheckpoint, prepareOk.NodePriority, prepareOk.ClusterInfo, deadline)
+			.ContinueWith(r => {
+				if (r.Exception != null) {
+					Log.Information(r.Exception, "Prepare OK Send Failed to {Server}",
+						destinationEndpoint);
+				}
+			});
+	}
+
+	public void SendProposal(ElectionMessage.Proposal proposal, EndPoint destinationEndpoint, DateTime deadline) {
+		SendProposalAsync(proposal.ServerId, proposal.ServerHttpEndPoint, proposal.LeaderId,
+				proposal.LeaderHttpEndPoint,
+				proposal.View, proposal.EpochNumber, proposal.EpochPosition, proposal.EpochId, proposal.EpochLeaderInstanceId,
+				proposal.LastCommitPosition, proposal.WriterCheckpoint, proposal.ChaserCheckpoint,
+				proposal.NodePriority,
+				deadline)
+			.ContinueWith(r => {
+				if (r.Exception != null) {
+					Log.Information(r.Exception, "Proposal Send Failed to {Server}",
+						destinationEndpoint);
+				}
+			});
+	}
+
+	public void SendAccept(ElectionMessage.Accept accept, EndPoint destinationEndpoint, DateTime deadline) {
+		SendAcceptAsync(accept.ServerId, accept.ServerHttpEndPoint, accept.LeaderId, accept.LeaderHttpEndPoint,
+				accept.View, deadline)
+			.ContinueWith(r => {
+				if (r.Exception != null) {
+					Log.Information(r.Exception, "Accept Send Failed to {Server}", destinationEndpoint);
+				}
+			});
+	}
+
+	public void SendLeaderIsResigning(ElectionMessage.LeaderIsResigning resigning, EndPoint destinationEndpoint,
+		DateTime deadline) {
+		SendLeaderIsResigningAsync(resigning.LeaderId, resigning.LeaderHttpEndPoint, deadline).ContinueWith(r => {
+			if (r.Exception != null) {
+				Log.Information(r.Exception, "Leader is Resigning Send Failed to {Server}", destinationEndpoint);
+			}
+		});
+	}
+
+	public void SendLeaderIsResigningOk(ElectionMessage.LeaderIsResigningOk resigningOk,
+		EndPoint destinationEndpoint, DateTime deadline) {
+		SendLeaderIsResigningOkAsync(resigningOk.LeaderId, resigningOk.LeaderHttpEndPoint,
+			resigningOk.ServerId, resigningOk.ServerHttpEndPoint, deadline).ContinueWith(r => {
+				if (r.Exception != null) {
+					Log.Information(r.Exception, "Leader is Resigning Ok Send Failed to {Server}", destinationEndpoint);
+				}
+			});
+	}
+
+	private async Task SendViewChangeAsync(Guid serverId, EndPoint serverHttpEndPoint, int attemptedView,
+		DateTime deadline) {
+		var request = new ViewChangeRequest {
+			ServerId = Uuid.FromGuid(serverId).ToDto(),
+			ServerHttp = new GossipEndPoint(serverHttpEndPoint.GetHost(), (uint)serverHttpEndPoint.GetPort()),
+			AttemptedView = attemptedView
+		};
+		await _electionsClient.ViewChangeAsync(request, deadline: deadline.ToUniversalTime());
+	}
+
+	private async Task SendViewChangeProofAsync(Guid serverId, EndPoint serverHttpEndPoint, int installedView,
+		DateTime deadline) {
+		var request = new ViewChangeProofRequest {
+			ServerId = Uuid.FromGuid(serverId).ToDto(),
+			ServerHttp = new GossipEndPoint(serverHttpEndPoint.GetHost(), (uint)serverHttpEndPoint.GetPort()),
+			InstalledView = installedView
+		};
+		await _electionsClient.ViewChangeProofAsync(request, deadline: deadline.ToUniversalTime());
+	}
+
+	private async Task SendPrepareAsync(Guid serverId, EndPoint serverHttpEndPoint, int view, DateTime deadline) {
+		var request = new PrepareRequest {
+			ServerId = Uuid.FromGuid(serverId).ToDto(),
+			ServerHttp = new GossipEndPoint(serverHttpEndPoint.GetHost(), (uint)serverHttpEndPoint.GetPort()),
+			View = view
+		};
+		await _electionsClient.PrepareAsync(request, deadline: deadline.ToUniversalTime());
+	}
+
+	private async Task SendPrepareOkAsync(int view, Guid serverId, EndPoint serverHttpEndPoint, int epochNumber,
+		long epochPosition, Guid epochId, Guid epochLeaderInstanceId, long lastCommitPosition, long writerCheckpoint, long chaserCheckpoint,
+		int nodePriority, ClusterInfo clusterInfo, DateTime deadline) {
+		var request = new PrepareOkRequest {
+			View = view,
+			ServerId = Uuid.FromGuid(serverId).ToDto(),
+			ServerHttp = new GossipEndPoint(serverHttpEndPoint.GetHost(), (uint)serverHttpEndPoint.GetPort()),
+			EpochNumber = epochNumber,
+			EpochPosition = epochPosition,
+			EpochId = Uuid.FromGuid(epochId).ToDto(),
+			EpochLeaderInstanceId = Uuid.FromGuid(epochLeaderInstanceId).ToDto(),
+			LastCommitPosition = lastCommitPosition,
+			WriterCheckpoint = writerCheckpoint,
+			ChaserCheckpoint = chaserCheckpoint,
+			NodePriority = nodePriority,
+			ClusterInfo = ClusterInfo.ToGrpcClusterInfo(clusterInfo)
+		};
+		await _electionsClient.PrepareOkAsync(request, deadline: deadline.ToUniversalTime());
+	}
+
+	private async Task SendProposalAsync(Guid serverId, EndPoint serverHttpEndPoint, Guid leaderId,
+		EndPoint leaderHttp, int view, int epochNumber, long epochPosition, Guid epochId, Guid epochLeaderInstanceId,
+		long lastCommitPosition, long writerCheckpoint, long chaserCheckpoint, int nodePriority,
+		DateTime deadline) {
+		var request = new ProposalRequest {
+			ServerId = Uuid.FromGuid(serverId).ToDto(),
+			ServerHttp = new GossipEndPoint(serverHttpEndPoint.GetHost(), (uint)serverHttpEndPoint.GetPort()),
+			LeaderId = Uuid.FromGuid(leaderId).ToDto(),
+			LeaderHttp = new GossipEndPoint(leaderHttp.GetHost(), (uint)leaderHttp.GetPort()),
+			View = view,
+			EpochNumber = epochNumber,
+			EpochPosition = epochPosition,
+			EpochId = Uuid.FromGuid(epochId).ToDto(),
+			EpochLeaderInstanceId = Uuid.FromGuid(epochLeaderInstanceId).ToDto(),
+			LastCommitPosition = lastCommitPosition,
+			WriterCheckpoint = writerCheckpoint,
+			ChaserCheckpoint = chaserCheckpoint,
+			NodePriority = nodePriority
+		};
+		await _electionsClient.ProposalAsync(request, deadline: deadline.ToUniversalTime());
+	}
+
+	private async Task SendAcceptAsync(Guid serverId, EndPoint serverHttpEndPoint, Guid leaderId,
+		EndPoint leaderHttp, int view, DateTime deadline) {
+		var request = new AcceptRequest {
+			ServerId = Uuid.FromGuid(serverId).ToDto(),
+			ServerHttp = new GossipEndPoint(serverHttpEndPoint.GetHost(), (uint)serverHttpEndPoint.GetPort()),
+			LeaderId = Uuid.FromGuid(leaderId).ToDto(),
+			LeaderHttp = new GossipEndPoint(leaderHttp.GetHost(), (uint)leaderHttp.GetPort()),
+			View = view
+		};
+		await _electionsClient.AcceptAsync(request);
+		_electionsClient.Accept(request, deadline: deadline.ToUniversalTime());
+	}
+
+	private async Task SendLeaderIsResigningAsync(Guid leaderId, EndPoint leaderHttp, DateTime deadline) {
+		var request = new LeaderIsResigningRequest {
+			LeaderId = Uuid.FromGuid(leaderId).ToDto(),
+			LeaderHttp = new GossipEndPoint(leaderHttp.GetHost(), (uint)leaderHttp.GetPort()),
+		};
+		await _electionsClient.LeaderIsResigningAsync(request, deadline: deadline.ToUniversalTime());
+	}
+
+	private async Task SendLeaderIsResigningOkAsync(Guid leaderId, EndPoint leaderHttp,
+		Guid serverId, EndPoint serverHttpEndPoint, DateTime deadline) {
+		var request = new LeaderIsResigningOkRequest {
+			LeaderId = Uuid.FromGuid(leaderId).ToDto(),
+			LeaderHttp = new GossipEndPoint(leaderHttp.GetHost(), (uint)leaderHttp.GetPort()),
+			ServerId = Uuid.FromGuid(serverId).ToDto(),
+			ServerHttp = new GossipEndPoint(serverHttpEndPoint.GetHost(), (uint)serverHttpEndPoint.GetPort()),
+		};
+		await _electionsClient.LeaderIsResigningOkAsync(request, deadline: deadline.ToUniversalTime());
+	}
+}
diff --git a/src/KurrentDB.Core/Cluster/EventStoreClusterClient.Gossip.cs b/src/KurrentDB.Core/Cluster/EventStoreClusterClient.Gossip.cs
new file mode 100644
index 00000000000..4c03223f496
--- /dev/null
+++ b/src/KurrentDB.Core/Cluster/EventStoreClusterClient.Gossip.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.Cluster;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using ClusterInfo = KurrentDB.Core.Cluster.ClusterInfo;
+using Empty = EventStore.Client.Empty;
+using EndPoint = System.Net.EndPoint;
+using GossipEndPoint = EventStore.Cluster.EndPoint;
+using ILogger = Serilog.ILogger;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Cluster;
+
+public partial class EventStoreClusterClient {
+	private static readonly ILogger Log = Serilog.Log.ForContext<EventStoreClusterClient>();
+
+	public void SendGossip(GossipMessage.SendGossip sendGossip, EndPoint destinationEndpoint, DateTime deadline) {
+		SendGossipAsync(sendGossip.ClusterInfo, sendGossip.ServerEndPoint, deadline).ContinueWith(
+			async response => {
+				try {
+					_bus.Publish(new GossipMessage.GossipReceived(new CallbackEnvelope(_ => { }),
+						await response, destinationEndpoint));
+				} catch (Exception ex) {
+					_bus.Publish(new GossipMessage.GossipSendFailed(ex.Message, destinationEndpoint));
+				}
+			});
+	}
+
+	public void GetGossip(EndPoint destinationEndpoint, DateTime deadline) {
+		GetGossipAsync(deadline).ContinueWith(async response => {
+			try {
+				_bus.Publish(new GossipMessage.GetGossipReceived(await response,
+					destinationEndpoint));
+			} catch (Exception ex) {
+				_bus.Publish(new GossipMessage.GetGossipFailed(ex.Message, destinationEndpoint));
+			}
+		});
+	}
+
+	private async Task<ClusterInfo> SendGossipAsync(ClusterInfo clusterInfo,
+		EndPoint server, DateTime deadline) {
+
+		using var duration = _gossipSendTracker.Start();
+		try {
+			var request = new GossipRequest {
+				Info = ClusterInfo.ToGrpcClusterInfo(clusterInfo),
+				Server = new GossipEndPoint(server.GetHost(), (uint)server.GetPort())
+			};
+			var clusterInfoDto = await _gossipClient.UpdateAsync(request, deadline: deadline.ToUniversalTime());
+			return ClusterInfo.FromGrpcClusterInfo(clusterInfoDto, _clusterDns);
+		} catch (Exception ex) {
+			duration.SetException(ex);
+			throw;
+		}
+	}
+
+	private async Task<ClusterInfo> GetGossipAsync(DateTime deadline) {
+		using var duration = _gossipGetTracker.Start();
+		try {
+			var clusterInfoDto = await _gossipClient.ReadAsync(new Empty(), deadline: deadline.ToUniversalTime());
+			return ClusterInfo.FromGrpcClusterInfo(clusterInfoDto, _clusterDns);
+		} catch (Exception ex) {
+			duration.SetException(ex);
+			throw;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Cluster/EventStoreClusterClient.cs b/src/KurrentDB.Core/Cluster/EventStoreClusterClient.cs
new file mode 100644
index 00000000000..9a83d1bc015
--- /dev/null
+++ b/src/KurrentDB.Core/Cluster/EventStoreClusterClient.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using EventStore.Cluster;
+using Grpc.Net.Client;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.Transport.Http.NodeHttpClientFactory;
+using Serilog.Extensions.Logging;
+using EndPoint = System.Net.EndPoint;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Cluster;
+
+
+public partial class EventStoreClusterClient : IDisposable {
+	private readonly Gossip.GossipClient _gossipClient;
+	private readonly Elections.ElectionsClient _electionsClient;
+
+	private readonly GrpcChannel _channel;
+	private readonly IPublisher _bus;
+	private readonly string _clusterDns;
+	private readonly IDurationTracker _gossipSendTracker;
+	private readonly IDurationTracker _gossipGetTracker;
+
+	public bool Disposed { get; private set; }
+
+	public EventStoreClusterClient(
+		IPublisher bus,
+		string uriScheme,
+		EndPoint nodeEndPoint,
+		INodeHttpClientFactory nodeHttpClientFactory,
+		string clusterDns,
+		IDurationTracker gossipSendTracker,
+		IDurationTracker gossipGetTracker) {
+
+		_clusterDns = clusterDns;
+
+		var httpClient = nodeHttpClientFactory.CreateHttpClient(nodeEndPoint.GetOtherNames());
+		httpClient.Timeout = Timeout.InfiniteTimeSpan;
+		httpClient.DefaultRequestVersion = new Version(2, 0);
+
+		var address = new UriBuilder(uriScheme, nodeEndPoint.GetHost(), nodeEndPoint.GetPort()).Uri;
+		_channel = GrpcChannel.ForAddress(address, new GrpcChannelOptions {
+			HttpClient = httpClient,
+			LoggerFactory = new SerilogLoggerFactory()
+		});
+		var callInvoker = _channel.CreateCallInvoker();
+		_gossipClient = new Gossip.GossipClient(callInvoker);
+		_electionsClient = new Elections.ElectionsClient(callInvoker);
+		_bus = bus;
+		_gossipSendTracker = gossipSendTracker;
+		_gossipGetTracker = gossipGetTracker;
+	}
+
+	public void Dispose() {
+		if (Disposed)
+			return;
+		_channel.Dispose();
+		Disposed = true;
+	}
+}
diff --git a/src/KurrentDB.Core/Cluster/EventStoreClusterClientCache.cs b/src/KurrentDB.Core/Cluster/EventStoreClusterClientCache.cs
new file mode 100644
index 00000000000..8d1727c1bf4
--- /dev/null
+++ b/src/KurrentDB.Core/Cluster/EventStoreClusterClientCache.cs
@@ -0,0 +1,70 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using EventStore.Core.Cluster;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using Microsoft.Extensions.Caching.Memory;
+
+namespace KurrentDB.Core.Cluster;
+
+public class EventStoreClusterClientCache :
+	IHandle<ClusterClientMessage.CleanCache>,
+	IHandle<SystemMessage.SystemInit> {
+	private readonly TimeSpan _cacheCleaningInterval = TimeSpan.FromMinutes(1);
+
+	//TODO: Align with Gossip Dead Member Removal Time once the options is in ClusterNodeOptions
+	private readonly TimeSpan _oldCacheItemThreshold = TimeSpan.FromMinutes(30);
+	private readonly IPublisher _bus;
+	private readonly Func<EndPoint, IPublisher, EventStoreClusterClient> _clientFactory;
+	private readonly IEnvelope _publishEnvelope;
+	private readonly MemoryCache _cache;
+
+	public EventStoreClusterClientCache(IPublisher bus,
+		Func<EndPoint, IPublisher, EventStoreClusterClient> clientFactory, TimeSpan? cacheCleaningInterval = null,
+		TimeSpan? oldCacheItemThreshold = null) {
+		_bus = bus ?? throw new ArgumentNullException(nameof(bus));
+		_clientFactory = clientFactory ?? throw new ArgumentNullException(nameof(clientFactory));
+
+		_cacheCleaningInterval = cacheCleaningInterval ?? _cacheCleaningInterval;
+		_oldCacheItemThreshold = oldCacheItemThreshold ?? _oldCacheItemThreshold;
+
+		_publishEnvelope = _bus;
+		_cache = new MemoryCache(new MemoryCacheOptions {
+			ExpirationScanFrequency = _oldCacheItemThreshold
+		});
+	}
+
+	private void Start() {
+		_bus.Publish(TimerMessage.Schedule.Create(_cacheCleaningInterval, _publishEnvelope,
+			new ClusterClientMessage.CleanCache()));
+	}
+
+	public EventStoreClusterClient Get(EndPoint endpoint) {
+		return _cache.GetOrCreate(endpoint, item => {
+			item.SlidingExpiration = _oldCacheItemThreshold;
+			item.RegisterPostEvictionCallback(callback: EvictionCallback);
+			return _clientFactory(endpoint, _bus);
+		});
+	}
+
+	private static void EvictionCallback(object key, object value, EvictionReason reason, object state) {
+		if (value is IDisposable disposable) {
+			disposable.Dispose();
+		}
+	}
+
+	public void Handle(ClusterClientMessage.CleanCache message) {
+		_cache.Compact(0);
+		_bus.Publish(TimerMessage.Schedule.Create(_cacheCleaningInterval, _publishEnvelope,
+			new ClusterClientMessage.CleanCache()));
+	}
+
+	public void Handle(SystemMessage.SystemInit message) {
+		Start();
+	}
+}
diff --git a/src/KurrentDB.Core/Cluster/MemberInfo.cs b/src/KurrentDB.Core/Cluster/MemberInfo.cs
new file mode 100644
index 00000000000..85a55bcced2
--- /dev/null
+++ b/src/KurrentDB.Core/Cluster/MemberInfo.cs
@@ -0,0 +1,279 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.Cluster;
+
+public class MemberInfo : IEquatable<MemberInfo> {
+	public readonly Guid InstanceId;
+
+	public readonly DateTime TimeStamp;
+	public readonly VNodeState State;
+	public readonly bool IsAlive;
+
+	public readonly EndPoint InternalTcpEndPoint;
+	public readonly EndPoint InternalSecureTcpEndPoint;
+	public readonly EndPoint ExternalTcpEndPoint;
+	public readonly EndPoint ExternalSecureTcpEndPoint;
+	public readonly EndPoint HttpEndPoint;
+	public readonly string AdvertiseHostToClientAs;
+	public readonly int AdvertiseHttpPortToClientAs;
+	public readonly int AdvertiseTcpPortToClientAs;
+
+	public readonly long LastCommitPosition;
+	public readonly long WriterCheckpoint;
+	public readonly long ChaserCheckpoint;
+	public readonly long EpochPosition;
+	public readonly int EpochNumber;
+	public readonly Guid EpochId;
+
+	public readonly int NodePriority;
+	public readonly bool IsReadOnlyReplica;
+
+	public readonly string ESVersion;
+
+	public static MemberInfo ForManager(Guid instanceId, DateTime timeStamp, bool isAlive,
+		EndPoint httpEndPoint, string esVersion = VersionInfo.UnknownVersion) {
+		return new MemberInfo(instanceId, timeStamp, VNodeState.Manager, isAlive,
+			httpEndPoint, null, httpEndPoint, null,
+			httpEndPoint, null, 0, 0,
+			-1, -1, -1, -1, -1, Guid.Empty, 0, false, esVersion);
+	}
+
+	public static MemberInfo ForVNode(Guid instanceId,
+		DateTime timeStamp,
+		VNodeState state,
+		bool isAlive,
+		EndPoint internalTcpEndPoint,
+		EndPoint internalSecureTcpEndPoint,
+		EndPoint externalTcpEndPoint,
+		EndPoint externalSecureTcpEndPoint,
+		EndPoint httpEndPoint,
+		string advertiseHostToClientAs,
+		int advertiseHttpPortToClientAs,
+		int advertiseTcpPortToClientAs,
+		long lastCommitPosition,
+		long writerCheckpoint,
+		long chaserCheckpoint,
+		long epochPosition,
+		int epochNumber,
+		Guid epochId,
+		int nodePriority,
+		bool isReadOnlyReplica, string esVersion = VersionInfo.UnknownVersion) {
+		if (state == VNodeState.Manager)
+			throw new ArgumentException(string.Format("Wrong State for VNode: {0}", state), "state");
+		return new MemberInfo(instanceId, timeStamp, state, isAlive,
+			internalTcpEndPoint, internalSecureTcpEndPoint,
+			externalTcpEndPoint, externalSecureTcpEndPoint,
+			httpEndPoint, advertiseHostToClientAs, advertiseHttpPortToClientAs, advertiseTcpPortToClientAs,
+			lastCommitPosition, writerCheckpoint, chaserCheckpoint,
+			epochPosition, epochNumber, epochId, nodePriority, isReadOnlyReplica, esVersion);
+	}
+
+	public static MemberInfo Initial(Guid instanceId,
+		DateTime timeStamp,
+		VNodeState state,
+		bool isAlive,
+		EndPoint internalTcpEndPoint,
+		EndPoint internalSecureTcpEndPoint,
+		EndPoint externalTcpEndPoint,
+		EndPoint externalSecureTcpEndPoint,
+		EndPoint httpEndPoint,
+		string advertiseHostToClientAs,
+		int advertiseHttpPortToClientAs,
+		int advertiseTcpPortToClientAs,
+		int nodePriority,
+		bool isReadOnlyReplica, string esVersion = VersionInfo.UnknownVersion) {
+		if (state == VNodeState.Manager)
+			throw new ArgumentException(string.Format("Wrong State for VNode: {0}", state), "state");
+		return new MemberInfo(instanceId, timeStamp, state, isAlive,
+			internalTcpEndPoint, internalSecureTcpEndPoint,
+			externalTcpEndPoint, externalSecureTcpEndPoint,
+			httpEndPoint, advertiseHostToClientAs, advertiseHttpPortToClientAs, advertiseTcpPortToClientAs,
+			-1, -1, -1, -1, -1, Guid.Empty, nodePriority, isReadOnlyReplica, esVersion);
+	}
+
+	internal MemberInfo(Guid instanceId, DateTime timeStamp, VNodeState state, bool isAlive,
+		EndPoint internalTcpEndPoint, EndPoint internalSecureTcpEndPoint,
+		EndPoint externalTcpEndPoint, EndPoint externalSecureTcpEndPoint,
+		EndPoint httpEndPoint, string advertiseHostToClientAs, int advertiseHttpPortToClientAs, int advertiseTcpPortToClientAs,
+		long lastCommitPosition, long writerCheckpoint, long chaserCheckpoint,
+		long epochPosition, int epochNumber, Guid epochId, int nodePriority, bool isReadOnlyReplica, string esVersion = null) {
+		Ensure.Equal(false, internalTcpEndPoint == null && internalSecureTcpEndPoint == null, "Both internal TCP endpoints are null");
+		Ensure.NotNull(httpEndPoint, nameof(httpEndPoint));
+
+		InstanceId = instanceId;
+
+		TimeStamp = timeStamp;
+		State = state;
+		IsAlive = isAlive;
+
+		InternalTcpEndPoint = internalTcpEndPoint;
+		InternalSecureTcpEndPoint = internalSecureTcpEndPoint;
+		ExternalTcpEndPoint = externalTcpEndPoint;
+		ExternalSecureTcpEndPoint = externalSecureTcpEndPoint;
+		HttpEndPoint = httpEndPoint;
+		AdvertiseHostToClientAs = advertiseHostToClientAs;
+		AdvertiseHttpPortToClientAs = advertiseHttpPortToClientAs;
+		AdvertiseTcpPortToClientAs = advertiseTcpPortToClientAs;
+
+		LastCommitPosition = lastCommitPosition;
+		WriterCheckpoint = writerCheckpoint;
+		ChaserCheckpoint = chaserCheckpoint;
+
+		EpochPosition = epochPosition;
+		EpochNumber = epochNumber;
+		EpochId = epochId;
+
+		NodePriority = nodePriority;
+		IsReadOnlyReplica = isReadOnlyReplica;
+
+		ESVersion = esVersion;
+	}
+
+	internal MemberInfo(MemberInfoDto dto) {
+		InstanceId = dto.InstanceId;
+		TimeStamp = dto.TimeStamp;
+		State = dto.State;
+		IsAlive = dto.IsAlive;
+		InternalTcpEndPoint = new DnsEndPoint(dto.InternalTcpIp, dto.InternalTcpPort);
+		InternalSecureTcpEndPoint = dto.InternalSecureTcpPort > 0
+			? new DnsEndPoint(dto.InternalTcpIp, dto.InternalSecureTcpPort)
+			: null;
+		ExternalTcpEndPoint = dto.ExternalTcpIp != null ? new DnsEndPoint(dto.ExternalTcpIp, dto.ExternalTcpPort) : null;
+		ExternalSecureTcpEndPoint = dto.ExternalTcpIp != null && dto.ExternalSecureTcpPort > 0
+			? new DnsEndPoint(dto.ExternalTcpIp, dto.ExternalSecureTcpPort)
+			: null;
+		HttpEndPoint = new DnsEndPoint(dto.HttpEndPointIp, dto.HttpEndPointPort);
+		AdvertiseHostToClientAs = dto.AdvertiseHostToClientAs;
+		AdvertiseHttpPortToClientAs = dto.AdvertiseHttpPortToClientAs;
+		AdvertiseTcpPortToClientAs = dto.AdvertiseTcpPortToClientAs;
+		LastCommitPosition = dto.LastCommitPosition;
+		WriterCheckpoint = dto.WriterCheckpoint;
+		ChaserCheckpoint = dto.ChaserCheckpoint;
+		EpochPosition = dto.EpochPosition;
+		EpochNumber = dto.EpochNumber;
+		EpochId = dto.EpochId;
+		NodePriority = dto.NodePriority;
+		IsReadOnlyReplica = dto.IsReadOnlyReplica;
+	}
+
+	public bool Is(EndPoint endPoint) {
+		return endPoint != null
+			   && HttpEndPoint.EndPointEquals(endPoint)
+				  || (InternalTcpEndPoint != null && InternalTcpEndPoint.EndPointEquals(endPoint))
+				  || (InternalSecureTcpEndPoint != null && InternalSecureTcpEndPoint.EndPointEquals(endPoint))
+				  || (ExternalTcpEndPoint != null && ExternalTcpEndPoint.EndPointEquals(endPoint))
+				  || (ExternalSecureTcpEndPoint != null && ExternalSecureTcpEndPoint.EndPointEquals(endPoint));
+	}
+
+	public MemberInfo Updated(DateTime utcNow,
+		VNodeState? state = null,
+		bool? isAlive = null,
+		long? lastCommitPosition = null,
+		long? writerCheckpoint = null,
+		long? chaserCheckpoint = null,
+		EpochRecord epoch = null,
+		int? nodePriority = null, string esVersion = null) {
+		return new MemberInfo(InstanceId,
+			utcNow,
+			state ?? State,
+			isAlive ?? IsAlive,
+			InternalTcpEndPoint,
+			InternalSecureTcpEndPoint,
+			ExternalTcpEndPoint,
+			ExternalSecureTcpEndPoint,
+			HttpEndPoint,
+			AdvertiseHostToClientAs,
+			AdvertiseHttpPortToClientAs,
+			AdvertiseTcpPortToClientAs,
+			lastCommitPosition ?? LastCommitPosition,
+			writerCheckpoint ?? WriterCheckpoint,
+			chaserCheckpoint ?? ChaserCheckpoint,
+			epoch != null ? epoch.EpochPosition : EpochPosition,
+			epoch != null ? epoch.EpochNumber : EpochNumber,
+			epoch != null ? epoch.EpochId : EpochId,
+			nodePriority ?? NodePriority,
+			IsReadOnlyReplica, esVersion ?? ESVersion);
+	}
+
+	public override string ToString() {
+		if (State == VNodeState.Manager)
+			return
+				$"MAN {InstanceId:B} <{(IsAlive ? "LIVE" : "DEAD")}> [{State}, {HttpEndPoint}] | {TimeStamp:yyyy-MM-dd HH:mm:ss.fff}";
+		return
+			$"Priority: {NodePriority} VND {InstanceId:B} <{(IsAlive ? "LIVE" : "DEAD")}> [{State}, " +
+			$"{(InternalTcpEndPoint == null ? "n/a" : InternalTcpEndPoint.ToString())}, " +
+			$"{(InternalSecureTcpEndPoint == null ? "n/a" : InternalSecureTcpEndPoint.ToString())}, " +
+			$"{(ExternalTcpEndPoint == null ? "n/a" : ExternalTcpEndPoint.ToString())}, " +
+			$"{(ExternalSecureTcpEndPoint == null ? "n/a" : ExternalSecureTcpEndPoint.ToString())}, " +
+			$"{HttpEndPoint}, (ADVERTISED: HTTP:{AdvertiseHostToClientAs}:{AdvertiseHttpPortToClientAs}, TCP:{AdvertiseHostToClientAs}:{AdvertiseTcpPortToClientAs}), " +
+			$"Version: {ESVersion}] " +
+			$"{LastCommitPosition}/{WriterCheckpoint}/{ChaserCheckpoint}/E{EpochNumber}@{EpochPosition}:{EpochId:B} | {TimeStamp:yyyy-MM-dd HH:mm:ss.fff}";
+	}
+
+	public bool Equals(MemberInfo other) {
+		// we ignore timestamp and checkpoints for equality comparison
+		if (ReferenceEquals(null, other))
+			return false;
+		if (ReferenceEquals(this, other))
+			return true;
+		return other.InstanceId == InstanceId
+			   && other.State == State
+			   && other.IsAlive == IsAlive
+			   && Equals(other.InternalTcpEndPoint, InternalTcpEndPoint)
+			   && Equals(other.InternalSecureTcpEndPoint, InternalSecureTcpEndPoint)
+			   && Equals(other.ExternalTcpEndPoint, ExternalTcpEndPoint)
+			   && Equals(other.ExternalSecureTcpEndPoint, ExternalSecureTcpEndPoint)
+			   && Equals(other.HttpEndPoint, HttpEndPoint)
+			   && other.AdvertiseHostToClientAs == AdvertiseHostToClientAs
+			   && other.AdvertiseHttpPortToClientAs == AdvertiseHttpPortToClientAs
+			   && other.AdvertiseTcpPortToClientAs == AdvertiseTcpPortToClientAs
+			   && other.EpochPosition == EpochPosition
+			   && other.EpochNumber == EpochNumber
+			   && other.EpochId == EpochId
+			   && other.NodePriority == NodePriority
+			   && other.IsReadOnlyReplica == IsReadOnlyReplica
+			   && other.ESVersion == ESVersion;
+	}
+
+	public override bool Equals(object obj) {
+		if (ReferenceEquals(null, obj))
+			return false;
+		if (ReferenceEquals(this, obj))
+			return true;
+		if (obj.GetType() != typeof(MemberInfo))
+			return false;
+		return Equals((MemberInfo)obj);
+	}
+
+	public override int GetHashCode() {
+		unchecked {
+			int result = InstanceId.GetHashCode();
+			result = (result * 397) ^ State.GetHashCode();
+			result = (result * 397) ^ IsAlive.GetHashCode();
+			result = (result * 397) ^ (InternalTcpEndPoint != null ? InternalTcpEndPoint.GetHashCode() : 0);
+			result = (result * 397) ^
+					 (InternalSecureTcpEndPoint != null ? InternalSecureTcpEndPoint.GetHashCode() : 0);
+			result = (result * 397) ^ (ExternalTcpEndPoint != null ? ExternalTcpEndPoint.GetHashCode() : 0);
+			result = (result * 397) ^
+					 (ExternalSecureTcpEndPoint != null ? ExternalSecureTcpEndPoint.GetHashCode() : 0);
+			result = (result * 397) ^ HttpEndPoint.GetHashCode();
+			result = (result * 397) ^ (AdvertiseHostToClientAs != null ? AdvertiseHostToClientAs.GetHashCode() : 0);
+			result = (result * 397) ^ AdvertiseHttpPortToClientAs.GetHashCode();
+			result = (result * 397) ^ AdvertiseTcpPortToClientAs.GetHashCode();
+			result = (result * 397) ^ EpochPosition.GetHashCode();
+			result = (result * 397) ^ EpochNumber.GetHashCode();
+			result = (result * 397) ^ EpochId.GetHashCode();
+			result = (result * 397) ^ NodePriority;
+			result = (result * 397) ^ (ESVersion != null ? ESVersion.GetHashCode() : 0);
+			return result;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Cluster/ReplicationPartials.cs b/src/KurrentDB.Core/Cluster/ReplicationPartials.cs
new file mode 100644
index 00000000000..b11341d0c6a
--- /dev/null
+++ b/src/KurrentDB.Core/Cluster/ReplicationPartials.cs
@@ -0,0 +1,162 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using Google.Protobuf;
+using KurrentDB.Common.Utils;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Cluster;
+
+partial class ReplicaLogWrite {
+	public ReplicaLogWrite(long logPosition, byte[] replicaId) {
+		LogPosition = logPosition;
+		ReplicaId = ByteString.CopyFrom(replicaId);
+	}
+}
+partial class ReplicatedTo {
+	public ReplicatedTo(long logPosition) {
+		LogPosition = logPosition;
+	}
+}
+
+partial class Epoch {
+	public Epoch(long epochPosition, int epochNumber, byte[] epochId) {
+		EpochPosition = epochPosition;
+		EpochNumber = epochNumber;
+		EpochId = ByteString.CopyFrom(epochId);
+	}
+}
+partial class SubscribeReplica {
+	public SubscribeReplica(long logPosition, byte[] chunkId, Epoch[] lastEpochs, byte[] ip, int port,
+		byte[] leaderId, byte[] subscriptionId, bool isPromotable, int version) {
+		LogPosition = logPosition;
+		ChunkId = ByteString.CopyFrom(chunkId);
+		LastEpochs.AddRange(lastEpochs);
+
+		Ip = ByteString.CopyFrom(ip);
+		Port = port;
+		LeaderId = ByteString.CopyFrom(leaderId);
+		SubscriptionId = ByteString.CopyFrom(subscriptionId);
+		IsPromotable = isPromotable;
+		Version = version;
+	}
+}
+
+partial class ReplicaSubscriptionRetry {
+	public ReplicaSubscriptionRetry(byte[] leaderId, byte[] subscriptionId) {
+		Ensure.NotNull(leaderId, "leaderId");
+		Ensure.NotNull(subscriptionId, "subscriptionId");
+
+		LeaderId = ByteString.CopyFrom(leaderId);
+		SubscriptionId = ByteString.CopyFrom(subscriptionId);
+	}
+}
+partial class ReplicaSubscribed {
+	public ReplicaSubscribed(byte[] leaderId, byte[] subscriptionId, long subscriptionPosition) {
+		Ensure.NotNull(leaderId, "leaderId");
+		Ensure.NotNull(subscriptionId, "subscriptionId");
+		Ensure.Nonnegative(subscriptionPosition, "subscriptionPosition");
+
+		LeaderId = ByteString.CopyFrom(leaderId);
+		SubscriptionId = ByteString.CopyFrom(subscriptionId);
+		SubscriptionPosition = subscriptionPosition;
+	}
+}
+
+partial class ReplicaLogPositionAck {
+	public ReplicaLogPositionAck(
+		byte[] subscriptionId,
+		long replicationLogPosition,
+		long writerLogPosition) {
+
+		SubscriptionId = ByteString.CopyFrom(subscriptionId);
+		ReplicationLogPosition = replicationLogPosition;
+		WriterLogPosition = writerLogPosition;
+	}
+}
+
+partial class CreateChunk {
+	public CreateChunk(byte[] leaderId, byte[] subscriptionId, byte[] chunkHeaderBytes, int fileSize,
+		bool isScavengedChunk, ReadOnlySpan<byte> transformHeaderBytes) {
+		Ensure.NotNull(leaderId, "leaderId");
+		Ensure.NotNull(subscriptionId, "subscriptionId");
+		Ensure.NotNull(chunkHeaderBytes, "chunkHeaderBytes");
+
+		LeaderId = ByteString.CopyFrom(leaderId);
+		SubscriptionId = ByteString.CopyFrom(subscriptionId);
+		ChunkHeaderBytes = ByteString.CopyFrom(chunkHeaderBytes);
+		FileSize = fileSize;
+		IsScavengedChunk = isScavengedChunk;
+		TransformHeaderBytes = ByteString.CopyFrom(transformHeaderBytes);
+	}
+}
+
+partial class RawChunkBulk {
+	public RawChunkBulk(byte[] leaderId,
+		byte[] subscriptionId,
+		int chunkStartNumber,
+		int chunkEndNumber,
+		int rawPosition,
+		byte[] rawBytes,
+		bool completeChunk) {
+		Ensure.NotNull(leaderId, "leaderId");
+		Ensure.NotNull(subscriptionId, "subscriptionId");
+		Ensure.NotNull(rawBytes, "rawBytes");
+		Ensure.Positive(rawBytes.Length, "rawBytes.Length"); // we should never send empty array, NEVER
+
+		LeaderId = ByteString.CopyFrom(leaderId);
+		;
+		SubscriptionId = ByteString.CopyFrom(subscriptionId);
+		ChunkStartNumber = chunkStartNumber;
+		ChunkEndNumber = chunkEndNumber;
+		RawPosition = rawPosition;
+		RawBytes = ByteString.CopyFrom(rawBytes);
+		CompleteChunk = completeChunk;
+	}
+}
+partial class DataChunkBulk {
+
+	public DataChunkBulk(byte[] leaderId,
+		byte[] subscriptionId,
+		int chunkStartNumber,
+		int chunkEndNumber,
+		long subscriptionPosition,
+		byte[] dataBytes,
+		bool completeChunk) {
+		Ensure.NotNull(leaderId, "leaderId");
+		Ensure.NotNull(subscriptionId, "subscriptionId");
+		Ensure.NotNull(dataBytes, "rawBytes");
+		Ensure.Nonnegative(dataBytes.Length,
+			"dataBytes.Length"); // we CAN send empty dataBytes array here, unlike as with completed chunks
+
+		LeaderId = ByteString.CopyFrom(leaderId);
+		SubscriptionId = ByteString.CopyFrom(subscriptionId);
+		ChunkStartNumber = chunkStartNumber;
+		ChunkEndNumber = chunkEndNumber;
+		SubscriptionPosition = subscriptionPosition;
+		DataBytes = ByteString.CopyFrom(dataBytes);
+		CompleteChunk = completeChunk;
+	}
+}
+
+partial class FollowerAssignment {
+	public FollowerAssignment(byte[] leaderId, byte[] subscriptionId) {
+		LeaderId = ByteString.CopyFrom(leaderId);
+		SubscriptionId = ByteString.CopyFrom(subscriptionId);
+	}
+}
+
+partial class CloneAssignment {
+	public CloneAssignment(byte[] leaderId, byte[] subscriptionId) {
+		LeaderId = ByteString.CopyFrom(leaderId);
+		SubscriptionId = ByteString.CopyFrom(subscriptionId);
+	}
+}
+
+partial class DropSubscription {
+	public DropSubscription(byte[] leaderId, byte[] subscriptionId) {
+		LeaderId = ByteString.CopyFrom(leaderId);
+		SubscriptionId = ByteString.CopyFrom(subscriptionId);
+	}
+}
diff --git a/src/KurrentDB.Core/Cluster/Settings/ClusterConsts.cs b/src/KurrentDB.Core/Cluster/Settings/ClusterConsts.cs
new file mode 100644
index 00000000000..613d566a9d1
--- /dev/null
+++ b/src/KurrentDB.Core/Cluster/Settings/ClusterConsts.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Cluster.Settings;
+
+public static class ClusterConsts {
+	public const int SubscriptionLastEpochCount = 20;
+	public static readonly TimeSpan TruncationSyncTimeout = TimeSpan.FromSeconds(60);
+}
diff --git a/src/KurrentDB.Core/Cluster/Settings/ClusterVNodeAuthenticationType.cs b/src/KurrentDB.Core/Cluster/Settings/ClusterVNodeAuthenticationType.cs
new file mode 100644
index 00000000000..65820944622
--- /dev/null
+++ b/src/KurrentDB.Core/Cluster/Settings/ClusterVNodeAuthenticationType.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Cluster.Settings;
+
+public enum ClusterVNodeAuthenticationType {
+	Internal,
+	Ldaps
+}
diff --git a/src/KurrentDB.Core/ClusterNodeMutex.cs b/src/KurrentDB.Core/ClusterNodeMutex.cs
new file mode 100644
index 00000000000..d1d650c3c0a
--- /dev/null
+++ b/src/KurrentDB.Core/ClusterNodeMutex.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core;
+
+public class ClusterNodeMutex {
+	private static readonly ILogger Log = Serilog.Log.ForContext<ClusterNodeMutex>();
+
+	public readonly string MutexName;
+
+	public bool IsAcquired {
+		get { return _acquired; }
+	}
+
+	private Mutex _clusterNodeMutex;
+	private bool _acquired;
+
+	public ClusterNodeMutex() {
+		MutexName = string.Format("ESCLUSTERNODE:{0}", Process.GetCurrentProcess().Id);
+	}
+
+	public bool Acquire() {
+		if (_acquired)
+			throw new InvalidOperationException(string.Format("Cluster Node mutex '{0}' is already acquired.",
+				MutexName));
+
+		try {
+			_clusterNodeMutex = new Mutex(initiallyOwned: true, name: MutexName, createdNew: out _acquired);
+		} catch (AbandonedMutexException exc) {
+			Log.Information(exc,
+				"Cluster Node mutex '{mutex}' is said to be abandoned. "
+				+ "Probably previous instance of server was terminated abruptly.",
+				MutexName);
+		}
+
+		return _acquired;
+	}
+
+	public void Release() {
+		if (!_acquired)
+			throw new InvalidOperationException(string.Format("Cluster Node mutex '{0}' was not acquired.",
+				MutexName));
+		_clusterNodeMutex.ReleaseMutex();
+	}
+
+	public static bool IsPresent(int pid) {
+		var mutexName = string.Format("ESCLUSTERNODE:{0}", pid);
+		try {
+			using (Mutex.OpenExisting(mutexName)) {
+				return true;
+			}
+		} catch (WaitHandleCannotBeOpenedException) {
+			return false;
+		} catch (Exception exc) {
+			Log.Debug(exc, "Exception while trying to open Cluster Node mutex '{mutex}': {e}.", mutexName,
+				exc.Message);
+		}
+
+		return false;
+	}
+}
diff --git a/src/EventStore.Core/ClusterVNode.cs b/src/KurrentDB.Core/ClusterVNode.cs
similarity index 80%
rename from src/EventStore.Core/ClusterVNode.cs
rename to src/KurrentDB.Core/ClusterVNode.cs
index e5c6caa8ce5..80d0ea4c2b5 100644
--- a/src/EventStore.Core/ClusterVNode.cs
+++ b/src/KurrentDB.Core/ClusterVNode.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -9,79 +12,92 @@
 using System.Runtime.InteropServices;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading;
-using EventStore.Common.Configuration;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.DataStructures;
-using EventStore.Core.Index;
-using EventStore.Core.Index.Hashes;
-using EventStore.Core.LogAbstraction;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services;
-using EventStore.Core.Services.Gossip;
-using EventStore.Core.Services.Monitoring;
-using EventStore.Core.Services.Replication;
-using EventStore.Core.Services.RequestManager;
-using EventStore.Core.Services.Storage;
-using EventStore.Core.Services.Storage.EpochManager;
-using EventStore.Core.Services.Storage.ReaderIndex;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Services.Transport.Http;
-using EventStore.Core.Services.Transport.Http.Authentication;
-using EventStore.Core.Services.Transport.Http.Controllers;
-using EventStore.Core.Services.Transport.Tcp;
-using EventStore.Core.Services.VNode;
-using EventStore.Core.Settings;
-using EventStore.Core.TransactionLog;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.TransactionLog.LogRecords;
-using EventStore.Core.TransactionLog.Scavenging;
-using EventStore.Core.TransactionLog.Scavenging.Sqlite;
-using EventStore.Core.Authentication;
-using EventStore.Core.Helpers;
-using EventStore.Core.Services.PersistentSubscription;
-using EventStore.Core.Services.PersistentSubscription.ConsumerStrategy;
 using System.Threading.Tasks;
-using EventStore.Common.Exceptions;
-using EventStore.Common.Log;
-using EventStore.Common.Options;
-using EventStore.Core.Authentication.DelegatedAuthentication;
-using EventStore.Core.Authentication.PassthroughAuthentication;
-using EventStore.Core.Authorization;
-using EventStore.Core.Caching;
-using EventStore.Core.Certificates;
 using EventStore.Core.Cluster;
-using EventStore.Core.Services.Storage.InMemory;
-using EventStore.Core.Services.PeriodicLogs;
-using EventStore.Core.Services.Transport.Http.NodeHttpClientFactory;
-using EventStore.Core.Synchronization;
-using EventStore.Core.Telemetry;
-using EventStore.Core.TransactionLog.Checkpoint;
-using EventStore.Core.TransactionLog.FileNamingStrategy;
-using EventStore.Core.Transforms;
-using EventStore.Core.Transforms.Identity;
-using EventStore.Core.Util;
 using EventStore.Plugins.Authentication;
 using EventStore.Plugins.Authorization;
 using EventStore.Plugins.Subsystems;
 using EventStore.Plugins.Transforms;
+using KurrentDB.Common.Configuration;
+using KurrentDB.Common.Exceptions;
+using KurrentDB.Common.Log;
+using KurrentDB.Common.Options;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Authentication;
+using KurrentDB.Core.Authentication.DelegatedAuthentication;
+using KurrentDB.Core.Authentication.PassthroughAuthentication;
+using KurrentDB.Core.Authorization;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Caching;
+using KurrentDB.Core.Certificates;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Configuration.Sources;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Resilience;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Archive;
+using KurrentDB.Core.Services.Archive.Naming;
+using KurrentDB.Core.Services.Archive.Storage;
+using KurrentDB.Core.Services.Gossip;
+using KurrentDB.Core.Services.Monitoring;
+using KurrentDB.Core.Services.PeriodicLogs;
+using KurrentDB.Core.Services.PersistentSubscription;
+using KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+using KurrentDB.Core.Services.Replication;
+using KurrentDB.Core.Services.RequestManager;
+using KurrentDB.Core.Services.Storage;
+using KurrentDB.Core.Services.Storage.EpochManager;
+using KurrentDB.Core.Services.Storage.InMemory;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Services.Transport.Http;
+using KurrentDB.Core.Services.Transport.Http.Authentication;
+using KurrentDB.Core.Services.Transport.Http.Controllers;
+using KurrentDB.Core.Services.Transport.Http.NodeHttpClientFactory;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.Core.Services.VNode;
+using KurrentDB.Core.Settings;
+using KurrentDB.Core.Synchronization;
+using KurrentDB.Core.Telemetry;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.FileNamingStrategy;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.TransactionLog.Scavenging;
+using KurrentDB.Core.TransactionLog.Scavenging.DbAccess;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+using KurrentDB.Core.TransactionLog.Scavenging.Stages;
+using KurrentDB.Core.Transforms;
+using KurrentDB.Core.Transforms.Identity;
+using KurrentDB.Core.Util;
+using KurrentDB.Licensing;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.Data.Sqlite;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using ILogger = Serilog.ILogger;
-using LogLevel = EventStore.Common.Options.LogLevel;
+using IODispatcherDelayedMessage = KurrentDB.Core.Helpers.IODispatcherDelayedMessage;
+using LogLevel = KurrentDB.Common.Options.LogLevel;
 using RuntimeInformation = System.Runtime.RuntimeInformation;
-using TimeoutControl = DotNext.Threading.Timeout;
-using EventStore.Core.Services.Archiver;
+using TelemetryMessage = KurrentDB.Core.Telemetry.TelemetryMessage;
 
-namespace EventStore.Core;
+namespace KurrentDB.Core;
 public abstract class ClusterVNode {
 	protected static readonly ILogger Log = Serilog.Log.ForContext<ClusterVNode>();
 
+	public static readonly TimeSpan ShutdownTimeout =
+		ClusterVNodeController.ShutdownTimeout + TimeSpan.FromSeconds(1);
+
 	public static ClusterVNode<TStreamId> Create<TStreamId>(
 		ClusterVNodeOptions options,
 		ILogFormatAbstractorFactory<TStreamId> logFormatAbstractorFactory,
@@ -110,7 +126,7 @@ public static ClusterVNode<TStreamId> Create<TStreamId>(
 	abstract public IPublisher MainQueue { get; }
 	abstract public ISubscriber MainBus { get; }
 	abstract public QueueStatsManager QueueStatsManager { get; }
-	abstract public IStartup Startup { get; }
+	abstract public IInternalStartup Startup { get; }
 	abstract public IAuthenticationProvider AuthenticationProvider { get; }
 	abstract public IHttpService HttpService { get; }
 	abstract public VNodeInfo NodeInfo { get; }
@@ -121,8 +137,7 @@ public static ClusterVNode<TStreamId> Create<TStreamId>(
 	abstract public bool EnableUnixSocket { get; }
 	abstract public bool IsShutdown { get; }
 
-	abstract public void Start();
-	abstract public Task<ClusterVNode> StartAsync(bool waitUntilRead);
+	abstract public Task<ClusterVNode> StartAsync(bool waitUntilReady, CancellationToken token);
 	abstract public Task StopAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default);
 }
 
@@ -132,7 +147,6 @@ public class ClusterVNode<TStreamId> :
 	IHandle<SystemMessage.BecomeShutdown>,
 	IHandle<SystemMessage.SystemStart>,
 	IHandle<ClientMessage.ReloadConfig> {
-	private static readonly TimeSpan DefaultShutdownTimeout = TimeSpan.FromSeconds(5);
 
 	private readonly ClusterVNodeOptions _options;
 
@@ -150,7 +164,7 @@ public override IHttpService HttpService {
 
 	public override QueueStatsManager QueueStatsManager => _queueStatsManager;
 
-	public override IStartup Startup => _startup;
+	public override IInternalStartup Startup => _startup;
 
 	public override IAuthenticationProvider AuthenticationProvider {
 		get { return _authenticationProvider; }
@@ -191,6 +205,7 @@ internal MultiQueuedHandler WorkersHandler {
 	private readonly CertificateDelegates.ServerCertificateValidator _externalServerCertificateValidator;
 	private readonly CertificateProvider _certificateProvider;
 	private readonly ClusterVNodeStartup<TStreamId> _startup;
+	private readonly Func<CancellationToken, ValueTask> _start;
 	private readonly INodeHttpClientFactory _nodeHttpClientFactory;
 	private readonly EventStoreClusterClientCache _eventStoreClusterClientCache;
 
@@ -228,12 +243,22 @@ public ClusterVNode(ClusterVNodeOptions options,
 
 		configuration ??= new ConfigurationBuilder().Build();
 
+		LogPluginSubsectionWarnings(configuration);
+
 		_certificateProvider = certificateProvider;
 
 		ClusterVNodeOptionsValidator.Validate(options);
 
 		ReloadLogOptions(options);
 
+		T GetOptions<T>(string subsection) where T : new() => configuration
+			.GetSection($"{KurrentConfigurationKeys.Prefix}:{subsection}")
+			.Get<T>() ?? new();
+
+		var experimentalOptions = GetOptions<ExperimentalOptions>("Experimental");
+		OptionsFormatter.LogConfig("Experimental", experimentalOptions);
+		ChunkFileHandle.AsynchronousByDefault = experimentalOptions.AsyncIO;
+
 		var isRunningInContainer = ContainerizedEnvironment.IsRunningInContainer();
 
 		instanceId ??= Guid.NewGuid();
@@ -255,9 +280,13 @@ public ClusterVNode(ClusterVNodeOptions options,
 		AddTask(_taskAddedTrigger.Task);
 #endif
 
+		var archiveOptions = GetOptions<ArchiveOptions>("Archive");
+		OptionsFormatter.LogConfig("Archive", archiveOptions);
+		archiveOptions.Validate();
+
 		var disableInternalTcpTls = options.Application.Insecure;
 		var disableExternalTcpTls = options.Application.Insecure;
-		var nodeTcpOptions = configuration.GetSection("EventStore:TcpPlugin").Get<NodeTcpOptions>() ?? new();
+		var nodeTcpOptions = GetOptions<NodeTcpOptions>("TcpPlugin");
 		var enableExternalTcp = nodeTcpOptions.EnableExternalTcp;
 
 		var httpEndPoint = new IPEndPoint(options.Interface.NodeIp, options.Interface.NodePort);
@@ -301,10 +330,37 @@ public ClusterVNode(ClusterVNodeOptions options,
 			out var workerThreadsCount);
 
 		var trackers = new Trackers();
-		var metricsConfiguration = MetricsConfiguration.Get((configuration));
+		var metricsConfiguration = MetricsConfiguration.Get(configuration);
 		MetricsBootstrapper.Bootstrap(metricsConfiguration, dbConfig, trackers);
 
-		Db = new TFChunkDb(dbConfig, tracker: trackers.TransactionFileTracker, transformManager: new DbTransformManager());
+		var namingStrategy = new VersionedPatternFileNamingStrategy(dbConfig.Path, "chunk-");
+		IChunkFileSystem fileSystem = new ChunkLocalFileSystem(namingStrategy);
+
+		// ARCHIVE
+		IArchiveStorageReader archiveReader = NoArchiveReader.Instance;
+		var locatorCodec = new PrefixingLocatorCodec();
+		if (archiveOptions.Enabled) {
+			archiveReader = new ResilientArchiveStorage(
+				ResiliencePipelines.RetrySlow,
+				ArchiveStorageFactory.Create(
+					options: archiveOptions,
+					namingStrategy: new ArchiveNamingStrategy(namingStrategy)));
+
+			fileSystem = new FileSystemWithArchive(
+				chunkSize: dbConfig.ChunkSize,
+				locatorCodec: locatorCodec,
+				localFileSystem: fileSystem,
+				archive: archiveReader);
+		}
+
+		Db = new TFChunkDb(
+			dbConfig,
+			tracker: trackers.TransactionFileTracker,
+			fileSystem: fileSystem,
+			transformManager: new DbTransformManager(),
+			onChunkSwitched: chunkInfo => {
+				_mainQueue.Publish(new SystemMessage.ChunkSwitched(chunkInfo));
+			});
 
 		TFChunkDbConfig CreateDbConfig(
 			out SystemStatsHelper statsHelper,
@@ -331,28 +387,29 @@ TFChunkDbConfig CreateDbConfig(
 				streamExistenceFilterChk = new InMemoryCheckpoint(Checkpoint.StreamExistenceFilter, initValue: -1);
 			} else {
 				try {
-					if (!Directory.Exists(dbPath)) // mono crashes without this check
-						Directory.CreateDirectory(dbPath);
+					Directory.CreateDirectory(dbPath);
+					// Ensure that we have write access to the dbPath
+					using var _ = File.Create(Path.Combine(dbPath, $"write-attempt-{Guid.NewGuid()}.tmp"),
+						bufferSize: 1, FileOptions.DeleteOnClose);
 				} catch (UnauthorizedAccessException) {
-					if (dbPath == Locations.DefaultDataDirectory) {
+					// Only use the fallback default directory if we are using a default directory
+					if (dbPath == Locations.DefaultDataDirectory || dbPath == Locations.LegacyDataDirectory) {
 						Log.Information(
-							"Access to path {dbPath} denied. The Event Store database will be created in {fallbackDefaultDataDirectory}",
+							"Access to path {dbPath} denied. The KurrentDB database will be created in {fallbackDefaultDataDirectory}",
 							dbPath, Locations.FallbackDefaultDataDirectory);
 						dbPath = Locations.FallbackDefaultDataDirectory;
 						Log.Information("Defaulting DB Path to {dbPath}", dbPath);
-
-						if (!Directory.Exists(dbPath)) // mono crashes without this check
-							Directory.CreateDirectory(dbPath);
+						Directory.CreateDirectory(dbPath);
 					} else {
 						throw;
 					}
 				}
 
 				var indexPath = options.Database.Index ?? Path.Combine(dbPath, ESConsts.DefaultIndexDirectoryName);
+				Log.Information("Index Path set to {indexPath}", indexPath);
+
 				var streamExistencePath = Path.Combine(indexPath, ESConsts.StreamExistenceFilterDirectoryName);
-				if (!Directory.Exists(streamExistencePath)) {
-					Directory.CreateDirectory(streamExistencePath);
-				}
+				Directory.CreateDirectory(streamExistencePath);
 
 				var writerCheckFilename = Path.Combine(dbPath, Checkpoint.Writer + ".chk");
 				var chaserCheckFilename = Path.Combine(dbPath, Checkpoint.Chaser + ".chk");
@@ -389,7 +446,7 @@ TFChunkDbConfig CreateDbConfig(
 			}
 
 			var cache = options.Database.CachedChunks >= 0
-				? options.Database.CachedChunks * (long)(TFConsts.ChunkSize + ChunkHeader.Size + ChunkFooter.Size)
+				? options.Database.CachedChunks * (long)(options.Database.ChunkSize + ChunkHeader.Size + ChunkFooter.Size)
 				: options.Database.ChunksCacheSize;
 
 			// Calculate automatic configuration changes
@@ -409,7 +466,6 @@ TFChunkDbConfig CreateDbConfig(
 					readerThreadsCount, isRunningInContainer);
 
 			return new TFChunkDbConfig(dbPath,
-				new VersionedPatternFileNamingStrategy(dbPath, "chunk-"),
 				options.Database.ChunkSize,
 				cache,
 				writerChk,
@@ -423,7 +479,6 @@ TFChunkDbConfig CreateDbConfig(
 				options.Database.MemDb,
 				unbuffered: false,
 				options.Database.WriteThrough,
-				options.Database.OptimizeIndexMerge,
 				options.Database.ReduceFileCachePressure,
 				options.Database.MaxTruncation);
 		}
@@ -502,6 +557,12 @@ void StartSubsystems() {
 		_mainQueue = _controller.MainQueue;
 		_mainBus = _controller.MainBus;
 
+		var shutdownService = new ShutdownService(_mainQueue, NodeInfo);
+		_mainBus.Subscribe<SystemMessage.RegisterForGracefulTermination>(shutdownService);
+		_mainBus.Subscribe<ClientMessage.RequestShutdown>(shutdownService);
+		_mainBus.Subscribe<SystemMessage.ComponentTerminated>(shutdownService);
+		_mainBus.Subscribe<SystemMessage.PeripheralShutdownTimeout>(shutdownService);
+
 		var uriScheme = options.Application.Insecure ? Uri.UriSchemeHttp : Uri.UriSchemeHttps;
 		var clusterDns = options.Cluster.DiscoverViaDns ? options.Cluster.ClusterDns : null;
 
@@ -567,8 +628,7 @@ void StartSubsystems() {
 			pTableMaxReaderCount,
 			() => new TFChunkReader(
 				Db,
-				Db.Config.WriterCheckpoint.AsReadOnly(),
-				optimizeReadSideCache: Db.Config.OptimizeReadSideCache));
+				Db.Config.WriterCheckpoint.AsReadOnly()));
 
 		var logFormat = logFormatAbstractorFactory.Create(new() {
 			InMemory = options.Database.MemDb,
@@ -675,8 +735,7 @@ void StartSubsystems() {
 
 		var partitionManager = logFormat.CreatePartitionManager(new TFChunkReader(
 				Db,
-				Db.Config.WriterCheckpoint.AsReadOnly(),
-				optimizeReadSideCache: Db.Config.OptimizeReadSideCache),
+				Db.Config.WriterCheckpoint.AsReadOnly()),
 			writer);
 
 		var epochManager = new EpochManager<TStreamId>(_mainQueue,
@@ -687,8 +746,7 @@ void StartSubsystems() {
 			maxReaderCount: 5,
 			readerFactory: () => new TFChunkReader(
 				Db,
-				Db.Config.WriterCheckpoint.AsReadOnly(),
-				optimizeReadSideCache: Db.Config.OptimizeReadSideCache),
+				Db.Config.WriterCheckpoint.AsReadOnly()),
 			logFormat.RecordFactory,
 			logFormat.StreamNameIndex,
 			logFormat.EventTypeIndex,
@@ -781,8 +839,7 @@ void StartSubsystems() {
 		var chaser = new TFChunkChaser(
 			Db,
 			Db.Config.WriterCheckpoint.AsReadOnly(),
-			Db.Config.ChaserCheckpoint,
-			Db.Config.OptimizeReadSideCache);
+			Db.Config.ChaserCheckpoint);
 
 		var storageChaser = new StorageChaser<TStreamId>(
 			_mainQueue,
@@ -872,11 +929,9 @@ GossipAdvertiseInfo GetGossipAdvertiseInfo() {
 				nodeTcpOptions?.NodeTcpPortAdvertiseAs ?? 0);
 		}
 
-		_httpService = new KestrelHttpService(ServiceAccessibility.Public, _mainQueue, new TrieUriRouter(),
-			_workersHandler, options.Application.LogHttpRequests,
+		_httpService = new KestrelHttpService(ServiceAccessibility.Public, _mainQueue, new TrieUriRouter(), options.Application.LogHttpRequests,
 			string.IsNullOrEmpty(GossipAdvertiseInfo.AdvertiseHostToClientAs) ? GossipAdvertiseInfo.AdvertiseExternalHostAs : GossipAdvertiseInfo.AdvertiseHostToClientAs,
 			GossipAdvertiseInfo.AdvertiseHttpPortToClientAs == 0 ? GossipAdvertiseInfo.AdvertiseHttpPortAs : GossipAdvertiseInfo.AdvertiseHttpPortToClientAs,
-			options.Auth.DisableFirstLevelHttpAuthorization,
 			NodeInfo.HttpEndPoint);
 
 		var components = new AuthenticationProviderFactoryComponents {
@@ -914,7 +969,13 @@ GossipAdvertiseInfo GetGossipAdvertiseInfo() {
 
 		var modifiedOptions = options
 			.WithPlugableComponent(_authorizationProvider)
-			.WithPlugableComponent(_authenticationProvider);
+			.WithPlugableComponent(_authenticationProvider)
+			.WithPlugableComponent(new ArchivePlugableComponent(options.Cluster.Archiver));
+
+		modifiedOptions = modifiedOptions.WithPlugableComponent(new LicensingPlugin(ex => {
+			Log.Warning("Shutting down due to licensing error: {Message}", ex.Message);
+			MainQueue.Publish(new ClientMessage.RequestShutdown(exitProcess: true, shutdownHttp: true));
+		}));
 
 		var authorizationGateway = new AuthorizationGateway(_authorizationProvider);
 		{
@@ -993,16 +1054,12 @@ GossipAdvertiseInfo GetGossipAdvertiseInfo() {
 		//default authentication provider
 		httpAuthenticationProviders.Add(new AnonymousHttpAuthenticationProvider());
 
-		if (options.Cluster.Archiver) {
-			modifiedOptions = modifiedOptions.WithPlugableComponent(new ArchiverService());
-		}
-
 		var adminController = new AdminController(_mainQueue, _workersHandler);
 		var pingController = new PingController();
 		var statController = new StatController(monitoringQueue, _workersHandler);
 		var metricsController = new MetricsController();
 		var atomController = new AtomController(_mainQueue, _workersHandler,
-			options.Application.DisableHttpCaching, TimeSpan.FromMilliseconds(options.Database.WriteTimeoutMs));
+			options.Application.DisableHttpCaching, options.Application.MaxAppendEventSize, TimeSpan.FromMilliseconds(options.Database.WriteTimeoutMs));
 		var gossipController = new GossipController(_mainQueue, _workersHandler,
 			trackers.GossipTrackers.ProcessingRequestFromHttpClient);
 		var persistentSubscriptionController =
@@ -1188,162 +1245,158 @@ GossipAdvertiseInfo GetGossipAdvertiseInfo() {
 		_mainBus.Subscribe<IODispatcherDelayedMessage>(scavengerDispatcher);
 		_mainBus.Subscribe<ClientMessage.NotHandled>(scavengerDispatcher);
 
-		var newScavenge = true;
-		if (newScavenge) {
-			// reuse the same buffer; it's quite big.
-			var calculatorBuffer = new Calculator<TStreamId>.Buffer(32_768);
-
-			scavengerFactory = new ScavengerFactory((message, scavengerLogger, logger) => {
-				// currently on the main queue
-				var throttle = new Throttle(
-					logger: logger,
-					minimumRest: TimeSpan.FromMilliseconds(1000),
-					restLoggingThreshold: TimeSpan.FromMilliseconds(10_000),
-					activePercent: message.ThrottlePercent ?? 100);
-
-				if (logFormat is not LogFormatAbstractor<string> logFormatV2)
-					throw new NotSupportedException("Scavenge is not yet supported on Log V3");
-
-				if (options.Database.MemDb)
-					throw new NotSupportedException("Scavenge is not supported on in-memory databases");
-
-				var cancellationCheckPeriod = 1024;
-
-				var longHasher = new CompositeHasher<TStreamId>(logFormat.LowHasher, logFormat.HighHasher);
-
-				// the backends (and therefore connections) are scoped to the run of the scavenge
-				// so that we don't keep hold of memory used for the page caches between scavenges
-				var backendPool = new ObjectPool<IScavengeStateBackend<TStreamId>>(
-					objectPoolName: "scavenge backend pool",
-					initialCount: 0, // so that factory is not called on the main queue
-					maxCount: TFChunkScavenger.MaxThreadCount + 1,
-					factory: () => {
-						// not on the main queue
-						var scavengeDirectory = Path.Combine(indexPath, "scavenging");
-						Directory.CreateDirectory(scavengeDirectory);
-						var dbPath = Path.Combine(scavengeDirectory, "scavenging.db");
-						var connectionStringBuilder = new SqliteConnectionStringBuilder {
-							DataSource = dbPath,
-							Pooling = false,
-						};
-						var connection = new SqliteConnection(connectionStringBuilder.ConnectionString);
-						connection.Open();
-						Log.Information("Opened scavenging database {scavengeDatabase} with version {version}",
-							dbPath, connection.ServerVersion);
-						var sqlite = new SqliteScavengeBackend<TStreamId>(
-							logger: logger,
-							pageSizeInBytes: options.Database.ScavengeBackendPageSize,
-							cacheSizeInBytes: options.Database.ScavengeBackendCacheSize);
-						sqlite.Initialize(connection);
-						return sqlite;
-					},
-					dispose: backend => backend.Dispose());
-
-				var state = new ScavengeState<TStreamId>(
-					logger,
-					longHasher,
-					logFormat.Metastreams,
-					backendPool,
-					options.Database.ScavengeHashUsersCacheCapacity);
-
-				var accumulator = new Accumulator<TStreamId>(
-					logger: logger,
-					chunkSize: TFConsts.ChunkSize,
-					metastreamLookup: logFormat.Metastreams,
-					chunkReader: new ChunkReaderForAccumulator<TStreamId>(
-						Db.Manager,
-						logFormat.Metastreams,
-						logFormat.StreamIdConverter,
-						Db.Config.ReplicationCheckpoint,
-						TFConsts.ChunkSize),
-					index: new IndexReaderForAccumulator<TStreamId>(readIndex),
-					cancellationCheckPeriod: cancellationCheckPeriod,
-					throttle: throttle);
-
-				var calculator = new Calculator<TStreamId>(
-					logger: logger,
-					new IndexReaderForCalculator<TStreamId>(
-						readIndex,
-						() => new TFReaderLease(readerPool),
-						state.LookupUniqueHashUser),
-					chunkSize: TFConsts.ChunkSize,
-					cancellationCheckPeriod: cancellationCheckPeriod,
-					buffer: calculatorBuffer,
-					throttle: throttle);
-
-				var chunkExecutor = new ChunkExecutor<TStreamId, ILogRecord>(
-					logger,
+		// reuse the same buffer; it's quite big.
+		var calculatorBuffer = new Calculator<TStreamId>.Buffer(32_768);
+
+		scavengerFactory = new ScavengerFactory((message, scavengerLogger, logger) => {
+			// currently on the main queue
+			var optionsCalculator = new ScavengeOptionsCalculator(options, archiveOptions, message);
+
+			var throttle = new Throttle(
+				logger: logger,
+				minimumRest: TimeSpan.FromMilliseconds(1000),
+				restLoggingThreshold: TimeSpan.FromMilliseconds(10_000),
+				activePercent: message.ThrottlePercent ?? 100);
+
+			if (logFormat is not LogFormatAbstractor<string> logFormatV2)
+				throw new NotSupportedException("Scavenge is not yet supported on Log V3");
+
+			if (options.Database.MemDb)
+				throw new NotSupportedException("Scavenge is not supported on in-memory databases");
+
+			var cancellationCheckPeriod = 1024;
+
+			var longHasher = new CompositeHasher<TStreamId>(logFormat.LowHasher, logFormat.HighHasher);
+
+			// the backends (and therefore connections) are scoped to the run of the scavenge
+			// so that we don't keep hold of memory used for the page caches between scavenges
+			var backendPool = new ObjectPool<IScavengeStateBackend<TStreamId>>(
+				objectPoolName: "scavenge backend pool",
+				initialCount: 0, // so that factory is not called on the main queue
+				maxCount: TFChunkScavenger.MaxThreadCount + 1,
+				factory: () => {
+					// not on the main queue
+					var scavengeDirectory = Path.Combine(indexPath, "scavenging");
+					Directory.CreateDirectory(scavengeDirectory);
+					var dbPath = Path.Combine(scavengeDirectory, "scavenging.db");
+					var connectionStringBuilder = new SqliteConnectionStringBuilder {
+						DataSource = dbPath,
+						Pooling = false,
+					};
+					var connection = new SqliteConnection(connectionStringBuilder.ConnectionString);
+					connection.Open();
+					Log.Information("Opened scavenging database {scavengeDatabase} with version {version}",
+						dbPath, connection.ServerVersion);
+					var sqlite = new SqliteScavengeBackend<TStreamId>(
+						logger: logger,
+						pageSizeInBytes: options.Database.ScavengeBackendPageSize,
+						cacheSizeInBytes: options.Database.ScavengeBackendCacheSize);
+					sqlite.Initialize(connection);
+					return sqlite;
+				},
+				dispose: backend => backend.Dispose());
+
+			var state = new ScavengeState<TStreamId>(
+				logger,
+				longHasher,
+				logFormat.Metastreams,
+				backendPool,
+				options.Database.ScavengeHashUsersCacheCapacity);
+
+			var accumulator = new Accumulator<TStreamId>(
+				logger: logger,
+				chunkSize: options.Database.ChunkSize,
+				metastreamLookup: logFormat.Metastreams,
+				chunkReader: new ChunkReaderForAccumulator<TStreamId>(
+					Db.Manager,
 					logFormat.Metastreams,
-					new ChunkManagerForExecutor<TStreamId>(logger, Db.Manager, Db.Config, Db.TransformManager),
-					chunkSize: Db.Config.ChunkSize,
-					unsafeIgnoreHardDeletes: options.Database.UnsafeIgnoreHardDelete,
-					cancellationCheckPeriod: cancellationCheckPeriod,
-					threads: message.Threads,
-					throttle: throttle);
-
-				var chunkMerger = new ChunkMerger(
-					logger: logger,
-					mergeChunks: !options.Database.DisableScavengeMerging,
-					backend: new OldScavengeChunkMergerBackend(logger, db: Db),
-					throttle: throttle);
-
-				var indexExecutor = new IndexExecutor<TStreamId>(
-					logger,
-					new IndexScavenger(tableIndex),
-					new ChunkReaderForIndexExecutor<TStreamId>(() => new TFReaderLease(readerPool)),
-					unsafeIgnoreHardDeletes: options.Database.UnsafeIgnoreHardDelete,
-					restPeriod: 32_768,
-					throttle: throttle);
-
-				var cleaner = new Cleaner(
-					logger: logger,
-					unsafeIgnoreHardDeletes: options.Database.UnsafeIgnoreHardDelete);
-
-				var scavengePointSource = new ScavengePointSource(logger, scavengerDispatcher);
-
-				return new Scavenger<TStreamId>(
+					logFormat.StreamIdConverter,
+					Db.Config.ReplicationCheckpoint.AsReadOnly(),
+					options.Database.ChunkSize),
+				index: new IndexReaderForAccumulator<TStreamId>(readIndex),
+				cancellationCheckPeriod: cancellationCheckPeriod,
+				throttle: throttle);
+
+			var calculator = new Calculator<TStreamId>(
+				logger: logger,
+				new IndexReaderForCalculator<TStreamId>(
+					readIndex,
+					() => new TFReaderLease(readerPool),
+					state.LookupUniqueHashUser),
+				chunkSize: options.Database.ChunkSize,
+				cancellationCheckPeriod: cancellationCheckPeriod,
+				buffer: calculatorBuffer,
+				throttle: throttle);
+
+			var chunkRemover = IChunkRemover<TStreamId, ILogRecord>.NoOp;
+			if (archiveOptions.Enabled) {
+				chunkRemover = new ChunkRemover<TStreamId, ILogRecord>(
 					logger: logger,
-					checkPreconditions: () => {
-						tableIndex.Visit(table => {
-							if (table.Version <= PTableVersions.IndexV1)
-								throw new NotSupportedException(
-									$"PTable {table.Filename} has version {table.Version}. Scavenge requires V2 index files and above. Please rebuild the indexes to upgrade them.");
-						});
-					},
-					state: state,
-					accumulator: accumulator,
-					calculator: calculator,
-					chunkExecutor: chunkExecutor,
-					chunkMerger: chunkMerger,
-					indexExecutor: indexExecutor,
-					cleaner: cleaner,
-					scavengePointSource: scavengePointSource,
-					scavengerLogger: scavengerLogger,
-					statusTracker: trackers.ScavengeStatusTracker,
-					// threshold < 0: execute all chunks, even those with no weight
-					// threshold = 0: execute all chunks with weight greater than 0
-					// threshold > 0: execute all chunks above a certain weight
-					thresholdForNewScavenge: message.Threshold ?? 0,
-					syncOnly: message.SyncOnly,
-					getThrottleStats: () => throttle.PrettyPrint());
-			});
+					archiveCheckpoint: new AdvancingCheckpoint(archiveReader.GetCheckpoint),
+					chunkManager: new ChunkManagerForChunkRemover(Db.Manager),
+					locatorCodec: locatorCodec,
+					retainPeriod: TimeSpan.FromDays(archiveOptions.RetainAtLeast.Days),
+					retainBytes: archiveOptions.RetainAtLeast.LogicalBytes);
+			}
 
-		} else {
-			scavengerFactory = new ScavengerFactory((message, scavengerLogger, logger) =>
-				new OldScavenger<TStreamId>(
-					alwaysKeepScaveged: options.Database.AlwaysKeepScavenged,
-					mergeChunks: !options.Database.DisableScavengeMerging,
-					startFromChunk: message.StartFromChunk,
-					tfChunkScavenger: new TFChunkScavenger<TStreamId>(
-						logger: logger,
-						db: Db,
-						scavengerLog: scavengerLogger,
-						tableIndex: tableIndex,
-						readIndex: readIndex,
-						metastreams: logFormat.SystemStreams,
-						unsafeIgnoreHardDeletes: options.Database.UnsafeIgnoreHardDelete,
-						threads: message.Threads)));
-		}
+			var chunkExecutor = new ChunkExecutor<TStreamId, ILogRecord>(
+				logger,
+				logFormat.Metastreams,
+				chunkRemover,
+				new ChunkManagerForExecutor<TStreamId>(logger, Db.Manager, Db.Config, Db.TransformManager),
+				chunkSize: Db.Config.ChunkSize,
+				unsafeIgnoreHardDeletes: options.Database.UnsafeIgnoreHardDelete,
+				cancellationCheckPeriod: cancellationCheckPeriod,
+				threads: message.Threads,
+				isArchiver: options.Cluster.Archiver,
+				throttle: throttle);
+
+			var chunkMerger = new ChunkMerger(
+				logger: logger,
+				mergeChunks: optionsCalculator.MergeChunks,
+				backend: new OldScavengeChunkMergerBackend(logger, db: Db),
+				throttle: throttle);
+
+			var indexExecutor = new IndexExecutor<TStreamId>(
+				logger,
+				new IndexScavenger(tableIndex),
+				new ChunkReaderForIndexExecutor<TStreamId>(() => new TFReaderLease(readerPool)),
+				unsafeIgnoreHardDeletes: options.Database.UnsafeIgnoreHardDelete,
+				restPeriod: 32_768,
+				throttle: throttle);
+
+			var cleaner = new Cleaner(
+				logger: logger,
+				unsafeIgnoreHardDeletes: options.Database.UnsafeIgnoreHardDelete);
+
+			var scavengePointSource = new ScavengePointSource(logger, scavengerDispatcher);
+
+			return new Scavenger<TStreamId>(
+				logger: logger,
+				checkPreconditions: () => {
+					tableIndex.Visit(table => {
+						if (table.Version <= PTableVersions.IndexV1)
+							throw new NotSupportedException(
+								$"PTable {table.Filename} has version {table.Version}. Scavenge requires V2 index files and above. Please rebuild the indexes to upgrade them.");
+					});
+				},
+				state: state,
+				accumulator: accumulator,
+				calculator: calculator,
+				chunkExecutor: chunkExecutor,
+				chunkMerger: chunkMerger,
+				indexExecutor: indexExecutor,
+				cleaner: cleaner,
+				scavengePointSource: scavengePointSource,
+				scavengerLogger: scavengerLogger,
+				statusTracker: trackers.ScavengeStatusTracker,
+				// threshold < 0: execute all chunks, even those with no weight
+				// threshold = 0: execute all chunks with weight greater than 0
+				// threshold > 0: execute all chunks above a certain weight
+				thresholdForNewScavenge: optionsCalculator.ChunkExecutionThreshold,
+				syncOnly: message.SyncOnly,
+				getThrottleStats: () => throttle.PrettyPrint());
+		});
 
 		var scavengerLogManager = new TFChunkScavengerLogManager(
 			nodeEndpoint: $"{GossipAdvertiseInfo.HttpEndPoint.Host}:{GossipAdvertiseInfo.HttpEndPoint.Port}",
@@ -1407,6 +1460,7 @@ GossipAdvertiseInfo GetGossipAdvertiseInfo() {
 		var telemetryService = new TelemetryService(
 			Db.Manager,
 			modifiedOptions,
+			configuration,
 			_mainQueue,
 			new TelemetrySink(options.Application.TelemetryOptout),
 			Db.Config.WriterCheckpoint.AsReadOnly(),
@@ -1472,50 +1526,48 @@ GossipAdvertiseInfo GetGossipAdvertiseInfo() {
 			electionsService.SubscribeMessages(_mainBus);
 		}
 
-		if (!isSingleNode || (options.Interface.GossipOnSingleNode ?? true)) {
-			// GOSSIP
-
-			var gossipSeedSource = (
-				options.Cluster.DiscoverViaDns,
-				options.Cluster.ClusterSize > 1,
-				options.Cluster.GossipSeed is { Length: > 0 }) switch {
-					(true, true, _) => (IGossipSeedSource)new DnsGossipSeedSource(options.Cluster.ClusterDns,
-						options.Cluster.ClusterGossipPort),
-					(false, true, false) => throw new InvalidConfigurationException(
-						"DNS discovery is disabled, but no gossip seed endpoints have been specified. "
-						+ "Specify gossip seeds using the `GossipSeed` option."),
-					_ => new KnownEndpointGossipSeedSource(options.Cluster.GossipSeed)
-				};
-
-			var gossip = new NodeGossipService(
-				_mainQueue,
-				options.Cluster.ClusterSize,
-				gossipSeedSource,
-				memberInfo,
-				Db.Config.WriterCheckpoint.AsReadOnly(),
-				Db.Config.ChaserCheckpoint.AsReadOnly(),
-				epochManager, () => readIndex.LastIndexedPosition,
-				options.Cluster.NodePriority, TimeSpan.FromMilliseconds(options.Cluster.GossipIntervalMs),
-				TimeSpan.FromMilliseconds(options.Cluster.GossipAllowedDifferenceMs),
-				TimeSpan.FromMilliseconds(options.Cluster.GossipTimeoutMs),
-				TimeSpan.FromSeconds(options.Cluster.DeadMemberRemovalPeriodSec),
-				_timeProvider);
-			_mainBus.Subscribe<SystemMessage.SystemInit>(gossip);
-			_mainBus.Subscribe<GossipMessage.RetrieveGossipSeedSources>(gossip);
-			_mainBus.Subscribe<GossipMessage.GotGossipSeedSources>(gossip);
-			_mainBus.Subscribe<GossipMessage.Gossip>(gossip);
-			_mainBus.Subscribe<GossipMessage.GossipReceived>(gossip);
-			_mainBus.Subscribe<GossipMessage.ReadGossip>(gossip);
-			_mainBus.Subscribe<GossipMessage.ClientGossip>(gossip);
-			_mainBus.Subscribe<SystemMessage.StateChangeMessage>(gossip);
-			_mainBus.Subscribe<GossipMessage.GossipSendFailed>(gossip);
-			_mainBus.Subscribe<GossipMessage.UpdateNodePriority>(gossip);
-			_mainBus.Subscribe<SystemMessage.VNodeConnectionEstablished>(gossip);
-			_mainBus.Subscribe<SystemMessage.VNodeConnectionLost>(gossip);
-			_mainBus.Subscribe<GossipMessage.GetGossipFailed>(gossip);
-			_mainBus.Subscribe<GossipMessage.GetGossipReceived>(gossip);
-			_mainBus.Subscribe<ElectionMessage.ElectionsDone>(gossip);
-		}
+		// GOSSIP
+
+		var gossipSeedSource = (
+			options.Cluster.DiscoverViaDns,
+			options.Cluster.ClusterSize > 1,
+			options.Cluster.GossipSeed is { Length: > 0 }) switch {
+				(true, true, _) => (IGossipSeedSource)new DnsGossipSeedSource(options.Cluster.ClusterDns,
+					options.Cluster.ClusterGossipPort),
+				(false, true, false) => throw new InvalidConfigurationException(
+					"DNS discovery is disabled, but no gossip seed endpoints have been specified. "
+					+ "Specify gossip seeds using the `GossipSeed` option."),
+				_ => new KnownEndpointGossipSeedSource(options.Cluster.GossipSeed)
+			};
+
+		var gossip = new NodeGossipService(
+			_mainQueue,
+			options.Cluster.ClusterSize,
+			gossipSeedSource,
+			memberInfo,
+			Db.Config.WriterCheckpoint.AsReadOnly(),
+			Db.Config.ChaserCheckpoint.AsReadOnly(),
+			epochManager, () => readIndex.LastIndexedPosition,
+			options.Cluster.NodePriority, TimeSpan.FromMilliseconds(options.Cluster.GossipIntervalMs),
+			TimeSpan.FromMilliseconds(options.Cluster.GossipAllowedDifferenceMs),
+			TimeSpan.FromMilliseconds(options.Cluster.GossipTimeoutMs),
+			TimeSpan.FromSeconds(options.Cluster.DeadMemberRemovalPeriodSec),
+			_timeProvider);
+		_mainBus.Subscribe<SystemMessage.SystemInit>(gossip);
+		_mainBus.Subscribe<GossipMessage.RetrieveGossipSeedSources>(gossip);
+		_mainBus.Subscribe<GossipMessage.GotGossipSeedSources>(gossip);
+		_mainBus.Subscribe<GossipMessage.Gossip>(gossip);
+		_mainBus.Subscribe<GossipMessage.GossipReceived>(gossip);
+		_mainBus.Subscribe<GossipMessage.ReadGossip>(gossip);
+		_mainBus.Subscribe<GossipMessage.ClientGossip>(gossip);
+		_mainBus.Subscribe<SystemMessage.StateChangeMessage>(gossip);
+		_mainBus.Subscribe<GossipMessage.GossipSendFailed>(gossip);
+		_mainBus.Subscribe<GossipMessage.UpdateNodePriority>(gossip);
+		_mainBus.Subscribe<SystemMessage.VNodeConnectionEstablished>(gossip);
+		_mainBus.Subscribe<SystemMessage.VNodeConnectionLost>(gossip);
+		_mainBus.Subscribe<GossipMessage.GetGossipFailed>(gossip);
+		_mainBus.Subscribe<GossipMessage.GetGossipReceived>(gossip);
+		_mainBus.Subscribe<ElectionMessage.ElectionsDone>(gossip);
 
 		var clusterStateChangeListener = new ClusterMultipleVersionsLogger();
 		_mainBus.Subscribe<GossipMessage.GossipUpdated>(clusterStateChangeListener);
@@ -1530,7 +1582,7 @@ GossipAdvertiseInfo GetGossipAdvertiseInfo() {
 		_subsystems = options.Subsystems;
 
 		var standardComponents = new StandardComponents(Db.Config, _mainQueue, _mainBus, _timerService, _timeProvider,
-			httpSendService, new IHttpService[] { _httpService }, _workersHandler, _queueStatsManager, trackers.QueueTrackers, metricsConfiguration.ProjectionStats);
+			httpSendService, new IHttpService[] { _httpService }, _workersHandler, _queueStatsManager, trackers.QueueTrackers, metricsConfiguration);
 
 		IServiceCollection ConfigureNodeServices(IServiceCollection services) {
 			services
@@ -1539,17 +1591,23 @@ IServiceCollection ConfigureNodeServices(IServiceCollection services) {
 				.AddSingleton(standardComponents)
 				.AddSingleton(authorizationGateway)
 				.AddSingleton(certificateProvider)
+				.AddSingleton(_authenticationProvider)
 				.AddSingleton<IReadOnlyList<IDbTransform>>(new List<IDbTransform> { new IdentityDbTransform() })
+				.AddSingleton<IReadOnlyList<IClusterVNodeStartupTask>>(new List<IClusterVNodeStartupTask> { })
 				.AddSingleton<IReadOnlyList<IHttpAuthenticationProvider>>(httpAuthenticationProviders)
 				.AddSingleton<Func<(X509Certificate2 Node, X509Certificate2Collection Intermediates,
 						X509Certificate2Collection Roots)>>
 					(() => (_certificateSelector(), _intermediateCertsSelector(), _trustedRootCertsSelector()))
-				.AddSingleton(_nodeHttpClientFactory);
+				.AddSingleton(_nodeHttpClientFactory)
+				.AddSingleton<IChunkRegistry<IChunkBlob>>(Db.Manager)
+				.AddSingleton<IVersionedFileNamingStrategy>(Db.Manager.FileSystem.LocalNamingStrategy);
 
 			configureAdditionalNodeServices?.Invoke(services);
 			return services;
 		}
 
+		IReadOnlyList<IClusterVNodeStartupTask> startupTasks = [];
+
 		void ConfigureNode(IApplicationBuilder app) {
 			var dbTransforms = app.ApplicationServices.GetService<IReadOnlyList<IDbTransform>>();
 			Db.TransformManager.LoadTransforms(dbTransforms);
@@ -1558,6 +1616,10 @@ void ConfigureNode(IApplicationBuilder app) {
 				throw new InvalidConfigurationException(
 					$"Unknown {nameof(options.Database.Transform)} specified: {options.Database.Transform}");
 
+			startupTasks = app.ApplicationServices.GetRequiredService<IReadOnlyList<IClusterVNodeStartupTask>>();
+		}
+
+		async ValueTask StartNode(CancellationToken token) {
 			// TRUNCATE IF NECESSARY
 			var truncPos = Db.Config.TruncateCheckpoint.Read();
 			if (truncPos != -1) {
@@ -1565,52 +1627,59 @@ void ConfigureNode(IApplicationBuilder app) {
 					"Truncate checkpoint is present. Truncate: {truncatePosition} (0x{truncatePosition:X}), Writer: {writerCheckpoint} (0x{writerCheckpoint:X}), Chaser: {chaserCheckpoint} (0x{chaserCheckpoint:X}), Epoch: {epochCheckpoint} (0x{epochCheckpoint:X})",
 					truncPos, truncPos, writerCheckpoint, writerCheckpoint, chaserCheckpoint, chaserCheckpoint,
 					epochCheckpoint, epochCheckpoint);
-				var truncator = new TFChunkDbTruncator(Db.Config, type => Db.TransformManager.GetFactoryForExistingChunk(type));
-				truncator.TruncateDb(truncPos);
+				var truncator = new TFChunkDbTruncator(Db.Config, Db.Manager.FileSystem, type => Db.TransformManager.GetFactoryForExistingChunk(type));
+				await truncator.TruncateDb(truncPos, CancellationToken.None);
 
 				// The truncator has moved the checkpoints but it is possible that other components in the startup have
 				// already read the old values. If we ensure all checkpoint reads are performed after the truncation
 				// then we can remove this extra restart
 				Log.Information("Truncation successful. Shutting down.");
 				var shutdownGuid = Guid.NewGuid();
-				using var task = HandleAsync(
+				using var linked = CancellationTokenSource.CreateLinkedTokenSource(token);
+				linked.CancelAfter(ShutdownTimeout);
+
+				await HandleAsync(
 						new SystemMessage.BecomeShuttingDown(shutdownGuid, exitProcess: true, shutdownHttp: true),
-						CancellationToken.None).AsTask();
+						linked.Token);
 
-				task.Wait(DefaultShutdownTimeout);
 				Handle(new SystemMessage.BecomeShutdown(shutdownGuid));
 				Application.Exit(0, "Shutting down after successful truncation.");
 				return;
 			}
 
-			Db.Open(!options.Database.SkipDbVerify, threads: options.Database.InitializationThreads, createNewChunks: false);
+			foreach (var x in startupTasks) {
+				await x.Run(token);
+			}
+
+			// start the main queue as we publish messages to it while opening the db
+			_controller.Start();
 
-			epochManager.Init();
+			await Db.Open(!options.Database.SkipDbVerify, threads: options.Database.InitializationThreads,
+				createNewChunks: false, token: token);
 
-			storageWriter.Start();
-			AddTasks(storageWriter.Tasks);
+			await epochManager.Init(token);
 
-			AddTasks(_workersHandler.Start());
-			AddTask(_controller.Start());
-			AddTask(monitoringQueue.Start());
-			AddTask(subscrQueue.Start());
-			AddTask(perSubscrQueue.Start());
-			AddTask(redactionQueue.Start());
+			await storageWriter.Start(token);
 
+			_workersHandler.Start();
+			monitoringQueue.Start();
+			subscrQueue.Start();
+			perSubscrQueue.Start();
+			redactionQueue.Start();
 			dynamicCacheManager.Start();
+			_mainQueue.Publish(new SystemMessage.SystemInit());
 		}
+		_start = StartNode;
 
 		_startup = new ClusterVNodeStartup<TStreamId>(
+			options,
 			modifiedOptions.PlugableComponents,
 			_mainQueue, monitoringQueue, _mainBus, _workersHandler,
 			_authenticationProvider, _authorizationProvider,
-			options.Application.MaxAppendSize,
-			TimeSpan.FromMilliseconds(options.Database.WriteTimeoutMs),
 			expiryStrategy ?? new DefaultExpiryStrategy(),
 			_httpService,
 			configuration,
 			trackers,
-			options.Cluster.DiscoverViaDns ? options.Cluster.ClusterDns : null,
 			ConfigureNodeServices,
 			ConfigureNode);
 
@@ -1725,10 +1794,6 @@ private void SubscribeWorkers(Action<InMemoryBus> setup) {
 		}
 	}
 
-	public override void Start() {
-		_mainQueue.Publish(new SystemMessage.SystemInit());
-	}
-
 	public override async Task StopAsync(TimeSpan? timeout = null, CancellationToken cancellationToken = default) {
 		if (Interlocked.Exchange(ref _stopCalled, 1) == 1) {
 			Log.Warning("Stop was already called.");
@@ -1737,23 +1802,19 @@ public override async Task StopAsync(TimeSpan? timeout = null, CancellationToken
 
 		_mainQueue.Publish(new ClientMessage.RequestShutdown(false, true));
 
-		_reloadConfigSignalRegistration?.Dispose();
-		_reloadConfigSignalRegistration = null;
-
-		TimeSpan remainingTime;
-		var timeoutCtl = new TimeoutControl(timeout ?? DefaultShutdownTimeout);
-		foreach (var subsystem in _subsystems ?? []) {
-			timeoutCtl.ThrowIfExpired(out remainingTime);
-			await subsystem.Stop().WaitAsync(remainingTime, cancellationToken);
+		try {
+			await _shutdownSource.Task.WaitAsync(timeout ?? ShutdownTimeout, cancellationToken);
+		} catch (Exception) {
+			Log.Error("Graceful shutdown not complete. Forcing shutdown now.");
+			throw;
+		} finally {
+			_switchChunksLock?.Dispose();
 		}
-
-		timeoutCtl.ThrowIfExpired(out remainingTime);
-		await _shutdownSource.Task.WaitAsync(remainingTime, cancellationToken);
-
-		_switchChunksLock?.Dispose();
 	}
 
 	public async ValueTask HandleAsync(SystemMessage.BecomeShuttingDown message, CancellationToken token) {
+		Log.Information("========== [{httpEndPoint}] IS SHUTTING DOWN SUBSYSTEMS...", NodeInfo.HttpEndPoint);
+
 		_reloadConfigSignalRegistration?.Dispose();
 		_reloadConfigSignalRegistration = null;
 
@@ -1804,7 +1865,7 @@ public void AddTask(Task task) {
 #endif
 	}
 
-	public override Task<ClusterVNode> StartAsync(bool waitUntilReady) {
+	public override async Task<ClusterVNode> StartAsync(bool waitUntilReady, CancellationToken token) {
 		var tcs = new TaskCompletionSource<ClusterVNode>(TaskCreationOptions.RunContinuationsAsynchronously);
 
 		if (waitUntilReady) {
@@ -1814,12 +1875,12 @@ public override Task<ClusterVNode> StartAsync(bool waitUntilReady) {
 			tcs.TrySetResult(this);
 		}
 
-		Start();
+		await _start(token);
 
 		if (IsShutdown)
 			tcs.TrySetResult(this);
 
-		return tcs.Task;
+		return await tcs.Task;
 	}
 
 	public static ValueTuple<bool, string> ValidateServerCertificate(X509Certificate certificate,
@@ -1926,6 +1987,23 @@ private void ReloadCertificates(ClusterVNodeOptions options) {
 		}
 	}
 
+	private static void LogPluginSubsectionWarnings(IConfiguration configuration) {
+		var pluginSubsectionOptions = configuration.GetSection($"{KurrentConfigurationKeys.Prefix}:Plugins").AsEnumerable().ToList();
+		if (pluginSubsectionOptions.Count <= 1)
+			return;
+
+		Log.Warning(
+			"The \"Plugins\" configuration subsection has been removed. " +
+			"The following settings will be ignored. " +
+			"Please move them out of the \"Plugins\" subsection and " +
+			$"directly into the \"{KurrentConfigurationKeys.Prefix}\" root.");
+
+		foreach (var kvp in pluginSubsectionOptions) {
+			if (kvp.Value is not null)
+				Log.Warning("Ignoring option nested in \"Plugins\" subsection: {IgnoredOption}", kvp.Key);
+		}
+	}
+
 	public override string ToString() =>
 		$"[{NodeInfo.InstanceId:B}, {NodeInfo.InternalTcp}, {NodeInfo.ExternalTcp}, {NodeInfo.HttpEndPoint}]";
 }
diff --git a/src/KurrentDB.Core/ClusterVNodeStartup.cs b/src/KurrentDB.Core/ClusterVNodeStartup.cs
new file mode 100644
index 00000000000..f9fa3e6b75e
--- /dev/null
+++ b/src/KurrentDB.Core/ClusterVNodeStartup.cs
@@ -0,0 +1,348 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Metrics;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using EventStore.Core.Services.Transport.Grpc;
+using EventStore.Core.Services.Transport.Grpc.Cluster;
+using EventStore.Plugins;
+using EventStore.Plugins.Authentication;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Configuration;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.Transport.Grpc;
+using KurrentDB.Core.Services.Transport.Http;
+using KurrentDB.Core.TransactionLog.Chunks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Authentication.OpenIdConnect;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.IdentityModel.JsonWebTokens;
+using Microsoft.IdentityModel.Protocols.OpenIdConnect;
+using OpenTelemetry.Metrics;
+using OpenTelemetry.Resources;
+using Serilog;
+using AuthenticationMiddleware = KurrentDB.Core.Services.Transport.Http.AuthenticationMiddleware;
+using ClientGossip = EventStore.Core.Services.Transport.Grpc.Gossip;
+using ClusterGossip = EventStore.Core.Services.Transport.Grpc.Cluster.Gossip;
+using HttpMethod = KurrentDB.Transport.Http.HttpMethod;
+using Operations = EventStore.Core.Services.Transport.Grpc.Operations;
+using ServerFeatures = KurrentDB.Core.Services.Transport.Grpc.ServerFeatures;
+
+#nullable enable
+namespace KurrentDB.Core;
+
+public class ClusterVNodeStartup<TStreamId> : IInternalStartup, IHandle<SystemMessage.SystemReady>,
+	IHandle<SystemMessage.BecomeShuttingDown> {
+	readonly ClusterVNodeOptions _options;
+	private readonly IReadOnlyList<IPlugableComponent> _plugableComponents;
+	private readonly IPublisher _mainQueue;
+	private readonly IPublisher _monitoringQueue;
+	private readonly ISubscriber _mainBus;
+	private readonly IAuthenticationProvider _authenticationProvider;
+	private readonly IExpiryStrategy _expiryStrategy;
+	private readonly KestrelHttpService _httpService;
+	private readonly IConfiguration _configuration;
+	private readonly MetricsConfiguration _metricsConfiguration;
+	private readonly Trackers _trackers;
+	private readonly StatusCheck _statusCheck;
+	private readonly Func<IServiceCollection, IServiceCollection> _configureNodeServices;
+	private readonly Action<IApplicationBuilder> _configureNode;
+
+	private bool _ready;
+	private readonly IAuthorizationProvider _authorizationProvider;
+	private readonly MultiQueuedHandler _httpMessageHandler;
+	private readonly string? _clusterDns;
+
+	public ClusterVNodeStartup(
+		ClusterVNodeOptions options,
+		IReadOnlyList<IPlugableComponent> plugableComponents,
+		IPublisher mainQueue,
+		IPublisher monitoringQueue,
+		ISubscriber mainBus,
+		MultiQueuedHandler httpMessageHandler,
+		IAuthenticationProvider authenticationProvider,
+		IAuthorizationProvider authorizationProvider,
+		IExpiryStrategy expiryStrategy,
+		KestrelHttpService httpService,
+		IConfiguration configuration,
+		Trackers trackers,
+		Func<IServiceCollection, IServiceCollection> configureNodeServices,
+		Action<IApplicationBuilder> configureNode) {
+		_options = options;
+		_plugableComponents = plugableComponents;
+		_mainQueue = mainQueue;
+		_monitoringQueue = monitoringQueue ?? throw new ArgumentNullException(nameof(monitoringQueue));
+		_mainBus = mainBus ?? throw new ArgumentNullException(nameof(mainBus));
+		_httpMessageHandler = httpMessageHandler;
+		_authenticationProvider = authenticationProvider;
+		_authorizationProvider = authorizationProvider ?? throw new ArgumentNullException(nameof(authorizationProvider));
+		_expiryStrategy = expiryStrategy;
+		_httpService = Ensure.NotNull(httpService);
+		_configuration = Ensure.NotNull(configuration);
+		_metricsConfiguration = MetricsConfiguration.Get(_configuration);
+		_trackers = trackers;
+		_clusterDns = options.Cluster.DiscoverViaDns ? options.Cluster.ClusterDns : null;
+		_configureNodeServices = configureNodeServices ?? throw new ArgumentNullException(nameof(configureNodeServices));
+		_configureNode = configureNode ?? throw new ArgumentNullException(nameof(configureNode));
+		_statusCheck = new StatusCheck(this);
+	}
+
+	public void Configure(WebApplication app) {
+		_configureNode(app);
+
+		var forcePlainTextMetrics =
+			_metricsConfiguration.LegacyCoreNaming &&
+			_metricsConfiguration.LegacyProjectionsNaming;
+
+		var internalDispatcher = new InternalDispatcherEndpoint(_mainQueue, _httpMessageHandler);
+		_mainBus.Subscribe(internalDispatcher);
+
+		_statusCheck.MapLiveness(app.MapGroup("/health"));
+		app.UseCors("default");
+
+		// AuthenticationMiddleware uses _httpAuthenticationProviders and assigns
+		// the resulting ClaimsPrinciple to HttpContext.User
+		app.UseMiddleware<AuthenticationMiddleware>();
+
+		// UseAuthentication/UseAuthorization allow the rest of the pipeline to access auth
+		// in a conventional way (e.g. with AuthorizeAttribute). The server doesn't make use
+		// of this yet but plugins may. The registered authentication scheme (kurrent auth)
+		// is driven by the HttpContext.User established above
+		app.UseAuthentication();
+		app.UseRouting();
+		app.UseAuthorization();
+		app.UseAntiforgery();
+
+		// allow all subsystems to register their legacy controllers before calling MapLegacyHttp
+		foreach (var component in _plugableComponents)
+			component.ConfigureApplication(app, _configuration);
+
+		_authenticationProvider.ConfigureEndpoints(app);
+		app.UseStaticFiles();
+
+		// Select an appropriate controller action and codec.
+		//    Success -> Add InternalContext (HttpEntityManager, urimatch, ...) to HttpContext
+		//    Fail -> Pipeline terminated with response.
+		app.UseMiddleware<KestrelToInternalBridgeMiddleware>();
+
+		// Looks up the InternalContext to perform the check.
+		// Terminal if auth check is not successful.
+		app.UseMiddleware<AuthorizationMiddleware>();
+
+		// Open telemetry currently guarded by our custom authz for consistency with stats
+		app.UseOpenTelemetryPrometheusScrapingEndpoint(x => {
+			if (x.Request.Path != "/metrics")
+				return false;
+
+			// Prometheus scrapes preferring application/openmetrics-text, but the prometheus exporter
+			// these days adds `_total` suffix to counters when outputting openmetrics format (as
+			// required by the spec). DisableTotalNameSuffixForCounters only affects plain text output.
+			// So if we are exporting legacy metrics, where we do not want the _total suffix for
+			// backwards compatibility, then force the exporter to respond with plain text metrics as it
+			// did in 23.10 and 24.10.
+			if (forcePlainTextMetrics)
+				x.Request.Headers.Remove("Accept");
+			return true;
+		});
+
+		// Internal dispatcher looks up the InternalContext to call the appropriate controller
+		app.Use((ctx, next) => internalDispatcher.InvokeAsync(ctx, next));
+
+		app.MapGrpcService<PersistentSubscriptions>();
+		app.MapGrpcService<Users>();
+		app.MapGrpcService<Streams<TStreamId>>();
+		app.MapGrpcService<ClusterGossip>();
+		app.MapGrpcService<Elections>();
+		app.MapGrpcService<Operations>();
+		app.MapGrpcService<ClientGossip>();
+		app.MapGrpcService<Monitoring>();
+		app.MapGrpcService<ServerFeatures>();
+		// enable redaction service on unix sockets only
+		app.MapGrpcService<Redaction>().AddEndpointFilter(async (c, next) => {
+			if (!c.HttpContext.IsUnixSocketConnection())
+				return Results.BadRequest("Redaction is only available via Unix Sockets");
+			return await next(c).ConfigureAwait(false);
+		});
+	}
+
+	public void ConfigureServices(IServiceCollection services) {
+		// Web-related registrations
+		services.AddRouting();
+		var authBuilder = services.AddAuthentication(o => {
+			o.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme;
+			if (OAuthEnabled) {
+				o.DefaultChallengeScheme = OpenIdConnectDefaults.AuthenticationScheme;
+			}
+
+			o.AddScheme<EventStoreAuthenticationHandler>("kurrent auth", displayName: null);
+		});
+		if (OAuthEnabled) {
+			var oidcConfig = _configuration.GetSection("KurrentDB:OAuth");
+			authBuilder
+				.AddCookie()
+				.AddOpenIdConnect(o => {
+					var insecure = bool.TryParse(oidcConfig["Insecure"], out var insecureValue) && insecureValue;
+					o.Authority = oidcConfig["Issuer"];
+					o.ClientId = oidcConfig["ClientId"];
+					o.ClientSecret = oidcConfig["ClientSecret"];
+					o.SignInScheme = CookieAuthenticationDefaults.AuthenticationScheme;
+					o.SignOutScheme = OpenIdConnectDefaults.AuthenticationScheme;
+					o.ResponseType = OpenIdConnectResponseType.Code;
+					if (insecure) {
+						o.BackchannelHttpHandler = new HttpClientHandler {
+							ServerCertificateCustomValidationCallback = (_, _, _, _) => true
+						};
+						o.RequireHttpsMetadata = false;
+					}
+					o.SaveTokens = true;
+					o.GetClaimsFromUserInfoEndpoint = true;
+					o.TokenValidationParameters.NameClaimType = JwtRegisteredClaimNames.Name;
+					o.Events.OnUserInformationReceived = async ctx => {
+						if (ctx.Principal != null) {
+							await ctx.HttpContext.SignInAsync(ctx.Principal, ctx.Properties);
+						}
+					};
+				});
+		} else {
+			authBuilder.AddCookie(x => x.LoginPath = "/ui/login");
+		}
+
+		services.AddAuthorization();
+		services.AddAntiforgery(s => s.Cookie.Expiration = TimeSpan.Zero);
+		services
+			.AddSingleton<AuthenticationMiddleware>()
+			.AddSingleton<AuthorizationMiddleware>()
+			.AddSingleton(new KestrelToInternalBridgeMiddleware(_httpService.UriRouter, _httpService.LogHttpRequests, _httpService.AdvertiseAsHost, _httpService.AdvertiseAsPort))
+			.AddSingleton(_authenticationProvider)
+			.AddSingleton(_authorizationProvider);
+		services.AddCors(o => o.AddPolicy(
+			"default",
+			b => b.AllowAnyOrigin().WithMethods(HttpMethod.Options, HttpMethod.Get).AllowAnyHeader())
+		);
+
+		// Other dependencies
+		services
+			.AddSingleton<ISubscriber>(_mainBus)
+			.AddSingleton<IPublisher>(_mainQueue)
+			.AddSingleton(new Streams<TStreamId>(_mainQueue,
+				Ensure.Positive(_options.Application.MaxAppendSize),
+				Ensure.Positive(_options.Application.MaxAppendEventSize),
+				TimeSpan.FromMilliseconds(_options.Database.WriteTimeoutMs),
+				_expiryStrategy, _trackers.GrpcTrackers, _authorizationProvider))
+			.AddSingleton(new PersistentSubscriptions(_mainQueue, _authorizationProvider))
+			.AddSingleton(new Users(_mainQueue, _authorizationProvider))
+			.AddSingleton(new Operations(_mainQueue, _authorizationProvider))
+			.AddSingleton(new ClusterGossip(_mainQueue, _authorizationProvider, _clusterDns,
+				updateTracker: _trackers.GossipTrackers.ProcessingPushFromPeer,
+				readTracker: _trackers.GossipTrackers.ProcessingRequestFromPeer))
+			.AddSingleton(new Elections(_mainQueue, _authorizationProvider, _clusterDns))
+			.AddSingleton(new ClientGossip(_mainQueue, _authorizationProvider, _trackers.GossipTrackers.ProcessingRequestFromGrpcClient))
+			.AddSingleton(new Monitoring(_monitoringQueue))
+			.AddSingleton(new Redaction(_mainQueue, _authorizationProvider))
+			.AddSingleton<ServerFeatures>();
+
+		// OpenTelemetry
+		services.AddOpenTelemetry()
+			.WithMetrics(meterOptions => meterOptions
+				.SetResourceBuilder(ResourceBuilder.CreateDefault().AddService(_metricsConfiguration.ServiceName))
+				.AddMeter(_metricsConfiguration.Meters)
+				.AddView(ViewConfig)
+				.AddInternalExporter()
+				.AddPrometheusExporter(options => {
+					if (_metricsConfiguration is { LegacyCoreNaming: true, LegacyProjectionsNaming: true }) {
+						options.DisableTotalNameSuffixForCounters = true;
+					} else if (_metricsConfiguration.LegacyCoreNaming || _metricsConfiguration.LegacyProjectionsNaming) {
+						Log.Error("Inconsistent Meter names: {names}. Please use EventStore or KurrentDB for all.",
+							string.Join(", ", _metricsConfiguration.Meters));
+					}
+
+					options.ScrapeResponseCacheDurationMilliseconds = 1000;
+				}));
+
+		// gRPC
+		services
+			.AddSingleton<RetryInterceptor>()
+			.AddGrpc(options => options.Interceptors.Add<RetryInterceptor>())
+			.AddServiceOptions<Streams<TStreamId>>(options => options.MaxReceiveMessageSize = TFConsts.EffectiveMaxLogRecordSize);
+
+		// Ask the node itself to add DI registrations
+		_configureNodeServices(services);
+
+		// Let pluggable components to register their services
+		foreach (var component in _plugableComponents)
+			component.ConfigureServices(services, _configuration);
+		return;
+
+		MetricStreamConfiguration? ViewConfig(Instrument i) {
+			if (i.Name == MetricsBootstrapper.LogicalChunkReadDistributionName(_metricsConfiguration.ServiceName))
+				// 20 buckets, 0, 1, 2, 4, 8, ...
+				return new ExplicitBucketHistogramConfiguration { Boundaries = [0, .. Enumerable.Range(0, count: 19).Select(x => 1 << x)] };
+			if (i.Name.StartsWith(_metricsConfiguration.ServiceName + "-") && (i.Name.EndsWith("-latency-seconds") || i.Name.EndsWith("-latency") && i.Unit == "seconds"))
+				return new ExplicitBucketHistogramConfiguration {
+					Boundaries = [
+						0.001, //    1 ms
+						0.005, //    5 ms
+						0.01, //   10 ms
+						0.05, //   50 ms
+						0.1, //  100 ms
+						0.5, //  500 ms
+						1, // 1000 ms
+						5, // 5000 ms
+					]
+				};
+			if (i.Name.StartsWith(_metricsConfiguration.ServiceName + "-") && (i.Name.EndsWith("-seconds") || i.Unit == "seconds"))
+				return new ExplicitBucketHistogramConfiguration {
+					Boundaries = [
+						0.000_001, // 1 microsecond
+						0.000_01, 0.000_1, 0.001, // 1 millisecond
+						0.01, 0.1, 1, // 1 second
+						10,
+					]
+				};
+			return default;
+		}
+	}
+
+	public void Handle(SystemMessage.SystemReady _) => _ready = true;
+
+	public void Handle(SystemMessage.BecomeShuttingDown _) => _ready = false;
+
+	private class StatusCheck {
+		private readonly ClusterVNodeStartup<TStreamId> _startup;
+		private readonly int _livecode = 204;
+
+		public StatusCheck(ClusterVNodeStartup<TStreamId> startup) {
+			_startup = startup ?? throw new ArgumentNullException(nameof(startup));
+		}
+
+		public void MapLiveness(RouteGroupBuilder builder) {
+			builder.MapMethods("live", [HttpMethod.Get, HttpMethod.Head], Handler);
+			return;
+
+			Task Handler(HttpContext context) {
+				context.Response.StatusCode = _startup._ready
+					? context.Request.Query.TryGetValue("liveCode", out var expected) && int.TryParse(expected, out var statusCode)
+						? statusCode
+						: _livecode
+					: 503;
+
+				return Task.CompletedTask;
+			}
+		}
+	}
+
+	bool OAuthEnabled => _plugableComponents.Any(x => x is { Enabled: true, Name: "OAuthAuthentication" });
+}
diff --git a/src/KurrentDB.Core/Configuration/ClusterVNodeOptions.Framework.cs b/src/KurrentDB.Core/Configuration/ClusterVNodeOptions.Framework.cs
new file mode 100644
index 00000000000..cb21f0da3db
--- /dev/null
+++ b/src/KurrentDB.Core/Configuration/ClusterVNodeOptions.Framework.cs
@@ -0,0 +1,264 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+// ReSharper disable CheckNamespace
+
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+using System.Runtime;
+using System.Text;
+using System.Text.RegularExpressions;
+using KurrentDB.Common.Configuration;
+using KurrentDB.Core.Configuration;
+using KurrentDB.Core.Configuration.Sources;
+using Microsoft.Extensions.Configuration;
+
+namespace KurrentDB.Core;
+
+public partial record ClusterVNodeOptions {
+	private static readonly IEnumerable<Type> OptionSections;
+	public static readonly string HelpText;
+	public string GetComponentName() => $"{Interface.NodeIp}-{Interface.NodePort}-cluster-node";
+	public static readonly List<SectionMetadata> Metadata;
+
+	static ClusterVNodeOptions() {
+		OptionSections = typeof(ClusterVNodeOptions)
+			.GetProperties(BindingFlags.Public | BindingFlags.Instance)
+			.Where(p => p.GetCustomAttribute<OptionGroupAttribute>() != null)
+			.Select(p => p.PropertyType);
+
+		HelpText = GetHelpText();
+
+		Metadata = typeof(ClusterVNodeOptions)
+			.GetProperties(BindingFlags.Public | BindingFlags.Instance)
+			.Where(prop => prop.GetCustomAttribute<OptionGroupAttribute>() != null)
+			.Select(SectionMetadata.FromPropertyInfo)
+			.ToList();
+
+		DefaultValues = OptionSections.SelectMany(GetDefaultValues);
+
+		return;
+
+		static IEnumerable<KeyValuePair<string, object?>> GetDefaultValues(Type type) {
+			var defaultInstance = Activator.CreateInstance(type)!;
+
+			return type.GetProperties().Select(property =>
+				new KeyValuePair<string, object?>(property.Name, property.PropertyType switch {
+					{ IsArray: true } => string.Join(",",
+						((Array)(property.GetValue(defaultInstance) ?? Array.Empty<object>())).OfType<object>()),
+					_ => property.GetValue(defaultInstance)
+				}));
+		}
+	}
+
+	public static IEnumerable<KeyValuePair<string, object?>> DefaultValues { get; }
+
+	public string? DumpOptions() =>
+		ConfigurationRoot == null ? null : ClusterVNodeOptionsPrinter.Print(LoadedOptions);
+
+	public IReadOnlyDictionary<string, LoadedOption> LoadedOptions { get; init; } =
+		new Dictionary<string, LoadedOption>();
+
+	public string? GetDeprecationWarnings() {
+		var defaultValues = new Dictionary<string, object?>(DefaultValues, StringComparer.OrdinalIgnoreCase);
+
+		var deprecationWarnings = from section in OptionSections
+								  from option in section.GetProperties()
+								  let deprecationWarning = option.GetCustomAttribute<DeprecatedAttribute>()?.Message
+								  where deprecationWarning is not null
+								  let value = ConfigurationRoot?.GetValue<string?>(KurrentConfigurationKeys.Normalize(option.Name))
+								  where defaultValues.TryGetValue(option.Name, out var defaultValue)
+										&& !string.Equals(value, defaultValue?.ToString(), StringComparison.OrdinalIgnoreCase)
+								  select deprecationWarning;
+
+		var builder = deprecationWarnings
+			.Aggregate(new StringBuilder(), (builder, deprecationWarning) => builder.AppendLine(deprecationWarning));
+
+		return builder.Length != 0 ? builder.ToString() : null;
+	}
+
+	public string? CheckForEnvironmentOnlyOptions() =>
+		ConfigurationRoot.CheckProvidersForEnvironmentVariables(OptionSections);
+
+	public string[] CheckForLegacyEventStoreConfiguration() =>
+		ConfigurationRoot.CheckProvidersForLegacyEventStoreConfiguration();
+
+	public string[] CheckForLegacyDefaultLocations(LocationOptionWithLegacyDefault[] optionsWithLegacyDefaults) =>
+		ConfigurationRoot.CheckProvidersForEventStoreDefaultLocations(optionsWithLegacyDefaults);
+
+	public static IReadOnlyDictionary<string, LoadedOption> GetLoadedOptions(IConfigurationRoot configurationRoot) {
+		var loadedOptions = new Dictionary<string, LoadedOption>();
+
+		// because we always start with defaults, we can just add them all first.
+		// then we can override them with the actual values.
+		foreach (var provider in configurationRoot.Providers) {
+			foreach (var option in Metadata.SelectMany(x => x.Options)) {
+				if (!provider.TryGet(option.Value.Key, out var value))
+					continue;
+
+				var title = GetTitle(option);
+				var sourceDisplayName = GetSourceDisplayName(option.Value.Key, provider);
+				var isDefault = provider.GetType() == typeof(KurrentDefaultValuesConfigurationProvider);
+
+				// Handle options that have been configured as arrays (GossipSeed is currently the only one
+				// where this is possible)
+				if (sourceDisplayName is "<UNKNOWN>" && value is null) {
+					var parentPath = option.Value.Key;
+					var childValues = new List<string>();
+
+					foreach (var childKey in provider.GetChildKeys([], parentPath)) {
+						var absoluteChildKey = parentPath + ":" + childKey;
+						if (provider.TryGet(absoluteChildKey, out var childValue) && childValue is not null) {
+							childValues.Add(childValue);
+							sourceDisplayName = GetSourceDisplayName(absoluteChildKey, provider);
+						}
+					}
+
+					value = string.Join(", ", childValues);
+				}
+
+				loadedOptions[option.Value.Key] = new(
+					metadata: option.Value,
+					title: title,
+					value: value,
+					sourceDisplayName: sourceDisplayName,
+					isDefault: isDefault
+				);
+			}
+		}
+
+		return loadedOptions;
+
+		static string GetTitle(KeyValuePair<string, OptionMetadata> option) =>
+			CombineByPascalCase(KurrentConfigurationKeys.StripConfigurationPrefix(option.Value.Key)).ToUpper();
+	}
+
+	public static string GetSourceDisplayName(string key, IConfigurationProvider provider) {
+		if (provider is KurrentDefaultValuesConfigurationProvider) {
+			return "<DEFAULT>";
+		} else if (provider is SectionProvider sectionProvider) {
+			return sectionProvider.TryGetProviderFor(key, out var innerProvider)
+				? GetSourceDisplayName(key, innerProvider)
+				: "<UNKNOWN>";
+		} else {
+			return CombineByPascalCase(
+				provider.GetType().Name
+					.Replace(KurrentConfigurationKeys.Prefix, "")
+					.Replace("ConfigurationProvider", "")
+			);
+		}
+	}
+
+	private static string GetHelpText() {
+		const string OPTION = nameof(OPTION);
+		const string DESCRIPTION = nameof(DESCRIPTION);
+
+		var optionColumnWidth = Options().Max(o =>
+			OptionHeaderColumnWidth(o.Name, DefaultValue(o)));
+
+		var header = $"{OPTION.PadRight(optionColumnWidth, ' ')}{DESCRIPTION}";
+
+		var environmentOnlyOptions = OptionSections.SelectMany(section => section.GetProperties())
+			.Where(option => option.GetCustomAttribute<EnvironmentOnlyAttribute>() != null)
+			.Select(option => option)
+			.ToList();
+
+		var environmentOnlyOptionsBuilder = environmentOnlyOptions
+			.Aggregate(new StringBuilder(),
+				(builder, property) => builder.Append(GetEnvironmentOption(property, optionColumnWidth)).AppendLine())
+			.ToString();
+
+		var options = Options().Where(option =>
+			environmentOnlyOptions.All(environmentOption => environmentOption.Name != option.Name)).ToList();
+
+		var optionGroups = options.GroupBy(option =>
+			option.DeclaringType?.GetCustomAttribute<DescriptionAttribute>()?.Description ?? string.Empty);
+
+		return optionGroups
+			.Aggregate(new StringBuilder().Append(header).AppendLine(), (builder, optionGroup) =>
+				optionGroup.Aggregate(
+					builder.AppendLine().Append(optionGroup.Key).AppendLine(),
+					(stringBuilder, property) => stringBuilder.Append(Line(property)).AppendLine()))
+			.AppendLine().AppendLine("EnvironmentOnly Options").Append(environmentOnlyOptionsBuilder)
+			.ToString();
+
+
+		string Line(PropertyInfo property) {
+			var description = property.GetCustomAttribute<DescriptionAttribute>()?.Description;
+			if (property.PropertyType.IsEnum) {
+				description += $" ({string.Join(", ", Enum.GetNames(property.PropertyType))})";
+			}
+
+			return GetOption(property).PadRight(optionColumnWidth, ' ') + description;
+		}
+
+		string GetOption(PropertyInfo property) {
+			var builder = new StringBuilder();
+			builder.AppendJoin(string.Empty, GnuOption(property.Name));
+
+			var defaultValue = DefaultValue(property);
+			if (defaultValue != string.Empty) {
+				builder.Append(" (Default:").Append(defaultValue).Append(')');
+			}
+
+			return builder.ToString();
+		}
+
+		static IEnumerable<PropertyInfo> Options() => OptionSections.SelectMany(type => type.GetProperties());
+
+		static int OptionWidth(string name, string @default) =>
+			(name + @default).Count(char.IsUpper) + 1 + 1 + (name + @default).Length;
+
+		int OptionHeaderColumnWidth(string name, string @default) =>
+			Math.Max(OptionWidth(name, @default) + 1, OPTION.Length);
+
+		static string DefaultValue(PropertyInfo option) {
+			var value = option.GetValue(Activator.CreateInstance(option.DeclaringType!));
+			return (value, RuntimeInformation.IsWindows) switch {
+				(bool b, false) => b.ToString().ToLower(),
+				(bool b, true) => b.ToString(),
+				(Array { Length: 0 }, _) => string.Empty,
+				(Array { Length: > 0 } a, _) => string.Join(",", a.OfType<object>()),
+				_ => value?.ToString() ?? string.Empty
+			};
+		}
+
+		static IEnumerable<char> GnuOption(string x) {
+			yield return '-';
+			foreach (var c in x) {
+				if (char.IsUpper(c)) {
+					yield return '-';
+				}
+
+				yield return char.ToLower(c);
+			}
+		}
+
+		static string GetEnvironmentOption(PropertyInfo property, int optionColumnWidth) {
+			var prefix = KurrentConfigurationKeys.Prefix.ToUpper();
+
+			var builder = new StringBuilder();
+
+			builder.Append($"{prefix}_")
+				.Append(CombineByPascalCase(property.Name, "_").ToUpper());
+
+			var description = property.GetCustomAttribute<EnvironmentOnlyAttribute>()?.Message;
+
+			return builder.ToString().PadRight(optionColumnWidth, ' ') + description;
+
+		}
+	}
+
+	static string CombineByPascalCase(string name, string token = " ") {
+		var regex = new Regex(
+			@"(?<=[A-Z])(?=[A-Z][a-z])|(?<=[^A-Z])(?=[A-Z])|(?<=[A-Za-z])(?=[^A-Za-z])");
+		return regex.Replace(name, token);
+	}
+
+	[AttributeUsage(AttributeTargets.Property)]
+	internal class OptionGroupAttribute : Attribute;
+}
diff --git a/src/KurrentDB.Core/Configuration/ClusterVNodeOptions.cs b/src/KurrentDB.Core/Configuration/ClusterVNodeOptions.cs
new file mode 100644
index 00000000000..e851483976a
--- /dev/null
+++ b/src/KurrentDB.Core/Configuration/ClusterVNodeOptions.cs
@@ -0,0 +1,658 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+// ReSharper disable CheckNamespace
+
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Net;
+using System.Security.Cryptography.X509Certificates;
+using EventStore.Plugins;
+using EventStore.Plugins.Subsystems;
+using JetBrains.Annotations;
+using KurrentDB.Common.Configuration;
+using KurrentDB.Common.Options;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Configuration;
+using KurrentDB.Core.Configuration.Sources;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Services.Monitoring;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.Util;
+using Microsoft.Extensions.Configuration;
+using Quickenshtein;
+using Serilog;
+
+namespace KurrentDB.Core;
+
+[PublicAPI]
+public partial record ClusterVNodeOptions {
+	public ClusterVNodeOptions() => FileStreamExtensions.ConfigureFlush(Database.UnsafeDisableFlushToDisk);
+
+	public IConfigurationRoot? ConfigurationRoot { get; init; }
+	[OptionGroup] public ApplicationOptions Application { get; init; } = new();
+	[OptionGroup] public DevModeOptions DevMode { get; init; } = new();
+	[OptionGroup] public DefaultUserOptions DefaultUser { get; init; } = new();
+	[OptionGroup] public LoggingOptions Logging { get; init; } = new();
+	[OptionGroup] public AuthOptions Auth { get; init; } = new();
+	[OptionGroup] public CertificateOptions Certificate { get; init; } = new();
+	[OptionGroup] public CertificateFileOptions CertificateFile { get; init; } = new();
+	[OptionGroup] public CertificateStoreOptions CertificateStore { get; init; } = new();
+	[OptionGroup] public ClusterOptions Cluster { get; init; } = new();
+	[OptionGroup] public DatabaseOptions Database { get; init; } = new();
+	[OptionGroup] public GrpcOptions Grpc { get; init; } = new();
+	[OptionGroup] public InterfaceOptions Interface { get; init; } = new();
+	[OptionGroup] public ProjectionOptions Projection { get; init; } = new();
+	public UnknownOptions Unknown { get; init; } = new([]);
+
+	public byte IndexBitnessVersion { get; init; } = PTableVersions.IndexV4;
+
+	public X509Certificate2? ServerCertificate { get; init; }
+	public X509Certificate2Collection? TrustedRootCertificates { get; init; }
+	public IReadOnlyList<IPlugableComponent> PlugableComponents { get; init; } = [];
+
+	public IReadOnlyList<ISubsystem> Subsystems => PlugableComponents.OfType<ISubsystem>().ToArray();
+
+	public bool UnknownOptionsDetected => Unknown.Options.Any();
+
+	public static ClusterVNodeOptions FromConfiguration(IConfigurationRoot configurationRoot) {
+		var configuration = configurationRoot.GetRequiredSection(KurrentConfigurationKeys.Prefix);
+
+		// required because of a bug in the configuration system that
+		// is not reading the attribute from the property itself
+		TypeDescriptor.AddAttributes(typeof(EndPoint[]), new TypeConverterAttribute(typeof(GossipSeedConverter)));
+		TypeDescriptor.AddAttributes(typeof(EndPoint), new TypeConverterAttribute(typeof(GossipEndPointConverter)));
+		TypeDescriptor.AddAttributes(typeof(IPAddress), new TypeConverterAttribute(typeof(IPAddressConverter)));
+
+		// with full keys we would not even need to do all these binds, just a single one
+		// configurationRoot.BindOptions<ClusterVNodeOptions>();
+
+		var options = new ClusterVNodeOptions {
+			Application = configuration.BindOptions<ApplicationOptions>(),
+			DevMode = configuration.BindOptions<DevModeOptions>(),
+			DefaultUser = configuration.BindOptions<DefaultUserOptions>(),
+			Logging = configuration.BindOptions<LoggingOptions>(),
+			Auth = configuration.BindOptions<AuthOptions>(),
+			Certificate = configuration.BindOptions<CertificateOptions>(),
+			CertificateFile = configuration.BindOptions<CertificateFileOptions>(),
+			CertificateStore = configuration.BindOptions<CertificateStoreOptions>(),
+			Cluster = configuration.BindOptions<ClusterOptions>(),
+			Database = configuration.BindOptions<DatabaseOptions>(),
+			Grpc = configuration.BindOptions<GrpcOptions>(),
+			Interface = configuration.BindOptions<InterfaceOptions>(),
+			Projection = configuration.BindOptions<ProjectionOptions>(),
+
+			Unknown = UnknownOptions.FromConfiguration(configuration),
+			ConfigurationRoot = configurationRoot,
+			LoadedOptions = GetLoadedOptions(configurationRoot)
+		};
+
+		return options;
+	}
+
+	[Description("Default User Options")]
+	public record DefaultUserOptions {
+		[Description("Admin Default password"), Sensitive, EnvironmentOnly("The Admin user password can only be set using Environment Variables")]
+		public string DefaultAdminPassword { get; init; } = "changeit";
+
+		[Description("Ops Default password"), Sensitive, EnvironmentOnly("The Ops user password can only be set using Environment Variables")]
+		public string DefaultOpsPassword { get; init; } = "changeit";
+	}
+
+	[Description("Dev Mode Options")]
+	public record DevModeOptions {
+		[Description("Runs KurrentDB in dev mode. This will create and add dev certificates to your certificate store, enable atompub over http, and run standard projections.")]
+		public bool Dev { get; init; } = false;
+
+		[Description("Removes any dev certificates installed on this computer without starting KurrentDB.")]
+		public bool RemoveDevCerts { get; init; } = false;
+	}
+
+	[Description("Application Options")]
+	public record ApplicationOptions {
+		[Description("Show help.")] public bool Help { get; init; } = false;
+
+		[Description("Show version.")] public bool Version { get; init; } = false;
+
+		[Description("Configuration files.")]
+		public string Config { get; init; } = DefaultFiles.DefaultConfigPath;
+
+		[Description("Print effective configuration to console and then exit.")]
+		public bool WhatIf { get; init; } = false;
+
+		[Description("Allows KurrentDB to run with unknown configuration options present.")]
+		public bool AllowUnknownOptions { get; init; } = false;
+
+		[Description("Disable HTTP caching.")] public bool DisableHttpCaching { get; init; } = false;
+
+		[Description("The number of seconds between statistics gathers."),
+		 Unit("s")]
+		public int StatsPeriodSec { get; init; } = 30;
+
+		[Description("The number of threads to use for pool of worker services. Set to '0' to scale automatically (Default)")]
+		public int WorkerThreads { get; init; } = 0;
+
+		[Description("Enables the tracking of various histograms in the backend, " +
+					 "typically only used for debugging, etc.")]
+		[Deprecated("The EnableHistograms setting has been deprecated as of version 24.10.0 and currently has no effect. " +
+					"Please contact Kurrent if this feature is of interest to you.")]
+		public bool EnableHistograms { get; init; } = false;
+
+		[Description("Log Http Requests and Responses before processing them.")]
+		public bool LogHttpRequests { get; init; } = false;
+
+		[Description("Log the failed authentication attempts.")]
+		public bool LogFailedAuthenticationAttempts { get; init; } = false;
+
+		[Description("Skip Index Scan on Reads. This skips the index scan which was used " +
+					 "to stop reading duplicates.")]
+		public bool SkipIndexScanOnReads { get; init; } = false;
+
+		[Description("The maximum size of appends, in bytes. This is the total size of all events in the append request. " +
+					 "May not exceed 16MB.")]
+		public int MaxAppendSize { get; init; } = 1_024 * 1_024;
+
+		[Description("The maximum size of an individual event in an append request received over gRPC or HTTP, in bytes.")]
+		public int MaxAppendEventSize { get; init; } = int.MaxValue;
+
+		[Description("Disable Authentication, Authorization and TLS on all TCP/HTTP interfaces.")]
+		public bool Insecure { get; init; } = false;
+
+		[Description("Allow anonymous access to HTTP API endpoints.")]
+		public bool AllowAnonymousEndpointAccess { get; init; } = false;
+
+		[Description("Allow anonymous access to streams.")]
+		public bool AllowAnonymousStreamAccess { get; init; } = false;
+
+		[Description("Overrides anonymous access for the gossip endpoint. If set to true, the gossip endpoint will accept anonymous access. " +
+					 $"Otherwise anonymous access will be dis/allowed based on the value of the '{nameof(AllowAnonymousEndpointAccess)}' option")]
+		public bool OverrideAnonymousEndpointAccessForGossip { get; init; } = true;
+
+		[Description("Disable telemetry data collection."), EnvironmentOnly("You can only opt-out of telemetry using Environment Variables")]
+		public bool TelemetryOptout { get; init; } = false;
+	}
+
+	[Description("Logging Options")]
+	public record LoggingOptions {
+		[Description("Path where to keep log files.")]
+		public string Log { get; init; } = Locations.DefaultLogDirectory;
+
+		[Description("The name of the log configuration file.")]
+		public string LogConfig { get; init; } = "logconfig.json";
+
+		[Description("Sets the minimum log level. For more granular settings, please edit logconfig.json.")]
+		public LogLevel LogLevel { get; init; } = LogLevel.Default;
+
+		[Description("Which format (plain, json) to use when writing to the console.")]
+		public LogConsoleFormat LogConsoleFormat { get; init; } = LogConsoleFormat.Plain;
+
+		[Description("Maximum size of each log file.")]
+		public int LogFileSize { get; init; } = 1024 * 1024 * 1024;
+
+		[Description("How often to rotate logs.")]
+		public RollingInterval LogFileInterval { get; init; } = RollingInterval.Day;
+
+		[Description("How many log files to hold on to.")]
+		public int LogFileRetentionCount { get; init; } = 31;
+
+		[Description("Disable log to disk.")]
+		public bool DisableLogFile { get; init; } = false;
+	}
+
+	[Description("Authentication/Authorization Options")]
+	public record AuthOptions {
+		[Description("The type of authorization to use.")]
+		public string AuthorizationType { get; init; } = "internal";
+
+		[Description("Path to the configuration file for authorization configuration (if applicable).")]
+		public string? AuthorizationConfig { get; init; }
+
+		[Description("The type of Authentication to use.")]
+		public string AuthenticationType { get; init; } = "internal";
+
+		[Description("Path to the configuration file for Authentication configuration (if applicable).")]
+		public string? AuthenticationConfig { get; init; }
+
+		[Description("Disables first level authorization checks on all HTTP endpoints. " +
+					 "This option can be enabled for backwards compatibility with EventStore 5.0.1 or earlier.")]
+		public bool DisableFirstLevelHttpAuthorization { get; init; } = false;
+	}
+
+	[Description("Certificate Options (from file)")]
+	public record CertificateFileOptions {
+		[Description("The path to a PKCS #12 (.p12/.pfx) or an X.509 (.pem, .crt, .cer, .der) certificate file. " +
+					 "If you have intermediate certificates, they should be bundled together in a PEM or PKCS #12 file containing the node's certificate followed by the intermediate certificates.")]
+		public string? CertificateFile { get; init; }
+
+		[Description("The path to the certificate private key file (.key) if an X.509 (.pem, .crt, .cer, .der) " +
+					 "certificate file is provided.")]
+		public string? CertificatePrivateKeyFile { get; init; }
+
+		[Description("The password to the certificate if a PKCS #12 (.p12/.pfx) certificate file is provided."),
+		 Sensitive]
+		public string? CertificatePassword { get; init; }
+
+		[Description("The password to the certificate private key file if an encrypted PKCS #8 private key file is provided."),
+		 Sensitive]
+		public string? CertificatePrivateKeyPassword { get; init; }
+	}
+
+	[Description("Certificate Options")]
+	public record CertificateOptions {
+		[Description("The path to a directory which contains trusted X.509 (.pem, .crt, .cer, .der) " +
+					 "root certificate files.")]
+		public string? TrustedRootCertificatesPath { get; init; } =
+			Locations.DefaultTrustedRootCertificateDirectory;
+
+		[Description("The pattern the CN (Common Name) of a connecting KurrentDB node must match to be authenticated. A wildcard FQDN can be specified if using wildcard certificates or if the CN is not the same on all nodes. Leave empty to automatically use the CN of this node's certificate.")]
+		public string CertificateReservedNodeCommonName { get; init; } = string.Empty;
+	}
+
+	[Description("Certificate Options (from store)")]
+	public record CertificateStoreOptions {
+		[Description("The certificate store location name.")]
+		public string CertificateStoreLocation { get; init; } = string.Empty;
+
+		[Description("The certificate store name.")]
+		public string CertificateStoreName { get; init; } = string.Empty;
+
+		[Description("The certificate store subject name.")]
+		public string CertificateSubjectName { get; init; } = string.Empty;
+
+		[Description("The certificate fingerprint/thumbprint.")]
+		public string CertificateThumbprint { get; init; } = string.Empty;
+
+		[Description("The name of the certificate store that contains the trusted root certificate.")]
+		public string TrustedRootCertificateStoreName { get; init; } = string.Empty;
+
+		[Description("The certificate store location that contains the trusted root certificate.")]
+		public string TrustedRootCertificateStoreLocation { get; init; } = string.Empty;
+
+		[Description("The trusted root certificate subject name.")]
+		public string TrustedRootCertificateSubjectName { get; init; } = string.Empty;
+
+		[Description("The trusted root certificate fingerprint/thumbprint.")]
+		public string TrustedRootCertificateThumbprint { get; init; } = string.Empty;
+	}
+
+	[Description("Cluster Options")]
+	public record ClusterOptions {
+		[Description("The maximum number of entries to keep in the stream info cache. Set to '0' to scale automatically (Default)")]
+		public int StreamInfoCacheCapacity { get; init; } = 0;
+
+		[Description("The number of nodes in the cluster.")]
+		public int ClusterSize { get; init; } = 1;
+
+		[Description("The node priority used during leader election.")]
+		public int NodePriority { get; init; } = 0;
+
+		[Description("Whether to use DNS lookup to discover other cluster nodes.")]
+		public bool DiscoverViaDns { get; init; } = true;
+
+		[Description("DNS name from which other nodes can be discovered.")]
+		public string ClusterDns { get; init; } = "fake.dns";
+
+		[Description("The port on which cluster nodes' managers are running.")]
+		public int ClusterGossipPort { get; init; } = 2113;
+
+		[Description("Endpoints for other cluster nodes from which to seed gossip.")]
+		public EndPoint[] GossipSeed { get; init; } = [];
+
+		[Description("The interval, in ms, nodes should try to gossip with each other."),
+		 Unit("ms")]
+		public int GossipIntervalMs { get; init; } = 2_000;
+
+		[Description("The amount of drift, in ms, between clocks on nodes allowed before gossip is rejected."),
+		 Unit("ms")]
+		public int GossipAllowedDifferenceMs { get; init; } = 60_000;
+
+		[Description("The timeout, in ms, on gossip to another node."),
+		 Unit("ms")]
+		public int GossipTimeoutMs { get; init; } = 2_500;
+
+		[Description("Sets this node as a read only replica that is not allowed to participate in elections " +
+					 "or accept writes from clients.")]
+		public bool ReadOnlyReplica { get; init; } = false;
+
+		[Description("Sets this node as an Archiver node. Requires ReadOnlyReplica to be true. Experimental.")]
+		public bool Archiver { get; init; } = false;
+
+		[Description("Allow more nodes than the cluster size to join the cluster as clones. " +
+					 "(UNSAFE: can cause data loss if a clone is promoted as leader)")]
+		public bool UnsafeAllowSurplusNodes { get; init; } = false;
+
+		[Description("The number of seconds a dead node will remain in the gossip before being pruned."),
+		 Unit("s")]
+		public int DeadMemberRemovalPeriodSec { get; init; } = 1_800;
+
+		[Description("The timeout, in milliseconds, on election messages to other nodes."),
+		 Unit("ms")]
+		public int LeaderElectionTimeoutMs { get; init; } = 1_000;
+
+		public int QuorumSize => ClusterSize == 1 ? 1 : ClusterSize / 2 + 1;
+	}
+
+	[Description("Database Options")]
+	public record DatabaseOptions {
+		[Description("The minimum flush delay in milliseconds."),
+		 Unit("ms")]
+		public double MinFlushDelayMs { get; init; } = TFConsts.MinFlushDelayMs.TotalMilliseconds;
+
+		[Description("Disables the merging of chunks when scavenge is running.")]
+		public bool DisableScavengeMerging { get; init; } = false;
+
+		[Description("The number of days to keep scavenge history."),
+		Unit("d")]
+		public int ScavengeHistoryMaxAge { get; init; } = 30;
+
+		[Description("The number of chunks to cache in unmanaged memory.")]
+		public int CachedChunks { get; init; } = -1;
+
+		[Description("The amount of unmanaged memory to use for caching chunks in bytes.")]
+		public long ChunksCacheSize { get; init; } = TFConsts.ChunksCacheSize;
+
+		[Description("Adjusts the maximum size of a mem table.")]
+		public int MaxMemTableSize { get; init; } = 1_000_000;
+
+		[Description("The number of events to read per candidate in the case of a hash collision.")]
+		public int HashCollisionReadLimit { get; init; } = 100;
+
+		[Description("The path the db should be loaded/saved to.")]
+		public string Db { get; init; } = Locations.DefaultDataDirectory;
+
+		[Description("The path the index should be loaded/saved to.")]
+		public string? Index { get; init; } = null;
+
+		[Description("The type of transformation to apply to the database.")]
+		public string Transform { get; init; } = "identity";
+
+		[Description("Keep everything in memory, no directories or files are created.")]
+		public bool MemDb { get; init; } = false;
+
+		[Description("Creates a Bloom filter file for each new index file to speed up index reads.")]
+		public bool UseIndexBloomFilters { get; init; } = true;
+
+		[Description("The maximum number of entries to keep in each index cache.")]
+		public int IndexCacheSize { get; init; } = 0;
+
+		[Description("Bypasses the checking of file hashes of database during startup " +
+					 "(allows for faster startup).")]
+		public bool SkipDbVerify { get; init; } = false;
+
+		[Description("Enables Write Through when writing to the file system, this bypasses filesystem caches.")]
+		public bool WriteThrough { get; init; } = false;
+
+		[Description("Enables Unbuffered/DirectIO when writing to the file system, this bypasses filesystem " +
+					 "caches.")]
+		[Deprecated("The Unbuffered setting has been deprecated as of version 24.6.0 and currently has no effect. " +
+					"Please contact Kurrent if this feature is of interest to you.")]
+		public bool Unbuffered { get; init; } = false;
+
+		[Description("The initial number of readers to start when opening a TFChunk.")]
+		[Deprecated("The ChunkInitialReaderCount parameter has been deprecated as of version 24.6.0 and currently has no effect.")]
+		public int ChunkInitialReaderCount { get; init; } = 5;
+
+		[Description("Prepare timeout (in milliseconds)."),
+		 Unit("ms")]
+		public int PrepareTimeoutMs { get; init; } = 2_000;
+
+		[Description("Commit timeout (in milliseconds)."),
+		 Unit("ms")]
+		public int CommitTimeoutMs { get; init; } = 2_000;
+
+		[Description("Write timeout (in milliseconds)."),
+		 Unit("ms")]
+		public int WriteTimeoutMs { get; init; } = 2_000;
+
+		[Description("Disable flushing to disk. (UNSAFE: on power off)")]
+		public bool UnsafeDisableFlushToDisk { get; init; }
+
+		[Description("Disables Hard Deletes. (UNSAFE: use to remove hard deletes)")]
+		[Deprecated("This setting is unsafe and not recommended")]
+		public bool UnsafeIgnoreHardDelete { get; init; } = false;
+
+		[Description("Bypasses the checking of file hashes of indexes during startup and after index merges " +
+					 "(allows for faster startup and less disk pressure after merges).")]
+		public bool SkipIndexVerify { get; init; } = false;
+
+		[Description("Sets the depth to cache for the mid point cache in index.")]
+		public int IndexCacheDepth { get; init; } = 16;
+
+		[Description("Change the way the DB files are opened to reduce their stickiness in the system file cache.")]
+		public bool ReduceFileCachePressure { get; init; } = false;
+
+		[Description("Number of threads to be used to initialize the database. " +
+					 "Will be capped at host processor count.")]
+		public int InitializationThreads { get; init; } = 1;
+
+		[Description("The number of reader threads to use for processing reads. Set to '0' to scale automatically (Default)")]
+		public int ReaderThreadsCount { get; init; } = 0;
+
+		[Description("During large Index Merge operations, writes may be slowed down. Set this to the maximum " +
+					 "index file level for which automatic merges should happen. Merging indexes above this level " +
+					 "should be done manually.")]
+		public int MaxAutoMergeIndexLevel { get; init; } = int.MaxValue;
+
+		[Description("Set this option to write statistics to the database.")]
+		public bool WriteStatsToDb {
+			get => (StatsStorage.Stream & StatsStorage) != 0;
+			init => StatsStorage =
+				value
+					? StatsStorage.StreamAndFile
+					: StatsStorage.File; // TODO SS: not sure if we should do this here
+		}
+
+		[Description("When truncate.chk is set, the database will be truncated on startup. " +
+					 "This is a safety check to ensure large amounts of data truncation does not happen " +
+					 "accidentally. This value should be set in the low 10,000s for allow for " +
+					 "standard cluster recovery operations. -1 is no max.")]
+		public long MaxTruncation { get; init; } = 256 * 1_024 * 1_024;
+
+		public int ChunkSize { get; init; } = TFConsts.ChunkSize;
+
+		public StatsStorage StatsStorage { get; init; } = StatsStorage.File;
+
+		[Description("The log format version to use for storing the event log. " +
+					 "V3 is currently in development and should only be used for testing purposes.")]
+		public DbLogFormat DbLogFormat { get; init; } = DbLogFormat.V2;
+
+		[Description("The amount of memory & disk space, in bytes, to use for the stream existence filter. " +
+					 "This should be set to roughly the maximum number of streams you expect to have in your database, " +
+					 "i.e if you expect to have a max of 500 million streams, use a value of 500 megabytes. " +
+					 "The value you select should also fit entirely in memory to avoid any performance degradation. " +
+					 "Use 0 to disable the filter. Resizing the filter will cause a full rebuild.")]
+		public long StreamExistenceFilterSize { get; init; } = Opts.StreamExistenceFilterSizeDefault;
+
+		[Description("The page size of the scavenge database.")]
+		public int ScavengeBackendPageSize { get; init; } = Opts.ScavengeBackendPageSizeDefault;
+
+		[Description("The amount of memory to use for backend caching in bytes.")]
+		public long ScavengeBackendCacheSize { get; init; } = Opts.ScavengeBackendCacheSizeDefault;
+
+		[Description("The number of stream hashes to remember when checking for collisions.")]
+		public int ScavengeHashUsersCacheCapacity { get; init; } = Opts.ScavengeHashUsersCacheCapacityDefault;
+	}
+
+	[Description("gRPC Options")]
+	public record GrpcOptions {
+		[Description("Controls the period (in milliseconds) after which a keepalive ping " +
+					 "is sent on the transport."),
+		 Unit("ms")]
+		public int KeepAliveInterval { get; init; } = 10_000;
+
+		[Description("Controls the amount of time (in milliseconds) the sender of the keepalive ping waits " +
+					 "for an acknowledgement. If it does not receive an acknowledgment within this time, " +
+					 "it will close the connection."),
+		 Unit("ms")]
+		public int KeepAliveTimeout { get; init; } = 10_000;
+
+		internal static GrpcOptions FromConfiguration(IConfiguration configurationRoot) => new() {
+			KeepAliveInterval = configurationRoot.GetValue<int>(nameof(KeepAliveInterval)),
+			KeepAliveTimeout = configurationRoot.GetValue<int>(nameof(KeepAliveTimeout))
+		};
+	}
+
+	[Description("Interface Options")]
+	public record InterfaceOptions {
+		[Description("The IP Address used by internal replication between nodes in the cluster.")]
+		public IPAddress ReplicationIp { get; init; } = IPAddress.Loopback;
+
+		[Description("The IP Address for the node.")]
+		public IPAddress NodeIp { get; init; } = IPAddress.Loopback;
+
+		[Description("The Port to run the HTTP server on.")]
+		public int NodePort { get; init; } = 2113;
+
+		[Description("The TCP port used by internal replication between nodes in the cluster.")]
+		public int ReplicationPort { get; init; } = 1112;
+
+		[Description("Advertise the Node's host name to other nodes and external clients as.")]
+		public string? NodeHostAdvertiseAs { get; init; } = null;
+
+		[Description("Advertise the Replication host name to other nodes in the cluster as.")]
+		public string? ReplicationHostAdvertiseAs { get; init; } = null;
+
+		[Description("Advertise Host in Gossip to Client As.")]
+		public string? AdvertiseHostToClientAs { get; init; } = null;
+
+		[Description("Advertise Node Port in Gossip to Client As.")]
+		public int AdvertiseNodePortToClientAs { get; init; } = 0;
+
+		[Description("Advertise Http Port As.")]
+		public int NodePortAdvertiseAs { get; init; } = 0;
+
+		[Description("Advertise Replication Tcp Port As.")]
+		public int ReplicationTcpPortAdvertiseAs { get; init; } = 0;
+
+		[Description("Heartbeat timeout for Replication TCP sockets."),
+		 Unit("ms")]
+		public int ReplicationHeartbeatTimeout { get; init; } = 700;
+
+		[Description("Heartbeat interval for Replication TCP sockets."),
+		 Unit("ms")]
+		public int ReplicationHeartbeatInterval { get; init; } = 700;
+
+		[Description("Whether to allow local connections via a UNIX domain socket.")]
+		public bool EnableUnixSocket { get; init; } = false;
+
+		[Description("The maximum number of pending send bytes allowed before a connection is closed.")]
+		public int ConnectionPendingSendBytesThreshold { get; init; } = 10 * 1_024 * 1_024;
+
+		[Description("The maximum number of pending connection operations allowed before a connection is closed.")]
+		public int ConnectionQueueSizeThreshold { get; init; } = 50_000;
+
+		[Description("Disables the admin ui on the HTTP endpoint.")]
+		public bool DisableAdminUi { get; init; } = false;
+
+		[Description("Disables statistics requests on the HTTP endpoint.")]
+		public bool DisableStatsOnHttp { get; init; } = false;
+
+		[Description("Disables gossip requests on the HTTP endpoint.")]
+		public bool DisableGossipOnHttp { get; init; } = false;
+
+		[Description("Enables trusted authentication by an intermediary in the HTTP.")]
+		public bool EnableTrustedAuth { get; init; } = false;
+
+		[Description("Enable AtomPub over HTTP Interface."),
+		 Deprecated("AtomPub over HTTP Interface has been deprecated as of version 20.6.0. It is recommended to use gRPC instead")]
+		public bool EnableAtomPubOverHttp { get; init; } = false;
+	}
+
+	[Description("Projection Options")]
+	public record ProjectionOptions {
+		public const int DefaultProjectionExecutionTimeout = 250;
+		[Description("Enables the running of projections. System runs built-in projections, " +
+					 "All runs user projections.")]
+		public ProjectionType RunProjections { get; init; }
+
+		[Description("Start the built in system projections.")]
+		public bool StartStandardProjections { get; init; } = false;
+
+		[Description("The number of threads to use for projections.")]
+		public int ProjectionThreads { get; init; } = 3;
+
+		[Description("The number of minutes a query can be idle before it expires."),
+		 Unit("m")]
+		public int ProjectionsQueryExpiry { get; init; } = 5;
+
+		[Description("Fault the projection if the Event number that was expected in the stream differs " +
+					 "from what is received. This may happen if events have been deleted or expired.")]
+		public bool FaultOutOfOrderProjections { get; init; } = false;
+
+		[Description("The time in milliseconds allowed for the compilation phase of user projections"),
+		 Unit("ms")]
+		public int ProjectionCompilationTimeout { get; set; } = 500;
+
+		[Description("The maximum execution time in milliseconds for executing a handler in a user projection. It can be overridden for a specific projection by setting ProjectionExecutionTimeout config for that projection"),
+		 Unit("ms")]
+		public int ProjectionExecutionTimeout { get; set; } = DefaultProjectionExecutionTimeout;
+
+		[Description("The maximum size, in bytes, of a projection's state and result. A projection will fault if its state size exceeds this value. May not exceed 16mb.")]
+		public int MaxProjectionStateSize { get; set; } = Opts.MaxProjectionStateSizeDefault;
+	}
+
+	public record UnknownOptions(IReadOnlyList<(string, string)> Options) {
+		/// <summary>
+		/// Identifies unknown options in the configuration and provides suggestions for known options.
+		/// </summary>
+		public static UnknownOptions FromConfiguration(IConfiguration configuration) {
+			var knownKeys = Metadata
+				.SelectMany(x => x.Options)
+				.Select(x => x.Key)
+				.ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+			var unknownKeys = FindUnknownKeys(configuration, knownKeys);
+
+			var result = unknownKeys
+				.Select(unknownKey => CreateUnknownOptionResult(knownKeys, unknownKey))
+				.ToList();
+
+			return new(result);
+
+			static IEnumerable<string> FindUnknownKeys(IConfiguration configuration,
+				IReadOnlySet<string> knownKeys) {
+				var unknownKeys = configuration
+					.AsEnumerable()
+					.Select(kvp => kvp.Key)
+					.Where(key => key != KurrentConfigurationKeys.Prefix
+								  && !knownKeys.Contains(KurrentConfigurationKeys.Normalize(key)))
+					.ToList();
+
+				var unknownSections = FindUnknownSections(unknownKeys);
+
+				// only report top level unknown keys. plugins, metrics, etc will use nested keys.
+				// in the future we may report unknown keys in nested sections but it is out of scope for now.
+				return unknownKeys
+					.Where(key => !unknownSections.Any(key.StartsWith));
+			}
+
+			static HashSet<string> FindUnknownSections(IEnumerable<string> keys) {
+				// if it has more than 2 sections, we found a value with an unknown section
+				var hashSet = new HashSet<string>();
+
+				foreach (var key in keys.Where(key => key.Split(":").Length > 2))
+					hashSet.Add(key[..key.LastIndexOf(':')]);
+
+				return hashSet;
+			}
+
+			static (string UnknownKey, string SuggestedKey) CreateUnknownOptionResult(IEnumerable<string> knownKeys,
+				string unknownKey, int distanceThreshold = 5) {
+				var suggestion = knownKeys
+					.Select(key => (AllowedKey: key, Distance: Levenshtein.GetDistance(unknownKey, key)))
+					.MinBy(x => x.Distance);
+
+				return (
+					UnknownKey: KurrentConfigurationKeys.StripConfigurationPrefix(unknownKey),
+					SuggestedKey: suggestion.Distance > distanceThreshold
+						? ""
+						: KurrentConfigurationKeys.StripConfigurationPrefix(suggestion.AllowedKey)
+				);
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Configuration/ClusterVNodeOptionsExtensions.cs b/src/KurrentDB.Core/Configuration/ClusterVNodeOptionsExtensions.cs
new file mode 100644
index 00000000000..b79201e2eba
--- /dev/null
+++ b/src/KurrentDB.Core/Configuration/ClusterVNodeOptionsExtensions.cs
@@ -0,0 +1,282 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+// ReSharper disable CheckNamespace
+
+using System;
+using System.Net;
+using System.Security.Cryptography.X509Certificates;
+using EventStore.Plugins;
+using KurrentDB.Common.Exceptions;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Certificates;
+using Serilog;
+
+namespace KurrentDB.Core;
+
+public static class ClusterVNodeOptionsExtensions {
+	public static ClusterVNodeOptions Reload(this ClusterVNodeOptions options) =>
+		options.ConfigurationRoot == null
+			? options
+			: ClusterVNodeOptions.FromConfiguration(options.ConfigurationRoot);
+
+	public static ClusterVNodeOptions WithPlugableComponent(this ClusterVNodeOptions options, IPlugableComponent plugableComponent) =>
+		options with { PlugableComponents = [.. options.PlugableComponents, plugableComponent] };
+
+	public static ClusterVNodeOptions InCluster(this ClusterVNodeOptions options, int clusterSize) => options with {
+		Cluster = options.Cluster with {
+			ClusterSize = clusterSize <= 1
+				? throw new ArgumentOutOfRangeException(nameof(clusterSize), clusterSize,
+					$"{nameof(clusterSize)} must be greater than 1.")
+				: clusterSize
+		}
+	};
+
+	/// <summary>
+	/// Returns a builder set to run in memory only
+	/// </summary>
+	/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
+	/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
+	public static ClusterVNodeOptions RunInMemory(this ClusterVNodeOptions options) => options with {
+		Database = options.Database with {
+			MemDb = true,
+			Db = new ClusterVNodeOptions().Database.Db
+		}
+	};
+
+	/// <summary>
+	/// Returns a builder set to write database files to the specified path
+	/// </summary>
+	/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
+	/// <param name="path">The path on disk in which to write the database files</param>
+	/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
+	public static ClusterVNodeOptions RunOnDisk(this ClusterVNodeOptions options, string path) => options with {
+		Database = options.Database with {
+			MemDb = false,
+			Db = path
+		}
+	};
+
+	/// <summary>
+	/// Runs the node in insecure mode.
+	/// </summary>
+	/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
+	/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
+	public static ClusterVNodeOptions Insecure(this ClusterVNodeOptions options) => options with {
+		Application = options.Application with {
+			Insecure = true
+		},
+		ServerCertificate = null,
+		TrustedRootCertificates = null
+	};
+
+	/// <summary>
+	/// Runs the node in secure mode.
+	/// </summary>
+	/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
+	/// <param name="trustedRootCertificates">A <see cref="X509Certificate2Collection"/> containing trusted root <see cref="X509Certificate2"/></param>
+	/// <param name="serverCertificate">A <see cref="X509Certificate2"/> for the server</param>
+	/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
+	public static ClusterVNodeOptions Secure(this ClusterVNodeOptions options,
+		X509Certificate2Collection trustedRootCertificates, X509Certificate2 serverCertificate) => options with {
+			Application = options.Application with {
+				Insecure = false,
+			},
+			ServerCertificate = serverCertificate,
+			TrustedRootCertificates = trustedRootCertificates
+		};
+
+	/// <summary>
+	/// Sets gossip seeds to the specified value and turns off dns discovery
+	/// </summary>
+	/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
+	/// <param name="gossipSeeds">The list of gossip seeds</param>
+	/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
+	public static ClusterVNodeOptions WithGossipSeeds(this ClusterVNodeOptions options, EndPoint[] gossipSeeds) =>
+		options with {
+			Cluster = options.Cluster with {
+				GossipSeed = gossipSeeds,
+				DiscoverViaDns = false,
+				ClusterDns = string.Empty
+			}
+		};
+
+	/// <summary>
+	/// Sets the external tcp endpoint to the specified value
+	/// </summary>
+	/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
+	/// <param name="endPoint">The external endpoint to use</param>
+	/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
+	public static ClusterVNodeOptions WithExternalTcpOn(
+		this ClusterVNodeOptions options, IPEndPoint endPoint) =>
+		options with {
+			Interface = options.Interface with {
+				NodeIp = endPoint.Address,
+			}
+		};
+
+	/// <summary>
+	/// Sets the internal tcp endpoint to the specified value
+	/// </summary>
+	/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
+	/// <param name="endPoint">The internal endpoint to use</param>
+	/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
+	public static ClusterVNodeOptions WithReplicationEndpointOn(
+		this ClusterVNodeOptions options, IPEndPoint endPoint) =>
+		options with {
+			Interface = options.Interface with {
+				ReplicationIp = endPoint.Address,
+				ReplicationPort = endPoint.Port,
+			}
+		};
+
+	/// <summary>
+	/// Sets the http endpoint to the specified value
+	/// </summary>
+	/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
+	/// <param name="endPoint">The http endpoint to use</param>
+	/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
+	public static ClusterVNodeOptions WithNodeEndpointOn(
+		this ClusterVNodeOptions options, IPEndPoint endPoint) =>
+		options with {
+			Interface = options.Interface with {
+				NodeIp = endPoint.Address,
+				NodePort = endPoint.Port
+			}
+		};
+
+	/// <summary>
+	/// Sets up the External Host that would be advertised
+	/// </summary>
+	/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
+	/// <param name="endPoint">The advertised host</param>
+	/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
+	public static ClusterVNodeOptions
+		AdvertiseExternalHostAs(this ClusterVNodeOptions options, EndPoint endPoint) =>
+		options with {
+			Interface = options.Interface with {
+				NodeHostAdvertiseAs = endPoint.GetHost(),
+			}
+		};
+
+	/// <summary>
+	/// Sets up the Internal Host that would be advertised
+	/// </summary>
+	/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
+	/// <param name="endPoint">The advertised host</param>
+	/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
+	public static ClusterVNodeOptions
+		AdvertiseInternalHostAs(this ClusterVNodeOptions options, EndPoint endPoint) =>
+		options with {
+			Interface = options.Interface with {
+				ReplicationHostAdvertiseAs = endPoint.GetHost(),
+				ReplicationTcpPortAdvertiseAs = endPoint.GetPort()
+			}
+		};
+
+	/// <summary>
+	/// </summary>
+	/// <param name="options">The <see cref="ClusterVNodeOptions"/></param>
+	/// <param name="endPoint">The advertised host</param>
+	/// <returns>A <see cref="ClusterVNodeOptions"/> with the options set</returns>
+	public static ClusterVNodeOptions AdvertiseNodeAs(this ClusterVNodeOptions options, EndPoint endPoint) =>
+		options with {
+			Interface = options.Interface with {
+				NodeHostAdvertiseAs = endPoint.GetHost(),
+				NodePortAdvertiseAs = endPoint.GetPort()
+			}
+		};
+
+	/// <summary>
+	/// </summary>
+	/// <param name="options"></param>
+	/// <returns></returns>
+	/// <exception cref="InvalidConfigurationException"></exception>
+	public static (X509Certificate2 certificate, X509Certificate2Collection intermediates) LoadNodeCertificate(
+		this ClusterVNodeOptions options) {
+		if (options.ServerCertificate != null) {
+			//used by test code paths only
+			return (options.ServerCertificate!, null);
+		}
+
+
+		if (!string.IsNullOrWhiteSpace(options.CertificateStore.CertificateStoreLocation)) {
+			var location =
+				CertificateUtils.GetCertificateStoreLocation(options.CertificateStore.CertificateStoreLocation);
+			var name = CertificateUtils.GetCertificateStoreName(options.CertificateStore.CertificateStoreName);
+			return (CertificateUtils.LoadFromStore(location, name, options.CertificateStore.CertificateSubjectName,
+				options.CertificateStore.CertificateThumbprint), null);
+		}
+
+		if (!string.IsNullOrWhiteSpace(options.CertificateStore.CertificateStoreName)) {
+			var name = CertificateUtils.GetCertificateStoreName(options.CertificateStore.CertificateStoreName);
+			return (
+				CertificateUtils.LoadFromStore(name, options.CertificateStore.CertificateSubjectName,
+					options.CertificateStore.CertificateThumbprint), null);
+		}
+
+		if (options.CertificateFile.CertificateFile.IsNotEmptyString()) {
+			Log.Information("Loading the node's certificate(s) from file: {path}",
+				options.CertificateFile.CertificateFile);
+			return CertificateUtils.LoadFromFile(options.CertificateFile.CertificateFile,
+				options.CertificateFile.CertificatePrivateKeyFile, options.CertificateFile.CertificatePassword,
+				options.CertificateFile.CertificatePrivateKeyPassword);
+		}
+
+		throw new InvalidConfigurationException(
+			"A certificate is required unless insecure mode (--insecure) is set.");
+	}
+
+	/// <summary>
+	/// Loads an <see cref="X509Certificate2Collection"/> from the options set.
+	/// If either TrustedRootCertificateStoreLocation or TrustedRootCertificateStoreName is set,
+	/// then the certificates will only be loaded from the certificate store.
+	/// Otherwise, the certificates will be loaded from the path specified by TrustedRootCertificatesPath.
+	/// </summary>
+	/// <param name="options"></param>
+	/// <returns></returns>
+	/// <exception cref="InvalidConfigurationException"></exception>
+	public static X509Certificate2Collection LoadTrustedRootCertificates(this ClusterVNodeOptions options) {
+		if (options.TrustedRootCertificates != null)
+			return options.TrustedRootCertificates;
+		var trustedRootCerts = new X509Certificate2Collection();
+
+		if (!string.IsNullOrWhiteSpace(options.CertificateStore.TrustedRootCertificateStoreLocation)) {
+			var location =
+				CertificateUtils.GetCertificateStoreLocation(options.CertificateStore
+					.TrustedRootCertificateStoreLocation);
+			var name = CertificateUtils.GetCertificateStoreName(options.CertificateStore
+				.TrustedRootCertificateStoreName);
+			trustedRootCerts.Add(CertificateUtils.LoadFromStore(location, name,
+				options.CertificateStore.TrustedRootCertificateSubjectName,
+				options.CertificateStore.TrustedRootCertificateThumbprint));
+			return trustedRootCerts;
+		}
+
+		if (!string.IsNullOrWhiteSpace(options.CertificateStore.TrustedRootCertificateStoreName)) {
+			var name = CertificateUtils.GetCertificateStoreName(options.CertificateStore
+				.TrustedRootCertificateStoreName);
+			trustedRootCerts.Add(CertificateUtils.LoadFromStore(name,
+				options.CertificateStore.TrustedRootCertificateSubjectName,
+				options.CertificateStore.TrustedRootCertificateThumbprint));
+			return trustedRootCerts;
+		}
+
+		if (string.IsNullOrEmpty(options.Certificate.TrustedRootCertificatesPath)) {
+			throw new InvalidConfigurationException(
+				$"{nameof(options.Certificate.TrustedRootCertificatesPath)} must be specified unless insecure mode (--insecure) is set.");
+		}
+
+		Log.Information("Loading trusted root certificates.");
+		foreach (var (fileName, cert) in CertificateUtils
+					 .LoadAllCertificates(options.Certificate.TrustedRootCertificatesPath)) {
+			trustedRootCerts.Add(cert);
+			Log.Information("Loading trusted root certificate file: {file}", fileName);
+		}
+
+		if (trustedRootCerts.Count == 0)
+			throw new InvalidConfigurationException(
+				$"No trusted root certificate files were loaded from the specified path: {options.Certificate.TrustedRootCertificatesPath}");
+		return trustedRootCerts;
+	}
+}
diff --git a/src/EventStore.Core/Configuration/ClusterVNodeOptionsPrinter.cs b/src/KurrentDB.Core/Configuration/ClusterVNodeOptionsPrinter.cs
similarity index 87%
rename from src/EventStore.Core/Configuration/ClusterVNodeOptionsPrinter.cs
rename to src/KurrentDB.Core/Configuration/ClusterVNodeOptionsPrinter.cs
index 152882e1184..c619d8ac107 100644
--- a/src/EventStore.Core/Configuration/ClusterVNodeOptionsPrinter.cs
+++ b/src/KurrentDB.Core/Configuration/ClusterVNodeOptionsPrinter.cs
@@ -1,10 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 #nullable enable
 
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace EventStore.Core.Configuration;
+namespace KurrentDB.Core.Configuration;
 
 public static class ClusterVNodeOptionsPrinter {
 	public static string Print(IReadOnlyDictionary<string, LoadedOption> loadedOptions) {
diff --git a/src/EventStore.Core/Configuration/ClusterVNodeOptionsValidator.cs b/src/KurrentDB.Core/Configuration/ClusterVNodeOptionsValidator.cs
similarity index 86%
rename from src/EventStore.Core/Configuration/ClusterVNodeOptionsValidator.cs
rename to src/KurrentDB.Core/Configuration/ClusterVNodeOptionsValidator.cs
index ec253d8b1d7..194f4be3b86 100644
--- a/src/EventStore.Core/Configuration/ClusterVNodeOptionsValidator.cs
+++ b/src/KurrentDB.Core/Configuration/ClusterVNodeOptionsValidator.cs
@@ -1,13 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 // ReSharper disable CheckNamespace
+
 using System;
 using System.IO;
-using EventStore.Common.Exceptions;
-using EventStore.Core.Services;
-using EventStore.Core.TransactionLog.Chunks;
-using EventStore.Core.Util;
+using KurrentDB.Common.Exceptions;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.Util;
 using Serilog;
 
-namespace EventStore.Core;
+namespace KurrentDB.Core;
 
 public static class ClusterVNodeOptionsValidator {
 	public static void Validate(ClusterVNodeOptions options) {
@@ -68,7 +72,7 @@ public static void Validate(ClusterVNodeOptions options) {
 
 		if (options.Database.Db.StartsWith("~")) {
 			throw new ApplicationInitializationException(
-				"The given database path starts with a '~'. Event Store does not expand '~'.");
+				"The given database path starts with a '~'. KurrentDB does not expand '~'.");
 		}
 
 		if (options.Database.Index != null && options.Database.Db != null) {
@@ -92,13 +96,18 @@ public static void Validate(ClusterVNodeOptions options) {
 
 		if (options.Cluster.Archiver && !options.Cluster.ReadOnlyReplica) {
 			throw new InvalidConfigurationException(
-				"Only Read Only Replica nodes can be Archivers.");
+				"The Archiver node must also be a Read Only Replica.");
+		}
+
+		if (options.Cluster.Archiver && options.Database.UnsafeIgnoreHardDelete) {
+			throw new InvalidConfigurationException(
+				"The Archiving feature is not compatible with UnsafeIgnoreHardDelete.");
 		}
 	}
 
 	public static bool ValidateForStartup(ClusterVNodeOptions options) {
 		if (!options.Cluster.DiscoverViaDns && options.Cluster.GossipSeed.Length == 0 &&
-		    options.Cluster.ClusterSize == 1) {
+			options.Cluster.ClusterSize == 1) {
 			Log.Information(
 				"DNS discovery is disabled, but no gossip seed endpoints have been specified. Since "
 				+ "the cluster size is set to 1, this may be intentional. Gossip seeds can be specified "
diff --git a/src/KurrentDB.Core/Configuration/ConfigurationBuilderExtensions.cs b/src/KurrentDB.Core/Configuration/ConfigurationBuilderExtensions.cs
new file mode 100644
index 00000000000..b47ff6990df
--- /dev/null
+++ b/src/KurrentDB.Core/Configuration/ConfigurationBuilderExtensions.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System;
+using System.IO;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.FileProviders;
+using Serilog;
+
+namespace KurrentDB.Core.Configuration;
+
+public static class ConfigurationBuilderExtensions {
+
+	public static IConfigurationBuilder AddKurrentConfigFile(this IConfigurationBuilder builder, string configFilePath,
+		bool optional = false, bool reloadOnChange = false) {
+		if (!Locations.TryLocateConfigFile(configFilePath, out var directory, out var fileName)) {
+			if (optional)
+				return builder;
+
+			throw new FileNotFoundException(
+				$"Could not find {configFilePath} in the following directories: {string.Join(", ", Locations.GetPotentialConfigurationDirectories())}");
+		}
+
+		builder.AddJsonFile(config => {
+			config.Optional = optional;
+			config.FileProvider = new PhysicalFileProvider(directory) {
+				UseActivePolling = reloadOnChange,
+				UsePollingFileWatcher = reloadOnChange
+			};
+			config.OnLoadException = context => Log.Error(context.Exception, "err");
+			config.Path = fileName;
+			config.ReloadOnChange = reloadOnChange;
+		});
+
+		return builder;
+	}
+
+	public static IConfigurationBuilder AddKurrentConfigFiles(this IConfigurationBuilder builder, string subdirectory,
+		string pattern) {
+		AddConfigFiles(subdirectory, pattern, (file) =>
+			builder.AddKurrentConfigFile(file, optional: true, reloadOnChange: true));
+		return builder;
+	}
+
+	public static void AddConfigFiles(string subdirectory,
+		string pattern, Action<string> addConfigFile) {
+		// when searching for a file we check the directories in forward order until we find it
+		// so when adding all the files we apply them in reverse order to keep the same precedence
+		foreach (var directory in Locations.GetPotentialConfigurationDirectories().Reverse()) {
+			var configDirectory = Path.Combine(directory, subdirectory);
+			if (!Directory.Exists(configDirectory))
+				continue;
+
+			foreach (var configFile in Directory.EnumerateFiles(configDirectory, pattern).Order()) {
+				addConfigFile(configFile);
+			}
+		}
+	}
+
+	public static IConfigurationBuilder AddKurrentConfigFiles(this IConfigurationBuilder builder, string pattern) =>
+		builder.AddKurrentConfigFiles("config", pattern);
+}
diff --git a/src/KurrentDB.Core/Configuration/ConfigurationProviderExtensions.cs b/src/KurrentDB.Core/Configuration/ConfigurationProviderExtensions.cs
new file mode 100644
index 00000000000..c0faaa91046
--- /dev/null
+++ b/src/KurrentDB.Core/Configuration/ConfigurationProviderExtensions.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Configuration.Sources;
+using Microsoft.Extensions.Configuration;
+
+namespace KurrentDB.Core.Configuration;
+
+public static class ConfigurationProviderExtensions {
+	public static IEnumerable<string> GetChildKeys(this IConfigurationProvider provider) =>
+		provider.GetChildKeys([], KurrentConfigurationKeys.Prefix);
+}
diff --git a/src/KurrentDB.Core/Configuration/ConfigurationRootExtensions.cs b/src/KurrentDB.Core/Configuration/ConfigurationRootExtensions.cs
new file mode 100644
index 00000000000..0137b66c6ef
--- /dev/null
+++ b/src/KurrentDB.Core/Configuration/ConfigurationRootExtensions.cs
@@ -0,0 +1,112 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using KurrentDB.Common.Configuration;
+using KurrentDB.Common.Exceptions;
+using KurrentDB.Core.Configuration.Sources;
+using Microsoft.Extensions.Configuration;
+
+namespace KurrentDB.Core.Configuration;
+
+public static class ConfigurationRootExtensions {
+	public static string[] CheckProvidersForLegacyEventStoreConfiguration(this IConfigurationRoot? configurationRoot) {
+		if (configurationRoot == null)
+			return [];
+		var errorMessages = new List<string>();
+		foreach (var provider in configurationRoot.Providers) {
+			var source = provider.GetType();
+			if (source == typeof(EventStoreCommandLineConfigurationProvider) ||
+				source == typeof(EventStoreEnvironmentVariablesConfigurationProvider) ||
+				source == typeof(EventStoreJsonFileConfigurationProvider)) {
+				errorMessages.AddRange(
+					provider.GetChildKeys().Select(
+						key =>
+							$"\"{key}\" Provided by: {ClusterVNodeOptions.GetSourceDisplayName(KurrentConfigurationKeys.Prefix + ":" + key, provider)}. " +
+							$"The \"{KurrentConfigurationKeys.LegacyEventStorePrefix}\" configuration root " +
+							$"has been deprecated, use \"{KurrentConfigurationKeys.Prefix}\" instead."));
+			}
+		}
+
+		return errorMessages.ToArray();
+	}
+
+	public static string? CheckProvidersForEnvironmentVariables(this IConfigurationRoot? configurationRoot, IEnumerable<Type> optionSections) {
+		if (configurationRoot == null)
+			return null;
+
+		var environmentOptionsOnly = optionSections.SelectMany(section => section.GetProperties())
+			.Where(option => option.GetCustomAttribute<EnvironmentOnlyAttribute>() != null)
+			.Select(option => option)
+			.ToArray();
+
+		var errorBuilder = new StringBuilder();
+
+		foreach (var provider in configurationRoot.Providers) {
+			var source = provider.GetType();
+
+			if (source == typeof(KurrentDefaultValuesConfigurationProvider) ||
+				source == typeof(KurrentDBEnvironmentVariablesConfigurationProvider) ||
+				source == typeof(EventStoreEnvironmentVariablesConfigurationProvider))
+				continue;
+
+			var errorDescriptions =
+				from key in provider.GetChildKeys()
+				from property in environmentOptionsOnly
+				where string.Equals(property.Name, key, StringComparison.CurrentCultureIgnoreCase)
+				select (key, property.GetCustomAttribute<EnvironmentOnlyAttribute>()?.Message);
+
+			errorBuilder.Append(
+				errorDescriptions
+					.Aggregate(
+						new StringBuilder(),
+						(sb, pair) => sb.AppendLine($"\"{pair.key}\" Provided by: {ClusterVNodeOptions.GetSourceDisplayName(KurrentConfigurationKeys.Prefix + ":" + pair.key, provider)}. {pair.Message}")
+					)
+			);
+		}
+
+		return errorBuilder.Length != 0 ? errorBuilder.ToString() : null;
+	}
+
+	public static string[] CheckProvidersForEventStoreDefaultLocations(
+		this IConfigurationRoot? configurationRoot, LocationOptionWithLegacyDefault[] optionsWithLegacyDefaults) {
+		if (configurationRoot is null) {
+			return [];
+		}
+
+		var legacyLocationsProvider = configurationRoot
+			.Providers.OfType<EventStoreDefaultLocationsProvider>().FirstOrDefault();
+		if (legacyLocationsProvider is null) {
+			return [];
+		}
+
+		var warnings = new List<string>();
+		foreach (var legacyOption in optionsWithLegacyDefaults) {
+			if (!legacyLocationsProvider.TryGet(legacyOption.OptionKey, out var value))
+				continue;
+			if (value is not null) {
+				warnings.Add($"\"{legacyOption.OptionKey}\": The default location \"{legacyOption.KurrentPath}\" was not found, using the legacy default location \"{value}\".");
+			}
+		}
+
+		return warnings.ToArray();
+	}
+
+	public static T BindOptions<T>(this IConfiguration configuration) where T : new() {
+		try {
+			return configuration.Get<T>() ?? new T();
+		} catch (InvalidOperationException ex) {
+			var messages = new string?[] { ex.Message, ex.InnerException?.Message }
+				.Where(x => !string.IsNullOrWhiteSpace(x))
+				.Select(x => x?.TrimEnd('.'));
+
+			throw new InvalidConfigurationException(string.Join(". ", messages) + ".");
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Configuration/KurrentConfiguration.cs b/src/KurrentDB.Core/Configuration/KurrentConfiguration.cs
new file mode 100644
index 00000000000..a62b5d4ca45
--- /dev/null
+++ b/src/KurrentDB.Core/Configuration/KurrentConfiguration.cs
@@ -0,0 +1,113 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System;
+using System.Collections;
+using KurrentDB.Common.Configuration;
+using KurrentDB.Core.Configuration.Sources;
+using KurrentDB.Core.Util;
+using Microsoft.Extensions.Configuration;
+
+namespace KurrentDB.Core.Configuration;
+
+public static class KurrentConfiguration {
+	public static IConfigurationRoot Build(LocationOptionWithLegacyDefault[] optionsWithLegacyDefaults, string[] args, IDictionary environment) {
+
+		// resolve the main configuration file
+		var configFile = ResolveConfigurationFile(optionsWithLegacyDefaults, args, environment);
+
+		// Create a single IConfiguration object that contains the whole configuration, including
+		// plugin configuration. We will add it to the DI and make it available to the plugins.
+		//
+		// Three json files are loaded explicitly for backwards compatibility
+		// - metricsconfig.json needs loading into the KurrentDB:Metrics section.
+		// - kestrelsettings.json is not located in a config/ directory
+		// - logconfig.json is not located in a config/ directory
+		//
+		// The EventStore configuration section is transformed to KurrentDB by the EventStore configuration providers
+		// to maintain backwards compatibility
+		var builder = new ConfigurationBuilder()
+			// we should be able to stop doing this soon as long as we bind the options automatically
+			.AddKurrentDefaultValues()
+			// check for the existence of KurrentDB default locations
+			// if they do not exist, use the EventStore ones if the EventStore location exists.
+			.AddLegacyDefaultLocations(optionsWithLegacyDefaults)
+			.AddKurrentYamlConfigFile(configFile.Path, configFile.Optional)
+
+			.AddSection($"{KurrentConfigurationKeys.Prefix}:Metrics",
+				x => x.AddKurrentConfigFile("metricsconfig.json", true, true))
+
+			// The other config files are added to the root, and must put themselves in the appropriate sections
+			.AddKurrentConfigFile("kestrelsettings.json", true, true)
+			.AddKurrentConfigFile("logconfig.json", true, true)
+
+			// Load all json files in the  `config` subdirectory (if it exists) of each configuration
+			// directory. We use the subdirectory to ensure that we only load configuration files.
+			.AddLegacyEventStoreConfigFiles("*.json")
+			.AddKurrentConfigFiles("*.json")
+
+#if DEBUG
+			// load all json files in the current directory
+			.AddJsonFile("appsettings.json", true)
+			.AddJsonFile("appsettings.Development.json", true)
+#endif
+
+			.AddEnvironmentVariables()
+			.AddLegacyEventStoreEnvironmentVariables(environment)
+			.AddKurrentEnvironmentVariables(environment)
+
+			// follows current behaviour yet Env Vars should take precedence
+			// to handle real-world deployment pipeline scenarios
+			.AddLegacyEventStoreCommandLine(args)
+			.AddKurrentCommandLine(args);
+
+		return builder.Build();
+	}
+
+	public static IConfigurationRoot Build(LocationOptionWithLegacyDefault[] optionsWithLegacyDefaults, params string[] args) {
+		var environment = Environment.GetEnvironmentVariables();
+		return Build(optionsWithLegacyDefaults, args, environment);
+	}
+
+	private static (string Path, bool Optional) ResolveConfigurationFile(
+		LocationOptionWithLegacyDefault[] optionsWithLegacyDefaults, string[] args, IDictionary environment) {
+		var configuration = new ConfigurationBuilder()
+			.AddLegacyEventStoreEnvironmentVariables(environment)
+			.AddKurrentEnvironmentVariables(environment)
+			.AddLegacyEventStoreCommandLine(args)
+			.AddKurrentCommandLine(args)
+			.Build();
+
+		var configFilePath = configuration.GetValue<string?>($"{KurrentConfigurationKeys.Prefix}:Config");
+
+		if (configFilePath is not null) {
+			// if the user has specified a config file make it non optional
+			return (configFilePath, false);
+		}
+
+		// rebuild the configuration just with the defaults
+		configuration = new ConfigurationBuilder()
+			.AddKurrentDefaultValues()
+			.AddLegacyDefaultLocations(optionsWithLegacyDefaults)
+			.Build();
+
+		configFilePath = configuration.GetValue<string?>($"{KurrentConfigurationKeys.Prefix}:Config");
+		// this is a default, so it can be optional
+		return configFilePath is not null
+			? (configFilePath, true)
+			: (DefaultFiles.DefaultConfigPath, true);
+	}
+
+	public static IConfigurationBuilder AddKurrentYamlConfigFile(
+		this IConfigurationBuilder builder,
+		string path,
+		bool optional) =>
+		builder.AddSection(
+			KurrentConfigurationKeys.Prefix,
+			x => x.AddYamlFile(
+				path: path,
+				optional: optional,
+				reloadOnChange: true));
+}
diff --git a/src/EventStore.Core/Configuration/LoadedOption.cs b/src/KurrentDB.Core/Configuration/LoadedOption.cs
similarity index 80%
rename from src/EventStore.Core/Configuration/LoadedOption.cs
rename to src/KurrentDB.Core/Configuration/LoadedOption.cs
index f3307b64497..eab68691dff 100644
--- a/src/EventStore.Core/Configuration/LoadedOption.cs
+++ b/src/KurrentDB.Core/Configuration/LoadedOption.cs
@@ -1,8 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 // ReSharper disable CheckNamespace
 
 #nullable enable
 
-namespace EventStore.Core;
+namespace KurrentDB.Core;
 
 public record LoadedOption {
 	public LoadedOption(
diff --git a/src/EventStore.Core/Configuration/OptionMetadata.cs b/src/KurrentDB.Core/Configuration/OptionMetadata.cs
similarity index 84%
rename from src/EventStore.Core/Configuration/OptionMetadata.cs
rename to src/KurrentDB.Core/Configuration/OptionMetadata.cs
index 5345084fd15..48cbdbe1593 100644
--- a/src/EventStore.Core/Configuration/OptionMetadata.cs
+++ b/src/KurrentDB.Core/Configuration/OptionMetadata.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 // ReSharper disable CheckNamespace
 
 #nullable enable
@@ -5,11 +8,11 @@
 using System.ComponentModel;
 using System.Net;
 using System.Reflection;
-using EventStore.Common.Configuration;
-using EventStore.Core.Configuration.Sources;
+using KurrentDB.Common.Configuration;
+using KurrentDB.Core.Configuration.Sources;
 using Newtonsoft.Json.Linq;
 
-namespace EventStore.Core;
+namespace KurrentDB.Core;
 
 public record OptionMetadata(
 	string Key,
@@ -27,9 +30,9 @@ public record OptionMetadata(
 	public static OptionMetadata
 		FromPropertyInfo(SectionMetadata sectionMetadata, PropertyInfo property, int sequence) {
 		var sectionName = property.DeclaringType?.Name.Replace("Options", "") ?? "";
-		var key = EventStoreConfigurationKeys.Normalize(property.Name);
+		var key = KurrentConfigurationKeys.Normalize(property.Name);
 		var fullKey =
-			$"{EventStoreConfigurationKeys.Prefix}:{sectionName}:{EventStoreConfigurationKeys.StripConfigurationPrefix(property.Name)}";
+			$"{KurrentConfigurationKeys.Prefix}:{sectionName}:{KurrentConfigurationKeys.StripConfigurationPrefix(property.Name)}";
 
 		var description = property.GetCustomAttribute<DescriptionAttribute>()?.Description ?? "";
 		var isSensitive = property.GetCustomAttribute<SensitiveAttribute>() != null;
@@ -80,7 +83,7 @@ private static JObject GetOptionSchema(PropertyInfo property, string? unitAttrib
 		}
 
 		if (property.PropertyType == typeof(int) || property.PropertyType == typeof(long) ||
-		           property.PropertyType == typeof(double)) {
+				   property.PropertyType == typeof(double)) {
 			if (unitAttributeMessage != null) {
 				return new JObject {
 					["type"] = "integer",
diff --git a/src/EventStore.Core/Configuration/SectionMetadata.cs b/src/KurrentDB.Core/Configuration/SectionMetadata.cs
similarity index 84%
rename from src/EventStore.Core/Configuration/SectionMetadata.cs
rename to src/KurrentDB.Core/Configuration/SectionMetadata.cs
index c6ca7faee27..9a7d369f233 100644
--- a/src/EventStore.Core/Configuration/SectionMetadata.cs
+++ b/src/KurrentDB.Core/Configuration/SectionMetadata.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 // ReSharper disable CheckNamespace
 
 #nullable enable
@@ -8,7 +11,7 @@
 using System.Linq;
 using System.Reflection;
 
-namespace EventStore.Core;
+namespace KurrentDB.Core;
 
 public record SectionMetadata(
 	string SectionName,
@@ -33,7 +36,7 @@ public static SectionMetadata FromPropertyInfo(PropertyInfo property, int sequen
 			var optionMetadata = OptionMetadata.FromPropertyInfo(metadata, optionProps[i], i);
 			metadata.Options[optionMetadata.Key] = optionMetadata;
 		}
-	
+
 		var options = property.PropertyType.GetProperties()
 			.Select((p, i) => OptionMetadata.FromPropertyInfo(metadata, p, i))
 			.ToDictionary(option => option.Key, x => x);
diff --git a/src/KurrentDB.Core/Configuration/Sources/EventStoreCommandLine.cs b/src/KurrentDB.Core/Configuration/Sources/EventStoreCommandLine.cs
new file mode 100644
index 00000000000..c0ac4e643d8
--- /dev/null
+++ b/src/KurrentDB.Core/Configuration/Sources/EventStoreCommandLine.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration.CommandLine;
+using static System.StringComparer;
+
+namespace KurrentDB.Core.Configuration.Sources;
+
+public class EventStoreCommandLineConfigurationProvider(IEnumerable<string> args)
+	: CommandLineConfigurationProvider(args) {
+
+	public override void Load() {
+		base.Load();
+
+		Data = Data.Keys
+			.Where(KurrentConfigurationKeys.IsEventStoreKey)
+			.ToDictionary(
+				KurrentConfigurationKeys.NormalizeEventStorePrefix,
+				x => Data[x], OrdinalIgnoreCase
+			);
+	}
+}
+
+public class CommandLineConfigurationSource : IConfigurationSource {
+	public CommandLineConfigurationSource(string[] args) {
+		Args = args
+			.Select(KurrentDBCommandLineConfigurationSource.NormalizeKeys)
+			.Select((x, i) => KurrentDBCommandLineConfigurationSource.NormalizeBooleans(args, x, i));
+	}
+
+	private IEnumerable<string> Args { get; set; }
+
+	public IConfigurationProvider Build(IConfigurationBuilder builder) =>
+		new EventStoreCommandLineConfigurationProvider(Args);
+}
+
+public static class EventStoreCommandLineConfigurationExtensions {
+	public static IConfigurationBuilder AddLegacyEventStoreCommandLine(this IConfigurationBuilder builder, params string[] args) =>
+		builder.Add(new CommandLineConfigurationSource(args));
+}
diff --git a/src/KurrentDB.Core/Configuration/Sources/EventStoreDefaultLocations.cs b/src/KurrentDB.Core/Configuration/Sources/EventStoreDefaultLocations.cs
new file mode 100644
index 00000000000..b9a1fb38576
--- /dev/null
+++ b/src/KurrentDB.Core/Configuration/Sources/EventStoreDefaultLocations.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System.Collections.Generic;
+using System.IO.Abstractions;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Util;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration.Memory;
+
+namespace KurrentDB.Core.Configuration.Sources;
+
+public class EventStoreDefaultLocationsProvider(MemoryConfigurationSource source)
+	: MemoryConfigurationProvider(source);
+
+public class EventStoreDefaultLocationsSource(LocationOptionWithLegacyDefault[] defaultLocations, IFileSystem fileSystem) : IConfigurationSource {
+	public IConfigurationProvider Build(IConfigurationBuilder builder) {
+		var overrideLocations = new List<KeyValuePair<string, string?>>();
+		foreach (var location in defaultLocations) {
+			if (location.IsFile) {
+				if (!fileSystem.File.Exists(location.KurrentPath) && fileSystem.File.Exists(location.LegacyPath)) {
+					overrideLocations.Add(new KeyValuePair<string, string?>(location.OptionKey, location.LegacyPath));
+				}
+			} else {
+				if (!fileSystem.Directory.Exists(location.KurrentPath) && fileSystem.Directory.Exists(location.LegacyPath)) {
+					overrideLocations.Add(new KeyValuePair<string, string?>(location.OptionKey, location.LegacyPath));
+				}
+			}
+		}
+		return new EventStoreDefaultLocationsProvider(new MemoryConfigurationSource { InitialData = overrideLocations });
+	}
+}
+
+public static class EventStoreDefaultLocationsConfigurationExtensions {
+	public static IConfigurationBuilder AddLegacyDefaultLocations(this IConfigurationBuilder builder,
+		LocationOptionWithLegacyDefault[] defaultLocations, IFileSystem? fileSystem = null) {
+		return builder.Add(new EventStoreDefaultLocationsSource(defaultLocations, fileSystem ?? new FileSystem()));
+	}
+}
+
+public record LocationOptionWithLegacyDefault(string OptionKey, string KurrentPath, string LegacyPath, bool IsFile) {
+	public static LocationOptionWithLegacyDefault[] SupportedLegacyLocations => [
+		new($"{KurrentConfigurationKeys.Prefix}:Config",
+			DefaultFiles.DefaultConfigPath,
+			DefaultFiles.LegacyEventStoreConfigPath,
+			true),
+		new($"{KurrentConfigurationKeys.Prefix}:Db",
+			Locations.DefaultDataDirectory,
+			Locations.LegacyDataDirectory,
+			false),
+		new($"{KurrentConfigurationKeys.Prefix}:Log",
+			Locations.DefaultLogDirectory,
+			Locations.LegacyLogDirectory,
+			false)
+	];
+}
diff --git a/src/KurrentDB.Core/Configuration/Sources/EventStoreEnvironmentVariables.cs b/src/KurrentDB.Core/Configuration/Sources/EventStoreEnvironmentVariables.cs
new file mode 100644
index 00000000000..fa4e6b4f019
--- /dev/null
+++ b/src/KurrentDB.Core/Configuration/Sources/EventStoreEnvironmentVariables.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.Configuration;
+using static System.Environment;
+
+namespace KurrentDB.Core.Configuration.Sources;
+
+public class EventStoreEnvironmentVariablesConfigurationProvider(IDictionary? environment = null) : ConfigurationProvider {
+	IDictionary? Environment { get; } = environment;
+
+	public override void Load() {
+		var environment = Environment ?? GetEnvironmentVariables();
+
+		var data = new Dictionary<string, string?>(StringComparer.OrdinalIgnoreCase);
+
+		foreach (var key in environment.Keys) {
+			if (KurrentConfigurationKeys.TryNormalizeEventStoreEnvVar(key, out var normalizedKey))
+				data[normalizedKey] = environment[key]?.ToString();
+		}
+
+		Data = data;
+	}
+}
+public class EnvironmentVariablesSource(IDictionary? environment = null) : IConfigurationSource {
+	public IConfigurationProvider Build(IConfigurationBuilder builder) =>
+		new EventStoreEnvironmentVariablesConfigurationProvider(environment);
+}
+
+public static class EventStoreEnvironmentVariablesConfigurationExtensions {
+	public static IConfigurationBuilder AddLegacyEventStoreEnvironmentVariables(this IConfigurationBuilder builder, IDictionary? environment = null) =>
+		builder.Add(new EnvironmentVariablesSource(environment));
+
+	public static IConfigurationBuilder AddLegacyEventStoreEnvironmentVariables(this IConfigurationBuilder builder, Dictionary<string, string> environment) =>
+		builder.Add(new EnvironmentVariablesSource(environment));
+
+	public static IConfigurationBuilder AddLegacyEventStoreEnvironmentVariables(this IConfigurationBuilder builder, params (string Key, string Value)[] environment) =>
+		builder.Add(new EnvironmentVariablesSource(environment.ToDictionary(x => x.Key, x => x.Value)));
+}
diff --git a/src/KurrentDB.Core/Configuration/Sources/EventStoreJsonFile.cs b/src/KurrentDB.Core/Configuration/Sources/EventStoreJsonFile.cs
new file mode 100644
index 00000000000..d4f0c87f9ba
--- /dev/null
+++ b/src/KurrentDB.Core/Configuration/Sources/EventStoreJsonFile.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration.Json;
+using Microsoft.Extensions.FileProviders;
+using Serilog;
+using static System.StringComparer;
+
+namespace KurrentDB.Core.Configuration.Sources;
+
+public class EventStoreJsonFileConfigurationProvider(EventStoreJsonFileConfigurationSource source)
+	: JsonConfigurationProvider(source) {
+
+	public override void Load() {
+		base.Load();
+		Data = Data.Keys.ToDictionary(
+			KurrentConfigurationKeys.NormalizeEventStorePrefix,
+			x => Data[x], OrdinalIgnoreCase
+		);
+	}
+}
+
+public class EventStoreJsonFileConfigurationSource : JsonConfigurationSource {
+	public override IConfigurationProvider Build(IConfigurationBuilder builder) {
+		EnsureDefaults(builder);
+		return new EventStoreJsonFileConfigurationProvider(this);
+	}
+}
+
+public static class EventStoreJsonFileConfigurationExtensions {
+	public static IConfigurationBuilder AddLegacyEventStoreJsonFile(this IConfigurationBuilder builder, Action<EventStoreJsonFileConfigurationSource> configureSource) =>
+		builder.Add(configureSource);
+
+	public static IConfigurationBuilder AddLegacyEventStoreConfigFile(this IConfigurationBuilder builder, string configFilePath,
+		bool optional = false, bool reloadOnChange = false) {
+		if (!Locations.TryLocateConfigFile(configFilePath, out var directory, out var fileName)) {
+			if (optional)
+				return builder;
+
+			throw new FileNotFoundException(
+				$"Could not find {configFilePath} in the following directories: {string.Join(", ", Locations.GetPotentialConfigurationDirectories())}");
+		}
+
+		builder.AddLegacyEventStoreJsonFile(config => {
+			config.Optional = optional;
+			config.FileProvider = new PhysicalFileProvider(directory) {
+				UseActivePolling = reloadOnChange,
+				UsePollingFileWatcher = reloadOnChange
+			};
+			config.OnLoadException = context => Log.Error(context.Exception, "err");
+			config.Path = fileName;
+			config.ReloadOnChange = reloadOnChange;
+		});
+
+		return builder;
+	}
+
+	public static IConfigurationBuilder AddLegacyEventStoreConfigFiles(this IConfigurationBuilder builder, string pattern) {
+		ConfigurationBuilderExtensions.AddConfigFiles("config", pattern, (file) =>
+			builder.AddLegacyEventStoreConfigFile(file, optional: true, reloadOnChange: true));
+		return builder;
+	}
+}
diff --git a/src/KurrentDB.Core/Configuration/Sources/KurrentConfigurationKeys.cs b/src/KurrentDB.Core/Configuration/Sources/KurrentConfigurationKeys.cs
new file mode 100644
index 00000000000..fbcd5311f38
--- /dev/null
+++ b/src/KurrentDB.Core/Configuration/Sources/KurrentConfigurationKeys.cs
@@ -0,0 +1,118 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Reflection;
+using Microsoft.Extensions.Configuration;
+using static System.String;
+using static System.StringComparison;
+
+namespace KurrentDB.Core.Configuration.Sources;
+
+public static class KurrentConfigurationKeys {
+	public const string Prefix = "KurrentDB";
+	public const string LegacyEventStorePrefix = "EventStore";
+
+	private const string EnvVarKeyDelimiter = "__";
+	private const string ArgWordDelimiter = "-";
+	private const string EnvVarWordDelimiter = "_";
+
+	private static readonly char[] Delimiters = { '-', '_', ':' };
+
+	private static readonly IReadOnlyList<string> SectionKeys;
+	private static readonly IReadOnlyList<string> OptionsKeys;
+	private static readonly IReadOnlyList<string> AllKnownKeys;
+
+	static KurrentConfigurationKeys() {
+		SectionKeys = typeof(ClusterVNodeOptions).GetProperties()
+			.Where(prop => prop.GetCustomAttribute<ClusterVNodeOptions.OptionGroupAttribute>() != null)
+			.Select(property => property.Name)
+			.ToList();
+
+		OptionsKeys = typeof(ClusterVNodeOptions).GetProperties()
+			.Where(prop => prop.GetCustomAttribute<ClusterVNodeOptions.OptionGroupAttribute>() != null)
+			.SelectMany(
+				property => property.PropertyType.GetProperties(BindingFlags.Public | BindingFlags.Instance))
+			.Select(x => x.Name)
+			.ToList();
+
+		AllKnownKeys = SectionKeys.Concat(OptionsKeys).Distinct(StringComparer.InvariantCultureIgnoreCase).ToList();
+	}
+
+	// outputs a key for IConfiguration e.g. KurrentDB:StreamInfoCacheCapacity
+	public static string Normalize(string key) => Normalize(Prefix, Prefix, key);
+
+	// outputs a key for IConfiguration converted from EventStore:* to KurrentDB:*
+	public static string NormalizeEventStorePrefix(string key) => Normalize(LegacyEventStorePrefix, Prefix, key);
+
+	public static string Normalize(string originalPrefix, string targetPrefix, string key) {
+		// if the key doesn't contain any delimiters,
+		// we can just get out, transforming the key
+		// if needed because of cli lowercase args
+		if (!key.Any(Delimiters.Contains))
+			return $"{targetPrefix}:{Transform(key)}";
+
+		// remove the prefix and normalize the key
+		var keys = (key.StartsWith(originalPrefix, OrdinalIgnoreCase)
+				? key.Remove(0, originalPrefix.Length)
+				: key)
+			.Replace(EnvVarKeyDelimiter, ConfigurationPath.KeyDelimiter)
+			.Replace(ArgWordDelimiter, EnvVarWordDelimiter)
+			.Split(ConfigurationPath.KeyDelimiter)
+			.Where(x => x.Length > 0)
+			.Select(Transform);
+
+		return $"{targetPrefix}:{Join(ConfigurationPath.KeyDelimiter, keys)}";
+
+		// because we know all keys, we can ensure the name is always correct
+		static string Transform(string key) {
+			var value = Pascalize(key);
+			return AllKnownKeys.FirstOrDefault(x => x.Equals(value, OrdinalIgnoreCase)) ?? value;
+		}
+
+		static string Pascalize(string key) =>
+			Join(Empty, key
+				.ToLowerInvariant()
+				.Split(EnvVarWordDelimiter)
+				.Select(word => new string(word.Select((c, i) => i == 0 ? char.ToUpper(c) : c).ToArray()))
+			);
+	}
+
+	/// <summary>
+	/// Determines if the given key is an EventStore key
+	/// </summary>
+	public static bool IsEventStoreKey(string? key) =>
+		key is not null && key.StartsWith($"{LegacyEventStorePrefix}", OrdinalIgnoreCase);
+
+	/// <summary>
+	/// Determines if the given key starts with the given prefix
+	/// </summary>
+	private static bool IsEnvVarWithPrefix(string prefix, string? key) =>
+		key is not null && key.StartsWith($"{prefix}{EnvVarWordDelimiter}", OrdinalIgnoreCase);
+
+	/// <summary>
+	/// Only normalizes the given key if it starts with the given prefix
+	/// </summary>
+	private static bool TryNormalizeEnvVar(string originalPrefix, string targetPrefix, string key, [MaybeNullWhen(false)] out string normalizedKey) =>
+		(normalizedKey = IsEnvVarWithPrefix(originalPrefix, key) ? Normalize(originalPrefix, targetPrefix, key) : null) is not null;
+
+	/// <summary>
+	/// Only normalizes the given key if it is an Event Store environment variable.
+	/// </summary>
+	public static bool TryNormalizeEventStoreEnvVar(object? key, [MaybeNullWhen(false)] out string normalizedKey) =>
+		TryNormalizeEnvVar(LegacyEventStorePrefix, Prefix, key?.ToString() ?? Empty, out normalizedKey);
+
+	/// <summary>
+	/// Only normalizes the given key if it is a KurrentDB environment variable.
+	/// </summary>
+	public static bool TryNormalizeEnvVar(object? key, [MaybeNullWhen(false)] out string normalizedKey) =>
+		TryNormalizeEnvVar(Prefix, Prefix, key?.ToString() ?? Empty, out normalizedKey);
+
+	public static string StripConfigurationPrefix(string key) =>
+		key.StartsWith($"{Prefix}:", OrdinalIgnoreCase) ? key.Remove(0, Prefix.Length + 1) : key;
+}
diff --git a/src/KurrentDB.Core/Configuration/Sources/KurrentDBCommandLineConfigurationExtensions.cs b/src/KurrentDB.Core/Configuration/Sources/KurrentDBCommandLineConfigurationExtensions.cs
new file mode 100644
index 00000000000..9c4b83b56c4
--- /dev/null
+++ b/src/KurrentDB.Core/Configuration/Sources/KurrentDBCommandLineConfigurationExtensions.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using Microsoft.Extensions.Configuration;
+
+namespace KurrentDB.Core.Configuration.Sources;
+
+public static class KurrentDBCommandLineConfigurationExtensions {
+	public static IConfigurationBuilder AddKurrentCommandLine(this IConfigurationBuilder builder, params string[] args) =>
+		builder.Add(new KurrentDBCommandLineConfigurationSource(args));
+}
diff --git a/src/KurrentDB.Core/Configuration/Sources/KurrentDBCommandLineConfigurationProvider.cs b/src/KurrentDB.Core/Configuration/Sources/KurrentDBCommandLineConfigurationProvider.cs
new file mode 100644
index 00000000000..d70645c38aa
--- /dev/null
+++ b/src/KurrentDB.Core/Configuration/Sources/KurrentDBCommandLineConfigurationProvider.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.Configuration.CommandLine;
+using static System.StringComparer;
+
+namespace KurrentDB.Core.Configuration.Sources;
+
+public class KurrentDBCommandLineConfigurationProvider(IEnumerable<string> args)
+	: CommandLineConfigurationProvider(args) {
+
+	public override void Load() {
+		base.Load();
+
+		Data = Data.Keys
+			.ToDictionary(
+				KurrentConfigurationKeys.Normalize,
+				x => Data[x], OrdinalIgnoreCase
+			);
+	}
+}
diff --git a/src/KurrentDB.Core/Configuration/Sources/KurrentDBCommandLineConfigurationSource.cs b/src/KurrentDB.Core/Configuration/Sources/KurrentDBCommandLineConfigurationSource.cs
new file mode 100644
index 00000000000..de37de061e1
--- /dev/null
+++ b/src/KurrentDB.Core/Configuration/Sources/KurrentDBCommandLineConfigurationSource.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.Configuration;
+
+namespace KurrentDB.Core.Configuration.Sources;
+
+public class KurrentDBCommandLineConfigurationSource : IConfigurationSource {
+	public KurrentDBCommandLineConfigurationSource(string[] args) {
+		Args = args.Select(NormalizeKeys).Select((x, i) => NormalizeBooleans(args, x, i));
+	}
+
+	public static string NormalizeKeys(string x) => x[0] == '-' && x[1] != '-' ? $"-{x}" : x;
+
+	public static string NormalizeBooleans(string[] args, string x, int i) {
+		if (!x.StartsWith("--"))
+			return x;
+
+		if (x.EndsWith('+'))
+			return $"{x[..^1]}=true";
+
+		if (x.EndsWith('-'))
+			return $"{x[..^1]}=false";
+
+		if (x.Contains('='))
+			return x;
+
+		if (i != args.Length - 1 && !args[i + 1].StartsWith("--"))
+			return x;
+
+		return $"{x}=true";
+	}
+	private IEnumerable<string> Args { get; set; }
+
+	public IConfigurationProvider Build(IConfigurationBuilder builder) =>
+		new KurrentDBCommandLineConfigurationProvider(Args);
+}
diff --git a/src/KurrentDB.Core/Configuration/Sources/KurrentDBDefaultValuesConfigurationSource.cs b/src/KurrentDB.Core/Configuration/Sources/KurrentDBDefaultValuesConfigurationSource.cs
new file mode 100644
index 00000000000..8b978f95783
--- /dev/null
+++ b/src/KurrentDB.Core/Configuration/Sources/KurrentDBDefaultValuesConfigurationSource.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration.Memory;
+using static System.StringComparer;
+
+namespace KurrentDB.Core.Configuration.Sources;
+
+public class KurrentDBDefaultValuesConfigurationSource(IEnumerable<KeyValuePair<string, string?>>? initialData = null) : IConfigurationSource {
+	private IEnumerable<KeyValuePair<string, string?>> InitialData { get; } =
+		initialData ?? new Dictionary<string, string?>();
+
+	public IConfigurationProvider Build(IConfigurationBuilder builder) =>
+		new KurrentDefaultValuesConfigurationProvider(InitialData);
+}
+
+public class KurrentDefaultValuesConfigurationProvider(IEnumerable<KeyValuePair<string, string?>> initialData)
+	: MemoryConfigurationProvider(new() {
+		InitialData = initialData.ToDictionary(
+			kvp => $"{KurrentConfigurationKeys.Prefix}:{kvp.Key}",
+			kvp => kvp.Value,
+			OrdinalIgnoreCase)
+	}) {
+}
+
+public static class EventStoreDefaultValuesConfigurationExtensions {
+	public static IConfigurationBuilder AddKurrentDefaultValues(this IConfigurationBuilder configurationBuilder,
+		IEnumerable<KeyValuePair<string, string?>> initialData) =>
+		configurationBuilder.Add(new KurrentDBDefaultValuesConfigurationSource(initialData));
+
+	public static IConfigurationBuilder AddKurrentDefaultValues(this IConfigurationBuilder builder,
+		IEnumerable<KeyValuePair<string, object?>>? initialData) =>
+		initialData is not null
+			? builder.AddKurrentDefaultValues(initialData
+				.Select(x => new KeyValuePair<string, string?>(x.Key, x.Value?.ToString())).ToArray())
+			: builder;
+
+	public static IConfigurationBuilder AddKurrentDefaultValues(this IConfigurationBuilder builder) =>
+		builder.AddKurrentDefaultValues(ClusterVNodeOptions.DefaultValues);
+}
diff --git a/src/KurrentDB.Core/Configuration/Sources/KurrentDBEnvironmentVariablesConfigurationExtensions.cs b/src/KurrentDB.Core/Configuration/Sources/KurrentDBEnvironmentVariablesConfigurationExtensions.cs
new file mode 100644
index 00000000000..7b73c6fde80
--- /dev/null
+++ b/src/KurrentDB.Core/Configuration/Sources/KurrentDBEnvironmentVariablesConfigurationExtensions.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Extensions.Configuration;
+
+namespace KurrentDB.Core.Configuration.Sources;
+
+public static class KurrentDBEnvironmentVariablesConfigurationExtensions {
+	public static IConfigurationBuilder AddKurrentEnvironmentVariables(this IConfigurationBuilder builder, IDictionary? environment = null) =>
+		builder.Add(new KurrentDBEnvironmentVariablesSource(environment));
+
+	public static IConfigurationBuilder AddKurrentEnvironmentVariables(this IConfigurationBuilder builder, Dictionary<string, string> environment) =>
+		builder.Add(new KurrentDBEnvironmentVariablesSource(environment));
+
+	public static IConfigurationBuilder AddKurrentEnvironmentVariables(this IConfigurationBuilder builder, params (string Key, string Value)[] environment) =>
+		builder.Add(new KurrentDBEnvironmentVariablesSource(environment.ToDictionary(x => x.Key, x => x.Value)));
+}
diff --git a/src/KurrentDB.Core/Configuration/Sources/KurrentDBEnvironmentVariablesConfigurationProvider.cs b/src/KurrentDB.Core/Configuration/Sources/KurrentDBEnvironmentVariablesConfigurationProvider.cs
new file mode 100644
index 00000000000..7723373198a
--- /dev/null
+++ b/src/KurrentDB.Core/Configuration/Sources/KurrentDBEnvironmentVariablesConfigurationProvider.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Microsoft.Extensions.Configuration;
+using static System.Environment;
+
+namespace KurrentDB.Core.Configuration.Sources;
+
+public class KurrentDBEnvironmentVariablesConfigurationProvider(IDictionary? environment = null) : ConfigurationProvider {
+	IDictionary? Environment { get; } = environment;
+
+	public override void Load() {
+		var environment = Environment ?? GetEnvironmentVariables();
+
+		var data = new Dictionary<string, string?>(StringComparer.OrdinalIgnoreCase);
+
+		foreach (var key in environment.Keys) {
+			if (KurrentConfigurationKeys.TryNormalizeEnvVar(key, out var normalizedKey))
+				data[normalizedKey] = environment[key]?.ToString();
+		}
+
+		Data = data;
+	}
+}
diff --git a/src/KurrentDB.Core/Configuration/Sources/KurrentDBEnvironmentVariablesSource.cs b/src/KurrentDB.Core/Configuration/Sources/KurrentDBEnvironmentVariablesSource.cs
new file mode 100644
index 00000000000..c22cc901366
--- /dev/null
+++ b/src/KurrentDB.Core/Configuration/Sources/KurrentDBEnvironmentVariablesSource.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System.Collections;
+using Microsoft.Extensions.Configuration;
+
+namespace KurrentDB.Core.Configuration.Sources;
+
+public class KurrentDBEnvironmentVariablesSource(IDictionary? environment = null) : IConfigurationSource {
+	public IConfigurationProvider Build(IConfigurationBuilder builder) =>
+		new KurrentDBEnvironmentVariablesConfigurationProvider(environment);
+}
diff --git a/src/KurrentDB.Core/Configuration/TypeConverters.cs b/src/KurrentDB.Core/Configuration/TypeConverters.cs
new file mode 100644
index 00000000000..f8aad19d62f
--- /dev/null
+++ b/src/KurrentDB.Core/Configuration/TypeConverters.cs
@@ -0,0 +1,71 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using System.Net;
+
+namespace KurrentDB.Core.Configuration;
+
+public class GossipEndPointConverter : TypeConverter {
+	public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType) =>
+		sourceType == typeof(string) || base.CanConvertFrom(context, sourceType);
+
+	public override object? ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value) =>
+		value is string stringValue
+			? ParseGossipEndPoint(stringValue)
+			: base.ConvertFrom(context, culture, value);
+
+	private static EndPoint ParseGossipEndPoint(string value) {
+		var parts = value.Split(':', 2);
+
+		if (parts.Length != 2)
+			throw new("You must specify the ports in the gossip seed");
+
+		if (!int.TryParse(parts[1], out var port))
+			throw new($"Invalid format for gossip seed port: {parts[1]}");
+
+		return IPAddress.TryParse(parts[0], out var ip)
+			? new IPEndPoint(ip, port)
+			: new DnsEndPoint(parts[0], port);
+	}
+}
+
+public class GossipSeedConverter : ArrayConverter {
+	private static readonly char[] InvalidDelimiters = [';', '\t'];
+
+	private static readonly GossipEndPointConverter _gossipEndPointConverter = new();
+
+	public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType) =>
+		sourceType == typeof(string) || base.CanConvertFrom(context, sourceType);
+
+	public override object? ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value) {
+		if (value is not string stringValue)
+			return base.ConvertFrom(context, culture, value);
+
+		if (stringValue.Any(c => InvalidDelimiters.Contains(c)))
+			throw new ArgumentException($"Invalid delimiter for gossip seed value: {stringValue}");
+
+		var values = stringValue.Split(',', StringSplitOptions.RemoveEmptyEntries);
+
+		var gossipEndPoints = values
+			.Select(x => (EndPoint)_gossipEndPointConverter.ConvertFrom(context, culture, x)!)
+			.ToArray();
+
+		return gossipEndPoints;
+	}
+}
+
+public class IPAddressConverter : TypeConverter {
+	public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType) =>
+		sourceType == typeof(string) || base.CanConvertFrom(context, sourceType);
+
+	public override object? ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value) =>
+		value is string stringValue
+			? IPAddress.Parse(stringValue)
+			: base.ConvertFrom(context, culture, value);
+}
diff --git a/src/KurrentDB.Core/Data/ChunkInfo.cs b/src/KurrentDB.Core/Data/ChunkInfo.cs
new file mode 100644
index 00000000000..aa1ac20cdd4
--- /dev/null
+++ b/src/KurrentDB.Core/Data/ChunkInfo.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Data;
+
+public readonly record struct ChunkInfo {
+	public required int ChunkStartNumber { get; init; }
+	public required int ChunkEndNumber { get; init; }
+	public required bool IsRemote { get; init; }
+}
diff --git a/src/KurrentDB.Core/Data/CommitEventRecord.cs b/src/KurrentDB.Core/Data/CommitEventRecord.cs
new file mode 100644
index 00000000000..9ad7da9c807
--- /dev/null
+++ b/src/KurrentDB.Core/Data/CommitEventRecord.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Data;
+
+public struct CommitEventRecord {
+	public readonly EventRecord Event;
+	public readonly long CommitPosition;
+
+	public CommitEventRecord(EventRecord @event, long commitPosition) {
+		Event = @event;
+		CommitPosition = commitPosition;
+	}
+
+	public override string ToString() {
+		return string.Format("CommitPosition: {0}, Event: {1}", CommitPosition, Event);
+	}
+}
diff --git a/src/KurrentDB.Core/Data/Epoch.cs b/src/KurrentDB.Core/Data/Epoch.cs
new file mode 100644
index 00000000000..c25efd54bfb
--- /dev/null
+++ b/src/KurrentDB.Core/Data/Epoch.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Data;
+
+public class Epoch {
+	public readonly long EpochPosition;
+	public readonly int EpochNumber;
+	public readonly Guid EpochId;
+
+	public Epoch(long epochPosition, int epochNumber, Guid epochId) {
+		EpochPosition = epochPosition;
+		EpochNumber = epochNumber;
+		EpochId = epochId;
+	}
+}
diff --git a/src/KurrentDB.Core/Data/Event.cs b/src/KurrentDB.Core/Data/Event.cs
new file mode 100644
index 00000000000..f50be083034
--- /dev/null
+++ b/src/KurrentDB.Core/Data/Event.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.TransactionLog.Chunks;
+
+namespace KurrentDB.Core.Data;
+
+public class Event {
+	public readonly Guid EventId;
+	public readonly string EventType;
+	public readonly bool IsJson;
+	public readonly byte[] Data;
+	public readonly byte[] Metadata;
+
+	public Event(Guid eventId, string eventType, bool isJson, string data, string metadata)
+		: this(
+			eventId, eventType, isJson, Helper.UTF8NoBom.GetBytes(data),
+			metadata != null ? Helper.UTF8NoBom.GetBytes(metadata) : null) {
+	}
+
+	public static int SizeOnDisk(string eventType, byte[] data, byte[] metadata) =>
+		(data?.Length ?? 0) + (metadata?.Length ?? 0) + (eventType.Length * 2);
+
+	private static bool ExceedsMaximumSizeOnDisk(string eventType, byte[] data, byte[] metadata) =>
+		SizeOnDisk(eventType, data, metadata) > TFConsts.EffectiveMaxLogRecordSize;
+
+	public Event(Guid eventId, string eventType, bool isJson, byte[] data, byte[] metadata) {
+		if (eventId == Guid.Empty)
+			throw new ArgumentException("Empty eventId provided.", nameof(eventId));
+		if (string.IsNullOrEmpty(eventType))
+			throw new ArgumentException("Empty eventType provided.", nameof(eventType));
+		if (ExceedsMaximumSizeOnDisk(eventType, data, metadata))
+			throw new ArgumentException("Record is too big.", nameof(data));
+
+		EventId = eventId;
+		EventType = eventType;
+		IsJson = isJson;
+		Data = data ?? Array.Empty<byte>();
+		Metadata = metadata ?? Array.Empty<byte>();
+	}
+}
diff --git a/src/KurrentDB.Core/Data/EventInfo.cs b/src/KurrentDB.Core/Data/EventInfo.cs
new file mode 100644
index 00000000000..5301f958765
--- /dev/null
+++ b/src/KurrentDB.Core/Data/EventInfo.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Data;
+
+public readonly struct EventInfo {
+	public readonly long LogPosition;
+	public readonly long EventNumber;
+
+	public EventInfo(long logPosition, long eventNumber) {
+		LogPosition = logPosition;
+		EventNumber = eventNumber;
+	}
+}
diff --git a/src/KurrentDB.Core/Data/EventNumber.cs b/src/KurrentDB.Core/Data/EventNumber.cs
new file mode 100644
index 00000000000..f79482c6fbc
--- /dev/null
+++ b/src/KurrentDB.Core/Data/EventNumber.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Data;
+
+public static class EventNumber {
+	public const long DeletedStream = long.MaxValue;
+	public const long Invalid = int.MinValue;
+}
diff --git a/src/KurrentDB.Core/Data/EventRecord.cs b/src/KurrentDB.Core/Data/EventRecord.cs
new file mode 100644
index 00000000000..0c240ede7ab
--- /dev/null
+++ b/src/KurrentDB.Core/Data/EventRecord.cs
@@ -0,0 +1,181 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.Data;
+
+public class EventRecord : IEquatable<EventRecord> {
+	public bool IsJson {
+		get { return (Flags & PrepareFlags.IsJson) == PrepareFlags.IsJson; }
+	}
+
+	public bool IsSelfCommitted => Flags.HasAnyOf(PrepareFlags.IsCommitted);
+
+	public readonly long EventNumber;
+	public readonly long LogPosition;
+	public readonly Guid CorrelationId;
+	public readonly Guid EventId;
+	public readonly long TransactionPosition;
+	public readonly int TransactionOffset;
+	public readonly string EventStreamId;
+	public readonly long ExpectedVersion;
+	public readonly DateTime TimeStamp;
+	public readonly PrepareFlags Flags;
+	public readonly string EventType;
+	public readonly ReadOnlyMemory<byte> Data;
+	public readonly ReadOnlyMemory<byte> Metadata;
+
+	public EventRecord(long eventNumber, IPrepareLogRecord prepare, string eventStreamId, string eventType) {
+		Ensure.Nonnegative(eventNumber, "eventNumber");
+		Ensure.NotNull(eventStreamId, "eventStreamId");
+
+		EventNumber = eventNumber;
+		LogPosition = prepare.LogPosition;
+		CorrelationId = prepare.CorrelationId;
+		EventId = prepare.EventId;
+		TransactionPosition = prepare.TransactionPosition;
+		TransactionOffset = prepare.TransactionOffset;
+		EventStreamId = eventStreamId;
+		ExpectedVersion = prepare.ExpectedVersion;
+		TimeStamp = prepare.TimeStamp;
+
+		Flags = prepare.Flags;
+		EventType = eventType ?? string.Empty;
+		Data = prepare.Data;
+		Metadata = prepare.Metadata;
+	}
+
+	// called from tests only
+	public EventRecord(long eventNumber,
+		long logPosition,
+		Guid correlationId,
+		Guid eventId,
+		long transactionPosition,
+		int transactionOffset,
+		string eventStreamId,
+		long expectedVersion,
+		DateTime timeStamp,
+		PrepareFlags flags,
+		string eventType,
+		byte[] data,
+		byte[] metadata) {
+		Ensure.Nonnegative(logPosition, "logPosition");
+		Ensure.Nonnegative(transactionPosition, "transactionPosition");
+		if (transactionOffset < -1)
+			throw new ArgumentOutOfRangeException("transactionOffset");
+		Ensure.NotNull(eventStreamId, "eventStreamId");
+		Ensure.Nonnegative(eventNumber, "eventNumber");
+		Ensure.NotEmptyGuid(eventId, "eventId");
+		Ensure.NotNull(data, "data");
+
+		EventNumber = eventNumber;
+		LogPosition = logPosition;
+		CorrelationId = correlationId;
+		EventId = eventId;
+		TransactionPosition = transactionPosition;
+		TransactionOffset = transactionOffset;
+		EventStreamId = eventStreamId;
+		ExpectedVersion = expectedVersion;
+		TimeStamp = timeStamp;
+		Flags = flags;
+		EventType = eventType ?? string.Empty;
+		Data = data ?? Empty.ByteArray;
+		Metadata = metadata ?? Empty.ByteArray;
+	}
+
+	public bool Equals(EventRecord other) {
+		if (ReferenceEquals(null, other))
+			return false;
+		if (ReferenceEquals(this, other))
+			return true;
+		return EventNumber == other.EventNumber
+			   && LogPosition == other.LogPosition
+			   && CorrelationId.Equals(other.CorrelationId)
+			   && EventId.Equals(other.EventId)
+			   && TransactionPosition == other.TransactionPosition
+			   && TransactionOffset == other.TransactionOffset
+			   && string.Equals(EventStreamId, other.EventStreamId)
+			   && ExpectedVersion == other.ExpectedVersion
+			   && TimeStamp.Equals(other.TimeStamp)
+			   && Flags.Equals(other.Flags)
+			   && string.Equals(EventType, other.EventType)
+			   && Data.Span.SequenceEqual(other.Data.Span)
+			   && Metadata.Span.SequenceEqual(other.Metadata.Span);
+	}
+
+	public override bool Equals(object obj) {
+		if (ReferenceEquals(null, obj))
+			return false;
+		if (ReferenceEquals(this, obj))
+			return true;
+		if (obj.GetType() != GetType())
+			return false;
+		return Equals((EventRecord)obj);
+	}
+
+	public override int GetHashCode() {
+		unchecked {
+			int hashCode = EventNumber.GetHashCode();
+			hashCode = (hashCode * 397) ^ LogPosition.GetHashCode();
+			hashCode = (hashCode * 397) ^ CorrelationId.GetHashCode();
+			hashCode = (hashCode * 397) ^ EventId.GetHashCode();
+			hashCode = (hashCode * 397) ^ TransactionPosition.GetHashCode();
+			hashCode = (hashCode * 397) ^ TransactionOffset;
+			hashCode = (hashCode * 397) ^ EventStreamId.GetHashCode();
+			hashCode = (hashCode * 397) ^ ExpectedVersion.GetHashCode();
+			hashCode = (hashCode * 397) ^ TimeStamp.GetHashCode();
+			hashCode = (hashCode * 397) ^ Flags.GetHashCode();
+			hashCode = (hashCode * 397) ^ EventType.GetHashCode();
+			hashCode = (hashCode * 397) ^ Data.GetHashCode();
+			hashCode = (hashCode * 397) ^ Metadata.GetHashCode();
+			return hashCode;
+		}
+	}
+
+	public static bool operator ==(EventRecord left, EventRecord right) {
+		return Equals(left, right);
+	}
+
+	public static bool operator !=(EventRecord left, EventRecord right) {
+		return !Equals(left, right);
+	}
+
+	public override string ToString() {
+		return string.Format("EventNumber: {0}, "
+							 + "LogPosition: {1}, "
+							 + "CorrelationId: {2}, "
+							 + "EventId: {3}, "
+							 + "TransactionPosition: {4}, "
+							 + "TransactionOffset: {5}, "
+							 + "EventStreamId: {6}, "
+							 + "ExpectedVersion: {7}, "
+							 + "TimeStamp: {8}, "
+							 + "Flags: {9}, "
+							 + "EventType: {10}",
+			EventNumber,
+			LogPosition,
+			CorrelationId,
+			EventId,
+			TransactionPosition,
+			TransactionOffset,
+			EventStreamId,
+			ExpectedVersion,
+			TimeStamp,
+			Flags,
+			EventType);
+	}
+
+#if DEBUG
+	public string DebugDataView {
+		get { return Encoding.UTF8.GetString(Data.Span); }
+	}
+
+	public string DebugMetadataView {
+		get { return Encoding.UTF8.GetString(Metadata.Span); }
+	}
+#endif
+}
diff --git a/src/KurrentDB.Core/Data/ExpectedVersion.cs b/src/KurrentDB.Core/Data/ExpectedVersion.cs
new file mode 100644
index 00000000000..0cf62365ef3
--- /dev/null
+++ b/src/KurrentDB.Core/Data/ExpectedVersion.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Data;
+
+public static class ExpectedVersion {
+	public const long Any = -2;
+
+	public const long NoStream = -1;
+
+	public const long Invalid = -3;
+	public const long StreamExists = -4;
+}
diff --git a/src/KurrentDB.Core/Data/FilteredReadAllResult.cs b/src/KurrentDB.Core/Data/FilteredReadAllResult.cs
new file mode 100644
index 00000000000..d54d86bc9cd
--- /dev/null
+++ b/src/KurrentDB.Core/Data/FilteredReadAllResult.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Data;
+
+public enum FilteredReadAllResult {
+	Success = 0,
+	NotModified = 1,
+	Error = 2,
+	AccessDenied = 3,
+	Expired = 4,
+	InvalidPosition = 5,
+}
diff --git a/src/KurrentDB.Core/Data/GossipAdvertiseInfo.cs b/src/KurrentDB.Core/Data/GossipAdvertiseInfo.cs
new file mode 100644
index 00000000000..7f8b73955c0
--- /dev/null
+++ b/src/KurrentDB.Core/Data/GossipAdvertiseInfo.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.Data;
+
+public class GossipAdvertiseInfo {
+	public DnsEndPoint InternalTcp { get; }
+	public DnsEndPoint InternalSecureTcp { get; }
+	public DnsEndPoint ExternalTcp { get; }
+	public DnsEndPoint ExternalSecureTcp { get; }
+	public DnsEndPoint HttpEndPoint { get; }
+	public string AdvertiseInternalHostAs { get; }
+	public string AdvertiseExternalHostAs { get; }
+	public int AdvertiseHttpPortAs { get; }
+	public string AdvertiseHostToClientAs { get; }
+	public int AdvertiseHttpPortToClientAs { get; }
+	public int AdvertiseTcpPortToClientAs { get; }
+
+	public GossipAdvertiseInfo(DnsEndPoint internalTcp, DnsEndPoint internalSecureTcp,
+		DnsEndPoint externalTcp, DnsEndPoint externalSecureTcp,
+		DnsEndPoint httpEndPoint,
+		string advertiseInternalHostAs, string advertiseExternalHostAs, int advertiseHttpPortAs,
+		string advertiseHostToClientAs, int advertiseHttpPortToClientAs, int advertiseTcpPortToClientAs) {
+		Ensure.Equal(false, internalTcp == null && internalSecureTcp == null, "Both internal TCP endpoints are null");
+
+		InternalTcp = internalTcp;
+		InternalSecureTcp = internalSecureTcp;
+		ExternalTcp = externalTcp;
+		ExternalSecureTcp = externalSecureTcp;
+		HttpEndPoint = httpEndPoint;
+		AdvertiseInternalHostAs = advertiseInternalHostAs;
+		AdvertiseExternalHostAs = advertiseExternalHostAs;
+		AdvertiseHttpPortAs = advertiseHttpPortAs;
+		AdvertiseHostToClientAs = advertiseHostToClientAs;
+		AdvertiseHttpPortToClientAs = advertiseHttpPortToClientAs;
+		AdvertiseTcpPortToClientAs = advertiseTcpPortToClientAs;
+	}
+
+	public override string ToString() {
+		return string.Format(
+			$"IntTcp: {InternalTcp}, IntSecureTcp: {InternalSecureTcp}\n" +
+			$"ExtTcp: {ExternalTcp}, ExtSecureTcp: {ExternalSecureTcp}\n" +
+			$"Http: {HttpEndPoint}, HttpAdvertiseAs: {AdvertiseExternalHostAs}:{AdvertiseHttpPortAs},\n" +
+			$"HttpAdvertiseToClientAs: {AdvertiseHostToClientAs}:{AdvertiseHttpPortToClientAs},\n" +
+			$"TcpAdvertiseToClientAs: {AdvertiseHostToClientAs}:{AdvertiseTcpPortToClientAs}");
+	}
+}
diff --git a/src/KurrentDB.Core/Data/LowerUpper.cs b/src/KurrentDB.Core/Data/LowerUpper.cs
new file mode 100644
index 00000000000..9078d7c93fd
--- /dev/null
+++ b/src/KurrentDB.Core/Data/LowerUpper.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Data;
+
+public struct Range {
+	public readonly long Lower;
+	public readonly long Upper;
+
+	public Range(long lower, long upper) {
+		Lower = lower;
+		Upper = upper;
+	}
+}
diff --git a/src/KurrentDB.Core/Data/ReadAllResult.cs b/src/KurrentDB.Core/Data/ReadAllResult.cs
new file mode 100644
index 00000000000..60851c5f0fa
--- /dev/null
+++ b/src/KurrentDB.Core/Data/ReadAllResult.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Data;
+
+public enum ReadAllResult {
+	Success = 0,
+	NotModified = 1,
+	Error = 2,
+	AccessDenied = 3,
+	Expired = 4,
+	InvalidPosition = 5
+}
diff --git a/src/KurrentDB.Core/Data/ReadEventResult.cs b/src/KurrentDB.Core/Data/ReadEventResult.cs
new file mode 100644
index 00000000000..e00bd07c54b
--- /dev/null
+++ b/src/KurrentDB.Core/Data/ReadEventResult.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Data;
+
+public enum ReadEventResult {
+	Success = 0,
+	NotFound = 1,
+	NoStream = 2,
+	StreamDeleted = 3,
+	Error = 4,
+	AccessDenied = 5
+}
diff --git a/src/KurrentDB.Core/Data/ReadStreamResult.cs b/src/KurrentDB.Core/Data/ReadStreamResult.cs
new file mode 100644
index 00000000000..36413881b63
--- /dev/null
+++ b/src/KurrentDB.Core/Data/ReadStreamResult.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Data;
+
+public enum ReadStreamResult {
+	Success = 0,
+	NoStream = 1,
+	StreamDeleted = 2,
+	NotModified = 3,
+	Error = 4,
+	AccessDenied = 5,
+	Expired = 6,
+}
diff --git a/src/KurrentDB.Core/Data/Redaction/AcquireChunksLockResult.cs b/src/KurrentDB.Core/Data/Redaction/AcquireChunksLockResult.cs
new file mode 100644
index 00000000000..2d8b192a06e
--- /dev/null
+++ b/src/KurrentDB.Core/Data/Redaction/AcquireChunksLockResult.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Data.Redaction;
+
+public enum AcquireChunksLockResult {
+	None = 0,
+	Success = 1,
+	Failed = 2
+}
+
+public static class AcquireChunksLockResultExtensions {
+	public static string GetErrorMessage(this AcquireChunksLockResult result) {
+		return result switch {
+			AcquireChunksLockResult.Failed => "Failed to acquire lock.",
+			_ => result.ToString()
+		};
+	}
+}
diff --git a/src/KurrentDB.Core/Data/Redaction/EventPosition.cs b/src/KurrentDB.Core/Data/Redaction/EventPosition.cs
new file mode 100644
index 00000000000..637a0c0d4a7
--- /dev/null
+++ b/src/KurrentDB.Core/Data/Redaction/EventPosition.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Data.Redaction;
+
+public readonly struct EventPosition {
+	public long LogPosition { get; }
+	public ChunkInfo ChunkInfo { get; }
+
+	public EventPosition(long logPosition, string chunkFile, byte chunkVersion, bool chunkComplete, uint chunkEventOffset) {
+		LogPosition = logPosition;
+		ChunkInfo = new ChunkInfo(chunkFile, chunkVersion, chunkComplete, chunkEventOffset);
+	}
+}
+
+public readonly struct ChunkInfo {
+	public string FileName { get; }
+	public byte Version { get; }
+	public bool IsComplete { get; }
+	public uint EventOffset { get; }
+
+	public ChunkInfo(string fileName, byte version, bool isComplete, uint eventOffset) {
+		FileName = fileName;
+		Version = version;
+		IsComplete = isComplete;
+		EventOffset = eventOffset;
+	}
+}
diff --git a/src/KurrentDB.Core/Data/Redaction/GetEventPositionResult.cs b/src/KurrentDB.Core/Data/Redaction/GetEventPositionResult.cs
new file mode 100644
index 00000000000..1b088e685d0
--- /dev/null
+++ b/src/KurrentDB.Core/Data/Redaction/GetEventPositionResult.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Data.Redaction;
+
+public enum GetEventPositionResult {
+	None = 0,
+	Success = 1,
+	UnexpectedError = 2
+}
+
+public static class GetEventPositionResultExtensions {
+	public static string GetErrorMessage(this GetEventPositionResult result) {
+		return result switch {
+			GetEventPositionResult.UnexpectedError => "An unexpected error has occurred.",
+			_ => result.ToString()
+		};
+	}
+}
diff --git a/src/KurrentDB.Core/Data/Redaction/ReleaseChunksLockResult.cs b/src/KurrentDB.Core/Data/Redaction/ReleaseChunksLockResult.cs
new file mode 100644
index 00000000000..eccead5a68e
--- /dev/null
+++ b/src/KurrentDB.Core/Data/Redaction/ReleaseChunksLockResult.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Data.Redaction;
+
+public enum ReleaseChunksLockResult {
+	None = 0,
+	Success = 1,
+	Failed = 2
+}
+
+public static class ReleaseChunksLockResultExtensions {
+	public static string GetErrorMessage(this ReleaseChunksLockResult result) {
+		return result switch {
+			ReleaseChunksLockResult.Failed => "Failed to release lock.",
+			_ => result.ToString()
+		};
+	}
+}
diff --git a/src/KurrentDB.Core/Data/Redaction/SwitchChunkResult.cs b/src/KurrentDB.Core/Data/Redaction/SwitchChunkResult.cs
new file mode 100644
index 00000000000..1df1e8657b6
--- /dev/null
+++ b/src/KurrentDB.Core/Data/Redaction/SwitchChunkResult.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Data.Redaction;
+
+public enum SwitchChunkResult {
+	None = 0,
+	Success = 1,
+	TargetChunkFileNameInvalid = 2,
+	TargetChunkFileNotFound = 3,
+	TargetChunkExcessive = 4,
+	TargetChunkInactive = 5,
+	TargetChunkNotCompleted = 6,
+	NewChunkFileNameInvalid = 7,
+	NewChunkFileNotFound = 8,
+	NewChunkNotCompleted = 9,
+	NewChunkHeaderOrFooterInvalid = 10,
+	NewChunkHashInvalid = 11,
+	NewChunkOpenFailed = 12,
+	ChunkRangeDoesNotMatch = 13,
+	UnexpectedError = 14,
+	TargetChunkFormatNotSupported = 15,
+}
+
+public static class SwitchChunkResultExtensions {
+	public static string GetErrorMessage(this SwitchChunkResult result) {
+		return result switch {
+			SwitchChunkResult.TargetChunkFileNameInvalid => "The target chunk's file name is not valid.",
+			SwitchChunkResult.TargetChunkFileNotFound => "The target chunk file was not found in the database directory.",
+			SwitchChunkResult.TargetChunkExcessive => "The target chunk file is not part of the database.",
+			SwitchChunkResult.TargetChunkInactive => "The target chunk file is not actively used by the database.",
+			SwitchChunkResult.TargetChunkNotCompleted => "The target chunk is not a completed chunk.",
+			SwitchChunkResult.NewChunkFileNameInvalid => "The new chunk's file name is not valid.",
+			SwitchChunkResult.NewChunkFileNotFound => "The new chunk file was not found in the database directory.",
+			SwitchChunkResult.NewChunkNotCompleted => "The new chunk is not a completed chunk.",
+			SwitchChunkResult.NewChunkHeaderOrFooterInvalid => "The new chunk's header or footer is not valid.",
+			SwitchChunkResult.NewChunkHashInvalid => "The new chunk has failed hash verification.",
+			SwitchChunkResult.NewChunkOpenFailed => "An error has occurred when opening the new chunk.",
+			SwitchChunkResult.ChunkRangeDoesNotMatch => "The target chunk's range and the new chunk's range do not match.",
+			SwitchChunkResult.UnexpectedError => "An unexpected error has occurred.",
+			SwitchChunkResult.TargetChunkFormatNotSupported => "The target chunk's file format is not supported.",
+			_ => result.ToString()
+		};
+	}
+}
diff --git a/src/KurrentDB.Core/Data/ResolvedEvent.cs b/src/KurrentDB.Core/Data/ResolvedEvent.cs
new file mode 100644
index 00000000000..ebfa0375cd5
--- /dev/null
+++ b/src/KurrentDB.Core/Data/ResolvedEvent.cs
@@ -0,0 +1,95 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Data;
+
+public readonly struct ResolvedEvent : IEquatable<ResolvedEvent> {
+	public static readonly ResolvedEvent[] EmptyArray = new ResolvedEvent[0];
+	public static readonly ResolvedEvent EmptyEvent = new ResolvedEvent();
+
+	public readonly EventRecord Event;
+	public readonly EventRecord Link;
+	private readonly long? _originalEventCommitPosition;
+
+	public EventRecord OriginalEvent {
+		get { return Link ?? Event; }
+	}
+
+	/// <summary>
+	/// Position of the OriginalEvent (unresolved link or event) if available
+	/// </summary>
+	public TFPos? OriginalPosition => Link is not null ? LinkPosition : EventPosition;
+
+	public TFPos? EventPosition => CalculatePosition(Event);
+
+	public TFPos? LinkPosition => CalculatePosition(Link);
+
+	public readonly ReadEventResult ResolveResult;
+
+	public string OriginalStreamId {
+		get { return OriginalEvent.EventStreamId; }
+	}
+
+	public long OriginalEventNumber {
+		get { return OriginalEvent.EventNumber; }
+	}
+
+
+	private ResolvedEvent(EventRecord @event, EventRecord link, long? commitPosition,
+		ReadEventResult resolveResult = default(ReadEventResult)) {
+		Event = @event;
+		Link = link;
+		_originalEventCommitPosition = commitPosition;
+		ResolveResult = resolveResult;
+	}
+
+	public static ResolvedEvent ForUnresolvedEvent(EventRecord @event, long? commitPosition = null) {
+		return new ResolvedEvent(@event, null, commitPosition);
+	}
+
+	public static ResolvedEvent ForResolvedLink(EventRecord @event, EventRecord link, long? commitPosition = null) {
+		return new ResolvedEvent(@event, link, commitPosition);
+	}
+
+	public static ResolvedEvent ForFailedResolvedLink(EventRecord link, ReadEventResult resolveResult,
+		long? commitPosition = null) {
+		return new ResolvedEvent(null, link, commitPosition, resolveResult);
+	}
+
+	public ResolvedEvent WithoutPosition() {
+		return new ResolvedEvent(Event, Link, null, ResolveResult);
+	}
+
+	private TFPos? CalculatePosition(EventRecord @event) {
+		if (@event is null)
+			return null;
+
+		// if this is the original event and we know where it was committed
+		if (@event == OriginalEvent && _originalEventCommitPosition.HasValue)
+			return new TFPos(_originalEventCommitPosition.Value, @event.LogPosition);
+
+		// we don't know where this event was committed, unless it committed itself
+		if (@event.IsSelfCommitted)
+			return new TFPos(@event.LogPosition, @event.LogPosition);
+
+		// we don't know where this event was committed
+		return null;
+	}
+
+	public bool Equals(ResolvedEvent other) =>
+		Equals(Event, other.Event) && Equals(Link, other.Link) &&
+		_originalEventCommitPosition == other._originalEventCommitPosition &&
+		ResolveResult == other.ResolveResult;
+
+	public override bool Equals(object obj) =>
+		obj is ResolvedEvent other && Equals(other);
+
+	public override int GetHashCode() =>
+		HashCode.Combine(Event, Link, _originalEventCommitPosition, (int)ResolveResult);
+
+	public static bool operator ==(ResolvedEvent left, ResolvedEvent right) => left.Equals(right);
+
+	public static bool operator !=(ResolvedEvent left, ResolvedEvent right) => !left.Equals(right);
+}
diff --git a/src/KurrentDB.Core/Data/StreamAcl.cs b/src/KurrentDB.Core/Data/StreamAcl.cs
new file mode 100644
index 00000000000..f7541f1f98d
--- /dev/null
+++ b/src/KurrentDB.Core/Data/StreamAcl.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Runtime.CompilerServices;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Caching;
+
+namespace KurrentDB.Core.Data;
+
+public class StreamAcl {
+	public readonly string[] ReadRoles;
+	public readonly string[] WriteRoles;
+	public readonly string[] DeleteRoles;
+	public readonly string[] MetaReadRoles;
+	public readonly string[] MetaWriteRoles;
+
+	public StreamAcl(string readRole, string writeRole, string deleteRole, string metaReadRole,
+		string metaWriteRole)
+		: this(readRole == null ? null : new[] { readRole },
+			writeRole == null ? null : new[] { writeRole },
+			deleteRole == null ? null : new[] { deleteRole },
+			metaReadRole == null ? null : new[] { metaReadRole },
+			metaWriteRole == null ? null : new[] { metaWriteRole }) {
+	}
+
+	public StreamAcl(string[] readRoles, string[] writeRoles, string[] deleteRoles, string[] metaReadRoles,
+		string[] metaWriteRoles) {
+		ReadRoles = readRoles;
+		WriteRoles = writeRoles;
+		DeleteRoles = deleteRoles;
+		MetaReadRoles = metaReadRoles;
+		MetaWriteRoles = metaWriteRoles;
+	}
+
+	public override string ToString() {
+		return string.Format("Read: {0}, Write: {1}, Delete: {2}, MetaRead: {3}, MetaWrite: {4}",
+			ReadRoles == null ? "<null>" : "[" + string.Join(",", ReadRoles) + "]",
+			WriteRoles == null ? "<null>" : "[" + string.Join(",", WriteRoles) + "]",
+			DeleteRoles == null ? "<null>" : "[" + string.Join(",", DeleteRoles) + "]",
+			MetaReadRoles == null ? "<null>" : "[" + string.Join(",", MetaReadRoles) + "]",
+			MetaWriteRoles == null ? "<null>" : "[" + string.Join(",", MetaWriteRoles) + "]");
+	}
+
+	public int ApproximateSize {
+		get {
+			var size = 0;
+			size += MemSizer.ObjectHeaderSize; // StreamAcl object header
+			size += (Unsafe.SizeOf<string[]>() * 5) // string arrays refs
+				.RoundUpToMultipleOf(IntPtr.Size); // padding
+			size += MemSizer.SizeOf(ReadRoles);
+			size += MemSizer.SizeOf(WriteRoles);
+			size += MemSizer.SizeOf(DeleteRoles);
+			size += MemSizer.SizeOf(MetaReadRoles);
+			size += MemSizer.SizeOf(MetaWriteRoles);
+
+			return size;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Data/StreamMetadata.cs b/src/KurrentDB.Core/Data/StreamMetadata.cs
new file mode 100644
index 00000000000..a8ca2ca18ca
--- /dev/null
+++ b/src/KurrentDB.Core/Data/StreamMetadata.cs
@@ -0,0 +1,330 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.CompilerServices;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Caching;
+using KurrentDB.Core.Services;
+using KurrentDB.LogCommon;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace KurrentDB.Core.Data;
+
+public class StreamMetadata {
+	public static readonly StreamMetadata Empty = new StreamMetadata();
+
+	public readonly long? MaxCount;
+	public readonly TimeSpan? MaxAge;
+
+	public readonly long? TruncateBefore;
+	public readonly bool? TempStream;
+
+	public readonly TimeSpan? CacheControl;
+	public readonly StreamAcl Acl;
+
+	public StreamMetadata(long? maxCount = null, TimeSpan? maxAge = null,
+		long? truncateBefore = null, bool? tempStream = null,
+		TimeSpan? cacheControl = null, StreamAcl acl = null) {
+		if (maxCount <= 0)
+			throw new ArgumentOutOfRangeException(
+				"maxCount", string.Format("{0} should be positive value.", SystemMetadata.MaxCount));
+		if (maxAge <= TimeSpan.Zero)
+			throw new ArgumentOutOfRangeException(
+				"maxAge", string.Format("{0} should be positive time span.", SystemMetadata.MaxAge));
+		if (truncateBefore < 0)
+			throw new ArgumentOutOfRangeException(
+				"truncateBefore",
+				string.Format("{0} should be non-negative value.", SystemMetadata.TruncateBefore));
+		if (cacheControl <= TimeSpan.Zero)
+			throw new ArgumentOutOfRangeException(
+				"cacheControl", string.Format("{0} should be positive time span.", SystemMetadata.CacheControl));
+
+		MaxCount = maxCount;
+		MaxAge = maxAge;
+		TruncateBefore = truncateBefore;
+		TempStream = tempStream;
+		CacheControl = cacheControl;
+		Acl = acl;
+	}
+
+	public override string ToString() {
+		return string.Format(
+			"MaxCount: {0}, MaxAge: {1}, TruncateBefore: {2}, TempStream: {3}, CacheControl: {4}, Acl: {5}",
+			MaxCount, MaxAge, TruncateBefore, TempStream, CacheControl, Acl);
+	}
+
+	public static StreamMetadata TryFromJsonBytes(byte prepareVersion, ReadOnlyMemory<byte> bytes) =>
+		TryFromJsonBytes(prepareVersion, bytes.Span);
+
+	public static StreamMetadata TryFromJsonBytes(byte prepareVersion, ReadOnlySpan<byte> json) {
+		try {
+			var metadata = FromJsonBytes(json);
+			metadata = UpgradeMetadata(prepareVersion, metadata);
+			return metadata;
+		} catch {
+			// this can happen if the json is malformed, or if any of the things that we expect to be
+			// longs are bigger than longs which can happen if you try to set something to
+			// long.maxvalue in the webui because javascript translates it into a number that is
+			// bigger than long.max
+			return Empty;
+		}
+	}
+
+	public static StreamMetadata UpgradeMetadata(byte prepareVersion, StreamMetadata metadata) {
+		if (prepareVersion == LogRecordVersion.LogRecordV0 && metadata.TruncateBefore == int.MaxValue) {
+			metadata = new StreamMetadata(
+				maxCount: metadata.MaxCount,
+				maxAge: metadata.MaxAge,
+				truncateBefore: EventNumber.DeletedStream,
+				tempStream: metadata.TempStream,
+				cacheControl: metadata.CacheControl,
+				acl: metadata.Acl);
+		}
+
+		return metadata;
+	}
+
+	public static StreamMetadata FromJsonBytes(ReadOnlyMemory<byte> json) => FromJsonBytes(json.Span);
+
+	public static StreamMetadata FromJsonBytes(ReadOnlySpan<byte> json) {
+		using (var reader = new JsonTextReader(new StreamReader(new MemoryStream(json.ToArray())))) {
+			return FromJsonReader(reader);
+		}
+	}
+
+	public static StreamMetadata FromJson(string json) {
+		using (var reader = new JsonTextReader(new StringReader(json))) {
+			return FromJsonReader(reader);
+		}
+	}
+
+	public static StreamMetadata FromJsonReader(JsonTextReader reader) {
+		Check(reader.Read(), reader);
+		Check(JsonToken.StartObject, reader);
+
+		long? maxCount = null;
+		TimeSpan? maxAge = null;
+		long? truncateBefore = null;
+		bool? tempStream = null;
+		TimeSpan? cacheControl = null;
+		StreamAcl acl = null;
+
+		while (true) {
+			Check(reader.Read(), reader);
+			if (reader.TokenType == JsonToken.EndObject)
+				break;
+			Check(JsonToken.PropertyName, reader);
+			var name = (string)reader.Value;
+			switch (name) {
+				case SystemMetadata.MaxCount: {
+					Check(reader.Read(), reader);
+					Check(JsonToken.Integer, reader);
+					maxCount = (long)reader.Value;
+					break;
+				}
+				case SystemMetadata.MaxAge: {
+					Check(reader.Read(), reader);
+					Check(JsonToken.Integer, reader);
+					maxAge = TimeSpan.FromSeconds((long)reader.Value);
+					break;
+				}
+				case SystemMetadata.TruncateBefore: {
+					Check(reader.Read(), reader);
+					Check(JsonToken.Integer, reader);
+					truncateBefore = (long)reader.Value;
+					break;
+				}
+				case SystemMetadata.TempStream: {
+					Check(reader.Read(), reader);
+					Check(JsonToken.Boolean, reader);
+					tempStream = (bool)reader.Value;
+					break;
+				}
+				case SystemMetadata.CacheControl: {
+					Check(reader.Read(), reader);
+					Check(JsonToken.Integer, reader);
+					cacheControl = TimeSpan.FromSeconds((long)reader.Value);
+					break;
+				}
+				case SystemMetadata.Acl: {
+					acl = ReadAcl(reader);
+					break;
+				}
+				default: {
+					Check(reader.Read(), reader);
+					// skip
+					JToken.ReadFrom(reader);
+					break;
+				}
+			}
+		}
+
+		return new StreamMetadata(
+			maxCount > 0 ? maxCount : null, maxAge > TimeSpan.Zero ? maxAge : null,
+			truncateBefore >= 0 ? truncateBefore : null, tempStream,
+			cacheControl > TimeSpan.Zero ? cacheControl : null, acl);
+	}
+
+	internal static StreamAcl ReadAcl(JsonTextReader reader) {
+		Check(reader.Read(), reader);
+		Check(JsonToken.StartObject, reader);
+
+		string[] read = null;
+		string[] write = null;
+		string[] delete = null;
+		string[] metaRead = null;
+		string[] metaWrite = null;
+
+		while (true) {
+			Check(reader.Read(), reader);
+			if (reader.TokenType == JsonToken.EndObject)
+				break;
+			Check(JsonToken.PropertyName, reader);
+			var name = (string)reader.Value;
+			switch (name) {
+				case SystemMetadata.AclRead:
+					read = ReadRoles(reader);
+					break;
+				case SystemMetadata.AclWrite:
+					write = ReadRoles(reader);
+					break;
+				case SystemMetadata.AclDelete:
+					delete = ReadRoles(reader);
+					break;
+				case SystemMetadata.AclMetaRead:
+					metaRead = ReadRoles(reader);
+					break;
+				case SystemMetadata.AclMetaWrite:
+					metaWrite = ReadRoles(reader);
+					break;
+			}
+		}
+
+		return new StreamAcl(read, write, delete, metaRead, metaWrite);
+	}
+
+	private static string[] ReadRoles(JsonTextReader reader) {
+		Check(reader.Read(), reader);
+		if (reader.TokenType == JsonToken.String)
+			return new[] { (string)reader.Value };
+
+		if (reader.TokenType == JsonToken.StartArray) {
+			var roles = new List<string>();
+			while (true) {
+				Check(reader.Read(), reader);
+				if (reader.TokenType == JsonToken.EndArray)
+					break;
+				Check(JsonToken.String, reader);
+				roles.Add((string)reader.Value);
+			}
+
+			return roles.ToArray();
+		}
+
+		throw new Exception("Invalid JSON");
+	}
+
+	private static void Check(JsonToken type, JsonTextReader reader) {
+		if (reader.TokenType != type)
+			throw new Exception("Invalid JSON");
+	}
+
+	private static void Check(bool read, JsonTextReader reader) {
+		if (!read)
+			throw new Exception("Invalid JSON");
+	}
+
+	public byte[] ToJsonBytes() {
+		using (var memoryStream = new MemoryStream()) {
+			using (var jsonWriter = new JsonTextWriter(new StreamWriter(memoryStream, Helper.UTF8NoBom))) {
+				WriteAsJson(jsonWriter);
+			}
+
+			return memoryStream.ToArray();
+		}
+	}
+
+	public string ToJsonString() {
+		using (var stringWriter = new StringWriter()) {
+			using (var jsonWriter = new JsonTextWriter(stringWriter)) {
+				WriteAsJson(jsonWriter);
+			}
+
+			return stringWriter.ToString();
+		}
+	}
+
+	private void WriteAsJson(JsonTextWriter jsonWriter) {
+		jsonWriter.WriteStartObject();
+		if (MaxCount.HasValue) {
+			jsonWriter.WritePropertyName(SystemMetadata.MaxCount);
+			jsonWriter.WriteValue(MaxCount.Value);
+		}
+
+		if (MaxAge.HasValue) {
+			jsonWriter.WritePropertyName(SystemMetadata.MaxAge);
+			jsonWriter.WriteValue((long)MaxAge.Value.TotalSeconds);
+		}
+
+		if (TruncateBefore.HasValue) {
+			jsonWriter.WritePropertyName(SystemMetadata.TruncateBefore);
+			jsonWriter.WriteValue(TruncateBefore.Value);
+		}
+
+		if (TempStream.HasValue) {
+			jsonWriter.WritePropertyName(SystemMetadata.TempStream);
+			jsonWriter.WriteValue(TempStream.Value);
+		}
+
+		if (CacheControl.HasValue) {
+			jsonWriter.WritePropertyName(SystemMetadata.CacheControl);
+			jsonWriter.WriteValue((long)CacheControl.Value.TotalSeconds);
+		}
+
+		if (Acl != null) {
+			jsonWriter.WritePropertyName(SystemMetadata.Acl);
+			WriteAcl(jsonWriter, Acl);
+		}
+
+		jsonWriter.WriteEndObject();
+	}
+
+	internal static void WriteAcl(JsonTextWriter jsonWriter, StreamAcl acl) {
+		jsonWriter.WriteStartObject();
+		WriteAclRoles(jsonWriter, SystemMetadata.AclRead, acl.ReadRoles);
+		WriteAclRoles(jsonWriter, SystemMetadata.AclWrite, acl.WriteRoles);
+		WriteAclRoles(jsonWriter, SystemMetadata.AclDelete, acl.DeleteRoles);
+		WriteAclRoles(jsonWriter, SystemMetadata.AclMetaRead, acl.MetaReadRoles);
+		WriteAclRoles(jsonWriter, SystemMetadata.AclMetaWrite, acl.MetaWriteRoles);
+		jsonWriter.WriteEndObject();
+	}
+
+	private static void WriteAclRoles(JsonTextWriter jsonWriter, string propertyName, string[] roles) {
+		if (roles == null)
+			return;
+		jsonWriter.WritePropertyName(propertyName);
+		if (roles.Length == 1) {
+			jsonWriter.WriteValue(roles[0]);
+		} else {
+			jsonWriter.WriteStartArray();
+			Array.ForEach(roles, jsonWriter.WriteValue);
+			jsonWriter.WriteEndArray();
+		}
+	}
+
+	public int ApproximateSize =>
+		MemSizer.ObjectHeaderSize // StreamMetadata object header
+		+ (
+			Unsafe.SizeOf<long?>() // MaxCount
+			+ Unsafe.SizeOf<TimeSpan?>() // MaxAge
+			+ Unsafe.SizeOf<long?>() // TruncateBefore
+			+ Unsafe.SizeOf<bool?>() // TempStream
+			+ Unsafe.SizeOf<TimeSpan?>() // CacheControl
+			+ Unsafe.SizeOf<StreamAcl>()
+		).RoundUpToMultipleOf(IntPtr.Size) // padding
+		+ (Acl?.ApproximateSize ?? 0); // Acl
+}
diff --git a/src/KurrentDB.Core/Data/SystemSettings.cs b/src/KurrentDB.Core/Data/SystemSettings.cs
new file mode 100644
index 00000000000..32c0e9b8a6b
--- /dev/null
+++ b/src/KurrentDB.Core/Data/SystemSettings.cs
@@ -0,0 +1,109 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Services;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace KurrentDB.Core.Data;
+
+public class SystemSettings {
+	public static readonly SystemSettings Default = new SystemSettings(
+		new StreamAcl(SystemRoles.All, SystemRoles.All, SystemRoles.All, SystemRoles.All, SystemRoles.All),
+		new StreamAcl(SystemRoles.Admins, SystemRoles.Admins, SystemRoles.Admins, SystemRoles.Admins,
+			SystemRoles.Admins));
+
+	public readonly StreamAcl UserStreamAcl;
+	public readonly StreamAcl SystemStreamAcl;
+
+	public SystemSettings(StreamAcl userStreamAcl, StreamAcl systemStreamAcl) {
+		UserStreamAcl = userStreamAcl;
+		SystemStreamAcl = systemStreamAcl;
+	}
+
+	public override string ToString() {
+		return string.Format("UserStreamAcl: ({0}), SystemStreamAcl: ({1})", UserStreamAcl, SystemStreamAcl);
+	}
+
+	public static SystemSettings FromJsonBytes(ReadOnlyMemory<byte> json) {
+		using (var reader = new JsonTextReader(new StreamReader(new MemoryStream(json.ToArray())))) {
+			Check(reader.Read(), reader);
+			Check(JsonToken.StartObject, reader);
+
+			StreamAcl userStreamAcl = null;
+			StreamAcl systemStreamAcl = null;
+
+			while (true) {
+				Check(reader.Read(), reader);
+				if (reader.TokenType == JsonToken.EndObject)
+					break;
+				Check(JsonToken.PropertyName, reader);
+				var name = (string)reader.Value;
+				switch (name) {
+					case SystemMetadata.UserStreamAcl:
+						userStreamAcl = StreamMetadata.ReadAcl(reader);
+						break;
+					case SystemMetadata.SystemStreamAcl:
+						systemStreamAcl = StreamMetadata.ReadAcl(reader);
+						break;
+					default: {
+						Check(reader.Read(), reader);
+						// skip
+						JToken.ReadFrom(reader);
+						break;
+					}
+				}
+			}
+
+			return new SystemSettings(userStreamAcl, systemStreamAcl);
+		}
+	}
+
+	private static void Check(JsonToken type, JsonTextReader reader) {
+		if (reader.TokenType != type)
+			throw new Exception("Invalid JSON");
+	}
+
+	private static void Check(bool read, JsonTextReader reader) {
+		if (!read)
+			throw new Exception("Invalid JSON");
+	}
+
+	public byte[] ToJsonBytes() {
+		using (var memoryStream = new MemoryStream()) {
+			using (var jsonWriter = new JsonTextWriter(new StreamWriter(memoryStream, Helper.UTF8NoBom))) {
+				WriteAsJson(jsonWriter);
+			}
+
+			return memoryStream.ToArray();
+		}
+	}
+
+	public string ToJsonString() {
+		using (var stringWriter = new StringWriter()) {
+			using (var jsonWriter = new JsonTextWriter(stringWriter)) {
+				WriteAsJson(jsonWriter);
+			}
+
+			return stringWriter.ToString();
+		}
+	}
+
+	private void WriteAsJson(JsonTextWriter jsonWriter) {
+		jsonWriter.WriteStartObject();
+		if (UserStreamAcl != null) {
+			jsonWriter.WritePropertyName(SystemMetadata.UserStreamAcl);
+			StreamMetadata.WriteAcl(jsonWriter, UserStreamAcl);
+		}
+
+		if (SystemStreamAcl != null) {
+			jsonWriter.WritePropertyName(SystemMetadata.SystemStreamAcl);
+			StreamMetadata.WriteAcl(jsonWriter, SystemStreamAcl);
+		}
+
+		jsonWriter.WriteEndObject();
+	}
+}
diff --git a/src/KurrentDB.Core/Data/TFPos.cs b/src/KurrentDB.Core/Data/TFPos.cs
new file mode 100644
index 00000000000..effc11ff570
--- /dev/null
+++ b/src/KurrentDB.Core/Data/TFPos.cs
@@ -0,0 +1,96 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics.Contracts;
+using System.Globalization;
+
+namespace KurrentDB.Core.Data;
+
+public struct TFPos : IEquatable<TFPos>, IComparable<TFPos> {
+	public static readonly TFPos Invalid = new TFPos(-1, -1);
+	public static readonly TFPos HeadOfTf = new TFPos(-1, -1);
+	public static readonly TFPos FirstRecordOfTf = new TFPos(0, 0);
+
+	public readonly long CommitPosition;
+	public readonly long PreparePosition;
+
+	public TFPos(long commitPosition, long preparePosition) {
+		CommitPosition = commitPosition;
+		PreparePosition = preparePosition;
+	}
+
+	[Pure]
+	public string AsString() {
+		return string.Format("{0:X16}{1:X16}", CommitPosition, PreparePosition);
+	}
+
+	public static bool TryParse(string s, out TFPos pos) {
+		pos = Invalid;
+		if (s == null || s.Length != 32)
+			return false;
+
+		long commitPos;
+		long preparePos;
+		if (!long.TryParse(s.Substring(0, 16), NumberStyles.HexNumber, null, out commitPos))
+			return false;
+		if (!long.TryParse(s.Substring(16, 16), NumberStyles.HexNumber, null, out preparePos))
+			return false;
+		pos = new TFPos(commitPos, preparePos);
+		return true;
+	}
+
+	public int CompareTo(TFPos other) {
+		if (CommitPosition < other.CommitPosition)
+			return -1;
+		if (CommitPosition > other.CommitPosition)
+			return 1;
+		return PreparePosition.CompareTo(other.PreparePosition);
+	}
+
+	public bool Equals(TFPos other) {
+		return this == other;
+	}
+
+	public override bool Equals(object obj) {
+		if (ReferenceEquals(null, obj))
+			return false;
+		return obj is TFPos && Equals((TFPos)obj);
+	}
+
+	public override int GetHashCode() {
+		unchecked {
+			return (CommitPosition.GetHashCode() * 397) ^ PreparePosition.GetHashCode();
+		}
+	}
+
+	public static bool operator ==(TFPos left, TFPos right) {
+		return left.CommitPosition == right.CommitPosition && left.PreparePosition == right.PreparePosition;
+	}
+
+	public static bool operator !=(TFPos left, TFPos right) {
+		return !(left == right);
+	}
+
+	public static bool operator <=(TFPos left, TFPos right) {
+		return !(left > right);
+	}
+
+	public static bool operator >=(TFPos left, TFPos right) {
+		return !(left < right);
+	}
+
+	public static bool operator <(TFPos left, TFPos right) {
+		return left.CommitPosition < right.CommitPosition
+			   || (left.CommitPosition == right.CommitPosition && left.PreparePosition < right.PreparePosition);
+	}
+
+	public static bool operator >(TFPos left, TFPos right) {
+		return left.CommitPosition > right.CommitPosition
+			   || (left.CommitPosition == right.CommitPosition && left.PreparePosition > right.PreparePosition);
+	}
+
+	public override string ToString() {
+		return string.Format("C:{0}/P:{1}", CommitPosition, PreparePosition);
+	}
+}
diff --git a/src/EventStore.Core/Data/UserData.cs b/src/KurrentDB.Core/Data/UserData.cs
similarity index 80%
rename from src/EventStore.Core/Data/UserData.cs
rename to src/KurrentDB.Core/Data/UserData.cs
index 73d49b80c57..8c869f9334b 100644
--- a/src/EventStore.Core/Data/UserData.cs
+++ b/src/KurrentDB.Core/Data/UserData.cs
@@ -1,6 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 #nullable enable
 
-namespace EventStore.Core.Data;
+namespace KurrentDB.Core.Data;
 
 public record UserData {
 	public UserData(string loginName, string fullName, string[]? groups, string hash, string salt, bool disabled) {
@@ -20,12 +23,12 @@ public UserData(string loginName, string fullName, string[]? groups, string hash
 	public bool Disabled { get; init; }
 
 	public UserData SetFullName(string fullName) => this with { FullName = fullName };
-	
+
 	public UserData SetGroups(params string[] groups) => this with { Groups = groups };
-	
+
 	public UserData SetPassword(string hash, string salt) => this with { Hash = hash, Salt = salt };
-	
+
 	public UserData SetEnabled() => this with { Disabled = false };
-	
+
 	public UserData SetDisabled() => this with { Disabled = true };
 }
diff --git a/src/KurrentDB.Core/Data/VNodeInfo.cs b/src/KurrentDB.Core/Data/VNodeInfo.cs
new file mode 100644
index 00000000000..661ebbcf50c
--- /dev/null
+++ b/src/KurrentDB.Core/Data/VNodeInfo.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.Data;
+
+public class VNodeInfo {
+	public readonly Guid InstanceId;
+	public readonly int DebugIndex;
+	public readonly IPEndPoint InternalTcp;
+	public readonly IPEndPoint InternalSecureTcp;
+	public readonly IPEndPoint ExternalTcp;
+	public readonly IPEndPoint ExternalSecureTcp;
+	public readonly EndPoint HttpEndPoint;
+	public readonly bool IsReadOnlyReplica;
+
+	public VNodeInfo(Guid instanceId, int debugIndex,
+		IPEndPoint internalTcp, IPEndPoint internalSecureTcp,
+		IPEndPoint externalTcp, IPEndPoint externalSecureTcp,
+		EndPoint httpEndPoint,
+		bool isReadOnlyReplica) {
+		Ensure.NotEmptyGuid(instanceId, "instanceId");
+		Ensure.Equal(false, internalTcp == null && internalSecureTcp == null, "Both internal TCP endpoints are null");
+		Ensure.NotNull(httpEndPoint, nameof(httpEndPoint));
+
+		DebugIndex = debugIndex;
+		InstanceId = instanceId;
+		InternalTcp = internalTcp;
+		InternalSecureTcp = internalSecureTcp;
+		ExternalTcp = externalTcp;
+		ExternalSecureTcp = externalSecureTcp;
+		HttpEndPoint = httpEndPoint;
+		IsReadOnlyReplica = isReadOnlyReplica;
+	}
+
+	public bool Is(EndPoint endPoint) {
+		return endPoint != null
+			   && HttpEndPoint.Equals(endPoint)
+				   || (InternalTcp != null && InternalTcp.Equals(endPoint))
+				   || (InternalSecureTcp != null && InternalSecureTcp.Equals(endPoint))
+				   || (ExternalTcp != null && ExternalTcp.Equals(endPoint))
+				   || (ExternalSecureTcp != null && ExternalSecureTcp.Equals(endPoint));
+	}
+
+	public override string ToString() {
+		return string.Format("InstanceId: {0:B}, InternalTcp: {1}, InternalSecureTcp: {2}, " +
+							 "ExternalTcp: {3}, ExternalSecureTcp: {4}, HttpEndPoint: {5}," +
+							 "IsReadOnlyReplica: {6}",
+			InstanceId,
+			InternalTcp,
+			InternalSecureTcp,
+			ExternalTcp,
+			ExternalSecureTcp,
+			HttpEndPoint,
+			IsReadOnlyReplica);
+	}
+}
diff --git a/src/KurrentDB.Core/Data/VNodeState.cs b/src/KurrentDB.Core/Data/VNodeState.cs
new file mode 100644
index 00000000000..22708a94a3c
--- /dev/null
+++ b/src/KurrentDB.Core/Data/VNodeState.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.ComponentModel;
+
+namespace KurrentDB.Core.Data;
+
+//WARNING: new states must be added at the bottom of the enum otherwise it may break cluster and client compatibility
+public enum VNodeState {
+	Initializing = 0,
+	DiscoverLeader = 1,
+	Unknown = 2,
+	PreReplica = 3,
+	CatchingUp = 4,
+	Clone = 5,
+	Follower = 6,
+	PreLeader = 7,
+	Leader = 8,
+	Manager = 9,
+	ShuttingDown = 10,
+	Shutdown = 11,
+	ReadOnlyLeaderless = 12,
+	PreReadOnlyReplica = 13,
+	ReadOnlyReplica = 14,
+	ResigningLeader = 15,
+
+	[EditorBrowsable(EditorBrowsableState.Never)]
+	MaxValue = ResigningLeader,
+}
+
+public static class VNodeStateExtensions {
+	public static bool IsReplica(this VNodeState state) {
+		return state is VNodeState.CatchingUp or VNodeState.Clone or VNodeState.Follower
+			or VNodeState.ReadOnlyReplica;
+	}
+}
diff --git a/src/KurrentDB.Core/DataStructures/BoundedQueue.cs b/src/KurrentDB.Core/DataStructures/BoundedQueue.cs
new file mode 100644
index 00000000000..88d3888d937
--- /dev/null
+++ b/src/KurrentDB.Core/DataStructures/BoundedQueue.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+
+namespace KurrentDB.Core.DataStructures;
+
+public class BoundedQueue<T> {
+	private readonly int _maxCapacity;
+	private readonly Queue<T> _queue;
+
+	public int MaxCapacity {
+		get { return _maxCapacity; }
+	}
+
+	public int Count {
+		get { return _queue.Count; }
+	}
+
+	public BoundedQueue(int maxCapacity) {
+		_queue = new Queue<T>(maxCapacity);
+		_maxCapacity = maxCapacity;
+	}
+
+	public void Enqueue(T obj) {
+		if (_queue.Count >= _maxCapacity)
+			Dequeue();
+		_queue.Enqueue(obj);
+	}
+
+	public T Dequeue() {
+		return _queue.Dequeue();
+	}
+
+	public T Peek() {
+		return _queue.Peek();
+	}
+
+	public bool CanAccept() {
+		return _queue.Count < _maxCapacity;
+	}
+}
diff --git a/src/KurrentDB.Core/DataStructures/ILRUCache.cs b/src/KurrentDB.Core/DataStructures/ILRUCache.cs
new file mode 100644
index 00000000000..a17491258ff
--- /dev/null
+++ b/src/KurrentDB.Core/DataStructures/ILRUCache.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Caching;
+
+namespace KurrentDB.Core.DataStructures;
+
+public interface ILRUCache : IDynamicCache {
+	void Clear();
+}
+
+public interface ILRUCache<TKey, TValue> : ILRUCache {
+	bool TryGet(TKey key, out TValue value);
+	TValue Put(TKey key, TValue value);
+
+	TValue Put<T>(TKey key, T userData, Func<TKey, T, TValue> addFactory,
+		Func<TKey, TValue, T, TValue> updateFactory);
+}
+
+public interface IStickyLRUCache<TKey, TValue> {
+	void Clear();
+	bool TryGet(TKey key, out TValue value);
+	TValue Put(TKey key, TValue value, int stickiness);
+	TValue Put(TKey key, Func<TKey, TValue> addFactory, Func<TKey, TValue, TValue> updateFactory, int stickiness);
+}
diff --git a/src/KurrentDB.Core/DataStructures/LRUCache.cs b/src/KurrentDB.Core/DataStructures/LRUCache.cs
new file mode 100644
index 00000000000..122afbe5a5b
--- /dev/null
+++ b/src/KurrentDB.Core/DataStructures/LRUCache.cs
@@ -0,0 +1,271 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Caching;
+using Serilog;
+
+namespace KurrentDB.Core.DataStructures;
+
+public class LRUCache {
+	protected static readonly ILogger Log = Serilog.Log.ForContext<LRUCache>();
+}
+
+public class LRUCache<TKey, TValue> : LRUCache, ILRUCache<TKey, TValue> {
+	private class LRUItem {
+		public TKey Key;
+		public TValue Value;
+
+		// calculation excludes the size of refs of
+		// the key & value to avoid double counting
+		public static int Size =>
+			MemSizer.ObjectHeaderSize +
+			(
+				Unsafe.SizeOf<TKey>() +
+				Unsafe.SizeOf<TValue>()
+			).RoundUpToMultipleOf(IntPtr.Size);
+	}
+
+	public delegate int CalculateItemSize(TKey key, TValue value);
+	public delegate int CalculateFreedSize(TKey key, TValue value, bool keyFreed, bool valueFreed, bool nodeFreed);
+
+	private readonly LinkedList<LRUItem> _orderList = new();
+	private readonly Dictionary<TKey, LinkedListNode<LRUItem>> _items = new();
+	private readonly Queue<LinkedListNode<LRUItem>> _nodesPool = new();
+	private readonly object _lock = new();
+	private readonly string _unit;
+	private readonly CalculateItemSize _calculateItemSize;
+	private readonly CalculateFreedSize _calculateFreedSize;
+
+	private long _capacity;
+	private long _size;
+	private long _freedSize;
+
+	private static readonly CalculateItemSize _unitSize = delegate { return 1; };
+	private static readonly CalculateFreedSize _zeroSize = delegate { return 0; };
+
+	public string Name { get; }
+	public long Size => Interlocked.Read(ref _size);
+	public long FreedSize => Interlocked.Read(ref _freedSize);
+	public long Capacity => Interlocked.Read(ref _capacity);
+	public long Count {
+		get {
+			lock (_lock) {
+				return _items.Count;
+			}
+		}
+	}
+
+	public LRUCache(
+		string name,
+		long capacity,
+		CalculateItemSize calculateItemSize = null,
+		CalculateFreedSize calculateFreedSize = null,
+		string unit = null) {
+
+		Ensure.NotNull(name, nameof(name));
+		Ensure.Nonnegative(capacity, nameof(capacity));
+		Name = name;
+		_capacity = capacity;
+		_size = 0L;
+		_calculateItemSize = calculateItemSize ?? _unitSize;
+		_calculateFreedSize = calculateFreedSize ?? _zeroSize;
+		_unit = unit ?? "items";
+	}
+
+	public static int ApproximateItemSize(int keyRefsSize, int valueRefsSize) =>
+		LRUItem.Size +
+		keyRefsSize +
+		valueRefsSize +
+		MemSizer.SizeOfLinkedListNode<LRUItem>() + // linked list node
+		MemSizer.SizeOfDictionaryEntry<TKey, LinkedListNode<LRUItem>>() + // _items entry
+		MemSizer.LinkedListEntrySize; // _orderList entry
+
+	private void PutItem(TKey key, TValue value) {
+		lock (_lock) {
+			var node = GetNode();
+			node.Value.Key = key;
+			node.Value.Value = value;
+
+			var itemSize = _calculateItemSize(key, value);
+			EnsureCapacity(itemSize, true, out _, out _);
+
+			_items.Add(key, node);
+			_orderList.AddLast(node);
+			_size += itemSize;
+		}
+	}
+
+	private void UpdateItem(LinkedListNode<LRUItem> node, TValue value) {
+		lock (_lock) {
+			const bool reuseNode = true;
+			_size -= _calculateItemSize(node.Value.Key, node.Value.Value);
+			_size += _calculateItemSize(node.Value.Key, value);
+			_freedSize += _calculateFreedSize(node.Value.Key, node.Value.Value, false, true, !reuseNode);
+
+			node.Value.Value = value;
+
+			if (!ReferenceEquals(node, _orderList.Last)) {
+				_orderList.Remove(node);
+				_orderList.AddLast(node);
+			}
+
+			if (_size > _capacity)
+				EnsureCapacity(0, reuseNode, out _, out _);
+		}
+	}
+
+	private void RemoveItem(TKey key) {
+		lock (_lock) {
+			LinkedListNode<LRUItem> node;
+			if (_items.TryGetValue(key, out node)) {
+				_orderList.Remove(node);
+				_items.Remove(key);
+				_size -= _calculateItemSize(key, node.Value.Value);
+				_freedSize += _calculateFreedSize(node.Value.Key, node.Value.Value, true, true, false);
+
+				ReturnNode(node);
+			}
+		}
+	}
+
+	private void RemoveFirstItem(bool reuseNode) {
+		lock (_lock) {
+			var node = _orderList.First;
+			if (node == null)
+				return;
+
+			_orderList.Remove(node);
+			_items.Remove(node.Value.Key);
+			_size -= _calculateItemSize(node.Value.Key, node.Value.Value);
+			_freedSize += _calculateFreedSize(node.Value.Key, node.Value.Value, true, true, !reuseNode);
+
+			if (reuseNode)
+				ReturnNode(node);
+		}
+	}
+
+	public bool TryGet(TKey key, out TValue value) {
+		lock (_lock) {
+			LinkedListNode<LRUItem> node;
+			if (_items.TryGetValue(key, out node)) {
+				_orderList.Remove(node);
+				_orderList.AddLast(node);
+				value = node.Value.Value;
+				return true;
+			}
+
+			value = default;
+			return false;
+		}
+	}
+
+	public TValue Put(TKey key, TValue value) {
+		lock (_lock) {
+			LinkedListNode<LRUItem> node;
+			if (!_items.TryGetValue(key, out node))
+				PutItem(key, value);
+			else
+				UpdateItem(node, value);
+
+			return value;
+		}
+	}
+
+	public void Remove(TKey key) {
+		lock (_lock) {
+			RemoveItem(key);
+		}
+	}
+
+	public void Clear() {
+		lock (_lock) {
+			while (_orderList.Count > 0)
+				RemoveFirstItem(false);
+		}
+	}
+
+	public TValue Put<T>(TKey key, T userData, Func<TKey, T, TValue> addFactory,
+		Func<TKey, TValue, T, TValue> updateFactory) {
+		lock (_lock) {
+			TValue value;
+			LinkedListNode<LRUItem> node;
+			if (!_items.TryGetValue(key, out node)) {
+				value = addFactory(key, userData);
+				PutItem(key, value);
+			} else {
+				value = updateFactory(key, node.Value.Value, userData);
+				UpdateItem(node, value);
+			}
+
+			return value;
+		}
+	}
+
+	private void EnsureCapacity(int forItemSize, bool reuseNodes, out int removedCount, out long removedSize) {
+		lock (_lock) {
+			var initialCount = _items.Count;
+			var initialSize = _size;
+
+			while (_items.Count > 0 && _size + forItemSize > _capacity)
+				RemoveFirstItem(reuseNodes);
+
+			removedCount = initialCount - _items.Count;
+			removedSize = initialSize - _size;
+		}
+	}
+
+	public void SetCapacity(long newCapacity) {
+		const int resizeBatchSize = 100_000;
+
+		if (newCapacity < 0)
+			throw new ArgumentOutOfRangeException(nameof(newCapacity));
+
+		var removedCount = 0;
+		var removedSize = 0L;
+
+		// when decreasing the capacity, remove items batch by batch to prevent
+		// other threads from starving when trying to access the cache.
+		// when increasing, jump straight up.
+		var curCapacity = Interlocked.Read(ref _capacity);
+
+		while (curCapacity != newCapacity) {
+			curCapacity = Math.Max(curCapacity - resizeBatchSize, newCapacity);
+			Interlocked.Exchange(ref _capacity, curCapacity);
+			EnsureCapacity(0, false, out var curRemovedCount, out var curRemovedSize);
+			removedCount += curRemovedCount;
+			removedSize += curRemovedSize;
+		}
+
+		if (removedCount > 0)
+			Log.Information(
+				"{name} cache removed {removedCount:N0} entries amounting to ~{removedSize:N0} " + _unit,
+				Name, removedCount, removedSize);
+	}
+
+	public void ResetFreedSize() {
+		// note: if something's already holding the lock when this method is called,
+		// the calculation may become off by a few items, but it doesn't matter much
+		// since the freed size is only an approximation.
+		lock (_lock) {
+			_freedSize = 0;
+		}
+	}
+
+	private LinkedListNode<LRUItem> GetNode() {
+		if (_nodesPool.Count > 0)
+			return _nodesPool.Dequeue();
+		return new LinkedListNode<LRUItem>(new LRUItem());
+	}
+
+	private void ReturnNode(LinkedListNode<LRUItem> node) {
+		// set to default to allow memory to be gced
+		node.Value.Key = default;
+		node.Value.Value = default;
+		_nodesPool.Enqueue(node);
+	}
+}
diff --git a/src/KurrentDB.Core/DataStructures/NoLRUCache.cs b/src/KurrentDB.Core/DataStructures/NoLRUCache.cs
new file mode 100644
index 00000000000..84d53080f44
--- /dev/null
+++ b/src/KurrentDB.Core/DataStructures/NoLRUCache.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.DataStructures;
+
+public class NoLRUCache<TKey, TValue> : ILRUCache<TKey, TValue> {
+	public string Name => "No Cache";
+	public long Size => 0;
+	public long Count => 0;
+	public long FreedSize => 0;
+	public long Capacity { get; private set; }
+
+	public void SetCapacity(long value) {
+		Capacity = value;
+	}
+
+	public void ResetFreedSize() {
+	}
+
+	public void Clear() {
+	}
+
+	public bool TryGet(TKey key, out TValue value) {
+		value = default(TValue);
+		return false;
+	}
+
+	public TValue Put(TKey key, TValue value) {
+		return value;
+	}
+
+	public TValue Put<T>(TKey key, T userData, Func<TKey, T, TValue> addFactory,
+		Func<TKey, TValue, T, TValue> updateFactory) {
+		return addFactory(key, userData);
+	}
+}
diff --git a/src/KurrentDB.Core/DataStructures/ObjectPool.cs b/src/KurrentDB.Core/DataStructures/ObjectPool.cs
new file mode 100644
index 00000000000..2d3c69f49ff
--- /dev/null
+++ b/src/KurrentDB.Core/DataStructures/ObjectPool.cs
@@ -0,0 +1,137 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Threading;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.DataStructures;
+
+public class ObjectPoolDisposingException : Exception {
+	public ObjectPoolDisposingException(string poolName)
+		: this(poolName, null) {
+	}
+
+	public ObjectPoolDisposingException(string poolName, Exception innerException)
+		: base(string.Format("Object pool '{0}' is disposing/disposed while Get operation is requested.", poolName),
+			innerException) {
+		Ensure.NotNullOrEmpty(poolName, "poolName");
+	}
+}
+
+public class ObjectPoolMaxLimitReachedException : Exception {
+	public ObjectPoolMaxLimitReachedException(string poolName, int maxLimit)
+		: this(poolName, maxLimit, null) {
+	}
+
+	public ObjectPoolMaxLimitReachedException(string poolName, int maxLimit, Exception innerException)
+		: base(string.Format("Object pool '{0}' has reached its max limit for items: {1}.", poolName, maxLimit),
+			innerException) {
+		Ensure.NotNullOrEmpty(poolName, "poolName");
+		Ensure.Nonnegative(maxLimit, "maxLimit");
+	}
+}
+
+public class ObjectPool<T> : IDisposable {
+	public readonly string ObjectPoolName;
+
+	private readonly ConcurrentQueue<T> _queue = new ConcurrentQueue<T>();
+	private readonly int _maxCount;
+	private readonly Func<T> _factory;
+	private readonly Action<T> _dispose;
+	private readonly Action<ObjectPool<T>> _onPoolDisposed;
+
+	private int _count;
+	private volatile bool _disposing;
+	private int _poolDisposed;
+
+	public ObjectPool(string objectPoolName,
+		int initialCount,
+		int maxCount,
+		Func<T> factory,
+		Action<T> dispose = null,
+		Action<ObjectPool<T>> onPoolDisposed = null) {
+		Ensure.NotNullOrEmpty(objectPoolName, "objectPoolName");
+		Ensure.Nonnegative(initialCount, "initialCount");
+		Ensure.Nonnegative(maxCount, "maxCount");
+		if (initialCount > maxCount)
+			throw new ArgumentOutOfRangeException("initialCount", "initialCount is greater than maxCount.");
+		Ensure.NotNull(factory, "factory");
+
+		ObjectPoolName = objectPoolName;
+		_maxCount = maxCount;
+		_count = initialCount;
+		_factory = factory;
+		_dispose = dispose ?? (x => { });
+		_onPoolDisposed = onPoolDisposed ?? (x => { });
+
+		for (int i = 0; i < initialCount; ++i) {
+			_queue.Enqueue(factory());
+		}
+	}
+
+	public void MarkForDisposal() {
+		Dispose();
+	}
+
+	public void Dispose() {
+		_disposing = true;
+		Thread.MemoryBarrier();
+		TryDestruct();
+	}
+
+	public T Get() {
+		if (_disposing)
+			throw new ObjectPoolDisposingException(ObjectPoolName);
+
+		T item;
+		if (_queue.TryDequeue(out item))
+			return item;
+
+		if (_disposing)
+			throw new ObjectPoolDisposingException(ObjectPoolName);
+
+		var newCount = Interlocked.Increment(ref _count);
+		if (newCount > _maxCount)
+			throw new ObjectPoolMaxLimitReachedException(ObjectPoolName, _maxCount);
+
+		if (_disposing) {
+			if (Interlocked.Decrement(ref _count) == 0)
+				OnPoolDisposed(); // now we possibly should "turn light off"
+			throw new ObjectPoolDisposingException(ObjectPoolName);
+		}
+
+		// if we get here, then it is safe to return newly created item to user, object pool won't be disposed
+		// until that item is returned to pool
+		return _factory();
+	}
+
+	public void Return(T item) {
+		_queue.Enqueue(item);
+		Thread.MemoryBarrier();
+		if (_disposing)
+			TryDestruct();
+	}
+
+	private void TryDestruct() {
+		int count = int.MaxValue;
+
+		T item;
+		while (_queue.TryDequeue(out item)) {
+			_dispose(item);
+			count = Interlocked.Decrement(ref _count);
+		}
+
+		if (count < 0)
+			throw new Exception("Somehow we managed to decrease count of pool items below zero.");
+		if (count == 0) // we are the last who should "turn the light off"
+			OnPoolDisposed();
+	}
+
+	private void OnPoolDisposed() {
+		// ensure that we call _onPoolDisposed just once
+		if (Interlocked.CompareExchange(ref _poolDisposed, 1, 0) == 0)
+			_onPoolDisposed(this);
+	}
+}
diff --git a/src/KurrentDB.Core/DataStructures/PairingHeap.cs b/src/KurrentDB.Core/DataStructures/PairingHeap.cs
new file mode 100644
index 00000000000..c5f45e93734
--- /dev/null
+++ b/src/KurrentDB.Core/DataStructures/PairingHeap.cs
@@ -0,0 +1,179 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#define USE_POOL
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.DataStructures;
+
+public class PairingHeap<T> {
+#if USE_POOL
+	private readonly ObjectPool<HeapNode> _nodePool = new ObjectPool<HeapNode>(100, () => new HeapNode());
+#endif
+	public int Count {
+		get { return _count; }
+	}
+
+	private HeapNode _root;
+	private int _count;
+	private readonly Func<T, T, bool> _compare;
+
+	public PairingHeap() : this(null, null as IComparer<T>) {
+	}
+
+	public PairingHeap(IComparer<T> comparer) : this(null, comparer) {
+		if (comparer == null)
+			throw new ArgumentNullException("comparer");
+	}
+
+	public PairingHeap(Func<T, T, bool> compare) : this(null, compare) {
+		if (compare == null)
+			throw new ArgumentNullException("compare");
+	}
+
+	public PairingHeap(IEnumerable<T> items) : this(items, null as IComparer<T>) {
+	}
+
+	public PairingHeap(IEnumerable<T> items, Func<T, T, bool> compare) {
+		if (compare == null) {
+			var comparer = Comparer<T>.Default;
+			_compare = (x, y) => comparer.Compare(x, y) < 0;
+		} else {
+			_compare = compare;
+		}
+
+		if (items != null) {
+			foreach (var item in items) {
+				Add(item);
+			}
+		}
+	}
+
+	public PairingHeap(IEnumerable<T> items, IComparer<T> comparer) {
+		var comp = comparer ?? Comparer<T>.Default;
+		_compare = (x, y) => comp.Compare(x, y) < 0;
+
+		if (items != null) {
+			foreach (var item in items) {
+				Add(item);
+			}
+		}
+	}
+
+	public void Add(T x) {
+#if USE_POOL
+		var newNode = _nodePool.Get();
+#else
+            var newNode = new HeapNode();
+#endif
+		newNode.Item = x;
+		_root = Meld(_root, newNode);
+		_count += 1;
+	}
+
+	public T FindMin() {
+		if (Count == 0)
+			throw new InvalidOperationException();
+		return _root.Item;
+	}
+
+	public T DeleteMin() {
+		if (Count == 0)
+			throw new InvalidOperationException();
+
+		var oldRoot = _root;
+		var res = _root.Item;
+		_root = Pair(_root.SubHeaps);
+		_count -= 1;
+#if USE_POOL
+		oldRoot.Next = null;
+		oldRoot.SubHeaps = null;
+		_nodePool.Return(oldRoot);
+#endif
+		return res;
+	}
+
+	private HeapNode Meld(HeapNode heap1, HeapNode heap2) {
+		if (heap1 == null)
+			return heap2;
+		if (heap2 == null)
+			return heap1;
+
+		if (_compare(heap1.Item, heap2.Item)) {
+			heap2.Next = heap1.SubHeaps;
+			heap1.SubHeaps = heap2;
+			return heap1;
+		} else {
+			heap1.Next = heap2.SubHeaps;
+			heap2.SubHeaps = heap1;
+			return heap2;
+		}
+	}
+
+	private HeapNode Pair(HeapNode node) {
+		HeapNode tail = null;
+		HeapNode cur = node;
+
+		while (cur?.Next != null) {
+			var n1 = cur;
+			var n2 = cur.Next;
+			cur = cur.Next.Next;
+
+			n1.Next = tail;
+			n2.Next = n1;
+			tail = n2;
+		}
+
+		while (tail != null) {
+			var n = tail;
+			tail = tail.Next.Next;
+			cur = Meld(cur, Meld(n, n.Next));
+		}
+
+		return cur;
+	}
+
+	private class HeapNode {
+		public T Item;
+		public HeapNode SubHeaps;
+		public HeapNode Next;
+	}
+
+#if USE_POOL
+	private class ObjectPool<TItem> where TItem : class {
+		private readonly ConcurrentQueueWrapper<TItem> _items = new ConcurrentQueueWrapper<TItem>();
+
+		private readonly int _count;
+		private readonly Func<TItem> _creator;
+
+		public ObjectPool(int count, Func<TItem> creator) {
+			if (count < 0)
+				throw new ArgumentOutOfRangeException();
+			if (creator == null)
+				throw new ArgumentNullException("creator");
+
+			_count = count;
+			_creator = creator;
+
+			for (int i = 0; i < count; ++i) {
+				_items.Enqueue(creator());
+			}
+		}
+
+		public TItem Get() {
+			TItem res;
+			if (_items.TryDequeue(out res))
+				return res;
+			return _creator();
+		}
+
+		public void Return(TItem item) {
+			if (_items.Count < _count)
+				_items.Enqueue(item);
+		}
+	}
+#endif
+}
diff --git a/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/AlignedMemory.cs b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/AlignedMemory.cs
new file mode 100644
index 00000000000..dc2ca805438
--- /dev/null
+++ b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/AlignedMemory.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Runtime.InteropServices;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.DataStructures.ProbabilisticFilter;
+
+// net6 can do aligned allocations directly
+// but we need to overallocate and do our own alignment.
+public sealed unsafe class AlignedMemory : IDisposable {
+	private readonly IntPtr _intPtr;
+	private readonly long _size;
+	private readonly long _bytesAllocated;
+	private bool _disposed;
+
+	/// contents of memory are not initialized
+	public AlignedMemory(long size, int alignTo) : this(new IntPtr(size), alignTo) {
+	}
+
+	// todo probably better to use a safe handle
+	~AlignedMemory() => Dispose();
+
+	/// contents of memory are not initialized
+	public AlignedMemory(IntPtr size, int alignTo) {
+		_size = (long)size;
+		var bytesToAllocate = size + alignTo;
+		_intPtr = Marshal.AllocHGlobal(bytesToAllocate);
+		_bytesAllocated = (long)bytesToAllocate;
+		GC.AddMemoryPressure(_bytesAllocated);
+		Pointer = (byte*)((long)_intPtr).RoundUpToMultipleOf(alignTo);
+	}
+
+	public byte* Pointer { get; }
+
+	public Span<byte> AsSpan() {
+		if (_size > int.MaxValue)
+			throw new InvalidOperationException("Size is too big to fit in one span");
+		return new(Pointer, (int)_size);
+	}
+
+	public void Dispose() {
+		if (_disposed)
+			return;
+
+		_disposed = true;
+		GC.SuppressFinalize(this);
+
+		if (_intPtr == IntPtr.Zero) {
+			// didn't manage to allocate or add pressure (OOM), so do not free.
+			return;
+		}
+
+		Marshal.FreeHGlobal(_intPtr);
+		GC.RemoveMemoryPressure(_bytesAllocated);
+	}
+}
diff --git a/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/BloomFilterAccessor.cs b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/BloomFilterAccessor.cs
new file mode 100644
index 00000000000..c48c7c2833b
--- /dev/null
+++ b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/BloomFilterAccessor.cs
@@ -0,0 +1,238 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Runtime.CompilerServices;
+using KurrentDB.Common.Utils;
+using Serilog;
+
+namespace KurrentDB.Core.DataStructures.ProbabilisticFilter;
+
+// encapsulates access to a persistent bloom filter through a byte* and specified sizes.
+// this does the necessary pointer arithmetic and bounds checking.
+// no synchronisation in here.
+//
+// First cache line(64 bytes) contains the header and nothing else
+// Subsequent cachelines contain 60 bytes of bloom filter bits then a 4 byte hash of those bits.
+//
+// The hashes are as granular as they are so that the hash can be
+// cheaply calculated inline with the write (since we loaded the cacheline into
+// memory anyway) which guarantees, since there is a writer lock, that
+// the cacheline at any time only has at most one bit set that isn't hashed, which was
+// important for the memory mapped persistece (since the OS can flush it at any time)
+public unsafe class BloomFilterAccessor {
+	public delegate void OnPageDirty(long pageNumber);
+
+	public const long MinSizeKB = 10;
+	public const long MaxSizeKB = 4_000_000;
+	private readonly OnPageDirty _onPageDirty;
+	private readonly ILogger _log;
+
+	public BloomFilterAccessor(
+		long logicalFilterSize,
+		int cacheLineSize,
+		int hashSize,
+		int pageSize,
+		OnPageDirty onPageDirty,
+		ILogger log) {
+
+		Ensure.Positive(logicalFilterSize, nameof(logicalFilterSize));
+		Ensure.Positive(cacheLineSize, nameof(cacheLineSize));
+		Ensure.Positive(hashSize, nameof(hashSize));
+		Ensure.Positive(pageSize, nameof(pageSize));
+
+		if (logicalFilterSize < MinSizeKB * 1000 || logicalFilterSize > MaxSizeKB * 1000) {
+			throw new ArgumentOutOfRangeException(
+				nameof(logicalFilterSize),
+				logicalFilterSize,
+				$"size should be between {MinSizeKB:N0} KB and {MaxSizeKB:N0} KB inclusive");
+		}
+
+		if (Header.Size > cacheLineSize)
+			throw new Exception("header needs to fit in a cache line");
+
+		if (pageSize % cacheLineSize != 0)
+			throw new ArgumentException(
+				$"PageSize {pageSize} must be a multiple of CacheLineSize {cacheLineSize}");
+
+		LogicalFilterSize = logicalFilterSize;
+		LogicalFilterSizeBits = logicalFilterSize * 8;
+		CacheLineSize = cacheLineSize;
+		HashSize = hashSize;
+		PageSize = pageSize;
+		_onPageDirty = onPageDirty;
+		_log = log;
+
+		// add room for filter bits, rounded down to nearest cacheline
+		FileSize = GetBytePositionInFile(LogicalFilterSizeBits).RoundDownToMultipleOf(cacheLineSize);
+		// with an extra cacheline so we have at least as much logical filter space as asked for
+		// can't change this to a call to .RoundUpToMultipleOf without breaking the existing filters.
+		FileSize += cacheLineSize;
+
+		// last page may be a partial page
+		NumPages = FileSize / PageSize;
+		if (FileSize % PageSize != 0)
+			NumPages++;
+	}
+
+	public long LogicalFilterSize { get; }
+	public long LogicalFilterSizeBits { get; }
+	public int CacheLineSize { get; }
+	public int HashSize { get; }
+	public int PageSize { get; }
+	public long FileSize { get; }
+
+	// last page may be a partial page
+	public long NumPages { get; }
+
+	// FileSize is definitely a multiple of CacheLineSize
+	public long NumCacheLines => FileSize / CacheLineSize;
+
+	// Pointer to the beginning of the file
+	private byte* _pointer;
+	public byte* Pointer {
+		get => _pointer;
+		set {
+			if ((long)value % CacheLineSize != 0)
+				throw new InvalidOperationException($"Pointer {(long)value} is not aligned to a cacheline ({CacheLineSize})");
+
+			_pointer = value;
+		}
+	}
+
+	// converts a bit position in the logical filter into a byte position in the file
+	public long GetBytePositionInFile(long bitPosition) {
+		var bytePositionInFile = bitPosition / 8;
+
+		// account for 4 bytes at the end of each cache line being a hash
+		bytePositionInFile += bytePositionInFile / (CacheLineSize - HashSize) * HashSize;
+
+		// first cache line is reserved for the header
+		bytePositionInFile += CacheLineSize;
+
+		return bytePositionInFile;
+	}
+
+	// converts page number into byte position of the page in the file
+	// the pages are aligned with the beginning of the file so that they are aligned on disk
+	// the first page is therefore slightly smaller to account for the header cache line.
+	public (long PositionInFile, int PageSize) GetPagePositionInFile(long pageNumber) {
+		if (pageNumber >= NumPages)
+			throw new ArgumentOutOfRangeException(nameof(pageNumber), pageNumber, "");
+
+		var positionInFile = pageNumber * PageSize;
+
+		var pageSize = Math.Min(PageSize, FileSize - positionInFile);
+
+		if (pageNumber == 0) {
+			pageSize -= CacheLineSize;
+			positionInFile += CacheLineSize;
+		}
+
+		return (positionInFile, (int)pageSize);
+	}
+
+	// determines which page a bytePosition in the file is for.
+	public long GetPageNumber(long bytePositionInFile) {
+		return bytePositionInFile / PageSize;
+	}
+
+	private void EnsureBounds(long bytePosition, int length) {
+		if (bytePosition > FileSize - length) {
+			throw new ArgumentOutOfRangeException(
+				nameof(bytePosition),
+				bytePosition,
+				$"Position {bytePosition:N0} + length {length:N0} = {bytePosition + length:N0} out of file size {FileSize:N0}");
+		}
+	}
+
+	private ref byte ReadByte(long bytePositionInFile) {
+		EnsureBounds(bytePositionInFile, length: 1);
+		return ref *(Pointer + bytePositionInFile);
+	}
+
+	private Span<byte> ReadCacheLineFor(long bytePositionInFile) {
+		bytePositionInFile = bytePositionInFile.RoundDownToMultipleOf(CacheLineSize);
+		return ReadBytes(bytePositionInFile, CacheLineSize);
+	}
+
+	public Span<byte> ReadBytes(long bytePositionInFile, int count) {
+		EnsureBounds(bytePositionInFile, count);
+		return new Span<byte>(Pointer + bytePositionInFile, count);
+	}
+
+	public bool IsBitSet(long bitPosition) {
+		var bytePositionInFile = GetBytePositionInFile(bitPosition);
+		var byteValue = ReadByte(bytePositionInFile);
+		return byteValue.IsBitSet(bitPosition % 8);
+	}
+
+	public void SetBit(long bitPosition) {
+		var bytePositionInFile = GetBytePositionInFile(bitPosition);
+		ref var byteValue = ref ReadByte(bytePositionInFile);
+		byte oldByte = byteValue;
+		byteValue = byteValue.SetBit(bitPosition % 8);
+
+		if (byteValue != oldByte) {
+			var cacheLine = ReadCacheLineFor(bytePositionInFile);
+
+			// it would be possible to delegate the hash calculation call to the persistence
+			// strategy. memmap would calculate it synchronously, filestream could defer
+			// it until flush (and wouldn't even need to set it in the memory area, only
+			// in the file. not worth the effort at the moment, however.
+			BloomFilterIntegrity.WriteHash(cacheLine);
+
+			if (_onPageDirty is not null) {
+				var pageNumber = GetPageNumber(bytePositionInFile);
+				_onPageDirty(pageNumber);
+			}
+		}
+	}
+
+	public void FillWithZeros() {
+		_log.Debug("Zeroing bloom filter...");
+		var bytesToClear = FileSize;
+		var startAddress = Pointer;
+		while (bytesToClear > 0) {
+			uint bytesToClearInBlock = bytesToClear > uint.MaxValue
+				? uint.MaxValue
+				: (uint)bytesToClear;
+			Unsafe.InitBlock(ref *startAddress, 0, bytesToClearInBlock);
+			startAddress += bytesToClearInBlock;
+			bytesToClear -= bytesToClearInBlock;
+		}
+		_log.Debug("Done zeroing bloom filter");
+	}
+
+	// corruptionThreshold = 0.05 => tolerate up to 5% corruption
+	public void Verify(int corruptionRebuildCount, double corruptionThreshold) {
+		Ensure.Nonnegative(corruptionThreshold, nameof(corruptionThreshold));
+
+		_log.Debug("Verifying bloom filter...");
+		var corruptedCacheLines = 0;
+
+		for (long i = CacheLineSize; i < FileSize; i += CacheLineSize) {
+			var cacheLine = ReadCacheLineFor(i);
+			if (!BloomFilterIntegrity.ValidateHash(cacheLine)) {
+				corruptedCacheLines++;
+				_log.Verbose("Invalid cache line starting at {i:N0} / {fileSize:N0}", i, FileSize);
+			}
+		}
+
+		var corruptionThresholdPercent = corruptionThreshold * 100;
+		var corruptedPercent = (double)corruptedCacheLines / NumCacheLines * 100;
+		if (corruptedPercent > corruptionThreshold * 100)
+			throw new CorruptedHashException(
+				corruptionRebuildCount,
+				$"{corruptedCacheLines:N0} corruption(s) detected ({corruptedPercent:N2}%). Threshold {corruptionThresholdPercent:N2}%");
+
+		if (corruptedCacheLines == 0) {
+			_log.Debug("Done verifying bloom filter");
+		} else {
+			_log.Warning("Done verifying bloom filter: {corruptedCacheLines:N0} corruption(s) detected ({corruptedPercent:N2}%). Threshold {corruptionThresholdPercent:N2}%",
+				corruptedCacheLines,
+				corruptedPercent,
+				corruptionThresholdPercent);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/BloomFilterIntegrity.cs b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/BloomFilterIntegrity.cs
new file mode 100644
index 00000000000..ecbfc5ecde1
--- /dev/null
+++ b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/BloomFilterIntegrity.cs
@@ -0,0 +1,120 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Runtime.InteropServices;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Index.Hashes;
+using Serilog;
+
+namespace KurrentDB.Core.DataStructures.ProbabilisticFilter;
+
+// This class is responsible for maintaining and validating a 4 byte hash at the end
+// of the cache line.
+public class BloomFilterIntegrity {
+	public const int CacheLineSize = 64;
+	public const int HashSize = 4;
+	// amount of filter that is marked dirty for flushing
+	public const int PageSize = 8 * 1024;
+
+	private const int UintHashIndex = (CacheLineSize - HashSize) / HashSize;
+	static readonly ILogger Log = Serilog.Log.ForContext<BloomFilterIntegrity>();
+
+	private static readonly IHasher _hasher = new XXHashUnsafe(0xc58f1a7b);
+
+	public static void WriteHash(Span<byte> cacheLine) {
+		Ensure.Equal(CacheLineSize, cacheLine.Length, "cacheline length");
+
+		if (IsAllOnes(cacheLine)) {
+			// corrupted line made safe, dont make it valid again by writing the hash
+			return;
+		}
+
+		var hash = _hasher.Hash(cacheLine[..^HashSize]);
+		var uints = MemoryMarshal.Cast<byte, uint>(cacheLine);
+		uints[UintHashIndex] = hash;
+	}
+
+	// If the hash is correct, return true.
+	// If the hash is not correct, but can be corrected then correct it and return true.
+	// If the hash is not correct and cannot be corrected then set all the bits in the
+	// cacheline and return false. The data is made safe for the bloom filter.
+	public static bool ValidateHash(Span<byte> cacheLine) {
+		Ensure.Equal(CacheLineSize, cacheLine.Length, "cacheline length");
+
+		if (IsAllOnes(cacheLine)) {
+			// all bytes 0xFFs. Corrupted data that has been made safe.
+			return false;
+		}
+
+		if (IsAllZeros(cacheLine)) {
+			// all bytes 0x00s. Empty data
+			return true;
+		}
+
+		// check the hash
+		var cacheToHash = cacheLine[..^HashSize];
+		var hash = _hasher.Hash(cacheToHash);
+		var targetHash = MemoryMarshal.Cast<byte, uint>(cacheLine)[UintHashIndex];
+		if (hash == targetHash)
+			return true;
+
+		// corrupt, try to recover.
+		if (CanRehash(cacheToHash, targetHash)) {
+			WriteHash(cacheLine);
+			Log.Verbose("Corrected a hash");
+			return true;
+		}
+
+		// corrupt and could not recover, set all bytes to 0xFFs to make safe
+		var ulongs = MemoryMarshal.Cast<byte, ulong>(cacheLine);
+		for (int i = 0; i < ulongs.Length; i++) {
+			ulongs[i] = ulong.MaxValue;
+		}
+
+		return false;
+	}
+
+	// The hash can be wrong simply because the flush happened between when
+	// we set the bit and set the new hash. We can detect this by unsetting
+	// a single bit that is set and see if it produces the hash that is recorded
+	// in the cacheline. If so, then we can have confidence that the data is
+	// actually correct and we can simply rehash it.
+	private static bool CanRehash(ReadOnlySpan<byte> dataToHash, uint targetHash) {
+		var copy = dataToHash.ToArray().AsSpan();
+
+		for (var byteIndex1 = 0; byteIndex1 < copy.Length; byteIndex1++) {
+			for (var bitIndex1 = 0; bitIndex1 < 8; bitIndex1++) {
+				if (!copy[byteIndex1].IsBitSet(bitIndex1))
+					continue;
+
+				copy[byteIndex1] = copy[byteIndex1].UnsetBit(bitIndex1);
+
+				if (_hasher.Hash(copy) == targetHash)
+					return true;
+
+				copy[byteIndex1] = copy[byteIndex1].SetBit(bitIndex1);
+			}
+		}
+
+		return false;
+	}
+
+	private static bool IsAllZeros(ReadOnlySpan<byte> cacheLine) {
+		var ulongs = MemoryMarshal.Cast<byte, ulong>(cacheLine);
+		for (int i = 0; i < ulongs.Length; i++) {
+			if (ulongs[i] != ulong.MinValue)
+				return false;
+		}
+		return true;
+	}
+
+	private static bool IsAllOnes(ReadOnlySpan<byte> cacheLine) {
+		var ulongs = MemoryMarshal.Cast<byte, ulong>(cacheLine);
+		for (int i = 0; i < ulongs.Length; i++) {
+			if (ulongs[i] != ulong.MaxValue)
+				return false;
+		}
+		return true;
+	}
+}
diff --git a/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/ByteExtensions.cs b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/ByteExtensions.cs
new file mode 100644
index 00000000000..b57fddb1da5
--- /dev/null
+++ b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/ByteExtensions.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.DataStructures.ProbabilisticFilter;
+
+public static class ByteExtensions {
+	public static bool IsBitSet(this byte x, long bitIndex) {
+		return (x & (1 << (int)(7 - bitIndex))) != 0;
+	}
+
+	public static byte SetBit(this byte x, long bitIndex) {
+		return (byte)(x | (1 << (int)(7 - bitIndex)));
+	}
+
+	public static byte UnsetBit(this byte x, long bitIndex) {
+		return (byte)(x & ~(1 << (int)(7 - bitIndex)));
+	}
+}
diff --git a/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/CorruptedFileException.cs b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/CorruptedFileException.cs
new file mode 100644
index 00000000000..b0c50bb9839
--- /dev/null
+++ b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/CorruptedFileException.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.DataStructures.ProbabilisticFilter;
+
+public class CorruptedFileException : Exception {
+	public CorruptedFileException(string error, Exception inner = null) : base(error, inner) { }
+}
diff --git a/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/CorruptedHashException.cs b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/CorruptedHashException.cs
new file mode 100644
index 00000000000..144843b75d8
--- /dev/null
+++ b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/CorruptedHashException.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.DataStructures.ProbabilisticFilter;
+
+public class CorruptedHashException : Exception {
+	public CorruptedHashException(int rebuildCount, string error) : base(error) {
+		RebuildCount = rebuildCount;
+	}
+
+	public int RebuildCount { get; }
+}
diff --git a/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/FileStreamPersistence.cs b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/FileStreamPersistence.cs
new file mode 100644
index 00000000000..cedc468e0ac
--- /dev/null
+++ b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/FileStreamPersistence.cs
@@ -0,0 +1,317 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Threading;
+using KurrentDB.Common.Utils;
+using Serilog;
+
+namespace KurrentDB.Core.DataStructures.ProbabilisticFilter;
+
+public unsafe class FileStreamPersistence : IPersistenceStrategy {
+	protected static readonly ILogger Log = Serilog.Log.ForContext<FileStreamPersistence>();
+
+	// We synchronize access to _dirtyPageBitmap because
+	// Flush can be called at the same time as OnPageDirty (we dont pause writes into the
+	// bloom filter while it is flushing). And they both write to the bitmap (to unset and
+	// set bits respectively)
+	// This lock is often obtained while holding the write lock to the filter
+	// therefore don't make any non-trivial external calls while holding this lock
+	private readonly object _bitmapLock = new();
+	private readonly long _logicalFilterSize;
+	private readonly string _path;
+	private AlignedMemory _bloomFilterMemory;
+	private AlignedMemory _dirtyPageBitmap;
+	private bool _disposed;
+
+	public FileStreamPersistence(long size, string path, bool create) {
+		Ensure.NotNull(path, nameof(path));
+		_logicalFilterSize = size;
+		_path = path;
+		Create = create;
+	}
+
+	// when we want to open an existing filter and we don't mind what size it is
+	public static FileStreamPersistence FromFile(string path) {
+		Ensure.NotNull(path, nameof(path));
+
+		var header = ReadHeader(path);
+		return new FileStreamPersistence(
+			size: header.NumBits / 8,
+			path: path,
+			create: false);
+	}
+
+	public BloomFilterAccessor DataAccessor { get; private set; }
+	public bool Create { get; }
+
+	// ms to wait after each batch flush. allows breathing room for other writes to continue.
+	public int FlushBatchDelay { get; private set; }
+
+	// max number of pages to flush to disk in each batch
+	public long FlushBatchSize { get; private set; }
+
+	public void Init() {
+		DataAccessor = new BloomFilterAccessor(
+			logicalFilterSize: _logicalFilterSize,
+			cacheLineSize: BloomFilterIntegrity.CacheLineSize,
+			hashSize: BloomFilterIntegrity.HashSize,
+			pageSize: BloomFilterIntegrity.PageSize,
+			onPageDirty: OnPageDirty,
+			log: Log);
+
+		// instead of flushing all the dirty pages as fast as we can, we flush them in batches
+		// with a sleep between each flush to allow other writes to proceed.
+		// we could consider making these configurable but we have set defaults as follows
+		// based on 8 KiB pages:
+		//  1. sleep 128ms between batches to gives a good chunk of time for other writes
+		//  2. calculate how many pages to flush per batch in order to give no more than 60s
+		//     of sleep total. if the whole filter is dirty, total sleep will add up to 60s.
+		// this will yield bigger batches for bigger filters, but they ought also to be running
+		// on faster disks.
+		//
+		// For default filter this yields a batch size of 96 pages, 0.75 MiB
+		// For max size filter this yield a batch size of 1120 pages, 8.75 MiB
+		// For PTables up to 24gb this yields a batch size of 96 pages.
+		FlushBatchDelay = 128;
+		FlushBatchSize = DataAccessor.NumPages * FlushBatchDelay / 60_000;
+		FlushBatchSize = Math.Max(FlushBatchSize, 96);
+		FlushBatchSize = FlushBatchSize.RoundUpToMultipleOf(32);
+
+		// dirtypages: one bit per page, but pad to the nearest cacheline boundary
+		var numBits = DataAccessor.NumPages;
+		var numBitsPadded = numBits.RoundUpToMultipleOf(BloomFilterIntegrity.CacheLineSize * 8);
+		_dirtyPageBitmap = new AlignedMemory(
+			size: numBitsPadded / 8,
+			alignTo: BloomFilterIntegrity.CacheLineSize);
+		_dirtyPageBitmap.AsSpan().Clear(); // alignedmemory isn't initialized otherwise
+
+		// main filter:
+		_bloomFilterMemory = new AlignedMemory(
+			size: new IntPtr(DataAccessor.FileSize),
+			alignTo: BloomFilterIntegrity.CacheLineSize);
+		DataAccessor.Pointer = _bloomFilterMemory.Pointer;
+
+		// initialize the aligned memory
+		if (Create) {
+			DataAccessor.FillWithZeros();
+		} else {
+			// load the whole filter into memory for rapid access
+			BulkLoadExisting();
+		}
+	}
+
+	private void BulkLoadExisting() {
+		Log.Information(
+			"Reading persisted bloom filter {path} of size {size:N0} bytes into memory...",
+			_path,
+			DataAccessor.FileSize);
+
+		var sw = Stopwatch.StartNew();
+
+		using var bulkFileStream = new FileStream(
+			_path,
+			FileMode.Open,
+			FileAccess.Read,
+			FileShare.ReadWrite,
+			bufferSize: 65_536,
+			// consider if we should do something similar to chunk file reduce file cache pressure?
+			options: FileOptions.SequentialScan);
+
+		if (bulkFileStream.Length != DataAccessor.FileSize)
+			throw new SizeMismatchException(
+				$"The expected file size ({DataAccessor.FileSize:N0}) does not match " +
+				$"the actual file size ({bulkFileStream.Length:N0}) of file {_path}");
+
+		// linux only reads 2147479552 at a time (4095 bytes less than intmax)
+		var blockSize = int.MaxValue / 2;
+		var bytesToRead = DataAccessor.FileSize;
+		var bytesRead = 0L;
+		while (bytesToRead > 0) {
+			var bytesToReadInBlock = bytesToRead > blockSize
+				? blockSize
+				: (int)bytesToRead;
+
+			// consider reading in buffer size blocks. or using random access in net6
+			var read = bulkFileStream.Read(new Span<byte>(DataAccessor.Pointer + bytesRead, bytesToReadInBlock));
+			if (read != bytesToReadInBlock)
+				throw new Exception($"Read fewer bytes ({read}) from bloom filter ({_path}) than expected ({bytesToReadInBlock})");
+			bytesRead += bytesToReadInBlock;
+			bytesToRead -= bytesToReadInBlock;
+		}
+
+		var elapsed = sw.Elapsed;
+		var fileSizeMb = DataAccessor.FileSize / 1000 / 1000;
+		var megaBytesPerSecond = fileSizeMb / elapsed.TotalSeconds;
+		Log.Information(
+			"Read persisted bloom filter {path} into memory. Took {elapsed}. {megaBytesPerSecond:N2} MB/s",
+			_path,
+			elapsed,
+			megaBytesPerSecond);
+	}
+
+	private void OnPageDirty(long pageNumber) {
+		lock (_bitmapLock) {
+			ThrowIfDisposed();
+			var byteIndex = (int)(pageNumber / 8);
+			var bitIndex = pageNumber % 8;
+			ref var byteValue = ref _dirtyPageBitmap.AsSpan()[byteIndex];
+			byteValue = byteValue.SetBit(bitIndex);
+		}
+	}
+
+	public void Flush() {
+		using var fileStream = new FileStream(
+			_path,
+			FileMode.OpenOrCreate,
+			FileAccess.ReadWrite,
+			FileShare.ReadWrite,
+			bufferSize: DataAccessor.PageSize);
+
+		fileStream.SetLength(DataAccessor.FileSize);
+		Span<byte> localCacheLine = stackalloc byte[BloomFilterIntegrity.CacheLineSize];
+		localCacheLine.Clear();
+
+		var pageNumber = 0L;
+		var flushedPages = 0L;
+		var pauses = 0;
+
+		var activelyFlushing = Stopwatch.StartNew();
+		// consider Interlocked.Or/And into/outof the dirty page map. could remove need for lock
+		for (
+			var remaining = _dirtyPageBitmap.AsSpan();
+			!remaining.IsEmpty;
+			remaining = remaining[BloomFilterIntegrity.CacheLineSize..]
+			) {
+
+			lock (_bitmapLock) {
+				ThrowIfDisposed();
+				var cacheLine = remaining[..BloomFilterIntegrity.CacheLineSize];
+				cacheLine.CopyTo(localCacheLine);
+				cacheLine.Clear();
+			}
+
+			foreach (var @byte in localCacheLine) {
+				//we could skip based on 0L without checking each bit/byte
+				for (var bitOffset = 0; bitOffset < 8; bitOffset++) {
+					if (@byte.IsBitSet(bitOffset)) {
+						WritePage(pageNumber, fileStream);
+						flushedPages++;
+
+						// could be an unnecessary delay at the end
+						if (flushedPages % FlushBatchSize == 0) {
+							fileStream.FlushToDisk();
+							activelyFlushing.Stop();
+							pauses++;
+							Thread.Sleep(FlushBatchDelay);
+							activelyFlushing.Start();
+						}
+					}
+
+					pageNumber++;
+					if (pageNumber == DataAccessor.NumPages)
+						goto Done;
+				}
+			}
+		}
+
+Done:
+		fileStream.FlushToDisk();
+
+		activelyFlushing.Stop();
+
+		var flushedBytes = flushedPages * DataAccessor.PageSize;
+		var flushedMegaBytes = (float)flushedBytes / 1000 / 1000;
+		var activeFlushRateMBperS = flushedMegaBytes / activelyFlushing.Elapsed.TotalSeconds;
+
+		Log.Verbose(
+			"Flushed {pages:N0} pages out of {totalPages:N0}. {bytes:N0} bytes. " +
+			"Delay {delay} ms per batch. Total delay {totalDelay:N0} ms. " +
+			"Actively flushing: {activeFlushTime} {activeFlushRate:N2} MB/s. ",
+			flushedPages, DataAccessor.NumPages, flushedBytes,
+			FlushBatchDelay, FlushBatchDelay * pauses,
+			activelyFlushing.Elapsed, activeFlushRateMBperS);
+	}
+
+	private void WritePage(long pageNumber, FileStream fileStream) {
+		var (fileOffset, pageSize) = DataAccessor.GetPagePositionInFile(pageNumber);
+		fileStream.Seek(offset: fileOffset, SeekOrigin.Begin);
+		fileStream.Write(DataAccessor.ReadBytes(fileOffset, pageSize));
+	}
+
+	// todo later: maybe could be a common implementation across the strategies that reads
+	// from the DataAccessor
+	public Header ReadHeader() => ReadHeader(_path);
+
+	private static Header ReadHeader(string path) {
+		using var fileStream = new FileStream(
+			path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+
+		try {
+			//read the version first
+			fileStream.Seek(offset: 0, SeekOrigin.Begin);
+			byte version = (byte)fileStream.ReadByte();
+			if (version != Header.CurrentVersion) {
+				throw new CorruptedFileException($"Unsupported version: {version}");
+			}
+
+			//then the full header
+			var headerBytes = new byte[Header.Size].AsSpan();
+
+			fileStream.Seek(offset: 0, SeekOrigin.Begin);
+			var read = fileStream.Read(headerBytes);
+			if (read != Header.Size) {
+				throw new CorruptedFileException(
+					$"File header size ({read} bytes) does not match expected header size ({Header.Size} bytes)");
+			}
+
+			return MemoryMarshal.AsRef<Header>(headerBytes);
+		} catch (Exception exc) when (exc is not CorruptedFileException) {
+			throw new CorruptedFileException("Failed to read the header", exc);
+		}
+	}
+
+	public void WriteHeader(Header header) {
+		Log.Information("Writing header and expanding file...");
+		using var fileStream = new FileStream(
+			_path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite);
+		var span = MemoryMarshal.CreateReadOnlySpan(ref header, 1);
+		var headerBytes = MemoryMarshal.Cast<Header, byte>(span);
+
+		// this doesn't technically guarantee that the file is zeroed, but we expect file systems
+		// that could reasonably be running eventstore to do this for us because giving us other
+		// peoples data would be a security problem. if some filesystem does not to this the filter
+		// will be recognised as corrupt the next time it is opened.
+		fileStream.SetLength(DataAccessor.FileSize);
+		fileStream.Seek(offset: 0, SeekOrigin.Begin);
+		fileStream.Write(headerBytes);
+		fileStream.Seek(-1, SeekOrigin.End);
+		fileStream.WriteByte(0);
+		fileStream.FlushToDisk();
+		Log.Information("Wrote header and expanded file");
+	}
+
+	private void ThrowIfDisposed() {
+		if (_disposed) {
+			throw new ObjectDisposedException(nameof(FileStreamPersistence));
+		}
+	}
+
+	public void Dispose() {
+		lock (_bitmapLock) {
+			if (_disposed)
+				return;
+
+			_disposed = true;
+
+			if (DataAccessor is not null)
+				DataAccessor.Pointer = default;
+
+			_bloomFilterMemory?.Dispose();
+			_dirtyPageBitmap?.Dispose();
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/Header.cs b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/Header.cs
new file mode 100644
index 00000000000..a7de7fa19fb
--- /dev/null
+++ b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/Header.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Runtime.InteropServices;
+
+namespace KurrentDB.Core.DataStructures.ProbabilisticFilter;
+
+[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
+public struct Header {
+	public const byte CurrentVersion = 1;
+	public const int Size = 16;
+
+	[FieldOffset(0)] private byte _version;
+	[FieldOffset(4)] private int _corruptionRebuildCount;
+	[FieldOffset(8)] private long _numBits;
+
+
+	public byte Version {
+		get => _version;
+		set => _version = value;
+	}
+
+	public int CorruptionRebuildCount {
+		get => _corruptionRebuildCount;
+		set => _corruptionRebuildCount = value;
+	}
+
+	public long NumBits {
+		get => _numBits;
+		set => _numBits = value;
+	}
+}
diff --git a/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/IPersistenceStrategy.cs b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/IPersistenceStrategy.cs
new file mode 100644
index 00000000000..dd5408ce590
--- /dev/null
+++ b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/IPersistenceStrategy.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.DataStructures.ProbabilisticFilter;
+
+public interface IPersistenceStrategy : IDisposable {
+	BloomFilterAccessor DataAccessor { get; }
+	bool Create { get; }
+	void Init();
+	void Flush();
+	Header ReadHeader();
+	void WriteHeader(Header header);
+}
diff --git a/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/IProbabilisticFilter.cs b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/IProbabilisticFilter.cs
new file mode 100644
index 00000000000..165e11ab962
--- /dev/null
+++ b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/IProbabilisticFilter.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.DataStructures.ProbabilisticFilter;
+
+public interface IProbabilisticFilter<in TItem> {
+	void Add(TItem item);
+	bool MightContain(TItem item);
+}
+
+public interface IProbabilisticFilter {
+	void Add(ReadOnlySpan<byte> item);
+	bool MightContain(ReadOnlySpan<byte> item);
+}
diff --git a/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/MemoryMappedFilePersistence.cs b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/MemoryMappedFilePersistence.cs
new file mode 100644
index 00000000000..0c2f6574987
--- /dev/null
+++ b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/MemoryMappedFilePersistence.cs
@@ -0,0 +1,138 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.IO.MemoryMappedFiles;
+using System.Runtime.InteropServices;
+using KurrentDB.Common.Utils;
+using Serilog;
+
+namespace KurrentDB.Core.DataStructures.ProbabilisticFilter;
+
+public unsafe class MemoryMappedFilePersistence : IPersistenceStrategy {
+	public static readonly ILogger Log = Serilog.Log.ForContext<MemoryMappedFilePersistence>();
+	private readonly long _size;
+	private readonly string _path;
+	private MemoryMappedFile _mmf;
+	private MemoryMappedViewAccessor _mmfWriteAccessor;
+	private FileStream _fileStream;
+	private bool _disposed;
+
+	public MemoryMappedFilePersistence(long size, string path, bool create) {
+		Ensure.NotNull(path, nameof(path));
+
+		_size = size;
+		_path = path;
+		Create = create;
+	}
+
+	public BloomFilterAccessor DataAccessor { get; private set; }
+	public bool Create { get; }
+
+	public void Init() {
+		DataAccessor = new BloomFilterAccessor(
+			logicalFilterSize: _size,
+			cacheLineSize: BloomFilterIntegrity.CacheLineSize,
+			hashSize: BloomFilterIntegrity.HashSize,
+			pageSize: BloomFilterIntegrity.PageSize,
+			onPageDirty: null,
+			log: Log);
+
+		_fileStream = new FileStream(
+			_path,
+			// todo: OpenOrCreate can be CreateNew if the mininode closed the file before declaring itself 'stopped'
+			Create ? FileMode.OpenOrCreate : FileMode.Open,
+			FileAccess.ReadWrite,
+			FileShare.ReadWrite);
+
+		if (Create) {
+			_fileStream.SetLength(DataAccessor.FileSize);
+		} else {
+			// existing
+			if (_fileStream.Length != DataAccessor.FileSize)
+				throw new SizeMismatchException(
+					$"The expected file size ({DataAccessor.FileSize:N0}) does not match " +
+					$"the actual file size ({_fileStream.Length:N0}) of file {_path}");
+		}
+
+		_mmf = MemoryMappedFile.CreateFromFile(
+			fileStream: _fileStream,
+			mapName: null,
+			capacity: 0,
+			access: MemoryMappedFileAccess.ReadWrite,
+			inheritability: HandleInheritability.None,
+			leaveOpen: false);
+
+		_mmfWriteAccessor = _mmf.CreateViewAccessor(
+			offset: DataAccessor.CacheLineSize,
+			size: 0, // whole file
+			access: MemoryMappedFileAccess.ReadWrite);
+
+		// acquired pointer unaffected by the accessor offset
+		// to the beginning of the file (i.e. the header)
+		byte* pointer = null;
+		_mmfWriteAccessor.SafeMemoryMappedViewHandle.AcquirePointer(ref pointer);
+		DataAccessor.Pointer = pointer;
+
+		if (Create) {
+			DataAccessor.FillWithZeros();
+		} else {
+			// do not fill with zeros; would overwrite the data.
+		}
+	}
+
+	public void Flush() {
+		_mmfWriteAccessor.Flush();
+		_fileStream.FlushToDisk();
+	}
+
+	// todo later: maybe could be a common implementation across the strategies that reads
+	// from the DataAccessor
+	public Header ReadHeader() {
+		try {
+			//read the version first
+			using (var headerAccessor = _mmf.CreateViewAccessor(0, 1, MemoryMappedFileAccess.Read)) {
+				byte version = headerAccessor.ReadByte(0);
+				if (version != Header.CurrentVersion) {
+					throw new CorruptedFileException($"Unsupported version: {version}");
+				}
+			}
+
+			//then the full header
+			var headerBytes = new byte[Header.Size].AsSpan();
+			using (var headerAccessor = _mmf.CreateViewStream(0, Header.Size, MemoryMappedFileAccess.Read)) {
+				int read = headerAccessor.Read(headerBytes);
+				if (read != Header.Size) {
+					throw new CorruptedFileException(
+						$"File header size ({read} bytes) does not match expected header size ({Header.Size} bytes)");
+				}
+			}
+
+			return MemoryMarshal.AsRef<Header>(headerBytes);
+		} catch (Exception exc) when (exc is not CorruptedFileException) {
+			throw new CorruptedFileException("Failed to read the header", exc);
+		}
+	}
+
+	public void WriteHeader(Header header) {
+		var span = MemoryMarshal.CreateReadOnlySpan(ref header, 1);
+		var headerBytes = MemoryMarshal.Cast<Header, byte>(span);
+		using var headerAccessor = _mmf.CreateViewStream(0, Header.Size, MemoryMappedFileAccess.Write);
+		headerAccessor.Write(headerBytes);
+		headerAccessor.Flush();
+	}
+
+	public void Dispose() {
+		if (_disposed)
+			return;
+
+		_disposed = true;
+
+		if (DataAccessor is not null)
+			DataAccessor.Pointer = default;
+		_mmfWriteAccessor?.SafeMemoryMappedViewHandle.ReleasePointer();
+		_mmfWriteAccessor?.Dispose();
+		_mmf?.Dispose();
+	}
+}
diff --git a/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/PersistentBloomFilter.cs b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/PersistentBloomFilter.cs
new file mode 100644
index 00000000000..b0b6b558201
--- /dev/null
+++ b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/PersistentBloomFilter.cs
@@ -0,0 +1,153 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using KurrentDB.Core.Index.Hashes;
+using Serilog;
+
+namespace KurrentDB.Core.DataStructures.ProbabilisticFilter;
+
+// the bloom filter has a pluggable strategy for persisting data. the IPersistenceStrategy
+// provides us with a BloomFilterAccessor that we can use to manipulate the data.
+// we deal with actually bloom filter hashing in here and synchronise the access to the data.
+public class PersistentBloomFilter : IProbabilisticFilter, IDisposable {
+	/*
+	    Bloom filter implementation based on the following paper by Adam Kirsch and Michael Mitzenmacher:
+	    "Less Hashing, Same Performance: Building a Better Bloom Filter"
+	    https://www.eecs.harvard.edu/~michaelm/postscripts/rsa2008.pdf
+
+	    Only two 32-bit hash functions can be used to simulate additional hash functions of the form g(x) = h1(x) + i*h2(x)
+	*/
+
+	protected static readonly ILogger Log = Serilog.Log.ForContext<PersistentBloomFilter>();
+	public const double RecommendedFalsePositiveProbability = 0.02;
+	private const int NumHashFunctions = 6;
+
+	private readonly IHasher[] _hashers = {
+		new XXHashUnsafe(seed: 0xC0015EEDU),
+		new Murmur3AUnsafe(seed: 0xC0015EEDU),
+		new XXHashUnsafe(seed: 0x13375EEDU),
+		new Murmur3AUnsafe(seed: 0x13375EEDU)
+	};
+
+	private readonly Header _header;
+	private readonly object _writeLock = new();
+	private readonly BloomFilterAccessor _data;
+	private readonly IPersistenceStrategy _persistenceStrategy;
+
+	/// <summary>
+	/// Bloom filter implementation which uses a file for persistence.
+	/// </summary>
+	/// Add and MightContain can be called concurrently on different threads.
+	/// If the call to Add is complete then a call to MightContain will find the added value.
+	public PersistentBloomFilter(
+		IPersistenceStrategy persistenceStrategy,
+		int corruptionRebuildCount = 0) {
+
+		try {
+			_persistenceStrategy = persistenceStrategy;
+			// initialisation and verification can involve writing
+			// there will be no contention since we are in the constructor, but
+			// we want to ensure our writes are available to the readers
+			lock (_writeLock) {
+				_persistenceStrategy.Init();
+				_data = _persistenceStrategy.DataAccessor;
+				var numBits = _data.LogicalFilterSizeBits;
+				if (_persistenceStrategy.Create) {
+					_header = new Header() {
+						Version = Header.CurrentVersion,
+						CorruptionRebuildCount = corruptionRebuildCount,
+						NumBits = numBits
+					};
+
+					_persistenceStrategy.WriteHeader(_header);
+				} else {
+					_header = _persistenceStrategy.ReadHeader();
+					if (_header.NumBits != numBits) {
+						throw new SizeMismatchException(
+							$"The configured number of bytes ({(numBits / 8):N0}) does not match the number of bytes in file header ({(_header.NumBits / 8):N0}).");
+					}
+					Verify(0.05);
+				}
+			}
+		} catch {
+			Dispose();
+			throw;
+		}
+	}
+
+	public int CorruptionRebuildCount => _header.CorruptionRebuildCount;
+
+	/// <summary>
+	/// Calculates optimal number of items in the bloom filter for a specific false positive probability, p
+	/// </summary>
+	/// <param name="p">Desired false positive probability</param>
+	/// <returns></returns>
+	public long CalculateOptimalNumItems(double p = RecommendedFalsePositiveProbability) {
+		return Convert.ToInt64(Math.Floor(
+			Math.Log(1 - Math.Pow(p, 1.0 / NumHashFunctions)) /
+			Math.Log(Math.Pow(1 - 1.0 / _data.LogicalFilterSizeBits, NumHashFunctions)
+		)));
+	}
+
+	public bool MightContain(ReadOnlySpan<byte> bytes) {
+		long hash1 = ((long)_hashers[0].Hash(bytes) << 32) | _hashers[1].Hash(bytes);
+		long hash2 = ((long)_hashers[2].Hash(bytes) << 32) | _hashers[3].Hash(bytes);
+
+		// guarantee our LOADs are executed now and not prior.
+		// dual with the memory barrier implicit in the Add(...) method
+		Thread.MemoryBarrier();
+
+		long hash = hash1;
+		for (int i = 0; i < NumHashFunctions; i++) {
+			hash += hash2;
+			hash &= long.MaxValue; // make non-negative
+			long bitPosition = hash % _data.LogicalFilterSizeBits;
+			if (!_data.IsBitSet(bitPosition))
+				return false;
+		}
+
+		return true;
+	}
+
+	public void Add(ReadOnlySpan<byte> bytes) {
+		long hash1 = ((long)_hashers[0].Hash(bytes) << 32) | _hashers[1].Hash(bytes);
+		long hash2 = ((long)_hashers[2].Hash(bytes) << 32) | _hashers[3].Hash(bytes);
+
+		// guarantee only one writer
+		lock (_writeLock) {
+			long hash = hash1;
+			// possible SIMD optimisation?
+			for (int i = 0; i < NumHashFunctions; i++) {
+				hash += hash2;
+				hash &= long.MaxValue; // make non-negative
+				long bitPosition = hash % _data.LogicalFilterSizeBits;
+				// Consider returning the dirty page from set bit and calling the
+				// persistence strategy directly from here to remove the callback delegate
+				_data.SetBit(bitPosition);
+			}
+			// lock release guarantees our STOREs are executed before we return
+			// todo: confirm is this is true on ARM
+		}
+	}
+
+	// not re-entrant
+	public void Flush() {
+		// need to be sure the read operations were not done in advance of this point
+		// not 100% sure, however, that the barrier is required.
+		Thread.MemoryBarrier();
+		_persistenceStrategy.Flush();
+	}
+
+	public void Dispose() {
+		_persistenceStrategy.Dispose();
+	}
+
+	// corruptionThreshold = 0.05 => tolerate up to 5% corruption
+	public void Verify(double corruptionThreshold) {
+		lock (_writeLock) {
+			_data.Verify(_header.CorruptionRebuildCount, corruptionThreshold);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/PersistentStreamBloomFilter.cs b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/PersistentStreamBloomFilter.cs
new file mode 100644
index 00000000000..e888159fc6e
--- /dev/null
+++ b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/PersistentStreamBloomFilter.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Runtime.InteropServices;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Index.Hashes;
+
+namespace KurrentDB.Core.DataStructures.ProbabilisticFilter;
+
+// this class exists to deal with the fact that v3 stores strings in the bloom filter
+// but v2 stores hashes (to make it faster to rebuild from the standard index)
+//
+// if you provide a ILongHasher then strings are hashed using it and the resulting ulong
+// added to the filter. if you add a ulong directly, it must be the result of the same hash.
+public class PersistentStreamBloomFilter : PersistentBloomFilter {
+	private readonly ILongHasher<string> _hasher;
+
+	public PersistentStreamBloomFilter(
+		IPersistenceStrategy persistenceStrategy,
+		ILongHasher<string> hasher,
+		int corruptionRebuildCount = 0) :
+
+		base(persistenceStrategy, corruptionRebuildCount) {
+		_hasher = hasher;
+	}
+
+	public void Add(string stream) {
+		if (_hasher != null) {
+			var hash = _hasher.Hash(stream);
+			Add(GetSpan(ref hash));
+		} else {
+			Add(MemoryMarshal.AsBytes(stream.AsSpan()));
+		}
+	}
+
+	public void Add(ulong streamHash) {
+		Ensure.NotNull(_hasher, "Hasher");
+		Add(GetSpan(ref streamHash));
+	}
+
+	public bool MightContain(string stream) {
+		if (_hasher != null) {
+			var hash = _hasher.Hash(stream);
+			return MightContain(GetSpan(ref hash));
+		} else {
+			return MightContain(MemoryMarshal.AsBytes(stream.AsSpan()));
+		}
+	}
+
+	private static ReadOnlySpan<byte> GetSpan(ref ulong streamHash) =>
+		MemoryMarshal.AsBytes(MemoryMarshal.CreateReadOnlySpan(ref streamHash, 1));
+}
diff --git a/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/SizeMismatchException.cs b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/SizeMismatchException.cs
new file mode 100644
index 00000000000..04547a5cac6
--- /dev/null
+++ b/src/KurrentDB.Core/DataStructures/ProbabilisticFilter/SizeMismatchException.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.DataStructures.ProbabilisticFilter;
+
+public class SizeMismatchException : Exception {
+	public SizeMismatchException(string error) : base(error) { }
+}
diff --git a/src/KurrentDB.Core/DataStructures/StickyLRUCache.cs b/src/KurrentDB.Core/DataStructures/StickyLRUCache.cs
new file mode 100644
index 00000000000..0349f9c7f81
--- /dev/null
+++ b/src/KurrentDB.Core/DataStructures/StickyLRUCache.cs
@@ -0,0 +1,130 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.DataStructures;
+
+public class StickyLRUCache<TKey, TValue> : IStickyLRUCache<TKey, TValue> {
+	private class LRUItem {
+		public TKey Key;
+		public TValue Value;
+		public int Stickiness;
+	}
+
+	private readonly LinkedList<LRUItem> _orderList = new LinkedList<LRUItem>();
+
+	private readonly Dictionary<TKey, LinkedListNode<LRUItem>> _items =
+		new Dictionary<TKey, LinkedListNode<LRUItem>>();
+
+	private readonly Queue<LinkedListNode<LRUItem>> _nodesPool = new Queue<LinkedListNode<LRUItem>>();
+
+	private readonly int _maxCount;
+
+	public StickyLRUCache(int maxCount) {
+		Ensure.Nonnegative(maxCount, "maxCount");
+
+		_maxCount = maxCount;
+	}
+
+	public void Clear() {
+		while (_orderList.Count > 0) {
+			var node = _orderList.First;
+			_orderList.RemoveFirst();
+			ReturnNode(node);
+		}
+
+		_items.Clear();
+	}
+
+	public bool TryGet(TKey key, out TValue value) {
+		LinkedListNode<LRUItem> node;
+		if (_items.TryGetValue(key, out node)) {
+			_orderList.Remove(node);
+			_orderList.AddLast(node);
+			value = node.Value.Value;
+			return true;
+		}
+
+		value = default(TValue);
+		return false;
+	}
+
+	public TValue Put(TKey key, TValue value, int stickiness) {
+		LinkedListNode<LRUItem> node;
+		if (!_items.TryGetValue(key, out node)) {
+			node = GetNode();
+			node.Value.Key = key;
+			node.Value.Value = value;
+			node.Value.Stickiness = stickiness;
+
+			EnsureCapacity();
+
+			_items.Add(key, node);
+		} else {
+			node.Value.Value = value;
+			node.Value.Stickiness += stickiness;
+			_orderList.Remove(node);
+		}
+
+		_orderList.AddLast(node);
+		return value;
+	}
+
+	public void Remove(TKey key) {
+		LinkedListNode<LRUItem> node;
+		if (_items.TryGetValue(key, out node)) {
+			_orderList.Remove(node);
+			_items.Remove(key);
+		}
+	}
+
+	public TValue Put(TKey key, Func<TKey, TValue> addFactory, Func<TKey, TValue, TValue> updateFactory,
+		int stickiness) {
+		LinkedListNode<LRUItem> node;
+		if (!_items.TryGetValue(key, out node)) {
+			node = GetNode();
+			node.Value.Key = key;
+			node.Value.Value = addFactory(key);
+			node.Value.Stickiness = stickiness;
+
+			EnsureCapacity();
+
+			_items.Add(key, node);
+		} else {
+			node.Value.Value = updateFactory(key, node.Value.Value);
+			node.Value.Stickiness += stickiness;
+			_orderList.Remove(node);
+		}
+
+		_orderList.AddLast(node);
+		return node.Value.Value;
+	}
+
+	private void EnsureCapacity() {
+		while (_items.Count > 0 && _items.Count >= _maxCount) {
+			var node = _orderList.First;
+			if (node.Value.Stickiness == 0) {
+				_orderList.Remove(node);
+				_items.Remove(node.Value.Key);
+				ReturnNode(node);
+			} else {
+				_orderList.Remove(node);
+				_orderList.AddLast(node);
+				break; // hope garbage will be freed on later puts
+			}
+		}
+	}
+
+	private LinkedListNode<LRUItem> GetNode() {
+		if (_nodesPool.Count > 0)
+			return _nodesPool.Dequeue();
+		return new LinkedListNode<LRUItem>(new LRUItem());
+	}
+
+	private void ReturnNode(LinkedListNode<LRUItem> node) {
+		_nodesPool.Enqueue(node);
+	}
+}
diff --git a/src/KurrentDB.Core/DataStructures/UnmanagedMemoryAppendOnlyList.cs b/src/KurrentDB.Core/DataStructures/UnmanagedMemoryAppendOnlyList.cs
new file mode 100644
index 00000000000..1e808b1757f
--- /dev/null
+++ b/src/KurrentDB.Core/DataStructures/UnmanagedMemoryAppendOnlyList.cs
@@ -0,0 +1,111 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+namespace KurrentDB.Core.DataStructures;
+
+
+public interface IAppendOnlyList<in T> {
+	void Add(T item);
+	void Clear();
+	int Count { get; }
+}
+
+public sealed class UnmanagedMemoryAppendOnlyList<T> : IAppendOnlyList<T>, IDisposable {
+	private readonly int _maxCapacity;
+	private readonly IntPtr _dataPtr = IntPtr.Zero;
+	private readonly long _dataBytesAllocated;
+
+	private int _count;
+	private bool _disposed;
+
+	public UnmanagedMemoryAppendOnlyList(int maxCapacity) {
+		if (maxCapacity <= 0) {
+			throw new ArgumentException($"{nameof(maxCapacity)} must be positive");
+		}
+
+		_maxCapacity = maxCapacity;
+		_count = 0;
+		long bytesToAllocate = (long)_maxCapacity * Marshal.SizeOf(typeof(T));
+		_dataPtr = Marshal.AllocHGlobal(new IntPtr(bytesToAllocate));
+		Thread.MemoryBarrier();
+		_dataBytesAllocated = bytesToAllocate;
+
+		if (_dataBytesAllocated > 0) {
+			GC.AddMemoryPressure(_dataBytesAllocated);
+		}
+	}
+
+	~UnmanagedMemoryAppendOnlyList() => Dispose(false);
+
+	public void Add(T item) {
+		if (_count >= _maxCapacity)
+			throw new MaxCapacityReachedException();
+
+		unsafe {
+			new Span<T>(_dataPtr.ToPointer(), _maxCapacity) {
+				[_count] = item
+			};
+		}
+		_count++;
+	}
+
+	public void Clear() {
+		_count = 0;
+	}
+
+	public int Count => _count;
+	public ReadOnlySpan<T> AsSpan() {
+		if (_dataPtr == IntPtr.Zero)
+			return ReadOnlySpan<T>.Empty;
+
+		unsafe {
+			return new ReadOnlySpan<T>(_dataPtr.ToPointer(), _maxCapacity).Slice(0, _count);
+		}
+	}
+
+	public T this[int index] {
+		get {
+			if (index < 0 || index >= _count) {
+				throw new IndexOutOfRangeException();
+			}
+
+			unsafe {
+				return new ReadOnlySpan<T>(_dataPtr.ToPointer(), _maxCapacity)[index];
+			}
+		}
+	}
+
+	public void Dispose() {
+		Dispose(true);
+		GC.SuppressFinalize(this);
+	}
+
+	private void Dispose(bool disposing) {
+		if (_disposed) {
+			return;
+		}
+
+		if (disposing) {
+			//dispose any managed objects here
+		}
+
+		if (_dataPtr != IntPtr.Zero) {
+			Marshal.FreeHGlobal(_dataPtr);
+			Thread.MemoryBarrier();
+			if (_dataBytesAllocated > 0) {
+				GC.RemoveMemoryPressure(_dataBytesAllocated);
+			}
+		}
+
+		_disposed = true;
+	}
+}
+
+public class MaxCapacityReachedException : Exception {
+	public MaxCapacityReachedException() : base("Max capacity reached") {
+	}
+}
diff --git a/src/KurrentDB.Core/EpochExtensions.cs b/src/KurrentDB.Core/EpochExtensions.cs
new file mode 100644
index 00000000000..4c87b51204c
--- /dev/null
+++ b/src/KurrentDB.Core/EpochExtensions.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core;
+
+internal static class EpochExtensions {
+	public static DateTime FromTicksSinceEpoch(this long value) =>
+		new DateTime(DateTime.UnixEpoch.Ticks + value, DateTimeKind.Utc);
+
+	public static long ToTicksSinceEpoch(this DateTime value) =>
+		(value - DateTime.UnixEpoch).Ticks;
+}
diff --git a/src/KurrentDB.Core/Exceptions/BadChunkInDatabaseException.cs b/src/KurrentDB.Core/Exceptions/BadChunkInDatabaseException.cs
new file mode 100644
index 00000000000..b911a78007b
--- /dev/null
+++ b/src/KurrentDB.Core/Exceptions/BadChunkInDatabaseException.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Exceptions;
+
+public class BadChunkInDatabaseException : Exception {
+	public BadChunkInDatabaseException(string message) : base(message) {
+	}
+}
diff --git a/src/KurrentDB.Core/Exceptions/ChunkNotFoundException.cs b/src/KurrentDB.Core/Exceptions/ChunkNotFoundException.cs
new file mode 100644
index 00000000000..592992e43b7
--- /dev/null
+++ b/src/KurrentDB.Core/Exceptions/ChunkNotFoundException.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Exceptions;
+
+public class ChunkNotFoundException : Exception {
+	public ChunkNotFoundException(string chunkName) : base(chunkName + " not found.") {
+	}
+}
diff --git a/src/KurrentDB.Core/Exceptions/CorruptDatabaseException.cs b/src/KurrentDB.Core/Exceptions/CorruptDatabaseException.cs
new file mode 100644
index 00000000000..96bf4e7af20
--- /dev/null
+++ b/src/KurrentDB.Core/Exceptions/CorruptDatabaseException.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Exceptions;
+
+public class CorruptDatabaseException : Exception {
+	public CorruptDatabaseException(Exception inner) : base("Corrupt database detected.", inner) {
+	}
+
+	public CorruptDatabaseException(string message, Exception inner) : base(message, inner) {
+	}
+}
diff --git a/src/KurrentDB.Core/Exceptions/CorruptIndexException.cs b/src/KurrentDB.Core/Exceptions/CorruptIndexException.cs
new file mode 100644
index 00000000000..953c66abffb
--- /dev/null
+++ b/src/KurrentDB.Core/Exceptions/CorruptIndexException.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Exceptions;
+
+public class CorruptIndexException : Exception {
+	public CorruptIndexException() {
+	}
+
+	public CorruptIndexException(Exception innerException) : base("Corrupted index.", innerException) {
+	}
+
+	public CorruptIndexException(string message) : base(message) {
+	}
+
+	public CorruptIndexException(string message, Exception innerException) : base(message, innerException) {
+	}
+}
diff --git a/src/KurrentDB.Core/Exceptions/ExtraneousFileFoundException.cs b/src/KurrentDB.Core/Exceptions/ExtraneousFileFoundException.cs
new file mode 100644
index 00000000000..16a468a3288
--- /dev/null
+++ b/src/KurrentDB.Core/Exceptions/ExtraneousFileFoundException.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Exceptions;
+
+public class ExtraneousFileFoundException : Exception {
+	public ExtraneousFileFoundException(string message) : base(message) {
+	}
+}
diff --git a/src/KurrentDB.Core/Exceptions/FileBeingDeletedException.cs b/src/KurrentDB.Core/Exceptions/FileBeingDeletedException.cs
new file mode 100644
index 00000000000..761600cdc2d
--- /dev/null
+++ b/src/KurrentDB.Core/Exceptions/FileBeingDeletedException.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Exceptions;
+
+public class FileBeingDeletedException : Exception {
+	public FileBeingDeletedException() {
+	}
+
+	public FileBeingDeletedException(string message) : base(message) {
+	}
+
+	public FileBeingDeletedException(string message, Exception innerException) : base(message, innerException) {
+	}
+}
diff --git a/src/KurrentDB.Core/Exceptions/HashValidationException.cs b/src/KurrentDB.Core/Exceptions/HashValidationException.cs
new file mode 100644
index 00000000000..1bb17b1c818
--- /dev/null
+++ b/src/KurrentDB.Core/Exceptions/HashValidationException.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Exceptions;
+
+public class HashValidationException : Exception {
+	public HashValidationException() {
+	}
+
+	public HashValidationException(string message) : base(message) {
+	}
+
+	public HashValidationException(string message, Exception innerException) : base(message, innerException) {
+	}
+}
diff --git a/src/KurrentDB.Core/Exceptions/InvalidFileException.cs b/src/KurrentDB.Core/Exceptions/InvalidFileException.cs
new file mode 100644
index 00000000000..dbfb156a996
--- /dev/null
+++ b/src/KurrentDB.Core/Exceptions/InvalidFileException.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Exceptions;
+
+public class InvalidFileException : Exception {
+	public InvalidFileException() {
+	}
+
+	public InvalidFileException(string message) : base(message) {
+	}
+
+	public InvalidFileException(string message, Exception innerException) : base(message, innerException) {
+	}
+}
diff --git a/src/KurrentDB.Core/Exceptions/MaybeCorruptIndexException.cs b/src/KurrentDB.Core/Exceptions/MaybeCorruptIndexException.cs
new file mode 100644
index 00000000000..bfbb35973f4
--- /dev/null
+++ b/src/KurrentDB.Core/Exceptions/MaybeCorruptIndexException.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Exceptions;
+
+public class MaybeCorruptIndexException : Exception {
+	public MaybeCorruptIndexException() {
+	}
+
+	public MaybeCorruptIndexException(Exception innerException) : base("May be corrupted index.", innerException) {
+	}
+
+	public MaybeCorruptIndexException(string message) : base(message) {
+	}
+
+	public MaybeCorruptIndexException(string message, Exception innerException) : base(message, innerException) {
+	}
+}
diff --git a/src/KurrentDB.Core/Exceptions/NoCertificatePrivateKeyException.cs b/src/KurrentDB.Core/Exceptions/NoCertificatePrivateKeyException.cs
new file mode 100644
index 00000000000..020724a50fc
--- /dev/null
+++ b/src/KurrentDB.Core/Exceptions/NoCertificatePrivateKeyException.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Exceptions;
+
+public class NoCertificatePrivateKeyException : Exception {
+	public NoCertificatePrivateKeyException() : base() {
+	}
+}
diff --git a/src/KurrentDB.Core/Exceptions/PTableNotFoundException.cs b/src/KurrentDB.Core/Exceptions/PTableNotFoundException.cs
new file mode 100644
index 00000000000..21aea245afe
--- /dev/null
+++ b/src/KurrentDB.Core/Exceptions/PTableNotFoundException.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Exceptions;
+
+public class PTableNotFoundException : Exception {
+	public PTableNotFoundException(string ptableName) : base("PTable " + ptableName + " not found.") {
+	}
+}
diff --git a/src/KurrentDB.Core/Exceptions/PossibleToHandleOutOfMemoryException.cs b/src/KurrentDB.Core/Exceptions/PossibleToHandleOutOfMemoryException.cs
new file mode 100644
index 00000000000..bde456ac61d
--- /dev/null
+++ b/src/KurrentDB.Core/Exceptions/PossibleToHandleOutOfMemoryException.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Exceptions;
+
+internal class PossibleToHandleOutOfMemoryException : OutOfMemoryException {
+	public PossibleToHandleOutOfMemoryException() {
+	}
+
+	public PossibleToHandleOutOfMemoryException(string message) : base(message) {
+	}
+
+	public PossibleToHandleOutOfMemoryException(string message, Exception innerException) : base(message,
+		innerException) {
+	}
+}
diff --git a/src/KurrentDB.Core/Exceptions/ReaderCheckpointHigherThanWriterException.cs b/src/KurrentDB.Core/Exceptions/ReaderCheckpointHigherThanWriterException.cs
new file mode 100644
index 00000000000..adfc37f6735
--- /dev/null
+++ b/src/KurrentDB.Core/Exceptions/ReaderCheckpointHigherThanWriterException.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Exceptions;
+
+public class ReaderCheckpointHigherThanWriterException : Exception {
+	public ReaderCheckpointHigherThanWriterException(string checkpointName)
+		: base(string.Format("Checkpoint '{0}' has greater value than writer checkpoint.", checkpointName)) {
+	}
+}
diff --git a/src/KurrentDB.Core/Exceptions/SystemStreamNotFoundException.cs b/src/KurrentDB.Core/Exceptions/SystemStreamNotFoundException.cs
new file mode 100644
index 00000000000..e9721fb8ba6
--- /dev/null
+++ b/src/KurrentDB.Core/Exceptions/SystemStreamNotFoundException.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Exceptions;
+
+class SystemStreamNotFoundException : Exception {
+	public SystemStreamNotFoundException(string message) : base(message) {
+	}
+}
diff --git a/src/KurrentDB.Core/Exceptions/UnableToAcquireLockInReasonableTimeException.cs b/src/KurrentDB.Core/Exceptions/UnableToAcquireLockInReasonableTimeException.cs
new file mode 100644
index 00000000000..f8efa3133ae
--- /dev/null
+++ b/src/KurrentDB.Core/Exceptions/UnableToAcquireLockInReasonableTimeException.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Exceptions;
+
+public class UnableToAcquireLockInReasonableTimeException : Exception {
+}
diff --git a/src/KurrentDB.Core/Exceptions/UnableToReadPastEndOfStreamException.cs b/src/KurrentDB.Core/Exceptions/UnableToReadPastEndOfStreamException.cs
new file mode 100644
index 00000000000..23614b1e7e6
--- /dev/null
+++ b/src/KurrentDB.Core/Exceptions/UnableToReadPastEndOfStreamException.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Exceptions;
+
+internal class UnableToReadPastEndOfStreamException : Exception {
+	public UnableToReadPastEndOfStreamException() {
+	}
+
+	public UnableToReadPastEndOfStreamException(string message) : base(message) {
+	}
+
+	public UnableToReadPastEndOfStreamException(string message, Exception innerException) : base(message,
+		innerException) {
+	}
+}
diff --git a/src/KurrentDB.Core/Exceptions/UnsupportedFileVersionException.cs b/src/KurrentDB.Core/Exceptions/UnsupportedFileVersionException.cs
new file mode 100644
index 00000000000..4da9af8881c
--- /dev/null
+++ b/src/KurrentDB.Core/Exceptions/UnsupportedFileVersionException.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Exceptions;
+
+public class UnsupportedFileVersionException : Exception {
+	public UnsupportedFileVersionException(string filename, byte fileVersion, byte lastSupportedVersion,
+		string message = "")
+		: base(string.Format("File {0} has unsupported version: {1}. The latest supported version is: {2}. {3}",
+			filename,
+			fileVersion,
+			lastSupportedVersion,
+			message)) {
+	}
+}
diff --git a/src/KurrentDB.Core/ExclusiveDbLock.cs b/src/KurrentDB.Core/ExclusiveDbLock.cs
new file mode 100644
index 00000000000..50cb0a90d25
--- /dev/null
+++ b/src/KurrentDB.Core/ExclusiveDbLock.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Util;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core;
+
+public class ExclusiveDbLock : IDisposable {
+	private static readonly ILogger Log = Serilog.Log.ForContext<ExclusiveDbLock>();
+
+	public readonly string MutexName;
+
+	public bool IsAcquired => _acquired;
+
+	private Mutex _dbMutex;
+	private bool _acquired;
+
+	public ExclusiveDbLock(string dbPath) {
+		Ensure.NotNullOrEmpty(dbPath, "dbPath");
+		MutexName = @"Global\ESDB-HASHED:" + GetDbPathHash(dbPath);
+	}
+
+	public bool Acquire() {
+		if (_acquired)
+			throw new InvalidOperationException($"DB mutex '{MutexName}' is already acquired.");
+
+		try {
+			_dbMutex?.Dispose();
+			_dbMutex = new Mutex(initiallyOwned: true, name: MutexName, createdNew: out _acquired);
+			_dbMutex.WaitOne(TimeSpan.FromSeconds(5));
+		} catch (AbandonedMutexException exc) {
+			Log.Warning(exc,
+				"DB mutex '{mutex}' is said to be abandoned. "
+				+ "Probably previous instance of server was terminated abruptly.",
+				MutexName);
+		}
+
+		return _acquired;
+	}
+
+	private static string GetDbPathHash(string dbPath) {
+		using var memStream = new MemoryStream(Helper.UTF8NoBom.GetBytes(dbPath));
+		return BitConverter.ToString(MD5Hash.GetHashFor(memStream)).Replace("-", "");
+	}
+
+	public void Release() {
+		if (!_acquired)
+			throw new InvalidOperationException($"DB mutex '{MutexName}' was not acquired.");
+		try {
+			_dbMutex.ReleaseMutex();
+		} catch (ApplicationException ex) {
+			Log.Warning(ex, "Error occurred while releasing lock.");
+		} finally {
+			_acquired = false;
+		}
+	}
+
+	public void Dispose() {
+		if (_acquired) {
+			Release();
+		}
+		_dbMutex?.Dispose();
+	}
+}
diff --git a/src/KurrentDB.Core/Hashing/MD5.cs b/src/KurrentDB.Core/Hashing/MD5.cs
new file mode 100644
index 00000000000..dcedbf8953f
--- /dev/null
+++ b/src/KurrentDB.Core/Hashing/MD5.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Cryptography;
+using EventStore.Plugins.MD5;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.Hashing;
+
+public class MD5 {
+	private static IMD5Provider _provider = new NetMD5Provider();
+
+	public static HashAlgorithm Create() => _provider.Create();
+
+	public static void UseProvider(IMD5Provider md5Provider) {
+		Ensure.NotNull(md5Provider, nameof(md5Provider));
+
+		try {
+			using var _ = md5Provider.Create();
+		} catch (Exception ex) {
+			throw new AggregateException("Failed to use the specified MD5 provider.", ex);
+		}
+
+		_provider = md5Provider;
+	}
+}
diff --git a/src/KurrentDB.Core/Hashing/NetMD5Provider.cs b/src/KurrentDB.Core/Hashing/NetMD5Provider.cs
new file mode 100644
index 00000000000..001191f4d49
--- /dev/null
+++ b/src/KurrentDB.Core/Hashing/NetMD5Provider.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Cryptography;
+using EventStore.Plugins;
+using EventStore.Plugins.MD5;
+
+namespace KurrentDB.Core.Hashing;
+
+public class NetMD5Provider : Plugin, IMD5Provider {
+	public HashAlgorithm Create() => System.Security.Cryptography.MD5.Create();
+}
diff --git a/src/KurrentDB.Core/Helpers/IODispatcher.cs b/src/KurrentDB.Core/Helpers/IODispatcher.cs
new file mode 100644
index 00000000000..81e878448db
--- /dev/null
+++ b/src/KurrentDB.Core/Helpers/IODispatcher.cs
@@ -0,0 +1,958 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.TimerService;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+
+namespace KurrentDB.Core.Helpers;
+
+
+public sealed class IODispatcher : IHandle<IODispatcherDelayedMessage>, IHandle<ClientMessage.NotHandled> {
+	public sealed class RequestTracking {
+		public RequestTracking(bool trackPendingRequests) {
+			_trackPendingRequests = trackPendingRequests;
+		}
+
+		private readonly WriterQueueSet _writerQueueSet = new WriterQueueSet();
+		private readonly PendingWrites _pendingWrites = new PendingWrites();
+		private readonly PendingReads _pendingReads = new PendingReads();
+		private readonly bool _trackPendingRequests;
+		private readonly HashSet<Guid> _allPendingRequests = new HashSet<Guid>();
+		private bool _draining;
+		private Action _onRequestsDrained;
+		private readonly object _lockObject = new object();
+
+		public void StartDraining(Action onRequestsDrained) {
+			lock (_lockObject) {
+				if (_allPendingRequests.IsEmpty()) {
+					onRequestsDrained?.Invoke();
+					return;
+				}
+				_draining = true;
+				_onRequestsDrained = onRequestsDrained;
+			}
+		}
+
+		public void AddPendingRequest(Guid correlationId) {
+			lock (_lockObject) {
+				if (!_trackPendingRequests)
+					return;
+
+				_allPendingRequests.Add(correlationId);
+			}
+		}
+
+		public void RemovePendingRequest(Guid correlationId) {
+			lock (_lockObject) {
+				if (!_trackPendingRequests)
+					return;
+
+				_allPendingRequests.Remove(correlationId);
+				if (_draining && _allPendingRequests.IsEmpty()) {
+					_onRequestsDrained?.Invoke();
+					_onRequestsDrained = null;
+					_draining = false;
+				}
+			}
+		}
+
+		public void AddPendingRead(Guid corrId) {
+			lock (_lockObject) {
+				AddPendingRequest(corrId);
+				_pendingReads.Register(corrId);
+			}
+		}
+
+		public bool RemovePendingRead(Guid corrId) {
+			lock (_lockObject) {
+				RemovePendingRequest(corrId);
+				if (!_pendingReads.IsRegistered(corrId))
+					return false;
+				_pendingReads.Remove(corrId);
+				return true;
+			}
+		}
+
+		private void WorkQueue(
+			Guid key,
+			RequestResponseDispatcher<ClientMessage.WriteEvents, ClientMessage.WriteEventsCompleted> writer) {
+
+			if (_writerQueueSet.IsBusy(key))
+				return;
+			if (!_writerQueueSet.HasPendingWrites(key))
+				return;
+			var write = _writerQueueSet.Dequeue(key);
+			if (write != null) {
+				writer.Publish(write, (msg) => Handle(key, msg, writer));
+			}
+		}
+
+		private void Handle(
+			Guid key,
+			ClientMessage.WriteEventsCompleted message,
+			RequestResponseDispatcher<ClientMessage.WriteEvents, ClientMessage.WriteEventsCompleted> writer) {
+
+			lock (_lockObject) {
+				_writerQueueSet.Finish(key);
+
+				_pendingWrites.CompleteRequest(message);
+				RemovePendingRequest(message.CorrelationId);
+
+				WorkQueue(key, writer);
+			}
+		}
+
+		public void QueuePendingWrite(
+			Guid key,
+			Guid corrId,
+			Action<ClientMessage.WriteEventsCompleted> action,
+			ClientMessage.WriteEvents message,
+			RequestResponseDispatcher<ClientMessage.WriteEvents, ClientMessage.WriteEventsCompleted> writer) {
+
+			lock (_lockObject) {
+				AddPendingRequest(corrId);
+				_pendingWrites.CaptureCallback(corrId, action);
+
+				_writerQueueSet.AddToQueue(key, message);
+
+				WorkQueue(key, writer);
+			}
+		}
+	}
+
+	public const int ReadTimeoutMs = 10000;
+
+	private readonly Guid _selfId = Guid.NewGuid();
+	private readonly IPublisher _publisher;
+	private readonly IEnvelope _inputQueueEnvelope;
+	private readonly RequestTracking _requestTracker;
+
+	public readonly
+		RequestResponseDispatcher
+		<ClientMessage.ReadStreamEventsForward, ClientMessage.ReadStreamEventsForwardCompleted> ForwardReader;
+
+	public ReadDispatcher BackwardReader { get; }
+
+	public readonly RequestResponseDispatcher<ClientMessage.WriteEvents, ClientMessage.WriteEventsCompleted> Writer;
+
+	public readonly RequestResponseDispatcher<ClientMessage.DeleteStream, ClientMessage.DeleteStreamCompleted>
+		StreamDeleter;
+
+	public readonly RequestResponseDispatcher<AwakeServiceMessage.SubscribeAwake, IODispatcherDelayedMessage>
+		Awaker;
+
+	public readonly RequestResponseDispatcher<ClientMessage.ReadEvent, ClientMessage.ReadEventCompleted> EventReader;
+
+	public readonly
+		RequestResponseDispatcher
+		<ClientMessage.ReadAllEventsForward, ClientMessage.ReadAllEventsForwardCompleted> AllForwardReader;
+
+	public readonly
+		RequestResponseDispatcher
+		<ClientMessage.ReadAllEventsBackward, ClientMessage.ReadAllEventsBackwardCompleted> AllBackwardReader;
+
+	public readonly
+		RequestResponseDispatcher
+		<ClientMessage.FilteredReadAllEventsForward, ClientMessage.FilteredReadAllEventsForwardCompleted> AllForwardFilteredReader;
+
+	public readonly
+		RequestResponseDispatcher
+		<ClientMessage.FilteredReadAllEventsBackward, ClientMessage.FilteredReadAllEventsBackwardCompleted> AllBackwardFilteredReader;
+
+	public IODispatcher(IPublisher publisher, IEnvelope envelope, bool trackPendingRequests = false) {
+		_publisher = publisher;
+		_inputQueueEnvelope = envelope;
+		_requestTracker = new RequestTracking(trackPendingRequests);
+
+		ForwardReader =
+			new RequestResponseDispatcher
+				<ClientMessage.ReadStreamEventsForward, ClientMessage.ReadStreamEventsForwardCompleted>(
+					publisher,
+					v => v.CorrelationId,
+					v => v.CorrelationId,
+					envelope);
+
+		BackwardReader = new ReadDispatcher(
+			publisher,
+			v => v.CorrelationId,
+			v => v.CorrelationId,
+			v => v.CorrelationId,
+			envelope);
+
+		Writer =
+			new RequestResponseDispatcher<ClientMessage.WriteEvents, ClientMessage.WriteEventsCompleted>(
+				publisher,
+				v => v.CorrelationId,
+				v => v.CorrelationId,
+				envelope);
+
+		StreamDeleter =
+			new RequestResponseDispatcher<ClientMessage.DeleteStream, ClientMessage.DeleteStreamCompleted>(
+				publisher,
+				v => v.CorrelationId,
+				v => v.CorrelationId,
+				envelope);
+
+		Awaker =
+			new RequestResponseDispatcher<AwakeServiceMessage.SubscribeAwake, IODispatcherDelayedMessage>(
+				publisher,
+				v => v.CorrelationId,
+				v => v.CorrelationId,
+				envelope,
+				cancelMessageFactory: requestId => new AwakeServiceMessage.UnsubscribeAwake(requestId));
+
+		EventReader =
+			new RequestResponseDispatcher<ClientMessage.ReadEvent, ClientMessage.ReadEventCompleted>(
+				publisher,
+				v => v.CorrelationId,
+				v => v.CorrelationId,
+				envelope);
+
+		AllForwardReader =
+			new RequestResponseDispatcher
+				<ClientMessage.ReadAllEventsForward, ClientMessage.ReadAllEventsForwardCompleted>(
+					publisher,
+					v => v.CorrelationId,
+					v => v.CorrelationId,
+					envelope);
+
+		AllBackwardReader =
+			new RequestResponseDispatcher
+				<ClientMessage.ReadAllEventsBackward, ClientMessage.ReadAllEventsBackwardCompleted>(
+					publisher,
+					v => v.CorrelationId,
+					v => v.CorrelationId,
+					envelope);
+
+		AllForwardFilteredReader =
+			new RequestResponseDispatcher
+				<ClientMessage.FilteredReadAllEventsForward, ClientMessage.FilteredReadAllEventsForwardCompleted>(
+					publisher,
+					v => v.CorrelationId,
+					v => v.CorrelationId,
+					envelope);
+
+		AllBackwardFilteredReader =
+			new RequestResponseDispatcher
+				<ClientMessage.FilteredReadAllEventsBackward, ClientMessage.FilteredReadAllEventsBackwardCompleted>(
+					publisher,
+					v => v.CorrelationId,
+					v => v.CorrelationId,
+					envelope);
+	}
+
+	public void StartDraining(Action onRequestsDrained) {
+		_requestTracker.StartDraining(onRequestsDrained);
+	}
+
+	private void AddPendingRequest(Guid correlationId) {
+		_requestTracker.AddPendingRequest(correlationId);
+	}
+
+	private void RemovePendingRequest(Guid correlationId) {
+		_requestTracker.RemovePendingRequest(correlationId);
+	}
+
+	public Guid ReadBackward(
+		string streamId,
+		long fromEventNumber,
+		int maxCount,
+		bool resolveLinks,
+		ClaimsPrincipal principal,
+		Action<ClientMessage.ReadStreamEventsBackwardCompleted> action,
+		Guid? corrId = null,
+		DateTime? expires = null) {
+		if (!corrId.HasValue)
+			corrId = Guid.NewGuid();
+
+		return BackwardReader.Publish(
+			new ClientMessage.ReadStreamEventsBackward(
+					corrId.Value,
+					corrId.Value,
+					BackwardReader.Envelope,
+					streamId,
+					fromEventNumber,
+					maxCount,
+					resolveLinks,
+					false,
+					null,
+					principal,
+					expires: expires),
+			new ReadStreamEventsBackwardHandlers.Optimistic(action));
+	}
+
+	public Guid ReadBackward(
+		string streamId,
+		long fromEventNumber,
+		int maxCount,
+		bool resolveLinks,
+		ClaimsPrincipal principal,
+		Action<ClientMessage.ReadStreamEventsBackwardCompleted> action,
+		Action timeoutAction,
+		Guid corrId) {
+
+		var handler = new ReadStreamEventsBackwardHandlers.Tracking(
+			corrId,
+			_requestTracker,
+			new ReadStreamEventsBackwardHandlers.AdHoc(
+				handled: action,
+				notHandled: null,
+				timedout: timeoutAction));
+
+		BackwardReader.Publish(
+			new ClientMessage.ReadStreamEventsBackward(
+				corrId,
+				corrId,
+				BackwardReader.Envelope,
+				streamId,
+				fromEventNumber,
+				maxCount,
+				resolveLinks,
+				false,
+				null,
+				principal),
+			handler);
+
+		Delay(TimeSpan.FromMilliseconds(ReadTimeoutMs), BackwardReader, corrId);
+		return corrId;
+	}
+
+	public Guid ReadBackward(
+		string streamId,
+		long fromEventNumber,
+		int maxCount,
+		bool resolveLinks,
+		ClaimsPrincipal principal,
+		IReadStreamEventsBackwardHandler handler,
+		Guid corrId) {
+
+		var trackingHandler = new ReadStreamEventsBackwardHandlers.Tracking(
+			corrId, _requestTracker, handler);
+
+		BackwardReader.Publish(
+			new ClientMessage.ReadStreamEventsBackward(
+				corrId,
+				corrId,
+				BackwardReader.Envelope,
+				streamId,
+				fromEventNumber,
+				maxCount,
+				resolveLinks,
+				false,
+				null,
+				principal),
+			trackingHandler);
+
+		Delay(TimeSpan.FromMilliseconds(ReadTimeoutMs), BackwardReader, corrId);
+		return corrId;
+	}
+
+	public Guid ReadForward(
+		string streamId,
+		long fromEventNumber,
+		int maxCount,
+		bool resolveLinks,
+		ClaimsPrincipal principal,
+		Action<ClientMessage.ReadStreamEventsForwardCompleted> action,
+		Guid? corrId = null) {
+		if (!corrId.HasValue)
+			corrId = Guid.NewGuid();
+		return
+			ForwardReader.Publish(
+				new ClientMessage.ReadStreamEventsForward(
+					corrId.Value,
+					corrId.Value,
+					ForwardReader.Envelope,
+					streamId,
+					fromEventNumber,
+					maxCount,
+					resolveLinks,
+					false,
+					null,
+					principal,
+					replyOnExpired: false),
+				action);
+	}
+
+	public Guid ReadForward(
+		string streamId,
+		long fromEventNumber,
+		int maxCount,
+		bool resolveLinks,
+		ClaimsPrincipal principal,
+		Action<ClientMessage.ReadStreamEventsForwardCompleted> action,
+		Action timeoutAction,
+		Guid corrId) {
+		_requestTracker.AddPendingRead(corrId);
+
+		ForwardReader.Publish(
+			new ClientMessage.ReadStreamEventsForward(
+				corrId,
+				corrId,
+				ForwardReader.Envelope,
+				streamId,
+				fromEventNumber,
+				maxCount,
+				resolveLinks,
+				false,
+				null,
+				principal,
+				replyOnExpired: false),
+			res => {
+				if (_requestTracker.RemovePendingRead(res.CorrelationId)) {
+					action(res);
+				}
+			},
+			() => {
+				if (_requestTracker.RemovePendingRead(corrId)) {
+					timeoutAction();
+				}
+			});
+		Delay(TimeSpan.FromMilliseconds(ReadTimeoutMs), ForwardReader, corrId);
+		return corrId;
+	}
+
+	public Guid ReadEvent(
+		string streamId,
+		long fromEventNumber,
+		ClaimsPrincipal principal,
+		Action<ClientMessage.ReadEventCompleted> action,
+		Action timeoutAction,
+		Guid corrId) {
+		_requestTracker.AddPendingRead(corrId);
+
+		EventReader.Publish(
+			new ClientMessage.ReadEvent(
+				corrId,
+				corrId,
+				EventReader.Envelope,
+				streamId,
+				fromEventNumber,
+				false,
+				false,
+				principal),
+			res => {
+				if (_requestTracker.RemovePendingRead(res.CorrelationId)) {
+					action(res);
+				}
+			},
+			() => {
+				if (_requestTracker.RemovePendingRead(corrId)) {
+					timeoutAction();
+				}
+			});
+		Delay(TimeSpan.FromMilliseconds(ReadTimeoutMs), EventReader, corrId);
+		return corrId;
+	}
+
+	public Guid ReadAllForward(
+		long commitPosition,
+		long preparePosition,
+		int maxCount,
+		bool resolveLinks,
+		bool requireLeader,
+		long? validationTfLastCommitPosition,
+		ClaimsPrincipal user,
+		TimeSpan? longPollTimeout,
+		Action<ClientMessage.ReadAllEventsForwardCompleted> action,
+		Action timeoutAction,
+		Guid corrId) {
+		_requestTracker.AddPendingRead(corrId);
+
+		AllForwardReader.Publish(
+			new ClientMessage.ReadAllEventsForward(
+				corrId,
+				corrId,
+				AllForwardReader.Envelope,
+				commitPosition,
+				preparePosition,
+				maxCount,
+				resolveLinks,
+				requireLeader,
+				validationTfLastCommitPosition,
+				user,
+				replyOnExpired: false,
+				longPollTimeout: longPollTimeout
+				),
+			res => {
+				if (_requestTracker.RemovePendingRead(res.CorrelationId)) {
+					action(res);
+				}
+			},
+			() => {
+				if (_requestTracker.RemovePendingRead(corrId)) {
+					timeoutAction();
+				}
+			});
+		Delay(TimeSpan.FromMilliseconds(ReadTimeoutMs), AllForwardReader, corrId);
+		return corrId;
+	}
+
+	public Guid ReadAllBackward(
+		long commitPosition,
+		long preparePosition,
+		int maxCount,
+		bool resolveLinks,
+		bool requireLeader,
+		long? validationTfLastCommitPosition,
+		ClaimsPrincipal user,
+		TimeSpan? longPollTimeout,
+		Action<ClientMessage.ReadAllEventsBackwardCompleted> action,
+		Action timeoutAction,
+		Guid corrId) {
+		_requestTracker.AddPendingRead(corrId);
+
+		AllBackwardReader.Publish(
+			new ClientMessage.ReadAllEventsBackward(
+				corrId,
+				corrId,
+				AllBackwardReader.Envelope,
+				commitPosition,
+				preparePosition,
+				maxCount,
+				resolveLinks,
+				requireLeader,
+				validationTfLastCommitPosition,
+				user
+			),
+			res => {
+				if (_requestTracker.RemovePendingRead(res.CorrelationId)) {
+					action(res);
+				}
+			},
+			() => {
+				if (_requestTracker.RemovePendingRead(corrId)) {
+					timeoutAction();
+				}
+			});
+		Delay(TimeSpan.FromMilliseconds(ReadTimeoutMs), AllBackwardReader, corrId);
+		return corrId;
+	}
+
+	public Guid ReadAllForwardFiltered(
+		long commitPosition,
+		long preparePosition,
+		int maxCount,
+		bool resolveLinks,
+		bool requireLeader,
+		int maxSearchWindow,
+		long? validationTfLastCommitPosition,
+		IEventFilter eventFilter,
+		ClaimsPrincipal user,
+		TimeSpan? longPollTimeout,
+		Action<ClientMessage.FilteredReadAllEventsForwardCompleted> action,
+		Action timeoutAction,
+		Guid corrId) {
+		_requestTracker.AddPendingRead(corrId);
+
+		AllForwardFilteredReader.Publish(
+			new ClientMessage.FilteredReadAllEventsForward(
+				corrId,
+				corrId,
+				AllForwardFilteredReader.Envelope,
+				commitPosition,
+				preparePosition,
+				maxCount,
+				resolveLinks,
+				requireLeader,
+				maxSearchWindow,
+				validationTfLastCommitPosition,
+				eventFilter,
+				user,
+				replyOnExpired: false,
+				longPollTimeout: longPollTimeout
+			),
+			res => {
+				if (_requestTracker.RemovePendingRead(res.CorrelationId)) {
+					action(res);
+				}
+			},
+			() => {
+				if (_requestTracker.RemovePendingRead(corrId)) {
+					timeoutAction();
+				}
+			});
+		Delay(TimeSpan.FromMilliseconds(ReadTimeoutMs), AllForwardFilteredReader, corrId);
+		return corrId;
+	}
+
+	public Guid ReadAllBackwardFiltered(
+		long commitPosition,
+		long preparePosition,
+		int maxCount,
+		bool resolveLinks,
+		bool requireLeader,
+		int maxSearchWindow,
+		long? validationTfLastCommitPosition,
+		IEventFilter eventFilter,
+		ClaimsPrincipal user,
+		Action<ClientMessage.FilteredReadAllEventsBackwardCompleted> action,
+		Action timeoutAction,
+		Guid corrId) {
+		_requestTracker.AddPendingRead(corrId);
+
+		AllBackwardFilteredReader.Publish(
+			new ClientMessage.FilteredReadAllEventsBackward(
+				corrId,
+				corrId,
+				AllBackwardFilteredReader.Envelope,
+				commitPosition,
+				preparePosition,
+				maxCount,
+				resolveLinks,
+				requireLeader,
+				maxSearchWindow,
+				validationTfLastCommitPosition,
+				eventFilter,
+				user
+			),
+			res => {
+				if (_requestTracker.RemovePendingRead(res.CorrelationId)) {
+					action(res);
+				}
+			},
+			() => {
+				if (_requestTracker.RemovePendingRead(corrId)) {
+					timeoutAction();
+				}
+			});
+		Delay(TimeSpan.FromMilliseconds(ReadTimeoutMs), AllBackwardFilteredReader, corrId);
+		return corrId;
+	}
+
+	public void ConfigureStreamAndWriteEvents(
+		string streamId,
+		long expectedVersion,
+		Lazy<StreamMetadata> streamMetadata,
+		Event[] events,
+		ClaimsPrincipal principal,
+		Action<ClientMessage.WriteEventsCompleted> action) {
+		if (expectedVersion != ExpectedVersion.Any && expectedVersion != ExpectedVersion.NoStream)
+			WriteEvents(streamId, expectedVersion, events, principal, action);
+		else
+			ReadBackward(
+				streamId,
+				-1,
+				1,
+				false,
+				principal,
+				completed => {
+					switch (completed.Result) {
+						case ReadStreamResult.Success:
+						case ReadStreamResult.NoStream:
+							if (completed.Events is not null && completed.Events.Count > 0)
+								WriteEvents(streamId, expectedVersion, events, principal, action);
+							else
+								UpdateStreamAcl(
+									streamId,
+									ExpectedVersion.Any,
+									principal,
+									streamMetadata.Value,
+									metaCompleted =>
+										WriteEvents(streamId, expectedVersion, events, principal, action));
+							break;
+						case ReadStreamResult.AccessDenied:
+							action(
+								new ClientMessage.WriteEventsCompleted(
+									Guid.NewGuid(),
+									OperationResult.AccessDenied,
+									""));
+							break;
+						case ReadStreamResult.StreamDeleted:
+							action(
+								new ClientMessage.WriteEventsCompleted(
+									Guid.NewGuid(),
+									OperationResult.StreamDeleted,
+									""));
+							break;
+						default:
+							throw new NotSupportedException();
+					}
+				});
+	}
+
+	public Guid WriteEvents(
+		string streamId,
+		long expectedVersion,
+		Event[] events,
+		ClaimsPrincipal principal,
+		Action<ClientMessage.WriteEventsCompleted> action) {
+		var corrId = Guid.NewGuid();
+		AddPendingRequest(corrId);
+		return
+			Writer.Publish(
+				new ClientMessage.WriteEvents(
+					corrId,
+					corrId,
+					Writer.Envelope,
+					false,
+					streamId,
+					expectedVersion,
+					events,
+					principal),
+				res => {
+					RemovePendingRequest(res.CorrelationId);
+					action(res);
+				});
+	}
+
+	private class PendingWrites {
+		private readonly Dictionary<Guid, Action<ClientMessage.WriteEventsCompleted>> _map;
+
+		public PendingWrites() {
+			_map = new Dictionary<Guid, Action<ClientMessage.WriteEventsCompleted>>();
+		}
+
+		public void CaptureCallback(Guid correlationId, Action<ClientMessage.WriteEventsCompleted> action) {
+			_map.Add(correlationId, action);
+		}
+
+		public void CompleteRequest(ClientMessage.WriteEventsCompleted message) {
+			Action<ClientMessage.WriteEventsCompleted> action;
+			if (_map.TryGetValue(message.CorrelationId, out action)) {
+				_map.Remove(message.CorrelationId);
+				action(message);
+			}
+		}
+	}
+
+	private class PendingReads {
+		private readonly HashSet<Guid> _pendingReads = new HashSet<Guid>();
+
+		public void Register(Guid id) {
+			_pendingReads.Add(id);
+		}
+
+		public bool IsRegistered(Guid id) {
+			var ret = _pendingReads.Contains(id);
+			return ret;
+		}
+
+		public void Remove(Guid id) {
+			_pendingReads.Remove(id);
+		}
+	}
+
+	private class WriterQueueSet {
+		private readonly Dictionary<Guid, WriterQueue> _queues;
+
+		public WriterQueueSet() {
+			_queues = new Dictionary<Guid, WriterQueue>();
+		}
+
+		public void AddToQueue(Guid key, ClientMessage.WriteEvents message) {
+			WriterQueue writerQueue;
+			if (!_queues.TryGetValue(key, out writerQueue)) {
+				writerQueue = new WriterQueue();
+				_queues.Add(key, writerQueue);
+			}
+
+			writerQueue.Enqueue(message);
+		}
+
+		public void Finish(Guid key) {
+			var queue = GetQueue(key);
+			if (queue == null)
+				return;
+			queue.IsBusy = false;
+
+			CleanupQueue(key, queue);
+		}
+
+		public bool IsBusy(Guid key) =>
+			GetQueue(key)?.IsBusy ?? false;
+
+		public bool HasPendingWrites(Guid key) =>
+			GetQueue(key)?.Count > 0;
+
+		public ClientMessage.WriteEvents Dequeue(Guid key) =>
+			GetQueue(key)?.Dequeue();
+
+		private WriterQueue GetQueue(Guid key) {
+			WriterQueue queue;
+			_queues.TryGetValue(key, out queue);
+			return queue;
+		}
+
+		private void CleanupQueue(Guid key, WriterQueue queue) {
+			if (queue.IsBusy)
+				return;
+			if (queue.Count > 0)
+				return;
+			_queues.Remove(key);
+		}
+	}
+
+	private class WriterQueue {
+		private readonly Queue<ClientMessage.WriteEvents> _queue;
+		public bool IsBusy;
+		public int Count => _queue.Count;
+
+		public WriterQueue() {
+			IsBusy = false;
+			_queue = new Queue<ClientMessage.WriteEvents>();
+		}
+
+		public void Enqueue(ClientMessage.WriteEvents message) {
+			_queue.Enqueue(message);
+		}
+
+		public ClientMessage.WriteEvents Dequeue() {
+			if (_queue.Count == 0)
+				return null;
+
+			IsBusy = true;
+
+			return _queue.Dequeue();
+		}
+	}
+
+	public Guid QueueWriteEvents(
+		Guid key,
+		string streamId,
+		long expectedVersion,
+		Event[] events,
+		ClaimsPrincipal principal,
+		Action<ClientMessage.WriteEventsCompleted> action) {
+		var corrId = Guid.NewGuid();
+
+		var message = new ClientMessage.WriteEvents(
+			corrId,
+			corrId,
+			Writer.Envelope,
+			false,
+			streamId,
+			expectedVersion,
+			events,
+			principal);
+		_requestTracker.QueuePendingWrite(key, corrId, action, message, Writer);
+
+		return corrId;
+	}
+
+	public Guid WriteEvent(
+		string streamId,
+		long expectedVersion,
+		Event @event,
+		ClaimsPrincipal principal,
+		Action<ClientMessage.WriteEventsCompleted> action) {
+		var corrId = Guid.NewGuid();
+		AddPendingRequest(corrId);
+		return
+			Writer.Publish(
+				new ClientMessage.WriteEvents(
+					corrId,
+					corrId,
+					Writer.Envelope,
+					false,
+					streamId,
+					expectedVersion,
+					new[] { @event },
+					principal),
+				res => {
+					RemovePendingRequest(res.CorrelationId);
+					action(res);
+				});
+	}
+
+	public Guid DeleteStream(
+		string streamId,
+		long expectedVersion,
+		bool hardDelete,
+		ClaimsPrincipal principal,
+		Action<ClientMessage.DeleteStreamCompleted> action) {
+		var corrId = Guid.NewGuid();
+		AddPendingRequest(corrId);
+		return StreamDeleter.Publish(
+			new ClientMessage.DeleteStream(
+				corrId,
+				corrId,
+				Writer.Envelope,
+				false,
+				streamId,
+				expectedVersion,
+				hardDelete,
+				principal),
+			res => {
+				RemovePendingRequest(res.CorrelationId);
+				action(res);
+			});
+	}
+
+	public void SubscribeAwake(
+		string streamId,
+		TFPos from,
+		Action<IODispatcherDelayedMessage> action,
+		Guid? correlationId = null) {
+		var corrId = correlationId ?? Guid.NewGuid();
+		AddPendingRequest(corrId);
+		Awaker.Publish(
+			new AwakeServiceMessage.SubscribeAwake(
+				Awaker.Envelope,
+				corrId,
+				streamId,
+				from,
+				new IODispatcherDelayedMessage(corrId, null)),
+			res => {
+				RemovePendingRequest(res.CorrelationId);
+				action(res);
+			});
+	}
+
+	public void UnsubscribeAwake(Guid correlationId) {
+		Awaker.Cancel(correlationId);
+	}
+
+	public void UpdateStreamAcl(
+		string streamId,
+		long expectedVersion,
+		ClaimsPrincipal principal,
+		StreamMetadata metadata,
+		Action<ClientMessage.WriteEventsCompleted> completed) {
+		WriteEvents(
+			SystemStreams.MetastreamOf(streamId),
+			expectedVersion,
+			new[] { new Event(Guid.NewGuid(), SystemEventTypes.StreamMetadata, true, metadata.ToJsonBytes(), null) },
+			principal,
+			completed);
+	}
+
+	public void Delay(TimeSpan delay, Action<Guid> timeout) {
+		_publisher.Publish(
+			TimerMessage.Schedule.Create(
+				delay,
+				_inputQueueEnvelope,
+				new IODispatcherDelayedMessage(_selfId, new AdHocCorrelatedTimeout(timeout))));
+	}
+
+	private void Delay(TimeSpan delay, ICorrelatedTimeout timeout, Guid messageCorrelationId) {
+		_publisher.Publish(
+			TimerMessage.Schedule.Create(
+				delay,
+				_inputQueueEnvelope,
+				new IODispatcherDelayedMessage(_selfId, timeout, messageCorrelationId)));
+	}
+
+	public void Handle(IODispatcherDelayedMessage message) {
+		if (_selfId != message.CorrelationId)
+			return;
+		message.Timeout();
+	}
+
+	public void Handle(ClientMessage.NotHandled message) {
+		// we do not remove the pending read here but only the pending request.
+		// the pending read will be removed when calling the timeout action
+		_requestTracker.RemovePendingRequest(message.CorrelationId);
+	}
+}
diff --git a/src/KurrentDB.Core/Helpers/IODispatcherAsync.cs b/src/KurrentDB.Core/Helpers/IODispatcherAsync.cs
new file mode 100644
index 00000000000..e13f0b616ab
--- /dev/null
+++ b/src/KurrentDB.Core/Helpers/IODispatcherAsync.cs
@@ -0,0 +1,340 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+
+namespace KurrentDB.Core.Helpers;
+
+public static class IODispatcherAsync {
+	public class CancellationScope {
+		private bool _cancelled = false;
+		private readonly HashSet<Guid> _ids = new HashSet<Guid>();
+
+		public Guid Register(Guid id) {
+			_ids.Add(id);
+			return id;
+		}
+
+		public bool Cancelled(Guid id) {
+			_ids.Remove(id);
+			return _cancelled;
+		}
+
+		public void Cancel() {
+			_cancelled = true;
+		}
+	}
+
+	public delegate void Step(IEnumerator<Step> nextSteps);
+
+	public static void Run(this IEnumerable<Step> actions) {
+		var actionsEnumerator = actions.GetEnumerator();
+		Run(actionsEnumerator);
+	}
+
+	public static void Run(this Step action) {
+		Run(new[] { action });
+	}
+
+	public static Step BeginReadForward(
+		this IODispatcher ioDispatcher,
+		CancellationScope cancellationScope,
+		string streamId,
+		long fromEventNumber,
+		int maxCount,
+		bool resolveLinks,
+		ClaimsPrincipal principal,
+		Action<ClientMessage.ReadStreamEventsForwardCompleted> handler,
+		Action timeoutHandler) {
+		return
+			steps => {
+				var corrId = Guid.NewGuid();
+				cancellationScope.Register(corrId);
+				ioDispatcher.ReadForward(
+					streamId,
+					fromEventNumber,
+					maxCount,
+					resolveLinks,
+					principal,
+					response => {
+						if (cancellationScope.Cancelled(response.CorrelationId))
+							return;
+						handler(response);
+						Run(steps);
+					},
+					() => {
+						if (cancellationScope.Cancelled(corrId))
+							return;
+						timeoutHandler();
+						Run(steps);
+					},
+					corrId);
+			};
+	}
+
+	public static Step BeginReadBackward(
+		this IODispatcher ioDispatcher,
+		CancellationScope cancellationScope,
+		string streamId,
+		long fromEventNumber,
+		int maxCount,
+		bool resolveLinks,
+		ClaimsPrincipal principal,
+		Action<ClientMessage.ReadStreamEventsBackwardCompleted> handler,
+		Action timeoutHandler) {
+		return
+			steps => {
+				var corrId = Guid.NewGuid();
+				cancellationScope.Register(corrId);
+				ioDispatcher.ReadBackward(
+					streamId,
+					fromEventNumber,
+					maxCount,
+					resolveLinks,
+					principal,
+					response => {
+						if (cancellationScope.Cancelled(response.CorrelationId))
+							return;
+						handler(response);
+						Run(steps);
+					},
+					() => {
+						if (cancellationScope.Cancelled(corrId))
+							return;
+						timeoutHandler();
+						Run(steps);
+					},
+					corrId);
+			};
+	}
+
+	public static Step BeginWriteEvents(
+		this IODispatcher ioDispatcher,
+		CancellationScope cancellationScope,
+		string streamId,
+		long expectedVersion,
+		ClaimsPrincipal principal,
+		Event[] events,
+		Action<ClientMessage.WriteEventsCompleted> handler) {
+		return
+			steps =>
+				WriteEventsWithRetry(ioDispatcher, cancellationScope, streamId, expectedVersion, principal, events,
+					handler, steps);
+	}
+
+	public static Step BeginDeleteStream(
+		this IODispatcher ioDispatcher,
+		CancellationScope cancellationScope,
+		string streamId,
+		long expectedVersion,
+		bool hardDelete,
+		ClaimsPrincipal principal,
+		Action<ClientMessage.DeleteStreamCompleted> handler) {
+		return
+			steps =>
+				DeleteStreamWithRetry(
+					ioDispatcher,
+					cancellationScope,
+					streamId,
+					expectedVersion,
+					hardDelete,
+					principal,
+					handler,
+					steps);
+	}
+
+	public static Step BeginSubscribeAwake(
+		this IODispatcher ioDispatcher,
+		CancellationScope cancellationScope,
+		string streamId,
+		TFPos from,
+		Action<IODispatcherDelayedMessage> handler,
+		Guid? correlationId = null) {
+		return steps => ioDispatcher.SubscribeAwake(
+			streamId,
+			@from,
+			message => {
+				if (cancellationScope.Cancelled(message.CorrelationId))
+					return;
+				handler(message);
+				Run(steps);
+			},
+			correlationId);
+	}
+
+	public static Step BeginUpdateStreamAcl(
+		this IODispatcher ioDispatcher,
+		CancellationScope cancellationScope,
+		string streamId,
+		long expectedVersion,
+		ClaimsPrincipal principal,
+		StreamMetadata metadata,
+		Action<ClientMessage.WriteEventsCompleted> handler) {
+		return
+			steps =>
+				UpdateStreamAclWithRetry(
+					ioDispatcher,
+					cancellationScope,
+					streamId,
+					expectedVersion,
+					principal,
+					metadata,
+					handler,
+					steps);
+	}
+
+	public static Step BeginDelay(
+		this IODispatcher ioDispatcher,
+		CancellationScope cancellationScope,
+		TimeSpan timeout,
+		Action handler) {
+		return steps => ioDispatcher.Delay(
+			timeout,
+			_ => {
+				if (cancellationScope.Cancelled(Guid.Empty))
+					return;
+				handler();
+				Run(steps);
+			});
+	}
+
+	private static void WriteEventsWithRetry(
+		this IODispatcher ioDispatcher,
+		CancellationScope cancellationScope,
+		string streamId,
+		long expectedVersion,
+		ClaimsPrincipal principal,
+		Event[] events,
+		Action<ClientMessage.WriteEventsCompleted> handler,
+		IEnumerator<Step> steps) {
+		PerformWithRetry(
+			ioDispatcher,
+			handler,
+			steps,
+			expectedVersion == ExpectedVersion.Any,
+			TimeSpan.FromMilliseconds(100),
+			action =>
+				cancellationScope.Register(
+					ioDispatcher.WriteEvents(
+						streamId,
+						expectedVersion,
+						events,
+						principal,
+						response => {
+							if (cancellationScope.Cancelled(response.CorrelationId))
+								return;
+							action(response, response.Result);
+						})));
+	}
+
+	private static void DeleteStreamWithRetry(
+		this IODispatcher ioDispatcher,
+		CancellationScope cancellationScope,
+		string streamId,
+		long expectedVersion,
+		bool hardDelete,
+		ClaimsPrincipal principal,
+		Action<ClientMessage.DeleteStreamCompleted> handler,
+		IEnumerator<Step> steps) {
+		PerformWithRetry(
+			ioDispatcher,
+			handler,
+			steps,
+			expectedVersion == ExpectedVersion.Any,
+			TimeSpan.FromMilliseconds(100),
+			action =>
+				cancellationScope.Register(
+					ioDispatcher.DeleteStream(
+						streamId,
+						expectedVersion,
+						hardDelete,
+						principal,
+						response => {
+							if (cancellationScope.Cancelled(response.CorrelationId))
+								return;
+							action(response, response.Result);
+						})));
+	}
+
+
+	private static void UpdateStreamAclWithRetry(
+		this IODispatcher ioDispatcher,
+		CancellationScope cancellationScope,
+		string streamId,
+		long expectedVersion,
+		ClaimsPrincipal principal,
+		StreamMetadata metadata,
+		Action<ClientMessage.WriteEventsCompleted> handler,
+		IEnumerator<Step> steps) {
+		PerformWithRetry(
+			ioDispatcher,
+			handler,
+			steps,
+			expectedVersion == ExpectedVersion.Any,
+			TimeSpan.FromMilliseconds(100),
+			action =>
+				cancellationScope.Register(
+					ioDispatcher.WriteEvents(
+						SystemStreams.MetastreamOf(streamId),
+						expectedVersion,
+						new[] {
+							new Event(Guid.NewGuid(), SystemEventTypes.StreamMetadata, true, metadata.ToJsonBytes(),
+								null)
+						},
+						principal,
+						response => {
+							if (cancellationScope.Cancelled(response.CorrelationId))
+								return;
+							action(response, response.Result);
+						})));
+	}
+
+	private static void PerformWithRetry<T>(
+		this IODispatcher ioDispatcher,
+		Action<T> handler,
+		IEnumerator<Step> steps,
+		bool retryExpectedVersion,
+		TimeSpan timeout,
+		Action<Action<T, OperationResult>> action) {
+		action(
+			(response, result) => {
+				if (ShouldRetry(result, retryExpectedVersion)) {
+					ioDispatcher.Delay(
+						timeout,
+						_ => {
+							if (timeout < TimeSpan.FromSeconds(10))
+								timeout += timeout;
+							PerformWithRetry(ioDispatcher, handler, steps, retryExpectedVersion, timeout, action);
+						});
+				} else {
+					handler(response);
+					Run(steps);
+				}
+			});
+	}
+
+	private static bool ShouldRetry(OperationResult result, bool retryExpectedVersion) {
+		switch (result) {
+			case OperationResult.CommitTimeout:
+			case OperationResult.ForwardTimeout:
+			case OperationResult.PrepareTimeout:
+				return true;
+			case OperationResult.WrongExpectedVersion:
+				return retryExpectedVersion;
+			default:
+				return false;
+		}
+	}
+
+	private static void Run(IEnumerator<Step> actions) {
+		if (actions.MoveNext()) {
+			var action = actions.Current;
+			action(actions);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Helpers/IODispatcherDelayedMessage.cs b/src/KurrentDB.Core/Helpers/IODispatcherDelayedMessage.cs
new file mode 100644
index 00000000000..f68392a61f2
--- /dev/null
+++ b/src/KurrentDB.Core/Helpers/IODispatcherDelayedMessage.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Helpers;
+
+[DerivedMessage(CoreMessage.IODispatcher)]
+public sealed partial class IODispatcherDelayedMessage : Message {
+	private readonly Guid _correlationId;
+	private readonly ICorrelatedTimeout _timeout;
+	private readonly Guid? _messageCorrelationId;
+
+	public IODispatcherDelayedMessage(Guid correlationId, ICorrelatedTimeout timeout) {
+		_timeout = timeout;
+		_correlationId = correlationId;
+	}
+
+	public IODispatcherDelayedMessage(Guid correlationId, ICorrelatedTimeout timeout, Guid messageCorrelationId) {
+		_timeout = timeout;
+		_correlationId = correlationId;
+		_messageCorrelationId = messageCorrelationId;
+	}
+
+	public void Timeout() {
+		_timeout.Timeout(_messageCorrelationId ?? Guid.Empty);
+	}
+
+	public Guid CorrelationId {
+		get { return _correlationId; }
+	}
+
+	public Guid? MessageCorrelationId {
+		get { return _messageCorrelationId; }
+	}
+}
diff --git a/src/KurrentDB.Core/Helpers/LengthPrefixSuffixFramer.cs b/src/KurrentDB.Core/Helpers/LengthPrefixSuffixFramer.cs
new file mode 100644
index 00000000000..1fc6c3cb2ff
--- /dev/null
+++ b/src/KurrentDB.Core/Helpers/LengthPrefixSuffixFramer.cs
@@ -0,0 +1,125 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Transport.Tcp.Framing;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Helpers;
+
+public sealed class LengthPrefixSuffixFramer : IAsyncMessageFramer<ReadOnlySequence<byte>> {
+	private static readonly ILogger Log = Serilog.Log.ForContext<LengthPrefixSuffixFramer>();
+
+	private const int PrefixLength = sizeof(int);
+
+	public bool HasData {
+		get { return _memStream.Length > 0; }
+	}
+
+	private readonly int _maxPackageSize;
+	private Func<ReadOnlySequence<byte>, CancellationToken, ValueTask> _packageHandler = static (_, _) => ValueTask.CompletedTask;
+
+	private readonly MemoryStream _memStream;
+
+	private int _prefixBytes;
+	private int _packageLength;
+
+	public LengthPrefixSuffixFramer(int maxPackageSize = TFConsts.MaxLogRecordSize) {
+		Ensure.Positive(maxPackageSize, "maxPackageSize");
+
+		_maxPackageSize = maxPackageSize;
+		_memStream = new MemoryStream();
+	}
+
+	public void Reset() {
+		_memStream.SetLength(0);
+		_prefixBytes = 0;
+		_packageLength = 0;
+	}
+
+	public async ValueTask UnFrameData(IEnumerable<ArraySegment<byte>> data, CancellationToken token) {
+		Ensure.NotNull(data, nameof(data));
+
+		foreach (ArraySegment<byte> buffer in data) {
+			await Parse(buffer, token);
+		}
+	}
+
+	public void RegisterMessageArrivedCallback(Func<ReadOnlySequence<byte>, CancellationToken, ValueTask> packageHandler) {
+		Ensure.NotNull(packageHandler, nameof(packageHandler));
+		_packageHandler = packageHandler;
+	}
+
+	public ValueTask UnFrameData(ArraySegment<byte> data, CancellationToken token) => Parse(data, token);
+
+	// Parses a stream chunking based on length-prefixed-suffixed framing. Calls are re-entrant and hold state internally.
+	private async ValueTask Parse(ArraySegment<byte> bytes, CancellationToken token) {
+		byte[] data = bytes.Array;
+		Debug.Assert(data is not null);
+
+		for (int i = bytes.Offset; i < bytes.Offset + bytes.Count;) {
+			if (_prefixBytes < PrefixLength) {
+				_packageLength |= (data[i] << (_prefixBytes * 8)); // little-endian order
+				_prefixBytes += 1;
+				i += 1;
+				if (_prefixBytes == PrefixLength) {
+					if (_packageLength <= 0 || _packageLength > _maxPackageSize) {
+						Log.Error("FRAMING ERROR! Data:\n{data}", Helper.FormatBinaryDump(bytes));
+						throw new PackageFramingException(string.Format(
+							"Package size is out of bounds: {0} (max: {1}).",
+							_packageLength, _maxPackageSize));
+					}
+
+					_packageLength += PrefixLength; // we need to read suffix as well
+				}
+			} else {
+				int copyCnt = Math.Min(bytes.Count + bytes.Offset - i, _packageLength - (int)_memStream.Length);
+				_memStream.Write(data, i, copyCnt);
+				i += copyCnt;
+
+				if (_memStream.Length == _packageLength) {
+					byte[] buf;
+					var messageLength = _packageLength - PrefixLength;
+#if DEBUG
+					buf = _memStream.GetBuffer();
+					int suffixLength = (buf[_packageLength - 4] << 0)
+									   | (buf[_packageLength - 3] << 8)
+									   | (buf[_packageLength - 2] << 16)
+									   | (buf[_packageLength - 1] << 24);
+					if (messageLength != suffixLength) {
+						throw new Exception(string.Format("Prefix length: {0} is not equal to suffix length: {1}.",
+							messageLength, suffixLength));
+					}
+#endif
+					_memStream.SetLength(messageLength); // remove suffix length
+					_memStream.Position = 0;
+					buf = _memStream.GetBuffer();
+
+					await _packageHandler(new(buf, 0, messageLength), token);
+
+					_memStream.SetLength(0);
+					_prefixBytes = 0;
+					_packageLength = 0;
+				}
+			}
+		}
+	}
+
+	public IEnumerable<ArraySegment<byte>> FrameData(ArraySegment<byte> data) {
+		var length = data.Count;
+
+		var lengthArray = new ArraySegment<byte>(
+			[(byte)length, (byte)(length >> 8), (byte)(length >> 16), (byte)(length >> 24)]);
+		yield return lengthArray;
+		yield return data;
+		yield return lengthArray;
+	}
+}
diff --git a/src/KurrentDB.Core/Helpers/NoOpAction.cs b/src/KurrentDB.Core/Helpers/NoOpAction.cs
new file mode 100644
index 00000000000..0ba62792b5b
--- /dev/null
+++ b/src/KurrentDB.Core/Helpers/NoOpAction.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Helpers;
+
+public class NoOpAction {
+	public static Action Instance { get; } = () => { };
+}
+
+public class NoOpAction<T> {
+	public static Action<T> Instance { get; } = _ => { };
+}
+
+public static class ActionExtensions {
+	public static Action OrNoOp(this Action self) => self ?? NoOpAction.Instance;
+	public static Action<T> OrNoOp<T>(this Action<T> self) => self ?? NoOpAction<T>.Instance;
+}
diff --git a/src/KurrentDB.Core/Helpers/ReadStreamEventsBackwardHandlers.cs b/src/KurrentDB.Core/Helpers/ReadStreamEventsBackwardHandlers.cs
new file mode 100644
index 00000000000..74c080e7e4d
--- /dev/null
+++ b/src/KurrentDB.Core/Helpers/ReadStreamEventsBackwardHandlers.cs
@@ -0,0 +1,107 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using static KurrentDB.Core.Helpers.IODispatcher;
+
+namespace KurrentDB.Core.Helpers;
+
+public interface IReadStreamEventsBackwardHandler :
+	IHandle<ClientMessage.ReadStreamEventsBackwardCompleted>,
+	IHandleAlt<ClientMessage.NotHandled>,
+	IHandleTimeout {
+}
+
+public static class ReadStreamEventsBackwardHandlers {
+	// Adds and removes from a tracker so it knows what is outstanding
+	public class Tracking : IReadStreamEventsBackwardHandler {
+		private readonly Guid _correlationId;
+		private readonly RequestTracking _requestTracker;
+		private readonly IReadStreamEventsBackwardHandler _wrapped;
+
+		public Tracking(
+			Guid correlationId,
+			RequestTracking requestTracker,
+			IReadStreamEventsBackwardHandler wrapped) {
+
+			Ensure.NotNull(requestTracker, nameof(requestTracker));
+			Ensure.NotNull(wrapped, nameof(wrapped));
+
+			_correlationId = correlationId;
+			_requestTracker = requestTracker;
+			_wrapped = wrapped;
+
+			_requestTracker.AddPendingRead(correlationId);
+		}
+
+		public bool HandlesAlt => _wrapped.HandlesAlt;
+		public bool HandlesTimeout => _wrapped.HandlesTimeout;
+
+		public void Handle(ClientMessage.ReadStreamEventsBackwardCompleted message) {
+			if (_requestTracker.RemovePendingRead(message.CorrelationId)) {
+				_wrapped.Handle(message);
+			}
+		}
+
+		public void Handle(ClientMessage.NotHandled message) {
+			if (_requestTracker.RemovePendingRead(message.CorrelationId)) {
+				_wrapped.Handle(message);
+			}
+		}
+
+		public void Timeout() {
+			if (_requestTracker.RemovePendingRead(_correlationId)) {
+				_wrapped.Timeout();
+			}
+		}
+	}
+
+	// todo: move away from this and towards bespoke implementations (like AuthReadResponseHandler) to avoid having to
+	// allocate all these delegates
+	public class AdHoc : IReadStreamEventsBackwardHandler {
+		private readonly Action<ClientMessage.ReadStreamEventsBackwardCompleted> _handled;
+		private readonly Action<ClientMessage.NotHandled> _notHandled;
+		private readonly Action _timedout;
+
+		public AdHoc(
+			Action<ClientMessage.ReadStreamEventsBackwardCompleted> handled,
+			Action<ClientMessage.NotHandled> notHandled,
+			Action timedout) {
+
+			Ensure.NotNull(handled, nameof(handled));
+
+			HandlesAlt = notHandled is not null;
+			HandlesTimeout = timedout is not null;
+			_handled = handled;
+			_notHandled = notHandled.OrNoOp();
+			_timedout = timedout.OrNoOp();
+		}
+
+		public bool HandlesAlt { get; }
+		public bool HandlesTimeout { get; }
+
+		public void Handle(ClientMessage.ReadStreamEventsBackwardCompleted message) {
+			_handled(message);
+		}
+
+		public void Handle(ClientMessage.NotHandled message) {
+			_notHandled(message);
+		}
+
+		public void Timeout() {
+			_timedout();
+		}
+	}
+
+	// Assumes the request will eventually receive a reponse of the expected type
+	// And not be dropped due to timeout or responded to with a different message
+	public class Optimistic : AdHoc {
+		public Optimistic(
+			Action<ClientMessage.ReadStreamEventsBackwardCompleted> handle) : base(
+				handle, null, null) {
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Helpers/ReusableBuffer.cs b/src/KurrentDB.Core/Helpers/ReusableBuffer.cs
new file mode 100644
index 00000000000..0a68859a88f
--- /dev/null
+++ b/src/KurrentDB.Core/Helpers/ReusableBuffer.cs
@@ -0,0 +1,74 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+namespace KurrentDB.Core.Helpers;
+
+// Thread-safe reusable buffer: similar concept as an ArrayPool<byte> but has only one buffer and one user at a time.
+// If used correctly, there should not be any contention since there can be only one user of the buffer at a time.
+// However, some synchronization is done since the AcquireAs*() and Release() methods are allowed to be called from
+// different threads.
+public class ReusableBuffer {
+	private byte[] _buffer;
+	private int _state;
+
+	private enum State {
+		Free = 0,
+		LockedToAcquire = 1,
+		Acquired = 2,
+	}
+
+	public ReusableBuffer(int defaultSize) {
+		if (defaultSize <= 0)
+			throw new ArgumentOutOfRangeException(nameof(defaultSize), "default size must be positive");
+
+		_buffer = new byte[ClosestPowerOf2(defaultSize)];
+		_state = (int)State.Free;
+	}
+
+	private static int ClosestPowerOf2(int x) {
+		int y = 0;
+		while (x > 0) {
+			x >>= 1;
+			y++;
+		}
+
+		if (y >= 31)
+			throw new ArgumentOutOfRangeException();
+
+		return 1 << y;
+	}
+
+	// Note: The acquired buffer size can be larger than the requested size
+	// It is better to use AcquireAsSpan() or AcquireAsMemory() where possible.
+	public byte[] AcquireAsByteArray(int size) {
+		if (size <= 0)
+			throw new ArgumentOutOfRangeException(nameof(size), "size must be positive");
+
+		TrySwitchState(State.Free, State.LockedToAcquire);
+
+		if (_buffer.Length < size)
+			_buffer = new byte[ClosestPowerOf2(size)];
+
+		TrySwitchState(State.LockedToAcquire, State.Acquired);
+		return _buffer;
+	}
+
+	public Span<byte> AcquireAsSpan(int size) => AcquireAsByteArray(size).AsSpan(0, size);
+
+	public Memory<byte> AcquireAsMemory(int size) => AcquireAsByteArray(size).AsMemory(0, size);
+
+	public void Release() {
+		TrySwitchState(State.Acquired, State.Free);
+	}
+
+	[MethodImpl(MethodImplOptions.AggressiveInlining)]
+	private void TrySwitchState(State from, State to) {
+		var was = (State)Interlocked.CompareExchange(ref _state, (int)to, (int)from);
+		if (was != from)
+			throw new InvalidOperationException($"Failed to transition buffer from state: {from} to {to}. Was {was}.");
+	}
+}
diff --git a/src/KurrentDB.Core/Helpers/StreamVersionConverter.cs b/src/KurrentDB.Core/Helpers/StreamVersionConverter.cs
new file mode 100644
index 00000000000..63f21b54ed1
--- /dev/null
+++ b/src/KurrentDB.Core/Helpers/StreamVersionConverter.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Helpers;
+
+public static class StreamVersionConverter {
+	public static int Downgrade(long expectedVersion) {
+		if (expectedVersion == long.MaxValue) {
+			return int.MaxValue;
+		}
+
+		return (int)expectedVersion;
+	}
+
+	public static long Upgrade(long expectedVersion) {
+		return expectedVersion == int.MaxValue ? long.MaxValue : expectedVersion;
+	}
+}
diff --git a/src/KurrentDB.Core/IClusterVNodeStartupTask.cs b/src/KurrentDB.Core/IClusterVNodeStartupTask.cs
new file mode 100644
index 00000000000..7df36ded4b8
--- /dev/null
+++ b/src/KurrentDB.Core/IClusterVNodeStartupTask.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core;
+
+// Implementations of this interface are run to completion during startup
+public interface IClusterVNodeStartupTask {
+	ValueTask Run(CancellationToken token);
+}
diff --git a/src/KurrentDB.Core/IInternalStartup.cs b/src/KurrentDB.Core/IInternalStartup.cs
new file mode 100644
index 00000000000..b61466657b1
--- /dev/null
+++ b/src/KurrentDB.Core/IInternalStartup.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace KurrentDB.Core;
+
+public interface IInternalStartup {
+	void Configure(WebApplication app);
+	void ConfigureServices(IServiceCollection services);
+}
diff --git a/src/KurrentDB.Core/Index/AddResult.cs b/src/KurrentDB.Core/Index/AddResult.cs
new file mode 100644
index 00000000000..1d205ecb1c1
--- /dev/null
+++ b/src/KurrentDB.Core/Index/AddResult.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Index;
+
+public class AddResult {
+	public readonly IndexMap NewMap;
+	public readonly bool CanMergeAny;
+
+	public AddResult(IndexMap newMap, bool canMergeAny) {
+		NewMap = newMap;
+		CanMergeAny = canMergeAny;
+	}
+}
diff --git a/src/KurrentDB.Core/Index/FileType.cs b/src/KurrentDB.Core/Index/FileType.cs
new file mode 100644
index 00000000000..85c00600caf
--- /dev/null
+++ b/src/KurrentDB.Core/Index/FileType.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Index;
+
+public enum FileType : byte {
+	PTableFile = 1,
+	ChunkFile = 2
+}
diff --git a/src/KurrentDB.Core/Index/GuidFilenameProvider.cs b/src/KurrentDB.Core/Index/GuidFilenameProvider.cs
new file mode 100644
index 00000000000..a00b5167e52
--- /dev/null
+++ b/src/KurrentDB.Core/Index/GuidFilenameProvider.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+
+namespace KurrentDB.Core.Index;
+
+public class GuidFilenameProvider : IIndexFilenameProvider {
+	private readonly string _directory;
+
+	public GuidFilenameProvider(string directory) {
+		_directory = directory;
+	}
+
+	public string GetFilenameNewTable() {
+		return Path.Combine(_directory, Guid.NewGuid().ToString());
+	}
+}
diff --git a/src/KurrentDB.Core/Index/HashListMemTable.cs b/src/KurrentDB.Core/Index/HashListMemTable.cs
new file mode 100644
index 00000000000..4772181bf61
--- /dev/null
+++ b/src/KurrentDB.Core/Index/HashListMemTable.cs
@@ -0,0 +1,341 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Threading;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Exceptions;
+
+namespace KurrentDB.Core.Index;
+
+public class HashListMemTable : IMemTable {
+	private static readonly IComparer<Entry> MemTableComparer = new EventNumberComparer();
+	private static readonly IComparer<Entry> LogPosComparer = new LogPositionComparer();
+	private static readonly TimeSpan DefaultLockTimeout = TimeSpan.FromMilliseconds(10_000);
+
+	public long Count {
+		get { return _count; }
+	}
+
+	public Guid Id {
+		get { return _id; }
+	}
+
+	public byte Version {
+		get { return _version; }
+	}
+
+	private readonly ConcurrentDictionary<ulong, EntryList> _hash;
+	private readonly Guid _id = Guid.NewGuid();
+	private readonly byte _version;
+	private int _count;
+
+	private int _isConverting;
+
+	public HashListMemTable(byte version, int maxSize) {
+		_version = version;
+		_hash = new();
+	}
+
+	public bool MarkForConversion() {
+		return Interlocked.CompareExchange(ref _isConverting, 1, 0) == 0;
+	}
+
+	public void Add(ulong stream, long version, long position) {
+		AddEntries([new IndexEntry(stream, version, position)]);
+	}
+
+	public void AddEntries(IReadOnlyList<IndexEntry> entries) {
+		Ensure.NotNull(entries, "entries");
+		Ensure.Positive(entries.Count, "entries.Count");
+
+		var collection = entries.Select(x => new IndexEntry(GetHash(x.Stream), x.Version, x.Position)).ToList();
+
+		// only one thread at a time can write
+		Interlocked.Add(ref _count, collection.Count);
+
+		var stream = collection[0].Stream; // NOTE: all entries should have the same stream
+		EntryList list = null;
+		try {
+
+			if (!_hash.TryGetValue(stream, out list)) {
+				list = new(MemTableComparer);
+				if (!list.Lock.TryEnterWriteLock(DefaultLockTimeout))
+					throw new UnableToAcquireLockInReasonableTimeException();
+				_hash.AddOrUpdate(stream, list,
+					(x, y) => {
+						throw new Exception("This should never happen as MemTable updates are single-threaded.");
+					});
+			} else {
+				if (!list.Lock.TryEnterWriteLock(DefaultLockTimeout))
+					throw new UnableToAcquireLockInReasonableTimeException();
+			}
+
+			for (int i = 0, n = collection.Count; i < n; ++i) {
+				var entry = collection[i];
+				if (entry.Stream != stream)
+					throw new Exception("Not all index entries in a bulk have the same stream hash.");
+				Ensure.Nonnegative(entry.Version, "entry.Version");
+				Ensure.Nonnegative(entry.Position, "entry.Position");
+				list.Add(new Entry(entry.Version, entry.Position), 0);
+			}
+		} finally {
+			list?.Lock.Release();
+		}
+	}
+
+	public bool TryGetOneValue(ulong stream, long number, out long position) {
+		ArgumentOutOfRangeException.ThrowIfNegative(number);
+		ulong hash = GetHash(stream);
+
+		position = 0;
+
+		if (_hash.TryGetValue(hash, out var list)) {
+			if (!list.Lock.TryEnterReadLock(DefaultLockTimeout))
+				throw new UnableToAcquireLockInReasonableTimeException();
+			try {
+				int endIdx = list.UpperBound(new Entry(number, long.MaxValue));
+				if (endIdx is -1)
+					return false;
+
+				var key = list.Keys[endIdx];
+				if (key.EvNum == number) {
+					position = key.LogPos;
+					return true;
+				}
+			} finally {
+				list.Lock.Release();
+			}
+		}
+
+		return false;
+	}
+
+	public bool TryGetLatestEntry(ulong stream, out IndexEntry entry) {
+		ulong hash = GetHash(stream);
+		entry = TableIndex.InvalidIndexEntry;
+
+		if (_hash.TryGetValue(hash, out var list)) {
+			if (!list.Lock.TryEnterReadLock(DefaultLockTimeout))
+				throw new UnableToAcquireLockInReasonableTimeException();
+			try {
+				var latest = list.Keys[list.Count - 1];
+				entry = new IndexEntry(hash, latest.EvNum, latest.LogPos);
+				return true;
+			} finally {
+				list.Lock.Release();
+			}
+		}
+
+		return false;
+	}
+
+	public async ValueTask<IndexEntry?> TryGetLatestEntry(ulong stream, long beforePosition, Func<IndexEntry, CancellationToken, ValueTask<bool>> isForThisStream, CancellationToken token) {
+		ArgumentOutOfRangeException.ThrowIfNegative(beforePosition);
+
+		ulong hash = GetHash(stream);
+
+		if (!_hash.TryGetValue(hash, out var list))
+			return null;
+
+		if (!await list.Lock.TryEnterReadLockAsync(DefaultLockTimeout, token))
+			throw new UnableToAcquireLockInReasonableTimeException();
+
+		try {
+			// we use LogPosComparer here so that it only compares the position part of the key we
+			// are passing in and not the evNum (maxvalue) which is meaningless
+			int endIdx = await list.UpperBound(
+				key: new Entry(long.MaxValue, beforePosition - 1),
+				comparer: LogPosComparer,
+				continueSearch: (e, token) => isForThisStream(new IndexEntry(hash, e.EvNum, e.LogPos), token),
+				token);
+
+			if (endIdx is -1)
+				return null;
+
+			var latestBeforePosition = list.Keys[endIdx];
+			return new(hash, latestBeforePosition.EvNum, latestBeforePosition.LogPos);
+		} catch (SearchStoppedException) {
+			// fall back to linear search if there was a hash collision
+			int maxIdx = await list.FindMax(async (e, token) =>
+				e.LogPos < beforePosition &&
+				await isForThisStream(new IndexEntry(hash, e.EvNum, e.LogPos), token),
+				token);
+
+			if (maxIdx is -1)
+				return null;
+
+			var latestBeforePosition = list.Keys[maxIdx];
+			return new(hash, latestBeforePosition.EvNum, latestBeforePosition.LogPos);
+		} finally {
+			list.Lock.Release();
+		}
+	}
+
+	public bool TryGetOldestEntry(ulong stream, out IndexEntry entry) {
+		ulong hash = GetHash(stream);
+		entry = TableIndex.InvalidIndexEntry;
+
+		if (_hash.TryGetValue(hash, out var list)) {
+			if (!list.Lock.TryEnterReadLock(DefaultLockTimeout))
+				throw new UnableToAcquireLockInReasonableTimeException();
+			try {
+				var oldest = list.Keys[0];
+				entry = new IndexEntry(hash, oldest.EvNum, oldest.LogPos);
+				return true;
+			} finally {
+				list.Lock.Release();
+			}
+		}
+
+		return false;
+	}
+
+	public bool TryGetNextEntry(ulong stream, long afterNumber, out IndexEntry entry) {
+		ArgumentOutOfRangeException.ThrowIfNegative(afterNumber);
+
+		ulong hash = GetHash(stream);
+		entry = TableIndex.InvalidIndexEntry;
+
+		if (afterNumber >= long.MaxValue)
+			return false;
+
+		if (_hash.TryGetValue(hash, out var list)) {
+			if (!list.Lock.TryEnterReadLock(DefaultLockTimeout))
+				throw new UnableToAcquireLockInReasonableTimeException();
+			try {
+				int endIdx = list.LowerBound(new Entry(afterNumber + 1, 0));
+				if (endIdx is -1)
+					return false;
+
+				var e = list.Keys[endIdx];
+				entry = new IndexEntry(hash, e.EvNum, e.LogPos);
+				return true;
+			} finally {
+				list.Lock.Release();
+			}
+		}
+
+		return false;
+	}
+
+	public bool TryGetPreviousEntry(ulong stream, long beforeNumber, out IndexEntry entry) {
+		ArgumentOutOfRangeException.ThrowIfNegative(beforeNumber);
+
+		ulong hash = GetHash(stream);
+		entry = TableIndex.InvalidIndexEntry;
+
+		if (beforeNumber <= 0)
+			return false;
+
+		if (_hash.TryGetValue(hash, out var list)) {
+			if (!list.Lock.TryEnterReadLock(DefaultLockTimeout))
+				throw new UnableToAcquireLockInReasonableTimeException();
+			try {
+				int endIdx = list.UpperBound(new Entry(beforeNumber - 1, long.MaxValue));
+				if (endIdx is -1)
+					return false;
+
+				var e = list.Keys[endIdx];
+				entry = new IndexEntry(hash, e.EvNum, e.LogPos);
+				return true;
+			} finally {
+				list.Lock.Release();
+			}
+		}
+
+		return false;
+	}
+
+	public IEnumerable<IndexEntry> IterateAllInOrder() {
+		//Log.Trace("Sorting array in HashListMemTable.IterateAllInOrder...");
+
+		var keys = _hash.Keys.ToArray();
+		Array.Sort(keys, new ReverseComparer<ulong>());
+
+		foreach (var key in keys) {
+			var list = _hash[key];
+			for (int i = list.Count - 1; i >= 0; --i) {
+				var x = list.Keys[i];
+				yield return new IndexEntry(key, x.EvNum, x.LogPos);
+			}
+		}
+
+		//Log.Trace("Sorting array in HashListMemTable.IterateAllInOrder... DONE!");
+	}
+
+	public void Clear() {
+		_hash.Clear();
+	}
+
+	public IReadOnlyList<IndexEntry> GetRange(ulong stream, long startNumber, long endNumber, int? limit = null) {
+		ArgumentOutOfRangeException.ThrowIfNegative(startNumber);
+		ArgumentOutOfRangeException.ThrowIfNegative(endNumber);
+
+		ulong hash = GetHash(stream);
+		var ret = new List<IndexEntry>();
+
+		if (_hash.TryGetValue(hash, out var list)) {
+			if (!list.Lock.TryEnterReadLock(DefaultLockTimeout))
+				throw new UnableToAcquireLockInReasonableTimeException();
+			try {
+				var endIdx = list.UpperBound(new Entry(endNumber, long.MaxValue));
+				for (int i = endIdx; i >= 0; i--) {
+					var key = list.Keys[i];
+					if (key.EvNum < startNumber || ret.Count == limit)
+						break;
+					ret.Add(new IndexEntry(hash, version: key.EvNum, position: key.LogPos));
+				}
+			} finally {
+				list.Lock.Release();
+			}
+		}
+
+		return ret;
+	}
+
+	private ulong GetHash(ulong hash) {
+		return _version is PTableVersions.IndexV1 ? hash >> 32 : hash;
+	}
+
+	private readonly record struct Entry(long EvNum, long LogPos);
+
+	private sealed class EntryList(IComparer<Entry> comparer) : SortedList<Entry, byte>(comparer) {
+		internal readonly AsyncReaderWriterLock Lock = new();
+	}
+
+	private class EventNumberComparer : IComparer<Entry> {
+		public int Compare(Entry x, Entry y) {
+			if (x.EvNum < y.EvNum)
+				return -1;
+			if (x.EvNum > y.EvNum)
+				return 1;
+			if (x.LogPos < y.LogPos)
+				return -1;
+			if (x.LogPos > y.LogPos)
+				return 1;
+			return 0;
+		}
+	}
+
+	private class LogPositionComparer : IComparer<Entry> {
+		public int Compare(Entry x, Entry y) {
+			if (x.LogPos < y.LogPos)
+				return -1;
+			if (x.LogPos > y.LogPos)
+				return 1;
+			return 0;
+		}
+	}
+}
+
+public class ReverseComparer<T> : IComparer<T> where T : IComparable {
+	public int Compare(T x, T y) {
+		return -x.CompareTo(y);
+	}
+}
diff --git a/src/KurrentDB.Core/Index/Hashes/CompositeHasher.cs b/src/KurrentDB.Core/Index/Hashes/CompositeHasher.cs
new file mode 100644
index 00000000000..20e98ef8e2b
--- /dev/null
+++ b/src/KurrentDB.Core/Index/Hashes/CompositeHasher.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Index.Hashes;
+
+public class CompositeHasher<T> : ILongHasher<T> {
+	private readonly IHasher<T> _lowHasher;
+	private readonly IHasher<T> _highHasher;
+
+	public CompositeHasher(IHasher<T> lowHasher, IHasher<T> highHasher) {
+		_lowHasher = lowHasher;
+		_highHasher = highHasher;
+	}
+
+	public ulong Hash(T x) {
+		// same way around as Tableindex for consistency.
+		return (ulong)_lowHasher.Hash(x) << 32 | _highHasher.Hash(x);
+	}
+}
diff --git a/src/KurrentDB.Core/Index/Hashes/IHasher.cs b/src/KurrentDB.Core/Index/Hashes/IHasher.cs
new file mode 100644
index 00000000000..8e93762b153
--- /dev/null
+++ b/src/KurrentDB.Core/Index/Hashes/IHasher.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Index.Hashes;
+
+public interface IHasher {
+	uint Hash(byte[] data);
+	uint Hash(byte[] data, int offset, uint len, uint seed);
+	uint Hash(ReadOnlySpan<byte> data);
+}
+
+public interface IHasher<TStreamId> {
+	uint Hash(TStreamId s);
+}
+
+public interface ILongHasher<T> {
+	ulong Hash(T x);
+}
diff --git a/src/KurrentDB.Core/Index/Hashes/Murmur2Unsafe.cs b/src/KurrentDB.Core/Index/Hashes/Murmur2Unsafe.cs
new file mode 100644
index 00000000000..15e4985f076
--- /dev/null
+++ b/src/KurrentDB.Core/Index/Hashes/Murmur2Unsafe.cs
@@ -0,0 +1,86 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Index.Hashes;
+
+public class Murmur2Unsafe : IHasher, IHasher<string> {
+	private const uint Seed = 0xc58f1a7b;
+
+	private const UInt32 m = 0x5bd1e995;
+	private const Int32 r = 24;
+
+	public unsafe UInt32 Hash(string s) {
+		fixed (char* input = s) {
+			return Hash((byte*)input, (uint)s.Length * sizeof(char), Seed);
+		}
+	}
+
+	public unsafe uint Hash(byte[] data) {
+		fixed (byte* input = &data[0]) {
+			return Hash(input, (uint)data.Length, Seed);
+		}
+	}
+
+	public unsafe uint Hash(byte[] data, int offset, uint len, uint seed) {
+		fixed (byte* input = &data[offset]) {
+			return Hash(input, len, seed);
+		}
+	}
+
+	public unsafe uint Hash(ReadOnlySpan<byte> data) {
+		fixed (byte* input = data) {
+			return Hash(input, (uint)data.Length, Seed);
+		}
+	}
+
+	private unsafe static uint Hash(byte* data, uint len, uint seed) {
+		UInt32 h = seed ^ len;
+		UInt32 numberOfLoops = len >> 2; // div 4
+
+		UInt32* realData = (UInt32*)data;
+		while (numberOfLoops > 0) {
+			UInt32 k = *realData;
+
+			k *= m;
+			k ^= k >> r;
+			k *= m;
+
+			h *= m;
+			h ^= k;
+
+			realData++;
+			numberOfLoops--;
+		}
+
+		var tail = (byte*)realData;
+		switch (len & 3) // mod 4
+		{
+			case 3:
+				h ^= (uint)(tail[2] << 16);
+				h ^= (uint)(tail[1] << 8);
+				h ^= tail[0];
+				h *= m;
+				break;
+			case 2:
+				h ^= (uint)(tail[1] << 8);
+				h ^= tail[0];
+				h *= m;
+				break;
+			case 1:
+				h ^= tail[0];
+				h *= m;
+				break;
+		}
+
+		// Do a few final mixes of the hash to ensure the last few
+		// bytes are well-incorporated.
+
+		h ^= h >> 13;
+		h *= m;
+		h ^= h >> 15;
+
+		return h;
+	}
+}
diff --git a/src/KurrentDB.Core/Index/Hashes/Murmur3AUnsafe.cs b/src/KurrentDB.Core/Index/Hashes/Murmur3AUnsafe.cs
new file mode 100644
index 00000000000..1b7c4db8f23
--- /dev/null
+++ b/src/KurrentDB.Core/Index/Hashes/Murmur3AUnsafe.cs
@@ -0,0 +1,99 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Index.Hashes;
+
+public class Murmur3AUnsafe : IHasher, IHasher<string> {
+	private readonly uint _seed;
+
+	private const UInt32 c1 = 0xcc9e2d51;
+	private const UInt32 c2 = 0x1b873593;
+
+	public Murmur3AUnsafe(uint seed = 0xc58f1a7b) {
+		_seed = seed;
+	}
+
+	public unsafe UInt32 Hash(string s) {
+		fixed (char* input = s) {
+			return Hash((byte*)input, (uint)s.Length * sizeof(char), _seed);
+		}
+	}
+
+	public unsafe uint Hash(byte[] data) {
+		fixed (byte* input = &data[0]) {
+			return Hash(input, (uint)data.Length, _seed);
+		}
+	}
+
+	public unsafe uint Hash(byte[] data, int offset, uint len, uint seed) {
+		fixed (byte* input = &data[offset]) {
+			return Hash(input, len, seed);
+		}
+	}
+
+	public unsafe uint Hash(ReadOnlySpan<byte> data) {
+		fixed (byte* input = data) {
+			return Hash(input, (uint)data.Length, _seed);
+		}
+	}
+
+	private unsafe static uint Hash(byte* data, uint len, uint seed) {
+		UInt32 nblocks = len / 4;
+		UInt32 h1 = seed;
+
+		//----------
+		// body
+
+		UInt32 k1;
+		UInt32* block = (UInt32*)data;
+		for (UInt32 i = nblocks; i > 0; --i, ++block) {
+			k1 = *block;
+
+			k1 *= c1;
+			k1 = Rotl32(k1, 15);
+			k1 *= c2;
+
+			h1 ^= k1;
+			h1 = Rotl32(h1, 13);
+			h1 = h1 * 5 + 0xe6546b64;
+		}
+
+		//----------
+		// tail
+
+
+		k1 = 0;
+		uint rem = len & 3;
+		byte* tail = (byte*)block;
+		if (rem >= 3)
+			k1 ^= (uint)(tail[2] << 16);
+		if (rem >= 2)
+			k1 ^= (uint)(tail[1] << 8);
+		if (rem > 0) {
+			k1 ^= tail[0];
+			k1 *= c1;
+			k1 = Rotl32(k1, 15);
+			k1 *= c2;
+			h1 ^= k1;
+		}
+
+		//----------
+		// finalization
+
+		h1 ^= len;
+
+		h1 ^= h1 >> 16;
+		h1 *= 0x85ebca6b;
+		h1 ^= h1 >> 13;
+		h1 *= 0xc2b2ae35;
+		h1 ^= h1 >> 16;
+
+		return h1;
+	}
+
+	private static UInt32 Rotl32(UInt32 x, int r) {
+		return (x << r) | (x >> (32 - r));
+	}
+}
diff --git a/src/KurrentDB.Core/Index/Hashes/XXHashUnsafe.cs b/src/KurrentDB.Core/Index/Hashes/XXHashUnsafe.cs
new file mode 100644
index 00000000000..b01a418e26a
--- /dev/null
+++ b/src/KurrentDB.Core/Index/Hashes/XXHashUnsafe.cs
@@ -0,0 +1,151 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Index.Hashes;
+
+public class XXHashUnsafe : IHasher, IHasher<string> {
+	private readonly uint _seed;
+
+	private const uint PRIME1 = 2654435761U;
+	private const uint PRIME2 = 2246822519U;
+	private const uint PRIME3 = 3266489917U;
+	private const uint PRIME4 = 668265263U;
+	private const int PRIME5 = 0x165667b1;
+
+	public XXHashUnsafe(uint seed = 0xc58f1a7b) {
+		_seed = seed;
+	}
+
+	public unsafe UInt32 Hash(string s) {
+		fixed (char* input = s) {
+			return Hash((byte*)input, (uint)s.Length * sizeof(char), _seed);
+		}
+	}
+
+	public unsafe uint Hash(byte[] data) {
+		fixed (byte* input = &data[0]) {
+			return Hash(input, (uint)data.Length, _seed);
+		}
+	}
+
+	public unsafe uint Hash(byte[] data, int offset, uint len, uint seed) {
+		fixed (byte* input = &data[offset]) {
+			return Hash(input, len, seed);
+		}
+	}
+
+	public unsafe uint Hash(ReadOnlySpan<byte> data) {
+		fixed (byte* input = data) {
+			return Hash(input, (uint)data.Length, _seed);
+		}
+	}
+
+	private unsafe static uint Hash(byte* data, uint len, uint seed) {
+		if (len < 16)
+			return HashSmall(data, len, seed);
+
+		uint v1 = seed + PRIME1;
+		uint v2 = v1 * PRIME2 + len;
+		uint v3 = v2 * PRIME3;
+		uint v4 = v3 * PRIME4;
+
+		uint* p = (uint*)data;
+		uint* limit = (uint*)(data + len - 16);
+
+		while (p < limit) {
+			v1 += Rotl32(v1, 13);
+			v1 *= PRIME1;
+			v1 += *p;
+			p++;
+			v2 += Rotl32(v2, 11);
+			v2 *= PRIME1;
+			v2 += *p;
+			p++;
+			v3 += Rotl32(v3, 17);
+			v3 *= PRIME1;
+			v3 += *p;
+			p++;
+			v4 += Rotl32(v4, 19);
+			v4 *= PRIME1;
+			v4 += *p;
+			p++;
+		}
+
+		p = limit;
+		v1 += Rotl32(v1, 17);
+		v2 += Rotl32(v2, 19);
+		v3 += Rotl32(v3, 13);
+		v4 += Rotl32(v4, 11);
+		v1 *= PRIME1;
+		v2 *= PRIME1;
+		v3 *= PRIME1;
+		v4 *= PRIME1;
+		v1 += *p;
+		p++;
+		v2 += *p;
+		p++;
+		v3 += *p;
+		p++;
+		v4 += *p;
+		v1 *= PRIME2;
+		v2 *= PRIME2;
+		v3 *= PRIME2;
+		v4 *= PRIME2;
+		v1 += Rotl32(v1, 11);
+		v2 += Rotl32(v2, 17);
+		v3 += Rotl32(v3, 19);
+		v4 += Rotl32(v4, 13);
+		v1 *= PRIME3;
+		v2 *= PRIME3;
+		v3 *= PRIME3;
+		v4 *= PRIME3;
+
+		uint crc = v1 + Rotl32(v2, 3) + Rotl32(v3, 6) + Rotl32(v4, 9);
+		crc ^= crc >> 11;
+		crc += (PRIME4 + len) * PRIME1;
+		crc ^= crc >> 15;
+		crc *= PRIME2;
+		crc ^= crc >> 13;
+		return crc;
+	}
+
+	private unsafe static uint HashSmall(byte* data, uint len, uint seed) {
+		byte* p = data;
+		byte* bEnd = data + len;
+		byte* limit = bEnd - 4;
+
+		uint idx = seed + PRIME1;
+		uint crc = PRIME5;
+
+		while (p < limit) {
+			crc += (*(uint*)p) + idx;
+			idx++;
+			crc += Rotl32(crc, 17) * PRIME4;
+			crc *= PRIME1;
+			p += 4;
+		}
+
+		while (p < bEnd) {
+			crc += (*p) + idx;
+			idx++;
+			crc *= PRIME1;
+			p++;
+		}
+
+		crc += len;
+
+		crc ^= crc >> 15;
+		crc *= PRIME2;
+		crc ^= crc >> 13;
+		crc *= PRIME3;
+		crc ^= crc >> 16;
+
+		return crc;
+	}
+
+	private static UInt32 Rotl32(UInt32 x, int r) {
+		return (x << r) | (x >> (32 - r));
+	}
+}
diff --git a/src/KurrentDB.Core/Index/IIndexFilenameProvider.cs b/src/KurrentDB.Core/Index/IIndexFilenameProvider.cs
new file mode 100644
index 00000000000..adcd6460e3b
--- /dev/null
+++ b/src/KurrentDB.Core/Index/IIndexFilenameProvider.cs
@@ -0,0 +1,8 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Index;
+
+public interface IIndexFilenameProvider {
+	string GetFilenameNewTable();
+}
diff --git a/src/KurrentDB.Core/Index/IIndexScavengerLog.cs b/src/KurrentDB.Core/Index/IIndexScavengerLog.cs
new file mode 100644
index 00000000000..0489fc5518c
--- /dev/null
+++ b/src/KurrentDB.Core/Index/IIndexScavengerLog.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Index;
+
+public interface IIndexScavengerLog {
+	void IndexTableScavenged(int level, int index, TimeSpan elapsed, long entriesDeleted, long entriesKept,
+		long spaceSaved);
+
+	void IndexTableNotScavenged(int level, int index, TimeSpan elapsed, long entriesKept, string errorMessage);
+}
diff --git a/src/KurrentDB.Core/Index/IMemTable.cs b/src/KurrentDB.Core/Index/IMemTable.cs
new file mode 100644
index 00000000000..df2b74eeca9
--- /dev/null
+++ b/src/KurrentDB.Core/Index/IMemTable.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+
+namespace KurrentDB.Core.Index;
+
+public interface IMemTable : ISearchTable {
+	bool MarkForConversion();
+	void Add(ulong stream, long version, long position);
+	void AddEntries(IReadOnlyList<IndexEntry> entries);
+}
diff --git a/src/KurrentDB.Core/Index/ISearchTable.cs b/src/KurrentDB.Core/Index/ISearchTable.cs
new file mode 100644
index 00000000000..95241a92021
--- /dev/null
+++ b/src/KurrentDB.Core/Index/ISearchTable.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core.Index;
+
+public interface ISearchTable {
+	Guid Id { get; }
+	long Count { get; }
+	byte Version { get; }
+
+	bool TryGetOneValue(ulong stream, long number, out long position);
+	bool TryGetLatestEntry(ulong stream, out IndexEntry entry);
+	ValueTask<IndexEntry?> TryGetLatestEntry(ulong stream, long beforePosition, Func<IndexEntry, CancellationToken, ValueTask<bool>> isForThisStream, CancellationToken token);
+	bool TryGetOldestEntry(ulong stream, out IndexEntry entry);
+	bool TryGetNextEntry(ulong stream, long afterVersion, out IndexEntry entry);
+	bool TryGetPreviousEntry(ulong stream, long beforeVersion, out IndexEntry entry);
+	IReadOnlyList<IndexEntry> GetRange(ulong stream, long startNumber, long endNumber, int? limit = null);
+	IEnumerable<IndexEntry> IterateAllInOrder();
+}
diff --git a/src/KurrentDB.Core/Index/ITableIndex.cs b/src/KurrentDB.Core/Index/ITableIndex.cs
new file mode 100644
index 00000000000..e01c728d5db
--- /dev/null
+++ b/src/KurrentDB.Core/Index/ITableIndex.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core.Index;
+
+public interface ITableIndex {
+	long CommitCheckpoint { get; }
+	long PrepareCheckpoint { get; }
+
+	void Initialize(long chaserCheckpoint);
+	void Close(bool removeFiles = true);
+
+	// this overload keeps IndexEntries that exist in the log
+	ValueTask Scavenge(IIndexScavengerLog log, CancellationToken ct);
+	// this overload keeps IndexEntries that pass the keep predicate
+	ValueTask Scavenge(Func<IndexEntry, CancellationToken, ValueTask<bool>> shouldKeep, IIndexScavengerLog log, CancellationToken ct);
+	Task MergeIndexes();
+	IEnumerable<ISearchTable> IterateAllInOrder();
+	bool IsBackgroundTaskRunning { get; }
+}
+
+public interface ITableIndex<TStreamId> : ITableIndex {
+	void Add(long commitPos, TStreamId streamId, long version, long position);
+	void AddEntries(long commitPos, IList<IndexKey<TStreamId>> entries);
+
+	bool TryGetOneValue(TStreamId streamId, long version, out long position);
+	bool TryGetLatestEntry(TStreamId streamId, out IndexEntry entry);
+	ValueTask<IndexEntry?> TryGetLatestEntry(ulong stream, long beforePosition, Func<IndexEntry, CancellationToken, ValueTask<bool>> isForThisStream, CancellationToken token);
+	ValueTask<IndexEntry?> TryGetLatestEntry(TStreamId streamId, long beforePosition, Func<IndexEntry, CancellationToken, ValueTask<bool>> isForThisStream, CancellationToken token);
+	bool TryGetOldestEntry(TStreamId streamId, out IndexEntry entry);
+	bool TryGetNextEntry(TStreamId streamId, long afterVersion, out IndexEntry entry);
+	bool TryGetNextEntry(ulong stream, long afterVersion, out IndexEntry entry);
+	bool TryGetPreviousEntry(TStreamId streamId, long beforeVersion, out IndexEntry entry);
+	bool TryGetPreviousEntry(ulong stream, long beforeVersion, out IndexEntry entry);
+
+	IReadOnlyList<IndexEntry> GetRange(TStreamId streamId, long startVersion, long endVersion, int? limit = null);
+	IReadOnlyList<IndexEntry> GetRange(ulong stream, long startVersion, long endVersion, int? limit = null);
+
+	void WaitForBackgroundTasks(int millisecondsTimeout);
+}
diff --git a/src/KurrentDB.Core/Index/IndexEntry.cs b/src/KurrentDB.Core/Index/IndexEntry.cs
new file mode 100644
index 00000000000..ec4e396c924
--- /dev/null
+++ b/src/KurrentDB.Core/Index/IndexEntry.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace KurrentDB.Core.Index;
+
+[StructLayout(LayoutKind.Explicit)]
+public unsafe struct IndexEntry : IComparable<IndexEntry>, IEquatable<IndexEntry> {
+	[FieldOffset(0)] public fixed byte Bytes[24];
+	[FieldOffset(0)] public Int64 Version;
+	[FieldOffset(8)] public UInt64 Stream;
+	[FieldOffset(16)] public Int64 Position;
+
+	public IndexEntry(ulong stream, long version, long position) : this() {
+		Stream = stream;
+		Version = version;
+		Position = position;
+	}
+
+	public int CompareTo(IndexEntry other) {
+		var keyCmp = Stream.CompareTo(other.Stream);
+		if (keyCmp != 0)
+			return keyCmp;
+
+		keyCmp = Version.CompareTo(other.Version);
+		if (keyCmp != 0)
+			return keyCmp;
+
+		return Position.CompareTo(other.Position);
+	}
+
+	public bool Equals(IndexEntry other) {
+		return (Stream == other.Stream && Version == other.Version) && Position == other.Position;
+	}
+
+	public override string ToString() {
+		return string.Format("Stream: {0}, Version: {1}, Position: {2}", Stream, Version, Position);
+	}
+}
diff --git a/src/KurrentDB.Core/Index/IndexEntryV1.cs b/src/KurrentDB.Core/Index/IndexEntryV1.cs
new file mode 100644
index 00000000000..6d74ad7a184
--- /dev/null
+++ b/src/KurrentDB.Core/Index/IndexEntryV1.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace KurrentDB.Core.Index;
+
+[StructLayout(LayoutKind.Explicit)]
+public unsafe struct IndexEntryV1 : IComparable<IndexEntryV1>, IEquatable<IndexEntryV1> {
+	[FieldOffset(0)] public UInt64 Key;
+	[FieldOffset(0)] public fixed byte Bytes[16];
+	[FieldOffset(0)] public Int32 Version;
+	[FieldOffset(4)] public UInt32 Stream;
+	[FieldOffset(8)] public Int64 Position;
+
+	public IndexEntryV1(ulong key, long position) : this() {
+		Key = key;
+		Position = position;
+	}
+
+	public IndexEntryV1(uint stream, int version, long position) : this() {
+		Stream = stream;
+		Version = version;
+		Position = position;
+	}
+
+	public int CompareTo(IndexEntryV1 other) {
+		var keyCmp = Key.CompareTo(other.Key);
+		if (keyCmp != 0)
+			return keyCmp;
+		return Position.CompareTo(other.Position);
+	}
+
+	public bool Equals(IndexEntryV1 other) {
+		return Key == other.Key && Position == other.Position;
+	}
+
+	public override string ToString() {
+		return string.Format("Key: {0}, Stream: {1}, Version: {2}, Position: {3}", Key, Stream, Version, Position);
+	}
+}
diff --git a/src/KurrentDB.Core/Index/IndexEntryV2.cs b/src/KurrentDB.Core/Index/IndexEntryV2.cs
new file mode 100644
index 00000000000..7f13d123b0d
--- /dev/null
+++ b/src/KurrentDB.Core/Index/IndexEntryV2.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace KurrentDB.Core.Index;
+
+[StructLayout(LayoutKind.Explicit)]
+public unsafe struct IndexEntryV2 : IComparable<IndexEntryV2>, IEquatable<IndexEntryV2> {
+	[FieldOffset(0)] public fixed byte Bytes[20];
+	[FieldOffset(0)] public Int32 Version;
+	[FieldOffset(4)] public UInt64 Stream;
+	[FieldOffset(12)] public Int64 Position;
+
+	public IndexEntryV2(ulong stream, int version, long position) : this() {
+		Stream = stream;
+		Version = version;
+		Position = position;
+	}
+
+	public int CompareTo(IndexEntryV2 other) {
+		var keyCmp = Stream.CompareTo(other.Stream);
+		if (keyCmp == 0) {
+			keyCmp = Version.CompareTo(other.Version);
+			if (keyCmp != 0)
+				return keyCmp;
+		}
+
+		if (keyCmp != 0)
+			return keyCmp;
+		return Position.CompareTo(other.Position);
+	}
+
+	public bool Equals(IndexEntryV2 other) {
+		return (Stream == other.Stream && Version == other.Version) && Position == other.Position;
+	}
+
+	public override string ToString() {
+		return string.Format("Stream: {0}, Version: {1}, Position: {2}", Stream, Version, Position);
+	}
+}
diff --git a/src/KurrentDB.Core/Index/IndexKey.cs b/src/KurrentDB.Core/Index/IndexKey.cs
new file mode 100644
index 00000000000..ae27a2cce52
--- /dev/null
+++ b/src/KurrentDB.Core/Index/IndexKey.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Index;
+
+public struct IndexKey<TStreamId> {
+	public TStreamId StreamId;
+	public long Version;
+	public long Position;
+	public ulong Hash;
+
+	public IndexKey(TStreamId streamId, long version, long position) : this(streamId, version, position, 0) {
+	}
+
+	public IndexKey(TStreamId streamId, long version, long position, ulong hash) {
+		StreamId = streamId;
+		Version = version;
+		Position = position;
+
+		Hash = hash;
+	}
+}
diff --git a/src/KurrentDB.Core/Index/IndexMap.cs b/src/KurrentDB.Core/Index/IndexMap.cs
new file mode 100644
index 00000000000..65053373e6e
--- /dev/null
+++ b/src/KurrentDB.Core/Index/IndexMap.cs
@@ -0,0 +1,554 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.Settings;
+using KurrentDB.Core.Util;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Index;
+
+public class IndexMap {
+	private static readonly ILogger Log = Serilog.Log.ForContext<IndexMap>();
+
+	public const int IndexMapVersion = 2;
+
+	public readonly int Version;
+
+	public readonly long PrepareCheckpoint;
+	public readonly long CommitCheckpoint;
+
+	private readonly List<List<PTable>> _map;
+	private readonly int _maxTablesPerLevel;
+	private readonly int _maxTableLevelsForAutomaticMerge;
+	private readonly int _pTableMaxReaderCount;
+
+	private IndexMap(int version, List<List<PTable>> tables, long prepareCheckpoint, long commitCheckpoint,
+		int maxTablesPerLevel, int maxTableLevelsForAutomaticMerge, int pTableMaxReaderCount) {
+		Ensure.Nonnegative(version, "version");
+		if (prepareCheckpoint < -1)
+			throw new ArgumentOutOfRangeException("prepareCheckpoint");
+		if (commitCheckpoint < -1)
+			throw new ArgumentOutOfRangeException("commitCheckpoint");
+		if (maxTablesPerLevel <= 1)
+			throw new ArgumentOutOfRangeException("maxTablesPerLevel");
+
+		Version = version;
+
+		PrepareCheckpoint = prepareCheckpoint;
+		CommitCheckpoint = commitCheckpoint;
+
+		_map = CopyFrom(tables);
+		_maxTablesPerLevel = maxTablesPerLevel;
+		_maxTableLevelsForAutomaticMerge = maxTableLevelsForAutomaticMerge;
+		_pTableMaxReaderCount = pTableMaxReaderCount;
+		VerifyStructure();
+	}
+
+	private static List<List<PTable>> CopyFrom(List<List<PTable>> tables) {
+		var tmp = new List<List<PTable>>();
+		for (int i = 0; i < tables.Count; i++) {
+			tmp.Add(new List<PTable>(tables[i]));
+		}
+
+		return tmp;
+	}
+
+	private void VerifyStructure() {
+		if (_map.SelectMany(level => level).Any(item => item == null))
+			throw new CorruptIndexException("Internal indexmap structure corruption.");
+	}
+
+	private static void AddTableToTables(List<List<PTable>> tables, int level, PTable table) {
+		while (level >= tables.Count) {
+			tables.Add(new List<PTable>());
+		}
+
+		var innerTables = tables[level] ?? (tables[level] = new List<PTable>());
+
+		innerTables.Add(table);
+	}
+
+	private static void InsertTableToTables(List<List<PTable>> tables, int level, int position, PTable table) {
+		while (level >= tables.Count)
+			tables.Add(new List<PTable>());
+
+		var innerTables = tables[level] ?? (tables[level] = new List<PTable>());
+
+		while (position >= innerTables.Count)
+			innerTables.Add(null);
+
+		innerTables[position] = table;
+	}
+
+	public IEnumerable<PTable> InOrder() {
+		var map = _map;
+		// level 0 (newest tables) -> N (oldest tables)
+		for (int i = 0; i < map.Count; ++i) {
+			// last in the level's list (newest on level) -> to first (oldest on level)
+			for (int j = map[i].Count - 1; j >= 0; --j) {
+				yield return map[i][j];
+			}
+		}
+	}
+
+	public IEnumerable<PTable> InReverseOrder() {
+		var map = _map;
+		// N (oldest tables) -> level 0 (newest tables)
+		for (int i = map.Count - 1; i >= 0; --i) {
+			// from first (oldest on level) in the level's list -> last in the level's list (newest on level)
+			for (int j = 0, n = map[i].Count; j < n; ++j) {
+				yield return map[i][j];
+			}
+		}
+	}
+
+	public IEnumerable<string> GetAllFilenames() {
+		return from level in _map
+			   from table in level
+			   select table.Filename;
+	}
+
+	public static IndexMap CreateEmpty(int maxTablesPerLevel, int maxTableLevelsForAutomaticMerge, int pTableMaxReaderCount) {
+		return new IndexMap(IndexMapVersion, new List<List<PTable>>(), -1, -1, maxTablesPerLevel,
+			maxTableLevelsForAutomaticMerge, pTableMaxReaderCount);
+	}
+
+	public static IndexMap FromFile(
+		string filename,
+		int maxTablesPerLevel,
+		bool loadPTables,
+		int cacheDepth,
+		bool skipIndexVerify,
+		bool useBloomFilter,
+		int lruCacheSize,
+		int threads,
+		int maxAutoMergeLevel,
+		int pTableMaxReaderCount) {
+		if (!File.Exists(filename))
+			return CreateEmpty(maxTablesPerLevel, maxAutoMergeLevel, pTableMaxReaderCount);
+
+		using (var f = File.OpenRead(filename)) {
+			// calculate real MD5 hash except first 32 bytes which are string representation of stored hash
+			f.Position = 32;
+			var realHash = MD5Hash.GetHashFor(f);
+			f.Position = 0;
+
+			using (var reader = new StreamReader(f)) {
+				ReadAndCheckHash(reader, realHash);
+
+				// at this point we can assume the format is ok, so actually no need to check errors.
+				var version = ReadVersion(reader);
+
+				var checkpoints = ReadCheckpoints(reader);
+				var prepareCheckpoint = checkpoints.PreparePosition;
+				var commitCheckpoint = checkpoints.CommitPosition;
+				if (version > 1) {
+					var tmpMaxAutoMergeLevel = ReadMaxAutoMergeLevel(reader);
+					if (tmpMaxAutoMergeLevel < maxAutoMergeLevel)
+						throw new CorruptIndexException(
+							$"Index map has lower maximum auto merge level ({tmpMaxAutoMergeLevel}) than is currently configured ({maxAutoMergeLevel}) and the index will need to be rebuilt");
+
+					maxAutoMergeLevel = Math.Min(maxAutoMergeLevel, tmpMaxAutoMergeLevel);
+				}
+
+				//we are doing a logical upgrade of the version to have the new data, so we will change the version to match so that new files are saved with the right version
+				version = IndexMapVersion;
+				var tables = loadPTables
+					? LoadPTables(reader, filename, checkpoints, cacheDepth, skipIndexVerify, useBloomFilter, lruCacheSize, threads, pTableMaxReaderCount)
+					: new List<List<PTable>>();
+
+				if (!loadPTables && reader.ReadLine() != null)
+					throw new CorruptIndexException(
+						string.Format("Negative prepare/commit checkpoint in non-empty IndexMap: {0}.",
+							checkpoints));
+
+				return new IndexMap(version, tables, prepareCheckpoint, commitCheckpoint, maxTablesPerLevel,
+					maxAutoMergeLevel, pTableMaxReaderCount);
+			}
+		}
+	}
+
+	private static void ReadAndCheckHash(TextReader reader, byte[] realHash) {
+		// read stored MD5 hash and convert it from string to byte array
+		string text;
+		if ((text = reader.ReadLine()) == null)
+			throw new CorruptIndexException("IndexMap file is empty.");
+		if (text.Length != 32 || !text.All(x => char.IsDigit(x) || (x >= 'A' && x <= 'F')))
+			throw new CorruptIndexException(string.Format("Corrupted IndexMap MD5 hash. Hash ({0}): {1}.",
+				text.Length, text));
+
+		// check expected and real hashes are the same
+		var expectedHash = new byte[16];
+		for (int i = 0; i < 16; ++i) {
+			expectedHash[i] = Convert.ToByte(text.Substring(i * 2, 2), 16);
+		}
+
+		if (expectedHash.Length != realHash.Length) {
+			throw new CorruptIndexException(
+				string.Format("Hash validation error (different hash sizes).\n"
+							  + "Expected hash ({0}): {1}, real hash ({2}): {3}.",
+					expectedHash.Length, BitConverter.ToString(expectedHash),
+					realHash.Length, BitConverter.ToString(realHash)));
+		}
+
+		for (int i = 0; i < realHash.Length; ++i) {
+			if (expectedHash[i] != realHash[i]) {
+				throw new CorruptIndexException(
+					string.Format("Hash validation error (different hashes).\n"
+								  + "Expected hash ({0}): {1}, real hash ({2}): {3}.",
+						expectedHash.Length, BitConverter.ToString(expectedHash),
+						realHash.Length, BitConverter.ToString(realHash)));
+			}
+		}
+	}
+
+	private static int ReadVersion(TextReader reader) {
+		string text;
+		if ((text = reader.ReadLine()) == null)
+			throw new CorruptIndexException("Corrupted version.");
+		return int.Parse(text);
+	}
+
+	private static TFPos ReadCheckpoints(TextReader reader) {
+		// read and check prepare/commit checkpoint
+		string text;
+		if ((text = reader.ReadLine()) == null)
+			throw new CorruptIndexException("Corrupted commit checkpoint.");
+		try {
+			long prepareCheckpoint;
+			long commitCheckpoint;
+			var checkpoints = text.Split('/');
+			if (!long.TryParse(checkpoints[0], out prepareCheckpoint) || prepareCheckpoint < -1)
+				throw new CorruptIndexException(string.Format("Invalid prepare checkpoint: {0}.", checkpoints[0]));
+			if (!long.TryParse(checkpoints[1], out commitCheckpoint) || commitCheckpoint < -1)
+				throw new CorruptIndexException(string.Format("Invalid commit checkpoint: {0}.", checkpoints[1]));
+			return new TFPos(commitCheckpoint, prepareCheckpoint);
+		} catch (Exception exc) {
+			throw new CorruptIndexException("Corrupted prepare/commit checkpoints pair.", exc);
+		}
+	}
+
+	private static int ReadMaxAutoMergeLevel(TextReader reader) {
+		if (!(reader.ReadLine() is string text && int.TryParse(text, out var maxAutoMergeLevel)))
+			throw new CorruptIndexException("Corrupted auto merge level.");
+		return maxAutoMergeLevel;
+	}
+
+	private static IEnumerable<string> GetAllLines(StreamReader reader) {
+		// all next lines are PTables sorted by levels
+		string text;
+		while ((text = reader.ReadLine()) != null) {
+			yield return text;
+		}
+	}
+
+	private static List<List<PTable>> LoadPTables(StreamReader reader, string indexmapFilename, TFPos checkpoints,
+		int cacheDepth, bool skipIndexVerify,
+		bool useBloomFilter, int lruCacheSize,
+		int threads,
+		int pTableMaxReaderCount) {
+		var tables = new List<List<PTable>>();
+		try {
+			try {
+				Parallel.ForEach(
+					GetAllLines(reader)
+						.Reverse(), // Reverse so we load the highest levels (biggest files) first - ensures we use concurrency in the most efficient way.
+					new ParallelOptions { MaxDegreeOfParallelism = threads },
+					indexMapEntry => {
+						if (checkpoints.PreparePosition < 0 || checkpoints.CommitPosition < 0)
+							throw new CorruptIndexException(
+								string.Format("Negative prepare/commit checkpoint in non-empty IndexMap: {0}.",
+									checkpoints));
+
+						PTable ptable = null;
+						var pieces = indexMapEntry.Split(',');
+						try {
+							var level = int.Parse(pieces[0]);
+							var position = int.Parse(pieces[1]);
+							var file = pieces[2];
+							var path = Path.GetDirectoryName(indexmapFilename);
+							var ptablePath = Path.Combine(path, file);
+
+							ptable = PTable.FromFile(ptablePath, ESConsts.PTableInitialReaderCount, pTableMaxReaderCount, cacheDepth, skipIndexVerify, useBloomFilter, lruCacheSize);
+
+							lock (tables) {
+								InsertTableToTables(tables, level, position, ptable);
+							}
+						} catch (Exception) {
+							// if PTable file path was correct, but data is corrupted, we still need to dispose opened streams
+							if (ptable != null)
+								ptable.Dispose();
+
+							throw;
+						}
+					});
+
+				// Verify map is correct
+				for (int i = 0; i < tables.Count; ++i) {
+					for (int j = 0; j < tables[i].Count; ++j) {
+						if (tables[i][j] == null) {
+							throw new CorruptIndexException(
+								$"indexmap is missing contiguous level,position {i},{j}");
+						}
+					}
+				}
+			} catch (AggregateException aggEx) {
+				// We only care that *something* has gone wrong, throw the first exception
+				throw aggEx.InnerException;
+			}
+		} catch (Exception exc) {
+			// also dispose all previously loaded correct PTables
+			for (int i = 0; i < tables.Count; ++i) {
+				for (int j = 0; j < tables[i].Count; ++j) {
+					if (tables[i][j] != null)
+						tables[i][j].Dispose();
+				}
+			}
+
+			throw new CorruptIndexException("Error while loading IndexMap.", exc);
+		}
+
+		return tables;
+	}
+
+	public void SaveToFile(string filename) {
+		var tmpIndexMap = string.Format("{0}.{1}.indexmap.tmp", filename, Guid.NewGuid());
+
+		using (var memStream = new MemoryStream())
+		using (var memWriter = new StreamWriter(memStream)) {
+			memWriter.WriteLine(new string('0', 32)); // pre-allocate space for MD5 hash
+			memWriter.WriteLine(Version);
+			memWriter.WriteLine("{0}/{1}", PrepareCheckpoint, CommitCheckpoint);
+			memWriter.WriteLine(_maxTableLevelsForAutomaticMerge);
+			for (int i = 0; i < _map.Count; i++) {
+				for (int j = 0; j < _map[i].Count; j++) {
+					memWriter.WriteLine("{0},{1},{2}", i, j, new FileInfo(_map[i][j].Filename).Name);
+				}
+			}
+
+			memWriter.Flush();
+
+			memStream.Position = 32;
+			var hash = MD5Hash.GetHashFor(memStream);
+
+			memStream.Position = 0;
+			foreach (var t in hash) {
+				memWriter.Write(t.ToString("X2"));
+			}
+
+			memWriter.Flush();
+
+			memStream.Position = 0;
+			using (var f = File.OpenWrite(tmpIndexMap)) {
+				f.Write(memStream.GetBuffer(), 0, (int)memStream.Length);
+				f.FlushToDisk();
+			}
+		}
+
+		int trial = 0;
+		int maxTrials = 5;
+		while (trial < maxTrials) {
+			Action<Exception> errorHandler = ex => {
+				Log.Error("Failed trial to replace indexmap {indexMap} with {tmpIndexMap}.", filename, tmpIndexMap);
+				Log.Error("Exception: {e}", ex);
+				trial += 1;
+			};
+			try {
+				if (File.Exists(filename)) {
+					File.SetAttributes(filename, FileAttributes.Normal);
+					File.Delete(filename);
+				}
+
+				File.Move(tmpIndexMap, filename);
+				break;
+			} catch (IOException exc) {
+				errorHandler(exc);
+				if (trial >= maxTrials) {
+					WindowsProcessUtil.PrintWhoIsLocking(tmpIndexMap, Log);
+					WindowsProcessUtil.PrintWhoIsLocking(filename, Log);
+				}
+			} catch (UnauthorizedAccessException exc) {
+				errorHandler(exc);
+			}
+		}
+	}
+
+	public AddResult AddPTable(PTable tableToAdd,
+		long prepareCheckpoint,
+		long commitCheckpoint) {
+		Ensure.NotNull(tableToAdd, "tableToAdd");
+		Ensure.Nonnegative(prepareCheckpoint, "prepareCheckpoint");
+		Ensure.Nonnegative(commitCheckpoint, "commitCheckpoint");
+
+		var tables = CopyFrom(_map);
+		AddTableToTables(tables, 0, tableToAdd);
+
+		var indexMap = new IndexMap(Version, tables, prepareCheckpoint, commitCheckpoint, _maxTablesPerLevel,
+			_maxTableLevelsForAutomaticMerge, _pTableMaxReaderCount);
+
+		var canMergeAny = false;
+		var maxTableLevelsToMerge = Math.Min(tables.Count, _maxTableLevelsForAutomaticMerge);
+		for (int level = 0; level < maxTableLevelsToMerge; level++) {
+			if (tables[level].Count >= _maxTablesPerLevel) {
+				canMergeAny = true;
+				break;
+			}
+		}
+
+		return new AddResult(indexMap, canMergeAny);
+	}
+
+	public MergeResult TryMergeOneLevel(
+		IIndexFilenameProvider filenameProvider,
+		byte version,
+		int indexCacheDepth = 16,
+		bool skipIndexVerify = false,
+		bool useBloomFilter = true,
+		int lruCacheSize = 1_000_000) {
+
+		var tables = CopyFrom(_map);
+
+		var hasMergedAny = false;
+		var canMergeAny = false;
+		var toDelete = new List<PTable>();
+		var maxTableLevelsToMerge = Math.Min(tables.Count, _maxTableLevelsForAutomaticMerge);
+		for (int level = 0; level < maxTableLevelsToMerge; level++) {
+			if (tables[level].Count >= _maxTablesPerLevel) {
+				if (hasMergedAny) {
+					canMergeAny = true;
+					break;
+				}
+				var filename = filenameProvider.GetFilenameNewTable();
+				PTable mergedTable = PTable.MergeTo(
+					tables[level],
+					filename,
+					version,
+					ESConsts.PTableInitialReaderCount,
+					_pTableMaxReaderCount,
+					indexCacheDepth,
+					skipIndexVerify,
+					useBloomFilter,
+					lruCacheSize);
+				hasMergedAny = true;
+
+				AddTableToTables(tables, level + 1, mergedTable);
+				toDelete.AddRange(tables[level]);
+				tables[level].Clear();
+			}
+		}
+
+		var indexMap = new IndexMap(Version, tables, PrepareCheckpoint, CommitCheckpoint, _maxTablesPerLevel,
+			_maxTableLevelsForAutomaticMerge, _pTableMaxReaderCount);
+		return new MergeResult(indexMap, toDelete, hasMergedAny, canMergeAny);
+	}
+
+	public MergeResult TryManualMerge(
+		IIndexFilenameProvider filenameProvider,
+		byte version,
+		int indexCacheDepth = 16,
+		bool skipIndexVerify = false,
+		bool useBloomFilter = true,
+		int lruCacheSize = 1_000_000) {
+
+		var tables = CopyFrom(_map);
+
+		if (tables.Count <= _maxTableLevelsForAutomaticMerge) {
+			return new MergeResult(this, new List<PTable>(), false, false);
+		}
+
+		var toDelete = new List<PTable>();
+		var tablesToMerge = tables.Skip(_maxTableLevelsForAutomaticMerge).SelectMany(a => a).ToList();
+		if (tablesToMerge.Count == 1)
+			return new MergeResult(this, new List<PTable>(), false, false);
+
+		var filename = filenameProvider.GetFilenameNewTable();
+		PTable mergedTable = PTable.MergeTo(
+			tablesToMerge,
+			filename,
+			version,
+			ESConsts.PTableInitialReaderCount,
+			_pTableMaxReaderCount,
+			indexCacheDepth,
+			skipIndexVerify,
+			useBloomFilter,
+			lruCacheSize);
+
+		for (int i = tables.Count - 1; i > _maxTableLevelsForAutomaticMerge; i--) {
+			tables.RemoveAt(i);
+		}
+
+		tables[_maxTableLevelsForAutomaticMerge].Clear();
+		AddTableToTables(tables, _maxTableLevelsForAutomaticMerge + 1, mergedTable);
+		toDelete.AddRange(tablesToMerge);
+
+		var indexMap = new IndexMap(Version, tables, PrepareCheckpoint, CommitCheckpoint, _maxTablesPerLevel,
+			_maxTableLevelsForAutomaticMerge, _pTableMaxReaderCount);
+		return new MergeResult(indexMap, toDelete, true, false);
+	}
+
+	public async ValueTask<ScavengeResult> Scavenge(Guid toScavenge, CancellationToken ct,
+		Func<IndexEntry, CancellationToken, ValueTask<bool>> shouldKeep,
+		IIndexFilenameProvider filenameProvider,
+		byte version,
+		int indexCacheDepth = 16,
+		bool skipIndexVerify = false,
+		bool useBloomFilter = true,
+		int lruCacheSize = 1_000_000) {
+
+		var scavengedMap = CopyFrom(_map);
+		for (int level = 0; level < scavengedMap.Count; level++) {
+			for (int i = 0; i < scavengedMap[level].Count; i++) {
+				if (scavengedMap[level][i].Id == toScavenge) {
+					var filename = filenameProvider.GetFilenameNewTable();
+					var oldTable = scavengedMap[level][i];
+
+					var (scavenged, spaceSaved) = await PTable.Scavenged(
+						oldTable,
+						filename,
+						version,
+						shouldKeep,
+						ESConsts.PTableInitialReaderCount,
+						_pTableMaxReaderCount,
+						indexCacheDepth,
+						skipIndexVerify,
+						useBloomFilter,
+						lruCacheSize,
+						ct);
+
+					if (scavenged is null) {
+						return ScavengeResult.Failed(oldTable, level, i);
+					}
+
+					scavengedMap[level][i] = scavenged;
+
+					var indexMap = new IndexMap(Version, scavengedMap, PrepareCheckpoint, CommitCheckpoint,
+						_maxTablesPerLevel, _maxTableLevelsForAutomaticMerge, _pTableMaxReaderCount);
+
+					return ScavengeResult.Success(indexMap, oldTable, scavenged, spaceSaved, level, i);
+				}
+			}
+		}
+
+		throw new ArgumentException("Unable to find table in map.", nameof(toScavenge));
+	}
+
+	public void Dispose(TimeSpan timeout) {
+		foreach (var ptable in InOrder()) {
+			ptable.Dispose();
+		}
+
+		foreach (var ptable in InOrder()) {
+			ptable.WaitForDisposal(timeout);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Index/IndexStatusTracker.cs b/src/KurrentDB.Core/Index/IndexStatusTracker.cs
new file mode 100644
index 00000000000..e89bb567a9e
--- /dev/null
+++ b/src/KurrentDB.Core/Index/IndexStatusTracker.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Metrics;
+
+namespace KurrentDB.Core.Index;
+
+public interface IIndexStatusTracker {
+	IDisposable StartOpening();
+	IDisposable StartRebuilding();
+	IDisposable StartInitializing();
+	IDisposable StartMerging();
+	IDisposable StartScavenging();
+}
+
+public class IndexStatusTracker : IIndexStatusTracker {
+	private readonly ActivityStatusSubMetric _metric;
+
+	public IndexStatusTracker(StatusMetric metric) {
+		_metric = new("Index", metric);
+	}
+
+	public IDisposable StartOpening() => _metric.StartActivity("Opening");
+	public IDisposable StartRebuilding() => _metric.StartActivity("Rebuilding");
+	public IDisposable StartInitializing() => _metric.StartActivity("Initializing");
+	public IDisposable StartMerging() => _metric.StartActivity("Merging");
+	public IDisposable StartScavenging() => _metric.StartActivity("Scavenging");
+
+	public class NoOp : IIndexStatusTracker {
+		public IDisposable StartOpening() => null;
+		public IDisposable StartRebuilding() => null;
+		public IDisposable StartInitializing() => null;
+		public IDisposable StartMerging() => null;
+		public IDisposable StartScavenging() => null;
+	}
+}
diff --git a/src/KurrentDB.Core/Index/IndexTracker.cs b/src/KurrentDB.Core/Index/IndexTracker.cs
new file mode 100644
index 00000000000..517a6e2be35
--- /dev/null
+++ b/src/KurrentDB.Core/Index/IndexTracker.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+using System.Collections.Generic;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.Index;
+
+public interface IIndexTracker {
+	void OnIndexed<TStreamId>(List<IPrepareLogRecord<TStreamId>> prepares);
+}
+
+public class IndexTracker : IIndexTracker {
+	private readonly CounterSubMetric _indexedEvents;
+
+	public IndexTracker(CounterSubMetric indexedEvents) {
+		_indexedEvents = indexedEvents;
+	}
+
+	public void OnIndexed<TStreamId>(List<IPrepareLogRecord<TStreamId>> prepares) {
+		_indexedEvents.Add(prepares.Count);
+	}
+
+	public class NoOp : IIndexTracker {
+		public void OnIndexed<TStreamId>(List<IPrepareLogRecord<TStreamId>> record) {
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Index/MergeResult.cs b/src/KurrentDB.Core/Index/MergeResult.cs
new file mode 100644
index 00000000000..1c6ebd6178b
--- /dev/null
+++ b/src/KurrentDB.Core/Index/MergeResult.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+
+namespace KurrentDB.Core.Index;
+
+public class MergeResult {
+	public readonly IndexMap MergedMap;
+	public readonly List<PTable> ToDelete;
+	public readonly bool HasMergedAny;
+	public readonly bool CanMergeAny;
+
+	public MergeResult(IndexMap mergedMap, List<PTable> toDelete, bool hasMergedAny, bool canMergeAny) {
+		MergedMap = mergedMap;
+		ToDelete = toDelete;
+		HasMergedAny = hasMergedAny;
+		CanMergeAny = canMergeAny;
+	}
+}
diff --git a/src/KurrentDB.Core/Index/PTable.cs b/src/KurrentDB.Core/Index/PTable.cs
new file mode 100644
index 00000000000..9ea690a351d
--- /dev/null
+++ b/src/KurrentDB.Core/Index/PTable.cs
@@ -0,0 +1,1355 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Security.Cryptography;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.DataStructures.ProbabilisticFilter;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.TransactionLog.Unbuffered;
+using ILogger = Serilog.ILogger;
+using MD5 = KurrentDB.Core.Hashing.MD5;
+using Range = KurrentDB.Core.Data.Range;
+using RuntimeInformation = System.Runtime.RuntimeInformation;
+
+namespace KurrentDB.Core.Index;
+
+public class PTableVersions {
+	// original
+	public const byte IndexV1 = 1;
+
+	// 64bit hashes
+	public const byte IndexV2 = 2;
+
+	// 64bit versions
+	public const byte IndexV3 = 3;
+
+	// cached midpoints
+	public const byte IndexV4 = 4;
+}
+
+public partial class PTable : ISearchTable, IDisposable {
+	public const int IndexEntryV1Size = sizeof(int) + sizeof(int) + sizeof(long);
+	public const int IndexEntryV2Size = sizeof(int) + sizeof(long) + sizeof(long);
+	public const int IndexEntryV3Size = sizeof(long) + sizeof(long) + sizeof(long);
+	public const int IndexEntryV4Size = IndexEntryV3Size;
+
+	public const int IndexKeyV1Size = sizeof(int) + sizeof(int);
+	public const int IndexKeyV2Size = sizeof(int) + sizeof(long);
+	public const int IndexKeyV3Size = sizeof(long) + sizeof(long);
+	public const int IndexKeyV4Size = IndexKeyV3Size;
+	public const int MD5Size = 16;
+	public const int DefaultBufferSize = 8192;
+	public const int DefaultSequentialBufferSize = 65536;
+	private static readonly ILogger Log = Serilog.Log.ForContext<PTable>();
+
+	public Guid Id {
+		get { return _id; }
+	}
+
+	public long Count {
+		get { return _count; }
+	}
+
+	public string Filename {
+		get { return _filename; }
+	}
+
+	public byte Version {
+		get { return _version; }
+	}
+
+	public string BloomFilterFilename => GenBloomFilterFilename(_filename);
+
+	public bool HasBloomFilter => _bloomFilter is not null;
+
+	public static string GenBloomFilterFilename(string filename) => $"{filename}.bloomfilter";
+
+	private static long GenBloomFilterSizeBytes(long entryCount) {
+		// Fewer events per stream will require a larger bloom filter (or incur more false positives)
+		// We could count them to be precise, but a reasonable estimate will be faster.
+		const int averageEventsPerStreamPerFile = 4;
+		long size = entryCount / averageEventsPerStreamPerFile;
+		size = Math.Clamp(
+			value: size,
+			min: BloomFilterAccessor.MinSizeKB * 1000,
+			max: BloomFilterAccessor.MaxSizeKB * 1000);
+		return size;
+	}
+
+	private readonly Guid _id;
+	private readonly string _filename;
+	private readonly long _count;
+	private readonly long _size;
+	private readonly UnmanagedMemoryAppendOnlyList<Midpoint> _midpoints = null;
+	private readonly uint _midpointsCached = 0;
+	private readonly long _midpointsCacheSize = 0;
+
+	private readonly PersistentBloomFilter _bloomFilter;
+	private readonly LRUCache<StreamHash, CacheEntry> _lruCache;
+	private readonly LRUCache<StreamHash, bool> _lruConfirmedNotPresent;
+
+	private readonly IndexEntryKey _minEntry, _maxEntry;
+	private readonly ObjectPool<WorkItem> _workItems;
+	private readonly byte _version;
+	private readonly int _indexEntrySize;
+	private readonly int _indexKeySize;
+
+	private readonly ManualResetEventSlim _destroyEvent = new ManualResetEventSlim(false);
+	private volatile bool _deleteFile;
+	private bool _disposed;
+
+	public ReadOnlySpan<Midpoint> GetMidPoints() {
+		if (_midpoints == null)
+			return ReadOnlySpan<Midpoint>.Empty;
+
+		return _midpoints.AsSpan();
+	}
+
+	private PTable(string filename,
+		Guid id,
+		int initialReaders,
+		int maxReaders,
+		int depth = 16,
+		bool skipIndexVerify = false,
+		bool useBloomFilter = true,
+		int lruCacheSize = 1_000_000) {
+
+		Ensure.NotNullOrEmpty(filename, "filename");
+		Ensure.NotEmptyGuid(id, "id");
+		Ensure.Positive(maxReaders, "maxReaders");
+		Ensure.Nonnegative(depth, "depth");
+
+		if (!File.Exists(filename))
+			throw new CorruptIndexException(new PTableNotFoundException(filename));
+
+		_id = id;
+		_filename = filename;
+
+		Log.Debug("Loading " + (skipIndexVerify ? "" : "and Verification ") + "of PTable '{pTable}' started...",
+			Path.GetFileName(Filename));
+		var sw = Stopwatch.StartNew();
+		_size = new FileInfo(_filename).Length;
+
+		Helper.EatException(_filename, static filename => {
+			// this action will fail if the file is created on a Unix system that does not have permissions to make files read-only
+			File.SetAttributes(filename, FileAttributes.ReadOnly | FileAttributes.NotContentIndexed);
+		});
+
+		_workItems = new ObjectPool<WorkItem>(string.Format("PTable {0} work items", _id),
+			initialReaders,
+			maxReaders,
+			() => new WorkItem(filename, DefaultBufferSize),
+			workItem => workItem.Dispose(),
+			pool => OnAllWorkItemsDisposed());
+
+		var readerWorkItem = GetWorkItem();
+		try {
+			readerWorkItem.Stream.Seek(0, SeekOrigin.Begin);
+			var header = PTableHeader.FromStream(readerWorkItem.Stream);
+
+			if (header.Version == PTableVersions.IndexV1) {
+				throw new CorruptIndexException(new UnsupportedFileVersionException(
+					_filename, header.Version, Version,
+					"Detected a V1 index file, which is no longer supported. " +
+					"The index will be backed up and rebuilt in a supported format. " +
+					"This may take a long time for large databases. " +
+					"You can also use a version of ESDB (>= 3.9.0 and < 24.10.0) to upgrade the " +
+					"indexes to a supported format by performing an index merge."));
+			}
+
+			if ((header.Version != PTableVersions.IndexV2) &&
+				(header.Version != PTableVersions.IndexV3) &&
+				(header.Version != PTableVersions.IndexV4))
+				throw new CorruptIndexException(new UnsupportedFileVersionException(_filename, header.Version, Version));
+			_version = header.Version;
+
+			if (_version == PTableVersions.IndexV1) {
+				_indexEntrySize = IndexEntryV1Size;
+				_indexKeySize = IndexKeyV1Size;
+			}
+
+			if (_version == PTableVersions.IndexV2) {
+				_indexEntrySize = IndexEntryV2Size;
+				_indexKeySize = IndexKeyV2Size;
+			}
+
+			if (_version == PTableVersions.IndexV3) {
+				_indexEntrySize = IndexEntryV3Size;
+				_indexKeySize = IndexKeyV3Size;
+			}
+
+			if (_version >= PTableVersions.IndexV4) {
+				//read the PTable footer
+				var previousPosition = readerWorkItem.Stream.Position;
+				readerWorkItem.Stream.Seek(readerWorkItem.Stream.Length - MD5Size - PTableFooter.GetSize(_version),
+					SeekOrigin.Begin);
+				var footer = PTableFooter.FromStream(readerWorkItem.Stream);
+				if (footer.Version != header.Version)
+					throw new CorruptIndexException(
+						String.Format("PTable header/footer version mismatch: {0}/{1}", header.Version,
+							footer.Version), new InvalidFileException("Invalid PTable file."));
+
+				if (_version == PTableVersions.IndexV4) {
+					_indexEntrySize = IndexEntryV4Size;
+					_indexKeySize = IndexKeyV4Size;
+				} else
+					throw new InvalidOperationException("Unknown PTable version: " + _version);
+
+				_midpointsCached = footer.NumMidpointsCached;
+				_midpointsCacheSize = _midpointsCached * _indexEntrySize;
+				readerWorkItem.Stream.Seek(previousPosition, SeekOrigin.Begin);
+			}
+
+			long indexEntriesTotalSize = (_size - PTableHeader.Size - _midpointsCacheSize -
+										  PTableFooter.GetSize(_version) - MD5Size);
+
+			if (indexEntriesTotalSize < 0) {
+				throw new CorruptIndexException(String.Format(
+					"Total size of index entries < 0: {0}. _size: {1}, header size: {2}, _midpointsCacheSize: {3}, footer size: {4}, md5 size: {5}",
+					indexEntriesTotalSize, _size, PTableHeader.Size, _midpointsCacheSize,
+					PTableFooter.GetSize(_version), MD5Size));
+			} else if (indexEntriesTotalSize % _indexEntrySize != 0) {
+				throw new CorruptIndexException(String.Format(
+					"Total size of index entries: {0} is not divisible by index entry size: {1}",
+					indexEntriesTotalSize, _indexEntrySize));
+			}
+
+			_count = indexEntriesTotalSize / _indexEntrySize;
+
+			if (_version >= PTableVersions.IndexV4 && _count > 0 && _midpointsCached > 0 && _midpointsCached < 2) {
+				//if there is at least 1 index entry with version>=4 and there are cached midpoints, there should always be at least 2 midpoints cached
+				throw new CorruptIndexException(String.Format(
+					"Less than 2 midpoints cached in PTable. Index entries: {0}, Midpoints cached: {1}", _count,
+					_midpointsCached));
+			} else if (_count >= 2 && _midpointsCached > _count) {
+				//if there are at least 2 index entries, midpoints count should be at most the number of index entries
+				throw new CorruptIndexException(String.Format(
+					"More midpoints cached in PTable than index entries. Midpoints: {0} , Index entries: {1}",
+					_midpointsCached, _count));
+			}
+
+			if (Count == 0) {
+				_minEntry = new IndexEntryKey(ulong.MaxValue, long.MaxValue);
+				_maxEntry = new IndexEntryKey(ulong.MinValue, long.MinValue);
+			} else {
+				var minEntry = ReadEntry(_indexEntrySize, Count - 1, readerWorkItem, _version);
+				_minEntry = new IndexEntryKey(minEntry.Stream, minEntry.Version);
+				var maxEntry = ReadEntry(_indexEntrySize, 0, readerWorkItem, _version);
+				_maxEntry = new IndexEntryKey(maxEntry.Stream, maxEntry.Version);
+			}
+		} catch (Exception) {
+			Dispose();
+			throw;
+		} finally {
+			ReturnWorkItem(readerWorkItem);
+		}
+
+		int calcdepth = 0;
+		try {
+			calcdepth = GetDepth(_count * _indexEntrySize, depth);
+			_midpoints = CacheMidpointsAndVerifyHash(calcdepth, skipIndexVerify);
+
+			// the bloom filter is important to the efficient functioning of the cache because without it
+			// any cache miss request for data not contained in this file will cause two fruitless searches
+			// to populate the _lruConfirmedNotPresent cache, which itself will become heavily used.
+			if (lruCacheSize > 0 && !useBloomFilter) {
+				Log.Warning("Index cache is enabled (--index-cache-size > 0) but will not be used because --use-index-bloom-filters is false");
+			}
+
+			if (useBloomFilter)
+				_bloomFilter = TryOpenBloomFilter();
+
+			if (lruCacheSize > 0) {
+				if (_bloomFilter is not null) {
+					_lruCache = new("ConfirmedPresent", lruCacheSize);
+					_lruConfirmedNotPresent = new("ConfirmedNotPresent", lruCacheSize);
+				} else {
+					Log.Information("Not enabling LRU cache for index {file} because it has no bloom filter", _filename);
+				}
+			}
+		} catch (PossibleToHandleOutOfMemoryException) {
+			Log.Error(
+				"Unable to create midpoints for PTable '{pTable}' ({count} entries, depth {depth} requested). "
+				+ "Performance hit will occur. OOM Exception.", Path.GetFileName(Filename), Count, depth);
+		}
+
+		Log.Debug(
+			"Loading PTable (Version: {version}) '{pTable}' ({count} entries, cache depth {depth}) done in {elapsed}.",
+			_version, Path.GetFileName(Filename), Count, calcdepth, sw.Elapsed);
+	}
+
+	~PTable() => Dispose(false);
+
+	internal UnmanagedMemoryAppendOnlyList<Midpoint> CacheMidpointsAndVerifyHash(int depth, bool skipIndexVerify) {
+		var buffer = new byte[4096];
+		if (depth < 0 || depth > 30)
+			throw new ArgumentOutOfRangeException("depth");
+		var count = Count;
+		if (count == 0 || depth == 0)
+			return null;
+
+		if (skipIndexVerify) {
+			Log.Debug("Disabling Verification of PTable");
+		}
+
+		Stream stream = null;
+		WorkItem workItem = null;
+		if (RuntimeInformation.IsUnix) {
+			workItem = GetWorkItem();
+			stream = workItem.Stream;
+		} else {
+			stream = UnbufferedFileStream.Create(_filename, FileMode.Open, FileAccess.Read, FileShare.Read,
+				4096, 4096, false, 4096);
+		}
+
+		UnmanagedMemoryAppendOnlyList<Midpoint> midpoints = null;
+
+		try {
+			using (var md5 = MD5.Create()) {
+				int midpointsCount;
+				try {
+					midpointsCount = (int)Math.Max(2L, Math.Min((long)1 << depth, count));
+					midpoints = new UnmanagedMemoryAppendOnlyList<Midpoint>(midpointsCount);
+				} catch (OutOfMemoryException exc) {
+					throw new PossibleToHandleOutOfMemoryException("Failed to allocate memory for Midpoint cache.",
+						exc);
+				}
+
+				if (skipIndexVerify && (_version >= PTableVersions.IndexV4)) {
+					if (_midpointsCached == midpointsCount) {
+						//index verification is disabled and cached midpoints with the same depth requested are available
+						//so, we can load them directly from the PTable file
+						Log.Debug("Loading {midpointsCached} cached midpoints from PTable", _midpointsCached);
+						long startOffset = stream.Length - MD5Size - PTableFooter.GetSize(_version) -
+										   _midpointsCacheSize;
+						stream.Seek(startOffset, SeekOrigin.Begin);
+						for (int k = 0; k < (int)_midpointsCached; k++) {
+							stream.Read(buffer, 0, _indexEntrySize);
+							IndexEntryKey key;
+							long index;
+							if (_version == PTableVersions.IndexV4) {
+								key = new IndexEntryKey(BitConverter.ToUInt64(buffer, 8),
+									BitConverter.ToInt64(buffer, 0));
+								index = BitConverter.ToInt64(buffer, 8 + 8);
+							} else
+								throw new InvalidOperationException("Unknown PTable version: " + _version);
+
+							midpoints.Add(new Midpoint(key, index));
+
+							if (k > 0) {
+								if (midpoints[k].Key.GreaterThan(midpoints[k - 1].Key)) {
+									throw new CorruptIndexException(String.Format(
+										"Index entry key for midpoint {0} (stream: {1}, version: {2}) < index entry key for midpoint {3} (stream: {4}, version: {5})",
+										k - 1, midpoints[k - 1].Key.Stream, midpoints[k - 1].Key.Version, k,
+										midpoints[k].Key.Stream, midpoints[k].Key.Version));
+								} else if (midpoints[k - 1].ItemIndex > midpoints[k].ItemIndex) {
+									throw new CorruptIndexException(String.Format(
+										"Item index for midpoint {0} ({1}) > Item index for midpoint {2} ({3})",
+										k - 1, midpoints[k - 1].ItemIndex, k, midpoints[k].ItemIndex));
+								}
+							}
+						}
+
+						return midpoints;
+					} else
+						Log.Debug(
+							"Skipping loading of cached midpoints from PTable due to count mismatch, cached midpoints: {midpointsCached} / required midpoints: {midpointsCount}",
+							_midpointsCached, midpointsCount);
+				}
+
+				if (!skipIndexVerify) {
+					stream.Seek(0, SeekOrigin.Begin);
+					stream.Read(buffer, 0, PTableHeader.Size);
+					md5.TransformBlock(buffer, 0, PTableHeader.Size, null, 0);
+				}
+
+				long previousNextIndex = long.MinValue;
+				var previousKey = new IndexEntryKey(long.MaxValue, long.MaxValue);
+				for (int k = 0; k < midpointsCount; ++k) {
+					long nextIndex = GetMidpointIndex(k, count, midpointsCount);
+					if (previousNextIndex != nextIndex) {
+						if (!skipIndexVerify) {
+							ReadUntilWithMd5(PTableHeader.Size + _indexEntrySize * nextIndex, stream, md5);
+							stream.Read(buffer, 0, _indexKeySize);
+							md5.TransformBlock(buffer, 0, _indexKeySize, null, 0);
+						} else {
+							stream.Seek(PTableHeader.Size + _indexEntrySize * nextIndex, SeekOrigin.Begin);
+							stream.Read(buffer, 0, _indexKeySize);
+						}
+
+						IndexEntryKey key;
+						if (_version == PTableVersions.IndexV1) {
+							key = new IndexEntryKey(BitConverter.ToUInt32(buffer, 4),
+								BitConverter.ToInt32(buffer, 0));
+						} else if (_version == PTableVersions.IndexV2) {
+							key = new IndexEntryKey(BitConverter.ToUInt64(buffer, 4),
+								BitConverter.ToInt32(buffer, 0));
+						} else {
+							key = new IndexEntryKey(BitConverter.ToUInt64(buffer, 8),
+								BitConverter.ToInt64(buffer, 0));
+						}
+
+						midpoints.Add(new Midpoint(key, nextIndex));
+						previousNextIndex = nextIndex;
+						previousKey = key;
+					} else {
+						midpoints.Add(new Midpoint(previousKey, previousNextIndex));
+					}
+
+					if (k > 0) {
+						if (midpoints[k].Key.GreaterThan(midpoints[k - 1].Key)) {
+							throw new CorruptIndexException(String.Format(
+								"Index entry key for midpoint {0} (stream: {1}, version: {2}) < index entry key for midpoint {3} (stream: {4}, version: {5})",
+								k - 1, midpoints[k - 1].Key.Stream, midpoints[k - 1].Key.Version, k,
+								midpoints[k].Key.Stream, midpoints[k].Key.Version));
+						} else if (midpoints[k - 1].ItemIndex > midpoints[k].ItemIndex) {
+							throw new CorruptIndexException(String.Format(
+								"Item index for midpoint {0} ({1}) > Item index for midpoint {2} ({3})", k - 1,
+								midpoints[k - 1].ItemIndex, k, midpoints[k].ItemIndex));
+						}
+					}
+				}
+
+				if (!skipIndexVerify) {
+					ReadUntilWithMd5(stream.Length - MD5Size, stream, md5);
+					//verify hash (should be at stream.length - MD5Size)
+					md5.TransformFinalBlock(Empty.ByteArray, 0, 0);
+					var fileHash = new byte[MD5Size];
+					stream.Read(fileHash, 0, MD5Size);
+					ValidateHash(md5.Hash, fileHash);
+				}
+
+				return midpoints;
+			}
+		} catch (PossibleToHandleOutOfMemoryException) {
+			midpoints?.Dispose();
+			throw;
+		} catch {
+			midpoints?.Dispose();
+			Dispose();
+			throw;
+		} finally {
+			if (RuntimeInformation.IsUnix) {
+				if (workItem != null)
+					ReturnWorkItem(workItem);
+			} else {
+				stream?.Dispose();
+			}
+		}
+	}
+
+	private PersistentBloomFilter TryOpenBloomFilter() {
+		try {
+			// use existing filter without specifying what size it needs to be
+			// for scavenged ptables in particular we do not know exactly what size the bloom filter
+			// is because it is based on the pre-scavenge size
+			var bloomFilter = new PersistentBloomFilter(
+				FileStreamPersistence.FromFile(BloomFilterFilename));
+
+			return bloomFilter;
+		} catch (FileNotFoundException) {
+			Log.Information("Bloom filter for index file {file} does not exist", _filename);
+			return null;
+		} catch (CorruptedFileException ex) {
+			Log.Error(ex, "Bloom filter for index file {file} is corrupt. Performance will be degraded", _filename);
+			return null;
+		} catch (CorruptedHashException ex) {
+			Log.Error(ex, "Bloom filter contents for index file {file} are corrupt. Performance will be degraded", _filename);
+			return null;
+		} catch (OutOfMemoryException ex) {
+			Log.Warning(ex, "Could not allocate enough memory for Bloom filter for index file {file}. Performance will be degraded", _filename);
+			return null;
+		} catch (Exception ex) {
+			Log.Error(ex, "Unexpected error opening bloom filter for index file {file}. Performance will be degraded", _filename);
+			return null;
+		}
+	}
+
+	private readonly byte[] TmpReadBuf = new byte[DefaultBufferSize];
+
+	private void ReadUntilWithMd5(long nextPos, Stream fileStream, HashAlgorithm md5) {
+		long toRead = nextPos - fileStream.Position;
+		if (toRead < 0)
+			throw new Exception("should not do negative reads.");
+		while (toRead > 0) {
+			var localReadCount = Math.Min(toRead, TmpReadBuf.Length);
+			int read = fileStream.Read(TmpReadBuf, 0, (int)localReadCount);
+			md5.TransformBlock(TmpReadBuf, 0, read, null, 0);
+			toRead -= read;
+		}
+	}
+
+	void ValidateHash(byte[] fromFile, byte[] computed) {
+		if (computed == null)
+			throw new CorruptIndexException(new HashValidationException("Calculated MD5 hash is null!"));
+		if (fromFile == null)
+			throw new CorruptIndexException(new HashValidationException("Read from file MD5 hash is null!"));
+
+		if (computed.Length != fromFile.Length)
+			throw new CorruptIndexException(
+				new HashValidationException(
+					string.Format(
+						"Hash sizes differ! FileHash({0}): {1}, hash({2}): {3}.",
+						computed.Length,
+						BitConverter.ToString(computed),
+						fromFile.Length,
+						BitConverter.ToString(fromFile))));
+
+		for (int i = 0; i < fromFile.Length; i++) {
+			if (fromFile[i] != computed[i])
+				throw new CorruptIndexException(
+					new HashValidationException(
+						string.Format(
+							"Hashes are different! computed: {0}, hash: {1}.",
+							BitConverter.ToString(computed),
+							BitConverter.ToString(fromFile))));
+		}
+	}
+
+	public IEnumerable<IndexEntry> IterateAllInOrder() {
+		var workItem = GetWorkItem();
+		try {
+			workItem.Stream.Position = PTableHeader.Size;
+			for (long i = 0, n = Count; i < n; i++) {
+				yield return ReadNextNoSeek(workItem, _version);
+			}
+		} finally {
+			ReturnWorkItem(workItem);
+		}
+	}
+
+	public bool TryGetOneValue(ulong stream, long number, out long position) {
+		if (TryGetLatestEntryNoCache(GetHash(stream), number, number, out var entry)) {
+			position = entry.Position;
+			return true;
+		}
+
+		position = -1;
+		return false;
+	}
+
+	public bool TryGetLatestEntry(ulong stream, out IndexEntry entry) =>
+		_lruCache == null
+			? TryGetLatestEntryNoCache(GetHash(stream), 0, long.MaxValue, out entry)
+			: TryGetLatestEntryWithCache(GetHash(stream), out entry);
+
+	private bool TryGetLatestEntryWithCache(StreamHash stream, out IndexEntry entry) {
+		if (!TryLookThroughLru(stream, out var value)) {
+			// stream not present
+			entry = TableIndex.InvalidIndexEntry;
+			return false;
+		}
+
+		entry = ReadEntry(_indexEntrySize, value.LatestOffset, _version);
+		return true;
+	}
+
+	public async ValueTask<IndexEntry?> TryGetLatestEntry(
+		ulong stream,
+		long beforePosition,
+		Func<IndexEntry, CancellationToken, ValueTask<bool>> isForThisStream,
+		CancellationToken token) {
+
+		Ensure.Nonnegative(beforePosition, nameof(beforePosition));
+		var streamHash = GetHash(stream);
+
+		var startKey = BuildKey(streamHash, 0);
+		var endKey = BuildKey(streamHash, long.MaxValue);
+
+		if (startKey.GreaterThan(_maxEntry) || endKey.SmallerThan(_minEntry))
+			return null;
+
+		if (!MightContainStream(streamHash))
+			return null;
+
+		var workItem = GetWorkItem();
+		try {
+			var recordRange = LocateRecordRange(endKey, startKey, out var lowBoundsCheck, out var highBoundsCheck);
+
+			try {
+				return await TryGetLatestEntryFast(
+					streamHash,
+					beforePosition,
+					isForThisStream,
+					recordRange,
+					lowBoundsCheck,
+					highBoundsCheck,
+					workItem,
+					token);
+			} catch (HashCollisionException) {
+				// fall back to linear search if there's a hash collision
+				return await TryGetLatestEntrySlow(
+					streamHash,
+					beforePosition,
+					isForThisStream,
+					recordRange,
+					lowBoundsCheck,
+					highBoundsCheck,
+					workItem,
+					token);
+			}
+		} finally {
+			ReturnWorkItem(workItem);
+		}
+	}
+
+	// linearly search the whole range for the entry with the greatest position that
+	// is for this stream and before the beforePosition.
+	private async ValueTask<IndexEntry?> TryGetLatestEntrySlow(
+		StreamHash stream,
+		long beforePosition,
+		Func<IndexEntry, CancellationToken, ValueTask<bool>> isForThisStream,
+		Range recordRange,
+		IndexEntryKey lowBoundsCheck,
+		IndexEntryKey highBoundsCheck,
+		WorkItem workItem,
+		CancellationToken token) {
+
+		long maxBeforePosition = long.MinValue;
+		IndexEntry maxEntry = default;
+
+		for (var idx = recordRange.Lower; idx <= recordRange.Upper; idx++) {
+			var candidateEntry = ReadEntry(_indexEntrySize, idx, workItem, _version);
+			var candidateEntryKey = new IndexEntryKey(candidateEntry.Stream, candidateEntry.Version);
+
+			if (candidateEntryKey.GreaterThan(lowBoundsCheck)) {
+				throw new MaybeCorruptIndexException(
+					$"Candidate entry key (stream: {candidateEntryKey.Stream}, version: {candidateEntryKey.Version}) > "
+					+ $"low bounds check key (stream: {lowBoundsCheck.Stream}, version: {lowBoundsCheck.Version})");
+			}
+
+			if (candidateEntryKey.SmallerThan(highBoundsCheck)) {
+				throw new MaybeCorruptIndexException(
+					$"Candidate entry key (stream: {candidateEntryKey.Stream}, version: {candidateEntryKey.Version}) < "
+					+ $"high bounds check key (stream: {highBoundsCheck.Stream}, version: {highBoundsCheck.Version})");
+			}
+
+			if (candidateEntry.Stream == stream.Hash &&
+				candidateEntry.Position < beforePosition &&
+				candidateEntry.Position > maxBeforePosition &&
+				await isForThisStream(candidateEntry, token)) {
+
+				maxBeforePosition = candidateEntry.Position;
+				maxEntry = candidateEntry;
+			}
+		}
+
+		return maxBeforePosition is not long.MinValue ? maxEntry : null;
+	}
+
+	private async ValueTask<IndexEntry?> TryGetLatestEntryFast(
+		StreamHash stream,
+		long beforePosition,
+		Func<IndexEntry, CancellationToken, ValueTask<bool>> isForThisStream,
+		Range recordRange,
+		IndexEntryKey lowBoundsCheck,
+		IndexEntryKey highBoundsCheck,
+		WorkItem workItem,
+		CancellationToken token) {
+
+		var startKey = BuildKey(stream, 0);
+		var endKey = BuildKey(stream, long.MaxValue);
+
+		var low = recordRange.Lower;
+		var high = recordRange.Upper;
+
+		while (low < high) {
+			var mid = low + (high - low) / 2;
+			IndexEntry midpoint = ReadEntry(_indexEntrySize, mid, workItem, _version);
+
+			var midpointKey = new IndexEntryKey(midpoint.Stream, midpoint.Version);
+			if (midpointKey.GreaterThan(lowBoundsCheck)) {
+				throw new MaybeCorruptIndexException(
+					$"Midpoint key (stream: {midpointKey.Stream}, version: {midpointKey.Version}) > "
+				+ $"low bounds check key (stream: {lowBoundsCheck.Stream}, version: {lowBoundsCheck.Version})");
+			}
+
+			if (midpointKey.SmallerThan(highBoundsCheck)) {
+				throw new MaybeCorruptIndexException(
+					$"Midpoint key (stream: {midpointKey.Stream}, version: {midpointKey.Version}) < "
+				+ $"high bounds check key (stream: {highBoundsCheck.Stream}, version: {highBoundsCheck.Version})");
+			}
+
+			if (midpointKey.Stream != stream.Hash) {
+				if (midpointKey.GreaterThan(endKey)) {
+					low = mid + 1;
+					lowBoundsCheck = midpointKey;
+				} else if (midpointKey.SmallerThan(startKey)) {
+					high = mid - 1;
+					highBoundsCheck = midpointKey;
+				} else
+					throw new MaybeCorruptIndexException(
+					$"Midpoint key (stream: {midpointKey.Stream}, version: {midpointKey.Version}) >= "
+					+ $"start key (stream: {startKey.Stream}, version: {startKey.Version}) and <= "
+					+ $"end key (stream: {endKey.Stream}, version: {endKey.Version}) "
+					+ "but the stream hashes do not match.");
+				continue;
+			}
+
+			if (!await isForThisStream(midpoint, token))
+				throw new HashCollisionException();
+
+			if (midpoint.Position >= beforePosition) {
+				low = mid + 1;
+				lowBoundsCheck = midpointKey;
+			} else {
+				high = mid;
+				highBoundsCheck = midpointKey;
+			}
+		}
+
+		var candidateEntry = ReadEntry(_indexEntrySize, high, workItem, _version);
+
+		// index entry is for a different hash
+		if (candidateEntry.Stream != stream.Hash)
+			return null;
+
+		// index entry is for the correct hash but for a colliding stream
+		if (!await isForThisStream(candidateEntry, token))
+			throw new HashCollisionException();
+
+		// index entry is for the correct stream but does not respect the position limit
+		if (candidateEntry.Position >= beforePosition) {
+			return null;
+		}
+
+		// index entry is for the correct stream and respects the position limit
+		return candidateEntry;
+	}
+
+	private bool TryGetLatestEntryNoCache(StreamHash stream, long startNumber, long endNumber, out IndexEntry entry) {
+		Ensure.Nonnegative(startNumber, "startNumber");
+		Ensure.Nonnegative(endNumber, "endNumber");
+
+		if (!MightContainStream(stream)) {
+			entry = TableIndex.InvalidIndexEntry;
+			return false;
+		}
+
+		return TrySearchForLatestEntry(stream, startNumber, endNumber, out entry, out _);
+	}
+
+	private bool TrySearchForLatestEntry(StreamHash stream, long startNumber, long endNumber,
+		out IndexEntry entry, out long offset) {
+
+		entry = TableIndex.InvalidIndexEntry;
+
+		var startKey = BuildKey(stream, startNumber);
+		var endKey = BuildKey(stream, endNumber);
+
+		if (startKey.GreaterThan(_maxEntry) || endKey.SmallerThan(_minEntry)) {
+			offset = default;
+			return false;
+		}
+
+		var workItem = GetWorkItem();
+		try {
+			var high = ChopForLatest(workItem, endKey);
+			var candEntry = ReadEntry(_indexEntrySize, high, workItem, _version);
+			var candKey = new IndexEntryKey(candEntry.Stream, candEntry.Version);
+
+			if (candKey.GreaterThan(endKey))
+				throw new MaybeCorruptIndexException(string.Format(
+					"candEntry ({0}@{1}) > startKey {2}, stream {3}, startNum {4}, endNum {5}, PTable: {6}.",
+					candEntry.Stream, candEntry.Version, startKey, stream, startNumber, endNumber, Filename));
+			if (candKey.SmallerThan(startKey)) {
+				offset = default;
+				return false;
+			}
+
+			entry = candEntry;
+			offset = high;
+			return true;
+		} finally {
+			ReturnWorkItem(workItem);
+		}
+	}
+
+	public bool TryGetOldestEntry(ulong stream, out IndexEntry entry) =>
+		_lruCache == null
+			? TryGetOldestEntryNoCache(GetHash(stream), out entry)
+			: TryGetOldestEntryWithCache(GetHash(stream), out entry);
+
+	private bool TryGetOldestEntryWithCache(StreamHash stream, out IndexEntry entry) {
+		if (!TryLookThroughLru(stream, out var value)) {
+			// stream not present
+			entry = TableIndex.InvalidIndexEntry;
+			return false;
+		}
+
+		entry = ReadEntry(_indexEntrySize, value.OldestOffset, _version);
+		return true;
+	}
+
+	private bool TryGetOldestEntryNoCache(StreamHash stream, out IndexEntry entry) {
+		if (!MightContainStream(stream)) {
+			entry = TableIndex.InvalidIndexEntry;
+			return false;
+		}
+
+		return TrySearchForOldestEntry(stream, 0, long.MaxValue, out entry, out _);
+	}
+
+	public bool TryGetNextEntry(ulong stream, long afterVersion, out IndexEntry entry) {
+		var hash = GetHash(stream);
+		if (afterVersion >= long.MaxValue || !MightContainStream(hash)) {
+			entry = TableIndex.InvalidIndexEntry;
+			return false;
+		}
+		return TrySearchForOldestEntry(hash, afterVersion + 1, long.MaxValue, out entry, out _);
+	}
+
+	public bool TryGetPreviousEntry(ulong stream, long beforeVersion, out IndexEntry entry) {
+		var hash = GetHash(stream);
+		if (beforeVersion <= 0 || !MightContainStream(hash)) {
+			entry = TableIndex.InvalidIndexEntry;
+			return false;
+		}
+		return TrySearchForLatestEntry(hash, 0, beforeVersion - 1, out entry, out _);
+	}
+
+	private bool TrySearchForOldestEntry(StreamHash stream, long startNumber, long endNumber,
+		out IndexEntry entry, out long offset) {
+		Ensure.Nonnegative(startNumber, "startNumber");
+		Ensure.Nonnegative(endNumber, "endNumber");
+
+		entry = TableIndex.InvalidIndexEntry;
+
+		var startKey = BuildKey(stream, startNumber);
+		var endKey = BuildKey(stream, endNumber);
+
+		if (startKey.GreaterThan(_maxEntry) || endKey.SmallerThan(_minEntry)) {
+			offset = default;
+			return false;
+		}
+
+		var workItem = GetWorkItem();
+		try {
+			var high = ChopForOldest(workItem, startKey);
+			var candEntry = ReadEntry(_indexEntrySize, high, workItem, _version);
+			var candidateKey = new IndexEntryKey(candEntry.Stream, candEntry.Version);
+			if (candidateKey.SmallerThan(startKey))
+				throw new MaybeCorruptIndexException(string.Format(
+					"candEntry ({0}@{1}) < startKey {2}, stream {3}, startNum {4}, endNum {5}, PTable: {6}.",
+					candEntry.Stream, candEntry.Version, startKey, stream, startNumber, endNumber, Filename));
+			if (candidateKey.GreaterThan(endKey)) {
+				offset = default;
+				return false;
+			}
+
+			entry = candEntry;
+			offset = high;
+			return true;
+		} finally {
+			ReturnWorkItem(workItem);
+		}
+	}
+
+	public IReadOnlyList<IndexEntry> GetRange(ulong stream, long startNumber, long endNumber, int? limit = null) {
+		Ensure.Nonnegative(startNumber, "startNumber");
+		Ensure.Nonnegative(endNumber, "endNumber");
+
+		return _lruCache is null
+			? GetRangeNoCache(GetHash(stream), startNumber, endNumber, limit)
+			: GetRangeWithCache(GetHash(stream), startNumber, endNumber, limit);
+	}
+
+	private StreamHash GetHash(ulong hash) {
+		return new(_version, hash);
+	}
+
+	private static IndexEntryKey BuildKey(StreamHash stream, long version) {
+		return new IndexEntryKey(stream.Hash, version);
+	}
+
+	// use the midpoints (if they exist) to narrow the search range.
+	// returns a range of indexes to search and corresponding IndexEntryKeys
+	private Range LocateRecordRange(IndexEntryKey key, out IndexEntryKey lowKey, out IndexEntryKey highKey) =>
+		LocateRecordRange(key, key, out lowKey, out highKey);
+
+	private Range LocateRecordRange(IndexEntryKey lowKey, IndexEntryKey highKey, out IndexEntryKey lowKeyOut, out IndexEntryKey highKeyOut) {
+		lowKeyOut = new IndexEntryKey(ulong.MaxValue, long.MaxValue);
+		highKeyOut = new IndexEntryKey(ulong.MinValue, long.MinValue);
+
+		ReadOnlySpan<Midpoint> midpoints = null;
+		if (_midpoints != null) {
+			midpoints = _midpoints.AsSpan();
+		}
+
+		if (midpoints == null)
+			return new Range(0, Count - 1);
+
+		long lowerMidpoint = LowerMidpointBound(midpoints, lowKey);
+		long upperMidpoint = UpperMidpointBound(midpoints, highKey);
+
+		lowKeyOut = midpoints[(int)lowerMidpoint].Key;
+		highKeyOut = midpoints[(int)upperMidpoint].Key;
+
+		return new Range(midpoints[(int)lowerMidpoint].ItemIndex, midpoints[(int)upperMidpoint].ItemIndex);
+	}
+
+	private long LowerMidpointBound(ReadOnlySpan<Midpoint> midpoints, IndexEntryKey key) {
+		long l = 0;
+		long r = midpoints.Length - 1;
+		while (l < r) {
+			long m = l + (r - l + 1) / 2;
+			if (midpoints[(int)m].Key.GreaterThan(key))
+				l = m;
+			else
+				r = m - 1;
+		}
+
+		return l;
+	}
+
+	private long UpperMidpointBound(ReadOnlySpan<Midpoint> midpoints, IndexEntryKey key) {
+		long l = 0;
+		long r = midpoints.Length - 1;
+		while (l < r) {
+			long m = l + (r - l) / 2;
+			if (midpoints[(int)m].Key.SmallerThan(key))
+				r = m;
+			else
+				l = m + 1;
+		}
+
+		return r;
+	}
+
+	private static void PositionAtEntry(int indexEntrySize, long indexNum, WorkItem workItem) {
+		workItem.Stream.Seek(indexEntrySize * indexNum + PTableHeader.Size, SeekOrigin.Begin);
+	}
+
+	private static IndexEntry ReadEntry(int indexEntrySize, long indexNum, WorkItem workItem, int ptableVersion) {
+		long seekTo = indexEntrySize * indexNum + PTableHeader.Size;
+		workItem.Stream.Seek(seekTo, SeekOrigin.Begin);
+		return ReadNextNoSeek(workItem, ptableVersion);
+	}
+
+	private IndexEntry ReadEntry(int indexEntrySize, long indexNum, int ptableVersion) {
+		var workItem = GetWorkItem();
+		try {
+			return ReadEntry(_indexEntrySize, indexNum, workItem, ptableVersion);
+		} finally {
+			ReturnWorkItem(workItem);
+		}
+	}
+
+	private static IndexEntry ReadNextNoSeek(WorkItem workItem, int ptableVersion) {
+		long version = (ptableVersion >= PTableVersions.IndexV3)
+			? workItem.Reader.ReadInt64()
+			: workItem.Reader.ReadInt32();
+		ulong stream = ptableVersion == PTableVersions.IndexV1
+			? workItem.Reader.ReadUInt32()
+			: workItem.Reader.ReadUInt64();
+		long position = workItem.Reader.ReadInt64();
+		return new IndexEntry(stream, version, position);
+	}
+
+	private WorkItem GetWorkItem() {
+		try {
+			return _workItems.Get();
+		} catch (ObjectPoolDisposingException) {
+			throw new FileBeingDeletedException();
+		} catch (ObjectPoolMaxLimitReachedException) {
+			throw new Exception("Unable to acquire work item.");
+		}
+	}
+
+	private void ReturnWorkItem(WorkItem workItem) {
+		_workItems.Return(workItem);
+	}
+
+	public void MarkForDestruction() {
+		_deleteFile = true;
+		_workItems.MarkForDisposal();
+	}
+
+	public void Dispose() {
+		_deleteFile = false;
+		_workItems.MarkForDisposal();
+	}
+
+	protected virtual void Dispose(bool disposing) {
+		if (_disposed) {
+			return;
+		}
+
+		if (disposing) {
+			//dispose any managed objects here
+			_midpoints?.Dispose();
+			_bloomFilter?.Dispose();
+		}
+
+		_disposed = true;
+	}
+
+	private void OnAllWorkItemsDisposed() {
+		File.SetAttributes(_filename, FileAttributes.Normal);
+		if (_deleteFile) {
+			_bloomFilter?.Dispose();
+			File.Delete(_filename);
+			File.Delete(BloomFilterFilename);
+		}
+		_destroyEvent.Set();
+		Dispose(true);
+		GC.SuppressFinalize(this);
+	}
+
+	public void WaitForDisposal(int timeout) {
+		if (!_destroyEvent.Wait(timeout))
+			throw new TimeoutException();
+	}
+
+	public void WaitForDisposal(TimeSpan timeout) {
+		if (!_destroyEvent.Wait(timeout))
+			throw new TimeoutException();
+	}
+
+	public List<IndexEntry> GetRangeWithCache(StreamHash stream, long startNumber, long endNumber, int? limit = null) {
+		if (!OverlapsRange(stream, startNumber, endNumber, out var tableLatestNumber, out var tableLatestOffset))
+			return new List<IndexEntry>();
+
+		// it does overlap.
+		// if the requested end version is greater than or equal to what we have in this ptable
+		// then we can jump to tableLatestOffset and read the file forwards from there without binary chopping.
+		if (endNumber >= tableLatestNumber) {
+			return PositionAndReadForward(stream, startNumber, endNumber, limit, tableLatestOffset: tableLatestOffset);
+		}
+		// todo: else if the requested start version is less than or equal to what we have in this ptable
+		// then we could jump to tableStartOffset and read the file backwards.
+
+		// otherwise the request is contained strictly within what we have in this ptable
+		// and we must chop for it
+		return ChopAndReadForward(stream, startNumber, endNumber, limit);
+	}
+
+	public List<IndexEntry> GetRangeNoCache(StreamHash stream, long startNumber, long endNumber, int? limit = null) {
+		if (!MightContainStream(stream))
+			return new List<IndexEntry>();
+
+		return ChopAndReadForward(stream, startNumber, endNumber, limit);
+	}
+
+	private List<IndexEntry> ChopAndReadForward(StreamHash stream, long startNumber, long endNumber, int? limit) {
+		return PositionAndReadForward(stream, startNumber, endNumber, limit: limit, tableLatestOffset: null);
+	}
+
+	private List<IndexEntry> PositionAndReadForward(StreamHash stream, long startNumber, long endNumber, int? limit, long? tableLatestOffset) {
+		var result = new List<IndexEntry>();
+
+		var startKey = BuildKey(stream, startNumber);
+		var endKey = BuildKey(stream, endNumber);
+
+		if (startKey.GreaterThan(_maxEntry) || endKey.SmallerThan(_minEntry))
+			return result;
+
+		var workItem = GetWorkItem();
+		try {
+			var high = tableLatestOffset ?? ChopForLatest(workItem, endKey);
+			PositionAtEntry(_indexEntrySize, high, workItem);
+			result = ReadForward(workItem, high, startKey, endKey, limit);
+			return result;
+		} catch (MaybeCorruptIndexException ex) {
+			throw new MaybeCorruptIndexException(
+				$"{ex.Message}. stream {stream}, startNum {startNumber}, endNum {endNumber}, PTable: {Filename}.");
+		} finally {
+			ReturnWorkItem(workItem);
+		}
+	}
+
+	// forward here meaning forward in the file. towards the older records.
+	private List<IndexEntry> ReadForward(WorkItem workItem, long high, IndexEntryKey startKey, IndexEntryKey endKey, int? limit) {
+
+		var result = new List<IndexEntry>();
+
+		for (long i = high, n = Count; i < n; ++i) {
+			var entry = ReadNextNoSeek(workItem, _version);
+
+			var candidateKey = new IndexEntryKey(entry.Stream, entry.Version);
+
+			if (candidateKey.GreaterThan(endKey))
+				throw new MaybeCorruptIndexException($"candidateKey ({candidateKey}) > endKey ({endKey})");
+
+			if (candidateKey.SmallerThan(startKey))
+				return result;
+
+			result.Add(entry);
+
+			if (result.Count == limit)
+				break;
+		}
+
+		return result;
+	}
+
+	private long ChopForLatest(WorkItem workItem, IndexEntryKey endKey) {
+		var recordRange = LocateRecordRange(endKey, out var lowBoundsCheck, out var highBoundsCheck);
+		long low = recordRange.Lower;
+		long high = recordRange.Upper;
+		while (low < high) {
+			var mid = low + (high - low) / 2;
+			var midpoint = ReadEntry(_indexEntrySize, mid, workItem, _version);
+			var midpointKey = new IndexEntryKey(midpoint.Stream, midpoint.Version);
+
+			if (midpointKey.GreaterThan(lowBoundsCheck)) {
+				throw new MaybeCorruptIndexException(String.Format(
+					"Midpoint key (stream: {0}, version: {1}) > low bounds check key (stream: {2}, version: {3})",
+					midpointKey.Stream, midpointKey.Version, lowBoundsCheck.Stream, lowBoundsCheck.Version));
+			} else if (!midpointKey.GreaterEqualsThan(highBoundsCheck)) {
+				throw new MaybeCorruptIndexException(String.Format(
+					"Midpoint key (stream: {0}, version: {1}) < high bounds check key (stream: {2}, version: {3})",
+					midpointKey.Stream, midpointKey.Version, highBoundsCheck.Stream, highBoundsCheck.Version));
+			}
+
+			if (midpointKey.GreaterThan(endKey)) {
+				low = mid + 1;
+				lowBoundsCheck = midpointKey;
+			} else {
+				high = mid;
+				highBoundsCheck = midpointKey;
+			}
+		}
+
+		return high;
+	}
+
+	private long ChopForOldest(WorkItem workItem, IndexEntryKey startKey) {
+		var recordRange = LocateRecordRange(startKey, out var lowBoundsCheck, out var highBoundsCheck);
+		long low = recordRange.Lower;
+		long high = recordRange.Upper;
+		while (low < high) {
+			var mid = low + (high - low + 1) / 2;
+			var midpoint = ReadEntry(_indexEntrySize, mid, workItem, _version);
+			var midpointKey = new IndexEntryKey(midpoint.Stream, midpoint.Version);
+
+			if (midpointKey.GreaterThan(lowBoundsCheck)) {
+				throw new MaybeCorruptIndexException(String.Format(
+					"Midpoint key (stream: {0}, version: {1}) > low bounds check key (stream: {2}, version: {3})",
+					midpointKey.Stream, midpointKey.Version, lowBoundsCheck.Stream, lowBoundsCheck.Version));
+			} else if (!midpointKey.GreaterEqualsThan(highBoundsCheck)) {
+				throw new MaybeCorruptIndexException(String.Format(
+					"Midpoint key (stream: {0}, version: {1}) < high bounds check key (stream: {2}, version: {3})",
+					midpointKey.Stream, midpointKey.Version, highBoundsCheck.Stream, highBoundsCheck.Version));
+			}
+
+			if (midpointKey.SmallerThan(startKey)) {
+				high = mid - 1;
+				highBoundsCheck = midpointKey;
+			} else {
+				low = mid;
+				lowBoundsCheck = midpointKey;
+			}
+		}
+
+		return high;
+	}
+
+	// Checks if this file might contain any of the range from start to end inclusive.
+	private bool OverlapsRange(
+		StreamHash stream,
+		long startNumber,
+		long endNumber,
+		out long tableLatestNumber,
+		out long tableLatestOffset) {
+
+		if (!TryLookThroughLru(stream, out var cacheEntry)) {
+			// no range present
+			tableLatestNumber = default;
+			tableLatestOffset = default;
+			return false;
+		}
+
+		tableLatestNumber = cacheEntry.LatestNumber;
+		tableLatestOffset = cacheEntry.LatestOffset;
+
+		// there is a range for this stream, does it overlap?
+		return startNumber <= cacheEntry.LatestNumber && cacheEntry.OldestNumber <= endNumber;
+	}
+
+	// Gets the value from the lru cache. Populate the cache if necessary
+	// returns true iff we managed to get a CacheEntry. i.e. if any events are
+	// present for this stream in this file.
+	private bool TryLookThroughLru(StreamHash stream, out CacheEntry value) {
+		Ensure.NotNull(_lruCache, nameof(_lruCache));
+
+		if (_lruCache.TryGet(stream, out value)) {
+			return true;
+		}
+
+		if (!MightContainStream(stream)) {
+			value = default;
+			return false;
+		}
+
+		if (_lruConfirmedNotPresent.TryGet(stream, out _)) {
+			value = default;
+			return false;
+		}
+
+		// its not in either of the LRU caches. add it to one or the other
+		// so that subsequent calls do not require searching.
+		if (TrySearchForLatestEntry(stream, 0, long.MaxValue, out var latestEntry, out var latestOffset) &&
+			TrySearchForOldestEntry(stream, 0, long.MaxValue, out var oldestEntry, out var oldestOffset)) {
+
+			value = new(
+				oldestNumber: oldestEntry.Version,
+				latestNumber: latestEntry.Version,
+				oldestOffset: oldestOffset,
+				latestOffset: latestOffset);
+
+			_lruCache.Put(stream, value);
+			return true;
+		} else {
+			// in case of false positive in the bloom filter
+			_lruConfirmedNotPresent.Put(stream, true);
+			value = default;
+			return false;
+		}
+	}
+
+	private bool MightContainStream(StreamHash stream) {
+		if (_bloomFilter == null)
+			return true;
+
+		// with a workitem checked out the ptable (and bloom filter specifically)
+		// wont get disposed
+		var workItem = GetWorkItem();
+		try {
+			var streamHash = stream.Hash;
+			return _bloomFilter.MightContain(GetSpan(ref streamHash));
+		} finally {
+			ReturnWorkItem(workItem);
+		}
+	}
+
+	private static ReadOnlySpan<byte> GetSpan(ref ulong streamHash) =>
+		MemoryMarshal.AsBytes(MemoryMarshal.CreateReadOnlySpan(ref streamHash, 1));
+
+	// construct this struct with a 64 bit hash and it will convert it to a hash
+	// for the specified table version
+	public readonly struct StreamHash : IEquatable<StreamHash> {
+		public StreamHash(byte version, ulong hash) {
+			Hash = version == PTableVersions.IndexV1 ? hash >> 32 : hash;
+		}
+
+		public ulong Hash { get; init; }
+
+		public override int GetHashCode() =>
+			Hash.GetHashCode();
+
+		public bool Equals(StreamHash other) =>
+			Hash == other.Hash;
+
+		public override bool Equals(object obj) =>
+			obj is StreamHash streamHash && Equals(streamHash);
+	}
+
+	public struct CacheEntry {
+		public readonly long OldestNumber;
+		public readonly long LatestNumber;
+		public readonly long OldestOffset;
+		public readonly long LatestOffset;
+
+		public CacheEntry(long oldestNumber, long latestNumber, long oldestOffset, long latestOffset) {
+			OldestNumber = oldestNumber;
+			LatestNumber = latestNumber;
+			OldestOffset = oldestOffset;
+			LatestOffset = latestOffset;
+		}
+	}
+
+	public struct Midpoint {
+		public readonly IndexEntryKey Key;
+		public readonly long ItemIndex;
+
+		public Midpoint(IndexEntryKey key, long itemIndex) {
+			Key = key;
+			ItemIndex = itemIndex;
+		}
+	}
+
+	public readonly struct IndexEntryKey {
+		public readonly ulong Stream;
+		public readonly long Version;
+
+		public IndexEntryKey(ulong stream, long version) {
+			Stream = stream;
+			Version = version;
+		}
+
+		public bool GreaterThan(IndexEntryKey other) {
+			if (Stream == other.Stream) {
+				return Version > other.Version;
+			}
+
+			return Stream > other.Stream;
+		}
+
+		public bool SmallerThan(IndexEntryKey other) {
+			if (Stream == other.Stream) {
+				return Version < other.Version;
+			}
+
+			return Stream < other.Stream;
+		}
+
+		public bool GreaterEqualsThan(IndexEntryKey other) {
+			if (Stream == other.Stream) {
+				return Version >= other.Version;
+			}
+
+			return Stream >= other.Stream;
+		}
+
+		public bool SmallerEqualsThan(IndexEntryKey other) {
+			if (Stream == other.Stream) {
+				return Version <= other.Version;
+			}
+
+			return Stream <= other.Stream;
+		}
+
+		public override string ToString() {
+			return string.Format("Stream: {0}, Version: {1}", Stream, Version);
+		}
+	}
+
+	private class WorkItem : IDisposable {
+		public readonly FileStream Stream;
+		public readonly BinaryReader Reader;
+
+		public WorkItem(string filename, int bufferSize) {
+			Stream = new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.Read, bufferSize,
+				FileOptions.RandomAccess);
+			Reader = new BinaryReader(Stream);
+		}
+
+		~WorkItem() {
+			Dispose(false);
+		}
+
+		public void Dispose() {
+			Dispose(true);
+			GC.SuppressFinalize(this);
+		}
+
+		private void Dispose(bool disposing) {
+			if (disposing) {
+				Stream.Dispose();
+				Reader.Dispose();
+			}
+		}
+	}
+}
+
+internal class HashCollisionException : Exception {
+}
diff --git a/src/KurrentDB.Core/Index/PTableConstruction.cs b/src/KurrentDB.Core/Index/PTableConstruction.cs
new file mode 100644
index 00000000000..09e28584448
--- /dev/null
+++ b/src/KurrentDB.Core/Index/PTableConstruction.cs
@@ -0,0 +1,791 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Security.Cryptography;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.DataStructures.ProbabilisticFilter;
+using MD5 = KurrentDB.Core.Hashing.MD5;
+
+namespace KurrentDB.Core.Index;
+
+public partial class PTable {
+	public static PTable FromFile(string filename, int initialReaders, int maxReaders,
+		int cacheDepth, bool skipIndexVerify,
+		bool useBloomFilter = true,
+		int lruCacheSize = 1_000_000) {
+
+		return new PTable(filename, Guid.NewGuid(), initialReaders, maxReaders,
+			cacheDepth, skipIndexVerify, useBloomFilter, lruCacheSize);
+	}
+
+	private const int MidpointsOverflowSafetyNet = 20;
+
+	public static PersistentBloomFilter ConstructBloomFilter(
+		bool useBloomFilter,
+		string filename,
+		long indexEntryCount,
+		Func<long, long> genBloomFilterSizeBytes = null) {
+
+		if (!useBloomFilter)
+			return null;
+
+		try {
+			genBloomFilterSizeBytes ??= GenBloomFilterSizeBytes;
+			return new PersistentBloomFilter(
+				new FileStreamPersistence(
+					path: GenBloomFilterFilename(filename),
+					create: true,
+					size: genBloomFilterSizeBytes(indexEntryCount)));
+		} catch (OutOfMemoryException ex) {
+			Log.Warning(ex, "Could not allocate enough memory for Bloom filter for index file {file}. Performance will be degraded", filename);
+			return null;
+		} catch (Exception ex) {
+			Log.Error(ex, "Could not create Bloom filter for index file {file}. Performance will be degraded", filename);
+			return null;
+		}
+	}
+
+	public static PTable FromMemtable(IMemTable table, string filename, int initialReaders, int maxReaders,
+		int cacheDepth = 16,
+		bool skipIndexVerify = false,
+		bool useBloomFilter = true,
+		int lruCacheSize = 1_000_000) {
+
+		Ensure.NotNull(table, "table");
+		Ensure.NotNullOrEmpty(filename, "filename");
+		Ensure.Nonnegative(cacheDepth, "cacheDepth");
+
+		int indexEntrySize = GetIndexEntrySize(table.Version);
+		long dumpedEntryCount = 0;
+
+		var sw = Stopwatch.StartNew();
+		using (var fs = new FileStream(filename, FileMode.Create, FileAccess.ReadWrite, FileShare.None,
+			DefaultSequentialBufferSize, FileOptions.SequentialScan)) {
+
+			var fileSize = GetFileSizeUpToIndexEntries(table.Count, table.Version);
+			fs.SetLength(fileSize);
+			fs.Seek(0, SeekOrigin.Begin);
+
+			using (var bloomFilter = ConstructBloomFilter(useBloomFilter, filename, table.Count))
+			using (var md5 = MD5.Create())
+			using (var cs = new CryptoStream(fs, md5, CryptoStreamMode.Write))
+			using (var bs = new BufferedStream(cs, DefaultSequentialBufferSize)) {
+				// WRITE HEADER
+				var headerBytes = new PTableHeader(table.Version).AsByteArray();
+				cs.Write(headerBytes, 0, headerBytes.Length);
+
+				// WRITE INDEX ENTRIES
+				var buffer = new byte[indexEntrySize];
+				var records = table.IterateAllInOrder();
+				var requiredMidpointCount = GetRequiredMidpointCountCached(table.Count, table.Version, cacheDepth);
+				using var midpoints = new UnmanagedMemoryAppendOnlyList<Midpoint>((int)requiredMidpointCount + MidpointsOverflowSafetyNet);
+
+				var midpointCalculator = new MidpointIndexCalculator(table.Count, requiredMidpointCount);
+				long indexEntry = 0L;
+
+				ulong? previousHash = null;
+				foreach (var rec in records) {
+					AppendRecordTo(bs, buffer, table.Version, rec, indexEntrySize);
+					dumpedEntryCount += 1;
+					if (table.Version >= PTableVersions.IndexV4 &&
+						indexEntry == midpointCalculator.NextMidpointIndex) {
+						midpoints.Add(new Midpoint(new IndexEntryKey(rec.Stream, rec.Version), indexEntry));
+						midpointCalculator.Advance();
+					}
+
+					// WRITE BLOOM FILTER ENTRY
+					if (bloomFilter != null && rec.Stream != previousHash) {
+						// we are creating a PTable of the same version as the Memtable. therefore the hash is the right format
+						var streamHash = rec.Stream;
+						bloomFilter.Add(GetSpan(ref streamHash));
+						previousHash = rec.Stream;
+					}
+
+					indexEntry++;
+				}
+
+				//WRITE MIDPOINTS
+				if (table.Version >= PTableVersions.IndexV4) {
+					var numIndexEntries = table.Count;
+					if (dumpedEntryCount != numIndexEntries) {
+						//if index entries have been removed, compute the midpoints again
+						numIndexEntries = dumpedEntryCount;
+						requiredMidpointCount =
+							GetRequiredMidpointCount(numIndexEntries, table.Version, cacheDepth);
+						ComputeMidpoints(bs, fs, table.Version, indexEntrySize, numIndexEntries,
+							requiredMidpointCount, midpoints);
+					}
+
+					if (midpoints.Count > 0) {
+						if (midpoints[0].ItemIndex != 0)
+							throw new Exception("First midpoint was not the first index entry");
+						if (midpoints[^1].ItemIndex != numIndexEntries - 1)
+							throw new Exception("Last midpoint was not the last index entry");
+					}
+
+					WriteMidpointsTo(bs, fs, table.Version, indexEntrySize, buffer, dumpedEntryCount,
+						numIndexEntries, requiredMidpointCount, midpoints);
+				}
+
+				bloomFilter?.Flush();
+				bs.Flush();
+				cs.FlushFinalBlock();
+
+				// WRITE MD5
+				var hash = md5.Hash;
+				fs.SetLength(fs.Position + MD5Size);
+				fs.Write(hash, 0, hash.Length);
+				fs.FlushToDisk();
+			}
+		}
+
+		Log.Debug("Dumped MemTable [{id}, {table} entries] in {elapsed}.", table.Id, table.Count, sw.Elapsed);
+		return new PTable(filename, table.Id, initialReaders, maxReaders, cacheDepth, skipIndexVerify, useBloomFilter, lruCacheSize);
+	}
+
+	public static PTable MergeTo(
+		IList<PTable> tables,
+		string outputFile,
+		byte version,
+		int initialReaders,
+		int maxReaders,
+		int cacheDepth = 16,
+		bool skipIndexVerify = false,
+		bool useBloomFilter = true,
+		int lruCacheSize = 1_000_000) {
+
+		Ensure.NotNull(tables, "tables");
+		Ensure.NotNullOrEmpty(outputFile, "outputFile");
+		Ensure.Nonnegative(cacheDepth, "cacheDepth");
+
+		var indexEntrySize = GetIndexEntrySize(version);
+
+		long numIndexEntries = 0;
+		for (var i = 0; i < tables.Count; i++)
+			numIndexEntries += tables[i].Count;
+
+		var fileSizeUpToIndexEntries = GetFileSizeUpToIndexEntries(numIndexEntries, version);
+		if (tables.Count == 2)
+			return MergeTo2(tables, numIndexEntries, indexEntrySize, outputFile,
+				version, initialReaders, maxReaders, cacheDepth, skipIndexVerify, useBloomFilter, lruCacheSize); // special case
+
+		Log.Debug("PTables merge started.");
+		var watch = Stopwatch.StartNew();
+
+		var enumerators = tables.Select(Get64bitEnumerator).ToList();
+		try {
+			for (int i = 0; i < enumerators.Count; i++) {
+				if (!enumerators[i].MoveNext()) {
+					enumerators[i].Dispose();
+					enumerators.RemoveAt(i);
+					i--;
+				}
+			}
+
+			long dumpedEntryCount = 0;
+			using (var f = new FileStream(outputFile, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.None,
+				DefaultSequentialBufferSize, FileOptions.SequentialScan)) {
+				f.SetLength(fileSizeUpToIndexEntries);
+				f.Seek(0, SeekOrigin.Begin);
+
+				using (var bloomFilter = ConstructBloomFilter(useBloomFilter, outputFile, tables.Sum(table => table.Count)))
+				using (var md5 = MD5.Create())
+				using (var cs = new CryptoStream(f, md5, CryptoStreamMode.Write))
+				using (var bs = new BufferedStream(cs, DefaultSequentialBufferSize)) {
+					// WRITE HEADER
+					var headerBytes = new PTableHeader(version).AsByteArray();
+					cs.Write(headerBytes, 0, headerBytes.Length);
+
+					var buffer = new byte[indexEntrySize];
+
+					var requiredMidpointCount = GetRequiredMidpointCountCached(numIndexEntries, version, cacheDepth);
+					using var midpoints = new UnmanagedMemoryAppendOnlyList<Midpoint>((int)requiredMidpointCount + MidpointsOverflowSafetyNet);
+
+					var midpointCalculator = new MidpointIndexCalculator(numIndexEntries, requiredMidpointCount);
+					long indexEntry = 0L;
+
+					// WRITE INDEX ENTRIES
+					ulong? previousHash = null;
+					while (enumerators.Count > 0) {
+						var idx = GetMaxOf(enumerators);
+						var current = enumerators[idx].Current;
+						AppendRecordTo(bs, buffer, version, current, indexEntrySize);
+						if (version >= PTableVersions.IndexV4 &&
+							indexEntry == midpointCalculator.NextMidpointIndex) {
+							midpoints.Add(new Midpoint(new IndexEntryKey(current.Stream, current.Version), indexEntry));
+							midpointCalculator.Advance();
+						}
+
+						// WRITE BLOOM FILTER ENTRY
+						if (bloomFilter != null && current.Stream != previousHash) {
+							var streamHash = current.Stream;
+							bloomFilter.Add(GetSpan(ref streamHash));
+							previousHash = current.Stream;
+						}
+
+						indexEntry++;
+						dumpedEntryCount++;
+
+						if (!enumerators[idx].MoveNext()) {
+							enumerators[idx].Dispose();
+							enumerators.RemoveAt(idx);
+						}
+					}
+
+					//WRITE MIDPOINTS
+					if (version >= PTableVersions.IndexV4) {
+						if (dumpedEntryCount != numIndexEntries) {
+							//if index entries have been removed, compute the midpoints again
+							numIndexEntries = dumpedEntryCount;
+							requiredMidpointCount = GetRequiredMidpointCount(numIndexEntries, version, cacheDepth);
+							ComputeMidpoints(bs, f, version, indexEntrySize, numIndexEntries,
+								requiredMidpointCount, midpoints);
+						}
+
+						if (midpoints.Count > 0) {
+							if (midpoints[0].ItemIndex != 0)
+								throw new Exception("First midpoint was not the first index entry");
+							if (midpoints[^1].ItemIndex != numIndexEntries - 1)
+								throw new Exception("Last midpoint was not the last index entry");
+						}
+
+						WriteMidpointsTo(bs, f, version, indexEntrySize, buffer, dumpedEntryCount, numIndexEntries,
+							requiredMidpointCount, midpoints);
+					}
+
+					bloomFilter?.Flush();
+					bs.Flush();
+					cs.FlushFinalBlock();
+
+					f.FlushToDisk();
+					f.SetLength(f.Position + MD5Size);
+
+					// WRITE MD5
+					var hash = md5.Hash;
+					f.Write(hash, 0, hash.Length);
+					f.FlushToDisk();
+				}
+			}
+
+			Log.Debug(
+				"PTables merge finished in {elapsed} ([{entryCount}] entries merged into {dumpedEntryCount}).",
+				watch.Elapsed, string.Join(", ", tables.Select(x => x.Count)), dumpedEntryCount);
+			return new PTable(outputFile, Guid.NewGuid(), initialReaders, maxReaders, cacheDepth, skipIndexVerify, useBloomFilter, lruCacheSize);
+		} finally {
+			foreach (var enumerableTable in enumerators) {
+				enumerableTable.Dispose();
+			}
+		}
+	}
+
+	public static int GetIndexEntrySize(byte version) {
+		if (version == PTableVersions.IndexV1) {
+			return IndexEntryV1Size;
+		}
+
+		if (version == PTableVersions.IndexV2) {
+			return IndexEntryV2Size;
+		}
+
+		if (version == PTableVersions.IndexV3) {
+			return IndexEntryV3Size;
+		}
+
+		return IndexEntryV4Size;
+	}
+
+	private static PTable MergeTo2(IList<PTable> tables, long numIndexEntries, int indexEntrySize,
+		string outputFile,
+		byte version, int initialReaders, int maxReaders,
+		int cacheDepth, bool skipIndexVerify,
+		bool useBloomFilter, int lruCacheSize) {
+
+		Log.Debug("PTables merge started (specialized for <= 2 tables).");
+		var watch = Stopwatch.StartNew();
+
+		var fileSizeUpToIndexEntries = GetFileSizeUpToIndexEntries(numIndexEntries, version);
+		var enumerators = tables.Select(Get64bitEnumerator).ToList();
+		try {
+			long dumpedEntryCount = 0;
+			using (var f = new FileStream(outputFile, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.None,
+				DefaultSequentialBufferSize, FileOptions.SequentialScan)) {
+				f.SetLength(fileSizeUpToIndexEntries);
+				f.Seek(0, SeekOrigin.Begin);
+
+				using (var bloomFilter = ConstructBloomFilter(useBloomFilter, outputFile, tables.Sum(table => table.Count)))
+				using (var md5 = MD5.Create())
+				using (var cs = new CryptoStream(f, md5, CryptoStreamMode.Write))
+				using (var bs = new BufferedStream(cs, DefaultSequentialBufferSize)) {
+					// WRITE HEADER
+					var headerBytes = new PTableHeader(version).AsByteArray();
+					cs.Write(headerBytes, 0, headerBytes.Length);
+
+					// WRITE INDEX ENTRIES
+					var buffer = new byte[indexEntrySize];
+					var requiredMidpointCount =
+						GetRequiredMidpointCountCached(numIndexEntries, version, cacheDepth);
+					using var midpoints = new UnmanagedMemoryAppendOnlyList<Midpoint>((int)requiredMidpointCount + MidpointsOverflowSafetyNet);
+
+					var midpointCalculator = new MidpointIndexCalculator(numIndexEntries, requiredMidpointCount);
+					long indexEntry = 0L;
+
+					var enum1 = enumerators[0];
+					var enum2 = enumerators[1];
+					bool available1 = enum1.MoveNext();
+					bool available2 = enum2.MoveNext();
+					IndexEntry current;
+					ulong? previousHash = null;
+					while (available1 || available2) {
+						var entry1 = new IndexEntry(enum1.Current.Stream, enum1.Current.Version,
+							enum1.Current.Position);
+						var entry2 = new IndexEntry(enum2.Current.Stream, enum2.Current.Version,
+							enum2.Current.Position);
+
+						if (available1 && (!available2 || entry1.CompareTo(entry2) > 0)) {
+							current = entry1;
+							available1 = enum1.MoveNext();
+						} else {
+							current = entry2;
+							available2 = enum2.MoveNext();
+						}
+
+						AppendRecordTo(bs, buffer, version, current, indexEntrySize);
+						if (version >= PTableVersions.IndexV4 &&
+							indexEntry == midpointCalculator.NextMidpointIndex) {
+							midpoints.Add(new Midpoint(new IndexEntryKey(current.Stream, current.Version),
+								indexEntry));
+							midpointCalculator.Advance();
+						}
+
+						// WRITE BLOOM FILTER ENTRY
+						if (bloomFilter != null && current.Stream != previousHash) {
+							// upgradeHash has already ensured the hash is in the right format for the target
+							var streamHash = current.Stream;
+							bloomFilter.Add(GetSpan(ref streamHash));
+							previousHash = current.Stream;
+						}
+
+						indexEntry++;
+						dumpedEntryCount++;
+					}
+
+					//WRITE MIDPOINTS
+					if (version >= PTableVersions.IndexV4) {
+						if (dumpedEntryCount != numIndexEntries) {
+							//if index entries have been removed, compute the midpoints again
+							numIndexEntries = dumpedEntryCount;
+							requiredMidpointCount = GetRequiredMidpointCount(numIndexEntries, version, cacheDepth);
+							ComputeMidpoints(bs, f, version, indexEntrySize, numIndexEntries,
+								requiredMidpointCount, midpoints);
+						}
+
+						if (midpoints.Count > 0) {
+							if (midpoints[0].ItemIndex != 0)
+								throw new Exception("First midpoint was not the first index entry");
+							if (midpoints[^1].ItemIndex != numIndexEntries - 1)
+								throw new Exception("Last midpoint was not the last index entry");
+						}
+
+						WriteMidpointsTo(bs, f, version, indexEntrySize, buffer, dumpedEntryCount, numIndexEntries,
+							requiredMidpointCount, midpoints);
+					}
+
+					bloomFilter?.Flush();
+					bs.Flush();
+					cs.FlushFinalBlock();
+
+					f.SetLength(f.Position + MD5Size);
+
+					// WRITE MD5
+					var hash = md5.Hash;
+					f.Write(hash, 0, hash.Length);
+					f.FlushToDisk();
+				}
+			}
+
+			Log.Debug(
+				"PTables merge finished in {elapsed} ([{entryCount}] entries merged into {dumpedEntryCount}).",
+				watch.Elapsed, string.Join(", ", tables.Select(x => x.Count)), dumpedEntryCount);
+			return new PTable(outputFile, Guid.NewGuid(), initialReaders, maxReaders, cacheDepth, skipIndexVerify, useBloomFilter, lruCacheSize);
+		} finally {
+			foreach (var enumerator in enumerators) {
+				enumerator.Dispose();
+			}
+		}
+	}
+
+	public static async ValueTask<(PTable, long SpaceSaved)> Scavenged(
+		PTable table,
+		string outputFile,
+		byte version,
+		Func<IndexEntry, CancellationToken, ValueTask<bool>> shouldKeep,
+		int initialReaders,
+		int maxReaders,
+		int cacheDepth = 16,
+		bool skipIndexVerify = false,
+		bool useBloomFilter = true,
+		int lruCacheSize = 1_000_000,
+		CancellationToken ct = default) {
+
+		Ensure.NotNull(table, "table");
+		Ensure.NotNullOrEmpty(outputFile, "outputFile");
+		Ensure.Nonnegative(cacheDepth, "cacheDepth");
+
+		var indexEntrySize = GetIndexEntrySize(version);
+		var numIndexEntries = table.Count;
+
+		var fileSizeUpToIndexEntries = GetFileSizeUpToIndexEntries(numIndexEntries, version);
+
+		Log.Debug("PTables scavenge started with {numIndexEntries} entries.", numIndexEntries);
+		var watch = Stopwatch.StartNew();
+		long keptCount = 0L;
+		long droppedCount;
+
+		try {
+			using (var f = new FileStream(outputFile, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.None,
+				DefaultSequentialBufferSize, FileOptions.SequentialScan)) {
+				f.SetLength(fileSizeUpToIndexEntries);
+				f.Seek(0, SeekOrigin.Begin);
+
+				using (var bloomFilter = ConstructBloomFilter(useBloomFilter, outputFile, table.Count))
+				using (var md5 = MD5.Create())
+				using (var cs = new CryptoStream(f, md5, CryptoStreamMode.Write))
+				using (var bs = new BufferedStream(cs, DefaultSequentialBufferSize)) {
+					// WRITE HEADER
+					var headerBytes = new PTableHeader(version).AsByteArray();
+					cs.Write(headerBytes, 0, headerBytes.Length);
+
+					// WRITE SCAVENGED INDEX ENTRIES
+					var buffer = new byte[indexEntrySize];
+					using (var enumerator = Get64bitEnumerator(table)) {
+
+						ulong? previousHash = null;
+						while (enumerator.MoveNext()) {
+							if (await shouldKeep(enumerator.Current, ct)) {
+								var current = enumerator.Current;
+								AppendRecordTo(bs, buffer, version, enumerator.Current, indexEntrySize);
+								// WRITE BLOOM FILTER ENTRY
+								if (bloomFilter != null && current.Stream != previousHash) {
+									var streamHash = current.Stream;
+									bloomFilter.Add(GetSpan(ref streamHash));
+									previousHash = current.Stream;
+								}
+								keptCount++;
+							}
+						}
+					}
+
+					droppedCount = numIndexEntries - keptCount;
+
+					var forceKeep = version > table.Version;
+
+					if (droppedCount == 0 && !forceKeep) {
+						Log.Debug(
+							"PTable scavenge finished in {elapsed}. No entries removed so not keeping scavenged table.",
+							watch.Elapsed);
+
+						try {
+							bs.Close();
+							File.Delete(outputFile);
+						} catch (Exception ex) {
+							Log.Error(ex, "Unable to delete unwanted scavenged PTable: {outputFile}",
+								outputFile);
+						}
+
+						var bloomFilterFile = GenBloomFilterFilename(outputFile);
+						try {
+							File.Delete(bloomFilterFile);
+						} catch (Exception ex) {
+							Log.Error(ex, "Unable to delete unwanted bloom filter: {bloomFilterFile}",
+								bloomFilterFile);
+						}
+
+						return (null, 0);
+					}
+
+					if (droppedCount == 0 && forceKeep) {
+						Log.Debug("Keeping scavenged index even though it isn't smaller; version upgraded.");
+					}
+
+					//CALCULATE AND WRITE MIDPOINTS
+					if (version >= PTableVersions.IndexV4) {
+						var requiredMidpointCount = GetRequiredMidpointCount(keptCount, version, cacheDepth);
+						using var midpoints =
+							new UnmanagedMemoryAppendOnlyList<Midpoint>(
+								(int)requiredMidpointCount + MidpointsOverflowSafetyNet);
+						ComputeMidpoints(bs, f, version, indexEntrySize, keptCount,
+							requiredMidpointCount, midpoints, ct);
+						WriteMidpointsTo(bs, f, version, indexEntrySize, buffer, keptCount, keptCount,
+							requiredMidpointCount, midpoints);
+					}
+
+					bloomFilter?.Flush();
+					bs.Flush();
+					cs.FlushFinalBlock();
+
+					f.FlushToDisk();
+					f.SetLength(f.Position + MD5Size);
+
+					// WRITE MD5
+					var hash = md5.Hash;
+					f.Write(hash, 0, hash.Length);
+					f.FlushToDisk();
+				}
+			}
+
+			Log.Debug(
+				"PTable scavenge finished in {elapsed} ({droppedCount} entries removed, {keptCount} remaining).",
+				watch.Elapsed,
+				droppedCount, keptCount);
+			var scavengedTable = new PTable(outputFile, Guid.NewGuid(), initialReaders, maxReaders, cacheDepth, skipIndexVerify, useBloomFilter, lruCacheSize);
+			return (scavengedTable, table._size - scavengedTable._size);
+		} catch (Exception) {
+			try {
+				File.Delete(outputFile);
+			} catch (Exception ex) {
+				Log.Error(ex, "Unable to delete unwanted scavenged PTable: {outputFile}", outputFile);
+			}
+
+			var bloomFilterFile = GenBloomFilterFilename(outputFile);
+			try {
+				File.Delete(bloomFilterFile);
+			} catch (Exception ex) {
+				Log.Error(ex, "Unable to delete unwanted bloom filter: {bloomFilterFile}", bloomFilterFile);
+			}
+			throw;
+		}
+	}
+
+	private static int GetMaxOf(List<IEnumerator<IndexEntry>> enumerators) {
+		var max = new IndexEntry(ulong.MinValue, 0, long.MinValue);
+		int idx = 0;
+		for (int i = 0; i < enumerators.Count; i++) {
+			var cur = enumerators[i].Current;
+			if (cur.CompareTo(max) > 0) {
+				max = cur;
+				idx = i;
+			}
+		}
+
+		return idx;
+	}
+
+	private static unsafe void AppendRecordTo(Stream stream, byte[] buffer, byte version, IndexEntry entry,
+		int indexEntrySize) {
+		var bytes = entry.Bytes;
+		if (version == PTableVersions.IndexV1) {
+			var entryV1 = new IndexEntryV1((uint)entry.Stream, (int)entry.Version, entry.Position);
+			bytes = entryV1.Bytes;
+		} else if (version == PTableVersions.IndexV2) {
+			var entryV2 = new IndexEntryV2(entry.Stream, (int)entry.Version, entry.Position);
+			bytes = entryV2.Bytes;
+		}
+
+		Marshal.Copy((IntPtr)bytes, buffer, 0, indexEntrySize);
+		stream.Write(buffer, 0, indexEntrySize);
+	}
+
+	private static void ComputeMidpoints(BufferedStream bs, FileStream fs, byte version,
+		int indexEntrySize, long numIndexEntries, int requiredMidpointCount, UnmanagedMemoryAppendOnlyList<Midpoint> midpoints,
+		CancellationToken ct = default(CancellationToken)) {
+		int indexKeySize;
+		if (version == PTableVersions.IndexV4)
+			indexKeySize = IndexKeyV4Size;
+		else
+			throw new InvalidOperationException("Unknown PTable version: " + version);
+
+		midpoints.Clear();
+		bs.Flush();
+		byte[] buffer = new byte[indexKeySize];
+
+		var previousFileStreamPosition = fs.Position;
+
+		long previousIndex = -1;
+		IndexEntryKey previousKey = new IndexEntryKey(0, 0);
+
+		for (int k = 0; k < requiredMidpointCount; k++) {
+			ct.ThrowIfCancellationRequested();
+
+			long index = GetMidpointIndex(k, numIndexEntries, requiredMidpointCount);
+			if (index == previousIndex) {
+				midpoints.Add(new Midpoint(previousKey, previousIndex));
+			} else {
+				fs.Seek(PTableHeader.Size + index * indexEntrySize, SeekOrigin.Begin);
+				fs.Read(buffer, 0, indexKeySize);
+				IndexEntryKey key = new IndexEntryKey(BitConverter.ToUInt64(buffer, 8),
+					BitConverter.ToInt64(buffer, 0));
+				midpoints.Add(new Midpoint(key, index));
+				previousIndex = index;
+				previousKey = key;
+			}
+		}
+
+		fs.Seek(previousFileStreamPosition, SeekOrigin.Begin);
+	}
+
+	private static void WriteMidpointsTo(BufferedStream bs, FileStream fs, byte version, int indexEntrySize,
+		byte[] buffer, long dumpedEntryCount, long numIndexEntries, long requiredMidpointCount,
+		UnmanagedMemoryAppendOnlyList<Midpoint> midpoints) {
+		//WRITE MIDPOINT ENTRIES
+
+		//special case, when there is a single index entry, we need two midpoints
+		if (numIndexEntries == 1 && midpoints.Count == 1) {
+			midpoints.Add(new Midpoint(midpoints[0].Key, midpoints[0].ItemIndex));
+		}
+
+		var midpointsWritten = 0;
+		if (dumpedEntryCount == numIndexEntries && requiredMidpointCount == midpoints.Count) {
+			//if these values don't match, something is wrong
+			bs.Flush();
+			long fileSizeUpToMidpointEntries = GetFileSizeUpToMidpointEntries(fs.Position, midpoints.Count, version);
+			fs.SetLength(fileSizeUpToMidpointEntries);
+			for (var i = 0; i < midpoints.Count; i++) {
+				AppendMidpointRecordTo(bs, buffer, version, midpoints[i], indexEntrySize);
+			}
+
+			midpointsWritten = midpoints.Count;
+			Log.Debug("Cached {midpointsWritten} index midpoints to PTable", midpointsWritten);
+		} else
+			Log.Debug(
+				"Not caching index midpoints to PTable due to count mismatch. Table entries: {numIndexEntries} / Dumped entries: {dumpedEntryCount}, Required midpoint count: {requiredMidpointCount} /  Actual midpoint count: {midpoints}",
+				numIndexEntries, dumpedEntryCount, requiredMidpointCount, midpoints.Count);
+
+		bs.Flush();
+		fs.SetLength(fs.Position + PTableFooter.GetSize(version));
+		var footerBytes = new PTableFooter(version, (uint)midpointsWritten).AsByteArray();
+		bs.Write(footerBytes, 0, footerBytes.Length);
+		bs.Flush();
+	}
+
+	private static void AppendMidpointRecordTo(Stream stream, byte[] buffer, byte version, Midpoint midpointEntry,
+		int midpointEntrySize) {
+		if (version >= PTableVersions.IndexV4) {
+			ulong eventStream = midpointEntry.Key.Stream;
+			long eventVersion = midpointEntry.Key.Version;
+			long itemIndex = midpointEntry.ItemIndex;
+
+			for (int i = 0; i < 8; i++) {
+				buffer[i] = (byte)(eventVersion & 0xFF);
+				eventVersion >>= 8;
+			}
+
+			for (int i = 0; i < 8; i++) {
+				buffer[i + 8] = (byte)(eventStream & 0xFF);
+				eventStream >>= 8;
+			}
+
+			for (int i = 0; i < 8; i++) {
+				buffer[i + 16] = (byte)(itemIndex & 0xFF);
+				itemIndex >>= 8;
+			}
+
+			stream.Write(buffer, 0, midpointEntrySize);
+		}
+	}
+
+	static IEnumerator<IndexEntry> Get64bitEnumerator(ISearchTable table) {
+		if (table.Version == PTableVersions.IndexV1)
+			throw new InvalidOperationException("Attempted to merge or scavenge a V1 PTable");
+
+		return table.IterateAllInOrder().GetEnumerator();
+	}
+
+	public static long GetFileSizeUpToIndexEntries(long numIndexEntries, byte version) {
+		int indexEntrySize = GetIndexEntrySize(version);
+		return (long)PTableHeader.Size + numIndexEntries * indexEntrySize;
+	}
+
+	public static long GetFileSizeUpToMidpointEntries(long currentPosition, long numMidpointEntries, byte version) {
+		int indexEntrySize = GetIndexEntrySize(version);
+		return currentPosition + numMidpointEntries * indexEntrySize;
+	}
+
+	private static int GetDepth(long indexEntriesFileSize, int minDepth) {
+		minDepth = Math.Max(0, Math.Min(minDepth, 28));
+		if ((2L << 28) * 4096L < indexEntriesFileSize)
+			return 28;
+		for (int i = 27; i >= minDepth; i--) {
+			if ((2L << i) * 4096L < indexEntriesFileSize) {
+				return i + 1;
+			}
+		}
+
+		return minDepth;
+	}
+
+	private static int GetRequiredMidpointCount(long numIndexEntries, byte version, int minDepth) {
+		if (numIndexEntries == 0)
+			return 0;
+		if (numIndexEntries == 1)
+			return 2;
+
+		int indexEntrySize = GetIndexEntrySize(version);
+		var depth = GetDepth(numIndexEntries * indexEntrySize, minDepth);
+		return (int)Math.Max(2L, Math.Min((long)1 << depth, numIndexEntries));
+	}
+
+
+	public static int GetRequiredMidpointCountCached(long numIndexEntries, byte version, int minDepth = 16) {
+		if (version >= PTableVersions.IndexV4)
+			return GetRequiredMidpointCount(numIndexEntries, version, minDepth);
+		return 0;
+	}
+
+	public static long GetMidpointIndex(int k, long numIndexEntries, int numMidpoints) {
+		ArgumentOutOfRangeException.ThrowIfNegativeOrZero(numIndexEntries);
+		ArgumentOutOfRangeException.ThrowIfNegative(k);
+		ArgumentOutOfRangeException.ThrowIfGreaterThanOrEqual(k, numMidpoints);
+
+		if (k == 0)
+			return 0;
+
+		if (k == numMidpoints - 1)
+			return numIndexEntries - 1;
+
+		// k * (numIndexEntries - 1) / (numMidpoints - 1), avoiding 64-bit integer overflows
+		var (q, r) = long.DivRem(numIndexEntries - 1, numMidpoints - 1);
+		return k * q + k * r / (numMidpoints - 1);
+	}
+
+	public class MidpointIndexCalculator {
+		private readonly long _numIndexEntries;
+		private readonly int _numMidpoints;
+		private int _midpointNumber;
+
+		public MidpointIndexCalculator(long numIndexEntries, int numMidpoints, int initialMidpointNumber = 0) {
+			ArgumentOutOfRangeException.ThrowIfNegative(numIndexEntries);
+			ArgumentOutOfRangeException.ThrowIfNegative(numMidpoints);
+
+			_numIndexEntries = numIndexEntries;
+			_numMidpoints = numMidpoints;
+			_midpointNumber = initialMidpointNumber;
+			Advance();
+		}
+
+		public long? NextMidpointIndex { get; private set; }
+
+		public void Advance() {
+			if (_numIndexEntries == 0) {
+				NextMidpointIndex = null;
+				return;
+			}
+
+			if (_midpointNumber >= _numMidpoints) {
+				// no more midpoints
+				NextMidpointIndex = null;
+				return;
+			}
+
+			NextMidpointIndex = GetMidpointIndex(_midpointNumber++, _numIndexEntries, _numMidpoints);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Index/PTableFooter.cs b/src/KurrentDB.Core/Index/PTableFooter.cs
new file mode 100644
index 00000000000..3e1bfdf7cfc
--- /dev/null
+++ b/src/KurrentDB.Core/Index/PTableFooter.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using KurrentDB.Core.Exceptions;
+
+namespace KurrentDB.Core.Index;
+
+public class PTableFooter {
+	private const int Size = 128;
+	public readonly FileType FileType;
+	public readonly byte Version;
+	public readonly uint NumMidpointsCached;
+
+	public static int GetSize(byte version) {
+		if (version >= PTableVersions.IndexV4)
+			return Size;
+		return 0;
+	}
+
+	public PTableFooter(byte version, uint numMidpointsCached) {
+		FileType = FileType.PTableFile;
+		Version = version;
+		NumMidpointsCached = numMidpointsCached;
+	}
+
+	public byte[] AsByteArray() {
+		var array = new byte[Size];
+		array[0] = (byte)FileType.PTableFile;
+		array[1] = Version;
+		uint numMidpoints = NumMidpointsCached;
+		for (int i = 0; i < 4; i++) {
+			array[i + 2] = (byte)(numMidpoints & 0xFF);
+			numMidpoints >>= 8;
+		}
+
+		return array;
+	}
+
+	public static PTableFooter FromStream(Stream stream) {
+		var type = stream.ReadByte();
+		if (type != (int)FileType.PTableFile)
+			throw new CorruptIndexException("Corrupted PTable.", new InvalidFileException("Wrong type of PTable."));
+		var version = stream.ReadByte();
+		if (version == -1)
+			throw new CorruptIndexException("Couldn't read version of PTable from footer.",
+				new InvalidFileException("Invalid PTable file."));
+		if (!(version >= PTableVersions.IndexV4))
+			throw new CorruptIndexException(
+				"PTable footer with version < 4 found. PTable footers are supported as from version 4.",
+				new InvalidFileException("Invalid PTable file."));
+
+		byte[] buffer = new byte[4];
+		stream.Read(buffer, 0, 4);
+		uint numMidpointsCached = BitConverter.ToUInt32(buffer, 0);
+
+		return new PTableFooter((byte)version, numMidpointsCached);
+	}
+}
diff --git a/src/KurrentDB.Core/Index/PTableHeader.cs b/src/KurrentDB.Core/Index/PTableHeader.cs
new file mode 100644
index 00000000000..5680bb6455c
--- /dev/null
+++ b/src/KurrentDB.Core/Index/PTableHeader.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using KurrentDB.Core.Exceptions;
+
+namespace KurrentDB.Core.Index;
+
+public class PTableHeader {
+	public const int Size = 128;
+
+	public readonly FileType FileType;
+	public readonly byte Version;
+
+	public PTableHeader(byte version) {
+		FileType = FileType.PTableFile;
+		Version = version;
+	}
+
+	public byte[] AsByteArray() {
+		var array = new byte[Size];
+		array[0] = (byte)FileType.PTableFile;
+		array[1] = Version;
+		return array;
+	}
+
+	public static PTableHeader FromStream(Stream stream) {
+		var type = stream.ReadByte();
+		if (type != (int)FileType.PTableFile)
+			throw new CorruptIndexException("Corrupted PTable.", new InvalidFileException("Wrong type of PTable."));
+		var version = stream.ReadByte();
+		if (version == -1)
+			throw new CorruptIndexException("Couldn't read version of PTable from header.",
+				new InvalidFileException("Invalid PTable file."));
+		return new PTableHeader((byte)version);
+	}
+}
diff --git a/src/KurrentDB.Core/Index/ScavengeResult.cs b/src/KurrentDB.Core/Index/ScavengeResult.cs
new file mode 100644
index 00000000000..bebde2d0882
--- /dev/null
+++ b/src/KurrentDB.Core/Index/ScavengeResult.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Index;
+
+public class ScavengeResult {
+	public readonly IndexMap ScavengedMap;
+	public readonly bool IsSuccess;
+	public readonly PTable OldTable;
+	public readonly PTable NewTable;
+	public readonly long SpaceSaved;
+	public readonly int Level;
+	public readonly int Index;
+
+	private ScavengeResult(IndexMap scavengedMap, bool isSuccess, PTable oldTable, PTable newTable, long spaceSaved,
+		int level, int index) {
+		ScavengedMap = scavengedMap;
+		IsSuccess = isSuccess;
+		OldTable = oldTable;
+		NewTable = newTable;
+		SpaceSaved = spaceSaved;
+		Level = level;
+		Index = index;
+	}
+
+	public static ScavengeResult Success(IndexMap scavengedMap, PTable oldTable, PTable newTable, long spaceSaved,
+		int level, int index) {
+		return new ScavengeResult(scavengedMap, true, oldTable, newTable, spaceSaved, level, index);
+	}
+
+	public static ScavengeResult Failed(PTable oldTable, int level, int index) {
+		return new ScavengeResult(null, false, oldTable, null, 0, level, index);
+	}
+}
diff --git a/src/KurrentDB.Core/Index/SortedListExtensions.cs b/src/KurrentDB.Core/Index/SortedListExtensions.cs
new file mode 100644
index 00000000000..21e0517a26b
--- /dev/null
+++ b/src/KurrentDB.Core/Index/SortedListExtensions.cs
@@ -0,0 +1,142 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core.Index;
+
+public static class SortedListExtensions {
+	/// <summary>
+	/// Returns the index of smallest (according to comparer) element greater than or equal to provided key.
+	/// Returns -1 if all keys are smaller than provided key.
+	/// </summary>
+	public static int LowerBound<TKey, TValue>(this SortedList<TKey, TValue> list, TKey key) {
+		if (list.Count == 0)
+			return -1;
+
+		var comparer = list.Comparer;
+		if (comparer.Compare(list.Keys[list.Keys.Count - 1], key) < 0)
+			return -1; // if all elements are smaller, then no lower bound
+
+		int l = 0;
+		int r = list.Count - 1;
+		while (l < r) {
+			int m = l + (r - l) / 2;
+			if (comparer.Compare(list.Keys[m], key) >= 0)
+				r = m;
+			else
+				l = m + 1;
+		}
+
+		return r;
+	}
+
+	/// <summary>
+	/// Returns the index of largest (according to comparer) element less than or equal to provided key.
+	/// Returns -1 if all keys are greater than provided key.
+	/// </summary>
+	public static int UpperBound<TKey, TValue>(
+		this SortedList<TKey, TValue> list,
+		TKey key,
+		IComparer<TKey> comparer = null,
+		Func<TKey, bool> continueSearch = null) {
+
+		if (continueSearch == null)
+			continueSearch = _ => true;
+
+		if (comparer == null)
+			comparer = list.Comparer;
+
+		if (list.Count == 0)
+			return -1;
+
+		if (!continueSearch(list.Keys[0]))
+			throw new SearchStoppedException();
+
+		if (comparer.Compare(key, list.Keys[0]) < 0)
+			return -1; // if all elements are greater, then no upper bound
+
+		int l = 0;
+		int r = list.Count - 1;
+		while (l < r) {
+			int m = l + (r - l + 1) / 2;
+			if (!continueSearch(list.Keys[m]))
+				throw new SearchStoppedException();
+
+			if (comparer.Compare(list.Keys[m], key) <= 0)
+				l = m;
+			else
+				r = m - 1;
+		}
+
+		if (!continueSearch(list.Keys[l]))
+			throw new SearchStoppedException();
+
+		return l;
+	}
+
+	public static async ValueTask<int> UpperBound<TKey, TValue>(
+		this SortedList<TKey, TValue> list,
+		TKey key,
+		IComparer<TKey> comparer,
+		Func<TKey, CancellationToken, ValueTask<bool>> continueSearch,
+		CancellationToken token) {
+
+		if (list.Count is 0)
+			return -1;
+
+		if (!await continueSearch(list.Keys[0], token))
+			throw new SearchStoppedException();
+
+		if (comparer.Compare(key, list.Keys[0]) < 0)
+			return -1; // if all elements are greater, then no upper bound
+
+		int l = 0;
+		int r = list.Count - 1;
+		while (l < r) {
+			int m = l + (r - l + 1) / 2;
+			if (!await continueSearch(list.Keys[m], token))
+				throw new SearchStoppedException();
+
+			if (comparer.Compare(list.Keys[m], key) <= 0)
+				l = m;
+			else
+				r = m - 1;
+		}
+
+		if (!await continueSearch(list.Keys[l], token))
+			throw new SearchStoppedException();
+
+		return l;
+	}
+
+	/// <summary>
+	/// Returns the index of largest (according to comparer) element that matches the predicate.
+	/// Returns -1 if none of the keys match the predicate.
+	/// </summary>
+	public static async ValueTask<int> FindMax<TKey, TValue>(
+		this SortedList<TKey, TValue> list,
+		Func<TKey, CancellationToken, ValueTask<bool>> predicate,
+		CancellationToken token) {
+
+		if (list.Count is 0)
+			return -1;
+
+		int maxIdx = -1;
+
+		for (int i = 0; i < list.Keys.Count; i++) {
+			if (!await predicate(list.Keys[i], token))
+				continue;
+
+			if (maxIdx is -1 || list.Comparer.Compare(list.Keys[i], list.Keys[maxIdx]) > 0)
+				maxIdx = i;
+		}
+
+		return maxIdx;
+	}
+}
+
+public class SearchStoppedException : Exception;
diff --git a/src/KurrentDB.Core/Index/TableIndex.cs b/src/KurrentDB.Core/Index/TableIndex.cs
new file mode 100644
index 00000000000..60b5c8b0976
--- /dev/null
+++ b/src/KurrentDB.Core/Index/TableIndex.cs
@@ -0,0 +1,1010 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Diagnostics;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.Settings;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.Util;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Index;
+
+public abstract class TableIndex {
+	internal static readonly IndexEntry InvalidIndexEntry = new IndexEntry(0, -1, -1);
+	public const string IndexMapFilename = "indexmap";
+	public const string ForceIndexVerifyFilename = ".forceverify";
+	protected static readonly ILogger Log = Serilog.Log.ForContext<TableIndex>();
+}
+
+public class TableIndex<TStreamId> : TableIndex, ITableIndex<TStreamId> {
+	private const int MaxMemoryTables = 1;
+
+	public long CommitCheckpoint {
+		get { return Interlocked.Read(ref _commitCheckpoint); }
+	}
+
+	public long PrepareCheckpoint {
+		get { return Interlocked.Read(ref _prepareCheckpoint); }
+	}
+
+	private readonly int _maxSizeForMemory;
+	private readonly int _maxTablesPerLevel;
+	private readonly bool _additionalReclaim;
+	private readonly bool _inMem;
+	private readonly bool _skipIndexVerify;
+	private readonly int _indexCacheDepth;
+	private readonly bool _useBloomFilter;
+	private readonly int _lruCacheSize;
+	private readonly int _initializationThreads;
+	private readonly byte _ptableVersion;
+	private readonly string _directory;
+	private readonly Func<IMemTable> _memTableFactory;
+	private readonly Func<TFReaderLease> _tfReaderFactory;
+	private readonly IIndexFilenameProvider _fileNameProvider;
+	private readonly IIndexStatusTracker _statusTracker;
+
+	private readonly object _awaitingTablesLock = new object();
+
+	private IndexMap _indexMap;
+	private List<TableItem> _awaitingMemTables;
+	private volatile bool _isManualMergePending;
+
+	private long _commitCheckpoint = -1;
+	private long _prepareCheckpoint = -1;
+
+	// there are two background processes, scavenge and writing/merging ptables.
+	private volatile bool _backgroundRunning;
+	private readonly ManualResetEventSlim _backgroundRunningEvent = new ManualResetEventSlim(true);
+
+	private IHasher<TStreamId> _lowHasher;
+	private IHasher<TStreamId> _highHasher;
+	private readonly TStreamId _emptyStreamId;
+
+	private bool _initialized;
+	private readonly int _maxAutoMergeIndexLevel;
+	private readonly int _pTableMaxReaderCount;
+
+	public TableIndex(string directory,
+		IHasher<TStreamId> lowHasher,
+		IHasher<TStreamId> highHasher,
+		TStreamId emptyStreamId,
+		Func<IMemTable> memTableFactory,
+		Func<TFReaderLease> tfReaderFactory,
+		byte ptableVersion,
+		int maxAutoMergeIndexLevel,
+		int pTableMaxReaderCount,
+		int maxSizeForMemory = 1000000,
+		int maxTablesPerLevel = 4,
+		bool additionalReclaim = false,
+		bool inMem = false,
+		bool skipIndexVerify = false,
+		int indexCacheDepth = 16,
+		int initializationThreads = 1,
+		bool useBloomFilter = true,
+		int lruCacheSize = 1_000_000,
+		IIndexStatusTracker statusTracker = null) {
+
+		Ensure.NotNullOrEmpty(directory, "directory");
+		Ensure.NotNull(memTableFactory, "memTableFactory");
+		Ensure.NotNull(lowHasher, "lowHasher");
+		Ensure.NotNull(highHasher, "highHasher");
+		Ensure.NotNull(tfReaderFactory, "tfReaderFactory");
+		Ensure.Positive(initializationThreads, "initializationThreads");
+		Ensure.Positive(pTableMaxReaderCount, "pTableMaxReaderCount");
+
+		if (maxTablesPerLevel <= 1)
+			throw new ArgumentOutOfRangeException("maxTablesPerLevel");
+
+		if (indexCacheDepth > 28 || indexCacheDepth < 8)
+			throw new ArgumentOutOfRangeException("indexCacheDepth");
+
+		_directory = directory;
+		_memTableFactory = memTableFactory;
+		_tfReaderFactory = tfReaderFactory;
+		_fileNameProvider = new GuidFilenameProvider(directory);
+		_statusTracker = statusTracker ?? new IndexStatusTracker.NoOp();
+		_maxSizeForMemory = maxSizeForMemory;
+		_maxTablesPerLevel = maxTablesPerLevel;
+		_additionalReclaim = additionalReclaim;
+		_inMem = inMem;
+		_skipIndexVerify = ShouldForceIndexVerify() ? false : skipIndexVerify;
+		_indexCacheDepth = indexCacheDepth;
+		_initializationThreads = initializationThreads;
+		_useBloomFilter = useBloomFilter;
+		_lruCacheSize = lruCacheSize;
+		_ptableVersion = ptableVersion;
+		_awaitingMemTables = new List<TableItem> { new TableItem(_memTableFactory(), -1, -1, 0) };
+
+		_lowHasher = lowHasher;
+		_highHasher = highHasher;
+		_emptyStreamId = emptyStreamId;
+
+		_maxAutoMergeIndexLevel = maxAutoMergeIndexLevel;
+		_pTableMaxReaderCount = pTableMaxReaderCount;
+	}
+
+	public void Initialize(long chaserCheckpoint) {
+		Ensure.Nonnegative(chaserCheckpoint, "chaserCheckpoint");
+
+		//NOT THREAD SAFE (assumes one thread)
+		if (_initialized)
+			throw new IOException("TableIndex is already initialized.");
+		_initialized = true;
+
+		if (_inMem) {
+			_indexMap = IndexMap.CreateEmpty(_maxTablesPerLevel, int.MaxValue, _pTableMaxReaderCount);
+			_prepareCheckpoint = _indexMap.PrepareCheckpoint;
+			_commitCheckpoint = _indexMap.CommitCheckpoint;
+			return;
+		}
+
+		if (ShouldForceIndexVerify()) {
+			Log.Debug("Forcing verification of index files...");
+		}
+
+		CreateIfDoesNotExist(_directory);
+		var indexmapFile = Path.Combine(_directory, IndexMapFilename);
+
+		// if TableIndex's CommitCheckpoint is >= amount of written TFChunk data,
+		// we'll have to remove some of PTables as they point to non-existent data
+		// this can happen (very unlikely, though) on leader crash
+		try {
+			_indexMap = IndexMap.FromFile(indexmapFile, _maxTablesPerLevel, true, _indexCacheDepth,
+				_skipIndexVerify,
+				useBloomFilter: _useBloomFilter,
+				lruCacheSize: _lruCacheSize,
+				threads: _initializationThreads,
+				maxAutoMergeLevel: _maxAutoMergeIndexLevel,
+				pTableMaxReaderCount: _pTableMaxReaderCount);
+			if (_indexMap.CommitCheckpoint >= chaserCheckpoint) {
+				_indexMap.Dispose(TimeSpan.FromMilliseconds(5000));
+				throw new CorruptIndexException(String.Format(
+					"IndexMap's CommitCheckpoint ({0}) is greater than ChaserCheckpoint ({1}).",
+					_indexMap.CommitCheckpoint, chaserCheckpoint));
+			}
+
+			//verification should be completed by now
+			DeleteForceIndexVerifyFile();
+		} catch (CorruptIndexException exc) {
+			Log.Error(exc, "ReadIndex is corrupted...");
+			LogIndexMapContent(indexmapFile);
+			DumpAndCopyIndex();
+			File.SetAttributes(indexmapFile, FileAttributes.Normal);
+			File.Delete(indexmapFile);
+			DeleteForceIndexVerifyFile();
+			_indexMap = IndexMap.FromFile(indexmapFile, _maxTablesPerLevel, true, _indexCacheDepth,
+				_skipIndexVerify,
+				useBloomFilter: _useBloomFilter,
+				lruCacheSize: _lruCacheSize,
+				threads: _initializationThreads,
+				maxAutoMergeLevel: _maxAutoMergeIndexLevel,
+				pTableMaxReaderCount: _pTableMaxReaderCount);
+		}
+
+		_prepareCheckpoint = _indexMap.PrepareCheckpoint;
+		_commitCheckpoint = _indexMap.CommitCheckpoint;
+
+		// clean up all other remaining files
+		var indexFiles = _indexMap.InOrder().SelectMany(x => new[] {
+				Path.GetFileName(x.Filename),
+ 					Path.GetFileName(x.BloomFilterFilename) })
+			.Union(new[] { IndexMapFilename });
+		var toDeleteFiles = Directory.EnumerateFiles(_directory).Select(Path.GetFileName)
+			.Except(indexFiles, StringComparer.OrdinalIgnoreCase);
+		foreach (var filePath in toDeleteFiles) {
+			var file = Path.Combine(_directory, filePath);
+			File.SetAttributes(file, FileAttributes.Normal);
+			File.Delete(file);
+		}
+	}
+
+	private static void LogIndexMapContent(string indexmapFile) {
+		try {
+			Log.Error("IndexMap '{indexMap}' content:\n {content}", indexmapFile,
+				Helper.FormatBinaryDump(File.ReadAllBytes(indexmapFile)));
+		} catch (Exception exc) {
+			Log.Error(exc, "Unexpected error while dumping IndexMap '{indexMap}'.", indexmapFile);
+		}
+	}
+
+	private void DumpAndCopyIndex() {
+		string dumpPath = null;
+		try {
+			dumpPath = Path.Combine(Path.GetDirectoryName(_directory),
+				string.Format("index-backup-{0:yyyy-MM-dd_HH-mm-ss.fff}", DateTime.UtcNow));
+			Log.Error("Making backup of index folder for inspection to {dumpPath}...", dumpPath);
+			FileUtils.DirectoryCopy(_directory, dumpPath, copySubDirs: true);
+		} catch (Exception exc) {
+			Log.Error(exc, "Unexpected error while copying index to backup dir '{dumpPath}'", dumpPath);
+		}
+	}
+
+	private static void CreateIfDoesNotExist(string directory) {
+		if (!Directory.Exists(directory))
+			Directory.CreateDirectory(directory);
+	}
+
+	public void Add(long commitPos, TStreamId streamId, long version, long position) {
+		Ensure.Nonnegative(commitPos, "commitPos");
+		Ensure.Nonnegative(version, "version");
+		Ensure.Nonnegative(position, "position");
+
+		AddEntries(commitPos, new[] { CreateIndexKey(streamId, version, position) });
+	}
+
+	public void AddEntries(long commitPos, IList<IndexKey<TStreamId>> entries) {
+		//should only be called on a single thread.
+		var table = (IMemTable)_awaitingMemTables[0].Table; // always a memtable
+
+		var collection = entries.Select(x => CreateIndexEntry(x)).ToList();
+		table.AddEntries(collection);
+
+		if (table.Count >= _maxSizeForMemory) {
+			long prepareCheckpoint = collection[0].Position;
+			for (int i = 1, n = collection.Count; i < n; ++i) {
+				prepareCheckpoint = Math.Max(prepareCheckpoint, collection[i].Position);
+			}
+
+			TryProcessAwaitingTables(commitPos, prepareCheckpoint);
+		}
+	}
+
+	public Task MergeIndexes() {
+		TryManualMerge();
+		return Task.CompletedTask;
+	}
+
+	public bool IsBackgroundTaskRunning {
+		get { return _backgroundRunning; }
+	}
+
+	//Automerge only
+	private void TryProcessAwaitingTables(long commitPos, long prepareCheckpoint) {
+		lock (_awaitingTablesLock) {
+			var newTables = new List<TableItem> { new TableItem(_memTableFactory(), -1, -1, 0) };
+			newTables.AddRange(_awaitingMemTables.Select(
+				(x, i) => i == 0 ? new TableItem(x.Table, prepareCheckpoint, commitPos, x.Level) : x));
+
+			Log.Debug("Switching MemTable, currently: {awaitingMemTables} awaiting tables.", newTables.Count);
+
+			_awaitingMemTables = newTables;
+			if (_inMem)
+				return;
+			TryProcessAwaitingTables();
+
+			if (_additionalReclaim)
+				ThreadPool.QueueUserWorkItem(x => ReclaimMemoryIfNeeded(_awaitingMemTables));
+		}
+	}
+
+	public void TryManualMerge() {
+		_isManualMergePending = true;
+		TryProcessAwaitingTables();
+	}
+
+	private void TryProcessAwaitingTables() {
+		lock (_awaitingTablesLock) {
+			if (!_backgroundRunning) {
+				_backgroundRunningEvent.Reset();
+				_backgroundRunning = true;
+				ThreadPool.QueueUserWorkItem(x => ReadOffQueue());
+			}
+		}
+	}
+
+	private void ReadOffQueue() {
+		try {
+			using var _ = _statusTracker.StartMerging();
+			while (true) {
+				var indexmapFile = Path.Combine(_directory, IndexMapFilename);
+
+				if (_isManualMergePending) {
+					Log.Debug("Performing manual index merge.");
+
+					_isManualMergePending = false;
+					var manualMergeResult = _indexMap.TryManualMerge(
+						_fileNameProvider,
+						_ptableVersion,
+						_indexCacheDepth,
+						_skipIndexVerify,
+						useBloomFilter: _useBloomFilter,
+						lruCacheSize: _lruCacheSize);
+
+					if (manualMergeResult.HasMergedAny) {
+						_indexMap = manualMergeResult.MergedMap;
+						_indexMap.SaveToFile(indexmapFile);
+						manualMergeResult.ToDelete.ForEach(x => x.MarkForDestruction());
+					}
+					Log.Debug("Manual index merge completed: {numMergedPTables} PTable(s) merged.", manualMergeResult.ToDelete.Count);
+				}
+
+				TableItem tableItem;
+				//ISearchTable table;
+				lock (_awaitingTablesLock) {
+					Log.Debug("Awaiting tables queue size is: {awaitingMemTables}.", _awaitingMemTables.Count);
+					if (_awaitingMemTables.Count == 1) {
+						return;
+					}
+
+					tableItem = _awaitingMemTables[_awaitingMemTables.Count - 1];
+				}
+
+				PTable ptable;
+				var memtable = tableItem.Table as IMemTable;
+				if (memtable != null) {
+					memtable.MarkForConversion();
+					ptable = PTable.FromMemtable(memtable, _fileNameProvider.GetFilenameNewTable(),
+						ESConsts.PTableInitialReaderCount,
+						_pTableMaxReaderCount,
+						_indexCacheDepth,
+						_skipIndexVerify,
+						useBloomFilter: _useBloomFilter,
+						lruCacheSize: _lruCacheSize);
+				} else
+					ptable = (PTable)tableItem.Table;
+
+				var addResult = _indexMap.AddPTable(ptable, tableItem.PrepareCheckpoint, tableItem.CommitCheckpoint);
+				_indexMap = addResult.NewMap;
+				_indexMap.SaveToFile(indexmapFile);
+
+				if (addResult.CanMergeAny) {
+					MergeResult mergeResult;
+					do {
+						mergeResult = _indexMap.TryMergeOneLevel(
+							_fileNameProvider,
+							_ptableVersion,
+							_indexCacheDepth,
+							_skipIndexVerify,
+							useBloomFilter: _useBloomFilter,
+							lruCacheSize: _lruCacheSize);
+
+						if (mergeResult.HasMergedAny) {
+							_indexMap = mergeResult.MergedMap;
+							_indexMap.SaveToFile(indexmapFile);
+							mergeResult.ToDelete.ForEach(x => x.MarkForDestruction());
+						}
+					} while (mergeResult.CanMergeAny);
+				}
+
+				lock (_awaitingTablesLock) {
+					var memTables = _awaitingMemTables.ToList();
+
+					var corrTable = memTables.First(x => x.Table.Id == ptable.Id);
+					memTables.Remove(corrTable);
+
+					// parallel thread could already switch table,
+					// so if we have another PTable instance with same ID,
+					// we need to kill that instance as we added ours already
+					if (!ReferenceEquals(corrTable.Table, ptable) && corrTable.Table is PTable)
+						((PTable)corrTable.Table).MarkForDestruction();
+
+					Log.Debug("There are now {awaitingMemTables} awaiting tables.", memTables.Count);
+					_awaitingMemTables = memTables;
+				}
+			}
+		} catch (FileBeingDeletedException exc) {
+			Log.Error(exc,
+				"Could not acquire chunk in TableIndex.ReadOffQueue. It is OK if node is shutting down.");
+		} catch (Exception exc) {
+			Log.Error(exc, "Error in TableIndex.ReadOffQueue");
+			throw;
+		} finally {
+			lock (_awaitingTablesLock) {
+				_backgroundRunning = false;
+				_backgroundRunningEvent.Set();
+			}
+		}
+	}
+
+	public void WaitForBackgroundTasks(int millisecondsTimeout = 7_000) {
+		if (!_backgroundRunningEvent.Wait(millisecondsTimeout)) {
+			throw new TimeoutException(
+				$"Waiting for TableIndex background tasks took longer than {millisecondsTimeout:N0} ms.");
+		}
+	}
+
+	public ValueTask Scavenge(IIndexScavengerLog log, CancellationToken ct) =>
+		Scavenge(shouldKeep: null, log: log, ct: ct);
+
+	public async ValueTask Scavenge(
+		Func<IndexEntry, CancellationToken, ValueTask<bool>> shouldKeep,
+		IIndexScavengerLog log,
+		CancellationToken ct) {
+
+		GetExclusiveBackgroundTask(ct);
+		var sw = Stopwatch.StartNew();
+
+		try {
+			using var _ = _statusTracker.StartScavenging();
+			Log.Information("Starting scavenge of TableIndex.");
+			await ScavengeInternal(shouldKeep, log, ct);
+		} finally {
+			lock (_awaitingTablesLock) {
+				_backgroundRunning = false;
+				_backgroundRunningEvent.Set();
+
+				TryProcessAwaitingTables();
+			}
+
+			Log.Information("Completed scavenge of TableIndex.  Elapsed: {elapsed}", sw.Elapsed);
+		}
+	}
+
+	private async ValueTask ScavengeInternal(
+		Func<IndexEntry, CancellationToken, ValueTask<bool>> shouldKeep,
+		IIndexScavengerLog log,
+		CancellationToken ct) {
+
+		var toScavenge = _indexMap.InOrder().ToList();
+
+		foreach (var pTable in toScavenge) {
+			var startNew = new Timestamp();
+
+			try {
+				using (var reader = _tfReaderFactory()) {
+					var indexmapFile = Path.Combine(_directory, IndexMapFilename);
+
+					Func<IndexEntry, CancellationToken, ValueTask<bool>> existsAt =
+						(entry, token) => reader.ExistsAt(entry.Position, token);
+
+					var scavengeResult = await _indexMap.Scavenge(
+						pTable.Id,
+						ct,
+						shouldKeep ?? existsAt,
+						_fileNameProvider,
+						_ptableVersion,
+						_indexCacheDepth,
+						_skipIndexVerify,
+						useBloomFilter: _useBloomFilter,
+						lruCacheSize: _lruCacheSize);
+
+					if (scavengeResult.IsSuccess) {
+						_indexMap = scavengeResult.ScavengedMap;
+						_indexMap.SaveToFile(indexmapFile);
+
+						scavengeResult.OldTable.MarkForDestruction();
+
+						var entriesDeleted = scavengeResult.OldTable.Count - scavengeResult.NewTable.Count;
+						log.IndexTableScavenged(scavengeResult.Level, scavengeResult.Index, startNew.Elapsed,
+							entriesDeleted, scavengeResult.NewTable.Count, scavengeResult.SpaceSaved);
+					} else {
+						log.IndexTableNotScavenged(scavengeResult.Level, scavengeResult.Index, startNew.Elapsed,
+							pTable.Count, "");
+					}
+				}
+			} catch (OperationCanceledException) {
+				log.IndexTableNotScavenged(-1, -1, startNew.Elapsed, pTable.Count, "Scavenge cancelled");
+				throw;
+			} catch (Exception ex) {
+				log.IndexTableNotScavenged(-1, -1, startNew.Elapsed, pTable.Count, ex.Message);
+				throw;
+			}
+		}
+	}
+
+	private void GetExclusiveBackgroundTask(CancellationToken ct) {
+		while (true) {
+			lock (_awaitingTablesLock) {
+				if (!_backgroundRunning) {
+					_backgroundRunningEvent.Reset();
+					_backgroundRunning = true;
+					return;
+				}
+			}
+
+			Log.Information("Waiting for TableIndex background task to complete before starting scavenge.");
+			_backgroundRunningEvent.Wait(ct);
+		}
+	}
+
+	private void ReclaimMemoryIfNeeded(List<TableItem> awaitingMemTables) {
+		var toPutOnDisk = awaitingMemTables.OfType<IMemTable>().Count() - MaxMemoryTables;
+		for (var i = awaitingMemTables.Count - 1; i >= 1 && toPutOnDisk > 0; i--) {
+			var memtable = awaitingMemTables[i].Table as IMemTable;
+			if (memtable == null || !memtable.MarkForConversion())
+				continue;
+
+			Log.Debug("Putting awaiting file as PTable instead of MemTable [{id}].", memtable.Id);
+
+			var ptable = PTable.FromMemtable(memtable, _fileNameProvider.GetFilenameNewTable(),
+				ESConsts.PTableInitialReaderCount,
+				_pTableMaxReaderCount,
+				_indexCacheDepth,
+				_skipIndexVerify,
+				useBloomFilter: _useBloomFilter,
+				lruCacheSize: _lruCacheSize);
+			var swapped = false;
+			lock (_awaitingTablesLock) {
+				for (var j = _awaitingMemTables.Count - 1; j >= 1; j--) {
+					var tableItem = _awaitingMemTables[j];
+					if (!(tableItem.Table is IMemTable) || tableItem.Table.Id != ptable.Id)
+						continue;
+					swapped = true;
+					_awaitingMemTables[j] = new TableItem(ptable,
+						tableItem.PrepareCheckpoint,
+						tableItem.CommitCheckpoint,
+						tableItem.Level);
+					break;
+				}
+			}
+
+			if (!swapped)
+				ptable.MarkForDestruction();
+			toPutOnDisk--;
+		}
+	}
+
+	public void Visit(Action<PTable> f) {
+		int counter = 0;
+		while (counter < 5) {
+			counter++;
+			try {
+				VisitInternal(f);
+				return;
+			} catch (FileBeingDeletedException) {
+				Log.Debug("File being deleted.");
+			} catch (MaybeCorruptIndexException) {
+				ForceIndexVerifyOnNextStartup();
+				throw;
+			}
+		}
+
+		throw new InvalidOperationException("Files are locked.");
+	}
+
+	private void VisitInternal(Action<PTable> f) {
+		var map = _indexMap;
+		foreach (var table in map.InOrder()) {
+			f(table);
+		}
+	}
+
+	public bool TryGetOneValue(TStreamId streamId, long version, out long position) {
+		ulong stream = CreateHash(streamId);
+		int counter = 0;
+		while (counter < 5) {
+			counter++;
+			try {
+				return TryGetOneValueInternal(stream, version, out position);
+			} catch (FileBeingDeletedException) {
+				Log.Debug("File being deleted.");
+			} catch (MaybeCorruptIndexException) {
+				ForceIndexVerifyOnNextStartup();
+				throw;
+			}
+		}
+
+		throw new InvalidOperationException("Files are locked.");
+	}
+
+	private bool TryGetOneValueInternal(ulong stream, long version, out long position) {
+		if (version < 0)
+			throw new ArgumentOutOfRangeException("version");
+
+		var awaiting = _awaitingMemTables;
+		foreach (var tableItem in awaiting) {
+			if (tableItem.Table.TryGetOneValue(stream, version, out position))
+				return true;
+		}
+
+		var map = _indexMap;
+		foreach (var table in map.InOrder()) {
+			if (table.TryGetOneValue(stream, version, out position))
+				return true;
+		}
+
+		position = 0;
+		return false;
+	}
+
+	public bool TryGetLatestEntry(TStreamId streamId, out IndexEntry entry) {
+		ulong stream = CreateHash(streamId);
+		var counter = 0;
+		while (counter < 5) {
+			counter++;
+			try {
+				return TryGetLatestEntryInternal(stream, out entry);
+			} catch (FileBeingDeletedException) {
+				Log.Debug("File being deleted.");
+			} catch (MaybeCorruptIndexException) {
+				ForceIndexVerifyOnNextStartup();
+				throw;
+			}
+		}
+
+		throw new InvalidOperationException("Files are locked.");
+	}
+
+	private bool TryGetLatestEntryInternal(ulong stream, out IndexEntry entry) {
+		var awaiting = _awaitingMemTables;
+		foreach (var t in awaiting) {
+			if (t.Table.TryGetLatestEntry(stream, out entry))
+				return true;
+		}
+
+		var map = _indexMap;
+		foreach (var table in map.InOrder()) {
+			if (table.TryGetLatestEntry(stream, out entry))
+				return true;
+		}
+
+		entry = InvalidIndexEntry;
+		return false;
+	}
+
+	public async ValueTask<IndexEntry?> TryGetLatestEntry(ulong stream, long beforePosition, Func<IndexEntry, CancellationToken, ValueTask<bool>> isForThisStream, CancellationToken token) {
+		var counter = 0;
+		while (counter < 5) {
+			counter++;
+			try {
+				return await TryGetLatestEntryInternal(stream, beforePosition, isForThisStream, token);
+			} catch (FileBeingDeletedException) {
+				Log.Debug("File being deleted.");
+			} catch (MaybeCorruptIndexException) {
+				ForceIndexVerifyOnNextStartup();
+				throw;
+			}
+		}
+
+		throw new InvalidOperationException("Files are locked.");
+	}
+
+	public ValueTask<IndexEntry?> TryGetLatestEntry(TStreamId streamId, long beforePosition, Func<IndexEntry, CancellationToken, ValueTask<bool>> isForThisStream, CancellationToken token) {
+		ulong stream = CreateHash(streamId);
+		return TryGetLatestEntry(stream, beforePosition, isForThisStream, token);
+	}
+
+	private async ValueTask<IndexEntry?> TryGetLatestEntryInternal(ulong stream, long beforePosition, Func<IndexEntry, CancellationToken, ValueTask<bool>> isForThisStream, CancellationToken token) {
+		var awaiting = _awaitingMemTables;
+
+		foreach (var t in awaiting) {
+			if (await t.Table.TryGetLatestEntry(stream, beforePosition, isForThisStream, token) is { } entry)
+				return entry;
+		}
+
+		var map = _indexMap;
+		foreach (var table in map.InOrder()) {
+			if (await table.TryGetLatestEntry(stream, beforePosition, isForThisStream, token) is { } entry)
+				return entry;
+		}
+
+		return null;
+	}
+
+	public bool TryGetOldestEntry(TStreamId streamId, out IndexEntry entry) {
+		ulong stream = CreateHash(streamId);
+		var counter = 0;
+		while (counter < 5) {
+			counter++;
+			try {
+				return TryGetOldestEntryInternal(stream, out entry);
+			} catch (FileBeingDeletedException) {
+				Log.Debug("File being deleted.");
+			} catch (MaybeCorruptIndexException) {
+				ForceIndexVerifyOnNextStartup();
+				throw;
+			}
+		}
+
+		throw new InvalidOperationException("Files are locked.");
+	}
+
+	private bool TryGetOldestEntryInternal(ulong stream, out IndexEntry entry) {
+		var map = _indexMap;
+		foreach (var table in map.InReverseOrder()) {
+			if (table.TryGetOldestEntry(stream, out entry))
+				return true;
+		}
+
+		var awaiting = _awaitingMemTables;
+		for (var index = awaiting.Count - 1; index >= 0; index--) {
+			if (awaiting[index].Table.TryGetOldestEntry(stream, out entry))
+				return true;
+		}
+
+		entry = InvalidIndexEntry;
+		return false;
+	}
+
+	public bool TryGetNextEntry(TStreamId streamId, long afterVersion, out IndexEntry entry) {
+		ulong stream = CreateHash(streamId);
+		return TryGetNextEntry(stream, afterVersion, out entry);
+	}
+
+	public bool TryGetNextEntry(ulong stream, long afterVersion, out IndexEntry entry) {
+		var counter = 0;
+		while (counter < 5) {
+			counter++;
+			try {
+				return TryGetNextEntryInternal(stream, afterVersion, out entry);
+			} catch (FileBeingDeletedException) {
+				Log.Debug("File being deleted.");
+			} catch (MaybeCorruptIndexException) {
+				ForceIndexVerifyOnNextStartup();
+				throw;
+			}
+		}
+
+		throw new InvalidOperationException("Files are locked.");
+	}
+
+	private bool TryGetNextEntryInternal(ulong stream, long afterVersion, out IndexEntry entry) {
+		var map = _indexMap;
+		foreach (var table in map.InReverseOrder()) {
+			if (table.TryGetNextEntry(stream, afterVersion, out entry))
+				return true;
+		}
+
+		var awaiting = _awaitingMemTables;
+		for (var index = awaiting.Count - 1; index >= 0; index--) {
+			if (awaiting[index].Table.TryGetNextEntry(stream, afterVersion, out entry))
+				return true;
+		}
+
+		entry = InvalidIndexEntry;
+		return false;
+	}
+
+	public bool TryGetPreviousEntry(TStreamId streamId, long beforeVersion, out IndexEntry entry) {
+		ulong stream = CreateHash(streamId);
+		return TryGetPreviousEntry(stream, beforeVersion, out entry);
+	}
+
+	public bool TryGetPreviousEntry(ulong stream, long beforeVersion, out IndexEntry entry) {
+		var counter = 0;
+		while (counter < 5) {
+			counter++;
+			try {
+				return TryGetPreviousEntryInternal(stream, beforeVersion, out entry);
+			} catch (FileBeingDeletedException) {
+				Log.Debug("File being deleted.");
+			} catch (MaybeCorruptIndexException) {
+				ForceIndexVerifyOnNextStartup();
+				throw;
+			}
+		}
+
+		throw new InvalidOperationException("Files are locked.");
+	}
+
+	private bool TryGetPreviousEntryInternal(ulong stream, long beforeVersion, out IndexEntry entry) {
+		var awaiting = _awaitingMemTables;
+
+		foreach (var t in awaiting) {
+			if (t.Table.TryGetPreviousEntry(stream, beforeVersion, out entry))
+				return true;
+		}
+
+		var map = _indexMap;
+		foreach (var table in map.InOrder()) {
+			if (table.TryGetPreviousEntry(stream, beforeVersion, out entry))
+				return true;
+		}
+
+		entry = InvalidIndexEntry;
+		return false;
+	}
+
+	public IReadOnlyList<IndexEntry> GetRange(TStreamId streamId, long startVersion, long endVersion,
+		int? limit = null) => GetRange(CreateHash(streamId), startVersion, endVersion, limit);
+
+	public IReadOnlyList<IndexEntry> GetRange(ulong stream, long startVersion, long endVersion, int? limit = null) {
+		var counter = 0;
+		while (counter < 5) {
+			counter++;
+			try {
+				return GetRangeInternal(stream, startVersion, endVersion, limit);
+			} catch (FileBeingDeletedException) {
+				Log.Debug("File being deleted.");
+			} catch (MaybeCorruptIndexException) {
+				ForceIndexVerifyOnNextStartup();
+				throw;
+			}
+		}
+
+		throw new InvalidOperationException("Files are locked.");
+	}
+
+	private IReadOnlyList<IndexEntry> GetRangeInternal(ulong hash, long startVersion, long endVersion,
+		int? limit = null) {
+		if (startVersion < 0)
+			throw new ArgumentOutOfRangeException("startVersion");
+		if (endVersion < 0)
+			throw new ArgumentOutOfRangeException("endVersion");
+
+		// 1. assemble results per table for memtables and ptables
+		// discard any results with 0 entries.
+		var resultsPerTable = new List<IReadOnlyList<IndexEntry>>(16);
+
+		var awaiting = _awaitingMemTables;
+		for (int index = 0; index < awaiting.Count; index++) {
+			var range = awaiting[index].Table.GetRange(hash, startVersion, endVersion, limit);
+			if (range.Count > 0)
+				resultsPerTable.Add(range);
+		}
+
+		var map = _indexMap;
+		foreach (var table in map.InOrder()) {
+			var range = table.GetRange(hash, startVersion, endVersion, limit);
+			if (range.Count > 0)
+				resultsPerTable.Add(range);
+		}
+
+		// 2. iterate through the per table results producing candidate enumerators
+		// if the results per table dont overlap then we can merge them much more quickly
+		// because they're already in order. this will be so in the common case of
+		// having no hash collisions.
+		var maybeInOrder = true;
+		var prevOldestVersion = long.MaxValue;
+		var totalEntryCount = 0;
+		var candidates = new List<IEnumerator<IndexEntry>>(resultsPerTable.Count);
+		foreach (var entries in resultsPerTable) {
+			var entriesEnumerator = entries.GetEnumerator();
+			entriesEnumerator.MoveNext();
+			candidates.Add(entriesEnumerator);
+
+			totalEntryCount += entries.Count;
+
+			if (maybeInOrder) {
+				var latestVersion = entriesEnumerator.Current.Version;
+
+				if (latestVersion >= prevOldestVersion) {
+					maybeInOrder = false;
+				}
+
+				var oldestVersion = entries[^1].Version;
+				prevOldestVersion = oldestVersion;
+			}
+		}
+		var areInOrder = maybeInOrder;
+
+		// 3. sort the entries by consuming the enumerators
+		//    removes duplicates
+		var last = new IndexEntry(0, 0, 0);
+		var first = true;
+
+		var sortedCandidates = new List<IndexEntry>(totalEntryCount);
+
+		// reverse so that typically the largest candidate is at the back, making the RemoveAt cheap
+		candidates.Reverse();
+
+		while (candidates.Count > 0) {
+			var maxIdx = areInOrder ? (candidates.Count - 1) : GetMaxOf(candidates);
+			var winner = candidates[maxIdx];
+
+			var best = winner.Current;
+			if (first ||
+				((last.Stream != best.Stream) && (last.Version != best.Version)) ||
+				last.Position != best.Position) {
+				last = best;
+				sortedCandidates.Add(best);
+				first = false;
+			}
+
+			if (!winner.MoveNext())
+				candidates.RemoveAt(maxIdx);
+		}
+
+		return sortedCandidates;
+	}
+
+	private static int GetMaxOf(List<IEnumerator<IndexEntry>> enumerators) {
+		var max = new IndexEntry(
+			stream: ulong.MinValue,
+			version: 0,
+			position: long.MinValue);
+
+		int idx = 0;
+		for (int i = 0; i < enumerators.Count; i++) {
+			var cur = enumerators[i].Current;
+			if (cur.CompareTo(max) > 0) {
+				max = cur;
+				idx = i;
+			}
+		}
+
+		return idx;
+	}
+
+	public void Close(bool removeFiles = true) {
+		if (!_backgroundRunningEvent.Wait(7000))
+			throw new TimeoutException("Could not finish background thread in reasonable time.");
+		if (_inMem)
+			return;
+		if (_indexMap == null)
+			return;
+		if (removeFiles) {
+			_indexMap.InOrder().ToList().ForEach(x => x.MarkForDestruction());
+			var fileName = Path.Combine(_directory, IndexMapFilename);
+			if (File.Exists(fileName)) {
+				File.SetAttributes(fileName, FileAttributes.Normal);
+				File.Delete(fileName);
+			}
+		} else {
+			_indexMap.InOrder().ToList().ForEach(x => x.Dispose());
+		}
+
+		_indexMap.InOrder().ToList().ForEach(x => x.WaitForDisposal(TimeSpan.FromMilliseconds(5000)));
+	}
+
+	private IndexEntry CreateIndexEntry(IndexKey<TStreamId> key) {
+		key = CreateIndexKey(key.StreamId, key.Version, key.Position);
+		return new IndexEntry(key.Hash, key.Version, key.Position);
+	}
+
+	private ulong CreateHash(TStreamId streamId) {
+		return (ulong)_lowHasher.Hash(streamId) << 32 | _highHasher.Hash(streamId);
+	}
+
+	/// newest to oldest
+	public IEnumerable<ISearchTable> IterateAllInOrder() {
+		var awaiting = _awaitingMemTables;
+		var map = _indexMap;
+
+		foreach (var tableItem in awaiting)
+			yield return tableItem.Table;
+
+		foreach (var table in map.InOrder())
+			yield return table;
+	}
+
+	private IndexKey<TStreamId> CreateIndexKey(TStreamId streamId, long version, long position) {
+		return new IndexKey<TStreamId>(streamId, version, position, CreateHash(streamId));
+	}
+
+	private class TableItem {
+		public readonly ISearchTable Table;
+		public readonly long PrepareCheckpoint;
+		public readonly long CommitCheckpoint;
+		public readonly int Level;
+
+		public TableItem(ISearchTable table, long prepareCheckpoint, long commitCheckpoint, int level) {
+			Table = table;
+			PrepareCheckpoint = prepareCheckpoint;
+			CommitCheckpoint = commitCheckpoint;
+			Level = level;
+		}
+	}
+
+	private void ForceIndexVerifyOnNextStartup() {
+		Log.Debug("Forcing index verification on next startup");
+		string path = Path.Combine(_directory, ForceIndexVerifyFilename);
+		try {
+			using (FileStream fs = new FileStream(path, FileMode.OpenOrCreate)) {
+			}
+
+			;
+		} catch {
+			Log.Error("Could not create force index verification file at: {path}", path);
+		}
+
+		return;
+	}
+
+	private bool ShouldForceIndexVerify() {
+		string path = Path.Combine(_directory, ForceIndexVerifyFilename);
+		return File.Exists(path);
+	}
+
+	private void DeleteForceIndexVerifyFile() {
+		string path = Path.Combine(_directory, ForceIndexVerifyFilename);
+		try {
+			if (File.Exists(path)) {
+				File.SetAttributes(path, FileAttributes.Normal);
+				File.Delete(path);
+			}
+		} catch {
+			Log.Error("Could not delete force index verification file at: {path}", path);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/KurrentDB.Core.csproj b/src/KurrentDB.Core/KurrentDB.Core.csproj
new file mode 100644
index 00000000000..5db17adb696
--- /dev/null
+++ b/src/KurrentDB.Core/KurrentDB.Core.csproj
@@ -0,0 +1,120 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+	</PropertyGroup>
+	<ItemGroup>
+		<FrameworkReference Include="Microsoft.AspNetCore.App" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="EventStore.Plugins" Version="25.2.5" />
+		<PackageReference Include="FluentStorage" Version="5.6.0" />
+		<PackageReference Include="FluentStorage.AWS" Version="5.5.0" />
+		<PackageReference Include="Google.Protobuf" Version="3.27.2" />
+		<PackageReference Include="Grpc.AspNetCore" Version="2.64.0" />
+		<PackageReference Include="Grpc.Tools" Version="2.65.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
+		<PackageReference Include="librdkafka.redist" Version="2.5.0" />
+		<PackageReference Include="Microsoft.FASTER.Core" Version="1.9.16" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.13" />
+		<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.6.0" />
+		<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.11.2-beta.1" />
+		<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
+		<PackageReference Include="Polly.Core" Version="8.5.2" />
+		<PackageReference Include="Quickenshtein" Version="1.5.1" />
+		<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.1" />
+		<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
+		<PackageReference Include="System.IO.Pipelines" Version="8.0.0" />
+		<PackageReference Include="System.Linq.Async" Version="6.0.1" />
+		<PackageReference Include="System.Net.Http" Version="4.3.4" />
+		<PackageReference Include="Microsoft.Diagnostics.NETCore.Client" Version="0.2.553101" />
+		<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.19" />
+		<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.0" />
+		<PackageReference Include="DotNext.IO" Version="5.18.2" />
+		<PackageReference Include="DotNext.Threading" Version="5.18.1" />
+		<PackageReference Include="DotNext.Unsafe" Version="5.18.0" />
+		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
+		<PackageReference Include="System.Threading.Channels" Version="9.0.1" />
+		<PackageReference Include="Scrutor" Version="5.0.2" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.Common\KurrentDB.Common.csproj" />
+		<ProjectReference Include="..\KurrentDB.Licensing\KurrentDB.Licensing.csproj" />
+		<ProjectReference Include="..\KurrentDB.LogV3\KurrentDB.LogV3.csproj" />
+		<ProjectReference Include="..\KurrentDB.Native\KurrentDB.Native.csproj" />
+		<ProjectReference Include="..\KurrentDB.Transport.Http\KurrentDB.Transport.Http.csproj" />
+		<ProjectReference Include="..\KurrentDB.Transport.Tcp\KurrentDB.Transport.Tcp.csproj" />
+		<ProjectReference Include="..\KurrentDB.NETCore.Compatibility\KurrentDB.NETCore.Compatibility.csproj" />
+		<ProjectReference Include="..\KurrentDB.SourceGenerators\KurrentDB.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+	</ItemGroup>
+	<ItemGroup>
+		<Protobuf Include="..\Protos\ClientAPI\ClientMessageDtos.proto">
+			<Link>Services\Transport\Tcp\protos\ClientMessageDtos.proto</Link>
+		</Protobuf>
+		<Protobuf Include="..\Protos\Grpc\code.proto" GrpcServices="Server" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
+			<Link>Services\Transport\Grpc\Protos\code.proto</Link>
+		</Protobuf>
+		<Protobuf Include="../Protos/Grpc/cluster.proto" GrpcServices="Both" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
+			<Link>Services\Transport\Grpc\Protos\cluster.proto</Link>
+		</Protobuf>
+		<Protobuf Include="..\Protos\Grpc\gossip.proto" GrpcServices="Server" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
+			<Link>Services\Transport\Grpc\Protos\gossip.proto</Link>
+		</Protobuf>
+		<Protobuf Include="..\Protos\Grpc\operations.proto" GrpcServices="Server" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
+			<Link>Services\Transport\Grpc\Protos\operations.proto</Link>
+		</Protobuf>
+		<Protobuf Include="..\Protos\Grpc\persistent.proto" GrpcServices="Both" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
+			<Link>Services\Transport\Grpc\Protos\persistent.proto</Link>
+		</Protobuf>
+		<Protobuf Include="..\Protos\Grpc\shared.proto" GrpcServices="Server" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
+			<Link>Services\Transport\Grpc\Protos\shared.proto</Link>
+		</Protobuf>
+		<Protobuf Include="..\Protos\Grpc\status.proto" GrpcServices="Server" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
+			<Link>Services\Transport\Grpc\Protos\status.proto</Link>
+		</Protobuf>
+		<Protobuf Include="..\Protos\Grpc\streams.proto" GrpcServices="Both" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
+			<Link>Services\Transport\Grpc\Protos\streams.proto</Link>
+		</Protobuf>
+		<Protobuf Include="..\Protos\Grpc\users.proto" GrpcServices="Server" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
+			<Link>Services\Transport\Grpc\Protos\users.proto</Link>
+		</Protobuf>
+		<Protobuf Include="..\Protos\Grpc\monitoring.proto" GrpcServices="Both" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
+			<Link>Services\Transport\Grpc\Protos\monitoring.proto</Link>
+		</Protobuf>
+		<Protobuf Include="..\Protos\Grpc\serverfeatures.proto" GrpcServices="Both" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
+			<Link>Services\Transport\Grpc\Protos\serverfeatures.proto</Link>
+		</Protobuf>
+		<Protobuf Include="..\Protos\Grpc\redaction.proto" GrpcServices="Server" LinkBase="Services/Transport/Grpc" ProtoRoot="../Protos/Grpc">
+			<Link>Services\Transport\Grpc\Protos\redaction.proto</Link>
+		</Protobuf>
+	</ItemGroup>
+	<ItemGroup>
+		<Folder Include="Services\Transport\Tcp\protos\" />
+	</ItemGroup>
+	<ItemGroup>
+	  <Compile Update="Services\Transport\Grpc\Cluster.*.cs">
+	    <DependentUpon>Cluster.cs</DependentUpon>
+	  </Compile>
+	  <Compile Update="Services\Transport\Grpc\Gossip.*.cs">
+	    <DependentUpon>Gossip.cs</DependentUpon>
+	  </Compile>
+	  <Compile Update="Services\Transport\Grpc\Operations.*.cs">
+	    <DependentUpon>Operations.cs</DependentUpon>
+	  </Compile>
+	  <Compile Update="Services\Transport\Grpc\PersistentSubscriptions.*.cs">
+	    <DependentUpon>PersistentSubscriptions.cs</DependentUpon>
+	  </Compile>
+	  <Compile Update="Services\Transport\Grpc\Redaction.*.cs">
+	    <DependentUpon>Redaction.cs</DependentUpon>
+	  </Compile>
+	  <Compile Update="Services\Transport\Grpc\Streams.*.cs">
+	    <DependentUpon>Streams.cs</DependentUpon>
+	  </Compile>
+	  <Compile Update="Services\Transport\Grpc\Users.*.cs">
+	    <DependentUpon>Users.cs</DependentUpon>
+	  </Compile>
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.Core/Log/EventStoreLoggerConfiguration.cs b/src/KurrentDB.Core/Log/EventStoreLoggerConfiguration.cs
new file mode 100644
index 00000000000..82c7db50748
--- /dev/null
+++ b/src/KurrentDB.Core/Log/EventStoreLoggerConfiguration.cs
@@ -0,0 +1,241 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using KurrentDB.Common.Exceptions;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Configuration;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Primitives;
+using Serilog;
+using Serilog.Configuration;
+using Serilog.Core;
+using Serilog.Debugging;
+using Serilog.Events;
+using Serilog.Filters;
+using Serilog.Templates;
+using Serilog.Templates.Themes;
+
+// Resharper disable CheckNamespace
+
+namespace KurrentDB.Common.Log;
+
+public class EventStoreLoggerConfiguration {
+	static readonly ExpressionTemplate ConsoleOutputExpressionTemplate = new(
+		"[{ProcessId,5},{ThreadId,2},{@t:HH:mm:ss.fff},{@l:u3}] {Substring(SourceContext, LastIndexOf(SourceContext, '.') + 1), -30} {@m}\n{@x}",
+		theme: TemplateTheme.Literate
+	);
+
+	private const string CompactJsonTemplate = "{ {@t, @mt, @r, @l, @i, @x, ..@p} }\n";
+
+	public static readonly Logger ConsoleLog = StandardLoggerConfiguration
+		.WriteTo.Console(ConsoleOutputExpressionTemplate)
+		.CreateLogger();
+
+	private static readonly Func<LogEvent, bool> RegularStats = Matching.FromSource("REGULAR-STATS-LOGGER");
+
+	private static readonly SerilogEventListener EventListener;
+
+	private static int Initialized;
+	private static LoggingLevelSwitch _defaultLogLevelSwitch;
+	private static object _defaultLogLevelSwitchLock = new object();
+
+	private readonly string _logsDirectory;
+	private readonly string _componentName;
+	private readonly LoggerConfiguration _loggerConfiguration;
+
+	static EventStoreLoggerConfiguration() {
+		Serilog.Log.Logger = ConsoleLog;
+		AppDomain.CurrentDomain.UnhandledException += (s, e) => {
+			if (e.ExceptionObject is Exception exc)
+				Serilog.Log.Fatal(exc, "Global Unhandled Exception occurred.");
+			else
+				Serilog.Log.Fatal("Global Unhandled Exception object: {e}.", e.ExceptionObject);
+		};
+		EventListener = new SerilogEventListener();
+	}
+
+	public static void Initialize(string logsDirectory, string componentName, LogConsoleFormat logConsoleFormat,
+		int logFileSize, RollingInterval logFileInterval, int logFileRetentionCount, bool disableLogFile,
+		string logConfig = "logconfig.json") {
+		if (Interlocked.Exchange(ref Initialized, 1) == 1) {
+			throw new InvalidOperationException($"{nameof(Initialize)} may not be called more than once.");
+		}
+
+		if (logsDirectory.StartsWith("~")) {
+			throw new ApplicationInitializationException(
+				"The given log path starts with a '~'. KurrentDB does not expand '~'.");
+		}
+
+		var configurationRoot = new ConfigurationBuilder()
+			.AddKurrentConfigFile(logConfig, reloadOnChange: true)
+			.Build();
+
+		SelfLog.Enable(ConsoleLog.Information);
+
+		Serilog.Log.Logger = (configurationRoot.GetSection("Serilog").Exists()
+				? new LoggerConfiguration()
+					.Enrich.WithProperty(Constants.SourceContextPropertyName, "KurrentDB")
+					.ReadFrom.Configuration(configurationRoot)
+				: Default(logsDirectory, componentName, configurationRoot, logConsoleFormat, logFileInterval,
+					logFileSize, logFileRetentionCount, disableLogFile))
+			.CreateLogger();
+
+		SelfLog.Disable();
+	}
+
+	public static bool AdjustMinimumLogLevel(LogLevel logLevel) {
+		lock (_defaultLogLevelSwitchLock) {
+#if !DEBUG
+			if (_defaultLogLevelSwitch == null) {
+				throw new InvalidOperationException("The logger configuration has not yet been initialized.");
+			}
+#endif
+			if (!Enum.TryParse<LogEventLevel>(logLevel.ToString(), out var serilogLogLevel)) {
+				throw new ArgumentException($"'{logLevel}' is not a valid log level.");
+			}
+
+			if (serilogLogLevel == _defaultLogLevelSwitch.MinimumLevel)
+				return false;
+			_defaultLogLevelSwitch.MinimumLevel = serilogLogLevel;
+			return true;
+		}
+	}
+
+	private static LoggerConfiguration Default(string logsDirectory, string componentName,
+		IConfigurationRoot logLevelConfigurationRoot, LogConsoleFormat logConsoleFormat,
+		RollingInterval logFileInterval, int logFileSize, int logFileRetentionCount, bool disableLogFile) =>
+		new EventStoreLoggerConfiguration(logsDirectory, componentName, logLevelConfigurationRoot, logConsoleFormat,
+			logFileInterval, logFileSize, logFileRetentionCount, disableLogFile);
+
+	private EventStoreLoggerConfiguration(string logsDirectory, string componentName,
+		IConfigurationRoot logLevelConfigurationRoot, LogConsoleFormat logConsoleFormat,
+		RollingInterval logFileInterval, int logFileSize, int logFileRetentionCount, bool disableLogFile) {
+		if (logsDirectory == null) {
+			throw new ArgumentNullException(nameof(logsDirectory));
+		}
+
+		if (componentName == null) {
+			throw new ArgumentNullException(nameof(componentName));
+		}
+
+		if (logLevelConfigurationRoot == null) {
+			throw new ArgumentNullException(nameof(logLevelConfigurationRoot));
+		}
+
+		_logsDirectory = logsDirectory;
+		_componentName = componentName;
+
+		var loglevelSection = logLevelConfigurationRoot.GetSection("Logging").GetSection("LogLevel");
+		var defaultLogLevelSection = loglevelSection.GetSection("Default");
+		lock (_defaultLogLevelSwitchLock) {
+			_defaultLogLevelSwitch = new LoggingLevelSwitch {
+				MinimumLevel = LogEventLevel.Verbose
+			};
+			ApplyLogLevel(defaultLogLevelSection, _defaultLogLevelSwitch);
+		}
+
+		var loggerConfiguration = StandardLoggerConfiguration
+			.MinimumLevel.ControlledBy(_defaultLogLevelSwitch)
+			.WriteTo.Async(AsyncSink);
+
+		foreach (var namedLogLevelSection in loglevelSection.GetChildren().Where(x => x.Key != "Default")) {
+			var levelSwitch = new LoggingLevelSwitch();
+			ApplyLogLevel(namedLogLevelSection, levelSwitch);
+			loggerConfiguration = loggerConfiguration.MinimumLevel.Override(namedLogLevelSection.Key, levelSwitch);
+		}
+
+		_loggerConfiguration = loggerConfiguration;
+
+		void AsyncSink(LoggerSinkConfiguration configuration) {
+			configuration.Logger(c => c
+				.Filter.ByIncludingOnly(RegularStats)
+				.WriteTo.Logger(Stats));
+			configuration.Logger(c => c
+				.Filter.ByExcluding(RegularStats)
+				.WriteTo.Logger(Default));
+		}
+
+		void Default(LoggerConfiguration configuration) {
+			configuration.WriteTo.Console(
+				logConsoleFormat == LogConsoleFormat.Plain
+					? ConsoleOutputExpressionTemplate
+					: new(CompactJsonTemplate));
+
+			if (!disableLogFile) {
+				configuration.WriteTo
+					.RollingFile(GetLogFileName(), new ExpressionTemplate(CompactJsonTemplate),
+						logFileRetentionCount, logFileInterval, logFileSize)
+					.WriteTo.Logger(Error);
+			}
+
+			configuration.WriteTo.Sink(ObservableSerilogSink.Instance);
+		}
+
+		void Error(LoggerConfiguration configuration) {
+			if (!disableLogFile) {
+				configuration
+					.Filter.ByIncludingOnly(Errors)
+					.WriteTo
+					.RollingFile(GetLogFileName("err"), new ExpressionTemplate(CompactJsonTemplate),
+						logFileRetentionCount, logFileInterval, logFileSize);
+			}
+		}
+
+		void Stats(LoggerConfiguration configuration) {
+			if (!disableLogFile) {
+				configuration.WriteTo.RollingFile(GetLogFileName("stats"),
+					new ExpressionTemplate(CompactJsonTemplate), logFileRetentionCount, logFileInterval,
+					logFileSize);
+			}
+		}
+
+		void ApplyLogLevel(IConfigurationSection namedLogLevelSection, LoggingLevelSwitch levelSwitch) {
+			TrySetLogLevel(namedLogLevelSection, levelSwitch);
+			ChangeToken.OnChange(namedLogLevelSection.GetReloadToken,
+				() => TrySetLogLevel(namedLogLevelSection, levelSwitch));
+		}
+
+		// the log level must be a valid microsoft level, we have been keeping the log config in the section
+		// that the ms libraries will access.
+		static void TrySetLogLevel(IConfigurationSection logLevel, LoggingLevelSwitch levelSwitch) {
+			if (!Enum.TryParse<Microsoft.Extensions.Logging.LogLevel>(logLevel.Value, out var level))
+				throw new UnknownLogLevelException(logLevel.Value, logLevel.Path);
+
+			levelSwitch.MinimumLevel = level switch {
+				Microsoft.Extensions.Logging.LogLevel.None => LogEventLevel.Fatal,
+				Microsoft.Extensions.Logging.LogLevel.Trace => LogEventLevel.Verbose,
+				Microsoft.Extensions.Logging.LogLevel.Debug => LogEventLevel.Debug,
+				Microsoft.Extensions.Logging.LogLevel.Information => LogEventLevel.Information,
+				Microsoft.Extensions.Logging.LogLevel.Warning => LogEventLevel.Warning,
+				Microsoft.Extensions.Logging.LogLevel.Error => LogEventLevel.Error,
+				Microsoft.Extensions.Logging.LogLevel.Critical => LogEventLevel.Fatal,
+				_ => throw new UnknownLogLevelException(logLevel.Value, logLevel.Path)
+			};
+		}
+	}
+
+	private static LoggerConfiguration StandardLoggerConfiguration =>
+		new LoggerConfiguration()
+			.Enrich.WithProperty(Constants.SourceContextPropertyName, "KurrentDB")
+			.Enrich.WithProcessId()
+			.Enrich.WithThreadId()
+			.Enrich.FromLogContext();
+
+
+	private string GetLogFileName(string log = null) =>
+		Path.Combine(_logsDirectory, $"{_componentName}/log{(log == null ? string.Empty : $"-{log}")}.json");
+
+	private static bool Errors(LogEvent e) => e.Exception != null || e.Level >= LogEventLevel.Error;
+
+	public static implicit operator LoggerConfiguration(EventStoreLoggerConfiguration configuration) =>
+		configuration._loggerConfiguration;
+}
+
+class UnknownLogLevelException(string logLevel, string path)
+	: InvalidConfigurationException($"Unknown log level: \"{logLevel}\" at \"{path}\". Known log levels: {string.Join(", ", KnownLogLevels)}") {
+	static string[] KnownLogLevels => Enum.GetNames(typeof(Microsoft.Extensions.Logging.LogLevel));
+}
diff --git a/src/KurrentDB.Core/Log/LoggerSinkConfigurationExtensions.cs b/src/KurrentDB.Core/Log/LoggerSinkConfigurationExtensions.cs
new file mode 100644
index 00000000000..ecb4cfe2b8b
--- /dev/null
+++ b/src/KurrentDB.Core/Log/LoggerSinkConfigurationExtensions.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using Serilog;
+using Serilog.Configuration;
+using Serilog.Formatting;
+
+// Resharper disable CheckNamespace
+
+namespace KurrentDB.Common.Log;
+
+internal static class LoggerSinkConfigurationExtensions {
+	public static LoggerConfiguration RollingFile(this LoggerSinkConfiguration configuration, string logFileName,
+		ITextFormatter expressionTemplate, int retainedFileCountLimit = 31,
+		RollingInterval rollingInterval = RollingInterval.Day, int fileSizeLimitBytes = 1024 * 1024 * 1024) {
+		if (configuration == null)
+			throw new ArgumentNullException(nameof(configuration));
+
+		return configuration.File(
+			expressionTemplate,
+			logFileName,
+			buffered: false,
+			rollOnFileSizeLimit: true,
+			rollingInterval: rollingInterval,
+			retainedFileCountLimit: retainedFileCountLimit,
+			fileSizeLimitBytes: fileSizeLimitBytes);
+	}
+}
diff --git a/src/KurrentDB.Core/Log/ObservableSerilogSink.cs b/src/KurrentDB.Core/Log/ObservableSerilogSink.cs
new file mode 100644
index 00000000000..7c5e7b704aa
--- /dev/null
+++ b/src/KurrentDB.Core/Log/ObservableSerilogSink.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Reactive.Subjects;
+using Serilog.Core;
+using Serilog.Events;
+
+// ReSharper disable once CheckNamespace
+
+namespace KurrentDB.Common.Log;
+
+public class ObservableSerilogSink : ILogEventSink, IObservable<LogEvent> {
+	public static readonly ObservableSerilogSink Instance = new();
+
+	readonly Subject<LogEvent> _subject = new();
+
+	public void Emit(LogEvent logEvent) => _subject.OnNext(logEvent);
+
+	public IDisposable Subscribe(IObserver<LogEvent> observer) => _subject.Subscribe(observer);
+}
diff --git a/src/KurrentDB.Core/Log/SerilogEventListener.cs b/src/KurrentDB.Core/Log/SerilogEventListener.cs
new file mode 100644
index 00000000000..10436984f40
--- /dev/null
+++ b/src/KurrentDB.Core/Log/SerilogEventListener.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Diagnostics.Tracing;
+using System.Linq;
+using Serilog.Events;
+
+// ReSharper disable once CheckNamespace
+
+namespace KurrentDB.Common.Log;
+
+public class SerilogEventListener : EventListener {
+	private readonly Dictionary<string, LogEventLevel> _eventSources = new() {
+		{ "kurrentdb-dev-certs", LogEventLevel.Verbose }
+	};
+
+	protected override void OnEventSourceCreated(EventSource eventSource) {
+		if (_eventSources.TryGetValue(eventSource.Name, out var level)) {
+			EnableEvents(eventSource, ConvertToEventSourceLevel(level));
+		}
+	}
+
+	protected override void OnEventWritten(EventWrittenEventArgs eventData) {
+		if (eventData.Message is null)
+			return;
+		Serilog.Log.Logger.Write(ConvertToSerilogLevel(eventData.Level), eventData.Message, eventData.Payload?.ToArray());
+	}
+
+	private static LogEventLevel ConvertToSerilogLevel(EventLevel level) {
+		switch (level) {
+			case EventLevel.Critical:
+				return LogEventLevel.Fatal;
+			case EventLevel.Error:
+				return LogEventLevel.Error;
+			case EventLevel.Informational:
+				return LogEventLevel.Information;
+			case EventLevel.Verbose:
+				return LogEventLevel.Verbose;
+			case EventLevel.Warning:
+				return LogEventLevel.Warning;
+			case EventLevel.LogAlways:
+				return LogEventLevel.Information;
+		}
+
+		return LogEventLevel.Information;
+	}
+	private static EventLevel ConvertToEventSourceLevel(LogEventLevel level) {
+		switch (level) {
+			case LogEventLevel.Fatal:
+				return EventLevel.Critical;
+			case LogEventLevel.Error:
+				return EventLevel.Error;
+			case LogEventLevel.Information:
+				return EventLevel.Informational;
+			case LogEventLevel.Verbose:
+				return EventLevel.Verbose;
+			case LogEventLevel.Warning:
+				return EventLevel.Warning;
+		}
+
+		return EventLevel.Informational;
+	}
+}
diff --git a/src/KurrentDB.Core/Log/ThrottledLog.cs b/src/KurrentDB.Core/Log/ThrottledLog.cs
new file mode 100644
index 00000000000..c6dd26a5e82
--- /dev/null
+++ b/src/KurrentDB.Core/Log/ThrottledLog.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using Serilog;
+
+// ReSharper disable once CheckNamespace
+
+namespace KurrentDB.Common.Log;
+
+public class ThrottledLog<T> {
+
+	private readonly ILogger _log;
+	private readonly long _duration;
+	private long _lastLogged;
+	public ThrottledLog(TimeSpan duration) {
+		_log = Serilog.Log.ForContext<T>();
+		_duration = duration.Ticks;
+		_lastLogged = DateTime.UnixEpoch.Ticks;
+	}
+
+	public bool Warning(string message) {
+		bool canLog = CanLog();
+		if (canLog)
+			_log.Warning(message);
+		return canLog;
+	}
+
+	public bool Fatal(string message) {
+		bool canLog = CanLog();
+		if (canLog)
+			_log.Fatal(message);
+		return canLog;
+	}
+
+	public bool Information(string message) {
+		bool canLog = CanLog();
+		if (canLog)
+			_log.Information(message);
+		return canLog;
+	}
+
+	public bool Error(string message) {
+		bool canLog = CanLog();
+		if (canLog)
+			_log.Error(message);
+		return canLog;
+	}
+
+	private bool CanLog() {
+		var currentTime = DateTime.Now.Ticks;
+		bool canLog = false;
+
+		// double-checked locking
+		if (currentTime - _lastLogged >= _duration) {
+			lock (_log) {
+				if (currentTime - _lastLogged >= _duration) {
+					_lastLogged = currentTime;
+					canLog = true;
+				}
+			}
+		}
+
+		// perform actual logging outside synchronization so that subsequent calls to this method which are not going to log can be returned quickly
+		// logging outside synchronization is safe since Serilog itself is thread-safe
+		return canLog;
+	}
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/AdHocNamesProvider.cs b/src/KurrentDB.Core/LogAbstraction/AdHocNamesProvider.cs
new file mode 100644
index 00000000000..f7ca4e411eb
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/AdHocNamesProvider.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+
+namespace KurrentDB.Core.LogAbstraction;
+
+// mechanism to delay construction of StreamNames and SystemStreams until the IndexReader is available
+public class AdHocStreamNamesProvider<TStreamId> : IStreamNamesProvider<TStreamId> {
+	private readonly Action<AdHocStreamNamesProvider<TStreamId>, IIndexReader<TStreamId>> _setReader;
+	private readonly Action<AdHocStreamNamesProvider<TStreamId>, ITableIndex> _setTableIndex;
+
+	private ISystemStreamLookup<TStreamId> _systemStreams;
+	private INameLookup<TStreamId> _streamNames;
+	private INameLookup<TStreamId> _eventTypes;
+	private INameExistenceFilterInitializer _streamExistenceFilterInitializer;
+
+	public AdHocStreamNamesProvider(
+		Action<AdHocStreamNamesProvider<TStreamId>, IIndexReader<TStreamId>> setReader = null,
+		Action<AdHocStreamNamesProvider<TStreamId>, ITableIndex> setTableIndex = null) {
+
+		_setReader = setReader;
+		_setTableIndex = setTableIndex;
+	}
+
+	public INameLookup<TStreamId> StreamNames {
+		get => _streamNames ?? throw new InvalidOperationException("Call SetReader or SetTableIndex first");
+		set => _streamNames = value;
+	}
+
+	public INameLookup<TStreamId> EventTypes {
+		get => _eventTypes ?? throw new InvalidOperationException("Call SetReader or SetTableIndex first");
+		set => _eventTypes = value;
+	}
+
+	public ISystemStreamLookup<TStreamId> SystemStreams {
+		get => _systemStreams ?? throw new InvalidOperationException("Call SetReader or SetTableIndex first");
+		set => _systemStreams = value;
+	}
+
+	public INameExistenceFilterInitializer StreamExistenceFilterInitializer {
+		get => _streamExistenceFilterInitializer ?? throw new InvalidOperationException("Call SetReader or SetTableIndex first");
+		set => _streamExistenceFilterInitializer = value;
+	}
+
+	public void SetReader(IIndexReader<TStreamId> reader) =>
+		_setReader?.Invoke(this, reader);
+
+	public void SetTableIndex(ITableIndex tableIndex) =>
+		_setTableIndex?.Invoke(this, tableIndex);
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/Common/Debouncer.cs b/src/KurrentDB.Core/LogAbstraction/Common/Debouncer.cs
new file mode 100644
index 00000000000..a0b070fabc7
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/Common/Debouncer.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core.LogAbstraction.Common;
+
+/// Executes the func after each interval, but only if it has been triggered during the interval.
+/// The func should handle its own exceptions.
+public class Debouncer {
+	private readonly TimeSpan _interval;
+	private readonly Func<CancellationToken, Task> _func;
+	private readonly CancellationToken _token;
+	private readonly Task _task;
+	private readonly ManualResetEventSlim _mres = new();
+
+	public Debouncer(
+		TimeSpan interval,
+		Func<CancellationToken, Task> func,
+		CancellationToken token) {
+
+		_interval = interval;
+		_func = func;
+		_token = token;
+		_task = RunAsync();
+	}
+
+	public void Trigger() {
+		_mres.Set();
+	}
+
+	async Task RunAsync() {
+		while (true) {
+			await Task.Delay(_interval, _token);
+			if (_mres.IsSet) {
+				_mres.Reset();
+				await _func(_token);
+			}
+		}
+	}
+}
+
diff --git a/src/KurrentDB.Core/LogAbstraction/Common/NameExistenceFilterValueLookupDecorator.cs b/src/KurrentDB.Core/LogAbstraction/Common/NameExistenceFilterValueLookupDecorator.cs
new file mode 100644
index 00000000000..2af4f3a6bd9
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/Common/NameExistenceFilterValueLookupDecorator.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.LogAbstraction.Common;
+
+public class NameExistenceFilterValueLookupDecorator<TValue> : IValueLookup<TValue> {
+	private readonly IValueLookup<TValue> _wrapped;
+	private readonly INameExistenceFilter _existenceFilter;
+
+	public NameExistenceFilterValueLookupDecorator(
+		IValueLookup<TValue> wrapped,
+		INameExistenceFilter existenceFilter) {
+
+		_wrapped = wrapped;
+		_existenceFilter = existenceFilter;
+	}
+
+	public TValue LookupValue(string name) {
+		if (_existenceFilter.MightContain(name))
+			return _wrapped.LookupValue(name);
+
+		return default;
+	}
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/Common/NoExistenceFilterReader.cs b/src/KurrentDB.Core/LogAbstraction/Common/NoExistenceFilterReader.cs
new file mode 100644
index 00000000000..f9ca6968f66
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/Common/NoExistenceFilterReader.cs
@@ -0,0 +1,8 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.LogAbstraction.Common;
+
+public class NoExistenceFilterReader : IExistenceFilterReader<uint> {
+	public bool MightContain(uint item) => true;
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/Common/NoNameExistenceFilter.cs b/src/KurrentDB.Core/LogAbstraction/Common/NoNameExistenceFilter.cs
new file mode 100644
index 00000000000..652a5b69b06
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/Common/NoNameExistenceFilter.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core.LogAbstraction.Common;
+
+public class NoNameExistenceFilter : INameExistenceFilter {
+	public ValueTask Initialize(INameExistenceFilterInitializer source, long truncateToPosition,
+		CancellationToken token)
+		=> token.IsCancellationRequested ? ValueTask.FromCanceled(token) : ValueTask.CompletedTask;
+
+	public void TruncateTo(long checkpoint) { }
+	public void Verify(double corruptionThreshold) { }
+	public long CurrentCheckpoint { get; set; } = -1;
+
+	public void Add(string name) { }
+	public void Add(ulong hash) { }
+	public bool MightContain(string name) => true;
+	public void Dispose() { }
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/Common/StreamExistenceFilter.cs b/src/KurrentDB.Core/LogAbstraction/Common/StreamExistenceFilter.cs
new file mode 100644
index 00000000000..9846108372a
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/Common/StreamExistenceFilter.cs
@@ -0,0 +1,222 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.DataStructures.ProbabilisticFilter;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using Serilog;
+
+namespace KurrentDB.Core.LogAbstraction.Common;
+
+// This connects a bloom filter datastructure to the rest of the system by
+// adding catchup and checkpointing.
+public class StreamExistenceFilter :
+	INameExistenceFilter {
+	private readonly string _filterName;
+	private readonly TimeSpan _checkpointDelay;
+	private readonly PersistentStreamBloomFilter _persistentBloomFilter;
+	private readonly ICheckpoint _checkpoint;
+	private readonly Debouncer _checkpointer;
+	private long _lastNonFlushedCheckpoint;
+	private readonly CancellationTokenSource _cancellationTokenSource;
+
+	private int _initialized;
+	private long _addedSinceLoad;
+
+	protected static readonly ILogger Log = Serilog.Log.ForContext<StreamExistenceFilter>();
+
+	public long CurrentCheckpoint {
+		get => Interlocked.Read(ref _lastNonFlushedCheckpoint);
+		set {
+			Interlocked.Exchange(ref _lastNonFlushedCheckpoint, value);
+			_checkpointer.Trigger();
+		}
+	}
+
+	public long CurrentCheckpointFlushed => _checkpoint.Read();
+
+	public string DataFilePath { get; }
+
+	public StreamExistenceFilter(
+		string directory,
+		ICheckpoint checkpoint,
+		string filterName,
+		long size,
+		TimeSpan checkpointInterval,
+		TimeSpan checkpointDelay,
+		ILongHasher<string> hasher) {
+		_filterName = filterName;
+		_checkpointDelay = checkpointDelay;
+		_checkpoint = checkpoint;
+		_lastNonFlushedCheckpoint = _checkpoint.Read();
+
+		if (!Directory.Exists(directory)) {
+			Directory.CreateDirectory(directory);
+		}
+
+		DataFilePath = $"{directory}/{_filterName}.dat";
+		var create = _lastNonFlushedCheckpoint == -1;
+
+		Log.Information("{filterName}: {creatingOrOpening} {dataFilePath}",
+			_filterName, create ? "Creating" : "Opening", DataFilePath);
+
+		try {
+			_persistentBloomFilter = new PersistentStreamBloomFilter(
+				persistenceStrategy: new FileStreamPersistence(
+					size: size,
+					path: DataFilePath,
+					create: create),
+				hasher: hasher,
+				corruptionRebuildCount: 0);
+		} catch (Exception exc) when (
+				exc is CorruptedFileException ||
+				exc is CorruptedHashException ||
+				exc is SizeMismatchException ||
+				exc is FileNotFoundException) {
+
+			var corruptionRebuildCount = 0;
+
+			if (exc is CorruptedFileException) {
+				Log.Error(exc, "{filterName} is corrupted. Rebuilding...", _filterName);
+			} else if (exc is CorruptedHashException corruptedHashException) {
+				corruptionRebuildCount = corruptedHashException.RebuildCount + 1;
+				Log.Error(exc, "{filterName} has too many corrupted hashes. Rebuilding...", _filterName);
+			} else if (exc is SizeMismatchException) {
+				Log.Error(exc, "{filterName} does not have the expected size. Rebuilding...", _filterName);
+			} else if (exc is FileNotFoundException) {
+				Log.Error(exc, "{filterName} does not exist even though the checkpoint does. Rebuilding...", _filterName);
+			}
+
+			File.Delete(DataFilePath);
+			_lastNonFlushedCheckpoint = -1L;
+			_checkpoint.Write(-1L);
+			_checkpoint.Flush();
+			_persistentBloomFilter = new PersistentStreamBloomFilter(
+				persistenceStrategy: new FileStreamPersistence(
+					size: size,
+					path: DataFilePath,
+					create: true),
+				hasher: hasher,
+				corruptionRebuildCount: corruptionRebuildCount);
+		}
+
+		if (_persistentBloomFilter.CorruptionRebuildCount == 0)
+			Log.Information("{filterName} has successfully loaded.", _filterName);
+		else
+			Log.Information("{filterName} has successfully loaded. Filter has been rebuilt due to hash corruption {count} times.",
+				_filterName, _persistentBloomFilter.CorruptionRebuildCount);
+
+		const double p = PersistentBloomFilter.RecommendedFalsePositiveProbability;
+		Log.Debug("Optimal number of items for a {filterName} with a configured size of " +
+						"{size:N0} MB is approximately equal to: {n:N0} with false positive probability: {p:N2}",
+			_filterName,
+			size / 1000 / 1000,
+			_persistentBloomFilter.CalculateOptimalNumItems(p),
+			p);
+
+		_cancellationTokenSource = new();
+		_checkpointer = new Debouncer(
+			checkpointInterval,
+			async _ => {
+				await TakeCheckpointAsync();
+			},
+			_cancellationTokenSource.Token);
+	}
+
+	public void Verify(double corruptionThreshold) => _persistentBloomFilter.Verify(corruptionThreshold);
+
+	private async Task TakeCheckpointAsync() {
+		var checkpoint = Interlocked.Read(ref _lastNonFlushedCheckpoint);
+		try {
+			var prevCheckpoint = _checkpoint.Read();
+			var diff = checkpoint - prevCheckpoint;
+
+			var startTime = DateTime.UtcNow;
+			Log.Verbose("{filterName} is flushing at {checkpoint:N0}. Diff {diff:N0} ...", _filterName, checkpoint, diff);
+			_persistentBloomFilter.Flush();
+			var endTime = DateTime.UtcNow;
+			Log.Verbose("{filterName} has flushed at {checkpoint:N0}. Diff {diff:N0}. Took {flushLength}",
+					   _filterName, checkpoint, diff, endTime - startTime);
+
+			// safety precaution against anything in the stack lying about the data
+			// truly being on disk.
+			await Task.Delay(_checkpointDelay);
+
+			_checkpoint.Write(checkpoint);
+			_checkpoint.Flush();
+			Log.Verbose("{filterName} took checkpoint at position: {position:N0}.",
+				_filterName,
+				_checkpoint.Read());
+		} catch (Exception ex) {
+			Log.Error(ex, "{filterName} could not take checkpoint at position: {position:N0}", _filterName, checkpoint);
+		}
+	}
+
+	public async ValueTask Initialize(INameExistenceFilterInitializer source, long truncateToPosition, CancellationToken token) {
+		Log.Debug("{filterName} rebuilding started from checkpoint: {checkpoint:N0} (0x{checkpoint:X}).",
+			_filterName, CurrentCheckpoint, CurrentCheckpoint);
+		var startTime = DateTime.UtcNow;
+		await source.Initialize(this, truncateToPosition, token);
+		Log.Debug("{filterName} rebuilding done: total processed {processed} records, time elapsed: {elapsed}.",
+			_filterName, _addedSinceLoad, DateTime.UtcNow - startTime);
+		Interlocked.Exchange(ref _initialized, 1);
+	}
+
+	// any truncation must be done prior to calling Add or setting CurrentCheckpoint
+	public void TruncateTo(long checkpoint) {
+		if (CurrentCheckpoint <= checkpoint) {
+			// this was already guarded elsewhere but we want to guard it in this class so that we
+			// can guarantee that a checkpoint is only set at all if the filter was successfully
+			// flushed. otherwise here we might set the checkpoint even though we hadn't flushed
+			// that far.
+			Log.Information(
+				"{filterName} is NOT truncating from {current:N0} to {truncateTo:N0} " +
+				"since it already satisfies the truncation point.",
+				_filterName,
+				CurrentCheckpoint,
+				checkpoint);
+			return;
+		}
+
+		Log.Information("{filterName} is truncating from {current:N0} to {truncateTo:N0}.",
+			_filterName,
+			CurrentCheckpoint,
+			checkpoint);
+
+		// we dont need to remove data from the bloom filter since false positives
+		// are allowed, and we can't anyway, since we wouldn't know what to remove.
+		// but we DO need to move the checkpoint back and flush it. otherwise if
+		// (1) the writer/chaser move forward and (2) the node exits before
+		// the filter has flushed those records, then we will no longer know that
+		// we need to go back and add them.
+		Interlocked.Exchange(ref _lastNonFlushedCheckpoint, checkpoint);
+		_checkpoint.Write(checkpoint);
+		_checkpoint.Flush();
+	}
+
+	public void Add(string name) {
+		_persistentBloomFilter.Add(name);
+		_addedSinceLoad++;
+	}
+
+	public void Add(ulong hash) {
+		_persistentBloomFilter.Add(hash);
+		_addedSinceLoad++;
+	}
+
+	public bool MightContain(string name) {
+		if (Interlocked.CompareExchange(ref _initialized, 0, 0) == 0)
+			throw new InvalidOperationException("Initialize the filter before querying");
+		return _persistentBloomFilter.MightContain(name);
+	}
+
+	public void Dispose() {
+		_cancellationTokenSource?.Cancel();
+		_persistentBloomFilter?.Dispose();
+		GC.SuppressFinalize(this);
+	}
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/IMetastreamLookup.cs b/src/KurrentDB.Core/LogAbstraction/IMetastreamLookup.cs
new file mode 100644
index 00000000000..b06881ca17f
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/IMetastreamLookup.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.LogAbstraction;
+
+public interface IMetastreamLookup<TStreamId> {
+	bool IsMetaStream(TStreamId streamId);
+	TStreamId MetaStreamOf(TStreamId streamId);
+	TStreamId OriginalStreamOf(TStreamId streamId);
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/INameExistenceFilter.cs b/src/KurrentDB.Core/LogAbstraction/INameExistenceFilter.cs
new file mode 100644
index 00000000000..03644aaecae
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/INameExistenceFilter.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core.LogAbstraction;
+
+public interface INameExistenceFilter : IExistenceFilterReader<string>, IDisposable {
+	ValueTask Initialize(INameExistenceFilterInitializer source, long truncateToPosition, CancellationToken token);
+	void TruncateTo(long checkpoint);
+	void Verify(double corruptionThreshold);
+	void Add(string name);
+	void Add(ulong hash);
+	long CurrentCheckpoint { get; set; }
+}
+
+public interface IExistenceFilterReader<T> {
+	bool MightContain(T item);
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/INameExistenceFilterInitializer.cs b/src/KurrentDB.Core/LogAbstraction/INameExistenceFilterInitializer.cs
new file mode 100644
index 00000000000..e4125926c44
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/INameExistenceFilterInitializer.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core.LogAbstraction;
+
+public interface INameExistenceFilterInitializer {
+	ValueTask Initialize(INameExistenceFilter filter, long truncateToPosition, CancellationToken token);
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/INameIndex.cs b/src/KurrentDB.Core/LogAbstraction/INameIndex.cs
new file mode 100644
index 00000000000..5e08309b02c
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/INameIndex.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.LogAbstraction;
+
+/// Maps names (strings) to TValues
+public interface INameIndex<TValue> {
+	void CancelReservations();
+
+	// return true => stream already existed.
+	// return false => stream was created. addedValue and addedName are the details of the created stream.
+	// these can be different to streamName/streamId e.g. if streamName is a metastream.
+	bool GetOrReserve(string name, out TValue value, out TValue addedValue, out string addedName);
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/INameIndexConfirmer.cs b/src/KurrentDB.Core/LogAbstraction/INameIndexConfirmer.cs
new file mode 100644
index 00000000000..682b8717d30
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/INameIndexConfirmer.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.LogAbstraction;
+
+public interface INameIndexConfirmer<TValue> : IDisposable {
+	ValueTask InitializeWithConfirmed(INameLookup<TValue> source, CancellationToken token);
+
+	/// Entries are confirmed once they are replicated.
+	/// Once confirmed, the entry can be persisted.
+	// trying quite hard not to use the word 'commit' since it has other uses.
+	void Confirm(
+		IList<IPrepareLogRecord<TValue>> replicatedPrepares,
+		bool catchingUp,
+		IIndexBackend<TValue> backend);
+
+	void Confirm(
+		IList<IPrepareLogRecord<TValue>> replicatedPrepares,
+		CommitLogRecord commit,
+		bool catchingUp,
+		IIndexBackend<TValue> backend);
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/INameIndexExtensions.cs b/src/KurrentDB.Core/LogAbstraction/INameIndexExtensions.cs
new file mode 100644
index 00000000000..69aaa719b38
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/INameIndexExtensions.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.LogAbstraction;
+
+public static class INameIndexExtensions {
+	// todo: rename to GetOrReserveStream when we generalise to EventTypes too.
+	/// Generates a StreamRecord if necessary
+	public static bool GetOrReserve<TStreamId>(
+		this INameIndex<TStreamId> streamNameIndex,
+		IRecordFactory<TStreamId> recordFactory,
+		string streamName,
+		long logPosition,
+		out TStreamId streamId,
+		out IPrepareLogRecord<TStreamId> streamRecord) {
+
+		var preExisting = streamNameIndex.GetOrReserve(streamName, out streamId, out var addedId, out var addedName);
+
+		var appendNewStream = recordFactory.ExplicitStreamCreation && !preExisting;
+		if (!appendNewStream) {
+			streamRecord = null;
+			return preExisting;
+		}
+
+		streamRecord = recordFactory.CreateStreamRecord(
+			streamId: Guid.NewGuid(),
+			logPosition: logPosition,
+			timeStamp: DateTime.UtcNow,
+			streamNumber: addedId,
+			streamName: addedName);
+
+		return preExisting;
+	}
+
+	public static bool GetOrReserveEventType<TStreamId>(
+		this INameIndex<TStreamId> eventTypeIndex,
+		IRecordFactory<TStreamId> recordFactory,
+		string eventType,
+		long logPosition,
+		out TStreamId eventTypeId,
+		out IPrepareLogRecord<TStreamId> eventTypeRecord) {
+
+		var preExisting = eventTypeIndex.GetOrReserve(eventType, out eventTypeId, out var addedNumber, out var addedName);
+
+		var appendNewEventType = recordFactory.ExplicitEventTypeCreation && !preExisting;
+		if (!appendNewEventType) {
+			eventTypeRecord = null;
+			return preExisting;
+		}
+
+		eventTypeRecord = recordFactory.CreateEventTypeRecord(
+			eventTypeId: Guid.NewGuid(),
+			parentEventTypeId: Guid.Empty,
+			eventType: addedName,
+			eventTypeNumber: addedNumber,
+			eventTypeVersion: 0,
+			logPosition: logPosition,
+			timeStamp: DateTime.UtcNow);
+
+		return preExisting;
+	}
+
+	public static TStreamId GetExisting<TStreamId>(
+		this INameIndex<TStreamId> nameIndex,
+		string name) {
+
+		if (!nameIndex.GetOrReserve(name, out var value, out _, out _))
+			throw new Exception($"{name} was expected to already exist but it didn not");
+
+		return value;
+	}
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/INameIndexPersistence.cs b/src/KurrentDB.Core/LogAbstraction/INameIndexPersistence.cs
new file mode 100644
index 00000000000..28a5f54f615
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/INameIndexPersistence.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core.LogAbstraction;
+
+public interface INameIndexPersistence<TValue> : IValueLookup<TValue>, IDisposable
+	where TValue : struct {
+	TValue LastValueAdded { get; }
+	ValueTask Init(INameLookup<TValue> source, CancellationToken token);
+	bool TryGetValue(string name, out TValue value);
+	void Add(string name, TValue value);
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/INameLookup.cs b/src/KurrentDB.Core/LogAbstraction/INameLookup.cs
new file mode 100644
index 00000000000..0af65a8cf0e
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/INameLookup.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext;
+
+namespace KurrentDB.Core.LogAbstraction;
+
+/// Looks up a name given a value
+public interface INameLookup<TValue> {
+	/// returns false if there is no max (i.e. the source is empty)
+	ValueTask<Optional<TValue>> TryGetLastValue(CancellationToken token);
+
+	ValueTask<string> LookupName(TValue value, CancellationToken token);
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/IPartitionManager.cs b/src/KurrentDB.Core/LogAbstraction/IPartitionManager.cs
new file mode 100644
index 00000000000..737511a495f
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/IPartitionManager.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core.LogAbstraction;
+
+public interface IPartitionManager {
+
+	Guid? RootId { get; }
+	Guid? RootTypeId { get; }
+
+	ValueTask Initialize(CancellationToken token);
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/IRecordFactory.cs b/src/KurrentDB.Core/LogAbstraction/IRecordFactory.cs
new file mode 100644
index 00000000000..ef5164a78d7
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/IRecordFactory.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.LogAbstraction;
+
+public interface IRecordFactory {
+	ISystemLogRecord CreateEpoch(EpochRecord epoch);
+}
+
+public interface IRecordFactory<TStreamId> : IRecordFactory {
+	bool ExplicitStreamCreation { get; }
+	bool ExplicitEventTypeCreation { get; }
+
+	IPrepareLogRecord<TStreamId> CreateStreamRecord(
+		Guid streamId,
+		long logPosition,
+		DateTime timeStamp,
+		TStreamId streamNumber,
+		string streamName);
+
+	IPrepareLogRecord<TStreamId> CreateEventTypeRecord(
+		Guid eventTypeId,
+		Guid parentEventTypeId,
+		string eventType,
+		TStreamId eventTypeNumber,
+		ushort eventTypeVersion,
+		long logPosition,
+		DateTime timeStamp);
+
+	IPrepareLogRecord<TStreamId> CreatePrepare(
+		long logPosition,
+		Guid correlationId,
+		Guid eventId,
+		long transactionPosition,
+		int transactionOffset,
+		TStreamId eventStreamId,
+		long expectedVersion,
+		DateTime timeStamp,
+		PrepareFlags flags,
+		TStreamId eventType,
+		ReadOnlyMemory<byte> data,
+		ReadOnlyMemory<byte> metadata);
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/ISizer.cs b/src/KurrentDB.Core/LogAbstraction/ISizer.cs
new file mode 100644
index 00000000000..a8897d24c33
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/ISizer.cs
@@ -0,0 +1,8 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.LogAbstraction;
+
+public interface ISizer<T> {
+	int GetSizeInBytes(T t);
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/IStreamIdConverter.cs b/src/KurrentDB.Core/LogAbstraction/IStreamIdConverter.cs
new file mode 100644
index 00000000000..719d4ecfe6f
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/IStreamIdConverter.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.LogAbstraction;
+
+public interface IStreamIdConverter<TStreamId> {
+	TStreamId ToStreamId(ReadOnlySpan<byte> bytes);
+	TStreamId ToStreamId(ReadOnlyMemory<byte> bytes);
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/IStreamNamesProvider.cs b/src/KurrentDB.Core/LogAbstraction/IStreamNamesProvider.cs
new file mode 100644
index 00000000000..c7e3d3768f4
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/IStreamNamesProvider.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+
+namespace KurrentDB.Core.LogAbstraction;
+
+// certain abstraction points cant be provided until we have access to the index reader.
+// hopefully when some other pieces have fallen into place we can replace this with a nicer mechanism.
+public interface IStreamNamesProvider<TStreamId> {
+	void SetReader(IIndexReader<TStreamId> reader);
+	void SetTableIndex(ITableIndex reader);
+	ISystemStreamLookup<TStreamId> SystemStreams { get; }
+	INameLookup<TStreamId> StreamNames { get; }
+	INameLookup<TStreamId> EventTypes { get; }
+	INameExistenceFilterInitializer StreamExistenceFilterInitializer { get; }
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/ISystemStreamLookup.cs b/src/KurrentDB.Core/LogAbstraction/ISystemStreamLookup.cs
new file mode 100644
index 00000000000..805d9d65107
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/ISystemStreamLookup.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core.LogAbstraction;
+
+public interface ISystemStreamLookup<TStreamId> : IMetastreamLookup<TStreamId> {
+	TStreamId AllStream { get; }
+	TStreamId SettingsStream { get; }
+	ValueTask<bool> IsSystemStream(TStreamId streamId, CancellationToken token);
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/IValueLookup.cs b/src/KurrentDB.Core/LogAbstraction/IValueLookup.cs
new file mode 100644
index 00000000000..0ed92d6ddc7
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/IValueLookup.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.LogAbstraction;
+
+/// Looks up a Value given a Name
+public interface IValueLookup<TValue> {
+	TValue LookupValue(string name);
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/IdentityHighHasher.cs b/src/KurrentDB.Core/LogAbstraction/IdentityHighHasher.cs
new file mode 100644
index 00000000000..144a256d26f
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/IdentityHighHasher.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Index.Hashes;
+
+namespace KurrentDB.Core.LogAbstraction;
+
+// if the streams are only 32 bit, neednt have 64 bits in the index
+public class IdentityHighHasher : IHasher<uint> {
+	public uint Hash(uint s) => 0;
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/IdentityLowHasher.cs b/src/KurrentDB.Core/LogAbstraction/IdentityLowHasher.cs
new file mode 100644
index 00000000000..0ae42b1e326
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/IdentityLowHasher.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Index.Hashes;
+using StreamId = System.UInt32;
+
+namespace KurrentDB.Core.LogAbstraction;
+
+public class IdentityLowHasher : IHasher<StreamId> {
+	public uint Hash(StreamId s) => s;
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/LogFormatAbstractor.cs b/src/KurrentDB.Core/LogAbstraction/LogFormatAbstractor.cs
new file mode 100644
index 00000000000..a0587cb2d34
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/LogFormatAbstractor.cs
@@ -0,0 +1,315 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.LogAbstraction.Common;
+using KurrentDB.Core.LogV2;
+using KurrentDB.Core.LogV3;
+using KurrentDB.Core.LogV3.FASTER;
+using KurrentDB.Core.Settings;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using LogV3StreamId = System.UInt32;
+
+namespace KurrentDB.Core.LogAbstraction;
+
+public record LogFormatAbstractorOptions {
+	public string IndexDirectory { get; init; }
+	public bool InMemory { get; init; }
+	public int InitialReaderCount { get; init; } = ESConsts.PTableInitialReaderCount;
+	public int MaxReaderCount { get; init; } = 100;
+	public long StreamExistenceFilterSize { get; init; }
+	public ICheckpoint StreamExistenceFilterCheckpoint { get; init; }
+	public TimeSpan StreamExistenceFilterCheckpointInterval { get; init; } = TimeSpan.FromSeconds(30);
+	public TimeSpan StreamExistenceFilterCheckpointDelay { get; init; } = TimeSpan.FromSeconds(5);
+	public Func<TFReaderLease> TFReaderLeaseFactory { get; init; }
+	public IHasher<string> LowHasher { get; init; } = new XXHashUnsafe();
+	public IHasher<string> HighHasher { get; init; } = new Murmur3AUnsafe();
+}
+
+public interface ILogFormatAbstractorFactory<TStreamId> {
+	LogFormatAbstractor<TStreamId> Create(LogFormatAbstractorOptions options);
+}
+
+public class LogV2FormatAbstractorFactory : ILogFormatAbstractorFactory<string> {
+	public LogV2FormatAbstractorFactory() {
+	}
+
+	public LogFormatAbstractor<string> Create(LogFormatAbstractorOptions options) {
+		var streamExistenceFilter = GenStreamExistenceFilter(options);
+		var streamNameIndex = new LogV2StreamNameIndex(streamExistenceFilter);
+		var eventTypeIndex = new LogV2EventTypeIndex();
+
+		return new LogFormatAbstractor<string>(
+			lowHasher: options.LowHasher,
+			highHasher: options.HighHasher,
+			streamNameIndex: streamNameIndex,
+			streamNameIndexConfirmer: streamNameIndex,
+			eventTypeIndex: eventTypeIndex,
+			eventTypeIndexConfirmer: eventTypeIndex,
+			streamIds: streamNameIndex,
+			metastreams: new LogV2SystemStreams(),
+			streamNamesProvider: GenStreamNamesProvider(options, streamNameIndex, eventTypeIndex),
+			streamIdValidator: new LogV2StreamIdValidator(),
+			streamIdConverter: new LogV2StreamIdConverter(),
+			emptyStreamId: string.Empty,
+			emptyEventTypeId: string.Empty,
+			streamIdSizer: new LogV2Sizer(),
+			streamExistenceFilter: streamExistenceFilter,
+			streamExistenceFilterReader: streamExistenceFilter,
+			recordFactory: new LogV2RecordFactory(),
+			supportsExplicitTransactions: true,
+			partitionManagerFactory: (r, w) => new LogV2PartitionManager());
+	}
+
+	private static INameExistenceFilter GenStreamExistenceFilter(
+		LogFormatAbstractorOptions options) {
+
+		if (options.InMemory || options.StreamExistenceFilterSize == 0) {
+			return new NoNameExistenceFilter();
+		}
+
+		var nameExistenceFilter = new StreamExistenceFilter(
+			directory: $"{options.IndexDirectory}/{ESConsts.StreamExistenceFilterDirectoryName}",
+			filterName: "streamExistenceFilter",
+			size: options.StreamExistenceFilterSize,
+			checkpoint: options.StreamExistenceFilterCheckpoint,
+			checkpointInterval: options.StreamExistenceFilterCheckpointInterval,
+			checkpointDelay: options.StreamExistenceFilterCheckpointDelay,
+			hasher: new CompositeHasher<string>(
+				options.LowHasher,
+				options.HighHasher));
+
+		return nameExistenceFilter;
+	}
+
+	static IStreamNamesProvider<string> GenStreamNamesProvider(
+		LogFormatAbstractorOptions options,
+		LogV2StreamNameIndex streamNameIndex,
+		LogV2EventTypeIndex eventTypeIndex) =>
+
+		new AdHocStreamNamesProvider<string>(setTableIndex: (self, tableIndex) => {
+			self.SystemStreams = new LogV2SystemStreams();
+			self.StreamNames = streamNameIndex;
+			self.EventTypes = eventTypeIndex;
+			self.StreamExistenceFilterInitializer = new LogV2StreamExistenceFilterInitializer(
+				options.TFReaderLeaseFactory,
+				tableIndex);
+		});
+}
+
+public class LogV3FormatAbstractorFactory : ILogFormatAbstractorFactory<LogV3StreamId> {
+	public LogV3FormatAbstractorFactory() {
+	}
+
+	public LogFormatAbstractor<LogV3StreamId> Create(LogFormatAbstractorOptions options) {
+		var metastreams = new LogV3Metastreams();
+		var recordFactory = new LogV3RecordFactory();
+
+		var streamNameIndexPersistence = GenStreamNameIndexPersistence(options);
+		var streamExistenceFilter = GenStreamExistenceFilter(options);
+		var streamNameIndex = GenStreamNameIndex(streamExistenceFilter, streamNameIndexPersistence, metastreams);
+
+		var streamIds = streamNameIndexPersistence
+			.Wrap(x => new NameExistenceFilterValueLookupDecorator<LogV3StreamId>(x, streamExistenceFilter))
+			.Wrap(x => new StreamIdLookupMetastreamDecorator(x, metastreams));
+
+		var eventTypeIndexPersistence = GenEventTypeIndexPersistence(options);
+		var eventTypeIndex = GenEventTypeIndex(eventTypeIndexPersistence);
+
+		var abstractor = new LogFormatAbstractor<LogV3StreamId>(
+			lowHasher: new IdentityLowHasher(),
+			highHasher: new IdentityHighHasher(),
+			streamNameIndex: new StreamNameIndexMetastreamDecorator(streamNameIndex, metastreams),
+			streamNameIndexConfirmer: streamNameIndex,
+			eventTypeIndex: new EventTypeIndexSystemTypesDecorator(eventTypeIndex),
+			eventTypeIndexConfirmer: eventTypeIndex,
+			streamIds: streamIds,
+			metastreams: metastreams,
+			streamNamesProvider: GenStreamNamesProvider(metastreams),
+			streamIdValidator: new LogV3StreamIdValidator(),
+			streamIdConverter: new LogV3StreamIdConverter(),
+			emptyStreamId: 0,
+			emptyEventTypeId: 0,
+			streamIdSizer: new LogV3Sizer(),
+			streamExistenceFilter: streamExistenceFilter,
+			// this is for the indexreader to check the existence of the stream using a streamId
+			// its important for LogV2 (because it has no stream name index)
+			// but not applicable to LogV3 (because you need a streamName not id to check the filter)
+			streamExistenceFilterReader: new NoExistenceFilterReader(),
+			recordFactory: recordFactory,
+			supportsExplicitTransactions: false,
+			partitionManagerFactory: (r, w) => new PartitionManager(r, w, recordFactory));
+		return abstractor;
+	}
+
+	static IStreamNamesProvider<LogV3StreamId> GenStreamNamesProvider(IMetastreamLookup<LogV3StreamId> metastreams) {
+		return new AdHocStreamNamesProvider<LogV3StreamId>((self, indexReader) => {
+			INameLookup<LogV3StreamId> streamNames = new StreamIdToNameFromStandardIndex(indexReader);
+			INameLookup<LogV3StreamId> eventTypes = new EventTypeIdToNameFromStandardIndex(indexReader);
+			self.SystemStreams = new LogV3SystemStreams(metastreams, streamNames);
+			self.StreamNames = new StreamNameLookupMetastreamDecorator(streamNames, metastreams);
+			self.EventTypes = new EventTypeLookupSystemTypesDecorator(eventTypes);
+			self.StreamExistenceFilterInitializer = new LogV3StreamExistenceFilterInitializer(streamNames);
+		});
+	}
+
+	static NameIndex GenStreamNameIndex(
+		INameExistenceFilter existenceFilter,
+		INameIndexPersistence<LogV3StreamId> persistence,
+		IMetastreamLookup<LogV3StreamId> metastreams) =>
+		new NameIndex(
+			indexName: "StreamNameIndex",
+			firstValue: LogV3SystemStreams.FirstRealStream,
+			valueInterval: LogV3SystemStreams.StreamInterval,
+			existenceFilter: existenceFilter,
+			persistence: persistence,
+			metastreams: metastreams,
+			recordTypeToHandle: typeof(LogV3StreamRecord));
+
+	static INameIndexPersistence<LogV3StreamId> GenStreamNameIndexPersistence(LogFormatAbstractorOptions options) {
+		if (options.InMemory) {
+			return new NameIndexInMemoryPersistence();
+		}
+
+		var persistence = new FASTERNameIndexPersistence(
+			indexName: "StreamNameIndexPersistence",
+			logDir: $"{options.IndexDirectory}/stream-name-index",
+			firstValue: LogV3SystemStreams.FirstRealStream,
+			valueInterval: LogV3SystemStreams.StreamInterval,
+			initialReaderCount: options.InitialReaderCount,
+			maxReaderCount: options.MaxReaderCount,
+			enableReadCache: true,
+			checkpointInterval: TimeSpan.FromSeconds(60));
+		return persistence;
+	}
+
+	public static INameExistenceFilter GenStreamExistenceFilter(LogFormatAbstractorOptions options) {
+		if (options.InMemory || options.StreamExistenceFilterSize == 0) {
+			return new NoNameExistenceFilter();
+		}
+
+		var nameExistenceFilter = new StreamExistenceFilter(
+			directory: $"{options.IndexDirectory}/{ESConsts.StreamExistenceFilterDirectoryName}",
+			filterName: "streamExistenceFilter",
+			size: options.StreamExistenceFilterSize,
+			checkpoint: options.StreamExistenceFilterCheckpoint,
+			checkpointInterval: options.StreamExistenceFilterCheckpointInterval,
+			checkpointDelay: options.StreamExistenceFilterCheckpointDelay,
+			hasher: null)
+		.Wrap(x => new StreamExistenceFilterValidator(x));
+
+		return nameExistenceFilter;
+	}
+
+	static INameIndexPersistence<LogV3StreamId> GenEventTypeIndexPersistence(LogFormatAbstractorOptions options) {
+		if (options.InMemory) {
+			return new NameIndexInMemoryPersistence();
+		}
+
+		var persistence = new FASTERNameIndexPersistence(
+			indexName: "EventTypeIndexPersistence",
+			logDir: $"{options.IndexDirectory}/event-type-index",
+			firstValue: LogV3SystemEventTypes.FirstRealEventTypeNumber,
+			valueInterval: LogV3SystemEventTypes.EventTypeInterval,
+			initialReaderCount: options.InitialReaderCount,
+			maxReaderCount: options.MaxReaderCount,
+			enableReadCache: true,
+			checkpointInterval: TimeSpan.FromSeconds(60));
+		return persistence;
+	}
+
+	static NameIndex GenEventTypeIndex(INameIndexPersistence<LogV3StreamId> persistence) =>
+		new NameIndex(
+			indexName: "EventTypeIndex",
+			firstValue: LogV3SystemEventTypes.FirstRealEventTypeNumber,
+			valueInterval: LogV3SystemEventTypes.EventTypeInterval,
+			existenceFilter: new NoNameExistenceFilter(),
+			persistence: persistence,
+			metastreams: null,
+			recordTypeToHandle: typeof(LogV3EventTypeRecord));
+}
+
+public class LogFormatAbstractor<TStreamId> : IDisposable {
+	private readonly Func<ITransactionFileReader, ITransactionFileWriter, IPartitionManager> _partitionManagerFactory;
+
+	public LogFormatAbstractor(
+		IHasher<TStreamId> lowHasher,
+		IHasher<TStreamId> highHasher,
+		INameIndex<TStreamId> streamNameIndex,
+		INameIndexConfirmer<TStreamId> streamNameIndexConfirmer,
+		INameIndex<TStreamId> eventTypeIndex,
+		INameIndexConfirmer<TStreamId> eventTypeIndexConfirmer,
+		IValueLookup<TStreamId> streamIds,
+		IMetastreamLookup<TStreamId> metastreams,
+		IStreamNamesProvider<TStreamId> streamNamesProvider,
+		IValidator<TStreamId> streamIdValidator,
+		IStreamIdConverter<TStreamId> streamIdConverter,
+		TStreamId emptyStreamId,
+		TStreamId emptyEventTypeId,
+		ISizer<TStreamId> streamIdSizer,
+		INameExistenceFilter streamExistenceFilter,
+		IExistenceFilterReader<TStreamId> streamExistenceFilterReader,
+		IRecordFactory<TStreamId> recordFactory,
+		bool supportsExplicitTransactions,
+		Func<ITransactionFileReader, ITransactionFileWriter, IPartitionManager> partitionManagerFactory) {
+
+		_partitionManagerFactory = partitionManagerFactory;
+
+		LowHasher = lowHasher;
+		HighHasher = highHasher;
+		StreamNameIndex = streamNameIndex;
+		StreamNameIndexConfirmer = streamNameIndexConfirmer;
+		EventTypeIndex = eventTypeIndex;
+		EventTypeIndexConfirmer = eventTypeIndexConfirmer;
+		StreamIds = streamIds;
+		Metastreams = metastreams;
+		StreamNamesProvider = streamNamesProvider;
+		StreamIdValidator = streamIdValidator;
+		StreamIdConverter = streamIdConverter;
+		EmptyStreamId = emptyStreamId;
+		EmptyEventTypeId = emptyEventTypeId;
+		StreamIdSizer = streamIdSizer;
+		StreamExistenceFilter = streamExistenceFilter;
+		StreamExistenceFilterReader = streamExistenceFilterReader;
+		RecordFactory = recordFactory;
+		SupportsExplicitTransactions = supportsExplicitTransactions;
+	}
+
+	public void Dispose() {
+		StreamNameIndexConfirmer?.Dispose();
+		EventTypeIndexConfirmer?.Dispose();
+		StreamExistenceFilter?.Dispose();
+	}
+
+	public IHasher<TStreamId> LowHasher { get; }
+	public IHasher<TStreamId> HighHasher { get; }
+	public INameIndex<TStreamId> StreamNameIndex { get; }
+	public INameIndexConfirmer<TStreamId> StreamNameIndexConfirmer { get; }
+	public INameIndex<TStreamId> EventTypeIndex { get; }
+	public INameIndexConfirmer<TStreamId> EventTypeIndexConfirmer { get; }
+	public IValueLookup<TStreamId> StreamIds { get; }
+	public IMetastreamLookup<TStreamId> Metastreams { get; }
+	public IStreamNamesProvider<TStreamId> StreamNamesProvider { get; }
+	public IValidator<TStreamId> StreamIdValidator { get; }
+	public IStreamIdConverter<TStreamId> StreamIdConverter { get; }
+	public TStreamId EmptyStreamId { get; }
+	public TStreamId EmptyEventTypeId { get; }
+	public ISizer<TStreamId> StreamIdSizer { get; }
+	public INameExistenceFilter StreamExistenceFilter { get; }
+	public IExistenceFilterReader<TStreamId> StreamExistenceFilterReader { get; }
+	public IRecordFactory<TStreamId> RecordFactory { get; }
+
+	public INameLookup<TStreamId> StreamNames => StreamNamesProvider.StreamNames;
+	public INameLookup<TStreamId> EventTypes => StreamNamesProvider.EventTypes;
+	public ISystemStreamLookup<TStreamId> SystemStreams => StreamNamesProvider.SystemStreams;
+	public INameExistenceFilterInitializer StreamExistenceFilterInitializer => StreamNamesProvider.StreamExistenceFilterInitializer;
+	public bool SupportsExplicitTransactions { get; }
+
+	public IPartitionManager CreatePartitionManager(ITransactionFileReader reader, ITransactionFileWriter writer) {
+		return _partitionManagerFactory(reader, writer);
+	}
+}
diff --git a/src/KurrentDB.Core/LogAbstraction/WrapExtensions.cs b/src/KurrentDB.Core/LogAbstraction/WrapExtensions.cs
new file mode 100644
index 00000000000..72fb5da6a78
--- /dev/null
+++ b/src/KurrentDB.Core/LogAbstraction/WrapExtensions.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.LogAbstraction;
+
+public static class WrapExtensions {
+	public static U Wrap<T, U>(this T t, Func<T, U> wrap) => wrap(t);
+}
diff --git a/src/KurrentDB.Core/LogV2/LogV2EventTypeIndex.cs b/src/KurrentDB.Core/LogV2/LogV2EventTypeIndex.cs
new file mode 100644
index 00000000000..aeb51373bb7
--- /dev/null
+++ b/src/KurrentDB.Core/LogV2/LogV2EventTypeIndex.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.LogV2;
+
+public class LogV2EventTypeIndex :
+	INameIndex<string>,
+	INameIndexConfirmer<string>,
+	IValueLookup<string>,
+	INameLookup<string> {
+
+	public void Dispose() {
+	}
+
+	public ValueTask InitializeWithConfirmed(INameLookup<string> source, CancellationToken token)
+		=> token.IsCancellationRequested ? ValueTask.FromCanceled(token) : ValueTask.CompletedTask;
+
+	public void CancelReservations() {
+	}
+
+	public void Confirm(IList<IPrepareLogRecord<string>> prepares, bool catchingUp, IIndexBackend<string> backend) {
+	}
+
+	public void Confirm(
+		IList<IPrepareLogRecord<string>> prepares,
+		CommitLogRecord commit,
+		bool catchingUp,
+		IIndexBackend<string> backend) {
+	}
+
+	public bool GetOrReserve(string eventType, out string eventTypeId, out string createdId, out string createdName) {
+		Ensure.NotNull(eventType, "eventType");
+		eventTypeId = eventType;
+		createdId = default;
+		createdName = default;
+
+		return true;
+	}
+
+	public string LookupValue(string eventTypeName) => eventTypeName;
+
+	public ValueTask<string> LookupName(string eventTypeId, CancellationToken token)
+		=> token.IsCancellationRequested ? ValueTask.FromCanceled<string>(token) : ValueTask.FromResult(eventTypeId);
+
+	public ValueTask<Optional<string>> TryGetLastValue(CancellationToken token)
+		=> ValueTask.FromException<Optional<string>>(new NotImplementedException());
+}
diff --git a/src/KurrentDB.Core/LogV2/LogV2PartitionManager.cs b/src/KurrentDB.Core/LogV2/LogV2PartitionManager.cs
new file mode 100644
index 00000000000..a4556ae83df
--- /dev/null
+++ b/src/KurrentDB.Core/LogV2/LogV2PartitionManager.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.LogAbstraction;
+
+namespace KurrentDB.Core.LogV2;
+
+public class LogV2PartitionManager : IPartitionManager {
+
+	public Guid? RootId => Guid.Empty;
+	public Guid? RootTypeId => Guid.Empty;
+
+	public ValueTask Initialize(CancellationToken token)
+		=> token.IsCancellationRequested ? ValueTask.FromCanceled(token) : ValueTask.CompletedTask;
+}
diff --git a/src/KurrentDB.Core/LogV2/LogV2RecordFactory.cs b/src/KurrentDB.Core/LogV2/LogV2RecordFactory.cs
new file mode 100644
index 00000000000..dd22da5bd0b
--- /dev/null
+++ b/src/KurrentDB.Core/LogV2/LogV2RecordFactory.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.LogV2;
+
+public class LogV2RecordFactory : IRecordFactory<string> {
+	public LogV2RecordFactory() {
+	}
+
+	public bool ExplicitStreamCreation => false;
+	public bool ExplicitEventTypeCreation => false;
+
+	public IPrepareLogRecord<string> CreateStreamRecord(
+		Guid streamId,
+		long logPosition,
+		DateTime timeStamp,
+		string streamNumber,
+		string streamName) =>
+		throw new NotSupportedException();
+
+	public IPrepareLogRecord<string> CreateEventTypeRecord(
+		Guid eventTypeId,
+		Guid parentEventTypeId,
+		string eventType,
+		string referenceNumber,
+		ushort version,
+		long logPosition,
+		DateTime timeStamp) =>
+		throw new NotSupportedException();
+
+	public ISystemLogRecord CreateEpoch(EpochRecord epoch) {
+		var result = new SystemLogRecord(
+			logPosition: epoch.EpochPosition,
+			timeStamp: epoch.TimeStamp,
+			systemRecordType: SystemRecordType.Epoch,
+			systemRecordSerialization: SystemRecordSerialization.Json,
+			data: epoch.AsSerialized());
+		return result;
+	}
+
+	public IPrepareLogRecord<string> CreatePrepare(
+		long logPosition,
+		Guid correlationId,
+		Guid eventId,
+		long transactionPosition,
+		int transactionOffset,
+		string eventStreamId,
+		long expectedVersion,
+		DateTime timeStamp,
+		PrepareFlags flags,
+		string eventType,
+		ReadOnlyMemory<byte> data,
+		ReadOnlyMemory<byte> metadata) {
+
+		var result = new PrepareLogRecord(
+			logPosition: logPosition,
+			correlationId: correlationId,
+			eventId: eventId,
+			transactionPosition: transactionPosition,
+			transactionOffset: transactionOffset,
+			eventStreamId: eventStreamId,
+			eventStreamIdSize: null,
+			expectedVersion: expectedVersion,
+			timeStamp: timeStamp,
+			flags: flags,
+			eventType: eventType,
+			eventTypeSize: null,
+			data: data,
+			metadata: metadata);
+		return result;
+	}
+}
diff --git a/src/KurrentDB.Core/LogV2/LogV2Sizer.cs b/src/KurrentDB.Core/LogV2/LogV2Sizer.cs
new file mode 100644
index 00000000000..151bc213c51
--- /dev/null
+++ b/src/KurrentDB.Core/LogV2/LogV2Sizer.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Caching;
+using KurrentDB.Core.LogAbstraction;
+
+namespace KurrentDB.Core.LogV2;
+
+public class LogV2Sizer : ISizer<string> {
+	public int GetSizeInBytes(string t) => MemSizer.SizeOf(t);
+}
diff --git a/src/KurrentDB.Core/LogV2/LogV2StreamExistenceFilterInitializer.cs b/src/KurrentDB.Core/LogV2/LogV2StreamExistenceFilterInitializer.cs
new file mode 100644
index 00000000000..c18f0eeda73
--- /dev/null
+++ b/src/KurrentDB.Core/LogV2/LogV2StreamExistenceFilterInitializer.cs
@@ -0,0 +1,159 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using Serilog;
+
+namespace KurrentDB.Core.LogV2;
+
+/// <summary>
+/// Stream existence filter initializer for Log V2
+/// Reads the index and transaction log to populate the stream existence filter from the last checkpoint.
+/// May add a stream hash more than once.
+/// </summary>
+/// In V2 the the bloom filter checkpoint is the post-position of the last processed
+/// log record. Sometimes we only have the pre-position, but this is also the post-position
+/// of the previous record, which is fine. the net effect is an extra record is initialized
+/// on startup next time.
+public class LogV2StreamExistenceFilterInitializer : INameExistenceFilterInitializer {
+	private readonly Func<TFReaderLease> _tfReaderFactory;
+	private readonly ITableIndex _tableIndex;
+
+	protected static readonly ILogger Log = Serilog.Log.ForContext<LogV2StreamExistenceFilterInitializer>();
+
+	public LogV2StreamExistenceFilterInitializer(
+		Func<TFReaderLease> tfReaderFactory,
+		ITableIndex tableIndex) {
+
+		Ensure.NotNull(tableIndex, nameof(tableIndex));
+
+		_tfReaderFactory = tfReaderFactory;
+		_tableIndex = tableIndex;
+	}
+
+	public async ValueTask Initialize(INameExistenceFilter filter, long truncateToPosition, CancellationToken token) {
+		if (truncateToPosition < filter.CurrentCheckpoint) {
+			filter.TruncateTo(checkpoint: truncateToPosition);
+		}
+
+		InitializeFromIndex(filter);
+		await InitializeFromLog(filter, token);
+	}
+
+	private void InitializeFromIndex(INameExistenceFilter filter) {
+		if (filter.CurrentCheckpoint != -1L) {
+			// can only use the index to build from scratch. if we have a checkpoint
+			// we need to build from the log in order to make use of it.
+			return;
+		}
+
+		Log.Information("Initializing from index");
+
+		// we have no checkpoint, build from the index. unfortunately there isn't
+		// a simple way to checkpoint in the middle of the index.
+		// keep track of the max position we see and use that as the checkpoint
+		// but only if we complete.
+		var checkpoint = -1L;
+		var enumerators = GetEnumerators();
+		var recordsTotal = enumerators.Sum(pair => pair.Count);
+		var recordsProcessed = 0L;
+		ulong? previousHash = null;
+		for (var t = 0; t < enumerators.Count; t++) {
+			var pair = enumerators[t];
+			var enumerator = pair.Enumerator;
+			do {
+				// enumerators are already advanced to first item
+				var entry = enumerator.Current;
+				checkpoint = Math.Max(checkpoint, entry.Position);
+				if (entry.Stream == previousHash)
+					continue;
+
+				// add regardless of version because event 0 may be scavenged
+				filter.Add(entry.Stream);
+				previousHash = entry.Stream;
+			} while (enumerator.MoveNext());
+			enumerator.Dispose();
+
+			recordsProcessed += pair.Count;
+			var percent = (double)recordsProcessed / recordsTotal * 100;
+			Log.Information("Stream Existence Filter initialization processed {tablesProcessed}/{tablesTotal} tables. {recordsProcessed:N0}/{recordsTotal:N0} log records ({percent:N2}%)",
+				t + 1, enumerators.Count, recordsProcessed, recordsTotal, percent);
+		}
+
+		// checkpoint at the end of the index.
+		filter.CurrentCheckpoint = checkpoint;
+	}
+
+	private List<(IEnumerator<IndexEntry> Enumerator, long Count)> GetEnumerators() {
+		var attempt = 0;
+		while (attempt < 5) {
+			attempt++;
+			var enumerators = new List<(IEnumerator<IndexEntry> Enumerator, long Count)>();
+			try {
+				var tables = _tableIndex.IterateAllInOrder();
+				foreach (var table in tables) {
+					Log.Information("Found table {id}. Type: {type}. Count: {count:N0}. Version: {version}",
+						table.Id, table.GetType(), table.Count, table.Version);
+
+					if (table.Version == PTableVersions.IndexV1)
+						throw new NotSupportedException("The Stream Existence Filter is not supported with V1 index files. Please disable the filter by setting StreamExistenceFilterSize to 0, or rebuild the indexes.");
+
+					var enumerator = table.IterateAllInOrder().GetEnumerator();
+
+					// advance into the enumerator so that we obtain a workitem in each table
+					// so that the ptables will definitely not be deleted until we are done.
+					if (enumerator.MoveNext()) {
+						// got workitem!
+						enumerators.Add((enumerator, table.Count));
+					} else {
+						enumerator.Dispose();
+					}
+				}
+				return enumerators;
+			} catch (NotSupportedException) {
+				foreach (var pair in enumerators)
+					pair.Enumerator.Dispose();
+				throw;
+			} catch (FileBeingDeletedException) {
+				foreach (var pair in enumerators)
+					pair.Enumerator.Dispose();
+				Log.Debug("PTable is being deleted.");
+			}
+		}
+
+		throw new InvalidOperationException("Failed to get enumerators for the index.");
+	}
+
+	private async ValueTask InitializeFromLog(INameExistenceFilter filter, CancellationToken token) {
+		// if we have a checkpoint, start from that position in the log. this will work
+		// whether the checkpoint is the pre or post position of the last processed record.
+		var startPosition = filter.CurrentCheckpoint == -1 ? 0 : filter.CurrentCheckpoint;
+		Log.Information("Initializing from log starting at {startPosition:N0}", startPosition);
+		using var reader = _tfReaderFactory();
+		reader.Reposition(startPosition);
+
+		while (await reader.TryReadNext(token) is { Success: true } result) {
+			switch (result.LogRecord.RecordType) {
+				case LogRecordType.Prepare:
+					// add regardless of expectedVersion because event 0 may be scavenged
+					// add regardless of committed or not because waiting for the commit is expensive
+					var prepare = (IPrepareLogRecord<string>)result.LogRecord;
+					filter.Add(prepare.EventStreamId);
+					filter.CurrentCheckpoint = result.RecordPostPosition;
+					break;
+					// no need to handle commits here, see comments in the prepare handling.
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/LogV2/LogV2StreamIdConverter.cs b/src/KurrentDB.Core/LogV2/LogV2StreamIdConverter.cs
new file mode 100644
index 00000000000..bdba9be9a93
--- /dev/null
+++ b/src/KurrentDB.Core/LogV2/LogV2StreamIdConverter.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+using KurrentDB.Core.LogAbstraction;
+
+namespace KurrentDB.Core.LogV2;
+
+public class LogV2StreamIdConverter : IStreamIdConverter<string> {
+	public string ToStreamId(ReadOnlySpan<byte> bytes) {
+		unsafe {
+			fixed (byte* b = bytes) {
+				return Encoding.UTF8.GetString(b, bytes.Length);
+			}
+		}
+	}
+
+	public string ToStreamId(ReadOnlyMemory<byte> bytes) =>
+		ToStreamId(bytes.Span);
+}
diff --git a/src/KurrentDB.Core/LogV2/LogV2StreamIdValidator.cs b/src/KurrentDB.Core/LogV2/LogV2StreamIdValidator.cs
new file mode 100644
index 00000000000..6f5a8bcf890
--- /dev/null
+++ b/src/KurrentDB.Core/LogV2/LogV2StreamIdValidator.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.LogV2;
+
+public class LogV2StreamIdValidator : IValidator<string> {
+	public LogV2StreamIdValidator() {
+	}
+
+	public void Validate(string streamId) {
+		Ensure.NotNullOrEmpty(streamId, "streamId");
+	}
+}
diff --git a/src/KurrentDB.Core/LogV2/LogV2StreamNameIndex.cs b/src/KurrentDB.Core/LogV2/LogV2StreamNameIndex.cs
new file mode 100644
index 00000000000..17cfe5f4ec9
--- /dev/null
+++ b/src/KurrentDB.Core/LogV2/LogV2StreamNameIndex.cs
@@ -0,0 +1,95 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.LogV2;
+
+public class LogV2StreamNameIndex :
+	INameIndex<string>,
+	INameIndexConfirmer<string>,
+	IValueLookup<string>,
+	INameLookup<string> {
+
+	private readonly INameExistenceFilter _existenceFilter;
+
+	public LogV2StreamNameIndex(INameExistenceFilter existenceFilter) {
+		_existenceFilter = existenceFilter;
+	}
+
+	public void Dispose() {
+	}
+
+	public ValueTask InitializeWithConfirmed(INameLookup<string> source, CancellationToken token)
+		=> token.IsCancellationRequested ? ValueTask.FromCanceled(token) : ValueTask.CompletedTask;
+
+	public void CancelReservations() {
+	}
+
+	public void Confirm(IList<IPrepareLogRecord<string>> prepares, bool catchingUp, IIndexBackend<string> backend) {
+		if (catchingUp) {
+			// after the main index is caught up we will initialize the stream existence filter
+			return;
+		}
+
+		if (prepares.Count == 0)
+			return;
+
+		var lastPrepare = prepares[prepares.Count - 1];
+
+		if (prepares[0].ExpectedVersion == ExpectedVersion.NoStream) {
+			_existenceFilter.Add(lastPrepare.EventStreamId);
+		}
+
+		_existenceFilter.CurrentCheckpoint = lastPrepare.LogPosition;
+	}
+
+	// must use the commit to see if these are the first events in the stream
+	// and for checkpointing.
+	public void Confirm(
+		IList<IPrepareLogRecord<string>> prepares,
+		CommitLogRecord commit,
+		bool catchingUp,
+		IIndexBackend<string> backend) {
+
+		if (catchingUp) {
+			// after the main index is caught up we will initialize the stream existence filter
+			return;
+		}
+
+		if (prepares.Count != 0 && commit.FirstEventNumber == 0) {
+			var lastPrepare = prepares[prepares.Count - 1];
+			_existenceFilter.Add(lastPrepare.EventStreamId);
+		}
+
+		_existenceFilter.CurrentCheckpoint = commit.LogPosition;
+	}
+
+	public bool GetOrReserve(string streamName, out string streamId, out string createdId, out string createdName) {
+		Ensure.NotNullOrEmpty(streamName, "streamName");
+		streamId = streamName;
+		createdId = default;
+		createdName = default;
+
+		// not adding the stream to the filter here, but this is safe because returning
+		// true indicates that the stream might exist and no shortcut may be taken.
+		return true;
+	}
+
+	public string LookupValue(string streamName) => streamName;
+
+	public ValueTask<string> LookupName(string value, CancellationToken token)
+		=> token.IsCancellationRequested ? ValueTask.FromCanceled<string>(token) : ValueTask.FromResult(value);
+
+	public ValueTask<Optional<string>> TryGetLastValue(CancellationToken token)
+		=> ValueTask.FromException<Optional<string>>(new NotImplementedException());
+}
diff --git a/src/KurrentDB.Core/LogV2/LogV2SystemStreams.cs b/src/KurrentDB.Core/LogV2/LogV2SystemStreams.cs
new file mode 100644
index 00000000000..ac0bb6e5993
--- /dev/null
+++ b/src/KurrentDB.Core/LogV2/LogV2SystemStreams.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Services;
+
+namespace KurrentDB.Core.LogV2;
+
+public class LogV2SystemStreams : ISystemStreamLookup<string> {
+	public LogV2SystemStreams() {
+	}
+
+	public string AllStream { get; } = SystemStreams.AllStream;
+	public string SettingsStream { get; } = SystemStreams.SettingsStream;
+
+	public bool IsMetaStream(string streamId) => SystemStreams.IsMetastream(streamId);
+
+	public ValueTask<bool> IsSystemStream(string streamId, CancellationToken token) =>
+		new(SystemStreams.IsSystemStream(streamId));
+	public string MetaStreamOf(string streamId) => SystemStreams.MetastreamOf(streamId);
+	public string OriginalStreamOf(string streamId) => SystemStreams.OriginalStreamOf(streamId);
+}
diff --git a/src/KurrentDB.Core/LogV3/EventTypeIdConverter.cs b/src/KurrentDB.Core/LogV3/EventTypeIdConverter.cs
new file mode 100644
index 00000000000..535fe6ea829
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/EventTypeIdConverter.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.LogV3;
+
+/// Converts between EventTypeIds and their event number in the event types stream.
+public static class EventTypeIdConverter {
+	static readonly uint _offset = LogV3SystemEventTypes.FirstRealEventTypeNumber;
+
+	public static uint ToEventTypeId(long index) {
+		return (uint)index + _offset;
+	}
+
+	public static long ToEventNumber(uint eventTypeId) {
+		return eventTypeId - _offset;
+	}
+}
diff --git a/src/KurrentDB.Core/LogV3/EventTypeIdToNameFromStandardIndex.cs b/src/KurrentDB.Core/LogV3/EventTypeIdToNameFromStandardIndex.cs
new file mode 100644
index 00000000000..190301b7288
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/EventTypeIdToNameFromStandardIndex.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.LogV3;
+
+public class EventTypeIdToNameFromStandardIndex : INameLookup<uint> {
+	private readonly IIndexReader<uint> _indexReader;
+
+	public EventTypeIdToNameFromStandardIndex(IIndexReader<uint> indexReader) {
+		_indexReader = indexReader;
+	}
+
+	public async ValueTask<string> LookupName(uint eventTypeId, CancellationToken token) {
+		var record = await _indexReader.ReadPrepare(
+			streamId: LogV3SystemStreams.EventTypesStreamNumber,
+			eventNumber: EventTypeIdConverter.ToEventNumber(eventTypeId),
+			token);
+
+		return record switch {
+			null => null,
+			LogV3EventTypeRecord eventTypeRecord => eventTypeRecord.EventTypeName,
+			_ => throw new Exception($"Unexpected log record type: {record}."),
+		};
+	}
+
+	public async ValueTask<Optional<uint>> TryGetLastValue(CancellationToken token) {
+		var lastEventNumber = await _indexReader.GetStreamLastEventNumber(LogV3SystemStreams.EventTypesStreamNumber, token);
+		return lastEventNumber is > ExpectedVersion.NoStream and not EventNumber.DeletedStream
+			? EventTypeIdConverter.ToEventTypeId(lastEventNumber)
+			: Optional.None<uint>();
+	}
+}
diff --git a/src/KurrentDB.Core/LogV3/EventTypeIndexSystemTypesDecorator.cs b/src/KurrentDB.Core/LogV3/EventTypeIndexSystemTypesDecorator.cs
new file mode 100644
index 00000000000..27ad90e450c
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/EventTypeIndexSystemTypesDecorator.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.LogAbstraction;
+
+namespace KurrentDB.Core.LogV3;
+
+public class EventTypeIndexSystemTypesDecorator : INameIndex<uint> {
+	private readonly INameIndex<uint> _wrapped;
+
+	public EventTypeIndexSystemTypesDecorator(INameIndex<uint> wrapped) {
+		_wrapped = wrapped;
+	}
+
+	public void CancelReservations() {
+		_wrapped.CancelReservations();
+	}
+
+	public bool GetOrReserve(string eventType, out uint eventTypeId, out uint createdId, out string createdName) {
+		Ensure.NotNull(eventType, "eventType");
+
+		if (LogV3SystemEventTypes.TryGetSystemEventTypeId(eventType, out eventTypeId)) {
+			createdId = default;
+			createdName = default;
+			return true;
+		}
+
+		return _wrapped.GetOrReserve(eventType, out eventTypeId, out createdId, out createdName);
+	}
+}
diff --git a/src/KurrentDB.Core/LogV3/EventTypeLookupSystemTypesDecorator.cs b/src/KurrentDB.Core/LogV3/EventTypeLookupSystemTypesDecorator.cs
new file mode 100644
index 00000000000..acd677db8a1
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/EventTypeLookupSystemTypesDecorator.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext;
+using KurrentDB.Core.LogAbstraction;
+
+namespace KurrentDB.Core.LogV3;
+
+public class EventTypeLookupSystemTypesDecorator : INameLookup<uint> {
+	private readonly INameLookup<uint> _wrapped;
+
+	public EventTypeLookupSystemTypesDecorator(INameLookup<uint> wrapped) {
+		_wrapped = wrapped;
+	}
+
+	public ValueTask<string> LookupName(uint eventTypeId, CancellationToken token) {
+		return LogV3SystemEventTypes.TryGetVirtualEventType(eventTypeId, out var name)
+			? new(name)
+			: _wrapped.LookupName(eventTypeId, token);
+	}
+
+	public ValueTask<Optional<uint>> TryGetLastValue(CancellationToken token)
+		=> _wrapped.TryGetLastValue(token);
+}
diff --git a/src/KurrentDB.Core/LogV3/FASTER/Context.cs b/src/KurrentDB.Core/LogV3/FASTER/Context.cs
new file mode 100644
index 00000000000..009d8b5408f
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/FASTER/Context.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using FASTER.core;
+
+namespace KurrentDB.Core.LogV3.FASTER;
+
+public class Context<TValue> {
+	public Status Status { get; set; }
+	public TValue Value { get; set; }
+}
+
diff --git a/src/KurrentDB.Core/LogV3/FASTER/FASTERNameIndexPersistence.cs b/src/KurrentDB.Core/LogV3/FASTER/FASTERNameIndexPersistence.cs
new file mode 100644
index 00000000000..f751a7d487c
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/FASTER/FASTERNameIndexPersistence.cs
@@ -0,0 +1,509 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Text.Unicode;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Threading;
+using FASTER.core;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.LogAbstraction.Common;
+using Serilog;
+using static System.Threading.Timeout;
+using Value = System.UInt32;
+
+namespace KurrentDB.Core.LogV3.FASTER;
+
+public class NameIndexPersistence {
+	protected static readonly ILogger Log = Serilog.Log.ForContext<NameIndexPersistence>();
+}
+
+public class FASTERNameIndexPersistence :
+	NameIndexPersistence,
+	INameIndexPersistence<Value> {
+
+	private static readonly Encoding _utf8NoBom = new UTF8Encoding(false, true);
+	private readonly IDevice _log;
+	private readonly FasterKV<SpanByte, Value> _store;
+	private readonly LogSettings _logSettings;
+	private readonly Debouncer _logCheckpointer;
+	private readonly CancellationTokenSource _cancellationTokenSource;
+
+	// used during initialization
+	private readonly ClientSession<SpanByte, Value, Value, Value, Empty, MaintenanceFunctions<Value>> _maintenanceSession;
+
+	// used during initialization and then by the confirmer
+	private readonly ClientSession<SpanByte, Value, Value, Value, Empty, WriterFunctions<Value>> _writerSession;
+
+	// used during initialization and then by various readers (including the storage writer)
+	private readonly ObjectPool<ReaderSession<Value>> _readerSessionPool;
+	private readonly string _indexName;
+	private readonly Value _firstValue;
+	private readonly Value _valueInterval;
+
+	// not expecting any contention for _lastValueAdded but do need the memory barrriers
+	private readonly AsyncExclusiveLock _lastValueLock = new();
+	private Value _lastValueAdded;
+
+	private bool _disposed = false;
+
+	public Value LastValueAdded => _lastValueAdded;
+
+	public FASTERNameIndexPersistence(
+		string indexName,
+		string logDir,
+		Value firstValue,
+		Value valueInterval,
+		int initialReaderCount,
+		int maxReaderCount,
+		bool enableReadCache,
+		TimeSpan checkpointInterval) {
+
+		_indexName = indexName;
+		_firstValue = firstValue;
+		_valueInterval = valueInterval;
+
+		_log = Devices.CreateLogDevice(
+			logPath: $"{logDir}/{_indexName}.log",
+			deleteOnClose: false);
+
+		var checkpointSettings = new CheckpointSettings {
+			CheckpointDir = $"{logDir}",
+			RemoveOutdated = true,
+		};
+
+		var readCacheSettings = enableReadCache
+			? new ReadCacheSettings {
+				// todo: dynamic settings according to available memory
+				MemorySizeBits = 15,
+				PageSizeBits = 12,
+				SecondChanceFraction = 0.1
+			}
+			: null;
+
+		_logSettings = new LogSettings {
+			LogDevice = _log,
+			// todo: dynamic settings according to available memory
+			MemorySizeBits = 15,
+			PageSizeBits = 12,
+			//PreallocateLog = true,
+
+			ReadCacheSettings = readCacheSettings,
+		};
+
+		_store = new FasterKV<SpanByte, Value>(
+			// todo: dynamic settings according to available memory
+			// but bear in mind if we have taken an index checkpoint there is a
+			// procedure to resize it.
+			size: 1L << 20,
+			checkpointSettings: checkpointSettings,
+			logSettings: _logSettings);
+
+		_writerSession = _store
+			.For(new WriterFunctions<Value>())
+			.NewSession<WriterFunctions<Value>>();
+
+		_maintenanceSession = _store
+			.For(new MaintenanceFunctions<Value>())
+			.NewSession<MaintenanceFunctions<Value>>();
+
+		_readerSessionPool = new ObjectPool<ReaderSession<Value>>(
+			objectPoolName: $"{_indexName} readers pool",
+			initialCount: initialReaderCount,
+			maxCount: maxReaderCount,
+			factory: () => new ReaderSession<Value>(
+				_store.For(new ReaderFunctions<Value>()).NewSession<ReaderFunctions<Value>>(),
+				new Context<Value>()),
+			dispose: session => session.Dispose());
+
+		_cancellationTokenSource = new();
+		_logCheckpointer = new Debouncer(
+			checkpointInterval,
+			async token => {
+				try {
+					var success = await CheckpointLogAsync();
+					if (!success)
+						throw new Exception($"not successful");
+
+					Log.Debug("{_indexName} took checkpoint", _indexName);
+				} catch (Exception ex) {
+					Log.Error(ex, "{_indexName} could not take checkpoint", _indexName);
+				}
+			},
+			_cancellationTokenSource.Token);
+
+		Log.Information("{indexName} total memory before recovery {totalMemoryMib:N0} MiB.", _indexName, CalcTotalMemoryMib());
+		Recover();
+		Log.Information("{indexName} total memory after recovery {totalMemoryMib:N0} MiB.", _indexName, CalcTotalMemoryMib());
+	}
+
+	public void Dispose() {
+		if (_disposed)
+			return;
+		_disposed = true;
+		_cancellationTokenSource.Cancel();
+		_maintenanceSession?.Dispose();
+		_writerSession?.Dispose();
+		_readerSessionPool?.Dispose();
+		_store?.Dispose();
+		_log?.Dispose();
+	}
+
+	void Recover() {
+		try {
+			_store.Recover();
+			var (name, value) = ScanBackwards().FirstOrDefault();
+
+			_lastValueLock.TryAcquire(InfiniteTimeSpan);
+			try {
+				_lastValueAdded = name == null ? default : value;
+			} finally {
+				_lastValueLock.Release();
+			}
+
+			Log.Information(
+				"{indexName} has been recovered. " +
+				"Last entry was {name}:{value}",
+				_indexName, name, value);
+		} catch (FasterException ex) {
+			Log.Information($"{_indexName} is starting from scratch: {ex.Message}");
+		}
+	}
+
+	// the source has been initialised. it now contains exactly the data that we want to have in the name index.
+	// there are three cases
+	// 1. we are exactly in sync with the source (do nothing)
+	// 2. we are behind the source (could be by a lot, say we are rebuilding) -> catch up
+	// 3. we are ahead of the source (should only be by a little) -> truncate
+	// after we make it that the indexes only contain replicated records then there
+	// will be no need for the truncation case and we will remove it with the associated
+	// scanning code.
+	public async ValueTask Init(INameLookup<Value> source, CancellationToken token) {
+		Log.Information("{indexName} initializing...", _indexName);
+		var iter = ScanBackwards().GetEnumerator();
+
+		if (!iter.MoveNext()) {
+			Log.Information("{indexName} is empty. Catching up from beginning of source.", _indexName);
+			await CatchUp(source, previousValue: 0, token);
+
+		} else if (await source.LookupName(iter.Current.Value, token) is { } sourceName) {
+			if (sourceName != iter.Current.Name)
+				ThrowNameMismatch(iter.Current.Value, iter.Current.Name, sourceName);
+
+			Log.Information("{indexName} has entry {value}. Catching up from there", _indexName, iter.Current.Value);
+			await CatchUp(source, previousValue: iter.Current.Value, token);
+
+		} else {
+			// we have a most recent entry but it is not in the source.
+			// scan backwards until we find something in common with the source and
+			// truncate everything in between.
+			var keysToTruncate = new List<string>();
+			var keysToTruncateSet = new HashSet<string>();
+
+			void PopEntry() {
+				Debug.Assert(_lastValueLock.IsLockHeld);
+
+				var name = iter.Current.Name;
+				var value = iter.Current.Value;
+				if (keysToTruncateSet.Add(name)) {
+					keysToTruncate.Add(iter.Current.Name);
+
+					if (_lastValueAdded != value)
+						throw new Exception(
+							$"Trying to remove the last entry added \"{name}\":{value} but the last entry was really {_lastValueAdded}");
+
+					_lastValueAdded = _lastValueAdded > _firstValue
+						? _lastValueAdded - _valueInterval
+						: default;
+
+					Log.Verbose("{indexName} is going to delete {name}:{value}", _indexName, name, value);
+				}
+			}
+
+			await _lastValueLock.AcquireAsync(token);
+			try {
+				PopEntry();
+			} finally {
+				_lastValueLock.Release();
+			}
+
+			bool found = false;
+			await _lastValueLock.AcquireAsync(token);
+			sourceName = null;
+			try {
+				while (!found && iter.MoveNext()) {
+					sourceName = await source.LookupName(iter.Current.Value, token);
+					if (sourceName is null) {
+						PopEntry();
+					} else {
+						found = true;
+					}
+				}
+			} finally {
+				_lastValueLock.Release();
+			}
+
+			var last = await source.TryGetLastValue(token);
+			if (found) {
+				if (iter.Current.Value != last.Value)
+					throw new Exception($"{_indexName} this should never happen. expecting source to have values up to {iter.Current.Value} but was {last}");
+				if (iter.Current.Name != sourceName)
+					ThrowNameMismatch(iter.Current.Value, iter.Current.Name, sourceName);
+			} else {
+				if (last.HasValue)
+					throw new Exception($"{_indexName} this should never happen. expecting source to have been empty but it wasn't. has values up to {last}");
+			}
+
+			Log.Information("{indexName} is truncating {count} entries", _indexName, keysToTruncate.Count);
+			Truncate(keysToTruncate);
+		}
+
+		CheckpointLogSynchronously();
+
+		await _lastValueLock.AcquireAsync(token);
+		try {
+			Log.Information("{indexName} initialized. Last value is {value}", _indexName, _lastValueAdded);
+		} finally {
+			_lastValueLock.Release();
+		}
+
+		Log.Information("{indexName} total memory after initialization {totalMemoryMib:N0} MiB.", _indexName, CalcTotalMemoryMib());
+	}
+
+	void ThrowNameMismatch(Value value, string ourName, string sourceName) {
+		throw new Exception(
+			$"{_indexName} this should never happen. name mismatch. " +
+			$"value: {value} name: \"{ourName}\"/\"{sourceName}\"");
+	}
+
+	async ValueTask CatchUp(INameLookup<Value> source, Value previousValue, CancellationToken token) {
+		if (!(await source.TryGetLastValue(token)).TryGet(out var sourceLastValue)) {
+			Log.Information("{indexName} source is empty, nothing to catch up", _indexName);
+			return;
+		}
+
+		Log.Information("{indexName} source last value is {sourceLastValue}", _indexName, sourceLastValue);
+
+		var startValue = previousValue == 0
+			? _firstValue
+			: previousValue + _valueInterval;
+
+		var count = 0;
+		for (var sourceValue = startValue; sourceValue <= sourceLastValue; sourceValue += _valueInterval) {
+			count++;
+			if (await source.LookupName(sourceValue, token) is not { } name)
+				throw new Exception($"{_indexName} this should never happen. could not find {sourceValue} in source");
+
+			Add(name, sourceValue);
+		}
+
+		Log.Information("{indexName} caught up {count} entries", _indexName, count);
+	}
+
+	void Truncate(IList<string> names) {
+		for (int i = 0; i < names.Count; i++) {
+			TruncateTail(names[i]);
+		}
+	}
+
+	void TruncateTail(string name) {
+		if (string.IsNullOrEmpty(name))
+			throw new ArgumentNullException(nameof(name));
+
+		// convert the name into a UTF8 span which we can use as a key.
+		Span<byte> keySpan = stackalloc byte[Measure(name)];
+		PopulateKey(name, keySpan);
+
+		var status = _maintenanceSession.Delete(key: SpanByte.FromFixedSpan(keySpan));
+
+		switch (status) {
+			case Status.OK:
+			case Status.NOTFOUND:
+				break;
+
+			case Status.PENDING:
+				_maintenanceSession.CompletePending(wait: true);
+				break;
+
+			case Status.ERROR:
+			default:
+				throw new Exception($"{_indexName} Unexpected status {status} deleting {name}");
+		}
+	}
+
+	/// this will include the same name more than once if it was truncated and then
+	/// subsequently re-added with the same value. de-dup when consuming if necessary.
+	public IEnumerable<(string Name, Value Value)> Scan() => Scan(0, _store.Log.TailAddress);
+
+	public IEnumerable<(string Name, Value Value)> Scan(long beginAddress, long endAddress) {
+		using var iter = _store.Log.Scan(beginAddress, endAddress);
+		while (iter.GetNext(out var recordInfo)) {
+			if (recordInfo.Invalid || recordInfo.Tombstone)
+				continue;
+
+			var name = _utf8NoBom.GetString(iter.GetKey().AsReadOnlySpan());
+			var value = iter.GetValue();
+
+			if (!TryGetValue(name, out var currentValue) || currentValue != value) {
+				// deleted (from a previous truncation), and maybe readded with a different value
+				continue;
+			}
+
+			yield return (name, value);
+		}
+	}
+
+	public IEnumerable<(string Name, Value Value)> ScanBackwards() {
+		// in faster you can begin log scans from records address, but also from
+		// page boundaries. use this to iterate backwards by jumping back
+		// one page at a time.
+		var pageSize = 1 << _logSettings.PageSizeBits;
+		var endAddress = _store.Log.TailAddress;
+		var beginAddress = endAddress / pageSize * pageSize;
+
+		if (beginAddress < 0)
+			beginAddress = 0;
+
+		var detailCount = 0;
+		while (endAddress > 0) {
+			var entries = Scan(beginAddress, endAddress).ToList();
+			for (int i = entries.Count - 1; i >= 0; i--) {
+				yield return entries[i];
+				detailCount++;
+			}
+			endAddress = beginAddress;
+			beginAddress -= pageSize;
+		}
+	}
+
+	public Value LookupValue(string name) {
+		if (string.IsNullOrEmpty(name))
+			throw new ArgumentNullException(nameof(name));
+
+		return TryGetValue(name, out var value) ? value : default;
+	}
+
+	public bool TryGetValue(string name, out Value value) {
+		using var lease = _readerSessionPool.Rent();
+		var session = lease.Reader.ClientSession;
+		var context = lease.Reader.Context;
+
+		// convert the name into a UTF8 span which we can use as a key.
+		Span<byte> key = stackalloc byte[Measure(name)];
+		PopulateKey(name, key);
+
+		var status = session.Read(
+			key: SpanByte.FromFixedSpan(key),
+			output: out value,
+			userContext: context);
+
+		switch (status) {
+			case Status.OK:
+				return true;
+			case Status.NOTFOUND:
+				return false;
+			case Status.PENDING:
+				session.CompletePending(wait: true);
+				switch (context.Status) {
+					case Status.OK:
+						value = context.Value;
+						return true;
+					case Status.NOTFOUND:
+						return false;
+					default:
+						throw new Exception($"{_indexName} Unexpected status {context.Status} completing read for \"{name}\"");
+				}
+			case Status.ERROR:
+			default:
+				throw new Exception($"{_indexName} Unexpected status {status} reading \"{name}\"");
+		}
+	}
+
+	public void Add(string name, Value value) {
+		if (string.IsNullOrEmpty(name))
+			throw new ArgumentNullException(nameof(name));
+
+		_lastValueLock.TryAcquire(InfiniteTimeSpan);
+		try {
+			var validFirst = _lastValueAdded == default && value == _firstValue;
+			var validNext = value == _lastValueAdded + _valueInterval;
+			if (!validFirst && !validNext)
+				throw new Exception(
+					$"{_indexName} attempting to add entry out of order: \"{name}\":{value} when last value added was {_lastValueAdded}");
+		} finally {
+			_lastValueLock.Release();
+		}
+
+		// convert the name into a UTF8 span which we can use as a key in FASTER.
+		Span<byte> key = stackalloc byte[Measure(name)];
+		PopulateKey(name, key);
+
+		var status = _writerSession.Upsert(
+			key: SpanByte.FromFixedSpan(key),
+			desiredValue: value);
+
+		switch (status) {
+			// pending fine too, they will complete later in order, any that dont
+			// complete will catch up on startup
+			case Status.OK:
+			case Status.NOTFOUND:
+			case Status.PENDING:
+				break;
+			case Status.ERROR:
+			default:
+				throw new Exception($"{_indexName} Unexpected status {status} upserting \"{name}\":{value}");
+		}
+
+		_lastValueLock.TryAcquire(InfiniteTimeSpan);
+		try {
+			_lastValueAdded = value;
+		} finally {
+			_lastValueLock.Release();
+		}
+
+		_logCheckpointer.Trigger();
+
+		Log.Verbose("{indexName} added new entry: {name}:{value}", _indexName, name, value);
+	}
+
+	void CheckpointLogSynchronously() {
+		// unideal
+		CheckpointLogAsync().GetAwaiter().GetResult();
+	}
+
+	public async Task<bool> CheckpointLogAsync() {
+		LogStats();
+		Log.Debug("{indexName} is checkpointing", _indexName);
+		var (success, _) = await _store.TakeHybridLogCheckpointAsync(CheckpointType.FoldOver);
+		return success;
+	}
+
+	void LogStats() {
+		Log.Debug("{indexName} total memory {totalMemoryMib:N0} MiB.", _indexName, CalcTotalMemoryMib());
+	}
+
+	long CalcTotalMemoryMib() {
+		var indexSizeBytes = _store.IndexSize * 64;
+		var indexOverflowBytes = _store.OverflowBucketCount * 64;
+		var logMemorySizeBytes = _store.Log.MemorySizeBytes;
+		var readCacheMemorySizeBytes = _store.ReadCache?.MemorySizeBytes ?? 0;
+		var totalMemoryBytes = indexSizeBytes + indexOverflowBytes + logMemorySizeBytes + readCacheMemorySizeBytes;
+		var totalMemoryMib = totalMemoryBytes / 1024 / 1024;
+		return totalMemoryMib;
+	}
+
+	static int Measure(string source) {
+		var length = _utf8NoBom.GetByteCount(source);
+		return length;
+	}
+
+	static void PopulateKey(string source, Span<byte> destination) {
+		Utf8.FromUtf16(source, destination, out _, out _, true, true);
+	}
+}
diff --git a/src/KurrentDB.Core/LogV3/FASTER/Lease.cs b/src/KurrentDB.Core/LogV3/FASTER/Lease.cs
new file mode 100644
index 00000000000..ce8f8892af1
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/FASTER/Lease.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.DataStructures;
+
+namespace KurrentDB.Core.LogV3.FASTER;
+
+public struct Lease<T> : IDisposable {
+	private readonly ObjectPool<T> _pool;
+	public T Reader { get; }
+
+	public Lease(ObjectPool<T> pool) {
+		_pool = pool;
+		Reader = _pool.Get();
+	}
+	public void Dispose() {
+		_pool.Return(Reader);
+	}
+}
+
diff --git a/src/KurrentDB.Core/LogV3/FASTER/MaintenanceFunctions.cs b/src/KurrentDB.Core/LogV3/FASTER/MaintenanceFunctions.cs
new file mode 100644
index 00000000000..23205b74a6f
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/FASTER/MaintenanceFunctions.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using FASTER.core;
+
+namespace KurrentDB.Core.LogV3.FASTER;
+
+// for deleting and checkpointing
+public struct MaintenanceFunctions<TValue> : IFunctions<SpanByte, TValue> {
+	public bool SupportsLocking => false;
+
+	public void DeleteCompletionCallback(ref SpanByte key, Empty ctx) {
+	}
+
+	public void CheckpointCompletionCallback(string sessionId, CommitPoint commitPoint) {
+	}
+
+	#region not needed
+	public void ConcurrentReader(ref SpanByte key, ref TValue input, ref TValue value, ref TValue dst) =>
+		throw new NotImplementedException();
+
+	public bool ConcurrentWriter(ref SpanByte key, ref TValue src, ref TValue dst) =>
+		throw new NotImplementedException();
+
+	public void CopyUpdater(ref SpanByte key, ref TValue input, ref TValue oldValue, ref TValue newValue, ref TValue output) =>
+		throw new NotImplementedException();
+
+	public void InitialUpdater(ref SpanByte key, ref TValue input, ref TValue value, ref TValue output) =>
+		throw new NotImplementedException();
+
+	public bool InPlaceUpdater(ref SpanByte key, ref TValue input, ref TValue value, ref TValue output) =>
+		throw new NotImplementedException();
+
+	public void Lock(ref RecordInfo recordInfo, ref SpanByte key, ref TValue value, LockType lockType, ref long lockContext) =>
+		throw new NotImplementedException();
+
+	public void ReadCompletionCallback(ref SpanByte key, ref TValue input, ref TValue output, Empty ctx, Status status) =>
+		throw new NotImplementedException();
+
+	public void RMWCompletionCallback(ref SpanByte key, ref TValue input, ref TValue output, Empty ctx, Status status) =>
+		throw new NotImplementedException();
+
+	public void SingleReader(ref SpanByte key, ref TValue input, ref TValue value, ref TValue dst) =>
+		throw new NotImplementedException();
+
+	public void SingleWriter(ref SpanByte key, ref TValue src, ref TValue dst) =>
+		throw new NotImplementedException();
+
+	public bool Unlock(ref RecordInfo recordInfo, ref SpanByte key, ref TValue value, LockType lockType, long lockContext) =>
+		throw new NotImplementedException();
+
+	public void UpsertCompletionCallback(ref SpanByte key, ref TValue value, Empty ctx) =>
+		throw new NotImplementedException();
+	#endregion
+}
+
diff --git a/src/KurrentDB.Core/LogV3/FASTER/ObjectPoolExtensions.cs b/src/KurrentDB.Core/LogV3/FASTER/ObjectPoolExtensions.cs
new file mode 100644
index 00000000000..f9217854a47
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/FASTER/ObjectPoolExtensions.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.DataStructures;
+
+namespace KurrentDB.Core.LogV3.FASTER;
+
+public static class ObjectPoolExtensions {
+	public static Lease<T> Rent<T>(this ObjectPool<T> pool) => new(pool);
+}
+
diff --git a/src/KurrentDB.Core/LogV3/FASTER/ReaderFunctions.cs b/src/KurrentDB.Core/LogV3/FASTER/ReaderFunctions.cs
new file mode 100644
index 00000000000..732393c2dfa
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/FASTER/ReaderFunctions.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using FASTER.core;
+
+namespace KurrentDB.Core.LogV3.FASTER;
+
+public struct ReaderFunctions<TValue> : IFunctions<SpanByte, TValue, Context<TValue>> {
+
+	public bool SupportsLocking => false;
+
+	public void ConcurrentReader(ref SpanByte key, ref TValue input, ref TValue value, ref TValue dst) {
+		dst = value;
+	}
+
+	public void SingleReader(ref SpanByte key, ref TValue input, ref TValue value, ref TValue dst) {
+		dst = value;
+	}
+
+	public void ReadCompletionCallback(ref SpanByte key, ref TValue input, ref TValue output, Context<TValue> context, Status status) {
+		context.Status = status;
+		context.Value = output;
+	}
+
+	public void CheckpointCompletionCallback(string sessionId, CommitPoint commitPoint) {
+	}
+
+	// the reader writes to the read-cache
+	public void SingleWriter(ref SpanByte key, ref TValue src, ref TValue dst) {
+		dst = src;
+	}
+
+	// the reader writes to the read-cache
+	public bool ConcurrentWriter(ref SpanByte key, ref TValue src, ref TValue dst) {
+		dst = src;
+		return true;
+	}
+
+	#region not needed
+	public void CopyUpdater(ref SpanByte key, ref TValue input, ref TValue oldValue, ref TValue newValue, ref TValue output) =>
+		throw new NotImplementedException();
+
+	public void InitialUpdater(ref SpanByte key, ref TValue input, ref TValue value, ref TValue output) =>
+		throw new NotImplementedException();
+
+	public bool InPlaceUpdater(ref SpanByte key, ref TValue input, ref TValue value, ref TValue output) =>
+		throw new NotImplementedException();
+
+	public void RMWCompletionCallback(ref SpanByte key, ref TValue input, ref TValue output, Context<TValue> ctx, Status status) =>
+		throw new NotImplementedException();
+
+	public void DeleteCompletionCallback(ref SpanByte key, Context<TValue> context) =>
+		throw new NotImplementedException();
+
+	public void UpsertCompletionCallback(ref SpanByte key, ref TValue value, Context<TValue> context) =>
+		throw new NotImplementedException();
+
+	public void Lock(ref RecordInfo recordInfo, ref SpanByte key, ref TValue value, LockType lockType, ref long lockContext) =>
+		throw new NotImplementedException();
+
+	public bool Unlock(ref RecordInfo recordInfo, ref SpanByte key, ref TValue value, LockType lockType, long lockContext) =>
+		throw new NotImplementedException();
+	#endregion
+}
+
diff --git a/src/KurrentDB.Core/LogV3/FASTER/ReaderSession.cs b/src/KurrentDB.Core/LogV3/FASTER/ReaderSession.cs
new file mode 100644
index 00000000000..16ef47d9312
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/FASTER/ReaderSession.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using FASTER.core;
+
+namespace KurrentDB.Core.LogV3.FASTER;
+
+internal class ReaderSession<TValue> : IDisposable {
+	public ReaderSession(
+		ClientSession<SpanByte, TValue, TValue, TValue, Context<TValue>, ReaderFunctions<TValue>> clientSession,
+		Context<TValue> context) {
+		ClientSession = clientSession;
+		Context = context;
+	}
+
+	public ClientSession<SpanByte, TValue, TValue, TValue, Context<TValue>, ReaderFunctions<TValue>> ClientSession { get; }
+	public Context<TValue> Context { get; }
+
+	public void Dispose() {
+		ClientSession?.Dispose();
+	}
+}
+
diff --git a/src/KurrentDB.Core/LogV3/FASTER/WriterFunctions.cs b/src/KurrentDB.Core/LogV3/FASTER/WriterFunctions.cs
new file mode 100644
index 00000000000..c1f18ff2b74
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/FASTER/WriterFunctions.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using FASTER.core;
+
+namespace KurrentDB.Core.LogV3.FASTER;
+
+public struct WriterFunctions<TValue> : IFunctions<SpanByte, TValue> {
+	public bool SupportsLocking => false;
+
+	public void SingleWriter(ref SpanByte key, ref TValue src, ref TValue dst) {
+		dst = src;
+	}
+
+	public bool ConcurrentWriter(ref SpanByte key, ref TValue src, ref TValue dst) {
+		dst = src;
+		return true;
+	}
+
+	public void UpsertCompletionCallback(ref SpanByte key, ref TValue value, Empty context) {
+	}
+
+	public void CheckpointCompletionCallback(string sessionId, CommitPoint commitPoint) {
+		if (commitPoint.ExcludedSerialNos.Count != 0)
+			throw new Exception($"{commitPoint.ExcludedSerialNos.Count} writes unexpectedly excluded from checkpoint");
+	}
+
+	#region not needed
+	public void SingleReader(ref SpanByte key, ref TValue input, ref TValue value, ref TValue dst) =>
+		throw new NotImplementedException();
+
+	public void ConcurrentReader(ref SpanByte key, ref TValue input, ref TValue value, ref TValue dst) =>
+		throw new NotImplementedException();
+
+	public void ReadCompletionCallback(ref SpanByte key, ref TValue input, ref TValue output, Empty context, Status status) =>
+		throw new NotImplementedException();
+
+	public void CopyUpdater(ref SpanByte key, ref TValue input, ref TValue oldValue, ref TValue newValue, ref TValue output) =>
+		throw new NotImplementedException();
+
+	public void InitialUpdater(ref SpanByte key, ref TValue input, ref TValue value, ref TValue output) =>
+		throw new NotImplementedException();
+
+	public bool InPlaceUpdater(ref SpanByte key, ref TValue input, ref TValue value, ref TValue output) =>
+		throw new NotImplementedException();
+
+	public void RMWCompletionCallback(ref SpanByte key, ref TValue input, ref TValue output, Empty ctx, Status status) =>
+		throw new NotImplementedException();
+
+	public void DeleteCompletionCallback(ref SpanByte key, Empty context) =>
+		throw new NotImplementedException();
+
+	public void Lock(ref RecordInfo recordInfo, ref SpanByte key, ref TValue value, LockType lockType, ref long lockContext) =>
+		throw new NotImplementedException();
+
+	public bool Unlock(ref RecordInfo recordInfo, ref SpanByte key, ref TValue value, LockType lockType, long lockContext) =>
+		throw new NotImplementedException();
+	#endregion
+}
+
diff --git a/src/KurrentDB.Core/LogV3/LogV3Metastreams.cs b/src/KurrentDB.Core/LogV3/LogV3Metastreams.cs
new file mode 100644
index 00000000000..a05607b782b
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/LogV3Metastreams.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.LogAbstraction;
+using StreamId = System.UInt32;
+
+namespace KurrentDB.Core.LogV3;
+
+public class LogV3Metastreams : IMetastreamLookup<StreamId> {
+	public bool IsMetaStream(StreamId streamId) =>
+		streamId % 2 == 1;
+
+	// in v2 this prepends "$$"
+	public StreamId MetaStreamOf(StreamId streamId) {
+		if (IsMetaStream(streamId))
+			throw new ArgumentException($"{streamId} is already a metastream", nameof(streamId));
+		return streamId + 1;
+	}
+
+	// in v2 this drops the first two characters,
+	public StreamId OriginalStreamOf(StreamId streamId) {
+		if (!IsMetaStream(streamId))
+			throw new ArgumentException($"{streamId} is not a metastream", nameof(streamId));
+		return streamId - 1;
+	}
+}
diff --git a/src/KurrentDB.Core/LogV3/LogV3RecordFactory.cs b/src/KurrentDB.Core/LogV3/LogV3RecordFactory.cs
new file mode 100644
index 00000000000..ac534b529c9
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/LogV3RecordFactory.cs
@@ -0,0 +1,149 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogV3;
+using StreamId = System.UInt32;
+
+namespace KurrentDB.Core.LogV3;
+
+public class LogV3RecordFactory : IRecordFactory<StreamId> {
+	private Guid _rootPartitionId;
+
+	public LogV3RecordFactory() {
+		if (!BitConverter.IsLittleEndian) {
+			// to support big endian we would need to adjust some of the bit
+			// operations in the raw v3 structs, and adjust the way that the
+			// v3 records are written/read from disk (currently blitted)
+			throw new NotSupportedException();
+		}
+	}
+
+	public bool ExplicitStreamCreation => true;
+	public bool ExplicitEventTypeCreation => true;
+
+	public IPrepareLogRecord<StreamId> CreateStreamRecord(
+		Guid streamId,
+		long logPosition,
+		DateTime timeStamp,
+		StreamId streamNumber,
+		string streamName) {
+
+		var result = new LogV3StreamRecord(
+			streamId: streamId,
+			logPosition: logPosition,
+			timeStamp: timeStamp,
+			streamNumber: streamNumber,
+			streamName: streamName,
+			partitionId: _rootPartitionId);
+
+		return result;
+	}
+
+	public IPrepareLogRecord<StreamId> CreateEventTypeRecord(
+		Guid eventTypeId,
+		Guid parentEventTypeId,
+		string eventType,
+		uint eventTypeNumber,
+		ushort eventTypeVersion,
+		long logPosition,
+		DateTime timeStamp) {
+
+		var result = new LogV3EventTypeRecord(
+			eventTypeId: eventTypeId,
+			parentEventTypeId: parentEventTypeId,
+			eventType: eventType,
+			eventTypeNumber: eventTypeNumber,
+			eventTypeVersion: eventTypeVersion,
+			logPosition: logPosition,
+			timeStamp: timeStamp,
+			partitionId: _rootPartitionId);
+
+		return result;
+	}
+
+	public ISystemLogRecord CreateEpoch(EpochRecord epoch) {
+		var result = new LogV3EpochLogRecord(
+			logPosition: epoch.EpochPosition,
+			timeStamp: epoch.TimeStamp,
+			epochNumber: epoch.EpochNumber,
+			epochId: epoch.EpochId,
+			prevEpochPosition: epoch.PrevEpochPosition,
+			leaderInstanceId: epoch.LeaderInstanceId);
+		return result;
+	}
+
+	public IPrepareLogRecord<StreamId> CreatePrepare(
+		long logPosition,
+		Guid correlationId,
+		Guid eventId,
+		long transactionPosition,
+		int transactionOffset,
+		StreamId eventStreamId,
+		long expectedVersion,
+		DateTime timeStamp,
+		PrepareFlags flags,
+		StreamId eventType,
+		ReadOnlyMemory<byte> data,
+		ReadOnlyMemory<byte> metadata) {
+
+		var result = new LogV3StreamWriteRecord(
+			logPosition: logPosition,
+			transactionPosition: transactionPosition,
+			transactionOffset: transactionOffset,
+			correlationId: correlationId,
+			eventId: eventId,
+			eventStreamId: eventStreamId,
+			expectedVersion: expectedVersion,
+			timeStamp: timeStamp,
+			flags: flags,
+			eventType: eventType,
+			data: data.Span,
+			metadata: metadata.Span);
+		return result;
+	}
+
+	public ILogRecord CreatePartitionTypeRecord(
+		DateTime timeStamp,
+		long logPosition,
+		Guid partitionTypeId,
+		Guid partitionId,
+		string name) {
+
+		return new PartitionTypeLogRecord(
+			timeStamp: timeStamp,
+			logPosition: logPosition,
+			partitionTypeId: partitionTypeId,
+			partitionId: partitionId,
+			name: name
+		);
+	}
+
+	public ILogRecord CreatePartitionRecord(
+		DateTime timeStamp,
+		long logPosition,
+		Guid partitionId,
+		Guid partitionTypeId,
+		Guid parentPartitionId,
+		Raw.PartitionFlags flags,
+		ushort referenceNumber,
+		string name) {
+
+		return new PartitionLogRecord(
+			timeStamp: timeStamp,
+			logPosition: logPosition,
+			partitionId: partitionId,
+			partitionTypeId: partitionTypeId,
+			parentPartitionId: parentPartitionId,
+			flags: flags,
+			referenceNumber: referenceNumber,
+			name: name
+		);
+	}
+
+	public void SetRootPartitionId(Guid id) {
+		_rootPartitionId = id;
+	}
+}
diff --git a/src/KurrentDB.Core/LogV3/LogV3Sizer.cs b/src/KurrentDB.Core/LogV3/LogV3Sizer.cs
new file mode 100644
index 00000000000..a58807afd50
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/LogV3Sizer.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.LogAbstraction;
+using StreamId = System.UInt32;
+
+namespace KurrentDB.Core.LogV3;
+
+public class LogV3Sizer : ISizer<StreamId> {
+	public int GetSizeInBytes(StreamId t) => sizeof(StreamId);
+}
diff --git a/src/KurrentDB.Core/LogV3/LogV3StreamExistenceFilterInitializer.cs b/src/KurrentDB.Core/LogV3/LogV3StreamExistenceFilterInitializer.cs
new file mode 100644
index 00000000000..d4417e57533
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/LogV3StreamExistenceFilterInitializer.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.LogAbstraction;
+using StreamId = System.UInt32;
+
+namespace KurrentDB.Core.LogV3;
+
+/// Populates a stream existence filter by iterating through the names
+/// In V3 the the bloom filter checkpoint is the last processed stream number.
+public class LogV3StreamExistenceFilterInitializer : INameExistenceFilterInitializer {
+	private readonly INameLookup<StreamId> _streamNames;
+
+	public LogV3StreamExistenceFilterInitializer(INameLookup<StreamId> streamNames) {
+		_streamNames = streamNames;
+	}
+
+	public async ValueTask Initialize(INameExistenceFilter filter, long truncateToPosition, CancellationToken token) {
+		// todo: truncate if necessary. implementation will likely depend on how the indexes come out
+
+		if (!(await _streamNames.TryGetLastValue(token)).TryGet(out var sourceLastStreamId))
+			return;
+
+		var startStreamId = (uint)Math.Max(LogV3SystemStreams.FirstRealStream, filter.CurrentCheckpoint);
+		for (var streamId = startStreamId; streamId <= sourceLastStreamId; streamId += LogV3SystemStreams.StreamInterval) {
+			if (await _streamNames.LookupName(streamId, token) is not { } name)
+				throw new Exception(
+					$"NameExistenceFilter: this should never happen. could not find {streamId} in source");
+
+			filter.Add(name);
+			filter.CurrentCheckpoint = streamId;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/LogV3/LogV3StreamIdConverter.cs b/src/KurrentDB.Core/LogV3/LogV3StreamIdConverter.cs
new file mode 100644
index 00000000000..b5c7f443315
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/LogV3StreamIdConverter.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.LogAbstraction;
+using StreamId = System.UInt32;
+
+namespace KurrentDB.Core.LogV3;
+
+public class LogV3StreamIdConverter : IStreamIdConverter<StreamId> {
+	public uint ToStreamId(ReadOnlySpan<byte> bytes) {
+		throw new NotImplementedException();
+	}
+
+	public uint ToStreamId(ReadOnlyMemory<byte> bytes) {
+		throw new NotImplementedException();
+	}
+}
diff --git a/src/KurrentDB.Core/LogV3/LogV3StreamIdValidator.cs b/src/KurrentDB.Core/LogV3/LogV3StreamIdValidator.cs
new file mode 100644
index 00000000000..6835b39f04e
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/LogV3StreamIdValidator.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Common.Utils;
+using StreamId = System.UInt32;
+
+namespace KurrentDB.Core.LogV3;
+
+public class LogV3StreamIdValidator : IValidator<StreamId> {
+	public LogV3StreamIdValidator() {
+	}
+
+	// Corresponding to LogV2StreamIdValidator we just check here that the steamId is
+	// in the right space. The stream does not have to exist.
+	public void Validate(StreamId streamId) {
+		Ensure.Nonnegative(streamId, "streamId");
+	}
+}
diff --git a/src/KurrentDB.Core/LogV3/LogV3SystemEventTypes.cs b/src/KurrentDB.Core/LogV3/LogV3SystemEventTypes.cs
new file mode 100644
index 00000000000..8b9950fa292
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/LogV3SystemEventTypes.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Services;
+using EventTypeId = System.UInt32;
+
+namespace KurrentDB.Core.LogV3;
+
+public class LogV3SystemEventTypes {
+
+	public const EventTypeId FirstRealEventTypeNumber = 1024;
+	public const EventTypeId EventTypeInterval = 1;
+
+	public const EventTypeId EmptyEventTypeNumber = 0;
+	public const EventTypeId EventTypeDefinedNumber = 1;
+	public const EventTypeId StreamCreatedNumber = 2;
+	public const EventTypeId StreamMetadataNumber = 3;
+	public const EventTypeId StreamDeletedNumber = 4;
+	public const EventTypeId EpochInformationNumber = 5;
+	public const EventTypeId ScavengePointNumber = 6;
+
+	public static bool TryGetSystemEventTypeId(string type, out EventTypeId eventTypeId) {
+		switch (type) {
+			case SystemEventTypes.EmptyEventType:
+				eventTypeId = EmptyEventTypeNumber;
+				return true;
+			case SystemEventTypes.EpochInformation:
+				eventTypeId = EpochInformationNumber;
+				return true;
+			case SystemEventTypes.EventTypeDefined:
+				eventTypeId = EventTypeDefinedNumber;
+				return true;
+			case SystemEventTypes.ScavengePoint:
+				eventTypeId = ScavengePointNumber;
+				return true;
+			case SystemEventTypes.StreamCreated:
+				eventTypeId = StreamCreatedNumber;
+				return true;
+			case SystemEventTypes.StreamMetadata:
+				eventTypeId = StreamMetadataNumber;
+				return true;
+			case SystemEventTypes.StreamDeleted:
+				eventTypeId = StreamDeletedNumber;
+				return true;
+			default:
+				eventTypeId = EmptyEventTypeNumber;
+				return false;
+		}
+	}
+
+	public static bool TryGetVirtualEventType(EventTypeId eventTypeId, out string name) {
+		if (!IsVirtualEventType(eventTypeId)) {
+			name = null;
+			return false;
+		}
+
+		name = eventTypeId switch {
+			EmptyEventTypeNumber => SystemEventTypes.EmptyEventType,
+			EpochInformationNumber => SystemEventTypes.EpochInformation,
+			EventTypeDefinedNumber => SystemEventTypes.EventTypeDefined,
+			ScavengePointNumber => SystemEventTypes.ScavengePoint,
+			StreamCreatedNumber => SystemEventTypes.StreamCreated,
+			StreamMetadataNumber => SystemEventTypes.StreamMetadata,
+			StreamDeletedNumber => SystemEventTypes.StreamDeleted,
+			_ => null,
+		};
+
+		return name != null;
+	}
+
+	private static bool IsVirtualEventType(EventTypeId eventTypeId) => eventTypeId < FirstRealEventTypeNumber;
+}
diff --git a/src/KurrentDB.Core/LogV3/LogV3SystemStreams.cs b/src/KurrentDB.Core/LogV3/LogV3SystemStreams.cs
new file mode 100644
index 00000000000..e4b2cba205c
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/LogV3SystemStreams.cs
@@ -0,0 +1,137 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Services;
+using StreamId = System.UInt32;
+
+namespace KurrentDB.Core.LogV3;
+
+
+public class LogV3SystemStreams : ISystemStreamLookup<StreamId> {
+	// Virtual streams are streams that exist without requiring a stream record.
+	// Essentially, they are hard coded.
+	// Reserving a thousand. Doubtful we will need many, but just in case.
+	// As an alternative to reserving virtual streams, we could add their stream records as part
+	// of the database bootstrapping. This would be odd for the AllStream
+	// but more appealing for the settings stream.
+	// Reservations are 2 apart to make room for their metastreams.
+	public static StreamId FirstRealStream { get; } = 1024;
+	// difference between each stream record (2 because of metastreams)
+	public static StreamId StreamInterval { get; } = 2;
+
+	// Even streams that dont exist can be normal/meta and user/system
+	// e.g. for default ACLs.
+	public const StreamId NoUserStream = 0;
+	public const StreamId NoUserMetastream = 1;
+	public const StreamId NoSystemStream = 2;
+	public const StreamId NoSystemMetastream = 3;
+
+	public const StreamId FirstVirtualStream = 4;
+
+	// virtual stream so that we can write metadata to $$$all
+	private const StreamId AllStreamNumber = 4;
+
+	// virtual stream so that we can index StreamRecords for looking up stream names
+	public const StreamId StreamsCreatedStreamNumber = 6;
+
+	// virtual stream for storing system settings
+	private const StreamId SettingsStreamNumber = 8;
+
+	// virtual stream so that we can index EventTypeRecords for looking up event type names
+	public const StreamId EventTypesStreamNumber = 10;
+
+	public const StreamId EpochInformationStreamNumber = 12;
+
+	public const StreamId ScavengePointsStreamNumber = 14;
+
+	public StreamId AllStream => AllStreamNumber;
+	public StreamId SettingsStream => SettingsStreamNumber;
+
+	private readonly IMetastreamLookup<StreamId> _metastreams;
+	private readonly INameLookup<StreamId> _streamNames;
+
+	public LogV3SystemStreams(
+		IMetastreamLookup<StreamId> metastreams,
+		INameLookup<StreamId> streamNames) {
+
+		_metastreams = metastreams;
+		_streamNames = streamNames;
+	}
+
+	public static bool TryGetVirtualStreamName(StreamId streamId, out string name) {
+		if (!IsVirtualStream(streamId)) {
+			name = null;
+			return false;
+		}
+
+		name = streamId switch {
+			AllStreamNumber => SystemStreams.AllStream,
+			EpochInformationStreamNumber => SystemStreams.EpochInformationStream,
+			EventTypesStreamNumber => SystemStreams.EventTypesStream,
+			ScavengePointsStreamNumber => SystemStreams.ScavengePointsStream,
+			SettingsStreamNumber => SystemStreams.SettingsStream,
+			StreamsCreatedStreamNumber => SystemStreams.StreamsCreatedStream,
+			_ => null,
+		};
+
+		return name != null;
+	}
+
+	public static bool TryGetVirtualStreamId(string name, out StreamId streamId) {
+		switch (name) {
+			case SystemStreams.AllStream:
+				streamId = AllStreamNumber;
+				return true;
+			case SystemStreams.EpochInformationStream:
+				streamId = EpochInformationStreamNumber;
+				return true;
+			case SystemStreams.EventTypesStream:
+				streamId = EventTypesStreamNumber;
+				return true;
+			case SystemStreams.ScavengePointsStream:
+				streamId = ScavengePointsStreamNumber;
+				return true;
+			case SystemStreams.StreamsCreatedStream:
+				streamId = StreamsCreatedStreamNumber;
+				return true;
+			case SystemStreams.SettingsStream:
+				streamId = SettingsStreamNumber;
+				return true;
+			default:
+				streamId = 0;
+				return false;
+		}
+	}
+
+	// in v2 this checks if the first character is '$'
+	// system streams can be created dynamically at runtime
+	// e.g. "$persistentsubscription-" + _eventStreamId + "::" + _groupName + "-parked"
+	// so we can either allocate a range of numbers (how many?) for them, or look up the name and see if it begins with $.
+	// for now do the latter because (1) allocating a range of numbers will probably get fiddly
+	// and (2) i expect we will find that at the point we are trying to determine if a stream is a system stream then
+	// we will have already looked up its info in the stream index, so this call will become trivial or unnecessary.
+	public async ValueTask<bool> IsSystemStream(StreamId streamId, CancellationToken token) {
+		if (IsVirtualStream(streamId) ||
+			_metastreams.IsMetaStream(streamId) ||
+			streamId == NoSystemStream)
+			return true;
+
+		if (streamId == NoUserStream)
+			return false;
+
+		var streamName = await _streamNames.LookupName(streamId, token);
+		return SystemStreams.IsSystemStream(streamName);
+	}
+
+	private static bool IsVirtualStream(StreamId streamId) =>
+		FirstVirtualStream <= streamId && streamId < FirstRealStream;
+
+	public bool IsMetaStream(StreamId streamId) => _metastreams.IsMetaStream(streamId);
+
+	public StreamId MetaStreamOf(StreamId streamId) => _metastreams.MetaStreamOf(streamId);
+
+	public StreamId OriginalStreamOf(StreamId streamId) => _metastreams.OriginalStreamOf(streamId);
+}
diff --git a/src/KurrentDB.Core/LogV3/NameIndex.cs b/src/KurrentDB.Core/LogV3/NameIndex.cs
new file mode 100644
index 00000000000..1acbc5eb729
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/NameIndex.cs
@@ -0,0 +1,209 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using Serilog;
+using Value = System.UInt32;
+
+namespace KurrentDB.Core.LogV3;
+
+// There are two components injected NameIndex. The existenceFilter and the persistence.
+//
+// The NameIndex itself allows for reservation of entries, which generates the numbering and holds them
+// in memory. This is similar to the purpose of the 'IndexWriter' class.
+//
+// To do this it makes use of the existence filter which can quickly tell if a name
+// might exist or definitely does not exist.
+//
+// The entries can then be confirmed, which transfers them to the INameIndexPersistence
+// object which is allowed to persist them to disk. This is similar to the IndexCommitter class.
+//
+// Components wanting only entries that have been confirmed will read from the INameIndexPersistence.
+public class NameIndex :
+	INameIndex<Value>,
+	INameIndexConfirmer<Value> {
+
+	private static readonly ILogger Log = Serilog.Log.ForContext<NameIndex>();
+	private readonly ConcurrentDictionary<string, Value> _reservations = new();
+	private readonly INameExistenceFilter _existenceFilter;
+	private readonly INameIndexPersistence<Value> _persistence;
+	private readonly IMetastreamLookup<uint> _metastreams;
+	private readonly string _indexName;
+	private readonly Value _firstValue;
+	private readonly Value _valueInterval;
+	private readonly object _nextValueLock = new();
+	private Value _nextValue;
+	private Type _recordTypeToHandle;
+
+	public NameIndex(
+		string indexName,
+		Value firstValue,
+		Value valueInterval,
+		INameExistenceFilter existenceFilter,
+		INameIndexPersistence<Value> persistence,
+		IMetastreamLookup<Value> metastreams,
+		Type recordTypeToHandle) {
+
+		_indexName = indexName;
+		_firstValue = firstValue;
+		_valueInterval = valueInterval;
+		_nextValue = firstValue;
+		_existenceFilter = existenceFilter;
+		_persistence = persistence;
+		_metastreams = metastreams;
+		_recordTypeToHandle = recordTypeToHandle;
+	}
+
+	public void Dispose() {
+		_persistence?.Dispose();
+	}
+
+	public void CancelReservations() {
+		var count = _reservations.Count;
+		_reservations.Clear();
+		var nextValue = CalcNextValue();
+		Log.Information("{indexName} {count} reservations cancelled. Next value is {value}",
+			_indexName, count, nextValue);
+	}
+
+	public async ValueTask InitializeWithConfirmed(INameLookup<Value> source, CancellationToken token) {
+		_reservations.Clear();
+		await _persistence.Init(source, token);
+		var nextValue = CalcNextValue();
+		Log.Information("{indexName} initialized. Next value is {value}", _indexName, nextValue);
+	}
+
+	Value CalcNextValue() {
+		lock (_nextValueLock) {
+			_nextValue = _persistence.LastValueAdded == default
+				? _firstValue
+				: _persistence.LastValueAdded + _valueInterval;
+			return _nextValue;
+		}
+	}
+
+	public void Confirm(string name, Value value) {
+		_existenceFilter.Add(name);
+		_existenceFilter.CurrentCheckpoint = value;
+		_persistence.Add(name, value);
+		if (_reservations.TryRemove(name, out var reservedValue)) {
+			if (reservedValue != value) {
+				throw new Exception($"This should never happen. Confirmed value for \"{name}\" was {value} but reserved as {reservedValue}");
+			}
+		} else {
+			// an entry got confirmed that we didn't reserve. this is normal in the follower
+			// and there is nothing to do. however it is currently possible in the leader too
+			// because it only waits for the chaser to catch up and not the index.
+			// in this case we need to maintain _nextValue
+			lock (_nextValueLock) {
+				_nextValue = value + _valueInterval;
+			}
+		}
+	}
+
+	// todo: TC: could be sensible to take this code out of here altogether. that will save this
+	// class from having to know which _recordTypeToHandle, and save the indexcommitter from
+	// having to commit to two indexes (which will both look for what they need). instead the index commiter
+	// (perhaps using another class) can commit the right stuff to the right indexes itself.
+	//
+	// this is stream specific and will need to be generalised for eventtypes
+	// not terribly happy with the 'catchingUp' mechanism here because it couples
+	// the IndexCommitter behaviour to this method. but the intention is to remove
+	// the use of the old indexes for logv3
+	public void Confirm(IList<IPrepareLogRecord<Value>> prepares, bool catchingUp, IIndexBackend<Value> backend) {
+		for (int i = 0; i < prepares.Count; i++) {
+			var prepare = prepares[i];
+			if (prepare.RecordType == LogRecordType.Stream &&
+				prepare is LogV3StreamRecord streamRecord && prepare.GetType() == _recordTypeToHandle) {
+				Confirm(
+					name: streamRecord.StreamName,
+					value: streamRecord.StreamNumber);
+
+				// update the streams stream
+				// initialisation of the stream name index caused an entry to be populated in
+				// the last event number cache, because it read the last event number of the streams stream.
+				// now we need to keep it up to date even on initialisation or it will be wrong
+				backend.SetStreamLastEventNumber(prepare.EventStreamId, prepare.ExpectedVersion + 1);
+
+				if (catchingUp) {
+					// we are catching up, do not set the last event numbers of the stream we just
+					// created because they will not be
+					// updated during the catchup if we do write some events to those streams.
+					// therefore leave the entry blank so it will be (cheaply because in mem) be
+					// populated on miss.
+				} else {
+					// we just created the stream so we know that no events exist in either
+					// the stream itself or its metastream.
+					var createdStreamNumber = streamRecord.StreamNumber;
+					var createdMetaStreamNumber = _metastreams.MetaStreamOf(streamRecord.StreamNumber);
+					backend.SetStreamLastEventNumber(createdStreamNumber, ExpectedVersion.NoStream);
+					backend.SetStreamLastEventNumber(createdMetaStreamNumber, ExpectedVersion.NoStream);
+				}
+			} else if (prepare.RecordType == LogRecordType.EventType &&
+					   prepare is LogV3EventTypeRecord eventTypeRecord && prepare.GetType() == _recordTypeToHandle) {
+				Confirm(
+					name: eventTypeRecord.EventTypeName,
+					value: eventTypeRecord.EventTypeNumber);
+
+				// update the event types stream
+				// initialisation of the event types index caused an entry to be populated in
+				// the last event number cache, because it read the last event number of the event types stream.
+				// now we need to keep it up to date even on initialisation or it will be wrong
+				backend.SetStreamLastEventNumber(prepare.EventStreamId, prepare.ExpectedVersion + 1);
+			}
+		}
+	}
+
+	public void Confirm(
+		IList<IPrepareLogRecord<Value>> prepares,
+		CommitLogRecord commit,
+		bool catchingUp,
+		IIndexBackend<Value> backend) {
+	}
+
+	public bool GetOrReserve(string name, out Value value, out Value addedValue, out string addedName) {
+		if (string.IsNullOrEmpty(name))
+			throw new ArgumentNullException(nameof(name));
+
+		if (_reservations.TryGetValue(name, out value)) {
+			addedValue = default;
+			addedName = default;
+			return true;
+		}
+
+		if (!_existenceFilter.MightContain(name)) {
+			// stream definitely does not exist, we can jump straight to reserving it.
+			Reserve(name, out value, out addedValue, out addedName);
+			return false;
+		}
+
+		if (!_persistence.TryGetValue(name, out value)) {
+			Reserve(name, out value, out addedValue, out addedName);
+			return false;
+		}
+
+		addedValue = default;
+		addedName = default;
+		return true;
+	}
+
+	private void Reserve(string name, out Value value, out Value addedValue, out string addedName) {
+		lock (_nextValueLock) {
+			value = _nextValue;
+			_nextValue += _valueInterval;
+			addedValue = value;
+			addedName = name;
+			_reservations[name] = value;
+			Log.Verbose("{indexName} reserved new entry: {key}:{value}", _indexName, name, value);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/LogV3/NameIndexInMemoryPersistence.cs b/src/KurrentDB.Core/LogV3/NameIndexInMemoryPersistence.cs
new file mode 100644
index 00000000000..8faf8e9ac18
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/NameIndexInMemoryPersistence.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.LogAbstraction;
+using StreamId = System.UInt32;
+
+namespace KurrentDB.Core.LogV3;
+
+public class NameIndexInMemoryPersistence :
+	INameIndexPersistence<StreamId> {
+
+	readonly ConcurrentDictionary<string, StreamId> _dict = new();
+
+	public StreamId LastValueAdded { get; private set; }
+
+	public NameIndexInMemoryPersistence() {
+	}
+
+	public void Dispose() {
+	}
+
+	public ValueTask Init(INameLookup<StreamId> source, CancellationToken token)
+		=> token.IsCancellationRequested ? ValueTask.FromCanceled(token) : ValueTask.CompletedTask;
+
+	public void Add(string name, StreamId value) {
+		_dict[name] = value;
+		LastValueAdded = value;
+	}
+
+	public bool TryGetValue(string name, out StreamId value) =>
+		_dict.TryGetValue(name, out value);
+
+	public StreamId LookupValue(string name) {
+		if (string.IsNullOrEmpty(name))
+			throw new ArgumentNullException(nameof(name));
+
+		if (!_dict.TryGetValue(name, out var value))
+			return 0;
+
+		return value;
+	}
+}
diff --git a/src/KurrentDB.Core/LogV3/PartitionManager.cs b/src/KurrentDB.Core/LogV3/PartitionManager.cs
new file mode 100644
index 00000000000..b654c13e349
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/PartitionManager.cs
@@ -0,0 +1,137 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using Serilog;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.LogV3;
+
+public class PartitionManager : IPartitionManager {
+	private static readonly ILogger _log = Log.ForContext<PartitionManager>();
+	private readonly ITransactionFileReader _reader;
+	private readonly ITransactionFileWriter _writer;
+	private readonly LogV3RecordFactory _recordFactory;
+
+	private const string RootPartitionName = "Root";
+	private const string RootPartitionTypeName = "Root";
+
+	public Guid? RootId { get; private set; }
+	public Guid? RootTypeId { get; private set; }
+
+	public PartitionManager(
+		ITransactionFileReader reader, ITransactionFileWriter writer, LogV3RecordFactory recordFactory) {
+		_reader = reader;
+		_writer = writer;
+		_recordFactory = recordFactory;
+	}
+
+	public async ValueTask Initialize(CancellationToken token) {
+		if (RootId.HasValue)
+			return;
+
+		await ReadRootPartition(token);
+		await EnsureRootPartitionIsWritten(token);
+	}
+
+	private async ValueTask EnsureRootPartitionIsWritten(CancellationToken token) {
+		// below code only takes into account offline truncation
+		if (!RootTypeId.HasValue) {
+			RootTypeId = Guid.NewGuid();
+			long pos = _writer.Position;
+			var rootPartitionType = _recordFactory.CreatePartitionTypeRecord(
+				timeStamp: DateTime.UtcNow,
+				logPosition: pos,
+				partitionTypeId: RootTypeId.Value,
+				partitionId: Guid.Empty,
+				name: RootPartitionTypeName);
+
+			if (await _writer.Write(rootPartitionType, token) is (false, _))
+				throw new Exception($"Failed to write root partition type!");
+
+			await _writer.Flush(token);
+
+			_log.Debug("Root partition type created, id: {id}", RootTypeId);
+		}
+
+		if (!RootId.HasValue) {
+			RootId = Guid.NewGuid();
+			long pos = _writer.Position;
+			var rootPartition = _recordFactory.CreatePartitionRecord(
+				timeStamp: DateTime.UtcNow,
+				logPosition: pos,
+				partitionId: RootId.Value,
+				partitionTypeId: RootTypeId.Value,
+				parentPartitionId: Guid.Empty,
+				flags: 0,
+				referenceNumber: 0,
+				name: RootPartitionName);
+
+			if (await _writer.Write(rootPartition, token) is (false, _))
+				throw new Exception($"Failed to write root partition!");
+
+			await _writer.Flush(token);
+
+			_recordFactory.SetRootPartitionId(RootId.Value);
+
+			_log.Debug("Root partition created, id: {id}", RootId);
+		}
+	}
+
+	private async ValueTask ReadRootPartition(CancellationToken token) {
+		SeqReadResult result;
+		_reader.Reposition(0);
+		while ((result = await _reader.TryReadNext(token)).Success) {
+			var rec = result.LogRecord;
+			switch (rec.RecordType) {
+				case LogRecordType.PartitionType:
+					var r = ((PartitionTypeLogRecord)rec).Record;
+					if (r.StringPayload == RootPartitionTypeName && r.SubHeader.PartitionId == Guid.Empty) {
+						RootTypeId = r.Header.RecordId;
+
+						_log.Debug("Root partition type read, id: {id}", RootTypeId);
+
+						break;
+					}
+
+					throw new InvalidDataException(
+						"Unexpected partition type encountered while trying to read the root partition type.");
+
+				case LogRecordType.Partition:
+					var p = ((PartitionLogRecord)rec).Record;
+					if (p.StringPayload == RootPartitionName && p.SubHeader.PartitionTypeId == RootTypeId
+															 && p.SubHeader.ParentPartitionId == Guid.Empty) {
+						RootId = p.Header.RecordId;
+						_recordFactory.SetRootPartitionId(RootId.Value);
+
+						_log.Debug("Root partition read, id: {id}", RootId);
+
+						return;
+					}
+
+					throw new InvalidDataException(
+						"Unexpected partition encountered while trying to read the root partition.");
+
+				case LogRecordType.System:
+					var systemLogRecord = (ISystemLogRecord)result.LogRecord;
+					if (systemLogRecord.SystemRecordType == SystemRecordType.Epoch) {
+						continue;
+					}
+
+					throw new ArgumentOutOfRangeException("SystemRecordType",
+						"Unexpected system record while trying to read the root partition");
+
+				default:
+					throw new ArgumentOutOfRangeException("RecordType",
+						"Unexpected record while trying to read the root partition");
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/LogV3/StreamExistenceFilterValidator.cs b/src/KurrentDB.Core/LogV3/StreamExistenceFilterValidator.cs
new file mode 100644
index 00000000000..4a66e330e9a
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/StreamExistenceFilterValidator.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Services;
+
+namespace KurrentDB.Core.LogV3;
+
+public class StreamExistenceFilterValidator : INameExistenceFilter {
+	private readonly INameExistenceFilter _wrapped;
+
+	public StreamExistenceFilterValidator(INameExistenceFilter wrapped) {
+		_wrapped = wrapped;
+	}
+
+	public long CurrentCheckpoint {
+		get => _wrapped.CurrentCheckpoint;
+		set => _wrapped.CurrentCheckpoint = value;
+	}
+
+	public ValueTask Initialize(INameExistenceFilterInitializer source, long truncateToPosition, CancellationToken token)
+		=> _wrapped.Initialize(source, truncateToPosition, token);
+
+	public void TruncateTo(long checkpoint) =>
+		_wrapped.TruncateTo(checkpoint);
+
+	public void Verify(double corruptionThreshold) => _wrapped.Verify(corruptionThreshold);
+
+	public void Add(string streamName) {
+		ValidateStreamName(streamName);
+		_wrapped.Add(streamName);
+	}
+
+	public void Add(ulong hash) => throw new NotSupportedException();
+
+	public bool MightContain(string streamName) {
+		ValidateStreamName(streamName);
+		return _wrapped.MightContain(streamName);
+	}
+
+	private static void ValidateStreamName(string streamName) {
+		if (string.IsNullOrEmpty(streamName))
+			throw new ArgumentException($"{nameof(streamName)} must not be null or empty", nameof(streamName));
+
+		if (SystemStreams.IsMetastream(streamName))
+			throw new ArgumentException($"{nameof(streamName)} must not be a metastream", nameof(streamName));
+
+		if (LogV3SystemStreams.TryGetVirtualStreamId(streamName, out _))
+			throw new ArgumentException($"{nameof(streamName)} must not be a virtual stream", nameof(streamName));
+	}
+
+	public void Dispose() => _wrapped?.Dispose();
+}
diff --git a/src/KurrentDB.Core/LogV3/StreamIdConverter.cs b/src/KurrentDB.Core/LogV3/StreamIdConverter.cs
new file mode 100644
index 00000000000..57efdc35b7f
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/StreamIdConverter.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using StreamId = System.UInt32;
+
+namespace KurrentDB.Core.LogV3;
+
+/// Converts between StreamIds and their event number in the streams stream.
+public static class StreamIdConverter {
+	static readonly StreamId _offset = LogV3SystemStreams.FirstRealStream / LogV3SystemStreams.StreamInterval;
+
+	public static StreamId ToStreamId(long index) {
+		return ((StreamId)index + _offset) * LogV3SystemStreams.StreamInterval;
+	}
+
+	public static long ToEventNumber(StreamId streamId) {
+		if (streamId % LogV3SystemStreams.StreamInterval != 0)
+			throw new ArgumentOutOfRangeException(nameof(streamId), "streamId must be even");
+
+		return streamId / LogV3SystemStreams.StreamInterval - _offset;
+	}
+}
diff --git a/src/KurrentDB.Core/LogV3/StreamIdLookupMetastreamDecorator.cs b/src/KurrentDB.Core/LogV3/StreamIdLookupMetastreamDecorator.cs
new file mode 100644
index 00000000000..c50a77002db
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/StreamIdLookupMetastreamDecorator.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Services;
+using StreamId = System.UInt32;
+
+namespace KurrentDB.Core.LogV3;
+
+// Decorates a StreamIdLookup, intercepting Metastream (and VirtualStream) calls
+public class StreamIdLookupMetastreamDecorator : IValueLookup<StreamId> {
+	private readonly IValueLookup<StreamId> _wrapped;
+	private readonly IMetastreamLookup<StreamId> _metastreams;
+
+	public StreamIdLookupMetastreamDecorator(
+		IValueLookup<StreamId> wrapped,
+		IMetastreamLookup<StreamId> metastreams) {
+
+		_wrapped = wrapped;
+		_metastreams = metastreams;
+	}
+
+	public StreamId LookupValue(string streamName) {
+		if (string.IsNullOrEmpty(streamName))
+			throw new ArgumentNullException(nameof(streamName));
+
+		StreamId streamId;
+		if (SystemStreams.IsMetastream(streamName)) {
+			streamName = SystemStreams.OriginalStreamOf(streamName);
+			streamId = LookupValue(streamName);
+			return _metastreams.MetaStreamOf(streamId);
+		}
+
+		if (LogV3SystemStreams.TryGetVirtualStreamId(streamName, out streamId))
+			return streamId;
+
+		var result = _wrapped.LookupValue(streamName);
+
+		return result == default
+			? SystemStreams.IsSystemStream(streamName)
+				? LogV3SystemStreams.NoSystemStream
+				: LogV3SystemStreams.NoUserStream
+			: result;
+	}
+}
diff --git a/src/KurrentDB.Core/LogV3/StreamIdToNameFromStandardIndex.cs b/src/KurrentDB.Core/LogV3/StreamIdToNameFromStandardIndex.cs
new file mode 100644
index 00000000000..27e21c9cae9
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/StreamIdToNameFromStandardIndex.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using StreamId = System.UInt32;
+
+namespace KurrentDB.Core.LogV3;
+
+public class StreamIdToNameFromStandardIndex : INameLookup<StreamId> {
+	private readonly IIndexReader<StreamId> _indexReader;
+
+	public StreamIdToNameFromStandardIndex(IIndexReader<StreamId> indexReader) {
+		_indexReader = indexReader;
+	}
+
+	public async ValueTask<string> LookupName(StreamId streamId, CancellationToken token) {
+		if (streamId % 2 is 1)
+			throw new ArgumentOutOfRangeException(nameof(streamId), "streamId must be even");
+
+		// we divided by two when calculating the position in the stream, since we dont
+		// explicitly create metastreams.
+		var record = await _indexReader.ReadPrepare(
+			streamId: LogV3SystemStreams.StreamsCreatedStreamNumber,
+			eventNumber: StreamIdConverter.ToEventNumber(streamId),
+			token);
+
+		return record switch {
+			null => null,
+			LogV3StreamRecord streamRecord => streamRecord.StreamName,
+			_ => throw new Exception($"Unexpected log record type: {record}.")
+		};
+	}
+
+	public async ValueTask<Optional<StreamId>> TryGetLastValue(CancellationToken token) {
+		var lastEventNumber =
+			await _indexReader.GetStreamLastEventNumber(LogV3SystemStreams.StreamsCreatedStreamNumber, token);
+
+		return lastEventNumber is > ExpectedVersion.NoStream and not EventNumber.DeletedStream
+			? StreamIdConverter.ToStreamId(lastEventNumber)
+			: Optional.None<StreamId>();
+	}
+}
diff --git a/src/KurrentDB.Core/LogV3/StreamNameIndexMetastreamDecorator.cs b/src/KurrentDB.Core/LogV3/StreamNameIndexMetastreamDecorator.cs
new file mode 100644
index 00000000000..40614913229
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/StreamNameIndexMetastreamDecorator.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Services;
+using StreamId = System.UInt32;
+
+namespace KurrentDB.Core.LogV3;
+
+// Decorates a StreamNameIndex, intercepting Metastream (and VirtualStream) calls
+public class StreamNameIndexMetastreamDecorator : INameIndex<StreamId> {
+	private readonly INameIndex<StreamId> _wrapped;
+	private readonly IMetastreamLookup<StreamId> _metastreams;
+
+	public StreamNameIndexMetastreamDecorator(
+		INameIndex<StreamId> wrapped,
+		IMetastreamLookup<StreamId> metastreams) {
+
+		_wrapped = wrapped;
+		_metastreams = metastreams;
+	}
+
+	public void CancelReservations() {
+		_wrapped.CancelReservations();
+	}
+
+	public bool GetOrReserve(string streamName, out StreamId streamId, out StreamId createdId, out string createdName) {
+		Ensure.NotNullOrEmpty(streamName, "streamName");
+		if (SystemStreams.IsMetastream(streamName)) {
+			streamName = SystemStreams.OriginalStreamOf(streamName);
+			var ret = GetOrReserve(streamName, out streamId, out createdId, out createdName);
+			streamId = _metastreams.MetaStreamOf(streamId);
+			return ret;
+		}
+
+		if (LogV3SystemStreams.TryGetVirtualStreamId(streamName, out streamId)) {
+			createdId = default;
+			createdName = default;
+			return true;
+		}
+
+		return _wrapped.GetOrReserve(streamName, out streamId, out createdId, out createdName);
+	}
+}
diff --git a/src/KurrentDB.Core/LogV3/StreamNameLookupMetastreamDecorator.cs b/src/KurrentDB.Core/LogV3/StreamNameLookupMetastreamDecorator.cs
new file mode 100644
index 00000000000..35742ee02cd
--- /dev/null
+++ b/src/KurrentDB.Core/LogV3/StreamNameLookupMetastreamDecorator.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Services;
+using StreamId = System.UInt32;
+
+namespace KurrentDB.Core.LogV3;
+
+// Decorates a StreamNameLookup, intercepting Metastream (and VirtualStream) calls
+public class StreamNameLookupMetastreamDecorator : INameLookup<StreamId> {
+	private readonly INameLookup<StreamId> _wrapped;
+	private readonly IMetastreamLookup<StreamId> _metastreams;
+
+	public StreamNameLookupMetastreamDecorator(
+		INameLookup<StreamId> wrapped,
+		IMetastreamLookup<StreamId> metastreams) {
+
+		_wrapped = wrapped;
+		_metastreams = metastreams;
+	}
+
+	public async ValueTask<string> LookupName(StreamId streamId, CancellationToken token) {
+		if (_metastreams.IsMetaStream(streamId)) {
+			streamId = _metastreams.OriginalStreamOf(streamId);
+			return await LookupName(streamId, token) is { } name
+				? SystemStreams.MetastreamOf(name)
+				: null;
+		} else {
+			return LogV3SystemStreams.TryGetVirtualStreamName(streamId, out var name)
+				? name
+				: await _wrapped.LookupName(streamId, token);
+		}
+	}
+
+	public ValueTask<Optional<StreamId>> TryGetLastValue(CancellationToken token) {
+		return _wrapped.TryGetLastValue(token);
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/AuthenticationMessage.cs b/src/KurrentDB.Core/Messages/AuthenticationMessage.cs
new file mode 100644
index 00000000000..c97ee914b92
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/AuthenticationMessage.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Messages;
+
+public static partial class AuthenticationMessage {
+	[DerivedMessage(CoreMessage.Authentication)]
+	public partial class AuthenticationProviderInitialized : Message {
+	}
+
+	[DerivedMessage(CoreMessage.Authentication)]
+	public partial class AuthenticationProviderInitializationFailed : Message {
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/ClientMessage.cs b/src/KurrentDB.Core/Messages/ClientMessage.cs
new file mode 100644
index 00000000000..80e12d7bf7c
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/ClientMessage.cs
@@ -0,0 +1,1970 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Security.Claims;
+using System.Threading;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Settings;
+using FilteredReadAllResult = KurrentDB.Core.Data.FilteredReadAllResult;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+
+namespace KurrentDB.Core.Messages;
+
+public enum OperationResult {
+	Success = 0,
+	PrepareTimeout = 1,
+	CommitTimeout = 2,
+	ForwardTimeout = 3,
+	WrongExpectedVersion = 4,
+	StreamDeleted = 5,
+	InvalidTransaction = 6,
+	AccessDenied = 7
+}
+
+public static partial class ClientMessage {
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class RequestShutdown : Message {
+		public readonly bool ExitProcess;
+
+		public readonly bool ShutdownHttp;
+
+		public RequestShutdown(bool exitProcess, bool shutdownHttp) {
+			ExitProcess = exitProcess;
+			ShutdownHttp = shutdownHttp;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ReloadConfig : Message {
+	}
+
+	[DerivedMessage]
+	public abstract partial class WriteRequestMessage : Message {
+		public readonly Guid InternalCorrId;
+		public readonly Guid CorrelationId;
+		public readonly IEnvelope Envelope;
+		public readonly bool RequireLeader;
+
+		public readonly ClaimsPrincipal User;
+		public string Login => Tokens?.GetValueOrDefault("uid");
+		public string Password => Tokens?.GetValueOrDefault("pwd");
+		public readonly IReadOnlyDictionary<string, string> Tokens;
+
+		protected WriteRequestMessage(Guid internalCorrId,
+			Guid correlationId, IEnvelope envelope, bool requireLeader,
+			ClaimsPrincipal user, IReadOnlyDictionary<string, string> tokens,
+			CancellationToken token) : base(token) {
+
+			Ensure.NotEmptyGuid(internalCorrId, "internalCorrId");
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			Ensure.NotNull(envelope, "envelope");
+
+			InternalCorrId = internalCorrId;
+			CorrelationId = correlationId;
+			Envelope = envelope;
+			RequireLeader = requireLeader;
+
+			User = user;
+			Tokens = tokens;
+		}
+	}
+
+	[DerivedMessage]
+	public abstract partial class ReadRequestMessage : Message {
+		public readonly Guid InternalCorrId;
+		public readonly Guid CorrelationId;
+		public readonly IEnvelope Envelope;
+
+		public readonly ClaimsPrincipal User;
+
+		public readonly DateTime Expires;
+
+		protected ReadRequestMessage(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
+			ClaimsPrincipal user, DateTime? expires,
+			CancellationToken cancellationToken = default) : base(cancellationToken) {
+			Ensure.NotEmptyGuid(internalCorrId, "internalCorrId");
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			Ensure.NotNull(envelope, "envelope");
+
+			InternalCorrId = internalCorrId;
+			CorrelationId = correlationId;
+			Envelope = envelope;
+
+			User = user;
+			Expires = expires ?? DateTime.UtcNow.AddMilliseconds(ESConsts.ReadRequestTimeout);
+		}
+
+		public override string ToString() =>
+			$"{GetType().Name} " +
+			$"InternalCorrId: {InternalCorrId}, " +
+			$"CorrelationId: {CorrelationId}, " +
+			$"User: {User?.FindFirst(ClaimTypes.Name)?.Value ?? "(anonymous)"}, " +
+			$"Envelope: {{ {Envelope} }}, " +
+			$"Expires: {Expires}";
+	}
+
+	[DerivedMessage]
+	public abstract partial class ReadResponseMessage : Message {
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class TcpForwardMessage : Message {
+		public readonly Message Message;
+
+		public TcpForwardMessage(Message message) {
+			Ensure.NotNull(message, "message");
+
+			Message = message;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class NotHandled : Message {
+		public readonly Guid CorrelationId;
+		public readonly Types.NotHandledReason Reason;
+		public readonly Types.LeaderInfo LeaderInfo;
+		public readonly string Description;
+		public NotHandled(Guid correlationId,
+			Types.NotHandledReason reason,
+			Types.LeaderInfo leaderInfo) {
+			CorrelationId = correlationId;
+			Reason = reason;
+			LeaderInfo = leaderInfo;
+		}
+
+		public NotHandled(Guid correlationId,
+			Types.NotHandledReason reason,
+			string description) {
+			CorrelationId = correlationId;
+			Reason = reason;
+			Description = description;
+		}
+
+
+		public static class Types {
+
+			public enum NotHandledReason {
+				NotReady,
+				TooBusy,
+				NotLeader,
+				IsReadOnly
+			}
+			public class LeaderInfo {
+				public LeaderInfo(EndPoint externalTcp, bool isSecure, EndPoint http) {
+					ExternalTcp = externalTcp;
+					IsSecure = isSecure;
+					Http = http;
+				}
+
+				public bool IsSecure { get; }
+				public EndPoint ExternalTcp { get; }
+				public EndPoint Http { get; }
+			}
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class WriteEvents : WriteRequestMessage {
+		public readonly string EventStreamId;
+		public readonly long ExpectedVersion;
+		public readonly Event[] Events;
+
+		public WriteEvents(Guid internalCorrId, Guid correlationId, IEnvelope envelope, bool requireLeader,
+			string eventStreamId, long expectedVersion, Event[] events, ClaimsPrincipal user,
+			IReadOnlyDictionary<string, string> tokens = null, CancellationToken cancellationToken = default)
+			: base(internalCorrId, correlationId, envelope, requireLeader, user, tokens, cancellationToken) {
+
+			if (SystemStreams.IsInvalidStream(eventStreamId))
+				throw new ArgumentOutOfRangeException(nameof(eventStreamId));
+
+			if (expectedVersion < KurrentDB.Core.Data.ExpectedVersion.StreamExists ||
+				expectedVersion == KurrentDB.Core.Data.ExpectedVersion.Invalid)
+				throw new ArgumentOutOfRangeException(nameof(expectedVersion));
+
+			Ensure.NotNull(events, "events");
+
+			EventStreamId = eventStreamId;
+			ExpectedVersion = expectedVersion;
+			Events = events;
+		}
+
+		public WriteEvents(Guid internalCorrId, Guid correlationId, IEnvelope envelope, bool requireLeader,
+			string eventStreamId, long expectedVersion, Event @event, ClaimsPrincipal user,
+			IReadOnlyDictionary<string, string> tokens = null)
+			: this(internalCorrId, correlationId, envelope, requireLeader, eventStreamId, expectedVersion,
+				@event == null ? null : new[] { @event }, user, tokens) {
+		}
+
+		public override string ToString() {
+			return String.Format(
+				"WRITE: InternalCorrId: {0}, CorrelationId: {1}, EventStreamId: {2}, ExpectedVersion: {3}, Events: {4}",
+				InternalCorrId, CorrelationId, EventStreamId, ExpectedVersion, Events.Length);
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class WriteEventsCompleted : Message {
+		public readonly Guid CorrelationId;
+		public readonly OperationResult Result;
+		public readonly string Message;
+		public readonly long FirstEventNumber;
+		public readonly long LastEventNumber;
+		public readonly long PreparePosition;
+		public readonly long CommitPosition;
+		public readonly long CurrentVersion;
+
+		public WriteEventsCompleted(Guid correlationId, long firstEventNumber, long lastEventNumber,
+			long preparePosition, long commitPosition) {
+			if (firstEventNumber < -1)
+				throw new ArgumentOutOfRangeException(nameof(firstEventNumber),
+					$"FirstEventNumber: {firstEventNumber}");
+			if (lastEventNumber - firstEventNumber + 1 < 0)
+				throw new ArgumentOutOfRangeException(nameof(lastEventNumber),
+					$"LastEventNumber {lastEventNumber}, FirstEventNumber {firstEventNumber}.");
+
+			CorrelationId = correlationId;
+			Result = OperationResult.Success;
+			Message = null;
+			FirstEventNumber = firstEventNumber;
+			LastEventNumber = lastEventNumber;
+			PreparePosition = preparePosition;
+			CommitPosition = commitPosition;
+		}
+
+		public WriteEventsCompleted(Guid correlationId, OperationResult result, string message,
+			long currentVersion = -1) {
+			if (result == OperationResult.Success)
+				throw new ArgumentException("Invalid constructor used for successful write.", nameof(result));
+
+			CorrelationId = correlationId;
+			Result = result;
+			Message = message;
+			FirstEventNumber = EventNumber.Invalid;
+			LastEventNumber = EventNumber.Invalid;
+			PreparePosition = EventNumber.Invalid;
+			CurrentVersion = currentVersion;
+		}
+
+		private WriteEventsCompleted(Guid correlationId, OperationResult result, string message,
+			long firstEventNumber, long lastEventNumber, long preparePosition, long commitPosition,
+			long currentVersion) {
+			CorrelationId = correlationId;
+			Result = result;
+			Message = message;
+			FirstEventNumber = firstEventNumber;
+			LastEventNumber = lastEventNumber;
+			PreparePosition = preparePosition;
+			CommitPosition = commitPosition;
+			CurrentVersion = currentVersion;
+		}
+
+		public WriteEventsCompleted WithCorrelationId(Guid newCorrId) {
+			return new WriteEventsCompleted(newCorrId, Result, Message, FirstEventNumber, LastEventNumber,
+				PreparePosition, CommitPosition, CurrentVersion);
+		}
+
+		public override string ToString() {
+			return
+				$"WRITE COMPLETED: CorrelationId: {CorrelationId}, Result: {Result}, Message: {Message}, FirstEventNumber: {FirstEventNumber}, LastEventNumber: {LastEventNumber}, CurrentVersion: {CurrentVersion}";
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class TransactionStart : WriteRequestMessage {
+		public readonly string EventStreamId;
+		public readonly long ExpectedVersion;
+
+		public TransactionStart(Guid internalCorrId, Guid correlationId, IEnvelope envelope, bool requireLeader,
+			string eventStreamId, long expectedVersion, ClaimsPrincipal user,
+			IReadOnlyDictionary<string, string> tokens = null)
+			: base(internalCorrId, correlationId, envelope, requireLeader, user, tokens, CancellationToken.None) {
+			Ensure.NotNullOrEmpty(eventStreamId, "eventStreamId");
+			if (expectedVersion < KurrentDB.Core.Data.ExpectedVersion.Any)
+				throw new ArgumentOutOfRangeException(nameof(expectedVersion));
+
+			EventStreamId = eventStreamId;
+			ExpectedVersion = expectedVersion;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class TransactionStartCompleted : Message {
+		public readonly Guid CorrelationId;
+		public readonly long TransactionId;
+		public readonly OperationResult Result;
+		public readonly string Message;
+
+		public TransactionStartCompleted(Guid correlationId, long transactionId, OperationResult result,
+			string message) {
+			CorrelationId = correlationId;
+			TransactionId = transactionId;
+			Result = result;
+			Message = message;
+		}
+
+		public TransactionStartCompleted WithCorrelationId(Guid newCorrId) {
+			return new TransactionStartCompleted(newCorrId, TransactionId, Result, Message);
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class TransactionWrite : WriteRequestMessage {
+		public readonly long TransactionId;
+		public readonly Event[] Events;
+
+		public TransactionWrite(Guid internalCorrId, Guid correlationId, IEnvelope envelope, bool requireLeader,
+			long transactionId, Event[] events, ClaimsPrincipal user, IReadOnlyDictionary<string, string> tokens = null)
+			: base(internalCorrId, correlationId, envelope, requireLeader, user, tokens, CancellationToken.None) {
+			Ensure.Nonnegative(transactionId, "transactionId");
+			Ensure.NotNull(events, "events");
+
+			TransactionId = transactionId;
+			Events = events;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class TransactionWriteCompleted : Message {
+		public readonly Guid CorrelationId;
+		public readonly long TransactionId;
+		public readonly OperationResult Result;
+		public readonly string Message;
+
+		public TransactionWriteCompleted(Guid correlationId, long transactionId, OperationResult result,
+			string message) {
+			CorrelationId = correlationId;
+			TransactionId = transactionId;
+			Result = result;
+			Message = message;
+		}
+
+		public TransactionWriteCompleted WithCorrelationId(Guid newCorrId) {
+			return new TransactionWriteCompleted(newCorrId, TransactionId, Result, Message);
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class TransactionCommit : WriteRequestMessage {
+		public readonly long TransactionId;
+
+		public TransactionCommit(Guid internalCorrId, Guid correlationId, IEnvelope envelope, bool requireLeader,
+			long transactionId, ClaimsPrincipal user, IReadOnlyDictionary<string, string> tokens = null)
+			: base(internalCorrId, correlationId, envelope, requireLeader, user, tokens, CancellationToken.None) {
+			Ensure.Nonnegative(transactionId, "transactionId");
+			TransactionId = transactionId;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class TransactionCommitCompleted : Message {
+		public readonly Guid CorrelationId;
+		public readonly long TransactionId;
+		public readonly OperationResult Result;
+		public readonly string Message;
+		public readonly long FirstEventNumber;
+		public readonly long LastEventNumber;
+		public readonly long PreparePosition;
+		public readonly long CommitPosition;
+
+		public TransactionCommitCompleted(Guid correlationId, long transactionId, long firstEventNumber,
+			long lastEventNumber, long preparePosition, long commitPosition) {
+			if (firstEventNumber < -1)
+				throw new ArgumentOutOfRangeException("firstEventNumber",
+					String.Format("FirstEventNumber: {0}", firstEventNumber));
+			if (lastEventNumber - firstEventNumber + 1 < 0)
+				throw new ArgumentOutOfRangeException("lastEventNumber",
+					String.Format("LastEventNumber {0}, FirstEventNumber {1}.", lastEventNumber, firstEventNumber));
+			CorrelationId = correlationId;
+			TransactionId = transactionId;
+			Result = OperationResult.Success;
+			Message = String.Empty;
+			FirstEventNumber = firstEventNumber;
+			LastEventNumber = lastEventNumber;
+			PreparePosition = preparePosition;
+			CommitPosition = commitPosition;
+		}
+
+		public TransactionCommitCompleted(Guid correlationId, long transactionId, OperationResult result,
+			string message) {
+			if (result == OperationResult.Success)
+				throw new ArgumentException("Invalid constructor used for successful write.", "result");
+
+			CorrelationId = correlationId;
+			TransactionId = transactionId;
+			Result = result;
+			Message = message;
+			FirstEventNumber = EventNumber.Invalid;
+			LastEventNumber = EventNumber.Invalid;
+		}
+
+		private TransactionCommitCompleted(Guid correlationId, long transactionId, OperationResult result,
+			string message,
+			long firstEventNumber, long lastEventNumber) {
+			CorrelationId = correlationId;
+			TransactionId = transactionId;
+			Result = result;
+			Message = message;
+			FirstEventNumber = firstEventNumber;
+			LastEventNumber = lastEventNumber;
+		}
+
+		public TransactionCommitCompleted WithCorrelationId(Guid newCorrId) {
+			return new TransactionCommitCompleted(newCorrId, TransactionId, Result, Message, FirstEventNumber,
+				LastEventNumber);
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class DeleteStream : WriteRequestMessage {
+		public readonly string EventStreamId;
+		public readonly long ExpectedVersion;
+		public readonly bool HardDelete;
+
+		public DeleteStream(Guid internalCorrId, Guid correlationId, IEnvelope envelope, bool requireLeader,
+			string eventStreamId, long expectedVersion, bool hardDelete, ClaimsPrincipal user,
+			IReadOnlyDictionary<string, string> tokens = null, CancellationToken cancellationToken = default)
+			: base(internalCorrId, correlationId, envelope, requireLeader, user, tokens, cancellationToken) {
+			Ensure.NotNullOrEmpty(eventStreamId, "eventStreamId");
+			EventStreamId = eventStreamId;
+			ExpectedVersion = expectedVersion switch {
+				KurrentDB.Core.Data.ExpectedVersion.Invalid => throw new ArgumentOutOfRangeException(nameof(expectedVersion)),
+				< KurrentDB.Core.Data.ExpectedVersion.StreamExists => throw new ArgumentOutOfRangeException(nameof(expectedVersion)),
+				_ => expectedVersion
+			};
+			HardDelete = hardDelete;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class DeleteStreamCompleted : Message {
+		public readonly Guid CorrelationId;
+		public readonly OperationResult Result;
+		public readonly string Message;
+		public readonly long PreparePosition;
+		public readonly long CommitPosition;
+		public readonly long CurrentVersion;
+
+		public DeleteStreamCompleted(Guid correlationId, OperationResult result, string message,
+			long currentVersion, long preparePosition, long commitPosition) {
+			CorrelationId = correlationId;
+			Result = result;
+			Message = message;
+			CurrentVersion = currentVersion;
+			PreparePosition = preparePosition;
+			CommitPosition = commitPosition;
+		}
+
+		public DeleteStreamCompleted(Guid correlationId, OperationResult result, string message,
+			long currentVersion = -1L) : this(correlationId, result, message, currentVersion, -1, -1) {
+		}
+
+		public DeleteStreamCompleted WithCorrelationId(Guid newCorrId) {
+			return new DeleteStreamCompleted(newCorrId, Result, Message, CurrentVersion, PreparePosition,
+				CommitPosition);
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ReadEvent : ReadRequestMessage {
+		public readonly string EventStreamId;
+		public readonly long EventNumber;
+		public readonly bool ResolveLinkTos;
+		public readonly bool RequireLeader;
+
+		public ReadEvent(Guid internalCorrId, Guid correlationId, IEnvelope envelope, string eventStreamId,
+			long eventNumber,
+			bool resolveLinkTos, bool requireLeader, ClaimsPrincipal user, DateTime? expires = null,
+			CancellationToken cancellationToken = default)
+			: base(internalCorrId, correlationId, envelope, user, expires, cancellationToken) {
+			Ensure.NotNullOrEmpty(eventStreamId, "eventStreamId");
+			if (eventNumber < -1)
+				throw new ArgumentOutOfRangeException(nameof(eventNumber));
+
+			EventStreamId = eventStreamId;
+			EventNumber = eventNumber;
+			ResolveLinkTos = resolveLinkTos;
+			RequireLeader = requireLeader;
+		}
+
+		public override string ToString() =>
+			$"{base.ToString()}, " +
+			$"EventStreamId: {EventStreamId}, " +
+			$"EventNumber: {EventNumber}, " +
+			$"ResolveLinkTos: {ResolveLinkTos}, " +
+			$"RequireLeader: {RequireLeader}";
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ReadEventCompleted : ReadResponseMessage {
+		public readonly Guid CorrelationId;
+		public readonly string EventStreamId;
+		public readonly ReadEventResult Result;
+		public readonly ResolvedEvent Record;
+		public readonly StreamMetadata StreamMetadata;
+		public readonly bool IsCachePublic;
+		public readonly string Error;
+
+		public ReadEventCompleted(Guid correlationId, string eventStreamId, ReadEventResult result,
+			ResolvedEvent record, StreamMetadata streamMetadata, bool isCachePublic, string error) {
+			Ensure.NotNullOrEmpty(eventStreamId, "eventStreamId");
+			//if (result == ReadEventResult.Success)
+			//    Ensure.NotNull(record.Event, "record.Event");
+
+			CorrelationId = correlationId;
+			EventStreamId = eventStreamId;
+			Result = result;
+			Record = record;
+			StreamMetadata = streamMetadata;
+			IsCachePublic = isCachePublic;
+			Error = error;
+		}
+	}
+
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ReadStreamEventsForward : ReadRequestMessage {
+		public readonly string EventStreamId;
+		public readonly long FromEventNumber;
+		public readonly int MaxCount;
+		public readonly bool ResolveLinkTos;
+		public readonly bool RequireLeader;
+
+		public readonly long? ValidationStreamVersion;
+		public readonly TimeSpan? LongPollTimeout;
+		public readonly bool ReplyOnExpired;
+
+		public ReadStreamEventsForward(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
+			string eventStreamId, long fromEventNumber, int maxCount, bool resolveLinkTos,
+			bool requireLeader, long? validationStreamVersion, ClaimsPrincipal user,
+			bool replyOnExpired,
+			TimeSpan? longPollTimeout = null, DateTime? expires = null,
+			CancellationToken cancellationToken = default)
+			: base(internalCorrId, correlationId, envelope, user, expires, cancellationToken) {
+			Ensure.NotNullOrEmpty(eventStreamId, "eventStreamId");
+			if (fromEventNumber < -1)
+				throw new ArgumentOutOfRangeException(nameof(fromEventNumber));
+
+			EventStreamId = eventStreamId;
+			FromEventNumber = fromEventNumber;
+			MaxCount = maxCount;
+			ResolveLinkTos = resolveLinkTos;
+			RequireLeader = requireLeader;
+			ValidationStreamVersion = validationStreamVersion;
+			LongPollTimeout = longPollTimeout;
+			ReplyOnExpired = replyOnExpired;
+		}
+
+		public override string ToString() =>
+			$"{base.ToString()}, " +
+			$"EventStreamId: {EventStreamId}, " +
+			$"FromEventNumber: {FromEventNumber}, " +
+			$"MaxCount: {MaxCount}, " +
+			$"ResolveLinkTos: {ResolveLinkTos}, " +
+			$"RequireLeader: {RequireLeader}, " +
+			$"ValidationStreamVersion: {ValidationStreamVersion}, " +
+			$"LongPollTimeout: {LongPollTimeout}, " +
+			$"ReplyOnExpired: {ReplyOnExpired}";
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ReadStreamEventsForwardCompleted : ReadResponseMessage {
+		public readonly Guid CorrelationId;
+		public readonly string EventStreamId;
+		public readonly long FromEventNumber;
+		public readonly int MaxCount;
+
+		public readonly ReadStreamResult Result;
+		public readonly IReadOnlyList<ResolvedEvent> Events;
+		public readonly StreamMetadata StreamMetadata;
+		public readonly bool IsCachePublic;
+		public readonly string Error;
+		public readonly long NextEventNumber;
+		public readonly long LastEventNumber;
+		public readonly bool IsEndOfStream;
+		public readonly long TfLastCommitPosition;
+
+		public ReadStreamEventsForwardCompleted(Guid correlationId, string eventStreamId, long fromEventNumber,
+			int maxCount,
+			ReadStreamResult result, IReadOnlyList<ResolvedEvent> events,
+			StreamMetadata streamMetadata, bool isCachePublic,
+			string error, long nextEventNumber, long lastEventNumber, bool isEndOfStream,
+			long tfLastCommitPosition) {
+			Ensure.NotNull(events, "events");
+
+			if (result != ReadStreamResult.Success && result != ReadStreamResult.Expired) {
+				Ensure.Equal(nextEventNumber, -1, "nextEventNumber");
+				Ensure.Equal(isEndOfStream, true, "isEndOfStream");
+			}
+
+			CorrelationId = correlationId;
+			EventStreamId = eventStreamId;
+			FromEventNumber = fromEventNumber;
+			MaxCount = maxCount;
+
+			Result = result;
+			Events = events;
+			StreamMetadata = streamMetadata;
+			IsCachePublic = isCachePublic;
+			Error = error;
+			NextEventNumber = nextEventNumber;
+			LastEventNumber = lastEventNumber;
+			IsEndOfStream = isEndOfStream;
+			TfLastCommitPosition = tfLastCommitPosition;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ReadStreamEventsBackward : ReadRequestMessage {
+		public readonly string EventStreamId;
+		public readonly long FromEventNumber;
+		public readonly int MaxCount;
+		public readonly bool ResolveLinkTos;
+		public readonly bool RequireLeader;
+
+		public readonly long? ValidationStreamVersion;
+
+		public ReadStreamEventsBackward(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
+			string eventStreamId, long fromEventNumber, int maxCount, bool resolveLinkTos,
+			bool requireLeader, long? validationStreamVersion, ClaimsPrincipal user, DateTime? expires = null,
+			CancellationToken cancellationToken = default)
+			: base(internalCorrId, correlationId, envelope, user, expires, cancellationToken) {
+			Ensure.NotNullOrEmpty(eventStreamId, "eventStreamId");
+			if (fromEventNumber < -1)
+				throw new ArgumentOutOfRangeException(nameof(fromEventNumber));
+
+			EventStreamId = eventStreamId;
+			FromEventNumber = fromEventNumber;
+			MaxCount = maxCount;
+			ResolveLinkTos = resolveLinkTos;
+			RequireLeader = requireLeader;
+			ValidationStreamVersion = validationStreamVersion;
+		}
+
+		public override string ToString() =>
+			$"{base.ToString()}, " +
+			$"EventStreamId: {EventStreamId}, " +
+			$"FromEventNumber: {FromEventNumber}, " +
+			$"MaxCount: {MaxCount}, " +
+			$"ResolveLinkTos: {ResolveLinkTos}, " +
+			$"RequireLeader: {RequireLeader}, " +
+			$"ValidationStreamVersion: {ValidationStreamVersion}";
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ReadStreamEventsBackwardCompleted : ReadResponseMessage {
+		public readonly Guid CorrelationId;
+		public readonly string EventStreamId;
+		public readonly long FromEventNumber;
+		public readonly int MaxCount;
+
+		public readonly ReadStreamResult Result;
+		public readonly IReadOnlyList<ResolvedEvent> Events;
+		public readonly StreamMetadata StreamMetadata;
+		public readonly bool IsCachePublic;
+		public readonly string Error;
+		public readonly long NextEventNumber;
+		public readonly long LastEventNumber;
+		public readonly bool IsEndOfStream;
+		public readonly long TfLastCommitPosition;
+
+		public ReadStreamEventsBackwardCompleted(Guid correlationId,
+			string eventStreamId,
+			long fromEventNumber,
+			int maxCount,
+			ReadStreamResult result,
+			IReadOnlyList<ResolvedEvent> events,
+			StreamMetadata streamMetadata,
+			bool isCachePublic,
+			string error,
+			long nextEventNumber,
+			long lastEventNumber,
+			bool isEndOfStream,
+			long tfLastCommitPosition) {
+			Ensure.NotNull(events, "events");
+
+			if (result != ReadStreamResult.Success) {
+				Ensure.Equal(nextEventNumber, -1, "nextEventNumber");
+				Ensure.Equal(isEndOfStream, true, "isEndOfStream");
+			}
+
+			CorrelationId = correlationId;
+			EventStreamId = eventStreamId;
+			FromEventNumber = fromEventNumber;
+			MaxCount = maxCount;
+
+			Result = result;
+			Events = events;
+			StreamMetadata = streamMetadata;
+			IsCachePublic = isCachePublic;
+			Error = error;
+			NextEventNumber = nextEventNumber;
+			LastEventNumber = lastEventNumber;
+			IsEndOfStream = isEndOfStream;
+			TfLastCommitPosition = tfLastCommitPosition;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ReadAllEventsForward : ReadRequestMessage {
+		public readonly long CommitPosition;
+		public readonly long PreparePosition;
+		public readonly int MaxCount;
+		public readonly bool ResolveLinkTos;
+		public readonly bool RequireLeader;
+
+		public readonly long? ValidationTfLastCommitPosition;
+		public readonly TimeSpan? LongPollTimeout;
+		public readonly bool ReplyOnExpired;
+
+		public ReadAllEventsForward(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
+			long commitPosition, long preparePosition, int maxCount, bool resolveLinkTos,
+			bool requireLeader, long? validationTfLastCommitPosition, ClaimsPrincipal user,
+			bool replyOnExpired,
+			TimeSpan? longPollTimeout = null, DateTime? expires = null,
+			CancellationToken cancellationToken = default)
+			: base(internalCorrId, correlationId, envelope, user, expires, cancellationToken) {
+			CommitPosition = commitPosition;
+			PreparePosition = preparePosition;
+			MaxCount = maxCount;
+			ResolveLinkTos = resolveLinkTos;
+			RequireLeader = requireLeader;
+			ValidationTfLastCommitPosition = validationTfLastCommitPosition;
+			LongPollTimeout = longPollTimeout;
+			ReplyOnExpired = replyOnExpired;
+		}
+
+		public override string ToString() =>
+			$"{base.ToString()}, " +
+			$"PreparePosition: {PreparePosition}, " +
+			$"CommitPosition: {CommitPosition}, " +
+			$"MaxCount: {MaxCount}, " +
+			$"ResolveLinkTos: {ResolveLinkTos}, " +
+			$"RequireLeader: {RequireLeader}, " +
+			$"ValidationTfLastCommitPosition: {ValidationTfLastCommitPosition}, " +
+			$"LongPollTimeout: {LongPollTimeout}, " +
+			$"ReplyOnExpired: {ReplyOnExpired}";
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ReadAllEventsForwardCompleted : ReadResponseMessage {
+		public readonly Guid CorrelationId;
+
+		public readonly ReadAllResult Result;
+		public readonly string Error;
+
+		public readonly IReadOnlyList<ResolvedEvent> Events;
+		public readonly StreamMetadata StreamMetadata;
+		public readonly bool IsCachePublic;
+		public readonly int MaxCount;
+		public readonly TFPos CurrentPos;
+		public readonly TFPos NextPos;
+		public readonly TFPos PrevPos;
+		public readonly long TfLastCommitPosition;
+
+		public bool IsEndOfStream {
+			get { return Events == null || Events.Count < MaxCount; }
+		}
+
+		public ReadAllEventsForwardCompleted(Guid correlationId, ReadAllResult result, string error,
+			IReadOnlyList<ResolvedEvent> events,
+			StreamMetadata streamMetadata, bool isCachePublic, int maxCount,
+			TFPos currentPos, TFPos nextPos, TFPos prevPos, long tfLastCommitPosition) {
+			Ensure.NotNull(events, "events");
+
+			CorrelationId = correlationId;
+			Result = result;
+			Error = error;
+			Events = events;
+			StreamMetadata = streamMetadata;
+			IsCachePublic = isCachePublic;
+			MaxCount = maxCount;
+			CurrentPos = currentPos;
+			NextPos = nextPos;
+			PrevPos = prevPos;
+			TfLastCommitPosition = tfLastCommitPosition;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ReadAllEventsBackward : ReadRequestMessage {
+		public readonly long CommitPosition;
+		public readonly long PreparePosition;
+		public readonly int MaxCount;
+		public readonly bool ResolveLinkTos;
+		public readonly bool RequireLeader;
+
+		public readonly long? ValidationTfLastCommitPosition;
+
+		public ReadAllEventsBackward(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
+			long commitPosition, long preparePosition, int maxCount, bool resolveLinkTos,
+			bool requireLeader, long? validationTfLastCommitPosition, ClaimsPrincipal user,
+			DateTime? expires = null,
+			CancellationToken cancellationToken = default)
+			: base(internalCorrId, correlationId, envelope, user, expires, cancellationToken) {
+			CommitPosition = commitPosition;
+			PreparePosition = preparePosition;
+			MaxCount = maxCount;
+			ResolveLinkTos = resolveLinkTos;
+			RequireLeader = requireLeader;
+			ValidationTfLastCommitPosition = validationTfLastCommitPosition;
+		}
+
+		public override string ToString() =>
+			$"{base.ToString()}, " +
+			$"PreparePosition: {PreparePosition}, " +
+			$"CommitPosition: {CommitPosition}, " +
+			$"MaxCount: {MaxCount}, " +
+			$"ResolveLinkTos: {ResolveLinkTos}, " +
+			$"RequireLeader: {RequireLeader}, " +
+			$"ValidationTfLastCommitPosition: {ValidationTfLastCommitPosition}";
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ReadAllEventsBackwardCompleted : ReadResponseMessage {
+		public readonly Guid CorrelationId;
+
+		public readonly ReadAllResult Result;
+		public readonly string Error;
+
+		public readonly IReadOnlyList<ResolvedEvent> Events;
+		public readonly StreamMetadata StreamMetadata;
+		public readonly bool IsCachePublic;
+		public readonly int MaxCount;
+		public readonly TFPos CurrentPos;
+		public readonly TFPos NextPos;
+		public readonly TFPos PrevPos;
+		public readonly long TfLastCommitPosition;
+
+		public bool IsEndOfStream {
+			get { return Events == null || Events.Count < MaxCount; }
+		}
+
+		public ReadAllEventsBackwardCompleted(Guid correlationId, ReadAllResult result, string error,
+			IReadOnlyList<ResolvedEvent> events,
+			StreamMetadata streamMetadata, bool isCachePublic, int maxCount,
+			TFPos currentPos, TFPos nextPos, TFPos prevPos, long tfLastCommitPosition) {
+			Ensure.NotNull(events, "events");
+
+			CorrelationId = correlationId;
+			Result = result;
+			Error = error;
+			Events = events;
+			StreamMetadata = streamMetadata;
+			IsCachePublic = isCachePublic;
+			MaxCount = maxCount;
+			CurrentPos = currentPos;
+			NextPos = nextPos;
+			PrevPos = prevPos;
+			TfLastCommitPosition = tfLastCommitPosition;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class FilteredReadAllEventsForward : ReadRequestMessage {
+		public readonly long CommitPosition;
+		public readonly long PreparePosition;
+		public readonly int MaxCount;
+		public readonly bool ResolveLinkTos;
+		public readonly bool RequireLeader;
+		public readonly int MaxSearchWindow;
+		public readonly IEventFilter EventFilter;
+		public readonly bool ReplyOnExpired;
+
+		public readonly long? ValidationTfLastCommitPosition;
+		public readonly TimeSpan? LongPollTimeout;
+
+		public FilteredReadAllEventsForward(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
+			long commitPosition, long preparePosition, int maxCount, bool resolveLinkTos, bool requireLeader,
+			int maxSearchWindow, long? validationTfLastCommitPosition, IEventFilter eventFilter, ClaimsPrincipal user,
+			bool replyOnExpired,
+			TimeSpan? longPollTimeout = null, DateTime? expires = null,
+			CancellationToken cancellationToken = default)
+			: base(internalCorrId, correlationId, envelope, user, expires, cancellationToken) {
+			CommitPosition = commitPosition;
+			PreparePosition = preparePosition;
+			MaxCount = maxCount;
+			ResolveLinkTos = resolveLinkTos;
+			RequireLeader = requireLeader;
+			ValidationTfLastCommitPosition = validationTfLastCommitPosition;
+			LongPollTimeout = longPollTimeout;
+			MaxSearchWindow = maxSearchWindow;
+			EventFilter = eventFilter;
+			ReplyOnExpired = replyOnExpired;
+		}
+
+		public override string ToString() =>
+			$"{base.ToString()}, " +
+			$"PreparePosition: {PreparePosition}, " +
+			$"CommitPosition: {CommitPosition}, " +
+			$"MaxCount: {MaxCount}, " +
+			$"ResolveLinkTos: {ResolveLinkTos}, " +
+			$"RequireLeader: {RequireLeader}, " +
+			$"ValidationTfLastCommitPosition: {ValidationTfLastCommitPosition}, " +
+			$"LongPollTimeout: {LongPollTimeout}, " +
+			$"MaxSearchWindow: {MaxSearchWindow}, " +
+			$"EventFilter: {{ {EventFilter} }}, " +
+			$"ReplyOnExpired: {ReplyOnExpired}";
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class FilteredReadAllEventsForwardCompleted : ReadResponseMessage {
+		public readonly Guid CorrelationId;
+
+		public readonly FilteredReadAllResult Result;
+		public readonly string Error;
+
+		public readonly IReadOnlyList<ResolvedEvent> Events;
+		public readonly StreamMetadata StreamMetadata;
+		public readonly bool IsCachePublic;
+		public readonly int MaxCount;
+		public readonly TFPos CurrentPos;
+		public readonly TFPos NextPos;
+		public readonly TFPos PrevPos;
+		public readonly long TfLastCommitPosition;
+		public readonly bool IsEndOfStream;
+		public readonly long ConsideredEventsCount;
+
+		public FilteredReadAllEventsForwardCompleted(Guid correlationId, FilteredReadAllResult result, string error,
+			IReadOnlyList<ResolvedEvent> events,
+			StreamMetadata streamMetadata, bool isCachePublic, int maxCount,
+			TFPos currentPos, TFPos nextPos, TFPos prevPos, long tfLastCommitPosition,
+			bool isEndOfStream, long consideredEventsCount) {
+			Ensure.NotNull(events, "events");
+
+			CorrelationId = correlationId;
+			Result = result;
+			Error = error;
+			Events = events;
+			StreamMetadata = streamMetadata;
+			IsCachePublic = isCachePublic;
+			MaxCount = maxCount;
+			CurrentPos = currentPos;
+			NextPos = nextPos;
+			PrevPos = prevPos;
+			TfLastCommitPosition = tfLastCommitPosition;
+			IsEndOfStream = isEndOfStream;
+			ConsideredEventsCount = consideredEventsCount;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class FilteredReadAllEventsBackward : ReadRequestMessage {
+		public readonly long CommitPosition;
+		public readonly long PreparePosition;
+		public readonly int MaxCount;
+		public readonly bool ResolveLinkTos;
+		public readonly bool RequireLeader;
+		public readonly int MaxSearchWindow;
+		public readonly IEventFilter EventFilter;
+
+		public readonly long? ValidationTfLastCommitPosition;
+		public readonly TimeSpan? LongPollTimeout;
+
+		public FilteredReadAllEventsBackward(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
+			long commitPosition, long preparePosition, int maxCount, bool resolveLinkTos, bool requireLeader,
+			int maxSearchWindow, long? validationTfLastCommitPosition, IEventFilter eventFilter, ClaimsPrincipal user,
+			TimeSpan? longPollTimeout = null, DateTime? expires = null,
+			CancellationToken cancellationToken = default)
+			: base(internalCorrId, correlationId, envelope, user, expires, cancellationToken) {
+			CommitPosition = commitPosition;
+			PreparePosition = preparePosition;
+			MaxCount = maxCount;
+			ResolveLinkTos = resolveLinkTos;
+			RequireLeader = requireLeader;
+			ValidationTfLastCommitPosition = validationTfLastCommitPosition;
+			LongPollTimeout = longPollTimeout;
+			MaxSearchWindow = maxSearchWindow;
+			EventFilter = eventFilter;
+		}
+
+		public override string ToString() =>
+			$"{base.ToString()}, " +
+			$"PreparePosition: {PreparePosition}, " +
+			$"CommitPosition: {CommitPosition}, " +
+			$"MaxCount: {MaxCount}, " +
+			$"ResolveLinkTos: {ResolveLinkTos}, " +
+			$"RequireLeader: {RequireLeader}, " +
+			$"MaxSearchWindow: {MaxSearchWindow}, " +
+			$"EventFilter: {{ {EventFilter} }}, " +
+			$"LongPollTimeout: {LongPollTimeout}, " +
+			$"ValidationTfLastCommitPosition: {ValidationTfLastCommitPosition}";
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class FilteredReadAllEventsBackwardCompleted : ReadResponseMessage {
+		public readonly Guid CorrelationId;
+
+		public readonly FilteredReadAllResult Result;
+		public readonly string Error;
+
+		public readonly IReadOnlyList<ResolvedEvent> Events;
+		public readonly StreamMetadata StreamMetadata;
+		public readonly bool IsCachePublic;
+		public readonly int MaxCount;
+		public readonly TFPos CurrentPos;
+		public readonly TFPos NextPos;
+		public readonly TFPos PrevPos;
+		public readonly long TfLastCommitPosition;
+		public readonly bool IsEndOfStream;
+
+		public FilteredReadAllEventsBackwardCompleted(Guid correlationId, FilteredReadAllResult result, string error,
+			IReadOnlyList<ResolvedEvent> events,
+			StreamMetadata streamMetadata, bool isCachePublic, int maxCount,
+			TFPos currentPos, TFPos nextPos, TFPos prevPos, long tfLastCommitPosition,
+			bool isEndOfStream) {
+			Ensure.NotNull(events, "events");
+
+			CorrelationId = correlationId;
+			Result = result;
+			Error = error;
+			Events = events;
+			StreamMetadata = streamMetadata;
+			IsCachePublic = isCachePublic;
+			MaxCount = maxCount;
+			CurrentPos = currentPos;
+			NextPos = nextPos;
+			PrevPos = prevPos;
+			TfLastCommitPosition = tfLastCommitPosition;
+			IsEndOfStream = isEndOfStream;
+		}
+	}
+
+	//Persistent subscriptions
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ConnectToPersistentSubscriptionToStream : ReadRequestMessage {
+		public readonly Guid ConnectionId;
+		public readonly string ConnectionName;
+		public readonly string GroupName;
+		public readonly string EventStreamId;
+		public readonly int AllowedInFlightMessages;
+		public readonly string From;
+
+		public ConnectToPersistentSubscriptionToStream(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
+			Guid connectionId, string connectionName, string groupName, string eventStreamId,
+			int allowedInFlightMessages, string from, ClaimsPrincipal user, DateTime? expires = null)
+			: base(internalCorrId, correlationId, envelope, user, expires) {
+			Ensure.NotEmptyGuid(connectionId, "connectionId");
+			Ensure.NotNullOrEmpty(groupName, "subscriptionId");
+			Ensure.Nonnegative(allowedInFlightMessages, "AllowedInFlightMessages");
+			GroupName = groupName;
+			ConnectionId = connectionId;
+			ConnectionName = connectionName;
+			AllowedInFlightMessages = allowedInFlightMessages;
+			EventStreamId = eventStreamId;
+			From = from;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ConnectToPersistentSubscriptionToAll : ReadRequestMessage {
+		public readonly Guid ConnectionId;
+		public readonly string ConnectionName;
+		public readonly string GroupName;
+		public readonly int AllowedInFlightMessages;
+		public readonly string From;
+
+		public ConnectToPersistentSubscriptionToAll(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
+			Guid connectionId, string connectionName, string groupName,
+			int allowedInFlightMessages, string from, ClaimsPrincipal user, DateTime? expires = null)
+			: base(internalCorrId, correlationId, envelope, user, expires) {
+			Ensure.NotEmptyGuid(connectionId, "connectionId");
+			Ensure.NotNullOrEmpty(groupName, "groupName");
+			Ensure.Nonnegative(allowedInFlightMessages, "AllowedInFlightMessages");
+			GroupName = groupName;
+			ConnectionId = connectionId;
+			ConnectionName = connectionName;
+			AllowedInFlightMessages = allowedInFlightMessages;
+			From = from;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class CreatePersistentSubscriptionToStream : ReadRequestMessage {
+		public readonly long StartFrom;
+		public readonly int MessageTimeoutMilliseconds;
+		public readonly bool RecordStatistics;
+
+		public readonly bool ResolveLinkTos;
+		public readonly int MaxRetryCount;
+		public readonly int BufferSize;
+		public readonly int LiveBufferSize;
+		public readonly int ReadBatchSize;
+
+		public readonly string GroupName;
+		public readonly string EventStreamId;
+		public readonly int MaxSubscriberCount;
+		public readonly string NamedConsumerStrategy;
+		public readonly int MaxCheckPointCount;
+		public readonly int MinCheckPointCount;
+		public readonly int CheckPointAfterMilliseconds;
+
+		public CreatePersistentSubscriptionToStream(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
+			string eventStreamId, string groupName, bool resolveLinkTos, long startFrom,
+			int messageTimeoutMilliseconds, bool recordStatistics, int maxRetryCount, int bufferSize,
+			int liveBufferSize, int readbatchSize,
+			int checkPointAfterMilliseconds, int minCheckPointCount, int maxCheckPointCount,
+			int maxSubscriberCount, string namedConsumerStrategy, ClaimsPrincipal user, DateTime? expires = null)
+			: base(internalCorrId, correlationId, envelope, user, expires) {
+			ResolveLinkTos = resolveLinkTos;
+			EventStreamId = eventStreamId;
+			GroupName = groupName;
+			StartFrom = startFrom;
+			MessageTimeoutMilliseconds = messageTimeoutMilliseconds;
+			RecordStatistics = recordStatistics;
+			MaxRetryCount = maxRetryCount;
+			BufferSize = bufferSize;
+			LiveBufferSize = liveBufferSize;
+			ReadBatchSize = readbatchSize;
+			MaxCheckPointCount = maxCheckPointCount;
+			MinCheckPointCount = minCheckPointCount;
+			CheckPointAfterMilliseconds = checkPointAfterMilliseconds;
+			MaxSubscriberCount = maxSubscriberCount;
+			NamedConsumerStrategy = namedConsumerStrategy;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class CreatePersistentSubscriptionToStreamCompleted : ReadResponseMessage {
+		public readonly Guid CorrelationId;
+		public readonly string Reason;
+		public readonly CreatePersistentSubscriptionToStreamResult Result;
+
+		public CreatePersistentSubscriptionToStreamCompleted(Guid correlationId, CreatePersistentSubscriptionToStreamResult result,
+			string reason) {
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			CorrelationId = correlationId;
+			Result = result;
+			Reason = reason;
+		}
+
+		public enum CreatePersistentSubscriptionToStreamResult {
+			Success = 0,
+			AlreadyExists = 1,
+			Fail = 2,
+			AccessDenied = 3
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class CreatePersistentSubscriptionToAll : ReadRequestMessage {
+		public readonly IEventFilter EventFilter;
+
+		public readonly TFPos StartFrom;
+		public readonly int MessageTimeoutMilliseconds;
+		public readonly bool RecordStatistics;
+
+		public readonly bool ResolveLinkTos;
+		public readonly int MaxRetryCount;
+		public readonly int BufferSize;
+		public readonly int LiveBufferSize;
+		public readonly int ReadBatchSize;
+
+		public readonly string GroupName;
+		public readonly int MaxSubscriberCount;
+		public readonly string NamedConsumerStrategy;
+		public readonly int MaxCheckPointCount;
+		public readonly int MinCheckPointCount;
+		public readonly int CheckPointAfterMilliseconds;
+
+		public CreatePersistentSubscriptionToAll(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
+			string groupName, IEventFilter eventFilter, bool resolveLinkTos, TFPos startFrom,
+			int messageTimeoutMilliseconds, bool recordStatistics, int maxRetryCount, int bufferSize,
+			int liveBufferSize, int readbatchSize,
+			int checkPointAfterMilliseconds, int minCheckPointCount, int maxCheckPointCount,
+			int maxSubscriberCount, string namedConsumerStrategy, ClaimsPrincipal user, DateTime? expires = null)
+			: base(internalCorrId, correlationId, envelope, user, expires) {
+			ResolveLinkTos = resolveLinkTos;
+			GroupName = groupName;
+			EventFilter = eventFilter;
+			StartFrom = startFrom;
+			MessageTimeoutMilliseconds = messageTimeoutMilliseconds;
+			RecordStatistics = recordStatistics;
+			MaxRetryCount = maxRetryCount;
+			BufferSize = bufferSize;
+			LiveBufferSize = liveBufferSize;
+			ReadBatchSize = readbatchSize;
+			MaxCheckPointCount = maxCheckPointCount;
+			MinCheckPointCount = minCheckPointCount;
+			CheckPointAfterMilliseconds = checkPointAfterMilliseconds;
+			MaxSubscriberCount = maxSubscriberCount;
+			NamedConsumerStrategy = namedConsumerStrategy;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class CreatePersistentSubscriptionToAllCompleted : ReadResponseMessage {
+		public readonly Guid CorrelationId;
+		public readonly string Reason;
+		public readonly CreatePersistentSubscriptionToAllResult Result;
+
+		public CreatePersistentSubscriptionToAllCompleted(Guid correlationId, CreatePersistentSubscriptionToAllResult result,
+			string reason) {
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			CorrelationId = correlationId;
+			Result = result;
+			Reason = reason;
+		}
+
+		public enum CreatePersistentSubscriptionToAllResult {
+			Success = 0,
+			AlreadyExists = 1,
+			Fail = 2,
+			AccessDenied = 3
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class UpdatePersistentSubscriptionToStream : ReadRequestMessage {
+		public readonly long StartFrom;
+		public readonly int MessageTimeoutMilliseconds;
+		public readonly bool RecordStatistics;
+
+		public readonly bool ResolveLinkTos;
+		public readonly int MaxRetryCount;
+		public readonly int BufferSize;
+		public readonly int LiveBufferSize;
+		public readonly int ReadBatchSize;
+
+		public readonly string GroupName;
+		public readonly string EventStreamId;
+		public readonly int MaxSubscriberCount;
+
+		public readonly int MaxCheckPointCount;
+		public readonly int MinCheckPointCount;
+		public readonly int CheckPointAfterMilliseconds;
+		public readonly string NamedConsumerStrategy;
+
+		public UpdatePersistentSubscriptionToStream(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
+			string eventStreamId, string groupName, bool resolveLinkTos, long startFrom,
+			int messageTimeoutMilliseconds, bool recordStatistics, int maxRetryCount, int bufferSize,
+			int liveBufferSize, int readbatchSize, int checkPointAfterMilliseconds, int minCheckPointCount,
+			int maxCheckPointCount, int maxSubscriberCount, string namedConsumerStrategy, ClaimsPrincipal user,
+			DateTime? expires = null)
+			: base(internalCorrId, correlationId, envelope, user, expires) {
+			ResolveLinkTos = resolveLinkTos;
+			EventStreamId = eventStreamId;
+			GroupName = groupName;
+			StartFrom = startFrom;
+			MessageTimeoutMilliseconds = messageTimeoutMilliseconds;
+			RecordStatistics = recordStatistics;
+			MaxRetryCount = maxRetryCount;
+			BufferSize = bufferSize;
+			LiveBufferSize = liveBufferSize;
+			ReadBatchSize = readbatchSize;
+			MaxCheckPointCount = maxCheckPointCount;
+			MinCheckPointCount = minCheckPointCount;
+			CheckPointAfterMilliseconds = checkPointAfterMilliseconds;
+			MaxSubscriberCount = maxSubscriberCount;
+			NamedConsumerStrategy = namedConsumerStrategy;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class UpdatePersistentSubscriptionToStreamCompleted : ReadResponseMessage {
+		public readonly Guid CorrelationId;
+		public readonly string Reason;
+		public readonly UpdatePersistentSubscriptionToStreamResult Result;
+
+		public UpdatePersistentSubscriptionToStreamCompleted(Guid correlationId, UpdatePersistentSubscriptionToStreamResult result,
+			string reason) {
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			CorrelationId = correlationId;
+			Result = result;
+			Reason = reason;
+		}
+
+		public enum UpdatePersistentSubscriptionToStreamResult {
+			Success = 0,
+			DoesNotExist = 1,
+			Fail = 2,
+			AccessDenied = 3
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class UpdatePersistentSubscriptionToAll : ReadRequestMessage {
+		public readonly TFPos StartFrom;
+		public readonly int MessageTimeoutMilliseconds;
+		public readonly bool RecordStatistics;
+
+		public readonly bool ResolveLinkTos;
+		public readonly int MaxRetryCount;
+		public readonly int BufferSize;
+		public readonly int LiveBufferSize;
+		public readonly int ReadBatchSize;
+
+		public readonly string GroupName;
+		public readonly int MaxSubscriberCount;
+
+		public readonly int MaxCheckPointCount;
+		public readonly int MinCheckPointCount;
+		public readonly int CheckPointAfterMilliseconds;
+		public readonly string NamedConsumerStrategy;
+
+		public UpdatePersistentSubscriptionToAll(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
+			string groupName, bool resolveLinkTos, TFPos startFrom,
+			int messageTimeoutMilliseconds, bool recordStatistics, int maxRetryCount, int bufferSize,
+			int liveBufferSize, int readbatchSize, int checkPointAfterMilliseconds, int minCheckPointCount,
+			int maxCheckPointCount, int maxSubscriberCount, string namedConsumerStrategy, ClaimsPrincipal user,
+			DateTime? expires = null)
+			: base(internalCorrId, correlationId, envelope, user, expires) {
+			ResolveLinkTos = resolveLinkTos;
+			GroupName = groupName;
+			StartFrom = startFrom;
+			MessageTimeoutMilliseconds = messageTimeoutMilliseconds;
+			RecordStatistics = recordStatistics;
+			MaxRetryCount = maxRetryCount;
+			BufferSize = bufferSize;
+			LiveBufferSize = liveBufferSize;
+			ReadBatchSize = readbatchSize;
+			MaxCheckPointCount = maxCheckPointCount;
+			MinCheckPointCount = minCheckPointCount;
+			CheckPointAfterMilliseconds = checkPointAfterMilliseconds;
+			MaxSubscriberCount = maxSubscriberCount;
+			NamedConsumerStrategy = namedConsumerStrategy;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class UpdatePersistentSubscriptionToAllCompleted : ReadResponseMessage {
+		public readonly Guid CorrelationId;
+		public readonly string Reason;
+		public readonly UpdatePersistentSubscriptionToAllResult Result;
+
+		public UpdatePersistentSubscriptionToAllCompleted(Guid correlationId, UpdatePersistentSubscriptionToAllResult result,
+			string reason) {
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			CorrelationId = correlationId;
+			Result = result;
+			Reason = reason;
+		}
+
+		public enum UpdatePersistentSubscriptionToAllResult {
+			Success = 0,
+			DoesNotExist = 1,
+			Fail = 2,
+			AccessDenied = 3
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ReadNextNPersistentMessages : ReadRequestMessage {
+		public readonly string GroupName;
+		public readonly string EventStreamId;
+		public readonly int Count;
+
+		public ReadNextNPersistentMessages(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
+			string eventStreamId, string groupName, int count, ClaimsPrincipal user, DateTime? expires = null)
+			: base(internalCorrId, correlationId, envelope, user, expires) {
+			GroupName = groupName;
+			EventStreamId = eventStreamId;
+			Count = count;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ReadNextNPersistentMessagesCompleted : ReadResponseMessage {
+		public readonly Guid CorrelationId;
+		public readonly string Reason;
+		public readonly ReadNextNPersistentMessagesResult Result;
+		public readonly (ResolvedEvent ResolvedEvent, int RetryCount)[] Events;
+
+		public ReadNextNPersistentMessagesCompleted(Guid correlationId, ReadNextNPersistentMessagesResult result,
+			string reason, (ResolvedEvent ResolvedEvent, int RetryCount)[] events) {
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			CorrelationId = correlationId;
+			Result = result;
+			Reason = reason;
+			Events = events;
+		}
+
+		public enum ReadNextNPersistentMessagesResult {
+			Success = 0,
+			DoesNotExist = 1,
+			Fail = 2,
+			AccessDenied = 3
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class DeletePersistentSubscriptionToStream : ReadRequestMessage {
+		public readonly string GroupName;
+		public readonly string EventStreamId;
+
+		public DeletePersistentSubscriptionToStream(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
+			string eventStreamId, string groupName, ClaimsPrincipal user, DateTime? expires = null)
+			: base(internalCorrId, correlationId, envelope, user, expires) {
+			GroupName = groupName;
+			EventStreamId = eventStreamId;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class DeletePersistentSubscriptionToStreamCompleted : ReadResponseMessage {
+		public readonly Guid CorrelationId;
+		public readonly string Reason;
+		public readonly DeletePersistentSubscriptionToStreamResult Result;
+
+		public DeletePersistentSubscriptionToStreamCompleted(Guid correlationId, DeletePersistentSubscriptionToStreamResult result,
+			string reason) {
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			CorrelationId = correlationId;
+			Result = result;
+			Reason = reason;
+		}
+
+		public enum DeletePersistentSubscriptionToStreamResult {
+			Success = 0,
+			DoesNotExist = 1,
+			Fail = 2,
+			AccessDenied = 3
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class DeletePersistentSubscriptionToAll : ReadRequestMessage {
+		public readonly string GroupName;
+
+		public DeletePersistentSubscriptionToAll(Guid internalCorrId, Guid correlationId, IEnvelope envelope
+			, string groupName, ClaimsPrincipal user, DateTime? expires = null)
+			: base(internalCorrId, correlationId, envelope, user, expires) {
+			GroupName = groupName;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class DeletePersistentSubscriptionToAllCompleted : ReadResponseMessage {
+		public readonly Guid CorrelationId;
+		public readonly string Reason;
+		public readonly DeletePersistentSubscriptionToAllResult Result;
+
+		public DeletePersistentSubscriptionToAllCompleted(Guid correlationId, DeletePersistentSubscriptionToAllResult result,
+			string reason) {
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			CorrelationId = correlationId;
+			Result = result;
+			Reason = reason;
+		}
+
+		public enum DeletePersistentSubscriptionToAllResult {
+			Success = 0,
+			DoesNotExist = 1,
+			Fail = 2,
+			AccessDenied = 3
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class PersistentSubscriptionAckEvents : ReadRequestMessage {
+		public readonly string SubscriptionId;
+		public readonly Guid[] ProcessedEventIds;
+
+		public PersistentSubscriptionAckEvents(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
+			string subscriptionId, Guid[] processedEventIds, ClaimsPrincipal user, DateTime? expires = null)
+			: base(internalCorrId, correlationId, envelope, user, expires) {
+			Ensure.NotNullOrEmpty(subscriptionId, "subscriptionId");
+			Ensure.NotNull(processedEventIds, "processedEventIds");
+
+			SubscriptionId = subscriptionId;
+			ProcessedEventIds = processedEventIds;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class PersistentSubscriptionNackEvents : ReadRequestMessage {
+		public readonly string SubscriptionId;
+		public readonly Guid[] ProcessedEventIds;
+		public readonly string Message;
+		public readonly NakAction Action;
+
+		public PersistentSubscriptionNackEvents(Guid internalCorrId,
+			Guid correlationId,
+			IEnvelope envelope,
+			string subscriptionId,
+			string message,
+			NakAction action,
+			Guid[] processedEventIds,
+			ClaimsPrincipal user,
+			DateTime? expires = null)
+			: base(internalCorrId, correlationId, envelope, user, expires) {
+			SubscriptionId = subscriptionId;
+			ProcessedEventIds = processedEventIds;
+			Message = message;
+			Action = action;
+		}
+
+		public enum NakAction {
+			Unknown = 0,
+			Park = 1,
+			Retry = 2,
+			Skip = 3,
+			Stop = 4
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class PersistentSubscriptionNakEvents : ReadRequestMessage {
+		public readonly string SubscriptionId;
+		public readonly Guid[] ProcessedEventIds;
+
+		public PersistentSubscriptionNakEvents(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
+			string subscriptionId, Guid[] processedEventIds, ClaimsPrincipal user, DateTime? expires = null)
+			: base(internalCorrId, correlationId, envelope, user, expires) {
+			Ensure.NotNullOrEmpty(subscriptionId, "subscriptionId");
+			Ensure.NotNull(processedEventIds, "processedEventIds");
+
+			SubscriptionId = subscriptionId;
+			ProcessedEventIds = processedEventIds;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class PersistentSubscriptionConfirmation : Message {
+		public readonly Guid CorrelationId;
+		public readonly long LastIndexedPosition;
+		public readonly long? LastEventNumber;
+		public readonly string SubscriptionId;
+
+		public PersistentSubscriptionConfirmation(string subscriptionId, Guid correlationId,
+			long lastIndexedPosition, long? lastEventNumber) {
+			CorrelationId = correlationId;
+			LastIndexedPosition = lastIndexedPosition;
+			LastEventNumber = lastEventNumber;
+			SubscriptionId = subscriptionId;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ReplayParkedMessages : ReadRequestMessage {
+		public readonly string EventStreamId;
+		public readonly string GroupName;
+		public readonly long? StopAt;
+
+		public ReplayParkedMessages(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
+			string eventStreamId, string groupName, long? stopAt, ClaimsPrincipal user, DateTime? expires = null)
+			: base(internalCorrId, correlationId, envelope, user, expires) {
+			EventStreamId = eventStreamId;
+			GroupName = groupName;
+			StopAt = stopAt;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ReplayParkedMessage : ReadRequestMessage {
+		public readonly string EventStreamId;
+		public readonly string GroupName;
+		public readonly ResolvedEvent Event;
+
+		public ReplayParkedMessage(Guid internalCorrId, Guid correlationId, IEnvelope envelope, string streamId,
+			string groupName, ResolvedEvent @event, ClaimsPrincipal user, DateTime? expires = null)
+			: base(internalCorrId, correlationId, envelope, user, expires) {
+			EventStreamId = streamId;
+			GroupName = groupName;
+			Event = @event;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ReplayMessagesReceived : ReadResponseMessage {
+		public readonly Guid CorrelationId;
+		public readonly string Reason;
+		public readonly ReplayMessagesReceivedResult Result;
+
+		public ReplayMessagesReceived(Guid correlationId, ReplayMessagesReceivedResult result, string reason) {
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			CorrelationId = correlationId;
+			Result = result;
+			Reason = reason;
+		}
+
+		public enum ReplayMessagesReceivedResult {
+			Success = 0,
+			DoesNotExist = 1,
+			Fail = 2,
+			AccessDenied = 3
+		}
+	}
+
+	//End of persistence subscriptions
+
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class SubscribeToStream : ReadRequestMessage {
+		public readonly Guid ConnectionId;
+		public readonly string EventStreamId; // should be empty to subscribe to all
+		public readonly bool ResolveLinkTos;
+
+		public SubscribeToStream(Guid internalCorrId, Guid correlationId, IEnvelope envelope, Guid connectionId,
+			string eventStreamId, bool resolveLinkTos, ClaimsPrincipal user, DateTime? expires = null)
+			: base(internalCorrId, correlationId, envelope, user, expires) {
+			Ensure.NotEmptyGuid(connectionId, "connectionId");
+			ConnectionId = connectionId;
+			EventStreamId = eventStreamId;
+			ResolveLinkTos = resolveLinkTos;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class FilteredSubscribeToStream : ReadRequestMessage {
+		public readonly Guid ConnectionId;
+		public readonly string EventStreamId; // should be empty to subscribe to all
+		public readonly bool ResolveLinkTos;
+		public readonly IEventFilter EventFilter;
+		public readonly int CheckpointInterval;
+		public readonly int CheckpointIntervalCurrent;
+
+		public FilteredSubscribeToStream(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
+			Guid connectionId, string eventStreamId, bool resolveLinkTos, ClaimsPrincipal user,
+			IEventFilter eventFilter, int checkpointInterval, int checkpointIntervalCurrent, DateTime? expires = null)
+			: base(internalCorrId, correlationId, envelope, user, expires) {
+			Ensure.NotEmptyGuid(connectionId, "connectionId");
+			ConnectionId = connectionId;
+			EventStreamId = eventStreamId;
+			ResolveLinkTos = resolveLinkTos;
+			EventFilter = eventFilter;
+			CheckpointInterval = checkpointInterval;
+			CheckpointIntervalCurrent = checkpointIntervalCurrent;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class CheckpointReached : Message {
+		public readonly Guid CorrelationId;
+		public readonly TFPos? Position;
+
+		public CheckpointReached(Guid correlationId, TFPos? position) {
+			CorrelationId = correlationId;
+			Position = position;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class UnsubscribeFromStream : ReadRequestMessage {
+		public UnsubscribeFromStream(Guid internalCorrId, Guid correlationId, IEnvelope envelope,
+			ClaimsPrincipal user, DateTime? expires = null)
+			: base(internalCorrId, correlationId, envelope, user, expires) {
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class SubscriptionConfirmation : Message {
+		public readonly Guid CorrelationId;
+		public readonly long LastIndexedPosition;
+		public readonly long? LastEventNumber;
+
+		public SubscriptionConfirmation(Guid correlationId, long lastIndexedPosition, long? lastEventNumber) {
+			CorrelationId = correlationId;
+			LastIndexedPosition = lastIndexedPosition;
+			LastEventNumber = lastEventNumber;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class StreamEventAppeared : Message {
+		public readonly Guid CorrelationId;
+		public readonly ResolvedEvent Event;
+
+		public StreamEventAppeared(Guid correlationId, ResolvedEvent @event) {
+			CorrelationId = correlationId;
+			Event = @event;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class PersistentSubscriptionStreamEventAppeared : Message {
+		public readonly Guid CorrelationId;
+		public readonly ResolvedEvent Event;
+		public readonly int RetryCount;
+
+		public PersistentSubscriptionStreamEventAppeared(Guid correlationId, ResolvedEvent @event, int retryCount) {
+			CorrelationId = correlationId;
+			Event = @event;
+			RetryCount = retryCount;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class SubscriptionDropped : Message {
+		public readonly Guid CorrelationId;
+		public readonly SubscriptionDropReason Reason;
+
+		public SubscriptionDropped(Guid correlationId, SubscriptionDropReason reason) {
+			CorrelationId = correlationId;
+			Reason = reason;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class MergeIndexes : Message {
+		public readonly IEnvelope Envelope;
+		public readonly Guid CorrelationId;
+		public readonly ClaimsPrincipal User;
+
+		public MergeIndexes(IEnvelope envelope, Guid correlationId, ClaimsPrincipal user) {
+			Ensure.NotNull(envelope, "envelope");
+			Envelope = envelope;
+			CorrelationId = correlationId;
+			User = user;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class MergeIndexesResponse : Message {
+		public readonly Guid CorrelationId;
+		public readonly MergeIndexesResult Result;
+
+		public MergeIndexesResponse(Guid correlationId, MergeIndexesResult result) {
+			CorrelationId = correlationId;
+			Result = result;
+		}
+
+		public override string ToString() {
+			return String.Format("Result: {0}", Result);
+		}
+
+		public enum MergeIndexesResult {
+			Started
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class SetNodePriority : Message {
+		public readonly int NodePriority;
+
+		public SetNodePriority(int nodePriority) {
+			NodePriority = nodePriority;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ResignNode : Message {
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ScavengeDatabase : Message {
+		public readonly IEnvelope Envelope;
+		public readonly Guid CorrelationId;
+		public readonly ClaimsPrincipal User;
+		public readonly int StartFromChunk;
+		public readonly int Threads;
+		public readonly int? Threshold;
+		public readonly int? ThrottlePercent;
+		public readonly bool SyncOnly;
+
+		public ScavengeDatabase(
+			IEnvelope envelope,
+			Guid correlationId,
+			ClaimsPrincipal user,
+			int startFromChunk,
+			int threads,
+			int? threshold,
+			int? throttlePercent,
+			bool syncOnly) {
+
+			Ensure.NotNull(envelope, "envelope");
+			Envelope = envelope;
+			CorrelationId = correlationId;
+			User = user;
+			StartFromChunk = startFromChunk;
+			Threads = threads;
+			Threshold = threshold;
+			ThrottlePercent = throttlePercent;
+			SyncOnly = syncOnly;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class StopDatabaseScavenge : Message {
+		public readonly IEnvelope Envelope;
+		public readonly Guid CorrelationId;
+		public readonly ClaimsPrincipal User;
+		public readonly string ScavengeId;
+
+		public StopDatabaseScavenge(IEnvelope envelope, Guid correlationId, ClaimsPrincipal user, string scavengeId) {
+			Ensure.NotNull(envelope, "envelope");
+			Envelope = envelope;
+			CorrelationId = correlationId;
+			User = user;
+			ScavengeId = scavengeId;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class GetCurrentDatabaseScavenge : Message {
+		public readonly IEnvelope Envelope;
+		public readonly Guid CorrelationId;
+		public readonly ClaimsPrincipal User;
+
+		public GetCurrentDatabaseScavenge(IEnvelope envelope, Guid correlationId, ClaimsPrincipal user) {
+			Ensure.NotNull(envelope, "envelope");
+			Envelope = envelope;
+			CorrelationId = correlationId;
+			User = user;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ScavengeDatabaseGetCurrentResponse : Message {
+		public readonly Guid CorrelationId;
+		public readonly ScavengeResult Result;
+		public readonly string ScavengeId;
+
+		public ScavengeDatabaseGetCurrentResponse(Guid correlationId,
+			ScavengeResult result, string scavengeId) {
+			CorrelationId = correlationId;
+			Result = result;
+			ScavengeId = scavengeId;
+		}
+
+		public override string ToString() => $"Result: {Result}, ScavengeId: {ScavengeId}";
+		public enum ScavengeResult {
+			InProgress,
+			Stopped
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class GetLastDatabaseScavenge : Message {
+		public readonly IEnvelope Envelope;
+		public readonly Guid CorrelationId;
+		public readonly ClaimsPrincipal User;
+
+		public GetLastDatabaseScavenge(IEnvelope envelope, Guid correlationId, ClaimsPrincipal user) {
+			Ensure.NotNull(envelope, nameof(envelope));
+			Envelope = envelope;
+			CorrelationId = correlationId;
+			User = user;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ScavengeDatabaseGetLastResponse : Message {
+		public readonly Guid CorrelationId;
+		public readonly ScavengeResult Result;
+		public readonly string ScavengeId;
+
+		public ScavengeDatabaseGetLastResponse(
+			Guid correlationId,
+			ScavengeResult result,
+			string scavengeId) {
+			CorrelationId = correlationId;
+			Result = result;
+			ScavengeId = scavengeId;
+		}
+
+		public override string ToString() => $"Result: {Result}, ScavengeId: {ScavengeId}";
+
+		public enum ScavengeResult {
+			Unknown,
+			InProgress,
+			Success,
+			Stopped,
+			Errored,
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ScavengeDatabaseStartedResponse : Message {
+		public readonly Guid CorrelationId;
+		public readonly string ScavengeId;
+
+		public ScavengeDatabaseStartedResponse(Guid correlationId, string scavengeId) {
+			CorrelationId = correlationId;
+			ScavengeId = scavengeId;
+		}
+		public override string ToString() => $"ScavengeId: {ScavengeId}";
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ScavengeDatabaseInProgressResponse : Message {
+		public readonly Guid CorrelationId;
+		public readonly string ScavengeId;
+		public readonly string Reason;
+
+		public ScavengeDatabaseInProgressResponse(Guid correlationId, string scavengeId, string reason) {
+			CorrelationId = correlationId;
+			ScavengeId = scavengeId;
+			Reason = reason;
+		}
+
+		public override string ToString() => $"ScavengeId: {ScavengeId}, Reason: {Reason}";
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ScavengeDatabaseStoppedResponse : Message {
+		public readonly Guid CorrelationId;
+		public readonly string ScavengeId;
+
+		public ScavengeDatabaseStoppedResponse(Guid correlationId, string scavengeId) {
+			CorrelationId = correlationId;
+			ScavengeId = scavengeId;
+		}
+
+		public override string ToString() => $"ScavengeId: {ScavengeId}";
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ScavengeDatabaseNotFoundResponse : Message {
+		public readonly Guid CorrelationId;
+		public readonly string ScavengeId;
+		public readonly string Reason;
+
+		public ScavengeDatabaseNotFoundResponse(Guid correlationId, string scavengeId, string reason) {
+			CorrelationId = correlationId;
+			ScavengeId = scavengeId;
+			Reason = reason;
+		}
+
+		public override string ToString() => $"ScavengeId: {ScavengeId}, Reason: {Reason}";
+
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ScavengeDatabaseUnauthorizedResponse : Message {
+		public readonly Guid CorrelationId;
+		public readonly string ScavengeId;
+		public readonly string Reason;
+
+		public ScavengeDatabaseUnauthorizedResponse(Guid correlationId, string scavengeId, string reason) {
+			CorrelationId = correlationId;
+			ScavengeId = scavengeId;
+			Reason = reason;
+		}
+		public override string ToString() => $"ScavengeId: {ScavengeId}, Reason: {Reason}";
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class IdentifyClient : Message {
+		public readonly Guid CorrelationId;
+		public readonly int Version;
+		public readonly string ConnectionName;
+
+		public IdentifyClient(Guid correlationId,
+			int version,
+			string connectionName) {
+			CorrelationId = correlationId;
+			Version = version;
+			ConnectionName = connectionName;
+		}
+
+		public override string ToString() {
+			return String.Format("Version: {0}, Connection Name: {1}", Version, ConnectionName);
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Client)]
+	public partial class ClientIdentified : Message {
+		public readonly Guid CorrelationId;
+
+		public ClientIdentified(Guid correlationId) {
+			CorrelationId = correlationId;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/ClusterClientMessage.cs b/src/KurrentDB.Core/Messages/ClusterClientMessage.cs
new file mode 100644
index 00000000000..5c4642563b2
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/ClusterClientMessage.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Messages;
+
+public static partial class ClusterClientMessage {
+	[DerivedMessage(CoreMessage.ClusterClient)]
+	public partial class CleanCache : Message {
+		public CleanCache() { }
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/ClusterInfoDto.cs b/src/KurrentDB.Core/Messages/ClusterInfoDto.cs
new file mode 100644
index 00000000000..1527e769065
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/ClusterInfoDto.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Net;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Cluster;
+
+namespace KurrentDB.Core.Messages;
+
+public class ClusterInfoDto {
+	public MemberInfoDto[] Members { get; set; }
+	public string ServerIp { get; set; }
+	public int ServerPort { get; set; }
+
+	public ClusterInfoDto() {
+	}
+
+	public ClusterInfoDto(ClusterInfo clusterInfo, EndPoint serverEndPoint) {
+		Members = clusterInfo.Members.Select(x => new MemberInfoDto(x)).ToArray();
+		ServerIp = serverEndPoint.GetHost();
+		ServerPort = serverEndPoint.GetPort();
+	}
+
+	public override string ToString() {
+		return string.Format("Server: {0}:{1}, Members: [{2}]",
+			ServerIp, ServerPort,
+			Members != null ? string.Join(",", Members.Select(m => m.ToString())) : "null");
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/ElectionMessage.cs b/src/KurrentDB.Core/Messages/ElectionMessage.cs
new file mode 100644
index 00000000000..fcc251e2a0b
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/ElectionMessage.cs
@@ -0,0 +1,350 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Messages;
+
+public static partial class ElectionMessage {
+	[DerivedMessage(CoreMessage.Election)]
+	public partial class StartElections : Message {
+		public override string ToString() {
+			return "---- StartElections";
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Election)]
+	public partial class ViewChange : Message {
+		public readonly Guid ServerId;
+		public readonly EndPoint ServerHttpEndPoint;
+
+		public readonly int AttemptedView;
+
+		public ViewChange(Guid serverId,
+			EndPoint serverHttpEndPoint,
+			int attemptedView) {
+			ServerId = serverId;
+			ServerHttpEndPoint = serverHttpEndPoint;
+
+			AttemptedView = attemptedView;
+		}
+
+		public ViewChange(ElectionMessageDto.ViewChangeDto dto) {
+			AttemptedView = dto.AttemptedView;
+			ServerId = dto.ServerId;
+			ServerHttpEndPoint = new IPEndPoint(IPAddress.Parse(dto.ServerHttpAddress),
+				dto.ServerHttpPort);
+		}
+
+		public override string ToString() {
+			return string.Format("---- ViewChange: attemptedView {0}, serverId {1}, serverHttp {2}",
+				AttemptedView, ServerId, ServerHttpEndPoint);
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Election)]
+	public partial class ViewChangeProof : Message {
+		public readonly Guid ServerId;
+		public readonly EndPoint ServerHttpEndPoint;
+		public readonly int InstalledView;
+
+		public ViewChangeProof(Guid serverId, EndPoint serverHttpEndPoint, int installedView) {
+			ServerId = serverId;
+			ServerHttpEndPoint = serverHttpEndPoint;
+			InstalledView = installedView;
+		}
+
+		public ViewChangeProof(ElectionMessageDto.ViewChangeProofDto dto) {
+			ServerId = dto.ServerId;
+			ServerHttpEndPoint = new IPEndPoint(IPAddress.Parse(dto.ServerHttpAddress),
+				dto.ServerHttpPort);
+			InstalledView = dto.InstalledView;
+		}
+
+		public override string ToString() {
+			return string.Format("---- ViewChangeProof: serverId {0}, serverHttp {1}, installedView {2}",
+				ServerId, ServerHttpEndPoint, InstalledView);
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Election)]
+	public partial class SendViewChangeProof : Message {
+		public override string ToString() {
+			return string.Format("---- SendViewChangeProof");
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Election)]
+	public partial class ElectionsTimedOut : Message {
+		public readonly int View;
+
+		public ElectionsTimedOut(int view) {
+			View = view;
+		}
+
+		public override string ToString() {
+			return string.Format("---- ElectionsTimedOut: view {0}", View);
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Election)]
+	public partial class Prepare : Message {
+		public readonly Guid ServerId;
+		public readonly EndPoint ServerHttpEndPoint;
+		public readonly int View;
+
+		public Prepare(Guid serverId, EndPoint serverHttpEndPoint, int view) {
+			ServerId = serverId;
+			ServerHttpEndPoint = serverHttpEndPoint;
+			View = view;
+		}
+
+		public Prepare(ElectionMessageDto.PrepareDto dto) {
+			ServerId = dto.ServerId;
+			ServerHttpEndPoint = new IPEndPoint(IPAddress.Parse(dto.ServerHttpAddress),
+				dto.ServerHttpPort);
+			View = dto.View;
+		}
+
+		public override string ToString() {
+			return string.Format("---- Prepare: serverId {0}, serverHttp {1}, view {2}", ServerId,
+				ServerHttpEndPoint, View);
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Election)]
+	public partial class PrepareOk : Message {
+		public readonly int View;
+		public readonly Guid ServerId;
+		public readonly EndPoint ServerHttpEndPoint;
+		public readonly int EpochNumber;
+		public readonly long EpochPosition;
+		public readonly Guid EpochId;
+		public readonly Guid EpochLeaderInstanceId;
+		public readonly long LastCommitPosition;
+		public readonly long WriterCheckpoint;
+		public readonly long ChaserCheckpoint;
+		public readonly int NodePriority;
+		public readonly ClusterInfo ClusterInfo;
+
+		public PrepareOk(int view,
+			Guid serverId,
+			EndPoint serverHttpEndPoint,
+			int epochNumber,
+			long epochPosition,
+			Guid epochId,
+			Guid epochLeaderInstanceId,
+			long lastCommitPosition,
+			long writerCheckpoint,
+			long chaserCheckpoint,
+			int nodePriority,
+			ClusterInfo clusterInfo) {
+			View = view;
+			ServerId = serverId;
+			ServerHttpEndPoint = serverHttpEndPoint;
+			EpochNumber = epochNumber;
+			EpochPosition = epochPosition;
+			EpochId = epochId;
+			EpochLeaderInstanceId = epochLeaderInstanceId;
+			LastCommitPosition = lastCommitPosition;
+			WriterCheckpoint = writerCheckpoint;
+			ChaserCheckpoint = chaserCheckpoint;
+			NodePriority = nodePriority;
+			ClusterInfo = clusterInfo;
+		}
+
+		public PrepareOk(ElectionMessageDto.PrepareOkDto dto) {
+			View = dto.View;
+			ServerId = dto.ServerId;
+			ServerHttpEndPoint = new IPEndPoint(IPAddress.Parse(dto.ServerHttpAddress),
+				dto.ServerHttpPort);
+			EpochNumber = dto.EpochNumber;
+			EpochPosition = dto.EpochPosition;
+			EpochId = dto.EpochId;
+			EpochLeaderInstanceId = dto.EpochLeaderInstanceId;
+			LastCommitPosition = dto.LastCommitPosition;
+			WriterCheckpoint = dto.WriterCheckpoint;
+			ChaserCheckpoint = dto.ChaserCheckpoint;
+			NodePriority = dto.NodePriority;
+			ClusterInfo = dto.ClusterInfo;
+		}
+
+		public override string ToString() {
+			return string.Format(
+				"---- PrepareOk: view {0}, serverId {1}, serverHttp {2}, epochNumber {3}, " +
+				"epochPosition {4}, epochId {5}, epochLeaderInstanceId {6:B}, lastCommitPosition {7}, writerCheckpoint {8}, chaserCheckpoint {9}, nodePriority: {10}, clusterInfo: {11}",
+				View, ServerId, ServerHttpEndPoint, EpochNumber,
+				EpochPosition, EpochId, EpochLeaderInstanceId, LastCommitPosition, WriterCheckpoint, ChaserCheckpoint, NodePriority, ClusterInfo);
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Election)]
+	public partial class Proposal : Message {
+		public readonly Guid ServerId;
+		public readonly EndPoint ServerHttpEndPoint;
+		public readonly Guid LeaderId;
+		public readonly EndPoint LeaderHttpEndPoint;
+
+		public readonly int View;
+		public readonly int EpochNumber;
+		public readonly long EpochPosition;
+		public readonly Guid EpochId;
+		public readonly Guid EpochLeaderInstanceId;
+		public readonly long LastCommitPosition;
+		public readonly long WriterCheckpoint;
+		public readonly long ChaserCheckpoint;
+		public readonly int NodePriority;
+
+		public Proposal(Guid serverId, EndPoint serverHttpEndPoint, Guid leaderId, EndPoint leaderHttpEndPoint,
+			int view, int epochNumber, long epochPosition, Guid epochId, Guid epochLeaderInstanceId,
+			long lastCommitPosition, long writerCheckpoint, long chaserCheckpoint, int nodePriority) {
+			ServerId = serverId;
+			ServerHttpEndPoint = serverHttpEndPoint;
+			LeaderId = leaderId;
+			LeaderHttpEndPoint = leaderHttpEndPoint;
+			View = view;
+			EpochNumber = epochNumber;
+			EpochPosition = epochPosition;
+			EpochId = epochId;
+			EpochLeaderInstanceId = epochLeaderInstanceId;
+			LastCommitPosition = lastCommitPosition;
+			WriterCheckpoint = writerCheckpoint;
+			ChaserCheckpoint = chaserCheckpoint;
+			NodePriority = nodePriority;
+		}
+
+		public Proposal(ElectionMessageDto.ProposalDto dto) {
+			ServerId = dto.ServerId;
+			ServerHttpEndPoint = new IPEndPoint(IPAddress.Parse(dto.ServerHttpAddress),
+				dto.ServerHttpPort);
+			LeaderId = dto.LeaderId;
+			LeaderHttpEndPoint = new IPEndPoint(IPAddress.Parse(dto.LeaderHttpAddress),
+				dto.LeaderHttpPort);
+			View = dto.View;
+			EpochNumber = dto.EpochNumber;
+			EpochPosition = dto.EpochPosition;
+			EpochId = dto.EpochId;
+			EpochLeaderInstanceId = dto.EpochLeaderInstanceId;
+			LastCommitPosition = dto.LastCommitPosition;
+			WriterCheckpoint = dto.WriterCheckpoint;
+			ChaserCheckpoint = dto.ChaserCheckpoint;
+			NodePriority = dto.NodePriority;
+		}
+
+		public override string ToString() {
+			return string.Format(
+				"---- Proposal: serverId {0}, serverHttp {1}, leaderId {2}, leaderHttp {3}, "
+				+ "view {4}, lastCommitCheckpoint {5}, writerCheckpoint {6}, chaserCheckpoint {7}, epoch {8}@{9}:{10:B} (L={11:B}), NodePriority {12}",
+				ServerId, ServerHttpEndPoint, LeaderId, LeaderHttpEndPoint,
+				View, LastCommitPosition, WriterCheckpoint, ChaserCheckpoint,
+				EpochNumber, EpochPosition, EpochId, EpochLeaderInstanceId, NodePriority);
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Election)]
+	public partial class Accept : Message {
+		public readonly Guid ServerId;
+		public readonly EndPoint ServerHttpEndPoint;
+		public readonly Guid LeaderId;
+		public readonly EndPoint LeaderHttpEndPoint;
+		public readonly int View;
+
+		public Accept(Guid serverId, EndPoint serverHttpEndPoint, Guid leaderId, EndPoint leaderHttpEndPoint,
+			int view) {
+			ServerId = serverId;
+			ServerHttpEndPoint = serverHttpEndPoint;
+			LeaderId = leaderId;
+			LeaderHttpEndPoint = leaderHttpEndPoint;
+
+			View = view;
+		}
+
+		public Accept(ElectionMessageDto.AcceptDto dto) {
+			ServerId = dto.ServerId;
+			ServerHttpEndPoint = new IPEndPoint(IPAddress.Parse(dto.ServerHttpAddress),
+				dto.ServerHttpPort);
+			LeaderId = dto.LeaderId;
+			LeaderHttpEndPoint = new IPEndPoint(IPAddress.Parse(dto.LeaderHttpAddress),
+				dto.LeaderHttpPort);
+			View = dto.View;
+		}
+
+		public override string ToString() {
+			return string.Format(
+				"---- Accept: serverId {0}, serverHttp {1}, leaderId {2}, leaderHttp {3}, view {4}",
+				ServerId, ServerHttpEndPoint, LeaderId, LeaderHttpEndPoint, View);
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Election)]
+	public partial class LeaderIsResigning : Message {
+		public readonly Guid LeaderId;
+		public readonly EndPoint LeaderHttpEndPoint;
+
+		public LeaderIsResigning(Guid leaderId, EndPoint leaderHttpEndPoint) {
+			LeaderId = leaderId;
+			LeaderHttpEndPoint = leaderHttpEndPoint;
+		}
+
+		public LeaderIsResigning(ElectionMessageDto.LeaderIsResigningDto dto) {
+			LeaderId = dto.LeaderId;
+			LeaderHttpEndPoint = new IPEndPoint(IPAddress.Parse(dto.LeaderHttpAddress),
+				dto.LeaderHttpPort);
+		}
+
+		public override string ToString() {
+			return $"---- LeaderIsResigning: serverId {LeaderId}";
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Election)]
+	public partial class LeaderIsResigningOk : Message {
+		public readonly Guid LeaderId;
+		public readonly EndPoint LeaderHttpEndPoint;
+		public readonly Guid ServerId;
+		public readonly EndPoint ServerHttpEndPoint;
+
+		public LeaderIsResigningOk(ElectionMessageDto.LeaderIsResigningOkDto dto) {
+			LeaderId = dto.LeaderId;
+			LeaderHttpEndPoint = new IPEndPoint(IPAddress.Parse(dto.LeaderHttpAddress),
+				dto.LeaderHttpPort);
+			ServerId = dto.ServerId;
+			ServerHttpEndPoint = new IPEndPoint(IPAddress.Parse(dto.ServerHttpAddress),
+				dto.ServerHttpPort);
+		}
+
+		public LeaderIsResigningOk(Guid leaderId, EndPoint leaderHttpEndPoint, Guid serverId, EndPoint serverHttpEndPoint) {
+			LeaderId = leaderId;
+			LeaderHttpEndPoint = leaderHttpEndPoint;
+			ServerId = serverId;
+			ServerHttpEndPoint = serverHttpEndPoint;
+		}
+
+		public override string ToString() {
+			return $"---- LeaderIsResigningOk: serverId {ServerId}";
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Election)]
+	public partial class ElectionsDone : Message {
+		public readonly int InstalledView;
+		public readonly int ProposalNumber;
+		public readonly MemberInfo Leader;
+
+		public ElectionsDone(int installedView, int proposalNumber, MemberInfo leader) {
+			Ensure.Nonnegative(installedView, "installedView");
+			Ensure.NotNull(leader, "leader");
+			InstalledView = installedView;
+			Leader = leader;
+			ProposalNumber = proposalNumber;
+		}
+
+		public override string ToString() {
+			return $"---- ElectionsDone: installedView {InstalledView}, proposal number {ProposalNumber}, leader {Leader}";
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/ElectionMessageDtos.cs b/src/KurrentDB.Core/Messages/ElectionMessageDtos.cs
new file mode 100644
index 00000000000..a8ed8f07746
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/ElectionMessageDtos.cs
@@ -0,0 +1,215 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Cluster;
+
+namespace KurrentDB.Core.Messages;
+
+public static class ElectionMessageDto {
+	public class ViewChangeDto {
+		public Guid ServerId { get; set; }
+		public string ServerHttpAddress { get; set; }
+		public int ServerHttpPort { get; set; }
+
+		public int AttemptedView { get; set; }
+
+		public ViewChangeDto() {
+		}
+
+		public ViewChangeDto(ElectionMessage.ViewChange message) {
+			ServerId = message.ServerId;
+			ServerHttpAddress = message.ServerHttpEndPoint.GetHost();
+			ServerHttpPort = message.ServerHttpEndPoint.GetPort();
+
+			AttemptedView = message.AttemptedView;
+		}
+	}
+
+	public class ViewChangeProofDto {
+		public Guid ServerId { get; set; }
+		public string ServerHttpAddress { get; set; }
+		public int ServerHttpPort { get; set; }
+
+		public int InstalledView { get; set; }
+
+		public ViewChangeProofDto() {
+		}
+
+		public ViewChangeProofDto(ElectionMessage.ViewChangeProof message) {
+			ServerId = message.ServerId;
+			ServerHttpAddress = message.ServerHttpEndPoint.GetHost();
+			ServerHttpPort = message.ServerHttpEndPoint.GetPort();
+
+			InstalledView = message.InstalledView;
+		}
+	}
+
+	public class PrepareDto {
+		public Guid ServerId { get; set; }
+		public string ServerHttpAddress { get; set; }
+		public int ServerHttpPort { get; set; }
+
+		public int View { get; set; }
+
+		public PrepareDto() {
+		}
+
+		public PrepareDto(ElectionMessage.Prepare message) {
+			ServerId = message.ServerId;
+			ServerHttpAddress = message.ServerHttpEndPoint.GetHost();
+			ServerHttpPort = message.ServerHttpEndPoint.GetPort();
+
+			View = message.View;
+		}
+	}
+
+	public class PrepareOkDto {
+		public Guid ServerId { get; set; }
+		public string ServerHttpAddress { get; set; }
+		public int ServerHttpPort { get; set; }
+
+		public int View { get; set; }
+
+		public int EpochNumber { get; set; }
+		public long EpochPosition { get; set; }
+		public Guid EpochId { get; set; }
+		public Guid EpochLeaderInstanceId { get; set; }
+		public long LastCommitPosition { get; set; }
+		public long WriterCheckpoint { get; set; }
+		public long ChaserCheckpoint { get; set; }
+
+		public int NodePriority { get; set; }
+		public ClusterInfo ClusterInfo { get; set; }
+
+		public PrepareOkDto() {
+		}
+
+		public PrepareOkDto(ElectionMessage.PrepareOk message) {
+			ServerId = message.ServerId;
+			ServerHttpAddress = message.ServerHttpEndPoint.GetHost();
+			ServerHttpPort = message.ServerHttpEndPoint.GetPort();
+
+			View = message.View;
+
+			EpochNumber = message.EpochNumber;
+			EpochPosition = message.EpochPosition;
+			EpochId = message.EpochId;
+			EpochLeaderInstanceId = message.EpochLeaderInstanceId;
+			LastCommitPosition = message.LastCommitPosition;
+			WriterCheckpoint = message.WriterCheckpoint;
+			ChaserCheckpoint = message.ChaserCheckpoint;
+
+			NodePriority = message.NodePriority;
+			ClusterInfo = message.ClusterInfo;
+		}
+	}
+
+
+	public class ProposalDto {
+		public Guid ServerId { get; set; }
+		public Guid LeaderId { get; set; }
+
+		public string ServerHttpAddress { get; set; }
+		public int ServerHttpPort { get; set; }
+		public string LeaderHttpAddress { get; set; }
+		public int LeaderHttpPort { get; set; }
+
+		public int View { get; set; }
+
+		public long LastCommitPosition { get; set; }
+		public long WriterCheckpoint { get; set; }
+		public long ChaserCheckpoint { get; set; }
+		public int EpochNumber { get; set; }
+		public long EpochPosition { get; set; }
+		public Guid EpochId { get; set; }
+		public Guid EpochLeaderInstanceId { get; set; }
+		public int NodePriority { get; set; }
+
+		public ProposalDto() {
+		}
+
+		public ProposalDto(ElectionMessage.Proposal message) {
+			ServerId = message.ServerId;
+			LeaderId = message.LeaderId;
+
+			ServerHttpAddress = message.ServerHttpEndPoint.GetHost();
+			ServerHttpPort = message.ServerHttpEndPoint.GetPort();
+			LeaderHttpAddress = message.LeaderHttpEndPoint.GetHost();
+			LeaderHttpPort = message.LeaderHttpEndPoint.GetPort();
+
+			View = message.View;
+			EpochNumber = message.EpochNumber;
+			EpochPosition = message.EpochPosition;
+			EpochId = message.EpochId;
+			EpochLeaderInstanceId = message.EpochLeaderInstanceId;
+			LastCommitPosition = message.LastCommitPosition;
+			WriterCheckpoint = message.WriterCheckpoint;
+			ChaserCheckpoint = message.ChaserCheckpoint;
+			NodePriority = message.NodePriority;
+		}
+	}
+
+
+	public class AcceptDto {
+		public Guid ServerId { get; set; }
+		public Guid LeaderId { get; set; }
+
+		public string ServerHttpAddress { get; set; }
+		public int ServerHttpPort { get; set; }
+		public string LeaderHttpAddress { get; set; }
+		public int LeaderHttpPort { get; set; }
+
+		public int View { get; set; }
+
+		public AcceptDto() {
+		}
+
+		public AcceptDto(ElectionMessage.Accept message) {
+			ServerId = message.ServerId;
+			LeaderId = message.LeaderId;
+
+			ServerHttpAddress = message.ServerHttpEndPoint.GetHost();
+			ServerHttpPort = message.ServerHttpEndPoint.GetPort();
+			LeaderHttpAddress = message.LeaderHttpEndPoint.GetHost();
+			LeaderHttpPort = message.LeaderHttpEndPoint.GetPort();
+
+			View = message.View;
+		}
+	}
+
+	public class LeaderIsResigningDto {
+		public Guid LeaderId { get; set; }
+		public string LeaderHttpAddress { get; set; }
+		public int LeaderHttpPort { get; set; }
+		public LeaderIsResigningDto() {
+		}
+
+		public LeaderIsResigningDto(ElectionMessage.LeaderIsResigning message) {
+			LeaderId = message.LeaderId;
+			LeaderHttpAddress = message.LeaderHttpEndPoint.GetHost();
+			LeaderHttpPort = message.LeaderHttpEndPoint.GetPort();
+		}
+	}
+
+	public class LeaderIsResigningOkDto {
+		public Guid LeaderId { get; set; }
+		public string LeaderHttpAddress { get; set; }
+		public int LeaderHttpPort { get; set; }
+		public Guid ServerId { get; set; }
+		public string ServerHttpAddress { get; set; }
+		public int ServerHttpPort { get; set; }
+		public LeaderIsResigningOkDto() {
+		}
+
+		public LeaderIsResigningOkDto(ElectionMessage.LeaderIsResigningOk message) {
+			ServerId = message.ServerId;
+			ServerHttpAddress = message.ServerHttpEndPoint.GetHost();
+			ServerHttpPort = message.ServerHttpEndPoint.GetPort();
+			LeaderId = message.LeaderId;
+			LeaderHttpAddress = message.LeaderHttpEndPoint.GetHost();
+			LeaderHttpPort = message.LeaderHttpEndPoint.GetPort();
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/GossipMessage.cs b/src/KurrentDB.Core/Messages/GossipMessage.cs
new file mode 100644
index 00000000000..d02ddf0d254
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/GossipMessage.cs
@@ -0,0 +1,148 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Messages;
+
+public static partial class GossipMessage {
+	[DerivedMessage(CoreMessage.Gossip)]
+	public partial class RetrieveGossipSeedSources : Message {
+	}
+
+	[DerivedMessage(CoreMessage.Gossip)]
+	public partial class GotGossipSeedSources : Message {
+		public readonly EndPoint[] GossipSeeds;
+
+		public GotGossipSeedSources(EndPoint[] gossipSeeds) {
+			GossipSeeds = gossipSeeds;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Gossip)]
+	public partial class Gossip : Message {
+		public readonly int GossipRound;
+
+		public Gossip(int gossipRound) {
+			GossipRound = gossipRound;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Gossip)]
+	public partial class GossipReceived : Message {
+		public readonly IEnvelope Envelope;
+		public readonly ClusterInfo ClusterInfo;
+		public readonly EndPoint Server;
+
+		public GossipReceived(IEnvelope envelope, ClusterInfo clusterInfo, EndPoint server) {
+			Envelope = envelope;
+			ClusterInfo = clusterInfo;
+			Server = server;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Gossip)]
+	public partial class ReadGossip : Message {
+		public readonly IEnvelope Envelope;
+
+		public ReadGossip(IEnvelope envelope) {
+			Envelope = envelope;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Gossip)]
+	public partial class SendGossip : Message {
+		public readonly ClusterInfo ClusterInfo;
+		public readonly EndPoint ServerEndPoint;
+
+		public SendGossip(ClusterInfo clusterInfo, EndPoint serverEndPoint) {
+			ClusterInfo = clusterInfo;
+			ServerEndPoint = serverEndPoint;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Gossip)]
+	public partial class ClientGossip : Message {
+		public readonly IEnvelope Envelope;
+
+		public ClientGossip(IEnvelope envelope) {
+			Envelope = envelope;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Gossip)]
+	public partial class SendClientGossip : Message {
+		public readonly ClientClusterInfo ClusterInfo;
+
+		public SendClientGossip(ClientClusterInfo clusterInfo) {
+			ClusterInfo = clusterInfo;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Gossip)]
+	public partial class GossipUpdated : Message {
+		public readonly ClusterInfo ClusterInfo;
+
+		public GossipUpdated(ClusterInfo clusterInfo) {
+			ClusterInfo = clusterInfo;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Gossip)]
+	public partial class GossipSendFailed : Message {
+		public readonly string Reason;
+		public readonly EndPoint Recipient;
+
+		public GossipSendFailed(string reason, EndPoint recipient) {
+			Reason = reason;
+			Recipient = recipient;
+		}
+
+		public override string ToString() {
+			return String.Format("Reason: {0}, Recipient: {1}", Reason, Recipient);
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Gossip)]
+	public partial class GetGossip : Message {
+		public GetGossip() { }
+	}
+
+	[DerivedMessage(CoreMessage.Gossip)]
+	public partial class GetGossipFailed : Message {
+		public readonly string Reason;
+		public readonly EndPoint Recipient;
+
+		public GetGossipFailed(string reason, EndPoint recipient) {
+			Reason = reason;
+			Recipient = recipient;
+		}
+
+		public override string ToString() {
+			return String.Format("Reason: {0}, Recipient: {1}", Reason, Recipient);
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Gossip)]
+	public partial class GetGossipReceived : Message {
+		public readonly ClusterInfo ClusterInfo;
+		public readonly EndPoint Server;
+
+		public GetGossipReceived(ClusterInfo clusterInfo, EndPoint server) {
+			ClusterInfo = clusterInfo;
+			Server = server;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Gossip)]
+	public partial class UpdateNodePriority : Message {
+		public readonly int NodePriority;
+
+		public UpdateNodePriority(int priority) {
+			NodePriority = priority;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/GrpcMessage.cs b/src/KurrentDB.Core/Messages/GrpcMessage.cs
new file mode 100644
index 00000000000..b866fbef84b
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/GrpcMessage.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Messages;
+
+public static partial class GrpcMessage {
+	[DerivedMessage(CoreMessage.Grpc)]
+	public partial class SendOverGrpc : Message {
+
+		public readonly EndPoint DestinationEndpoint;
+		public readonly Message Message;
+		public readonly DateTime LiveUntil;
+
+		public SendOverGrpc(EndPoint destinationEndpoint, Message message, DateTime liveUntil) {
+			DestinationEndpoint = destinationEndpoint;
+			Message = message;
+			LiveUntil = liveUntil;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/HttpClientMessageDto.cs b/src/KurrentDB.Core/Messages/HttpClientMessageDto.cs
new file mode 100644
index 00000000000..436c92ea361
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/HttpClientMessageDto.cs
@@ -0,0 +1,104 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Xml.Serialization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+
+namespace KurrentDB.Core.Messages;
+
+public static class HttpClientMessageDto {
+	public class ClientEventDynamic {
+		public Guid eventId { get; set; }
+		public string eventType { get; set; }
+
+		public object data { get; set; }
+		public object metadata { get; set; }
+	}
+
+	public class WriteEventsDynamic {
+		public ClientEventDynamic[] events { get; set; }
+
+		public WriteEventsDynamic() {
+		}
+
+		public WriteEventsDynamic(ClientEventDynamic[] events) {
+			this.events = events;
+		}
+	}
+
+	[XmlType(TypeName = "event")]
+	public class ClientEventText {
+		public Guid eventId { get; set; }
+		public string eventType { get; set; }
+
+		public string data { get; set; }
+		public string metadata { get; set; }
+
+		public ClientEventText() {
+		}
+
+		public ClientEventText(Guid eventId, string eventType, string data, string metadata) {
+			Ensure.NotEmptyGuid(eventId, "eventId");
+			Ensure.NotNull(data, "data");
+
+			this.eventId = eventId;
+			this.eventType = eventType;
+
+			this.data = data;
+			this.metadata = metadata;
+		}
+
+		public ClientEventText(Guid eventId, string eventType, ReadOnlyMemory<byte> data, ReadOnlyMemory<byte> metadata) {
+			Ensure.NotEmptyGuid(eventId, "eventId");
+
+			this.eventId = eventId;
+			this.eventType = eventType;
+
+			this.data = Helper.UTF8NoBom.GetString(data.Span);
+			this.metadata = Helper.UTF8NoBom.GetString(metadata.Span);
+		}
+	}
+
+	[XmlRoot(ElementName = "event")]
+	public class ReadEventCompletedText {
+		public string eventStreamId { get; set; }
+		public long eventNumber { get; set; }
+		public string eventType { get; set; }
+		public string eventId { get; set; }
+		public object data { get; set; }
+		public object metadata { get; set; }
+
+		public ReadEventCompletedText() {
+		}
+
+		public ReadEventCompletedText(ResolvedEvent evnt) {
+			if (evnt.Event != null) {
+				eventStreamId = evnt.Event.EventStreamId;
+				eventNumber = evnt.Event.EventNumber;
+				eventType = evnt.Event.EventType;
+				eventId = evnt.Event.EventId.ToString();
+				data = Helper.UTF8NoBom.GetString(evnt.Event.Data.Span);
+				metadata = Helper.UTF8NoBom.GetString(evnt.Event.Metadata.Span);
+			} else {
+				eventStreamId = null;
+				eventNumber = EventNumber.Invalid;
+				eventType = null;
+				data = null;
+				metadata = null;
+			}
+		}
+
+		public override string ToString() {
+			return string.Format(
+				"id: {5} eventStreamId: {0}, eventNumber: {1}, eventType: {2}, data: {3}, metadata: {4}",
+				eventStreamId,
+				eventNumber,
+				eventType,
+				data,
+				metadata,
+				eventId);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/HttpMessage.cs b/src/KurrentDB.Core/Messages/HttpMessage.cs
new file mode 100644
index 00000000000..c3c7ede59a8
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/HttpMessage.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Http;
+using KurrentDB.Transport.Http.EntityManagement;
+
+namespace KurrentDB.Core.Messages;
+
+public enum DenialReason {
+	ServerTooBusy
+}
+
+public static partial class HttpMessage {
+	[DerivedMessage]
+	public abstract partial class HttpSendMessage : Message, IQueueAffineMessage {
+		public int QueueId {
+			get { return HttpEntityManager.GetHashCode(); }
+		}
+
+		public readonly IEnvelope Envelope;
+		public readonly Guid CorrelationId;
+		public readonly HttpEntityManager HttpEntityManager;
+
+		/// <param name="correlationId"></param>
+		/// <param name="envelope">non-null envelope requests HttpCompleted messages in response</param>
+		/// <param name="httpEntityManager"></param>
+		protected HttpSendMessage(Guid correlationId, IEnvelope envelope, HttpEntityManager httpEntityManager) {
+			CorrelationId = correlationId;
+			Envelope = envelope;
+			HttpEntityManager = httpEntityManager;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Http)]
+	public partial class HttpSend : HttpSendMessage {
+		public readonly object Data;
+		public readonly ResponseConfiguration Configuration;
+		public readonly Message Message;
+
+		public HttpSend(
+			HttpEntityManager httpEntityManager, ResponseConfiguration configuration, object data, Message message)
+			: base(Guid.Empty, null, httpEntityManager) {
+			Data = data;
+			Configuration = configuration;
+			Message = message;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Http)]
+	public partial class DeniedToHandle : Message {
+		public readonly DenialReason Reason;
+		public readonly string Details;
+
+		public DeniedToHandle(DenialReason reason, string details) {
+			Reason = reason;
+			Details = details;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Http)]
+	public partial class PurgeTimedOutRequests : Message {
+	}
+
+	[DerivedMessage(CoreMessage.Http)]
+	public partial class TextMessage : Message {
+		public string Text { get; set; }
+
+		public TextMessage() {
+		}
+
+		public TextMessage(string text) {
+			Text = text;
+		}
+
+		public override string ToString() {
+			return string.Format("Text: {0}", Text);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/IQueueAffineMessage.cs b/src/KurrentDB.Core/Messages/IQueueAffineMessage.cs
new file mode 100644
index 00000000000..c4f5e916041
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/IQueueAffineMessage.cs
@@ -0,0 +1,8 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Messages;
+
+public interface IQueueAffineMessage {
+	int QueueId { get; }
+}
diff --git a/src/KurrentDB.Core/Messages/InternalAuthenticationProviderMessages.cs b/src/KurrentDB.Core/Messages/InternalAuthenticationProviderMessages.cs
new file mode 100644
index 00000000000..83ecacfb47e
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/InternalAuthenticationProviderMessages.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Messages;
+
+public static partial class InternalAuthenticationProviderMessages {
+	[DerivedMessage(CoreMessage.Authentication)]
+	public sealed partial class ResetPasswordCache : Message {
+		public readonly string LoginName;
+
+		public ResetPasswordCache(string loginName) {
+			LoginName = loginName;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/LeaderDiscoveryMessage.cs b/src/KurrentDB.Core/Messages/LeaderDiscoveryMessage.cs
new file mode 100644
index 00000000000..70376c8de14
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/LeaderDiscoveryMessage.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Messages;
+
+public static partial class LeaderDiscoveryMessage {
+	[DerivedMessage(CoreMessage.LeaderDiscovery)]
+	public partial class LeaderFound : Message {
+		public readonly MemberInfo Leader;
+
+		public LeaderFound(MemberInfo leader) {
+			Ensure.NotNull(leader, "leader");
+			Leader = leader;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.LeaderDiscovery)]
+	public partial class DiscoveryTimeout : Message {
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/MemberInfoDto.cs b/src/KurrentDB.Core/Messages/MemberInfoDto.cs
new file mode 100644
index 00000000000..35545e40ec7
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/MemberInfoDto.cs
@@ -0,0 +1,93 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+
+namespace KurrentDB.Core.Messages;
+
+public class MemberInfoDto {
+	public Guid InstanceId { get; set; }
+
+	public DateTime TimeStamp { get; set; }
+	public VNodeState State { get; set; }
+	public bool IsAlive { get; set; }
+
+	public string InternalTcpIp { get; set; }
+	public int InternalTcpPort { get; set; }
+	public int InternalSecureTcpPort { get; set; }
+
+	public string ExternalTcpIp { get; set; }
+	public int ExternalTcpPort { get; set; }
+	public int ExternalSecureTcpPort { get; set; }
+
+	public string HttpEndPointIp { get; set; }
+	public int HttpEndPointPort { get; set; }
+	public string AdvertiseHostToClientAs { get; set; }
+	public int AdvertiseHttpPortToClientAs { get; set; }
+	public int AdvertiseTcpPortToClientAs { get; set; }
+
+	public long LastCommitPosition { get; set; }
+	public long WriterCheckpoint { get; set; }
+	public long ChaserCheckpoint { get; set; }
+
+	public long EpochPosition { get; set; }
+	public int EpochNumber { get; set; }
+	public Guid EpochId { get; set; }
+
+	public int NodePriority { get; set; }
+	public bool IsReadOnlyReplica { get; set; }
+
+	public MemberInfoDto() {
+	}
+
+	public MemberInfoDto(MemberInfo member) {
+		InstanceId = member.InstanceId;
+
+		TimeStamp = member.TimeStamp;
+		State = member.State;
+		IsAlive = member.IsAlive;
+
+		InternalTcpIp = member.InternalTcpEndPoint?.GetHost() ?? member.InternalSecureTcpEndPoint?.GetHost();
+		InternalTcpPort = member.InternalTcpEndPoint == null ? 0 : member.InternalTcpEndPoint.GetPort();
+		InternalSecureTcpPort =
+			member.InternalSecureTcpEndPoint == null ? 0 : member.InternalSecureTcpEndPoint.GetPort();
+
+		ExternalTcpIp = member.ExternalTcpEndPoint?.GetHost() ?? member.ExternalSecureTcpEndPoint?.GetHost();
+		ExternalTcpPort = member.ExternalTcpEndPoint == null ? 0 : member.ExternalTcpEndPoint.GetPort();
+		ExternalSecureTcpPort =
+			member.ExternalSecureTcpEndPoint == null ? 0 : member.ExternalSecureTcpEndPoint.GetPort();
+
+		HttpEndPointIp = member.HttpEndPoint.GetHost();
+		HttpEndPointPort = member.HttpEndPoint.GetPort();
+		AdvertiseHostToClientAs = member.AdvertiseHostToClientAs;
+		AdvertiseHttpPortToClientAs = member.AdvertiseHttpPortToClientAs;
+		AdvertiseTcpPortToClientAs = member.AdvertiseTcpPortToClientAs;
+
+		LastCommitPosition = member.LastCommitPosition;
+		WriterCheckpoint = member.WriterCheckpoint;
+		ChaserCheckpoint = member.ChaserCheckpoint;
+
+		EpochPosition = member.EpochPosition;
+		EpochNumber = member.EpochNumber;
+		EpochId = member.EpochId;
+
+		NodePriority = member.NodePriority;
+		IsReadOnlyReplica = member.IsReadOnlyReplica;
+	}
+
+	public override string ToString() {
+		return
+			$"InstanceId: {InstanceId:B}, TimeStamp: {TimeStamp:yyyy-MM-dd HH:mm:ss.fff}, State: {State}, IsAlive: {IsAlive}, " +
+			$"InternalTcpIp: {InternalTcpIp}, InternalTcpPort: {InternalTcpPort}, InternalSecureTcpPort: {InternalSecureTcpPort}, " +
+			$"ExternalTcpIp: {ExternalTcpIp}, ExternalTcpPort: {ExternalTcpPort}, ExternalSecureTcpPort: {ExternalSecureTcpPort}, " +
+			$"HttpEndPointIp: {HttpEndPointIp}, HttpEndPointPort: {HttpEndPointPort}, " +
+			$"{nameof(AdvertiseHostToClientAs)}: {AdvertiseHostToClientAs}, {nameof(AdvertiseHttpPortToClientAs)}: {AdvertiseHttpPortToClientAs}, " +
+			$"{nameof(AdvertiseTcpPortToClientAs)}: {AdvertiseTcpPortToClientAs}, " +
+			$"LastCommitPosition: {LastCommitPosition}, WriterCheckpoint: {WriterCheckpoint}, ChaserCheckpoint: {ChaserCheckpoint}, " +
+			$"EpochPosition: {EpochPosition}, EpochNumber: {EpochNumber}, EpochId: {EpochId:B}, NodePriority: {NodePriority}, " +
+			$"IsReadOnlyReplica: {IsReadOnlyReplica}";
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/MergeIndexesResultDto.cs b/src/KurrentDB.Core/Messages/MergeIndexesResultDto.cs
new file mode 100644
index 00000000000..ad2401c9bbf
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/MergeIndexesResultDto.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Messages;
+
+public class MergeIndexesResultDto {
+	public string MergeIndexesId { get; set; }
+
+	public MergeIndexesResultDto() {
+	}
+
+	public MergeIndexesResultDto(string mergeIndexesId) {
+		MergeIndexesId = mergeIndexesId;
+	}
+	public override string ToString() => $"MergeIndexesId: {MergeIndexesId}";
+}
diff --git a/src/KurrentDB.Core/Messages/MonitoringMessage.cs b/src/KurrentDB.Core/Messages/MonitoringMessage.cs
new file mode 100644
index 00000000000..1ecffe3e381
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/MonitoringMessage.cs
@@ -0,0 +1,248 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.PersistentSubscription;
+
+namespace KurrentDB.Core.Messages;
+
+public static partial class MonitoringMessage {
+	[DerivedMessage(CoreMessage.Monitoring)]
+	public partial class GetAllPersistentSubscriptionStats : Message {
+		public readonly IEnvelope Envelope;
+		public readonly int Offset;
+		public readonly int Count;
+
+		public GetAllPersistentSubscriptionStats(IEnvelope envelope) {
+			Ensure.NotNull(envelope, "envelope");
+			Envelope = envelope;
+			Offset = 0;
+			Count = int.MaxValue;
+		}
+
+		public GetAllPersistentSubscriptionStats(IEnvelope envelope, int offset, int count) {
+			Ensure.NotNull(envelope, "envelope");
+			Envelope = envelope;
+			Offset = offset;
+			Count = count;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Monitoring)]
+	public partial class GetPersistentSubscriptionStats : Message {
+		public string EventStreamId {
+			get { return _eventStreamId; }
+		}
+
+		public string GroupName {
+			get { return _groupName; }
+		}
+
+		public readonly IEnvelope Envelope;
+		private readonly string _eventStreamId;
+		private readonly string _groupName;
+
+		public GetPersistentSubscriptionStats(IEnvelope envelope, string eventStreamId, string groupName) {
+			Ensure.NotNull(envelope, "envelope");
+			Envelope = envelope;
+			_eventStreamId = eventStreamId;
+			_groupName = groupName;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Monitoring)]
+	public partial class GetStreamPersistentSubscriptionStats : Message {
+		public string EventStreamId {
+			get { return _eventStreamId; }
+		}
+
+		public readonly IEnvelope Envelope;
+		private readonly string _eventStreamId;
+
+		public GetStreamPersistentSubscriptionStats(IEnvelope envelope, string eventStreamId) {
+			Ensure.NotNull(envelope, "envelope");
+			Envelope = envelope;
+			_eventStreamId = eventStreamId;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Monitoring)]
+	public partial class GetPersistentSubscriptionStatsCompleted : Message {
+		public readonly OperationStatus Result;
+		public readonly List<PersistentSubscriptionInfo> SubscriptionStats;
+		public string ErrorString;
+		public readonly int RequestedOffset;
+		public readonly int RequestedCount;
+		public readonly int Total;
+
+		public GetPersistentSubscriptionStatsCompleted(OperationStatus result,
+			List<PersistentSubscriptionInfo> subscriptionStats, string errorString = "") {
+			Result = result;
+			SubscriptionStats = subscriptionStats;
+			ErrorString = errorString;
+		}
+
+		public GetPersistentSubscriptionStatsCompleted(OperationStatus result,
+			List<PersistentSubscriptionInfo> subscriptionStats, int requestedOffset, int requestedCount, int total, string errorString = "") {
+			Result = result;
+			SubscriptionStats = subscriptionStats;
+			ErrorString = errorString;
+			RequestedOffset = requestedOffset;
+			RequestedCount = requestedCount;
+			Total = total;
+		}
+
+		public enum OperationStatus {
+			Success = 0,
+			NotFound = 1,
+			Fail = 2,
+			NotReady = 3
+		}
+	}
+
+	public class PersistentSubscriptionInfo {
+		public string EventSource { get; set; }
+		public string GroupName { get; set; }
+		public string Status { get; set; }
+		public List<ConnectionInfo> Connections { get; set; }
+		public int AveragePerSecond { get; set; }
+		public long TotalItems { get; set; }
+		public long CountSinceLastMeasurement { get; set; }
+		public string LastCheckpointedEventPosition { get; set; }
+		public string LastKnownEventPosition { get; set; }
+		public bool ResolveLinktos { get; set; }
+		public string StartFrom { get; set; }
+		public int MessageTimeoutMilliseconds { get; set; }
+		public bool ExtraStatistics { get; set; }
+		public int MaxRetryCount { get; set; }
+		public int LiveBufferSize { get; set; }
+		public int BufferSize { get; set; }
+		public int ReadBatchSize { get; set; }
+		public int CheckPointAfterMilliseconds { get; set; }
+		public int MinCheckPointCount { get; set; }
+		public int MaxCheckPointCount { get; set; }
+		public int ReadBufferCount { get; set; }
+		public long LiveBufferCount { get; set; }
+		public int RetryBufferCount { get; set; }
+		public int TotalInFlightMessages { get; set; }
+		public int OutstandingMessagesCount { get; set; }
+		public string NamedConsumerStrategy { get; set; }
+		public int MaxSubscriberCount { get; set; }
+		public long ParkedMessageCount { get; set; }
+		public long OldestParkedMessage { get; set; }
+	}
+
+	public class ConnectionInfo {
+		public string From { get; set; }
+		public string Username { get; set; }
+		public int AverageItemsPerSecond { get; set; }
+		public long TotalItems { get; set; }
+		public long CountSinceLastMeasurement { get; set; }
+		public List<Measurement> ObservedMeasurements { get; set; }
+		public int AvailableSlots { get; set; }
+		public int InFlightMessages { get; set; }
+		public string ConnectionName { get; set; }
+	}
+
+	[DerivedMessage(CoreMessage.Monitoring)]
+	public partial class GetFreshStats : Message {
+		public readonly IEnvelope Envelope;
+		public readonly Func<Dictionary<string, object>, Dictionary<string, object>> StatsSelector;
+		public readonly bool UseMetadata;
+		public readonly bool UseGrouping;
+
+		public GetFreshStats(IEnvelope envelope,
+			Func<Dictionary<string, object>, Dictionary<string, object>> statsSelector,
+			bool useMetadata,
+			bool useGrouping) {
+			Ensure.NotNull(envelope, "envelope");
+			Ensure.NotNull(statsSelector, "statsSelector");
+
+			Envelope = envelope;
+			StatsSelector = statsSelector;
+			UseMetadata = useMetadata;
+			UseGrouping = useGrouping;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Monitoring)]
+	public partial class GetFreshStatsCompleted : Message {
+		public readonly bool Success;
+		public readonly Dictionary<string, object> Stats;
+
+		public GetFreshStatsCompleted(bool success, Dictionary<string, object> stats) {
+			Success = success;
+			Stats = stats;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Monitoring)]
+	public partial class GetFreshTcpConnectionStats : Message {
+		public readonly IEnvelope Envelope;
+
+		public GetFreshTcpConnectionStats(IEnvelope envelope) {
+			Ensure.NotNull(envelope, "envelope");
+
+			Envelope = envelope;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Monitoring)]
+	public partial class GetFreshTcpConnectionStatsCompleted : Message {
+		public readonly List<TcpConnectionStats> ConnectionStats;
+
+		public GetFreshTcpConnectionStatsCompleted(List<TcpConnectionStats> connectionStats) {
+			ConnectionStats = connectionStats;
+		}
+	}
+
+	public class TcpConnectionStats {
+		public string RemoteEndPoint { get; set; }
+		public string LocalEndPoint { get; set; }
+		public string ClientConnectionName { get; set; }
+		public Guid ConnectionId { get; set; }
+		public long TotalBytesSent { get; set; }
+		public long TotalBytesReceived { get; set; }
+		public int PendingSendBytes { get; set; }
+		public int PendingReceivedBytes { get; set; }
+		public bool IsExternalConnection { get; set; }
+		public bool IsSslConnection { get; set; }
+	}
+
+	[DerivedMessage(CoreMessage.Monitoring)]
+	public partial class InternalStatsRequest : Message {
+		public readonly IEnvelope Envelope;
+
+		public InternalStatsRequest(IEnvelope envelope) {
+			Ensure.NotNull(envelope, "envelope");
+
+			Envelope = envelope;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Monitoring)]
+	public partial class InternalStatsRequestResponse : Message {
+		public readonly Dictionary<string, object> Stats;
+
+		public InternalStatsRequestResponse(Dictionary<string, object> stats) {
+			Ensure.NotNull(stats, "stats");
+
+			Stats = stats;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Misc)]
+	public partial class DynamicCacheManagerTick : Message {
+	}
+
+	[DerivedMessage(CoreMessage.Misc)]
+	public partial class CheckCertificateExpiry : Message {
+	}
+
+	[DerivedMessage(CoreMessage.Misc)]
+	public partial class CheckEsVersion : Message {
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/RedactionMessage.cs b/src/KurrentDB.Core/Messages/RedactionMessage.cs
new file mode 100644
index 00000000000..f4bd78d00cd
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/RedactionMessage.cs
@@ -0,0 +1,112 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data.Redaction;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Messages;
+
+public static partial class RedactionMessage {
+	[DerivedMessage(CoreMessage.Redaction)]
+	public partial class GetEventPosition : Message {
+		public IEnvelope Envelope { get; }
+		public string EventStreamId { get; }
+		public long EventNumber { get; }
+
+		public GetEventPosition(IEnvelope envelope, string eventStreamId, long eventNumber) {
+			Ensure.NotNull(envelope, nameof(envelope));
+			Ensure.NotNullOrEmpty(eventStreamId, nameof(eventStreamId));
+			Ensure.Nonnegative(eventNumber, nameof(eventNumber));
+
+			Envelope = envelope;
+			EventStreamId = eventStreamId;
+			EventNumber = eventNumber;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Redaction)]
+	public partial class GetEventPositionCompleted : Message {
+		public GetEventPositionResult Result { get; }
+		public EventPosition[] EventPositions { get; }
+
+		public GetEventPositionCompleted(GetEventPositionResult result, EventPosition[] eventPositions) {
+			Ensure.NotNull(eventPositions, nameof(eventPositions));
+
+			Result = result;
+			EventPositions = eventPositions;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Redaction)]
+	public partial class AcquireChunksLock : Message {
+		public IEnvelope Envelope { get; }
+
+		public AcquireChunksLock(IEnvelope envelope) {
+			Envelope = envelope;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Redaction)]
+	public partial class AcquireChunksLockCompleted : Message {
+		public AcquireChunksLockResult Result { get; }
+		public Guid AcquisitionId { get; }
+
+		public AcquireChunksLockCompleted(AcquireChunksLockResult result, Guid acquisitionId) {
+			Result = result;
+			AcquisitionId = acquisitionId;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Redaction)]
+	public partial class SwitchChunk : Message {
+		public IEnvelope Envelope { get; }
+		public Guid AcquisitionId { get; }
+		public string TargetChunkFile { get; }
+		public string NewChunkFile { get; }
+
+		public SwitchChunk(IEnvelope envelope, Guid acquisitionId, string targetChunkFile, string newChunkFile) {
+			Ensure.NotNull(envelope, nameof(envelope));
+			Ensure.NotEmptyGuid(acquisitionId, nameof(acquisitionId));
+			Ensure.NotNullOrEmpty(targetChunkFile, nameof(targetChunkFile));
+			Ensure.NotNullOrEmpty(newChunkFile, nameof(newChunkFile));
+
+			Envelope = envelope;
+			AcquisitionId = acquisitionId;
+			TargetChunkFile = targetChunkFile;
+			NewChunkFile = newChunkFile;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Redaction)]
+	public partial class SwitchChunkCompleted : Message {
+		public SwitchChunkResult Result { get; }
+
+		public SwitchChunkCompleted(SwitchChunkResult result) {
+			Result = result;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Redaction)]
+	public partial class ReleaseChunksLock : Message {
+		public IEnvelope Envelope { get; }
+		public Guid AcquisitionId { get; }
+
+		public ReleaseChunksLock(IEnvelope envelope, Guid acquisitionId) {
+			Ensure.NotNull(envelope, nameof(envelope));
+			Ensure.NotEmptyGuid(acquisitionId, nameof(acquisitionId));
+			Envelope = envelope;
+			AcquisitionId = acquisitionId;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Redaction)]
+	public partial class ReleaseChunksLockCompleted : Message {
+		public ReleaseChunksLockResult Result { get; }
+
+		public ReleaseChunksLockCompleted(ReleaseChunksLockResult result) {
+			Result = result;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/ReplicationMessage.cs b/src/KurrentDB.Core/Messages/ReplicationMessage.cs
new file mode 100644
index 00000000000..e838feb140e
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/ReplicationMessage.cs
@@ -0,0 +1,503 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using EndPoint = System.Net.EndPoint;
+
+namespace KurrentDB.Core.Messages;
+
+public static partial class ReplicationMessage {
+	[DerivedMessage(CoreMessage.Replication)]
+	public partial class SubscribeReplica : Message {
+		public readonly int Version;
+		public readonly long LogPosition;
+		public readonly Guid ChunkId;
+		public readonly IReadOnlyList<EpochRecord> LastEpochs;
+		public readonly EndPoint ReplicaEndPoint;
+		public readonly Guid LeaderId;
+		public readonly Guid SubscriptionId;
+		public readonly bool IsPromotable;
+
+		public SubscribeReplica(
+			int version,
+			long logPosition, Guid chunkId, IReadOnlyList<EpochRecord> lastEpochs,
+			EndPoint replicaEndPoint,
+			Guid leaderId, Guid subscriptionId, bool isPromotable) {
+
+			Ensure.Nonnegative(version, "version");
+			Ensure.Nonnegative(logPosition, "logPosition");
+			Ensure.NotNull(lastEpochs, "lastEpochs");
+			Ensure.NotEmptyGuid(leaderId, "leaderId");
+			Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
+			Ensure.NotNull(replicaEndPoint, "replicaEndPoint");
+
+			Version = version;
+			LogPosition = logPosition;
+			ChunkId = chunkId;
+			LastEpochs = lastEpochs;
+			ReplicaEndPoint = replicaEndPoint;
+			LeaderId = leaderId;
+			SubscriptionId = subscriptionId;
+			IsPromotable = isPromotable;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Replication)]
+	public partial class AckLogPosition : Message {
+		public readonly Guid SubscriptionId;
+
+		// where the replication subscription is up to.
+		// used for managing the subscription
+		public readonly long ReplicationLogPosition;
+
+		// where we are up to writing data to the log.
+		// can be behind ReplicationLogPosition.
+		// used for determining what has been replicated
+		public readonly long WriterLogPosition;
+
+		public AckLogPosition(
+			Guid subscriptionId,
+			long replicationLogPosition,
+			long writerLogPosition) {
+
+			Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
+			SubscriptionId = subscriptionId;
+			ReplicationLogPosition = replicationLogPosition;
+			WriterLogPosition = writerLogPosition;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Replication)]
+	public partial class ReplicaLogPositionAck : Message {
+		public readonly Guid SubscriptionId;
+		public readonly long ReplicationLogPosition;
+		public readonly long WriterLogPosition;
+
+		public ReplicaLogPositionAck(
+			Guid subscriptionId,
+			long replicationLogPosition,
+			long writerLogPosition) {
+
+			Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
+
+			SubscriptionId = subscriptionId;
+			ReplicationLogPosition = replicationLogPosition;
+			WriterLogPosition = writerLogPosition;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Replication)]
+	public partial class ReplicaSubscriptionRequest : Message {
+		public readonly Guid CorrelationId;
+		public readonly IEnvelope Envelope;
+		public readonly TcpConnectionManager Connection;
+
+		public readonly int Version;
+		public readonly long LogPosition;
+		public readonly Guid ChunkId;
+		public readonly Epoch[] LastEpochs;
+		public readonly EndPoint ReplicaEndPoint;
+		public readonly Guid LeaderId;
+		public readonly Guid SubscriptionId;
+		public readonly bool IsPromotable;
+
+		public ReplicaSubscriptionRequest(Guid correlationId,
+			IEnvelope envelope,
+			TcpConnectionManager connection,
+			int version,
+			long logPosition,
+			Guid chunkId,
+			Epoch[] lastEpochs,
+			EndPoint replicaEndPoint,
+			Guid leaderId,
+			Guid subscriptionId,
+			bool isPromotable) {
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			Ensure.NotNull(envelope, "envelope");
+			Ensure.NotNull(connection, "connection");
+			Ensure.Nonnegative(version, "version");
+			Ensure.Nonnegative(logPosition, "logPosition");
+			Ensure.NotNull(lastEpochs, "lastEpochs");
+			Ensure.NotNull(replicaEndPoint, "ReplicaEndPoint");
+			Ensure.NotEmptyGuid(leaderId, "leaderId");
+			Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
+
+			Version = version;
+			CorrelationId = correlationId;
+			Envelope = envelope;
+			Connection = connection;
+			LogPosition = logPosition;
+			ChunkId = chunkId;
+			LastEpochs = lastEpochs;
+			ReplicaEndPoint = replicaEndPoint;
+			LeaderId = leaderId;
+			SubscriptionId = subscriptionId;
+			IsPromotable = isPromotable;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Replication)]
+	public partial class ReconnectToLeader : Message {
+		public readonly MemberInfo Leader;
+		public readonly Guid ConnectionCorrelationId;
+
+		public ReconnectToLeader(Guid connectionCorrelationId, MemberInfo leader) {
+			Ensure.NotEmptyGuid(connectionCorrelationId, nameof(connectionCorrelationId));
+			Ensure.NotNull(leader, nameof(leader));
+			ConnectionCorrelationId = connectionCorrelationId;
+			Leader = leader;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Replication)]
+	public partial class LeaderConnectionFailed : Message {
+		public readonly MemberInfo Leader;
+		public readonly Guid LeaderConnectionCorrelationId;
+
+		public LeaderConnectionFailed(Guid leaderConnectionCorrelationId, MemberInfo leader) {
+			Ensure.NotEmptyGuid(leaderConnectionCorrelationId, nameof(leaderConnectionCorrelationId));
+			Ensure.NotNull(leader, nameof(leader));
+			LeaderConnectionCorrelationId = leaderConnectionCorrelationId;
+			Leader = leader;
+		}
+	}
+
+	public interface IReplicationMessage {
+		Guid LeaderId { get; }
+		Guid SubscriptionId { get; }
+	}
+
+	[DerivedMessage(CoreMessage.Replication)]
+	public partial class SubscribeToLeader : Message, IReplicationMessage {
+		Guid IReplicationMessage.LeaderId {
+			get { return LeaderId; }
+		}
+
+		Guid IReplicationMessage.SubscriptionId {
+			get { return SubscriptionId; }
+		}
+
+		public readonly Guid StateCorrelationId;
+		public readonly Guid LeaderId;
+		public readonly Guid SubscriptionId;
+
+		public SubscribeToLeader(Guid stateCorrelationId, Guid leaderId, Guid subscriptionId) {
+			Ensure.NotEmptyGuid(stateCorrelationId, "stateCorrelationId");
+			Ensure.NotEmptyGuid(leaderId, "leaderId");
+			Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
+
+			StateCorrelationId = stateCorrelationId;
+			LeaderId = leaderId;
+			SubscriptionId = subscriptionId;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Replication)]
+	public partial class ReplicaSubscriptionRetry : Message, IReplicationMessage {
+		Guid IReplicationMessage.LeaderId {
+			get { return LeaderId; }
+		}
+
+		Guid IReplicationMessage.SubscriptionId {
+			get { return SubscriptionId; }
+		}
+
+		public readonly Guid LeaderId;
+		public readonly Guid SubscriptionId;
+
+		public ReplicaSubscriptionRetry(Guid leaderId, Guid subscriptionId) {
+			Ensure.NotEmptyGuid(leaderId, "leaderId");
+			Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
+			LeaderId = leaderId;
+			SubscriptionId = subscriptionId;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Replication)]
+	public partial class ReplicaSubscribed : Message, IReplicationMessage {
+		Guid IReplicationMessage.LeaderId {
+			get { return LeaderId; }
+		}
+
+		Guid IReplicationMessage.SubscriptionId {
+			get { return SubscriptionId; }
+		}
+
+		public readonly Guid LeaderId;
+		public readonly Guid SubscriptionId;
+		public readonly long SubscriptionPosition;
+
+		public readonly EndPoint LeaderEndPoint;
+
+		public ReplicaSubscribed(Guid leaderId, Guid subscriptionId, long subscriptionPosition) {
+			Ensure.NotEmptyGuid(leaderId, "leaderId");
+			Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
+			Ensure.Nonnegative(subscriptionPosition, "subscriptionPosition");
+
+			LeaderId = leaderId;
+			SubscriptionId = subscriptionId;
+			SubscriptionPosition = subscriptionPosition;
+		}
+
+		public ReplicaSubscribed(Guid leaderId, Guid subscriptionId, long subscriptionPosition,
+			EndPoint leaderEndPoint) {
+			Ensure.NotEmptyGuid(leaderId, "leaderId");
+			Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
+			Ensure.Nonnegative(subscriptionPosition, "subscriptionPosition");
+			Ensure.NotNull(leaderEndPoint, "leaderEndPoint");
+
+			LeaderId = leaderId;
+			SubscriptionId = subscriptionId;
+			SubscriptionPosition = subscriptionPosition;
+			LeaderEndPoint = leaderEndPoint;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Replication)]
+	public partial class FollowerAssignment : Message, IReplicationMessage {
+		Guid IReplicationMessage.LeaderId {
+			get { return LeaderId; }
+		}
+
+		Guid IReplicationMessage.SubscriptionId {
+			get { return SubscriptionId; }
+		}
+
+		public readonly Guid LeaderId;
+		public readonly Guid SubscriptionId;
+
+		public FollowerAssignment(Guid leaderId, Guid subscriptionId) {
+			Ensure.NotEmptyGuid(leaderId, "leaderId");
+			Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
+			LeaderId = leaderId;
+			SubscriptionId = subscriptionId;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Replication)]
+	public partial class CloneAssignment : Message, IReplicationMessage {
+		Guid IReplicationMessage.LeaderId {
+			get { return LeaderId; }
+		}
+
+		Guid IReplicationMessage.SubscriptionId {
+			get { return SubscriptionId; }
+		}
+
+		public readonly Guid LeaderId;
+		public readonly Guid SubscriptionId;
+
+		public CloneAssignment(Guid leaderId, Guid subscriptionId) {
+			Ensure.NotEmptyGuid(leaderId, "leaderId");
+			Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
+			LeaderId = leaderId;
+			SubscriptionId = subscriptionId;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Replication)]
+	public partial class CreateChunk : Message, IReplicationMessage {
+		Guid IReplicationMessage.LeaderId {
+			get { return LeaderId; }
+		}
+
+		Guid IReplicationMessage.SubscriptionId {
+			get { return SubscriptionId; }
+		}
+
+		public readonly Guid LeaderId;
+		public readonly Guid SubscriptionId;
+
+		public readonly ChunkHeader ChunkHeader;
+		public readonly int FileSize;
+		public bool IsScavengedChunk;
+
+		public ReadOnlyMemory<byte> TransformHeader;
+
+		public CreateChunk(Guid leaderId, Guid subscriptionId, ChunkHeader chunkHeader, int fileSize,
+			bool isScavengedChunk, ReadOnlyMemory<byte> transformHeader) {
+			Ensure.NotEmptyGuid(leaderId, "leaderId");
+			Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
+			Ensure.NotNull(chunkHeader, "chunkHeader");
+
+			LeaderId = leaderId;
+			SubscriptionId = subscriptionId;
+			ChunkHeader = chunkHeader;
+			FileSize = fileSize;
+			IsScavengedChunk = isScavengedChunk;
+			TransformHeader = transformHeader;
+		}
+
+		public override string ToString() {
+			return string.Format(
+				"CreateChunk message: LeaderId: {0}, SubscriptionId: {1}, ChunkHeader: {2}, FileSize: {3}, IsScavengedChunk: {4}, TransformHeader size: {5}",
+				LeaderId, SubscriptionId, ChunkHeader, FileSize, IsScavengedChunk, TransformHeader.Length);
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Replication)]
+	public partial class RawChunkBulk : Message, IReplicationMessage {
+		Guid IReplicationMessage.LeaderId {
+			get { return LeaderId; }
+		}
+
+		Guid IReplicationMessage.SubscriptionId {
+			get { return SubscriptionId; }
+		}
+
+		public readonly Guid LeaderId;
+		public readonly Guid SubscriptionId;
+
+		public readonly int ChunkStartNumber;
+		public readonly int ChunkEndNumber;
+		public readonly int RawPosition;
+		public readonly byte[] RawBytes;
+		public readonly bool CompleteChunk;
+
+		public RawChunkBulk(Guid leaderId,
+			Guid subscriptionId,
+			int chunkStartNumber, int chunkEndNumber,
+			int rawPosition, byte[] rawBytes,
+			bool completeChunk) {
+			Ensure.NotEmptyGuid(leaderId, "leaderId");
+			Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
+			Ensure.NotNull(rawBytes, "rawBytes");
+			Ensure.Positive(rawBytes.Length, "rawBytes.Length"); // we should never send empty array, NEVER
+
+			LeaderId = leaderId;
+			SubscriptionId = subscriptionId;
+			ChunkStartNumber = chunkStartNumber;
+			ChunkEndNumber = chunkEndNumber;
+			RawPosition = rawPosition;
+			RawBytes = rawBytes;
+			CompleteChunk = completeChunk;
+		}
+
+		public override string ToString() {
+			return string.Format(
+				"RawChunkBulk message: LeaderId: {0}, SubscriptionId: {1}, ChunkStartNumber: {2}, ChunkEndNumber: {3}, RawPosition: {4}, RawBytes length: {5}, CompleteChunk: {6}",
+				LeaderId, SubscriptionId,
+				ChunkStartNumber, ChunkEndNumber, RawPosition, RawBytes.Length, CompleteChunk);
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Replication)]
+	public partial class DataChunkBulk : Message, IReplicationMessage, StorageMessage.IFlushableMessage {
+		Guid IReplicationMessage.LeaderId {
+			get { return LeaderId; }
+		}
+
+		Guid IReplicationMessage.SubscriptionId {
+			get { return SubscriptionId; }
+		}
+
+		public readonly Guid LeaderId;
+		public readonly Guid SubscriptionId;
+
+		public readonly int ChunkStartNumber;
+		public readonly int ChunkEndNumber;
+		public readonly long SubscriptionPosition;
+		public readonly byte[] DataBytes;
+		public readonly bool CompleteChunk;
+
+		public DataChunkBulk(Guid leaderId,
+			Guid subscriptionId,
+			int chunkStartNumber,
+			int chunkEndNumber,
+			long subscriptionPosition,
+			byte[] dataBytes,
+			bool completeChunk) {
+			Ensure.NotEmptyGuid(leaderId, "leaderId");
+			Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
+			Ensure.NotNull(dataBytes, "rawBytes");
+			Ensure.Nonnegative(dataBytes.Length,
+				"dataBytes.Length"); // we CAN send empty dataBytes array here, unlike as with completed chunks
+
+			LeaderId = leaderId;
+			SubscriptionId = subscriptionId;
+			ChunkStartNumber = chunkStartNumber;
+			ChunkEndNumber = chunkEndNumber;
+			SubscriptionPosition = subscriptionPosition;
+			DataBytes = dataBytes;
+			CompleteChunk = completeChunk;
+		}
+
+		public override string ToString() {
+			return string.Format(
+				"DataChunkBulk message: LeaderId: {0}, SubscriptionId: {1}, ChunkStartNumber: {2}, ChunkEndNumber: {3}, SubscriptionPosition: {4}, DataBytes length: {5}, CompleteChunk: {6}",
+				LeaderId, SubscriptionId, ChunkStartNumber, ChunkEndNumber,
+				SubscriptionPosition, DataBytes.Length, CompleteChunk);
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Replication)]
+	public partial class DropSubscription : Message, IReplicationMessage {
+		Guid IReplicationMessage.LeaderId {
+			get { return LeaderId; }
+		}
+
+		Guid IReplicationMessage.SubscriptionId {
+			get { return SubscriptionId; }
+		}
+
+		public readonly Guid LeaderId;
+		public readonly Guid SubscriptionId;
+
+		public DropSubscription(Guid leaderId, Guid subscriptionId) {
+			Ensure.NotEmptyGuid(leaderId, "leaderId");
+			Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
+			LeaderId = leaderId;
+			SubscriptionId = subscriptionId;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Replication)]
+	public partial class GetReplicationStats : Message {
+		public IEnvelope Envelope;
+
+		public GetReplicationStats(IEnvelope envelope) {
+			Envelope = envelope;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Replication)]
+	public partial class GetReplicationStatsCompleted : Message {
+		public List<ReplicationStats> ReplicationStats;
+
+		public GetReplicationStatsCompleted(List<ReplicationStats> replicationStats) {
+			ReplicationStats = replicationStats;
+		}
+	}
+
+	public class ReplicationStats {
+		public Guid SubscriptionId { get; private set; }
+		public Guid ConnectionId { get; private set; }
+		public string SubscriptionEndpoint { get; private set; }
+		public long TotalBytesSent { get; private set; }
+		public long TotalBytesReceived { get; private set; }
+		public int PendingSendBytes { get; private set; }
+		public int PendingReceivedBytes { get; private set; }
+		public int SendQueueSize { get; private set; }
+
+		public ReplicationStats(Guid subscriptionId, Guid connectionId, string subscriptionEndpoint,
+			int sendQueueSize,
+			long totalBytesSent, long totalBytesReceived, int pendingSendBytes, int pendingReceivedBytes) {
+			SubscriptionId = subscriptionId;
+			ConnectionId = connectionId;
+			SubscriptionEndpoint = subscriptionEndpoint;
+			SendQueueSize = sendQueueSize;
+			TotalBytesSent = totalBytesSent;
+			TotalBytesReceived = totalBytesReceived;
+			PendingSendBytes = pendingSendBytes;
+			PendingReceivedBytes = pendingReceivedBytes;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/ReplicationTrackingMessage.cs b/src/KurrentDB.Core/Messages/ReplicationTrackingMessage.cs
new file mode 100644
index 00000000000..7849ef022a4
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/ReplicationTrackingMessage.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Messages;
+
+public static partial class ReplicationTrackingMessage {
+	[DerivedMessage(CoreMessage.ReplicationTracking)]
+	public partial class WriterCheckpointFlushed : Message {
+	}
+
+	[DerivedMessage(CoreMessage.ReplicationTracking)]
+	public partial class IndexedTo : Message {
+		public readonly long LogPosition;
+
+		public IndexedTo(long logPosition) {
+			Ensure.Nonnegative(logPosition + 1, "logPosition");
+			LogPosition = logPosition;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.ReplicationTracking)]
+	public partial class ReplicatedTo : Message {
+		public readonly long LogPosition;
+
+		public ReplicatedTo(long logPosition) {
+			Ensure.Nonnegative(logPosition + 1, "logPosition");
+			LogPosition = logPosition;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.ReplicationTracking)]
+	public partial class LeaderReplicatedTo : Message {
+		public readonly long LogPosition;
+
+		public LeaderReplicatedTo(long logPosition) {
+			Ensure.Nonnegative(logPosition + 1, "logPosition");
+			LogPosition = logPosition;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.ReplicationTracking)]
+	public partial class ReplicaWriteAck : Message {
+		public readonly Guid SubscriptionId;
+		public readonly long ReplicationLogPosition;
+
+		public ReplicaWriteAck(Guid subscriptionId, long replicationLogPosition) {
+			Ensure.NotEmptyGuid(subscriptionId, "subscriptionId");
+			SubscriptionId = subscriptionId;
+			ReplicationLogPosition = replicationLogPosition;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/ScavengeGetCurrentResultDto.cs b/src/KurrentDB.Core/Messages/ScavengeGetCurrentResultDto.cs
new file mode 100644
index 00000000000..e7a8280a28e
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/ScavengeGetCurrentResultDto.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Messages;
+
+public class ScavengeGetCurrentResultDto {
+	public string ScavengeId { get; set; } = "";
+	public string ScavengeLink { get; set; } = "";
+
+	public override string ToString() =>
+		$"ScavengeId: {ScavengeId}, " +
+		$"ScavengeLink: {ScavengeLink}";
+}
diff --git a/src/KurrentDB.Core/Messages/ScavengeGetLastResultDto.cs b/src/KurrentDB.Core/Messages/ScavengeGetLastResultDto.cs
new file mode 100644
index 00000000000..a4e23db8c17
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/ScavengeGetLastResultDto.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Messages;
+
+public class ScavengeGetLastResultDto {
+	public string ScavengeId { get; set; } = Guid.Empty.ToString();
+	public string ScavengeLink { get; set; } = "";
+	public string ScavengeResult { get; set; } = "";
+
+	public override string ToString() =>
+		$"ScavengeId: {ScavengeId}, " +
+		$"ScavengeLink: {ScavengeLink}, " +
+		$"ScavengeResult: {ScavengeResult}";
+}
diff --git a/src/KurrentDB.Core/Messages/ScavengeResultDto.cs b/src/KurrentDB.Core/Messages/ScavengeResultDto.cs
new file mode 100644
index 00000000000..caae822fbcd
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/ScavengeResultDto.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Messages;
+
+public class ScavengeResultDto {
+	public string ScavengeId { get; set; }
+
+	public ScavengeResultDto() {
+	}
+
+	public ScavengeResultDto(string scavengeId) {
+		ScavengeId = scavengeId;
+	}
+
+	public override string ToString() => $"ScavengeId: {ScavengeId}";
+}
diff --git a/src/KurrentDB.Core/Messages/StorageMessage.cs b/src/KurrentDB.Core/Messages/StorageMessage.cs
new file mode 100644
index 00000000000..40fa0c84a8f
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/StorageMessage.cs
@@ -0,0 +1,445 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.Messages;
+
+public static partial class StorageMessage {
+	public interface IPreconditionedWriteMessage {
+		Guid CorrelationId { get; }
+		IEnvelope Envelope { get; }
+		string EventStreamId { get; }
+		long ExpectedVersion { get; }
+	}
+
+	public interface IFlushableMessage {
+	}
+
+	public interface ILeaderWriteMessage {
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class WritePrepares : Message, IPreconditionedWriteMessage, IFlushableMessage, ILeaderWriteMessage {
+		public Guid CorrelationId { get; private set; }
+		public IEnvelope Envelope { get; private set; }
+
+		public string EventStreamId { get; private set; }
+		public long ExpectedVersion { get; private set; }
+		public readonly Event[] Events;
+
+		public WritePrepares(Guid correlationId, IEnvelope envelope, string eventStreamId, long expectedVersion,
+			Event[] events, CancellationToken cancellationToken) : base(cancellationToken) {
+			CorrelationId = correlationId;
+			Envelope = envelope;
+			EventStreamId = eventStreamId;
+			ExpectedVersion = expectedVersion;
+			Events = events;
+		}
+
+		public override string ToString() =>
+			$"{GetType().Name} " +
+			$"CorrelationId: {CorrelationId}, " +
+			$"EventStreamId: {EventStreamId}, " +
+			$"ExpectedVersion: {ExpectedVersion}, " +
+			$"Envelope: {{ {Envelope} }}, " +
+			$"NumEvents: {Events?.Length}, " +
+			$"DataBytes: {Events?.Sum(static e => e.Data.Length)}, " +
+			$"MetadataBytes: {Events?.Sum(static e => e.Metadata.Length)}";
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class WriteDelete : Message, IPreconditionedWriteMessage, IFlushableMessage, ILeaderWriteMessage {
+		public Guid CorrelationId { get; private set; }
+		public IEnvelope Envelope { get; private set; }
+		public string EventStreamId { get; private set; }
+		public long ExpectedVersion { get; private set; }
+		public readonly bool HardDelete;
+
+		public WriteDelete(Guid correlationId, IEnvelope envelope, string eventStreamId, long expectedVersion,
+			bool hardDelete, CancellationToken cancellationToken) : base(cancellationToken) {
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			Ensure.NotNull(envelope, "envelope");
+			Ensure.NotNull(eventStreamId, "eventStreamId");
+
+			CorrelationId = correlationId;
+			Envelope = envelope;
+			EventStreamId = eventStreamId;
+			ExpectedVersion = expectedVersion;
+			HardDelete = hardDelete;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class WriteCommit : Message, IFlushableMessage, ILeaderWriteMessage {
+		public readonly Guid CorrelationId;
+		public readonly IEnvelope Envelope;
+		public readonly long TransactionPosition;
+
+		public WriteCommit(Guid correlationId, IEnvelope envelope, long transactionPosition) {
+			CorrelationId = correlationId;
+			Envelope = envelope;
+			TransactionPosition = transactionPosition;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class WriteTransactionStart : Message, IPreconditionedWriteMessage, IFlushableMessage,
+		ILeaderWriteMessage {
+
+		public Guid CorrelationId { get; private set; }
+		public IEnvelope Envelope { get; private set; }
+		public string EventStreamId { get; private set; }
+		public long ExpectedVersion { get; private set; }
+
+		public readonly DateTime LiveUntil;
+
+		public WriteTransactionStart(Guid correlationId, IEnvelope envelope, string eventStreamId,
+			long expectedVersion, DateTime liveUntil) {
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			Ensure.NotNull(envelope, "envelope");
+			Ensure.NotNull(eventStreamId, "eventStreamId");
+
+			CorrelationId = correlationId;
+			Envelope = envelope;
+			EventStreamId = eventStreamId;
+			ExpectedVersion = expectedVersion;
+
+			LiveUntil = liveUntil;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class WriteTransactionData : Message, IFlushableMessage, ILeaderWriteMessage {
+		public readonly Guid CorrelationId;
+		public readonly IEnvelope Envelope;
+		public readonly long TransactionId;
+		public readonly Event[] Events;
+
+		public WriteTransactionData(Guid correlationId, IEnvelope envelope, long transactionId, Event[] events) {
+			CorrelationId = correlationId;
+			Envelope = envelope;
+			TransactionId = transactionId;
+			Events = events;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class WriteTransactionEnd : Message, IFlushableMessage, ILeaderWriteMessage {
+		public readonly Guid CorrelationId;
+		public readonly IEnvelope Envelope;
+		public readonly long TransactionId;
+
+		public readonly DateTime LiveUntil;
+
+		public WriteTransactionEnd(Guid correlationId, IEnvelope envelope, long transactionId,
+			DateTime liveUntil) {
+			CorrelationId = correlationId;
+			Envelope = envelope;
+			TransactionId = transactionId;
+
+			LiveUntil = liveUntil;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class PrepareAck : Message {
+		public readonly Guid CorrelationId;
+		public readonly long LogPosition;
+		public readonly PrepareFlags Flags;
+
+		public PrepareAck(Guid correlationId, long logPosition, PrepareFlags flags) {
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			Ensure.Nonnegative(logPosition, "logPosition");
+
+			CorrelationId = correlationId;
+			LogPosition = logPosition;
+			Flags = flags;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class CommitAck : Message {
+		public readonly Guid CorrelationId;
+		public readonly long LogPosition;
+		public readonly long TransactionPosition;
+		public readonly long FirstEventNumber;
+		public readonly long LastEventNumber;
+
+		public CommitAck(Guid correlationId, long logPosition, long transactionPosition, long firstEventNumber,
+			long lastEventNumber) {
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			Ensure.Nonnegative(logPosition, "logPosition");
+			Ensure.Nonnegative(transactionPosition, "transactionPosition");
+			if (firstEventNumber < -1)
+				throw new ArgumentOutOfRangeException("firstEventNumber",
+					string.Format("FirstEventNumber: {0}", firstEventNumber));
+			if (lastEventNumber - firstEventNumber + 1 < 0)
+				throw new ArgumentOutOfRangeException("lastEventNumber",
+					string.Format("LastEventNumber {0}, FirstEventNumber {1}.", lastEventNumber, firstEventNumber));
+
+			CorrelationId = correlationId;
+			LogPosition = logPosition;
+			TransactionPosition = transactionPosition;
+			FirstEventNumber = firstEventNumber;
+			LastEventNumber = lastEventNumber;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class CommitIndexed : Message {
+		public readonly Guid CorrelationId;
+		public readonly long LogPosition;
+		public readonly long TransactionPosition;
+		public readonly long FirstEventNumber;
+		public readonly long LastEventNumber;
+
+		public CommitIndexed(Guid correlationId, long logPosition, long transactionPosition,
+			long firstEventNumber, long lastEventNumber) {
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			Ensure.Nonnegative(logPosition, "logPosition");
+			Ensure.Nonnegative(transactionPosition, "transactionPosition");
+			if (firstEventNumber < -1)
+				throw new ArgumentOutOfRangeException("firstEventNumber",
+					string.Format("FirstEventNumber: {0}", firstEventNumber));
+			if (lastEventNumber - firstEventNumber + 1 < 0)
+				throw new ArgumentOutOfRangeException("lastEventNumber",
+					string.Format("LastEventNumber {0}, FirstEventNumber {1}.", lastEventNumber, firstEventNumber));
+			CorrelationId = correlationId;
+			LogPosition = logPosition;
+			TransactionPosition = transactionPosition;
+			FirstEventNumber = firstEventNumber;
+			LastEventNumber = lastEventNumber;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class EventCommitted : Message {
+		public readonly long CommitPosition;
+		public readonly EventRecord Event;
+		public readonly bool TfEof;
+
+		public EventCommitted(long commitPosition, EventRecord @event, bool isTfEof) {
+			CommitPosition = commitPosition;
+			Event = @event;
+			TfEof = isTfEof;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class InMemoryEventCommitted : Message {
+		public readonly long CommitPosition;
+		public readonly EventRecord Event;
+
+		public InMemoryEventCommitted(long commitPosition, EventRecord @event) {
+			CommitPosition = commitPosition;
+			Event = @event;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class TfEofAtNonCommitRecord : Message {
+		public TfEofAtNonCommitRecord() {
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class AlreadyCommitted : Message {
+		public readonly Guid CorrelationId;
+
+		public readonly string EventStreamId;
+		public readonly long FirstEventNumber;
+		public readonly long LastEventNumber;
+		public readonly long LogPosition;
+
+		public AlreadyCommitted(Guid correlationId, string eventStreamId, long firstEventNumber,
+			long lastEventNumber, long logPosition) {
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			Ensure.NotNullOrEmpty(eventStreamId, "eventStreamId");
+			Ensure.Nonnegative(firstEventNumber, "FirstEventNumber");
+
+			CorrelationId = correlationId;
+			EventStreamId = eventStreamId;
+			FirstEventNumber = firstEventNumber;
+			LastEventNumber = lastEventNumber;
+			LogPosition = logPosition;
+		}
+
+		public override string ToString() {
+			return string.Format(
+				"EventStreamId: {0}, CorrelationId: {1}, FirstEventNumber: {2}, LastEventNumber: {3}",
+				EventStreamId, CorrelationId, FirstEventNumber, LastEventNumber);
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class InvalidTransaction : Message {
+		public readonly Guid CorrelationId;
+
+		public InvalidTransaction(Guid correlationId) {
+			CorrelationId = correlationId;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class WrongExpectedVersion : Message {
+		public readonly Guid CorrelationId;
+		public readonly long CurrentVersion;
+
+		public WrongExpectedVersion(Guid correlationId, long currentVersion) {
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			CorrelationId = correlationId;
+			CurrentVersion = currentVersion;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class StreamDeleted : Message {
+		public readonly Guid CorrelationId;
+
+		public StreamDeleted(Guid correlationId) {
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			CorrelationId = correlationId;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class RequestCompleted : Message {
+		public readonly Guid CorrelationId;
+		public readonly bool Success;
+		public readonly long CurrentVersion;
+
+		public RequestCompleted(Guid correlationId, bool success, long currentVersion = -1) {
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			CorrelationId = correlationId;
+			Success = success;
+			CurrentVersion = currentVersion;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class RequestManagerTimerTick : Message {
+		public DateTime UtcNow {
+			get { return _now ?? DateTime.UtcNow; }
+		}
+
+		private readonly DateTime? _now;
+
+		public RequestManagerTimerTick() {
+		}
+
+		public RequestManagerTimerTick(DateTime now) {
+			_now = now;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class BatchLogExpiredMessages : Message, IQueueAffineMessage {
+		public readonly Guid CorrelationId;
+		public int QueueId { get; }
+
+		public BatchLogExpiredMessages(Guid correlationId, int queueId) {
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			Ensure.Nonnegative(queueId, "queueId");
+			CorrelationId = correlationId;
+			QueueId = queueId;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class EffectiveStreamAclRequest : Message {
+		public readonly string StreamId;
+		public readonly IEnvelope Envelope;
+
+		public EffectiveStreamAclRequest(string streamId, IEnvelope envelope, CancellationToken cancellationToken)
+			: base(cancellationToken) {
+			StreamId = streamId;
+			Envelope = envelope;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class EffectiveStreamAclResponse : Message {
+		public readonly EffectiveAcl Acl;
+
+		public EffectiveStreamAclResponse(EffectiveAcl acl) {
+			Acl = acl;
+		}
+	}
+
+	public class EffectiveAcl {
+		public readonly StreamAcl Stream;
+		public readonly StreamAcl System;
+		public readonly StreamAcl Default;
+
+		public EffectiveAcl(StreamAcl stream, StreamAcl system, StreamAcl @default) {
+			Stream = stream;
+			System = system;
+			Default = @default;
+		}
+
+		public static Task<EffectiveAcl> LoadAsync(IPublisher publisher, string streamId, CancellationToken cancellationToken) {
+			var envelope = new RequestEffectiveAclEnvelope();
+			publisher.Publish(new EffectiveStreamAclRequest(streamId, envelope, cancellationToken));
+			return envelope.Task;
+		}
+
+		class RequestEffectiveAclEnvelope : IEnvelope {
+			private readonly TaskCompletionSource<EffectiveAcl> _tcs;
+
+			public RequestEffectiveAclEnvelope() {
+				_tcs = new TaskCompletionSource<EffectiveAcl>(TaskCreationOptions.RunContinuationsAsynchronously);
+			}
+			public void ReplyWith<T>(T message) where T : Message {
+				if (message == null)
+					throw new ArgumentNullException(nameof(message));
+				if (message is EffectiveStreamAclResponse response) {
+					_tcs.TrySetResult(response.Acl);
+					return;
+				} else {
+					if (message is OperationCancelledMessage cancelled) {
+						_tcs.TrySetCanceled(cancelled.CancellationToken);
+					}
+				}
+				throw new ArgumentException($"Unexpected message type {typeof(T)}");
+			}
+
+			public Task<EffectiveAcl> Task => _tcs.Task;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class OperationCancelledMessage : Message {
+		public OperationCancelledMessage(CancellationToken cancellationToken) : base(cancellationToken) {
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class StreamIdFromTransactionIdRequest : Message {
+		public readonly long TransactionId;
+		public readonly IEnvelope Envelope;
+
+		public StreamIdFromTransactionIdRequest(in long transactionId, IEnvelope envelope, CancellationToken cancellationToken)
+			: base(cancellationToken) {
+			TransactionId = transactionId;
+			Envelope = envelope;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Storage)]
+	public partial class StreamIdFromTransactionIdResponse : Message {
+		public readonly string StreamId;
+
+		public StreamIdFromTransactionIdResponse(string streamId) {
+			StreamId = streamId;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/SubscriptionMessage.cs b/src/KurrentDB.Core/Messages/SubscriptionMessage.cs
new file mode 100644
index 00000000000..13140effe79
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/SubscriptionMessage.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+
+namespace KurrentDB.Core.Messages;
+
+public static partial class SubscriptionMessage {
+	[DerivedMessage(CoreMessage.Subscription)]
+	public partial class PollStream : Message {
+		public readonly string StreamId;
+		public readonly long LastIndexedPosition;
+		public readonly long? LastEventNumber;
+		public readonly DateTime ExpireAt;
+
+		public readonly Message OriginalRequest;
+
+		public PollStream(string streamId, long lastIndexedPosition, long? lastEventNumber, DateTime expireAt,
+			Message originalRequest) {
+			StreamId = streamId;
+			LastIndexedPosition = lastIndexedPosition;
+			LastEventNumber = lastEventNumber;
+			ExpireAt = expireAt;
+			OriginalRequest = originalRequest;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Subscription)]
+	public partial class CheckPollTimeout : Message {
+	}
+
+	[DerivedMessage(CoreMessage.Subscription)]
+	public partial class DropSubscription : Message {
+		public readonly Guid SubscriptionId;
+		public readonly SubscriptionDropReason DropReason;
+
+		public DropSubscription(Guid subscriptionId, SubscriptionDropReason dropReason) {
+			SubscriptionId = subscriptionId;
+			DropReason = dropReason;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Subscription)]
+	public partial class PersistentSubscriptionTimerTick : Message {
+		public Guid CorrelationId { get; }
+
+		public PersistentSubscriptionTimerTick(Guid correlationId) {
+			CorrelationId = correlationId;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Subscription)]
+	public partial class PersistentSubscriptionsRestart : Message {
+		public IEnvelope ReplyEnvelope { get; }
+
+		public PersistentSubscriptionsRestart(IEnvelope replyEnvelope) {
+			ReplyEnvelope = replyEnvelope;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Subscription)]
+	public partial class PersistentSubscriptionsRestarting : Message {
+	}
+
+	[DerivedMessage(CoreMessage.Subscription)]
+	public partial class InvalidPersistentSubscriptionsRestart : Message {
+		public readonly string Reason;
+
+		public InvalidPersistentSubscriptionsRestart(string reason) {
+			Reason = reason;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Subscription)]
+	public partial class PersistentSubscriptionsStarted : Message {
+	}
+
+	[DerivedMessage(CoreMessage.Subscription)]
+	public partial class PersistentSubscriptionsStopped : Message {
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/SystemMessage.cs b/src/KurrentDB.Core/Messages/SystemMessage.cs
new file mode 100644
index 00000000000..681689afd32
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/SystemMessage.cs
@@ -0,0 +1,329 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using EndPoint = System.Net.EndPoint;
+
+namespace KurrentDB.Core.Messages;
+
+public static partial class SystemMessage {
+	[DerivedMessage(CoreMessage.System)]
+	public partial class SystemInit : Message {
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class SystemStart : Message {
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class SystemCoreReady : Message {
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class SystemReady : Message {
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class ServiceInitialized : Message {
+		public readonly string ServiceName;
+
+		public ServiceInitialized(string serviceName) {
+			Ensure.NotNullOrEmpty(serviceName, "serviceName");
+			ServiceName = serviceName;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class SubSystemInitialized : Message {
+		public readonly string SubSystemName;
+
+		public SubSystemInitialized(string subSystemName) {
+			Ensure.NotNullOrEmpty(subSystemName, "subSystemName");
+			SubSystemName = subSystemName;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class WriteEpoch : Message {
+		public readonly int EpochNumber;
+		public WriteEpoch(int epochNumber) {
+			EpochNumber = epochNumber;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class InitiateLeaderResignation : Message {
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class RequestQueueDrained : Message {
+	}
+
+	[DerivedMessage]
+	public abstract partial class StateChangeMessage : Message {
+		public readonly Guid CorrelationId;
+		public readonly VNodeState State;
+
+		protected StateChangeMessage(Guid correlationId, VNodeState state) {
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			CorrelationId = correlationId;
+			State = state;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class BecomePreLeader : StateChangeMessage {
+		public BecomePreLeader(Guid correlationId) : base(correlationId, VNodeState.PreLeader) {
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class BecomeLeader : StateChangeMessage {
+		public BecomeLeader(Guid correlationId) : base(correlationId, VNodeState.Leader) {
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class BecomeShuttingDown : StateChangeMessage {
+		public readonly bool ShutdownHttp;
+		public readonly bool ExitProcess;
+
+		public BecomeShuttingDown(Guid correlationId, bool exitProcess, bool shutdownHttp) : base(correlationId,
+			VNodeState.ShuttingDown) {
+			ShutdownHttp = shutdownHttp;
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			ExitProcess = exitProcess;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class BecomeShutdown : StateChangeMessage {
+		public BecomeShutdown(Guid correlationId) : base(correlationId, VNodeState.Shutdown) {
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class BecomeUnknown : StateChangeMessage {
+		public BecomeUnknown(Guid correlationId)
+			: base(correlationId, VNodeState.Unknown) {
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class BecomeDiscoverLeader : StateChangeMessage {
+		public BecomeDiscoverLeader(Guid correlationId)
+			: base(correlationId, VNodeState.DiscoverLeader) {
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class BecomeResigningLeader : StateChangeMessage {
+		public BecomeResigningLeader(Guid correlationId)
+			: base(correlationId, VNodeState.ResigningLeader) {
+		}
+	}
+
+	[DerivedMessage]
+	public abstract partial class ReplicaStateMessage : StateChangeMessage {
+		public readonly MemberInfo Leader;
+
+		protected ReplicaStateMessage(Guid correlationId, VNodeState state, MemberInfo leader)
+			: base(correlationId, state) {
+			Ensure.NotNull(leader, "leader");
+			Leader = leader;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class BecomePreReplica : ReplicaStateMessage {
+		public readonly Guid LeaderConnectionCorrelationId;
+
+		public BecomePreReplica(Guid correlationId, Guid leaderConnectionCorrelationId, MemberInfo leader)
+			: base(correlationId, VNodeState.PreReplica, leader) {
+			LeaderConnectionCorrelationId = leaderConnectionCorrelationId;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class BecomeCatchingUp : ReplicaStateMessage {
+		public BecomeCatchingUp(Guid correlationId, MemberInfo leader) : base(correlationId, VNodeState.CatchingUp,
+			leader) {
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class BecomeClone : ReplicaStateMessage {
+		public BecomeClone(Guid correlationId, MemberInfo leader) : base(correlationId, VNodeState.Clone, leader) {
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class BecomeFollower : ReplicaStateMessage {
+		public BecomeFollower(Guid correlationId, MemberInfo leader) : base(correlationId, VNodeState.Follower,
+			leader) {
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class BecomeReadOnlyLeaderless : StateChangeMessage {
+		public BecomeReadOnlyLeaderless(Guid correlationId)
+			: base(correlationId, VNodeState.ReadOnlyLeaderless) {
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class BecomePreReadOnlyReplica : ReplicaStateMessage {
+		public readonly Guid LeaderConnectionCorrelationId;
+
+		public BecomePreReadOnlyReplica(Guid correlationId, Guid leaderConnectionCorrelationId, MemberInfo leader)
+			: base(correlationId, VNodeState.PreReadOnlyReplica, leader) {
+			LeaderConnectionCorrelationId = leaderConnectionCorrelationId;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class BecomeReadOnlyReplica : ReplicaStateMessage {
+		public BecomeReadOnlyReplica(Guid correlationId, MemberInfo leader)
+			: base(correlationId, VNodeState.ReadOnlyReplica, leader) {
+		}
+	}
+
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class ServiceShutdown : Message {
+		public readonly string ServiceName;
+		public string Details { get; }
+
+		public ServiceShutdown(string serviceName, string details = "") {
+			ArgumentNullException.ThrowIfNull(serviceName, nameof(serviceName));
+			ArgumentNullException.ThrowIfNull(details, nameof(details));
+			ServiceName = serviceName;
+			Details = details;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class RegisterForGracefulTermination : Message {
+		public readonly string ComponentName;
+		public readonly Action Action;
+
+		public RegisterForGracefulTermination(string componentName, Action action) {
+			ComponentName = componentName;
+			Action = action;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class ComponentTerminated : Message {
+		public readonly string ComponentName;
+
+		public ComponentTerminated(string componentName) {
+			ComponentName = componentName;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class PeripheralShutdownTimeout : Message {
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class ShutdownTimeout : Message {
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class VNodeConnectionLost : Message {
+		public readonly EndPoint VNodeEndPoint;
+		public readonly Guid ConnectionId;
+		public readonly Guid? SubscriptionId;
+
+		public VNodeConnectionLost(EndPoint vNodeEndPoint, Guid connectionId, Guid? subscriptionId = null) {
+			Ensure.NotNull(vNodeEndPoint, "vNodeEndPoint");
+			Ensure.NotEmptyGuid(connectionId, "connectionId");
+
+			VNodeEndPoint = vNodeEndPoint;
+			ConnectionId = connectionId;
+			SubscriptionId = subscriptionId;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class VNodeConnectionEstablished : Message {
+		public readonly EndPoint VNodeEndPoint;
+		public readonly Guid ConnectionId;
+
+		public VNodeConnectionEstablished(EndPoint vNodeEndPoint, Guid connectionId) {
+			Ensure.NotNull(vNodeEndPoint, "vNodeEndPoint");
+			Ensure.NotEmptyGuid(connectionId, "connectionId");
+
+			VNodeEndPoint = vNodeEndPoint;
+			ConnectionId = connectionId;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class WaitForChaserToCatchUp : Message {
+		public readonly Guid CorrelationId;
+		public readonly TimeSpan TotalTimeWasted;
+
+		public WaitForChaserToCatchUp(Guid correlationId, TimeSpan totalTimeWasted) {
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+
+			CorrelationId = correlationId;
+			TotalTimeWasted = totalTimeWasted;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class ChaserCaughtUp : Message {
+		public readonly Guid CorrelationId;
+
+		public ChaserCaughtUp(Guid correlationId) {
+			Ensure.NotEmptyGuid(correlationId, "correlationId");
+			CorrelationId = correlationId;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class EnablePreLeaderReplication : Message {
+		public EnablePreLeaderReplication() {
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class CheckInaugurationConditions : Message {
+		public CheckInaugurationConditions() {
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class RequestForwardingTimerTick : Message {
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class NoQuorumMessage : Message {
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class EpochWritten : Message {
+		public readonly EpochRecord Epoch;
+
+		public EpochWritten(EpochRecord epoch) {
+			Ensure.NotNull(epoch, "epoch");
+			Epoch = epoch;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.System)]
+	public partial class ChunkSwitched : Message {
+		public readonly ChunkInfo ChunkInfo;
+
+		public ChunkSwitched(ChunkInfo chunkInfo) {
+			ChunkInfo = chunkInfo;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/TcpClientMessageDto.cs b/src/KurrentDB.Core/Messages/TcpClientMessageDto.cs
new file mode 100644
index 00000000000..f030d3356e2
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/TcpClientMessageDto.cs
@@ -0,0 +1,519 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using Google.Protobuf;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Client.Messages;
+
+partial class NewEvent {
+	public NewEvent(byte[] eventId, string eventType, int dataContentType, int metadataContentType, byte[] data, byte[] metadata) {
+
+		EventId = ByteString.CopyFrom(eventId);
+		EventType = eventType;
+		DataContentType = dataContentType;
+		MetadataContentType = metadataContentType;
+		Data = ByteString.CopyFrom(data);
+		Metadata = ByteString.CopyFrom(metadata);
+	}
+}
+
+partial class EventRecord {
+	public EventRecord(string eventStreamId, long eventNumber, byte[] eventId, string eventType, int dataContentType, int metadataContentType, byte[] data, byte[] metadata, long created, long createdEpoch) {
+		AssignValues(eventStreamId, eventNumber, eventId, eventType, dataContentType, metadataContentType, data, metadata, created, createdEpoch);
+	}
+
+	private void AssignValues(string eventStreamId, long eventNumber, byte[] eventId, string eventType, int dataContentType,
+		int metadataContentType, byte[] data, byte[] metadata, long created, long createdEpoch) {
+		EventStreamId = eventStreamId;
+		EventNumber = eventNumber;
+		EventId = ByteString.CopyFrom(eventId);
+		EventType = eventType;
+		DataContentType = dataContentType;
+		MetadataContentType = metadataContentType;
+		Data = ByteString.CopyFrom(data);
+		Metadata = ByteString.CopyFrom(metadata);
+		Created = created;
+		CreatedEpoch = createdEpoch;
+	}
+
+	public EventRecord(KurrentDB.Core.Data.EventRecord eventRecord) {
+		if (eventRecord == null)
+			return;
+		AssignValues(
+			eventRecord.EventStreamId,
+			eventRecord.EventNumber,
+			eventRecord.EventId.ToByteArray(),
+			eventRecord.EventType,
+			eventRecord.IsJson ? 1 : 0,
+			eventRecord.IsJson ? 1 : 0,
+			eventRecord.Data.ToArray(),
+			eventRecord.Metadata.ToArray(),
+			eventRecord.TimeStamp.ToBinary(),
+			(long)(eventRecord.TimeStamp - new DateTime(1970, 1, 1)).TotalMilliseconds
+			);
+	}
+
+	public EventRecord(KurrentDB.Core.Data.EventRecord eventRecord, long eventNumber) {
+		if (eventRecord == null)
+			return;
+		AssignValues(
+			eventRecord.EventStreamId,
+			eventNumber,
+			eventRecord.EventId.ToByteArray(),
+			eventRecord.EventType,
+			eventRecord.IsJson ? 1 : 0,
+			eventRecord.IsJson ? 1 : 0,
+			eventRecord.Data.ToArray(),
+			eventRecord.Metadata.ToArray(),
+			eventRecord.TimeStamp.ToBinary(),
+			(long)(eventRecord.TimeStamp - new DateTime(1970, 1, 1)).TotalMilliseconds
+		);
+	}
+}
+
+partial class ResolvedIndexedEvent {
+	public ResolvedIndexedEvent(EventRecord @event, EventRecord link) {
+		Event = @event;
+		Link = link;
+	}
+
+	public ResolvedIndexedEvent(KurrentDB.Core.Data.EventRecord @event, KurrentDB.Core.Data.EventRecord link) {
+		if (@event != null)
+			Event = new EventRecord(@event);
+		if (link != null)
+			Link = new EventRecord(link);
+	}
+}
+
+partial class ResolvedEvent {
+	public ResolvedEvent(EventRecord @event, EventRecord link, long commitPosition, long preparePosition) {
+		if (@event != null)
+			Event = @event;
+		if (link != null)
+			Link = link;
+		CommitPosition = commitPosition;
+		PreparePosition = preparePosition;
+	}
+
+	public ResolvedEvent(KurrentDB.Core.Data.ResolvedEvent pair)
+		: this(pair.Event != null ? new EventRecord(pair.Event) : null,
+			pair.Link != null ? new EventRecord(pair.Link) : null,
+			pair.OriginalPosition?.CommitPosition ?? -1,
+			pair.OriginalPosition?.PreparePosition ?? -1) {
+	}
+}
+
+partial class WriteEvents {
+	public WriteEvents(string eventStreamId, long expectedVersion, NewEvent[] events, bool requireLeader) {
+		EventStreamId = eventStreamId;
+		ExpectedVersion = expectedVersion;
+		Events.AddRange(events);
+		RequireLeader = requireLeader;
+	}
+}
+
+partial class WriteEventsCompleted {
+	public WriteEventsCompleted(OperationResult result, string message, long firstEventNumber, long lastEventNumber, long preparePosition, long commitPosition, long currentVersion) {
+		Result = result;
+		if (message != null)
+			Message = message;
+		FirstEventNumber = firstEventNumber;
+		LastEventNumber = lastEventNumber;
+		PreparePosition = preparePosition;
+		CommitPosition = commitPosition;
+		CurrentVersion = currentVersion;
+	}
+}
+
+partial class DeleteStream {
+	public DeleteStream(string eventStreamId, long expectedVersion, bool requireLeader, bool hardDelete) {
+		EventStreamId = eventStreamId;
+		ExpectedVersion = expectedVersion;
+		RequireLeader = requireLeader;
+		HardDelete = hardDelete;
+	}
+}
+
+partial class DeleteStreamCompleted {
+	public DeleteStreamCompleted(OperationResult result, string message, long currentVersion, long preparePosition,
+		long commitPosition) {
+		Result = result;
+		if (!string.IsNullOrEmpty(message))
+			Message = message;
+		CurrentVersion = currentVersion;
+		PreparePosition = preparePosition;
+		CommitPosition = commitPosition;
+	}
+}
+
+partial class TransactionStart {
+	public TransactionStart(string eventStreamId, long expectedVersion, bool requireLeader) {
+		EventStreamId = eventStreamId;
+		ExpectedVersion = expectedVersion;
+		RequireLeader = requireLeader;
+	}
+}
+
+partial class TransactionStartCompleted {
+	public TransactionStartCompleted(long transactionId, OperationResult result, string message) {
+		TransactionId = transactionId;
+		Result = result;
+		if (message != null)
+			Message = message;
+	}
+}
+
+partial class TransactionWrite {
+	public TransactionWrite(long transactionId, NewEvent[] events, bool requireLeader) {
+		TransactionId = transactionId;
+		Events.AddRange(events);
+		RequireLeader = requireLeader;
+	}
+}
+
+partial class TransactionWriteCompleted {
+	public TransactionWriteCompleted(long transactionId, OperationResult result, string message) {
+		TransactionId = transactionId;
+		Result = result;
+		if (message != null)
+			Message = message;
+	}
+}
+
+partial class TransactionCommit {
+	public TransactionCommit(long transactionId, bool requireLeader) {
+		TransactionId = transactionId;
+		RequireLeader = requireLeader;
+	}
+}
+
+partial class TransactionCommitCompleted {
+	public TransactionCommitCompleted(long transactionId, OperationResult result, string message, long firstEventNumber, long lastEventNumber, long preparePosition, long commitPosition) {
+		TransactionId = transactionId;
+		Result = result;
+		if (message != null)
+			Message = message;
+		FirstEventNumber = firstEventNumber;
+		LastEventNumber = lastEventNumber;
+		PreparePosition = preparePosition;
+		CommitPosition = commitPosition;
+	}
+}
+
+partial class ReadEvent {
+	public ReadEvent(string eventStreamId, long eventNumber, bool resolveLinkTos, bool requireLeader) {
+		EventStreamId = eventStreamId;
+		EventNumber = eventNumber;
+		ResolveLinkTos = resolveLinkTos;
+		RequireLeader = requireLeader;
+	}
+}
+
+partial class ReadEventCompleted {
+	public ReadEventCompleted(Types.ReadEventResult result, ResolvedIndexedEvent @event, string error) {
+		Result = result;
+		if (@event != null)
+			Event = @event;
+		if (error != null)
+			Error = error;
+	}
+}
+
+partial class ReadStreamEvents {
+	public ReadStreamEvents(string eventStreamId, long fromEventNumber, int maxCount, bool resolveLinkTos, bool requireLeader) {
+		EventStreamId = eventStreamId;
+		FromEventNumber = fromEventNumber;
+		MaxCount = maxCount;
+		ResolveLinkTos = resolveLinkTos;
+		RequireLeader = requireLeader;
+	}
+}
+
+partial class ReadStreamEventsCompleted {
+	public ReadStreamEventsCompleted(ResolvedIndexedEvent[] events, Types.ReadStreamResult result, long nextEventNumber, long lastEventNumber, bool isEndOfStream, long lastCommitPosition, string error) {
+		Events.AddRange(events);
+		Result = result;
+		NextEventNumber = nextEventNumber;
+		LastEventNumber = lastEventNumber;
+		IsEndOfStream = isEndOfStream;
+		LastCommitPosition = lastCommitPosition;
+		if (error != null)
+			Error = error;
+	}
+}
+
+partial class ReadAllEvents {
+	public ReadAllEvents(long commitPosition, long preparePosition, int maxCount, bool resolveLinkTos, bool requireLeader) {
+		CommitPosition = commitPosition;
+		PreparePosition = preparePosition;
+		MaxCount = maxCount;
+		ResolveLinkTos = resolveLinkTos;
+		RequireLeader = requireLeader;
+	}
+}
+
+partial class ReadAllEventsCompleted {
+	public ReadAllEventsCompleted(long commitPosition, long preparePosition, ResolvedEvent[] events, long nextCommitPosition, long nextPreparePosition, Types.ReadAllResult result, string error) {
+		CommitPosition = commitPosition;
+		PreparePosition = preparePosition;
+		Events.AddRange(events);
+		NextCommitPosition = nextCommitPosition;
+		NextPreparePosition = nextPreparePosition;
+		Result = result;
+		if (error != null)
+			Error = error;
+	}
+}
+
+partial class Filter {
+	public Filter(Types.FilterContext context, Types.FilterType type, string[] data) {
+		Context = context;
+		Type = type;
+		Data.AddRange(data);
+	}
+}
+
+partial class FilteredReadAllEvents {
+	public FilteredReadAllEvents(long commitPosition, long preparePosition, int maxCount, int maxSearchWindow, bool resolveLinkTos, bool requireLeader, Filter filter) {
+		CommitPosition = commitPosition;
+		PreparePosition = preparePosition;
+		MaxCount = maxCount;
+		MaxSearchWindow = maxSearchWindow;
+		ResolveLinkTos = resolveLinkTos;
+		RequireLeader = requireLeader;
+		Filter = filter;
+	}
+}
+
+partial class FilteredReadAllEventsCompleted {
+	public FilteredReadAllEventsCompleted(long commitPosition, long preparePosition, ResolvedEvent[] events, long nextCommitPosition, long nextPreparePosition, bool isEndOfStream, Types.FilteredReadAllResult result, string error) {
+		CommitPosition = commitPosition;
+		PreparePosition = preparePosition;
+		Events.AddRange(events);
+		NextCommitPosition = nextCommitPosition;
+		NextPreparePosition = nextPreparePosition;
+		IsEndOfStream = isEndOfStream;
+		Result = result;
+		if (error != null)
+			Error = error;
+	}
+}
+
+partial class CreatePersistentSubscription {
+	public CreatePersistentSubscription(string subscriptionGroupName, string eventStreamId, bool resolveLinkTos, long startFrom, int messageTimeoutMilliseconds, bool recordStatistics, int liveBufferSize, int readBatchSize, int bufferSize, int maxRetryCount, bool preferRoundRobin, int checkpointAfterTime, int checkpointMaxCount, int checkpointMinCount, int subscriberMaxCount, string namedConsumerStrategy) {
+		SubscriptionGroupName = subscriptionGroupName;
+		EventStreamId = eventStreamId;
+		ResolveLinkTos = resolveLinkTos;
+		StartFrom = startFrom;
+		MessageTimeoutMilliseconds = messageTimeoutMilliseconds;
+		RecordStatistics = recordStatistics;
+		LiveBufferSize = liveBufferSize;
+		ReadBatchSize = readBatchSize;
+		BufferSize = bufferSize;
+		MaxRetryCount = maxRetryCount;
+		PreferRoundRobin = preferRoundRobin;
+		CheckpointAfterTime = checkpointAfterTime;
+		CheckpointMaxCount = checkpointMaxCount;
+		CheckpointMinCount = checkpointMinCount;
+		SubscriberMaxCount = subscriberMaxCount;
+		NamedConsumerStrategy = namedConsumerStrategy;
+	}
+}
+
+partial class CreatePersistentSubscriptionCompleted {
+	public CreatePersistentSubscriptionCompleted(Types.CreatePersistentSubscriptionResult result, string reason) {
+		Result = result;
+		if (reason != null)
+			Reason = reason;
+	}
+}
+
+partial class DeletePersistentSubscription {
+	public DeletePersistentSubscription(string subscriptionGroupName, string eventStreamId) {
+		SubscriptionGroupName = subscriptionGroupName;
+		EventStreamId = eventStreamId;
+	}
+}
+
+partial class DeletePersistentSubscriptionCompleted {
+	public DeletePersistentSubscriptionCompleted(Types.DeletePersistentSubscriptionResult result, string reason) {
+		Result = result;
+		Reason = reason;
+	}
+}
+
+partial class UpdatePersistentSubscription {
+	public UpdatePersistentSubscription(string subscriptionGroupName, string eventStreamId, bool resolveLinkTos, long startFrom, int messageTimeoutMilliseconds, bool recordStatistics, int liveBufferSize, int readBatchSize, int bufferSize, int maxRetryCount, bool preferRoundRobin, int checkpointAfterTime, int checkpointMaxCount, int checkpointMinCount, int subscriberMaxCount, string namedConsumerStrategy) {
+		SubscriptionGroupName = subscriptionGroupName;
+		EventStreamId = eventStreamId;
+		ResolveLinkTos = resolveLinkTos;
+		StartFrom = startFrom;
+		MessageTimeoutMilliseconds = messageTimeoutMilliseconds;
+		RecordStatistics = recordStatistics;
+		LiveBufferSize = liveBufferSize;
+		ReadBatchSize = readBatchSize;
+		BufferSize = bufferSize;
+		MaxRetryCount = maxRetryCount;
+		PreferRoundRobin = preferRoundRobin;
+		CheckpointAfterTime = checkpointAfterTime;
+		CheckpointMaxCount = checkpointMaxCount;
+		CheckpointMinCount = checkpointMinCount;
+		SubscriberMaxCount = subscriberMaxCount;
+		NamedConsumerStrategy = namedConsumerStrategy;
+	}
+}
+
+partial class UpdatePersistentSubscriptionCompleted {
+	public UpdatePersistentSubscriptionCompleted(Types.UpdatePersistentSubscriptionResult result, string reason) {
+		Result = result;
+		if (reason != null)
+			Reason = reason;
+	}
+}
+
+partial class ConnectToPersistentSubscription {
+	public ConnectToPersistentSubscription(string subscriptionId, string eventStreamId, int allowedInFlightMessages) {
+		SubscriptionId = subscriptionId;
+		EventStreamId = eventStreamId;
+		AllowedInFlightMessages = allowedInFlightMessages;
+	}
+}
+
+partial class PersistentSubscriptionConfirmation {
+	public PersistentSubscriptionConfirmation(long lastCommitPosition, string subscriptionId, long lastEventNumber) {
+		LastCommitPosition = lastCommitPosition;
+		SubscriptionId = subscriptionId;
+		LastEventNumber = lastEventNumber;
+	}
+}
+
+partial class PersistentSubscriptionAckEvents {
+	public PersistentSubscriptionAckEvents(string subscriptionId, byte[][] processedEventIds) {
+		SubscriptionId = subscriptionId;
+		for (int i = 0; i < processedEventIds.Length; i++) {
+			ProcessedEventIds.Add(ByteString.CopyFrom(processedEventIds[i]));
+		}
+	}
+}
+
+partial class PersistentSubscriptionNakEvents {
+	public PersistentSubscriptionNakEvents(string subscriptionId, byte[][] processedEventIds, string message, Types.NakAction action) {
+		SubscriptionId = subscriptionId;
+		for (int i = 0; i < processedEventIds.Length; i++) {
+			ProcessedEventIds.Add(ByteString.CopyFrom(processedEventIds[i]));
+		}
+
+		if (message != null)
+			Message = message;
+		Action = action;
+	}
+}
+
+partial class PersistentSubscriptionStreamEventAppeared {
+	public PersistentSubscriptionStreamEventAppeared(ResolvedIndexedEvent @event, int retryCount) {
+		Event = @event;
+		RetryCount = retryCount;
+	}
+}
+
+partial class SubscribeToStream {
+	public SubscribeToStream(string eventStreamId, bool resolveLinkTos) {
+		EventStreamId = eventStreamId;
+		ResolveLinkTos = resolveLinkTos;
+	}
+}
+
+partial class FilteredSubscribeToStream {
+	public FilteredSubscribeToStream(string eventStreamId, bool resolveLinkTos, Filter filter, int checkpointInterval) {
+		EventStreamId = eventStreamId;
+		ResolveLinkTos = resolveLinkTos;
+		Filter = filter;
+		CheckpointInterval = checkpointInterval;
+	}
+}
+
+partial class CheckpointReached {
+	public CheckpointReached(long commitPosition, long preparePosition) {
+		CommitPosition = commitPosition;
+		PreparePosition = preparePosition;
+	}
+}
+
+partial class SubscriptionConfirmation {
+	public SubscriptionConfirmation(long lastCommitPosition, long lastEventNumber) {
+		LastCommitPosition = lastCommitPosition;
+		LastEventNumber = lastEventNumber;
+	}
+}
+
+partial class StreamEventAppeared {
+	public StreamEventAppeared(ResolvedEvent @event) {
+		Event = @event;
+	}
+}
+
+partial class SubscriptionDropped {
+	public SubscriptionDropped(Types.SubscriptionDropReason reason) {
+		Reason = reason;
+	}
+}
+
+partial class NotHandled {
+	public NotHandled(ClientMessage.NotHandled source) {
+		Reason = source.Reason switch {
+			ClientMessage.NotHandled.Types.NotHandledReason.NotReady => Types.NotHandledReason.NotReady,
+			ClientMessage.NotHandled.Types.NotHandledReason.TooBusy => Types.NotHandledReason.TooBusy,
+			ClientMessage.NotHandled.Types.NotHandledReason.NotLeader => Types.NotHandledReason.NotLeader,
+			ClientMessage.NotHandled.Types.NotHandledReason.IsReadOnly => Types.NotHandledReason.IsReadOnly,
+			_ => throw new ArgumentOutOfRangeException()
+		};
+		//this is horrible and only for transport compatibility purposes
+		if (source.LeaderInfo != null)
+			AdditionalInfo = new Types.LeaderInfo(source.LeaderInfo.ExternalTcp, source.LeaderInfo.IsSecure, source.LeaderInfo.Http).ToByteString();
+	}
+	partial class Types {
+		partial class LeaderInfo {
+			public LeaderInfo(string externalTcpAddress, int externalTcpPort, string httpAddress, int httpPort, string externalSecureTcpAddress, int externalSecureTcpPort) {
+				ExternalTcpAddress = externalTcpAddress;
+				ExternalTcpPort = externalTcpPort;
+				HttpAddress = httpAddress;
+				HttpPort = httpPort;
+				ExternalSecureTcpAddress = externalSecureTcpAddress;
+				ExternalSecureTcpPort = externalSecureTcpPort;
+			}
+
+			public LeaderInfo(EndPoint tcpEndPoint, bool isTcpEndPointSecure, EndPoint httpEndPoint) {
+				if (isTcpEndPointSecure) {
+					ExternalSecureTcpAddress = tcpEndPoint?.GetHost();
+					ExternalSecureTcpPort = tcpEndPoint?.GetPort() ?? 0;
+				} else {
+					ExternalTcpAddress = tcpEndPoint?.GetHost();
+					ExternalTcpPort = tcpEndPoint?.GetPort() ?? 0;
+				}
+
+				HttpAddress = httpEndPoint.GetHost();
+				HttpPort = httpEndPoint.GetPort();
+			}
+		}
+	}
+}
+
+partial class ScavengeDatabaseResponse {
+	public ScavengeDatabaseResponse(Types.ScavengeResult result, string scavengeId) {
+		Result = result;
+		ScavengeId = scavengeId;
+	}
+}
+
+partial class IdentifyClient {
+	public IdentifyClient(int version, string connectionName) {
+		Version = version;
+		if (connectionName != null)
+			ConnectionName = connectionName;
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/TcpMessage.cs b/src/KurrentDB.Core/Messages/TcpMessage.cs
new file mode 100644
index 00000000000..9687d8e7f0f
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/TcpMessage.cs
@@ -0,0 +1,109 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net.Sockets;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Tcp;
+
+namespace KurrentDB.Core.Messages;
+
+public static partial class TcpMessage {
+	[DerivedMessage(CoreMessage.Tcp)]
+	public partial class TcpSend : Message, IQueueAffineMessage {
+		public int QueueId {
+			get { return ConnectionManager.GetHashCode(); }
+		}
+
+		public readonly TcpConnectionManager ConnectionManager;
+		public readonly Message Message;
+
+		public TcpSend(TcpConnectionManager connectionManager, Message message) {
+			ConnectionManager = connectionManager;
+			Message = message;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Tcp)]
+	public partial class Heartbeat : Message {
+		public readonly long ReceiveProgressIndicator;
+		public readonly long SendProgressIndicator;
+
+		public Heartbeat(long receiveProgressIndicator, long sendProgressIndicator) {
+			ReceiveProgressIndicator = receiveProgressIndicator;
+			SendProgressIndicator = sendProgressIndicator;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Tcp)]
+	public partial class HeartbeatTimeout : Message {
+		public readonly long ReceiveProgressIndicator;
+
+		public HeartbeatTimeout(long receiveProgressIndicator) {
+			ReceiveProgressIndicator = receiveProgressIndicator;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Tcp)]
+	public partial class PongMessage : Message {
+		public readonly Guid CorrelationId;
+		public readonly byte[] Payload;
+
+		public PongMessage(Guid correlationId, byte[] payload) {
+			CorrelationId = correlationId;
+			Payload = payload;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Tcp)]
+	public partial class ConnectionEstablished : Message {
+		public readonly TcpConnectionManager Connection;
+
+		public ConnectionEstablished(TcpConnectionManager connection) {
+			Connection = connection;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Tcp)]
+	public partial class ConnectionClosed : Message {
+		public readonly TcpConnectionManager Connection;
+		public readonly SocketError SocketError;
+
+		public ConnectionClosed(TcpConnectionManager connection, SocketError socketError) {
+			Connection = connection;
+			SocketError = socketError;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Tcp)]
+	public partial class NotReady : Message {
+		public readonly Guid CorrelationId;
+		public readonly string Reason;
+
+		public NotReady(Guid correlationId, string reason) {
+			CorrelationId = correlationId;
+			Reason = reason;
+		}
+	}
+
+
+	[DerivedMessage(CoreMessage.Tcp)]
+	public partial class NotAuthenticated : Message {
+		public readonly Guid CorrelationId;
+		public readonly string Reason;
+
+		public NotAuthenticated(Guid correlationId, string reason) {
+			CorrelationId = correlationId;
+			Reason = reason;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.Tcp)]
+	public partial class Authenticated : Message {
+		public readonly Guid CorrelationId;
+
+		public Authenticated(Guid correlationId) {
+			CorrelationId = correlationId;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Messages/UserManagementMessage.cs b/src/KurrentDB.Core/Messages/UserManagementMessage.cs
new file mode 100644
index 00000000000..aec9b64d11d
--- /dev/null
+++ b/src/KurrentDB.Core/Messages/UserManagementMessage.cs
@@ -0,0 +1,259 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Http.Controllers;
+
+namespace KurrentDB.Core.Messages;
+
+public static partial class UserManagementMessage {
+	[DerivedMessage(CoreMessage.UserManagement)]
+	public partial class RequestMessage : Message {
+		public readonly IEnvelope Envelope;
+		public readonly ClaimsPrincipal Principal;
+
+		public RequestMessage(IEnvelope envelope, ClaimsPrincipal principal) {
+			Envelope = envelope;
+			Principal = principal;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.UserManagement)]
+	public partial class ResponseMessage : Message {
+		public readonly bool Success;
+		public readonly Error Error;
+
+		public ResponseMessage(bool success, Error error) {
+			Success = success;
+			Error = error;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.UserManagement)]
+	public partial class UserManagementRequestMessage : RequestMessage {
+		public readonly string LoginName;
+
+		protected UserManagementRequestMessage(IEnvelope envelope, ClaimsPrincipal principal, string loginName)
+			: base(envelope, principal) {
+			LoginName = loginName;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.UserManagement)]
+	public sealed partial class Create : UserManagementRequestMessage {
+		public readonly string FullName;
+		public readonly string[] Groups;
+		public readonly string Password;
+
+		public Create(
+			IEnvelope envelope, ClaimsPrincipal principal, string loginName, string fullName, string[] groups,
+			string password)
+			: base(envelope, principal, loginName) {
+			FullName = fullName;
+			Groups = groups;
+			Password = password;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.UserManagement)]
+	public sealed partial class Update : UserManagementRequestMessage {
+		public readonly string FullName;
+		public readonly string[] Groups;
+
+		public Update(IEnvelope envelope, ClaimsPrincipal principal, string loginName, string fullName, string[] groups)
+			: base(envelope, principal, loginName) {
+			FullName = fullName;
+			Groups = groups;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.UserManagement)]
+	public sealed partial class Disable : UserManagementRequestMessage {
+		public Disable(IEnvelope envelope, ClaimsPrincipal principal, string loginName)
+			: base(envelope, principal, loginName) {
+		}
+	}
+
+	[DerivedMessage(CoreMessage.UserManagement)]
+	public sealed partial class Enable : UserManagementRequestMessage {
+		public Enable(IEnvelope envelope, ClaimsPrincipal principal, string loginName)
+			: base(envelope, principal, loginName) {
+		}
+	}
+
+	[DerivedMessage(CoreMessage.UserManagement)]
+	public sealed partial class Delete : UserManagementRequestMessage {
+		public Delete(IEnvelope envelope, ClaimsPrincipal principal, string loginName)
+			: base(envelope, principal, loginName) {
+		}
+	}
+
+	[DerivedMessage(CoreMessage.UserManagement)]
+	public sealed partial class ResetPassword : UserManagementRequestMessage {
+		public readonly string NewPassword;
+
+		public ResetPassword(IEnvelope envelope, ClaimsPrincipal principal, string loginName, string newPassword)
+			: base(envelope, principal, loginName) {
+			NewPassword = newPassword;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.UserManagement)]
+	public sealed partial class ChangePassword : UserManagementRequestMessage {
+		public readonly string CurrentPassword;
+		public readonly string NewPassword;
+
+		public ChangePassword(
+			IEnvelope envelope, ClaimsPrincipal principal, string loginName, string currentPassword, string newPassword)
+			: base(envelope, principal, loginName) {
+			CurrentPassword = currentPassword;
+			NewPassword = newPassword;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.UserManagement)]
+	public sealed partial class GetAll : RequestMessage {
+		public GetAll(IEnvelope envelope, ClaimsPrincipal principal)
+			: base(envelope, principal) {
+		}
+	}
+
+	[DerivedMessage(CoreMessage.UserManagement)]
+	public sealed partial class Get : UserManagementRequestMessage {
+		public Get(IEnvelope envelope, ClaimsPrincipal principal, string loginName)
+			: base(envelope, principal, loginName) {
+		}
+	}
+
+	public enum Error {
+		Success,
+		NotFound,
+		Conflict,
+		Error,
+		TryAgain,
+		Unauthorized
+	}
+
+	public sealed class UserData {
+		public readonly string LoginName;
+		public readonly string FullName;
+		public readonly string[] Groups;
+		public readonly DateTimeOffset? DateLastUpdated;
+		public readonly bool Disabled;
+
+		public UserData(
+			string loginName, string fullName, string[] groups, bool disabled, DateTimeOffset? dateLastUpdated) {
+			LoginName = loginName;
+			FullName = fullName;
+			Groups = groups;
+			Disabled = disabled;
+			DateLastUpdated = dateLastUpdated;
+		}
+
+		internal UserData() {
+		}
+	}
+
+	[DerivedMessage(CoreMessage.UserManagement)]
+	public sealed partial class UpdateResult : ResponseMessage {
+		public readonly string LoginName;
+
+		public UpdateResult(string loginName)
+			: base(true, Error.Success) {
+			LoginName = loginName;
+		}
+
+		public UpdateResult(string loginName, Error error)
+			: base(false, error) {
+			LoginName = loginName;
+		}
+	}
+
+	public class UserDataHttpFormated {
+		public readonly string LoginName;
+		public readonly string FullName;
+		public readonly string[] Groups;
+		public readonly DateTimeOffset? DateLastUpdated;
+		public readonly bool Disabled;
+		public readonly List<RelLink> Links;
+
+		public UserDataHttpFormated(UserData userData, Func<string, string> makeAbsoluteUrl) {
+			LoginName = userData.LoginName;
+			FullName = userData.FullName;
+			Groups = userData.Groups;
+			Disabled = userData.Disabled;
+
+			Links = new List<RelLink>();
+			var userLocalUrl = "/users/" + userData.LoginName;
+			Links.Add(new RelLink(makeAbsoluteUrl(userLocalUrl + "/command/reset-password"), "reset-password"));
+			Links.Add(new RelLink(makeAbsoluteUrl(userLocalUrl + "/command/change-password"), "change-password"));
+			Links.Add(new RelLink(makeAbsoluteUrl(userLocalUrl), "edit"));
+			Links.Add(new RelLink(makeAbsoluteUrl(userLocalUrl), "delete"));
+
+			Links.Add(userData.Disabled
+				? new RelLink(makeAbsoluteUrl(userLocalUrl + "/command/enable"), "enable")
+				: new RelLink(makeAbsoluteUrl(userLocalUrl + "/command/disable"), "disable"));
+		}
+	}
+
+
+	[DerivedMessage(CoreMessage.UserManagement)]
+	public partial class UserDetailsResultHttpFormatted : ResponseMessage {
+		public readonly UserDataHttpFormated Data;
+
+		public UserDetailsResultHttpFormatted(UserDetailsResult msg, Func<string, string> makeAbsoluteUrl) :
+			base(msg.Success, msg.Error) {
+			if (msg.Data != null)
+				Data = new UserDataHttpFormated(msg.Data, makeAbsoluteUrl);
+		}
+	}
+
+	[DerivedMessage(CoreMessage.UserManagement)]
+	public partial class AllUserDetailsResultHttpFormatted : ResponseMessage {
+		public readonly UserDataHttpFormated[] Data;
+
+		public AllUserDetailsResultHttpFormatted(AllUserDetailsResult msg, Func<string, string> makeAbsoluteUrl) :
+			base(msg.Success, msg.Error) {
+			Data = msg.Data.Select(user => new UserDataHttpFormated(user, makeAbsoluteUrl)).ToArray();
+		}
+	}
+
+
+	[DerivedMessage(CoreMessage.UserManagement)]
+	public sealed partial class UserDetailsResult : ResponseMessage {
+		public readonly UserData Data;
+
+		public UserDetailsResult(UserData data)
+			: base(true, Error.Success) {
+			Data = data;
+		}
+
+		public UserDetailsResult(Error error)
+			: base(false, error) {
+			Data = null;
+		}
+	}
+
+	[DerivedMessage(CoreMessage.UserManagement)]
+	public sealed partial class AllUserDetailsResult : ResponseMessage {
+		public readonly UserData[] Data;
+
+		internal AllUserDetailsResult()
+			: base(true, Error.Success) {
+		}
+
+		public AllUserDetailsResult(UserData[] data)
+			: base(true, Error.Success) {
+			Data = data;
+		}
+
+		public AllUserDetailsResult(Error error)
+			: base(false, error) {
+			Data = null;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Messaging/AdHocCorrelatedTimeout.cs b/src/KurrentDB.Core/Messaging/AdHocCorrelatedTimeout.cs
new file mode 100644
index 00000000000..236ed305d8c
--- /dev/null
+++ b/src/KurrentDB.Core/Messaging/AdHocCorrelatedTimeout.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Messaging;
+
+public struct AdHocCorrelatedTimeout : ICorrelatedTimeout {
+	private readonly Action<Guid> _timeout;
+
+	public AdHocCorrelatedTimeout(Action<Guid> timeout) {
+		_timeout = timeout;
+	}
+
+	public void Timeout(Guid correlationId) {
+		_timeout(correlationId);
+	}
+}
diff --git a/src/EventStore.Core/Messaging/AsyncTaskEnvelope.cs b/src/KurrentDB.Core/Messaging/AsyncTaskEnvelope.cs
similarity index 87%
rename from src/EventStore.Core/Messaging/AsyncTaskEnvelope.cs
rename to src/KurrentDB.Core/Messaging/AsyncTaskEnvelope.cs
index aa09af7eae5..4f9912ab413 100644
--- a/src/EventStore.Core/Messaging/AsyncTaskEnvelope.cs
+++ b/src/KurrentDB.Core/Messaging/AsyncTaskEnvelope.cs
@@ -1,8 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace EventStore.Core.Messaging;
+namespace KurrentDB.Core.Messaging;
 
 // WARNING: ReplyWith only _calls_ onMessage.
 // - it does not await it because ReplyWith is not asynchronous
diff --git a/src/KurrentDB.Core/Messaging/CallbackEnvelope.cs b/src/KurrentDB.Core/Messaging/CallbackEnvelope.cs
new file mode 100644
index 00000000000..5150ab5ad2d
--- /dev/null
+++ b/src/KurrentDB.Core/Messaging/CallbackEnvelope.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.Messaging;
+
+public class CallbackEnvelope : IEnvelope {
+	private readonly Action<Message> _callback;
+
+	public CallbackEnvelope(Action<Message> callback) {
+		_callback = callback;
+		Ensure.NotNull(callback, "callback");
+	}
+
+	public void ReplyWith<T>(T message) where T : Message {
+		_callback(message);
+	}
+}
diff --git a/src/KurrentDB.Core/Messaging/ContinuationEnvelope.cs b/src/KurrentDB.Core/Messaging/ContinuationEnvelope.cs
new file mode 100644
index 00000000000..d479afa2b8d
--- /dev/null
+++ b/src/KurrentDB.Core/Messaging/ContinuationEnvelope.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core.Messaging;
+
+public class ChannelEnvelope : IEnvelope {
+	private readonly Channel<Message> _channel;
+
+	public ChannelEnvelope(Channel<Message> channel) {
+		_channel = channel;
+	}
+
+	public void ReplyWith<T>(T message) where T : Message {
+		_channel.Writer.TryWrite(message);
+	}
+}
+public class ContinuationEnvelope : IEnvelope {
+	private readonly Func<Message, CancellationToken, Task> _onMessage;
+	private readonly SemaphoreSlim _semaphore;
+	private readonly CancellationToken _cancellationToken;
+
+	public ContinuationEnvelope(Func<Message, CancellationToken, Task> onMessage, SemaphoreSlim semaphore,
+		CancellationToken cancellationToken) {
+		_onMessage = onMessage;
+		_semaphore = semaphore;
+		_cancellationToken = cancellationToken;
+	}
+
+	public void ReplyWith<T>(T message) where T : Message {
+		try {
+			_semaphore.Wait(_cancellationToken);
+			_onMessage(message, _cancellationToken).ContinueWith(_ => _semaphore.Release(), _cancellationToken);
+		} catch (ObjectDisposedException) { } catch (OperationCanceledException) { }
+	}
+}
diff --git a/src/KurrentDB.Core/Messaging/CoreMessage.cs b/src/KurrentDB.Core/Messaging/CoreMessage.cs
new file mode 100644
index 00000000000..0f96a496eae
--- /dev/null
+++ b/src/KurrentDB.Core/Messaging/CoreMessage.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Messaging;
+
+// The name of this enum and its members are used for metrics
+public enum CoreMessage {
+	None,
+	Authentication,
+	Awake,
+	Client,
+	ClusterClient,
+	Election,
+	Gossip,
+	Grpc,
+	Http,
+	IODispatcher,
+	LeaderDiscovery,
+	Monitoring,
+	Misc,
+	Redaction,
+	Replication,
+	ReplicationTracking,
+	Storage,
+	Subscription,
+	System,
+	Tcp,
+	Telemetry,
+	Timer,
+	UserManagement
+}
diff --git a/src/KurrentDB.Core/Messaging/Forwarder.cs b/src/KurrentDB.Core/Messaging/Forwarder.cs
new file mode 100644
index 00000000000..a3ab21825c1
--- /dev/null
+++ b/src/KurrentDB.Core/Messaging/Forwarder.cs
@@ -0,0 +1,73 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Bus;
+
+namespace KurrentDB.Core.Messaging;
+
+public static class Forwarder {
+	/// <summary>
+	/// Creates a message handler publishing all incoming messages on destination.
+	/// </summary>
+	public static IHandle<T> Create<T>(IPublisher to) where T : Message {
+		return new F<T>(to);
+	}
+
+	public static IHandle<T> CreateTracing<T>(IPublisher to, string prefix) where T : Message {
+		return new FTracing<T>(to, prefix);
+	}
+
+	/// <summary>
+	/// Creates a message handler publishing all incoming messages onto one of the destinations.
+	/// </summary>
+	public static IHandle<T> CreateBalancing<T>(IReadOnlyList<IPublisher> to) where T : Message {
+		return new Balancing<T>(to);
+	}
+
+	class F<T> : IHandle<T> where T : Message {
+		private readonly IPublisher _to;
+
+		public F(IPublisher to) {
+			_to = to;
+		}
+
+		public void Handle(T message) {
+			_to.Publish(message);
+		}
+	}
+
+	class FTracing<T> : IHandle<T> where T : Message {
+		private readonly IPublisher _to;
+		private readonly string _prefix;
+
+		public FTracing(IPublisher to, string prefix) {
+			_to = to;
+			_prefix = prefix;
+		}
+
+		public void Handle(T message) {
+			Console.WriteLine(_prefix + message.GetType().Name);
+			_to.Publish(message);
+		}
+	}
+
+	class Balancing<T> : IHandle<T> where T : Message {
+		private readonly IReadOnlyList<IPublisher> _to;
+		private int _last;
+
+		public Balancing(IReadOnlyList<IPublisher> to) {
+			_to = to;
+		}
+
+		public void Handle(T message) {
+			var last = _last;
+			if (last == _to.Count - 1)
+				_last = 0;
+			else
+				_last = last + 1;
+			_to[_last].Publish(message);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Messaging/ICorrelatedTimeout.cs b/src/KurrentDB.Core/Messaging/ICorrelatedTimeout.cs
new file mode 100644
index 00000000000..74311e62b1a
--- /dev/null
+++ b/src/KurrentDB.Core/Messaging/ICorrelatedTimeout.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Messaging;
+
+public interface ICorrelatedTimeout {
+	void Timeout(Guid correlationId);
+}
diff --git a/src/KurrentDB.Core/Messaging/IEnvelope.cs b/src/KurrentDB.Core/Messaging/IEnvelope.cs
new file mode 100644
index 00000000000..ff21d6ece22
--- /dev/null
+++ b/src/KurrentDB.Core/Messaging/IEnvelope.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Messaging;
+
+public interface IEnvelope<in T> {
+	void ReplyWith<U>(U message) where U : T;
+}
+
+public interface IEnvelope : IEnvelope<Message> {
+	public static IEnvelope NoOp => NoOpEnvelope.Instance;
+}
+
+file sealed class NoOpEnvelope : IEnvelope {
+	public static NoOpEnvelope Instance { get; } = new();
+
+	public void ReplyWith<T>(T message) where T : Message { }
+}
diff --git a/src/KurrentDB.Core/Messaging/Message.cs b/src/KurrentDB.Core/Messaging/Message.cs
new file mode 100644
index 00000000000..399a84203ee
--- /dev/null
+++ b/src/KurrentDB.Core/Messaging/Message.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using Newtonsoft.Json;
+
+namespace KurrentDB.Core.Messaging;
+
+[AttributeUsage(AttributeTargets.Class)]
+public class BaseMessageAttribute : Attribute {
+	public BaseMessageAttribute() {
+	}
+}
+
+[AttributeUsage(AttributeTargets.Class)]
+public class DerivedMessageAttribute : Attribute {
+	public DerivedMessageAttribute() {
+	}
+
+	public DerivedMessageAttribute(object messageGroup) {
+	}
+}
+
+[BaseMessage]
+public abstract partial class Message(CancellationToken token = default) {
+	[JsonIgnore]
+	public CancellationToken CancellationToken => token;
+}
diff --git a/src/KurrentDB.Core/Messaging/NoopEnvelope.cs b/src/KurrentDB.Core/Messaging/NoopEnvelope.cs
new file mode 100644
index 00000000000..fd913909524
--- /dev/null
+++ b/src/KurrentDB.Core/Messaging/NoopEnvelope.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Messaging;
+
+public class NoopEnvelope : IEnvelope {
+	public void ReplyWith<T>(T message) where T : Message {
+	}
+}
diff --git a/src/KurrentDB.Core/Messaging/RequestClient.cs b/src/KurrentDB.Core/Messaging/RequestClient.cs
new file mode 100644
index 00000000000..0e7e479db26
--- /dev/null
+++ b/src/KurrentDB.Core/Messaging/RequestClient.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+
+namespace KurrentDB.Core.Messaging;
+
+public static class RequestClient {
+	public static Task<TResponse> RequestAsync<TRequest, TResponse>(IPublisher publisher, Func<IEnvelope, TRequest> getRequest, CancellationToken cancellationToken)
+		where TRequest : Message where TResponse : Message {
+		var envelope = new TcsEnvelope<TResponse>();
+		var request = getRequest(envelope);
+		publisher.Publish(request);
+		return envelope.Task.WaitAsync(cancellationToken);
+	}
+}
diff --git a/src/KurrentDB.Core/Messaging/RequestResponseAltDispatcher.cs b/src/KurrentDB.Core/Messaging/RequestResponseAltDispatcher.cs
new file mode 100644
index 00000000000..5916cb4c4a2
--- /dev/null
+++ b/src/KurrentDB.Core/Messaging/RequestResponseAltDispatcher.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+
+namespace KurrentDB.Core.Messaging;
+
+// Just a typedef
+public class ReadDispatcher :
+	RequestResponseAltDispatcher<
+		ClientMessage.ReadStreamEventsBackward,
+		ClientMessage.ReadStreamEventsBackwardCompleted,
+		ClientMessage.NotHandled,
+		IReadStreamEventsBackwardHandler> {
+	public ReadDispatcher(
+		IPublisher publisher,
+		Func<ClientMessage.ReadStreamEventsBackward, Guid> getRequestCorrelationId,
+		Func<ClientMessage.ReadStreamEventsBackwardCompleted, Guid> getResponseCorrelationId,
+		Func<ClientMessage.NotHandled, Guid> getResponseAltCorrelationId,
+		IEnvelope defaultReplyEnvelope,
+		Func<Guid, Message> cancelMessageFactory = null) :
+			base(publisher, getRequestCorrelationId, getResponseCorrelationId,
+				getResponseAltCorrelationId, defaultReplyEnvelope, cancelMessageFactory) {
+	}
+}
+
+// This derivation of RequestResponseDispatcher handles two different response messages
+// Useful if the system might respond to the request with a message like NotHandled and we want to know about it.
+public class RequestResponseAltDispatcher<TRequest, TResponse, TResponseAlt, THandler> :
+	RequestResponseDispatcher<TRequest, TResponse, THandler>,
+	IHandle<TResponseAlt>
+	where TRequest : Message
+	where TResponse : Message
+	where TResponseAlt : Message
+	where THandler : IHandle<TResponse>, IHandleAlt<TResponseAlt>, IHandleTimeout {
+
+	private readonly Func<TResponseAlt, Guid> _getResponseAltCorrelationId;
+
+	public RequestResponseAltDispatcher(
+		IPublisher publisher,
+		Func<TRequest, Guid> getRequestCorrelationId,
+		Func<TResponse, Guid> getResponseCorrelationId,
+		Func<TResponseAlt, Guid> getResponseAltCorrelationId,
+		IEnvelope defaultReplyEnvelope,
+		Func<Guid, Message> cancelMessageFactory = null) : base(
+			publisher,
+			getRequestCorrelationId,
+			getResponseCorrelationId,
+			defaultReplyEnvelope,
+			cancelMessageFactory) {
+		_getResponseAltCorrelationId = getResponseAltCorrelationId;
+	}
+
+	void IHandle<TResponseAlt>.Handle(TResponseAlt message) {
+		var correlationId = _getResponseAltCorrelationId(message);
+
+		// if we don't handle the alternative message, then don't remove the handler
+		// so that it can be called on timeout
+		var handlerExists = TryRemoveHandler(correlationId, static h => h.HandlesAlt, out var handler);
+
+		if (handlerExists) {
+			handler.Handle(message);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Messaging/RequestResponseDispatcher.cs b/src/KurrentDB.Core/Messaging/RequestResponseDispatcher.cs
new file mode 100644
index 00000000000..cfbf11ba3e8
--- /dev/null
+++ b/src/KurrentDB.Core/Messaging/RequestResponseDispatcher.cs
@@ -0,0 +1,142 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Bus;
+
+namespace KurrentDB.Core.Messaging;
+
+// This derivation of RequestResponseDispatcher provides a simple THandler that handles the expected TResponse message.
+// Alternate responses (such as NotHandled) are not processed. Timeouts, if any, are implemented elsewhere
+// (i.e. in the IODispatcher).
+// Allows IODispatcher to use RequestResponseDispatcher in the traditional way.
+public sealed class RequestResponseDispatcher<TRequest, TResponse> :
+	RequestResponseDispatcher<TRequest, TResponse, AdHocHandlerStruct<TResponse>>
+	where TRequest : Message
+	where TResponse : Message {
+
+	public RequestResponseDispatcher(
+		IPublisher publisher,
+		Func<TRequest, Guid> getRequestCorrelationId,
+		Func<TResponse, Guid> getResponseCorrelationId,
+		IEnvelope defaultReplyEnvelope,
+		Func<Guid, Message> cancelMessageFactory = null) : base(
+			publisher,
+			getRequestCorrelationId,
+			getResponseCorrelationId,
+			defaultReplyEnvelope,
+			cancelMessageFactory) {
+	}
+
+	public Guid Publish(TRequest request, Action<TResponse> response, Action timeout = null) =>
+		Publish(request, new AdHocHandlerStruct<TResponse>(response, timeout));
+}
+
+// Sends requests on the _publisher, keeping hold of a THandler in the _map to handle the response.
+// Handles responses via IHandle, correlating them to the THandler in the _map.
+public class RequestResponseDispatcher<TRequest, TResponse, THandler> :
+	IHandle<TResponse>,
+	ICorrelatedTimeout
+	where TRequest : Message
+	where TResponse : Message
+	where THandler : IHandle<TResponse>, IHandleTimeout {
+
+	private readonly Dictionary<Guid, THandler> _map = new Dictionary<Guid, THandler>();
+	private readonly IPublisher _publisher;
+	private readonly Func<TRequest, Guid> _getRequestCorrelationId;
+	private readonly Func<TResponse, Guid> _getResponseCorrelationId;
+	private readonly IEnvelope _defaultReplyEnvelope;
+	private readonly Func<Guid, Message> _cancelMessageFactory;
+
+	protected RequestResponseDispatcher(
+		IPublisher publisher,
+		Func<TRequest, Guid> getRequestCorrelationId,
+		Func<TResponse, Guid> getResponseCorrelationId,
+		IEnvelope defaultReplyEnvelope,
+		Func<Guid, Message> cancelMessageFactory = null) {
+		_publisher = publisher;
+		_getRequestCorrelationId = getRequestCorrelationId;
+		_getResponseCorrelationId = getResponseCorrelationId;
+		_defaultReplyEnvelope = defaultReplyEnvelope;
+		_cancelMessageFactory = cancelMessageFactory;
+	}
+
+	public Guid Publish(TRequest request, THandler handler) {
+		//TODO: expiration?
+		Guid requestCorrelationId;
+		lock (_map) {
+			requestCorrelationId = _getRequestCorrelationId(request);
+			_map.Add(requestCorrelationId, handler);
+		}
+
+		_publisher.Publish(request);
+		//NOTE: the following condition is required as publishing the message could also process the message
+		// and the correlationId is already invalid here
+		lock (_map)
+			return _map.ContainsKey(requestCorrelationId) ? requestCorrelationId : Guid.Empty;
+	}
+
+	void IHandle<TResponse>.Handle(TResponse message) {
+		Handle(message);
+	}
+
+	public bool Handle(TResponse message) {
+		var correlationId = _getResponseCorrelationId(message);
+		var handlerExists = TryRemoveHandler(correlationId, static _ => true, out var handler);
+
+		// We mustn't call the handler inside the lock as we have no
+		// knowledge of it's behaviour, which might result in dead locks.
+		if (handlerExists) {
+			handler.Handle(message);
+			return true;
+		}
+
+		return false;
+	}
+
+	public void Timeout(Guid correlationId) {
+		// if we don't handle timeouts then don't remove the handler
+		// so that the regular handler can still be called if it comes through.
+		// long term i doubt any of the handlers should not deal with timeouts.
+		if (TryRemoveHandler(correlationId, static h => h.HandlesTimeout, out var handler)) {
+			handler.Timeout();
+		}
+	}
+
+	protected bool TryRemoveHandler(Guid correlationId, Func<THandler, bool> condition, out THandler handler) {
+		lock (_map) {
+			var handlerExists = _map.TryGetValue(correlationId, out handler);
+			if (handlerExists && condition(handler)) {
+				_map.Remove(correlationId);
+				return true;
+			}
+			return false;
+		}
+	}
+
+	public IEnvelope Envelope {
+		get { return _defaultReplyEnvelope; }
+	}
+
+	public void Cancel(Guid requestId) {
+		if (_cancelMessageFactory != null)
+			_publisher.Publish(_cancelMessageFactory(requestId));
+		lock (_map)
+			_map.Remove(requestId);
+	}
+
+	public void CancelAll() {
+		Guid[] ids = null;
+		lock (_map) {
+			_map.Clear();
+			if (_cancelMessageFactory != null)
+				ids = _map.Keys.ToArray();
+		}
+
+		if (ids != null)
+			foreach (var id in ids)
+				_publisher.Publish(_cancelMessageFactory(id));
+	}
+}
diff --git a/src/KurrentDB.Core/Messaging/SendToThisEnvelope.cs b/src/KurrentDB.Core/Messaging/SendToThisEnvelope.cs
new file mode 100644
index 00000000000..c07ef735498
--- /dev/null
+++ b/src/KurrentDB.Core/Messaging/SendToThisEnvelope.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+
+namespace KurrentDB.Core.Messaging;
+
+// USE ONLY WHEN YOU KNOW WHAT YOU ARE DOING
+// - no support for async handlers
+// - calls the handler directly on the replying thread
+// - limited type safety
+public class SendToThisEnvelope : IEnvelope {
+	private readonly object _receiver;
+
+	public SendToThisEnvelope(object receiver) {
+		_receiver = receiver;
+	}
+
+	public void ReplyWith<T>(T message) where T : Message {
+		if (_receiver is IHandle<T> handle) {
+			handle.Handle(message);
+		} else if (_receiver is IAsyncHandle<T>) {
+			throw new Exception($"SendToThisEnvelope does not support asynchronous receivers. Receiver: {_receiver}");
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Messaging/TcsEnvelope.cs b/src/KurrentDB.Core/Messaging/TcsEnvelope.cs
new file mode 100644
index 00000000000..0d5a70362e2
--- /dev/null
+++ b/src/KurrentDB.Core/Messaging/TcsEnvelope.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core.Messaging;
+
+public class TcsEnvelope<TResult> : IEnvelope where TResult : class {
+	private readonly TaskCompletionSource<TResult> _tcs;
+	public Task<TResult> Task => _tcs.Task;
+
+	public TcsEnvelope() {
+		_tcs = new TaskCompletionSource<TResult>(TaskCreationOptions.RunContinuationsAsynchronously);
+	}
+
+	public void ReplyWith<T>(T message) where T : Message {
+		if (message is not TResult result) {
+			_tcs.TrySetException(new ArgumentException("Unexpected message type.", nameof(message)));
+			return;
+		}
+
+		_tcs.TrySetResult(result);
+	}
+}
diff --git a/src/KurrentDB.Core/Metrics/ActivityStatusSubMetric.cs b/src/KurrentDB.Core/Metrics/ActivityStatusSubMetric.cs
new file mode 100644
index 00000000000..cde6a24f7da
--- /dev/null
+++ b/src/KurrentDB.Core/Metrics/ActivityStatusSubMetric.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Metrics;
+
+// When there is one activity at a time and it is disposed before starting the next.
+// It would be possible to drive a version of this from ActivitySource/ActivityListener
+// for cases where we are already incurring the cost of allocating the Activities
+public class ActivityStatusSubMetric : StatusSubMetric, IDisposable {
+	private const string Idle = "Idle";
+
+	public ActivityStatusSubMetric(string componentName, StatusMetric metric)
+		: base(componentName, Idle, metric) {
+	}
+
+	public IDisposable StartActivity(string name) {
+		SetStatus(name);
+		return this;
+	}
+
+	public void Dispose() {
+		SetStatus(Idle);
+	}
+}
diff --git a/src/KurrentDB.Core/Metrics/AverageMetric.cs b/src/KurrentDB.Core/Metrics/AverageMetric.cs
new file mode 100644
index 00000000000..f51fb69534d
--- /dev/null
+++ b/src/KurrentDB.Core/Metrics/AverageMetric.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Metrics;
+using Tag = System.Collections.Generic.KeyValuePair<string, object>;
+
+namespace KurrentDB.Core.Metrics;
+
+// When observed, this calculates the average for each group
+public class AverageMetric {
+	private readonly object _lock = new();
+	private readonly Func<string, Tag> _genTag;
+	private readonly Dictionary<string, (List<Func<double>>, Tag[])> _subMetricGroups = new();
+
+	public AverageMetric(Meter meter, string name, string unit, Func<string, Tag> genTag, bool legacyNames) {
+		_genTag = genTag;
+		if (legacyNames)
+			meter.CreateObservableCounter(name + "-" + unit, Observe);
+		else
+			meter.CreateObservableCounter(name, Observe, unit);
+	}
+
+	public void Register(string group, Func<double> subMetric) {
+		lock (_lock) {
+			if (_subMetricGroups.TryGetValue(group, out var pair)) {
+				pair.Item1.Add(subMetric);
+			} else {
+				var tags = new[] { _genTag(group) };
+				_subMetricGroups[group] = (new() { subMetric }, tags);
+			}
+		}
+	}
+
+	private IEnumerable<Measurement<double>> Observe() {
+		lock (_lock) {
+			foreach (var (groupFuncs, groupTags) in _subMetricGroups.Values) {
+				var total = 0d;
+				foreach (var observe in groupFuncs) {
+					total += observe();
+				}
+				var average = total / groupFuncs.Count;
+				yield return new(average, groupTags);
+			}
+		}
+	}
+}
diff --git a/src/EventStore.Core/Metrics/CacheHitsMissesMetric.cs b/src/KurrentDB.Core/Metrics/CacheHitsMissesMetric.cs
similarity index 81%
rename from src/EventStore.Core/Metrics/CacheHitsMissesMetric.cs
rename to src/KurrentDB.Core/Metrics/CacheHitsMissesMetric.cs
index 91743529ec5..0a667b2b0d7 100644
--- a/src/EventStore.Core/Metrics/CacheHitsMissesMetric.cs
+++ b/src/KurrentDB.Core/Metrics/CacheHitsMissesMetric.cs
@@ -1,10 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Metrics;
 using System.Linq;
-using static EventStore.Common.Configuration.MetricsConfiguration;
+using static KurrentDB.Common.Configuration.MetricsConfiguration;
 
-namespace EventStore.Core.Metrics;
+namespace KurrentDB.Core.Metrics;
 
 public class CacheHitsMissesMetric {
 	private readonly Dictionary<Cache, string> _enabledCaches;
diff --git a/src/KurrentDB.Core/Metrics/CacheHitsMissesTracker.cs b/src/KurrentDB.Core/Metrics/CacheHitsMissesTracker.cs
new file mode 100644
index 00000000000..2a8782a3f1c
--- /dev/null
+++ b/src/KurrentDB.Core/Metrics/CacheHitsMissesTracker.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using static KurrentDB.Common.Configuration.MetricsConfiguration;
+
+namespace KurrentDB.Core.Metrics;
+
+public interface ICacheHitsMissesTracker {
+	void Register(Cache cache, Func<long> getHits, Func<long> getMisses);
+}
+
+public class CacheHitsMissesTracker : ICacheHitsMissesTracker {
+	private readonly CacheHitsMissesMetric _metric;
+
+	public CacheHitsMissesTracker(CacheHitsMissesMetric metric) {
+		_metric = metric;
+	}
+
+	public void Register(Cache cache, Func<long> getHits, Func<long> getMisses) =>
+		_metric.Register(cache, getHits, getMisses);
+
+	public class NoOp : ICacheHitsMissesTracker {
+		public void Register(Cache cache, Func<long> getHits, Func<long> getMisses) {
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Metrics/CacheResourcesMetrics.cs b/src/KurrentDB.Core/Metrics/CacheResourcesMetrics.cs
new file mode 100644
index 00000000000..97952da0d5f
--- /dev/null
+++ b/src/KurrentDB.Core/Metrics/CacheResourcesMetrics.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Metrics;
+using KurrentDB.Core.Caching;
+
+namespace KurrentDB.Core.Metrics;
+
+public class CacheResourcesMetrics {
+	private readonly ObservableUpDownMetric<long> _bytesMetric;
+	private readonly ObservableUpDownMetric<long> _entriesMetric;
+
+	public CacheResourcesMetrics(Meter meter, string name, bool legacyNames) {
+		_bytesMetric = new ObservableUpDownMetric<long>(meter, $"{name}-bytes", legacyNames ? null : "bytes");
+		_entriesMetric = new ObservableUpDownMetric<long>(meter, $"{name}-entries", legacyNames ? null : "entries");
+	}
+
+	public void Register(string cache, ResizerUnit unit, Func<CacheStats> getStats) {
+		var sizeAndCapacityMetric = unit == ResizerUnit.Entries
+			? _entriesMetric
+			: _bytesMetric;
+
+		Register(sizeAndCapacityMetric, cache, "capacity", () => getStats().Capacity);
+		Register(sizeAndCapacityMetric, cache, "size", () => getStats().Size);
+		Register(_entriesMetric, cache, "count", () => getStats().Count);
+	}
+
+	private static void Register(
+		ObservableUpDownMetric<long> metric,
+		string cache,
+		string metricName,
+		Func<long> measurementProvider) {
+
+		var tags = new KeyValuePair<string, object>[] {
+			new("cache", cache),
+			new("kind", metricName)
+		};
+		metric.Register(() => new(measurementProvider(), tags));
+	}
+}
diff --git a/src/KurrentDB.Core/Metrics/CacheResourcesTracker.cs b/src/KurrentDB.Core/Metrics/CacheResourcesTracker.cs
new file mode 100644
index 00000000000..c8bcdf08313
--- /dev/null
+++ b/src/KurrentDB.Core/Metrics/CacheResourcesTracker.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Caching;
+
+namespace KurrentDB.Core.Metrics;
+
+public interface ICacheResourcesTracker {
+	public void Register(string cacheKey, ResizerUnit unit, Func<CacheStats> getStats);
+}
+
+public class CacheResourcesTracker : ICacheResourcesTracker {
+	private readonly CacheResourcesMetrics _metrics;
+
+	public CacheResourcesTracker(CacheResourcesMetrics metrics) {
+		_metrics = metrics;
+	}
+
+	public void Register(string cache, ResizerUnit unit, Func<CacheStats> getStats) {
+		_metrics.Register(cache, unit, getStats);
+	}
+
+	public class NoOp : ICacheResourcesTracker {
+		public void Register(string cacheKey, ResizerUnit unit, Func<CacheStats> getStats) {
+		}
+	}
+}
diff --git a/src/EventStore.Core/Metrics/ConnectionMetric.cs b/src/KurrentDB.Core/Metrics/ConnectionMetric.cs
similarity index 79%
rename from src/EventStore.Core/Metrics/ConnectionMetric.cs
rename to src/KurrentDB.Core/Metrics/ConnectionMetric.cs
index eddd4a8e3d0..3376c39be72 100644
--- a/src/EventStore.Core/Metrics/ConnectionMetric.cs
+++ b/src/KurrentDB.Core/Metrics/ConnectionMetric.cs
@@ -1,7 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System.Diagnostics.Metrics;
 using System.Diagnostics.Tracing;
 
-namespace EventStore.Core.Metrics;
+namespace KurrentDB.Core.Metrics;
 
 public class ConnectionMetric : EventListener {
 	private readonly UpDownCounter<long> _connectionsMetric;
diff --git a/src/KurrentDB.Core/Metrics/CounterMetric.cs b/src/KurrentDB.Core/Metrics/CounterMetric.cs
new file mode 100644
index 00000000000..e84678c17d4
--- /dev/null
+++ b/src/KurrentDB.Core/Metrics/CounterMetric.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Diagnostics.Metrics;
+
+namespace KurrentDB.Core.Metrics;
+
+public class CounterMetric {
+	private readonly List<CounterSubMetric> _subMetrics = new();
+	private readonly object _lock = new();
+
+	public CounterMetric(Meter meter, string name, string unit, bool legacyNames) {
+		if (legacyNames) {
+			if (!string.IsNullOrWhiteSpace(unit)) {
+				name = name + "-" + unit;
+			}
+
+			meter.CreateObservableCounter(name, Observe);
+		} else {
+			meter.CreateObservableCounter(name, Observe, unit);
+		}
+	}
+
+	public void Add(CounterSubMetric subMetric) {
+		lock (_lock) {
+			_subMetrics.Add(subMetric);
+		}
+	}
+
+	private IEnumerable<Measurement<long>> Observe() {
+		lock (_lock) {
+			foreach (CounterSubMetric subMetric in _subMetrics) {
+				yield return subMetric.Observe();
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Metrics/CounterSubMetric.cs b/src/KurrentDB.Core/Metrics/CounterSubMetric.cs
new file mode 100644
index 00000000000..a4126440b22
--- /dev/null
+++ b/src/KurrentDB.Core/Metrics/CounterSubMetric.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Diagnostics.Metrics;
+using System.Threading;
+
+namespace KurrentDB.Core.Metrics;
+
+public class CounterSubMetric {
+	private readonly KeyValuePair<string, object>[] _tags;
+	private long _counter;
+
+	public CounterSubMetric(CounterMetric metric, KeyValuePair<string, object>[] tags) {
+		_tags = tags;
+		metric.Add(this);
+	}
+
+	public void Add(long delta) {
+		Interlocked.Add(ref _counter, delta);
+	}
+
+	public Measurement<long> Observe() {
+		return new Measurement<long>(Interlocked.Read(ref _counter), _tags);
+	}
+}
diff --git a/src/EventStore.Core/Metrics/Dimensions.cs b/src/KurrentDB.Core/Metrics/Dimensions.cs
similarity index 87%
rename from src/EventStore.Core/Metrics/Dimensions.cs
rename to src/KurrentDB.Core/Metrics/Dimensions.cs
index 873d0742f78..029972ab689 100644
--- a/src/EventStore.Core/Metrics/Dimensions.cs
+++ b/src/KurrentDB.Core/Metrics/Dimensions.cs
@@ -1,9 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Metrics;
 using System.Linq;
 
-namespace EventStore.Core.Metrics;
+namespace KurrentDB.Core.Metrics;
 
 internal class Dimensions<TTracker, TData> where TTracker : notnull where TData : struct {
 	private readonly List<Func<Measurement<TData>>> _funcs = new();
diff --git a/src/KurrentDB.Core/Metrics/Duration.cs b/src/KurrentDB.Core/Metrics/Duration.cs
new file mode 100644
index 00000000000..c1941e77fad
--- /dev/null
+++ b/src/KurrentDB.Core/Metrics/Duration.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Time;
+
+namespace KurrentDB.Core.Metrics;
+
+// This represents an activity that can fail
+public struct Duration : IDisposable {
+	private readonly DurationMetric _metric;
+	private readonly string _name;
+	private readonly Instant _start;
+	private bool _failed;
+
+	public static Duration Nil { get; } = new();
+
+	public Duration(DurationMetric metric, string name, Instant start) {
+		_metric = metric;
+		_name = name;
+		_start = start;
+		_failed = false;
+	}
+
+	public void SetException(Exception ex) {
+		_failed = true;
+	}
+
+	public readonly void Dispose() {
+		_metric?.Record(
+			_start,
+			new KeyValuePair<string, object>("activity", _name),
+			new KeyValuePair<string, object>("status", _failed ? "failed" : "successful"));
+	}
+}
diff --git a/src/KurrentDB.Core/Metrics/DurationMaxMetric.cs b/src/KurrentDB.Core/Metrics/DurationMaxMetric.cs
new file mode 100644
index 00000000000..20450678f47
--- /dev/null
+++ b/src/KurrentDB.Core/Metrics/DurationMaxMetric.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Diagnostics.Metrics;
+
+namespace KurrentDB.Core.Metrics;
+
+public class DurationMaxMetric {
+	private readonly List<DurationMaxTracker> _trackers = new();
+
+	public DurationMaxMetric(Meter meter, string name, bool legacyNames) {
+		// gauge rather than updowncounter because the dimensions wont make sense to sum,
+		// because they are maxes and not necessarily from the same moment
+		if (legacyNames) {
+			meter.CreateObservableGauge(name + "-seconds", Observe);
+		} else {
+			meter.CreateObservableGauge(name, Observe, "seconds");
+		}
+	}
+
+	public void Add(DurationMaxTracker tracker) {
+		lock (_trackers) {
+			_trackers.Add(tracker);
+		}
+	}
+
+	private IEnumerable<Measurement<double>> Observe() {
+		lock (_trackers) {
+			foreach (var tracker in _trackers) {
+				yield return tracker.Observe();
+			}
+		}
+	}
+}
diff --git a/src/EventStore.Core/Metrics/DurationMaxTracker.cs b/src/KurrentDB.Core/Metrics/DurationMaxTracker.cs
similarity index 91%
rename from src/EventStore.Core/Metrics/DurationMaxTracker.cs
rename to src/KurrentDB.Core/Metrics/DurationMaxTracker.cs
index 8a706b68812..5ba390e6343 100644
--- a/src/EventStore.Core/Metrics/DurationMaxTracker.cs
+++ b/src/KurrentDB.Core/Metrics/DurationMaxTracker.cs
@@ -1,9 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Metrics;
-using EventStore.Core.Time;
+using KurrentDB.Core.Time;
 
-namespace EventStore.Core.Metrics;
+namespace KurrentDB.Core.Metrics;
 
 public interface IDurationMaxTracker {
 	// Returns the current instant
diff --git a/src/KurrentDB.Core/Metrics/DurationMetric.cs b/src/KurrentDB.Core/Metrics/DurationMetric.cs
new file mode 100644
index 00000000000..5f086b75695
--- /dev/null
+++ b/src/KurrentDB.Core/Metrics/DurationMetric.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Diagnostics.Metrics;
+using KurrentDB.Core.Time;
+
+namespace KurrentDB.Core.Metrics;
+
+public class DurationMetric {
+	private readonly Histogram<double> _histogram;
+	private readonly IClock _clock;
+
+	public DurationMetric(Meter meter, string name, bool legacyNames, IClock clock = null) {
+		_clock = clock ?? Clock.Instance;
+		if (legacyNames) {
+			_histogram = meter.CreateHistogram<double>(name + "-seconds");
+		} else {
+			_histogram = meter.CreateHistogram<double>(name, "seconds");
+		}
+	}
+
+	public Duration Start(string durationName) =>
+		new(this, durationName, _clock.Now);
+
+	public Instant Record(
+		Instant start,
+		KeyValuePair<string, object> tag1,
+		KeyValuePair<string, object> tag2) {
+
+		var now = _clock.Now;
+		var elapsedSeconds = now.ElapsedSecondsSince(start);
+		_histogram.Record(elapsedSeconds, tag1, tag2);
+		return now;
+	}
+}
diff --git a/src/KurrentDB.Core/Metrics/DurationTracker.cs b/src/KurrentDB.Core/Metrics/DurationTracker.cs
new file mode 100644
index 00000000000..f87d6641afd
--- /dev/null
+++ b/src/KurrentDB.Core/Metrics/DurationTracker.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Metrics;
+
+
+public interface IDurationTracker {
+	Duration Start();
+}
+
+public class DurationTracker : IDurationTracker {
+	private readonly DurationMetric _metric;
+	private readonly string _durationName;
+
+	public DurationTracker(DurationMetric metric, string durationName) {
+		_metric = metric;
+		_durationName = durationName;
+	}
+
+	public Duration Start() => _metric.Start(_durationName);
+
+	public class NoOp : IDurationTracker {
+		public Duration Start() => Duration.Nil;
+	}
+}
diff --git a/src/KurrentDB.Core/Metrics/ElectionsCounterTracker.cs b/src/KurrentDB.Core/Metrics/ElectionsCounterTracker.cs
new file mode 100644
index 00000000000..17c694e04c8
--- /dev/null
+++ b/src/KurrentDB.Core/Metrics/ElectionsCounterTracker.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+
+namespace KurrentDB.Core.Metrics;
+
+public interface IElectionCounterTracker : IHandle<ElectionMessage.ElectionsDone> {
+}
+
+public class ElectionsCounterTracker : IElectionCounterTracker {
+	private readonly CounterSubMetric _electionsCounter;
+
+	public ElectionsCounterTracker(CounterSubMetric electionsCounter) {
+		_electionsCounter = electionsCounter;
+	}
+
+	public void Handle(ElectionMessage.ElectionsDone message) {
+		_electionsCounter.Add(1);
+	}
+
+	public class NoOp : IElectionCounterTracker {
+		public void Handle(ElectionMessage.ElectionsDone message) {
+		}
+	}
+}
diff --git a/src/EventStore.Core/Metrics/GCSuspensionMetric.cs b/src/KurrentDB.Core/Metrics/GCSuspensionMetric.cs
similarity index 87%
rename from src/EventStore.Core/Metrics/GCSuspensionMetric.cs
rename to src/KurrentDB.Core/Metrics/GCSuspensionMetric.cs
index 12638931126..f51e2917e27 100644
--- a/src/EventStore.Core/Metrics/GCSuspensionMetric.cs
+++ b/src/KurrentDB.Core/Metrics/GCSuspensionMetric.cs
@@ -1,7 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Diagnostics.Tracing;
 
-namespace EventStore.Core.Metrics;
+namespace KurrentDB.Core.Metrics;
 
 public class GcSuspensionMetric : EventListener {
 	private const int GcKeyword = 0x0000001;
diff --git a/src/KurrentDB.Core/Metrics/IPersistentSubscriptionTracker.cs b/src/KurrentDB.Core/Metrics/IPersistentSubscriptionTracker.cs
new file mode 100644
index 00000000000..15a77f96c0a
--- /dev/null
+++ b/src/KurrentDB.Core/Metrics/IPersistentSubscriptionTracker.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Messages;
+
+namespace KurrentDB.Core.Metrics;
+
+public interface IPersistentSubscriptionTracker {
+	public static IPersistentSubscriptionTracker NoOp => NoOpTracker.Instance;
+
+	void OnNewStats(IReadOnlyList<MonitoringMessage.PersistentSubscriptionInfo> newStats);
+}
+
+file class NoOpTracker : IPersistentSubscriptionTracker {
+	public static NoOpTracker Instance { get; } = new();
+	public void OnNewStats(IReadOnlyList<MonitoringMessage.PersistentSubscriptionInfo> newStats) { }
+}
diff --git a/src/EventStore.Core/Metrics/IncomingGrpcCallsMetric.cs b/src/KurrentDB.Core/Metrics/IncomingGrpcCallsMetric.cs
similarity index 91%
rename from src/EventStore.Core/Metrics/IncomingGrpcCallsMetric.cs
rename to src/KurrentDB.Core/Metrics/IncomingGrpcCallsMetric.cs
index a3543393bc8..307ae5d69a1 100644
--- a/src/EventStore.Core/Metrics/IncomingGrpcCallsMetric.cs
+++ b/src/KurrentDB.Core/Metrics/IncomingGrpcCallsMetric.cs
@@ -1,12 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Metrics;
 using System.Diagnostics.Tracing;
 using System.Linq;
 using System.Threading;
-using static EventStore.Common.Configuration.MetricsConfiguration;
+using static KurrentDB.Common.Configuration.MetricsConfiguration;
 
-namespace EventStore.Core.Metrics;
+namespace KurrentDB.Core.Metrics;
 
 // using observable counters rather than regular to reduce the cost of incrementing
 // (although, its probably not important at the rate calls are created)
diff --git a/src/KurrentDB.Core/Metrics/InternalExporter.cs b/src/KurrentDB.Core/Metrics/InternalExporter.cs
new file mode 100644
index 00000000000..b0af1e26bdf
--- /dev/null
+++ b/src/KurrentDB.Core/Metrics/InternalExporter.cs
@@ -0,0 +1,121 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using OpenTelemetry;
+using OpenTelemetry.Metrics;
+
+namespace KurrentDB.Core.Metrics;
+
+public class InternalExporter : BaseExporter<Metric>, IPullMetricExporter {
+	public readonly MetersSnapshot Snapshot = new();
+
+	public override ExportResult Export(in Batch<Metric> batch) {
+		if (DateTime.Now.Subtract(_lastCollected).TotalMilliseconds < 1000)
+			return ExportResult.Success;
+
+		_lastCollected = DateTime.Now;
+		foreach (var metric in batch) {
+			switch (metric.Name) {
+				case "kurrentdb-checkpoints":
+					HandleCheckpoint(metric);
+					continue;
+				case "kurrentdb-io-events":
+					ProcessEventsMetric(metric, ref Snapshot.EventsRead, ref Snapshot.EventsWritten);
+					break;
+				case "kurrentdb-io-bytes":
+					ProcessEventsMetric(metric, ref Snapshot.EventBytesRead, ref Snapshot.EventBytesWritten);
+					break;
+				case "kurrentdb-sys-disk":
+					ProcessDiskMetric(metric, ref Snapshot.DiskTotalBytes, ref Snapshot.DiskUsedBytes);
+					break;
+			}
+		}
+
+		return ExportResult.Success;
+
+		void ProcessEventsMetric(Metric metric, ref long val1, ref long val2) {
+			var enumerator = metric.GetMetricPoints().GetEnumerator();
+			while (enumerator.MoveNext()) {
+				var current = enumerator.Current;
+				var te = current.Tags.GetEnumerator();
+				while (te.MoveNext()) {
+					if (te.Current.Key != "activity")
+						continue;
+					switch ((string)te.Current.Value) {
+						case "read":
+							val1 = current.GetSumLong();
+							break;
+						case "written":
+							val2 = current.GetSumLong();
+							break;
+					}
+				}
+			}
+		}
+
+		void ProcessDiskMetric(Metric metric, ref long val1, ref long val2) {
+			var enumerator = metric.GetMetricPoints().GetEnumerator();
+			while (enumerator.MoveNext()) {
+				var current = enumerator.Current;
+				var te = current.Tags.GetEnumerator();
+				while (te.MoveNext()) {
+					switch (te.Current.Key) {
+						case "disk":
+							val1 = current.GetGaugeLastValueLong();
+							break;
+						case "kind":
+							if ((string)te.Current.Value == "used")
+								val2 = current.GetGaugeLastValueLong();
+							break;
+					}
+				}
+			}
+		}
+	}
+
+	void HandleCheckpoint(Metric metric) {
+		var enumerator = metric.GetMetricPoints().GetEnumerator();
+		while (enumerator.MoveNext()) {
+			var current = enumerator.Current;
+			var te = current.Tags.GetEnumerator();
+			te.MoveNext();
+			if (te.Current.Key != "name" || (string)te.Current.Value != "writer")
+				continue;
+
+			// Calculate the writer checkpoint delta and return
+			var sum = current.GetSumLong();
+			var delta = sum - _last;
+			_last = sum;
+			Snapshot.EventBytesWritten = delta;
+			return;
+		}
+	}
+
+	long _last;
+	DateTime _lastCollected = DateTime.MinValue;
+
+	public Func<int, bool> Collect { get; set; }
+
+	public class MetersSnapshot {
+		public long EventsRead;
+		public long EventsWritten;
+		public long EventBytesRead;
+		public long EventBytesWritten;
+		public long DiskTotalBytes;
+		public long DiskUsedBytes;
+	}
+}
+
+public static class InternalExporterMeterProviderBuilderExtensions {
+	public static MeterProviderBuilder AddInternalExporter(this MeterProviderBuilder builder) {
+		builder.ConfigureServices(services => services.AddSingleton<InternalExporter>());
+		return builder.AddReader(sp => {
+			var exporter = sp.GetRequiredService<InternalExporter>();
+			return new BaseExportingMetricReader(exporter) {
+				TemporalityPreference = MetricReaderTemporalityPreference.Delta
+			};
+		});
+	}
+}
diff --git a/src/KurrentDB.Core/Metrics/LogicalChunkReadDistributionMetric.cs b/src/KurrentDB.Core/Metrics/LogicalChunkReadDistributionMetric.cs
new file mode 100644
index 00000000000..d0528538cce
--- /dev/null
+++ b/src/KurrentDB.Core/Metrics/LogicalChunkReadDistributionMetric.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Diagnostics.Metrics;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.Metrics;
+
+public class LogicalChunkReadDistributionMetric {
+	private readonly Histogram<long> _histogram;
+	private readonly IReadOnlyCheckpoint _writer;
+	private readonly int _chunkSize;
+
+	public LogicalChunkReadDistributionMetric(Meter meter, string name, IReadOnlyCheckpoint writer, int chunkSize) {
+		_histogram = meter.CreateHistogram<long>(name);
+		_writer = writer;
+		_chunkSize = chunkSize;
+	}
+
+	public void Record(ILogRecord record) {
+		// todo: consider sampling if this turns out to have a performance implication.
+		// in the mean time event read metrics can be turned off in metricsconfig.json
+		var recordLogicalChunk = record.LogPosition / _chunkSize;
+		var currentLogicalChunk = _writer.ReadNonFlushed() / _chunkSize;
+		_histogram.Record(currentLogicalChunk - recordLogicalChunk);
+	}
+}
diff --git a/src/EventStore.Core/Metrics/MaxMetric.cs b/src/KurrentDB.Core/Metrics/MaxMetric.cs
similarity index 75%
rename from src/EventStore.Core/Metrics/MaxMetric.cs
rename to src/KurrentDB.Core/Metrics/MaxMetric.cs
index ef0bf4f6196..93f09916e39 100644
--- a/src/EventStore.Core/Metrics/MaxMetric.cs
+++ b/src/KurrentDB.Core/Metrics/MaxMetric.cs
@@ -1,7 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System.Collections.Generic;
 using System.Diagnostics.Metrics;
 
-namespace EventStore.Core.Metrics;
+namespace KurrentDB.Core.Metrics;
 
 public class MaxMetric<T> where T : struct {
 	private readonly List<MaxTracker<T>> _trackers = new();
diff --git a/src/EventStore.Core/Metrics/MaxTracker.cs b/src/KurrentDB.Core/Metrics/MaxTracker.cs
similarity index 83%
rename from src/EventStore.Core/Metrics/MaxTracker.cs
rename to src/KurrentDB.Core/Metrics/MaxTracker.cs
index 45c5436c0de..2c4645c99d5 100644
--- a/src/EventStore.Core/Metrics/MaxTracker.cs
+++ b/src/KurrentDB.Core/Metrics/MaxTracker.cs
@@ -1,9 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Metrics;
-using EventStore.Core.Time;
+using KurrentDB.Core.Time;
 
-namespace EventStore.Core.Metrics;
+namespace KurrentDB.Core.Metrics;
 
 public interface IMaxTracker<T> {
 	void Record(T value);
diff --git a/src/EventStore.Core/Metrics/MessageLabelConfigurator.cs b/src/KurrentDB.Core/Metrics/MessageLabelConfigurator.cs
similarity index 88%
rename from src/EventStore.Core/Metrics/MessageLabelConfigurator.cs
rename to src/KurrentDB.Core/Metrics/MessageLabelConfigurator.cs
index 5aa7ae2c7c2..7d8933ebf6d 100644
--- a/src/EventStore.Core/Metrics/MessageLabelConfigurator.cs
+++ b/src/KurrentDB.Core/Metrics/MessageLabelConfigurator.cs
@@ -1,11 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using EventStore.Common.Configuration;
+using KurrentDB.Common.Configuration;
 using Serilog;
 
-namespace EventStore.Core.Metrics;
+namespace KurrentDB.Core.Metrics;
 
 public class MessageLabelConfigurator {
 	private static readonly ILogger Log = Serilog.Log.ForContext<MessageLabelConfigurator>();
diff --git a/src/EventStore.Core/Metrics/ObservableUpDownMetric.cs b/src/KurrentDB.Core/Metrics/ObservableUpDownMetric.cs
similarity index 79%
rename from src/EventStore.Core/Metrics/ObservableUpDownMetric.cs
rename to src/KurrentDB.Core/Metrics/ObservableUpDownMetric.cs
index a0331480d8d..b2ae9a6f85a 100644
--- a/src/EventStore.Core/Metrics/ObservableUpDownMetric.cs
+++ b/src/KurrentDB.Core/Metrics/ObservableUpDownMetric.cs
@@ -1,8 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Metrics;
 
-namespace EventStore.Core.Metrics;
+namespace KurrentDB.Core.Metrics;
 
 public class ObservableUpDownMetric<T> where T : struct {
 	private readonly List<Func<Measurement<T>>> _measurementProviders = new();
diff --git a/src/EventStore.Core/Metrics/PersistentSubscriptionTracker.cs b/src/KurrentDB.Core/Metrics/PersistentSubscriptionTracker.cs
similarity index 92%
rename from src/EventStore.Core/Metrics/PersistentSubscriptionTracker.cs
rename to src/KurrentDB.Core/Metrics/PersistentSubscriptionTracker.cs
index 33b69331c57..ebbf2852184 100644
--- a/src/EventStore.Core/Metrics/PersistentSubscriptionTracker.cs
+++ b/src/KurrentDB.Core/Metrics/PersistentSubscriptionTracker.cs
@@ -1,11 +1,13 @@
-using System;
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System.Collections.Generic;
 using System.Diagnostics.Metrics;
 using System.Linq;
-using EventStore.Common.Utils;
-using EventStore.Core.Messages;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
 
-namespace EventStore.Core.Metrics;
+namespace KurrentDB.Core.Metrics;
 
 public class PersistentSubscriptionTracker : IPersistentSubscriptionTracker {
 	private IReadOnlyList<MonitoringMessage.PersistentSubscriptionInfo> _currentStats = [];
diff --git a/src/KurrentDB.Core/Metrics/ProcessMetrics.cs b/src/KurrentDB.Core/Metrics/ProcessMetrics.cs
new file mode 100644
index 00000000000..c07a29c0776
--- /dev/null
+++ b/src/KurrentDB.Core/Metrics/ProcessMetrics.cs
@@ -0,0 +1,133 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.Metrics;
+using System.Linq;
+using System.Reflection;
+using System.Threading;
+using KurrentDB.Core.Util;
+using static KurrentDB.Common.Configuration.MetricsConfiguration;
+
+namespace KurrentDB.Core.Metrics;
+
+public class ProcessMetrics(Meter meter, TimeSpan timeout, int scrapingPeriodInSeconds, Dictionary<ProcessTracker, bool> config, bool legacyNames) {
+	private readonly Func<DiskIoData> _getDiskIo = Functions.Debounce(ProcessStats.GetDiskIo, timeout);
+	private readonly Func<Process> _getCurrentProc = Functions.Debounce(Process.GetCurrentProcess, timeout);
+
+	public void CreateObservableMetrics(Dictionary<ProcessTracker, string> metricNames) {
+		var enabledNames = metricNames
+			.Where(kvp => config.TryGetValue(kvp.Key, out var enabled) && enabled)
+			.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
+
+		if (enabledNames.TryGetValue(ProcessTracker.UpTime, out var upTimeName))
+			meter.CreateObservableCounter(upTimeName, () => {
+				var process = _getCurrentProc();
+				var upTime = (DateTime.Now - process.StartTime).TotalSeconds;
+				return new Measurement<double>(upTime, new KeyValuePair<string, object?>("pid", process.Id));
+			}, legacyNames ? null : "seconds");
+
+		if (enabledNames.TryGetValue(ProcessTracker.GcPauseDuration, out var gcMaxPauseName)) {
+			var maxGcPauseDurationMetric = new DurationMaxMetric(meter, gcMaxPauseName, legacyNames);
+			var maxGcPauseDurationTracker = new DurationMaxTracker(maxGcPauseDurationMetric, null, scrapingPeriodInSeconds);
+			_ = new GcSuspensionMetric(maxGcPauseDurationTracker);
+		}
+
+		CreateObservableCounter(ProcessTracker.LockContentionCount, () => Monitor.LockContentionCount);
+		CreateObservableCounter(ProcessTracker.ExceptionCount, RuntimeStats.GetExceptionCount);
+		CreateObservableCounter(ProcessTracker.TotalAllocatedBytes, () => GC.GetTotalAllocatedBytes(), "bytes");
+
+		CreateObservableUpDownCounter(ProcessTracker.Cpu, RuntimeStats.GetCpuUsage);
+		CreateObservableUpDownCounter(ProcessTracker.ThreadCount, () => ThreadPool.ThreadCount);
+		CreateObservableUpDownCounter(ProcessTracker.ThreadPoolPendingWorkItemCount, () => ThreadPool.PendingWorkItemCount);
+		CreateObservableUpDownCounter(ProcessTracker.TimeInGc, RuntimeStats.GetLastGCPercentTimeInGC);
+		CreateObservableUpDownCounter(ProcessTracker.HeapSize, () => GC.GetGCMemoryInfo().HeapSizeBytes, "bytes");
+		CreateObservableUpDownCounter(ProcessTracker.HeapFragmentation, () => {
+			var info = GC.GetGCMemoryInfo();
+			return info.HeapSizeBytes != 0 ? info.FragmentedBytes * 100d / info.HeapSizeBytes : 0;
+		});
+
+		return;
+
+		void CreateObservableCounter<T>(ProcessTracker tracker, Func<T> observe, string? unit = null) where T : struct {
+			if (enabledNames.TryGetValue(tracker, out var name))
+				meter.CreateObservableCounter(name, observe, legacyNames ? null : unit);
+		}
+
+		void CreateObservableUpDownCounter<T>(ProcessTracker tracker, Func<T> observe, string? unit = null) where T : struct {
+			if (enabledNames.TryGetValue(tracker, out var name))
+				if (legacyNames)
+					meter.CreateObservableUpDownCounter(unit is null ? name : $"{name}-{unit}", observe);
+				else
+					meter.CreateObservableUpDownCounter(name, observe, unit);
+		}
+	}
+
+	public void CreateMemoryMetric(string metricName, Dictionary<ProcessTracker, string> dimNames) {
+		var dims = new Dimensions<ProcessTracker, long>(config, dimNames, tag => new("kind", tag));
+
+		dims.Register(ProcessTracker.MemWorkingSet, () => _getCurrentProc().WorkingSet64);
+		dims.Register(ProcessTracker.MemPagedBytes, () => _getCurrentProc().PagedMemorySize64);
+		dims.Register(ProcessTracker.MemVirtualBytes, () => _getCurrentProc().VirtualMemorySize64);
+
+		if (dims.AnyRegistered())
+			if (legacyNames)
+				meter.CreateObservableGauge($"{metricName}-bytes", dims.GenObserve());
+			else
+				meter.CreateObservableGauge(metricName, dims.GenObserve(), "bytes");
+	}
+
+	public void CreateGcGenerationSizeMetric(string metricName, Dictionary<ProcessTracker, string> dimNames) {
+		var dims = new Dimensions<ProcessTracker, long>(config, dimNames, tag => new("generation", tag));
+
+		var getGcGenerationSize = typeof(GC)
+			.GetMethod("GetGenerationSize", BindingFlags.Static | BindingFlags.NonPublic)!
+			.CreateDelegate<Func<int, ulong>>();
+
+		dims.Register(ProcessTracker.Gen0Size, () => (long)getGcGenerationSize(0));
+		dims.Register(ProcessTracker.Gen1Size, () => (long)getGcGenerationSize(1));
+		dims.Register(ProcessTracker.Gen2Size, () => (long)getGcGenerationSize(2));
+		dims.Register(ProcessTracker.LohSize, () => (long)getGcGenerationSize(3));
+
+		if (dims.AnyRegistered())
+			if (legacyNames)
+				meter.CreateObservableUpDownCounter($"{metricName}-bytes", dims.GenObserve());
+			else
+				meter.CreateObservableUpDownCounter(metricName, dims.GenObserve(), "bytes");
+	}
+
+	public void CreateGcCollectionCountMetric(string metricName, Dictionary<ProcessTracker, string> dimNames) {
+		var dims = new Dimensions<ProcessTracker, int>(config, dimNames, tag => new("generation", tag));
+
+		dims.Register(ProcessTracker.Gen0CollectionCount, () => GC.CollectionCount(0));
+		dims.Register(ProcessTracker.Gen1CollectionCount, () => GC.CollectionCount(1));
+		dims.Register(ProcessTracker.Gen2CollectionCount, () => GC.CollectionCount(2));
+
+		if (dims.AnyRegistered())
+			meter.CreateObservableCounter(metricName, dims.GenObserve());
+	}
+
+	public void CreateDiskBytesMetric(string metricName, Dictionary<ProcessTracker, string> dimNames) {
+		var dims = new Dimensions<ProcessTracker, long>(config, dimNames, tag => new("activity", tag));
+
+		dims.Register(ProcessTracker.DiskReadBytes, () => (long)_getDiskIo().ReadBytes);
+		dims.Register(ProcessTracker.DiskWrittenBytes, () => (long)_getDiskIo().WrittenBytes);
+
+		if (dims.AnyRegistered())
+			meter.CreateObservableCounter(metricName, dims.GenObserve(), legacyNames ? null : "bytes");
+	}
+
+	public void CreateDiskOpsMetric(string name, Dictionary<ProcessTracker, string> dimNames) {
+		var dims = new Dimensions<ProcessTracker, long>(config, dimNames, tag => new("activity", tag));
+
+		dims.Register(ProcessTracker.DiskReadOps, () => (long)_getDiskIo().ReadOps);
+		dims.Register(ProcessTracker.DiskWrittenOps, () => (long)_getDiskIo().WriteOps);
+
+		if (dims.AnyRegistered())
+			meter.CreateObservableCounter(name, dims.GenObserve(), legacyNames ? null : "operations");
+	}
+}
diff --git a/src/KurrentDB.Core/Metrics/QueueBusyTracker.cs b/src/KurrentDB.Core/Metrics/QueueBusyTracker.cs
new file mode 100644
index 00000000000..433f242f7a3
--- /dev/null
+++ b/src/KurrentDB.Core/Metrics/QueueBusyTracker.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Diagnostics;
+
+namespace KurrentDB.Core.Metrics;
+
+public interface IQueueBusyTracker {
+	void EnterBusy();
+	void EnterIdle();
+}
+
+public class QueueBusyTracker : IQueueBusyTracker {
+	private readonly Stopwatch _stopwatch = new();
+
+	public QueueBusyTracker(AverageMetric metric, string label) {
+		metric.Register(label, () => _stopwatch.Elapsed.TotalSeconds);
+	}
+
+	public void EnterBusy() => _stopwatch.Start();
+
+	public void EnterIdle() => _stopwatch.Stop();
+
+	public class NoOp : IQueueBusyTracker {
+		public void EnterBusy() {
+		}
+
+		public void EnterIdle() {
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Metrics/QueueProcessingTracker.cs b/src/KurrentDB.Core/Metrics/QueueProcessingTracker.cs
new file mode 100644
index 00000000000..1af81731574
--- /dev/null
+++ b/src/KurrentDB.Core/Metrics/QueueProcessingTracker.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Time;
+
+namespace KurrentDB.Core.Metrics;
+
+public interface IQueueProcessingTracker {
+	// returns the current time
+	Instant RecordNow(Instant start, string messageType);
+}
+
+public class QueueProcessingTracker : IQueueProcessingTracker {
+	private readonly DurationMetric _metric;
+	private readonly string _queueName;
+
+	public QueueProcessingTracker(DurationMetric metric, string queueName) {
+		_metric = metric;
+		_queueName = queueName;
+	}
+
+	public Instant RecordNow(Instant start, string messageType) {
+		return _metric.Record(
+			start: start,
+			new KeyValuePair<string, object>("queue", _queueName),
+			new KeyValuePair<string, object>("message-type", messageType));
+	}
+
+	public class NoOp : IQueueProcessingTracker {
+		public Instant RecordNow(Instant start, string messageType) => Instant.Now;
+	}
+}
diff --git a/src/KurrentDB.Core/Metrics/QueueTracker.cs b/src/KurrentDB.Core/Metrics/QueueTracker.cs
new file mode 100644
index 00000000000..4c4407db51e
--- /dev/null
+++ b/src/KurrentDB.Core/Metrics/QueueTracker.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Time;
+
+namespace KurrentDB.Core.Metrics;
+
+// Composite tracker for tracking the various things that queues want to track.
+// i.e.
+//   - queue being busy/idle
+//   - Duration items spent in the queue
+//   - Processing time of items at the end of the queue
+public class QueueTracker {
+	private readonly string _name;
+	private readonly IQueueBusyTracker _busyTracker;
+	private readonly IDurationMaxTracker _queueingDurationTracker;
+	private readonly IQueueProcessingTracker _queueProcessingTracker;
+	private readonly IClock _clock;
+
+	public QueueTracker(
+		string name,
+		IQueueBusyTracker busyTracker,
+		IDurationMaxTracker queueingDurationTracker,
+		IQueueProcessingTracker processingDurationTracker,
+		IClock clock = null) {
+
+		_name = name;
+		_queueingDurationTracker = queueingDurationTracker;
+		_queueProcessingTracker = processingDurationTracker;
+		_busyTracker = busyTracker;
+		_clock = clock ?? Clock.Instance;
+	}
+
+	public string Name => _name;
+
+	public Instant Now => _clock.Now;
+
+	public void EnterBusy() => _busyTracker.EnterBusy();
+
+	public void EnterIdle() => _busyTracker.EnterIdle();
+
+	public Instant RecordMessageDequeued(Instant enqueuedAt) {
+		return _queueingDurationTracker.RecordNow(enqueuedAt);
+	}
+
+	public Instant RecordMessageProcessed(Instant processingStartedAt, string messageType) {
+		return _queueProcessingTracker.RecordNow(processingStartedAt, messageType);
+	}
+}
diff --git a/src/EventStore.Core/Metrics/QueueTrackers.cs b/src/KurrentDB.Core/Metrics/QueueTrackers.cs
similarity index 93%
rename from src/EventStore.Core/Metrics/QueueTrackers.cs
rename to src/KurrentDB.Core/Metrics/QueueTrackers.cs
index 1f064942d58..baae6720eb3 100644
--- a/src/EventStore.Core/Metrics/QueueTrackers.cs
+++ b/src/KurrentDB.Core/Metrics/QueueTrackers.cs
@@ -1,10 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using Serilog;
-using Conf = EventStore.Common.Configuration.MetricsConfiguration;
+using Conf = KurrentDB.Common.Configuration.MetricsConfiguration;
 
-namespace EventStore.Core.Metrics;
+namespace KurrentDB.Core.Metrics;
 
 // Some of the trackers are shared between all the queues that have the same label
 // We cache those in _sharedTrackers.
diff --git a/src/EventStore.Core/Metrics/RecentMax.cs b/src/KurrentDB.Core/Metrics/RecentMax.cs
similarity index 95%
rename from src/EventStore.Core/Metrics/RecentMax.cs
rename to src/KurrentDB.Core/Metrics/RecentMax.cs
index 4e62e1bb17e..dd2d6addb88 100644
--- a/src/EventStore.Core/Metrics/RecentMax.cs
+++ b/src/KurrentDB.Core/Metrics/RecentMax.cs
@@ -1,9 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using EventStore.Core.Time;
+using KurrentDB.Core.Time;
 
-namespace EventStore.Core.Metrics;
+namespace KurrentDB.Core.Metrics;
 
 // When observed, this returns the max value that it has been asked to record over the last x
 // seconds, where x is not exact, but within a known range.
@@ -42,7 +45,7 @@ public RecentMax(int expectedScrapeIntervalSeconds) {
 
 		_maxBuckets = new T[_numBuckets];
 	}
-	 
+
 	public long MinPeriodSeconds { get; init; }
 	public long MaxPeriodSeconds { get; init; }
 
diff --git a/src/KurrentDB.Core/Metrics/StatusMetric.cs b/src/KurrentDB.Core/Metrics/StatusMetric.cs
new file mode 100644
index 00000000000..c08267be2e8
--- /dev/null
+++ b/src/KurrentDB.Core/Metrics/StatusMetric.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Diagnostics.Metrics;
+using KurrentDB.Core.Time;
+
+namespace KurrentDB.Core.Metrics;
+
+// A metric that tracks the statuses of multiple components.
+// We are only expecting to have a handful of components.
+public class StatusMetric {
+	private readonly List<StatusSubMetric> _subMetrics = new();
+	private readonly IClock _clock;
+
+	public StatusMetric(Meter meter, string name, bool legacyNames, IClock clock = null) {
+		_clock = clock ?? Clock.Instance;
+		if (legacyNames)
+			meter.CreateObservableCounter(name, Observe);
+		else
+			meter.CreateObservableGauge(name, Observe);
+	}
+
+	public void Add(StatusSubMetric subMetric) {
+		lock (_subMetrics) {
+			_subMetrics.Add(subMetric);
+		}
+	}
+
+	private IEnumerable<Measurement<long>> Observe() {
+		var secondsSinceEpoch = _clock.SecondsSinceEpoch;
+		lock (_subMetrics) {
+			foreach (var instance in _subMetrics) {
+				yield return instance.Observe(secondsSinceEpoch);
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Metrics/StatusSubMetric.cs b/src/KurrentDB.Core/Metrics/StatusSubMetric.cs
new file mode 100644
index 00000000000..69b6c7ec9f6
--- /dev/null
+++ b/src/KurrentDB.Core/Metrics/StatusSubMetric.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Metrics;
+using System.Threading;
+
+namespace KurrentDB.Core.Metrics;
+
+// Use this class if the status can transition from one to another, as in a state machine
+// Use ActivityStatusMetric if the status represents an activity that starts and stops
+//
+// This does create a time series for each name * status that gets instantiated.
+// However, prometheus does efficiently store series whose values are not changing.
+//
+// The component name and status are stored in tags
+// The value contains time in seconds since epoch so we can tell which status is active
+//
+// Multiple threads can SetStatus and Observe concurrently
+public class StatusSubMetric {
+	private readonly KeyValuePair<string, object>[] _tags;
+	private string _status;
+
+	public StatusSubMetric(string componentName, object initialStatus, StatusMetric metric) {
+		_status = initialStatus?.ToString();
+		_tags = new[] {
+			new KeyValuePair<string, object>("name", componentName),
+			new KeyValuePair<string, object>("status", _status),
+		};
+
+		metric.Add(this);
+	}
+
+	public void SetStatus(string status) {
+		Interlocked.Exchange(ref _status, status);
+	}
+
+	public Measurement<long> Observe(long secondsSinceEpoch) {
+		_tags[1] = new KeyValuePair<string, object>("status", _status);
+		return new Measurement<long>(secondsSinceEpoch, _tags.AsSpan());
+	}
+}
diff --git a/src/KurrentDB.Core/Metrics/SystemMetrics.cs b/src/KurrentDB.Core/Metrics/SystemMetrics.cs
new file mode 100644
index 00000000000..42a79a4af14
--- /dev/null
+++ b/src/KurrentDB.Core/Metrics/SystemMetrics.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.Metrics;
+using System.Runtime;
+using KurrentDB.Core.Util;
+using static KurrentDB.Common.Configuration.MetricsConfiguration;
+
+namespace KurrentDB.Core.Metrics;
+
+public class SystemMetrics(Meter meter, TimeSpan timeout, Dictionary<SystemTracker, bool> config, bool legacyNames) {
+	public void CreateLoadAverageMetric(string metricName, Dictionary<SystemTracker, string> dimNames) {
+		if (RuntimeInformation.IsWindows)
+			return;
+
+		var dims = new Dimensions<SystemTracker, double>(config, dimNames, tag => new("period", tag));
+
+		var getLoadAverages = Functions.Debounce(RuntimeStats.GetCpuLoadAverages, timeout);
+		dims.Register(SystemTracker.LoadAverage1m, () => getLoadAverages().OneMinute);
+		dims.Register(SystemTracker.LoadAverage5m, () => getLoadAverages().FiveMinutes);
+		dims.Register(SystemTracker.LoadAverage15m, () => getLoadAverages().FifteenMinutes);
+
+		if (dims.AnyRegistered())
+			meter.CreateObservableGauge(metricName, dims.GenObserve());
+	}
+
+	public void CreateCpuMetric(string name) {
+		if (!config.TryGetValue(SystemTracker.Cpu, out var enabled) || !enabled)
+			return;
+
+		meter.CreateObservableUpDownCounter(name, RuntimeStats.GetCpuUsage);
+	}
+
+	public void CreateMemoryMetric(string metricName, Dictionary<SystemTracker, string> dimNames) {
+		var dims = new Dimensions<SystemTracker, long>(config, dimNames, tag => new("kind", tag));
+
+		dims.Register(SystemTracker.FreeMem, RuntimeStats.GetFreeMemory);
+		dims.Register(SystemTracker.TotalMem, RuntimeStats.GetTotalMemory);
+
+		if (dims.AnyRegistered())
+			if (legacyNames)
+				meter.CreateObservableGauge($"{metricName}-bytes", dims.GenObserve());
+			else
+				meter.CreateObservableGauge(metricName, dims.GenObserve(), "bytes");
+	}
+
+	public void CreateDiskMetric(string metricName, string dbPath, Dictionary<SystemTracker, string> dimNames) {
+		var dims = new Dimensions<SystemTracker, long>(config, dimNames, tag => new());
+
+		var getDriveInfo = Functions.Debounce(() => DriveStats.GetDriveInfo(dbPath), timeout);
+
+		dims.Register(SystemTracker.DriveUsedBytes, GenMeasure(info => info.UsedBytes));
+		dims.Register(SystemTracker.DriveTotalBytes, GenMeasure(info => info.TotalBytes));
+
+		if (dims.AnyRegistered())
+			if (legacyNames)
+				meter.CreateObservableGauge($"{metricName}-bytes", dims.GenObserve());
+			else
+				meter.CreateObservableGauge(metricName, dims.GenObserve(), "bytes");
+
+		return;
+
+		Func<string, Measurement<long>> GenMeasure(Func<DriveData, long> func) => tag => {
+			var info = getDriveInfo();
+
+			return new(
+				func(info),
+				new("kind", tag),
+				new("disk", info.DiskName)
+			);
+		};
+	}
+}
diff --git a/src/KurrentDB.Core/MetricsBootstrapper.cs b/src/KurrentDB.Core/MetricsBootstrapper.cs
new file mode 100644
index 00000000000..394ec5e0a3d
--- /dev/null
+++ b/src/KurrentDB.Core/MetricsBootstrapper.cs
@@ -0,0 +1,339 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Metrics;
+using System.Linq;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.VNode;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Scavenging;
+using Conf = KurrentDB.Common.Configuration.MetricsConfiguration;
+
+namespace KurrentDB.Core;
+
+public class Trackers {
+	public IInaugurationStatusTracker InaugurationStatusTracker { get; set; } = new NodeStatusTracker.NoOp();
+	public IIndexStatusTracker IndexStatusTracker { get; set; } = new IndexStatusTracker.NoOp();
+	public INodeStatusTracker NodeStatusTracker { get; set; } = new NodeStatusTracker.NoOp();
+	public IScavengeStatusTracker ScavengeStatusTracker { get; set; } = new ScavengeStatusTracker.NoOp();
+	public GrpcTrackers GrpcTrackers { get; } = new();
+	public QueueTrackers QueueTrackers { get; set; } = new();
+	public GossipTrackers GossipTrackers { get; set; } = new();
+	public ITransactionFileTracker TransactionFileTracker { get; set; } = new TFChunkTracker.NoOp();
+	public IIndexTracker IndexTracker { get; set; } = new IndexTracker.NoOp();
+	public IMaxTracker<long> WriterFlushSizeTracker { get; set; } = new MaxTracker<long>.NoOp();
+	public IDurationMaxTracker WriterFlushDurationTracker { get; set; } = new DurationMaxTracker.NoOp();
+	public ICacheHitsMissesTracker CacheHitsMissesTracker { get; set; } = new CacheHitsMissesTracker.NoOp();
+	public ICacheResourcesTracker CacheResourcesTracker { get; set; } = new CacheResourcesTracker.NoOp();
+	public IElectionCounterTracker ElectionCounterTracker { get; set; } = new ElectionsCounterTracker.NoOp();
+	public IPersistentSubscriptionTracker PersistentSubscriptionTracker { get; set; } =
+		IPersistentSubscriptionTracker.NoOp;
+}
+
+public class GrpcTrackers {
+	private readonly IDurationTracker[] _trackers;
+
+	public GrpcTrackers() {
+		_trackers = new IDurationTracker[Enum.GetValues<Conf.GrpcMethod>().Cast<int>().Max() + 1];
+		var noOp = new DurationTracker.NoOp();
+		for (var i = 0; i < _trackers.Length; i++)
+			_trackers[i] = noOp;
+	}
+
+	public IDurationTracker this[Conf.GrpcMethod index] {
+		get => _trackers[(int)index];
+		set => _trackers[(int)index] = value;
+	}
+}
+
+public class GossipTrackers {
+	public IDurationTracker PullFromPeer { get; set; } = new DurationTracker.NoOp();
+	public IDurationTracker PushToPeer { get; set; } = new DurationTracker.NoOp();
+	public IDurationTracker ProcessingPushFromPeer { get; set; } = new DurationTracker.NoOp();
+	public IDurationTracker ProcessingRequestFromPeer { get; set; } = new DurationTracker.NoOp();
+	public IDurationTracker ProcessingRequestFromHttpClient { get; set; } = new DurationTracker.NoOp();
+	public IDurationTracker ProcessingRequestFromGrpcClient { get; set; } = new DurationTracker.NoOp();
+}
+
+public static class MetricsBootstrapper {
+	public static string LogicalChunkReadDistributionName(string serviceName) => $"{serviceName}-logical-chunk-read-distribution";
+
+	public static void Bootstrap(
+		Conf conf,
+		TFChunkDbConfig dbConfig,
+		Trackers trackers) {
+
+		OptionsFormatter.LogConfig("Metrics", conf);
+
+		MessageLabelConfigurator.ConfigureMessageLabels(
+			conf.MessageTypes, InMemoryBus.KnownMessageTypes);
+
+		var useLegacyNames = conf.LegacyCoreNaming;
+		var serviceName = conf.ServiceName;
+
+		if (conf.ExpectedScrapeIntervalSeconds <= 0)
+			return;
+
+		var coreMeter = new Meter(conf.CoreMeterName, version: "1.0.0");
+		var statusMetric = new StatusMetric(coreMeter, $"{serviceName}-statuses", useLegacyNames);
+		var grpcMethodMetric = new DurationMetric(coreMeter, $"{serviceName}-grpc-method-duration", useLegacyNames);
+		var gossipLatencyMetric = new DurationMetric(coreMeter, $"{serviceName}-gossip-latency", useLegacyNames);
+		var gossipProcessingMetric = new DurationMetric(coreMeter, $"{serviceName}-gossip-processing-duration", useLegacyNames);
+		var queueQueueingDurationMaxMetric = new DurationMaxMetric(coreMeter, $"{serviceName}-queue-queueing-duration-max", useLegacyNames);
+		var queueProcessingDurationMetric = new DurationMetric(coreMeter, $"{serviceName}-queue-processing-duration", useLegacyNames);
+		var queueBusyMetric = new AverageMetric(coreMeter, $"{serviceName}-queue-busy", "seconds", label => new("queue", label), useLegacyNames);
+		var byteMetric = new CounterMetric(coreMeter, $"{serviceName}-io-bytes", unit: useLegacyNames ? null : "bytes", legacyNames: false);
+		var eventMetric = new CounterMetric(coreMeter, $"{serviceName}-io-events", unit: useLegacyNames ? null : "events", legacyNames: false);
+		var recordReadDurationMetric = new DurationMetric(coreMeter, $"{serviceName}-io-record-read-duration", useLegacyNames);
+		var electionsCounterMetric = new CounterMetric(coreMeter, $"{serviceName}-elections-count", unit: "", useLegacyNames);
+
+		// incoming grpc calls
+		var enabledCalls = conf.IncomingGrpcCalls.Where(kvp => kvp.Value).Select(kvp => kvp.Key).ToArray();
+		if (enabledCalls.Length > 0) {
+			_ = new IncomingGrpcCallsMetric(
+				coreMeter,
+				$"{serviceName}-current-incoming-grpc-calls",
+				$"{serviceName}-incoming-grpc-calls",
+				enabledCalls);
+		}
+
+		// cache hits/misses
+		var enabledCacheHitsMisses = conf.CacheHitsMisses.Where(kvp => kvp.Value).Select(kvp => kvp.Key).ToArray();
+		if (enabledCacheHitsMisses.Length > 0) {
+			var metric = new CacheHitsMissesMetric(coreMeter, enabledCacheHitsMisses, $"{serviceName}-cache-hits-misses", new() {
+				{ Conf.Cache.StreamInfo, "stream-info" },
+				{ Conf.Cache.Chunk, "chunk" },
+			});
+			trackers.CacheHitsMissesTracker = new CacheHitsMissesTracker(metric);
+		}
+
+		// dynamic cache resources
+		if (conf.CacheResources) {
+			var metrics = new CacheResourcesMetrics(coreMeter, $"{serviceName}-cache-resources", useLegacyNames);
+			trackers.CacheResourcesTracker = new CacheResourcesTracker(metrics);
+		}
+
+		// elections count
+		if (conf.ElectionsCount) {
+			trackers.ElectionCounterTracker = new ElectionsCounterTracker(new CounterSubMetric(electionsCounterMetric, []));
+		}
+
+		// events
+		if (conf.Events.TryGetValue(Conf.EventTracker.Read, out var readEnabled) && readEnabled) {
+			var readTag = new KeyValuePair<string, object>("activity", "read");
+			trackers.TransactionFileTracker = new TFChunkTracker(
+				readDistribution: new LogicalChunkReadDistributionMetric(
+					meter: coreMeter,
+					name: LogicalChunkReadDistributionName(serviceName),
+					writer: dbConfig.WriterCheckpoint,
+					chunkSize: dbConfig.ChunkSize),
+				readDurationMetric: recordReadDurationMetric,
+				readBytes: new CounterSubMetric(byteMetric, [readTag]),
+				readEvents: new CounterSubMetric(eventMetric, [readTag]));
+		}
+
+		// from a users perspective an event is written when it is indexed: thats when it can be read.
+		if (conf.Events.TryGetValue(Conf.EventTracker.Written, out var writtenEnabled) && writtenEnabled) {
+			trackers.IndexTracker = new IndexTracker(new CounterSubMetric(
+				eventMetric,
+				new[] { new KeyValuePair<string, object>("activity", "written") }));
+		}
+
+		// gossip
+		if (conf.Gossip.Count != 0) {
+			if (conf.Gossip.TryGetValue(Conf.GossipTracker.PullFromPeer, out var pullFromPeer) && pullFromPeer)
+				trackers.GossipTrackers.PullFromPeer = new DurationTracker(gossipLatencyMetric, "pull-from-peer");
+
+			if (conf.Gossip.TryGetValue(Conf.GossipTracker.PushToPeer, out var pushToPeer) && pushToPeer)
+				trackers.GossipTrackers.PushToPeer = new DurationTracker(gossipLatencyMetric, "push-to-peer");
+
+			if (conf.Gossip.TryGetValue(Conf.GossipTracker.ProcessingPushFromPeer, out var processingPushFromPeer) && processingPushFromPeer)
+				trackers.GossipTrackers.ProcessingPushFromPeer = new DurationTracker(gossipProcessingMetric, "push-from-peer");
+
+			if (conf.Gossip.TryGetValue(Conf.GossipTracker.ProcessingRequestFromPeer, out var processingRequestFromPeer) && processingRequestFromPeer)
+				trackers.GossipTrackers.ProcessingRequestFromPeer = new DurationTracker(gossipProcessingMetric, "request-from-peer");
+
+			if (conf.Gossip.TryGetValue(Conf.GossipTracker.ProcessingRequestFromGrpcClient, out var processingRequestFromGrpcClient) && processingRequestFromGrpcClient)
+				trackers.GossipTrackers.ProcessingRequestFromGrpcClient = new DurationTracker(gossipProcessingMetric, "request-from-grpc-client");
+
+			if (conf.Gossip.TryGetValue(Conf.GossipTracker.ProcessingRequestFromHttpClient, out var processingRequestFromHttpClient) && processingRequestFromHttpClient)
+				trackers.GossipTrackers.ProcessingRequestFromHttpClient = new DurationTracker(gossipProcessingMetric, "request-from-http-client");
+		}
+
+		// persistent subscriptions
+		if (conf.PersistentSubscriptionStats) {
+			var tracker = new PersistentSubscriptionTracker();
+			trackers.PersistentSubscriptionTracker = tracker;
+
+			coreMeter.CreateObservableUpDownCounter($"{serviceName}-persistent-sub-connections", tracker.ObserveConnectionsCount);
+			coreMeter.CreateObservableUpDownCounter($"{serviceName}-persistent-sub-parked-messages", tracker.ObserveParkedMessages);
+			coreMeter.CreateObservableUpDownCounter($"{serviceName}-persistent-sub-in-flight-messages", tracker.ObserveInFlightMessages);
+			coreMeter.CreateObservableUpDownCounter($"{serviceName}-persistent-sub-oldest-parked-message-seconds", tracker.ObserveOldestParkedMessage);
+
+			// these only go up, but are not strictly counters; should not have `_total` appended
+			coreMeter.CreateObservableUpDownCounter($"{serviceName}-persistent-sub-last-known-event-number", tracker.ObserveLastKnownEvent);
+			coreMeter.CreateObservableUpDownCounter($"{serviceName}-persistent-sub-last-known-event-commit-position", tracker.ObserveLastKnownEventCommitPosition);
+			coreMeter.CreateObservableUpDownCounter($"{serviceName}-persistent-sub-checkpointed-event-number", tracker.ObserveLastCheckpointedEvent);
+			coreMeter.CreateObservableUpDownCounter($"{serviceName}-persistent-sub-checkpointed-event-commit-position", tracker.ObserveLastCheckpointedEventCommitPosition);
+
+			coreMeter.CreateObservableCounter($"{serviceName}-persistent-sub-items-processed", tracker.ObserveItemsProcessed);
+		}
+
+		// checkpoints
+		_ = new CheckpointMetric(
+			coreMeter,
+			$"{serviceName}-checkpoints",
+			conf.Checkpoints.Where(x => x.Value).Select(x => x.Key switch {
+				Conf.Checkpoint.Chaser => dbConfig.ChaserCheckpoint,
+				Conf.Checkpoint.Epoch => dbConfig.EpochCheckpoint,
+				Conf.Checkpoint.Index => dbConfig.IndexCheckpoint,
+				Conf.Checkpoint.Proposal => dbConfig.ProposalCheckpoint,
+				Conf.Checkpoint.Replication => dbConfig.ReplicationCheckpoint,
+				Conf.Checkpoint.StreamExistenceFilter => dbConfig.StreamExistenceFilterCheckpoint,
+				Conf.Checkpoint.Truncate => dbConfig.TruncateCheckpoint,
+				Conf.Checkpoint.Writer => dbConfig.WriterCheckpoint,
+				_ => throw new Exception(
+					$"Unknown checkpoint in MetricsConfiguration. Valid values are " +
+					$"{string.Join(", ", Enum.GetValues<Conf.Checkpoint>())}"),
+			}).ToArray());
+
+		// status metrics
+		if (conf.Statuses.Count > 0) {
+			if (conf.Statuses.TryGetValue(Conf.StatusTracker.Node, out var nodeStatus) && nodeStatus) {
+				var tracker = new NodeStatusTracker(statusMetric);
+				trackers.NodeStatusTracker = tracker;
+				trackers.InaugurationStatusTracker = tracker;
+			}
+
+			if (conf.Statuses.TryGetValue(Conf.StatusTracker.Index, out var indexStatus) && indexStatus)
+				trackers.IndexStatusTracker = new IndexStatusTracker(statusMetric);
+
+			if (conf.Statuses.TryGetValue(Conf.StatusTracker.Scavenge, out var scavengeStatus) && scavengeStatus)
+				trackers.ScavengeStatusTracker = new ScavengeStatusTracker(statusMetric);
+		}
+
+		// grpc histograms
+		foreach (var method in Enum.GetValues<Conf.GrpcMethod>()) {
+			if (conf.GrpcMethods.TryGetValue(method, out var label) && !string.IsNullOrWhiteSpace(label))
+				trackers.GrpcTrackers[method] = new DurationTracker(grpcMethodMetric, label);
+		}
+
+		// storage writer
+		if (conf.Writer.Count > 0) {
+			if (conf.Writer.TryGetValue(Conf.WriterTracker.FlushSize, out var flushSizeEnabled) && flushSizeEnabled) {
+				var maxMetric = new MaxMetric<long>(coreMeter, $"{serviceName}-writer-flush-size-max");
+				trackers.WriterFlushSizeTracker = new MaxTracker<long>(
+					metric: maxMetric,
+					name: null,
+					expectedScrapeIntervalSeconds: conf.ExpectedScrapeIntervalSeconds);
+			}
+
+			if (conf.Writer.TryGetValue(Conf.WriterTracker.FlushDuration, out var flushDurationEnabled) && flushDurationEnabled) {
+				var maxDurationmetric = new DurationMaxMetric(coreMeter, $"{serviceName}-writer-flush-duration-max", useLegacyNames);
+				trackers.WriterFlushDurationTracker = new DurationMaxTracker(
+					maxDurationmetric,
+					name: null,
+					expectedScrapeIntervalSeconds: conf.ExpectedScrapeIntervalSeconds);
+			}
+		}
+
+		// queue trackers
+		Func<string, IQueueBusyTracker> busyTrackerFactory = name => new QueueBusyTracker.NoOp();
+		Func<string, IDurationMaxTracker> lengthFactory = name => new DurationMaxTracker.NoOp();
+		Func<string, IQueueProcessingTracker> processingFactory = name => new QueueProcessingTracker.NoOp();
+
+		if (conf.Queues.TryGetValue(Conf.QueueTracker.Busy, out var busyEnabled) && busyEnabled)
+			busyTrackerFactory = name => new QueueBusyTracker(queueBusyMetric, name);
+
+		if (conf.Queues.TryGetValue(Conf.QueueTracker.Length, out var lengthEnabled) && lengthEnabled)
+			lengthFactory = name => new DurationMaxTracker(
+				name: name,
+				metric: queueQueueingDurationMaxMetric,
+				expectedScrapeIntervalSeconds: conf.ExpectedScrapeIntervalSeconds);
+
+		if (conf.Queues.TryGetValue(Conf.QueueTracker.Processing, out var processingEnabled) && processingEnabled)
+			processingFactory = name => new QueueProcessingTracker(queueProcessingDurationMetric, name);
+
+		trackers.QueueTrackers = new QueueTrackers(conf.QueueLabels, busyTrackerFactory, lengthFactory, processingFactory);
+
+		// kestrel
+		if (conf.Kestrel.TryGetValue(Conf.KestrelTracker.ConnectionCount, out var kestrelConnections) && kestrelConnections) {
+			_ = new ConnectionMetric(coreMeter, $"{serviceName}-kestrel-connections");
+		}
+
+		var timeout = TimeSpan.FromSeconds(1);
+
+		// system
+		var systemMetrics = new SystemMetrics(coreMeter, timeout, conf.System, useLegacyNames);
+		systemMetrics.CreateLoadAverageMetric($"{serviceName}-sys-load-avg", new() {
+			{ Conf.SystemTracker.LoadAverage1m, "1m" },
+			{ Conf.SystemTracker.LoadAverage5m, "5m" },
+			{ Conf.SystemTracker.LoadAverage15m, "15m" },
+		});
+
+		systemMetrics.CreateCpuMetric($"{serviceName}-sys-cpu");
+
+		systemMetrics.CreateMemoryMetric($"{serviceName}-sys-mem", new() {
+			{ Conf.SystemTracker.FreeMem, "free" },
+			{ Conf.SystemTracker.TotalMem, "total" },
+		});
+
+		systemMetrics.CreateDiskMetric($"{serviceName}-sys-disk", dbConfig.Path, new() {
+			{ Conf.SystemTracker.DriveTotalBytes, "total" },
+			{ Conf.SystemTracker.DriveUsedBytes, "used" },
+		});
+
+		// process
+		var processMetrics = new ProcessMetrics(coreMeter, timeout, conf.ExpectedScrapeIntervalSeconds, conf.Process, useLegacyNames);
+		processMetrics.CreateObservableMetrics(new() {
+			{ Conf.ProcessTracker.UpTime, $"{serviceName}-proc-up-time" },
+			{ Conf.ProcessTracker.Cpu, $"{serviceName}-proc-cpu" },
+			{ Conf.ProcessTracker.ThreadCount, $"{serviceName}-proc-thread-count" },
+			{ Conf.ProcessTracker.ThreadPoolPendingWorkItemCount, $"{serviceName}-proc-thread-pool-pending-work-item-count" },
+			{ Conf.ProcessTracker.LockContentionCount, $"{serviceName}-proc-contention-count" },
+			{ Conf.ProcessTracker.ExceptionCount, $"{serviceName}-proc-exception-count" },
+			{ Conf.ProcessTracker.TimeInGc, $"{serviceName}-gc-time-in-gc" },
+			{ Conf.ProcessTracker.HeapSize, $"{serviceName}-gc-heap-size" },
+			{ Conf.ProcessTracker.HeapFragmentation, $"{serviceName}-gc-heap-fragmentation" },
+			{ Conf.ProcessTracker.TotalAllocatedBytes, useLegacyNames
+				? $"{serviceName}-gc-total-allocated"
+				: $"{serviceName}-gc-allocated" },
+			{ Conf.ProcessTracker.GcPauseDuration, $"{serviceName}-gc-pause-duration-max" },
+		});
+
+		processMetrics.CreateMemoryMetric($"{serviceName}-proc-mem", new() {
+			{ Conf.ProcessTracker.MemWorkingSet, "working-set" },
+			{ Conf.ProcessTracker.MemPagedBytes, "paged-bytes" },
+			{ Conf.ProcessTracker.MemVirtualBytes, "virtual-bytes" },
+		});
+
+		processMetrics.CreateGcGenerationSizeMetric($"{serviceName}-gc-generation-size", new() {
+			{ Conf.ProcessTracker.Gen0Size, "gen0" },
+			{ Conf.ProcessTracker.Gen1Size, "gen1" },
+			{ Conf.ProcessTracker.Gen2Size, "gen2" },
+			{ Conf.ProcessTracker.LohSize, "loh" },
+		});
+
+		processMetrics.CreateGcCollectionCountMetric($"{serviceName}-gc-collection-count", new() {
+			{ Conf.ProcessTracker.Gen0CollectionCount, "gen0" },
+			{ Conf.ProcessTracker.Gen1CollectionCount, "gen1" },
+			{ Conf.ProcessTracker.Gen2CollectionCount, "gen2" },
+		});
+
+		processMetrics.CreateDiskBytesMetric($"{serviceName}-disk-io-bytes", new() {
+			{ Conf.ProcessTracker.DiskReadBytes, "read" },
+			{ Conf.ProcessTracker.DiskWrittenBytes, "written" },
+		});
+
+		processMetrics.CreateDiskOpsMetric($"{serviceName}-disk-io-operations", new() {
+			{ Conf.ProcessTracker.DiskReadOps, "read" },
+			{ Conf.ProcessTracker.DiskWrittenOps, "written" },
+		});
+	}
+}
diff --git a/src/KurrentDB.Core/NodeSubsystems.cs b/src/KurrentDB.Core/NodeSubsystems.cs
new file mode 100644
index 00000000000..a20d1ca2c7f
--- /dev/null
+++ b/src/KurrentDB.Core/NodeSubsystems.cs
@@ -0,0 +1,8 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core;
+
+public enum NodeSubsystems {
+	Projections
+}
diff --git a/src/KurrentDB.Core/NodeTcpOptions.cs b/src/KurrentDB.Core/NodeTcpOptions.cs
new file mode 100644
index 00000000000..6383d84ccae
--- /dev/null
+++ b/src/KurrentDB.Core/NodeTcpOptions.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core;
+
+// Still needed for gossip and stats.
+public class NodeTcpOptions {
+	public int NodeTcpPort { get; init; } = 1113;
+	public bool EnableExternalTcp { get; init; }
+	public int? NodeTcpPortAdvertiseAs { get; init; }
+}
diff --git a/src/KurrentDB.Core/OptionsFormatter.cs b/src/KurrentDB.Core/OptionsFormatter.cs
new file mode 100644
index 00000000000..f998f293805
--- /dev/null
+++ b/src/KurrentDB.Core/OptionsFormatter.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Serilog;
+
+namespace KurrentDB.Core;
+
+public static class OptionsFormatter {
+	private static readonly ILogger Log = Serilog.Log.ForContext(typeof(OptionsFormatter));
+	public static void LogConfig<TOptions>(string name, TOptions conf) {
+		var jsonSerializerSettings = new JsonSerializerSettings {
+			NullValueHandling = NullValueHandling.Ignore,
+		};
+		jsonSerializerSettings.Converters.Add(new StringEnumConverter());
+
+		var confJson = JsonConvert.SerializeObject(
+			conf,
+			Formatting.Indented,
+			jsonSerializerSettings);
+
+		Log.Information(
+			Environment.NewLine +
+			name + " Configuration: " + Environment.NewLine +
+			confJson);
+	}
+}
diff --git a/src/KurrentDB.Core/PluginModel/IPersistentSubscriptionConsumerStrategyPlugin.cs b/src/KurrentDB.Core/PluginModel/IPersistentSubscriptionConsumerStrategyPlugin.cs
new file mode 100644
index 00000000000..f3984da3e38
--- /dev/null
+++ b/src/KurrentDB.Core/PluginModel/IPersistentSubscriptionConsumerStrategyPlugin.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+
+namespace KurrentDB.Core.PluginModel;
+
+public interface IPersistentSubscriptionConsumerStrategyPlugin {
+	string Name { get; }
+
+	string Version { get; }
+
+	IPersistentSubscriptionConsumerStrategyFactory GetConsumerStrategyFactory();
+}
diff --git a/src/KurrentDB.Core/Resilience/PipelineExecutor.cs b/src/KurrentDB.Core/Resilience/PipelineExecutor.cs
new file mode 100644
index 00000000000..ec92a3e4669
--- /dev/null
+++ b/src/KurrentDB.Core/Resilience/PipelineExecutor.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Polly;
+using Serilog;
+
+namespace KurrentDB.Core.Resilience;
+
+// Executes a ResiliencePipeline in the context of an operation * logger
+public class PipelineExecutor(ResiliencePipeline pipeline, string operationPrefix, ILogger logger) {
+	private ResilienceContext GetContext(string operation, CancellationToken ct) {
+		var context = ResilienceContextPool.Shared.Get($"{operationPrefix}.{operation}", ct);
+		context.Properties.Set(ResilienceKeys.Logger, logger);
+		return context;
+	}
+
+	private static void Return(ResilienceContext context) =>
+		ResilienceContextPool.Shared.Return(context);
+
+	public async ValueTask ExecuteAsync<TState>(
+		Func<ResilienceContext, TState, ValueTask> func,
+		TState state,
+		CancellationToken ct,
+		[CallerMemberName] string memberName = "") {
+
+		var context = GetContext(memberName, ct);
+		try {
+			await pipeline.ExecuteAsync(func, context, state);
+		} finally {
+			Return(context);
+		}
+	}
+
+	public async ValueTask<TResult> ExecuteAsync<TResult, TState>(
+		Func<ResilienceContext, TState, ValueTask<TResult>> func,
+		TState state,
+		CancellationToken ct,
+		[CallerMemberName] string memberName = "") {
+
+		var context = GetContext(memberName, ct);
+		try {
+			return await pipeline.ExecuteAsync(func, context, state);
+		} finally {
+			Return(context);
+		}
+	}
+}
+
diff --git a/src/KurrentDB.Core/Resilience/ResilienceKeys.cs b/src/KurrentDB.Core/Resilience/ResilienceKeys.cs
new file mode 100644
index 00000000000..b0551133795
--- /dev/null
+++ b/src/KurrentDB.Core/Resilience/ResilienceKeys.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using Polly;
+using Serilog;
+
+namespace KurrentDB.Core.Resilience;
+
+public static class ResilienceKeys {
+	public static ResiliencePropertyKey<ILogger> Logger { get; } = new("logger");
+}
diff --git a/src/KurrentDB.Core/Resilience/ResiliencePipelines.cs b/src/KurrentDB.Core/Resilience/ResiliencePipelines.cs
new file mode 100644
index 00000000000..c4bc47ca1c9
--- /dev/null
+++ b/src/KurrentDB.Core/Resilience/ResiliencePipelines.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using Polly;
+using Serilog;
+
+namespace KurrentDB.Core.Resilience;
+
+public static class ResiliencePipelines {
+	public static ResiliencePipeline RetrySlow { get; } = BuildRetryPipeline(maxRetryAttempts: 5);
+
+	public static ResiliencePipeline RetryForever { get; } = BuildRetryPipeline(maxRetryAttempts: int.MaxValue);
+
+	private static ResiliencePipeline BuildRetryPipeline(int maxRetryAttempts) =>
+		new ResiliencePipelineBuilder()
+			.AddRetry(new() {
+				BackoffType = DelayBackoffType.Exponential,
+				Delay = TimeSpan.FromSeconds(1),
+				MaxDelay = TimeSpan.FromSeconds(60),
+				MaxRetryAttempts = maxRetryAttempts,
+				OnRetry = args => {
+					var logger = args.Context.Properties.TryGetValue(ResilienceKeys.Logger, out var log)
+						? log
+						: Log.Logger;
+
+					logger.Warning(
+						"Retrying {Operation}. Attempt {Attempt}/{MaxAttempts}. Duration {Duration}. Delay {Delay}. " +
+						"Error: {ExceptionMessage} ({ExceptionType})",
+						args.Context.OperationKey,
+						args.AttemptNumber,
+						maxRetryAttempts == int.MaxValue ? "Infinite" : maxRetryAttempts,
+						args.Duration,
+						args.RetryDelay,
+						args.Outcome.Exception?.Message,
+						args.Outcome.Exception?.GetType().Name);
+
+					return ValueTask.CompletedTask;
+				},
+			})
+			.Build();
+}
diff --git a/src/KurrentDB.Core/Services/Archive/ArchiveCatchup/ArchiveCatchup.cs b/src/KurrentDB.Core/Services/Archive/ArchiveCatchup/ArchiveCatchup.cs
new file mode 100644
index 00000000000..884736e7177
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Archive/ArchiveCatchup/ArchiveCatchup.cs
@@ -0,0 +1,151 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Archive.Naming;
+using KurrentDB.Core.Services.Archive.Storage;
+using KurrentDB.Core.Services.Archive.Storage.Exceptions;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using Serilog;
+
+namespace KurrentDB.Core.Services.Archive.ArchiveCatchup;
+
+// The archive catchup process downloads chunks that are missing locally from the archive.
+//
+// This is needed in some cases:
+// i)  a follower may be far behind the leader and the latter may have already deleted archived chunks locally.
+// ii) under normal circumstances, a leader should never need to catch up from the archive. however, if a cluster's
+//     data was restored from a backup, we can end up in a situation where the leader-to-be is behind the archive.
+//     in this case, we still want all nodes to catch up with the archive *before* joining the cluster to maintain
+//     consistency between the data that's in the cluster and in the archive.
+
+public class ArchiveCatchup : IClusterVNodeStartupTask {
+	private readonly string _dbPath;
+	private readonly ICheckpoint _writerCheckpoint;
+	private readonly ICheckpoint _chaserCheckpoint;
+	private readonly ICheckpoint _epochCheckpoint;
+	private readonly int _chunkSize;
+	private readonly IArchiveStorageReader _archiveReader;
+	private readonly IArchiveNamingStrategy _namingStrategy;
+
+	private static readonly ILogger Log = Serilog.Log.ForContext<ArchiveCatchup>();
+
+	public ArchiveCatchup(
+		string dbPath,
+		ICheckpoint writerCheckpoint,
+		ICheckpoint chaserCheckpoint,
+		ICheckpoint epochCheckpoint,
+		int chunkSize,
+		IArchiveStorageReader archiveStorageReader,
+		IArchiveNamingStrategy namingStrategy) {
+		_dbPath = dbPath;
+		_writerCheckpoint = writerCheckpoint;
+		_chaserCheckpoint = chaserCheckpoint;
+		_epochCheckpoint = epochCheckpoint;
+		_chunkSize = chunkSize;
+		_archiveReader = archiveStorageReader;
+		_namingStrategy = namingStrategy;
+	}
+
+	public async ValueTask Run(CancellationToken ct) {
+		var writerChk = _writerCheckpoint.Read();
+		var archiveChk = await _archiveReader.GetCheckpoint(ct);
+
+		if (writerChk >= archiveChk)
+			return;
+
+		Log.Information("Catching up with the archive. Writer checkpoint: 0x{writerCheckpoint:X}, Archive checkpoint: 0x{archiveCheckpoint:X}.",
+			writerChk, archiveChk);
+
+		if (writerChk == 0)
+			Log.Warning(
+				"This node has no local data and will download the entire archive. " +
+				"It is preferable to restore the node from a backup instead, so that it will download only the most recent data. " +
+				"A new backup can be created from one of the other nodes if necessary.");
+
+		while (!await CatchUpWithArchive(writerChk, archiveChk, ct))
+			writerChk = _writerCheckpoint.Read();
+	}
+
+	// returns true if the catchup is done
+	// returns false if it needs to be invoked again to continue the catchup
+	private async Task<bool> CatchUpWithArchive(long writerChk, long archiveChk, CancellationToken ct) {
+		var logicalChunkStartNumber = (int)(writerChk / _chunkSize);
+		var logicalChunkEndNumber = (int)(archiveChk / _chunkSize);
+
+		for (var logicalChunkNumber = logicalChunkStartNumber; logicalChunkNumber < logicalChunkEndNumber; logicalChunkNumber++)
+			if (!await FetchAndCommitChunk(logicalChunkNumber, ct))
+				return false;
+
+		Log.Information("Catch-up with the archive completed");
+		return true;
+	}
+
+	private async Task<bool> FetchAndCommitChunk(int logicalChunkNumber, CancellationToken ct) {
+		var destinationFile = _namingStrategy.GetBlobNameFor(logicalChunkNumber);
+		var destinationPath = Path.Combine(_dbPath, destinationFile);
+		if (!await FetchChunk(logicalChunkNumber, destinationPath, ct))
+			return false;
+
+		await CommitChunk(destinationPath, ct);
+		return true;
+	}
+
+	private async Task<bool> FetchChunk(int logicalChunkNumber, string destinationPath, CancellationToken ct) {
+		try {
+			Log.Information("Fetching chunk: {logicalChunkNumber} from the archive", logicalChunkNumber);
+
+			var tempPath = Path.Combine(_dbPath, Guid.NewGuid() + ".archive.tmp");
+
+			using var handle = await _archiveReader.OpenForReadAsync(logicalChunkNumber, ct);
+			await using (var inputStream = handle.CreateStream()) {
+				await using var outputStream = File.Open(
+					path: tempPath,
+					options: new FileStreamOptions {
+						Mode = FileMode.CreateNew,
+						Access = FileAccess.ReadWrite,
+						Share = FileShare.None,
+						Options = FileOptions.Asynchronous,
+						PreallocationSize = _chunkSize,
+					});
+
+				await inputStream.CopyToAsync(outputStream, ct);
+			}
+
+			if (File.Exists(destinationPath)) {
+				var backupPath = $"{destinationPath}.archive.bkup";
+				Log.Information("Backing up {chunk} to {chunkBackup}", Path.GetFileName(destinationPath), Path.GetFileName(backupPath));
+				File.Move(destinationPath, backupPath, overwrite: true);
+			}
+
+			File.Move(tempPath, destinationPath);
+
+			return true;
+		} catch (ChunkDeletedException) {
+			Log.Warning("Failed to fetch chunk: {logicalChunkNumber} from the archive as it was deleted. This can happen if the archive is being scavenged.", logicalChunkNumber);
+			return false;
+		}
+	}
+
+	private async Task CommitChunk(string chunkPath, CancellationToken ct) {
+		await using var headerStream = File.OpenRead(chunkPath);
+		var header = await ChunkHeader.FromStream(headerStream, ct);
+
+		_epochCheckpoint.Write(-1);
+		_epochCheckpoint.Flush();
+		Log.Debug("Reset {checkpoint} checkpoint to: 0x{position:X}", _epochCheckpoint.Name, -1);
+
+		_chaserCheckpoint.Write(header.ChunkEndPosition);
+		_chaserCheckpoint.Flush();
+		Log.Debug("Moved {checkpoint} checkpoint forward to: 0x{position:X}", _chaserCheckpoint.Name, header.ChunkEndPosition);
+
+		_writerCheckpoint.Write(header.ChunkEndPosition);
+		_writerCheckpoint.Flush();
+		Log.Debug("Moved {checkpoint} checkpoint forward to: 0x{position:X}", _writerCheckpoint.Name, header.ChunkEndPosition);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Archive/ArchiveOptions.cs b/src/KurrentDB.Core/Services/Archive/ArchiveOptions.cs
new file mode 100644
index 00000000000..68ffd952ce5
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Archive/ArchiveOptions.cs
@@ -0,0 +1,89 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Exceptions;
+
+namespace KurrentDB.Core.Services.Archive;
+
+public class ArchiveOptions {
+	public bool Enabled { get; init; } = false;
+	public StorageType StorageType { get; init; } = StorageType.Unspecified;
+	public FileSystemOptions FileSystem { get; init; } = new();
+	public S3Options S3 { get; init; } = new();
+	public RetentionOptions RetainAtLeast { get; init; } = new();
+
+	public void Validate() {
+		try {
+			ValidateImpl();
+		} catch (InvalidConfigurationException ex) {
+			throw new InvalidConfigurationException($"Archive configuration: {ex.Message}");
+		}
+	}
+
+	private void ValidateImpl() {
+		if (!Enabled)
+			return;
+
+		switch (StorageType) {
+			case StorageType.Unspecified:
+				throw new InvalidConfigurationException("Please specify a StorageType (e.g. S3)");
+			case StorageType.FileSystemDevelopmentOnly:
+				FileSystem.Validate();
+				break;
+			case StorageType.S3:
+				S3.Validate();
+				break;
+			default:
+				throw new InvalidConfigurationException("Unknown StorageType");
+		}
+
+		RetainAtLeast.Validate();
+	}
+}
+
+public enum StorageType {
+	Unspecified,
+	// FileSystem is for development only, it likely will not be able to reliably tell when the archiver
+	// node has scavenged a chunk and replaced it.
+	FileSystemDevelopmentOnly,
+	S3,
+}
+
+public class FileSystemOptions {
+	public string Path { get; init; } = "";
+
+	public void Validate() {
+		if (string.IsNullOrEmpty(Path))
+			throw new InvalidConfigurationException("Please provide a Path for the FileSystem archive");
+	}
+}
+
+public class S3Options {
+	public string Bucket { get; init; } = "";
+	public string Region { get; init; } = "";
+
+	public void Validate() {
+		if (string.IsNullOrEmpty(Bucket))
+			throw new InvalidConfigurationException("Please provide a Bucket for the S3 archive");
+
+		if (string.IsNullOrEmpty(Region))
+			throw new InvalidConfigurationException("Please provide a Region for the S3 archive");
+	}
+}
+
+// Local chunks are removed after they have passed beyond both criteria, so they
+// must both be set to be useful.
+public class RetentionOptions {
+	public long Days { get; init; } = TimeSpan.MaxValue.Days;
+	// number of bytes in the logical log
+	public long LogicalBytes { get; init; } = long.MaxValue;
+
+	public void Validate() {
+		if (Days == TimeSpan.MaxValue.Days)
+			throw new InvalidConfigurationException("Please specify a value for Days to retain");
+
+		if (LogicalBytes == long.MaxValue)
+			throw new InvalidConfigurationException("Please specify a value for LogicalBytes to retain");
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Archive/ArchivePlugableComponent.cs b/src/KurrentDB.Core/Services/Archive/ArchivePlugableComponent.cs
new file mode 100644
index 00000000000..cf02122c22a
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Archive/ArchivePlugableComponent.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using EventStore.Plugins;
+using EventStore.Plugins.Licensing;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Configuration.Sources;
+using KurrentDB.Core.Resilience;
+using KurrentDB.Core.Services.Archive.Archiver;
+using KurrentDB.Core.Services.Archive.Naming;
+using KurrentDB.Core.Services.Archive.Storage;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace KurrentDB.Core.Services.Archive;
+
+public class ArchivePlugableComponent : IPlugableComponent {
+	public string Name => "Archiver";
+
+	public string DiagnosticsName => Name;
+
+	public KeyValuePair<string, object>[] DiagnosticsTags => [];
+
+	public string Version => "0.0.1";
+
+	public bool Enabled { get; private set; }
+
+	public string LicensePublicKey => LicenseConstants.LicensePublicKey;
+
+	private readonly bool _isArchiver;
+
+	public ArchivePlugableComponent(bool isArchiver) {
+		_isArchiver = isArchiver;
+	}
+
+	public void ConfigureApplication(IApplicationBuilder builder, IConfiguration configuration) {
+		if (!Enabled)
+			return;
+
+		_ = builder.ApplicationServices.GetService<ArchiverService>();
+
+		var licenseService = builder.ApplicationServices.GetRequiredService<ILicenseService>();
+
+		_ = LicenseMonitor.MonitorAsync(
+			featureName: Name,
+			requiredEntitlements: ["ARCHIVE"],
+			licenseService: licenseService,
+			onLicenseException: licenseService.RejectLicense,
+			logger: builder.ApplicationServices.GetRequiredService<ILoggerFactory>().CreateLogger(GetType()));
+	}
+
+	public void ConfigureServices(IServiceCollection services, IConfiguration configuration) {
+		var options = configuration.GetSection($"{KurrentConfigurationKeys.Prefix}:Archive").Get<ArchiveOptions>() ?? new();
+		Enabled = options.Enabled;
+
+		if (!Enabled)
+			return;
+
+		services.AddSingleton<ArchiveOptions>(options);
+		services.AddSingleton<IArchiveStorage>(s => {
+			var resolver = s.GetRequiredService<IArchiveNamingStrategy>();
+			return ArchiveStorageFactory.Create(options, resolver);
+		});
+		services.Decorate<IReadOnlyList<IClusterVNodeStartupTask>>(AddArchiveCatchupTask);
+		services.AddSingleton<IArchiveNamingStrategy, ArchiveNamingStrategy>();
+
+		if (_isArchiver) {
+			services.AddSingleton<ArchiverService>(s => {
+				var archiveStorage = s.GetRequiredService<IArchiveStorage>();
+				return new(
+					mainBus: s.GetRequiredService<ISubscriber>(),
+					archiveStorage: new ResilientArchiveStorage(ResiliencePipelines.RetryForever, archiveStorage),
+					chunkManager: s.GetRequiredService<IChunkRegistry<IChunkBlob>>());
+			});
+		}
+	}
+
+	private static IReadOnlyList<IClusterVNodeStartupTask> AddArchiveCatchupTask(
+		IReadOnlyList<IClusterVNodeStartupTask> startupTasks,
+		IServiceProvider serviceProvider) {
+
+		var newStartupTasks = new List<IClusterVNodeStartupTask>();
+		if (startupTasks != null)
+			newStartupTasks.AddRange(startupTasks);
+
+		var standardComponents = serviceProvider.GetRequiredService<StandardComponents>();
+		newStartupTasks.Add(new ArchiveCatchup.ArchiveCatchup(
+			dbPath: standardComponents.DbConfig.Path,
+			writerCheckpoint: standardComponents.DbConfig.WriterCheckpoint,
+			chaserCheckpoint: standardComponents.DbConfig.ChaserCheckpoint,
+			epochCheckpoint: standardComponents.DbConfig.EpochCheckpoint,
+			chunkSize: standardComponents.DbConfig.ChunkSize,
+			new ResilientArchiveStorage(
+				ResiliencePipelines.RetryForever,
+				serviceProvider.GetRequiredService<IArchiveStorage>()),
+			serviceProvider.GetRequiredService<IArchiveNamingStrategy>()));
+
+		return newStartupTasks;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Archive/Archiver/ArchiverService.cs b/src/KurrentDB.Core/Services/Archive/Archiver/ArchiverService.cs
new file mode 100644
index 00000000000..a9bc2a29624
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Archive/Archiver/ArchiverService.cs
@@ -0,0 +1,163 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Runtime.CompilerServices;
+using DotNext.Threading;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Archive.Storage;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using Serilog;
+
+namespace KurrentDB.Core.Services.Archive.Archiver;
+
+public sealed class ArchiverService :
+	IHandle<SystemMessage.SystemStart>,
+	IHandle<SystemMessage.BecomeShuttingDown>,
+	IHandle<SystemMessage.ChunkSwitched>,
+	IHandle<ReplicationTrackingMessage.ReplicatedTo>,
+	IAsyncDisposable {
+
+	private static readonly ILogger Log = Serilog.Log.ForContext<ArchiverService>();
+	private static readonly TimeSpan MaxInterval = TimeSpan.FromSeconds(10);
+	private readonly IArchiveStorage _archive;
+	private readonly CancellationToken _lifetimeToken;
+	private readonly AsyncAutoResetEvent _archivingSignal;
+	private readonly IChunkRegistry<IChunkBlob> _chunkManager;
+	private readonly ConcurrentBag<ChunkInfo> _switchedChunks;
+	private Task _archivingTask;
+
+	private long _replicationPosition; // volatile
+	private volatile CancellationTokenSource _cts;
+
+	public ArchiverService(
+		ISubscriber mainBus,
+		IArchiveStorage archiveStorage,
+		IChunkRegistry<IChunkBlob> chunkManager) {
+		_archive = archiveStorage;
+		_cts = new();
+		_lifetimeToken = _cts.Token;
+		_archivingSignal = new(initialState: false);
+		_chunkManager = chunkManager;
+		_archivingTask = Task.CompletedTask;
+		_switchedChunks = [];
+
+		mainBus.Subscribe<SystemMessage.SystemStart>(this);
+		mainBus.Subscribe<SystemMessage.BecomeShuttingDown>(this);
+		mainBus.Subscribe<SystemMessage.ChunkSwitched>(this);
+		mainBus.Subscribe<ReplicationTrackingMessage.ReplicatedTo>(this);
+	}
+
+	public void Handle(SystemMessage.SystemStart message) {
+		_archivingTask = ArchiveAsync();
+	}
+
+	public void Handle(SystemMessage.BecomeShuttingDown message) {
+		Cancel();
+	}
+
+	public void Handle(SystemMessage.ChunkSwitched message) {
+		if (message.ChunkInfo.IsRemote)
+			return;
+
+		_switchedChunks.Add(message.ChunkInfo);
+		_archivingSignal.Set();
+	}
+
+	public void Handle(ReplicationTrackingMessage.ReplicatedTo message) {
+		_replicationPosition = long.Max(_replicationPosition, message.LogPosition);
+		_archivingSignal.Set();
+	}
+
+	[AsyncMethodBuilder(typeof(SpawningAsyncTaskMethodBuilder))]
+	private async Task ArchiveAsync() {
+		try {
+			var checkpoint = await _archive.GetCheckpoint(_lifetimeToken);
+			Log.Information("Archive is at checkpoint 0x{checkpoint:X}", checkpoint);
+			while (!_lifetimeToken.IsCancellationRequested) {
+				await ProcessSwitchedChunksAsync(checkpoint, _lifetimeToken);
+
+				if (await _chunkManager.TryGetInitializedChunkFor(checkpoint, _lifetimeToken) is { ChunkFooter.IsCompleted: true } chunk &&
+					chunk.ChunkHeader.ChunkEndPosition <= Volatile.Read(in _replicationPosition)) {
+					Log.Information("Storing chunk in archive: \"{chunk}\"", chunk.ChunkLocator);
+					await _archive.StoreChunk(chunk, _lifetimeToken);
+
+					// verify checkpoint to make sure that no one changed it concurrently, e.g. by another
+					// cluster that points to the same archive storage
+					await ValidateCheckpointAsync(checkpoint, _lifetimeToken);
+					checkpoint = chunk.ChunkHeader.ChunkEndPosition;
+					Log.Information("Setting archive checkpoint to 0x{checkpoint:X}", checkpoint);
+					await _archive.SetCheckpoint(checkpoint, _lifetimeToken);
+				} else {
+					// loop after MaxInterval even if not triggered. (e.g. replication checkpoint can move
+					// before the chunks are available for us to store to the archive)
+					await _archivingSignal.WaitAsync(MaxInterval, _lifetimeToken);
+				}
+			}
+		} catch (Exception ex) when (ex is not OperationCanceledException oce || oce.CancellationToken != _lifetimeToken) {
+			Log.Error(ex, "Archive process has terminated unexpectedly");
+			Application.Exit(ExitCode.Error, "Archive process has terminated unexpectedly");
+		}
+	}
+
+	private async ValueTask ProcessSwitchedChunksAsync(long checkpoint, CancellationToken token) {
+		// process only chunks that are already in the archive, all other chunks
+		// will be processed by the main loop
+		while (_switchedChunks.TryTake(out var chunkInfo)) {
+			var chunk = _chunkManager.UnsafeGetChunk(chunkInfo.ChunkEndNumber);
+			await chunk.EnsureInitialized(token);
+			if (chunk.ChunkHeader.ChunkEndPosition <= checkpoint) {
+				Log.Information("Storing switched chunk in archive: \"{chunk}\"", chunk.ChunkLocator);
+				await _archive.StoreChunk(chunk, token);
+			}
+		}
+	}
+
+	private async ValueTask ValidateCheckpointAsync(long expected, CancellationToken token) {
+		var actual = await _archive.GetCheckpoint(token);
+		if (expected != actual)
+			Application.Exit(ExitCode.Error,
+				$"Critical error: Remote and local Archive checkpoints are out of sync: expected {expected}, but actual {actual}. " +
+				$"Is another cluster configured to use the same archive?");
+	}
+
+	private void Cancel() {
+		if (Interlocked.Exchange(ref _cts, null) is { } cts) {
+			using (cts) {
+				cts.Cancel();
+			}
+		}
+	}
+
+	public async ValueTask DisposeAsync() {
+		Cancel();
+		try {
+			await _archivingTask.ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext |
+												ConfigureAwaitOptions.SuppressThrowing);
+		} finally {
+			_archivingSignal.Dispose();
+		}
+	}
+}
+
+file static class ChunkRegistry {
+	public static ValueTask<IChunkBlob> TryGetInitializedChunkFor(this IChunkRegistry<IChunkBlob> registry,
+		long logPosition, CancellationToken token) {
+		return registry.UnsafeTryGetChunkFor(logPosition) is { } chunk
+			? EnsureInitialized(chunk, token)
+			: ValueTask.FromResult<IChunkBlob>(result: null);
+
+		static async ValueTask<IChunkBlob> EnsureInitialized(IChunkBlob chunk, CancellationToken token) {
+			await chunk.EnsureInitialized(token);
+			return chunk;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Archive/Archiver/ICommand.cs b/src/KurrentDB.Core/Services/Archive/Archiver/ICommand.cs
new file mode 100644
index 00000000000..258041c364d
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Archive/Archiver/ICommand.cs
@@ -0,0 +1,7 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.Archive.Archiver;
+
+public interface ICommand;
+public record Command : ICommand;
diff --git a/src/KurrentDB.Core/Services/Archive/Naming/ArchiveNamingStrategy.cs b/src/KurrentDB.Core/Services/Archive/Naming/ArchiveNamingStrategy.cs
new file mode 100644
index 00000000000..7909f6691b4
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Archive/Naming/ArchiveNamingStrategy.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using KurrentDB.Core.TransactionLog.FileNamingStrategy;
+
+namespace KurrentDB.Core.Services.Archive.Naming;
+
+public class ArchiveNamingStrategy : IArchiveNamingStrategy {
+	private readonly IVersionedFileNamingStrategy _namingStrategy;
+
+	public ArchiveNamingStrategy(IVersionedFileNamingStrategy namingStrategy) {
+		_namingStrategy = namingStrategy;
+	}
+
+	public string Prefix => _namingStrategy.Prefix;
+
+	public string GetBlobNameFor(int logicalChunkNumber) {
+		// naming chunks remotely in a way that is compatible with locally allows us
+		// to easily download remote chunks and use them locally.
+		var filePath = _namingStrategy.GetFilenameFor(logicalChunkNumber, version: 1);
+		return Path.GetFileName(filePath);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Archive/Naming/IArchiveNamingStrategy.cs b/src/KurrentDB.Core/Services/Archive/Naming/IArchiveNamingStrategy.cs
new file mode 100644
index 00000000000..bacfd7f85f3
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Archive/Naming/IArchiveNamingStrategy.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.Archive.Naming;
+
+public interface IArchiveNamingStrategy {
+	string Prefix { get; } // The prefix that is applied to all chunks
+	string GetBlobNameFor(int logicalChunkNumber);
+}
diff --git a/src/KurrentDB.Core/Services/Archive/Storage/ArchiveStorage.cs b/src/KurrentDB.Core/Services/Archive/Storage/ArchiveStorage.cs
new file mode 100644
index 00000000000..c3662610e0f
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Archive/Storage/ArchiveStorage.cs
@@ -0,0 +1,89 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Buffers.Binary;
+using System.Diagnostics;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Buffers;
+using DotNext.IO;
+using KurrentDB.Core.Services.Archive.Naming;
+using KurrentDB.Core.Services.Archive.Storage.Exceptions;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+namespace KurrentDB.Core.Services.Archive.Storage;
+
+public class ArchiveStorage(
+	IBlobStorage blobStorage,
+	IArchiveNamingStrategy namingStrategy,
+	string archiveCheckpointFile)
+	: IArchiveStorage {
+
+	public async ValueTask<long> GetCheckpoint(CancellationToken ct) {
+		try {
+			using var buffer = Memory.AllocateExactly<byte>(sizeof(long));
+			await blobStorage.ReadAsync(archiveCheckpointFile, buffer.Memory, offset: 0, ct);
+			var checkpoint = BinaryPrimitives.ReadInt64LittleEndian(buffer.Span);
+			return checkpoint;
+		} catch (FileNotFoundException) {
+			return 0;
+		}
+	}
+
+	public async ValueTask<int> ReadAsync(int logicalChunkNumber, Memory<byte> buffer, long offset, CancellationToken ct) {
+		try {
+			var chunkFile = namingStrategy.GetBlobNameFor(logicalChunkNumber);
+			return await blobStorage.ReadAsync(chunkFile, buffer, offset, ct);
+		} catch (FileNotFoundException) {
+			throw new ChunkDeletedException();
+		}
+	}
+
+	public async ValueTask<ArchivedChunkMetadata> GetMetadataAsync(int logicalChunkNumber, CancellationToken ct) {
+		try {
+			var objectName = namingStrategy.GetBlobNameFor(logicalChunkNumber);
+			var metadata = await blobStorage.GetMetadataAsync(objectName, ct);
+			return new(PhysicalSize: metadata.Size);
+		} catch (FileNotFoundException) {
+			throw new ChunkDeletedException();
+		}
+	}
+
+	public async ValueTask SetCheckpoint(long checkpoint, CancellationToken ct) {
+		var buffer = Memory.AllocateExactly<byte>(sizeof(long));
+		var stream = StreamSource.AsStream(buffer.Memory);
+		try {
+			BinaryPrimitives.WriteInt64LittleEndian(buffer.Span, checkpoint);
+			await blobStorage.StoreAsync(stream, archiveCheckpointFile, ct);
+		} finally {
+			await stream.DisposeAsync();
+			buffer.Dispose();
+		}
+	}
+
+	public async ValueTask StoreChunk(IChunkBlob chunk, CancellationToken ct) {
+		// process single chunk
+		if (chunk.ChunkHeader.IsSingleLogicalChunk) {
+			await StoreAsync(chunk, ct);
+		} else {
+			await foreach (var unmergedChunk in chunk.UnmergeAsync(ct)) {
+				// we need to dispose the unmerged chunk because it's temporary chunk
+				using (unmergedChunk) {
+					await StoreAsync(unmergedChunk, ct);
+					unmergedChunk.MarkForDeletion();
+				}
+			}
+		}
+	}
+
+	private async ValueTask StoreAsync(IChunkBlob chunk, CancellationToken ct) {
+		Debug.Assert(chunk.ChunkHeader.IsSingleLogicalChunk);
+
+		var name = namingStrategy.GetBlobNameFor(chunk.ChunkHeader.ChunkStartNumber);
+		using var reader = await chunk.AcquireRawReader(ct);
+		reader.Stream.Position = 0L;
+		await blobStorage.StoreAsync(reader.Stream, name, ct);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Archive/Storage/ArchiveStorageFactory.cs b/src/KurrentDB.Core/Services/Archive/Storage/ArchiveStorageFactory.cs
new file mode 100644
index 00000000000..5f60ea8fab2
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Archive/Storage/ArchiveStorageFactory.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Services.Archive.Naming;
+using KurrentDB.Core.Services.Archive.Storage.S3;
+
+namespace KurrentDB.Core.Services.Archive.Storage;
+
+public static class ArchiveStorageFactory {
+	private const string ArchiveCheckpointFile = "archive.chk";
+
+	public static IArchiveStorage Create(ArchiveOptions options, IArchiveNamingStrategy namingStrategy) =>
+		options.StorageType switch {
+			StorageType.Unspecified => throw new InvalidOperationException("Please specify an Archive StorageType"),
+			StorageType.FileSystemDevelopmentOnly => new ArchiveStorage(new FileSystemBlobStorage(options.FileSystem), namingStrategy, ArchiveCheckpointFile),
+			StorageType.S3 => new ArchiveStorage(new S3BlobStorage(options.S3), namingStrategy, ArchiveCheckpointFile),
+			_ => throw new ArgumentOutOfRangeException(nameof(options.StorageType))
+		};
+}
diff --git a/src/KurrentDB.Core/Services/Archive/Storage/ArchivedChunkHandle.cs b/src/KurrentDB.Core/Services/Archive/Storage/ArchivedChunkHandle.cs
new file mode 100644
index 00000000000..6657471a986
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Archive/Storage/ArchivedChunkHandle.cs
@@ -0,0 +1,62 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.IO;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+namespace KurrentDB.Core.Services.Archive.Storage;
+
+public sealed class ArchivedChunkHandle : IChunkHandle {
+	private readonly IArchiveStorageReader _reader;
+	private readonly int _logicalChunkNumber;
+	private readonly long _length;
+
+	private ArchivedChunkHandle(IArchiveStorageReader reader, int logicalChunkNumber, long length) {
+		Debug.Assert(reader is not null);
+		Debug.Assert(length >= 0L);
+
+		_reader = reader;
+		_logicalChunkNumber = logicalChunkNumber;
+		_length = length;
+	}
+
+	public static async ValueTask<IChunkHandle> OpenForReadAsync(IArchiveStorageReader reader, int logicalChunkNumber, CancellationToken token) {
+		var metadata = await reader.GetMetadataAsync(logicalChunkNumber, token);
+		return new ArchivedChunkHandle(reader, logicalChunkNumber, metadata.PhysicalSize);
+	}
+
+	void IFlushable.Flush() {
+		// nothing to flush
+	}
+
+	Task IFlushable.FlushAsync(CancellationToken token) => CompletedOrCanceled(token);
+
+	ValueTask IChunkHandle.WriteAsync(ReadOnlyMemory<byte> data, long offset, CancellationToken token)
+		=> ValueTask.FromException(new NotSupportedException());
+
+	public ValueTask<int> ReadAsync(Memory<byte> buffer, long offset, CancellationToken token)
+		=> offset < _length
+			? _reader.ReadAsync(_logicalChunkNumber, buffer, offset, token)
+			: ValueTask.FromResult(0); // _reader.ReadAsync will give this behaviour too, but we can do it here more cheaply
+
+	public string Name => $"archive-handle-{_logicalChunkNumber}";
+
+	public long Length {
+		get => _length;
+		set => throw new NotSupportedException();
+	}
+
+	public FileAccess Access { get; init; } = FileAccess.Read;
+
+	private static Task CompletedOrCanceled(CancellationToken token)
+		=> token.IsCancellationRequested ? Task.FromCanceled(token) : Task.CompletedTask;
+
+	void IDisposable.Dispose() {
+		// nothing to dispose
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Archive/Storage/Exceptions/ChunkDeletedException.cs b/src/KurrentDB.Core/Services/Archive/Storage/Exceptions/ChunkDeletedException.cs
new file mode 100644
index 00000000000..e204d8ccbed
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Archive/Storage/Exceptions/ChunkDeletedException.cs
@@ -0,0 +1,8 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Services.Archive.Storage.Exceptions;
+
+public class ChunkDeletedException : Exception;
diff --git a/src/KurrentDB.Core/Services/Archive/Storage/FileSystemBlobStorage.cs b/src/KurrentDB.Core/Services/Archive/Storage/FileSystemBlobStorage.cs
new file mode 100644
index 00000000000..120c3d91232
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Archive/Storage/FileSystemBlobStorage.cs
@@ -0,0 +1,82 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Buffers;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.IO;
+using Serilog;
+
+namespace KurrentDB.Core.Services.Archive.Storage;
+
+public class FileSystemBlobStorage : IBlobStorage {
+	private static readonly ILogger Log = Serilog.Log.ForContext<FileSystemBlobStorage>();
+	private static readonly SearchValues<char> InvalidFileNameChars = SearchValues.Create(Path.GetInvalidFileNameChars());
+
+	private readonly string _archivePath;
+	private readonly FileStreamOptions _fileStreamOptions;
+
+	public FileSystemBlobStorage(FileSystemOptions options) {
+		_archivePath = Path.GetFullPath(options.Path);
+		Log.Information($"Using file system archive storage at {_archivePath}");
+
+		_fileStreamOptions = new FileStreamOptions {
+			Access = FileAccess.Read,
+			Mode = FileMode.Open,
+			Options = FileOptions.Asynchronous,
+		};
+	}
+
+	public async ValueTask<int> ReadAsync(string name, Memory<byte> buffer, long offset, CancellationToken ct) {
+		var targetPath = Path.Combine(_archivePath, name);
+		using var handle = File.OpenHandle(targetPath, _fileStreamOptions.Mode, _fileStreamOptions.Access,
+			_fileStreamOptions.Share,
+			_fileStreamOptions.Options);
+		return await RandomAccess.ReadAsync(handle, buffer, offset, ct);
+	}
+
+	public ValueTask<BlobMetadata> GetMetadataAsync(string name, CancellationToken token) {
+		ValueTask<BlobMetadata> task;
+		if (token.IsCancellationRequested) {
+			task = ValueTask.FromCanceled<BlobMetadata>(token);
+		} else {
+			try {
+				var targetPath = Path.Combine(_archivePath, name);
+				task = ValueTask.FromResult<BlobMetadata>(new(Size: new FileInfo(targetPath).Length));
+			} catch (Exception e) {
+				task = ValueTask.FromException<BlobMetadata>(e);
+			}
+		}
+
+		return task;
+	}
+
+	public async ValueTask StoreAsync(Stream sourceData, string name, CancellationToken ct) {
+		if (MemoryExtensions.IndexOfAny(name, InvalidFileNameChars) >= 0)
+			throw new ArgumentOutOfRangeException(nameof(name));
+
+		var destinationPath = Path.Combine(_archivePath, name);
+		var tempPath = $"{destinationPath}.tmp";
+		if (File.Exists(tempPath))
+			File.Delete(tempPath);
+
+		var handle = File.OpenHandle(tempPath, FileMode.CreateNew, FileAccess.Write, FileShare.None,
+			FileOptions.Asynchronous, preallocationSize: sourceData.CanSeek ? sourceData.Length : 0L);
+		var outputStream = handle.AsUnbufferedStream(FileAccess.Write);
+		try {
+			await sourceData.CopyToAsync(outputStream, ct);
+			await outputStream.FlushAsync(ct);
+		} catch when (File.Exists(tempPath)) {
+			File.Delete(tempPath);
+			throw;
+		} finally {
+			await outputStream.DisposeAsync();
+			handle.Dispose();
+		}
+
+		Log.Information($"Storing to archive file {destinationPath}");
+		File.Move(tempPath, destinationPath, overwrite: true);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Archive/Storage/IArchiveStorage.cs b/src/KurrentDB.Core/Services/Archive/Storage/IArchiveStorage.cs
new file mode 100644
index 00000000000..45cdf611b70
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Archive/Storage/IArchiveStorage.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+namespace KurrentDB.Core.Services.Archive.Storage;
+
+public interface IArchiveStorage : IArchiveStorageReader {
+	/// <summary>Sets the position in the transaction log up to which all chunks have been archived</summary>
+	public ValueTask SetCheckpoint(long checkpoint, CancellationToken ct);
+
+	/// <summary>Stores a chunk in the archive</summary>
+	public ValueTask StoreChunk(IChunkBlob chunk, CancellationToken ct);
+}
diff --git a/src/KurrentDB.Core/Services/Archive/Storage/IArchiveStorageReader.cs b/src/KurrentDB.Core/Services/Archive/Storage/IArchiveStorageReader.cs
new file mode 100644
index 00000000000..296e2d63700
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Archive/Storage/IArchiveStorageReader.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core.Services.Archive.Storage;
+
+public interface IArchiveStorageReader {
+	/// <returns>A position in the transaction log up to which all chunks have been archived</returns>
+	public ValueTask<long> GetCheckpoint(CancellationToken ct);
+
+	ValueTask<int> ReadAsync(int logicalChunkNumber, Memory<byte> buffer, long offset, CancellationToken ct);
+
+	ValueTask<ArchivedChunkMetadata> GetMetadataAsync(int logicalChunkNumber, CancellationToken token);
+}
+
+public readonly record struct ArchivedChunkMetadata(long PhysicalSize);
diff --git a/src/KurrentDB.Core/Services/Archive/Storage/IBlobStorage.cs b/src/KurrentDB.Core/Services/Archive/Storage/IBlobStorage.cs
new file mode 100644
index 00000000000..70843ab0451
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Archive/Storage/IBlobStorage.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core.Services.Archive.Storage;
+
+// The purpose of this is to make it easy to implement additional cloud providers for archiving.
+// If the cloud provider is not suitable for this interface then implement IArchiveStorage instead.
+public interface IBlobStorage {
+	ValueTask<int> ReadAsync(string name, Memory<byte> buffer, long offset, CancellationToken token);
+	ValueTask<BlobMetadata> GetMetadataAsync(string name, CancellationToken token);
+	ValueTask StoreAsync(Stream readableStream, string name, CancellationToken ct);
+}
+
+public readonly record struct BlobMetadata(long Size);
diff --git a/src/KurrentDB.Core/Services/Archive/Storage/NoArchiveReader.cs b/src/KurrentDB.Core/Services/Archive/Storage/NoArchiveReader.cs
new file mode 100644
index 00000000000..e58daf38fc5
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Archive/Storage/NoArchiveReader.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Archive.Storage.Exceptions;
+
+namespace KurrentDB.Core.Services.Archive.Storage;
+
+// Reader for when there is no archive
+public class NoArchiveReader : IArchiveStorageReader {
+	private NoArchiveReader() { }
+
+	public static NoArchiveReader Instance { get; } = new();
+
+	public ValueTask<long> GetCheckpoint(CancellationToken ct) =>
+		ValueTask.FromResult<long>(0);
+
+	public ValueTask<int> ReadAsync(int logicalChunkNumber, Memory<byte> buffer, long offset, CancellationToken ct) =>
+		ValueTask.FromException<int>(new ChunkDeletedException());
+
+	public ValueTask<ArchivedChunkMetadata> GetMetadataAsync(int logicalChunkNumber, CancellationToken token) =>
+		ValueTask.FromException<ArchivedChunkMetadata>(new ChunkDeletedException());
+}
diff --git a/src/KurrentDB.Core/Services/Archive/Storage/ResilientArchiveStorage.cs b/src/KurrentDB.Core/Services/Archive/Storage/ResilientArchiveStorage.cs
new file mode 100644
index 00000000000..7f43cde4c0b
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Archive/Storage/ResilientArchiveStorage.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Resilience;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using Polly;
+using Serilog;
+
+namespace KurrentDB.Core.Services.Archive.Storage;
+
+public class ResilientArchiveStorage(ResiliencePipeline pipeline, IArchiveStorage wrapped) : IArchiveStorage {
+	private static readonly ILogger Log = Serilog.Log.ForContext<ResilientArchiveStorage>();
+	private readonly PipelineExecutor _executor = new(pipeline, nameof(ResilientArchiveStorage), Log);
+
+	public ValueTask SetCheckpoint(long checkpoint, CancellationToken ct) =>
+		_executor.ExecuteAsync(
+			static (context, state) =>
+				state.wrapped.SetCheckpoint(state.checkpoint, context.CancellationToken),
+			(wrapped, checkpoint),
+			ct);
+
+	public ValueTask StoreChunk(IChunkBlob chunk, CancellationToken ct) =>
+		_executor.ExecuteAsync(
+			static (context, state) => state.wrapped.StoreChunk(state.chunk, context.CancellationToken),
+			(wrapped, chunk),
+			ct);
+
+	public ValueTask<long> GetCheckpoint(CancellationToken ct) =>
+		_executor.ExecuteAsync(
+			static (context, wrapped) => wrapped.GetCheckpoint(context.CancellationToken),
+			wrapped,
+			ct);
+
+	public ValueTask<int> ReadAsync(int logicalChunkNumber, Memory<byte> buffer, long offset, CancellationToken ct) =>
+		_executor.ExecuteAsync(
+			static (context, state) => state.wrapped.ReadAsync(state.logicalChunkNumber, state.buffer, state.offset, context.CancellationToken),
+			(wrapped, logicalChunkNumber, buffer, offset),
+			ct);
+
+	public ValueTask<ArchivedChunkMetadata> GetMetadataAsync(int logicalChunkNumber, CancellationToken ct) =>
+		_executor.ExecuteAsync(
+			static (context, state) => state.wrapped.GetMetadataAsync(state.logicalChunkNumber, context.CancellationToken),
+			(wrapped, logicalChunkNumber),
+			ct);
+}
diff --git a/src/KurrentDB.Core/Services/Archive/Storage/S3/AmazonTraceSerilogger.cs b/src/KurrentDB.Core/Services/Archive/Storage/S3/AmazonTraceSerilogger.cs
new file mode 100644
index 00000000000..17faf652e05
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Archive/Storage/S3/AmazonTraceSerilogger.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using Amazon.Runtime.Internal.Util;
+using Serilog.Core;
+using Serilog.Events;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Archive.Storage.S3;
+
+public class AmazonTraceSerilogger(Func<LogEventLevel, Exception, LogEventLevel> adjustLevel) : TraceListener {
+	private static readonly ILogger Logger = Serilog.Log.ForContext(Constants.SourceContextPropertyName, "Amazon");
+
+	public override void TraceData(TraceEventCache eventCache, string source, TraceEventType eventType, int id,
+		object data) {
+		Log(eventType, data);
+	}
+
+	public override void TraceData(TraceEventCache eventCache, string source, TraceEventType eventType, int id,
+		params object[] data) {
+		Log(eventType, data);
+	}
+
+	public override void TraceEvent(TraceEventCache eventCache, string source, TraceEventType eventType, int id) {
+	}
+
+	public override void TraceEvent(TraceEventCache eventCache, string source, TraceEventType eventType, int id,
+		string format, params object[] args) {
+		Log(eventType, string.Format(format, args));
+	}
+
+	public override void TraceEvent(TraceEventCache eventCache, string source, TraceEventType eventType, int id,
+		string message) {
+		Log(eventType, message);
+	}
+
+	public override void TraceTransfer(TraceEventCache eventCache, string source, int id, string message,
+		Guid relatedActivityId) {
+		Log(TraceEventType.Transfer, relatedActivityId);
+	}
+
+	public override void Write(string message) {
+		if (message is not null)
+			Log(TraceEventType.Information, message);
+	}
+
+	public override void WriteLine(string message) {
+		if (message is not null)
+			Log(TraceEventType.Information, message);
+	}
+
+	private void Log(TraceEventType eventType, params object[] data) {
+		if (data.Length is 0)
+			return;
+
+		var exception = data.Length > 1 ? data[1] as Exception : null;
+
+		if (data[0] is not LogMessage logMessage)
+			return;
+
+		var logLevel = adjustLevel(GetLogLevel(eventType), exception);
+		Logger.Write(logLevel, exception, logMessage.Format, logMessage.Args);
+	}
+
+	private static LogEventLevel GetLogLevel(TraceEventType eventType) {
+		return eventType switch {
+			TraceEventType.Verbose => LogEventLevel.Verbose,
+			TraceEventType.Information => LogEventLevel.Information,
+			TraceEventType.Warning => LogEventLevel.Warning,
+			TraceEventType.Error => LogEventLevel.Error,
+			TraceEventType.Critical => LogEventLevel.Fatal,
+			_ => LogEventLevel.Verbose
+		};
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Archive/Storage/S3/S3BlobStorage.cs b/src/KurrentDB.Core/Services/Archive/Storage/S3/S3BlobStorage.cs
new file mode 100644
index 00000000000..edd16d32e25
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Archive/Storage/S3/S3BlobStorage.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Amazon;
+using Amazon.Runtime.Internal;
+using Amazon.S3;
+using Amazon.S3.Model;
+using DotNext.Buffers;
+using FluentStorage;
+using FluentStorage.AWS.Blobs;
+using KurrentDB.Common.Exceptions;
+using Serilog.Events;
+
+namespace KurrentDB.Core.Services.Archive.Storage.S3;
+
+public class S3BlobStorage : IBlobStorage {
+	private readonly S3Options _options;
+	private readonly IAwsS3BlobStorage _awsBlobStorage;
+
+	static S3BlobStorage() {
+		AWSConfigs.AddTraceListener("Amazon", new AmazonTraceSerilogger(adjustLevel: (level, ex) =>
+			ex is AmazonS3Exception { ErrorCode: "NoSuchKey" or "InvalidRange" }
+				or HttpErrorResponseException
+				? LogEventLevel.Verbose
+				: level == LogEventLevel.Error
+					? LogEventLevel.Warning
+					: level
+		));
+		AWSConfigs.LoggingConfig.LogTo = LoggingOptions.SystemDiagnostics;
+		AWSConfigs.LoggingConfig.LogResponses = ResponseLoggingOption.OnError;
+		AWSConfigs.LoggingConfig.LogMetrics = false;
+	}
+
+	public S3BlobStorage(S3Options options) {
+		_options = options;
+
+		if (string.IsNullOrEmpty(options.Bucket))
+			throw new InvalidConfigurationException("Please specify an Archive S3 Bucket");
+
+		if (string.IsNullOrEmpty(options.Region))
+			throw new InvalidConfigurationException("Please specify an Archive S3 Region");
+
+		_awsBlobStorage = StorageFactory.Blobs.AwsS3(
+			bucketName: options.Bucket,
+			region: options.Region) as IAwsS3BlobStorage;
+	}
+
+	public async ValueTask<int> ReadAsync(string name, Memory<byte> buffer, long offset, CancellationToken ct) {
+		ArgumentOutOfRangeException.ThrowIfNegative(offset);
+
+		var request = new GetObjectRequest {
+			BucketName = _options.Bucket,
+			Key = name,
+			ByteRange = GetRange(offset, buffer.Length),
+		};
+
+		try {
+			using var response = await _awsBlobStorage.NativeBlobClient.GetObjectAsync(request, ct);
+			buffer = buffer.TrimLength(int.CreateSaturating(response.ContentLength));
+			await using var responseStream = response.ResponseStream;
+			await responseStream.ReadExactlyAsync(buffer, ct);
+			return buffer.Length;
+		} catch (AmazonS3Exception ex) when (ex.ErrorCode is "NoSuchKey") {
+			throw new FileNotFoundException();
+		} catch (AmazonS3Exception ex) when (ex.ErrorCode is "InvalidRange") {
+			return 0;
+		}
+	}
+
+	public ValueTask StoreAsync(Stream readableStream, string name, CancellationToken ct)
+		=> new(_awsBlobStorage.WriteAsync(name, readableStream, append: false, ct));
+
+	// ByteRange is inclusive of both start and end
+	private static ByteRange GetRange(long offset, int length) => new(
+		start: offset,
+		end: offset + length - 1L);
+
+	public async ValueTask<BlobMetadata> GetMetadataAsync(string name, CancellationToken token) {
+		var response = await _awsBlobStorage.NativeBlobClient.GetObjectMetadataAsync(
+			_awsBlobStorage.BucketName, name, token);
+		return new(Size: response.ContentLength);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/AuthorizationGateway.cs b/src/KurrentDB.Core/Services/AuthorizationGateway.cs
new file mode 100644
index 00000000000..c3009aa0657
--- /dev/null
+++ b/src/KurrentDB.Core/Services/AuthorizationGateway.cs
@@ -0,0 +1,371 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Services;
+
+public sealed class AuthorizationGateway {
+	private readonly IAuthorizationProvider _authorizationProvider;
+	private const string AccessDenied = "Access Denied";
+
+	private static readonly Func<ClientMessage.ReadEvent, Message> ReadEventDenied = msg =>
+		new ClientMessage.ReadEventCompleted(msg.CorrelationId, msg.EventStreamId, ReadEventResult.AccessDenied,
+			ResolvedEvent.EmptyEvent, StreamMetadata.Empty, false, AccessDenied);
+
+	private static readonly Func<ClientMessage.ReadAllEventsForward, Message> ReadAllEventsForwardDenied = msg =>
+		new ClientMessage.ReadAllEventsForwardCompleted(msg.CorrelationId, ReadAllResult.AccessDenied, AccessDenied,
+			Array.Empty<ResolvedEvent>(), StreamMetadata.Empty, false, 0, TFPos.Invalid, TFPos.Invalid,
+			TFPos.Invalid, default);
+
+	private static readonly Func<ClientMessage.ReadStreamEventsForward, Message> ReadStreamEventsForwardDenied =
+		msg => new ClientMessage.ReadStreamEventsForwardCompleted(msg.CorrelationId, msg.EventStreamId, msg.FromEventNumber, msg.MaxCount, ReadStreamResult.AccessDenied, Array.Empty<ResolvedEvent>(), StreamMetadata.Empty, false, AccessDenied, -1, default, true, default);
+
+	private static readonly Func<ClientMessage.ReadStreamEventsBackward, Message> ReadStreamEventsBackwardDenied =
+		msg => new ClientMessage.ReadStreamEventsBackwardCompleted(msg.CorrelationId, msg.EventStreamId, msg.FromEventNumber, msg.MaxCount,
+			ReadStreamResult.AccessDenied, Array.Empty<ResolvedEvent>(), StreamMetadata.Empty, default, AccessDenied, -1, default, true, default);
+
+	private static readonly Func<ClientMessage.WriteEvents, Message> WriteEventsDenied = msg =>
+		new ClientMessage.WriteEventsCompleted(msg.CorrelationId, OperationResult.AccessDenied, AccessDenied);
+
+	private static readonly Func<ClientMessage.DeleteStream, Message> DeleteStreamDenied = msg =>
+		new ClientMessage.DeleteStreamCompleted(msg.CorrelationId, OperationResult.AccessDenied, AccessDenied);
+
+	private static readonly Func<ClientMessage.SubscribeToStream, Message> SubscribeToStreamDenied = msg =>
+		new ClientMessage.SubscriptionDropped(msg.CorrelationId, SubscriptionDropReason.AccessDenied);
+	private static readonly Func<ClientMessage.FilteredSubscribeToStream, Message> FilteredSubscribeToStreamDenied =
+		msg =>
+			new ClientMessage.SubscriptionDropped(msg.CorrelationId, SubscriptionDropReason.AccessDenied);
+
+	private static readonly Func<ClientMessage.ReadAllEventsBackward, Message> ReadAllEventsBackwardDenied = msg =>
+		new ClientMessage.ReadAllEventsBackwardCompleted(msg.CorrelationId, ReadAllResult.AccessDenied,
+			AccessDenied,
+			Array.Empty<ResolvedEvent>(), StreamMetadata.Empty, false, 0, TFPos.Invalid, TFPos.Invalid,
+			TFPos.Invalid, default);
+
+	private static readonly Func<ClientMessage.FilteredReadAllEventsForward, Message>
+		FilteredReadAllEventsForwardDenied = msg =>
+			new ClientMessage.ReadAllEventsForwardCompleted(msg.CorrelationId, ReadAllResult.AccessDenied,
+				AccessDenied,
+				Array.Empty<ResolvedEvent>(), StreamMetadata.Empty, false, 0, TFPos.Invalid, TFPos.Invalid,
+				TFPos.Invalid, default);
+
+	private static readonly Func<ClientMessage.FilteredReadAllEventsBackward, Message>
+		FilteredReadAllEventsBackwardDenied = msg =>
+			new ClientMessage.ReadAllEventsBackwardCompleted(msg.CorrelationId, ReadAllResult.AccessDenied,
+				AccessDenied,
+				Array.Empty<ResolvedEvent>(), StreamMetadata.Empty, false, 0, TFPos.Invalid, TFPos.Invalid,
+				TFPos.Invalid, default);
+
+	private static readonly Func<ClientMessage.ConnectToPersistentSubscriptionToStream, Message>
+		ConnectToPersistentSubscriptionDenied = msg =>
+			new ClientMessage.SubscriptionDropped(msg.CorrelationId, SubscriptionDropReason.AccessDenied);
+
+	private static readonly Func<ClientMessage.ReadNextNPersistentMessages, Message>
+		ReadNextNPersistedMessagesDenied = msg =>
+			new ClientMessage.ReadNextNPersistentMessagesCompleted(msg.CorrelationId,
+				ClientMessage.ReadNextNPersistentMessagesCompleted.ReadNextNPersistentMessagesResult.AccessDenied,
+				AccessDenied, Array.Empty<(ResolvedEvent, int)>());
+
+	private static readonly Func<ClientMessage.CreatePersistentSubscriptionToStream, Message>
+		CreatePersistentSubscriptionDenied = msg =>
+			new ClientMessage.CreatePersistentSubscriptionToStreamCompleted(msg.CorrelationId,
+				ClientMessage.CreatePersistentSubscriptionToStreamCompleted.CreatePersistentSubscriptionToStreamResult.AccessDenied,
+				AccessDenied);
+
+	private static readonly Func<ClientMessage.UpdatePersistentSubscriptionToStream, Message>
+		UpdatePersistentSubscriptionDenied = msg =>
+			new ClientMessage.UpdatePersistentSubscriptionToStreamCompleted(msg.CorrelationId,
+				ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult.AccessDenied,
+				AccessDenied);
+
+	private static readonly Func<ClientMessage.ReplayParkedMessages, Message> ReplayAllParkedMessagesDenied =
+		msg => new ClientMessage.ReplayMessagesReceived(msg.CorrelationId,
+			ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.AccessDenied, AccessDenied);
+
+	private static readonly Func<ClientMessage.DeletePersistentSubscriptionToStream, Message>
+		DeletePersistentSubscriptionDenied =
+			msg => new ClientMessage.DeletePersistentSubscriptionToStreamCompleted(msg.CorrelationId,
+				ClientMessage.DeletePersistentSubscriptionToStreamCompleted.DeletePersistentSubscriptionToStreamResult.AccessDenied,
+				AccessDenied);
+
+	private static readonly Func<ClientMessage.TransactionStart, Message> TransactionStartDenied = msg =>
+		new ClientMessage.TransactionStartCompleted(msg.CorrelationId, -1, OperationResult.AccessDenied,
+			AccessDenied);
+
+	private static readonly Func<ClientMessage.TransactionWrite, Message> TransactionWriteDenied = msg =>
+		new ClientMessage.TransactionWriteCompleted(msg.CorrelationId, msg.TransactionId,
+			OperationResult.AccessDenied, AccessDenied);
+
+	private static readonly Func<ClientMessage.TransactionCommit, Message> TransactionCommitDenied = msg =>
+		new ClientMessage.TransactionCommitCompleted(msg.CorrelationId, msg.TransactionId,
+			OperationResult.AccessDenied, AccessDenied);
+
+
+	private static readonly Operation ReadStream = new Operation(Operations.Streams.Read);
+	private static readonly Operation WriteStream = new Operation(Operations.Streams.Write);
+	private static readonly Operation DeleteStream = new Operation(Operations.Streams.Delete);
+	private static readonly Operation ReadEvent = ReadStream;
+	private static readonly Operation FilteredSubscribeToStream = ReadStream;
+
+	private static readonly Operation ReadAllStream =
+		new Operation(Operations.Streams.Read).WithParameter(
+			Operations.Streams.Parameters.StreamId(SystemStreams.AllStream));
+
+	private static readonly Operation CreatePersistentSubscription = new Operation(Operations.Subscriptions.Create);
+	private static readonly Operation UpdatePersistentSubscription = new Operation(Operations.Subscriptions.Update);
+	private static readonly Operation DeletePersistentSubscription = new Operation(Operations.Subscriptions.Delete);
+
+	private static readonly Operation
+		ReplayAllParkedMessages = new Operation(Operations.Subscriptions.ReplayParked);
+
+	private static readonly Operation ConnectToPersistentSubscription =
+		new Operation(Operations.Subscriptions.ProcessMessages);
+
+	public AuthorizationGateway(IAuthorizationProvider authorizationProvider) {
+		_authorizationProvider = authorizationProvider;
+	}
+
+	public void Authorize(Message toValidate, IPublisher destination) {
+		Ensure.NotNull(toValidate, nameof(toValidate));
+		Ensure.NotNull(destination, nameof(destination));
+		switch (toValidate) {
+			case ClientMessage.ReadNextNPersistentMessages msg:
+				Authorize(msg, destination);
+				break;
+			case ClientMessage.ReadStreamEventsBackward msg:
+				Authorize(msg, destination);
+				break;
+			case ClientMessage.ReadStreamEventsForward msg:
+				Authorize(msg, destination);
+				break;
+			case ClientMessage.UpdatePersistentSubscriptionToStream msg:
+				Authorize(msg, destination);
+				break;
+			case ClientMessage.SubscribeToStream msg:
+				Authorize(msg, destination);
+				break;
+			case ClientMessage.ConnectToPersistentSubscriptionToStream msg:
+				Authorize(msg, destination);
+				break;
+			case ClientMessage.CreatePersistentSubscriptionToStream msg:
+				Authorize(msg, destination);
+				break;
+			case ClientMessage.DeletePersistentSubscriptionToStream msg:
+				Authorize(msg, destination);
+				break;
+			case ClientMessage.DeleteStream msg:
+				Authorize(msg, destination);
+				break;
+			case ClientMessage.FilteredReadAllEventsBackward msg:
+				Authorize(msg, destination);
+				break;
+			case ClientMessage.FilteredReadAllEventsForward msg:
+				Authorize(msg, destination);
+				break;
+			case ClientMessage.FilteredSubscribeToStream msg:
+				Authorize(msg, destination);
+				break;
+			case ClientMessage.ReadAllEventsBackward msg:
+				Authorize(msg, destination);
+				break;
+			case ClientMessage.ReadAllEventsForward msg:
+				Authorize(msg, destination);
+				break;
+			case ClientMessage.ReplayParkedMessages msg:
+				Authorize(msg, destination);
+				break;
+			case ClientMessage.ReadEvent msg:
+				Authorize(msg, destination);
+				break;
+			case ClientMessage.WriteEvents msg:
+				Authorize(msg, destination);
+				break;
+			case ClientMessage.TransactionStart msg:
+				Authorize(msg, destination);
+				break;
+			case ClientMessage.TransactionWrite msg:
+				Authorize(msg, destination);
+				break;
+			case ClientMessage.TransactionCommit msg:
+				Authorize(msg, destination);
+				break;
+			case ClientMessage.PersistentSubscriptionAckEvents _:
+			case ClientMessage.PersistentSubscriptionNackEvents _:
+			case ClientMessage.UnsubscribeFromStream _:
+			case ClientMessage.NotHandled _:
+			case ClientMessage.WriteEventsCompleted _:
+			case ClientMessage.TransactionStartCompleted _:
+			case ClientMessage.TransactionWriteCompleted _:
+			case ClientMessage.TransactionCommitCompleted _:
+			case ClientMessage.DeleteStreamCompleted _:
+				destination.Publish(toValidate);
+				break;
+			case ReplicationMessage.AckLogPosition _:
+			case ReplicationMessage.CloneAssignment _:
+			case ReplicationMessage.CreateChunk _:
+			case ReplicationMessage.DataChunkBulk _:
+			case ReplicationMessage.DropSubscription _:
+			case ReplicationMessage.FollowerAssignment _:
+			case ReplicationMessage.GetReplicationStats _:
+			case ReplicationMessage.GetReplicationStatsCompleted _:
+			case ReplicationMessage.RawChunkBulk _:
+			case ReplicationMessage.ReconnectToLeader _:
+			case ReplicationMessage.ReplicaLogPositionAck _:
+			case ReplicationMessage.ReplicaSubscribed _:
+			case ReplicationMessage.ReplicaSubscriptionRetry _:
+			case ReplicationMessage.ReplicaSubscriptionRequest _:
+			case ReplicationMessage.SubscribeReplica _:
+			case ReplicationMessage.SubscribeToLeader _:
+			case ReplicationTrackingMessage.IndexedTo _:
+			case ReplicationTrackingMessage.LeaderReplicatedTo _:
+			case ReplicationTrackingMessage.ReplicaWriteAck _:
+			case ReplicationTrackingMessage.ReplicatedTo _:
+			case ReplicationTrackingMessage.WriterCheckpointFlushed _:
+				destination.Publish(toValidate);
+				break;
+			default:
+#if DEBUG
+				//This sucks, because if new tcp messages are added there is no way to be sure they have to be authorized...
+				//They should be caught by debug builds though
+				throw new ArgumentOutOfRangeException(nameof(toValidate), toValidate.GetType().FullName,
+					"Unhandled client message");
+#else
+					destination.Publish(toValidate);
+					break;
+#endif
+		}
+	}
+
+	private void Authorize(ClientMessage.SubscribeToStream msg, IPublisher destination) {
+		Authorize(msg.User, ReadStream.WithParameter(Operations.Streams.Parameters.StreamId(msg.EventStreamId)),
+			msg.Envelope, destination, msg, SubscribeToStreamDenied);
+	}
+
+	private void Authorize(ClientMessage.ReadEvent msg, IPublisher destination) {
+		Authorize(msg.User, ReadEvent.WithParameter(Operations.Streams.Parameters.StreamId(msg.EventStreamId)),
+			msg.Envelope, destination, msg, ReadEventDenied);
+	}
+
+	private void Authorize(ClientMessage.WriteEvents msg, IPublisher destination) {
+		Authorize(msg.User, WriteStream.WithParameter(Operations.Streams.Parameters.StreamId(msg.EventStreamId)),
+			msg.Envelope, destination, msg, WriteEventsDenied);
+	}
+
+	private void Authorize(ClientMessage.ReplayParkedMessages msg, IPublisher destination) {
+		Authorize(msg.User, ReplayAllParkedMessages, msg.Envelope, destination, msg, ReplayAllParkedMessagesDenied);
+	}
+
+	private void Authorize(ClientMessage.ReadAllEventsForward msg, IPublisher destination) {
+		Authorize(msg.User, ReadAllStream, msg.Envelope, destination, msg, ReadAllEventsForwardDenied);
+	}
+
+	private void Authorize(ClientMessage.ReadAllEventsBackward msg, IPublisher destination) {
+		Authorize(msg.User, ReadAllStream, msg.Envelope, destination, msg, ReadAllEventsBackwardDenied);
+	}
+
+	private void Authorize(ClientMessage.FilteredSubscribeToStream msg, IPublisher destination) {
+		Authorize(msg.User,
+			FilteredSubscribeToStream.WithParameter(Operations.Streams.Parameters.StreamId(msg.EventStreamId)),
+			msg.Envelope, destination, msg, FilteredSubscribeToStreamDenied);
+	}
+
+	private void Authorize(ClientMessage.FilteredReadAllEventsForward msg, IPublisher destination) {
+		Authorize(msg.User, ReadAllStream, msg.Envelope, destination, msg, FilteredReadAllEventsForwardDenied);
+	}
+
+	private void Authorize(ClientMessage.FilteredReadAllEventsBackward msg, IPublisher destination) {
+		Authorize(msg.User, ReadAllStream, msg.Envelope, destination, msg, FilteredReadAllEventsBackwardDenied);
+	}
+
+	private void Authorize(ClientMessage.DeleteStream msg, IPublisher destination) {
+		Authorize(msg.User, DeleteStream.WithParameter(Operations.Streams.Parameters.StreamId(msg.EventStreamId)),
+			msg.Envelope, destination, msg, DeleteStreamDenied);
+	}
+
+	private void Authorize(ClientMessage.DeletePersistentSubscriptionToStream msg, IPublisher destination) {
+		Authorize(msg.User, DeletePersistentSubscription, msg.Envelope, destination, msg,
+			DeletePersistentSubscriptionDenied);
+	}
+
+	private void Authorize(ClientMessage.CreatePersistentSubscriptionToStream msg, IPublisher destination) {
+		Authorize(msg.User, CreatePersistentSubscription, msg.Envelope, destination, msg,
+			CreatePersistentSubscriptionDenied);
+	}
+
+	private void Authorize(ClientMessage.ConnectToPersistentSubscriptionToStream msg, IPublisher destination) {
+		Authorize(msg.User,
+			ConnectToPersistentSubscription.WithParameter(
+				Operations.Subscriptions.Parameters.StreamId(msg.EventStreamId)), msg.Envelope, destination, msg,
+			ConnectToPersistentSubscriptionDenied);
+	}
+
+	private void Authorize(ClientMessage.UpdatePersistentSubscriptionToStream msg, IPublisher destination) {
+		Authorize(msg.User, UpdatePersistentSubscription, msg.Envelope, destination, msg,
+			UpdatePersistentSubscriptionDenied);
+	}
+
+	private void Authorize(ClientMessage.ReadStreamEventsForward msg, IPublisher destination) {
+		Authorize(msg.User, ReadStream.WithParameter(Operations.Streams.Parameters.StreamId(msg.EventStreamId)),
+			msg.Envelope, destination, msg, ReadStreamEventsForwardDenied);
+	}
+
+	private void Authorize(ClientMessage.ReadStreamEventsBackward msg, IPublisher destination) {
+		Authorize(msg.User, ReadStream.WithParameter(Operations.Streams.Parameters.StreamId(msg.EventStreamId)),
+			msg.Envelope, destination, msg, ReadStreamEventsBackwardDenied);
+	}
+
+	private void Authorize(ClientMessage.ReadNextNPersistentMessages msg, IPublisher destination) {
+		Authorize(msg.User, ReadStream.WithParameter(Operations.Streams.Parameters.StreamId(msg.EventStreamId)),
+			msg.Envelope, destination, msg, ReadNextNPersistedMessagesDenied);
+	}
+
+	private void Authorize(ClientMessage.TransactionStart msg, IPublisher destination) {
+		Authorize(msg.User, WriteStream.WithParameter(Operations.Streams.Parameters.StreamId(msg.EventStreamId)),
+			msg.Envelope, destination, msg, TransactionStartDenied);
+	}
+
+	private void Authorize(ClientMessage.TransactionWrite msg, IPublisher destination) {
+		Authorize(msg.User, WriteStream.WithParameter(Operations.Streams.Parameters.TransactionId(msg.TransactionId)),
+			msg.Envelope, destination, msg, TransactionWriteDenied);
+	}
+
+	private void Authorize(ClientMessage.TransactionCommit msg, IPublisher destination) {
+		Authorize(msg.User, WriteStream.WithParameter(Operations.Streams.Parameters.TransactionId(msg.TransactionId)),
+			msg.Envelope, destination, msg, TransactionCommitDenied);
+	}
+
+
+	void Authorize<TRequest>(ClaimsPrincipal user, Operation operation, IEnvelope replyTo,
+			IPublisher destination, TRequest request, Func<TRequest, Message> createAccessDenied)
+			where TRequest : Message {
+		var accessCheck = _authorizationProvider.CheckAccessAsync(user, operation, CancellationToken.None);
+		if (!accessCheck.IsCompleted)
+			AuthorizeAsync(accessCheck, replyTo, destination, request, createAccessDenied);
+		else {
+			if (accessCheck.Result)
+				destination.Publish(request);
+			else {
+				replyTo.ReplyWith(createAccessDenied(request));
+			}
+		}
+	}
+
+	async void AuthorizeAsync<TRequest>(ValueTask<bool> accessCheck, IEnvelope replyTo, IPublisher destination, TRequest request,
+		Func<TRequest, Message> createAccessDenied) where TRequest : Message {
+		if (await accessCheck) {
+			destination.Publish(request);
+		} else {
+			replyTo.ReplyWith(createAccessDenied(request));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/AwakeReaderService/AwakeService.cs b/src/KurrentDB.Core/Services/AwakeReaderService/AwakeService.cs
new file mode 100644
index 00000000000..e29a1174f81
--- /dev/null
+++ b/src/KurrentDB.Core/Services/AwakeReaderService/AwakeService.cs
@@ -0,0 +1,125 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+
+// ReSharper disable ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator
+
+namespace KurrentDB.Core.Services.AwakeReaderService;
+
+public class AwakeService : IHandle<AwakeServiceMessage.SubscribeAwake>,
+	IHandle<AwakeServiceMessage.UnsubscribeAwake>,
+	IHandle<StorageMessage.EventCommitted>,
+	IHandle<StorageMessage.TfEofAtNonCommitRecord> {
+	private readonly Dictionary<string, HashSet<AwakeServiceMessage.SubscribeAwake>> _subscribers = new();
+	private readonly Dictionary<Guid, AwakeServiceMessage.SubscribeAwake> _map = new();
+
+	private TFPos _lastPosition;
+
+	private readonly List<AwakeServiceMessage.SubscribeAwake> _batchedReplies = [];
+
+	private int _processedEvents;
+	const int ProcessedEventsAwakeThreshold = 1000;
+
+	private void BeginReplyBatch() {
+		if (_batchedReplies.Count > 0)
+			throw new Exception();
+		_processedEvents = 0;
+	}
+
+	private void EndReplyBatch() {
+		foreach (var subscriber in _batchedReplies) {
+			subscriber.Envelope.ReplyWith(subscriber.ReplyWithMessage);
+		}
+
+		_batchedReplies.Clear();
+	}
+
+	private void CheckProcessedEventThreshold() {
+		if (_processedEvents > ProcessedEventsAwakeThreshold) {
+			EndReplyBatch();
+			BeginReplyBatch();
+		}
+	}
+
+	public void Handle(AwakeServiceMessage.SubscribeAwake message) {
+		//TODO: consider buffering last 10 events to avoid race condition
+		// when someone writes before we subscribe forcing us to resubscribe
+		if (message.From < _lastPosition) {
+			message.Envelope.ReplyWith(message.ReplyWithMessage);
+			return;
+		}
+
+		_map.Add(message.CorrelationId, message);
+		string streamId = message.StreamId ?? "$all";
+		if (!_subscribers.TryGetValue(streamId, out var list)) {
+			list = [];
+			_subscribers.Add(streamId, list);
+		}
+
+		list.Add(message);
+	}
+
+	public void Handle(StorageMessage.EventCommitted message) {
+		_processedEvents++;
+		_lastPosition = new TFPos(message.CommitPosition, message.Event.LogPosition);
+
+		if (EventFilter.DefaultAllFilter.IsEventAllowed(message.Event)) {
+			NotifyEventInStream("$all", message);
+		}
+
+		if (EventFilter.DefaultStreamFilter.IsEventAllowed(message.Event)) {
+			NotifyEventInStream(message.Event.EventStreamId, message);
+		}
+
+		if (message.TfEof) {
+			EndReplyBatch();
+			BeginReplyBatch();
+		}
+
+		CheckProcessedEventThreshold();
+	}
+
+	private void NotifyEventInStream(string streamId, StorageMessage.EventCommitted message) {
+		List<AwakeServiceMessage.SubscribeAwake> toRemove = null;
+		if (!_subscribers.TryGetValue(streamId, out var list))
+			return;
+
+		foreach (var subscriber in list) {
+			if (subscriber.From >= new TFPos(message.CommitPosition, message.Event.LogPosition))
+				continue;
+
+			_batchedReplies.Add(subscriber);
+			_map.Remove(subscriber.CorrelationId);
+			toRemove ??= [];
+			toRemove.Add(subscriber);
+		}
+
+		if (toRemove == null)
+			return;
+
+		foreach (var item in toRemove)
+			list.Remove(item);
+		if (list.Count == 0) {
+			_subscribers.Remove(streamId);
+		}
+	}
+
+	public void Handle(AwakeServiceMessage.UnsubscribeAwake message) {
+		if (!_map.Remove(message.CorrelationId, out var subscriber))
+			return;
+
+		var list = _subscribers[subscriber.StreamId ?? "$all"];
+		list.Remove(subscriber);
+	}
+
+	public void Handle(StorageMessage.TfEofAtNonCommitRecord message) {
+		EndReplyBatch();
+		BeginReplyBatch();
+	}
+}
diff --git a/src/KurrentDB.Core/Services/AwakeReaderService/AwakeServiceMessage.cs b/src/KurrentDB.Core/Services/AwakeReaderService/AwakeServiceMessage.cs
new file mode 100644
index 00000000000..e7ba8eb79d6
--- /dev/null
+++ b/src/KurrentDB.Core/Services/AwakeReaderService/AwakeServiceMessage.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Services.AwakeReaderService;
+
+public partial class AwakeServiceMessage {
+	[DerivedMessage(CoreMessage.Awake)]
+	public sealed partial class SubscribeAwake(
+		IEnvelope envelope,
+		Guid correlationId,
+		string streamId,
+		TFPos from,
+		Message replyWithMessage) : Message {
+
+		public readonly IEnvelope Envelope = envelope;
+		public readonly Guid CorrelationId = correlationId;
+		public readonly string StreamId = streamId;
+		public readonly TFPos From = from;
+		public readonly Message ReplyWithMessage = replyWithMessage;
+	}
+
+	[DerivedMessage(CoreMessage.Awake)]
+	public sealed partial class UnsubscribeAwake(Guid correlationId) : Message {
+		public readonly Guid CorrelationId = correlationId;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/ClusterStorageWriterService.cs b/src/KurrentDB.Core/Services/ClusterStorageWriterService.cs
new file mode 100644
index 00000000000..6a26f8d3c87
--- /dev/null
+++ b/src/KurrentDB.Core/Services/ClusterStorageWriterService.cs
@@ -0,0 +1,399 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.Replication;
+using KurrentDB.Core.Services.Storage;
+using KurrentDB.Core.Services.Storage.EpochManager;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services;
+
+public class ClusterStorageWriterService {
+}
+
+// see comment in StorageWriterService re CancellationToken handling
+public class ClusterStorageWriterService<TStreamId> : StorageWriterService<TStreamId>,
+	IAsyncHandle<ReplicationMessage.ReplicaSubscribed>,
+	IAsyncHandle<ReplicationMessage.CreateChunk>,
+	IAsyncHandle<ReplicationMessage.RawChunkBulk>,
+	IAsyncHandle<ReplicationMessage.DataChunkBulk> {
+	private static readonly ILogger Log = Serilog.Log.ForContext<ClusterStorageWriterService>();
+
+	private readonly Func<long> _getLastIndexedPosition;
+	private readonly TransactionFramer _framer;
+
+	private Guid _subscriptionId;
+	private TFChunk _activeChunk;
+	private long _subscriptionPos;
+	private long _ackedSubscriptionPos;
+
+	public ClusterStorageWriterService(IPublisher bus,
+		ISubscriber subscribeToBus,
+		TimeSpan minFlushDelay,
+		TFChunkDb db,
+		TFChunkWriter writer,
+		IIndexWriter<TStreamId> indexWriter,
+		IRecordFactory<TStreamId> recordFactory,
+		INameIndex<TStreamId> streamNameIndex,
+		INameIndex<TStreamId> eventTypeIndex,
+		TStreamId emptyEventTypeId,
+		ISystemStreamLookup<TStreamId> systemStreams,
+		IEpochManager epochManager,
+		QueueStatsManager queueStatsManager,
+		QueueTrackers trackers,
+		IMaxTracker<long> flushSizeTracker,
+		IDurationMaxTracker flushDurationTracker,
+		Func<long> getLastIndexedPosition)
+		: base(bus, subscribeToBus, minFlushDelay, db, writer, indexWriter, recordFactory, streamNameIndex,
+			eventTypeIndex, emptyEventTypeId, systemStreams, epochManager, queueStatsManager, trackers,
+			flushSizeTracker, flushDurationTracker) {
+		Ensure.NotNull(getLastIndexedPosition, "getLastCommitPosition");
+
+		_getLastIndexedPosition = getLastIndexedPosition;
+
+		var lengthPrefixSuffixFramer = new LengthPrefixSuffixFramer(maxPackageSize: TFConsts.MaxLogRecordSize);
+		var logRecordFramer = new LogRecordFramer(inner: lengthPrefixSuffixFramer);
+		_framer = new TransactionFramer(inner: logRecordFramer);
+		_framer.RegisterMessageArrivedCallback(OnTransactionUnframed);
+
+		SubscribeToMessage<ReplicationMessage.ReplicaSubscribed>();
+		SubscribeToMessage<ReplicationMessage.CreateChunk>();
+		SubscribeToMessage<ReplicationMessage.RawChunkBulk>();
+		SubscribeToMessage<ReplicationMessage.DataChunkBulk>();
+	}
+
+	public override async ValueTask HandleAsync(SystemMessage.StateChangeMessage message, CancellationToken token) {
+		if (message.State is VNodeState.PreLeader) {
+			_activeChunk?.MarkForDeletion();
+			_activeChunk = null;
+
+			_subscriptionId = Guid.Empty;
+			_subscriptionPos = -1;
+			_ackedSubscriptionPos = -1;
+		}
+
+		await base.HandleAsync(message, token);
+	}
+
+	async ValueTask IAsyncHandle<ReplicationMessage.ReplicaSubscribed>.HandleAsync(ReplicationMessage.ReplicaSubscribed message, CancellationToken token) {
+		if (_activeChunk != null) {
+			_activeChunk.MarkForDeletion();
+			_activeChunk = null;
+		}
+
+		_framer.Reset();
+
+		_subscriptionId = message.SubscriptionId;
+		_ackedSubscriptionPos = _subscriptionPos = message.SubscriptionPosition;
+
+		Log.Information(
+			"=== SUBSCRIBED to [{leaderEndPoint},{leaderId:B}] at {subscriptionPosition} (0x{subscriptionPosition:X}). SubscriptionId: {subscriptionId:B}.",
+			message.LeaderEndPoint, message.LeaderId, message.SubscriptionPosition, message.SubscriptionPosition,
+			message.SubscriptionId);
+
+		var writerCheck = Db.Config.WriterCheckpoint.ReadNonFlushed();
+		if (message.SubscriptionPosition > writerCheck) {
+			ReplicationFail(
+				"Leader [{0},{1:B}] subscribed us at {2} (0x{3:X}), which is greater than our writer checkpoint {4} (0x{5:X}). REPLICATION BUG.",
+				"Leader [{leaderEndpoint},{leaderId:B}] subscribed us at {subscriptionPosition} (0x{subscriptionPosition:X}), which is greater than our writer checkpoint {writerCheckpoint} (0x{writerCheckpoint:X}). REPLICATION BUG.",
+				message.LeaderEndPoint, message.LeaderId, message.SubscriptionPosition,
+				message.SubscriptionPosition, writerCheck, writerCheck);
+		}
+
+		if (message.SubscriptionPosition < writerCheck) {
+			Log.Information(
+				"Leader [{leaderEndPoint},{leaderId:B}] subscribed us at {subscriptionPosition} (0x{subscriptionPosition:X}), which is less than our writer checkpoint {writerCheckpoint} (0x{writerCheckpoint:X}). TRUNCATION IS NEEDED.",
+				message.LeaderEndPoint, message.LeaderId, message.SubscriptionPosition,
+				message.SubscriptionPosition, writerCheck, writerCheck);
+
+			var lastIndexedPosition = _getLastIndexedPosition();
+			if (message.SubscriptionPosition > lastIndexedPosition)
+				Log.Information(
+					"ONLINE TRUNCATION IS NEEDED. NOT IMPLEMENTED. OFFLINE TRUNCATION WILL BE PERFORMED. SHUTTING DOWN NODE.");
+			else
+				Log.Information(
+					"OFFLINE TRUNCATION IS NEEDED (SubscribedAt {subscriptionPosition} (0x{subscriptionPosition:X}) <= LastCommitPosition {lastCommitPosition} (0x{lastCommitPosition:X})). SHUTTING DOWN NODE.",
+					message.SubscriptionPosition, message.SubscriptionPosition, lastIndexedPosition,
+					lastIndexedPosition);
+
+			EpochRecord lastEpoch = EpochManager.GetLastEpoch();
+			if (AreAnyCommittedRecordsTruncatedWithLastEpoch(message.SubscriptionPosition, lastEpoch,
+				lastIndexedPosition)) {
+				Log.Error(
+					"Leader [{leaderEndPoint},{leaderId:B}] subscribed us at {subscriptionPosition} (0x{subscriptionPosition:X}), which is less than our last epoch and LastCommitPosition {lastCommitPosition} (0x{lastCommitPosition:X}) >= lastEpoch.EpochPosition {lastEpochPosition} (0x{lastEpochPosition:X}). That might be bad, especially if the LastCommitPosition is way beyond EpochPosition.",
+					message.LeaderEndPoint, message.LeaderId, message.SubscriptionPosition,
+					message.SubscriptionPosition, lastIndexedPosition, lastIndexedPosition, lastEpoch.EpochPosition,
+					lastEpoch.EpochPosition);
+				Log.Error(
+					"ATTEMPT TO TRUNCATE EPOCH WITH COMMITTED RECORDS. THIS MAY BE BAD, BUT IT IS OK IF A NEWLY-ELECTED LEADER FAILS IMMEDIATELY AFTER ELECTION.");
+			}
+
+			Log.Information("Setting the truncate checkpoint to: {truncatePosition} (0x{truncatePosition:X})",
+				message.SubscriptionPosition, message.SubscriptionPosition);
+			Db.Config.TruncateCheckpoint.Write(message.SubscriptionPosition);
+			Db.Config.TruncateCheckpoint.Flush();
+
+			// try to write the new epoch position prior to shutting down to
+			// avoid scanning the transaction log to find a valid epoch
+			// when starting up for truncation
+			var oldEpoch = EpochManager.GetLastEpoch();
+			if (await EpochManager.TryTruncateBefore(message.SubscriptionPosition, token) is { } newEpoch) {
+				if (newEpoch.EpochId != oldEpoch.EpochId) {
+					Log.Information("Truncated epoch from "
+									+ "E{oldEpochNumber}@{oldEpochPosition}:{oldEpochId:B} to "
+									+ "E{newEpochNumber}@{newEpochPosition}:{newEpochId:B}",
+						oldEpoch.EpochNumber, oldEpoch.EpochPosition, oldEpoch.EpochId,
+						newEpoch.EpochNumber, newEpoch.EpochPosition, newEpoch.EpochId);
+				} else {
+					Log.Information("Truncation of epoch not required.");
+				}
+			} else {
+				Log.Information("Could not find a valid epoch to truncate to before position: {truncatePosition} (0x{truncatePosition:X})",
+					message.SubscriptionPosition, message.SubscriptionPosition);
+				var epochs = await EpochManager.GetLastEpochs(int.MaxValue, token);
+				if (epochs.Count > 0) {
+					Log.Debug("Displaying cached epochs:");
+					foreach (var epoch in epochs) {
+						Log.Debug(
+							"=== E{epochNumber}@{epochPosition}:{epochId:B}",
+							epoch.EpochNumber, epoch.EpochPosition, epoch.EpochId);
+					}
+				} else {
+					Log.Debug("No cached epochs were found");
+				}
+			}
+
+			BlockWriter = true;
+			Bus.Publish(new ClientMessage.RequestShutdown(exitProcess: true, shutdownHttp: true));
+			return;
+		}
+
+		// subscription position == writer checkpoint
+		// everything is ok
+		Bus.Publish(new ReplicationMessage.AckLogPosition(
+			subscriptionId: _subscriptionId,
+			replicationLogPosition: _ackedSubscriptionPos,
+			writerLogPosition: writerCheck));
+	}
+
+	private bool AreAnyCommittedRecordsTruncatedWithLastEpoch(long subscriptionPosition, EpochRecord lastEpoch,
+		long lastCommitPosition) {
+		return lastEpoch != null && subscriptionPosition <= lastEpoch.EpochPosition &&
+			   lastCommitPosition >= lastEpoch.EpochPosition;
+	}
+
+	async ValueTask IAsyncHandle<ReplicationMessage.CreateChunk>.HandleAsync(ReplicationMessage.CreateChunk message, CancellationToken token) {
+		if (_subscriptionId != message.SubscriptionId)
+			return;
+
+		if (_activeChunk != null) {
+			_activeChunk.MarkForDeletion();
+			_activeChunk = null;
+		}
+
+		_framer.Reset();
+
+		if (!Db.TransformManager.SupportsTransform(message.ChunkHeader.TransformType)) {
+			ReplicationFail(
+				"Unsupported chunk transform: {0}",
+				"Unsupported chunk transform: {transformType}.",
+				message.ChunkHeader.TransformType);
+		}
+
+		if (message.IsScavengedChunk) {
+			_activeChunk = await Db.Manager.CreateTempChunk(message.ChunkHeader, message.FileSize, token);
+		} else {
+			if (message.ChunkHeader.ChunkStartNumber == Db.Manager.ChunksCount) {
+				await Writer.AddNewChunk(message.ChunkHeader, message.TransformHeader, message.FileSize, token);
+			} else if (message.ChunkHeader.ChunkStartNumber + 1 == Db.Manager.ChunksCount) {
+				// the requested chunk was already created. this is fine, it can happen if the follower created the
+				// chunk in a previous run, was killed and re-subscribed to the leader at the beginning of the chunk.
+				// i.e. this is the idempotent case
+			} else {
+				ReplicationFail(
+					"Received request to create a new ongoing chunk #{0}-{1}, but current chunks count is {2}.",
+					"Received request to create a new ongoing chunk #{chunkStartNumber}-{chunkEndNumber}, but current chunks count is {chunksCount}.",
+					message.ChunkHeader.ChunkStartNumber, message.ChunkHeader.ChunkEndNumber,
+					Db.Manager.ChunksCount);
+			}
+		}
+
+		_subscriptionPos = message.ChunkHeader.ChunkStartPosition;
+		_ackedSubscriptionPos = _subscriptionPos;
+		Bus.Publish(new ReplicationMessage.AckLogPosition(
+			subscriptionId: _subscriptionId,
+			replicationLogPosition: _ackedSubscriptionPos,
+			writerLogPosition: Writer.Position));
+	}
+
+	async ValueTask IAsyncHandle<ReplicationMessage.RawChunkBulk>.HandleAsync(ReplicationMessage.RawChunkBulk message, CancellationToken token) {
+		if (_subscriptionId != message.SubscriptionId)
+			return;
+		if (_activeChunk is null)
+			ReplicationFail(
+				"Physical chunk bulk received, but we do not have active chunk.",
+				"Physical chunk bulk received, but we do not have active chunk.");
+
+		if (_activeChunk.ChunkHeader.ChunkStartNumber != message.ChunkStartNumber ||
+			_activeChunk.ChunkHeader.ChunkEndNumber != message.ChunkEndNumber) {
+			Log.Error(
+				"Received RawChunkBulk for TFChunk {chunkStartNumber}-{chunkEndNumber}, but active chunk is {activeChunk}.",
+				message.ChunkStartNumber, message.ChunkEndNumber, _activeChunk);
+			return;
+		}
+
+		if (_activeChunk.RawWriterPosition != message.RawPosition) {
+			Log.Error(
+				"Received RawChunkBulk at raw pos {rawPosition} (0x{rawPosition:X}) while current writer raw pos is {rawWriterPosition} (0x{rawWriterPosition:X}).",
+				message.RawPosition, message.RawPosition, _activeChunk.RawWriterPosition,
+				_activeChunk.RawWriterPosition);
+			return;
+		}
+
+		if (!await _activeChunk.TryAppendRawData(message.RawBytes, token)) {
+			ReplicationFail(
+				"Could not append raw bytes to chunk {0}-{1}, raw pos: {2} (0x{3:X}), bytes length: {4} (0x{5:X}). Chunk file size: {6} (0x{7:X}).",
+				"Could not append raw bytes to chunk {chunkStartNumber}-{chunkEndNumber}, raw pos: {rawPosition} (0x{rawPosition:X}), bytes length: {rawBytesLength} (0x{rawBytesLength:X}). Chunk file size: {chunkFileSize} (0x{chunkFileSize:X}).",
+				message.ChunkStartNumber, message.ChunkEndNumber, message.RawPosition, message.RawPosition,
+				message.RawBytes.Length, message.RawBytes.Length, _activeChunk.FileSize, _activeChunk.FileSize);
+		}
+
+		_subscriptionPos += message.RawBytes.Length;
+
+		if (message.CompleteChunk) {
+			Log.Debug("Completing raw chunk {chunkStartNumber}-{chunkEndNumber}...", message.ChunkStartNumber,
+				message.ChunkEndNumber);
+			await Writer.CompleteReplicatedRawChunk(_activeChunk, token);
+			await Flush(token: token);
+
+			_subscriptionPos = _activeChunk.ChunkHeader.ChunkEndPosition;
+			_framer.Reset();
+			_activeChunk = null;
+		}
+
+		if (message.CompleteChunk || _subscriptionPos > _ackedSubscriptionPos) {
+			_ackedSubscriptionPos = _subscriptionPos;
+			Bus.Publish(new ReplicationMessage.AckLogPosition(
+				subscriptionId: _subscriptionId,
+				replicationLogPosition: _ackedSubscriptionPos,
+				writerLogPosition: Writer.Position));
+		}
+	}
+
+	async ValueTask IAsyncHandle<ReplicationMessage.DataChunkBulk>.HandleAsync(ReplicationMessage.DataChunkBulk message, CancellationToken token) {
+		Interlocked.Decrement(ref FlushMessagesInQueue);
+		try {
+			if (_subscriptionId != message.SubscriptionId)
+				return;
+			if (_activeChunk != null)
+				ReplicationFail(
+					"Data chunk bulk received, but we have active chunk for receiving raw chunk bulks.",
+					"Data chunk bulk received, but we have active chunk for receiving raw chunk bulks.");
+
+			if (Writer.NeedsNewChunk) {
+				// for backwards compatibility with leaders running an old version (in case it doesn't send the CreateChunk message)
+				await Writer.AddNewChunk(token: token);
+			}
+
+			var chunk = Writer.CurrentChunk;
+
+			if (chunk.ChunkHeader.ChunkStartNumber != message.ChunkStartNumber ||
+				chunk.ChunkHeader.ChunkEndNumber != message.ChunkEndNumber) {
+				Log.Error(
+					"Received DataChunkBulk for TFChunk {chunkStartNumber}-{chunkEndNumber}, but active chunk is {activeChunkStartNumber}-{activeChunkEndNumber}.",
+					message.ChunkStartNumber, message.ChunkEndNumber, chunk.ChunkHeader.ChunkStartNumber,
+					chunk.ChunkHeader.ChunkEndNumber);
+				return;
+			}
+
+			if (_subscriptionPos != message.SubscriptionPosition) {
+				Log.Error(
+					"Received DataChunkBulk at SubscriptionPosition {subscriptionPosition} (0x{subscriptionPosition:X}) while current SubscriptionPosition is {subscriptionPos} (0x{subscriptionPos:X}).",
+					message.SubscriptionPosition, message.SubscriptionPosition, _subscriptionPos, _subscriptionPos);
+				return;
+			}
+
+			await _framer.UnFrameData(new ArraySegment<byte>(message.DataBytes), token);
+			_subscriptionPos += message.DataBytes.Length;
+
+			if (message.CompleteChunk) {
+				// for backwards compatibility with logs having incomplete transactions at the end of a chunk
+				if (await _framer.UnFramePendingLogRecords(token) is { } numRecordsUnframed)
+					Log.Warning("Incomplete transaction consisting of {numRecords} log records was found at the end of chunk: {chunkStartNumber}-{chunkEndNumber}.",
+						numRecordsUnframed, message.ChunkStartNumber, message.ChunkEndNumber);
+
+				Log.Debug("Completing data chunk {chunkStartNumber}-{chunkEndNumber}...", message.ChunkStartNumber,
+					message.ChunkEndNumber);
+				await Writer.CompleteChunk(token);
+
+				if (_framer.HasData)
+					ReplicationFail(
+						"There is some data left in framer when completing chunk.",
+						"There is some data left in framer when completing chunk.");
+
+				_subscriptionPos = chunk.ChunkHeader.ChunkEndPosition;
+				_framer.Reset();
+			}
+		} catch (Exception exc) {
+			Log.Error(exc, "Exception in writer.");
+			throw;
+		} finally {
+			await Flush(token: token);
+		}
+
+		if (message.CompleteChunk || _subscriptionPos > _ackedSubscriptionPos) {
+			_ackedSubscriptionPos = _subscriptionPos;
+			Bus.Publish(new ReplicationMessage.AckLogPosition(
+				subscriptionId: _subscriptionId,
+				replicationLogPosition: _ackedSubscriptionPos,
+				// we leave it up to the Flush call above whether to truly flush or not
+				writerLogPosition: Writer.Position));
+		}
+	}
+
+	private async ValueTask OnTransactionUnframed(IEnumerable<ILogRecord> records, CancellationToken token) {
+		// once we start the transaction, do not abort due to cancellation, we have no way to roll it back
+		token.ThrowIfCancellationRequested();
+
+		Writer.OpenTransaction();
+		foreach (var record in records)
+			if (await Writer.WriteToTransaction(record, CancellationToken.None) is null)
+				ReplicationFail(
+					"Failed to write replicated log record at position: {0}. Writer's position: {1}.",
+					"Failed to write replicated log record at position: {recordPos}. Writer's position: {writerPos}.",
+					record.LogPosition, Writer.Position);
+		Writer.CommitTransaction();
+	}
+
+	[DoesNotReturn]
+	private void ReplicationFail(string message, string messageStructured, params object[] args) {
+		string msg;
+		if (args is []) {
+			Log.Fatal(messageStructured);
+			msg = message;
+		} else {
+			Log.Fatal(messageStructured, args);
+			msg = string.Format(message, args);
+		}
+
+		BlockWriter = true;
+		Application.Exit(ExitCode.Error, msg);
+		throw new Exception(msg);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/CorrelationIdPropertyContext.cs b/src/KurrentDB.Core/Services/CorrelationIdPropertyContext.cs
new file mode 100644
index 00000000000..2f3d5d1b685
--- /dev/null
+++ b/src/KurrentDB.Core/Services/CorrelationIdPropertyContext.cs
@@ -0,0 +1,8 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services;
+
+public static class CorrelationIdPropertyContext {
+	public static string CorrelationIdProperty { get; set; } = "$correlationId";
+}
diff --git a/src/KurrentDB.Core/Services/ElectionsService.cs b/src/KurrentDB.Core/Services/ElectionsService.cs
new file mode 100644
index 00000000000..5a339210d67
--- /dev/null
+++ b/src/KurrentDB.Core/Services/ElectionsService.cs
@@ -0,0 +1,730 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Storage.EpochManager;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services;
+
+public enum ElectionsState {
+	Idle,
+	ElectingLeader,
+	Leader,
+	Acceptor,
+	Shutdown
+}
+
+public class ElectionsService : IHandle<SystemMessage.BecomeShuttingDown>,
+	IHandle<SystemMessage.SystemInit>,
+	IHandle<LeaderDiscoveryMessage.LeaderFound>,
+	IHandle<GossipMessage.GossipUpdated>,
+	IHandle<ElectionMessage.StartElections>,
+	IHandle<ElectionMessage.ElectionsTimedOut>,
+	IHandle<ElectionMessage.ViewChange>,
+	IHandle<ElectionMessage.ViewChangeProof>,
+	IHandle<ElectionMessage.SendViewChangeProof>,
+	IHandle<ElectionMessage.Prepare>,
+	IHandle<ElectionMessage.PrepareOk>,
+	IHandle<ElectionMessage.Proposal>,
+	IHandle<ElectionMessage.Accept>,
+	IHandle<ClientMessage.SetNodePriority>,
+	IHandle<ClientMessage.ResignNode>,
+	IHandle<ElectionMessage.LeaderIsResigning>,
+	IHandle<ElectionMessage.LeaderIsResigningOk> {
+	public static readonly TimeSpan SendViewChangeProofInterval = TimeSpan.FromMilliseconds(5000);
+	private readonly TimeSpan _leaderElectionProgressTimeout;
+
+	private static readonly ILogger Log = Serilog.Log.ForContext<ElectionsService>();
+	private static readonly EndPointComparer IPComparer = new EndPointComparer();
+
+	private readonly IPublisher _publisher;
+	private readonly IEnvelope _publisherEnvelope;
+	private readonly MemberInfo _memberInfo;
+	private readonly int _clusterSize;
+	private readonly IReadOnlyCheckpoint _writerCheckpoint;
+	private readonly IReadOnlyCheckpoint _chaserCheckpoint;
+	private readonly ICheckpoint _proposalCheckpoint;
+	private readonly IEpochManager _epochManager;
+	private readonly Func<long> _getLastCommitPosition;
+	private int _nodePriority;
+	private readonly ITimeProvider _timeProvider;
+
+	private int _lastAttemptedView = -1;
+	private int _lastInstalledView = -1;
+	private ElectionsState _state = ElectionsState.Idle;
+
+	private readonly HashSet<Guid> _vcReceived = [];
+	private readonly Dictionary<Guid, ElectionMessage.PrepareOk> _prepareOkReceived = new();
+	private readonly HashSet<Guid> _leaderIsResigningOkReceived = [];
+	private readonly HashSet<Guid> _acceptsReceived = [];
+
+	private LeaderCandidate _leaderProposal;
+	public Guid LeaderProposalId => _leaderProposal?.InstanceId ?? Guid.Empty;
+	private Guid? _leader;
+	private Guid? _lastElectedLeader;
+
+	private MemberInfo[] _servers;
+	private Guid? _resigningLeaderInstanceId;
+
+	public ElectionsService(IPublisher publisher,
+		MemberInfo memberInfo,
+		int clusterSize,
+		IReadOnlyCheckpoint writerCheckpoint,
+		IReadOnlyCheckpoint chaserCheckpoint,
+		ICheckpoint proposalCheckpoint,
+		IEpochManager epochManager,
+		Func<long> getLastCommitPosition,
+		int nodePriority,
+		ITimeProvider timeProvider,
+		TimeSpan leaderElectionTimeout) {
+		if (leaderElectionTimeout.Seconds < 1) {
+			throw new ArgumentOutOfRangeException(nameof(leaderElectionTimeout),
+				$"{nameof(leaderElectionTimeout)} should be greater than 1 second.");
+		}
+
+		if (memberInfo.IsReadOnlyReplica) {
+			throw new ArgumentException("Read-only replicas are not allowed to run the Elections service.");
+		}
+
+		_publisher = Ensure.NotNull(publisher);
+		_memberInfo = Ensure.NotNull(memberInfo);
+		_publisherEnvelope = publisher;
+		_clusterSize = Ensure.Positive(clusterSize);
+		_writerCheckpoint = Ensure.NotNull(writerCheckpoint);
+		_chaserCheckpoint = Ensure.NotNull(chaserCheckpoint);
+		_proposalCheckpoint = Ensure.NotNull(proposalCheckpoint);
+		_epochManager = Ensure.NotNull(epochManager);
+		_getLastCommitPosition = Ensure.NotNull(getLastCommitPosition);
+		_nodePriority = nodePriority;
+		_timeProvider = Ensure.NotNull(timeProvider);
+		_leaderElectionProgressTimeout = leaderElectionTimeout;
+
+		var lastEpoch = _epochManager.LastEpochNumber;
+		if (_proposalCheckpoint.Read() < lastEpoch) {
+			_proposalCheckpoint.Write(lastEpoch);
+			_proposalCheckpoint.Flush();
+		}
+
+		var ownInfo = GetOwnInfo();
+		_servers = [
+			MemberInfo.ForVNode(memberInfo.InstanceId,
+				_timeProvider.UtcNow,
+				VNodeState.Initializing,
+				true,
+				memberInfo.InternalTcpEndPoint, memberInfo.InternalSecureTcpEndPoint,
+				memberInfo.ExternalTcpEndPoint, memberInfo.ExternalSecureTcpEndPoint,
+				memberInfo.HttpEndPoint,
+				memberInfo.AdvertiseHostToClientAs, memberInfo.AdvertiseHttpPortToClientAs, memberInfo.AdvertiseTcpPortToClientAs,
+				ownInfo.LastCommitPosition, ownInfo.WriterCheckpoint, ownInfo.ChaserCheckpoint,
+				ownInfo.EpochPosition, ownInfo.EpochNumber, ownInfo.EpochId, ownInfo.NodePriority,
+				memberInfo.IsReadOnlyReplica, VersionInfo.Version)
+		];
+	}
+
+	public void SubscribeMessages(ISubscriber subscriber) {
+		subscriber.Subscribe<SystemMessage.BecomeShuttingDown>(this);
+		subscriber.Subscribe<SystemMessage.SystemInit>(this);
+		subscriber.Subscribe<LeaderDiscoveryMessage.LeaderFound>(this);
+		subscriber.Subscribe<GossipMessage.GossipUpdated>(this);
+		subscriber.Subscribe<ElectionMessage.StartElections>(this);
+		subscriber.Subscribe<ElectionMessage.ElectionsTimedOut>(this);
+		subscriber.Subscribe<ElectionMessage.ViewChange>(this);
+		subscriber.Subscribe<ElectionMessage.ViewChangeProof>(this);
+		subscriber.Subscribe<ElectionMessage.SendViewChangeProof>(this);
+		subscriber.Subscribe<ElectionMessage.Prepare>(this);
+		subscriber.Subscribe<ElectionMessage.PrepareOk>(this);
+		subscriber.Subscribe<ElectionMessage.Proposal>(this);
+		subscriber.Subscribe<ElectionMessage.Accept>(this);
+		subscriber.Subscribe<ElectionMessage.LeaderIsResigning>(this);
+		subscriber.Subscribe<ElectionMessage.LeaderIsResigningOk>(this);
+		subscriber.Subscribe<ClientMessage.SetNodePriority>(this);
+		subscriber.Subscribe<ClientMessage.ResignNode>(this);
+	}
+
+	public void Handle(SystemMessage.SystemInit _) {
+		_publisher.Publish(TimerMessage.Schedule.Create(SendViewChangeProofInterval,
+			_publisherEnvelope,
+			new ElectionMessage.SendViewChangeProof()));
+	}
+
+	public void Handle(ClientMessage.SetNodePriority message) {
+		Log.Information("Setting Node Priority to {nodePriority}.", message.NodePriority);
+		_nodePriority = message.NodePriority;
+		_publisher.Publish(new GossipMessage.UpdateNodePriority(_nodePriority));
+	}
+
+	public void Handle(ClientMessage.ResignNode message) {
+		if (_leader != null && _memberInfo.InstanceId == _leader) {
+			_resigningLeaderInstanceId = _leader;
+			var leaderIsResigningMessageOk = new ElectionMessage.LeaderIsResigningOk(
+				_memberInfo.InstanceId,
+				_memberInfo.HttpEndPoint,
+				_memberInfo.InstanceId,
+				_memberInfo.HttpEndPoint);
+			_leaderIsResigningOkReceived.Clear();
+			Handle(leaderIsResigningMessageOk);
+			SendToAllExceptMe(new ElectionMessage.LeaderIsResigning(
+				_memberInfo.InstanceId, _memberInfo.HttpEndPoint));
+		} else {
+			Log.Information("ELECTIONS: ONLY LEADER RESIGNATION IS SUPPORTED AT THE MOMENT. IGNORING RESIGNATION.");
+		}
+	}
+
+	public void Handle(ElectionMessage.LeaderIsResigning message) {
+		Log.Information("ELECTIONS: LEADER IS RESIGNING [{leaderHttpEndPoint}, {leaderId:B}].",
+			message.LeaderHttpEndPoint, message.LeaderId);
+		var leaderIsResigningMessageOk = new ElectionMessage.LeaderIsResigningOk(
+			message.LeaderId,
+			message.LeaderHttpEndPoint,
+			_memberInfo.InstanceId,
+			_memberInfo.HttpEndPoint);
+
+		_resigningLeaderInstanceId = message.LeaderId;
+		_publisher.Publish(new GrpcMessage.SendOverGrpc(message.LeaderHttpEndPoint, leaderIsResigningMessageOk,
+			_timeProvider.LocalTime.Add(_leaderElectionProgressTimeout)));
+	}
+
+	public void Handle(ElectionMessage.LeaderIsResigningOk message) {
+		Log.Information(
+			"ELECTIONS: LEADER IS RESIGNING OK FROM [{serverHttpEndPoint},{serverId:B}] M=[{leaderHttpEndPoint},{leaderId:B}]).",
+			message.ServerHttpEndPoint,
+			message.ServerId,
+			message.LeaderHttpEndPoint,
+			message.LeaderId);
+		if (_leaderIsResigningOkReceived.Add(message.ServerId) &&
+			_leaderIsResigningOkReceived.Count == _clusterSize / 2 + 1) {
+			Log.Information(
+				"ELECTIONS: MAJORITY OF ACCEPTANCE OF RESIGNATION OF LEADER [{leaderHttpEndPoint},{leaderId:B}]. NOW INITIATING LEADER RESIGNATION.",
+				message.LeaderHttpEndPoint, message.LeaderId);
+			_publisher.Publish(new SystemMessage.InitiateLeaderResignation());
+		}
+	}
+
+	public void Handle(SystemMessage.BecomeShuttingDown message) {
+		_state = ElectionsState.Shutdown;
+	}
+
+	public void Handle(GossipMessage.GossipUpdated message) {
+		_servers = message.ClusterInfo.Members.Where(x => x.State != VNodeState.Manager)
+			.Where(x => x.IsAlive)
+			.OrderByDescending(x => x.HttpEndPoint, IPComparer)
+			.ToArray();
+	}
+
+	public void Handle(ElectionMessage.StartElections message) {
+		switch (_state) {
+			case ElectionsState.Shutdown:
+			case ElectionsState.ElectingLeader:
+				return;
+			default:
+				Log.Information("ELECTIONS: STARTING ELECTIONS.");
+				ShiftToLeaderElection(_lastAttemptedView + 1);
+				break;
+		}
+	}
+
+	public void Handle(ElectionMessage.ElectionsTimedOut message) {
+		if (_state == ElectionsState.Shutdown)
+			return;
+		if (message.View != _lastAttemptedView)
+			return;
+		// we are still on the same view, but we selected leader
+		if (_state != ElectionsState.ElectingLeader && _leader != null)
+			return;
+
+		Log.Information("ELECTIONS: (V={view}) TIMED OUT! (S={state}, M={leader}).", message.View, _state, _leader);
+		ShiftToLeaderElection(_lastAttemptedView + 1);
+	}
+
+	private void ShiftToLeaderElection(int view) {
+		Log.Information("ELECTIONS: (V={view}) SHIFT TO LEADER ELECTION.", view);
+
+		_state = ElectionsState.ElectingLeader;
+		_vcReceived.Clear();
+		_prepareOkReceived.Clear();
+		_lastAttemptedView = view;
+
+		_leaderProposal = null;
+		_leader = null;
+		_acceptsReceived.Clear();
+
+		var viewChangeMsg = new ElectionMessage.ViewChange(_memberInfo.InstanceId, _memberInfo.HttpEndPoint, view);
+		Handle(viewChangeMsg);
+		SendToAllExceptMe(viewChangeMsg);
+		_publisher.Publish(TimerMessage.Schedule.Create(_leaderElectionProgressTimeout,
+			_publisherEnvelope,
+			new ElectionMessage.ElectionsTimedOut(view)));
+	}
+
+	private void SendToAllExceptMe(Message message) {
+		foreach (var server in _servers.Where(x => x.InstanceId != _memberInfo.InstanceId)) {
+			_publisher.Publish(new GrpcMessage.SendOverGrpc(server.HttpEndPoint, message,
+				_timeProvider.LocalTime.Add(_leaderElectionProgressTimeout)));
+		}
+	}
+
+	public void Handle(ElectionMessage.ViewChange message) {
+		if (_state is ElectionsState.Shutdown or ElectionsState.Idle)
+			return;
+
+		if (message.AttemptedView <= _lastInstalledView)
+			return;
+
+		Log.Information("ELECTIONS: (V={view}) VIEWCHANGE FROM [{serverHttpEndPoint}, {serverId:B}].",
+			message.AttemptedView, message.ServerHttpEndPoint, message.ServerId);
+
+		if (message.AttemptedView > _lastAttemptedView)
+			ShiftToLeaderElection(message.AttemptedView);
+
+		if (_vcReceived.Add(message.ServerId) && _vcReceived.Count == _clusterSize / 2 + 1) {
+			Log.Information("ELECTIONS: (V={view}) MAJORITY OF VIEWCHANGE.", message.AttemptedView);
+			if (AmILeaderOf(_lastAttemptedView))
+				ShiftToPreparePhase();
+		}
+	}
+
+	public void Handle(ElectionMessage.SendViewChangeProof message) {
+		if (_state == ElectionsState.Shutdown)
+			return;
+
+		if (_lastInstalledView >= 0)
+			SendToAllExceptMe(new ElectionMessage.ViewChangeProof(_memberInfo.InstanceId, _memberInfo.HttpEndPoint, _lastInstalledView));
+
+		_publisher.Publish(TimerMessage.Schedule.Create(SendViewChangeProofInterval, _publisherEnvelope, new ElectionMessage.SendViewChangeProof()));
+	}
+
+	public void Handle(ElectionMessage.ViewChangeProof message) {
+		if (_state is ElectionsState.Shutdown or ElectionsState.Idle)
+			return;
+		if (message.InstalledView <= _lastInstalledView)
+			return;
+
+		_lastAttemptedView = message.InstalledView;
+
+		_publisher.Publish(TimerMessage.Schedule.Create(_leaderElectionProgressTimeout,
+			_publisherEnvelope,
+			new ElectionMessage.ElectionsTimedOut(_lastAttemptedView)));
+
+		if (AmILeaderOf(_lastAttemptedView)) {
+			Log.Information(
+				"ELECTIONS: (IV={installedView}) VIEWCHANGEPROOF FROM [{serverHttpEndPoint}, {serverId:B}]. JUMPING TO LEADER STATE.",
+				message.InstalledView, message.ServerHttpEndPoint, message.ServerId);
+
+			ShiftToPreparePhase();
+		} else {
+			Log.Information(
+				"ELECTIONS: (IV={installedView}) VIEWCHANGEPROOF FROM [{serverHttpEndPoint}, {serverId:B}]. JUMPING TO NON-LEADER STATE.",
+				message.InstalledView, message.ServerHttpEndPoint, message.ServerId);
+
+			ShiftToAcceptor();
+		}
+	}
+
+	private bool AmILeaderOf(int lastAttemptedView) {
+		var serversExcludingNonPotentialLeaders = _servers.Where(x => !x.IsReadOnlyReplica).ToArray();
+		var leader =
+			serversExcludingNonPotentialLeaders[lastAttemptedView % serversExcludingNonPotentialLeaders.Length];
+		return leader.InstanceId == _memberInfo.InstanceId;
+	}
+
+	private void ShiftToPreparePhase() {
+		Log.Information("ELECTIONS: (V={lastAttemptedView}) SHIFT TO PREPARE PHASE.", _lastAttemptedView);
+
+		_lastInstalledView = _lastAttemptedView;
+		_prepareOkReceived.Clear();
+
+		Handle(CreatePrepareOk(_lastInstalledView));
+		SendToAllExceptMe(new ElectionMessage.Prepare(_memberInfo.InstanceId, _memberInfo.HttpEndPoint, _lastInstalledView));
+	}
+
+	public void Handle(ElectionMessage.Prepare message) {
+		if (_state == ElectionsState.Shutdown)
+			return;
+		if (message.ServerId == _memberInfo.InstanceId)
+			return;
+		if (message.View != _lastAttemptedView)
+			return;
+		if (_servers.All(x => x.InstanceId != message.ServerId))
+			return; // unknown instance
+
+		Log.Information("ELECTIONS: (V={lastAttemptedView}) PREPARE FROM [{serverHttpEndPoint}, {serverId:B}].",
+			_lastAttemptedView, message.ServerHttpEndPoint, message.ServerId);
+
+		if (_state == ElectionsState.ElectingLeader) // install the view
+			ShiftToAcceptor();
+
+		var prepareOk = CreatePrepareOk(message.View);
+		_publisher.Publish(new GrpcMessage.SendOverGrpc(message.ServerHttpEndPoint, prepareOk,
+			_timeProvider.LocalTime.Add(_leaderElectionProgressTimeout)));
+	}
+
+	private ElectionMessage.PrepareOk CreatePrepareOk(int view) {
+		var ownInfo = GetOwnInfo();
+		var clusterInfo = new ClusterInfo(_servers);
+		return new ElectionMessage.PrepareOk(view, ownInfo.InstanceId, ownInfo.HttpEndPoint,
+			ownInfo.EpochNumber, ownInfo.EpochPosition, ownInfo.EpochId, ownInfo.EpochLeaderInstanceId,
+			ownInfo.LastCommitPosition, ownInfo.WriterCheckpoint, ownInfo.ChaserCheckpoint,
+			ownInfo.NodePriority, clusterInfo);
+	}
+
+	private void ShiftToAcceptor() {
+		Log.Information("ELECTIONS: (V={lastAttemptedView}) SHIFT TO REG_ACCEPTOR.", _lastAttemptedView);
+
+		_state = ElectionsState.Acceptor;
+		_lastInstalledView = _lastAttemptedView;
+	}
+
+	public void Handle(ElectionMessage.PrepareOk msg) {
+		if (_state is ElectionsState.Shutdown or not ElectionsState.ElectingLeader)
+			return;
+		if (msg.View != _lastAttemptedView)
+			return;
+
+		Log.Information("ELECTIONS: (V={view}) PREPARE_OK FROM {nodeInfo}.", msg.View,
+			FormatNodeInfo(msg.ServerHttpEndPoint, msg.ServerId,
+				msg.LastCommitPosition, msg.WriterCheckpoint, msg.ChaserCheckpoint,
+				msg.EpochNumber, msg.EpochPosition, msg.EpochId, msg.EpochLeaderInstanceId, msg.NodePriority));
+
+		if (_prepareOkReceived.TryAdd(msg.ServerId, msg)) {
+			if (_prepareOkReceived.Count == _clusterSize / 2 + 1)
+				ShiftToLeader();
+		}
+	}
+
+	private void ShiftToLeader() {
+		Log.Information("ELECTIONS: (V={lastAttemptedView}) SHIFT TO REG_LEADER.", _lastAttemptedView);
+
+		_state = ElectionsState.Leader;
+		SendProposal();
+	}
+
+	private void SendProposal() {
+		_acceptsReceived.Clear();
+		_leaderProposal = null;
+
+		var leader = GetBestLeaderCandidate(_prepareOkReceived, _servers, _resigningLeaderInstanceId, _lastAttemptedView);
+		if (leader == null) {
+			Log.Information("ELECTIONS: (V={lastAttemptedView}) NO LEADER CANDIDATE WHEN TRYING TO SEND PROPOSAL.", _lastAttemptedView);
+			return;
+		}
+
+		var proposalNumber = Math.Max(_epochManager.LastEpochNumber, _proposalCheckpoint.Read()) + 1;
+		_proposalCheckpoint.Write(proposalNumber);
+		_proposalCheckpoint.Flush();
+		leader.ProposalNumber = (int)proposalNumber;
+		_leaderProposal = leader;
+
+		Log.Information("ELECTIONS: (V={lastAttemptedView}) SENDING PROPOSAL CANDIDATE: {formatNodeInfo}, PROPOSAL NUMBER {proposal}, ME: {ownInfo}.",
+			_lastAttemptedView, FormatNodeInfo(leader), proposalNumber, FormatNodeInfo(GetOwnInfo()));
+
+		var proposal = new ElectionMessage.Proposal(_memberInfo.InstanceId, _memberInfo.HttpEndPoint,
+			leader.InstanceId, leader.HttpEndPoint,
+			_lastInstalledView,
+			(int)proposalNumber, leader.EpochPosition, leader.EpochId, leader.EpochLeaderInstanceId,
+			leader.LastCommitPosition, leader.WriterCheckpoint, leader.ChaserCheckpoint, leader.NodePriority);
+		Handle(new ElectionMessage.Accept(_memberInfo.InstanceId, _memberInfo.HttpEndPoint,
+			leader.InstanceId, leader.HttpEndPoint, _lastInstalledView));
+		SendToAllExceptMe(proposal);
+	}
+
+	public static LeaderCandidate GetBestLeaderCandidate(Dictionary<Guid, ElectionMessage.PrepareOk> received,
+		MemberInfo[] servers, Guid? resigningLeaderInstanceId, int lastAttemptedView) {
+		var best = received.Values
+			.OrderByDescending(x => x.EpochNumber) // latest election
+			.ThenByDescending(x => x.WriterCheckpoint) // log length (if not re-electing leader pick the most complete replica)
+			.ThenByDescending(x => x.ChaserCheckpoint) // in memory index position
+			.ThenBy(x => x.ServerId == resigningLeaderInstanceId) // pick other nodes over a resigning leader
+			.ThenByDescending(x => x.NodePriority) // indicated node priority from settings
+			.ThenByDescending(x => x.ServerId) // tie breaker
+			.FirstOrDefault();
+
+		if (best == null)
+			return null;
+
+		var bestCandidate = new LeaderCandidate(best.ServerId, best.ServerHttpEndPoint,
+			best.EpochNumber, best.EpochPosition, best.EpochId, best.EpochLeaderInstanceId,
+			best.LastCommitPosition, best.WriterCheckpoint, best.ChaserCheckpoint, best.NodePriority);
+
+		if (best.EpochLeaderInstanceId != Guid.Empty) {
+			//best.EpochLeaderInstanceId = id of the last leader/master which has been able to write an epoch record to the transaction log and get it replicated
+			//to the "best" node which has the latest data, i.e data that has been replicated to at least a quorum number of nodes for sure.
+			//We know that the data from the "best" node originates from this leader/master itself from this epoch record onwards, thus it implies that
+			//the leader/master in this epoch record must have the latest replicated data as well and is thus definitely a valid candidate for leader/master if it's still alive.
+			//NOTE 1: It does not matter if the "best" node's latest epoch record has been replicated to a quorum number of nodes or not, the
+			//leader/master in the epoch record must still have the latest replicated data
+			//NOTE 2: it is not necessary that this leader/master is the last elected leader/master in the cluster e.g a leader/master might be elected but
+			//has no time to replicate the epoch. In this case, it will need to truncate when joining the new leader.
+
+			var previousLeaderId = best.EpochLeaderInstanceId;
+			LeaderCandidate previousLeaderCandidate = null;
+
+			//we have received a PrepareOk message from the previous leader, so we definitely know it's alive.
+			if (received.TryGetValue(previousLeaderId, out var leaderMsg) &&
+				leaderMsg.EpochNumber == best.EpochNumber &&
+				leaderMsg.EpochId == best.EpochId) {
+				Log.Debug("ELECTIONS: (V={lastAttemptedView}) Previous Leader (L={previousLeaderId:B}) from last epoch record is still alive.", lastAttemptedView, previousLeaderId);
+				previousLeaderCandidate = new LeaderCandidate(leaderMsg.ServerId, leaderMsg.ServerHttpEndPoint,
+					leaderMsg.EpochNumber, leaderMsg.EpochPosition, leaderMsg.EpochId, leaderMsg.EpochLeaderInstanceId,
+					leaderMsg.LastCommitPosition, leaderMsg.WriterCheckpoint, leaderMsg.ChaserCheckpoint,
+					leaderMsg.NodePriority);
+			}
+
+			//we try to find at least one node from the quorum no. of PrepareOk messages which says that the previous leader is alive
+			//if none of them say it's alive, a quorum can very probably not be formed with the previous leader
+			//otherwise we know that the leader was alive during the last gossip time interval and we try our luck
+			if (previousLeaderCandidate == null) {
+				foreach (var (id, prepareOk) in received) {
+					var member = prepareOk.ClusterInfo.Members.FirstOrDefault(x => x.InstanceId == previousLeaderId && x.IsAlive);
+
+					if (member != null) {
+						//these checks are not really necessary but we do them to ensure that everything is normal.
+						if (best.EpochNumber == member.EpochNumber && best.EpochId != member.EpochId) {
+							//something is definitely not right if the epoch numbers match but not the epoch ids
+							Log.Warning(
+								"ELECTIONS: (V={lastAttemptedView}) Epoch ID mismatch in gossip information from node {nodeId:B}. Best node's Epoch Id: {bestEpochId:B}, Leader node's Epoch Id: {leaderEpochId:B}",
+								lastAttemptedView, id, best.EpochId, member.EpochId);
+							continue;
+						}
+
+						if (best.EpochNumber - member.EpochNumber > 2) {
+							//gossip information may be slightly out of date. We log a warning if the epoch number is off by more than 2
+							Log.Warning(
+								"ELECTIONS: (V={lastAttemptedView}) Epoch number is off by more than two in gossip information from node {nodeId:B}. Best node's Epoch number: {bestEpochNumber}, Leader node's Epoch number: {leaderEpochNumber}.",
+								lastAttemptedView, id, best.EpochNumber, member.EpochNumber);
+						}
+
+						Log.Debug("ELECTIONS: (V={lastAttemptedView}) Previous Leader (L={previousLeaderId:B}) from last epoch record is still alive according to gossip from node {nodeId:B}.",
+							lastAttemptedView, previousLeaderId, id);
+						previousLeaderCandidate = new LeaderCandidate(member.InstanceId,
+							member.HttpEndPoint,
+							member.EpochNumber, member.EpochPosition, member.EpochId, best.EpochLeaderInstanceId,
+							member.LastCommitPosition, member.WriterCheckpoint, member.ChaserCheckpoint,
+							member.NodePriority);
+						break;
+					}
+				}
+			}
+
+			if (previousLeaderCandidate == null) {
+				Log.Debug("ELECTIONS: (V={lastAttemptedView}) Previous Leader (L={previousLeaderId:B}) from last epoch record is dead, defaulting to the best candidate (B={bestCandidateId:B}).",
+					lastAttemptedView, previousLeaderId, bestCandidate.InstanceId);
+			} else if (previousLeaderCandidate.InstanceId == resigningLeaderInstanceId) {
+				Log.Debug(
+					"ELECTIONS: (V={lastAttemptedView}) Previous Leader (L={previousLeaderId:B}) from last epoch record is alive but it is resigning, defaulting to the best candidate (B={bestCandidateId:B}).",
+					lastAttemptedView, previousLeaderId, bestCandidate.InstanceId);
+			} else {
+				bestCandidate = previousLeaderCandidate;
+			}
+		}
+
+		Log.Debug("ELECTIONS: (V={lastAttemptedView}) Proposing node: {leaderCandidateId:B} as best leader candidate", lastAttemptedView, bestCandidate.InstanceId);
+		return bestCandidate;
+	}
+
+	public static bool IsLegitimateLeader(int view, EndPoint proposingServerEndPoint, Guid proposingServerId,
+		LeaderCandidate candidate, MemberInfo[] servers, Guid? lastElectedLeader, Guid instanceId,
+		LeaderCandidate ownInfo,
+		Guid? resigningLeader) {
+		var leader = servers.FirstOrDefault(x =>
+			x.IsAlive && x.InstanceId == lastElectedLeader && x.State == VNodeState.Leader);
+
+		if (leader != null && leader.InstanceId != resigningLeader) {
+			if (candidate.InstanceId == leader.InstanceId
+				|| candidate.EpochNumber > leader.EpochNumber
+				|| (candidate.EpochNumber == leader.EpochNumber && candidate.EpochId != leader.EpochId))
+				return true;
+
+			Log.Information(
+				"ELECTIONS: (V={view}) NOT LEGITIMATE LEADER PROPOSAL FROM [{proposingServerEndPoint},{proposingServerId:B}] M={candidateInfo}. "
+				+ "PREVIOUS LEADER IS ALIVE: [{leaderHttpEndPoint},{leaderId:B}].",
+				view, proposingServerEndPoint, proposingServerId, FormatNodeInfo(candidate),
+				leader.HttpEndPoint, leader.InstanceId);
+			return false;
+		}
+
+		if (candidate.InstanceId == instanceId)
+			return true;
+
+		if (!IsCandidateGoodEnough(candidate, ownInfo)) {
+			Log.Information(
+				"ELECTIONS: (V={view}) NOT LEGITIMATE LEADER PROPOSAL FROM [{proposingServerEndPoint},{proposingServerId:B}] M={candidateInfo}. ME={ownInfo}.",
+				view, proposingServerEndPoint, proposingServerId, FormatNodeInfo(candidate),
+				FormatNodeInfo(ownInfo));
+			return false;
+		}
+
+		return true;
+	}
+
+	private static bool IsCandidateGoodEnough(LeaderCandidate candidate, LeaderCandidate ownInfo) {
+		if (candidate.EpochNumber != ownInfo.EpochNumber)
+			return candidate.EpochNumber > ownInfo.EpochNumber;
+		if (candidate.LastCommitPosition != ownInfo.LastCommitPosition)
+			return candidate.LastCommitPosition > ownInfo.LastCommitPosition;
+		if (candidate.WriterCheckpoint != ownInfo.WriterCheckpoint)
+			return candidate.WriterCheckpoint > ownInfo.WriterCheckpoint;
+		if (candidate.ChaserCheckpoint != ownInfo.ChaserCheckpoint)
+			return candidate.ChaserCheckpoint > ownInfo.ChaserCheckpoint;
+		return true;
+	}
+
+	public void Handle(ElectionMessage.Proposal message) {
+		if (_state is ElectionsState.Shutdown or not ElectionsState.Acceptor)
+			return;
+		if (message.ServerId == _memberInfo.InstanceId)
+			return;
+		if (message.View != _lastInstalledView)
+			return;
+		if (_servers.All(x => x.InstanceId != message.ServerId))
+			return;
+		if (_servers.All(x => x.InstanceId != message.LeaderId))
+			return;
+
+		var candidate = new LeaderCandidate(message.LeaderId, message.LeaderHttpEndPoint,
+			message.EpochNumber, message.EpochPosition, message.EpochId, message.EpochLeaderInstanceId,
+			message.LastCommitPosition, message.WriterCheckpoint, message.ChaserCheckpoint, message.NodePriority);
+
+		if (message.EpochNumber > _proposalCheckpoint.Read()) {
+			_proposalCheckpoint.Write(message.EpochNumber);
+			_proposalCheckpoint.Flush();
+		} else {
+			Log.Information(
+				"ELECTIONS: (V={lastAttemptedView}, P={lastKnownProposal}) OUTDATED PROPOSAL P={proposedEpoch} FROM [{serverHttpEndPoint},{serverId:B}] M={candidateInfo}. ME={ownInfo}, NodePriority={priority}",
+				_lastAttemptedView,
+				_proposalCheckpoint.Read(),
+				message.EpochNumber,
+				message.ServerHttpEndPoint, message.ServerId, FormatNodeInfo(candidate), FormatNodeInfo(GetOwnInfo()),
+				message.NodePriority);
+			return;
+		}
+
+		var ownInfo = GetOwnInfo();
+		if (!IsLegitimateLeader(message.View, message.ServerHttpEndPoint, message.ServerId,
+				candidate, _servers, _lastElectedLeader, _memberInfo.InstanceId, ownInfo,
+				_resigningLeaderInstanceId))
+			return;
+
+		Log.Information(
+			"ELECTIONS: (V={lastAttemptedView}, P={lastKnownProposal}) PROPOSAL P={proposedEpoch} FROM [{serverHttpEndPoint},{serverId:B}] M={candidateInfo}. ME={ownInfo}, NodePriority={priority}",
+			_lastAttemptedView,
+			_proposalCheckpoint.Read(),
+			message.EpochNumber,
+			message.ServerHttpEndPoint, message.ServerId, FormatNodeInfo(candidate), FormatNodeInfo(GetOwnInfo()),
+			message.NodePriority);
+
+		if (_leaderProposal == null) {
+			_leaderProposal = candidate;
+			_leaderProposal.ProposalNumber = message.EpochNumber;
+			_acceptsReceived.Clear();
+		}
+
+		if (_leaderProposal.InstanceId == message.LeaderId) {
+			// NOTE: proposal from other server is also implicit Accept from that server
+			Handle(new ElectionMessage.Accept(message.ServerId, message.ServerHttpEndPoint, message.LeaderId, message.LeaderHttpEndPoint, message.View));
+			var accept = new ElectionMessage.Accept(_memberInfo.InstanceId, _memberInfo.HttpEndPoint, message.LeaderId, message.LeaderHttpEndPoint, message.View);
+			Handle(accept); // implicitly sent accept to ourselves
+			SendToAllExceptMe(accept);
+		}
+	}
+
+	public void Handle(ElectionMessage.Accept message) {
+		if (_state == ElectionsState.Shutdown)
+			return;
+		if (message.View != _lastInstalledView)
+			return;
+		if (_leaderProposal == null)
+			return;
+		if (_leaderProposal.InstanceId != message.LeaderId)
+			return;
+
+		Log.Information(
+			"ELECTIONS: (V={view}) ACCEPT FROM [{serverHttpEndPoint},{serverId:B}] M=[{leaderHttpEndPoint},{leaderId:B}]).",
+			message.View,
+			message.ServerHttpEndPoint, message.ServerId, message.LeaderHttpEndPoint, message.LeaderId);
+
+		if (_acceptsReceived.Add(message.ServerId) && _acceptsReceived.Count == _clusterSize / 2 + 1) {
+			var leader = _servers.FirstOrDefault(x => x.InstanceId == _leaderProposal.InstanceId);
+			if (leader != null) {
+				_leader = _leaderProposal.InstanceId;
+				Log.Information("ELECTIONS: (V={view}) DONE. ELECTED LEADER = {leaderInfo}. ME={ownInfo}.", message.View,
+					FormatNodeInfo(_leaderProposal), FormatNodeInfo(GetOwnInfo()));
+				_lastElectedLeader = _leader;
+				_resigningLeaderInstanceId = null;
+				_publisher.Publish(new ElectionMessage.ElectionsDone(message.View, _leaderProposal.ProposalNumber, leader));
+			}
+		}
+	}
+
+	public void Handle(LeaderDiscoveryMessage.LeaderFound message) {
+		if (_leader != null || _lastElectedLeader != null || _state != ElectionsState.Idle)
+			return;
+
+		Log.Information("ELECTIONS: Existing LEADER was discovered, updating information. M=[{leaderHttpEndPoint},{leaderId:B}])", message.Leader.HttpEndPoint, message.Leader.InstanceId);
+		_leader = message.Leader.InstanceId;
+		_lastElectedLeader = message.Leader.InstanceId;
+		_lastAttemptedView = 0;
+		_lastInstalledView = 0;
+		_state = ElectionsState.Acceptor;
+	}
+
+	private LeaderCandidate GetOwnInfo() {
+		var lastEpoch = _epochManager.GetLastEpoch();
+		var writerCheckpoint = _writerCheckpoint.Read();
+		var chaserCheckpoint = _chaserCheckpoint.Read();
+		var lastCommitPosition = _getLastCommitPosition();
+		return new LeaderCandidate(_memberInfo.InstanceId, _memberInfo.HttpEndPoint,
+			lastEpoch?.EpochNumber ?? -1,
+			lastEpoch?.EpochPosition ?? -1,
+			lastEpoch?.EpochId ?? Guid.Empty,
+			lastEpoch?.LeaderInstanceId ?? Guid.Empty,
+			lastCommitPosition, writerCheckpoint, chaserCheckpoint, _nodePriority);
+	}
+
+	private static string FormatNodeInfo(LeaderCandidate candidate) {
+		return FormatNodeInfo(candidate.HttpEndPoint, candidate.InstanceId,
+			candidate.LastCommitPosition, candidate.WriterCheckpoint, candidate.ChaserCheckpoint,
+			candidate.EpochNumber, candidate.EpochPosition, candidate.EpochId, candidate.EpochLeaderInstanceId, candidate.NodePriority);
+	}
+
+	private static string FormatNodeInfo(EndPoint serverEndPoint, Guid serverId,
+		long lastCommitPosition, long writerCheckpoint, long chaserCheckpoint,
+		int epochNumber, long epochPosition, Guid epochId, Guid epochLeaderInstanceId, int priority) {
+		return $"[{serverEndPoint},{serverId:B}](L={lastCommitPosition},W={writerCheckpoint},C={chaserCheckpoint},E{epochNumber}@{epochPosition}:{epochId:B} (L={epochLeaderInstanceId:B}),Priority={priority})";
+	}
+
+	public class LeaderCandidate(
+		Guid instanceId,
+		EndPoint httpEndPoint,
+		int epochNumber,
+		long epochPosition,
+		Guid epochId,
+		Guid epochLeaderInstanceId,
+		long lastCommitPosition,
+		long writerCheckpoint,
+		long chaserCheckpoint,
+		int nodePriority) {
+		public readonly Guid InstanceId = instanceId;
+		public readonly EndPoint HttpEndPoint = httpEndPoint;
+		public int ProposalNumber;
+		public readonly int EpochNumber = epochNumber;
+		public readonly long EpochPosition = epochPosition;
+		public readonly Guid EpochId = epochId;
+		public readonly Guid EpochLeaderInstanceId = epochLeaderInstanceId;
+		public readonly long LastCommitPosition = lastCommitPosition;
+		public readonly long WriterCheckpoint = writerCheckpoint;
+		public readonly long ChaserCheckpoint = chaserCheckpoint;
+		public readonly int NodePriority = nodePriority;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Gossip/ClusterMultipleVersionsLogger.cs b/src/KurrentDB.Core/Services/Gossip/ClusterMultipleVersionsLogger.cs
new file mode 100644
index 00000000000..d4b8810ed65
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Gossip/ClusterMultipleVersionsLogger.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using KurrentDB.Common.Log;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Messages;
+
+namespace KurrentDB.Core.Services.Gossip;
+
+public class ClusterMultipleVersionsLogger : IHandle<GossipMessage.GossipUpdated> {
+	private static readonly ThrottledLog<ClusterMultipleVersionsLogger> Log = new(TimeSpan.FromMinutes(1));
+
+	public void Handle(GossipMessage.GossipUpdated message) {
+		ClusterInfo updatedCluster = message.ClusterInfo;
+		if (updatedCluster == null) {
+			return;
+		}
+		Dictionary<EndPoint, string> ipAddressVsVersion = GetIPAddressVsVersion(updatedCluster, out int numDistinctKnownVersions);
+		if (numDistinctKnownVersions > 1) {
+			IEnumerable<string> ipAndVersion = ipAddressVsVersion.Select(keyvalue => $"({keyvalue.Key},{keyvalue.Value})");
+			Log.Warning($"MULTIPLE DB VERSIONS ON CLUSTER NODES FOUND [ {string.Join(", ", ipAndVersion)} ]");
+		}
+	}
+
+	public static Dictionary<EndPoint, string> GetIPAddressVsVersion(ClusterInfo cluster, out int numDistinctKnownVersions) {
+		var aliveMembers = cluster.Members.Where(memberInfo => memberInfo.IsAlive).ToList();
+		numDistinctKnownVersions = aliveMembers.Select(memberInfo => memberInfo.ESVersion)
+			.Where(esVersion => !VersionInfo.UnknownVersion.Equals(esVersion)).Distinct().Count();
+
+		return aliveMembers.ToDictionary(memberInfo => memberInfo.HttpEndPoint, memberInfo => memberInfo.ESVersion);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Gossip/DnsGossipSeedSource.cs b/src/KurrentDB.Core/Services/Gossip/DnsGossipSeedSource.cs
new file mode 100644
index 00000000000..18f5e78cbd9
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Gossip/DnsGossipSeedSource.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Net;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.Services.Gossip;
+
+public class DnsGossipSeedSource(string hostname, int managerHttpPort) : IGossipSeedSource {
+	public IAsyncResult BeginGetHostEndpoints(AsyncCallback requestCallback, object state) {
+		return Dns.BeginGetHostAddresses(hostname, requestCallback, state);
+	}
+
+	public EndPoint[] EndGetHostEndpoints(IAsyncResult asyncResult) {
+		var addresses = Dns.EndGetHostAddresses(asyncResult);
+
+		return addresses.Select(address => new IPEndPoint(address, managerHttpPort).WithClusterDns(hostname)).ToArray();
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Gossip/GossipServiceBase.cs b/src/KurrentDB.Core/Services/Gossip/GossipServiceBase.cs
new file mode 100644
index 00000000000..64fff5ca272
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Gossip/GossipServiceBase.cs
@@ -0,0 +1,389 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Net;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Gossip;
+
+public abstract class GossipServiceBase : IHandle<SystemMessage.SystemInit>,
+	IHandle<GossipMessage.RetrieveGossipSeedSources>,
+	IHandle<GossipMessage.GotGossipSeedSources>,
+	IHandle<GossipMessage.Gossip>,
+	IHandle<GossipMessage.GossipReceived>,
+	IHandle<GossipMessage.ReadGossip>,
+	IHandle<GossipMessage.ClientGossip>,
+	IHandle<SystemMessage.StateChangeMessage>,
+	IHandle<GossipMessage.GossipSendFailed>,
+	IHandle<SystemMessage.VNodeConnectionLost>,
+	IHandle<SystemMessage.VNodeConnectionEstablished>,
+	IHandle<GossipMessage.GetGossipReceived>,
+	IHandle<GossipMessage.GetGossipFailed>,
+	IHandle<ElectionMessage.ElectionsDone> {
+	public const int GossipRoundStartupThreshold = 20;
+	public static readonly TimeSpan DnsRetryTimeout = TimeSpan.FromMilliseconds(1000);
+	public static readonly TimeSpan GossipStartupInterval = TimeSpan.FromMilliseconds(100);
+	private readonly TimeSpan _deadMemberRemovalPeriod;
+	private static readonly ILogger Log = Serilog.Log.ForContext<GossipServiceBase>();
+
+	protected readonly MemberInfo MemberInfo;
+	protected VNodeState CurrentRole = VNodeState.Initializing;
+	private MemberInfo _currentLeader;
+	private readonly TimeSpan _gossipInterval;
+	private readonly TimeSpan _allowedTimeDifference;
+	private readonly TimeSpan _gossipTimeout;
+
+	private readonly IPublisher _bus;
+	private readonly int _clusterSize;
+	private readonly IEnvelope _publishEnvelope;
+	private readonly IGossipSeedSource _gossipSeedSource;
+
+	private GossipState _state;
+	private ClusterInfo _cluster;
+	private readonly Random _rnd = new Random(Math.Abs(Environment.TickCount));
+	private readonly ITimeProvider _timeProvider;
+	private readonly Func<MemberInfo[], MemberInfo> _getNodeToGossipTo;
+
+	protected GossipServiceBase(IPublisher bus,
+		int clusterSize,
+		IGossipSeedSource gossipSeedSource,
+		MemberInfo memberInfo,
+		TimeSpan gossipInterval,
+		TimeSpan allowedTimeDifference,
+		TimeSpan gossipTimeout,
+		TimeSpan deadMemberRemovalPeriod,
+		ITimeProvider timeProvider,
+		Func<MemberInfo[], MemberInfo> getNodeToGossipTo = null) {
+		_bus = Ensure.NotNull(bus);
+		_clusterSize = clusterSize;
+		_publishEnvelope = bus;
+		_gossipSeedSource = Ensure.NotNull(gossipSeedSource);
+		MemberInfo = Ensure.NotNull(memberInfo);
+		_gossipInterval = gossipInterval;
+		_allowedTimeDifference = allowedTimeDifference;
+		_gossipTimeout = gossipTimeout;
+		_deadMemberRemovalPeriod = deadMemberRemovalPeriod;
+		_state = GossipState.Startup;
+		_timeProvider = Ensure.NotNull(timeProvider);
+		_getNodeToGossipTo = getNodeToGossipTo ?? GetNodeToGossipTo;
+	}
+
+	protected abstract MemberInfo GetInitialMe();
+	protected abstract MemberInfo GetUpdatedMe(MemberInfo me);
+
+	public void Handle(SystemMessage.SystemInit message) {
+		if (_state != GossipState.Startup)
+			return;
+		_cluster = new ClusterInfo(GetInitialMe());
+		Handle(new GossipMessage.RetrieveGossipSeedSources());
+	}
+
+	public void Handle(GossipMessage.RetrieveGossipSeedSources message) {
+		_state = GossipState.RetrievingGossipSeeds;
+		try {
+			_gossipSeedSource.BeginGetHostEndpoints(OnGotGossipSeedSources, null);
+		} catch (Exception ex) {
+			Log.Error(ex, "Error while retrieving cluster members through DNS.");
+			_bus.Publish(TimerMessage.Schedule.Create(DnsRetryTimeout, _publishEnvelope, new GossipMessage.RetrieveGossipSeedSources()));
+		}
+	}
+
+	private void OnGotGossipSeedSources(IAsyncResult ar) {
+		try {
+			var entries = _gossipSeedSource.EndGetHostEndpoints(ar);
+			_bus.Publish(new GossipMessage.GotGossipSeedSources(entries));
+		} catch (Exception ex) {
+			Log.Error(ex, "Error while retrieving cluster members through DNS.");
+			_bus.Publish(TimerMessage.Schedule.Create(DnsRetryTimeout, _publishEnvelope, new GossipMessage.RetrieveGossipSeedSources()));
+		}
+	}
+
+	public void Handle(GossipMessage.GotGossipSeedSources message) {
+		var now = _timeProvider.UtcNow;
+		var dnsCluster = new ClusterInfo(message.GossipSeeds.Select(x => MemberInfo.ForManager(Guid.Empty, now, true, x)).ToArray());
+
+		var oldCluster = _cluster;
+		_cluster = MergeClusters(_cluster, dnsCluster, null, x => x, _timeProvider.UtcNow, MemberInfo,
+			_currentLeader?.InstanceId, _allowedTimeDifference, _deadMemberRemovalPeriod);
+
+		LogClusterChange(oldCluster, _cluster, null);
+
+		_state = GossipState.Working;
+		Handle(new GossipMessage.Gossip(0));
+	}
+
+	public void Handle(GossipMessage.Gossip message) {
+		if (_state != GossipState.Working)
+			return;
+
+		TimeSpan interval;
+		int gossipRound;
+
+		if (_clusterSize == 1) {
+			_cluster = UpdateCluster(_cluster, x => x.InstanceId == MemberInfo.InstanceId ? GetUpdatedMe(x) : x,
+				_timeProvider, _deadMemberRemovalPeriod, CurrentRole);
+			interval = _gossipInterval;
+			gossipRound = Math.Min(int.MaxValue - 1, message.GossipRound + 1);
+		} else {
+			var node = _getNodeToGossipTo(_cluster.Members);
+			if (node != null) {
+				_cluster = UpdateCluster(_cluster, x => x.InstanceId == MemberInfo.InstanceId ? GetUpdatedMe(x) : x,
+					_timeProvider, _deadMemberRemovalPeriod, CurrentRole);
+				_bus.Publish(new GrpcMessage.SendOverGrpc(node.HttpEndPoint,
+					new GossipMessage.SendGossip(_cluster, MemberInfo.HttpEndPoint),
+					_timeProvider.LocalTime.Add(_gossipTimeout)));
+			}
+
+			interval = message.GossipRound < GossipRoundStartupThreshold ? GossipStartupInterval : _gossipInterval;
+			gossipRound = Math.Min(int.MaxValue - 1, node == null ? message.GossipRound : message.GossipRound + 1);
+		}
+
+		_bus.Publish(TimerMessage.Schedule.Create(interval, _publishEnvelope, new GossipMessage.Gossip(gossipRound)));
+	}
+
+	private MemberInfo GetNodeToGossipTo(MemberInfo[] members) {
+		if (members.Length == 0)
+			return null;
+		for (int i = 0; i < 5; ++i) {
+			var node = members[_rnd.Next(members.Length)];
+			if (node.InstanceId != MemberInfo.InstanceId)
+				return node;
+		}
+
+		return null;
+	}
+
+	public void Handle(GossipMessage.GossipReceived message) {
+		if (_state != GossipState.Working)
+			return;
+
+		var oldCluster = _cluster;
+		_cluster = MergeClusters(_cluster,
+			message.ClusterInfo,
+			message.Server,
+			x => x.InstanceId == MemberInfo.InstanceId ? GetUpdatedMe(x) : x,
+			_timeProvider.UtcNow, MemberInfo, _currentLeader?.InstanceId, _allowedTimeDifference,
+			_deadMemberRemovalPeriod);
+
+		message.Envelope.ReplyWith(new GossipMessage.SendGossip(_cluster, MemberInfo.HttpEndPoint));
+
+		if (_cluster.HasChangedSince(oldCluster))
+			LogClusterChange(oldCluster, _cluster, $"gossip received from [{message.Server}]");
+		_bus.Publish(new GossipMessage.GossipUpdated(_cluster));
+	}
+
+	public void Handle(GossipMessage.ReadGossip message) {
+		if (_cluster != null) {
+			message.Envelope.ReplyWith(new GossipMessage.SendGossip(_cluster, MemberInfo.HttpEndPoint));
+		}
+	}
+
+	public void Handle(GossipMessage.ClientGossip message) {
+		if (_cluster == null)
+			return;
+
+		var advertisedAddress = string.IsNullOrEmpty(MemberInfo.AdvertiseHostToClientAs)
+			? MemberInfo.HttpEndPoint.GetHost()
+			: MemberInfo.AdvertiseHostToClientAs;
+		var advertisedPort = MemberInfo.AdvertiseHttpPortToClientAs == 0
+			? MemberInfo.HttpEndPoint.GetPort()
+			: MemberInfo.AdvertiseHttpPortToClientAs;
+		message.Envelope.ReplyWith(new GossipMessage.SendClientGossip(new(_cluster, advertisedAddress, advertisedPort)));
+	}
+
+	public void Handle(SystemMessage.StateChangeMessage message) {
+		CurrentRole = message.State;
+		_currentLeader = message is not SystemMessage.ReplicaStateMessage replicaState ? null : replicaState.Leader;
+
+		if (_cluster is null)
+			return;
+
+		_cluster = UpdateCluster(_cluster, x => x.InstanceId == MemberInfo.InstanceId ? GetUpdatedMe(x) : x,
+			_timeProvider, _deadMemberRemovalPeriod, CurrentRole);
+
+		_bus.Publish(new GossipMessage.GossipUpdated(_cluster));
+	}
+
+	public void Handle(GossipMessage.GossipSendFailed message) {
+		var node = _cluster.Members.FirstOrDefault(x => x.Is(message.Recipient));
+		if (node is not { IsAlive: true })
+			return;
+
+		if (node.InstanceId == _currentLeader?.InstanceId) {
+			Log.Information(
+				"Leader [{leaderEndPoint}, {instanceId:B}] appears to be DEAD (Gossip send failed); wait for TCP to decide.",
+				message.Recipient, node.InstanceId);
+			return;
+		}
+
+		Log.Information("Looks like node [{nodeEndPoint}] is DEAD (Gossip send failed).", message.Recipient);
+
+		var oldCluster = _cluster;
+		_cluster = UpdateCluster(_cluster, x => x.Is(message.Recipient)
+				? x.Updated(_timeProvider.UtcNow, isAlive: false)
+				: x,
+			_timeProvider, _deadMemberRemovalPeriod, CurrentRole);
+		if (_cluster.HasChangedSince(oldCluster))
+			LogClusterChange(oldCluster, _cluster, $"gossip send failed to [{message.Recipient}]");
+		_bus.Publish(new GossipMessage.GossipUpdated(_cluster));
+	}
+
+	public void Handle(SystemMessage.VNodeConnectionLost message) {
+		var node = _cluster.Members.FirstOrDefault(x => x.Is(message.VNodeEndPoint));
+		if (node is not { IsAlive: true })
+			return;
+
+		Log.Information("Looks like node [{nodeEndPoint}] is DEAD (TCP connection lost). Issuing a gossip to confirm.", message.VNodeEndPoint);
+		_bus.Publish(new GrpcMessage.SendOverGrpc(node.HttpEndPoint, new GossipMessage.GetGossip(), _timeProvider.LocalTime.Add(_gossipTimeout)));
+	}
+
+	public void Handle(GossipMessage.GetGossipReceived message) {
+		if (_state != GossipState.Working)
+			return;
+
+		Log.Information("Gossip Received, The node [{nodeEndpoint}] is not DEAD.", message.Server);
+
+		var oldCluster = _cluster;
+		_cluster = MergeClusters(_cluster,
+			message.ClusterInfo,
+			message.Server,
+			x => x.InstanceId == MemberInfo.InstanceId ? GetUpdatedMe(x) : x,
+			_timeProvider.UtcNow, MemberInfo, _currentLeader?.InstanceId, _allowedTimeDifference,
+			_deadMemberRemovalPeriod);
+
+		if (_cluster.HasChangedSince(oldCluster))
+			LogClusterChange(oldCluster, _cluster, $"gossip received from [{message.Server}]");
+
+		_bus.Publish(new GossipMessage.GossipUpdated(_cluster));
+	}
+
+	public void Handle(GossipMessage.GetGossipFailed message) {
+		if (_state != GossipState.Working)
+			return;
+
+		Log.Information("Gossip Failed, The node [{nodeEndpoint}] is being marked as DEAD. Reason: {reason}", message.Recipient, message.Reason);
+
+		var oldCluster = _cluster;
+		_cluster = UpdateCluster(_cluster, x => x.Is(message.Recipient)
+				? x.Updated(_timeProvider.UtcNow, isAlive: false)
+				: x,
+			_timeProvider, _deadMemberRemovalPeriod, CurrentRole);
+		if (_cluster.HasChangedSince(oldCluster))
+			LogClusterChange(oldCluster, _cluster, $"TCP connection lost to [{message.Recipient}]");
+		_bus.Publish(new GossipMessage.GossipUpdated(_cluster));
+	}
+
+	public void Handle(SystemMessage.VNodeConnectionEstablished message) {
+		var oldCluster = _cluster;
+		_cluster = UpdateCluster(_cluster, x => x.Is(message.VNodeEndPoint)
+				? x.Updated(_timeProvider.UtcNow, isAlive: true)
+				: x,
+			_timeProvider, _deadMemberRemovalPeriod, CurrentRole);
+		if (_cluster.HasChangedSince(oldCluster))
+			LogClusterChange(oldCluster, _cluster, $"TCP connection established to [{message.VNodeEndPoint}]");
+		_bus.Publish(new GossipMessage.GossipUpdated(_cluster));
+	}
+
+	public void Handle(ElectionMessage.ElectionsDone message) {
+		var oldCluster = _cluster;
+		_cluster = UpdateCluster(_cluster,
+			x => x.InstanceId == message.Leader.InstanceId
+				? x.Updated(_timeProvider.UtcNow, VNodeState.Leader)
+				: x.Updated(_timeProvider.UtcNow, VNodeState.Unknown),
+			_timeProvider, _deadMemberRemovalPeriod, CurrentRole);
+		if (_cluster.HasChangedSince(oldCluster))
+			LogClusterChange(oldCluster, _cluster, "Elections Done");
+		_bus.Publish(new GossipMessage.GossipUpdated(_cluster));
+	}
+
+	public static ClusterInfo MergeClusters(ClusterInfo myCluster, ClusterInfo othersCluster,
+		EndPoint peerEndPoint, Func<MemberInfo, MemberInfo> update, DateTime utcNow,
+		MemberInfo me, Guid? currentLeaderInstanceId, TimeSpan allowedTimeDifference,
+		TimeSpan deadMemberRemovalTimeout) {
+		var members = myCluster.Members.ToDictionary(member => member.HttpEndPoint, new EndPointEqualityComparer());
+		MemberInfo peerNode = peerEndPoint != null
+			? othersCluster.Members.SingleOrDefault(member => member.Is(peerEndPoint), null)
+			: null;
+		bool isPeerOld = peerNode?.ESVersion == null;
+		foreach (var member in othersCluster.Members) {
+			if (member.InstanceId == me.InstanceId || member.Is(me.HttpEndPoint))
+				// we know about ourselves better
+				continue;
+			if (member.Equals(peerNode)) // peer knows about itself better
+			{
+				if ((utcNow - member.TimeStamp).Duration() > allowedTimeDifference) {
+					Log.Error("Time difference between us and [{peerEndPoint}] is too great! "
+							  + "UTC now: {dateTime:yyyy-MM-dd HH:mm:ss.fff}, peer's time stamp: {peerTimestamp:yyyy-MM-dd HH:mm:ss.fff}.",
+						peerEndPoint, utcNow, member.TimeStamp);
+				}
+
+				members[member.HttpEndPoint] = member.Updated(utcNow: member.TimeStamp, esVersion: isPeerOld ? VersionInfo.OldVersion : member.ESVersion);
+			} else {
+				// if there is no data about this member or data is stale -- update
+				if (!members.TryGetValue(member.HttpEndPoint, out var existingMem) || IsMoreUpToDate(member, existingMem)) {
+					// we do not trust leader's alive status and state to come from outside
+					if (currentLeaderInstanceId != null && existingMem != null &&
+						member.InstanceId == currentLeaderInstanceId)
+						members[member.HttpEndPoint] = member.Updated(utcNow: utcNow, isAlive: existingMem.IsAlive, state: existingMem.State);
+					else
+						members[member.HttpEndPoint] = member;
+				}
+
+				if (peerNode != null && isPeerOld) {
+					MemberInfo newInfo = members[member.HttpEndPoint];
+					// if we don't have past information about es version of the node, es version is unknown because old peer won't be sending version info in gossip
+					members[member.HttpEndPoint] = newInfo.Updated(newInfo.TimeStamp, esVersion: existingMem?.ESVersion ?? VersionInfo.UnknownVersion);
+				}
+			}
+		}
+
+		var newMembers = members.Values.Select(update).Where(x => KeepNodeInGossip(x, utcNow, deadMemberRemovalTimeout, me.State));
+		return new ClusterInfo(newMembers);
+	}
+
+	private static bool IsMoreUpToDate(MemberInfo member, MemberInfo existingMem) {
+		if (member.EpochNumber != existingMem.EpochNumber)
+			return member.EpochNumber > existingMem.EpochNumber;
+		if (member.WriterCheckpoint != existingMem.WriterCheckpoint)
+			return member.WriterCheckpoint > existingMem.WriterCheckpoint;
+		return member.TimeStamp > existingMem.TimeStamp;
+	}
+
+	public static ClusterInfo UpdateCluster(ClusterInfo cluster, Func<MemberInfo, MemberInfo> update,
+		ITimeProvider timeProvider, TimeSpan deadMemberRemovalTimeout, VNodeState currentRole) {
+		var newMembers = cluster.Members.Select(update)
+			.Where(x => KeepNodeInGossip(x, timeProvider.UtcNow, deadMemberRemovalTimeout, currentRole));
+		return new ClusterInfo(newMembers);
+	}
+
+	private static bool KeepNodeInGossip(MemberInfo m, DateTime utcNow, TimeSpan deadMemberRemovalTimeout, VNodeState currentRole) {
+		// remove dead timed-out members, if there are any, and if we are not in an unknown/initializing/leaderless state
+		return m.IsAlive || utcNow - m.TimeStamp < deadMemberRemovalTimeout
+						 || currentRole <= VNodeState.Unknown || currentRole == VNodeState.ReadOnlyLeaderless;
+	}
+
+	private static void LogClusterChange(ClusterInfo oldCluster, ClusterInfo newCluster, string source) {
+		var endPointComparer = new EndPointComparer();
+		var oldMembers = oldCluster.Members.OrderByDescending(x => x.HttpEndPoint, endPointComparer).ToList();
+		var newMembers = newCluster.Members.OrderByDescending(x => x.HttpEndPoint, endPointComparer).ToList();
+		Log.Information(
+			"CLUSTER HAS CHANGED {source}"
+			+ "\nOld:"
+			+ "\n{oldMembers}"
+			+ "\nNew:"
+			+ "\n{newMembers}"
+			, source.IsNotEmptyString() ? source : string.Empty
+			, oldMembers
+			, newMembers
+		);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Gossip/GossipState.cs b/src/KurrentDB.Core/Services/Gossip/GossipState.cs
new file mode 100644
index 00000000000..0f3c969ac33
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Gossip/GossipState.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.Gossip;
+
+public enum GossipState {
+	Startup,
+	RetrievingGossipSeeds,
+	Working
+}
diff --git a/src/KurrentDB.Core/Services/Gossip/IGossipSeedSource.cs b/src/KurrentDB.Core/Services/Gossip/IGossipSeedSource.cs
new file mode 100644
index 00000000000..9595a3cf1cf
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Gossip/IGossipSeedSource.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+
+namespace KurrentDB.Core.Services.Gossip;
+
+public interface IGossipSeedSource {
+	IAsyncResult BeginGetHostEndpoints(AsyncCallback requestCallback, object state);
+	EndPoint[] EndGetHostEndpoints(IAsyncResult asyncResult);
+}
diff --git a/src/KurrentDB.Core/Services/Gossip/LoopbackDns.cs b/src/KurrentDB.Core/Services/Gossip/LoopbackDns.cs
new file mode 100644
index 00000000000..5dc69bf53be
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Gossip/LoopbackDns.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.Services.Gossip;
+
+public class KnownEndpointGossipSeedSource : IGossipSeedSource {
+	private readonly EndPoint[] _ipEndPoints;
+
+	public KnownEndpointGossipSeedSource(EndPoint[] ipEndPoints) {
+		_ipEndPoints = Ensure.NotNull(ipEndPoints);
+	}
+
+	public IAsyncResult BeginGetHostEndpoints(AsyncCallback requestCallback, object state) {
+		requestCallback(null!);
+		return null;
+	}
+
+	public EndPoint[] EndGetHostEndpoints(IAsyncResult asyncResult) => _ipEndPoints;
+}
diff --git a/src/KurrentDB.Core/Services/Gossip/NodeGossipService.cs b/src/KurrentDB.Core/Services/Gossip/NodeGossipService.cs
new file mode 100644
index 00000000000..082ec29b7ed
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Gossip/NodeGossipService.cs
@@ -0,0 +1,92 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Storage.EpochManager;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+
+namespace KurrentDB.Core.Services.Gossip;
+
+public class NodeGossipService : GossipServiceBase, IHandle<GossipMessage.UpdateNodePriority> {
+	private readonly IReadOnlyCheckpoint _writerCheckpoint;
+	private readonly IReadOnlyCheckpoint _chaserCheckpoint;
+	private readonly IEpochManager _epochManager;
+	private readonly Func<long> _getLastCommitPosition;
+	private int _nodePriority;
+	private readonly ITimeProvider _timeProvider;
+
+	public NodeGossipService(IPublisher bus,
+		int clusterSize,
+		IGossipSeedSource gossipSeedSource,
+		MemberInfo memberInfo,
+		IReadOnlyCheckpoint writerCheckpoint,
+		IReadOnlyCheckpoint chaserCheckpoint,
+		IEpochManager epochManager,
+		Func<long> getLastCommitPosition,
+		int nodePriority,
+		TimeSpan gossipInterval,
+		TimeSpan allowedTimeDifference,
+		TimeSpan gossipTimeout,
+		TimeSpan deadMemberRemovalPeriod,
+		ITimeProvider timeProvider,
+		Func<MemberInfo[], MemberInfo> getNodeToGossipTo = null)
+		: base(bus, clusterSize, gossipSeedSource, memberInfo, gossipInterval, allowedTimeDifference, gossipTimeout, deadMemberRemovalPeriod, timeProvider, getNodeToGossipTo) {
+		Ensure.NotNull(writerCheckpoint, nameof(writerCheckpoint));
+		Ensure.NotNull(chaserCheckpoint, nameof(chaserCheckpoint));
+		Ensure.NotNull(epochManager, nameof(epochManager));
+		Ensure.NotNull(getLastCommitPosition, nameof(getLastCommitPosition));
+
+		_writerCheckpoint = writerCheckpoint;
+		_chaserCheckpoint = chaserCheckpoint;
+		_epochManager = epochManager;
+		_getLastCommitPosition = getLastCommitPosition;
+		_nodePriority = nodePriority;
+		_timeProvider = timeProvider;
+	}
+
+	protected override MemberInfo GetInitialMe() {
+		var lastEpoch = _epochManager.GetLastEpoch();
+		var initialState = MemberInfo.IsReadOnlyReplica ? VNodeState.ReadOnlyLeaderless : VNodeState.Unknown;
+		return MemberInfo.ForVNode(MemberInfo.InstanceId,
+			_timeProvider.UtcNow,
+			initialState,
+			true,
+			MemberInfo.InternalTcpEndPoint,
+			MemberInfo.InternalSecureTcpEndPoint,
+			MemberInfo.ExternalTcpEndPoint,
+			MemberInfo.ExternalSecureTcpEndPoint,
+			MemberInfo.HttpEndPoint,
+			MemberInfo.AdvertiseHostToClientAs,
+			MemberInfo.AdvertiseHttpPortToClientAs,
+			MemberInfo.AdvertiseTcpPortToClientAs,
+			_getLastCommitPosition(),
+			_writerCheckpoint.Read(),
+			_chaserCheckpoint.Read(),
+			lastEpoch == null ? -1 : lastEpoch.EpochPosition,
+			lastEpoch == null ? -1 : lastEpoch.EpochNumber,
+			lastEpoch == null ? Guid.Empty : lastEpoch.EpochId,
+			_nodePriority,
+			MemberInfo.IsReadOnlyReplica, MemberInfo.ESVersion);
+	}
+
+	protected override MemberInfo GetUpdatedMe(MemberInfo me) {
+		return me.Updated(isAlive: true,
+			state: CurrentRole,
+			lastCommitPosition: _getLastCommitPosition(),
+			writerCheckpoint: _writerCheckpoint.ReadNonFlushed(),
+			chaserCheckpoint: _chaserCheckpoint.ReadNonFlushed(),
+			epoch: _epochManager.GetLastEpoch(),
+			nodePriority: _nodePriority,
+			utcNow: _timeProvider.UtcNow);
+	}
+
+	public void Handle(GossipMessage.UpdateNodePriority message) {
+		_nodePriority = message.NodePriority;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/GrpcSendService.cs b/src/KurrentDB.Core/Services/GrpcSendService.cs
new file mode 100644
index 00000000000..3534abed898
--- /dev/null
+++ b/src/KurrentDB.Core/Services/GrpcSendService.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Messages;
+using Serilog;
+
+namespace KurrentDB.Core.Services;
+
+public class GrpcSendService :
+	IHandle<GrpcMessage.SendOverGrpc> {
+
+	private readonly EventStoreClusterClientCache _eventStoreClientCache;
+	private static readonly ILogger Log = Serilog.Log.ForContext<GrpcSendService>();
+
+	public GrpcSendService(EventStoreClusterClientCache eventStoreClientCache) {
+		_eventStoreClientCache =
+			eventStoreClientCache ?? throw new ArgumentNullException(nameof(eventStoreClientCache));
+	}
+
+	public void Handle(GrpcMessage.SendOverGrpc message) {
+		if (message.LiveUntil < DateTime.Now) {
+			Log.Verbose("Dropping gRPC send message due to TTL being over. {messageType} To : {endPoint}",
+				message.Message.GetType().Name, message.DestinationEndpoint);
+			return;
+		}
+
+		switch (message.Message) {
+			case GossipMessage.SendGossip sendGossip:
+				_eventStoreClientCache.Get(message.DestinationEndpoint)
+					.SendGossip(sendGossip, message.DestinationEndpoint, message.LiveUntil);
+				break;
+			case GossipMessage.GetGossip _:
+				_eventStoreClientCache.Get(message.DestinationEndpoint)
+					.GetGossip(message.DestinationEndpoint, message.LiveUntil);
+				break;
+			case ElectionMessage.ViewChange viewChange:
+				_eventStoreClientCache.Get(message.DestinationEndpoint)
+					.SendViewChange(viewChange, message.DestinationEndpoint, message.LiveUntil);
+				break;
+			case ElectionMessage.ViewChangeProof proof:
+				_eventStoreClientCache.Get(message.DestinationEndpoint)
+					.SendViewChangeProof(proof, message.DestinationEndpoint, message.LiveUntil);
+				break;
+			case ElectionMessage.Prepare prepare:
+				_eventStoreClientCache.Get(message.DestinationEndpoint)
+					.SendPrepare(prepare, message.DestinationEndpoint, message.LiveUntil);
+				break;
+			case ElectionMessage.PrepareOk prepareOk:
+				_eventStoreClientCache.Get(message.DestinationEndpoint)
+					.SendPrepareOk(prepareOk, message.DestinationEndpoint, message.LiveUntil);
+				break;
+			case ElectionMessage.Proposal proposal:
+				_eventStoreClientCache.Get(message.DestinationEndpoint)
+					.SendProposal(proposal, message.DestinationEndpoint, message.LiveUntil);
+				break;
+			case ElectionMessage.Accept accept:
+				_eventStoreClientCache.Get(message.DestinationEndpoint)
+					.SendAccept(accept, message.DestinationEndpoint, message.LiveUntil);
+				break;
+			case ElectionMessage.LeaderIsResigning resigning:
+				_eventStoreClientCache.Get(message.DestinationEndpoint)
+					.SendLeaderIsResigning(resigning, message.DestinationEndpoint, message.LiveUntil);
+				break;
+			case ElectionMessage.LeaderIsResigningOk resigningOk:
+				_eventStoreClientCache.Get(message.DestinationEndpoint)
+					.SendLeaderIsResigningOk(resigningOk, message.DestinationEndpoint, message.LiveUntil);
+				break;
+			default:
+				throw new NotImplementedException($"Message of type {message.Message.GetType().Name} cannot be handled.");
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/HttpSendService.cs b/src/KurrentDB.Core/Services/HttpSendService.cs
new file mode 100644
index 00000000000..5faf0ec73db
--- /dev/null
+++ b/src/KurrentDB.Core/Services/HttpSendService.cs
@@ -0,0 +1,228 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Security.Cryptography.X509Certificates;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Transport.Http;
+using KurrentDB.Core.Settings;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.EntityManagement;
+using HttpMethod = System.Net.Http.HttpMethod;
+using HttpStatusCode = KurrentDB.Transport.Http.HttpStatusCode;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services;
+
+public class HttpSendService : IHttpForwarder,
+	IHandle<SystemMessage.StateChangeMessage>,
+	IHandle<HttpMessage.HttpSend> {
+	private static readonly ILogger Log = Serilog.Log.ForContext<HttpSendService>();
+
+	private readonly HttpMessagePipe _httpPipe;
+	private readonly bool _forwardRequests;
+	private readonly HttpClient _forwardClient;
+	private MemberInfo _leaderInfo;
+
+	public HttpSendService(HttpMessagePipe httpPipe, bool forwardRequests, CertificateDelegates.ServerCertificateValidator externServerCertValidator) {
+		_httpPipe = Ensure.NotNull(httpPipe);
+		_forwardRequests = forwardRequests;
+
+		var socketsHttpHandler = new SocketsHttpHandler {
+			SslOptions = {
+				CertificateRevocationCheckMode = X509RevocationMode.NoCheck,
+				RemoteCertificateValidationCallback = (_, certificate, chain, errors) => {
+					var (isValid, error) = externServerCertValidator(certificate, chain, errors, _leaderInfo?.HttpEndPoint.GetOtherNames());
+					if (!isValid && error != null) {
+						Log.Error("Server certificate validation error: {e}", error);
+					}
+
+					return isValid;
+				}
+			},
+			PooledConnectionLifetime = ESConsts.HttpClientConnectionLifeTime
+		};
+		_forwardClient = new HttpClient(socketsHttpHandler);
+	}
+
+	public void Handle(SystemMessage.StateChangeMessage message) {
+		switch (message.State) {
+			case VNodeState.PreReplica:
+			case VNodeState.CatchingUp:
+			case VNodeState.Clone:
+			case VNodeState.Follower:
+			case VNodeState.PreReadOnlyReplica:
+			case VNodeState.ReadOnlyReplica:
+				_leaderInfo = ((SystemMessage.ReplicaStateMessage)message).Leader;
+				break;
+			case VNodeState.Initializing:
+			case VNodeState.DiscoverLeader:
+			case VNodeState.Unknown:
+			case VNodeState.PreLeader:
+			case VNodeState.Leader:
+			case VNodeState.ResigningLeader:
+			case VNodeState.Manager:
+			case VNodeState.ShuttingDown:
+			case VNodeState.Shutdown:
+			case VNodeState.ReadOnlyLeaderless:
+				_leaderInfo = null;
+				break;
+			default:
+				throw new Exception($"Unknown node state: {message.State}.");
+		}
+	}
+
+	public void Handle(HttpMessage.HttpSend message) {
+		if (message.Message is HttpMessage.DeniedToHandle deniedToHandle) {
+			int code;
+			switch (deniedToHandle.Reason) {
+				case DenialReason.ServerTooBusy:
+					code = HttpStatusCode.ServiceUnavailable;
+					break;
+				default:
+					throw new ArgumentOutOfRangeException();
+			}
+
+			// todo: histogram metric?
+			message.HttpEntityManager.ReplyStatus(
+				code,
+				deniedToHandle.Details,
+				exc => Log.Debug("Error occurred while replying to HTTP with message {message}: {e}.",
+					message.Message, exc.Message));
+		} else {
+			var response = message.Data;
+			var config = message.Configuration;
+
+			// todo: histogram metric?
+			if (response is byte[] bytes) {
+				message.HttpEntityManager.ReplyContent(
+					bytes,
+					config.Code,
+					config.Description,
+					config.ContentType,
+					config.Headers,
+					exc => Log.Debug("Error occurred while replying to HTTP with message {message}: {e}.",
+						message.Message, exc.Message));
+			} else {
+				message.HttpEntityManager.ReplyTextContent(
+					response as string,
+					config.Code,
+					config.Description,
+					config.ContentType,
+					config.Headers,
+					exc => Log.Debug("Error occurred while replying to HTTP with message {message}: {e}.",
+						message.Message, exc.Message));
+			}
+		}
+	}
+
+	bool IHttpForwarder.ForwardRequest(HttpEntityManager manager) {
+		var leaderInfo = _leaderInfo;
+		if (!_forwardRequests || leaderInfo == null)
+			return false;
+
+		var srcUrl = manager.RequestedUrl;
+		var srcBase = new Uri($"{srcUrl.Scheme}://{srcUrl.Host}:{srcUrl.Port}/", UriKind.Absolute);
+		var baseUri = new Uri(leaderInfo.HttpEndPoint.ToHttpUrl(srcUrl.Scheme));
+		var forwardUri = new Uri(baseUri, srcBase.MakeRelativeUri(srcUrl));
+		ForwardRequest(manager, forwardUri);
+		return true;
+	}
+
+	private void ForwardRequest(HttpEntityManager manager, Uri forwardUri) {
+		var srcReq = manager.HttpEntity.Request;
+		var request = new HttpRequestMessage();
+		request.RequestUri = forwardUri;
+		request.Method = new HttpMethod(srcReq.HttpMethod);
+
+		var hasContentLength = false;
+		// Copy unrestricted headers (including cookies, if any)
+		foreach (var headerKey in srcReq.GetHeaderKeys()) {
+			try {
+				switch (headerKey.ToLower()) {
+					case "connection":
+					case "content-type":
+					case "expect":
+					case "proxy-connection":
+					case "range":
+						break;
+					case "accept":
+						request.Headers.Accept.ParseAdd(srcReq.GetHeaderValues(headerKey).ToString());
+						break;
+					case "content-length":
+						hasContentLength = true;
+						break;
+					case "date":
+						request.Headers.Date = DateTime.Parse(srcReq.GetHeaderValues(headerKey).ToString());
+						break;
+					case "host":
+						request.Headers.Host = $"{forwardUri.Host}:{forwardUri.Port}";
+						break;
+					case "if-modified-since":
+						request.Headers.IfModifiedSince = DateTime.Parse(srcReq.GetHeaderValues(headerKey).ToString());
+						break;
+					case "referer":
+						request.Headers.Referrer = new Uri(srcReq.GetHeaderValues(headerKey).ToString());
+						break;
+					case "transfer-encoding":
+						request.Headers.TransferEncoding.ParseAdd(srcReq.GetHeaderValues(headerKey).ToString());
+						break;
+					case "user-agent":
+						request.Headers.UserAgent.ParseAdd(srcReq.GetHeaderValues(headerKey).ToString());
+						break;
+
+					default:
+						request.Headers.Add(headerKey, srcReq.GetHeaderValues(headerKey).ToString());
+						break;
+				}
+			} catch (FormatException) {
+				request.Headers.TryAddWithoutValidation(headerKey, srcReq.GetHeaderValues(headerKey).ToString());
+			}
+		}
+
+		if (!request.Headers.Contains(ProxyHeaders.XForwardedHost)) {
+			request.Headers.Add(ProxyHeaders.XForwardedHost, $"{manager.RequestedUrl.Host}:{manager.RequestedUrl.Port}");
+		}
+
+		// Copy content (if content body is allowed)
+		if (!string.Equals(srcReq.HttpMethod, "GET", StringComparison.OrdinalIgnoreCase)
+			&& !string.Equals(srcReq.HttpMethod, "HEAD", StringComparison.OrdinalIgnoreCase)
+			&& hasContentLength) {
+			var streamContent = new StreamContent(srcReq.InputStream);
+			streamContent.Headers.ContentLength = srcReq.ContentLength64;
+			request.Content = streamContent;
+
+			if (MediaTypeHeaderValue.TryParse(srcReq.ContentType, out var contentType)) {
+				streamContent.Headers.ContentType = contentType;
+			}
+		}
+
+		ForwardResponse(manager, request);
+	}
+
+	private static void ForwardReplyFailed(HttpEntityManager manager) {
+		manager.ReplyStatus(HttpStatusCode.InternalServerError, "Error while forwarding request", _ => { });
+	}
+
+	private void ForwardResponse(HttpEntityManager manager, HttpRequestMessage request) {
+		_forwardClient.SendAsync(request)
+			.ContinueWith(t => {
+				HttpResponseMessage response;
+				try {
+					response = t.Result;
+				} catch (Exception ex) {
+					Log.Debug("Error in SendAsync for forwarded request for '{requestedUrl}': {e}.", manager.RequestedUrl, ex.InnerException.Message);
+					ForwardReplyFailed(manager);
+					return;
+				}
+
+				manager.ForwardReply(response, exc => Log.Debug("Error forwarding response for '{requestedUrl}': {e}.", manager.RequestedUrl, exc.Message));
+			});
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Monitoring/MonitoringService.cs b/src/KurrentDB.Core/Services/Monitoring/MonitoringService.cs
new file mode 100644
index 00000000000..7071678ad9b
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Monitoring/MonitoringService.cs
@@ -0,0 +1,351 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Net;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Runtime.CompilerServices;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Monitoring.Stats;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Transport.Tcp;
+using Serilog.Core;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Monitoring;
+
+[Flags]
+public enum StatsStorage {
+	None = 0x0, // only for tests
+	Stream = 0x1,
+	File = 0x2,
+	StreamAndFile = Stream | File
+}
+
+public class MonitoringService : IHandle<SystemMessage.SystemInit>,
+	IHandle<SystemMessage.StateChangeMessage>,
+	IAsyncHandle<SystemMessage.BecomeShuttingDown>,
+	IHandle<SystemMessage.BecomeShutdown>,
+	IHandle<ClientMessage.WriteEventsCompleted>,
+	IAsyncHandle<MonitoringMessage.GetFreshStats>,
+	IHandle<MonitoringMessage.GetFreshTcpConnectionStats> {
+	private static readonly ILogger RegularLog = Serilog.Log.ForContext(Constants.SourceContextPropertyName, "REGULAR-STATS-LOGGER");
+	private static readonly ILogger Log = Serilog.Log.ForContext<MonitoringService>();
+
+	private static readonly string StreamMetadata = $"{{\"$maxAge\":{(int)TimeSpan.FromDays(10).TotalSeconds}}}";
+
+	public static readonly TimeSpan MemoizePeriod = TimeSpan.FromSeconds(1);
+	private static readonly IEnvelope NoopEnvelope = new NoopEnvelope();
+
+	private readonly IQueuedHandler _monitoringQueue;
+	private readonly IAsyncHandle<Message> _statsCollectionDispatcher;
+	private readonly IPublisher _mainQueue;
+	private readonly StatsStorage _statsStorage;
+	private readonly TimeSpan _statsCollectionPeriod;
+	private readonly SystemStatsHelper _systemStats;
+
+	private DateTime _lastStatsRequestTime = DateTime.UtcNow;
+	private StatsContainer _memoizedStats;
+	private Task _timer;
+	private CancellationTokenSource _timerTokenSource;
+	private readonly CancellationToken _timerToken;
+
+	private readonly string _nodeStatsStream;
+	private bool _statsStreamCreated;
+	private Guid _streamMetadataWriteCorrId;
+	private IMonitoredTcpConnection[] _memoizedTcpConnections;
+	private DateTime _lastTcpConnectionsRequestTime;
+	private readonly IPEndPoint _tcpEndpoint;
+	private readonly IPEndPoint _tcpSecureEndpoint;
+
+	public MonitoringService(IQueuedHandler monitoringQueue,
+		IAsyncHandle<Message> statsCollectionDispatcher,
+		IPublisher mainQueue,
+		TimeSpan statsCollectionPeriod,
+		EndPoint nodeEndpoint,
+		StatsStorage statsStorage,
+		IPEndPoint tcpEndpoint,
+		IPEndPoint tcpSecureEndpoint,
+		SystemStatsHelper systemStatsHelper) {
+		Ensure.NotNull(nodeEndpoint);
+
+		_monitoringQueue = Ensure.NotNull(monitoringQueue);
+		_statsCollectionDispatcher = Ensure.NotNull(statsCollectionDispatcher);
+		_mainQueue = Ensure.NotNull(mainQueue);
+		_statsStorage = statsStorage;
+
+		_statsCollectionPeriod = statsCollectionPeriod;
+
+		if (statsCollectionPeriod > TimeSpan.Zero) {
+			_timerTokenSource = new();
+			_timerToken = _timerTokenSource.Token;
+		} else {
+			_timerToken = new(canceled: true);
+		}
+
+		_nodeStatsStream = $"{SystemStreams.StatsStreamPrefix}-{nodeEndpoint}";
+		_tcpEndpoint = tcpEndpoint;
+		_tcpSecureEndpoint = tcpSecureEndpoint;
+
+		_timer = Task.CompletedTask;
+		_systemStats = systemStatsHelper;
+	}
+
+	public void Handle(SystemMessage.SystemInit message) {
+		if (_timerToken.IsCancellationRequested)
+			return;
+
+		_timer = CollectRegularStatsJob();
+	}
+
+	[AsyncMethodBuilder(typeof(SpawningAsyncTaskMethodBuilder))]
+	private async Task CollectRegularStatsJob() {
+		_systemStats.Start();
+
+		while (true) {
+			await Task.Delay(_statsCollectionPeriod, _timerToken)
+				.ConfigureAwait(
+					ConfigureAwaitOptions.SuppressThrowing |
+					// to be consistent with all the other awaits
+					ConfigureAwaitOptions.ContinueOnCapturedContext);
+
+			if (_timerToken.IsCancellationRequested)
+				break;
+
+			await CollectRegularStats(_timerToken);
+		}
+	}
+
+	private async ValueTask CollectRegularStats(CancellationToken token) {
+		try {
+			if (await CollectStats(token) is { } stats) {
+				var rawStats = stats.GetStats(useGrouping: false, useMetadata: false);
+
+				if ((_statsStorage & StatsStorage.File) != 0)
+					SaveStatsToFile(StatsContainer.Group(rawStats));
+
+				if ((_statsStorage & StatsStorage.Stream) != 0) {
+					if (_statsStreamCreated)
+						SaveStatsToStream(rawStats);
+				}
+			}
+		} catch (Exception ex) {
+			Log.Error(ex, "Error on regular stats collection.");
+		}
+	}
+
+	private async ValueTask<StatsContainer> CollectStats(CancellationToken token) {
+		var statsContainer = new StatsContainer();
+		try {
+			statsContainer.Add(_systemStats.GetSystemStats());
+			await _statsCollectionDispatcher.HandleAsync(new MonitoringMessage.InternalStatsRequest(new StatsCollectorEnvelope(statsContainer)), token);
+		} catch (OperationCanceledException e) when (e.CancellationToken == token) {
+			statsContainer = null;
+		} catch (Exception ex) {
+			Log.Error(ex, "Error while collecting stats");
+			statsContainer = null;
+		}
+
+		return statsContainer;
+	}
+
+	private static void SaveStatsToFile(Dictionary<string, object> rawStats) {
+		rawStats.Add("timestamp", DateTime.UtcNow.ToString("O", CultureInfo.InvariantCulture));
+		RegularLog.Information("{@stats}", rawStats);
+	}
+
+	private void SaveStatsToStream(Dictionary<string, object> rawStats) {
+		var data = rawStats.ToJsonBytes();
+		var evnt = new Event(Guid.NewGuid(), SystemEventTypes.StatsCollection, true, data, null);
+		var corrId = Guid.NewGuid();
+		var msg = new ClientMessage.WriteEvents(corrId, corrId, NoopEnvelope, false, _nodeStatsStream, ExpectedVersion.Any, [evnt], SystemAccounts.System);
+		_mainQueue.Publish(msg);
+	}
+
+	public void Handle(SystemMessage.StateChangeMessage message) {
+		if ((_statsStorage & StatsStorage.Stream) == 0)
+			return;
+
+		if (_statsStreamCreated)
+			return;
+
+		switch (message.State) {
+			case VNodeState.CatchingUp:
+			case VNodeState.Clone:
+			case VNodeState.Follower:
+			case VNodeState.ReadOnlyReplica:
+			case VNodeState.Leader: {
+				SetStatsStreamMetadata();
+				break;
+			}
+		}
+	}
+
+	public async ValueTask HandleAsync(SystemMessage.BecomeShuttingDown message, CancellationToken token) {
+		if (Interlocked.Exchange(ref _timerTokenSource, null) is { } cts) {
+			try {
+				cts.Cancel();
+				await _timer.WaitAsync(token);
+			} finally {
+				cts.Dispose();
+				_systemStats.Dispose();
+			}
+		}
+	}
+
+	public void Handle(SystemMessage.BecomeShutdown message) {
+		_monitoringQueue.RequestStop();
+	}
+
+	private void SetStatsStreamMetadata() {
+		var metadata = Helper.UTF8NoBom.GetBytes(StreamMetadata);
+		_streamMetadataWriteCorrId = Guid.NewGuid();
+		_mainQueue.Publish(
+			new ClientMessage.WriteEvents(
+				_streamMetadataWriteCorrId, _streamMetadataWriteCorrId, _monitoringQueue,
+				false, SystemStreams.MetastreamOf(_nodeStatsStream), ExpectedVersion.NoStream,
+				[new Event(Guid.NewGuid(), SystemEventTypes.StreamMetadata, true, metadata, null)],
+				SystemAccounts.System));
+	}
+
+	public void Handle(ClientMessage.WriteEventsCompleted message) {
+		if (message.CorrelationId != _streamMetadataWriteCorrId)
+			return;
+		switch (message.Result) {
+			case OperationResult.Success:
+			case OperationResult.WrongExpectedVersion: // already created
+			{
+				Log.Debug("Created stats stream '{stream}', code = {result}", _nodeStatsStream, message.Result);
+				_statsStreamCreated = true;
+				break;
+			}
+			case OperationResult.PrepareTimeout:
+			case OperationResult.CommitTimeout:
+			case OperationResult.ForwardTimeout: {
+				Log.Debug("Failed to create stats stream '{stream}'. Reason : {e}({message}). Retrying...", _nodeStatsStream, message.Result, message.Message);
+				SetStatsStreamMetadata();
+				break;
+			}
+			case OperationResult.AccessDenied: {
+				// can't do anything about that right now
+				break;
+			}
+			case OperationResult.StreamDeleted:
+			case OperationResult.InvalidTransaction: // should not happen at all
+			{
+				Log.Error(
+					"Monitoring service got unexpected response code when trying to create stats stream ({e}).",
+					message.Result);
+				break;
+			}
+			default:
+				throw new ArgumentOutOfRangeException();
+		}
+	}
+
+	public async ValueTask HandleAsync(MonitoringMessage.GetFreshStats message, CancellationToken token) {
+		try {
+			if (!TryGetMemoizedStats(out var stats)) {
+				stats = await CollectStats(token);
+				if (stats != null) {
+					_memoizedStats = stats;
+					_lastStatsRequestTime = DateTime.UtcNow;
+				}
+			}
+
+			Dictionary<string, object> selectedStats = null;
+			if (stats != null) {
+				selectedStats = stats.GetStats(message.UseGrouping, message.UseMetadata);
+				if (message.UseGrouping)
+					selectedStats = message.StatsSelector(selectedStats);
+			}
+
+			message.Envelope.ReplyWith(new MonitoringMessage.GetFreshStatsCompleted(success: selectedStats != null, stats: selectedStats));
+		} catch (Exception ex) {
+			Log.Error(ex, "Error on getting fresh stats");
+		}
+	}
+
+	public void Handle(MonitoringMessage.GetFreshTcpConnectionStats message) {
+		try {
+			if (!TryGetMemoizedTcpConnections(out var connections)) {
+				connections = TcpConnectionMonitor.Default.GetTcpConnectionStats();
+				if (connections != null) {
+					_memoizedTcpConnections = connections;
+					_lastTcpConnectionsRequestTime = DateTime.UtcNow;
+				}
+			}
+
+			List<MonitoringMessage.TcpConnectionStats> connStats = [];
+			foreach (var conn in connections!) {
+				switch (conn) {
+					case TcpConnection tcpConn: {
+						var isExternalConnection = _tcpEndpoint != null && _tcpEndpoint.Port == tcpConn.LocalEndPoint.GetPort();
+						connStats.Add(new() {
+							IsExternalConnection = isExternalConnection,
+							RemoteEndPoint = tcpConn.RemoteEndPoint.ToString(),
+							LocalEndPoint = tcpConn.LocalEndPoint.ToString(),
+							ConnectionId = tcpConn.ConnectionId,
+							ClientConnectionName = tcpConn.ClientConnectionName,
+							TotalBytesSent = tcpConn.TotalBytesSent,
+							TotalBytesReceived = tcpConn.TotalBytesReceived,
+							PendingSendBytes = tcpConn.PendingSendBytes,
+							PendingReceivedBytes = tcpConn.PendingReceivedBytes,
+							IsSslConnection = false
+						});
+						break;
+					}
+					case TcpConnectionSsl tcpConnSsl: {
+						var isExternalConnection = _tcpSecureEndpoint != null && _tcpSecureEndpoint.Port == tcpConnSsl.LocalEndPoint.GetPort();
+						connStats.Add(new() {
+							IsExternalConnection = isExternalConnection,
+							RemoteEndPoint = tcpConnSsl.RemoteEndPoint.ToString(),
+							LocalEndPoint = tcpConnSsl.LocalEndPoint.ToString(),
+							ConnectionId = tcpConnSsl.ConnectionId,
+							ClientConnectionName = tcpConnSsl.ClientConnectionName,
+							TotalBytesSent = tcpConnSsl.TotalBytesSent,
+							TotalBytesReceived = tcpConnSsl.TotalBytesReceived,
+							PendingSendBytes = tcpConnSsl.PendingSendBytes,
+							PendingReceivedBytes = tcpConnSsl.PendingReceivedBytes,
+							IsSslConnection = true
+						});
+						break;
+					}
+				}
+			}
+
+			message.Envelope.ReplyWith(new MonitoringMessage.GetFreshTcpConnectionStatsCompleted(connStats));
+		} catch (Exception ex) {
+			Log.Error(ex, "Error on getting fresh tcp connection stats");
+		}
+	}
+
+	private bool TryGetMemoizedStats(out StatsContainer stats) {
+		if (_memoizedStats == null || DateTime.UtcNow - _lastStatsRequestTime > MemoizePeriod) {
+			stats = null;
+			return false;
+		}
+
+		stats = _memoizedStats;
+		return true;
+	}
+
+	private bool TryGetMemoizedTcpConnections([NotNullWhen(false)] out IMonitoredTcpConnection[] connections) {
+		if (_memoizedTcpConnections == null || DateTime.UtcNow - _lastTcpConnectionsRequestTime > MemoizePeriod) {
+			connections = null;
+			return false;
+		}
+
+		connections = _memoizedTcpConnections;
+		return true;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Monitoring/Stats/GcStats.cs b/src/KurrentDB.Core/Services/Monitoring/Stats/GcStats.cs
new file mode 100644
index 00000000000..9e879254e14
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Monitoring/Stats/GcStats.cs
@@ -0,0 +1,74 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.Monitoring.Stats;
+
+public class GcStats {
+	/// <summary>
+	/// Number of Gen 0 Collections.
+	/// </summary>
+	public readonly long Gen0ItemsCount;
+	/// <summary>
+	/// Number of Gen 1 Collections.
+	/// </summary>
+	public readonly long Gen1ItemsCount;
+	/// <summary>
+	/// Number of Gen 2 Collections.
+	/// </summary>
+	public readonly long Gen2ItemsCount;
+	/// <summary>
+	/// Gen 0 heap size.
+	/// </summary>
+	public readonly long Gen0Size;
+	/// <summary>
+	/// Gen 1 heap size.
+	/// </summary>
+	public readonly long Gen1Size;
+	/// <summary>
+	/// Gen 2 heap size.
+	/// </summary>
+	public readonly long Gen2Size;
+	/// <summary>
+	/// Large Object Heap size.
+	/// </summary>
+	public readonly long LargeHeapSize;
+	/// <summary>
+	/// Memory allocation speed.
+	/// </summary>
+	public readonly float AllocationSpeed;
+	/// <summary>
+	/// </summary>
+	public readonly float Fragmentation;
+	/// <summary>
+	/// % of Time in GC.
+	/// </summary>
+	public readonly float TimeInGc;
+	/// <summary>
+	/// Total Bytes in all Heaps.
+	/// </summary>
+	public readonly long TotalBytesInHeaps;
+
+	public GcStats(long gcGen0Items,
+		long gcGen1Items,
+		long gcGen2Items,
+		long gcGen0Size,
+		long gcGen1Size,
+		long gcGen2Size,
+		long gcLargeHeapSize,
+		float gcAllocationSpeed,
+		float gcFragmentation,
+		float gcTimeInGc,
+		long gcTotalBytesInHeaps) {
+		Gen0ItemsCount = gcGen0Items;
+		Gen1ItemsCount = gcGen1Items;
+		Gen2ItemsCount = gcGen2Items;
+		Gen0Size = gcGen0Size;
+		Gen1Size = gcGen1Size;
+		Gen2Size = gcGen2Size;
+		LargeHeapSize = gcLargeHeapSize;
+		AllocationSpeed = gcAllocationSpeed;
+		Fragmentation = gcFragmentation;
+		TimeInGc = gcTimeInGc;
+		TotalBytesInHeaps = gcTotalBytesInHeaps;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Monitoring/Stats/QueueStats.cs b/src/KurrentDB.Core/Services/Monitoring/Stats/QueueStats.cs
new file mode 100644
index 00000000000..fab8a7805f4
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Monitoring/Stats/QueueStats.cs
@@ -0,0 +1,120 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Services.Monitoring.Stats;
+
+public class QueueStats {
+	///<summary>
+	///Queue name
+	///</summary>
+	public readonly string Name;
+
+	///<summary>
+	///Group queue is a member of
+	///</summary>
+	public readonly string GroupName;
+
+	///<summary>
+	///Number of items in the queue
+	///</summary>
+	public readonly int Length;
+
+	///<summary>
+	///The highest number of items in the queue
+	///</summary>
+	public readonly long LengthLifetimePeak;
+
+	///<summary>
+	///The highest number of items in the queue within the past 100ms
+	///</summary>
+	public readonly long LengthCurrentTryPeak;
+
+	///<summary>
+	///Time elapsed processing the current item
+	///</summary>
+	public readonly TimeSpan? CurrentItemProcessingTime;
+
+	///<summary>
+	///Time elapsed since queue went idle
+	///</summary>
+	public readonly TimeSpan? CurrentIdleTime;
+
+	///<summary>
+	///The total number of items processed by the queue.
+	///</summary>
+	public readonly long TotalItemsProcessed;
+
+	///<summary>
+	///The average number of items processed per second by the queue.
+	///</summary>
+	public readonly int AvgItemsPerSecond;
+
+	///<summary>
+	///Average number of items processed per second
+	///</summary>
+	public readonly double AvgProcessingTime;
+
+	///<summary>
+	///Percentage of time queue spent idle
+	///</summary>
+	public readonly double IdleTimePercent;
+
+	///<summary>
+	///Last message type processed
+	///</summary>
+	public readonly Type LastProcessedMessageType;
+
+	///<summary>
+	///Current message type queue is processing
+	///</summary>
+	public readonly Type InProgressMessageType;
+
+	public QueueStats(string name,
+		string groupName,
+		int length,
+		int avgItemsPerSecond,
+		double avgProcessingTime,
+		double idleTimePercent,
+		TimeSpan? currentItemProcessingTime,
+		TimeSpan? currentIdleTime,
+		long totalItemsProcessed,
+		long lengthCurrentTryPeak,
+		long lengthLifetimePeak,
+		Type lastProcessedMessageType,
+		Type inProgressMessageType) {
+		Name = name;
+		GroupName = groupName;
+		Length = length;
+		AvgItemsPerSecond = avgItemsPerSecond;
+		AvgProcessingTime = avgProcessingTime;
+		IdleTimePercent = idleTimePercent;
+		CurrentItemProcessingTime = currentItemProcessingTime;
+		CurrentIdleTime = currentIdleTime;
+		TotalItemsProcessed = totalItemsProcessed;
+		LengthCurrentTryPeak = lengthCurrentTryPeak;
+
+		LengthLifetimePeak = lengthLifetimePeak;
+
+		LastProcessedMessageType = lastProcessedMessageType;
+		InProgressMessageType = inProgressMessageType;
+	}
+
+	public override string ToString() {
+		var str = string.Format("{0,-22} L: {1,-5}      Avg: {5,-5}i/s    AvgProcTime: {6:0.0}ms\n"
+								+ "      Idle %:{7,-5:00.0}  Peak: {2,-5}  MaxPeak: {3,-7}  TotalProcessed: {4,-7}\n"
+								+ "      Processing: {8}, Last: {9}",
+			Name,
+			Length,
+			LengthCurrentTryPeak,
+			LengthLifetimePeak,
+			TotalItemsProcessed,
+			AvgItemsPerSecond,
+			AvgProcessingTime,
+			IdleTimePercent,
+			InProgressMessageType == null ? "<none>" : InProgressMessageType.Name,
+			LastProcessedMessageType == null ? "<none>" : LastProcessedMessageType.Name);
+		return str;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Monitoring/Stats/StatMetadata.cs b/src/KurrentDB.Core/Services/Monitoring/Stats/StatMetadata.cs
new file mode 100644
index 00000000000..ec29ea15a97
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Monitoring/Stats/StatMetadata.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.Monitoring.Stats;
+
+public class StatMetadata {
+	public object Value { get; set; }
+	public string Category { get; set; }
+	public string Title { get; set; }
+	public bool DrawChart { get; set; }
+
+	public StatMetadata() {
+	}
+
+	private StatMetadata(object value, string category, string title, bool drawChart) {
+		Value = value;
+		Category = category;
+		Title = title;
+		DrawChart = drawChart;
+	}
+
+	public StatMetadata(object value, string category, string title)
+		: this(value, category, title, true) {
+	}
+
+	public StatMetadata(object value, string title)
+		: this(value, null, title, true) {
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Monitoring/Stats/StatsContainer.cs b/src/KurrentDB.Core/Services/Monitoring/Stats/StatsContainer.cs
new file mode 100644
index 00000000000..76be0ff2422
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Monitoring/Stats/StatsContainer.cs
@@ -0,0 +1,111 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using JetBrains.Annotations;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.Services.Monitoring.Stats;
+
+public class StatsContainer {
+	private readonly Dictionary<string, object> _stats = new();
+
+	private const string Separator = "-";
+	private static readonly string[] SplitSeparator = [Separator];
+
+	public void Add(IDictionary<string, object> statGroup) {
+		Ensure.NotNull(statGroup);
+
+		foreach (var stat in statGroup)
+			_stats.Add(stat.Key, stat.Value);
+	}
+
+	public Dictionary<string, object> GetStats(bool useGrouping, bool useMetadata) {
+		return useGrouping switch {
+			true when useMetadata => GetGroupedStatsWithMetadata(),
+			true when !useMetadata => GetGroupedStats(),
+			false when useMetadata => GetRawStatsWithMetadata(),
+			_ => GetRawStats()
+		};
+	}
+
+	private Dictionary<string, object> GetGroupedStatsWithMetadata() {
+		var grouped = Group(_stats);
+		return grouped;
+	}
+
+	private Dictionary<string, object> GetGroupedStats() {
+		var values = GetStatsValues(_stats);
+		var grouped = Group(values);
+		return grouped;
+	}
+
+	private Dictionary<string, object> GetRawStatsWithMetadata() {
+		return new(_stats);
+	}
+
+	private Dictionary<string, object> GetRawStats() {
+		var values = GetStatsValues(_stats);
+		return values;
+	}
+
+	private static Dictionary<string, object> GetStatsValues(Dictionary<string, object> dictionary) {
+		return dictionary.ToDictionary(
+			kvp => kvp.Key,
+			kvp => {
+				var statInfo = kvp.Value as StatMetadata;
+				return statInfo == null ? kvp.Value : statInfo.Value;
+			});
+	}
+
+	public static Dictionary<string, object> Group(Dictionary<string, object> input) {
+		Ensure.NotNull(input);
+
+		if (input.IsEmpty())
+			return input;
+
+		var groupContainer = NewDictionary();
+		var hasSubGroups = false;
+
+		foreach (var entry in input) {
+			var groups = entry.Key.Split(SplitSeparator, StringSplitOptions.RemoveEmptyEntries);
+			if (groups.Length < 2) {
+				groupContainer.Add(entry.Key, entry.Value);
+				continue;
+			}
+
+			hasSubGroups = true;
+
+			string prefix = groups[0];
+			string remaining = string.Join(Separator, groups.Skip(1).ToArray());
+
+			if (!groupContainer.ContainsKey(prefix))
+				groupContainer.Add(prefix, NewDictionary());
+
+			((Dictionary<string, object>)groupContainer[prefix]).Add(remaining, entry.Value);
+		}
+
+		if (!hasSubGroups)
+			return groupContainer;
+
+		// we must first iterate through all dictionary and then aggregate it again
+		var result = NewDictionary();
+
+		foreach (var entry in groupContainer) {
+			var subgroup = entry.Value as Dictionary<string, object>;
+			result[entry.Key] = subgroup != null ? Group(subgroup) : entry.Value;
+		}
+
+		return result;
+	}
+
+	private static Dictionary<string, object> NewDictionary() => new(new CaseInsensitiveStringComparer());
+
+	private class CaseInsensitiveStringComparer : IEqualityComparer<string> {
+		public bool Equals(string x, string y) => string.Equals(x, y, StringComparison.InvariantCultureIgnoreCase);
+
+		public int GetHashCode([CanBeNull] string obj) => obj != null ? obj.ToUpperInvariant().GetHashCode() : -1;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Monitoring/StatsCollectorEnvelope.cs b/src/KurrentDB.Core/Services/Monitoring/StatsCollectorEnvelope.cs
new file mode 100644
index 00000000000..f8dafa182b9
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Monitoring/StatsCollectorEnvelope.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Monitoring.Stats;
+
+namespace KurrentDB.Core.Services.Monitoring;
+
+public class StatsCollectorEnvelope(StatsContainer statsContainer) : IEnvelope {
+	public void ReplyWith<T>(T message) where T : Message {
+		if (message is MonitoringMessage.InternalStatsRequestResponse msg)
+			statsContainer.Add(msg.Stats);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Monitoring/SystemStatsHelper.cs b/src/KurrentDB.Core/Services/Monitoring/SystemStatsHelper.cs
new file mode 100644
index 00000000000..e5a53c58c82
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Monitoring/SystemStatsHelper.cs
@@ -0,0 +1,145 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Runtime;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Services.Monitoring.Stats;
+using KurrentDB.Core.Services.Monitoring.Utils;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Transport.Tcp;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Monitoring;
+
+public class SystemStatsHelper : IDisposable {
+	private readonly ILogger _log;
+	private readonly IReadOnlyCheckpoint _writerCheckpoint;
+	private readonly string _dbPath;
+	private readonly EventCountersHelper _eventCountersHelper;
+	private readonly long _totalMem = RuntimeStats.GetTotalMemory();
+	private bool _giveUp;
+
+	public SystemStatsHelper(ILogger log, IReadOnlyCheckpoint writerCheckpoint, string dbPath, long collectIntervalMs) {
+		_dbPath = dbPath;
+		_log = Ensure.NotNull(log);
+		_writerCheckpoint = Ensure.NotNull(writerCheckpoint);
+		_eventCountersHelper = new(collectIntervalMs);
+	}
+
+	public void Start() => _eventCountersHelper.Start();
+
+	public IDictionary<string, object> GetSystemStats() {
+		var stats = new Dictionary<string, object>();
+		GetPerfCounterInformation(stats, 0);
+
+		var diskIo = ProcessStats.GetDiskIo();
+
+		stats["proc-diskIo-readBytes"] = diskIo.ReadBytes;
+		stats["proc-diskIo-writtenBytes"] = diskIo.WrittenBytes;
+		stats["proc-diskIo-readOps"] = diskIo.ReadOps;
+		stats["proc-diskIo-writeOps"] = diskIo.WriteOps;
+
+		var tcp = TcpConnectionMonitor.Default.GetTcpStats();
+		stats["proc-tcp-connections"] = tcp.Connections;
+		stats["proc-tcp-receivingSpeed"] = tcp.ReceivingSpeed;
+		stats["proc-tcp-sendingSpeed"] = tcp.SendingSpeed;
+		stats["proc-tcp-inSend"] = tcp.InSend;
+		stats["proc-tcp-measureTime"] = tcp.MeasureTime;
+		stats["proc-tcp-pendingReceived"] = tcp.PendingReceived;
+		stats["proc-tcp-pendingSend"] = tcp.PendingSend;
+		stats["proc-tcp-receivedBytesSinceLastRun"] = tcp.ReceivedBytesSinceLastRun;
+		stats["proc-tcp-receivedBytesTotal"] = tcp.ReceivedBytesTotal;
+		stats["proc-tcp-sentBytesSinceLastRun"] = tcp.SentBytesSinceLastRun;
+		stats["proc-tcp-sentBytesTotal"] = tcp.SentBytesTotal;
+
+		stats["es-checksum"] = _writerCheckpoint.Read();
+		stats["es-checksumNonFlushed"] = _writerCheckpoint.ReadNonFlushed();
+
+		var drive = DriveStats.GetDriveInfo(_dbPath);
+
+		stats[DriveStat(drive.DiskName, "availableBytes")] = drive.AvailableBytes;
+		stats[DriveStat(drive.DiskName, "totalBytes")] = drive.TotalBytes;
+		stats[DriveStat(drive.DiskName, "usage")] = drive.Usage;
+		stats[DriveStat(drive.DiskName, "usedBytes")] = drive.UsedBytes;
+
+		var queues = QueueMonitor.Default.GetStats();
+		foreach (var queue in queues) {
+			stats[QueueStat(queue.Name, "queueName")] = queue.Name;
+			stats[QueueStat(queue.Name, "groupName")] = queue.GroupName ?? string.Empty;
+			stats[QueueStat(queue.Name, "avgItemsPerSecond")] = queue.AvgItemsPerSecond;
+			stats[QueueStat(queue.Name, "avgProcessingTime")] = queue.AvgProcessingTime;
+			stats[QueueStat(queue.Name, "currentIdleTime")] = queue.CurrentIdleTime?.ToString("G", CultureInfo.InvariantCulture);
+			stats[QueueStat(queue.Name, "currentItemProcessingTime")] = queue.CurrentItemProcessingTime?.ToString("G", CultureInfo.InvariantCulture);
+			stats[QueueStat(queue.Name, "idleTimePercent")] = queue.IdleTimePercent;
+			stats[QueueStat(queue.Name, "length")] = queue.Length;
+			stats[QueueStat(queue.Name, "lengthCurrentTryPeak")] = queue.LengthCurrentTryPeak;
+			stats[QueueStat(queue.Name, "lengthLifetimePeak")] = queue.LengthLifetimePeak;
+			stats[QueueStat(queue.Name, "totalItemsProcessed")] = queue.TotalItemsProcessed;
+			stats[QueueStat(queue.Name, "inProgressMessage")] = queue.InProgressMessageType?.Name ?? "<none>";
+			stats[QueueStat(queue.Name, "lastProcessedMessage")] = queue.LastProcessedMessageType?.Name ?? "<none>";
+		}
+
+		return stats;
+
+		string QueueStat(string queueName, string stat) => $"es-queue-{queueName}-{stat}";
+
+		string DriveStat(string diskName, string stat) => $"sys-drive-{diskName.Replace("\\", "").Replace(":", "")}-{stat}";
+	}
+
+	private void GetPerfCounterInformation(Dictionary<string, object> stats, int count) {
+		if (_giveUp)
+			return;
+		var process = Process.GetCurrentProcess();
+		try {
+			stats["proc-startTime"] = process.StartTime.ToUniversalTime().ToString("O");
+			stats["proc-id"] = process.Id;
+			stats["proc-mem"] = new StatMetadata(process.WorkingSet64, "Process", "Process Virtual Memory");
+			stats["proc-cpu"] = new StatMetadata(_eventCountersHelper.GetProcCpuUsage(), "Process", "Process Cpu Usage");
+			stats["proc-threadsCount"] = _eventCountersHelper.GetProcThreadsCount();
+			stats["proc-contentionsRate"] = _eventCountersHelper.GetContentionsRateCount();
+			stats["proc-thrownExceptionsRate"] = _eventCountersHelper.GetThrownExceptionsRate();
+
+			stats["sys-cpu"] = RuntimeStats.GetCpuUsage();
+
+			if (RuntimeInformation.IsUnix) {
+				var loadAverages = RuntimeStats.GetCpuLoadAverages();
+				stats["sys-loadavg-1m"] = loadAverages.OneMinute;
+				stats["sys-loadavg-5m"] = loadAverages.FiveMinutes;
+				stats["sys-loadavg-15m"] = loadAverages.FifteenMinutes;
+			}
+
+			stats["sys-freeMem"] = RuntimeStats.GetFreeMemory();
+			stats["sys-totalMem"] = _totalMem;
+
+			var gcStats = _eventCountersHelper.GetGcStats();
+			stats["proc-gc-allocationSpeed"] = gcStats.AllocationSpeed;
+			stats["proc-gc-fragmentation"] = gcStats.Fragmentation;
+			stats["proc-gc-gen0ItemsCount"] = gcStats.Gen0ItemsCount;
+			stats["proc-gc-gen0Size"] = gcStats.Gen0Size;
+			stats["proc-gc-gen1ItemsCount"] = gcStats.Gen1ItemsCount;
+			stats["proc-gc-gen1Size"] = gcStats.Gen1Size;
+			stats["proc-gc-gen2ItemsCount"] = gcStats.Gen2ItemsCount;
+			stats["proc-gc-gen2Size"] = gcStats.Gen2Size;
+			stats["proc-gc-largeHeapSize"] = gcStats.LargeHeapSize;
+			stats["proc-gc-timeInGc"] = gcStats.TimeInGc;
+			stats["proc-gc-totalBytesInHeaps"] = gcStats.TotalBytesInHeaps;
+		} catch (InvalidOperationException) {
+			_log.Information("Received error reading counters. Attempting to rebuild.");
+			_giveUp = count > 10;
+			if (_giveUp)
+				_log.Error("Maximum rebuild attempts reached. Giving up on rebuilds.");
+			else
+				GetPerfCounterInformation(stats, count + 1);
+		}
+	}
+
+	public void Dispose() {
+		_eventCountersHelper.Dispose();
+		GC.SuppressFinalize(this);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Monitoring/Utils/EventCountersHelper.cs b/src/KurrentDB.Core/Services/Monitoring/Utils/EventCountersHelper.cs
new file mode 100644
index 00000000000..f6d4829e03d
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Monitoring/Utils/EventCountersHelper.cs
@@ -0,0 +1,150 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.Tracing;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Monitoring.Stats;
+using Microsoft.Diagnostics.NETCore.Client;
+using Microsoft.Diagnostics.Tracing;
+using Microsoft.Diagnostics.Tracing.Parsers;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Monitoring.Utils;
+
+internal class EventCountersHelper : IDisposable {
+	private static readonly ILogger Log = Serilog.Log.ForContext<EventCountersHelper>();
+	private const int InvalidCounterResult = -1;
+
+	private EventPipeSession _session;
+	private readonly List<EventPipeProvider> _providers;
+	private readonly IDictionary<string, double> _collectedStats = new Dictionary<string, double>();
+	private readonly HashSet<string> _gcCollectionNames = new HashSet<string>() {
+		"gen-0-gc-count",
+		"gen-1-gc-count",
+		"gen-2-gc-count"
+	};
+
+	private readonly int _pid;
+
+	public EventCountersHelper(long collectIntervalInMs) {
+		var currentProcess = Process.GetCurrentProcess();
+		_pid = currentProcess.Id;
+
+		_providers = new List<EventPipeProvider> {
+			new EventPipeProvider("System.Runtime", EventLevel.Informational,
+				(long)(ClrTraceEventParser.Keywords.GC | ClrTraceEventParser.Keywords.Threading |
+					   ClrTraceEventParser.Keywords.Exception | ClrTraceEventParser.Keywords.Contention),
+				new Dictionary<string, string> {
+					{"EventCounterIntervalSec", $"{collectIntervalInMs / 1000}"}
+				}),
+			new EventPipeProvider("Microsoft-Windows-DotNETRuntime", EventLevel.Informational,
+				(long)ClrTraceEventParser.Keywords.GC, new Dictionary<string, string>())
+		};
+	}
+
+	public void Start() {
+		Task.Run(() => {
+			try {
+				var client = new DiagnosticsClient(_pid);
+				_session = client.StartEventPipeSession(_providers, false);
+				using var source = new EventPipeEventSource(_session.EventStream);
+
+
+				source.Dynamic.All += obj => {
+					if (obj.EventName.Equals("EventCounters")) {
+						var payload = (IDictionary<string, object>)obj.PayloadValue(0);
+						var pairs = (IDictionary<string, object>)(payload["Payload"]);
+
+						var name = string.Intern(pairs["Name"].ToString());
+
+						if (_gcCollectionNames.Contains(name)) {
+							var gcCounterType = pairs["CounterType"];
+							if (gcCounterType.Equals("Sum")) {
+								var gcCollectionsInTimeInterval = double.Parse(pairs["Increment"].ToString());
+								_collectedStats.TryGetValue(name, out var previousGcCollectionCount);
+								_collectedStats[name] = previousGcCollectionCount + gcCollectionsInTimeInterval;
+							}
+							return;
+						}
+
+						var counterType = pairs["CounterType"];
+						if (counterType.Equals("Sum")) {
+							_collectedStats[name] = double.Parse(pairs["Increment"].ToString());
+						}
+
+						if (counterType.Equals("Mean")) {
+							_collectedStats[name] = double.Parse(pairs["Mean"].ToString());
+						}
+					}
+				};
+
+				source.Process();
+			} catch (ObjectDisposedException) {
+				// ignore exception on shutdown
+			} catch (Exception exception) {
+				Log.Warning(exception, "Error encountered while processing events");
+			}
+		});
+	}
+
+	///<summary>
+	///Total process CPU usage
+	///</summary>
+	public float GetProcCpuUsage() {
+		return (float)GetCounterValue("cpu-usage");
+	}
+
+	///<summary>
+	///Current thread count
+	///</summary>
+	public int GetProcThreadsCount() {
+		return (int)GetCounterValue("threadpool-thread-count");
+	}
+
+	///<summary>
+	///Number of exceptions thrown per second
+	///</summary>
+	public float GetThrownExceptionsRate() {
+		return (float)GetCounterValue("exception-count");
+	}
+
+	///<summary>
+	///The rate at which threads in the runtime attempt to acquire a managed lock unsuccessfully
+	///</summary>
+	public float GetContentionsRateCount() {
+		return (float)GetCounterValue("monitor-lock-contention-count");
+	}
+
+	private double GetCounterValue(string name) {
+		if (!_collectedStats.TryGetValue(name, out var value))
+			return InvalidCounterResult;
+		return value;
+	}
+
+	public GcStats GetGcStats() {
+		return new GcStats(
+			gcAllocationSpeed: (float)GetCounterValue("alloc-rate"),
+			gcFragmentation: (float)GetCounterValue("gc-fragmentation"),
+			gcGen0Items: (long)GetCounterValue("gen-0-gc-count"),
+			gcGen0Size: (long)GetCounterValue("gen-0-size"),
+			gcGen1Items: (long)GetCounterValue("gen-1-gc-count"),
+			gcGen1Size: (long)GetCounterValue("gen-1-size"),
+			gcGen2Items: (long)GetCounterValue("gen-2-gc-count"),
+			gcGen2Size: (long)GetCounterValue("gen-2-size"),
+			gcLargeHeapSize: (long)GetCounterValue("loh-size"),
+			gcTimeInGc: (long)GetCounterValue("time-in-gc"),
+			gcTotalBytesInHeaps: (long)GetCounterValue("gc-heap-size") * 1_000_000);
+	}
+
+	public void Dispose() {
+		try {
+			_session?.Stop();
+		} catch (ServerNotAvailableException) {
+		}
+
+		_session?.Dispose();
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PeriodicLogs/PeriodicallyLoggingService.cs b/src/KurrentDB.Core/Services/PeriodicLogs/PeriodicallyLoggingService.cs
new file mode 100644
index 00000000000..0fd9f97d9ad
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PeriodicLogs/PeriodicallyLoggingService.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using Serilog;
+
+namespace KurrentDB.Core.Services.PeriodicLogs;
+
+public class PeriodicallyLoggingService :
+	IHandle<SystemMessage.SystemStart>,
+	IHandle<MonitoringMessage.CheckEsVersion> {
+
+	private static readonly TimeSpan Interval = TimeSpan.FromHours(12);
+
+	private readonly IPublisher _publisher;
+	private readonly string _esVersion;
+	private readonly ILogger _logger;
+	private readonly TimerMessage.Schedule _esVersionScheduleLog;
+
+	public PeriodicallyLoggingService(IPublisher publisher, string esVersion, ILogger logger) {
+		_publisher = Ensure.NotNull(publisher);
+		_esVersion = esVersion;
+		_logger = Ensure.NotNull(logger);
+		_esVersionScheduleLog = TimerMessage.Schedule.Create(Interval, publisher, new MonitoringMessage.CheckEsVersion());
+	}
+
+	public void Handle(SystemMessage.SystemStart message) {
+		_publisher.Publish(new MonitoringMessage.CheckEsVersion());
+	}
+
+	public void Handle(MonitoringMessage.CheckEsVersion message) {
+		_logger.Information("Current version of KurrentDB is : {dbVersion} ", _esVersion);
+		_publisher.Publish(_esVersionScheduleLog);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/ConsumerPushResult.cs b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/ConsumerPushResult.cs
new file mode 100644
index 00000000000..3e45c81045e
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/ConsumerPushResult.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+
+public enum ConsumerPushResult {
+	Sent,
+	Skipped,
+	NoMoreCapacity
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/DelegatePersistentSubscriptionConsumerStrategyFactory.cs b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/DelegatePersistentSubscriptionConsumerStrategyFactory.cs
new file mode 100644
index 00000000000..4796aa1eb59
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/DelegatePersistentSubscriptionConsumerStrategyFactory.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+
+namespace KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+
+class DelegatePersistentSubscriptionConsumerStrategyFactory : IPersistentSubscriptionConsumerStrategyFactory {
+	public string StrategyName { get; private set; }
+
+	private readonly Func<string, IPublisher, ISubscriber, IPersistentSubscriptionConsumerStrategy> _factory;
+
+	public DelegatePersistentSubscriptionConsumerStrategyFactory(string strategyName,
+		Func<string, IPublisher, ISubscriber, IPersistentSubscriptionConsumerStrategy> factory) {
+		_factory = factory;
+		StrategyName = strategyName;
+	}
+
+	public IPersistentSubscriptionConsumerStrategy Create(string subscriptionId, IPublisher mainQueue,
+		ISubscriber mainBus) {
+		return _factory(subscriptionId, mainQueue, mainBus);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/DispatchToSinglePersistentSubscriptionConsumerStrategy.cs b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/DispatchToSinglePersistentSubscriptionConsumerStrategy.cs
new file mode 100644
index 00000000000..180b1254975
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/DispatchToSinglePersistentSubscriptionConsumerStrategy.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+
+class DispatchToSinglePersistentSubscriptionConsumerStrategy : RoundRobinPersistentSubscriptionConsumerStrategy {
+	public override string Name {
+		get { return SystemConsumerStrategies.DispatchToSingle; }
+	}
+
+	public override ConsumerPushResult PushMessageToClient(OutstandingMessage message) {
+		for (int i = 0; i < Clients.Count; i++) {
+			if (Clients.Peek().Push(message)) {
+				return ConsumerPushResult.Sent;
+			}
+
+			var c = Clients.Dequeue();
+			Clients.Enqueue(c);
+		}
+
+		return ConsumerPushResult.NoMoreCapacity;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/IPersistentSubscriptionConsumerStrategy.cs b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/IPersistentSubscriptionConsumerStrategy.cs
new file mode 100644
index 00000000000..a7f27564567
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/IPersistentSubscriptionConsumerStrategy.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+
+public interface IPersistentSubscriptionConsumerStrategy {
+	string Name { get; }
+
+	void ClientAdded(PersistentSubscriptionClient client);
+
+	void ClientRemoved(PersistentSubscriptionClient client);
+
+	ConsumerPushResult PushMessageToClient(OutstandingMessage message);
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/IPersistentSubscriptionConsumerStrategyFactory.cs b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/IPersistentSubscriptionConsumerStrategyFactory.cs
new file mode 100644
index 00000000000..a62bcdbf529
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/IPersistentSubscriptionConsumerStrategyFactory.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Bus;
+
+namespace KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+
+public interface IPersistentSubscriptionConsumerStrategyFactory {
+	string StrategyName { get; }
+
+	IPersistentSubscriptionConsumerStrategy
+		Create(string subscriptionId, IPublisher mainQueue, ISubscriber mainBus);
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/PersistentSubscriptionConsumerStrategyRegistry.cs b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/PersistentSubscriptionConsumerStrategyRegistry.cs
new file mode 100644
index 00000000000..d430f816946
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/PersistentSubscriptionConsumerStrategyRegistry.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Index.Hashes;
+
+namespace KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+
+public class PersistentSubscriptionConsumerStrategyRegistry {
+	private readonly IPublisher _mainQueue;
+	private readonly ISubscriber _mainBus;
+
+	private readonly IDictionary<string, IPersistentSubscriptionConsumerStrategyFactory> _factoryLookup =
+		new Dictionary<string, IPersistentSubscriptionConsumerStrategyFactory>();
+
+	public PersistentSubscriptionConsumerStrategyRegistry(IPublisher mainQueue, ISubscriber mainBus,
+		IReadOnlyList<IPersistentSubscriptionConsumerStrategyFactory> additionalConsumerStrategies) {
+		_mainQueue = mainQueue;
+		_mainBus = mainBus;
+		Register(new DelegatePersistentSubscriptionConsumerStrategyFactory(SystemConsumerStrategies.RoundRobin,
+			(subId, queue, bus) => new RoundRobinPersistentSubscriptionConsumerStrategy()));
+		Register(new DelegatePersistentSubscriptionConsumerStrategyFactory(
+			SystemConsumerStrategies.DispatchToSingle,
+			(subId, queue, bus) => new DispatchToSinglePersistentSubscriptionConsumerStrategy()));
+		Register(new DelegatePersistentSubscriptionConsumerStrategyFactory(SystemConsumerStrategies.Pinned,
+			(subId, queue, bus) => new PinnedPersistentSubscriptionConsumerStrategy(new XXHashUnsafe())));
+		Register(new DelegatePersistentSubscriptionConsumerStrategyFactory(SystemConsumerStrategies.PinnedByCorrelation,
+			(subId, queue, bus) => new PinnedByCorrelationPersistentSubscriptionConsumerStrategy(new XXHashUnsafe())));
+
+		foreach (var consumerStrategyFactory in additionalConsumerStrategies) {
+			Register(consumerStrategyFactory);
+		}
+	}
+
+	private void Register(IPersistentSubscriptionConsumerStrategyFactory factory) {
+		// Note this is designed to replace strategies of the same name to allow overriding.
+		_factoryLookup[factory.StrategyName] = factory;
+	}
+
+	public IPersistentSubscriptionConsumerStrategy
+		GetInstance(string namedConsumerStrategy, string subscriptionId) {
+		if (!ValidateStrategy(namedConsumerStrategy)) {
+			throw new ArgumentException(
+				string.Format("The named consumer strategy '{0}' is unknown.", namedConsumerStrategy),
+				"namedConsumerStrategy");
+		}
+
+		return _factoryLookup[namedConsumerStrategy].Create(subscriptionId, _mainQueue, _mainBus);
+	}
+
+	public bool ValidateStrategy(string name) {
+		return _factoryLookup.ContainsKey(name);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/PinnablePersistentSubscriptionConsumerStrategy.cs b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/PinnablePersistentSubscriptionConsumerStrategy.cs
new file mode 100644
index 00000000000..1680f23e526
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/PinnablePersistentSubscriptionConsumerStrategy.cs
@@ -0,0 +1,103 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy.PinnedState;
+
+namespace KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+
+public abstract class PinnablePersistentSubscriptionConsumerStrategy : IPersistentSubscriptionConsumerStrategy {
+	private IHasher<string> _hash;
+	protected static readonly char LinkToSeparator = '@';
+	private readonly PinnedConsumerState _state = new PinnedConsumerState();
+	private readonly object _stateLock = new object();
+
+	public PinnablePersistentSubscriptionConsumerStrategy(IHasher<string> streamHasher) {
+		_hash = streamHasher;
+	}
+
+	public abstract string Name { get; }
+
+	public int AvailableCapacity {
+		get {
+			if (_state == null)
+				return 0;
+
+			return _state.AvailableCapacity;
+		}
+	}
+
+	public void ClientAdded(PersistentSubscriptionClient client) {
+		lock (_stateLock) {
+			var newNode = new Node(client);
+
+			_state.AddNode(newNode);
+
+			client.EventConfirmed += OnEventRemoved;
+		}
+	}
+
+	public void ClientRemoved(PersistentSubscriptionClient client) {
+		var nodeId = client.CorrelationId;
+
+		client.EventConfirmed -= OnEventRemoved;
+
+		_state.DisconnectNode(nodeId);
+	}
+
+	public ConsumerPushResult PushMessageToClient(OutstandingMessage message) {
+		if (_state == null) {
+			return ConsumerPushResult.NoMoreCapacity;
+		}
+
+		if (_state.AvailableCapacity == 0) {
+			return ConsumerPushResult.NoMoreCapacity;
+		}
+
+
+		uint bucket = GetAssignmentId(message.ResolvedEvent);
+
+		if (_state.Assignments[bucket].State != BucketAssignment.BucketState.Assigned) {
+			_state.AssignBucket(bucket);
+		}
+
+		if (!_state.Assignments[bucket].Node.Client.Push(message)) {
+			return ConsumerPushResult.Skipped;
+		}
+
+		_state.RecordEventSent(bucket);
+		return ConsumerPushResult.Sent;
+	}
+
+	private void OnEventRemoved(PersistentSubscriptionClient client, ResolvedEvent ev) {
+		var assignmentId = GetAssignmentId(ev);
+		_state.EventRemoved(client.CorrelationId, assignmentId);
+	}
+
+	private uint GetAssignmentId(ResolvedEvent ev) {
+		string sourceStreamId = GetAssignmentSourceId(ev);
+
+		return _hash.Hash(sourceStreamId) % (uint)_state.Assignments.Length;
+	}
+
+	protected abstract string GetAssignmentSourceId(ResolvedEvent ev);
+
+	protected string GetSourceStreamId(ResolvedEvent ev) {
+		var eventRecord = ev.Event ?? ev.Link; // Unresolved link just use the link
+
+		string sourceStreamId = eventRecord.EventStreamId;
+
+		if (eventRecord.EventType == SystemEventTypes.LinkTo) // Unresolved link.
+		{
+			sourceStreamId = Helper.UTF8NoBom.GetString(eventRecord.Data.Span);
+			int separatorIndex = sourceStreamId.IndexOf(LinkToSeparator);
+			if (separatorIndex != -1) {
+				sourceStreamId = sourceStreamId.Substring(separatorIndex + 1);
+			}
+		}
+
+		return sourceStreamId;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedByCorrelationPersistentSubscriptionConsumerStrategy.cs b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedByCorrelationPersistentSubscriptionConsumerStrategy.cs
new file mode 100644
index 00000000000..d7946bdb64a
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedByCorrelationPersistentSubscriptionConsumerStrategy.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Index.Hashes;
+using Newtonsoft.Json;
+
+namespace KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+
+public class PinnedByCorrelationPersistentSubscriptionConsumerStrategy : PinnedPersistentSubscriptionConsumerStrategy {
+
+	public PinnedByCorrelationPersistentSubscriptionConsumerStrategy(IHasher<string> streamHasher) : base(streamHasher) {
+	}
+
+	public override string Name {
+		get { return SystemConsumerStrategies.PinnedByCorrelation; }
+	}
+
+
+	protected override string GetAssignmentSourceId(ResolvedEvent ev) {
+		var eventRecord = ev.Event ?? ev.Link;
+
+		string correlation = CorrelationFromJsonBytes(eventRecord.Metadata);
+
+		if (correlation == null) {
+			return GetSourceStreamId(ev);
+		}
+
+		return correlation;
+	}
+
+	private string CorrelationFromJsonBytes(ReadOnlyMemory<byte> toConvert) {
+		using (var reader = new JsonTextReader(new StreamReader(new MemoryStream(toConvert.ToArray())))) {
+			if (!reader.Read()) {
+				return null;
+			}
+
+			while (true) {
+				if (!reader.Read()) {
+					return null;
+				}
+
+				if (reader.TokenType == JsonToken.EndObject) {
+					break;
+				}
+
+				if (reader.TokenType == JsonToken.PropertyName) {
+					if ((string)reader.Value == CorrelationIdPropertyContext.CorrelationIdProperty) {
+						reader.Read();
+
+						if (reader.TokenType == JsonToken.String) {
+							return (string)reader.Value;
+						}
+					}
+				}
+			}
+		}
+
+		return null;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedPersistentSubscriptionConsumerStrategy.cs b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedPersistentSubscriptionConsumerStrategy.cs
new file mode 100644
index 00000000000..ad388cdda9a
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedPersistentSubscriptionConsumerStrategy.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Index.Hashes;
+
+namespace KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+
+public class PinnedPersistentSubscriptionConsumerStrategy : PinnablePersistentSubscriptionConsumerStrategy {
+	public PinnedPersistentSubscriptionConsumerStrategy(IHasher<string> streamHasher) : base(streamHasher) {
+	}
+
+	public override string Name {
+		get { return SystemConsumerStrategies.Pinned; }
+	}
+
+	protected override string GetAssignmentSourceId(ResolvedEvent ev) {
+		return GetSourceStreamId(ev);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedState/BucketAssignment.cs b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedState/BucketAssignment.cs
new file mode 100644
index 00000000000..ac56f302f9c
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedState/BucketAssignment.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy.PinnedState;
+
+internal struct BucketAssignment {
+	internal enum BucketState {
+		Unassigned,
+		Assigned,
+		Disconnected
+	}
+
+	public Guid NodeId { get; set; }
+
+	public BucketState State { get; set; }
+
+	public int InFlightCount { get; set; }
+
+	public Node Node { get; set; }
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedState/Node.cs b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedState/Node.cs
new file mode 100644
index 00000000000..50527a2dcb1
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedState/Node.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy.PinnedState;
+
+internal class Node {
+	internal enum NodeState {
+		Connected,
+		Disconnected
+	}
+
+	public Node() {
+	}
+
+	public Node(Guid connectionId, Guid nodeId, string host, int port, NodeState state,
+		PersistentSubscriptionClient client, int maximumInFlightMessages, int assignmentCount) {
+		ConnectionId = connectionId;
+		NodeId = nodeId;
+		Host = host;
+		Port = port;
+		State = state;
+		Client = client;
+		MaximumInFlightMessages = maximumInFlightMessages;
+		AssignmentCount = assignmentCount;
+	}
+
+	public Node(PersistentSubscriptionClient client) {
+		Client = client;
+		ConnectionId = client.ConnectionId;
+		NodeId = client.CorrelationId;
+
+		var portSplit = client.From.IndexOf(':');
+		if (portSplit == -1) {
+			Host = client.From;
+		} else {
+			Host = client.From.Substring(0, portSplit);
+			Port = Int32.Parse(client.From.Substring(portSplit + 1));
+		}
+
+		State = NodeState.Connected;
+		MaximumInFlightMessages = client.MaximumInFlightMessages;
+	}
+
+	public Guid ConnectionId { get; set; }
+
+	public Guid NodeId { get; set; }
+
+	public string Host { get; set; }
+
+	public int Port { get; set; }
+
+	public NodeState State { get; set; }
+
+	public PersistentSubscriptionClient Client { get; set; }
+
+	public int MaximumInFlightMessages { get; set; }
+
+	public int AssignmentCount { get; set; }
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedState/PinnedConsumerState.cs b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedState/PinnedConsumerState.cs
new file mode 100644
index 00000000000..1f0c9696126
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/PinnedState/PinnedConsumerState.cs
@@ -0,0 +1,155 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy.PinnedState;
+
+class PinnedConsumerState {
+	private const int MaxBucketCount = 1024;
+
+	public PinnedConsumerState() {
+		Version = -1;
+		Assignments = new BucketAssignment[MaxBucketCount];
+		Nodes = new List<Node>();
+	}
+
+	public int Version { get; set; }
+
+	public BucketAssignment[] Assignments { get; set; }
+
+	public IList<Node> Nodes { get; set; }
+
+	public int AssignmentCount { get; set; }
+
+	public int TotalCapacity { get; set; }
+
+	public int AvailableCapacity {
+		get {
+			var cap = 0;
+			for (int index = 0; index < Nodes.Count; index++) {
+				var node = Nodes[index];
+				if (node.State == Node.NodeState.Connected) {
+					cap += node.MaximumInFlightMessages - node.Client.InflightMessages;
+				}
+			}
+
+			return cap;
+		}
+	}
+
+	public void DisconnectNode(Guid nodeId) {
+		var node = Nodes.FirstOrDefault(_ => _.NodeId == nodeId);
+
+		if (node == null) {
+			throw new ApplicationException(
+				"ClientRemoved was called for a client the consumer strategy didn't have.");
+		}
+
+		if (node.State == Node.NodeState.Disconnected)
+			throw new InvalidOperationException();
+
+		node.State = Node.NodeState.Disconnected;
+
+		AssignmentCount -= node.AssignmentCount;
+		if (AssignmentCount < 0)
+			throw new InvalidOperationException();
+
+		TotalCapacity -= node.MaximumInFlightMessages;
+		if (TotalCapacity < 0)
+			throw new InvalidOperationException();
+
+		for (int i = 0; i < Assignments.Length; i++) {
+			if (Assignments[i].NodeId == nodeId) {
+				Assignments[i].State = BucketAssignment.BucketState.Disconnected;
+				Assignments[i].InFlightCount = 0;
+			}
+		}
+	}
+
+	public void AddNode(Node newNode) {
+		Nodes.Add(newNode);
+		TotalCapacity += newNode.MaximumInFlightMessages;
+
+		var clientCount = Nodes.Count(_ => _.State == Node.NodeState.Connected);
+
+		var maxBalancedClientAssignmentCount = (int)Math.Ceiling(AssignmentCount / (decimal)clientCount);
+
+		var reassignments = new List<uint>();
+
+		foreach (var existingClient in Nodes) {
+			if (existingClient == newNode || existingClient.State == Node.NodeState.Disconnected) {
+				continue;
+			}
+
+			if (existingClient.AssignmentCount > maxBalancedClientAssignmentCount) {
+				var assignmentsToMove = Assignments
+					.Select((node, bucket) => Tuple.Create(node, bucket))
+					.Where(_ => _.Item1.NodeId == existingClient.NodeId &&
+								_.Item1.State == BucketAssignment.BucketState.Assigned)
+					.OrderBy(_ => _.Item1.InFlightCount) // Take buckets without inflight messages first.
+					.Take(existingClient.AssignmentCount - maxBalancedClientAssignmentCount);
+
+				foreach (var assignment in assignmentsToMove) {
+					reassignments.Add((uint)assignment.Item2);
+				}
+			}
+		}
+
+		foreach (var reassignment in reassignments) {
+			ApplyBucketAssigned(reassignment, newNode.NodeId);
+		}
+
+		Clean();
+	}
+
+	public void EventRemoved(Guid nodeId, uint assignmentId) {
+		if (Assignments[assignmentId].NodeId == nodeId) {
+			Assignments[assignmentId].InFlightCount--;
+		}
+	}
+
+	public void RecordEventSent(uint bucket) {
+		Assignments[bucket].InFlightCount++;
+	}
+
+	public void AssignBucket(uint bucket) {
+		var node = ChooseClient();
+		ApplyBucketAssigned(bucket, node.NodeId);
+	}
+
+	private void Clean() {
+		var oldNodes = Nodes.Where(_ => _.AssignmentCount == 0 && _.State == Node.NodeState.Disconnected).ToList();
+		foreach (var oldNode in oldNodes) {
+			Nodes.Remove(oldNode);
+		}
+	}
+
+	private void ApplyBucketAssigned(uint bucketId, Guid newNodeId) {
+		if (Assignments[bucketId].State != BucketAssignment.BucketState.Assigned) {
+			AssignmentCount++;
+		}
+
+		if (Assignments[bucketId].State != BucketAssignment.BucketState.Unassigned) {
+			Assignments[bucketId].Node.AssignmentCount--;
+		}
+
+		Assignments[bucketId].State = BucketAssignment.BucketState.Assigned;
+		Assignments[bucketId].NodeId = newNodeId;
+		Assignments[bucketId].Node = Nodes.First(_ => _.NodeId == newNodeId);
+		Assignments[bucketId].Node.AssignmentCount++;
+	}
+
+	private Node ChooseClient() {
+		Node minAssignedNode = null;
+		foreach (var node in Nodes.Where(_ => _.State == Node.NodeState.Connected)) {
+			if (minAssignedNode == null || node.AssignmentCount < minAssignedNode.AssignmentCount) {
+				minAssignedNode = node;
+			}
+		}
+
+		return minAssignedNode;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/RoundRobinPersistentSubscriptionConsumerStrategy.cs b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/RoundRobinPersistentSubscriptionConsumerStrategy.cs
new file mode 100644
index 00000000000..92281b9dfa1
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/ConsumerStrategy/RoundRobinPersistentSubscriptionConsumerStrategy.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+
+class RoundRobinPersistentSubscriptionConsumerStrategy : IPersistentSubscriptionConsumerStrategy {
+	protected readonly Queue<PersistentSubscriptionClient> Clients = new Queue<PersistentSubscriptionClient>();
+
+	public virtual string Name {
+		get { return SystemConsumerStrategies.RoundRobin; }
+	}
+
+	public void ClientAdded(PersistentSubscriptionClient client) {
+		Clients.Enqueue(client);
+	}
+
+	public void ClientRemoved(PersistentSubscriptionClient client) {
+		if (!Clients.Contains(client)) {
+			throw new InvalidOperationException("Only added clients can be removed.");
+		}
+
+		var temp = Clients.ToList();
+		var indexOf = temp.IndexOf(client);
+		temp.RemoveAt(indexOf);
+		Clients.Clear();
+		foreach (var persistentSubscriptionClient in temp) {
+			Clients.Enqueue(persistentSubscriptionClient);
+		}
+	}
+
+	public virtual ConsumerPushResult PushMessageToClient(OutstandingMessage message) {
+		for (int i = 0; i < Clients.Count; i++) {
+			var c = Clients.Dequeue();
+			var pushed = c.Push(message);
+			Clients.Enqueue(c);
+			if (pushed) {
+				return ConsumerPushResult.Sent;
+			}
+		}
+
+		return ConsumerPushResult.NoMoreCapacity;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/IPersistentSubscriptionCheckpointReader.cs b/src/KurrentDB.Core/Services/PersistentSubscription/IPersistentSubscriptionCheckpointReader.cs
new file mode 100644
index 00000000000..6e2c74a6fa3
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/IPersistentSubscriptionCheckpointReader.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+using System;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public interface IPersistentSubscriptionCheckpointReader {
+	void BeginLoadState(string subscriptionId, Action<string?> onStateLoaded);
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/IPersistentSubscriptionCheckpointWriter.cs b/src/KurrentDB.Core/Services/PersistentSubscription/IPersistentSubscriptionCheckpointWriter.cs
new file mode 100644
index 00000000000..dc1912a7bc7
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/IPersistentSubscriptionCheckpointWriter.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public interface IPersistentSubscriptionCheckpointWriter {
+	void BeginWriteState(IPersistentSubscriptionStreamPosition state);
+	void BeginDelete(Action<IPersistentSubscriptionCheckpointWriter> completed);
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/IPersistentSubscriptionEventSource.cs b/src/KurrentDB.Core/Services/PersistentSubscription/IPersistentSubscriptionEventSource.cs
new file mode 100644
index 00000000000..4110b950cb6
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/IPersistentSubscriptionEventSource.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public interface IPersistentSubscriptionEventSource {
+	bool FromStream { get; }
+	string EventStreamId { get; }
+	bool FromAll { get; }
+	string ToString();
+	IPersistentSubscriptionStreamPosition StreamStartPosition { get; }
+	IPersistentSubscriptionStreamPosition GetStreamPositionFor(ResolvedEvent @event);
+	IPersistentSubscriptionStreamPosition GetStreamPositionFor(string checkpoint);
+	IEventFilter EventFilter { get; }
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/IPersistentSubscriptionMessageParker.cs b/src/KurrentDB.Core/Services/PersistentSubscription/IPersistentSubscriptionMessageParker.cs
new file mode 100644
index 00000000000..2f43f30e613
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/IPersistentSubscriptionMessageParker.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public interface IPersistentSubscriptionMessageParker {
+	void BeginParkMessage(ResolvedEvent ev, string reason, Action<ResolvedEvent, OperationResult> completed);
+	void BeginReadEndSequence(Action<long?> completed);
+	void BeginMarkParkedMessagesReprocessed(long sequence, DateTime? oldestParkedMessageTimestamp, bool updateOldestParkedMessage);
+	void BeginDelete(Action<IPersistentSubscriptionMessageParker> completed);
+	long ParkedMessageCount { get; }
+	public void BeginLoadStats(Action completed);
+	DateTime? GetOldestParkedMessage { get; }
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/IPersistentSubscriptionStreamPosition.cs b/src/KurrentDB.Core/Services/PersistentSubscription/IPersistentSubscriptionStreamPosition.cs
new file mode 100644
index 00000000000..48c2ea646f7
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/IPersistentSubscriptionStreamPosition.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public interface IPersistentSubscriptionStreamPosition : IEquatable<IPersistentSubscriptionStreamPosition>, IComparable<IPersistentSubscriptionStreamPosition> {
+	bool IsSingleStreamPosition { get; }
+	long StreamEventNumber { get; }
+	bool IsAllStreamPosition { get; }
+	(long Commit, long Prepare) TFPosition { get; }
+	bool IsLivePosition { get; }
+	string ToString();
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/IPersistentSubscriptionStreamReader.cs b/src/KurrentDB.Core/Services/PersistentSubscription/IPersistentSubscriptionStreamReader.cs
new file mode 100644
index 00000000000..6d754af35d1
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/IPersistentSubscriptionStreamReader.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public interface IPersistentSubscriptionStreamReader {
+	void BeginReadEvents(IPersistentSubscriptionEventSource eventSource,
+		IPersistentSubscriptionStreamPosition startPosition, int countToLoad, int batchSize, int maxWindowSize,
+		bool resolveLinkTos, bool skipFirstEvent,
+		Action<IReadOnlyList<ResolvedEvent>, IPersistentSubscriptionStreamPosition, bool> onEventsFound,
+		Action<IPersistentSubscriptionStreamPosition, long> onEventsSkipped,
+		Action<string> onError);
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/NakAction.cs b/src/KurrentDB.Core/Services/PersistentSubscription/NakAction.cs
new file mode 100644
index 00000000000..f9201741810
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/NakAction.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public enum NakAction {
+	Unknown = 0,
+	Park = 1,
+	Retry = 2,
+	Skip = 3,
+	Stop = 4
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/OutstandingMessage.cs b/src/KurrentDB.Core/Services/PersistentSubscription/OutstandingMessage.cs
new file mode 100644
index 00000000000..8deb0551bc6
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/OutstandingMessage.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public struct OutstandingMessage {
+	public readonly ResolvedEvent ResolvedEvent;
+	public readonly int RetryCount;
+	public readonly Guid EventId;
+	public readonly bool IsReplayedEvent;
+	public readonly long? EventSequenceNumber;
+	public readonly IPersistentSubscriptionStreamPosition EventPosition;
+	public readonly IPersistentSubscriptionStreamPosition PreviousEventPosition;
+
+	private OutstandingMessage(Guid eventId, ResolvedEvent resolvedEvent, int retryCount, bool isReplayedEvent, long? eventSequenceNumber, IPersistentSubscriptionStreamPosition eventPosition, IPersistentSubscriptionStreamPosition previousEventPosition) : this() {
+		EventId = eventId;
+		ResolvedEvent = resolvedEvent;
+		RetryCount = retryCount;
+		IsReplayedEvent = isReplayedEvent;
+		EventSequenceNumber = eventSequenceNumber;
+		EventPosition = eventPosition;
+		PreviousEventPosition = previousEventPosition;
+	}
+
+	public static OutstandingMessage ForNewEvent(ResolvedEvent resolvedEvent, IPersistentSubscriptionStreamPosition eventPosition) {
+		Ensure.NotNull(eventPosition, "eventPosition");
+		return new OutstandingMessage(resolvedEvent.OriginalEvent.EventId, resolvedEvent, 0, false, null, eventPosition, null);
+	}
+
+	public static OutstandingMessage ForParkedEvent(ResolvedEvent resolvedEvent) {
+		return new OutstandingMessage(resolvedEvent.OriginalEvent.EventId, resolvedEvent, 0, true, null, null, null);
+	}
+
+	public static (OutstandingMessage message, bool newSequenceNumberAssigned) ForPushedEvent(OutstandingMessage message, long nextSequenceNumber, IPersistentSubscriptionStreamPosition previousEventPosition) {
+		if (nextSequenceNumber > 0) {
+			//only the first event may have a null previous event position
+			Ensure.NotNull(previousEventPosition, nameof(previousEventPosition));
+		}
+
+		if (message.IsReplayedEvent) { //replayed parked message
+			return (message, false);
+		}
+
+		if (message.EventSequenceNumber.HasValue) { //retried message
+			return (message, false);
+		}
+
+		return (new OutstandingMessage( //new event
+			message.EventId,
+			message.ResolvedEvent,
+			message.RetryCount,
+			message.IsReplayedEvent,
+			nextSequenceNumber,
+			message.EventPosition,
+			previousEventPosition), true);
+	}
+
+	public static OutstandingMessage ForRetriedEvent(OutstandingMessage message) {
+		return new OutstandingMessage(
+			message.EventId,
+			message.ResolvedEvent,
+			message.RetryCount + 1,
+			message.IsReplayedEvent,
+			message.EventSequenceNumber,
+			message.EventPosition,
+			message.PreviousEventPosition);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/OutstandingMessageCache.cs b/src/KurrentDB.Core/Services/PersistentSubscription/OutstandingMessageCache.cs
new file mode 100644
index 00000000000..e018e3100be
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/OutstandingMessageCache.cs
@@ -0,0 +1,114 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public enum StartMessageResult {
+	Success,
+	SkippedDuplicate
+}
+
+public class OutstandingMessageCache {
+	private readonly Dictionary<Guid, Tuple<DateTime, OutstandingMessage>> _outstandingRequests;
+	private readonly SortedDictionary<Tuple<DateTime, RetryableMessage>, bool> _byTime;
+	private readonly SortedList<long, OutstandingMessage> _bySequences;
+
+	public class ByTypeComparer : IComparer<Tuple<DateTime, RetryableMessage>> {
+		public int Compare(Tuple<DateTime, RetryableMessage> x, Tuple<DateTime, RetryableMessage> y) {
+			if (x.Item1 != y.Item1) {
+				return x.Item1 < y.Item1 ? -1 : 1;
+			}
+
+			var q = y.Item2.MessageId.CompareTo(x.Item2.MessageId);
+			return q;
+		}
+	}
+
+	public OutstandingMessageCache() {
+		_outstandingRequests = new Dictionary<Guid, Tuple<DateTime, OutstandingMessage>>();
+		_byTime = new SortedDictionary<Tuple<DateTime, RetryableMessage>, bool>(new ByTypeComparer());
+		_bySequences = new SortedList<long, OutstandingMessage>();
+	}
+
+	public int Count {
+		get { return _outstandingRequests.Count; }
+	}
+
+	public void Remove(Guid messageId) {
+		Tuple<DateTime, OutstandingMessage> m;
+		if (_outstandingRequests.TryGetValue(messageId, out m)) {
+			_byTime.Remove(new Tuple<DateTime, RetryableMessage>(m.Item1,
+				new RetryableMessage(m.Item2.EventId, m.Item1)));
+			_outstandingRequests.Remove(messageId);
+			if (m.Item2.EventSequenceNumber.HasValue) {
+				_bySequences.Remove(m.Item2.EventSequenceNumber.Value);
+			}
+		}
+	}
+
+	public void Remove(IEnumerable<Guid> messageIds) {
+		foreach (var m in messageIds)
+			Remove(m);
+	}
+
+	public StartMessageResult StartMessage(OutstandingMessage message, DateTime expires) {
+		if (_outstandingRequests.ContainsKey(message.EventId))
+			return StartMessageResult.SkippedDuplicate;
+		_outstandingRequests[message.EventId] = new Tuple<DateTime, OutstandingMessage>(expires, message);
+		Debug.Assert(message.IsReplayedEvent || message.EventSequenceNumber.HasValue);
+		if (message.EventSequenceNumber.HasValue) {
+			_bySequences.Add(message.EventSequenceNumber.Value, message);
+		}
+		_byTime.Add(new Tuple<DateTime, RetryableMessage>(expires, new RetryableMessage(message.EventId, expires)),
+			false);
+
+		return StartMessageResult.Success;
+	}
+
+	public IEnumerable<OutstandingMessage> GetMessagesExpiringBefore(DateTime time) {
+		while (_byTime.Count > 0) {
+			var item = _byTime.Keys.First();
+			if (item.Item1 > time) {
+				yield break;
+			}
+
+			_byTime.Remove(item);
+			Tuple<DateTime, OutstandingMessage> m;
+			if (_outstandingRequests.TryGetValue(item.Item2.MessageId, out m)) {
+				yield return _outstandingRequests[item.Item2.MessageId].Item2;
+				_outstandingRequests.Remove(item.Item2.MessageId);
+				if (m.Item2.EventSequenceNumber.HasValue) {
+					_bySequences.Remove(m.Item2.EventSequenceNumber.Value);
+				}
+			}
+		}
+	}
+
+	public IEnumerable<Tuple<DateTime, RetryableMessage>> WaitingTimeMessages() {
+		return _byTime.Keys;
+	}
+
+	public (OutstandingMessage? message, long sequenceNumber) GetLowestPosition() {
+		foreach (var x in _bySequences) {
+			if (!x.Value.IsReplayedEvent)
+				return (x.Value, x.Key);
+		}
+		return (null, long.MaxValue);
+	}
+
+	public bool GetMessageById(Guid id, out OutstandingMessage outstandingMessage) {
+		outstandingMessage = new OutstandingMessage();
+		Tuple<DateTime, OutstandingMessage> m;
+		if (_outstandingRequests.TryGetValue(id, out m)) {
+			outstandingMessage = m.Item2;
+			return true;
+		}
+
+		return false;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscription.cs b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscription.cs
new file mode 100644
index 00000000000..d02dd9c95b7
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscription.cs
@@ -0,0 +1,714 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+//TODO GFY REFACTOR TO USE ACTUAL STATE MACHINE
+public class PersistentSubscription {
+	private static readonly ILogger Log = Serilog.Log.ForContext<PersistentSubscription>();
+
+	public string SubscriptionId {
+		get { return _settings.SubscriptionId; }
+	}
+
+	public IPersistentSubscriptionEventSource EventSource {
+		get { return _settings.EventSource; }
+	}
+
+	public string GroupName {
+		get { return _settings.GroupName; }
+	}
+
+	public bool ResolveLinkTos {
+		get { return _settings.ResolveLinkTos; }
+	}
+
+	internal PersistentSubscriptionClientCollection _pushClients;
+	private readonly PersistentSubscriptionStats _statistics;
+	private readonly Stopwatch _totalTimeWatch;
+	private readonly OutstandingMessageCache _outstandingMessages;
+	private readonly TaskCompletionSource<StreamBuffer> _streamBufferSource;
+	private PersistentSubscriptionState _state = PersistentSubscriptionState.NotReady;
+	private IPersistentSubscriptionStreamPosition _nextEventToPullFrom;
+	private bool _skipFirstEvent;
+	private DateTime _lastCheckPointTime = DateTime.MinValue;
+	private readonly PersistentSubscriptionParams _settings;
+	private long _nextSequenceNumber;
+	private long _lastCheckpointedSequenceNumber;
+	private long _lastKnownSequenceNumber;
+	private IPersistentSubscriptionStreamPosition _lastKnownMessage;
+	private readonly object _lock = new object();
+	private bool _faulted;
+
+	public bool HasClients {
+		get { return _pushClients.Count > 0; }
+	}
+
+	public int ClientCount {
+		get { return _pushClients.Count; }
+	}
+
+	public bool HasReachedMaxClientCount {
+		get { return _settings.MaxSubscriberCount != 0 && _pushClients.Count >= _settings.MaxSubscriberCount; }
+	}
+
+	public PersistentSubscriptionState State {
+		get { return _state; }
+	}
+
+	public int OutstandingMessageCount {
+		get { return _outstandingMessages.Count; } //use outstanding not connections as http shows up here too
+	}
+
+	public PersistentSubscription(PersistentSubscriptionParams persistentSubscriptionParams) {
+		Ensure.NotNull(persistentSubscriptionParams.StreamReader, "eventLoader");
+		Ensure.NotNull(persistentSubscriptionParams.CheckpointReader, "checkpointReader");
+		Ensure.NotNull(persistentSubscriptionParams.CheckpointWriter, "checkpointWriter");
+		Ensure.NotNull(persistentSubscriptionParams.MessageParker, "messageParker");
+		Ensure.NotNull(persistentSubscriptionParams.SubscriptionId, "subscriptionId");
+		Ensure.NotNull(persistentSubscriptionParams.EventSource, "eventSource");
+		Ensure.NotNull(persistentSubscriptionParams.GroupName, "groupName");
+		if (persistentSubscriptionParams.ReadBatchSize >= persistentSubscriptionParams.BufferSize) {
+			throw new ArgumentOutOfRangeException($"{nameof(persistentSubscriptionParams.ReadBatchSize)} may not be greater than or equal to {nameof(persistentSubscriptionParams.BufferSize)}");
+		}
+
+		_totalTimeWatch = new Stopwatch();
+		_settings = persistentSubscriptionParams;
+		_nextEventToPullFrom = _settings.EventSource.StreamStartPosition;
+		_totalTimeWatch.Start();
+		_statistics = new PersistentSubscriptionStats(this, _settings, _totalTimeWatch);
+		_outstandingMessages = new OutstandingMessageCache();
+		_streamBufferSource = new TaskCompletionSource<StreamBuffer>(TaskCreationOptions.RunContinuationsAsynchronously);
+		InitAsNew();
+	}
+
+	public void InitAsNew() {
+		_state = PersistentSubscriptionState.NotReady;
+		_nextSequenceNumber = 0L;
+		_lastCheckpointedSequenceNumber = -1L;
+		_lastKnownSequenceNumber = -1L;
+		_lastKnownMessage = null;
+		_statistics.SetLastKnownEventPosition(null);
+		_settings.CheckpointReader.BeginLoadState(SubscriptionId, OnCheckpointLoaded);
+
+		_pushClients = new PersistentSubscriptionClientCollection(_settings.ConsumerStrategy);
+	}
+
+	public bool TryGetStreamBuffer(out StreamBuffer streamBuffer) {
+		if (_state == PersistentSubscriptionState.NotReady ||
+			!_streamBufferSource.Task.IsCompletedSuccessfully) {
+			streamBuffer = default;
+			return false;
+		}
+
+		streamBuffer = _streamBufferSource.Task.Result;
+		return true;
+	}
+
+	private void OnCheckpointLoaded(string checkpoint) {
+		lock (_lock) {
+			_state = PersistentSubscriptionState.Behind;
+			if (checkpoint == null) {
+				Log.Debug("Subscription {subscriptionId}: no checkpoint found", _settings.SubscriptionId);
+
+				Log.Debug("Start from = " + _settings.StartFrom);
+
+				_nextEventToPullFrom = _settings.StartFrom.IsLivePosition ? _settings.EventSource.StreamStartPosition : _settings.StartFrom;
+				_streamBufferSource.SetResult(new StreamBuffer(_settings.BufferSize, _settings.LiveBufferSize, null,
+				!_settings.StartFrom.IsLivePosition));
+				TryReadingNewBatch();
+			} else {
+				_nextEventToPullFrom = _settings.EventSource.GetStreamPositionFor(checkpoint);
+				_skipFirstEvent = true; //skip the checkpointed event
+
+				//initialize values based on the loaded checkpoint
+				_nextSequenceNumber = 1L;
+				_lastCheckpointedSequenceNumber = 0L;
+				_lastKnownSequenceNumber = 0L;
+				_lastKnownMessage = _settings.EventSource.GetStreamPositionFor(checkpoint);
+				_statistics.SetLastCheckPoint(_lastKnownMessage);
+
+				Log.Debug("Subscription {subscriptionId}: read checkpoint {checkpoint}", _settings.SubscriptionId,
+					checkpoint);
+				_streamBufferSource.SetResult(new StreamBuffer(_settings.BufferSize, _settings.LiveBufferSize, _nextEventToPullFrom, true));
+				_settings.MessageParker.BeginLoadStats(TryReadingNewBatch);
+			}
+		}
+	}
+
+	public void TryReadingNewBatch() {
+		lock (_lock) {
+			if (!TryGetStreamBuffer(out var streamBuffer))
+				return;
+			if ((_state & PersistentSubscriptionState.OutstandingPageRequest) > 0)
+				return;
+			if (streamBuffer.Live) {
+				SetLive();
+				return;
+			}
+
+			if (!streamBuffer.CanAccept(_settings.ReadBatchSize))
+				return;
+			_state |= PersistentSubscriptionState.OutstandingPageRequest;
+			_settings.StreamReader.BeginReadEvents(_settings.EventSource, _nextEventToPullFrom,
+				Math.Max(_settings.ReadBatchSize, 10), _settings.ReadBatchSize, _settings.MaxCheckPointCount,
+				_settings.ResolveLinkTos, _skipFirstEvent, HandleReadCompleted, HandleSkippedEvents, HandleReadError);
+			_skipFirstEvent = false;
+		}
+	}
+
+	private void HandleReadError(string error) {
+		lock (_lock) {
+			_faulted = true;
+			Log.Error("A non-recoverable error has occurred in persistent subscription {subscriptionId} : {error}. Dropping all connected clients.",
+				_settings.SubscriptionId, error);
+			var clients = _pushClients.GetAll().ToArray();
+			foreach (var client in clients) {
+				_pushClients.RemoveClientByCorrelationId(client.CorrelationId, true);
+			}
+		}
+	}
+
+	private void SetLive() {
+		//TODO GFY this is hacky and just trying to keep the state at this level when it
+		//lives in the streambuffer its for reporting reasons and likely should be revisited
+		//at some point.
+		_state &= ~PersistentSubscriptionState.Behind;
+		_state |= PersistentSubscriptionState.Live;
+	}
+
+	private void SetBehind() {
+		_state |= PersistentSubscriptionState.Behind;
+		_state &= ~PersistentSubscriptionState.Live;
+	}
+
+	public void HandleReadCompleted(IReadOnlyList<ResolvedEvent> events, IPersistentSubscriptionStreamPosition newPosition, bool isEndOfStream) {
+		lock (_lock) {
+			if (!TryGetStreamBuffer(out var streamBuffer))
+				return;
+			if ((_state & PersistentSubscriptionState.OutstandingPageRequest) == 0)
+				return;
+
+			_state &= ~PersistentSubscriptionState.OutstandingPageRequest;
+
+			if (streamBuffer.Live)
+				return;
+			foreach (var ev in events) {
+				streamBuffer.AddReadMessage(OutstandingMessage.ForNewEvent(ev, _settings.EventSource.GetStreamPositionFor(ev)));
+			}
+
+			if (events.Count > 0) {
+				_statistics.SetLastKnownEventPosition(_settings.EventSource.GetStreamPositionFor(events[^1]));
+			}
+
+			if (streamBuffer.Live) {
+				SetLive();
+			}
+
+			if (isEndOfStream) {
+				if (streamBuffer.TryMoveToLive()) {
+					SetLive();
+					return;
+				}
+			}
+
+			_nextEventToPullFrom = newPosition;
+			TryReadingNewBatch();
+			TryPushingMessagesToClients();
+		}
+	}
+
+	private void TryPushingMessagesToClients() {
+		lock (_lock) {
+			if (!TryGetStreamBuffer(out var streamBuffer))
+				return;
+
+			foreach (StreamBuffer.OutstandingMessagePointer messagePointer in streamBuffer.Scan()) {
+				//optimistically assume that the message will be pushed
+				//if it is, then we will increment the next sequence number if a new one was assigned
+				//if it is not, then we will not increment the next sequence number
+				(OutstandingMessage message, bool newSequenceNumberAssigned) =
+					OutstandingMessage.ForPushedEvent(messagePointer.Message, _nextSequenceNumber, _lastKnownMessage);
+				ConsumerPushResult result =
+					_pushClients.PushMessageToClient(message);
+				if (result == ConsumerPushResult.Sent) {
+					messagePointer.MarkSent();
+
+					if (newSequenceNumberAssigned) {
+						//the message was pushed and a new sequence number was assigned
+						//so we increment the next sequence number
+						_nextSequenceNumber++;
+					}
+
+					MarkBeginProcessing(message);
+				} else if (result == ConsumerPushResult.Skipped) {
+					// The consumer strategy skipped the message so leave it in the buffer and continue.
+				} else if (result == ConsumerPushResult.NoMoreCapacity) {
+					return;
+				}
+			}
+		}
+	}
+
+	public void NotifyLiveSubscriptionMessage(ResolvedEvent resolvedEvent) {
+		lock (_lock) {
+			if (!TryGetStreamBuffer(out var streamBuffer))
+				return;
+			if (_settings.EventSource.GetStreamPositionFor(resolvedEvent).CompareTo(_settings.StartFrom) < 0) {
+				return;
+			}
+
+			if (_settings.EventSource.EventFilter != null && !_settings.EventSource.EventFilter.IsEventAllowed(resolvedEvent.Event)) {
+				IPersistentSubscriptionStreamPosition position = new PersistentSubscriptionAllStreamPosition(-1, -1);
+				if (resolvedEvent.OriginalPosition.HasValue) {
+					position = new PersistentSubscriptionAllStreamPosition(
+						resolvedEvent.OriginalPosition.Value.CommitPosition,
+						resolvedEvent.OriginalPosition.Value.PreparePosition);
+				}
+				HandleSkippedEvents(position, 1);
+				return;
+			}
+
+			_statistics.SetLastKnownEventPosition(_settings.EventSource.GetStreamPositionFor(resolvedEvent));
+			var waslive = streamBuffer.Live; //hacky
+			streamBuffer.AddLiveMessage(OutstandingMessage.ForNewEvent(resolvedEvent, _settings.EventSource.GetStreamPositionFor(resolvedEvent)));
+			if (!streamBuffer.Live) {
+				SetBehind();
+				if (waslive)
+					_nextEventToPullFrom = _settings.EventSource.GetStreamPositionFor(resolvedEvent);
+			}
+
+			TryPushingMessagesToClients();
+		}
+	}
+
+	public IEnumerable<(ResolvedEvent ResolvedEvent, int RetryCount)> GetNextNOrLessMessages(int count) {
+		lock (_lock) {
+			if (!TryGetStreamBuffer(out var streamBuffer))
+				yield break;
+
+			foreach (var messagePointer in streamBuffer.Scan().Take(count)) {
+				messagePointer.MarkSent();
+				(OutstandingMessage message, bool newSequenceNumberAssigned) =
+					OutstandingMessage.ForPushedEvent(messagePointer.Message, _nextSequenceNumber, _lastKnownMessage);
+				if (newSequenceNumberAssigned) {
+					_nextSequenceNumber++;
+				}
+				MarkBeginProcessing(message); //sequence number will be incremented in this call if a new one has been assigned
+				yield return (messagePointer.Message.ResolvedEvent, messagePointer.Message.RetryCount);
+			}
+		}
+	}
+
+	private void MarkBeginProcessing(OutstandingMessage message) {
+		_statistics.IncrementProcessed();
+		if (message.EventSequenceNumber > _lastKnownSequenceNumber) {
+			_lastKnownSequenceNumber = message.EventSequenceNumber.Value;
+			_lastKnownMessage = _settings.EventSource.GetStreamPositionFor(message.ResolvedEvent);
+		}
+
+		StartMessage(message,
+			_settings.MessageTimeout == TimeSpan.MaxValue
+				? DateTime.MaxValue
+				: DateTime.UtcNow + _settings.MessageTimeout);
+	}
+
+	public void AddClient(Guid correlationId, Guid connectionId, string connectionName, IEnvelope envelope, int maxInFlight, string user,
+		string @from) {
+		lock (_lock) {
+			var client = new PersistentSubscriptionClient(correlationId, connectionId, connectionName, envelope, maxInFlight, user,
+				@from, _totalTimeWatch, _settings.ExtraStatistics);
+			_pushClients.AddClient(client);
+
+			if (_faulted) {
+				Log.Error("Dropping client: {clientId} from persistent subscription {subscriptionId} since the subscription has faulted.",
+					client.CorrelationId, _settings.SubscriptionId);
+				_pushClients.RemoveClientByCorrelationId(client.CorrelationId, true);
+				return;
+			}
+
+			TryPushingMessagesToClients();
+		}
+	}
+
+	public void Shutdown() {
+		lock (_lock) {
+			_pushClients.ShutdownAll();
+		}
+	}
+
+	public void HandleSkippedEvents(IPersistentSubscriptionStreamPosition position, long skippedCount) {
+		_lastKnownMessage = position;
+		_nextSequenceNumber += skippedCount;
+		_lastKnownSequenceNumber = _nextSequenceNumber - 1;
+		TryMarkCheckpoint(false);
+	}
+
+	public bool RemoveClientByConnectionId(Guid connectionId) {
+		lock (_lock) {
+			if (!_pushClients.RemoveClientByConnectionId(connectionId,
+					out var unconfirmedEvents))
+				return false;
+
+			var lostMessages = unconfirmedEvents.OrderBy(v => v.ResolvedEvent.OriginalEventNumber);
+			foreach (var m in lostMessages) {
+				if (ActionTakenForRetriedMessage(m))
+					return true;
+				RetryMessage(m);
+			}
+
+			TryPushingMessagesToClients();
+			return true;
+		}
+	}
+
+	public void RemoveClientByCorrelationId(Guid correlationId, bool sendDropNotification) {
+		lock (_lock) {
+			var lostMessages = _pushClients.RemoveClientByCorrelationId(correlationId, sendDropNotification)
+				.OrderBy(v => v.ResolvedEvent.OriginalEventNumber);
+			foreach (var m in lostMessages) {
+				RetryMessage(m);
+			}
+
+			TryPushingMessagesToClients();
+		}
+	}
+
+	public void TryMarkCheckpoint(bool isTimeCheck) {
+		lock (_lock) {
+			if (!TryGetStreamBuffer(out var streamBuffer))
+				return;
+
+			OutstandingMessage? lowestMessage;
+			long lowestSequenceNumber;
+
+			(lowestMessage, lowestSequenceNumber) = _outstandingMessages.GetLowestPosition();
+			var (lowestRetryMessage, lowestRetrySequenceNumber) = streamBuffer.GetLowestRetry();
+
+			if (lowestRetrySequenceNumber < lowestSequenceNumber) {
+				lowestSequenceNumber = lowestRetrySequenceNumber;
+				lowestMessage = lowestRetryMessage;
+			}
+
+			IPersistentSubscriptionStreamPosition lowestPosition;
+
+			if (lowestSequenceNumber != long.MaxValue) {
+				Debug.Assert(lowestMessage.HasValue);
+				// Subtract one from retry and outstanding as those messages have not been acknowledged yet.
+				lowestSequenceNumber--;
+				lowestPosition = lowestMessage.Value.PreviousEventPosition;
+
+				if (lowestPosition == null) {
+					Debug.Assert(lowestSequenceNumber == -1L);
+					//first message has been pushed but not yet acknowledged and we didn't have any previous checkpoint
+					//so we have nothing to checkpoint yet
+					return;
+				}
+				Debug.Assert(lowestPosition != null && lowestSequenceNumber >= 0L);
+			} else {
+				//no outstanding/retry messages. in this case we can say that the last known
+				//event would be our checkpoint place (we have already completed it)
+				lowestSequenceNumber = _lastKnownSequenceNumber;
+				lowestPosition = _lastKnownMessage;
+				Debug.Assert((lowestPosition != null && lowestSequenceNumber >= 0L) ||
+							 (lowestPosition == null && lowestSequenceNumber == -1L));
+			}
+
+			if (lowestSequenceNumber == -1) //we have not even pushed any messages yet
+				return;
+
+			Debug.Assert(lowestPosition != null);
+
+			var difference = lowestSequenceNumber - _lastCheckpointedSequenceNumber;
+			var now = DateTime.UtcNow;
+			var timedifference = now - _lastCheckPointTime;
+			if (timedifference < _settings.CheckPointAfter && difference < _settings.MaxCheckPointCount)
+				return;
+			if ((difference >= _settings.MinCheckPointCount && isTimeCheck) ||
+				difference >= _settings.MaxCheckPointCount) {
+				_lastCheckPointTime = now;
+				_lastCheckpointedSequenceNumber = lowestSequenceNumber;
+				_settings.CheckpointWriter.BeginWriteState(lowestPosition);
+				_statistics.SetLastCheckPoint(lowestPosition);
+			}
+		}
+	}
+
+	public void AcknowledgeMessagesProcessed(Guid correlationId, Guid[] processedEventIds) {
+		lock (_lock) {
+			RemoveProcessingMessages(processedEventIds);
+			TryMarkCheckpoint(false);
+			TryReadingNewBatch();
+			TryPushingMessagesToClients();
+		}
+	}
+
+	public void NotAcknowledgeMessagesProcessed(Guid correlationId, Guid[] processedEventIds, NakAction action,
+		string reason) {
+		lock (_lock) {
+			foreach (var id in processedEventIds) {
+				Log.Verbose("Message NAK'ed id {id} action to take {action} reason '{reason}'", id, action,
+					reason ?? "");
+				HandleNackedMessage(action, id, reason);
+			}
+
+			RemoveProcessingMessages(processedEventIds);
+			TryMarkCheckpoint(false);
+			TryReadingNewBatch();
+			TryPushingMessagesToClients();
+		}
+	}
+
+	private void HandleNackedMessage(NakAction action, Guid id, string reason) {
+		OutstandingMessage m;
+		switch (action) {
+			case NakAction.Retry:
+			case NakAction.Unknown:
+				if (_outstandingMessages.GetMessageById(id, out m)) {
+					if (!ActionTakenForRetriedMessage(m)) {
+						RetryMessage(m);
+					}
+				}
+
+				break;
+			case NakAction.Park:
+				if (_outstandingMessages.GetMessageById(id, out m)) {
+					ParkMessage(m.ResolvedEvent, "Client explicitly NAK'ed message.\n" + reason, 0);
+				}
+
+				break;
+			case NakAction.Stop:
+				StopSubscription();
+				break;
+			case NakAction.Skip:
+				SkipMessage(id);
+				break;
+			default:
+				SkipMessage(id);
+				break;
+		}
+	}
+
+	private void ParkMessage(ResolvedEvent resolvedEvent, string reason, int count) {
+		_settings.MessageParker.BeginParkMessage(resolvedEvent, reason, (e, result) => {
+			if (result != OperationResult.Success) {
+				if (count < 5) {
+					Log.Information("Unable to park message {stream}/{eventNumber} operation failed {e} retrying",
+						e.OriginalStreamId,
+						e.OriginalEventNumber, result);
+					ParkMessage(e, reason, count + 1);
+					return;
+				}
+
+				Log.Error(
+					"Unable to park message {stream}/{eventNumber} operation failed {e} after retries. Possible message loss",
+					e.OriginalStreamId,
+					e.OriginalEventNumber, result);
+			}
+
+			lock (_lock) {
+				_outstandingMessages.Remove(e.OriginalEvent.EventId);
+				_pushClients.RemoveProcessingMessages(e.OriginalEvent.EventId);
+				TryPushingMessagesToClients();
+			}
+		});
+	}
+
+
+	public void RetryParkedMessages(long? stopAt) {
+		lock (_lock) {
+			if (_state == PersistentSubscriptionState.NotReady)
+				return;
+			if ((_state & PersistentSubscriptionState.ReplayingParkedMessages) > 0)
+				return; //already replaying
+			_state |= PersistentSubscriptionState.ReplayingParkedMessages;
+			_settings.MessageParker.BeginReadEndSequence(end => {
+				if (!end.HasValue) {
+					_state ^= PersistentSubscriptionState.ReplayingParkedMessages;
+					return; //nothing to do.
+				}
+
+				var stopRead = stopAt.HasValue ? Math.Min(stopAt.Value, end.Value + 1) : end.Value + 1;
+				TryReadingParkedMessagesFrom(0, stopRead);
+			});
+		}
+	}
+
+	private void TryReadingParkedMessagesFrom(long position, long stopAt) {
+		if ((_state & PersistentSubscriptionState.ReplayingParkedMessages) == 0)
+			return; //not replaying
+
+		Ensure.Positive(stopAt - position, "count");
+
+		var count = (int)Math.Min((stopAt + 1) - position, _settings.ReadBatchSize); // Reading an extra event to get the Timestamp for the stopAt EventNumber
+		_settings.StreamReader.BeginReadEvents(
+			new PersistentSubscriptionSingleStreamEventSource(_settings.ParkedMessageStream),
+			new PersistentSubscriptionSingleStreamPosition(position),
+			count,
+			_settings.ReadBatchSize, _settings.MaxCheckPointCount, true, false,
+			(events, newposition, isstop) => HandleParkedReadCompleted(events, newposition, isstop, stopAt),
+			(_, _) => { }, HandleParkedReadError);
+	}
+
+	private void HandleParkedReadError(string error) {
+		Log.Error("Error reading parked messages from: {parkedStream} for persistent subscription {subscriptionId} : {error}",
+		_settings.ParkedMessageStream, _settings.SubscriptionId, error);
+	}
+
+	public void HandleParkedReadCompleted(IReadOnlyList<ResolvedEvent> events, IPersistentSubscriptionStreamPosition newPosition, bool isEndofStream, long stopAt) {
+		lock (_lock) {
+			if (!TryGetStreamBuffer(out var streamBuffer))
+				return;
+			if ((_state & PersistentSubscriptionState.ReplayingParkedMessages) == 0)
+				return;
+
+			foreach (var ev in events) {
+				if (ev.OriginalEventNumber == stopAt) {
+					break;
+				}
+
+				if (ev.Event is null) {
+					continue;
+				}
+
+				Log.Debug("Replaying parked message: {eventId} {stream}/{eventNumber} on subscription {subscriptionId}",
+					ev.OriginalEvent.EventId, ev.OriginalStreamId, ev.OriginalEventNumber,
+					_settings.SubscriptionId);
+				streamBuffer.AddRetry(OutstandingMessage.ForParkedEvent(ev));
+			}
+
+			TryPushingMessagesToClients();
+
+			var newStreamPosition = newPosition as PersistentSubscriptionSingleStreamPosition;
+			Ensure.NotNull(newStreamPosition, "newStreamPosition");
+
+			if (isEndofStream || stopAt <= newStreamPosition.StreamEventNumber) {
+				var replayedEnd = newStreamPosition.StreamEventNumber == -1 ? stopAt : Math.Min(stopAt, newStreamPosition.StreamEventNumber);
+
+				if (isEndofStream) {
+					_settings.MessageParker.BeginMarkParkedMessagesReprocessed(replayedEnd, null, true);
+				} else {
+					var (replayedEndTimeStamp, updateOldestParkedMessageTimeStamp) = GetOldestParkedMessageTimeStamp(events, replayedEnd);
+					_settings.MessageParker.BeginMarkParkedMessagesReprocessed(replayedEnd, replayedEndTimeStamp, updateOldestParkedMessageTimeStamp);
+				}
+
+				_state ^= PersistentSubscriptionState.ReplayingParkedMessages;
+			} else {
+				TryReadingParkedMessagesFrom(newStreamPosition.StreamEventNumber, stopAt);
+			}
+		}
+	}
+
+	private static (DateTime?, bool) GetOldestParkedMessageTimeStamp(IReadOnlyList<ResolvedEvent> events, long replayedEnd) {
+		foreach (var resolvedEvent in events) {
+			if (resolvedEvent.OriginalEvent.EventNumber != replayedEnd)
+				continue;
+			return (resolvedEvent.OriginalEvent.TimeStamp, true);
+		}
+
+		return (null, false);
+	}
+
+	private void StartMessage(OutstandingMessage message, DateTime expires) {
+		var result = _outstandingMessages.StartMessage(message, expires);
+
+		if (result == StartMessageResult.SkippedDuplicate) {
+			Log.Warning("Skipping message {stream}/{eventNumber} (stream position={streamPosition}) with duplicate eventId {eventId}",
+				message.ResolvedEvent.OriginalStreamId,
+				message.ResolvedEvent.OriginalEventNumber,
+				_settings.EventSource.GetStreamPositionFor(message.ResolvedEvent).ToString(),
+				message.EventId);
+		}
+	}
+
+	private void SkipMessage(Guid id) {
+		_outstandingMessages.Remove(id);
+	}
+
+	private void StopSubscription() {
+		//TODO CC Stop subscription?
+	}
+
+	private void RemoveProcessingMessages(Guid[] processedEventIds) {
+		_pushClients.RemoveProcessingMessages(processedEventIds);
+		foreach (var id in processedEventIds) {
+			_outstandingMessages.Remove(id);
+		}
+	}
+
+	public void NotifyClockTick(DateTime time) {
+		lock (_lock) {
+			if (_state == PersistentSubscriptionState.NotReady)
+				return;
+
+			foreach (var message in _outstandingMessages.GetMessagesExpiringBefore(time)) {
+				if (!ActionTakenForRetriedMessage(message)) {
+					RetryMessage(message);
+				}
+			}
+
+			TryPushingMessagesToClients();
+			TryMarkCheckpoint(true);
+			if ((_state & PersistentSubscriptionState.Behind |
+				 PersistentSubscriptionState.OutstandingPageRequest) ==
+				PersistentSubscriptionState.Behind)
+				TryReadingNewBatch();
+		}
+	}
+
+	private bool ActionTakenForRetriedMessage(OutstandingMessage message) {
+		if (message.RetryCount < _settings.MaxRetryCount)
+			return false;
+		ParkMessage(message.ResolvedEvent, string.Format("Reached retry count of {0}", _settings.MaxRetryCount), 0);
+		return true;
+	}
+
+	private void RetryMessage(OutstandingMessage message) {
+		if (!TryGetStreamBuffer(out var streamBuffer))
+			return;
+
+		var @event = message.ResolvedEvent;
+		if (!message.IsReplayedEvent) {
+			Log.Debug("Retrying message {subscriptionId} {stream}/{eventNumber} (stream position={streamPosition})",
+				SubscriptionId,
+				@event.OriginalStreamId, @event.OriginalEventNumber,
+				_settings.EventSource.GetStreamPositionFor(message.ResolvedEvent).ToString());
+		} else {
+			Log.Debug("Retrying parked message: {eventId} {stream}/{eventNumber} on subscription {subscriptionId}",
+				@event.OriginalEvent.EventId, @event.OriginalStreamId, @event.OriginalEventNumber,
+				_settings.SubscriptionId);
+		}
+
+		_outstandingMessages.Remove(@event.OriginalEvent.EventId);
+		_pushClients.RemoveProcessingMessages(@event.OriginalEvent.EventId);
+		streamBuffer.AddRetry(OutstandingMessage.ForRetriedEvent(message));
+	}
+
+	public MonitoringMessage.PersistentSubscriptionInfo GetStatistics() {
+		return _statistics.GetStatistics();
+	}
+
+	public void RetrySingleParkedMessage(ResolvedEvent @event) {
+		if (!TryGetStreamBuffer(out var streamBuffer))
+			return;
+
+		streamBuffer.AddRetry(OutstandingMessage.ForParkedEvent(@event));
+	}
+
+	public void Delete() {
+		_settings.CheckpointWriter.BeginDelete(x => { });
+		_settings.MessageParker.BeginDelete(x => { });
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionAllStreamEventSource.cs b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionAllStreamEventSource.cs
new file mode 100644
index 00000000000..3a665f77c8e
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionAllStreamEventSource.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public class PersistentSubscriptionAllStreamEventSource : IPersistentSubscriptionEventSource {
+	public bool FromStream => false;
+	public string EventStreamId => throw new InvalidOperationException();
+	public bool FromAll => true;
+	public override string ToString() => SystemStreams.AllStream;
+	public IEventFilter EventFilter { get; }
+
+	public PersistentSubscriptionAllStreamEventSource(IEventFilter eventFilter) {
+		EventFilter = eventFilter;
+	}
+
+	public PersistentSubscriptionAllStreamEventSource() {
+		EventFilter = null;
+	}
+
+	public IPersistentSubscriptionStreamPosition StreamStartPosition => new PersistentSubscriptionAllStreamPosition(0L, 0L);
+	public IPersistentSubscriptionStreamPosition GetStreamPositionFor(ResolvedEvent @event) {
+		if (@event.OriginalPosition.HasValue) {
+			return new PersistentSubscriptionAllStreamPosition(@event.OriginalPosition.Value.CommitPosition, @event.OriginalPosition.Value.PreparePosition);
+		}
+		throw new InvalidOperationException();
+	}
+	public IPersistentSubscriptionStreamPosition GetStreamPositionFor(string checkpoint) {
+		const string C = "C:";
+		const string P = "P:";
+		string[] tokens = checkpoint.Split("/");
+		Debug.Assert(tokens.Length == 2);
+		Debug.Assert(tokens[0].StartsWith(C));
+		Debug.Assert(tokens[1].StartsWith(P));
+		long commitPosition = long.Parse(tokens[0].Substring(C.Length));
+		long preparePosition = long.Parse(tokens[1].Substring(P.Length));
+		return new PersistentSubscriptionAllStreamPosition(commitPosition, preparePosition);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionAllStreamPosition.cs b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionAllStreamPosition.cs
new file mode 100644
index 00000000000..c400cbcb9f6
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionAllStreamPosition.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+using System;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public class PersistentSubscriptionAllStreamPosition : IPersistentSubscriptionStreamPosition {
+	public bool IsSingleStreamPosition => false;
+	public long StreamEventNumber => throw new InvalidOperationException();
+	public bool IsAllStreamPosition => true;
+	public bool IsLivePosition => _commitPosition == -1L && _preparePosition == -1L;
+	public (long Commit, long Prepare) TFPosition => (_commitPosition, _preparePosition);
+	private readonly long _commitPosition;
+	private readonly long _preparePosition;
+
+	public PersistentSubscriptionAllStreamPosition(long commitPosition, long preparePosition) {
+		_commitPosition = commitPosition;
+		_preparePosition = preparePosition;
+	}
+
+	public bool Equals(IPersistentSubscriptionStreamPosition? other) {
+		if (other == null)
+			throw new InvalidOperationException();
+		if (!(other is PersistentSubscriptionAllStreamPosition))
+			throw new InvalidOperationException();
+		return TFPosition.Commit == other.TFPosition.Commit &&
+			   TFPosition.Prepare == other.TFPosition.Prepare;
+	}
+
+	public int CompareTo(IPersistentSubscriptionStreamPosition? other) {
+		if (other == null)
+			throw new InvalidOperationException();
+		if (!(other is PersistentSubscriptionAllStreamPosition))
+			throw new InvalidOperationException();
+		if (Equals(other))
+			return 0;
+		if (TFPosition.Commit < other.TFPosition.Commit ||
+			TFPosition.Commit == other.TFPosition.Commit &&
+			TFPosition.Prepare < other.TFPosition.Prepare)
+			return -1;
+		return 1;
+	}
+
+	public override string ToString() => $"C:{_commitPosition}/P:{_preparePosition}";
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionCheckpointReader.cs b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionCheckpointReader.cs
new file mode 100644
index 00000000000..a176de8d5a9
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionCheckpointReader.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.UserManagement;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public class PersistentSubscriptionCheckpointReader : IPersistentSubscriptionCheckpointReader {
+	private readonly IODispatcher _ioDispatcher;
+
+	public PersistentSubscriptionCheckpointReader(IODispatcher ioDispatcher) {
+		_ioDispatcher = ioDispatcher;
+	}
+
+	public void BeginLoadState(string subscriptionId, Action<string?> onStateLoaded) {
+		var subscriptionStateStream = "$persistentsubscription-" + subscriptionId + "-checkpoint";
+		_ioDispatcher.ReadBackward(subscriptionStateStream, -1, 1, false, SystemAccounts.System,
+			new ResponseHandler(onStateLoaded).LoadStateCompleted,
+			() => BeginLoadState(subscriptionId, onStateLoaded), Guid.NewGuid());
+	}
+
+	private class ResponseHandler {
+		private readonly Action<string?> _onStateLoaded;
+
+		public ResponseHandler(Action<string?> onStateLoaded) {
+			_onStateLoaded = onStateLoaded;
+		}
+
+		public void LoadStateCompleted(ClientMessage.ReadStreamEventsBackwardCompleted msg) {
+			if (msg.Events.Count > 0) {
+				var checkpoint = msg.Events[0].Event;
+
+				if (checkpoint.EventType is "SubscriptionCheckpoint" or "$SubscriptionCheckpoint") {
+
+					var checkpointJson = checkpoint.Data.ParseJson<string>();
+					_onStateLoaded(checkpointJson);
+					return;
+				}
+			}
+
+			_onStateLoaded(null);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionCheckpointWriter.cs b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionCheckpointWriter.cs
new file mode 100644
index 00000000000..5094a28f215
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionCheckpointWriter.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.UserManagement;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public class PersistentSubscriptionCheckpointWriter : IPersistentSubscriptionCheckpointWriter {
+	private readonly IODispatcher _ioDispatcher;
+	private long _version = ExpectedVersion.Any;
+	private bool _outstandingWrite;
+	private readonly string _subscriptionStateStream;
+	private static readonly ILogger Log = Serilog.Log.ForContext<PersistentSubscriptionCheckpointWriter>();
+
+	public PersistentSubscriptionCheckpointWriter(string subscriptionId, IODispatcher ioDispatcher) {
+		_subscriptionStateStream = "$persistentsubscription-" + subscriptionId + "-checkpoint";
+		_ioDispatcher = ioDispatcher;
+	}
+
+	public void StartFrom(long version) {
+		_version = version;
+	}
+
+	public void BeginWriteState(IPersistentSubscriptionStreamPosition state) {
+		if (_outstandingWrite) {
+			return;
+		}
+
+		if (_version == ExpectedVersion.NoStream) {
+			PublishMetadata(state);
+		} else {
+			PublishCheckpoint(state);
+		}
+	}
+
+	public void BeginDelete(Action<IPersistentSubscriptionCheckpointWriter> completed) {
+		_ioDispatcher.DeleteStream(_subscriptionStateStream, ExpectedVersion.Any, false, SystemAccounts.System,
+			x => completed(this));
+	}
+
+	private void PublishCheckpoint(IPersistentSubscriptionStreamPosition state) {
+		_outstandingWrite = true;
+		var evnt = new Event(Guid.NewGuid(), "$SubscriptionCheckpoint", true, state.ToString().ToJson(), null);
+		_ioDispatcher.WriteEvent(_subscriptionStateStream, _version, evnt, SystemAccounts.System,
+			WriteStateCompleted);
+	}
+
+	private void PublishMetadata(IPersistentSubscriptionStreamPosition state) {
+		_outstandingWrite = true;
+		var metaStreamId = SystemStreams.MetastreamOf(_subscriptionStateStream);
+		_ioDispatcher.WriteEvent(
+			metaStreamId, ExpectedVersion.Any, CreateStreamMetadataEvent(), SystemAccounts.System, msg => {
+				_outstandingWrite = false;
+				switch (msg.Result) {
+					case OperationResult.Success:
+						PublishCheckpoint(state);
+						break;
+				}
+			});
+	}
+
+	private Event CreateStreamMetadataEvent() {
+		var eventId = Guid.NewGuid();
+		var acl = new StreamAcl(
+			readRole: SystemRoles.Admins, writeRole: SystemRoles.Admins,
+			deleteRole: SystemRoles.Admins, metaReadRole: SystemRoles.All,
+			metaWriteRole: SystemRoles.Admins);
+		var metadata = new StreamMetadata(maxCount: 2, maxAge: null, cacheControl: null, acl: acl);
+		var dataBytes = metadata.ToJsonBytes();
+		return new Event(eventId, SystemEventTypes.StreamMetadata, isJson: true, data: dataBytes, metadata: null);
+	}
+
+	private void WriteStateCompleted(ClientMessage.WriteEventsCompleted msg) {
+		_outstandingWrite = false;
+		if (msg.Result == OperationResult.Success) {
+			_version = msg.LastEventNumber;
+		} else {
+			Log.Debug("Error writing checkpoint for {stream}: {e}", _subscriptionStateStream, msg.Result);
+			_version = ExpectedVersion.Any;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionClient.cs b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionClient.cs
new file mode 100644
index 00000000000..9d37af2ed16
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionClient.cs
@@ -0,0 +1,140 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public class PersistentSubscriptionClient {
+	public readonly int MaximumInFlightMessages;
+
+	private readonly Guid _correlationId;
+	private readonly Guid _connectionId;
+	private readonly string _connectionName;
+	private readonly IEnvelope _envelope;
+	private int _allowedMessages;
+	public readonly string Username;
+	public readonly string From;
+	private long _totalItems;
+	private readonly RequestStatistics _extraStatistics;
+	private readonly Dictionary<Guid, OutstandingMessage> _unconfirmedEvents = new Dictionary<Guid, OutstandingMessage>();
+
+	public PersistentSubscriptionClient(Guid correlationId,
+		Guid connectionId,
+		string connectionName,
+		IEnvelope envelope,
+		int inFlightMessages,
+		string username,
+		string from,
+		Stopwatch watch,
+		bool extraStatistics) {
+		_correlationId = correlationId;
+		_connectionId = connectionId;
+		_connectionName = connectionName;
+		_envelope = envelope;
+		_allowedMessages = inFlightMessages;
+		Username = username;
+		From = @from;
+		MaximumInFlightMessages = inFlightMessages;
+		if (extraStatistics) {
+			_extraStatistics = new RequestStatistics(watch, 1000);
+		}
+	}
+
+	/// <summary>
+	/// Raised whenever an in-flight event has been confirmed. This could be because of ack, nak, timeout or disconnection.
+	/// </summary>
+	public event Action<PersistentSubscriptionClient, ResolvedEvent> EventConfirmed;
+
+	public int InflightMessages {
+		get { return _unconfirmedEvents.Count; }
+	}
+
+	public int AvailableSlots {
+		get { return _allowedMessages; }
+	}
+
+	public Guid ConnectionId {
+		get { return _connectionId; }
+	}
+
+	public string ConnectionName {
+		get { return _connectionName; }
+	}
+
+	public long TotalItems {
+		get { return _totalItems; }
+	}
+
+	public long LastTotalItems { get; set; }
+
+	public Guid CorrelationId {
+		get { return _correlationId; }
+	}
+
+	internal bool RemoveFromProcessing(Guid[] processedEventIds) {
+		bool removedAny = false;
+		foreach (var processedEventId in processedEventIds) {
+			if (_extraStatistics != null)
+				_extraStatistics.EndOperation(processedEventId);
+			OutstandingMessage ev;
+			if (!_unconfirmedEvents.TryGetValue(processedEventId, out ev))
+				continue;
+			_unconfirmedEvents.Remove(processedEventId);
+			removedAny = true;
+			_allowedMessages++;
+			OnEventConfirmed(ev);
+		}
+
+		return removedAny;
+	}
+
+	public bool Push(OutstandingMessage message) {
+		if (!CanSend()) {
+			return false;
+		}
+
+		var evnt = message.ResolvedEvent;
+		_allowedMessages--;
+		Interlocked.Increment(ref _totalItems);
+		if (_extraStatistics != null)
+			_extraStatistics.StartOperation(evnt.OriginalEvent.EventId);
+
+		_envelope.ReplyWith(
+			new ClientMessage.PersistentSubscriptionStreamEventAppeared(CorrelationId, evnt, message.RetryCount));
+		if (!_unconfirmedEvents.ContainsKey(evnt.OriginalEvent.EventId)) {
+			_unconfirmedEvents.Add(evnt.OriginalEvent.EventId, message);
+		}
+
+		return true;
+	}
+
+	public IEnumerable<OutstandingMessage> GetUnconfirmedEvents() {
+		return _unconfirmedEvents.Values;
+	}
+
+	internal void SendDropNotification() {
+		_envelope.ReplyWith(
+			new ClientMessage.SubscriptionDropped(CorrelationId, SubscriptionDropReason.Unsubscribed));
+	}
+
+	internal ObservedTimingMeasurement GetExtraStats() {
+		return _extraStatistics == null ? null : _extraStatistics.GetMeasurementDetails();
+	}
+
+	private bool CanSend() {
+		return AvailableSlots > 0;
+	}
+
+	private void OnEventConfirmed(OutstandingMessage ev) {
+		var handler = EventConfirmed;
+		if (handler != null)
+			handler(this, ev.ResolvedEvent);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionClientCollection.cs b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionClientCollection.cs
new file mode 100644
index 00000000000..7b24f75da24
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionClientCollection.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+internal class PersistentSubscriptionClientCollection {
+	private readonly IPersistentSubscriptionConsumerStrategy _consumerStrategy;
+
+	private readonly Dictionary<Guid, PersistentSubscriptionClient> _hash =
+		new Dictionary<Guid, PersistentSubscriptionClient>();
+
+	public int Count {
+		get { return _hash.Count; }
+	}
+
+	public PersistentSubscriptionClientCollection(IPersistentSubscriptionConsumerStrategy consumerStrategy) {
+		_consumerStrategy = consumerStrategy;
+	}
+
+	public void AddClient(PersistentSubscriptionClient client) {
+		_hash.Add(client.CorrelationId, client);
+		_consumerStrategy.ClientAdded(client);
+	}
+
+	public ConsumerPushResult PushMessageToClient(OutstandingMessage message) {
+		return _consumerStrategy.PushMessageToClient(message);
+	}
+
+	public bool RemoveClientByConnectionId(Guid connectionId,
+		out IEnumerable<OutstandingMessage> unconfirmedEvents) {
+		var clients = _hash.Values.Where(x => x.ConnectionId == connectionId).ToList();
+		if (clients.Count == 0) {
+			unconfirmedEvents = Array.Empty<OutstandingMessage>();
+			return false;
+		}
+
+		unconfirmedEvents = clients.SelectMany(client => RemoveClientByCorrelationId(client.CorrelationId, false));
+		return true;
+	}
+
+	public void ShutdownAll() {
+		foreach (var client in _hash.Values.ToArray()) {
+			RemoveClientByCorrelationId(client.CorrelationId, true);
+		}
+	}
+
+	public IEnumerable<OutstandingMessage> RemoveClientByCorrelationId(Guid correlationId,
+		bool sendDropNotification) {
+		PersistentSubscriptionClient client;
+		if (!_hash.TryGetValue(correlationId, out client))
+			return new OutstandingMessage[0];
+		_hash.Remove(client.CorrelationId);
+		_consumerStrategy.ClientRemoved(client);
+		if (sendDropNotification) {
+			client.SendDropNotification();
+		}
+
+		return client.GetUnconfirmedEvents();
+	}
+
+	public IEnumerable<PersistentSubscriptionClient> GetAll() {
+		return _hash.Values;
+	}
+
+	public void RemoveProcessingMessages(params Guid[] processedEventIds) {
+		foreach (var client in _hash.Values) {
+			client.RemoveFromProcessing(processedEventIds);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionConfig.cs b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionConfig.cs
new file mode 100644
index 00000000000..22267b9d4e9
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionConfig.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public class PersistentSubscriptionConfig {
+	public string Version;
+	public DateTime Updated;
+	public string UpdatedBy;
+	public List<PersistentSubscriptionEntry> Entries = new List<PersistentSubscriptionEntry>();
+
+	public byte[] GetSerializedForm() {
+		return this.ToJsonBytes();
+	}
+
+	public static PersistentSubscriptionConfig FromSerializedForm(ReadOnlyMemory<byte> data) {
+		try {
+			var ret = data.ParseJson<PersistentSubscriptionConfig>();
+			if (ret.Version == null)
+				throw new BadConfigDataException("Deserialized but no version present, invalid configuration data.",
+					null);
+
+			UpdateIfRequired(ret);
+
+			return ret;
+		} catch (Exception ex) {
+			throw new BadConfigDataException("The config data appears to be invalid", ex);
+		}
+	}
+
+	private static void UpdateIfRequired(PersistentSubscriptionConfig ret) {
+		if (ret.Version == "1") {
+			if (ret.Entries != null) {
+				foreach (var persistentSubscriptionEntry in ret.Entries) {
+					if (string.IsNullOrEmpty(persistentSubscriptionEntry.NamedConsumerStrategy)) {
+						persistentSubscriptionEntry.NamedConsumerStrategy =
+							persistentSubscriptionEntry.PreferRoundRobin
+								? SystemConsumerStrategies.RoundRobin
+								: SystemConsumerStrategies.DispatchToSingle;
+					}
+				}
+			}
+
+			ret.Version = "2";
+		}
+	}
+}
+
+public class BadConfigDataException : Exception {
+	public BadConfigDataException(string message, Exception inner) : base(message, inner) {
+	}
+}
+
+public class PersistentSubscriptionEntry {
+	public string Stream;
+	public string Group;
+	public EventFilter.EventFilterDto Filter;
+	public bool ResolveLinkTos;
+	public bool ExtraStatistics;
+	public int MessageTimeout;
+	[Obsolete] public long StartFrom;
+	public string StartPosition;
+	public int LiveBufferSize;
+	public int HistoryBufferSize;
+	public int MaxRetryCount;
+	public int ReadBatchSize;
+	public bool PreferRoundRobin;
+	public int CheckPointAfter { get; set; }
+	public int MinCheckPointCount { get; set; }
+	public int MaxCheckPointCount { get; set; }
+	public int MaxSubscriberCount { get; set; }
+	public string NamedConsumerStrategy { get; set; }
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionMessageParker.cs b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionMessageParker.cs
new file mode 100644
index 00000000000..9dc3340fc72
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionMessageParker.cs
@@ -0,0 +1,230 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Text;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.UserManagement;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public class PersistentSubscriptionMessageParker : IPersistentSubscriptionMessageParker {
+	private readonly IODispatcher _ioDispatcher;
+	public readonly string ParkedStreamId;
+	private long _lastTruncateBefore = -1;
+	private long _lastParkedEventNumber = -1;
+	private DateTime? _oldestParkedMessage;
+	public long ParkedMessageCount {
+		get {
+			return _lastParkedEventNumber == -1 ? 0 :
+				_lastTruncateBefore == -1 ? _lastParkedEventNumber + 1 :
+				_lastParkedEventNumber - _lastTruncateBefore + 1;
+		}
+	}
+
+	private static readonly ILogger Log = Serilog.Log.ForContext<PersistentSubscriptionMessageParker>();
+
+	public PersistentSubscriptionMessageParker(string subscriptionId, IODispatcher ioDispatcher) {
+		ParkedStreamId = "$persistentsubscription-" + subscriptionId + "-parked";
+		_ioDispatcher = ioDispatcher;
+	}
+
+	public DateTime? GetOldestParkedMessage {
+		get {
+			return _oldestParkedMessage;
+		}
+	}
+
+	public void BeginLoadStats(Action completed) {
+		BeginReadParkedMessageStats(completed);
+	}
+
+	private Event CreateStreamMetadataEvent(long? tb) {
+		var eventId = Guid.NewGuid();
+		var acl = new StreamAcl(
+			readRole: SystemRoles.Admins, writeRole: SystemRoles.Admins,
+			deleteRole: SystemRoles.Admins, metaReadRole: SystemRoles.Admins,
+			metaWriteRole: SystemRoles.Admins);
+		var metadata = new StreamMetadata(cacheControl: null,
+			truncateBefore: tb,
+			acl: acl);
+		var dataBytes = metadata.ToJsonBytes();
+		return new Event(eventId, SystemEventTypes.StreamMetadata, isJson: true, data: dataBytes, metadata: null);
+	}
+
+	private void WriteStateCompleted(Action<ResolvedEvent, OperationResult> completed, ResolvedEvent ev,
+		ClientMessage.WriteEventsCompleted msg, DateTime parkedMessageAdded) {
+		_lastParkedEventNumber = msg.LastEventNumber;
+		if (_oldestParkedMessage == null)
+			_oldestParkedMessage = parkedMessageAdded.ToUniversalTime();
+		completed?.Invoke(ev, msg.Result);
+	}
+
+	public void BeginParkMessage(ResolvedEvent ev, string reason,
+		Action<ResolvedEvent, OperationResult> completed) {
+		var metadata = new ParkedMessageMetadata { Added = DateTime.Now, Reason = reason, SubscriptionEventNumber = ev.OriginalEventNumber };
+
+		string data = GetLinkToFor(ev);
+
+		var parkedEvent = new Event(Guid.NewGuid(), SystemEventTypes.LinkTo, false, data, metadata.ToJson());
+
+		_ioDispatcher.WriteEvent(ParkedStreamId, ExpectedVersion.Any, parkedEvent, SystemAccounts.System,
+			x => WriteStateCompleted(completed, ev, x,
+				metadata.Added));
+	}
+
+	private string GetLinkToFor(ResolvedEvent ev) {
+		if (ev.Event == null) // Unresolved link so just use the bad/deleted link data.
+		{
+			return Encoding.UTF8.GetString(ev.Link.Data.Span);
+		}
+
+		return string.Format("{0}@{1}", ev.Event.EventNumber, ev.Event.EventStreamId);
+	}
+
+	public void BeginDelete(Action<IPersistentSubscriptionMessageParker> completed) {
+		_ioDispatcher.DeleteStream(ParkedStreamId, ExpectedVersion.Any, false, SystemAccounts.System,
+			x => completed?.Invoke(this));
+	}
+
+	private void BeginReadParkedMessageStats(Action completed) {
+		BeginReadLastEvent(lastEventNumber => {
+			if (lastEventNumber is null)
+				completed();
+			BeginReadFirstEvent(0, (firstEventNumber, oldestParkedMessageTimeStamp) => {
+				_lastTruncateBefore = firstEventNumber ?? -1;
+				_lastParkedEventNumber = lastEventNumber ?? -1;
+				_oldestParkedMessage = oldestParkedMessageTimeStamp;
+				completed?.Invoke();
+			});
+		});
+	}
+
+	public void BeginReadEndSequence(Action<long?> completed) {
+		_ioDispatcher.ReadBackward(ParkedStreamId,
+			long.MaxValue,
+			1,
+			false,
+			SystemAccounts.System, comp => {
+				switch (comp.Result) {
+					case ReadStreamResult.Success:
+						completed?.Invoke(comp.LastEventNumber);
+						break;
+					case ReadStreamResult.NoStream:
+						completed?.Invoke(null);
+						break;
+					default:
+						Log.Error(
+							"An error occured reading the last event in the parked message stream {stream} due to {e}.",
+							ParkedStreamId, comp.Result);
+						Log.Error("Messages were not removed on retry");
+						break;
+				}
+			});
+	}
+
+	private void BeginReadFirstEvent(long fromEventNumber, Action<long?, DateTime?> completed) {
+		_ioDispatcher.ReadForward(
+			ParkedStreamId,
+			fromEventNumber,
+			1, false, SystemAccounts.System,
+			comp => {
+				switch (comp.Result) {
+					case ReadStreamResult.Success:
+						if (comp.Events.Any()) {
+							completed?.Invoke(comp.Events.First().OriginalEventNumber, comp.Events.First().OriginalEvent.TimeStamp);
+						} else if (!comp.IsEndOfStream) {
+							BeginReadFirstEvent(comp.NextEventNumber, completed);
+						} else {
+							completed?.Invoke(null, null);
+						}
+
+						break;
+					case ReadStreamResult.NoStream:
+					case ReadStreamResult.StreamDeleted:
+						completed?.Invoke(null, null);
+						break;
+					default:
+						Log.Error(
+							$"An error occured reading the first event in the parked message stream {ParkedStreamId} due to {comp.Result}.");
+						completed?.Invoke(null, null);
+						break;
+				}
+			}, () => {
+				Log.Error(
+					$"Timed out reading the first event in the parked message stream {ParkedStreamId}. Parked message stats may be incorrect.");
+				completed?.Invoke(null, null);
+			}, Guid.NewGuid());
+	}
+
+	private void BeginReadLastEvent(Action<long?> completed) {
+		_ioDispatcher.ReadBackward(
+			ParkedStreamId,
+			-1,
+			1,
+			false,
+			SystemAccounts.System,
+			comp => {
+				switch (comp.Result) {
+					case ReadStreamResult.Success:
+						if (comp.Events.Any()) {
+							completed?.Invoke(comp.Events.Last().OriginalEventNumber);
+						} else {
+							completed?.Invoke(null);
+						}
+
+						break;
+					case ReadStreamResult.NoStream:
+					case ReadStreamResult.StreamDeleted:
+						completed?.Invoke(null);
+						break;
+					default:
+						Log.Error(
+							$"An error occured reading the last event in the parked message stream {ParkedStreamId} due to {comp.Result}.");
+						completed?.Invoke(null);
+						break;
+				}
+			}, () => {
+				Log.Error(
+					$"Timed out reading the last event in the parked message stream {ParkedStreamId}. Parked message stats may be incorrect.");
+				completed?.Invoke(null);
+			}, Guid.NewGuid());
+	}
+
+	public void BeginMarkParkedMessagesReprocessed(long sequence, DateTime? timestamp, bool updateOldestParkedMessage) {
+		BeginMarkParkedMessagesReprocessed(sequence, timestamp, updateOldestParkedMessage, null);
+	}
+
+	public void BeginMarkParkedMessagesReprocessed(long sequence, DateTime? timestamp, bool updateOldestParkedMessage, Action completed) {
+		var metaStreamId = SystemStreams.MetastreamOf(ParkedStreamId);
+		_ioDispatcher.WriteEvent(
+			metaStreamId, ExpectedVersion.Any, CreateStreamMetadataEvent(sequence), SystemAccounts.System,
+			msg => {
+				switch (msg.Result) {
+					case OperationResult.Success:
+						_lastTruncateBefore = sequence;
+						if (updateOldestParkedMessage)
+							_oldestParkedMessage = timestamp;
+						completed?.Invoke();
+						break;
+					default:
+						Log.Error("An error occured truncating the parked message stream {stream} due to {e}.",
+							ParkedStreamId, msg.Result);
+						Log.Error("Messages were not removed on retry");
+						completed?.Invoke();
+						break;
+				}
+			});
+	}
+
+	class ParkedMessageMetadata {
+		public DateTime Added { get; set; }
+		public string Reason { get; set; }
+		public long SubscriptionEventNumber { get; set; }
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionParams.cs b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionParams.cs
new file mode 100644
index 00000000000..8fae7af2688
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionParams.cs
@@ -0,0 +1,150 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public class PersistentSubscriptionParams {
+	private readonly bool _resolveLinkTos;
+	private readonly string _subscriptionId;
+	private readonly IPersistentSubscriptionEventSource _eventSource;
+	private readonly string _groupName;
+	private readonly IPersistentSubscriptionStreamPosition _startFrom;
+	private readonly bool _extraStatistics;
+	private readonly TimeSpan _messageTimeout;
+	private readonly TimeSpan _checkPointAfter;
+	private readonly int _minCheckPointCount;
+	private readonly int _maxCheckPointCount;
+	private readonly int _maxSubscriberCount;
+	private readonly IPersistentSubscriptionConsumerStrategy _consumerStrategy;
+
+	private readonly int _maxRetryCount;
+	private readonly int _liveBufferSize;
+	private readonly int _bufferSize;
+	private readonly int _readBatchSize;
+	private readonly IPersistentSubscriptionStreamReader _streamReader;
+	private readonly IPersistentSubscriptionCheckpointReader _checkpointReader;
+	private readonly IPersistentSubscriptionCheckpointWriter _checkpointWriter;
+	private IPersistentSubscriptionMessageParker _messageParker;
+
+	public PersistentSubscriptionParams(bool resolveLinkTos, string subscriptionId,
+		IPersistentSubscriptionEventSource eventSource,
+		string groupName,
+		IPersistentSubscriptionStreamPosition startFrom,
+		bool extraStatistics, TimeSpan messageTimeout,
+		int maxRetryCount, int liveBufferSize, int bufferSize, int readBatchSize,
+		TimeSpan checkPointAfter, int minCheckPointCount,
+		int maxCheckPointCount, int maxSubscriberCount,
+		IPersistentSubscriptionConsumerStrategy consumerStrategy,
+		IPersistentSubscriptionStreamReader streamReader,
+		IPersistentSubscriptionCheckpointReader checkpointReader,
+		IPersistentSubscriptionCheckpointWriter checkpointWriter,
+		IPersistentSubscriptionMessageParker messageParker) {
+		_resolveLinkTos = resolveLinkTos;
+		_subscriptionId = subscriptionId;
+		_eventSource = eventSource;
+		_groupName = groupName;
+		_startFrom = startFrom;
+		_extraStatistics = extraStatistics;
+		_messageTimeout = messageTimeout;
+		_maxRetryCount = maxRetryCount;
+		_liveBufferSize = liveBufferSize;
+		_bufferSize = bufferSize;
+		_checkPointAfter = checkPointAfter;
+		_minCheckPointCount = minCheckPointCount;
+		_maxCheckPointCount = maxCheckPointCount;
+		_maxSubscriberCount = maxSubscriberCount;
+		_consumerStrategy = consumerStrategy;
+		_readBatchSize = readBatchSize;
+		_streamReader = streamReader;
+		_checkpointReader = checkpointReader;
+		_checkpointWriter = checkpointWriter;
+		_messageParker = messageParker;
+	}
+
+	public bool ResolveLinkTos {
+		get { return _resolveLinkTos; }
+	}
+
+	public string SubscriptionId {
+		get { return _subscriptionId; }
+	}
+
+	public IPersistentSubscriptionEventSource EventSource {
+		get { return _eventSource; }
+	}
+
+	public string GroupName {
+		get { return _groupName; }
+	}
+
+	public IPersistentSubscriptionStreamPosition StartFrom {
+		get { return _startFrom; }
+	}
+
+	public bool ExtraStatistics {
+		get { return _extraStatistics; }
+	}
+
+	public TimeSpan MessageTimeout {
+		get { return _messageTimeout; }
+	}
+
+	public IPersistentSubscriptionStreamReader StreamReader {
+		get { return _streamReader; }
+	}
+
+	public IPersistentSubscriptionCheckpointReader CheckpointReader {
+		get { return _checkpointReader; }
+	}
+
+	public IPersistentSubscriptionCheckpointWriter CheckpointWriter {
+		get { return _checkpointWriter; }
+	}
+
+	public IPersistentSubscriptionMessageParker MessageParker {
+		get { return _messageParker; }
+	}
+
+	public int MaxRetryCount {
+		get { return _maxRetryCount; }
+	}
+
+	public int LiveBufferSize {
+		get { return _liveBufferSize; }
+	}
+
+	public int BufferSize {
+		get { return _bufferSize; }
+	}
+
+	public int ReadBatchSize {
+		get { return _readBatchSize; }
+	}
+
+	public TimeSpan CheckPointAfter {
+		get { return _checkPointAfter; }
+	}
+
+	public int MinCheckPointCount {
+		get { return _minCheckPointCount; }
+	}
+
+	public int MaxCheckPointCount {
+		get { return _maxCheckPointCount; }
+	}
+
+	public int MaxSubscriberCount {
+		get { return _maxSubscriberCount; }
+	}
+
+	public IPersistentSubscriptionConsumerStrategy ConsumerStrategy {
+		get { return _consumerStrategy; }
+	}
+
+	public string ParkedMessageStream {
+		get { return "$persistentsubscription-" + _eventSource + "::" + _groupName + "-parked"; }
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionParamsBuilder.cs b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionParamsBuilder.cs
new file mode 100644
index 00000000000..b7d4c2376f9
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionParamsBuilder.cs
@@ -0,0 +1,319 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+/// <summary>
+/// Builds a <see cref="PersistentSubscriptionParams"/> object.
+/// </summary>
+public abstract class PersistentSubscriptionParamsBuilder {
+	private bool _resolveLinkTos;
+	private IPersistentSubscriptionStreamPosition _startFrom;
+	private bool _recordStatistics;
+	private TimeSpan _timeout;
+	private int _readBatchSize;
+	private int _maxRetryCount;
+	private int _liveBufferSize;
+	private int _historyBufferSize;
+	private string _subscriptionId;
+	private IPersistentSubscriptionEventSource _eventSource;
+	private string _groupName;
+	private IPersistentSubscriptionStreamReader _streamReader;
+	private IPersistentSubscriptionCheckpointReader _checkpointReader;
+	private IPersistentSubscriptionCheckpointWriter _checkpointWriter;
+	private IPersistentSubscriptionMessageParker _messageParker;
+	private TimeSpan _checkPointAfter;
+	private int _minCheckPointCount;
+	private int _maxCheckPointCount;
+	private int _maxSubscriberCount;
+	private IPersistentSubscriptionConsumerStrategy _consumerStrategy;
+
+	/// <summary>
+	/// Sets the checkpoint reader for the instance
+	/// </summary>
+	/// <param name="reader"></param>
+	/// <returns></returns>
+	public PersistentSubscriptionParamsBuilder
+		WithCheckpointReader(IPersistentSubscriptionCheckpointReader reader) {
+		_checkpointReader = reader;
+		return this;
+	}
+
+	/// <summary>
+	/// Sets the group that the subscription belongs to
+	/// </summary>
+	/// <param name="groupName"></param>
+	/// <returns></returns>
+	public PersistentSubscriptionParamsBuilder SetGroup(string groupName) {
+		_groupName = groupName;
+		return this;
+	}
+
+	/// <summary>
+	/// Sets the unique subscription id of the subscription
+	/// </summary>
+	/// <param name="subscriptionId"></param>
+	/// <returns></returns>
+	public PersistentSubscriptionParamsBuilder SetSubscriptionId(string subscriptionId) {
+		_subscriptionId = subscriptionId;
+		return this;
+	}
+
+	/// <summary>
+	/// Sets the event source of the subscription
+	/// </summary>
+	/// <param name="eventSource"></param>
+	/// <returns></returns>
+	public PersistentSubscriptionParamsBuilder WithEventSource(IPersistentSubscriptionEventSource eventSource) {
+		_eventSource = eventSource;
+		return this;
+	}
+
+	/// <summary>
+	/// Sets the message parker for the instance
+	/// </summary>
+	/// <param name="parker"></param>
+	/// <returns></returns>
+	public PersistentSubscriptionParamsBuilder WithMessageParker(IPersistentSubscriptionMessageParker parker) {
+		_messageParker = parker;
+		return this;
+	}
+
+	/// <summary>
+	/// Sets the check point reader for the subscription
+	/// </summary>
+	/// <param name="writer"></param>
+	/// <returns></returns>
+	public PersistentSubscriptionParamsBuilder
+		WithCheckpointWriter(IPersistentSubscriptionCheckpointWriter writer) {
+		_checkpointWriter = writer;
+		return this;
+	}
+
+	/// <summary>
+	/// Sets the event loader for the subscription
+	/// </summary>
+	/// <param name="loader"></param>
+	/// <returns></returns>
+	public PersistentSubscriptionParamsBuilder WithEventLoader(IPersistentSubscriptionStreamReader loader) {
+		_streamReader = loader;
+		return this;
+	}
+
+	/// <summary>
+	/// Sets the option to include further latency statistics. These statistics have a cost and should not be used
+	/// in high performance situations.
+	/// </summary>
+	/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
+	public PersistentSubscriptionParamsBuilder WithExtraStatistics() {
+		_recordStatistics = true;
+		return this;
+	}
+
+	/// <summary>
+	/// Sets the option to resolve linktos on events that are found for this subscription.
+	/// </summary>
+	/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
+	public PersistentSubscriptionParamsBuilder ResolveLinkTos() {
+		_resolveLinkTos = true;
+		return this;
+	}
+
+	/// <summary>
+	/// Sets the option to not resolve linktos on events that are found for this subscription.
+	/// </summary>
+	/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
+	public PersistentSubscriptionParamsBuilder DoNotResolveLinkTos() {
+		_resolveLinkTos = false;
+		return this;
+	}
+
+	/// <summary>
+	/// If set the subscription will prefer if possible to round robin between the clients that
+	/// are connected.
+	/// </summary>
+	/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
+	public PersistentSubscriptionParamsBuilder PreferRoundRobin() {
+		_consumerStrategy = new RoundRobinPersistentSubscriptionConsumerStrategy();
+		return this;
+	}
+
+	/// <summary>
+	/// If set the subscription will prefer if possible to dispatch only to a single of the connected
+	/// clients. If however the buffer limits are reached on that client it will begin sending to other
+	/// clients.
+	/// </summary>
+	/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
+	public PersistentSubscriptionParamsBuilder PreferDispatchToSingle() {
+		_consumerStrategy = new DispatchToSinglePersistentSubscriptionConsumerStrategy();
+		return this;
+	}
+
+	/// <summary>
+	/// Sets the consumer strategy to the one provided.
+	/// </summary>
+	/// <param name="consumerStrategy"></param>
+	/// <returns></returns>
+	public PersistentSubscriptionParamsBuilder CustomConsumerStrategy(
+		IPersistentSubscriptionConsumerStrategy consumerStrategy) {
+		_consumerStrategy = consumerStrategy;
+		return this;
+	}
+
+	/// <summary>
+	/// Sets that the subscription should start from a specified location.
+	/// </summary>
+	/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
+	public PersistentSubscriptionParamsBuilder StartFrom(IPersistentSubscriptionStreamPosition startFrom) {
+		_startFrom = startFrom;
+		return this;
+	}
+
+	public abstract PersistentSubscriptionParamsBuilder StartFromBeginning();
+
+	public abstract PersistentSubscriptionParamsBuilder StartFromCurrent();
+
+	/// <summary>
+	/// Sets the timeout timespan to about 30k years.
+	/// </summary>
+	/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
+	public PersistentSubscriptionParamsBuilder DontTimeoutMessages() {
+		_timeout = TimeSpan.MaxValue;
+		return this;
+	}
+
+	/// <summary>
+	/// Sets the time after which the subscription should be checkpointed
+	/// </summary>
+	/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
+	public PersistentSubscriptionParamsBuilder CheckPointAfter(TimeSpan time) {
+		_checkPointAfter = time;
+		return this;
+	}
+
+	/// <summary>
+	/// Sets the minimum number of items to checkpoint
+	/// </summary>
+	/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
+	public PersistentSubscriptionParamsBuilder MinimumToCheckPoint(int count) {
+		_minCheckPointCount = count;
+		return this;
+	}
+
+	/// <summary>
+	/// Sets the maximum number of items to checkpoint
+	/// </summary>
+	/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
+	public PersistentSubscriptionParamsBuilder MaximumToCheckPoint(int count) {
+		_maxCheckPointCount = count;
+		return this;
+	}
+
+	/// <summary>
+	/// Sets the maximum number of subscribers
+	/// </summary>
+	/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
+	public PersistentSubscriptionParamsBuilder MaximumSubscribers(int count) {
+		_maxSubscriberCount = count;
+		return this;
+	}
+
+	/// <summary>
+	/// Sets the timeout for a message (will be retried if an ack is not received within this timespan)
+	/// </summary>
+	/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
+	public PersistentSubscriptionParamsBuilder WithMessageTimeoutOf(TimeSpan timeout) {
+		_timeout = timeout;
+		return this;
+	}
+
+	/// <summary>
+	/// Sets the number of times a message should be retried before being considered a bad message
+	/// </summary>
+	/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
+	public PersistentSubscriptionParamsBuilder WithMaxRetriesOf(int count) {
+		Ensure.Nonnegative(count, "count");
+		_maxRetryCount = count;
+		return this;
+	}
+
+	/// <summary>
+	/// Sets the size of the live buffer for the subscription. This is the buffer used
+	/// to cache messages while sending messages as they happen. The count is
+	/// in terms of the number of messages to cache.
+	/// </summary>
+	/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
+	public PersistentSubscriptionParamsBuilder WithLiveBufferSizeOf(int count) {
+		Ensure.Nonnegative(count, "count");
+		_liveBufferSize = count;
+		return this;
+	}
+
+
+	/// <summary>
+	/// Sets the size of the read batch used when paging in history for the subscription
+	/// sizes should not be too big ...
+	/// </summary>
+	/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
+	public PersistentSubscriptionParamsBuilder WithReadBatchOf(int count) {
+		Ensure.Nonnegative(count, "count");
+		_readBatchSize = count;
+		return this;
+	}
+
+
+	/// <summary>
+	/// Sets the size of the read batch used when paging in history for the subscription
+	/// sizes should not be too big ...
+	/// </summary>
+	/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
+	public PersistentSubscriptionParamsBuilder WithHistoryBufferSizeOf(int count) {
+		Ensure.Nonnegative(count, "count");
+		_historyBufferSize = count;
+		return this;
+	}
+
+	/// <summary>
+	/// Sets the size of the read batch used when paging in history for the subscription
+	/// sizes should not be too big ...
+	/// </summary>
+	/// <returns>A new <see cref="PersistentSubscriptionParamsBuilder"></see></returns>
+	public PersistentSubscriptionParamsBuilder WithNamedConsumerStrategy(
+		IPersistentSubscriptionConsumerStrategy consumerStrategy) {
+		Ensure.NotNull(consumerStrategy, "consumerStrategy");
+		_consumerStrategy = consumerStrategy;
+		return this;
+	}
+
+	/// <summary>
+	/// Builds a <see cref="PersistentSubscriptionParams"/> object from a <see cref="PersistentSubscriptionParamsBuilder"/>.
+	/// </summary>
+	/// <param name="builder"><see cref="PersistentSubscriptionParamsBuilder"/> from which to build a <see cref="PersistentSubscriptionParamsBuilder"/></param>
+	/// <returns></returns>
+	public static implicit operator PersistentSubscriptionParams(PersistentSubscriptionParamsBuilder builder) {
+		return new PersistentSubscriptionParams(builder._resolveLinkTos,
+			builder._subscriptionId,
+			builder._eventSource,
+			builder._groupName,
+			builder._startFrom,
+			builder._recordStatistics,
+			builder._timeout,
+			builder._maxRetryCount,
+			builder._liveBufferSize,
+			builder._historyBufferSize,
+			builder._readBatchSize,
+			builder._checkPointAfter,
+			builder._minCheckPointCount,
+			builder._maxCheckPointCount,
+			builder._maxSubscriberCount,
+			builder._consumerStrategy,
+			builder._streamReader,
+			builder._checkpointReader,
+			builder._checkpointWriter,
+			builder._messageParker);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionService.cs b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionService.cs
new file mode 100644
index 00000000000..f4eef6f02d6
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionService.cs
@@ -0,0 +1,1382 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Nodes;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Services.UserManagement;
+using ILogger = Serilog.ILogger;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+using TelemetryMessage = KurrentDB.Core.Telemetry.TelemetryMessage;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public abstract class PersistentSubscriptionService {
+	protected static readonly ILogger Log = Serilog.Log.ForContext<PersistentSubscriptionService>();
+}
+
+public class PersistentSubscriptionService<TStreamId> :
+	PersistentSubscriptionService,
+	IHandle<SystemMessage.BecomeShuttingDown>,
+	IHandle<TcpMessage.ConnectionClosed>,
+	IHandle<SystemMessage.BecomeLeader>,
+	IHandle<SubscriptionMessage.PersistentSubscriptionsRestart>,
+	IHandle<SubscriptionMessage.PersistentSubscriptionTimerTick>,
+	IHandle<ClientMessage.ReplayParkedMessages>,
+	IHandle<ClientMessage.ReplayParkedMessage>,
+	IHandle<SystemMessage.StateChangeMessage>,
+	IAsyncHandle<ClientMessage.ConnectToPersistentSubscriptionToStream>,
+	IAsyncHandle<ClientMessage.ConnectToPersistentSubscriptionToAll>,
+	IAsyncHandle<StorageMessage.EventCommitted>,
+	IHandle<ClientMessage.UnsubscribeFromStream>,
+	IHandle<ClientMessage.PersistentSubscriptionAckEvents>,
+	IHandle<ClientMessage.PersistentSubscriptionNackEvents>,
+	IHandle<ClientMessage.CreatePersistentSubscriptionToStream>,
+	IHandle<ClientMessage.UpdatePersistentSubscriptionToStream>,
+	IHandle<ClientMessage.DeletePersistentSubscriptionToStream>,
+	IHandle<ClientMessage.CreatePersistentSubscriptionToAll>,
+	IHandle<ClientMessage.UpdatePersistentSubscriptionToAll>,
+	IHandle<ClientMessage.DeletePersistentSubscriptionToAll>,
+	IHandle<ClientMessage.ReadNextNPersistentMessages>,
+	IHandle<TelemetryMessage.Request>,
+	IHandle<MonitoringMessage.GetAllPersistentSubscriptionStats>,
+	IHandle<MonitoringMessage.GetPersistentSubscriptionStats>,
+	IHandle<MonitoringMessage.GetStreamPersistentSubscriptionStats> {
+
+	// for constant time lookups in ProcessEventCommited
+	private Dictionary<string, List<PersistentSubscription>> _subscriptionTopics;
+	// for quick indexing into stable pages of topics
+	private SortedList<string, List<PersistentSubscription>> _sortedSubscriptionTopics;
+	private Dictionary<string, PersistentSubscription> _subscriptionsById;
+
+	private readonly IQueuedHandler _queuedHandler;
+	private readonly IReadIndex<TStreamId> _readIndex;
+	private readonly IODispatcher _ioDispatcher;
+	private readonly IPublisher _bus;
+	private readonly PersistentSubscriptionConsumerStrategyRegistry _consumerStrategyRegistry;
+	private readonly IPersistentSubscriptionCheckpointReader _checkpointReader;
+	private readonly IPersistentSubscriptionStreamReader _streamReader;
+	private PersistentSubscriptionConfig _config = new PersistentSubscriptionConfig();
+	private bool _started = false;
+	private VNodeState _state;
+	private Guid _timerTickCorrelationId;
+	private bool _handleTick;
+	private readonly IPersistentSubscriptionTracker _persistentSubscriptionTracker;
+	private static List<MonitoringMessage.PersistentSubscriptionInfo> SubscriptionStats = [];
+	private readonly TimeSpan _interval = TimeSpan.FromSeconds(1);
+	private readonly TimerMessage.Schedule _getStats;
+
+	public PersistentSubscriptionService(IQueuedHandler queuedHandler, IReadIndex<TStreamId> readIndex,
+		IODispatcher ioDispatcher, IPublisher bus,
+		PersistentSubscriptionConsumerStrategyRegistry consumerStrategyRegistry,
+		IPersistentSubscriptionTracker persistentSubscriptionTracker) {
+		Ensure.NotNull(queuedHandler, "queuedHandler");
+		Ensure.NotNull(readIndex, "readIndex");
+		Ensure.NotNull(ioDispatcher, "ioDispatcher");
+
+		_queuedHandler = queuedHandler;
+		_readIndex = readIndex;
+		_ioDispatcher = ioDispatcher;
+		_bus = bus;
+		_consumerStrategyRegistry = consumerStrategyRegistry;
+		_checkpointReader = new PersistentSubscriptionCheckpointReader(_ioDispatcher);
+		_streamReader = new PersistentSubscriptionStreamReader(_ioDispatcher, 100);
+		_timerTickCorrelationId = Guid.NewGuid();
+		_persistentSubscriptionTracker = persistentSubscriptionTracker;
+		_getStats = TimerMessage.Schedule.Create(_interval, _bus,
+			new MonitoringMessage.GetAllPersistentSubscriptionStats(
+				new CallbackEnvelope(PushStatsToPersistentSubscriptionTracker)));
+	}
+
+	private void PushStatsToPersistentSubscriptionTracker(Message message) {
+		if (message is MonitoringMessage.GetPersistentSubscriptionStatsCompleted stats) {
+			SubscriptionStats = stats.SubscriptionStats;
+			if (SubscriptionStats != null) {
+				_persistentSubscriptionTracker.OnNewStats(SubscriptionStats);
+			}
+		}
+		_bus.Publish(_getStats);
+	}
+
+	public List<MonitoringMessage.PersistentSubscriptionInfo> GetPersistentSubscriptionStats() {
+		return SubscriptionStats;
+	}
+
+	public void InitToEmpty() {
+		_handleTick = false;
+		_subscriptionTopics = new Dictionary<string, List<PersistentSubscription>>();
+		_sortedSubscriptionTopics = new SortedList<string, List<PersistentSubscription>>();
+		_subscriptionsById = new Dictionary<string, PersistentSubscription>();
+	}
+
+	public void Handle(SystemMessage.StateChangeMessage message) {
+		_state = message.State;
+
+		if (message.State == VNodeState.Leader)
+			return;
+		Log.Debug("Persistent subscriptions received state change to {state}. Stopping listening", _state);
+		ShutdownSubscriptions();
+		Stop();
+	}
+
+	public void Handle(SystemMessage.BecomeLeader message) {
+		Log.Debug("Persistent subscriptions Became Leader so now handling subscriptions");
+		StartSubscriptions();
+	}
+
+	public void Handle(SubscriptionMessage.PersistentSubscriptionsRestart message) {
+		if (!_started) {
+			message.ReplyEnvelope.ReplyWith(new SubscriptionMessage.InvalidPersistentSubscriptionsRestart("The Persistent Subscriptions subsystem cannot be restarted because it is not started."));
+			return;
+		}
+
+		Log.Debug("Persistent Subscriptions are being restarted");
+		message.ReplyEnvelope.ReplyWith(new SubscriptionMessage.PersistentSubscriptionsRestarting());
+
+		Stop();
+		ShutdownSubscriptions();
+		StartSubscriptions();
+	}
+
+	private void StartSubscriptions() {
+		InitToEmpty();
+		_handleTick = true;
+		_timerTickCorrelationId = Guid.NewGuid();
+		_bus.Publish(TimerMessage.Schedule.Create(TimeSpan.FromMilliseconds(1000),
+			_bus,
+			new SubscriptionMessage.PersistentSubscriptionTimerTick(_timerTickCorrelationId)));
+		LoadConfiguration(Start);
+	}
+
+	public void Handle(SystemMessage.BecomeShuttingDown message) {
+		ShutdownSubscriptions();
+		Stop();
+		_queuedHandler.RequestStop();
+	}
+
+	private void ShutdownSubscriptions() {
+		if (_subscriptionsById == null)
+			return;
+		foreach (var subscription in _subscriptionsById.Values) {
+			subscription.Shutdown();
+		}
+	}
+
+	public void Start() {
+		_started = true;
+		_bus.Publish(new SubscriptionMessage.PersistentSubscriptionsStarted());
+		_bus.Publish(_getStats);
+		Log.Debug("Persistent Subscriptions have been started.");
+	}
+
+	public void Stop() {
+		_started = false;
+		_bus.Publish(new SubscriptionMessage.PersistentSubscriptionsStopped());
+		Log.Debug("Persistent Subscriptions have been stopped.");
+	}
+
+	public void Handle(ClientMessage.UnsubscribeFromStream message) {
+		if (!_started)
+			return;
+		UnsubscribeFromStream(message.CorrelationId, true);
+	}
+
+	private bool ValidateStartFrom(IPersistentSubscriptionStreamPosition startFromPosition, out string error) {
+		switch (startFromPosition) {
+			case PersistentSubscriptionSingleStreamPosition startFromStream: {
+				if (startFromStream.StreamEventNumber < -1) {
+					error = "Invalid Start From position: event number must be greater than or equal to -1.";
+					return false;
+				}
+
+				error = null;
+				return true;
+			}
+			case PersistentSubscriptionAllStreamPosition startFromAll: {
+				var (commit, prepare) = startFromAll.TFPosition;
+
+				if (prepare > commit) {
+					error = "Invalid Start From position: prepare position must be less than or equal to the commit position.";
+					return false;
+				}
+
+				if (commit > _readIndex.LastIndexedPosition) {
+					error =
+						"Invalid Start From position: commit position must be less than or equal to the last commit position in the transaction file.";
+					return false;
+				}
+
+				if ((prepare <= -1 || commit <= -1) && !(prepare == -1 && commit == -1)) {
+					error =
+						"Invalid Start From position: prepare and commit positions must be greater than or equal to 0 or both equal to -1.";
+					return false;
+				}
+
+				error = null;
+				return true;
+			}
+			default:
+				throw new InvalidOperationException();
+		}
+	}
+
+	private void CreatePersistentSubscription(
+			IPersistentSubscriptionEventSource eventSource,
+			string groupName,
+			IPersistentSubscriptionStreamPosition startFrom,
+			int messageTimeoutMilliseconds,
+			bool resolveLinkTos,
+			int maxRetryCount,
+			int bufferSize,
+			int liveBufferSize,
+			int readBatchSize,
+			int maxSubscriberCount,
+			string namedConsumerStrategy,
+			int maxCheckPointCount,
+			int minCheckPointCount,
+			int checkPointAfterMilliseconds,
+			bool recordStatistics,
+			Action<string> onSuccess,
+			Action<string> onFail,
+			Action<string> onExists,
+			Action<string> onAccessDenied,
+			string user
+	) {
+		if (!_started)
+			return;
+		var stream = eventSource.ToString();
+		var key = BuildSubscriptionGroupKey(stream, groupName);
+		Log.Debug("Creating persistent subscription {subscriptionKey}", key);
+
+		if (!_consumerStrategyRegistry.ValidateStrategy(namedConsumerStrategy)) {
+			onFail($"Consumer strategy {namedConsumerStrategy} does not exist.");
+			return;
+		}
+
+		if (!ValidateStartFrom(startFrom, out var startFromValidationError)) {
+			onFail(startFromValidationError);
+			return;
+		}
+
+		var result = TryCreateSubscriptionGroup(eventSource,
+			groupName,
+			resolveLinkTos,
+			startFrom,
+			recordStatistics,
+			maxRetryCount,
+			liveBufferSize,
+			bufferSize,
+			readBatchSize,
+			ToCheckPointAfterTimeout(checkPointAfterMilliseconds),
+			minCheckPointCount,
+			maxCheckPointCount,
+			maxSubscriberCount,
+			namedConsumerStrategy,
+			ToMessageTimeout(messageTimeoutMilliseconds)
+		);
+
+		if (!result) {
+			onExists($"Group '{groupName}' already exists.");
+			return;
+		}
+
+		Log.Debug("New persistent subscription {subscriptionKey}", key);
+		var createEntry = new PersistentSubscriptionEntry {
+			Stream = stream, //'Stream' name kept for backward compatibility
+			Filter = EventFilter.ParseToDto(eventSource.EventFilter),
+			Group = groupName,
+			ResolveLinkTos = resolveLinkTos,
+			CheckPointAfter = checkPointAfterMilliseconds,
+			ExtraStatistics = recordStatistics,
+			HistoryBufferSize = bufferSize,
+			LiveBufferSize = liveBufferSize,
+			MaxCheckPointCount = maxCheckPointCount,
+			MinCheckPointCount = minCheckPointCount,
+			MaxRetryCount = maxRetryCount,
+			ReadBatchSize = readBatchSize,
+			MaxSubscriberCount = maxSubscriberCount,
+			MessageTimeout = messageTimeoutMilliseconds,
+			NamedConsumerStrategy = namedConsumerStrategy,
+#pragma warning disable 612
+			StartFrom = startFrom is PersistentSubscriptionSingleStreamPosition x ? x.StreamEventNumber : long.MinValue,
+#pragma warning restore 612
+			StartPosition = startFrom.ToString()
+		};
+		UpdateSubscriptionConfig(user, stream, groupName, createEntry);
+		SaveConfiguration(() => onSuccess(""));
+	}
+
+	public void Handle(ClientMessage.CreatePersistentSubscriptionToStream message) {
+		if (string.IsNullOrEmpty(message.EventStreamId)) {
+			message.Envelope.ReplyWith(new ClientMessage.CreatePersistentSubscriptionToStreamCompleted(
+				message.CorrelationId,
+				ClientMessage.CreatePersistentSubscriptionToStreamCompleted.CreatePersistentSubscriptionToStreamResult.Fail,
+				"Bad stream name."));
+			return;
+		}
+
+		if (message.EventStreamId == SystemStreams.AllStream) {
+			message.Envelope.ReplyWith(new ClientMessage.CreatePersistentSubscriptionToStreamCompleted(
+				message.CorrelationId,
+				ClientMessage.CreatePersistentSubscriptionToStreamCompleted.CreatePersistentSubscriptionToStreamResult.Fail,
+				"Persistent subscriptions to $all are only supported over gRPC through gRPC clients"));
+			return;
+		}
+
+		try {
+			CreatePersistentSubscription(
+				new PersistentSubscriptionSingleStreamEventSource(message.EventStreamId),
+				message.GroupName,
+				new PersistentSubscriptionSingleStreamPosition(message.StartFrom),
+				message.MessageTimeoutMilliseconds,
+				message.ResolveLinkTos,
+				message.MaxRetryCount,
+				message.BufferSize,
+				message.LiveBufferSize,
+				message.ReadBatchSize,
+				message.MaxSubscriberCount,
+				message.NamedConsumerStrategy,
+				message.MaxCheckPointCount,
+				message.MinCheckPointCount,
+				message.CheckPointAfterMilliseconds,
+				message.RecordStatistics,
+				(msg) => {
+					message.Envelope.ReplyWith(
+						new ClientMessage.CreatePersistentSubscriptionToStreamCompleted(
+							message.CorrelationId,
+							ClientMessage.CreatePersistentSubscriptionToStreamCompleted.CreatePersistentSubscriptionToStreamResult.Success,
+							msg));
+				},
+				(error) => {
+					message.Envelope.ReplyWith(new ClientMessage.CreatePersistentSubscriptionToStreamCompleted(
+						message.CorrelationId,
+						ClientMessage.CreatePersistentSubscriptionToStreamCompleted.CreatePersistentSubscriptionToStreamResult.Fail,
+						error));
+				},
+				(error) => {
+					message.Envelope.ReplyWith(new ClientMessage.CreatePersistentSubscriptionToStreamCompleted(
+						message.CorrelationId,
+						ClientMessage.CreatePersistentSubscriptionToStreamCompleted.CreatePersistentSubscriptionToStreamResult.AlreadyExists,
+						error));
+				},
+				(error) => {
+					message.Envelope.ReplyWith(new ClientMessage.CreatePersistentSubscriptionToStreamCompleted(
+						message.CorrelationId,
+						ClientMessage.CreatePersistentSubscriptionToStreamCompleted.CreatePersistentSubscriptionToStreamResult.AccessDenied,
+						error));
+				},
+				message.User?.Identity?.Name
+			);
+		} catch (Exception ex) {
+			message.Envelope.ReplyWith(new ClientMessage.CreatePersistentSubscriptionToStreamCompleted(
+				message.CorrelationId,
+				ClientMessage.CreatePersistentSubscriptionToStreamCompleted.CreatePersistentSubscriptionToStreamResult.Fail,
+				ex.Message));
+		}
+	}
+
+	public void Handle(ClientMessage.CreatePersistentSubscriptionToAll message) {
+		try {
+			CreatePersistentSubscription(
+				new PersistentSubscriptionAllStreamEventSource(message.EventFilter),
+				message.GroupName,
+				new PersistentSubscriptionAllStreamPosition(message.StartFrom.CommitPosition,
+					message.StartFrom.PreparePosition),
+				message.MessageTimeoutMilliseconds,
+				message.ResolveLinkTos,
+				message.MaxRetryCount,
+				message.BufferSize,
+				message.LiveBufferSize,
+				message.ReadBatchSize,
+				message.MaxSubscriberCount,
+				message.NamedConsumerStrategy,
+				message.MaxCheckPointCount,
+				message.MinCheckPointCount,
+				message.CheckPointAfterMilliseconds,
+				message.RecordStatistics,
+				(msg) => {
+					message.Envelope.ReplyWith(
+						new ClientMessage.CreatePersistentSubscriptionToAllCompleted(
+							message.CorrelationId,
+							ClientMessage.CreatePersistentSubscriptionToAllCompleted.CreatePersistentSubscriptionToAllResult.Success,
+							msg));
+				},
+				(error) => {
+					message.Envelope.ReplyWith(new ClientMessage.CreatePersistentSubscriptionToAllCompleted(
+						message.CorrelationId,
+						ClientMessage.CreatePersistentSubscriptionToAllCompleted.CreatePersistentSubscriptionToAllResult.Fail,
+						error));
+				},
+				(error) => {
+					message.Envelope.ReplyWith(new ClientMessage.CreatePersistentSubscriptionToAllCompleted(
+						message.CorrelationId,
+						ClientMessage.CreatePersistentSubscriptionToAllCompleted.CreatePersistentSubscriptionToAllResult.AlreadyExists,
+						error));
+				},
+				(error) => {
+					message.Envelope.ReplyWith(new ClientMessage.CreatePersistentSubscriptionToAllCompleted(
+						message.CorrelationId,
+						ClientMessage.CreatePersistentSubscriptionToAllCompleted.CreatePersistentSubscriptionToAllResult.AccessDenied,
+						error));
+				},
+				message.User?.Identity?.Name
+			);
+		} catch (Exception ex) {
+			message.Envelope.ReplyWith(new ClientMessage.CreatePersistentSubscriptionToAllCompleted(
+				message.CorrelationId,
+				ClientMessage.CreatePersistentSubscriptionToAllCompleted.CreatePersistentSubscriptionToAllResult.Fail,
+				ex.Message));
+		}
+
+	}
+
+	private void UpdatePersistentSubscription(
+			string stream,
+			Func<PersistentSubscription, IPersistentSubscriptionEventSource> genEventSource,
+			string groupName,
+			IPersistentSubscriptionStreamPosition startFrom,
+			int messageTimeoutMilliseconds,
+			bool resolveLinkTos,
+			int maxRetryCount,
+			int bufferSize,
+			int liveBufferSize,
+			int readBatchSize,
+			int maxSubscriberCount,
+			string namedConsumerStrategy,
+			int maxCheckPointCount,
+			int minCheckPointCount,
+			int checkPointAfterMilliseconds,
+			bool recordStatistics,
+			Action<string> onSuccess,
+			Action<string> onFail,
+			Action<string> onNotExist,
+			Action<string> onAccessDenied,
+			string user
+	) {
+		if (!_started)
+			return;
+
+		var key = BuildSubscriptionGroupKey(stream, groupName);
+		Log.Debug("Updating persistent subscription {subscriptionKey}", key);
+
+		if (!_subscriptionsById.TryGetValue(key, out var oldSubscription)) {
+			onNotExist($"Group '{groupName}' does not exist.");
+			return;
+		}
+
+		if (!_consumerStrategyRegistry.ValidateStrategy(namedConsumerStrategy)) {
+			onFail($"Consumer strategy {namedConsumerStrategy} does not exist.");
+			return;
+		}
+
+		if (!ValidateStartFrom(startFrom, out var startFromValidationError)) {
+			onFail(startFromValidationError);
+			return;
+		}
+
+		var eventSource = genEventSource(oldSubscription);
+		var subscription = new PersistentSubscription(
+			new PersistentSubscriptionParams(
+				resolveLinkTos,
+				key,
+				eventSource,
+				groupName,
+				startFrom,
+				recordStatistics,
+				ToMessageTimeout(messageTimeoutMilliseconds),
+				maxRetryCount,
+				liveBufferSize,
+				bufferSize,
+				readBatchSize,
+				ToCheckPointAfterTimeout(checkPointAfterMilliseconds),
+				minCheckPointCount,
+				maxCheckPointCount,
+				maxSubscriberCount,
+				_consumerStrategyRegistry.GetInstance(namedConsumerStrategy, key),
+				_streamReader,
+				_checkpointReader,
+				new PersistentSubscriptionCheckpointWriter(key, _ioDispatcher),
+				new PersistentSubscriptionMessageParker(key, _ioDispatcher)));
+
+		var updateEntry = new PersistentSubscriptionEntry {
+			Stream = stream, //'Stream' name kept for backward compatibility
+			Group = groupName,
+			Filter = EventFilter.ParseToDto(eventSource.EventFilter),
+			ResolveLinkTos = resolveLinkTos,
+			CheckPointAfter = checkPointAfterMilliseconds,
+			ExtraStatistics = recordStatistics,
+			HistoryBufferSize = bufferSize,
+			LiveBufferSize = liveBufferSize,
+			MaxCheckPointCount = maxCheckPointCount,
+			MinCheckPointCount = minCheckPointCount,
+			MaxRetryCount = maxRetryCount,
+			ReadBatchSize = readBatchSize,
+			MaxSubscriberCount = maxSubscriberCount,
+			MessageTimeout = messageTimeoutMilliseconds,
+			NamedConsumerStrategy = namedConsumerStrategy,
+#pragma warning disable 612
+			StartFrom = startFrom is PersistentSubscriptionSingleStreamPosition x
+				? x.StreamEventNumber
+				: long.MinValue,
+#pragma warning restore 612
+			StartPosition = startFrom.ToString()
+		};
+
+		UpdateSubscription(stream, groupName, subscription);
+		UpdateSubscriptionConfig(user, stream, groupName, updateEntry);
+		SaveConfiguration(() => onSuccess(""));
+	}
+
+	public void Handle(ClientMessage.UpdatePersistentSubscriptionToStream message) {
+		if (string.IsNullOrEmpty(message.EventStreamId)) {
+			message.Envelope.ReplyWith(new ClientMessage.UpdatePersistentSubscriptionToStreamCompleted(
+				message.CorrelationId,
+				ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult.Fail,
+				"Bad stream name."));
+			return;
+		}
+
+		if (message.EventStreamId == SystemStreams.AllStream) {
+			message.Envelope.ReplyWith(new ClientMessage.UpdatePersistentSubscriptionToStreamCompleted(
+				message.CorrelationId,
+				ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult.Fail,
+				"Persistent subscriptions to $all are only supported over gRPC through gRPC clients"));
+			return;
+		}
+
+		try {
+			UpdatePersistentSubscription(
+				message.EventStreamId,
+				_ => new PersistentSubscriptionSingleStreamEventSource(message.EventStreamId),
+				message.GroupName,
+				new PersistentSubscriptionSingleStreamPosition(message.StartFrom),
+				message.MessageTimeoutMilliseconds,
+				message.ResolveLinkTos,
+				message.MaxRetryCount,
+				message.BufferSize,
+				message.LiveBufferSize,
+				message.ReadBatchSize,
+				message.MaxSubscriberCount,
+				message.NamedConsumerStrategy,
+				message.MaxCheckPointCount,
+				message.MinCheckPointCount,
+				message.CheckPointAfterMilliseconds,
+				message.RecordStatistics,
+				(msg) => {
+					message.Envelope.ReplyWith(
+						new ClientMessage.UpdatePersistentSubscriptionToStreamCompleted(
+							message.CorrelationId,
+							ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult.Success,
+							msg));
+				},
+				(error) => {
+					message.Envelope.ReplyWith(new ClientMessage.UpdatePersistentSubscriptionToStreamCompleted(
+						message.CorrelationId,
+						ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult.Fail,
+						error));
+				},
+				(error) => {
+					message.Envelope.ReplyWith(new ClientMessage.UpdatePersistentSubscriptionToStreamCompleted(
+						message.CorrelationId,
+						ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult.DoesNotExist,
+						error));
+				},
+				(error) => {
+					message.Envelope.ReplyWith(new ClientMessage.UpdatePersistentSubscriptionToStreamCompleted(
+						message.CorrelationId,
+						ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult.AccessDenied,
+						error));
+				},
+				message.User?.Identity?.Name
+			);
+		} catch (Exception ex) {
+			message.Envelope.ReplyWith(new ClientMessage.UpdatePersistentSubscriptionToStreamCompleted(
+				message.CorrelationId,
+				ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult.Fail,
+				ex.Message));
+		}
+	}
+
+	public void Handle(ClientMessage.UpdatePersistentSubscriptionToAll message) {
+		try {
+			UpdatePersistentSubscription(
+				SystemStreams.AllStream,
+				sub => new PersistentSubscriptionAllStreamEventSource(sub.EventSource?.EventFilter),
+				message.GroupName,
+				new PersistentSubscriptionAllStreamPosition(message.StartFrom.CommitPosition,
+					message.StartFrom.PreparePosition),
+				message.MessageTimeoutMilliseconds,
+				message.ResolveLinkTos,
+				message.MaxRetryCount,
+				message.BufferSize,
+				message.LiveBufferSize,
+				message.ReadBatchSize,
+				message.MaxSubscriberCount,
+				message.NamedConsumerStrategy,
+				message.MaxCheckPointCount,
+				message.MinCheckPointCount,
+				message.CheckPointAfterMilliseconds,
+				message.RecordStatistics,
+				(msg) => {
+					message.Envelope.ReplyWith(
+						new ClientMessage.UpdatePersistentSubscriptionToAllCompleted(
+							message.CorrelationId,
+							ClientMessage.UpdatePersistentSubscriptionToAllCompleted.UpdatePersistentSubscriptionToAllResult.Success,
+							msg));
+				},
+				(error) => {
+					message.Envelope.ReplyWith(new ClientMessage.UpdatePersistentSubscriptionToAllCompleted(
+						message.CorrelationId,
+						ClientMessage.UpdatePersistentSubscriptionToAllCompleted.UpdatePersistentSubscriptionToAllResult.Fail,
+						error));
+				},
+				(error) => {
+					message.Envelope.ReplyWith(new ClientMessage.UpdatePersistentSubscriptionToAllCompleted(
+						message.CorrelationId,
+						ClientMessage.UpdatePersistentSubscriptionToAllCompleted.UpdatePersistentSubscriptionToAllResult.DoesNotExist,
+						error));
+				},
+				(error) => {
+					message.Envelope.ReplyWith(new ClientMessage.UpdatePersistentSubscriptionToAllCompleted(
+						message.CorrelationId,
+						ClientMessage.UpdatePersistentSubscriptionToAllCompleted.UpdatePersistentSubscriptionToAllResult.AccessDenied,
+						error));
+				},
+				message.User?.Identity?.Name
+			);
+		} catch (Exception ex) {
+			message.Envelope.ReplyWith(new ClientMessage.UpdatePersistentSubscriptionToAllCompleted(
+				message.CorrelationId,
+				ClientMessage.UpdatePersistentSubscriptionToAllCompleted.UpdatePersistentSubscriptionToAllResult
+					.Fail,
+				ex.Message));
+		}
+	}
+
+	private bool TryCreateSubscriptionGroup(IPersistentSubscriptionEventSource eventSource,
+		string groupName,
+		bool resolveLinkTos,
+		IPersistentSubscriptionStreamPosition startFrom,
+		bool extraStatistics,
+		int maxRetryCount,
+		int liveBufferSize,
+		int historyBufferSize,
+		int readBatchSize,
+		TimeSpan checkPointAfter,
+		int minCheckPointCount,
+		int maxCheckPointCount,
+		int maxSubscriberCount,
+		string namedConsumerStrategy,
+		TimeSpan messageTimeout) {
+		var stream = eventSource.ToString();
+		var key = BuildSubscriptionGroupKey(stream, groupName);
+
+		if (_subscriptionsById.ContainsKey(key))
+			return false;
+
+		var subscription = new PersistentSubscription(
+			new PersistentSubscriptionParams(
+				resolveLinkTos,
+				key,
+				eventSource,
+				groupName,
+				startFrom,
+				extraStatistics,
+				messageTimeout,
+				maxRetryCount,
+				liveBufferSize,
+				historyBufferSize,
+				readBatchSize,
+				checkPointAfter,
+				minCheckPointCount,
+				maxCheckPointCount,
+				maxSubscriberCount,
+				_consumerStrategyRegistry.GetInstance(namedConsumerStrategy, key),
+				_streamReader,
+				_checkpointReader,
+				new PersistentSubscriptionCheckpointWriter(key, _ioDispatcher),
+				new PersistentSubscriptionMessageParker(key, _ioDispatcher)));
+
+		UpdateSubscription(stream, groupName, subscription);
+		return true;
+
+	}
+
+	private void DeletePersistentSubscription(
+			IPersistentSubscriptionEventSource eventSource,
+			string groupName,
+			Action<string> onSuccess,
+			Action<string> onFail,
+			Action<string> onNotExist,
+			Action<string> onAccessDenied,
+			string user
+	) {
+		if (!_started)
+			return;
+		var stream = eventSource.ToString();
+		var key = BuildSubscriptionGroupKey(stream, groupName);
+		Log.Debug("Deleting persistent subscription {subscriptionKey}", key);
+
+		PersistentSubscription subscription;
+		if (!_subscriptionsById.TryGetValue(key, out subscription)) {
+			onNotExist($"Group '{groupName}' does not exist.");
+			return;
+		}
+
+		if (!_subscriptionTopics.ContainsKey(stream)) {
+			onFail($"Group '{groupName}' does not exist.");
+			return;
+		}
+
+		UpdateSubscription(stream, groupName, null);
+		UpdateSubscriptionConfig(user, stream, groupName, null);
+		subscription.Delete();
+		SaveConfiguration(() => onSuccess(""));
+	}
+
+
+	public void Handle(ClientMessage.DeletePersistentSubscriptionToStream message) {
+		if (string.IsNullOrEmpty(message.EventStreamId)) {
+			message.Envelope.ReplyWith(new ClientMessage.DeletePersistentSubscriptionToStreamCompleted(
+				message.CorrelationId,
+				ClientMessage.DeletePersistentSubscriptionToStreamCompleted.DeletePersistentSubscriptionToStreamResult.Fail,
+				"Bad stream name."));
+			return;
+		}
+
+		if (message.EventStreamId == SystemStreams.AllStream) {
+			message.Envelope.ReplyWith(new ClientMessage.DeletePersistentSubscriptionToStreamCompleted(
+				message.CorrelationId,
+				ClientMessage.DeletePersistentSubscriptionToStreamCompleted.DeletePersistentSubscriptionToStreamResult.Fail,
+				"Persistent subscriptions to $all are only supported over gRPC through gRPC clients"));
+			return;
+		}
+
+		DeletePersistentSubscription(
+			new PersistentSubscriptionSingleStreamEventSource(message.EventStreamId),
+			message.GroupName,
+			(msg) => {
+				message.Envelope.ReplyWith(new ClientMessage.DeletePersistentSubscriptionToStreamCompleted(
+					message.CorrelationId,
+					ClientMessage.DeletePersistentSubscriptionToStreamCompleted.DeletePersistentSubscriptionToStreamResult.Success, msg));
+			},
+			(error) => {
+				message.Envelope.ReplyWith(new ClientMessage.DeletePersistentSubscriptionToStreamCompleted(
+					message.CorrelationId,
+					ClientMessage.DeletePersistentSubscriptionToStreamCompleted.DeletePersistentSubscriptionToStreamResult.Fail,
+					error));
+			},
+			(error) => {
+				message.Envelope.ReplyWith(new ClientMessage.DeletePersistentSubscriptionToStreamCompleted(
+					message.CorrelationId,
+					ClientMessage.DeletePersistentSubscriptionToStreamCompleted.DeletePersistentSubscriptionToStreamResult.DoesNotExist,
+					error));
+			},
+			(error) => {
+				message.Envelope.ReplyWith(new ClientMessage.DeletePersistentSubscriptionToStreamCompleted(
+					message.CorrelationId,
+					ClientMessage.DeletePersistentSubscriptionToStreamCompleted.DeletePersistentSubscriptionToStreamResult.AccessDenied,
+					error));
+			},
+			message.User?.Identity?.Name
+		);
+	}
+
+	public void Handle(ClientMessage.DeletePersistentSubscriptionToAll message) {
+		DeletePersistentSubscription(
+			new PersistentSubscriptionAllStreamEventSource(),
+			message.GroupName,
+			(msg) => {
+				message.Envelope.ReplyWith(new ClientMessage.DeletePersistentSubscriptionToAllCompleted(
+					message.CorrelationId,
+					ClientMessage.DeletePersistentSubscriptionToAllCompleted.DeletePersistentSubscriptionToAllResult.Success, msg));
+			},
+			(error) => {
+				message.Envelope.ReplyWith(new ClientMessage.DeletePersistentSubscriptionToAllCompleted(
+					message.CorrelationId,
+					ClientMessage.DeletePersistentSubscriptionToAllCompleted.DeletePersistentSubscriptionToAllResult.Fail,
+					error));
+			},
+			(error) => {
+				message.Envelope.ReplyWith(new ClientMessage.DeletePersistentSubscriptionToAllCompleted(
+					message.CorrelationId,
+					ClientMessage.DeletePersistentSubscriptionToAllCompleted.DeletePersistentSubscriptionToAllResult.DoesNotExist,
+					error));
+			},
+			(error) => {
+				message.Envelope.ReplyWith(new ClientMessage.DeletePersistentSubscriptionToAllCompleted(
+					message.CorrelationId,
+					ClientMessage.DeletePersistentSubscriptionToAllCompleted.DeletePersistentSubscriptionToAllResult.AccessDenied,
+					error));
+			},
+			message.User?.Identity?.Name
+		);
+	}
+
+	private void UpdateSubscriptionConfig(string username, string eventSource, string groupName, PersistentSubscriptionEntry replaceBy) {
+		_config.Updated = DateTime.Now;
+		_config.UpdatedBy = username;
+		var index = _config.Entries.FindLastIndex(x => x.Stream == eventSource && x.Group == groupName);
+
+		if (index < 0) {
+			if (replaceBy == null) {
+				var key = BuildSubscriptionGroupKey(eventSource, groupName);
+				throw new ArgumentException($"Config for subscription: '{key}' does not exist");
+			}
+			// create
+			_config.Entries.Add(replaceBy);
+		} else {
+			if (replaceBy != null) // update
+				_config.Entries[index] = replaceBy;
+			else // delete
+				_config.Entries.RemoveAt(index);
+		}
+	}
+
+	private void UpdateSubscription(string eventSource, string groupName, PersistentSubscription replaceBy) {
+		var key = BuildSubscriptionGroupKey(eventSource, groupName);
+
+		if (!_subscriptionTopics.TryGetValue(eventSource, out var subscribers)) {
+			subscribers = new List<PersistentSubscription>();
+			_subscriptionTopics.Add(eventSource, subscribers);
+			_sortedSubscriptionTopics.Add(eventSource, subscribers);
+		}
+
+		// shut down any existing subscription
+		var subscriptionIndex = -1;
+		for (int i = 0; i < subscribers.Count; i++) {
+			if (subscribers[i].SubscriptionId != key)
+				continue;
+
+			subscriptionIndex = i;
+			var sub = subscribers[i];
+			try {
+				sub.Shutdown();
+			} catch (Exception ex) {
+				Log.Error(ex, "Failed to shut down subscription with id: {subscriptionId}",
+					sub.SubscriptionId);
+			}
+			break;
+		}
+
+		if (_subscriptionsById.ContainsKey(key)) {
+			if (subscriptionIndex == -1)
+				throw new ArgumentException($"Subscription: '{key}' exists but it's not present in the list of subscribers");
+
+			if (replaceBy != null) { // update
+				_subscriptionsById[key] = replaceBy;
+				subscribers[subscriptionIndex] = replaceBy;
+			} else { // delete
+				_subscriptionsById.Remove(key);
+				subscribers.RemoveAt(subscriptionIndex);
+			}
+		} else {
+			if (subscriptionIndex != -1)
+				throw new ArgumentException($"Subscription: '{key}' does not exist but it's present in the list of subscribers");
+
+			// create
+			_subscriptionsById.Add(key, replaceBy);
+			subscribers.Add(replaceBy);
+		}
+	}
+
+	private void UnsubscribeFromStream(Guid correlationId, bool sendDropNotification) {
+		foreach (var subscription in _subscriptionsById.Values) {
+			subscription.RemoveClientByCorrelationId(correlationId, sendDropNotification);
+		}
+	}
+
+	public void Handle(TcpMessage.ConnectionClosed message) {
+		if (_subscriptionsById == null)
+			return; //haven't built yet.
+
+		foreach (var subscription in _subscriptionsById.Values) {
+			if (subscription.RemoveClientByConnectionId(message.Connection.ConnectionId))
+				Log.Debug("Persistent subscription {subscription} lost connection from {remoteEndPoint}",
+					subscription.SubscriptionId,
+					message.Connection.RemoteEndPoint);
+		}
+	}
+
+	public async ValueTask ConnectToPersistentSubscription(
+		IPersistentSubscriptionEventSource eventSource,
+		string groupName,
+		int allowedInFlightMessages,
+		Guid connectionId,
+		string connectionName,
+		string from,
+		Guid correlationId,
+		IEnvelope envelope,
+		string user,
+		CancellationToken token) {
+		if (!_started)
+			return;
+
+		var stream = eventSource.ToString();
+		if (!_subscriptionTopics.TryGetValue(stream, out _)) {
+			envelope.ReplyWith(new ClientMessage.SubscriptionDropped(correlationId,
+				SubscriptionDropReason.NotFound));
+			return;
+		}
+
+		var key = BuildSubscriptionGroupKey(stream, groupName);
+		PersistentSubscription subscription;
+		if (!_subscriptionsById.TryGetValue(key, out subscription)) {
+			envelope.ReplyWith(new ClientMessage.SubscriptionDropped(correlationId, SubscriptionDropReason.NotFound));
+			return;
+		}
+
+		if (subscription.HasReachedMaxClientCount) {
+			envelope.ReplyWith(new ClientMessage.SubscriptionDropped(correlationId,
+				SubscriptionDropReason.SubscriberMaxCountReached));
+			return;
+		}
+
+		Log.Debug("New connection to persistent subscription {subscriptionKey} by {connectionId}", key, connectionId);
+		long? lastEventNumber = null;
+		if (eventSource.FromStream) {
+			var streamId = _readIndex.GetStreamId(eventSource.EventStreamId);
+			lastEventNumber = await _readIndex.GetStreamLastEventNumber(streamId, token);
+		}
+		var lastCommitPos = _readIndex.LastIndexedPosition;
+		var subscribedMessage =
+			new ClientMessage.PersistentSubscriptionConfirmation(key, correlationId, lastCommitPos, lastEventNumber);
+		envelope.ReplyWith(subscribedMessage);
+		var name = user ?? "anonymous";
+		subscription.AddClient(correlationId, connectionId, connectionName, envelope,
+			allowedInFlightMessages, name, from);
+
+	}
+
+	ValueTask IAsyncHandle<ClientMessage.ConnectToPersistentSubscriptionToStream>.HandleAsync(ClientMessage.ConnectToPersistentSubscriptionToStream message, CancellationToken token) {
+		return ConnectToPersistentSubscription(
+			new PersistentSubscriptionSingleStreamEventSource(message.EventStreamId),
+			message.GroupName,
+			message.AllowedInFlightMessages,
+			message.ConnectionId,
+			message.ConnectionName,
+			message.From,
+			message.CorrelationId,
+			message.Envelope,
+			message.User?.Identity?.Name,
+			token);
+	}
+
+	ValueTask IAsyncHandle<ClientMessage.ConnectToPersistentSubscriptionToAll>.HandleAsync(ClientMessage.ConnectToPersistentSubscriptionToAll message, CancellationToken token) {
+		return ConnectToPersistentSubscription(
+			new PersistentSubscriptionAllStreamEventSource(),
+			message.GroupName,
+			message.AllowedInFlightMessages,
+			message.ConnectionId,
+			message.ConnectionName,
+			message.From,
+			message.CorrelationId,
+			message.Envelope,
+			message.User?.Identity?.Name,
+			token);
+	}
+
+	private static string BuildSubscriptionGroupKey(string stream, string groupName) {
+		return stream + "::" + groupName;
+	}
+
+	ValueTask IAsyncHandle<StorageMessage.EventCommitted>.HandleAsync(StorageMessage.EventCommitted message, CancellationToken token) {
+		return _started
+			? ProcessEventCommited(message.Event.EventStreamId, message.CommitPosition, message.Event, token)
+			: ValueTask.CompletedTask;
+	}
+
+	private async ValueTask ProcessEventCommited(string eventStreamId, long commitPosition, EventRecord evnt, CancellationToken token) {
+		var subscriptions = new List<PersistentSubscription>();
+		if (EventFilter.DefaultStreamFilter.IsEventAllowed(evnt)
+			&& _subscriptionTopics.TryGetValue(eventStreamId, out var subscriptionsToStream)) {
+			subscriptions.AddRange(subscriptionsToStream);
+		}
+
+		if (EventFilter.DefaultAllFilter.IsEventAllowed(evnt)
+			&& _subscriptionTopics.TryGetValue(SystemStreams.AllStream, out var subscriptionsToAll)) {
+			subscriptions.AddRange(subscriptionsToAll);
+		}
+
+		for (int i = 0, n = subscriptions.Count; i < n; i++) {
+			var subscr = subscriptions[i];
+			var pair = ResolvedEvent.ForUnresolvedEvent(evnt, commitPosition);
+			if (subscr.ResolveLinkTos)
+				pair = await ResolveLinkToEvent(evnt, commitPosition, token); //TODO this can be cached
+			subscr.NotifyLiveSubscriptionMessage(pair);
+		}
+	}
+
+	private async ValueTask<ResolvedEvent> ResolveLinkToEvent(EventRecord eventRecord, long commitPosition, CancellationToken token) {
+		if (eventRecord.EventType is SystemEventTypes.LinkTo) {
+			try {
+				string[] parts = Helper.UTF8NoBom.GetString(eventRecord.Data.Span).Split('@', 2);
+				long eventNumber = long.Parse(parts[0]);
+				string streamName = parts[1];
+				var streamId = _readIndex.GetStreamId(streamName);
+				var res = await _readIndex.ReadEvent(streamName, streamId, eventNumber, token);
+				if (res.Result is ReadEventResult.Success)
+					return ResolvedEvent.ForResolvedLink(res.Record, eventRecord, commitPosition);
+
+				return ResolvedEvent.ForFailedResolvedLink(eventRecord, res.Result, commitPosition);
+			} catch (Exception exc) {
+				Log.Error(exc, "Error while resolving link for event record: {eventRecord}",
+					eventRecord.ToString());
+			}
+
+			return ResolvedEvent.ForFailedResolvedLink(eventRecord, ReadEventResult.Error, commitPosition);
+		}
+
+		return ResolvedEvent.ForUnresolvedEvent(eventRecord, commitPosition);
+	}
+
+	public void Handle(ClientMessage.PersistentSubscriptionAckEvents message) {
+		if (!_started)
+			return;
+		PersistentSubscription subscription;
+		if (_subscriptionsById.TryGetValue(message.SubscriptionId, out subscription)) {
+			subscription.AcknowledgeMessagesProcessed(message.CorrelationId, message.ProcessedEventIds);
+		}
+	}
+
+	public void Handle(ClientMessage.PersistentSubscriptionNackEvents message) {
+		if (!_started)
+			return;
+		PersistentSubscription subscription;
+		if (_subscriptionsById.TryGetValue(message.SubscriptionId, out subscription)) {
+			subscription.NotAcknowledgeMessagesProcessed(message.CorrelationId, message.ProcessedEventIds,
+				(NakAction)message.Action, message.Message);
+		}
+	}
+
+	public void Handle(ClientMessage.ReadNextNPersistentMessages message) {
+		if (!_started)
+			return;
+
+		if (string.IsNullOrEmpty(message.EventStreamId)) {
+			message.Envelope.ReplyWith(new ClientMessage.ReadNextNPersistentMessagesCompleted(
+				message.CorrelationId,
+				ClientMessage.ReadNextNPersistentMessagesCompleted.ReadNextNPersistentMessagesResult.Fail,
+				"Bad stream name.", null));
+			return;
+		}
+
+		if (message.EventStreamId == SystemStreams.AllStream) {
+			message.Envelope.ReplyWith(new ClientMessage.ReadNextNPersistentMessagesCompleted(
+				message.CorrelationId,
+				ClientMessage.ReadNextNPersistentMessagesCompleted.ReadNextNPersistentMessagesResult.Fail,
+				"Persistent subscriptions to $all are only supported over gRPC through gRPC clients", null));
+			return;
+		}
+
+		List<PersistentSubscription> subscribers;
+		if (!_subscriptionTopics.TryGetValue(message.EventStreamId, out subscribers)) {
+			message.Envelope.ReplyWith(
+				new ClientMessage.ReadNextNPersistentMessagesCompleted(message.CorrelationId,
+					ClientMessage.ReadNextNPersistentMessagesCompleted.ReadNextNPersistentMessagesResult
+						.DoesNotExist,
+					"Not found.",
+					null));
+			return;
+		}
+
+		var key = BuildSubscriptionGroupKey(message.EventStreamId, message.GroupName);
+		PersistentSubscription subscription;
+		if (!_subscriptionsById.TryGetValue(key, out subscription)) {
+			message.Envelope.ReplyWith(
+				new ClientMessage.ReadNextNPersistentMessagesCompleted(message.CorrelationId,
+					ClientMessage.ReadNextNPersistentMessagesCompleted.ReadNextNPersistentMessagesResult
+						.DoesNotExist,
+					"Not found.",
+					null));
+			return;
+		}
+
+		var messages = subscription.GetNextNOrLessMessages(message.Count).ToArray();
+		message.Envelope.ReplyWith(
+			new ClientMessage.ReadNextNPersistentMessagesCompleted(message.CorrelationId,
+				ClientMessage.ReadNextNPersistentMessagesCompleted.ReadNextNPersistentMessagesResult.Success,
+				string.Format("{0} read.", messages.Length),
+				messages));
+	}
+
+	public void Handle(ClientMessage.ReplayParkedMessages message) {
+		PersistentSubscription subscription;
+		var key = BuildSubscriptionGroupKey(message.EventStreamId, message.GroupName);
+		Log.Debug("Replaying parked messages for persistent subscription {subscriptionKey} {to}",
+			key,
+			message.StopAt.HasValue ? $" (To: '{message.StopAt.ToString()}')" : " (All)");
+
+		if (message.StopAt.HasValue && message.StopAt.Value < 0) {
+			message.Envelope.ReplyWith(new ClientMessage.ReplayMessagesReceived(message.CorrelationId,
+				ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.Fail,
+				"Cannot stop replaying parked message at a negative version."));
+			return;
+		}
+
+		if (!_subscriptionsById.TryGetValue(key, out subscription)) {
+			message.Envelope.ReplyWith(new ClientMessage.ReplayMessagesReceived(message.CorrelationId,
+				ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.DoesNotExist,
+				"Unable to locate '" + key + "'"));
+			return;
+		}
+
+		subscription.RetryParkedMessages(message.StopAt);
+		message.Envelope.ReplyWith(new ClientMessage.ReplayMessagesReceived(message.CorrelationId,
+			ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.Success, ""));
+	}
+
+	public void Handle(ClientMessage.ReplayParkedMessage message) {
+		var key = BuildSubscriptionGroupKey(message.EventStreamId, message.GroupName);
+		PersistentSubscription subscription;
+
+		if (!_subscriptionsById.TryGetValue(key, out subscription)) {
+			message.Envelope.ReplyWith(new ClientMessage.ReplayMessagesReceived(message.CorrelationId,
+				ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.DoesNotExist,
+				"Unable to locate '" + key + "'"));
+			return;
+		}
+
+		subscription.RetrySingleParkedMessage(message.Event);
+		message.Envelope.ReplyWith(new ClientMessage.ReplayMessagesReceived(message.CorrelationId,
+			ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.Success, ""));
+	}
+
+	private void LoadConfiguration(Action continueWith) {
+		_ioDispatcher.ReadBackward(SystemStreams.PersistentSubscriptionConfig, -1, 1, false,
+			SystemAccounts.System, x => HandleLoadCompleted(continueWith, x), expires: DateTime.MaxValue);
+	}
+
+	private void HandleLoadCompleted(Action continueWith,
+		ClientMessage.ReadStreamEventsBackwardCompleted readStreamEventsBackwardCompleted) {
+		switch (readStreamEventsBackwardCompleted.Result) {
+			case ReadStreamResult.Success:
+				try {
+					_config =
+						PersistentSubscriptionConfig.FromSerializedForm(
+							readStreamEventsBackwardCompleted.Events[0].Event.Data);
+					foreach (var entry in _config.Entries) {
+						if (!_consumerStrategyRegistry.ValidateStrategy(entry.NamedConsumerStrategy)) {
+							Log.Error(
+								"A persistent subscription exists with an invalid consumer strategy '{strategy}'. Ignoring it.",
+								entry.NamedConsumerStrategy);
+							continue;
+						}
+
+						IPersistentSubscriptionEventSource eventSource;
+						if (entry.Stream == SystemStreams.AllStream) {
+							IEventFilter filter = null;
+							if (entry.Filter != null) {
+								var (success, reason) = EventFilter.TryParse(entry.Filter, out filter);
+								if (!success) {
+									Log.Error(
+										"Could not load filtered persistent subscription to $all for group {group}. The filter could not be parsed: '{reason}",
+										entry.Group, reason);
+									continue;
+								}
+							}
+
+							eventSource = new PersistentSubscriptionAllStreamEventSource(filter);
+						} else {
+							eventSource = new PersistentSubscriptionSingleStreamEventSource(entry.Stream);
+						}
+
+						var result = TryCreateSubscriptionGroup(eventSource,
+							entry.Group,
+							entry.ResolveLinkTos,
+#pragma warning disable 612
+							eventSource.GetStreamPositionFor(entry.StartPosition ?? entry.StartFrom.ToString()),
+#pragma warning restore 612
+							entry.ExtraStatistics,
+							entry.MaxRetryCount,
+							entry.LiveBufferSize,
+							entry.HistoryBufferSize,
+							entry.ReadBatchSize,
+							ToCheckPointAfterTimeout(entry.CheckPointAfter),
+							entry.MinCheckPointCount,
+							entry.MaxCheckPointCount,
+							entry.MaxSubscriberCount,
+							entry.NamedConsumerStrategy,
+							ToMessageTimeout(entry.MessageTimeout));
+
+						if (!result) {
+							var key = BuildSubscriptionGroupKey(eventSource.ToString(), entry.Group);
+							Log.Warning("A duplicate persistent subscription: {subscriptionKey} was found in the configuration. Ignoring it.", key);
+						}
+
+					}
+
+					continueWith();
+				} catch (Exception ex) {
+					Log.Error(ex, "There was an error loading configuration from storage.");
+				}
+
+				break;
+			case ReadStreamResult.NoStream:
+				_config = new PersistentSubscriptionConfig { Version = "2" };
+				continueWith();
+				break;
+			default:
+				throw new Exception(readStreamEventsBackwardCompleted.Result +
+									" is an unexpected result writing subscription configuration.");
+		}
+	}
+
+	private void SaveConfiguration(Action continueWith) {
+		Log.Debug("Saving persistent subscription configuration");
+		var data = _config.GetSerializedForm();
+		var ev = new Event(Guid.NewGuid(), SystemEventTypes.PersistentSubscriptionConfig, true, data, new byte[0]);
+		var metadata = new StreamMetadata(maxCount: 2);
+		Lazy<StreamMetadata> streamMetadata = new Lazy<StreamMetadata>(() => metadata);
+		Event[] events = new Event[] { ev };
+		_ioDispatcher.ConfigureStreamAndWriteEvents(SystemStreams.PersistentSubscriptionConfig,
+			ExpectedVersion.Any, streamMetadata, events, SystemAccounts.System,
+			x => HandleSaveConfigurationCompleted(continueWith, x));
+	}
+
+	private void HandleSaveConfigurationCompleted(Action continueWith, ClientMessage.WriteEventsCompleted obj) {
+		switch (obj.Result) {
+			case OperationResult.Success:
+				continueWith();
+				break;
+			case OperationResult.CommitTimeout:
+			case OperationResult.PrepareTimeout:
+				Log.Information("Timeout while trying to save persistent subscription configuration. Retrying");
+				SaveConfiguration(continueWith);
+				break;
+			default:
+				throw new Exception(obj.Result +
+									" is an unexpected result writing persistent subscription configuration.");
+		}
+	}
+
+	public void Handle(TelemetryMessage.Request message) {
+		message.Envelope.ReplyWith(new TelemetryMessage.Response("persistentSubscriptions", new JsonObject {
+			["count"] = _subscriptionsById?.Count ?? 0
+		}));
+	}
+
+	public void Handle(MonitoringMessage.GetPersistentSubscriptionStats message) {
+		if (!_started) {
+			message.Envelope.ReplyWith(new MonitoringMessage.GetPersistentSubscriptionStatsCompleted(
+				MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotReady, null)
+			);
+			return;
+		}
+
+		List<PersistentSubscription> subscribers;
+		if (!_subscriptionTopics.TryGetValue(message.EventStreamId, out subscribers) || subscribers == null) {
+			message.Envelope.ReplyWith(new MonitoringMessage.GetPersistentSubscriptionStatsCompleted(
+				MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotFound, null)
+			);
+			return;
+		}
+
+		var subscription = subscribers.FirstOrDefault(x => x.GroupName == message.GroupName);
+		if (subscription == null) {
+			message.Envelope.ReplyWith(new MonitoringMessage.GetPersistentSubscriptionStatsCompleted(
+				MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotFound, null)
+			);
+			return;
+		}
+
+		var stats = new List<MonitoringMessage.PersistentSubscriptionInfo>() {
+			subscription.GetStatistics()
+		};
+		message.Envelope.ReplyWith(new MonitoringMessage.GetPersistentSubscriptionStatsCompleted(
+			MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.Success, stats)
+		);
+	}
+
+	public void Handle(MonitoringMessage.GetStreamPersistentSubscriptionStats message) {
+		if (!_started) {
+			message.Envelope.ReplyWith(new MonitoringMessage.GetPersistentSubscriptionStatsCompleted(
+				MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotReady, null)
+			);
+			return;
+		}
+
+		List<PersistentSubscription> subscribers;
+		if (!_subscriptionTopics.TryGetValue(message.EventStreamId, out subscribers)) {
+			message.Envelope.ReplyWith(new MonitoringMessage.GetPersistentSubscriptionStatsCompleted(
+				MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotFound, null)
+			);
+			return;
+		}
+
+		var stats = subscribers.Select(sub => sub.GetStatistics()).ToList();
+		message.Envelope.ReplyWith(new MonitoringMessage.GetPersistentSubscriptionStatsCompleted(
+			MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.Success, stats)
+		);
+	}
+
+	public void Handle(MonitoringMessage.GetAllPersistentSubscriptionStats message) {
+		if (!_started) {
+			message.Envelope.ReplyWith(new MonitoringMessage.GetPersistentSubscriptionStatsCompleted(
+				MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotReady, null)
+			);
+			return;
+		}
+
+		var total = _sortedSubscriptionTopics.Count;
+		var pageOffset = Math.Clamp(message.Offset, 0, total);
+		var pageLength = Math.Clamp(message.Count, 0, total - pageOffset);
+		var topics = new List<PersistentSubscription>[pageLength];
+		for (var i = 0; i < pageLength; i++) {
+			topics[i] = _sortedSubscriptionTopics.Values[i + pageOffset];
+		}
+
+		var stats = (from subscription in topics
+					 from sub in subscription
+					 select sub.GetStatistics()).ToList();
+		message.Envelope.ReplyWith(new MonitoringMessage.GetPersistentSubscriptionStatsCompleted(
+			MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.Success,
+			stats,
+			requestedOffset: message.Offset,
+			requestedCount: message.Count,
+			total: total));
+	}
+
+	public void Handle(SubscriptionMessage.PersistentSubscriptionTimerTick message) {
+		if (!_handleTick || _timerTickCorrelationId != message.CorrelationId)
+			return;
+		try {
+			WakeSubscriptions();
+		} finally {
+			_timerTickCorrelationId = Guid.NewGuid();
+			_bus.Publish(TimerMessage.Schedule.Create(TimeSpan.FromMilliseconds(1000),
+				_bus,
+				new SubscriptionMessage.PersistentSubscriptionTimerTick(_timerTickCorrelationId)));
+		}
+	}
+
+	private void WakeSubscriptions() {
+		var now = DateTime.UtcNow;
+
+		foreach (var subscription in _subscriptionsById.Values) {
+			subscription.NotifyClockTick(now);
+		}
+	}
+
+
+	private TimeSpan ToCheckPointAfterTimeout(int milliseconds) {
+		return milliseconds == 0 ? TimeSpan.MaxValue : TimeSpan.FromMilliseconds(milliseconds);
+	}
+
+	private TimeSpan ToMessageTimeout(int milliseconds) {
+		return milliseconds == 0 ? TimeSpan.Zero : TimeSpan.FromMilliseconds(milliseconds);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionSingleStreamEventSource.cs b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionSingleStreamEventSource.cs
new file mode 100644
index 00000000000..956fc0f7cc6
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionSingleStreamEventSource.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public class PersistentSubscriptionSingleStreamEventSource : IPersistentSubscriptionEventSource {
+	public bool FromStream => true;
+	public string EventStreamId { get; }
+	public bool FromAll => false;
+	public IEventFilter EventFilter => null;
+
+	public PersistentSubscriptionSingleStreamEventSource(string eventStreamId) {
+		EventStreamId = eventStreamId ?? throw new ArgumentNullException(nameof(eventStreamId));
+	}
+	public override string ToString() => EventStreamId;
+	public IPersistentSubscriptionStreamPosition StreamStartPosition => new PersistentSubscriptionSingleStreamPosition(0L);
+	public IPersistentSubscriptionStreamPosition GetStreamPositionFor(ResolvedEvent @event) => new PersistentSubscriptionSingleStreamPosition(@event.OriginalEventNumber);
+	public IPersistentSubscriptionStreamPosition GetStreamPositionFor(string checkpoint) => new PersistentSubscriptionSingleStreamPosition(long.Parse(checkpoint));
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionSingleStreamPosition.cs b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionSingleStreamPosition.cs
new file mode 100644
index 00000000000..2918f5913de
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionSingleStreamPosition.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+using System;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public class PersistentSubscriptionSingleStreamPosition : IPersistentSubscriptionStreamPosition {
+	public bool IsSingleStreamPosition => true;
+	public long StreamEventNumber { get; }
+	public bool IsAllStreamPosition => false;
+	public bool IsLivePosition => StreamEventNumber == -1L;
+	public (long Commit, long Prepare) TFPosition => throw new InvalidOperationException();
+	public PersistentSubscriptionSingleStreamPosition(long eventNumber) {
+		StreamEventNumber = eventNumber;
+	}
+	public bool Equals(IPersistentSubscriptionStreamPosition? other) {
+		if (other == null)
+			throw new InvalidOperationException();
+		if (!(other is PersistentSubscriptionSingleStreamPosition))
+			throw new InvalidOperationException();
+		return StreamEventNumber.Equals(other.StreamEventNumber);
+	}
+
+	public int CompareTo(IPersistentSubscriptionStreamPosition? other) {
+		if (other == null)
+			throw new InvalidOperationException();
+		if (!(other is PersistentSubscriptionSingleStreamPosition))
+			throw new InvalidOperationException();
+		return StreamEventNumber.CompareTo(other.StreamEventNumber);
+	}
+
+	public override string ToString() => StreamEventNumber.ToString();
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionState.cs b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionState.cs
new file mode 100644
index 00000000000..131bece8649
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionState.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+[Flags]
+public enum PersistentSubscriptionState {
+	NotReady = 0x00,
+	Behind = 0x01,
+	OutstandingPageRequest = 0x02,
+	ReplayingParkedMessages = 0x04,
+	Live = 0x08,
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionStats.cs b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionStats.cs
new file mode 100644
index 00000000000..c5251e66d37
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionStats.cs
@@ -0,0 +1,123 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+using KurrentDB.Core.Messages;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public class PersistentSubscriptionStats {
+	private long _totalItems;
+	private TimeSpan _lastTotalTime;
+	private long _lastTotalItems;
+	private IPersistentSubscriptionStreamPosition _lastCheckpointedEventPosition;
+	private IPersistentSubscriptionStreamPosition _lastKnownEventPosition;
+	private readonly PersistentSubscription _parent;
+	private readonly Stopwatch _totalTimeWatch;
+	private readonly PersistentSubscriptionParams _settings;
+
+	public PersistentSubscriptionStats(PersistentSubscription parent, PersistentSubscriptionParams settings,
+		Stopwatch totalTimeWatch) {
+		_settings = settings;
+		_parent = parent;
+		_totalTimeWatch = totalTimeWatch;
+	}
+
+	public void IncrementProcessed() {
+		Interlocked.Increment(ref _totalItems);
+	}
+
+	public void SetLastCheckPoint(IPersistentSubscriptionStreamPosition lastCheckpointedEventPosition) {
+		_lastCheckpointedEventPosition = lastCheckpointedEventPosition;
+	}
+
+	public void SetLastKnownEventPosition(IPersistentSubscriptionStreamPosition knownEventPosition) {
+		if (knownEventPosition == null)
+			return;
+		if (_lastKnownEventPosition == null || _lastKnownEventPosition.CompareTo(knownEventPosition) < 0)
+			_lastKnownEventPosition = knownEventPosition;
+	}
+
+	public MonitoringMessage.PersistentSubscriptionInfo GetStatistics() {
+		long oldestParkedMessage = 0;
+		var totalTime = _totalTimeWatch.Elapsed;
+		var totalItems = Interlocked.Read(ref _totalItems);
+
+		var lastRunMs = totalTime - _lastTotalTime;
+		var lastItems = totalItems - _lastTotalItems;
+
+		var avgItemsPerSecond =
+			lastRunMs.Ticks != 0 ? (int)(TimeSpan.TicksPerSecond * lastItems / lastRunMs.Ticks) : 0;
+		_lastTotalTime = totalTime;
+		_lastTotalItems = totalItems;
+		var connections = new List<MonitoringMessage.ConnectionInfo>();
+		var totalInflight = 0;
+		foreach (var conn in _parent._pushClients.GetAll()) {
+			var connItems = conn.TotalItems;
+			var connLastItems = connItems - conn.LastTotalItems;
+			conn.LastTotalItems = connItems;
+			var connAvgItemsPerSecond = lastRunMs.Ticks != 0
+				? (int)(TimeSpan.TicksPerSecond * connLastItems / lastRunMs.Ticks)
+				: 0;
+			var extraStats = conn.GetExtraStats();
+			var stats = extraStats == null ? new List<Measurement>() : extraStats.Measurements;
+			totalInflight += conn.InflightMessages;
+			connections.Add(new MonitoringMessage.ConnectionInfo {
+				From = conn.From,
+				Username = conn.Username,
+				AverageItemsPerSecond = connAvgItemsPerSecond,
+				TotalItems = conn.TotalItems,
+				InFlightMessages = conn.InflightMessages,
+				AvailableSlots = conn.AvailableSlots,
+				CountSinceLastMeasurement = connLastItems,
+				ObservedMeasurements = stats,
+				ConnectionName = conn.ConnectionName,
+			});
+		}
+
+		long parkedMessageCount = _settings.MessageParker.ParkedMessageCount;
+
+		var timeStamp = _settings.MessageParker.GetOldestParkedMessage;
+
+		if (timeStamp.HasValue) {
+			oldestParkedMessage = (long)(DateTime.UtcNow - timeStamp.Value).TotalSeconds;
+		}
+
+		var gotBuffer = _parent.TryGetStreamBuffer(out var streamBuffer);
+
+		return new MonitoringMessage.PersistentSubscriptionInfo() {
+			EventSource = _parent.EventSource.ToString(),
+			GroupName = _parent.GroupName,
+			Status = _parent.State.ToString(),
+			Connections = connections,
+			AveragePerSecond = avgItemsPerSecond,
+			LastCheckpointedEventPosition = _lastCheckpointedEventPosition?.ToString(),
+			LastKnownEventPosition = _lastKnownEventPosition?.ToString(),
+			TotalItems = totalItems,
+			CountSinceLastMeasurement = lastItems,
+			CheckPointAfterMilliseconds = (int)_settings.CheckPointAfter.TotalMilliseconds,
+			BufferSize = _settings.BufferSize,
+			LiveBufferSize = _settings.LiveBufferSize,
+			MaxCheckPointCount = _settings.MaxCheckPointCount,
+			MaxRetryCount = _settings.MaxRetryCount,
+			MessageTimeoutMilliseconds = (int)_settings.MessageTimeout.TotalMilliseconds,
+			MinCheckPointCount = _settings.MinCheckPointCount,
+			ReadBatchSize = _settings.ReadBatchSize,
+			ResolveLinktos = _settings.ResolveLinkTos,
+			StartFrom = _settings.StartFrom?.ToString(),
+			ReadBufferCount = gotBuffer ? streamBuffer.ReadBufferCount : 0,
+			RetryBufferCount = gotBuffer ? streamBuffer.RetryBufferCount : 0,
+			LiveBufferCount = gotBuffer ? streamBuffer.LiveBufferCount : 0,
+			ExtraStatistics = _settings.ExtraStatistics,
+			TotalInFlightMessages = totalInflight,
+			OutstandingMessagesCount = _parent.OutstandingMessageCount,
+			NamedConsumerStrategy = _settings.ConsumerStrategy.Name,
+			MaxSubscriberCount = _settings.MaxSubscriberCount,
+			ParkedMessageCount = parkedMessageCount,
+			OldestParkedMessage = oldestParkedMessage
+		};
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionStreamReader.cs b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionStreamReader.cs
new file mode 100644
index 00000000000..d3afb0d02b5
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionStreamReader.cs
@@ -0,0 +1,182 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.UserManagement;
+using Serilog;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public class PersistentSubscriptionStreamReader : IPersistentSubscriptionStreamReader {
+	private static readonly ILogger Log = Serilog.Log.ForContext<PersistentSubscriptionStreamReader>();
+
+	public const int MaxPullBatchSize = 500;
+	private const int MaxRetryTimeSecs = 60;
+	private const int MaxExponentialBackoffPower = 10; /*to prevent integer overflow*/
+
+	private readonly IODispatcher _ioDispatcher;
+	private readonly int _maxPullBatchSize;
+	private readonly Random _random = new Random();
+
+	public PersistentSubscriptionStreamReader(IODispatcher ioDispatcher, int maxPullBatchSize) {
+		_ioDispatcher = ioDispatcher;
+		_maxPullBatchSize = maxPullBatchSize;
+	}
+
+	public void BeginReadEvents(IPersistentSubscriptionEventSource eventSource,
+		IPersistentSubscriptionStreamPosition startPosition, int countToLoad, int batchSize,
+		int maxWindowSize, bool resolveLinkTos, bool skipFirstEvent,
+		Action<IReadOnlyList<ResolvedEvent>, IPersistentSubscriptionStreamPosition, bool> onEventsFound,
+		Action<IPersistentSubscriptionStreamPosition, long> onEventsSkipped,
+		Action<string> onError) {
+		BeginReadEventsInternal(eventSource, startPosition, countToLoad, batchSize, maxWindowSize, resolveLinkTos,
+			skipFirstEvent, onEventsFound, onEventsSkipped, onError, 0);
+	}
+
+	private int GetBackOffDelay(int retryCount) {
+		//exponential backoff + jitter
+		return 1 + _random.Next(0, 1 + Math.Min(MaxRetryTimeSecs, (1 << Math.Min(retryCount, MaxExponentialBackoffPower))));
+	}
+
+	private void BeginReadEventsInternal(IPersistentSubscriptionEventSource eventSource,
+		IPersistentSubscriptionStreamPosition startPosition, int countToLoad, int batchSize, int maxWindowSize, bool resolveLinkTos, bool skipFirstEvent,
+		Action<IReadOnlyList<ResolvedEvent>, IPersistentSubscriptionStreamPosition, bool> onEventsFound,
+		Action<IPersistentSubscriptionStreamPosition, long> onEventsSkipped,
+		Action<string> onError, int retryCount) {
+		var actualBatchSize = GetBatchSize(batchSize);
+
+		if (eventSource.FromStream) {
+			_ioDispatcher.ReadForward(
+				eventSource.EventStreamId, startPosition.StreamEventNumber, Math.Min(countToLoad, actualBatchSize),
+				resolveLinkTos, SystemAccounts.System, new ResponseHandler(onEventsFound, onEventsSkipped, onError, skipFirstEvent).FetchCompleted,
+				async () => await HandleTimeout(eventSource.EventStreamId),
+				Guid.NewGuid());
+		} else if (eventSource.FromAll) {
+			if (eventSource.EventFilter is null) {
+				_ioDispatcher.ReadAllForward(
+					startPosition.TFPosition.Commit,
+					startPosition.TFPosition.Prepare,
+					Math.Min(countToLoad, actualBatchSize),
+					resolveLinkTos,
+					true,
+					null,
+					SystemAccounts.System,
+					null,
+					new ResponseHandler(onEventsFound, onEventsSkipped, onError, skipFirstEvent).FetchAllCompleted,
+					async () => await HandleTimeout(SystemStreams.AllStream),
+					Guid.NewGuid());
+			} else {
+				var maxSearchWindow = Math.Max(actualBatchSize, maxWindowSize);
+				_ioDispatcher.ReadAllForwardFiltered(
+					startPosition.TFPosition.Commit,
+					startPosition.TFPosition.Prepare,
+					Math.Min(countToLoad, actualBatchSize),
+					resolveLinkTos,
+					true,
+					maxSearchWindow,
+					null,
+					eventSource.EventFilter,
+					SystemAccounts.System,
+					null,
+					new ResponseHandler(onEventsFound, onEventsSkipped, onError, skipFirstEvent).FetchAllFilteredCompleted,
+					async () => await HandleTimeout($"{SystemStreams.AllStream} with filter {eventSource.EventFilter}"),
+					Guid.NewGuid());
+			}
+		} else {
+			throw new InvalidOperationException();
+		}
+
+		async Task HandleTimeout(string streamName) {
+			var backOff = GetBackOffDelay(retryCount);
+			Log.Warning(
+				"Timed out reading from stream: {stream}. Retrying in {retryInterval} seconds.",
+				streamName, backOff);
+			await Task.Delay(TimeSpan.FromSeconds(backOff));
+			BeginReadEventsInternal(eventSource, startPosition, countToLoad, batchSize, maxWindowSize, resolveLinkTos,
+				skipFirstEvent, onEventsFound, onEventsSkipped, onError, retryCount + 1);
+		}
+	}
+
+	private int GetBatchSize(int batchSize) {
+		return Math.Min(Math.Min(batchSize == 0 ? 20 : batchSize, MaxPullBatchSize), _maxPullBatchSize);
+	}
+
+	private class ResponseHandler {
+		private readonly Action<IReadOnlyList<ResolvedEvent>, IPersistentSubscriptionStreamPosition, bool> _onFetchCompleted;
+		private readonly Action<IPersistentSubscriptionStreamPosition, long> _onEventsSkipped;
+		private readonly Action<string> _onError;
+		private readonly bool _skipFirstEvent;
+
+		public ResponseHandler(Action<IReadOnlyList<ResolvedEvent>, IPersistentSubscriptionStreamPosition, bool> onFetchCompleted,
+			Action<IPersistentSubscriptionStreamPosition, long> onEventsSkipped, Action<string> onError, bool skipFirstEvent) {
+			_onFetchCompleted = onFetchCompleted;
+			_onEventsSkipped = onEventsSkipped;
+			_skipFirstEvent = skipFirstEvent;
+			_onError = onError;
+		}
+
+		public void FetchCompleted(ClientMessage.ReadStreamEventsForwardCompleted msg) {
+			switch (msg.Result) {
+				case ReadStreamResult.Success:
+					_onFetchCompleted(_skipFirstEvent ? msg.Events.Skip(1).ToArray() : msg.Events,
+						new PersistentSubscriptionSingleStreamPosition(msg.NextEventNumber), msg.IsEndOfStream);
+					break;
+				case ReadStreamResult.NoStream:
+					_onFetchCompleted(
+						Array.Empty<ResolvedEvent>(),
+						new PersistentSubscriptionSingleStreamPosition(0),
+						msg.IsEndOfStream);
+					break;
+				case ReadStreamResult.AccessDenied:
+					_onError($"Read access denied for stream: {msg.EventStreamId}");
+					break;
+				default:
+					_onError(msg.Error ?? $"Error reading stream: {msg.EventStreamId} at event number: {msg.FromEventNumber}");
+					break;
+			}
+		}
+
+		public void FetchAllCompleted(ClientMessage.ReadAllEventsForwardCompleted msg) {
+			switch (msg.Result) {
+				case ReadAllResult.Success:
+					_onFetchCompleted(_skipFirstEvent ? msg.Events.Skip(1).ToArray() : msg.Events,
+						new PersistentSubscriptionAllStreamPosition(msg.NextPos.CommitPosition, msg.NextPos.PreparePosition), msg.IsEndOfStream);
+					break;
+				case ReadAllResult.AccessDenied:
+					_onError($"Read access denied for stream: {SystemStreams.AllStream}");
+					break;
+				default:
+					_onError(msg.Error ?? $"Error reading stream: {SystemStreams.AllStream} at position: {msg.CurrentPos}");
+					break;
+			}
+		}
+		public void FetchAllFilteredCompleted(ClientMessage.FilteredReadAllEventsForwardCompleted msg) {
+			switch (msg.Result) {
+				case FilteredReadAllResult.Success:
+					if (msg.Events is [] && msg.ConsideredEventsCount > 0) {
+						// Checkpoint on the position we read from rather than the next position
+						// to prevent skipping the next event when loading from the checkpoint
+						_onEventsSkipped(
+							new PersistentSubscriptionAllStreamPosition(msg.CurrentPos.CommitPosition, msg.CurrentPos.PreparePosition),
+							msg.ConsideredEventsCount);
+					}
+					_onFetchCompleted(_skipFirstEvent ? msg.Events.Skip(1).ToArray() : msg.Events,
+						new PersistentSubscriptionAllStreamPosition(msg.NextPos.CommitPosition, msg.NextPos.PreparePosition), msg.IsEndOfStream);
+
+					break;
+				case FilteredReadAllResult.AccessDenied:
+					_onError($"Read access denied for stream: {SystemStreams.AllStream}");
+					break;
+				default:
+					_onError(msg.Error ?? $"Error reading stream: {SystemStreams.AllStream} at position: {msg.CurrentPos}");
+					break;
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionToAllParamsBuilder.cs b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionToAllParamsBuilder.cs
new file mode 100644
index 00000000000..ed620b29fd8
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionToAllParamsBuilder.cs
@@ -0,0 +1,59 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+/// <summary>
+/// Builds a <see cref="PersistentSubscriptionParams"/> object.
+/// </summary>
+public class PersistentSubscriptionToAllParamsBuilder : PersistentSubscriptionParamsBuilder {
+	/// <summary>
+	/// Creates a new <see cref="PersistentSubscriptionParamsBuilder"></see> object
+	/// </summary>
+	/// <param name="groupName">The name of the group of the subscription</param>
+	/// <param name="filter">The optional filter for the subscription</param>
+	/// <returns>a new <see cref="PersistentSubscriptionParamsBuilder"></see> object</returns>
+	public static PersistentSubscriptionParamsBuilder CreateFor(string groupName, IEventFilter filter = null) {
+		return new PersistentSubscriptionToAllParamsBuilder()
+			.FromAll(filter)
+			.StartFrom(0L, 0L)
+			.SetGroup(groupName)
+			.SetSubscriptionId("$all" + ":" + groupName)
+			.DoNotResolveLinkTos()
+			.WithMessageTimeoutOf(TimeSpan.FromSeconds(30))
+			.WithHistoryBufferSizeOf(500)
+			.WithLiveBufferSizeOf(500)
+			.WithMaxRetriesOf(10)
+			.WithReadBatchOf(20)
+			.CheckPointAfter(TimeSpan.FromSeconds(1))
+			.MinimumToCheckPoint(5)
+			.MaximumToCheckPoint(1000)
+			.MaximumSubscribers(0)
+			.WithNamedConsumerStrategy(new RoundRobinPersistentSubscriptionConsumerStrategy());
+	}
+
+	public PersistentSubscriptionToAllParamsBuilder FromAll(IEventFilter filter = null) {
+		WithEventSource(new PersistentSubscriptionAllStreamEventSource(filter));
+		return this;
+	}
+
+	public PersistentSubscriptionToAllParamsBuilder StartFrom(long commitPosition, long preparePosition) {
+		StartFrom(new PersistentSubscriptionAllStreamPosition(commitPosition, preparePosition));
+		return this;
+	}
+
+	public override PersistentSubscriptionParamsBuilder StartFromBeginning() {
+		StartFrom(new PersistentSubscriptionAllStreamPosition(0, 0));
+		return this;
+	}
+
+	public override PersistentSubscriptionParamsBuilder StartFromCurrent() {
+		StartFrom(new PersistentSubscriptionAllStreamPosition(-1, -1));
+		return this;
+	}
+
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionToStreamParamsBuilder.cs b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionToStreamParamsBuilder.cs
new file mode 100644
index 00000000000..7d94a9133f0
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/PersistentSubscriptionToStreamParamsBuilder.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+/// <summary>
+/// Builds a <see cref="PersistentSubscriptionParams"/> object.
+/// </summary>
+public class PersistentSubscriptionToStreamParamsBuilder : PersistentSubscriptionParamsBuilder {
+	/// <summary>
+	/// Creates a new <see cref="PersistentSubscriptionParamsBuilder"></see> object
+	/// </summary>
+	/// <param name="streamName">The name of the stream for the subscription</param>
+	/// <param name="groupName">The name of the group of the subscription</param>
+	/// <returns>a new <see cref="PersistentSubscriptionParamsBuilder"></see> object</returns>
+	public static PersistentSubscriptionParamsBuilder CreateFor(string streamName, string groupName) {
+		return new PersistentSubscriptionToStreamParamsBuilder()
+			.FromStream(streamName)
+			.StartFrom(0)
+			.SetGroup(groupName)
+			.SetSubscriptionId(streamName + ":" + groupName)
+			.DoNotResolveLinkTos()
+			.WithMessageTimeoutOf(TimeSpan.FromSeconds(30))
+			.WithHistoryBufferSizeOf(500)
+			.WithLiveBufferSizeOf(500)
+			.WithMaxRetriesOf(10)
+			.WithReadBatchOf(20)
+			.CheckPointAfter(TimeSpan.FromSeconds(1))
+			.MinimumToCheckPoint(5)
+			.MaximumToCheckPoint(1000)
+			.MaximumSubscribers(0)
+			.WithNamedConsumerStrategy(new RoundRobinPersistentSubscriptionConsumerStrategy());
+	}
+
+	public PersistentSubscriptionToStreamParamsBuilder FromStream(string stream) {
+		WithEventSource(new PersistentSubscriptionSingleStreamEventSource(stream));
+		return this;
+	}
+
+	public PersistentSubscriptionToStreamParamsBuilder StartFrom(long startFrom) {
+		StartFrom(new PersistentSubscriptionSingleStreamPosition(startFrom));
+		return this;
+	}
+
+	public override PersistentSubscriptionParamsBuilder StartFromBeginning() {
+		StartFrom(new PersistentSubscriptionSingleStreamPosition(0));
+		return this;
+	}
+
+	public override PersistentSubscriptionParamsBuilder StartFromCurrent() {
+		StartFrom(new PersistentSubscriptionSingleStreamPosition(-1));
+		return this;
+	}
+
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/RequestStatistics.cs b/src/KurrentDB.Core/Services/PersistentSubscription/RequestStatistics.cs
new file mode 100644
index 00000000000..ef56d1eacb1
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/RequestStatistics.cs
@@ -0,0 +1,102 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public class RequestStatistics {
+	private readonly Func<long> _getElapsedTicks;
+
+	//TODO CC this can likely be done in a smarter way (though a few thousand ints is still pretty cheap memory wise)
+	private readonly Queue<long> _measurements;
+	private readonly ConcurrentDictionary<Guid, Operation> _operations = new();
+	private readonly int _windowSize;
+
+	public RequestStatistics(Func<long> getElapsedTicks, int windowSize) {
+		_getElapsedTicks = getElapsedTicks;
+		_windowSize = windowSize;
+		_measurements = new Queue<long>(windowSize);
+	}
+
+	public RequestStatistics(Stopwatch watch, int windowSize) : this(() => watch.ElapsedTicks, windowSize) {
+	}
+
+	public void StartOperation(Guid id) {
+		var record = new Operation { Start = _getElapsedTicks() };
+		_operations.AddOrUpdate(id, record, (_, _) => record);
+	}
+
+	public void EndOperation(Guid id) {
+		if (!_operations.TryRemove(id, out var record))
+			return;
+		var current = _getElapsedTicks();
+		var time = current - record.Start;
+		var ms = time / TimeSpan.TicksPerMillisecond;
+		if (_measurements.Count >= _windowSize) {
+			_measurements.Dequeue();
+		}
+
+		_measurements.Enqueue(ms);
+	}
+
+	public ObservedTimingMeasurement GetMeasurementDetails() {
+		var ret = new ObservedTimingMeasurement();
+		if (_measurements == null || _measurements.Count == 0)
+			return ret;
+		var items = _measurements.ToArray();
+		Array.Sort(items);
+		ret.Measurements.Add(Measurement.From("Mean", items.Sum() / items.Length));
+		ret.Measurements.Add(Measurement.From("Median", items[items.Length / 2]));
+		ret.Measurements.Add(Measurement.From("Fastest", items[0]));
+		for (var i = 0; i < 5; i++) {
+			ret.Measurements.Add(
+				Measurement.From("Quintile " + (i + 1), items[GetPercentile(i * 20, items.Length)]));
+		}
+
+		ret.Measurements.Add(Measurement.From("90%", items[GetPercentile(90m, items.Length)]));
+		ret.Measurements.Add(Measurement.From("95%", items[GetPercentile(95m, items.Length)]));
+		ret.Measurements.Add(Measurement.From("99%", items[GetPercentile(99m, items.Length)]));
+		ret.Measurements.Add(Measurement.From("99.5%", items[GetPercentile(99.5m, items.Length)]));
+		ret.Measurements.Add(Measurement.From("99.9%", items[GetPercentile(99.9m, items.Length)]));
+		ret.Measurements.Add(Measurement.From("Highest", items[^1]));
+		return ret;
+	}
+
+	public void ClearMeasurements() {
+		_measurements.Clear();
+	}
+
+	private int GetPercentile(decimal percentile, int size) {
+		decimal percent = 0;
+		percent = percentile / 100m;
+		var ret = (int)(percent * size);
+		if (ret == size)
+			ret -= 1;
+		return ret;
+	}
+
+	struct Operation {
+		public long Start;
+	}
+}
+
+public class ObservedTimingMeasurement {
+	public readonly List<Measurement> Measurements = new List<Measurement>();
+}
+
+public struct Measurement {
+	public readonly string Key;
+	public readonly long Value;
+
+	public Measurement(string key, long value) {
+		Key = key;
+		Value = value;
+	}
+
+	public static Measurement From(string key, long value) => new(key, value);
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/RetryableMessage.cs b/src/KurrentDB.Core/Services/PersistentSubscription/RetryableMessage.cs
new file mode 100644
index 00000000000..f7251f91aa7
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/RetryableMessage.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public struct RetryableMessage {
+	public readonly Guid MessageId;
+	public readonly DateTime DueTime;
+
+	public RetryableMessage(Guid messageId, DateTime dueTime) {
+		MessageId = messageId;
+		DueTime = dueTime;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/SequencedEvent.cs b/src/KurrentDB.Core/Services/PersistentSubscription/SequencedEvent.cs
new file mode 100644
index 00000000000..0c5b28c2800
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/SequencedEvent.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Data;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public struct SequencedEvent {
+	public readonly long Sequence;
+	public readonly ResolvedEvent Event;
+
+	public SequencedEvent(long sequence, ResolvedEvent @event) {
+		this.Sequence = sequence;
+		this.Event = @event;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/PersistentSubscription/StreamBuffer.cs b/src/KurrentDB.Core/Services/PersistentSubscription/StreamBuffer.cs
new file mode 100644
index 00000000000..a60c90641a2
--- /dev/null
+++ b/src/KurrentDB.Core/Services/PersistentSubscription/StreamBuffer.cs
@@ -0,0 +1,190 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using KurrentDB.Core.DataStructures;
+
+namespace KurrentDB.Core.Services.PersistentSubscription;
+
+public class StreamBuffer {
+	private readonly int _maxBufferSize;
+	private readonly IPersistentSubscriptionStreamPosition _initialSequence;
+	private readonly LinkedList<OutstandingMessage> _retry = new LinkedList<OutstandingMessage>();
+	private readonly LinkedList<OutstandingMessage> _buffer = new LinkedList<OutstandingMessage>();
+
+	private readonly BoundedQueue<OutstandingMessage> _liveBuffer;
+
+	public long LiveBufferCount {
+		get { return _liveBuffer.Count; }
+	}
+
+	public int BufferCount {
+		get { return _retry.Count + _buffer.Count; }
+	}
+
+	public int RetryBufferCount {
+		get { return _retry.Count; }
+	}
+
+	public int ReadBufferCount {
+		get { return _buffer.Count; }
+	}
+
+	public bool Live { get; private set; }
+
+	public bool CanAccept(int count) {
+		return _maxBufferSize - BufferCount > count;
+	}
+
+	public StreamBuffer(int maxBufferSize, int maxLiveBufferSize, IPersistentSubscriptionStreamPosition initialSequence, bool startInHistory) {
+		Live = !startInHistory;
+		_initialSequence = initialSequence;
+		_maxBufferSize = maxBufferSize;
+		_liveBuffer = new BoundedQueue<OutstandingMessage>(maxLiveBufferSize);
+	}
+
+	private void SwitchToLive() {
+		while (_liveBuffer.Count > 0) {
+			_buffer.AddLast(_liveBuffer.Dequeue());
+		}
+
+		Live = true;
+	}
+
+	private void DrainLiveTo(IPersistentSubscriptionStreamPosition eventPosition) {
+		while (_liveBuffer.Count > 0 && _liveBuffer.Peek().EventPosition.CompareTo(eventPosition) < 0) {
+			_liveBuffer.Dequeue();
+		}
+	}
+
+	public void AddRetry(OutstandingMessage ev) {
+		//add parked messages at the end of the list
+		if (ev.IsReplayedEvent) {
+			_retry.AddLast(ev);
+			return;
+		}
+
+		//if it's not a parked message, it should have an event position
+		Debug.Assert(ev.EventPosition != null);
+
+		// Insert the retried event before any events with higher version number.
+		var retryEventPosition = ev.EventPosition;
+
+		var currentNode = _retry.First;
+
+		while (currentNode != null) {
+			var currentEventPosition = currentNode.Value.EventPosition;
+			if (currentEventPosition is not null && retryEventPosition.CompareTo(currentEventPosition) < 0) {
+				_retry.AddBefore(currentNode, ev);
+				return;
+			}
+
+			currentNode = currentNode.Next;
+		}
+
+		_retry.AddLast(ev);
+	}
+
+	public void AddLiveMessage(OutstandingMessage ev) {
+		if (Live) {
+			if (_buffer.Count < _maxBufferSize)
+				_buffer.AddLast(ev);
+			else
+				Live = false;
+		}
+
+		_liveBuffer.Enqueue(ev);
+	}
+
+	public void AddReadMessage(OutstandingMessage ev) {
+		if (Live)
+			return;
+		if (_initialSequence != null &&
+			ev.EventPosition.CompareTo(_initialSequence) <= 0)
+			return;
+
+		var livePosition = TryPeekLive();
+		if (livePosition == null || ev.EventPosition.CompareTo(livePosition) < 0) {
+			_buffer.AddLast(ev);
+		} else if (livePosition.CompareTo(ev.EventPosition) < 0) {
+			DrainLiveTo(ev.EventPosition);
+			SwitchToLive();
+		} else {
+			SwitchToLive();
+		}
+	}
+
+	private IPersistentSubscriptionStreamPosition TryPeekLive() {
+		return _liveBuffer.Count == 0 ? null : _liveBuffer.Peek().EventPosition;
+	}
+
+	public IEnumerable<OutstandingMessagePointer> Scan() {
+		// This enumerator assumes that nothing is added to the buffers during enumeration.
+
+		foreach (var list in new[] { _retry, _buffer }) // save on code duplication
+		{
+			var current = list.First;
+			if (current != null) {
+				do {
+					// We have to copy next before yielding as the expectation is
+					// that current is removed from the list setting next to null.
+					var next = current.Next;
+
+					yield return new OutstandingMessagePointer(current);
+
+					current = next;
+				} while (current != null);
+			}
+		}
+	}
+
+	public bool TryMoveToLive() {
+		if (_liveBuffer.Count == 0) {
+			Live = true;
+			return true;
+		}
+
+		return false;
+	}
+
+	public (OutstandingMessage? message, long sequenceNumber) GetLowestRetry() {
+		(OutstandingMessage? message, long sequenceNumber) result = (null, long.MaxValue);
+		foreach (var x in _retry) {
+			if (x.IsReplayedEvent || !x.EventSequenceNumber.HasValue)
+				continue;
+			if (x.EventSequenceNumber.Value < result.sequenceNumber) {
+				result = (x, x.EventSequenceNumber.Value);
+			}
+		}
+		return result;
+	}
+
+	public struct OutstandingMessagePointer {
+		private readonly LinkedListNode<OutstandingMessage> _entry;
+
+		internal OutstandingMessagePointer(LinkedListNode<OutstandingMessage> entry)
+			: this() {
+			_entry = entry;
+		}
+
+		public OutstandingMessage Message {
+			get { return _entry.Value; }
+		}
+
+		public void MarkSent() {
+			if (_entry.List == null) {
+				throw new InvalidOperationException("The message can only be accepted once.");
+			}
+
+			_entry.List.Remove(_entry);
+		}
+	}
+}
+
+public enum BufferedStreamReaderState {
+	Unknown,
+	CatchingUp,
+	Live
+}
diff --git a/src/KurrentDB.Core/Services/RedactionService.cs b/src/KurrentDB.Core/Services/RedactionService.cs
new file mode 100644
index 00000000000..acb2d5faa64
--- /dev/null
+++ b/src/KurrentDB.Core/Services/RedactionService.cs
@@ -0,0 +1,254 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data.Redaction;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Synchronization;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using Serilog;
+
+namespace KurrentDB.Core.Services;
+
+public abstract class RedactionService {
+	protected static readonly ILogger Log = Serilog.Log.ForContext<RedactionService>();
+}
+
+public class RedactionService<TStreamId> :
+	RedactionService,
+	IAsyncHandle<RedactionMessage.GetEventPosition>,
+	IHandle<RedactionMessage.AcquireChunksLock>,
+	IAsyncHandle<RedactionMessage.SwitchChunk>,
+	IHandle<RedactionMessage.ReleaseChunksLock>,
+	IHandle<SystemMessage.BecomeShuttingDown> {
+
+	private readonly IQueuedHandler _queuedHandler;
+	private readonly TFChunkDb _db;
+	private readonly IReadIndex<TStreamId> _readIndex;
+	private readonly SemaphoreSlimLock _switchChunksLock;
+
+	private const string NewChunkFileExtension = ".tmp";
+
+	public RedactionService(
+		IQueuedHandler queuedHandler,
+		TFChunkDb db,
+		IReadIndex<TStreamId> readIndex,
+		SemaphoreSlimLock switchChunksLock) {
+
+		_queuedHandler = Ensure.NotNull(queuedHandler);
+		_db = Ensure.NotNull(db);
+		_readIndex = Ensure.NotNull(readIndex);
+		_switchChunksLock = Ensure.NotNull(switchChunksLock);
+	}
+
+	async ValueTask IAsyncHandle<RedactionMessage.GetEventPosition>.HandleAsync(RedactionMessage.GetEventPosition message, CancellationToken token) {
+		try {
+			await GetEventPosition(message.EventStreamId, message.EventNumber, message.Envelope, token);
+		} catch (Exception ex) {
+			Log.Error(ex, "REDACTION: An error has occurred when getting position for stream: {stream}, event number: {eventNumber}.",
+				message.EventStreamId, message.EventNumber);
+			message.Envelope.ReplyWith(new RedactionMessage.GetEventPositionCompleted(GetEventPositionResult.UnexpectedError, []));
+		}
+	}
+
+	private async ValueTask GetEventPosition(string streamName, long eventNumber, IEnvelope envelope, CancellationToken token) {
+		var streamId = _readIndex.GetStreamId(streamName);
+		var result = await _readIndex.ReadEventInfo_KeepDuplicates(streamId, eventNumber, token);
+
+		var eventPositions = new EventPosition[result.EventInfos.Length];
+
+		for (int i = 0; i < result.EventInfos.Length; i++) {
+			var eventInfo = result.EventInfos[i];
+			var logPos = eventInfo.LogPosition;
+			var chunk = await _db.Manager.GetInitializedChunkFor(logPos, token);
+			var localPosition = chunk.ChunkHeader.GetLocalLogPosition(logPos);
+			var chunkEventOffset = await chunk.GetActualRawPosition(localPosition, token);
+
+			eventPositions[i] = chunkEventOffset switch {
+				// all the events returned by ReadEventInfo_KeepDuplicates() must exist in the log
+				// since the log record was read from the chunk to check for hash collisions.
+				< 0 => throw new Exception($"Failed to fetch actual raw position for event at log position: {logPos}"),
+				> uint.MaxValue => throw new Exception($"Actual raw position for event at log position: {logPos} is larger than uint.MaxValue: {chunkEventOffset}"),
+				_ => new EventPosition(
+					logPosition: logPos,
+					chunkFile: Path.GetFileName(chunk.LocalFileName),
+					chunkVersion: chunk.ChunkHeader.MinCompatibleVersion,
+					chunkComplete: chunk.ChunkFooter is { IsCompleted: true },
+					chunkEventOffset: (uint)chunkEventOffset)
+			};
+		}
+
+		envelope.ReplyWith(new RedactionMessage.GetEventPositionCompleted(GetEventPositionResult.Success, eventPositions));
+	}
+
+	public void Handle(RedactionMessage.AcquireChunksLock message) {
+		if (_switchChunksLock.TryAcquire(out var acquisitionId)) {
+			Log.Information("REDACTION: Acquired the chunks lock");
+			message.Envelope.ReplyWith(new RedactionMessage.AcquireChunksLockCompleted(AcquireChunksLockResult.Success, acquisitionId));
+		} else {
+			Log.Information("REDACTION: Failed to acquire the chunks lock");
+			message.Envelope.ReplyWith(new RedactionMessage.AcquireChunksLockCompleted(AcquireChunksLockResult.Failed, Guid.Empty));
+		}
+	}
+
+	public void Handle(RedactionMessage.ReleaseChunksLock message) {
+		if (_switchChunksLock.TryRelease(message.AcquisitionId)) {
+			Log.Information("REDACTION: Released the chunks lock");
+			message.Envelope.ReplyWith(new RedactionMessage.ReleaseChunksLockCompleted(ReleaseChunksLockResult.Success));
+		} else {
+			Log.Information("REDACTION: Failed to release the chunks lock");
+			message.Envelope.ReplyWith(new RedactionMessage.ReleaseChunksLockCompleted(ReleaseChunksLockResult.Failed));
+		}
+	}
+
+	async ValueTask IAsyncHandle<RedactionMessage.SwitchChunk>.HandleAsync(RedactionMessage.SwitchChunk message, CancellationToken token) {
+		var currentAcquisitionId = _switchChunksLock.CurrentAcquisitionId;
+		if (currentAcquisitionId != message.AcquisitionId) {
+			Log.Error("REDACTION: Skipping switching of chunk: {targetChunk} with chunk: {newChunk} " +
+					  "as the lock is not currently held by the requester. " +
+					  "(Requester\'s lock ID: {requestLockId:B}. Current lock ID: {currentLockId:B})",
+				message.TargetChunkFile, message.NewChunkFile, message.AcquisitionId, currentAcquisitionId);
+			message.Envelope.ReplyWith(new RedactionMessage.SwitchChunkCompleted(SwitchChunkResult.UnexpectedError));
+			return;
+		}
+
+		try {
+			Log.Information("REDACTION: Replacing chunk {targetChunk} with {newChunk}", message.TargetChunkFile, message.NewChunkFile);
+			await SwitchChunk(message.TargetChunkFile, message.NewChunkFile, message.Envelope, token);
+		} catch (Exception ex) {
+			Log.Error(ex, "REDACTION: An error has occurred when trying to switch chunk: {targetChunk} with chunk: {newChunk}.",
+				message.TargetChunkFile, message.NewChunkFile);
+			message.Envelope.ReplyWith(new RedactionMessage.SwitchChunkCompleted(SwitchChunkResult.UnexpectedError));
+		}
+	}
+
+	private async ValueTask SwitchChunk(string targetChunkFile, string newChunkFile, IEnvelope envelope, CancellationToken token) {
+		Message reply;
+		switch (await IsValidSwitchChunkRequest(targetChunkFile, newChunkFile, token)) {
+			case { ValueOrDefault: { } newChunk }:
+				await _db.Manager.SwitchInTempChunk(chunk: newChunk, verifyHash: false, removeChunksWithGreaterNumbers: false, token);
+				reply = new RedactionMessage.SwitchChunkCompleted(SwitchChunkResult.Success);
+				break;
+			case var result:
+				reply = new RedactionMessage.SwitchChunkCompleted(result.Error);
+				break;
+		}
+
+		envelope.ReplyWith(reply);
+	}
+
+	private static bool IsUnsafeFileName(string fileName) {
+		// protect against directory traversal attacks
+		return fileName.Contains('/') || fileName.Contains('\\') || fileName.Contains("..");
+	}
+
+	private async ValueTask<Result<TFChunk, SwitchChunkResult>> IsValidSwitchChunkRequest(string targetChunkFile, string newChunkFile, CancellationToken token) {
+		if (IsUnsafeFileName(targetChunkFile)) {
+			return new(SwitchChunkResult.TargetChunkFileNameInvalid);
+		}
+
+		if (IsUnsafeFileName(newChunkFile)) {
+			return new(SwitchChunkResult.NewChunkFileNameInvalid);
+		}
+
+		int targetChunkNumber;
+		try {
+			targetChunkNumber = _db.Manager.FileSystem.LocalNamingStrategy.GetIndexFor(targetChunkFile);
+		} catch {
+			return new(SwitchChunkResult.TargetChunkFileNameInvalid);
+		}
+
+		if (Path.GetExtension(newChunkFile) != NewChunkFileExtension) {
+			return new(SwitchChunkResult.NewChunkFileNameInvalid);
+		}
+
+		if (!File.Exists(Path.Combine(_db.Config.Path, targetChunkFile))) {
+			return new(SwitchChunkResult.TargetChunkFileNotFound);
+		}
+
+		var newChunkPath = Path.Combine(_db.Config.Path, newChunkFile);
+		if (!File.Exists(newChunkPath)) {
+			return new(SwitchChunkResult.NewChunkFileNotFound);
+		}
+
+		TFChunk targetChunk;
+		try {
+			targetChunk = await _db.Manager.GetInitializedChunk(targetChunkNumber, token);
+		} catch (ArgumentOutOfRangeException) {
+			return new(SwitchChunkResult.TargetChunkExcessive);
+		}
+
+		if (Path.GetFileName(targetChunk.LocalFileName) != targetChunkFile) {
+			return new(SwitchChunkResult.TargetChunkInactive);
+		}
+
+		if (targetChunk.ChunkFooter is not { IsCompleted: true }) {
+			return new(SwitchChunkResult.TargetChunkNotCompleted);
+		}
+
+		if (targetChunk.ChunkHeader.TransformType is not TransformType.Identity) {
+			return new(SwitchChunkResult.TargetChunkFormatNotSupported);
+		}
+
+		ChunkHeader newChunkHeader;
+		ChunkFooter newChunkFooter;
+		try {
+			var fs = new FileStream(newChunkPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, 128, FileOptions.Asynchronous);
+			try {
+				newChunkHeader = await ChunkHeader.FromStream(fs, token);
+				fs.Seek(-ChunkFooter.Size, SeekOrigin.End);
+				newChunkFooter = await ChunkFooter.FromStream(fs, token);
+			} catch {
+				return new(SwitchChunkResult.NewChunkHeaderOrFooterInvalid);
+			} finally {
+				await fs.DisposeAsync();
+			}
+		} catch {
+			return new(SwitchChunkResult.NewChunkOpenFailed);
+		}
+
+		if (newChunkHeader.ChunkStartNumber != targetChunk.ChunkHeader.ChunkStartNumber ||
+			newChunkHeader.ChunkEndNumber != targetChunk.ChunkHeader.ChunkEndNumber) {
+			return new(SwitchChunkResult.ChunkRangeDoesNotMatch);
+		}
+
+		if (!newChunkFooter.IsCompleted) {
+			return new(SwitchChunkResult.NewChunkNotCompleted);
+		}
+
+		try {
+			// temporarily open the chunk to verify its integrity
+			return await TFChunk.FromCompletedFile(
+				_db.Manager.FileSystem,
+				filename: newChunkPath,
+				verifyHash: true,
+				unbufferedRead: _db.Config.Unbuffered,
+				reduceFileCachePressure: true,
+				tracker: new TFChunkTracker.NoOp(),
+				getTransformFactory: _db.TransformManager,
+				header: newChunkHeader,
+				footer: newChunkFooter,
+				token: token);
+		} catch (HashValidationException) {
+			return new(SwitchChunkResult.NewChunkHashInvalid);
+		} catch {
+			return new(SwitchChunkResult.NewChunkOpenFailed);
+		}
+	}
+
+	public void Handle(SystemMessage.BecomeShuttingDown message) {
+		// _switchChunksLock is not disposed here since it's shared between multiple services
+		_queuedHandler?.RequestStop();
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Replication/LeaderReplicationService.cs b/src/KurrentDB.Core/Services/Replication/LeaderReplicationService.cs
new file mode 100644
index 00000000000..b8f1126162f
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Replication/LeaderReplicationService.cs
@@ -0,0 +1,780 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Threading;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Monitoring.Stats;
+using KurrentDB.Core.Services.Storage.EpochManager;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Transport.Tcp;
+using Epoch = KurrentDB.Core.Data.Epoch;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Replication;
+
+public static class ReplicationSubscriptionVersions {
+	// original
+	public const int V0 = 0;
+
+	// explicit writer checkpoint in acks
+	public const int V1 = 1;
+
+	// always replicate chunk headers
+	// (send CreateChunk message for DataChunkBulk not just RawChunkBulk)
+	public const int V2 = 2;
+
+	public const int V_CURRENT = V2;
+}
+
+public class LeaderReplicationService : IMonitoredQueue,
+	IHandle<SystemMessage.SystemStart>,
+	IHandle<SystemMessage.StateChangeMessage>,
+	IHandle<SystemMessage.EnablePreLeaderReplication>,
+	IAsyncHandle<ReplicationMessage.ReplicaSubscriptionRequest>,
+	IHandle<ReplicationMessage.ReplicaLogPositionAck>,
+	IHandle<ReplicationMessage.GetReplicationStats>,
+	IHandle<ReplicationTrackingMessage.ReplicatedTo> {
+	public const int MaxQueueSize = 100;
+	public const int CloneThreshold = 1024;
+	public const int FollowerLagThreshold = 256 * 1024;
+	public const int LagOccurencesThreshold = 2;
+	public const int BulkSize = 8192;
+	public const int ReplicaSendWindow = 16 * 1024 * 1024;
+	public const int ReplicaAckWindow = 512 * 1024;
+	public static readonly TimeSpan RoleAssignmentsInterval = TimeSpan.FromMilliseconds(1000);
+	public static readonly TimeSpan NoQuorumTimeout = TimeSpan.FromMilliseconds(3000);
+
+	private static readonly ILogger Log = Serilog.Log.ForContext<LeaderReplicationService>();
+
+	public string Name {
+		get { return _queueStats.Name; }
+	}
+
+	private readonly IPublisher _publisher;
+	private readonly Guid _instanceId;
+	private readonly TFChunkDb _db;
+	private readonly IPublisher _tcpSendPublisher;
+	private readonly IEpochManager _epochManager;
+	private readonly int _clusterSize;
+	private readonly bool _unsafeAllowSurplusNodes;
+
+	private CancellationTokenSource _stopCts;
+	private readonly CancellationToken _stopToken;
+	private readonly QueueStatsCollector _queueStats;
+
+	private readonly ConcurrentDictionary<Guid, ReplicaSubscription> _subscriptions = new();
+
+	private volatile VNodeState _state = VNodeState.Initializing;
+
+	private readonly Stopwatch _stopwatch = Stopwatch.StartNew();
+	private TimeSpan _lastRolesAssignmentTimestamp;
+	private volatile bool _newSubscriptions;
+	private TimeSpan _noQuorumTimestamp = TimeSpan.Zero;
+	private bool _noQuorumNotified;
+	private bool _preLeaderReplicationEnabled;
+	private readonly AsyncManualResetEvent _flushSignal = new(false);
+	private readonly TaskCompletionSource _tcs = new(TaskCreationOptions.RunContinuationsAsynchronously);
+
+	public Task Task => _tcs.Task;
+
+	public LeaderReplicationService(
+		IPublisher publisher,
+		Guid instanceId,
+		TFChunkDb db,
+		IPublisher tcpSendPublisher,
+		IEpochManager epochManager,
+		int clusterSize,
+		bool unsafeAllowSurplusNodes,
+		QueueStatsManager queueStatsManager) {
+		_publisher = Ensure.NotNull(publisher);
+		_instanceId = Ensure.NotEmptyGuid(instanceId);
+		_db = Ensure.NotNull(db);
+		_tcpSendPublisher = Ensure.NotNull(tcpSendPublisher);
+		_epochManager = Ensure.NotNull(epochManager);
+		_clusterSize = Ensure.Positive(clusterSize);
+		_unsafeAllowSurplusNodes = unsafeAllowSurplusNodes;
+		_queueStats = queueStatsManager.CreateQueueStatsCollector("Leader Replication Service");
+
+		_lastRolesAssignmentTimestamp = _stopwatch.Elapsed;
+		_stopCts = new();
+		_stopToken = _stopCts.Token;
+	}
+
+	public void Handle(SystemMessage.SystemStart message) {
+		ThreadPool.UnsafeQueueUserWorkItem(static svc => svc.MainLoop(), this, preferLocal: false);
+	}
+
+	private void CancelMainLoop() {
+		if (Interlocked.Exchange(ref _stopCts, null) is { } cts) {
+			using (cts) {
+				cts.Cancel();
+			}
+		}
+	}
+
+	public void Handle(SystemMessage.StateChangeMessage message) {
+		switch (_state = message.State) {
+			case VNodeState.PreLeader:
+				_preLeaderReplicationEnabled = false;
+				_noQuorumTimestamp = TimeSpan.Zero;
+				break;
+			case VNodeState.Leader:
+				_noQuorumTimestamp = TimeSpan.Zero;
+				break;
+			case VNodeState.ShuttingDown:
+				CancelMainLoop();
+				break;
+		}
+	}
+
+	public void Handle(SystemMessage.EnablePreLeaderReplication message) {
+		_preLeaderReplicationEnabled = true;
+	}
+
+	private bool CanAcceptSubscription(ReplicationMessage.ReplicaSubscriptionRequest message) {
+		return CanAcceptSubscriptions() && message.LeaderId == _instanceId;
+	}
+
+	private bool CanAcceptSubscriptions() {
+		if (_state == VNodeState.Leader)
+			return true;
+
+		if (_state == VNodeState.PreLeader && _preLeaderReplicationEnabled)
+			return true;
+
+		return false;
+	}
+
+	async ValueTask IAsyncHandle<ReplicationMessage.ReplicaSubscriptionRequest>.HandleAsync(ReplicationMessage.ReplicaSubscriptionRequest message, CancellationToken token) {
+		_publisher.Publish(new SystemMessage.VNodeConnectionEstablished(message.ReplicaEndPoint, message.Connection.ConnectionId));
+
+		if (!CanAcceptSubscription(message)) {
+			message.Envelope.ReplyWith(new ReplicationMessage.ReplicaSubscriptionRetry(_instanceId, message.SubscriptionId));
+			return;
+		}
+
+		var subscription = new ReplicaSubscription(_tcpSendPublisher,
+			message.Version,
+			message.Connection,
+			message.SubscriptionId,
+			message.ReplicaEndPoint,
+			message.IsPromotable);
+
+		foreach (var subscr in _subscriptions.Values) {
+			if (subscr != subscription && subscr.ConnectionId == subscription.ConnectionId)
+				subscr.ShouldDispose = true;
+		}
+
+		if (await SubscribeReplica(subscription, message.LastEpochs, message.CorrelationId, message.LogPosition, token)) {
+			_newSubscriptions = true;
+			if (!_subscriptions.TryAdd(subscription.SubscriptionId, subscription)) {
+				ReplicaSubscription existingSubscr;
+				_subscriptions.TryGetValue(subscription.SubscriptionId, out existingSubscr);
+				Log.Error(
+					"There is already a subscription with SubscriptionID {subscriptionId:B}: {existingSubscription}.",
+					subscription.SubscriptionId, existingSubscr);
+				Log.Error("Subscription we tried to add: {existingSubscription}.", existingSubscr);
+				subscription.SendBadRequestAndClose(message.CorrelationId, string.Format(
+					"There is already a subscription with SubscriptionID {0:B}: {1}.\nSubscription we tried to add: {2}",
+					subscription.SubscriptionId, existingSubscr, subscription));
+				subscription.Dispose();
+			} else {
+				var replicationCheckpoint = _db.Config.ReplicationCheckpoint.Read();
+				subscription.SendMessage(new ReplicationTrackingMessage.ReplicatedTo(replicationCheckpoint));
+				_flushSignal.Set();
+			}
+		}
+	}
+
+	public void Handle(ReplicationMessage.ReplicaLogPositionAck message) {
+		if (_subscriptions.TryGetValue(message.SubscriptionId, out var subscription)) {
+			Interlocked.Exchange(ref subscription.AckedLogPosition, message.ReplicationLogPosition);
+			if (subscription.IsPromotable) {
+				var replicatedToLogPosition = subscription.Version == ReplicationSubscriptionVersions.V0
+					? message.ReplicationLogPosition
+					: message.WriterLogPosition;
+				_publisher.Publish(new ReplicationTrackingMessage.ReplicaWriteAck(message.SubscriptionId, replicatedToLogPosition));
+			}
+		}
+	}
+
+	public void Handle(ReplicationMessage.GetReplicationStats message) {
+		var connections = TcpConnectionMonitor.Default.GetTcpConnectionStats();
+		var replicaStats = new List<ReplicationMessage.ReplicationStats>();
+		foreach (var conn in connections) {
+			if (conn is not ITcpConnection tcpConn)
+				continue;
+			var subscription = _subscriptions.FirstOrDefault(x => x.Value.ConnectionId == tcpConn.ConnectionId);
+			if (subscription.Value != null) {
+				var stats = new ReplicationMessage.ReplicationStats(subscription.Key, tcpConn.ConnectionId,
+					subscription.Value.ReplicaEndPoint.ToString(), tcpConn.SendQueueSize,
+					conn.TotalBytesSent, conn.TotalBytesReceived, conn.PendingSendBytes,
+					conn.PendingReceivedBytes);
+				replicaStats.Add(stats);
+			}
+		}
+
+		message.Envelope.ReplyWith(new ReplicationMessage.GetReplicationStatsCompleted(replicaStats));
+	}
+
+	private async ValueTask<bool> SubscribeReplica(ReplicaSubscription replica, IReadOnlyList<Epoch> lastEpochs, Guid correlationId,
+		long logPosition, CancellationToken token) {
+		try {
+			var epochs = lastEpochs ?? Array.Empty<Epoch>();
+			Log.Information(
+				"SUBSCRIBE REQUEST from [{replicaEndPoint},V:{version},C:{connectionId:B},S:{subscriptionId:B},{logPosition}(0x{logPosition:X}),{epochs}]...",
+				replica.ReplicaEndPoint, replica.Version, replica.ConnectionId, replica.SubscriptionId, logPosition, logPosition,
+				string.Join(", ", epochs.Select(x => EpochRecordExtensions.AsString((Epoch)x))));
+
+			var epochCorrectedLogPos =
+				await GetValidLogPosition(logPosition, epochs, replica.ReplicaEndPoint, replica.SubscriptionId, token);
+			var subscriptionPos = await SetSubscriptionPosition(replica, epochCorrectedLogPos,
+				replicationStart: true, verbose: true, token: token);
+			Interlocked.Exchange(ref replica.AckedLogPosition, subscriptionPos);
+
+			if (subscriptionPos != logPosition) {
+				Log.Information("Replica is truncating. Sending it no more messages.");
+				replica.IsTruncating = true;
+			}
+
+			return true;
+		} catch (Exception exc) {
+			Log.Error(exc, "Exception while subscribing replica. Connection will be dropped.");
+			replica.SendBadRequestAndClose(correlationId, $"Exception while subscribing replica. Connection will be dropped. Error: {exc.Message}");
+			return false;
+		}
+	}
+
+	private async ValueTask<long> GetValidLogPosition(long logPosition, IReadOnlyList<Epoch> epochs, EndPoint replicaEndPoint, Guid subscriptionId, CancellationToken token) {
+		if (epochs.Count is 0) {
+			if (logPosition > 0) {
+				// follower has some data, but doesn't have any epoch
+				// for now we'll just report error and close connection
+				var msg = string.Format(
+					"Replica [{0},S:{1},{2}] has positive LogPosition {3} (0x{3:X}), but does not have epochs.",
+					replicaEndPoint, subscriptionId,
+					string.Join(", ", epochs.Select(x => x.AsString())), logPosition);
+				Log.Information(
+					"Replica [{replicaEndPoint},S:{subscriptionId},{epochs}] has positive LogPosition {logPosition} (0x{logPosition:X}), but does not have epochs.",
+					replicaEndPoint, subscriptionId,
+					string.Join(", ", epochs.Select(x => x.AsString())), logPosition, logPosition);
+				throw new Exception(msg);
+			}
+
+			return 0;
+		}
+
+		var leaderCheckpoint = _db.Config.WriterCheckpoint.Read();
+		Epoch nextEpochAfterCommonEpoch = null;
+		Epoch commonEpoch = null;
+		for (int i = 0; i < epochs.Count; ++i) {
+			var epoch = epochs[i];
+			if (await _epochManager.IsCorrectEpochAt(epoch.EpochPosition, epoch.EpochNumber, epoch.EpochId, token)) {
+				commonEpoch = epoch;
+				nextEpochAfterCommonEpoch = i > 0 ? epochs[i - 1] : null;
+				break;
+			}
+		}
+
+		if (commonEpoch == null) {
+			Log.Error(
+				"No common epoch found for replica [{replicaEndPoint},S{subscriptionId},{logPosition}(0x{logPosition:X}),{epochs}]. Subscribing at 0. Leader LogPosition: {leaderCheckpoint} (0x{leaderCheckpoint:X}), known epochs: {knownEpochs}.",
+				replicaEndPoint, subscriptionId,
+				logPosition, logPosition,
+				string.Join(", ", epochs.Select(x => x.AsString())),
+				leaderCheckpoint, leaderCheckpoint,
+				string.Join(", ", (await _epochManager.GetLastEpochs(int.MaxValue, token)).Select(x => x.AsString())));
+			return 0;
+		}
+
+		// if nextEpochAfterCommonEpoch is present, replica logPosition > nextEpochAfterCommonEpoch.EpochPosition,
+		// so safe position is definitely the start of nextEpochAfterCommonEpoch
+		var replicaPosition = nextEpochAfterCommonEpoch?.EpochPosition ?? logPosition;
+
+		if (commonEpoch.EpochNumber == _epochManager.LastEpochNumber)
+			return Math.Min(replicaPosition, leaderCheckpoint);
+
+		// common epoch number is older than the last epoch
+		if (await _epochManager.GetEpochAfter(commonEpoch.EpochNumber, false, token) is not { } nextEpoch) {
+			var msg = string.Format(
+				"Replica [{0},S:{1},{2}(0x{3:X}),epochs:\n{4}]\n provided epochs which are not in "
+				+ "EpochManager (possibly too old, known epochs:\n{5}).\nLeader LogPosition: {6} (0x{7:X}). "
+				+ "We do not support this case as of now.\n"
+				+ "CommonEpoch: {8}, NextEpochAfterCommonEpoch: {9}",
+				replicaEndPoint, subscriptionId, logPosition, logPosition,
+				string.Join("\n", epochs.Select(x => x.AsString())),
+				string.Join("\n", (await _epochManager.GetLastEpochs(int.MaxValue, token)).Select(x => x.AsString())),
+				leaderCheckpoint, leaderCheckpoint,
+				commonEpoch.AsString(),
+				nextEpochAfterCommonEpoch == null ? "<none>" : nextEpochAfterCommonEpoch.AsString());
+			Log.Error(
+				"Replica [{replicaEndPoint},S:{subscriptionId},{logPosition}(0x{logPosition:X}),epochs:\n{epochs}]\n provided epochs which are not in "
+				+ "EpochManager (possibly too old, known epochs:\n{lastEpochs}).\nLeader LogPosition: {leaderCheckpoint} (0x{leaderCheckpoint:X}). "
+				+ "We do not support this case as of now.\n"
+				+ "CommonEpoch: {commonEpoch}, NextEpochAfterCommonEpoch: {nextEpochAfterCommonEpoch}",
+				replicaEndPoint,
+				subscriptionId,
+				logPosition,
+				logPosition,
+				string.Join("\n", epochs.Select(x => x.AsString())),
+				string.Join("\n", (await _epochManager.GetLastEpochs(int.MaxValue, token)).Select(x => x.AsString())),
+				leaderCheckpoint,
+				leaderCheckpoint,
+				commonEpoch.AsString(),
+				nextEpochAfterCommonEpoch == null ? "<none>" : nextEpochAfterCommonEpoch.AsString()
+			);
+			throw new Exception(msg);
+		}
+
+		return Math.Min(replicaPosition, nextEpoch.EpochPosition);
+	}
+
+	private async ValueTask<long> SetSubscriptionPosition(ReplicaSubscription sub,
+		long logPosition,
+		bool replicationStart,
+		bool verbose,
+		CancellationToken token) {
+		const int maxRetryCount = 10;
+		for (var trial = 0; ;) {
+			try {
+				var chunk = await _db.Manager.GetInitializedChunkFor(logPosition, token);
+				var rawSend = chunk.ChunkHeader.IsScavenged;
+				var bulkReader = await (rawSend ? chunk.AcquireRawReader(token) : chunk.AcquireDataReader(token));
+				if (rawSend) {
+					var chunkStartPos = chunk.ChunkHeader.ChunkStartPosition;
+					if (verbose) {
+						Log.Information(
+							"Subscribed replica [{replicaEndPoint}, S:{subscriptionId}] for raw send at {chunkStartPosition} (0x{chunkStartPosition:X}) (requested {logPosition} (0x{logPosition:X})).",
+							sub.ReplicaEndPoint, sub.SubscriptionId, chunkStartPos, chunkStartPos, logPosition, logPosition);
+						if (chunkStartPos != logPosition) {
+							Log.Information(
+								"Forcing replica [{replicaEndPoint}, S:{subscriptionId}] to recreate chunk from position {chunkStartPosition} (0x{chunkStartPosition:X})...",
+								sub.ReplicaEndPoint, sub.SubscriptionId, chunkStartPos, chunkStartPos);
+						}
+					}
+
+					sub.LogPosition = chunkStartPos;
+					sub.RawSend = true;
+					bulkReader.SetPosition(ChunkHeader.Size);
+					if (replicationStart)
+						sub.SendMessage(new ReplicationMessage.ReplicaSubscribed(_instanceId, sub.SubscriptionId, sub.LogPosition));
+					sub.SendMessage(new ReplicationMessage.CreateChunk(_instanceId,
+						sub.SubscriptionId,
+						chunk.ChunkHeader,
+						chunk.FileSize,
+						isScavengedChunk: true,
+						chunk.TransformHeader));
+				} else {
+					if (verbose)
+						Log.Information(
+							"Subscribed replica [{replicaEndPoint},S:{subscriptionId}] for data send at {logPosition} (0x{logPosition:X}).",
+							sub.ReplicaEndPoint, sub.SubscriptionId, logPosition, logPosition);
+
+					sub.LogPosition = logPosition;
+					sub.RawSend = false;
+					bulkReader.SetPosition(chunk.ChunkHeader.GetLocalLogPosition(logPosition));
+					if (replicationStart)
+						sub.SendMessage(new ReplicationMessage.ReplicaSubscribed(_instanceId, sub.SubscriptionId, sub.LogPosition));
+
+					if (logPosition == chunk.ChunkHeader.ChunkStartPosition &&
+						sub.Version >= ReplicationSubscriptionVersions.V2) {
+						sub.SendMessage(new ReplicationMessage.CreateChunk(_instanceId,
+							sub.SubscriptionId,
+							chunk.ChunkHeader,
+							chunk.FileSize,
+							isScavengedChunk: false,
+							chunk.TransformHeader));
+					}
+				}
+
+				sub.EOFSent = false;
+				var oldBulkReader = Interlocked.Exchange(ref sub.BulkReader, bulkReader);
+				oldBulkReader?.Release();
+				return sub.LogPosition;
+			} catch (FileBeingDeletedException e) when (trial is maxRetryCount) {
+				throw new Exception("Too many retrials to acquire reader for subscriber.", e);
+			} catch (FileBeingDeletedException) {
+				trial++;
+			}
+		}
+	}
+
+	private async void MainLoop() {
+		try {
+			_publisher.Publish(new SystemMessage.ServiceInitialized(nameof(LeaderReplicationService)));
+			_queueStats.Start();
+			QueueMonitor.Default.Register(this);
+
+			_db.Config.WriterCheckpoint.Flushed += OnWriterFlushed;
+
+			while (!_stopToken.IsCancellationRequested) {
+				try {
+					_queueStats.EnterBusy();
+
+					_queueStats.ProcessingStarted(typeof(SendReplicationData), _subscriptions.Count);
+
+					// Reset the flush signal as we're about to read anyway. This could be closer to the actual read but no harm from too many checks.
+					_flushSignal.Reset();
+
+					var dataFound = await ManageSubscriptions(_stopToken);
+					ManageNoQuorumDetection();
+					var newSubscriptions = _newSubscriptions;
+					_newSubscriptions = false;
+					ManageRoleAssignments(force: newSubscriptions);
+
+					_queueStats.ProcessingEnded(_subscriptions.Count);
+
+					if (!dataFound) {
+						_queueStats.EnterIdle();
+
+						await _flushSignal.WaitAsync(TimeSpan.FromMilliseconds(500), _stopToken);
+					}
+				} catch (OperationCanceledException e) when (e.CancellationToken == _stopToken) {
+					// just leave the loop on cancellation
+					break;
+				} catch (Exception exc) {
+					Log.Information(exc, "Error during leader replication iteration.");
+#if DEBUG
+					throw;
+#endif
+				}
+			}
+
+			foreach (var subscription in _subscriptions.Values) {
+				subscription.Dispose();
+			}
+
+			_db.Config.WriterCheckpoint.Flushed -= OnWriterFlushed;
+
+			_publisher.Publish(new SystemMessage.ServiceShutdown(nameof(LeaderReplicationService)));
+			_tcs.TrySetResult();
+		} catch (Exception e) {
+			_tcs.TrySetException(e);
+		} finally {
+			_queueStats.Stop();
+			QueueMonitor.Default.Unregister(this);
+		}
+	}
+
+	private void OnWriterFlushed(long obj) {
+		_flushSignal.Set();
+	}
+
+	private async ValueTask<bool> ManageSubscriptions(CancellationToken token) {
+		var dataFound = false;
+		foreach (var subscription in _subscriptions.Values) {
+			bool lost = false;
+			if (subscription.IsConnectionClosed) {
+				subscription.ShouldDispose = true;
+				lost = true;
+			}
+
+			if (subscription.ShouldDispose) {
+				_subscriptions.TryRemove(subscription.SubscriptionId, out _);
+				if (lost) {
+					_publisher.Publish(new SystemMessage.VNodeConnectionLost(subscription.ReplicaEndPoint, subscription.ConnectionId, subscription.SubscriptionId));
+				}
+
+				subscription.Dispose();
+				continue;
+			}
+
+			if (subscription.SendQueueSize >= MaxQueueSize || subscription.LogPosition - Interlocked.Read(ref subscription.AckedLogPosition) >=
+				ReplicaSendWindow)
+				continue;
+
+			if (subscription.BulkReader == null)
+				throw new Exception("BulkReader is null for subscription.");
+
+			try {
+				var leaderCheckpoint = _db.Config.WriterCheckpoint.Read();
+
+				if (await TrySendLogBulk(subscription, leaderCheckpoint, token))
+					dataFound = true;
+
+				if (subscription.State == ReplicaState.CatchingUp &&
+					leaderCheckpoint - subscription.LogPosition <= CloneThreshold) {
+					subscription.State = ReplicaState.Clone;
+					subscription.SendMessage(new ReplicationMessage.CloneAssignment(_instanceId, subscription.SubscriptionId));
+				}
+			} catch (Exception exc) {
+				Log.Information(exc, "Error during replication send to replica: {subscription}.", subscription);
+			}
+		}
+
+		return dataFound;
+	}
+
+	private async ValueTask<bool> TrySendLogBulk(ReplicaSubscription subscription, long leaderCheckpoint, CancellationToken token) {
+		var bulkReader = subscription.BulkReader;
+		var chunkHeader = bulkReader.Chunk.ChunkHeader;
+
+		BulkReadResult bulkResult;
+		if (subscription.RawSend) {
+			bulkResult = await bulkReader.ReadNextBytes(subscription.DataBuffer, token);
+		} else {
+			var bytesToRead = (int)Math.Min(subscription.DataBuffer.Length,
+				leaderCheckpoint - subscription.LogPosition);
+			bulkResult = await bulkReader.ReadNextBytes(subscription.DataBuffer.AsMemory(0, bytesToRead), token);
+		}
+
+		bool dataFound = false;
+		// for logical send we can get 0 at the end multiple time, but we need to get EOF exactly once
+		if (bulkResult.BytesRead > 0 || (bulkResult.IsEOF && !subscription.RawSend && !subscription.EOFSent)) {
+			var data = new byte[bulkResult.BytesRead];
+			Buffer.BlockCopy(subscription.DataBuffer, 0, data, 0, bulkResult.BytesRead);
+
+			dataFound = true;
+			subscription.EOFSent = bulkResult.IsEOF;
+
+			if (subscription.RawSend) {
+				var msg = new ReplicationMessage.RawChunkBulk(
+					_instanceId, subscription.SubscriptionId, chunkHeader.ChunkStartNumber,
+					chunkHeader.ChunkEndNumber,
+					bulkResult.OldPosition, data, bulkResult.IsEOF);
+				subscription.SendMessage(msg);
+			} else {
+				if (chunkHeader.GetLocalLogPosition(subscription.LogPosition) != bulkResult.OldPosition) {
+					throw new Exception($"Replication invariant failure. SubscriptionPosition {subscription.LogPosition}, bulkResult.OldPosition {bulkResult.OldPosition}");
+				}
+
+				var msg = new ReplicationMessage.DataChunkBulk(
+					_instanceId, subscription.SubscriptionId, chunkHeader.ChunkStartNumber,
+					chunkHeader.ChunkEndNumber,
+					subscription.LogPosition, data, bulkResult.IsEOF);
+				subscription.LogPosition += bulkResult.BytesRead;
+				subscription.SendMessage(msg);
+			}
+		}
+
+		if (bulkResult.IsEOF) {
+			var newLogPosition = chunkHeader.ChunkEndPosition;
+			if (newLogPosition < leaderCheckpoint) {
+				dataFound = true;
+				await SetSubscriptionPosition(subscription, newLogPosition, replicationStart: false, verbose: true, token: token);
+			}
+		}
+
+		return dataFound;
+	}
+
+	private void ManageNoQuorumDetection() {
+		if (CanAcceptSubscriptions()) {
+			var now = _stopwatch.Elapsed;
+			if (_subscriptions.Count(x => x.Value.IsPromotable) >= _clusterSize / 2) // everything is ok
+				_noQuorumTimestamp = TimeSpan.Zero;
+			else {
+				if (_noQuorumTimestamp == TimeSpan.Zero) {
+					_noQuorumTimestamp = now;
+					_noQuorumNotified = false;
+				}
+
+				if (!_noQuorumNotified && now - _noQuorumTimestamp > NoQuorumTimeout) {
+					_publisher.Publish(new SystemMessage.NoQuorumMessage());
+					_noQuorumNotified = true;
+				}
+			}
+		}
+	}
+
+	private void ManageRoleAssignments(bool force = false) {
+		if (force || _stopwatch.Elapsed - _lastRolesAssignmentTimestamp >= RoleAssignmentsInterval) {
+			ManageRoleAssignments(_subscriptions.Values);
+			_lastRolesAssignmentTimestamp = _stopwatch.Elapsed;
+		}
+	}
+
+	private void ManageRoleAssignments(IEnumerable<ReplicaSubscription> subscribers) {
+		var candidates = subscribers.Where(x => x.IsPromotable && x.State != ReplicaState.CatchingUp)
+			.OrderByDescending(x => x.LogPosition)
+			.ToArray();
+		var leaderCheckpoint = _db.Config.WriterCheckpoint.Read();
+
+		int followerCount = 0;
+		int laggedFollowers = 0;
+		var desiredFollowerCount = _clusterSize - 1;
+
+		for (int i = 0; i < candidates.Length; ++i) {
+			var candidate = candidates[i];
+			if (candidate.State == ReplicaState.Follower) {
+				followerCount++;
+				candidate.LagOccurrences = i < desiredFollowerCount ? 0 : candidate.LagOccurrences + 1;
+
+				if (candidate.LagOccurrences >= LagOccurencesThreshold && leaderCheckpoint - candidate.LogPosition >= FollowerLagThreshold) {
+					++laggedFollowers;
+				}
+			}
+		}
+
+		int cloneIndex = 0;
+		int followerIndex = candidates.Length - 1;
+		for (int k = followerCount; k < desiredFollowerCount; ++k) {
+			// find next best clone
+			while (cloneIndex < candidates.Length && candidates[cloneIndex].State != ReplicaState.Clone)
+				cloneIndex++;
+
+			// out of suitable clones - get out of here
+			if (cloneIndex >= candidates.Length)
+				break;
+
+			// we need more followers, even if there are lagging followers
+			var newFollower = candidates[cloneIndex];
+			newFollower.State = ReplicaState.Follower;
+			newFollower.LagOccurrences = 0;
+			newFollower.SendMessage(new ReplicationMessage.FollowerAssignment(_instanceId, newFollower.SubscriptionId));
+			cloneIndex++;
+		}
+
+		for (int k = 0; k < laggedFollowers; ++k) {
+			// find next best clone
+			while (cloneIndex < candidates.Length && candidates[cloneIndex].State != ReplicaState.Clone)
+				cloneIndex++;
+
+			// find next worst follower
+			while (followerIndex >= 0 && candidates[followerIndex].State != ReplicaState.Follower)
+				followerIndex--;
+
+			// no more suitable clones - get out of here
+			if (cloneIndex > followerIndex)
+				break;
+
+			// we have enough follower, but some of them are probably lagging behind
+			Debug.Assert(followerIndex >= 0);
+
+			var oldFollower = candidates[followerIndex];
+			oldFollower.State = ReplicaState.Clone;
+			oldFollower.LagOccurrences = 0;
+			oldFollower.SendMessage(new ReplicationMessage.CloneAssignment(_instanceId, oldFollower.SubscriptionId));
+			followerIndex--;
+
+			var newFollower = candidates[cloneIndex];
+			newFollower.State = ReplicaState.Follower;
+			newFollower.LagOccurrences = 0;
+			newFollower.SendMessage(new ReplicationMessage.FollowerAssignment(_instanceId, newFollower.SubscriptionId));
+			cloneIndex++;
+		}
+
+		//drop surplus of clones unless the unsafe option is enabled
+		if (!_unsafeAllowSurplusNodes) {
+			while (cloneIndex < candidates.Length && candidates[cloneIndex].State != ReplicaState.Clone) {
+				cloneIndex++;
+			}
+
+			while (cloneIndex < candidates.Length && candidates[cloneIndex].State == ReplicaState.Clone) {
+				var cloneToDrop = candidates[cloneIndex];
+				cloneToDrop.SendMessage(new ReplicationMessage.DropSubscription(_instanceId, cloneToDrop.SubscriptionId));
+				Log.Debug(
+					"There is a surplus of nodes in the cluster. Dropped clone: C:{connectionId:B}, S:{subscriptionId:B}.",
+					cloneToDrop.ConnectionId, cloneToDrop.SubscriptionId);
+
+				cloneIndex++;
+			}
+		}
+	}
+
+	public void Handle(ReplicationTrackingMessage.ReplicatedTo message) {
+		//TODO(clc): if the node is busy and misses an update it might be a long time till the next update do we need check if they get too stale?
+		foreach (var subscription in _subscriptions.Values) {
+			if (subscription.IsConnectionClosed || subscription.SendQueueSize >= MaxQueueSize) { continue; }
+
+			subscription.SendMessage(message);
+		}
+	}
+
+	public QueueStats GetStatistics() {
+		return _queueStats.GetStatistics(_subscriptions.Count);
+	}
+
+	private enum ReplicaState {
+		CatchingUp,
+		Clone,
+		Follower
+	}
+
+	private class SendReplicationData;
+
+	private class ReplicaSubscription(
+		IPublisher tcpSendPublisher,
+		int version,
+		TcpConnectionManager connection,
+		Guid subscriptionId,
+		EndPoint replicaEndPoint,
+		bool isPromotable)
+		: IDisposable {
+		public readonly byte[] DataBuffer = new byte[BulkSize];
+
+		public Guid ConnectionId => connection.ConnectionId;
+
+		public int SendQueueSize => connection.SendQueueSize;
+
+		public bool IsConnectionClosed => connection.IsClosed;
+
+		public readonly int Version = version;
+		public readonly bool IsPromotable = isPromotable;
+		public readonly EndPoint ReplicaEndPoint = replicaEndPoint;
+		public readonly Guid SubscriptionId = subscriptionId;
+
+		public TFChunkBulkReader BulkReader;
+		public bool RawSend;
+
+		public bool EOFSent;
+		public long LogPosition;
+		public long AckedLogPosition;
+
+		public bool ShouldDispose;
+		public bool IsTruncating;
+		public ReplicaState State = ReplicaState.CatchingUp;
+		public int LagOccurrences;
+
+		public void SendMessage(Message msg) {
+			if (IsTruncating)
+				return;
+
+			tcpSendPublisher.Publish(new TcpMessage.TcpSend(connection, msg));
+		}
+
+		public void SendBadRequestAndClose(Guid correlationId, string message) {
+			connection.SendBadRequestAndClose(correlationId, message);
+		}
+
+		public override string ToString() {
+			return string.Format(
+				"Connection: {0:B}, ReplicaEndPoint: {1}, IsPromotable: {2}, RawSend: {3}, EOFSent: {4}, "
+				+ "LogPosition: {5} (0x{5:X}), AckedLogPosition: {6} (0x{6:X}), State: {7}, LagOccurences: {8}, "
+				+ "SubscriptionId: {9}, ShouldDispose: {10}",
+				connection.ConnectionId,
+				ReplicaEndPoint,
+				IsPromotable,
+				RawSend,
+				EOFSent,
+				LogPosition,
+				AckedLogPosition,
+				State,
+				LagOccurrences,
+				SubscriptionId,
+				ShouldDispose);
+		}
+
+		public void Dispose() {
+			connection?.Stop("Closing replication subscription connection.");
+			var bulkReader = Interlocked.Exchange(ref BulkReader, null);
+			bulkReader?.Release();
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Replication/LogRecordFramer.cs b/src/KurrentDB.Core/Services/Replication/LogRecordFramer.cs
new file mode 100644
index 00000000000..170ff9ffe71
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Replication/LogRecordFramer.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.IO;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Transport.Tcp.Framing;
+
+namespace KurrentDB.Core.Services.Replication;
+
+internal sealed class LogRecordFramer : IAsyncMessageFramer<ILogRecord> {
+	private readonly IAsyncMessageFramer<ReadOnlySequence<byte>> _inner;
+	private Func<ILogRecord, CancellationToken, ValueTask> _handler = static (_, _) => ValueTask.CompletedTask;
+
+	public LogRecordFramer(IAsyncMessageFramer<ReadOnlySequence<byte>> inner) {
+		_inner = inner;
+		_inner.RegisterMessageArrivedCallback(OnMessageArrived);
+	}
+
+	public bool HasData => _inner.HasData;
+
+	public IEnumerable<ArraySegment<byte>> FrameData(ArraySegment<byte> data) => _inner.FrameData(data);
+
+	public ValueTask UnFrameData(IEnumerable<ArraySegment<byte>> data, CancellationToken token) => _inner.UnFrameData(data, token);
+
+	public ValueTask UnFrameData(ArraySegment<byte> data, CancellationToken token) => _inner.UnFrameData(data, token);
+
+	public void Reset() => _inner.Reset();
+
+	private ValueTask OnMessageArrived(ReadOnlySequence<byte> recordPayload, CancellationToken token) {
+		var reader = new SequenceReader(recordPayload);
+		var record = LogRecord.ReadFrom(ref reader);
+		return _handler(record, token);
+	}
+
+	public void RegisterMessageArrivedCallback(Func<ILogRecord, CancellationToken, ValueTask> handler) {
+		_handler = Ensure.NotNull(handler);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Replication/ReplicaService.cs b/src/KurrentDB.Core/Services/Replication/ReplicaService.cs
new file mode 100644
index 00000000000..8654db1b213
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Replication/ReplicaService.cs
@@ -0,0 +1,266 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Net.Sockets;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authentication;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Cluster.Settings;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Storage.EpochManager;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Transport.Tcp;
+using EndPoint = System.Net.EndPoint;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Replication;
+
+public class ReplicaService :
+	IHandle<SystemMessage.StateChangeMessage>,
+	IHandle<ReplicationMessage.ReconnectToLeader>,
+	IAsyncHandle<ReplicationMessage.SubscribeToLeader>,
+	IHandle<ReplicationMessage.AckLogPosition>,
+	IHandle<ClientMessage.TcpForwardMessage> {
+
+	private static readonly ILogger Log = Serilog.Log.ForContext<ReplicaService>();
+
+	private readonly TcpClientConnector _connector = new();
+	private readonly IPublisher _publisher;
+	private readonly TFChunkDb _db;
+	private readonly IEpochManager _epochManager;
+	private readonly IPublisher _networkSendQueue;
+	private readonly IAuthenticationProvider _authProvider;
+	private readonly AuthorizationGateway _authorizationGateway;
+	private readonly EndPoint _internalTcp;
+	private readonly InternalTcpDispatcher _tcpDispatcher;
+	private readonly bool _isReadOnlyReplica;
+	private readonly bool _useSsl;
+	private readonly CertificateDelegates.ServerCertificateValidator _sslServerCertValidator;
+	private readonly Func<X509Certificate> _sslClientCertificateSelector;
+	private readonly TimeSpan _heartbeatTimeout;
+	private readonly TimeSpan _heartbeatInterval;
+	private VNodeState _state = VNodeState.Initializing;
+	private TcpConnectionManager _connection;
+
+	public ReplicaService(
+		IPublisher publisher,
+		TFChunkDb db,
+		IEpochManager epochManager,
+		IPublisher networkSendQueue,
+		IAuthenticationProvider authProvider,
+		AuthorizationGateway authorizationGateway,
+		EndPoint internalTcp,
+		bool isReadOnlyReplica,
+		bool useSsl,
+		CertificateDelegates.ServerCertificateValidator sslServerCertValidator,
+		Func<X509Certificate> sslClientCertificateSelector,
+		TimeSpan heartbeatTimeout,
+		TimeSpan heartbeatInterval,
+		TimeSpan writeTimeout) {
+		_isReadOnlyReplica = isReadOnlyReplica;
+		_useSsl = useSsl;
+		_sslServerCertValidator = sslServerCertValidator;
+		_sslClientCertificateSelector = sslClientCertificateSelector;
+		_heartbeatTimeout = heartbeatTimeout;
+		_heartbeatInterval = heartbeatInterval;
+		_publisher = Ensure.NotNull(publisher);
+		_db = Ensure.NotNull(db);
+		_epochManager = Ensure.NotNull(epochManager);
+		_networkSendQueue = Ensure.NotNull(networkSendQueue);
+		_authProvider = Ensure.NotNull(authProvider);
+		_authorizationGateway = Ensure.NotNull(authorizationGateway);
+		_internalTcp = Ensure.NotNull(internalTcp);
+		_tcpDispatcher = new(writeTimeout);
+	}
+
+	public void Handle(SystemMessage.StateChangeMessage message) {
+		_state = message.State;
+
+		switch (message.State) {
+			case VNodeState.Initializing:
+			case VNodeState.DiscoverLeader:
+			case VNodeState.Unknown:
+			case VNodeState.ReadOnlyLeaderless:
+			case VNodeState.PreLeader:
+			case VNodeState.Leader:
+			case VNodeState.ResigningLeader:
+			case VNodeState.ShuttingDown:
+			case VNodeState.Shutdown: {
+				Disconnect();
+				break;
+			}
+			case VNodeState.PreReplica: {
+				var m = (SystemMessage.BecomePreReplica)message;
+				ConnectToLeader(m.LeaderConnectionCorrelationId, m.Leader);
+				break;
+			}
+			case VNodeState.PreReadOnlyReplica: {
+				var m = (SystemMessage.BecomePreReadOnlyReplica)message;
+				ConnectToLeader(m.LeaderConnectionCorrelationId, m.Leader);
+				break;
+			}
+			case VNodeState.CatchingUp:
+			case VNodeState.Clone:
+			case VNodeState.Follower:
+			case VNodeState.ReadOnlyReplica: {
+				// nothing changed, essentially
+				break;
+			}
+			default:
+				throw new ArgumentOutOfRangeException();
+		}
+	}
+
+	private void Disconnect() {
+		if (_connection != null) {
+			_connection.Stop($"Node state changed to {_state}. Closing replication connection.");
+			_connection = null;
+		}
+	}
+
+	private void OnConnectionEstablished(TcpConnectionManager manager) {
+		_publisher.Publish(new SystemMessage.VNodeConnectionEstablished(manager.RemoteEndPoint, manager.ConnectionId));
+	}
+
+	private void OnConnectionClosed(TcpConnectionManager manager, SocketError socketError) {
+		_publisher.Publish(new SystemMessage.VNodeConnectionLost(manager.RemoteEndPoint, manager.ConnectionId));
+	}
+
+	public void Handle(ReplicationMessage.ReconnectToLeader message) {
+		ConnectToLeader(message.ConnectionCorrelationId, message.Leader);
+	}
+
+	private void ConnectToLeader(Guid leaderConnectionCorrelationId, MemberInfo leader) {
+		Debug.Assert(_state is VNodeState.PreReplica or VNodeState.PreReadOnlyReplica);
+
+		var leaderEndPoint = GetLeaderEndPoint(leader, _useSsl);
+		if (leaderEndPoint == null) {
+			Log.Error("No valid endpoint found to connect to the Leader. Aborting connection operation to Leader.");
+			return;
+		}
+
+		_connection?.Stop($"Reconnecting from old leader [{_connection.RemoteEndPoint}] to new leader: [{leaderEndPoint}].");
+
+		try {
+			_connection = new TcpConnectionManager(_useSsl ? "leader-secure" : "leader-normal",
+				Guid.NewGuid(),
+				_tcpDispatcher,
+				_publisher,
+				leaderEndPoint.GetHost(),
+				leaderEndPoint.GetOtherNames(),
+				leaderEndPoint,
+				_connector,
+				_useSsl,
+				_sslServerCertValidator,
+				() => {
+					var cert = _sslClientCertificateSelector();
+					return new X509CertificateCollection { cert };
+				},
+				_networkSendQueue,
+				_authProvider,
+				_authorizationGateway,
+				_heartbeatInterval,
+				_heartbeatTimeout,
+				OnConnectionEstablished,
+				OnConnectionClosed);
+			_connection.StartReceiving();
+		} catch (Exception ex) {
+			Log.Error(ex, "Failed to connect to leader [{leader}]. This will be retried.", leader);
+			_publisher.Publish(new ReplicationMessage.LeaderConnectionFailed(leaderConnectionCorrelationId, leader));
+		}
+	}
+
+	private static EndPoint GetLeaderEndPoint(MemberInfo leader, bool useSsl) {
+		Ensure.NotNull(leader);
+		switch (useSsl) {
+			case true when leader.InternalSecureTcpEndPoint == null:
+				Log.Error(
+					"Internal secure connections are required, but no internal secure TCP end point is specified for leader [{leader}]!",
+					leader);
+				break;
+			case false when leader.InternalTcpEndPoint == null:
+				Log.Error(
+					"Internal connections are required, but no internal TCP end point is specified for leader [{leader}]!",
+					leader);
+				break;
+		}
+
+		return useSsl ? leader.InternalSecureTcpEndPoint : leader.InternalTcpEndPoint;
+	}
+
+	async ValueTask IAsyncHandle<ReplicationMessage.SubscribeToLeader>.HandleAsync(ReplicationMessage.SubscribeToLeader message, CancellationToken token) {
+		if (_state is not VNodeState.PreReplica and not VNodeState.PreReadOnlyReplica)
+			throw new Exception($"_state is {_state}, but is expected to be {VNodeState.PreReplica} or {VNodeState.PreReadOnlyReplica}");
+		if (_connection is null) {
+			Log.Warning("Attempted to subscribe to LEADER [{leaderId:B}], but no connection has been established. This will be retried.", message.LeaderId);
+			return;
+		}
+
+		var logPosition = _db.Config.WriterCheckpoint.ReadNonFlushed();
+		var epochs = await _epochManager.GetLastEpochs(ClusterConsts.SubscriptionLastEpochCount, token);
+
+		Log.Information(
+			"Subscribing at LogPosition: {logPosition} (0x{logPosition:X}) to LEADER [{remoteEndPoint}, {leaderId:B}] as replica with SubscriptionId: {subscriptionId:B}, "
+			+ "ConnectionId: {connectionId:B}, LocalEndPoint: [{localEndPoint}], Epochs:\n{epochs}...\n.",
+			logPosition, logPosition, _connection.RemoteEndPoint, message.LeaderId, message.SubscriptionId,
+			_connection.ConnectionId, _connection.LocalEndPoint,
+			string.Join("\n", epochs.Select(x => x.AsString())));
+
+		var chunkId = Guid.Empty;
+
+		// the chunk may not exist if it's a new database or if we're at a chunk boundary
+		if (await _db.Manager.TryGetInitializedChunkFor(logPosition, token) is { } chunk)
+			chunkId = chunk.ChunkHeader.ChunkId;
+
+		SendTcpMessage(_connection,
+			new ReplicationMessage.SubscribeReplica(
+				version: ReplicationSubscriptionVersions.V_CURRENT,
+				logPosition, chunkId, epochs, _internalTcp,
+				message.LeaderId, message.SubscriptionId, isPromotable: !_isReadOnlyReplica));
+	}
+
+	public void Handle(ReplicationMessage.AckLogPosition message) {
+		if (!_state.IsReplica())
+			throw new Exception("!_state.IsReplica()");
+		if (_connection == null)
+			throw new Exception("_connection == null");
+		SendTcpMessage(_connection, message);
+	}
+
+	public void Handle(ClientMessage.TcpForwardMessage message) {
+		switch (_state) {
+			case VNodeState.PreReplica:
+			case VNodeState.PreReadOnlyReplica: {
+				if (_connection != null)
+					SendTcpMessage(_connection, message.Message);
+				break;
+			}
+			case VNodeState.CatchingUp:
+			case VNodeState.Clone:
+			case VNodeState.Follower:
+			case VNodeState.ReadOnlyReplica: {
+				Debug.Assert(_connection != null, "Connection manager is null in follower/clone/catching up state");
+				SendTcpMessage(_connection, message.Message);
+				break;
+			}
+
+			default:
+				throw new Exception($"Unexpected state: {_state}");
+		}
+	}
+
+	private void SendTcpMessage(TcpConnectionManager manager, Message msg) {
+		_networkSendQueue.Publish(new TcpMessage.TcpSend(manager, msg));
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Replication/ReplicationTrackingService.cs b/src/KurrentDB.Core/Services/Replication/ReplicationTrackingService.cs
new file mode 100644
index 00000000000..8cdccbc2afe
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Replication/ReplicationTrackingService.cs
@@ -0,0 +1,184 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using Serilog;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Replication;
+
+public class ReplicationTrackingService :
+	IHandle<SystemMessage.StateChangeMessage>,
+	IHandle<SystemMessage.BecomeShuttingDown>,
+	IHandle<SystemMessage.SystemInit>,
+	IHandle<ReplicationTrackingMessage.ReplicaWriteAck>,
+	IHandle<ReplicationTrackingMessage.WriterCheckpointFlushed>,
+	IHandle<ReplicationTrackingMessage.LeaderReplicatedTo>,
+	IHandle<SystemMessage.VNodeConnectionLost>,
+	IHandle<ReplicationMessage.ReplicaSubscribed> {
+
+	private readonly ILogger _log = Log.ForContext<ReplicationTrackingService>();
+	private readonly IPublisher _publisher;
+	private readonly ICheckpoint _replicationCheckpoint;
+	private readonly IReadOnlyCheckpoint _writerCheckpoint;
+	private readonly int _quorumSize;
+	private Thread _thread;
+	private bool _stop;
+	private VNodeState _state;
+	private long _publishedPosition;
+	private readonly ConcurrentDictionary<Guid, long> _replicaLogPositions = new();
+	private readonly ManualResetEventSlim _replicationChange = new(false, 1);
+	private readonly TaskCompletionSource<object> _tcs = new();
+
+	public ReplicationTrackingService(
+		IPublisher publisher,
+		int clusterNodeCount,
+		ICheckpoint replicationCheckpoint,
+		IReadOnlyCheckpoint writerCheckpoint) {
+		_publisher = Ensure.NotNull(publisher);
+		_replicationCheckpoint = Ensure.NotNull(replicationCheckpoint);
+		_writerCheckpoint = Ensure.NotNull(writerCheckpoint);
+		_quorumSize = Ensure.Positive(clusterNodeCount) / 2 + 1;
+	}
+
+	public Task Task => _tcs.Task;
+
+	public void Start() {
+		_thread = new Thread(TrackReplication) { IsBackground = true, Name = nameof(ReplicationTrackingService) };
+		_thread.Start();
+	}
+
+	public void Stop() {
+		_stop = true;
+	}
+
+	public bool IsCurrent() {
+		Debug.Assert(_state == VNodeState.Leader || _state == VNodeState.PreLeader);
+		return Interlocked.Read(ref _publishedPosition) == _replicationCheckpoint.Read();
+	}
+
+	private void TrackReplication() {
+		_publisher.Publish(new SystemMessage.ServiceInitialized(nameof(ReplicationTrackingService)));
+		try {
+			while (!_stop) {
+				_replicationChange.Reset();
+				if (_state == VNodeState.Leader || _state == VNodeState.PreLeader) {
+					//Publish Log Commit Position
+					var newPos = _replicationCheckpoint.Read();
+					if (newPos > Interlocked.Read(ref _publishedPosition)) {
+						_publisher.Publish(new ReplicationTrackingMessage.ReplicatedTo(newPos));
+						Interlocked.Exchange(ref _publishedPosition, newPos);
+					}
+				}
+
+				_replicationChange.Wait(100);
+			}
+		} catch (Exception exc) {
+			_log.Fatal(exc, $"Error in {nameof(ReplicationTrackingService)}. Terminating...");
+			_tcs.TrySetException(exc);
+			Application.Exit(ExitCode.Error, $"Error in {nameof(ReplicationTrackingService)}. Terminating...\nError: {exc.Message}");
+		}
+
+		_publisher.Publish(new SystemMessage.ServiceShutdown(nameof(ReplicationTrackingService)));
+	}
+
+	public void Handle(ReplicationTrackingMessage.LeaderReplicatedTo message) {
+		if (_stop)
+			return;
+		if (_state != VNodeState.Leader && _state != VNodeState.PreLeader && message.LogPosition > _replicationCheckpoint.Read()) {
+			_replicationCheckpoint.Write(message.LogPosition);
+			_replicationCheckpoint.Flush();
+			_publisher.Publish(new ReplicationTrackingMessage.ReplicatedTo(message.LogPosition));
+		}
+	}
+
+
+	private void UpdateReplicationPosition() {
+		var replicationCp = _replicationCheckpoint.Read();
+		var writerCp = _writerCheckpoint.Read();
+		if (writerCp <= replicationCp) { return; }
+
+		var minReplicas = _quorumSize - 1; //total - leader = min replicas
+		if (minReplicas == 0) {
+			_replicationCheckpoint.Write(writerCp);
+			_replicationCheckpoint.Flush();
+			_replicationChange.Set();
+			return;
+		}
+
+		long[] positions;
+		lock (_replicaLogPositions) {
+			positions = _replicaLogPositions.Values.ToArray();
+		}
+
+		if (positions.Length < minReplicas) { return; }
+
+		Array.Sort(positions);
+		var furthestReplicatedPosition = positions[^minReplicas];
+		if (furthestReplicatedPosition <= replicationCp) { return; }
+
+		var newReplicationPoint = Math.Min(writerCp, furthestReplicatedPosition);
+		_replicationCheckpoint.Write(newReplicationPoint);
+		_replicationCheckpoint.Flush();
+		_replicationChange.Set();
+	}
+
+
+	public void Handle(ReplicationTrackingMessage.ReplicaWriteAck message) {
+		if (_state != VNodeState.Leader && _state != VNodeState.PreLeader) { return; }
+
+		if (_replicaLogPositions.TryGetValue(message.SubscriptionId, out var position) &&
+			message.ReplicationLogPosition <= position) { return; }
+
+		_replicaLogPositions.AddOrUpdate(message.SubscriptionId, message.ReplicationLogPosition, (k, v) => message.ReplicationLogPosition);
+		UpdateReplicationPosition();
+	}
+
+	public void Handle(ReplicationTrackingMessage.WriterCheckpointFlushed message) {
+		if (_state != VNodeState.Leader && _state != VNodeState.PreLeader) { return; }
+
+		UpdateReplicationPosition();
+	}
+
+	public void Handle(SystemMessage.StateChangeMessage msg) {
+		//switching to leader from non-leader
+		if (_state != msg.State) {
+			_replicaLogPositions.Clear();
+		}
+
+		_state = msg.State;
+	}
+
+	public void Handle(SystemMessage.VNodeConnectionLost msg) {
+		if ((_state != VNodeState.Leader && _state != VNodeState.PreLeader) || !msg.SubscriptionId.HasValue)
+			return;
+		_replicaLogPositions.TryRemove(msg.SubscriptionId.Value, out _);
+	}
+
+	public void Handle(SystemMessage.BecomeShuttingDown message) {
+		Stop();
+	}
+
+	public void Handle(SystemMessage.SystemInit message) {
+		Start();
+	}
+
+
+	public void Handle(ReplicationMessage.ReplicaSubscribed message) {
+		if (message.SubscriptionPosition < _writerCheckpoint.ReadNonFlushed()) {
+			//Going offline for truncation
+			_log.Information("Offline truncation will happen, shutting down {service}", nameof(ReplicationTrackingService));
+			Stop();
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Replication/TransactionFramer.cs b/src/KurrentDB.Core/Services/Replication/TransactionFramer.cs
new file mode 100644
index 00000000000..8cbe3863dff
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Replication/TransactionFramer.cs
@@ -0,0 +1,59 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Transport.Tcp.Framing;
+
+namespace KurrentDB.Core.Services.Replication;
+
+internal sealed class TransactionFramer : IAsyncMessageFramer<IEnumerable<ILogRecord>> {
+	private readonly List<ILogRecord> _records = new(capacity: 1024);
+	private readonly IAsyncMessageFramer<ILogRecord> _inner;
+	private Func<IEnumerable<ILogRecord>, CancellationToken, ValueTask> _handler = static (_, _) => ValueTask.CompletedTask;
+
+	public TransactionFramer(IAsyncMessageFramer<ILogRecord> inner) {
+		_inner = inner;
+		_inner.RegisterMessageArrivedCallback(OnLogRecordUnframed);
+	}
+
+	public bool HasData => _records.Count > 0 || _inner.HasData;
+
+	public IEnumerable<ArraySegment<byte>> FrameData(ArraySegment<byte> data) => _inner.FrameData(data);
+
+	public ValueTask UnFrameData(IEnumerable<ArraySegment<byte>> data, CancellationToken token) => _inner.UnFrameData(data, token);
+
+	public ValueTask UnFrameData(ArraySegment<byte> data, CancellationToken token) => _inner.UnFrameData(data, token);
+
+	public void Reset() {
+		_records.Clear();
+		_inner.Reset();
+	}
+
+	private async ValueTask OnLogRecordUnframed(ILogRecord record, CancellationToken token) {
+		_records.Add(record);
+		if (record.IsTransactionBoundary()) {
+			await _handler(_records, token);
+			_records.Clear();
+		}
+	}
+
+	public void RegisterMessageArrivedCallback(Func<IEnumerable<ILogRecord>, CancellationToken, ValueTask> handler) {
+		Ensure.NotNull(handler, nameof(handler));
+		_handler = handler;
+	}
+
+	public async ValueTask<int?> UnFramePendingLogRecords(CancellationToken token) {
+		if (_records is [])
+			return null;
+
+		var numLogRecordsUnframed = _records.Count;
+		await _handler(_records, token);
+		_records.Clear();
+		return numLogRecordsUnframed;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/RequestForwardingService.cs b/src/KurrentDB.Core/Services/RequestForwardingService.cs
new file mode 100644
index 00000000000..142ca94566d
--- /dev/null
+++ b/src/KurrentDB.Core/Services/RequestForwardingService.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Services.VNode;
+
+namespace KurrentDB.Core.Services;
+
+public class RequestForwardingService : IHandle<SystemMessage.SystemStart>,
+	IHandle<SystemMessage.RequestForwardingTimerTick>,
+	IHandle<ClientMessage.NotHandled>,
+	IHandle<ClientMessage.WriteEventsCompleted>,
+	IHandle<ClientMessage.TransactionStartCompleted>,
+	IHandle<ClientMessage.TransactionWriteCompleted>,
+	IHandle<ClientMessage.TransactionCommitCompleted>,
+	IHandle<ClientMessage.DeleteStreamCompleted> {
+	private readonly IPublisher _bus;
+	private readonly MessageForwardingProxy _forwardingProxy;
+
+	private readonly TimerMessage.Schedule _tickScheduleMessage;
+
+	public RequestForwardingService(IPublisher bus, MessageForwardingProxy forwardingProxy, TimeSpan tickInterval) {
+		Ensure.Nonnegative(tickInterval.Milliseconds, "tickInterval");
+
+		_bus = Ensure.NotNull(bus);
+		_forwardingProxy = Ensure.NotNull(forwardingProxy);
+		_tickScheduleMessage = TimerMessage.Schedule.Create(tickInterval, bus, new SystemMessage.RequestForwardingTimerTick());
+	}
+
+	public void Handle(SystemMessage.SystemStart message) {
+		_bus.Publish(_tickScheduleMessage);
+	}
+
+	public void Handle(SystemMessage.RequestForwardingTimerTick message) {
+		_forwardingProxy.TimeoutForwardings();
+		_bus.Publish(_tickScheduleMessage);
+	}
+
+	public void Handle(ClientMessage.NotHandled message) {
+		_forwardingProxy.TryForwardReply(message.CorrelationId, message, (clientCorrId, m) => new(clientCorrId, m.Reason, m.LeaderInfo));
+	}
+
+	public void Handle(ClientMessage.WriteEventsCompleted message) {
+		_forwardingProxy.TryForwardReply(message.CorrelationId, message, (clientCorrId, m) => m.WithCorrelationId(clientCorrId));
+	}
+
+	public void Handle(ClientMessage.TransactionStartCompleted message) {
+		_forwardingProxy.TryForwardReply(message.CorrelationId, message, (clientCorrId, m) => m.WithCorrelationId(clientCorrId));
+	}
+
+	public void Handle(ClientMessage.TransactionWriteCompleted message) {
+		_forwardingProxy.TryForwardReply(message.CorrelationId, message, (clientCorrId, m) => m.WithCorrelationId(clientCorrId));
+	}
+
+	public void Handle(ClientMessage.TransactionCommitCompleted message) {
+		_forwardingProxy.TryForwardReply(message.CorrelationId, message, (clientCorrId, m) => m.WithCorrelationId(clientCorrId));
+	}
+
+	public void Handle(ClientMessage.DeleteStreamCompleted message) {
+		_forwardingProxy.TryForwardReply(message.CorrelationId, message, (clientCorrId, m) => m.WithCorrelationId(clientCorrId));
+	}
+}
diff --git a/src/KurrentDB.Core/Services/RequestManager/CommitLevels.cs b/src/KurrentDB.Core/Services/RequestManager/CommitLevels.cs
new file mode 100644
index 00000000000..731a9c4c5d9
--- /dev/null
+++ b/src/KurrentDB.Core/Services/RequestManager/CommitLevels.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.RequestManager;
+
+public enum CommitLevel {
+	Replicated, //Write on Cluster Quorum
+	Indexed //Indexed on Leader
+}
diff --git a/src/KurrentDB.Core/Services/RequestManager/CommitSource.cs b/src/KurrentDB.Core/Services/RequestManager/CommitSource.cs
new file mode 100644
index 00000000000..fc047520592
--- /dev/null
+++ b/src/KurrentDB.Core/Services/RequestManager/CommitSource.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+
+namespace KurrentDB.Core.Services.RequestManager;
+
+public class CommitSource :
+IHandle<ReplicationTrackingMessage.IndexedTo>,
+IHandle<ReplicationTrackingMessage.ReplicatedTo> {
+	private readonly ConcurrentDictionary<long, List<Action>> _notifyReplicated = new ConcurrentDictionary<long, List<Action>>();
+	private readonly ConcurrentDictionary<long, List<Action>> _notifyIndexed = new ConcurrentDictionary<long, List<Action>>();
+	private long _replicatedPosition;
+	private long _indexedPosition;
+
+	public long ReplicationPosition => _replicatedPosition;
+	public long IndexedPosition => _indexedPosition;
+
+	public void Handle(ReplicationTrackingMessage.ReplicatedTo message) {
+		Interlocked.Exchange(ref _replicatedPosition, message.LogPosition);
+		Notify(_notifyReplicated, message.LogPosition);
+	}
+
+	public void Handle(ReplicationTrackingMessage.IndexedTo message) {
+		Interlocked.Exchange(ref _indexedPosition, message.LogPosition);
+		Notify(_notifyIndexed, message.LogPosition);
+	}
+
+	public void NotifyFor(long position, Action target, CommitLevel level = CommitLevel.Indexed) {
+		long currentPosition;
+		ConcurrentDictionary<long, List<Action>> notificationDictionary;
+		switch (level) {
+			case CommitLevel.Replicated:
+				currentPosition = Interlocked.Read(ref _replicatedPosition);
+				notificationDictionary = _notifyReplicated;
+				break;
+			case CommitLevel.Indexed:
+				currentPosition = Interlocked.Read(ref _indexedPosition);
+				notificationDictionary = _notifyIndexed;
+				break;
+			default:
+				throw new ArgumentOutOfRangeException(nameof(level), level, null);
+		}
+		if (currentPosition >= position) { target(); }
+		if (!notificationDictionary.TryGetValue(position, out var actionList)) {
+			actionList = new List<Action> { target };
+			notificationDictionary.TryAdd(position, actionList);
+		} else {
+			lock (actionList) {
+				actionList.Add(target);
+			}
+		}
+	}
+	private void Notify(ConcurrentDictionary<long, List<Action>> dictionary, long logPosition) {
+		if (dictionary.IsEmpty) { return; }
+		long[] positions;
+		lock (dictionary) {
+			positions = dictionary.Keys.ToArray();
+		}
+		Array.Sort(positions);
+		var actionList = new List<Action>();
+		for (int i = 0; i < positions.Length && positions[i] <= logPosition; i++) {
+			if (dictionary.TryRemove(positions[i], out var actions) && actions != null) {
+				actionList.AddRange(actions);
+			}
+		}
+		actionList?.ForEach(a => { try { a?.Invoke(); } catch { /*ignore*/ } });
+	}
+}
diff --git a/src/KurrentDB.Core/Services/RequestManager/Managers/DeleteStream.cs b/src/KurrentDB.Core/Services/RequestManager/Managers/DeleteStream.cs
new file mode 100644
index 00000000000..6edb79768d0
--- /dev/null
+++ b/src/KurrentDB.Core/Services/RequestManager/Managers/DeleteStream.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Services.RequestManager.Managers;
+
+public class DeleteStream : RequestManagerBase {
+	private readonly bool _hardDelete;
+	private readonly CancellationToken _cancellationToken;
+	private readonly string _streamId;
+
+	public DeleteStream(
+				IPublisher publisher,
+				TimeSpan timeout,
+				IEnvelope clientResponseEnvelope,
+				Guid internalCorrId,
+				Guid clientCorrId,
+				string streamId,
+				long expectedVersion,
+				bool hardDelete,
+				CommitSource commitSource,
+				CancellationToken cancellationToken = default)
+		: base(
+				 publisher,
+				 timeout,
+				 clientResponseEnvelope,
+				 internalCorrId,
+				 clientCorrId,
+				 expectedVersion,
+				 commitSource,
+				 prepareCount: 0,
+				 waitForCommit: true) {
+		_hardDelete = hardDelete;
+		_cancellationToken = cancellationToken;
+		_streamId = streamId;
+	}
+
+	protected override Message WriteRequestMsg =>
+		new StorageMessage.WriteDelete(
+				InternalCorrId,
+				WriteReplyEnvelope,
+				_streamId,
+				ExpectedVersion,
+				_hardDelete,
+				_cancellationToken);
+
+	protected override Message ClientSuccessMsg =>
+		 new ClientMessage.DeleteStreamCompleted(
+			 ClientCorrId,
+			 OperationResult.Success,
+			 null,
+			 LastEventNumber,
+			 CommitPosition,  //not technically correct, but matches current behavior correctly
+			 CommitPosition);
+
+	protected override Message ClientFailMsg =>
+		new ClientMessage.DeleteStreamCompleted(ClientCorrId, Result, FailureMessage, FailureCurrentVersion);
+}
diff --git a/src/KurrentDB.Core/Services/RequestManager/Managers/RequestManagerBase.cs b/src/KurrentDB.Core/Services/RequestManager/Managers/RequestManagerBase.cs
new file mode 100644
index 00000000000..c75e8bc8f99
--- /dev/null
+++ b/src/KurrentDB.Core/Services/RequestManager/Managers/RequestManagerBase.cs
@@ -0,0 +1,223 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.RequestManager.Managers;
+
+public abstract class RequestManagerBase :
+	IHandle<StorageMessage.PrepareAck>,
+	IHandle<StorageMessage.CommitIndexed>,
+	IHandle<StorageMessage.InvalidTransaction>,
+	IHandle<StorageMessage.StreamDeleted>,
+	IHandle<StorageMessage.WrongExpectedVersion>,
+	IHandle<StorageMessage.AlreadyCommitted>,
+	IHandle<StorageMessage.RequestManagerTimerTick>,
+	IDisposable {
+
+	private static readonly ILogger Log = Serilog.Log.ForContext<RequestManagerBase>();
+
+	protected readonly IPublisher Publisher;
+	protected TimeSpan Timeout;
+	protected readonly IEnvelope WriteReplyEnvelope;
+
+	private readonly IEnvelope _clientResponseEnvelope;
+	protected readonly Guid InternalCorrId;
+	protected readonly Guid ClientCorrId;
+	protected readonly long ExpectedVersion;
+
+	protected OperationResult Result;
+	protected long FirstEventNumber = -1;
+	protected long LastEventNumber = -1;
+	protected string FailureMessage = string.Empty;
+	protected long FailureCurrentVersion = -1;
+	protected long TransactionId;
+
+	protected readonly CommitSource CommitSource;
+	protected long LastEventPosition;
+	protected bool Registered;
+	protected long CommitPosition = -1;
+
+	private readonly HashSet<long> _prepareLogPositions = new HashSet<long>();
+
+	private bool _allEventsWritten;
+	private bool _allPreparesWritten;
+	private long _complete;
+
+	private bool _commitReceived;
+	private readonly int _prepareCount;
+
+	protected DateTime NextTimeoutTime;
+	private readonly TimeSpan _timeoutOffset = TimeSpan.FromMilliseconds(30);
+
+
+	protected RequestManagerBase(
+			IPublisher publisher,
+			TimeSpan timeout,
+			IEnvelope clientResponseEnvelope,
+			Guid internalCorrId,
+			Guid clientCorrId,
+			long expectedVersion,
+			CommitSource commitSource,
+			int prepareCount = 0,
+			long transactionId = -1,
+			bool waitForCommit = false) {
+		Ensure.NotEmptyGuid(internalCorrId, nameof(internalCorrId));
+		Ensure.NotEmptyGuid(clientCorrId, nameof(clientCorrId));
+		Ensure.NotNull(publisher, nameof(publisher));
+		Ensure.NotNull(clientResponseEnvelope, nameof(clientResponseEnvelope));
+		Ensure.NotNull(commitSource, nameof(commitSource));
+
+		Publisher = publisher;
+		Timeout = timeout;
+		_clientResponseEnvelope = clientResponseEnvelope;
+		InternalCorrId = internalCorrId;
+		ClientCorrId = clientCorrId;
+		WriteReplyEnvelope = Publisher;
+		ExpectedVersion = expectedVersion;
+		CommitSource = commitSource;
+		_prepareCount = prepareCount;
+		TransactionId = transactionId;
+		_commitReceived = !waitForCommit; //if not waiting for commit flag as true
+		_allPreparesWritten = _prepareCount == 0; //if not waiting for prepares flag as true
+		if (prepareCount == 0 && waitForCommit == false) {
+			//empty operation just return success
+			var position = Math.Max(transactionId, 0);
+			ReturnCommitAt(position, 0, 0);
+		}
+	}
+	protected DateTime LiveUntil => NextTimeoutTime - _timeoutOffset;
+
+	protected abstract Message WriteRequestMsg { get; }
+	protected abstract Message ClientSuccessMsg { get; }
+	protected abstract Message ClientFailMsg { get; }
+	public void Start() {
+		NextTimeoutTime = DateTime.UtcNow + Timeout;
+		Publisher.Publish(WriteRequestMsg);
+	}
+
+	public void Handle(StorageMessage.PrepareAck message) {
+		if (Interlocked.Read(ref _complete) == 1 || _allPreparesWritten) { return; }
+		NextTimeoutTime = DateTime.UtcNow + Timeout;
+		if (message.Flags.HasAnyOf(PrepareFlags.TransactionBegin)) {
+			TransactionId = message.LogPosition;
+		}
+		if (message.LogPosition > LastEventPosition) {
+			LastEventPosition = message.LogPosition;
+		}
+
+		lock (_prepareLogPositions) {
+			_prepareLogPositions.Add(message.LogPosition);
+			_allPreparesWritten = _prepareLogPositions.Count == _prepareCount;
+		}
+		if (_allPreparesWritten) { AllPreparesWritten(); }
+		_allEventsWritten = _commitReceived && _allPreparesWritten;
+		if (_allEventsWritten) { AllEventsWritten(); }
+	}
+	public virtual void Handle(StorageMessage.CommitIndexed message) {
+		if (Interlocked.Read(ref _complete) == 1 || _commitReceived) { return; }
+		NextTimeoutTime = DateTime.UtcNow + Timeout;
+		_commitReceived = true;
+		_allEventsWritten = _commitReceived && _allPreparesWritten;
+		if (message.LogPosition > LastEventPosition) {
+			LastEventPosition = message.LogPosition;
+		}
+		FirstEventNumber = message.FirstEventNumber;
+		LastEventNumber = message.LastEventNumber;
+		CommitPosition = message.LogPosition;
+		if (_allEventsWritten) { AllEventsWritten(); }
+	}
+	protected virtual void AllPreparesWritten() { }
+
+	protected virtual void AllEventsWritten() {
+		if (CommitSource.IndexedPosition >= LastEventPosition) {
+			Committed();
+		} else if (!Registered) {
+			CommitSource.NotifyFor(LastEventPosition, Committed);
+			Registered = true;
+		}
+	}
+	protected virtual void Committed() {
+		if (Interlocked.CompareExchange(ref _complete, 1, 0) == 1) { return; }
+		Result = OperationResult.Success;
+		_clientResponseEnvelope.ReplyWith(ClientSuccessMsg);
+		Publisher.Publish(new StorageMessage.RequestCompleted(InternalCorrId, true));
+	}
+	public void Handle(StorageMessage.RequestManagerTimerTick message) {
+		if (_allEventsWritten) { AllEventsWritten(); }
+		if (Interlocked.Read(ref _complete) == 1 || message.UtcNow < NextTimeoutTime)
+			return;
+		var result = !_allPreparesWritten ? OperationResult.PrepareTimeout : OperationResult.CommitTimeout;
+		var msg = !_allPreparesWritten ? "Prepare phase timeout." : "Commit phase timeout.";
+		CompleteFailedRequest(result, msg);
+	}
+	public void Handle(StorageMessage.InvalidTransaction message) {
+		CompleteFailedRequest(OperationResult.InvalidTransaction, "Invalid transaction.");
+	}
+	public void Handle(StorageMessage.WrongExpectedVersion message) {
+		FailureCurrentVersion = message.CurrentVersion;
+		CompleteFailedRequest(OperationResult.WrongExpectedVersion, "Wrong expected version.", message.CurrentVersion);
+	}
+	public void Handle(StorageMessage.StreamDeleted message) {
+		CompleteFailedRequest(OperationResult.StreamDeleted, "Stream is deleted.");
+	}
+	public void Handle(StorageMessage.AlreadyCommitted message) {
+		if (Interlocked.Read(ref _complete) == 1 || _allEventsWritten) { return; }
+		Log.Debug("IDEMPOTENT WRITE TO STREAM ClientCorrelationID {clientCorrelationId}, {message}.", ClientCorrId,
+			message);
+		ReturnCommitAt(message.LogPosition, message.FirstEventNumber, message.LastEventNumber);
+	}
+	protected virtual void ReturnCommitAt(long logPosition, long firstEvent, long lastEvent) {
+		lock (_prepareLogPositions) {
+			_prepareLogPositions.Clear();
+			_prepareLogPositions.Add(logPosition);
+
+			FirstEventNumber = firstEvent;
+			LastEventNumber = lastEvent;
+			CommitPosition = logPosition;
+			Committed();
+		}
+	}
+
+	private void CompleteFailedRequest(OperationResult result, string error, long currentVersion = -1) {
+		Debug.Assert(result != OperationResult.Success);
+		if (Interlocked.CompareExchange(ref _complete, 1, 0) == 1) { return; }
+		Result = result;
+		FailureMessage = error;
+		Publisher.Publish(new StorageMessage.RequestCompleted(InternalCorrId, false, currentVersion));
+		_clientResponseEnvelope.ReplyWith(ClientFailMsg);
+	}
+
+	#region IDisposable Support
+	private bool _disposed; // To detect redundant calls
+
+	protected virtual void Dispose(bool disposing) {
+		if (!_disposed) {
+			if (disposing) {
+				try {
+					if (Interlocked.Read(ref _complete) != 1) {
+						//todo (clc) need a better Result here, but need to see if this will impact the client API
+						var result = !_allPreparesWritten ? OperationResult.PrepareTimeout : OperationResult.CommitTimeout;
+						var msg = "Request canceled by server";
+						CompleteFailedRequest(result, msg);
+					}
+				} catch { /*don't throw in disposed*/}
+
+				_disposed = true;
+			}
+		}
+	}
+	public void Dispose() {
+		Dispose(true);
+	}
+	#endregion
+}
diff --git a/src/KurrentDB.Core/Services/RequestManager/Managers/TransactionCommit.cs b/src/KurrentDB.Core/Services/RequestManager/Managers/TransactionCommit.cs
new file mode 100644
index 00000000000..fc16c1e9bba
--- /dev/null
+++ b/src/KurrentDB.Core/Services/RequestManager/Managers/TransactionCommit.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Services.RequestManager.Managers;
+
+public class TransactionCommit : RequestManagerBase,
+	IHandle<StorageMessage.CommitIndexed> {
+	private readonly TimeSpan _commitTimeout;
+	private bool _transactionWritten;
+	public TransactionCommit(
+				IPublisher publisher,
+				TimeSpan prepareTimeout,
+				TimeSpan commitTimeout,
+				IEnvelope clientResponseEnvelope,
+				Guid internalCorrId,
+				Guid clientCorrId,
+				long transactionId,
+				CommitSource commitSource)
+		: base(
+				 publisher,
+				 prepareTimeout,
+				 clientResponseEnvelope,
+				 internalCorrId,
+				 clientCorrId,
+				 expectedVersion: -1,
+				 commitSource,
+				 transactionId: transactionId,
+				 prepareCount: 1,
+				 waitForCommit: true) {
+		_commitTimeout = commitTimeout;
+	}
+
+	protected override Message WriteRequestMsg =>
+		new StorageMessage.WriteTransactionEnd(
+				InternalCorrId,
+				WriteReplyEnvelope,
+				TransactionId,
+				LiveUntil);
+
+	protected override void AllPreparesWritten() {
+		base.AllPreparesWritten();
+		NextTimeoutTime = DateTime.UtcNow + _commitTimeout;
+		Publisher.Publish(
+			new StorageMessage.WriteCommit(
+					InternalCorrId,
+					WriteReplyEnvelope,
+					TransactionId));
+	}
+
+	protected override Message ClientSuccessMsg =>
+		 new ClientMessage.TransactionCommitCompleted(
+				ClientCorrId,
+				TransactionId,
+				FirstEventNumber,
+				LastEventNumber,
+				CommitPosition,   //not technically correct, but matches current behavior correctly
+				CommitPosition);
+
+	protected override Message ClientFailMsg =>
+		 new ClientMessage.TransactionCommitCompleted(
+				ClientCorrId,
+				TransactionId,
+				Result,
+				FailureMessage);
+
+	public override void Handle(StorageMessage.CommitIndexed message) {
+		base.Handle(message);
+		_transactionWritten = true;
+		Committed();
+	}
+	protected override void Committed() {
+		if (!_transactionWritten)
+			return;
+		base.Committed();
+	}
+	protected override void ReturnCommitAt(long logPosition, long firstEvent, long lastEvent) {
+		_transactionWritten = true;
+		base.ReturnCommitAt(logPosition, firstEvent, lastEvent);
+	}
+
+
+}
diff --git a/src/KurrentDB.Core/Services/RequestManager/Managers/TransactionStart.cs b/src/KurrentDB.Core/Services/RequestManager/Managers/TransactionStart.cs
new file mode 100644
index 00000000000..79578b7c3df
--- /dev/null
+++ b/src/KurrentDB.Core/Services/RequestManager/Managers/TransactionStart.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Services.RequestManager.Managers;
+
+public class TransactionStart : RequestManagerBase {
+	private readonly string _streamId;
+
+	public TransactionStart(
+				IPublisher publisher,
+				TimeSpan timeout,
+				IEnvelope clientResponseEnvelope,
+				Guid internalCorrId,
+				Guid clientCorrId,
+				string streamId,
+				long expectedVersion,
+				CommitSource commitSource)
+		: base(
+				 publisher,
+				 timeout,
+				 clientResponseEnvelope,
+				 internalCorrId,
+				 clientCorrId,
+				 expectedVersion,
+				 commitSource,
+				 prepareCount: 1) {
+		_streamId = streamId;
+	}
+
+	protected override Message WriteRequestMsg =>
+		new StorageMessage.WriteTransactionStart(
+				InternalCorrId,
+				WriteReplyEnvelope,
+				_streamId,
+				ExpectedVersion,
+				LiveUntil);
+
+	protected override void AllEventsWritten() {
+		if (CommitSource.ReplicationPosition >= LastEventPosition) {
+			Committed();
+		} else if (!Registered) {
+			CommitSource.NotifyFor(LastEventPosition, Committed, CommitLevel.Replicated);
+			Registered = true;
+		}
+	}
+
+	protected override Message ClientSuccessMsg =>
+		 new ClientMessage.TransactionStartCompleted(
+					ClientCorrId,
+					TransactionId,
+					OperationResult.Success,
+					null);
+
+	protected override Message ClientFailMsg =>
+		 new ClientMessage.TransactionStartCompleted(
+					ClientCorrId,
+					TransactionId,
+					Result,
+					FailureMessage);
+
+}
diff --git a/src/KurrentDB.Core/Services/RequestManager/Managers/TransactionWrite.cs b/src/KurrentDB.Core/Services/RequestManager/Managers/TransactionWrite.cs
new file mode 100644
index 00000000000..a20dd029e1e
--- /dev/null
+++ b/src/KurrentDB.Core/Services/RequestManager/Managers/TransactionWrite.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Services.RequestManager.Managers;
+
+public class TransactionWrite : RequestManagerBase {
+	private static readonly Operation Operation = new Operation(Operations.Streams.Write);
+	private readonly Event[] _events;
+	private long _transactionId;
+
+	public TransactionWrite(
+				IPublisher publisher,
+				TimeSpan timeout,
+				IEnvelope clientResponseEnvelope,
+				Guid internalCorrId,
+				Guid clientCorrId,
+				Event[] events,
+				long transactionId,
+				CommitSource commitSource)
+		: base(
+				 publisher,
+				 timeout,
+				 clientResponseEnvelope,
+				 internalCorrId,
+				 clientCorrId,
+				 expectedVersion: -1,
+				 commitSource,
+				 prepareCount: events.Length,
+				 transactionId) {
+		_events = events;
+		_transactionId = transactionId;
+	}
+
+	protected override Message WriteRequestMsg =>
+		new StorageMessage.WriteTransactionData(
+				InternalCorrId,
+				WriteReplyEnvelope,
+				TransactionId,
+				_events);
+
+	protected override void AllEventsWritten() {
+		if (CommitSource.ReplicationPosition >= LastEventPosition) {
+			Committed();
+		} else if (!Registered) {
+			CommitSource.NotifyFor(LastEventPosition, Committed, CommitLevel.Replicated);
+			Registered = true;
+		}
+	}
+
+	protected override Message ClientSuccessMsg =>
+		 new ClientMessage.TransactionWriteCompleted(
+					ClientCorrId,
+					TransactionId,
+					OperationResult.Success,
+					null);
+	protected override Message ClientFailMsg =>
+		 new ClientMessage.TransactionWriteCompleted(
+					ClientCorrId,
+					TransactionId,
+					Result,
+					FailureMessage);
+}
diff --git a/src/KurrentDB.Core/Services/RequestManager/Managers/WriteEvents.cs b/src/KurrentDB.Core/Services/RequestManager/Managers/WriteEvents.cs
new file mode 100644
index 00000000000..da7b37c5bdc
--- /dev/null
+++ b/src/KurrentDB.Core/Services/RequestManager/Managers/WriteEvents.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Services.RequestManager.Managers;
+
+public class WriteEvents : RequestManagerBase {
+	private readonly string _streamId;
+	private readonly Event[] _events;
+	private readonly CancellationToken _cancellationToken;
+	public WriteEvents(IPublisher publisher,
+		TimeSpan timeout,
+		IEnvelope clientResponseEnvelope,
+		Guid internalCorrId,
+		Guid clientCorrId,
+		string streamId,
+		long expectedVersion,
+		Event[] events,
+		CommitSource commitSource,
+		CancellationToken cancellationToken = default)
+		: base(
+				 publisher,
+				 timeout,
+				 clientResponseEnvelope,
+				 internalCorrId,
+				 clientCorrId,
+				 expectedVersion,
+				 commitSource,
+				 prepareCount: 0,
+				 waitForCommit: true) {
+		_streamId = streamId;
+		_events = events;
+		_cancellationToken = cancellationToken;
+	}
+
+	protected override Message WriteRequestMsg =>
+		new StorageMessage.WritePrepares(
+				InternalCorrId,
+				WriteReplyEnvelope,
+				_streamId,
+				ExpectedVersion,
+				_events,
+				_cancellationToken);
+
+
+	protected override Message ClientSuccessMsg =>
+		 new ClientMessage.WriteEventsCompleted(
+			 ClientCorrId,
+			 FirstEventNumber,
+			 LastEventNumber,
+			 CommitPosition,  //not technically correct, but matches current behavior correctly
+			 CommitPosition);
+
+	protected override Message ClientFailMsg =>
+		 new ClientMessage.WriteEventsCompleted(
+			 ClientCorrId,
+			 Result,
+			 FailureMessage,
+			 FailureCurrentVersion);
+}
diff --git a/src/KurrentDB.Core/Services/RequestManager/RequestManagementService.cs b/src/KurrentDB.Core/Services/RequestManager/RequestManagementService.cs
new file mode 100644
index 00000000000..d78d90194ff
--- /dev/null
+++ b/src/KurrentDB.Core/Services/RequestManager/RequestManagementService.cs
@@ -0,0 +1,228 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.RequestManager.Managers;
+using KurrentDB.Core.Services.TimerService;
+
+namespace KurrentDB.Core.Services.RequestManager;
+
+public class RequestManagementService :
+	IHandle<SystemMessage.SystemInit>,
+	IHandle<ClientMessage.WriteEvents>,
+	IHandle<ClientMessage.DeleteStream>,
+	IHandle<ClientMessage.TransactionStart>,
+	IHandle<ClientMessage.TransactionWrite>,
+	IHandle<ClientMessage.TransactionCommit>,
+	IHandle<StorageMessage.RequestCompleted>,
+	IHandle<StorageMessage.AlreadyCommitted>,
+	IHandle<StorageMessage.PrepareAck>,
+	IHandle<ReplicationTrackingMessage.ReplicatedTo>,
+	IHandle<ReplicationTrackingMessage.IndexedTo>,
+	IHandle<StorageMessage.CommitIndexed>,
+	IHandle<StorageMessage.WrongExpectedVersion>,
+	IHandle<StorageMessage.InvalidTransaction>,
+	IHandle<StorageMessage.StreamDeleted>,
+	IHandle<StorageMessage.RequestManagerTimerTick>,
+	IHandle<SystemMessage.StateChangeMessage> {
+	private readonly IPublisher _bus;
+	private readonly TimerMessage.Schedule _tickRequestMessage;
+	private readonly Dictionary<Guid, RequestManagerBase> _currentRequests = new Dictionary<Guid, RequestManagerBase>();
+	private readonly Dictionary<Guid, Stopwatch> _currentTimedRequests = new Dictionary<Guid, Stopwatch>();
+	private readonly TimeSpan _prepareTimeout;
+	private readonly TimeSpan _commitTimeout;
+	private readonly CommitSource _commitSource;
+	private readonly bool _explicitTransactionsSupported;
+	private VNodeState _nodeState;
+
+	public RequestManagementService(IPublisher bus,
+		TimeSpan prepareTimeout,
+		TimeSpan commitTimeout,
+		bool explicitTransactionsSupported) {
+		Ensure.NotNull(bus, "bus");
+		_bus = bus;
+		_tickRequestMessage = TimerMessage.Schedule.Create(TimeSpan.FromMilliseconds(1000),
+			bus,
+			new StorageMessage.RequestManagerTimerTick());
+
+		_prepareTimeout = prepareTimeout;
+		_commitTimeout = commitTimeout;
+		_commitSource = new CommitSource();
+		_explicitTransactionsSupported = explicitTransactionsSupported;
+	}
+
+	public void Handle(ClientMessage.WriteEvents message) {
+		var manager = new WriteEvents(
+							_bus,
+							_commitTimeout,
+							message.Envelope,
+							message.InternalCorrId,
+							message.CorrelationId,
+							message.EventStreamId,
+							message.ExpectedVersion,
+							message.Events,
+							_commitSource,
+							message.CancellationToken);
+		_currentRequests.Add(message.InternalCorrId, manager);
+		_currentTimedRequests.Add(message.InternalCorrId, Stopwatch.StartNew());
+		manager.Start();
+	}
+
+	public void Handle(ClientMessage.DeleteStream message) {
+		var manager = new DeleteStream(
+							_bus,
+							_commitTimeout,
+							message.Envelope,
+							message.InternalCorrId,
+							message.CorrelationId,
+							message.EventStreamId,
+							message.ExpectedVersion,
+							message.HardDelete,
+							_commitSource,
+							message.CancellationToken);
+		_currentRequests.Add(message.InternalCorrId, manager);
+		_currentTimedRequests.Add(message.InternalCorrId, Stopwatch.StartNew());
+		manager.Start();
+	}
+
+	public void Handle(ClientMessage.TransactionStart message) {
+		if (!_explicitTransactionsSupported) {
+			var reply = new ClientMessage.TransactionStartCompleted(
+				message.CorrelationId,
+				default,
+				OperationResult.InvalidTransaction,
+				"Explicit transactions are not supported");
+			message.Envelope.ReplyWith(reply);
+			return;
+		}
+
+		var manager = new TransactionStart(
+							_bus,
+							_prepareTimeout,
+							message.Envelope,
+							message.InternalCorrId,
+							message.CorrelationId,
+							message.EventStreamId,
+							message.ExpectedVersion,
+							_commitSource);
+		_currentRequests.Add(message.InternalCorrId, manager);
+		_currentTimedRequests.Add(message.InternalCorrId, Stopwatch.StartNew());
+		manager.Start();
+	}
+
+	public void Handle(ClientMessage.TransactionWrite message) {
+		if (!_explicitTransactionsSupported) {
+			var reply = new ClientMessage.TransactionWriteCompleted(
+				message.CorrelationId,
+				default,
+				OperationResult.InvalidTransaction,
+				"Explicit transactions are not supported");
+			message.Envelope.ReplyWith(reply);
+			return;
+		}
+
+		var manager = new TransactionWrite(
+							_bus,
+							_prepareTimeout,
+							message.Envelope,
+							message.InternalCorrId,
+							message.CorrelationId,
+							message.Events,
+							message.TransactionId,
+							_commitSource);
+		_currentRequests.Add(message.InternalCorrId, manager);
+		_currentTimedRequests.Add(message.InternalCorrId, Stopwatch.StartNew());
+		manager.Start();
+	}
+
+	public void Handle(ClientMessage.TransactionCommit message) {
+		if (!_explicitTransactionsSupported) {
+			var reply = new ClientMessage.TransactionCommitCompleted(
+				message.CorrelationId,
+				default,
+				OperationResult.InvalidTransaction,
+				"Explicit transactions are not supported");
+			message.Envelope.ReplyWith(reply);
+			return;
+		}
+
+		var manager = new TransactionCommit(
+							_bus,
+							_prepareTimeout,
+							_commitTimeout,
+							message.Envelope,
+							message.InternalCorrId,
+							message.CorrelationId,
+							message.TransactionId,
+							_commitSource);
+		_currentRequests.Add(message.InternalCorrId, manager);
+		_currentTimedRequests.Add(message.InternalCorrId, Stopwatch.StartNew());
+		manager.Start();
+	}
+
+
+	public void Handle(SystemMessage.StateChangeMessage message) {
+
+		if (_nodeState == VNodeState.Leader && message.State is not VNodeState.Leader or VNodeState.ResigningLeader) {
+			var keys = _currentRequests.Keys;
+			foreach (var key in keys) {
+				if (_currentRequests.Remove(key, out var manager)) {
+					manager.Dispose();
+				}
+			}
+		}
+		_nodeState = message.State;
+	}
+
+	public void Handle(SystemMessage.SystemInit message) {
+		_bus.Publish(_tickRequestMessage);
+	}
+
+	public void Handle(StorageMessage.RequestManagerTimerTick message) {
+		foreach (var currentRequest in _currentRequests) {
+			currentRequest.Value.Handle(message);
+		}
+		//TODO(clc): if we have become resigning leader should all requests be actively disposed?
+		if (_nodeState == VNodeState.ResigningLeader && _currentRequests.Count == 0) {
+			_bus.Publish(new SystemMessage.RequestQueueDrained());
+		}
+
+		_bus.Publish(_tickRequestMessage);
+	}
+
+	public void Handle(StorageMessage.RequestCompleted message) {
+		if (_currentTimedRequests.TryGetValue(message.CorrelationId, out _)) {
+			// todo: histogram metric?
+			_currentTimedRequests.Remove(message.CorrelationId);
+		}
+
+		if (!_currentRequests.Remove(message.CorrelationId)) {
+			// noop. RequestManager guarantees not complete twice now.
+			// and we will legitimately get in here when StateChangeMessage removes
+			// entries from _currentRequests
+		}
+	}
+
+	public void Handle(ReplicationTrackingMessage.ReplicatedTo message) => _commitSource.Handle(message);
+	public void Handle(ReplicationTrackingMessage.IndexedTo message) => _commitSource.Handle(message);
+
+	public void Handle(StorageMessage.AlreadyCommitted message) => DispatchInternal(message.CorrelationId, message, static (manager, m) => manager.Handle(m));
+	public void Handle(StorageMessage.PrepareAck message) => DispatchInternal(message.CorrelationId, message, static (manager, m) => manager.Handle(m));
+	public void Handle(StorageMessage.CommitIndexed message) => DispatchInternal(message.CorrelationId, message, static (manager, m) => manager.Handle(m));
+	public void Handle(StorageMessage.WrongExpectedVersion message) => DispatchInternal(message.CorrelationId, message, static (manager, m) => manager.Handle(m));
+	public void Handle(StorageMessage.InvalidTransaction message) => DispatchInternal(message.CorrelationId, message, static (manager, m) => manager.Handle(m));
+	public void Handle(StorageMessage.StreamDeleted message) => DispatchInternal(message.CorrelationId, message, static (manager, m) => manager.Handle(m));
+
+	private void DispatchInternal<T>(Guid correlationId, T message, Action<RequestManagerBase, T> handle) where T : Message {
+		if (_currentRequests.TryGetValue(correlationId, out var manager)) {
+			handle(manager, message);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/ShutdownService.cs b/src/KurrentDB.Core/Services/ShutdownService.cs
new file mode 100644
index 00000000000..86ce5492103
--- /dev/null
+++ b/src/KurrentDB.Core/Services/ShutdownService.cs
@@ -0,0 +1,123 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using Serilog;
+
+namespace KurrentDB.Core.Services;
+
+// This intercepts the ShutdownRequest and shuts down Peripheral Services before shutting down the Core.
+// todo: later we can move the logic that tracks the core service shutdown into here, and also subsystems shutdown.
+public class ShutdownService :
+	IHandle<ClientMessage.RequestShutdown>,
+	IHandle<SystemMessage.RegisterForGracefulTermination>,
+	IHandle<SystemMessage.ComponentTerminated>,
+	IHandle<SystemMessage.PeripheralShutdownTimeout> {
+
+	private static readonly ILogger Log = Serilog.Log.ForContext<ShutdownService>();
+	private static readonly TimeSpan PeripheryShutdownTimeout = TimeSpan.FromSeconds(30);
+
+	private readonly IPublisher _mainQueue;
+	private readonly VNodeInfo _nodeInfo;
+	private readonly Dictionary<string, Action> _shutdownActions = [];
+	private readonly TimeSpan _shutdownTimeout;
+
+	private bool _exitProcess;
+	private bool _shutdownHttp;
+
+	enum State {
+		Running,
+		ShuttingDownPeriphery,
+		ShuttingDownCore,
+	}
+	private State _state;
+
+	public ShutdownService(IPublisher mainQueue, VNodeInfo nodeInfo, TimeSpan? shutdownTimeout = null) {
+		_mainQueue = mainQueue;
+		_nodeInfo = nodeInfo;
+		_shutdownTimeout = shutdownTimeout ?? PeripheryShutdownTimeout;
+	}
+
+	public void Handle(SystemMessage.RegisterForGracefulTermination message) {
+		if (_state is not State.Running) {
+			Log.Warning("Component {ComponentName} tried to register for graceful shutdown while the server is shutting down",
+				message.ComponentName);
+			return;
+		}
+
+		if (!_shutdownActions.TryAdd(message.ComponentName, message.Action))
+			throw new InvalidOperationException($"Component {message.ComponentName} already registered");
+
+		Log.Information("========== [{HttpEndPoint}] Component '{Component}' is registered for graceful termination", _nodeInfo.HttpEndPoint,
+			message.ComponentName);
+	}
+
+	public void Handle(ClientMessage.RequestShutdown message) {
+		if (_state is not State.Running) {
+			Log.Debug("Ignored request shutdown message because the server is already shutting down");
+			return;
+		}
+
+		_exitProcess = message.ExitProcess;
+		_shutdownHttp = message.ShutdownHttp;
+
+		if (_shutdownActions.Count == 0) {
+			ShutDownCore();
+			return;
+		}
+
+		_state = State.ShuttingDownPeriphery;
+		Log.Information("========== [{httpEndPoint}] IS SHUTTING DOWN PERIPHERAL COMPONENTS...", _nodeInfo.HttpEndPoint);
+
+		foreach (var entry in _shutdownActions) {
+			try {
+				entry.Value();
+			} catch (Exception e) {
+				Log.Warning(e, "Component {ComponentName} faulted when initiating shutdown", entry.Key);
+			}
+		}
+
+		_mainQueue.Publish(TimerMessage.Schedule.Create(
+			_shutdownTimeout,
+			_mainQueue,
+			new SystemMessage.PeripheralShutdownTimeout()));
+	}
+
+	public void Handle(SystemMessage.ComponentTerminated message) {
+		if (!_shutdownActions.Remove(message.ComponentName))
+			throw new InvalidOperationException($"Component {message.ComponentName} already terminated");
+
+		Log.Information("========== [{HttpEndPoint}] Component '{ComponentName}' has shut down.", _nodeInfo.HttpEndPoint,
+			message.ComponentName);
+
+		if (_state is State.ShuttingDownPeriphery && _shutdownActions.Count == 0) {
+			Log.Information("========== [{HttpEndPoint}] All Components Shutdown.", _nodeInfo.HttpEndPoint);
+			ShutDownCore();
+		}
+	}
+
+	public void Handle(SystemMessage.PeripheralShutdownTimeout message) {
+		if (_state is not State.ShuttingDownPeriphery) {
+			Log.Debug("Ignored shutdown timeout message when in state {State}", _state);
+			return;
+		}
+
+		Log.Information("========== [{httpEndPoint}] TIMED OUT SHUTTING DOWN PERIPHERAL COMPONENTS {Components}...",
+			_nodeInfo.HttpEndPoint,
+			string.Join(", ", _shutdownActions.Keys));
+		ShutDownCore();
+	}
+
+	private void ShutDownCore() {
+		_state = State.ShuttingDownCore;
+		_mainQueue.Publish(new SystemMessage.BecomeShuttingDown(
+			correlationId: Guid.NewGuid(),
+			exitProcess: _exitProcess,
+			shutdownHttp: _shutdownHttp));
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Storage/EpochManager/EpochManager.cs b/src/KurrentDB.Core/Services/Storage/EpochManager/EpochManager.cs
new file mode 100644
index 00000000000..589ec462cca
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/EpochManager/EpochManager.cs
@@ -0,0 +1,590 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Threading;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Storage.EpochManager;
+
+
+public abstract class Epochmanager {
+}
+
+public class EpochManager<TStreamId> : IEpochManager {
+	private static readonly ILogger Log = Serilog.Log.ForContext<Epochmanager>();
+	private readonly IPublisher _bus;
+
+	private readonly ICheckpoint _checkpoint;
+	private readonly ObjectPool<ITransactionFileReader> _readers;
+	private readonly ITransactionFileWriter _writer;
+	private readonly IRecordFactory<TStreamId> _recordFactory;
+	private readonly INameIndex<TStreamId> _streamNameIndex;
+	private readonly INameIndex<TStreamId> _eventTypeIndex;
+	private readonly IPartitionManager _partitionManager;
+	private readonly Guid _instanceId;
+
+	// We have two async exclusive locks. There are three options to optimize them:
+	// 1. Replace exclusive lock with async reader/writer lock to enable horizontal scaling
+	// 2. Use copy-on-write immutable collection to avoid lock contention on read side
+	// 3. Combine two locks by writing a custom sync primitive using QueuedSynchronizer<T>
+	private readonly AsyncExclusiveLock _locker = new();
+	private readonly int _cacheSize;
+	private readonly LinkedList<EpochRecord> _epochs = new();
+
+	private LinkedListNode<EpochRecord> _firstCachedEpoch;
+	private LinkedListNode<EpochRecord> _lastCachedEpoch;
+
+	public EpochRecord GetLastEpoch() => _lastCachedEpoch?.Value;
+
+	public int LastEpochNumber => _lastCachedEpoch?.Value.EpochNumber ?? -1;
+	private bool _truncated;
+	private readonly AsyncExclusiveLock _truncateLock = new();
+
+	// IMPORTANT
+	// Lock ordering to prevent deadlocks:
+	// 1)  _locker
+	// 2) _truncateLock
+
+	private async ValueTask<long> GetCheckpointAsync(CancellationToken token) {
+		await _truncateLock.AcquireAsync(token);
+		try {
+			if (_truncated)
+				throw new InvalidOperationException("Cannot read checkpoint since it has been truncated.");
+			return _checkpoint.Read();
+		} finally {
+			_truncateLock.Release();
+		}
+	}
+
+	private async ValueTask SetCheckpointAsync(long value, CancellationToken token) {
+		await _truncateLock.AcquireAsync(token);
+		try {
+			if (_truncated)
+				throw new InvalidOperationException("Cannot write checkpoint since it has been truncated.");
+			_checkpoint.Write(value);
+			_checkpoint.Flush();
+		} finally {
+			_truncateLock.Release();
+		}
+	}
+
+	public EpochManager(IPublisher bus,
+		int cachedEpochCount,
+		ICheckpoint checkpoint,
+		ITransactionFileWriter writer,
+		int initialReaderCount,
+		int maxReaderCount,
+		Func<ITransactionFileReader> readerFactory,
+		IRecordFactory<TStreamId> recordFactory,
+		INameIndex<TStreamId> streamNameIndex,
+		INameIndex<TStreamId> eventTypeIndex,
+		IPartitionManager partitionManager,
+		Guid instanceId) {
+		Ensure.NotNull(bus, "bus");
+		Ensure.Nonnegative(cachedEpochCount, "cachedEpochCount");
+		Ensure.NotNull(checkpoint, "checkpoint");
+		Ensure.NotNull(writer, "chunkWriter");
+		Ensure.Nonnegative(initialReaderCount, "initialReaderCount");
+		Ensure.Positive(maxReaderCount, "maxReaderCount");
+		if (initialReaderCount > maxReaderCount)
+			throw new ArgumentOutOfRangeException(nameof(initialReaderCount),
+				"initialReaderCount is greater than maxReaderCount.");
+		Ensure.NotNull(readerFactory, "readerFactory");
+
+		_bus = bus;
+		_cacheSize = cachedEpochCount;
+		_checkpoint = checkpoint;
+		_readers = new ObjectPool<ITransactionFileReader>("EpochManager readers pool", initialReaderCount,
+			maxReaderCount, readerFactory);
+		_writer = writer;
+		_recordFactory = recordFactory;
+		_streamNameIndex = streamNameIndex;
+		_eventTypeIndex = eventTypeIndex;
+		_partitionManager = partitionManager;
+		_instanceId = instanceId;
+	}
+
+	public ValueTask Init(CancellationToken token)
+		=> ReadEpochs(_cacheSize, token);
+
+	private async ValueTask ReadEpochs(int maxEpochCount, CancellationToken token) {
+		await _locker.AcquireAsync(token);
+		try {
+			var reader = _readers.Get();
+			try {
+				long epochPos = await GetCheckpointAsync(token);
+				if (epochPos < 0) {
+					// we probably have lost/uninitialized epoch checkpoint scan back to find the most recent epoch in the log
+					Log.Information("No epoch checkpoint. Scanning log backwards for most recent epoch...");
+					reader.Reposition(_writer.FlushedPosition);
+
+					for (SeqReadResult result;
+						 (result = await reader.TryReadPrev(token)).Success;
+						 token.ThrowIfCancellationRequested()) {
+						var rec = result.LogRecord;
+						if (rec.RecordType is not LogRecordType.System ||
+							((ISystemLogRecord)rec).SystemRecordType is not SystemRecordType.Epoch)
+							continue;
+						epochPos = rec.LogPosition;
+						await SetCheckpointAsync(epochPos, token);
+						break;
+					}
+
+					Log.Information("Done scanning log backwards for most recent epoch.");
+				}
+
+				//read back down the chain of epochs in the log until the cache is full
+				int cnt = 0;
+				while (epochPos >= 0 && cnt < maxEpochCount) {
+					var epoch = await ReadEpochAt(reader, epochPos, token);
+					_epochs.AddFirst(epoch);
+					if (epoch.EpochPosition == 0) { break; }
+
+					epochPos = epoch.PrevEpochPosition;
+					cnt += 1;
+				}
+
+				_lastCachedEpoch = _epochs.Last;
+				_firstCachedEpoch = _epochs.First;
+			} finally {
+				_readers.Return(reader);
+			}
+		} finally {
+			_locker.Release();
+		}
+	}
+	private async ValueTask<EpochRecord> ReadEpochAt(ITransactionFileReader reader, long epochPos, CancellationToken token) {
+		var result = await reader.TryReadAt(epochPos, couldBeScavenged: false, token);
+		if (!result.Success)
+			throw new Exception($"Could not find Epoch record at LogPosition {epochPos}.");
+		if (result.LogRecord.RecordType != LogRecordType.System)
+			throw new Exception($"LogRecord is not SystemLogRecord: {result.LogRecord}.");
+
+		var sysRec = (ISystemLogRecord)result.LogRecord;
+		if (sysRec.SystemRecordType != SystemRecordType.Epoch)
+			throw new Exception($"SystemLogRecord is not of Epoch sub-type: {result.LogRecord}.");
+
+		return sysRec.GetEpochRecord();
+	}
+	public async ValueTask<IReadOnlyList<EpochRecord>> GetLastEpochs(int maxCount, CancellationToken token) {
+		await _locker.AcquireAsync(token);
+		try {
+			var res = new List<EpochRecord>();
+			var node = _epochs.Last;
+			while (node != null && res.Count < maxCount) {
+				res.Add(node.Value);
+				node = node.Previous;
+			}
+
+			return res;
+		} finally {
+			_locker.Release();
+		}
+	}
+
+	public async ValueTask<EpochRecord> GetEpochAfter(int epochNumber, bool throwIfNotFound, CancellationToken token) {
+		if (epochNumber >= LastEpochNumber) {
+			if (!throwIfNotFound)
+				return null;
+			throw new ArgumentOutOfRangeException(
+				nameof(epochNumber),
+				$"EpochNumber no epochs exist after Last Epoch {epochNumber}.");
+		}
+
+		EpochRecord epoch;
+		await _locker.AcquireAsync(token);
+		try {
+			var epochNode = _epochs.Last;
+			while (epochNode != null && epochNode.Value.EpochNumber != epochNumber) {
+				epochNode = epochNode.Previous;
+			}
+
+			epoch = epochNode?.Next?.Value;
+		} finally {
+			_locker.Release();
+		}
+
+		if (epoch is not null) {
+			return epoch; //got it
+		}
+
+		var firstEpoch = _firstCachedEpoch?.Value;
+		if (firstEpoch != null && firstEpoch.PrevEpochPosition != -1) {
+			var reader = _readers.Get();
+			try {
+				epoch = firstEpoch;
+				do {
+					var result = await reader.TryReadAt(epoch.PrevEpochPosition, couldBeScavenged: false, token);
+					if (!result.Success)
+						throw new Exception(
+							$"Could not find Epoch record at LogPosition {epoch.PrevEpochPosition}.");
+					if (result.LogRecord.RecordType != LogRecordType.System)
+						throw new Exception($"LogRecord is not SystemLogRecord: {result.LogRecord}.");
+
+					var sysRec = (ISystemLogRecord)result.LogRecord;
+					if (sysRec.SystemRecordType != SystemRecordType.Epoch)
+						throw new Exception($"SystemLogRecord is not of Epoch sub-type: {result.LogRecord}.");
+
+					var nextEpoch = sysRec.GetEpochRecord();
+					if (nextEpoch.EpochNumber == epochNumber) {
+						return epoch; //got it
+					}
+
+					epoch = nextEpoch;
+				} while (epoch.PrevEpochPosition != -1 && epoch.EpochNumber > epochNumber);
+
+			} finally {
+				_readers.Return(reader);
+			}
+		}
+
+		if (epoch is null && throwIfNotFound) {
+			throw new Exception($"Concurrency failure, epoch #{epochNumber} should not be null.");
+		}
+
+		return epoch;
+	}
+
+	public async ValueTask<bool> IsCorrectEpochAt(long epochPosition, int epochNumber, Guid epochId, CancellationToken token) {
+		Ensure.Nonnegative(epochPosition, "logPosition");
+		Ensure.Nonnegative(epochNumber, "epochNumber");
+		Ensure.NotEmptyGuid(epochId, "epochId");
+
+		if (epochNumber > LastEpochNumber)
+			return false;
+
+		EpochRecord epoch;
+		await _locker.AcquireAsync(token);
+		try {
+			epoch = _epochs.FirstOrDefault(e => e.EpochNumber == epochNumber);
+			if (epoch != null) {
+				return epoch.EpochId == epochId && epoch.EpochPosition == epochPosition;
+			}
+
+			if (_firstCachedEpoch.Value is not null && epochNumber > _firstCachedEpoch.Value.EpochNumber)
+				// This isn't a cache miss, we don't have that epoch on this node
+				return false;
+		} finally {
+			_locker.Release();
+		}
+
+		// epochNumber < _minCachedEpochNumber
+		var reader = _readers.Get();
+		try {
+			var res = await reader.TryReadAt(epochPosition, couldBeScavenged: false, token);
+			if (!res.Success || res.LogRecord.RecordType != LogRecordType.System)
+				return false;
+			var sysRec = (ISystemLogRecord)res.LogRecord;
+			if (sysRec.SystemRecordType != SystemRecordType.Epoch)
+				return false;
+
+			epoch = sysRec.GetEpochRecord();
+			return epoch.EpochNumber == epochNumber && epoch.EpochId == epochId;
+		} catch (Exception ex) when (ex is InvalidReadException || ex is UnableToReadPastEndOfStreamException) {
+			Log.Information(ex, "Failed to read epoch {epochNumber} at {epochPosition}.", epochNumber, epochPosition);
+			return false;
+		} finally {
+			_readers.Return(reader);
+		}
+	}
+
+	// This method should be called from single thread.
+	public async ValueTask WriteNewEpoch(int epochNumber, CancellationToken token) {
+		// Now we write epoch record (with possible retry, if we are at the end of chunk)
+		// and update EpochManager's state, by adjusting cache of records, epoch count and un-caching
+		// excessive record, if present.
+		// If we are writing the very first epoch, last position will be -1.
+		if (epochNumber < 0) {
+			throw new ArgumentException($"Cannot write an Epoch with a negative Epoch Number {epochNumber}.",
+				nameof(epochNumber));
+		}
+
+		if (epochNumber <= LastEpochNumber) {
+			throw new ArgumentException(
+				$"Cannot add Epoch {epochNumber}, new Epoch numbers must be greater than the Last Epoch  {LastEpochNumber}.",
+				nameof(epochNumber));
+		}
+
+		var epoch = await WriteEpochRecordWithRetry(epochNumber, Guid.NewGuid(),
+			_lastCachedEpoch?.Value.EpochPosition ?? -1, _instanceId, token);
+
+		await AddEpochToCache(epoch, token);
+	}
+
+	private async ValueTask<EpochRecord> WriteEpochRecordWithRetry(int epochNumber, Guid epochId, long lastEpochPosition,
+		Guid instanceId, CancellationToken token) {
+		long pos = _writer.Position;
+		var epoch = new EpochRecord(pos, epochNumber, epochId, lastEpochPosition, DateTime.UtcNow, instanceId);
+		var rec = _recordFactory.CreateEpoch(epoch);
+
+		Log.Debug(
+						"=== Writing E{epochNumber}@{epochPosition}:{epochId:B} (previous epoch at {lastEpochPosition}). L={leaderId:B}.",
+						epochNumber, epoch.EpochPosition, epochId, lastEpochPosition, epoch.LeaderInstanceId);
+
+		(var written, pos) = await _writer.Write(rec, token);
+		if (!written) {
+			epoch = new EpochRecord(pos, epochNumber, epochId, lastEpochPosition, DateTime.UtcNow, instanceId);
+			rec = _recordFactory.CreateEpoch(epoch);
+
+			if (await _writer.Write(rec, token) is (false, _))
+				throw new Exception($"Second write try failed at {epoch.EpochPosition}.");
+		}
+
+		await _partitionManager.Initialize(token);
+		await WriteEpochInformationWithRetry(epoch, token);
+		await _writer.Flush(token);
+		_bus.Publish(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		_bus.Publish(new SystemMessage.EpochWritten(epoch));
+		return epoch;
+	}
+
+	private TStreamId GetEpochInformationStream() {
+		if (!_streamNameIndex.GetOrReserve(SystemStreams.EpochInformationStream, out var streamId, out _, out _))
+			throw new Exception($"{SystemStreams.EpochInformationStream} stream does not exist");
+		return streamId;
+	}
+
+	private TStreamId GetEpochInformationEventType() {
+		if (!_eventTypeIndex.GetOrReserve(SystemEventTypes.EpochInformation, out var eventTypeId, out _, out _))
+			throw new Exception($"{SystemEventTypes.EpochInformation} event type does not exist");
+		return eventTypeId;
+	}
+
+	async ValueTask WriteEpochInformationWithRetry(EpochRecord epoch, CancellationToken token) {
+		if (await TryGetExpectedVersionForEpochInformation(epoch, token) is not { } expectedVersion)
+			expectedVersion = ExpectedVersion.NoStream;
+
+		var originalLogPosition = _writer.Position;
+
+		var epochInformation = LogRecord.Prepare(
+				factory: _recordFactory,
+				logPosition: originalLogPosition,
+				correlationId: Guid.NewGuid(),
+				eventId: Guid.NewGuid(),
+				transactionPos: originalLogPosition,
+				transactionOffset: 0,
+				eventStreamId: GetEpochInformationStream(),
+				expectedVersion: expectedVersion,
+				flags: PrepareFlags.SingleWrite | PrepareFlags.IsCommitted | PrepareFlags.IsJson,
+				eventType: GetEpochInformationEventType(),
+				data: epoch.AsSerialized(),
+				metadata: Empty.ByteArray);
+
+		var (written, retryLogPosition) = await _writer.Write(epochInformation, token);
+		if (written)
+			return;
+
+		epochInformation = epochInformation.CopyForRetry(retryLogPosition, retryLogPosition);
+
+		if (await _writer.Write(epochInformation, token) is (true, _))
+			return;
+
+		throw new Exception(
+			string.Format("Second write try failed when first writing $epoch-information at {0}, then at {1}.",
+				originalLogPosition,
+				retryLogPosition));
+	}
+
+	// we have just written epoch. about to write the $epoch-information for it.
+	// this decides what expected version the $epoch-information should have.
+	// it looks up the previous epoch, finds that epoch's previous information
+	// (which immediately follows it) and gets its event number.
+	// except the first epoch in logv3, which is followed by the root partition
+	// initialization before the epochinfo.
+	private async ValueTask<long?> TryGetExpectedVersionForEpochInformation(EpochRecord epoch, CancellationToken token) {
+		if (epoch.PrevEpochPosition < 0)
+			return null;
+
+		var reader = _readers.Get();
+		try {
+			reader.Reposition(epoch.PrevEpochPosition);
+
+			// read the epoch
+			if (await reader.TryReadNext(token) is { Success: false })
+				return null;
+
+			// read the epoch-information (if there is one)
+			while (true) {
+				var result = await reader.TryReadNext(token);
+				if (!result.Success)
+					return null;
+
+				if (result.LogRecord is IPrepareLogRecord<TStreamId> prepare &&
+					EqualityComparer<TStreamId>.Default.Equals(prepare.EventStreamId, GetEpochInformationStream())) {
+					// found the epoch information
+					return prepare.ExpectedVersion + 1;
+				}
+
+				if (result.LogRecord.RecordType is LogRecordType.Prepare
+					or LogRecordType.Commit
+					or LogRecordType.System
+					or LogRecordType.StreamWrite) {
+					// definitely not reading the root partition initialization;
+					// there is no epochinfo for this epoch (probably the epoch is older
+					// than the epochinfo mechanism.
+					return null;
+				}
+
+				// could be reading the root partition initialization; skip over it.
+			}
+
+		} catch (Exception) {
+			return null;
+		} finally {
+			_readers.Return(reader);
+		}
+	}
+
+	public async ValueTask CacheEpoch(EpochRecord epoch, CancellationToken token) {
+		var added = await AddEpochToCache(epoch, token);
+
+		// Check each epoch as it is added to the cache for the first time from the chaser.
+		// n.b.: added will be false for idempotent CacheRequests
+		// If this check fails, then there is something very wrong with epochs, data corruption is possible.
+		if (added && !await IsCorrectEpochAt(epoch.EpochPosition, epoch.EpochNumber, epoch.EpochId, token)) {
+			throw new Exception(
+				$"Not found epoch at {epoch.EpochPosition} with epoch number: {epoch.EpochNumber} and epoch ID: {epoch.EpochId}. " +
+				"SetLastEpoch FAILED! Data corruption risk!");
+		}
+	}
+
+	/// <summary>
+	/// Idempotently adds epochs to the cache
+	/// </summary>
+	/// <param name="epoch">the epoch to add</param>
+	/// <param name="token">The token that can be used to cancel the operation.</param>
+	/// <returns>if the submitted epoch was added to the cache, false if already present</returns>
+	public async ValueTask<bool> AddEpochToCache(EpochRecord epoch, CancellationToken token) {
+		Ensure.NotNull(epoch, "epoch");
+
+		await _locker.AcquireAsync(token);
+		try {
+
+			// if it's already cached, just return false to indicate idempotent add
+			if (_epochs.Contains(ep => ep.EpochNumber == epoch.EpochNumber)) { return false; }
+
+			//new last epoch written or received, this is the normal case
+			//if the list is empty Last will be null
+			if (_epochs.Last is null || _epochs.Last.Value.EpochNumber < epoch.EpochNumber) {
+				_epochs.AddLast(epoch);
+				_lastCachedEpoch = _epochs.Last;
+				// in some race conditions we might have a gap in the epoch list
+				//read the epochs from the TFLog to fill in the gaps
+				if (epoch.EpochPosition > 0 &&
+					epoch.PrevEpochPosition >= 0 &&
+					epoch.PrevEpochPosition > (_epochs.Last?.Previous?.Value?.EpochPosition ?? -1)) {
+					var reader = _readers.Get();
+					var previous = _epochs.Last;
+					var count = 1; //include last
+					try {
+						do {
+							epoch = await ReadEpochAt(reader, epoch.PrevEpochPosition, token);
+							previous = _epochs.AddBefore(previous, epoch);
+							count++;
+						} while (
+							epoch.EpochPosition > 0 &&
+							epoch.PrevEpochPosition >= 0 &&
+							count <= _cacheSize &&
+							epoch.PrevEpochPosition > (previous?.Previous?.Value?.EpochPosition ?? -1));
+					} finally {
+						_readers.Return(reader);
+					}
+				}
+
+				while (_epochs.Count > _cacheSize) { _epochs.RemoveFirst(); }
+
+				_firstCachedEpoch = _epochs.First;
+				// Now update epoch checkpoint, so on restart we don't scan sequentially TF.
+				await SetCheckpointAsync(_epochs.Last.Value.EpochPosition, token);
+				Log.Debug(
+					"=== Cached new Last Epoch E{epochNumber}@{epochPosition}:{epochId:B} (previous epoch at {lastEpochPosition}) L={leaderId:B}.",
+					epoch.EpochNumber, epoch.EpochPosition, epoch.EpochId, epoch.PrevEpochPosition,
+					epoch.LeaderInstanceId);
+				return true;
+			}
+
+			if (epoch.EpochNumber < _epochs.First.Value.EpochNumber) {
+				return false;
+			}
+
+			//this should never happen
+			Log.Error(
+				"=== Unable to cache Epoch E{epochNumber}@{epochPosition}:{epochId:B} (previous epoch at {lastEpochPosition}) L={leaderId:B}.",
+				epoch.EpochNumber, epoch.EpochPosition, epoch.EpochId, epoch.PrevEpochPosition, epoch.LeaderInstanceId);
+			foreach (var epochRecord in _epochs) {
+				Log.Error(
+					"====== Epoch E{epochNumber}@{epochPosition}:{epochId:B} (previous epoch at {lastEpochPosition}) L={leaderId:B}.",
+					epochRecord.EpochNumber, epochRecord.EpochPosition, epochRecord.EpochId,
+					epochRecord.PrevEpochPosition, epochRecord.LeaderInstanceId);
+			}
+
+			Log.Error(
+				"====== Last Epoch E{epochNumber}@{epochPosition}:{epochId:B} (previous epoch at {lastEpochPosition}) L={leaderId:B}.",
+				_lastCachedEpoch.Value.EpochNumber, _lastCachedEpoch.Value.EpochPosition,
+				_lastCachedEpoch.Value.EpochId, _lastCachedEpoch.Value.PrevEpochPosition,
+				_lastCachedEpoch.Value.LeaderInstanceId);
+			Log.Error(
+				"====== First Epoch E{epochNumber}@{epochPosition}:{epochId:B} (previous epoch at {lastEpochPosition}) L={leaderId:B}.",
+				_firstCachedEpoch.Value.EpochNumber, _firstCachedEpoch.Value.EpochPosition,
+				_firstCachedEpoch.Value.EpochId, _firstCachedEpoch.Value.PrevEpochPosition,
+				_firstCachedEpoch.Value.LeaderInstanceId);
+
+			throw new Exception(
+				$"This should never happen: Unable to find correct position to cache Epoch E{epoch.EpochNumber}@{epoch.EpochPosition}:{epoch.EpochId:B} (previous epoch at {epoch.PrevEpochPosition}) L={epoch.LeaderInstanceId:B}");
+		} finally {
+			_locker.Release();
+		}
+	}
+
+	private async ValueTask<EpochRecord> TryGetEpochBefore(long position, CancellationToken token) {
+		await _locker.AcquireAsync(token);
+		try {
+			LinkedListNode<EpochRecord> node;
+			for (node = _epochs.Last;
+				 node is not null && node.Value.EpochPosition >= position;
+				 token.ThrowIfCancellationRequested()) {
+				node = node.Previous;
+			}
+
+			return node?.Value;
+		} finally {
+			_locker.Release();
+		}
+	}
+
+	public async ValueTask<EpochRecord> TryTruncateBefore(long position, CancellationToken token) {
+		await _truncateLock.AcquireAsync(token);
+		try {
+			if (_truncated)
+				throw new InvalidOperationException("Checkpoint has already been truncated.");
+			_truncated = true;
+		} finally {
+			_truncateLock.Release();
+		}
+
+		if (await TryGetEpochBefore(position, token) is not { } epoch)
+			return null;
+
+		_checkpoint.Write(epoch.EpochPosition);
+		_checkpoint.Flush();
+
+		return epoch;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Storage/EpochManager/IEpochManager.cs b/src/KurrentDB.Core/Services/Storage/EpochManager/IEpochManager.cs
new file mode 100644
index 00000000000..ab97f53979c
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/EpochManager/IEpochManager.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.Services.Storage.EpochManager;
+
+public interface IEpochManager {
+	int LastEpochNumber { get; }
+
+	ValueTask Init(CancellationToken token);
+	EpochRecord GetLastEpoch();
+	ValueTask<IReadOnlyList<EpochRecord>> GetLastEpochs(int maxCount, CancellationToken token);
+	ValueTask<EpochRecord> GetEpochAfter(int epochNumber, bool throwIfNotFound, CancellationToken token);
+	ValueTask<bool> IsCorrectEpochAt(long epochPosition, int epochNumber, Guid epochId, CancellationToken token);
+	ValueTask WriteNewEpoch(int epochNumber, CancellationToken token);
+	ValueTask CacheEpoch(EpochRecord epoch, CancellationToken token);
+	ValueTask<EpochRecord> TryTruncateBefore(long position, CancellationToken token);
+}
diff --git a/src/EventStore.Core/Services/Storage/InMemory/GossipListenerService.cs b/src/KurrentDB.Core/Services/Storage/InMemory/GossipListenerService.cs
similarity index 79%
rename from src/EventStore.Core/Services/Storage/InMemory/GossipListenerService.cs
rename to src/KurrentDB.Core/Services/Storage/InMemory/GossipListenerService.cs
index 2677ee18fb8..7929b6c0442 100644
--- a/src/EventStore.Core/Services/Storage/InMemory/GossipListenerService.cs
+++ b/src/KurrentDB.Core/Services/Storage/InMemory/GossipListenerService.cs
@@ -1,11 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Messages;
 
-namespace EventStore.Core.Services.Storage.InMemory;
+namespace KurrentDB.Core.Services.Storage.InMemory;
 
 public class GossipListenerService :
 	IInMemoryStreamReader,
@@ -33,7 +37,7 @@ public void Handle(GossipMessage.GossipUpdated message) {
 		var payload = new {
 			NodeId = _nodeId,
 			Members = message.ClusterInfo.Members.Select(static x =>
-				new Cluster.ClientClusterInfo.ClientMemberInfo(x)),
+				new ClientClusterInfo.ClientMemberInfo(x)),
 		};
 
 		var data = JsonSerializer.SerializeToUtf8Bytes(payload, _options);
diff --git a/src/KurrentDB.Core/Services/Storage/InMemory/IInMemoryStreamReader.cs b/src/KurrentDB.Core/Services/Storage/InMemory/IInMemoryStreamReader.cs
new file mode 100644
index 00000000000..dbf5d0a69f4
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/InMemory/IInMemoryStreamReader.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Messages;
+
+namespace KurrentDB.Core.Services.Storage.InMemory;
+
+public interface IInMemoryStreamReader {
+	ClientMessage.ReadStreamEventsForwardCompleted ReadForwards(ClientMessage.ReadStreamEventsForward msg);
+	ClientMessage.ReadStreamEventsBackwardCompleted ReadBackwards(ClientMessage.ReadStreamEventsBackward msg);
+}
diff --git a/src/KurrentDB.Core/Services/Storage/InMemory/InMemoryLog.cs b/src/KurrentDB.Core/Services/Storage/InMemory/InMemoryLog.cs
new file mode 100644
index 00000000000..80c3938224d
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/InMemory/InMemoryLog.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+
+namespace KurrentDB.Core.Services.Storage.InMemory;
+
+// does not support $all style reads, but tracks the LastCommitPosition so that
+// the long poll mechanism works in the SubscriptionsService.
+// note that the SubscriptionsService currently only supports one physical log
+// and one inmemory log so we can't have separate inmemory logs per inmemory stream.
+public class InMemoryLog {
+	long _lastCommitPosition = 0L;
+
+	public long GetLastCommitPosition() => Interlocked.Read(ref _lastCommitPosition);
+	public long GetNextCommitPosition() => Interlocked.Increment(ref _lastCommitPosition);
+}
diff --git a/src/EventStore.Core/Services/Storage/InMemory/InMemoryStreamReader.cs b/src/KurrentDB.Core/Services/Storage/InMemory/InMemoryStreamReader.cs
similarity index 84%
rename from src/EventStore.Core/Services/Storage/InMemory/InMemoryStreamReader.cs
rename to src/KurrentDB.Core/Services/Storage/InMemory/InMemoryStreamReader.cs
index 7103081d41f..ab2852d3988 100644
--- a/src/EventStore.Core/Services/Storage/InMemory/InMemoryStreamReader.cs
+++ b/src/KurrentDB.Core/Services/Storage/InMemory/InMemoryStreamReader.cs
@@ -1,9 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
 
-namespace EventStore.Core.Services.Storage.InMemory;
+namespace KurrentDB.Core.Services.Storage.InMemory;
 
 public class InMemoryStreamReader : IInMemoryStreamReader {
 	private readonly Dictionary<string, IInMemoryStreamReader> _readers;
diff --git a/src/EventStore.Core/Services/Storage/InMemory/NodeStateListenerService.cs b/src/KurrentDB.Core/Services/Storage/InMemory/NodeStateListenerService.cs
similarity index 80%
rename from src/EventStore.Core/Services/Storage/InMemory/NodeStateListenerService.cs
rename to src/KurrentDB.Core/Services/Storage/InMemory/NodeStateListenerService.cs
index 4c11f2963d5..080e06a7578 100644
--- a/src/EventStore.Core/Services/Storage/InMemory/NodeStateListenerService.cs
+++ b/src/KurrentDB.Core/Services/Storage/InMemory/NodeStateListenerService.cs
@@ -1,9 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using EventStore.Core.Bus;
-using EventStore.Core.Messages;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
 
-namespace EventStore.Core.Services.Storage.InMemory;
+namespace KurrentDB.Core.Services.Storage.InMemory;
 
 // threading: we expect to handle one StateChangeMessage at a time, but Reads can happen concurrently
 // with those handlings and with other reads.
diff --git a/src/EventStore.Core/Services/Storage/InMemory/SingleEventInMemoryStream.cs b/src/KurrentDB.Core/Services/Storage/InMemory/SingleEventInMemoryStream.cs
similarity index 91%
rename from src/EventStore.Core/Services/Storage/InMemory/SingleEventInMemoryStream.cs
rename to src/KurrentDB.Core/Services/Storage/InMemory/SingleEventInMemoryStream.cs
index 077ae745b95..b06a24f5bb0 100644
--- a/src/EventStore.Core/Services/Storage/InMemory/SingleEventInMemoryStream.cs
+++ b/src/KurrentDB.Core/Services/Storage/InMemory/SingleEventInMemoryStream.cs
@@ -1,10 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.TransactionLog.LogRecords;
 
-namespace EventStore.Core.Services.Storage.InMemory;
+namespace KurrentDB.Core.Services.Storage.InMemory;
 
 // threading: we expect to handle one Write at a time, but Reads can happen concurrently
 // with the write and with other reads.
diff --git a/src/KurrentDB.Core/Services/Storage/IndexCommitterService.cs b/src/KurrentDB.Core/Services/Storage/IndexCommitterService.cs
new file mode 100644
index 00000000000..8f10e73003c
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/IndexCommitterService.cs
@@ -0,0 +1,282 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Threading;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Monitoring.Stats;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Storage;
+
+public interface IIndexCommitterService<TStreamId> {
+	ValueTask Init(long checkpointPosition, CancellationToken token);
+	void Stop();
+	ValueTask<long> GetCommitLastEventNumber(CommitLogRecord record, CancellationToken token);
+	void AddPendingPrepare(IPrepareLogRecord<TStreamId>[] prepares, long postPosition);
+	void AddPendingCommit(CommitLogRecord commit, long postPosition);
+}
+
+public abstract class IndexCommitterService {
+	protected readonly ILogger Log = Serilog.Log.ForContext<IndexCommitterService>();
+}
+
+public class IndexCommitterService<TStreamId> : IndexCommitterService, IIndexCommitterService<TStreamId>,
+	IMonitoredQueue,
+	IHandle<SystemMessage.BecomeShuttingDown>,
+	IHandle<ReplicationTrackingMessage.ReplicatedTo>,
+	IHandle<StorageMessage.CommitAck>,
+	IHandle<ClientMessage.MergeIndexes>,
+	IThreadPoolWorkItem {
+	private readonly IIndexCommitter<TStreamId> _indexCommitter;
+	private readonly IPublisher _publisher;
+	private readonly IReadOnlyCheckpoint _replicationCheckpoint;
+	private readonly IReadOnlyCheckpoint _writerCheckpoint;
+	private readonly ITableIndex _tableIndex;
+
+	// cached to avoid ObjectDisposedException
+	private readonly CancellationToken _stopToken;
+	private CancellationTokenSource _stop;
+
+	public string Name => _queueStats.Name;
+
+	private readonly QueueStatsCollector _queueStats;
+	private readonly ConcurrentQueueWrapper<StorageMessage.CommitAck> _replicatedQueue = new();
+	private readonly ConcurrentDictionary<long, PendingTransaction> _pendingTransactions = new();
+	private readonly SortedList<long, StorageMessage.CommitAck> _commitAcks = new();
+	private readonly AsyncManualResetEvent _addMsgSignal = new(initialState: false);
+	private readonly TimeSpan _waitTimeoutMs = TimeSpan.FromMilliseconds(100);
+	private readonly TaskCompletionSource<object> _tcs = new();
+
+	public Task Task => _tcs.Task;
+
+	public IndexCommitterService(
+		IIndexCommitter<TStreamId> indexCommitter,
+		IPublisher publisher,
+		IReadOnlyCheckpoint writerCheckpoint,
+		IReadOnlyCheckpoint replicationCheckpoint,
+		ITableIndex tableIndex,
+		QueueStatsManager queueStatsManager) {
+		_indexCommitter = Ensure.NotNull(indexCommitter);
+		_publisher = Ensure.NotNull(publisher);
+		_writerCheckpoint = Ensure.NotNull(writerCheckpoint);
+		_replicationCheckpoint = Ensure.NotNull(replicationCheckpoint);
+		_tableIndex = tableIndex;
+		_queueStats = queueStatsManager.CreateQueueStatsCollector("Index Committer");
+		_stop = new();
+		_stopToken = _stop.Token;
+	}
+
+	public async ValueTask Init(long chaserCheckpoint, CancellationToken token) {
+		await _indexCommitter.Init(chaserCheckpoint, token);
+		_publisher.Publish(new ReplicationTrackingMessage.IndexedTo(_indexCommitter.LastIndexedPosition));
+		ThreadPool.UnsafeQueueUserWorkItem(this, preferLocal: false);
+	}
+
+	public void Stop() {
+		if (Interlocked.Exchange(ref _stop, null) is { } cts) {
+			using (cts) {
+				cts.Cancel();
+			}
+		}
+	}
+
+	async void IThreadPoolWorkItem.Execute() {
+		_publisher.Publish(new SystemMessage.ServiceInitialized(nameof(IndexCommitterService)));
+		try {
+			_queueStats.Start();
+			QueueMonitor.Default.Register(this);
+
+			StorageMessage.CommitAck replicatedMessage;
+			var msgType = typeof(StorageMessage.CommitAck);
+			while (!_stopToken.IsCancellationRequested) {
+				_addMsgSignal.Reset();
+				if (_replicatedQueue.TryDequeue(out replicatedMessage)) {
+					_queueStats.EnterBusy();
+#if DEBUG
+					_queueStats.Dequeued(replicatedMessage);
+#endif
+					_queueStats.ProcessingStarted(msgType, _replicatedQueue.Count);
+					await ProcessCommitReplicated(replicatedMessage, _stopToken);
+					_queueStats.ProcessingEnded(1);
+				} else {
+					_queueStats.EnterIdle();
+					await _addMsgSignal.WaitAsync(_waitTimeoutMs, _stopToken);
+				}
+			}
+		} catch (OperationCanceledException exc) when (exc.CancellationToken == _stopToken) {
+			// shutdown gracefully on cancellation
+		} catch (Exception exc) {
+			_queueStats.EnterIdle();
+			_queueStats.ProcessingStarted<FaultedIndexCommitterServiceState>(0);
+			Log.Fatal(exc, "Error in IndexCommitterService. Terminating...");
+			_tcs.TrySetException(exc);
+			Application.Exit(ExitCode.Error, "Error in IndexCommitterService. Terminating...\nError: " + exc.Message);
+
+			await _stopToken.WaitAsync();
+
+			_queueStats.ProcessingEnded(0);
+		} finally {
+			_queueStats.Stop();
+			QueueMonitor.Default.Unregister(this);
+		}
+
+		_publisher.Publish(new SystemMessage.ServiceShutdown(nameof(IndexCommitterService)));
+	}
+
+	private async ValueTask ProcessCommitReplicated(StorageMessage.CommitAck message, CancellationToken token) {
+		long lastEventNumber = message.LastEventNumber;
+		if (_pendingTransactions.TryRemove(message.TransactionPosition, out var transaction)) {
+			var isTfEof = IsTfEof(transaction.PostPosition);
+			if (transaction.Prepares.Count > 0) {
+				await _indexCommitter.Commit(transaction.Prepares, isTfEof, true, token);
+			}
+
+			if (transaction.Commit is not null) {
+				lastEventNumber = await _indexCommitter.Commit(transaction.Commit, isTfEof, true, token);
+			}
+		}
+
+		lastEventNumber = lastEventNumber == EventNumber.Invalid ? message.LastEventNumber : lastEventNumber;
+
+		_publisher.Publish(new ReplicationTrackingMessage.IndexedTo(message.LogPosition));
+
+		_publisher.Publish(new StorageMessage.CommitIndexed(message.CorrelationId, message.LogPosition,
+			message.TransactionPosition, message.FirstEventNumber, lastEventNumber));
+	}
+
+	private bool IsTfEof(long postPosition) => postPosition == _writerCheckpoint.Read();
+
+	public ValueTask<long> GetCommitLastEventNumber(CommitLogRecord commit, CancellationToken token)
+		=> _indexCommitter.GetCommitLastEventNumber(commit, token);
+
+	public void AddPendingPrepare(IPrepareLogRecord<TStreamId>[] prepares, long postPosition) {
+		var transactionPosition = prepares[0].TransactionPosition;
+		if (_pendingTransactions.TryGetValue(transactionPosition, out var transaction)) {
+			var newTransaction = new PendingTransaction(transactionPosition, postPosition, transaction.Prepares, transaction.Commit);
+			newTransaction.AddPendingPrepares(prepares);
+			if (!_pendingTransactions.TryUpdate(transactionPosition, newTransaction, transaction)) {
+				throw new InvalidOperationException("Failed to update pending prepare");
+			}
+		} else {
+			var pendingTransaction = new PendingTransaction(transactionPosition, postPosition, prepares);
+			if (!_pendingTransactions.TryAdd(transactionPosition, pendingTransaction)) {
+				throw new InvalidOperationException("Failed to add pending prepare");
+			}
+		}
+	}
+
+	public void AddPendingCommit(CommitLogRecord commit, long postPosition) {
+		if (_pendingTransactions.TryGetValue(commit.TransactionPosition, out var transaction)) {
+			var newTransaction = new PendingTransaction(commit.TransactionPosition, postPosition, transaction.Prepares, commit);
+			if (!_pendingTransactions.TryUpdate(commit.TransactionPosition, newTransaction, transaction)) {
+				throw new InvalidOperationException("Failed to update pending commit");
+			}
+		} else {
+			var pendingTransaction = new PendingTransaction(commit.TransactionPosition, postPosition, commit);
+			if (!_pendingTransactions.TryAdd(commit.TransactionPosition, pendingTransaction)) {
+				throw new InvalidOperationException("Failed to add pending commit");
+			}
+		}
+	}
+
+	public void Handle(SystemMessage.BecomeShuttingDown message) => Stop();
+
+	public void Handle(StorageMessage.CommitAck message) {
+		lock (_commitAcks) {
+			_commitAcks.TryAdd(message.LogPosition, message);
+		}
+
+		EnqueueReplicatedCommits();
+	}
+
+	public void Handle(ReplicationTrackingMessage.ReplicatedTo message) => EnqueueReplicatedCommits();
+
+	private void EnqueueReplicatedCommits() {
+		var replicated = new List<StorageMessage.CommitAck>();
+		lock (_commitAcks) {
+			while (_commitAcks.Count > 0) {
+				var ack = _commitAcks.Values[0];
+				if (ack.LogPosition >= _replicationCheckpoint.Read()) { break; }
+
+				replicated.Add(ack);
+				_commitAcks.RemoveAt(0);
+			}
+		}
+
+		foreach (var ack in replicated) {
+#if DEBUG
+			_queueStats.Enqueued();
+#endif
+			_replicatedQueue.Enqueue(ack);
+			_addMsgSignal.Set();
+		}
+	}
+
+	public QueueStats GetStatistics() {
+		return _queueStats.GetStatistics(0);
+	}
+
+	private class FaultedIndexCommitterServiceState;
+
+	internal class PendingTransaction {
+		public readonly List<IPrepareLogRecord<TStreamId>> Prepares = [];
+		private CommitLogRecord _commit;
+
+		public CommitLogRecord Commit {
+			get { return _commit; }
+		}
+
+		public readonly long TransactionPosition;
+		public readonly long PostPosition;
+
+		public PendingTransaction(long transactionPosition, long postPosition,
+			IEnumerable<IPrepareLogRecord<TStreamId>> prepares, CommitLogRecord commit = null) {
+			TransactionPosition = transactionPosition;
+			PostPosition = postPosition;
+			Prepares.AddRange(prepares);
+			_commit = commit;
+		}
+
+		public PendingTransaction(long transactionPosition, long postPosition, CommitLogRecord commit) {
+			TransactionPosition = transactionPosition;
+			PostPosition = postPosition;
+			_commit = commit;
+		}
+
+		public void AddPendingPrepares(IEnumerable<IPrepareLogRecord<TStreamId>> prepares) {
+			Prepares.AddRange(prepares);
+		}
+
+		public void SetPendingCommit(CommitLogRecord commit) {
+			_commit = commit;
+		}
+	}
+
+	public void Handle(ClientMessage.MergeIndexes message) {
+		if (_tableIndex.IsBackgroundTaskRunning) {
+			Log.Information("A background operation is already running...");
+			MakeReplyForMergeIndexes(message);
+			return;
+		}
+
+		_tableIndex.MergeIndexes();
+		MakeReplyForMergeIndexes(message);
+	}
+
+	private static void MakeReplyForMergeIndexes(ClientMessage.MergeIndexes message) {
+		message.Envelope.ReplyWith(new ClientMessage.MergeIndexesResponse(message.CorrelationId,
+			ClientMessage.MergeIndexesResponse.MergeIndexesResult.Started));
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/AllReader.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/AllReader.cs
new file mode 100644
index 00000000000..69f598b8e50
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/AllReader.cs
@@ -0,0 +1,331 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public interface IAllReader {
+	/// <summary>
+	/// Returns event records in the sequence they were committed into TF.
+	/// Positions is specified as pre-positions (pointer at the beginning of the record).
+	/// </summary>
+	ValueTask<IndexReadAllResult> ReadAllEventsForward(TFPos pos, int maxCount, CancellationToken token);
+
+	/// <summary>
+	/// Returns event records whose eventType matches the given <see cref="EventFilter"/> in the sequence they were committed into TF.
+	/// Positions is specified as pre-positions (pointer at the beginning of the record).
+	/// </summary>
+	ValueTask<IndexReadAllResult> FilteredReadAllEventsForward(TFPos pos, int maxCount, int maxSearchWindow,
+		IEventFilter eventFilter, CancellationToken token);
+
+	/// <summary>
+	/// Returns event records in the reverse sequence they were committed into TF.
+	/// Positions is specified as post-positions (pointer after the end of record).
+	/// </summary>
+	ValueTask<IndexReadAllResult> ReadAllEventsBackward(TFPos pos, int maxCount, CancellationToken token);
+
+	/// <summary>
+	/// Returns event records whose eventType matches the given <see cref="EventFilter"/> in the sequence they were committed into TF.
+	/// Positions is specified as pre-positions (pointer at the beginning of the record).
+	/// </summary>
+	ValueTask<IndexReadAllResult> FilteredReadAllEventsBackward(TFPos pos, int maxCount, int maxSearchWindow,
+		IEventFilter eventFilter, CancellationToken token);
+}
+
+public class AllReader<TStreamId> : IAllReader {
+	private readonly IIndexBackend _backend;
+	private readonly IIndexCommitter _indexCommitter;
+	private readonly INameLookup<TStreamId> _streamNames;
+	private readonly INameLookup<TStreamId> _eventTypes;
+
+	public AllReader(
+		IIndexBackend backend,
+		IIndexCommitter indexCommitter,
+		INameLookup<TStreamId> streamNames,
+		INameLookup<TStreamId> eventTypes) {
+
+		_backend = Ensure.NotNull(backend);
+		_indexCommitter = Ensure.NotNull(indexCommitter);
+		_streamNames = Ensure.NotNull(streamNames);
+		_eventTypes = Ensure.NotNull(eventTypes);
+	}
+
+	public ValueTask<IndexReadAllResult> ReadAllEventsForward(TFPos pos, int maxCount, CancellationToken token) {
+		return ReadAllEventsForwardInternal(pos, maxCount, int.MaxValue, EventFilter.DefaultAllFilter, token);
+	}
+
+	public ValueTask<IndexReadAllResult> FilteredReadAllEventsForward(TFPos pos, int maxCount, int maxSearchWindow,
+		IEventFilter eventFilter, CancellationToken token) {
+		return ReadAllEventsForwardInternal(pos, maxCount, maxSearchWindow, eventFilter, token);
+	}
+
+	private async ValueTask<IndexReadAllResult> ReadAllEventsForwardInternal(TFPos pos, int maxCount, int maxSearchWindow,
+		IEventFilter eventFilter, CancellationToken token) {
+		var records = new List<CommitEventRecord>();
+		var nextPos = pos;
+		// in case we are at position after which there is no commit at all, in that case we have to force
+		// PreparePosition to long.MaxValue, so if you decide to read backwards from PrevPos,
+		// you will receive all prepares.
+		var prevPos = new TFPos(pos.CommitPosition, long.MaxValue);
+		var consideredEventsCount = 0L;
+		var firstCommit = true;
+		var reachedEndOfStream = false;
+		using var reader = _backend.BorrowReader();
+
+		long nextCommitPos = pos.CommitPosition;
+		while (records.Count < maxCount && consideredEventsCount < maxSearchWindow) {
+			if (nextCommitPos > _indexCommitter.LastIndexedPosition) {
+				reachedEndOfStream = true;
+				break;
+			}
+
+			reader.Reposition(nextCommitPos);
+
+			SeqReadResult result;
+			while ((result = await reader.TryReadNext(token)).Success && !IsCommitAlike(result.LogRecord)) {
+				// skip until commit
+			}
+
+			if (!result.Success) // no more records in TF
+				break;
+
+			nextCommitPos = result.RecordPostPosition;
+
+			switch (result.LogRecord.RecordType) {
+				case LogRecordType.Prepare:
+				case LogRecordType.Stream:
+				case LogRecordType.EventType: {
+					var prepare = (IPrepareLogRecord<TStreamId>)result.LogRecord;
+					if (firstCommit) {
+						firstCommit = false;
+						prevPos = new TFPos(result.RecordPrePosition, result.RecordPrePosition);
+					}
+
+					if (prepare.Flags.HasAnyOf(PrepareFlags.Data | PrepareFlags.StreamDelete)
+						&& new TFPos(prepare.LogPosition, prepare.LogPosition) >= pos) {
+						var streamName = await _streamNames.LookupName(prepare.EventStreamId, token);
+						var eventType = await _eventTypes.LookupName(prepare.EventType, token);
+						var eventRecord = new EventRecord(eventNumber: prepare.ExpectedVersion + 1,
+							prepare, streamName, eventType);
+						consideredEventsCount++;
+						if (eventFilter.IsEventAllowed(eventRecord)) {
+							records.Add(new CommitEventRecord(eventRecord, prepare.LogPosition));
+						}
+
+						nextPos = new TFPos(result.RecordPostPosition, 0);
+					}
+
+					break;
+				}
+
+				case LogRecordType.Commit: {
+					var commit = (CommitLogRecord)result.LogRecord;
+					if (firstCommit) {
+						firstCommit = false;
+						// for backward pass we want to allow read the same commit and skip read prepares,
+						// so we put post-position of commit and post-position of prepare as TFPos for backward pass
+						prevPos = new TFPos(result.RecordPostPosition, pos.PreparePosition);
+					}
+
+					reader.Reposition(commit.TransactionPosition);
+					while (records.Count < maxCount && consideredEventsCount < maxSearchWindow) {
+						result = await reader.TryReadNext(token);
+						if (!result.Success) // no more records in TF
+							break;
+						// prepare with TransactionEnd could be scavenged already
+						// so we could reach the same commit record. In that case have to stop
+						if (result.LogRecord.LogPosition >= commit.LogPosition)
+							break;
+						if (result.LogRecord.RecordType != LogRecordType.Prepare)
+							continue;
+
+						var prepare = (IPrepareLogRecord<TStreamId>)result.LogRecord;
+						if (prepare.TransactionPosition != commit.TransactionPosition) // wrong prepare
+							continue;
+
+						// prepare with useful data or delete tombstone
+						if (prepare.Flags.HasAnyOf(PrepareFlags.Data | PrepareFlags.StreamDelete)
+							&& new TFPos(commit.LogPosition, prepare.LogPosition) >= pos) {
+							var streamName = await _streamNames.LookupName(prepare.EventStreamId, token);
+							var eventType = await _eventTypes.LookupName(prepare.EventType, token);
+							var eventRecord =
+								new EventRecord(commit.FirstEventNumber + prepare.TransactionOffset,
+									prepare, streamName, eventType);
+							consideredEventsCount++;
+							if (eventFilter.IsEventAllowed(eventRecord)) {
+								records.Add(new CommitEventRecord(eventRecord, commit.LogPosition));
+							}
+
+							// for forward pass position is inclusive,
+							// so we put pre-position of commit and post-position of prepare
+							nextPos = new TFPos(commit.LogPosition, result.RecordPostPosition);
+						}
+
+						if (prepare.Flags.HasAnyOf(PrepareFlags.TransactionEnd))
+							break;
+					}
+
+					break;
+				}
+
+				default:
+					throw new Exception($"Unexpected log record type: {result.LogRecord.RecordType}.");
+			}
+		}
+
+		return new IndexReadAllResult(records, pos, nextPos, prevPos, reachedEndOfStream, consideredEventsCount);
+	}
+
+	public ValueTask<IndexReadAllResult> ReadAllEventsBackward(TFPos pos, int maxCount, CancellationToken token) {
+		return ReadAllEventsBackwardInternal(pos, maxCount, int.MaxValue, EventFilter.DefaultAllFilter, token);
+	}
+
+	public ValueTask<IndexReadAllResult> FilteredReadAllEventsBackward(TFPos pos, int maxCount, int maxSearchWindow,
+		IEventFilter eventFilter, CancellationToken token) {
+		return ReadAllEventsBackwardInternal(pos, maxCount, maxSearchWindow, eventFilter, token);
+	}
+
+	private async ValueTask<IndexReadAllResult> ReadAllEventsBackwardInternal(TFPos pos, int maxCount, int maxSearchWindow,
+		IEventFilter eventFilter,
+		CancellationToken token) {
+		var records = new List<CommitEventRecord>();
+		var nextPos = pos;
+		// in case we are at position after which there is no commit at all, in that case we have to force
+		// PreparePosition to 0, so if you decide to read backwards from PrevPos,
+		// you will receive all prepares.
+		var prevPos = new TFPos(pos.CommitPosition, 0);
+		var consideredEventsCount = 0L;
+		bool firstCommit = true;
+		var reachedEndOfStream = false;
+		using var reader = _backend.BorrowReader();
+
+		long nextCommitPostPos = pos.CommitPosition;
+		while (records.Count < maxCount && consideredEventsCount < maxSearchWindow) {
+			reader.Reposition(nextCommitPostPos);
+
+			SeqReadResult result;
+			while ((result = await reader.TryReadPrev(token)).Success && !IsCommitAlike(result.LogRecord)) {
+				// skip until commit
+			}
+
+			if (!result.Success) {
+				// no more records in TF
+				reachedEndOfStream = true;
+				break;
+			}
+
+			nextCommitPostPos = result.RecordPrePosition;
+
+			if (nextCommitPostPos > _indexCommitter.LastIndexedPosition) {
+				continue;
+			}
+
+			switch (result.LogRecord.RecordType) {
+				case LogRecordType.Prepare:
+				case LogRecordType.Stream:
+				case LogRecordType.EventType: {
+					var prepare = (IPrepareLogRecord<TStreamId>)result.LogRecord;
+					if (firstCommit) {
+						firstCommit = false;
+						prevPos = new TFPos(result.RecordPostPosition, result.RecordPostPosition);
+					}
+
+					if (prepare.Flags.HasAnyOf(PrepareFlags.Data | PrepareFlags.StreamDelete)
+						&& new TFPos(result.RecordPostPosition, result.RecordPostPosition) <= pos) {
+						var streamName = await _streamNames.LookupName(prepare.EventStreamId, token);
+						var eventType = await _eventTypes.LookupName(prepare.EventType, token);
+						var eventRecord = new EventRecord(eventNumber: prepare.ExpectedVersion + 1,
+							prepare, streamName, eventType);
+						consideredEventsCount++;
+
+						if (eventFilter.IsEventAllowed(eventRecord)) {
+							records.Add(new CommitEventRecord(eventRecord, prepare.LogPosition));
+						}
+
+						// for backward pass we allow read the same commit, but force to skip last read prepare
+						// so we put post-position of commit and pre-position of prepare
+						nextPos = new TFPos(result.RecordPrePosition, result.RecordPrePosition);
+					}
+
+					break;
+				}
+
+				case LogRecordType.Commit: {
+					var commit = (CommitLogRecord)result.LogRecord;
+					if (firstCommit) {
+						firstCommit = false;
+						// for forward pass we allow read the same commit and as we have post-positions here
+						// we can put just prepare post-position as prepare pre-position for forward read
+						// so we put pre-position of commit and post-position of prepare
+						prevPos = new TFPos(commit.LogPosition, pos.PreparePosition);
+					}
+
+					var commitPostPos = result.RecordPostPosition;
+					// as we don't know exact position of the last record of transaction,
+					// we have to sequentially scan backwards, so no need to reposition
+					while (records.Count < maxCount && consideredEventsCount < maxSearchWindow) {
+						result = await reader.TryReadPrev(token);
+						if (!result.Success) // no more records in TF
+							break;
+
+						// prepare with TransactionBegin could be scavenged already
+						// so we could reach beyond the start of transaction. In that case we have to stop.
+						if (result.LogRecord.LogPosition < commit.TransactionPosition)
+							break;
+						if (result.LogRecord.RecordType != LogRecordType.Prepare)
+							continue;
+
+						var prepare = (IPrepareLogRecord<TStreamId>)result.LogRecord;
+						if (prepare.TransactionPosition != commit.TransactionPosition) // wrong prepare
+							continue;
+
+						// prepare with useful data or delete tombstone
+						if (prepare.Flags.HasAnyOf(PrepareFlags.Data | PrepareFlags.StreamDelete)
+							&& new TFPos(commitPostPos, result.RecordPostPosition) <= pos) {
+							var streamName = await _streamNames.LookupName(prepare.EventStreamId, token);
+							var eventType = await _eventTypes.LookupName(prepare.EventType, token);
+							var eventRecord =
+								new EventRecord(commit.FirstEventNumber + prepare.TransactionOffset,
+									prepare, streamName, eventType);
+							consideredEventsCount++;
+
+							if (eventFilter.IsEventAllowed(eventRecord)) {
+								records.Add(new CommitEventRecord(eventRecord, commit.LogPosition));
+							}
+
+							// for backward pass we allow read the same commit, but force to skip last read prepare
+							// so we put post-position of commit and pre-position of prepare
+							nextPos = new TFPos(commitPostPos, prepare.LogPosition);
+						}
+
+						if (prepare.Flags.HasAnyOf(PrepareFlags.TransactionBegin))
+							break;
+					}
+
+					break;
+				}
+
+				default:
+					throw new Exception($"Unexpected log record type: {result.LogRecord.RecordType}.");
+			}
+		}
+
+		return new IndexReadAllResult(records, pos, nextPos, prevPos, reachedEndOfStream, consideredEventsCount);
+	}
+
+	private static bool IsCommitAlike(ILogRecord rec) {
+		return rec.RecordType == LogRecordType.Commit
+			   || (rec.RecordType is LogRecordType.Prepare or LogRecordType.EventType or LogRecordType.Stream &&
+				   ((IPrepareLogRecord)rec).Flags.HasAnyOf(PrepareFlags.IsCommitted));
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/BoundedCache.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/BoundedCache.cs
new file mode 100644
index 00000000000..a547c441c51
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/BoundedCache.cs
@@ -0,0 +1,91 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public class BoundedCache<TKey, TValue> {
+	public int Count {
+		get { return _cache.Count; }
+	}
+
+	private readonly int _maxCachedEntries;
+	private readonly long _maxDataSize;
+	private readonly Func<TValue, long> _valueSize;
+	private readonly Dictionary<TKey, TValue> _cache = [];
+	private readonly Queue<TKey> _queue = new();
+
+	private long _currentSize;
+	private long _missCount;
+	private long _hitCount;
+
+	public BoundedCache(int maxCachedEntries, long maxDataSize, Func<TValue, long> valueSize) {
+		_maxCachedEntries = Ensure.Positive(maxCachedEntries);
+		_maxDataSize = Ensure.Positive(maxDataSize);
+		_valueSize = Ensure.NotNull(valueSize);
+	}
+
+	public bool TryGetRecord(TKey key, out TValue value) {
+		var found = _cache.TryGetValue(key, out value);
+		if (found)
+			_hitCount++;
+		else
+			_missCount++;
+		return found;
+	}
+
+	public void PutRecord(TKey key, TValue value) {
+		PutRecord(key, value, true);
+	}
+
+	public void PutRecord(TKey key, TValue value, bool throwOnDuplicate) {
+		while (IsFull()) {
+			var oldKey = _queue.Dequeue();
+			RemoveRecord(oldKey);
+		}
+
+		_currentSize += _valueSize(value);
+		_queue.Enqueue(key);
+		if (!throwOnDuplicate && _cache.ContainsKey(key))
+			return;
+		_cache.Add(key, value);
+	}
+
+	public bool TryPutRecord(TKey key, TValue value) {
+		if (IsFull())
+			return false;
+
+		_currentSize += _valueSize(value);
+		_queue.Enqueue(key);
+		_cache.Add(key, value); // add to throw exception if duplicate
+		return true;
+	}
+
+	public void Clear() {
+		_currentSize = 0;
+		_queue.Clear();
+		_cache.Clear();
+	}
+
+	private bool IsFull() {
+		return _queue.Count >= _maxCachedEntries || (_currentSize > _maxDataSize && _queue.Count > 0);
+	}
+
+	public void RemoveRecord(TKey key) {
+		if (_cache.TryGetValue(key, out var old)) {
+			_currentSize -= _valueSize(old);
+			_cache.Remove(key);
+		}
+	}
+
+	public ReadCacheStats GetStatistics() {
+		return new ReadCacheStats(Interlocked.Read(ref _currentSize),
+			_cache.Count,
+			Interlocked.Read(ref _hitCount),
+			Interlocked.Read(ref _missCount));
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/CommitCheckResult.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/CommitCheckResult.cs
new file mode 100644
index 00000000000..b296c3dc610
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/CommitCheckResult.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public struct CommitCheckResult<TStreamId>(
+	CommitDecision decision,
+	TStreamId eventStreamId,
+	long currentVersion,
+	long startEventNumber,
+	long endEventNumber,
+	bool isSoftDeleted,
+	long idempotentLogPosition = -1) {
+	public readonly CommitDecision Decision = decision;
+	public readonly TStreamId EventStreamId = eventStreamId;
+	public readonly long CurrentVersion = currentVersion;
+	public readonly long StartEventNumber = startEventNumber;
+	public readonly long EndEventNumber = endEventNumber;
+	public readonly bool IsSoftDeleted = isSoftDeleted;
+	public readonly long IdempotentLogPosition = idempotentLogPosition;
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/CommitDecision.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/CommitDecision.cs
new file mode 100644
index 00000000000..d23b5cd9600
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/CommitDecision.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public enum CommitDecision {
+	Ok,
+	WrongExpectedVersion,
+	Deleted,
+	Idempotent,
+	CorruptedIdempotency,
+	InvalidTransaction,
+	IdempotentNotReady
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/EventFilter.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/EventFilter.cs
new file mode 100644
index 00000000000..b05f2740ddf
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/EventFilter.cs
@@ -0,0 +1,262 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text.RegularExpressions;
+using EventStore.Client.Messages;
+using static EventStore.Client.Messages.Filter.Types;
+using EventRecord = KurrentDB.Core.Data.EventRecord;
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public static class EventFilter {
+	public const string StreamIdContext = "streamid";
+	public const string EventTypeContext = "eventtype";
+	public const string RegexType = "regex";
+	public const string PrefixType = "prefix";
+
+	public static IEventFilter DefaultAllFilter { get; } = new DefaultAllFilterStrategy();
+	public static IEventFilter DefaultStreamFilter { get; } = new DefaultStreamFilterStrategy();
+
+	public static class StreamName {
+		public static IEventFilter Prefixes(bool isAllStream, params string[] prefixes)
+			=> new StreamIdPrefixStrategy(isAllStream, prefixes);
+
+		public static IEventFilter Regex(bool isAllStream, string regex)
+			=> new StreamIdRegexStrategy(isAllStream, regex);
+	}
+
+	public static class EventType {
+		public static IEventFilter Prefixes(bool isAllStream, params string[] prefixes)
+			=> new EventTypePrefixStrategy(isAllStream, prefixes);
+
+		public static IEventFilter Regex(bool isAllStream, string regex)
+			=> new EventTypeRegexStrategy(isAllStream, regex);
+	}
+
+	public static IEventFilter Get(bool isAllStream, Filter filter) {
+		if (filter == null || filter.Data.Count == 0) {
+			return isAllStream ? new DefaultAllFilterStrategy() : new DefaultStreamFilterStrategy();
+		}
+
+		return filter.Context switch {
+			FilterContext.EventType when filter.Type == FilterType.Prefix => EventType.Prefixes(isAllStream, filter.Data.ToArray()),
+			FilterContext.EventType when filter.Type == FilterType.Regex => EventType.Regex(isAllStream, filter.Data[0]),
+			FilterContext.StreamId when filter.Type == FilterType.Prefix => StreamName.Prefixes(isAllStream, filter.Data.ToArray()),
+			FilterContext.StreamId when filter.Type == FilterType.Regex => StreamName.Regex(isAllStream, filter.Data[0]),
+			_ => throw new Exception() // Invalid filter
+		};
+	}
+
+	private sealed class DefaultStreamFilterStrategy : IEventFilter {
+		[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+		public bool IsEventAllowed(EventRecord eventRecord) => true;
+	}
+
+	private sealed class DefaultAllFilterStrategy : IEventFilter {
+		//first rule that matches from the top is applied
+		private readonly (IEventFilter filter, bool allow)[] _allFilters = {
+			//immediately allow all non-system events
+			(new NonSystemStreamStrategy(), true),
+			//disallow $epoch-information
+			(new OrdinalStreamIdEqualityStrategy(SystemStreams.EpochInformationStream), false),
+			//disallow persistent subscription to $all checkpoints
+			(new OrdinalStreamIdPrefixAndSuffixStrategy("$persistentsubscription-$all::", "-checkpoint"), false),
+			//disallow persistent subscription to $all parked messages
+			(new OrdinalStreamIdPrefixAndSuffixStrategy("$persistentsubscription-$all::", "-parked"), false)
+		};
+
+		[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+		public bool IsEventAllowed(EventRecord eventRecord) {
+			var filters = _allFilters.AsSpan();
+			Debug.Assert(filters.Length > 0);
+			do {
+				var (filter, allow) = filters[0];
+				if (filter.IsEventAllowed(eventRecord)) {
+					return allow;
+				}
+
+				filters = filters[1..];
+			} while (!filters.IsEmpty);
+
+			return true;
+		}
+
+		public override string ToString() => nameof(DefaultAllFilterStrategy);
+
+		private class NonSystemStreamStrategy : IEventFilter {
+			[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+			public bool IsEventAllowed(EventRecord eventRecord) => eventRecord.EventStreamId[0] != '$';
+
+			public override string ToString() => nameof(NonSystemStreamStrategy);
+		}
+
+		private sealed class OrdinalStreamIdEqualityStrategy(string stream) : IEventFilter {
+			[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+			public bool IsEventAllowed(EventRecord eventRecord) => eventRecord.EventStreamId == stream;
+
+			public override string ToString() => nameof(OrdinalStreamIdEqualityStrategy);
+		}
+
+		private class OrdinalStreamIdPrefixAndSuffixStrategy : IEventFilter {
+			private readonly string _prefix;
+			private readonly string _suffix;
+			private readonly int _minLength;
+
+			public OrdinalStreamIdPrefixAndSuffixStrategy(string prefix, string suffix) {
+				_prefix = prefix;
+				_suffix = suffix;
+				_minLength = _prefix.Length + _suffix.Length;
+			}
+
+			[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+			public bool IsEventAllowed(EventRecord eventRecord) =>
+				eventRecord.EventStreamId.Length >= _minLength
+				&& eventRecord.EventStreamId.StartsWith(_prefix, StringComparison.Ordinal)
+				&& eventRecord.EventStreamId.EndsWith(_suffix, StringComparison.Ordinal);
+
+			public override string ToString() =>
+				$"{nameof(OrdinalStreamIdPrefixAndSuffixStrategy)}: (prefix: {_prefix}, suffix: {_suffix})";
+		}
+	}
+
+	private sealed class StreamIdPrefixStrategy(bool isAllStream, string[] expectedPrefixes) : IEventFilter {
+		internal readonly bool _isAllStream = isAllStream;
+		internal readonly string[] _expectedPrefixes = expectedPrefixes;
+
+		public bool IsEventAllowed(EventRecord eventRecord) =>
+			(!_isAllStream || DefaultAllFilter.IsEventAllowed(eventRecord)) &&
+			_expectedPrefixes.Any(expectedPrefix => eventRecord.EventStreamId.StartsWith(expectedPrefix));
+
+		public override string ToString() =>
+			$"{nameof(StreamIdPrefixStrategy)}: ({string.Join(", ", _expectedPrefixes)})";
+	}
+
+	private sealed class EventTypePrefixStrategy(bool isAllStream, string[] expectedPrefixes) : IEventFilter {
+		internal readonly bool _isAllStream = isAllStream;
+		internal readonly string[] _expectedPrefixes = expectedPrefixes;
+
+		public bool IsEventAllowed(EventRecord eventRecord) =>
+			(!_isAllStream || DefaultAllFilter.IsEventAllowed(eventRecord)) &&
+			_expectedPrefixes.Any(expectedPrefix => eventRecord.EventType.StartsWith(expectedPrefix));
+
+		public override string ToString() =>
+			$"{nameof(EventTypePrefixStrategy)}: ({string.Join(", ", _expectedPrefixes)})";
+	}
+
+	private sealed class EventTypeRegexStrategy(bool isAllStream, string expectedRegex) : IEventFilter {
+		internal readonly bool _isAllStream = isAllStream;
+		internal readonly Regex _expectedRegex = new(expectedRegex, RegexOptions.Compiled);
+
+		public bool IsEventAllowed(EventRecord eventRecord) =>
+			(!_isAllStream || DefaultAllFilter.IsEventAllowed(eventRecord)) &&
+			_expectedRegex.Match(eventRecord.EventType).Success;
+
+		public override string ToString() =>
+			$"{nameof(EventTypeRegexStrategy)}: ({string.Join(", ", _expectedRegex)})";
+	}
+
+	private sealed class StreamIdRegexStrategy(bool isAllStream, string expectedRegex) : IEventFilter {
+		internal readonly bool _isAllStream = isAllStream;
+		internal readonly Regex _expectedRegex = new(expectedRegex, RegexOptions.Compiled);
+
+		public bool IsEventAllowed(EventRecord eventRecord) =>
+			(!_isAllStream || DefaultAllFilter.IsEventAllowed(eventRecord)) &&
+			_expectedRegex.Match(eventRecord.EventStreamId).Success;
+
+		public override string ToString() =>
+			$"{nameof(StreamIdRegexStrategy)}: ({string.Join(", ", _expectedRegex)})";
+	}
+
+	public class EventFilterDto {
+		public string Context;
+		public string Type;
+		public string Data;
+		public bool IsAllStream;
+	}
+
+	public static EventFilterDto ParseToDto(IEventFilter filter) {
+		switch (filter) {
+			case StreamIdPrefixStrategy sips:
+				return new() {
+					Context = StreamIdContext,
+					Type = PrefixType,
+					Data = string.Join(",", sips._expectedPrefixes.Select(x => $"{x}")),
+					IsAllStream = sips._isAllStream
+				};
+			case StreamIdRegexStrategy sirs:
+				return new() {
+					Context = StreamIdContext,
+					Type = RegexType,
+					Data = sirs._expectedRegex.ToString(),
+					IsAllStream = sirs._isAllStream
+				};
+			case EventTypePrefixStrategy etps:
+				return new() {
+					Context = EventTypeContext,
+					Type = PrefixType,
+					Data = string.Join(",", etps._expectedPrefixes.Select(x => $"{x}")),
+					IsAllStream = etps._isAllStream
+				};
+			case EventTypeRegexStrategy etrs:
+				return new() {
+					Context = EventTypeContext,
+					Type = RegexType,
+					Data = etrs._expectedRegex.ToString(),
+					IsAllStream = etrs._isAllStream
+				};
+		}
+
+		return null;
+	}
+
+	public static (bool success, string reason) TryParse(EventFilterDto dto, out IEventFilter filter) {
+		return TryParse(dto.Context, dto.IsAllStream, dto.Type, dto.Data, out filter);
+	}
+
+	public static (bool Success, string Reason) TryParse(string context, bool isAllStream, string type, string data, out IEventFilter filter) {
+		FilterContext parsedContext;
+		switch (context) {
+			case EventTypeContext:
+				parsedContext = FilterContext.EventType;
+				break;
+			case StreamIdContext:
+				parsedContext = FilterContext.StreamId;
+				break;
+			default:
+				filter = null;
+				var names = string.Join(", ", Enum.GetNames(typeof(FilterContext)));
+				return (false, $"Invalid context please provide one of the following: {names}.");
+		}
+
+		FilterType parsedType;
+		switch (type) {
+			case RegexType:
+				parsedType = FilterType.Regex;
+				break;
+			case PrefixType:
+				parsedType = FilterType.Prefix;
+				break;
+			default:
+				filter = null;
+				var names = string.Join(", ", Enum.GetNames(typeof(FilterType)));
+				return (false, $"Invalid type please provide one of the following: {names}.");
+		}
+
+		if (string.IsNullOrEmpty(data)) {
+			filter = null;
+			return (false, "Please provide a comma delimited list of data with at least one item.");
+		}
+
+		if (parsedType == FilterType.Regex) {
+			filter = Get(isAllStream, new(parsedContext, parsedType, [data]));
+			return (true, null);
+		}
+
+		filter = Get(isAllStream, new(parsedContext, parsedType, data.Split(",", StringSplitOptions.RemoveEmptyEntries)));
+		return (true, null);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/ExpiryStrategies.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/ExpiryStrategies.cs
new file mode 100644
index 00000000000..ea0f1e41940
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/ExpiryStrategies.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public interface IExpiryStrategy {
+	public DateTime? GetExpiry();
+}
+
+// Generates null expiry. Default expiry of now + ESConsts.ReadRequestTimeout will be in effect.
+public class DefaultExpiryStrategy : IExpiryStrategy {
+	public DateTime? GetExpiry() => null;
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/IEventFilter.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/IEventFilter.cs
new file mode 100644
index 00000000000..7e8ea766012
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/IEventFilter.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Data;
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public interface IEventFilter {
+	bool IsEventAllowed(EventRecord eventRecord);
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/IReadIndex.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/IReadIndex.cs
new file mode 100644
index 00000000000..01aad939d25
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/IReadIndex.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public interface IReadIndex {
+	long LastIndexedPosition { get; }
+
+	ReadIndexStats GetStatistics();
+
+	/// <summary>
+	/// Returns event records in the sequence they were committed into TF.
+	/// Positions is specified as pre-positions (pointer at the beginning of the record).
+	/// </summary>
+	ValueTask<IndexReadAllResult> ReadAllEventsForward(TFPos pos, int maxCount, CancellationToken token);
+
+	/// <summary>
+	/// Returns event records in the reverse sequence they were committed into TF.
+	/// Positions is specified as post-positions (pointer after the end of record).
+	/// </summary>
+	ValueTask<IndexReadAllResult> ReadAllEventsBackward(TFPos pos, int maxCount, CancellationToken token);
+
+	/// <summary>
+	/// Returns event records whose eventType matches the given EventFilter in the sequence they were committed into TF.
+	/// Positions is specified as pre-positions (pointer at the beginning of the record).
+	/// </summary>
+	ValueTask<IndexReadAllResult> ReadAllEventsForwardFiltered(TFPos pos, int maxCount, int maxSearchWindow,
+		IEventFilter eventFilter, CancellationToken token);
+
+	/// <summary>
+	/// Returns event records whose eventType matches the given EventFilter in the sequence they were committed into TF.
+	/// Positions is specified as pre-positions (pointer at the beginning of the record).
+	/// </summary>
+	ValueTask<IndexReadAllResult> ReadAllEventsBackwardFiltered(TFPos pos, int maxCount, int maxSearchWindow,
+		IEventFilter eventFilter, CancellationToken token);
+
+	void Close();
+	void Dispose();
+}
+
+public interface IReadIndex<TStreamId> : IReadIndex {
+	IIndexWriter<TStreamId> IndexWriter { get; }
+
+	// ReadEvent() / ReadStreamEvents*() :
+	// - deleted events are filtered out
+	// - duplicates are removed, keeping only the earliest event in the log
+	// - streamId drives the read, streamName is only for populating on the result.
+	//   this was less messy than safely adding the streamName to the EventRecord at some point after construction.
+	ValueTask<IndexReadEventResult> ReadEvent(string streamName, TStreamId streamId, long eventNumber, CancellationToken token);
+	ValueTask<IndexReadStreamResult> ReadStreamEventsBackward(string streamName, TStreamId streamId, long fromEventNumber, int maxCount, CancellationToken token);
+	ValueTask<IndexReadStreamResult> ReadStreamEventsForward(string streamName, TStreamId streamId, long fromEventNumber, int maxCount, CancellationToken token);
+
+	// ReadEventInfo_KeepDuplicates() :
+	// - deleted events are not filtered out
+	// - duplicates are kept, in ascending order of log position
+	// - next event number is always -1
+	ValueTask<IndexReadEventInfoResult> ReadEventInfo_KeepDuplicates(TStreamId streamId, long eventNumber, CancellationToken token);
+
+	// ReadEventInfo*Collisions() :
+	// - deleted events are not filtered out
+	// - duplicates are removed, keeping only the earliest event in the log
+	// - only events that are before "beforePosition" in the transaction log are returned
+	ValueTask<IndexReadEventInfoResult> ReadEventInfoForward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount, long beforePosition, CancellationToken token);
+	ValueTask<IndexReadEventInfoResult> ReadEventInfoForward_NoCollisions(ulong stream, long fromEventNumber, int maxCount, long beforePosition, CancellationToken token);
+	ValueTask<IndexReadEventInfoResult> ReadEventInfoBackward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount, long beforePosition, CancellationToken token);
+	ValueTask<IndexReadEventInfoResult> ReadEventInfoBackward_NoCollisions(ulong stream, Func<ulong, TStreamId> getStreamId, long fromEventNumber, int maxCount, long beforePosition, CancellationToken token);
+
+	ValueTask<bool> IsStreamDeleted(TStreamId streamId, CancellationToken token);
+	ValueTask<long> GetStreamLastEventNumber(TStreamId streamId, CancellationToken token);
+	ValueTask<long> GetStreamLastEventNumber_KnownCollisions(TStreamId streamId, long beforePosition, CancellationToken token);
+	ValueTask<long> GetStreamLastEventNumber_NoCollisions(ulong stream, Func<ulong, TStreamId> getStreamId, long beforePosition, CancellationToken token);
+	ValueTask<StreamMetadata> GetStreamMetadata(TStreamId streamId, CancellationToken token);
+	ValueTask<StorageMessage.EffectiveAcl> GetEffectiveAcl(TStreamId streamId, CancellationToken token);
+	ValueTask<TStreamId> GetEventStreamIdByTransactionId(long transactionId, CancellationToken token);
+
+	TStreamId GetStreamId(string streamName);
+	ValueTask<string> GetStreamName(TStreamId streamId, CancellationToken token);
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexBackend.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexBackend.cs
new file mode 100644
index 00000000000..12905b7362f
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexBackend.cs
@@ -0,0 +1,112 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.TransactionLog;
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public interface IIndexBackend {
+	TFReaderLease BorrowReader();
+	void SetSystemSettings(SystemSettings systemSettings);
+	SystemSettings GetSystemSettings();
+}
+
+public interface IIndexBackend<TStreamId> : IIndexBackend {
+	IndexBackend<TStreamId>.EventNumberCached TryGetStreamLastEventNumber(TStreamId streamId);
+	IndexBackend<TStreamId>.MetadataCached TryGetStreamMetadata(TStreamId streamId);
+
+	long? UpdateStreamLastEventNumber(int cacheVersion, TStreamId streamId, long? lastEventNumber);
+	StreamMetadata UpdateStreamMetadata(int cacheVersion, TStreamId streamId, StreamMetadata metadata);
+
+	long? SetStreamLastEventNumber(TStreamId streamId, long lastEventNumber);
+	StreamMetadata SetStreamMetadata(TStreamId streamId, StreamMetadata metadata);
+}
+
+public class IndexBackend<TStreamId> : IIndexBackend<TStreamId> {
+	private readonly ObjectPool<ITransactionFileReader> _readers;
+	private readonly ILRUCache<TStreamId, EventNumberCached> _streamLastEventNumberCache;
+	private readonly ILRUCache<TStreamId, MetadataCached> _streamMetadataCache;
+	private SystemSettings _systemSettings;
+
+	public IndexBackend(
+		ObjectPool<ITransactionFileReader> readers,
+		ILRUCache<TStreamId, EventNumberCached> streamLastEventNumberCache,
+		ILRUCache<TStreamId, MetadataCached> streamMetadataCache) {
+		_readers = Ensure.NotNull(readers);
+		_streamLastEventNumberCache = Ensure.NotNull(streamLastEventNumberCache);
+		_streamMetadataCache = Ensure.NotNull(streamMetadataCache);
+	}
+
+	public TFReaderLease BorrowReader() => new(_readers);
+
+	public EventNumberCached TryGetStreamLastEventNumber(TStreamId streamId) {
+		_streamLastEventNumberCache.TryGet(streamId, out var cacheInfo);
+		return cacheInfo;
+	}
+
+	public MetadataCached TryGetStreamMetadata(TStreamId streamId) {
+		_streamMetadataCache.TryGet(streamId, out var cacheInfo);
+		return cacheInfo;
+	}
+
+	public long? UpdateStreamLastEventNumber(int cacheVersion, TStreamId streamId, long? lastEventNumber) {
+		var res = _streamLastEventNumberCache.Put(
+			streamId,
+			new KeyValuePair<int, long?>(cacheVersion, lastEventNumber),
+			(_, d) => d.Key == 0 ? new EventNumberCached(1, d.Value) : new(1, null),
+			(_, old, d) => old.Version == d.Key ? new(d.Key + 1, d.Value ?? old.LastEventNumber) : old);
+		return res.LastEventNumber;
+	}
+
+	public StreamMetadata UpdateStreamMetadata(int cacheVersion, TStreamId streamId, StreamMetadata metadata) {
+		var res = _streamMetadataCache.Put(
+			streamId,
+			new KeyValuePair<int, StreamMetadata>(cacheVersion, metadata),
+			(_, d) => d.Key == 0 ? new MetadataCached(1, d.Value) : new(1, null),
+			(_, old, d) => old.Version == d.Key ? new(d.Key + 1, d.Value ?? old.Metadata) : old);
+		return res.Metadata;
+	}
+
+	long? IIndexBackend<TStreamId>.SetStreamLastEventNumber(TStreamId streamId, long lastEventNumber) {
+		var res = _streamLastEventNumberCache.Put(streamId,
+			lastEventNumber,
+			(_, lastEvNum) => new(1, lastEvNum),
+			(_, old, lastEvNum) => new(old.Version + 1, lastEvNum));
+		return res.LastEventNumber;
+	}
+
+	StreamMetadata IIndexBackend<TStreamId>.SetStreamMetadata(TStreamId streamId, StreamMetadata metadata) {
+		var res = _streamMetadataCache.Put(streamId,
+			metadata,
+			(_, meta) => new(1, meta),
+			(_, old, meta) => new(old.Version + 1, meta));
+		return res.Metadata;
+	}
+
+	public void SetSystemSettings(SystemSettings systemSettings) {
+		_systemSettings = systemSettings;
+	}
+
+	public SystemSettings GetSystemSettings() {
+		return _systemSettings;
+	}
+
+	public struct EventNumberCached(int version, long? lastEventNumber) {
+		public readonly int Version = version;
+		public readonly long? LastEventNumber = lastEventNumber;
+
+		public static int ApproximateSize => Unsafe.SizeOf<EventNumberCached>();
+	}
+
+	public readonly struct MetadataCached(int version, StreamMetadata metadata) {
+		public readonly int Version = version;
+		public readonly StreamMetadata Metadata = metadata;
+
+		public int ApproximateSize => Unsafe.SizeOf<MetadataCached>() + (Metadata?.ApproximateSize ?? 0);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexCommitter.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexCommitter.cs
new file mode 100644
index 00000000000..1ae1a54b98a
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexCommitter.cs
@@ -0,0 +1,522 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public interface IIndexCommitter {
+	long LastIndexedPosition { get; }
+	ValueTask Init(long buildToPosition, CancellationToken token);
+	void Dispose();
+	ValueTask<long> Commit(CommitLogRecord commit, bool isTfEof, bool cacheLastEventNumber, CancellationToken token);
+	ValueTask<long> GetCommitLastEventNumber(CommitLogRecord commit, CancellationToken token);
+}
+
+public interface IIndexCommitter<TStreamId> : IIndexCommitter {
+	ValueTask<long> Commit(IReadOnlyList<IPrepareLogRecord<TStreamId>> commitedPrepares, bool isTfEof, bool cacheLastEventNumber, CancellationToken token);
+}
+
+public abstract class IndexCommitter {
+	public static readonly ILogger Log = Serilog.Log.ForContext<IndexCommitter>();
+}
+
+public class IndexCommitter<TStreamId> : IndexCommitter, IIndexCommitter<TStreamId> {
+	private static EqualityComparer<TStreamId> StreamIdComparer { get; } = EqualityComparer<TStreamId>.Default;
+
+	public long LastIndexedPosition => _indexChk.Read();
+
+	private readonly IPublisher _bus;
+	private readonly IIndexBackend<TStreamId> _backend;
+	private readonly IIndexReader<TStreamId> _indexReader;
+	private readonly ITableIndex<TStreamId> _tableIndex;
+	private readonly INameIndexConfirmer<TStreamId> _streamNameIndex;
+	private readonly INameLookup<TStreamId> _streamNames;
+	private readonly INameIndexConfirmer<TStreamId> _eventTypeIndex;
+	private readonly INameLookup<TStreamId> _eventTypes;
+	private readonly ISystemStreamLookup<TStreamId> _systemStreams;
+	private readonly INameExistenceFilter _streamExistenceFilter;
+	private readonly INameExistenceFilterInitializer _streamExistenceFilterInitializer;
+	private readonly ICheckpoint _indexChk;
+	private readonly IIndexStatusTracker _statusTracker;
+	private readonly IIndexTracker _tracker;
+	private readonly bool _additionalCommitChecks;
+	private long _persistedPreparePos = -1;
+	private long _persistedCommitPos = -1;
+	private bool _indexRebuild = true;
+
+	public IndexCommitter(
+		IPublisher bus,
+		IIndexBackend<TStreamId> backend,
+		IIndexReader<TStreamId> indexReader,
+		ITableIndex<TStreamId> tableIndex,
+		INameIndexConfirmer<TStreamId> streamNameIndex,
+		INameLookup<TStreamId> streamNames,
+		INameIndexConfirmer<TStreamId> eventTypeIndex,
+		INameLookup<TStreamId> eventTypes,
+		ISystemStreamLookup<TStreamId> systemStreams,
+		INameExistenceFilter streamExistenceFilter,
+		INameExistenceFilterInitializer streamExistenceFilterInitializer,
+		ICheckpoint indexChk,
+		IIndexStatusTracker statusTracker,
+		IIndexTracker tracker,
+		bool additionalCommitChecks) {
+		_bus = bus;
+		_backend = backend;
+		_indexReader = indexReader;
+		_tableIndex = tableIndex;
+		_streamNameIndex = streamNameIndex;
+		_streamNames = streamNames;
+		_eventTypeIndex = eventTypeIndex;
+		_eventTypes = eventTypes;
+		_systemStreams = systemStreams;
+		_streamExistenceFilter = streamExistenceFilter;
+		_streamExistenceFilterInitializer = streamExistenceFilterInitializer;
+		_indexChk = indexChk;
+		_additionalCommitChecks = additionalCommitChecks;
+		_statusTracker = statusTracker;
+		_tracker = tracker;
+	}
+
+	public async ValueTask Init(long buildToPosition, CancellationToken token) {
+		Log.Information("TableIndex initialization...");
+
+		using (_statusTracker.StartOpening()) {
+			_tableIndex.Initialize(buildToPosition);
+		}
+
+		_persistedPreparePos = _tableIndex.PrepareCheckpoint;
+		_persistedCommitPos = _tableIndex.CommitCheckpoint;
+		//todo(clc) determin if this needs to move into the TableIndex re:project-io
+		_indexChk.Write(_tableIndex.CommitCheckpoint);
+		_indexChk.Flush();
+
+		if (_indexChk.Read() >= buildToPosition)
+			throw new Exception(string.Format("_lastCommitPosition {0} >= buildToPosition {1}", _indexChk.Read(),
+				buildToPosition));
+
+		var startTime = DateTime.UtcNow;
+		var lastTime = DateTime.UtcNow;
+		var reportPeriod = TimeSpan.FromSeconds(5);
+
+		Log.Information("ReadIndex building...");
+
+		// V2 index:
+		// right now it's possible for entries to get into the main index before being replicated
+		// (because we catch up to the chaser position)
+		// when we join the cluster it may turn out that some of what we indexed needs truncating.
+		// this is dealt with by adjusting the checkpoints and restarting. usually
+		// the unwanted index entries were only in memory so restarting will discard them.
+		// if they do happen to have been persisted, the above will delete the whole index.
+		//
+		// V3 index:
+		// the upshot for the stream name index is that here we must initialise the stream
+		// name index with the main index before we catch it up, even though it will likely
+		// mean entries need to be removed only to be re-added.
+		//
+		// after we only allow replicated entries into the index we can be sure that
+		// neither index will need truncating and this will become more elegant.
+		await _streamNameIndex.InitializeWithConfirmed(_streamNames, token);
+		await _eventTypeIndex.InitializeWithConfirmed(_eventTypes, token);
+
+		_indexRebuild = true;
+		using (_statusTracker.StartRebuilding())
+		using (var reader = _backend.BorrowReader()) {
+			var startPosition = Math.Max(0, _persistedCommitPos);
+			var fullRebuild = startPosition == 0;
+			reader.Reposition(startPosition);
+
+			var commitedPrepares = new List<IPrepareLogRecord<TStreamId>>();
+
+			long processed = 0;
+			SeqReadResult result;
+			while ((result = await reader.TryReadNext(token)).Success && result.LogRecord.LogPosition < buildToPosition) {
+				switch (result.LogRecord.RecordType) {
+					case LogRecordType.Stream:
+					case LogRecordType.EventType:
+					case LogRecordType.Prepare: {
+						var prepare = (IPrepareLogRecord<TStreamId>)result.LogRecord;
+						if (prepare.Flags.HasAnyOf(PrepareFlags.IsCommitted)) {
+							if (prepare.Flags.HasAnyOf(PrepareFlags.SingleWrite)) {
+								await Commit(commitedPrepares, false, false, token);
+								commitedPrepares.Clear();
+								await Commit([prepare], result.Eof, false, token);
+							} else {
+								if (prepare.Flags.HasAnyOf(PrepareFlags.Data | PrepareFlags.StreamDelete))
+									commitedPrepares.Add(prepare);
+								if (prepare.Flags.HasAnyOf(PrepareFlags.TransactionEnd)) {
+									await Commit(commitedPrepares, result.Eof, false, token);
+									commitedPrepares.Clear();
+								}
+							}
+						}
+
+						break;
+					}
+					case LogRecordType.Commit:
+						await Commit((CommitLogRecord)result.LogRecord, result.Eof, false, token);
+						break;
+					case LogRecordType.System:
+					case LogRecordType.Partition:
+					case LogRecordType.PartitionType:
+						break;
+					default:
+						throw new Exception(string.Format("Unknown RecordType: {0}", result.LogRecord.RecordType));
+				}
+
+				processed += 1;
+				if (DateTime.UtcNow - lastTime > reportPeriod || processed % 100000 == 0) {
+					Log.Debug("ReadIndex Rebuilding: processed {processed} records ({resultPosition:0.0}%).",
+						processed,
+						(result.RecordPostPosition - startPosition) * 100.0 / (buildToPosition - startPosition));
+					lastTime = DateTime.UtcNow;
+				}
+
+				if (fullRebuild && processed % 1000000 == 0) {
+					if (_tableIndex.IsBackgroundTaskRunning) {
+						Log.Debug("Pausing ReadIndex Rebuild due to ongoing index merges.");
+						while (_tableIndex.IsBackgroundTaskRunning) {
+							Thread.Sleep(1000);
+						}
+						Log.Debug("Resuming ReadIndex Rebuild.");
+					}
+				}
+			}
+
+			Log.Debug("ReadIndex rebuilding done: total processed {processed} records, time elapsed: {elapsed}.",
+				processed, DateTime.UtcNow - startTime);
+			startTime = DateTime.UtcNow;
+
+			// now that the main index has caught up, we initialize the stream existence filter to add any missing entries.
+			// while the index above is concerned with building exactly to the buildToPosition and not beyond, that isn't
+			// important for the streamexistencefiler since false positives are allowed. it only cares about truncating back
+			// to the buildToPosition (if necessary).
+			// V2:
+			// reads the index and transaction file forward from the last checkpoint (a log position) and adds stream names to the filter, possibly multiple times
+			// but it's not an issue since it's idempotent
+			//
+			// V3:
+			// reads the stream created stream forward from the last checkpoint (a stream number) and adds stream names to the filter
+			//
+			// V2/V3 note: it's possible that we add extra uncommitted entries to the filter if the index or log later gets truncated when joining
+			// the cluster but false positives are not a problem since it's a probabilistic filter
+			Log.Debug("Initializing the StreamExistenceFilter. The filter can be disabled by setting the configuration option \"StreamExistenceFilterSize\" to 0");
+			_statusTracker.StartInitializing();
+			await _streamExistenceFilter.Initialize(_streamExistenceFilterInitializer, truncateToPosition: buildToPosition, token);
+			Log.Debug("StreamExistenceFilter initialized. Time elapsed: {elapsed}.", DateTime.UtcNow - startTime);
+
+			_bus.Publish(new StorageMessage.TfEofAtNonCommitRecord());
+			_backend.SetSystemSettings(await GetSystemSettings(token));
+		}
+
+		_indexRebuild = false;
+	}
+
+	public void Dispose() {
+		_streamNameIndex?.Dispose();
+		_eventTypeIndex?.Dispose();
+		_streamExistenceFilter?.Dispose();
+		try {
+			_tableIndex.Close(removeFiles: false);
+		} catch (TimeoutException exc) {
+			Log.Error(exc, "Timeout exception when trying to close TableIndex.");
+			throw;
+		}
+	}
+
+	public async ValueTask<long> GetCommitLastEventNumber(CommitLogRecord commit, CancellationToken token) {
+		long eventNumber = EventNumber.Invalid;
+
+		var lastIndexedPosition = _indexChk.Read();
+		if (commit.LogPosition < lastIndexedPosition || (commit.LogPosition == lastIndexedPosition && !_indexRebuild))
+			return eventNumber;
+
+		await foreach (var prepare in GetTransactionPrepares(commit.TransactionPosition, commit.LogPosition, token)) {
+			if (prepare.Flags.HasNoneOf(PrepareFlags.StreamDelete | PrepareFlags.Data))
+				continue;
+			eventNumber = prepare.Flags.HasAllOf(PrepareFlags.StreamDelete)
+				? EventNumber.DeletedStream
+				: commit.FirstEventNumber + prepare.TransactionOffset;
+		}
+
+		return eventNumber;
+	}
+
+	public async ValueTask<long> Commit(CommitLogRecord commit, bool isTfEof, bool cacheLastEventNumber, CancellationToken token) {
+		long eventNumber = EventNumber.Invalid;
+
+		var lastIndexedPosition = _indexChk.Read();
+		if (commit.LogPosition < lastIndexedPosition || (commit.LogPosition == lastIndexedPosition && !_indexRebuild))
+			return eventNumber; // already committed
+
+		TStreamId streamId = default;
+		var indexEntries = new List<IndexKey<TStreamId>>();
+		var prepares = new List<IPrepareLogRecord<TStreamId>>();
+
+		await foreach (var prepare in GetTransactionPrepares(commit.TransactionPosition, commit.LogPosition, token)) {
+			if (prepare.Flags.HasNoneOf(PrepareFlags.StreamDelete | PrepareFlags.Data))
+				continue;
+
+			if (StreamIdComparer.Equals(streamId, default)) {
+				streamId = prepare.EventStreamId;
+			} else {
+				if (!StreamIdComparer.Equals(prepare.EventStreamId, streamId))
+					throw new Exception($"Expected stream: {streamId}, actual: {prepare.EventStreamId}. LogPosition: {commit.LogPosition}");
+			}
+
+			eventNumber = prepare.Flags.HasAllOf(PrepareFlags.StreamDelete)
+				? EventNumber.DeletedStream
+				: commit.FirstEventNumber + prepare.TransactionOffset;
+
+			if (new TFPos(commit.LogPosition, prepare.LogPosition) >
+				new TFPos(_persistedCommitPos, _persistedPreparePos)) {
+				indexEntries.Add(new IndexKey<TStreamId>(streamId, eventNumber, prepare.LogPosition));
+				prepares.Add(prepare);
+			}
+		}
+
+		if (indexEntries.Count > 0) {
+			if (_additionalCommitChecks && cacheLastEventNumber) {
+				await CheckStreamVersion(streamId, indexEntries[0].Version, commit, token);
+				await CheckDuplicateEvents(streamId, commit, indexEntries, prepares, token);
+			}
+
+			_tableIndex.AddEntries(commit.LogPosition, indexEntries); // atomically add a whole bulk of entries
+		}
+
+		if (eventNumber != EventNumber.Invalid) {
+			if (eventNumber < 0)
+				throw new Exception($"EventNumber {eventNumber} is incorrect.");
+
+			if (cacheLastEventNumber) {
+				_backend.SetStreamLastEventNumber(streamId, eventNumber);
+			}
+
+			if (_systemStreams.IsMetaStream(streamId))
+				_backend.SetStreamMetadata(_systemStreams.OriginalStreamOf(streamId),
+					null); // invalidate cached metadata
+
+			if (StreamIdComparer.Equals(streamId, _systemStreams.SettingsStream))
+				_backend.SetSystemSettings(DeserializeSystemSettings(prepares[prepares.Count - 1].Data));
+		}
+
+		// todo: refactor into one call
+		_streamNameIndex.Confirm(prepares, commit, _indexRebuild, _backend);
+		_eventTypeIndex.Confirm(prepares, commit, _indexRebuild, _backend);
+
+		var newLastIndexedPosition = Math.Max(commit.LogPosition, lastIndexedPosition);
+		if (_indexChk.Read() != lastIndexedPosition) {
+			throw new Exception("Concurrency error in ReadIndex.Commit: _lastCommitPosition was modified during Commit execution!");
+		}
+
+		_indexChk.Write(newLastIndexedPosition);
+		_indexChk.Flush();
+
+		if (!_indexRebuild) {
+			var streamName = await _streamNames.LookupName(streamId, token);
+			for (int i = 0, n = indexEntries.Count; i < n; ++i) {
+				var eventType = await _eventTypes.LookupName(prepares[i].EventType, token);
+				_bus.Publish(new StorageMessage.EventCommitted(commit.LogPosition, new(indexEntries[i].Version, prepares[i], streamName, eventType), isTfEof && i == n - 1));
+			}
+		}
+
+		return eventNumber;
+	}
+
+	public async ValueTask<long> Commit(IReadOnlyList<IPrepareLogRecord<TStreamId>> commitedPrepares, bool isTfEof, bool cacheLastEventNumber, CancellationToken token) {
+		long eventNumber = EventNumber.Invalid;
+
+		if (commitedPrepares.Count is 0)
+			return eventNumber;
+
+		var lastIndexedPosition = _indexChk.Read();
+		var lastPrepare = commitedPrepares[commitedPrepares.Count - 1];
+
+		var streamId = lastPrepare.EventStreamId;
+		var indexEntries = new List<IndexKey<TStreamId>>();
+		var prepares = new List<IPrepareLogRecord<TStreamId>>();
+
+		foreach (var prepare in commitedPrepares) {
+			if (prepare.Flags.HasNoneOf(PrepareFlags.StreamDelete | PrepareFlags.Data))
+				continue;
+
+			if (!StreamIdComparer.Equals(prepare.EventStreamId, streamId)) {
+				var sb = new StringBuilder();
+				sb.Append($"ERROR: Expected stream: {streamId}, actual: {prepare.EventStreamId}.");
+				sb.Append(Environment.NewLine);
+				sb.Append(Environment.NewLine);
+				sb.Append("Prepares: (" + commitedPrepares.Count + ")");
+				sb.Append(Environment.NewLine);
+				for (int i = 0; i < commitedPrepares.Count; i++) {
+					var p = commitedPrepares[i];
+					sb.Append("Stream ID: " + p.EventStreamId);
+					sb.Append(Environment.NewLine);
+					sb.Append("LogPosition: " + p.LogPosition);
+					sb.Append(Environment.NewLine);
+					sb.Append("Flags: " + p.Flags);
+					sb.Append(Environment.NewLine);
+					sb.Append("Type: " + p.EventType);
+					sb.Append(Environment.NewLine);
+					sb.Append("MetaData: " + Encoding.UTF8.GetString(p.Metadata.Span));
+					sb.Append(Environment.NewLine);
+					sb.Append("Data: " + Encoding.UTF8.GetString(p.Data.Span));
+					sb.Append(Environment.NewLine);
+				}
+
+				throw new Exception(sb.ToString());
+			}
+
+			if (prepare.LogPosition < lastIndexedPosition ||
+				(prepare.LogPosition == lastIndexedPosition && !_indexRebuild))
+				continue; // already committed
+
+			eventNumber =
+				prepare.ExpectedVersion + 1; /* for committed prepare expected version is always explicit */
+
+			if (new TFPos(prepare.LogPosition, prepare.LogPosition) >
+				new TFPos(_persistedCommitPos, _persistedPreparePos)) {
+				indexEntries.Add(new IndexKey<TStreamId>(streamId, eventNumber, prepare.LogPosition));
+				prepares.Add(prepare);
+			}
+		}
+
+		if (indexEntries.Count > 0) {
+			if (_additionalCommitChecks && cacheLastEventNumber) {
+				await CheckStreamVersion(streamId, indexEntries[0].Version, null, token); // TODO AN: bad passing null commit
+				await CheckDuplicateEvents(streamId, null, indexEntries, prepares, token); // TODO AN: bad passing null commit
+			}
+
+			_tableIndex.AddEntries(lastPrepare.LogPosition, indexEntries); // atomically add a whole bulk of entries
+		}
+
+		if (eventNumber != EventNumber.Invalid) {
+			if (eventNumber < 0)
+				throw new Exception(string.Format("EventNumber {0} is incorrect.", eventNumber));
+
+			if (cacheLastEventNumber) {
+				_backend.SetStreamLastEventNumber(streamId, eventNumber);
+			}
+
+			if (_systemStreams.IsMetaStream(streamId))
+				_backend.SetStreamMetadata(_systemStreams.OriginalStreamOf(streamId),
+					null); // invalidate cached metadata
+
+			if (StreamIdComparer.Equals(streamId, _systemStreams.SettingsStream))
+				_backend.SetSystemSettings(DeserializeSystemSettings(prepares[prepares.Count - 1].Data));
+		}
+
+		_streamNameIndex.Confirm(prepares, _indexRebuild, _backend);
+		_eventTypeIndex.Confirm(prepares, _indexRebuild, _backend);
+
+		var newLastIndexedPosition = Math.Max(lastPrepare.LogPosition, lastIndexedPosition);
+		if (_indexChk.Read() != lastIndexedPosition) {
+			throw new Exception("Concurrency error in ReadIndex.Commit: _lastCommitPosition was modified during Commit execution!");
+		}
+
+		_indexChk.Write(newLastIndexedPosition);
+		_indexChk.Flush();
+
+		if (!_indexRebuild) {
+			var streamName = await _streamNames.LookupName(streamId, token);
+			for (int i = 0, n = indexEntries.Count; i < n; ++i) {
+				var eventType = await _eventTypes.LookupName(prepares[i].EventType, token);
+				_bus.Publish(new StorageMessage.EventCommitted(prepares[i].LogPosition, new(indexEntries[i].Version, prepares[i], streamName, eventType), isTfEof && i == n - 1));
+			}
+
+			_tracker.OnIndexed(prepares);
+		}
+
+		return eventNumber;
+	}
+
+	private async IAsyncEnumerable<IPrepareLogRecord<TStreamId>> GetTransactionPrepares(long transactionPos, long commitPos, [EnumeratorCancellation] CancellationToken token) {
+		using var reader = _backend.BorrowReader();
+		reader.Reposition(transactionPos);
+
+		// in case all prepares were scavenged, we should not read past Commit LogPosition
+		SeqReadResult result;
+		while ((result = await reader.TryReadNext(token)).Success && result.RecordPrePosition <= commitPos) {
+			if (result.LogRecord.RecordType != LogRecordType.Prepare)
+				continue;
+
+			var prepare = (IPrepareLogRecord<TStreamId>)result.LogRecord;
+			if (prepare.TransactionPosition == transactionPos) {
+				yield return prepare;
+				if (prepare.Flags.HasAnyOf(PrepareFlags.TransactionEnd))
+					yield break;
+			}
+		}
+	}
+
+	private async ValueTask CheckStreamVersion(TStreamId streamId, long newEventNumber, CommitLogRecord commit, CancellationToken token) {
+		if (newEventNumber == EventNumber.DeletedStream)
+			return;
+
+		long lastEventNumber = await _indexReader.GetStreamLastEventNumber(streamId, token);
+		if (newEventNumber != lastEventNumber + 1) {
+			if (Debugger.IsAttached)
+				Debugger.Break();
+			else
+				throw new Exception($"Commit invariant violation: new event number {newEventNumber} does not correspond to current stream version {lastEventNumber}.\n" +
+									$"Stream ID: {streamId}.\nCommit: {commit}.");
+		}
+	}
+
+	private async ValueTask CheckDuplicateEvents(TStreamId streamId, CommitLogRecord commit, List<IndexKey<TStreamId>> indexEntries,
+		List<IPrepareLogRecord<TStreamId>> prepares, CancellationToken token) {
+		using var reader = _backend.BorrowReader();
+		var entries = _tableIndex.GetRange(streamId, indexEntries[0].Version, indexEntries[^1].Version);
+		foreach (var indexEntry in entries) {
+			int prepareIndex = (int)(indexEntry.Version - indexEntries[0].Version);
+			var prepare = prepares[prepareIndex];
+			IPrepareLogRecord<TStreamId> indexedPrepare = await GetPrepare(reader, indexEntry.Position, token);
+			if (indexedPrepare != null && StreamIdComparer.Equals(indexedPrepare.EventStreamId, prepare.EventStreamId)) {
+				if (Debugger.IsAttached)
+					Debugger.Break();
+				else
+					throw new Exception($"Trying to add duplicate event #{indexEntry.Version} to stream {prepare.EventStreamId} \nCommit: {commit}\n" +
+										$"Prepare: {prepare}\nIndexed prepare: {indexedPrepare}.");
+			}
+		}
+	}
+
+	private async ValueTask<SystemSettings> GetSystemSettings(CancellationToken token) {
+		var res = await _indexReader.ReadEvent(IndexReader.UnspecifiedStreamName, _systemStreams.SettingsStream, -1, token);
+		return res.Result is ReadEventResult.Success ? DeserializeSystemSettings(res.Record.Data) : null;
+	}
+
+	private static SystemSettings DeserializeSystemSettings(ReadOnlyMemory<byte> settingsData) {
+		try {
+			return SystemSettings.FromJsonBytes(settingsData);
+		} catch (Exception exc) {
+			Log.Error(exc, "Error deserializing SystemSettings record.");
+		}
+
+		return null;
+	}
+
+	private static async ValueTask<IPrepareLogRecord<TStreamId>> GetPrepare(TFReaderLease reader, long logPosition, CancellationToken token) {
+		var result = await reader.TryReadAt(logPosition, couldBeScavenged: true, token);
+		if (!result.Success)
+			return null;
+		if (result.LogRecord.RecordType != LogRecordType.Prepare)
+			throw new Exception($"Incorrect type of log record {result.LogRecord.RecordType}, expected Prepare record.");
+		return (IPrepareLogRecord<TStreamId>)result.LogRecord;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexReadAllResult.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexReadAllResult.cs
new file mode 100644
index 00000000000..e70582f4fa9
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexReadAllResult.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public readonly struct IndexReadAllResult(
+	List<CommitEventRecord> records,
+	TFPos currentPos,
+	TFPos nextPos,
+	TFPos prevPos,
+	bool isEndOfStream,
+	long consideredEventsCount) {
+	public readonly List<CommitEventRecord> Records = records;
+	public readonly TFPos CurrentPos = currentPos;
+	public readonly TFPos NextPos = nextPos;
+	public readonly TFPos PrevPos = prevPos;
+	public readonly bool IsEndOfStream = isEndOfStream;
+	public readonly long ConsideredEventsCount = consideredEventsCount;
+
+	public override string ToString() =>
+		$"CurrentPos: {CurrentPos}, NextPos: {NextPos}, PrevPos: {PrevPos}, " +
+		$"IsEndOfStream: {IsEndOfStream}, Records: {string.Join("\n", Records.Select(x => x.ToString()))}";
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexReadEventInfoResult.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexReadEventInfoResult.cs
new file mode 100644
index 00000000000..2c074af71bc
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexReadEventInfoResult.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Data;
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public readonly struct IndexReadEventInfoResult(EventInfo[] eventInfos, long nextEventNumber) {
+	public EventInfo[] EventInfos { get; } = eventInfos;
+	public long NextEventNumber { get; } = nextEventNumber;
+	public bool IsEndOfStream => NextEventNumber < 0;
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexReadEventResult.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexReadEventResult.cs
new file mode 100644
index 00000000000..0dc6a9c90b5
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexReadEventResult.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public struct IndexReadEventResult {
+	public readonly ReadEventResult Result;
+	public readonly EventRecord Record;
+	public readonly StreamMetadata Metadata;
+	public readonly long LastEventNumber;
+	public readonly bool? OriginalStreamExists;
+
+	public IndexReadEventResult(ReadEventResult result, StreamMetadata metadata, long lastEventNumber, bool? originalStreamExists) {
+		if (result == ReadEventResult.Success)
+			throw new ArgumentException($"Wrong ReadEventResult provided for failure constructor: {result}.", nameof(result));
+
+		Result = result;
+		Record = null;
+		Metadata = metadata;
+		LastEventNumber = lastEventNumber;
+		OriginalStreamExists = originalStreamExists;
+	}
+
+	public IndexReadEventResult(ReadEventResult result, EventRecord record, StreamMetadata metadata,
+		long lastEventNumber, bool? originalStreamExists) {
+		Result = result;
+		Record = record;
+		Metadata = metadata;
+		LastEventNumber = lastEventNumber;
+		OriginalStreamExists = originalStreamExists;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexReadStreamResult.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexReadStreamResult.cs
new file mode 100644
index 00000000000..feca7f8e4ba
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexReadStreamResult.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public readonly struct IndexReadStreamResult {
+	internal static readonly EventRecord[] EmptyRecords = [];
+
+	public readonly long FromEventNumber;
+	public readonly int MaxCount;
+
+	public readonly ReadStreamResult Result;
+	public readonly long NextEventNumber;
+	public readonly long LastEventNumber;
+	public readonly bool IsEndOfStream;
+
+	public readonly EventRecord[] Records;
+	public readonly StreamMetadata Metadata;
+
+	/// <summary>
+	/// Failure Constructor
+	/// </summary>
+	public IndexReadStreamResult(long fromEventNumber, int maxCount, ReadStreamResult result, StreamMetadata metadata, long lastEventNumber) {
+		if (result == ReadStreamResult.Success)
+			throw new ArgumentException($"Wrong ReadStreamResult provided for failure constructor: {result}.", nameof(result));
+
+		FromEventNumber = fromEventNumber;
+		MaxCount = maxCount;
+		Result = result;
+		NextEventNumber = -1;
+		LastEventNumber = lastEventNumber;
+		IsEndOfStream = true;
+		Records = EmptyRecords;
+		Metadata = metadata;
+	}
+
+	/// <summary>
+	/// Success Constructor
+	/// </summary>
+	/// <param name="fromEventNumber">
+	///     EventNumber that the read starts from. Usually as specified in the request.
+	///     Sometimes resolved (e.g. from EndOfStream to the actual lastEventNumber)
+	///     This is not returned to the client when reading forwards, only backwards.
+	/// </param>
+	/// <param name="maxCount">The maximum number of events requested</param>
+	/// <param name="records"></param>
+	/// <param name="metadata"></param>
+	/// <param name="nextEventNumber">The event number to start the next _request_</param>
+	/// <param name="lastEventNumber">The last event number of the _stream_</param>
+	/// <param name="isEndOfStream"></param>
+	public IndexReadStreamResult(
+		long fromEventNumber,
+		int maxCount,
+		EventRecord[] records,
+		StreamMetadata metadata,
+		long nextEventNumber,
+		long lastEventNumber,
+		bool isEndOfStream) {
+		FromEventNumber = fromEventNumber;
+		MaxCount = maxCount;
+		Result = ReadStreamResult.Success;
+		Records = Ensure.NotNull(records);
+		Metadata = metadata;
+		NextEventNumber = nextEventNumber;
+		LastEventNumber = lastEventNumber;
+		IsEndOfStream = isEndOfStream;
+	}
+
+	public override string ToString() {
+		return $"FromEventNumber: {FromEventNumber}, Maxcount: {MaxCount}, Result: {Result}, Record count: {Records.Length}, Metadata: {Metadata}, " +
+			   $"NextEventNumber: {NextEventNumber}, LastEventNumber: {LastEventNumber}, IsEndOfStream: {IsEndOfStream}";
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexReader.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexReader.cs
new file mode 100644
index 00000000000..d5cacc023ec
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexReader.cs
@@ -0,0 +1,1063 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using ILogger = Serilog.ILogger;
+
+// ReSharper disable InvertIf
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public interface IIndexReader<TStreamId> {
+	long CachedStreamInfo { get; }
+	long NotCachedStreamInfo { get; }
+	long HashCollisions { get; }
+
+	// streamId drives the read, streamName is only for populating on the result.
+	// this was less messy than safely adding the streamName to the EventRecord at some point after construction
+	ValueTask<IndexReadEventResult> ReadEvent(string streamName, TStreamId streamId, long eventNumber, CancellationToken token);
+	ValueTask<IndexReadStreamResult> ReadStreamEventsForward(string streamName, TStreamId streamId, long fromEventNumber, int maxCount, CancellationToken token);
+	ValueTask<IndexReadStreamResult> ReadStreamEventsBackward(string streamName, TStreamId streamId, long fromEventNumber, int maxCount, CancellationToken token);
+	ValueTask<StorageMessage.EffectiveAcl> GetEffectiveAcl(TStreamId streamId, CancellationToken token);
+	ValueTask<IndexReadEventInfoResult> ReadEventInfo_KeepDuplicates(TStreamId streamId, long eventNumber, CancellationToken token);
+	ValueTask<IndexReadEventInfoResult> ReadEventInfoForward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount, long beforePosition, CancellationToken token);
+	ValueTask<IndexReadEventInfoResult> ReadEventInfoForward_NoCollisions(ulong stream, long fromEventNumber, int maxCount, long beforePosition, CancellationToken token);
+	ValueTask<IndexReadEventInfoResult> ReadEventInfoBackward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount, long beforePosition, CancellationToken token);
+	ValueTask<IndexReadEventInfoResult> ReadEventInfoBackward_NoCollisions(ulong stream, Func<ulong, TStreamId> getStreamId, long fromEventNumber, int maxCount, long beforePosition, CancellationToken token);
+
+	/// <summary>
+	/// Doesn't filter $maxAge, $maxCount, $tb(truncate before), doesn't check stream deletion, etc.
+	/// </summary>
+	ValueTask<IPrepareLogRecord<TStreamId>> ReadPrepare(TStreamId streamId, long eventNumber, CancellationToken token);
+
+	ValueTask<TStreamId> GetEventStreamIdByTransactionId(long transactionId, CancellationToken token);
+
+	ValueTask<StreamMetadata> GetStreamMetadata(TStreamId streamId, CancellationToken token);
+	ValueTask<long> GetStreamLastEventNumber(TStreamId streamId, CancellationToken token);
+	ValueTask<long> GetStreamLastEventNumber_KnownCollisions(TStreamId streamId, long beforePosition, CancellationToken token);
+	ValueTask<long> GetStreamLastEventNumber_NoCollisions(ulong stream, Func<ulong, TStreamId> getStreamId, long beforePosition, CancellationToken token);
+}
+
+public abstract class IndexReader {
+	public static string UnspecifiedStreamName => "Unspecified stream name";
+	protected static readonly ILogger Log = Serilog.Log.ForContext<IndexReader>();
+}
+
+public class IndexReader<TStreamId> : IndexReader, IIndexReader<TStreamId> {
+	private static EqualityComparer<TStreamId> StreamIdComparer { get; } = EqualityComparer<TStreamId>.Default;
+
+	public long CachedStreamInfo {
+		get { return Interlocked.Read(ref _cachedStreamInfo); }
+	}
+
+	public long NotCachedStreamInfo {
+		get { return Interlocked.Read(ref _notCachedStreamInfo); }
+	}
+
+	public long HashCollisions {
+		get { return Interlocked.Read(ref _hashCollisions); }
+	}
+
+	private readonly IIndexBackend<TStreamId> _backend;
+	private readonly ITableIndex<TStreamId> _tableIndex;
+	private readonly INameLookup<TStreamId> _eventTypes;
+	private readonly ISystemStreamLookup<TStreamId> _systemStreams;
+	private readonly IValidator<TStreamId> _validator;
+	private readonly IExistenceFilterReader<TStreamId> _streamExistenceFilter;
+	private readonly bool _skipIndexScanOnRead;
+	private readonly StreamMetadata _metastreamMetadata;
+
+	private long _hashCollisions;
+	private long _cachedStreamInfo;
+	private long _notCachedStreamInfo;
+	private readonly int _hashCollisionReadLimit;
+
+	public IndexReader(
+		IIndexBackend<TStreamId> backend,
+		ITableIndex<TStreamId> tableIndex,
+		IStreamNamesProvider<TStreamId> streamNamesProvider,
+		IValidator<TStreamId> validator,
+		IExistenceFilterReader<TStreamId> streamExistenceFilter,
+		StreamMetadata metastreamMetadata,
+		int hashCollisionReadLimit, bool skipIndexScanOnRead) {
+		Ensure.NotNull(streamNamesProvider);
+		streamNamesProvider.SetReader(this);
+		_backend = Ensure.NotNull(backend);
+		_tableIndex = Ensure.NotNull(tableIndex);
+		_systemStreams = streamNamesProvider.SystemStreams;
+		_eventTypes = streamNamesProvider.EventTypes;
+		_validator = Ensure.NotNull(validator);
+		_streamExistenceFilter = streamExistenceFilter;
+		_metastreamMetadata = Ensure.NotNull(metastreamMetadata);
+		_hashCollisionReadLimit = hashCollisionReadLimit;
+		_skipIndexScanOnRead = skipIndexScanOnRead;
+	}
+
+	async ValueTask<IndexReadEventResult> IIndexReader<TStreamId>.ReadEvent(string streamName, TStreamId streamId, long eventNumber, CancellationToken token) {
+		Ensure.Valid(streamId, _validator);
+		ArgumentOutOfRangeException.ThrowIfLessThan(eventNumber, -1);
+
+		using var reader = _backend.BorrowReader();
+		return await ReadEventInternal(reader, streamName, streamId, eventNumber, token);
+	}
+
+	private async ValueTask<IndexReadEventResult> ReadEventInternal(TFReaderLease reader, string streamName, TStreamId streamId, long eventNumber, CancellationToken token) {
+		var lastEventNumber = await GetStreamLastEventNumberCached(reader, streamId, token);
+		var metadata = await GetStreamMetadataCached(reader, streamId, token);
+		var originalStreamExists = await OriginalStreamExists(reader, streamId, token);
+		if (lastEventNumber == EventNumber.DeletedStream)
+			return new(ReadEventResult.StreamDeleted, metadata, lastEventNumber, originalStreamExists);
+		if (lastEventNumber == ExpectedVersion.NoStream || metadata.TruncateBefore == EventNumber.DeletedStream)
+			return new(ReadEventResult.NoStream, metadata, lastEventNumber, originalStreamExists);
+		if (lastEventNumber == EventNumber.Invalid)
+			return new(ReadEventResult.NoStream, metadata, lastEventNumber, originalStreamExists);
+
+		if (eventNumber == -1)
+			eventNumber = lastEventNumber;
+
+		long minEventNumber = 0;
+		if (metadata.MaxCount.HasValue)
+			minEventNumber = Math.Max(minEventNumber, lastEventNumber - metadata.MaxCount.Value + 1);
+		if (metadata.TruncateBefore.HasValue)
+			minEventNumber = Math.Max(minEventNumber, metadata.TruncateBefore.Value);
+		//TODO(clc): confirm this logic, it seems that reads less than min should be invaild rather than found
+		if (eventNumber < minEventNumber || eventNumber > lastEventNumber)
+			return new(ReadEventResult.NotFound, metadata, lastEventNumber, originalStreamExists);
+
+		if (await ReadPrepareInternal(reader, streamId, eventNumber, token) is { } prepare) {
+			if (metadata.MaxAge.HasValue && prepare.TimeStamp < DateTime.UtcNow - metadata.MaxAge.Value)
+				return new(ReadEventResult.NotFound, metadata, lastEventNumber, originalStreamExists);
+			return new(ReadEventResult.Success, await CreateEventRecord(eventNumber, prepare, streamName, token), metadata, lastEventNumber, originalStreamExists);
+		}
+
+		return new(ReadEventResult.NotFound, metadata, lastEventNumber, originalStreamExists: originalStreamExists);
+	}
+
+	async ValueTask<IPrepareLogRecord<TStreamId>> IIndexReader<TStreamId>.ReadPrepare(TStreamId streamId, long eventNumber, CancellationToken token) {
+		using var reader = _backend.BorrowReader();
+		return await ReadPrepareInternal(reader, streamId, eventNumber, token);
+	}
+
+	private ValueTask<IPrepareLogRecord<TStreamId>> ReadPrepareInternal(TFReaderLease reader, TStreamId streamId, long eventNumber, CancellationToken token) {
+		// we assume that you already did check for stream deletion
+		Ensure.Valid(streamId, _validator);
+		Ensure.Nonnegative(eventNumber);
+
+		return _skipIndexScanOnRead
+			? ReadPrepareSkipScan(reader, streamId, eventNumber, token)
+			: ReadPrepare(reader, streamId, eventNumber, token);
+	}
+
+	private ValueTask<IPrepareLogRecord<TStreamId>> ReadPrepare(TFReaderLease reader, TStreamId streamId,
+		long eventNumber, CancellationToken token) {
+		var recordsQuery = _tableIndex.GetRange(streamId, eventNumber, eventNumber)
+			.ToAsyncEnumerable()
+			.SelectAwaitWithCancellation(async (x, token) =>
+				new { x.Version, Prepare = await ReadPrepareInternal(reader, x.Position, token) })
+			.Where(x => x.Prepare is not null && StreamIdComparer.Equals(x.Prepare.EventStreamId, streamId))
+			.GroupBy(static x => x.Version)
+			.SelectAwaitWithCancellation(AsyncEnumerable.LastAsync)
+			.Select(static x => x.Prepare);
+
+		return recordsQuery.FirstOrDefaultAsync(token);
+	}
+
+	private async ValueTask<IPrepareLogRecord<TStreamId>> ReadPrepareSkipScan(TFReaderLease reader, TStreamId streamId, long eventNumber, CancellationToken token) {
+		if (!_tableIndex.TryGetOneValue(streamId, eventNumber, out var position)) {
+			return null;
+		}
+
+		if (await ReadPrepareInternal(reader, position, token) is { } rec && StreamIdComparer.Equals(rec.EventStreamId, streamId))
+			return rec;
+
+		foreach (var indexEntry in _tableIndex.GetRange(streamId, eventNumber, eventNumber)) {
+			Interlocked.Increment(ref _hashCollisions);
+			if (indexEntry.Position == position)
+				continue;
+			rec = await ReadPrepareInternal(reader, indexEntry.Position, token);
+			if (rec != null && StreamIdComparer.Equals(rec.EventStreamId, streamId))
+				return rec;
+		}
+
+		return null;
+	}
+
+	private static async ValueTask<IPrepareLogRecord<TStreamId>> ReadPrepareInternal(TFReaderLease reader, long logPosition, CancellationToken token) {
+		var result = await reader.TryReadAt(logPosition, couldBeScavenged: true, token);
+		if (!result.Success)
+			return null;
+
+		if (result.LogRecord.RecordType is not LogRecordType.Prepare
+			and not LogRecordType.Stream
+			and not LogRecordType.EventType)
+			throw new Exception($"Incorrect type of log record {result.LogRecord.RecordType}, expected Prepare record.");
+		return (IPrepareLogRecord<TStreamId>)result.LogRecord;
+	}
+
+	ValueTask<IndexReadStreamResult> IIndexReader<TStreamId>.ReadStreamEventsForward(string streamName, TStreamId streamId, long fromEventNumber, int maxCount, CancellationToken token) {
+		return ReadStreamEventsForwardInternal(streamName, streamId, fromEventNumber, maxCount, _skipIndexScanOnRead, token);
+	}
+
+	private async ValueTask<IndexReadStreamResult> ReadStreamEventsForwardInternal(string streamName, TStreamId streamId, long fromEventNumber,
+		int maxCount, bool skipIndexScanOnRead, CancellationToken token) {
+		Ensure.Valid(streamId, _validator);
+		Ensure.Nonnegative(fromEventNumber, "fromEventNumber");
+		Ensure.Positive(maxCount, "maxCount");
+
+		using (var reader = _backend.BorrowReader()) {
+			var lastEventNumber = await GetStreamLastEventNumberCached(reader, streamId, token);
+			var metadata = await GetStreamMetadataCached(reader, streamId, token);
+			if (lastEventNumber is EventNumber.DeletedStream)
+				return new(fromEventNumber, maxCount, ReadStreamResult.StreamDeleted, StreamMetadata.Empty, lastEventNumber);
+			if (lastEventNumber == ExpectedVersion.NoStream || metadata.TruncateBefore == EventNumber.DeletedStream)
+				return new(fromEventNumber, maxCount, ReadStreamResult.NoStream, metadata, lastEventNumber);
+			if (lastEventNumber == EventNumber.Invalid)
+				return new(fromEventNumber, maxCount, ReadStreamResult.NoStream, metadata, lastEventNumber);
+
+			long startEventNumber = fromEventNumber;
+			long endEventNumber = fromEventNumber < long.MaxValue - maxCount + 1 ? fromEventNumber + maxCount - 1 : long.MaxValue;
+
+			// calculate minEventNumber, which is the lower bound that we are allowed to read
+			// according to the MaxCount and TruncateBefore
+			long minEventNumber = 0;
+			if (metadata.MaxCount.HasValue)
+				minEventNumber = Math.Max(minEventNumber, lastEventNumber - metadata.MaxCount.Value + 1);
+			if (metadata.TruncateBefore.HasValue)
+				minEventNumber = Math.Max(minEventNumber, metadata.TruncateBefore.Value);
+
+			// early return if we are trying to read events that are all below the lower bound
+			if (endEventNumber < minEventNumber)
+				return new(fromEventNumber, maxCount, IndexReadStreamResult.EmptyRecords, metadata, minEventNumber, lastEventNumber, isEndOfStream: false);
+
+			// start our read at the lower bound if we were going to start it before hand.
+			startEventNumber = Math.Max(startEventNumber, minEventNumber);
+
+			// early return if we are trying to read events that are all above the upper bound
+			if (startEventNumber > lastEventNumber)
+				return new(
+					fromEventNumber: fromEventNumber,
+					maxCount: maxCount,
+					records: IndexReadStreamResult.EmptyRecords,
+					metadata: metadata,
+					nextEventNumber: lastEventNumber + 1,
+					lastEventNumber: lastEventNumber,
+					isEndOfStream: true);
+
+			if (metadata.MaxAge.HasValue) {
+				return await ForStreamWithMaxAge(streamId, streamName,
+					fromEventNumber, maxCount,
+					startEventNumber, endEventNumber, lastEventNumber,
+					metadata.MaxAge.Value, metadata, _tableIndex, reader, _eventTypes,
+					skipIndexScanOnRead, token);
+			}
+
+			var recordsQuery = _tableIndex.GetRange(streamId, startEventNumber, endEventNumber)
+				.ToAsyncEnumerable()
+				.SelectAwaitWithCancellation(async (x, ct) => new { x.Version, Prepare = await ReadPrepareInternal(reader, x.Position, ct) })
+				.Where(x => x.Prepare != null && StreamIdComparer.Equals(x.Prepare.EventStreamId, streamId));
+			if (!skipIndexScanOnRead) {
+				recordsQuery = recordsQuery.OrderByDescending(x => x.Version)
+					.GroupBy(static x => x.Version).SelectAwaitWithCancellation(AsyncEnumerable.LastAsync);
+			}
+
+			var records = await recordsQuery
+				.Reverse()
+				.SelectAwaitWithCancellation((x, ct) => CreateEventRecord(x.Version, x.Prepare, streamName, ct))
+				.ToArrayAsync(token);
+
+			long nextEventNumber = Math.Min(endEventNumber + 1, lastEventNumber + 1);
+			if (records.Length > 0)
+				nextEventNumber = records[^1].EventNumber + 1;
+			var isEndOfStream = endEventNumber >= lastEventNumber;
+			return new(fromEventNumber, maxCount, records, metadata, nextEventNumber, lastEventNumber, isEndOfStream);
+		}
+
+		async ValueTask<IndexReadStreamResult> ForStreamWithMaxAge(TStreamId streamId,
+			string streamName,
+			long fromEventNumber, int maxCount, long startEventNumber,
+			long endEventNumber, long lastEventNumber, TimeSpan maxAge, StreamMetadata metadata,
+			ITableIndex<TStreamId> tableIndex, TFReaderLease reader, INameLookup<TStreamId> eventTypes,
+			bool skipIndexScanOnRead,
+			CancellationToken token) {
+			if (startEventNumber > lastEventNumber) {
+				return new(fromEventNumber, maxCount, IndexReadStreamResult.EmptyRecords,
+					metadata, lastEventNumber + 1, lastEventNumber, isEndOfStream: true);
+			}
+
+			var ageThreshold = DateTime.UtcNow - maxAge;
+			var nextEventNumber = lastEventNumber;
+			var indexEntries = tableIndex.GetRange(streamId, startEventNumber, endEventNumber);
+
+			//Move to the first valid entries. At this point we could instead return an empty result set with the minimum set, but that would
+			//involve an additional set of reads for no good reason
+			while (indexEntries is []) {
+				// we didn't find any indexEntries, and we already early returned in the case that startEventNumber > lastEventNumber
+				// so we want to find the oldest entry that is after startEventNumber.
+				// startEventNumber may be before the start of the stream, or it may be in a gap caused by scavenging.
+				// this will generally only iterate once, unless a scavenge completes exactly now, in which case it might iterate twice
+				if (tableIndex.TryGetNextEntry(streamId, startEventNumber, out var next)) {
+					startEventNumber = next.Version;
+					endEventNumber = startEventNumber + maxCount - 1;
+					indexEntries = tableIndex.GetRange(streamId, startEventNumber, endEventNumber);
+				} else {
+					//scavenge completed and deleted our stream? return empty set and get the client to try again?
+					return new(fromEventNumber, maxCount, IndexReadStreamResult.EmptyRecords,
+						metadata, lastEventNumber + 1, lastEventNumber, isEndOfStream: false);
+				}
+			}
+
+			var results = new ResultsDeduplicator(maxCount, skipIndexScanOnRead);
+
+			for (int i = 0; i < indexEntries.Count; i++) {
+				if (await ReadPrepareInternal(reader, indexEntries[i].Position, token) is not { } prepare ||
+					!StreamIdComparer.Equals(prepare.EventStreamId, streamId)) {
+					continue;
+				}
+
+				if (prepare.TimeStamp >= ageThreshold) {
+					results.Add(await CreateEventRecord(indexEntries[i].Version, prepare, streamName, eventTypes, token));
+				} else {
+					break;
+				}
+			}
+
+			if (results.Count > 0) {
+				//We got at least one event in the correct age range, so we will return whatever was valid and indicate where to read from next
+				var resultsArray = results.ProduceArray();
+				nextEventNumber = resultsArray[0].EventNumber + 1;
+				Array.Reverse(resultsArray);
+
+				var isEndOfStream = endEventNumber >= lastEventNumber;
+				return new(fromEventNumber, maxCount, resultsArray, metadata, nextEventNumber, lastEventNumber, isEndOfStream);
+			}
+
+			//we didn't find anything valid yet, now we need to search
+			//the entries we found were all either scavenged, or expired, or for another stream.
+
+			//check high value will be valid, otherwise early return.
+			// this resolves hash collisions itself
+			if (await ReadPrepareInternal(reader, streamId, eventNumber: lastEventNumber, token) is not { } lastEvent ||
+				lastEvent.TimeStamp < ageThreshold || lastEventNumber < fromEventNumber) {
+				//No events in the stream are < max age, so return an empty set
+				return new(fromEventNumber, maxCount, IndexReadStreamResult.EmptyRecords, metadata, lastEventNumber + 1, lastEventNumber, isEndOfStream: true);
+			}
+
+			// intuition for loop termination here is that the explicit continue cases are
+			// the only way to continue the iteration. apart from those it return;s or break;s.
+			// the continue cases always narrow the gap between low and high
+			//
+			// low, mid, and high are event numbers (versions)
+			// attempt to initialize low to the latest (highest) entry that we found but in the unlikely event that
+			// they're out of version order that's still ok, low will just be lower than it could have been.
+			var low = indexEntries[0].Version;
+			var high = lastEventNumber;
+			while (low <= high) {
+				var mid = low + ((high - low) / 2);
+				indexEntries = tableIndex.GetRange(streamId, mid, mid + maxCount - 1);
+				if (indexEntries.Count > 0) {
+					nextEventNumber = indexEntries[0].Version + 1;
+				} else {
+					// midpoint is in a gap. everything before any gap is no longer part of the stream
+					// though the entries may not have been removed yet. skip to higher event numbers
+					if (!tableIndex.TryGetNextEntry(streamId, mid, out var next)) {
+						// there is nothing in this stream (maybe a scavenge just completed)
+						nextEventNumber = lastEventNumber;
+						break;
+					}
+
+					low = next.Version;
+					continue;
+				}
+
+				// be really careful if adjusting these, to make sure that the loop still terminates
+				var (lowPrepareVersion, lowPrepare) = await LowPrepare(reader, indexEntries, streamId, token);
+				if (lowPrepare?.TimeStamp >= ageThreshold) {
+					// found a lowPrepare for this stream. it has not expired. chop lower in case there are more
+					high = mid - 1;
+					nextEventNumber = lowPrepareVersion;
+					continue;
+				}
+
+				var (highPrepareVersion, highPrepare) = await HighPrepare(reader, indexEntries, streamId, token);
+				if (highPrepare?.TimeStamp < ageThreshold) {
+					// found a highPrepare for this stream. it has expired. chop higher
+					low = highPrepareVersion + 1;
+					continue;
+				}
+
+				//ok, some entries must match, if not (due to time moving forwards) we can just reissue based on the current mid
+				// also might have no matches because the getrange call returned addresses that
+				// were all scavenged or for other streams, in which case we won't add anything to results here
+				for (int i = 0; i < indexEntries.Count; i++) {
+					if (await ReadPrepareInternal(reader, indexEntries[i].Position, token) is not { } prepare ||
+						!StreamIdComparer.Equals(prepare.EventStreamId, streamId))
+						continue;
+
+					if (prepare?.TimeStamp >= ageThreshold) {
+						results.Add(await CreateEventRecord(indexEntries[i].Version, prepare, streamName, eventTypes, token));
+					} else {
+						break;
+					}
+				}
+
+				if (results.Count > 0) {
+					//We got at least one event in the correct age range, so we will return whatever was valid and indicate where to read from next
+					var resultsList = results.ProduceList();
+					endEventNumber = resultsList[0].EventNumber;
+					nextEventNumber = endEventNumber + 1;
+					resultsList.Reverse();
+					var isEndOfStream = endEventNumber >= lastEventNumber;
+
+					var maxEventNumberToReturn = fromEventNumber + maxCount - 1;
+					while (resultsList.Count > 0 && resultsList[^1].EventNumber > maxEventNumberToReturn) {
+						nextEventNumber = resultsList[^1].EventNumber;
+						resultsList.RemoveAt(resultsList.Count - 1);
+						isEndOfStream = false;
+					}
+
+					return new(fromEventNumber, maxCount, resultsList.ToArray(), metadata, nextEventNumber, lastEventNumber, isEndOfStream);
+				}
+
+				break;
+			}
+
+			//We didn't find anything, send back to the client with the latest position to retry
+			return new(fromEventNumber, maxCount, IndexReadStreamResult.EmptyRecords, metadata, nextEventNumber, lastEventNumber, isEndOfStream: false);
+
+			static async ValueTask<(long, IPrepareLogRecord<TStreamId>)> LowPrepare(
+				TFReaderLease tfReaderLease,
+				IReadOnlyList<IndexEntry> entries,
+				TStreamId streamId,
+				CancellationToken token) {
+				for (int i = entries.Count - 1; i >= 0; i--) {
+					if (await ReadPrepareInternal(tfReaderLease, entries[i].Position, token) is { } prepare && StreamIdComparer.Equals(prepare.EventStreamId, streamId))
+						return (entries[i].Version, prepare);
+				}
+
+				return default;
+			}
+
+			static async ValueTask<(long, IPrepareLogRecord<TStreamId>)> HighPrepare(
+				TFReaderLease tfReaderLease,
+				IReadOnlyList<IndexEntry> entries,
+				TStreamId streamId,
+				CancellationToken token) {
+				for (int i = 0; i < entries.Count; i++) {
+					if (await ReadPrepareInternal(tfReaderLease, entries[i].Position, token) is { } prepare && StreamIdComparer.Equals(prepare.EventStreamId, streamId))
+						return (entries[i].Version, prepare);
+				}
+
+				return default;
+			}
+		}
+	}
+
+	delegate IAsyncEnumerable<IndexEntry> ReadIndexEntries<in TStreamHandle>(
+		IndexReader<TStreamId> indexReader,
+		TStreamHandle streamHandle,
+		TFReaderLease reader,
+		long startEventNumber,
+		long endEventNumber);
+
+	private static IAsyncEnumerable<IndexEntry> ReadIndexEntries_RemoveCollisions(IndexReader<TStreamId> indexReader,
+		TStreamId streamHandle,
+		TFReaderLease reader,
+		long startEventNumber,
+		long endEventNumber)
+		=> indexReader._tableIndex.GetRange(streamHandle, startEventNumber, endEventNumber)
+			.ToAsyncEnumerable()
+			.SelectAwaitWithCancellation(async (x, token) => new { IndexEntry = x, Prepare = await ReadPrepareInternal(reader, x.Position, token) })
+			.Where(x => x.Prepare is not null && StreamIdComparer.Equals(x.Prepare.EventStreamId, streamHandle))
+			.Select(static x => x.IndexEntry);
+
+	private static IAsyncEnumerable<IndexEntry> ReadIndexEntries_NoCollisions(IndexReader<TStreamId> indexReader,
+		ulong streamHandle,
+		TFReaderLease reader,
+		long startEventNumber,
+		long endEventNumber) =>
+		indexReader._tableIndex.GetRange(streamHandle, startEventNumber, endEventNumber).ToAsyncEnumerable();
+
+	public async ValueTask<IndexReadEventInfoResult> ReadEventInfo_KeepDuplicates(TStreamId streamId, long eventNumber, CancellationToken token) {
+		using var reader = _backend.BorrowReader();
+		var result = await ReadEventInfoForwardInternal(
+			streamId,
+			reader,
+			ReadIndexEntries_RemoveCollisions,
+			// the next event number doesn't matter in this context since we're reading a single event without a specific direction
+			getNextEventNumber: static (_, _, _) => -1,
+			fromEventNumber: eventNumber,
+			maxCount: 1,
+			beforePosition: long.MaxValue,
+			deduplicate: false,
+			token);
+
+		// ensure that the next event number is set to -1
+		return new IndexReadEventInfoResult(result.EventInfos, nextEventNumber: -1);
+	}
+
+	// note for simplicity skipIndexScanOnRead is always treated as false. see ReadEventInfoInternal
+	public async ValueTask<IndexReadEventInfoResult> ReadEventInfoForward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount, long beforePosition, CancellationToken token) {
+		using var reader = _backend.BorrowReader();
+		return await ReadEventInfoForwardInternal(
+			streamId,
+			reader,
+			ReadIndexEntries_RemoveCollisions,
+			static (self, streamHandle, afterEventNumber) => {
+				if (!self._tableIndex.TryGetNextEntry(streamHandle, afterEventNumber, out var entry))
+					return -1;
+
+				// Note that this event number may be for a colliding stream. It is not a major issue since these
+				// colliding events will be filtered out during the next read. However, it may cause some extra empty reads.
+				return entry.Version;
+			},
+			fromEventNumber,
+			maxCount,
+			beforePosition,
+			deduplicate: true,
+			token);
+	}
+
+	// note for simplicity skipIndexScanOnRead is always treated as false. see ReadEventInfoInternal
+	public ValueTask<IndexReadEventInfoResult> ReadEventInfoForward_NoCollisions(ulong stream, long fromEventNumber, int maxCount, long beforePosition, CancellationToken token) {
+		return ReadEventInfoForwardInternal(
+			stream,
+			default,
+			ReadIndexEntries_NoCollisions,
+			static (self, streamHandle, afterEventNumber) => {
+				if (!self._tableIndex.TryGetNextEntry(streamHandle, afterEventNumber, out var entry))
+					return -1;
+
+				return entry.Version;
+			},
+			fromEventNumber,
+			maxCount,
+			beforePosition,
+			deduplicate: true,
+			token);
+	}
+
+	private async ValueTask<IndexReadEventInfoResult> ReadEventInfoForwardInternal<TStreamHandle>(
+		TStreamHandle streamHandle,
+		TFReaderLease reader,
+		ReadIndexEntries<TStreamHandle> readIndexEntries,
+		Func<IndexReader<TStreamId>, TStreamHandle, long, long> getNextEventNumber,
+		long fromEventNumber,
+		int maxCount,
+		long beforePosition,
+		bool deduplicate,
+		CancellationToken token) {
+		Ensure.Nonnegative(fromEventNumber, nameof(fromEventNumber));
+		Ensure.Positive(maxCount, nameof(maxCount));
+
+		var endEventNumber = fromEventNumber > long.MaxValue - maxCount + 1 ? long.MaxValue : fromEventNumber + maxCount - 1;
+
+		var eventInfos = await ReadEventInfoInternal(streamHandle, reader, readIndexEntries, fromEventNumber, endEventNumber, beforePosition, deduplicate, token);
+
+		Array.Reverse(eventInfos);
+
+		long nextEventNumber;
+		if (endEventNumber >= long.MaxValue)
+			nextEventNumber = -1;
+		else if (eventInfos.Length == 0)
+			nextEventNumber = getNextEventNumber(this, streamHandle, endEventNumber);
+		else
+			nextEventNumber = endEventNumber + 1;
+
+		return new(eventInfos, nextEventNumber);
+	}
+
+	ValueTask<IndexReadStreamResult> IIndexReader<TStreamId>.ReadStreamEventsBackward(string streamName, TStreamId streamId, long fromEventNumber, int maxCount, CancellationToken token) {
+		return ReadStreamEventsBackwardInternal(streamName, streamId, fromEventNumber, maxCount, _skipIndexScanOnRead, token);
+	}
+
+	private async ValueTask<IndexReadStreamResult> ReadStreamEventsBackwardInternal(string streamName, TStreamId streamId, long fromEventNumber,
+		int maxCount, bool skipIndexScanOnRead, CancellationToken token) {
+		Ensure.Valid(streamId, _validator);
+		Ensure.Positive(maxCount);
+
+		using var reader = _backend.BorrowReader();
+		var lastEventNumber = await GetStreamLastEventNumberCached(reader, streamId, token);
+		var metadata = await GetStreamMetadataCached(reader, streamId, token);
+		if (lastEventNumber is EventNumber.DeletedStream)
+			return new(fromEventNumber, maxCount, ReadStreamResult.StreamDeleted, StreamMetadata.Empty, lastEventNumber);
+		if (lastEventNumber is ExpectedVersion.NoStream || metadata.TruncateBefore is EventNumber.DeletedStream)
+			return new(fromEventNumber, maxCount, ReadStreamResult.NoStream, metadata, lastEventNumber);
+		if (lastEventNumber is EventNumber.Invalid)
+			return new(fromEventNumber, maxCount, ReadStreamResult.NoStream, metadata, lastEventNumber);
+
+		long endEventNumber = fromEventNumber < 0 ? lastEventNumber : fromEventNumber;
+		long startEventNumber = Math.Max(0L, endEventNumber - maxCount + 1);
+		bool isEndOfStream = false;
+
+		long minEventNumber = 0;
+		if (metadata.MaxCount.HasValue)
+			minEventNumber = Math.Max(minEventNumber, lastEventNumber - metadata.MaxCount.Value + 1);
+		if (metadata.TruncateBefore.HasValue)
+			minEventNumber = Math.Max(minEventNumber, metadata.TruncateBefore.Value);
+		if (endEventNumber < minEventNumber)
+			return new(fromEventNumber, maxCount, IndexReadStreamResult.EmptyRecords, metadata, -1, lastEventNumber, isEndOfStream: true);
+
+		if (startEventNumber <= minEventNumber) {
+			isEndOfStream = true;
+			startEventNumber = minEventNumber;
+		}
+
+		var recordsQuery = _tableIndex.GetRange(streamId, startEventNumber, endEventNumber)
+			.ToAsyncEnumerable()
+			.SelectAwaitWithCancellation(async (x, ct) => new { x.Version, Prepare = await ReadPrepareInternal(reader, x.Position, ct) })
+			.Where(x => x.Prepare is not null && StreamIdComparer.Equals(x.Prepare.EventStreamId, streamId));
+		if (!skipIndexScanOnRead) {
+			recordsQuery = recordsQuery
+				.OrderByDescending(static x => x.Version)
+				.GroupBy(x => x.Version)
+				.SelectAwaitWithCancellation(AsyncEnumerable.LastAsync);
+		}
+
+		if (metadata.MaxAge.HasValue) {
+			var ageThreshold = DateTime.UtcNow - metadata.MaxAge.Value;
+			recordsQuery = recordsQuery.Where(x => x.Prepare.TimeStamp >= ageThreshold);
+		}
+
+		var records = await recordsQuery
+			.SelectAwaitWithCancellation((x, ct) => CreateEventRecord(x.Version, x.Prepare, streamName, ct))
+			.ToArrayAsync(token);
+
+		isEndOfStream = isEndOfStream
+						|| startEventNumber == 0
+						|| (startEventNumber <= lastEventNumber
+							&& (records.Length is 0 || records[^1].EventNumber != startEventNumber));
+		long nextEventNumber = isEndOfStream ? -1 : Math.Min(startEventNumber - 1, lastEventNumber);
+		return new(endEventNumber, maxCount, records, metadata, nextEventNumber, lastEventNumber, isEndOfStream);
+	}
+
+	public async ValueTask<IndexReadEventInfoResult> ReadEventInfoBackward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount,
+		long beforePosition, CancellationToken token) {
+		if (fromEventNumber < 0)
+			fromEventNumber = await GetStreamLastEventNumber_KnownCollisions(streamId, beforePosition, token);
+
+		if (fromEventNumber is ExpectedVersion.NoStream)
+			return new([], -1);
+
+		using var reader = _backend.BorrowReader();
+		return await ReadEventInfoBackwardInternal(
+			streamId,
+			reader,
+			ReadIndexEntries_RemoveCollisions,
+			// Note that this event number may be for a colliding stream. It is not a major issue since these
+			// colliding events will be filtered out during the next read. However, it may cause some extra empty reads.
+			static (self, streamHandle, beforeEventNumber) => !self._tableIndex.TryGetPreviousEntry(streamHandle, beforeEventNumber, out var entry) ? -1 : entry.Version,
+			fromEventNumber,
+			maxCount,
+			beforePosition,
+			deduplicate: true,
+			token);
+	}
+
+	public async ValueTask<IndexReadEventInfoResult> ReadEventInfoBackward_NoCollisions(
+		ulong stream,
+		Func<ulong, TStreamId> getStreamId,
+		long fromEventNumber,
+		int maxCount,
+		long beforePosition,
+		CancellationToken token) {
+		if (fromEventNumber < 0)
+			fromEventNumber = await GetStreamLastEventNumber_NoCollisions(stream, getStreamId, beforePosition, token);
+
+		if (fromEventNumber is ExpectedVersion.NoStream)
+			return new([], -1);
+
+		return await ReadEventInfoBackwardInternal(
+			stream,
+			default,
+			ReadIndexEntries_NoCollisions,
+			static (self, streamHandle, beforeEventNumber) => !self._tableIndex.TryGetPreviousEntry(streamHandle, beforeEventNumber, out var entry) ? -1 : entry.Version,
+			fromEventNumber,
+			maxCount,
+			beforePosition,
+			deduplicate: true,
+			token);
+	}
+
+	private async ValueTask<IndexReadEventInfoResult> ReadEventInfoBackwardInternal<TStreamHandle>(
+		TStreamHandle streamHandle,
+		TFReaderLease reader,
+		ReadIndexEntries<TStreamHandle> readIndexEntries,
+		Func<IndexReader<TStreamId>, TStreamHandle, long, long> getNextEventNumber,
+		long fromEventNumber,
+		int maxCount,
+		long beforePosition,
+		bool deduplicate,
+		CancellationToken token) {
+		Ensure.Nonnegative(fromEventNumber, nameof(fromEventNumber));
+		Ensure.Positive(maxCount, nameof(maxCount));
+
+		var startEventNumber = Math.Max(0L, fromEventNumber - maxCount + 1);
+
+		var eventInfos = await ReadEventInfoInternal(streamHandle, reader, readIndexEntries, startEventNumber, fromEventNumber, beforePosition, deduplicate, token);
+
+		long nextEventNumber;
+		if (startEventNumber <= 0)
+			nextEventNumber = -1;
+		else if (eventInfos.Length is 0)
+			nextEventNumber = getNextEventNumber(this, streamHandle, startEventNumber);
+		else
+			nextEventNumber = startEventNumber - 1;
+
+		return new(eventInfos, nextEventNumber);
+	}
+
+	// used forward and backward
+	// resulting array is in descending order
+	private async ValueTask<EventInfo[]> ReadEventInfoInternal<TStreamHandle>(
+		TStreamHandle streamHandle,
+		TFReaderLease reader,
+		ReadIndexEntries<TStreamHandle> readIndexEntries,
+		long startEventNumber,
+		long endEventNumber,
+		long beforePosition,
+		bool deduplicate,
+		CancellationToken token) {
+		var entries = readIndexEntries(this, streamHandle, reader, startEventNumber, endEventNumber);
+		var eventInfos = new List<EventInfo>();
+
+		var prevEntry = new IndexEntry(long.MaxValue, long.MaxValue, long.MaxValue);
+
+		// entries are from TableIndex.GetRange. They are in IndexEntry order descending.
+		// we need to return EventInfos in EventNumber order descending. As we go we check if this
+		// criteria is already met, and avoid the sorting and deduplicating linq query if it is.
+		var sortAndDeduplicate = false;
+		await foreach (var entry in entries.WithCancellation(token)) {
+			if (entry.Position >= beforePosition)
+				continue;
+
+			if (prevEntry.Version <= entry.Version)
+				sortAndDeduplicate = true;
+
+			eventInfos.Add(new EventInfo(entry.Position, entry.Version));
+			prevEntry = entry;
+		}
+
+		EventInfo[] result;
+		if (sortAndDeduplicate) {
+			if (deduplicate) {
+				// note that even if _skipIndexScanOnRead = True, we're still reordering and filtering out duplicates here.
+				result = eventInfos
+					.OrderByDescending(x => x.EventNumber)
+					.GroupBy(x => x.EventNumber)
+					// keep the earliest event in the log (the index entries that were read are in descending order)
+					.Select(x => x.Last())
+					.ToArray();
+			} else {
+				result = eventInfos
+					.OrderByDescending(x => x.EventNumber)
+					.ToArray();
+			}
+		} else {
+			result = eventInfos.ToArray();
+		}
+
+		return result;
+	}
+
+	public async ValueTask<TStreamId> GetEventStreamIdByTransactionId(long transactionId, CancellationToken token) {
+		Ensure.Nonnegative(transactionId);
+		using var reader = _backend.BorrowReader();
+		var res = await ReadPrepareInternal(reader, transactionId, token);
+		return res is null ? default : res.EventStreamId;
+	}
+
+	public async ValueTask<StorageMessage.EffectiveAcl> GetEffectiveAcl(TStreamId streamId, CancellationToken token) {
+		using var reader = _backend.BorrowReader();
+		var sysSettings = _backend.GetSystemSettings() ?? SystemSettings.Default;
+		StreamAcl acl;
+		StreamAcl sysAcl;
+		StreamAcl defAcl;
+		var meta = await GetStreamMetadataCached(reader, streamId, token);
+		if (await _systemStreams.IsSystemStream(streamId, token)) {
+			defAcl = SystemSettings.Default.SystemStreamAcl;
+			sysAcl = sysSettings.SystemStreamAcl ?? defAcl;
+			acl = meta.Acl ?? sysAcl;
+		} else {
+			defAcl = SystemSettings.Default.UserStreamAcl;
+			sysAcl = sysSettings.UserStreamAcl ?? defAcl;
+			acl = meta.Acl ?? sysAcl;
+		}
+
+		return new(acl, sysAcl, defAcl);
+	}
+
+	async ValueTask<long> IIndexReader<TStreamId>.GetStreamLastEventNumber(TStreamId streamId, CancellationToken token) {
+		Ensure.Valid(streamId, _validator);
+		using var reader = _backend.BorrowReader();
+		return await GetStreamLastEventNumberCached(reader, streamId, token);
+	}
+
+	public async ValueTask<long> GetStreamLastEventNumber_KnownCollisions(TStreamId streamId, long beforePosition, CancellationToken token) {
+		Ensure.Valid(streamId, _validator);
+		using var reader = _backend.BorrowReader();
+		return await GetStreamLastEventNumber_KnownCollisions(streamId, beforePosition, reader, token);
+	}
+
+	private async ValueTask<long> GetStreamLastEventNumber_KnownCollisions(TStreamId streamId, long beforePosition, TFReaderLease reader, CancellationToken token) {
+		return await _tableIndex.TryGetLatestEntry(streamId, beforePosition, IsForThisStream, token) is { } entry
+			? entry.Version
+			: ExpectedVersion.NoStream;
+
+		async ValueTask<bool> IsForThisStream(IndexEntry indexEntry, CancellationToken token) {
+			// we know that collisions have occurred for this stream's hash prior to "beforePosition" in the log
+			// we just fetch the stream name from the log to make sure this index entry is for the correct stream
+			var prepare = await ReadPrepareInternal(reader, indexEntry.Position, token);
+			return StreamIdComparer.Equals(prepare.EventStreamId, streamId);
+		}
+	}
+
+	// gets the last event number before beforePosition for the given stream hash. can assume that
+	// the hash does not collide with anything before beforePosition.
+	public async ValueTask<long> GetStreamLastEventNumber_NoCollisions(ulong stream, Func<ulong, TStreamId> getStreamId, long beforePosition, CancellationToken token) {
+		using var reader = _backend.BorrowReader();
+		return await GetStreamLastEventNumber_NoCollisions(stream, getStreamId, beforePosition, reader, token);
+	}
+
+	private async ValueTask<long> GetStreamLastEventNumber_NoCollisions(
+		ulong stream,
+		Func<ulong, TStreamId> getStreamId,
+		long beforePosition,
+		TFReaderLease reader,
+		CancellationToken token) {
+		TStreamId streamId = default;
+
+		return await _tableIndex.TryGetLatestEntry(stream, beforePosition, IsForThisStream, token) is { } entry
+			? entry.Version
+			: ExpectedVersion.NoStream;
+
+		async ValueTask<bool> IsForThisStream(IndexEntry indexEntry, CancellationToken token) {
+			// we know that there are no collisions for this hash prior to "beforePosition" in the log
+			if (indexEntry.Position < beforePosition)
+				return true;
+
+			// fetch the correct stream name from the log if we haven't yet
+			if (StreamIdComparer.Equals(streamId, default))
+				streamId = getStreamId(stream);
+
+			// compare the correct stream name against this index entry's stream name fetched from the log
+			var prepare = await ReadPrepareInternal(reader, indexEntry.Position, token);
+			return StreamIdComparer.Equals(prepare.EventStreamId, streamId);
+		}
+	}
+
+	async ValueTask<StreamMetadata> IIndexReader<TStreamId>.GetStreamMetadata(TStreamId streamId, CancellationToken token) {
+		Ensure.Valid(streamId, _validator);
+		using var reader = _backend.BorrowReader();
+		return await GetStreamMetadataCached(reader, streamId, token);
+	}
+
+	private async ValueTask<long> GetStreamLastEventNumberCached(TFReaderLease reader, TStreamId streamId, CancellationToken token) {
+		// if this is metastream -- check if original stream was deleted, if yes -- metastream is deleted as well
+		if (_systemStreams.IsMetaStream(streamId)
+			&& await GetStreamLastEventNumberCached(reader, _systemStreams.OriginalStreamOf(streamId), token) ==
+			EventNumber.DeletedStream)
+			return EventNumber.DeletedStream;
+
+		var cache = _backend.TryGetStreamLastEventNumber(streamId);
+		if (cache.LastEventNumber != null) {
+			Interlocked.Increment(ref _cachedStreamInfo);
+			return cache.LastEventNumber.GetValueOrDefault();
+		}
+
+		Interlocked.Increment(ref _notCachedStreamInfo);
+		var lastEventNumber = await GetStreamLastEventNumberUncached(reader, streamId, token);
+
+		// Conditional update depending on previously returned cache info version.
+		// If version is not correct -- nothing is changed in cache.
+		// This update is conditioned to not interfere with updating stream cache info by commit procedure
+		// (which is the source of truth).
+		var res = _backend.UpdateStreamLastEventNumber(cache.Version, streamId, lastEventNumber);
+		return res ?? lastEventNumber;
+	}
+
+	private async ValueTask<long> GetStreamLastEventNumberUncached(TFReaderLease reader, TStreamId streamId, CancellationToken token) {
+		if (!_streamExistenceFilter.MightContain(streamId))
+			return ExpectedVersion.NoStream;
+
+		if (!_tableIndex.TryGetLatestEntry(streamId, out var latestEntry))
+			return ExpectedVersion.NoStream;
+
+		if (await ReadPrepareInternal(reader, latestEntry.Position, token) is not { } rec)
+			throw new Exception($"Could not read latest stream's prepare for stream '{streamId}' at position {latestEntry.Position}");
+
+		int count = 0;
+		long startVersion = 0;
+		long latestVersion = long.MinValue;
+		if (StreamIdComparer.Equals(rec.EventStreamId, streamId)) {
+			startVersion = Math.Max(latestEntry.Version, latestEntry.Version + 1);
+			latestVersion = latestEntry.Version;
+		}
+
+		foreach (var indexEntry in _tableIndex.GetRange(streamId, startVersion, long.MaxValue,
+					 limit: _hashCollisionReadLimit + 1)) {
+			if (await ReadPrepareInternal(reader, indexEntry.Position, token) is { } r &&
+				StreamIdComparer.Equals(r.EventStreamId, streamId)) {
+				if (latestVersion is long.MinValue) {
+					latestVersion = indexEntry.Version;
+					continue;
+				}
+
+				return latestVersion < indexEntry.Version ? indexEntry.Version : latestVersion;
+			}
+
+			count++;
+			Interlocked.Increment(ref _hashCollisions);
+			if (count > _hashCollisionReadLimit) {
+				Log.Error("A hash collision resulted in not finding the last event number for the stream {stream}.", streamId);
+				return EventNumber.Invalid;
+			}
+		}
+
+		return latestVersion == long.MinValue ? ExpectedVersion.NoStream : latestVersion;
+	}
+
+	private async ValueTask<bool?> OriginalStreamExists(TFReaderLease reader, TStreamId metaStreamId, CancellationToken token) {
+		if (_systemStreams.IsMetaStream(metaStreamId)) {
+			var originalStreamId = _systemStreams.OriginalStreamOf(metaStreamId);
+			var lastEventNumber = await GetStreamLastEventNumberCached(reader, originalStreamId, token);
+			return lastEventNumber is not ExpectedVersion.NoStream and not EventNumber.DeletedStream;
+		}
+
+		return null;
+	}
+
+	private async ValueTask<StreamMetadata> GetStreamMetadataCached(TFReaderLease reader, TStreamId streamId, CancellationToken token) {
+		// if this is metastream -- check if original stream was deleted, if yes -- metastream is deleted as well
+		if (_systemStreams.IsMetaStream(streamId))
+			return _metastreamMetadata;
+
+		var cache = _backend.TryGetStreamMetadata(streamId);
+		if (cache.Metadata != null) {
+			Interlocked.Increment(ref _cachedStreamInfo);
+			return cache.Metadata;
+		}
+
+		Interlocked.Increment(ref _notCachedStreamInfo);
+		var streamMetadata = await GetStreamMetadataUncached(reader, streamId, token);
+
+		// Conditional update depending on previously returned cache info version.
+		// If version is not correct -- nothing is changed in cache.
+		// This update is conditioned to not interfere with updating stream cache info by commit procedure
+		// (which is the source of truth).
+		var res = _backend.UpdateStreamMetadata(cache.Version, streamId, streamMetadata);
+		return res ?? streamMetadata;
+	}
+
+	private async ValueTask<StreamMetadata> GetStreamMetadataUncached(TFReaderLease reader, TStreamId streamId, CancellationToken token) {
+		var metastreamId = _systemStreams.MetaStreamOf(streamId);
+		var metaEventNumber = await GetStreamLastEventNumberCached(reader, metastreamId, token);
+		if (metaEventNumber is ExpectedVersion.NoStream or EventNumber.DeletedStream)
+			return StreamMetadata.Empty;
+
+		if (await ReadPrepareInternal(reader, metastreamId, metaEventNumber, token) is not { } prepare)
+			throw new Exception($"ReadPrepareInternal could not find metaevent #{metaEventNumber} on metastream '{metastreamId}'. " + "That should never happen.");
+
+		if (prepare.Data.Length is 0 || prepare.Flags.HasNoneOf(PrepareFlags.IsJson))
+			return StreamMetadata.Empty;
+
+		var metadata = StreamMetadata.TryFromJsonBytes(prepare.Version, prepare.Data);
+		return metadata;
+	}
+
+	private ValueTask<EventRecord> CreateEventRecord(long version, IPrepareLogRecord<TStreamId> prepare, string streamName, CancellationToken token) {
+		return CreateEventRecord(version, prepare, streamName, _eventTypes, token);
+	}
+
+	private static async ValueTask<EventRecord> CreateEventRecord(long version, IPrepareLogRecord<TStreamId> prepare,
+		string streamName, INameLookup<TStreamId> eventTypeLookup, CancellationToken token) {
+		var eventTypeName = await eventTypeLookup.LookupName(prepare.EventType, token);
+
+		return new(version, prepare, streamName, eventTypeName);
+	}
+
+	// This struct implements the IndexScanOnRead logic.
+	//
+	// The IndexScanOnRead logic deals with the case that there are duplicate
+	// EventNumbers for a single stream (note: not talking about hash collisions), which
+	// may also be out of order (possible when there are a mix of index table bitnesses)
+	//
+	// It deals with them by removing duplicates as they are added (preferring the record
+	// with the lower LogPosition) and then sorting by EventNumber (descending) on output.
+	//
+	// If SkipIndexScanOnRead is true, then it is assumed that the EventRecords are added
+	// (1) in EventNumber order descending and (2) without duplicate EventNumbers.
+	public readonly struct ResultsDeduplicator {
+		// when deduplicating, maps event number to index in _results
+		private readonly Dictionary<long, int> _dict;
+		private readonly List<EventRecord> _results;
+		private readonly bool _skipIndexScanOnRead;
+		// ReSharper disable once StaticMemberInGenericType
+		private static readonly Comparison<EventRecord> ByEventNumberDesc = CompareByEventNumberDesc;
+
+		public ResultsDeduplicator(int maxCount, bool skipIndexScanOnRead) {
+			var capacity = Math.Min(maxCount, 256);
+			_dict = skipIndexScanOnRead
+				? null
+				: new Dictionary<long, int>(capacity);
+			_results = new(capacity);
+			_skipIndexScanOnRead = skipIndexScanOnRead;
+		}
+
+		public int Count => _results.Count;
+
+		public EventRecord[] ProduceArray() {
+			var array = _results.ToArray();
+
+			if (!_skipIndexScanOnRead) {
+				// we already deduplicated on the way in, just sort here
+				Array.Sort(array, ByEventNumberDesc);
+			}
+
+			return array;
+		}
+
+		public List<EventRecord> ProduceList() {
+			var list = _results.ToList();
+
+			if (!_skipIndexScanOnRead) {
+				list.Sort(ByEventNumberDesc);
+			}
+
+			return list;
+		}
+
+		public void Add(EventRecord evt) {
+			if (_skipIndexScanOnRead) {
+				_results.Add(evt);
+				return;
+			}
+
+			if (_dict.TryGetValue(evt.EventNumber, out var i)) {
+				if (_results[i].LogPosition > evt.LogPosition) {
+					_results[i] = evt;
+				} else {
+					// ignore
+				}
+			} else {
+				_results.Add(evt);
+				_dict[evt.EventNumber] = _results.Count - 1;
+			}
+		}
+
+		private static int CompareByEventNumberDesc(EventRecord x, EventRecord y) {
+			return y.EventNumber.CompareTo(x.EventNumber);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexWriter.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexWriter.cs
new file mode 100644
index 00000000000..48f79d55b95
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/IndexWriter.cs
@@ -0,0 +1,480 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Settings;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public interface IIndexWriter<TStreamId> {
+	long CachedTransInfo { get; }
+	long NotCachedTransInfo { get; }
+
+	void Reset();
+	ValueTask<CommitCheckResult<TStreamId>> CheckCommitStartingAt(long transactionPosition, long commitPosition, CancellationToken token);
+	ValueTask<CommitCheckResult<TStreamId>> CheckCommit(TStreamId streamId, long expectedVersion, IEnumerable<Guid> eventIds, bool streamMightExist, CancellationToken token);
+	ValueTask PreCommit(CommitLogRecord commit, CancellationToken token);
+	void PreCommit(ReadOnlySpan<IPrepareLogRecord<TStreamId>> commitedPrepares);
+	void UpdateTransactionInfo(long transactionId, long logPosition, TransactionInfo<TStreamId> transactionInfo);
+	ValueTask<TransactionInfo<TStreamId>> GetTransactionInfo(long writerCheckpoint, long transactionId, CancellationToken token);
+	void PurgeNotProcessedCommitsTill(long checkpoint);
+	void PurgeNotProcessedTransactions(long checkpoint);
+
+	ValueTask<bool> IsSoftDeleted(TStreamId streamId, CancellationToken token);
+	ValueTask<long> GetStreamLastEventNumber(TStreamId streamId, CancellationToken token);
+	ValueTask<StreamMetadata> GetStreamMetadata(TStreamId streamId, CancellationToken token);
+	ValueTask<RawMetaInfo> GetStreamRawMeta(TStreamId streamId, CancellationToken token);
+
+	TStreamId GetStreamId(string streamName);
+	ValueTask<string> GetStreamName(TStreamId streamId, CancellationToken token);
+}
+
+public struct RawMetaInfo(long metaLastEventNumber, ReadOnlyMemory<byte> rawMeta) {
+	public readonly long MetaLastEventNumber = metaLastEventNumber;
+	public readonly ReadOnlyMemory<byte> RawMeta = rawMeta;
+}
+
+public abstract class IndexWriter {
+	protected static readonly ILogger Log = Serilog.Log.ForContext<IndexWriter>();
+}
+
+public class IndexWriter<TStreamId> : IndexWriter, IIndexWriter<TStreamId> {
+	private static EqualityComparer<TStreamId> StreamIdComparer { get; } = EqualityComparer<TStreamId>.Default;
+
+	public long CachedTransInfo {
+		get { return Interlocked.Read(ref _cachedTransInfo); }
+	}
+
+	public long NotCachedTransInfo {
+		get { return Interlocked.Read(ref _notCachedTransInfo); }
+	}
+
+	private readonly IIndexBackend _indexBackend;
+	private readonly IIndexReader<TStreamId> _indexReader;
+	private readonly IValueLookup<TStreamId> _streamIds;
+	private readonly INameLookup<TStreamId> _streamNames;
+	private readonly ISystemStreamLookup<TStreamId> _systemStreams;
+	private readonly TStreamId _emptyStreamId;
+	private readonly StickyLRUCache<long, TransactionInfo<TStreamId>> _transactionInfoCache = new(ESConsts.TransactionMetadataCacheCapacity);
+	private readonly Queue<TransInfo> _notProcessedTrans = new();
+	private readonly BoundedCache<Guid, EventInfo> _committedEvents;
+	private readonly StickyLRUCache<TStreamId, long> _streamVersions = new(ESConsts.IndexWriterCacheCapacity);
+	private readonly StickyLRUCache<TStreamId, StreamMeta> _streamRawMetas = new(0); // store nothing flushed, only sticky non-flushed stuff
+	private readonly Queue<CommitInfo> _notProcessedCommits = new();
+
+	private long _cachedTransInfo;
+	private long _notCachedTransInfo;
+
+	public IndexWriter(
+		IIndexBackend indexBackend,
+		IIndexReader<TStreamId> indexReader,
+		IValueLookup<TStreamId> streamIds,
+		INameLookup<TStreamId> streamNames,
+		ISystemStreamLookup<TStreamId> systemStreams,
+		TStreamId emptyStreamId,
+		ISizer<TStreamId> inMemorySizer) {
+		_committedEvents = new(int.MaxValue, ESConsts.CommitedEventsMemCacheLimit, x => 16 + 4 + IntPtr.Size + Ensure.NotNull(inMemorySizer).GetSizeInBytes(x.StreamId));
+		_indexBackend = Ensure.NotNull(indexBackend);
+		_indexReader = Ensure.NotNull(indexReader);
+		_streamIds = Ensure.NotNull(streamIds);
+		_streamNames = Ensure.NotNull(streamNames);
+		_systemStreams = Ensure.NotNull(systemStreams);
+		_emptyStreamId = emptyStreamId;
+	}
+
+	public void Reset() {
+		_notProcessedCommits.Clear();
+		_streamVersions.Clear();
+		_streamRawMetas.Clear();
+		_notProcessedTrans.Clear();
+		_transactionInfoCache.Clear();
+	}
+
+	public async ValueTask<CommitCheckResult<TStreamId>> CheckCommitStartingAt(long transactionPosition, long commitPosition, CancellationToken token) {
+		TStreamId streamId;
+		long expectedVersion;
+		using (var reader = _indexBackend.BorrowReader()) {
+			try {
+				if (await GetPrepare(reader, transactionPosition, token) is not { } prepare) {
+					Log.Error("Could not read first prepare of to-be-committed transaction. "
+							  + "Transaction pos: {transactionPosition}, commit pos: {commitPosition}.",
+						transactionPosition, commitPosition);
+					var message = "Could not read first prepare of to-be-committed transaction. " + $"Transaction pos: {transactionPosition}, commit pos: {commitPosition}.";
+					throw new InvalidOperationException(message);
+				}
+
+				streamId = prepare.EventStreamId;
+				expectedVersion = prepare.ExpectedVersion;
+			} catch (InvalidOperationException) {
+				return new(CommitDecision.InvalidTransaction, _emptyStreamId, -1, -1, -1, false);
+			}
+		}
+
+		// we should skip prepares without data, as they don't mean anything for idempotency
+		// though we have to check deletes, otherwise they will always be considered idempotent :)
+		var eventIds = await GetTransactionPrepares(transactionPosition, commitPosition, token)
+			.Where(static prepare => prepare.Flags.HasAnyOf(PrepareFlags.Data | PrepareFlags.StreamDelete))
+			.Select(static prepare => prepare.EventId)
+			.ToListAsync(token);
+		return await CheckCommit(streamId, expectedVersion, eventIds, streamMightExist: true, token);
+	}
+
+	private static async ValueTask<IPrepareLogRecord<TStreamId>> GetPrepare(TFReaderLease reader, long logPosition, CancellationToken token) {
+		RecordReadResult result = await reader.TryReadAt(logPosition, couldBeScavenged: true, token);
+		if (!result.Success)
+			return null;
+		if (result.LogRecord.RecordType != LogRecordType.Prepare)
+			throw new Exception($"Incorrect type of log record {result.LogRecord.RecordType}, expected Prepare record.");
+		return (IPrepareLogRecord<TStreamId>)result.LogRecord;
+	}
+
+	private static CommitCheckResult<TStreamId> CheckCommitForNewStream(TStreamId streamId, long expectedVersion) {
+		var commitDecision = expectedVersion switch {
+			ExpectedVersion.Any or ExpectedVersion.NoStream => CommitDecision.Ok,
+			_ => CommitDecision.WrongExpectedVersion
+		};
+
+		return new(commitDecision, streamId, ExpectedVersion.NoStream, -1, -1, false);
+	}
+
+	public async ValueTask<CommitCheckResult<TStreamId>> CheckCommit(TStreamId streamId, long expectedVersion, IEnumerable<Guid> eventIds, bool streamMightExist, CancellationToken token) {
+		if (!streamMightExist) {
+			// fast path for completely new streams
+			return CheckCommitForNewStream(streamId, expectedVersion);
+		}
+
+		var curVersion = await GetStreamLastEventNumber(streamId, token);
+		switch (curVersion) {
+			case EventNumber.DeletedStream:
+				return new(CommitDecision.Deleted, streamId, curVersion, -1, -1, false);
+			case EventNumber.Invalid:
+				return new(CommitDecision.WrongExpectedVersion, streamId, curVersion, -1, -1, false);
+		}
+
+		if (expectedVersion is ExpectedVersion.StreamExists) {
+			if (await IsSoftDeleted(streamId, token))
+				return new(CommitDecision.Deleted, streamId, curVersion, -1, -1, true);
+
+			if (curVersion < 0) {
+				var metadataVersion = await GetStreamLastEventNumber(_systemStreams.MetaStreamOf(streamId), token);
+				if (metadataVersion < 0)
+					return new(CommitDecision.WrongExpectedVersion, streamId, curVersion, -1, -1, false);
+			}
+		}
+
+		// idempotency checks
+		if (expectedVersion is ExpectedVersion.Any or ExpectedVersion.StreamExists) {
+			var first = true;
+			long startEventNumber = -1;
+			long endEventNumber = -1;
+			foreach (var eventId in eventIds) {
+				if (!_committedEvents.TryGetRecord(eventId, out var prepInfo) || !StreamIdComparer.Equals(prepInfo.StreamId, streamId))
+					return new(first ? CommitDecision.Ok : CommitDecision.CorruptedIdempotency,
+						streamId, curVersion, -1, -1, first && await IsSoftDeleted(streamId, token));
+				if (first)
+					startEventNumber = prepInfo.EventNumber;
+				endEventNumber = prepInfo.EventNumber;
+				first = false;
+			}
+
+			if (first) /*no data in transaction*/
+				return new(CommitDecision.Ok, streamId, curVersion, -1, -1, await IsSoftDeleted(streamId, token));
+			var isReplicated = await _indexReader.GetStreamLastEventNumber(streamId, token) >= endEventNumber;
+			//TODO(clc): the new index should hold the log positions removing this read
+			//n.b. the index will never have the event in the case of NotReady as it only committed records are indexed
+			//in that case the position will need to come from the pre-index
+			var idempotentEvent = await _indexReader.ReadEvent(IndexReader.UnspecifiedStreamName, streamId, endEventNumber, token);
+			var logPos = idempotentEvent.Result == ReadEventResult.Success
+				? idempotentEvent.Record.LogPosition
+				: -1;
+			return isReplicated
+				? new(CommitDecision.Idempotent, streamId, curVersion, startEventNumber, endEventNumber, false, logPos)
+				: new(CommitDecision.IdempotentNotReady, streamId, curVersion, startEventNumber, endEventNumber, false, logPos);
+		}
+
+		if (expectedVersion < curVersion) {
+			var eventNumber = expectedVersion;
+			foreach (var eventId in eventIds) {
+				eventNumber += 1;
+
+				if (_committedEvents.TryGetRecord(eventId, out var prepInfo)
+					&& StreamIdComparer.Equals(prepInfo.StreamId, streamId)
+					&& prepInfo.EventNumber == eventNumber)
+					continue;
+
+				if (await _indexReader.ReadPrepare(streamId, eventNumber, token) is { } res && res.EventId == eventId)
+					continue;
+
+				var first = eventNumber == expectedVersion + 1;
+				if (!first)
+					return new(CommitDecision.CorruptedIdempotency, streamId, curVersion, -1, -1, false);
+
+				if (expectedVersion is ExpectedVersion.NoStream && await IsSoftDeleted(streamId, token))
+					return new(CommitDecision.Ok, streamId, curVersion, -1, -1, true);
+
+				return new(CommitDecision.WrongExpectedVersion, streamId, curVersion, -1, -1, false);
+			}
+
+			if (eventNumber == expectedVersion) /* no data in transaction */
+				return new(CommitDecision.WrongExpectedVersion, streamId, curVersion, -1, -1, false);
+
+			var isReplicated = await _indexReader.GetStreamLastEventNumber(streamId, token) >= eventNumber;
+			//TODO(clc): the new index should hold the log positions removing this read
+			//n.b. the index will never have the event in the case of NotReady as it only committed records are indexed
+			//in that case the position will need to come from the pre-index
+			var idempotentEvent =
+				await _indexReader.ReadEvent(IndexReader.UnspecifiedStreamName, streamId, eventNumber, token);
+			var logPos = idempotentEvent.Result == ReadEventResult.Success
+				? idempotentEvent.Record.LogPosition
+				: -1;
+
+			return new(
+				isReplicated ? CommitDecision.Idempotent : CommitDecision.IdempotentNotReady, streamId,
+				curVersion,
+				expectedVersion + 1, eventNumber, false, logPos);
+		}
+
+		if (expectedVersion > curVersion)
+			return new(CommitDecision.WrongExpectedVersion, streamId, curVersion, -1, -1, false);
+
+		// expectedVersion == currentVersion
+		return new(CommitDecision.Ok, streamId, curVersion, -1, -1, await IsSoftDeleted(streamId, token));
+	}
+
+	public async ValueTask PreCommit(CommitLogRecord commit, CancellationToken token) {
+		TStreamId streamId = default;
+		long eventNumber = EventNumber.Invalid;
+		IPrepareLogRecord<TStreamId> lastPrepare = null;
+
+		await foreach (var prepare in GetTransactionPrepares(commit.TransactionPosition, commit.LogPosition, token)) {
+			if (prepare.Flags.HasNoneOf(PrepareFlags.StreamDelete | PrepareFlags.Data))
+				continue;
+
+			if (StreamIdComparer.Equals(streamId, default))
+				streamId = prepare.EventStreamId;
+
+			if (!StreamIdComparer.Equals(prepare.EventStreamId, streamId))
+				throw new Exception(string.Format("Expected stream: {0}, actual: {1}.", streamId,
+					prepare.EventStreamId));
+
+			eventNumber = prepare.Flags.HasAnyOf(PrepareFlags.StreamDelete)
+				? EventNumber.DeletedStream
+				: commit.FirstEventNumber + prepare.TransactionOffset;
+			lastPrepare = prepare;
+			_committedEvents.PutRecord(prepare.EventId, new EventInfo(streamId, eventNumber),
+				throwOnDuplicate: false);
+		}
+
+		if (eventNumber != EventNumber.Invalid)
+			_streamVersions.Put(streamId, eventNumber, +1);
+
+		if (lastPrepare != null && _systemStreams.IsMetaStream(streamId)) {
+			var rawMeta = lastPrepare.Data;
+			_streamRawMetas.Put(_systemStreams.OriginalStreamOf(streamId), new StreamMeta(rawMeta, null), +1);
+		}
+	}
+
+	public void PreCommit(ReadOnlySpan<IPrepareLogRecord<TStreamId>> commitedPrepares) {
+		if (commitedPrepares.Length == 0)
+			return;
+
+		var lastPrepare = commitedPrepares[^1];
+		var streamId = lastPrepare.EventStreamId;
+		long eventNumber = EventNumber.Invalid;
+		foreach (var prepare in commitedPrepares) {
+			if (prepare.Flags.HasNoneOf(PrepareFlags.StreamDelete | PrepareFlags.Data))
+				continue;
+
+			if (!StreamIdComparer.Equals(prepare.EventStreamId, streamId))
+				throw new Exception($"Expected stream: {streamId}, actual: {prepare.EventStreamId}.");
+
+			eventNumber = prepare.ExpectedVersion + 1; /* for committed prepare expected version is always explicit */
+			_committedEvents.PutRecord(prepare.EventId, new EventInfo(streamId, eventNumber), throwOnDuplicate: false);
+		}
+
+		_notProcessedCommits.Enqueue(new CommitInfo(streamId, lastPrepare.LogPosition));
+		_streamVersions.Put(streamId, eventNumber, 1);
+		if (_systemStreams.IsMetaStream(streamId)) {
+			var rawMeta = lastPrepare.Data;
+			_streamRawMetas.Put(_systemStreams.OriginalStreamOf(streamId), new StreamMeta(rawMeta, null), +1);
+		}
+	}
+
+	public void UpdateTransactionInfo(long transactionId, long logPosition, TransactionInfo<TStreamId> transactionInfo) {
+		_notProcessedTrans.Enqueue(new TransInfo(transactionId, logPosition));
+		_transactionInfoCache.Put(transactionId, transactionInfo, +1);
+	}
+
+	public async ValueTask<TransactionInfo<TStreamId>> GetTransactionInfo(long writerCheckpoint, long transactionId, CancellationToken token) {
+		if (!_transactionInfoCache.TryGet(transactionId, out var transactionInfo)) {
+			(var result, transactionInfo) = await GetTransactionInfoUncached(writerCheckpoint, transactionId, token);
+			if (result)
+				_transactionInfoCache.Put(transactionId, transactionInfo, 0);
+			else
+				transactionInfo = new(int.MinValue, default);
+
+			Interlocked.Increment(ref _notCachedTransInfo);
+		} else {
+			Interlocked.Increment(ref _cachedTransInfo);
+		}
+
+		return transactionInfo;
+	}
+
+	private async ValueTask<(bool, TransactionInfo<TStreamId>)> GetTransactionInfoUncached(long writerCheckpoint, long transactionId, CancellationToken token) {
+		using (var reader = _indexBackend.BorrowReader()) {
+			reader.Reposition(writerCheckpoint);
+			SeqReadResult result;
+			while ((result = await reader.TryReadPrev(token)).Success) {
+				if (result.LogRecord.LogPosition < transactionId)
+					break;
+				if (result.LogRecord.RecordType != LogRecordType.Prepare)
+					continue;
+				var prepare = (IPrepareLogRecord<TStreamId>)result.LogRecord;
+				if (prepare.TransactionPosition == transactionId) {
+					return (true, new(prepare.TransactionOffset, prepare.EventStreamId));
+				}
+			}
+		}
+
+		return (false, new(int.MinValue, default));
+	}
+
+	public void PurgeNotProcessedCommitsTill(long checkpoint) {
+		while (_notProcessedCommits.Count > 0 && _notProcessedCommits.Peek().LogPosition < checkpoint) {
+			var commitInfo = _notProcessedCommits.Dequeue();
+			// decrease stickiness
+			_streamVersions.Put(
+				commitInfo.StreamId,
+				x => {
+					if (!Debugger.IsAttached)
+						Debugger.Launch();
+					else
+						Debugger.Break();
+					throw new Exception($"CommitInfo for stream '{x}' is not present!");
+				},
+				(streamId, oldVersion) => oldVersion,
+				stickiness: -1);
+			if (_systemStreams.IsMetaStream(commitInfo.StreamId)) {
+				_streamRawMetas.Put(
+					_systemStreams.OriginalStreamOf(commitInfo.StreamId),
+					x => {
+						if (!Debugger.IsAttached)
+							Debugger.Launch();
+						else
+							Debugger.Break();
+						throw new Exception($"Original stream CommitInfo for meta-stream '{_systemStreams.MetaStreamOf(x)}' is not present!");
+					},
+					(_, oldVersion) => oldVersion,
+					stickiness: -1);
+			}
+		}
+	}
+
+	public void PurgeNotProcessedTransactions(long checkpoint) {
+		while (_notProcessedTrans.Count > 0 && _notProcessedTrans.Peek().LogPosition < checkpoint) {
+			var transInfo = _notProcessedTrans.Dequeue();
+			// decrease stickiness
+			_transactionInfoCache.Put(
+				transInfo.TransactionId,
+				x => throw new Exception($"TransInfo for transaction ID {x} is not present!"),
+				(_, oldTransInfo) => oldTransInfo,
+				stickiness: -1);
+		}
+	}
+
+	private async IAsyncEnumerable<IPrepareLogRecord<TStreamId>> GetTransactionPrepares(long transactionPos, long commitPos, [EnumeratorCancellation] CancellationToken token) {
+		using var reader = _indexBackend.BorrowReader();
+		reader.Reposition(transactionPos);
+
+		// in case all prepares were scavenged, we should not read past Commit LogPosition
+		SeqReadResult result;
+		while ((result = await reader.TryReadNext(token)).Success && result.RecordPrePosition <= commitPos) {
+			if (result.LogRecord.RecordType is not LogRecordType.Prepare)
+				continue;
+
+			var prepare = (IPrepareLogRecord<TStreamId>)result.LogRecord;
+			if (prepare.TransactionPosition == transactionPos) {
+				yield return prepare;
+				if (prepare.Flags.HasAnyOf(PrepareFlags.TransactionEnd))
+					yield break;
+			}
+		}
+	}
+
+	public TStreamId GetStreamId(string streamName) {
+		return _streamIds.LookupValue(streamName);
+	}
+
+	public ValueTask<string> GetStreamName(TStreamId streamId, CancellationToken token) {
+		return _streamNames.LookupName(streamId, token);
+	}
+
+	public async ValueTask<bool> IsSoftDeleted(TStreamId streamId, CancellationToken token) {
+		return (await GetStreamMetadata(streamId, token)).TruncateBefore is EventNumber.DeletedStream;
+	}
+
+	public ValueTask<long> GetStreamLastEventNumber(TStreamId streamId, CancellationToken token) {
+		return _streamVersions.TryGet(streamId, out var lastEventNumber)
+			? new(lastEventNumber)
+			: _indexReader.GetStreamLastEventNumber(streamId, token);
+	}
+
+	public ValueTask<StreamMetadata> GetStreamMetadata(TStreamId streamId, CancellationToken token) {
+		if (!_streamRawMetas.TryGet(streamId, out var meta)) {
+			return _indexReader.GetStreamMetadata(streamId, token);
+		}
+
+		if (meta.Meta is not null) {
+			return new(meta.Meta);
+		}
+
+		var m = Helper.EatException(() => StreamMetadata.FromJsonBytes(meta.RawMeta), StreamMetadata.Empty);
+		_streamRawMetas.Put(streamId, new StreamMeta(meta.RawMeta, m), 0);
+		return new(m);
+	}
+
+	public async ValueTask<RawMetaInfo> GetStreamRawMeta(TStreamId streamId, CancellationToken token) {
+		var metastreamId = _systemStreams.MetaStreamOf(streamId);
+		var metaLastEventNumber = await GetStreamLastEventNumber(metastreamId, token);
+
+		if (!_streamRawMetas.TryGet(streamId, out var meta))
+			meta = new StreamMeta((await _indexReader.ReadPrepare(metastreamId, metaLastEventNumber, token)).Data, null);
+
+		return new(metaLastEventNumber, meta.RawMeta);
+	}
+
+	private struct StreamMeta(ReadOnlyMemory<byte> rawMeta, StreamMetadata meta) {
+		public readonly ReadOnlyMemory<byte> RawMeta = rawMeta;
+		public readonly StreamMetadata Meta = meta;
+	}
+
+	private struct EventInfo(TStreamId streamId, long eventNumber) {
+		public readonly TStreamId StreamId = streamId;
+		public readonly long EventNumber = eventNumber;
+	}
+
+	private struct TransInfo(long transactionId, long logPosition) {
+		public readonly long TransactionId = transactionId;
+		public readonly long LogPosition = logPosition;
+	}
+
+	private struct CommitInfo(TStreamId streamId, long logPosition) {
+		public readonly TStreamId StreamId = streamId;
+		public readonly long LogPosition = logPosition;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/ReadCacheStats.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/ReadCacheStats.cs
new file mode 100644
index 00000000000..6c7e8f89111
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/ReadCacheStats.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public class ReadCacheStats {
+	public readonly long Size;
+	public readonly int Count;
+	public readonly long HitCount;
+	public readonly long MissCount;
+
+	public ReadCacheStats(long size, int count, long hitCount, long missCount) {
+		Size = size;
+		Count = count;
+		HitCount = hitCount;
+		MissCount = missCount;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/ReadIndex.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/ReadIndex.cs
new file mode 100644
index 00000000000..663146110c1
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/ReadIndex.cs
@@ -0,0 +1,220 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using static KurrentDB.Common.Configuration.MetricsConfiguration;
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public sealed class ReadIndex<TStreamId> : IDisposable, IReadIndex<TStreamId> {
+	public long LastIndexedPosition {
+		get { return _indexCommitter.LastIndexedPosition; }
+	}
+
+	public IIndexWriter<TStreamId> IndexWriter {
+		get { return _indexWriter; }
+	}
+
+	public IIndexCommitter<TStreamId> IndexCommitter {
+		get { return _indexCommitter; }
+	}
+
+	private readonly IIndexReader<TStreamId> _indexReader;
+	private readonly IIndexWriter<TStreamId> _indexWriter;
+	private readonly IIndexCommitter<TStreamId> _indexCommitter;
+	private readonly IAllReader _allReader;
+	private readonly IValueLookup<TStreamId> _streamIds;
+	private readonly INameLookup<TStreamId> _streamNames;
+
+	public ReadIndex(IPublisher bus,
+		ObjectPool<ITransactionFileReader> readerPool,
+		ITableIndex<TStreamId> tableIndex,
+		INameIndexConfirmer<TStreamId> streamNameIndex,
+		IValueLookup<TStreamId> streamIds,
+		IStreamNamesProvider<TStreamId> streamNamesProvider,
+		TStreamId emptyStreamName,
+		IValidator<TStreamId> streamIdValidator,
+		ISizer<TStreamId> sizer,
+		INameExistenceFilter streamExistenceFilter,
+		IExistenceFilterReader<TStreamId> streamExistenceFilterReader,
+		INameIndexConfirmer<TStreamId> eventTypeIndex,
+		ILRUCache<TStreamId, IndexBackend<TStreamId>.EventNumberCached> streamLastEventNumberCache,
+		ILRUCache<TStreamId, IndexBackend<TStreamId>.MetadataCached> streamMetadataCache,
+		bool additionalCommitChecks,
+		long metastreamMaxCount,
+		int hashCollisionReadLimit,
+		bool skipIndexScanOnReads,
+		IReadOnlyCheckpoint replicationCheckpoint,
+		ICheckpoint indexCheckpoint,
+		IIndexStatusTracker indexStatusTracker,
+		IIndexTracker indexTracker,
+		ICacheHitsMissesTracker cacheTracker) {
+
+		Ensure.NotNull(bus, "bus");
+		Ensure.NotNull(readerPool, "readerPool");
+		Ensure.NotNull(tableIndex, "tableIndex");
+		Ensure.NotNull(streamIds, nameof(streamIds));
+		Ensure.NotNull(streamNamesProvider, nameof(streamNamesProvider));
+		Ensure.NotNull(streamIdValidator, nameof(streamIdValidator));
+		Ensure.NotNull(sizer, nameof(sizer));
+		Ensure.NotNull(streamExistenceFilter, nameof(streamExistenceFilter));
+		Ensure.NotNull(streamExistenceFilterReader, nameof(streamExistenceFilterReader));
+		Ensure.NotNull(streamLastEventNumberCache, nameof(streamLastEventNumberCache));
+		Ensure.NotNull(streamMetadataCache, nameof(streamMetadataCache));
+		Ensure.Positive(metastreamMaxCount, "metastreamMaxCount");
+		Ensure.NotNull(replicationCheckpoint, "replicationCheckpoint");
+		Ensure.NotNull(indexCheckpoint, "indexCheckpoint");
+
+		var metastreamMetadata = new StreamMetadata(maxCount: metastreamMaxCount);
+
+		var indexBackend = new IndexBackend<TStreamId>(readerPool, streamLastEventNumberCache, streamMetadataCache);
+
+		_indexReader = new IndexReader<TStreamId>(indexBackend, tableIndex, streamNamesProvider, streamIdValidator,
+			streamExistenceFilterReader, metastreamMetadata, hashCollisionReadLimit, skipIndexScanOnReads);
+
+		_streamIds = streamIds;
+		_streamNames = streamNamesProvider.StreamNames;
+		var systemStreams = streamNamesProvider.SystemStreams;
+		var eventTypeNames = streamNamesProvider.EventTypes;
+		var streamExistenceFilterInitializer = streamNamesProvider.StreamExistenceFilterInitializer;
+
+		_indexWriter = new IndexWriter<TStreamId>(indexBackend, _indexReader, _streamIds, _streamNames, systemStreams, emptyStreamName, sizer);
+		_indexCommitter = new IndexCommitter<TStreamId>(bus, indexBackend, _indexReader, tableIndex, streamNameIndex,
+			_streamNames, eventTypeIndex, eventTypeNames, systemStreams, streamExistenceFilter,
+			streamExistenceFilterInitializer, indexCheckpoint, indexStatusTracker, indexTracker, additionalCommitChecks);
+		_allReader = new AllReader<TStreamId>(indexBackend, _indexCommitter, _streamNames, eventTypeNames);
+
+		RegisterHitsMisses(cacheTracker);
+	}
+
+	ValueTask<IndexReadEventResult> IReadIndex<TStreamId>.ReadEvent(string streamName, TStreamId streamId, long eventNumber, CancellationToken token) {
+		return _indexReader.ReadEvent(streamName, streamId, eventNumber, token);
+	}
+
+	ValueTask<IndexReadStreamResult> IReadIndex<TStreamId>.ReadStreamEventsForward(string streamName, TStreamId streamId, long fromEventNumber, int maxCount, CancellationToken token) {
+		return _indexReader.ReadStreamEventsForward(streamName, streamId, fromEventNumber, maxCount, token);
+	}
+
+	ValueTask<IndexReadStreamResult> IReadIndex<TStreamId>.ReadStreamEventsBackward(string streamName, TStreamId streamId, long fromEventNumber, int maxCount, CancellationToken token) {
+		return _indexReader.ReadStreamEventsBackward(streamName, streamId, fromEventNumber, maxCount, token);
+	}
+
+	TStreamId IReadIndex<TStreamId>.GetStreamId(string streamName) {
+		return _streamIds.LookupValue(streamName);
+	}
+
+	public ValueTask<IndexReadEventInfoResult> ReadEventInfo_KeepDuplicates(TStreamId streamId, long eventNumber, CancellationToken token) {
+		return _indexReader.ReadEventInfo_KeepDuplicates(streamId, eventNumber, token);
+	}
+
+	public ValueTask<IndexReadEventInfoResult> ReadEventInfoForward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount, long beforePosition, CancellationToken token) {
+		return _indexReader.ReadEventInfoForward_KnownCollisions(streamId, fromEventNumber, maxCount, beforePosition, token);
+	}
+
+	public ValueTask<IndexReadEventInfoResult> ReadEventInfoForward_NoCollisions(ulong stream, long fromEventNumber, int maxCount, long beforePosition, CancellationToken token) {
+		return _indexReader.ReadEventInfoForward_NoCollisions(stream, fromEventNumber, maxCount, beforePosition, token);
+	}
+
+	public ValueTask<IndexReadEventInfoResult> ReadEventInfoBackward_KnownCollisions(TStreamId streamId, long fromEventNumber, int maxCount,
+		long beforePosition, CancellationToken token) {
+		return _indexReader.ReadEventInfoBackward_KnownCollisions(streamId, fromEventNumber, maxCount, beforePosition, token);
+	}
+
+	public ValueTask<IndexReadEventInfoResult> ReadEventInfoBackward_NoCollisions(ulong stream, Func<ulong, TStreamId> getStreamId,
+		long fromEventNumber, int maxCount, long beforePosition, CancellationToken token) {
+		return _indexReader.ReadEventInfoBackward_NoCollisions(stream, getStreamId, fromEventNumber, maxCount, beforePosition, token);
+	}
+
+	ValueTask<string> IReadIndex<TStreamId>.GetStreamName(TStreamId streamId, CancellationToken token) {
+		return _streamNames.LookupName(streamId, token);
+	}
+
+	async ValueTask<bool> IReadIndex<TStreamId>.IsStreamDeleted(TStreamId streamId, CancellationToken token) {
+		return await _indexReader.GetStreamLastEventNumber(streamId, token) is EventNumber.DeletedStream;
+	}
+
+	ValueTask<long> IReadIndex<TStreamId>.GetStreamLastEventNumber(TStreamId streamId, CancellationToken token) {
+		return _indexReader.GetStreamLastEventNumber(streamId, token);
+	}
+
+	public ValueTask<long> GetStreamLastEventNumber_KnownCollisions(TStreamId streamId, long beforePosition, CancellationToken token) {
+		return _indexReader.GetStreamLastEventNumber_KnownCollisions(streamId, beforePosition, token);
+	}
+
+	public ValueTask<long> GetStreamLastEventNumber_NoCollisions(ulong stream, Func<ulong, TStreamId> getStreamId, long beforePosition, CancellationToken token) {
+		return _indexReader.GetStreamLastEventNumber_NoCollisions(stream, getStreamId, beforePosition, token);
+	}
+
+	ValueTask<StreamMetadata> IReadIndex<TStreamId>.GetStreamMetadata(TStreamId streamId, CancellationToken token) {
+		return _indexReader.GetStreamMetadata(streamId, token);
+	}
+
+	public ValueTask<TStreamId> GetEventStreamIdByTransactionId(long transactionId, CancellationToken token) {
+		return _indexReader.GetEventStreamIdByTransactionId(transactionId, token);
+	}
+
+	ValueTask<IndexReadAllResult> IReadIndex.ReadAllEventsForward(TFPos pos, int maxCount, CancellationToken token) {
+		return _allReader.ReadAllEventsForward(pos, maxCount, token);
+	}
+
+	ValueTask<IndexReadAllResult> IReadIndex.ReadAllEventsForwardFiltered(TFPos pos, int maxCount, int maxSearchWindow,
+		IEventFilter eventFilter, CancellationToken token) {
+		return _allReader.FilteredReadAllEventsForward(pos, maxCount, maxSearchWindow, eventFilter, token);
+	}
+
+	ValueTask<IndexReadAllResult> IReadIndex.ReadAllEventsBackwardFiltered(TFPos pos, int maxCount, int maxSearchWindow,
+		IEventFilter eventFilter, CancellationToken token) {
+		return _allReader.FilteredReadAllEventsBackward(pos, maxCount, maxSearchWindow, eventFilter, token);
+	}
+
+	ValueTask<IndexReadAllResult> IReadIndex.ReadAllEventsBackward(TFPos pos, int maxCount, CancellationToken token) {
+		return _allReader.ReadAllEventsBackward(pos, maxCount, token);
+	}
+
+	public ValueTask<StorageMessage.EffectiveAcl> GetEffectiveAcl(TStreamId streamId, CancellationToken token) {
+		return _indexReader.GetEffectiveAcl(streamId, token);
+	}
+
+	void RegisterHitsMisses(ICacheHitsMissesTracker tracker) {
+		tracker.Register(
+			Cache.Chunk,
+			() => Interlocked.Read(ref TFChunkReader.CachedReads),
+			() => Interlocked.Read(ref TFChunkReader.NotCachedReads));
+
+		tracker.Register(
+			Cache.StreamInfo,
+			() => _indexReader.CachedStreamInfo,
+			() => _indexReader.NotCachedStreamInfo);
+	}
+
+	ReadIndexStats IReadIndex.GetStatistics() {
+		return new ReadIndexStats(Interlocked.Read(ref TFChunkReader.CachedReads),
+			Interlocked.Read(ref TFChunkReader.NotCachedReads),
+			_indexReader.CachedStreamInfo,
+			_indexReader.NotCachedStreamInfo,
+			_indexReader.HashCollisions,
+			_indexWriter.CachedTransInfo,
+			_indexWriter.NotCachedTransInfo);
+	}
+
+	public void Close() {
+		Dispose();
+	}
+
+	public void Dispose() {
+		_indexCommitter.Dispose();
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/ReadIndexStats.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/ReadIndexStats.cs
new file mode 100644
index 00000000000..773882785c5
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/ReadIndexStats.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public class ReadIndexStats {
+	public readonly long CachedRecordReads;
+	public readonly long NotCachedRecordReads;
+	public readonly long CachedStreamInfoReads;
+	public readonly long NotCachedStreamInfoReads;
+	public readonly long HashCollisions;
+	public readonly long CachedTransInfoReads;
+	public readonly long NotCachedTransInfoReads;
+
+	public ReadIndexStats(long cachedRecordReads, long notCachedRecordReads,
+		long cachedStreamInfoReads, long notCachedStreamInfoReads,
+		long hashCollisions,
+		long cachedTransInfoReads, long notCachedTransInfoReads) {
+		CachedRecordReads = cachedRecordReads;
+		NotCachedRecordReads = notCachedRecordReads;
+		CachedStreamInfoReads = cachedStreamInfoReads;
+		NotCachedStreamInfoReads = notCachedStreamInfoReads;
+		HashCollisions = hashCollisions;
+		CachedTransInfoReads = cachedTransInfoReads;
+		NotCachedTransInfoReads = notCachedTransInfoReads;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/ReadStreamResult.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/ReadStreamResult.cs
new file mode 100644
index 00000000000..a4c893b0b76
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/ReadStreamResult.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public enum ReadStreamResult {
+	Success,
+	NoStream,
+	StreamDeleted
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/StreamAccess.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/StreamAccess.cs
new file mode 100644
index 00000000000..23e66b2f94f
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/StreamAccess.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public struct StreamAccess {
+	public readonly bool Granted;
+	public readonly bool Public;
+
+	public StreamAccess(bool granted) {
+		Granted = granted;
+		Public = false;
+	}
+
+	public StreamAccess(bool granted, bool @public) {
+		Granted = granted;
+		Public = @public;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/StreamAccessType.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/StreamAccessType.cs
new file mode 100644
index 00000000000..0e6499ba84a
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/StreamAccessType.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public enum StreamAccessType {
+	Read,
+	Write,
+	Delete,
+	MetaRead,
+	MetaWrite
+}
diff --git a/src/KurrentDB.Core/Services/Storage/ReaderIndex/TransactionInfo.cs b/src/KurrentDB.Core/Services/Storage/ReaderIndex/TransactionInfo.cs
new file mode 100644
index 00000000000..f7ccb9efe9c
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ReaderIndex/TransactionInfo.cs
@@ -0,0 +1,6 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.Storage.ReaderIndex;
+
+public readonly record struct TransactionInfo<TStreamId>(int TransactionOffset, TStreamId EventStreamId);
diff --git a/src/KurrentDB.Core/Services/Storage/ScavengerFactory.cs b/src/KurrentDB.Core/Services/Storage/ScavengerFactory.cs
new file mode 100644
index 00000000000..71c5baaee17
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/ScavengerFactory.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Serilog;
+
+namespace KurrentDB.Core.Services.Storage;
+
+// The resulting scavenger is used for one continuous run. If it is cancelled or
+// completed then starting scavenge again will instantiate another scavenger
+// with a different id.
+public class ScavengerFactory(Func<ClientMessage.ScavengeDatabase, ITFChunkScavengerLog, ILogger, IScavenger> create) {
+	public IScavenger Create(ClientMessage.ScavengeDatabase message, ITFChunkScavengerLog scavengerLogger, ILogger logger) => create(message, scavengerLogger, logger);
+}
+
+public class OldScavenger<TStreamId>(
+	bool alwaysKeepScaveged,
+	bool mergeChunks,
+	int startFromChunk,
+	TFChunkScavenger<TStreamId> tfChunkScavenger)
+	: IScavenger {
+	public string ScavengeId => tfChunkScavenger.ScavengeId;
+
+	public void Dispose() {
+	}
+
+	public Task<ScavengeResult> ScavengeAsync(CancellationToken cancellationToken) {
+		return tfChunkScavenger.Scavenge(
+			alwaysKeepScavenged: alwaysKeepScaveged,
+			mergeChunks: mergeChunks,
+			startFromChunk: startFromChunk,
+			ct: cancellationToken);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Storage/StorageChaser.cs b/src/KurrentDB.Core/Services/Storage/StorageChaser.cs
new file mode 100644
index 00000000000..5112dae9a3a
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/StorageChaser.cs
@@ -0,0 +1,283 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Monitoring.Stats;
+using KurrentDB.Core.Services.Storage.EpochManager;
+using KurrentDB.Core.TransactionLog;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+using static System.Threading.Timeout;
+using ILogger = Serilog.ILogger;
+
+// ReSharper disable StaticMemberInGenericType
+
+namespace KurrentDB.Core.Services.Storage;
+
+public abstract class StorageChaser {
+	protected static readonly ILogger Log = Serilog.Log.ForContext<StorageChaser>();
+}
+
+public class StorageChaser<TStreamId> : StorageChaser, IMonitoredQueue,
+	IHandle<SystemMessage.SystemInit>,
+	IHandle<SystemMessage.SystemStart>,
+	IHandle<SystemMessage.BecomeShuttingDown>,
+	IThreadPoolWorkItem {
+	private static readonly int TicksPerMs = (int)(Stopwatch.Frequency / 1000);
+	private static readonly int MinFlushDelay = 2 * TicksPerMs;
+	private static readonly ManualResetEventSlim FlushSignal = new(false, 1);
+	private static readonly TimeSpan FlushWaitTimeout = TimeSpan.FromMilliseconds(10);
+
+	public string Name => _queueStats.Name;
+
+	private readonly IPublisher _leaderBus;
+	private readonly IReadOnlyCheckpoint _writerCheckpoint;
+	private readonly ITransactionFileChaser _chaser;
+	private readonly IIndexCommitterService<TStreamId> _indexCommitterService;
+	private readonly IEpochManager _epochManager;
+	private readonly CancellationToken _stopToken; // cached to avoid ObjectDisposedException
+	private readonly CancellationTokenSource _stop = new();
+
+	private volatile bool _systemStarted;
+
+	private readonly QueueStatsCollector _queueStats;
+
+	private readonly Stopwatch _watch = Stopwatch.StartNew();
+	private long _flushDelay;
+	private long _lastFlush;
+
+	private readonly List<IPrepareLogRecord<TStreamId>> _transaction = new();
+	private bool _commitsAfterEof;
+
+	private readonly TaskCompletionSource<object> _tcs = new();
+
+	public Task Task => _tcs.Task;
+
+	public StorageChaser(IPublisher leaderBus,
+		IReadOnlyCheckpoint writerCheckpoint,
+		ITransactionFileChaser chaser,
+		IIndexCommitterService<TStreamId> indexCommitterService,
+		IEpochManager epochManager,
+		QueueStatsManager queueStatsManager) {
+		_leaderBus = Ensure.NotNull(leaderBus);
+		_writerCheckpoint = Ensure.NotNull(writerCheckpoint);
+		_chaser = Ensure.NotNull(chaser);
+		_indexCommitterService = Ensure.NotNull(indexCommitterService);
+		_epochManager = Ensure.NotNull(epochManager);
+		_queueStats = queueStatsManager.CreateQueueStatsCollector("Storage Chaser");
+		_lastFlush = _watch.ElapsedTicks;
+		_stopToken = _stop.Token;
+	}
+
+	public void Handle(SystemMessage.SystemInit message) {
+		ThreadPool.UnsafeQueueUserWorkItem(this, preferLocal: false);
+	}
+
+	public void Handle(SystemMessage.SystemStart message) {
+		_systemStarted = true;
+	}
+
+	async void IThreadPoolWorkItem.Execute() {
+		try {
+			_queueStats.Start();
+			QueueMonitor.Default.Register(this);
+
+			_writerCheckpoint.Flushed += OnWriterFlushed;
+
+			_chaser.Open();
+
+			// We rebuild index till the chaser position, because
+			// everything else will be done by chaser as during replication
+			// with no concurrency issues with writer, as writer before jumping
+			// into leader mode and accepting writes will wait till chaser caught up.
+			await _indexCommitterService.Init(_chaser.Checkpoint.Read(), _stopToken);
+			_leaderBus.Publish(new SystemMessage.ServiceInitialized(nameof(StorageChaser)));
+
+			while (!_stopToken.IsCancellationRequested) {
+				if (_systemStarted)
+					await ChaserIteration(_stopToken);
+				else
+					await Task.Delay(1, _stopToken).ConfigureAwait(ConfigureAwaitOptions.ContinueOnCapturedContext |
+																   ConfigureAwaitOptions.SuppressThrowing);
+			}
+		} catch (Exception exc) {
+			Log.Fatal(exc, "Error in StorageChaser. Terminating...");
+			_queueStats.EnterIdle();
+			_queueStats.ProcessingStarted<FaultedChaserState>(0);
+			_tcs.TrySetException(exc);
+			Application.Exit(ExitCode.Error, "Error in StorageChaser. Terminating...\nError: " + exc.Message);
+			await Task.Delay(InfiniteTimeSpan, _stopToken).ConfigureAwait(ConfigureAwaitOptions.SuppressThrowing |
+																		  ConfigureAwaitOptions.ContinueOnCapturedContext);
+
+			_queueStats.ProcessingEnded(0);
+		} finally {
+			_queueStats.Stop();
+			QueueMonitor.Default.Unregister(this);
+		}
+
+		_writerCheckpoint.Flushed -= OnWriterFlushed;
+		_chaser.Close();
+		_leaderBus.Publish(new SystemMessage.ServiceShutdown(nameof(StorageChaser)));
+	}
+
+	private static void OnWriterFlushed(long obj) {
+		FlushSignal.Set();
+	}
+
+	private async ValueTask ChaserIteration(CancellationToken token) {
+		_queueStats.EnterBusy();
+
+		FlushSignal.Reset(); // Reset the flush signal just before a read to reduce pointless reads from [flush flush read] patterns.
+
+		var result = await _chaser.TryReadNext(token);
+
+		if (result.Success) {
+			_queueStats.ProcessingStarted(result.LogRecord.GetType(), 0);
+			await ProcessLogRecord(result, token);
+			_queueStats.ProcessingEnded(1);
+		}
+
+		var start = _watch.ElapsedTicks;
+		if (!result.Success || start - _lastFlush >= _flushDelay + MinFlushDelay) {
+			_queueStats.ProcessingStarted<ChaserCheckpointFlush>(0);
+			// todo: histogram metric?
+			_chaser.Flush();
+			_queueStats.ProcessingEnded(1);
+
+			var end = _watch.ElapsedTicks;
+			_flushDelay = end - start;
+			_lastFlush = end;
+		}
+
+		if (!result.Success) {
+			_queueStats.EnterIdle();
+			// todo: histogram metric?
+			FlushSignal.Wait(FlushWaitTimeout);
+		}
+	}
+
+	private async ValueTask ProcessLogRecord(SeqReadResult result, CancellationToken token) {
+		switch (result.LogRecord.RecordType) {
+			case LogRecordType.Stream:
+			case LogRecordType.EventType:
+			case LogRecordType.Prepare: {
+				var record = (IPrepareLogRecord<TStreamId>)result.LogRecord;
+				ProcessPrepareRecord(record, result.RecordPostPosition);
+				break;
+			}
+			case LogRecordType.Commit: {
+				_commitsAfterEof = !result.Eof;
+				var record = (CommitLogRecord)result.LogRecord;
+				await ProcessCommitRecord(record, result.RecordPostPosition, token);
+				break;
+			}
+			case LogRecordType.System: {
+				var record = (ISystemLogRecord)result.LogRecord;
+				await ProcessSystemRecord(record, token);
+				break;
+			}
+			case LogRecordType.Partition:
+			case LogRecordType.PartitionType:
+				break;
+			default:
+				throw new ArgumentOutOfRangeException();
+		}
+
+		if (result.Eof && result.LogRecord.RecordType != LogRecordType.Commit && _commitsAfterEof) {
+			_commitsAfterEof = false;
+			_leaderBus.Publish(new StorageMessage.TfEofAtNonCommitRecord());
+		}
+	}
+
+	private void ProcessPrepareRecord(IPrepareLogRecord<TStreamId> record, long postPosition) {
+		if (_transaction.Count > 0 && _transaction[0].TransactionPosition != record.TransactionPosition)
+			CommitPendingTransaction(_transaction, postPosition);
+
+		if (record.Flags.HasAnyOf(PrepareFlags.IsCommitted)) {
+			if (record.Flags.HasAnyOf(PrepareFlags.Data | PrepareFlags.StreamDelete))
+				_transaction.Add(record);
+
+			if (!record.Flags.HasAnyOf(PrepareFlags.TransactionEnd)) {
+				return;
+			}
+
+			CommitPendingTransaction(_transaction, postPosition);
+
+			long firstEventNumber;
+			long lastEventNumber;
+			if (record.Flags.HasAnyOf(PrepareFlags.Data)) {
+				firstEventNumber = record.ExpectedVersion + 1 - record.TransactionOffset;
+				lastEventNumber = record.ExpectedVersion + 1;
+			} else {
+				firstEventNumber = record.ExpectedVersion + 1;
+				lastEventNumber = record.ExpectedVersion;
+			}
+
+			_leaderBus.Publish(new StorageMessage.CommitAck(record.CorrelationId,
+				record.LogPosition,
+				record.TransactionPosition,
+				firstEventNumber,
+				lastEventNumber));
+		} else if (record.Flags.HasAnyOf(PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd | PrepareFlags.Data)) {
+			_leaderBus.Publish(new StorageMessage.PrepareAck(record.CorrelationId, record.LogPosition, record.Flags));
+		}
+	}
+
+	private async ValueTask ProcessCommitRecord(CommitLogRecord record, long postPosition, CancellationToken token) {
+		CommitPendingTransaction(_transaction, postPosition);
+
+		var firstEventNumber = record.FirstEventNumber;
+		var lastEventNumber = await _indexCommitterService.GetCommitLastEventNumber(record, token);
+		_indexCommitterService.AddPendingCommit(record, postPosition);
+		if (lastEventNumber is EventNumber.Invalid)
+			lastEventNumber = record.FirstEventNumber - 1;
+		_leaderBus.Publish(new StorageMessage.CommitAck(record.CorrelationId, record.LogPosition,
+			record.TransactionPosition, firstEventNumber, lastEventNumber));
+	}
+
+	private ValueTask ProcessSystemRecord(ISystemLogRecord record, CancellationToken token) {
+		CommitPendingTransaction(_transaction, record.LogPosition);
+
+		if (record.SystemRecordType is SystemRecordType.Epoch) {
+			// Epoch record is written to TF, but possibly is not added to EpochManager
+			// as we could be in Follower/Clone mode. We try to add epoch to EpochManager
+			// every time we encounter EpochRecord while chasing. CacheEpoch call is idempotent,
+			// but does integrity checks.
+			var epoch = record.GetEpochRecord();
+			return _epochManager.CacheEpoch(epoch, token);
+		}
+
+		return ValueTask.CompletedTask;
+	}
+
+	private void CommitPendingTransaction(List<IPrepareLogRecord<TStreamId>> transaction, long postPosition) {
+		if (transaction.Count > 0) {
+			_indexCommitterService.AddPendingPrepare(transaction.ToArray(), postPosition);
+			_transaction.Clear();
+		}
+	}
+
+	public void Handle(SystemMessage.BecomeShuttingDown message) {
+		if (!_stop.IsCancellationRequested) {
+			_stop.Cancel();
+			_stop.Dispose();
+		}
+	}
+
+	public QueueStats GetStatistics() {
+		return _queueStats.GetStatistics(0);
+	}
+
+	private class ChaserCheckpointFlush;
+
+	private class FaultedChaserState;
+}
diff --git a/src/KurrentDB.Core/Services/Storage/StorageReaderService.cs b/src/KurrentDB.Core/Services/Storage/StorageReaderService.cs
new file mode 100644
index 00000000000..070ade7761b
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/StorageReaderService.cs
@@ -0,0 +1,122 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.Storage.InMemory;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Storage;
+
+public abstract class StorageReaderService {
+	protected static readonly ILogger Log = Serilog.Log.ForContext<StorageReaderService>();
+}
+
+public class StorageReaderService<TStreamId> : StorageReaderService, IHandle<SystemMessage.SystemInit>,
+	IAsyncHandle<SystemMessage.BecomeShuttingDown>,
+	IHandle<SystemMessage.BecomeShutdown>,
+	IHandle<MonitoringMessage.InternalStatsRequest> {
+
+	private readonly IPublisher _bus;
+	private readonly IReadIndex _readIndex;
+	private readonly MultiQueuedHandler _workersMultiHandler;
+
+	public StorageReaderService(
+		IPublisher bus,
+		ISubscriber subscriber,
+		IReadIndex<TStreamId> readIndex,
+		ISystemStreamLookup<TStreamId> systemStreams,
+		int threadCount,
+		IReadOnlyCheckpoint writerCheckpoint,
+		IInMemoryStreamReader inMemReader,
+		QueueStatsManager queueStatsManager,
+		QueueTrackers trackers) {
+		Ensure.NotNull(subscriber);
+		Ensure.NotNull(systemStreams);
+		Ensure.Positive(threadCount);
+		Ensure.NotNull(writerCheckpoint);
+
+		_bus = Ensure.NotNull(bus);
+		_readIndex = Ensure.NotNull(readIndex);
+		StorageReaderWorker<TStreamId>[] readerWorkers = new StorageReaderWorker<TStreamId>[threadCount];
+		InMemoryBus[] storageReaderBuses = new InMemoryBus[threadCount];
+		for (var i = 0; i < threadCount; i++) {
+			readerWorkers[i] = new(bus, readIndex, systemStreams, writerCheckpoint, inMemReader, i);
+			storageReaderBuses[i] = new("StorageReaderBus", watchSlowMsg: false);
+			storageReaderBuses[i].Subscribe<ClientMessage.ReadEvent>(readerWorkers[i]);
+			storageReaderBuses[i].Subscribe<ClientMessage.ReadStreamEventsBackward>(readerWorkers[i]);
+			storageReaderBuses[i].Subscribe<ClientMessage.ReadStreamEventsForward>(readerWorkers[i]);
+			storageReaderBuses[i].Subscribe<ClientMessage.ReadAllEventsForward>(readerWorkers[i]);
+			storageReaderBuses[i].Subscribe<ClientMessage.ReadAllEventsBackward>(readerWorkers[i]);
+			storageReaderBuses[i].Subscribe<ClientMessage.FilteredReadAllEventsForward>(readerWorkers[i]);
+			storageReaderBuses[i].Subscribe<ClientMessage.FilteredReadAllEventsBackward>(readerWorkers[i]);
+			storageReaderBuses[i].Subscribe<StorageMessage.BatchLogExpiredMessages>(readerWorkers[i]);
+			storageReaderBuses[i].Subscribe<StorageMessage.EffectiveStreamAclRequest>(readerWorkers[i]);
+			storageReaderBuses[i].Subscribe<StorageMessage.StreamIdFromTransactionIdRequest>(readerWorkers[i]);
+		}
+
+		_workersMultiHandler = new MultiQueuedHandler(
+			threadCount,
+			queueNum => new QueuedHandlerThreadPool(storageReaderBuses[queueNum],
+				$"StorageReaderQueue #{queueNum + 1}",
+				queueStatsManager,
+				trackers,
+				groupName: "StorageReaderQueue",
+				watchSlowMsg: true,
+				slowMsgThreshold: TimeSpan.FromMilliseconds(200)));
+		_workersMultiHandler.Start();
+
+		subscriber.Subscribe<ClientMessage.ReadEvent>(_workersMultiHandler);
+		subscriber.Subscribe<ClientMessage.ReadStreamEventsBackward>(_workersMultiHandler);
+		subscriber.Subscribe<ClientMessage.ReadStreamEventsForward>(_workersMultiHandler);
+		subscriber.Subscribe<ClientMessage.ReadAllEventsForward>(_workersMultiHandler);
+		subscriber.Subscribe<ClientMessage.ReadAllEventsBackward>(_workersMultiHandler);
+		subscriber.Subscribe<ClientMessage.FilteredReadAllEventsForward>(_workersMultiHandler);
+		subscriber.Subscribe<ClientMessage.FilteredReadAllEventsBackward>(_workersMultiHandler);
+		subscriber.Subscribe<StorageMessage.BatchLogExpiredMessages>(_workersMultiHandler);
+		subscriber.Subscribe<StorageMessage.EffectiveStreamAclRequest>(_workersMultiHandler);
+		subscriber.Subscribe<StorageMessage.StreamIdFromTransactionIdRequest>(_workersMultiHandler);
+	}
+
+	void IHandle<SystemMessage.SystemInit>.Handle(SystemMessage.SystemInit message) {
+		_bus.Publish(new SystemMessage.ServiceInitialized(nameof(StorageReaderService)));
+	}
+
+	async ValueTask IAsyncHandle<SystemMessage.BecomeShuttingDown>.HandleAsync(SystemMessage.BecomeShuttingDown message, CancellationToken token) {
+		try {
+			await _workersMultiHandler.Stop();
+		} catch (Exception exc) {
+			Log.Error(exc, "Error while stopping readers multi handler.");
+		}
+
+		_bus.Publish(new SystemMessage.ServiceShutdown(nameof(StorageReaderService)));
+	}
+
+	void IHandle<SystemMessage.BecomeShutdown>.Handle(SystemMessage.BecomeShutdown message) {
+		// by now (in case of successful shutdown process), all readers and writers should not be using ReadIndex
+		_readIndex.Close();
+	}
+
+	void IHandle<MonitoringMessage.InternalStatsRequest>.Handle(MonitoringMessage.InternalStatsRequest message) {
+		var s = _readIndex.GetStatistics();
+		var stats = new Dictionary<string, object> {
+			{ "es-readIndex-cachedRecord", s.CachedRecordReads },
+			{ "es-readIndex-notCachedRecord", s.NotCachedRecordReads },
+			{ "es-readIndex-cachedStreamInfo", s.CachedStreamInfoReads },
+			{ "es-readIndex-notCachedStreamInfo", s.NotCachedStreamInfoReads },
+			{ "es-readIndex-cachedTransInfo", s.CachedTransInfoReads },
+			{ "es-readIndex-notCachedTransInfo", s.NotCachedTransInfoReads },
+		};
+
+		message.Envelope.ReplyWith(new MonitoringMessage.InternalStatsRequestResponse(stats));
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Storage/StorageReaderWorker.cs b/src/KurrentDB.Core/Services/Storage/StorageReaderWorker.cs
new file mode 100644
index 00000000000..b7e80b8660f
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/StorageReaderWorker.cs
@@ -0,0 +1,797 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Threading;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Storage.InMemory;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using ILogger = Serilog.ILogger;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+
+// ReSharper disable StaticMemberInGenericType
+
+namespace KurrentDB.Core.Services.Storage;
+
+public abstract class StorageReaderWorker {
+	protected static readonly ILogger Log = Serilog.Log.ForContext<StorageReaderWorker>();
+}
+
+public class StorageReaderWorker<TStreamId> :
+	StorageReaderWorker,
+	IAsyncHandle<ClientMessage.ReadEvent>,
+	IAsyncHandle<ClientMessage.ReadStreamEventsBackward>,
+	IAsyncHandle<ClientMessage.ReadStreamEventsForward>,
+	IAsyncHandle<ClientMessage.ReadAllEventsForward>,
+	IAsyncHandle<ClientMessage.ReadAllEventsBackward>,
+	IAsyncHandle<ClientMessage.FilteredReadAllEventsForward>,
+	IAsyncHandle<ClientMessage.FilteredReadAllEventsBackward>,
+	IAsyncHandle<StorageMessage.EffectiveStreamAclRequest>,
+	IAsyncHandle<StorageMessage.StreamIdFromTransactionIdRequest>,
+	IHandle<StorageMessage.BatchLogExpiredMessages> {
+
+	private static readonly ResolvedEvent[] EmptyRecords = [];
+	private static readonly char[] LinkToSeparator = ['@'];
+
+	private readonly IReadIndex<TStreamId> _readIndex;
+	private readonly ISystemStreamLookup<TStreamId> _systemStreams;
+	private readonly IReadOnlyCheckpoint _writerCheckpoint;
+	private readonly IPublisher _publisher;
+	private readonly IInMemoryStreamReader _inMemReader;
+	private readonly int _queueId;
+	private const int MaxPageSize = 4096;
+	private DateTime? _lastExpireTime;
+	private long _expiredBatchCount;
+	private bool _batchLoggingEnabled;
+
+	public StorageReaderWorker(
+		IPublisher publisher,
+		IReadIndex<TStreamId> readIndex,
+		ISystemStreamLookup<TStreamId> systemStreams,
+		IReadOnlyCheckpoint writerCheckpoint,
+		IInMemoryStreamReader inMemReader,
+		int queueId) {
+
+		_publisher = publisher;
+		_readIndex = Ensure.NotNull(readIndex);
+		_systemStreams = Ensure.NotNull(systemStreams);
+		_writerCheckpoint = Ensure.NotNull(writerCheckpoint);
+		_inMemReader = inMemReader;
+		_queueId = queueId;
+	}
+
+	async ValueTask IAsyncHandle<ClientMessage.ReadEvent>.HandleAsync(ClientMessage.ReadEvent msg, CancellationToken token) {
+		if (msg.CancellationToken.IsCancellationRequested)
+			return;
+
+		if (msg.Expires < DateTime.UtcNow) {
+			if (LogExpiredMessage(msg.Expires))
+				Log.Debug(
+					"Read Event operation has expired for Stream: {stream}, Event Number: {eventNumber}. Operation Expired at {expiryDateTime}",
+					msg.EventStreamId, msg.EventNumber, msg.Expires);
+			return;
+		}
+
+		var cts = token.LinkTo(msg.CancellationToken);
+		try {
+			var ev = await ReadEvent(msg, token);
+			msg.Envelope.ReplyWith(ev);
+		} catch (OperationCanceledException ex) when (ex.CancellationToken == cts?.Token) {
+			throw new OperationCanceledException(null, ex, cts.CancellationOrigin);
+		} finally {
+			cts?.Dispose();
+		}
+	}
+
+	async ValueTask IAsyncHandle<ClientMessage.ReadStreamEventsForward>.HandleAsync(ClientMessage.ReadStreamEventsForward msg, CancellationToken token) {
+		if (msg.CancellationToken.IsCancellationRequested)
+			return;
+
+		if (msg.Expires < DateTime.UtcNow) {
+			if (msg.ReplyOnExpired) {
+				msg.Envelope.ReplyWith(new ClientMessage.ReadStreamEventsForwardCompleted(
+					msg.CorrelationId, msg.EventStreamId, msg.FromEventNumber, msg.MaxCount,
+					ReadStreamResult.Expired,
+					ResolvedEvent.EmptyArray, default, default, default, default, default, default, default));
+			}
+
+			if (LogExpiredMessage(msg.Expires))
+				Log.Debug(
+					"Read Stream Events Forward operation has expired for Stream: {stream}, From Event Number: {fromEventNumber}, Max Count: {maxCount}. Operation Expired at {expiryDateTime}",
+					msg.EventStreamId, msg.FromEventNumber, msg.MaxCount, msg.Expires);
+			return;
+		}
+
+		ClientMessage.ReadStreamEventsForwardCompleted res;
+		var cts = token.LinkTo(msg.CancellationToken);
+		try {
+			res = SystemStreams.IsInMemoryStream(msg.EventStreamId)
+				? _inMemReader.ReadForwards(msg)
+				: await ReadStreamEventsForward(msg, token);
+		} catch (OperationCanceledException ex) when (ex.CancellationToken == cts?.Token) {
+			throw new OperationCanceledException(null, ex, cts.CancellationOrigin);
+		} finally {
+			cts?.Dispose();
+		}
+
+		switch (res.Result) {
+			case ReadStreamResult.Success:
+			case ReadStreamResult.NoStream:
+			case ReadStreamResult.NotModified:
+				if (msg.LongPollTimeout.HasValue && res.FromEventNumber > res.LastEventNumber) {
+					_publisher.Publish(new SubscriptionMessage.PollStream(
+						msg.EventStreamId, res.TfLastCommitPosition, res.LastEventNumber,
+						DateTime.UtcNow + msg.LongPollTimeout.Value, msg));
+				} else {
+					msg.Envelope.ReplyWith(res);
+				}
+
+				break;
+			case ReadStreamResult.StreamDeleted:
+			case ReadStreamResult.Error:
+			case ReadStreamResult.AccessDenied:
+				msg.Envelope.ReplyWith(res);
+				break;
+			default:
+				throw new ArgumentOutOfRangeException(
+					$"Unknown ReadStreamResult: {res.Result}");
+		}
+	}
+
+	async ValueTask IAsyncHandle<ClientMessage.ReadStreamEventsBackward>.HandleAsync(ClientMessage.ReadStreamEventsBackward msg, CancellationToken token) {
+		if (msg.CancellationToken.IsCancellationRequested)
+			return;
+
+		if (msg.Expires < DateTime.UtcNow) {
+			if (LogExpiredMessage(msg.Expires))
+				Log.Debug(
+					"Read Stream Events Backward operation has expired for Stream: {stream}, From Event Number: {fromEventNumber}, Max Count: {maxCount}. Operation Expired at {expiryDateTime}",
+					msg.EventStreamId, msg.FromEventNumber, msg.MaxCount, msg.Expires);
+			return;
+		}
+
+		var cts = token.LinkTo(msg.CancellationToken);
+		try {
+			var res = SystemStreams.IsInMemoryStream(msg.EventStreamId)
+				? _inMemReader.ReadBackwards(msg)
+				: await ReadStreamEventsBackward(msg, token);
+
+			msg.Envelope.ReplyWith(res);
+		} catch (OperationCanceledException ex) when (ex.CancellationToken == cts?.Token) {
+			throw new OperationCanceledException(null, ex, cts.CancellationOrigin);
+		} finally {
+			cts?.Dispose();
+		}
+	}
+
+	async ValueTask IAsyncHandle<ClientMessage.ReadAllEventsForward>.HandleAsync(ClientMessage.ReadAllEventsForward msg, CancellationToken token) {
+		if (msg.CancellationToken.IsCancellationRequested)
+			return;
+
+		if (msg.Expires < DateTime.UtcNow) {
+			if (msg.ReplyOnExpired) {
+				msg.Envelope.ReplyWith(new ClientMessage.ReadAllEventsForwardCompleted(
+					msg.CorrelationId, ReadAllResult.Expired,
+					default, ResolvedEvent.EmptyArray, default, default, default,
+					currentPos: new TFPos(msg.CommitPosition, msg.PreparePosition),
+					TFPos.Invalid, TFPos.Invalid, default));
+			}
+
+			if (LogExpiredMessage(msg.Expires))
+				Log.Debug(
+					"Read All Stream Events Forward operation has expired for C:{commitPosition}/P:{preparePosition}. Operation Expired at {expiryDateTime}",
+					msg.CommitPosition, msg.PreparePosition, msg.Expires);
+			return;
+		}
+
+		var res = await ReadAllEventsForward(msg, token);
+		switch (res.Result) {
+			case ReadAllResult.Success:
+				if (msg.LongPollTimeout.HasValue && res.IsEndOfStream && res.Events.Count is 0) {
+					_publisher.Publish(new SubscriptionMessage.PollStream(
+						SubscriptionsService.AllStreamsSubscriptionId, res.TfLastCommitPosition, null,
+						DateTime.UtcNow + msg.LongPollTimeout.Value, msg));
+				} else
+					msg.Envelope.ReplyWith(res);
+
+				break;
+			case ReadAllResult.NotModified:
+				if (msg.LongPollTimeout.HasValue && res.IsEndOfStream &&
+					res.CurrentPos.CommitPosition > res.TfLastCommitPosition) {
+					_publisher.Publish(new SubscriptionMessage.PollStream(
+						SubscriptionsService.AllStreamsSubscriptionId, res.TfLastCommitPosition, null,
+						DateTime.UtcNow + msg.LongPollTimeout.Value, msg));
+				} else
+					msg.Envelope.ReplyWith(res);
+
+				break;
+			case ReadAllResult.Error:
+			case ReadAllResult.AccessDenied:
+			case ReadAllResult.InvalidPosition:
+				msg.Envelope.ReplyWith(res);
+				break;
+			default:
+				throw new ArgumentOutOfRangeException($"Unknown ReadAllResult: {res.Result}");
+		}
+	}
+
+	async ValueTask IAsyncHandle<ClientMessage.ReadAllEventsBackward>.HandleAsync(ClientMessage.ReadAllEventsBackward msg, CancellationToken token) {
+		if (msg.CancellationToken.IsCancellationRequested)
+			return;
+
+		if (msg.Expires < DateTime.UtcNow) {
+			if (LogExpiredMessage(msg.Expires))
+				Log.Debug(
+					"Read All Stream Events Backward operation has expired for C:{commitPosition}/P:{preparePosition}. Operation Expired at {expiryDateTime}",
+					msg.CommitPosition, msg.PreparePosition, msg.Expires);
+			return;
+		}
+
+		msg.Envelope.ReplyWith(await ReadAllEventsBackward(msg, token));
+	}
+
+	async ValueTask IAsyncHandle<ClientMessage.FilteredReadAllEventsForward>.HandleAsync(ClientMessage.FilteredReadAllEventsForward msg, CancellationToken token) {
+		if (msg.CancellationToken.IsCancellationRequested)
+			return;
+
+		if (msg.Expires < DateTime.UtcNow) {
+			if (msg.ReplyOnExpired) {
+				msg.Envelope.ReplyWith(new ClientMessage.FilteredReadAllEventsForwardCompleted(
+					msg.CorrelationId, FilteredReadAllResult.Expired,
+					default, ResolvedEvent.EmptyArray, default, default, default,
+					currentPos: new TFPos(msg.CommitPosition, msg.PreparePosition),
+					TFPos.Invalid, TFPos.Invalid, default, default, default));
+			}
+
+			Log.Debug(
+				"Read All Stream Events Forward Filtered operation has expired for C:{0}/P:{1}. Operation Expired at {2}",
+				msg.CommitPosition, msg.PreparePosition, msg.Expires);
+			return;
+		}
+
+		var res = await FilteredReadAllEventsForward(msg, token);
+		switch (res.Result) {
+			case FilteredReadAllResult.Success:
+				if (msg.LongPollTimeout.HasValue && res.IsEndOfStream && res.Events.Count is 0) {
+					_publisher.Publish(new SubscriptionMessage.PollStream(
+						SubscriptionsService.AllStreamsSubscriptionId, res.TfLastCommitPosition, null,
+						DateTime.UtcNow + msg.LongPollTimeout.Value, msg));
+				} else
+					msg.Envelope.ReplyWith(res);
+
+				break;
+			case FilteredReadAllResult.NotModified:
+				if (msg.LongPollTimeout.HasValue && res.IsEndOfStream && res.CurrentPos.CommitPosition > res.TfLastCommitPosition) {
+					_publisher.Publish(new SubscriptionMessage.PollStream(
+						SubscriptionsService.AllStreamsSubscriptionId, res.TfLastCommitPosition, null,
+						DateTime.UtcNow + msg.LongPollTimeout.Value, msg));
+				} else
+					msg.Envelope.ReplyWith(res);
+
+				break;
+			case FilteredReadAllResult.Error:
+			case FilteredReadAllResult.AccessDenied:
+			case FilteredReadAllResult.InvalidPosition:
+				msg.Envelope.ReplyWith(res);
+				break;
+			default:
+				throw new ArgumentOutOfRangeException($"Unknown ReadAllResult: {res.Result}");
+		}
+	}
+
+	async ValueTask IAsyncHandle<ClientMessage.FilteredReadAllEventsBackward>.HandleAsync(ClientMessage.FilteredReadAllEventsBackward msg, CancellationToken token) {
+		if (msg.CancellationToken.IsCancellationRequested)
+			return;
+
+		if (msg.Expires < DateTime.UtcNow) {
+			Log.Debug(
+				"Read All Stream Events Backward Filtered operation has expired for C:{0}/P:{1}. Operation Expired at {2}",
+				msg.CommitPosition, msg.PreparePosition, msg.Expires);
+			return;
+		}
+
+		var res = await FilteredReadAllEventsBackward(msg, token);
+		switch (res.Result) {
+			case FilteredReadAllResult.Success:
+				if (msg.LongPollTimeout.HasValue && res.IsEndOfStream && res.Events.Count is 0) {
+					_publisher.Publish(new SubscriptionMessage.PollStream(
+						SubscriptionsService.AllStreamsSubscriptionId, res.TfLastCommitPosition, null,
+						DateTime.UtcNow + msg.LongPollTimeout.Value, msg));
+				} else
+					msg.Envelope.ReplyWith(res);
+
+				break;
+			case FilteredReadAllResult.NotModified:
+				if (msg.LongPollTimeout.HasValue && res.IsEndOfStream && res.CurrentPos.CommitPosition > res.TfLastCommitPosition) {
+					_publisher.Publish(new SubscriptionMessage.PollStream(
+						SubscriptionsService.AllStreamsSubscriptionId, res.TfLastCommitPosition, null,
+						DateTime.UtcNow + msg.LongPollTimeout.Value, msg));
+				} else
+					msg.Envelope.ReplyWith(res);
+
+				break;
+			case FilteredReadAllResult.Error:
+			case FilteredReadAllResult.AccessDenied:
+			case FilteredReadAllResult.InvalidPosition:
+				msg.Envelope.ReplyWith(res);
+				break;
+			default:
+				throw new ArgumentOutOfRangeException($"Unknown ReadAllResult: {res.Result}");
+		}
+	}
+
+	async ValueTask IAsyncHandle<StorageMessage.EffectiveStreamAclRequest>.HandleAsync(StorageMessage.EffectiveStreamAclRequest msg, CancellationToken token) {
+		Message reply;
+		var cts = token.LinkTo(msg.CancellationToken);
+
+		try {
+			var acl = await _readIndex.GetEffectiveAcl(_readIndex.GetStreamId(msg.StreamId), token);
+			reply = new StorageMessage.EffectiveStreamAclResponse(acl);
+		} catch (OperationCanceledException e) when (e.CausedBy(cts, msg.CancellationToken)) {
+			reply = new StorageMessage.OperationCancelledMessage(msg.CancellationToken);
+		} catch (OperationCanceledException ex) when (ex.CancellationToken == cts?.Token) {
+			throw new OperationCanceledException(null, ex, cts.CancellationOrigin);
+		} finally {
+			cts?.Dispose();
+		}
+
+		msg.Envelope.ReplyWith(reply);
+	}
+
+	private async ValueTask<ClientMessage.ReadEventCompleted> ReadEvent(ClientMessage.ReadEvent msg, CancellationToken token) {
+		try {
+			var streamName = msg.EventStreamId;
+			var streamId = _readIndex.GetStreamId(streamName);
+			var result = await _readIndex.ReadEvent(streamName, streamId, msg.EventNumber, token);
+			var record = result.Result is ReadEventResult.Success && msg.ResolveLinkTos
+				? await ResolveLinkToEvent(result.Record, msg.User, null, token)
+				: ResolvedEvent.ForUnresolvedEvent(result.Record);
+			if (record is null)
+				return NoData(msg, ReadEventResult.AccessDenied);
+			if (result.Result is ReadEventResult.NoStream or ReadEventResult.NotFound &&
+				_systemStreams.IsMetaStream(streamId) &&
+				result.OriginalStreamExists.HasValue &&
+				result.OriginalStreamExists.Value) {
+				return NoData(msg, ReadEventResult.Success);
+			}
+
+			return new ClientMessage.ReadEventCompleted(msg.CorrelationId, msg.EventStreamId, result.Result,
+				record.Value, result.Metadata, false, null);
+		} catch (Exception exc) when (exc is not OperationCanceledException oce || oce.CancellationToken != token) {
+			Log.Error(exc, "Error during processing ReadEvent request.");
+			return NoData(msg, ReadEventResult.Error, exc.Message);
+		}
+	}
+
+	private async ValueTask<ClientMessage.ReadStreamEventsForwardCompleted> ReadStreamEventsForward(ClientMessage.ReadStreamEventsForward msg, CancellationToken token) {
+		var lastIndexPosition = _readIndex.LastIndexedPosition;
+		try {
+			if (msg.MaxCount > MaxPageSize) {
+				throw new ArgumentException($"Read size too big, should be less than {MaxPageSize} items");
+			}
+
+			var streamName = msg.EventStreamId;
+			var streamId = _readIndex.GetStreamId(msg.EventStreamId);
+			if (msg.ValidationStreamVersion.HasValue &&
+				await _readIndex.GetStreamLastEventNumber(streamId, token) == msg.ValidationStreamVersion)
+				return NoData(msg, ReadStreamResult.NotModified, lastIndexPosition,
+					msg.ValidationStreamVersion.Value);
+
+			var result =
+				await _readIndex.ReadStreamEventsForward(streamName, streamId, msg.FromEventNumber, msg.MaxCount, token);
+			CheckEventsOrder(msg, result);
+			if (await ResolveLinkToEvents(result.Records, msg.ResolveLinkTos, msg.User, token) is not { } resolvedPairs)
+				return NoData(msg, ReadStreamResult.AccessDenied, lastIndexPosition);
+
+			return new ClientMessage.ReadStreamEventsForwardCompleted(
+				msg.CorrelationId, msg.EventStreamId, msg.FromEventNumber, msg.MaxCount,
+				(ReadStreamResult)result.Result, resolvedPairs, result.Metadata, false, string.Empty,
+				result.NextEventNumber, result.LastEventNumber, result.IsEndOfStream, lastIndexPosition);
+		} catch (Exception exc) when (exc is not OperationCanceledException oce || oce.CancellationToken != token) {
+			Log.Error(exc, "Error during processing ReadStreamEventsForward request.");
+			return NoData(msg, ReadStreamResult.Error, lastIndexPosition, error: exc.Message);
+		}
+	}
+
+	private async ValueTask<ClientMessage.ReadStreamEventsBackwardCompleted> ReadStreamEventsBackward(ClientMessage.ReadStreamEventsBackward msg, CancellationToken token) {
+		var lastIndexedPosition = _readIndex.LastIndexedPosition;
+		try {
+			if (msg.MaxCount > MaxPageSize) {
+				throw new ArgumentException($"Read size too big, should be less than {MaxPageSize} items");
+			}
+
+			var streamName = msg.EventStreamId;
+			var streamId = _readIndex.GetStreamId(msg.EventStreamId);
+			if (msg.ValidationStreamVersion.HasValue &&
+				await _readIndex.GetStreamLastEventNumber(streamId, token) == msg.ValidationStreamVersion)
+				return NoData(msg, ReadStreamResult.NotModified, lastIndexedPosition,
+					msg.ValidationStreamVersion.Value);
+
+
+			var result = await _readIndex.ReadStreamEventsBackward(streamName, streamId, msg.FromEventNumber,
+				msg.MaxCount, token);
+			CheckEventsOrder(msg, result);
+			if (await ResolveLinkToEvents(result.Records, msg.ResolveLinkTos, msg.User, token) is not { } resolvedPairs)
+				return NoData(msg, ReadStreamResult.AccessDenied, lastIndexedPosition);
+
+			return new ClientMessage.ReadStreamEventsBackwardCompleted(
+				msg.CorrelationId, msg.EventStreamId, result.FromEventNumber, result.MaxCount,
+				(ReadStreamResult)result.Result, resolvedPairs, result.Metadata, false, string.Empty,
+				result.NextEventNumber, result.LastEventNumber, result.IsEndOfStream, lastIndexedPosition);
+		} catch (Exception exc) when (exc is not OperationCanceledException oce || oce.CancellationToken != token) {
+			Log.Error(exc, "Error during processing ReadStreamEventsBackward request.");
+			return NoData(msg, ReadStreamResult.Error, lastIndexedPosition, error: exc.Message);
+		}
+	}
+
+	private async ValueTask<ClientMessage.ReadAllEventsForwardCompleted> ReadAllEventsForward(ClientMessage.ReadAllEventsForward msg, CancellationToken token) {
+		var pos = new TFPos(msg.CommitPosition, msg.PreparePosition);
+		var lastIndexedPosition = _readIndex.LastIndexedPosition;
+		try {
+			if (msg.MaxCount > MaxPageSize) {
+				throw new ArgumentException($"Read size too big, should be less than {MaxPageSize} items");
+			}
+
+			if (pos == TFPos.HeadOfTf) {
+				var checkpoint = _writerCheckpoint.Read();
+				pos = new TFPos(checkpoint, checkpoint);
+			}
+
+			if (pos.CommitPosition < 0 || pos.PreparePosition < 0)
+				return NoData(msg, ReadAllResult.InvalidPosition, pos, lastIndexedPosition, "Invalid position.");
+			if (msg.ValidationTfLastCommitPosition == lastIndexedPosition)
+				return NoData(msg, ReadAllResult.NotModified, pos, lastIndexedPosition);
+
+			var res = await _readIndex.ReadAllEventsForward(pos, msg.MaxCount, token);
+			if (await ResolveReadAllResult(res.Records, msg.ResolveLinkTos, msg.User, token) is not { } resolved)
+				return NoData(msg, ReadAllResult.AccessDenied, pos, lastIndexedPosition);
+
+			var metadata = await _readIndex.GetStreamMetadata(_systemStreams.AllStream, token);
+			return new ClientMessage.ReadAllEventsForwardCompleted(
+				msg.CorrelationId, ReadAllResult.Success, null, resolved, metadata, false, msg.MaxCount,
+				res.CurrentPos, res.NextPos, res.PrevPos, lastIndexedPosition);
+		} catch (Exception exc) when (exc is InvalidReadException or UnableToReadPastEndOfStreamException) {
+			Log.Warning(exc, "Error during processing ReadAllEventsBackward request. The read appears to be at an invalid position.");
+			return NoData(msg, ReadAllResult.InvalidPosition, pos, lastIndexedPosition, exc.Message);
+		} catch (Exception exc) when (exc is not OperationCanceledException oce || oce.CancellationToken != token) {
+			Log.Error(exc, "Error during processing ReadAllEventsForward request.");
+			return NoData(msg, ReadAllResult.Error, pos, lastIndexedPosition, exc.Message);
+		}
+	}
+
+	private async ValueTask<ClientMessage.ReadAllEventsBackwardCompleted> ReadAllEventsBackward(ClientMessage.ReadAllEventsBackward msg, CancellationToken token) {
+		var pos = new TFPos(msg.CommitPosition, msg.PreparePosition);
+		var lastIndexedPosition = _readIndex.LastIndexedPosition;
+		try {
+			if (msg.MaxCount > MaxPageSize) {
+				throw new ArgumentException($"Read size too big, should be less than {MaxPageSize} items");
+			}
+
+			if (pos == TFPos.HeadOfTf) {
+				var checkpoint = _writerCheckpoint.Read();
+				pos = new TFPos(checkpoint, checkpoint);
+			}
+
+			if (pos.CommitPosition < 0 || pos.PreparePosition < 0)
+				return NoData(msg, ReadAllResult.InvalidPosition, pos, lastIndexedPosition, "Invalid position.");
+			if (msg.ValidationTfLastCommitPosition == lastIndexedPosition)
+				return NoData(msg, ReadAllResult.NotModified, pos, lastIndexedPosition);
+
+			var res = await _readIndex.ReadAllEventsBackward(pos, msg.MaxCount, token);
+			if (await ResolveReadAllResult(res.Records, msg.ResolveLinkTos, msg.User, token) is not { } resolved)
+				return NoData(msg, ReadAllResult.AccessDenied, pos, lastIndexedPosition);
+
+			var metadata = await _readIndex.GetStreamMetadata(_systemStreams.AllStream, token);
+			return new ClientMessage.ReadAllEventsBackwardCompleted(
+				msg.CorrelationId, ReadAllResult.Success, null, resolved, metadata, false, msg.MaxCount,
+				res.CurrentPos, res.NextPos, res.PrevPos, lastIndexedPosition);
+		} catch (Exception exc) when (exc is InvalidReadException or UnableToReadPastEndOfStreamException) {
+			Log.Warning(exc, "Error during processing ReadAllEventsBackward request. The read appears to be at an invalid position.");
+			return NoData(msg, ReadAllResult.InvalidPosition, pos, lastIndexedPosition, exc.Message);
+		} catch (Exception exc) when (exc is not OperationCanceledException oce || oce.CancellationToken != token) {
+			Log.Error(exc, "Error during processing ReadAllEventsBackward request.");
+			return NoData(msg, ReadAllResult.Error, pos, lastIndexedPosition, exc.Message);
+		}
+	}
+
+	private async ValueTask<ClientMessage.FilteredReadAllEventsForwardCompleted> FilteredReadAllEventsForward(ClientMessage.FilteredReadAllEventsForward msg, CancellationToken token) {
+		var pos = new TFPos(msg.CommitPosition, msg.PreparePosition);
+		var lastIndexedPosition = _readIndex.LastIndexedPosition;
+		try {
+			if (msg.MaxCount > MaxPageSize) {
+				throw new ArgumentException($"Read size too big, should be less than {MaxPageSize} items");
+			}
+
+			if (pos == TFPos.HeadOfTf) {
+				var checkpoint = _writerCheckpoint.Read();
+				pos = new TFPos(checkpoint, checkpoint);
+			}
+
+			if (pos.CommitPosition < 0 || pos.PreparePosition < 0)
+				return NoDataForFilteredCommand(msg, FilteredReadAllResult.InvalidPosition, pos, lastIndexedPosition,
+					"Invalid position.");
+			if (msg.ValidationTfLastCommitPosition == lastIndexedPosition)
+				return NoDataForFilteredCommand(msg, FilteredReadAllResult.NotModified, pos,
+					lastIndexedPosition);
+
+			var res = await _readIndex.ReadAllEventsForwardFiltered(pos, msg.MaxCount, msg.MaxSearchWindow,
+				msg.EventFilter, token);
+			if (await ResolveReadAllResult(res.Records, msg.ResolveLinkTos, msg.User, token) is not { } resolved)
+				return NoDataForFilteredCommand(msg, FilteredReadAllResult.AccessDenied, pos,
+					lastIndexedPosition);
+
+			var metadata = await _readIndex.GetStreamMetadata(_systemStreams.AllStream, token);
+			return new ClientMessage.FilteredReadAllEventsForwardCompleted(
+				msg.CorrelationId, FilteredReadAllResult.Success, null, resolved, metadata, false,
+				msg.MaxCount,
+				res.CurrentPos, res.NextPos, res.PrevPos, lastIndexedPosition, res.IsEndOfStream,
+				res.ConsideredEventsCount);
+		} catch (Exception exc) when (exc is InvalidReadException or UnableToReadPastEndOfStreamException) {
+			Log.Warning(exc, "Error during processing ReadAllEventsForwardFiltered request. The read appears to be at an invalid position.");
+			return NoDataForFilteredCommand(msg, FilteredReadAllResult.InvalidPosition, pos, lastIndexedPosition, exc.Message);
+		} catch (Exception exc) when (exc is not OperationCanceledException oce || oce.CancellationToken != token) {
+			Log.Error(exc, "Error during processing ReadAllEventsForwardFiltered request.");
+			return NoDataForFilteredCommand(msg, FilteredReadAllResult.Error, pos, lastIndexedPosition,
+				exc.Message);
+		}
+	}
+
+	private async ValueTask<ClientMessage.FilteredReadAllEventsBackwardCompleted> FilteredReadAllEventsBackward(ClientMessage.FilteredReadAllEventsBackward msg, CancellationToken token) {
+		var pos = new TFPos(msg.CommitPosition, msg.PreparePosition);
+		var lastIndexedPosition = _readIndex.LastIndexedPosition;
+		try {
+			if (msg.MaxCount > MaxPageSize) {
+				throw new ArgumentException($"Read size too big, should be less than {MaxPageSize} items");
+			}
+
+			if (pos == TFPos.HeadOfTf) {
+				var checkpoint = _writerCheckpoint.Read();
+				pos = new TFPos(checkpoint, checkpoint);
+			}
+
+			if (pos.CommitPosition < 0 || pos.PreparePosition < 0)
+				return NoDataForFilteredCommand(msg, FilteredReadAllResult.InvalidPosition, pos, lastIndexedPosition,
+					"Invalid position.");
+			if (msg.ValidationTfLastCommitPosition == lastIndexedPosition)
+				return NoDataForFilteredCommand(msg, FilteredReadAllResult.NotModified, pos,
+					lastIndexedPosition);
+
+			var res = await _readIndex.ReadAllEventsBackwardFiltered(pos, msg.MaxCount, msg.MaxSearchWindow,
+				msg.EventFilter, token);
+			if (await ResolveReadAllResult(res.Records, msg.ResolveLinkTos, msg.User, token) is not { } resolved)
+				return NoDataForFilteredCommand(msg, FilteredReadAllResult.AccessDenied, pos,
+					lastIndexedPosition);
+
+			var metadata = await _readIndex.GetStreamMetadata(_systemStreams.AllStream, token);
+			return new ClientMessage.FilteredReadAllEventsBackwardCompleted(
+				msg.CorrelationId, FilteredReadAllResult.Success, null, resolved, metadata, false,
+				msg.MaxCount,
+				res.CurrentPos, res.NextPos, res.PrevPos, lastIndexedPosition, res.IsEndOfStream);
+		} catch (Exception exc) when (exc is InvalidReadException or UnableToReadPastEndOfStreamException) {
+			Log.Warning(exc, "Error during processing ReadAllEventsBackwardFiltered request. The read appears to be at an invalid position.");
+			return NoDataForFilteredCommand(msg, FilteredReadAllResult.InvalidPosition, pos, lastIndexedPosition, exc.Message);
+		} catch (Exception exc) when (exc is not OperationCanceledException oce || oce.CancellationToken != token) {
+			Log.Error(exc, "Error during processing ReadAllEventsBackwardFiltered request.");
+			return NoDataForFilteredCommand(msg, FilteredReadAllResult.Error, pos, lastIndexedPosition,
+				exc.Message);
+		}
+	}
+
+	private static ClientMessage.ReadEventCompleted NoData(ClientMessage.ReadEvent msg, ReadEventResult result, string error = null) {
+		return new(msg.CorrelationId, msg.EventStreamId, result, ResolvedEvent.EmptyEvent, null, false, error);
+	}
+
+	private static ClientMessage.ReadStreamEventsForwardCompleted NoData(ClientMessage.ReadStreamEventsForward msg,
+		ReadStreamResult result, long lastIndexedPosition, long lastEventNumber = -1, string error = null) {
+		return new(
+			msg.CorrelationId, msg.EventStreamId, msg.FromEventNumber, msg.MaxCount, result,
+			EmptyRecords, null, false, error ?? string.Empty, -1, lastEventNumber, true, lastIndexedPosition);
+	}
+
+	private static ClientMessage.ReadStreamEventsBackwardCompleted NoData(ClientMessage.ReadStreamEventsBackward msg, ReadStreamResult result, long lastIndexedPosition,
+		long lastEventNumber = -1, string error = null) {
+		return new(
+			msg.CorrelationId, msg.EventStreamId, msg.FromEventNumber, msg.MaxCount, result,
+			EmptyRecords, null, false, error ?? string.Empty, -1, lastEventNumber, true, lastIndexedPosition);
+	}
+
+	private static ClientMessage.ReadAllEventsForwardCompleted NoData(ClientMessage.ReadAllEventsForward msg,
+		ReadAllResult result, TFPos pos, long lastIndexedPosition, string error = null) {
+		return new(
+			msg.CorrelationId, result, error, ResolvedEvent.EmptyArray, null, false,
+			msg.MaxCount, pos, TFPos.Invalid, TFPos.Invalid, lastIndexedPosition);
+	}
+
+	private static ClientMessage.FilteredReadAllEventsForwardCompleted NoDataForFilteredCommand(
+		ClientMessage.FilteredReadAllEventsForward msg, FilteredReadAllResult result, TFPos pos,
+		long lastIndexedPosition, string error = null) {
+		return new(
+			msg.CorrelationId, result, error, ResolvedEvent.EmptyArray, null, false,
+			msg.MaxCount, pos, TFPos.Invalid, TFPos.Invalid, lastIndexedPosition, false, 0L);
+	}
+
+	private static ClientMessage.FilteredReadAllEventsBackwardCompleted NoDataForFilteredCommand(
+		ClientMessage.FilteredReadAllEventsBackward msg, FilteredReadAllResult result, TFPos pos,
+		long lastIndexedPosition, string error = null) {
+		return new(
+			msg.CorrelationId, result, error, ResolvedEvent.EmptyArray, null, false,
+			msg.MaxCount, pos, TFPos.Invalid, TFPos.Invalid, lastIndexedPosition, false);
+	}
+
+	private static ClientMessage.ReadAllEventsBackwardCompleted NoData(ClientMessage.ReadAllEventsBackward msg,
+		ReadAllResult result, TFPos pos, long lastIndexedPosition, string error = null) {
+		return new(
+			msg.CorrelationId, result, error, ResolvedEvent.EmptyArray, null, false,
+			msg.MaxCount, pos, TFPos.Invalid, TFPos.Invalid, lastIndexedPosition);
+	}
+
+	private static void CheckEventsOrder(ClientMessage.ReadStreamEventsForward msg, IndexReadStreamResult result) {
+		for (var index = 1; index < result.Records.Length; index++) {
+			if (result.Records[index].EventNumber != result.Records[index - 1].EventNumber + 1) {
+				throw new Exception(
+					$"Invalid order of events has been detected in read index for the event stream '{msg.EventStreamId}'. " +
+					$"The event {result.Records[index].EventNumber} at position {result.Records[index].LogPosition} goes after the event {result.Records[index - 1].EventNumber} at position {result.Records[index - 1].LogPosition}");
+			}
+		}
+	}
+
+	private static void CheckEventsOrder(ClientMessage.ReadStreamEventsBackward msg, IndexReadStreamResult result) {
+		for (var index = 1; index < result.Records.Length; index++) {
+			if (result.Records[index].EventNumber != result.Records[index - 1].EventNumber - 1) {
+				throw new Exception(
+					$"Invalid order of events has been detected in read index for the event stream '{msg.EventStreamId}'. " +
+					$"The event {result.Records[index].EventNumber} at position {result.Records[index].LogPosition} goes after the event {result.Records[index - 1].EventNumber} at position {result.Records[index - 1].LogPosition}");
+			}
+		}
+	}
+
+	private async ValueTask<IReadOnlyList<ResolvedEvent>> ResolveLinkToEvents(IReadOnlyList<EventRecord> records, bool resolveLinks, ClaimsPrincipal user, CancellationToken token) {
+		var resolved = new ResolvedEvent[records.Count];
+		if (resolveLinks) {
+			for (var i = 0; i < records.Count; i++) {
+				if (await ResolveLinkToEvent(records[i], user, null, token) is not { } rec)
+					return null;
+
+				resolved[i] = rec;
+			}
+		} else {
+			for (int i = 0; i < records.Count; ++i) {
+				resolved[i] = ResolvedEvent.ForUnresolvedEvent(records[i]);
+			}
+		}
+
+		return resolved;
+	}
+
+	private async ValueTask<ResolvedEvent?> ResolveLinkToEvent(EventRecord eventRecord, ClaimsPrincipal user, long? commitPosition, CancellationToken token) {
+		if (eventRecord.EventType is not SystemEventTypes.LinkTo) {
+			return ResolvedEvent.ForUnresolvedEvent(eventRecord, commitPosition);
+		}
+
+		try {
+			var linkPayload = Helper.UTF8NoBom.GetString(eventRecord.Data.Span);
+			var parts = linkPayload.Split(LinkToSeparator, 2);
+			if (long.TryParse(parts[0], out long eventNumber)) {
+				var streamName = parts[1];
+				var streamId = _readIndex.GetStreamId(streamName);
+				var res = await _readIndex.ReadEvent(streamName, streamId, eventNumber, token);
+				return res.Result is ReadEventResult.Success
+					? ResolvedEvent.ForResolvedLink(res.Record, eventRecord, commitPosition)
+					: ResolvedEvent.ForFailedResolvedLink(eventRecord, res.Result, commitPosition);
+			}
+
+			Log.Warning($"Invalid link event payload [{linkPayload}]: {eventRecord}");
+			return ResolvedEvent.ForUnresolvedEvent(eventRecord, commitPosition);
+		} catch (Exception exc) when (exc is not OperationCanceledException oce || oce.CancellationToken != token) {
+			Log.Error(exc, "Error while resolving link for event record: {eventRecord}", eventRecord.ToString());
+		}
+
+		// return unresolved link
+		return ResolvedEvent.ForFailedResolvedLink(eventRecord, ReadEventResult.Error, commitPosition);
+	}
+
+	private async ValueTask<IReadOnlyList<ResolvedEvent>> ResolveReadAllResult(List<CommitEventRecord> records, bool resolveLinks,
+		ClaimsPrincipal user, CancellationToken token) {
+		var result = new ResolvedEvent[records.Count];
+		if (resolveLinks) {
+			for (var i = 0; i < result.Length; ++i) {
+				var record = records[i];
+				if (await ResolveLinkToEvent(record.Event, user, record.CommitPosition, token) is not { } resolvedPair)
+					return null;
+				result[i] = resolvedPair;
+			}
+		} else {
+			for (var i = 0; i < result.Length; ++i) {
+				result[i] = ResolvedEvent.ForUnresolvedEvent(records[i].Event, records[i].CommitPosition);
+			}
+		}
+
+		return result;
+	}
+
+	public void Handle(StorageMessage.BatchLogExpiredMessages message) {
+		if (!_batchLoggingEnabled)
+			return;
+		if (_expiredBatchCount == 0) {
+			_batchLoggingEnabled = false;
+			Log.Warning("StorageReaderWorker #{0}: Batch logging disabled, read load is back to normal", _queueId);
+			return;
+		}
+
+		Log.Warning("StorageReaderWorker #{0}: {1} read operations have expired", _queueId, _expiredBatchCount);
+		_expiredBatchCount = 0;
+		_publisher.Publish(
+			TimerMessage.Schedule.Create(TimeSpan.FromSeconds(2),
+				_publisher,
+				new StorageMessage.BatchLogExpiredMessages(Guid.NewGuid(), _queueId))
+		);
+	}
+
+	private bool LogExpiredMessage(DateTime expire) {
+		if (!_lastExpireTime.HasValue) {
+			_expiredBatchCount = 1;
+			_lastExpireTime = expire;
+			return true;
+		}
+
+		if (_batchLoggingEnabled) {
+			_expiredBatchCount++;
+			_lastExpireTime = expire;
+			return false;
+		}
+
+		_expiredBatchCount++;
+		if (_expiredBatchCount < 50)
+			return true;
+
+		if (expire - _lastExpireTime.Value > TimeSpan.FromSeconds(1)) {
+			_expiredBatchCount = 1;
+			_lastExpireTime = expire;
+
+			return true;
+		}
+
+		//heuristic to match approximately >= 50 expired messages / second
+		_batchLoggingEnabled = true;
+		Log.Warning("StorageReaderWorker #{0}: Batch logging enabled, high rate of expired read messages detected", _queueId);
+		_publisher.Publish(
+			TimerMessage.Schedule.Create(TimeSpan.FromSeconds(2),
+				_publisher,
+				new StorageMessage.BatchLogExpiredMessages(Guid.NewGuid(), _queueId))
+		);
+		_expiredBatchCount = 1;
+		_lastExpireTime = expire;
+		return false;
+	}
+
+	async ValueTask IAsyncHandle<StorageMessage.StreamIdFromTransactionIdRequest>.HandleAsync(StorageMessage.StreamIdFromTransactionIdRequest message, CancellationToken token) {
+		var cts = token.LinkTo(message.CancellationToken);
+		Message reply;
+		try {
+			var streamId = await _readIndex.GetEventStreamIdByTransactionId(message.TransactionId, token);
+			var streamName = await _readIndex.GetStreamName(streamId, token);
+			reply = new StorageMessage.StreamIdFromTransactionIdResponse(streamName);
+		} catch (OperationCanceledException ex) when (ex.CausedBy(cts, message.CancellationToken)) {
+			reply = new StorageMessage.OperationCancelledMessage(message.CancellationToken);
+		} catch (OperationCanceledException ex) when (ex.CancellationToken == cts?.Token) {
+			throw new OperationCanceledException(null, ex, cts.CancellationOrigin);
+		} finally {
+			cts?.Dispose();
+		}
+
+		message.Envelope.ReplyWith(reply);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Storage/StorageScavenger.cs b/src/KurrentDB.Core/Services/Storage/StorageScavenger.cs
new file mode 100644
index 00000000000..8e753c13852
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/StorageScavenger.cs
@@ -0,0 +1,211 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Synchronization;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Serilog;
+
+namespace KurrentDB.Core.Services.Storage;
+
+// This tracks the current scavenge and starts/stops/creates it according to the client instructions
+// It works for both old and new scavenge, determined by ScavengerFactory
+public class StorageScavenger :
+	IHandle<ClientMessage.ScavengeDatabase>,
+	IHandle<ClientMessage.StopDatabaseScavenge>,
+	IHandle<ClientMessage.GetCurrentDatabaseScavenge>,
+	IHandle<ClientMessage.GetLastDatabaseScavenge>,
+	IHandle<SystemMessage.StateChangeMessage> {
+
+	protected static ILogger Log { get; } = Serilog.Log.ForContext<StorageScavenger>();
+	private readonly ITFChunkScavengerLogManager _logManager;
+	private readonly ScavengerFactory _scavengerFactory;
+	private readonly SemaphoreSlimLock _switchChunksLock;
+	private Guid _switchChunksLockId = Guid.Empty;
+	private readonly object _lock = new object();
+
+	private IScavenger _currentScavenge;
+
+	// invariant: _currentScavenge is not null => _currentScavengeTask is the task of the current scavenge
+	private Task<ScavengeResult> _currentScavengeTask;
+	private CancellationTokenSource _cancellationTokenSource;
+
+	private string _lastScavengeId;
+	private LastScavengeResult _lastScavengeResult = LastScavengeResult.Unknown;
+
+	public StorageScavenger(
+		ITFChunkScavengerLogManager logManager,
+		ScavengerFactory scavengerFactory,
+		SemaphoreSlimLock switchChunksLock) {
+
+		_logManager = Ensure.NotNull(logManager);
+		_scavengerFactory = Ensure.NotNull(scavengerFactory);
+		_switchChunksLock = Ensure.NotNull(switchChunksLock);
+	}
+
+	public void Handle(SystemMessage.StateChangeMessage message) {
+		if (message.State == VNodeState.Leader || message.State == VNodeState.Follower) {
+			_logManager.Initialise();
+		}
+	}
+
+	public void Handle(ClientMessage.ScavengeDatabase message) {
+		if (!IsAllowed(message.User, message.CorrelationId, message.Envelope)) {
+			return;
+		}
+
+		lock (_lock) {
+			if (_currentScavenge != null) {
+				message.Envelope.ReplyWith(new ClientMessage.ScavengeDatabaseInProgressResponse(
+					message.CorrelationId,
+					_currentScavenge.ScavengeId,
+					"Scavenge is already running"));
+			} else if (!_switchChunksLock.TryAcquire(out _switchChunksLockId)) {
+				Log.Information("SCAVENGING: Failed to acquire the chunks lock");
+				message.Envelope.ReplyWith(new ClientMessage.ScavengeDatabaseInProgressResponse(
+					message.CorrelationId,
+					Guid.Empty.ToString(),
+					"Failed to acquire the chunk switch lock"));
+			} else {
+				Log.Information("SCAVENGING: Acquired the chunks lock");
+				var tfChunkScavengerLog = _logManager.CreateLog();
+				var logger = Log.ForContext("ScavengeId", tfChunkScavengerLog.ScavengeId);
+
+				_cancellationTokenSource = new();
+
+				_currentScavenge = _scavengerFactory.Create(message, tfChunkScavengerLog, logger);
+				_currentScavengeTask = _currentScavenge.ScavengeAsync(_cancellationTokenSource.Token);
+				_lastScavengeId = _currentScavenge.ScavengeId;
+				_lastScavengeResult = LastScavengeResult.InProgress;
+
+				HandleCleanupWhenFinished(_currentScavengeTask, _currentScavenge, logger);
+
+				message.Envelope.ReplyWith(new ClientMessage.ScavengeDatabaseStartedResponse(message.CorrelationId, tfChunkScavengerLog.ScavengeId));
+			}
+		}
+	}
+
+	public void Handle(ClientMessage.StopDatabaseScavenge message) {
+		if (!IsAllowed(message.User, message.CorrelationId, message.Envelope)) {
+			return;
+		}
+
+		lock (_lock) {
+			if (_currentScavenge != null &&
+				(_currentScavenge.ScavengeId == message.ScavengeId || message.ScavengeId == "current")) {
+				_cancellationTokenSource.Cancel();
+
+				_currentScavengeTask.ContinueWith(_ => {
+					message.Envelope.ReplyWith(new ClientMessage.ScavengeDatabaseStoppedResponse(message.CorrelationId, _currentScavenge.ScavengeId));
+				});
+			} else {
+				message.Envelope.ReplyWith(new ClientMessage.ScavengeDatabaseNotFoundResponse(message.CorrelationId, _currentScavenge?.ScavengeId, "Scavenge Id does not exist"));
+			}
+		}
+	}
+
+	public void Handle(ClientMessage.GetCurrentDatabaseScavenge message) {
+		if (!IsAllowed(message.User, message.CorrelationId, message.Envelope)) {
+			return;
+		}
+
+		lock (_lock) {
+			if (_currentScavenge != null) {
+				message.Envelope.ReplyWith(new ClientMessage.ScavengeDatabaseGetCurrentResponse(
+					message.CorrelationId,
+					ClientMessage.ScavengeDatabaseGetCurrentResponse.ScavengeResult.InProgress,
+					_currentScavenge.ScavengeId));
+			} else {
+				message.Envelope.ReplyWith(new ClientMessage.ScavengeDatabaseGetCurrentResponse(
+					message.CorrelationId, ClientMessage.ScavengeDatabaseGetCurrentResponse.ScavengeResult.Stopped, scavengeId: null));
+			}
+		}
+	}
+
+	public void Handle(ClientMessage.GetLastDatabaseScavenge message) {
+		if (!IsAllowed(message.User, message.CorrelationId, message.Envelope)) {
+			return;
+		}
+
+		lock (_lock) {
+			var response = new ClientMessage.ScavengeDatabaseGetLastResponse(
+				message.CorrelationId,
+				_lastScavengeResult switch {
+					LastScavengeResult.Unknown => ClientMessage.ScavengeDatabaseGetLastResponse.ScavengeResult.Unknown,
+					LastScavengeResult.Success => ClientMessage.ScavengeDatabaseGetLastResponse.ScavengeResult.Success,
+					LastScavengeResult.Errored => ClientMessage.ScavengeDatabaseGetLastResponse.ScavengeResult.Errored,
+					LastScavengeResult.Stopped => ClientMessage.ScavengeDatabaseGetLastResponse.ScavengeResult.Stopped,
+					LastScavengeResult.InProgress => ClientMessage.ScavengeDatabaseGetLastResponse.ScavengeResult.InProgress,
+					_ => throw new ArgumentOutOfRangeException(nameof(_lastScavengeResult))
+				},
+				_lastScavengeId);
+
+			message.Envelope.ReplyWith(response);
+		}
+	}
+
+	private async void HandleCleanupWhenFinished(Task<ScavengeResult> newScavengeTask, IScavenger newScavenge, ILogger logger) {
+		// Clean up the reference to the TfChunkScavenger once it's finished.
+		try {
+			var result = await newScavengeTask;
+
+			lock (_lock) {
+				_lastScavengeResult = result switch {
+					ScavengeResult.Success => LastScavengeResult.Success,
+					ScavengeResult.Errored => LastScavengeResult.Errored,
+					ScavengeResult.Stopped => LastScavengeResult.Stopped,
+					_ => throw new ArgumentOutOfRangeException(nameof(result))
+				};
+			}
+		} catch (Exception ex) {
+			logger.Error(ex, "SCAVENGING: Unexpected error when scavenging");
+
+			lock (_lock) {
+				_lastScavengeResult = LastScavengeResult.Errored;
+			}
+		} finally {
+			try {
+				newScavenge.Dispose();
+			} catch (Exception ex) {
+				logger.Error(ex, "SCAVENGING: Unexpected error when disposing the scavenger");
+			}
+		}
+
+		Guid switchChunksLockId;
+		lock (_lock) {
+			switchChunksLockId = _switchChunksLockId;
+		}
+
+		try {
+			logger.Information(_switchChunksLock.TryRelease(switchChunksLockId)
+				? "SCAVENGING: Released the chunks lock"
+				: "SCAVENGING: Failed to release the chunks lock");
+		} catch (Exception ex) {
+			logger.Error(ex, "SCAVENGING: Unexpected error when releasing the chunks lock");
+		}
+
+		lock (_lock) {
+			if (newScavenge == _currentScavenge) {
+				_currentScavenge = null;
+			}
+		}
+	}
+
+	private static bool IsAllowed(ClaimsPrincipal user, Guid correlationId, IEnvelope envelope) {
+		if (user != null && (user.LegacyRoleCheck(SystemRoles.Admins) || user.LegacyRoleCheck(SystemRoles.Operations))) {
+			return true;
+		}
+
+		envelope.ReplyWith(new ClientMessage.ScavengeDatabaseUnauthorizedResponse(correlationId, null, "User not authorized"));
+		return false;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Storage/StorageWriterService.cs b/src/KurrentDB.Core/Services/Storage/StorageWriterService.cs
new file mode 100644
index 00000000000..5633437346d
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Storage/StorageWriterService.cs
@@ -0,0 +1,867 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.Monitoring.Stats;
+using KurrentDB.Core.Services.Storage.EpochManager;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Time;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using ILogger = Serilog.ILogger;
+
+// ReSharper disable StaticMemberInGenericType
+
+namespace KurrentDB.Core.Services.Storage;
+
+public abstract class StorageWriterService;
+
+// StorageWriterService has its own queue. Messages are handled on that queue atomically, any exception
+// will shut down the server.
+//
+// The service ensures that the CancellationToken passed into the handlers is only cancelled
+// when the server is being shutdown.
+//
+// The handlers can therefore treat the CancellationToken argument as normal - throwing if it is
+// cancelled and passing it on to other methods. (They still should not throw due to cancellation
+// during atomic sequences - also per normal best practices).
+//
+// Some messages have a CancellationToken associated with the client operation. If this is cancelled
+// the handler must not throw. Instead it can ignore the message.
+public class StorageWriterService<TStreamId> : IHandle<SystemMessage.SystemInit>,
+	IAsyncHandle<SystemMessage.StateChangeMessage>,
+	IAsyncHandle<SystemMessage.WriteEpoch>,
+	IAsyncHandle<SystemMessage.WaitForChaserToCatchUp>,
+	IAsyncHandle<StorageMessage.WritePrepares>,
+	IAsyncHandle<StorageMessage.WriteDelete>,
+	IAsyncHandle<StorageMessage.WriteTransactionStart>,
+	IAsyncHandle<StorageMessage.WriteTransactionData>,
+	IAsyncHandle<StorageMessage.WriteTransactionEnd>,
+	IAsyncHandle<StorageMessage.WriteCommit>,
+	IHandle<MonitoringMessage.InternalStatsRequest> {
+	private static readonly ILogger Log = Serilog.Log.ForContext<StorageWriterService>();
+	private static EqualityComparer<TStreamId> StreamIdComparer { get; } = EqualityComparer<TStreamId>.Default;
+
+	private static readonly int TicksPerMs = (int)(Stopwatch.Frequency / 1000);
+	private static readonly TimeSpan WaitForChaserSingleIterationTimeout = TimeSpan.FromMilliseconds(200);
+
+	protected readonly TFChunkDb Db;
+	protected readonly TFChunkWriter Writer;
+	private readonly IIndexWriter<TStreamId> _indexWriter;
+	private readonly IRecordFactory<TStreamId> _recordFactory;
+	private readonly INameIndex<TStreamId> _streamNameIndex;
+	private readonly INameIndex<TStreamId> _eventTypeIndex;
+	private readonly ISystemStreamLookup<TStreamId> _systemStreams;
+	private readonly IMaxTracker<long> _flushSizeTracker;
+	private readonly IDurationMaxTracker _flushDurationTracker;
+
+	protected readonly IEpochManager EpochManager;
+	protected readonly IPublisher Bus;
+	private readonly ISubscriber _subscribeToBus;
+	private readonly QueuedHandlerThreadPool _writerQueue;
+	private readonly InMemoryBus _writerBus;
+
+	private readonly Clock _clock = Clock.Instance;
+	private readonly double _minFlushDelay;
+	private long _lastFlushDelay;
+	private Instant _lastFlushTimestamp;
+
+	protected int FlushMessagesInQueue;
+	private VNodeState _vnodeState = VNodeState.Initializing;
+	protected bool BlockWriter = false;
+
+	private const int LastStatsCount = 1024;
+	private readonly long[] _lastFlushDelays = new long[LastStatsCount];
+	private readonly long[] _lastFlushSizes = new long[LastStatsCount];
+	private int _statIndex;
+	private int _statCount;
+	private long _sumFlushDelay;
+	private long _sumFlushSize;
+	private long _lastFlushSize;
+	private long _maxFlushSize;
+	private long _maxFlushDelay;
+	private readonly TStreamId _emptyEventTypeId;
+	private readonly TStreamId _scavengePointsStreamId;
+	private readonly TStreamId _scavengePointEventTypeId;
+
+	public StorageWriterService(IPublisher bus,
+		ISubscriber subscribeToBus,
+		TimeSpan minFlushDelay,
+		TFChunkDb db,
+		TFChunkWriter writer,
+		IIndexWriter<TStreamId> indexWriter,
+		IRecordFactory<TStreamId> recordFactory,
+		INameIndex<TStreamId> streamNameIndex,
+		INameIndex<TStreamId> eventTypeIndex,
+		TStreamId emptyEventTypeId,
+		ISystemStreamLookup<TStreamId> systemStreams,
+		IEpochManager epochManager,
+		QueueStatsManager queueStatsManager,
+		QueueTrackers queueTrackers,
+		IMaxTracker<long> flushSizeTracker,
+		IDurationMaxTracker flushDurationTracker) {
+		Bus = Ensure.NotNull(bus);
+		_subscribeToBus = Ensure.NotNull(subscribeToBus);
+		Db = Ensure.NotNull(db);
+		_indexWriter = Ensure.NotNull(indexWriter);
+		_recordFactory = Ensure.NotNull(recordFactory);
+		_streamNameIndex = Ensure.NotNull(streamNameIndex);
+		_eventTypeIndex = Ensure.NotNull(eventTypeIndex);
+		_systemStreams = Ensure.NotNull(systemStreams);
+		_emptyEventTypeId = emptyEventTypeId;
+		EpochManager = Ensure.NotNull(epochManager);
+		_flushDurationTracker = flushDurationTracker;
+		_flushSizeTracker = flushSizeTracker;
+		_scavengePointsStreamId = _streamNameIndex.GetExisting(SystemStreams.ScavengePointsStream);
+		_scavengePointEventTypeId = _eventTypeIndex.GetExisting(SystemEventTypes.ScavengePoint);
+
+		_minFlushDelay = minFlushDelay.TotalMilliseconds * TicksPerMs;
+		_lastFlushDelay = 0;
+		_lastFlushTimestamp = _clock.Now;
+
+		Writer = Ensure.NotNull(writer);
+
+		_writerBus = new("StorageWriterBus", watchSlowMsg: false);
+		_writerQueue = new(new AdHocHandler<Message>(CommonHandle),
+			"StorageWriterQueue",
+			queueStatsManager,
+			queueTrackers,
+			true,
+			TimeSpan.FromMilliseconds(500));
+
+		SubscribeToMessage<SystemMessage.SystemInit>();
+		SubscribeToMessage<SystemMessage.StateChangeMessage>();
+		SubscribeToMessage<SystemMessage.WriteEpoch>();
+		SubscribeToMessage<SystemMessage.WaitForChaserToCatchUp>();
+		SubscribeToMessage<StorageMessage.WritePrepares>();
+		SubscribeToMessage<StorageMessage.WriteDelete>();
+		SubscribeToMessage<StorageMessage.WriteTransactionStart>();
+		SubscribeToMessage<StorageMessage.WriteTransactionData>();
+		SubscribeToMessage<StorageMessage.WriteTransactionEnd>();
+		SubscribeToMessage<StorageMessage.WriteCommit>();
+	}
+
+	public async ValueTask Start(CancellationToken token) {
+		await Writer.Open(token);
+		_writerQueue.Start();
+	}
+
+	protected void SubscribeToMessage<T>() where T : Message {
+		_writerBus.Subscribe((IAsyncHandle<T>)this);
+		_subscribeToBus.Subscribe<T>(new AdHocHandler<Message>(EnqueueMessage));
+	}
+
+	private void EnqueueMessage(Message message) {
+		if (message is StorageMessage.IFlushableMessage)
+			Interlocked.Increment(ref FlushMessagesInQueue);
+
+		_writerQueue.Publish(message);
+	}
+
+	private async ValueTask CommonHandle(Message message, CancellationToken token) {
+		if (BlockWriter && message is not SystemMessage.StateChangeMessage) {
+			Log.Verbose("Blocking message {message} in StorageWriterService. Message:", message.GetType().Name);
+			Log.Verbose("{message}", message);
+			return;
+		}
+
+		if (_vnodeState is not VNodeState.Leader and not VNodeState.ResigningLeader && message is StorageMessage.ILeaderWriteMessage) {
+			Log.Fatal("{message} appeared in StorageWriter during state {vnodeStrate}.", message.GetType().Name, _vnodeState);
+			var msg = $"{message.GetType().Name} appeared in StorageWriter during state {_vnodeState}.";
+			Application.Exit(ExitCode.Error, msg);
+			return;
+		}
+
+		try {
+			await _writerBus.DispatchAsync(message, token);
+		} catch (Exception exc) {
+			// any exception, including the token being cancelled, terminates the process, because
+			// the message processing is atomic.
+			BlockWriter = true;
+			Log.Fatal(exc, "Unexpected error in StorageWriterService. Terminating the process...");
+			Application.Exit(ExitCode.Error, $"Unexpected error in StorageWriterService: {exc.Message}");
+		}
+	}
+
+	void IHandle<SystemMessage.SystemInit>.Handle(SystemMessage.SystemInit message) {
+		Bus.Publish(new SystemMessage.ServiceInitialized(nameof(StorageWriterService)));
+	}
+
+	public virtual async ValueTask HandleAsync(SystemMessage.StateChangeMessage message, CancellationToken token) {
+		_vnodeState = message.State;
+
+		switch (message.State) {
+			case VNodeState.Leader: {
+				_indexWriter.Reset();
+				_streamNameIndex.CancelReservations();
+				_eventTypeIndex.CancelReservations();
+				break;
+			}
+			case VNodeState.ShuttingDown: {
+				await Writer.Flush(token);
+				BlockWriter = true;
+				_writerQueue.Stop().GetAwaiter().OnCompleted(Bus.PublishStorageWriterShutdown);
+				break;
+			}
+		}
+	}
+
+	async ValueTask IAsyncHandle<SystemMessage.WriteEpoch>.HandleAsync(SystemMessage.WriteEpoch message, CancellationToken token) {
+		if (_vnodeState is not VNodeState.Leader and not VNodeState.PreLeader)
+			throw new Exception($"New Epoch request not in leader or preleader state. State: {_vnodeState}.");
+
+		if (Writer.NeedsNewChunk)
+			await Writer.AddNewChunk(token: token);
+
+		await EpochManager.WriteNewEpoch(message.EpochNumber, token);
+		PurgeNotProcessedInfo();
+	}
+
+	async ValueTask IAsyncHandle<SystemMessage.WaitForChaserToCatchUp>.HandleAsync(SystemMessage.WaitForChaserToCatchUp message, CancellationToken token) {
+		// if we are in states, that doesn't need to wait for chaser, ignore
+		if (_vnodeState is not VNodeState.PreLeader
+					   and not VNodeState.PreReplica
+					   and not VNodeState.PreReadOnlyReplica)
+			throw new Exception($"{message.GetType().Name} appeared in {_vnodeState} state.");
+
+		if (Writer.HasOpenTransaction())
+			throw new InvalidOperationException("Writer has an open transaction.");
+
+		if (Writer.FlushedPosition != Writer.Position) {
+			await Writer.Flush(token);
+			Bus.Publish(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		}
+
+		var sw = Stopwatch.StartNew();
+		while (Db.Config.ChaserCheckpoint.Read() < Db.Config.WriterCheckpoint.Read() && sw.Elapsed < WaitForChaserSingleIterationTimeout) {
+			Thread.Sleep(1);
+		}
+
+		if (Db.Config.ChaserCheckpoint.Read() == Db.Config.WriterCheckpoint.Read()) {
+			Bus.Publish(new SystemMessage.ChaserCaughtUp(message.CorrelationId));
+			return;
+		}
+
+		var totalTime = message.TotalTimeWasted + sw.Elapsed;
+		if (totalTime < TimeSpan.FromSeconds(5) || (int)totalTime.TotalSeconds % 30 == 0) // too verbose otherwise
+			Log.Debug("Still waiting for chaser to catch up already for {totalTime}...", totalTime);
+		Bus.Publish(new SystemMessage.WaitForChaserToCatchUp(message.CorrelationId, totalTime));
+	}
+
+	async ValueTask IAsyncHandle<StorageMessage.WritePrepares>.HandleAsync(StorageMessage.WritePrepares msg, CancellationToken token) {
+		Interlocked.Decrement(ref FlushMessagesInQueue);
+
+		try {
+			if (msg.CancellationToken.IsCancellationRequested)
+				return;
+
+			var logPosition = Writer.Position;
+			var prepares = new List<IPrepareLogRecord<TStreamId>>();
+
+			var preExisting = _streamNameIndex.GetOrReserve(
+				recordFactory: _recordFactory,
+				streamName: msg.EventStreamId,
+				logPosition: logPosition,
+				streamId: out var streamId,
+				streamRecord: out var streamRecord);
+
+			if (streamRecord is not null) {
+				prepares.Add(streamRecord);
+				logPosition += streamRecord.GetSizeWithLengthPrefixAndSuffix();
+			}
+
+			var commitCheck = await _indexWriter.CheckCommit(streamId, msg.ExpectedVersion,
+				msg.Events.Select(static x => x.EventId), streamMightExist: preExisting, token);
+			if (commitCheck.Decision is not CommitDecision.Ok) {
+				await ActOnCommitCheckFailure(msg.Envelope, msg.CorrelationId, commitCheck, token);
+				return;
+			}
+
+			if (msg.Events.Length > 0) {
+				var eventTypes = new TStreamId[msg.Events.Length]; // todo: pool
+				for (int i = 0; i < msg.Events.Length; ++i) {
+					var evnt = msg.Events[i];
+					GetOrReserveEventType(evnt.EventType, logPosition, out eventTypes[i], out var eventTypeRecord);
+					if (eventTypeRecord != null) {
+						prepares.Add(eventTypeRecord);
+						logPosition += eventTypeRecord.GetSizeWithLengthPrefixAndSuffix();
+					}
+				}
+
+				var transactionPosition = logPosition;
+				for (int i = 0; i < msg.Events.Length; ++i) {
+					var evnt = msg.Events[i];
+					var flags = PrepareFlags.Data | PrepareFlags.IsCommitted;
+					if (i == 0)
+						flags |= PrepareFlags.TransactionBegin;
+					if (i == msg.Events.Length - 1)
+						flags |= PrepareFlags.TransactionEnd;
+					if (evnt.IsJson)
+						flags |= PrepareFlags.IsJson;
+
+					// when IsCommitted ExpectedVersion is always explicit
+					var expectedVersion = commitCheck.CurrentVersion + i;
+					var prepare = LogRecord.Prepare(
+						_recordFactory, logPosition, msg.CorrelationId, evnt.EventId,
+						transactionPosition, i, streamId,
+						expectedVersion, flags, eventTypes[i], evnt.Data, evnt.Metadata);
+					prepares.Add(prepare);
+
+					logPosition += prepare.GetSizeWithLengthPrefixAndSuffix();
+				}
+			} else {
+				prepares.Add(
+					LogRecord.Prepare(_recordFactory, logPosition, msg.CorrelationId, Guid.NewGuid(), logPosition, -1,
+						streamId, commitCheck.CurrentVersion,
+						PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd | PrepareFlags.IsCommitted,
+						_emptyEventTypeId, Empty.ByteArray, Empty.ByteArray)
+				);
+			}
+
+			if (!await TryWritePreparesWithRetry(prepares, token)) {
+				await ActOnCommitCheckFailure(
+					envelope: msg.Envelope,
+					correlationId: msg.CorrelationId,
+					result: new(
+						decision: CommitDecision.InvalidTransaction,
+						eventStreamId: streamId,
+						currentVersion: commitCheck.CurrentVersion,
+						startEventNumber: -1,
+						endEventNumber: -1,
+						isSoftDeleted: false),
+					token);
+				return;
+			}
+
+			bool softUndeleteMetastream = _systemStreams.IsMetaStream(streamId)
+										  && await _indexWriter.IsSoftDeleted(_systemStreams.OriginalStreamOf(streamId), token);
+
+			// note: the stream & event type records are indexed separately and must not be pre-committed to the main index
+			_indexWriter.PreCommit(CollectionsMarshal.AsSpan(prepares)[^msg.Events.Length..]);
+
+			if (commitCheck.IsSoftDeleted)
+				await SoftUndeleteStream(streamId, commitCheck.CurrentVersion + 1, token);
+			if (softUndeleteMetastream)
+				await SoftUndeleteMetastream(streamId, token);
+		} catch (Exception exc) {
+			Log.Error(exc, "Exception in writer.");
+			throw;
+		} finally {
+			await Flush(token: token);
+		}
+	}
+
+	private bool GetOrReserveEventType(string eventType, long logPosition, out TStreamId eventTypeId, out IPrepareLogRecord<TStreamId> eventTypeRecord) {
+		return _eventTypeIndex.GetOrReserveEventType(
+			recordFactory: _recordFactory,
+			eventType: eventType,
+			logPosition: logPosition,
+			eventTypeId: out eventTypeId,
+			eventTypeRecord: out eventTypeRecord);
+	}
+
+	private async ValueTask<(TStreamId, long)> GetOrWriteEventType(string eventType, long logPosition, CancellationToken token) {
+		GetOrReserveEventType(eventType, logPosition, out var eventTypeId, out var eventTypeRecord);
+
+		if (eventTypeRecord is not null) {
+			var result = await WritePrepareWithRetry(eventTypeRecord, token);
+			logPosition = result.NewPos;
+		}
+
+		return (eventTypeId, logPosition);
+	}
+
+	private async ValueTask SoftUndeleteMetastream(TStreamId metastreamId, CancellationToken token) {
+		var origStreamId = _systemStreams.OriginalStreamOf(metastreamId);
+		var rawMetaInfo = await _indexWriter.GetStreamRawMeta(origStreamId, token);
+		await SoftUndeleteStream(origStreamId, rawMetaInfo.MetaLastEventNumber, rawMetaInfo.RawMeta,
+			recreateFrom: await _indexWriter.GetStreamLastEventNumber(origStreamId, token) + 1, token);
+	}
+
+	private async ValueTask SoftUndeleteStream(TStreamId streamId, long recreateFromEventNumber, CancellationToken token) {
+		var rawInfo = await _indexWriter.GetStreamRawMeta(streamId, token);
+		await SoftUndeleteStream(streamId, rawInfo.MetaLastEventNumber, rawInfo.RawMeta, recreateFromEventNumber, token);
+	}
+
+	private async ValueTask SoftUndeleteStream(TStreamId streamId, long metaLastEventNumber, ReadOnlyMemory<byte> rawMeta, long recreateFrom, CancellationToken token) {
+		if (!SoftUndeleteRawMeta(rawMeta, recreateFrom, out var modifiedMeta))
+			return;
+
+		var logPosition = Writer.Position;
+		(var streamMetadataEventTypeId, logPosition) = await GetOrWriteEventType(SystemEventTypes.StreamMetadata, logPosition, token);
+
+		var res = await WritePrepareWithRetry(
+			LogRecord.Prepare(_recordFactory, logPosition, Guid.NewGuid(), Guid.NewGuid(), logPosition, 0,
+				_systemStreams.MetaStreamOf(streamId), metaLastEventNumber,
+				PrepareFlags.SingleWrite | PrepareFlags.IsCommitted | PrepareFlags.IsJson,
+				streamMetadataEventTypeId, modifiedMeta, Empty.ByteArray),
+			token
+		);
+
+		_indexWriter.PreCommit([res.Prepare]);
+	}
+
+	public bool SoftUndeleteRawMeta(ReadOnlyMemory<byte> rawMeta, long recreateFromEventNumber, out byte[] modifiedMeta) {
+		try {
+			var jobj = JObject.Parse(Encoding.UTF8.GetString(rawMeta.Span));
+			jobj[SystemMetadata.TruncateBefore] = recreateFromEventNumber;
+			using var memoryStream = new MemoryStream();
+			using (var jsonWriter = new JsonTextWriter(new StreamWriter(memoryStream))) {
+				jobj.WriteTo(jsonWriter);
+			}
+
+			modifiedMeta = memoryStream.ToArray();
+			return true;
+		} catch (Exception) {
+			modifiedMeta = null;
+			return false;
+		}
+	}
+
+	async ValueTask IAsyncHandle<StorageMessage.WriteDelete>.HandleAsync(StorageMessage.WriteDelete message, CancellationToken token) {
+		Interlocked.Decrement(ref FlushMessagesInQueue);
+		try {
+			if (message.CancellationToken.IsCancellationRequested)
+				return;
+
+			var eventId = Guid.NewGuid();
+
+			var logPosition = Writer.Position;
+
+			var preExisting = _streamNameIndex.GetOrReserve(
+				recordFactory: _recordFactory,
+				streamName: message.EventStreamId,
+				logPosition: logPosition,
+				streamId: out var streamId,
+				streamRecord: out var streamRecord);
+
+			if (streamRecord is not null) {
+				var res = await WritePrepareWithRetry(streamRecord, token);
+				logPosition = res.NewPos;
+			}
+
+			var commitCheck = await _indexWriter.CheckCommit(streamId, message.ExpectedVersion, [eventId], streamMightExist: preExisting, token);
+			if (commitCheck.Decision != CommitDecision.Ok) {
+				await ActOnCommitCheckFailure(message.Envelope, message.CorrelationId, commitCheck, token);
+				return;
+			}
+
+			if (message.HardDelete) {
+				// HARD DELETE
+				const long expectedVersion = EventNumber.DeletedStream - 1;
+				(var streamDeletedEventType, logPosition) = await GetOrWriteEventType(SystemEventTypes.StreamDeleted, logPosition, token);
+				var record = LogRecord.DeleteTombstone(_recordFactory, logPosition, message.CorrelationId,
+					eventId, streamId, streamDeletedEventType,
+					expectedVersion, PrepareFlags.IsCommitted);
+				var res = await WritePrepareWithRetry(record, token);
+				_indexWriter.PreCommit([res.Prepare]);
+			} else {
+				// SOFT DELETE
+				var metastreamId = _systemStreams.MetaStreamOf(streamId);
+				var expectedVersion = await _indexWriter.GetStreamLastEventNumber(metastreamId, token);
+
+				if (await _indexWriter.GetStreamLastEventNumber(streamId, token) < 0 && expectedVersion < 0) {
+					var result = new CommitCheckResult<TStreamId>(CommitDecision.WrongExpectedVersion, streamId, -1, -1, -1, false);
+					await ActOnCommitCheckFailure(message.Envelope, message.CorrelationId, result, token);
+					return;
+				}
+
+
+				const PrepareFlags flags = PrepareFlags.SingleWrite | PrepareFlags.IsCommitted | PrepareFlags.IsJson;
+				var data = new StreamMetadata(truncateBefore: EventNumber.DeletedStream).ToJsonBytes();
+
+				(var streamMetadataEventTypeId, logPosition) = await GetOrWriteEventType(SystemEventTypes.StreamMetadata, logPosition, token);
+
+				var res = await WritePrepareWithRetry(
+					LogRecord.Prepare(_recordFactory, logPosition, message.CorrelationId, eventId, logPosition, 0,
+						metastreamId, expectedVersion, flags, streamMetadataEventTypeId, data, null),
+					token
+				);
+				_indexWriter.PreCommit([res.Prepare]);
+			}
+		} catch (Exception exc) {
+			Log.Error(exc, "Exception in writer.");
+			throw;
+		} finally {
+			await Flush(token: token);
+		}
+	}
+
+	async ValueTask IAsyncHandle<StorageMessage.WriteTransactionStart>.HandleAsync(StorageMessage.WriteTransactionStart message, CancellationToken token) {
+		Interlocked.Decrement(ref FlushMessagesInQueue);
+		try {
+			if (message.LiveUntil < DateTime.UtcNow)
+				return;
+
+			var streamId = _indexWriter.GetStreamId(message.EventStreamId);
+			var record = LogRecord.TransactionBegin(_recordFactory, Writer.Position, message.CorrelationId, streamId, message.ExpectedVersion);
+			var res = await WritePrepareWithRetry(record, token);
+
+			// we update cache to avoid non-cached look-up on next TransactionWrite
+			_indexWriter.UpdateTransactionInfo(res.WrittenPos, res.WrittenPos, new(-1, streamId));
+		} catch (Exception exc) {
+			Log.Error(exc, "Exception in writer.");
+			throw;
+		} finally {
+			await Flush(token: token);
+		}
+	}
+
+	async ValueTask IAsyncHandle<StorageMessage.WriteTransactionData>.HandleAsync(StorageMessage.WriteTransactionData message, CancellationToken token) {
+		Interlocked.Decrement(ref FlushMessagesInQueue);
+		try {
+			var logPosition = Writer.Position;
+			var transactionInfo = await _indexWriter.GetTransactionInfo(Writer.FlushedPosition, message.TransactionId, token);
+			if (!CheckTransactionInfo(message.TransactionId, transactionInfo))
+				return;
+
+			if (message.Events.Length > 0) {
+				long lastLogPosition = -1;
+				for (int i = 0; i < message.Events.Length; ++i) {
+					var evnt = message.Events[i];
+					// safe, only v2 supports transactions and it doesnt write eventtype records.
+					(var eventType, logPosition) = await GetOrWriteEventType(evnt.EventType, logPosition, token);
+					var record = LogRecord.TransactionWrite(
+						_recordFactory,
+						logPosition,
+						message.CorrelationId,
+						evnt.EventId,
+						message.TransactionId,
+						transactionInfo.TransactionOffset + i + 1,
+						transactionInfo.EventStreamId,
+						eventType,
+						evnt.Data,
+						evnt.Metadata,
+						evnt.IsJson);
+					var res = await WritePrepareWithRetry(record, token);
+					logPosition = res.NewPos;
+					lastLogPosition = res.WrittenPos;
+				}
+
+				var info = transactionInfo with {
+					TransactionOffset = transactionInfo.TransactionOffset + message.Events.Length
+				};
+
+				_indexWriter.UpdateTransactionInfo(message.TransactionId, lastLogPosition, info);
+			}
+		} catch (Exception exc) {
+			Log.Error(exc, "Exception in writer.");
+			throw;
+		} finally {
+			await Flush(token: token);
+		}
+	}
+
+	async ValueTask IAsyncHandle<StorageMessage.WriteTransactionEnd>.HandleAsync(StorageMessage.WriteTransactionEnd message, CancellationToken token) {
+		Interlocked.Decrement(ref FlushMessagesInQueue);
+		try {
+			if (message.LiveUntil < DateTime.UtcNow)
+				return;
+
+			var transactionInfo = await _indexWriter.GetTransactionInfo(Writer.FlushedPosition, message.TransactionId, token);
+			if (!CheckTransactionInfo(message.TransactionId, transactionInfo))
+				return;
+
+			var record = LogRecord.TransactionEnd(_recordFactory, Writer.Position,
+				message.CorrelationId,
+				Guid.NewGuid(),
+				message.TransactionId,
+				transactionInfo.EventStreamId);
+			await WritePrepareWithRetry(record, token);
+		} catch (Exception exc) {
+			Log.Error(exc, "Exception in writer.");
+			throw;
+		} finally {
+			await Flush(token: token);
+		}
+	}
+
+	private static bool CheckTransactionInfo(long transactionId, TransactionInfo<TStreamId> transactionInfo) {
+		var noStreamId = StreamIdComparer.Equals(transactionInfo.EventStreamId, default);
+		if (transactionInfo.TransactionOffset < -1 || noStreamId) {
+			Log.Error(
+				"Invalid transaction info found for transaction ID {transactionId}. "
+				+ "Possibly wrong transactionId provided. TransactionOffset: {transactionOffset}, EventStreamId: {stream}",
+				transactionId,
+				transactionInfo.TransactionOffset,
+				noStreamId ? "<null>" : $"{transactionInfo.EventStreamId}");
+			return false;
+		}
+
+		return true;
+	}
+
+	async ValueTask IAsyncHandle<StorageMessage.WriteCommit>.HandleAsync(StorageMessage.WriteCommit message, CancellationToken token) {
+		Interlocked.Decrement(ref FlushMessagesInQueue);
+		try {
+			var commitPos = Writer.Position;
+			var commitCheck = await _indexWriter.CheckCommitStartingAt(message.TransactionPosition, commitPos, token);
+			if (commitCheck.Decision is not CommitDecision.Ok) {
+				await ActOnCommitCheckFailure(message.Envelope, message.CorrelationId, commitCheck, token);
+				return;
+			}
+
+			var commit = await WriteCommitWithRetry(
+				LogRecord.Commit(commitPos,
+					message.CorrelationId,
+					message.TransactionPosition,
+					commitCheck.CurrentVersion + 1),
+				token
+			);
+
+			bool softUndeleteMetastream = _systemStreams.IsMetaStream(commitCheck.EventStreamId)
+										  && await _indexWriter.IsSoftDeleted(_systemStreams.OriginalStreamOf(commitCheck.EventStreamId), token);
+
+			await _indexWriter.PreCommit(commit, token);
+
+			if (commitCheck.IsSoftDeleted)
+				await SoftUndeleteStream(commitCheck.EventStreamId, commitCheck.CurrentVersion + 1, token);
+			if (softUndeleteMetastream)
+				await SoftUndeleteMetastream(commitCheck.EventStreamId, token);
+		} catch (Exception exc) {
+			Log.Error(exc, "Exception in writer.");
+			throw;
+		} finally {
+			await Flush(token: token);
+		}
+	}
+
+	private async ValueTask ActOnCommitCheckFailure(IEnvelope envelope, Guid correlationId, CommitCheckResult<TStreamId> result, CancellationToken token) {
+		switch (result.Decision) {
+			case CommitDecision.WrongExpectedVersion:
+				envelope.ReplyWith(new StorageMessage.WrongExpectedVersion(correlationId, result.CurrentVersion));
+				break;
+			case CommitDecision.Deleted:
+				envelope.ReplyWith(new StorageMessage.StreamDeleted(correlationId));
+				break;
+			case CommitDecision.Idempotent:
+				var eventStreamName = await _indexWriter.GetStreamName(result.EventStreamId, token);
+				envelope.ReplyWith(new StorageMessage.AlreadyCommitted(correlationId,
+					eventStreamName,
+					result.StartEventNumber,
+					result.EndEventNumber,
+					result.IdempotentLogPosition));
+				break;
+			case CommitDecision.CorruptedIdempotency:
+				// in case of corrupted idempotency (part of transaction is ok, other is different)
+				// then we can say that the transaction is not idempotent, so WrongExpectedVersion is ok answer
+				envelope.ReplyWith(new StorageMessage.WrongExpectedVersion(correlationId, result.CurrentVersion));
+				break;
+			case CommitDecision.InvalidTransaction:
+				envelope.ReplyWith(new StorageMessage.InvalidTransaction(correlationId));
+				break;
+			case CommitDecision.IdempotentNotReady:
+				//TODO(clc): when we have the pre-index we should be able to get the logPosition from the pre-index and allow the transaction to wait for the cluster commit
+				//just drop the write and wait for the client to retry
+				Log.Debug(
+					"Dropping idempotent write to stream {@stream}, startEventNumber: {@startEventNumber}, endEventNumber: {@endEventNumber} since the original write has not yet been replicated.",
+					result.EventStreamId, result.StartEventNumber, result.EndEventNumber);
+				break;
+			default:
+				throw new ArgumentOutOfRangeException();
+		}
+	}
+
+	private async ValueTask<bool> TryWritePreparesWithRetry(IList<IPrepareLogRecord<TStreamId>> prepares, CancellationToken token) {
+		Ensure.Positive(prepares.Count);
+
+		if (prepares.Count is 1) {
+			await WritePrepareWithRetry(prepares[0], token);
+			return true;
+		}
+
+		var prepareSizes = 0;
+		foreach (var prepare in prepares)
+			prepareSizes += prepare.GetSizeWithLengthPrefixAndSuffix();
+
+		if (prepareSizes > Db.Config.ChunkSize) {
+			Log.Error("Transaction size ({prepareSizes:N0}) exceeds chunk size ({chunkSize:N0})", prepareSizes, Db.Config.ChunkSize);
+			return false;
+		}
+
+		if (!Writer.CanWrite(prepareSizes)) {
+			await Writer.CompleteChunk(token);
+			await Writer.AddNewChunk(token: token);
+			if (!Writer.CanWrite(prepareSizes)) {
+				throw new Exception($"Transaction of size {prepareSizes:N0} cannot be written even after completing a chunk");
+			}
+
+			long logPos = Writer.Position;
+			long transactionPos = default;
+
+			for (int i = 0; i < prepares.Count; i++) {
+				// the prepares may be from different streams due to the stream & event type records
+				// we thus adjust the transaction position to the correct value on each stream id change
+				if (i is 0 || !StreamIdComparer.Equals(prepares[i].EventStreamId, prepares[i - 1].EventStreamId))
+					transactionPos = logPos;
+
+				prepares[i] = prepares[i].CopyForRetry(logPos, transactionPos);
+				logPos += prepares[i].GetSizeWithLengthPrefixAndSuffix();
+			}
+		}
+
+		// Workaround: The transaction cannot be canceled in a middle, it should be atomic.
+		// There is no way to rollback it on cancellation
+		token.ThrowIfCancellationRequested();
+
+		Writer.OpenTransaction();
+		var writerPos = Writer.Position;
+
+		foreach (var prepare in prepares) {
+			long newWriterPos = await Writer.WriteToTransaction(prepare, CancellationToken.None)
+								?? throw new InvalidOperationException("The transaction does not fit in the current chunk.");
+			if (newWriterPos - writerPos != prepare.GetSizeWithLengthPrefixAndSuffix())
+				throw new Exception($"Expected writer position to be at: {writerPos + prepare.GetSizeWithLengthPrefixAndSuffix()} but it was at {newWriterPos}");
+
+			writerPos = newWriterPos;
+		}
+
+		Writer.CommitTransaction();
+
+		return true;
+	}
+
+	private async ValueTask<WriteResult> WritePrepareWithRetry(IPrepareLogRecord<TStreamId> prepare, CancellationToken token) {
+		long writtenPos = prepare.LogPosition;
+		var record = prepare;
+
+		var (written, newPos) = await Writer.Write(prepare, token);
+		if (!written) {
+			var transactionPos = prepare.TransactionPosition == prepare.LogPosition
+				? newPos
+				: prepare.TransactionPosition;
+
+			record = prepare.CopyForRetry(logPosition: newPos, transactionPosition: transactionPos);
+
+			writtenPos = newPos;
+			(written, newPos) = await Writer.Write(record, token);
+			if (!written) {
+				throw new Exception($"Second write try failed when first writing prepare at {prepare.LogPosition}, then at {writtenPos}.");
+			}
+		}
+
+		if (StreamIdComparer.Equals(prepare.EventType, _scavengePointEventTypeId) &&
+			StreamIdComparer.Equals(prepare.EventStreamId, _scavengePointsStreamId)) {
+			await Writer.CompleteChunk(token);
+			await Writer.AddNewChunk(token: token);
+		}
+
+		return new WriteResult(writtenPos, newPos, record);
+	}
+
+	private async ValueTask<CommitLogRecord> WriteCommitWithRetry(CommitLogRecord commit, CancellationToken token) {
+		if (await Writer.Write(commit, token) is not (false, var newPos))
+			return commit;
+
+		var transactionPos = commit.TransactionPosition == commit.LogPosition ? newPos : commit.TransactionPosition;
+		var record = new CommitLogRecord(newPos, commit.CorrelationId, transactionPos, commit.TimeStamp, commit.FirstEventNumber);
+		if (await Writer.Write(record, token) is (false, _)) {
+			throw new Exception($"Second write try failed when first writing commit at {commit.LogPosition}, then at {newPos}.");
+		}
+
+		return record;
+	}
+
+	protected async ValueTask<bool> Flush(bool force = false, CancellationToken token = default) {
+		var start = _clock.Now;
+		if (!force && FlushMessagesInQueue != 0 && !(start.ElapsedTicksSince(_lastFlushTimestamp) >= _lastFlushDelay + _minFlushDelay)) {
+			return false;
+		}
+
+		var flushSize = Writer.Position - Writer.FlushedPosition;
+
+		await Writer.Flush(token);
+
+		_flushSizeTracker.Record(flushSize);
+		var end = _flushDurationTracker.RecordNow(start);
+
+		var flushDelay = end.ElapsedTicksSince(start);
+
+		Interlocked.Exchange(ref _lastFlushDelay, flushDelay);
+		Interlocked.Exchange(ref _lastFlushSize, flushSize);
+		_lastFlushTimestamp = end;
+
+		if (_statCount >= LastStatsCount) {
+			Interlocked.Add(ref _sumFlushSize, -_lastFlushSizes[_statIndex]);
+			Interlocked.Add(ref _sumFlushDelay, -_lastFlushDelays[_statIndex]);
+		} else {
+			_statCount += 1;
+		}
+
+		_lastFlushSizes[_statIndex] = flushSize;
+		_lastFlushDelays[_statIndex] = flushDelay;
+		Interlocked.Add(ref _sumFlushSize, flushSize);
+		Interlocked.Add(ref _sumFlushDelay, flushDelay);
+		Interlocked.Exchange(ref _maxFlushSize, Math.Max(Interlocked.Read(ref _maxFlushSize), flushSize));
+		Interlocked.Exchange(ref _maxFlushDelay, Math.Max(Interlocked.Read(ref _maxFlushDelay), flushDelay));
+		_statIndex = (_statIndex + 1) & (LastStatsCount - 1);
+
+		PurgeNotProcessedInfo();
+		Bus.Publish(new ReplicationTrackingMessage.WriterCheckpointFlushed());
+		return true;
+	}
+
+	private void PurgeNotProcessedInfo() {
+		_indexWriter.PurgeNotProcessedCommitsTill(Db.Config.ChaserCheckpoint.Read());
+		_indexWriter.PurgeNotProcessedTransactions(Db.Config.WriterCheckpoint.Read());
+	}
+
+	private readonly struct WriteResult {
+		public readonly long WrittenPos;
+		public readonly long NewPos;
+		public readonly IPrepareLogRecord<TStreamId> Prepare;
+
+		public WriteResult(long writtenPos, long newPos, IPrepareLogRecord<TStreamId> prepare) {
+			WrittenPos = writtenPos;
+			NewPos = newPos;
+			Prepare = prepare;
+		}
+	}
+
+	public void Handle(MonitoringMessage.InternalStatsRequest message) {
+		var lastFlushSize = Interlocked.Read(ref _lastFlushSize);
+		var lastFlushDelayMs = Interlocked.Read(ref _lastFlushDelay) / (double)TicksPerMs;
+		var statCount = _statCount;
+		var meanFlushSize = statCount == 0 ? 0 : Interlocked.Read(ref _sumFlushSize) / statCount;
+		var meanFlushDelayMs = statCount == 0
+			? 0
+			: Interlocked.Read(ref _sumFlushDelay) / (double)TicksPerMs / statCount;
+		var maxFlushSize = Interlocked.Read(ref _maxFlushSize);
+		var maxFlushDelayMs = Interlocked.Read(ref _maxFlushDelay) / (double)TicksPerMs;
+		var queuedFlushMessages = FlushMessagesInQueue;
+
+		var stats = new Dictionary<string, object> {
+			{ "es-writer-lastFlushSize", new StatMetadata(lastFlushSize, "Writer Last Flush Size") },
+			{ "es-writer-lastFlushDelayMs", new StatMetadata(lastFlushDelayMs, "Writer Last Flush Delay, ms") },
+			{ "es-writer-meanFlushSize", new StatMetadata(meanFlushSize, "Writer Mean Flush Size") },
+			{ "es-writer-meanFlushDelayMs", new StatMetadata(meanFlushDelayMs, "Writer Mean Flush Delay, ms") },
+			{ "es-writer-maxFlushSize", new StatMetadata(maxFlushSize, "Writer Max Flush Size") },
+			{ "es-writer-maxFlushDelayMs", new StatMetadata(maxFlushDelayMs, "Writer Max Flush Delay, ms") },
+			{ "es-writer-queuedFlushMessages", new StatMetadata(queuedFlushMessages, "Writer Queued Flush Message") }
+		};
+
+		message.Envelope.ReplyWith(new MonitoringMessage.InternalStatsRequestResponse(stats));
+	}
+}
+
+file static class MessageBusHelpers {
+	internal static void PublishStorageWriterShutdown(this IPublisher publisher)
+		=> publisher.Publish(new SystemMessage.ServiceShutdown(nameof(StorageWriterService)));
+}
diff --git a/src/KurrentDB.Core/Services/SubscriptionsService.cs b/src/KurrentDB.Core/Services/SubscriptionsService.cs
new file mode 100644
index 00000000000..e4d26b8f027
--- /dev/null
+++ b/src/KurrentDB.Core/Services/SubscriptionsService.cs
@@ -0,0 +1,501 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Storage.InMemory;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Services.UserManagement;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services;
+
+public enum SubscriptionDropReason {
+	Unsubscribed = 0,
+	AccessDenied = 1,
+	NotFound = 2,
+	PersistentSubscriptionDeleted = 3,
+	SubscriberMaxCountReached = 4,
+	StreamDeleted = 5
+}
+
+public abstract class SubscriptionsService {
+	public const string AllStreamsSubscriptionId = ""; // empty stream id means subscription to all streams
+	protected static readonly ILogger Log = Serilog.Log.ForContext<SubscriptionsService>();
+}
+
+public class SubscriptionsService<TStreamId> :
+	SubscriptionsService,
+	IHandle<SystemMessage.SystemStart>,
+	IHandle<SystemMessage.BecomeShuttingDown>,
+	IHandle<TcpMessage.ConnectionClosed>,
+	IAsyncHandle<ClientMessage.SubscribeToStream>,
+	IAsyncHandle<ClientMessage.FilteredSubscribeToStream>,
+	IHandle<ClientMessage.UnsubscribeFromStream>,
+	IHandle<SubscriptionMessage.DropSubscription>,
+	IHandle<SubscriptionMessage.PollStream>,
+	IHandle<SubscriptionMessage.CheckPollTimeout>,
+	IAsyncHandle<StorageMessage.InMemoryEventCommitted>,
+	IAsyncHandle<StorageMessage.EventCommitted> {
+
+	private const int DontReportCheckpointReached = -1;
+
+	// ReSharper disable once StaticMemberInGenericType
+	private static readonly TimeSpan TimeoutPeriod = TimeSpan.FromSeconds(1);
+	// ReSharper disable once StaticMemberInGenericType
+	private static readonly char[] LinkToSeparator = ['@'];
+
+	private readonly Dictionary<string, List<Subscription>> _subscriptionTopics = new();
+	private readonly Dictionary<Guid, Subscription> _subscriptionsById = new();
+	private readonly Dictionary<string, List<PollSubscription>> _pollTopics = new();
+
+	private long _lastSeenCommitPosition = -1;
+	private long _lastSeenInMemoryCommitPosition = -1;
+
+	private readonly IPublisher _bus;
+	private readonly IEnvelope _busEnvelope;
+	private readonly IQueuedHandler _queuedHandler;
+	private readonly IReadIndex<TStreamId> _readIndex;
+	private readonly IInMemoryStreamReader _inMemReader;
+	private readonly IAuthorizationProvider _authorizationProvider;
+
+	public SubscriptionsService(
+		IPublisher bus,
+		IQueuedHandler queuedHandler,
+		IAuthorizationProvider authorizationProvider,
+		IReadIndex<TStreamId> readIndex,
+		IInMemoryStreamReader inMemReader) {
+		_bus = Ensure.NotNull(bus);
+		_busEnvelope = bus;
+		_queuedHandler = Ensure.NotNull(queuedHandler);
+		_readIndex = Ensure.NotNull(readIndex);
+		_inMemReader = Ensure.NotNull(inMemReader);
+		_authorizationProvider = Ensure.NotNull(authorizationProvider);
+	}
+
+	public void Handle(SystemMessage.SystemStart message) {
+		_bus.Publish(TimerMessage.Schedule.Create(TimeoutPeriod, _busEnvelope, new SubscriptionMessage.CheckPollTimeout()));
+	}
+
+	/* SUBSCRIPTION SECTION */
+	public void Handle(SystemMessage.BecomeShuttingDown message) {
+		List<Subscription> subscriptions = _subscriptionsById.Values.ToList();
+		foreach (var subscription in subscriptions) {
+			DropSubscription(subscription, SubscriptionDropReason.Unsubscribed, sendDropNotification: true);
+		}
+
+		_queuedHandler.RequestStop();
+	}
+
+	public void Handle(TcpMessage.ConnectionClosed message) {
+		List<string> subscriptionGroupsToRemove = null;
+		foreach (var (key, subscriptions) in _subscriptionTopics) {
+			for (int i = 0, n = subscriptions.Count; i < n; ++i) {
+				if (subscriptions[i].ConnectionId == message.Connection.ConnectionId)
+					_subscriptionsById.Remove(subscriptions[i].CorrelationId);
+			}
+
+			subscriptions.RemoveAll(x => x.ConnectionId == message.Connection.ConnectionId);
+			if (subscriptions.Count == 0) // schedule removal of list instance
+			{
+				subscriptionGroupsToRemove ??= [];
+				subscriptionGroupsToRemove.Add(key);
+			}
+		}
+
+		if (subscriptionGroupsToRemove != null) {
+			for (int i = 0, n = subscriptionGroupsToRemove.Count; i < n; ++i) {
+				_subscriptionTopics.Remove(subscriptionGroupsToRemove[i]);
+			}
+		}
+	}
+
+	async ValueTask IAsyncHandle<ClientMessage.SubscribeToStream>.HandleAsync(ClientMessage.SubscribeToStream msg, CancellationToken token) {
+		var isInMemoryStream = SystemStreams.IsInMemoryStream(msg.EventStreamId);
+
+		long? lastEventNumber = null;
+		if (isInMemoryStream) {
+			var readMsg = new ClientMessage.ReadStreamEventsBackward(
+				internalCorrId: Guid.NewGuid(),
+				correlationId: msg.CorrelationId,
+				envelope: new NoopEnvelope(),
+				eventStreamId: msg.EventStreamId,
+				fromEventNumber: -1,
+				maxCount: 1,
+				resolveLinkTos: false,
+				requireLeader: false,
+				validationStreamVersion: null,
+				user: SystemAccounts.System);
+
+			var readResult = _inMemReader.ReadBackwards(readMsg);
+			lastEventNumber = readResult.LastEventNumber;
+		} else if (!msg.EventStreamId.IsEmptyString()) {
+			lastEventNumber = await _readIndex.GetStreamLastEventNumber(_readIndex.GetStreamId(msg.EventStreamId), token);
+		}
+
+		if (lastEventNumber == EventNumber.DeletedStream) {
+			msg.Envelope.ReplyWith(new ClientMessage.SubscriptionDropped(Guid.Empty, SubscriptionDropReason.StreamDeleted));
+			return;
+		}
+
+		var lastIndexedPos = isInMemoryStream ? -1 : _readIndex.LastIndexedPosition;
+
+		SubscribeToStream(msg.CorrelationId, msg.Envelope, msg.ConnectionId, msg.EventStreamId,
+			msg.ResolveLinkTos, lastIndexedPos, lastEventNumber,
+			msg.User, msg.EventStreamId.IsEmptyString() ? EventFilter.DefaultAllFilter : EventFilter.DefaultStreamFilter);
+
+		var subscribedMessage =
+			new ClientMessage.SubscriptionConfirmation(msg.CorrelationId, lastIndexedPos, lastEventNumber);
+		msg.Envelope.ReplyWith(subscribedMessage);
+	}
+
+	async ValueTask IAsyncHandle<ClientMessage.FilteredSubscribeToStream>.HandleAsync(ClientMessage.FilteredSubscribeToStream msg, CancellationToken token) {
+		var isInMemoryStream = SystemStreams.IsInMemoryStream(msg.EventStreamId);
+
+		long? lastEventNumber = null;
+		if (isInMemoryStream) {
+			lastEventNumber = -1;
+		} else if (!msg.EventStreamId.IsEmptyString()) {
+			lastEventNumber = await _readIndex.GetStreamLastEventNumber(_readIndex.GetStreamId(msg.EventStreamId), token);
+		}
+
+		var lastIndexedPos = isInMemoryStream ? -1 : _readIndex.LastIndexedPosition;
+
+		SubscribeToStream(msg.CorrelationId, msg.Envelope, msg.ConnectionId, msg.EventStreamId,
+			msg.ResolveLinkTos, lastIndexedPos, lastEventNumber, msg.User, msg.EventFilter,
+			msg.CheckpointInterval, msg.CheckpointIntervalCurrent);
+		var subscribedMessage = new ClientMessage.SubscriptionConfirmation(msg.CorrelationId, lastIndexedPos, lastEventNumber);
+		msg.Envelope.ReplyWith(subscribedMessage);
+	}
+
+	public void Handle(ClientMessage.UnsubscribeFromStream message) {
+		DropSubscription(message.CorrelationId, SubscriptionDropReason.Unsubscribed);
+	}
+
+	public void Handle(SubscriptionMessage.DropSubscription message) {
+		DropSubscription(message.SubscriptionId, message.DropReason);
+	}
+
+	private void SubscribeToStream(Guid correlationId, IEnvelope envelope, Guid connectionId,
+		string eventStreamId, bool resolveLinkTos, long lastIndexedPosition, long? lastEventNumber,
+		ClaimsPrincipal user,
+		IEventFilter eventFilter, int? checkpointInterval = null, int checkpointIntervalCurrent = 0) {
+		if (!_subscriptionTopics.TryGetValue(eventStreamId, out var subscribers)) {
+			subscribers = [];
+			_subscriptionTopics.Add(eventStreamId, subscribers);
+		}
+
+		// if eventStreamId is null or empty -- subscription is to all streams
+		var subscription = new Subscription(correlationId,
+			envelope,
+			connectionId,
+			eventStreamId.IsEmptyString() ? AllStreamsSubscriptionId : eventStreamId,
+			resolveLinkTos,
+			lastIndexedPosition,
+			lastEventNumber ?? -1,
+			user,
+			eventFilter,
+			checkpointInterval,
+			checkpointIntervalCurrent);
+		subscribers.Add(subscription);
+		_subscriptionsById[correlationId] = subscription;
+	}
+
+	private void DropSubscription(Guid subscriptionId, SubscriptionDropReason dropReason) {
+		if (_subscriptionsById.TryGetValue(subscriptionId, out var subscription))
+			DropSubscription(subscription, dropReason, sendDropNotification: true);
+	}
+
+	private void DropSubscription(Subscription subscription, SubscriptionDropReason dropReason, bool sendDropNotification) {
+		if (sendDropNotification)
+			subscription.Envelope.ReplyWith(new ClientMessage.SubscriptionDropped(subscription.CorrelationId, dropReason));
+
+		if (_subscriptionTopics.TryGetValue(subscription.EventStreamId, out var subscriptions)) {
+			subscriptions.Remove(subscription);
+			if (subscriptions.Count == 0)
+				_subscriptionTopics.Remove(subscription.EventStreamId);
+		}
+
+		_subscriptionsById.Remove(subscription.CorrelationId);
+	}
+
+	/* LONG POLL SECTION */
+	public void Handle(SubscriptionMessage.PollStream message) {
+		if (MissedEvents(message.StreamId, message.LastIndexedPosition, message.LastEventNumber)) {
+			_bus.Publish(CloneReadRequestWithNoPollFlag(message.OriginalRequest));
+			return;
+		}
+
+		SubscribePoller(message.StreamId, message.ExpireAt, message.LastIndexedPosition, message.LastEventNumber, message.OriginalRequest);
+	}
+
+	private bool MissedEvents(string streamId, long lastIndexedPosition, long? lastEventNumber) {
+		return SystemStreams.IsInMemoryStream(streamId)
+			? _lastSeenInMemoryCommitPosition > lastIndexedPosition
+			: _lastSeenCommitPosition > lastIndexedPosition;
+	}
+
+	private void SubscribePoller(string streamId, DateTime expireAt, long lastIndexedPosition, long? lastEventNumber, Message originalRequest) {
+		if (!_pollTopics.TryGetValue(streamId, out var pollTopic)) {
+			pollTopic = [];
+			_pollTopics.Add(streamId, pollTopic);
+		}
+
+		pollTopic.Add(new(expireAt, lastIndexedPosition, lastEventNumber ?? -1, originalRequest));
+	}
+
+	public void Handle(SubscriptionMessage.CheckPollTimeout message) {
+		List<string> pollTopicsToRemove = null;
+		var now = DateTime.UtcNow;
+		foreach (var (key, pollTopic) in _pollTopics) {
+			for (int i = pollTopic.Count - 1; i >= 0; --i) {
+				var poller = pollTopic[i];
+				if (poller.ExpireAt > now)
+					continue;
+
+				_bus.Publish(CloneReadRequestWithNoPollFlag(poller.OriginalRequest));
+				pollTopic.RemoveAt(i);
+
+				if (pollTopic.Count == 0) // schedule removal of list instance
+				{
+					pollTopicsToRemove ??= [];
+					pollTopicsToRemove.Add(key);
+				}
+			}
+		}
+
+		if (pollTopicsToRemove != null) {
+			for (int i = 0, n = pollTopicsToRemove.Count; i < n; ++i) {
+				_pollTopics.Remove(pollTopicsToRemove[i]);
+			}
+		}
+
+		_bus.Publish(TimerMessage.Schedule.Create(TimeSpan.FromSeconds(1), _busEnvelope, message));
+	}
+
+	private static Message CloneReadRequestWithNoPollFlag(Message originalRequest) {
+		return originalRequest switch {
+			ClientMessage.ReadStreamEventsForward streamReq => new ClientMessage.ReadStreamEventsForward(streamReq.InternalCorrId, streamReq.CorrelationId, streamReq.Envelope, streamReq.EventStreamId,
+				streamReq.FromEventNumber, streamReq.MaxCount, streamReq.ResolveLinkTos, streamReq.RequireLeader, streamReq.ValidationStreamVersion, streamReq.User,
+				replyOnExpired: streamReq.ReplyOnExpired),
+			ClientMessage.ReadAllEventsForward allReq => new ClientMessage.ReadAllEventsForward(allReq.InternalCorrId, allReq.CorrelationId, allReq.Envelope, allReq.CommitPosition,
+				allReq.PreparePosition, allReq.MaxCount, allReq.ResolveLinkTos, allReq.RequireLeader, allReq.ValidationTfLastCommitPosition, allReq.User, replyOnExpired: allReq.ReplyOnExpired),
+			_ => throw new Exception($"Unexpected read request of type {originalRequest.GetType()} for long polling: {originalRequest}.")
+		};
+	}
+
+	async ValueTask IAsyncHandle<StorageMessage.EventCommitted>.HandleAsync(StorageMessage.EventCommitted message, CancellationToken token) {
+		_lastSeenCommitPosition = message.CommitPosition;
+
+		var resolvedEvent =
+			await ProcessEventCommited(AllStreamsSubscriptionId, message.CommitPosition, message.Event, null, token);
+		await ProcessEventCommited(message.Event.EventStreamId, message.CommitPosition, message.Event, resolvedEvent, token);
+
+		ProcessStreamMetadataChanges(message.Event.EventStreamId);
+		ProcessSettingsStreamChanges(message.Event.EventStreamId);
+
+		ReissueReadsFor(AllStreamsSubscriptionId, message.CommitPosition, message.Event.EventNumber);
+		ReissueReadsFor(message.Event.EventStreamId, message.CommitPosition, message.Event.EventNumber);
+	}
+
+	async ValueTask IAsyncHandle<StorageMessage.InMemoryEventCommitted>.HandleAsync(StorageMessage.InMemoryEventCommitted message, CancellationToken token) {
+		_lastSeenInMemoryCommitPosition = message.CommitPosition;
+		await ProcessEventCommited(message.Event.EventStreamId, message.CommitPosition, message.Event, null, token);
+		ProcessStreamMetadataChanges(message.Event.EventStreamId);
+		ProcessSettingsStreamChanges(message.Event.EventStreamId);
+		ReissueReadsFor(message.Event.EventStreamId, message.CommitPosition, message.Event.EventNumber);
+	}
+
+	private async ValueTask<ResolvedEvent?> ProcessEventCommited(string eventStreamId, long commitPosition, EventRecord evnt, ResolvedEvent? resolvedEvent, CancellationToken token) {
+		if (!_subscriptionTopics.TryGetValue(eventStreamId, out var subscriptions))
+			return resolvedEvent;
+		for (int i = 0, n = subscriptions.Count; i < n; i++) {
+			var subscr = subscriptions[i];
+			if (commitPosition <= subscr.LastIndexedPosition || evnt.EventNumber <= subscr.LastEventNumber)
+				continue;
+
+			var pair = ResolvedEvent.ForUnresolvedEvent(evnt, commitPosition);
+			if (subscr.ResolveLinkTos)
+				// resolve event if has not been previously resolved
+				resolvedEvent = pair = resolvedEvent ?? await ResolveLinkToEvent(evnt, commitPosition, token);
+
+			if (subscr.EventFilter.IsEventAllowed(evnt)) {
+				subscr.Envelope.ReplyWith(new ClientMessage.StreamEventAppeared(subscr.CorrelationId, pair));
+			}
+
+			if (subscr.CheckpointInterval == DontReportCheckpointReached)
+				continue;
+
+			subscr.CheckpointIntervalCurrent++;
+
+			if (subscr.CheckpointInterval != null &&
+				subscr.CheckpointIntervalCurrent >= subscr.CheckpointInterval) {
+				subscr.Envelope.ReplyWith(new ClientMessage.CheckpointReached(subscr.CorrelationId, pair.OriginalPosition));
+				subscr.CheckpointIntervalCurrent = 0;
+			}
+		}
+
+		return resolvedEvent;
+	}
+
+	private void ProcessStreamMetadataChanges(string eventStreamId) {
+		if (!SystemStreams.IsMetastream(eventStreamId))
+			return;
+
+		eventStreamId = SystemStreams.OriginalStreamOf(eventStreamId);
+
+		if (eventStreamId == SystemStreams.AllStream)
+			eventStreamId = string.Empty;
+
+		if (!_subscriptionTopics.TryGetValue(eventStreamId, out var subscriptions))
+			return;
+
+		foreach (var subscription in subscriptions.ToArray())
+			Authorize(subscription);
+	}
+
+	private void ProcessSettingsStreamChanges(string eventStreamId) {
+		if (eventStreamId != SystemStreams.SettingsStream)
+			return;
+
+		foreach (var subscriptions in _subscriptionTopics.Values) {
+			foreach (var subscription in subscriptions.ToArray())
+				Authorize(subscription);
+		}
+	}
+
+	private void Authorize(Subscription subscription) {
+		try {
+			var streamId = Operations.Streams.Parameters.StreamId(subscription.EventStreamId);
+			var op = new Operation(Operations.Streams.Read).WithParameter(streamId);
+
+			var accessChk = _authorizationProvider.CheckAccessAsync(subscription.User, op, CancellationToken.None);
+
+			if (accessChk.IsCompleted)
+				AuthorizeSync();
+			else
+				_ = AuthorizeAsync();
+
+			void AuthorizeSync() {
+				if (accessChk.Result)
+					return;
+
+				LogSubscriptionDrop();
+				DropSubscription(subscription, SubscriptionDropReason.AccessDenied, sendDropNotification: true);
+			}
+
+			async Task AuthorizeAsync() {
+				// note: when authorizing asynchronously, a few live events may go through before the "Access Denied" message is sent to the subscription
+				if (await accessChk)
+					return;
+
+				LogSubscriptionDrop();
+				// we go through the queue to avoid the need for any lock
+				_bus.Publish(new SubscriptionMessage.DropSubscription(subscription.CorrelationId, SubscriptionDropReason.AccessDenied));
+			}
+		} catch (Exception ex) {
+			LogException(ex);
+		}
+
+		void LogSubscriptionDrop() {
+			Log.Debug(
+				"Dropping live subscription to stream: {streamId} (Connection ID: {connectionId}) following new stream metadata.",
+				subscription.EventStreamId, subscription.ConnectionId);
+		}
+
+		void LogException(Exception ex) {
+			Log.Error(ex, "Failed to check access for live subscription to stream: {streamId} (Connection ID: {connectionId}) following new stream metadata. Live subscription will continue to run.",
+				subscription.EventStreamId, subscription.ConnectionId);
+		}
+	}
+
+	private async ValueTask<ResolvedEvent> ResolveLinkToEvent(EventRecord eventRecord, long commitPosition, CancellationToken token) {
+		if (eventRecord.EventType is SystemEventTypes.LinkTo) {
+			try {
+				string[] parts = Helper.UTF8NoBom.GetString(eventRecord.Data.Span).Split(LinkToSeparator, 2);
+				long eventNumber = long.Parse(parts[0]);
+				string streamName = parts[1];
+				var streamId = _readIndex.GetStreamId(streamName);
+				var res = await _readIndex.ReadEvent(streamName, streamId, eventNumber, token);
+
+				return res.Result is ReadEventResult.Success
+					? ResolvedEvent.ForResolvedLink(res.Record, eventRecord, commitPosition)
+					: ResolvedEvent.ForFailedResolvedLink(eventRecord, res.Result, commitPosition);
+			} catch (Exception exc) {
+				Log.Error(exc, "Error while resolving link for event record: {eventRecord}",
+					eventRecord.ToString());
+			}
+
+			// return unresolved link
+			return ResolvedEvent.ForFailedResolvedLink(eventRecord, ReadEventResult.Error, commitPosition);
+		}
+
+		return ResolvedEvent.ForUnresolvedEvent(eventRecord, commitPosition);
+	}
+
+	private void ReissueReadsFor(string streamId, long commitPosition, long eventNumber) {
+		if (!_pollTopics.TryGetValue(streamId, out var pollTopic))
+			return;
+
+		List<PollSubscription> survivors = null;
+		foreach (var poller in pollTopic) {
+			if (commitPosition <= poller.LastIndexedPosition || eventNumber <= poller.LastEventNumber) {
+				survivors ??= [];
+				survivors.Add(poller);
+			} else {
+				_bus.Publish(CloneReadRequestWithNoPollFlag(poller.OriginalRequest));
+			}
+		}
+
+		_pollTopics.Remove(streamId);
+		if (survivors != null)
+			_pollTopics.Add(streamId, survivors);
+	}
+
+	private class Subscription(
+		Guid correlationId,
+		IEnvelope envelope,
+		Guid connectionId,
+		string eventStreamId,
+		bool resolveLinkTos,
+		long lastIndexedPosition,
+		long lastEventNumber,
+		ClaimsPrincipal user,
+		IEventFilter eventFilter,
+		int? checkpointInterval,
+		int checkpointIntervalCurrent) {
+		public readonly Guid CorrelationId = correlationId;
+		public readonly IEnvelope Envelope = envelope;
+		public readonly Guid ConnectionId = connectionId;
+		public readonly string EventStreamId = eventStreamId;
+		public readonly bool ResolveLinkTos = resolveLinkTos;
+		public readonly long LastIndexedPosition = lastIndexedPosition;
+		public readonly long LastEventNumber = lastEventNumber;
+		public readonly ClaimsPrincipal User = user;
+		public readonly IEventFilter EventFilter = eventFilter;
+		public readonly int? CheckpointInterval = checkpointInterval;
+		public int CheckpointIntervalCurrent = checkpointInterval == null ? 0 : checkpointIntervalCurrent;
+	}
+
+	private class PollSubscription(
+		DateTime expireAt,
+		long lastIndexedPosition,
+		long lastEventNumber,
+		Message originalRequest) {
+		public readonly DateTime ExpireAt = expireAt;
+		public readonly long LastIndexedPosition = lastIndexedPosition;
+		public readonly long LastEventNumber = lastEventNumber;
+		public readonly Message OriginalRequest = originalRequest;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/SystemNames.cs b/src/KurrentDB.Core/Services/SystemNames.cs
new file mode 100644
index 00000000000..054b85d27be
--- /dev/null
+++ b/src/KurrentDB.Core/Services/SystemNames.cs
@@ -0,0 +1,198 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.Services;
+
+public static class SystemHeaders {
+	public const string ExpectedVersion = "Kurrent-ExpectedVersion";
+	public const string RequireLeader = "Kurrent-RequireLeader";
+	public const string ResolveLinkTos = "Kurrent-ResolveLinkTos";
+	public const string LongPoll = "Kurrent-LongPoll";
+	public const string TrustedAuth = "Kurrent-TrustedAuth";
+	public const string ProjectionPosition = "Kurrent-Position";
+	public const string HardDelete = "Kurrent-HardDelete";
+	public const string EventId = "Kurrent-EventId";
+	public const string EventType = "Kurrent-EventType";
+	public const string CurrentVersion = "Kurrent-CurrentVersion";
+
+	// Legacy ES-* headers
+	public const string LegacyExpectedVersion = "ES-ExpectedVersion";
+	public const string LegacyRequireLeader = "ES-RequireLeader";
+	public const string RequireMaster = "ES-RequireMaster"; // For backwards compatibility
+	public const string LegacyResolveLinkTos = "ES-ResolveLinkTos";
+	public const string LegacyLongPoll = "ES-LongPoll";
+	public const string LegacyTrustedAuth = "ES-TrustedAuth";
+	public const string LegacyProjectionPosition = "ES-Position";
+	public const string LegacyHardDelete = "ES-HardDelete";
+	public const string LegacyEventId = "ES-EventId";
+	public const string LegacyEventType = "ES-EventType";
+	public const string LegacyCurrentVersion = "ES-CurrentVersion";
+}
+
+public static class SystemStreams {
+	public const string PersistentSubscriptionConfig = "$persistentSubscriptionConfig";
+	public const string AllStream = "$all";
+	public const string EventTypesStream = "$event-types";
+	public const string StreamsStream = "$streams";
+	public const string StreamsCreatedStream = "$streams-created";
+	public const string SettingsStream = "$settings";
+	public const string StatsStreamPrefix = "$stats";
+	public const string ScavengesStream = "$scavenges";
+	public const string EpochInformationStream = "$epoch-information";
+	public const string ScavengePointsStream = "$scavengePoints";
+
+	public const string AuthorizationPolicyRegistryStream = "$authorization-policy-settings";
+
+	// mem streams
+	public const string NodeStateStream = "$mem-node-state";
+	public const string GossipStream = "$mem-gossip";
+
+	public static bool IsSystemStream(string streamId) => streamId is ['$', ..];
+
+	// "" is an invalid name, and so metadata cannot be set for it
+	public static bool IsInvalidStream(string streamId) {
+		return string.IsNullOrEmpty(streamId) || streamId == "$$";
+	}
+
+	public static string MetastreamOf(string streamId) {
+		return $"$${streamId}";
+	}
+
+	public static bool IsMetastream(string streamId) => streamId is ['$', '$', ..];
+
+	public static string OriginalStreamOf(string metastreamId) {
+		return metastreamId[2..];
+	}
+
+	public static bool IsInMemoryStream(string streamId) {
+		return streamId.StartsWith("$mem-");
+	}
+}
+
+public static class SystemMetadata {
+	public const string MaxAge = "$maxAge";
+	public const string MaxCount = "$maxCount";
+	public const string TruncateBefore = "$tb";
+	public const string TempStream = "$tmp";
+	public const string CacheControl = "$cacheControl";
+
+	public const string Acl = "$acl";
+	public const string AclRead = "$r";
+	public const string AclWrite = "$w";
+	public const string AclDelete = "$d";
+	public const string AclMetaRead = "$mr";
+	public const string AclMetaWrite = "$mw";
+
+	public const string UserStreamAcl = "$userStreamAcl";
+	public const string SystemStreamAcl = "$systemStreamAcl";
+}
+
+public static class SystemEventTypes {
+	private static readonly char[] _linkToSeparator = new[] { '@' };
+	public const string StreamDeleted = "$streamDeleted";
+	public const string StatsCollection = "$statsCollected";
+	public const string LinkTo = "$>";
+	public const string StreamReference = "$@";
+	public const string StreamMetadata = "$metadata";
+	public const string Settings = "$settings";
+	public const string StreamCreated = "$stream";
+	public const string EpochInformation = "$epoch-information";
+
+	public const string V2__StreamCreated_InIndex = "StreamCreated";
+	public const string V1__StreamCreated__ = "$stream-created";
+	public const string V1__StreamCreatedImplicit__ = "$stream-created-implicit";
+
+	public const string ScavengeStarted = "$scavengeStarted";
+	public const string ScavengeCompleted = "$scavengeCompleted";
+	public const string ScavengeChunksCompleted = "$scavengeChunksCompleted";
+	public const string ScavengeMergeCompleted = "$scavengeMergeCompleted";
+	public const string ScavengeIndexCompleted = "$scavengeIndexCompleted";
+	public const string EmptyEventType = "";
+	public const string EventTypeDefined = "$event-type";
+	public const string ScavengePoint = "$scavengePoint";
+
+	public const string AuthorizationPolicyChanged = "$authorization-policy-changed";
+	public const string PersistentSubscriptionConfig = "$PersistentConfig";
+
+	public static string StreamReferenceEventToStreamId(string eventType, ReadOnlyMemory<byte> data) {
+		string streamId;
+		switch (eventType) {
+			case LinkTo: {
+				string[] parts = Helper.UTF8NoBom.GetString(data.Span).Split(_linkToSeparator, 2);
+				streamId = parts[1];
+				break;
+			}
+			case StreamReference:
+			case V1__StreamCreated__:
+			case V2__StreamCreated_InIndex: {
+				streamId = Helper.UTF8NoBom.GetString(data.Span);
+				break;
+			}
+			default:
+				throw new NotSupportedException("Unknown event type: " + eventType);
+		}
+
+		return streamId;
+	}
+
+	public static string StreamReferenceEventToStreamId(string eventType, string data) {
+		string streamId;
+		switch (eventType) {
+			case LinkTo: {
+				string[] parts = data.Split(_linkToSeparator, 2);
+				streamId = parts[1];
+				break;
+			}
+			case StreamReference:
+			case V1__StreamCreated__:
+			case V2__StreamCreated_InIndex: {
+				streamId = data;
+				break;
+			}
+			default:
+				throw new NotSupportedException("Unknown event type: " + eventType);
+		}
+
+		return streamId;
+	}
+
+	public static long EventLinkToEventNumber(string link) {
+		string[] parts = link.Split(_linkToSeparator, 2);
+		return long.Parse(parts[0]);
+	}
+}
+
+public static class SystemRoles {
+	public const string Admins = "$admins";
+	public const string Operations = "$ops";
+	public const string All = "$all";
+}
+
+/// <summary>
+/// System supported consumer strategies for use with persistent subscriptions.
+/// </summary>
+public static class SystemConsumerStrategies {
+	/// <summary>
+	/// Distributes events to a single client until it is full. Then round robin to the next client.
+	/// </summary>
+	public const string DispatchToSingle = "DispatchToSingle";
+
+	/// <summary>
+	/// Distribute events to each client in a round robin fashion.
+	/// </summary>
+	public const string RoundRobin = "RoundRobin";
+
+	/// <summary>
+	/// Distribute events of the same streamId to the same client until it disconnects on a best efforts basis.
+	/// Designed to be used with indexes such as the category projection.
+	/// </summary>
+	public const string Pinned = "Pinned";
+
+	/// <summary>
+	/// Distribute events of the same correlationId to the same client until it disconnects on a best efforts basis.
+	/// </summary>
+	public const string PinnedByCorrelation = "PinnedByCorrelation";
+}
diff --git a/src/KurrentDB.Core/Services/SystemUsers.cs b/src/KurrentDB.Core/Services/SystemUsers.cs
new file mode 100644
index 00000000000..80eba4edcae
--- /dev/null
+++ b/src/KurrentDB.Core/Services/SystemUsers.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services;
+
+public static class SystemUsers {
+	public const string Admin = "admin";
+	public const string Operations = "ops";
+	public const string DefaultAdminPassword = "changeit";
+	public const string DefaultOpsPassword = "changeit";
+}
diff --git a/src/KurrentDB.Core/Services/TcpSendService.cs b/src/KurrentDB.Core/Services/TcpSendService.cs
new file mode 100644
index 00000000000..d51abb03382
--- /dev/null
+++ b/src/KurrentDB.Core/Services/TcpSendService.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+
+namespace KurrentDB.Core.Services;
+
+public class TcpSendService : IHandle<TcpMessage.TcpSend> {
+	public void Handle(TcpMessage.TcpSend message) {
+		// todo: histogram metric?
+		message.ConnectionManager.SendMessage(message.Message);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/TimerService/IScheduler.cs b/src/KurrentDB.Core/Services/TimerService/IScheduler.cs
new file mode 100644
index 00000000000..fb857ebc301
--- /dev/null
+++ b/src/KurrentDB.Core/Services/TimerService/IScheduler.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Services.TimerService;
+
+public interface IScheduler : IDisposable {
+	void Stop();
+	void Schedule(TimeSpan after, Action<IScheduler, object> callback, object state);
+}
diff --git a/src/KurrentDB.Core/Services/TimerService/ITimeProvider.cs b/src/KurrentDB.Core/Services/TimerService/ITimeProvider.cs
new file mode 100644
index 00000000000..81cd226a6c3
--- /dev/null
+++ b/src/KurrentDB.Core/Services/TimerService/ITimeProvider.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Services.TimerService;
+
+public interface ITimeProvider {
+	DateTime UtcNow { get; }
+	DateTime LocalTime { get; }
+}
diff --git a/src/KurrentDB.Core/Services/TimerService/ITimer.cs b/src/KurrentDB.Core/Services/TimerService/ITimer.cs
new file mode 100644
index 00000000000..2d23cfc6703
--- /dev/null
+++ b/src/KurrentDB.Core/Services/TimerService/ITimer.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Services.TimerService;
+
+public interface ITimer : IDisposable {
+	void FireIn(int milliseconds, Action callback);
+}
diff --git a/src/KurrentDB.Core/Services/TimerService/RealTimeProvider.cs b/src/KurrentDB.Core/Services/TimerService/RealTimeProvider.cs
new file mode 100644
index 00000000000..c420cc6bc59
--- /dev/null
+++ b/src/KurrentDB.Core/Services/TimerService/RealTimeProvider.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Services.TimerService;
+
+public class RealTimeProvider : ITimeProvider {
+	public DateTime UtcNow {
+		get { return DateTime.UtcNow; }
+	}
+
+	public DateTime LocalTime {
+		get { return DateTime.Now; }
+	}
+}
diff --git a/src/KurrentDB.Core/Services/TimerService/RealTimer.cs b/src/KurrentDB.Core/Services/TimerService/RealTimer.cs
new file mode 100644
index 00000000000..602cd1d65af
--- /dev/null
+++ b/src/KurrentDB.Core/Services/TimerService/RealTimer.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+
+namespace KurrentDB.Core.Services.TimerService;
+
+public sealed class RealTimer : ITimer {
+	private Action _callback;
+	private readonly Timer _timer;
+
+	public RealTimer() {
+		_timer = new Timer(InvokeCallback, null, Timeout.Infinite, Timeout.Infinite);
+	}
+
+	private void InvokeCallback(object state) {
+		_callback?.Invoke();
+	}
+
+	public void FireIn(int milliseconds, Action callback) {
+		_callback = callback;
+		var dueTime = milliseconds == Timeout.Infinite ? Timeout.Infinite : Math.Max(0, milliseconds);
+		_timer.Change(dueTime, Timeout.Infinite);
+	}
+
+	public void Dispose() {
+		_timer.Dispose();
+	}
+}
diff --git a/src/KurrentDB.Core/Services/TimerService/ThreadBasedScheduler.cs b/src/KurrentDB.Core/Services/TimerService/ThreadBasedScheduler.cs
new file mode 100644
index 00000000000..c5a6d754488
--- /dev/null
+++ b/src/KurrentDB.Core/Services/TimerService/ThreadBasedScheduler.cs
@@ -0,0 +1,158 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.Monitoring.Stats;
+using KurrentDB.Core.Time;
+using Serilog;
+
+namespace KurrentDB.Core.Services.TimerService;
+
+public sealed class ThreadBasedScheduler : IMonitoredQueue, IScheduler {
+	private static readonly ILogger Log = Serilog.Log.ForContext<ThreadBasedScheduler>();
+	public string Name => _queueStats.Name;
+
+	private readonly ConcurrentQueueWrapper<ScheduledTask> _pending = new();
+	private readonly ManualResetEventSlim _pendingEvent = new(false);
+	private readonly PairingHeap<ScheduledTask> _tasks = new((x, y) => x.DueTime < y.DueTime);
+
+	private readonly IClock _timeProvider;
+
+	private volatile bool _stop;
+
+	private readonly QueueStatsCollector _queueStats;
+	private readonly QueueTracker _tracker;
+	private readonly TaskCompletionSource<object> _tcs = new();
+
+	private long _nextWakeupTimeTicks = long.MinValue;
+
+	public Task Task => _tcs.Task;
+
+	public ThreadBasedScheduler(
+		QueueStatsManager queueStatsManager,
+		QueueTrackers trackers,
+		IClock timeProvider = null) {
+		_timeProvider = timeProvider ?? Clock.Instance;
+		_queueStats = queueStatsManager.CreateQueueStatsCollector("Timer");
+		_tracker = trackers.GetTrackerForQueue("Timer");
+
+		new Thread(DoTiming) {
+			IsBackground = true,
+			Name = Name
+		}.Start();
+	}
+
+	public void Stop() {
+		Dispose();
+	}
+
+	public void Schedule(TimeSpan after, Action<IScheduler, object> callback, object state) {
+		var nextWakeup = Interlocked.Read(ref _nextWakeupTimeTicks);
+		var now = _timeProvider.Now;
+
+		var dueTime = now.Add(after);
+		_pending.Enqueue(new ScheduledTask(dueTime, callback, state));
+
+		// don't unnecessarily wake up the timer thread if it's going to wake up before this task's due time anyway
+		if (nextWakeup < now.Ticks || nextWakeup > dueTime.Ticks)
+			_pendingEvent.Set();
+	}
+
+	private void DoTiming() {
+		_queueStats.Start();
+		QueueMonitor.Default.Register(this);
+
+		var minTimeout = TimeSpan.FromMilliseconds(1);
+		var maxTimeout = TimeSpan.FromSeconds(5);
+
+		while (!_stop) {
+			try {
+				_queueStats.EnterBusy();
+				_queueStats.ProcessingStarted<SchedulePendingTasks>(_pending.Count);
+
+				_pendingEvent.Reset();
+
+				int pending = 0;
+				while (_pending.TryDequeue(out var task)) {
+					_tasks.Add(task);
+					pending += 1;
+				}
+
+				_queueStats.ProcessingEnded(pending);
+
+				_queueStats.ProcessingStarted<ExecuteScheduledTasks>(_tasks.Count);
+				int processed = 0;
+
+				Instant? nextTaskDueTime;
+				while (true) {
+					if (_tasks.Count == 0) {
+						nextTaskDueTime = null;
+						break;
+					}
+
+					nextTaskDueTime = _tasks.FindMin().DueTime;
+					if (nextTaskDueTime > _timeProvider.Now)
+						break;
+
+					processed += 1;
+					var scheduledTask = _tasks.DeleteMin();
+					var now = _tracker.RecordMessageDequeued(enqueuedAt: scheduledTask.DueTime);
+					scheduledTask.Action(this, scheduledTask.State);
+					var label = (scheduledTask.State as TimerMessage.Schedule)?.ReplyMessage.Label;
+					_tracker.RecordMessageProcessed(now, label ?? "");
+				}
+
+				_queueStats.ProcessingEnded(processed);
+
+				if (processed == 0 && !_pendingEvent.IsSet) {
+					_queueStats.EnterIdle();
+
+					// give some processor time to other threads since we're free right now
+					Thread.Yield();
+
+					var timeout = nextTaskDueTime?.ElapsedTimeSince(_timeProvider.Now) ?? maxTimeout;
+
+					if (timeout <= TimeSpan.Zero)
+						// we have already reached the due time of the next task, so we process it immediately
+						continue;
+
+					timeout = new TimeSpan(Math.Clamp(timeout.Ticks, minTimeout.Ticks, maxTimeout.Ticks));
+					Interlocked.Exchange(ref _nextWakeupTimeTicks, _timeProvider.Now.Add(timeout).Ticks);
+					_pendingEvent.Wait(timeout);
+				}
+
+			} catch (Exception ex) {
+				Log.Error(ex, "Error executing scheduled task");
+				_tcs.TrySetException(ex);
+			}
+		}
+
+		_queueStats.Stop();
+		QueueMonitor.Default.Unregister(this);
+		_pendingEvent.Dispose();
+	}
+
+	public void Dispose() {
+		_stop = true;
+	}
+
+	public QueueStats GetStatistics() {
+		return _queueStats.GetStatistics(_tasks.Count);
+	}
+
+	private struct ScheduledTask(Instant dueTime, Action<IScheduler, object> action, object state) {
+		public readonly Instant DueTime = dueTime;
+		public readonly Action<IScheduler, object> Action = action;
+		public readonly object State = state;
+	}
+
+	private class SchedulePendingTasks;
+
+	private class ExecuteScheduledTasks;
+}
diff --git a/src/KurrentDB.Core/Services/TimerService/TimerBasedScheduler.cs b/src/KurrentDB.Core/Services/TimerService/TimerBasedScheduler.cs
new file mode 100644
index 00000000000..bb0ab02af84
--- /dev/null
+++ b/src/KurrentDB.Core/Services/TimerService/TimerBasedScheduler.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.DataStructures;
+
+namespace KurrentDB.Core.Services.TimerService;
+
+public class TimerBasedScheduler : IScheduler {
+	private readonly PairingHeap<ScheduledTask> _tasks = new((x, y) => x.DueTime < y.DueTime);
+	private readonly ITimeProvider _timeProvider;
+	private readonly ITimer _timer;
+	private readonly object _queueLock = new();
+
+	public TimerBasedScheduler(ITimer timer, ITimeProvider timeProvider) {
+		_timeProvider = Ensure.NotNull(timeProvider);
+		_timer = Ensure.NotNull(timer);
+	}
+
+	public void Stop() {
+		Dispose();
+	}
+
+	public void Schedule(TimeSpan after, Action<IScheduler, object> callback, object state) {
+		lock (_queueLock) {
+			_tasks.Add(new ScheduledTask(_timeProvider.UtcNow.Add(after), callback, state));
+			ResetTimer();
+		}
+	}
+
+	protected void ProcessOperations() {
+		while (_tasks.Count > 0 && _tasks.FindMin().DueTime <= _timeProvider.UtcNow) {
+			var scheduledTask = _tasks.DeleteMin();
+			scheduledTask.Action(this, scheduledTask.State);
+		}
+	}
+
+	private void OnTimerFired() {
+		lock (_queueLock) {
+			ProcessOperations();
+			ResetTimer();
+		}
+	}
+
+	private void ResetTimer() {
+		if (_tasks.Count > 0) {
+			var tuple = _tasks.FindMin();
+			_timer.FireIn((int)(tuple.DueTime - _timeProvider.UtcNow).TotalMilliseconds, OnTimerFired);
+		} else {
+			_timer.FireIn(Timeout.Infinite, OnTimerFired);
+		}
+	}
+
+	public void Dispose() {
+		_timer.Dispose();
+	}
+
+	private struct ScheduledTask(DateTime dueTime, Action<IScheduler, object> action, object state) {
+		public readonly DateTime DueTime = dueTime;
+		public readonly Action<IScheduler, object> Action = action;
+		public readonly object State = state;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/TimerService/TimerMessage.cs b/src/KurrentDB.Core/Services/TimerService/TimerMessage.cs
new file mode 100644
index 00000000000..a42b1e851f1
--- /dev/null
+++ b/src/KurrentDB.Core/Services/TimerService/TimerMessage.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Services.TimerService;
+
+public static partial class TimerMessage {
+	[DerivedMessage(CoreMessage.Timer)]
+	public partial class Schedule : Message {
+		public readonly TimeSpan TriggerAfter;
+		public readonly IEnvelope Envelope;
+		public readonly Message ReplyMessage;
+
+		private readonly Action _replyAction;
+
+		public static Schedule Create<T>(TimeSpan triggerAfter, IEnvelope envelope, T replyMessage) where T : Message {
+			return new Schedule(triggerAfter, envelope, replyMessage, () => envelope.ReplyWith(replyMessage));
+		}
+
+		private Schedule(TimeSpan triggerAfter, IEnvelope envelope, Message replyMessage, Action replyAction) {
+			TriggerAfter = triggerAfter;
+			Envelope = Ensure.NotNull(envelope);
+			ReplyMessage = Ensure.NotNull(replyMessage);
+			_replyAction = Ensure.NotNull(replyAction);
+		}
+
+		public void Reply() {
+			_replyAction();
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/TimerService/TimerService.cs b/src/KurrentDB.Core/Services/TimerService/TimerService.cs
new file mode 100644
index 00000000000..c6032db3885
--- /dev/null
+++ b/src/KurrentDB.Core/Services/TimerService/TimerService.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+
+namespace KurrentDB.Core.Services.TimerService;
+
+/// <summary>
+/// Timer service uses scheduler that is expected to be already running
+/// when it is passed to constructor and stopped on the disposal. This is done to
+/// make sure that we can handle timeouts and callbacks any time
+/// (even during system shutdowns and initialization)
+/// </summary>
+public class TimerService(IScheduler scheduler) : IDisposable,
+	IHandle<SystemMessage.BecomeShutdown>,
+	IHandle<TimerMessage.Schedule> {
+	public void Handle(SystemMessage.BecomeShutdown message) {
+		scheduler.Stop();
+	}
+
+	public void Handle(TimerMessage.Schedule message) {
+		scheduler.Schedule(
+			message.TriggerAfter,
+			static (scheduler, state) => OnTimerCallback(scheduler, state),
+			message);
+	}
+
+	private static void OnTimerCallback(IScheduler scheduler, object state) {
+		var msg = (TimerMessage.Schedule)state;
+		msg.Reply();
+	}
+
+	public void Dispose() {
+		scheduler.Dispose();
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Common/HashCode.cs b/src/KurrentDB.Core/Services/Transport/Common/HashCode.cs
new file mode 100644
index 00000000000..727985f5ab6
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Common/HashCode.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+
+namespace KurrentDB.Core.Services.Transport.Common;
+
+public readonly struct HashCode {
+	private readonly int _value;
+
+	private HashCode(int value) {
+		_value = value;
+	}
+
+	public static readonly HashCode Hash = default;
+
+	public HashCode Combine<T>(T? value) where T : struct => Combine(value ?? default);
+
+	public HashCode Combine<T>(T value) where T : struct {
+		unchecked {
+			return new((_value * 397) ^ value.GetHashCode());
+		}
+	}
+
+	public HashCode Combine(string value) {
+		unchecked {
+			return new((_value * 397) ^ (value?.GetHashCode() ?? 0));
+		}
+	}
+
+	public static HashCode Combine<T>(IEnumerable<T> values) where T : struct =>
+		values.Aggregate(Hash, (previous, value) => previous.Combine(value));
+
+	public static HashCode Combine(IEnumerable<string> values) =>
+		values.Aggregate(Hash, (previous, value) => previous.Combine(value));
+
+	public static implicit operator int(HashCode value) => value._value;
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Common/Position.cs b/src/KurrentDB.Core/Services/Transport/Common/Position.cs
new file mode 100644
index 00000000000..8412d9953c3
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Common/Position.cs
@@ -0,0 +1,162 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Services.Transport.Common;
+
+/// <summary>
+/// A structure referring to a potential logical record position
+/// in the Event Store transaction file.
+/// </summary>
+public readonly struct Position : IEquatable<Position>, IComparable<Position> {
+	/// <summary>
+	/// Position representing the start of the transaction file
+	/// </summary>
+	public static readonly Position Start = new Position(0, 0);
+
+	/// <summary>
+	/// Position representing the end of the transaction file
+	/// </summary>
+	public static readonly Position End = new Position(ulong.MaxValue, ulong.MaxValue);
+
+	public static Position FromInt64(long commitPosition, long preparePosition)
+		=> new Position(
+			commitPosition == -1 ? ulong.MaxValue : (ulong)commitPosition,
+			preparePosition == -1 ? ulong.MaxValue : (ulong)preparePosition);
+
+	/// <summary>
+	/// The commit position of the record
+	/// </summary>
+	public readonly ulong CommitPosition;
+
+	/// <summary>
+	/// The prepare position of the record.
+	/// </summary>
+	public readonly ulong PreparePosition;
+
+	/// <summary>
+	/// Constructs a position with the given commit and prepare positions.
+	/// It is not guaranteed that the position is actually the start of a
+	/// record in the transaction file.
+	///
+	/// The commit position cannot be less than the prepare position.
+	/// </summary>
+	/// <param name="commitPosition">The commit position of the record.</param>
+	/// <param name="preparePosition">The prepare position of the record.</param>
+	public Position(ulong commitPosition, ulong preparePosition) {
+		if (commitPosition < preparePosition)
+			throw new ArgumentOutOfRangeException(
+				nameof(commitPosition),
+				"The commit position cannot be less than the prepare position");
+
+		if (commitPosition > long.MaxValue && commitPosition != ulong.MaxValue) {
+			throw new ArgumentOutOfRangeException(nameof(commitPosition));
+		}
+
+
+		if (preparePosition > long.MaxValue && preparePosition != ulong.MaxValue) {
+			throw new ArgumentOutOfRangeException(nameof(preparePosition));
+		}
+
+		CommitPosition = commitPosition;
+		PreparePosition = preparePosition;
+	}
+
+	/// <summary>
+	/// Compares whether p1 &lt; p2.
+	/// </summary>
+	/// <param name="p1">A <see cref="Position" />.</param>
+	/// <param name="p2">A <see cref="Position" />.</param>
+	/// <returns>True if p1 &lt; p2.</returns>
+	public static bool operator <(Position p1, Position p2) =>
+		p1.CommitPosition < p2.CommitPosition ||
+		p1.CommitPosition == p2.CommitPosition && p1.PreparePosition < p2.PreparePosition;
+
+
+	/// <summary>
+	/// Compares whether p1 &gt; p2.
+	/// </summary>
+	/// <param name="p1">A <see cref="Position" />.</param>
+	/// <param name="p2">A <see cref="Position" />.</param>
+	/// <returns>True if p1 &gt; p2.</returns>
+	public static bool operator >(Position p1, Position p2) =>
+		p1.CommitPosition > p2.CommitPosition ||
+		p1.CommitPosition == p2.CommitPosition && p1.PreparePosition > p2.PreparePosition;
+
+	/// <summary>
+	/// Compares whether p1 &gt;= p2.
+	/// </summary>
+	/// <param name="p1">A <see cref="Position" />.</param>
+	/// <param name="p2">A <see cref="Position" />.</param>
+	/// <returns>True if p1 &gt;= p2.</returns>
+	public static bool operator >=(Position p1, Position p2) => p1 > p2 || p1 == p2;
+
+	/// <summary>
+	/// Compares whether p1 &lt;= p2.
+	/// </summary>
+	/// <param name="p1">A <see cref="Position" />.</param>
+	/// <param name="p2">A <see cref="Position" />.</param>
+	/// <returns>True if p1 &lt;= p2.</returns>
+	public static bool operator <=(Position p1, Position p2) => p1 < p2 || p1 == p2;
+
+	/// <summary>
+	/// Compares p1 and p2 for equality.
+	/// </summary>
+	/// <param name="p1">A <see cref="Position" />.</param>
+	/// <param name="p2">A <see cref="Position" />.</param>
+	/// <returns>True if p1 is equal to p2.</returns>
+	public static bool operator ==(Position p1, Position p2) =>
+		Equals(p1, p2);
+
+	/// <summary>
+	/// Compares p1 and p2 for equality.
+	/// </summary>
+	/// <param name="p1">A <see cref="Position" />.</param>
+	/// <param name="p2">A <see cref="Position" />.</param>
+	/// <returns>True if p1 is not equal to p2.</returns>
+	public static bool operator !=(Position p1, Position p2) => !(p1 == p2);
+
+	///<inheritdoc cref="IComparable{T}.CompareTo"/>
+	public int CompareTo(Position other) => this == other ? 0 : this > other ? 1 : -1;
+
+	/// <summary>
+	/// Indicates whether this instance and a specified object are equal.
+	/// </summary>
+	/// <returns>
+	/// true if <paramref name="obj"/> and this instance are the same type and represent the same value; otherwise, false.
+	/// </returns>
+	/// <param name="obj">Another object to compare to. </param><filterpriority>2</filterpriority>
+	public override bool Equals(object obj) => obj is Position position && Equals(position);
+
+	/// <summary>
+	/// Compares this instance of <see cref="Position" /> for equality
+	/// with another instance.
+	/// </summary>
+	/// <param name="other">A <see cref="Position" /></param>
+	/// <returns>True if this instance is equal to the other instance.</returns>
+	public readonly bool Equals(Position other) =>
+		CommitPosition == other.CommitPosition && PreparePosition == other.PreparePosition;
+
+	/// <summary>
+	/// Returns the hash code for this instance.
+	/// </summary>
+	/// <returns>
+	/// A 32-bit signed integer that is the hash code for this instance.
+	/// </returns>
+	/// <filterpriority>2</filterpriority>
+	public override int GetHashCode() => HashCode.Hash.Combine(CommitPosition).Combine(PreparePosition);
+
+	/// <summary>
+	/// Returns the fully qualified type name of this instance.
+	/// </summary>
+	/// <returns>
+	/// A <see cref="T:System.String"/> containing a fully qualified type name.
+	/// </returns>
+	/// <filterpriority>2</filterpriority>
+	public override string ToString() => this == End ? "End" : $"C:{CommitPosition}/P:{PreparePosition}";
+
+	public readonly (long commitPosition, long preparePosition) ToInt64() => Equals(End)
+		? (-1, -1)
+		: ((long)CommitPosition, (long)PreparePosition);
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Common/StreamRevision.cs b/src/KurrentDB.Core/Services/Transport/Common/StreamRevision.cs
new file mode 100644
index 00000000000..b331a6d7bbd
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Common/StreamRevision.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Services.Transport.Common;
+
+public readonly struct StreamRevision : IEquatable<StreamRevision>, IComparable<StreamRevision> {
+	private readonly ulong _value;
+
+	public static readonly StreamRevision Start = new(0);
+	public static readonly StreamRevision End = new(ulong.MaxValue);
+
+	public static StreamRevision FromInt64(long value) => value == -1 ? End : new(Convert.ToUInt64(value));
+
+	public StreamRevision(ulong value) {
+		if (value > long.MaxValue && value != ulong.MaxValue) {
+			throw new ArgumentOutOfRangeException(nameof(value));
+		}
+
+		_value = value;
+	}
+
+	public int CompareTo(StreamRevision other) => _value.CompareTo(other._value);
+	public bool Equals(StreamRevision other) => _value == other._value;
+	public override bool Equals(object obj) => obj is StreamRevision other && Equals(other);
+	public override int GetHashCode() => _value.GetHashCode();
+	public static bool operator ==(StreamRevision left, StreamRevision right) => left.Equals(right);
+	public static bool operator !=(StreamRevision left, StreamRevision right) => !left.Equals(right);
+
+	public static StreamRevision operator +(StreamRevision left, ulong right) {
+		checked {
+			return new(left._value + right);
+		}
+	}
+
+	public static StreamRevision operator +(ulong left, StreamRevision right) {
+		checked {
+			return new(left + right._value);
+		}
+	}
+
+	public static StreamRevision operator -(StreamRevision left, ulong right) {
+		checked {
+			return new(left._value - right);
+		}
+	}
+
+	public static StreamRevision operator -(ulong left, StreamRevision right) {
+		checked {
+			return new(left - right._value);
+		}
+	}
+
+	public static bool operator >(StreamRevision left, StreamRevision right) => left._value > right._value;
+	public static bool operator <(StreamRevision left, StreamRevision right) => left._value < right._value;
+	public static bool operator >=(StreamRevision left, StreamRevision right) => left._value >= right._value;
+	public static bool operator <=(StreamRevision left, StreamRevision right) => left._value <= right._value;
+	public long ToInt64() => Equals(End) ? -1 : Convert.ToInt64(_value);
+	public static implicit operator ulong(StreamRevision streamRevision) => streamRevision._value;
+	public override string ToString() => this == End ? "End" : _value.ToString();
+	public ulong ToUInt64() => _value;
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.AllSubscription.cs b/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.AllSubscription.cs
new file mode 100644
index 00000000000..df4e763959c
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.AllSubscription.cs
@@ -0,0 +1,355 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.Transport.Common;
+using Serilog;
+
+namespace KurrentDB.Core.Services.Transport.Enumerators;
+
+static partial class Enumerator {
+	public class AllSubscription : IAsyncEnumerator<ReadResponse> {
+		private static readonly ILogger Log = Serilog.Log.ForContext<AllSubscription>();
+
+		private readonly IExpiryStrategy _expiryStrategy;
+		private readonly Guid _subscriptionId;
+		private readonly IPublisher _bus;
+		private readonly bool _resolveLinks;
+		private readonly ClaimsPrincipal _user;
+		private readonly bool _requiresLeader;
+		private readonly CancellationTokenSource _cts;
+		private readonly Channel<ReadResponse> _channel;
+		private readonly Channel<(ulong SequenceNumber, ResolvedEvent ResolvedEvent)> _liveEvents;
+
+		private ReadResponse _current;
+		private bool _disposed;
+		private Position? _currentPosition;
+
+		public ReadResponse Current => _current;
+		public string SubscriptionId { get; }
+
+		public AllSubscription(
+			IPublisher bus,
+			IExpiryStrategy expiryStrategy,
+			Position? checkpoint,
+			bool resolveLinks,
+			ClaimsPrincipal user,
+			bool requiresLeader,
+			CancellationToken cancellationToken) {
+			_expiryStrategy = expiryStrategy;
+			_subscriptionId = Guid.NewGuid();
+			_bus = Ensure.NotNull(bus);
+			_resolveLinks = resolveLinks;
+			_user = user;
+			_requiresLeader = requiresLeader;
+			_cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+			_channel = Channel.CreateBounded<ReadResponse>(BoundedChannelOptions);
+			_liveEvents = Channel.CreateBounded<(ulong, ResolvedEvent)>(LiveChannelOptions);
+
+			SubscriptionId = _subscriptionId.ToString();
+
+			Subscribe(checkpoint, _cts.Token);
+		}
+
+		public ValueTask DisposeAsync() {
+			if (_disposed) {
+				return ValueTask.CompletedTask;
+			}
+
+			Log.Verbose("Subscription {subscriptionId} to $all disposed.", _subscriptionId);
+
+			_disposed = true;
+			Unsubscribe();
+
+			_cts.Cancel();
+			_cts.Dispose();
+
+			return ValueTask.CompletedTask;
+		}
+
+		public async ValueTask<bool> MoveNextAsync() {
+ReadLoop:
+
+			if (!await _channel.Reader.WaitToReadAsync(_cts.Token)) {
+				return false;
+			}
+
+			var readResponse = await _channel.Reader.ReadAsync(_cts.Token);
+
+			if (readResponse is ReadResponse.EventReceived eventReceived) {
+				var eventPos = eventReceived.Event.OriginalPosition!.Value;
+				var position = Position.FromInt64(eventPos.CommitPosition, eventPos.PreparePosition);
+
+				if (_currentPosition.HasValue && position <= _currentPosition.Value) {
+					// this should no longer happen
+					Log.Warning("Subscription {subscriptionId} to $all skipping event {position} as it is less than {currentPosition}.",
+						_subscriptionId, position, _currentPosition);
+					goto ReadLoop;
+				}
+
+				Log.Verbose("Subscription {subscriptionId} to $all seen event {position}.", _subscriptionId, position);
+
+				_currentPosition = position;
+			}
+
+			_current = readResponse;
+
+			return true;
+		}
+
+		private void Subscribe(Position? checkpoint, CancellationToken ct) {
+			Task.Factory.StartNew(() => MainLoop(checkpoint, ct), ct);
+		}
+
+		private static TFPos ConvertCheckpoint(Position? checkpoint, TFPos lastLivePos) {
+			if (!checkpoint.HasValue)
+				return new TFPos(-1, -1);
+
+			if (checkpoint == Position.End)
+				return lastLivePos;
+
+			var (commitPos, preparePos) = checkpoint.Value.ToInt64();
+			return new TFPos(commitPos, preparePos);
+		}
+
+		private async Task MainLoop(Position? checkpointPosition, CancellationToken ct) {
+			try {
+				Log.Debug("Subscription {subscriptionId} to $all has started at checkpoint {position}",
+					_subscriptionId, checkpointPosition?.ToString() ?? "Start");
+
+				var confirmationLastPos = await SubscribeToLive();
+				await ConfirmSubscription(ct);
+
+				// the event number we most recently sent on towards the client.
+				// (we should send on events _after_ this)
+				var checkpoint = ConvertCheckpoint(checkpointPosition, confirmationLastPos);
+
+				// the most recently read sequence number from the live channel. 0 when we haven't read any.
+				var sequenceNumber = 0UL;
+
+				if (checkpoint >= confirmationLastPos)
+					(checkpoint, sequenceNumber) = await GoLive(checkpoint, sequenceNumber, ct);
+
+				while (true) {
+					ct.ThrowIfCancellationRequested();
+					checkpoint = await CatchUp(checkpoint, ct);
+					(checkpoint, sequenceNumber) = await GoLive(checkpoint, sequenceNumber, ct);
+				}
+			} catch (Exception ex) {
+				if (ex is not (OperationCanceledException or ReadResponseException.InvalidPosition))
+					Log.Error(ex, "Subscription {subscriptionId} to $all experienced an error.", _subscriptionId);
+				_channel.Writer.TryComplete(ex);
+			} finally {
+				Log.Debug("Subscription {subscriptionId} to $all has ended.", _subscriptionId);
+			}
+		}
+
+		private async Task NotifyCaughtUp(TFPos checkpoint, CancellationToken ct) {
+			Log.Debug(
+				"Subscription {subscriptionId} to $all caught up at checkpoint {position}.",
+				_subscriptionId, checkpoint);
+
+			await _channel.Writer.WriteAsync(new ReadResponse.SubscriptionCaughtUp(), ct);
+		}
+
+		private async Task NotifyFellBehind(TFPos checkpoint, CancellationToken ct) {
+			Log.Debug(
+				"Subscription {subscriptionId} to $all fell behind at checkpoint {position}.",
+				_subscriptionId, checkpoint);
+
+			await _channel.Writer.WriteAsync(new ReadResponse.SubscriptionFellBehind(), ct);
+		}
+
+		private async ValueTask<(TFPos, ulong)> GoLive(TFPos checkpoint, ulong sequenceNumber, CancellationToken ct) {
+			await NotifyCaughtUp(checkpoint, ct);
+
+			await foreach (var liveEvent in _liveEvents.Reader.ReadAllAsync(ct)) {
+				var sequenceCorrect = liveEvent.SequenceNumber == sequenceNumber + 1;
+				sequenceNumber = liveEvent.SequenceNumber;
+
+				if (liveEvent.ResolvedEvent.OriginalPosition <= checkpoint) {
+					// skip because this event has already been sent towards the client
+					// (or the client specified a checkpoint for events that don't exist yet and so
+					// is not interested in them)
+					// nb: we can skip this event even if it had the wrong sequence number, it means
+					// we would have skipped the events that got discarded anyway.
+					continue;
+				}
+
+				if (!sequenceCorrect) {
+					// there's a gap in the sequence numbers, at least one live event was discarded
+					// due to the live channel becoming full.
+					// switch back to catchup to make sure we didn't miss anything we wanted to send.
+					await NotifyFellBehind(checkpoint, ct);
+					return (checkpoint, sequenceNumber);
+				}
+
+				// this is the next event to send towards the client. send it and update the checkpoint
+				await SendEventToSubscription(liveEvent.ResolvedEvent, ct);
+				checkpoint = liveEvent.ResolvedEvent.OriginalPosition!.Value;
+			}
+
+			throw new Exception($"Unexpected error: live events channel for subscription {_subscriptionId} to $all completed without exception");
+		}
+
+		private Task<TFPos> CatchUp(TFPos checkpoint, CancellationToken ct) {
+			Log.Verbose("Subscription {subscriptionId} to $all is catching up from checkpoint {position}", _subscriptionId, checkpoint);
+
+			var catchupCompletionTcs = new TaskCompletionSource<TFPos>();
+
+			// this is a safe use of AsyncTaskEnvelope. Only one call to OnMessage will be running
+			// at any given time because we only expect one reply and that reply kicks off the next read.
+			AsyncTaskEnvelope envelope = null;
+			envelope = new(OnMessage, ct);
+
+			ReadPage(checkpoint, envelope, ct);
+
+			return catchupCompletionTcs.Task;
+
+			async Task OnMessage(Message message, CancellationToken ct) {
+				try {
+					if (message is ClientMessage.NotHandled notHandled &&
+						TryHandleNotHandled(notHandled, out var ex))
+						throw ex;
+
+					if (message is not ClientMessage.ReadAllEventsForwardCompleted completed)
+						throw ReadResponseException.UnknownMessage
+							.Create<ClientMessage.ReadAllEventsForwardCompleted>(message);
+
+					switch (completed.Result) {
+						case ReadAllResult.Success:
+							foreach (var @event in completed.Events) {
+								var eventPosition = @event.OriginalPosition!.Value;
+
+								// this will only be true for the first event of the first page
+								// as we start page reads from the checkpoint's position
+								if (eventPosition <= checkpoint)
+									continue;
+
+								Log.Verbose("Subscription {subscriptionId} to $all received catch-up event {position}.", _subscriptionId, eventPosition);
+
+								await SendEventToSubscription(@event, ct);
+								checkpoint = eventPosition;
+							}
+
+							if (completed.IsEndOfStream) {
+								catchupCompletionTcs.TrySetResult(checkpoint);
+								return;
+							}
+
+							ReadPage(completed.NextPos, envelope, ct);
+							return;
+						case ReadAllResult.Expired:
+							ReadPage(completed.CurrentPos, envelope, ct);
+							return;
+						case ReadAllResult.AccessDenied:
+							throw new ReadResponseException.AccessDenied();
+						case ReadAllResult.InvalidPosition:
+							throw new ReadResponseException.InvalidPosition();
+						default:
+							throw ReadResponseException.UnknownError.Create(completed.Result);
+					}
+				} catch (Exception exception) {
+					catchupCompletionTcs.TrySetException(exception);
+				}
+			}
+		}
+
+		private async Task SendEventToSubscription(ResolvedEvent @event, CancellationToken ct) {
+			await _channel.Writer.WriteAsync(new ReadResponse.EventReceived(@event), ct);
+		}
+
+		private Task<TFPos> SubscribeToLive() {
+			var nextLiveSequenceNumber = 0UL;
+			var confirmationPositionTcs = new TaskCompletionSource<TFPos>();
+
+			_bus.Publish(new ClientMessage.SubscribeToStream(Guid.NewGuid(), _subscriptionId,
+				new CallbackEnvelope(OnSubscriptionMessage), _subscriptionId,
+				string.Empty, _resolveLinks, _user));
+
+			return confirmationPositionTcs.Task;
+
+			void OnSubscriptionMessage(Message message) {
+				try {
+					if (message is ClientMessage.NotHandled notHandled && TryHandleNotHandled(notHandled, out var ex))
+						throw ex;
+
+					switch (message) {
+						case ClientMessage.SubscriptionConfirmation confirmed:
+							long caughtUp = confirmed.LastIndexedPosition;
+
+							Log.Debug(
+								"Subscription {subscriptionId} to $all confirmed. LastIndexedPosition is {position:N0}.",
+								_subscriptionId, caughtUp);
+
+							confirmationPositionTcs.TrySetResult(new TFPos(caughtUp, caughtUp));
+							return;
+						case ClientMessage.SubscriptionDropped dropped:
+							Log.Debug(
+								"Subscription {subscriptionId} to $all dropped by subscription service: {droppedReason}",
+								_subscriptionId, dropped.Reason);
+							switch (dropped.Reason) {
+								case SubscriptionDropReason.AccessDenied:
+									throw new ReadResponseException.AccessDenied();
+								case SubscriptionDropReason.Unsubscribed:
+									return;
+								case SubscriptionDropReason.StreamDeleted: // applies only to regular streams
+								case SubscriptionDropReason.NotFound: // applies only to persistent subscriptions
+								default:
+									throw ReadResponseException.UnknownError.Create(dropped.Reason);
+							}
+						case ClientMessage.StreamEventAppeared appeared: {
+							Log.Verbose(
+								"Subscription {subscriptionId} to $all received live event {position}.",
+								_subscriptionId, appeared.Event.OriginalPosition!.Value);
+
+							if (!_liveEvents.Writer.TryWrite((++nextLiveSequenceNumber, appeared.Event))) {
+								// this cannot happen because _liveEvents does not have full mode 'wait'.
+								throw new Exception($"Unexpected error: could not write to live events channel for subscription {_subscriptionId} to $all");
+							}
+
+							return;
+						}
+						default:
+							throw ReadResponseException.UnknownMessage.Create<ClientMessage.SubscriptionConfirmation>(message);
+					}
+				} catch (Exception exception) {
+					_liveEvents.Writer.TryComplete(exception);
+					confirmationPositionTcs.TrySetException(exception);
+				}
+			}
+		}
+
+		private ValueTask ConfirmSubscription(CancellationToken ct) {
+			return _channel.Writer.WriteAsync(new ReadResponse.SubscriptionConfirmed(SubscriptionId), ct);
+		}
+
+		private void ReadPage(TFPos startPos, IEnvelope envelope, CancellationToken ct) {
+			Guid correlationId = Guid.NewGuid();
+			Log.Verbose("Subscription {subscriptionId} to $all reading next page starting from {position}.", _subscriptionId, startPos);
+
+			if (startPos is { CommitPosition: < 0, PreparePosition: < 0 })
+				startPos = new TFPos(0, 0);
+
+			_bus.Publish(new ClientMessage.ReadAllEventsForward(
+				correlationId, correlationId, envelope,
+				startPos.CommitPosition, startPos.PreparePosition, ReadBatchSize, _resolveLinks, _requiresLeader, null, _user,
+				replyOnExpired: true,
+				expires: _expiryStrategy.GetExpiry(),
+				cancellationToken: ct));
+		}
+
+		private void Unsubscribe() => _bus.Publish(new ClientMessage.UnsubscribeFromStream(Guid.NewGuid(), _subscriptionId, new NoopEnvelope(), _user));
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.AllSubscriptionFiltered.cs b/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.AllSubscriptionFiltered.cs
new file mode 100644
index 00000000000..24d6dcdbe17
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.AllSubscriptionFiltered.cs
@@ -0,0 +1,465 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.Transport.Common;
+using Serilog;
+using TFPos = KurrentDB.Core.Data.TFPos;
+
+namespace KurrentDB.Core.Services.Transport.Enumerators;
+
+partial class Enumerator {
+	public class AllSubscriptionFiltered : IAsyncEnumerator<ReadResponse> {
+		private static readonly ILogger Log = Serilog.Log.ForContext<AllSubscriptionFiltered>();
+
+		private readonly IExpiryStrategy _expiryStrategy;
+		private readonly Guid _subscriptionId;
+		private readonly IPublisher _bus;
+		private readonly bool _resolveLinks;
+		private readonly IEventFilter _eventFilter;
+		private readonly ClaimsPrincipal _user;
+		private readonly bool _requiresLeader;
+		private readonly uint _maxSearchWindow;
+		private readonly uint _checkpointInterval;
+		private readonly CancellationTokenSource _cts;
+		private readonly Channel<ReadResponse> _channel;
+		private readonly Channel<(ulong SequenceNumber, ResolvedEvent? ResolvedEvent, TFPos? Checkpoint)> _liveEvents;
+
+		private ReadResponse _current;
+		private bool _disposed;
+		private Position? _currentPosition;
+		private Position? _currentCheckpoint;
+
+		public ReadResponse Current => _current;
+		public string SubscriptionId { get; }
+
+		public AllSubscriptionFiltered(IPublisher bus,
+			IExpiryStrategy expiryStrategy,
+			Position? checkpoint,
+			bool resolveLinks,
+			IEventFilter eventFilter,
+			ClaimsPrincipal user,
+			bool requiresLeader,
+			uint? maxSearchWindow,
+			uint checkpointIntervalMultiplier,
+			CancellationToken cancellationToken) {
+			ArgumentOutOfRangeException.ThrowIfZero(checkpointIntervalMultiplier);
+
+			_expiryStrategy = expiryStrategy;
+			_subscriptionId = Guid.NewGuid();
+			_bus = Ensure.NotNull(bus);
+			_resolveLinks = resolveLinks;
+			_eventFilter = Ensure.NotNull(eventFilter);
+			_user = user;
+			_requiresLeader = requiresLeader;
+			_maxSearchWindow = maxSearchWindow ?? ReadBatchSize;
+			_checkpointInterval = checkpointIntervalMultiplier * _maxSearchWindow;
+			_cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+			_channel = Channel.CreateBounded<ReadResponse>(BoundedChannelOptions);
+			_liveEvents = Channel.CreateBounded<(ulong, ResolvedEvent?, TFPos?)>(LiveChannelOptions);
+
+			SubscriptionId = _subscriptionId.ToString();
+
+			Subscribe(checkpoint, _cts.Token);
+		}
+
+		public ValueTask DisposeAsync() {
+			if (_disposed) {
+				return ValueTask.CompletedTask;
+			}
+
+			Log.Verbose("Subscription {subscriptionId} to $all:{eventFilter} disposed.", _subscriptionId, _eventFilter);
+
+			_disposed = true;
+			Unsubscribe();
+
+			_cts.Cancel();
+			_cts.Dispose();
+
+			return ValueTask.CompletedTask;
+		}
+
+		public async ValueTask<bool> MoveNextAsync() {
+ReadLoop:
+
+			if (!await _channel.Reader.WaitToReadAsync(_cts.Token)) {
+				return false;
+			}
+
+			var readResponse = await _channel.Reader.ReadAsync(_cts.Token);
+
+			if (readResponse is ReadResponse.EventReceived eventReceived) {
+				var eventPos = eventReceived.Event.OriginalPosition!.Value;
+				var position = Position.FromInt64(eventPos.CommitPosition, eventPos.PreparePosition);
+
+				if (_currentPosition.HasValue && position <= _currentPosition.Value) {
+					// this should no longer happen
+					Log.Warning("Subscription {subscriptionId} to $all:{eventFilter} skipping event {position} as it is less than {currentPosition}.",
+						_subscriptionId, _eventFilter, position, _currentPosition);
+					goto ReadLoop;
+				}
+
+				Log.Verbose("Subscription {subscriptionId} to $all:{eventFilter} seen event {position}.", _subscriptionId, _eventFilter, position);
+
+				_currentPosition = position;
+			} else if (readResponse is ReadResponse.CheckpointReceived checkpointReceived) {
+				var checkpointPos = new Position(checkpointReceived.CommitPosition, checkpointReceived.PreparePosition);
+
+				if (_currentCheckpoint.HasValue && checkpointPos <= _currentCheckpoint.Value) {
+					// in some cases, it's possible to receive the same checkpoint twice for example:
+					// i) when the subscription goes live, and it turns out that the next thing on the live channel is a checkpoint
+					// ii) when catching-up, reaching the checkpoint interval and the next page read reaches the end of the stream
+
+					goto ReadLoop;
+				}
+
+				Log.Verbose("Subscription {subscriptionId} to $all:{eventFilter} received checkpoint {position}.", _subscriptionId, _eventFilter, checkpointPos);
+
+				_currentCheckpoint = checkpointPos;
+			}
+
+			_current = readResponse;
+
+			return true;
+		}
+
+		private void Subscribe(Position? checkpoint, CancellationToken ct) {
+			Task.Factory.StartNew(() => MainLoop(checkpoint, ct), ct);
+		}
+
+		private static TFPos ConvertCheckpoint(Position? checkpoint, TFPos lastLivePos) {
+			if (!checkpoint.HasValue)
+				return TFPos.HeadOfTf;
+
+			if (checkpoint == Position.End)
+				return lastLivePos;
+
+			var (commitPos, preparePos) = checkpoint.Value.ToInt64();
+			return new TFPos(commitPos, preparePos);
+		}
+
+		private async Task MainLoop(Position? checkpointPosition, CancellationToken ct) {
+			try {
+				Log.Debug("Subscription {subscriptionId} to $all:{eventFilter} has started at checkpoint {position}",
+					_subscriptionId, _eventFilter, checkpointPosition?.ToString() ?? "Start");
+
+				var confirmationLastPos = await SubscribeToLive();
+				await ConfirmSubscription(ct);
+
+				// the event or checkpoint position we most recently sent on towards the client.
+				// (we should send on events _after_ this and checkpoints _equal to or after_ this)
+				var checkpoint = ConvertCheckpoint(checkpointPosition, confirmationLastPos);
+
+				// the most recently read sequence number from the live channel. 0 when we haven't read any.
+				var sequenceNumber = 0UL;
+
+				if (checkpoint >= confirmationLastPos) {
+					(checkpoint, sequenceNumber) = await GoLive(checkpoint, sequenceNumber, ct);
+				}
+
+				while (true) {
+					ct.ThrowIfCancellationRequested();
+					checkpoint = await CatchUp(checkpoint, ct);
+					(checkpoint, sequenceNumber) = await GoLive(checkpoint, sequenceNumber, ct);
+				}
+			} catch (Exception ex) {
+				if (ex is not (OperationCanceledException or ReadResponseException.InvalidPosition)) {
+					Log.Error(ex, "Subscription {subscriptionId} to $all:{eventFilter} experienced an error.", _subscriptionId, _eventFilter);
+				}
+
+				_channel.Writer.TryComplete(ex);
+			} finally {
+				Log.Debug("Subscription {subscriptionId} to $all:{eventFilter} has ended.", _subscriptionId, _eventFilter);
+			}
+		}
+
+		private async Task NotifyCaughtUp(TFPos checkpoint, CancellationToken ct) {
+			Log.Debug(
+				"Subscription {subscriptionId} to $all:{eventFilter} caught up at checkpoint {position}.",
+				_subscriptionId, _eventFilter, checkpoint);
+
+			await _channel.Writer.WriteAsync(new ReadResponse.SubscriptionCaughtUp(), ct);
+		}
+
+		private async Task NotifyFellBehind(TFPos checkpoint, CancellationToken ct) {
+			Log.Debug(
+				"Subscription {subscriptionId} to $all:{eventFilter} fell behind at checkpoint {position}.",
+				_subscriptionId, _eventFilter, checkpoint);
+
+			await _channel.Writer.WriteAsync(new ReadResponse.SubscriptionFellBehind(), ct);
+		}
+
+		private async ValueTask<(TFPos, ulong)> GoLive(TFPos checkpoint, ulong sequenceNumber, CancellationToken ct) {
+			await NotifyCaughtUp(checkpoint, ct);
+
+			await foreach (var liveEvent in _liveEvents.Reader.ReadAllAsync(ct)) {
+				var sequenceCorrect = liveEvent.SequenceNumber == sequenceNumber + 1;
+				sequenceNumber = liveEvent.SequenceNumber;
+
+				if (liveEvent.ResolvedEvent.HasValue && liveEvent.ResolvedEvent.Value.OriginalPosition <= checkpoint) {
+					// skip because this event has already been sent towards the client
+					// (or the client specified a checkpoint for events that don't exist yet and so
+					// is not interested in them)
+					// nb: we can skip this event even if it had the wrong sequence number, it means
+					// we would have skipped the events that got discarded anyway.
+					continue;
+				}
+
+				if (liveEvent.Checkpoint.HasValue && liveEvent.Checkpoint.Value < checkpoint) {
+					// skip because the checkpoint received is earlier than the last event or checkpoint sent towards the client
+					continue;
+				}
+
+				if (!sequenceCorrect) {
+					// there's a gap in the sequence numbers, at least one live event was discarded
+					// due to the live channel becoming full.
+					// switch back to catch up to make sure we didn't miss anything we wanted to send.
+					await NotifyFellBehind(checkpoint, ct);
+
+					// issue a checkpoint before falling behind to catch up to make sure that
+					// at least one checkpoint is issued within the checkpoint interval
+					await SendCheckpointToSubscription(checkpoint, ct);
+
+					return (checkpoint, sequenceNumber);
+				}
+
+				if (liveEvent.ResolvedEvent.HasValue) {
+					// this is the next event to send towards the client. send it and update `checkpoint`
+					await SendEventToSubscription(liveEvent.ResolvedEvent.Value, ct);
+					checkpoint = liveEvent.ResolvedEvent.Value.OriginalPosition!.Value;
+				} else if (liveEvent.Checkpoint.HasValue) {
+					// this is a valid checkpoint that we can send towards the client. send it and update `checkpoint`
+					await SendCheckpointToSubscription(liveEvent.Checkpoint.Value, ct);
+					checkpoint = liveEvent.Checkpoint.Value;
+				}
+			}
+
+			throw new Exception($"Unexpected error: live events channel for subscription {_subscriptionId} to $all:{_eventFilter} completed without exception");
+		}
+
+		private Task<TFPos> CatchUp(TFPos checkpoint, CancellationToken ct) {
+			Log.Verbose(
+				"Subscription {subscriptionId} to $all:{eventFilter} is catching up from checkpoint {position}",
+				_subscriptionId, _eventFilter, checkpoint);
+
+			var checkpointIntervalCounter = 0L;
+			var catchupCompletionTcs = new TaskCompletionSource<TFPos>();
+
+			// this is a safe use of AsyncTaskEnvelope. Only one call to OnMessage will be running
+			// at any given time because we only expect one reply and that reply kicks off the next read.
+			AsyncTaskEnvelope envelope = null;
+			envelope = new(OnMessage, ct);
+
+			ReadPage(checkpoint, envelope, ct);
+
+			return catchupCompletionTcs.Task;
+
+			async Task OnMessage(Message message, CancellationToken ct) {
+				try {
+					if (message is ClientMessage.NotHandled notHandled && TryHandleNotHandled(notHandled, out var ex)) {
+						throw ex;
+					}
+
+					if (message is not ClientMessage.FilteredReadAllEventsForwardCompleted completed)
+						throw ReadResponseException.UnknownMessage.Create<ClientMessage.FilteredReadAllEventsForwardCompleted>(message);
+
+					switch (completed.Result) {
+						case FilteredReadAllResult.Success:
+							foreach (var @event in completed.Events) {
+								var eventPosition = @event.OriginalPosition!.Value;
+
+								// this can only be true for the first event of the first page
+								// as we start page reads from the checkpoint's position
+								if (eventPosition <= checkpoint)
+									continue;
+
+								Log.Verbose(
+									"Subscription {subscriptionId} to $all:{eventFilter} received catch-up event {position}.",
+									_subscriptionId, _eventFilter, eventPosition);
+
+								await SendEventToSubscription(@event, ct);
+								checkpoint = eventPosition;
+							}
+
+							if (checkpoint < completed.CurrentPos && completed.CurrentPos < completed.NextPos) {
+								// note: when completed.CurrentPos == completed.NextPos, we can't use completed.CurrentPos
+								// as checkpoint as we haven't yet processed the record at that position
+								checkpoint = completed.CurrentPos;
+							}
+
+							checkpointIntervalCounter += completed.ConsideredEventsCount;
+							Log.Verbose(
+								"Subscription {subscriptionId} to $all:{eventFilter} considered {consideredEventsCount} catch-up events (interval: {checkpointInterval}, counter: {checkpointIntervalCounter})",
+								_subscriptionId, _eventFilter, completed.ConsideredEventsCount, _checkpointInterval, checkpointIntervalCounter);
+
+							if (completed.IsEndOfStream) {
+								if (checkpoint < TFPos.FirstRecordOfTf && TFPos.FirstRecordOfTf < completed.NextPos) {
+									// we've reached the end of the log but didn't have any checkpoint updates.
+									// this can happen when we've read a single page from the transaction log.
+									// we set a trivial checkpoint to preserve the checkpoint interval semantics.
+									checkpoint = TFPos.FirstRecordOfTf;
+								}
+
+								// issue a checkpoint when going live to make sure that at least
+								// one checkpoint is issued within the checkpoint interval
+								await SendCheckpointToSubscription(checkpoint, ct);
+
+								catchupCompletionTcs.TrySetResult(checkpoint);
+								return;
+							}
+
+							if (checkpointIntervalCounter >= _checkpointInterval) {
+								checkpointIntervalCounter %= _checkpointInterval;
+
+								Log.Verbose(
+									"Subscription {subscriptionId} to $all:{eventFilter} reached checkpoint at {position} during catch-up (interval: {checkpointInterval}, counter: {checkpointIntervalCounter})",
+									_subscriptionId, _eventFilter, checkpoint, _checkpointInterval, checkpointIntervalCounter);
+
+								await SendCheckpointToSubscription(checkpoint, ct);
+							}
+
+							ReadPage(completed.NextPos, envelope, ct);
+							return;
+						case FilteredReadAllResult.Expired:
+							ReadPage(completed.CurrentPos, envelope, ct);
+							return;
+						case FilteredReadAllResult.AccessDenied:
+							throw new ReadResponseException.AccessDenied();
+						case FilteredReadAllResult.InvalidPosition:
+							throw new ReadResponseException.InvalidPosition();
+						default:
+							throw ReadResponseException.UnknownError.Create(completed.Result);
+					}
+				} catch (Exception exception) {
+					catchupCompletionTcs.TrySetException(exception);
+				}
+			}
+		}
+
+		private async Task SendEventToSubscription(ResolvedEvent @event, CancellationToken ct) {
+			await _channel.Writer.WriteAsync(new ReadResponse.EventReceived(@event), ct);
+		}
+
+		private async Task SendCheckpointToSubscription(TFPos checkpoint, CancellationToken ct) {
+			if (checkpoint == TFPos.HeadOfTf) {
+				// there is not yet any checkpoint to send (failsafe)
+				return;
+			}
+			var checkpointPos = Position.FromInt64(checkpoint.CommitPosition, checkpoint.PreparePosition);
+			await _channel.Writer.WriteAsync(new ReadResponse.CheckpointReceived(
+				commitPosition: checkpointPos.CommitPosition,
+				preparePosition: checkpointPos.PreparePosition), ct);
+		}
+
+		private Task<TFPos> SubscribeToLive() {
+			var nextLiveSequenceNumber = 0UL;
+			var confirmationPositionTcs = new TaskCompletionSource<TFPos>();
+
+			_bus.Publish(new ClientMessage.FilteredSubscribeToStream(Guid.NewGuid(), _subscriptionId,
+				new CallbackEnvelope(OnSubscriptionMessage), _subscriptionId,
+				string.Empty, _resolveLinks, _user,
+				_eventFilter, (int)_checkpointInterval, checkpointIntervalCurrent: 0)
+			);
+
+			return confirmationPositionTcs.Task;
+
+			void OnSubscriptionMessage(Message message) {
+				try {
+					if (message is ClientMessage.NotHandled notHandled && TryHandleNotHandled(notHandled, out var ex)) {
+						throw ex;
+					}
+
+					switch (message) {
+						case ClientMessage.SubscriptionConfirmation confirmed:
+							long caughtUp = confirmed.LastIndexedPosition;
+
+							Log.Debug(
+								"Subscription {subscriptionId} to $all:{eventFilter} confirmed. LastIndexedPosition is {position:N0}.",
+								_subscriptionId, _eventFilter, caughtUp);
+
+							confirmationPositionTcs.TrySetResult(new TFPos(caughtUp, caughtUp));
+							return;
+						case ClientMessage.SubscriptionDropped dropped:
+							Log.Debug(
+								"Subscription {subscriptionId} to $all:{eventFilter} dropped by subscription service: {droppedReason}",
+								_subscriptionId, _eventFilter, dropped.Reason);
+							switch (dropped.Reason) {
+								case SubscriptionDropReason.AccessDenied:
+									throw new ReadResponseException.AccessDenied();
+								case SubscriptionDropReason.Unsubscribed:
+									return;
+								case SubscriptionDropReason.StreamDeleted: // applies only to regular streams
+								case SubscriptionDropReason.NotFound: // applies only to persistent subscriptions
+								default:
+									throw ReadResponseException.UnknownError.Create(dropped.Reason);
+							}
+						case ClientMessage.StreamEventAppeared appeared: {
+							Log.Verbose(
+								"Subscription {subscriptionId} to $all:{eventFilter} received live event {position}.",
+								_subscriptionId, _eventFilter, appeared.Event.OriginalPosition!.Value);
+
+							if (!_liveEvents.Writer.TryWrite((++nextLiveSequenceNumber, appeared.Event, null))) {
+								// this cannot happen because _liveEvents does not have full mode 'wait'.
+								throw new Exception($"Unexpected error: could not write to live events channel for subscription {_subscriptionId} to $all:{_eventFilter}");
+							}
+
+							return;
+						}
+						case ClientMessage.CheckpointReached checkpointReached: {
+							Log.Verbose(
+								"Subscription {subscriptionId} to $all:{eventFilter} received live checkpoint {position}.",
+								_subscriptionId, _eventFilter, checkpointReached.Position);
+
+							if (!_liveEvents.Writer.TryWrite((++nextLiveSequenceNumber, null, checkpointReached.Position!.Value))) {
+								// this cannot happen because _liveEvents does not have full mode 'wait'.
+								throw new Exception($"Unexpected error: could not write to live events channel for subscription {_subscriptionId} to $all:{_eventFilter}");
+							}
+
+							return;
+						}
+						default:
+							throw ReadResponseException.UnknownMessage.Create<ClientMessage.SubscriptionConfirmation>(message);
+					}
+				} catch (Exception exception) {
+					_liveEvents.Writer.TryComplete(exception);
+					confirmationPositionTcs.TrySetException(exception);
+				}
+			}
+		}
+
+		private ValueTask ConfirmSubscription(CancellationToken ct) {
+			return _channel.Writer.WriteAsync(new ReadResponse.SubscriptionConfirmed(SubscriptionId), ct);
+		}
+
+		private void ReadPage(TFPos startPos, IEnvelope envelope, CancellationToken ct) {
+			Guid correlationId = Guid.NewGuid();
+			Log.Verbose(
+				"Subscription {subscriptionId} to $all:{eventFilter} reading next page starting from {position}.",
+				_subscriptionId, _eventFilter, startPos);
+
+			if (startPos is { CommitPosition: < 0, PreparePosition: < 0 })
+				startPos = new TFPos(0, 0);
+
+			_bus.Publish(new ClientMessage.FilteredReadAllEventsForward(
+				correlationId, correlationId, envelope,
+				startPos.CommitPosition, startPos.PreparePosition, ReadBatchSize, _resolveLinks, _requiresLeader,
+				(int)_maxSearchWindow, null, _eventFilter, _user,
+				replyOnExpired: true,
+				expires: _expiryStrategy.GetExpiry(),
+				cancellationToken: ct));
+		}
+
+		private void Unsubscribe() => _bus.Publish(new ClientMessage.UnsubscribeFromStream(Guid.NewGuid(), _subscriptionId, new NoopEnvelope(), _user));
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.ReadAllBackwards.cs b/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.ReadAllBackwards.cs
new file mode 100644
index 00000000000..cb2d077490a
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.ReadAllBackwards.cs
@@ -0,0 +1,120 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Common;
+
+namespace KurrentDB.Core.Services.Transport.Enumerators;
+
+partial class Enumerator {
+	public class ReadAllBackwards : IAsyncEnumerator<ReadResponse> {
+		private readonly IPublisher _bus;
+		private readonly ulong _maxCount;
+		private readonly bool _resolveLinks;
+		private readonly ClaimsPrincipal _user;
+		private readonly bool _requiresLeader;
+		private readonly DateTime _deadline;
+		private readonly CancellationToken _cancellationToken;
+		private readonly SemaphoreSlim _semaphore = new(1, 1);
+		private readonly Channel<ReadResponse> _channel = Channel.CreateBounded<ReadResponse>(BoundedChannelOptions);
+
+		private ReadResponse _current;
+
+		public ReadResponse Current => _current;
+
+		public ReadAllBackwards(IPublisher bus,
+			Position position,
+			ulong maxCount,
+			bool resolveLinks,
+			ClaimsPrincipal user,
+			bool requiresLeader,
+			DateTime deadline,
+			CancellationToken cancellationToken) {
+			_bus = Ensure.NotNull(bus);
+			_maxCount = maxCount;
+			_resolveLinks = resolveLinks;
+			_user = user;
+			_requiresLeader = requiresLeader;
+			_deadline = deadline;
+			_cancellationToken = cancellationToken;
+
+			ReadPage(position);
+		}
+
+		public ValueTask DisposeAsync() {
+			_channel.Writer.TryComplete();
+			return new ValueTask(Task.CompletedTask);
+		}
+
+		public async ValueTask<bool> MoveNextAsync() {
+			if (!await _channel.Reader.WaitToReadAsync(_cancellationToken)) {
+				return false;
+			}
+
+			_current = await _channel.Reader.ReadAsync(_cancellationToken);
+
+			return true;
+		}
+
+		private void ReadPage(Position startPosition, ulong readCount = 0) {
+			var correlationId = Guid.NewGuid();
+
+			var (commitPosition, preparePosition) = startPosition.ToInt64();
+
+			_bus.Publish(new ClientMessage.ReadAllEventsBackward(
+				correlationId, correlationId, new ContinuationEnvelope(OnMessage, _semaphore, _cancellationToken),
+				commitPosition, preparePosition, (int)Math.Min(ReadBatchSize, _maxCount), _resolveLinks,
+				_requiresLeader, default, _user, _deadline,
+				cancellationToken: _cancellationToken));
+
+			async Task OnMessage(Message message, CancellationToken ct) {
+				if (message is ClientMessage.NotHandled notHandled && TryHandleNotHandled(notHandled, out var ex)) {
+					_channel.Writer.TryComplete(ex);
+					return;
+				}
+
+				if (message is not ClientMessage.ReadAllEventsBackwardCompleted completed) {
+					_channel.Writer.TryComplete(ReadResponseException.UnknownMessage.Create<ClientMessage.ReadAllEventsBackwardCompleted>(message));
+					return;
+				}
+
+				switch (completed.Result) {
+					case ReadAllResult.Success:
+						foreach (var @event in completed.Events) {
+							if (readCount >= _maxCount) {
+								_channel.Writer.TryComplete();
+								return;
+							}
+
+							await _channel.Writer.WriteAsync(new ReadResponse.EventReceived(@event), ct);
+							readCount++;
+						}
+
+						if (completed.IsEndOfStream) {
+							_channel.Writer.TryComplete();
+							return;
+						}
+
+						ReadPage(Position.FromInt64(completed.NextPos.CommitPosition, completed.NextPos.PreparePosition), readCount);
+						return;
+					case ReadAllResult.AccessDenied:
+						_channel.Writer.TryComplete(new ReadResponseException.AccessDenied());
+						return;
+					default:
+						_channel.Writer.TryComplete(ReadResponseException.UnknownError.Create(completed.Result));
+						return;
+				}
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.ReadAllBackwardsFiltered.cs b/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.ReadAllBackwardsFiltered.cs
new file mode 100644
index 00000000000..243ed5b1da4
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.ReadAllBackwardsFiltered.cs
@@ -0,0 +1,131 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.Transport.Common;
+using Serilog;
+
+namespace KurrentDB.Core.Services.Transport.Enumerators;
+
+partial class Enumerator {
+	public class ReadAllBackwardsFiltered : IAsyncEnumerator<ReadResponse> {
+		private static readonly ILogger Log = Serilog.Log.ForContext<ReadAllBackwardsFiltered>();
+
+		private readonly IPublisher _bus;
+		private readonly ulong _maxCount;
+		private readonly bool _resolveLinks;
+		private readonly IEventFilter _eventFilter;
+		private readonly ClaimsPrincipal _user;
+		private readonly bool _requiresLeader;
+		private readonly DateTime _deadline;
+		private readonly uint _maxSearchWindow;
+		private readonly CancellationToken _cancellationToken;
+		private readonly SemaphoreSlim _semaphore = new(1, 1);
+		private readonly Channel<ReadResponse> _channel = Channel.CreateBounded<ReadResponse>(BoundedChannelOptions);
+
+		private ReadResponse _current;
+
+		public ReadResponse Current => _current;
+
+		public ReadAllBackwardsFiltered(IPublisher bus,
+			Position position,
+			ulong maxCount,
+			bool resolveLinks,
+			IEventFilter eventFilter,
+			ClaimsPrincipal user,
+			bool requiresLeader,
+			uint? maxSearchWindow,
+			DateTime deadline,
+			CancellationToken cancellationToken) {
+			_bus = Ensure.NotNull(bus);
+			_maxCount = maxCount;
+			_resolveLinks = resolveLinks;
+			_eventFilter = Ensure.NotNull(eventFilter);
+			_user = user;
+			_requiresLeader = requiresLeader;
+			_maxSearchWindow = maxSearchWindow ?? ReadBatchSize;
+			_deadline = deadline;
+			_cancellationToken = cancellationToken;
+
+			ReadPage(position);
+		}
+
+		public ValueTask DisposeAsync() {
+			_channel.Writer.TryComplete();
+			return new ValueTask(Task.CompletedTask);
+		}
+
+		public async ValueTask<bool> MoveNextAsync() {
+			if (!await _channel.Reader.WaitToReadAsync(_cancellationToken)) {
+				return false;
+			}
+
+			_current = await _channel.Reader.ReadAsync(_cancellationToken);
+
+			return true;
+		}
+
+		private void ReadPage(Position startPosition, ulong readCount = 0) {
+			var correlationId = Guid.NewGuid();
+
+			var (commitPosition, preparePosition) = startPosition.ToInt64();
+
+			_bus.Publish(new ClientMessage.FilteredReadAllEventsBackward(
+				correlationId, correlationId, new ContinuationEnvelope(OnMessage, _semaphore, _cancellationToken),
+				commitPosition, preparePosition, (int)Math.Min(ReadBatchSize, _maxCount), _resolveLinks,
+				_requiresLeader, (int)_maxSearchWindow, null, _eventFilter, _user, expires: _deadline,
+				cancellationToken: _cancellationToken));
+
+			async Task OnMessage(Message message, CancellationToken ct) {
+				if (message is ClientMessage.NotHandled notHandled &&
+					TryHandleNotHandled(notHandled, out var ex)) {
+					_channel.Writer.TryComplete(ex);
+					return;
+				}
+
+				if (message is not ClientMessage.FilteredReadAllEventsBackwardCompleted completed) {
+					_channel.Writer.TryComplete(ReadResponseException.UnknownMessage.Create<ClientMessage.FilteredReadAllEventsBackwardCompleted>(message));
+					return;
+				}
+
+				switch (completed.Result) {
+					case FilteredReadAllResult.Success:
+						foreach (var @event in completed.Events) {
+							if (readCount >= _maxCount) {
+								_channel.Writer.TryComplete();
+								return;
+							}
+
+							await _channel.Writer.WriteAsync(new ReadResponse.EventReceived(@event), ct);
+							readCount++;
+						}
+
+						if (completed.IsEndOfStream) {
+							_channel.Writer.TryComplete();
+							return;
+						}
+
+						ReadPage(Position.FromInt64(completed.NextPos.CommitPosition, completed.NextPos.PreparePosition), readCount);
+						return;
+					case FilteredReadAllResult.AccessDenied:
+						_channel.Writer.TryComplete(new ReadResponseException.AccessDenied());
+						return;
+					default:
+						_channel.Writer.TryComplete(ReadResponseException.UnknownError.Create(completed.Result));
+						return;
+				}
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.ReadAllForwards.cs b/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.ReadAllForwards.cs
new file mode 100644
index 00000000000..b7b23adbef8
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.ReadAllForwards.cs
@@ -0,0 +1,121 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Common;
+
+namespace KurrentDB.Core.Services.Transport.Enumerators;
+
+partial class Enumerator {
+	public class ReadAllForwards : IAsyncEnumerator<ReadResponse> {
+		private readonly IPublisher _bus;
+		private readonly ulong _maxCount;
+		private readonly bool _resolveLinks;
+		private readonly ClaimsPrincipal _user;
+		private readonly bool _requiresLeader;
+		private readonly DateTime _deadline;
+		private readonly CancellationToken _cancellationToken;
+		private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
+		private readonly Channel<ReadResponse> _channel = Channel.CreateBounded<ReadResponse>(BoundedChannelOptions);
+
+		private ReadResponse _current;
+
+		public ReadResponse Current => _current;
+
+		public ReadAllForwards(IPublisher bus,
+			Position position,
+			ulong maxCount,
+			bool resolveLinks,
+			ClaimsPrincipal user,
+			bool requiresLeader,
+			DateTime deadline,
+			CancellationToken cancellationToken) {
+			_bus = Ensure.NotNull(bus);
+			_maxCount = maxCount;
+			_resolveLinks = resolveLinks;
+			_user = user;
+			_requiresLeader = requiresLeader;
+			_deadline = deadline;
+			_cancellationToken = cancellationToken;
+
+			ReadPage(position);
+		}
+
+		public ValueTask DisposeAsync() {
+			_channel.Writer.TryComplete();
+			return new ValueTask(Task.CompletedTask);
+		}
+
+		public async ValueTask<bool> MoveNextAsync() {
+			if (!await _channel.Reader.WaitToReadAsync(_cancellationToken)) {
+				return false;
+			}
+
+			_current = await _channel.Reader.ReadAsync(_cancellationToken);
+
+			return true;
+		}
+
+		private void ReadPage(Position startPosition, ulong readCount = 0) {
+			var correlationId = Guid.NewGuid();
+
+			var (commitPosition, preparePosition) = startPosition.ToInt64();
+
+			_bus.Publish(new ClientMessage.ReadAllEventsForward(
+				correlationId, correlationId, new ContinuationEnvelope(OnMessage, _semaphore, _cancellationToken),
+				commitPosition, preparePosition, (int)Math.Min(ReadBatchSize, _maxCount), _resolveLinks,
+				_requiresLeader, default, _user, replyOnExpired: false, expires: _deadline,
+				cancellationToken: _cancellationToken)
+			);
+
+			async Task OnMessage(Message message, CancellationToken ct) {
+				if (message is ClientMessage.NotHandled notHandled && TryHandleNotHandled(notHandled, out var ex)) {
+					_channel.Writer.TryComplete(ex);
+					return;
+				}
+
+				if (message is not ClientMessage.ReadAllEventsForwardCompleted completed) {
+					_channel.Writer.TryComplete(ReadResponseException.UnknownMessage.Create<ClientMessage.ReadAllEventsForwardCompleted>(message));
+					return;
+				}
+
+				switch (completed.Result) {
+					case ReadAllResult.Success:
+						foreach (var @event in completed.Events) {
+							if (readCount >= _maxCount) {
+								_channel.Writer.TryComplete();
+								return;
+							}
+
+							await _channel.Writer.WriteAsync(new ReadResponse.EventReceived(@event), ct);
+							readCount++;
+						}
+
+						if (completed.IsEndOfStream) {
+							_channel.Writer.TryComplete();
+							return;
+						}
+
+						ReadPage(Position.FromInt64(completed.NextPos.CommitPosition, completed.NextPos.PreparePosition), readCount);
+						return;
+					case ReadAllResult.AccessDenied:
+						_channel.Writer.TryComplete(new ReadResponseException.AccessDenied());
+						return;
+					default:
+						_channel.Writer.TryComplete(ReadResponseException.UnknownError.Create(completed.Result));
+						return;
+				}
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.ReadAllForwardsFiltered.cs b/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.ReadAllForwardsFiltered.cs
new file mode 100644
index 00000000000..e99c6fb5e62
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.ReadAllForwardsFiltered.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.Transport.Common;
+using Serilog;
+
+namespace KurrentDB.Core.Services.Transport.Enumerators;
+
+partial class Enumerator {
+	public class ReadAllForwardsFiltered : IAsyncEnumerator<ReadResponse> {
+		private static readonly ILogger Log = Serilog.Log.ForContext<ReadAllForwardsFiltered>();
+
+		private readonly IPublisher _bus;
+		private readonly ulong _maxCount;
+		private readonly bool _resolveLinks;
+		private readonly IEventFilter _eventFilter;
+		private readonly ClaimsPrincipal _user;
+		private readonly bool _requiresLeader;
+		private readonly DateTime _deadline;
+		private readonly uint _maxSearchWindow;
+		private readonly CancellationToken _cancellationToken;
+		private readonly SemaphoreSlim _semaphore = new(1, 1);
+		private readonly Channel<ReadResponse> _channel = Channel.CreateBounded<ReadResponse>(BoundedChannelOptions);
+
+		private ReadResponse _current;
+
+		public ReadResponse Current => _current;
+
+		public ReadAllForwardsFiltered(IPublisher bus,
+			Position position,
+			ulong maxCount,
+			bool resolveLinks,
+			IEventFilter eventFilter,
+			ClaimsPrincipal user,
+			bool requiresLeader,
+			uint? maxSearchWindow,
+			DateTime deadline,
+			CancellationToken cancellationToken) {
+			_bus = Ensure.NotNull(bus);
+			_maxCount = maxCount;
+			_resolveLinks = resolveLinks;
+			_eventFilter = Ensure.NotNull(eventFilter);
+			_user = user;
+			_requiresLeader = requiresLeader;
+			_maxSearchWindow = maxSearchWindow ?? ReadBatchSize;
+			_deadline = deadline;
+			_cancellationToken = cancellationToken;
+
+			ReadPage(position);
+		}
+
+		public ValueTask DisposeAsync() {
+			_channel.Writer.TryComplete();
+			return new ValueTask(Task.CompletedTask);
+		}
+
+		public async ValueTask<bool> MoveNextAsync() {
+			if (!await _channel.Reader.WaitToReadAsync(_cancellationToken)) {
+				return false;
+			}
+
+			_current = await _channel.Reader.ReadAsync(_cancellationToken);
+
+			return true;
+		}
+
+		private void ReadPage(Position startPosition, ulong readCount = 0) {
+			var correlationId = Guid.NewGuid();
+
+			var (commitPosition, preparePosition) = startPosition.ToInt64();
+
+			_bus.Publish(new ClientMessage.FilteredReadAllEventsForward(
+				correlationId, correlationId, new ContinuationEnvelope(OnMessage, _semaphore, _cancellationToken),
+				commitPosition, preparePosition, (int)Math.Min(ReadBatchSize, _maxCount), _resolveLinks,
+				_requiresLeader, (int)_maxSearchWindow, null, _eventFilter, _user,
+				replyOnExpired: false,
+				expires: _deadline,
+				cancellationToken: _cancellationToken)
+			);
+
+			async Task OnMessage(Message message, CancellationToken ct) {
+				if (message is ClientMessage.NotHandled notHandled && TryHandleNotHandled(notHandled, out var ex)) {
+					_channel.Writer.TryComplete(ex);
+					return;
+				}
+
+				if (message is not ClientMessage.FilteredReadAllEventsForwardCompleted completed) {
+					_channel.Writer.TryComplete(ReadResponseException.UnknownMessage.Create<ClientMessage.FilteredReadAllEventsForwardCompleted>(message));
+					return;
+				}
+
+				switch (completed.Result) {
+					case FilteredReadAllResult.Success:
+						foreach (var @event in completed.Events) {
+							if (readCount >= _maxCount) {
+								_channel.Writer.TryComplete();
+								return;
+							}
+
+							await _channel.Writer.WriteAsync(new ReadResponse.EventReceived(@event), ct);
+							readCount++;
+						}
+
+						if (completed.IsEndOfStream) {
+							_channel.Writer.TryComplete();
+							return;
+						}
+
+						ReadPage(Position.FromInt64(
+							completed.NextPos.CommitPosition,
+							completed.NextPos.PreparePosition), readCount);
+						return;
+					case FilteredReadAllResult.AccessDenied:
+						_channel.Writer.TryComplete(new ReadResponseException.AccessDenied());
+						return;
+					default:
+						_channel.Writer.TryComplete(ReadResponseException.UnknownError.Create(completed.Result));
+						return;
+				}
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.ReadStreamBackwards.cs b/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.ReadStreamBackwards.cs
new file mode 100644
index 00000000000..1b3ab923958
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.ReadStreamBackwards.cs
@@ -0,0 +1,133 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Common;
+
+namespace KurrentDB.Core.Services.Transport.Enumerators;
+
+partial class Enumerator {
+	public class ReadStreamBackwards : IAsyncEnumerator<ReadResponse> {
+		private readonly IPublisher _bus;
+		private readonly string _streamName;
+		private readonly ulong _maxCount;
+		private readonly bool _resolveLinks;
+		private readonly ClaimsPrincipal _user;
+		private readonly bool _requiresLeader;
+		private readonly DateTime _deadline;
+		private readonly uint _compatibility;
+		private readonly CancellationToken _cancellationToken;
+		private readonly SemaphoreSlim _semaphore = new(1, 1);
+		private readonly Channel<ReadResponse> _channel = Channel.CreateBounded<ReadResponse>(BoundedChannelOptions);
+
+		private ReadResponse _current;
+
+		public ReadResponse Current => _current;
+
+		public ReadStreamBackwards(IPublisher bus,
+			string streamName,
+			StreamRevision startRevision,
+			ulong maxCount,
+			bool resolveLinks,
+			ClaimsPrincipal user,
+			bool requiresLeader,
+			DateTime deadline,
+			uint compatibility,
+			CancellationToken cancellationToken) {
+			_bus = Ensure.NotNull(bus);
+			_streamName = Ensure.NotNullOrEmpty(streamName);
+			_maxCount = maxCount;
+			_resolveLinks = resolveLinks;
+			_user = user;
+			_requiresLeader = requiresLeader;
+			_deadline = deadline;
+			_compatibility = compatibility;
+			_cancellationToken = cancellationToken;
+
+			ReadPage(startRevision);
+		}
+
+		public ValueTask DisposeAsync() {
+			_channel.Writer.TryComplete();
+			return new ValueTask(Task.CompletedTask);
+		}
+
+		public async ValueTask<bool> MoveNextAsync() {
+			if (!await _channel.Reader.WaitToReadAsync(_cancellationToken)) {
+				return false;
+			}
+
+			_current = await _channel.Reader.ReadAsync(_cancellationToken);
+
+			return true;
+		}
+
+		private void ReadPage(StreamRevision startRevision, ulong readCount = 0) {
+			var correlationId = Guid.NewGuid();
+
+			_bus.Publish(new ClientMessage.ReadStreamEventsBackward(
+				correlationId, correlationId, new ContinuationEnvelope(OnMessage, _semaphore, _cancellationToken),
+				_streamName, startRevision.ToInt64(), (int)Math.Min(ReadBatchSize, _maxCount), _resolveLinks,
+				_requiresLeader, null, _user, _deadline,
+				cancellationToken: _cancellationToken));
+
+			async Task OnMessage(Message message, CancellationToken ct) {
+				if (message is ClientMessage.NotHandled notHandled && TryHandleNotHandled(notHandled, out var ex)) {
+					_channel.Writer.TryComplete(ex);
+					return;
+				}
+
+				if (message is not ClientMessage.ReadStreamEventsBackwardCompleted completed) {
+					_channel.Writer.TryComplete(ReadResponseException.UnknownMessage.Create<ClientMessage.ReadStreamEventsBackwardCompleted>(message));
+					return;
+				}
+
+				switch (completed.Result) {
+					case ReadStreamResult.Success:
+						foreach (var @event in completed.Events) {
+							if (readCount >= _maxCount) {
+								break;
+							}
+							await _channel.Writer.WriteAsync(new ReadResponse.EventReceived(@event), ct);
+							readCount++;
+						}
+
+						if (!completed.IsEndOfStream && readCount < _maxCount) {
+							ReadPage(StreamRevision.FromInt64(completed.NextEventNumber), readCount);
+							return;
+						}
+
+						if (_compatibility >= 1) {
+							await _channel.Writer.WriteAsync(new ReadResponse.LastStreamPositionReceived(StreamRevision.FromInt64(completed.LastEventNumber)), ct);
+						}
+
+						_channel.Writer.TryComplete();
+						return;
+					case ReadStreamResult.NoStream:
+						await _channel.Writer.WriteAsync(new ReadResponse.StreamNotFound(_streamName), ct);
+						_channel.Writer.TryComplete();
+						return;
+					case ReadStreamResult.StreamDeleted:
+						_channel.Writer.TryComplete(new ReadResponseException.StreamDeleted(_streamName));
+						return;
+					case ReadStreamResult.AccessDenied:
+						_channel.Writer.TryComplete(new ReadResponseException.AccessDenied());
+						return;
+					default:
+						_channel.Writer.TryComplete(ReadResponseException.UnknownError.Create(completed.Result));
+						return;
+				}
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.ReadStreamForwards.cs b/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.ReadStreamForwards.cs
new file mode 100644
index 00000000000..ec024b78936
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.ReadStreamForwards.cs
@@ -0,0 +1,144 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Common;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+
+namespace KurrentDB.Core.Services.Transport.Enumerators;
+
+partial class Enumerator {
+	public class ReadStreamForwards : IAsyncEnumerator<ReadResponse> {
+		private readonly IPublisher _bus;
+		private readonly string _streamName;
+		private readonly ulong _maxCount;
+		private readonly bool _resolveLinks;
+		private readonly ClaimsPrincipal _user;
+		private readonly bool _requiresLeader;
+		private readonly DateTime _deadline;
+		private readonly uint _compatibility;
+		private readonly CancellationToken _cancellationToken;
+		private readonly SemaphoreSlim _semaphore = new(1, 1);
+		private readonly Channel<ReadResponse> _channel = Channel.CreateBounded<ReadResponse>(BoundedChannelOptions);
+
+		private ReadResponse _current;
+
+		public ReadResponse Current => _current;
+
+		public ReadStreamForwards(IPublisher bus,
+			string streamName,
+			StreamRevision startRevision,
+			ulong maxCount,
+			bool resolveLinks,
+			ClaimsPrincipal user,
+			bool requiresLeader,
+			DateTime deadline,
+			uint compatibility,
+			CancellationToken cancellationToken) {
+			_bus = Ensure.NotNull(bus);
+			_streamName = Ensure.NotNullOrEmpty(streamName);
+			_maxCount = maxCount;
+			_resolveLinks = resolveLinks;
+			_user = user;
+			_requiresLeader = requiresLeader;
+			_deadline = deadline;
+			_compatibility = compatibility;
+			_cancellationToken = cancellationToken;
+
+			ReadPage(startRevision);
+		}
+
+		public ValueTask DisposeAsync() {
+			_channel.Writer.TryComplete();
+			return new ValueTask(Task.CompletedTask);
+		}
+
+		public async ValueTask<bool> MoveNextAsync() {
+			if (!await _channel.Reader.WaitToReadAsync(_cancellationToken)) {
+				return false;
+			}
+
+			_current = await _channel.Reader.ReadAsync(_cancellationToken);
+
+			return true;
+		}
+
+		private void ReadPage(StreamRevision startRevision, ulong readCount = 0) {
+			Guid correlationId = Guid.NewGuid();
+
+			_bus.Publish(new ClientMessage.ReadStreamEventsForward(
+				correlationId, correlationId, new ContinuationEnvelope(OnMessage, _semaphore, _cancellationToken),
+				_streamName, startRevision.ToInt64(), (int)Math.Min(ReadBatchSize, _maxCount), _resolveLinks,
+				_requiresLeader, null, _user, replyOnExpired: false, expires: _deadline,
+				cancellationToken: _cancellationToken));
+
+			async Task OnMessage(Message message, CancellationToken ct) {
+				if (message is ClientMessage.NotHandled notHandled &&
+					TryHandleNotHandled(notHandled, out var ex)) {
+					_channel.Writer.TryComplete(ex);
+					return;
+				}
+
+				if (message is not ClientMessage.ReadStreamEventsForwardCompleted completed) {
+					_channel.Writer.TryComplete(ReadResponseException.UnknownMessage.Create<ClientMessage.ReadStreamEventsForwardCompleted>(message));
+					return;
+				}
+
+				switch (completed.Result) {
+					case ReadStreamResult.Success:
+						if (readCount == 0 && _compatibility >= 1) {
+							if (completed.Events is []) {
+								var firstStreamPosition = StreamRevision.FromInt64(completed.NextEventNumber);
+								if (startRevision != firstStreamPosition) {
+									await _channel.Writer.WriteAsync(new ReadResponse.FirstStreamPositionReceived(firstStreamPosition), ct);
+								}
+							}
+						}
+
+						foreach (var @event in completed.Events) {
+							if (readCount >= _maxCount) {
+								break;
+							}
+							await _channel.Writer.WriteAsync(new ReadResponse.EventReceived(@event), ct);
+							readCount++;
+						}
+
+						if (!completed.IsEndOfStream && readCount < _maxCount) {
+							ReadPage(StreamRevision.FromInt64(completed.NextEventNumber), readCount);
+							return;
+						}
+
+						if (_compatibility >= 1) {
+							await _channel.Writer.WriteAsync(new ReadResponse.LastStreamPositionReceived(StreamRevision.FromInt64(completed.LastEventNumber)), ct);
+						}
+
+						_channel.Writer.TryComplete();
+						return;
+
+					case ReadStreamResult.NoStream:
+						await _channel.Writer.WriteAsync(new ReadResponse.StreamNotFound(_streamName), ct);
+						_channel.Writer.TryComplete();
+						return;
+					case ReadStreamResult.StreamDeleted:
+						_channel.Writer.TryComplete(new ReadResponseException.StreamDeleted(_streamName));
+						return;
+					case ReadStreamResult.AccessDenied:
+						_channel.Writer.TryComplete(new ReadResponseException.AccessDenied());
+						return;
+					default:
+						_channel.Writer.TryComplete(ReadResponseException.UnknownError.Create(completed.Result));
+						return;
+				}
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.StreamSubscription.cs b/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.StreamSubscription.cs
new file mode 100644
index 00000000000..03b1cee874d
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.StreamSubscription.cs
@@ -0,0 +1,367 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.Transport.Common;
+using Serilog;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+
+namespace KurrentDB.Core.Services.Transport.Enumerators;
+
+static partial class Enumerator {
+	public abstract class StreamSubscription : IAsyncEnumerator<ReadResponse> {
+		protected static readonly ILogger Log = Serilog.Log.ForContext<StreamSubscription>();
+		public abstract ValueTask DisposeAsync();
+		public abstract ValueTask<bool> MoveNextAsync();
+		public abstract ReadResponse Current { get; }
+	}
+
+	public class StreamSubscription<TStreamId> : StreamSubscription {
+		private readonly IExpiryStrategy _expiryStrategy;
+		private readonly Guid _subscriptionId;
+		private readonly IPublisher _bus;
+		private readonly string _streamName;
+		private readonly bool _resolveLinks;
+		private readonly ClaimsPrincipal _user;
+		private readonly bool _requiresLeader;
+		private readonly CancellationTokenSource _cts;
+		private readonly Channel<ReadResponse> _channel;
+		private readonly Channel<(ulong SequenceNumber, ResolvedEvent ResolvedEvent)> _liveEvents;
+
+		private ReadResponse _current;
+		private bool _disposed;
+		private StreamRevision? _currentRevision;
+
+		public override ReadResponse Current => _current;
+		public string SubscriptionId { get; }
+
+		public StreamSubscription(
+			IPublisher bus,
+			IExpiryStrategy expiryStrategy,
+			string streamName,
+			StreamRevision? checkpoint,
+			bool resolveLinks,
+			ClaimsPrincipal user,
+			bool requiresLeader,
+			CancellationToken cancellationToken) {
+			_expiryStrategy = expiryStrategy;
+			_subscriptionId = Guid.NewGuid();
+			_bus = Ensure.NotNull(bus);
+			_streamName = Ensure.NotNullOrEmpty(streamName);
+			_resolveLinks = resolveLinks;
+			_user = user;
+			_requiresLeader = requiresLeader;
+			_cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+			_channel = Channel.CreateBounded<ReadResponse>(BoundedChannelOptions);
+			_liveEvents = Channel.CreateBounded<(ulong, ResolvedEvent)>(LiveChannelOptions);
+			_currentRevision = null;
+
+			SubscriptionId = _subscriptionId.ToString();
+
+			Subscribe(checkpoint, _cts.Token);
+		}
+
+		public override ValueTask DisposeAsync() {
+			if (_disposed) {
+				return ValueTask.CompletedTask;
+			}
+
+			Log.Verbose("Subscription {subscriptionId} to {streamName} disposed.", _subscriptionId, _streamName);
+			_disposed = true;
+
+			Unsubscribe();
+
+			_cts.Cancel();
+			_cts.Dispose();
+
+			return ValueTask.CompletedTask;
+		}
+
+		public override async ValueTask<bool> MoveNextAsync() {
+ReadLoop:
+
+			if (!await _channel.Reader.WaitToReadAsync(_cts.Token)) {
+				return false;
+			}
+
+			var readResponse = await _channel.Reader.ReadAsync(_cts.Token);
+
+			if (readResponse is ReadResponse.EventReceived eventReceived) {
+				var @event = eventReceived.Event;
+				var streamRevision = StreamRevision.FromInt64(@event.OriginalEventNumber);
+
+				if (_currentRevision.HasValue && streamRevision <= _currentRevision.Value) {
+					// this should no longer happen
+					Log.Warning(
+						"Subscription {subscriptionId} to {streamName} skipping event {streamRevision} as it is less than {currentRevision}.",
+						_subscriptionId, _streamName, streamRevision, _currentRevision);
+
+					goto ReadLoop;
+				}
+
+				_currentRevision = streamRevision;
+
+				Log.Verbose("Subscription {subscriptionId} to {streamName} seen event {streamRevision}.", _subscriptionId, _streamName, streamRevision);
+			}
+
+			_current = readResponse;
+
+			return true;
+		}
+
+		private void Subscribe(StreamRevision? checkpoint, CancellationToken ct) {
+			Task.Factory.StartNew(() => MainLoop(checkpoint, ct), ct);
+		}
+
+		private static long ConvertCheckpoint(StreamRevision? checkpoint, long lastLiveEventNumber) {
+			if (!checkpoint.HasValue)
+				return -1;
+
+			if (checkpoint == StreamRevision.End)
+				return lastLiveEventNumber;
+
+			return checkpoint.Value.ToInt64();
+		}
+
+		private async Task MainLoop(StreamRevision? checkpointRevision, CancellationToken ct) {
+			try {
+				Log.Debug("Subscription {subscriptionId} to {streamName} has started at checkpoint {streamRevision:N0}",
+					_subscriptionId, _streamName, checkpointRevision?.ToString() ?? "Start");
+
+				var confirmationLastEventNumber = await SubscribeToLive();
+				await ConfirmSubscription(ct);
+
+				// the event number we most recently sent on towards the client.
+				// (we should send on events _after_ this)
+				var checkpoint = ConvertCheckpoint(checkpointRevision, confirmationLastEventNumber);
+
+				// the most recently read sequence number from the live channel. 0 when we haven't read any.
+				var sequenceNumber = 0UL;
+
+				if (checkpoint >= confirmationLastEventNumber)
+					(checkpoint, sequenceNumber) = await GoLive(checkpoint, sequenceNumber, ct);
+
+				while (true) {
+					ct.ThrowIfCancellationRequested();
+					checkpoint = await CatchUp(checkpoint, ct);
+					(checkpoint, sequenceNumber) = await GoLive(checkpoint, sequenceNumber, ct);
+				}
+			} catch (Exception ex) {
+				if (ex is not (OperationCanceledException or ReadResponseException.StreamDeleted)) {
+					Log.Error(ex, "Subscription {subscriptionId} to {streamName} experienced an error.", _subscriptionId, _streamName);
+				}
+
+				_channel.Writer.TryComplete(ex);
+			} finally {
+				Log.Debug("Subscription {subscriptionId} to {streamName} has ended.", _subscriptionId, _streamName);
+			}
+		}
+
+		private async Task NotifyCaughtUp(long checkpoint, CancellationToken ct) {
+			Log.Debug("Subscription {subscriptionId} to {streamName} caught up at checkpoint {streamRevision:N0}.", _subscriptionId, _streamName, checkpoint);
+
+			await _channel.Writer.WriteAsync(new ReadResponse.SubscriptionCaughtUp(), ct);
+		}
+
+		private async Task NotifyFellBehind(long checkpoint, CancellationToken ct) {
+			Log.Debug("Subscription {subscriptionId} to {streamName} fell behind at checkpoint {streamRevision:N0}.", _subscriptionId, _streamName, checkpoint);
+
+			await _channel.Writer.WriteAsync(new ReadResponse.SubscriptionFellBehind(), ct);
+		}
+
+		private async ValueTask<(long, ulong)> GoLive(long checkpoint, ulong sequenceNumber, CancellationToken ct) {
+			await NotifyCaughtUp(checkpoint, ct);
+
+			await foreach (var liveEvent in _liveEvents.Reader.ReadAllAsync(ct)) {
+				var sequenceCorrect = liveEvent.SequenceNumber == sequenceNumber + 1;
+				sequenceNumber = liveEvent.SequenceNumber;
+
+				if (liveEvent.ResolvedEvent.OriginalEventNumber <= checkpoint) {
+					// skip because this event has already been sent towards the client
+					// (or the client specified a checkpoint for events that don't exist yet and so
+					// is not interested in them)
+					// nb: we can skip this event even if it had the wrong sequence number, it means
+					// we would have skipped the events that got discarded anyway.
+					continue;
+				}
+
+				if (!sequenceCorrect) {
+					// there's a gap in the sequence numbers, at least one live event was discarded
+					// due to the live channel becoming full.
+					// switch back to catch up to make sure we didn't miss anything we wanted to send.
+					await NotifyFellBehind(checkpoint, ct);
+					return (checkpoint, sequenceNumber);
+				}
+
+				// this is the next event to send towards the client. send it and update the checkpoint
+				await SendEventToSubscription(liveEvent.ResolvedEvent, ct);
+				checkpoint = liveEvent.ResolvedEvent.OriginalEventNumber;
+			}
+
+			throw new Exception($"Unexpected error: live events channel for subscription {_subscriptionId} to {_streamName} completed without exception");
+		}
+
+		private Task<long> CatchUp(long checkpoint, CancellationToken ct) {
+			var startEventNumber = checkpoint + 1;
+			Log.Verbose("Subscription {subscriptionId} to {streamName} is catching up from checkpoint {checkpoint:N0}", _subscriptionId, _streamName, checkpoint);
+
+			var catchupCompletionTcs = new TaskCompletionSource<long>();
+
+			// this is a safe use of AsyncTaskEnvelope. Only one call to OnMessage will be running
+			// at any given time because we only expect one reply and that reply kicks off the next read.
+			AsyncTaskEnvelope envelope = null;
+			envelope = new(OnMessage, ct);
+
+			ReadPage(startEventNumber, envelope, ct);
+
+			return catchupCompletionTcs.Task;
+
+			async Task OnMessage(Message message, CancellationToken token) {
+				try {
+					if (message is ClientMessage.NotHandled notHandled && TryHandleNotHandled(notHandled, out var ex)) {
+						throw ex;
+					}
+
+					if (message is not ClientMessage.ReadStreamEventsForwardCompleted completed) {
+						throw ReadResponseException.UnknownMessage.Create<ClientMessage.ReadStreamEventsForwardCompleted>(message);
+					}
+
+					switch (completed.Result) {
+						case ReadStreamResult.Success:
+							foreach (var @event in completed.Events) {
+								var streamRevision = StreamRevision.FromInt64(@event.OriginalEvent.EventNumber);
+
+								Log.Verbose("Subscription {subscriptionId} to {streamName} received catch-up event {streamRevision}.", _subscriptionId, _streamName, streamRevision);
+
+								await SendEventToSubscription(@event, token);
+								checkpoint = @event.OriginalEventNumber;
+							}
+
+							if (completed.IsEndOfStream) {
+								catchupCompletionTcs.TrySetResult(checkpoint);
+								return;
+							}
+
+							ReadPage(completed.NextEventNumber, envelope, token);
+							return;
+						case ReadStreamResult.Expired:
+							ReadPage(completed.FromEventNumber, envelope, token);
+							return;
+						case ReadStreamResult.NoStream:
+							catchupCompletionTcs.TrySetResult(checkpoint);
+							return;
+						case ReadStreamResult.StreamDeleted:
+							Log.Debug("Subscription {subscriptionId} to {streamName} stream deleted.", _subscriptionId, _streamName);
+							throw new ReadResponseException.StreamDeleted(_streamName);
+						case ReadStreamResult.AccessDenied:
+							throw new ReadResponseException.AccessDenied();
+						default:
+							throw ReadResponseException.UnknownError.Create(completed.Result);
+					}
+				} catch (Exception exception) {
+					catchupCompletionTcs.TrySetException(exception);
+				}
+			}
+		}
+
+		private async Task SendEventToSubscription(ResolvedEvent @event, CancellationToken ct) {
+			await _channel.Writer.WriteAsync(new ReadResponse.EventReceived(@event), ct);
+
+			if (@event.OriginalEvent.EventType == SystemEventTypes.StreamDeleted) {
+				throw new ReadResponseException.StreamDeleted(_streamName);
+			}
+		}
+
+		private Task<long> SubscribeToLive() {
+			var nextLiveSequenceNumber = 0UL;
+			var confirmationEventNumberTcs = new TaskCompletionSource<long>();
+
+			_bus.Publish(new ClientMessage.SubscribeToStream(Guid.NewGuid(), _subscriptionId, new CallbackEnvelope(OnSubscriptionMessage), _subscriptionId, _streamName, _resolveLinks, _user));
+
+			return confirmationEventNumberTcs.Task;
+
+			void OnSubscriptionMessage(Message message) {
+				try {
+					if (message is ClientMessage.NotHandled notHandled && TryHandleNotHandled(notHandled, out var ex)) {
+						throw ex;
+					}
+
+					switch (message) {
+						case ClientMessage.SubscriptionConfirmation confirmed:
+							long caughtUp = confirmed.LastEventNumber ??
+											throw ReadResponseException.UnknownError.Create($"Live subscription {_subscriptionId} to {_streamName} failed to retrieve the last event number.");
+
+							Log.Debug(
+								"Subscription {subscriptionId} to {streamName} confirmed. LastEventNumber is {streamRevision:N0}.",
+								_subscriptionId, _streamName, caughtUp);
+
+							confirmationEventNumberTcs.TrySetResult(caughtUp);
+							return;
+						case ClientMessage.SubscriptionDropped dropped:
+							Log.Debug(
+								"Subscription {subscriptionId} to {streamName} dropped by subscription service: {droppedReason}",
+								_subscriptionId, _streamName, dropped.Reason);
+							switch (dropped.Reason) {
+								case SubscriptionDropReason.AccessDenied:
+									throw new ReadResponseException.AccessDenied();
+								case SubscriptionDropReason.StreamDeleted:
+									throw new ReadResponseException.StreamDeleted(_streamName);
+								case SubscriptionDropReason.Unsubscribed:
+									return;
+								case SubscriptionDropReason.NotFound: // applies only to persistent subscriptions
+								default:
+									throw ReadResponseException.UnknownError.Create(dropped.Reason);
+							}
+						case ClientMessage.StreamEventAppeared appeared: {
+							Log.Verbose(
+								"Subscription {subscriptionId} to {streamName} received live event {streamRevision}.",
+								_subscriptionId, _streamName, appeared.Event.OriginalEventNumber);
+
+							if (!_liveEvents.Writer.TryWrite((++nextLiveSequenceNumber, appeared.Event))) {
+								// this cannot happen because _liveEvents does not have full mode 'wait'.
+								throw new Exception($"Unexpected error: could not write to live events channel for subscription {_subscriptionId} to {_streamName}");
+							}
+
+							return;
+						}
+						default:
+							throw ReadResponseException.UnknownMessage.Create<ClientMessage.SubscriptionConfirmation>(message);
+					}
+				} catch (Exception exception) {
+					_liveEvents.Writer.TryComplete(exception);
+					confirmationEventNumberTcs.TrySetException(exception);
+				}
+			}
+		}
+
+		private ValueTask ConfirmSubscription(CancellationToken ct) {
+			return _channel.Writer.WriteAsync(new ReadResponse.SubscriptionConfirmed(SubscriptionId), ct);
+		}
+
+		private void ReadPage(long startEventNumber, IEnvelope envelope, CancellationToken ct) {
+			var correlationId = Guid.NewGuid();
+			Log.Verbose("Subscription {subscriptionId} to {streamName} reading next page starting from {streamRevision}.", _subscriptionId, _streamName, startEventNumber);
+
+			_bus.Publish(new ClientMessage.ReadStreamEventsForward(
+				correlationId, correlationId, envelope,
+				_streamName, startEventNumber, ReadBatchSize, _resolveLinks, _requiresLeader, null,
+				_user,
+				replyOnExpired: true,
+				expires: _expiryStrategy.GetExpiry(),
+				cancellationToken: ct));
+		}
+
+		private void Unsubscribe() => _bus.Publish(new ClientMessage.UnsubscribeFromStream(Guid.NewGuid(), _subscriptionId, new NoopEnvelope(), _user));
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.cs b/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.cs
new file mode 100644
index 00000000000..6e5e0200103
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Enumerators/Enumerator.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Channels;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+
+namespace KurrentDB.Core.Services.Transport.Enumerators;
+
+public static partial class Enumerator {
+	private const int MaxLiveEventBufferCount = 32;
+	public const int ReadBatchSize = 32; // TODO  JPB make this configurable
+
+	private static readonly BoundedChannelOptions BoundedChannelOptions =
+		new(MaxLiveEventBufferCount) {
+			FullMode = BoundedChannelFullMode.Wait,
+			SingleReader = true,
+			SingleWriter = true
+		};
+
+	private static readonly BoundedChannelOptions LiveChannelOptions =
+		new(MaxLiveEventBufferCount) {
+			FullMode = BoundedChannelFullMode.DropOldest,
+			SingleReader = true,
+			SingleWriter = true
+		};
+
+	private static bool TryHandleNotHandled(ClientMessage.NotHandled notHandled, out ReadResponseException exception) {
+		exception = null;
+		switch (notHandled.Reason) {
+			case ClientMessage.NotHandled.Types.NotHandledReason.NotReady:
+				exception = new ReadResponseException.NotHandled.ServerNotReady();
+				return true;
+			case ClientMessage.NotHandled.Types.NotHandledReason.TooBusy:
+				exception = new ReadResponseException.NotHandled.ServerBusy();
+				return true;
+			case ClientMessage.NotHandled.Types.NotHandledReason.NotLeader:
+			case ClientMessage.NotHandled.Types.NotHandledReason.IsReadOnly:
+				switch (notHandled.LeaderInfo) {
+					case { } leaderInfo:
+						exception = new ReadResponseException.NotHandled.LeaderInfo(leaderInfo.Http.GetHost(), leaderInfo.Http.GetPort());
+						return true;
+					default:
+						exception = new ReadResponseException.NotHandled.NoLeaderInfo();
+						return true;
+				}
+
+			default:
+				return false;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Enumerators/ReadResponse.cs b/src/KurrentDB.Core/Services/Transport/Enumerators/ReadResponse.cs
new file mode 100644
index 00000000000..e81beb4619f
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Enumerators/ReadResponse.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Transport.Common;
+
+namespace KurrentDB.Core.Services.Transport.Enumerators;
+
+public abstract class ReadResponse {
+	public class EventReceived(ResolvedEvent @event) : ReadResponse {
+		public ResolvedEvent Event = @event;
+	}
+
+	public class SubscriptionCaughtUp : ReadResponse;
+
+	public class SubscriptionFellBehind : ReadResponse;
+
+	public class CheckpointReceived(ulong commitPosition, ulong preparePosition) : ReadResponse {
+		public readonly ulong CommitPosition = commitPosition;
+		public readonly ulong PreparePosition = preparePosition;
+	}
+
+	public class StreamNotFound(string streamName) : ReadResponse {
+		public readonly string StreamName = streamName;
+	}
+
+	public class SubscriptionConfirmed(string subscriptionId) : ReadResponse {
+		public readonly string SubscriptionId = subscriptionId;
+	}
+
+	public class LastStreamPositionReceived(StreamRevision lastStreamPosition) : ReadResponse {
+		public readonly StreamRevision LastStreamPosition = lastStreamPosition;
+	}
+
+	public class FirstStreamPositionReceived(StreamRevision firstStreamPosition) : ReadResponse {
+		public readonly StreamRevision FirstStreamPosition = firstStreamPosition;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Enumerators/ReadResponseException.cs b/src/KurrentDB.Core/Services/Transport/Enumerators/ReadResponseException.cs
new file mode 100644
index 00000000000..f084dca2d8a
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Enumerators/ReadResponseException.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Common;
+
+namespace KurrentDB.Core.Services.Transport.Enumerators;
+
+public abstract class ReadResponseException : Exception {
+	public class StreamNotFound(string streamName) : ReadResponseException {
+		public string StreamName { get; } = streamName;
+	}
+
+	public class WrongExpectedRevision(string stream, long expectedRevision, long actualRevision) : ReadResponseException {
+		public string Stream { get; } = stream;
+
+		public StreamRevision ExpectedStreamRevision { get; } = StreamRevision.FromInt64(expectedRevision);
+
+		public StreamRevision ActualStreamRevision { get; } = StreamRevision.FromInt64(actualRevision);
+	}
+
+	public class StreamDeleted(string streamName) : ReadResponseException {
+		public readonly string StreamName = streamName;
+	}
+
+	public class AccessDenied : ReadResponseException;
+
+	public class InvalidPosition : ReadResponseException;
+
+	public class Timeout(string errorMessage) : ReadResponseException {
+		public readonly string ErrorMessage = errorMessage;
+	}
+
+	public class UnknownMessage(Type unknownMessageType, Type expectedMessageType) : ReadResponseException {
+		public readonly Type UnknownMessageType = unknownMessageType;
+		public readonly Type ExpectedMessageType = expectedMessageType;
+
+		public static UnknownMessage Create<T>(Message message) where T : Message => new(message.GetType(), typeof(T));
+	}
+
+	public class UnknownError(Type resultType, object result) : ReadResponseException {
+		public readonly Type ResultType = resultType;
+		public readonly object Result = result;
+
+		public static UnknownError Create<T>(T result) => new(typeof(T), result);
+	}
+
+	public abstract class NotHandled {
+		public class ServerNotReady : ReadResponseException;
+
+		public class ServerBusy : ReadResponseException;
+
+		public class LeaderInfo(string host, int port) : ReadResponseException {
+			public string Host { get; } = host;
+			public int Port { get; } = port;
+		}
+
+		public class NoLeaderInfo : ReadResponseException;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/AnyStreamRevision.cs b/src/KurrentDB.Core/Services/Transport/Grpc/AnyStreamRevision.cs
new file mode 100644
index 00000000000..2eba2a4f274
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/AnyStreamRevision.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using HashCode = KurrentDB.Core.Services.Transport.Common.HashCode;
+
+namespace KurrentDB.Core.Services.Transport.Grpc;
+
+public readonly struct AnyStreamRevision : IEquatable<AnyStreamRevision> {
+	public static readonly AnyStreamRevision NoStream = new(Constants.NoStream);
+	public static readonly AnyStreamRevision Any = new(Constants.Any);
+	public static readonly AnyStreamRevision StreamExists = new(Constants.StreamExists);
+
+	private readonly int _value;
+
+	private static class Constants {
+		public const int NoStream = 1;
+		public const int Any = 2;
+		public const int StreamExists = 4;
+	}
+
+	public static AnyStreamRevision FromInt64(long value) => new(-Convert.ToInt32(value));
+
+	public AnyStreamRevision(int value) {
+		switch (value) {
+			case Constants.NoStream:
+			case Constants.Any:
+			case Constants.StreamExists:
+				_value = value;
+				return;
+			default:
+				throw new ArgumentOutOfRangeException(nameof(value));
+		}
+	}
+
+	public bool Equals(AnyStreamRevision other) => _value == other._value;
+	public override bool Equals(object obj) => obj is AnyStreamRevision other && Equals(other);
+	public override int GetHashCode() => HashCode.Hash.Combine(_value);
+	public static bool operator ==(AnyStreamRevision left, AnyStreamRevision right) => left.Equals(right);
+	public static bool operator !=(AnyStreamRevision left, AnyStreamRevision right) => !left.Equals(right);
+	public long ToInt64() => -Convert.ToInt64(_value);
+	public static implicit operator int(AnyStreamRevision streamRevision) => streamRevision._value;
+
+	public override string ToString() => _value switch {
+		Constants.NoStream => nameof(NoStream),
+		Constants.Any => nameof(Any),
+		Constants.StreamExists => nameof(StreamExists),
+		_ => _value.ToString()
+	};
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/AsyncStreamExtensions.cs b/src/KurrentDB.Core/Services/Transport/Grpc/AsyncStreamExtensions.cs
new file mode 100644
index 00000000000..bc4af1eaa5a
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/AsyncStreamExtensions.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#region Copyright notice and license
+
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#endregion
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Grpc.Core;
+
+namespace KurrentDB.Core.Services.Transport.Grpc;
+
+/// <summary>
+/// Extension methods that simplify work with gRPC streaming calls.
+/// </summary>
+public static class AsyncStreamExtensions {
+	/// <summary>
+	/// Reads the entire stream and executes an async action for each element.
+	/// </summary>
+	public static async ValueTask ForEachAsync<T>(this IAsyncStreamReader<T> streamReader,
+		Func<T, ValueTask> asyncAction,
+		CancellationToken token)
+		where T : class {
+		while (await streamReader.MoveNext(token)) {
+			await asyncAction(streamReader.Current);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/BatchAppendResp.cs b/src/KurrentDB.Core/Services/Transport/Grpc/BatchAppendResp.cs
new file mode 100644
index 00000000000..06d7390783d
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/BatchAppendResp.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Client.Streams;
+
+partial class BatchAppendResp {
+	internal bool IsClosing { get; set; }
+
+	partial class Types {
+		partial class Success {
+			public static Success Completed(long commitPosition, long preparePosition, long currentVersion) => new() {
+				positionOptionCase_ = (commitPosition, preparePosition) switch {
+					( >= 0, >= 0) => PositionOptionOneofCase.Position,
+					_ => PositionOptionOneofCase.NoPosition
+				},
+				positionOption_ = (commitPosition, preparePosition) switch {
+					( >= 0, >= 0) => new AllStreamPosition {
+						CommitPosition = (ulong)commitPosition,
+						PreparePosition = (ulong)preparePosition
+					},
+					_ => new Google.Protobuf.WellKnownTypes.Empty()
+				},
+				currentRevisionOptionCase_ = currentVersion switch {
+					>= 0 => CurrentRevisionOptionOneofCase.CurrentRevision,
+					_ => CurrentRevisionOptionOneofCase.NoStream
+				},
+				currentRevisionOption_ = currentVersion switch {
+					>= 0 => (ulong)currentVersion,
+					_ => new Google.Protobuf.WellKnownTypes.Empty()
+				}
+			};
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Cluster.Elections.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Cluster.Elections.cs
new file mode 100644
index 00000000000..c152108a6fc
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Cluster.Elections.cs
@@ -0,0 +1,163 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net;
+using System.Threading.Tasks;
+using EventStore.Cluster;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Transport.Grpc;
+using ClusterInfo = KurrentDB.Core.Cluster.ClusterInfo;
+using Empty = EventStore.Client.Empty;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc.Cluster;
+
+partial class Elections {
+	private static readonly Empty EmptyResult = new();
+	private readonly IAuthorizationProvider _authorizationProvider;
+	private static readonly Operation ViewChangeOperation = new(Plugins.Authorization.Operations.Node.Elections.ViewChange);
+	private static readonly Operation ViewChangeProofOperation = new(Plugins.Authorization.Operations.Node.Elections.ViewChangeProof);
+	private static readonly Operation PrepareOperation = new(Plugins.Authorization.Operations.Node.Elections.Prepare);
+	private static readonly Operation PrepareOkOperation = new(Plugins.Authorization.Operations.Node.Elections.PrepareOk);
+	private static readonly Operation ProposalOperation = new(Plugins.Authorization.Operations.Node.Elections.Proposal);
+	private static readonly Operation AcceptOperation = new(Plugins.Authorization.Operations.Node.Elections.Accept);
+	private static readonly Operation MasterIsResigningOperation = new(Plugins.Authorization.Operations.Node.Elections.LeaderIsResigning);
+	private static readonly Operation MasterIsResigningOkOperation = new(Plugins.Authorization.Operations.Node.Elections.LeaderIsResigningOk);
+	private readonly IPublisher _bus;
+	private readonly string _clusterDns;
+
+	public Elections(IPublisher bus, IAuthorizationProvider authorizationProvider, string clusterDns) {
+		_bus = bus;
+		_authorizationProvider = Ensure.NotNull(authorizationProvider);
+		_clusterDns = clusterDns;
+	}
+
+	public override async Task<Empty> ViewChange(ViewChangeRequest request, ServerCallContext context) {
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, ViewChangeOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		_bus.Publish(new ElectionMessage.ViewChange(
+			Uuid.FromDto(request.ServerId).ToGuid(),
+			new DnsEndPoint(request.ServerHttp.Address, (int)request.ServerHttp.Port).WithClusterDns(_clusterDns),
+			request.AttemptedView));
+		return EmptyResult;
+	}
+
+	public override async Task<Empty> ViewChangeProof(ViewChangeProofRequest request, ServerCallContext context) {
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, ViewChangeProofOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		_bus.Publish(new ElectionMessage.ViewChangeProof(
+			Uuid.FromDto(request.ServerId).ToGuid(),
+			new DnsEndPoint(request.ServerHttp.Address, (int)request.ServerHttp.Port).WithClusterDns(_clusterDns),
+			request.InstalledView));
+		return EmptyResult;
+	}
+
+	public override async Task<Empty> Prepare(PrepareRequest request, ServerCallContext context) {
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, PrepareOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		_bus.Publish(new ElectionMessage.Prepare(
+			Uuid.FromDto(request.ServerId).ToGuid(),
+			new DnsEndPoint(request.ServerHttp.Address, (int)request.ServerHttp.Port).WithClusterDns(_clusterDns),
+			request.View));
+		return EmptyResult;
+	}
+
+	public override async Task<Empty> PrepareOk(PrepareOkRequest request, ServerCallContext context) {
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, PrepareOkOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		_bus.Publish(new ElectionMessage.PrepareOk(
+			request.View,
+			Uuid.FromDto(request.ServerId).ToGuid(),
+			new DnsEndPoint(request.ServerHttp.Address, (int)request.ServerHttp.Port).WithClusterDns(_clusterDns),
+			request.EpochNumber,
+			request.EpochPosition,
+			Uuid.FromDto(request.EpochId).ToGuid(),
+			Uuid.FromDto(request.EpochLeaderInstanceId).ToGuid(),
+			request.LastCommitPosition,
+			request.WriterCheckpoint,
+			request.ChaserCheckpoint,
+			request.NodePriority,
+			ClusterInfo.FromGrpcClusterInfo(request.ClusterInfo, _clusterDns)));
+		return EmptyResult;
+	}
+
+	public override async Task<Empty> Proposal(ProposalRequest request, ServerCallContext context) {
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, ProposalOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		_bus.Publish(new ElectionMessage.Proposal(
+			Uuid.FromDto(request.ServerId).ToGuid(),
+			new DnsEndPoint(request.ServerHttp.Address, (int)request.ServerHttp.Port).WithClusterDns(_clusterDns),
+			Uuid.FromDto(request.LeaderId).ToGuid(),
+			new DnsEndPoint(request.LeaderHttp.Address, (int)request.LeaderHttp.Port).WithClusterDns(_clusterDns),
+			request.View,
+			request.EpochNumber,
+			request.EpochPosition,
+			Uuid.FromDto(request.EpochId).ToGuid(),
+			Uuid.FromDto(request.EpochLeaderInstanceId).ToGuid(),
+			request.LastCommitPosition,
+			request.WriterCheckpoint,
+			request.ChaserCheckpoint,
+			request.NodePriority));
+		return EmptyResult;
+	}
+
+	public override async Task<Empty> Accept(AcceptRequest request, ServerCallContext context) {
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, AcceptOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		_bus.Publish(new ElectionMessage.Accept(
+			Uuid.FromDto(request.ServerId).ToGuid(),
+			new DnsEndPoint(request.ServerHttp.Address, (int)request.ServerHttp.Port).WithClusterDns(_clusterDns),
+			Uuid.FromDto(request.LeaderId).ToGuid(),
+			new DnsEndPoint(request.LeaderHttp.Address, (int)request.LeaderHttp.Port).WithClusterDns(_clusterDns),
+			request.View));
+		return EmptyResult;
+	}
+
+	public override async Task<Empty> LeaderIsResigning(LeaderIsResigningRequest request, ServerCallContext context) {
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, MasterIsResigningOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		_bus.Publish(new ElectionMessage.LeaderIsResigning(
+			Uuid.FromDto(request.LeaderId).ToGuid(),
+			new DnsEndPoint(request.LeaderHttp.Address, (int)request.LeaderHttp.Port).WithClusterDns(_clusterDns)));
+		return EmptyResult;
+	}
+
+	public override async Task<Empty> LeaderIsResigningOk(LeaderIsResigningOkRequest request, ServerCallContext context) {
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, MasterIsResigningOkOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		_bus.Publish(new ElectionMessage.LeaderIsResigningOk(
+			Uuid.FromDto(request.LeaderId).ToGuid(),
+			new DnsEndPoint(request.LeaderHttp.Address, (int)request.LeaderHttp.Port).WithClusterDns(_clusterDns),
+			Uuid.FromDto(request.ServerId).ToGuid(),
+			new DnsEndPoint(request.ServerHttp.Address, (int)request.ServerHttp.Port).WithClusterDns(_clusterDns)));
+		return EmptyResult;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Cluster.Gossip.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Cluster.Gossip.cs
new file mode 100644
index 00000000000..74bc4a268dd
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Cluster.Gossip.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net;
+using System.Threading.Tasks;
+using EventStore.Cluster;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.Transport.Grpc;
+using Empty = EventStore.Client.Empty;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc.Cluster;
+
+partial class Gossip {
+	private readonly IAuthorizationProvider _authorizationProvider;
+	private static readonly Operation ReadOperation = new(Plugins.Authorization.Operations.Node.Gossip.Read);
+	private static readonly Operation UpdateOperation = new(Plugins.Authorization.Operations.Node.Gossip.Update);
+	private readonly IPublisher _bus;
+	private readonly string _clusterDns;
+	private readonly IDurationTracker _updateTracker;
+	private readonly IDurationTracker _readTracker;
+
+	public Gossip(
+		IPublisher bus,
+		IAuthorizationProvider authorizationProvider,
+		string clusterDns,
+		IDurationTracker updateTracker,
+		IDurationTracker readTracker) {
+
+		_bus = bus;
+		_authorizationProvider = Ensure.NotNull(authorizationProvider);
+		_clusterDns = clusterDns;
+		_updateTracker = updateTracker;
+		_readTracker = readTracker;
+	}
+
+	public override async Task<ClusterInfo> Update(GossipRequest request, ServerCallContext context) {
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, UpdateOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		var clusterInfo = KurrentDB.Core.Cluster.ClusterInfo.FromGrpcClusterInfo(request.Info, _clusterDns);
+		var tcs = new TaskCompletionSource<ClusterInfo>();
+		var duration = _updateTracker.Start();
+		_bus.Publish(new GossipMessage.GossipReceived(new CallbackEnvelope(msg => GossipResponse(msg, tcs, duration)),
+			clusterInfo, new DnsEndPoint(request.Server.Address, (int)request.Server.Port).WithClusterDns(_clusterDns)));
+		return await tcs.Task;
+	}
+
+	public override async Task<ClusterInfo> Read(Empty request, ServerCallContext context) {
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, ReadOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		var tcs = new TaskCompletionSource<ClusterInfo>();
+		var duration = _readTracker.Start();
+		_bus.Publish(new GossipMessage.ReadGossip(new CallbackEnvelope(msg => GossipResponse(msg, tcs, duration))));
+		return await tcs.Task;
+	}
+
+	private static void GossipResponse(Message msg, TaskCompletionSource<ClusterInfo> tcs, Duration duration) {
+		if (msg is GossipMessage.SendGossip received) {
+			tcs.TrySetResult(KurrentDB.Core.Cluster.ClusterInfo.ToGrpcClusterInfo(received.ClusterInfo));
+			duration.Dispose();
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Cluster.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Cluster.cs
new file mode 100644
index 00000000000..95b37fb6c7a
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Cluster.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc.Cluster;
+
+internal partial class Gossip : EventStore.Cluster.Gossip.GossipBase;
+
+internal partial class Elections : EventStore.Cluster.Elections.ElectionsBase;
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Constants.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Constants.cs
new file mode 100644
index 00000000000..5544a8a711f
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Constants.cs
@@ -0,0 +1,71 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.Transport.Grpc;
+
+public static class Constants {
+	public static class Exceptions {
+		public const string ExceptionKey = "exception";
+
+		public const string AccessDenied = "access-denied";
+		public const string InvalidTransaction = "invalid-transaction";
+		public const string StreamDeleted = "stream-deleted";
+		public const string WrongExpectedVersion = "wrong-expected-version";
+		public const string StreamNotFound = "stream-not-found";
+		public const string MaximumAppendSizeExceeded = "maximum-append-size-exceeded";
+		public const string MaximumAppendEventSizeExceeded = "maximum-append-event-size-exceeded";
+		public const string MissingRequiredMetadataProperty = "missing-required-metadata-property";
+		public const string NotLeader = "not-leader";
+
+		public const string PersistentSubscriptionFailed = "persistent-subscription-failed";
+		public const string PersistentSubscriptionDoesNotExist = "persistent-subscription-does-not-exist";
+		public const string PersistentSubscriptionExists = "persistent-subscription-exists";
+		public const string MaximumSubscribersReached = "maximum-subscribers-reached";
+		public const string PersistentSubscriptionDropped = "persistent-subscription-dropped";
+
+		public const string UserNotFound = "user-not-found";
+		public const string UserConflict = "user-conflict";
+
+		public const string ScavengeNotFound = "scavenge-not-found";
+
+		public const string RedactionLockFailed = "redaction-lock-failed";
+		public const string RedactionGetEventPositionFailed = "redaction-get-event-position-failed";
+		public const string RedactionSwitchChunkFailed = "redaction-switch-chunk-failed";
+
+		public const string ExpectedVersion = "expected-version";
+		public const string ActualVersion = "actual-version";
+		public const string StreamName = "stream-name";
+		public const string GroupName = "group-name";
+		public const string Reason = "reason";
+		public const string MaximumAppendSize = "maximum-append-size";
+		public const string MaximumAppendEventSize = "maximum-append-event-size";
+		public const string ProposedAppendEventSize = "proposed-append-event-size";
+		public const string RequiredMetadataProperties = "required-metadata-properties";
+		public const string ScavengeId = "scavenge-id";
+		public const string LeaderEndpointHost = "leader-endpoint-host";
+		public const string LeaderEndpointPort = "leader-endpoint-port";
+		public const string EventId = "event-id";
+
+		public const string LoginName = "login-name";
+	}
+
+	public static class Metadata {
+		public const string Type = "type";
+		public const string Created = "created";
+		public const string ContentType = "content-type";
+		public static readonly string[] RequiredMetadata = { Type, ContentType };
+
+		public static class ContentTypes {
+			public const string ApplicationJson = "application/json";
+			public const string ApplicationOctetStream = "application/octet-stream";
+		}
+	}
+
+	public static class Headers {
+		public const string Authorization = "authorization";
+		public const string BasicScheme = "Basic";
+
+		public const string ConnectionName = "connection-name";
+		public const string RequiresLeader = "requires-leader";
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Gossip.Read.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Gossip.Read.cs
new file mode 100644
index 00000000000..28f4f7d14ce
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Gossip.Read.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.Client;
+using EventStore.Client.Gossip;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.Transport.Grpc;
+using ClusterInfo = EventStore.Client.Gossip.ClusterInfo;
+using MemberInfo = EventStore.Client.Gossip.MemberInfo;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+partial class Gossip {
+	private static readonly Operation ReadOperation = new(Plugins.Authorization.Operations.Node.Gossip.ClientRead);
+
+	public override async Task<ClusterInfo> Read(Empty request, ServerCallContext context) {
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, ReadOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		var tcs = new TaskCompletionSource<ClusterInfo>();
+		var duration = _tracker.Start();
+		_bus.Publish(new GossipMessage.ClientGossip(new CallbackEnvelope(msg => GossipResponse(msg, tcs, duration))));
+		return await tcs.Task;
+	}
+
+	private void GossipResponse(Message msg, TaskCompletionSource<ClusterInfo> tcs, Duration duration) {
+		if (msg is GossipMessage.SendClientGossip received) {
+			tcs.TrySetResult(ToGrpcClusterInfo(received.ClusterInfo));
+			duration.Dispose();
+		}
+	}
+
+	private static ClusterInfo ToGrpcClusterInfo(ClientClusterInfo cluster) {
+		var members = Array.ConvertAll(cluster.Members, x => new MemberInfo {
+			InstanceId = Uuid.FromGuid(x.InstanceId).ToDto(),
+			TimeStamp = x.TimeStamp.ToTicksSinceEpoch(),
+			State = (MemberInfo.Types.VNodeState)x.State,
+			IsAlive = x.IsAlive,
+			HttpEndPoint = new EndPoint {
+				Address = x.HttpEndPointIp,
+				Port = (uint)x.HttpEndPointPort
+			}
+		}).ToArray();
+		var info = new ClusterInfo();
+		info.Members.AddRange(members);
+		return info;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Gossip.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Gossip.cs
new file mode 100644
index 00000000000..10dcfc709ca
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Gossip.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Metrics;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+partial class Gossip : Client.Gossip.Gossip.GossipBase {
+	private readonly IPublisher _bus;
+	private readonly IAuthorizationProvider _authorizationProvider;
+	private readonly IDurationTracker _tracker;
+
+	public Gossip(IPublisher bus, IAuthorizationProvider authorizationProvider, IDurationTracker tracker) {
+		_bus = bus;
+		_authorizationProvider = Ensure.NotNull(authorizationProvider);
+		_tracker = tracker;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Monitoring.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Monitoring.cs
new file mode 100644
index 00000000000..c536a6904ba
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Monitoring.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using EventStore.Client.Monitoring;
+using Grpc.Core;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Services.Transport.Grpc;
+
+internal class Monitoring(IPublisher publisher) : EventStore.Client.Monitoring.Monitoring.MonitoringBase {
+	public override Task Stats(StatsReq request, IServerStreamWriter<StatsResp> responseStream, ServerCallContext context) {
+		var channel = Channel.CreateBounded<StatsResp>(new BoundedChannelOptions(1) {
+			SingleReader = true,
+			SingleWriter = true
+		});
+
+		_ = Receive();
+
+		return channel.Reader.ReadAllAsync(context.CancellationToken)
+			.ForEachAwaitAsync(responseStream.WriteAsync, context.CancellationToken);
+
+		async Task Receive() {
+			var delay = TimeSpan.FromMilliseconds(request.RefreshTimePeriodInMs);
+			var envelope = new CallbackEnvelope(message => {
+				if (message is not MonitoringMessage.GetFreshStatsCompleted completed) {
+					channel.Writer.TryComplete(UnknownMessage<MonitoringMessage.GetFreshStatsCompleted>(message));
+					return;
+				}
+
+				var response = new StatsResp();
+
+				foreach (var (key, value) in completed.Stats.Where(stat => stat.Value is not null)) {
+					response.Stats.Add(key, value.ToString());
+				}
+
+				channel.Writer.TryWrite(response);
+			});
+			while (!context.CancellationToken.IsCancellationRequested) {
+				publisher.Publish(new MonitoringMessage.GetFreshStats(envelope, x => x, request.UseMetadata, false));
+
+				await Task.Delay(delay, context.CancellationToken);
+			}
+		}
+	}
+
+	private static RpcException UnknownMessage<T>(Message message) where T : Message =>
+		new(new(StatusCode.Unknown, $"Envelope callback expected {typeof(T).Name}, received {message.GetType().Name} instead"));
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Operations.Admin.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Operations.Admin.cs
new file mode 100644
index 00000000000..f2a2895c74e
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Operations.Admin.cs
@@ -0,0 +1,104 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.Client;
+using EventStore.Client.Operations;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class Operations {
+	private static readonly Operation ShutdownOperation = new(Plugins.Authorization.Operations.Node.Shutdown);
+	private static readonly Operation MergeIndexesOperation = new(Plugins.Authorization.Operations.Node.MergeIndexes);
+	private static readonly Operation ResignOperation = new(Plugins.Authorization.Operations.Node.Resign);
+	private static readonly Operation SetNodePriorityOperation = new(Plugins.Authorization.Operations.Node.SetPriority);
+	private static readonly Operation RestartPersistentSubscriptionsOperation = new(Plugins.Authorization.Operations.Subscriptions.Restart);
+	private static readonly Empty EmptyResult = new();
+
+	public override async Task<Empty> Shutdown(Empty request, ServerCallContext context) {
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, ShutdownOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		_publisher.Publish(new ClientMessage.RequestShutdown(exitProcess: true, shutdownHttp: true));
+		return EmptyResult;
+	}
+
+	public override async Task<Empty> MergeIndexes(Empty request, ServerCallContext context) {
+		var mergeResultSource = new TaskCompletionSource<string>();
+
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, MergeIndexesOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		var correlationId = Guid.NewGuid();
+		_publisher.Publish(new ClientMessage.MergeIndexes(new CallbackEnvelope(OnMessage), correlationId, user));
+
+		await mergeResultSource.Task;
+		return EmptyResult;
+
+		void OnMessage(Message message) {
+			if (message is not ClientMessage.MergeIndexesResponse completed) {
+				mergeResultSource.TrySetException(RpcExceptions.UnknownMessage<ClientMessage.MergeIndexesResponse>(message));
+			} else {
+				mergeResultSource.SetResult(completed.CorrelationId.ToString());
+			}
+		}
+	}
+
+	public override async Task<Empty> ResignNode(Empty request, ServerCallContext context) {
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, ResignOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		_publisher.Publish(new ClientMessage.ResignNode());
+		return EmptyResult;
+	}
+
+	public override async Task<Empty> SetNodePriority(SetNodePriorityReq request, ServerCallContext context) {
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, SetNodePriorityOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		_publisher.Publish(new ClientMessage.SetNodePriority(request.Priority));
+		return EmptyResult;
+	}
+
+	public override async Task<Empty> RestartPersistentSubscriptions(Empty request, ServerCallContext context) {
+		var restart = new TaskCompletionSource<bool>();
+		var envelope = new CallbackEnvelope(OnMessage);
+
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, RestartPersistentSubscriptionsOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		_publisher.Publish(new SubscriptionMessage.PersistentSubscriptionsRestart(envelope));
+
+		await restart.Task;
+		return new Empty();
+
+		void OnMessage(Message message) {
+			switch (message) {
+				case SubscriptionMessage.PersistentSubscriptionsRestarting:
+				case SubscriptionMessage.InvalidPersistentSubscriptionsRestart:
+					restart.TrySetResult(true);
+					break;
+				default:
+					restart.TrySetException(RpcExceptions.UnknownMessage<SubscriptionMessage.PersistentSubscriptionsRestarting>(message));
+					break;
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Operations.Scavenge.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Operations.Scavenge.cs
new file mode 100644
index 00000000000..21539dc8240
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Operations.Scavenge.cs
@@ -0,0 +1,95 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.Client.Operations;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+partial class Operations {
+	private static readonly Operation StartOperation = new(Plugins.Authorization.Operations.Node.Scavenge.Start);
+	private static readonly Operation StopOperation = new(Plugins.Authorization.Operations.Node.Scavenge.Stop);
+
+	public override async Task<ScavengeResp> StartScavenge(StartScavengeReq request, ServerCallContext context) {
+		var scavengeResultSource = new TaskCompletionSource<(string, ScavengeResp.Types.ScavengeResult)>();
+
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, StartOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		_publisher.Publish(
+			new ClientMessage.ScavengeDatabase(
+				new CallbackEnvelope(OnMessage),
+				Guid.NewGuid(),
+				user,
+				request.Options.StartFromChunk,
+				request.Options.ThreadCount,
+				null,
+				null,
+				false
+			)
+		);
+
+		var (scavengeId, scavengeResult) = await scavengeResultSource.Task;
+
+		return new ScavengeResp {
+			ScavengeId = scavengeId,
+			ScavengeResult = scavengeResult
+		};
+
+		void OnMessage(Message message) => HandleScavengeDatabaseResponse(message, scavengeResultSource);
+	}
+
+	public override async Task<ScavengeResp> StopScavenge(StopScavengeReq request, ServerCallContext context) {
+		var scavengeResultSource = new TaskCompletionSource<(string, ScavengeResp.Types.ScavengeResult)>();
+
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, StopOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		_publisher.Publish(new ClientMessage.StopDatabaseScavenge(new CallbackEnvelope(OnMessage), Guid.NewGuid(), user, request.Options.ScavengeId));
+
+		var (scavengeId, scavengeResult) = await scavengeResultSource.Task;
+
+		return new ScavengeResp {
+			ScavengeId = scavengeId,
+			ScavengeResult = scavengeResult
+		};
+
+		void OnMessage(Message message) => HandleScavengeDatabaseResponse(message, scavengeResultSource);
+	}
+
+	private static void HandleScavengeDatabaseResponse(
+		Message message,
+		TaskCompletionSource<(string, ScavengeResp.Types.ScavengeResult)> scavengeResultSource) {
+		switch (message) {
+			case ClientMessage.ScavengeDatabaseUnauthorizedResponse:
+				scavengeResultSource.TrySetException(RpcExceptions.AccessDenied());
+				return;
+			case ClientMessage.ScavengeDatabaseNotFoundResponse notFoundResponse:
+				scavengeResultSource.TrySetException(RpcExceptions.ScavengeNotFound(notFoundResponse.ScavengeId));
+				return;
+			case ClientMessage.ScavengeDatabaseStartedResponse startedResponse:
+				scavengeResultSource.TrySetResult((startedResponse.ScavengeId, ScavengeResp.Types.ScavengeResult.Started));
+				return;
+			case ClientMessage.ScavengeDatabaseStoppedResponse stoppedResponse:
+				scavengeResultSource.TrySetResult((stoppedResponse.ScavengeId, ScavengeResp.Types.ScavengeResult.Stopped));
+				return;
+			case ClientMessage.ScavengeDatabaseInProgressResponse inProgressResponse:
+				scavengeResultSource.TrySetResult((inProgressResponse.ScavengeId, ScavengeResp.Types.ScavengeResult.InProgress));
+				return;
+			default:
+				scavengeResultSource.TrySetException(RpcExceptions.UnknownMessage<Message>(message));
+				return;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Operations.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Operations.cs
new file mode 100644
index 00000000000..7405ed92ee4
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Operations.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class Operations : Client.Operations.Operations.OperationsBase {
+	private readonly IPublisher _publisher;
+	private readonly IAuthorizationProvider _authorizationProvider;
+
+	public Operations(IPublisher publisher, IAuthorizationProvider authorizationProvider) {
+		_publisher = Ensure.NotNull(publisher);
+		_authorizationProvider = Ensure.NotNull(authorizationProvider);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.Create.cs b/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.Create.cs
new file mode 100644
index 00000000000..1f7f1943069
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.Create.cs
@@ -0,0 +1,230 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.Client.PersistentSubscriptions;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.Transport.Common;
+using static EventStore.Client.PersistentSubscriptions.CreateReq.Types.Settings;
+using static KurrentDB.Core.Messages.ClientMessage.CreatePersistentSubscriptionToAllCompleted;
+using static KurrentDB.Core.Messages.ClientMessage.CreatePersistentSubscriptionToStreamCompleted;
+using static KurrentDB.Core.Services.Transport.Grpc.RpcExceptions;
+using AllOptionOneofCase = EventStore.Client.PersistentSubscriptions.CreateReq.Types.AllOptions.AllOptionOneofCase;
+using RevisionOptionOneofCase = EventStore.Client.PersistentSubscriptions.CreateReq.Types.StreamOptions.RevisionOptionOneofCase;
+using StreamOptionOneofCase = EventStore.Client.PersistentSubscriptions.CreateReq.Types.Options.StreamOptionOneofCase;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class PersistentSubscriptions {
+	private static readonly Operation CreateOperation = new(Plugins.Authorization.Operations.Subscriptions.Create);
+
+	public override async Task<CreateResp> Create(CreateReq request, ServerCallContext context) {
+		var createPersistentSubscriptionSource = new TaskCompletionSource<CreateResp>();
+		var settings = request.Options.Settings;
+		var correlationId = Guid.NewGuid();
+
+		var user = context.GetHttpContext().User;
+
+		if (!await _authorizationProvider.CheckAccessAsync(user,
+				CreateOperation, context.CancellationToken)) {
+			throw AccessDenied();
+		}
+
+		string streamId;
+		string consumerStrategy;
+		if (string.IsNullOrEmpty(settings.ConsumerStrategy)) {
+#pragma warning disable 612
+			/*for backwards compatibility*/
+			consumerStrategy = settings.NamedConsumerStrategy.ToString();
+#pragma warning restore 612
+		} else {
+			consumerStrategy = settings.ConsumerStrategy;
+		}
+
+		switch (request.Options.StreamOptionCase) {
+			case StreamOptionOneofCase.Stream:
+			case StreamOptionOneofCase.None: /*for backwards compatibility*/ {
+				StreamRevision startRevision;
+
+				if (request.Options.StreamOptionCase == StreamOptionOneofCase.Stream) {
+					streamId = request.Options.Stream.StreamIdentifier;
+					startRevision = request.Options.Stream.RevisionOptionCase switch {
+						RevisionOptionOneofCase.Revision => new StreamRevision(request.Options.Stream.Revision),
+						RevisionOptionOneofCase.Start => StreamRevision.Start,
+						RevisionOptionOneofCase.End => StreamRevision.End,
+						_ => throw InvalidArgument(request.Options.Stream.RevisionOptionCase)
+					};
+				} else {
+#pragma warning disable 612
+					/*for backwards compatibility*/
+					streamId = request.Options.StreamIdentifier;
+					startRevision = new StreamRevision(request.Options.Settings.Revision);
+#pragma warning restore 612
+				}
+
+				_publisher.Publish(
+					new ClientMessage.CreatePersistentSubscriptionToStream(
+						correlationId,
+						correlationId,
+						new CallbackEnvelope(HandleCreatePersistentSubscriptionCompleted),
+						streamId,
+						request.Options.GroupName,
+						settings.ResolveLinks,
+						startRevision.ToInt64(),
+						settings.MessageTimeoutCase switch {
+							MessageTimeoutOneofCase.MessageTimeoutMs => settings.MessageTimeoutMs,
+							MessageTimeoutOneofCase.MessageTimeoutTicks => (int)TimeSpan.FromTicks(settings.MessageTimeoutTicks).TotalMilliseconds,
+							_ => 0
+						},
+						settings.ExtraStatistics,
+						settings.MaxRetryCount,
+						settings.HistoryBufferSize,
+						settings.LiveBufferSize,
+						settings.ReadBatchSize,
+						settings.CheckpointAfterCase switch {
+							CheckpointAfterOneofCase.CheckpointAfterMs => settings.CheckpointAfterMs,
+							CheckpointAfterOneofCase.CheckpointAfterTicks => (int)TimeSpan.FromTicks(settings.CheckpointAfterTicks).TotalMilliseconds,
+							_ => 0
+						},
+						settings.MinCheckpointCount,
+						settings.MaxCheckpointCount,
+						settings.MaxSubscriberCount,
+						consumerStrategy,
+						user));
+				break;
+			}
+			case StreamOptionOneofCase.All:
+				var startPosition = request.Options.All.AllOptionCase switch {
+					AllOptionOneofCase.Position => new Position(
+						request.Options.All.Position.CommitPosition,
+						request.Options.All.Position.PreparePosition),
+					AllOptionOneofCase.Start => Position.Start,
+					AllOptionOneofCase.End => Position.End,
+					_ => throw InvalidArgument(request.Options.All.AllOptionCase)
+				};
+				var filter = request.Options.All.FilterOptionCase switch {
+					CreateReq.Types.AllOptions.FilterOptionOneofCase.NoFilter => null,
+					CreateReq.Types.AllOptions.FilterOptionOneofCase.Filter => ConvertToEventFilter(true, request.Options.All.Filter),
+					CreateReq.Types.AllOptions.FilterOptionOneofCase.None => null,
+					_ => throw InvalidArgument(request.Options.All.FilterOptionCase)
+				};
+
+				streamId = SystemStreams.AllStream;
+				_publisher.Publish(
+					new ClientMessage.CreatePersistentSubscriptionToAll(
+						correlationId,
+						correlationId,
+						new CallbackEnvelope(HandleCreatePersistentSubscriptionCompleted),
+						request.Options.GroupName,
+						filter,
+						settings.ResolveLinks,
+						new TFPos(startPosition.ToInt64().commitPosition, startPosition.ToInt64().preparePosition),
+						settings.MessageTimeoutCase switch {
+							MessageTimeoutOneofCase.MessageTimeoutMs => settings.MessageTimeoutMs,
+							MessageTimeoutOneofCase.MessageTimeoutTicks => (int)TimeSpan.FromTicks(settings.MessageTimeoutTicks).TotalMilliseconds,
+							_ => 0
+						},
+						settings.ExtraStatistics,
+						settings.MaxRetryCount,
+						settings.HistoryBufferSize,
+						settings.LiveBufferSize,
+						settings.ReadBatchSize,
+						settings.CheckpointAfterCase switch {
+							CheckpointAfterOneofCase.CheckpointAfterMs => settings.CheckpointAfterMs,
+							CheckpointAfterOneofCase.CheckpointAfterTicks => (int)TimeSpan.FromTicks(settings.CheckpointAfterTicks).TotalMilliseconds,
+							_ => 0
+						},
+						settings.MinCheckpointCount,
+						settings.MaxCheckpointCount,
+						settings.MaxSubscriberCount,
+						consumerStrategy,
+						user));
+				break;
+			default:
+				throw new InvalidOperationException();
+		}
+
+		IEventFilter ConvertToEventFilter(bool isAllStream, CreateReq.Types.AllOptions.Types.FilterOptions filter) =>
+			filter.FilterCase switch {
+				CreateReq.Types.AllOptions.Types.FilterOptions.FilterOneofCase.EventType => (
+					string.IsNullOrEmpty(filter.EventType.Regex)
+						? EventFilter.EventType.Prefixes(isAllStream, filter.EventType.Prefix.ToArray())
+						: EventFilter.EventType.Regex(isAllStream, filter.EventType.Regex)),
+				CreateReq.Types.AllOptions.Types.FilterOptions.FilterOneofCase.StreamIdentifier => (
+					string.IsNullOrEmpty(filter.StreamIdentifier.Regex)
+						? EventFilter.StreamName.Prefixes(isAllStream, filter.StreamIdentifier.Prefix.ToArray())
+						: EventFilter.StreamName.Regex(isAllStream, filter.StreamIdentifier.Regex)),
+				_ => throw InvalidArgument(filter.FilterCase)
+			};
+
+		return await createPersistentSubscriptionSource.Task;
+
+		void HandleCreatePersistentSubscriptionCompleted(Message message) {
+			if (message is ClientMessage.NotHandled notHandled && TryHandleNotHandled(notHandled, out var ex)) {
+				createPersistentSubscriptionSource.TrySetException(ex);
+				return;
+			}
+
+			if (streamId != SystemStreams.AllStream) {
+				if (message is ClientMessage.CreatePersistentSubscriptionToStreamCompleted completed) {
+					switch (completed.Result) {
+						case CreatePersistentSubscriptionToStreamResult.Success:
+							createPersistentSubscriptionSource.TrySetResult(new CreateResp());
+							return;
+						case CreatePersistentSubscriptionToStreamResult.Fail:
+							createPersistentSubscriptionSource.TrySetException(
+								PersistentSubscriptionFailed(streamId, request.Options.GroupName, completed.Reason)
+							);
+							return;
+						case CreatePersistentSubscriptionToStreamResult.AlreadyExists:
+							createPersistentSubscriptionSource.TrySetException(PersistentSubscriptionExists(streamId, request.Options.GroupName));
+							return;
+						case CreatePersistentSubscriptionToStreamResult.AccessDenied:
+							createPersistentSubscriptionSource.TrySetException(AccessDenied());
+							return;
+						default:
+							createPersistentSubscriptionSource.TrySetException(UnknownError(completed.Result));
+							return;
+					}
+				}
+
+				createPersistentSubscriptionSource.TrySetException(
+					UnknownMessage<ClientMessage.CreatePersistentSubscriptionToStreamCompleted>(message)
+				);
+			} else {
+				if (message is ClientMessage.CreatePersistentSubscriptionToAllCompleted completedAll) {
+					switch (completedAll.Result) {
+						case CreatePersistentSubscriptionToAllResult.Success:
+							createPersistentSubscriptionSource.TrySetResult(new CreateResp());
+							return;
+						case CreatePersistentSubscriptionToAllResult.Fail:
+							createPersistentSubscriptionSource.TrySetException(
+								PersistentSubscriptionFailed(streamId, request.Options.GroupName, completedAll.Reason)
+							);
+							return;
+						case CreatePersistentSubscriptionToAllResult.AlreadyExists:
+							createPersistentSubscriptionSource.TrySetException(PersistentSubscriptionExists(streamId, request.Options.GroupName));
+							return;
+						case CreatePersistentSubscriptionToAllResult.AccessDenied:
+							createPersistentSubscriptionSource.TrySetException(AccessDenied());
+							return;
+						default:
+							createPersistentSubscriptionSource.TrySetException(UnknownError(completedAll.Result));
+							return;
+					}
+				}
+
+				createPersistentSubscriptionSource.TrySetException(UnknownMessage<ClientMessage.CreatePersistentSubscriptionToAllCompleted>(message));
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.Delete.cs b/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.Delete.cs
new file mode 100644
index 00000000000..e3fc63bff7a
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.Delete.cs
@@ -0,0 +1,122 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.Client.PersistentSubscriptions;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using static KurrentDB.Core.Messages.ClientMessage.DeletePersistentSubscriptionToAllCompleted;
+using static KurrentDB.Core.Messages.ClientMessage.DeletePersistentSubscriptionToStreamCompleted;
+using static KurrentDB.Core.Services.Transport.Grpc.RpcExceptions;
+using StreamOptionOneofCase = EventStore.Client.PersistentSubscriptions.DeleteReq.Types.Options.StreamOptionOneofCase;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class PersistentSubscriptions {
+	private static readonly Operation DeleteOperation = new(Plugins.Authorization.Operations.Subscriptions.Delete);
+
+	public override async Task<DeleteResp> Delete(DeleteReq request, ServerCallContext context) {
+		var createPersistentSubscriptionSource = new TaskCompletionSource<DeleteResp>();
+		var correlationId = Guid.NewGuid();
+
+		var user = context.GetHttpContext().User;
+
+		if (!await _authorizationProvider.CheckAccessAsync(user, DeleteOperation, context.CancellationToken)) {
+			throw AccessDenied();
+		}
+
+		string streamId;
+
+		switch (request.Options.StreamOptionCase) {
+			case StreamOptionOneofCase.StreamIdentifier: {
+				streamId = request.Options.StreamIdentifier;
+				_publisher.Publish(new ClientMessage.DeletePersistentSubscriptionToStream(
+					correlationId,
+					correlationId,
+					new CallbackEnvelope(HandleDeletePersistentSubscriptionCompleted),
+					streamId,
+					request.Options.GroupName,
+					user));
+				break;
+			}
+			case StreamOptionOneofCase.All:
+				streamId = SystemStreams.AllStream;
+				_publisher.Publish(new ClientMessage.DeletePersistentSubscriptionToAll(
+					correlationId,
+					correlationId,
+					new CallbackEnvelope(HandleDeletePersistentSubscriptionCompleted),
+					request.Options.GroupName,
+					user));
+				break;
+			default:
+				throw new InvalidOperationException();
+		}
+
+		return await createPersistentSubscriptionSource.Task;
+
+		void HandleDeletePersistentSubscriptionCompleted(Message message) {
+			if (message is ClientMessage.NotHandled notHandled && TryHandleNotHandled(notHandled, out var ex)) {
+				createPersistentSubscriptionSource.TrySetException(ex);
+				return;
+			}
+
+			if (streamId != SystemStreams.AllStream) {
+				if (message is ClientMessage.DeletePersistentSubscriptionToStreamCompleted completed) {
+					switch (completed.Result) {
+						case DeletePersistentSubscriptionToStreamResult.Success:
+							createPersistentSubscriptionSource.TrySetResult(new DeleteResp());
+							return;
+						case DeletePersistentSubscriptionToStreamResult.Fail:
+							createPersistentSubscriptionSource.TrySetException(
+								PersistentSubscriptionFailed(streamId, request.Options.GroupName, completed.Reason)
+							);
+							return;
+						case DeletePersistentSubscriptionToStreamResult.DoesNotExist:
+							createPersistentSubscriptionSource.TrySetException(
+								PersistentSubscriptionDoesNotExist(streamId, request.Options.GroupName));
+							return;
+						case DeletePersistentSubscriptionToStreamResult.AccessDenied:
+							createPersistentSubscriptionSource.TrySetException(AccessDenied());
+							return;
+						default:
+							createPersistentSubscriptionSource.TrySetException(UnknownError(completed.Result));
+							return;
+					}
+				}
+
+				createPersistentSubscriptionSource.TrySetException(UnknownMessage<ClientMessage.DeletePersistentSubscriptionToStreamCompleted>(message));
+			} else {
+				if (message is ClientMessage.DeletePersistentSubscriptionToAllCompleted completedAll) {
+					switch (completedAll.Result) {
+						case DeletePersistentSubscriptionToAllResult.Success:
+							createPersistentSubscriptionSource.TrySetResult(new DeleteResp());
+							return;
+						case DeletePersistentSubscriptionToAllResult.Fail:
+							createPersistentSubscriptionSource.TrySetException(
+								PersistentSubscriptionFailed(streamId, request.Options.GroupName, completedAll.Reason)
+							);
+							return;
+						case DeletePersistentSubscriptionToAllResult.DoesNotExist:
+							createPersistentSubscriptionSource.TrySetException(
+								PersistentSubscriptionDoesNotExist(streamId, request.Options.GroupName)
+							);
+							return;
+						case DeletePersistentSubscriptionToAllResult.AccessDenied:
+							createPersistentSubscriptionSource.TrySetException(AccessDenied());
+							return;
+						default:
+							createPersistentSubscriptionSource.TrySetException(UnknownError(completedAll.Result));
+							return;
+					}
+				}
+
+				createPersistentSubscriptionSource.TrySetException(UnknownMessage<ClientMessage.DeletePersistentSubscriptionToAllCompleted>(message));
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.Info.cs b/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.Info.cs
new file mode 100644
index 00000000000..8ea60262b4e
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.Info.cs
@@ -0,0 +1,189 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.Client.PersistentSubscriptions;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class PersistentSubscriptions {
+	private static readonly Operation GetInfoOperation = new(Plugins.Authorization.Operations.Subscriptions.Statistics);
+
+	public override async Task<GetInfoResp> GetInfo(GetInfoReq request, ServerCallContext context) {
+		var getPersistentSubscriptionInfoSource = new TaskCompletionSource<GetInfoResp>();
+
+		var user = context.GetHttpContext().User;
+
+		if (!await _authorizationProvider.CheckAccessAsync(user, GetInfoOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		string streamId = request.Options.StreamOptionCase switch {
+			GetInfoReq.Types.Options.StreamOptionOneofCase.All => "$all",
+			GetInfoReq.Types.Options.StreamOptionOneofCase.StreamIdentifier => request.Options.StreamIdentifier,
+			_ => throw new InvalidOperationException()
+		};
+
+		_publisher.Publish(new MonitoringMessage.GetPersistentSubscriptionStats(
+			new CallbackEnvelope(HandleGetPersistentSubscriptionStatsCompleted),
+			streamId,
+			request.Options.GroupName));
+		return await getPersistentSubscriptionInfoSource.Task;
+
+		void HandleGetPersistentSubscriptionStatsCompleted(Message message) {
+			switch (message) {
+				case ClientMessage.NotHandled notHandled when RpcExceptions.TryHandleNotHandled(notHandled, out var ex):
+					getPersistentSubscriptionInfoSource.TrySetException(ex);
+					return;
+				case MonitoringMessage.GetPersistentSubscriptionStatsCompleted completed:
+					switch (completed.Result) {
+						case MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.Success:
+							var getInfoResp = new GetInfoResp {
+								SubscriptionInfo = ParseSubscriptionInfo(completed.SubscriptionStats.First())
+							};
+							getPersistentSubscriptionInfoSource.TrySetResult(getInfoResp);
+							return;
+						case MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotFound:
+							getPersistentSubscriptionInfoSource.TrySetException(RpcExceptions.PersistentSubscriptionDoesNotExist(streamId, request.Options.GroupName));
+							return;
+						case MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotReady:
+							getPersistentSubscriptionInfoSource.TrySetException(RpcExceptions.ServerNotReady());
+							return;
+						case MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.Fail:
+							getPersistentSubscriptionInfoSource.TrySetException(
+								RpcExceptions.PersistentSubscriptionFailed(streamId, request.Options.GroupName, completed.ErrorString));
+							return;
+						default:
+							getPersistentSubscriptionInfoSource.TrySetException(RpcExceptions.UnknownError(completed.Result));
+							return;
+					}
+				default:
+					getPersistentSubscriptionInfoSource.TrySetException(RpcExceptions.UnknownMessage<MonitoringMessage.GetPersistentSubscriptionStatsCompleted>(message));
+					break;
+			}
+		}
+	}
+
+	public override async Task<ListResp> List(ListReq request, ServerCallContext context) {
+		var listPersistentSubscriptionsSource = new TaskCompletionSource<ListResp>();
+		var user = context.GetHttpContext().User;
+
+		if (!await _authorizationProvider.CheckAccessAsync(user, GetInfoOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		var streamId = string.Empty;
+		switch (request.Options.ListOptionCase) {
+			case ListReq.Types.Options.ListOptionOneofCase.ListAllSubscriptions:
+				_publisher.Publish(new MonitoringMessage.GetAllPersistentSubscriptionStats(new CallbackEnvelope(HandleListSubscriptionsCompleted)));
+				break;
+			case ListReq.Types.Options.ListOptionOneofCase.ListForStream:
+				streamId = request.Options.ListForStream.StreamOptionCase switch {
+					ListReq.Types.StreamOption.StreamOptionOneofCase.All => "$all",
+					ListReq.Types.StreamOption.StreamOptionOneofCase.Stream => request.Options.ListForStream.Stream,
+					_ => throw new InvalidOperationException()
+				};
+				_publisher.Publish(new MonitoringMessage.GetStreamPersistentSubscriptionStats(
+					new CallbackEnvelope(HandleListSubscriptionsCompleted),
+					streamId
+				));
+				break;
+			default:
+				throw new InvalidOperationException();
+		}
+
+		return await listPersistentSubscriptionsSource.Task;
+
+		void HandleListSubscriptionsCompleted(Message message) {
+			switch (message) {
+				case ClientMessage.NotHandled notHandled when RpcExceptions.TryHandleNotHandled(notHandled, out var ex):
+					listPersistentSubscriptionsSource.TrySetException(ex);
+					return;
+				case MonitoringMessage.GetPersistentSubscriptionStatsCompleted completed:
+					switch (completed.Result) {
+						case MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.Success:
+							var listResp = new ListResp();
+							listResp.Subscriptions.AddRange(completed.SubscriptionStats.Select(ParseSubscriptionInfo));
+							listPersistentSubscriptionsSource.TrySetResult(listResp);
+							return;
+						case MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotFound:
+							listPersistentSubscriptionsSource.TrySetException(RpcExceptions.PersistentSubscriptionDoesNotExist(streamId, ""));
+							return;
+						case MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotReady:
+							listPersistentSubscriptionsSource.TrySetException(RpcExceptions.ServerNotReady());
+							return;
+						case MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.Fail:
+							listPersistentSubscriptionsSource.TrySetException(RpcExceptions.PersistentSubscriptionFailed(streamId, "", completed.ErrorString));
+							return;
+						default:
+							listPersistentSubscriptionsSource.TrySetException(RpcExceptions.UnknownError(completed.Result));
+							return;
+					}
+				default:
+					listPersistentSubscriptionsSource.TrySetException(RpcExceptions.UnknownMessage<MonitoringMessage.GetPersistentSubscriptionStatsCompleted>(message));
+					break;
+			}
+		}
+	}
+
+	private static SubscriptionInfo ParseSubscriptionInfo(MonitoringMessage.PersistentSubscriptionInfo input) {
+		var connectionInfo = new List<SubscriptionInfo.Types.ConnectionInfo>();
+		foreach (var conn in input.Connections) {
+			var connInfo = new SubscriptionInfo.Types.ConnectionInfo {
+				From = conn.From,
+				Username = conn.Username,
+				AverageItemsPerSecond = conn.AverageItemsPerSecond,
+				TotalItems = conn.TotalItems,
+				CountSinceLastMeasurement = conn.CountSinceLastMeasurement,
+				AvailableSlots = conn.AvailableSlots,
+				InFlightMessages = conn.InFlightMessages,
+				ConnectionName = conn.ConnectionName
+			};
+			connInfo.ObservedMeasurements.AddRange(
+				conn.ObservedMeasurements.Select(x => new SubscriptionInfo.Types.Measurement { Key = x.Key, Value = x.Value })
+			);
+			connectionInfo.Add(connInfo);
+		}
+
+		var subscriptionInfo = new SubscriptionInfo {
+			EventSource = input.EventSource,
+			GroupName = input.GroupName,
+			Status = input.Status,
+			AveragePerSecond = input.AveragePerSecond,
+			TotalItems = input.TotalItems,
+			CountSinceLastMeasurement = input.CountSinceLastMeasurement,
+			LastCheckpointedEventPosition = input.LastCheckpointedEventPosition ?? string.Empty,
+			LastKnownEventPosition = input.LastKnownEventPosition ?? string.Empty,
+			ResolveLinkTos = input.ResolveLinktos,
+			StartFrom = input.StartFrom,
+			MessageTimeoutMilliseconds = input.MessageTimeoutMilliseconds,
+			ExtraStatistics = input.ExtraStatistics,
+			MaxRetryCount = input.MaxRetryCount,
+			LiveBufferSize = input.LiveBufferSize,
+			BufferSize = input.BufferSize,
+			ReadBatchSize = input.ReadBatchSize,
+			CheckPointAfterMilliseconds = input.CheckPointAfterMilliseconds,
+			MinCheckPointCount = input.MinCheckPointCount,
+			MaxCheckPointCount = input.MaxCheckPointCount,
+			ReadBufferCount = input.ReadBufferCount,
+			LiveBufferCount = input.LiveBufferCount,
+			RetryBufferCount = input.RetryBufferCount,
+			TotalInFlightMessages = input.TotalInFlightMessages,
+			OutstandingMessagesCount = input.OutstandingMessagesCount,
+			NamedConsumerStrategy = input.NamedConsumerStrategy,
+			MaxSubscriberCount = input.MaxSubscriberCount,
+			ParkedMessageCount = input.ParkedMessageCount,
+		};
+		subscriptionInfo.Connections.AddRange(connectionInfo);
+		return subscriptionInfo;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.Read.cs b/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.Read.cs
new file mode 100644
index 00000000000..3fe0ac00528
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.Read.cs
@@ -0,0 +1,285 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using EventStore.Client.PersistentSubscriptions;
+using EventStore.Plugins.Authorization;
+using Google.Protobuf;
+using Grpc.Core;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Grpc;
+using Serilog;
+using static EventStore.Plugins.Authorization.Operations.Subscriptions;
+using static KurrentDB.Core.Messages.ClientMessage.PersistentSubscriptionNackEvents;
+using Empty = EventStore.Client.Empty;
+using UUID = EventStore.Client.UUID;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class PersistentSubscriptions {
+	private static readonly Operation ProcessMessagesOperation = new(ProcessMessages);
+
+	public override async Task Read(IAsyncStreamReader<ReadReq> requestStream,
+		IServerStreamWriter<ReadResp> responseStream, ServerCallContext context) {
+		if (!await requestStream.MoveNext()) {
+			return;
+		}
+
+		if (requestStream.Current.ContentCase != ReadReq.ContentOneofCase.Options) {
+			throw new InvalidOperationException();
+		}
+
+		var options = requestStream.Current.Options;
+		var user = context.GetHttpContext().User;
+
+		string streamId = options.StreamOptionCase switch {
+			ReadReq.Types.Options.StreamOptionOneofCase.StreamIdentifier => options.StreamIdentifier,
+			ReadReq.Types.Options.StreamOptionOneofCase.All => SystemStreams.AllStream,
+			_ => throw new InvalidOperationException()
+		};
+
+		if (!await _authorizationProvider.CheckAccessAsync(user, ProcessMessagesOperation.WithParameter(Parameters.StreamId(streamId)), context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		var connectionName = context.RequestHeaders.FirstOrDefault(x => x.Key == Constants.Headers.ConnectionName)?.Value ?? "<unknown>";
+		var correlationId = Guid.NewGuid();
+		var uuidOptionsCase = options.UuidOption.ContentCase;
+
+		var enumerator = new PersistentStreamSubscriptionEnumerator(correlationId, connectionName,
+			_publisher, streamId, options.GroupName, options.BufferSize, user, context.CancellationToken);
+		await using var _ = enumerator;
+
+		var subscriptionId = await enumerator.Started;
+
+		var read = ValueTask.CompletedTask;
+		var cts = new CancellationTokenSource();
+		try {
+			read = PumpRequestStream(cts.Token);
+
+			await responseStream.WriteAsync(new ReadResp {
+				SubscriptionConfirmation = new ReadResp.Types.SubscriptionConfirmation {
+					SubscriptionId = subscriptionId
+				}
+			});
+
+			while (await enumerator.MoveNextAsync()) {
+				await responseStream.WriteAsync(new ReadResp {
+					Event = ConvertToReadEvent(enumerator.Current)
+				});
+			}
+		} catch (IOException) {
+			Log.Information("Subscription {correlationId} to {subscriptionId} disposed. The request stream was closed.", correlationId, subscriptionId);
+		} finally {
+			// make sure we stop reading the request stream before leaving this method
+			cts.Cancel();
+			await read;
+		}
+
+		async ValueTask PumpRequestStream(CancellationToken token) {
+			try {
+				await requestStream.ForEachAsync(HandleAckNack, token);
+			} catch {
+				// ignore
+			}
+		}
+
+		ValueTask HandleAckNack(ReadReq request) {
+			_publisher.Publish(request.ContentCase switch {
+				ReadReq.ContentOneofCase.Ack => new ClientMessage.PersistentSubscriptionAckEvents(
+					correlationId, correlationId, new NoopEnvelope(), subscriptionId,
+					request.Ack.Ids.Select(id => Uuid.FromDto(id).ToGuid()).ToArray(), user),
+				ReadReq.ContentOneofCase.Nack =>
+					new ClientMessage.PersistentSubscriptionNackEvents(
+						correlationId, correlationId, new NoopEnvelope(), subscriptionId,
+						request.Nack.Reason, request.Nack.Action switch {
+							ReadReq.Types.Nack.Types.Action.Unknown => NakAction.Unknown,
+							ReadReq.Types.Nack.Types.Action.Park => NakAction.Park,
+							ReadReq.Types.Nack.Types.Action.Retry => NakAction.Retry,
+							ReadReq.Types.Nack.Types.Action.Skip => NakAction.Skip,
+							ReadReq.Types.Nack.Types.Action.Stop => NakAction.Stop,
+							_ => throw RpcExceptions.InvalidArgument(request.Nack.Action)
+						},
+						request.Nack.Ids.Select(id => Uuid.FromDto(id).ToGuid()).ToArray(), user),
+				_ => throw RpcExceptions.InvalidArgument(request.ContentCase)
+			});
+
+			return new ValueTask(Task.CompletedTask);
+		}
+
+		ReadResp.Types.ReadEvent.Types.RecordedEvent ConvertToRecordedEvent(EventRecord e, long? commitPosition, long? preparePosition) {
+			if (e == null)
+				return null;
+			var position = Position.FromInt64(commitPosition ?? -1, preparePosition ?? -1);
+			return new() {
+				Id = uuidOptionsCase switch {
+					ReadReq.Types.Options.Types.UUIDOption.ContentOneofCase.String => new UUID {
+						String = e.EventId.ToString()
+					},
+					_ => Uuid.FromGuid(e.EventId).ToDto()
+				},
+				StreamIdentifier = e.EventStreamId,
+				StreamRevision = StreamRevision.FromInt64(e.EventNumber),
+				CommitPosition = position.CommitPosition,
+				PreparePosition = position.PreparePosition,
+				Metadata = {
+					[Constants.Metadata.Type] = e.EventType,
+					[Constants.Metadata.Created] = e.TimeStamp.ToTicksSinceEpoch().ToString(),
+					[Constants.Metadata.ContentType] = e.IsJson
+						? Constants.Metadata.ContentTypes.ApplicationJson
+						: Constants.Metadata.ContentTypes.ApplicationOctetStream
+				},
+				Data = ByteString.CopyFrom(e.Data.Span),
+				CustomMetadata = ByteString.CopyFrom(e.Metadata.Span)
+			};
+		}
+
+		ReadResp.Types.ReadEvent ConvertToReadEvent((ResolvedEvent, int) _) {
+			var (e, retryCount) = _;
+			var readEvent = new ReadResp.Types.ReadEvent {
+				Link = ConvertToRecordedEvent(e.Link, e.OriginalPosition?.CommitPosition, e.OriginalPosition?.PreparePosition),
+				Event = ConvertToRecordedEvent(e.Event, e.OriginalPosition?.CommitPosition, e.OriginalPosition?.PreparePosition),
+				RetryCount = retryCount
+			};
+			if (e.OriginalPosition.HasValue) {
+				var position = Position.FromInt64(e.OriginalPosition.Value.CommitPosition, e.OriginalPosition.Value.PreparePosition);
+				readEvent.CommitPosition = position.CommitPosition;
+			} else {
+				readEvent.NoPosition = new Empty();
+			}
+
+			return readEvent;
+		}
+	}
+
+	private class PersistentStreamSubscriptionEnumerator : IAsyncEnumerator<(ResolvedEvent resolvedEvent, int retryCount)> {
+		private readonly TaskCompletionSource<string> _subscriptionIdSource;
+		private readonly IPublisher _publisher;
+		private readonly Guid _correlationId;
+		private readonly ClaimsPrincipal _user;
+		private readonly CancellationToken _cancellationToken;
+		private readonly Channel<(ResolvedEvent, int)> _channel;
+
+		private (ResolvedEvent, int) _current;
+
+		public (ResolvedEvent resolvedEvent, int retryCount) Current => _current;
+		public Task<string> Started => _subscriptionIdSource.Task;
+
+		public PersistentStreamSubscriptionEnumerator(Guid correlationId,
+			string connectionName,
+			IPublisher publisher,
+			string streamName,
+			string groupName,
+			int bufferSize,
+			ClaimsPrincipal user,
+			CancellationToken cancellationToken) {
+			ArgumentNullException.ThrowIfNull(connectionName);
+			ArgumentNullException.ThrowIfNull(streamName);
+			ArgumentNullException.ThrowIfNull(groupName);
+
+			_correlationId = Ensure.NotEmptyGuid(correlationId);
+			_publisher = Ensure.NotNull(publisher);
+			_subscriptionIdSource = new();
+			_user = user;
+			_cancellationToken = cancellationToken;
+			_channel = Channel.CreateBounded<(ResolvedEvent, int)>(new BoundedChannelOptions(bufferSize) {
+				SingleReader = true,
+				SingleWriter = false,
+				FullMode = BoundedChannelFullMode.DropWrite
+			});
+
+			var semaphore = new SemaphoreSlim(1, 1);
+
+			switch (streamName) {
+				case SystemStreams.AllStream:
+					publisher.Publish(new ClientMessage.ConnectToPersistentSubscriptionToAll(correlationId,
+						correlationId,
+						new ContinuationEnvelope(OnMessage, semaphore, _cancellationToken), correlationId,
+						connectionName,
+						groupName, bufferSize, string.Empty, user));
+					break;
+				default:
+					publisher.Publish(new ClientMessage.ConnectToPersistentSubscriptionToStream(correlationId,
+						correlationId,
+						new ContinuationEnvelope(OnMessage, semaphore, _cancellationToken), correlationId,
+						connectionName,
+						groupName, streamName, bufferSize, string.Empty, user));
+					break;
+			}
+
+			async Task OnMessage(Message message, CancellationToken ct) {
+				if (message is ClientMessage.NotHandled notHandled && RpcExceptions.TryHandleNotHandled(notHandled, out var ex)) {
+					_subscriptionIdSource.TrySetException(ex);
+					return;
+				}
+
+				switch (message) {
+					case ClientMessage.SubscriptionDropped dropped:
+						switch (dropped.Reason) {
+							case SubscriptionDropReason.AccessDenied:
+								Fail(RpcExceptions.AccessDenied());
+								return;
+							case SubscriptionDropReason.NotFound:
+							case SubscriptionDropReason.PersistentSubscriptionDeleted:
+								Fail(RpcExceptions.PersistentSubscriptionDoesNotExist(streamName, groupName));
+								return;
+							case SubscriptionDropReason.SubscriberMaxCountReached:
+								Fail(RpcExceptions.PersistentSubscriptionMaximumSubscribersReached(streamName, groupName));
+								return;
+							case SubscriptionDropReason.Unsubscribed:
+								Fail(RpcExceptions.PersistentSubscriptionDropped(streamName, groupName));
+								return;
+							default:
+								Fail(RpcExceptions.UnknownError(dropped.Reason));
+								return;
+						}
+					case ClientMessage.PersistentSubscriptionConfirmation confirmation:
+						_subscriptionIdSource.TrySetResult(confirmation.SubscriptionId);
+						return;
+					case ClientMessage.PersistentSubscriptionStreamEventAppeared appeared:
+						await _channel.Writer.WriteAsync((appeared.Event, appeared.RetryCount), ct);
+						return;
+					default:
+						Fail(RpcExceptions
+							.UnknownMessage<ClientMessage.PersistentSubscriptionConfirmation>(message));
+						return;
+				}
+			}
+
+			void Fail(Exception ex) {
+				_channel.Writer.TryComplete(ex);
+				_subscriptionIdSource.TrySetException(ex);
+			}
+		}
+
+		public ValueTask DisposeAsync() {
+			_publisher.Publish(new ClientMessage.UnsubscribeFromStream(Guid.NewGuid(), _correlationId, new NoopEnvelope(), _user));
+			_channel.Writer.TryComplete();
+			return new ValueTask(Task.CompletedTask);
+		}
+
+		public async ValueTask<bool> MoveNextAsync() {
+			if (!await _channel.Reader.WaitToReadAsync(_cancellationToken)) {
+				return false;
+			}
+
+			_current = await _channel.Reader.ReadAsync(_cancellationToken);
+			return true;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.ReplayParked.cs b/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.ReplayParked.cs
new file mode 100644
index 00000000000..aba1d8d1b30
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.ReplayParked.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.Client.PersistentSubscriptions;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using static KurrentDB.Core.Services.Transport.Grpc.RpcExceptions;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class PersistentSubscriptions {
+	private static readonly Operation ReplayParkedOperation = new(Plugins.Authorization.Operations.Subscriptions.ReplayParked);
+
+	public override async Task<ReplayParkedResp> ReplayParked(ReplayParkedReq request, ServerCallContext context) {
+		var replayParkedMessagesSource = new TaskCompletionSource<ReplayParkedResp>();
+		var correlationId = Guid.NewGuid();
+
+		var user = context.GetHttpContext().User;
+
+		if (!await _authorizationProvider.CheckAccessAsync(user, ReplayParkedOperation, context.CancellationToken)) {
+			throw AccessDenied();
+		}
+
+		string streamId = request.Options.StreamOptionCase switch {
+			ReplayParkedReq.Types.Options.StreamOptionOneofCase.All => "$all",
+			ReplayParkedReq.Types.Options.StreamOptionOneofCase.StreamIdentifier => request.Options.StreamIdentifier,
+			_ => throw new InvalidOperationException()
+		};
+
+		long? stopAt = request.Options.StopAtOptionCase switch {
+			ReplayParkedReq.Types.Options.StopAtOptionOneofCase.StopAt => request.Options.StopAt,
+			ReplayParkedReq.Types.Options.StopAtOptionOneofCase.NoLimit => null,
+			_ => throw new InvalidOperationException()
+		};
+
+		_publisher.Publish(new ClientMessage.ReplayParkedMessages(
+			correlationId,
+			correlationId,
+			new CallbackEnvelope(HandleReplayParkedMessagesCompleted),
+			streamId,
+			request.Options.GroupName,
+			stopAt,
+			user));
+		return await replayParkedMessagesSource.Task;
+
+		void HandleReplayParkedMessagesCompleted(Message message) {
+			switch (message) {
+				case ClientMessage.NotHandled notHandled when TryHandleNotHandled(notHandled, out var ex):
+					replayParkedMessagesSource.TrySetException(ex);
+					return;
+				case ClientMessage.ReplayMessagesReceived completed:
+					switch (completed.Result) {
+						case ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.Success:
+							replayParkedMessagesSource.TrySetResult(new ReplayParkedResp());
+							return;
+						case ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.DoesNotExist:
+							replayParkedMessagesSource.TrySetException(
+								PersistentSubscriptionDoesNotExist(streamId, request.Options.GroupName));
+							return;
+						case ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.AccessDenied:
+							replayParkedMessagesSource.TrySetException(AccessDenied());
+							return;
+						case ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.Fail:
+							replayParkedMessagesSource.TrySetException(
+								PersistentSubscriptionFailed(streamId, request.Options.GroupName, completed.Reason));
+							return;
+
+						default:
+							replayParkedMessagesSource.TrySetException(UnknownError(completed.Result));
+							return;
+					}
+				default:
+					replayParkedMessagesSource.TrySetException(UnknownMessage<ClientMessage.ReplayMessagesReceived>(message));
+					break;
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.RestartSubsystem.cs b/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.RestartSubsystem.cs
new file mode 100644
index 00000000000..7a1d8b6ecdc
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.RestartSubsystem.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.Client;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class PersistentSubscriptions {
+	private static readonly Operation RestartOperation = new(Plugins.Authorization.Operations.Subscriptions.Restart);
+
+	public override async Task<Empty> RestartSubsystem(Empty request, ServerCallContext context) {
+		var restartSubsystemSource = new TaskCompletionSource<Empty>();
+
+		var user = context.GetHttpContext().User;
+
+		if (!await _authorizationProvider.CheckAccessAsync(user, RestartOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		_publisher.Publish(new SubscriptionMessage.PersistentSubscriptionsRestart(new CallbackEnvelope(HandleRestartSubsystemCompleted)));
+		return await restartSubsystemSource.Task;
+
+		void HandleRestartSubsystemCompleted(Message message) {
+			if (message is ClientMessage.NotHandled notHandled &&
+				RpcExceptions.TryHandleNotHandled(notHandled, out var ex)) {
+				restartSubsystemSource.TrySetException(ex);
+				return;
+			}
+
+			switch (message) {
+				case SubscriptionMessage.PersistentSubscriptionsRestarting:
+					restartSubsystemSource.TrySetResult(new Empty());
+					return;
+				case SubscriptionMessage.InvalidPersistentSubscriptionsRestart:
+					restartSubsystemSource.TrySetException(
+						RpcExceptions.PersistentSubscriptionFailed("", "", "Persistent Subscriptions cannot be restarted as it is in the wrong state."));
+					return;
+				default:
+					restartSubsystemSource.TrySetException(
+						RpcExceptions.UnknownMessage<SubscriptionMessage.PersistentSubscriptionsRestarting>(message));
+					return;
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.Update.cs b/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.Update.cs
new file mode 100644
index 00000000000..3ae0238058f
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.Update.cs
@@ -0,0 +1,196 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.Client.PersistentSubscriptions;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Transport.Common;
+using static KurrentDB.Core.Services.Transport.Grpc.RpcExceptions;
+using AllOptionOneofCase = EventStore.Client.PersistentSubscriptions.UpdateReq.Types.AllOptions.AllOptionOneofCase;
+using RevisionOptionOneofCase = EventStore.Client.PersistentSubscriptions.UpdateReq.Types.StreamOptions.RevisionOptionOneofCase;
+using StreamOptionOneofCase = EventStore.Client.PersistentSubscriptions.UpdateReq.Types.Options.StreamOptionOneofCase;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class PersistentSubscriptions {
+	private static readonly Operation UpdateOperation = new(Plugins.Authorization.Operations.Subscriptions.Update);
+
+	public override async Task<UpdateResp> Update(UpdateReq request, ServerCallContext context) {
+		var updatePersistentSubscriptionSource = new TaskCompletionSource<UpdateResp>();
+		var settings = request.Options.Settings;
+		var correlationId = Guid.NewGuid();
+
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, UpdateOperation, context.CancellationToken)) {
+			throw AccessDenied();
+		}
+
+		string streamId;
+
+		switch (request.Options.StreamOptionCase) {
+			case StreamOptionOneofCase.Stream:
+			case StreamOptionOneofCase.None: /*for backwards compatibility*/ {
+				StreamRevision startRevision;
+
+				if (request.Options.StreamOptionCase == StreamOptionOneofCase.Stream) {
+					streamId = request.Options.Stream.StreamIdentifier;
+					startRevision = request.Options.Stream.RevisionOptionCase switch {
+						RevisionOptionOneofCase.Revision => new StreamRevision(request.Options.Stream.Revision),
+						RevisionOptionOneofCase.Start => StreamRevision.Start,
+						RevisionOptionOneofCase.End => StreamRevision.End,
+						_ => throw InvalidArgument(request.Options.Stream.RevisionOptionCase)
+					};
+				} else {
+					/*for backwards compatibility*/
+#pragma warning disable 612
+					streamId = request.Options.StreamIdentifier;
+					startRevision = new StreamRevision(request.Options.Settings.Revision);
+#pragma warning restore 612
+				}
+
+				_publisher.Publish(new ClientMessage.UpdatePersistentSubscriptionToStream(
+					correlationId,
+					correlationId,
+					new CallbackEnvelope(HandleUpdatePersistentSubscriptionCompleted),
+					streamId,
+					request.Options.GroupName,
+					settings.ResolveLinks,
+					startRevision.ToInt64(),
+					settings.MessageTimeoutCase switch {
+						UpdateReq.Types.Settings.MessageTimeoutOneofCase.MessageTimeoutMs => settings.MessageTimeoutMs,
+						UpdateReq.Types.Settings.MessageTimeoutOneofCase.MessageTimeoutTicks => (int)TimeSpan
+							.FromTicks(settings.MessageTimeoutTicks).TotalMilliseconds,
+						_ => 0
+					},
+					settings.ExtraStatistics,
+					settings.MaxRetryCount,
+					settings.HistoryBufferSize,
+					settings.LiveBufferSize,
+					settings.ReadBatchSize,
+					settings.CheckpointAfterCase switch {
+						UpdateReq.Types.Settings.CheckpointAfterOneofCase.CheckpointAfterMs => settings.CheckpointAfterMs,
+						UpdateReq.Types.Settings.CheckpointAfterOneofCase.CheckpointAfterTicks => (int)TimeSpan
+							.FromTicks(settings.CheckpointAfterTicks).TotalMilliseconds,
+						_ => 0
+					},
+					settings.MinCheckpointCount,
+					settings.MaxCheckpointCount,
+					settings.MaxSubscriberCount,
+					settings.NamedConsumerStrategy.ToString(),
+					user));
+				break;
+			}
+			case StreamOptionOneofCase.All:
+				var startPosition = request.Options.All.AllOptionCase switch {
+					AllOptionOneofCase.Position => new Position(
+						request.Options.All.Position.CommitPosition,
+						request.Options.All.Position.PreparePosition),
+					AllOptionOneofCase.Start => Position.Start,
+					AllOptionOneofCase.End => Position.End,
+					_ => throw new InvalidOperationException()
+				};
+
+				streamId = SystemStreams.AllStream;
+
+				_publisher.Publish(new ClientMessage.UpdatePersistentSubscriptionToAll(
+					correlationId,
+					correlationId,
+					new CallbackEnvelope(HandleUpdatePersistentSubscriptionCompleted),
+					request.Options.GroupName,
+					settings.ResolveLinks,
+					new TFPos(startPosition.ToInt64().commitPosition, startPosition.ToInt64().preparePosition),
+					settings.MessageTimeoutCase switch {
+						UpdateReq.Types.Settings.MessageTimeoutOneofCase.MessageTimeoutMs => settings.MessageTimeoutMs,
+						UpdateReq.Types.Settings.MessageTimeoutOneofCase.MessageTimeoutTicks => (int)TimeSpan
+							.FromTicks(settings.MessageTimeoutTicks).TotalMilliseconds,
+						_ => 0
+					},
+					settings.ExtraStatistics,
+					settings.MaxRetryCount,
+					settings.HistoryBufferSize,
+					settings.LiveBufferSize,
+					settings.ReadBatchSize,
+					settings.CheckpointAfterCase switch {
+						UpdateReq.Types.Settings.CheckpointAfterOneofCase.CheckpointAfterMs => settings.CheckpointAfterMs,
+						UpdateReq.Types.Settings.CheckpointAfterOneofCase.CheckpointAfterTicks => (int)TimeSpan
+							.FromTicks(settings.CheckpointAfterTicks).TotalMilliseconds,
+						_ => 0
+					},
+					settings.MinCheckpointCount,
+					settings.MaxCheckpointCount,
+					settings.MaxSubscriberCount,
+					settings.NamedConsumerStrategy.ToString(),
+					user));
+				break;
+			default:
+				throw new InvalidOperationException();
+		}
+
+		return await updatePersistentSubscriptionSource.Task;
+
+		void HandleUpdatePersistentSubscriptionCompleted(Message message) {
+			if (message is ClientMessage.NotHandled notHandled && TryHandleNotHandled(notHandled, out var ex)) {
+				updatePersistentSubscriptionSource.TrySetException(ex);
+				return;
+			}
+
+			if (streamId != SystemStreams.AllStream) {
+				if (message is ClientMessage.UpdatePersistentSubscriptionToStreamCompleted completed) {
+					switch (completed.Result) {
+						case ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult.Success:
+							updatePersistentSubscriptionSource.TrySetResult(new UpdateResp());
+							return;
+						case ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult.Fail:
+							updatePersistentSubscriptionSource.TrySetException(
+								PersistentSubscriptionFailed(streamId, request.Options.GroupName, completed.Reason));
+							return;
+						case ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult.AccessDenied:
+							updatePersistentSubscriptionSource.TrySetException(AccessDenied());
+							return;
+						case ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult.DoesNotExist:
+							updatePersistentSubscriptionSource.TrySetException(
+								PersistentSubscriptionDoesNotExist(streamId, request.Options.GroupName));
+							return;
+						default:
+							updatePersistentSubscriptionSource.TrySetException(
+								UnknownError(completed.Result));
+							return;
+					}
+				}
+
+				updatePersistentSubscriptionSource.TrySetException(UnknownMessage<ClientMessage.UpdatePersistentSubscriptionToStreamCompleted>(message));
+			} else {
+				if (message is ClientMessage.UpdatePersistentSubscriptionToAllCompleted completedAll) {
+					switch (completedAll.Result) {
+						case ClientMessage.UpdatePersistentSubscriptionToAllCompleted.UpdatePersistentSubscriptionToAllResult.Success:
+							updatePersistentSubscriptionSource.TrySetResult(new UpdateResp());
+							return;
+						case ClientMessage.UpdatePersistentSubscriptionToAllCompleted.UpdatePersistentSubscriptionToAllResult.Fail:
+							updatePersistentSubscriptionSource.TrySetException(
+								PersistentSubscriptionFailed(streamId, request.Options.GroupName, completedAll.Reason));
+							return;
+						case ClientMessage.UpdatePersistentSubscriptionToAllCompleted.UpdatePersistentSubscriptionToAllResult.AccessDenied:
+							updatePersistentSubscriptionSource.TrySetException(AccessDenied());
+							return;
+						case ClientMessage.UpdatePersistentSubscriptionToAllCompleted.UpdatePersistentSubscriptionToAllResult.DoesNotExist:
+							updatePersistentSubscriptionSource.TrySetException(
+								PersistentSubscriptionDoesNotExist(streamId, request.Options.GroupName));
+							return;
+						default:
+							updatePersistentSubscriptionSource.TrySetException(UnknownError(completedAll.Result));
+							return;
+					}
+				}
+
+				updatePersistentSubscriptionSource.TrySetException(UnknownMessage<ClientMessage.UpdatePersistentSubscriptionToAllCompleted>(message));
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.cs b/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.cs
new file mode 100644
index 00000000000..c046598b4ce
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/PersistentSubscriptions.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class PersistentSubscriptions : Client.PersistentSubscriptions.PersistentSubscriptions.PersistentSubscriptionsBase {
+	private readonly IPublisher _publisher;
+	private readonly IAuthorizationProvider _authorizationProvider;
+
+	public PersistentSubscriptions(IPublisher publisher, IAuthorizationProvider authorizationProvider) {
+		_publisher = Ensure.NotNull(publisher);
+		_authorizationProvider = Ensure.NotNull(authorizationProvider);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/ReadReq.cs b/src/KurrentDB.Core/Services/Transport/Grpc/ReadReq.cs
new file mode 100644
index 00000000000..6f3bb224655
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/ReadReq.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Services.Transport.Common;
+using RecordPosition = KurrentDB.Core.Services.Transport.Common.Position;
+
+// ReSharper disable CheckNamespace
+namespace EventStore.Client.Streams;
+
+// ReSharper restore CheckNamespace
+partial class ReadReq {
+	partial class Types {
+		partial class Options {
+			partial class Types {
+				partial class StreamOptions {
+					internal StreamRevision ToStreamRevision() => RevisionOptionCase switch {
+						RevisionOptionOneofCase.End => StreamRevision.End,
+						RevisionOptionOneofCase.Start => StreamRevision.Start,
+						RevisionOptionOneofCase.Revision => new StreamRevision(Revision),
+						_ => throw new InvalidOperationException()
+					};
+
+					internal StreamRevision? ToSubscriptionStreamRevision() => RevisionOptionCase switch {
+						RevisionOptionOneofCase.End => StreamRevision.End,
+						RevisionOptionOneofCase.Start => null,
+						RevisionOptionOneofCase.Revision => new StreamRevision(Revision),
+						_ => throw new InvalidOperationException()
+					};
+				}
+
+				partial class AllOptions {
+					internal RecordPosition ToPosition() => AllOptionCase switch {
+						AllOptionOneofCase.End => RecordPosition.End,
+						AllOptionOneofCase.Start => RecordPosition.Start,
+						AllOptionOneofCase.Position => new(Position.CommitPosition, Position.PreparePosition),
+						_ => throw new InvalidOperationException()
+					};
+
+					internal RecordPosition? ToSubscriptionPosition() => AllOptionCase switch {
+						AllOptionOneofCase.End => RecordPosition.End,
+						AllOptionOneofCase.Start => null,
+						AllOptionOneofCase.Position => new RecordPosition(Position.CommitPosition, Position.PreparePosition),
+						_ => throw new InvalidOperationException()
+					};
+				}
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/ReadResp.cs b/src/KurrentDB.Core/Services/Transport/Grpc/ReadResp.cs
new file mode 100644
index 00000000000..0fef7db823a
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/ReadResp.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+// ReSharper disable CheckNamespace
+namespace EventStore.Client.Streams;
+
+// ReSharper restore CheckNamespace
+partial class ReadResp {
+	partial class Types {
+		partial class ReadEvent {
+			public Types.RecordedEvent OriginalEvent => Link ?? Event;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Redaction.GetEventPositions.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Redaction.GetEventPositions.cs
new file mode 100644
index 00000000000..08c81192474
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Redaction.GetEventPositions.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using Kurrent.Client.Redaction;
+using KurrentDB.Core.Data.Redaction;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Grpc;
+using ChunkInfo = Kurrent.Client.Redaction.ChunkInfo;
+using EventPosition = Kurrent.Client.Redaction.EventPosition;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class Redaction {
+	private static readonly Operation ReadOperation = new(Plugins.Authorization.Operations.Streams.Read);
+
+	public override async Task GetEventPositions(
+		IAsyncStreamReader<GetEventPositionReq> requestStream,
+		IServerStreamWriter<GetEventPositionResp> responseStream,
+		ServerCallContext context) {
+
+		var user = context.GetHttpContext().User;
+
+		await foreach (var request in requestStream.ReadAllAsync()) {
+			var streamId = request.StreamIdentifier.StreamName.ToStringUtf8();
+			var streamRevision = new StreamRevision(request.StreamRevision);
+
+			var op = ReadOperation.WithParameter(
+				Plugins.Authorization.Operations.Streams.Parameters.StreamId(streamId));
+
+			if (!await _authorizationProvider.CheckAccessAsync(user, op, context.CancellationToken))
+				throw RpcExceptions.AccessDenied();
+
+			var tcsEnvelope = new TcsEnvelope<RedactionMessage.GetEventPositionCompleted>();
+			_bus.Publish(new RedactionMessage.GetEventPosition(tcsEnvelope, streamId, streamRevision.ToInt64()));
+
+			var completionMsg = await tcsEnvelope.Task;
+			var result = completionMsg.Result;
+			if (result != GetEventPositionResult.Success)
+				throw RpcExceptions.RedactionGetEventPositionFailed(result.GetErrorMessage());
+
+			var eventPositions = completionMsg.EventPositions;
+
+			var response = new GetEventPositionResp();
+			foreach (var eventPosition in eventPositions) {
+				var pos = Position.FromInt64(eventPosition.LogPosition, eventPosition.LogPosition);
+				response.EventPositions.Add(new EventPosition {
+					LogPosition = pos.PreparePosition,
+					ChunkInfo = new ChunkInfo {
+						FileName = eventPosition.ChunkInfo.FileName,
+						Version = eventPosition.ChunkInfo.Version,
+						IsComplete = eventPosition.ChunkInfo.IsComplete,
+						EventOffset = eventPosition.ChunkInfo.EventOffset
+					}
+				});
+			}
+
+			await responseStream.WriteAsync(response);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Redaction.SwitchChunks.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Redaction.SwitchChunks.cs
new file mode 100644
index 00000000000..a75c171200c
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Redaction.SwitchChunks.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using Kurrent.Client.Redaction;
+using KurrentDB.Core.Data.Redaction;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class Redaction {
+	private static readonly Operation SwitchChunkOperation = new(Plugins.Authorization.Operations.Node.Redaction.SwitchChunk);
+
+	public override async Task SwitchChunks(
+		IAsyncStreamReader<SwitchChunkReq> requestStream,
+		IServerStreamWriter<SwitchChunkResp> responseStream,
+		ServerCallContext context) {
+
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, SwitchChunkOperation, context.CancellationToken))
+			throw RpcExceptions.AccessDenied();
+
+		var acquisitionId = Guid.Empty;
+		try {
+			acquisitionId = await AcquireChunksLock(context);
+			await SwitchChunks(requestStream, responseStream, acquisitionId);
+		} finally {
+			await ReleaseChunksLock(acquisitionId);
+		}
+	}
+
+	private async Task<Guid> AcquireChunksLock(ServerCallContext context) {
+		var tcsEnvelope = new TcsEnvelope<RedactionMessage.AcquireChunksLockCompleted>();
+		_bus.Publish(new RedactionMessage.AcquireChunksLock(tcsEnvelope));
+
+		var completionMsg = await tcsEnvelope.Task;
+		if (completionMsg.Result != AcquireChunksLockResult.Success)
+			throw RpcExceptions.RedactionLockFailed();
+
+		// we've managed to acquire the lock. we need to write the headers here since the client's waiting for them.
+		// (they're written automatically when throwing an RpcException e.g. when acquiring the lock failed above)
+		await context.WriteResponseHeadersAsync(new Metadata());
+
+		return completionMsg.AcquisitionId;
+	}
+
+	private async Task SwitchChunks(
+		IAsyncStreamReader<SwitchChunkReq> requestStream,
+		IServerStreamWriter<SwitchChunkResp> responseStream,
+		Guid acquisitionId) {
+
+		await foreach (var request in requestStream.ReadAllAsync()) {
+			var tcsEnvelope = new TcsEnvelope<RedactionMessage.SwitchChunkCompleted>();
+			_bus.Publish(new RedactionMessage.SwitchChunk(tcsEnvelope, acquisitionId, request.TargetChunkFile, request.NewChunkFile));
+
+			var completionMsg = await tcsEnvelope.Task;
+			var result = completionMsg.Result;
+			if (result != SwitchChunkResult.Success)
+				throw RpcExceptions.RedactionSwitchChunkFailed(result.GetErrorMessage());
+
+			await responseStream.WriteAsync(new SwitchChunkResp());
+		}
+	}
+
+	private async Task ReleaseChunksLock(Guid acquisitionId) {
+		if (acquisitionId == Guid.Empty)
+			return;
+
+		var tcsEnvelope = new TcsEnvelope<RedactionMessage.ReleaseChunksLockCompleted>();
+		_bus.Publish(new RedactionMessage.ReleaseChunksLock(tcsEnvelope, acquisitionId));
+
+		var completionMsg = await tcsEnvelope.Task;
+		var result = completionMsg.Result;
+		if (result != ReleaseChunksLockResult.Success)
+			throw RpcExceptions.RedactionSwitchChunkFailed(result.GetErrorMessage());
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Redaction.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Redaction.cs
new file mode 100644
index 00000000000..1866ca7e600
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Redaction.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Authorization;
+using KurrentDB.Core.Bus;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class Redaction : Kurrent.Client.Redaction.Redaction.RedactionBase {
+	private readonly IPublisher _bus;
+	private readonly IAuthorizationProvider _authorizationProvider;
+
+	public Redaction(IPublisher bus, IAuthorizationProvider authorizationProvider) {
+		_bus = bus;
+		_authorizationProvider = authorizationProvider;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/RetryInterceptor.cs b/src/KurrentDB.Core/Services/Transport/Grpc/RetryInterceptor.cs
new file mode 100644
index 00000000000..f82a348b4a4
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/RetryInterceptor.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using Grpc.Core;
+using Grpc.Core.Interceptors;
+using Serilog;
+
+namespace KurrentDB.Core.Services.Transport.Grpc;
+
+// Detect calls that have been automatically retried per https://github.com/grpc/proposal/blob/master/A6-client-retries.md
+// such calls may not have been intended by the user and as such may disguise a network interruption as a slow server response
+class RetryInterceptor : Interceptor {
+	static readonly ILogger Log = Serilog.Log.ForContext<RetryInterceptor>();
+
+	public override Task<TResponse> ClientStreamingServerHandler<TRequest, TResponse>(
+		IAsyncStreamReader<TRequest> requestStream,
+		ServerCallContext context,
+		ClientStreamingServerMethod<TRequest, TResponse> continuation) {
+
+		LogRetries(context);
+		return base.ClientStreamingServerHandler(requestStream, context, continuation);
+	}
+
+	public override Task DuplexStreamingServerHandler<TRequest, TResponse>(
+		IAsyncStreamReader<TRequest> requestStream,
+		IServerStreamWriter<TResponse> responseStream,
+		ServerCallContext context,
+		DuplexStreamingServerMethod<TRequest, TResponse> continuation) {
+
+		LogRetries(context);
+		return base.DuplexStreamingServerHandler(requestStream, responseStream, context, continuation);
+	}
+
+	public override Task ServerStreamingServerHandler<TRequest, TResponse>(
+		TRequest request,
+		IServerStreamWriter<TResponse> responseStream,
+		ServerCallContext context,
+		ServerStreamingServerMethod<TRequest, TResponse> continuation) {
+
+		LogRetries(context);
+		return base.ServerStreamingServerHandler(request, responseStream, context, continuation);
+	}
+
+	public override Task<TResponse> UnaryServerHandler<TRequest, TResponse>(
+		TRequest request,
+		ServerCallContext context,
+		UnaryServerMethod<TRequest, TResponse> continuation) {
+
+		LogRetries(context);
+		return base.UnaryServerHandler(request, context, continuation);
+	}
+
+	private static void LogRetries(ServerCallContext context) {
+		var entry = context.RequestHeaders.Get("grpc-previous-rpc-attempts");
+		if (entry is null)
+			return;
+
+		Log.Information("gRPC call to {method} received after {retries} retries", context.Method, entry.Value);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/RpcExceptions.cs b/src/KurrentDB.Core/Services/Transport/Grpc/RpcExceptions.cs
new file mode 100644
index 00000000000..4f267e591db
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/RpcExceptions.cs
@@ -0,0 +1,249 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Runtime.CompilerServices;
+using Grpc.Core;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Services.Transport.Grpc;
+
+public static class RpcExceptions {
+	public static Exception Timeout(string message) => new RpcException(new Status(StatusCode.Aborted, $"Operation timed out: {message}"));
+
+	public static RpcException ServerNotReady() =>
+		new(new Status(StatusCode.Unavailable, "Server Is Not Ready"));
+
+	public static RpcException ServerBusy() =>
+		new(new Status(StatusCode.Unavailable, "Server Is Too Busy"));
+
+	public static Exception NoLeaderInfo() =>
+		new RpcException(new Status(StatusCode.Unknown, "No leader info available in response"));
+
+	public static RpcException LeaderInfo(string host, int port) =>
+		new(new Status(StatusCode.NotFound, $"Leader info available"), new Metadata {
+			{ Constants.Exceptions.ExceptionKey, Constants.Exceptions.NotLeader },
+			{ Constants.Exceptions.LeaderEndpointHost, host },
+			{ Constants.Exceptions.LeaderEndpointPort, port.ToString() },
+		});
+
+	public static RpcException StreamNotFound(string streamName) =>
+		new(new Status(StatusCode.NotFound, $"Event stream '{streamName}' is not found."), new Metadata {
+			{ Constants.Exceptions.ExceptionKey, Constants.Exceptions.StreamNotFound },
+			{ Constants.Exceptions.StreamName, streamName }
+		});
+
+	public static RpcException NoStream(string streamName) =>
+		new(new Status(StatusCode.NotFound, $"Event stream '{streamName}' was not created."));
+
+	public static RpcException UnknownMessage<T>(Message message) where T : Message =>
+		UnknownMessage(message.GetType(), typeof(T));
+
+	public static RpcException UnknownMessage(Type unknownMessageType, Type expectedMsgType) =>
+		new(new Status(StatusCode.Unknown,
+			$"Envelope callback expected either {expectedMsgType.Name} or {nameof(ClientMessage.NotHandled)}, received {unknownMessageType.Name} instead"));
+
+	public static RpcException UnknownError<T>(T result) where T : unmanaged =>
+		UnknownError(typeof(T), result);
+
+	public static RpcException UnknownError(Type resultType, object result) =>
+		new(new Status(StatusCode.Unknown, $"Unexpected {resultType.Name}: {result}"));
+
+	public static RpcException UnknownError(string message) =>
+		new(new Status(StatusCode.Unknown, message));
+
+	public static RpcException AccessDenied() =>
+		new(new Status(StatusCode.PermissionDenied, "Access Denied"), new Metadata {
+			{ Constants.Exceptions.ExceptionKey, Constants.Exceptions.AccessDenied }
+		});
+
+	public static RpcException InvalidTransaction() =>
+		new(new Status(StatusCode.InvalidArgument, "Invalid Transaction"), new Metadata {
+			{ Constants.Exceptions.ExceptionKey, Constants.Exceptions.InvalidTransaction }
+		});
+
+	public static RpcException StreamDeleted(string streamName) =>
+		new(new Status(StatusCode.FailedPrecondition, $"Event stream '{streamName}' is deleted."),
+			new Metadata {
+				{ Constants.Exceptions.ExceptionKey, Constants.Exceptions.StreamDeleted },
+				{ Constants.Exceptions.StreamName, streamName }
+			});
+
+	public static RpcException ScavengeNotFound(string scavengeId) =>
+		new(new Status(StatusCode.NotFound, "Scavenge id was invalid."),
+			new Metadata {
+				{ Constants.Exceptions.ExceptionKey, Constants.Exceptions.ScavengeNotFound },
+				{ Constants.Exceptions.ScavengeId, scavengeId ?? string.Empty }
+			});
+
+	public static RpcException RedactionLockFailed() =>
+		new(new Status(StatusCode.FailedPrecondition, "Failed to acquire lock for redaction."),
+			new Metadata {
+				{ Constants.Exceptions.ExceptionKey, Constants.Exceptions.RedactionLockFailed }
+			});
+
+	public static RpcException RedactionGetEventPositionFailed(string reason) =>
+		new(new Status(StatusCode.Unknown, $"Failed to get event position: '{reason}'"),
+			new Metadata {
+				{ Constants.Exceptions.ExceptionKey, Constants.Exceptions.RedactionGetEventPositionFailed },
+				{ Constants.Exceptions.Reason, reason }
+			});
+
+	public static RpcException RedactionSwitchChunkFailed(string reason) =>
+		new(new Status(StatusCode.FailedPrecondition, $"Failed to switch chunk during redaction: '{reason}'"),
+			new Metadata {
+				{ Constants.Exceptions.ExceptionKey, Constants.Exceptions.RedactionSwitchChunkFailed },
+				{ Constants.Exceptions.Reason, reason }
+			});
+
+	public static RpcException WrongExpectedVersion(
+		string operation,
+		string streamName,
+		long expectedVersion,
+		long? actualVersion = default) =>
+		new(
+			new Status(
+				StatusCode.FailedPrecondition,
+				$"{operation} failed due to WrongExpectedVersion. Stream: {streamName}, Expected version: {expectedVersion}, Actual version: {actualVersion}"),
+			new Metadata {
+				{ Constants.Exceptions.ExceptionKey, Constants.Exceptions.WrongExpectedVersion },
+				{ Constants.Exceptions.StreamName, streamName },
+				{ Constants.Exceptions.ExpectedVersion, expectedVersion.ToString() },
+				{ Constants.Exceptions.ActualVersion, actualVersion?.ToString() ?? string.Empty }
+			});
+
+	public static RpcException MaxAppendEventSizeExceeded(string eventId, int proposedEventSize, int maxAppendEventSize) =>
+		new(
+			new Status(StatusCode.InvalidArgument, $"Event with Id: {eventId}, Size: {proposedEventSize}, exceeds Maximum Append Event Size of {maxAppendEventSize}."),
+			new Metadata {
+				{ Constants.Exceptions.ExceptionKey, Constants.Exceptions.MaximumAppendEventSizeExceeded },
+				{ Constants.Exceptions.MaximumAppendEventSize, maxAppendEventSize.ToString() },
+				{ Constants.Exceptions.EventId, eventId },
+				{ Constants.Exceptions.ProposedAppendEventSize, proposedEventSize.ToString() }
+			});
+
+	public static RpcException MaxAppendSizeExceeded(int maxAppendSize) =>
+		new(
+			new Status(StatusCode.InvalidArgument, $"Maximum Append Size of {maxAppendSize} Exceeded."),
+			new Metadata {
+				{ Constants.Exceptions.ExceptionKey, Constants.Exceptions.MaximumAppendSizeExceeded },
+				{ Constants.Exceptions.MaximumAppendSize, maxAppendSize.ToString() }
+			});
+
+	public static RpcException RequiredMetadataPropertyMissing(string missingMetadataProperty) =>
+		new(
+			new Status(StatusCode.InvalidArgument, $"Required Metadata Property '{missingMetadataProperty}' is missing"),
+			new Metadata {
+				{ Constants.Exceptions.ExceptionKey, Constants.Exceptions.MissingRequiredMetadataProperty },
+				{ Constants.Exceptions.RequiredMetadataProperties, string.Join(",", Constants.Metadata.RequiredMetadata) }
+			});
+
+	public static bool TryHandleNotHandled(ClientMessage.NotHandled notHandled, out Exception exception) {
+		exception = null;
+		switch (notHandled.Reason) {
+			case ClientMessage.NotHandled.Types.NotHandledReason.NotReady:
+				exception = ServerNotReady();
+				return true;
+			case ClientMessage.NotHandled.Types.NotHandledReason.TooBusy:
+				exception = ServerBusy();
+				return true;
+			case ClientMessage.NotHandled.Types.NotHandledReason.NotLeader:
+			case ClientMessage.NotHandled.Types.NotHandledReason.IsReadOnly:
+				switch (notHandled.LeaderInfo) {
+					case { } leaderInfo:
+						exception = LeaderInfo(leaderInfo.Http.GetHost(), leaderInfo.Http.GetPort());
+						return true;
+					default:
+						exception = NoLeaderInfo();
+						return true;
+				}
+
+			default:
+				return false;
+		}
+	}
+
+	public static Exception PersistentSubscriptionFailed(string streamName, string groupName, string reason)
+		=> new RpcException(
+			new Status(
+				StatusCode.Internal,
+				$"Subscription group {groupName} on stream {streamName} failed: '{reason}'"), new Metadata {
+				{ Constants.Exceptions.ExceptionKey, Constants.Exceptions.PersistentSubscriptionFailed },
+				{ Constants.Exceptions.StreamName, streamName },
+				{ Constants.Exceptions.GroupName, groupName },
+				{ Constants.Exceptions.Reason, reason }
+			});
+
+	public static Exception PersistentSubscriptionDoesNotExist(string streamName, string groupName)
+		=> new RpcException(
+			new Status(
+				StatusCode.NotFound,
+				$"Subscription group {groupName} on stream {streamName} does not exist."), new Metadata {
+				{ Constants.Exceptions.ExceptionKey, Constants.Exceptions.PersistentSubscriptionDoesNotExist },
+				{ Constants.Exceptions.StreamName, streamName },
+				{ Constants.Exceptions.GroupName, groupName }
+			});
+
+	public static Exception PersistentSubscriptionExists(string streamName, string groupName)
+		=> new RpcException(
+			new Status(
+				StatusCode.AlreadyExists,
+				$"Subscription group {groupName} on stream {streamName} exists."), new Metadata {
+				{ Constants.Exceptions.ExceptionKey, Constants.Exceptions.PersistentSubscriptionExists },
+				{ Constants.Exceptions.StreamName, streamName },
+				{ Constants.Exceptions.GroupName, groupName }
+			});
+
+	public static Exception PersistentSubscriptionMaximumSubscribersReached(string streamName, string groupName)
+		=> new RpcException(
+			new Status(
+				StatusCode.FailedPrecondition,
+				$"Maximum subscriptions reached for subscription group {groupName} on stream {streamName}."),
+			new Metadata {
+				{ Constants.Exceptions.ExceptionKey, Constants.Exceptions.MaximumSubscribersReached },
+				{ Constants.Exceptions.StreamName, streamName },
+				{ Constants.Exceptions.GroupName, groupName }
+			});
+
+	public static Exception PersistentSubscriptionDropped(string streamName, string groupName)
+		=> new RpcException(
+			new Status(
+				StatusCode.Cancelled,
+				$"Subscription group {groupName} on stream {streamName} was dropped."), new Metadata {
+				{ Constants.Exceptions.ExceptionKey, Constants.Exceptions.PersistentSubscriptionDropped },
+				{ Constants.Exceptions.StreamName, streamName },
+				{ Constants.Exceptions.GroupName, groupName }
+			});
+
+	public static Exception LoginNotFound(string loginName) =>
+		new RpcException(new Status(StatusCode.NotFound, $"User '{loginName}' is not found."), new Metadata {
+			{ Constants.Exceptions.ExceptionKey, Constants.Exceptions.UserNotFound },
+			{ Constants.Exceptions.LoginName, loginName }
+		});
+
+	public static Exception LoginConflict(string loginName) =>
+		new RpcException(new Status(StatusCode.FailedPrecondition, "Conflict."), new Metadata {
+			{ Constants.Exceptions.ExceptionKey, Constants.Exceptions.UserConflict },
+			{ Constants.Exceptions.LoginName, loginName }
+		});
+
+	public static Exception LoginTryAgain(string loginName) =>
+		new RpcException(new Status(StatusCode.DeadlineExceeded, "Try again."), new Metadata {
+			{ Constants.Exceptions.ExceptionKey, Constants.Exceptions.UserConflict },
+			{ Constants.Exceptions.LoginName, loginName }
+		});
+
+	public static RpcException InvalidArgument<T>(T argument) =>
+		new(new Status(StatusCode.InvalidArgument, $"'{argument}' is not a valid {typeof(T)}"));
+
+	public static RpcException RequiredArgument<T>(string name, T argument) =>
+		new(new Status(StatusCode.InvalidArgument, $"'{name}' is a required argument of type {typeof(T)}"));
+
+	public static RpcException InvalidCombination<T>(T combination) where T : ITuple
+		=> new(new Status(StatusCode.InvalidArgument, $"The combination of {combination} is invalid."));
+
+	public static RpcException InvalidPositionException() =>
+		new(new Status(StatusCode.InvalidArgument, "Trying to read from an invalid position."));
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/ServerFeatures.cs b/src/KurrentDB.Core/Services/Transport/Grpc/ServerFeatures.cs
new file mode 100644
index 00000000000..c4ca71ef37d
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/ServerFeatures.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.Client;
+using EventStore.Client.ServerFeatures;
+using Grpc.AspNetCore.Server;
+using Grpc.Core;
+using Microsoft.AspNetCore.Routing;
+using VersionInfo = KurrentDB.Common.Utils.VersionInfo;
+
+namespace KurrentDB.Core.Services.Transport.Grpc;
+
+class ServerFeatures(EndpointDataSource endpointDataSource) : EventStore.Client.ServerFeatures.ServerFeatures.ServerFeaturesBase {
+	public const int ApiVersion = 1;
+	private readonly Task<SupportedMethods> _supportedMethods = GetSupportedMethods(endpointDataSource);
+
+	public override Task<SupportedMethods> GetSupportedMethods(Empty request, ServerCallContext context) =>
+		_supportedMethods;
+
+	private static Task<SupportedMethods> GetSupportedMethods(EndpointDataSource endpointDataSource) {
+		var supportedEndpoints = endpointDataSource.Endpoints
+			.Select(x => x.Metadata.FirstOrDefault(m => m is GrpcMethodMetadata))
+			.OfType<GrpcMethodMetadata>()
+			.Where(x => x.Method.ServiceName.Contains("client"))
+			.Select(x => {
+				var method = new SupportedMethod {
+					MethodName = x.Method.Name.ToLower(),
+					ServiceName = x.Method.ServiceName.ToLower(),
+				};
+
+				if (x.Method.ServiceName.Contains("PersistentSubscriptions")) {
+					method.Features.AddRange(["stream", "all"]);
+				} else if (x.Method.ServiceName.Contains("Streams") && x.Method.Name.Contains("Read")) {
+					method.Features.AddRange(["position", "events"]);
+				} else if (x.Method.ServiceName.Contains("Streams") && x.Method.Name.Contains("BatchAppend")) {
+					method.Features.Add("deadline_duration");
+				} else if (x.Method.ServiceName.Contains("Projections") && x.Method.Name.Contains("Create")) {
+					method.Features.Add("track_emitted_streams");
+				}
+
+				return method;
+			});
+
+		var result = new SupportedMethods {
+			EventStoreServerVersion = string.Join('.', VersionInfo.Version.Split('.')[..3]),
+			Methods = { supportedEndpoints.Distinct() }
+		};
+		return Task.FromResult(result);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/ServiceBase.cs b/src/KurrentDB.Core/Services/Transport/Grpc/ServiceBase.cs
new file mode 100644
index 00000000000..adaecb5439b
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/ServiceBase.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using EventStore.Core.Services.Transport.Grpc;
+using Grpc.Core;
+using KurrentDB.Core.Services.Transport.Grpc;
+
+namespace EventStore.Cluster {
+	partial class Gossip {
+		partial class GossipBase : ServiceBase;
+	}
+
+	partial class Elections {
+		partial class ElectionsBase : ServiceBase;
+	}
+}
+
+namespace EventStore.Client.PersistentSubscriptions {
+	partial class PersistentSubscriptions {
+		partial class PersistentSubscriptionsBase : ServiceBase;
+	}
+}
+
+namespace EventStore.Client.Streams {
+	partial class Streams {
+		partial class StreamsBase : ServiceBase;
+	}
+}
+
+namespace EventStore.Client.Users {
+	partial class Users {
+		partial class UsersBase : ServiceBase;
+	}
+}
+
+namespace EventStore.Client.Operations {
+	partial class Operations {
+		partial class OperationsBase : ServiceBase;
+	}
+}
+
+namespace EventStore.Client.Gossip {
+	partial class Gossip {
+		partial class GossipBase : ServiceBase;
+	}
+}
+
+namespace EventStore.Client.Monitoring {
+	partial class Monitoring {
+		partial class MonitoringBase : ServiceBase;
+	}
+}
+
+namespace EventStore.Core.Services.Transport.Grpc {
+	public class ServiceBase {
+		protected static bool GetRequiresLeader(Metadata requestHeaders) {
+			var requiresLeaderHeaderValue =
+				requestHeaders.FirstOrDefault(x => x.Key == Constants.Headers.RequiresLeader)?.Value;
+			if (string.IsNullOrEmpty(requiresLeaderHeaderValue))
+				return false;
+			bool.TryParse(requiresLeaderHeaderValue, out var requiresLeader);
+			return requiresLeader;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Status.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Status.cs
new file mode 100644
index 00000000000..3a036c195f4
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Status.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Client;
+using Google.Protobuf.WellKnownTypes;
+using KurrentDB.Core.Services.Transport.Common;
+using Empty = Google.Protobuf.WellKnownTypes.Empty;
+
+// ReSharper disable once CheckNamespace
+namespace Google.Rpc;
+
+partial class Status {
+	public static Status WrongExpectedVersion(StreamRevision currentStreamRevision,
+		long expectedVersion) => new() {
+			Message = nameof(WrongExpectedVersion),
+			Details = Any.Pack(EventStore.Client.WrongExpectedVersion.Create(currentStreamRevision, expectedVersion)),
+			Code = Code.AlreadyExists
+		};
+
+	public static Status StreamDeleted(StreamIdentifier streamIdentifier) => new() {
+		Details = Any.Pack(new StreamDeleted {
+			StreamIdentifier = streamIdentifier
+		}),
+		Message = nameof(StreamDeleted),
+		Code = Code.NotFound
+	};
+
+	public static Status AccessDenied { get; } = new() {
+		Details = Any.Pack(new AccessDenied()),
+		Message = nameof(AccessDenied),
+		Code = Code.PermissionDenied
+	};
+
+	public static Status Timeout { get; } = new() {
+		Details = Any.Pack(new Timeout()),
+		Message = nameof(Timeout),
+		Code = Code.DeadlineExceeded
+	};
+
+	public static Status InvalidTransaction { get; } = new() {
+		Details = Any.Pack(new InvalidTransaction()),
+		Message = nameof(InvalidTransaction),
+		Code = Code.FailedPrecondition
+	};
+
+	public static Status Unknown { get; } = new() {
+		Details = Any.Pack(new Unknown()),
+		Message = nameof(Unknown),
+		Code = Code.Unknown
+	};
+
+	public static Status MaximumAppendSizeExceeded(uint maxAppendSize) =>
+		new() {
+			Details = Any.Pack(new MaximumAppendSizeExceeded {
+				MaxAppendSize = maxAppendSize
+			}),
+			Message = nameof(MaximumAppendSizeExceeded),
+			Code = Code.InvalidArgument
+		};
+
+	public static Status MaximumAppendEventSizeExceeded(string eventId, uint proposedEventSize, uint maxAppendEventSize) =>
+		new() {
+			Details = Any.Pack(new MaximumAppendEventSizeExceeded {
+				EventId = eventId,
+				ProposedEventSize = proposedEventSize,
+				MaxAppendEventSize = maxAppendEventSize
+			}),
+			Message = nameof(MaximumAppendEventSizeExceeded),
+			Code = Code.InvalidArgument
+		};
+
+	public static Status BadRequest(string message) => new() {
+		Details = Any.Pack(new BadRequest { Message = message }),
+		Message = nameof(BadRequest),
+		Code = Code.InvalidArgument
+	};
+
+	public static Status InternalError(string message) => new() {
+		Details = Any.Pack(new Empty()),
+		Message = message,
+		Code = Code.Internal
+	};
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/StreamIdentifier.cs b/src/KurrentDB.Core/Services/Transport/Grpc/StreamIdentifier.cs
new file mode 100644
index 00000000000..5f522db4a42
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/StreamIdentifier.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text;
+using Google.Protobuf;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Client;
+
+partial class StreamIdentifier {
+	private string _cached;
+
+	public static implicit operator string(StreamIdentifier source) {
+		if (source._cached != null || source.StreamName.IsEmpty)
+			return source._cached;
+		var tmp = Encoding.UTF8.GetString(source.StreamName.Span);
+		//this doesn't have to be thread safe, it's just a cache in case the identifier is turned into a string several times
+		source._cached = tmp;
+		return source._cached;
+	}
+
+	public static implicit operator StreamIdentifier(string source) =>
+		new() { StreamName = ByteString.CopyFromUtf8(source) };
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Streams.Append.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Streams.Append.cs
new file mode 100644
index 00000000000..ee0f930c4df
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Streams.Append.cs
@@ -0,0 +1,201 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using EventStore.Client.Streams;
+using Grpc.Core;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Grpc;
+using static EventStore.Client.Streams.AppendReq.Types.Options;
+using Empty = EventStore.Client.Empty;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class Streams<TStreamId> {
+	public override async Task<AppendResp> Append(IAsyncStreamReader<AppendReq> requestStream, ServerCallContext context) {
+		using var duration = _appendTracker.Start();
+		try {
+			if (!await requestStream.MoveNext())
+				throw new InvalidOperationException();
+
+			if (requestStream.Current.ContentCase != AppendReq.ContentOneofCase.Options)
+				throw new InvalidOperationException();
+
+			var options = requestStream.Current.Options;
+			var streamName = options.StreamIdentifier;
+
+			var expectedVersion = options.ExpectedStreamRevisionCase switch {
+				ExpectedStreamRevisionOneofCase.Revision => new StreamRevision(options.Revision).ToInt64(),
+				ExpectedStreamRevisionOneofCase.Any => AnyStreamRevision.Any.ToInt64(),
+				ExpectedStreamRevisionOneofCase.StreamExists => AnyStreamRevision.StreamExists.ToInt64(),
+				ExpectedStreamRevisionOneofCase.NoStream => AnyStreamRevision.NoStream.ToInt64(),
+				_ => throw RpcExceptions.InvalidArgument(options.ExpectedStreamRevisionCase)
+			};
+
+			var requiresLeader = GetRequiresLeader(context.RequestHeaders);
+
+			var user = context.GetHttpContext().User;
+			var op = WriteOperation.WithParameter(Plugins.Authorization.Operations.Streams.Parameters.StreamId(streamName));
+			if (!await _provider.CheckAccessAsync(user, op, context.CancellationToken)) {
+				throw RpcExceptions.AccessDenied();
+			}
+
+			var correlationId = Guid.NewGuid(); // TODO: JPB use request id?
+
+			var events = new List<Event>();
+
+			var size = 0;
+			while (await requestStream.MoveNext()) {
+				if (requestStream.Current.ContentCase != AppendReq.ContentOneofCase.ProposedMessage)
+					throw new InvalidOperationException();
+
+				var proposedMessage = requestStream.Current.ProposedMessage;
+				var data = proposedMessage.Data.ToByteArray();
+				var metadata = proposedMessage.CustomMetadata.ToByteArray();
+
+				if (!proposedMessage.Metadata.TryGetValue(Constants.Metadata.Type, out var eventType)) {
+					throw RpcExceptions.RequiredMetadataPropertyMissing(Constants.Metadata.Type);
+				}
+
+				if (!proposedMessage.Metadata.TryGetValue(Constants.Metadata.ContentType, out var contentType)) {
+					throw RpcExceptions.RequiredMetadataPropertyMissing(Constants.Metadata.ContentType);
+				}
+
+				var eventSize = Event.SizeOnDisk(eventType, data, metadata);
+				if (eventSize > _maxAppendEventSize) {
+					throw RpcExceptions.MaxAppendEventSizeExceeded(proposedMessage.Id.ToString(), eventSize, _maxAppendEventSize);
+				}
+
+				size += eventSize;
+
+				if (size > _maxAppendSize) {
+					throw RpcExceptions.MaxAppendSizeExceeded(_maxAppendSize);
+				}
+
+				events.Add(new Event(
+					Uuid.FromDto(proposedMessage.Id).ToGuid(),
+					eventType,
+					contentType == Constants.Metadata.ContentTypes.ApplicationJson,
+					data,
+					metadata));
+			}
+
+			var appendResponseSource = new TaskCompletionSource<AppendResp>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+			var envelope = new CallbackEnvelope(HandleWriteEventsCompleted);
+
+			_publisher.Publish(new ClientMessage.WriteEvents(
+				correlationId,
+				correlationId,
+				envelope,
+				requiresLeader,
+				streamName,
+				expectedVersion,
+				events.ToArray(),
+				user,
+				cancellationToken: context.CancellationToken));
+
+			return await appendResponseSource.Task;
+
+			void HandleWriteEventsCompleted(Message message) {
+				if (message is ClientMessage.NotHandled notHandled &&
+					RpcExceptions.TryHandleNotHandled(notHandled, out var ex)) {
+					appendResponseSource.TrySetException(ex);
+					return;
+				}
+
+				if (message is not ClientMessage.WriteEventsCompleted completed) {
+					appendResponseSource.TrySetException(
+						RpcExceptions.UnknownMessage<ClientMessage.WriteEventsCompleted>(message));
+					return;
+				}
+
+				var response = new AppendResp();
+				switch (completed.Result) {
+					case OperationResult.Success:
+						response.Success = new AppendResp.Types.Success();
+						if (completed.LastEventNumber == -1) {
+							response.Success.NoStream = new Empty();
+						} else {
+							response.Success.CurrentRevision = StreamRevision.FromInt64(completed.LastEventNumber);
+						}
+
+						if (completed.CommitPosition == -1) {
+							response.Success.NoPosition = new Empty();
+						} else {
+							var position = Position.FromInt64(completed.CommitPosition, completed.PreparePosition);
+							response.Success.Position = new AppendResp.Types.Position {
+								CommitPosition = position.CommitPosition,
+								PreparePosition = position.PreparePosition
+							};
+						}
+
+						appendResponseSource.TrySetResult(response);
+						return;
+					case OperationResult.PrepareTimeout:
+					case OperationResult.CommitTimeout:
+					case OperationResult.ForwardTimeout:
+						appendResponseSource.TrySetException(RpcExceptions.Timeout(completed.Message));
+						return;
+					case OperationResult.WrongExpectedVersion:
+						response.WrongExpectedVersion = new AppendResp.Types.WrongExpectedVersion();
+
+						switch (options.ExpectedStreamRevisionCase) {
+							case ExpectedStreamRevisionOneofCase.Any:
+								response.WrongExpectedVersion.ExpectedAny = new Empty();
+								response.WrongExpectedVersion.Any2060 = new Empty();
+								break;
+							case ExpectedStreamRevisionOneofCase.StreamExists:
+								response.WrongExpectedVersion.ExpectedStreamExists = new Empty();
+								response.WrongExpectedVersion.StreamExists2060 = new Empty();
+								break;
+							case ExpectedStreamRevisionOneofCase.NoStream:
+								response.WrongExpectedVersion.ExpectedNoStream = new Empty();
+								response.WrongExpectedVersion.ExpectedRevision2060 = ulong.MaxValue;
+								break;
+							case ExpectedStreamRevisionOneofCase.Revision:
+								response.WrongExpectedVersion.ExpectedRevision =
+									StreamRevision.FromInt64(expectedVersion);
+								response.WrongExpectedVersion.ExpectedRevision2060 =
+									StreamRevision.FromInt64(expectedVersion);
+								break;
+						}
+
+						if (completed.CurrentVersion == -1) {
+							response.WrongExpectedVersion.CurrentNoStream = new Empty();
+							response.WrongExpectedVersion.NoStream2060 = new Empty();
+						} else {
+							response.WrongExpectedVersion.CurrentRevision =
+								StreamRevision.FromInt64(completed.CurrentVersion);
+							response.WrongExpectedVersion.CurrentRevision2060 =
+								StreamRevision.FromInt64(completed.CurrentVersion);
+						}
+
+						appendResponseSource.TrySetResult(response);
+						return;
+					case OperationResult.StreamDeleted:
+						appendResponseSource.TrySetException(RpcExceptions.StreamDeleted(streamName));
+						return;
+					case OperationResult.InvalidTransaction:
+						appendResponseSource.TrySetException(RpcExceptions.InvalidTransaction());
+						return;
+					case OperationResult.AccessDenied:
+						appendResponseSource.TrySetException(RpcExceptions.AccessDenied());
+						return;
+					default:
+						appendResponseSource.TrySetException(RpcExceptions.UnknownError(completed.Result));
+						return;
+				}
+			}
+		} catch (Exception ex) {
+			duration.SetException(ex);
+			throw;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Streams.BatchAppend.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Streams.BatchAppend.cs
new file mode 100644
index 00000000000..3baf05e5307
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Streams.BatchAppend.cs
@@ -0,0 +1,370 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using EventStore.Client;
+using EventStore.Client.Streams;
+using EventStore.Plugins.Authorization;
+using Google.Protobuf;
+using Google.Protobuf.WellKnownTypes;
+using Grpc.Core;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Grpc;
+using Serilog;
+using static EventStore.Client.Streams.BatchAppendReq.Types;
+using static EventStore.Client.Streams.BatchAppendReq.Types.Options;
+using static KurrentDB.Core.Messages.OperationResult;
+using Empty = Google.Protobuf.WellKnownTypes.Empty;
+using OperationResult = KurrentDB.Core.Messages.OperationResult;
+using Status = Google.Rpc.Status;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+partial class Streams<TStreamId> {
+	public override async Task BatchAppend(IAsyncStreamReader<BatchAppendReq> requestStream,
+		IServerStreamWriter<BatchAppendResp> responseStream, ServerCallContext context) {
+		var worker = new BatchAppendWorker(_publisher, _provider,
+			_batchAppendTracker,
+			requestStream, responseStream,
+			context.GetHttpContext().User, _maxAppendSize, _maxAppendEventSize, _writeTimeout,
+			GetRequiresLeader(context.RequestHeaders));
+
+		await worker.Work(context.CancellationToken);
+	}
+
+	private class BatchAppendWorker {
+		private readonly IPublisher _publisher;
+		private readonly IAuthorizationProvider _authorizationProvider;
+		private readonly IDurationTracker _tracker;
+		private readonly IAsyncStreamReader<BatchAppendReq> _requestStream;
+		private readonly IServerStreamWriter<BatchAppendResp> _responseStream;
+		private readonly ClaimsPrincipal _user;
+		private readonly int _maxAppendSize;
+		private readonly int _maxAppendEventSize;
+		private readonly TimeSpan _writeTimeout;
+		private readonly bool _requiresLeader;
+		private readonly Channel<BatchAppendResp> _channel;
+
+		private long _pending;
+
+		public BatchAppendWorker(IPublisher publisher, IAuthorizationProvider authorizationProvider,
+			IDurationTracker tracker,
+			IAsyncStreamReader<BatchAppendReq> requestStream, IServerStreamWriter<BatchAppendResp> responseStream,
+			ClaimsPrincipal user, int maxAppendSize, int maxAppendEventSize, TimeSpan writeTimeout, bool requiresLeader) {
+			_publisher = publisher;
+			_authorizationProvider = authorizationProvider;
+			_tracker = tracker;
+			_requestStream = requestStream;
+			_responseStream = responseStream;
+			_user = user;
+			_maxAppendSize = maxAppendSize;
+			_maxAppendEventSize = maxAppendEventSize;
+			_writeTimeout = writeTimeout;
+			_requiresLeader = requiresLeader;
+			_channel = Channel.CreateUnbounded<BatchAppendResp>(new() {
+				AllowSynchronousContinuations = false,
+				SingleReader = false,
+				SingleWriter = false
+			});
+		}
+
+		public Task Work(CancellationToken cancellationToken) {
+			var remaining = 2;
+			var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+
+#if DEBUG
+			var sendTask =
+#endif
+					Send(_channel.Reader, cancellationToken)
+						.ContinueWith(HandleCompletion, CancellationToken.None);
+#if DEBUG
+			var receiveTask =
+#endif
+					Receive(_channel.Writer, _user, _requiresLeader, cancellationToken)
+						.ContinueWith(HandleCompletion, CancellationToken.None);
+
+			return tcs.Task;
+
+			async void HandleCompletion(Task task) {
+				try {
+					await task;
+					if (Interlocked.Decrement(ref remaining) == 0) {
+						tcs.TrySetResult();
+					}
+				} catch (OperationCanceledException) {
+					tcs.TrySetCanceled(cancellationToken);
+				} catch (IOException ex) {
+					Log.Information("Closing gRPC client connection: {message}", ex.GetBaseException().Message);
+					tcs.TrySetException(ex);
+				} catch (Exception ex) {
+					tcs.TrySetException(ex);
+				}
+			}
+		}
+
+		private async Task Send(ChannelReader<BatchAppendResp> reader, CancellationToken cancellationToken) {
+			var isClosing = false;
+			await foreach (var response in reader.ReadAllAsync(cancellationToken)) {
+				if (!response.IsClosing) {
+					await _responseStream.WriteAsync(response);
+					if (Interlocked.Decrement(ref _pending) >= 0 && isClosing) {
+						break;
+					}
+				} else {
+					isClosing = true;
+				}
+			}
+		}
+
+		private async Task Receive(ChannelWriter<BatchAppendResp> writer, ClaimsPrincipal user, bool requiresLeader,
+			CancellationToken cancellationToken) {
+			var pendingWrites = new ConcurrentDictionary<Guid, ClientWriteRequest>();
+
+			try {
+				await foreach (var request in _requestStream.ReadAllAsync(cancellationToken)) {
+					using var duration = _tracker.Start();
+					try {
+						var correlationId = Uuid.FromDto(request.CorrelationId).ToGuid();
+
+						if (request.Options != null) {
+							var timeout = Min(GetRequestedTimeout(request.Options), _writeTimeout);
+
+							if (!await _authorizationProvider.CheckAccessAsync(user, WriteOperation.WithParameter(
+								Plugins.Authorization.Operations.Streams.Parameters.StreamId(
+									request.Options.StreamIdentifier)), cancellationToken)) {
+								await writer.WriteAsync(new BatchAppendResp {
+									CorrelationId = request.CorrelationId,
+									StreamIdentifier = request.Options.StreamIdentifier,
+									Error = Status.AccessDenied
+								}, cancellationToken);
+								continue;
+							}
+
+							if (request.Options.StreamIdentifier == null) {
+								await writer.WriteAsync(new BatchAppendResp {
+									CorrelationId = request.CorrelationId,
+									StreamIdentifier = request.Options.StreamIdentifier,
+									Error = Status.BadRequest(
+										$"Required field {nameof(request.Options.StreamIdentifier)} not set.")
+								}, cancellationToken);
+								continue;
+							}
+
+							if (Max(timeout, TimeSpan.Zero) == TimeSpan.Zero) {
+								await writer.WriteAsync(new BatchAppendResp {
+									CorrelationId = request.CorrelationId,
+									StreamIdentifier = request.Options.StreamIdentifier,
+									Error = Status.Timeout
+								}, cancellationToken);
+								continue;
+							}
+
+							pendingWrites.AddOrUpdate(correlationId,
+								c => FromOptions(c, request.Options, timeout, cancellationToken),
+								(_, writeRequest) => writeRequest);
+						}
+
+						if (!pendingWrites.TryGetValue(correlationId, out var clientWriteRequest)) {
+							continue;
+						}
+
+						try {
+							clientWriteRequest.AddEvents(request.ProposedMessages.Select(FromProposedMessage), _maxAppendEventSize);
+
+							if (clientWriteRequest.Size > _maxAppendSize) {
+								pendingWrites.TryRemove(correlationId, out _);
+								await writer.WriteAsync(new BatchAppendResp {
+									CorrelationId = request.CorrelationId,
+									StreamIdentifier = clientWriteRequest.StreamId,
+									Error = Status.MaximumAppendSizeExceeded((uint)_maxAppendSize)
+								}, cancellationToken);
+							}
+						} catch (MaxAppendEventSizeExceededException ex) {
+							pendingWrites.TryRemove(correlationId, out _);
+							await writer.WriteAsync(new BatchAppendResp {
+								CorrelationId = request.CorrelationId,
+								StreamIdentifier = clientWriteRequest.StreamId,
+								Error = Status.MaximumAppendEventSizeExceeded(ex.EventId, (uint)ex.ProposedEventSize, (uint)ex.MaxAppendEventSize)
+							}, cancellationToken);
+						}
+
+						if (!request.IsFinal) {
+							continue;
+						}
+
+						if (!pendingWrites.TryRemove(correlationId, out _)) {
+							continue;
+						}
+
+						Interlocked.Increment(ref _pending);
+
+						_publisher.Publish(ToInternalMessage(clientWriteRequest, new CallbackEnvelope(message => {
+							try {
+								writer.TryWrite(ConvertMessage(message));
+							} catch (Exception ex) {
+								writer.TryComplete(ex);
+							}
+						}), requiresLeader, user, cancellationToken));
+
+						BatchAppendResp ConvertMessage(Message message) {
+							var batchAppendResp = message switch {
+								ClientMessage.NotHandled notHandled => new BatchAppendResp {
+									Error = new Status {
+										Details = Any.Pack(new Empty()),
+										Message = (notHandled.Reason, AdditionalInfo: notHandled.LeaderInfo) switch {
+											(ClientMessage.NotHandled.Types.NotHandledReason.NotReady, _) => "Server Is Not Ready",
+											(ClientMessage.NotHandled.Types.NotHandledReason.TooBusy, _) => "Server Is Busy",
+											(ClientMessage.NotHandled.Types.NotHandledReason.NotLeader or ClientMessage.NotHandled.Types.NotHandledReason.IsReadOnly,
+												ClientMessage.NotHandled.Types.LeaderInfo leaderInfo) =>
+												throw RpcExceptions.LeaderInfo(leaderInfo.Http.GetHost(),
+													leaderInfo.Http.GetPort()),
+											(ClientMessage.NotHandled.Types.NotHandledReason.NotLeader or ClientMessage.NotHandled.Types.NotHandledReason.IsReadOnly, _) =>
+												"No leader info available in response",
+											_ => $"Unknown {nameof(ClientMessage.NotHandled.Types.NotHandledReason)} ({(int)notHandled.Reason})"
+										}
+									}
+								},
+								ClientMessage.WriteEventsCompleted completed => completed.Result switch {
+									Success => new BatchAppendResp {
+										Success = BatchAppendResp.Types.Success.Completed(completed.CommitPosition,
+											completed.PreparePosition, completed.LastEventNumber),
+									},
+									OperationResult.WrongExpectedVersion => new BatchAppendResp {
+										Error = Status.WrongExpectedVersion(
+											StreamRevision.FromInt64(completed.CurrentVersion),
+											clientWriteRequest.ExpectedVersion)
+									},
+									OperationResult.AccessDenied => new BatchAppendResp { Error = Status.AccessDenied },
+									OperationResult.StreamDeleted => new BatchAppendResp {
+										Error = Status.StreamDeleted(clientWriteRequest.StreamId)
+									},
+									CommitTimeout or ForwardTimeout or PrepareTimeout => new BatchAppendResp { Error = Status.Timeout },
+									_ => new BatchAppendResp { Error = Status.Unknown }
+								},
+								_ => new BatchAppendResp {
+									Error = Status.InternalError(
+										$"Envelope callback expected either {nameof(ClientMessage.WriteEventsCompleted)} or {nameof(ClientMessage.NotHandled)}, received {message.GetType().Name} instead.")
+								}
+							};
+							batchAppendResp.CorrelationId = request.CorrelationId;
+							batchAppendResp.StreamIdentifier = new StreamIdentifier {
+								StreamName = ByteString.CopyFromUtf8(clientWriteRequest.StreamId)
+							};
+							return batchAppendResp;
+						}
+					} catch (Exception ex) {
+						duration.SetException(ex);
+						await writer.WriteAsync(new BatchAppendResp {
+							CorrelationId = request.CorrelationId,
+							StreamIdentifier = request.Options.StreamIdentifier,
+							Error = Status.BadRequest(ex.Message)
+						}, cancellationToken);
+					}
+				}
+
+				await writer.WriteAsync(new BatchAppendResp {
+					IsClosing = true
+				}, cancellationToken);
+			} catch (Exception ex) {
+				writer.TryComplete(ex);
+				throw;
+			}
+
+			ClientWriteRequest FromOptions(Guid correlationId, Options options, TimeSpan timeout,
+				CancellationToken cancellationToken) =>
+				new(correlationId, options.StreamIdentifier, options.ExpectedStreamPositionCase switch {
+					ExpectedStreamPositionOneofCase.StreamPosition => new StreamRevision(options.StreamPosition).ToInt64(),
+					ExpectedStreamPositionOneofCase.Any => AnyStreamRevision.Any.ToInt64(),
+					ExpectedStreamPositionOneofCase.StreamExists => AnyStreamRevision.StreamExists.ToInt64(),
+					ExpectedStreamPositionOneofCase.NoStream => AnyStreamRevision.NoStream.ToInt64(),
+					_ => throw RpcExceptions.InvalidArgument(options.ExpectedStreamPositionCase)
+				}, timeout, () =>
+					pendingWrites.TryRemove(correlationId, out var pendingWrite)
+						? writer.WriteAsync(new BatchAppendResp {
+							CorrelationId = Uuid.FromGuid(correlationId).ToDto(),
+							StreamIdentifier = new StreamIdentifier {
+								StreamName = ByteString.CopyFromUtf8(pendingWrite.StreamId)
+							},
+							Error = Status.Timeout
+						}, cancellationToken)
+						: new ValueTask(Task.CompletedTask), cancellationToken);
+
+			static Event FromProposedMessage(ProposedMessage proposedMessage) =>
+				new(Uuid.FromDto(proposedMessage.Id).ToGuid(),
+					proposedMessage.Metadata[Constants.Metadata.Type],
+					proposedMessage.Metadata[Constants.Metadata.ContentType] ==
+					Constants.Metadata.ContentTypes.ApplicationJson, proposedMessage.Data.ToByteArray(),
+					proposedMessage.CustomMetadata.ToByteArray());
+
+			static ClientMessage.WriteEvents ToInternalMessage(ClientWriteRequest request, IEnvelope envelope,
+				bool requiresLeader, ClaimsPrincipal user, CancellationToken token) =>
+				new(Guid.NewGuid(), request.CorrelationId, envelope, requiresLeader, request.StreamId,
+					request.ExpectedVersion, request.Events.ToArray(), user, cancellationToken: token);
+
+			static TimeSpan GetRequestedTimeout(Options options) => options.DeadlineOptionCase switch {
+				DeadlineOptionOneofCase.Deadline => options.Deadline.ToTimeSpan(),
+				_ => (options.Deadline21100?.ToDateTime() ?? DateTime.MaxValue) - DateTime.UtcNow,
+			};
+
+			static TimeSpan Min(TimeSpan a, TimeSpan b) => a > b ? b : a;
+			static TimeSpan Max(TimeSpan a, TimeSpan b) => a > b ? a : b;
+		}
+	}
+
+	private class MaxAppendEventSizeExceededException(string eventId, int proposedEventSize, int maxAppendEventSize)
+		: Exception($"Event with Id: {eventId}, Size: {proposedEventSize}, exceeded Max Append Event Size of {maxAppendEventSize}") {
+		public string EventId { get; } = eventId;
+		public int ProposedEventSize { get; } = proposedEventSize;
+		public int MaxAppendEventSize { get; } = maxAppendEventSize;
+	}
+
+	private record ClientWriteRequest {
+		public Guid CorrelationId { get; }
+		public string StreamId { get; }
+		public long ExpectedVersion { get; }
+		private readonly List<Event> _events;
+		public IEnumerable<Event> Events => _events.AsEnumerable();
+		private int _size;
+		public int Size => _size;
+
+		public ClientWriteRequest(Guid correlationId, string streamId, long expectedVersion, TimeSpan timeout,
+			Func<ValueTask> onTimeout, CancellationToken cancellationToken) {
+			CorrelationId = correlationId;
+			StreamId = streamId;
+			_events = [];
+			_size = 0;
+			ExpectedVersion = expectedVersion;
+
+			Task.Delay(timeout, cancellationToken).ContinueWith(_ => onTimeout(), cancellationToken);
+		}
+
+		public ClientWriteRequest AddEvents(IEnumerable<Event> events, int maxAppendEventSize) {
+			foreach (var e in events) {
+				var eventSize = Event.SizeOnDisk(e.EventType, e.Data, e.Metadata);
+				if (eventSize > maxAppendEventSize) {
+					throw new MaxAppendEventSizeExceededException(e.EventId.ToString(), eventSize, maxAppendEventSize);
+				}
+
+				_size += eventSize;
+				_events.Add(e);
+			}
+
+			return this;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Streams.Delete.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Streams.Delete.cs
new file mode 100644
index 00000000000..5e633415a3a
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Streams.Delete.cs
@@ -0,0 +1,169 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Client;
+using EventStore.Client.Streams;
+using Grpc.Core;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Grpc;
+using static EventStore.Client.Streams.TombstoneReq.Types.Options;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class Streams<TStreamId> {
+	public override async Task<DeleteResp> Delete(DeleteReq request, ServerCallContext context) {
+		using var duration = _deleteTracker.Start();
+		try {
+			var options = request.Options;
+			var streamName = options.StreamIdentifier;
+			var expectedVersion = options.ExpectedStreamRevisionCase switch {
+				DeleteReq.Types.Options.ExpectedStreamRevisionOneofCase.Revision =>
+				new StreamRevision(options.Revision).ToInt64(),
+				DeleteReq.Types.Options.ExpectedStreamRevisionOneofCase.Any =>
+				AnyStreamRevision.Any.ToInt64(),
+				DeleteReq.Types.Options.ExpectedStreamRevisionOneofCase.NoStream =>
+				AnyStreamRevision.NoStream.ToInt64(),
+				DeleteReq.Types.Options.ExpectedStreamRevisionOneofCase.StreamExists =>
+				AnyStreamRevision.StreamExists.ToInt64(),
+				_ => throw RpcExceptions.InvalidArgument(options.ExpectedStreamRevisionCase)
+			};
+
+			var user = context.GetHttpContext().User;
+			var op = DeleteOperation.WithParameter(Plugins.Authorization.Operations.Streams.Parameters.StreamId(streamName));
+			if (!await _provider.CheckAccessAsync(user, op, context.CancellationToken)) {
+				throw RpcExceptions.AccessDenied();
+			}
+			var requiresLeader = GetRequiresLeader(context.RequestHeaders);
+
+			var position = await DeleteInternal(streamName, expectedVersion, user, false, requiresLeader,
+				context.CancellationToken);
+
+			return position.HasValue
+				? new DeleteResp {
+					Position = new DeleteResp.Types.Position {
+						CommitPosition = position.Value.CommitPosition,
+						PreparePosition = position.Value.PreparePosition
+					}
+				}
+				: new DeleteResp {
+					NoPosition = new Empty()
+				};
+		} catch (Exception ex) {
+			duration.SetException(ex);
+			throw;
+		}
+	}
+
+	public override async Task<TombstoneResp> Tombstone(TombstoneReq request, ServerCallContext context) {
+		using var duration = _tombstoneTracker.Start();
+		try {
+			var options = request.Options;
+			var streamName = options.StreamIdentifier;
+
+			var expectedVersion = options.ExpectedStreamRevisionCase switch {
+				ExpectedStreamRevisionOneofCase.Revision => new StreamRevision(options.Revision).ToInt64(),
+				ExpectedStreamRevisionOneofCase.Any => AnyStreamRevision.Any.ToInt64(),
+				ExpectedStreamRevisionOneofCase.NoStream => AnyStreamRevision.NoStream.ToInt64(),
+				ExpectedStreamRevisionOneofCase.StreamExists => AnyStreamRevision.StreamExists.ToInt64(),
+				_ => throw RpcExceptions.InvalidArgument(options.ExpectedStreamRevisionCase)
+			};
+
+			var requiresLeader = GetRequiresLeader(context.RequestHeaders);
+
+			var user = context.GetHttpContext().User;
+			var op = DeleteOperation.WithParameter(Plugins.Authorization.Operations.Streams.Parameters.StreamId(streamName));
+			if (!await _provider.CheckAccessAsync(user, op, context.CancellationToken)) {
+				throw RpcExceptions.AccessDenied();
+			}
+
+			var position = await DeleteInternal(streamName, expectedVersion, user, true, requiresLeader,
+				context.CancellationToken);
+
+			return position.HasValue
+				? new TombstoneResp {
+					Position = new TombstoneResp.Types.Position {
+						CommitPosition = position.Value.CommitPosition,
+						PreparePosition = position.Value.PreparePosition
+					}
+				}
+				: new TombstoneResp {
+					NoPosition = new Empty()
+				};
+		} catch (Exception ex) {
+			duration.SetException(ex);
+			throw;
+		}
+	}
+
+	private async Task<Position?> DeleteInternal(string streamName, long expectedVersion,
+		ClaimsPrincipal user, bool hardDelete, bool requiresLeader, CancellationToken cancellationToken) {
+		var correlationId = Guid.NewGuid(); // TODO: JPB use request id?
+		var deleteResponseSource = new TaskCompletionSource<Position?>();
+
+		var envelope = new CallbackEnvelope(HandleStreamDeletedCompleted);
+
+		_publisher.Publish(new ClientMessage.DeleteStream(
+			correlationId,
+			correlationId,
+			envelope,
+			requiresLeader,
+			streamName,
+			expectedVersion,
+			hardDelete,
+			user,
+			cancellationToken: cancellationToken));
+
+		return await deleteResponseSource.Task;
+
+		void HandleStreamDeletedCompleted(Message message) {
+			if (message is ClientMessage.NotHandled notHandled &&
+				RpcExceptions.TryHandleNotHandled(notHandled, out var ex)) {
+				deleteResponseSource.TrySetException(ex);
+				return;
+			}
+
+			if (message is not ClientMessage.DeleteStreamCompleted completed) {
+				deleteResponseSource.TrySetException(
+					RpcExceptions.UnknownMessage<ClientMessage.DeleteStreamCompleted>(message));
+				return;
+			}
+
+			switch (completed.Result) {
+				case OperationResult.Success:
+					deleteResponseSource.TrySetResult(completed.CommitPosition == -1
+						? default
+						: Position.FromInt64(completed.CommitPosition, completed.PreparePosition));
+
+					return;
+				case OperationResult.PrepareTimeout:
+				case OperationResult.CommitTimeout:
+				case OperationResult.ForwardTimeout:
+					deleteResponseSource.TrySetException(RpcExceptions.Timeout(completed.Message));
+					return;
+				case OperationResult.WrongExpectedVersion:
+					deleteResponseSource.TrySetException(RpcExceptions.WrongExpectedVersion("Delete",
+						streamName, expectedVersion, completed.CurrentVersion));
+					return;
+				case OperationResult.StreamDeleted:
+					deleteResponseSource.TrySetException(RpcExceptions.StreamDeleted(streamName));
+					return;
+				case OperationResult.InvalidTransaction:
+					deleteResponseSource.TrySetException(RpcExceptions.InvalidTransaction());
+					return;
+				case OperationResult.AccessDenied:
+					deleteResponseSource.TrySetException(RpcExceptions.AccessDenied());
+					return;
+				default:
+					deleteResponseSource.TrySetException(RpcExceptions.UnknownError(completed.Result));
+					return;
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Streams.Read.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Streams.Read.cs
new file mode 100644
index 00000000000..cee7551c68b
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Streams.Read.cs
@@ -0,0 +1,370 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Client;
+using EventStore.Client.Streams;
+using Google.Protobuf;
+using Grpc.Core;
+using KurrentDB.Core;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Enumerators;
+using KurrentDB.Core.Services.Transport.Grpc;
+using static EventStore.Client.Streams.ReadResp.Types;
+using static EventStore.Plugins.Authorization.Operations.Streams;
+using CountOptionOneofCase = EventStore.Client.Streams.ReadReq.Types.Options.CountOptionOneofCase;
+using FilterOptionOneofCase = EventStore.Client.Streams.ReadReq.Types.Options.FilterOptionOneofCase;
+using ReadDirection = EventStore.Client.Streams.ReadReq.Types.Options.Types.ReadDirection;
+using StreamOptionOneofCase = EventStore.Client.Streams.ReadReq.Types.Options.StreamOptionOneofCase;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class Streams<TStreamId> {
+	public override async Task Read(
+		ReadReq request,
+		IServerStreamWriter<ReadResp> responseStream,
+		ServerCallContext context) {
+
+		var trackDuration = request.Options.CountOptionCase != CountOptionOneofCase.Subscription;
+		using var duration = trackDuration ? _readTracker.Start() : Duration.Nil;
+		try {
+			var options = request.Options;
+			var countOptionsCase = options.CountOptionCase;
+			var streamOptionsCase = options.StreamOptionCase;
+			var readDirection = options.ReadDirection;
+			var filterOptionsCase = options.FilterOptionCase;
+			var compatibility = options.ControlOption?.Compatibility ?? 0;
+
+			var user = context.GetHttpContext().User;
+			var requiresLeader = GetRequiresLeader(context.RequestHeaders);
+
+			var uuidOption = options.UuidOption;
+			if (uuidOption == null) {
+				throw RpcExceptions.RequiredArgument(nameof(uuidOption), uuidOption);
+			}
+
+			var op = streamOptionsCase switch {
+				StreamOptionOneofCase.Stream => ReadOperation.WithParameter(Parameters.StreamId(request.Options.Stream.StreamIdentifier)),
+				StreamOptionOneofCase.All => ReadOperation.WithParameter(Parameters.StreamId(SystemStreams.AllStream)),
+				_ => throw RpcExceptions.InvalidArgument(streamOptionsCase)
+			};
+
+			if (!await _provider.CheckAccessAsync(user, op, context.CancellationToken)) {
+				throw RpcExceptions.AccessDenied();
+			}
+
+			try {
+				var enumerator = CreateEnumerator(
+					request,
+					user,
+					requiresLeader,
+					compatibility,
+					streamOptionsCase,
+					countOptionsCase,
+					readDirection,
+					filterOptionsCase,
+					context.Deadline,
+					context.CancellationToken);
+
+				async void DisposeEnumerator() => await enumerator.DisposeAsync();
+
+				await using (enumerator) {
+					await using (context.CancellationToken.Register(DisposeEnumerator)) {
+						while (await enumerator.MoveNextAsync()) {
+							if (TryConvertReadResponse(enumerator.Current, uuidOption, out var readResponse))
+								await responseStream.WriteAsync(readResponse);
+						}
+					}
+				}
+			} catch (ReadResponseException ex) {
+				ConvertReadResponseException(ex);
+			}
+		} catch (Exception ex) {
+			duration.SetException(ex);
+			throw;
+		}
+	}
+
+	private IAsyncEnumerator<ReadResponse> CreateEnumerator(
+		ReadReq request,
+		ClaimsPrincipal user,
+		bool requiresLeader,
+		uint compatibility,
+		StreamOptionOneofCase streamOptionsCase,
+		CountOptionOneofCase countOptionsCase,
+		ReadDirection readDirection,
+		FilterOptionOneofCase filterOptionsCase,
+		DateTime deadline,
+		CancellationToken cancellationToken) {
+		return (streamOptionsCase, countOptionsCase, readDirection, filterOptionsCase) switch {
+			(StreamOptionOneofCase.Stream,
+				CountOptionOneofCase.Count,
+				ReadDirection.Forwards,
+				FilterOptionOneofCase.NoFilter) => new Enumerator.ReadStreamForwards(
+					_publisher,
+					request.Options.Stream.StreamIdentifier,
+					request.Options.Stream.ToStreamRevision(),
+					request.Options.Count,
+					request.Options.ResolveLinks,
+					user,
+					requiresLeader,
+					deadline,
+					compatibility,
+					cancellationToken),
+			(StreamOptionOneofCase.Stream,
+				CountOptionOneofCase.Count,
+				ReadDirection.Backwards,
+				FilterOptionOneofCase.NoFilter) => new Enumerator.ReadStreamBackwards(
+					_publisher,
+					request.Options.Stream.StreamIdentifier,
+					request.Options.Stream.ToStreamRevision(),
+					request.Options.Count,
+					request.Options.ResolveLinks,
+					user,
+					requiresLeader,
+					deadline,
+					compatibility,
+					cancellationToken),
+			(StreamOptionOneofCase.All,
+				CountOptionOneofCase.Count,
+				ReadDirection.Forwards,
+				FilterOptionOneofCase.NoFilter) => new Enumerator.ReadAllForwards(
+					_publisher,
+					request.Options.All.ToPosition(),
+					request.Options.Count,
+					request.Options.ResolveLinks,
+					user,
+					requiresLeader,
+					deadline,
+					cancellationToken),
+			(StreamOptionOneofCase.All,
+				CountOptionOneofCase.Count,
+				ReadDirection.Forwards,
+				FilterOptionOneofCase.Filter) => new Enumerator.ReadAllForwardsFiltered(
+					_publisher,
+					request.Options.All.ToPosition(),
+					request.Options.Count,
+					request.Options.ResolveLinks,
+					ConvertToEventFilter(true, request.Options.Filter),
+					user,
+					requiresLeader,
+					request.Options.Filter.WindowCase switch {
+						ReadReq.Types.Options.Types.FilterOptions.WindowOneofCase.Count => null,
+						ReadReq.Types.Options.Types.FilterOptions.WindowOneofCase.Max => request.Options.Filter
+							.Max,
+						_ => throw RpcExceptions.InvalidArgument(request.Options.Filter.WindowCase)
+					},
+					deadline,
+					cancellationToken),
+			(StreamOptionOneofCase.All,
+				CountOptionOneofCase.Count,
+				ReadDirection.Backwards,
+				FilterOptionOneofCase.NoFilter) => new Enumerator.ReadAllBackwards(
+					_publisher,
+					request.Options.All.ToPosition(),
+					request.Options.Count,
+					request.Options.ResolveLinks,
+					user,
+					requiresLeader,
+					deadline,
+					cancellationToken),
+			(StreamOptionOneofCase.All,
+				CountOptionOneofCase.Count,
+				ReadDirection.Backwards,
+				FilterOptionOneofCase.Filter) => new Enumerator.ReadAllBackwardsFiltered(
+					_publisher,
+					request.Options.All.ToPosition(),
+					request.Options.Count,
+					request.Options.ResolveLinks,
+					ConvertToEventFilter(true, request.Options.Filter),
+					user,
+					requiresLeader,
+					request.Options.Filter.WindowCase switch {
+						ReadReq.Types.Options.Types.FilterOptions.WindowOneofCase.Count => null,
+						ReadReq.Types.Options.Types.FilterOptions.WindowOneofCase.Max => request.Options.Filter
+							.Max,
+						_ => throw RpcExceptions.InvalidArgument(request.Options.Filter.WindowCase)
+					},
+					deadline,
+					cancellationToken),
+			(StreamOptionOneofCase.Stream,
+				CountOptionOneofCase.Subscription,
+				ReadDirection.Forwards,
+				FilterOptionOneofCase.NoFilter) => new Enumerator.StreamSubscription<TStreamId>(
+					_publisher,
+					_expiryStrategy,
+					request.Options.Stream.StreamIdentifier,
+					request.Options.Stream.ToSubscriptionStreamRevision(),
+					request.Options.ResolveLinks,
+					user,
+					requiresLeader,
+					cancellationToken),
+			(StreamOptionOneofCase.All,
+				CountOptionOneofCase.Subscription,
+				ReadDirection.Forwards,
+				FilterOptionOneofCase.NoFilter) => new Enumerator.AllSubscription(
+					_publisher,
+					_expiryStrategy,
+					request.Options.All.ToSubscriptionPosition(),
+					request.Options.ResolveLinks,
+					user,
+					requiresLeader,
+					cancellationToken),
+			(StreamOptionOneofCase.All,
+				CountOptionOneofCase.Subscription,
+				ReadDirection.Forwards,
+				FilterOptionOneofCase.Filter) => new Enumerator.AllSubscriptionFiltered(
+					_publisher,
+					_expiryStrategy,
+					request.Options.All.ToSubscriptionPosition(),
+					request.Options.ResolveLinks,
+					ConvertToEventFilter(true, request.Options.Filter),
+					user,
+					requiresLeader,
+					request.Options.Filter.WindowCase switch {
+						ReadReq.Types.Options.Types.FilterOptions.WindowOneofCase.Count => null,
+						ReadReq.Types.Options.Types.FilterOptions.WindowOneofCase.Max => request.Options.Filter.Max,
+						_ => throw RpcExceptions.InvalidArgument(request.Options.Filter.WindowCase)
+					},
+					request.Options.Filter.CheckpointIntervalMultiplier,
+					cancellationToken),
+			_ => throw RpcExceptions.InvalidCombination((streamOptionsCase, countOptionsCase, readDirection,
+				filterOptionsCase))
+		};
+	}
+
+	private static IEventFilter ConvertToEventFilter(bool isAllStream, ReadReq.Types.Options.Types.FilterOptions filter) =>
+		filter.FilterCase switch {
+			ReadReq.Types.Options.Types.FilterOptions.FilterOneofCase.EventType => (
+				string.IsNullOrEmpty(filter.EventType.Regex)
+					? EventFilter.EventType.Prefixes(isAllStream, filter.EventType.Prefix.ToArray())
+					: EventFilter.EventType.Regex(isAllStream, filter.EventType.Regex)),
+			ReadReq.Types.Options.Types.FilterOptions.FilterOneofCase.StreamIdentifier => (
+				string.IsNullOrEmpty(filter.StreamIdentifier.Regex)
+					? EventFilter.StreamName.Prefixes(isAllStream, filter.StreamIdentifier.Prefix.ToArray())
+					: EventFilter.StreamName.Regex(isAllStream, filter.StreamIdentifier.Regex)),
+			_ => throw RpcExceptions.InvalidArgument(filter)
+		};
+
+	private static bool TryConvertReadResponse(ReadResponse readResponse, ReadReq.Types.Options.Types.UUIDOption uuidOption, out ReadResp readResp) {
+		readResp = readResponse switch {
+			ReadResponse.EventReceived eventReceived => new ReadResp {
+				Event = ConvertToReadEvent(uuidOption, eventReceived.Event)
+			},
+			ReadResponse.SubscriptionConfirmed subscriptionConfirmed => new ReadResp {
+				Confirmation = new SubscriptionConfirmation {
+					SubscriptionId = subscriptionConfirmed.SubscriptionId
+				}
+			},
+			ReadResponse.CheckpointReceived checkpointReceived => new ReadResp {
+				Checkpoint = new Checkpoint {
+					CommitPosition = checkpointReceived.CommitPosition,
+					PreparePosition = checkpointReceived.PreparePosition
+				}
+			},
+			ReadResponse.StreamNotFound streamNotFound => new ReadResp {
+				StreamNotFound = new StreamNotFound {
+					StreamIdentifier = streamNotFound.StreamName
+				}
+			},
+			ReadResponse.SubscriptionCaughtUp => new ReadResp {
+				CaughtUp = new CaughtUp()
+			},
+			ReadResponse.SubscriptionFellBehind => null, // currently not sent to clients
+			ReadResponse.LastStreamPositionReceived lastStreamPositionReceived => new ReadResp {
+				LastStreamPosition = lastStreamPositionReceived.LastStreamPosition
+			},
+			ReadResponse.FirstStreamPositionReceived firstStreamPositionReceived => new ReadResp {
+				FirstStreamPosition = firstStreamPositionReceived.FirstStreamPosition
+			},
+			_ => throw new ArgumentException($"Unknown read response type: {readResponse.GetType().Name}", nameof(readResponse))
+		};
+
+		return readResp != null;
+	}
+
+	private static void ConvertReadResponseException(ReadResponseException readResponseEx) {
+		switch (readResponseEx) {
+			case ReadResponseException.NotHandled.ServerNotReady:
+				throw RpcExceptions.ServerNotReady();
+			case ReadResponseException.NotHandled.ServerBusy:
+				throw RpcExceptions.ServerBusy();
+			case ReadResponseException.NotHandled.LeaderInfo leaderInfo:
+				throw RpcExceptions.LeaderInfo(leaderInfo.Host, leaderInfo.Port);
+			case ReadResponseException.NotHandled.NoLeaderInfo:
+				throw RpcExceptions.NoLeaderInfo();
+			case ReadResponseException.StreamDeleted streamDeleted:
+				throw RpcExceptions.StreamDeleted(streamDeleted.StreamName);
+			case ReadResponseException.AccessDenied:
+				throw RpcExceptions.AccessDenied();
+			case ReadResponseException.Timeout timeout:
+				throw RpcExceptions.Timeout(timeout.ErrorMessage);
+			case ReadResponseException.InvalidPosition:
+				throw RpcExceptions.InvalidPositionException();
+			case ReadResponseException.UnknownMessage unknownMessage:
+				throw RpcExceptions.UnknownMessage(unknownMessage.UnknownMessageType, unknownMessage.ExpectedMessageType);
+			case ReadResponseException.UnknownError unknown:
+				throw RpcExceptions.UnknownError(unknown.ResultType, unknown.Result);
+			default:
+				throw new ArgumentException($"Unknown read response exception type: {readResponseEx.GetType().Name}", nameof(readResponseEx));
+		}
+	}
+
+	private static ReadEvent.Types.RecordedEvent ConvertToRecordedEvent(
+		ReadReq.Types.Options.Types.UUIDOption uuidOption, EventRecord e, long? commitPosition,
+		long? preparePosition) {
+		if (e == null)
+			return null;
+		var position = Position.FromInt64(commitPosition ?? -1, preparePosition ?? -1);
+		return new ReadEvent.Types.RecordedEvent {
+			Id = uuidOption.ContentCase switch {
+				ReadReq.Types.Options.Types.UUIDOption.ContentOneofCase.String => new UUID {
+					String = e.EventId.ToString()
+				},
+				_ => Uuid.FromGuid(e.EventId).ToDto()
+			},
+			StreamIdentifier = e.EventStreamId,
+			StreamRevision = StreamRevision.FromInt64(e.EventNumber),
+			CommitPosition = position.CommitPosition,
+			PreparePosition = position.PreparePosition,
+			Metadata = {
+				[Constants.Metadata.Type] = e.EventType,
+				[Constants.Metadata.Created] = e.TimeStamp.ToTicksSinceEpoch().ToString(),
+				[Constants.Metadata.ContentType] = e.IsJson
+					? Constants.Metadata.ContentTypes.ApplicationJson
+					: Constants.Metadata.ContentTypes.ApplicationOctetStream
+			},
+			Data = ByteString.CopyFrom(e.Data.Span),
+			CustomMetadata = ByteString.CopyFrom(e.Metadata.Span)
+		};
+	}
+
+	private static ReadEvent ConvertToReadEvent(ReadReq.Types.Options.Types.UUIDOption uuidOption, ResolvedEvent e) {
+		var readEvent = new ReadEvent {
+			Link = ConvertToRecordedEvent(uuidOption, e.Link, e.LinkPosition?.CommitPosition,
+				e.LinkPosition?.PreparePosition),
+			Event = ConvertToRecordedEvent(uuidOption, e.Event, e.EventPosition?.CommitPosition,
+				e.EventPosition?.PreparePosition),
+		};
+		if (e.OriginalPosition.HasValue) {
+			var position = Position.FromInt64(
+				e.OriginalPosition.Value.CommitPosition,
+				e.OriginalPosition.Value.PreparePosition);
+			readEvent.CommitPosition = position.CommitPosition;
+		} else {
+			readEvent.NoPosition = new Empty();
+		}
+
+		return readEvent;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Streams.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Streams.cs
new file mode 100644
index 00000000000..a3f8edc724d
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Streams.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using EventStore.Client.Streams;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Configuration;
+using KurrentDB.Core;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class Streams<TStreamId> : Streams.StreamsBase {
+	private readonly IPublisher _publisher;
+	private readonly int _maxAppendSize;
+	private readonly int _maxAppendEventSize;
+	private readonly TimeSpan _writeTimeout;
+	private readonly IExpiryStrategy _expiryStrategy;
+	private readonly IDurationTracker _readTracker;
+	private readonly IDurationTracker _appendTracker;
+	private readonly IDurationTracker _batchAppendTracker;
+	private readonly IDurationTracker _deleteTracker;
+	private readonly IDurationTracker _tombstoneTracker;
+	private readonly IAuthorizationProvider _provider;
+	private static readonly Operation ReadOperation = new Operation(Plugins.Authorization.Operations.Streams.Read);
+	private static readonly Operation WriteOperation = new Operation(Plugins.Authorization.Operations.Streams.Write);
+	private static readonly Operation DeleteOperation = new Operation(Plugins.Authorization.Operations.Streams.Delete);
+
+	public Streams(IPublisher publisher, int maxAppendSize, int maxAppendEventSize, TimeSpan writeTimeout,
+		IExpiryStrategy expiryStrategy,
+		GrpcTrackers trackers,
+		IAuthorizationProvider provider) {
+
+		if (publisher == null)
+			throw new ArgumentNullException(nameof(publisher));
+		_publisher = publisher;
+		_maxAppendSize = maxAppendSize;
+		_maxAppendEventSize = maxAppendEventSize;
+		_writeTimeout = writeTimeout;
+		_expiryStrategy = expiryStrategy;
+		_readTracker = trackers[MetricsConfiguration.GrpcMethod.StreamRead];
+		_appendTracker = trackers[MetricsConfiguration.GrpcMethod.StreamAppend];
+		_batchAppendTracker = trackers[MetricsConfiguration.GrpcMethod.StreamBatchAppend];
+		_deleteTracker = trackers[MetricsConfiguration.GrpcMethod.StreamDelete];
+		_tombstoneTracker = trackers[MetricsConfiguration.GrpcMethod.StreamTombstone];
+		_provider = provider;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Users.ChangePassword.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Users.ChangePassword.cs
new file mode 100644
index 00000000000..866c6e56710
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Users.ChangePassword.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.Client.Users;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+using static EventStore.Plugins.Authorization.Operations.Users;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class Users {
+	private static readonly Operation ChangePasswordOperation = new(Plugins.Authorization.Operations.Users.ChangePassword);
+
+	public override async Task<ChangePasswordResp> ChangePassword(ChangePasswordReq request,
+		ServerCallContext context) {
+		var options = request.Options;
+
+		var user = context.GetHttpContext().User;
+		var changePasswordOperation = ChangePasswordOperation;
+		if (user?.Identity?.Name != null) {
+			changePasswordOperation = changePasswordOperation.WithParameter(Parameters.User(user.Identity.Name));
+		}
+
+		if (!await _authorizationProvider.CheckAccessAsync(user, changePasswordOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		var changePasswordSource = new TaskCompletionSource<bool>();
+		var envelope = new CallbackEnvelope(OnMessage);
+
+		_publisher.Publish(new UserManagementMessage.ChangePassword(envelope, user, options.LoginName, options.CurrentPassword, options.NewPassword));
+
+		await changePasswordSource.Task;
+
+		return new();
+
+		void OnMessage(Message message) {
+			if (HandleErrors(options.LoginName, message, changePasswordSource))
+				return;
+
+			changePasswordSource.TrySetResult(true);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Users.Create.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Users.Create.cs
new file mode 100644
index 00000000000..6dd62111143
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Users.Create.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.Client.Users;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class Users {
+	private static readonly Operation CreateOperation = new(Plugins.Authorization.Operations.Users.Create);
+
+	public override async Task<CreateResp> Create(CreateReq request, ServerCallContext context) {
+		var options = request.Options;
+
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, CreateOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		var createSource = new TaskCompletionSource<bool>();
+
+		var envelope = new CallbackEnvelope(OnMessage);
+
+		_publisher.Publish(
+			new UserManagementMessage.Create(envelope, user, options.LoginName, options.FullName, options.Groups.ToArray(), options.Password)
+		);
+
+		await createSource.Task;
+
+		return new CreateResp();
+
+		void OnMessage(Message message) {
+			if (HandleErrors(options.LoginName, message, createSource))
+				return;
+
+			createSource.TrySetResult(true);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Users.Delete.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Users.Delete.cs
new file mode 100644
index 00000000000..84a71fd0f6b
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Users.Delete.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.Client.Users;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class Users {
+	private static readonly Operation DeleteOperation = new(Plugins.Authorization.Operations.Users.Delete);
+
+	public override async Task<DeleteResp> Delete(DeleteReq request, ServerCallContext context) {
+		var options = request.Options;
+
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, DeleteOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		var deleteSource = new TaskCompletionSource<bool>();
+		var envelope = new CallbackEnvelope(OnMessage);
+
+		_publisher.Publish(new UserManagementMessage.Delete(envelope, user, options.LoginName));
+
+		await deleteSource.Task;
+
+		return new DeleteResp();
+
+		void OnMessage(Message message) {
+			if (HandleErrors(options.LoginName, message, deleteSource))
+				return;
+
+			deleteSource.TrySetResult(true);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Users.Details.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Users.Details.cs
new file mode 100644
index 00000000000..d3581bd761d
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Users.Details.cs
@@ -0,0 +1,74 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.Client.Users;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+using static EventStore.Plugins.Authorization.Operations.Users;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class Users {
+	private static readonly Operation ReadOperation = new(Read);
+
+	public override async Task Details(DetailsReq request, IServerStreamWriter<DetailsResp> responseStream, ServerCallContext context) {
+		var options = request.Options;
+
+		var user = context.GetHttpContext().User;
+		var readOperation = ReadOperation;
+		if (user?.Identity?.Name != null) {
+			readOperation = readOperation.WithParameter(Parameters.User(user.Identity.Name));
+		}
+
+		if (!await _authorizationProvider.CheckAccessAsync(user, readOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		var detailsSource = new TaskCompletionSource<UserManagementMessage.UserData[]>();
+
+		var envelope = new CallbackEnvelope(OnMessage);
+
+		_publisher.Publish(string.IsNullOrWhiteSpace(options?.LoginName)
+			? new UserManagementMessage.GetAll(envelope, user)
+			: new UserManagementMessage.Get(envelope, user, options.LoginName));
+
+		var details = await detailsSource.Task;
+
+		foreach (var detail in details) {
+			await responseStream.WriteAsync(new DetailsResp {
+				UserDetails = new DetailsResp.Types.UserDetails {
+					Disabled = detail.Disabled,
+					Groups = { detail.Groups },
+					FullName = detail.FullName,
+					LoginName = detail.LoginName,
+					LastUpdated = detail.DateLastUpdated.HasValue
+						? new DetailsResp.Types.UserDetails.Types.DateTime { TicksSinceEpoch = detail.DateLastUpdated.Value.UtcDateTime.ToTicksSinceEpoch() }
+						: null
+				}
+			});
+		}
+
+		void OnMessage(Message message) {
+			if (HandleErrors(options?.LoginName, message, detailsSource))
+				return;
+
+			switch (message) {
+				case UserManagementMessage.UserDetailsResult userDetails:
+					detailsSource.TrySetResult([userDetails.Data]);
+					break;
+				case UserManagementMessage.AllUserDetailsResult allUserDetails:
+					detailsSource.TrySetResult(allUserDetails.Data);
+					break;
+				default:
+					detailsSource.TrySetException(RpcExceptions.UnknownError(1));
+					break;
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Users.Disable.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Users.Disable.cs
new file mode 100644
index 00000000000..29816b042b6
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Users.Disable.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.Client.Users;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class Users {
+	private static readonly Operation DisableOperation = new(Plugins.Authorization.Operations.Users.Disable);
+
+	public override async Task<DisableResp> Disable(DisableReq request, ServerCallContext context) {
+		var options = request.Options;
+
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, DisableOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		var disableSource = new TaskCompletionSource<bool>();
+
+		var envelope = new CallbackEnvelope(OnMessage);
+
+		_publisher.Publish(new UserManagementMessage.Disable(envelope, user, options.LoginName));
+
+		await disableSource.Task;
+
+		return new DisableResp();
+
+		void OnMessage(Message message) {
+			if (HandleErrors(options.LoginName, message, disableSource))
+				return;
+
+			disableSource.TrySetResult(true);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Users.Enable.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Users.Enable.cs
new file mode 100644
index 00000000000..1c24547be54
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Users.Enable.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.Client.Users;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class Users {
+	private static readonly Operation EnableOperation = new(Plugins.Authorization.Operations.Users.Enable);
+
+	public override async Task<EnableResp> Enable(EnableReq request, ServerCallContext context) {
+		var options = request.Options;
+
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, EnableOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		var enableSource = new TaskCompletionSource<bool>();
+
+		var envelope = new CallbackEnvelope(OnMessage);
+
+		_publisher.Publish(new UserManagementMessage.Enable(envelope, user, options.LoginName));
+
+		await enableSource.Task;
+
+		return new EnableResp();
+
+		void OnMessage(Message message) {
+			if (HandleErrors(options.LoginName, message, enableSource))
+				return;
+
+			enableSource.TrySetResult(true);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Users.ResetPassword.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Users.ResetPassword.cs
new file mode 100644
index 00000000000..115093f94f9
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Users.ResetPassword.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.Client.Users;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class Users {
+	private static readonly Operation ResetOperation = new(Plugins.Authorization.Operations.Users.ResetPassword);
+
+	public override async Task<ResetPasswordResp> ResetPassword(ResetPasswordReq request, ServerCallContext context) {
+		var options = request.Options;
+
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, ResetOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		var resetPasswordSource = new TaskCompletionSource<bool>();
+
+		var envelope = new CallbackEnvelope(OnMessage);
+
+		_publisher.Publish(new UserManagementMessage.ResetPassword(envelope, user, options.LoginName, options.NewPassword));
+
+		await resetPasswordSource.Task;
+
+		return new ResetPasswordResp();
+
+		void OnMessage(Message message) {
+			if (HandleErrors(options.LoginName, message, resetPasswordSource))
+				return;
+
+			resetPasswordSource.TrySetResult(true);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Users.Update.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Users.Update.cs
new file mode 100644
index 00000000000..019422a00fa
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Users.Update.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.Client.Users;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class Users {
+	private static readonly Operation UpdateOperation = new(Plugins.Authorization.Operations.Users.Update);
+
+	public override async Task<UpdateResp> Update(UpdateReq request, ServerCallContext context) {
+		var options = request.Options;
+
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, UpdateOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+		var updateSource = new TaskCompletionSource<bool>();
+
+		var envelope = new CallbackEnvelope(OnMessage);
+
+		_publisher.Publish(new UserManagementMessage.Update(envelope, user, options.LoginName, options.FullName, options.Groups.ToArray()));
+
+		await updateSource.Task;
+
+		return new UpdateResp();
+
+		void OnMessage(Message message) {
+			if (HandleErrors(options.LoginName, message, updateSource))
+				return;
+
+			updateSource.TrySetResult(true);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Users.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Users.cs
new file mode 100644
index 00000000000..4eec149b7f4
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Users.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+using static KurrentDB.Core.Messages.UserManagementMessage;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Core.Services.Transport.Grpc;
+
+internal partial class Users : Client.Users.Users.UsersBase {
+	private readonly IPublisher _publisher;
+	private readonly IAuthorizationProvider _authorizationProvider;
+
+	public Users(IPublisher publisher, IAuthorizationProvider authorizationProvider) {
+		_publisher = Ensure.NotNull(publisher);
+		_authorizationProvider = Ensure.NotNull(authorizationProvider);
+	}
+
+	private static bool HandleErrors<T>(string loginName, Message message, TaskCompletionSource<T> source) {
+		if (message is not ResponseMessage response) {
+			source.TrySetException(RpcExceptions.UnknownMessage<ResponseMessage>(message));
+			return true;
+		}
+
+		if (response.Success)
+			return false;
+		source.TrySetException(response.Error switch {
+			Error.Unauthorized => RpcExceptions.AccessDenied(),
+			Error.NotFound => RpcExceptions.LoginNotFound(loginName),
+			Error.Conflict => RpcExceptions.LoginConflict(loginName),
+			Error.TryAgain => RpcExceptions.LoginTryAgain(loginName),
+			_ => RpcExceptions.UnknownError(response.Error)
+		});
+		return true;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/Uuid.cs b/src/KurrentDB.Core/Services/Transport/Grpc/Uuid.cs
new file mode 100644
index 00000000000..63f4fc98b5a
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/Uuid.cs
@@ -0,0 +1,94 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using EventStore.Client;
+using HashCode = KurrentDB.Core.Services.Transport.Common.HashCode;
+
+namespace KurrentDB.Core.Services.Transport.Grpc;
+
+public readonly struct Uuid : IEquatable<Uuid> {
+	public static readonly Uuid Empty = new(Guid.Empty);
+
+	private readonly long _lsb;
+	private readonly long _msb;
+
+	public static Uuid NewUuid() => new(Guid.NewGuid());
+	public static Uuid FromGuid(Guid value) => new(value);
+	public static Uuid Parse(string value) => new(value);
+	public static Uuid FromInt64(long msb, long lsb) => new(msb, lsb);
+
+	public static Uuid FromDto(UUID dto) {
+		return dto == null
+			? throw new ArgumentNullException(nameof(dto))
+			: dto.ValueCase switch {
+				UUID.ValueOneofCase.String => new(dto.String),
+				UUID.ValueOneofCase.Structured => new(dto.Structured.MostSignificantBits, dto.Structured.LeastSignificantBits),
+				_ => throw new ArgumentException($"Invalid argument: {dto.ValueCase}", nameof(dto))
+			};
+	}
+
+	private Uuid(Guid value) {
+		if (!BitConverter.IsLittleEndian) {
+			throw new NotSupportedException();
+		}
+
+		Span<byte> data = stackalloc byte[16];
+
+		if (!value.TryWriteBytes(data)) {
+			throw new InvalidOperationException();
+		}
+
+		data[..8].Reverse();
+		data[..2].Reverse();
+		data.Slice(2, 2).Reverse();
+		data.Slice(4, 4).Reverse();
+		data[8..].Reverse();
+
+		_msb = BitConverter.ToInt64(data);
+		_lsb = BitConverter.ToInt64(data[8..]);
+	}
+
+	private Uuid(string value) : this(value != null ? Guid.Parse(value) : throw new ArgumentNullException(nameof(value))) {
+	}
+
+	private Uuid(long msb, long lsb) {
+		_msb = msb;
+		_lsb = lsb;
+	}
+
+	public UUID ToDto() => new() {
+		Structured = new() {
+			LeastSignificantBits = _lsb,
+			MostSignificantBits = _msb
+		}
+	};
+
+	public bool Equals(Uuid other) => _lsb == other._lsb && _msb == other._msb;
+	public override bool Equals(object obj) => obj is Uuid other && Equals(other);
+	public override int GetHashCode() => HashCode.Hash.Combine(_lsb).Combine(_msb);
+	public static bool operator ==(Uuid left, Uuid right) => left.Equals(right);
+	public static bool operator !=(Uuid left, Uuid right) => !left.Equals(right);
+	public override string ToString() => ToGuid().ToString();
+	public string ToString(string format) => ToGuid().ToString(format);
+
+	public Guid ToGuid() {
+		if (!BitConverter.IsLittleEndian) {
+			throw new NotSupportedException();
+		}
+
+		Span<byte> data = stackalloc byte[16];
+		if (!BitConverter.TryWriteBytes(data, _msb) ||
+			!BitConverter.TryWriteBytes(data[8..], _lsb)) {
+			throw new InvalidOperationException();
+		}
+
+		data[..8].Reverse();
+		data[..4].Reverse();
+		data.Slice(4, 2).Reverse();
+		data.Slice(6, 2).Reverse();
+		data[8..].Reverse();
+
+		return new(data);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Grpc/WrongExpectedVersion.cs b/src/KurrentDB.Core/Services/Transport/Grpc/WrongExpectedVersion.cs
new file mode 100644
index 00000000000..24f719cca26
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Grpc/WrongExpectedVersion.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Services.Transport.Common;
+using static KurrentDB.Core.Data.ExpectedVersion;
+
+// ReSharper disable once CheckNamespace
+namespace EventStore.Client;
+
+partial class WrongExpectedVersion {
+	public static WrongExpectedVersion Create(StreamRevision currentStreamRevision, long expectedStreamPosition)
+		=> new() {
+			currentStreamRevisionOption_ = currentStreamRevision == StreamRevision.End
+				? new Google.Protobuf.WellKnownTypes.Empty()
+				: currentStreamRevision.ToUInt64(),
+			currentStreamRevisionOptionCase_ = currentStreamRevision == StreamRevision.End
+				? CurrentStreamRevisionOptionOneofCase.CurrentNoStream
+				: CurrentStreamRevisionOptionOneofCase.CurrentStreamRevision,
+			expectedStreamPositionOption_ = expectedStreamPosition switch {
+				Any or NoStream or StreamExists => new Google.Protobuf.WellKnownTypes.Empty(),
+				_ => StreamRevision.FromInt64(expectedStreamPosition).ToUInt64()
+			},
+			expectedStreamPositionOptionCase_ = expectedStreamPosition switch {
+				Any => ExpectedStreamPositionOptionOneofCase.ExpectedAny,
+				NoStream => ExpectedStreamPositionOptionOneofCase.ExpectedNoStream,
+				StreamExists => ExpectedStreamPositionOptionOneofCase.ExpectedStreamExists,
+				_ => ExpectedStreamPositionOptionOneofCase.ExpectedStreamPosition
+			}
+		};
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/AuthenticatedHttpRequestProcessor.cs b/src/KurrentDB.Core/Services/Transport/Http/AuthenticatedHttpRequestProcessor.cs
new file mode 100644
index 00000000000..f36f3f78f0e
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/AuthenticatedHttpRequestProcessor.cs
@@ -0,0 +1,62 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Transport.Http.Messages;
+using KurrentDB.Transport.Http.EntityManagement;
+using HttpStatusCode = KurrentDB.Transport.Http.HttpStatusCode;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+internal class AuthenticatedHttpRequestProcessor : IHandle<HttpMessage.PurgeTimedOutRequests>, IHandle<AuthenticatedHttpRequestMessage> {
+	private static readonly ILogger Log = Serilog.Log.ForContext<AuthenticatedHttpRequestProcessor>();
+
+	private readonly PairingHeap<Tuple<DateTime, HttpEntityManager>> _pending = new((x, y) => x.Item1 < y.Item1);
+
+	public void Handle(HttpMessage.PurgeTimedOutRequests message) {
+		PurgeTimedOutRequests();
+	}
+
+	private void PurgeTimedOutRequests() {
+		try {
+			while (_pending.Count > 0) {
+				var req = _pending.FindMin();
+				if (req.Item1 <= DateTime.UtcNow || req.Item2.IsProcessing) {
+					req = _pending.DeleteMin();
+					req.Item2.ReplyStatus(HttpStatusCode.RequestTimeout,
+						"Server was unable to handle request in time",
+						e => Log.Debug(
+							"Error occurred while closing timed out connection (HTTP service core): {e}.",
+							e.Message));
+				} else
+					break;
+			}
+		} catch (Exception exc) {
+			Log.Error(exc, "Error purging timed out requests in HTTP request processor.");
+		}
+	}
+
+	public void Handle(AuthenticatedHttpRequestMessage message) {
+		var manager = message.Manager;
+		var match = message.Match;
+		try {
+			var reqParams = match.RequestHandler(manager, match.TemplateMatch);
+			if (!reqParams.IsDone)
+				_pending.Add(Tuple.Create(DateTime.UtcNow + reqParams.Timeout, manager));
+		} catch (Exception exc) {
+			Log.Error(exc, "Error while handling HTTP request '{url}'.", manager.HttpEntity.Request.Url);
+			InternalServerError(manager);
+		}
+
+		PurgeTimedOutRequests();
+	}
+
+	private static void InternalServerError(HttpEntityManager entity) {
+		entity.ReplyStatus(HttpStatusCode.InternalServerError, "Internal Server Error",
+			e => Log.Debug("Error while closing HTTP connection (HTTP service core): {e}.", e.Message));
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Authentication/AnonymousHttpAuthenticationProvider.cs b/src/KurrentDB.Core/Services/Transport/Http/Authentication/AnonymousHttpAuthenticationProvider.cs
new file mode 100644
index 00000000000..c2c38a0eaa1
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Authentication/AnonymousHttpAuthenticationProvider.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Authentication;
+using KurrentDB.Core.Services.UserManagement;
+using Microsoft.AspNetCore.Http;
+
+namespace KurrentDB.Core.Services.Transport.Http.Authentication;
+
+public class AnonymousHttpAuthenticationProvider : IHttpAuthenticationProvider {
+	public string Name => "anonymous";
+
+	public bool Authenticate(HttpContext context, out HttpAuthenticationRequest request) {
+		request = new(context, null!, null!);
+		request.Authenticated(SystemAccounts.Anonymous);
+		return true;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Authentication/BasicHttpAuthenticationProvider.cs b/src/KurrentDB.Core/Services/Transport/Http/Authentication/BasicHttpAuthenticationProvider.cs
new file mode 100644
index 00000000000..f9216de6f0d
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Authentication/BasicHttpAuthenticationProvider.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net.Http.Headers;
+using System.Text;
+using EventStore.Plugins.Authentication;
+using Microsoft.AspNetCore.Http;
+
+namespace KurrentDB.Core.Services.Transport.Http.Authentication;
+
+public class BasicHttpAuthenticationProvider(IAuthenticationProvider internalAuthenticationProvider) : IHttpAuthenticationProvider {
+	public string Name => "basic";
+
+	public bool Authenticate(HttpContext context, out HttpAuthenticationRequest request) {
+		if (context.Request.Headers.TryGetValue("authorization", out var values) && values.Count == 1 &&
+			AuthenticationHeaderValue.TryParse(values[0], out var authenticationHeader) && authenticationHeader.Scheme == "Basic" &&
+			TryDecodeCredential(authenticationHeader.Parameter, out var username, out var password)) {
+			request = new HttpAuthenticationRequest(context, username, password);
+			internalAuthenticationProvider.Authenticate(request);
+			return true;
+		}
+
+		request = null!;
+		return false;
+	}
+
+	private static bool TryDecodeCredential(string value, out string username, out string password) {
+		username = password = default;
+
+		var stringValue = Encoding.UTF8.GetString(System.Convert.FromBase64String(value));
+		var index = stringValue.IndexOf(':');
+		if (index < 0) {
+			return false;
+		}
+
+		username = stringValue[..index];
+		password = stringValue[(index + 1)..];
+
+		return true;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Authentication/BearerHttpAuthenticationProvider.cs b/src/KurrentDB.Core/Services/Transport/Http/Authentication/BearerHttpAuthenticationProvider.cs
new file mode 100644
index 00000000000..367f272e879
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Authentication/BearerHttpAuthenticationProvider.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net.Http.Headers;
+using EventStore.Plugins.Authentication;
+using Microsoft.AspNetCore.Http;
+
+namespace KurrentDB.Core.Services.Transport.Http.Authentication;
+
+public class BearerHttpAuthenticationProvider(IAuthenticationProvider internalAuthenticationProvider) : IHttpAuthenticationProvider {
+	public string Name => "bearer";
+
+	public bool Authenticate(HttpContext context, out HttpAuthenticationRequest request) {
+		if (!context.Request.Headers.TryGetValue("authorization", out var values) || values.Count != 1 ||
+			!AuthenticationHeaderValue.TryParse(values[0], out var authenticationHeader) || authenticationHeader.Scheme != "Bearer") {
+			request = null!;
+			return false;
+		}
+
+		request = new(context, authenticationHeader.Parameter!);
+		internalAuthenticationProvider.Authenticate(request);
+		return true;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Authentication/NodeCertificateAuthenticationProvider.cs b/src/KurrentDB.Core/Services/Transport/Http/Authentication/NodeCertificateAuthenticationProvider.cs
new file mode 100644
index 00000000000..89c7f130a89
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Authentication/NodeCertificateAuthenticationProvider.cs
@@ -0,0 +1,114 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+using EventStore.Plugins.Authentication;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Services.UserManagement;
+using Microsoft.AspNetCore.Connections.Features;
+using Microsoft.AspNetCore.Http;
+using Serilog;
+
+namespace KurrentDB.Core.Services.Transport.Http.Authentication;
+
+public class NodeCertificateAuthenticationProvider(System.Func<string> getCertificateReservedNodeCommonName) : IHttpAuthenticationProvider {
+	public string Name => "node-certificate";
+
+	static readonly ILogger Log = Serilog.Log.ForContext<NodeCertificateAuthenticationProvider>();
+
+	public bool Authenticate(HttpContext context, out HttpAuthenticationRequest request) => AuthenticateCached(context, out request);
+
+	private bool AuthenticateCached(HttpContext context, out HttpAuthenticationRequest request) {
+		// we cache the authentication result as the same TLS connection may be used for multiple HTTP requests.
+		// performance aside, the cache also ensures that authentication requests that were successful in the past
+		// will succeed in the future for the same TLS connection even if certificates are rotated.
+
+		request = null;
+
+		// if the connection doesn't have a client certificate, take a shortcut
+		var clientCertificate = context.Connection.ClientCertificate;
+		if (clientCertificate is null)
+			return false;
+
+		bool authenticated;
+
+		var connectionItems = context.Features.Get<IConnectionItemsFeature>()?.Items;
+		const string connectionItemsKey = "NodeCertificateAuthenticationStatus";
+		if (TryGetDictionaryValue(connectionItems, connectionItemsKey, out var wasAuthenticated)) {
+			authenticated = (bool)wasAuthenticated;
+		} else {
+			authenticated = AuthenticateUncached(context, clientCertificate);
+			TrySetDictionaryValue(connectionItems, connectionItemsKey, authenticated);
+		}
+
+		if (!authenticated)
+			return false;
+
+		request = new(context, "system", "");
+		request.Authenticated(SystemAccounts.System);
+
+		return true;
+	}
+
+	private static bool TryGetDictionaryValue(IDictionary<object, object> dictionary, string key, out object value) {
+		if (dictionary == null) {
+			value = null;
+			return false;
+		}
+
+		lock (dictionary) {
+			return dictionary.TryGetValue(key, out value);
+		}
+	}
+
+	private static bool TrySetDictionaryValue(IDictionary<object, object> dictionary, string key, object value) {
+		if (dictionary == null)
+			return false;
+
+		lock (dictionary) {
+			return dictionary.TryAdd(key, value);
+		}
+	}
+
+	private bool AuthenticateUncached(HttpContext context, X509Certificate2 clientCertificate) {
+		var ip = context.Connection.RemoteIpAddress?.ToString() ?? "<unknown>";
+		var isServerCertificate = clientCertificate.IsServerCertificate(out var serverCertReason);
+
+		var reservedNodeCN = getCertificateReservedNodeCommonName();
+		bool hasReservedNodeCN;
+		try {
+			hasReservedNodeCN = clientCertificate.ClientCertificateMatchesName(reservedNodeCN);
+		} catch (CryptographicException) {
+			return false;
+		} catch (NullReferenceException) {
+			return false;
+		}
+
+		bool hasIpOrDnsSan = clientCertificate.GetSubjectAlternativeNames()
+			.Where(x => x.type is CertificateNameType.DnsName or CertificateNameType.IpAddress)
+			.IsNotEmpty();
+
+		if (!isServerCertificate && !hasReservedNodeCN && !hasIpOrDnsSan) {
+			// We are sure that this is not a misconfigured node certificate with incorrect EKUs, missing SANs, etc. It could be a user certificate.
+			return false;
+		}
+		if (!hasReservedNodeCN) {
+			var clientCertificateCN = clientCertificate.GetCommonName();
+			Log.Error(
+				"Connection from node: {ip} was denied because its CN: {clientCertificateCN} does not match with the reserved node CN: {reservedNodeCN}",
+				ip, clientCertificateCN, reservedNodeCN);
+		}
+		if (!hasIpOrDnsSan) {
+			Log.Error("Connection from node: {ip} was denied because its certificate does not have any IP or DNS Subject Alternative Names (SAN).", ip);
+		}
+		if (!isServerCertificate) {
+			Log.Error("Connection from node: {ip} was denied because it is not configured as a server certificate: {failReason}", ip, serverCertReason);
+		}
+
+		return hasReservedNodeCN && hasIpOrDnsSan && isServerCertificate;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Authentication/PassthroughHttpAuthenticationProvider.cs b/src/KurrentDB.Core/Services/Transport/Http/Authentication/PassthroughHttpAuthenticationProvider.cs
new file mode 100644
index 00000000000..231f2d5cd29
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Authentication/PassthroughHttpAuthenticationProvider.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using EventStore.Plugins.Authentication;
+using KurrentDB.Core.Authentication.DelegatedAuthentication;
+using KurrentDB.Core.Authentication.PassthroughAuthentication;
+using Microsoft.AspNetCore.Http;
+
+namespace KurrentDB.Core.Services.Transport.Http.Authentication;
+
+public class PassthroughHttpAuthenticationProvider(IAuthenticationProvider internalAuthenticationProvider) : IHttpAuthenticationProvider {
+	private readonly IAuthenticationProvider _authenticationProvider = GetProvider(internalAuthenticationProvider);
+
+	public string Name => "insecure";
+
+	private static PassthroughAuthenticationProvider GetProvider(IAuthenticationProvider provider) =>
+		provider switch {
+			PassthroughAuthenticationProvider p => p,
+			DelegatedAuthenticationProvider d => GetProvider(d.Inner),
+			_ => throw new ArgumentException("PassthroughHttpAuthenticationProvider can be initialized only with a PassthroughAuthenticationProvider.")
+		};
+
+	public bool Authenticate(HttpContext context, out HttpAuthenticationRequest request) {
+		request = new(context, null!, null!);
+		_authenticationProvider.Authenticate(request);
+		return true;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Authentication/PasswordChangeNotificationReader.cs b/src/KurrentDB.Core/Services/Transport/Http/Authentication/PasswordChangeNotificationReader.cs
new file mode 100644
index 00000000000..a5ea1225bed
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Authentication/PasswordChangeNotificationReader.cs
@@ -0,0 +1,119 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Authentication.InternalAuthentication;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.UserManagement;
+using Newtonsoft.Json;
+using Serilog;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Transport.Http.Authentication;
+
+public class PasswordChangeNotificationReader :
+	IHandle<SystemMessage.SystemStart>,
+	IHandle<SystemMessage.BecomeShutdown> {
+
+	private readonly ILogger _log = Log.ForContext<UserManagementService>();
+	private readonly IPublisher _publisher;
+	private readonly IODispatcher _ioDispatcher;
+	private bool _stopped;
+
+	public PasswordChangeNotificationReader(IPublisher publisher, IODispatcher ioDispatcher) {
+		_publisher = publisher;
+		_ioDispatcher = ioDispatcher;
+	}
+
+	private void Start() {
+		_stopped = false;
+		_ioDispatcher.ReadBackward(
+			UserManagementService.UserPasswordNotificationsStreamId, -1, 1, false, SystemAccounts.System,
+			completed => {
+				switch (completed.Result) {
+					case ReadStreamResult.NoStream:
+						ReadNotificationsFrom(0);
+						break;
+					case ReadStreamResult.Success:
+						if (completed.Events is [])
+							ReadNotificationsFrom(0);
+						else
+							ReadNotificationsFrom(completed.Events[0].Event.EventNumber + 1);
+						break;
+					default:
+						throw new($"Failed to initialize password change notification reader. Cannot read {UserManagementService.UserPasswordNotificationsStreamId} Error: {completed.Result}");
+				}
+			});
+	}
+
+	private void ReadNotificationsFrom(long fromEventNumber) {
+		if (_stopped)
+			return;
+		_ioDispatcher.ReadForward(
+			UserManagementService.UserPasswordNotificationsStreamId,
+			fromEventNumber,
+			100,
+			false,
+			SystemAccounts.System,
+			completed => {
+				if (_stopped)
+					return;
+				switch (completed.Result) {
+					case ReadStreamResult.AccessDenied:
+					case ReadStreamResult.Error:
+					case ReadStreamResult.NotModified:
+						_log.Error("Failed to read: {stream} completed.Result={e}", UserManagementService.UserPasswordNotificationsStreamId, completed.Result.ToString());
+						_ioDispatcher.Delay(TimeSpan.FromSeconds(10), _ => ReadNotificationsFrom(fromEventNumber));
+						break;
+					case ReadStreamResult.NoStream:
+					case ReadStreamResult.StreamDeleted:
+						_ioDispatcher.Delay(TimeSpan.FromSeconds(1), _ => ReadNotificationsFrom(0));
+						break;
+					case ReadStreamResult.Success:
+						foreach (var @event in completed.Events) {
+							PublishPasswordChangeNotificationFrom(@event);
+						}
+
+						if (completed.IsEndOfStream) {
+							_ioDispatcher.Delay(TimeSpan.FromSeconds(1), _ => ReadNotificationsFrom(completed.NextEventNumber));
+						} else {
+							ReadNotificationsFrom(completed.NextEventNumber);
+						}
+
+						break;
+					default:
+						throw new NotSupportedException();
+				}
+			},
+			() => {
+				_log.Warning("Timeout reading stream: {stream}. Trying again in 10 seconds.", UserManagementService.UserPasswordNotificationsStreamId);
+				_ioDispatcher.Delay(TimeSpan.FromSeconds(10), _ => ReadNotificationsFrom(fromEventNumber));
+			},
+			Guid.NewGuid());
+	}
+
+
+	private class Notification {
+#pragma warning disable 649
+		public string LoginName;
+#pragma warning restore 649
+	}
+
+	private void PublishPasswordChangeNotificationFrom(ResolvedEvent @event) {
+		var data = @event.Event.Data;
+		try {
+			var notification = data.ParseJson<Notification>();
+			_publisher.Publish(new InternalAuthenticationProviderMessages.ResetPasswordCache(notification.LoginName));
+		} catch (JsonException ex) {
+			_log.Error("Failed to de-serialize event #{eventNumber}. Error: '{e}'", @event.OriginalEventNumber, ex.Message);
+		}
+	}
+
+	public void Handle(SystemMessage.SystemStart message) => Start();
+
+	public void Handle(SystemMessage.BecomeShutdown message) => _stopped = true;
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Authentication/Rfc2898PasswordHashAlgorithm.cs b/src/KurrentDB.Core/Services/Transport/Http/Authentication/Rfc2898PasswordHashAlgorithm.cs
new file mode 100644
index 00000000000..effbce60af3
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Authentication/Rfc2898PasswordHashAlgorithm.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Cryptography;
+using KurrentDB.Core.Authentication.InternalAuthentication;
+
+namespace KurrentDB.Core.Services.Transport.Http.Authentication;
+
+public class Rfc2898PasswordHashAlgorithm : PasswordHashAlgorithm {
+	private const int HashSize = 20;
+	private const int SaltSize = 16;
+	private const int Iterations = 1000;
+
+	public override void Hash(string password, out string hash, out string salt) {
+		var saltData = new byte[SaltSize];
+		RandomNumberGenerator.Fill(saltData);
+
+		using var rfcBytes = new Rfc2898DeriveBytes(password, saltData, Iterations, HashAlgorithmName.SHA1);
+		var hashData = rfcBytes.GetBytes(HashSize);
+		hash = System.Convert.ToBase64String(hashData);
+		salt = System.Convert.ToBase64String(saltData);
+	}
+
+	public override bool Verify(string password, string hash, string salt) {
+		var saltData = System.Convert.FromBase64String(salt);
+
+		using var rfcBytes = new Rfc2898DeriveBytes(password, saltData, Iterations, HashAlgorithmName.SHA1);
+		var newHash = System.Convert.ToBase64String(rfcBytes.GetBytes(HashSize));
+
+		return hash == newHash;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Authentication/TrustedHttpAuthenticationProvider.cs b/src/KurrentDB.Core/Services/Transport/Http/Authentication/TrustedHttpAuthenticationProvider.cs
new file mode 100644
index 00000000000..0cdf7db4e0c
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Authentication/TrustedHttpAuthenticationProvider.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Security.Claims;
+using EventStore.Plugins.Authentication;
+using Microsoft.AspNetCore.Http;
+
+namespace KurrentDB.Core.Services.Transport.Http.Authentication;
+
+public class TrustedHttpAuthenticationProvider : IHttpAuthenticationProvider {
+	public string Name => "trusted";
+
+	public bool Authenticate(HttpContext context, out HttpAuthenticationRequest request) {
+		request = null!;
+		if (!context.Request.Headers.TryGetValue(SystemHeaders.TrustedAuth, out var values) &&
+			!context.Request.Headers.TryGetValue(SystemHeaders.LegacyTrustedAuth, out values)) {
+			return false;
+		}
+		request = new(context, null!, null!);
+		var principal = CreatePrincipal(values[0]);
+		if (principal != null)
+			request.Authenticated(principal);
+		else
+			request.Unauthorized();
+		return true;
+	}
+
+	private static ClaimsPrincipal CreatePrincipal(string header) {
+		var loginAndGroups = header.Split(';');
+		if (loginAndGroups.Length is 0 or > 2) {
+			return null;
+		}
+
+		var login = loginAndGroups[0];
+		List<Claim> claims = [new(ClaimTypes.Name, login)];
+		if (loginAndGroups.Length == 2) {
+			var groups = loginAndGroups[1];
+			var roles = groups.Split(',');
+			for (var i = 0; i < roles.Length; i++) {
+				claims.Add(new(ClaimTypes.Role, roles[i].Trim()));
+			}
+
+		}
+		return new(new ClaimsIdentity(claims, SystemHeaders.TrustedAuth));
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Authentication/UnixSocketAuthenticationProvider.cs b/src/KurrentDB.Core/Services/Transport/Http/Authentication/UnixSocketAuthenticationProvider.cs
new file mode 100644
index 00000000000..bf6a6162880
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Authentication/UnixSocketAuthenticationProvider.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Authentication;
+using KurrentDB.Core.Services.UserManagement;
+using Microsoft.AspNetCore.Http;
+
+namespace KurrentDB.Core.Services.Transport.Http.Authentication;
+
+public class UnixSocketAuthenticationProvider : IHttpAuthenticationProvider {
+	public string Name => "unix-socket";
+
+	public bool Authenticate(HttpContext context, out HttpAuthenticationRequest request) {
+		if (context.IsUnixSocketConnection()) {
+			request = new(context, "system", "");
+			request.Authenticated(SystemAccounts.System);
+			return true;
+		}
+
+		request = null!;
+		return false;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/AuthenticationMiddleware.cs b/src/KurrentDB.Core/Services/Transport/Http/AuthenticationMiddleware.cs
new file mode 100644
index 00000000000..1da7f51897f
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/AuthenticationMiddleware.cs
@@ -0,0 +1,142 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.Plugins.Authentication;
+using Grpc.Core;
+using KurrentDB.Transport.Http;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Newtonsoft.Json;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public class AuthenticationMiddleware : IMiddleware {
+	private readonly IAuthenticationProvider _authenticationProvider;
+	private readonly IReadOnlyList<IHttpAuthenticationProvider> _httpAuthenticationProviders;
+
+	public AuthenticationMiddleware(
+		IReadOnlyList<IHttpAuthenticationProvider> httpAuthenticationProviders,
+		IAuthenticationProvider authenticationProvider) {
+		_httpAuthenticationProviders = httpAuthenticationProviders;
+		_authenticationProvider = authenticationProvider;
+	}
+
+	public async Task InvokeAsync(HttpContext context, RequestDelegate next) {
+		try {
+			if (context.IsGrpc()) {
+				await HandleAsGrpcAsync(context, next);
+			} else {
+				await HandleAsHttpAsync(context, next);
+			}
+		} catch (Exception ex) when (ex is OperationCanceledException or TaskCanceledException) {
+			// ignore request aborted
+		}
+	}
+
+	private async Task HandleAsHttpAsync(HttpContext context, RequestDelegate next) {
+		if (!TrySelectProvider(context, out var authenticationRequest)) {
+			await AddHttp1ChallengeHeaders(context);
+			return;
+		}
+
+		var (status, principal) = await authenticationRequest.AuthenticateAsync();
+
+		switch (status) {
+			case HttpAuthenticationRequestStatus.Authenticated:
+				context.User = principal;
+				await next(context);
+				if (context.Response.StatusCode == 302 && principal.Identity?.IsAuthenticated == false) {
+					// Unless the call is made from a browser, return 401 instead of redirecting to the login page
+					var userAgent = context.Request.Headers.UserAgent.FirstOrDefault();
+					if (userAgent == null || userAgent.StartsWith("Mozilla") == false) {
+						// Avoid setting the status code if the response has already started
+						if (!context.Response.HasStarted) {
+							context.Response.StatusCode = 401;
+						}
+					}
+				}
+
+				break;
+			case HttpAuthenticationRequestStatus.Error:
+				context.Response.StatusCode = HttpStatusCode.InternalServerError;
+				break;
+			case HttpAuthenticationRequestStatus.NotReady:
+				context.Response.StatusCode = HttpStatusCode.ServiceUnavailable;
+				context.Response.Headers.Append("Retry-After", "5");
+				break;
+			case HttpAuthenticationRequestStatus.Unauthenticated:
+			default:
+				await AddHttp1ChallengeHeaders(context);
+				break;
+		}
+	}
+
+	private async Task HandleAsGrpcAsync(HttpContext context, RequestDelegate next) {
+		var (status, principal) = TrySelectProvider(context, out var authenticationRequest)
+			? await authenticationRequest.AuthenticateAsync()
+			: (HttpAuthenticationRequestStatus.Unauthenticated, default);
+
+		GrpcProtocolHelpers.AddProtocolHeaders(context.Response);
+		var trailersDestination = GrpcProtocolHelpers.GetTrailersDestination(context.Response);
+
+		Status grpcStatus;
+		switch (status) {
+			case HttpAuthenticationRequestStatus.Authenticated:
+				context.User = principal;
+				await next(context);
+				return;
+			case HttpAuthenticationRequestStatus.Error:
+				grpcStatus = new Status(StatusCode.Unknown, "Internal server error");
+				break;
+			case HttpAuthenticationRequestStatus.NotReady:
+				// negative RetryPushbackHeader asks the grpc client not to retry the request.
+				// the user is then explicit about what retries they want and aware of the delays incurred
+				trailersDestination.Append(GrpcProtocolHelpers.RetryPushbackHeader, "-1");
+				grpcStatus = new Status(StatusCode.Unavailable, "Server not ready");
+				break;
+			case HttpAuthenticationRequestStatus.Unauthenticated:
+			default:
+				grpcStatus = new Status(StatusCode.Unauthenticated, "Unauthenticated");
+				break;
+		}
+
+		GrpcProtocolHelpers.SetStatus(trailersDestination, grpcStatus);
+
+		// Immediately send remaining response content and trailers
+		// If feature is null then reset/abort will still end request, but response won't have trailers
+		var completionFeature = context.Features.Get<IHttpResponseBodyFeature>();
+		if (completionFeature != null) {
+			await completionFeature.CompleteAsync();
+		}
+	}
+
+	private bool TrySelectProvider(HttpContext context, out HttpAuthenticationRequest authenticationRequest) {
+		for (int i = 0; i < _httpAuthenticationProviders.Count; i++) {
+			if (_httpAuthenticationProviders[i].Authenticate(context, out authenticationRequest)) {
+				return true;
+			}
+		}
+
+		authenticationRequest = default;
+		return false;
+	}
+
+	private async Task AddHttp1ChallengeHeaders(HttpContext context) {
+		context.Response.StatusCode = HttpStatusCode.Unauthorized;
+		var authSchemes = _authenticationProvider.GetSupportedAuthenticationSchemes();
+		// ReSharper disable once ConditionIsAlwaysTrueOrFalse
+		if (authSchemes != null && authSchemes.Any()) {
+			//add "X-" in front to prevent any default browser behaviour e.g Basic Auth popups
+			context.Response.Headers.Append("WWW-Authenticate", $"X-{authSchemes.First()} realm=\"ESDB\"");
+			var properties = _authenticationProvider.GetPublicProperties();
+			// ReSharper disable once ConditionIsAlwaysTrueOrFalse
+			if (properties != null && properties.Any()) {
+				await context.Response.WriteAsync(JsonConvert.SerializeObject(properties));
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/AuthorizationLevel.cs b/src/KurrentDB.Core/Services/Transport/Http/AuthorizationLevel.cs
new file mode 100644
index 00000000000..245df68f8e6
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/AuthorizationLevel.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public enum AuthorizationLevel {
+	None,
+	User,
+	Ops,
+	Admin
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/AuthorizationMiddleware.cs b/src/KurrentDB.Core/Services/Transport/Http/AuthorizationMiddleware.cs
new file mode 100644
index 00000000000..db94fa95633
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/AuthorizationMiddleware.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Transport.Http;
+using Microsoft.AspNetCore.Http;
+using Serilog;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public class AuthorizationMiddleware(IAuthorizationProvider authorization) : IMiddleware {
+	private static readonly ILogger Log = Serilog.Log.ForContext<AuthorizationMiddleware>();
+
+	public async Task InvokeAsync(HttpContext context, RequestDelegate next) {
+		if (InternalHttpHelper.TryGetInternalContext(context, out var manager, out var match, out _)) {
+			if (await authorization.CheckAccessAsync(manager.User, match.ControllerAction.Operation(match.TemplateMatch), context.RequestAborted)) {
+				await next(context);
+				return;
+			}
+
+			context.Response.StatusCode = HttpStatusCode.Unauthorized;
+			return;
+		}
+
+		Log.Error("Failed to get internal http components for request {requestId}", context.TraceIdentifier);
+		context.Response.StatusCode = HttpStatusCode.InternalServerError;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/AutoEventConverter.cs b/src/KurrentDB.Core/Services/Transport/Http/AutoEventConverter.cs
new file mode 100644
index 00000000000..012ed72f6e6
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/AutoEventConverter.cs
@@ -0,0 +1,171 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Xml.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.Codecs;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Serilog;
+using Serilog.Core;
+using Formatting = Newtonsoft.Json.Formatting;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public static class AutoEventConverter {
+	private static readonly ILogger Log = Serilog.Log.ForContext(Constants.SourceContextPropertyName, "AutoEventConverter");
+
+	public static object SmartFormat(ResolvedEvent evnt, ICodec targetCodec) {
+		var dto = CreateDataDto(evnt);
+
+		switch (targetCodec.ContentType) {
+			case ContentType.Raw:
+				return evnt.Event.Data.ToArray();
+			case ContentType.Xml:
+			case ContentType.ApplicationXml: {
+				if (evnt.Event.Data.IsEmpty)
+					return "<data />";
+
+				var serializeObject = JsonConvert.SerializeObject(dto.data);
+				var deserializeXmlNode = JsonConvert.DeserializeXmlNode(serializeObject, "data");
+				return deserializeXmlNode.InnerXml;
+			}
+			case ContentType.Json:
+				return targetCodec.To(dto.data);
+			case ContentType.Atom:
+			case ContentType.EventXml: {
+				var serializeObject = JsonConvert.SerializeObject(dto);
+				var deserializeXmlNode = JsonConvert.DeserializeXmlNode(serializeObject, "event");
+				return deserializeXmlNode.InnerXml;
+			}
+			case ContentType.EventJson:
+			case ContentType.LegacyEventJson:
+				return targetCodec.To(dto);
+			default:
+				throw new NotSupportedException();
+		}
+	}
+
+	public static HttpClientMessageDto.ReadEventCompletedText CreateDataDto(ResolvedEvent evnt) {
+		var dto = new HttpClientMessageDto.ReadEventCompletedText(evnt);
+		if (evnt.Event.Flags.HasFlag(PrepareFlags.IsJson)) {
+			var deserializedData = Codec.Json.From<object>((string)dto.data);
+			var deserializedMetadata = Codec.Json.From<object>((string)dto.metadata);
+
+			if (deserializedData != null)
+				dto.data = deserializedData;
+			if (deserializedMetadata != null)
+				dto.metadata = deserializedMetadata;
+		}
+
+		return dto;
+	}
+
+	//TODO GFY THERE IS WAY TOO MUCH COPYING/SERIALIZING/DESERIALIZING HERE!
+	public static Event[] SmartParse(byte[] request, ICodec sourceCodec, Guid includedId,
+		string includedType = null) {
+		switch (sourceCodec.ContentType) {
+			case ContentType.Raw:
+				return LoadRaw(request, includedId, includedType);
+			case ContentType.Json:
+				return LoadRaw(sourceCodec.Encoding.GetString(request), true, includedId, includedType);
+			case ContentType.EventJson:
+			case ContentType.LegacyEventJson:
+			case ContentType.EventsJson:
+			case ContentType.LegacyEventsJson:
+			case ContentType.AtomJson:
+			case ContentType.LegacyAtomJson:
+				var writeEvents = LoadFromJson(sourceCodec.Encoding.GetString(request));
+				return writeEvents.IsEmpty() ? null : Parse(writeEvents);
+			case ContentType.ApplicationXml:
+			case ContentType.Xml:
+				return LoadRaw(sourceCodec.Encoding.GetString(request), false, includedId, includedType);
+			case ContentType.EventXml:
+			case ContentType.EventsXml:
+			case ContentType.Atom:
+				var writeEvents2 = LoadFromXml(sourceCodec.Encoding.GetString(request));
+				return writeEvents2.IsEmpty() ? null : Parse(writeEvents2);
+			default:
+				return null;
+		}
+	}
+
+	private static Event[] LoadRaw(byte[] data, Guid includedId, string includedType) {
+		var ret = new Event[1];
+		ret[0] = new Event(includedId, includedType, false, data, null);
+		return ret;
+	}
+
+	private static Event[] LoadRaw(string data, bool isJson, Guid includedId, string includedType) {
+		var ret = new Event[1];
+		ret[0] = new Event(includedId, includedType, isJson, data, null);
+		return ret;
+	}
+
+	private static HttpClientMessageDto.ClientEventDynamic[] LoadFromJson(string json) {
+		return Codec.Json.From<HttpClientMessageDto.ClientEventDynamic[]>(json);
+	}
+
+	private static HttpClientMessageDto.ClientEventDynamic[] LoadFromXml(string xml) {
+		try {
+			XDocument doc = XDocument.Parse(xml);
+			XNamespace jsonNsValue = "http://james.newtonking.com/projects/json";
+			XName jsonNsName = XNamespace.Xmlns + "json";
+
+			doc.Root.SetAttributeValue(jsonNsName, jsonNsValue);
+
+			var events = doc.Root.Elements();
+			foreach (var @event in events) {
+				@event.Name = "events";
+				@event.SetAttributeValue(jsonNsValue + "Array", "true");
+			}
+
+			var json = JsonConvert.SerializeXNode(doc.Root, Formatting.None, true);
+			var root = JsonConvert.DeserializeObject<HttpClientMessageDto.WriteEventsDynamic>(json);
+			return root.events;
+		} catch (Exception e) {
+			Log.Information(e, "Failed to load xml. Invalid format");
+			return null;
+		}
+	}
+
+	private static Event[] Parse(HttpClientMessageDto.ClientEventDynamic[] dynamicEvents) {
+		var events = new Event[dynamicEvents.Length];
+		for (int i = 0, n = dynamicEvents.Length; i < n; ++i) {
+			var textEvent = dynamicEvents[i];
+			var data = AsBytes(textEvent.data, out var dataIsJson);
+			var metadata = AsBytes(textEvent.metadata, out var metadataIsJson);
+			events[i] = new Event(textEvent.eventId, textEvent.eventType, dataIsJson || metadataIsJson, data, metadata);
+		}
+
+		return events.ToArray();
+	}
+
+	private static byte[] AsBytes(object obj, out bool isJson) {
+		switch (obj) {
+			case JObject or JArray:
+				isJson = true;
+				return Helper.UTF8NoBom.GetBytes(Codec.Json.To(obj));
+			case string s:
+				try {
+					var jsonObject = JsonConvert.DeserializeObject(s);
+					if (jsonObject is not (JObject or JArray))
+						throw new JsonException();
+					isJson = true;
+					return Helper.UTF8NoBom.GetBytes(Codec.Json.To(jsonObject));
+				} catch (JsonException) {
+					isJson = false;
+					return Helper.UTF8NoBom.GetBytes(s);
+				}
+			default:
+				isJson = false;
+				return Helper.UTF8NoBom.GetBytes(string.Empty);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/ClearTextHttpMultiplexingMiddleware.cs b/src/KurrentDB.Core/Services/Transport/Http/ClearTextHttpMultiplexingMiddleware.cs
new file mode 100644
index 00000000000..566962e14c6
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/ClearTextHttpMultiplexingMiddleware.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO.Pipelines;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Connections;
+using Microsoft.AspNetCore.Server.Kestrel.Core;
+using Microsoft.CSharp.RuntimeBinder;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public class ClearTextHttpMultiplexingMiddleware(ConnectionDelegate next) {
+	//HTTP/2 prior knowledge-mode connection preface
+	private static readonly byte[] Http2Preface = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"u8.ToArray(); //PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n
+
+	private static async Task<bool> HasHttp2Preface(PipeReader input) {
+		while (true) {
+			var result = await input.ReadAsync();
+			try {
+				int pos = 0;
+				foreach (var x in result.Buffer) {
+					for (var i = 0; i < x.Span.Length && pos < Http2Preface.Length; i++) {
+						if (Http2Preface[pos] != x.Span[i]) {
+							return false;
+						}
+
+						pos++;
+					}
+
+					if (pos >= Http2Preface.Length) {
+						return true;
+					}
+				}
+
+				if (result.IsCompleted)
+					return false;
+			} finally {
+				input.AdvanceTo(result.Buffer.Start);
+			}
+		}
+	}
+
+	private static void SetProtocols(object target, HttpProtocols protocols) {
+		var field = target.GetType().GetField("_endpointDefaultProtocols", BindingFlags.Instance | BindingFlags.NonPublic);
+		if (field == null)
+			throw new RuntimeBinderException("Couldn't bind to Kestrel _endpointDefaultProtocols field");
+		field.SetValue(target, protocols);
+	}
+
+	public async Task OnConnectAsync(ConnectionContext context) {
+		var hasHttp2Preface = await HasHttp2Preface(context.Transport.Input);
+		SetProtocols(next.Target, hasHttp2Preface ? HttpProtocols.Http2 : HttpProtocols.Http1);
+		await next(context);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Configure.cs b/src/KurrentDB.Core/Services/Transport/Http/Configure.cs
new file mode 100644
index 00000000000..19b96f7536a
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Configure.cs
@@ -0,0 +1,459 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Monitoring;
+using KurrentDB.Core.Services.Transport.Http.Controllers;
+using ContentType = KurrentDB.Transport.Http.ContentType;
+using HttpStatusCode = KurrentDB.Transport.Http.HttpStatusCode;
+using OperationResult = KurrentDB.Core.Messages.OperationResult;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public static class Configure {
+	private const int MaxPossibleAge = 31536000;
+	public static bool DisableHttpCaching = false;
+
+	public static ResponseConfiguration Ok(string contentType) => new(HttpStatusCode.OK, "OK", contentType);
+
+	public static ResponseConfiguration Ok(string contentType,
+		Encoding encoding,
+		string etag,
+		int? cacheSeconds,
+		bool isCachePublic,
+		params KeyValuePair<string, string>[] headers) {
+		var headrs = new List<KeyValuePair<string, string>>(headers);
+		if (DisableHttpCaching) {
+			headrs.Add(new("Cache-Control", "max-age=0, no-cache, must-revalidate"));
+		} else {
+			headrs.Add(new(
+				"Cache-Control",
+				cacheSeconds.HasValue
+					? $"max-age={cacheSeconds}, {(isCachePublic ? "public" : "private")}"
+					: "max-age=0, no-cache, must-revalidate")
+			);
+		}
+
+		headrs.Add(new("Vary", "Accept"));
+		if (etag.IsNotEmptyString())
+			headrs.Add(new("ETag", $"\"{etag}\""));
+		return new(HttpStatusCode.OK, "OK", contentType, encoding, headrs);
+	}
+
+	public static ResponseConfiguration TemporaryRedirect(Uri originalUrl, string targetHost, int targetPort) {
+		var srcBase = new Uri($"{originalUrl.Scheme}://{originalUrl.Host}:{originalUrl.Port}/", UriKind.Absolute);
+		var targetBase = new Uri($"{originalUrl.Scheme}://{targetHost}:{targetPort}/", UriKind.Absolute);
+		var forwardUri = new Uri(targetBase, srcBase.MakeRelativeUri(originalUrl));
+		return new(
+			HttpStatusCode.TemporaryRedirect,
+			"Temporary Redirect",
+			ContentType.PlainText,
+			new KeyValuePair<string, string>("Location", forwardUri.ToString())
+		);
+	}
+
+	public static ResponseConfiguration DenyRequestBecauseReadOnly(Uri originalUrl, string targetHost, int targetPort) {
+		var srcBase = new Uri($"{originalUrl.Scheme}://{originalUrl.Host}:{originalUrl.Port}/", UriKind.Absolute);
+		var targetBase = new Uri($"{originalUrl.Scheme}://{targetHost}:{targetPort}/", UriKind.Absolute);
+		var forwardUri = new Uri(targetBase, srcBase.MakeRelativeUri(originalUrl));
+		return new(
+			HttpStatusCode.InternalServerError,
+			"Operation Not Supported on Read Only Replica",
+			ContentType.PlainText,
+			new KeyValuePair<string, string>("Location", forwardUri.ToString())
+		);
+	}
+
+	public static ResponseConfiguration NotFound() => new(HttpStatusCode.NotFound, "Not Found", ContentType.PlainText);
+
+	public static ResponseConfiguration NotFound(string etag, int? cacheSeconds, bool isCachePublic, string contentType) {
+		var headers = new List<KeyValuePair<string, string>> {
+			new(
+				"Cache-Control",
+				cacheSeconds.HasValue
+					? $"max-age={cacheSeconds}, {(isCachePublic ? "public" : "private")}"
+					: "max-age=0, no-cache, must-revalidate"
+			),
+			new("Vary", "Accept")
+		};
+		if (etag.IsNotEmptyString())
+			headers.Add(new("ETag", $"\"{etag}\""));
+		return new(HttpStatusCode.NotFound, "Not Found", contentType, Helper.UTF8NoBom, headers);
+	}
+
+	public static ResponseConfiguration Gone(string description = null) {
+		return new(HttpStatusCode.Gone, description ?? "Deleted", ContentType.PlainText);
+	}
+
+	public static ResponseConfiguration NotModified() {
+		return new(HttpStatusCode.NotModified, "Not Modified", ContentType.PlainText);
+	}
+
+	public static ResponseConfiguration BadRequest(string description = null) {
+		return new(HttpStatusCode.BadRequest, description ?? "Bad Request", ContentType.PlainText);
+	}
+
+	public static ResponseConfiguration InternalServerError(string description = null) {
+		return new(HttpStatusCode.InternalServerError, description ?? "Internal Server Error", ContentType.PlainText);
+	}
+
+	public static ResponseConfiguration ServiceUnavailable(string description = null) {
+		return new(HttpStatusCode.ServiceUnavailable, description ?? "Service Unavailable", ContentType.PlainText);
+	}
+
+	public static ResponseConfiguration NotImplemented(string description = null) {
+		return new(HttpStatusCode.NotImplemented, description ?? "Not Implemented", ContentType.PlainText);
+	}
+
+	public static ResponseConfiguration Unauthorized(string description = null) {
+		return new(HttpStatusCode.Unauthorized, description ?? "Unauthorized", ContentType.PlainText);
+	}
+
+	public static ResponseConfiguration EventEntry(HttpResponseConfiguratorArgs entity, Message message, bool headEvent) {
+		switch (message) {
+			case ClientMessage.ReadEventCompleted msg:
+				switch (msg.Result) {
+					case ReadEventResult.Success:
+						var codec = entity.ResponseCodec;
+						if (msg.Record.Event == null && msg.Record.Link != null) {
+							return NotFound();
+						}
+
+						if (!headEvent)
+							return Ok(codec.ContentType, codec.Encoding, null, MaxPossibleAge, msg.IsCachePublic);
+
+						var etag = msg.Record.OriginalEvent != null
+							? GetPositionETag(msg.Record.OriginalEventNumber, codec.ContentType)
+							: string.Empty;
+						var cacheSeconds = GetCacheSeconds(msg.StreamMetadata);
+						return Ok(codec.ContentType, codec.Encoding, etag, cacheSeconds, msg.IsCachePublic);
+
+					case ReadEventResult.NotFound:
+					case ReadEventResult.NoStream:
+						return NotFound();
+					case ReadEventResult.StreamDeleted:
+						return Gone();
+					case ReadEventResult.Error:
+						return InternalServerError(msg.Error);
+					case ReadEventResult.AccessDenied:
+						return Unauthorized();
+					default:
+						throw new ArgumentOutOfRangeException();
+				}
+			case ClientMessage.NotHandled notHandled:
+				return HandleNotHandled(entity.RequestedUrl, notHandled);
+			default:
+				return InternalServerError();
+		}
+	}
+
+	public static ResponseConfiguration EventMetadata(HttpResponseConfiguratorArgs entity) {
+		return NotImplemented();
+	}
+
+	public static ResponseConfiguration GetStreamEventsBackward(HttpResponseConfiguratorArgs entity, Message message, bool headOfStream) {
+		switch (message) {
+			case ClientMessage.ReadStreamEventsBackwardCompleted msg:
+				switch (msg.Result) {
+					case ReadStreamResult.Success:
+						var codec = entity.ResponseCodec;
+						if (msg.LastEventNumber >= msg.FromEventNumber && !headOfStream)
+							return Ok(codec.ContentType, codec.Encoding, null, MaxPossibleAge, msg.IsCachePublic);
+						var etag = GetPositionETag(msg.LastEventNumber, codec.ContentType);
+						var cacheSeconds = GetCacheSeconds(msg.StreamMetadata);
+						return Ok(codec.ContentType, codec.Encoding, etag, cacheSeconds, msg.IsCachePublic);
+					case ReadStreamResult.NoStream:
+						return NotFound();
+					case ReadStreamResult.StreamDeleted:
+						return Gone();
+					case ReadStreamResult.NotModified:
+						return NotModified();
+					case ReadStreamResult.Error:
+						return InternalServerError(msg.Error);
+					case ReadStreamResult.AccessDenied:
+						return Unauthorized();
+					default:
+						throw new ArgumentOutOfRangeException();
+				}
+			case ClientMessage.NotHandled notHandled:
+				return HandleNotHandled(entity.RequestedUrl, notHandled);
+			default:
+				return InternalServerError();
+		}
+	}
+
+	public static ResponseConfiguration
+		GetStreamEventsForward(HttpResponseConfiguratorArgs entity, Message message) {
+		switch (message) {
+			case ClientMessage.ReadStreamEventsForwardCompleted msg:
+				switch (msg.Result) {
+					case ReadStreamResult.Success:
+						var codec = entity.ResponseCodec;
+						var etag = GetPositionETag(msg.LastEventNumber, codec.ContentType);
+						var cacheSeconds = GetCacheSeconds(msg.StreamMetadata);
+						return msg.LastEventNumber + 1 >= msg.FromEventNumber + msg.MaxCount
+							? Ok(codec.ContentType, codec.Encoding, null, MaxPossibleAge, msg.IsCachePublic)
+							: Ok(codec.ContentType, codec.Encoding, etag, cacheSeconds, msg.IsCachePublic);
+					case ReadStreamResult.NoStream:
+						return NotFound();
+					case ReadStreamResult.StreamDeleted:
+						return Gone();
+					case ReadStreamResult.NotModified:
+						return NotModified();
+					case ReadStreamResult.Error:
+						return InternalServerError(msg.Error);
+					case ReadStreamResult.AccessDenied:
+						return Unauthorized();
+					default:
+						throw new ArgumentOutOfRangeException();
+				}
+			case ClientMessage.NotHandled notHandled:
+				return HandleNotHandled(entity.RequestedUrl, notHandled);
+			default:
+				return InternalServerError();
+		}
+	}
+
+	public static ResponseConfiguration ReadAllEventsBackwardCompleted(HttpResponseConfiguratorArgs entity, Message message, bool headOfTf) {
+		switch (message) {
+			case ClientMessage.ReadAllEventsBackwardCompleted msg:
+				switch (msg.Result) {
+					case ReadAllResult.Success:
+						var codec = entity.ResponseCodec;
+						if (!headOfTf && msg.CurrentPos.CommitPosition <= msg.TfLastCommitPosition)
+							return Ok(codec.ContentType, codec.Encoding, null, MaxPossibleAge, msg.IsCachePublic);
+						var etag = GetPositionETag(msg.TfLastCommitPosition, codec.ContentType);
+						var cacheSeconds = GetCacheSeconds(msg.StreamMetadata);
+						return Ok(codec.ContentType, codec.Encoding, etag, cacheSeconds, msg.IsCachePublic);
+					case ReadAllResult.NotModified:
+						return NotModified();
+					case ReadAllResult.Error:
+					case ReadAllResult.InvalidPosition:
+						return InternalServerError(msg.Error);
+					case ReadAllResult.AccessDenied:
+						return Unauthorized();
+					default:
+						throw new ArgumentOutOfRangeException();
+				}
+			case ClientMessage.NotHandled notHandled:
+				return HandleNotHandled(entity.RequestedUrl, notHandled);
+			default:
+				return InternalServerError();
+		}
+	}
+
+	public static ResponseConfiguration ReadAllEventsBackwardFilteredCompleted(HttpResponseConfiguratorArgs entity, Message message, bool headOfTf) {
+		switch (message) {
+			case ClientMessage.FilteredReadAllEventsBackwardCompleted msg:
+				switch (msg.Result) {
+					case FilteredReadAllResult.Success:
+						var codec = entity.ResponseCodec;
+						if (!headOfTf && msg.CurrentPos.CommitPosition <= msg.TfLastCommitPosition)
+							return Ok(codec.ContentType, codec.Encoding, null, MaxPossibleAge, msg.IsCachePublic);
+						var etag = GetPositionETag(msg.TfLastCommitPosition, codec.ContentType);
+						var cacheSeconds = GetCacheSeconds(msg.StreamMetadata);
+						return Ok(codec.ContentType, codec.Encoding, etag, cacheSeconds, msg.IsCachePublic);
+					case FilteredReadAllResult.NotModified:
+						return NotModified();
+					case FilteredReadAllResult.Error:
+					case FilteredReadAllResult.InvalidPosition:
+						return InternalServerError(msg.Error);
+					case FilteredReadAllResult.AccessDenied:
+						return Unauthorized();
+					default:
+						throw new ArgumentOutOfRangeException();
+				}
+			case ClientMessage.NotHandled notHandled:
+				return HandleNotHandled(entity.RequestedUrl, notHandled);
+			default:
+				return InternalServerError();
+		}
+	}
+
+	public static ResponseConfiguration ReadAllEventsForwardCompleted(HttpResponseConfiguratorArgs entity, Message message, bool headOfTf) {
+		switch (message) {
+			case ClientMessage.ReadAllEventsForwardCompleted msg:
+				switch (msg.Result) {
+					case ReadAllResult.Success:
+						var codec = entity.ResponseCodec;
+						if (!headOfTf && msg.Events.Count == msg.MaxCount)
+							return Ok(codec.ContentType, codec.Encoding, null, MaxPossibleAge, msg.IsCachePublic);
+						var etag = GetPositionETag(msg.TfLastCommitPosition, codec.ContentType);
+						var cacheSeconds = GetCacheSeconds(msg.StreamMetadata);
+						return Ok(codec.ContentType, codec.Encoding, etag, cacheSeconds, msg.IsCachePublic);
+					case ReadAllResult.NotModified:
+						return NotModified();
+					case ReadAllResult.Error:
+					case ReadAllResult.InvalidPosition:
+						return InternalServerError(msg.Error);
+					case ReadAllResult.AccessDenied:
+						return Unauthorized();
+					default:
+						throw new ArgumentOutOfRangeException();
+				}
+			case ClientMessage.NotHandled notHandled:
+				return HandleNotHandled(entity.RequestedUrl, notHandled);
+			default:
+				return InternalServerError();
+		}
+	}
+
+	public static ResponseConfiguration ReadAllEventsForwardFilteredCompleted(HttpResponseConfiguratorArgs entity, Message message, bool headOfTf) {
+		switch (message) {
+			case ClientMessage.FilteredReadAllEventsForwardCompleted msg:
+				switch (msg.Result) {
+					case FilteredReadAllResult.Success:
+						var codec = entity.ResponseCodec;
+						if (!headOfTf && msg.Events.Count == msg.MaxCount)
+							return Ok(codec.ContentType, codec.Encoding, null, MaxPossibleAge, msg.IsCachePublic);
+						var etag = GetPositionETag(msg.TfLastCommitPosition, codec.ContentType);
+						var cacheSeconds = GetCacheSeconds(msg.StreamMetadata);
+						return Ok(codec.ContentType, codec.Encoding, etag, cacheSeconds, msg.IsCachePublic);
+					case FilteredReadAllResult.NotModified:
+						return NotModified();
+					case FilteredReadAllResult.Error:
+					case FilteredReadAllResult.InvalidPosition:
+						return InternalServerError(msg.Error);
+					case FilteredReadAllResult.AccessDenied:
+						return Unauthorized();
+					default:
+						throw new ArgumentOutOfRangeException();
+				}
+			case ClientMessage.NotHandled notHandled:
+				return HandleNotHandled(entity.RequestedUrl, notHandled);
+			default:
+				return InternalServerError();
+		}
+	}
+
+	public static string GetPositionETag(long position, string contentType) {
+		return $"{position}{AtomController.ETagSeparator}{contentType.GetHashCode()}";
+	}
+
+	private static int? GetCacheSeconds(StreamMetadata metadata) {
+		return metadata is { CacheControl: not null }
+			? (int)metadata.CacheControl.Value.TotalSeconds
+			: null;
+	}
+
+	public static ResponseConfiguration WriteEventsCompleted(HttpResponseConfiguratorArgs entity, Message message,
+		string eventStreamId) {
+		switch (message) {
+			case ClientMessage.WriteEventsCompleted msg:
+				switch (msg.Result) {
+					case OperationResult.Success:
+						var location = HostName.Combine(entity.ResponseUrl, "/streams/{0}/{1}", Uri.EscapeDataString(eventStreamId), msg.FirstEventNumber);
+						return new(HttpStatusCode.Created, "Created", ContentType.PlainText, new KeyValuePair<string, string>("Location", location));
+					case OperationResult.PrepareTimeout:
+					case OperationResult.CommitTimeout:
+					case OperationResult.ForwardTimeout:
+						return InternalServerError("Write timeout");
+					case OperationResult.WrongExpectedVersion:
+						return new(HttpStatusCode.BadRequest, "Wrong expected EventNumber",
+							ContentType.PlainText,
+							new KeyValuePair<string, string>(SystemHeaders.CurrentVersion, msg.CurrentVersion.ToString()),
+							new KeyValuePair<string, string>(SystemHeaders.LegacyCurrentVersion, msg.CurrentVersion.ToString()));
+					case OperationResult.StreamDeleted:
+						return Gone("Stream deleted");
+					case OperationResult.InvalidTransaction:
+						return InternalServerError("Invalid transaction");
+					case OperationResult.AccessDenied:
+						return Unauthorized();
+					default:
+						throw new ArgumentOutOfRangeException();
+				}
+			case ClientMessage.NotHandled notHandled:
+				return HandleNotHandled(entity.RequestedUrl, notHandled);
+			default:
+				return InternalServerError();
+		}
+	}
+
+	public static ResponseConfiguration
+		DeleteStreamCompleted(HttpResponseConfiguratorArgs entity, Message message) {
+		switch (message) {
+			case ClientMessage.DeleteStreamCompleted msg:
+				switch (msg.Result) {
+					case OperationResult.Success:
+						return new(HttpStatusCode.NoContent, "Stream deleted", ContentType.PlainText);
+					case OperationResult.PrepareTimeout:
+					case OperationResult.CommitTimeout:
+					case OperationResult.ForwardTimeout:
+						return InternalServerError("Delete timeout");
+					case OperationResult.WrongExpectedVersion:
+						return new(HttpStatusCode.BadRequest, "Wrong expected EventNumber",
+							ContentType.PlainText,
+							new KeyValuePair<string, string>(SystemHeaders.CurrentVersion, msg.CurrentVersion.ToString()),
+							new KeyValuePair<string, string>(SystemHeaders.LegacyCurrentVersion, msg.CurrentVersion.ToString()));
+					case OperationResult.StreamDeleted:
+						return Gone("Stream deleted");
+					case OperationResult.InvalidTransaction:
+						return InternalServerError("Invalid transaction");
+					case OperationResult.AccessDenied:
+						return Unauthorized();
+					default:
+						throw new ArgumentOutOfRangeException();
+				}
+			case ClientMessage.NotHandled notHandled:
+				return HandleNotHandled(entity.RequestedUrl, notHandled);
+			default:
+				return InternalServerError();
+		}
+	}
+
+	private static ResponseConfiguration HandleNotHandled(Uri requestedUri, ClientMessage.NotHandled notHandled) {
+		switch (notHandled.Reason) {
+			case ClientMessage.NotHandled.Types.NotHandledReason.NotReady:
+				return ServiceUnavailable("Server Is Not Ready");
+			case ClientMessage.NotHandled.Types.NotHandledReason.TooBusy:
+				return ServiceUnavailable("Server Is Too Busy");
+			case ClientMessage.NotHandled.Types.NotHandledReason.NotLeader: {
+				var leaderInfo = notHandled.LeaderInfo;
+				return leaderInfo == null
+					? InternalServerError("No leader info available in response")
+					: TemporaryRedirect(requestedUri, leaderInfo.Http.GetHost(), leaderInfo.Http.GetPort());
+			}
+			case ClientMessage.NotHandled.Types.NotHandledReason.IsReadOnly: {
+				var leaderInfo = notHandled.LeaderInfo;
+				return leaderInfo == null
+					? InternalServerError("No leader info available in response")
+					: DenyRequestBecauseReadOnly(requestedUri, leaderInfo.Http.GetHost(), leaderInfo.Http.GetPort());
+			}
+			default:
+				return InternalServerError($"Unknown not handled reason: {notHandled.Reason}");
+		}
+	}
+
+	public static ResponseConfiguration GetFreshStatsCompleted(HttpResponseConfiguratorArgs entity, Message message) {
+		if (message is not MonitoringMessage.GetFreshStatsCompleted completed)
+			return InternalServerError();
+
+		var cacheSeconds = (int)MonitoringService.MemoizePeriod.TotalSeconds;
+		return completed.Success
+			? Ok(entity.ResponseCodec.ContentType, Helper.UTF8NoBom, null, cacheSeconds, isCachePublic: true)
+			: NotFound();
+	}
+
+	public static ResponseConfiguration GetReplicationStatsCompleted(HttpResponseConfiguratorArgs entity, Message message) {
+		if (message is not ReplicationMessage.GetReplicationStatsCompleted)
+			return InternalServerError();
+
+		var cacheSeconds = (int)MonitoringService.MemoizePeriod.TotalSeconds;
+		return Ok(entity.ResponseCodec.ContentType, Helper.UTF8NoBom, null, cacheSeconds, isCachePublic: true);
+	}
+
+	public static ResponseConfiguration GetFreshTcpConnectionStatsCompleted(HttpResponseConfiguratorArgs entity, Message message) {
+		if (message is not MonitoringMessage.GetFreshTcpConnectionStatsCompleted)
+			return InternalServerError();
+
+		var cacheSeconds = (int)MonitoringService.MemoizePeriod.TotalSeconds;
+		return Ok(entity.ResponseCodec.ContentType, Helper.UTF8NoBom, null, cacheSeconds, isCachePublic: true);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/ControllerAction.cs b/src/KurrentDB.Core/Services/Transport/Http/ControllerAction.cs
new file mode 100644
index 00000000000..51c7d0613fc
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/ControllerAction.cs
@@ -0,0 +1,71 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Transport.Http;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public class ControllerAction {
+	public readonly string UriTemplate;
+	public readonly string HttpMethod;
+	public readonly Func<UriTemplateMatch, Operation> Operation;
+	public readonly ICodec[] SupportedRequestCodecs;
+	public readonly ICodec[] SupportedResponseCodecs;
+	public readonly ICodec DefaultResponseCodec;
+
+	public ControllerAction(string uriTemplate,
+		string httpMethod,
+		ICodec[] requestCodecs,
+		ICodec[] responseCodecs,
+		Operation operation) : this(uriTemplate, httpMethod, requestCodecs, responseCodecs, _ => operation) {
+	}
+
+	public ControllerAction(
+		string uriTemplate,
+		string httpMethod,
+		ICodec[] requestCodecs,
+		ICodec[] responseCodecs,
+		Func<UriTemplateMatch, Operation> operation) {
+		UriTemplate = Ensure.NotNull(uriTemplate);
+		HttpMethod = Ensure.NotNull(httpMethod);
+		Operation = operation;
+		SupportedRequestCodecs = Ensure.NotNull(requestCodecs);
+		SupportedResponseCodecs = Ensure.NotNull(responseCodecs);
+		DefaultResponseCodec = responseCodecs.Length > 0 ? responseCodecs[0] : null;
+	}
+
+	public bool Equals(ControllerAction other) {
+		if (ReferenceEquals(null, other))
+			return false;
+		if (ReferenceEquals(this, other))
+			return true;
+		return Equals(other.UriTemplate, UriTemplate) && Equals(other.HttpMethod, HttpMethod);
+	}
+
+	public override bool Equals(object obj) {
+		if (ReferenceEquals(null, obj))
+			return false;
+		if (ReferenceEquals(this, obj))
+			return true;
+		if (obj.GetType() != typeof(ControllerAction))
+			return false;
+		return Equals((ControllerAction)obj);
+	}
+
+	public override int GetHashCode() {
+		unchecked {
+			return (UriTemplate.GetHashCode() * 397) ^ HttpMethod.GetHashCode();
+		}
+	}
+
+	public override string ToString() {
+		return string.Format("UriTemplate: {0}, HttpMethod: {1}, SupportedCodecs: {2}, DefaultCodec: {3}",
+			UriTemplate,
+			HttpMethod,
+			SupportedResponseCodecs,
+			DefaultResponseCodec);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Controllers/AdminController.cs b/src/KurrentDB.Core/Services/Transport/Http/Controllers/AdminController.cs
new file mode 100644
index 00000000000..3cc496ee392
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Controllers/AdminController.cs
@@ -0,0 +1,584 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Security.Claims;
+using System.Text;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.Atom;
+using KurrentDB.Transport.Http.Codecs;
+using KurrentDB.Transport.Http.EntityManagement;
+using Microsoft.Extensions.Primitives;
+using Serilog;
+
+namespace KurrentDB.Core.Services.Transport.Http.Controllers;
+
+public class AdminController : CommunicationController {
+	private readonly IPublisher _networkSendQueue;
+	private static readonly ILogger Log = Serilog.Log.ForContext<AdminController>();
+
+	private static readonly ICodec[] SupportedCodecs = new ICodec[]
+		{Codec.Text, Codec.Json, Codec.Xml, Codec.ApplicationXml};
+
+	private static readonly ICodec[] SupportedStreamCodecs = new ICodec[] {
+		Codec.DescriptionJson,
+		Codec.LegacyDescriptionJson,
+		Codec.Text,
+		Codec.Json,
+		Codec.Xml,
+		Codec.ApplicationXml
+	};
+
+	public static readonly char[] ETagSeparatorArray = { ';' };
+
+	private static readonly Func<UriTemplateMatch, Operation> ReadStreamOperationForScavengeStream =
+		ForScavengeStream(Operations.Streams.Read);
+	public AdminController(IPublisher publisher, IPublisher networkSendQueue) : base(publisher) {
+		_networkSendQueue = networkSendQueue;
+	}
+
+	protected override void SubscribeCore(IHttpService service) {
+		service.RegisterAction(
+			new ControllerAction("/admin/shutdown", HttpMethod.Post, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Shutdown)),
+			OnPostShutdown);
+		service.RegisterAction(
+			new ControllerAction("/admin/reloadconfig", HttpMethod.Post, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.ReloadConfiguration)),
+			OnPostReloadConfig);
+		service.RegisterAction(
+			new ControllerAction("/admin/scavenge?startFromChunk={startFromChunk}&threads={threads}&threshold={threshold}&throttlePercent={throttlePercent}&syncOnly={syncOnly}",
+				HttpMethod.Post, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Scavenge.Start)), OnPostScavenge);
+		service.RegisterAction(
+			new ControllerAction("/admin/scavenge/{scavengeId}", HttpMethod.Delete, Codec.NoCodecs,
+				SupportedCodecs, new Operation(Operations.Node.Scavenge.Stop)), OnStopScavenge);
+		service.RegisterAction(
+			new ControllerAction("/admin/scavenge/current", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Scavenge.Read)),
+			OnGetCurrentScavenge);
+		service.RegisterAction(
+			new ControllerAction("/admin/scavenge/last", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Scavenge.Read)),
+			OnGetLastScavenge);
+		service.RegisterAction(
+			new ControllerAction("/admin/mergeindexes", HttpMethod.Post, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.MergeIndexes)),
+			OnPostMergeIndexes);
+		service.RegisterAction(
+			new ControllerAction("/admin/node/priority/{nodePriority}", HttpMethod.Post, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.SetPriority)),
+			OnSetNodePriority);
+		service.RegisterAction(
+			new ControllerAction("/admin/node/resign", HttpMethod.Post, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Resign)),
+			OnResignNode);
+		service.RegisterAction(
+			new ControllerAction("/admin/login", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Login)),
+			OnGetLogin);
+		Register(service, "/streams/$scavenges/{scavengeId}/{event}/{count}?embed={embed}", HttpMethod.Get, GetStreamEventsBackwardScavenges, Codec.NoCodecs,
+			SupportedStreamCodecs, ReadStreamOperationForScavengeStream);
+		Register(service, "/streams/$scavenges?embed={embed}", HttpMethod.Get, GetStreamEventsBackwardScavenges, Codec.NoCodecs,
+			SupportedStreamCodecs, ReadStreamOperationForScavengeStream);
+	}
+
+	private static Func<UriTemplateMatch, Operation> ForScavengeStream(OperationDefinition definition) {
+		return match => {
+			var operation = new Operation(definition);
+			var stream = "$scavenges";
+			var scavengeId = match.BoundVariables["scavengeId"];
+			if (scavengeId != null)
+				stream = stream + "-" + scavengeId;
+
+			if (!string.IsNullOrEmpty(stream)) {
+				return operation.WithParameter(Operations.Streams.Parameters.StreamId(stream));
+			}
+
+			return operation;
+		};
+	}
+
+	private void OnPostShutdown(HttpEntityManager entity, UriTemplateMatch match) {
+		if (entity.User != null &&
+			(entity.User.LegacyRoleCheck(SystemRoles.Admins) || entity.User.LegacyRoleCheck(SystemRoles.Operations))) {
+			Log.Information("Request shut down of node because shutdown command has been received.");
+			Publish(new ClientMessage.RequestShutdown(exitProcess: true, shutdownHttp: true));
+			entity.ReplyStatus(HttpStatusCode.OK, "OK", LogReplyError);
+		} else {
+			entity.ReplyStatus(HttpStatusCode.Unauthorized, "Unauthorized", LogReplyError);
+		}
+	}
+
+	private void OnPostReloadConfig(HttpEntityManager entity, UriTemplateMatch match) {
+		if (entity.User != null &&
+			(entity.User.LegacyRoleCheck(SystemRoles.Admins) || entity.User.LegacyRoleCheck(SystemRoles.Operations))) {
+			Log.Information("Reloading the node's configuration since a request has been received on /admin/reloadconfig.");
+			Publish(new ClientMessage.ReloadConfig());
+			entity.ReplyStatus(HttpStatusCode.OK, "OK", LogReplyError);
+		} else {
+			entity.ReplyStatus(HttpStatusCode.Unauthorized, "Unauthorized", LogReplyError);
+		}
+	}
+
+	private void OnPostMergeIndexes(HttpEntityManager entity, UriTemplateMatch match) {
+		Log.Information("Request merge indexes because /admin/mergeindexes request has been received.");
+
+		var correlationId = Guid.NewGuid();
+		var envelope = new SendToHttpEnvelope(_networkSendQueue, entity,
+			(e, message) => { return e.ResponseCodec.To(new MergeIndexesResultDto(correlationId.ToString())); },
+			(e, message) => {
+				var completed = message as ClientMessage.MergeIndexesResponse;
+				switch (completed?.Result) {
+					case ClientMessage.MergeIndexesResponse.MergeIndexesResult.Started:
+						return Configure.Ok(e.ResponseCodec.ContentType);
+					default:
+						return Configure.InternalServerError();
+				}
+			}
+		);
+
+		Publish(new ClientMessage.MergeIndexes(envelope, correlationId, entity.User));
+	}
+
+	private void OnPostScavenge(HttpEntityManager entity, UriTemplateMatch match) {
+		int startFromChunk = 0;
+		var startFromChunkVariable = match.BoundVariables["startFromChunk"];
+		if (startFromChunkVariable != null) {
+			if (!int.TryParse(startFromChunkVariable, out startFromChunk) || startFromChunk < 0) {
+				SendBadRequest(entity, "startFromChunk must be a positive integer");
+				return;
+			}
+		}
+
+		int threads = 1;
+		var threadsVariable = match.BoundVariables["threads"];
+		if (threadsVariable != null) {
+			if (!int.TryParse(threadsVariable, out threads) || threads < 1) {
+				SendBadRequest(entity, "threads must be a 1 or above");
+				return;
+			}
+		}
+
+		int? threshold = null;
+		var thresholdVariable = match.BoundVariables["threshold"];
+		if (thresholdVariable != null) {
+			if (!int.TryParse(thresholdVariable, out var x)) {
+				SendBadRequest(entity, "threshold must be an integer");
+				return;
+			}
+
+			threshold = x;
+		}
+
+		int? throttlePercent = null;
+		var throttlePercentVariable = match.BoundVariables["throttlePercent"];
+		if (throttlePercentVariable != null) {
+			if (!int.TryParse(throttlePercentVariable, out var x) || x <= 0 || x > 100) {
+				SendBadRequest(entity, "throttlePercent must be between 1 and 100 inclusive");
+				return;
+			}
+
+			if (x != 100 && threads > 1) {
+				SendBadRequest(entity, "throttlePercent must be 100 for a multi-threaded scavenge");
+				return;
+			}
+
+			throttlePercent = x;
+		}
+
+		var syncOnly = false;
+		var syncOnlyVariable = match.BoundVariables["syncOnly"];
+		if (syncOnlyVariable != null) {
+			if (!bool.TryParse(syncOnlyVariable, out var x)) {
+				SendBadRequest(entity, "syncOnly must be a boolean");
+				return;
+			}
+
+			syncOnly = x;
+		}
+
+		var sb = new StringBuilder();
+		var args = new List<object>();
+
+		sb.Append("Request scavenging because /admin/scavenge");
+		sb.Append("?startFromChunk={chunkStartNumber}");
+		args.Add(startFromChunk);
+		sb.Append("&threads={numThreads}");
+		args.Add(threads);
+
+		if (threshold != null) {
+			sb.Append("&threshold={threshold}");
+			args.Add(threshold);
+		}
+
+		if (throttlePercent != null) {
+			sb.Append("&throttlePercent={throttlePercent}");
+			args.Add(throttlePercent);
+		}
+
+		sb.Append("&syncOnly={syncOnly}");
+		args.Add(syncOnly);
+
+		sb.Append(" request has been received.");
+		Log.Information(sb.ToString(), args.ToArray());
+
+		var envelope = new SendToHttpEnvelope<ClientMessage.ScavengeDatabaseStartedResponse>(_networkSendQueue, entity, (e, message) => {
+			return e.To(new ScavengeResultDto(message?.ScavengeId));
+		},
+			(e, message) => {
+				return Configure.Ok(e.ContentType);
+			}, CreateErrorEnvelope(entity)
+		);
+
+		Publish(new ClientMessage.ScavengeDatabase(
+			envelope: envelope,
+			correlationId: Guid.Empty,
+			user: entity.User,
+			startFromChunk: startFromChunk,
+			threads: threads,
+			threshold: threshold,
+			throttlePercent: throttlePercent,
+			syncOnly: syncOnly));
+	}
+
+	private void OnStopScavenge(HttpEntityManager entity, UriTemplateMatch match) {
+		var scavengeId = match.BoundVariables["scavengeId"];
+
+		Log.Information("Stopping scavenge because /admin/scavenge/{scavengeId} DELETE request has been received.",
+			scavengeId);
+
+		var envelope = new SendToHttpEnvelope<ClientMessage.ScavengeDatabaseStoppedResponse>(_networkSendQueue, entity, (e, message) => {
+			return e.To(message?.ScavengeId);
+		},
+			(e, message) => {
+				return Configure.Ok(e.ContentType);
+			}, CreateErrorEnvelope(entity)
+		);
+
+		Publish(new ClientMessage.StopDatabaseScavenge(envelope, Guid.Empty, entity.User, scavengeId));
+	}
+
+	private void OnGetCurrentScavenge(HttpEntityManager entity, UriTemplateMatch match) {
+		Log.Information("/admin/scavenge/current GET request has been received.");
+
+		var envelope = new SendToHttpEnvelope<ClientMessage.ScavengeDatabaseGetCurrentResponse>(
+			_networkSendQueue,
+			entity,
+			(e, message) => {
+				var result = new ScavengeGetCurrentResultDto();
+
+				if (message is not null &&
+					message.Result == ClientMessage.ScavengeDatabaseGetCurrentResponse.ScavengeResult.InProgress &&
+					message.ScavengeId is not null) {
+
+					result.ScavengeId = message.ScavengeId;
+					result.ScavengeLink = $"/admin/scavenge/{message.ScavengeId}";
+				}
+
+				return e.To(result);
+			},
+			(e, message) => {
+				return Configure.Ok(e.ContentType);
+			}, CreateErrorEnvelope(entity)
+		);
+
+		Publish(new ClientMessage.GetCurrentDatabaseScavenge(envelope, Guid.Empty, entity.User));
+	}
+
+	private void OnGetLastScavenge(HttpEntityManager entity, UriTemplateMatch match) {
+		Log.Information("/admin/scavenge/last GET request has been received.");
+
+		var envelope = new SendToHttpEnvelope<ClientMessage.ScavengeDatabaseGetLastResponse>(
+			_networkSendQueue,
+			entity,
+			(e, message) => {
+				var result = new ScavengeGetLastResultDto();
+				if (message.ScavengeId is not null) {
+					result.ScavengeId = message.ScavengeId;
+					result.ScavengeLink = $"/admin/scavenge/{message.ScavengeId}";
+				}
+				result.ScavengeResult = message.Result.ToString();
+
+				return e.To(result);
+			},
+			(e, message) => {
+				return Configure.Ok(e.ContentType);
+			}, CreateErrorEnvelope(entity)
+		);
+
+		Publish(new ClientMessage.GetLastDatabaseScavenge(envelope, Guid.Empty, entity.User));
+	}
+
+	private void OnSetNodePriority(HttpEntityManager entity, UriTemplateMatch match) {
+		if (entity.User != null &&
+			(entity.User.LegacyRoleCheck(SystemRoles.Admins) || entity.User.LegacyRoleCheck(SystemRoles.Operations))) {
+			Log.Information("Request to set node priority.");
+
+			int nodePriority;
+			var nodePriorityVariable = match.BoundVariables["nodePriority"];
+			if (nodePriorityVariable == null) {
+				SendBadRequest(entity, "Could not find expected `nodePriority` in the request body.");
+				return;
+			}
+
+			if (!int.TryParse(nodePriorityVariable, out nodePriority)) {
+				SendBadRequest(entity, "nodePriority must be an integer.");
+				return;
+			}
+
+			Publish(new ClientMessage.SetNodePriority(nodePriority));
+			entity.ReplyStatus(HttpStatusCode.OK, "OK", LogReplyError);
+		} else {
+			entity.ReplyStatus(HttpStatusCode.Unauthorized, "Unauthorized", LogReplyError);
+		}
+	}
+
+	private void OnResignNode(HttpEntityManager entity, UriTemplateMatch match) {
+		if (entity.User != null &&
+			(entity.User.LegacyRoleCheck(SystemRoles.Admins) || entity.User.LegacyRoleCheck(SystemRoles.Operations))) {
+			Log.Information("Request to resign node.");
+			Publish(new ClientMessage.ResignNode());
+			entity.ReplyStatus(HttpStatusCode.OK, "OK", LogReplyError);
+		} else {
+			entity.ReplyStatus(HttpStatusCode.Unauthorized, "Unauthorized", LogReplyError);
+		}
+	}
+
+	private void OnGetLogin(HttpEntityManager entity, UriTemplateMatch match) {
+		var message = new UserManagementMessage.UserDetailsResult(
+			new UserManagementMessage.UserData(
+				entity.User.Identity.Name,
+				entity.User.Identity.Name,
+				entity.User.Claims.Where(x => x.Type == ClaimTypes.Role).Select(x => x.Value).ToArray(),
+				false,
+				new DateTimeOffset(DateTime.UtcNow)));
+
+		entity.ReplyTextContent(
+			message.ToJson(),
+			HttpStatusCode.OK,
+			"",
+			ContentType.Json,
+			new List<KeyValuePair<string, string>>(),
+			e => Log.Error(e, "Error while writing HTTP response"));
+	}
+
+	private IEnvelope CreateErrorEnvelope(HttpEntityManager http) {
+		return new SendToHttpEnvelope<ClientMessage.ScavengeDatabaseInProgressResponse>(
+			_networkSendQueue,
+			http,
+			ScavengeInProgressFormatter,
+			ScavengeInProgressConfigurator,
+			new SendToHttpEnvelope<ClientMessage.ScavengeDatabaseNotFoundResponse>(
+					_networkSendQueue,
+					http,
+					ScavengeNotFoundFormatter,
+					ScavengeNotFoundConfigurator,
+					new SendToHttpEnvelope<ClientMessage.ScavengeDatabaseUnauthorizedResponse>(
+						_networkSendQueue,
+						http,
+						ScavengeUnauthorizedFormatter,
+						ScavengeUnauthorizedConfigurator,
+						null)));
+	}
+
+	private ResponseConfiguration ScavengeInProgressConfigurator(ICodec codec, ClientMessage.ScavengeDatabaseInProgressResponse message) {
+		return new ResponseConfiguration(HttpStatusCode.BadRequest, "Bad Request", ContentType.PlainText, Helper.UTF8NoBom);
+	}
+
+	private string ScavengeInProgressFormatter(ICodec codec, ClientMessage.ScavengeDatabaseInProgressResponse message) {
+		return message.Reason;
+	}
+
+	private ResponseConfiguration ScavengeNotFoundConfigurator(ICodec codec, ClientMessage.ScavengeDatabaseNotFoundResponse message) {
+		return new ResponseConfiguration(HttpStatusCode.NotFound, "Not Found", ContentType.PlainText, Helper.UTF8NoBom);
+	}
+
+	private string ScavengeNotFoundFormatter(ICodec codec, ClientMessage.ScavengeDatabaseNotFoundResponse message) {
+		return message.Reason;
+	}
+
+	private ResponseConfiguration ScavengeUnauthorizedConfigurator(ICodec codec, ClientMessage.ScavengeDatabaseUnauthorizedResponse message) {
+		return new ResponseConfiguration(HttpStatusCode.Unauthorized, "Unauthorized", ContentType.PlainText, Helper.UTF8NoBom);
+	}
+
+	private string ScavengeUnauthorizedFormatter(ICodec codec, ClientMessage.ScavengeDatabaseUnauthorizedResponse message) {
+		return message.Reason;
+	}
+
+	private void LogReplyError(Exception exc) {
+		Log.Debug("Error while closing HTTP connection (admin controller): {e}.", exc.Message);
+	}
+	private bool GetDescriptionDocument(HttpEntityManager manager, UriTemplateMatch match) {
+		if (manager.ResponseCodec.ContentType == ContentType.DescriptionDocJson ||
+			manager.ResponseCodec.ContentType == ContentType.LegacyDescriptionDocJson) {
+			var stream = match.BoundVariables["stream"];
+			var accepts = (manager.HttpEntity.Request.AcceptTypes?.Length ?? 0) == 0 ||
+						  manager.HttpEntity.Request.AcceptTypes.Contains(ContentType.Any);
+			var responseStatusCode = accepts ? HttpStatusCode.NotAcceptable : HttpStatusCode.OK;
+			var responseMessage = manager.HttpEntity.Request.AcceptTypes == null
+				? "We are unable to represent the stream in the format requested."
+				: "Description Document";
+			var envelope = new SendToHttpEnvelope(
+				_networkSendQueue, manager,
+				(args, message) => {
+					var m = message as MonitoringMessage.GetPersistentSubscriptionStatsCompleted;
+					if (m == null)
+						throw new Exception("Could not get subscriptions for stream " + stream);
+
+					string[] persistentSubscriptionGroups = null;
+					if (m.Result == MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus
+							.Success) {
+						persistentSubscriptionGroups = m.SubscriptionStats.Select(x => x.GroupName).ToArray();
+					}
+
+					manager.ReplyTextContent(
+						Format.GetDescriptionDocument(manager, stream, persistentSubscriptionGroups),
+						responseStatusCode, responseMessage,
+						manager.ResponseCodec.ContentType,
+						null,
+						e => Log.Error(e, "Error while writing HTTP response"));
+					return String.Empty;
+				},
+				(args, message) => new ResponseConfiguration(HttpStatusCode.OK, manager.ResponseCodec.ContentType,
+					manager.ResponseCodec.Encoding));
+			var cmd = new MonitoringMessage.GetStreamPersistentSubscriptionStats(envelope, stream);
+			Publish(cmd);
+			return true;
+		}
+
+		return false;
+	}
+	private void GetStreamEventsBackwardScavenges(HttpEntityManager manager, UriTemplateMatch match) {
+		if (GetDescriptionDocument(manager, match))
+			return;
+		var stream = "$scavenges";
+		var evNum = match.BoundVariables["event"];
+		var cnt = match.BoundVariables["count"];
+		var scavengeId = match.BoundVariables["scavengeId"];
+
+		long eventNumber = -1;
+		int count = AtomSpecs.FeedPageSize;
+		var embed = GetEmbedLevel(manager, match);
+
+		if (scavengeId != null)
+			stream = stream + "-" + scavengeId;
+
+		if (stream.IsEmptyString()) {
+			SendBadRequest(manager, string.Format("Invalid stream name '{0}'", stream));
+			return;
+		}
+
+		if (evNum != null && evNum != "head" && (!long.TryParse(evNum, out eventNumber) || eventNumber < 0)) {
+			SendBadRequest(manager, string.Format("'{0}' is not valid event number", evNum));
+			return;
+		}
+
+		if (cnt.IsNotEmptyString() && (!int.TryParse(cnt, out count) || count <= 0)) {
+			SendBadRequest(manager, string.Format("'{0}' is not valid count. Should be positive integer", cnt));
+			return;
+		}
+
+		bool resolveLinkTos;
+		if (!GetResolveLinkTos(manager, out resolveLinkTos, true)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.ResolveLinkTos));
+			return;
+		}
+
+		if (!GetRequireLeader(manager, out var requireLeader)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
+			return;
+		}
+
+		bool headOfStream = eventNumber == -1;
+		GetStreamEventsBackward(manager, stream, eventNumber, count, resolveLinkTos, requireLeader, headOfStream,
+			embed);
+	}
+	private void GetStreamEventsBackward(HttpEntityManager manager, string stream, long eventNumber, int count,
+		bool resolveLinkTos, bool requireLeader, bool headOfStream, EmbedLevel embed) {
+		var envelope = new SendToHttpEnvelope(_networkSendQueue,
+			manager,
+			(ent, msg) =>
+				Format.GetStreamEventsBackward(ent, msg, embed, headOfStream),
+			(args, msg) => Configure.GetStreamEventsBackward(args, msg, headOfStream));
+		var corrId = Guid.NewGuid();
+		Publish(new ClientMessage.ReadStreamEventsBackward(corrId, corrId, envelope, stream, eventNumber, count,
+			resolveLinkTos, requireLeader, GetETagStreamVersion(manager), manager.User));
+	}
+	private static EmbedLevel GetEmbedLevel(HttpEntityManager manager, UriTemplateMatch match,
+		EmbedLevel htmlLevel = EmbedLevel.PrettyBody) {
+		if (manager.ResponseCodec is IRichAtomCodec)
+			return htmlLevel;
+		var rawValue = match.BoundVariables["embed"] ?? string.Empty;
+		switch (rawValue.ToLowerInvariant()) {
+			case "content":
+				return EmbedLevel.Content;
+			case "rich":
+				return EmbedLevel.Rich;
+			case "body":
+				return EmbedLevel.Body;
+			case "pretty":
+				return EmbedLevel.PrettyBody;
+			case "tryharder":
+				return EmbedLevel.TryHarder;
+			default:
+				return EmbedLevel.None;
+		}
+	}
+	private bool GetResolveLinkTos(HttpEntityManager manager, out bool resolveLinkTos, bool defaultOption = false) {
+		resolveLinkTos = defaultOption;
+		var linkToHeader = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.ResolveLinkTos);
+		if (StringValues.IsNullOrEmpty(linkToHeader))
+			linkToHeader = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.LegacyResolveLinkTos);
+
+		if (StringValues.IsNullOrEmpty(linkToHeader))
+			return true;
+		if (string.Equals(linkToHeader, "False", StringComparison.OrdinalIgnoreCase)) {
+			return true;
+		}
+
+		if (string.Equals(linkToHeader, "True", StringComparison.OrdinalIgnoreCase)) {
+			resolveLinkTos = true;
+			return true;
+		}
+
+		return false;
+	}
+	private bool GetRequireLeader(HttpEntityManager manager, out bool requireLeader) {
+		requireLeader = false;
+
+		var onlyLeader = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.RequireLeader);
+		var onlyLeaderLegacy = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.LegacyRequireLeader);
+		var onlyMaster = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.RequireMaster);
+
+		if (StringValues.IsNullOrEmpty(onlyLeader) && StringValues.IsNullOrEmpty(onlyMaster) && StringValues.IsNullOrEmpty(onlyLeaderLegacy))
+			return true;
+
+		if (string.Equals(onlyLeader, "True", StringComparison.OrdinalIgnoreCase) ||
+			string.Equals(onlyLeaderLegacy, "True", StringComparison.OrdinalIgnoreCase) ||
+			string.Equals(onlyMaster, "True", StringComparison.OrdinalIgnoreCase)) {
+			requireLeader = true;
+			return true;
+		}
+
+		return string.Equals(onlyLeader, "False", StringComparison.OrdinalIgnoreCase) ||
+			   string.Equals(onlyLeaderLegacy, "False", StringComparison.OrdinalIgnoreCase) ||
+			   string.Equals(onlyMaster, "False", StringComparison.OrdinalIgnoreCase);
+	}
+	private long? GetETagStreamVersion(HttpEntityManager manager) {
+		var etag = manager.HttpEntity.Request.GetHeaderValues("If-None-Match");
+		if (!StringValues.IsNullOrEmpty(etag)) {
+			// etag format is version;contenttypehash
+			var splitted = etag.ToString().Trim('\"').Split(ETagSeparatorArray);
+			if (splitted.Length == 2) {
+				var typeHash = manager.ResponseCodec.ContentType.GetHashCode()
+					.ToString(CultureInfo.InvariantCulture);
+				var res = splitted[1] == typeHash && long.TryParse(splitted[0], out var streamVersion)
+					? (long?)streamVersion
+					: null;
+				return res;
+			}
+		}
+
+		return null;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Controllers/AtomController.cs b/src/KurrentDB.Core/Services/Transport/Http/Controllers/AtomController.cs
new file mode 100644
index 00000000000..9b3a2fe57ac
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Controllers/AtomController.cs
@@ -0,0 +1,1169 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using EventStore.Client.Messages;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Settings;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.Atom;
+using KurrentDB.Transport.Http.Codecs;
+using KurrentDB.Transport.Http.EntityManagement;
+using Microsoft.Extensions.Primitives;
+using Newtonsoft.Json;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Transport.Http.Controllers;
+
+public enum EmbedLevel {
+	None,
+	Content,
+	Rich,
+	Body,
+	PrettyBody,
+	TryHarder
+}
+
+public class AtomController : CommunicationController {
+	public const char ETagSeparator = ';';
+	public static readonly char[] ETagSeparatorArray = { ';' };
+
+	private static readonly ILogger Log = Serilog.Log.ForContext<AtomController>();
+
+	private static readonly HtmlFeedCodec HtmlFeedCodec = new HtmlFeedCodec(); // initialization order matters
+
+	private static readonly Func<UriTemplateMatch, Operation> ReadStreamOperation =
+		ForStream(Operations.Streams.Read);
+
+	private static readonly Operation RedirectOperation = new Operation(Operations.Node.Redirect);
+	private static readonly Operation ReadForAllOperation = new Operation(Operations.Streams.Read).WithParameter(Operations.Streams.Parameters.StreamId(SystemStreams.AllStream));
+
+	private static readonly ICodec[] AtomCodecsWithoutBatches = {
+		Codec.EventStoreXmlCodec,
+		Codec.KurrentJsonCodec,
+		Codec.LegacyEventStoreJsonCodec,
+		Codec.Xml,
+		Codec.ApplicationXml,
+		Codec.Json
+	};
+
+	private static readonly ICodec[] AtomCodecs = {
+		Codec.DescriptionJson,
+		Codec.LegacyDescriptionJson,
+		Codec.EventStoreXmlCodec,
+		Codec.KurrentJsonCodec,
+		Codec.LegacyEventStoreJsonCodec,
+		Codec.Xml,
+		Codec.ApplicationXml,
+		Codec.Json,
+		Codec.EventXml,
+		Codec.EventJson,
+		Codec.LegacyEventJson,
+		Codec.EventsXml,
+		Codec.EventsJson,
+		Codec.LegacyEventsJson,
+		Codec.Raw,
+	};
+
+	private static readonly ICodec[] AtomWithHtmlCodecs = {
+		Codec.DescriptionJson,
+		Codec.LegacyDescriptionJson,
+		Codec.EventStoreXmlCodec,
+		Codec.KurrentJsonCodec,
+		Codec.LegacyEventStoreJsonCodec,
+		Codec.Xml,
+		Codec.ApplicationXml,
+		Codec.Json,
+		Codec.EventXml,
+		Codec.EventJson,
+		Codec.LegacyEventJson,
+		Codec.EventsXml,
+		Codec.EventsJson,
+		Codec.LegacyEventsJson,
+		HtmlFeedCodec // initialization order matters
+	};
+
+	private static readonly ICodec[] DefaultCodecs = {
+		Codec.EventStoreXmlCodec,
+		Codec.KurrentJsonCodec,
+		Codec.LegacyEventStoreJsonCodec,
+		Codec.Xml,
+		Codec.ApplicationXml,
+		Codec.Json,
+		Codec.EventXml,
+		Codec.EventJson,
+		Codec.LegacyEventJson,
+		Codec.Raw,
+		HtmlFeedCodec // initialization order matters
+	};
+
+	private readonly IPublisher _networkSendQueue;
+	private readonly TimeSpan _writeTimeout;
+	private readonly int _maxAppendEventSize;
+
+	public AtomController(IPublisher publisher, IPublisher networkSendQueue,
+		bool disableHTTPCaching, int maxAppendEventSize, TimeSpan writeTimeout) : base(publisher) {
+		_networkSendQueue = networkSendQueue;
+		_writeTimeout = writeTimeout;
+		// Preserve the old behaviour where the Atom controller would not accept events larger than 4mb.
+		_maxAppendEventSize = Math.Min(maxAppendEventSize, 4 * 1024 * 1024);
+
+		if (disableHTTPCaching) {
+			// ReSharper disable once RedundantNameQualifier
+			Configure.DisableHttpCaching = true;
+		}
+	}
+
+	protected override void SubscribeCore(IHttpService http) {
+		// STREAMS
+		Register(http, "/streams/{stream}", HttpMethod.Post, PostEvents, AtomCodecs, AtomCodecs,
+			ForStream(Operations.Streams.Write));
+		Register(http, "/streams/{stream}", HttpMethod.Delete, DeleteStream, Codec.NoCodecs, AtomCodecs,
+			ForStream(Operations.Streams.Delete));
+
+		Register(http, "/streams/{stream}/incoming/{guid}", HttpMethod.Post, PostEventsIdempotent,
+			AtomCodecsWithoutBatches, AtomCodecsWithoutBatches, ForStream(Operations.Streams.Write));
+
+		Register(http, "/streams/{stream}/", HttpMethod.Post, RedirectKeepVerb, AtomCodecs, AtomCodecs,
+			RedirectOperation);
+		Register(http, "/streams/{stream}/", HttpMethod.Delete, RedirectKeepVerb, Codec.NoCodecs, AtomCodecs,
+			RedirectOperation);
+		Register(http, "/streams/{stream}/", HttpMethod.Get, RedirectKeepVerb, Codec.NoCodecs, AtomCodecs,
+			RedirectOperation);
+
+		Register(http, "/streams/{stream}?embed={embed}", HttpMethod.Get, GetStreamEventsBackward, Codec.NoCodecs,
+			AtomWithHtmlCodecs, ReadStreamOperation);
+
+		Register(http, "/streams/{stream}/{event}?embed={embed}", HttpMethod.Get, GetStreamEvent, Codec.NoCodecs,
+			DefaultCodecs, ReadStreamOperation);
+		Register(http, "/streams/{stream}/{event}/{count}?embed={embed}", HttpMethod.Get, GetStreamEventsBackward,
+			Codec.NoCodecs, AtomWithHtmlCodecs, ReadStreamOperation);
+		Register(http, "/streams/{stream}/{event}/backward/{count}?embed={embed}", HttpMethod.Get,
+			GetStreamEventsBackward, Codec.NoCodecs, AtomWithHtmlCodecs, ReadStreamOperation);
+		RegisterCustom(http, "/streams/{stream}/{event}/forward/{count}?embed={embed}", HttpMethod.Get,
+			GetStreamEventsForward, Codec.NoCodecs, AtomWithHtmlCodecs, ReadStreamOperation);
+
+		// METASTREAMS
+		Register(http, "/streams/{stream}/metadata", HttpMethod.Post, PostMetastreamEvent, AtomCodecs, AtomCodecs,
+			ForStream(Operations.Streams.MetadataWrite));
+		Register(http, "/streams/{stream}/metadata/", HttpMethod.Post, RedirectKeepVerb, AtomCodecs, AtomCodecs,
+			RedirectOperation);
+
+		Register(http, "/streams/{stream}/metadata?embed={embed}", HttpMethod.Get, GetMetastreamEvent,
+			Codec.NoCodecs, DefaultCodecs, ForStream(Operations.Streams.MetadataRead));
+		Register(http, "/streams/{stream}/metadata/?embed={embed}", HttpMethod.Get, RedirectKeepVerb,
+			Codec.NoCodecs, DefaultCodecs, RedirectOperation);
+		Register(http, "/streams/{stream}/metadata/{event}?embed={embed}", HttpMethod.Get, GetMetastreamEvent,
+			Codec.NoCodecs, DefaultCodecs, ForStream(Operations.Streams.MetadataRead));
+
+		Register(http, "/streams/{stream}/metadata/{event}/{count}?embed={embed}", HttpMethod.Get,
+			GetMetastreamEventsBackward, Codec.NoCodecs, AtomWithHtmlCodecs, ForStream(Operations.Streams.MetadataRead));
+		Register(http, "/streams/{stream}/metadata/{event}/backward/{count}?embed={embed}", HttpMethod.Get,
+			GetMetastreamEventsBackward, Codec.NoCodecs, AtomWithHtmlCodecs, ForStream(Operations.Streams.MetadataRead));
+		RegisterCustom(http, "/streams/{stream}/metadata/{event}/forward/{count}?embed={embed}", HttpMethod.Get,
+			GetMetastreamEventsForward, Codec.NoCodecs, AtomWithHtmlCodecs, ForStream(Operations.Streams.MetadataRead));
+
+		// $ALL Filtered
+		const string querystring =
+			"?embed={embed}&context={context}&type={type}&data={data}&exclude-system-events={exclude-system-events}";
+
+		Register(http,
+			"/streams/$all/filtered" + querystring,
+			HttpMethod.Get, GetAllEventsBackwardFiltered, Codec.NoCodecs,
+			AtomWithHtmlCodecs, ReadForAllOperation);
+		Register(http,
+			"/streams/$all/filtered/{position}/{count}" + querystring,
+			HttpMethod.Get, GetAllEventsBackwardFiltered,
+			Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
+		Register(http,
+			"/streams/$all/filtered/{position}/backward/{count}" + querystring,
+			HttpMethod.Get,
+			GetAllEventsBackwardFiltered, Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
+		RegisterCustom(http,
+			"/streams/$all/filtered/{position}/forward/{count}" + querystring,
+			HttpMethod.Get,
+			GetAllEventsForwardFiltered, Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
+		Register(http,
+			"/streams/%24all/filtered" + querystring,
+			HttpMethod.Get, GetAllEventsBackwardFiltered, Codec.NoCodecs,
+			AtomWithHtmlCodecs, ReadForAllOperation);
+		Register(http,
+			"/streams/%24all/filtered/{position}/{count}" + querystring,
+			HttpMethod.Get, GetAllEventsBackwardFiltered,
+			Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
+		Register(http,
+			"/streams/%24all/filtered/{position}/backward/{count}" + querystring,
+			HttpMethod.Get,
+			GetAllEventsBackwardFiltered, Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
+		RegisterCustom(http,
+			"/streams/%24all/filtered/{position}/forward/{count}" + querystring,
+			HttpMethod.Get,
+			GetAllEventsForwardFiltered, Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
+
+		// $ALL
+		Register(http, "/streams/$all/", HttpMethod.Get, RedirectKeepVerb, Codec.NoCodecs, AtomWithHtmlCodecs,
+			RedirectOperation);
+		Register(http, "/streams/%24all/", HttpMethod.Get, RedirectKeepVerb, Codec.NoCodecs, AtomWithHtmlCodecs,
+			RedirectOperation);
+		Register(http, "/streams/$all?embed={embed}", HttpMethod.Get, GetAllEventsBackward, Codec.NoCodecs,
+			AtomWithHtmlCodecs, ReadForAllOperation);
+		Register(http, "/streams/$all/{position}/{count}?embed={embed}", HttpMethod.Get, GetAllEventsBackward,
+			Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
+		Register(http, "/streams/$all/{position}/backward/{count}?embed={embed}", HttpMethod.Get,
+			GetAllEventsBackward, Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
+		RegisterCustom(http, "/streams/$all/{position}/forward/{count}?embed={embed}", HttpMethod.Get,
+			GetAllEventsForward, Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
+		Register(http, "/streams/%24all?embed={embed}", HttpMethod.Get, GetAllEventsBackward, Codec.NoCodecs,
+			AtomWithHtmlCodecs, ReadForAllOperation);
+		Register(http, "/streams/%24all/{position}/{count}?embed={embed}", HttpMethod.Get, GetAllEventsBackward,
+			Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
+		Register(http, "/streams/%24all/{position}/backward/{count}?embed={embed}", HttpMethod.Get,
+			GetAllEventsBackward, Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
+		RegisterCustom(http, "/streams/%24all/{position}/forward/{count}?embed={embed}", HttpMethod.Get,
+			GetAllEventsForward, Codec.NoCodecs, AtomWithHtmlCodecs, ReadForAllOperation);
+	}
+
+	private static Func<UriTemplateMatch, Operation> ForStream(OperationDefinition definition) {
+		return match => {
+			var operation = new Operation(definition);
+			var stream = match.BoundVariables["stream"];
+			if (!string.IsNullOrEmpty(stream)) {
+				return operation.WithParameter(Operations.Streams.Parameters.StreamId(stream));
+			}
+
+			return operation;
+		};
+	}
+
+	private bool GetDescriptionDocument(HttpEntityManager manager, UriTemplateMatch match) {
+		if (manager.ResponseCodec.ContentType == ContentType.DescriptionDocJson ||
+			manager.ResponseCodec.ContentType == ContentType.LegacyDescriptionDocJson) {
+			var stream = match.BoundVariables["stream"];
+			var accepts = (manager.HttpEntity.Request.AcceptTypes?.Length ?? 0) == 0 ||
+						  manager.HttpEntity.Request.AcceptTypes.Contains(ContentType.Any);
+			var responseStatusCode = accepts ? HttpStatusCode.NotAcceptable : HttpStatusCode.OK;
+			var responseMessage = manager.HttpEntity.Request.AcceptTypes == null
+				? "We are unable to represent the stream in the format requested."
+				: "Description Document";
+			var envelope = new SendToHttpEnvelope(
+				_networkSendQueue, manager,
+				(args, message) => {
+					var m = message as MonitoringMessage.GetPersistentSubscriptionStatsCompleted;
+					if (m == null)
+						throw new Exception("Could not get subscriptions for stream " + stream);
+
+					string[] persistentSubscriptionGroups = null;
+					if (m.Result == MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus
+							.Success) {
+						persistentSubscriptionGroups = m.SubscriptionStats.Select(x => x.GroupName).ToArray();
+					}
+
+					manager.ReplyTextContent(
+						Format.GetDescriptionDocument(manager, stream, persistentSubscriptionGroups),
+						responseStatusCode, responseMessage,
+						manager.ResponseCodec.ContentType,
+						null,
+						e => Log.Error(e, "Error while writing HTTP response"));
+					return String.Empty;
+				},
+				(args, message) => new ResponseConfiguration(HttpStatusCode.OK, manager.ResponseCodec.ContentType,
+					manager.ResponseCodec.Encoding));
+			var cmd = new MonitoringMessage.GetStreamPersistentSubscriptionStats(envelope, stream);
+			Publish(cmd);
+			return true;
+		}
+
+		return false;
+	}
+
+	private void RedirectKeepVerb(HttpEntityManager httpEntity, UriTemplateMatch uriTemplateMatch) {
+		var original = uriTemplateMatch.RequestUri.ToString();
+		var header = new[] {
+			new KeyValuePair<string, string>("Location", original.Substring(0, original.Length - 1)),
+			new KeyValuePair<string, string>("Cache-Control", "max-age=31536000, public"),
+		};
+		httpEntity.ReplyTextContent("Moved Permanently", HttpStatusCode.RedirectKeepVerb, "", "", header, e => { });
+	}
+
+	// STREAMS
+	private void PostEvents(HttpEntityManager manager, UriTemplateMatch match) {
+		var stream = match.BoundVariables["stream"];
+		if (stream.IsEmptyString()) {
+			SendBadRequest(manager, string.Format("Invalid request. Stream must be non-empty string"));
+			return;
+		}
+
+		string includedType;
+		if (!GetIncludedType(manager, out includedType)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.EventType));
+			return;
+		}
+
+		if (!manager.RequestCodec.HasEventTypes && includedType == null) {
+			SendBadRequest(manager,
+				$"Must include an event type with the request either in body or as {SystemHeaders.EventType} header.");
+			return;
+		}
+
+		Guid includedId;
+		if (!GetIncludedId(manager, out includedId)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.EventId));
+			return;
+		}
+
+		if (!manager.RequestCodec.HasEventIds && includedId == Guid.Empty) {
+			var uri = new Uri(new Uri(match.RequestUri + "/"), "incoming/" + Guid.NewGuid()).ToString();
+			var header = new[]
+				{new KeyValuePair<string, string>("Location", uri)};
+			manager.ReplyTextContent("Forwarding to idempotent URI", HttpStatusCode.RedirectKeepVerb,
+				"Temporary Redirect", ContentType.PlainText, header, e => { });
+			return;
+		}
+
+		long expectedVersion;
+		if (!GetExpectedVersion(manager, out expectedVersion)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.ExpectedVersion));
+			return;
+		}
+
+		if (!GetRequireLeader(manager, out var requireLeader)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
+			return;
+		}
+
+		PostEntry(manager, expectedVersion, requireLeader, stream, includedId, includedType);
+	}
+
+	private void PostEventsIdempotent(HttpEntityManager manager, UriTemplateMatch match) {
+		var stream = match.BoundVariables["stream"];
+		var guid = match.BoundVariables["guid"];
+		Guid id;
+		if (!Guid.TryParse(guid, out id)) {
+			SendBadRequest(manager, string.Format("Invalid request. Unable to parse guid"));
+			return;
+		}
+
+		if (stream.IsEmptyString()) {
+			SendBadRequest(manager, string.Format("Invalid request. Stream must be non-empty string"));
+			return;
+		}
+
+		string includedType;
+		if (!GetIncludedType(manager, out includedType)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.EventType));
+			return;
+		}
+
+		long expectedVersion;
+		if (!GetExpectedVersion(manager, out expectedVersion)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.ExpectedVersion));
+			return;
+		}
+
+		if (!GetRequireLeader(manager, out var requireLeader)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
+			return;
+		}
+
+		PostEntry(manager, expectedVersion, requireLeader, stream, id, includedType);
+	}
+
+	private void DeleteStream(HttpEntityManager manager, UriTemplateMatch match) {
+		var stream = match.BoundVariables["stream"];
+		if (stream.IsEmptyString()) {
+			SendBadRequest(manager, string.Format("Invalid stream name '{0}'", stream));
+			return;
+		}
+
+		long expectedVersion;
+		if (!GetExpectedVersion(manager, out expectedVersion)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.ExpectedVersion));
+			return;
+		}
+
+		if (!GetRequireLeader(manager, out var requireLeader)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
+			return;
+		}
+
+		bool hardDelete;
+		if (!GetHardDelete(manager, out hardDelete)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.HardDelete));
+			return;
+		}
+
+		var cts = CancellationTokenSource.CreateLinkedTokenSource(manager.HttpEntity.Context.RequestAborted);
+		var envelope = new SendToHttpEnvelope(_networkSendQueue, manager, Format.DeleteStreamCompleted,
+			ConfigureResponse);
+		var corrId = Guid.NewGuid();
+		cts.CancelAfter(_writeTimeout);
+		Publish(new ClientMessage.DeleteStream(corrId, corrId, envelope, requireLeader, stream, expectedVersion,
+			hardDelete, manager.User, cancellationToken: manager.HttpEntity.Context.RequestAborted));
+
+		ResponseConfiguration ConfigureResponse(HttpResponseConfiguratorArgs args, Message message) {
+			cts.Dispose();
+			return Configure.DeleteStreamCompleted(args, message);
+		}
+	}
+
+	private void GetStreamEvent(HttpEntityManager manager, UriTemplateMatch match) {
+		var stream = match.BoundVariables["stream"];
+		var evNum = match.BoundVariables["event"];
+
+		long eventNumber = -1;
+		var embed = GetEmbedLevel(manager, match, EmbedLevel.TryHarder);
+
+		if (stream.IsEmptyString()) {
+			SendBadRequest(manager, string.Format("Invalid stream name '{0}'", stream));
+			return;
+		}
+
+		if (evNum != "head" && (!long.TryParse(evNum, out eventNumber) || eventNumber < 0)) {
+			SendBadRequest(manager, string.Format("'{0}' is not valid event number", evNum));
+			return;
+		}
+
+		bool resolveLinkTos;
+		if (!GetResolveLinkTos(manager, out resolveLinkTos, true)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.ResolveLinkTos));
+			return;
+		}
+
+		if (!GetRequireLeader(manager, out var requireLeader)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
+			return;
+		}
+
+		GetStreamEvent(manager, stream, eventNumber, resolveLinkTos, requireLeader, embed);
+	}
+
+	private void GetStreamEventsBackward(HttpEntityManager manager, UriTemplateMatch match) {
+		if (GetDescriptionDocument(manager, match))
+			return;
+
+		var stream = match.BoundVariables["stream"];
+		var evNum = match.BoundVariables["event"];
+		var cnt = match.BoundVariables["count"];
+
+		long eventNumber = -1;
+		int count = AtomSpecs.FeedPageSize;
+		var embed = GetEmbedLevel(manager, match);
+
+		if (stream.IsEmptyString()) {
+			SendBadRequest(manager, string.Format("Invalid stream name '{0}'", stream));
+			return;
+		}
+
+		if (evNum != null && evNum != "head" && (!long.TryParse(evNum, out eventNumber) || eventNumber < 0)) {
+			SendBadRequest(manager, string.Format("'{0}' is not valid event number", evNum));
+			return;
+		}
+
+		if (cnt.IsNotEmptyString() && (!int.TryParse(cnt, out count) || count <= 0)) {
+			SendBadRequest(manager, string.Format("'{0}' is not valid count. Should be positive integer", cnt));
+			return;
+		}
+
+		bool resolveLinkTos;
+		if (!GetResolveLinkTos(manager, out resolveLinkTos, true)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.ResolveLinkTos));
+			return;
+		}
+
+		if (!GetRequireLeader(manager, out var requireLeader)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
+			return;
+		}
+
+		bool headOfStream = eventNumber == -1;
+		GetStreamEventsBackward(manager, stream, eventNumber, count, resolveLinkTos, requireLeader, headOfStream,
+			embed);
+	}
+
+	private RequestParams GetStreamEventsForward(HttpEntityManager manager, UriTemplateMatch match) {
+		var stream = match.BoundVariables["stream"];
+		var evNum = match.BoundVariables["event"];
+		var cnt = match.BoundVariables["count"];
+
+		long eventNumber;
+		int count;
+		var embed = GetEmbedLevel(manager, match);
+
+		if (stream.IsEmptyString())
+			return SendBadRequest(manager, string.Format("Invalid stream name '{0}'", stream));
+		if (evNum.IsEmptyString() || !long.TryParse(evNum, out eventNumber) || eventNumber < 0)
+			return SendBadRequest(manager, string.Format("'{0}' is not valid event number", evNum));
+		if (cnt.IsEmptyString() || !int.TryParse(cnt, out count) || count <= 0)
+			return SendBadRequest(manager,
+				string.Format("'{0}' is not valid count. Should be positive integer", cnt));
+		bool resolveLinkTos;
+		if (!GetResolveLinkTos(manager, out resolveLinkTos, true))
+			return SendBadRequest(manager,
+				string.Format("{0} header in wrong format.", SystemHeaders.ResolveLinkTos));
+		if (!GetRequireLeader(manager, out var requireLeader))
+			return SendBadRequest(manager,
+				string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
+		TimeSpan? longPollTimeout;
+		if (!GetLongPoll(manager, out longPollTimeout))
+			return SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.LongPoll));
+		var etag = GetETagStreamVersion(manager);
+
+		GetStreamEventsForward(manager, stream, eventNumber, count, resolveLinkTos, requireLeader, etag,
+			longPollTimeout, embed);
+		return new RequestParams((longPollTimeout ?? TimeSpan.Zero) + ESConsts.HttpTimeout);
+	}
+
+	// METASTREAMS
+	private void PostMetastreamEvent(HttpEntityManager manager, UriTemplateMatch match) {
+		var stream = match.BoundVariables["stream"];
+		if (stream.IsEmptyString() || SystemStreams.IsMetastream(stream)) {
+			SendBadRequest(manager,
+				string.Format("Invalid request. Stream must be non-empty string and should not be metastream"));
+			return;
+		}
+
+		Guid includedId;
+		if (!GetIncludedId(manager, out includedId)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.EventId));
+			return;
+		}
+
+		string foo;
+		GetIncludedType(manager, out foo);
+		if (!(foo == null || foo == SystemEventTypes.StreamMetadata)) {
+			SendBadRequest(manager, "Bad Request. You should not include an event type for metadata.");
+			return;
+		}
+
+		const string includedType = SystemEventTypes.StreamMetadata;
+		long expectedVersion;
+		if (!GetExpectedVersion(manager, out expectedVersion)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.ExpectedVersion));
+			return;
+		}
+
+		if (!GetRequireLeader(manager, out var requireLeader)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
+			return;
+		}
+
+		PostEntry(manager, expectedVersion, requireLeader, SystemStreams.MetastreamOf(stream), includedId,
+			includedType);
+	}
+
+	private void GetMetastreamEvent(HttpEntityManager manager, UriTemplateMatch match) {
+		var stream = match.BoundVariables["stream"];
+		var evNum = match.BoundVariables["event"];
+
+		long eventNumber = -1;
+		var embed = GetEmbedLevel(manager, match, EmbedLevel.TryHarder);
+
+		if (stream.IsEmptyString() || SystemStreams.IsMetastream(stream)) {
+			SendBadRequest(manager, "Stream must be non-empty string and should not be metastream");
+			return;
+		}
+
+		if (evNum != null && evNum != "head" && (!long.TryParse(evNum, out eventNumber) || eventNumber < 0)) {
+			SendBadRequest(manager, string.Format("'{0}' is not valid event number", evNum));
+			return;
+		}
+
+		bool resolveLinkTos;
+		if (!GetResolveLinkTos(manager, out resolveLinkTos)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.ResolveLinkTos));
+			return;
+		}
+
+		if (!GetRequireLeader(manager, out var requireLeader)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
+			return;
+		}
+
+		GetStreamEvent(manager, SystemStreams.MetastreamOf(stream), eventNumber, resolveLinkTos, requireLeader,
+			embed);
+	}
+
+	private void GetMetastreamEventsBackward(HttpEntityManager manager, UriTemplateMatch match) {
+		var stream = match.BoundVariables["stream"];
+		var evNum = match.BoundVariables["event"];
+		var cnt = match.BoundVariables["count"];
+
+		long eventNumber = -1;
+		int count = AtomSpecs.FeedPageSize;
+		var embed = GetEmbedLevel(manager, match);
+
+		if (stream.IsEmptyString() || SystemStreams.IsMetastream(stream)) {
+			SendBadRequest(manager, string.Format("Invalid stream name '{0}'", stream));
+			return;
+		}
+
+		if (evNum != null && evNum != "head" && (!long.TryParse(evNum, out eventNumber) || eventNumber < 0)) {
+			SendBadRequest(manager, string.Format("'{0}' is not valid event number", evNum));
+			return;
+		}
+
+		if (cnt.IsNotEmptyString() && (!int.TryParse(cnt, out count) || count <= 0)) {
+			SendBadRequest(manager, string.Format("'{0}' is not valid count. Should be positive integer", cnt));
+			return;
+		}
+
+		bool resolveLinkTos;
+		if (!GetResolveLinkTos(manager, out resolveLinkTos)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.ResolveLinkTos));
+			return;
+		}
+
+		if (!GetRequireLeader(manager, out var requireLeader)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
+			return;
+		}
+
+		bool headOfStream = eventNumber == -1;
+		GetStreamEventsBackward(manager, SystemStreams.MetastreamOf(stream), eventNumber, count,
+			resolveLinkTos, requireLeader, headOfStream, embed);
+	}
+
+	private RequestParams GetMetastreamEventsForward(HttpEntityManager manager, UriTemplateMatch match) {
+		var stream = match.BoundVariables["stream"];
+		var evNum = match.BoundVariables["event"];
+		var cnt = match.BoundVariables["count"];
+
+		long eventNumber;
+		int count;
+		var embed = GetEmbedLevel(manager, match);
+
+		if (stream.IsEmptyString() || SystemStreams.IsMetastream(stream))
+			return SendBadRequest(manager, string.Format("Invalid stream name '{0}'", stream));
+		if (evNum.IsEmptyString() || !long.TryParse(evNum, out eventNumber) || eventNumber < 0)
+			return SendBadRequest(manager, string.Format("'{0}' is not valid event number", evNum));
+		if (cnt.IsEmptyString() || !int.TryParse(cnt, out count) || count <= 0)
+			return SendBadRequest(manager,
+				string.Format("'{0}' is not valid count. Should be positive integer", cnt));
+		bool resolveLinkTos;
+		if (!GetResolveLinkTos(manager, out resolveLinkTos))
+			return SendBadRequest(manager,
+				string.Format("{0} header in wrong format.", SystemHeaders.ResolveLinkTos));
+		if (!GetRequireLeader(manager, out var requireLeader))
+			return SendBadRequest(manager,
+				string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
+		TimeSpan? longPollTimeout;
+		if (!GetLongPoll(manager, out longPollTimeout))
+			return SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.LongPoll));
+		var etag = GetETagStreamVersion(manager);
+
+		GetStreamEventsForward(manager, SystemStreams.MetastreamOf(stream), eventNumber, count, resolveLinkTos,
+			requireLeader, etag, longPollTimeout, embed);
+		return new RequestParams((longPollTimeout ?? TimeSpan.Zero) + ESConsts.HttpTimeout);
+	}
+
+	// $ALL
+	private void GetAllEventsBackward(HttpEntityManager manager, UriTemplateMatch match) {
+		var pos = match.BoundVariables["position"];
+		var cnt = match.BoundVariables["count"];
+
+		TFPos position = TFPos.HeadOfTf;
+		int count = AtomSpecs.FeedPageSize;
+		var embed = GetEmbedLevel(manager, match);
+
+		if (pos != null && pos != "head"
+						&& (!TFPos.TryParse(pos, out position) || position.PreparePosition < 0 ||
+							position.CommitPosition < 0)) {
+			SendBadRequest(manager, string.Format("Invalid position argument: {0}", pos));
+			return;
+		}
+
+		if (cnt.IsNotEmptyString() && (!int.TryParse(cnt, out count) || count <= 0)) {
+			SendBadRequest(manager, string.Format("Invalid count argument: {0}", cnt));
+			return;
+		}
+
+		if (!GetResolveLinkTos(manager, out var resolveLinkTos)) {
+			SendBadRequest(manager, $"{SystemHeaders.ResolveLinkTos} header in wrong format.");
+		}
+		if (!GetRequireLeader(manager, out var requireLeader)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
+			return;
+		}
+
+		var envelope = new SendToHttpEnvelope(_networkSendQueue,
+			manager,
+			(args, msg) => Format.ReadAllEventsBackwardCompleted(args, msg, embed),
+			(args, msg) => Configure.ReadAllEventsBackwardCompleted(args, msg, position == TFPos.HeadOfTf));
+		var corrId = Guid.NewGuid();
+		Publish(new ClientMessage.ReadAllEventsBackward(corrId, corrId, envelope,
+			position.CommitPosition, position.PreparePosition, count, resolveLinkTos,
+			requireLeader, GetETagTFPosition(manager), manager.User));
+	}
+
+	private void GetAllEventsBackwardFiltered(HttpEntityManager manager, UriTemplateMatch match) {
+		var pos = match.BoundVariables["position"];
+		var cnt = match.BoundVariables["count"];
+
+		var (success, errorMessage) = GetFilterFromQueryString(match, true, out var filter);
+		if (!success) {
+			SendBadRequest(manager, errorMessage);
+			return;
+		}
+
+		TFPos position = TFPos.HeadOfTf;
+		int count = AtomSpecs.FeedPageSize;
+		var embed = GetEmbedLevel(manager, match);
+
+		if (pos != null && pos != "head"
+						&& (!TFPos.TryParse(pos, out position) || position.PreparePosition < 0 ||
+							position.CommitPosition < 0)) {
+			SendBadRequest(manager, string.Format("Invalid position argument: {0}", pos));
+			return;
+		}
+
+		if (cnt.IsNotEmptyString() && (!int.TryParse(cnt, out count) || count <= 0)) {
+			SendBadRequest(manager, string.Format("Invalid count argument: {0}", cnt));
+			return;
+		}
+
+		if (!GetRequireLeader(manager, out var requireLeader)) {
+			SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
+			return;
+		}
+
+		var envelope = new SendToHttpEnvelope(_networkSendQueue,
+			manager,
+			(args, msg) => Format.ReadAllEventsBackwardFilteredCompleted(args, msg, embed),
+			(args, msg) => Configure.ReadAllEventsBackwardFilteredCompleted(args, msg, position == TFPos.HeadOfTf));
+		var corrId = Guid.NewGuid();
+		Publish(new ClientMessage.FilteredReadAllEventsBackward(corrId, corrId, envelope,
+			position.CommitPosition, position.PreparePosition, count,
+			requireLeader, true, count, GetETagTFPosition(manager), filter, manager.User));
+	}
+
+
+
+	private RequestParams GetAllEventsForward(HttpEntityManager manager, UriTemplateMatch match) {
+		var pos = match.BoundVariables["position"];
+		var cnt = match.BoundVariables["count"];
+
+		TFPos position;
+		int count;
+		var embed = GetEmbedLevel(manager, match);
+
+		if (!TFPos.TryParse(pos, out position) || position.PreparePosition < 0 || position.CommitPosition < 0)
+			return SendBadRequest(manager, string.Format("Invalid position argument: {0}", pos));
+		if (!int.TryParse(cnt, out count) || count <= 0)
+			return SendBadRequest(manager, string.Format("Invalid count argument: {0}", cnt));
+		if (!GetResolveLinkTos(manager, out var resolveLinkTos))
+			return SendBadRequest(manager, $"{SystemHeaders.ResolveLinkTos} header in wrong format.");
+		if (!GetRequireLeader(manager, out var requireLeader))
+			return SendBadRequest(manager,
+				string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
+		TimeSpan? longPollTimeout;
+		if (!GetLongPoll(manager, out longPollTimeout))
+			return SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.LongPoll));
+
+		var envelope = new SendToHttpEnvelope(_networkSendQueue,
+			manager,
+			(args, msg) => Format.ReadAllEventsForwardCompleted(args, msg, embed),
+			(args, msg) => Configure.ReadAllEventsForwardCompleted(args, msg, headOfTf: false));
+		var corrId = Guid.NewGuid();
+		Publish(new ClientMessage.ReadAllEventsForward(corrId, corrId, envelope,
+			position.CommitPosition, position.PreparePosition, count, resolveLinkTos,
+			requireLeader, GetETagTFPosition(manager), manager.User,
+			replyOnExpired: false,
+			longPollTimeout: longPollTimeout));
+		return new RequestParams((longPollTimeout ?? TimeSpan.Zero) + ESConsts.HttpTimeout);
+	}
+
+	private RequestParams GetAllEventsForwardFiltered(HttpEntityManager manager, UriTemplateMatch match) {
+		var pos = match.BoundVariables["position"];
+		var cnt = match.BoundVariables["count"];
+
+		var (success, errorMessage) = GetFilterFromQueryString(match, true, out var filter);
+		if (!success) {
+			return SendBadRequest(manager, errorMessage);
+		}
+
+		TFPos position;
+		int count;
+		var embed = GetEmbedLevel(manager, match);
+
+		if (!TFPos.TryParse(pos, out position) || position.PreparePosition < 0 || position.CommitPosition < 0)
+			return SendBadRequest(manager, string.Format("Invalid position argument: {0}", pos));
+		if (!int.TryParse(cnt, out count) || count <= 0)
+			return SendBadRequest(manager, string.Format("Invalid count argument: {0}", cnt));
+		if (!GetRequireLeader(manager, out var requireLeader))
+			return SendBadRequest(manager,
+				string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
+		TimeSpan? longPollTimeout;
+		if (!GetLongPoll(manager, out longPollTimeout))
+			return SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.LongPoll));
+
+		var envelope = new SendToHttpEnvelope(_networkSendQueue,
+			manager,
+			(args, msg) => Format.ReadAllEventsForwardFilteredCompleted(args, msg, embed),
+			(args, msg) => Configure.ReadAllEventsForwardFilteredCompleted(args, msg, headOfTf: false));
+		var corrId = Guid.NewGuid();
+		Publish(new ClientMessage.FilteredReadAllEventsForward(corrId, corrId, envelope,
+			position.CommitPosition, position.PreparePosition, count, true,
+			requireLeader, 1000, GetETagTFPosition(manager), filter, manager.User,
+			replyOnExpired: false,
+			longPollTimeout: longPollTimeout));
+		return new RequestParams((longPollTimeout ?? TimeSpan.Zero) + ESConsts.HttpTimeout);
+	}
+
+	// HELPERS
+	private (bool Success, string ErrorMessage) GetFilterFromQueryString(UriTemplateMatch match, bool isAllStream, out IEventFilter filter) {
+		var context = match.BoundVariables["context"];
+		var type = match.BoundVariables["type"];
+		var data = match.BoundVariables["data"];
+		var excludeSystemEvents = match.BoundVariables["exclude-system-events"];
+
+		if (excludeSystemEvents != null) {
+			if (!bool.TryParse(excludeSystemEvents, out var parsedExcludeSystemEvents)) {
+				filter = null;
+				return (false, "exclude-sytem-events should have a value of true.");
+			}
+
+			if (parsedExcludeSystemEvents == false) {
+				filter = null;
+				return (false, "exclude-sytem-events should have a value of true.");
+			}
+
+			filter = EventFilter.Get(isAllStream, new Filter(
+				Filter.Types.FilterContext.EventType,
+				Filter.Types.FilterType.Regex,
+				new[] { @"^[^\$].*" }
+			));
+
+			return (true, null);
+		}
+
+		var parsedFilterResult = EventFilter.TryParse(context, isAllStream, type, data, out filter);
+		if (!parsedFilterResult.Success) {
+			return (false, parsedFilterResult.Reason);
+		}
+
+		return (true, null);
+	}
+
+	private bool GetExpectedVersion(HttpEntityManager manager, out long expectedVersion) {
+		var expVer = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.ExpectedVersion);
+		if (StringValues.IsNullOrEmpty(expVer))
+			expVer = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.LegacyExpectedVersion);
+
+		if (StringValues.IsNullOrEmpty(expVer)) {
+			expectedVersion = ExpectedVersion.Any;
+			return true;
+		}
+
+		return long.TryParse(expVer, out expectedVersion) && expectedVersion >= ExpectedVersion.StreamExists;
+	}
+
+	private bool GetIncludedId(HttpEntityManager manager, out Guid includedId) {
+		var id = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.EventId);
+		if (StringValues.IsNullOrEmpty(id))
+			id = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.LegacyEventId);
+
+		if (StringValues.IsNullOrEmpty(id)) {
+			includedId = Guid.Empty;
+			return true;
+		}
+
+		return Guid.TryParse(id, out includedId) && includedId != Guid.Empty;
+	}
+
+	private bool GetIncludedType(HttpEntityManager manager, out string includedType) {
+		var type = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.EventType);
+		if (StringValues.IsNullOrEmpty(type))
+			type = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.LegacyEventType);
+
+		if (StringValues.IsNullOrEmpty(type)) {
+			includedType = null;
+			return true;
+		}
+
+		includedType = type;
+		return true;
+	}
+
+
+	private bool GetRequireLeader(HttpEntityManager manager, out bool requireLeader) {
+		requireLeader = false;
+
+		var onlyLeader = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.RequireLeader);
+		var onlyLeaderLegacy = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.LegacyRequireLeader);
+		var onlyMaster = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.RequireMaster);
+
+		if (StringValues.IsNullOrEmpty(onlyLeader) && StringValues.IsNullOrEmpty(onlyMaster) && StringValues.IsNullOrEmpty(onlyLeaderLegacy))
+			return true;
+
+		if (string.Equals(onlyLeader, "True", StringComparison.OrdinalIgnoreCase) ||
+			string.Equals(onlyLeaderLegacy, "True", StringComparison.OrdinalIgnoreCase) ||
+			string.Equals(onlyMaster, "True", StringComparison.OrdinalIgnoreCase)) {
+			requireLeader = true;
+			return true;
+		}
+
+		return string.Equals(onlyLeader, "False", StringComparison.OrdinalIgnoreCase) ||
+			   string.Equals(onlyLeaderLegacy, "False", StringComparison.OrdinalIgnoreCase) ||
+			   string.Equals(onlyMaster, "False", StringComparison.OrdinalIgnoreCase);
+	}
+
+	private bool GetLongPoll(HttpEntityManager manager, out TimeSpan? longPollTimeout) {
+		longPollTimeout = null;
+		var longPollHeader = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.LongPoll);
+		if (StringValues.IsNullOrEmpty(longPollHeader))
+			longPollHeader = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.LegacyLongPoll);
+
+		if (StringValues.IsNullOrEmpty(longPollHeader))
+			return true;
+		int longPollSec;
+		if (int.TryParse(longPollHeader, out longPollSec) && longPollSec > 0) {
+			longPollTimeout = TimeSpan.FromSeconds(longPollSec);
+			return true;
+		}
+
+		return false;
+	}
+
+	private bool GetResolveLinkTos(HttpEntityManager manager, out bool resolveLinkTos, bool defaultOption = false) {
+		resolveLinkTos = defaultOption;
+		var linkToHeader = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.ResolveLinkTos);
+		if (StringValues.IsNullOrEmpty(linkToHeader))
+			linkToHeader = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.LegacyResolveLinkTos);
+
+		if (StringValues.IsNullOrEmpty(linkToHeader))
+			return true;
+		if (string.Equals(linkToHeader, "False", StringComparison.OrdinalIgnoreCase)) {
+			return true;
+		}
+
+		if (string.Equals(linkToHeader, "True", StringComparison.OrdinalIgnoreCase)) {
+			resolveLinkTos = true;
+			return true;
+		}
+
+		return false;
+	}
+
+	private bool GetHardDelete(HttpEntityManager manager, out bool hardDelete) {
+		hardDelete = false;
+		var hardDel = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.HardDelete);
+		if (StringValues.IsNullOrEmpty(hardDel))
+			hardDel = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.LegacyHardDelete);
+
+		if (StringValues.IsNullOrEmpty(hardDel))
+			return true;
+		if (string.Equals(hardDel, "True", StringComparison.OrdinalIgnoreCase)) {
+			hardDelete = true;
+			return true;
+		}
+
+		if (string.Equals(hardDel, "False", StringComparison.OrdinalIgnoreCase))
+			return true;
+		return false;
+	}
+
+	public void PostEntry(HttpEntityManager manager, long expectedVersion, bool requireLeader, string stream,
+		Guid idIncluded, string typeIncluded) {
+		//TODO GFY SHOULD WE MAKE THIS READ BYTE[] FOR RAW THEN CONVERT? AS OF NOW ITS ALL NO BOM UTF8
+		manager.ReadRequestAsync(
+			(man, body) => {
+				var events = new Event[0];
+				try {
+					events = AutoEventConverter.SmartParse(body, manager.RequestCodec, idIncluded, typeIncluded);
+				} catch (Exception ex) {
+					SendBadRequest(manager, ex.Message);
+					return;
+				}
+
+				if (events.IsEmpty()) {
+					SendBadRequest(manager, "Write request body invalid.");
+					return;
+				}
+
+				foreach (var e in events) {
+					if (e.Data.Length + e.Metadata.Length > _maxAppendEventSize) {
+						SendTooBig(manager, _maxAppendEventSize);
+					}
+				}
+
+				var cts = CancellationTokenSource.CreateLinkedTokenSource(manager.HttpEntity.Context.RequestAborted);
+				var envelope = new SendToHttpEnvelope(_networkSendQueue,
+					manager,
+					Format.WriteEventsCompleted,
+					ConfigureResponse);
+				var corrId = Guid.NewGuid();
+				var msg = new ClientMessage.WriteEvents(corrId, corrId, envelope, requireLeader, stream,
+					expectedVersion, events, manager.User,
+					cancellationToken: manager.HttpEntity.Context.RequestAborted);
+				cts.CancelAfter(_writeTimeout);
+				Publish(msg);
+
+				ResponseConfiguration ConfigureResponse(HttpResponseConfiguratorArgs a, Message m) {
+					cts.Dispose();
+					return Configure.WriteEventsCompleted(a, m, stream);
+				}
+
+			},
+			e => Log.Debug("Error while reading request (POST entry): {e}.", e.Message));
+
+	}
+
+	private void GetStreamEvent(HttpEntityManager manager, string stream, long eventNumber,
+		bool resolveLinkTos, bool requireLeader, EmbedLevel embed) {
+		var envelope = new SendToHttpEnvelope(_networkSendQueue,
+			manager,
+			(args, message) => Format.EventEntry(args, message, embed),
+			(args, message) => Configure.EventEntry(args, message, headEvent: eventNumber == -1));
+		var corrId = Guid.NewGuid();
+		Publish(new ClientMessage.ReadEvent(corrId, corrId, envelope, stream, eventNumber, resolveLinkTos,
+			requireLeader, manager.User));
+	}
+
+	private void GetStreamEventsBackward(HttpEntityManager manager, string stream, long eventNumber, int count,
+		bool resolveLinkTos, bool requireLeader, bool headOfStream, EmbedLevel embed) {
+		var envelope = new SendToHttpEnvelope(_networkSendQueue,
+			manager,
+			(ent, msg) =>
+				Format.GetStreamEventsBackward(ent, msg, embed, headOfStream),
+			(args, msg) => Configure.GetStreamEventsBackward(args, msg, headOfStream));
+		var corrId = Guid.NewGuid();
+		Publish(new ClientMessage.ReadStreamEventsBackward(corrId, corrId, envelope, stream, eventNumber, count,
+			resolveLinkTos, requireLeader, GetETagStreamVersion(manager), manager.User));
+	}
+
+	private void GetStreamEventsForward(HttpEntityManager manager, string stream, long eventNumber, int count,
+		bool resolveLinkTos, bool requireLeader, long? etag, TimeSpan? longPollTimeout, EmbedLevel embed) {
+		var envelope = new SendToHttpEnvelope(_networkSendQueue,
+			manager,
+			(ent, msg) => Format.GetStreamEventsForward(ent, msg, embed),
+			Configure.GetStreamEventsForward);
+		var corrId = Guid.NewGuid();
+		Publish(new ClientMessage.ReadStreamEventsForward(corrId, corrId, envelope, stream, eventNumber, count,
+			resolveLinkTos, requireLeader, etag, manager.User,
+			replyOnExpired: false,
+			longPollTimeout: longPollTimeout));
+	}
+
+	private long? GetETagStreamVersion(HttpEntityManager manager) {
+		var etag = manager.HttpEntity.Request.GetHeaderValues("If-None-Match");
+		if (!StringValues.IsNullOrEmpty(etag)) {
+			// etag format is version;contenttypehash
+			var splitted = etag.ToString().Trim('\"').Split(ETagSeparatorArray);
+			if (splitted.Length == 2) {
+				var typeHash = manager.ResponseCodec.ContentType.GetHashCode()
+					.ToString(CultureInfo.InvariantCulture);
+				var res = splitted[1] == typeHash && long.TryParse(splitted[0], out var streamVersion)
+					? (long?)streamVersion
+					: null;
+				return res;
+			}
+		}
+
+		return null;
+	}
+
+	private static long? GetETagTFPosition(HttpEntityManager manager) {
+		var etag = manager.HttpEntity.Request.GetHeaderValues("If-None-Match");
+		if (!StringValues.IsNullOrEmpty(etag)) {
+			// etag format is version;contenttypehash
+			var splitted = etag.ToString().Trim('\"').Split(ETagSeparatorArray);
+			if (splitted.Length == 2) {
+				var typeHash = manager.ResponseCodec.ContentType.GetHashCode()
+					.ToString(CultureInfo.InvariantCulture);
+				return splitted[1] == typeHash && long.TryParse(splitted[0], out var tfEofPosition)
+					? (long?)tfEofPosition
+					: null;
+			}
+		}
+
+		return null;
+	}
+
+	private static EmbedLevel GetEmbedLevel(HttpEntityManager manager, UriTemplateMatch match,
+		EmbedLevel htmlLevel = EmbedLevel.PrettyBody) {
+		if (manager.ResponseCodec is IRichAtomCodec)
+			return htmlLevel;
+		var rawValue = match.BoundVariables["embed"] ?? string.Empty;
+		switch (rawValue.ToLowerInvariant()) {
+			case "content":
+				return EmbedLevel.Content;
+			case "rich":
+				return EmbedLevel.Rich;
+			case "body":
+				return EmbedLevel.Body;
+			case "pretty":
+				return EmbedLevel.PrettyBody;
+			case "tryharder":
+				return EmbedLevel.TryHarder;
+			default:
+				return EmbedLevel.None;
+		}
+	}
+}
+
+internal class HtmlFeedCodec : ICodec, IRichAtomCodec {
+	public string ContentType {
+		get { return "text/html"; }
+	}
+
+	public Encoding Encoding {
+		get { return Helper.UTF8NoBom; }
+	}
+
+	public bool HasEventIds {
+		get { return false; }
+	}
+
+	public bool HasEventTypes {
+		get { return false; }
+	}
+
+	public bool CanParse(MediaType format) {
+		throw new NotImplementedException();
+	}
+
+	public bool SuitableForResponse(MediaType component) {
+		return component.Type == "*"
+			   || (string.Equals(component.Type, "text", StringComparison.OrdinalIgnoreCase)
+				   && (component.Subtype == "*" ||
+					   string.Equals(component.Subtype, "html", StringComparison.OrdinalIgnoreCase)));
+	}
+
+	public T From<T>(string text) {
+		throw new NotImplementedException();
+	}
+
+	public string To<T>(T value) {
+		return @"
+            <!DOCTYPE html>
+            <html>
+            <head>
+            </head>
+            <body>
+            <script>
+                var data = " + JsonConvert.SerializeObject(value, Formatting.Indented, JsonCodec.ToSettings) + @";
+                var newLocation = '/web/index.html#/streams/' + data.streamId" + @"
+                if('positionEventNumber' in data){
+                    newLocation = newLocation + '/' + data.positionEventNumber;
+                }
+                window.location.replace(newLocation);
+            </script>
+            </body>
+            </html>
+            ";
+	}
+}
+
+interface IRichAtomCodec {
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Controllers/ClusterWebUIController.cs b/src/KurrentDB.Core/Services/Transport/Http/Controllers/ClusterWebUIController.cs
new file mode 100644
index 00000000000..508f1ef1b9b
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Controllers/ClusterWebUIController.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Util;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.Codecs;
+using KurrentDB.Transport.Http.EntityManagement;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Transport.Http.Controllers;
+
+public class ClusterWebUiController : CommunicationController {
+	private static readonly ILogger Log = Serilog.Log.ForContext<ClusterWebUiController>();
+
+	private readonly NodeSubsystems[] _enabledNodeSubsystems;
+
+	//private readonly MiniWeb _commonWeb;
+	private readonly MiniWeb _clusterNodeWeb;
+
+	public ClusterWebUiController(IPublisher publisher, NodeSubsystems[] enabledNodeSubsystems)
+		: base(publisher) {
+		_enabledNodeSubsystems = enabledNodeSubsystems;
+		_clusterNodeWeb = new MiniWeb("/web");
+	}
+
+	protected override void SubscribeCore(IHttpService service) {
+		_clusterNodeWeb.RegisterControllerActions(service);
+		RegisterRedirectAction(service, "", "/ui/cluster");
+		RegisterRedirectAction(service, "/web", "/web/index.html");
+
+		service.RegisterAction(
+			new ControllerAction("/sys/subsystems", HttpMethod.Get, Codec.NoCodecs, new ICodec[] { Codec.Json }, new Operation(Operations.Node.Information.Subsystems)),
+			OnListNodeSubsystems);
+	}
+
+	private void OnListNodeSubsystems(HttpEntityManager http, UriTemplateMatch match) {
+		http.ReplyTextContent(
+			Codec.Json.To(_enabledNodeSubsystems),
+			200,
+			"OK",
+			ContentType.Json,
+			null,
+			ex => Log.Information(ex, "Failed to prepare main menu")
+		);
+	}
+
+	private static void RegisterRedirectAction(IHttpService service, string fromUrl, string toUrl) {
+		service.RegisterAction(
+			new ControllerAction(
+				fromUrl,
+				HttpMethod.Get,
+				Codec.NoCodecs,
+				new ICodec[] { Codec.ManualEncoding },
+				new Operation(Operations.Node.Redirect)),
+			(http, match) => http.ReplyTextContent(
+				"Moved", 302, "Found", ContentType.PlainText,
+				new[] {
+					new KeyValuePair<string, string>(
+						"Location", new Uri(http.HttpEntity.RequestedUrl, toUrl).AbsoluteUri)
+				}, Console.WriteLine));
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Controllers/CommunicationController.cs b/src/KurrentDB.Core/Services/Transport/Http/Controllers/CommunicationController.cs
new file mode 100644
index 00000000000..3fc968c2556
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Controllers/CommunicationController.cs
@@ -0,0 +1,114 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.Codecs;
+using KurrentDB.Transport.Http.EntityManagement;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Transport.Http.Controllers;
+
+public abstract class CommunicationController : IHttpController {
+	private static readonly ILogger Log = Serilog.Log.ForContext<CommunicationController>();
+	private static readonly ICodec[] DefaultCodecs = new ICodec[] { Codec.Json, Codec.Xml };
+
+	private readonly IPublisher _publisher;
+
+	protected CommunicationController(IPublisher publisher) {
+		Ensure.NotNull(publisher, "publisher");
+
+		_publisher = publisher;
+	}
+
+	public void Publish(Message message) {
+		Ensure.NotNull(message, "message");
+		_publisher.Publish(message);
+	}
+
+	public void Subscribe(IHttpService service) {
+		Ensure.NotNull(service, "service");
+		SubscribeCore(service);
+	}
+
+	protected abstract void SubscribeCore(IHttpService service);
+
+	protected RequestParams SendBadRequest(HttpEntityManager httpEntityManager, string reason) {
+		httpEntityManager.ReplyContent(Encoding.ASCII.GetBytes(reason), HttpStatusCode.BadRequest,
+			"Bad Request", type: ContentType.PlainText, headers: null,
+			e => Log.Debug("Error while closing HTTP connection (bad request): {e}.", e.Message));
+
+		return new RequestParams(done: true);
+	}
+
+	protected RequestParams SendTooBig(HttpEntityManager httpEntityManager, int maxAppendEventSize) {
+		httpEntityManager.ReplyStatus(HttpStatusCode.RequestEntityTooLarge,
+			$"Too large events received. Limit is {maxAppendEventSize} bytes.",
+			e => Log.Debug("Too large events received over HTTP"));
+		return new RequestParams(done: true);
+	}
+
+	protected RequestParams SendOk(HttpEntityManager httpEntityManager) {
+		httpEntityManager.ReplyStatus(HttpStatusCode.OK,
+			"OK",
+			e => Log.Debug("Error while closing HTTP connection (ok): {e}.", e.Message));
+		return new RequestParams(done: true);
+	}
+
+	protected void Register(IHttpService service, string uriTemplate, string httpMethod,
+		Action<HttpEntityManager, UriTemplateMatch> handler, ICodec[] requestCodecs, ICodec[] responseCodecs, Operation operation) {
+		service.RegisterAction(new ControllerAction(uriTemplate, httpMethod, requestCodecs, responseCodecs, operation),
+			handler);
+	}
+
+	protected void Register(IHttpService service, string uriTemplate, string httpMethod,
+		Action<HttpEntityManager, UriTemplateMatch> handler, ICodec[] requestCodecs, ICodec[] responseCodecs, Func<UriTemplateMatch, Operation> operation) {
+		service.RegisterAction(new ControllerAction(uriTemplate, httpMethod, requestCodecs, responseCodecs, operation),
+			handler);
+	}
+
+	protected void RegisterCustom(IHttpService service, string uriTemplate, string httpMethod,
+		Func<HttpEntityManager, UriTemplateMatch, RequestParams> handler,
+		ICodec[] requestCodecs, ICodec[] responseCodecs, Operation operation) {
+		service.RegisterCustomAction(new ControllerAction(uriTemplate, httpMethod, requestCodecs, responseCodecs, operation),
+			handler);
+	}
+
+	protected void RegisterCustom(IHttpService service, string uriTemplate, string httpMethod,
+		Func<HttpEntityManager, UriTemplateMatch, RequestParams> handler,
+		ICodec[] requestCodecs, ICodec[] responseCodecs, Func<UriTemplateMatch, Operation> operation) {
+		service.RegisterCustomAction(new ControllerAction(uriTemplate, httpMethod, requestCodecs, responseCodecs, operation),
+			handler);
+	}
+
+	protected void RegisterUrlBased(IHttpService service, string uriTemplate, string httpMethod, Operation operation,
+		Action<HttpEntityManager, UriTemplateMatch> action) {
+		Register(service, uriTemplate, httpMethod, action, Codec.NoCodecs, DefaultCodecs, operation);
+	}
+
+	protected void RegisterUrlBased(IHttpService service, string uriTemplate, string httpMethod, Func<UriTemplateMatch, Operation> operation,
+		Action<HttpEntityManager, UriTemplateMatch> action) {
+		Register(service, uriTemplate, httpMethod, action, Codec.NoCodecs, DefaultCodecs, operation);
+	}
+
+	protected static string MakeUrl(HttpEntityManager http, string path) {
+		if (path.Length > 0 && path[0] == '/')
+			path = path.Substring(1);
+		var hostUri = http.ResponseUrl;
+		var builder = new UriBuilder(hostUri.Scheme, hostUri.Host, hostUri.Port, hostUri.LocalPath + path);
+		return builder.Uri.AbsoluteUri;
+	}
+
+	protected static string MakeUrl(HttpEntityManager http, string path, string query) {
+		if (path.Length > 0 && path[0] == '/')
+			path = path.Substring(1);
+		var hostUri = http.ResponseUrl;
+		var builder = new UriBuilder(hostUri.Scheme, hostUri.Host, hostUri.Port, hostUri.LocalPath + path, query);
+		return builder.Uri.AbsoluteUri;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Controllers/GossipController.cs b/src/KurrentDB.Core/Services/Transport/Http/Controllers/GossipController.cs
new file mode 100644
index 00000000000..629b5133612
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Controllers/GossipController.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.Codecs;
+using KurrentDB.Transport.Http.EntityManagement;
+using HttpMethod = KurrentDB.Transport.Http.HttpMethod;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Transport.Http.Controllers;
+
+public class GossipController : CommunicationController {
+	private static readonly ILogger Log = Serilog.Log.ForContext<GossipController>();
+
+	private static readonly ICodec[] SupportedCodecs = new ICodec[]
+		{Codec.Json, Codec.ApplicationXml, Codec.Xml, Codec.Text};
+
+	private readonly IPublisher _networkSendQueue;
+	private readonly IDurationTracker _tracker;
+
+	public GossipController(IPublisher publisher, IPublisher networkSendQueue, IDurationTracker tracker)
+		: base(publisher) {
+		_networkSendQueue = networkSendQueue;
+		_tracker = tracker;
+	}
+
+	protected override void SubscribeCore(IHttpService service) {
+		service.RegisterAction(new ControllerAction("/gossip", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Gossip.ClientRead)),
+			OnGetGossip);
+	}
+
+	private void OnGetGossip(HttpEntityManager entity, UriTemplateMatch match) {
+		var duration = _tracker.Start();
+		var sendToHttpEnvelope = new SendToHttpEnvelope(
+			_networkSendQueue, entity, Format.SendPublicGossip,
+			(e, m) => {
+				duration.Dispose();
+				return Configure.Ok(e.ResponseCodec.ContentType, Helper.UTF8NoBom, null, null, false);
+			});
+		Publish(new GossipMessage.ClientGossip(sendToHttpEnvelope));
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Controllers/HttpHelpers.cs b/src/KurrentDB.Core/Services/Transport/Http/Controllers/HttpHelpers.cs
new file mode 100644
index 00000000000..3a3e7b3ded1
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Controllers/HttpHelpers.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.Codecs;
+using KurrentDB.Transport.Http.EntityManagement;
+
+namespace KurrentDB.Core.Services.Transport.Http.Controllers;
+
+public static class HttpHelpers {
+	public static void RegisterRedirectAction(IHttpService service, string fromUrl, string toUrl) {
+		service.RegisterAction(
+			new ControllerAction(
+				fromUrl,
+				HttpMethod.Get,
+				Codec.NoCodecs,
+				new ICodec[] { Codec.ManualEncoding },
+				new Operation(Operations.Node.Redirect)),
+			(http, match) => http.ReplyTextContent(
+				"Moved", 302, "Found", ContentType.PlainText,
+				new[] {
+					new KeyValuePair<string, string>(
+						"Location", new Uri(match.BaseUri, toUrl).AbsoluteUri)
+				}, Console.WriteLine));
+	}
+
+	public static void Reply(
+		this HttpEntityManager http, string response, int code, string description, string contentType,
+		IEnumerable<KeyValuePair<string, string>> headers = null) {
+		http.Reply(Helper.UTF8NoBom.GetBytes(response), code, description, contentType, Helper.UTF8NoBom, headers,
+			exception => { });
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Controllers/InfoController.cs b/src/KurrentDB.Core/Services/Transport/Http/Controllers/InfoController.cs
new file mode 100644
index 00000000000..f07c9a58810
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Controllers/InfoController.cs
@@ -0,0 +1,121 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using EventStore.Plugins.Authentication;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.Codecs;
+using KurrentDB.Transport.Http.EntityManagement;
+using Newtonsoft.Json.Linq;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Transport.Http.Controllers;
+
+public class InfoController : IHttpController, IHandle<SystemMessage.StateChangeMessage> {
+	private static readonly ILogger Log = Serilog.Log.ForContext<InfoController>();
+	private static readonly ICodec[] SupportedCodecs = { Codec.Json, Codec.Xml, Codec.ApplicationXml, Codec.Text };
+
+	private readonly ClusterVNodeOptions _options;
+	private readonly IDictionary<string, bool> _features;
+	private readonly IAuthenticationProvider _authenticationProvider;
+	private VNodeState _currentState;
+
+	public InfoController(ClusterVNodeOptions options, IDictionary<string, bool> features,
+		IAuthenticationProvider authenticationProvider) {
+		_options = options;
+		_features = features;
+		_authenticationProvider = authenticationProvider;
+	}
+
+	public void Subscribe(IHttpService service) {
+		Ensure.NotNull(service, "service");
+
+		service.RegisterAction(
+			new("/info", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs,
+				new Operation(Operations.Node.Information.Read)),
+			OnGetInfo);
+		service.RegisterAction(
+			new("/info/options", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs,
+				new Operation(Operations.Node.Information.Options)),
+			OnGetOptions);
+	}
+
+	public void Handle(SystemMessage.StateChangeMessage message) =>
+		_currentState = message.State;
+
+	private void OnGetInfo(HttpEntityManager entity, UriTemplateMatch match) {
+		entity.ReplyTextContent(
+			Codec.Json.To(
+				new {
+					DBVersion = VersionInfo.Version,
+					ESVersion = VersionInfo.Version,
+					State = _currentState.ToString().ToLower(),
+					Features = _features,
+					Authentication = GetAuthenticationInfo()
+				}
+			),
+			HttpStatusCode.OK,
+			"OK",
+			entity.ResponseCodec.ContentType,
+			null,
+			e => Log.Error(e, "Error while writing HTTP response (info)"));
+	}
+
+	private Dictionary<string, object> GetAuthenticationInfo() {
+		if (_authenticationProvider == null)
+			return null;
+
+		return new() {
+			{ "type", _authenticationProvider.Name },
+			{ "properties", _authenticationProvider.GetPublicProperties() }
+		};
+	}
+
+	private void OnGetOptions(HttpEntityManager entity, UriTemplateMatch match) {
+		if (entity.User != null && (entity.User.LegacyRoleCheck(SystemRoles.Operations) ||
+									entity.User.LegacyRoleCheck(SystemRoles.Admins))) {
+			var options = _options.LoadedOptions.Values.Select(
+				x => new OptionStructure {
+					Name = x.Metadata.Name,
+					Description = x.Metadata.Description,
+					Group = x.Metadata.SectionMetadata.SectionType.Name,
+					Value = x.DisplayValue,
+					ConfigurationSource = x.SourceDisplayName,
+					DeprecationMessage = x.Metadata.DeprecationMessage,
+					Schema = x.Metadata.OptionSchema
+				}
+			);
+
+			entity.ReplyTextContent(
+				Codec.Json.To(options),
+				HttpStatusCode.OK,
+				"OK",
+				entity.ResponseCodec.ContentType,
+				null,
+				e => Log.Error(e, "error while writing HTTP response (options)")
+			);
+		} else {
+			entity.ReplyStatus(HttpStatusCode.Unauthorized, "Unauthorized", LogReplyError);
+		}
+	}
+
+	private void LogReplyError(Exception exc) =>
+		Log.Debug("Error while replying (info controller): {e}.", exc.Message);
+
+	public class OptionStructure {
+		public string Name { get; set; }
+		public string Description { get; set; }
+		public string Group { get; set; }
+		public string Value { get; set; }
+		public string ConfigurationSource { get; set; }
+		public string DeprecationMessage { get; set; }
+		public JObject Schema { get; set; }
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Controllers/InfoControllerBuilder.cs b/src/KurrentDB.Core/Services/Transport/Http/Controllers/InfoControllerBuilder.cs
new file mode 100644
index 00000000000..7ad3b291bce
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Controllers/InfoControllerBuilder.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using EventStore.Plugins.Authentication;
+
+namespace KurrentDB.Core.Services.Transport.Http.Controllers;
+
+public class InfoControllerBuilder {
+	private ClusterVNodeOptions _options;
+	private IDictionary<string, bool> _features;
+	private IAuthenticationProvider _authenticationProvider;
+
+	public InfoControllerBuilder WithOptions(ClusterVNodeOptions options) {
+		_options = options;
+		return this;
+
+	}
+
+	public InfoControllerBuilder WithFeatures(IDictionary<string, bool> features) {
+		_features = features;
+		return this;
+	}
+
+	public InfoControllerBuilder WithAuthenticationProvider(IAuthenticationProvider authenticationProvider) {
+		_authenticationProvider = authenticationProvider;
+		return this;
+	}
+
+	public InfoController Build() {
+		return new InfoController(_options, _features, _authenticationProvider);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Controllers/MetricsController.cs b/src/KurrentDB.Core/Services/Transport/Http/Controllers/MetricsController.cs
new file mode 100644
index 00000000000..1818a9e2275
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Controllers/MetricsController.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.Codecs;
+
+namespace KurrentDB.Core.Services.Transport.Http.Controllers;
+
+public class MetricsController : CommunicationController {
+	private static readonly ICodec[] SupportedCodecs = new ICodec[] {
+		Codec.CreateCustom(Codec.Text, ContentType.PlainText, Helper.UTF8NoBom, false, false),
+		Codec.CreateCustom(Codec.Text, ContentType.OpenMetricsText, Helper.UTF8NoBom, false, false),
+	};
+
+	public MetricsController() : base(new NoOpPublisher()) {
+	}
+
+	protected override void SubscribeCore(IHttpService service) {
+		Ensure.NotNull(service, "service");
+
+		// this exists only to specify the permissions required for the /metrics endpoint
+		service.RegisterAction(new ControllerAction("/metrics", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs,
+			new Operation(Operations.Node.Statistics.Read)),
+			(x, y) => {
+				// the PrometheusExporterMiddleware handles the request itself, this will not be called
+				throw new InvalidOperationException();
+			});
+	}
+
+	class NoOpPublisher : IPublisher {
+		public void Publish(Message message) {
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Controllers/PersistentSubscriptionController.cs b/src/KurrentDB.Core/Services/Transport/Http/Controllers/PersistentSubscriptionController.cs
new file mode 100644
index 00000000000..25222a808ea
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Controllers/PersistentSubscriptionController.cs
@@ -0,0 +1,1219 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.PersistentSubscription;
+using KurrentDB.Core.Settings;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.Atom;
+using KurrentDB.Transport.Http.Codecs;
+using KurrentDB.Transport.Http.EntityManagement;
+using Microsoft.Extensions.Primitives;
+using ClientMessages = KurrentDB.Core.Messages.ClientMessage.PersistentSubscriptionNackEvents;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Transport.Http.Controllers;
+
+public class PersistentSubscriptionController : CommunicationController {
+	private readonly IHttpForwarder _httpForwarder;
+	private readonly IPublisher _networkSendQueue;
+	private const int DefaultNumberOfMessagesToGet = 1;
+	private static readonly ICodec[] DefaultCodecs = { Codec.Json, Codec.Xml };
+	public static readonly char[] ETagSeparatorArray = { ';' };
+	private static readonly ICodec[] AtomCodecs = {
+		Codec.CompetingXml,
+		Codec.CompetingJson,
+		Codec.LegacyCompetingJson,
+	};
+
+	private static readonly ILogger Log = Serilog.Log.ForContext<PersistentSubscriptionController>();
+
+	public PersistentSubscriptionController(IHttpForwarder httpForwarder, IPublisher publisher,
+		IPublisher networkSendQueue)
+		: base(publisher) {
+		_httpForwarder = httpForwarder;
+		_networkSendQueue = networkSendQueue;
+	}
+
+	protected override void SubscribeCore(IHttpService service) {
+		Register(service, "/subscriptions?offset={offset}&count={count}", HttpMethod.Get, GetAllSubscriptionInfo, Codec.NoCodecs, DefaultCodecs, new Operation(Operations.Subscriptions.Statistics));
+		Register(service, "/subscriptions/restart", HttpMethod.Post, RestartPersistentSubscriptions, Codec.NoCodecs, DefaultCodecs, new Operation(Operations.Subscriptions.Restart));
+		Register(service, "/subscriptions/{stream}", HttpMethod.Get, GetSubscriptionInfoForStream, Codec.NoCodecs,
+			DefaultCodecs, new Operation(Operations.Subscriptions.Statistics));
+		Register(service, "/subscriptions/{stream}/{subscription}", HttpMethod.Put, PutSubscription, DefaultCodecs,
+			DefaultCodecs, new Operation(Operations.Subscriptions.Create));
+		Register(service, "/subscriptions/{stream}/{subscription}", HttpMethod.Post, PostSubscription,
+			DefaultCodecs, DefaultCodecs, new Operation(Operations.Subscriptions.Update));
+		RegisterUrlBased(service, "/subscriptions/{stream}/{subscription}", HttpMethod.Delete, new Operation(Operations.Subscriptions.Delete), DeleteSubscription);
+		Register(service, "/subscriptions/{stream}/{subscription}", HttpMethod.Get, GetNextNMessages,
+			Codec.NoCodecs, AtomCodecs, WithParameters(Operations.Subscriptions.ProcessMessages));
+		Register(service, "/subscriptions/{stream}/{subscription}?embed={embed}", HttpMethod.Get, GetNextNMessages,
+			Codec.NoCodecs, AtomCodecs, WithParameters(Operations.Subscriptions.ProcessMessages));
+		Register(service, "/subscriptions/{stream}/{subscription}/{count}?embed={embed}", HttpMethod.Get,
+			GetNextNMessages, Codec.NoCodecs, AtomCodecs, WithParameters(Operations.Subscriptions.ProcessMessages));
+		Register(service, "/subscriptions/{stream}/{subscription}/info", HttpMethod.Get, GetSubscriptionInfo,
+			Codec.NoCodecs, DefaultCodecs, new Operation(Operations.Subscriptions.Statistics));
+		RegisterUrlBased(service, "/subscriptions/{stream}/{subscription}/replayParked?stopAt={stopAt}", HttpMethod.Post,
+			WithParameters(Operations.Subscriptions.ReplayParked), ReplayParkedMessages);
+		RegisterUrlBased(service, "/subscriptions/{stream}/{subscription}/ack/{messageid}", HttpMethod.Post,
+			WithParameters(Operations.Subscriptions.ProcessMessages), AckMessage);
+		RegisterUrlBased(service, "/subscriptions/{stream}/{subscription}/nack/{messageid}?action={action}",
+			HttpMethod.Post, WithParameters(Operations.Subscriptions.ProcessMessages), NackMessage);
+		RegisterUrlBased(service, "/subscriptions/{stream}/{subscription}/ack?ids={messageids}", HttpMethod.Post,
+			WithParameters(Operations.Subscriptions.ProcessMessages), AckMessages);
+		RegisterUrlBased(service, "/subscriptions/{stream}/{subscription}/nack?ids={messageids}&action={action}",
+			HttpMethod.Post, WithParameters(Operations.Subscriptions.ProcessMessages), NackMessages);
+		//map view parked messages
+		Register(service,
+			"/subscriptions/viewparkedmessages/{stream}/{group}/{event}/backward/{count}?embed={embed}",
+			HttpMethod.Get,
+			ViewParkedMessagesBackward, Codec.NoCodecs, AtomCodecs,
+			WithParameters(Operations.Subscriptions.Statistics));
+		RegisterCustom(service, "/subscriptions/viewparkedmessages/{stream}/{group}/{event}/forward/{count}?embed={embed}", HttpMethod.Get,
+			ViewParkedMessagesForward, Codec.NoCodecs, AtomCodecs, WithParameters(Operations.Subscriptions.Statistics));
+	}
+	private RequestParams ViewParkedMessagesForward(HttpEntityManager manager, UriTemplateMatch match) {
+		var stream = match.BoundVariables["stream"];
+		var groupName = match.BoundVariables["group"];
+		var evNum = match.BoundVariables["event"];
+		var cnt = match.BoundVariables["count"];
+
+		stream = BuildSubscriptionParkedStreamName(stream, groupName);
+
+		long eventNumber;
+		int count;
+		var embed = GetEmbedLevel(manager, match);
+
+		if (stream.IsEmptyString())
+			return SendBadRequest(manager, string.Format("Invalid stream name '{0}'", stream));
+		if (evNum.IsEmptyString() || !long.TryParse(evNum, out eventNumber) || eventNumber < 0)
+			return SendBadRequest(manager, string.Format("'{0}' is not valid event number", evNum));
+		if (cnt.IsEmptyString() || !int.TryParse(cnt, out count) || count <= 0)
+			return SendBadRequest(manager,
+				string.Format("'{0}' is not valid count. Should be positive integer", cnt));
+		bool resolveLinkTos;
+		if (!GetResolveLinkTos(manager, out resolveLinkTos, true))
+			return SendBadRequest(manager,
+				string.Format("{0} header in wrong format.", SystemHeaders.ResolveLinkTos));
+		if (!GetRequireLeader(manager, out var requireLeader))
+			return SendBadRequest(manager,
+				string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
+		TimeSpan? longPollTimeout;
+		if (!GetLongPoll(manager, out longPollTimeout))
+			return SendBadRequest(manager, string.Format("{0} header in wrong format.", SystemHeaders.LongPoll));
+		var etag = GetETagStreamVersion(manager);
+
+		GetStreamEventsForward(manager, stream, eventNumber, count, resolveLinkTos, requireLeader, etag,
+			longPollTimeout, embed);
+		return new RequestParams((longPollTimeout ?? TimeSpan.Zero) + ESConsts.HttpTimeout);
+	}
+	private bool GetLongPoll(HttpEntityManager manager, out TimeSpan? longPollTimeout) {
+		longPollTimeout = null;
+		var longPollHeader = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.LongPoll);
+		if (StringValues.IsNullOrEmpty(longPollHeader))
+			longPollHeader = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.LegacyLongPoll);
+
+		if (StringValues.IsNullOrEmpty(longPollHeader))
+			return true;
+		int longPollSec;
+		if (int.TryParse(longPollHeader, out longPollSec) && longPollSec > 0) {
+			longPollTimeout = TimeSpan.FromSeconds(longPollSec);
+			return true;
+		}
+
+		return false;
+	}
+	private void GetStreamEventsForward(HttpEntityManager manager, string stream, long eventNumber, int count,
+		bool resolveLinkTos, bool requireLeader, long? etag, TimeSpan? longPollTimeout, EmbedLevel embed) {
+		var envelope = new SendToHttpEnvelope(_networkSendQueue,
+			manager,
+			(ent, msg) => Format.GetStreamEventsForward(ent, msg, embed),
+			Configure.GetStreamEventsForward);
+		var corrId = Guid.NewGuid();
+		Publish(new ClientMessage.ReadStreamEventsForward(corrId, corrId, envelope, stream, eventNumber, count,
+			resolveLinkTos, requireLeader, etag, manager.User,
+			replyOnExpired: false,
+			longPollTimeout: longPollTimeout));
+	}
+	private void ViewParkedMessagesBackward(HttpEntityManager http, UriTemplateMatch match) {
+		var stream = match.BoundVariables["stream"];
+		var groupName = match.BoundVariables["group"];
+		var evNum = match.BoundVariables["event"];
+		var cnt = match.BoundVariables["count"];
+
+		stream = BuildSubscriptionParkedStreamName(stream, groupName);
+
+		long eventNumber = -1;
+		int count = AtomSpecs.FeedPageSize;
+		var embed = GetEmbedLevel(http, match);
+
+		if (stream.IsEmptyString()) {
+			SendBadRequest(http, string.Format("Invalid stream name '{0}'", stream));
+			return;
+		}
+
+		if (evNum != null && evNum != "head" && (!long.TryParse(evNum, out eventNumber) || eventNumber < 0)) {
+			SendBadRequest(http, string.Format("'{0}' is not valid event number", evNum));
+			return;
+		}
+
+		if (cnt.IsNotEmptyString() && (!int.TryParse(cnt, out count) || count <= 0)) {
+			SendBadRequest(http, string.Format("'{0}' is not valid count. Should be positive integer", cnt));
+			return;
+		}
+
+		bool resolveLinkTos;
+		if (!GetResolveLinkTos(http, out resolveLinkTos, true)) {
+			SendBadRequest(http, string.Format("{0} header in wrong format.", SystemHeaders.ResolveLinkTos));
+			return;
+		}
+
+		if (!GetRequireLeader(http, out var requireLeader)) {
+			SendBadRequest(http, string.Format("{0} header in wrong format.", SystemHeaders.RequireLeader));
+			return;
+		}
+
+		bool headOfStream = eventNumber == -1;
+		GetStreamEventsBackward(http, stream, eventNumber, count, resolveLinkTos, requireLeader, headOfStream,
+			embed);
+	}
+	private void GetStreamEventsBackward(HttpEntityManager manager, string stream, long eventNumber, int count,
+		bool resolveLinkTos, bool requireLeader, bool headOfStream, EmbedLevel embed) {
+		var envelope = new SendToHttpEnvelope(_networkSendQueue,
+			manager,
+			(ent, msg) =>
+				Format.GetStreamEventsBackward(ent, msg, embed, headOfStream),
+			(args, msg) => Configure.GetStreamEventsBackward(args, msg, headOfStream));
+		var corrId = Guid.NewGuid();
+		Publish(new ClientMessage.ReadStreamEventsBackward(corrId, corrId, envelope, stream, eventNumber, count,
+			resolveLinkTos, requireLeader, GetETagStreamVersion(manager), manager.User));
+	}
+	private bool GetRequireLeader(HttpEntityManager manager, out bool requireLeader) {
+		requireLeader = false;
+
+		var onlyLeader = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.RequireLeader);
+		var onlyLeaderLegacy = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.LegacyRequireLeader);
+		var onlyMaster = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.RequireMaster);
+
+		if (StringValues.IsNullOrEmpty(onlyLeader) && StringValues.IsNullOrEmpty(onlyMaster) && StringValues.IsNullOrEmpty(onlyLeaderLegacy))
+			return true;
+
+		if (string.Equals(onlyLeader, "True", StringComparison.OrdinalIgnoreCase) ||
+			string.Equals(onlyLeaderLegacy, "True", StringComparison.OrdinalIgnoreCase) ||
+			string.Equals(onlyMaster, "True", StringComparison.OrdinalIgnoreCase)) {
+			requireLeader = true;
+			return true;
+		}
+
+		return string.Equals(onlyLeader, "False", StringComparison.OrdinalIgnoreCase) ||
+			   string.Equals(onlyLeaderLegacy, "False", StringComparison.OrdinalIgnoreCase) ||
+			   string.Equals(onlyMaster, "False", StringComparison.OrdinalIgnoreCase);
+	}
+	private bool GetResolveLinkTos(HttpEntityManager manager, out bool resolveLinkTos, bool defaultOption = false) {
+		resolveLinkTos = defaultOption;
+		var linkToHeader = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.ResolveLinkTos);
+		if (StringValues.IsNullOrEmpty(linkToHeader))
+			linkToHeader = manager.HttpEntity.Request.GetHeaderValues(SystemHeaders.LegacyResolveLinkTos);
+
+		if (StringValues.IsNullOrEmpty(linkToHeader))
+			return true;
+		if (string.Equals(linkToHeader, "False", StringComparison.OrdinalIgnoreCase)) {
+			return true;
+		}
+
+		if (string.Equals(linkToHeader, "True", StringComparison.OrdinalIgnoreCase)) {
+			resolveLinkTos = true;
+			return true;
+		}
+
+		return false;
+	}
+	private long? GetETagStreamVersion(HttpEntityManager manager) {
+		var etag = manager.HttpEntity.Request.GetHeaderValues("If-None-Match");
+		if (!StringValues.IsNullOrEmpty(etag)) {
+			// etag format is version;contenttypehash
+			var splitted = etag.ToString().Trim('\"').Split(ETagSeparatorArray);
+			if (splitted.Length == 2) {
+				var typeHash = manager.ResponseCodec.ContentType.GetHashCode()
+					.ToString(CultureInfo.InvariantCulture);
+				var res = splitted[1] == typeHash && long.TryParse(splitted[0], out var streamVersion)
+					? (long?)streamVersion
+					: null;
+				return res;
+			}
+		}
+
+		return null;
+	}
+
+	static Func<UriTemplateMatch, Operation> WithParameters(OperationDefinition definition) {
+		return match => {
+			var operation = new Operation(definition);
+			var stream = match.BoundVariables["stream"];
+			if (!string.IsNullOrEmpty(stream))
+				operation = operation.WithParameter(Operations.Subscriptions.Parameters.StreamId(stream));
+			var subscription = match.BoundVariables["subscription"];
+			if (!string.IsNullOrEmpty(subscription))
+				operation = operation.WithParameter(
+					Operations.Subscriptions.Parameters.SubscriptionId(subscription));
+			return operation;
+		};
+	}
+
+	private static ClientMessages.NakAction GetNackAction(HttpEntityManager manager, UriTemplateMatch match,
+		NakAction nakAction = NakAction.Unknown) {
+		var rawValue = match.BoundVariables["action"] ?? string.Empty;
+		switch (rawValue.ToLowerInvariant()) {
+			case "park":
+				return ClientMessages.NakAction.Park;
+			case "retry":
+				return ClientMessages.NakAction.Retry;
+			case "skip":
+				return ClientMessages.NakAction.Skip;
+			case "stop":
+				return ClientMessages.NakAction.Stop;
+			default:
+				return ClientMessages.NakAction.Unknown;
+		}
+	}
+
+	private void AckMessages(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+		var envelope = new NoopEnvelope();
+		var groupname = match.BoundVariables["subscription"];
+		var stream = match.BoundVariables["stream"];
+		var messageIds = match.BoundVariables["messageIds"];
+		var ids = new List<Guid>();
+		foreach (var messageId in messageIds.Split(new[] { ',' })) {
+			Guid id;
+			if (!Guid.TryParse(messageId, out id)) {
+				http.ReplyStatus(HttpStatusCode.BadRequest, "messageid should be a properly formed guid",
+					exception => { });
+				return;
+			}
+
+			ids.Add(id);
+		}
+
+		var cmd = new ClientMessage.PersistentSubscriptionAckEvents(
+			Guid.NewGuid(),
+			Guid.NewGuid(),
+			envelope,
+			BuildSubscriptionGroupKey(stream, groupname),
+			ids.ToArray(),
+			http.User);
+		Publish(cmd);
+		http.ReplyStatus(HttpStatusCode.Accepted, "", exception => { });
+	}
+
+	private void NackMessages(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+		var envelope = new NoopEnvelope();
+		var groupname = match.BoundVariables["subscription"];
+		var stream = match.BoundVariables["stream"];
+		var messageIds = match.BoundVariables["messageIds"];
+		var nakAction = GetNackAction(http, match);
+		var ids = new List<Guid>();
+		foreach (var messageId in messageIds.Split(new[] { ',' })) {
+			Guid id;
+			if (!Guid.TryParse(messageId, out id)) {
+				http.ReplyStatus(HttpStatusCode.BadRequest, "messageid should be a properly formed guid",
+					exception => { });
+				return;
+			}
+
+			ids.Add(id);
+		}
+
+		var cmd = new ClientMessages(
+			Guid.NewGuid(),
+			Guid.NewGuid(),
+			envelope,
+			BuildSubscriptionGroupKey(stream, groupname),
+			"Nacked from HTTP",
+			nakAction,
+			ids.ToArray(),
+			http.User);
+		Publish(cmd);
+		http.ReplyStatus(HttpStatusCode.Accepted, "", exception => { });
+	}
+
+	private static string BuildSubscriptionGroupKey(string stream, string groupName) {
+		return stream + "::" + groupName;
+	}
+
+	private static string BuildSubscriptionParkedStreamName(string stream, string groupName) {
+		return "$persistentsubscription-" + BuildSubscriptionGroupKey(stream, groupName) + "-parked";
+	}
+
+	private void AckMessage(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+		var envelope = new NoopEnvelope();
+		var groupname = match.BoundVariables["subscription"];
+		var stream = match.BoundVariables["stream"];
+		var messageId = match.BoundVariables["messageId"];
+		var id = Guid.NewGuid();
+		if (!Guid.TryParse(messageId, out id)) {
+			http.ReplyStatus(HttpStatusCode.BadRequest, "messageid should be a properly formed guid",
+				exception => { });
+			return;
+		}
+
+		var cmd = new ClientMessage.PersistentSubscriptionAckEvents(
+			Guid.NewGuid(),
+			Guid.NewGuid(),
+			envelope,
+			BuildSubscriptionGroupKey(stream, groupname),
+			new[] { id },
+			http.User);
+		Publish(cmd);
+		http.ReplyStatus(HttpStatusCode.Accepted, "", exception => { });
+	}
+
+	private void NackMessage(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+		var envelope = new NoopEnvelope();
+		var groupname = match.BoundVariables["subscription"];
+		var stream = match.BoundVariables["stream"];
+		var messageId = match.BoundVariables["messageId"];
+		var nakAction = GetNackAction(http, match);
+		var id = Guid.NewGuid();
+		if (!Guid.TryParse(messageId, out id)) {
+			http.ReplyStatus(HttpStatusCode.BadRequest, "messageid should be a properly formed guid",
+				exception => { });
+			return;
+		}
+
+		var cmd = new ClientMessages(
+			Guid.NewGuid(),
+			Guid.NewGuid(),
+			envelope,
+			BuildSubscriptionGroupKey(stream, groupname),
+			"Nacked from HTTP",
+			nakAction,
+			new[] { id },
+			http.User);
+		Publish(cmd);
+		http.ReplyStatus(HttpStatusCode.Accepted, "", exception => { });
+	}
+
+	private void ReplayParkedMessages(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+		var envelope = new SendToHttpEnvelope(
+			_networkSendQueue, http,
+			(args, message) => http.ResponseCodec.To(message),
+			(args, message) => {
+				int code;
+				var m = message as ClientMessage.ReplayMessagesReceived;
+				if (m == null)
+					throw new Exception("unexpected message " + message);
+				switch (m.Result) {
+					case ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.Success:
+						code = HttpStatusCode.OK;
+						break;
+					case ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.DoesNotExist:
+						code = HttpStatusCode.NotFound;
+						break;
+					case ClientMessage.ReplayMessagesReceived.ReplayMessagesReceivedResult.AccessDenied:
+						code = HttpStatusCode.Unauthorized;
+						break;
+					default:
+						code = HttpStatusCode.InternalServerError;
+						break;
+				}
+
+				return new ResponseConfiguration(code, http.ResponseCodec.ContentType,
+					http.ResponseCodec.Encoding);
+			});
+		var groupname = match.BoundVariables["subscription"];
+		var stream = match.BoundVariables["stream"];
+		var stopAtStr = match.BoundVariables["stopAt"];
+
+		long? stopAt;
+		// if stopAt is declared...
+		if (stopAtStr != null) {
+			// check it is valid
+			if (!long.TryParse(stopAtStr, out var stopAtLong) || stopAtLong < 0) {
+				http.ReplyStatus(HttpStatusCode.BadRequest, "stopAt should be a properly formed positive long",
+					exception => { });
+				return;
+			}
+
+			stopAt = stopAtLong;
+		} else {
+			// else it's null
+			stopAt = null;
+		}
+
+		var cmd = new ClientMessage.ReplayParkedMessages(Guid.NewGuid(), Guid.NewGuid(), envelope, stream,
+			groupname, stopAt, http.User);
+		Publish(cmd);
+	}
+
+	private void PutSubscription(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+		var groupname = match.BoundVariables["subscription"];
+		var stream = match.BoundVariables["stream"];
+		var envelope = new SendToHttpEnvelope(
+			_networkSendQueue, http,
+			(args, message) => http.ResponseCodec.To(message),
+			(args, message) => {
+				int code;
+				var m = message as ClientMessage.CreatePersistentSubscriptionToStreamCompleted;
+				if (m == null)
+					throw new Exception("unexpected message " + message);
+				switch (m.Result) {
+					case ClientMessage.CreatePersistentSubscriptionToStreamCompleted.CreatePersistentSubscriptionToStreamResult
+						.Success:
+						code = HttpStatusCode.Created;
+						break;
+					case ClientMessage.CreatePersistentSubscriptionToStreamCompleted.CreatePersistentSubscriptionToStreamResult
+						.AlreadyExists:
+						code = HttpStatusCode.Conflict;
+						break;
+					case ClientMessage.CreatePersistentSubscriptionToStreamCompleted.CreatePersistentSubscriptionToStreamResult
+						.AccessDenied:
+						code = HttpStatusCode.Unauthorized;
+						break;
+					case ClientMessage.CreatePersistentSubscriptionToStreamCompleted.CreatePersistentSubscriptionToStreamResult.Fail:
+						code = HttpStatusCode.BadRequest;
+						break;
+					default:
+						code = HttpStatusCode.InternalServerError;
+						break;
+				}
+
+				return new ResponseConfiguration(code, http.ResponseCodec.ContentType,
+					http.ResponseCodec.Encoding,
+					new KeyValuePair<string, string>("location",
+						MakeUrl(http, "/subscriptions/" + stream + "/" + groupname)));
+			});
+		http.ReadTextRequestAsync(
+			(o, s) => {
+				var data = http.RequestCodec.From<SubscriptionConfigData>(s);
+				var config = ParseConfig(data);
+				if (!ValidateConfig(config, http))
+					return;
+				var message = new ClientMessage.CreatePersistentSubscriptionToStream(Guid.NewGuid(),
+					Guid.NewGuid(),
+					envelope,
+					stream,
+					groupname,
+					config.ResolveLinktos,
+#pragma warning disable 612
+					config.StartPosition != null ? long.Parse(config.StartPosition) : config.StartFrom,
+#pragma warning restore 612
+					config.MessageTimeoutMilliseconds,
+					config.ExtraStatistics,
+					config.MaxRetryCount,
+					config.BufferSize,
+					config.LiveBufferSize,
+					config.ReadBatchSize,
+					config.CheckPointAfterMilliseconds,
+					config.MinCheckPointCount,
+					config.MaxCheckPointCount,
+					config.MaxSubscriberCount,
+					CalculateNamedConsumerStrategyForOldClients(data),
+					http.User);
+				Publish(message);
+			}, x => Log.Debug(x, "Reply Text Content Failed."));
+	}
+
+	private void PostSubscription(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+		var groupname = match.BoundVariables["subscription"];
+		var stream = match.BoundVariables["stream"];
+		var envelope = new SendToHttpEnvelope(
+			_networkSendQueue, http,
+			(args, message) => http.ResponseCodec.To(message),
+			(args, message) => {
+				int code;
+				var m = message as ClientMessage.UpdatePersistentSubscriptionToStreamCompleted;
+				if (m == null)
+					throw new Exception("unexpected message " + message);
+				switch (m.Result) {
+					case ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult
+						.Success:
+						code = HttpStatusCode.OK;
+						//TODO competing return uri to subscription
+						break;
+					case ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult
+						.DoesNotExist:
+						code = HttpStatusCode.NotFound;
+						break;
+					case ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult
+						.AccessDenied:
+						code = HttpStatusCode.Unauthorized;
+						break;
+					case ClientMessage.UpdatePersistentSubscriptionToStreamCompleted.UpdatePersistentSubscriptionToStreamResult
+						.Fail:
+						code = HttpStatusCode.BadRequest;
+						break;
+					default:
+						code = HttpStatusCode.InternalServerError;
+						break;
+				}
+
+				return new ResponseConfiguration(code, http.ResponseCodec.ContentType,
+					http.ResponseCodec.Encoding,
+					new KeyValuePair<string, string>("location",
+						MakeUrl(http, "/subscriptions/" + stream + "/" + groupname)));
+			});
+		http.ReadTextRequestAsync(
+			(o, s) => {
+				var data = http.RequestCodec.From<SubscriptionConfigData>(s);
+				var config = ParseConfig(data);
+				if (!ValidateConfig(config, http))
+					return;
+				var message = new ClientMessage.UpdatePersistentSubscriptionToStream(Guid.NewGuid(),
+					Guid.NewGuid(),
+					envelope,
+					stream,
+					groupname,
+					config.ResolveLinktos,
+#pragma warning disable 612
+					config.StartPosition != null ? long.Parse(config.StartPosition) : config.StartFrom,
+#pragma warning restore 612
+					config.MessageTimeoutMilliseconds,
+					config.ExtraStatistics,
+					config.MaxRetryCount,
+					config.BufferSize,
+					config.LiveBufferSize,
+					config.ReadBatchSize,
+					config.CheckPointAfterMilliseconds,
+					config.MinCheckPointCount,
+					config.MaxCheckPointCount,
+					config.MaxSubscriberCount,
+					CalculateNamedConsumerStrategyForOldClients(data),
+					http.User);
+				Publish(message);
+			}, x => Log.Debug(x, "Reply Text Content Failed."));
+	}
+
+	private SubscriptionConfigData ParseConfig(SubscriptionConfigData config) {
+		if (config == null) {
+			return new SubscriptionConfigData();
+		}
+
+		return new SubscriptionConfigData {
+			ResolveLinktos = config.ResolveLinktos,
+#pragma warning disable 612
+			StartFrom = config.StartFrom,
+#pragma warning restore 612
+			StartPosition = config.StartPosition,
+			MessageTimeoutMilliseconds = config.MessageTimeoutMilliseconds,
+			ExtraStatistics = config.ExtraStatistics,
+			MaxRetryCount = config.MaxRetryCount,
+			BufferSize = config.BufferSize,
+			LiveBufferSize = config.LiveBufferSize,
+			ReadBatchSize = config.ReadBatchSize,
+			CheckPointAfterMilliseconds = config.CheckPointAfterMilliseconds,
+			MinCheckPointCount = config.MinCheckPointCount,
+			MaxCheckPointCount = config.MaxCheckPointCount,
+			MaxSubscriberCount = config.MaxSubscriberCount
+		};
+	}
+
+	private bool ValidateConfig(SubscriptionConfigData config, HttpEntityManager http) {
+		if (config.BufferSize <= 0) {
+			SendBadRequest(
+				http,
+				string.Format(
+					"Buffer Size ({0}) must be positive",
+					config.BufferSize));
+			return false;
+		}
+
+		if (config.LiveBufferSize <= 0) {
+			SendBadRequest(
+				http,
+				string.Format(
+					"Live Buffer Size ({0}) must be positive",
+					config.LiveBufferSize));
+			return false;
+		}
+
+		if (config.ReadBatchSize <= 0) {
+			SendBadRequest(
+				http,
+				string.Format(
+					"Read Batch Size ({0}) must be positive",
+					config.ReadBatchSize));
+			return false;
+		}
+
+		if (!(config.BufferSize > config.ReadBatchSize)) {
+			SendBadRequest(
+				http,
+				string.Format(
+					"BufferSize ({0}) must be larger than ReadBatchSize ({1})",
+					config.BufferSize, config.ReadBatchSize));
+			return false;
+		}
+
+		return true;
+	}
+
+	private static string CalculateNamedConsumerStrategyForOldClients(SubscriptionConfigData data) {
+		var namedConsumerStrategy = data == null ? null : data.NamedConsumerStrategy;
+		if (string.IsNullOrEmpty(namedConsumerStrategy)) {
+			var preferRoundRobin = data == null || data.PreferRoundRobin;
+			namedConsumerStrategy = preferRoundRobin
+				? SystemConsumerStrategies.RoundRobin
+				: SystemConsumerStrategies.DispatchToSingle;
+		}
+
+		return namedConsumerStrategy;
+	}
+
+	private void DeleteSubscription(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+		var envelope = new SendToHttpEnvelope(
+			_networkSendQueue, http,
+			(args, message) => http.ResponseCodec.To(message),
+			(args, message) => {
+				int code;
+				var m = message as ClientMessage.DeletePersistentSubscriptionToStreamCompleted;
+				if (m == null)
+					throw new Exception("unexpected message " + message);
+				switch (m.Result) {
+					case ClientMessage.DeletePersistentSubscriptionToStreamCompleted.DeletePersistentSubscriptionToStreamResult
+						.Success:
+						code = HttpStatusCode.OK;
+						break;
+					case ClientMessage.DeletePersistentSubscriptionToStreamCompleted.DeletePersistentSubscriptionToStreamResult
+						.DoesNotExist:
+						code = HttpStatusCode.NotFound;
+						break;
+					case ClientMessage.DeletePersistentSubscriptionToStreamCompleted.DeletePersistentSubscriptionToStreamResult
+						.AccessDenied:
+						code = HttpStatusCode.Unauthorized;
+						break;
+					case ClientMessage.DeletePersistentSubscriptionToStreamCompleted.DeletePersistentSubscriptionToStreamResult
+						.Fail:
+						code = HttpStatusCode.BadRequest;
+						break;
+					default:
+						code = HttpStatusCode.InternalServerError;
+						break;
+				}
+
+				return new ResponseConfiguration(code, http.ResponseCodec.ContentType,
+					http.ResponseCodec.Encoding);
+			});
+		var groupname = match.BoundVariables["subscription"];
+		var stream = match.BoundVariables["stream"];
+		var cmd = new ClientMessage.DeletePersistentSubscriptionToStream(Guid.NewGuid(), Guid.NewGuid(), envelope, stream,
+			groupname, http.User);
+		Publish(cmd);
+	}
+
+	private void RestartPersistentSubscriptions(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+
+		var envelope = new SendToHttpEnvelope<SubscriptionMessage.PersistentSubscriptionsRestarting>(_networkSendQueue, http,
+			(e, message) => e.To("Restarting"),
+			(e, message) => {
+				switch (message) {
+					case SubscriptionMessage.PersistentSubscriptionsRestarting _:
+						return Configure.Ok(e.ContentType);
+					default:
+						return Configure.InternalServerError();
+				}
+			}, CreateErrorEnvelope(http)
+		);
+
+		Publish(new SubscriptionMessage.PersistentSubscriptionsRestart(envelope));
+	}
+
+	private void GetAllSubscriptionInfo(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+		var offsetParam = match.BoundVariables["offset"];
+		var countParam = match.BoundVariables["count"];
+		if (offsetParam is null && countParam is null) {
+			GetSubscriptionInfoUnpaged(http);
+		} else {
+			GetSubscriptionInfoPaged(http, offsetParam, countParam);
+		}
+
+		// old api for backwards compatibility: just returns the list of persistent subscriptions
+		void GetSubscriptionInfoUnpaged(HttpEntityManager http) {
+			var envelope = new SendToHttpEnvelope(
+				_networkSendQueue, http,
+				(args, message) =>
+					http.ResponseCodec.To(ToSummaryDto(http,
+						message as MonitoringMessage.GetPersistentSubscriptionStatsCompleted).ToArray()),
+				(args, message) => StatsConfiguration(http, message));
+			var cmd = new MonitoringMessage.GetAllPersistentSubscriptionStats(envelope);
+			Publish(cmd);
+		}
+
+		// new api: returns the list (page) of persistent subscriptions with paging info.
+		// count must be provided
+		void GetSubscriptionInfoPaged(HttpEntityManager http, string offsetParam, string countParam) {
+			int offset = offsetParam is null
+				? 0
+				: int.TryParse(offsetParam, out var off)
+					? off
+					: -1;
+
+			if (offset < 0) {
+				SendBadRequest(http, $"Offset \"{offsetParam}\" must be a non-negative integer");
+				return;
+			}
+
+			if (!int.TryParse(countParam, out var count) || count < 1) {
+				SendBadRequest(http, $"Count \"{countParam}\" must be a positive integer");
+				return;
+			}
+
+			var envelope = new SendToHttpEnvelope(
+				_networkSendQueue, http,
+				(_, message) =>
+					http.ResponseCodec.To(ToPagedSummaryDto(
+						http, message as MonitoringMessage.GetPersistentSubscriptionStatsCompleted)),
+				(_, message) => StatsConfiguration(http, message));
+			var cmd = new MonitoringMessage.GetAllPersistentSubscriptionStats(envelope, offset, count);
+			Publish(cmd);
+		}
+	}
+
+	private void GetSubscriptionInfoForStream(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+		var stream = match.BoundVariables["stream"];
+		var envelope = new SendToHttpEnvelope(
+			_networkSendQueue, http,
+			(args, message) =>
+				http.ResponseCodec.To(ToSummaryDto(http,
+					message as MonitoringMessage.GetPersistentSubscriptionStatsCompleted).ToArray()),
+			(args, message) => StatsConfiguration(http, message));
+		var cmd = new MonitoringMessage.GetStreamPersistentSubscriptionStats(envelope, stream);
+		Publish(cmd);
+	}
+
+	private void GetSubscriptionInfo(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+		var stream = match.BoundVariables["stream"];
+		var groupName = match.BoundVariables["subscription"];
+		var envelope = new SendToHttpEnvelope(
+			_networkSendQueue, http,
+			(args, message) =>
+				http.ResponseCodec.To(
+					ToDto(http, message as MonitoringMessage.GetPersistentSubscriptionStatsCompleted)
+						.FirstOrDefault()),
+			(args, message) => StatsConfiguration(http, message));
+		var cmd = new MonitoringMessage.GetPersistentSubscriptionStats(envelope, stream, groupName);
+		Publish(cmd);
+	}
+
+	private IEnvelope CreateErrorEnvelope(HttpEntityManager http) {
+		return new SendToHttpEnvelope<SubscriptionMessage.InvalidPersistentSubscriptionsRestart>(
+			_networkSendQueue,
+			http,
+			ErrorFormatter,
+			ErrorConfigurator,
+			null);
+	}
+
+	private ResponseConfiguration ErrorConfigurator(ICodec codec, SubscriptionMessage.InvalidPersistentSubscriptionsRestart message) {
+		return new ResponseConfiguration(HttpStatusCode.BadRequest, "Bad Request", ContentType.PlainText,
+			Helper.UTF8NoBom);
+	}
+
+	private string ErrorFormatter(ICodec codec, SubscriptionMessage.InvalidPersistentSubscriptionsRestart message) {
+		return message.Reason;
+	}
+
+
+	private static ResponseConfiguration StatsConfiguration(HttpEntityManager http, Message message) {
+		int code;
+		var m = message as MonitoringMessage.GetPersistentSubscriptionStatsCompleted;
+		if (m == null)
+			throw new Exception("unexpected message " + message);
+		switch (m.Result) {
+			case MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.Success:
+				code = HttpStatusCode.OK;
+				break;
+			case MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotFound:
+				code = HttpStatusCode.NotFound;
+				break;
+			case MonitoringMessage.GetPersistentSubscriptionStatsCompleted.OperationStatus.NotReady:
+				code = HttpStatusCode.ServiceUnavailable;
+				break;
+			default:
+				code = HttpStatusCode.InternalServerError;
+				break;
+		}
+
+		return new ResponseConfiguration(code, http.ResponseCodec.ContentType,
+			http.ResponseCodec.Encoding);
+	}
+
+	private void GetNextNMessages(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+		var groupname = match.BoundVariables["subscription"];
+		var stream = match.BoundVariables["stream"];
+		var cnt = match.BoundVariables["count"];
+		var embed = GetEmbedLevel(http, match);
+		int count = DefaultNumberOfMessagesToGet;
+		if (!cnt.IsEmptyString() && (!int.TryParse(cnt, out count) || count > 100 || count < 1)) {
+			SendBadRequest(http,
+				string.Format("Message count must be an integer between 1 and 100 'count' ='{0}'", count));
+			return;
+		}
+
+		var envelope = new SendToHttpEnvelope(
+			_networkSendQueue, http,
+			(args, message) => Format.ReadNextNPersistentMessagesCompleted(http,
+				message as ClientMessage.ReadNextNPersistentMessagesCompleted, stream, groupname, count, embed),
+			(args, message) => {
+				int code;
+				var m = message as ClientMessage.ReadNextNPersistentMessagesCompleted;
+				if (m == null)
+					throw new Exception("unexpected message " + message);
+				switch (m.Result) {
+					case
+						ClientMessage.ReadNextNPersistentMessagesCompleted.ReadNextNPersistentMessagesResult
+							.Success:
+						code = HttpStatusCode.OK;
+						break;
+					case
+						ClientMessage.ReadNextNPersistentMessagesCompleted.ReadNextNPersistentMessagesResult
+							.DoesNotExist:
+						code = HttpStatusCode.NotFound;
+						break;
+					case
+						ClientMessage.ReadNextNPersistentMessagesCompleted.ReadNextNPersistentMessagesResult
+							.AccessDenied:
+						code = HttpStatusCode.Unauthorized;
+						break;
+					case
+						ClientMessage.ReadNextNPersistentMessagesCompleted.ReadNextNPersistentMessagesResult
+							.Fail:
+						code = HttpStatusCode.BadRequest;
+						break;
+					default:
+						code = HttpStatusCode.InternalServerError;
+						break;
+				}
+
+				return new ResponseConfiguration(code, http.ResponseCodec.ContentType,
+					http.ResponseCodec.Encoding);
+			});
+
+		var cmd = new ClientMessage.ReadNextNPersistentMessages(
+			Guid.NewGuid(),
+			Guid.NewGuid(),
+			envelope,
+			stream,
+			groupname,
+			count,
+			http.User);
+		Publish(cmd);
+	}
+
+	private static EmbedLevel GetEmbedLevel(HttpEntityManager manager, UriTemplateMatch match,
+		EmbedLevel htmlLevel = EmbedLevel.PrettyBody) {
+		if (manager.ResponseCodec is IRichAtomCodec)
+			return htmlLevel;
+		var rawValue = match.BoundVariables["embed"] ?? string.Empty;
+		switch (rawValue.ToLowerInvariant()) {
+			case "content":
+				return EmbedLevel.Content;
+			case "rich":
+				return EmbedLevel.Rich;
+			case "body":
+				return EmbedLevel.Body;
+			case "pretty":
+				return EmbedLevel.PrettyBody;
+			case "tryharder":
+				return EmbedLevel.TryHarder;
+			default:
+				return EmbedLevel.None;
+		}
+	}
+
+	string parkedMessageUriTemplate =
+		"/streams/" + Uri.EscapeDataString("$persistentsubscription") + "-{0}::{1}-parked";
+
+	private IEnumerable<SubscriptionInfo> ToDto(HttpEntityManager manager,
+		MonitoringMessage.GetPersistentSubscriptionStatsCompleted message) {
+		if (message == null)
+			yield break;
+		if (message.SubscriptionStats == null)
+			yield break;
+
+		foreach (var stat in message.SubscriptionStats) {
+			string escapedStreamId = Uri.EscapeDataString(stat.EventSource);
+			string escapedGroupName = Uri.EscapeDataString(stat.GroupName);
+			var info = new SubscriptionInfo {
+				Links = new List<RelLink>() {
+					new RelLink(
+						MakeUrl(manager,
+							string.Format("/subscriptions/{0}/{1}/info", escapedStreamId, escapedGroupName)),
+						"detail"),
+					new RelLink(
+						MakeUrl(manager,
+							string.Format("/subscriptions/{0}/{1}/replayParked", escapedStreamId,
+								escapedGroupName)), "replayParked")
+				},
+				EventStreamId = stat.EventSource,
+				GroupName = stat.GroupName,
+				Status = stat.Status,
+				AverageItemsPerSecond = stat.AveragePerSecond,
+				TotalItemsProcessed = stat.TotalItems,
+				CountSinceLastMeasurement = stat.CountSinceLastMeasurement,
+#pragma warning disable 612
+				LastKnownEventNumber = long.TryParse(stat.LastKnownEventPosition, out var lastKnownMsg) ? lastKnownMsg : 0,
+#pragma warning restore 612
+				LastKnownEventPosition = stat.LastKnownEventPosition,
+#pragma warning disable 612
+				LastProcessedEventNumber = long.TryParse(stat.LastCheckpointedEventPosition, out var lastProcessedPos) ? lastProcessedPos : 0,
+#pragma warning restore 612
+				LastCheckpointedEventPosition = stat.LastCheckpointedEventPosition,
+				ReadBufferCount = stat.ReadBufferCount,
+				LiveBufferCount = stat.LiveBufferCount,
+				RetryBufferCount = stat.RetryBufferCount,
+				TotalInFlightMessages = stat.TotalInFlightMessages,
+				OutstandingMessagesCount = stat.OutstandingMessagesCount,
+				ParkedMessageUri = MakeUrl(manager,
+					string.Format(parkedMessageUriTemplate, escapedStreamId, escapedGroupName)),
+				GetMessagesUri = MakeUrl(manager,
+					string.Format("/subscriptions/{0}/{1}/{2}", escapedStreamId, escapedGroupName,
+						DefaultNumberOfMessagesToGet)),
+				Config = new SubscriptionConfigData {
+					CheckPointAfterMilliseconds = stat.CheckPointAfterMilliseconds,
+					BufferSize = stat.BufferSize,
+					LiveBufferSize = stat.LiveBufferSize,
+					MaxCheckPointCount = stat.MaxCheckPointCount,
+					MaxRetryCount = stat.MaxRetryCount,
+					MessageTimeoutMilliseconds = stat.MessageTimeoutMilliseconds,
+					MinCheckPointCount = stat.MinCheckPointCount,
+					NamedConsumerStrategy = stat.NamedConsumerStrategy,
+					PreferRoundRobin = stat.NamedConsumerStrategy == SystemConsumerStrategies.RoundRobin,
+					ReadBatchSize = stat.ReadBatchSize,
+					ResolveLinktos = stat.ResolveLinktos,
+#pragma warning disable 612
+					StartFrom = long.TryParse(stat.StartFrom, out var startFrom) ? startFrom : 0,
+#pragma warning restore 612
+					StartPosition = stat.StartFrom,
+					ExtraStatistics = stat.ExtraStatistics,
+					MaxSubscriberCount = stat.MaxSubscriberCount,
+				},
+				Connections = new List<ConnectionInfo>(),
+				ParkedMessageCount = stat.ParkedMessageCount
+			};
+			if (stat.Connections != null) {
+				foreach (var connection in stat.Connections) {
+					info.Connections.Add(new ConnectionInfo {
+						Username = connection.Username,
+						From = connection.From,
+						AverageItemsPerSecond = connection.AverageItemsPerSecond,
+						CountSinceLastMeasurement = connection.CountSinceLastMeasurement,
+						TotalItemsProcessed = connection.TotalItems,
+						AvailableSlots = connection.AvailableSlots,
+						InFlightMessages = connection.InFlightMessages,
+						ExtraStatistics = connection.ObservedMeasurements ?? new List<Measurement>(),
+						ConnectionName = connection.ConnectionName,
+					});
+				}
+			}
+
+			yield return info;
+		}
+	}
+
+	private PagedSubscriptionInfo ToPagedSummaryDto(HttpEntityManager manager,
+		MonitoringMessage.GetPersistentSubscriptionStatsCompleted message) {
+
+		if (message is null || message.SubscriptionStats is null) {
+			return new PagedSubscriptionInfo();
+		}
+
+		var stats = ToSummaryDto(manager, message).ToArray();
+		var offset = message.RequestedOffset;
+		var count = message.RequestedCount;
+		var links = new List<RelLink> {
+			new(MakeUrl(manager, "/subscriptions", $"?offset={offset}&count={count}"), "self"),
+			new(MakeUrl(manager, "/subscriptions", $"?offset=0&count={count}"), "first"),
+		};
+		if (offset > 0) {
+			var prevOffset = Math.Max(0, offset - count);
+			links.Add(new RelLink(MakeUrl(manager, "/subscriptions", $"?offset={prevOffset}&count={count}"), "previous"));
+		}
+		if (offset + count < message.Total) {
+			var nextOffset = offset + count;
+			links.Add(new RelLink(MakeUrl(manager, "/subscriptions", $"?offset={nextOffset}&count={count}"), "next"));
+		}
+		return new PagedSubscriptionInfo {
+			Links = links,
+			Offset = offset,
+			Count = count,
+			Total = message.Total,
+			Subscriptions = stats,
+		};
+	}
+
+	private IEnumerable<SubscriptionSummary> ToSummaryDto(HttpEntityManager manager,
+		MonitoringMessage.GetPersistentSubscriptionStatsCompleted message) {
+		if (message == null)
+			yield break;
+		if (message.SubscriptionStats == null)
+			yield break;
+
+		foreach (var stat in message.SubscriptionStats) {
+			string escapedStreamId = Uri.EscapeDataString(stat.EventSource);
+			string escapedGroupName = Uri.EscapeDataString(stat.GroupName);
+			var info = new SubscriptionSummary {
+				Links = new List<RelLink>() {
+					new RelLink(
+						MakeUrl(manager,
+							string.Format("/subscriptions/{0}/{1}/info", escapedStreamId, escapedGroupName)),
+						"detail"),
+				},
+				EventStreamId = stat.EventSource,
+				GroupName = stat.GroupName,
+				Status = stat.Status,
+				AverageItemsPerSecond = stat.AveragePerSecond,
+				TotalItemsProcessed = stat.TotalItems,
+#pragma warning disable 612
+				LastKnownEventNumber = long.TryParse(stat.LastKnownEventPosition, out var lastKnownMsg) ? lastKnownMsg : 0,
+#pragma warning restore 612
+				LastKnownEventPosition = stat.LastKnownEventPosition,
+#pragma warning disable 612
+				LastProcessedEventNumber = long.TryParse(stat.LastCheckpointedEventPosition, out var lastEventPos) ? lastEventPos : 0,
+#pragma warning restore 612
+				LastCheckpointedEventPosition = stat.LastCheckpointedEventPosition,
+				ParkedMessageUri = MakeUrl(manager,
+					string.Format(parkedMessageUriTemplate, escapedStreamId, escapedGroupName)),
+				GetMessagesUri = MakeUrl(manager,
+					string.Format("/subscriptions/{0}/{1}/{2}", escapedStreamId, escapedGroupName,
+						DefaultNumberOfMessagesToGet)),
+				TotalInFlightMessages = stat.TotalInFlightMessages,
+			};
+			if (stat.Connections != null) {
+				info.ConnectionCount = stat.Connections.Count;
+			}
+
+			yield return info;
+		}
+	}
+
+	public class SubscriptionConfigData {
+		public bool ResolveLinktos { get; set; }
+		[Obsolete] public long StartFrom { get; set; }
+		public string StartPosition { get; set; }
+		public int MessageTimeoutMilliseconds { get; set; }
+		public bool ExtraStatistics { get; set; }
+		public int MaxRetryCount { get; set; }
+		public int LiveBufferSize { get; set; }
+		public int BufferSize { get; set; }
+		public int ReadBatchSize { get; set; }
+		public bool PreferRoundRobin { get; set; }
+		public int CheckPointAfterMilliseconds { get; set; }
+		public int MinCheckPointCount { get; set; }
+		public int MaxCheckPointCount { get; set; }
+		public int MaxSubscriberCount { get; set; }
+		public string NamedConsumerStrategy { get; set; }
+
+		public SubscriptionConfigData() {
+#pragma warning disable 612
+			StartFrom = 0;
+#pragma warning restore 612
+			StartPosition = null;
+			MessageTimeoutMilliseconds = 10000;
+			MaxRetryCount = 10;
+			CheckPointAfterMilliseconds = 1000;
+			MinCheckPointCount = 10;
+			MaxCheckPointCount = 500;
+			MaxSubscriberCount = 10;
+			NamedConsumerStrategy = "RoundRobin";
+
+			BufferSize = 500;
+			LiveBufferSize = 500;
+			ReadBatchSize = 20;
+		}
+	}
+
+	public class PagedSubscriptionInfo {
+		public List<RelLink> Links { get; set; }
+		public int Offset { get; set; }
+		public int Count { get; set; }
+		public int Total { get; set; }
+		public IReadOnlyList<SubscriptionSummary> Subscriptions { get; set; }
+	}
+
+	public class SubscriptionSummary {
+		public List<RelLink> Links { get; set; }
+		public string EventStreamId { get; set; }
+		public string GroupName { get; set; }
+		public string ParkedMessageUri { get; set; }
+		public string GetMessagesUri { get; set; }
+		public string Status { get; set; }
+		public decimal AverageItemsPerSecond { get; set; }
+		public long TotalItemsProcessed { get; set; }
+		[Obsolete] public long LastProcessedEventNumber { get; set; }
+		public string LastCheckpointedEventPosition { get; set; }
+		[Obsolete] public long LastKnownEventNumber { get; set; }
+		public string LastKnownEventPosition { get; set; }
+		public int ConnectionCount { get; set; }
+		public int TotalInFlightMessages { get; set; }
+	}
+
+	public class SubscriptionInfo {
+		public List<RelLink> Links { get; set; }
+		public SubscriptionConfigData Config { get; set; }
+		public string EventStreamId { get; set; }
+		public string GroupName { get; set; }
+		public string Status { get; set; }
+		public decimal AverageItemsPerSecond { get; set; }
+		public string ParkedMessageUri { get; set; }
+		public string GetMessagesUri { get; set; }
+		public long TotalItemsProcessed { get; set; }
+		public long CountSinceLastMeasurement { get; set; }
+		[Obsolete] public long LastProcessedEventNumber { get; set; }
+		public string LastCheckpointedEventPosition { get; set; }
+		[Obsolete] public long LastKnownEventNumber { get; set; }
+		public string LastKnownEventPosition { get; set; }
+		public int ReadBufferCount { get; set; }
+		public long LiveBufferCount { get; set; }
+		public int RetryBufferCount { get; set; }
+		public int TotalInFlightMessages { get; set; }
+		public int OutstandingMessagesCount { get; set; }
+		public List<ConnectionInfo> Connections { get; set; }
+		public long ParkedMessageCount { get; set; }
+	}
+
+	public class ConnectionInfo {
+		public string From { get; set; }
+		public string Username { get; set; }
+		public decimal AverageItemsPerSecond { get; set; }
+		public long TotalItemsProcessed { get; set; }
+		public long CountSinceLastMeasurement { get; set; }
+		public List<Measurement> ExtraStatistics { get; set; }
+		public int AvailableSlots { get; set; }
+		public int InFlightMessages { get; set; }
+		public string ConnectionName { get; set; }
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Controllers/PingController.cs b/src/KurrentDB.Core/Services/Transport/Http/Controllers/PingController.cs
new file mode 100644
index 00000000000..2b77de3d9a2
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Controllers/PingController.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.Codecs;
+using KurrentDB.Transport.Http.EntityManagement;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Transport.Http.Controllers;
+
+public class PingController : IHttpController {
+	private static readonly ILogger Log = Serilog.Log.ForContext<PingController>();
+
+	private static readonly ICodec[] SupportedCodecs = new ICodec[]
+		{Codec.Json, Codec.Xml, Codec.ApplicationXml, Codec.Text};
+
+	public void Subscribe(IHttpService service) {
+		Ensure.NotNull(service, "service");
+		service.RegisterAction(new ControllerAction("/ping", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Ping)),
+			OnGetPing);
+	}
+
+	private void OnGetPing(HttpEntityManager entity, UriTemplateMatch match) {
+		var response = new HttpMessage.TextMessage("Ping request successfully handled");
+		entity.ReplyTextContent(Format.TextMessage(entity, response),
+			HttpStatusCode.OK,
+			"OK",
+			entity.ResponseCodec.ContentType,
+			null,
+			e => Log.Error(e, "Error while writing HTTP response (ping)"));
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Controllers/RelLink.cs b/src/KurrentDB.Core/Services/Transport/Http/Controllers/RelLink.cs
new file mode 100644
index 00000000000..0a133529328
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Controllers/RelLink.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Xml;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+
+namespace KurrentDB.Core.Services.Transport.Http.Controllers;
+
+public class RelLink : IXmlSerializable {
+	public readonly string href;
+	public readonly string rel;
+
+	private RelLink() {
+	}
+
+	public RelLink(string href, string rel) {
+		this.href = href;
+		this.rel = rel;
+	}
+
+	public XmlSchema GetSchema() {
+		return null;
+	}
+
+	public void ReadXml(XmlReader reader) {
+		throw new NotImplementedException("Rel links not deserialized.");
+	}
+
+	public void WriteXml(XmlWriter writer) {
+		if (string.IsNullOrEmpty(href))
+			throw new Exception("null href when serializing a rel link");
+
+		writer.WriteStartElement("link");
+		writer.WriteAttributeString("href", href);
+
+		if (rel != null)
+			writer.WriteAttributeString("rel", rel);
+		writer.WriteEndElement();
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Controllers/StatController.cs b/src/KurrentDB.Core/Services/Transport/Http/Controllers/StatController.cs
new file mode 100644
index 00000000000..f1400697663
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Controllers/StatController.cs
@@ -0,0 +1,115 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.Codecs;
+using KurrentDB.Transport.Http.EntityManagement;
+
+namespace KurrentDB.Core.Services.Transport.Http.Controllers;
+
+public class StatController : CommunicationController {
+	private static readonly ICodec[] SupportedCodecs = new ICodec[] { Codec.Json, Codec.Xml, Codec.ApplicationXml };
+
+	private readonly IPublisher _networkSendQueue;
+
+	public StatController(IPublisher publisher, IPublisher networkSendQueue)
+		: base(publisher) {
+		_networkSendQueue = networkSendQueue;
+	}
+
+	protected override void SubscribeCore(IHttpService service) {
+		Ensure.NotNull(service);
+
+		service.RegisterAction(
+			new("/stats", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Statistics.Read)),
+			OnGetFreshStats);
+		service.RegisterAction(
+			new("/stats/replication", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Statistics.Replication)),
+			OnGetReplicationStats);
+		service.RegisterAction(
+			new("/stats/tcp", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Statistics.Tcp)),
+			OnGetTcpConnectionStats);
+		service.RegisterAction(
+			new("/stats/{*statPath}", HttpMethod.Get, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Node.Statistics.Custom)),
+			OnGetFreshStats);
+	}
+
+	private void OnGetTcpConnectionStats(HttpEntityManager entity, UriTemplateMatch match) {
+		var envelope = new SendToHttpEnvelope(_networkSendQueue,
+			entity,
+			Format.GetFreshTcpConnectionStatsCompleted,
+			Configure.GetFreshTcpConnectionStatsCompleted);
+		Publish(new MonitoringMessage.GetFreshTcpConnectionStats(envelope));
+	}
+
+	private void OnGetFreshStats(HttpEntityManager entity, UriTemplateMatch match) {
+		var envelope = new SendToHttpEnvelope(_networkSendQueue,
+			entity,
+			Format.GetFreshStatsCompleted,
+			Configure.GetFreshStatsCompleted);
+
+		var statPath = match.BoundVariables["statPath"];
+		var statSelector = GetStatSelector(statPath);
+
+		bool useMetadata;
+		if (!bool.TryParse(match.QueryParameters["metadata"], out useMetadata))
+			useMetadata = false;
+
+		bool useGrouping;
+		if (!bool.TryParse(match.QueryParameters["group"], out useGrouping))
+			useGrouping = true;
+
+		if (!useGrouping && !string.IsNullOrEmpty(statPath)) {
+			SendBadRequest(entity, "Dynamic stats selection works only with grouping enabled");
+			return;
+		}
+
+		Publish(new MonitoringMessage.GetFreshStats(envelope, statSelector, useMetadata, useGrouping));
+	}
+
+	private static Func<Dictionary<string, object>, Dictionary<string, object>> GetStatSelector(string statPath) {
+		if (string.IsNullOrEmpty(statPath))
+			return dict => dict;
+
+		//NOTE: this is fix for Mono incompatibility in UriTemplate behavior for /a/b{*C}
+		//todo: use IsMono here?
+		if (statPath.StartsWith("stats/")) {
+			statPath = statPath.Substring(6);
+			if (string.IsNullOrEmpty(statPath))
+				return dict => dict;
+		}
+
+		var groups = statPath.Split('/');
+
+		return dict => {
+			Ensure.NotNull(dict, "dictionary");
+
+			foreach (string groupName in groups) {
+				object item;
+				if (!dict.TryGetValue(groupName, out item))
+					return null;
+
+				dict = item as Dictionary<string, object>;
+
+				if (dict == null)
+					return null;
+			}
+
+			return dict;
+		};
+	}
+
+	private void OnGetReplicationStats(HttpEntityManager entity, UriTemplateMatch match) {
+		var envelope = new SendToHttpEnvelope(_networkSendQueue,
+			entity,
+			Format.GetReplicationStatsCompleted,
+			Configure.GetReplicationStatsCompleted);
+		Publish(new ReplicationMessage.GetReplicationStats(envelope));
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Controllers/UsersController.cs b/src/KurrentDB.Core/Services/Transport/Http/Controllers/UsersController.cs
new file mode 100644
index 00000000000..138339bf8cc
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Controllers/UsersController.cs
@@ -0,0 +1,249 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.Codecs;
+using KurrentDB.Transport.Http.EntityManagement;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Transport.Http.Controllers;
+
+public class UsersController : CommunicationController {
+	private readonly IHttpForwarder _httpForwarder;
+	private readonly IPublisher _networkSendQueue;
+	private static readonly ICodec[] DefaultCodecs = new ICodec[] { Codec.Json, Codec.Xml };
+	private static readonly ILogger Log = Serilog.Log.ForContext<UsersController>();
+
+	public UsersController(IHttpForwarder httpForwarder, IPublisher publisher, IPublisher networkSendQueue)
+		: base(publisher) {
+		_httpForwarder = httpForwarder;
+		_networkSendQueue = networkSendQueue;
+	}
+
+	protected override void SubscribeCore(IHttpService service) {
+		RegisterUrlBased(service, "/users", HttpMethod.Get, new Operation(Operations.Users.List), GetUsers);
+		RegisterUrlBased(service, "/users/", HttpMethod.Get, new Operation(Operations.Users.List), GetUsers);
+		RegisterUrlBased(service, "/users/{login}", HttpMethod.Get, new Operation(Operations.Users.Read), GetUser);
+		RegisterUrlBased(service, "/users/$current", HttpMethod.Get, new Operation(Operations.Users.CurrentUser), GetCurrentUser);
+		Register(service, "/users", HttpMethod.Post, PostUser, DefaultCodecs, DefaultCodecs, new Operation(Operations.Users.Create));
+		Register(service, "/users/", HttpMethod.Post, PostUser, DefaultCodecs, DefaultCodecs, new Operation(Operations.Users.Create));
+		Register(service, "/users/{login}", HttpMethod.Put, PutUser, DefaultCodecs, DefaultCodecs, new Operation(Operations.Users.Update));
+		RegisterUrlBased(service, "/users/{login}", HttpMethod.Delete, new Operation(Operations.Users.Delete), DeleteUser);
+		RegisterUrlBased(service, "/users/{login}/command/enable", HttpMethod.Post, new Operation(Operations.Users.Enable), PostCommandEnable);
+		RegisterUrlBased(service, "/users/{login}/command/disable", HttpMethod.Post, new Operation(Operations.Users.Disable), PostCommandDisable);
+		Register(service, "/users/{login}/command/reset-password", HttpMethod.Post, PostCommandResetPassword,
+			DefaultCodecs, DefaultCodecs, new Operation(Operations.Users.ResetPassword));
+		Register(service, "/users/{login}/command/change-password", HttpMethod.Post, PostCommandChangePassword,
+			DefaultCodecs, DefaultCodecs, ForUser(Operations.Users.ChangePassword));
+	}
+
+	private static Func<UriTemplateMatch, Operation> ForUser(OperationDefinition definition) {
+		return match => new Operation(definition).WithParameter(Operations.Users.Parameters.User(match.BoundVariables["login"]));
+	}
+
+	private void GetUsers(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+
+		var envelope = CreateSendToHttpWithConversionEnvelope(http,
+			(UserManagementMessage.AllUserDetailsResult msg) =>
+				new UserManagementMessage.AllUserDetailsResultHttpFormatted(msg, s => MakeUrl(http, s)));
+
+		var message = new UserManagementMessage.GetAll(envelope, http.User);
+		Publish(message);
+	}
+
+	private void GetUser(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+
+		var envelope = CreateSendToHttpWithConversionEnvelope(http,
+			(UserManagementMessage.UserDetailsResult msg) =>
+				new UserManagementMessage.UserDetailsResultHttpFormatted(msg, s => MakeUrl(http, s)));
+
+		var login = match.BoundVariables["login"];
+		var message = new UserManagementMessage.Get(envelope, http.User, login);
+		Publish(message);
+	}
+
+	private void GetCurrentUser(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+		var envelope = CreateReplyEnvelope<UserManagementMessage.UserDetailsResult>(http);
+		if (http.User == null) {
+			envelope.ReplyWith(
+				new UserManagementMessage.UserDetailsResult(UserManagementMessage.Error.Unauthorized));
+			return;
+		}
+
+		var message = new UserManagementMessage.Get(envelope, http.User, http.User.Identity.Name);
+		Publish(message);
+	}
+
+	private void PostUser(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+		var envelope = CreateReplyEnvelope<UserManagementMessage.UpdateResult>(
+			http, configurator: (codec, result) => {
+				var configuration = AutoConfigurator(codec, result);
+				return configuration.Code == HttpStatusCode.OK
+					? configuration.SetCreated(
+						MakeUrl(http, "/users/" + Uri.EscapeDataString(result.LoginName)))
+					: configuration;
+			});
+		http.ReadTextRequestAsync(
+			(o, s) => {
+				var data = http.RequestCodec.From<PostUserData>(s);
+				var message = new UserManagementMessage.Create(
+					envelope, http.User, data.LoginName, data.FullName, data.Groups, data.Password);
+				Publish(message);
+			}, x => Log.Debug(x, "Reply Text Content Failed."));
+	}
+
+	private void PutUser(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+		var envelope = CreateReplyEnvelope<UserManagementMessage.UpdateResult>(http);
+		http.ReadTextRequestAsync(
+			(o, s) => {
+				var login = match.BoundVariables["login"];
+				var data = http.RequestCodec.From<PutUserData>(s);
+				var message =
+					new UserManagementMessage.Update(envelope, http.User, login, data.FullName, data.Groups);
+				Publish(message);
+			}, x => Log.Debug(x, "Reply Text Content Failed."));
+	}
+
+	private void DeleteUser(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+		var envelope = CreateReplyEnvelope<UserManagementMessage.UpdateResult>(http);
+		var login = match.BoundVariables["login"];
+		var message = new UserManagementMessage.Delete(envelope, http.User, login);
+		Publish(message);
+	}
+
+	private void PostCommandEnable(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+		var envelope = CreateReplyEnvelope<UserManagementMessage.UpdateResult>(http);
+		var login = match.BoundVariables["login"];
+		var message = new UserManagementMessage.Enable(envelope, http.User, login);
+		Publish(message);
+	}
+
+	private void PostCommandDisable(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+		var envelope = CreateReplyEnvelope<UserManagementMessage.UpdateResult>(http);
+		var login = match.BoundVariables["login"];
+		var message = new UserManagementMessage.Disable(envelope, http.User, login);
+		Publish(message);
+	}
+
+	private void PostCommandResetPassword(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+		var envelope = CreateReplyEnvelope<UserManagementMessage.UpdateResult>(http);
+		http.ReadTextRequestAsync(
+			(o, s) => {
+				var login = match.BoundVariables["login"];
+				var data = http.RequestCodec.From<ResetPasswordData>(s);
+				var message = new UserManagementMessage.ResetPassword(envelope, http.User, login, data.NewPassword);
+				Publish(message);
+			}, x => Log.Debug(x, "Reply Text Content Failed."));
+	}
+
+	private void PostCommandChangePassword(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+		var envelope = CreateReplyEnvelope<UserManagementMessage.UpdateResult>(http);
+		http.ReadTextRequestAsync(
+			(o, s) => {
+				var login = match.BoundVariables["login"];
+				var data = http.RequestCodec.From<ChangePasswordData>(s);
+				var message = new UserManagementMessage.ChangePassword(
+					envelope, http.User, login, data.CurrentPassword, data.NewPassword);
+				Publish(message);
+			},
+			x => Log.Debug(x, "Reply Text Content Failed."));
+	}
+
+	private SendToHttpEnvelope<T> CreateReplyEnvelope<T>(
+		HttpEntityManager http, Func<ICodec, T, string> formatter = null,
+		Func<ICodec, T, ResponseConfiguration> configurator = null)
+		where T : UserManagementMessage.ResponseMessage {
+		return new SendToHttpEnvelope<T>(
+			_networkSendQueue, http, formatter ?? AutoFormatter, configurator ?? AutoConfigurator, null);
+	}
+
+	private SendToHttpWithConversionEnvelope<T, R> CreateSendToHttpWithConversionEnvelope<T, R>(
+		HttpEntityManager http, Func<T, R> formatter)
+		where T : UserManagementMessage.ResponseMessage
+		where R : UserManagementMessage.ResponseMessage {
+		return new SendToHttpWithConversionEnvelope<T, R>(_networkSendQueue,
+			http,
+			(codec, msg) => codec.To(msg),
+			(codec, transformed) => transformed.Success
+				? new ResponseConfiguration(HttpStatusCode.OK, codec.ContentType, codec.Encoding)
+				: new ResponseConfiguration(
+					ErrorToHttpStatusCode(transformed.Error), codec.ContentType, codec.Encoding),
+			formatter);
+	}
+
+	private ResponseConfiguration AutoConfigurator<T>(ICodec codec, T result)
+		where T : UserManagementMessage.ResponseMessage {
+		return result.Success
+			? new ResponseConfiguration(HttpStatusCode.OK, codec.ContentType, codec.Encoding)
+			: new ResponseConfiguration(
+				ErrorToHttpStatusCode(result.Error), codec.ContentType, codec.Encoding);
+	}
+
+	private string AutoFormatter<T>(ICodec codec, T result) {
+		return codec.To(result);
+	}
+
+	private int ErrorToHttpStatusCode(UserManagementMessage.Error error) {
+		switch (error) {
+			case UserManagementMessage.Error.Success:
+				return HttpStatusCode.OK;
+			case UserManagementMessage.Error.Conflict:
+				return HttpStatusCode.Conflict;
+			case UserManagementMessage.Error.NotFound:
+				return HttpStatusCode.NotFound;
+			case UserManagementMessage.Error.Error:
+				return HttpStatusCode.InternalServerError;
+			case UserManagementMessage.Error.TryAgain:
+				return HttpStatusCode.RequestTimeout;
+			case UserManagementMessage.Error.Unauthorized:
+				return HttpStatusCode.Unauthorized;
+			default:
+				return HttpStatusCode.InternalServerError;
+		}
+	}
+
+	private class PostUserData {
+		public string LoginName { get; set; }
+		public string FullName { get; set; }
+		public string[] Groups { get; set; }
+		public string Password { get; set; }
+	}
+
+	private class PutUserData {
+		public string FullName { get; set; }
+		public string[] Groups { get; set; }
+	}
+
+	private class ResetPasswordData {
+		public string NewPassword { get; set; }
+	}
+
+	private class ChangePasswordData {
+		public string CurrentPassword { get; set; }
+		public string NewPassword { get; set; }
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Convert.cs b/src/KurrentDB.Core/Services/Transport/Http/Convert.cs
new file mode 100644
index 00000000000..98c92101d9b
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Convert.cs
@@ -0,0 +1,439 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Transport.Http.Controllers;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Transport.Http.Atom;
+using KurrentDB.Transport.Http.Codecs;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public static class Convert {
+	private static readonly string AllEscaped = Uri.EscapeDataString("$all");
+	private static readonly string AllFilteredEscaped = "%24all/filtered";
+
+	public static FeedElement ToStreamEventForwardFeed(ClientMessage.ReadStreamEventsForwardCompleted msg, Uri requestedUrl, EmbedLevel embedContent) {
+		Ensure.NotNull(msg);
+		string escapedStreamId = Uri.EscapeDataString(msg.EventStreamId);
+		var self = HostName.Combine(requestedUrl, "/streams/{0}", escapedStreamId);
+		var feed = new FeedElement();
+		feed.SetTitle($"Event stream '{msg.EventStreamId}'");
+		feed.StreamId = msg.EventStreamId;
+		feed.SetId(self);
+		feed.SetUpdated(msg.Events.Count > 0 && msg.Events[0].Event != null
+			? msg.Events[0].Event.TimeStamp
+			: DateTime.MinValue.ToUniversalTime());
+		feed.SetAuthor(AtomSpecs.Author);
+		feed.SetHeadOfStream(msg.IsEndOfStream);
+
+		var prevEventNumber = Math.Min(msg.FromEventNumber + msg.MaxCount - 1, msg.LastEventNumber) + 1;
+		var nextEventNumber = msg.FromEventNumber - 1;
+
+		feed.AddLink("self", self);
+		feed.AddLink("first", HostName.Combine(requestedUrl, "/streams/{0}/head/backward/{1}", escapedStreamId, msg.MaxCount));
+		if (nextEventNumber >= 0) {
+			feed.AddLink("last", HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", escapedStreamId, 0, msg.MaxCount));
+			feed.AddLink("next", HostName.Combine(requestedUrl, "/streams/{0}/{1}/backward/{2}", escapedStreamId, nextEventNumber, msg.MaxCount));
+		}
+
+		if (!msg.IsEndOfStream || msg.Events.Count > 0)
+			feed.AddLink("previous", HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", escapedStreamId, prevEventNumber, msg.MaxCount));
+		if (!escapedStreamId.StartsWith("$$"))
+			feed.AddLink("metadata", HostName.Combine(requestedUrl, "/streams/{0}/metadata", escapedStreamId));
+		for (int i = msg.Events.Count - 1; i >= 0; --i) {
+			feed.AddEntry(ToEntry(msg.Events[i], requestedUrl, embedContent));
+		}
+
+		return feed;
+	}
+
+	public static FeedElement ToStreamEventBackwardFeed(ClientMessage.ReadStreamEventsBackwardCompleted msg,
+		Uri requestedUrl, EmbedLevel embedContent, bool headOfStream, string contentType) {
+		Ensure.NotNull(msg);
+
+		string escapedStreamId = Uri.EscapeDataString(msg.EventStreamId);
+		var self = HostName.Combine(requestedUrl, "/streams/{0}", escapedStreamId);
+		var feed = new FeedElement();
+		feed.SetTitle($"Event stream '{msg.EventStreamId}'");
+		feed.StreamId = msg.EventStreamId;
+		feed.SetId(self);
+		feed.SetUpdated(msg.Events.Count > 0 && msg.Events[0].Event != null
+			? msg.Events[0].Event.TimeStamp
+			: DateTime.MinValue.ToUniversalTime());
+		feed.SetAuthor(AtomSpecs.Author);
+		feed.SetHeadOfStream(headOfStream);
+		feed.SetSelfUrl(self);
+		if (headOfStream)
+			feed.SetETag(Configure.GetPositionETag(msg.LastEventNumber, contentType));
+
+		var prevEventNumber = Math.Min(msg.FromEventNumber, msg.LastEventNumber) + 1;
+		var nextEventNumber = msg.FromEventNumber - msg.MaxCount;
+
+		feed.AddLink("self", self);
+		feed.AddLink("first", HostName.Combine(requestedUrl, "/streams/{0}/head/backward/{1}", escapedStreamId, msg.MaxCount));
+		if (!msg.IsEndOfStream) {
+			if (nextEventNumber < 0)
+				throw new Exception($"nextEventNumber is negative: {nextEventNumber} while IsEndOfStream");
+			feed.AddLink("last", HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", escapedStreamId, 0, msg.MaxCount));
+			feed.AddLink("next", HostName.Combine(requestedUrl, "/streams/{0}/{1}/backward/{2}", escapedStreamId, nextEventNumber, msg.MaxCount));
+		}
+
+		feed.AddLink("previous", HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", escapedStreamId, prevEventNumber, msg.MaxCount));
+		feed.AddLink("metadata", HostName.Combine(requestedUrl, "/streams/{0}/metadata", escapedStreamId));
+		for (int i = 0; i < msg.Events.Count; ++i) {
+			feed.AddEntry(ToEntry(msg.Events[i], requestedUrl, embedContent));
+		}
+
+		return feed;
+	}
+
+	public static FeedElement ToAllEventsForwardFeed(ClientMessage.ReadAllEventsForwardCompleted msg, Uri requestedUrl, EmbedLevel embedContent) {
+		var self = HostName.Combine(requestedUrl, "/streams/{0}", AllEscaped);
+		var feed = new FeedElement();
+		feed.SetTitle("All events");
+		feed.SetId(self);
+		feed.SetUpdated(msg.Events.Count > 0 && msg.Events[0].Event is not null
+			? msg.Events[^1].Event.TimeStamp
+			: DateTime.MinValue.ToUniversalTime());
+		feed.SetAuthor(AtomSpecs.Author);
+
+		feed.AddLink("self", self);
+		feed.AddLink("first", HostName.Combine(requestedUrl, "/streams/{0}/head/backward/{1}", AllEscaped, msg.MaxCount));
+		if (msg.CurrentPos.CommitPosition != 0) {
+			feed.AddLink("last", HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", AllEscaped, new TFPos(0, 0).AsString(), msg.MaxCount));
+			feed.AddLink("next", HostName.Combine(requestedUrl, "/streams/{0}/{1}/backward/{2}", AllEscaped, msg.PrevPos.AsString(), msg.MaxCount));
+		}
+
+		if (!msg.IsEndOfStream || msg.Events.Count > 0)
+			feed.AddLink("previous", HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", AllEscaped, msg.NextPos.AsString(), msg.MaxCount));
+		feed.AddLink("metadata", HostName.Combine(requestedUrl, "/streams/{0}/metadata", AllEscaped));
+		for (int i = msg.Events.Count - 1; i >= 0; --i) {
+			feed.AddEntry(ToEntry(msg.Events[i].WithoutPosition(), requestedUrl, embedContent));
+		}
+
+		return feed;
+	}
+
+	public static FeedElement ToAllEventsForwardFilteredFeed(ClientMessage.FilteredReadAllEventsForwardCompleted msg, Uri requestedUrl, EmbedLevel embedContent) {
+		var self = HostName.Combine(requestedUrl, "/streams/{0}", AllFilteredEscaped);
+		var feed = new FeedElement();
+		feed.SetTitle("All events");
+		feed.SetId(self);
+		feed.SetUpdated(msg.Events.Count > 0 && msg.Events[0].Event != null
+			? msg.Events[^1].Event.TimeStamp
+			: DateTime.MinValue.ToUniversalTime());
+		feed.SetAuthor(AtomSpecs.Author);
+
+		feed.AddLink("self", self);
+		feed.AddLink("first", HostName.Combine(requestedUrl, "/streams/{0}/head/backward/{1}", AllFilteredEscaped, msg.MaxCount));
+		if (msg.CurrentPos.CommitPosition != 0) {
+			feed.AddLink("last", HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", AllFilteredEscaped, new TFPos(0, 0).AsString(), msg.MaxCount));
+			feed.AddLink("next", HostName.Combine(requestedUrl, "/streams/{0}/{1}/backward/{2}", AllFilteredEscaped, msg.PrevPos.AsString(), msg.MaxCount));
+		}
+
+		if (!msg.IsEndOfStream || msg.Events.Count > 0)
+			feed.AddLink("previous", HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", AllFilteredEscaped, msg.NextPos.AsString(), msg.MaxCount));
+		for (int i = msg.Events.Count - 1; i >= 0; --i) {
+			feed.AddEntry(ToEntry(msg.Events[i].WithoutPosition(), requestedUrl, embedContent));
+		}
+
+		return feed;
+	}
+
+	public static FeedElement ToAllEventsBackwardFeed(ClientMessage.ReadAllEventsBackwardCompleted msg, Uri requestedUrl, EmbedLevel embedContent) {
+		var self = HostName.Combine(requestedUrl, "/streams/{0}", AllEscaped);
+		var feed = new FeedElement();
+		feed.SetTitle("All events");
+		feed.SetId(self);
+		feed.SetUpdated(msg.Events.Count > 0 && msg.Events[0].Event != null
+			? msg.Events[0].Event.TimeStamp
+			: DateTime.MinValue.ToUniversalTime());
+		feed.SetAuthor(AtomSpecs.Author);
+
+		feed.AddLink("self", self);
+		feed.AddLink("first", HostName.Combine(requestedUrl, "/streams/{0}/head/backward/{1}", AllEscaped, msg.MaxCount));
+		if (!msg.IsEndOfStream) {
+			feed.AddLink("last", HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", AllEscaped, new TFPos(0, 0).AsString(), msg.MaxCount));
+			feed.AddLink("next", HostName.Combine(requestedUrl, "/streams/{0}/{1}/backward/{2}", AllEscaped, msg.NextPos.AsString(), msg.MaxCount));
+		}
+
+		feed.AddLink("previous", HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", AllEscaped, msg.PrevPos.AsString(), msg.MaxCount));
+		feed.AddLink("metadata", HostName.Combine(requestedUrl, "/streams/{0}/metadata", AllEscaped));
+		for (int i = 0; i < msg.Events.Count; ++i) {
+			feed.AddEntry(ToEntry(msg.Events[i].WithoutPosition(), requestedUrl, embedContent));
+		}
+
+		return feed;
+	}
+
+	public static FeedElement ToFilteredAllEventsBackwardFeed(ClientMessage.FilteredReadAllEventsBackwardCompleted msg,
+		Uri requestedUrl, EmbedLevel embedContent) {
+		var self = HostName.Combine(requestedUrl, "/streams/{0}", AllFilteredEscaped);
+		var feed = new FeedElement();
+		feed.SetTitle("All events");
+		feed.SetId(self);
+		feed.SetUpdated(msg.Events.Count > 0 && msg.Events[0].Event != null
+			? msg.Events[0].Event.TimeStamp
+			: DateTime.MinValue.ToUniversalTime());
+		feed.SetAuthor(AtomSpecs.Author);
+
+		feed.AddLink("self", self);
+		feed.AddLink("first", HostName.Combine(requestedUrl, "/streams/{0}/head/backward/{1}", AllFilteredEscaped, msg.MaxCount));
+		if (!msg.IsEndOfStream) {
+			feed.AddLink("last", HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", AllFilteredEscaped, new TFPos(0, 0).AsString(), msg.MaxCount));
+			feed.AddLink("next", HostName.Combine(requestedUrl, "/streams/{0}/{1}/backward/{2}", AllFilteredEscaped, msg.NextPos.AsString(), msg.MaxCount));
+		}
+
+		feed.AddLink("previous", HostName.Combine(requestedUrl, "/streams/{0}/{1}/forward/{2}", AllFilteredEscaped, msg.PrevPos.AsString(), msg.MaxCount));
+		for (int i = 0; i < msg.Events.Count; ++i) {
+			feed.AddEntry(ToEntry(msg.Events[i].WithoutPosition(), requestedUrl, embedContent));
+		}
+
+		return feed;
+	}
+
+	public static FeedElement ToNextNPersistentMessagesFeed(ClientMessage.ReadNextNPersistentMessagesCompleted msg,
+		Uri requestedUrl, string streamId, string groupName, int count, EmbedLevel embedContent) {
+		string escapedStreamId = Uri.EscapeDataString(streamId);
+		string escapedGroupName = Uri.EscapeDataString(groupName);
+		var self = HostName.Combine(requestedUrl, "/subscriptions/{0}/{1}", escapedStreamId, escapedGroupName);
+		var feed = new FeedElement();
+		feed.SetTitle($"Messages for '{streamId}/{groupName}'");
+		feed.SetId(self);
+		feed.SetUpdated(msg.Events.Length > 0 && msg.Events[0].ResolvedEvent.Event != null
+			? msg.Events[^1].ResolvedEvent.Event.TimeStamp
+			: DateTime.MinValue.ToUniversalTime());
+		feed.SetAuthor(AtomSpecs.Author);
+
+		if (msg.Events is { Length: > 0 }) {
+			var ackAllQueryString = $"?ids={string.Join(",", msg.Events.Select(x => x.ResolvedEvent.OriginalEvent.EventId))}";
+			var ackAll = HostName.Combine(requestedUrl, "/subscriptions/{0}/{1}/ack", escapedStreamId, escapedGroupName) + ackAllQueryString;
+			feed.AddLink("ackAll", ackAll);
+
+			var nackAllQueryString = $"?ids={string.Join(",", msg.Events.Select(x => x.ResolvedEvent.OriginalEvent.EventId))}";
+			var nackAll = HostName.Combine(requestedUrl, "/subscriptions/{0}/{1}/nack", escapedStreamId, escapedGroupName) + nackAllQueryString;
+			feed.AddLink("nackAll", nackAll);
+		}
+
+		var prev = HostName.Combine(requestedUrl, "/subscriptions/{0}/{1}/{2}", escapedStreamId, escapedGroupName, count);
+		feed.AddLink("previous", prev);
+
+		feed.AddLink("self", self);
+		for (int i = msg.Events.Length - 1; i >= 0; --i) {
+			var entry = ToEntry(msg.Events[i].ResolvedEvent.WithoutPosition(), requestedUrl, embedContent);
+			var ack = HostName.Combine(requestedUrl, "/subscriptions/{0}/{1}/ack/{2}", escapedStreamId, escapedGroupName, msg.Events[i].ResolvedEvent.OriginalEvent.EventId);
+			var nack = HostName.Combine(requestedUrl, "/subscriptions/{0}/{1}/nack/{2}", escapedStreamId, escapedGroupName, msg.Events[i].ResolvedEvent.OriginalEvent.EventId);
+			entry.AddLink("ack", ack);
+			entry.AddLink("nack", nack);
+			entry.AddRetryCount(msg.Events[i].RetryCount);
+			feed.AddEntry(entry);
+		}
+
+		return feed;
+	}
+
+	public static DescriptionDocument ToDescriptionDocument(Uri requestedUrl, string streamId, string[] subscriptions, string contentType) {
+		string escapedStreamId = Uri.EscapeDataString(streamId);
+		var descriptionDocument = new DescriptionDocument();
+		descriptionDocument.SetTitle($"Description document for '{streamId}'");
+		descriptionDocument.SetDescription("The description document will be presented when no accept header is present or it was requested");
+		descriptionDocument.SetSelf($"/streams/{escapedStreamId}", contentType);
+		descriptionDocument.SetStream($"/streams/{escapedStreamId}", Codec.EventStoreXmlCodec.ContentType, Codec.KurrentJsonCodec.ContentType, Codec.LegacyEventStoreJsonCodec.ContentType);
+
+		if (subscriptions == null)
+			return descriptionDocument;
+
+		foreach (var group in subscriptions) {
+			descriptionDocument.AddStreamSubscription(
+				$"/subscriptions/{escapedStreamId}/{group}",
+				Codec.CompetingXml.ContentType,
+				Codec.CompetingJson.ContentType,
+				Codec.LegacyCompetingJson.ContentType);
+		}
+
+		return descriptionDocument;
+	}
+
+	public static EntryElement ToEntry(ResolvedEvent eventLinkPair, Uri requestedUrl, EmbedLevel embedContent, bool singleEntry = false) {
+		if (requestedUrl == null)
+			return null;
+
+		var evnt = eventLinkPair.Event;
+		var link = eventLinkPair.Link;
+		EntryElement entry;
+		if (embedContent > EmbedLevel.Content && evnt != null) {
+			var richEntry = new RichEntryElement();
+			entry = richEntry;
+
+			richEntry.EventId = evnt.EventId;
+			richEntry.EventType = evnt.EventType;
+			richEntry.EventNumber = evnt.EventNumber;
+			richEntry.StreamId = evnt.EventStreamId;
+			richEntry.PositionEventNumber = eventLinkPair.OriginalEvent.EventNumber;
+			richEntry.PositionStreamId = eventLinkPair.OriginalEvent.EventStreamId;
+			richEntry.IsJson = (evnt.Flags & PrepareFlags.IsJson) != 0;
+			richEntry.IsRedacted = (evnt.Flags & PrepareFlags.IsRedacted) != 0;
+
+			var data = evnt.Data.Span;
+
+			if (embedContent >= EmbedLevel.Body && eventLinkPair.Event != null) {
+				if (richEntry.IsJson) {
+					if (embedContent >= EmbedLevel.PrettyBody) {
+						try {
+							richEntry.Data = Helper.UTF8NoBom.GetString(data);
+							// next step may fail, so we have already assigned body
+							richEntry.Data = FormatJson(Helper.UTF8NoBom.GetString(data));
+						} catch {
+							// ignore - we tried
+						}
+					} else
+						richEntry.Data = Helper.UTF8NoBom.GetString(data);
+				} else if (embedContent >= EmbedLevel.TryHarder) {
+					try {
+						richEntry.Data = Helper.UTF8NoBom.GetString(data);
+						// next step may fail, so we have already assigned body
+						richEntry.Data = FormatJson(richEntry.Data);
+						// it is json if successed
+						richEntry.IsJson = true;
+					} catch {
+						// ignore - we tried
+					}
+				}
+
+				// metadata
+				if (embedContent >= EmbedLevel.Body) {
+					try {
+						richEntry.MetaData = Helper.UTF8NoBom.GetString(evnt.Metadata.Span);
+						richEntry.IsMetaData = richEntry.MetaData.IsNotEmptyString();
+						// next step may fail, so we have already assigned body
+						if (embedContent >= EmbedLevel.PrettyBody) {
+							richEntry.MetaData = FormatJson(richEntry.MetaData);
+						}
+
+						if (string.IsNullOrEmpty(richEntry.MetaData)) {
+							richEntry.MetaData = null;
+						}
+					} catch {
+						// ignore - we tried
+					}
+
+					var lnk = eventLinkPair.Link;
+					if (lnk != null) {
+						try {
+							richEntry.LinkMetaData = Helper.UTF8NoBom.GetString(lnk.Metadata.Span);
+							richEntry.IsLinkMetaData = richEntry.LinkMetaData.IsNotEmptyString();
+							// next step may fail, so we have already assigned body
+							if (embedContent >= EmbedLevel.PrettyBody) {
+								richEntry.LinkMetaData = FormatJson(richEntry.LinkMetaData);
+							}
+						} catch {
+							// ignore - we tried
+						}
+					}
+				}
+			}
+		} else {
+			entry = new EntryElement();
+		}
+
+		if (evnt != null && link == null) {
+			SetEntryProperties(evnt.EventStreamId, evnt.EventNumber, evnt.TimeStamp, requestedUrl, entry);
+			entry.SetSummary(evnt.EventType);
+			if ((singleEntry || embedContent == EmbedLevel.Content) && ((evnt.Flags & PrepareFlags.IsJson) != 0))
+				entry.SetContent(AutoEventConverter.CreateDataDto(eventLinkPair));
+		} else if (link != null) {
+			var eventLoc = GetLinkData(Encoding.UTF8.GetString(link.Data.Span));
+			SetEntryProperties(eventLoc.Item1, eventLoc.Item2, link.TimeStamp, requestedUrl, entry);
+			entry.SetSummary("$>");
+		}
+
+		return entry;
+	}
+
+	private static Tuple<string, long> GetLinkData(string link) {
+		Debug.Assert(link != null, "link data cannot be null");
+		var loc = link.IndexOf('@');
+		if (loc == -1)
+			throw new($"Unable to parse link {link}");
+		var position = long.Parse(link[..loc]);
+		var stream = link.Substring(loc + 1, link.Length - loc - 1);
+		return new(stream, position);
+	}
+
+	private static void SetEntryProperties(string stream, long eventNumber, DateTime timestamp, Uri requestedUrl, EntryElement entry) {
+		var escapedStreamId = Uri.EscapeDataString(stream);
+		entry.SetTitle($"{eventNumber}@{stream}");
+		entry.SetId(HostName.Combine(requestedUrl, "/streams/{0}/{1}", escapedStreamId, eventNumber));
+		entry.SetUpdated(timestamp);
+		entry.SetAuthor(AtomSpecs.Author);
+		entry.AddLink("edit", HostName.Combine(requestedUrl, "/streams/{0}/{1}", escapedStreamId, eventNumber));
+		entry.AddLink("alternate", HostName.Combine(requestedUrl, "/streams/{0}/{1}", escapedStreamId, eventNumber));
+	}
+
+	private static string FormatJson(string unformattedjson) {
+		if (string.IsNullOrEmpty(unformattedjson))
+			return unformattedjson;
+		JsonReader reader = new JsonTextReader(new StringReader(unformattedjson));
+		reader.DateParseHandling = DateParseHandling.None;
+		var jo = JObject.Load(reader);
+		var json = JsonConvert.SerializeObject(jo, Formatting.Indented);
+		return json;
+	}
+}
+
+public class Links {
+	public Link Self;
+	public Link Stream;
+	public List<Link> StreamSubscription;
+}
+
+public class Link {
+	public string Href;
+	public string[] SupportedContentTypes;
+
+	public Link() {
+	}
+
+	public Link(string href, string[] supportedContentTypes) {
+		Href = href;
+		SupportedContentTypes = supportedContentTypes;
+	}
+}
+
+public class DescriptionDocument {
+	public string Title;
+	public string Description;
+	[JsonProperty("_links")] public Links Links = new();
+
+	public void SetTitle(string title) {
+		Title = title;
+	}
+
+	public void SetDescription(string description) {
+		Description = description;
+	}
+
+	public void SetSelf(string href, params string[] supportedContentTypes) {
+		Links.Self = new(href, supportedContentTypes);
+	}
+
+	public void AddStreamSubscription(string href, params string[] supportedContentTypes) {
+		Links.StreamSubscription ??= [];
+		Links.StreamSubscription.Add(new Link(href, supportedContentTypes));
+	}
+
+	public void SetStream(string href, params string[] supportedContentTypes) {
+		Links.Stream = new(href, supportedContentTypes);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/EventStoreAuthenticationHandler.cs b/src/KurrentDB.Core/Services/Transport/Http/EventStoreAuthenticationHandler.cs
new file mode 100644
index 00000000000..2c47f67b985
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/EventStoreAuthenticationHandler.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+// This runs after Services.Transport.Http.AuthenticationMiddleware runs and makes use of the
+// ClaimsPrinciple that it has left in the context.
+// todo: figure out why AuthenticationMiddleware is as complicated as it is and whether it
+// should be replaced with an AuthenticationHandler (or several)
+public class EventStoreAuthenticationHandler(
+	IOptionsMonitor<AuthenticationSchemeOptions> options,
+	// we could pass the logger through instead of NullLoggerFactory, but we have debug logging
+	// on by default, and it will log successes unless we change the level in the config:
+	// "KurrentDB.Core.Services.Transport.Http.EventStoreAuthenticationHandler": "Information"
+	// instead we should rationalize the log levels, turn off debug logging, and then pass this through.
+	// ILoggerFactory logger,
+	UrlEncoder encoder) : AuthenticationHandler<AuthenticationSchemeOptions>(options, NullLoggerFactory.Instance, encoder) {
+	protected override Task<AuthenticateResult> HandleAuthenticateAsync() {
+		if (!Context.User.Identity!.IsAuthenticated)
+			return Task.FromResult(AuthenticateResult.Fail("Not authenticated"));
+
+		var ticket = new AuthenticationTicket(principal: Context.User, authenticationScheme: "kurrent auth");
+
+		return Task.FromResult(AuthenticateResult.Success(ticket));
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Format.cs b/src/KurrentDB.Core/Services/Transport/Http/Format.cs
new file mode 100644
index 00000000000..b4915f1cfcf
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Format.cs
@@ -0,0 +1,111 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Http.Controllers;
+using KurrentDB.Transport.Http;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public static class Format {
+	public static string TextMessage(HttpResponseFormatterArgs entity, Message message) {
+		return message is HttpMessage.TextMessage textMessage ? entity.ResponseCodec.To(textMessage) : string.Empty;
+	}
+
+	public static object EventEntry(HttpResponseFormatterArgs entity, Message message, EmbedLevel embed) {
+		if (message is not ClientMessage.ReadEventCompleted { Result: ReadEventResult.Success } msg || msg.Record.Event == null)
+			return entity.ResponseCodec.To(Empty.Result);
+
+		return entity.ResponseCodec.ContentType switch {
+			ContentType.Atom or ContentType.AtomJson or ContentType.LegacyAtomJson or ContentType.Html
+				=> entity.ResponseCodec.To(Convert.ToEntry(msg.Record, entity.ResponseUrl, embed, singleEntry: true)),
+			_ => AutoEventConverter.SmartFormat(msg.Record, entity.ResponseCodec)
+		};
+	}
+
+	public static string GetStreamEventsBackward(HttpResponseFormatterArgs entity, Message message, EmbedLevel embed, bool headOfStream) {
+		return message is not ClientMessage.ReadStreamEventsBackwardCompleted { Result: ReadStreamResult.Success } msg
+			? string.Empty
+			: entity.ResponseCodec.To(Convert.ToStreamEventBackwardFeed(msg, entity.ResponseUrl, embed, headOfStream, entity.ResponseCodec.ContentType));
+	}
+
+	public static string GetStreamEventsForward(HttpResponseFormatterArgs entity, Message message, EmbedLevel embed) {
+		return message is not ClientMessage.ReadStreamEventsForwardCompleted { Result: ReadStreamResult.Success } msg
+			? string.Empty
+			: entity.ResponseCodec.To(Convert.ToStreamEventForwardFeed(msg, entity.ResponseUrl, embed));
+	}
+
+	public static string ReadAllEventsBackwardCompleted(HttpResponseFormatterArgs entity, Message message, EmbedLevel embed) {
+		return message is not ClientMessage.ReadAllEventsBackwardCompleted { Result: ReadAllResult.Success } msg
+			? string.Empty
+			: entity.ResponseCodec.To(Convert.ToAllEventsBackwardFeed(msg, entity.ResponseUrl, embed));
+	}
+
+	public static string ReadAllEventsBackwardFilteredCompleted(HttpResponseFormatterArgs entity, Message message, EmbedLevel embed) {
+		return message is not ClientMessage.FilteredReadAllEventsBackwardCompleted { Result: FilteredReadAllResult.Success } msg
+			? string.Empty
+			: entity.ResponseCodec.To(Convert.ToFilteredAllEventsBackwardFeed(msg, entity.ResponseUrl, embed));
+	}
+
+	public static string ReadAllEventsForwardCompleted(HttpResponseFormatterArgs entity, Message message, EmbedLevel embed) {
+		return message is not ClientMessage.ReadAllEventsForwardCompleted { Result: ReadAllResult.Success } msg
+			? string.Empty
+			: entity.ResponseCodec.To(Convert.ToAllEventsForwardFeed(msg, entity.ResponseUrl, embed));
+	}
+
+	public static string ReadAllEventsForwardFilteredCompleted(HttpResponseFormatterArgs entity, Message message, EmbedLevel embed) {
+		return message is not ClientMessage.FilteredReadAllEventsForwardCompleted { Result: FilteredReadAllResult.Success } msg
+			? string.Empty
+			: entity.ResponseCodec.To(Convert.ToAllEventsForwardFilteredFeed(msg, entity.ResponseUrl, embed));
+	}
+
+	public static string WriteEventsCompleted(HttpResponseFormatterArgs entity, Message message) => string.Empty;
+
+	public static string DeleteStreamCompleted(HttpResponseFormatterArgs entity, Message message) => string.Empty;
+
+	public static string GetFreshStatsCompleted(HttpResponseFormatterArgs entity, Message message) {
+		return message is not MonitoringMessage.GetFreshStatsCompleted { Success: true } completed
+			? string.Empty
+			: entity.ResponseCodec.To(completed.Stats);
+	}
+
+	public static string GetReplicationStatsCompleted(HttpResponseFormatterArgs entity, Message message) {
+		if (message.GetType() != typeof(ReplicationMessage.GetReplicationStatsCompleted))
+			throw new($"Unexpected type of Response message: {message.GetType().Name}, expected: {nameof(ReplicationMessage.GetReplicationStatsCompleted)}");
+		var completed = message as ReplicationMessage.GetReplicationStatsCompleted;
+		return entity.ResponseCodec.To(completed!.ReplicationStats);
+	}
+
+	public static string GetFreshTcpConnectionStatsCompleted(HttpResponseFormatterArgs entity, Message message) {
+		return message is not MonitoringMessage.GetFreshTcpConnectionStatsCompleted completed
+			? string.Empty
+			: entity.ResponseCodec.To(completed.ConnectionStats);
+	}
+
+	public static string SendPublicGossip(HttpResponseFormatterArgs entity, Message message) {
+		if (message.GetType() != typeof(GossipMessage.SendClientGossip))
+			throw new($"Unexpected type of response message: {message.GetType().Name}, expected: {nameof(GossipMessage.SendClientGossip)}");
+
+		return message is GossipMessage.SendClientGossip sendPublicGossip
+			? entity.ResponseCodec.To(sendPublicGossip.ClusterInfo)
+			: string.Empty;
+	}
+
+	public static string ReadNextNPersistentMessagesCompleted(HttpResponseFormatterArgs entity, Message message,
+		string streamId, string groupName, int count, EmbedLevel embed) {
+		var msg = message as ClientMessage.ReadNextNPersistentMessagesCompleted;
+		if (msg is not { Result: ClientMessage.ReadNextNPersistentMessagesCompleted.ReadNextNPersistentMessagesResult.Success }) {
+			return msg != null ? entity.ResponseCodec.To(msg.Reason) : string.Empty;
+		}
+
+		return entity.ResponseCodec.To(Convert.ToNextNPersistentMessagesFeed(msg, entity.ResponseUrl, streamId, groupName, count, embed));
+	}
+
+	public static string GetDescriptionDocument(HttpResponseFormatterArgs entity, string streamId, string[] persistentSubscriptionStats) {
+		return entity.ResponseCodec.To(Convert.ToDescriptionDocument(entity.RequestedUrl, streamId, persistentSubscriptionStats, entity.ResponseCodec.ContentType));
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/GrpcProtocolHelpers.cs b/src/KurrentDB.Core/Services/Transport/Http/GrpcProtocolHelpers.cs
new file mode 100644
index 00000000000..73994c6616f
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/GrpcProtocolHelpers.cs
@@ -0,0 +1,212 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+// From https://github.com/grpc/grpc-dotnet
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Text;
+using Grpc.Core;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.Net.Http.Headers;
+using HttpResponse = Microsoft.AspNetCore.Http.HttpResponse;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public static class GrpcProtocolHelpers {
+	internal const string GrpcContentType = "application/grpc";
+	internal const string GrpcProtoContentType = "application/grpc+proto";
+	internal const string GrpcWebContentType = "application/grpc-web";
+	internal const string GrpcWebTextContentType = "application/grpc-web-text";
+	internal const string RetryPushbackHeader = "grpc-retry-pushback-ms";
+
+	internal static readonly string StatusTrailer = HeaderNames.GrpcStatus;
+	internal static readonly string MessageTrailer = HeaderNames.GrpcMessage;
+
+	public static IHeaderDictionary GetTrailersDestination(HttpResponse response) {
+		if (response.HasStarted) {
+			// The response has content so write trailers to a trailing HEADERS frame
+			var feature = response.HttpContext.Features.Get<IHttpResponseTrailersFeature>();
+			if (feature?.Trailers == null || feature.Trailers.IsReadOnly) {
+				throw new InvalidOperationException("Trailers are not supported for this response. The server may not support gRPC.");
+			}
+
+			return feature.Trailers;
+		} else {
+			// The response is "Trailers-Only". There are no gRPC messages in the response so the status
+			// and other trailers can be placed in the header HEADERS frame
+			return response.Headers;
+		}
+	}
+
+	public static void AddProtocolHeaders(HttpResponse response) {
+		response.ContentType = GrpcContentType;
+	}
+
+	public static bool IsGrpc(this HttpContext context) =>
+		context.Request.ContentType
+			is GrpcContentType
+			or GrpcProtoContentType
+			or GrpcWebContentType
+			or GrpcWebTextContentType;
+
+	public static void SetStatus(IHeaderDictionary destination, Status status) {
+		// Overwrite any previously set status
+		destination[StatusTrailer] = status.StatusCode.ToTrailerString();
+
+		string escapedDetail;
+		if (!string.IsNullOrEmpty(status.Detail)) {
+			// https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md#responses
+			// The value portion of Status-Message is conceptually a Unicode string description of the error,
+			// physically encoded as UTF-8 followed by percent-encoding.
+			escapedDetail = PercentEncode(status.Detail);
+		} else {
+			escapedDetail = null;
+		}
+
+		destination[MessageTrailer] = escapedDetail;
+	}
+
+	private static readonly char[] HexChars = new[]
+	{
+		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
+	};
+	internal const int MaxUnicodeCharsReallocate = 40; // Maximum batch size when working with unicode characters
+	private const int MaxUtf8BytesPerUnicodeChar = 4;
+	private const int AsciiMaxValue = 127;
+
+	// From https://github.com/grpc/grpc/blob/324189c9dc540f0693d79f02dcb8c5f9261b535e/src/core/lib/slice/percent_encoding.cc#L31
+	private static readonly byte[] PercentEncodingUnreservedBitField =
+	{
+		0x00, 0x00, 0x00, 0x00, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	};
+
+	public static string PercentEncode(string value) {
+		// Count the number of bytes needed to output this string
+		var encodedLength = 0L;
+		for (var i = 0; i < value.Length; i++) {
+			var c = value[i];
+			if (c > AsciiMaxValue) {
+				// Get additional unicode characters
+				var unicodeCharCount = GetCountOfNonAsciiUtf16CodeUnits(value, i, maxCount: int.MaxValue);
+
+				var utf8ByteCount = Encoding.UTF8.GetByteCount(value.AsSpan(i, unicodeCharCount));
+				encodedLength += (long)utf8ByteCount * 3;
+				i += unicodeCharCount - 1;
+			} else {
+				encodedLength += IsUnreservedCharacter(c) ? 1 : 3;
+			}
+		}
+
+		if (encodedLength > int.MaxValue) {
+			throw new InvalidOperationException("Value is too large to encode.");
+		}
+
+		// Return the original string if no encoding is required
+		if (value.Length == encodedLength) {
+			return value;
+		}
+
+		// Encode
+		return string.Create((int)encodedLength, value, Encode);
+
+		static void Encode(Span<char> span, string s) {
+			Span<byte> unicodeBytesBuffer = stackalloc byte[MaxUnicodeCharsReallocate * MaxUtf8BytesPerUnicodeChar];
+
+			var writePosition = 0;
+			for (var i = 0; i < s.Length; i++) {
+				var current = s[i];
+				if (current > AsciiMaxValue) {
+					// Leave a character for possible low surrogate
+					const int MaxCount = MaxUnicodeCharsReallocate - 1;
+
+					// Get additional unicode characters
+					var unicodeCharCount = GetCountOfNonAsciiUtf16CodeUnits(s, i, MaxCount);
+
+					// Note that invalid UTF-16 data, e.g. unpaired surrogates, will be converted to EF BF BD (unicode replacement character)
+					var numberOfBytes = Encoding.UTF8.GetBytes(s.AsSpan(i, unicodeCharCount), unicodeBytesBuffer);
+
+					for (var count = 0; count < numberOfBytes; count++) {
+						EscapeAsciiChar(span, ref writePosition, (char)unicodeBytesBuffer[count]);
+					}
+					i += unicodeCharCount - 1;
+				} else if (IsUnreservedCharacter(current)) {
+					span[writePosition++] = current;
+				} else {
+					EscapeAsciiChar(span, ref writePosition, current);
+				}
+			}
+		}
+	}
+
+	private static void EscapeAsciiChar(Span<char> span, ref int writePosition, char current) {
+		span[writePosition++] = '%';
+		span[writePosition++] = HexChars[current >> 4];
+		span[writePosition++] = HexChars[current & 15];
+	}
+
+	private static int GetCountOfNonAsciiUtf16CodeUnits(string value, int currentIndex, int maxCount) {
+		// We know we have started with a UTF-16 character
+		var unicodeCharCount = 1;
+
+		var maxSize = Math.Min(value.Length - currentIndex, maxCount);
+		for (; unicodeCharCount < maxSize && value[currentIndex + unicodeCharCount] > AsciiMaxValue; unicodeCharCount++) {
+		}
+
+		if (char.IsHighSurrogate(value[currentIndex + unicodeCharCount - 1])) {
+			if (unicodeCharCount < value.Length - currentIndex && char.IsLowSurrogate(value[currentIndex + unicodeCharCount])) {
+				// Last character is a high surrogate so check ahead to see if it is followed by a low surrogate and include
+				unicodeCharCount++;
+			}
+		}
+
+		return unicodeCharCount;
+	}
+
+	[MethodImpl(MethodImplOptions.AggressiveInlining)]
+	private static bool IsUnreservedCharacter(char c) {
+		return ((PercentEncodingUnreservedBitField[c / 8] >> (c % 8)) & 1) != 0;
+	}
+
+	public static string ToTrailerString(this StatusCode status) {
+		switch (status) {
+			case StatusCode.OK:
+				return "0";
+			case StatusCode.Cancelled:
+				return "1";
+			case StatusCode.Unknown:
+				return "2";
+			case StatusCode.InvalidArgument:
+				return "3";
+			case StatusCode.DeadlineExceeded:
+				return "4";
+			case StatusCode.NotFound:
+				return "5";
+			case StatusCode.AlreadyExists:
+				return "6";
+			case StatusCode.PermissionDenied:
+				return "7";
+			case StatusCode.ResourceExhausted:
+				return "8";
+			case StatusCode.FailedPrecondition:
+				return "9";
+			case StatusCode.Aborted:
+				return "10";
+			case StatusCode.OutOfRange:
+				return "11";
+			case StatusCode.Unimplemented:
+				return "12";
+			case StatusCode.Internal:
+				return "13";
+			case StatusCode.Unavailable:
+				return "14";
+			case StatusCode.DataLoss:
+				return "15";
+			case StatusCode.Unauthenticated:
+				return "16";
+			default:
+				return status.ToString("D");
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/HttpContextExtensions.cs b/src/KurrentDB.Core/Services/Transport/Http/HttpContextExtensions.cs
new file mode 100644
index 00000000000..c488a2276d3
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/HttpContextExtensions.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using Microsoft.AspNetCore.Connections.Features;
+using Microsoft.AspNetCore.Http;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public static class HttpContextExtensions {
+	public static bool IsUnixSocketConnection(this HttpContext ctx) {
+		var connectionItemsFeature = ctx.Features.Get<IConnectionItemsFeature>();
+		return connectionItemsFeature is not null && connectionItemsFeature.Items.ContainsKey(UnixSocketConnectionMiddleware.UnixSocketConnectionKey);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/HttpMessagePipe.cs b/src/KurrentDB.Core/Services/Transport/Http/HttpMessagePipe.cs
new file mode 100644
index 00000000000..f67d49bedd1
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/HttpMessagePipe.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Net;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public class HttpMessagePipe {
+	private readonly ConcurrentDictionary<Type, IMessageSender> _senders = new();
+
+	public void RegisterSender<T>(ISender<T> sender) where T : Message {
+		Ensure.NotNull(sender);
+		_senders.TryAdd(typeof(T), new MessageSender<T>(sender));
+	}
+
+	public void Push(Message message, IPEndPoint endPoint) {
+		Ensure.NotNull(message);
+		Ensure.NotNull(endPoint);
+
+		var type = message.GetType();
+
+		if (_senders.TryGetValue(type, out var sender))
+			sender.Send(message, endPoint);
+	}
+}
+
+public interface ISender<in T> where T : Message {
+	void Send(T message, IPEndPoint endPoint);
+}
+
+public interface IMessageSender {
+	void Send(Message message, IPEndPoint endPoint);
+}
+
+public class MessageSender<T> : IMessageSender where T : Message {
+	private readonly ISender<T> _sender;
+
+	public MessageSender(ISender<T> sender) {
+		Ensure.NotNull(sender);
+		_sender = sender;
+	}
+
+	public void Send(Message message, IPEndPoint endPoint) {
+		Ensure.NotNull(message);
+		Ensure.NotNull(endPoint);
+
+		_sender.Send((T)message, endPoint);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/IHttpService.cs b/src/KurrentDB.Core/Services/Transport/Http/IHttpService.cs
new file mode 100644
index 00000000000..bde17779d3e
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/IHttpService.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using KurrentDB.Transport.Http.EntityManagement;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public interface IHttpController {
+	void Subscribe(IHttpService service);
+}
+
+public interface IHttpSender {
+	void SubscribeSenders(HttpMessagePipe pipe);
+}
+
+public interface IHttpForwarder {
+	bool ForwardRequest(HttpEntityManager manager);
+}
+
+public interface IHttpService {
+	ServiceAccessibility Accessibility { get; }
+	bool IsListening { get; }
+	IEnumerable<EndPoint> EndPoints { get; }
+	IEnumerable<ControllerAction> Actions { get; }
+
+	List<UriToActionMatch> GetAllUriMatches(Uri uri);
+	void SetupController(IHttpController controller);
+
+	void RegisterCustomAction(ControllerAction action, Func<HttpEntityManager, UriTemplateMatch, RequestParams> handler);
+
+	void RegisterAction(ControllerAction action, Action<HttpEntityManager, UriTemplateMatch> handler);
+
+	void Shutdown();
+
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/InternalDispatcherEndpoint.cs b/src/KurrentDB.Core/Services/Transport/Http/InternalDispatcherEndpoint.cs
new file mode 100644
index 00000000000..9e9f7e20901
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/InternalDispatcherEndpoint.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Services.Transport.Http.Messages;
+using Microsoft.AspNetCore.Http;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public class InternalDispatcherEndpoint(IPublisher inputBus, MultiQueuedHandler requestsMultiHandler) : IHandle<HttpMessage.PurgeTimedOutRequests> {
+	private static readonly TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
+	private readonly IEnvelope _publishEnvelope = inputBus;
+
+	public void Handle(HttpMessage.PurgeTimedOutRequests message) {
+		requestsMultiHandler.PublishToAll(message);
+		inputBus.Publish(TimerMessage.Schedule.Create(UpdateInterval, _publishEnvelope, message));
+	}
+
+	public Task InvokeAsync(HttpContext context, RequestDelegate next) {
+		if (context.IsGrpc() || context.Request.Path.StartsWithSegments("/ui"))
+			return next(context);
+
+		if (!InternalHttpHelper.TryGetInternalContext(context, out var manager, out var match, out var tcs)) {
+			return next(context);
+		}
+
+		requestsMultiHandler.Publish(new AuthenticatedHttpRequestMessage(manager, match));
+		return tcs.Task;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/InternalHttpHelper.cs b/src/KurrentDB.Core/Services/Transport/Http/InternalHttpHelper.cs
new file mode 100644
index 00000000000..4ccd24b67da
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/InternalHttpHelper.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Transport.Http.EntityManagement;
+using Microsoft.AspNetCore.Http;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public static class InternalHttpHelper {
+	public static bool TryGetInternalContext(HttpContext context, out HttpEntityManager manager, out UriToActionMatch match, out TaskCompletionSource<bool> tcs) {
+		manager = null;
+		match = null;
+		tcs = null;
+		return context.Items.TryGetValue(typeof(HttpEntityManager), out var untypedManager) &&
+			   context.Items.TryGetValue(typeof(UriToActionMatch), out var untypedMatch) &&
+			   context.Items.TryGetValue(typeof(TaskCompletionSource<bool>), out var untypedTcs) &&
+			   (manager = untypedManager as HttpEntityManager) != null &&
+			   (match = untypedMatch as UriToActionMatch) != null &&
+			   (tcs = untypedTcs as TaskCompletionSource<bool>) != null;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/KestrelHttpService.cs b/src/KurrentDB.Core/Services/Transport/Http/KestrelHttpService.cs
new file mode 100644
index 00000000000..5fc4b71aea2
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/KestrelHttpService.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Transport.Http.Messages;
+using KurrentDB.Core.Settings;
+using KurrentDB.Transport.Http.EntityManagement;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public class KestrelHttpService :
+	IHttpService,
+	IHandle<SystemMessage.SystemInit>,
+	IHandle<SystemMessage.BecomeShuttingDown> {
+
+	public ServiceAccessibility Accessibility => _accessibility;
+	public bool IsListening => _isListening;
+	public IEnumerable<EndPoint> EndPoints { get; }
+
+	public IEnumerable<ControllerAction> Actions => UriRouter.Actions;
+
+	private readonly ServiceAccessibility _accessibility;
+	private readonly IPublisher _inputBus;
+
+	public IUriRouter UriRouter { get; }
+	public bool LogHttpRequests { get; }
+	public string AdvertiseAsHost { get; }
+	public int AdvertiseAsPort { get; }
+
+	private bool _isListening;
+
+	public KestrelHttpService(
+		ServiceAccessibility accessibility,
+		IPublisher inputBus,
+		IUriRouter uriRouter,
+		bool logHttpRequests,
+		string advertiseAsHost,
+		int advertiseAsPort,
+		params EndPoint[] endPoints) {
+		_accessibility = accessibility;
+		EndPoints = Ensure.NotNull(endPoints);
+		_inputBus = Ensure.NotNull(inputBus);
+		UriRouter = Ensure.NotNull(uriRouter);
+		LogHttpRequests = logHttpRequests;
+		AdvertiseAsHost = advertiseAsHost;
+		AdvertiseAsPort = advertiseAsPort;
+	}
+
+	public void Handle(SystemMessage.SystemInit message) {
+		_isListening = true;
+		_inputBus.Publish(new SystemMessage.ServiceInitialized(nameof(KestrelHttpService)));
+	}
+
+	public void Handle(SystemMessage.BecomeShuttingDown message) {
+		if (message.ShutdownHttp)
+			Shutdown();
+		_inputBus.Publish(new SystemMessage.ServiceShutdown(nameof(KestrelHttpService), $"[{string.Join(", ", EndPoints)}]"));
+	}
+
+	public void Shutdown() {
+		_isListening = false;
+	}
+
+	public void SetupController(IHttpController controller) {
+		Ensure.NotNull(controller);
+		controller.Subscribe(this);
+	}
+
+	public void RegisterCustomAction(ControllerAction action, Func<HttpEntityManager, UriTemplateMatch, RequestParams> handler) {
+		Ensure.NotNull(action);
+		Ensure.NotNull(handler);
+
+		UriRouter.RegisterAction(action, handler);
+	}
+
+	public void RegisterAction(ControllerAction action, Action<HttpEntityManager, UriTemplateMatch> handler) {
+		Ensure.NotNull(action);
+		Ensure.NotNull(handler);
+
+		UriRouter.RegisterAction(action, (man, match) => {
+			handler(man, match);
+			return new RequestParams(ESConsts.HttpTimeout);
+		});
+	}
+
+	public List<UriToActionMatch> GetAllUriMatches(Uri uri) => UriRouter.GetAllUriMatches(uri);
+
+	public static void CreateAndSubscribePipeline(ISubscriber bus) {
+		var requestProcessor = new AuthenticatedHttpRequestProcessor();
+		bus.Subscribe<AuthenticatedHttpRequestMessage>(requestProcessor);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/KestrelToInternalBridgeMiddleware.cs b/src/KurrentDB.Core/Services/Transport/Http/KestrelToInternalBridgeMiddleware.cs
new file mode 100644
index 00000000000..e69e2e529fb
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/KestrelToInternalBridgeMiddleware.cs
@@ -0,0 +1,177 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.Codecs;
+using KurrentDB.Transport.Http.EntityManagement;
+using Microsoft.AspNetCore.Http;
+using Serilog;
+using HttpStatusCode = KurrentDB.Transport.Http.HttpStatusCode;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public class KestrelToInternalBridgeMiddleware : IMiddleware {
+	private static readonly ILogger Log = Serilog.Log.ForContext<KestrelToInternalBridgeMiddleware>();
+	private readonly IUriRouter _uriRouter;
+	private readonly bool _logHttpRequests;
+	private readonly string _advertiseAsAddress;
+	private readonly int _advertiseAsPort;
+
+	public KestrelToInternalBridgeMiddleware(IUriRouter uriRouter, bool logHttpRequests, string advertiseAsAddress, int advertiseAsPort) {
+		_uriRouter = uriRouter;
+		_logHttpRequests = logHttpRequests;
+		_advertiseAsAddress = advertiseAsAddress;
+		_advertiseAsPort = advertiseAsPort;
+	}
+
+	private static bool TryMatch(HttpContext context, IUriRouter uriRouter, bool logHttpRequests, string advertiseAsAddress, int advertiseAsPort) {
+		var tcs = new TaskCompletionSource<bool>();
+		var httpEntity = new HttpEntity(context, logHttpRequests, advertiseAsAddress, advertiseAsPort, () => tcs.TrySetResult(true));
+
+		var request = httpEntity.Request;
+		try {
+			var allMatches = uriRouter.GetAllUriMatches(request.Url);
+			if (allMatches.Count == 0) {
+				NotFound(httpEntity);
+				return false;
+			}
+
+			var allowedMethods = GetAllowedMethods(allMatches);
+
+			if (request.HttpMethod.Equals(HttpMethod.Options, StringComparison.OrdinalIgnoreCase)) {
+				RespondWithOptions(httpEntity, allowedMethods);
+				return false;
+			}
+
+			var match = allMatches.LastOrDefault(m => m.ControllerAction.HttpMethod.Equals(request.HttpMethod, StringComparison.OrdinalIgnoreCase));
+			if (match == null) {
+				MethodNotAllowed(httpEntity, allowedMethods);
+				return false;
+			}
+
+			ICodec requestCodec = null;
+			var supportedRequestCodecs = match.ControllerAction.SupportedRequestCodecs;
+			if (supportedRequestCodecs is { Length: > 0 }) {
+				requestCodec = SelectRequestCodec(request.HttpMethod, request.ContentType, supportedRequestCodecs);
+				if (requestCodec == null) {
+					BadContentType(httpEntity, "Invalid or missing Content-Type");
+					return false;
+				}
+			}
+
+			ICodec responseCodec = SelectResponseCodec(request,
+				request.AcceptTypes,
+				match.ControllerAction.SupportedResponseCodecs,
+				match.ControllerAction.DefaultResponseCodec);
+			if (responseCodec == null) {
+				BadCodec(httpEntity, "Requested URI is not available in requested format");
+				return false;
+			}
+			try {
+				var manager = httpEntity.CreateManager(requestCodec, responseCodec, allowedMethods, _ => { });
+				context.Items.Add(manager.GetType(), manager);
+				context.Items.Add(match.GetType(), match);
+				context.Items.Add(tcs.GetType(), tcs);
+				return true;
+			} catch (Exception exc) {
+				Log.Error(exc, "Error while handling HTTP request '{url}'.", request.Url);
+				InternalServerError(httpEntity);
+
+			}
+		} catch (Exception exc) {
+			Log.Error(exc, "Unhandled exception while processing HTTP request at {url}.", httpEntity.RequestedUrl);
+			InternalServerError(httpEntity);
+		}
+		return false;
+	}
+
+	private static string[] GetAllowedMethods(List<UriToActionMatch> allMatches) {
+		var allowedMethods = new string[allMatches.Count + 1];
+		for (int i = 0; i < allMatches.Count; ++i) {
+			allowedMethods[i] = allMatches[i].ControllerAction.HttpMethod;
+		}
+
+		//add options to the list of allowed request methods
+		allowedMethods[allMatches.Count] = HttpMethod.Options;
+		return allowedMethods;
+	}
+
+	private static void RespondWithOptions(HttpEntity httpEntity, string[] allowed) {
+		var entity = httpEntity.CreateManager(Codec.NoCodec, Codec.NoCodec, allowed, _ => { });
+		entity.ReplyStatus(HttpStatusCode.OK, "OK", e => Log.Debug("Error while closing HTTP connection (http service core): {e}.", e.Message));
+	}
+
+	private static void MethodNotAllowed(HttpEntity httpEntity, string[] allowed) {
+		var entity = httpEntity.CreateManager(Codec.NoCodec, Codec.NoCodec, allowed, _ => { });
+		entity.ReplyStatus(HttpStatusCode.MethodNotAllowed, "Method Not Allowed", e => Log.Debug("Error while closing HTTP connection (HTTP service core): {e}.", e.Message));
+	}
+
+	private static void NotFound(HttpEntity httpEntity) {
+		var entity = httpEntity.CreateManager();
+		entity.ReplyStatus(HttpStatusCode.NotFound, "Not Found", e => Log.Debug("Error while closing HTTP connection (HTTP service core): {e}.", e.Message));
+	}
+
+	private static void InternalServerError(HttpEntity httpEntity) {
+		var entity = httpEntity.CreateManager();
+		entity.ReplyStatus(HttpStatusCode.InternalServerError, "Internal Server Error", e => Log.Debug("Error while closing HTTP connection (HTTP service core): {e}.", e.Message));
+	}
+
+	private static void BadCodec(HttpEntity httpEntity, string reason) {
+		var entity = httpEntity.CreateManager();
+		entity.ReplyStatus(HttpStatusCode.NotAcceptable, reason, e => Log.Debug("Error while closing HTTP connection (HTTP service core): {e}.", e.Message));
+	}
+
+	private static void BadContentType(HttpEntity httpEntity, string reason) {
+		var entity = httpEntity.CreateManager();
+		entity.ReplyStatus(HttpStatusCode.UnsupportedMediaType, reason, e => Log.Debug("Error while closing HTTP connection (HTTP service core): {e}.", e.Message));
+	}
+
+	private static ICodec SelectRequestCodec(string method, string contentType, ICodec[] supportedCodecs) {
+		if (string.IsNullOrEmpty(contentType))
+			return supportedCodecs is { Length: > 0 } ? null : Codec.NoCodec;
+		return method.ToUpper() switch {
+			HttpMethod.Post or HttpMethod.Put or HttpMethod.Delete => supportedCodecs.SingleOrDefault(c => c.CanParse(MediaType.Parse(contentType))),
+			_ => Codec.NoCodec
+		};
+	}
+
+	private static ICodec SelectResponseCodec(IHttpRequest query, string[] acceptTypes, ICodec[] supported, ICodec @default) {
+		var requestedFormat = GetFormatOrDefault(query);
+		if (requestedFormat == null && acceptTypes.IsEmpty())
+			return @default;
+
+		if (requestedFormat != null)
+			return supported.FirstOrDefault(c => c.SuitableForResponse(MediaType.Parse(requestedFormat)));
+
+		return acceptTypes.Select(MediaType.TryParse)
+			.Where(x => x != null)
+			.OrderByDescending(v => v.Priority)
+			.Select(type => supported.FirstOrDefault(codec => codec.SuitableForResponse(type)))
+			.FirstOrDefault(corresponding => corresponding != null);
+	}
+
+	private static string GetFormatOrDefault(IHttpRequest request) {
+		var format = request.GetQueryStringValues("format").FirstOrDefault()?.ToLower();
+
+		return format switch {
+			null or "" => null,
+			"json" => ContentType.Json,
+			"text" => ContentType.PlainText,
+			"xml" => ContentType.Xml,
+			"atom" => ContentType.Atom,
+			"atomxj" => ContentType.AtomJson,
+			"atomsvc" => ContentType.AtomServiceDoc,
+			"atomsvcxj" => ContentType.AtomServiceDocJson,
+			_ => throw new NotSupportedException("Unknown format requested")
+		};
+	}
+
+	public Task InvokeAsync(HttpContext context, RequestDelegate next) {
+		return TryMatch(context, _uriRouter, _logHttpRequests, _advertiseAsAddress, _advertiseAsPort) ? next(context) : Task.CompletedTask;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Messages/AuthenticatedHttpRequestMessage.cs b/src/KurrentDB.Core/Services/Transport/Http/Messages/AuthenticatedHttpRequestMessage.cs
new file mode 100644
index 00000000000..7c946862b93
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Messages/AuthenticatedHttpRequestMessage.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Messaging;
+using KurrentDB.Transport.Http.EntityManagement;
+
+namespace KurrentDB.Core.Services.Transport.Http.Messages;
+
+[DerivedMessage(CoreMessage.Http)]
+partial class AuthenticatedHttpRequestMessage(HttpEntityManager manager, UriToActionMatch match) : Message {
+	public readonly HttpEntityManager Manager = manager;
+	public readonly UriToActionMatch Match = match;
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/Messages/IncomingHttpRequestMessage.cs b/src/KurrentDB.Core/Services/Transport/Http/Messages/IncomingHttpRequestMessage.cs
new file mode 100644
index 00000000000..3e89774625f
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/Messages/IncomingHttpRequestMessage.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Transport.Http.EntityManagement;
+
+namespace KurrentDB.Core.Services.Transport.Http.Messages;
+
+[DerivedMessage(CoreMessage.Http)]
+public partial class IncomingHttpRequestMessage(IHttpService httpService, HttpEntity entity, IPublisher nextStagePublisher) : Message {
+	public readonly IPublisher NextStagePublisher = nextStagePublisher;
+	public readonly IHttpService HttpService = httpService;
+	public readonly HttpEntity Entity = entity;
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/NodeHttpClientFactory/INodeHttpClientFactory.cs b/src/KurrentDB.Core/Services/Transport/Http/NodeHttpClientFactory/INodeHttpClientFactory.cs
new file mode 100644
index 00000000000..a06d3a87a7a
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/NodeHttpClientFactory/INodeHttpClientFactory.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net.Http;
+
+namespace KurrentDB.Core.Services.Transport.Http.NodeHttpClientFactory;
+
+public interface INodeHttpClientFactory {
+	HttpClient CreateHttpClient(string[] additionalCertificateNames);
+}
diff --git a/src/EventStore.Core/Services/Transport/Http/NodeHttpClientFactory/NodeHttpClientFactory.cs b/src/KurrentDB.Core/Services/Transport/Http/NodeHttpClientFactory/NodeHttpClientFactory.cs
similarity index 77%
rename from src/EventStore.Core/Services/Transport/Http/NodeHttpClientFactory/NodeHttpClientFactory.cs
rename to src/KurrentDB.Core/Services/Transport/Http/NodeHttpClientFactory/NodeHttpClientFactory.cs
index 4c9bdfe0700..5cc84de5ea8 100644
--- a/src/EventStore.Core/Services/Transport/Http/NodeHttpClientFactory/NodeHttpClientFactory.cs
+++ b/src/KurrentDB.Core/Services/Transport/Http/NodeHttpClientFactory/NodeHttpClientFactory.cs
@@ -1,11 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Net.Http;
 using System.Security.Cryptography.X509Certificates;
-using EventStore.Common.Utils;
-using EventStore.Core.Settings;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Settings;
 using Serilog;
 
-namespace EventStore.Core.Services.Transport.Http.NodeHttpClientFactory;
+namespace KurrentDB.Core.Services.Transport.Http.NodeHttpClientFactory;
 
 public class NodeHttpClientFactory(
 	string uriScheme,
@@ -14,7 +17,7 @@ public class NodeHttpClientFactory(
 
 	public HttpClient CreateHttpClient(string[] additionalCertificateNames) {
 		HttpMessageHandler httpMessageHandler;
-		if (uriScheme == Uri.UriSchemeHttps){
+		if (uriScheme == Uri.UriSchemeHttps) {
 			var socketsHttpHandler = new SocketsHttpHandler {
 				SslOptions = {
 					CertificateRevocationCheckMode = X509RevocationMode.NoCheck,
diff --git a/src/KurrentDB.Core/Services/Transport/Http/OptionalAuthorizationLevel.cs b/src/KurrentDB.Core/Services/Transport/Http/OptionalAuthorizationLevel.cs
new file mode 100644
index 00000000000..d46ada8a189
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/OptionalAuthorizationLevel.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+internal class OptionalAuthorizationLevel(AuthorizationLevel authorizationLevel) {
+	private readonly AuthorizationLevel _authorizationLevel = authorizationLevel;
+
+	public static implicit operator AuthorizationLevel(OptionalAuthorizationLevel level) => level._authorizationLevel;
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/RequestParams.cs b/src/KurrentDB.Core/Services/Transport/Http/RequestParams.cs
new file mode 100644
index 00000000000..bb476bb4d6a
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/RequestParams.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public struct RequestParams(bool done, TimeSpan timeout) {
+	public readonly bool IsDone = done;
+	public readonly TimeSpan Timeout = timeout;
+
+	public RequestParams(bool done) : this(done, TimeSpan.Zero) {
+	}
+
+	public RequestParams(TimeSpan timeout) : this(false, timeout) {
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/ResponseConfiguration.cs b/src/KurrentDB.Core/Services/Transport/Http/ResponseConfiguration.cs
new file mode 100644
index 00000000000..1386d96224c
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/ResponseConfiguration.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using KurrentDB.Common.Utils;
+using HttpStatusCode = System.Net.HttpStatusCode;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public class ResponseConfiguration(
+	int code,
+	string description,
+	string contentType,
+	Encoding encoding,
+	IEnumerable<KeyValuePair<string, string>> headers) {
+	public readonly int Code = code;
+	public readonly string Description = description;
+	public readonly string ContentType = contentType;
+	public readonly Encoding Encoding = encoding;
+	public readonly IEnumerable<KeyValuePair<string, string>> Headers = headers;
+
+	public ResponseConfiguration(int code, string contentType, Encoding encoding, params KeyValuePair<string, string>[] headers)
+		: this(code, GetHttpStatusDescription(code), contentType, encoding, headers as IEnumerable<KeyValuePair<string, string>>) {
+	}
+
+	public ResponseConfiguration SetCreated(string location) {
+		var headers = Headers.ToDictionary(v => v.Key, v => v.Value);
+		headers["Location"] = location;
+		return new(KurrentDB.Transport.Http.HttpStatusCode.Created, ContentType, Encoding, headers.ToArray());
+	}
+
+	private static string GetHttpStatusDescription(int code) {
+		if (code == 200)
+			return "OK";
+		var status = (HttpStatusCode)code;
+		var name = Enum.GetName(typeof(HttpStatusCode), status);
+		var result = new StringBuilder(name.Length + 5);
+		for (var i = 0; i < name.Length; i++) {
+			if (i > 0 && char.IsUpper(name[i]))
+				result.Append(' ');
+			result.Append(name[i]);
+		}
+
+		return result.ToString();
+	}
+
+	public ResponseConfiguration(int code, string description, string contentType, Encoding encoding, params KeyValuePair<string, string>[] headers)
+		: this(code, description, contentType, encoding, headers as IEnumerable<KeyValuePair<string, string>>) {
+	}
+
+	public ResponseConfiguration(int code, string description, string contentType, params KeyValuePair<string, string>[] headers)
+		: this(code, description, contentType, Helper.UTF8NoBom, headers as IEnumerable<KeyValuePair<string, string>>) {
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/SendToHttpEnvelope.cs b/src/KurrentDB.Core/Services/Transport/Http/SendToHttpEnvelope.cs
new file mode 100644
index 00000000000..ecffe6160b9
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/SendToHttpEnvelope.cs
@@ -0,0 +1,100 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.EntityManagement;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public class HttpResponseConfiguratorArgs(Uri responseUrl, Uri requestedUrl, ICodec responseCodec) {
+	public readonly Uri ResponseUrl = responseUrl;
+	public readonly Uri RequestedUrl = requestedUrl;
+	public readonly ICodec ResponseCodec = responseCodec;
+
+	public static implicit operator HttpResponseConfiguratorArgs(HttpEntityManager entity) {
+		return new(entity.ResponseUrl, entity.RequestedUrl, entity.ResponseCodec);
+	}
+}
+
+public class HttpResponseFormatterArgs(Uri responseUrl, Uri requestedUrl, ICodec responseCodec) {
+	public readonly Uri ResponseUrl = responseUrl;
+	public readonly Uri RequestedUrl = requestedUrl;
+	public readonly ICodec ResponseCodec = responseCodec;
+
+	public static implicit operator HttpResponseFormatterArgs(HttpEntityManager entity) {
+		return new(entity.ResponseUrl, entity.RequestedUrl, entity.ResponseCodec);
+	}
+}
+
+public class SendToHttpEnvelope : IEnvelope {
+	private readonly IPublisher _networkSendQueue;
+	private readonly HttpEntityManager _entity;
+	private readonly Func<HttpResponseFormatterArgs, Message, object> _formatter;
+	private readonly Func<HttpResponseConfiguratorArgs, Message, ResponseConfiguration> _configurator;
+
+	public SendToHttpEnvelope(
+		IPublisher networkSendQueue,
+		HttpEntityManager entity,
+		Func<HttpResponseFormatterArgs, Message, object> formatter,
+		Func<HttpResponseConfiguratorArgs, Message, ResponseConfiguration> configurator) {
+
+		_networkSendQueue = Ensure.NotNull(networkSendQueue);
+		_entity = Ensure.NotNull(entity);
+		_formatter = Ensure.NotNull(formatter);
+		_configurator = Ensure.NotNull(configurator);
+	}
+
+	public void ReplyWith<T>(T message) where T : Message {
+		var responseConfiguration = _configurator(_entity, Ensure.NotNull(message));
+		var data = _formatter(_entity, message);
+		_networkSendQueue.Publish(new HttpMessage.HttpSend(_entity, responseConfiguration, data, message));
+	}
+}
+
+public class SendToHttpEnvelope<TExpectedResponseMessage> : IEnvelope where TExpectedResponseMessage : Message {
+	private readonly Func<ICodec, TExpectedResponseMessage, string> _formatter;
+	private readonly Func<ICodec, TExpectedResponseMessage, ResponseConfiguration> _configurator;
+	private readonly IEnvelope _notMatchingEnvelope;
+	private readonly IEnvelope _httpEnvelope;
+
+	public SendToHttpEnvelope(IPublisher networkSendQueue,
+		HttpEntityManager entity,
+		Func<ICodec, TExpectedResponseMessage, string> formatter,
+		Func<ICodec, TExpectedResponseMessage, ResponseConfiguration> configurator,
+		IEnvelope notMatchingEnvelope) {
+		_formatter = formatter;
+		_configurator = configurator;
+		_notMatchingEnvelope = notMatchingEnvelope;
+		_httpEnvelope = new SendToHttpEnvelope(networkSendQueue, entity, Formatter, Configurator);
+	}
+
+	private ResponseConfiguration Configurator(HttpResponseConfiguratorArgs http, Message message) {
+		try {
+			return _configurator(http.ResponseCodec, (TExpectedResponseMessage)message);
+		} catch (InvalidCastException) {
+			//NOTE: using exceptions to allow handling errors in debugger
+			return new(500, "Internal server error", ContentType.PlainText, Helper.UTF8NoBom);
+		}
+	}
+
+	private string Formatter(HttpResponseFormatterArgs http, Message message) {
+		try {
+			return _formatter(http.ResponseCodec, (TExpectedResponseMessage)message);
+		} catch (InvalidCastException) {
+			//NOTE: using exceptions to allow handling errors in debugger
+			return "";
+		}
+	}
+
+	public void ReplyWith<T>(T message) where T : Message {
+		if (message is TExpectedResponseMessage || _notMatchingEnvelope == null)
+			_httpEnvelope.ReplyWith(message);
+		else
+			_notMatchingEnvelope.ReplyWith(message);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/SendToHttpWithConversionEnvelope.cs b/src/KurrentDB.Core/Services/Transport/Http/SendToHttpWithConversionEnvelope.cs
new file mode 100644
index 00000000000..abf8651ff3b
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/SendToHttpWithConversionEnvelope.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.EntityManagement;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public class SendToHttpWithConversionEnvelope<TExpectedResponseMessage, TExpectedHttpFormattedResponseMessage> : IEnvelope
+	where TExpectedResponseMessage : Message {
+	private readonly Func<ICodec, TExpectedHttpFormattedResponseMessage, string> _formatter;
+	private readonly Func<ICodec, TExpectedHttpFormattedResponseMessage, ResponseConfiguration> _configurator;
+	private readonly Func<TExpectedResponseMessage, TExpectedHttpFormattedResponseMessage> _convertor;
+
+	private readonly SendToHttpEnvelope<TExpectedResponseMessage> _httpEnvelope;
+
+	public SendToHttpWithConversionEnvelope(IPublisher networkSendQueue,
+		HttpEntityManager entity,
+		Func<ICodec, TExpectedHttpFormattedResponseMessage, string> formatter,
+		Func<ICodec, TExpectedHttpFormattedResponseMessage, ResponseConfiguration> configurator,
+		Func<TExpectedResponseMessage, TExpectedHttpFormattedResponseMessage> convertor,
+		IEnvelope nonMatchingEnvelope = null) {
+		_formatter = formatter;
+		_configurator = configurator;
+		_convertor = convertor;
+		_httpEnvelope = new(networkSendQueue, entity, Formatter, Configurator, nonMatchingEnvelope);
+	}
+
+	private ResponseConfiguration Configurator(ICodec codec, TExpectedResponseMessage message) {
+		var convertedMessage = _convertor(message);
+		return _configurator(codec, convertedMessage);
+	}
+
+	private string Formatter(ICodec codec, TExpectedResponseMessage message) {
+		var convertedMessage = _convertor(message);
+		return _formatter(codec, convertedMessage);
+	}
+
+	public void ReplyWith<T>(T message) where T : Message {
+		_httpEnvelope.ReplyWith(message);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/ServiceAccessibility.cs b/src/KurrentDB.Core/Services/Transport/Http/ServiceAccessibility.cs
new file mode 100644
index 00000000000..4b02b5f275c
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/ServiceAccessibility.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public enum ServiceAccessibility {
+	Private,
+	Public
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/UnixSocketConnectionMiddleware.cs b/src/KurrentDB.Core/Services/Transport/Http/UnixSocketConnectionMiddleware.cs
new file mode 100644
index 00000000000..558d6c6259e
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/UnixSocketConnectionMiddleware.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Connections;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+public class UnixSocketConnectionMiddleware(ConnectionDelegate next) {
+	public const string UnixSocketConnectionKey = "UnixSocketConnection";
+
+	public async Task OnConnectAsync(ConnectionContext context) {
+		context.Items.Add(UnixSocketConnectionKey, true);
+		await next(context);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/UriRouters.cs b/src/KurrentDB.Core/Services/Transport/Http/UriRouters.cs
new file mode 100644
index 00000000000..384e62a3d48
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/UriRouters.cs
@@ -0,0 +1,133 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Transport.Http.EntityManagement;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public interface IUriRouter {
+	void RegisterAction(ControllerAction action, Func<HttpEntityManager, UriTemplateMatch, RequestParams> handler);
+	List<UriToActionMatch> GetAllUriMatches(Uri uri);
+	IEnumerable<ControllerAction> Actions { get; }
+}
+
+public class TrieUriRouter : IUriRouter {
+	private const string Placeholder = "{}";
+	private const string GreedyPlaceholder = "{*}";
+
+	private readonly RouterNode _root = new();
+	private readonly List<ControllerAction> _registeredRoutes = [];
+
+	public void RegisterAction(ControllerAction action, Func<HttpEntityManager, UriTemplateMatch, RequestParams> handler) {
+		Ensure.NotNull(action);
+		Ensure.NotNull(handler);
+
+		var segments = new Uri($"http://fake{action.UriTemplate}", UriKind.Absolute).Segments;
+		RouterNode node = _root;
+		foreach (var sgm in segments) {
+			var segment = Uri.UnescapeDataString(sgm);
+			string path = segment.StartsWith("{*")
+				? GreedyPlaceholder
+				: segment.StartsWith('{') ? Placeholder : segment;
+
+			if (!node.Children.TryGetValue(path, out var child)) {
+				child = new();
+				node.Children.Add(path, child);
+			}
+
+			node = child;
+		}
+
+		if (node.LeafRoutes.Contains(x => x.Action.Equals(action)))
+			throw new ArgumentException("Duplicate route.");
+		node.LeafRoutes.Add(new HttpRoute(action, handler));
+
+		_registeredRoutes.Add(action);
+	}
+
+	public List<UriToActionMatch> GetAllUriMatches(Uri uri) {
+		var matches = new List<UriToActionMatch>();
+		var baseAddress = new UriBuilder(uri.Scheme, uri.Host, uri.Port).Uri;
+
+		var segments = new string[uri.Segments.Length];
+		for (int i = 0; i < uri.Segments.Length; i++) {
+			segments[i] = Uri.UnescapeDataString(uri.Segments[i]);
+		}
+
+		GetAllUriMatches(_root, baseAddress, uri, segments, 0, matches);
+
+		return matches;
+	}
+
+	public IEnumerable<ControllerAction> Actions => _registeredRoutes;
+
+	private static void GetAllUriMatches(RouterNode node, Uri baseAddress, Uri uri, string[] segments, int index, List<UriToActionMatch> matches) {
+		RouterNode child;
+
+		if (index == segments.Length) {
+			// /stats/ should match /stats/{*greedyStatsPath}
+			if (uri.OriginalString.EndsWith('/') && node.Children.TryGetValue(GreedyPlaceholder, out child))
+				AddMatchingRoutes(child.LeafRoutes, baseAddress, uri, matches);
+
+			AddMatchingRoutes(node.LeafRoutes, baseAddress, uri, matches);
+			return;
+		}
+
+		if (node.Children.TryGetValue(GreedyPlaceholder, out child))
+			GetAllUriMatches(child, baseAddress, uri, segments, segments.Length, matches);
+		if (node.Children.TryGetValue(Placeholder, out child))
+			GetAllUriMatches(child, baseAddress, uri, segments, index + 1, matches);
+		if (node.Children.TryGetValue(segments[index], out child))
+			GetAllUriMatches(child, baseAddress, uri, segments, index + 1, matches);
+	}
+
+	private static void AddMatchingRoutes(IList<HttpRoute> routes, Uri baseAddress, Uri uri,
+		List<UriToActionMatch> matches) {
+		for (int i = 0; i < routes.Count; ++i) {
+			var route = routes[i];
+			var match = route.UriTemplate.Match(baseAddress, uri);
+			if (match != null)
+				matches.Add(new(match, route.Action, route.Handler));
+		}
+	}
+
+	private class RouterNode {
+		public readonly Dictionary<string, RouterNode> Children = new();
+		public readonly List<HttpRoute> LeafRoutes = [];
+	}
+}
+
+public class NaiveUriRouter : IUriRouter {
+	private readonly List<HttpRoute> _actions = [];
+
+	public IEnumerable<ControllerAction> Actions => _actions.Select(x => x.Action);
+
+	public void RegisterAction(ControllerAction action, Func<HttpEntityManager, UriTemplateMatch, RequestParams> handler) {
+		if (_actions.Contains(x => x.Action.Equals(action)))
+			throw new ArgumentException("Duplicate route.");
+		_actions.Add(new HttpRoute(action, handler));
+	}
+
+	public List<UriToActionMatch> GetAllUriMatches(Uri uri) {
+		var matches = new List<UriToActionMatch>();
+		var baseAddress = new UriBuilder(uri.Scheme, uri.Host, uri.Port).Uri;
+		for (int i = 0; i < _actions.Count; ++i) {
+			var route = _actions[i];
+			var match = route.UriTemplate.Match(baseAddress, uri);
+			if (match != null)
+				matches.Add(new UriToActionMatch(match, route.Action, route.Handler));
+		}
+
+		return matches;
+	}
+}
+
+internal class HttpRoute(ControllerAction action, Func<HttpEntityManager, UriTemplateMatch, RequestParams> handler) {
+	public readonly ControllerAction Action = action;
+	public readonly Func<HttpEntityManager, UriTemplateMatch, RequestParams> Handler = handler;
+	public readonly UriTemplate UriTemplate = new(action.UriTemplate);
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Http/UriToActionMatch.cs b/src/KurrentDB.Core/Services/Transport/Http/UriToActionMatch.cs
new file mode 100644
index 00000000000..1b56b8842cf
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Http/UriToActionMatch.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Transport.Http.EntityManagement;
+
+namespace KurrentDB.Core.Services.Transport.Http;
+
+public class UriToActionMatch(
+	UriTemplateMatch templateMatch,
+	ControllerAction controllerAction,
+	Func<HttpEntityManager, UriTemplateMatch, RequestParams> requestHandler) {
+	public readonly UriTemplateMatch TemplateMatch = templateMatch;
+	public readonly ControllerAction ControllerAction = controllerAction;
+	public readonly Func<HttpEntityManager, UriTemplateMatch, RequestParams> RequestHandler = requestHandler;
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Tcp/ClientTcpDispatcher.cs b/src/KurrentDB.Core/Services/Transport/Tcp/ClientTcpDispatcher.cs
new file mode 100644
index 00000000000..c3a3cda1c01
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Tcp/ClientTcpDispatcher.cs
@@ -0,0 +1,497 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Security.Claims;
+using EventStore.Client.Messages;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using static KurrentDB.Core.Messages.ClientMessage;
+using CheckpointReached = EventStore.Client.Messages.CheckpointReached;
+using FilteredSubscribeToStream = EventStore.Client.Messages.FilteredSubscribeToStream;
+using IdentifyClient = EventStore.Client.Messages.IdentifyClient;
+using NotHandled = EventStore.Client.Messages.NotHandled;
+using PersistentSubscriptionAckEvents = EventStore.Client.Messages.PersistentSubscriptionAckEvents;
+using PersistentSubscriptionConfirmation = EventStore.Client.Messages.PersistentSubscriptionConfirmation;
+using PersistentSubscriptionNakEvents = EventStore.Client.Messages.PersistentSubscriptionNakEvents;
+using PersistentSubscriptionStreamEventAppeared = EventStore.Client.Messages.PersistentSubscriptionStreamEventAppeared;
+using ReadEvent = EventStore.Client.Messages.ReadEvent;
+using ReadEventCompleted = EventStore.Client.Messages.ReadEventCompleted;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+using StreamEventAppeared = EventStore.Client.Messages.StreamEventAppeared;
+using SubscribeToStream = EventStore.Client.Messages.SubscribeToStream;
+using SubscriptionConfirmation = EventStore.Client.Messages.SubscriptionConfirmation;
+using SubscriptionDropped = EventStore.Client.Messages.SubscriptionDropped;
+using UnsubscribeFromStream = EventStore.Client.Messages.UnsubscribeFromStream;
+
+namespace KurrentDB.Core.Services.Transport.Tcp;
+
+public class ClientTcpDispatcher : ClientWriteTcpDispatcher {
+	public ClientTcpDispatcher(int writeTimeoutMs)
+		: this(TimeSpan.FromMilliseconds(writeTimeoutMs)) {
+	}
+
+	public ClientTcpDispatcher(TimeSpan writeTimeout) : base(writeTimeout) {
+		AddUnwrapper(TcpCommand.Ping, UnwrapPing, ClientVersion.V2);
+		AddWrapper<TcpMessage.PongMessage>(WrapPong, ClientVersion.V2);
+
+		AddUnwrapper(TcpCommand.IdentifyClient, UnwrapIdentifyClient, ClientVersion.V2);
+
+		AddUnwrapper(TcpCommand.ReadEvent, UnwrapReadEvent, ClientVersion.V2);
+		AddWrapper<ClientMessage.ReadEventCompleted>(WrapReadEventCompleted, ClientVersion.V2);
+
+		AddUnwrapper(TcpCommand.ReadStreamEventsForward, UnwrapReadStreamEventsForward, ClientVersion.V2);
+		AddWrapper<ReadStreamEventsForwardCompleted>(WrapReadStreamEventsForwardCompleted, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.ReadStreamEventsBackward, UnwrapReadStreamEventsBackward, ClientVersion.V2);
+		AddWrapper<ReadStreamEventsBackwardCompleted>(WrapReadStreamEventsBackwardCompleted, ClientVersion.V2);
+
+		AddUnwrapper(TcpCommand.ReadAllEventsForward, UnwrapReadAllEventsForward, ClientVersion.V2);
+		AddWrapper<ReadAllEventsForwardCompleted>(WrapReadAllEventsForwardCompleted, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.ReadAllEventsBackward, UnwrapReadAllEventsBackward, ClientVersion.V2);
+		AddWrapper<ReadAllEventsBackwardCompleted>(WrapReadAllEventsBackwardCompleted, ClientVersion.V2);
+
+		AddUnwrapper(TcpCommand.FilteredReadAllEventsForward, UnwrapFilteredReadAllEventsForward, ClientVersion.V2);
+		AddWrapper<FilteredReadAllEventsForwardCompleted>(WrapFilteredReadAllEventsForwardCompleted, ClientVersion.V2);
+
+		AddUnwrapper(TcpCommand.FilteredReadAllEventsBackward, UnwrapFilteredReadAllEventsBackward, ClientVersion.V2);
+		AddWrapper<FilteredReadAllEventsBackwardCompleted>(WrapFilteredReadAllEventsBackwardCompleted, ClientVersion.V2);
+
+		AddUnwrapper(TcpCommand.SubscribeToStream, UnwrapSubscribeToStream, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.FilteredSubscribeToStream, UnwrapFilteredSubscribeToStream, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.UnsubscribeFromStream, UnwrapUnsubscribeFromStream, ClientVersion.V2);
+
+		AddWrapper<ClientMessage.CheckpointReached>(WrapCheckpointReached, ClientVersion.V2);
+
+		AddWrapper<ClientMessage.SubscriptionConfirmation>(WrapSubscribedToStream, ClientVersion.V2);
+		AddWrapper<ClientMessage.StreamEventAppeared>(WrapStreamEventAppeared, ClientVersion.V2);
+		AddWrapper<ClientMessage.SubscriptionDropped>(WrapSubscriptionDropped, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.CreatePersistentSubscription, UnwrapCreatePersistentSubscription, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.DeletePersistentSubscription, UnwrapDeletePersistentSubscription, ClientVersion.V2);
+		AddWrapper<CreatePersistentSubscriptionToStreamCompleted>(WrapCreatePersistentSubscriptionCompleted, ClientVersion.V2);
+		AddWrapper<DeletePersistentSubscriptionToStreamCompleted>(WrapDeletePersistentSubscriptionCompleted, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.UpdatePersistentSubscription, UnwrapUpdatePersistentSubscription, ClientVersion.V2);
+		AddWrapper<UpdatePersistentSubscriptionToStreamCompleted>(WrapUpdatePersistentSubscriptionCompleted, ClientVersion.V2);
+
+		AddUnwrapper(TcpCommand.ConnectToPersistentSubscription, UnwrapConnectToPersistentSubscription, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.PersistentSubscriptionAckEvents, UnwrapPersistentSubscriptionAckEvents, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.PersistentSubscriptionNakEvents, UnwrapPersistentSubscriptionNackEvents, ClientVersion.V2);
+		AddWrapper<ClientMessage.PersistentSubscriptionConfirmation>(WrapPersistentSubscriptionConfirmation, ClientVersion.V2);
+		AddWrapper<ClientMessage.PersistentSubscriptionStreamEventAppeared>(WrapPersistentSubscriptionStreamEventAppeared, ClientVersion.V2);
+
+		AddUnwrapper(TcpCommand.ScavengeDatabase, UnwrapScavengeDatabase, ClientVersion.V2);
+		AddWrapper<ScavengeDatabaseInProgressResponse>(WrapScavengeDatabaseResponse, ClientVersion.V2);
+		AddWrapper<ScavengeDatabaseStartedResponse>(WrapScavengeDatabaseResponse, ClientVersion.V2);
+		AddWrapper<ScavengeDatabaseUnauthorizedResponse>(WrapScavengeDatabaseResponse, ClientVersion.V2);
+
+		AddWrapper<ClientMessage.NotHandled>(WrapNotHandled, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.NotHandled, UnwrapNotHandled, ClientVersion.V2);
+
+		AddWrapper<TcpMessage.NotAuthenticated>(WrapNotAuthenticated, ClientVersion.V2);
+		AddWrapper<TcpMessage.Authenticated>(WrapAuthenticated, ClientVersion.V2);
+	}
+
+
+	private static TcpPackage WrapCheckpointReached(ClientMessage.CheckpointReached msg) {
+		var dto = new CheckpointReached(msg.Position.Value.CommitPosition, msg.Position.Value.PreparePosition);
+		return new(TcpCommand.CheckpointReached, msg.CorrelationId, dto.Serialize());
+	}
+
+	private static Message UnwrapPing(TcpPackage package, IEnvelope envelope) {
+		var data = new byte[package.Data.Count];
+		Buffer.BlockCopy(package.Data.Array, package.Data.Offset, data, 0, package.Data.Count);
+		var pongMessage = new TcpMessage.PongMessage(package.CorrelationId, data);
+		envelope.ReplyWith(pongMessage);
+		return pongMessage;
+	}
+
+	private static Message UnwrapIdentifyClient(TcpPackage package, IEnvelope envelope) {
+		var dto = package.Data.Deserialize<IdentifyClient>();
+		return dto == null ? null : new ClientMessage.IdentifyClient(package.CorrelationId, dto.Version, dto.ConnectionName);
+	}
+
+	private static TcpPackage WrapPong(TcpMessage.PongMessage message) {
+		return new(TcpCommand.Pong, message.CorrelationId, message.Payload);
+	}
+
+	private static ClientMessage.ReadEvent UnwrapReadEvent(TcpPackage package, IEnvelope envelope, ClaimsPrincipal user) {
+		var dto = package.Data.Deserialize<ReadEvent>();
+		if (dto == null)
+			return null;
+		return new(Guid.NewGuid(), package.CorrelationId, envelope, dto.EventStreamId, dto.EventNumber, dto.ResolveLinkTos, dto.RequireLeader, user);
+	}
+
+	private static TcpPackage WrapReadEventCompleted(ClientMessage.ReadEventCompleted msg) {
+		var dto = new ReadEventCompleted((ReadEventCompleted.Types.ReadEventResult)msg.Result, new(msg.Record.Event, msg.Record.Link), msg.Error);
+		return new(TcpCommand.ReadEventCompleted, msg.CorrelationId, dto.Serialize());
+	}
+
+	private static ReadStreamEventsForward UnwrapReadStreamEventsForward(TcpPackage package, IEnvelope envelope, ClaimsPrincipal user) {
+		var dto = package.Data.Deserialize<ReadStreamEvents>();
+		if (dto == null)
+			return null;
+		return new(Guid.NewGuid(), package.CorrelationId, envelope,
+			dto.EventStreamId, dto.FromEventNumber, dto.MaxCount,
+			dto.ResolveLinkTos, dto.RequireLeader, null, user,
+			replyOnExpired: false);
+	}
+
+	private static TcpPackage WrapReadStreamEventsForwardCompleted(ReadStreamEventsForwardCompleted msg) {
+		var dto = new ReadStreamEventsCompleted(
+			ConvertToResolvedIndexedEvents(msg.Events),
+			(ReadStreamEventsCompleted.Types.ReadStreamResult)msg.Result,
+			msg.NextEventNumber, msg.LastEventNumber, msg.IsEndOfStream, msg.TfLastCommitPosition, msg.Error);
+		return new(TcpCommand.ReadStreamEventsForwardCompleted, msg.CorrelationId, dto.Serialize());
+	}
+
+	private static ReadStreamEventsBackward UnwrapReadStreamEventsBackward(TcpPackage package, IEnvelope envelope, ClaimsPrincipal user) {
+		var dto = package.Data.Deserialize<ReadStreamEvents>();
+		if (dto == null)
+			return null;
+		return new(Guid.NewGuid(), package.CorrelationId, envelope,
+			dto.EventStreamId, dto.FromEventNumber, dto.MaxCount,
+			dto.ResolveLinkTos, dto.RequireLeader, null, user);
+	}
+
+	private static TcpPackage WrapReadStreamEventsBackwardCompleted(ReadStreamEventsBackwardCompleted msg) {
+		var dto = new ReadStreamEventsCompleted(
+			ConvertToResolvedIndexedEvents(msg.Events),
+			(ReadStreamEventsCompleted.Types.ReadStreamResult)msg.Result,
+			msg.NextEventNumber, msg.LastEventNumber, msg.IsEndOfStream, msg.TfLastCommitPosition, msg.Error);
+		return new(TcpCommand.ReadStreamEventsBackwardCompleted, msg.CorrelationId, dto.Serialize());
+	}
+
+	private static ResolvedIndexedEvent[] ConvertToResolvedIndexedEvents(IReadOnlyList<ResolvedEvent> events) {
+		var result = new ResolvedIndexedEvent[events.Count];
+		for (int i = 0; i < events.Count; ++i) {
+			result[i] = new(events[i].Event, events[i].Link);
+		}
+
+		return result;
+	}
+
+	private static ReadAllEventsForward UnwrapReadAllEventsForward(TcpPackage package, IEnvelope envelope, ClaimsPrincipal user) {
+		var dto = package.Data.Deserialize<ReadAllEvents>();
+		if (dto == null)
+			return null;
+
+		return new(Guid.NewGuid(), package.CorrelationId, envelope,
+			dto.CommitPosition, dto.PreparePosition, dto.MaxCount,
+			dto.ResolveLinkTos, dto.RequireLeader, null, user,
+			replyOnExpired: false,
+			longPollTimeout: null);
+	}
+
+	private static TcpPackage WrapReadAllEventsForwardCompleted(ReadAllEventsForwardCompleted msg) {
+		var dto = new ReadAllEventsCompleted(
+			msg.CurrentPos.CommitPosition, msg.CurrentPos.PreparePosition, ConvertToResolvedEvents(msg.Events),
+			msg.NextPos.CommitPosition, msg.NextPos.PreparePosition,
+			(ReadAllEventsCompleted.Types.ReadAllResult)msg.Result, msg.Error);
+		return new(TcpCommand.ReadAllEventsForwardCompleted, msg.CorrelationId, dto.Serialize());
+	}
+
+	private static ReadAllEventsBackward UnwrapReadAllEventsBackward(TcpPackage package, IEnvelope envelope, ClaimsPrincipal user) {
+		var dto = package.Data.Deserialize<ReadAllEvents>();
+		if (dto == null)
+			return null;
+		return new(Guid.NewGuid(), package.CorrelationId, envelope,
+			dto.CommitPosition, dto.PreparePosition, dto.MaxCount,
+			dto.ResolveLinkTos, dto.RequireLeader, null, user);
+	}
+
+	private static TcpPackage WrapReadAllEventsBackwardCompleted(ReadAllEventsBackwardCompleted msg) {
+		var dto = new ReadAllEventsCompleted(
+			msg.CurrentPos.CommitPosition, msg.CurrentPos.PreparePosition, ConvertToResolvedEvents(msg.Events),
+			msg.NextPos.CommitPosition, msg.NextPos.PreparePosition,
+			(ReadAllEventsCompleted.Types.ReadAllResult)msg.Result, msg.Error);
+		return new(TcpCommand.ReadAllEventsBackwardCompleted, msg.CorrelationId, dto.Serialize());
+	}
+
+	private static FilteredReadAllEventsForward UnwrapFilteredReadAllEventsForward(TcpPackage package, IEnvelope envelope, ClaimsPrincipal user) {
+		var dto = package.Data.Deserialize<FilteredReadAllEvents>();
+		if (dto == null)
+			return null;
+
+		var eventFilter = EventFilter.Get(true, dto.Filter);
+		int maxSearchWindow = dto.MaxCount;
+		if (dto.MaxSearchWindow > 0) {
+			maxSearchWindow = dto.MaxSearchWindow;
+		}
+
+		return new(Guid.NewGuid(), package.CorrelationId, envelope,
+			dto.CommitPosition, dto.PreparePosition, dto.MaxCount,
+			dto.ResolveLinkTos, dto.RequireLeader, maxSearchWindow, null, eventFilter, user,
+			replyOnExpired: false,
+			longPollTimeout: null);
+	}
+
+	private static TcpPackage WrapFilteredReadAllEventsForwardCompleted(FilteredReadAllEventsForwardCompleted msg) {
+		var dto = new FilteredReadAllEventsCompleted(
+			msg.CurrentPos.CommitPosition, msg.CurrentPos.PreparePosition, ConvertToResolvedEvents(msg.Events),
+			msg.NextPos.CommitPosition, msg.NextPos.PreparePosition, msg.IsEndOfStream,
+			(FilteredReadAllEventsCompleted.Types.FilteredReadAllResult)msg.Result, msg.Error);
+		return new(TcpCommand.FilteredReadAllEventsForwardCompleted, msg.CorrelationId, dto.Serialize());
+	}
+
+	private static EventStore.Client.Messages.ResolvedEvent[] ConvertToResolvedEvents(IReadOnlyList<ResolvedEvent> events) {
+		var result = new EventStore.Client.Messages.ResolvedEvent[events.Count];
+		for (int i = 0; i < events.Count; ++i) {
+			result[i] = new(events[i]);
+		}
+
+		return result;
+	}
+
+	private static FilteredReadAllEventsBackward UnwrapFilteredReadAllEventsBackward(TcpPackage package, IEnvelope envelope, ClaimsPrincipal user) {
+		var dto = package.Data.Deserialize<FilteredReadAllEvents>();
+		if (dto == null)
+			return null;
+
+		var eventFilter = EventFilter.Get(true, dto.Filter);
+		int maxSearchWindow = dto.MaxCount;
+		if (dto.MaxSearchWindow > 0) {
+			maxSearchWindow = dto.MaxSearchWindow;
+		}
+
+		return new(Guid.NewGuid(), package.CorrelationId, envelope,
+			dto.CommitPosition, dto.PreparePosition, dto.MaxCount,
+			dto.ResolveLinkTos, dto.RequireLeader, maxSearchWindow, null, eventFilter, user, null);
+	}
+
+	private static TcpPackage WrapFilteredReadAllEventsBackwardCompleted(
+		FilteredReadAllEventsBackwardCompleted msg) {
+		var dto = new FilteredReadAllEventsCompleted(
+			msg.CurrentPos.CommitPosition, msg.CurrentPos.PreparePosition, ConvertToResolvedEvents(msg.Events),
+			msg.NextPos.CommitPosition, msg.NextPos.PreparePosition, msg.IsEndOfStream,
+			(FilteredReadAllEventsCompleted.Types.FilteredReadAllResult)msg.Result, msg.Error);
+		return new(TcpCommand.FilteredReadAllEventsBackwardCompleted, msg.CorrelationId, dto.Serialize());
+	}
+
+	private static ClientMessage.SubscribeToStream UnwrapSubscribeToStream(TcpPackage package,
+		IEnvelope envelope,
+		ClaimsPrincipal user,
+		TcpConnectionManager connection) {
+		var dto = package.Data.Deserialize<SubscribeToStream>();
+		if (dto == null)
+			return null;
+		return new(Guid.NewGuid(), package.CorrelationId, envelope,
+			connection.ConnectionId, dto.EventStreamId, dto.ResolveLinkTos, user);
+	}
+
+	private static ClientMessage.FilteredSubscribeToStream UnwrapFilteredSubscribeToStream(TcpPackage package,
+		IEnvelope envelope,
+		ClaimsPrincipal user,
+		TcpConnectionManager connection) {
+		var dto = package.Data.Deserialize<FilteredSubscribeToStream>();
+		if (dto == null)
+			return null;
+
+		var eventFilter = EventFilter.Get(dto.EventStreamId.IsEmptyString(), dto.Filter);
+		return new(Guid.NewGuid(), package.CorrelationId, envelope,
+			connection.ConnectionId, dto.EventStreamId, dto.ResolveLinkTos, user, eventFilter,
+			dto.CheckpointInterval, checkpointIntervalCurrent: 0);
+	}
+
+	private static ClientMessage.UnsubscribeFromStream UnwrapUnsubscribeFromStream(TcpPackage package, IEnvelope envelope, ClaimsPrincipal user) {
+		var dto = package.Data.Deserialize<UnsubscribeFromStream>();
+		if (dto == null)
+			return null;
+		return new(Guid.NewGuid(), package.CorrelationId, envelope, user);
+	}
+
+	private static TcpPackage WrapSubscribedToStream(ClientMessage.SubscriptionConfirmation msg) {
+		var dto = new SubscriptionConfirmation(msg.LastIndexedPosition, msg.LastEventNumber ?? 0);
+		return new(TcpCommand.SubscriptionConfirmation, msg.CorrelationId, dto.Serialize());
+	}
+
+	private static CreatePersistentSubscriptionToStream UnwrapCreatePersistentSubscription(
+		TcpPackage package, IEnvelope envelope, ClaimsPrincipal user, TcpConnectionManager connection) {
+		var dto = package.Data.Deserialize<CreatePersistentSubscription>();
+		if (dto == null)
+			return null;
+
+		var namedConsumerStrategy = dto.NamedConsumerStrategy;
+		if (string.IsNullOrEmpty(namedConsumerStrategy)) {
+			namedConsumerStrategy = dto.PreferRoundRobin ? SystemConsumerStrategies.RoundRobin : SystemConsumerStrategies.DispatchToSingle;
+		}
+
+		return new(Guid.NewGuid(), package.CorrelationId, envelope,
+			dto.EventStreamId, dto.SubscriptionGroupName, dto.ResolveLinkTos, dto.StartFrom,
+			dto.MessageTimeoutMilliseconds,
+			dto.RecordStatistics, dto.MaxRetryCount, dto.BufferSize, dto.LiveBufferSize,
+			dto.ReadBatchSize, dto.CheckpointAfterTime, dto.CheckpointMinCount,
+			dto.CheckpointMaxCount, dto.SubscriberMaxCount, namedConsumerStrategy,
+			user);
+	}
+
+	private static UpdatePersistentSubscriptionToStream UnwrapUpdatePersistentSubscription(
+		TcpPackage package, IEnvelope envelope, ClaimsPrincipal user, TcpConnectionManager connection) {
+		var dto = package.Data.Deserialize<UpdatePersistentSubscription>();
+		if (dto == null)
+			return null;
+
+		var namedConsumerStrategy = dto.NamedConsumerStrategy;
+		if (string.IsNullOrEmpty(namedConsumerStrategy)) {
+			namedConsumerStrategy = dto.PreferRoundRobin ? SystemConsumerStrategies.RoundRobin : SystemConsumerStrategies.DispatchToSingle;
+		}
+
+		return new(Guid.NewGuid(), package.CorrelationId, envelope,
+			dto.EventStreamId, dto.SubscriptionGroupName, dto.ResolveLinkTos, dto.StartFrom,
+			dto.MessageTimeoutMilliseconds,
+			dto.RecordStatistics, dto.MaxRetryCount, dto.BufferSize, dto.LiveBufferSize,
+			dto.ReadBatchSize, dto.CheckpointAfterTime, dto.CheckpointMinCount,
+			dto.CheckpointMaxCount, dto.SubscriberMaxCount, namedConsumerStrategy,
+			user);
+	}
+
+	private static DeletePersistentSubscriptionToStream UnwrapDeletePersistentSubscription(
+		TcpPackage package, IEnvelope envelope, ClaimsPrincipal user, TcpConnectionManager connection) {
+		var dto = package.Data.Deserialize<CreatePersistentSubscription>();
+		if (dto == null)
+			return null;
+		return new(Guid.NewGuid(), package.CorrelationId, envelope,
+			dto.EventStreamId, dto.SubscriptionGroupName, user);
+	}
+
+	private static TcpPackage WrapDeletePersistentSubscriptionCompleted(DeletePersistentSubscriptionToStreamCompleted msg) {
+		var dto = new DeletePersistentSubscriptionCompleted((DeletePersistentSubscriptionCompleted.Types.DeletePersistentSubscriptionResult)msg.Result, msg.Reason);
+		return new(TcpCommand.DeletePersistentSubscriptionCompleted, msg.CorrelationId, dto.Serialize());
+	}
+
+	private static TcpPackage WrapCreatePersistentSubscriptionCompleted(CreatePersistentSubscriptionToStreamCompleted msg) {
+		var dto = new CreatePersistentSubscriptionCompleted((CreatePersistentSubscriptionCompleted.Types.CreatePersistentSubscriptionResult)msg.Result, msg.Reason);
+		return new(TcpCommand.CreatePersistentSubscriptionCompleted, msg.CorrelationId, dto.Serialize());
+	}
+
+	private static TcpPackage WrapUpdatePersistentSubscriptionCompleted(UpdatePersistentSubscriptionToStreamCompleted msg) {
+		var dto = new UpdatePersistentSubscriptionCompleted((UpdatePersistentSubscriptionCompleted.Types.UpdatePersistentSubscriptionResult)msg.Result, msg.Reason);
+		return new(TcpCommand.UpdatePersistentSubscriptionCompleted, msg.CorrelationId, dto.Serialize());
+	}
+
+	private static ConnectToPersistentSubscriptionToStream UnwrapConnectToPersistentSubscription(TcpPackage package, IEnvelope envelope, ClaimsPrincipal user, TcpConnectionManager connection) {
+		var dto = package.Data.Deserialize<ConnectToPersistentSubscription>();
+		if (dto == null)
+			return null;
+		return new(Guid.NewGuid(), package.CorrelationId, envelope,
+			connection.ConnectionId, connection.ClientConnectionName, dto.SubscriptionId, dto.EventStreamId, dto.AllowedInFlightMessages,
+			connection.RemoteEndPoint.ToString(), user);
+	}
+
+	private static ClientMessage.PersistentSubscriptionAckEvents UnwrapPersistentSubscriptionAckEvents(
+		TcpPackage package, IEnvelope envelope, ClaimsPrincipal user, TcpConnectionManager connection) {
+		var dto = package.Data.Deserialize<PersistentSubscriptionAckEvents>();
+		if (dto == null)
+			return null;
+		return new(
+			Guid.NewGuid(), package.CorrelationId, envelope, dto.SubscriptionId,
+			dto.ProcessedEventIds.Select(x => new Guid(x.ToByteArray())).ToArray(), user);
+	}
+
+	private static PersistentSubscriptionNackEvents UnwrapPersistentSubscriptionNackEvents(
+		TcpPackage package, IEnvelope envelope, ClaimsPrincipal user, TcpConnectionManager connection) {
+		var dto = package.Data.Deserialize<PersistentSubscriptionNakEvents>();
+		if (dto == null)
+			return null;
+		return new(
+			Guid.NewGuid(), package.CorrelationId, envelope, dto.SubscriptionId,
+			dto.Message, (PersistentSubscriptionNackEvents.NakAction)dto.Action,
+			dto.ProcessedEventIds.Select(x => new Guid(x.ToByteArray())).ToArray(), user);
+	}
+
+	private static TcpPackage WrapPersistentSubscriptionConfirmation(ClientMessage.PersistentSubscriptionConfirmation msg) {
+		var dto = new PersistentSubscriptionConfirmation(msg.LastIndexedPosition, msg.SubscriptionId, msg.LastEventNumber ?? 0);
+		return new(TcpCommand.PersistentSubscriptionConfirmation, msg.CorrelationId, dto.Serialize());
+	}
+
+	private static TcpPackage WrapPersistentSubscriptionStreamEventAppeared(
+		ClientMessage.PersistentSubscriptionStreamEventAppeared msg) {
+		var dto = new PersistentSubscriptionStreamEventAppeared(new(msg.Event.Event, msg.Event.Link), msg.RetryCount);
+		return new(TcpCommand.PersistentSubscriptionStreamEventAppeared, msg.CorrelationId, dto.Serialize());
+	}
+
+	private static TcpPackage WrapStreamEventAppeared(ClientMessage.StreamEventAppeared msg) {
+		var dto = new StreamEventAppeared(new EventStore.Client.Messages.ResolvedEvent(msg.Event));
+		return new(TcpCommand.StreamEventAppeared, msg.CorrelationId, dto.Serialize());
+	}
+
+	private static TcpPackage WrapSubscriptionDropped(ClientMessage.SubscriptionDropped msg) {
+		var dto = new SubscriptionDropped((SubscriptionDropped.Types.SubscriptionDropReason)msg.Reason);
+		return new(TcpCommand.SubscriptionDropped, msg.CorrelationId, dto.Serialize());
+	}
+
+	private static ClientMessage.ScavengeDatabase UnwrapScavengeDatabase(TcpPackage package, IEnvelope envelope, ClaimsPrincipal user) {
+		return new(envelope, package.CorrelationId, user, 0, 1, null, null, false);
+	}
+
+	private static TcpPackage WrapScavengeDatabaseResponse(Message msg) {
+		ScavengeDatabaseResponse.Types.ScavengeResult result;
+		string scavengeId;
+		Guid correlationId;
+
+		switch (msg) {
+			case ScavengeDatabaseStartedResponse startedResponse:
+				result = ScavengeDatabaseResponse.Types.ScavengeResult.Started;
+				scavengeId = startedResponse.ScavengeId;
+				correlationId = startedResponse.CorrelationId;
+				break;
+			case ScavengeDatabaseInProgressResponse inProgressResponse:
+				result = ScavengeDatabaseResponse.Types.ScavengeResult.InProgress;
+				scavengeId = inProgressResponse.ScavengeId;
+				correlationId = inProgressResponse.CorrelationId;
+				break;
+			case ScavengeDatabaseUnauthorizedResponse unauthorizedResponse:
+				result = ScavengeDatabaseResponse.Types.ScavengeResult.Unauthorized;
+				scavengeId = unauthorizedResponse.ScavengeId;
+				correlationId = unauthorizedResponse.CorrelationId;
+				break;
+			default:
+				throw new ArgumentOutOfRangeException();
+		}
+
+		var dto = new ScavengeDatabaseResponse(result, scavengeId);
+		return new TcpPackage(TcpCommand.ScavengeDatabaseResponse, correlationId, dto.Serialize());
+	}
+
+	private static ClientMessage.NotHandled UnwrapNotHandled(TcpPackage package, IEnvelope envelope) {
+		var dto = package.Data.Deserialize<NotHandled>();
+		if (dto == null)
+			return null;
+		var reason = dto.Reason switch {
+			NotHandled.Types.NotHandledReason.NotReady => ClientMessage.NotHandled.Types.NotHandledReason.NotReady,
+			NotHandled.Types.NotHandledReason.TooBusy => ClientMessage.NotHandled.Types.NotHandledReason.TooBusy,
+			NotHandled.Types.NotHandledReason.NotLeader => ClientMessage.NotHandled.Types.NotHandledReason.NotLeader,
+			NotHandled.Types.NotHandledReason.IsReadOnly => ClientMessage.NotHandled.Types.NotHandledReason.IsReadOnly,
+			_ => throw new ArgumentOutOfRangeException()
+		};
+		var leaderInfoDto = dto.AdditionalInfo switch {
+			{ } ai => ai.ToByteArray().Deserialize<NotHandled.Types.LeaderInfo>(),
+			_ => null
+		};
+
+		var leaderInfo = leaderInfoDto switch {
+			{ ExternalTcpAddress: not null } => new(
+				new DnsEndPoint(leaderInfoDto.ExternalTcpAddress, leaderInfoDto.ExternalTcpPort), false, new DnsEndPoint(leaderInfoDto.HttpAddress, leaderInfoDto.HttpPort)),
+			{ ExternalSecureTcpAddress: not null } => new ClientMessage.NotHandled.Types.LeaderInfo(
+				new DnsEndPoint(leaderInfoDto.ExternalSecureTcpAddress, leaderInfoDto.ExternalSecureTcpPort), true, new DnsEndPoint(leaderInfoDto.HttpAddress, leaderInfoDto.HttpPort)),
+			_ => null
+		};
+		return new(package.CorrelationId, reason, leaderInfo);
+	}
+
+	private static TcpPackage WrapNotHandled(ClientMessage.NotHandled msg) {
+		var dto = new NotHandled(msg);
+		return new(TcpCommand.NotHandled, msg.CorrelationId, dto.Serialize());
+	}
+
+	private static TcpPackage WrapNotAuthenticated(TcpMessage.NotAuthenticated msg) {
+		return new(TcpCommand.NotAuthenticated, msg.CorrelationId, Helper.UTF8NoBom.GetBytes(msg.Reason ?? string.Empty));
+	}
+
+	private static TcpPackage WrapAuthenticated(TcpMessage.Authenticated msg) {
+		return new(TcpCommand.Authenticated, msg.CorrelationId, Empty.ByteArray);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Tcp/ClientWriteTcpDispatcher.cs b/src/KurrentDB.Core/Services/Transport/Tcp/ClientWriteTcpDispatcher.cs
new file mode 100644
index 00000000000..2476a250290
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Tcp/ClientWriteTcpDispatcher.cs
@@ -0,0 +1,278 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using System.Threading;
+using EventStore.Client.Messages;
+using Google.Protobuf;
+using KurrentDB.Core.Authentication.DelegatedAuthentication;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.UserManagement;
+using OperationResult = KurrentDB.Core.Messages.OperationResult;
+
+namespace KurrentDB.Core.Services.Transport.Tcp;
+
+public enum ClientVersion : byte {
+	V1 = 0,
+	V2 = 1
+}
+
+public class ClientWriteTcpDispatcher : TcpDispatcher {
+	private readonly TimeSpan _writeTimeout;
+
+	protected ClientWriteTcpDispatcher(TimeSpan writeTimeout) {
+		_writeTimeout = writeTimeout;
+		AddUnwrapper(TcpCommand.WriteEvents, UnwrapWriteEvents, ClientVersion.V2);
+		AddWrapper<ClientMessage.WriteEvents>(WrapWriteEvents, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.WriteEventsCompleted, UnwrapWriteEventsCompleted, ClientVersion.V2);
+		AddWrapper<ClientMessage.WriteEventsCompleted>(WrapWriteEventsCompleted, ClientVersion.V2);
+
+		AddUnwrapper(TcpCommand.TransactionStart, UnwrapTransactionStart, ClientVersion.V2);
+		AddWrapper<ClientMessage.TransactionStart>(WrapTransactionStart, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.TransactionStartCompleted, UnwrapTransactionStartCompleted, ClientVersion.V2);
+		AddWrapper<ClientMessage.TransactionStartCompleted>(WrapTransactionStartCompleted, ClientVersion.V2);
+
+		AddUnwrapper(TcpCommand.TransactionWrite, UnwrapTransactionWrite, ClientVersion.V2);
+		AddWrapper<ClientMessage.TransactionWrite>(WrapTransactionWrite, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.TransactionWriteCompleted, UnwrapTransactionWriteCompleted, ClientVersion.V2);
+		AddWrapper<ClientMessage.TransactionWriteCompleted>(WrapTransactionWriteCompleted, ClientVersion.V2);
+
+		AddUnwrapper(TcpCommand.TransactionCommit, UnwrapTransactionCommit, ClientVersion.V2);
+		AddWrapper<ClientMessage.TransactionCommit>(WrapTransactionCommit, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.TransactionCommitCompleted, UnwrapTransactionCommitCompleted, ClientVersion.V2);
+		AddWrapper<ClientMessage.TransactionCommitCompleted>(WrapTransactionCommitCompleted, ClientVersion.V2);
+
+		AddUnwrapper(TcpCommand.DeleteStream, UnwrapDeleteStream, ClientVersion.V2);
+		AddWrapper<ClientMessage.DeleteStream>(WrapDeleteStream, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.DeleteStreamCompleted, UnwrapDeleteStreamCompleted, ClientVersion.V2);
+		AddWrapper<ClientMessage.DeleteStreamCompleted>(WrapDeleteStreamCompleted, ClientVersion.V2);
+	}
+
+	private ClientMessage.WriteEvents UnwrapWriteEvents(TcpPackage package, IEnvelope envelope,
+		ClaimsPrincipal user) {
+		var dto = package.Data.Deserialize<WriteEvents>();
+		if (dto == null)
+			return null;
+
+		var events = new Event[dto.Events.Count];
+		for (int i = 0; i < events.Length; ++i) {
+			// ReSharper disable PossibleNullReferenceException
+			var e = dto.Events[i];
+			// ReSharper restore PossibleNullReferenceException
+			events[i] = new Event(new Guid(e.EventId.ToByteArray()), e.EventType, e.DataContentType == 1, e.Data.ToByteArray(), e.Metadata.ToByteArray());
+		}
+
+		var cts = new CancellationTokenSource();
+		var envelopeWrapper = new CallbackEnvelope(OnMessage);
+		cts.CancelAfter(_writeTimeout);
+
+		return new(Guid.NewGuid(), package.CorrelationId, envelopeWrapper, dto.RequireLeader,
+			dto.EventStreamId, dto.ExpectedVersion, events, user, package.Tokens, cts.Token);
+
+		void OnMessage(Message m) {
+			cts.Dispose();
+			envelope.ReplyWith(m);
+		}
+	}
+
+	private static TcpPackage WrapWriteEvents(ClientMessage.WriteEvents msg) {
+		var events = new NewEvent[msg.Events.Length];
+		for (int i = 0; i < events.Length; ++i) {
+			var e = msg.Events[i];
+			events[i] = new NewEvent(e.EventId.ToByteArray(),
+				e.EventType,
+				e.IsJson ? 1 : 0,
+				0, e.Data,
+				e.Metadata);
+		}
+
+		var dto = new WriteEvents(msg.EventStreamId, msg.ExpectedVersion, events,
+			msg.RequireLeader);
+		return CreateWriteRequestPackage(TcpCommand.WriteEvents, msg, dto);
+	}
+
+	private static TcpPackage CreateWriteRequestPackage<T>(TcpCommand command, ClientMessage.WriteRequestMessage msg, T dto) where T : IMessage<T> {
+		// we are forwarding with InternalCorrId, not client's CorrelationId!!!
+		if (msg.User == SystemAccounts.System) {
+			return new TcpPackage(command, TcpFlags.TrustedWrite, msg.InternalCorrId, null, null, dto.Serialize());
+		}
+
+		foreach (var identity in msg.User.Identities) {
+			if (identity is not DelegatedClaimsIdentity dci) {
+				continue;
+			}
+
+			var jwtClaim = dci.FindFirst("jwt");
+			if (jwtClaim != null) {
+				return new(command, TcpFlags.Authenticated, msg.InternalCorrId, jwtClaim.Value, dto.Serialize());
+			}
+
+			var uidClaim = dci.FindFirst("uid");
+			var pwdClaim = dci.FindFirst("pwd");
+
+			if (uidClaim != null && pwdClaim != null) {
+				return new(command, TcpFlags.Authenticated, msg.InternalCorrId, uidClaim.Value, pwdClaim.Value, dto.Serialize());
+			}
+		}
+
+		return msg.Login != null && msg.Password != null
+			? new(command, TcpFlags.Authenticated, msg.InternalCorrId, msg.Login, msg.Password, dto.Serialize())
+			: new TcpPackage(command, TcpFlags.None, msg.InternalCorrId, null, null, dto.Serialize());
+	}
+
+	private static ClientMessage.WriteEventsCompleted UnwrapWriteEventsCompleted(TcpPackage package, IEnvelope envelope) {
+		var dto = package.Data.Deserialize<WriteEventsCompleted>();
+		if (dto == null)
+			return null;
+		return dto.Result == EventStore.Client.Messages.OperationResult.Success
+			? new(package.CorrelationId, dto.FirstEventNumber, dto.LastEventNumber, dto.PreparePosition, dto.CommitPosition)
+			: new(package.CorrelationId, (OperationResult)dto.Result, dto.Message, dto.CurrentVersion);
+	}
+
+	private static TcpPackage WrapWriteEventsCompleted(ClientMessage.WriteEventsCompleted msg) {
+		var dto = new WriteEventsCompleted((EventStore.Client.Messages.OperationResult)msg.Result,
+			msg.Message,
+			msg.FirstEventNumber,
+			msg.LastEventNumber,
+			msg.PreparePosition,
+			msg.CommitPosition,
+			msg.CurrentVersion);
+		return new(TcpCommand.WriteEventsCompleted, msg.CorrelationId, dto.Serialize());
+	}
+
+	private static ClientMessage.TransactionStart UnwrapTransactionStart(TcpPackage package, IEnvelope envelope, ClaimsPrincipal user) {
+		var dto = package.Data.Deserialize<TransactionStart>();
+		if (dto == null)
+			return null;
+		return new(Guid.NewGuid(), package.CorrelationId, envelope,
+			dto.RequireLeader,
+			dto.EventStreamId, dto.ExpectedVersion, user, package.Tokens);
+	}
+
+	private static TcpPackage WrapTransactionStart(ClientMessage.TransactionStart msg) {
+		var dto = new TransactionStart(msg.EventStreamId, msg.ExpectedVersion, msg.RequireLeader);
+		return CreateWriteRequestPackage(TcpCommand.TransactionStart, msg, dto);
+	}
+
+	private static ClientMessage.TransactionStartCompleted UnwrapTransactionStartCompleted(TcpPackage package, IEnvelope envelope) {
+		var dto = package.Data.Deserialize<TransactionStartCompleted>();
+		if (dto == null)
+			return null;
+		return new(package.CorrelationId, dto.TransactionId, (OperationResult)dto.Result, dto.Message);
+	}
+
+	private static TcpPackage WrapTransactionStartCompleted(ClientMessage.TransactionStartCompleted msg) {
+		var dto = new TransactionStartCompleted(msg.TransactionId, (EventStore.Client.Messages.OperationResult)msg.Result, msg.Message);
+		return new(TcpCommand.TransactionStartCompleted, msg.CorrelationId, dto.Serialize());
+	}
+
+	private static ClientMessage.TransactionWrite UnwrapTransactionWrite(TcpPackage package, IEnvelope envelope, ClaimsPrincipal user) {
+		var dto = package.Data.Deserialize<TransactionWrite>();
+		if (dto == null)
+			return null;
+
+		var events = new Event[dto.Events.Count];
+		for (int i = 0; i < events.Length; ++i) {
+			// ReSharper disable PossibleNullReferenceException
+			var e = dto.Events[i];
+			// ReSharper restore PossibleNullReferenceException
+			events[i] = new Event(new Guid(e.EventId.ToByteArray()), e.EventType, e.DataContentType == 1, e.Data.ToByteArray(), e.Metadata.ToByteArray());
+		}
+
+		return new(Guid.NewGuid(), package.CorrelationId, envelope, dto.RequireLeader, dto.TransactionId, events, user, package.Tokens);
+	}
+
+	private static TcpPackage WrapTransactionWrite(ClientMessage.TransactionWrite msg) {
+		var events = new NewEvent[msg.Events.Length];
+		for (int i = 0; i < events.Length; ++i) {
+			var e = msg.Events[i];
+			events[i] = new(e.EventId.ToByteArray(), e.EventType, e.IsJson ? 1 : 0, 0, e.Data, e.Metadata);
+		}
+
+		var dto = new TransactionWrite(msg.TransactionId, events, msg.RequireLeader);
+		return CreateWriteRequestPackage(TcpCommand.TransactionWrite, msg, dto);
+	}
+
+	private static ClientMessage.TransactionWriteCompleted UnwrapTransactionWriteCompleted(TcpPackage package,
+		IEnvelope envelope) {
+		var dto = package.Data.Deserialize<TransactionWriteCompleted>();
+		if (dto == null)
+			return null;
+		return new(package.CorrelationId, dto.TransactionId, (OperationResult)dto.Result, dto.Message);
+	}
+
+	private static TcpPackage WrapTransactionWriteCompleted(ClientMessage.TransactionWriteCompleted msg) {
+		var dto = new TransactionWriteCompleted(msg.TransactionId, (EventStore.Client.Messages.OperationResult)msg.Result, msg.Message);
+		return new(TcpCommand.TransactionWriteCompleted, msg.CorrelationId, dto.Serialize());
+	}
+
+	private static ClientMessage.TransactionCommit UnwrapTransactionCommit(TcpPackage package, IEnvelope envelope, ClaimsPrincipal user) {
+		var dto = package.Data.Deserialize<TransactionCommit>();
+		if (dto == null)
+			return null;
+		return new(Guid.NewGuid(), package.CorrelationId, envelope, dto.RequireLeader, dto.TransactionId, user, package.Tokens);
+	}
+
+	private static TcpPackage WrapTransactionCommit(ClientMessage.TransactionCommit msg) {
+		var dto = new TransactionCommit(msg.TransactionId, msg.RequireLeader);
+		return CreateWriteRequestPackage(TcpCommand.TransactionCommit, msg, dto);
+	}
+
+	private static ClientMessage.TransactionCommitCompleted UnwrapTransactionCommitCompleted(TcpPackage package, IEnvelope envelope) {
+		var dto = package.Data.Deserialize<TransactionCommitCompleted>();
+		if (dto == null)
+			return null;
+		return dto.Result == EventStore.Client.Messages.OperationResult.Success
+			? new(package.CorrelationId, dto.TransactionId, dto.FirstEventNumber, dto.LastEventNumber, dto.PreparePosition, dto.CommitPosition)
+			: new(package.CorrelationId, dto.TransactionId, (OperationResult)dto.Result, dto.Message);
+	}
+
+	private static TcpPackage WrapTransactionCommitCompleted(ClientMessage.TransactionCommitCompleted msg) {
+		var dto = new TransactionCommitCompleted(
+			msg.TransactionId,
+			(EventStore.Client.Messages.OperationResult)msg.Result,
+			msg.Message, msg.FirstEventNumber,
+			msg.LastEventNumber,
+			msg.PreparePosition,
+			msg.CommitPosition);
+		return new(TcpCommand.TransactionCommitCompleted, msg.CorrelationId, dto.Serialize());
+	}
+
+	private ClientMessage.DeleteStream UnwrapDeleteStream(TcpPackage package, IEnvelope envelope, ClaimsPrincipal user) {
+		var dto = package.Data.Deserialize<DeleteStream>();
+		if (dto == null)
+			return null;
+
+		var cts = new CancellationTokenSource();
+		var envelopeWrapper = new CallbackEnvelope(OnMessage);
+		cts.CancelAfter(_writeTimeout);
+
+		return new(Guid.NewGuid(), package.CorrelationId, envelopeWrapper, dto.RequireLeader,
+			dto.EventStreamId, dto.ExpectedVersion, dto.HardDelete, user, package.Tokens, cts.Token);
+
+		void OnMessage(Message m) {
+			cts.Dispose();
+			envelope.ReplyWith(m);
+		}
+	}
+
+	private static TcpPackage WrapDeleteStream(ClientMessage.DeleteStream msg) {
+		var dto = new DeleteStream(msg.EventStreamId, msg.ExpectedVersion, msg.RequireLeader, msg.HardDelete);
+		return CreateWriteRequestPackage(TcpCommand.DeleteStream, msg, dto);
+	}
+
+	private static ClientMessage.DeleteStreamCompleted UnwrapDeleteStreamCompleted(TcpPackage package, IEnvelope envelope) {
+		var dto = package.Data.Deserialize<DeleteStreamCompleted>();
+		if (dto == null)
+			return null;
+		return new(package.CorrelationId, (OperationResult)dto.Result, dto.Message, dto.CurrentVersion, dto.PreparePosition, dto.CommitPosition);
+	}
+
+	private static TcpPackage WrapDeleteStreamCompleted(ClientMessage.DeleteStreamCompleted msg) {
+		var dto = new DeleteStreamCompleted((EventStore.Client.Messages.OperationResult)msg.Result, msg.Message, msg.CurrentVersion, msg.PreparePosition, msg.CommitPosition);
+		return new(TcpCommand.DeleteStreamCompleted, msg.CorrelationId, dto.Serialize());
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Tcp/ITcpDispatcher.cs b/src/KurrentDB.Core/Services/Transport/Tcp/ITcpDispatcher.cs
new file mode 100644
index 00000000000..151a77edb43
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Tcp/ITcpDispatcher.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Security.Claims;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Services.Transport.Tcp;
+
+public interface ITcpDispatcher {
+	TcpPackage? WrapMessage(Message message, byte version);
+
+	Message UnwrapPackage(TcpPackage package, IEnvelope envelope, ClaimsPrincipal user,
+		IReadOnlyDictionary<string, string> tokens, TcpConnectionManager connection, byte version);
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Tcp/InternalTcpDispatcher.cs b/src/KurrentDB.Core/Services/Transport/Tcp/InternalTcpDispatcher.cs
new file mode 100644
index 00000000000..30f5fe8f084
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Tcp/InternalTcpDispatcher.cs
@@ -0,0 +1,210 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Net;
+using EventStore.Cluster;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.TransactionLog.Chunks;
+using Epoch = KurrentDB.Core.Data.Epoch;
+
+namespace KurrentDB.Core.Services.Transport.Tcp;
+
+public class InternalTcpDispatcher : ClientWriteTcpDispatcher {
+	public InternalTcpDispatcher(TimeSpan writeTimeout) : base(writeTimeout) {
+		AddUnwrapper(TcpCommand.LeaderReplicatedTo, UnwrapReplicatedTo, ClientVersion.V2);
+		AddWrapper<ReplicationTrackingMessage.ReplicatedTo>(WrapReplicatedTo, ClientVersion.V2);
+
+		AddUnwrapper(TcpCommand.SubscribeReplica, UnwrapReplicaSubscriptionRequest, ClientVersion.V2);
+		AddWrapper<ReplicationMessage.SubscribeReplica>(WrapSubscribeReplica, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.ReplicaLogPositionAck, UnwrapReplicaLogPositionAck, ClientVersion.V2);
+		AddWrapper<ReplicationMessage.AckLogPosition>(WrapAckLogPosition, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.CreateChunk, UnwrapCreateChunk, ClientVersion.V2);
+		AddWrapper<ReplicationMessage.CreateChunk>(WrapCreateChunk, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.RawChunkBulk, UnwrapRawChunkBulk, ClientVersion.V2);
+		AddWrapper<ReplicationMessage.RawChunkBulk>(WrapRawChunkBulk, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.DataChunkBulk, UnwrapDataChunkBulk, ClientVersion.V2);
+		AddWrapper<ReplicationMessage.DataChunkBulk>(WrapDataChunkBulk, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.ReplicaSubscriptionRetry, UnwrapReplicaSubscriptionRetry, ClientVersion.V2);
+		AddWrapper<ReplicationMessage.ReplicaSubscriptionRetry>(WrapReplicaSubscriptionRetry, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.ReplicaSubscribed, UnwrapReplicaSubscribed, ClientVersion.V2);
+		AddWrapper<ReplicationMessage.ReplicaSubscribed>(WrapReplicaSubscribed, ClientVersion.V2);
+
+		AddUnwrapper(TcpCommand.FollowerAssignment, UnwrapFollowerAssignment, ClientVersion.V2);
+		AddWrapper<ReplicationMessage.FollowerAssignment>(WrapFollowerAssignment, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.CloneAssignment, UnwrapCloneAssignment, ClientVersion.V2);
+		AddWrapper<ReplicationMessage.CloneAssignment>(WrapCloneAssignment, ClientVersion.V2);
+		AddUnwrapper(TcpCommand.DropSubscription, UnwrapDropSubscription, ClientVersion.V2);
+		AddWrapper<ReplicationMessage.DropSubscription>(WrapDropSubscription, ClientVersion.V2);
+	}
+
+	private static TcpPackage WrapReplicatedTo(ReplicationTrackingMessage.ReplicatedTo msg) {
+		var dto = new ReplicatedTo(msg.LogPosition);
+		return new(TcpCommand.LeaderReplicatedTo, Guid.NewGuid(), dto.Serialize());
+	}
+
+	private static ReplicationTrackingMessage.LeaderReplicatedTo UnwrapReplicatedTo(TcpPackage package, IEnvelope envelope) {
+		var dto = package.Data.Deserialize<ReplicatedTo>();
+		return new(dto.LogPosition);
+	}
+
+	private static ReplicationMessage.ReplicaSubscriptionRequest UnwrapReplicaSubscriptionRequest(TcpPackage package, IEnvelope envelope, TcpConnectionManager connection) {
+		var dto = package.Data.Deserialize<SubscribeReplica>();
+		var vnodeTcpEndPoint = new DnsEndPoint(Helper.UTF8NoBom.GetString(dto.Ip.Span), dto.Port);
+		var lastEpochs = dto.LastEpochs.Safe().Select(x => new Epoch(x.EpochPosition, x.EpochNumber, new Guid(x.EpochId.Span))).ToArray();
+		return new(package.CorrelationId,
+			envelope,
+			connection,
+			dto.Version,
+			dto.LogPosition,
+			new Guid(dto.ChunkId.Span),
+			lastEpochs,
+			vnodeTcpEndPoint,
+			new Guid(dto.LeaderId.Span),
+			new Guid(dto.SubscriptionId.Span),
+			dto.IsPromotable);
+	}
+
+	private static TcpPackage WrapSubscribeReplica(ReplicationMessage.SubscribeReplica msg) {
+		var epochs = msg.LastEpochs.Select(x => new EventStore.Cluster.Epoch(x.EpochPosition, x.EpochNumber, x.EpochId.ToByteArray())).ToArray();
+		var dto = new SubscribeReplica(msg.LogPosition,
+			msg.ChunkId.ToByteArray(),
+			epochs,
+			Helper.UTF8NoBom.GetBytes(msg.ReplicaEndPoint.GetHost()),
+			msg.ReplicaEndPoint.GetPort(),
+			msg.LeaderId.ToByteArray(),
+			msg.SubscriptionId.ToByteArray(),
+			msg.IsPromotable,
+			msg.Version);
+		return new(TcpCommand.SubscribeReplica, Guid.NewGuid(), dto.Serialize());
+	}
+
+	private static ReplicationMessage.ReplicaLogPositionAck UnwrapReplicaLogPositionAck(TcpPackage package, IEnvelope envelope, TcpConnectionManager connection) {
+		var dto = package.Data.Deserialize<ReplicaLogPositionAck>();
+		return new(new Guid(dto.SubscriptionId.Span), dto.ReplicationLogPosition, dto.WriterLogPosition);
+	}
+
+	private static TcpPackage WrapAckLogPosition(ReplicationMessage.AckLogPosition msg) {
+		var dto = new ReplicaLogPositionAck(msg.SubscriptionId.ToByteArray(), msg.ReplicationLogPosition, msg.WriterLogPosition);
+		return new(TcpCommand.ReplicaLogPositionAck, Guid.NewGuid(), dto.Serialize());
+	}
+
+	private static ReplicationMessage.CreateChunk UnwrapCreateChunk(TcpPackage package, IEnvelope envelope) {
+		var dto = package.Data.Deserialize<CreateChunk>();
+		ChunkHeader chunkHeader = new(dto.ChunkHeaderBytes.Span);
+
+		return new(new(dto.LeaderId.Span), new(dto.SubscriptionId.Span), chunkHeader, dto.FileSize, dto.IsScavengedChunk, dto.TransformHeaderBytes.Memory);
+	}
+
+	private static TcpPackage WrapCreateChunk(ReplicationMessage.CreateChunk msg) {
+		var dto = new CreateChunk(msg.LeaderId.ToByteArray(),
+			msg.SubscriptionId.ToByteArray(),
+			msg.ChunkHeader.AsByteArray(),
+			msg.FileSize,
+			msg.IsScavengedChunk,
+			msg.TransformHeader.Span);
+		return new(TcpCommand.CreateChunk, Guid.NewGuid(), dto.Serialize());
+	}
+
+	private static ReplicationMessage.RawChunkBulk UnwrapRawChunkBulk(TcpPackage package, IEnvelope envelope) {
+		var dto = package.Data.Deserialize<RawChunkBulk>();
+		return new(new Guid(dto.LeaderId.Span),
+			new Guid(dto.SubscriptionId.Span),
+			dto.ChunkStartNumber,
+			dto.ChunkEndNumber,
+			dto.RawPosition,
+			dto.RawBytes.ToByteArray(),
+			dto.CompleteChunk);
+	}
+
+	private static TcpPackage WrapRawChunkBulk(ReplicationMessage.RawChunkBulk msg) {
+		var dto = new RawChunkBulk(msg.LeaderId.ToByteArray(),
+			msg.SubscriptionId.ToByteArray(),
+			msg.ChunkStartNumber,
+			msg.ChunkEndNumber,
+			msg.RawPosition,
+			msg.RawBytes,
+			msg.CompleteChunk);
+		return new(TcpCommand.RawChunkBulk, Guid.NewGuid(), dto.Serialize());
+	}
+
+	private static ReplicationMessage.DataChunkBulk UnwrapDataChunkBulk(TcpPackage package, IEnvelope envelope) {
+		var dto = package.Data.Deserialize<DataChunkBulk>();
+		return new(new Guid(dto.LeaderId.Span),
+			new Guid(dto.SubscriptionId.Span),
+			dto.ChunkStartNumber,
+			dto.ChunkEndNumber,
+			dto.SubscriptionPosition,
+			dto.DataBytes.ToByteArray(),
+			dto.CompleteChunk);
+	}
+
+	private static TcpPackage WrapDataChunkBulk(ReplicationMessage.DataChunkBulk msg) {
+		var dto = new DataChunkBulk(msg.LeaderId.ToByteArray(),
+			msg.SubscriptionId.ToByteArray(),
+			msg.ChunkStartNumber,
+			msg.ChunkEndNumber,
+			msg.SubscriptionPosition,
+			msg.DataBytes,
+			msg.CompleteChunk);
+		return new(TcpCommand.DataChunkBulk, Guid.NewGuid(), dto.Serialize());
+	}
+
+	private static ReplicationMessage.ReplicaSubscriptionRetry UnwrapReplicaSubscriptionRetry(TcpPackage package, IEnvelope envelope) {
+		var dto = package.Data.Deserialize<ReplicaSubscriptionRetry>();
+		return new(new Guid(dto.LeaderId.Span), new Guid(dto.SubscriptionId.Span));
+	}
+
+	private static TcpPackage WrapReplicaSubscriptionRetry(ReplicationMessage.ReplicaSubscriptionRetry msg) {
+		var dto = new ReplicaSubscriptionRetry(msg.LeaderId.ToByteArray(), msg.SubscriptionId.ToByteArray());
+		return new(TcpCommand.ReplicaSubscriptionRetry, Guid.NewGuid(), dto.Serialize());
+	}
+
+	private static ReplicationMessage.ReplicaSubscribed UnwrapReplicaSubscribed(TcpPackage package, IEnvelope envelope, TcpConnectionManager connection) {
+		var dto = package.Data.Deserialize<ReplicaSubscribed>();
+		return new(new Guid(dto.LeaderId.Span),
+			new Guid(dto.SubscriptionId.Span),
+			dto.SubscriptionPosition,
+			connection.RemoteEndPoint);
+	}
+
+	private static TcpPackage WrapReplicaSubscribed(ReplicationMessage.ReplicaSubscribed msg) {
+		var dto = new ReplicaSubscribed(msg.LeaderId.ToByteArray(),
+			msg.SubscriptionId.ToByteArray(),
+			msg.SubscriptionPosition);
+		return new(TcpCommand.ReplicaSubscribed, Guid.NewGuid(), dto.Serialize());
+	}
+
+	private static ReplicationMessage.FollowerAssignment UnwrapFollowerAssignment(TcpPackage package, IEnvelope envelope) {
+		var dto = package.Data.Deserialize<FollowerAssignment>();
+		return new(new Guid(dto.LeaderId.Span), new Guid(dto.SubscriptionId.Span));
+	}
+
+	private static TcpPackage WrapFollowerAssignment(ReplicationMessage.FollowerAssignment msg) {
+		var dto = new FollowerAssignment(msg.LeaderId.ToByteArray(), msg.SubscriptionId.ToByteArray());
+		return new(TcpCommand.FollowerAssignment, Guid.NewGuid(), dto.Serialize());
+	}
+
+	private static ReplicationMessage.CloneAssignment UnwrapCloneAssignment(TcpPackage package, IEnvelope envelope) {
+		var dto = package.Data.Deserialize<CloneAssignment>();
+		return new(new Guid(dto.LeaderId.Span), new Guid(dto.SubscriptionId.Span));
+	}
+
+	private static TcpPackage WrapCloneAssignment(ReplicationMessage.CloneAssignment msg) {
+		var dto = new CloneAssignment(msg.LeaderId.ToByteArray(), msg.SubscriptionId.ToByteArray());
+		return new(TcpCommand.CloneAssignment, Guid.NewGuid(), dto.Serialize());
+	}
+
+	private static ReplicationMessage.DropSubscription UnwrapDropSubscription(TcpPackage package, IEnvelope envelope) {
+		var dto = package.Data.Deserialize<CloneAssignment>();
+		return new(new Guid(dto.LeaderId.Span), new Guid(dto.SubscriptionId.Span));
+	}
+
+	private static TcpPackage WrapDropSubscription(ReplicationMessage.DropSubscription msg) {
+		var dto = new DropSubscription(msg.LeaderId.ToByteArray(), msg.SubscriptionId.ToByteArray());
+		return new(TcpCommand.DropSubscription, Guid.NewGuid(), dto.Serialize());
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Tcp/ProtobufExtensions.cs b/src/KurrentDB.Core/Services/Transport/Tcp/ProtobufExtensions.cs
new file mode 100644
index 00000000000..b8834e4d9d7
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Tcp/ProtobufExtensions.cs
@@ -0,0 +1,91 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.IO;
+using System.Threading;
+using Google.Protobuf;
+using Serilog.Core;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Transport.Tcp;
+
+public static class ProtobufExtensions {
+	private static readonly ConcurrentStack<MemoryStream> _streams;
+
+	static ProtobufExtensions() {
+		_streams = new ConcurrentStack<MemoryStream>();
+		for (var i = 0; i < 300; i++) {
+			_streams.Push(new MemoryStream(2048));
+		}
+	}
+
+	private static readonly ILogger Log =
+		Serilog.Log.ForContext(Constants.SourceContextPropertyName, "ProtobufExtensions");
+
+	static MemoryStream AcquireStream() {
+		for (var i = 0; i < 1000; i++) {
+			MemoryStream ret;
+			if (_streams.TryPop(out ret)) {
+				ret.SetLength(0);
+				return ret;
+			}
+
+			if ((i + 1) % 5 == 0)
+				Thread.Sleep(1); //need to do better than this
+		}
+
+		throw new UnableToAcquireStreamException();
+	}
+
+	static void ReleaseStream(MemoryStream stream) {
+		_streams.Push(stream);
+	}
+
+	public static T Deserialize<T>(this byte[] data) where T : IMessage<T>, new() {
+		return Deserialize<T>(new ArraySegment<byte>(data));
+	}
+
+	public static T Deserialize<T>(this ArraySegment<byte> data) where T : IMessage<T>, new() {
+		try {
+			using (var memory = new MemoryStream(data.Array, data.Offset, data.Count)
+			) //uses original buffer as memory
+			{
+				var res = new T();
+				res.MergeFrom(memory);
+				return res;
+			}
+		} catch (Exception e) {
+			Log.Information(e, "Deserialization to {type} failed", typeof(T).FullName);
+			return default(T);
+		}
+	}
+
+	public static ArraySegment<byte> Serialize<T>(this T protoContract) where T : IMessage<T> {
+		MemoryStream stream = null;
+		try {
+			stream = AcquireStream();
+			protoContract.WriteTo(stream);
+			var res = new ArraySegment<byte>(stream.ToArray(), 0, (int)stream.Length);
+			return res;
+		} finally {
+			if (stream != null) {
+				ReleaseStream(stream);
+			}
+		}
+	}
+
+	public static byte[] SerializeToArray<T>(this T protoContract) where T : IMessage<T> {
+		MemoryStream stream = null;
+		try {
+			stream = AcquireStream();
+			protoContract.WriteTo(stream);
+			return stream.ToArray();
+		} finally {
+			if (stream != null) {
+				ReleaseStream(stream);
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Tcp/SendOverTcpEnvelope.cs b/src/KurrentDB.Core/Services/Transport/Tcp/SendOverTcpEnvelope.cs
new file mode 100644
index 00000000000..10afa5c68aa
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Tcp/SendOverTcpEnvelope.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Services.Transport.Tcp;
+
+public class SendOverTcpEnvelope(TcpConnectionManager manager, IPublisher networkSendQueue) : IEnvelope {
+	public void ReplyWith<T>(T message) where T : Message {
+		if (manager is { IsClosed: false }) {
+			networkSendQueue.Publish(new TcpMessage.TcpSend(manager, message));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Tcp/TcpCommand.cs b/src/KurrentDB.Core/Services/Transport/Tcp/TcpCommand.cs
new file mode 100644
index 00000000000..ed87195f000
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Tcp/TcpCommand.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.Services.Transport.Tcp;
+
+public enum TcpCommand : byte {
+	HeartbeatRequestCommand = 0x01,
+	HeartbeatResponseCommand = 0x02,
+
+	Ping = 0x03,
+	Pong = 0x04,
+
+	FollowerAssignment = 0x07,
+	CloneAssignment = 0x08,
+	DropSubscription = 0x09,
+
+	SubscribeReplica = 0x10,
+	ReplicaLogPositionAck = 0x11,
+	CreateChunk = 0x12,
+	RawChunkBulk = 0x13,
+	DataChunkBulk = 0x14,
+	ReplicaSubscriptionRetry = 0x15,
+	ReplicaSubscribed = 0x16,
+	LeaderReplicatedTo = 0x17,
+
+	// CLIENT COMMANDS
+	//        CreateStream = 0x80,
+	//        CreateStreamCompleted = 0x81,
+
+	WriteEvents = 0x82,
+	WriteEventsCompleted = 0x83,
+
+	TransactionStart = 0x84,
+	TransactionStartCompleted = 0x85,
+	TransactionWrite = 0x86,
+	TransactionWriteCompleted = 0x87,
+	TransactionCommit = 0x88,
+	TransactionCommitCompleted = 0x89,
+
+	DeleteStream = 0x8A,
+	DeleteStreamCompleted = 0x8B,
+
+	ReadEvent = 0xB0,
+	ReadEventCompleted = 0xB1,
+	ReadStreamEventsForward = 0xB2,
+	ReadStreamEventsForwardCompleted = 0xB3,
+	ReadStreamEventsBackward = 0xB4,
+	ReadStreamEventsBackwardCompleted = 0xB5,
+	ReadAllEventsForward = 0xB6,
+	ReadAllEventsForwardCompleted = 0xB7,
+	ReadAllEventsBackward = 0xB8,
+	ReadAllEventsBackwardCompleted = 0xB9,
+	FilteredReadAllEventsForward = 0xBA,
+	FilteredReadAllEventsForwardCompleted = 0xBB,
+	FilteredReadAllEventsBackward = 0xBC,
+	FilteredReadAllEventsBackwardCompleted = 0xBE,
+
+	SubscribeToStream = 0xC0,
+	SubscriptionConfirmation = 0xC1,
+	StreamEventAppeared = 0xC2,
+	UnsubscribeFromStream = 0xC3,
+	SubscriptionDropped = 0xC4,
+	ConnectToPersistentSubscription = 0xC5,
+	PersistentSubscriptionConfirmation = 0xC6,
+	PersistentSubscriptionStreamEventAppeared = 0xC7,
+	CreatePersistentSubscription = 0xC8,
+	CreatePersistentSubscriptionCompleted = 0xC9,
+	DeletePersistentSubscription = 0xCA,
+	DeletePersistentSubscriptionCompleted = 0xCB,
+	PersistentSubscriptionAckEvents = 0xCC,
+	PersistentSubscriptionNakEvents = 0xCD,
+	UpdatePersistentSubscription = 0xCE,
+	UpdatePersistentSubscriptionCompleted = 0xCF,
+	FilteredSubscribeToStream = 0xD2,
+	CheckpointReached = 0xD3,
+
+	ScavengeDatabase = 0xD0,
+	ScavengeDatabaseResponse = 0xD1,
+
+	BadRequest = 0xF0,
+	NotHandled = 0xF1,
+	Authenticate = 0xF2,
+	Authenticated = 0xF3,
+	NotAuthenticated = 0xF4,
+	IdentifyClient = 0xF5,
+	ClientIdentified = 0xF6,
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Tcp/TcpConnectionManager.cs b/src/KurrentDB.Core/Services/Transport/Tcp/TcpConnectionManager.cs
new file mode 100644
index 00000000000..e1c404582da
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Tcp/TcpConnectionManager.cs
@@ -0,0 +1,492 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+using System.Security.Claims;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading;
+using EventStore.Plugins.Authentication;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Settings;
+using KurrentDB.Transport.Tcp;
+using KurrentDB.Transport.Tcp.Framing;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Transport.Tcp;
+
+/// <summary>
+/// Manager for individual TCP connection. It handles connection lifecycle,
+/// heartbeats, message framing and dispatch to the memory bus.
+/// </summary>
+public class TcpConnectionManager : IHandle<TcpMessage.Heartbeat>, IHandle<TcpMessage.HeartbeatTimeout> {
+	public static readonly TimeSpan ConnectionTimeout = TimeSpan.FromMilliseconds(1000);
+	private static readonly ILogger Log = Serilog.Log.ForContext<TcpConnectionManager>();
+	private static readonly ClaimsPrincipal Anonymous = new(new ClaimsIdentity([new(ClaimTypes.Anonymous, "")]));
+	public readonly Guid ConnectionId;
+	public readonly string ConnectionName;
+	public readonly EndPoint RemoteEndPoint;
+
+	public EndPoint LocalEndPoint => _connection.LocalEndPoint;
+
+	public bool IsClosed => _isClosed != 0;
+
+	public int SendQueueSize => _connection.SendQueueSize;
+
+	public string ClientConnectionName => _clientConnectionName;
+
+	private readonly ITcpConnection _connection;
+	private readonly SendOverTcpEnvelope _tcpEnvelope;
+	private readonly IPublisher _publisher;
+	private readonly ITcpDispatcher _dispatcher;
+	private readonly IMessageFramer<ArraySegment<byte>> _framer;
+	private long ReceiveProgressIndicator => _connection?.TotalBytesReceived ?? 0L;
+	private long SendProgressIndicator => _connection?.TotalBytesSent ?? 0L;
+	private int _isClosed;
+	private string _clientConnectionName;
+
+	private byte _version;
+
+	private readonly Action<TcpConnectionManager, SocketError> _connectionClosed;
+	private readonly Action<TcpConnectionManager> _connectionEstablished;
+
+	private readonly SendToWeakThisEnvelope _weakThisEnvelope;
+	private readonly TimeSpan _heartbeatInterval;
+	private readonly TimeSpan _heartbeatTimeout;
+	private bool _awaitingHeartbeatTimeoutCheck;
+	private readonly int _connectionPendingSendBytesThreshold;
+	private readonly int _connectionQueueSizeThreshold;
+
+	private readonly IAuthenticationProvider _authProvider;
+	private readonly AuthorizationGateway _authorization;
+	private UserCredentials _defaultUser;
+	private readonly TcpServiceType _serviceType;
+
+	public TcpConnectionManager(string connectionName,
+		TcpServiceType serviceType,
+		ITcpDispatcher dispatcher,
+		IPublisher publisher,
+		ITcpConnection openedConnection,
+		IPublisher networkSendQueue,
+		IAuthenticationProvider authProvider,
+		AuthorizationGateway authorization,
+		TimeSpan heartbeatInterval,
+		TimeSpan heartbeatTimeout,
+		Action<TcpConnectionManager, SocketError> onConnectionClosed,
+		int connectionPendingSendBytesThreshold,
+		int connectionQueueSizeThreshold) {
+		_connection = Ensure.NotNull(openedConnection);
+		ConnectionId = openedConnection.ConnectionId;
+		ConnectionName = connectionName;
+		_serviceType = serviceType;
+		_tcpEnvelope = new(this, Ensure.NotNull(networkSendQueue));
+		_publisher = Ensure.NotNull(publisher);
+		_dispatcher = Ensure.NotNull(dispatcher);
+		_authProvider = Ensure.NotNull(authProvider);
+		_authorization = Ensure.NotNull(authorization);
+
+		_framer = new LengthPrefixMessageFramer();
+		_framer.RegisterMessageArrivedCallback(OnMessageArrived);
+
+		_weakThisEnvelope = new(this);
+		_heartbeatInterval = heartbeatInterval;
+		_heartbeatTimeout = heartbeatTimeout;
+		_connectionPendingSendBytesThreshold = connectionPendingSendBytesThreshold;
+		_connectionQueueSizeThreshold = connectionQueueSizeThreshold;
+		_connectionClosed = onConnectionClosed;
+		RemoteEndPoint = openedConnection.RemoteEndPoint;
+		_connection.ConnectionClosed += OnConnectionClosed;
+		if (_connection.IsClosed) {
+			OnConnectionClosed(_connection, SocketError.Success);
+			return;
+		}
+
+		ScheduleHeartbeat(0L, 0L);
+	}
+
+	public TcpConnectionManager(string connectionName,
+		Guid connectionId,
+		ITcpDispatcher dispatcher,
+		IPublisher publisher,
+		string targetHost,
+		string[] otherNames,
+		EndPoint remoteEndPoint,
+		TcpClientConnector connector,
+		bool useSsl,
+		CertificateDelegates.ServerCertificateValidator sslServerCertValidator,
+		Func<X509CertificateCollection> sslClientCertificatesSelector,
+		IPublisher networkSendQueue,
+		IAuthenticationProvider authProvider,
+		AuthorizationGateway authorization,
+		TimeSpan heartbeatInterval,
+		TimeSpan heartbeatTimeout,
+		Action<TcpConnectionManager> onConnectionEstablished,
+		Action<TcpConnectionManager, SocketError> onConnectionClosed) {
+		Ensure.NotNull(connector);
+
+		ConnectionId = Ensure.NotEmptyGuid(connectionId);
+		ConnectionName = connectionName;
+
+		_tcpEnvelope = new(this, networkSendQueue);
+		_publisher = Ensure.NotNull(publisher);
+		_dispatcher = Ensure.NotNull(dispatcher);
+		_authProvider = Ensure.NotNull(authProvider);
+		_authorization = Ensure.NotNull(authorization);
+
+		_framer = new LengthPrefixMessageFramer();
+		_framer.RegisterMessageArrivedCallback(OnMessageArrived);
+
+		_weakThisEnvelope = new(this);
+		_heartbeatInterval = heartbeatInterval;
+		_heartbeatTimeout = heartbeatTimeout;
+		_connectionPendingSendBytesThreshold = ESConsts.UnrestrictedPendingSendBytes;
+		_connectionQueueSizeThreshold = ESConsts.MaxConnectionQueueSize;
+
+		_connectionEstablished = onConnectionEstablished;
+		_connectionClosed = onConnectionClosed;
+
+		RemoteEndPoint = Ensure.NotNull(remoteEndPoint);
+		_connection = useSsl
+			? connector.ConnectSslTo(ConnectionId, targetHost, otherNames, remoteEndPoint.ResolveDnsToIPAddress(), ConnectionTimeout,
+				sslServerCertValidator, sslClientCertificatesSelector, OnConnectionEstablished, OnConnectionFailed)
+			: connector.ConnectTo(ConnectionId, remoteEndPoint.ResolveDnsToIPAddress(), ConnectionTimeout, OnConnectionEstablished,
+				OnConnectionFailed);
+		_connection.ConnectionClosed += OnConnectionClosed;
+		if (_connection.IsClosed)
+			OnConnectionClosed(_connection, SocketError.Success);
+	}
+
+	private void OnConnectionEstablished(ITcpConnection connection) {
+		Log.Information("Connection '{connectionName}' ({connectionId:B}) to [{remoteEndPoint}] established.", ConnectionName, ConnectionId, connection.RemoteEndPoint);
+
+		ScheduleHeartbeat(0L, 0L);
+
+		_connectionEstablished?.Invoke(this);
+	}
+
+	private void OnConnectionFailed(ITcpConnection connection, SocketError socketError) {
+		if (Interlocked.CompareExchange(ref _isClosed, 1, 0) != 0)
+			return;
+		Log.Information("Connection '{connectionName}' ({connectionId:B}) to [{remoteEndPoint}] failed: {e}.",
+			ConnectionName, ConnectionId, connection.RemoteEndPoint, socketError);
+		_connectionClosed?.Invoke(this, socketError);
+	}
+
+	private void OnConnectionClosed(ITcpConnection connection, SocketError socketError) {
+		if (Interlocked.CompareExchange(ref _isClosed, 1, 0) != 0)
+			return;
+		Log.Information(
+			"Connection '{connectionName}{clientConnectionName}' [{remoteEndPoint}, {connectionId:B}] closed: {e}.",
+			ConnectionName, ClientConnectionName.IsEmptyString() ? string.Empty : ":" + ClientConnectionName,
+			connection.RemoteEndPoint, ConnectionId, socketError);
+
+		if (_serviceType == TcpServiceType.Internal && _connection.TotalBytesSent == 0) {
+			Log.Warning(
+				"Unable to connect to Remote EndPoint : {remoteEndPoint}. Connection is potentially blocked. Total bytes sent: {TotalBytesSent}, Total bytes received: {TotalBytesReceived}",
+				RemoteEndPoint, _connection.TotalBytesSent, _connection.TotalBytesReceived);
+		}
+
+		_connectionClosed?.Invoke(this, socketError);
+	}
+
+	public void StartReceiving() {
+		_connection.ReceiveAsync(OnRawDataReceived);
+	}
+
+	private void OnRawDataReceived(ITcpConnection connection, IEnumerable<ArraySegment<byte>> data) {
+		try {
+			_framer.UnFrameData(data);
+		} catch (PackageFramingException exc) {
+			SendBadRequestAndClose(Guid.Empty, $"Invalid TCP frame received. Error: {exc.Message}.");
+			return;
+		}
+
+		_connection.ReceiveAsync(OnRawDataReceived);
+	}
+
+	private void OnMessageArrived(ArraySegment<byte> data) {
+		TcpPackage package;
+		try {
+			package = TcpPackage.FromArraySegment(data);
+		} catch (Exception e) {
+			SendBadRequestAndClose(Guid.Empty, $"Received bad network package. Error: {e}");
+			return;
+		}
+
+		OnPackageReceived(package);
+	}
+
+	private void OnPackageReceived(TcpPackage package) {
+		try {
+			ProcessPackage(package);
+		} catch (Exception e) {
+			SendBadRequestAndClose(package.CorrelationId, $"Error while processing package. Error: {e}");
+		}
+	}
+
+	public void ProcessPackage(TcpPackage package) {
+		if (_serviceType == TcpServiceType.External && (package.Flags & TcpFlags.TrustedWrite) != 0) {
+			SendBadRequestAndClose(package.CorrelationId, "Trusted writes aren't accepted over the external TCP interface");
+			return;
+		}
+
+		switch (package.Command) {
+			case TcpCommand.HeartbeatResponseCommand:
+				break;
+			case TcpCommand.HeartbeatRequestCommand:
+				SendPackage(new TcpPackage(TcpCommand.HeartbeatResponseCommand, package.CorrelationId, null));
+				break;
+			case TcpCommand.IdentifyClient: {
+				try {
+					var message = (ClientMessage.IdentifyClient)_dispatcher.UnwrapPackage(package, _tcpEnvelope, null, null, this, _version);
+					Log.Information(
+						"Connection '{connectionName}' ({connectionId:B}) identified by client. Client connection name: '{clientConnectionName}', Client version: {clientVersion}.",
+						ConnectionName, ConnectionId, message.ConnectionName, (ClientVersion)message.Version);
+					_version = (byte)message.Version;
+					_clientConnectionName = message.ConnectionName;
+					_connection.SetClientConnectionName(_clientConnectionName);
+					SendPackage(new TcpPackage(TcpCommand.ClientIdentified, package.CorrelationId, null));
+				} catch (Exception ex) {
+					Log.Error("Error identifying client: {e}", ex);
+				}
+
+				break;
+			}
+			case TcpCommand.BadRequest: {
+				var reason = string.Empty;
+				Helper.EatException(() => reason = Helper.UTF8NoBom.GetString(package.Data.Array, package.Data.Offset, package.Data.Count));
+				Log.Error(
+					"Bad request received from '{connectionName}{clientConnectionName}' [{remoteEndPoint}, L{localEndPoint}, {connectionId:B}]. CorrelationId: {correlationId:B}, Error: {e}.",
+					ConnectionName,
+					ClientConnectionName.IsEmptyString() ? string.Empty : ":" + ClientConnectionName,
+					RemoteEndPoint,
+					LocalEndPoint, ConnectionId, package.CorrelationId,
+					reason.IsEmptyString() ? "<reason missing>" : reason);
+				break;
+			}
+			case TcpCommand.Authenticate: {
+				if ((package.Flags & TcpFlags.Authenticated) == 0)
+					ReplyNotAuthenticated(package.CorrelationId, "No user credentials provided.");
+				else {
+					var defaultUser = new UserCredentials(package.Tokens, null);
+					Interlocked.Exchange(ref _defaultUser, defaultUser);
+					_authProvider.Authenticate(new TcpDefaultAuthRequest(this, package.CorrelationId, defaultUser));
+				}
+
+				break;
+			}
+			default: {
+				var defaultUser = _defaultUser;
+				if ((package.Flags & TcpFlags.TrustedWrite) != 0) {
+					UnwrapAndPublishPackage(package, SystemAccounts.System, null);
+				} else if ((package.Flags & TcpFlags.Authenticated) != 0) {
+					_authProvider.Authenticate(new TcpAuthRequest(this, package));
+				} else if (defaultUser != null) {
+					if (defaultUser.User != null) {
+						UnwrapAndPublishPackage(package, defaultUser.User, defaultUser.Tokens);
+					} else {
+						// The default credentials aren't authenticated
+						ReplyNotAuthenticated(package.CorrelationId, "Not Authenticated");
+					}
+				} else {
+					UnwrapAndPublishPackage(package, Anonymous, null);
+				}
+
+				break;
+			}
+		}
+	}
+
+	private void UnwrapAndPublishPackage(TcpPackage package, ClaimsPrincipal user, IReadOnlyDictionary<string, string> tokens) {
+		Message message = null;
+		string error = "";
+		try {
+			message = _dispatcher.UnwrapPackage(package, _tcpEnvelope, user, tokens, this, _version);
+		} catch (Exception ex) {
+			error = ex.Message;
+		}
+
+		if (message != null)
+			_authorization.Authorize(message, _publisher);
+		else
+			SendBadRequest(package.CorrelationId, $"Could not unwrap network package for command {package.Command}.\n{error}");
+	}
+
+	private void ReplyNotAuthenticated(Guid correlationId, string description) {
+		_tcpEnvelope.ReplyWith(new TcpMessage.NotAuthenticated(correlationId, description));
+	}
+
+	private void ReplyNotReady(Guid correlationId, string description) {
+		_tcpEnvelope.ReplyWith(new ClientMessage.NotHandled(correlationId, ClientMessage.NotHandled.Types.NotHandledReason.NotReady, description));
+	}
+
+	private void ReplyAuthenticated(Guid correlationId, UserCredentials userCredentials, ClaimsPrincipal user) {
+		var authCredentials = new UserCredentials(userCredentials.Tokens, user);
+		Interlocked.CompareExchange(ref _defaultUser, authCredentials, userCredentials);
+		_tcpEnvelope.ReplyWith(new TcpMessage.Authenticated(correlationId));
+	}
+
+	public void SendBadRequestAndClose(Guid correlationId, string message) {
+		Ensure.NotNull(message);
+
+		SendPackage(new(TcpCommand.BadRequest, correlationId, Helper.UTF8NoBom.GetBytes(message)), checkQueueSize: false);
+		Log.Error(
+			"Closing connection '{connectionName}{clientConnectionName}' [{remoteEndPoint}, L{localEndPoint}, {connectionId:B}] due to error. Reason: {e}",
+			ConnectionName, ClientConnectionName.IsEmptyString() ? string.Empty : ":" + ClientConnectionName,
+			RemoteEndPoint, LocalEndPoint, ConnectionId, message);
+		_connection.Close(message);
+	}
+
+	public void SendBadRequest(Guid correlationId, string message) {
+		Ensure.NotNull(message);
+
+		SendPackage(new(TcpCommand.BadRequest, correlationId, Helper.UTF8NoBom.GetBytes(message)), checkQueueSize: false);
+	}
+
+	public void Stop(string reason = null) {
+		Log.Debug(
+			"Closing connection '{connectionName}{clientConnectionName}' [{remoteEndPoint}, L{localEndPoint}, {connectionId:B}] cleanly.{reason}",
+			ConnectionName, ClientConnectionName.IsEmptyString() ? string.Empty : ":" + ClientConnectionName,
+			RemoteEndPoint, LocalEndPoint, ConnectionId,
+			reason.IsEmpty() ? string.Empty : $"Reason: {reason}");
+		_connection.Close(reason);
+	}
+
+	public void SendMessage(Message message) {
+		var package = _dispatcher.WrapMessage(message, _version);
+		if (package != null)
+			SendPackage(package.Value);
+	}
+
+	private void SendPackage(TcpPackage package, bool checkQueueSize = true) {
+		if (IsClosed)
+			return;
+
+		if (checkQueueSize) {
+			int queueSize;
+			if ((queueSize = _connection.SendQueueSize) > _connectionQueueSizeThreshold) {
+				SendBadRequestAndClose(Guid.Empty, $"Connection queue size is too large: {queueSize}.");
+				return;
+			}
+
+			int queueSendBytes;
+			if (_connectionPendingSendBytesThreshold > ESConsts.UnrestrictedPendingSendBytes &&
+				(queueSendBytes = _connection.PendingSendBytes) > _connectionPendingSendBytesThreshold) {
+				SendBadRequestAndClose(Guid.Empty, $"Connection pending send bytes is too large: {queueSendBytes}.");
+				return;
+			}
+		}
+
+		var data = package.AsArraySegment();
+		var framed = _framer.FrameData(data);
+		_connection.EnqueueSend(framed);
+	}
+
+	public void Handle(TcpMessage.Heartbeat message) {
+		if (IsClosed)
+			return;
+
+		var receiveProgressIndicator = ReceiveProgressIndicator;
+		var sendProgressIndicator = SendProgressIndicator;
+
+		// If we have not received any data within the heartbeat interval, and we are not waiting for a heartbeat timeout check,
+		// then we send a heartbeat request.
+		if (message.ReceiveProgressIndicator == receiveProgressIndicator && !_awaitingHeartbeatTimeoutCheck) {
+			SendPackage(new(TcpCommand.HeartbeatRequestCommand, Guid.NewGuid(), null));
+			_awaitingHeartbeatTimeoutCheck = true;
+			_publisher.Publish(TimerMessage.Schedule.Create(_heartbeatTimeout, _weakThisEnvelope,
+				new TcpMessage.HeartbeatTimeout(receiveProgressIndicator)));
+		}
+		// As a proactive measure, if we have not sent any data to the remote party within the heartbeat interval,
+		// we also send a heartbeat request just to generate some data for the remote party so that it can clear its heartbeat timeouts.
+		// This is particularly useful when the remote party's heartbeat request is stuck behind a large (multi-megabyte) TCP message.
+		else if (message.SendProgressIndicator == sendProgressIndicator) {
+			SendPackage(new(TcpCommand.HeartbeatRequestCommand, Guid.NewGuid(), null));
+			Log.Verbose(
+				"Connection '{connectionName}{clientConnectionName}' [{remoteEndPoint}, {connectionId:B}] Proactive heartbeat request sent to the remote party since no data was sent during the last heartbeat interval.",
+				ConnectionName, ClientConnectionName.IsEmptyString() ? string.Empty : $":{ClientConnectionName}",
+				_connection.RemoteEndPoint, ConnectionId);
+		}
+
+		// Schedule the next heartbeat regardless of whether or not there's an active heartbeat request
+		ScheduleHeartbeat(receiveProgressIndicator, sendProgressIndicator);
+	}
+
+	public void Handle(TcpMessage.HeartbeatTimeout message) {
+		_awaitingHeartbeatTimeoutCheck = false;
+		if (IsClosed)
+			return;
+
+		var receiveProgressIndicator = ReceiveProgressIndicator;
+		var sendProgressIndicator = SendProgressIndicator;
+		if (message.ReceiveProgressIndicator == receiveProgressIndicator)
+			Stop(string.Format($"HEARTBEAT TIMEOUT at receiveProgressIndicator={receiveProgressIndicator}, sendProgressIndicator={sendProgressIndicator}"));
+	}
+
+	private void ScheduleHeartbeat(long receiveProgressIndicator, long sendProgressIndicator) {
+		_publisher.Publish(TimerMessage.Schedule.Create(_heartbeatInterval, _weakThisEnvelope,
+			new TcpMessage.Heartbeat(receiveProgressIndicator, sendProgressIndicator)));
+	}
+
+	// Same health warnings as SendToThisEnvelope
+	private class SendToWeakThisEnvelope(object receiver) : IEnvelope {
+		private readonly WeakReference _receiver = new(receiver);
+
+		public void ReplyWith<T>(T message) where T : Message {
+			if (_receiver.Target is IHandle<T> handle) {
+				handle.Handle(message);
+			} else if (_receiver is IAsyncHandle<T>) {
+				throw new Exception($"SendToWeakThisEnvelope does not support asynchronous receivers. Receiver: {_receiver}");
+			}
+		}
+	}
+
+	private class TcpAuthRequest(TcpConnectionManager manager, TcpPackage package)
+		: AuthenticationRequest($"(TCP) {manager.RemoteEndPoint}", package.Tokens) {
+		private readonly TcpPackage _package = package;
+
+		public override void Unauthorized() {
+			manager.ReplyNotAuthenticated(_package.CorrelationId, "Not Authenticated");
+		}
+
+		public override void Authenticated(ClaimsPrincipal principal) {
+			manager.UnwrapAndPublishPackage(_package, principal, _package.Tokens);
+		}
+
+		public override void Error() {
+			manager.ReplyNotAuthenticated(_package.CorrelationId, "Internal Server Error");
+		}
+
+		public override void NotReady() {
+			manager.ReplyNotReady(_package.CorrelationId, "Server not ready");
+		}
+	}
+
+	private class TcpDefaultAuthRequest(TcpConnectionManager manager, Guid correlationId, UserCredentials userCredentials)
+		: AuthenticationRequest($"(TCP) {manager.RemoteEndPoint}", userCredentials.Tokens) {
+		public override void Unauthorized() {
+			manager.ReplyNotAuthenticated(correlationId, "Unauthorized");
+		}
+
+		public override void Authenticated(ClaimsPrincipal principal) {
+			manager.ReplyAuthenticated(correlationId, userCredentials, principal);
+		}
+
+		public override void Error() {
+			manager.ReplyNotAuthenticated(correlationId, "Internal Server Error");
+		}
+
+		public override void NotReady() {
+			manager.ReplyNotReady(correlationId, "Server not yet ready");
+		}
+	}
+
+	record UserCredentials(IReadOnlyDictionary<string, string> Tokens, ClaimsPrincipal User);
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Tcp/TcpDispatcher.cs b/src/KurrentDB.Core/Services/Transport/Tcp/TcpDispatcher.cs
new file mode 100644
index 00000000000..80f7cade36c
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Tcp/TcpDispatcher.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using KurrentDB.Core.Messaging;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Transport.Tcp;
+
+public abstract class TcpDispatcher : ITcpDispatcher {
+	private static readonly ILogger Log = Serilog.Log.ForContext<TcpDispatcher>();
+
+	private readonly Func<TcpPackage, IEnvelope, ClaimsPrincipal, IReadOnlyDictionary<string, string>, TcpConnectionManager, Message>[][] _unwrappers;
+	private readonly IDictionary<Type, Func<Message, TcpPackage>>[] _wrappers;
+
+	protected TcpDispatcher() {
+		_unwrappers = new Func<TcpPackage, IEnvelope, ClaimsPrincipal, IReadOnlyDictionary<string, string>, TcpConnectionManager, Message>[2][];
+		_unwrappers[0] = new Func<TcpPackage, IEnvelope, ClaimsPrincipal, IReadOnlyDictionary<string, string>, TcpConnectionManager, Message>[255];
+		_unwrappers[1] = new Func<TcpPackage, IEnvelope, ClaimsPrincipal, IReadOnlyDictionary<string, string>, TcpConnectionManager, Message>[255];
+
+		_wrappers = new IDictionary<Type, Func<Message, TcpPackage>>[2];
+		_wrappers[0] = new Dictionary<Type, Func<Message, TcpPackage>>();
+		_wrappers[1] = new Dictionary<Type, Func<Message, TcpPackage>>();
+	}
+
+	protected void AddWrapper<T>(Func<T, TcpPackage> wrapper, ClientVersion version) where T : Message {
+		_wrappers[(byte)version][typeof(T)] = x => wrapper((T)x);
+	}
+
+	protected void AddUnwrapper<T>(TcpCommand command, Func<TcpPackage, IEnvelope, T> unwrapper, ClientVersion version) where T : Message {
+		_unwrappers[(byte)version][(byte)command] = (pkg, env, _, _, _) => unwrapper(pkg, env);
+	}
+
+	protected void AddUnwrapper<T>(TcpCommand command, Func<TcpPackage, IEnvelope, TcpConnectionManager, T> unwrapper, ClientVersion version) where T : Message {
+		_unwrappers[(byte)version][(byte)command] = (pkg, env, _, _, conn) => unwrapper(pkg, env, conn);
+	}
+
+	protected void AddUnwrapper<T>(TcpCommand command, Func<TcpPackage, IEnvelope, ClaimsPrincipal, TcpConnectionManager, T> unwrapper, ClientVersion version) where T : Message {
+		_unwrappers[(byte)version][(byte)command] = (pkg, env, user, _, conn) => unwrapper(pkg, env, user, conn);
+	}
+
+	protected void AddUnwrapper<T>(TcpCommand command, Func<TcpPackage, IEnvelope, ClaimsPrincipal, T> unwrapper, ClientVersion version) where T : Message {
+		_unwrappers[(byte)version][(byte)command] = (pkg, env, user, _, _) => unwrapper(pkg, env, user);
+	}
+
+	protected void AddUnwrapper<T>(TcpCommand command, Func<TcpPackage, IEnvelope, ClaimsPrincipal, IReadOnlyDictionary<string, string>, T> unwrapper, ClientVersion version) where T : Message {
+		_unwrappers[(byte)version][(byte)command] = (pkg, env, user, tokens, _) => unwrapper(pkg, env, user, tokens);
+	}
+
+	protected void AddUnwrapper<T>(TcpCommand command, Func<TcpPackage, IEnvelope, ClaimsPrincipal, IReadOnlyDictionary<string, string>, TcpConnectionManager, T> unwrapper, ClientVersion version)
+		where T : Message {
+		// ReSharper disable RedundantCast
+		_unwrappers[(byte)version][(byte)command] = (Func<TcpPackage, IEnvelope, ClaimsPrincipal, IReadOnlyDictionary<string, string>, TcpConnectionManager, Message>)unwrapper;
+		// ReSharper restore RedundantCast
+	}
+
+	public TcpPackage? WrapMessage(Message message, byte version) {
+		ArgumentNullException.ThrowIfNull(message);
+
+		try {
+			if (_wrappers[version].TryGetValue(message.GetType(), out var wrapper))
+				return wrapper(message);
+			if (_wrappers[^1].TryGetValue(message.GetType(), out wrapper))
+				return wrapper(message);
+		} catch (Exception exc) {
+			Log.Error(exc, "Error while wrapping message {message}.", message);
+		}
+
+		return null;
+	}
+
+	public Message UnwrapPackage(TcpPackage package, IEnvelope envelope, ClaimsPrincipal user,
+		IReadOnlyDictionary<string, string> tokens, TcpConnectionManager connection, byte version) {
+		ArgumentNullException.ThrowIfNull(envelope);
+
+		var unwrapper = _unwrappers[version][(byte)package.Command] ?? _unwrappers[^1][(byte)package.Command];
+
+		try {
+			return unwrapper?.Invoke(package, envelope, user, tokens, connection);
+		} catch (Exception exc) {
+			Log.Error(exc, "Error while unwrapping TcpPackage with command {command}.", package.Command);
+		}
+
+		return null;
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Tcp/TcpPackage.cs b/src/KurrentDB.Core/Services/Transport/Tcp/TcpPackage.cs
new file mode 100644
index 00000000000..6a0d316a6eb
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Tcp/TcpPackage.cs
@@ -0,0 +1,196 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.Services.Transport.Tcp;
+
+[Flags]
+public enum TcpFlags : byte {
+	None = 0x00,
+	Authenticated = 0x01,
+	TrustedWrite = 0x02
+}
+
+public readonly struct TcpPackage {
+	private static readonly IReadOnlyDictionary<string, string> NotAuthenticated = new Dictionary<string, string>();
+	public const int CommandOffset = 0;
+	public const int FlagsOffset = CommandOffset + 1;
+	public const int CorrelationOffset = FlagsOffset + 1;
+	public const int AuthOffset = CorrelationOffset + 16;
+
+	public const int MandatorySize = AuthOffset;
+
+	public const int MaxLoginLength = 127;
+	public const int MaxPasswordLength = 127;
+	public const int MaxTokenLength = short.MaxValue - 2;
+
+	public readonly TcpCommand Command;
+	public readonly TcpFlags Flags;
+	public readonly Guid CorrelationId;
+	public readonly ArraySegment<byte> Data;
+
+	private readonly string _login;
+	private readonly string _password;
+	private readonly string _authToken;
+
+	public IReadOnlyDictionary<string, string> Tokens => (_login, _authToken) switch {
+		(null, null) => NotAuthenticated,
+		(null, _) => new Dictionary<string, string> { ["jwt"] = _authToken },
+		_ => new Dictionary<string, string> { ["uid"] = _login, ["pwd"] = _password }
+	};
+
+	public static TcpPackage FromArraySegment(ArraySegment<byte> data) {
+		if (data.Count < MandatorySize)
+			throw new ArgumentException($"ArraySegment too short, length: {data.Count}", nameof(data));
+
+		var command = (TcpCommand)data.Array[data.Offset + CommandOffset];
+		var flags = (TcpFlags)data.Array[data.Offset + FlagsOffset];
+
+		var guidBytes = new byte[16];
+		Buffer.BlockCopy(data.Array, data.Offset + CorrelationOffset, guidBytes, 0, 16);
+		var correlationId = new Guid(guidBytes);
+
+		var headerSize = MandatorySize;
+		string login = null;
+		string pass = null;
+		if ((flags & TcpFlags.Authenticated) == 0) {
+			return new(command,
+				flags,
+				correlationId,
+				login,
+				pass,
+				new ArraySegment<byte>(data.Array, data.Offset + headerSize, data.Count - headerSize));
+		}
+
+		var firstByte = data.Array[data.Offset + AuthOffset];
+		var tokenLength = BitConverter.ToInt16(data.Array, AuthOffset);
+		if (Math.Sign(tokenLength) == -1) {
+			var token = Helper.UTF8NoBom.GetString(data.Array, AuthOffset + 2, -tokenLength);
+
+			headerSize += token.Length + 2;
+
+			return new(command, flags, correlationId, token, new(data.Array, data.Offset + headerSize, data.Count - headerSize));
+		}
+
+		login = Helper.UTF8NoBom.GetString(data.Array, data.Offset + AuthOffset + 1, firstByte);
+		var passLen = data.Array[data.Offset + AuthOffset + 1 + firstByte];
+		pass = Helper.UTF8NoBom.GetString(data.Array, data.Offset + AuthOffset + 1 + firstByte + 1, passLen);
+
+		headerSize += 1 + firstByte + 1 + passLen;
+
+		return new(command,
+			flags,
+			correlationId,
+			login,
+			pass,
+			new ArraySegment<byte>(data.Array, data.Offset + headerSize, data.Count - headerSize));
+	}
+
+	public TcpPackage(TcpCommand command, Guid correlationId, byte[] data)
+		: this(command, TcpFlags.None, correlationId, null, new(data ?? Empty.ByteArray)) {
+	}
+
+	public TcpPackage(TcpCommand command, Guid correlationId, ArraySegment<byte> data)
+		: this(command, TcpFlags.None, correlationId, null, data) {
+	}
+
+	public TcpPackage(TcpCommand command, TcpFlags flags, Guid correlationId, string login, string password, byte[] data)
+		: this(command, flags, correlationId, login, password, new ArraySegment<byte>(data ?? Empty.ByteArray)) {
+	}
+
+	public TcpPackage(TcpCommand command, TcpFlags flags, Guid correlationId, string login, string password,
+		ArraySegment<byte> data) : this(command, flags, correlationId, data) {
+		if ((flags & TcpFlags.Authenticated) != 0) {
+			Ensure.NotNull(login, nameof(login));
+			Ensure.NotNull(password, nameof(password));
+			if (Helper.UTF8NoBom.GetByteCount(login) > MaxLoginLength) {
+				throw new ArgumentException($"Login length must be less than {MaxLoginLength} bytes.", nameof(login));
+			}
+
+			if (Helper.UTF8NoBom.GetByteCount(password) > MaxPasswordLength) {
+				throw new ArgumentException($"Password length must be less than {MaxPasswordLength} bytes.", nameof(password));
+			}
+		} else {
+			if (login != null) {
+				throw new ArgumentException("Login provided for non-authorized TcpPackage", nameof(login));
+			}
+
+			if (password != null) {
+				throw new ArgumentException("Password provided for non-authorized TcpPackage", nameof(password));
+			}
+		}
+
+		_login = login;
+		_password = password;
+	}
+
+	public TcpPackage(TcpCommand command, TcpFlags flags, Guid correlationId, string authToken,
+		ArraySegment<byte> data) : this(command, flags, correlationId, data) {
+		if ((flags & TcpFlags.Authenticated) != 0) {
+			Ensure.NotNull(authToken, nameof(authToken));
+
+			if (Helper.UTF8NoBom.GetByteCount(authToken) > MaxTokenLength) {
+				throw new ArgumentException($"Token length must be smaller than {MaxTokenLength} bytes", nameof(authToken));
+			}
+		}
+
+		if ((flags & TcpFlags.Authenticated) == 0 && authToken != null) {
+			throw new ArgumentException("Token provided for non-authorized TcpPackage", nameof(authToken));
+		}
+
+		_authToken = authToken;
+	}
+
+
+	private TcpPackage(TcpCommand command, TcpFlags flags, Guid correlationId, ArraySegment<byte> data) {
+		Command = command;
+		Flags = flags;
+		CorrelationId = correlationId;
+		Data = data;
+		_login = null;
+		_password = null;
+		_authToken = null;
+	}
+
+	public byte[] AsByteArray() {
+		byte[] res;
+		if ((Flags & TcpFlags.Authenticated) != 0) {
+			if (_authToken == null) {
+				var loginLen = Helper.UTF8NoBom.GetByteCount(_login);
+				var passLen = Helper.UTF8NoBom.GetByteCount(_password);
+				res = new byte[MandatorySize + 2 + loginLen + passLen + Data.Count];
+				res[CommandOffset] = (byte)Command;
+				res[FlagsOffset] = (byte)Flags;
+				Buffer.BlockCopy(CorrelationId.ToByteArray(), 0, res, CorrelationOffset, 16);
+
+				res[AuthOffset] = (byte)loginLen;
+				Helper.UTF8NoBom.GetBytes(_login, 0, _login.Length, res, AuthOffset + 1);
+				res[AuthOffset + 1 + loginLen] = (byte)passLen;
+				Helper.UTF8NoBom.GetBytes(_password, 0, _password.Length, res, AuthOffset + 1 + loginLen + 1);
+			} else {
+				var authTokenLength = Helper.UTF8NoBom.GetByteCount(_authToken);
+				res = new byte[MandatorySize + 2 + authTokenLength + Data.Count];
+				res[CommandOffset] = (byte)Command;
+				res[FlagsOffset] = (byte)Flags;
+				Buffer.BlockCopy(CorrelationId.ToByteArray(), 0, res, CorrelationOffset, 16);
+				Buffer.BlockCopy(BitConverter.GetBytes(-Convert.ToInt16(authTokenLength)), 0, res, AuthOffset, 2);
+				Helper.UTF8NoBom.GetBytes(_authToken, 0, _authToken.Length, res, AuthOffset + 2);
+			}
+
+			Buffer.BlockCopy(Data.Array, Data.Offset, res, res.Length - Data.Count, Data.Count);
+			return res;
+		}
+
+		res = new byte[MandatorySize + Data.Count];
+		res[CommandOffset] = (byte)Command;
+		res[FlagsOffset] = (byte)Flags;
+		Buffer.BlockCopy(CorrelationId.ToByteArray(), 0, res, CorrelationOffset, 16);
+		Buffer.BlockCopy(Data.Array, Data.Offset, res, res.Length - Data.Count, Data.Count);
+		return res;
+	}
+
+	public ArraySegment<byte> AsArraySegment() => new(AsByteArray());
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Tcp/TcpService.cs b/src/KurrentDB.Core/Services/Transport/Tcp/TcpService.cs
new file mode 100644
index 00000000000..61671bbd6fb
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Tcp/TcpService.cs
@@ -0,0 +1,145 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using System.Net.Sockets;
+using System.Security.Cryptography.X509Certificates;
+using EventStore.Plugins.Authentication;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Transport.Tcp;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.Transport.Tcp;
+
+public enum TcpServiceType {
+	Internal,
+	External
+}
+
+public enum TcpSecurityType {
+	Normal,
+	Secure
+}
+
+public class TcpService : IHandle<SystemMessage.SystemInit>,
+	IHandle<SystemMessage.SystemStart>,
+	IHandle<SystemMessage.BecomeShuttingDown> {
+
+	private static readonly ILogger Log = Serilog.Log.ForContext<TcpService>();
+
+	private readonly IPublisher _publisher;
+	private readonly IPEndPoint _serverEndPoint;
+	private readonly TcpServerListener _serverListener;
+	private readonly IPublisher _networkSendQueue;
+	private readonly Func<Guid, IPEndPoint, ITcpDispatcher> _dispatcherFactory;
+	private readonly IAuthenticationProvider _authProvider;
+	private readonly AuthorizationGateway _authorizationGateway;
+	private readonly TcpServiceType _serviceType;
+	private readonly TcpSecurityType _securityType;
+	private readonly TimeSpan _heartbeatInterval;
+	private readonly TimeSpan _heartbeatTimeout;
+	private readonly Func<X509Certificate2> _certificateSelector;
+	private readonly Func<X509Certificate2Collection> _intermediatesSelector;
+	private readonly CertificateDelegates.ClientCertificateValidator _sslClientCertValidator;
+	private readonly int _connectionPendingSendBytesThreshold;
+	private readonly int _connectionQueueSizeThreshold;
+
+	public TcpService(IPublisher publisher,
+		IPEndPoint serverEndPoint,
+		IPublisher networkSendQueue,
+		TcpServiceType serviceType,
+		TcpSecurityType securityType,
+		ITcpDispatcher dispatcher,
+		TimeSpan heartbeatInterval,
+		TimeSpan heartbeatTimeout,
+		IAuthenticationProvider authProvider,
+		AuthorizationGateway authorizationGateway,
+		Func<X509Certificate2> certificateSelector,
+		Func<X509Certificate2Collection> intermediatesSelector,
+		CertificateDelegates.ClientCertificateValidator sslClientCertValidator,
+		int connectionPendingSendBytesThreshold,
+		int connectionQueueSizeThreshold)
+		: this(publisher, serverEndPoint, networkSendQueue, serviceType, securityType, (_, _) => dispatcher,
+			heartbeatInterval, heartbeatTimeout, authProvider, authorizationGateway, certificateSelector, intermediatesSelector, sslClientCertValidator, connectionPendingSendBytesThreshold, connectionQueueSizeThreshold) {
+	}
+
+	public TcpService(
+		IPublisher publisher,
+		IPEndPoint serverEndPoint,
+		IPublisher networkSendQueue,
+		TcpServiceType serviceType,
+		TcpSecurityType securityType,
+		Func<Guid, IPEndPoint, ITcpDispatcher> dispatcherFactory,
+		TimeSpan heartbeatInterval,
+		TimeSpan heartbeatTimeout,
+		IAuthenticationProvider authProvider,
+		AuthorizationGateway authorizationGateway,
+		Func<X509Certificate2> certificateSelector,
+		Func<X509Certificate2Collection> intermediatesSelector,
+		CertificateDelegates.ClientCertificateValidator sslClientCertValidator,
+		int connectionPendingSendBytesThreshold,
+		int connectionQueueSizeThreshold) {
+
+		_publisher = Ensure.NotNull(publisher);
+		_serverEndPoint = Ensure.NotNull(serverEndPoint);
+		_serverListener = new(serverEndPoint);
+		_networkSendQueue = Ensure.NotNull(networkSendQueue);
+		_serviceType = serviceType;
+		_securityType = securityType;
+		_dispatcherFactory = Ensure.NotNull(dispatcherFactory);
+		_heartbeatInterval = heartbeatInterval;
+		_heartbeatTimeout = heartbeatTimeout;
+		_connectionPendingSendBytesThreshold = connectionPendingSendBytesThreshold;
+		_connectionQueueSizeThreshold = connectionQueueSizeThreshold;
+		_authProvider = Ensure.NotNull(authProvider);
+		_authorizationGateway = Ensure.NotNull(authorizationGateway);
+		_certificateSelector = certificateSelector;
+		_intermediatesSelector = intermediatesSelector;
+		_sslClientCertValidator = sslClientCertValidator;
+	}
+
+	public void Handle(SystemMessage.SystemInit message) {
+		try {
+			_serverListener.StartListening(OnConnectionAccepted, _securityType.ToString());
+		} catch (Exception e) {
+			Application.Exit(ExitCode.Error, e.Message);
+		}
+	}
+
+	public void Handle(SystemMessage.SystemStart message) {
+	}
+
+	public void Handle(SystemMessage.BecomeShuttingDown message) {
+		_serverListener.Stop();
+	}
+
+	private void OnConnectionAccepted(IPEndPoint endPoint, Socket socket) {
+		var conn = _securityType == TcpSecurityType.Secure
+			? TcpConnectionSsl.CreateServerFromSocket(Guid.NewGuid(), endPoint, socket, _certificateSelector, _intermediatesSelector, _sslClientCertValidator, verbose: true)
+			: TcpConnection.CreateAcceptedTcpConnection(Guid.NewGuid(), endPoint, socket, verbose: true);
+		Log.Information(
+			"{serviceType} TCP connection accepted: [{securityType}, {remoteEndPoint}, L{localEndPoint}, {connectionId:B}].",
+			_serviceType, _securityType, conn.RemoteEndPoint, conn.LocalEndPoint, conn.ConnectionId);
+
+		var dispatcher = _dispatcherFactory(conn.ConnectionId, _serverEndPoint);
+		var manager = new TcpConnectionManager(
+			$"{_serviceType.ToString().ToLower()}-{_securityType.ToString().ToLower()}",
+			_serviceType,
+			dispatcher,
+			_publisher,
+			conn,
+			_networkSendQueue,
+			_authProvider,
+			_authorizationGateway,
+			_heartbeatInterval,
+			_heartbeatTimeout,
+			(m, e) => _publisher.Publish(new TcpMessage.ConnectionClosed(m, e)),
+			_connectionPendingSendBytesThreshold,
+			_connectionQueueSizeThreshold); // TODO AN: race condition
+		_publisher.Publish(new TcpMessage.ConnectionEstablished(manager));
+		manager.StartReceiving();
+	}
+}
diff --git a/src/KurrentDB.Core/Services/Transport/Tcp/UnableToAcquireStreamException.cs b/src/KurrentDB.Core/Services/Transport/Tcp/UnableToAcquireStreamException.cs
new file mode 100644
index 00000000000..ecf2f87f527
--- /dev/null
+++ b/src/KurrentDB.Core/Services/Transport/Tcp/UnableToAcquireStreamException.cs
@@ -0,0 +1,8 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Services.Transport.Tcp;
+
+class UnableToAcquireStreamException : Exception;
diff --git a/src/KurrentDB.Core/Services/UserManagement/SystemAccounts.cs b/src/KurrentDB.Core/Services/UserManagement/SystemAccounts.cs
new file mode 100644
index 00000000000..a8777da4a0f
--- /dev/null
+++ b/src/KurrentDB.Core/Services/UserManagement/SystemAccounts.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Security.Claims;
+
+namespace KurrentDB.Core.Services.UserManagement;
+
+public class SystemAccounts {
+	private static readonly IReadOnlyList<Claim> Claims = new[] {
+		new Claim(ClaimTypes.Name, "system"),
+		new Claim(ClaimTypes.Role, "system"),
+		new Claim(ClaimTypes.Role, SystemRoles.Admins),
+	};
+	public static readonly ClaimsPrincipal System = new ClaimsPrincipal(new ClaimsIdentity(Claims, "system"));
+	public static readonly ClaimsPrincipal Anonymous = new ClaimsPrincipal(new ClaimsIdentity(new Claim[] { new Claim(ClaimTypes.Anonymous, ""), }));
+}
diff --git a/src/EventStore.Core/Services/VNode/ClusterVNodeController.cs b/src/KurrentDB.Core/Services/VNode/ClusterVNodeController.cs
similarity index 95%
rename from src/EventStore.Core/Services/VNode/ClusterVNodeController.cs
rename to src/KurrentDB.Core/Services/VNode/ClusterVNodeController.cs
index 35cc0616afa..97339350a0d 100644
--- a/src/EventStore.Core/Services/VNode/ClusterVNodeController.cs
+++ b/src/KurrentDB.Core/Services/VNode/ClusterVNodeController.cs
@@ -1,28 +1,33 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Cluster;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.TransactionLog.Chunks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Storage;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.TransactionLog.Chunks;
 using ILogger = Serilog.ILogger;
-using OperationResult = EventStore.Core.Messages.OperationResult;
+using OperationResult = KurrentDB.Core.Messages.OperationResult;
 
-namespace EventStore.Core.Services.VNode;
+namespace KurrentDB.Core.Services.VNode;
 
 public abstract class ClusterVNodeController {
 	protected static readonly ILogger Log = Serilog.Log.ForContext<ClusterVNodeController>();
+	public static readonly TimeSpan ShutdownTimeout = TimeSpan.FromSeconds(5);
 }
 
 public sealed class ClusterVNodeController<TStreamId> : ClusterVNodeController {
-	public static readonly TimeSpan ShutdownTimeout = TimeSpan.FromSeconds(5);
 	public static readonly TimeSpan LeaderReconnectionDelay = TimeSpan.FromMilliseconds(500);
 	private static readonly TimeSpan LeaderSubscriptionRetryDelay = TimeSpan.FromMilliseconds(500);
 	private static readonly TimeSpan LeaderSubscriptionTimeout = TimeSpan.FromMilliseconds(1000);
@@ -60,16 +65,13 @@ private VNodeState State {
 
 	private int _subSystemInitsToExpect;
 
-	private int _serviceInitsToExpect = 1 /* StorageChaser */
-										+ 1 /* StorageReader */
-										+ 1 /* StorageWriter */;
+	enum ServiceState {
+		Initialized,
+		Shutdown,
+	};
 
-	private int _serviceShutdownsToExpect = 1 /* StorageChaser */
-											+ 1 /* StorageReader */
-											+ 1 /* StorageWriter */
-											+ 1 /* IndexCommitterService */
-											+ 1 /* LeaderReplicationService */
-											+ 1 /* HttpService */;
+	private readonly Dictionary<string, ServiceState> _initializedServices = [];
+	private bool _publishedSystemStart;
 
 	private bool _exitProcessOnShutdown;
 
@@ -95,14 +97,6 @@ public ClusterVNodeController(
 		_subsystemCount = options.Subsystems.Count;
 		_subSystemInitsToExpect = _subsystemCount;
 		_clusterSize = options.Cluster.ClusterSize;
-		if (_clusterSize == 1) {
-			_serviceShutdownsToExpect = 1 /* StorageChaser */
-										+ 1 /* StorageReader */
-										+ 1 /* StorageWriter */
-										+ 1 /* IndexCommitterService */
-										+ 1 /* HttpService */;
-		}
-
 
 		_forwardingProxy = forwardingProxy;
 		_forwardingTimeout = TimeSpan.FromMilliseconds(options.Database.PrepareTimeoutMs +
@@ -245,6 +239,7 @@ private VNodeFSM CreateFSM() {
 			.When<ClientMessage.TransactionWriteCompleted>().ForwardTo(_outputBus)
 			.When<ClientMessage.TransactionCommitCompleted>().ForwardTo(_outputBus)
 			.When<ClientMessage.DeleteStreamCompleted>().ForwardTo(_outputBus)
+			.When<SystemMessage.BecomeShuttingDown>().Do(Handle)
 			.InAllStatesExcept(VNodeState.Initializing, VNodeState.ShuttingDown, VNodeState.Shutdown,
 			VNodeState.ReadOnlyLeaderless, VNodeState.PreReadOnlyReplica, VNodeState.ReadOnlyReplica)
 			.When<ElectionMessage.ElectionsDone>().Do(Handle)
@@ -335,9 +330,6 @@ private VNodeFSM CreateFSM() {
 			.When<StorageMessage.WriteTransactionData>().Ignore()
 			.When<StorageMessage.WriteTransactionEnd>().Ignore()
 			.When<StorageMessage.WriteCommit>().Ignore()
-			.InAllStatesExcept(VNodeState.ShuttingDown, VNodeState.Shutdown)
-			.When<ClientMessage.RequestShutdown>().Do(Handle)
-			.When<SystemMessage.BecomeShuttingDown>().Do(Handle)
 			.InState(VNodeState.ShuttingDown)
 			.When<SystemMessage.BecomeShutdown>().Do(Handle)
 			.When<SystemMessage.ShutdownTimeout>().Do(Handle)
@@ -351,7 +343,7 @@ private VNodeFSM CreateFSM() {
 		return stm;
 	}
 
-	public Task Start() => _mainQueue.Start();
+	public void Start() => _mainQueue.Start();
 
 	private ValueTask Handle(SystemMessage.SystemInit message, CancellationToken token) {
 		Log.Information("========== [{httpEndPoint}] SYSTEM INIT...", _nodeInfo.HttpEndPoint);
@@ -560,7 +552,7 @@ private async ValueTask Handle(SystemMessage.BecomeShutdown message, Cancellatio
 		}
 
 		try {
-			_node.WorkersHandler.Stop();
+			await _node.WorkersHandler.Stop();
 			_mainQueue.RequestStop();
 		} catch (Exception exc) {
 			Log.Error(exc, "Error when stopping workers/main queue.");
@@ -598,10 +590,23 @@ private async ValueTask Handle(ElectionMessage.ElectionsDone message, Cancellati
 	private async ValueTask Handle(SystemMessage.ServiceInitialized message, CancellationToken token) {
 		Log.Information("========== [{httpEndPoint}] Service '{service}' initialized.", _nodeInfo.HttpEndPoint,
 			message.ServiceName);
-		_serviceInitsToExpect -= 1;
+
+		_initializedServices[message.ServiceName] = ServiceState.Initialized;
+
 		await _outputBus.DispatchAsync(message, token);
-		if (_serviceInitsToExpect == 0)
-			_mainQueue.Publish(new SystemMessage.SystemStart());
+
+		if (!_publishedSystemStart) {
+			// may be interested in these three because they facilitate the initialization of the authentication provider
+			var trioStarted =
+				_initializedServices.TryGetValue(nameof(StorageChaser), out var x) && x is ServiceState.Initialized &&
+				_initializedServices.TryGetValue(nameof(StorageReaderService), out var y) && y is ServiceState.Initialized &&
+				_initializedServices.TryGetValue(nameof(StorageWriterService), out var z) && z is ServiceState.Initialized;
+
+			if (trioStarted) {
+				_mainQueue.Publish(new SystemMessage.SystemStart());
+				_publishedSystemStart = true;
+			}
+		}
 	}
 
 	private async ValueTask Handle(AuthenticationMessage.AuthenticationProviderInitialized message,
@@ -1249,7 +1254,7 @@ private ValueTask Handle(ReplicationMessage.DropSubscription message, Cancellati
 					_leader.InternalTcpEndPoint == null ? "n/a" : _leader.InternalTcpEndPoint.ToString(),
 					_leader.InternalSecureTcpEndPoint == null ? "n/a" : _leader.InternalSecureTcpEndPoint.ToString(),
 					message.LeaderId);
-				task = _fsm.HandleAsync(new ClientMessage.RequestShutdown(exitProcess: true, shutdownHttp: true), token);
+				task = _outputBus.DispatchAsync(new ClientMessage.RequestShutdown(exitProcess: true, shutdownHttp: true), token);
 			} else {
 				task = ValueTask.CompletedTask;
 			}
@@ -1284,18 +1289,14 @@ private bool IsLegitimateReplicationMessage(ReplicationMessage.IReplicationMessa
 		return true;
 	}
 
-	private async ValueTask Handle(ClientMessage.RequestShutdown message, CancellationToken token) {
-		await _outputBus.DispatchAsync(message, token);
-		await _fsm.HandleAsync(
-			new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), message.ExitProcess, message.ShutdownHttp), token);
-	}
-
 	private async ValueTask Handle(SystemMessage.ServiceShutdown message, CancellationToken token) {
+		var serviceInfo = message.ServiceName + (string.IsNullOrWhiteSpace(message.Details) ? "" : $" {message.Details}");
 		Log.Information("========== [{httpEndPoint}] Service '{service}' has shut down.", _nodeInfo.HttpEndPoint,
-			message.ServiceName);
+			serviceInfo);
+
+		_initializedServices[message.ServiceName] = ServiceState.Shutdown;
 
-		_serviceShutdownsToExpect -= 1;
-		if (_serviceShutdownsToExpect is 0) {
+		if (_initializedServices.All(kvp => kvp.Value is ServiceState.Shutdown)) {
 			Log.Information("========== [{httpEndPoint}] All Services Shutdown.", _nodeInfo.HttpEndPoint);
 			await Shutdown(token);
 		}
@@ -1306,16 +1307,22 @@ private async ValueTask Handle(SystemMessage.ServiceShutdown message, Cancellati
 	private async ValueTask Handle(SystemMessage.ShutdownTimeout message, CancellationToken token) {
 		Debug.Assert(State is VNodeState.ShuttingDown);
 
-		Log.Error("========== [{httpEndPoint}] Shutdown Timeout.", _nodeInfo.HttpEndPoint);
+		var services = string.Join(", ", _initializedServices
+			.Where(kvp => kvp.Value is not ServiceState.Shutdown)
+			.Select(kvp => kvp.Key));
+		var error = $"Gave up waiting for services: [{services}]";
+
+		Log.Error("========== [{httpEndPoint}] Shutdown Timeout. {error}", _nodeInfo.HttpEndPoint, error);
+
 		await Shutdown(token);
 		await _outputBus.DispatchAsync(message, token);
 	}
 
-	private ValueTask Shutdown(CancellationToken token) {
+	private async ValueTask Shutdown(CancellationToken token) {
 		Debug.Assert(State is VNodeState.ShuttingDown);
 
-		_db.Close();
-		return _fsm.HandleAsync(new SystemMessage.BecomeShutdown(_stateCorrelationId), token);
+		await _db.Close(token);
+		await _fsm.HandleAsync(new SystemMessage.BecomeShutdown(_stateCorrelationId), token);
 	}
 
 	private static bool IsAliveLeader(MemberInfo member)
diff --git a/src/KurrentDB.Core/Services/VNode/InaugurationManager.cs b/src/KurrentDB.Core/Services/VNode/InaugurationManager.cs
new file mode 100644
index 00000000000..299f4e0bf4c
--- /dev/null
+++ b/src/KurrentDB.Core/Services/VNode/InaugurationManager.cs
@@ -0,0 +1,252 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using Serilog;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Services.VNode;
+
+public class InaugurationManager :
+	IHandle<SystemMessage.StateChangeMessage>,
+	IHandle<SystemMessage.ChaserCaughtUp>,
+	IHandle<SystemMessage.EpochWritten>,
+	IHandle<SystemMessage.CheckInaugurationConditions>,
+	IHandle<ElectionMessage.ElectionsDone>,
+	IHandle<ReplicationTrackingMessage.ReplicatedTo>,
+	IHandle<ReplicationTrackingMessage.IndexedTo> {
+
+	private readonly ILogger _log = Log.ForContext<InaugurationManager>();
+	private readonly IPublisher _publisher;
+	private readonly IReadOnlyCheckpoint _replicationCheckpoint;
+	private readonly IReadOnlyCheckpoint _indexCheckpoint;
+	private readonly Message _scheduleCheckInaugurationConditions;
+	private readonly IInaugurationStatusTracker _statusTracker;
+
+	private VNodeState _nodeState;
+	private ManagerState _managerState;
+	private Guid _stateCorrelationId;
+	private int _currentEpochNumber;
+	private long _replicationCheckpointTarget;
+	private long _indexCheckpointTarget;
+
+	private ManagerState State {
+		get => _managerState;
+		set {
+			_managerState = value;
+			_statusTracker.OnStateChange(value);
+		}
+	}
+
+	public enum ManagerState {
+		Idle,
+		WaitingForChaser,
+		WritingEpoch,
+		WaitingForConditions,
+		BecomingLeader,
+	}
+
+	public InaugurationManager(
+		IPublisher publisher,
+		IReadOnlyCheckpoint replicationCheckpoint,
+		IReadOnlyCheckpoint indexCheckpoint,
+		IInaugurationStatusTracker statusTracker) {
+
+		_log.Information("Using {name}", nameof(InaugurationManager));
+		_publisher = publisher;
+		_replicationCheckpoint = replicationCheckpoint;
+		_indexCheckpoint = indexCheckpoint;
+		_statusTracker = statusTracker;
+
+		_scheduleCheckInaugurationConditions = TimerMessage.Schedule.Create(
+			triggerAfter: TimeSpan.FromSeconds(1),
+			envelope: _publisher,
+			replyMessage: new SystemMessage.CheckInaugurationConditions());
+	}
+
+	public void Handle(ElectionMessage.ElectionsDone received) {
+		_currentEpochNumber = received.ProposalNumber;
+		Received(received, "currentEpochNumber {currentEpochNumber}.", _currentEpochNumber);
+	}
+
+	public void Handle(SystemMessage.StateChangeMessage received) {
+		if (received is SystemMessage.BecomePreLeader becomePreLeader) {
+			HandleBecomePreLeader(becomePreLeader);
+		} else {
+			HandleBecomeOtherNodeState(received);
+		}
+	}
+
+	private void HandleBecomePreLeader(SystemMessage.BecomePreLeader received) {
+		Received(
+			received,
+			"Starting inauguration process with correlation id {currentCorrelationId}. Waiting for chaser.",
+			received.CorrelationId);
+		_nodeState = received.State;
+		State = ManagerState.WaitingForChaser;
+		_stateCorrelationId = received.CorrelationId;
+	}
+
+	private void HandleBecomeOtherNodeState(SystemMessage.StateChangeMessage received) {
+		if (State != ManagerState.Idle) {
+			Received(received, "Inauguration process is now stopped.");
+			State = ManagerState.Idle;
+		}
+
+		_nodeState = received.State;
+	}
+
+	public void Handle(SystemMessage.ChaserCaughtUp received) {
+		if (State != ManagerState.WaitingForChaser) {
+			// will get this in prereplica and prereadonly replica
+			Ignore(received, "Not waiting for chaser.");
+		} else if (received.CorrelationId != _stateCorrelationId) {
+			Ignore(
+				received,
+				"Current correlation id is {currentCorrelationId} but received {receivedCorrelationId}.",
+				_stateCorrelationId,
+				received.CorrelationId);
+		} else {
+			Respond(
+				received,
+				new SystemMessage.WriteEpoch(_currentEpochNumber),
+				"currentEpochNumber {currentEpochNumber}.",
+				_currentEpochNumber);
+			State = ManagerState.WritingEpoch;
+		}
+	}
+
+	public void Handle(SystemMessage.EpochWritten received) {
+		if (State != ManagerState.WritingEpoch) {
+			Ignore(received, "Not writing epoch.");
+		} else if (received.Epoch.EpochNumber != _currentEpochNumber) {
+			Ignore(
+				received,
+				"Current epoch number is {currentEpochNumber} but received {receivedEpochNumber}.",
+				_currentEpochNumber,
+				received.Epoch.EpochNumber);
+		} else {
+			Respond(received, new SystemMessage.EnablePreLeaderReplication());
+			State = ManagerState.WaitingForConditions;
+
+			// want to replicate past the start of the epoch we just wrote.
+			_replicationCheckpointTarget = received.Epoch.EpochPosition + 1;
+
+			// and index past it too, to the $epoch-information event that immediately follows it
+			_indexCheckpointTarget = received.Epoch.EpochPosition + 1;
+
+			ConsiderBecomingLeader(received, log: true);
+			_publisher.Publish(_scheduleCheckInaugurationConditions);
+		}
+	}
+
+	public void Handle(ReplicationTrackingMessage.ReplicatedTo received) {
+		if (State != ManagerState.WaitingForConditions) {
+			// silently ignore. we'll get these all the time
+		} else {
+			ConsiderBecomingLeader(received, log: false);
+		}
+	}
+
+	public void Handle(ReplicationTrackingMessage.IndexedTo received) {
+		if (State != ManagerState.WaitingForConditions) {
+			// silently ignore. we'll get these all the time
+		} else {
+			ConsiderBecomingLeader(received, log: false);
+		}
+	}
+
+	public void Handle(SystemMessage.CheckInaugurationConditions received) {
+		if (State != ManagerState.WaitingForConditions) {
+			Ignore(received, "Not waiting for conditions.");
+		} else {
+			Respond(received, _scheduleCheckInaugurationConditions);
+			ConsiderBecomingLeader(received, log: true);
+		}
+	}
+
+	private void ConsiderBecomingLeader(Message received, bool log) {
+		var replicationCurrent = _replicationCheckpoint.Read();
+		var indexCurrent = _indexCheckpoint.Read();
+		var replicationDone = replicationCurrent >= _replicationCheckpointTarget;
+		var indexDone = indexCurrent >= _indexCheckpointTarget;
+
+		if (log || (replicationDone && indexDone)) {
+			LogExtraInformation(
+				"Replication {progress}: {current:N0}/{target:N0}. Remaining: {remaining:N0}.",
+				replicationDone ? "DONE" : "IN PROGRESS",
+				replicationCurrent,
+				_replicationCheckpointTarget,
+				Math.Max(0, _replicationCheckpointTarget - replicationCurrent));
+
+			LogExtraInformation(
+				"Index {progress}: {current:N0}/{target:N0}. Remaining: {remaining:N0}.",
+				indexDone ? "DONE" : "IN PROGRESS",
+				indexCurrent,
+				_indexCheckpointTarget,
+				Math.Max(0, _indexCheckpointTarget - indexCurrent));
+		}
+
+		if (replicationDone && indexDone) {
+			// transition to leader!
+			Respond(
+				received,
+				new SystemMessage.BecomeLeader(_stateCorrelationId),
+				"Correlation id {currentCorrelationId}",
+				_stateCorrelationId);
+			State = ManagerState.Idle;
+		}
+	}
+
+	private void Received(Message received, string template = null, params object[] templateArgs) {
+		LogExtraInformation(
+			Combine(template, "RECEIVED {received}."),
+			Combine(templateArgs, received.GetType().Name));
+	}
+
+	private void Respond(Message received, Message send, string template = null, params object[] templateArgs) {
+		LogExtraInformation(
+			Combine(template, "RECEIVED {received}. RESPONDING with {send}."),
+			Combine(templateArgs, received.GetType().Name, send.GetType().Name));
+		_publisher.Publish(send);
+	}
+
+	private void Ignore(Message received, string template = null, params object[] templateArgs) {
+		LogExtraInformation(
+			Combine(template, "IGNORING {received}."),
+			Combine(templateArgs, received.GetType().Name));
+	}
+
+	private void LogExtraInformation(string template = null, params object[] templateArgs) {
+		_log.Information(
+			Combine(template, "{name} in state ({nodeState}, {managerState}):"),
+			Combine(templateArgs, nameof(InaugurationManager), _nodeState, State));
+	}
+
+	private static string Combine(string template2, string template1) {
+		if (template1 is null)
+			return template2;
+
+		if (template2 is null)
+			return template1;
+
+		return $"{template1} {template2}";
+	}
+
+	private static object[] Combine(object[] args2, params object[] args1) {
+		if (args1 is null)
+			return args2;
+
+		if (args2 is null)
+			return args1;
+
+		return args1.Concat(args2).ToArray();
+	}
+}
diff --git a/src/KurrentDB.Core/Services/VNode/LeaderInfoProvider.cs b/src/KurrentDB.Core/Services/VNode/LeaderInfoProvider.cs
new file mode 100644
index 00000000000..62826c260e2
--- /dev/null
+++ b/src/KurrentDB.Core/Services/VNode/LeaderInfoProvider.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using EndPoint = System.Net.EndPoint;
+
+namespace KurrentDB.Core.Services.VNode;
+
+
+public class LeaderInfoProvider {
+	private readonly GossipAdvertiseInfo _gossipInfo;
+	private readonly MemberInfo _leaderInfo;
+
+	public LeaderInfoProvider(GossipAdvertiseInfo gossipInfo, MemberInfo leaderInfo) {
+		Ensure.NotNull(gossipInfo, "gossipInfo");
+
+		_gossipInfo = gossipInfo;
+		_leaderInfo = leaderInfo;
+	}
+
+	public (EndPoint AdvertisedTcpEndPoint, bool IsTcpEndPointSecure, EndPoint AdvertisedHttpEndPoint)
+		GetLeaderInfoEndPoints() {
+
+		var endpoints = _leaderInfo != null
+			? (TcpEndPoint: _leaderInfo.ExternalTcpEndPoint ?? _leaderInfo.ExternalSecureTcpEndPoint,
+				IsTcpEndPointSecure: _leaderInfo.ExternalSecureTcpEndPoint != null,
+				HttpEndPoint: _leaderInfo.HttpEndPoint,
+				AdvertiseHost: _leaderInfo.AdvertiseHostToClientAs,
+				AdvertiseHttpPort: _leaderInfo.AdvertiseHttpPortToClientAs,
+				AdvertiseTcpPort: _leaderInfo.AdvertiseTcpPortToClientAs)
+			: (TcpEndPoint: _gossipInfo.ExternalTcp ?? _gossipInfo.ExternalSecureTcp,
+				IsTcpEndPointSecure: _gossipInfo.ExternalSecureTcp != null,
+				HttpEndPoint: _gossipInfo.HttpEndPoint,
+				AdvertiseHost: _gossipInfo.AdvertiseHostToClientAs,
+				AdvertiseHttpPort: _gossipInfo.AdvertiseHttpPortToClientAs,
+				AdvertiseTcpPort: _gossipInfo.AdvertiseTcpPortToClientAs);
+
+		var advertisedTcpEndPoint = endpoints.TcpEndPoint == null
+			? null
+			: new DnsEndPoint(
+				string.IsNullOrEmpty(endpoints.AdvertiseHost)
+					? endpoints.TcpEndPoint.GetHost()
+					: endpoints.AdvertiseHost,
+				endpoints.AdvertiseTcpPort == 0 ? endpoints.TcpEndPoint.GetPort() : endpoints.AdvertiseTcpPort);
+		var advertisedHttpEndPoint = new DnsEndPoint(
+			string.IsNullOrEmpty(endpoints.AdvertiseHost)
+				? endpoints.HttpEndPoint.GetHost()
+				: endpoints.AdvertiseHost,
+			endpoints.AdvertiseHttpPort == 0 ? endpoints.HttpEndPoint.GetPort() : endpoints.AdvertiseHttpPort);
+
+		return (advertisedTcpEndPoint, endpoints.IsTcpEndPointSecure, advertisedHttpEndPoint);
+	}
+}
diff --git a/src/KurrentDB.Core/Services/VNode/MessageForwardingProxy.cs b/src/KurrentDB.Core/Services/VNode/MessageForwardingProxy.cs
new file mode 100644
index 00000000000..2e4339258a1
--- /dev/null
+++ b/src/KurrentDB.Core/Services/VNode/MessageForwardingProxy.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Diagnostics;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Core.Services.VNode;
+
+public class MessageForwardingProxy {
+	private readonly Stopwatch _stopwatch = Stopwatch.StartNew();
+
+	private readonly ConcurrentDictionary<Guid, Forwarding> _forwardings =
+		new ConcurrentDictionary<Guid, Forwarding>();
+
+	public void Register(Guid internalCorrId, Guid clientCorrId, IEnvelope envelope, TimeSpan timeout,
+		Message timeoutMessage) {
+		_forwardings.AddOrUpdate(
+			internalCorrId,
+			new Forwarding(clientCorrId, envelope, _stopwatch.Elapsed + timeout, timeoutMessage),
+			(x, y) => {
+				throw new Exception(
+					string.Format("Forwarding for InternalCorrId {0:B} (ClientCorrId {1:B}) already exists.",
+						internalCorrId, clientCorrId));
+			});
+	}
+
+	public bool TryForwardReply<TMessage>(Guid correlationId, TMessage originalMessage,
+		Func<Guid, TMessage, TMessage> getForwardMessage)
+		where TMessage : Message {
+		Forwarding forwarding;
+		if (_forwardings.TryRemove(correlationId, out forwarding)) {
+			forwarding.Envelope.ReplyWith(getForwardMessage(forwarding.ClientCorrId, originalMessage));
+			return true;
+		}
+
+		return false;
+	}
+
+	public void TimeoutForwardings() {
+		var now = _stopwatch.Elapsed;
+
+		foreach (var forwPair in _forwardings) {
+			Forwarding forwarding;
+			if (forwPair.Value.TimeoutTimestamp <= now && _forwardings.TryRemove(forwPair.Key, out forwarding))
+				forwarding.Envelope.ReplyWith(forwarding.TimeoutMessage);
+		}
+	}
+
+	private class Forwarding {
+		public readonly Guid ClientCorrId;
+		public readonly IEnvelope Envelope;
+		public readonly TimeSpan TimeoutTimestamp;
+		public readonly Message TimeoutMessage;
+
+		public Forwarding(Guid clientCorrId, IEnvelope envelope, TimeSpan timeoutTimestamp,
+			Message timeoutMessage) {
+			Ensure.NotNull(envelope, "envelope");
+			Ensure.NotNull(timeoutMessage, "timeoutMessage");
+
+			ClientCorrId = clientCorrId;
+			Envelope = envelope;
+			TimeoutTimestamp = timeoutTimestamp;
+			TimeoutMessage = timeoutMessage;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Services/VNode/NodeStatusTracker.cs b/src/KurrentDB.Core/Services/VNode/NodeStatusTracker.cs
new file mode 100644
index 00000000000..cbf121cead0
--- /dev/null
+++ b/src/KurrentDB.Core/Services/VNode/NodeStatusTracker.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Metrics;
+
+namespace KurrentDB.Core.Services.VNode;
+
+public interface IInaugurationStatusTracker {
+	void OnStateChange(InaugurationManager.ManagerState newState);
+}
+
+public interface INodeStatusTracker : IInaugurationStatusTracker {
+	void OnStateChange(VNodeState newState);
+}
+
+public class NodeStatusTracker : INodeStatusTracker {
+	private readonly StatusSubMetric _subMetric;
+	private readonly object _lock = new();
+
+	private VNodeState _nodeState;
+	private InaugurationManager.ManagerState _inaugurationState;
+
+	public NodeStatusTracker(StatusMetric metric) {
+		_nodeState = VNodeState.Initializing;
+		_inaugurationState = InaugurationManager.ManagerState.Idle;
+		_subMetric = new StatusSubMetric("Node", _nodeState, metric);
+	}
+
+	public void OnStateChange(VNodeState newState) {
+		lock (_lock) {
+			_nodeState = newState;
+			UpdateStatus();
+		}
+	}
+
+	public void OnStateChange(InaugurationManager.ManagerState newState) {
+		lock (_lock) {
+			_inaugurationState = newState;
+			UpdateStatus();
+		}
+	}
+
+	private void UpdateStatus() {
+		_subMetric.SetStatus(_inaugurationState == InaugurationManager.ManagerState.Idle
+			? $"{_nodeState}"
+			: $"{_nodeState} - {_inaugurationState}");
+	}
+
+	public class NoOp : INodeStatusTracker {
+		public void OnStateChange(VNodeState newState) {
+		}
+
+		public void OnStateChange(InaugurationManager.ManagerState newState) {
+		}
+	}
+}
diff --git a/src/EventStore.Core/Services/VNode/VNodeFSM.cs b/src/KurrentDB.Core/Services/VNode/VNodeFSM.cs
similarity index 93%
rename from src/EventStore.Core/Services/VNode/VNodeFSM.cs
rename to src/KurrentDB.Core/Services/VNode/VNodeFSM.cs
index 3ec583c9ec6..9ffa7daafd5 100644
--- a/src/EventStore.Core/Services/VNode/VNodeFSM.cs
+++ b/src/KurrentDB.Core/Services/VNode/VNodeFSM.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Frozen;
 using System.Collections.Generic;
@@ -9,11 +12,11 @@
 using System.Threading;
 using System.Threading.Tasks;
 using DotNext.Runtime;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messaging;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messaging;
 
-namespace EventStore.Core.Services.VNode;
+namespace KurrentDB.Core.Services.VNode;
 
 public class VNodeFSM : IAsyncHandle<Message> {
 	private readonly ReadOnlyValueReference<VNodeState> _stateRef;
diff --git a/src/EventStore.Core/Services/VNode/VNodeFSMBuilder.cs b/src/KurrentDB.Core/Services/VNode/VNodeFSMBuilder.cs
similarity index 89%
rename from src/EventStore.Core/Services/VNode/VNodeFSMBuilder.cs
rename to src/KurrentDB.Core/Services/VNode/VNodeFSMBuilder.cs
index fabea329b6b..9e45042fd86 100644
--- a/src/EventStore.Core/Services/VNode/VNodeFSMBuilder.cs
+++ b/src/KurrentDB.Core/Services/VNode/VNodeFSMBuilder.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -5,11 +8,11 @@
 using System.Threading;
 using System.Threading.Tasks;
 using DotNext.Runtime;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Messaging;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messaging;
 
-namespace EventStore.Core.Services.VNode;
+namespace KurrentDB.Core.Services.VNode;
 
 /// <summary>
 /// Builder syntax for constructing <see cref="VNodeFSM"/> in the code
diff --git a/src/EventStore.Core/Services/VNode/VNodeFSMHandling.cs b/src/KurrentDB.Core/Services/VNode/VNodeFSMHandling.cs
similarity index 83%
rename from src/EventStore.Core/Services/VNode/VNodeFSMHandling.cs
rename to src/KurrentDB.Core/Services/VNode/VNodeFSMHandling.cs
index 0f1a2f69f6e..2bd40b21d07 100644
--- a/src/EventStore.Core/Services/VNode/VNodeFSMHandling.cs
+++ b/src/KurrentDB.Core/Services/VNode/VNodeFSMHandling.cs
@@ -1,12 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Threading;
 using System.Threading.Tasks;
 using DotNext;
-using EventStore.Common.Utils;
-using EventStore.Core.Bus;
-using EventStore.Core.Messaging;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
 
-namespace EventStore.Core.Services.VNode;
+namespace KurrentDB.Core.Services.VNode;
 
 public readonly ref struct VNodeFSMHandling<TMessage>
 	where TMessage : Message {
diff --git a/src/EventStore.Core/Services/VNode/VNodeFSMStatesDefinition.cs b/src/KurrentDB.Core/Services/VNode/VNodeFSMStatesDefinition.cs
similarity index 77%
rename from src/EventStore.Core/Services/VNode/VNodeFSMStatesDefinition.cs
rename to src/KurrentDB.Core/Services/VNode/VNodeFSMStatesDefinition.cs
index e8c01f847ff..d384a5e91cc 100644
--- a/src/EventStore.Core/Services/VNode/VNodeFSMStatesDefinition.cs
+++ b/src/KurrentDB.Core/Services/VNode/VNodeFSMStatesDefinition.cs
@@ -1,9 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
-using EventStore.Common.Utils;
-using EventStore.Core.Data;
-using EventStore.Core.Messaging;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messaging;
 
-namespace EventStore.Core.Services.VNode;
+namespace KurrentDB.Core.Services.VNode;
 
 public readonly ref struct VNodeFSMStatesDefinition {
 	internal readonly VNodeFSMBuilder FSM;
diff --git a/src/KurrentDB.Core/Settings/ESConsts.cs b/src/KurrentDB.Core/Settings/ESConsts.cs
new file mode 100644
index 00000000000..431b986108e
--- /dev/null
+++ b/src/KurrentDB.Core/Settings/ESConsts.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Settings;
+
+public static class ESConsts {
+	public const int PTableInitialReaderCount = 5;
+	public const int MemTableEntryCount = 1000000;
+	public const int IndexWriterCacheCapacity = 100_000;
+	public const int TransactionMetadataCacheCapacity = 50000;
+	public const int CommitedEventsMemCacheLimit = 8 * 1024 * 1024;
+	public const int CachedEpochCount = 1000;
+	public const int ReadRequestTimeout = 10000;
+	public const bool PerformAdditionlCommitChecks = false;
+	public const int MetaStreamMaxCount = 1;
+
+	public const int CachedPrincipalCount = 1000;
+
+	public static readonly TimeSpan HttpTimeout = TimeSpan.FromSeconds(10);
+	public static readonly TimeSpan HttpClientConnectionLifeTime = TimeSpan.FromMinutes(10);
+
+	public const int UnrestrictedPendingSendBytes = 0;
+	public const int MaxConnectionQueueSize = 50000;
+
+	public const string DefaultIndexDirectoryName = "index";
+	public const string StreamExistenceFilterDirectoryName = "stream-existence";
+}
diff --git a/src/KurrentDB.Core/Settings/ThreadCountCalculator.cs b/src/KurrentDB.Core/Settings/ThreadCountCalculator.cs
new file mode 100644
index 00000000000..f5f04136a82
--- /dev/null
+++ b/src/KurrentDB.Core/Settings/ThreadCountCalculator.cs
@@ -0,0 +1,71 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using Serilog;
+
+namespace KurrentDB.Core.Settings;
+
+
+public static class ThreadCountCalculator {
+	private const int ReaderThreadCountFloor = 4;
+
+	public static int CalculateReaderThreadCount(int configuredCount, int processorCount,
+		bool isRunningInContainer) {
+		if (configuredCount > 0) {
+			Log.Information(
+				"ReaderThreadsCount set to {readerThreadsCount:N0}. " +
+				"Calculated based on processor count of {processorCount:N0} and configured value of {configuredCount:N0}",
+				configuredCount,
+				processorCount, configuredCount);
+			return configuredCount;
+		}
+
+		if (isRunningInContainer) {
+			Log.Information(
+				"ReaderThreadsCount set to {readerThreadsCount:N0}. " +
+				"Calculated based on containerized environment and configured value of {configuredCount:N0}",
+				ContainerizedEnvironment.ReaderThreadCount,
+				configuredCount);
+			return ContainerizedEnvironment.ReaderThreadCount;
+		}
+
+		var readerCount = Math.Clamp(processorCount * 2, ReaderThreadCountFloor, 16);
+		Log.Information(
+			"ReaderThreadsCount set to {readerThreadsCount:N0}. " +
+			"Calculated based on processor count of {processorCount:N0} and configured value of {configuredCount:N0}",
+			readerCount,
+			processorCount, configuredCount);
+		return readerCount;
+	}
+
+	public static int CalculateWorkerThreadCount(int configuredCount, int readerCount, bool isRunningInContainer) {
+		if (configuredCount > 0) {
+			Log.Information(
+				"WorkerThreads set to {workerThreadsCount:N0}. " +
+				"Calculated based on a reader thread count of {readerThreadsCount:N0} and a configured value of {configuredCount:N0}",
+				configuredCount,
+				readerCount, configuredCount);
+			return configuredCount;
+		}
+
+
+		if (isRunningInContainer) {
+			Log.Information(
+				"WorkerThreads set to {workerThreadsCount:N0}. " +
+				"Calculated based on containerized environment and a configured value of {configuredCount:N0}",
+				ContainerizedEnvironment.WorkerThreadCount,
+				configuredCount);
+			return ContainerizedEnvironment.WorkerThreadCount;
+		}
+
+		var workerThreadsCount = readerCount > ReaderThreadCountFloor ? 10 : 5;
+		Log.Information(
+			"WorkerThreads set to {workerThreadsCount:N0}. " +
+			"Calculated based on a reader thread count of {readerThreadsCount:N0} and a configured value of {configuredCount:N0}",
+			workerThreadsCount,
+			readerCount, configuredCount);
+		return workerThreadsCount;
+	}
+}
diff --git a/src/KurrentDB.Core/Settings/VNodeSettings.cs b/src/KurrentDB.Core/Settings/VNodeSettings.cs
new file mode 100644
index 00000000000..b240323b204
--- /dev/null
+++ b/src/KurrentDB.Core/Settings/VNodeSettings.cs
@@ -0,0 +1,101 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using System.Security.Cryptography.X509Certificates;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Services.Monitoring;
+
+namespace KurrentDB.Core.Settings;
+
+public class SingleVNodeSettings {
+	public readonly IPEndPoint ExternalTcpEndPoint;
+	public readonly IPEndPoint ExternalSecureTcpEndPoint;
+	public readonly IPEndPoint HttpEndPoint;
+	public readonly string[] HttpPrefixes;
+	public readonly bool EnableTrustedAuth;
+	public readonly X509Certificate2 Certificate;
+	public readonly int WorkerThreads;
+
+	public readonly TimeSpan MinFlushDelay;
+	public readonly TimeSpan PrepareTimeout;
+	public readonly TimeSpan CommitTimeout;
+
+	public readonly bool DisableScavengeMerging;
+
+	public readonly TimeSpan StatsPeriod;
+	public readonly StatsStorage StatsStorage;
+
+	public readonly bool SkipInitializeStandardUsersCheck;
+
+	public readonly TimeSpan TcpTimeout;
+
+	public SingleVNodeSettings(IPEndPoint externalTcpEndPoint,
+		IPEndPoint externalSecureTcpEndPoint,
+		IPEndPoint httpEndPoint,
+		string[] httpPrefixes,
+		bool enableTrustedAuth,
+		X509Certificate2 certificate,
+		int workerThreads,
+		TimeSpan minFlushDelay,
+		TimeSpan prepareTimeout,
+		TimeSpan commitTimeout,
+		TimeSpan statsPeriod,
+		TimeSpan tcpTimeout,
+		StatsStorage statsStorage = StatsStorage.StreamAndFile,
+		bool skipInitializeStandardUsersCheck = false,
+		bool disableScavengeMerging = false) {
+		Ensure.NotNull(httpEndPoint, nameof(httpEndPoint));
+		Ensure.NotNull(httpPrefixes, "httpPrefixes");
+		if (externalSecureTcpEndPoint != null)
+			Ensure.NotNull(certificate, "certificate");
+		Ensure.Positive(workerThreads, "workerThreads");
+
+		ExternalTcpEndPoint = externalTcpEndPoint;
+		ExternalSecureTcpEndPoint = externalSecureTcpEndPoint;
+		HttpEndPoint = httpEndPoint;
+		HttpPrefixes = httpPrefixes;
+		EnableTrustedAuth = enableTrustedAuth;
+		Certificate = certificate;
+		WorkerThreads = workerThreads;
+
+		MinFlushDelay = minFlushDelay;
+		PrepareTimeout = prepareTimeout;
+		CommitTimeout = commitTimeout;
+
+		StatsPeriod = statsPeriod;
+		StatsStorage = statsStorage;
+
+		SkipInitializeStandardUsersCheck = skipInitializeStandardUsersCheck;
+		DisableScavengeMerging = disableScavengeMerging;
+		TcpTimeout = tcpTimeout;
+	}
+
+	public override string ToString() {
+		return string.Format("ExternalTcpEndPoint: {0},\n"
+							 + "ExternalSecureTcpEndPoint: {1},\n"
+							 + "HttpEndPoint: {2},\n"
+							 + "HttpPrefixes: {3},\n"
+							 + "EnableTrustedAuth: {4},\n"
+							 + "Certificate: {5},\n"
+							 + "WorkerThreads: {6}\n"
+							 + "MinFlushDelay: {7}\n"
+							 + "PrepareTimeout: {8}\n"
+							 + "CommitTimeout: {9}\n"
+							 + "StatsPeriod: {10}\n"
+							 + "StatsStorage: {11}",
+			ExternalTcpEndPoint == null ? "n/a" : ExternalTcpEndPoint.ToString(),
+			ExternalSecureTcpEndPoint == null ? "n/a" : ExternalSecureTcpEndPoint.ToString(),
+			HttpEndPoint,
+			string.Join(", ", HttpPrefixes),
+			EnableTrustedAuth,
+			Certificate == null ? "n/a" : Certificate.ToString(verbose: true),
+			WorkerThreads,
+			MinFlushDelay,
+			PrepareTimeout,
+			CommitTimeout,
+			StatsPeriod,
+			StatsStorage);
+	}
+}
diff --git a/src/KurrentDB.Core/StandardComponents.cs b/src/KurrentDB.Core/StandardComponents.cs
new file mode 100644
index 00000000000..6646030ef9d
--- /dev/null
+++ b/src/KurrentDB.Core/StandardComponents.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Common.Configuration;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Services.Transport.Http;
+using KurrentDB.Core.TransactionLog.Chunks;
+
+namespace KurrentDB.Core;
+
+public class StandardComponents {
+	private readonly TFChunkDbConfig _dbConfig;
+	private readonly IPublisher _mainQueue;
+	private readonly ISubscriber _mainBus;
+	private readonly TimerService _timerService;
+	private readonly ITimeProvider _timeProvider;
+	private readonly IHttpForwarder _httpForwarder;
+	private readonly IHttpService[] _httpServices;
+	private readonly IPublisher _networkSendService;
+	private readonly QueueStatsManager _queueStatsManager;
+
+	public StandardComponents(
+		TFChunkDbConfig dbConfig,
+		IPublisher mainQueue,
+		ISubscriber mainBus,
+		TimerService timerService,
+		ITimeProvider timeProvider,
+		IHttpForwarder httpForwarder,
+		IHttpService[] httpServices,
+		IPublisher networkSendService,
+		QueueStatsManager queueStatsManager,
+		QueueTrackers trackers,
+		MetricsConfiguration metricsConfiguration) {
+		_dbConfig = dbConfig;
+		_mainQueue = mainQueue;
+		_mainBus = mainBus;
+		_timerService = timerService;
+		_timeProvider = timeProvider;
+		_httpForwarder = httpForwarder;
+		_httpServices = httpServices;
+		_networkSendService = networkSendService;
+		_queueStatsManager = queueStatsManager;
+		QueueTrackers = trackers;
+		MetricsConfiguration = metricsConfiguration;
+	}
+
+	public TFChunkDbConfig DbConfig {
+		get { return _dbConfig; }
+	}
+
+	public IPublisher MainQueue {
+		get { return _mainQueue; }
+	}
+
+	public ISubscriber MainBus {
+		get { return _mainBus; }
+	}
+
+	public TimerService TimerService {
+		get { return _timerService; }
+	}
+
+	public ITimeProvider TimeProvider {
+		get { return _timeProvider; }
+	}
+
+	public IHttpForwarder HttpForwarder {
+		get { return _httpForwarder; }
+	}
+
+	public IHttpService[] HttpServices {
+		get { return _httpServices; }
+	}
+
+	public IPublisher NetworkSendService {
+		get { return _networkSendService; }
+	}
+
+	public QueueStatsManager QueueStatsManager {
+		get { return _queueStatsManager; }
+	}
+
+	public MetricsConfiguration MetricsConfiguration { get; }
+
+	public QueueTrackers QueueTrackers { get; private set; }
+}
diff --git a/src/EventStore.Core/Synchronization/SemaphoreSlimLock.cs b/src/KurrentDB.Core/Synchronization/SemaphoreSlimLock.cs
similarity index 81%
rename from src/EventStore.Core/Synchronization/SemaphoreSlimLock.cs
rename to src/KurrentDB.Core/Synchronization/SemaphoreSlimLock.cs
index 89ace39169d..f5717c139a5 100644
--- a/src/EventStore.Core/Synchronization/SemaphoreSlimLock.cs
+++ b/src/KurrentDB.Core/Synchronization/SemaphoreSlimLock.cs
@@ -1,7 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Threading;
 
-namespace EventStore.Core.Synchronization;
+namespace KurrentDB.Core.Synchronization;
 
 public class SemaphoreSlimLock : IDisposable {
 	private readonly SemaphoreSlim _semaphoreSlim;
diff --git a/src/KurrentDB.Core/Telemetry/ContainerInfo.cs b/src/KurrentDB.Core/Telemetry/ContainerInfo.cs
new file mode 100644
index 00000000000..560b8b3d132
--- /dev/null
+++ b/src/KurrentDB.Core/Telemetry/ContainerInfo.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Runtime;
+
+namespace KurrentDB.Core.Telemetry;
+
+public readonly record struct ContainerInfo(bool IsContainer, bool IsKubernetes) {
+	public static ContainerInfo Collect() => new(
+		RuntimeInformation.IsRunningInContainer,
+		RuntimeInformation.IsRunningInKubernetes
+	);
+}
diff --git a/src/KurrentDB.Core/Telemetry/EnvironmentTelemetry.cs b/src/KurrentDB.Core/Telemetry/EnvironmentTelemetry.cs
new file mode 100644
index 00000000000..03ebdd6071c
--- /dev/null
+++ b/src/KurrentDB.Core/Telemetry/EnvironmentTelemetry.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Runtime;
+
+namespace KurrentDB.Core.Telemetry;
+
+public readonly record struct EnvironmentTelemetry {
+	public string Arch { get; init; }
+	public ContainerInfo Container { get; init; }
+	public MachineInfo Machine { get; init; }
+
+	public static EnvironmentTelemetry Collect(ClusterVNodeOptions options) =>
+		new() {
+			Arch = RuntimeInformation.Host.Architecture.ToString(),
+			Container = ContainerInfo.Collect(),
+			Machine = MachineInfo.Collect(options)
+		};
+}
diff --git a/src/KurrentDB.Core/Telemetry/ITelemetrySink.cs b/src/KurrentDB.Core/Telemetry/ITelemetrySink.cs
new file mode 100644
index 00000000000..5a561869a7e
--- /dev/null
+++ b/src/KurrentDB.Core/Telemetry/ITelemetrySink.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text.Json.Nodes;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core.Telemetry;
+
+
+public interface ITelemetrySink {
+	Task Flush(JsonObject data, CancellationToken token);
+}
diff --git a/src/KurrentDB.Core/Telemetry/InMemoryTelemetrySink.cs b/src/KurrentDB.Core/Telemetry/InMemoryTelemetrySink.cs
new file mode 100644
index 00000000000..0e17b9e20fd
--- /dev/null
+++ b/src/KurrentDB.Core/Telemetry/InMemoryTelemetrySink.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text.Json.Nodes;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core.Telemetry;
+
+
+public class InMemoryTelemetrySink : ITelemetrySink {
+	public JsonObject Data { get; private set; }
+
+	public Task Flush(JsonObject data, CancellationToken token) {
+		Data = (JsonObject)JsonNode.Parse(data.ToJsonString());
+		return Task.CompletedTask;
+	}
+}
diff --git a/src/KurrentDB.Core/Telemetry/MachineInfo.cs b/src/KurrentDB.Core/Telemetry/MachineInfo.cs
new file mode 100644
index 00000000000..8856d677de5
--- /dev/null
+++ b/src/KurrentDB.Core/Telemetry/MachineInfo.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+namespace KurrentDB.Core.Telemetry;
+
+public readonly record struct MachineInfo(
+	string OS,
+	int ProcessorCount,
+	long TotalMemory,
+	long TotalDiskSpace) {
+
+	public static MachineInfo Collect(ClusterVNodeOptions options) => new(
+		RuntimeInformation.OSDescription,
+		Environment.ProcessorCount,
+		RuntimeStats.GetTotalMemory(),
+		DriveStats.GetDriveInfo(options.Database.Db).TotalBytes
+	);
+}
diff --git a/src/EventStore.Core/Telemetry/TelemetryMessage.cs b/src/KurrentDB.Core/Telemetry/TelemetryMessage.cs
similarity index 78%
rename from src/EventStore.Core/Telemetry/TelemetryMessage.cs
rename to src/KurrentDB.Core/Telemetry/TelemetryMessage.cs
index 96066c93d9e..080f6d52f36 100644
--- a/src/EventStore.Core/Telemetry/TelemetryMessage.cs
+++ b/src/KurrentDB.Core/Telemetry/TelemetryMessage.cs
@@ -1,8 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System.Text.Json.Nodes;
-using EventStore.Common.Utils;
-using EventStore.Core.Messaging;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messaging;
 
-namespace EventStore.Core.Telemetry;
+namespace KurrentDB.Core.Telemetry;
 
 [DerivedMessage]
 public abstract partial class TelemetryMessage : Message {
diff --git a/src/KurrentDB.Core/Telemetry/TelemetryService.cs b/src/KurrentDB.Core/Telemetry/TelemetryService.cs
new file mode 100644
index 00000000000..86bdb9384a9
--- /dev/null
+++ b/src/KurrentDB.Core/Telemetry/TelemetryService.cs
@@ -0,0 +1,281 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using DotNext.Collections.Generic;
+using DotNext.Runtime.CompilerServices;
+using EventStore.Plugins.Diagnostics;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Configuration.Sources;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using Microsoft.Extensions.Configuration;
+using Serilog;
+using static EventStore.Plugins.Diagnostics.PluginDiagnosticsDataCollectionMode;
+
+namespace KurrentDB.Core.Telemetry;
+
+public sealed class TelemetryService :
+	IHandle<SystemMessage.StateChangeMessage>,
+	IHandle<ElectionMessage.ElectionsDone>,
+	IHandle<SystemMessage.ReplicaStateMessage>,
+	IHandle<LeaderDiscoveryMessage.LeaderFound>,
+	IAsyncDisposable {
+	private static readonly ILogger Logger = Log.ForContext<TelemetryService>();
+
+	private static readonly TimeSpan InitialInterval = TimeSpan.FromHours(1);
+	private static readonly TimeSpan Interval = TimeSpan.FromHours(24);
+	private static readonly TimeSpan FlushDelay = TimeSpan.FromSeconds(10);
+
+	private readonly ClusterVNodeOptions _nodeOptions;
+	private readonly Task _task;
+	private readonly IConfiguration _configuration;
+	private readonly IPublisher _publisher;
+	private readonly IReadOnlyCheckpoint _writerCheckpoint;
+	private readonly long _startTime = TimeProvider.System.GetTimestamp();
+	private readonly Guid _nodeId;
+	private readonly TFChunkManager _manager;
+	private readonly PluginDiagnosticsDataCollector _pluginDiagnosticsDataCollector;
+
+	private CancellationTokenSource _cts;
+	private VNodeState _nodeState;
+	private int _epochNumber;
+	private Guid _leaderId = Guid.Empty;
+	private Guid _firstEpochId = Guid.Empty;
+
+	public TelemetryService(
+		TFChunkManager manager,
+		ClusterVNodeOptions nodeOptions,
+		IConfiguration configuration,
+		IPublisher publisher,
+		ITelemetrySink sink,
+		IReadOnlyCheckpoint writerCheckpoint,
+		Guid nodeId
+	) {
+		_manager = manager;
+		_nodeOptions = nodeOptions;
+		_configuration = configuration;
+		_publisher = publisher;
+		_writerCheckpoint = writerCheckpoint;
+		_nodeId = nodeId;
+
+		_pluginDiagnosticsDataCollector = PluginDiagnosticsDataCollector.Start(
+			_nodeOptions.PlugableComponents.Select(x => x.DiagnosticsName).ToArray()
+		);
+
+		_cts = new();
+		_task = ProcessAsync(sink, _cts.Token);
+	}
+
+	[AsyncMethodBuilder(typeof(SpawningAsyncTaskMethodBuilder))]
+	private async Task ProcessAsync(ITelemetrySink sink, CancellationToken token) {
+		try {
+			await ProcessAsync(_publisher, sink, token);
+		} catch (Exception ex) when (ex is not OperationCanceledException) {
+			Logger.Error(ex, "Telemetry loop stopped");
+		}
+	}
+
+	public async ValueTask DisposeAsync() {
+		if (Interlocked.Exchange(ref _cts, null) is { } cts) {
+			using (cts) {
+				cts.Cancel();
+			}
+		}
+
+		await _task.ConfigureAwait(
+			ConfigureAwaitOptions.SuppressThrowing |
+			ConfigureAwaitOptions.ContinueOnCapturedContext);
+	}
+
+	// we send messages on the publisher, and receive responses directly to the channel
+	// using the channel reduces chatter on the main queue.
+	private async Task ProcessAsync(IPublisher publisher, ITelemetrySink sink, CancellationToken token) {
+		var channel = Channel.CreateBounded<Message>(new BoundedChannelOptions(500) {
+			SingleReader = true,
+			FullMode = BoundedChannelFullMode.DropOldest,
+		});
+
+		var envelope = new ChannelEnvelope(channel);
+		var scheduleInitialCollect = TimerMessage.Schedule.Create(InitialInterval, envelope, new TelemetryMessage.Collect());
+		var scheduleCollect = TimerMessage.Schedule.Create(Interval - FlushDelay, envelope, new TelemetryMessage.Collect());
+		var scheduleFlush = TimerMessage.Schedule.Create(FlushDelay, envelope, new TelemetryMessage.Flush());
+		var usageRequest = new TelemetryMessage.Request(envelope);
+
+		publisher.Publish(scheduleInitialCollect);
+
+		var data = new JsonObject();
+		await foreach (var message in channel.Reader.ReadAllAsync(token)) {
+			switch (message) {
+				case TelemetryMessage.Collect:
+					await Handle(usageRequest, token);
+					publisher.Publish(usageRequest);
+					publisher.Publish(scheduleFlush);
+					break;
+
+				case TelemetryMessage.Response response:
+					if (string.IsNullOrWhiteSpace(response.Root)) {
+						data[response.Key] = response.Value;
+						break;
+					}
+
+					if (data.TryGetPropertyValue(response.Root, out var existing) &&
+						existing is JsonObject existingObject) {
+
+						existingObject[response.Key] = response.Value;
+						break;
+					}
+
+					data[response.Root] = new JsonObject {
+						[response.Key] = response.Value
+					};
+					break;
+
+				case TelemetryMessage.Flush:
+					await sink.Flush(data, token);
+					data.Clear();
+					publisher.Publish(scheduleCollect);
+					break;
+			}
+		}
+	}
+
+	public void Handle(SystemMessage.StateChangeMessage message) {
+		_nodeState = message.State;
+	}
+
+	public void Handle(ElectionMessage.ElectionsDone message) {
+		_epochNumber = message.ProposalNumber;
+		_leaderId = message.Leader.InstanceId;
+	}
+	public void Handle(SystemMessage.ReplicaStateMessage message) {
+		_epochNumber = message.Leader.EpochNumber;
+		_leaderId = message.Leader.InstanceId;
+	}
+	public void Handle(LeaderDiscoveryMessage.LeaderFound message) {
+		_epochNumber = message.Leader.EpochNumber;
+		_leaderId = message.Leader.InstanceId;
+	}
+
+	private async ValueTask Handle(TelemetryMessage.Request message, CancellationToken token) {
+		if (_firstEpochId == Guid.Empty)
+			await ReadFirstEpoch(token);
+
+		message.Envelope.ReplyWith(new TelemetryMessage.Response(
+			"version", JsonValue.Create(VersionInfo.Version)));
+
+		message.Envelope.ReplyWith(new TelemetryMessage.Response(
+			"edition", JsonValue.Create(VersionInfo.Edition)));
+
+		message.Envelope.ReplyWith(new TelemetryMessage.Response(
+			"uptime", JsonValue.Create(TimeProvider.System.GetElapsedTime(_startTime))));
+
+		message.Envelope.ReplyWith(new TelemetryMessage.Response(
+			"cluster", new JsonObject {
+				["leaderId"] = JsonValue.Create(_leaderId),
+				["nodeId"] = JsonValue.Create(_nodeId),
+				["nodeState"] = _nodeState.ToString(),
+			}));
+
+		message.Envelope.ReplyWith(new TelemetryMessage.Response(
+			"configuration", new JsonObject {
+				["clusterSize"] = _nodeOptions.Cluster.ClusterSize,
+				["enableAtomPubOverHttp"] = _nodeOptions.Interface.EnableAtomPubOverHttp,
+				["insecure"] = _nodeOptions.Application.Insecure,
+				["runProjections"] = _nodeOptions.Projection.RunProjections.ToString(),
+				["authorizationType"] = _nodeOptions.Auth.AuthorizationType,
+				["authenticationType"] = _nodeOptions.Auth.AuthenticationType
+			}));
+
+		message.Envelope.ReplyWith(new TelemetryMessage.Response(
+			"database", new JsonObject {
+				["epochNumber"] = _epochNumber,
+				["firstEpochId"] = _firstEpochId,
+				["activeChunkNumber"] = _writerCheckpoint.Read() / _nodeOptions.Database.ChunkSize,
+			}));
+
+		var env = EnvironmentTelemetry.Collect(_nodeOptions);
+		message.Envelope.ReplyWith(new TelemetryMessage.Response(
+			"environment", new JsonObject {
+				["os"] = env.Machine.OS,
+				["coreCount"] = env.Machine.ProcessorCount,
+				["isContainer"] = env.Container.IsContainer,
+				["isKubernetes"] = env.Container.IsKubernetes,
+				["processorArchitecture"] = env.Arch,
+				["totalDiskSpace"] = env.Machine.TotalDiskSpace,
+				["totalMemory"] = env.Machine.TotalMemory,
+			}));
+
+		_nodeOptions.PlugableComponents
+			.SelectMany(plugin => _pluginDiagnosticsDataCollector
+				.CollectedEvents(plugin.DiagnosticsName)
+				.Where(evt => evt.CollectionMode == Snapshot))
+			.ForEach(evt => {
+				try {
+					var payload = JsonSerializer.SerializeToNode(
+						evt.Data.ToDictionary(kvp => LowerFirstLetter(kvp.Key), kvp => kvp.Value));
+					message.Envelope.ReplyWith(new TelemetryMessage.Response(LowerFirstLetter(evt.Source), payload));
+				} catch (Exception ex) {
+					Logger.Warning(ex, "Failed to collect telemetry from pluggable component {Source}", evt.Source);
+				}
+			});
+
+		_publisher.Publish(new GossipMessage.ReadGossip(new CallbackEnvelope(resp => OnGossipReceived(message.Envelope, resp))));
+
+		{
+			var extraTelemetry = _configuration.GetSection($"{KurrentConfigurationKeys.Prefix}:Telemetry").Get<Dictionary<string, string>>() ?? [];
+			var payload = JsonSerializer.SerializeToNode(extraTelemetry.ToDictionary(kvp => LowerFirstLetter(kvp.Key), kvp => kvp.Value));
+			message.Envelope.ReplyWith(new TelemetryMessage.Response(
+				"telemetry", payload));
+		}
+	}
+
+	private static string LowerFirstLetter(string x) {
+		if (string.IsNullOrEmpty(x) || char.IsLower(x[0]))
+			return x;
+
+		return $"{char.ToLower(x[0])}{x[1..]}";
+	}
+
+	private static void OnGossipReceived(IEnvelope<TelemetryMessage.Response> envelope, Message message) {
+		if (message is not GossipMessage.SendGossip gossip)
+			return;
+
+		var seeds = new JsonObject();
+
+		foreach (var member in gossip.ClusterInfo.Members) {
+			seeds[member.InstanceId.ToString()] = member.State.ToString();
+		}
+
+		envelope.ReplyWith(new TelemetryMessage.Response("gossip", seeds));
+	}
+
+	private async ValueTask ReadFirstEpoch(CancellationToken token) {
+		try {
+			var chunk = await _manager.GetInitializedChunkFor(0, token);
+			var result = await chunk.TryReadAt(0, false, token);
+
+			if (!result.Success)
+				return;
+
+			var epoch = ((SystemLogRecord)result.LogRecord).GetEpochRecord();
+			_firstEpochId = epoch.EpochId;
+		} catch {
+			// noop
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Telemetry/TelemetrySink.cs b/src/KurrentDB.Core/Telemetry/TelemetrySink.cs
new file mode 100644
index 00000000000..1be5a16a61a
--- /dev/null
+++ b/src/KurrentDB.Core/Telemetry/TelemetrySink.cs
@@ -0,0 +1,70 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net.Http;
+using System.Net.Http.Json;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Threading;
+using System.Threading.Tasks;
+using Serilog;
+
+namespace KurrentDB.Core.Telemetry;
+
+
+public class TelemetrySink : ITelemetrySink {
+	private static readonly ILogger _log = Log.ForContext<TelemetrySink>();
+	private const string ApiHost = "https://kurrent.io/telemetry";
+	private readonly bool _optout;
+	private readonly HttpClient _httpClient;
+	private readonly JsonSerializerOptions _serializerOptions = new() {
+		WriteIndented = true,
+		PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+	};
+
+	public TelemetrySink(bool optout) {
+		_optout = optout;
+
+		LogTelemetryMessage();
+
+		if (!optout) {
+			_httpClient = new HttpClient();
+		}
+	}
+
+	public async Task Flush(JsonObject data, CancellationToken token) {
+		var json = JsonSerializer.Serialize(data, _serializerOptions);
+
+		if (_optout) {
+			_log.Information("Telemetry not sent; opted out: " + Environment.NewLine + json);
+		} else {
+			_log.Information("Sending telemetry data to {url} (visit for more information): " + Environment.NewLine + json, ApiHost);
+			try {
+				await _httpClient.PostAsync(ApiHost, JsonContent.Create(data), token);
+			} catch (Exception ex) when (ex is not TaskCanceledException) {
+				_log.Error("Error when sending telemetry payload: {exception}", ex);
+			}
+		}
+	}
+
+	private void LogTelemetryMessage() {
+		var sb = new StringBuilder();
+
+		sb.AppendLine("");
+		sb.AppendLine("Telemetry");
+		sb.AppendLine("---------");
+
+		if (_optout) {
+			sb.AppendLine("You have opted out of sending telemetry by setting the KURRENTDB_TELEMETRY_OPTOUT environment variable to true.");
+		} else {
+			sb.Append("KurrentDB collects usage data in order to improve your experience. ");
+			sb.AppendLine("The data is anonymous and collected by Kurrent, Inc.");
+			sb.AppendLine("You can opt out of sending telemetry by setting the KURRENTDB_TELEMETRY_OPTOUT environment variable to true.");
+		}
+
+		sb.AppendLine("For more information visit https://kurrent.io/telemetry");
+		_log.Information(sb.ToString());
+	}
+}
diff --git a/src/KurrentDB.Core/Time/Clock.cs b/src/KurrentDB.Core/Time/Clock.cs
new file mode 100644
index 00000000000..b43f2e47bb0
--- /dev/null
+++ b/src/KurrentDB.Core/Time/Clock.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.Time;
+
+public interface IClock {
+	Instant Now { get; }
+	long SecondsSinceEpoch { get; }
+}
+
+public class Clock : IClock {
+	public static Clock Instance { get; } = new();
+	private Clock() { }
+	public Instant Now => Instant.Now;
+	public long SecondsSinceEpoch => DateTimeOffset.UtcNow.ToUnixTimeSeconds();
+}
diff --git a/src/EventStore.Core/Time/Instant.cs b/src/KurrentDB.Core/Time/Instant.cs
similarity index 78%
rename from src/EventStore.Core/Time/Instant.cs
rename to src/KurrentDB.Core/Time/Instant.cs
index 9830dbf7bdc..2c85f5c5b75 100644
--- a/src/EventStore.Core/Time/Instant.cs
+++ b/src/KurrentDB.Core/Time/Instant.cs
@@ -1,24 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Diagnostics;
 
-namespace EventStore.Core.Time;
+namespace KurrentDB.Core.Time;
 
 // this provides stronger typing than just passing a long representing the number of ticks
 // and provides us a place to change the resolution and size if long ticks is overkill.
 public struct Instant : IEquatable<Instant> {
 	public static readonly long TicksPerSecond;
 	private static readonly double SecondsPerTick;
-	private static readonly long TicksPerTimeSpanTick;
+	private static readonly double TicksPerTimeSpanTick;
 
 	static Instant() {
 		TicksPerSecond = Stopwatch.Frequency;
-		SecondsPerTick =  1 / (double)TicksPerSecond;
-
-		if (TicksPerSecond % TimeSpan.TicksPerSecond != 0)
-			throw new Exception($"Expected {nameof(TicksPerSecond)} ({TicksPerSecond}) to be an exact multiple" +
-			                    $" of {nameof(TimeSpan)}.{nameof(TimeSpan.TicksPerSecond)} ({TimeSpan.TicksPerSecond})");
-
-		TicksPerTimeSpanTick = TicksPerSecond / TimeSpan.TicksPerSecond;
+		SecondsPerTick = 1 / (double)TicksPerSecond;
+		TicksPerTimeSpanTick = (double)TicksPerSecond / TimeSpan.TicksPerSecond;
 	}
 
 	public static Instant Now => new(Stopwatch.GetTimestamp());
@@ -36,7 +34,7 @@ static Instant() {
 	private readonly long _ticks;
 
 	// Stopwatch Ticks, not DateTime Ticks - these can be different.
-	private Instant(long stopwatchTicks) {
+	public Instant(long stopwatchTicks) {
 		_ticks = stopwatchTicks;
 	}
 
@@ -65,7 +63,7 @@ public TimeSpan ElapsedTimeSince(Instant since) {
 		var elapsedTicks = ElapsedTicksSince(since);
 		// since we're decreasing the resolution when converting to TimeSpan, we round up to make sure that something
 		// using the TimeSpan doesn't wait for less time than it should.
-		elapsedTicks = (elapsedTicks + TicksPerTimeSpanTick - 1) / TicksPerTimeSpanTick;
+		elapsedTicks = (long)Math.Ceiling(elapsedTicks / TicksPerTimeSpanTick);
 		return new TimeSpan(elapsedTicks);
 	}
 }
diff --git a/src/KurrentDB.Core/TransactionLog/Checkpoint/Checkpoint.cs b/src/KurrentDB.Core/TransactionLog/Checkpoint/Checkpoint.cs
new file mode 100644
index 00000000000..28c16c94f59
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Checkpoint/Checkpoint.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.TransactionLog.Checkpoint;
+
+public static class Checkpoint {
+	public const string Writer = "writer";
+	public const string Chaser = "chaser";
+	public const string Epoch = "epoch";
+	public const string Proposal = "proposal";
+	public const string Truncate = "truncate";
+	public const string Replication = "replication";
+	public const string Index = "index";
+	public const string StreamExistenceFilter = "streamExistenceFilter";
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Checkpoint/CheckpointMetric.cs b/src/KurrentDB.Core/TransactionLog/Checkpoint/CheckpointMetric.cs
new file mode 100644
index 00000000000..4eaab0f0351
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Checkpoint/CheckpointMetric.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Metrics;
+
+namespace KurrentDB.Core.TransactionLog.Checkpoint;
+
+// For now reading 'nonflushed' because the flushed values may give the impression
+// of the checkpoints being further behind than they really are.
+public class CheckpointMetric {
+	private readonly IReadOnlyCheckpoint[] _checkpoints;
+	private readonly Measurement<long>[] _measurements;
+	private readonly KeyValuePair<string, object>[][] _tagss;
+
+	public CheckpointMetric(Meter meter, string name, params IReadOnlyCheckpoint[] checkpoints) {
+		_checkpoints = checkpoints;
+		_measurements = new Measurement<long>[checkpoints.Length];
+		_tagss = new KeyValuePair<string, object>[checkpoints.Length][];
+
+		for (var i = 0; i < checkpoints.Length; i++) {
+			_tagss[i] = new KeyValuePair<string, object>[] {
+				new("name", checkpoints[i].Name),
+				new("read", "non-flushed"),
+			};
+		}
+
+		// we could consider using ObservableCounter, but ICheckpoint does allow the values to
+		// go down as well as up, so we are currently supporting that here.
+		meter.CreateObservableUpDownCounter(name, Observe);
+	}
+
+	private IEnumerable<Measurement<long>> Observe() {
+		for (var i = 0; i < _checkpoints.Length; i++) {
+			// looks like the Measurement constructor will allocate an array for the tags but the
+			// other constructor overloads appear to allocate two
+			_measurements[i] = new Measurement<long>(
+				value: _checkpoints[i].ReadNonFlushed(),
+				tags: _tagss[i].AsSpan());
+		}
+
+		return _measurements;
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Checkpoint/FileCheckpoint.cs b/src/KurrentDB.Core/TransactionLog/Checkpoint/FileCheckpoint.cs
new file mode 100644
index 00000000000..c23d5c28621
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Checkpoint/FileCheckpoint.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.TransactionLog.Checkpoint;
+
+public class FileCheckpoint : ICheckpoint {
+	private readonly string _name;
+	private readonly string _filename;
+	private readonly FileStream _fileStream;
+
+	private long _last;
+	private long _lastFlushed;
+
+	private readonly BinaryWriter _writer;
+	private readonly BinaryReader _reader;
+
+	public FileCheckpoint(string filename)
+		: this(filename, Guid.NewGuid().ToString()) {
+	}
+
+	public FileCheckpoint(string filename, string name, bool mustExist = false, long initValue = 0) {
+		_filename = filename;
+		_name = name;
+		var old = File.Exists(filename);
+		_fileStream = new FileStream(_filename,
+			mustExist ? FileMode.Open : FileMode.OpenOrCreate,
+			FileAccess.ReadWrite,
+			FileShare.ReadWrite);
+		if (_fileStream.Length != 8)
+			_fileStream.SetLength(8);
+		_reader = new BinaryReader(_fileStream);
+		_writer = new BinaryWriter(_fileStream);
+		if (old)
+			_last = _lastFlushed = ReadCurrent();
+		else {
+			_last = initValue;
+			Flush();
+		}
+	}
+
+	private long ReadCurrent() {
+		_fileStream.Seek(0, SeekOrigin.Begin);
+		return _reader.ReadInt64();
+	}
+
+	public void Close(bool flush) {
+		if (flush)
+			Flush();
+
+		_reader.Close();
+		_writer.Close();
+		_fileStream.Close();
+	}
+
+	public string Name {
+		get { return _name; }
+	}
+
+	public void Write(long checkpoint) {
+		Interlocked.Exchange(ref _last, checkpoint);
+	}
+
+	public void Flush() {
+		var last = Interlocked.Read(ref _last);
+		if (last == _lastFlushed)
+			return;
+
+		_fileStream.Seek(0, SeekOrigin.Begin);
+		_writer.Write(last);
+
+		_fileStream.FlushToDisk();
+		Interlocked.Exchange(ref _lastFlushed, last);
+
+		OnFlushed(last);
+	}
+
+	public long Read() {
+		return Interlocked.Read(ref _lastFlushed);
+	}
+
+	public long ReadNonFlushed() {
+		return Interlocked.Read(ref _last);
+	}
+
+	public event Action<long> Flushed;
+
+	private void OnFlushed(long obj) {
+		var onFlushed = Flushed;
+		if (onFlushed != null)
+			onFlushed.Invoke(obj);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Checkpoint/ICheckpoint.cs b/src/KurrentDB.Core/TransactionLog/Checkpoint/ICheckpoint.cs
new file mode 100644
index 00000000000..894cc0eae64
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Checkpoint/ICheckpoint.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.TransactionLog.Checkpoint;
+
+public interface ICheckpoint : IReadOnlyCheckpoint {
+	void Write(long checkpoint);
+	void Flush();
+	void Close(bool flush);
+	IReadOnlyCheckpoint AsReadOnly() => this;
+}
+
+public interface IReadOnlyCheckpoint {
+	string Name { get; }
+	long Read();
+	long ReadNonFlushed();
+
+	event Action<long> Flushed;
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Checkpoint/InMemoryCheckpoint.cs b/src/KurrentDB.Core/TransactionLog/Checkpoint/InMemoryCheckpoint.cs
new file mode 100644
index 00000000000..f111b566213
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Checkpoint/InMemoryCheckpoint.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+
+namespace KurrentDB.Core.TransactionLog.Checkpoint;
+
+public class InMemoryCheckpoint : ICheckpoint {
+	public string Name {
+		get { return _name; }
+	}
+
+	private long _last;
+	private long _lastFlushed;
+	private readonly string _name;
+
+	public InMemoryCheckpoint(long initialValue) : this(Guid.NewGuid().ToString(), initialValue) {
+	}
+
+	public InMemoryCheckpoint() : this(Guid.NewGuid().ToString(), 0) {
+	}
+
+	public InMemoryCheckpoint(string name, long initValue = 0) {
+		_last = initValue;
+		_lastFlushed = initValue;
+		_name = name;
+	}
+
+	public void Write(long checkpoint) {
+		Interlocked.Exchange(ref _last, checkpoint);
+	}
+
+	public long Read() {
+		return Interlocked.Read(ref _lastFlushed);
+	}
+
+	public long ReadNonFlushed() {
+		return Interlocked.Read(ref _last);
+	}
+
+	public void Flush() {
+		var last = Interlocked.Read(ref _last);
+		if (last == _lastFlushed)
+			return;
+
+		Interlocked.Exchange(ref _lastFlushed, last);
+
+		OnFlushed(last);
+	}
+
+	public event Action<long> Flushed;
+
+	private void OnFlushed(long obj) {
+		var onFlushed = Flushed;
+		if (onFlushed != null)
+			onFlushed.Invoke(obj);
+	}
+
+	public void Close(bool flush) {
+		if (flush)
+			Flush();
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Checkpoint/MemoryMappedFileCheckpoint.cs b/src/KurrentDB.Core/TransactionLog/Checkpoint/MemoryMappedFileCheckpoint.cs
new file mode 100644
index 00000000000..bbf191788e4
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Checkpoint/MemoryMappedFileCheckpoint.cs
@@ -0,0 +1,95 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.IO.MemoryMappedFiles;
+using System.Threading;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.TransactionLog.Checkpoint;
+
+public class MemoryMappedFileCheckpoint : ICheckpoint {
+	public string Name {
+		get { return _name; }
+	}
+
+	private readonly string _filename;
+	private readonly string _name;
+	private readonly FileStream _fileStream;
+	private readonly MemoryMappedFile _file;
+	private long _last;
+	private long _lastFlushed;
+	private readonly MemoryMappedViewAccessor _accessor;
+
+	public MemoryMappedFileCheckpoint(string filename) : this(filename, Guid.NewGuid().ToString()) {
+	}
+
+	public MemoryMappedFileCheckpoint(string filename, string name, bool mustExist = false,
+		long initValue = 0) {
+		_filename = filename;
+		_name = name;
+		var old = File.Exists(_filename);
+		_fileStream = new FileStream(_filename,
+			mustExist ? FileMode.Open : FileMode.OpenOrCreate,
+			FileAccess.ReadWrite,
+			FileShare.ReadWrite);
+		_fileStream.SetLength(sizeof(long));
+		_file = MemoryMappedFile.CreateFromFile(_fileStream,
+			null,
+			sizeof(long),
+			MemoryMappedFileAccess.ReadWrite,
+			HandleInheritability.None,
+			false);
+		_accessor = _file.CreateViewAccessor(0, sizeof(long));
+
+		if (old)
+			_last = _lastFlushed = _accessor.ReadInt64(0);
+		else {
+			_last = initValue;
+			Flush();
+		}
+	}
+
+	public void Close(bool flush) {
+		if (flush)
+			Flush();
+		_accessor.Dispose();
+		_file.Dispose();
+	}
+
+	public void Write(long checkpoint) {
+		Interlocked.Exchange(ref _last, checkpoint);
+	}
+
+	public void Flush() {
+		var last = Interlocked.Read(ref _last);
+		if (last == _lastFlushed)
+			return;
+
+		_accessor.Write(0, last);
+		_accessor.Flush();
+
+		_fileStream.FlushToDisk();
+
+		Interlocked.Exchange(ref _lastFlushed, last);
+
+		OnFlushed(last);
+	}
+
+	public long Read() {
+		return Interlocked.Read(ref _lastFlushed);
+	}
+
+	public long ReadNonFlushed() {
+		return Interlocked.Read(ref _last);
+	}
+
+	public event Action<long> Flushed;
+
+	private void OnFlushed(long obj) {
+		var onFlushed = Flushed;
+		if (onFlushed != null)
+			onFlushed.Invoke(obj);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/ChunkFooter.cs b/src/KurrentDB.Core/TransactionLog/Chunks/ChunkFooter.cs
new file mode 100644
index 00000000000..3d3403fbf76
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/ChunkFooter.cs
@@ -0,0 +1,136 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.CompilerServices;
+using System.Security.Cryptography;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Buffers;
+using DotNext.Buffers.Binary;
+using DotNext.IO;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+namespace KurrentDB.Core.TransactionLog.Chunks;
+
+// TODO: Consider struct instead of class
+public sealed class ChunkFooter : IBinaryFormattable<ChunkFooter> {
+	public const int Size = TFConsts.ChunkFooterSize;
+	public const int ChecksumSize = 16;
+
+	private readonly MD5HashBuffer _checksum;
+
+	// flags within single byte
+	public readonly bool IsCompleted;
+	public readonly bool IsMap12Bytes;
+
+	public readonly int PhysicalDataSize; // the size of a section of data in chunk
+
+	public readonly long
+		LogicalDataSize; // the size of a logical data size (after scavenge LogicalDataSize can be > physicalDataSize)
+
+	public readonly int MapSize;
+
+	public ReadOnlySpan<byte> MD5Hash {
+		get => _checksum;
+		init => value.CopyTo(_checksum);
+	}
+
+	public readonly int MapCount; // calculated, not stored
+
+	public ChunkFooter(bool isCompleted, bool isMap12Bytes, int physicalDataSize, long logicalDataSize, int mapSize, IncrementalHash hash = null) {
+		Ensure.Nonnegative(physicalDataSize, nameof(physicalDataSize));
+		Ensure.Nonnegative(logicalDataSize, nameof(logicalDataSize));
+		if (logicalDataSize < physicalDataSize)
+			throw new ArgumentOutOfRangeException(nameof(logicalDataSize),
+				$"LogicalDataSize {logicalDataSize} is less than PhysicalDataSize {physicalDataSize}");
+		Ensure.Nonnegative(mapSize, "mapSize");
+
+		IsCompleted = isCompleted;
+		IsMap12Bytes = isMap12Bytes;
+
+		PhysicalDataSize = physicalDataSize;
+		LogicalDataSize = logicalDataSize;
+		MapSize = mapSize;
+
+		Debug.Assert(hash is null || hash.HashLengthInBytes is ChecksumSize);
+		Unsafe.SkipInit(out _checksum); // fix for Qodana false positive about init of readonly field
+		hash?.TryGetHashAndReset(_checksum, out _);
+
+		var posMapSize = isMap12Bytes ? PosMap.FullSize : PosMap.DeprecatedSize;
+		if (MapSize % posMapSize is not 0)
+			throw new Exception($"Wrong MapSize {MapSize} -- not divisible by PosMap.Size {posMapSize}.");
+		MapCount = mapSize / posMapSize;
+	}
+
+	public ChunkFooter(ReadOnlySpan<byte> source) {
+		Debug.Assert(source.Length >= Size);
+
+		SpanReader<byte> reader = new(source);
+		byte flags = reader.Read();
+
+		IsCompleted = (flags & 1) is not 0;
+		IsMap12Bytes = (flags & 2) is not 0;
+		PhysicalDataSize = reader.ReadLittleEndian<int>();
+		LogicalDataSize = IsMap12Bytes
+			? reader.ReadLittleEndian<long>()
+			: reader.ReadLittleEndian<int>();
+
+		MapSize = reader.ReadLittleEndian<int>();
+		reader.ConsumedCount = Size - ChecksumSize;
+		reader.Read(_checksum);
+
+		var posMapSize = IsMap12Bytes ? PosMap.FullSize : PosMap.DeprecatedSize;
+		if (MapSize % posMapSize is not 0) {
+			throw new Exception($"Wrong MapSize {MapSize} -- not divisible by PosMap.Size {posMapSize}.");
+		}
+
+		MapCount = MapSize / posMapSize;
+	}
+
+	static int IBinaryFormattable<ChunkFooter>.Size => Size;
+
+	public void Format(Span<byte> destination) {
+		Debug.Assert(destination.Length >= Size);
+
+		SpanWriter<byte> writer = new(destination.Slice(0, Size));
+		int flags = Unsafe.BitCast<bool, byte>(IsCompleted)
+			| Unsafe.BitCast<bool, byte>(IsMap12Bytes) << 1;
+
+		writer.Add((byte)flags);
+		writer.WriteLittleEndian(PhysicalDataSize);
+		if (IsMap12Bytes)
+			writer.WriteLittleEndian(LogicalDataSize);
+		else
+			writer.WriteLittleEndian((int)LogicalDataSize);
+
+		writer.WriteLittleEndian(MapSize);
+
+		// reserved bytes must be zero
+		writer.Slide(Size - writer.WrittenCount - ChecksumSize).Clear();
+
+		writer.Write(_checksum);
+	}
+
+	static ChunkFooter IBinaryFormattable<ChunkFooter>.Parse(ReadOnlySpan<byte> source)
+		=> new(source);
+
+	public byte[] AsByteArray() {
+		var array = new byte[Size];
+		Format(array);
+		return array;
+	}
+
+	public static async ValueTask<ChunkFooter> FromStream(Stream stream, CancellationToken token) {
+		using var buffer = Memory.AllocateExactly<byte>(Size);
+		return await stream.ReadAsync<ChunkFooter>(buffer.Memory, token);
+	}
+
+	[InlineArray(ChecksumSize)]
+	private struct MD5HashBuffer {
+		private byte _element0;
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/ChunkHeader.cs b/src/KurrentDB.Core/TransactionLog/Chunks/ChunkHeader.cs
new file mode 100644
index 00000000000..868c49e76a3
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/ChunkHeader.cs
@@ -0,0 +1,175 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Buffers;
+using DotNext.Buffers.Binary;
+using DotNext.IO;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.Index;
+using ChunkVersions = KurrentDB.Core.TransactionLog.Chunks.TFChunk.TFChunk.ChunkVersions;
+
+namespace KurrentDB.Core.TransactionLog.Chunks;
+
+
+// TODO: Consider struct instead of class
+public sealed class ChunkHeader : IBinaryFormattable<ChunkHeader> {
+	public const int Size = TFConsts.ChunkHeaderSize;
+
+	public readonly long ChunkStartPosition; // return ChunkStartNumber * (long)ChunkSize;
+	public readonly long ChunkEndPosition; // return (ChunkEndNumber + 1) * (long)ChunkSize;
+
+	public readonly byte Version;
+	public readonly byte MinCompatibleVersion; // the minimum version of the chunk format that the db needs to "understand" to be able to read/write to this chunk
+	public readonly int ChunkSize;
+	public readonly int ChunkStartNumber;
+	public readonly int ChunkEndNumber;
+	public readonly bool IsScavenged; // uses 4 bytes (legacy)
+	public readonly Guid ChunkId;
+	public readonly TransformType TransformType;
+
+	public ChunkHeader(byte version, byte minCompatibleVersion, int chunkSize, int chunkStartNumber, int chunkEndNumber, bool isScavenged,
+		Guid chunkId, TransformType transformType) {
+		Ensure.Nonnegative(version, "version");
+		Ensure.Nonnegative(minCompatibleVersion, "minCompatibleVersion");
+		Ensure.Positive(chunkSize, "chunkSize");
+		Ensure.Nonnegative(chunkStartNumber, "chunkStartNumber");
+		Ensure.Nonnegative(chunkEndNumber, "chunkEndNumber");
+		if (chunkStartNumber > chunkEndNumber)
+			throw new ArgumentOutOfRangeException("chunkStartNumber",
+				"chunkStartNumber is greater than ChunkEndNumber.");
+
+		Version = version;
+		MinCompatibleVersion = minCompatibleVersion;
+		ChunkSize = chunkSize;
+		ChunkStartNumber = chunkStartNumber;
+		ChunkEndNumber = chunkEndNumber;
+		IsScavenged = isScavenged;
+		ChunkId = chunkId;
+		TransformType = transformType;
+
+		ChunkStartPosition = ChunkStartNumber * (long)ChunkSize;
+		ChunkEndPosition = (ChunkEndNumber + 1) * (long)ChunkSize;
+	}
+
+	public ChunkHeader(ReadOnlySpan<byte> source) {
+		Debug.Assert(source.Length >= Size);
+
+		SpanReader<byte> reader = new(source.Slice(0, Size));
+
+		if ((FileType)reader.Read() is not FileType.ChunkFile)
+			throw new CorruptDatabaseException(new InvalidFileException());
+
+		MinCompatibleVersion = reader.Read();
+
+		ChunkSize = reader.ReadLittleEndian<int>();
+		Debug.Assert(ChunkSize >= 0);
+
+		ChunkStartNumber = reader.ReadLittleEndian<int>();
+		Debug.Assert(ChunkStartNumber >= 0);
+
+		ChunkEndNumber = reader.ReadLittleEndian<int>();
+		Debug.Assert(ChunkEndNumber >= 0);
+
+		IsScavenged = reader.ReadLittleEndian<int>() > 0;
+		ChunkId = new(reader.Read(16));
+
+		Version = reader.Read();
+
+		if (Version is 0)
+			Version = MinCompatibleVersion;
+		Debug.Assert(Version >= MinCompatibleVersion);
+
+		if (Version >= (byte)ChunkVersions.Transformed)
+			TransformType = (TransformType)reader.Read();
+		else
+			TransformType = TransformType.Identity;
+
+		ChunkStartPosition = ChunkStartNumber * (long)ChunkSize;
+		ChunkEndPosition = (ChunkEndNumber + 1) * (long)ChunkSize;
+	}
+
+	static int IBinaryFormattable<ChunkHeader>.Size => Size;
+
+	public void Format(Span<byte> destination) {
+		Debug.Assert(destination.Length >= Size);
+
+		SpanWriter<byte> writer = new(destination);
+		writer.Add((byte)FileType.ChunkFile);
+		writer.Add(MinCompatibleVersion);
+		writer.WriteLittleEndian(ChunkSize);
+		writer.WriteLittleEndian(ChunkStartNumber);
+		writer.WriteLittleEndian(ChunkEndNumber);
+		writer.WriteLittleEndian<int>(Unsafe.BitCast<bool, byte>(IsScavenged));
+		ChunkId.TryWriteBytes(writer.Slide(16));
+
+		if (Version >= (byte)ChunkVersions.Transformed)
+			// we started to use this byte of the chunk header to store `Version` as from `ChunkVersions.Transformed`
+			// so, we don't write it for older versions to keep the previous formats the same.
+			writer.Add(Version);
+
+		if (Version >= (byte)ChunkVersions.Transformed)
+			writer.Add((byte)TransformType);
+
+		// reserved bytes must be zero
+		writer.RemainingSpan.Clear();
+	}
+
+	static ChunkHeader IBinaryFormattable<ChunkHeader>.Parse(ReadOnlySpan<byte> source)
+		=> new(source);
+
+	public byte[] AsByteArray() {
+		var array = new byte[Size];
+		Format(array);
+
+		return array;
+	}
+
+	public static async ValueTask<ChunkHeader> FromStream(Stream stream, CancellationToken token) {
+		using var buffer = Memory.AllocateExactly<byte>(Size);
+		return await stream.ReadAsync<ChunkHeader>(buffer.Memory, token);
+	}
+
+	public long GetLocalLogPosition(long globalLogicalPosition) {
+		if (globalLogicalPosition < ChunkStartPosition || globalLogicalPosition > ChunkEndPosition) {
+			throw new Exception(
+				$"globalLogicalPosition {globalLogicalPosition} is out of chunk logical positions [{ChunkStartPosition}, {ChunkEndPosition}].");
+		}
+
+		return globalLogicalPosition - ChunkStartPosition;
+	}
+
+	public long GetGlobalLogPosition(long localLogicalPosition) {
+		if (ChunkStartPosition + localLogicalPosition > ChunkEndPosition) {
+			throw new Exception(
+				$"localLogicalPosition {localLogicalPosition} is out of chunk logical positions [{ChunkStartPosition}, {ChunkEndPosition}].");
+		}
+
+		return ChunkStartPosition + localLogicalPosition;
+	}
+
+	public bool IsSingleLogicalChunk => ChunkStartNumber == ChunkEndNumber;
+
+	public override string ToString() {
+		return string.Format(
+			"Version: {0}, ChunkSize: {1}, ChunkStartNumber: {2}, ChunkEndNumber: {3}, IsScavenged: {4}, ChunkId: {5}\n" +
+			"TransformType: {6}, ChunkStartPosition: {7}, ChunkEndPosition: {8}, ChunkFullSize: {9}",
+			Version,
+			ChunkSize,
+			ChunkStartNumber,
+			ChunkEndNumber,
+			IsScavenged,
+			ChunkId,
+			TransformType,
+			ChunkStartPosition,
+			ChunkEndPosition,
+			ChunkEndPosition - ChunkStartPosition);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/IChunkRawReader.cs b/src/KurrentDB.Core/TransactionLog/Chunks/IChunkRawReader.cs
new file mode 100644
index 00000000000..4abab099442
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/IChunkRawReader.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+
+namespace KurrentDB.Core.TransactionLog.Chunks;
+
+public interface IChunkRawReader : IDisposable {
+	Stream Stream { get; }
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/IChunkRegistry.cs b/src/KurrentDB.Core/TransactionLog/Chunks/IChunkRegistry.cs
new file mode 100644
index 00000000000..869294cd28b
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/IChunkRegistry.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+namespace KurrentDB.Core.TransactionLog.Chunks;
+
+public interface IChunkRegistry<out TChunk>
+	where TChunk : class, IChunkBlob {
+
+	// unsafe means that the returned chunk might not be initialized
+	TChunk UnsafeTryGetChunkFor(long logPosition);
+
+	TChunk UnsafeGetChunk(int chunkNum);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/ITFChunkScavengerLog.cs b/src/KurrentDB.Core/TransactionLog/Chunks/ITFChunkScavengerLog.cs
new file mode 100644
index 00000000000..e18fd30d71a
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/ITFChunkScavengerLog.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Index;
+
+namespace KurrentDB.Core.TransactionLog.Chunks;
+
+public interface ITFChunkScavengerLog : IIndexScavengerLog {
+	string ScavengeId { get; }
+
+	long SpaceSaved { get; }
+
+	void ScavengeStarted();
+
+	void ScavengeStarted(bool alwaysKeepScavenged, bool mergeChunks, int startFromChunk, int threads);
+
+	void ChunksScavenged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, long spaceSaved);
+
+	void ChunksNotScavenged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, string errorMessage);
+
+	void ChunksMerged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, long spaceSaved);
+
+	void ChunksNotMerged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, string errorMessage);
+
+	void ScavengeCompleted(ScavengeResult result, string error, TimeSpan elapsed);
+}
+
+public enum ScavengeResult {
+	Success,
+	Stopped,
+	Errored,
+	Interrupted,
+}
+
+public enum LastScavengeResult {
+	Unknown,
+	InProgress,
+	Success,
+	Stopped,
+	Errored,
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/ITFChunkScavengerLogManager.cs b/src/KurrentDB.Core/TransactionLog/Chunks/ITFChunkScavengerLogManager.cs
new file mode 100644
index 00000000000..510e12f1293
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/ITFChunkScavengerLogManager.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.TransactionLog.Chunks;
+
+public interface ITFChunkScavengerLogManager {
+	void Initialise();
+
+	ITFChunkScavengerLog CreateLog();
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/ArchiveStorageReaderExtensions.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/ArchiveStorageReaderExtensions.cs
new file mode 100644
index 00000000000..ac2fb030f68
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/ArchiveStorageReaderExtensions.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Archive.Storage;
+
+namespace KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+public static class ArchiveStorageReaderExtensions {
+	public static ValueTask<IChunkHandle> OpenForReadAsync(this IArchiveStorageReader self, int chunkNumber, CancellationToken token) =>
+		ArchivedChunkHandle.OpenForReadAsync(self, chunkNumber, token);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/BulkReadResult.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/BulkReadResult.cs
new file mode 100644
index 00000000000..f6c29ca5f63
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/BulkReadResult.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+public struct BulkReadResult {
+	public readonly int OldPosition;
+	public readonly int BytesRead;
+	public readonly bool IsEOF;
+
+	public BulkReadResult(int oldPosition, int bytesRead, bool isEof) {
+		OldPosition = oldPosition;
+		BytesRead = bytesRead;
+		IsEOF = isEof;
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/ChunkFileHandle.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/ChunkFileHandle.cs
new file mode 100644
index 00000000000..c78a0b0d107
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/ChunkFileHandle.cs
@@ -0,0 +1,134 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext;
+using Microsoft.Win32.SafeHandles;
+
+namespace KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+file sealed class SynchronousChunkFileHandle(string path, FileStreamOptions options) : ChunkFileHandle(path, options) {
+	public override ValueTask WriteAsync(ReadOnlyMemory<byte> data, long offset, CancellationToken token) {
+		var ret = ValueTask.CompletedTask;
+		if (token.IsCancellationRequested) {
+			ret = ValueTask.FromCanceled(token);
+		} else {
+			try {
+				Write(data.Span, offset);
+			} catch (Exception ex) {
+				ret = ValueTask.FromException(ex);
+			}
+		}
+		return ret;
+	}
+
+	public override ValueTask<int> ReadAsync(Memory<byte> buffer, long offset, CancellationToken token) {
+		ValueTask<int> ret;
+		if (token.IsCancellationRequested) {
+			ret = ValueTask.FromCanceled<int>(token);
+		} else {
+			try {
+				ret = new(Read(buffer.Span, offset));
+			} catch (Exception ex) {
+				ret = ValueTask.FromException<int>(ex);
+			}
+		}
+		return ret;
+	}
+}
+
+file sealed class AsynchronousChunkFileHandle(string path, FileStreamOptions options) : ChunkFileHandle(path, options) {
+	public override ValueTask WriteAsync(ReadOnlyMemory<byte> data, long offset, CancellationToken token) =>
+		RandomAccess.WriteAsync(_handle, data, offset, token);
+
+	public override ValueTask<int> ReadAsync(Memory<byte> buffer, long offset, CancellationToken token) =>
+		RandomAccess.ReadAsync(_handle, buffer, offset, token);
+}
+
+internal abstract class ChunkFileHandle : Disposable, IChunkHandle {
+	public static bool AsynchronousByDefault { get; set; } = false;
+
+	public static FileOptions DefaultFileOptions => AsynchronousByDefault
+		? FileOptions.Asynchronous
+		: FileOptions.None;
+
+	protected readonly SafeFileHandle _handle;
+	private readonly string _path;
+
+	protected ChunkFileHandle(string path, FileStreamOptions options) {
+		Debug.Assert(options is not null);
+		Debug.Assert(path is { Length: > 0 });
+
+		_handle = File.OpenHandle(path, options.Mode, options.Access, options.Share, options.Options,
+			options.PreallocationSize);
+		Access = options.Access;
+		_path = path;
+	}
+
+	public static ChunkFileHandle Create(string path, FileStreamOptions options) =>
+		options.Options.HasFlag(FileOptions.Asynchronous)
+			? new AsynchronousChunkFileHandle(path, options)
+			: new SynchronousChunkFileHandle(path, options);
+
+	internal static FileOptions ConvertToFileOptions(
+		IChunkFileSystem.ReadOptimizationHint optimizationHint) {
+
+		var flags = optimizationHint switch {
+			IChunkFileSystem.ReadOptimizationHint.RandomAccess => FileOptions.RandomAccess,
+			IChunkFileSystem.ReadOptimizationHint.SequentialScan => FileOptions.SequentialScan,
+			_ => FileOptions.None,
+		};
+
+		return flags | DefaultFileOptions;
+	}
+
+	// UnbufferedStreamWithSync makes use of the synchronous Read/Write methods on the handle only
+	// when the synchronous Read/Write methods of the stream are called.
+	// It is suitable regardless of the value of _asynchronous
+	Stream IChunkHandle.CreateStream(bool leaveOpen) => new UnbufferedStreamWithSync(this, leaveOpen);
+
+	private sealed class UnbufferedStreamWithSync(ChunkFileHandle handle, bool leaveOpen)
+		: IChunkHandle.UnbufferedStream(handle, leaveOpen) {
+
+		public override bool CanTimeout => false;
+
+		protected override void Write(ReadOnlySpan<byte> buffer, long offset) =>
+			handle.Write(buffer, offset);
+
+		protected override int Read(Span<byte> buffer, long offset) =>
+			handle.Read(buffer, offset);
+	}
+
+	public string Name => _path;
+
+	public void Flush() => RandomAccess.FlushToDisk(_handle);
+
+	public abstract ValueTask WriteAsync(ReadOnlyMemory<byte> data, long offset, CancellationToken token);
+
+	public abstract ValueTask<int> ReadAsync(Memory<byte> buffer, long offset, CancellationToken token);
+
+	protected void Write(ReadOnlySpan<byte> data, long offset) =>
+		RandomAccess.Write(_handle, data, offset);
+
+	protected int Read(Span<byte> buffer, long offset) =>
+		RandomAccess.Read(_handle, buffer, offset);
+
+	public long Length {
+		get => RandomAccess.GetLength(_handle);
+		set => RandomAccess.SetLength(_handle, value);
+	}
+
+	public FileAccess Access { get; }
+
+	protected override void Dispose(bool disposing) {
+		if (disposing) {
+			_handle.Dispose();
+		}
+
+		base.Dispose(disposing);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/ChunkLocalFileSystem.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/ChunkLocalFileSystem.cs
new file mode 100644
index 00000000000..86efcfda288
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/ChunkLocalFileSystem.cs
@@ -0,0 +1,162 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.TransactionLog.FileNamingStrategy;
+
+namespace KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+public sealed class ChunkLocalFileSystem : IChunkFileSystem {
+	private readonly VersionedPatternFileNamingStrategy _strategy;
+
+	public ChunkLocalFileSystem(VersionedPatternFileNamingStrategy namingStrategy) {
+		_strategy = namingStrategy;
+	}
+
+	public ChunkLocalFileSystem(string path, string chunkFilePrefix = "chunk-")
+		: this(new(path, chunkFilePrefix)) {
+	}
+
+	public IVersionedFileNamingStrategy LocalNamingStrategy => _strategy;
+
+	// is used from tests only
+	public Func<string, int, int, CancellationToken, ValueTask<int>> ChunkNumberProvider {
+		get;
+		init;
+	}
+
+	public ValueTask<IChunkHandle> OpenForReadAsync(string fileName, IChunkFileSystem.ReadOptimizationHint hint, CancellationToken token) {
+		ValueTask<IChunkHandle> task;
+		try {
+			var options = new FileStreamOptions {
+				Mode = FileMode.Open,
+				Access = FileAccess.Read,
+				Share = FileShare.ReadWrite,
+				Options = ChunkFileHandle.ConvertToFileOptions(hint),
+			};
+
+			task = new(ChunkFileHandle.Create(fileName, options));
+		} catch (FileNotFoundException) {
+			task = ValueTask.FromException<IChunkHandle>(
+				new CorruptDatabaseException(new ChunkNotFoundException(fileName)));
+		} catch (Exception e) {
+			task = ValueTask.FromException<IChunkHandle>(e);
+		}
+
+		return task;
+	}
+
+	public bool IsRemote(string locator) => false;
+
+	public ValueTask SetReadOnlyAsync(string fileName, bool value, CancellationToken token) {
+		ValueTask task;
+		if (token.IsCancellationRequested) {
+			task = ValueTask.FromCanceled(token);
+		} else {
+			task = ValueTask.CompletedTask;
+			try {
+				SetReadOnly(fileName, value);
+			} catch (Exception e) {
+				task = ValueTask.FromException(e);
+			}
+		}
+
+		return task;
+	}
+
+	private static void SetReadOnly(string fileName, bool value) {
+		var flags = value
+			? FileAttributes.ReadOnly | FileAttributes.NotContentIndexed
+			: FileAttributes.NotContentIndexed;
+
+		if (OperatingSystem.IsWindows()) {
+			try {
+				File.SetAttributes(fileName, flags);
+			} catch (UnauthorizedAccessException) {
+				// suppress exception
+			}
+		} else {
+			File.SetAttributes(fileName, flags);
+		}
+	}
+
+	public IChunkFileSystem.IChunkEnumerable GetChunks()
+		=> new TFChunkEnumerable(this) { ChunkNumberProvider = ChunkNumberProvider };
+
+	private sealed class TFChunkEnumerable(ChunkLocalFileSystem fileSystem)
+		: Dictionary<string, int>, IChunkFileSystem.IChunkEnumerable {
+		private string[] _allFiles;
+		private readonly Func<string, int, int, CancellationToken, ValueTask<int>> _chunkNumberProvider;
+
+		public required Func<string, int, int, CancellationToken, ValueTask<int>> ChunkNumberProvider {
+			init => _chunkNumberProvider = value ?? GetNextChunkNumber;
+		}
+
+		public int LastChunkNumber { get; set; }
+
+		public async IAsyncEnumerator<TFChunkInfo> GetAsyncEnumerator(CancellationToken token = default) {
+			if (_allFiles is null) {
+				var allFiles = fileSystem._strategy.GetAllPresentFiles();
+				Array.Sort(allFiles, StringComparer.CurrentCultureIgnoreCase);
+				_allFiles = allFiles;
+			}
+
+			int expectedChunkNumber = 0;
+			for (int i = 0; i < _allFiles.Length; i++) {
+				var chunkFileName = _allFiles[i];
+				var chunkNumber = fileSystem._strategy.GetIndexFor(Path.GetFileName(_allFiles[i]));
+				var nextChunkNumber = -1;
+				if (i + 1 < _allFiles.Length)
+					nextChunkNumber = fileSystem._strategy.GetIndexFor(Path.GetFileName(_allFiles[i + 1]));
+
+				if (chunkNumber < expectedChunkNumber) {
+					// present in an earlier, merged, chunk
+					yield return new OldVersion(chunkFileName, chunkNumber);
+					continue;
+				}
+
+				if (chunkNumber > expectedChunkNumber) {
+					// one or more chunks are missing
+					for (int j = expectedChunkNumber; j < chunkNumber; j++) {
+						yield return new MissingVersion(fileSystem._strategy.GetFilenameFor(j, 0), j);
+					}
+
+					// set the expected chunk number to prevent calling onFileMissing() again for the same chunk numbers
+					expectedChunkNumber = chunkNumber;
+				}
+
+				if (chunkNumber == nextChunkNumber) {
+					// there is a newer version of this chunk
+					yield return new OldVersion(chunkFileName, chunkNumber);
+				} else {
+					// latest version of chunk with the expected chunk number
+					expectedChunkNumber = await _chunkNumberProvider(chunkFileName, chunkNumber,
+						fileSystem._strategy.GetVersionFor(Path.GetFileName(chunkFileName)), token);
+					yield return new LatestVersion(chunkFileName, chunkNumber, expectedChunkNumber - 1);
+				}
+			}
+
+			for (int i = expectedChunkNumber; i <= LastChunkNumber; i++) {
+				yield return new MissingVersion(fileSystem._strategy.GetFilenameFor(i, 0), i);
+			}
+		}
+
+		private async ValueTask<int> GetNextChunkNumber(string chunkFileName, int chunkNumber, int chunkVersion, CancellationToken token) {
+			if (chunkVersion is 0)
+				return chunkNumber + 1;
+
+			// we only cache next chunk numbers for chunks having a non-zero version
+			if (TryGetValue(chunkFileName, out var nextChunkNumber))
+				return nextChunkNumber;
+
+			var header = await fileSystem.ReadHeaderAsync(chunkFileName, token);
+			this[chunkFileName] = header.ChunkEndNumber + 1;
+			return header.ChunkEndNumber + 1;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/FileSystemWithArchive.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/FileSystemWithArchive.cs
new file mode 100644
index 00000000000..319d867b3e5
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/FileSystemWithArchive.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Archive.Storage;
+using KurrentDB.Core.TransactionLog.FileNamingStrategy;
+
+namespace KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+// Adds archive storage to a filesystem.
+public sealed class FileSystemWithArchive : IChunkFileSystem {
+	private readonly int _chunkSize;
+	private readonly ILocatorCodec _locatorCodec;
+	private readonly IChunkFileSystem _localFileSystem;
+	private readonly IArchiveStorageReader _archive;
+
+	public FileSystemWithArchive(
+		int chunkSize,
+		ILocatorCodec locatorCodec,
+		IChunkFileSystem localFileSystem,
+		IArchiveStorageReader archive) {
+
+		_chunkSize = chunkSize;
+		_locatorCodec = locatorCodec;
+		_localFileSystem = localFileSystem;
+		_archive = archive;
+	}
+
+	public IVersionedFileNamingStrategy LocalNamingStrategy =>
+		_localFileSystem.LocalNamingStrategy;
+
+	public ValueTask<IChunkHandle> OpenForReadAsync(string locator, IChunkFileSystem.ReadOptimizationHint hint,
+		CancellationToken token) {
+		return _locatorCodec.Decode(locator, out var chunkNumber, out var fileName)
+			? _archive.OpenForReadAsync(chunkNumber, token)
+			: _localFileSystem.OpenForReadAsync(fileName, hint, token);
+	}
+
+	public bool IsRemote(string locator) =>
+		_locatorCodec.Decode(locator, out _, out _);
+
+	public ValueTask SetReadOnlyAsync(string locator, bool value, CancellationToken token) {
+		return _locatorCodec.Decode(locator, out _, out var fileName)
+			? ValueTask.CompletedTask
+			: _localFileSystem.SetReadOnlyAsync(fileName, value, token);
+	}
+
+	public IChunkFileSystem.IChunkEnumerable GetChunks() {
+		return new ChunkEnumerableWithArchive(this);
+	}
+
+	sealed class ChunkEnumerableWithArchive(FileSystemWithArchive fileSystem) : IChunkFileSystem.IChunkEnumerable {
+		private readonly IChunkFileSystem.IChunkEnumerable _localChunks = fileSystem._localFileSystem.GetChunks();
+
+		public int LastChunkNumber {
+			get => _localChunks.LastChunkNumber;
+			set => _localChunks.LastChunkNumber = value;
+		}
+
+		public async IAsyncEnumerator<TFChunkInfo> GetAsyncEnumerator(CancellationToken token = default) {
+			var archiveCheckpoint = await fileSystem._archive.GetCheckpoint(token);
+			var firstChunkNotInArchive = (int)(archiveCheckpoint / fileSystem._chunkSize);
+
+			await foreach (var chunkInfo in _localChunks.WithCancellation(token)) {
+				switch (chunkInfo) {
+					// replace missing local versions with latest from archive if they
+					// are present there
+					case MissingVersion(_, var chunkNumber) when (chunkNumber < firstChunkNotInArchive): {
+						var fileName = fileSystem._locatorCodec.EncodeRemote(chunkNumber);
+						yield return new LatestVersion(fileName, chunkNumber, chunkNumber);
+						break;
+					}
+
+					default:
+						yield return chunkInfo;
+						break;
+				}
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/IChunkBlob.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/IChunkBlob.cs
new file mode 100644
index 00000000000..46d7ba69c28
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/IChunkBlob.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+/// <summary>
+/// Interprets database chunk as a blob.
+/// </summary>
+public interface IChunkBlob : IDisposable {
+	string ChunkLocator { get; }
+
+	ValueTask<IChunkRawReader> AcquireRawReader(CancellationToken token);
+
+	IAsyncEnumerable<IChunkBlob> UnmergeAsync(CancellationToken token);
+
+	void MarkForDeletion();
+
+	ValueTask EnsureInitialized(CancellationToken token);
+
+	ChunkHeader ChunkHeader { get; }
+
+	ChunkFooter ChunkFooter { get; }
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/IChunkFileSystem.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/IChunkFileSystem.cs
new file mode 100644
index 00000000000..846b40c6498
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/IChunkFileSystem.cs
@@ -0,0 +1,79 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Buffers;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.TransactionLog.FileNamingStrategy;
+using Serilog;
+
+namespace KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+// Chunks can be stored in different locations (say, archive vs local) but the access still goes through
+// one implementation of this interface. That implementation can compose more than one implementation
+// of IBlobFileSystem interface and act as a proxy
+public interface IChunkFileSystem {
+	ValueTask<IChunkHandle> OpenForReadAsync(string locator, ReadOptimizationHint hint, CancellationToken token);
+
+	ValueTask SetReadOnlyAsync(string locator, bool value, CancellationToken token);
+
+	// do not use for chunks that may be remote
+	IVersionedFileNamingStrategy LocalNamingStrategy { get; }
+
+	// Remote means not local. It could be in any remote tier of storage, not necessarily the archive.
+	// (although at the moment the archive is the only remote tier)
+	bool IsRemote(string locator);
+
+	IChunkEnumerable GetChunks();
+
+	public interface IChunkEnumerable : IAsyncEnumerable<TFChunkInfo> {
+		// It is not a filter/limit, it is used to spot missing chunks
+		int LastChunkNumber { get; set; }
+	}
+
+	// it's not a flag enum
+	public enum ReadOptimizationHint {
+		None = 0,
+		RandomAccess = 1,
+		SequentialScan = 2,
+	}
+}
+
+public static class ChunkFileSystem {
+	private static readonly ILogger Logger = Log.ForContext(typeof(ChunkFileSystem));
+	public static async ValueTask<ChunkHeader> ReadHeaderAsync(this IChunkFileSystem fileSystem, string fileName, CancellationToken token) {
+		if (fileSystem.IsRemote(fileName))
+			Logger.Warning("Reading remote chunk header. This is OK but should be uncommon");
+
+		using var handle = await fileSystem.OpenForReadAsync(fileName, IChunkFileSystem.ReadOptimizationHint.None, token);
+
+		var length = handle.Length;
+		if (length < ChunkFooter.Size + ChunkHeader.Size) {
+			throw new CorruptDatabaseException(new BadChunkInDatabaseException(
+				$"Chunk file '{fileName}' is bad. It does not have enough size for header and footer. File size is {length} bytes."));
+		}
+
+		using var buffer = Memory.AllocateExactly<byte>(ChunkHeader.Size);
+		await handle.ReadAsync(buffer.Memory, offset: 0, token);
+		return new(buffer.Span);
+	}
+
+	public static async ValueTask<ChunkFooter> ReadFooterAsync(this IChunkFileSystem fileSystem, string fileName, CancellationToken token) {
+		if (fileSystem.IsRemote(fileName))
+			Logger.Warning("Reading remote chunk footer. This is OK but should be uncommon");
+
+		using var handle = await fileSystem.OpenForReadAsync(fileName, IChunkFileSystem.ReadOptimizationHint.None, token);
+
+		var length = handle.Length;
+		if (length < ChunkFooter.Size + ChunkHeader.Size) {
+			throw new CorruptDatabaseException(new BadChunkInDatabaseException(
+				$"Chunk file '{fileName}' is bad. It does not have enough size for header and footer. File size is {length} bytes."));
+		}
+
+		using var buffer = Memory.AllocateExactly<byte>(ChunkFooter.Size);
+		await handle.ReadAsync(buffer.Memory, length - ChunkFooter.Size, token);
+		return new(buffer.Span);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/IChunkHandle.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/IChunkHandle.cs
new file mode 100644
index 00000000000..bb6187aadfd
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/IChunkHandle.cs
@@ -0,0 +1,162 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext;
+using DotNext.Buffers;
+using DotNext.IO;
+using DotNext.Threading.Tasks;
+using Serilog;
+
+namespace KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+/// <summary>
+/// Represents a handle to access the underlying chunk physical storage.
+/// </summary>
+public interface IChunkHandle : IFlushable, IDisposable {
+
+	ValueTask WriteAsync(ReadOnlyMemory<byte> data, long offset, CancellationToken token);
+
+	ValueTask<int> ReadAsync(Memory<byte> buffer, long offset, CancellationToken token);
+
+	/// <summary>
+	/// Gets or sets the length of the data represented by this handle, in bytes.
+	/// </summary>
+	long Length {
+		get;
+		set;
+	}
+
+	string Name { get; }
+
+	/// <summary>
+	/// Gets access mode for this handle.
+	/// </summary>
+	FileAccess Access { get; }
+
+	/// <summary>
+	/// Creates an unbuffered stream for this handle.
+	/// </summary>
+	/// <returns>The unbuffered stream for this handle.</returns>
+	Stream CreateStream(bool leaveOpen = true) => CreateStream(this, leaveOpen, 60_000);
+
+	protected static Stream CreateStream(IChunkHandle handle, bool leaveOpen, int synchronousTimeout)
+		=> new UnbufferedStream(handle, leaveOpen) { ReadTimeout = synchronousTimeout, WriteTimeout = synchronousTimeout };
+
+	private protected class UnbufferedStream(IChunkHandle handle, bool leaveOpen) : RandomAccessStream {
+		private int _readTimeout, _writeTimeout;
+		private CancellationTokenSource _timeoutSource;
+
+		public sealed override void Flush() => handle.Flush();
+
+		public sealed override void SetLength(long value) => handle.Length = value;
+
+		public sealed override bool CanRead => handle.Access.HasFlag(FileAccess.Read);
+
+		public sealed override bool CanSeek => true;
+
+		public sealed override bool CanWrite => handle.Access.HasFlag(FileAccess.Write);
+
+		public override bool CanTimeout => true;
+
+		public sealed override int WriteTimeout {
+			get => _writeTimeout;
+			set => _writeTimeout =
+				value >= Timeout.Infinite ? value : throw new ArgumentOutOfRangeException(nameof(value));
+		}
+
+		public sealed override int ReadTimeout {
+			get => _readTimeout;
+			set => _readTimeout =
+				value >= Timeout.Infinite ? value : throw new ArgumentOutOfRangeException(nameof(value));
+		}
+
+		public sealed override long Length => handle.Length;
+
+		protected override void Write(ReadOnlySpan<byte> buffer, long offset) {
+			// leave fast without sync over async
+			if (buffer.IsEmpty)
+				return;
+
+			// Do sync over async without any optimizations to make it just works.
+			// In practice, no one should call synchronous write
+			var bufferCopy = buffer.Copy();
+			var timeoutToken = GetTimeoutToken(WriteTimeout);
+			var task = WriteAsync(bufferCopy.Memory, offset, timeoutToken);
+			try {
+				task.Wait();
+			} catch (OperationCanceledException canceledEx) when (canceledEx.CancellationToken == timeoutToken) {
+				throw new TimeoutException(canceledEx.Message, canceledEx);
+			} finally {
+				ResetTimeout();
+				bufferCopy.Dispose();
+			}
+
+			// This synchronous Write implementation exists because it is hard to be sure that it is
+			// never called. Quite a few synchronous stream operations can call synchronous write under
+			// the hood (e.g. SetLength). We want to be sure that these are at least not called
+			// routinely, because it is inefficient.
+			Log.Warning("Synchronous writes should be uncommon. Handle: {Handle}", handle.Name);
+		}
+
+
+		protected override ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, long offset, CancellationToken token)
+			=> handle.WriteAsync(buffer, offset, token);
+
+		protected override int Read(Span<byte> buffer, long offset) {
+			// leave fast without sync over async
+			int bytesRead;
+			if (buffer.IsEmpty) {
+				bytesRead = 0;
+			} else {
+				// Do sync over async without any optimizations to make it just works.
+				// In practice, no one should call synchronous write
+				var bufferCopy = Memory.AllocateExactly<byte>(buffer.Length);
+				var timeoutToken = GetTimeoutToken(ReadTimeout);
+				var task = ReadAsync(bufferCopy.Memory, offset, timeoutToken);
+				try {
+					bytesRead = task.Wait();
+					bufferCopy.Span.Slice(0, bytesRead).CopyTo(buffer);
+				} catch (OperationCanceledException canceledEx) when (canceledEx.CancellationToken == timeoutToken) {
+					throw new TimeoutException(canceledEx.Message, canceledEx);
+				} finally {
+					ResetTimeout();
+					bufferCopy.Dispose();
+				}
+			}
+
+			Log.Warning("Synchronous reads should be uncommon. Handle: {Handle}", handle.Name);
+			return bytesRead;
+		}
+
+		protected override ValueTask<int> ReadAsync(Memory<byte> buffer, long offset, CancellationToken token)
+			=> handle.ReadAsync(buffer, offset, token);
+
+		private CancellationToken GetTimeoutToken(int timeout) {
+			_timeoutSource ??= new();
+			_timeoutSource.CancelAfter(timeout);
+			return _timeoutSource.Token;
+		}
+
+		private void ResetTimeout() {
+			// attempt to reuse the token source to avoid extra memory allocation
+			if (!_timeoutSource.TryReset()) {
+				_timeoutSource.Dispose();
+				_timeoutSource = null;
+			}
+		}
+
+		protected override void Dispose(bool disposing) {
+			if (disposing) {
+				_timeoutSource?.Dispose();
+				if (!leaveOpen)
+					handle.Dispose();
+			}
+
+			base.Dispose(disposing);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/ILocatorCodec.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/ILocatorCodec.cs
new file mode 100644
index 00000000000..90838e1681d
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/ILocatorCodec.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+// This is intended to be used within IChunkFileSystem only, to avoid leaking details of which
+// chunks are remote and which are local.
+public interface ILocatorCodec {
+	string EncodeLocal(string fileName);
+	string EncodeRemote(int chunkNumber);
+
+	// returns false => fileName is set (local)
+	// returns true => chunkNumber is set (remote)
+	bool Decode(string locator, out int chunkNumber, out string fileName);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/PosMap.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/PosMap.cs
new file mode 100644
index 00000000000..bd4b1b04f4d
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/PosMap.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Buffers.Binary;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using DotNext.Buffers;
+using DotNext.Buffers.Binary;
+
+namespace KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+[StructLayout(LayoutKind.Auto)]
+public readonly struct PosMap : IBinaryFormattable<PosMap> {
+	public const int FullSize = sizeof(long) + sizeof(int);
+	public const int DeprecatedSize = sizeof(int) + sizeof(int);
+
+	public readonly long LogPos;
+	public readonly int ActualPos;
+
+	public PosMap(long logPos, int actualPos) {
+		LogPos = logPos;
+		ActualPos = actualPos;
+	}
+
+	// for new format only
+	public PosMap(ReadOnlySpan<byte> source) {
+		Debug.Assert(source.Length >= FullSize);
+
+		SpanReader<byte> reader = new(source);
+		ActualPos = reader.ReadLittleEndian<int>();
+		LogPos = reader.ReadLittleEndian<long>();
+	}
+
+	static int IBinaryFormattable<PosMap>.Size => FullSize;
+
+	static PosMap IBinaryFormattable<PosMap>.Parse(ReadOnlySpan<byte> source)
+		=> FromNewFormat(source);
+
+	public static PosMap FromNewFormat(ReadOnlySpan<byte> source)
+		=> new(source);
+
+	public static PosMap FromOldFormat(ReadOnlySpan<byte> source) {
+		var posmap = BinaryPrimitives.ReadUInt64LittleEndian(source);
+		var logPos = (int)(posmap >>> 32);
+		var actualPos = (int)(posmap & 0xFFFFFFFF);
+		return new(logPos, actualPos);
+	}
+
+	public readonly void Format(Span<byte> destination) {
+		SpanWriter<byte> writer = new(destination);
+		writer.WriteLittleEndian(ActualPos);
+		writer.WriteLittleEndian(LogPos);
+	}
+
+	public readonly override string ToString() => $"LogPos: {LogPos}, ActualPos: {ActualPos}";
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/PrefixingLocatorCodec.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/PrefixingLocatorCodec.cs
new file mode 100644
index 00000000000..c8fb63844c8
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/PrefixingLocatorCodec.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+// Prefixes remote chunks. Leaves local chunks as-is
+public class PrefixingLocatorCodec : ILocatorCodec {
+	const string RemotePrefix = "archived-chunk-";
+
+	private readonly int _remotePrefixLength = RemotePrefix.Length;
+
+	public string EncodeLocal(string fileName) => fileName;
+
+	public string EncodeRemote(int chunkNumber) => $"{RemotePrefix}{chunkNumber}";
+
+	public bool Decode(string locator, out int chunkNumber, out string fileName) {
+		if (locator.StartsWith(RemotePrefix)) {
+			// remote
+			chunkNumber = int.Parse(locator[_remotePrefixLength..]);
+			fileName = default;
+			return true;
+		}
+
+		// local
+		fileName = locator;
+		chunkNumber = default;
+		return false;
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/ReaderWorkItem.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/ReaderWorkItem.cs
new file mode 100644
index 00000000000..2a3075d0c57
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/ReaderWorkItem.cs
@@ -0,0 +1,95 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using DotNext;
+using DotNext.Buffers;
+using DotNext.IO;
+using EventStore.Plugins.Transforms;
+using static DotNext.Runtime.Intrinsics;
+
+namespace KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+internal sealed class ReaderWorkItem : Disposable {
+	private const int BufferSize = 8192;
+
+	// if item was taken from the pool, the field contains position within the array (>= 0)
+	private readonly int _positionInPool = -1;
+	public readonly ChunkDataReadStream BaseStream;
+	private readonly bool _leaveOpen;
+	private readonly IBufferedReader _cachedReader;
+
+	private ReaderWorkItem(ChunkDataReadStream stream, bool leaveOpen) {
+		Debug.Assert(stream is not null);
+
+		_leaveOpen = leaveOpen;
+		BaseStream = stream;
+
+		// Access to the internal buffer of 'PoolingBufferedStream' is only allowed
+		// when the top-level stream doesn't perform any transformations. Otherwise,
+		// the buffer contains untransformed bytes that cannot be accessed directly.
+		_cachedReader = IsExactTypeOf<ChunkDataReadStream>(stream)
+						&& stream.ChunkFileStream is PoolingBufferedStream bufferedStream
+			? bufferedStream
+			: null;
+	}
+
+	public ReaderWorkItem(Stream sharedStream, IChunkReadTransform chunkReadTransform)
+		: this(CreateTransformedMemoryStream(sharedStream, chunkReadTransform), leaveOpen: true) {
+		IsMemory = true;
+		Source = ITransactionFileTracker.Source.ChunkCache;
+	}
+
+	public ReaderWorkItem(IChunkHandle handle, IChunkReadTransform chunkReadTransform, bool isRemoteChunk)
+		: this(CreateTransformedFileStream(handle, chunkReadTransform), leaveOpen: false) {
+		IsMemory = false;
+		Source = isRemoteChunk
+			? ITransactionFileTracker.Source.Archive
+			: ITransactionFileTracker.Source.FileSystem;
+	}
+
+	private static ChunkDataReadStream CreateTransformedMemoryStream(Stream memStream, IChunkReadTransform chunkReadTransform) {
+		return chunkReadTransform.TransformData(new ChunkDataReadStream(memStream));
+	}
+
+	private static ChunkDataReadStream CreateTransformedFileStream(IChunkHandle handle,
+		IChunkReadTransform chunkReadTransform) {
+		var fileStream = new PoolingBufferedStream(handle.CreateStream()) { MaxBufferSize = BufferSize };
+		return chunkReadTransform.TransformData(new ChunkDataReadStream(fileStream));
+	}
+
+	public bool IsMemory { get; }
+
+	public ITransactionFileTracker.Source Source { get; }
+
+	public int PositionInPool {
+		get => _positionInPool;
+		init {
+			Debug.Assert(value >= 0);
+
+			_positionInPool = value;
+		}
+	}
+
+	internal IBufferedReader TryGetBufferedReader(int length, out ReadOnlyMemory<byte> buffer) {
+		if (_cachedReader is { } reader) {
+			buffer = reader.Buffer.TrimLength(length);
+		} else {
+			buffer = ReadOnlyMemory<byte>.Empty;
+			reader = null;
+		}
+
+		return buffer.Length >= length ? reader : null;
+	}
+
+	protected override void Dispose(bool disposing) {
+		if (disposing) {
+			if (!_leaveOpen)
+				BaseStream.Dispose();
+		}
+
+		base.Dispose(disposing);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/TFChunk.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/TFChunk.cs
new file mode 100644
index 00000000000..1a0b66d9f2f
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/TFChunk.cs
@@ -0,0 +1,1803 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Security.Cryptography;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Buffers;
+using DotNext.Collections.Concurrent;
+using DotNext.Diagnostics;
+using DotNext.IO;
+using DotNext.Threading;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.TransactionLog.Scavenging.DbAccess;
+using KurrentDB.Core.Transforms;
+using KurrentDB.Core.Transforms.Identity;
+using KurrentDB.Core.Util;
+using static System.Threading.Timeout;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+// Exception handling strategy on write: we generally do not attempt to recover from exceptions on write,
+// and instead leave the objects in an invalid state. The intention is that these should only be thrown
+// in catastrophic scenarios such as disk failure. The originator of the call takes suitable action:
+// typically shutdown the server (e.g. StorageWriter) or abandoning the chunk (e.g. Scavenge).
+//
+// If a CancellationToken we are passed is cancelled, we follow the normal practice and are allowed to
+// throw, but not if it would leave the object in an invalid state. It is up to the caller to not cancel
+// the call if doing so would cause the caller to shutdown the server.
+public partial class TFChunk : IChunkBlob {
+	public enum ChunkVersions : byte {
+		OriginalNotUsed = 1,
+		Unaligned = 2,
+		Aligned = 3,
+		Transformed = 4,
+	}
+
+	public const byte CurrentChunkVersion = (byte)ChunkVersions.Transformed;
+	private const int AlignmentSize = 4096;
+
+	private static readonly ILogger Log = Serilog.Log.ForContext<TFChunk>();
+
+	public bool IsReadOnly {
+		[InitializationNotRequired]
+		get { return Interlocked.CompareExchange(ref _isReadOnly, 0, 0) == 1; }
+		private set { Interlocked.Exchange(ref _isReadOnly, value ? 1 : 0); }
+	}
+
+	public bool IsCached {
+		[InitializationNotRequired]
+		get { return _cacheStatus is CacheStatus.Cached; }
+	}
+
+	public bool IsUncached {
+		[InitializationNotRequired]
+		get { return _cacheStatus is CacheStatus.Uncached; }
+	}
+
+	[MemberNotNullWhen(true, nameof(_chunkHeader))]
+	public bool Initialized {
+		[InitializationNotRequired]
+		get => _lazyInitArgs is null;
+	}
+
+	public bool IsRemote { [InitializationNotRequired] get; }
+
+	// the logical size of (untransformed) data (could be > PhysicalDataSize if scavenged chunk)
+	public long LogicalDataSize {
+		get {
+			ThrowIfNotInitialized();
+			return Interlocked.Read(ref _logicalDataSize);
+		}
+	}
+
+	// the physical size of (untransformed) data
+	public int PhysicalDataSize {
+		get {
+			ThrowIfNotInitialized();
+			return _physicalDataSize;
+		}
+	}
+
+	// This can be used to locate the chunk regardless of whether it is local or remote.
+	// The FileSystem abstraction can understand it, and so can the user.
+	public string ChunkLocator {
+		[InitializationNotRequired]
+		get => _filename;
+	}
+
+	// This can only be used when we know that the chunk is local.
+	// Generally ideally only the FileSystem abstraction should know whether the chunk is local or remote,
+	// so we want to minimise calls this this as we go, calling the FileSystem instead.
+	public string LocalFileName {
+		[InitializationNotRequired]
+		get => _filename;
+	}
+
+	public int FileSize {
+		get {
+			ThrowIfNotInitialized();
+			return _fileSize;
+		}
+	}
+
+	public ChunkHeader ChunkHeader {
+		get {
+			ThrowIfNotInitialized();
+			return _chunkHeader;
+		}
+	}
+
+	public ChunkFooter ChunkFooter {
+		get {
+			ThrowIfNotInitialized();
+			return _chunkFooter;
+		}
+	}
+
+	public ChunkInfo ChunkInfo {
+		[InitializationNotRequired]
+		get {
+			if (_lazyInitArgs is (ITransactionFileTracker, int startNumber))
+				return new() {
+					// only remote chunks are lazily initialized
+					// and all remote chunks have a range of 1.
+					ChunkStartNumber = startNumber,
+					ChunkEndNumber = startNumber,
+					IsRemote = true,
+				};
+
+			if (_chunkHeader is not null)
+				return new() {
+					ChunkStartNumber = _chunkHeader.ChunkStartNumber,
+					ChunkEndNumber = _chunkHeader.ChunkEndNumber,
+					IsRemote = IsRemote,
+				};
+
+			throw CreateNotInitializedException();
+		}
+	}
+
+	public ReadOnlyMemory<byte> TransformHeader {
+		get {
+			ThrowIfNotInitialized();
+			return _transformHeader;
+		}
+	}
+
+	private readonly int _midpointsDepth;
+
+	public int RawWriterPosition {
+		[InitializationNotRequired]
+		get {
+			return (int)(_writerWorkItem?.WorkingStream.Position
+				?? throw new InvalidOperationException(string.Format("TFChunk {0} is not in write mode.", ChunkLocator)));
+		}
+	}
+
+	private readonly bool _inMem;
+	private readonly string _filename;
+	private IChunkHandle _handle;
+	private int _fileSize;
+
+	// This field establishes happens-before relationship with _fileStreams as follows:
+	// if _isReadOnly is not 0, then _fileStreams fully initialized
+	private int _isReadOnly;
+	private ChunkHeader _chunkHeader;
+	private ChunkFooter _chunkFooter;
+
+	private ReaderWorkItemPool _fileStreams;
+	private ReaderWorkItemPool _memStreams;
+
+	// This field established happens-before relationship with _memStreams as follows:
+	// if _memStreams has at least one available item in the pool then _sharedMemStream != null
+	private Stream _sharedMemStream;
+	private int _fileStreamCount;
+	private int _memStreamCount;
+	private int _cleanedUpFileStreams;
+
+	private WriterWorkItem _writerWorkItem;
+	private long _logicalDataSize;
+	private volatile int _physicalDataSize;
+
+	// the lock protects all three parts of the caching process:
+	// CacheInMemory, UnCacheFromMemory and TryDestructMemStreams
+	// so that the variables _cacheStatus, _cachedData, and _cachedLength are synchronized by the lock,
+	// and so is the creation and removal of the mem readers.
+	// previously TryDestructMemStreams could run concurrently with CacheInMemory,
+	// potentially causing problems.
+	private readonly AsyncExclusiveLock _cachedDataLock = new();
+	private volatile nint _cachedData;
+	// When the chunk is Cached/Uncaching, _cachedDataTransformed indicates whether _cachedData has had the transformation applied
+	private bool _cachedDataTransformed;
+	private int _cachedLength;
+	private volatile CacheStatus _cacheStatus;
+
+	private enum CacheStatus {
+		// The default state.
+		// CacheInMemory can transition us to Cached
+		// invariants: _cachedData == IntPtr.Zero, _memStreamCount == 0
+		Uncached = 0,
+
+		// UnCacheFromMemory can transition us to Uncaching
+		// invariants: _cachedData != IntPtr.Zero, _memStreamCount > 0
+		Cached,
+
+		// TryDestructMemStreams can transition us to Uncached
+		// The chunk is still cached but the process of uncaching has been started by
+		// UnCacheFromMemory. We are waiting for readers to be returned.
+		// invariants: _cachedData != IntPtr.Zero, _memStreamCount > 0
+		Uncaching,
+	}
+
+	private readonly ManualResetEventSlim _destroyEvent = new(false);
+	private volatile bool _selfdestructin54321;
+	private volatile bool _deleteFile;
+	private readonly bool _unbuffered;
+	private readonly bool _writeThrough;
+
+	// Volatile flag signalling that initialization is complete. the flag is 'true' when set to null.
+	// Members marked with InitializationNotRequiredAttribute are considered as 'safe' to be called
+	// without EnsureInitialized.
+	private volatile ITuple _lazyInitArgs;
+
+	// https://learn.microsoft.com/en-US/troubleshoot/windows-server/application-management/operating-system-performance-degrades
+	private readonly bool _reduceFileCachePressure;
+	private readonly IChunkFileSystem _fileSystem;
+
+	private IChunkReadSide _readSide;
+
+	private readonly IGetChunkTransformFactory _getTransformFactory;
+	private IChunkTransform _transform;
+	private ReadOnlyMemory<byte> _transformHeader;
+
+	private TFChunk(string filename,
+		int midpointsDepth,
+		bool inMem,
+		bool unbuffered,
+		bool writethrough,
+		bool reduceFileCachePressure,
+		IChunkFileSystem fileSystem,
+		IGetChunkTransformFactory getTransformFactory) {
+		Ensure.NotNullOrEmpty(filename, "filename");
+		Ensure.Nonnegative(midpointsDepth, "midpointsDepth");
+
+		_filename = filename;
+		_midpointsDepth = midpointsDepth;
+		_inMem = inMem;
+		_unbuffered = unbuffered;
+		_writeThrough = writethrough;
+		_reduceFileCachePressure = reduceFileCachePressure;
+		_memStreams = new();
+		_fileStreams = new();
+		_fileSystem = fileSystem;
+		_getTransformFactory = getTransformFactory;
+
+		IsRemote = !_inMem && _fileSystem.IsRemote(ChunkLocator);
+
+		// Workaround: the lock is used by the finalizer. When the finalizer is called by .NET,
+		// the lock is already finalized (and Dispose is called) and cannot be used. To avoid that situation,
+		// we suppress the finalizer for the lock. Anyway, the lock doesn't hold any unmanaged resources.
+		GC.SuppressFinalize(_cachedDataLock);
+	}
+
+	~TFChunk() {
+		FreeCachedData();
+	}
+
+	private static InvalidOperationException CreateNotInitializedException([CallerMemberName] string memberName = "")
+		=> new($"The chunk is not yet initialized to access the member {memberName}. Call EnsureInitialized() first.");
+
+	[MemberNotNull(nameof(_chunkHeader))]
+	private void ThrowIfNotInitialized([CallerMemberName] string memberName = "") {
+		if (_lazyInitArgs is not null)
+			throw CreateNotInitializedException(memberName);
+	}
+
+	private static TFChunk FromCompletedFile(IChunkFileSystem fileSystem, string filename, bool unbufferedRead,
+		IGetChunkTransformFactory getTransformFactory, bool reduceFileCachePressure)
+		=> new(filename, TFConsts.MidpointsDepth, false, unbufferedRead, false, reduceFileCachePressure, fileSystem,
+			getTransformFactory);
+
+	// local or remote
+	public static async ValueTask<TFChunk> FromCompletedFile(IChunkFileSystem fileSystem, string filename,
+		bool verifyHash, bool unbufferedRead,
+		ITransactionFileTracker tracker, IGetChunkTransformFactory getTransformFactory,
+		bool reduceFileCachePressure, ChunkHeader header = null, ChunkFooter footer = null,
+		CancellationToken token = default) {
+
+		var chunk = FromCompletedFile(fileSystem, filename, unbufferedRead, getTransformFactory,
+			reduceFileCachePressure);
+
+		try {
+			await chunk.InitCompleted(verifyHash, tracker, header, footer, token);
+		} catch {
+			chunk.Dispose();
+			throw;
+		}
+
+		return chunk;
+	}
+
+	// local or remote
+	public static async ValueTask<TFChunk> FromCompletedFile(IChunkFileSystem fileSystem, string filename,
+		bool verifyHash, bool unbufferedRead,
+		ITransactionFileTracker tracker, IGetChunkTransformFactory getTransformFactory,
+		bool reduceFileCachePressure, int startNumber, CancellationToken token = default) {
+
+		var chunk = FromCompletedFile(fileSystem, filename, unbufferedRead, getTransformFactory,
+			reduceFileCachePressure);
+
+		if (chunk.IsRemote) {
+			chunk.IsReadOnly = true;
+			chunk._lazyInitArgs = (tracker, startNumber);
+		} else {
+			try {
+				await chunk.InitCompleted(verifyHash, tracker, header: null, footer: null, token);
+			} catch {
+				chunk.Dispose();
+				throw;
+			}
+		}
+
+		return chunk;
+	}
+
+	// always local
+	public static async ValueTask<TFChunk> FromOngoingFile(IChunkFileSystem fileSystem, string filename, int writePosition, bool unbuffered,
+		bool writethrough, bool reduceFileCachePressure, ITransactionFileTracker tracker,
+		IGetChunkTransformFactory getTransformFactory,
+		CancellationToken token) {
+		var chunk = new TFChunk(filename,
+			TFConsts.MidpointsDepth,
+			false,
+			unbuffered,
+			writethrough,
+			reduceFileCachePressure,
+			fileSystem: fileSystem,
+			getTransformFactory: getTransformFactory);
+		try {
+			await chunk.InitOngoing(writePosition, tracker, getTransformFactory, token);
+		} catch {
+			chunk.Dispose();
+			throw;
+		}
+
+		return chunk;
+	}
+
+	// always local
+	public static async ValueTask<TFChunk> CreateNew(
+		IChunkFileSystem fileSystem,
+		string filename,
+		int chunkDataSize,
+		int chunkStartNumber,
+		int chunkEndNumber,
+		bool isScavenged,
+		bool inMem,
+		bool unbuffered,
+		bool writethrough,
+		bool reduceFileCachePressure,
+		ITransactionFileTracker tracker,
+		IGetChunkTransformFactory getTransformFactory,
+		CancellationToken token) {
+		var transformFactory = getTransformFactory.ForNewChunk();
+		var version = CurrentChunkVersion;
+		var minCompatibleVersion = transformFactory.Type == TransformType.Identity
+			? (byte)ChunkVersions.Aligned
+			: version;
+
+		var chunkHeader = new ChunkHeader(version, minCompatibleVersion, chunkDataSize, chunkStartNumber, chunkEndNumber,
+			isScavenged, Guid.NewGuid(), transformFactory.Type);
+		var fileSize = GetAlignedSize(transformFactory.TransformDataPosition(chunkDataSize) + ChunkHeader.Size + ChunkFooter.Size);
+
+		var transformHeader = transformFactory.TransformHeaderLength > 0
+			? new byte[transformFactory.TransformHeaderLength]
+			: [];
+
+		transformFactory.CreateTransformHeader(transformHeader);
+
+		return await CreateWithHeader(fileSystem, filename, chunkHeader, fileSize, inMem, unbuffered, writethrough,
+			reduceFileCachePressure, tracker, transformFactory, getTransformFactory, transformHeader, token);
+	}
+
+	// always local
+	public static async ValueTask<TFChunk> CreateWithHeader(
+		IChunkFileSystem fileSystem,
+		string filename,
+		ChunkHeader header,
+		int fileSize,
+		bool inMem,
+		bool unbuffered,
+		bool writethrough,
+		bool reduceFileCachePressure,
+		ITransactionFileTracker tracker,
+		IChunkTransformFactory transformFactory,
+		IGetChunkTransformFactory getTransformFactory,
+		ReadOnlyMemory<byte> transformHeader,
+		CancellationToken token) {
+		var chunk = new TFChunk(filename,
+			TFConsts.MidpointsDepth,
+			inMem,
+			unbuffered,
+			writethrough,
+			reduceFileCachePressure,
+			fileSystem: fileSystem,
+			getTransformFactory: getTransformFactory);
+		try {
+			await chunk.InitNew(header, fileSize, tracker, transformFactory, transformHeader, token);
+		} catch {
+			chunk.Dispose();
+			throw;
+		}
+
+		return chunk;
+	}
+
+	[InitializationNotRequired]
+	public ValueTask EnsureInitialized(CancellationToken token) => _lazyInitArgs switch {
+		(ITransactionFileTracker tracker, int) => EnsureInitAsCompletedCore(tracker, token),
+		_ => ValueTask.CompletedTask,
+	};
+
+	private async ValueTask EnsureInitAsCompletedCore(ITransactionFileTracker tracker,
+		CancellationToken token) {
+		// lazy init is based on the double check pattern implemented on top of existing lock
+		await _cachedDataLock.AcquireAsync(token);
+		try {
+			if (_lazyInitArgs is not null) {
+				await InitCompleted(verifyHash: false, tracker, header: null, footer: null, token);
+
+				// cannot be reordered, so we know that this flag is set to 'true' when all fields initialized properly
+				_lazyInitArgs = null;
+			}
+		} catch {
+			// revert internal state
+			if (_handle is not null) {
+				_handle.Dispose();
+				_handle = null;
+			}
+
+			_transform = null;
+			_transformHeader = ReadOnlyMemory<byte>.Empty;
+			_chunkFooter = null;
+			_chunkHeader = null;
+
+			throw;
+		} finally {
+			_cachedDataLock.Release();
+		}
+	}
+
+	private async ValueTask InitCompleted(bool verifyHash, ITransactionFileTracker tracker, ChunkHeader header, ChunkFooter footer, CancellationToken token) {
+		_handle = await _fileSystem.OpenForReadAsync(
+			ChunkLocator,
+			_reduceFileCachePressure
+				? IChunkFileSystem.ReadOptimizationHint.None
+				: IChunkFileSystem.ReadOptimizationHint.RandomAccess,
+			token);
+		await _fileSystem.SetReadOnlyAsync(ChunkLocator, true, token);
+		_fileSize = (int)_handle.Length;
+
+		IsReadOnly = true;
+
+		await using (var stream = _handle.CreateStream()) {
+			if (header is null) {
+				_chunkHeader = await ReadHeader(stream, token);
+			} else {
+				_chunkHeader = header;
+				stream.Position = ChunkHeader.Size;
+			}
+			Log.Debug("Opened completed {chunk} as version {version} (min. compatible version: {minCompatibleVersion})", ChunkLocator, _chunkHeader.Version, _chunkHeader.MinCompatibleVersion);
+
+			if (_chunkHeader.MinCompatibleVersion > CurrentChunkVersion)
+				throw new CorruptDatabaseException(new UnsupportedFileVersionException(ChunkLocator, _chunkHeader.MinCompatibleVersion,
+					CurrentChunkVersion));
+
+			var transformFactory = _getTransformFactory.ForExistingChunk(_chunkHeader.TransformType);
+
+			var transformHeader = transformFactory.TransformHeaderLength > 0
+				? new byte[transformFactory.TransformHeaderLength]
+				: [];
+			await transformFactory.ReadTransformHeader(stream, transformHeader, token);
+			_transformHeader = transformHeader;
+			_transform = transformFactory.CreateTransform(transformHeader);
+
+			_chunkFooter = footer ?? await ReadFooter(stream, token);
+			if (!_chunkFooter.IsCompleted) {
+				throw new CorruptDatabaseException(new BadChunkInDatabaseException(
+					$"Chunk file '{ChunkLocator}' should be completed, but is not."));
+			}
+
+			_logicalDataSize = _chunkFooter.LogicalDataSize;
+			_physicalDataSize = _chunkFooter.PhysicalDataSize;
+		}
+
+		CreateReaderStreams();
+
+		_readSide = _chunkHeader.IsScavenged
+			? new TFChunkReadSideScavenged(this, tracker)
+			: new TFChunkReadSideUnscavenged(this, tracker);
+
+		if (verifyHash)
+			await VerifyFileHash(token);
+	}
+
+	private async ValueTask InitNew(ChunkHeader chunkHeader, int fileSize, ITransactionFileTracker tracker,
+		IChunkTransformFactory transformFactory,
+		ReadOnlyMemory<byte> transformHeader,
+		CancellationToken token) {
+		Ensure.NotNull(chunkHeader, "chunkHeader");
+		Ensure.Positive(fileSize, "fileSize");
+
+		_fileSize = fileSize;
+		IsReadOnly = false;
+		_chunkHeader = chunkHeader;
+		_physicalDataSize = 0;
+		_logicalDataSize = 0;
+
+		_transformHeader = transformHeader;
+		_transform = transformFactory.CreateTransform(transformHeader.Span);
+
+		if (_inMem)
+			await CreateInMemChunk(chunkHeader, fileSize, transformHeader, token);
+		else {
+			await CreateWriterWorkItemForNewChunk(chunkHeader, fileSize, transformHeader, token);
+		}
+
+		_readSide = chunkHeader.IsScavenged
+			? new TFChunkReadSideScavenged(this, tracker)
+			: new TFChunkReadSideUnscavenged(this, tracker);
+
+		// Always cache the active chunk
+		// If the chunk is scavenged we will definitely mark it readonly before we are done writing to it.
+		if (!chunkHeader.IsScavenged) {
+			await CacheInMemory(token);
+		}
+	}
+
+	private async ValueTask InitOngoing(int writePosition, ITransactionFileTracker tracker,
+		IGetChunkTransformFactory getTransformFactory,
+		CancellationToken token) {
+		Ensure.Nonnegative(writePosition, "writePosition");
+		var fileInfo = new FileInfo(LocalFileName);
+		if (!fileInfo.Exists)
+			throw new CorruptDatabaseException(new ChunkNotFoundException(ChunkLocator));
+
+		_fileSize = (int)fileInfo.Length;
+		IsReadOnly = false;
+		_physicalDataSize = writePosition;
+		_logicalDataSize = writePosition;
+
+		await _fileSystem.SetReadOnlyAsync(fileInfo.FullName, false, token);
+		_chunkHeader = await CreateWriterWorkItemForExistingChunk(writePosition, getTransformFactory, token);
+		Log.Debug("Opened ongoing {chunk} as version {version} (min. compatible version: {minCompatibleVersion})", ChunkLocator, _chunkHeader.Version, _chunkHeader.MinCompatibleVersion);
+
+		if (_chunkHeader.MinCompatibleVersion > CurrentChunkVersion)
+			throw new CorruptDatabaseException(new UnsupportedFileVersionException(ChunkLocator, _chunkHeader.MinCompatibleVersion,
+				CurrentChunkVersion));
+
+		_readSide = new TFChunkReadSideUnscavenged(this, tracker);
+
+		// Always cache the active chunk
+		await CacheInMemory(token);
+	}
+
+	// If one file stream writes to a file, and another file stream happens to have that part of
+	// the same file already in its buffer, the buffer is not (any longer) invalidated and a read from
+	// the second file stream will not contain the write.
+	// We therefore only read from memory while the chunk is still being written to, and only create
+	// the file streams when the chunk is being completed.
+	private void CreateReaderStreams() {
+		_fileStreams.Reuse();
+		Interlocked.Add(ref _fileStreamCount, IndexPool.Capacity);
+	}
+
+	private async ValueTask CreateInMemChunk(ChunkHeader chunkHeader, int fileSize, ReadOnlyMemory<byte> transformHeader, CancellationToken token) {
+		var md5 = IncrementalHash.CreateHash(HashAlgorithmName.MD5);
+
+		// ALLOCATE MEM
+		_cacheStatus = CacheStatus.Cached;
+		_cachedLength = fileSize;
+		_cachedData = Marshal.AllocHGlobal(_cachedLength);
+		_cachedDataTransformed = true;
+		GC.AddMemoryPressure(_cachedLength);
+
+
+		// WRITE HEADERS
+		await using (var headerStream = CreateMemoryStream(_cachedLength, FileAccess.ReadWrite)) {
+			await WriteHeader(md5, headerStream, chunkHeader, token);
+			await WriteTransformHeader(md5, headerStream, transformHeader, token);
+		}
+
+		// WRITER STREAM
+		var writerWorkItem = new WriterWorkItem(_cachedData, _cachedLength, md5, _transform.Write, ChunkHeader.Size + transformHeader.Length);
+
+		// READER STREAMS
+		_sharedMemStream = CreateSharedMemoryStream();
+		Interlocked.Add(ref _memStreamCount, IndexPool.Capacity);
+		_memStreams.Reuse();
+
+		// should never happen in practice because this function is called from the static TFChunk constructors
+		Debug.Assert(!_selfdestructin54321);
+
+		_writerWorkItem = writerWorkItem;
+	}
+
+	private unsafe Stream CreateSharedMemoryStream() {
+		Debug.Assert(_cachedData is not 0);
+		Debug.Assert(_cachedLength > 0);
+
+		ReadOnlyMemory<byte> memoryView = UnmanagedMemory.AsMemory((byte*)_cachedData, _cachedLength);
+		return StreamSource.AsSharedStream(new(memoryView), compatWithAsync: true);
+	}
+
+	private FileOptions WritableHandleOptions {
+		get {
+			var options = _reduceFileCachePressure
+				? ChunkFileHandle.DefaultFileOptions
+				: ChunkFileHandle.DefaultFileOptions | FileOptions.RandomAccess;
+			if (_writeThrough)
+				options |= FileOptions.WriteThrough;
+
+			return options;
+		}
+	}
+
+	private async ValueTask CreateWriterWorkItemForNewChunk(ChunkHeader chunkHeader, int fileSize, ReadOnlyMemory<byte> transformHeader, CancellationToken token) {
+		var md5 = IncrementalHash.CreateHash(HashAlgorithmName.MD5);
+
+		// create temp file first and set desired length
+		// if there is not enough disk space or something else prevents file to be resized as desired
+		// we'll end up with empty temp file, which won't trigger false error on next DB verification
+		var tempFilename = $"{LocalFileName}.{Guid.NewGuid()}.tmp";
+		var options = new FileStreamOptions {
+			Mode = FileMode.CreateNew,
+			Access = FileAccess.ReadWrite,
+			Share = FileShare.Read,
+			Options = FileOptions.SequentialScan | ChunkFileHandle.DefaultFileOptions,
+			PreallocationSize = fileSize, // avoid fragmentation of file
+			BufferSize = WriterWorkItem.BufferSize,
+		};
+
+		await using (var tempFile = new FileStream(tempFilename, options)) {
+			tempFile.SetLength(fileSize);
+
+			// we need to write header into temp file before moving it into correct chunk place, so in case of crash
+			// we don't end up with seemingly valid chunk file with no header at all...
+			await WriteHeader(md5, tempFile, chunkHeader, token);
+			await WriteTransformHeader(md5, tempFile, transformHeader, token);
+
+			tempFile.FlushToDisk();
+		}
+
+		File.Move(tempFilename, LocalFileName);
+
+		// reuse FileStreamOptions instance
+		options.Mode = FileMode.Open;
+		options.Options = WritableHandleOptions;
+		options.PreallocationSize = 0L;
+		_handle = ChunkFileHandle.Create(LocalFileName, options);
+		_writerWorkItem = new(_handle, md5, _unbuffered, _transform.Write, ChunkHeader.Size + transformHeader.Length);
+		await _fileSystem.SetReadOnlyAsync(LocalFileName, false, token);
+	}
+
+	private async ValueTask<ChunkHeader> CreateWriterWorkItemForExistingChunk(int writePosition,
+		IGetChunkTransformFactory getTransformFactory,
+		CancellationToken token) {
+		var options = new FileStreamOptions {
+			Mode = FileMode.Open,
+			Access = FileAccess.ReadWrite,
+			Share = FileShare.Read,
+			Options = WritableHandleOptions,
+		};
+
+		_handle = ChunkFileHandle.Create(LocalFileName, options);
+
+		var stream = _handle.CreateStream();
+		ChunkHeader chunkHeader;
+		try {
+			chunkHeader = await ReadHeader(stream, token);
+			if (chunkHeader.Version is (byte)ChunkVersions.Unaligned) {
+				Log.Debug("Upgrading ongoing file {chunk} to version 3", ChunkLocator);
+				var newHeader = new ChunkHeader((byte)ChunkVersions.Aligned,
+					(byte)ChunkVersions.Aligned,
+					chunkHeader.ChunkSize,
+					chunkHeader.ChunkStartNumber,
+					chunkHeader.ChunkEndNumber,
+					false,
+					chunkHeader.ChunkId,
+					chunkHeader.TransformType);
+				stream.Seek(0, SeekOrigin.Begin);
+				chunkHeader = newHeader;
+
+				using (var buffer = Memory.AllocateExactly<byte>(ChunkHeader.Size)) {
+					await stream.WriteAsync(newHeader, buffer.Memory, token);
+				}
+
+				await stream.FlushAsync(token);
+			}
+
+			var transformFactory = getTransformFactory.ForExistingChunk(chunkHeader.TransformType);
+
+			var transformHeader = transformFactory.TransformHeaderLength > 0
+				? new byte[transformFactory.TransformHeaderLength]
+				: [];
+			await transformFactory.ReadTransformHeader(stream, transformHeader, token);
+			_transformHeader = transformHeader;
+			_transform = transformFactory.CreateTransform(transformHeader);
+		} catch {
+			_handle.Dispose();
+			throw;
+		} finally {
+			await stream.DisposeAsync();
+		}
+
+		var workItem = new WriterWorkItem(_handle, IncrementalHash.CreateHash(HashAlgorithmName.MD5), _unbuffered, _transform.Write, 0);
+		var realPosition = GetRawPosition(writePosition);
+		// the writer work item's stream is responsible for computing the current checksum when the position is set
+		workItem.WorkingStream.Position = realPosition;
+
+		// Workaround: the following call triggers the hash computation for the data up to a new position
+		// (see ChunkDataWriteStream.WriteAsync sources). Otherwise, the optimization with
+		// WriterWorkItem.TryGetBufferedWriter doesn't work.
+		await workItem.WorkingStream.WriteAsync(ReadOnlyMemory<byte>.Empty, token);
+
+		_writerWorkItem = workItem;
+
+		return chunkHeader;
+	}
+
+	private static async ValueTask WriteHeader(IncrementalHash md5, Stream stream, ChunkHeader chunkHeader, CancellationToken token) {
+		var chunkHeaderBytes = ArrayPool<byte>.Shared.Rent(ChunkHeader.Size);
+		try {
+			chunkHeader.Format(chunkHeaderBytes);
+			md5.AppendData(chunkHeaderBytes, 0, ChunkHeader.Size);
+			await stream.WriteAsync(chunkHeaderBytes.AsMemory(0, ChunkHeader.Size), token);
+		} finally {
+			ArrayPool<byte>.Shared.Return(chunkHeaderBytes);
+		}
+	}
+
+	private static ValueTask WriteTransformHeader(IncrementalHash md5, Stream stream, ReadOnlyMemory<byte> transformHeader, CancellationToken token) {
+		if (transformHeader.IsEmpty)
+			return ValueTask.CompletedTask;
+
+		md5.AppendData(transformHeader.Span);
+		return stream.WriteAsync(transformHeader, token);
+	}
+
+	[InitializationNotRequired]
+	public async ValueTask VerifyFileHash(CancellationToken token) {
+		if (!IsReadOnly)
+			throw new InvalidOperationException("You can't verify hash of not-completed TFChunk.");
+
+		if (IsRemote) {
+			Log.Debug("Skipped verifying hash for TFChunk '{chunk}' because it is remote", ChunkLocator);
+			return;
+		}
+
+		Log.Debug("Verifying hash for TFChunk '{chunk}'...", ChunkLocator);
+		using var reader = await AcquireRawReader(token);
+		reader.Stream.Seek(0, SeekOrigin.Begin);
+		var stream = reader.Stream;
+		var footer = _chunkFooter;
+
+		using var md5 = IncrementalHash.CreateHash(HashAlgorithmName.MD5);
+
+		// hash whole chunk except MD5 hash sum which should always be last
+		await MD5Hash.ContinuousHashFor(md5, stream, 0, _fileSize - ChunkFooter.ChecksumSize, token);
+		VerifyHash(footer.MD5Hash, md5);
+
+		static void VerifyHash(ReadOnlySpan<byte> expected, IncrementalHash actual) {
+			Span<byte> buffer = stackalloc byte[ChunkFooter.ChecksumSize];
+			var bytesWritten = actual.GetCurrentHash(buffer);
+			Debug.Assert(bytesWritten is ChunkFooter.ChecksumSize);
+
+			// Perf: use hardware accelerated byte array comparison
+			if (!expected.SequenceEqual(buffer.Slice(0, bytesWritten)))
+				throw new HashValidationException();
+		}
+	}
+
+	private ValueTask<ChunkHeader> ReadHeader(Stream stream, CancellationToken token) {
+		if (stream.Length < ChunkHeader.Size) {
+			return ValueTask.FromException<ChunkHeader>(new CorruptDatabaseException(new BadChunkInDatabaseException(
+				$"Chunk file '{ChunkLocator}' is too short to even read ChunkHeader, its size is {stream.Length} bytes.")));
+		}
+
+		stream.Seek(0, SeekOrigin.Begin);
+		return ChunkHeader.FromStream(stream, token);
+	}
+
+	private ValueTask<ChunkFooter> ReadFooter(Stream stream, CancellationToken token) {
+		if (stream.Length < ChunkFooter.Size) {
+			return ValueTask.FromException<ChunkFooter>(new CorruptDatabaseException(new BadChunkInDatabaseException(
+				$"Chunk file '{ChunkLocator}' is too short to even read ChunkFooter, its size is {stream.Length} bytes.")));
+		}
+
+		stream.Seek(-ChunkFooter.Size, SeekOrigin.End);
+		return ChunkFooter.FromStream(stream, token);
+	}
+
+	private static long GetRawPosition(long logicalPosition) {
+		return ChunkHeader.Size + logicalPosition;
+	}
+
+	private static long GetDataPosition(WriterWorkItem workItem) {
+		return workItem.WorkingStream.Position - ChunkHeader.Size;
+	}
+
+	// There are four kinds of event position
+	// (a) global logical (logical position in the log)
+	// (b) local logical (logical position in the chunk, which is global logical - chunk logical start)
+	// (c) actual (local logical but with posmap taken into account)
+	// (d) raw (byte offset in file, which is actual - header size)
+	//
+	// this method takes (b) and returns (d)
+	public async ValueTask<long> GetActualRawPosition(long logicalPosition, CancellationToken token) {
+		ArgumentOutOfRangeException.ThrowIfNegative(logicalPosition);
+		ThrowIfNotInitialized();
+
+		var actualPosition = await _readSide.GetActualPosition(logicalPosition, token);
+
+		return actualPosition < 0 ? -1 : GetRawPosition(actualPosition);
+	}
+
+	public async ValueTask CacheInMemory(CancellationToken token) {
+		if (_inMem)
+			return;
+
+		ThrowIfNotInitialized();
+		await _cachedDataLock.AcquireAsync(token);
+		try {
+			if (_cacheStatus is not CacheStatus.Uncached) {
+				// expected to be very rare
+				if (_cacheStatus is CacheStatus.Uncaching)
+					Log.Debug("CACHING TFChunk {chunk} SKIPPED because it is uncaching.", this);
+
+				return;
+			}
+
+			// we won the right to cache
+			var sw = new Timestamp();
+			try {
+				// note: we do not want to cache transformed data for the active chunk as we would be incurring the cost of
+				// transformation twice - once when writing to the filestream and once when writing to the memory stream.
+				// however, we want to cache (already) transformed data for completed/read-only chunks as we would otherwise
+				// incur the cost of transforming the whole chunk when loading data from the file into memory.
+
+				if (!IsReadOnly)
+					// we do not cache the header for the active chunk -
+					// it's not necessary as the cache is used only for reading data.
+					await BuildCacheArray(
+						size: GetAlignedSize(ChunkHeader.Size + _chunkHeader.ChunkSize + ChunkFooter.Size),
+						reader: await AcquireFileReader(raw: false, token),
+						offset: ChunkHeader.Size,
+						count: _physicalDataSize,
+						transformed: false,
+						token);
+				else
+					await BuildCacheArray(
+						size: _fileSize,
+						reader: await AcquireFileReader(raw: true, token),
+						offset: 0,
+						count: _fileSize,
+						transformed: true,
+						token);
+			} catch (OutOfMemoryException) {
+				Log.Error("CACHING FAILED due to OutOfMemory exception in TFChunk {chunk}.", this);
+				return;
+			} catch (FileBeingDeletedException) {
+				Log.Debug(
+					"CACHING FAILED due to FileBeingDeleted exception (TFChunk is being disposed) in TFChunk {chunk}.",
+					this);
+				return;
+			}
+
+			_sharedMemStream = CreateSharedMemoryStream();
+			Interlocked.Add(ref _memStreamCount, IndexPool.Capacity);
+			_memStreams.Reuse();
+
+			if (_selfdestructin54321) {
+				if (Interlocked.Add(ref _memStreamCount, -IndexPool.Capacity) is 0)
+					FreeCachedDataUnsafe();
+				Log.Debug("CACHING ABORTED for TFChunk {chunk} as TFChunk was probably marked for deletion.", this);
+				return;
+			}
+
+			if (_writerWorkItem is { } writerWorkItem) {
+				UnmanagedMemoryStream memStream;
+				unsafe {
+					memStream =
+						new((byte*)_cachedData, _cachedLength, _cachedLength, FileAccess.ReadWrite) {
+							Position = writerWorkItem.WorkingStream.Position,
+						};
+				}
+
+				writerWorkItem.SetMemStream(memStream);
+			}
+
+			Log.Debug("CACHED TFChunk {chunk} in {elapsed}.", this, sw.Elapsed);
+
+			if (_selfdestructin54321)
+				TryDestructMemStreamsUnsafe();
+
+			_cacheStatus = CacheStatus.Cached;
+		} finally {
+			_cachedDataLock.Release();
+		}
+	}
+
+	private async ValueTask BuildCacheArray(int size, TFChunkBulkReader reader, int offset, int count, bool transformed, CancellationToken token) {
+		Debug.Assert(_cachedDataLock.IsLockHeld);
+
+		try {
+			if (reader.IsMemory)
+				throw new InvalidOperationException(
+					"When trying to build cache, reader worker is already in-memory reader.");
+
+			_cachedLength = size;
+			var cachedData = Marshal.AllocHGlobal(_cachedLength);
+			GC.AddMemoryPressure(_cachedLength);
+
+			try {
+				Memory<byte> memoryView;
+				unsafe {
+					memoryView = UnmanagedMemory.AsMemory((byte*)(cachedData + offset), count);
+				}
+
+				reader.Stream.Seek(offset, SeekOrigin.Begin);
+				await reader.Stream.ReadExactlyAsync(memoryView, token);
+			} catch {
+				Marshal.FreeHGlobal(cachedData);
+				GC.RemoveMemoryPressure(_cachedLength);
+				throw;
+			}
+
+			_cachedData = cachedData;
+			_cachedDataTransformed = transformed;
+		} finally {
+			reader.Dispose();
+		}
+	}
+
+	[InitializationNotRequired]
+	public async ValueTask UnCacheFromMemory(CancellationToken token) {
+		await _cachedDataLock.AcquireAsync(token);
+		try {
+			if (_inMem)
+				return;
+			if (_cacheStatus is CacheStatus.Cached) {
+				// we won the right to un-cache and chunk was cached
+				_writerWorkItem?.DisposeMemStream();
+
+				Log.Debug("UNCACHING TFChunk {chunk}.", this);
+				_cacheStatus = CacheStatus.Uncaching;
+				// this memory barrier corresponds to the barrier in ReturnReaderWorkItem
+				Thread.MemoryBarrier();
+				TryDestructMemStreamsUnsafe();
+			}
+		} finally {
+			_cachedDataLock.Release();
+		}
+	}
+
+	public ValueTask<bool> ExistsAt(long logicalPosition, CancellationToken token)
+		=> Initialized
+			? _readSide.ExistsAt(logicalPosition, token)
+			: ValueTask.FromException<bool>(CreateNotInitializedException());
+
+	public ValueTask<RecordReadResult> TryReadAt(long logicalPosition, bool couldBeScavenged, CancellationToken token)
+		=> Initialized
+			? _readSide.TryReadAt(logicalPosition, couldBeScavenged, token)
+			: ValueTask.FromException<RecordReadResult>(CreateNotInitializedException());
+
+	public ValueTask<RecordReadResult> TryReadFirst(CancellationToken token)
+		=> Initialized
+			? _readSide.TryReadFirst(token)
+			: ValueTask.FromException<RecordReadResult>(CreateNotInitializedException());
+
+	public ValueTask<RecordReadResult> TryReadClosestForward(long logicalPosition, CancellationToken token)
+		=> Initialized
+			? _readSide.TryReadClosestForward(logicalPosition, token)
+			: ValueTask.FromException<RecordReadResult>(CreateNotInitializedException());
+
+	public ValueTask<RawReadResult> TryReadClosestForwardRaw(long logicalPosition, Func<int, byte[]> getBuffer,
+		CancellationToken token)
+		=> Initialized
+			? _readSide.TryReadClosestForwardRaw(logicalPosition, getBuffer, token)
+			: ValueTask.FromException<RawReadResult>(CreateNotInitializedException());
+
+	public ValueTask<RecordReadResult> TryReadLast(CancellationToken token)
+		=> Initialized
+			? _readSide.TryReadLast(token)
+			: ValueTask.FromException<RecordReadResult>(CreateNotInitializedException());
+
+	public ValueTask<RecordReadResult> TryReadClosestBackward(long logicalPosition, CancellationToken token)
+		=> Initialized
+			? _readSide.TryReadClosestBackward(logicalPosition, token)
+			: ValueTask.FromException<RecordReadResult>(CreateNotInitializedException());
+
+	public async ValueTask<RecordWriteResult> TryAppend(ILogRecord record, CancellationToken token) {
+		if (IsReadOnly)
+			throw new InvalidOperationException("Cannot write to a read-only block.");
+
+		ThrowIfNotInitialized();
+		var workItem = _writerWorkItem;
+		var length = record.GetSizeWithLengthPrefixAndSuffix();
+		var oldPosition = GetDataPosition(workItem);
+		if (workItem.WorkingStream.Position + length > ChunkHeader.Size + _chunkHeader.ChunkSize)
+			return RecordWriteResult.Failed(oldPosition);
+
+		if (workItem.TryGetDirectBuffer(length) is { IsEmpty: false } directBuf) {
+			var bytesWritten = SerializeLogRecordDirectly(record, directBuf.Span);
+			Debug.Assert(bytesWritten == length);
+			workItem.AppendData(bytesWritten);
+		} else {
+			using var dataOnDisk = SerializeLogRecord(record, length);
+			await workItem.AppendData(dataOnDisk.Memory, token);
+		}
+
+		_physicalDataSize = (int)GetDataPosition(workItem); // should fit 32 bits
+		_logicalDataSize = _chunkHeader.GetLocalLogPosition(record.LogPosition + length);
+
+		// for non-scavenged chunk _physicalDataSize should be the same as _logicalDataSize
+		// for scavenged chunk _logicalDataSize should be at least the same as _physicalDataSize
+		if ((!_chunkHeader.IsScavenged && _logicalDataSize != _physicalDataSize)
+			|| (_chunkHeader.IsScavenged && _logicalDataSize < _physicalDataSize)) {
+			throw new Exception(
+				$"Data sizes violation. Chunk: {ChunkLocator}, IsScavenged: {_chunkHeader.IsScavenged}, LogicalDataSize: {_logicalDataSize}, PhysicalDataSize: {_physicalDataSize}.");
+		}
+
+		return RecordWriteResult.Successful(oldPosition, _physicalDataSize);
+
+		static void WriteRecord(ILogRecord record, ref BufferWriterSlim<byte> writer) {
+			writer.Advance(sizeof(int)); // reserved for length prefix
+			record.WriteTo(ref writer);
+
+			var recordLength = writer.WrittenCount - sizeof(int);
+
+			// write length suffix
+			writer.WriteLittleEndian(recordLength);
+
+			// write length prefix
+			var bytesWritten = writer.WrittenCount;
+			writer.WrittenCount = 0;
+			writer.WriteLittleEndian(recordLength);
+			writer.WrittenCount = bytesWritten;
+		}
+
+		static MemoryOwner<byte> SerializeLogRecord(ILogRecord record, int length) {
+			var writer = new BufferWriterSlim<byte>(length);
+			WriteRecord(record, ref writer);
+
+			var buffer = writer.DetachOrCopyBuffer();
+			Debug.Assert(length == buffer.Length);
+
+			return buffer;
+		}
+
+		static int SerializeLogRecordDirectly(ILogRecord record, Span<byte> buffer) {
+			var writer = new BufferWriterSlim<byte>(buffer);
+			WriteRecord(record, ref writer);
+			return writer.WrittenCount;
+		}
+	}
+
+	public async ValueTask<bool> TryAppendRawData(ReadOnlyMemory<byte> buffer, CancellationToken token) {
+		ThrowIfNotInitialized();
+		var workItem = _writerWorkItem;
+		if (workItem.WorkingStream.Position + buffer.Length > workItem.WorkingStream.Length)
+			return false;
+
+		if (workItem.TryGetDirectBuffer(buffer.Length) is { IsEmpty: false } directBuf) {
+			buffer.CopyTo(directBuf);
+			workItem.AppendData(buffer.Length);
+		} else {
+			await workItem.AppendData(buffer, token);
+		}
+
+		return true;
+	}
+
+	[InitializationNotRequired]
+	public ValueTask Flush(CancellationToken token)
+		=> IsReadOnly ? ValueTask.CompletedTask : _writerWorkItem.FlushToDisk(token);
+
+	public ValueTask Complete(CancellationToken token) {
+		if (!Initialized)
+			return ValueTask.FromException(CreateNotInitializedException());
+
+		return _chunkHeader.IsScavenged
+			? ValueTask.FromException(
+				new InvalidOperationException("CompleteScavenged should be used for scavenged chunks."))
+			: CompleteNonRaw(null, token);
+	}
+
+	public ValueTask CompleteScavenge(IReadOnlyCollection<PosMap> mapping, CancellationToken token) {
+		if (!Initialized)
+			return ValueTask.FromException(CreateNotInitializedException());
+
+		return _chunkHeader.IsScavenged
+			? CompleteNonRaw(mapping, token)
+			: ValueTask.FromException(
+				new InvalidOperationException("CompleteScavenged should not be used for non-scavenged chunks."));
+	}
+
+	private async ValueTask CompleteNonRaw(IReadOnlyCollection<PosMap> mapping, CancellationToken token) {
+		if (IsReadOnly)
+			throw new InvalidOperationException("Cannot complete a read-only TFChunk.");
+
+		_chunkFooter = await WriteFooter(mapping, token); // WriteFooter always calls Flush
+
+		// cannot be canceled from here on
+		if (!_inMem) {
+			await _fileSystem.SetReadOnlyAsync(ChunkLocator, true, CancellationToken.None);
+		}
+
+		if (!_inMem) {
+			CreateReaderStreams();
+		}
+
+		IsReadOnly = true;
+
+		_writerWorkItem?.Dispose();
+		_writerWorkItem = null;
+	}
+
+	public async ValueTask CompleteRaw(CancellationToken token) {
+		if (IsReadOnly)
+			throw new InvalidOperationException("Cannot complete a read-only TFChunk.");
+
+		ThrowIfNotInitialized();
+		if (_writerWorkItem.WorkingStream.Position != _writerWorkItem.WorkingStream.Length)
+			throw new InvalidOperationException("The raw chunk is not completely written.");
+
+		await Flush(token);
+
+		if (!_inMem) {
+			await _fileSystem.SetReadOnlyAsync(ChunkLocator, true, token);
+			await using var stream = _handle.CreateStream();
+			_chunkFooter = await ReadFooter(stream, token);
+		} else {
+			_chunkFooter = await ReadFooter(_sharedMemStream, token);
+		}
+
+		// cannot be canceled from here on
+		if (!_inMem)
+			CreateReaderStreams();
+
+		IsReadOnly = true;
+
+		_writerWorkItem?.Dispose();
+		_writerWorkItem = null;
+	}
+
+	private async ValueTask<ChunkFooter> WriteFooter(IReadOnlyCollection<PosMap> mapping, CancellationToken token) {
+		token.ThrowIfCancellationRequested();
+
+		// cannot be canceled from here on
+		var workItem = _writerWorkItem;
+		int mapSize;
+
+		// reuse rented buffer for position mapping serialization and chunk footer
+		byte[] bufferFromPool;
+		if (mapping is null) {
+			mapSize = 0;
+			bufferFromPool = ArrayPool<byte>.Shared.Rent(ChunkFooter.Size);
+		} else {
+			if (_inMem)
+				throw new InvalidOperationException(
+					"Cannot write an in-memory chunk with a PosMap. " +
+					"Scavenge is not supported on in-memory databases");
+
+			if (_cacheStatus is not CacheStatus.Uncached) {
+				throw new InvalidOperationException("Trying to write mapping while chunk is cached. "
+													+ "You probably are writing scavenged chunk as cached. "
+													+ "Do not do this.");
+			}
+
+			mapSize = mapping.Count * PosMap.FullSize;
+
+			bufferFromPool = ArrayPool<byte>.Shared.Rent(Math.Max(mapSize, ChunkFooter.Size));
+			mapSize = WriteMapping(bufferFromPool, mapping);
+			await workItem.AppendData(bufferFromPool.AsMemory(0, mapSize), CancellationToken.None);
+		}
+
+		await _transform.Write.CompleteData(
+			footerSize: ChunkFooter.Size,
+			alignmentSize: _chunkHeader.Version >= (byte)ChunkVersions.Aligned ? AlignmentSize : 1,
+			CancellationToken.None);
+
+		int fileSize;
+		ChunkFooter footerWithHash;
+		try {
+			var footerNoHash = new ChunkFooter(true, true, _physicalDataSize, LogicalDataSize, mapSize);
+
+			//MD5
+			footerNoHash.Format(bufferFromPool);
+			workItem.MD5.AppendData(bufferFromPool, 0,
+				ChunkFooter.Size - ChunkFooter.ChecksumSize);
+
+			//FILE
+			footerWithHash = new ChunkFooter(true, true, _physicalDataSize, LogicalDataSize, mapSize, workItem.MD5);
+			footerWithHash.Format(bufferFromPool);
+			fileSize = await _transform.Write.WriteFooter(new(bufferFromPool, 0, ChunkFooter.Size), CancellationToken.None);
+		} finally {
+			ArrayPool<byte>.Shared.Return(bufferFromPool);
+		}
+
+		// at this point in code, 'WorkingStream` should not contain buffered bytes because SeLength
+		// can cause sync-over-async write. This fact is checked within `IChunkHandle.UnbufferedStream` class
+		workItem.ResizeFileStream(fileSize);
+
+		_fileSize = fileSize;
+		return footerWithHash;
+
+		static int WriteMapping(Span<byte> buffer, IReadOnlyCollection<PosMap> mapping) {
+			var writer = new SpanWriter<byte>(buffer);
+			foreach (var map in mapping) {
+				writer.Write(map);
+			}
+
+			return writer.WrittenCount;
+		}
+	}
+
+	[InitializationNotRequired]
+	public void Dispose() => TryClose();
+
+	[InitializationNotRequired]
+	public bool TryClose() {
+		_selfdestructin54321 = true;
+
+		Thread.MemoryBarrier();
+
+		bool closed = true;
+		closed &= TryDestructFileStreams();
+		closed &= TryDestructMemStreams();
+
+		return closed;
+	}
+
+	// Causes the chunk to be deleted when all the readers have returned.
+	[InitializationNotRequired]
+	public void MarkForDeletion() {
+		_selfdestructin54321 = true;
+		_deleteFile = true;
+
+		Thread.MemoryBarrier();
+
+		TryDestructFileStreams();
+		TryDestructMemStreams();
+	}
+
+	private bool TryDestructFileStreams() {
+		switch (_fileStreams.Drain(ref _fileStreamCount)) {
+			case < 0:
+				throw new Exception("Count of file streams reduced below zero.");
+			case 0:
+				CleanUpFileStreamDestruction();
+				return true;
+			default:
+				return false;
+		}
+	}
+
+	// Called when the filestreams have all been returned and disposed.
+	// This used to be a 'last one out turns off the light' mechanism, but now it is idempotent
+	// so it is more like 'make sure the light is off if no one is using it'.
+	// The idempotency means that
+	//  1. we don't have to worry if we just disposed the last filestream or if someone else did before.
+	//  2. this mechanism will work if we decide not to create any pooled filestreams at all
+	//        (previously if we didnt create any filestreams then no one would call this method)
+	private void CleanUpFileStreamDestruction() {
+		if (Interlocked.CompareExchange(ref _cleanedUpFileStreams, 1, 0) is not 0)
+			return;
+
+		if (_writerWorkItem is not null) {
+			_writerWorkItem.FlushToDisk();
+			_writerWorkItem.Dispose();
+		}
+
+		if (!_inMem) {
+			_handle?.Dispose();
+			Helper.EatException(LocalFileName, static filename => File.SetAttributes(filename, FileAttributes.Normal));
+
+			if (_deleteFile) {
+				Log.Information("Deleting chunk {chunk}",
+					Path.GetFileName(ChunkLocator));
+				Helper.EatException(LocalFileName, File.Delete);
+			}
+		}
+
+		_destroyEvent.Set();
+	}
+
+	public static int GetAlignedSize(int size) {
+		if (size % AlignmentSize == 0)
+			return size;
+		return (size / AlignmentSize + 1) * AlignmentSize;
+	}
+
+	// the caller must be responsible to obtain the lock to call this method
+	private bool TryDestructMemStreamsUnsafe() {
+		Debug.Assert(_cachedDataLock.IsLockHeld);
+
+		if (_cacheStatus is not CacheStatus.Uncaching && !_selfdestructin54321)
+			return false;
+
+		_writerWorkItem?.DisposeMemStream();
+
+		switch (_memStreams.Drain(ref _memStreamCount)) {
+			case < 0:
+				throw new Exception("Count of memory streams reduced below zero.");
+			case 0:
+				// make sure "the light is off" for memory streams
+				FreeCachedDataUnsafe();
+				return true;
+			default:
+				return false;
+		}
+	}
+
+	private bool TryDestructMemStreams() {
+		_cachedDataLock.TryAcquire(InfiniteTimeSpan);
+		try {
+			return TryDestructMemStreamsUnsafe();
+		} finally {
+			_cachedDataLock.Release();
+		}
+	}
+
+	// the caller must be responsible to obtain the lock to call this method
+	private void FreeCachedDataUnsafe() {
+		Debug.Assert(_cachedDataLock.IsLockHeld);
+
+		var cachedData = _cachedData;
+		if (cachedData is not 0) {
+			Marshal.FreeHGlobal(cachedData);
+			GC.RemoveMemoryPressure(_cachedLength);
+			_cachedData = 0;
+			_cachedLength = 0;
+			_cacheStatus = CacheStatus.Uncached;
+			Interlocked.Exchange(ref _sharedMemStream, null)?.Dispose();
+			Log.Debug("UNCACHED TFChunk {chunk}.", this);
+		}
+	}
+
+	private void FreeCachedData() {
+		_cachedDataLock.TryAcquire(InfiniteTimeSpan);
+		try {
+			FreeCachedDataUnsafe();
+		} finally {
+			_cachedDataLock.Release();
+		}
+	}
+
+	[InitializationNotRequired]
+	public void WaitForDestroy(int timeoutMs) {
+		if (!_destroyEvent.Wait(timeoutMs))
+			throw new TimeoutException();
+	}
+
+	private ReaderWorkItem GetReaderWorkItem() {
+		if (_selfdestructin54321)
+			throw new FileBeingDeletedException();
+
+		// try get memory stream reader first
+		if (_memStreams.TryTake(out var slot)) {
+			// When caching, _cachedDataTransformed and _sharedMemStream are both set before
+			// _memStreams.Reuse() (which repopulates the pool that was definitely empty)
+			// The Interlocked.Add(_memStreamCount) barrier guarantees the order.
+			// So since we have got a slot from the pool, we are guaranteed that _sharedMemStream and
+			// _cachedDataTransformed are populated with the correct values and further more their
+			// values will not change because we have the slot, preventing any uncaching.
+			Debug.Assert(_sharedMemStream is not null);
+
+			if (slot.ValueRef is not { } memoryWorkItem) {
+				memoryWorkItem = slot.ValueRef = new(
+					_sharedMemStream,
+					_cachedDataTransformed ? _transform.Read : IdentityChunkReadTransform.Instance) { PositionInPool = slot.Index };
+			}
+
+			return memoryWorkItem;
+		} else if (_selfdestructin54321) {
+			throw new FileBeingDeletedException();
+		} else if (Atomic.UpdateAndGet(ref _memStreamCount, IncrementIfGreaterThanZero) > 0) {
+			// We did not get a slot from the pool, but we incremented _memStreamCount from an
+			// already positive number. This means there are other mem readers in existence so we can
+			// create a new one separate to the pool because their existence guarantees that
+			// _sharedMemStream and _cachedDataTransformed are populated and will not change until
+			// _memStreamCount returns to 0.
+			//
+			// If the number of mem readers in existence had dropped to 0 then the uncaching
+			// procedure may be in progress and _sharedMemStream and _cachedDataTransformed may
+			// change or become invalid, so we don't use them. Instead fallback to filestream.
+			Debug.Assert(_sharedMemStream is not null);
+
+			return new(_sharedMemStream, _cachedDataTransformed ? _transform.Read : IdentityChunkReadTransform.Instance);
+		}
+
+		if (!IsReadOnly) {
+			// chunks cannot be read using filestreams while they can still be written to
+			throw new Exception(_cacheStatus is not CacheStatus.Cached
+				? "Active chunk must be cached but was not."
+				: "Not enough memory streams for active chunk.");
+		}
+
+		// get a filestream from the pool, or create one if the pool is empty.
+		if (_fileStreams.TryTake(out slot)) {
+			if (slot.ValueRef is not { } fileStreamWorkItem)
+				slot.ValueRef = fileStreamWorkItem = new(_handle, _transform.Read, IsRemote) { PositionInPool = slot.Index };
+
+			return fileStreamWorkItem;
+		}
+
+		Interlocked.Increment(ref _fileStreamCount);
+
+		if (_selfdestructin54321) {
+			if (Interlocked.Decrement(ref _fileStreamCount) == 0)
+				CleanUpFileStreamDestruction();
+			throw new FileBeingDeletedException();
+		}
+
+		return new(_handle, _transform.Read, IsRemote);
+
+		static int IncrementIfGreaterThanZero(int value)
+			=> value + Unsafe.BitCast<bool, byte>(value > 0);
+	}
+
+	private void ReturnReaderWorkItem(ReaderWorkItem item) {
+		if (item.IsMemory) {
+			// we avoid taking the _cachedDataLock here every time because we would be
+			// contending with other reader threads also returning readerworkitems.
+			//
+			// instead we check _cacheStatus to give us a hint about whether we need to lock.
+			// but this read of _cacheStatus is not inside the lock, so it can be wrong
+			// because we read a stale value, or it changed immediately after
+			// we read it.
+			//
+			// if the check is wrong it can result in one of two outcomes:
+			// 1. we call TryDestructMemStreams when we shouldn't.
+			//    we protect against this by checking the condition again inside the lock
+			// 2. we don't call TryDestructMemStreams when we should.
+			//    the memory barrier, corresponding to the barrier in UnCacheFromMemory, protects
+			//    against this by guaranteeing ordering as emphasied in _italics_ below.
+			//    the case protected against is that another thread might call UnCacheFromMemory just as
+			//    we are returning an item here and neither thread tidys up the item we are returning.
+			//    but consider: UnCacheFromMemory sets the state to Uncaching _and then_ tidys up the
+			//    items in the pool. if it does not tidy up our item, it is because our item wasn't
+			//    in the pool. which means we hadn't enqueued it yet, which means that we will
+			//    enqueue it and then _after that_ read _cacheStatus and find it is Uncaching,
+			//    which means we will tidy it up here.
+			//    this works in the same way as the barriers in ObjectPool.cs
+			//
+			// if we do end up needing to take the lock the risk of having to wait a long time is
+			// low (or possibly none), because Caching is the only slow operation while holding
+			// the lock and it only occurs when there are no outstanding memory readers, but we know
+			// there is one currently because we are in the process of returning it.
+			if (!_memStreams.Return(item)) {
+				// item was not taken from the pool, destroy immediately
+				item.Dispose();
+				Interlocked.Decrement(ref _memStreamCount);
+			}
+
+			Thread.MemoryBarrier();
+			if (_cacheStatus is CacheStatus.Uncaching || _selfdestructin54321)
+				TryDestructMemStreams();
+		} else {
+			if (!_fileStreams.Return(item)) {
+				// item was not taken from the pool, destroy immediately
+				item.Dispose();
+				Interlocked.Decrement(ref _fileStreamCount);
+			}
+
+			if (_selfdestructin54321)
+				TryDestructFileStreams();
+		}
+	}
+
+	public ValueTask<TFChunkBulkReader> AcquireDataReader(CancellationToken token) {
+		return !Initialized
+			? ValueTask.FromException<TFChunkBulkReader>(CreateNotInitializedException())
+			: TryAcquireBulkMemReader(raw: false, out var reader)
+				? ValueTask.FromResult(reader)
+				: AcquireFileReader(raw: false, token);
+	}
+
+	public ValueTask<TFChunkBulkReader> AcquireRawReader(CancellationToken token) {
+		return !Initialized
+			? ValueTask.FromException<TFChunkBulkReader>(CreateNotInitializedException())
+			: TryAcquireBulkMemReader(raw: true, out var reader)
+				? ValueTask.FromResult(reader)
+				: AcquireFileReader(raw: true, token);
+	}
+
+	private async ValueTask<TFChunkBulkReader> AcquireFileReader(bool raw, CancellationToken token) {
+		Interlocked.Increment(ref _fileStreamCount);
+		if (_selfdestructin54321) {
+			if (Interlocked.Decrement(ref _fileStreamCount) == 0) {
+				CleanUpFileStreamDestruction();
+			}
+
+			throw new FileBeingDeletedException();
+		}
+
+		// if we get here, then we reserved TFChunk for sure so no one should dispose of chunk file
+		// until client returns dedicated reader
+		var stream = await CreateFileStreamForBulkReader(token);
+
+		if (raw) {
+			return new TFChunkBulkRawReader(this, stream, isMemory: false);
+		}
+
+		var streamToUse = _transform.Read.TransformData(new ChunkDataReadStream(stream));
+		return new TFChunkBulkDataReader(this, streamToUse, isMemory: false);
+	}
+
+	private unsafe UnmanagedMemoryStream CreateMemoryStream(int length, FileAccess access = FileAccess.Read) =>
+		new((byte*)_cachedData, length, length, access);
+
+	private async ValueTask<Stream> CreateFileStreamForBulkReader(CancellationToken token) {
+		if (_inMem)
+			return CreateMemoryStream(_fileSize);
+
+		var handle = await _fileSystem.OpenForReadAsync(
+			ChunkLocator,
+			IChunkFileSystem.ReadOptimizationHint.SequentialScan,
+			token);
+
+		return new PoolingBufferedStream(handle.CreateStream(leaveOpen: false)) {
+			MaxBufferSize = 65536
+		};
+	}
+
+	// tries to acquire a bulk reader over a memstream but
+	// (a) doesn't block if a file reader would be acceptable instead
+	//     (we might be in the middle of caching which could take a while)
+	// (b) _does_ throw if we can't get a memstream and a filestream is not acceptable
+	private bool TryAcquireBulkMemReader(bool raw, out TFChunkBulkReader reader) {
+		reader = null;
+
+		if (IsReadOnly) {
+			// chunk is definitely readonly and will remain so, so a filestream would be acceptable.
+			// we might be able to get a memstream but we don't want to wait for the lock in case we
+			// are currently performing a slow operation with it such as caching.
+			if (!_cachedDataLock.TryAcquire())
+				return false;
+
+			try {
+				return TryCreateBulkMemReaderUnsafe(raw, out reader);
+			} finally {
+				_cachedDataLock.Release();
+			}
+		}
+
+		// chunk is not readonly so it should be cached and let us create a mem reader
+		// (but might become readonly at any moment!)
+		if (TryCreateBulkMemReader(raw, out reader))
+			return true;
+
+		// we couldn't get a memreader, maybe we just became readonly and got uncached.
+		if (IsReadOnly) {
+			// we did become readonly, it is acceptable to fall back to filestream.
+			return false;
+		} else {
+			// we are not yet readonly, we shouldn't have failed to get a memstream and we
+			// cannot fall back to file stream.
+			throw new Exception("Failed to get a MemStream bulk reader for a non-readonly chunk.");
+		}
+	}
+
+	// 'unsafe' because _cachedDataLock must be acquired first
+	private bool TryCreateBulkMemReaderUnsafe(bool raw, out TFChunkBulkReader reader) {
+		Debug.Assert(_cachedDataLock.IsLockHeld);
+
+		if (_cacheStatus is not CacheStatus.Cached) {
+			reader = null;
+			return false;
+		}
+
+		if (raw && !_cachedDataTransformed) {
+			// we want a raw reader for a cached chunk (which should return transformed data)
+			// but the cached data is not transformed so we can't use it directly.
+			// (likely this chunk was cached before it was completed)
+			reader = null;
+			return false;
+		}
+
+		if (_cachedData is 0)
+			throw new Exception("Unexpected error: a cached chunk had no cached data");
+
+		// After incrementing the count we must return true
+		Interlocked.Increment(ref _memStreamCount);
+		var stream = CreateMemoryStream(_cachedLength);
+
+		if (raw) {
+			reader = new TFChunkBulkRawReader(chunk: this, streamToUse: stream, isMemory: true);
+			return true;
+		}
+
+		var streamToUse = new ChunkDataReadStream(stream);
+		streamToUse = (_cachedDataTransformed
+			? _transform.Read
+			: IdentityChunkReadTransform.Instance).TransformData(streamToUse);
+
+		reader = new TFChunkBulkDataReader(chunk: this, streamToUse: streamToUse, isMemory: true);
+
+		return true;
+	}
+
+	// creates a bulk reader over a memstream as long as we are cached
+	private bool TryCreateBulkMemReader(bool raw, out TFChunkBulkReader reader) {
+		_cachedDataLock.TryAcquire(InfiniteTimeSpan);
+		try {
+			return TryCreateBulkMemReaderUnsafe(raw, out reader);
+		} finally {
+			_cachedDataLock.Release();
+		}
+	}
+
+	public void ReleaseReader(TFChunkBulkReader reader) {
+		if (reader.IsMemory) {
+			switch (Interlocked.Decrement(ref _memStreamCount)) {
+				case < 0:
+					throw new Exception("Count of mem streams reduced below zero.");
+				case 0:
+					TryDestructMemStreams();
+					break;
+			}
+
+			return;
+		}
+
+		switch (Interlocked.Decrement(ref _fileStreamCount)) {
+			case < 0:
+				throw new Exception("Count of file streams reduced below zero.");
+			case 0 when _selfdestructin54321:
+				CleanUpFileStreamDestruction();
+				break;
+		}
+	}
+
+	public async IAsyncEnumerable<IChunkBlob> UnmergeAsync([EnumeratorCancellation] CancellationToken token) {
+		ThrowIfNotInitialized();
+		switch (_chunkHeader) {
+			case { IsSingleLogicalChunk: true }:
+				throw new InvalidOperationException($"Chunk: {ChunkLocator} is not merged");
+			case { IsScavenged: false }:
+				throw new InvalidOperationException($"Chunk: {ChunkLocator} is not scavenged");
+		}
+
+		if (!IsReadOnly)
+			throw new InvalidOperationException($"Chunk: {ChunkLocator} is not complete");
+
+		var recordReadResult = await _readSide.TryReadClosestForward(0L, token);
+
+		for (var logicalChunkNumber = _chunkHeader.ChunkStartNumber;
+			 logicalChunkNumber <= _chunkHeader.ChunkEndNumber;
+			 logicalChunkNumber++) {
+
+			var unmerged = await Spawn(logicalChunkNumber);
+			var writer = new ScavengedChunkWriter(unmerged);
+
+			while (recordReadResult.Success) {
+				var recordChunkNumber = (int)(recordReadResult.LogRecord.LogPosition / _chunkHeader.ChunkSize);
+				if (recordChunkNumber != logicalChunkNumber)
+					break;
+				await writer.WriteRecord(recordReadResult.LogRecord, token);
+				recordReadResult = await TryReadClosestForward(recordReadResult.NextPosition, token);
+			}
+
+			await writer.Complete(token);
+			yield return unmerged;
+		}
+
+		ValueTask<TFChunk> Spawn(int logicalChunkNumber) => CreateNew(
+			_fileSystem,
+			filename: Path.Combine(Path.GetDirectoryName(_filename)!, Guid.NewGuid() + ".unmerge.tmp"),
+			chunkDataSize: _chunkHeader.ChunkSize,
+			chunkStartNumber: logicalChunkNumber,
+			chunkEndNumber: logicalChunkNumber,
+			isScavenged: true,
+			inMem: _inMem,
+			unbuffered: _unbuffered,
+			writethrough: _writeThrough,
+			reduceFileCachePressure: _reduceFileCachePressure,
+			tracker: new TFChunkTracker.NoOp(),
+			getTransformFactory: _getTransformFactory,
+			token);
+	}
+
+	async ValueTask<IChunkRawReader> IChunkBlob.AcquireRawReader(CancellationToken token)
+		=> (IChunkRawReader)await AcquireRawReader(token);
+
+	[InitializationNotRequired]
+	public override string ToString() {
+		return string.Format("#{0}-{1} ({2})", _chunkHeader.ChunkStartNumber, _chunkHeader.ChunkEndNumber,
+			Path.GetFileName(ChunkLocator));
+	}
+
+	[StructLayout(LayoutKind.Auto)]
+	private readonly struct Midpoint(int itemIndex, in PosMap posmap) {
+		public readonly int ItemIndex = itemIndex;
+		public readonly long LogPos = posmap.LogPos;
+
+		public override string ToString() => $"ItemIndex: {ItemIndex}, LogPos: {LogPos}";
+	}
+
+	// all public members are thread-safe
+	[StructLayout(LayoutKind.Auto)]
+	private struct ReaderWorkItemPool() {
+		private volatile ReaderWorkItem[] _array;
+
+		// IndexPool supports up to 64 elements with O(1) take/return time complexity.
+		// It's a thread-safe data structure with no allocations that provide predictability about
+		// the indices: smallest available index is always preferred.
+		private IndexPool _indices = new() { IsEmpty = true };
+
+		public void Reuse() {
+			if (_array is null) {
+				Interlocked.CompareExchange(ref _array, new ReaderWorkItem[IndexPool.Capacity], null);
+			}
+
+			_indices.Reset();
+		}
+
+		// Skip index and type variance checks which is inserted by runtime typically because
+		// the array element is of reference type.
+		private static ref ReaderWorkItem UnsafeGetElement(ReaderWorkItem[] array, int index) {
+			Debug.Assert((uint)index < (uint)array.Length);
+
+			return ref Unsafe.Add(ref MemoryMarshal.GetArrayDataReference(array), index);
+		}
+
+		// releases all available slots in the pool
+		public int Drain(ref int referenceCount) {
+			int localReferenceCount = Interlocked.CompareExchange(ref referenceCount, 0, 0);
+
+			if (_array is { } array && localReferenceCount > 0) {
+				Span<int> indices = stackalloc int[IndexPool.Capacity];
+				int count = _indices.Take(indices);
+
+				foreach (var index in indices.Slice(0, count)) {
+					ref ReaderWorkItem slot = ref UnsafeGetElement(array, index);
+					slot?.Dispose();
+					slot = null;
+
+					localReferenceCount = Interlocked.Decrement(ref referenceCount);
+				}
+			}
+
+			return localReferenceCount;
+		}
+
+		public bool TryTake(out Slot slot) {
+			if (_array is { } array && _indices.TryTake(out int index)) {
+				slot = new(array, index);
+				return true;
+			}
+
+			slot = default;
+			return false;
+		}
+
+		public bool Return(ReaderWorkItem item) {
+			int index = item.PositionInPool;
+			if (index < 0)
+				return false;
+
+			_indices.Return(index);
+			return true;
+		}
+
+		[StructLayout(LayoutKind.Auto)]
+		internal readonly ref struct Slot(ReaderWorkItem[] array, int index) {
+			public int Index => index;
+
+			public ref ReaderWorkItem ValueRef => ref UnsafeGetElement(array, index);
+		}
+	}
+}
+
+/// <summary>
+/// Indicates that the public method of TFChunk can be called without EnsureInitialized.
+/// </summary>
+[AttributeUsage(AttributeTargets.Method)]
+[Conditional("DEBUG")]
+file sealed class InitializationNotRequiredAttribute : Attribute;
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/TFChunkReadSide.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/TFChunkReadSide.cs
new file mode 100644
index 00000000000..705b1af8e8a
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/TFChunkReadSide.cs
@@ -0,0 +1,654 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Buffers.Binary;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Buffers;
+using DotNext.IO;
+using DotNext.Threading;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.Time;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using Serilog;
+using Range = KurrentDB.Core.Data.Range;
+
+namespace KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+public partial class TFChunk {
+	public interface IChunkReadSide {
+		ValueTask<bool> ExistsAt(long logicalPosition, CancellationToken token);
+		ValueTask<long> GetActualPosition(long logicalPosition, CancellationToken token);
+		ValueTask<RecordReadResult> TryReadAt(long logicalPosition, bool couldBeScavenged, CancellationToken token);
+		ValueTask<RecordReadResult> TryReadFirst(CancellationToken token);
+		ValueTask<RecordReadResult> TryReadClosestForward(long logicalPosition, CancellationToken token);
+		ValueTask<RawReadResult> TryReadClosestForwardRaw(long logicalPosition, Func<int, byte[]> getBuffer, CancellationToken token);
+		ValueTask<RecordReadResult> TryReadLast(CancellationToken token);
+		ValueTask<RecordReadResult> TryReadClosestBackward(long logicalPosition, CancellationToken token);
+	}
+
+	private class TFChunkReadSideUnscavenged : TFChunkReadSide, IChunkReadSide {
+		public TFChunkReadSideUnscavenged(TFChunk chunk, ITransactionFileTracker tracker) : base(chunk, tracker) {
+			if (chunk._chunkHeader.IsScavenged)
+				throw new ArgumentException("Scavenged TFChunk passed into unscavenged chunk read side.");
+		}
+
+		public ValueTask<bool> ExistsAt(long logicalPosition, CancellationToken token)
+			=> token.IsCancellationRequested
+				? ValueTask.FromCanceled<bool>(token)
+				: ValueTask.FromResult(logicalPosition >= 0 && logicalPosition < Chunk.LogicalDataSize);
+
+		public ValueTask<long> GetActualPosition(long logicalPosition, CancellationToken token) {
+			Ensure.Nonnegative(logicalPosition, nameof(logicalPosition));
+
+			return token.IsCancellationRequested
+			? ValueTask.FromCanceled<long>(token)
+			: ValueTask.FromResult(logicalPosition >= Chunk.LogicalDataSize ? -1 : logicalPosition);
+		}
+
+		public async ValueTask<RecordReadResult> TryReadAt(long logicalPosition, bool couldBeScavenged, CancellationToken token) {
+			var start = Instant.Now;
+			var workItem = Chunk.GetReaderWorkItem();
+			try {
+				if (logicalPosition >= Chunk.LogicalDataSize) {
+					_log.Warning(
+						"Tried to read logical position {logicalPosition} which is greater than the chunk's logical size of {chunkLogicalSize}",
+						logicalPosition, Chunk.LogicalDataSize);
+					return RecordReadResult.Failure;
+				}
+
+				var (record, length) = await TryReadForwardInternal(start, workItem, logicalPosition, token);
+				return new RecordReadResult(record is not null, -1, record, length);
+			} finally {
+				Chunk.ReturnReaderWorkItem(workItem);
+			}
+		}
+
+		public ValueTask<RecordReadResult> TryReadFirst(CancellationToken token)
+			=> TryReadClosestForward(0, token);
+
+		public async ValueTask<RecordReadResult> TryReadClosestForward(long logicalPosition, CancellationToken token) {
+			var start = Instant.Now;
+			var workItem = Chunk.GetReaderWorkItem();
+			try {
+				if (logicalPosition >= Chunk.LogicalDataSize)
+					return RecordReadResult.Failure;
+
+				if (await TryReadForwardInternal(start, workItem, logicalPosition, token) is not ( { } record, var length))
+					return RecordReadResult.Failure;
+
+				long nextLogicalPos = record.GetNextLogPosition(logicalPosition, length);
+				return new(true, nextLogicalPos, record, length);
+			} finally {
+				Chunk.ReturnReaderWorkItem(workItem);
+			}
+		}
+
+		public async ValueTask<RawReadResult> TryReadClosestForwardRaw(long logicalPosition, Func<int, byte[]> getBuffer, CancellationToken token) {
+			var workItem = Chunk.GetReaderWorkItem();
+			try {
+				if (logicalPosition >= Chunk.LogicalDataSize)
+					return RawReadResult.Failure;
+
+				if (await TryReadForwardRawInternal(workItem, logicalPosition, getBuffer, token) is not { Array: not null } record)
+					return RawReadResult.Failure;
+
+				var nextLogicalPos = logicalPosition + record.Count + 2 * sizeof(int);
+				return new(true, nextLogicalPos, record.Array, record.Count);
+			} finally {
+				Chunk.ReturnReaderWorkItem(workItem);
+			}
+		}
+
+		public ValueTask<RecordReadResult> TryReadLast(CancellationToken token)
+			=> TryReadClosestBackward(Chunk.LogicalDataSize, token);
+
+		public async ValueTask<RecordReadResult> TryReadClosestBackward(long logicalPosition, CancellationToken token) {
+			var start = Instant.Now;
+			var workItem = Chunk.GetReaderWorkItem();
+			try {
+				// here we allow actualPosition == _logicalDataSize as we can read backward the very last record that way
+				if (logicalPosition > Chunk.LogicalDataSize)
+					return RecordReadResult.Failure;
+
+				if (await TryReadBackwardInternal(start, workItem, logicalPosition, token) is not ( { } record, var length))
+					return RecordReadResult.Failure;
+
+				long nextLogicalPos = record.GetPrevLogPosition(logicalPosition, length);
+				return new RecordReadResult(true, nextLogicalPos, record, length);
+			} finally {
+				Chunk.ReturnReaderWorkItem(workItem);
+			}
+		}
+	}
+
+	private class TFChunkReadSideScavenged : TFChunkReadSide, IChunkReadSide {
+		// must hold _lock to assign to _midpoints
+		private readonly AsyncExclusiveLock _lock = new();
+		private Midpoint[] _midpoints;
+
+		public TFChunkReadSideScavenged(TFChunk chunk, ITransactionFileTracker tracker)
+			: base(chunk, tracker) {
+			if (!chunk._chunkHeader.IsScavenged)
+				throw new ArgumentException($"Chunk provided is not scavenged: {chunk}");
+		}
+
+		private async ValueTask<Midpoint[]> GetOrCreateMidPoints(ReaderWorkItem workItem, CancellationToken token) {
+			// double-checked lock pattern
+			if (_midpoints is { } midpoints)
+				return midpoints;
+
+			await _lock.AcquireAsync(token);
+			try {
+				if (_midpoints is { } midpointsDouble)
+					return midpointsDouble;
+
+				_midpoints = await PopulateMidpoints(Chunk._midpointsDepth, workItem, token);
+				return _midpoints;
+			} finally {
+				_lock.Release();
+			}
+		}
+
+		private async ValueTask<Midpoint[]> PopulateMidpoints(int depth, ReaderWorkItem workItem,
+			CancellationToken token) {
+			if (depth > 31)
+				throw new ArgumentOutOfRangeException(nameof(depth), "Depth too for midpoints.");
+
+			var mapCount = Chunk.ChunkFooter.MapCount;
+			if (mapCount is 0) // empty chunk
+				return [];
+
+			var posmapSize = Chunk.ChunkFooter.IsMap12Bytes ? PosMap.FullSize : PosMap.DeprecatedSize;
+			using var posMapTable = UnmanagedMemory.Allocate<byte>(posmapSize * mapCount);
+
+			// write the table once
+			workItem.BaseStream.Position = ChunkHeader.Size + Chunk.ChunkFooter.PhysicalDataSize;
+			await workItem.BaseStream.ReadExactlyAsync(posMapTable.Memory, token);
+
+			return CreateMidpoints(posMapTable.Span, depth, mapCount, posmapSize);
+
+			static Midpoint[] CreateMidpoints(ReadOnlySpan<byte> posMapTable, int depth, int mapCount, int posmapSize) {
+				int midPointsCnt = 1 << depth;
+				int segmentSize;
+				Midpoint[] midpoints;
+				if (mapCount < midPointsCnt) {
+					segmentSize = 1; // we cache all items
+					midpoints = GC.AllocateUninitializedArray<Midpoint>(mapCount);
+				} else {
+					segmentSize = mapCount / midPointsCnt;
+					midpoints = GC.AllocateUninitializedArray<Midpoint>(1 + (mapCount + segmentSize - 1) /
+						segmentSize);
+				}
+
+				var i = 0;
+				for (int x = 0, xN = mapCount - 1; x < xN; x += segmentSize, i++) {
+					midpoints[i] = new(x, ReadPosMap(posMapTable, x, posmapSize));
+				}
+
+				// add the very last item as the last midpoints (there can be 0, 1 or more of these)
+				var lastMidpoint = new Midpoint(mapCount - 1, ReadPosMap(posMapTable, mapCount - 1, posmapSize));
+				while (i < midpoints.Length) {
+					midpoints[i++] = lastMidpoint;
+				}
+
+				return midpoints;
+			}
+		}
+
+		private static unsafe PosMap ReadPosMap(ReadOnlySpan<byte> table, int index, int posmapSize) {
+			delegate*<ReadOnlySpan<byte>, PosMap> factory;
+			if (posmapSize is PosMap.FullSize) {
+				factory = &PosMap.FromNewFormat;
+			} else {
+				factory = &PosMap.FromOldFormat;
+			}
+
+			return factory(table.Slice(index * posmapSize, posmapSize));
+		}
+
+		public async ValueTask<bool> ExistsAt(long logicalPosition, CancellationToken token) {
+			var workItem = Chunk.GetReaderWorkItem();
+			try {
+				var actualPosition = await TranslateExactPosition(workItem, logicalPosition, token);
+				return actualPosition >= 0 && actualPosition < Chunk.PhysicalDataSize;
+			} finally {
+				Chunk.ReturnReaderWorkItem(workItem);
+			}
+		}
+
+		public async ValueTask<long> GetActualPosition(long logicalPosition, CancellationToken token) {
+			Ensure.Nonnegative(logicalPosition, nameof(logicalPosition));
+
+			var workItem = Chunk.GetReaderWorkItem();
+			try {
+				return await TranslateExactPosition(workItem, logicalPosition, token);
+			} finally {
+				Chunk.ReturnReaderWorkItem(workItem);
+			}
+		}
+
+		public async ValueTask<RecordReadResult> TryReadAt(long logicalPosition, bool couldBeScavenged, CancellationToken token) {
+			var start = Instant.Now;
+			var workItem = Chunk.GetReaderWorkItem();
+			try {
+				var actualPosition = await TranslateExactPosition(workItem, logicalPosition, token);
+				if (actualPosition is -1 || actualPosition >= Chunk.PhysicalDataSize) {
+					if (!couldBeScavenged) {
+						_log.Warning(
+							"Tried to read actual position {actualPosition}, translated from logPosition {logicalPosition}, " +
+							"which is greater than the chunk's physical size of {chunkPhysicalSize}",
+							actualPosition, logicalPosition, Chunk.PhysicalDataSize);
+					}
+					return RecordReadResult.Failure;
+				}
+
+				var (record, length) = await TryReadForwardInternal(start, workItem, actualPosition, token);
+				return new(record is not null, -1, record, length);
+			} finally {
+				Chunk.ReturnReaderWorkItem(workItem);
+			}
+		}
+
+		private async ValueTask<int> TranslateExactPosition(ReaderWorkItem workItem, long pos, CancellationToken token) {
+			return await GetOrCreateMidPoints(workItem, token) is { Length: > 0 } midpoints
+				? await TranslateExactWithMidpoints(workItem, midpoints, pos, token)
+				: await TranslateWithoutMidpoints(workItem, pos, 0, Chunk.ChunkFooter.MapCount - 1, exactMatch: true, token);
+		}
+
+		private ValueTask<int> TranslateExactWithMidpoints(ReaderWorkItem workItem, ReadOnlySpan<Midpoint> midpoints, long pos, CancellationToken token) {
+			if (pos < midpoints[0].LogPos || pos > midpoints[^1].LogPos)
+				return ValueTask.FromResult(-1);
+
+			var recordRange = LocatePosRange(midpoints, pos);
+			return TranslateWithoutMidpoints(workItem, pos, recordRange.Lower, recordRange.Upper, exactMatch: true, token);
+		}
+
+		public ValueTask<RecordReadResult> TryReadFirst(CancellationToken token)
+			=> TryReadClosestForward(0, token);
+
+		public async ValueTask<RecordReadResult> TryReadClosestForward(long logicalPosition, CancellationToken token) {
+			if (Chunk.ChunkFooter.MapCount is 0)
+				return RecordReadResult.Failure;
+
+			var start = Instant.Now;
+			var workItem = Chunk.GetReaderWorkItem();
+			try {
+				var actualPosition = await TranslateClosestForwardPosition(workItem, logicalPosition, token);
+				if (actualPosition is -1 || actualPosition >= Chunk.PhysicalDataSize)
+					return RecordReadResult.Failure;
+
+				if (await TryReadForwardInternal(start, workItem, actualPosition, token) is not ( { } record, var length))
+					return RecordReadResult.Failure;
+
+				long nextLogicalPos =
+					Chunk.ChunkHeader.GetLocalLogPosition(record.GetNextLogPosition(record.LogPosition, length));
+				return new RecordReadResult(true, nextLogicalPos, record, length);
+			} finally {
+				Chunk.ReturnReaderWorkItem(workItem);
+			}
+		}
+
+		public async ValueTask<RawReadResult> TryReadClosestForwardRaw(long logicalPosition, Func<int, byte[]> getBuffer, CancellationToken token) {
+			if (Chunk.ChunkFooter.MapCount == 0)
+				return RawReadResult.Failure;
+
+			var workItem = Chunk.GetReaderWorkItem();
+			try {
+				var actualPosition = await TranslateClosestForwardPosition(workItem, logicalPosition, token);
+				if (actualPosition is -1 || actualPosition >= Chunk.PhysicalDataSize)
+					return RawReadResult.Failure;
+
+				if (await TryReadForwardRawInternal(workItem, actualPosition, getBuffer, token) is not { Array: not null } record)
+					return RawReadResult.Failure;
+
+				// We need to read the record's log position from the buffer so that we can correctly compute
+				// the next position. Simply adding the record's length, suffix & prefix to "logicalPosition" won't
+				// work properly with scavenged chunks since the computed position may still be before the current
+				// record's position, which would cause us to read it again.
+				if (!BitConverter.IsLittleEndian)
+					throw new NotSupportedException();
+
+				const int logPositionOffset = 2;
+				var recordLogPos = BitConverter.ToInt64(record.Array, logPositionOffset);
+				long nextLogicalPos =
+					Chunk.ChunkHeader.GetLocalLogPosition(recordLogPos + record.Count + 2 * sizeof(int));
+
+				return new(true, nextLogicalPos, record.Array, record.Count);
+			} finally {
+				Chunk.ReturnReaderWorkItem(workItem);
+			}
+		}
+
+		public ValueTask<RecordReadResult> TryReadLast(CancellationToken token)
+			=> TryReadClosestBackward(Chunk.LogicalDataSize, token);
+
+		public async ValueTask<RecordReadResult> TryReadClosestBackward(long logicalPosition, CancellationToken token) {
+			if (Chunk.ChunkFooter.MapCount == 0)
+				return RecordReadResult.Failure;
+
+			var start = Instant.Now;
+			var workItem = Chunk.GetReaderWorkItem();
+			try {
+				var actualPosition = await TranslateClosestForwardPosition(workItem, logicalPosition, token);
+				// here we allow actualPosition == _physicalDataSize as we can read backward the very last record that way
+				if (actualPosition is -1 || actualPosition > Chunk.PhysicalDataSize)
+					return RecordReadResult.Failure;
+
+				if (await TryReadBackwardInternal(start, workItem, actualPosition, token) is not ( { } record, var length))
+					return RecordReadResult.Failure;
+
+				long nextLogicalPos = Chunk.ChunkHeader.GetLocalLogPosition(record.LogPosition);
+				return new(true, nextLogicalPos, record, length);
+			} finally {
+				Chunk.ReturnReaderWorkItem(workItem);
+			}
+		}
+
+		private async ValueTask<int> TranslateClosestForwardPosition(ReaderWorkItem workItem, long logicalPosition, CancellationToken token) {
+			return await GetOrCreateMidPoints(workItem, token) is { Length: > 0 } midpoints
+				? await TranslateClosestForwardWithMidpoints(workItem, midpoints, logicalPosition, token)
+				: await TranslateWithoutMidpoints(workItem, logicalPosition, 0,
+					Chunk.ChunkFooter.MapCount - 1, exactMatch: false, token);
+		}
+
+		private ValueTask<int> TranslateClosestForwardWithMidpoints(ReaderWorkItem workItem, ReadOnlySpan<Midpoint> midpoints, long pos, CancellationToken token) {
+			// to allow backward reading of the last record, forward read will decline anyway
+			if (pos > midpoints[^1].LogPos)
+				return ValueTask.FromResult(Chunk.PhysicalDataSize);
+
+			var recordRange = LocatePosRange(midpoints, pos);
+			return TranslateWithoutMidpoints(workItem, pos, recordRange.Lower, recordRange.Upper, exactMatch: false, token);
+		}
+
+		private async ValueTask<int> TranslateWithoutMidpoints(ReaderWorkItem workItem, long pos, long startIndex,
+			long endIndex, [ConstantExpected] bool exactMatch, CancellationToken token) {
+			var count = (int)(endIndex - startIndex + 1L);
+			var posmapSize = Chunk.ChunkFooter.IsMap12Bytes
+				? PosMap.FullSize
+				: PosMap.DeprecatedSize;
+
+			using var buffer = Memory.AllocateExactly<byte>(count * posmapSize);
+			workItem.BaseStream.Position =
+				ChunkHeader.Size + Chunk.ChunkFooter.PhysicalDataSize + startIndex * posmapSize;
+
+			await workItem.BaseStream.ReadExactlyAsync(buffer.Memory, token);
+			return exactMatch ? ExactMatch(buffer.Span) : ClosestForward(buffer.Span);
+
+			int ExactMatch(ReadOnlySpan<byte> segment) {
+				for (int low = 0, high = count - 1; low <= high;) {
+					var mid = low + (high - low) / 2;
+					var v = ReadPosMap(segment, mid, posmapSize);
+
+					if (v.LogPos == pos)
+						return v.ActualPos;
+					if (v.LogPos < pos)
+						low = mid + 1;
+					else
+						high = mid - 1;
+				}
+
+				return -1;
+			}
+
+			int ClosestForward(ReadOnlySpan<byte> segment) {
+				var res = ReadPosMap(segment, count - 1, posmapSize);
+
+				// to allow backward reading of the last record, forward read will decline anyway
+				if (pos > res.LogPos)
+					return Chunk.PhysicalDataSize;
+
+				for (int low = 0, high = count - 1; low < high;) {
+					var mid = low + (high - low) / 2;
+					var v = ReadPosMap(segment, mid, posmapSize);
+
+					if (v.LogPos < pos)
+						low = mid + 1;
+					else {
+						high = mid;
+						res = v;
+					}
+				}
+
+				return res.ActualPos;
+			}
+		}
+
+		private static Range LocatePosRange(ReadOnlySpan<Midpoint> midpoints, long pos) {
+			int lowerMidpoint = LowerMidpointBound(midpoints, pos);
+			int upperMidpoint = UpperMidpointBound(midpoints, pos);
+			return new(midpoints[lowerMidpoint].ItemIndex, midpoints[upperMidpoint].ItemIndex);
+		}
+
+		/// <summary>
+		/// Returns the index of lower midpoint for given logical position.
+		/// Assumes it always exists.
+		/// </summary>
+		private static int LowerMidpointBound(ReadOnlySpan<Midpoint> midpoints, long pos) {
+			int l = 0;
+			int r = midpoints.Length - 1;
+			while (l < r) {
+				int m = l + (r - l + 1) / 2;
+				if (midpoints[m].LogPos <= pos)
+					l = m;
+				else
+					r = m - 1;
+			}
+
+			return l;
+		}
+
+		/// <summary>
+		/// Returns the index of upper midpoint for given logical position.
+		/// Assumes it always exists.
+		/// </summary>
+		private static int UpperMidpointBound(ReadOnlySpan<Midpoint> midpoints, long pos) {
+			int l = 0;
+			int r = midpoints.Length - 1;
+			while (l < r) {
+				int m = l + (r - l) / 2;
+				if (midpoints[m].LogPos >= pos)
+					r = m;
+				else
+					l = m + 1;
+			}
+
+			return l;
+		}
+	}
+
+	private abstract class TFChunkReadSide {
+		protected readonly TFChunk Chunk;
+		protected readonly ILogger _log = Log.ForContext<TFChunkReader>();
+		private readonly ITransactionFileTracker _tracker;
+
+		protected TFChunkReadSide(TFChunk chunk, ITransactionFileTracker tracker) {
+			Ensure.NotNull(chunk, "chunk");
+			Chunk = chunk;
+			_tracker = tracker;
+		}
+
+		private bool ValidateRecordPosition(long actualPosition) {
+			// no space even for length prefix and suffix
+			if (actualPosition + 2 * sizeof(int) > Chunk.PhysicalDataSize) {
+				_log.Warning(
+					"Tried to read actual position {actualPosition}, but there isn't enough space for a record left in the chunk. Chunk's data size: {chunkPhysicalDataSize}",
+					actualPosition, Chunk.PhysicalDataSize);
+				return false;
+			}
+
+			return true;
+		}
+
+		private void ValidateRecordLength(int length, long actualPosition) {
+			if (length <= 0) {
+				throw new InvalidReadException(
+					$"Log record at actual pos {actualPosition} has non-positive length: {length}. " +
+					$" in chunk {Chunk}.");
+			}
+
+			if (length > TFConsts.MaxLogRecordSize) {
+				throw new InvalidReadException(
+					$"Log record at actual pos {actualPosition} has too large length: {length} bytes, " +
+					$"while limit is {TFConsts.MaxLogRecordSize} bytes. In chunk {Chunk}.");
+			}
+
+			if (actualPosition + length + 2 * sizeof(int) > Chunk.PhysicalDataSize) {
+				throw new UnableToReadPastEndOfStreamException(
+					$"There is not enough space to read full record (length prefix: {length}). " +
+					$"Actual pre-position: {actualPosition}. Something is seriously wrong in chunk {Chunk}.");
+			}
+		}
+
+		private void ValidatePrefixSuffixLength(int prefixLength, int suffixLength, long actualPosition, string actualPositionType) {
+			// verify suffix length == prefix length
+			if (suffixLength != prefixLength) {
+				throw new InvalidReadException(
+					$"Prefix/suffix length inconsistency: prefix length ({prefixLength}) != suffix length ({suffixLength}).\n" +
+					$"Actual {actualPositionType}: {actualPosition}. Something is seriously wrong in chunk {Chunk}.");
+			}
+		}
+
+		protected async ValueTask<(ILogRecord, int)> TryReadForwardInternal(Instant start, ReaderWorkItem workItem, long actualPosition, CancellationToken token) {
+			workItem.BaseStream.Position = GetRawPosition(actualPosition);
+			if (!ValidateRecordPosition(actualPosition))
+				return (null, -1);
+
+			int length;
+			var buffer = Memory.AllocateAtLeast<byte>(sizeof(int));
+
+			// Perf: use 'try-catch' instead of 'using' to avoid defensive copy of 'buffer' caused by the compiler
+			try {
+				length = await workItem.BaseStream.ReadLittleEndianAsync<int>(buffer.Memory, token);
+				ValidateRecordLength(length, actualPosition);
+			} finally {
+				buffer.Dispose();
+			}
+
+			// log record payload + length suffix
+			var lengthWithSuffix = length + sizeof(int);
+			ILogRecord record;
+			IBufferedReader bufferedReader = null;
+			try {
+				// Perf: if buffered stream contains necessary amount of buffered bytes, we can omit expensive buffer
+				// rental and copy
+				if ((bufferedReader = workItem.TryGetBufferedReader(lengthWithSuffix, out var input)) is null) {
+					buffer = Memory.AllocateExactly<byte>(lengthWithSuffix);
+					await workItem.BaseStream.ReadExactlyAsync(buffer.Memory, token);
+					input = buffer.Memory;
+				} else {
+					Debug.Assert(buffer.IsEmpty);
+				}
+
+				var reader = new SequenceReader(new(input[..length]));
+				record = LogRecord.ReadFrom(ref reader);
+
+				_tracker.OnRead(start, record, workItem.Source);
+
+				int suffixLength =
+					BinaryPrimitives.ReadInt32LittleEndian(input.Span[^sizeof(int)..]);
+
+				ValidatePrefixSuffixLength(length, suffixLength, actualPosition, "pre-position");
+			} catch (Exception exc) {
+				throw new InvalidReadException(
+					$"Error while reading log record forwards at actual position {actualPosition}. {exc.Message}");
+			} finally {
+				bufferedReader?.Consume(lengthWithSuffix);
+				buffer.Dispose();
+			}
+
+			return (record, length);
+		}
+
+		protected async ValueTask<ArraySegment<byte>> TryReadForwardRawInternal(ReaderWorkItem workItem, long actualPosition, Func<int, byte[]> getBuffer,
+			CancellationToken token) {
+			workItem.BaseStream.Position = GetRawPosition(actualPosition);
+			if (!ValidateRecordPosition(actualPosition))
+				return default;
+
+			using var buffer = Memory.AllocateAtLeast<byte>(sizeof(int));
+			var length = await workItem.BaseStream.ReadLittleEndianAsync<int>(buffer.Memory, token);
+			ValidateRecordLength(length, actualPosition);
+
+			var record = getBuffer(length);
+			await workItem.BaseStream.ReadExactlyAsync(record.AsMemory(0, length), token);
+
+			var suffixLength = await workItem.BaseStream.ReadLittleEndianAsync<int>(buffer.Memory, token);
+			ValidatePrefixSuffixLength(length, suffixLength, actualPosition, "pre-position");
+
+			return new(record, 0, length);
+		}
+
+		protected async ValueTask<(ILogRecord, int)> TryReadBackwardInternal(Instant start, ReaderWorkItem workItem, long actualPosition, CancellationToken token) {
+			// no space even for length prefix and suffix
+			if (actualPosition < 2 * sizeof(int)) {
+				_log.Warning(
+					"Tried to read actual position {actualPosition}, but the position isn't large enough to contain a record",
+					actualPosition);
+				return (null, -1);
+			}
+
+			var realPos = GetRawPosition(actualPosition);
+			workItem.BaseStream.Position = realPos - sizeof(int);
+			int length;
+			MemoryOwner<byte> buffer;
+
+			using (buffer = Memory.AllocateAtLeast<byte>(sizeof(int))) {
+				length = await workItem.BaseStream.ReadLittleEndianAsync<int>(buffer.Memory, token);
+				if (length <= 0) {
+					throw new InvalidReadException(
+						string.Format("Log record that ends at actual pos {0} has non-positive length: {1}. "
+									  + "In chunk {2}.",
+							actualPosition, length, Chunk));
+				}
+
+				if (length > TFConsts.MaxLogRecordSize) {
+					throw new InvalidReadException(
+						string.Format("Log record that ends at actual pos {0} has too large length: {1} bytes, "
+									  + "while limit is {2} bytes. In chunk {3}.",
+							actualPosition, length, TFConsts.MaxLogRecordSize, Chunk));
+				}
+
+				if (actualPosition < length + 2 * sizeof(int)) // no space for record + length prefix and suffix
+				{
+					throw new UnableToReadPastEndOfStreamException(
+						string.Format("There is not enough space to read full record (length suffix: {0}). "
+									  + "Actual post-position: {1}. Something is seriously wrong in chunk {2}.",
+							length, actualPosition, Chunk));
+				}
+
+				workItem.BaseStream.Position = realPos - length - 2 * sizeof(int);
+
+				// verify suffix length == prefix length
+				int prefixLength = await workItem.BaseStream.ReadLittleEndianAsync<int>(buffer.Memory, token);
+				ValidatePrefixSuffixLength(prefixLength, length, actualPosition, "post-position");
+			}
+
+			ILogRecord record;
+			buffer = Memory.AllocateExactly<byte>(length);
+			try {
+				await workItem.BaseStream.ReadExactlyAsync(buffer.Memory, token);
+				var reader = new SequenceReader(new(buffer.Memory));
+				record = LogRecord.ReadFrom(ref reader);
+			} catch (Exception exc) {
+				throw new InvalidReadException(
+					$"Error while reading log record backwards at actual position {actualPosition}. {exc.Message}");
+			} finally {
+				buffer.Dispose();
+			}
+
+			_tracker.OnRead(start, record, workItem.Source);
+
+			return (record, length);
+		}
+	}
+}
+
+public class InvalidReadException : Exception {
+	public InvalidReadException(string message) : base(message) {
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/WriterWorkItem.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/WriterWorkItem.cs
new file mode 100644
index 00000000000..025873f1f4a
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunk/WriterWorkItem.cs
@@ -0,0 +1,128 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Security.Cryptography;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext;
+using DotNext.Buffers;
+using DotNext.IO;
+using DotNext.Runtime;
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+// see CancellationToken comment at the top of TFChunk.cs
+internal sealed class WriterWorkItem : Disposable {
+	public const int BufferSize = 8192;
+
+	public Stream WorkingStream { get; private set; }
+
+	private readonly ChunkDataWriteStream _fileStream;
+	private readonly IBufferedWriter _cachedWriter;
+	private Stream _memStream;
+	public readonly IncrementalHash MD5;
+
+	public unsafe WriterWorkItem(nint memoryPtr, int length, IncrementalHash md5,
+		IChunkWriteTransform chunkWriteTransform, int initialStreamPosition) {
+		var memStream = new UnmanagedMemoryStream((byte*)memoryPtr, length, length, FileAccess.ReadWrite) {
+			Position = initialStreamPosition,
+		};
+
+		var chunkDataWriteStream = new ChunkDataWriteStream(memStream, md5);
+		WorkingStream = _memStream = chunkWriteTransform.TransformData(chunkDataWriteStream);
+		MD5 = md5;
+	}
+
+	public WriterWorkItem(IChunkHandle handle, IncrementalHash md5, bool unbuffered,
+		IChunkWriteTransform chunkWriteTransform, int initialStreamPosition) {
+		var chunkStream = handle.CreateStream();
+		var fileStream = unbuffered
+			? chunkStream
+			: new PoolingBufferedStream(chunkStream) { MaxBufferSize = BufferSize };
+		fileStream.Position = initialStreamPosition;
+		var chunkDataWriteStream = new ChunkDataWriteStream(fileStream, md5);
+
+		WorkingStream = _fileStream = chunkWriteTransform.TransformData(chunkDataWriteStream);
+		MD5 = md5;
+		_cachedWriter = Intrinsics.IsExactTypeOf<ChunkDataWriteStream>(_fileStream)
+			? fileStream as IBufferedWriter
+			: null;
+	}
+
+	public Memory<byte> TryGetDirectBuffer(int length) {
+		Memory<byte> buffer;
+		if (_cachedWriter is PoolingBufferedStream { HasBufferedDataToRead: false }
+			&& (buffer = _cachedWriter.Buffer).Length >= length) {
+			buffer = buffer.Slice(0, length);
+		} else {
+			buffer = Memory<byte>.Empty;
+		}
+
+		return buffer;
+	}
+
+	public void SetMemStream(UnmanagedMemoryStream memStream) {
+		_memStream = memStream;
+		if (_fileStream is null)
+			WorkingStream = memStream;
+	}
+
+	// this method can throw, and if it does the two streams may be out of sync with each other
+	// at the moment callers need to realise this and not use this object any more.
+	// we don't pass the CancellationToken to WriteAsync because cancelling there would
+	// also leave this object in an invalid state.
+	public ValueTask AppendData(ReadOnlyMemory<byte> buf, CancellationToken _) {
+		// MEMORY (in-memory write doesn't require async I/O)
+		_memStream?.Write(buf.Span);
+
+		// as we are always append-only, stream's position should be right here
+		return _fileStream?.WriteAsync(buf, CancellationToken.None) ?? ValueTask.CompletedTask;
+	}
+
+	internal void AppendData(int length) {
+		Debug.Assert(_cachedWriter is not null);
+
+		ReadOnlySpan<byte> buffer = _cachedWriter.Buffer.Span.Slice(0, length);
+
+		// MEMORY (in-memory write doesn't require async I/O)
+		_memStream?.Write(buffer);
+
+		_cachedWriter.Produce(length);
+		MD5.AppendData(buffer);
+	}
+
+	public void ResizeFileStream(long fileSize) {
+		_fileStream?.SetLength(fileSize);
+	}
+
+	protected override void Dispose(bool disposing) {
+		if (disposing) {
+			_fileStream?.Dispose();
+			DisposeMemStream();
+			MD5.Dispose();
+		}
+
+		base.Dispose(disposing);
+	}
+
+	public ValueTask FlushToDisk(CancellationToken token) {
+		// in-mem stream doesn't require async call
+		_memStream?.Flush();
+
+		return new(_fileStream is not null ? _fileStream.FlushAsync(token) : Task.CompletedTask);
+	}
+
+	public void FlushToDisk() {
+		_fileStream?.Flush();
+		_memStream?.Flush();
+	}
+
+	public void DisposeMemStream() {
+		_memStream?.Dispose();
+		_memStream = null;
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkBulkDataReader.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkBulkDataReader.cs
new file mode 100644
index 00000000000..41aafb58001
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkBulkDataReader.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+namespace KurrentDB.Core.TransactionLog.Chunks;
+
+public sealed class TFChunkBulkDataReader(TFChunk.TFChunk chunk, Stream streamToUse, bool isMemory)
+	: TFChunkBulkReader(chunk, streamToUse, isMemory) {
+
+	public override void SetPosition(long dataPosition) {
+		var rawPos = dataPosition + ChunkHeader.Size;
+		Stream.Position = rawPos;
+	}
+
+	public override async ValueTask<BulkReadResult> ReadNextBytes(Memory<byte> buffer, CancellationToken token) {
+		if (Stream.Position is 0)
+			Stream.Position = ChunkHeader.Size;
+
+		var oldPos = (int)Stream.Position - ChunkHeader.Size;
+		var toRead = Math.Min(Chunk.PhysicalDataSize - oldPos, buffer.Length);
+		Debug.Assert(toRead >= 0);
+		Stream.Position = Stream.Position; // flush read buffer
+		int bytesRead = await Stream.ReadAsync(buffer.Slice(0, toRead), token);
+		return new(oldPos,
+			bytesRead,
+			isEof: Chunk.IsReadOnly && oldPos + bytesRead == Chunk.PhysicalDataSize);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkBulkRawReader.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkBulkRawReader.cs
new file mode 100644
index 00000000000..94d6d42766b
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkBulkRawReader.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+namespace KurrentDB.Core.TransactionLog.Chunks;
+
+public sealed class TFChunkBulkRawReader(TFChunk.TFChunk chunk, Stream streamToUse, bool isMemory)
+	: TFChunkBulkReader(chunk, streamToUse, isMemory), IChunkRawReader {
+
+	public override void SetPosition(long rawPosition) {
+		if (rawPosition >= Stream.Length)
+			throw new ArgumentOutOfRangeException(nameof(rawPosition),
+				$"Raw position {rawPosition} is out of bounds.");
+		Stream.Position = rawPosition;
+	}
+
+	Stream IChunkRawReader.Stream => Stream;
+
+	public override async ValueTask<BulkReadResult> ReadNextBytes(Memory<byte> buffer, CancellationToken token) {
+		var oldPos = (int)Stream.Position;
+		int bytesRead = await Stream.ReadAsync(buffer, token);
+		return new(oldPos, bytesRead, isEof: Stream.Length == Stream.Position);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkBulkReader.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkBulkReader.cs
new file mode 100644
index 00000000000..59ee9a19c54
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkBulkReader.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+
+namespace KurrentDB.Core.TransactionLog.Chunks;
+
+public abstract class TFChunkBulkReader : IDisposable {
+	public TFChunk.TFChunk Chunk {
+		get { return _chunk; }
+	}
+
+	internal Stream Stream {
+		get { return _stream; }
+	}
+
+	private readonly TFChunk.TFChunk _chunk;
+	private readonly Stream _stream;
+	private bool _disposed;
+	public bool IsMemory { get; }
+
+	protected TFChunkBulkReader(TFChunk.TFChunk chunk, Stream streamToUse, bool isMemory) {
+		Ensure.NotNull(chunk, "chunk");
+		Ensure.NotNull(streamToUse, "stream");
+		_chunk = chunk;
+		_stream = streamToUse;
+		IsMemory = isMemory;
+	}
+
+	public abstract void SetPosition(long position);
+	public abstract ValueTask<BulkReadResult> ReadNextBytes(Memory<byte> buffer, CancellationToken token);
+
+	~TFChunkBulkReader() {
+		Dispose();
+	}
+
+	public void Release() {
+		_stream.Dispose();
+		_disposed = true;
+		_chunk.ReleaseReader(this);
+	}
+
+	public void Dispose() {
+		if (_disposed)
+			return;
+		Release();
+		GC.SuppressFinalize(this);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkChaser.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkChaser.cs
new file mode 100644
index 00000000000..b62bf72ec4a
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkChaser.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+
+namespace KurrentDB.Core.TransactionLog.Chunks;
+
+public class TFChunkChaser : ITransactionFileChaser {
+	public ICheckpoint Checkpoint {
+		get { return _chaserCheckpoint; }
+	}
+
+	private readonly TFChunkDb _db;
+	private readonly IReadOnlyCheckpoint _writerCheckpoint;
+	private readonly ICheckpoint _chaserCheckpoint;
+	private TFChunkReader _reader;
+
+	public TFChunkChaser(TFChunkDb db, IReadOnlyCheckpoint writerCheckpoint, ICheckpoint chaserCheckpoint) {
+		Ensure.NotNull(db, "dbConfig");
+		Ensure.NotNull(writerCheckpoint, "writerCheckpoint");
+		Ensure.NotNull(chaserCheckpoint, "chaserCheckpoint");
+
+		_db = db;
+		_writerCheckpoint = writerCheckpoint;
+		_chaserCheckpoint = chaserCheckpoint;
+	}
+
+	public void Open() {
+		_reader = new TFChunkReader(_db, _writerCheckpoint, _chaserCheckpoint.Read());
+	}
+
+	public async ValueTask<SeqReadResult> TryReadNext(CancellationToken token) {
+		var res = await _reader.TryReadNext(token);
+		if (res.Success)
+			_chaserCheckpoint.Write(res.RecordPostPosition);
+		else
+			_chaserCheckpoint.Write(_reader.CurrentPosition);
+
+		return res;
+	}
+
+	public void Dispose() {
+		Close();
+	}
+
+	public void Close() {
+		Flush();
+	}
+
+	public void Flush() {
+		_chaserCheckpoint.Flush();
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkDb.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkDb.cs
new file mode 100644
index 00000000000..3455e8697c7
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkDb.cs
@@ -0,0 +1,376 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.Transforms;
+using Serilog;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.TransactionLog.Chunks;
+
+public sealed class TFChunkDb : IAsyncDisposable {
+	public readonly TFChunkDbConfig Config;
+	public readonly TFChunkManager Manager;
+	public readonly DbTransformManager TransformManager;
+
+	private readonly ILogger _log;
+	private readonly ITransactionFileTracker _tracker;
+	private int _closed;
+
+	public TFChunkDb(
+		TFChunkDbConfig config,
+		ITransactionFileTracker tracker = null,
+		ILogger log = null,
+		IChunkFileSystem fileSystem = null,
+		DbTransformManager transformManager = null,
+		Action<Data.ChunkInfo> onChunkSwitched = null) {
+		Ensure.NotNull(config, "config");
+
+		Config = config;
+		TransformManager = transformManager ?? DbTransformManager.Default;
+		_tracker = tracker ?? new TFChunkTracker.NoOp();
+		fileSystem ??= new ChunkLocalFileSystem(config.Path);
+
+		Manager = new TFChunkManager(Config, fileSystem, _tracker, TransformManager) {
+			OnChunkSwitched = onChunkSwitched,
+		};
+
+		_log = log ?? Log.ForContext<TFChunkDb>();
+	}
+
+	struct ChunkInfo {
+		public int ChunkStartNumber;
+		public string ChunkFileName;
+	}
+
+	// Gets the latest versions of all historical chunks
+	private static async IAsyncEnumerable<ChunkInfo> GetHistoricalChunks(
+		IChunkFileSystem.IChunkEnumerable chunkEnumerator,
+		[EnumeratorCancellation] CancellationToken token) {
+
+		await foreach (var chunkInfo in chunkEnumerator.WithCancellation(token)) {
+			switch (chunkInfo) {
+				case LatestVersion(var fileName, var start, _):
+					if (start <= chunkEnumerator.LastChunkNumber - 1)
+						yield return new ChunkInfo {
+							ChunkFileName = fileName,
+							ChunkStartNumber = start,
+						};
+					break;
+				case MissingVersion(var fileName, var chunkNum):
+					if (chunkNum <= chunkEnumerator.LastChunkNumber - 1)
+						throw new CorruptDatabaseException(new ChunkNotFoundException(fileName));
+
+					// fine for last chunk to be 'missing' (not created yet)
+					break;
+					// OldVersion: don't open old versions. they will soon be deleted
+			}
+		}
+	}
+
+	public async ValueTask Open(
+		bool verifyHash = true,
+		bool readOnly = false,
+		int threads = 1,
+		bool createNewChunks = true,
+		CancellationToken token = default) {
+
+		Ensure.Positive(threads, "threads");
+
+		if (Interlocked.CompareExchange(ref _closed, 0, 0) != 0)
+			throw new InvalidOperationException("Cannot reopen database after closing");
+
+		ValidateReaderChecksumsMustBeLess(Config);
+		var writerCheckpoint = Config.WriterCheckpoint.Read();
+
+		if (Config.InMemDb) {
+			if (createNewChunks)
+				await Manager.AddNewChunk(token);
+			return;
+		}
+
+		var lastChunkNum = (int)(writerCheckpoint / Config.ChunkSize);
+		// the lastChunk num doesn't necessarily exist yet, but it has not been removed due to archiving
+		// because that can only happen after the writerCheckpoint has advanced to the next chunk.
+		var lastChunkVersions = Manager.FileSystem.LocalNamingStrategy.GetAllVersionsFor(lastChunkNum);
+		var chunkEnumerator = Manager.FileSystem.GetChunks();
+
+		// Open the historical chunks. New records will not be written to any of these.
+		// (but the last one may need completing)
+		chunkEnumerator.LastChunkNumber = lastChunkNum;
+		await Parallel.ForEachAsync(GetHistoricalChunks(chunkEnumerator, token),
+			new ParallelOptions { MaxDegreeOfParallelism = threads, CancellationToken = token },
+			async (chunkInfo, token) => {
+				TFChunk.TFChunk chunk;
+				if (lastChunkVersions.Length == 0 &&
+					(chunkInfo.ChunkStartNumber + 1) * (long)Config.ChunkSize == writerCheckpoint) {
+					// The situation where the logical data size is exactly divisible by ChunkSize,
+					// so it might happen that we have checkpoint indicating one more chunk should exist,
+					// but the actual last chunk is (lastChunkNum-1) one and it could be not completed yet -- perfectly valid situation.
+					var footer = await Manager.FileSystem.ReadFooterAsync(chunkInfo.ChunkFileName, token);
+					if (footer.IsCompleted)
+						chunk = await TFChunk.TFChunk.FromCompletedFile(
+							Manager.FileSystem,
+							filename: chunkInfo.ChunkFileName,
+							verifyHash: false,
+							unbufferedRead: Config.Unbuffered,
+							tracker: _tracker,
+							reduceFileCachePressure: Config.ReduceFileCachePressure,
+							getTransformFactory: TransformManager,
+							footer: footer,
+							token: token);
+					else {
+						chunk = await TFChunk.TFChunk.FromOngoingFile(
+							Manager.FileSystem,
+							filename: chunkInfo.ChunkFileName,
+							writePosition: Config.ChunkSize,
+							unbuffered: Config.Unbuffered,
+							writethrough: Config.WriteThrough,
+							reduceFileCachePressure: Config.ReduceFileCachePressure,
+							tracker: _tracker,
+							getTransformFactory: TransformManager,
+							token: token);
+						// chunk is full with data, we should complete it right here
+						if (!readOnly)
+							await chunk.Complete(token);
+					}
+				} else {
+					// common case
+					chunk = await TFChunk.TFChunk.FromCompletedFile(
+						Manager.FileSystem,
+						filename: chunkInfo.ChunkFileName,
+						verifyHash: false,
+						unbufferedRead: Config.Unbuffered,
+						reduceFileCachePressure: Config.ReduceFileCachePressure,
+						tracker: _tracker,
+						getTransformFactory: TransformManager,
+						startNumber: chunkInfo.ChunkStartNumber,
+						token: token);
+				}
+
+				// This call is thread-safe.
+				await Manager.AddChunk(chunk, token);
+			});
+
+		// Open the current chunk, where new records will be written. It might not exist yet.
+		if (lastChunkVersions.Length == 0) {
+			var onBoundary = writerCheckpoint == (Config.ChunkSize * (long)lastChunkNum);
+			if (!onBoundary)
+				throw new CorruptDatabaseException(
+					new ChunkNotFoundException(Manager.FileSystem.LocalNamingStrategy.GetFilenameFor(lastChunkNum, 0)));
+
+			if (!readOnly && createNewChunks)
+				await Manager.AddNewChunk(token);
+		} else {
+			var chunkFileName = lastChunkVersions[0];
+			var chunkHeader = await Manager.FileSystem.ReadHeaderAsync(chunkFileName, token);
+			var chunkLocalPos = chunkHeader.GetLocalLogPosition(writerCheckpoint);
+			if (chunkHeader.IsScavenged) {
+				// scavenged chunks are first replicated to a temporary file before being atomically switched in.
+				// thus, the writer checkpoint can point to either the beginning or the end of a scavenged chunk.
+				//
+				// if it was pointing to the end of the scavenged chunk, it would be "inside" the next chunk, and we
+				// wouldn't be here (as the next chunk wouldn't exist yet or would not be scavenged)
+				//
+				// thus, the current case is possible only when a scavenged chunk was switched in but
+				// the writer checkpoint wasn't yet updated & flushed. therefore, we expect the writer checkpoint to
+				// point exactly to the beginning of the scavenged chunk. (i.e chunkLocalPos = 0)
+
+				if (chunkLocalPos != 0) {
+					throw new CorruptDatabaseException(new BadChunkInDatabaseException(
+						$"Chunk {chunkFileName} is corrupted. Expected local chunk position: 0 but was {chunkLocalPos}. " +
+						$"Writer checkpoint: {writerCheckpoint}."));
+				}
+
+				var lastChunk = await TFChunk.TFChunk.FromCompletedFile(Manager.FileSystem, chunkFileName, verifyHash: false,
+					unbufferedRead: Config.Unbuffered,
+					reduceFileCachePressure: Config.ReduceFileCachePressure,
+					tracker: _tracker,
+					getTransformFactory: TransformManager,
+					header: chunkHeader,
+					token: token);
+
+				lastChunkNum = lastChunk.ChunkHeader.ChunkEndNumber + 1;
+
+				await Manager.AddChunk(lastChunk, token);
+				if (!readOnly) {
+					_log.Information(
+						"Moving the writer checkpoint from {checkpoint} to {chunkEndPosition}, as it points to a scavenged chunk.",
+						writerCheckpoint, lastChunk.ChunkHeader.ChunkEndPosition);
+					Config.WriterCheckpoint.Write(lastChunk.ChunkHeader.ChunkEndPosition);
+					Config.WriterCheckpoint.Flush();
+
+					// as of recent versions, it's possible that a new chunk was already created as the writer checkpoint
+					// is updated & flushed _after_ the new chunk is created. if that's the case, we remove it.
+					var newChunk = Manager.FileSystem.LocalNamingStrategy.GetFilenameFor(lastChunkNum, 0);
+					if (File.Exists(newChunk))
+						RemoveFile("Removing excessive chunk: {chunk}", newChunk);
+
+					if (createNewChunks)
+						await Manager.AddNewChunk(token);
+				}
+			} else {
+				var lastChunk = await TFChunk.TFChunk.FromOngoingFile(
+					Manager.FileSystem,
+					filename: chunkFileName,
+					writePosition: (int)chunkLocalPos,
+					unbuffered: Config.Unbuffered,
+					writethrough: Config.WriteThrough,
+					reduceFileCachePressure: Config.ReduceFileCachePressure,
+					tracker: _tracker,
+					getTransformFactory: TransformManager,
+					token: token);
+				await Manager.AddChunk(lastChunk, token);
+			}
+		}
+
+		chunkEnumerator.LastChunkNumber = lastChunkNum;
+		_log.Information("Ensuring no excessive chunks...");
+		await EnsureNoExcessiveChunks(chunkEnumerator, token);
+		_log.Information("Done ensuring no excessive chunks.");
+
+		if (!readOnly) {
+			_log.Information("Removing old chunk versions...");
+			await RemoveOldChunksVersions(chunkEnumerator, token);
+			_log.Information("Done removing old chunk versions.");
+
+			_log.Information("Cleaning up temp files...");
+			CleanUpTempFiles();
+			_log.Information("Done cleaning up temp files.");
+		}
+
+		if (verifyHash && lastChunkNum > 0) {
+			var preLastChunk = await Manager.GetInitializedChunk(lastChunkNum - 1, token);
+			var lastBgChunkNum = preLastChunk.ChunkHeader.ChunkStartNumber;
+			ThreadPool.UnsafeQueueUserWorkItem(async token => {
+				for (int chunkNum = lastBgChunkNum; chunkNum >= 0;) {
+					var chunk = Manager.UnsafeGetChunk(chunkNum);
+					try {
+						await chunk.VerifyFileHash(token);
+					} catch (FileBeingDeletedException exc) {
+						_log.Debug(
+							"{exceptionType} exception was thrown while doing background validation of chunk {chunk}.",
+							exc.GetType().Name, chunk);
+						_log.Debug(
+							"That's probably OK, especially if truncation was request at the same time: {e}.",
+							exc.Message);
+					} catch (Exception exc) {
+						_log.Fatal(exc, "Verification of chunk {chunk} failed, terminating server...",
+							chunk);
+						var msg = string.Format("Verification of chunk {0} failed, terminating server...", chunk);
+						Application.Exit(ExitCode.Error, msg);
+						return;
+					}
+
+					chunkNum = chunk.ChunkInfo.ChunkStartNumber - 1;
+				}
+			}, token, preferLocal: false);
+		}
+
+		await Manager.EnableCaching(token);
+	}
+
+	private static void ValidateReaderChecksumsMustBeLess(TFChunkDbConfig config) {
+		var current = config.WriterCheckpoint.Read();
+		foreach (var checkpoint in new[] { config.ChaserCheckpoint, config.EpochCheckpoint }) {
+			if (checkpoint.Read() > current)
+				throw new CorruptDatabaseException(new ReaderCheckpointHigherThanWriterException(checkpoint.Name));
+		}
+	}
+
+	private async ValueTask EnsureNoExcessiveChunks(
+		IChunkFileSystem.IChunkEnumerable chunkEnumerator,
+		CancellationToken token) {
+
+		var extraneousFiles = new List<string>();
+
+		await foreach (var chunkInfo in chunkEnumerator.WithCancellation(token)) {
+			switch (chunkInfo) {
+				case LatestVersion(var fileName, var start, var end):
+					// there can be at most one excessive chunk at startup:
+					// when a new chunk was created but the writer checkpoint was not yet committed and flushed
+					if (start == chunkEnumerator.LastChunkNumber + 1 &&
+						start == end &&
+						Manager.FileSystem.LocalNamingStrategy.GetVersionFor(Path.GetFileName(fileName)) == 0)
+						RemoveFile("Removing excessive chunk: {chunk}", fileName);
+					else if (start > chunkEnumerator.LastChunkNumber)
+						extraneousFiles.Add(fileName);
+					break;
+				case OldVersion(var fileName, var start):
+					if (start > chunkEnumerator.LastChunkNumber)
+						extraneousFiles.Add(fileName);
+					break;
+			}
+		}
+
+		if (!extraneousFiles.IsEmpty()) {
+			throw new CorruptDatabaseException(new ExtraneousFileFoundException(
+				$"Unexpected files: {string.Join(", ", extraneousFiles)}."));
+		}
+	}
+
+	private async ValueTask RemoveOldChunksVersions(
+		IChunkFileSystem.IChunkEnumerable chunkEnumerator,
+		CancellationToken token) {
+
+		await foreach (var chunkInfo in chunkEnumerator.WithCancellation(token)) {
+			switch (chunkInfo) {
+				case OldVersion(var fileName, var start):
+					if (start <= chunkEnumerator.LastChunkNumber)
+						RemoveFile("Removing old chunk version: {chunk}...", fileName);
+					break;
+			}
+		}
+	}
+
+	private void CleanUpTempFiles() {
+		var tempFiles = Manager.FileSystem.LocalNamingStrategy.GetAllTempFiles();
+		foreach (string tempFile in tempFiles) {
+			try {
+				RemoveFile("Deleting temporary file {file}...", tempFile);
+			} catch (Exception exc) {
+				_log.Error(exc, "Error while trying to delete remaining temp file: '{tempFile}'.",
+					tempFile);
+			}
+		}
+	}
+
+	private void RemoveFile(string reason, string file) {
+		_log.Debug(reason, file);
+		File.SetAttributes(file, FileAttributes.Normal);
+		File.Delete(file);
+	}
+
+	public ValueTask DisposeAsync() => Close(CancellationToken.None);
+
+	public async ValueTask Close(CancellationToken token) {
+		if (Interlocked.CompareExchange(ref _closed, 1, 0) != 0)
+			return;
+
+		bool chunksClosed = false;
+
+		try {
+			chunksClosed = await Manager.TryClose(token);
+		} catch (Exception ex) {
+			_log.Error(ex, "An error has occurred while closing the chunks.");
+		}
+
+		if (!chunksClosed)
+			_log.Debug("One or more chunks are still open; skipping checkpoint flush.");
+
+		Config.WriterCheckpoint.Close(flush: chunksClosed);
+		Config.ChaserCheckpoint.Close(flush: chunksClosed);
+		Config.EpochCheckpoint.Close(flush: chunksClosed);
+		Config.TruncateCheckpoint.Close(flush: chunksClosed);
+		Config.ProposalCheckpoint.Close(flush: chunksClosed);
+		Config.StreamExistenceFilterCheckpoint.Close(flush: chunksClosed);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkDbConfig.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkDbConfig.cs
new file mode 100644
index 00000000000..c3398c0d974
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkDbConfig.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+
+namespace KurrentDB.Core.TransactionLog.Chunks;
+
+public class TFChunkDbConfig {
+	public readonly string Path;
+	public readonly int ChunkSize;
+	public readonly long MaxChunksCacheSize;
+	public readonly ICheckpoint WriterCheckpoint;
+	public readonly ICheckpoint ChaserCheckpoint;
+	public readonly ICheckpoint EpochCheckpoint;
+	public readonly ICheckpoint ProposalCheckpoint;
+	public readonly ICheckpoint TruncateCheckpoint;
+	public readonly ICheckpoint ReplicationCheckpoint;
+	public readonly ICheckpoint IndexCheckpoint;
+	public readonly ICheckpoint StreamExistenceFilterCheckpoint;
+	public readonly bool InMemDb;
+	public readonly bool Unbuffered;
+	public readonly bool WriteThrough;
+	public readonly bool ReduceFileCachePressure;
+	public readonly long MaxTruncation;
+
+	public TFChunkDbConfig(string path,
+		int chunkSize,
+		long maxChunksCacheSize,
+		ICheckpoint writerCheckpoint,
+		ICheckpoint chaserCheckpoint,
+		ICheckpoint epochCheckpoint,
+		ICheckpoint proposalCheckpoint,
+		ICheckpoint truncateCheckpoint,
+		ICheckpoint replicationCheckpoint,
+		ICheckpoint indexCheckpoint,
+		ICheckpoint streamExistenceFilterCheckpoint,
+		bool inMemDb = false,
+		bool unbuffered = false,
+		bool writethrough = false,
+		bool reduceFileCachePressure = false,
+		long maxTruncation = 256 * 1024 * 1024) {
+		Ensure.NotNullOrEmpty(path, "path");
+		Ensure.Positive(chunkSize, "chunkSize");
+		Ensure.Nonnegative(maxChunksCacheSize, "maxChunksCacheSize");
+		Ensure.NotNull(writerCheckpoint, "writerCheckpoint");
+		Ensure.NotNull(chaserCheckpoint, "chaserCheckpoint");
+		Ensure.NotNull(epochCheckpoint, "epochCheckpoint");
+		Ensure.NotNull(proposalCheckpoint, "proposalCheckpoint");
+		Ensure.NotNull(truncateCheckpoint, "truncateCheckpoint");
+		Ensure.NotNull(replicationCheckpoint, "replicationCheckpoint");
+		Ensure.NotNull(indexCheckpoint, "indexCheckpoint");
+		Ensure.NotNull(streamExistenceFilterCheckpoint, "streamExistenceFilterCheckpoint");
+
+		Path = path;
+		ChunkSize = chunkSize;
+		MaxChunksCacheSize = maxChunksCacheSize;
+		WriterCheckpoint = writerCheckpoint;
+		ChaserCheckpoint = chaserCheckpoint;
+		EpochCheckpoint = epochCheckpoint;
+		ProposalCheckpoint = proposalCheckpoint;
+		TruncateCheckpoint = truncateCheckpoint;
+		ReplicationCheckpoint = replicationCheckpoint;
+		IndexCheckpoint = indexCheckpoint;
+		StreamExistenceFilterCheckpoint = streamExistenceFilterCheckpoint;
+		InMemDb = inMemDb;
+		Unbuffered = unbuffered;
+		WriteThrough = writethrough;
+		ReduceFileCachePressure = reduceFileCachePressure;
+		MaxTruncation = maxTruncation;
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkDbTruncator.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkDbTruncator.cs
new file mode 100644
index 00000000000..47917f48d8e
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkDbTruncator.cs
@@ -0,0 +1,188 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.TransactionLog.Chunks;
+
+public class TFChunkDbTruncator {
+	private static readonly ILogger Log = Serilog.Log.ForContext<TFChunkDbTruncator>();
+
+	private readonly TFChunkDbConfig _config;
+	private readonly Func<TransformType, IChunkTransformFactory> _getTransformFactory;
+	private readonly IChunkFileSystem _fileSystem;
+
+	public TFChunkDbTruncator(TFChunkDbConfig config, IChunkFileSystem fileSystem, Func<TransformType, IChunkTransformFactory> getTransformFactory) {
+		ArgumentNullException.ThrowIfNull(config);
+		ArgumentNullException.ThrowIfNull(fileSystem);
+		ArgumentNullException.ThrowIfNull(getTransformFactory);
+
+		_config = config;
+		_getTransformFactory = getTransformFactory;
+		_fileSystem = fileSystem;
+	}
+
+	public async ValueTask TruncateDb(long truncateChk, CancellationToken token) {
+		var writerChk = _config.WriterCheckpoint.Read();
+		var requestedTruncation = writerChk - truncateChk;
+		if (_config.MaxTruncation >= 0 && requestedTruncation > _config.MaxTruncation) {
+			Log.Error(
+				"MaxTruncation is set and truncate checkpoint is out of bounds. MaxTruncation {maxTruncation} vs requested truncation {requestedTruncation} [{writerChk} => {truncateChk}].  To proceed, set MaxTruncation to -1 (no max) or greater than {requestedTruncationHint}.",
+				_config.MaxTruncation, requestedTruncation, writerChk, truncateChk, requestedTruncation);
+			throw new Exception(
+				$"MaxTruncation is set ({_config.MaxTruncation}) and truncate checkpoint is out of bounds (requested truncation is {requestedTruncation} [{writerChk} => {truncateChk}]).");
+		}
+
+		var oldLastChunkNum = (int)(writerChk / _config.ChunkSize);
+		var newLastChunkNum = (int)(truncateChk / _config.ChunkSize);
+		var chunkEnumerator = _fileSystem.GetChunks();
+		chunkEnumerator.LastChunkNumber = oldLastChunkNum;
+		var truncatingToBoundary = truncateChk % _config.ChunkSize is 0;
+
+		var excessiveChunks = _fileSystem.LocalNamingStrategy.GetAllVersionsFor(oldLastChunkNum + 1);
+		if (excessiveChunks.Length > 0)
+			throw new Exception(
+				$"During truncation of DB excessive TFChunks were found:\n{string.Join("\n", excessiveChunks)}.");
+
+		ChunkHeader newLastChunkHeader = null;
+		string newLastChunkFilename = null;
+
+		// find the chunk to truncate to
+		await foreach (var chunkInfo in chunkEnumerator.WithCancellation(token)) {
+			switch (chunkInfo) {
+				case LatestVersion(var fileName, var _, var end):
+					if (newLastChunkFilename != null || end < newLastChunkNum)
+						break;
+					newLastChunkHeader = await _fileSystem.ReadHeaderAsync(fileName, token);
+					newLastChunkFilename = fileName;
+					break;
+				case MissingVersion(var fileName, var chunkNum) when (chunkNum < newLastChunkNum):
+					throw new Exception($"Could not find any chunk #{fileName}.");
+			}
+		}
+
+		// it's not bad if there is no file, it could have been deleted on previous run
+		if (newLastChunkHeader != null) {
+			var chunksToDelete = new List<string>();
+			var chunkNumToDeleteFrom = newLastChunkNum + 1;
+			if (newLastChunkHeader.IsScavenged) {
+				Log.Information(
+					"Deleting ALL chunks from #{chunkStartNumber} inclusively "
+					+ "as truncation position is in the middle of scavenged chunk.",
+					newLastChunkHeader.ChunkStartNumber);
+				chunkNumToDeleteFrom = newLastChunkHeader.ChunkStartNumber;
+			} else if (truncatingToBoundary) {
+				// we're truncating to a chunk boundary:
+				// delete the chunk after the boundary so that we can re-replicate the chunk header from the leader
+				chunkNumToDeleteFrom--;
+			}
+
+			await foreach (var chunkInfo in chunkEnumerator.WithCancellation(token)) {
+				switch (chunkInfo) {
+					case LatestVersion(var fileName, var start, _):
+						if (start >= chunkNumToDeleteFrom)
+							chunksToDelete.Add(fileName);
+						break;
+					case OldVersion(var fileName, var start):
+						if (start >= chunkNumToDeleteFrom)
+							chunksToDelete.Add(fileName);
+						break;
+				}
+			}
+
+			// we need to remove excessive chunks from largest number to lowest one, so in case of crash
+			// mid-process, we don't end up with broken non-sequential chunks sequence.
+			chunksToDelete.Reverse();
+			foreach (var chunkFile in chunksToDelete) {
+				Log.Information("File {chunk} will be deleted during TruncateDb procedure.", chunkFile);
+				File.SetAttributes(chunkFile, FileAttributes.Normal);
+				File.Delete(chunkFile);
+			}
+
+			if (!newLastChunkHeader.IsScavenged && !truncatingToBoundary) {
+				TruncateChunkAndFillWithZeros(newLastChunkHeader, newLastChunkFilename, truncateChk);
+			} else {
+				truncateChk = newLastChunkHeader.ChunkStartPosition;
+				Log.Information(
+					"Setting TruncateCheckpoint to {truncateCheckpoint} "
+					+ "as truncation position is in the middle of scavenged chunk.",
+					truncateChk);
+			}
+		}
+
+		// Note: Prior to going offline for truncation, we attempt to set the epoch checkpoint to an epoch record
+		// located before the truncate position (if such a record is present in the epoch cache).
+		// This saves us from resetting it to -1 here and also saves us from scanning the transaction log for
+		// a proper epoch record during startup.
+		if (_config.EpochCheckpoint.Read() >= truncateChk) {
+			var epochChk = _config.EpochCheckpoint.Read();
+			Log.Information("Truncating epoch from {epochFrom} (0x{epochFrom:X}) to {epochTo} (0x{epochTo:X}).", epochChk,
+				epochChk, -1, -1);
+			_config.EpochCheckpoint.Write(-1);
+			_config.EpochCheckpoint.Flush();
+		}
+
+		if (_config.ChaserCheckpoint.Read() > truncateChk) {
+			var chaserChk = _config.ChaserCheckpoint.Read();
+			Log.Information(
+				"Truncating chaser from {chaserCheckpoint} (0x{chaserCheckpoint:X}) to {truncateCheckpoint} (0x{truncateCheckpoint:X}).",
+				chaserChk, chaserChk, truncateChk, truncateChk);
+			_config.ChaserCheckpoint.Write(truncateChk);
+			_config.ChaserCheckpoint.Flush();
+		}
+
+		if (_config.WriterCheckpoint.Read() > truncateChk) {
+			var writerCheckpoint = _config.WriterCheckpoint.Read();
+			Log.Information(
+				"Truncating writer from {writerCheckpoint} (0x{writerCheckpoint:X}) to {truncateCheckpoint} (0x{truncateCheckpoint:X}).",
+				writerCheckpoint, writerCheckpoint, truncateChk, truncateChk);
+			_config.WriterCheckpoint.Write(truncateChk);
+			_config.WriterCheckpoint.Flush();
+		}
+
+		Log.Information("Resetting TruncateCheckpoint to {truncateCheckpoint} (0x{truncateCheckpoint:X}).", -1, -1);
+		_config.TruncateCheckpoint.Write(-1);
+		_config.TruncateCheckpoint.Flush();
+	}
+
+	private void TruncateChunkAndFillWithZeros(ChunkHeader chunkHeader, string chunkFilename, long truncateChk) {
+		if (chunkHeader.IsScavenged
+			|| chunkHeader.ChunkStartNumber != chunkHeader.ChunkEndNumber
+			|| truncateChk < chunkHeader.ChunkStartPosition
+			|| truncateChk >= chunkHeader.ChunkEndPosition) {
+			throw new Exception(
+				string.Format(
+					"Chunk #{0}-{1} ({2}) is not correct unscavenged chunk. TruncatePosition: {3}, ChunkHeader: {4}.",
+					chunkHeader.ChunkStartNumber, chunkHeader.ChunkEndNumber, chunkFilename, truncateChk,
+					chunkHeader));
+		}
+
+		var transformFactory = _getTransformFactory(chunkHeader.TransformType);
+		var newDataSize = transformFactory.TransformDataPosition(chunkHeader.ChunkSize);
+		var newFileSize = TFChunk.TFChunk.GetAlignedSize(ChunkHeader.Size + newDataSize + ChunkFooter.Size);
+		var dataTruncatePos = transformFactory.TransformDataPosition((int)chunkHeader.GetLocalLogPosition(truncateChk));
+
+		File.SetAttributes(chunkFilename, FileAttributes.Normal);
+		using (var fs = new FileStream(chunkFilename, FileMode.Open, FileAccess.ReadWrite, FileShare.Read)) {
+			fs.SetLength(newFileSize);
+			fs.Position = ChunkHeader.Size + dataTruncatePos;
+			var zeros = new byte[65536];
+			var leftToWrite = fs.Length - fs.Position;
+			while (leftToWrite > 0) {
+				var toWrite = (int)Math.Min(leftToWrite, zeros.Length);
+				fs.Write(zeros, 0, toWrite);
+				leftToWrite -= toWrite;
+			}
+
+			fs.FlushToDisk();
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkInfo.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkInfo.cs
new file mode 100644
index 00000000000..f70e01016dc
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkInfo.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.TransactionLog.Chunks;
+
+public abstract record TFChunkInfo(string FileName);
+public record LatestVersion(string FileName, int Start, int End) : TFChunkInfo(FileName);
+public record OldVersion(string FileName, int Start) : TFChunkInfo(FileName);
+public record MissingVersion(string FileName, int ChunkNumber) : TFChunkInfo(FileName);
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkManager.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkManager.cs
new file mode 100644
index 00000000000..71dad49f5d2
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkManager.cs
@@ -0,0 +1,587 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Threading;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.Transforms;
+using KurrentDB.Core.Transforms.Identity;
+using ChunkInfo = KurrentDB.Core.Data.ChunkInfo;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.TransactionLog.Chunks;
+
+public sealed class TFChunkManager : IChunkRegistry<TFChunk.TFChunk>, IThreadPoolWorkItem {
+	private static readonly ILogger Log = Serilog.Log.ForContext<TFChunkManager>();
+
+	// MaxChunksCount is currently capped at 400,000 since:
+	// - the chunk file naming strategy supports only up to 6 digits for the chunk number.
+	// - this class uses a fixed size array to keep the chunk list
+	public const int MaxChunksCount = 400_000;
+
+	public int ChunksCount {
+		get { return _chunksCount; }
+	}
+
+	private readonly TFChunkDbConfig _config;
+	private readonly TFChunk.TFChunk[] _chunks = new TFChunk.TFChunk[MaxChunksCount];
+	private readonly ITransactionFileTracker _tracker;
+	private readonly DbTransformManager _transformManager;
+
+	private volatile int _chunksCount;
+	private volatile bool _cachingEnabled;
+
+	// protects _chunksCount and _chunks
+	private readonly AsyncExclusiveLock _chunksLocker = new();
+	private int _backgroundPassesRemaining;
+	private int _backgroundRunning;
+	public Action<ChunkInfo> OnChunkSwitched { get; init; }
+
+	public TFChunkManager(
+		TFChunkDbConfig config,
+		IChunkFileSystem fileSystem,
+		ITransactionFileTracker tracker,
+		DbTransformManager transformManager) {
+		Ensure.NotNull(config, "config");
+		_config = config;
+		_tracker = tracker;
+		_transformManager = transformManager;
+		FileSystem = fileSystem;
+	}
+
+	public IChunkFileSystem FileSystem { get; }
+
+	public async ValueTask EnableCaching(CancellationToken token) {
+		await _chunksLocker.AcquireAsync(token);
+		try {
+			_cachingEnabled = true;
+		} finally {
+			_chunksLocker.Release();
+		}
+
+		// trigger caching out of lock to avoid lock contention
+		TriggerBackgroundCaching();
+	}
+
+	async void IThreadPoolWorkItem.Execute() {
+		do {
+			do {
+				await CacheUncacheReadOnlyChunks(CancellationToken.None);
+			} while (Interlocked.Decrement(ref _backgroundPassesRemaining) > 0);
+
+			Interlocked.Exchange(ref _backgroundRunning, 0);
+		} while (Interlocked.CompareExchange(ref _backgroundPassesRemaining, 0, 0) > 0
+				 && Interlocked.CompareExchange(ref _backgroundRunning, 1, 0) == 0);
+	}
+
+	private async ValueTask CacheUncacheReadOnlyChunks(CancellationToken token) {
+		int lastChunkToCache;
+
+		await _chunksLocker.AcquireAsync(token);
+		try {
+			long totalSize = 0;
+			lastChunkToCache = _chunksCount;
+
+			// work backwards through the history until we have found enough chunks
+			// to cache according to the chunk cache size. determines lastChunkToCache.
+			for (int chunkNum = _chunksCount - 1; chunkNum >= 0;) {
+				var chunk = _chunks[chunkNum];
+				await chunk.EnsureInitialized(token);
+				var chunkSize = chunk.IsReadOnly
+					? chunk.ChunkFooter.PhysicalDataSize + chunk.ChunkFooter.MapSize + ChunkHeader.Size +
+					  ChunkFooter.Size
+					: chunk.ChunkHeader.ChunkSize + ChunkHeader.Size + ChunkFooter.Size;
+
+				if (totalSize + chunkSize > _config.MaxChunksCacheSize)
+					break;
+
+				totalSize += chunkSize;
+				lastChunkToCache = chunk.ChunkHeader.ChunkStartNumber;
+
+				chunkNum = chunk.ChunkHeader.ChunkStartNumber - 1;
+			}
+		} finally {
+			_chunksLocker.Release();
+		}
+
+		// uncache everything earlier than lastChunkToCache
+		for (int chunkNum = lastChunkToCache - 1; chunkNum >= 0;) {
+			var chunk = _chunks[chunkNum];
+			if (chunk.IsReadOnly)
+				await chunk.UnCacheFromMemory(token);
+			chunkNum = chunk.ChunkInfo.ChunkStartNumber - 1;
+		}
+
+		// cache everything from lastChunkToCache up to now
+		for (int chunkNum = lastChunkToCache; chunkNum < _chunksCount;) {
+			var chunk = _chunks[chunkNum];
+			if (chunk.IsReadOnly) {
+				await chunk.EnsureInitialized(token);
+				await chunk.CacheInMemory(token);
+			}
+
+			chunkNum = chunk.ChunkInfo.ChunkEndNumber + 1;
+		}
+	}
+
+	public ValueTask<TFChunk.TFChunk> CreateTempChunk(ChunkHeader chunkHeader, int fileSize, CancellationToken token) {
+		var chunkFileName = FileSystem.LocalNamingStrategy.CreateTempFilename();
+		return TFChunk.TFChunk.CreateWithHeader(
+			FileSystem,
+			chunkFileName,
+			chunkHeader,
+			fileSize,
+			_config.InMemDb,
+			_config.Unbuffered,
+			_config.WriteThrough,
+			_config.ReduceFileCachePressure,
+			_tracker,
+			// temporary chunks are used for replicating raw (scavenged) chunks.
+			// since the raw data being replicated is already transformed, we use
+			// the identity transform as we don't want to transform the data again
+			// when appending raw data to the chunk.
+			transformFactory: new IdentityChunkTransformFactory(),
+			getTransformFactory: _transformManager,
+			ReadOnlyMemory<byte>.Empty,
+			token);
+	}
+
+	public async ValueTask<TFChunk.TFChunk> AddNewChunk(CancellationToken token) {
+		TFChunk.TFChunk chunk;
+		bool triggerCaching;
+		await _chunksLocker.AcquireAsync(token);
+		try {
+			var chunkNumber = _chunksCount;
+			var chunkName = FileSystem.LocalNamingStrategy.GetFilenameFor(chunkNumber, 0);
+			chunk = await TFChunk.TFChunk.CreateNew(
+				FileSystem,
+				chunkName,
+				_config.ChunkSize,
+				chunkNumber,
+				chunkNumber,
+				isScavenged: false,
+				inMem: _config.InMemDb,
+				unbuffered: _config.Unbuffered,
+				writethrough: _config.WriteThrough,
+				reduceFileCachePressure: _config.ReduceFileCachePressure,
+				tracker: _tracker,
+				getTransformFactory: _transformManager,
+				token);
+			AddChunk(chunk);
+			triggerCaching = _cachingEnabled;
+		} finally {
+			_chunksLocker.Release();
+		}
+
+		// trigger caching out of lock to avoid lock contention
+		if (triggerCaching)
+			TriggerBackgroundCaching();
+		return chunk;
+	}
+
+	public async ValueTask<TFChunk.TFChunk> AddNewChunk(ChunkHeader chunkHeader, ReadOnlyMemory<byte> transformHeader, int fileSize, CancellationToken token) {
+		Ensure.NotNull(chunkHeader, "chunkHeader");
+		Ensure.Positive(fileSize, "fileSize");
+
+		TFChunk.TFChunk chunk;
+		bool triggerCaching;
+		await _chunksLocker.AcquireAsync(token);
+		try {
+			if (chunkHeader.ChunkStartNumber != _chunksCount)
+				throw new Exception(string.Format(
+					"Received request to create a new ongoing chunk #{0}-{1}, but current chunks count is {2}.",
+					chunkHeader.ChunkStartNumber, chunkHeader.ChunkEndNumber, _chunksCount));
+
+			var chunkName = FileSystem.LocalNamingStrategy.GetFilenameFor(chunkHeader.ChunkStartNumber, 0);
+			chunk = await TFChunk.TFChunk.CreateWithHeader(
+				FileSystem,
+				chunkName,
+				chunkHeader,
+				fileSize,
+				_config.InMemDb,
+				unbuffered: _config.Unbuffered,
+				writethrough: _config.WriteThrough,
+				reduceFileCachePressure: _config.ReduceFileCachePressure,
+				tracker: _tracker,
+				transformFactory: _transformManager.GetFactoryForExistingChunk(chunkHeader.TransformType),
+				getTransformFactory: _transformManager,
+				transformHeader: transformHeader,
+				token);
+			AddChunk(chunk);
+			triggerCaching = _cachingEnabled;
+		} finally {
+			_chunksLocker.Release();
+		}
+
+		// trigger caching out of lock to avoid lock contention
+		if (triggerCaching)
+			TriggerBackgroundCaching();
+		return chunk;
+	}
+
+	private void AddChunk(TFChunk.TFChunk chunk) {
+		Debug.Assert(chunk is not null);
+		Debug.Assert(_chunksLocker.IsLockHeld);
+
+		var info = chunk.ChunkInfo;
+		for (int i = info.ChunkStartNumber; i <= info.ChunkEndNumber; ++i) {
+			_chunks[i] = chunk;
+		}
+
+		_chunksCount = Math.Max(info.ChunkEndNumber + 1, _chunksCount);
+	}
+
+	public async ValueTask AddChunk(TFChunk.TFChunk chunk, CancellationToken token) {
+		Ensure.NotNull(chunk, "chunk");
+
+		bool triggerCaching;
+		await _chunksLocker.AcquireAsync(token);
+		try {
+			AddChunk(chunk);
+			triggerCaching = _cachingEnabled;
+		} finally {
+			_chunksLocker.Release();
+		}
+
+		// trigger caching out of lock to avoid lock contention
+		if (triggerCaching)
+			TriggerBackgroundCaching();
+	}
+
+	// Takes a collection of locators for chunks which must be contiguous.
+	// Atomically switches them in if the range precisely overlaps one or more chunks in _chunks
+	public async ValueTask<bool> SwitchInCompletedChunks(IReadOnlyList<string> locators, CancellationToken token) {
+		var newChunks = new TFChunk.TFChunk[locators.Count];
+		var i = 0;
+		try {
+			for (; i < locators.Count; i++) {
+				var chunk = await TFChunk.TFChunk.FromCompletedFile(
+					fileSystem: FileSystem,
+					filename: locators[i],
+					verifyHash: false,
+					unbufferedRead: _config.Unbuffered,
+					tracker: _tracker,
+					getTransformFactory: _transformManager,
+					reduceFileCachePressure: _config.ReduceFileCachePressure,
+					token: token);
+
+				newChunks[i] = chunk;
+			}
+		} catch {
+			for (var j = 0; j < i; j++) {
+				newChunks[i].Dispose();
+			}
+
+			throw;
+		}
+
+		return await SwitchInChunks(newChunks, removeChunksAfter: null, token);
+	}
+
+	// Converts the specified temp chunk to permanent, and switches it in.
+	public async ValueTask<TFChunk.TFChunk> SwitchInTempChunk(TFChunk.TFChunk chunk, bool verifyHash,
+		bool removeChunksWithGreaterNumbers,
+		CancellationToken token) {
+		Ensure.NotNull(chunk, "chunk");
+
+		var chunkHeader = chunk.ChunkHeader;
+
+		// convert to new, permanent chunk
+		var newChunk = await MakeTempChunkPermanent(chunk, verifyHash, token);
+
+		// switch the new chunk into the chunks array.
+		int? removeChunksAfter = removeChunksWithGreaterNumbers
+			? chunkHeader.ChunkEndNumber // only true during replication
+			: null;
+		await SwitchInChunks([newChunk], removeChunksAfter, token);
+		return newChunk;
+	}
+
+	// The specified chunk is temporary, but complete. It needs closing and renaming.
+	private async ValueTask<TFChunk.TFChunk> MakeTempChunkPermanent(
+		TFChunk.TFChunk chunk,
+		bool verifyHash,
+		CancellationToken token) {
+
+		Ensure.NotNull(chunk, "chunk");
+
+		if (!chunk.IsReadOnly)
+			throw new ArgumentException(string.Format("Passed TFChunk is not completed: {0}.", chunk.ChunkLocator));
+
+		var chunkHeader = chunk.ChunkHeader;
+		var oldFileName = chunk.LocalFileName;
+
+		Log.Information("Switching chunk #{chunkStartNumber}-{chunkEndNumber} ({oldFileName})...",
+			chunkHeader.ChunkStartNumber, chunkHeader.ChunkEndNumber, Path.GetFileName(oldFileName));
+		TFChunk.TFChunk newChunk;
+
+		if (_config.InMemDb)
+			newChunk = chunk;
+		else {
+			chunk.Dispose();
+			try {
+				chunk.WaitForDestroy(0); // should happen immediately
+			} catch (TimeoutException exc) {
+				throw new Exception(
+					string.Format("The chunk that is being switched {0} is used by someone else.", chunk), exc);
+			}
+
+			// calculate the appropriate chunk version and move the chunk to the right filename.
+			var newFileName =
+				FileSystem.LocalNamingStrategy.DetermineNewVersionFilenameForIndex(chunkHeader.ChunkStartNumber, defaultVersion: 1);
+			Log.Information("File {oldFileName} will be moved to file {newFileName}", Path.GetFileName(oldFileName),
+				Path.GetFileName(newFileName));
+			try {
+				File.Move(oldFileName, newFileName);
+			} catch (IOException) {
+				WindowsProcessUtil.PrintWhoIsLocking(oldFileName, Log);
+				WindowsProcessUtil.PrintWhoIsLocking(newFileName, Log);
+				throw;
+			}
+
+			newChunk = await TFChunk.TFChunk.FromCompletedFile(FileSystem, newFileName, verifyHash, _config.Unbuffered,
+				_tracker, _transformManager,
+				_config.ReduceFileCachePressure, token: token);
+		}
+
+		return newChunk;
+	}
+
+	// Takes a collection of newChunks which must be contiguous.
+	// Atomically switches them in if the range precisely overlaps one or more chunks in _chunks
+	private async ValueTask<bool> SwitchInChunks(
+		IReadOnlyList<TFChunk.TFChunk> newChunks,
+		int? removeChunksAfter,
+		CancellationToken token) {
+
+		Ensure.NotNull(newChunks, nameof(newChunks));
+		var ret = true;
+
+		bool triggerCaching;
+		await _chunksLocker.AcquireAsync(token);
+		try {
+			if (ReplaceChunksWith(newChunks, "Old")) {
+				foreach (var newChunk in newChunks) {
+					OnChunkSwitched?.Invoke(newChunk.ChunkInfo);
+				}
+			} else {
+				foreach (var newChunk in newChunks) {
+					Log.Information("Chunk {chunk} will be not switched, marking for remove...", newChunk);
+					newChunk.MarkForDeletion();
+				}
+				// there was never any provision for early return here, but maybe there should be.
+				// it only depends on the removeChunksAfter is not null case (replication)
+				ret = false;
+			}
+
+			// only true during replication
+			if (removeChunksAfter.HasValue) {
+				var oldChunksCount = _chunksCount;
+				_chunksCount = newChunks[^1].ChunkHeader.ChunkEndNumber + 1;
+				RemoveChunks(removeChunksAfter.Value + 1, oldChunksCount - 1, "Excessive");
+				if (_chunks[_chunksCount] is not null)
+					throw new Exception(string.Format("Excessive chunk #{0} found after raw replication switch.",
+						_chunksCount));
+			}
+			triggerCaching = _cachingEnabled;
+		} finally {
+			_chunksLocker.Release();
+		}
+
+		// trigger caching out of lock to avoid lock contention
+		if (triggerCaching)
+			TriggerBackgroundCaching();
+
+		return ret;
+	}
+
+	// Checks this chunk has a compatible range to be swapped in and swaps it in.
+	// Returns false if the range is not compatible. (This would be unexpected?)
+	private bool ReplaceChunksWith(IReadOnlyList<TFChunk.TFChunk> newChunks, string chunkExplanation) {
+		Debug.Assert(_chunksLocker.IsLockHeld);
+
+		if (newChunks.Count is 0)
+			return true;
+
+		var chunkStartNumber = newChunks[0].ChunkHeader.ChunkStartNumber;
+		var chunkEndNumber = newChunks[^1].ChunkHeader.ChunkEndNumber;
+
+		// check newChunks are contiguous
+		var expectedStart = chunkStartNumber;
+		foreach (var newChunk in newChunks) {
+			if (newChunk.ChunkHeader.ChunkStartNumber != expectedStart) {
+				Log.Error(
+					"Cannot replace chunks because new chunks are not contiguous. " +
+					"ExpectedChunkNumber {Expected}. ActualChunkNumber {Actual}",
+					expectedStart, newChunk.ChunkHeader.ChunkStartNumber);
+				return false;
+			}
+			expectedStart = newChunk.ChunkHeader.ChunkEndNumber + 1;
+		}
+
+		// check that the range covered by new chunks exactly covers one or more existing chunks
+		for (int i = chunkStartNumber; i <= chunkEndNumber;) {
+			var chunk = _chunks[i];
+			if (chunk != null) {
+				// we would be removing `chunk` and replacing it with `newChunks`.
+				// check that chunk's range is covered by the newChunks.
+				var chunkInfo = chunk.ChunkInfo;
+				if (chunkInfo.ChunkStartNumber < chunkStartNumber || chunkInfo.ChunkEndNumber > chunkEndNumber)
+					return false;
+				i = chunkInfo.ChunkEndNumber + 1;
+			} else {
+				//Cover the case of initial replication of merged chunks where they were never set
+				// in the map in the first place.
+				i++;
+			}
+		}
+
+		// switch the chunk in to _chunks array and mark any removed chunks for deletion.
+		TFChunk.TFChunk previousRemovedChunk = null;
+		var newChunkIndex = 0;
+		for (int i = chunkStartNumber; i <= chunkEndNumber; i++) {
+			while (!Covers(newChunks[newChunkIndex], chunkNumber: i))
+				newChunkIndex++;
+			// now newChunks[newChunkIndex] covers logical chunk i
+			var oldChunk = Interlocked.Exchange(ref _chunks[i], newChunks[newChunkIndex]);
+			if (!ReferenceEquals(previousRemovedChunk, oldChunk)) {
+				// Once we've swapped all entries for the previousRemovedChunk we can safely delete it.
+				if (previousRemovedChunk != null) {
+					previousRemovedChunk.MarkForDeletion();
+					Log.Information("{chunkExplanation} chunk #{oldChunk} is marked for deletion.", chunkExplanation,
+						previousRemovedChunk);
+				}
+
+				previousRemovedChunk = oldChunk;
+			}
+		}
+
+		if (previousRemovedChunk != null) {
+			// Delete the last chunk swapped out now it's fully replaced.
+			previousRemovedChunk.MarkForDeletion();
+			Log.Information("{chunkExplanation} chunk #{oldChunk} is marked for deletion.", chunkExplanation,
+				previousRemovedChunk);
+		}
+
+		return true;
+
+		static bool Covers(TFChunk.TFChunk chunk, int chunkNumber) =>
+			chunk.ChunkHeader.ChunkStartNumber <= chunkNumber &&
+			chunk.ChunkHeader.ChunkEndNumber >= chunkNumber;
+	}
+
+	private void RemoveChunks(int chunkStartNumber, int chunkEndNumber, string chunkExplanation) {
+		Debug.Assert(_chunksLocker.IsLockHeld);
+
+		TFChunk.TFChunk lastRemovedChunk = null;
+		for (int i = chunkStartNumber; i <= chunkEndNumber; i += 1) {
+			var oldChunk = Interlocked.Exchange(ref _chunks[i], null);
+			if (oldChunk != null && !ReferenceEquals(lastRemovedChunk, oldChunk)) {
+				oldChunk.MarkForDeletion();
+				Log.Information("{chunkExplanation} chunk {oldChunk} is marked for deletion.", chunkExplanation, oldChunk);
+			}
+
+			lastRemovedChunk = oldChunk;
+		}
+	}
+
+	private void TriggerBackgroundCaching() {
+		Interlocked.Increment(ref _backgroundPassesRemaining);
+		if (Interlocked.CompareExchange(ref _backgroundRunning, 1, 0) == 0)
+			ThreadPool.UnsafeQueueUserWorkItem(this, preferLocal: false);
+	}
+
+	public ValueTask<TFChunk.TFChunk> GetInitializedChunkFor(long logPosition, CancellationToken token) {
+		ValueTask<TFChunk.TFChunk> task;
+
+		var chunkNum = (int)(logPosition / _config.ChunkSize);
+		if ((uint)chunkNum >= (uint)_chunksCount) {
+			task = ValueTask.FromException<TFChunk.TFChunk>(new ArgumentOutOfRangeException(nameof(logPosition),
+				$"LogPosition {logPosition} does not have corresponding chunk in DB."));
+		} else if (_chunks[chunkNum] is not { } chunk) {
+			task = ValueTask.FromException<TFChunk.TFChunk>(new Exception(
+				$"Requested chunk for LogPosition {logPosition}, which is not present in TFChunkManager."));
+		} else if (chunk.Initialized) {
+			task = new(chunk);
+		} else {
+			task = EnsureInitialized(chunk, token);
+		}
+
+		return task;
+	}
+
+	TFChunk.TFChunk IChunkRegistry<TFChunk.TFChunk>.UnsafeTryGetChunkFor(long logPosition) {
+		var chunkNum = (int)(logPosition / _config.ChunkSize);
+		return (uint)chunkNum < (uint)_chunksCount ? _chunks[chunkNum] : null;
+	}
+
+	public ValueTask<TFChunk.TFChunk> TryGetInitializedChunkFor(long logPosition, CancellationToken token) {
+		var chunkNum = (int)(logPosition / _config.ChunkSize);
+
+		ValueTask<TFChunk.TFChunk> task;
+		if ((uint)chunkNum >= (uint)_chunksCount || _chunks[chunkNum] is not { } chunk) {
+			task = default;
+		} else if (chunk.Initialized) {
+			task = new(chunk);
+		} else {
+			task = EnsureInitialized(chunk, token);
+		}
+
+		return task;
+	}
+
+	public TFChunk.TFChunk UnsafeGetChunk(int chunkNum) {
+		if ((uint)chunkNum >= (uint)_chunksCount)
+			throw new ArgumentOutOfRangeException(nameof(chunkNum),
+				$"Chunk #{chunkNum} is not present in DB.");
+
+		if (_chunks[chunkNum] is not { } chunk)
+			throw new Exception($"Requested chunk #{chunkNum}, which is not present in TFChunkManager.");
+
+		return chunk;
+	}
+
+	public ValueTask<TFChunk.TFChunk> GetInitializedChunk(int chunkNum, CancellationToken token) {
+		ValueTask<TFChunk.TFChunk> task;
+		if ((uint)chunkNum >= (uint)_chunksCount) {
+			task = ValueTask.FromException<TFChunk.TFChunk>(new ArgumentOutOfRangeException(nameof(chunkNum),
+				$"Chunk #{chunkNum} is not present in DB."));
+		} else if (_chunks[chunkNum] is not { } chunk) {
+			task = ValueTask.FromException<TFChunk.TFChunk>(new Exception(
+				$"Requested chunk #{chunkNum}, which is not present in TFChunkManager."));
+		} else if (chunk.Initialized) {
+			task = new(chunk);
+		} else {
+			task = EnsureInitialized(chunk, token);
+		}
+
+		return task;
+	}
+
+	private static async ValueTask<TFChunk.TFChunk> EnsureInitialized(TFChunk.TFChunk chunk, CancellationToken token) {
+		await chunk.EnsureInitialized(token);
+		return chunk;
+	}
+
+	public async ValueTask<bool> TryClose(CancellationToken token) {
+		var allChunksClosed = true;
+
+		await _chunksLocker.AcquireAsync(token);
+		try {
+			for (int i = 0; i < _chunksCount; ++i) {
+				if (_chunks[i] is { } chunk)
+					allChunksClosed &= chunk.TryClose();
+			}
+		} finally {
+			_chunksLocker.Release();
+		}
+
+		return allChunksClosed;
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkReader.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkReader.cs
new file mode 100644
index 00000000000..ac5cd148a89
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkReader.cs
@@ -0,0 +1,188 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using Serilog;
+
+namespace KurrentDB.Core.TransactionLog.Chunks;
+
+public class TFChunkReader : ITransactionFileReader {
+	internal static long CachedReads;
+	internal static long NotCachedReads;
+
+	public const int MaxRetries = 20;
+
+	public long CurrentPosition {
+		get { return _curPos; }
+	}
+
+	private readonly TFChunkDb _db;
+	private readonly IReadOnlyCheckpoint _writerCheckpoint;
+	private long _curPos;
+	private readonly ILogger _log = Log.ForContext<TFChunkReader>();
+
+	public TFChunkReader(TFChunkDb db, IReadOnlyCheckpoint writerCheckpoint, long initialPosition = 0) {
+		Ensure.NotNull(db, "dbConfig");
+		Ensure.NotNull(writerCheckpoint, "writerCheckpoint");
+		Ensure.Nonnegative(initialPosition, "initialPosition");
+
+		_db = db;
+		_writerCheckpoint = writerCheckpoint;
+		_curPos = initialPosition;
+	}
+
+	public void Reposition(long position) {
+		_curPos = position;
+	}
+
+	public ValueTask<SeqReadResult> TryReadNext(CancellationToken token)
+		=> TryReadNextInternal(0, token);
+
+	private async ValueTask<SeqReadResult> TryReadNextInternal(int retries, CancellationToken token) {
+		while (true) {
+			var pos = _curPos;
+			var writerChk = _writerCheckpoint.Read();
+			if (pos >= writerChk)
+				return SeqReadResult.Failure;
+
+			var chunk = await _db.Manager.GetInitializedChunkFor(pos, token);
+			RecordReadResult result;
+			try {
+				result = await chunk.TryReadClosestForward(chunk.ChunkHeader.GetLocalLogPosition(pos), token);
+				CountRead(chunk.IsCached);
+			} catch (FileBeingDeletedException) {
+				if (retries > MaxRetries)
+					throw new Exception(
+						string.Format(
+							"Got a file that was being deleted {0} times from TFChunkDb, likely a bug there.",
+							MaxRetries));
+				return await TryReadNextInternal(retries + 1, token);
+			}
+
+			if (result.Success) {
+				_curPos = chunk.ChunkHeader.ChunkStartPosition + result.NextPosition;
+				var postPos =
+					result.LogRecord.GetNextLogPosition(result.LogRecord.LogPosition, result.RecordLength);
+				var eof = postPos == writerChk;
+				return new SeqReadResult(
+					true, eof, result.LogRecord, result.RecordLength, result.LogRecord.LogPosition, postPos);
+			}
+
+			// we are the end of chunk
+			_curPos = chunk.ChunkHeader.ChunkEndPosition; // the start of next physical chunk
+		}
+	}
+
+	public ValueTask<SeqReadResult> TryReadPrev(CancellationToken token) {
+		return TryReadPrevInternal(0, token);
+	}
+
+	private async ValueTask<SeqReadResult> TryReadPrevInternal(int retries, CancellationToken token) {
+		for (; ; token.ThrowIfCancellationRequested()) {
+			var pos = _curPos;
+			var writerChk = _writerCheckpoint.Read();
+			// we allow == writerChk, that means read the very last record
+			if (pos > writerChk)
+				throw new Exception(string.Format(
+					"Requested position {0} is greater than writer checkpoint {1} when requesting to read previous record from TF.",
+					pos, writerChk));
+			if (pos <= 0)
+				return SeqReadResult.Failure;
+
+			bool readLast = false;
+
+			if (await _db.Manager.TryGetInitializedChunkFor(pos, token) is not { } chunk ||
+				pos == chunk.ChunkHeader.ChunkStartPosition) {
+				// we are exactly at the boundary of physical chunks
+				// so we switch to previous chunk and request TryReadLast
+				readLast = true;
+				chunk = await _db.Manager.GetInitializedChunkFor(pos - 1, token);
+			}
+
+			RecordReadResult result;
+			try {
+				result = await (readLast
+					? chunk.TryReadLast(token)
+					: chunk.TryReadClosestBackward(chunk.ChunkHeader.GetLocalLogPosition(pos), token));
+				CountRead(chunk.IsCached);
+			} catch (FileBeingDeletedException) {
+				if (retries > MaxRetries)
+					throw new Exception(string.Format(
+						"Got a file that was being deleted {0} times from TFChunkDb, likely a bug there.",
+						MaxRetries));
+				return await TryReadPrevInternal(retries + 1, token);
+			}
+
+			if (result.Success) {
+				_curPos = chunk.ChunkHeader.ChunkStartPosition + result.NextPosition;
+				var postPos =
+					result.LogRecord.GetNextLogPosition(result.LogRecord.LogPosition, result.RecordLength);
+				var eof = postPos == writerChk;
+				var res = new SeqReadResult(true, eof, result.LogRecord, result.RecordLength,
+					result.LogRecord.LogPosition, postPos);
+				return res;
+			}
+
+			// we are the beginning of chunk, so need to switch to previous one
+			// to do that we set cur position to the exact boundary position between current and previous chunk,
+			// this will be handled correctly on next iteration
+			_curPos = chunk.ChunkHeader.ChunkStartPosition;
+		}
+	}
+
+	public ValueTask<RecordReadResult> TryReadAt(long position, bool couldBeScavenged, CancellationToken token)
+		=> TryReadAtInternal(position, couldBeScavenged, 0, token);
+
+	private async ValueTask<RecordReadResult> TryReadAtInternal(long position, bool couldBeScavenged, int retries, CancellationToken token) {
+		var writerChk = _writerCheckpoint.Read();
+		if (position >= writerChk) {
+			_log.Warning(
+				"Attempted to read at position {position}, which is further than writer checkpoint {writerChk}",
+				position, writerChk);
+			return RecordReadResult.Failure;
+		}
+
+		var chunk = await _db.Manager.GetInitializedChunkFor(position, token);
+		try {
+			CountRead(chunk.IsCached);
+			return await chunk.TryReadAt(chunk.ChunkHeader.GetLocalLogPosition(position), couldBeScavenged, token);
+		} catch (FileBeingDeletedException) {
+			if (retries > MaxRetries)
+				throw new FileBeingDeletedException(
+					"Been told the file was deleted > MaxRetries times. Probably a problem in db.");
+			return await TryReadAtInternal(position, couldBeScavenged, retries + 1, token);
+		}
+	}
+
+	public ValueTask<bool> ExistsAt(long position, CancellationToken token)
+		=> ExistsAtInternal(position, 0, token);
+
+	private async ValueTask<bool> ExistsAtInternal(long position, int retries, CancellationToken token) {
+		var writerChk = _writerCheckpoint.Read();
+		if (position >= writerChk)
+			return false;
+
+		var chunk = await _db.Manager.GetInitializedChunkFor(position, token);
+		try {
+			CountRead(chunk.IsCached);
+			return await chunk.ExistsAt(chunk.ChunkHeader.GetLocalLogPosition(position), token);
+		} catch (FileBeingDeletedException) {
+			if (retries > MaxRetries)
+				throw new FileBeingDeletedException(
+					"Been told the file was deleted > MaxRetries times. Probably a problem in db.");
+			return await ExistsAtInternal(position, retries + 1, token);
+		}
+	}
+
+	private static void CountRead(bool isCached) {
+		if (isCached)
+			Interlocked.Increment(ref CachedReads);
+		else
+			Interlocked.Increment(ref NotCachedReads);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkScavenger.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkScavenger.cs
new file mode 100644
index 00000000000..dde8084b85b
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkScavenger.cs
@@ -0,0 +1,843 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext;
+using DotNext.Diagnostics;
+using DotNext.Runtime.CompilerServices;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.TransactionLog.Scavenging;
+using KurrentDB.LogCommon;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.TransactionLog.Chunks;
+
+public abstract class TFChunkScavenger {
+	public const int MinThreadCount = 1;
+	public const int MaxThreadCount = 4;
+	public const int MaxRetryCount = 5;
+	public const int FlushPageInterval = 32; // max 65536 pages to write resulting in 2048 flushes per chunk
+
+	public static async ValueTask<PosMap> WriteRecord(TFChunk.TFChunk newChunk, ILogRecord record, CancellationToken token) {
+		var writeResult = await newChunk.TryAppend(record, token);
+		if (!writeResult.Success) {
+			throw new Exception(string.Format(
+				"Unable to append record to scavenged chunk. Writer position: {0}, Record: {1}.",
+				writeResult.OldPosition,
+				record));
+		}
+
+		long logPos = newChunk.ChunkHeader.GetLocalLogPosition(record.LogPosition);
+		int actualPos = (int)writeResult.OldPosition;
+		return new PosMap(logPos, actualPos);
+	}
+}
+
+public class TFChunkScavenger<TStreamId> : TFChunkScavenger {
+	private readonly ILogger _logger;
+	private readonly TFChunkDb _db;
+	private readonly ITFChunkScavengerLog _scavengerLog;
+	private readonly ITableIndex<TStreamId> _tableIndex;
+	private readonly IReadIndex<TStreamId> _readIndex;
+	private readonly IMetastreamLookup<TStreamId> _metastreams;
+	private readonly long _maxChunkDataSize;
+	private readonly bool _unsafeIgnoreHardDeletes;
+	private readonly int _threads;
+
+	public TFChunkScavenger(ILogger logger, TFChunkDb db, ITFChunkScavengerLog scavengerLog, ITableIndex<TStreamId> tableIndex,
+		IReadIndex<TStreamId> readIndex, IMetastreamLookup<TStreamId> metastreams, long? maxChunkDataSize = null,
+		bool unsafeIgnoreHardDeletes = false, int threads = 1) {
+		Ensure.NotNull(logger, nameof(logger));
+		Ensure.NotNull(db, "db");
+		Ensure.NotNull(scavengerLog, "scavengerLog");
+		Ensure.NotNull(tableIndex, "tableIndex");
+		Ensure.NotNull(readIndex, "readIndex");
+		Ensure.NotNull(metastreams, nameof(metastreams));
+		Ensure.Positive(threads, "threads");
+
+		_logger = logger;
+
+		if (threads > MaxThreadCount) {
+			_logger.Warning(
+				"{numThreads} scavenging threads not allowed.  Max threads allowed for scavenging is {maxThreadCount}. Capping.",
+				threads, MaxThreadCount);
+			threads = MaxThreadCount;
+		}
+
+		_db = db;
+		_scavengerLog = scavengerLog;
+		_tableIndex = tableIndex;
+		_readIndex = readIndex;
+		_metastreams = metastreams;
+		_maxChunkDataSize = maxChunkDataSize ?? db.Config.ChunkSize;
+		_unsafeIgnoreHardDeletes = unsafeIgnoreHardDeletes;
+		_threads = threads;
+	}
+
+	public string ScavengeId => _scavengerLog.ScavengeId;
+
+	private static async IAsyncEnumerable<TFChunk.TFChunk> GetAllChunks(TFChunkDb db, int startFromChunk, [EnumeratorCancellation] CancellationToken token) {
+		long scavengePos = db.Config.ChunkSize * (long)startFromChunk;
+		while (scavengePos < db.Config.ChaserCheckpoint.Read()) {
+			var chunk = await db.Manager.GetInitializedChunkFor(scavengePos, token);
+			if (!chunk.IsReadOnly) {
+				yield break;
+			}
+
+			yield return chunk;
+
+			scavengePos = chunk.ChunkHeader.ChunkEndPosition;
+		}
+	}
+
+	[AsyncMethodBuilder(typeof(SpawningAsyncTaskMethodBuilder<>))] // get off the main queue
+	public async Task<ScavengeResult> Scavenge(bool alwaysKeepScavenged, bool mergeChunks, int startFromChunk = 0,
+		bool scavengeIndex = true,
+		CancellationToken ct = default) {
+		Ensure.Nonnegative(startFromChunk, nameof(startFromChunk));
+
+		// Awaiters don't have to handle Exceptions and can wait for the actual completion of the task.
+		var sw = new Timestamp();
+
+		ScavengeResult result = ScavengeResult.Success;
+		string error = null;
+		try {
+			_scavengerLog.ScavengeStarted(alwaysKeepScavenged, mergeChunks, startFromChunk, _threads);
+
+			await ScavengeInternal(alwaysKeepScavenged, mergeChunks, startFromChunk, ct);
+
+			if (scavengeIndex) {
+				await _tableIndex.Scavenge(_scavengerLog, ct);
+			}
+		} catch (OperationCanceledException) {
+			_logger.Information("SCAVENGING: Scavenge cancelled.");
+			result = ScavengeResult.Stopped;
+		} catch (Exception exc) {
+			result = ScavengeResult.Errored;
+			_logger.Error(exc, "SCAVENGING: Error while scavenging DB.");
+			error = string.Format("Error while scavenging DB: {0}.", exc.Message);
+		} finally {
+			try {
+				_scavengerLog.ScavengeCompleted(result, error, sw.Elapsed);
+			} catch (Exception ex) {
+				_logger.Error(ex,
+					"Error whilst recording scavenge completed. Scavenge result: {result}, Elapsed: {elapsed}, Original error: {e}",
+					result, sw.Elapsed, error);
+			}
+		}
+
+		return result;
+	}
+
+	private async ValueTask ScavengeInternal(bool alwaysKeepScavenged, bool mergeChunks, int startFromChunk,
+		CancellationToken ct) {
+		var totalSw = new Timestamp();
+		var sw = totalSw;
+
+		_logger.Debug(
+			"SCAVENGING: Started scavenging of DB. Chunks count at start: {chunksCount}. Options: alwaysKeepScavenged = {alwaysKeepScavenged}, mergeChunks = {mergeChunks}",
+			_db.Manager.ChunksCount, alwaysKeepScavenged, mergeChunks);
+
+		// Initial scavenge pass
+		var chunksToScavenge = GetAllChunks(_db, startFromChunk, ct);
+
+		using (var scavengeCacheObjectPool = CreateThreadLocalScavengeCachePool(_threads)) {
+			await Parallel.ForEachAsync(chunksToScavenge,
+				new ParallelOptions { MaxDegreeOfParallelism = _threads, CancellationToken = ct },
+				async (chunk, ct) => {
+					var cache = scavengeCacheObjectPool.Get();
+					try {
+						await ScavengeChunk(alwaysKeepScavenged, chunk, cache, ct);
+					} finally {
+						cache.Reset(); // reset thread local cache before next iteration.
+						scavengeCacheObjectPool.Return(cache);
+					}
+				});
+		}
+
+		_logger.Debug("SCAVENGING: Initial pass completed in {elapsed}.", sw.Elapsed);
+
+		// Merge scavenge pass
+		if (mergeChunks) {
+			await MergePhase(
+				logger: _logger,
+				db: _db,
+				maxChunkDataSize: _maxChunkDataSize,
+				scavengerLog: _scavengerLog,
+				throttle: new Throttle(_logger, TimeSpan.Zero, TimeSpan.Zero, 100),
+				ct: ct);
+		}
+
+		_logger.Debug("SCAVENGING: Total time taken: {elapsed}, total space saved: {spaceSaved}.", totalSw.Elapsed,
+			_scavengerLog.SpaceSaved);
+	}
+
+	private async ValueTask ScavengeChunk(bool alwaysKeepScavenged, TFChunk.TFChunk oldChunk,
+		ThreadLocalScavengeCache threadLocalCache, CancellationToken ct) {
+		ArgumentNullException.ThrowIfNull(oldChunk);
+
+		var sw = new Timestamp();
+
+		int chunkStartNumber = oldChunk.ChunkHeader.ChunkStartNumber;
+		long chunkStartPos = oldChunk.ChunkHeader.ChunkStartPosition;
+		int chunkEndNumber = oldChunk.ChunkHeader.ChunkEndNumber;
+		long chunkEndPos = oldChunk.ChunkHeader.ChunkEndPosition;
+
+		var tmpChunkPath = Path.Combine(_db.Config.Path, Guid.NewGuid() + ".scavenge.tmp");
+		var oldChunkName = oldChunk.ToString();
+		_logger.Debug(
+			"SCAVENGING: Started to scavenge chunks: {oldChunkName} {chunkStartNumber} => {chunkEndNumber} ({chunkStartPosition} => {chunkEndPosition})",
+			oldChunkName, chunkStartNumber, chunkEndNumber,
+			chunkStartPos, chunkEndPos);
+		_logger.Debug("Resulting temp chunk file: {tmpChunkPath}.", Path.GetFileName(tmpChunkPath));
+
+		TFChunk.TFChunk newChunk;
+		try {
+			newChunk = await TFChunk.TFChunk.CreateNew(
+				_db.Manager.FileSystem,
+				tmpChunkPath,
+				_db.Config.ChunkSize,
+				chunkStartNumber,
+				chunkEndNumber,
+				isScavenged: true,
+				inMem: _db.Config.InMemDb,
+				unbuffered: _db.Config.Unbuffered,
+				writethrough: _db.Config.WriteThrough,
+				reduceFileCachePressure: _db.Config.ReduceFileCachePressure,
+				tracker: new TFChunkTracker.NoOp(),
+				getTransformFactory: _db.TransformManager,
+				ct);
+		} catch (IOException exc) {
+			_logger.Error(exc,
+				"IOException during creating new chunk for scavenging purposes. Stopping scavenging process...");
+			throw;
+		}
+
+		try {
+			await TraverseChunkBasic(oldChunk, ct,
+				new Action<CandidateRecord>(result => {
+					threadLocalCache.Records.Add(result);
+
+					if (result.LogRecord.RecordType == LogRecordType.Commit) {
+						var commit = (CommitLogRecord)result.LogRecord;
+						if (commit.TransactionPosition >= chunkStartPos)
+							threadLocalCache.Commits.Add(commit.TransactionPosition, new CommitInfo(commit));
+					}
+				}).ToAsync());
+
+			long newSize = 0;
+			int filteredCount = 0;
+
+			for (int i = 0; i < threadLocalCache.Records.Count; i++) {
+				ct.ThrowIfCancellationRequested();
+
+				var recordReadResult = threadLocalCache.Records[i];
+				if (await ShouldKeep(recordReadResult, threadLocalCache.Commits, chunkStartPos, chunkEndPos, ct)) {
+					newSize += recordReadResult.RecordLength + 2 * sizeof(int);
+					filteredCount++;
+				} else {
+					// We don't need this record any more.
+					threadLocalCache.Records[i] = default(CandidateRecord);
+				}
+			}
+
+			_logger.Debug("Scavenging {oldChunkName} traversed {recordsCount} including {filteredCount}.", oldChunkName,
+				threadLocalCache.Records.Count, filteredCount);
+
+			newSize += filteredCount * PosMap.FullSize + ChunkHeader.Size + ChunkFooter.Size;
+			if (newChunk.ChunkHeader.Version >= (byte)TFChunk.TFChunk.ChunkVersions.Aligned)
+				newSize = TFChunk.TFChunk.GetAlignedSize((int)newSize);
+
+			bool oldVersion = oldChunk.ChunkHeader.Version < (byte)TFChunk.TFChunk.ChunkVersions.Aligned;
+			long oldSize = oldChunk.FileSize;
+
+			if (oldSize <= newSize && !alwaysKeepScavenged && !_unsafeIgnoreHardDeletes && !oldVersion) {
+				_logger.Debug(
+					"Scavenging of chunks:"
+					+ "\n{oldChunkName}"
+					+ "\ncompleted in {elapsed}."
+					+ "\nOld chunks' versions are kept as they are smaller."
+					+ "\nOld chunk total size: {oldSize}, scavenged chunk size: {newSize}."
+					+ "\nScavenged chunk removed.", oldChunkName, sw.Elapsed, oldSize, newSize);
+
+				newChunk.MarkForDeletion();
+				_scavengerLog.ChunksNotScavenged(chunkStartNumber, chunkEndNumber, sw.Elapsed, "");
+			} else {
+				var positionMapping = new List<PosMap>(filteredCount);
+
+				var lastFlushedPage = -1;
+				for (int i = 0; i < threadLocalCache.Records.Count; i++) {
+
+					// Since we replaced the ones we don't want with `default`, the success flag will only be true on the ones we want to keep.
+					var recordReadResult = threadLocalCache.Records[i];
+
+					// Check log record, if not present then assume we can skip.
+					if (recordReadResult.LogRecord is not null)
+						positionMapping.Add(await WriteRecord(newChunk, recordReadResult.LogRecord, ct));
+
+					var currentPage = newChunk.RawWriterPosition / 4096;
+					if (currentPage - lastFlushedPage > FlushPageInterval) {
+						await newChunk.Flush(ct);
+						lastFlushedPage = currentPage;
+					}
+				}
+
+				await newChunk.CompleteScavenge(positionMapping, ct);
+
+				if (_unsafeIgnoreHardDeletes) {
+					_logger.Debug("Forcing scavenge chunk to be kept even if bigger.");
+				}
+
+				if (oldVersion) {
+					_logger.Debug("Forcing scavenged chunk to be kept as old chunk is a previous version.");
+				}
+
+				var chunk = await _db.Manager.SwitchInTempChunk(newChunk, verifyHash: false,
+					removeChunksWithGreaterNumbers: false, ct);
+				if (chunk is not null) {
+					_logger.Debug("Scavenging of chunks:"
+							  + "\n{oldChunkName}"
+							  + "\ncompleted in {elapsed}."
+							  + "\nNew chunk: {tmpChunkPath} --> #{chunkStartNumber}-{chunkEndNumber} ({newChunk})."
+							  + "\nOld chunk total size: {oldSize}, scavenged chunk size: {newSize}.",
+						oldChunkName, sw.Elapsed, Path.GetFileName(tmpChunkPath), chunkStartNumber, chunkEndNumber,
+						Path.GetFileName(chunk.ChunkLocator), oldSize, newSize);
+					var spaceSaved = oldSize - newSize;
+					_scavengerLog.ChunksScavenged(chunkStartNumber, chunkEndNumber, sw.Elapsed, spaceSaved);
+				} else {
+					_logger.Debug("Scavenging of chunks:"
+							  + "\n{oldChunkName}"
+							  + "\ncompleted in {elapsed}."
+							  + "\nBut switching was prevented for new chunk: #{chunkStartNumber}-{chunkEndNumber} ({tmpChunkPath})."
+							  + "\nOld chunks total size: {oldSize}, scavenged chunk size: {newSize}.",
+						oldChunkName, sw.Elapsed, chunkStartNumber, chunkEndNumber, Path.GetFileName(tmpChunkPath),
+						oldSize, newSize);
+					_scavengerLog.ChunksNotScavenged(chunkStartNumber, chunkEndNumber, sw.Elapsed,
+						"Chunk switch prevented.");
+				}
+			}
+		} catch (FileBeingDeletedException exc) {
+			_logger.Information(
+				"Got FileBeingDeletedException exception during scavenging, that probably means some chunks were re-replicated."
+				+ "\nScavenging of following chunks will be skipped: {oldChunkName}"
+				+ "\nStopping scavenging and removing temp chunk '{tmpChunkPath}'..."
+				+ "\nException message: {e}.",
+				oldChunkName, tmpChunkPath, exc.Message);
+			newChunk.Dispose();
+			DeleteTempChunk(_logger, tmpChunkPath, MaxRetryCount);
+			_scavengerLog.ChunksNotScavenged(chunkStartNumber, chunkEndNumber, sw.Elapsed, exc.Message);
+		} catch (OperationCanceledException) {
+			_logger.Information("Scavenging cancelled at: {oldChunkName}", oldChunkName);
+			newChunk.MarkForDeletion();
+			_scavengerLog.ChunksNotScavenged(chunkStartNumber, chunkEndNumber, sw.Elapsed, "Scavenge cancelled");
+		} catch (Exception ex) {
+			_logger.Information(
+				"Got exception while scavenging chunk: #{chunkStartNumber}-{chunkEndNumber}. This chunk will be skipped\n"
+				+ "Exception: {e}.", chunkStartNumber, chunkEndNumber, ex.ToString());
+			newChunk.Dispose();
+			DeleteTempChunk(_logger, tmpChunkPath, MaxRetryCount);
+			_scavengerLog.ChunksNotScavenged(chunkStartNumber, chunkEndNumber, sw.Elapsed, ex.Message);
+		}
+	}
+
+	public static async ValueTask MergePhase(
+		ILogger logger,
+		TFChunkDb db,
+		long maxChunkDataSize,
+		ITFChunkScavengerLog scavengerLog,
+		Throttle throttle,
+		CancellationToken ct) {
+
+		bool mergedSomething;
+		int passNum = 0;
+		do {
+			mergedSomething = false;
+			passNum += 1;
+			var sw = new Timestamp();
+
+			var chunksToMerge = new List<TFChunk.TFChunk>();
+			long totalDataSize = 0;
+			await foreach (var chunk in GetAllChunks(db, 0, ct)) {
+				ct.ThrowIfCancellationRequested();
+
+				if (totalDataSize + chunk.PhysicalDataSize > maxChunkDataSize) {
+					if (chunksToMerge.Count == 0)
+						throw new Exception("SCAVENGING: No chunks to merge, unexpectedly...");
+
+					if (chunksToMerge.Count > 1 &&
+						await MergeChunks(
+							logger: logger,
+							db: db,
+							scavengerLog: scavengerLog,
+							oldChunks: chunksToMerge,
+							ct: ct)) {
+
+						mergedSomething = true;
+					}
+
+					chunksToMerge.Clear();
+					totalDataSize = 0;
+				}
+
+				chunksToMerge.Add(chunk);
+				totalDataSize += chunk.PhysicalDataSize;
+				throttle.Rest(ct);
+			}
+
+			if (chunksToMerge.Count > 1) {
+				if (await MergeChunks(
+					logger: logger,
+					db: db,
+					scavengerLog: scavengerLog,
+					oldChunks: chunksToMerge,
+					ct: ct)) {
+
+					mergedSomething = true;
+				}
+			}
+
+			logger.Debug("SCAVENGING: Merge pass #{pass} completed in {elapsed}. {merged} merged.",
+				passNum, sw.Elapsed, mergedSomething ? "Some chunks" : "Nothing");
+		} while (mergedSomething);
+	}
+
+	private static async ValueTask<bool> MergeChunks(
+		ILogger logger,
+		TFChunkDb db,
+		ITFChunkScavengerLog scavengerLog,
+		IList<TFChunk.TFChunk> oldChunks,
+		CancellationToken ct) {
+
+		if (oldChunks.IsEmpty())
+			throw new ArgumentException("Provided list of chunks to merge is empty.");
+
+		var oldChunksList = string.Join("\n", oldChunks);
+
+		if (oldChunks.Count < 2) {
+			logger.Debug("SCAVENGING: Tried to merge less than 2 chunks, aborting: {oldChunksList}", oldChunksList);
+			return false;
+		}
+
+		var sw = new Timestamp();
+
+		int chunkStartNumber = oldChunks.First().ChunkHeader.ChunkStartNumber;
+		int chunkEndNumber = oldChunks.Last().ChunkHeader.ChunkEndNumber;
+
+		var tmpChunkPath = Path.Combine(db.Config.Path, Guid.NewGuid() + ".merge.scavenge.tmp");
+		logger.Debug("SCAVENGING: Started to merge chunks: {oldChunksList}"
+				  + "\nResulting temp chunk file: {tmpChunkPath}.",
+			oldChunksList, Path.GetFileName(tmpChunkPath));
+
+		TFChunk.TFChunk newChunk;
+		try {
+			newChunk = await TFChunk.TFChunk.CreateNew(
+				db.Manager.FileSystem,
+				tmpChunkPath,
+				db.Config.ChunkSize,
+				chunkStartNumber,
+				chunkEndNumber,
+				isScavenged: true,
+				inMem: db.Config.InMemDb,
+				unbuffered: db.Config.Unbuffered,
+				writethrough: db.Config.WriteThrough,
+				reduceFileCachePressure: db.Config.ReduceFileCachePressure,
+				tracker: new TFChunkTracker.NoOp(),
+				getTransformFactory: db.TransformManager,
+				ct);
+		} catch (IOException exc) {
+			logger.Error(exc,
+				"IOException during creating new chunk for scavenging merge purposes. Stopping scavenging merge process...");
+			return false;
+		}
+
+		try {
+			var oldVersion = oldChunks.Any(x => x.ChunkHeader.Version < (byte)TFChunk.TFChunk.ChunkVersions.Aligned);
+
+			var positionMapping = new List<PosMap>();
+			foreach (var oldChunk in oldChunks) {
+				var lastFlushedPage = -1;
+				await TraverseChunkBasic(oldChunk, ct,
+					async (result, ct) => {
+
+						positionMapping.Add(await WriteRecord(newChunk, result.LogRecord, ct));
+
+						var currentPage = newChunk.RawWriterPosition / 4096;
+						if (currentPage - lastFlushedPage > FlushPageInterval) {
+							await newChunk.Flush(ct);
+							lastFlushedPage = currentPage;
+						}
+					});
+			}
+
+			await newChunk.CompleteScavenge(positionMapping, ct);
+
+			if (oldVersion) {
+				logger.Debug("Forcing merged chunk to be kept as old chunk is a previous version.");
+			}
+
+			var chunk = await db.Manager.SwitchInTempChunk(newChunk, verifyHash: false,
+				removeChunksWithGreaterNumbers: false, ct);
+			if (chunk is not null) {
+				logger.Debug(
+					"Merging of chunks:"
+					+ "\n{oldChunksList}"
+					+ "\ncompleted in {elapsed}."
+					+ "\nNew chunk: {tmpChunkPath} --> #{chunkStartNumber}-{chunkEndNumber} ({newChunk}).",
+					oldChunksList, sw.Elapsed, Path.GetFileName(tmpChunkPath), chunkStartNumber, chunkEndNumber,
+					Path.GetFileName(chunk.ChunkLocator));
+				var spaceSaved = oldChunks.Sum(_ => _.FileSize) - newChunk.FileSize;
+				scavengerLog.ChunksMerged(chunkStartNumber, chunkEndNumber, sw.Elapsed, spaceSaved);
+				return true;
+			} else {
+				logger.Debug(
+					"Merging of chunks:"
+					+ "\n{oldChunksList}"
+					+ "\ncompleted in {elapsed}."
+					+ "\nBut switching was prevented for new chunk: #{chunkStartNumber}-{chunkEndNumber} ({tmpChunkPath}).",
+					oldChunksList, sw.Elapsed, chunkStartNumber, chunkEndNumber, Path.GetFileName(tmpChunkPath));
+				scavengerLog.ChunksNotMerged(chunkStartNumber, chunkEndNumber, sw.Elapsed,
+					"Chunk switch prevented.");
+				return false;
+			}
+		} catch (FileBeingDeletedException exc) {
+			logger.Information(
+				"Got FileBeingDeletedException exception during scavenge merging, that probably means some chunks were re-replicated."
+				+ "\nMerging of following chunks will be skipped:"
+				+ "\n{oldChunksList}"
+				+ "\nStopping merging and removing temp chunk '{tmpChunkPath}'..."
+				+ "\nException message: {e}.",
+				oldChunksList, tmpChunkPath, exc.Message);
+			newChunk.Dispose();
+			DeleteTempChunk(logger, tmpChunkPath, MaxRetryCount);
+			scavengerLog.ChunksNotMerged(chunkStartNumber, chunkEndNumber, sw.Elapsed, exc.Message);
+			return false;
+		} catch (OperationCanceledException) {
+			logger.Information("Scavenging cancelled at:"
+					 + "\n{oldChunksList}",
+				oldChunksList);
+			newChunk.MarkForDeletion();
+			scavengerLog.ChunksNotMerged(chunkStartNumber, chunkEndNumber, sw.Elapsed, "Scavenge cancelled");
+			return false;
+		} catch (Exception ex) {
+			logger.Information("Got exception while merging chunk:"
+					 + "\n{oldChunks}"
+					 + "\nException: {e}",
+				oldChunks, ex.ToString()
+			);
+			newChunk.Dispose();
+			DeleteTempChunk(logger, tmpChunkPath, MaxRetryCount);
+			scavengerLog.ChunksNotMerged(chunkStartNumber, chunkEndNumber, sw.Elapsed, ex.Message);
+			return false;
+		}
+	}
+
+	public static void DeleteTempChunk(ILogger logger, string tmpChunkPath, int retries) {
+		try {
+			File.SetAttributes(tmpChunkPath, FileAttributes.Normal);
+			File.Delete(tmpChunkPath);
+		} catch (Exception ex) {
+			if (retries > 0) {
+				logger.Error("Failed to delete the temp chunk. Retrying {retry}/{maxRetryCount}. Reason: {e}",
+					MaxRetryCount - retries, MaxRetryCount, ex);
+				Thread.Sleep(5000);
+				DeleteTempChunk(logger, tmpChunkPath, retries - 1);
+			} else {
+				logger.Error("Failed to delete the temp chunk. Retry limit of {maxRetryCount} reached. Reason: {e}",
+					MaxRetryCount, ex);
+				if (ex is IOException)
+					WindowsProcessUtil.PrintWhoIsLocking(tmpChunkPath, logger);
+				throw;
+			}
+		}
+	}
+
+	private async ValueTask<bool> ShouldKeep(CandidateRecord result, Dictionary<long, CommitInfo> commits, long chunkStartPos,
+		long chunkEndPos, CancellationToken token) {
+		switch (result.LogRecord.RecordType) {
+			case LogRecordType.Prepare:
+				var prepare = (IPrepareLogRecord<TStreamId>)result.LogRecord;
+				if (await ShouldKeepPrepare(prepare, commits, chunkStartPos, chunkEndPos, token))
+					return true;
+				break;
+			case LogRecordType.Commit:
+				var commit = (CommitLogRecord)result.LogRecord;
+				if (ShouldKeepCommit(commit, commits))
+					return true;
+				break;
+			case LogRecordType.ContentType:
+			case LogRecordType.EventType:
+			case LogRecordType.Partition:
+			case LogRecordType.PartitionType:
+			case LogRecordType.Stream:
+			case LogRecordType.StreamType:
+			case LogRecordType.StreamWrite:
+			case LogRecordType.System:
+			case LogRecordType.TransactionEnd:
+			case LogRecordType.TransactionStart:
+				return true;
+		}
+
+		return false;
+	}
+
+	private bool ShouldKeepCommit(CommitLogRecord commit, Dictionary<long, CommitInfo> commits) {
+		CommitInfo commitInfo;
+		if (!commits.TryGetValue(commit.TransactionPosition, out commitInfo)) {
+			// This should never happen given that we populate `commits` from the commit records.
+			// (not sure about this. the `commits` are only commit records for transactions that opened in this chunk)
+			return true;
+		}
+
+		return commitInfo.KeepCommit != false;
+	}
+
+	private async ValueTask<bool> ShouldKeepPrepare(
+		IPrepareLogRecord<TStreamId> prepare,
+		Dictionary<long, CommitInfo> commits,
+		long chunkStart,
+		long chunkEnd,
+		CancellationToken token) {
+
+		CommitInfo commitInfo;
+		bool hasSeenCommit = commits.TryGetValue(prepare.TransactionPosition, out commitInfo);
+		bool isCommitted = hasSeenCommit || prepare.Flags.HasAnyOf(PrepareFlags.IsCommitted);
+
+		if (prepare.Flags.HasAnyOf(PrepareFlags.StreamDelete)) {
+			// this is the tombstone of a hard deleted stream.
+			if (_unsafeIgnoreHardDeletes) {
+				_logger.Information(
+					"Removing hard deleted stream tombstone for stream {stream} at position {transactionPosition}",
+					prepare.EventStreamId, prepare.TransactionPosition);
+				commitInfo.TryNotToKeep();
+				return false;
+			} else {
+				commitInfo.ForciblyKeep();
+				return true;
+			}
+		}
+
+		if (!isCommitted && prepare.Flags.HasAnyOf(PrepareFlags.TransactionBegin)) {
+			// So here we have prepare which commit is in the following chunks or prepare is not committed at all.
+			// Now, whatever heuristic on prepare scavenge we use, we should never delete the very first prepare
+			// in transaction, as in some circumstances we need it.
+			// For instance, this prepare could be part of ongoing transaction and though we sometimes can determine
+			// that prepare wouldn't ever be needed (e.g., stream was deleted, $maxAge or $maxCount rule it out)
+			// we still need the first prepare to find out StreamId for possible commit in StorageWriterService.WriteCommit method.
+			// There could be other reasons where it is needed, so we just safely filter it out to not bother further.
+			return true;
+		}
+
+		var lastEventNumber = await _readIndex.GetStreamLastEventNumber(prepare.EventStreamId, token);
+		if (lastEventNumber is EventNumber.DeletedStream) {
+			// The stream is hard deleted but this is not the tombstone.
+			// When all prepares and commit of transaction belong to single chunk and the stream is deleted,
+			// we can safely delete both prepares and commit.
+			// Even if this prepare is not committed, but its stream is deleted, then as long as it is
+			// not TransactionBegin prepare we can remove it, because any transaction should fail either way on commit stage.
+			// (see comments in previous section for TransactionBegin)
+			commitInfo.TryNotToKeep();
+			return false;
+		}
+
+		if (!isCommitted) {
+			// If we could somehow figure out (from read index) the event number of this prepare
+			// (if it is actually committed, but commit is in another chunk) then we can apply same scavenging logic.
+			// Unfortunately, if it is not committed prepare we can say nothing for now, so should conservatively keep it.
+			return true;
+		}
+
+		if (prepare.Flags.HasNoneOf(PrepareFlags.Data)) {
+			// We encountered system prepare with no data. As of now it can appear only in explicit
+			// transactions so we can safely remove it. The performance shouldn't hurt, because
+			// TransactionBegin prepare is never needed either way and TransactionEnd should be in most
+			// circumstances close to commit, so shouldn't hurt performance too much.
+			// The advantage of getting rid of system prepares is ability to completely eliminate transaction
+			// prepares and commit, if transaction events are completely ruled out by $maxAge/$maxCount.
+			// Otherwise we'd have to either keep prepare not requiring to keep commit, which could leave
+			// this prepare as never discoverable garbage, or we could insist on keeping commit forever
+			// even if all events in transaction are scavenged.
+			commitInfo.TryNotToKeep();
+			return false;
+		}
+
+		if (await IsSoftDeletedTempStreamWithinSameChunk(prepare.EventStreamId, chunkStart, chunkEnd, token)) {
+			commitInfo.TryNotToKeep();
+			return false;
+		}
+
+		var eventNumber = prepare.Flags.HasAnyOf(PrepareFlags.IsCommitted)
+			? prepare.ExpectedVersion + 1 // IsCommitted prepares always have explicit expected version
+										  // we always have commitInfo.EventNumber here because we early returned if isCommitted is false
+			: commitInfo.EventNumber + prepare.TransactionOffset;
+
+		if (await DiscardBecauseDuplicate(prepare, eventNumber, token)) {
+			commitInfo.TryNotToKeep();
+			return false;
+		}
+
+		// We should always physically keep the very last prepare in the stream.
+		// Otherwise we get into trouble when trying to resolve LastStreamEventNumber, for instance.
+		// That is because our TableIndex doesn't keep EventStreamId, only hash of it, so on doing some operations
+		// that needs TableIndex, we have to make sure we have prepare records in TFChunks when we need them.
+		if (eventNumber >= lastEventNumber) {
+			// Definitely keep commit, otherwise current prepare wouldn't be discoverable.
+			commitInfo.ForciblyKeep();
+			return true;
+		}
+
+		var meta = await _readIndex.GetStreamMetadata(prepare.EventStreamId, token);
+		bool canRemove = (meta.MaxCount.HasValue && eventNumber < lastEventNumber - meta.MaxCount.Value + 1)
+						 || (meta.TruncateBefore.HasValue && eventNumber < meta.TruncateBefore.Value)
+						 || (meta.MaxAge.HasValue && prepare.TimeStamp < DateTime.UtcNow - meta.MaxAge.Value);
+
+		if (canRemove) {
+			commitInfo.TryNotToKeep();
+			return false;
+		} else {
+			commitInfo.ForciblyKeep();
+			return true;
+		}
+	}
+
+	private async ValueTask<bool> DiscardBecauseDuplicate(IPrepareLogRecord<TStreamId> prepare, long eventNumber, CancellationToken token) {
+		var result = await _readIndex.ReadEvent(IndexReader.UnspecifiedStreamName, prepare.EventStreamId, eventNumber, token);
+
+		// prepare isn't the record we get for an index read at its own stream/version.
+		// therefore it is a duplicate that cannot be read from the index, discard it.
+		return result.Result is ReadEventResult.Success && result.Record.LogPosition != prepare.LogPosition;
+	}
+
+	private async ValueTask<bool> IsSoftDeletedTempStreamWithinSameChunk(TStreamId eventStreamId, long chunkStart, long chunkEnd, CancellationToken token) {
+		TStreamId sh;
+		TStreamId msh;
+		if (_metastreams.IsMetaStream(eventStreamId)) {
+			var originalStreamId = _metastreams.OriginalStreamOf(eventStreamId);
+			var meta = await _readIndex.GetStreamMetadata(originalStreamId, token);
+			if (meta.TruncateBefore != EventNumber.DeletedStream || meta.TempStream != true)
+				return false;
+			sh = originalStreamId;
+			msh = eventStreamId;
+		} else {
+			var meta = await _readIndex.GetStreamMetadata(eventStreamId, token);
+			if (meta.TruncateBefore != EventNumber.DeletedStream || meta.TempStream != true)
+				return false;
+			sh = eventStreamId;
+			msh = _metastreams.MetaStreamOf(eventStreamId);
+		}
+
+		IndexEntry e;
+		var allInChunk = _tableIndex.TryGetOldestEntry(sh, out e) && e.Position >= chunkStart &&
+						 e.Position < chunkEnd
+						 && _tableIndex.TryGetLatestEntry(sh, out e) && e.Position >= chunkStart &&
+						 e.Position < chunkEnd
+						 && _tableIndex.TryGetOldestEntry(msh, out e) && e.Position >= chunkStart &&
+						 e.Position < chunkEnd
+						 && _tableIndex.TryGetLatestEntry(msh, out e) && e.Position >= chunkStart &&
+						 e.Position < chunkEnd;
+		return allInChunk;
+	}
+
+	private static async ValueTask TraverseChunkBasic(TFChunk.TFChunk chunk, CancellationToken ct,
+		Func<CandidateRecord, CancellationToken, ValueTask> process) {
+		var result = await chunk.TryReadFirst(ct);
+		while (result.Success) {
+			await process(new CandidateRecord(result.LogRecord, result.RecordLength), ct);
+
+			result = await chunk.TryReadClosestForward(result.NextPosition, ct);
+		}
+	}
+
+	internal class CommitInfo {
+		public readonly long EventNumber;
+
+		public bool? KeepCommit;
+
+		public CommitInfo(CommitLogRecord commitRecord) {
+			EventNumber = commitRecord.FirstEventNumber;
+		}
+
+		public override string ToString() {
+			return string.Format("EventNumber: {0}, KeepCommit: {1}", EventNumber, KeepCommit);
+		}
+	}
+
+	struct CandidateRecord {
+		public readonly ILogRecord LogRecord;
+		public readonly int RecordLength;
+
+		public CandidateRecord(ILogRecord logRecord, int recordLength) {
+			LogRecord = logRecord;
+			RecordLength = recordLength;
+		}
+	}
+
+	private ObjectPool<ThreadLocalScavengeCache> CreateThreadLocalScavengeCachePool(int threads) {
+		const int initialSizeOfThreadLocalCache = 1024 * 64; // 64k records
+
+		return new ObjectPool<ThreadLocalScavengeCache>(
+			ScavengeId,
+			0,
+			threads,
+			() => {
+				_logger.Debug("SCAVENGING: Allocating {size} spaces in thread local cache {threadId}.",
+					initialSizeOfThreadLocalCache,
+					Thread.CurrentThread.ManagedThreadId);
+				return new ThreadLocalScavengeCache(initialSizeOfThreadLocalCache);
+			},
+			cache => { },
+			pool => { });
+	}
+
+	class ThreadLocalScavengeCache {
+		private readonly Dictionary<long, CommitInfo> _commits;
+		private readonly List<CandidateRecord> _records;
+
+		public Dictionary<long, CommitInfo> Commits {
+			get { return _commits; }
+		}
+
+		public List<CandidateRecord> Records {
+			get { return _records; }
+		}
+
+		public ThreadLocalScavengeCache(int records) {
+			// assume max quarter records are commits.
+			_commits = new Dictionary<long, CommitInfo>(records / 4);
+			_records = new List<CandidateRecord>(records);
+		}
+
+		public void Reset() {
+			Commits.Clear();
+			Records.Clear();
+		}
+	}
+}
+
+internal static class CommitInfoExtensions {
+	public static void ForciblyKeep<TStreamId>(this TFChunkScavenger<TStreamId>.CommitInfo commitInfo) {
+		if (commitInfo != null)
+			commitInfo.KeepCommit = true;
+	}
+
+	public static void TryNotToKeep<TStreamId>(this TFChunkScavenger<TStreamId>.CommitInfo commitInfo) {
+		// If someone decided definitely to keep corresponding commit then we shouldn't interfere.
+		// Otherwise we should point that yes, you can remove commit for this prepare.
+		if (commitInfo != null)
+			commitInfo.KeepCommit = commitInfo.KeepCommit ?? false;
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkScavengerLog.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkScavengerLog.cs
new file mode 100644
index 00000000000..3c0324f1819
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkScavengerLog.cs
@@ -0,0 +1,287 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Storage;
+using KurrentDB.Core.Services.UserManagement;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.TransactionLog.Chunks;
+
+class TFChunkScavengerLog : ITFChunkScavengerLog {
+	private readonly object _updateLock = new object();
+
+	private readonly string _streamName;
+	private readonly IODispatcher _ioDispatcher;
+	private readonly string _scavengeId;
+	private readonly string _nodeId;
+	private readonly int _retryAttempts;
+	private readonly TimeSpan _scavengeHistoryMaxAge;
+	private static readonly ILogger Log = Serilog.Log.ForContext<StorageScavenger>();
+	private long _spaceSaved;
+
+	/// <summary>
+	/// When we're scavenging, we want to keep track of the chunk high watermark (this won't be perfect in multi-threaded scavenges)
+	/// as it will give us a good approximate place to resume the scavenge if it gets interrupted.
+	/// </summary>
+	private int _maxChunkScavenged;
+
+	public TFChunkScavengerLog(IODispatcher ioDispatcher, string scavengeId, string nodeId, int retryAttempts,
+		TimeSpan scavengeHistoryMaxAge) {
+		_ioDispatcher = ioDispatcher;
+		_scavengeId = scavengeId;
+		_nodeId = nodeId;
+		_retryAttempts = retryAttempts;
+		_scavengeHistoryMaxAge = scavengeHistoryMaxAge;
+
+		_streamName = string.Format("{0}-{1}", SystemStreams.ScavengesStream, scavengeId);
+	}
+
+	public string ScavengeId => _scavengeId;
+
+	public long SpaceSaved => Interlocked.Read(ref _spaceSaved);
+
+	public void ScavengeStarted() {
+		ScavengeStartedInternal(new Dictionary<string, object> {
+			{"scavengeId", _scavengeId},
+			{"nodeEndpoint", _nodeId},
+		});
+	}
+
+	public void ScavengeStarted(bool alwaysKeepScavenged, bool mergeChunks, int startFromChunk, int threads) {
+		ScavengeStartedInternal(new Dictionary<string, object> {
+			{"scavengeId", _scavengeId},
+			{"nodeEndpoint", _nodeId},
+			{"alwaysKeepScavenged", alwaysKeepScavenged},
+			{"mergeChunks", mergeChunks},
+			{"startFromChunk", startFromChunk},
+			{"threads", threads},
+		});
+	}
+
+	private void ScavengeStartedInternal(Dictionary<string, object> payload) {
+		var metadataEventId = Guid.NewGuid();
+		var metaStreamId = SystemStreams.MetastreamOf(_streamName);
+		var acl = new StreamAcl(
+			new string[] { "$ops" },
+			new string[] { },
+			new string[] { },
+			new string[] { },
+			new string[] { }
+		);
+		var metadata = new StreamMetadata(maxAge: _scavengeHistoryMaxAge, acl: acl);
+		var metaStreamEvent = new Event(metadataEventId, SystemEventTypes.StreamMetadata, isJson: true,
+			data: metadata.ToJsonBytes(), metadata: null);
+		_ioDispatcher.WriteEvent(metaStreamId, ExpectedVersion.Any, metaStreamEvent, SystemAccounts.System, m => {
+			if (m.Result != OperationResult.Success) {
+				Log.Error(
+					"Failed to write the $maxAge of {days} days metadata for the {stream} stream. Reason: {reason}",
+					_scavengeHistoryMaxAge.TotalDays, _streamName, m.Result);
+			}
+		});
+
+		var scavengeStartedEvent = new Event(Guid.NewGuid(), SystemEventTypes.ScavengeStarted, true,
+			payload.ToJsonBytes(), null);
+		WriteScavengeDetailEvent(_streamName, scavengeStartedEvent, _retryAttempts);
+	}
+
+	public void ScavengeCompleted(ScavengeResult result, string error, TimeSpan elapsed)
+		=> ScavengeCompleted(result, error, elapsed, _spaceSaved, _maxChunkScavenged);
+
+	internal void ScavengeCompleted(ScavengeResult result, string error, TimeSpan elapsed, long spaceSaved, int maxChunkScavenged) {
+		var scavengeCompletedEvent = new Event(Guid.NewGuid(), SystemEventTypes.ScavengeCompleted, true,
+			new Dictionary<string, object> {
+				{"scavengeId", _scavengeId},
+				{"nodeEndpoint", _nodeId},
+				{"result", result},
+				{"error", error},
+				{"timeTaken", elapsed},
+				{"spaceSaved", spaceSaved},
+				{"maxChunkScavenged", maxChunkScavenged}
+			}.ToJsonBytes(), null);
+		WriteScavengeDetailEvent(_streamName, scavengeCompletedEvent, _retryAttempts);
+	}
+
+	public void ChunksScavenged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, long spaceSaved) {
+		Interlocked.Add(ref _spaceSaved, spaceSaved);
+		lock (_updateLock)
+			_maxChunkScavenged = Math.Max(_maxChunkScavenged, chunkEndNumber);
+		var evnt = new Event(Guid.NewGuid(), SystemEventTypes.ScavengeChunksCompleted, true,
+			new Dictionary<string, object> {
+				{"scavengeId", _scavengeId},
+				{"chunkStartNumber", chunkStartNumber},
+				{"chunkEndNumber", chunkEndNumber},
+				{"timeTaken", elapsed},
+				{"wasScavenged", true},
+				{"spaceSaved", spaceSaved},
+				{"nodeEndpoint", _nodeId},
+				{"errorMessage", ""}
+			}.ToJsonBytes(), null);
+
+		WriteScavengeChunkCompletedEvent(_streamName, evnt, _retryAttempts);
+	}
+
+	public void ChunksNotScavenged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed,
+		string errorMessage) {
+		// We still update the _maxChunkScavenged as we've processed it during our scavenge stage.
+		lock (_updateLock)
+			_maxChunkScavenged = Math.Max(_maxChunkScavenged, chunkEndNumber);
+		var evnt = new Event(Guid.NewGuid(), SystemEventTypes.ScavengeChunksCompleted, true,
+			new Dictionary<string, object> {
+				{"scavengeId", _scavengeId},
+				{"chunkStartNumber", chunkStartNumber},
+				{"chunkEndNumber", chunkEndNumber},
+				{"timeTaken", elapsed},
+				{"wasScavenged", false},
+				{"spaceSaved", 0},
+				{"nodeEndpoint", _nodeId},
+				{"errorMessage", errorMessage}
+			}.ToJsonBytes(), null);
+
+		WriteScavengeChunkCompletedEvent(_streamName, evnt, _retryAttempts);
+	}
+
+	public void ChunksMerged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, long spaceSaved) {
+		Interlocked.Add(ref _spaceSaved, spaceSaved);
+		var evnt = new Event(Guid.NewGuid(), SystemEventTypes.ScavengeMergeCompleted, true,
+			new Dictionary<string, object> {
+				{"scavengeId", _scavengeId},
+				{"chunkStartNumber", chunkStartNumber},
+				{"chunkEndNumber", chunkEndNumber},
+				{"timeTaken", elapsed},
+				{"spaceSaved", spaceSaved},
+				{"wasMerged", true},
+				{"nodeEndpoint", _nodeId},
+				{"errorMessage", ""}
+			}.ToJsonBytes(), null);
+
+		WriteScavengeChunkCompletedEvent(_streamName, evnt, _retryAttempts);
+	}
+
+	public void ChunksNotMerged(int chunkStartNumber, int chunkEndNumber, TimeSpan elapsed, string errorMessage) {
+		var evnt = new Event(Guid.NewGuid(), SystemEventTypes.ScavengeMergeCompleted, true,
+			new Dictionary<string, object> {
+				{"scavengeId", _scavengeId},
+				{"chunkStartNumber", chunkStartNumber},
+				{"chunkEndNumber", chunkEndNumber},
+				{"timeTaken", elapsed},
+				{"spaceSaved", 0},
+				{"wasMerged", false},
+				{"nodeEndpoint", _nodeId},
+				{"errorMessage", errorMessage}
+			}.ToJsonBytes(), null);
+
+		WriteScavengeChunkCompletedEvent(_streamName, evnt, _retryAttempts);
+	}
+
+
+	public void IndexTableScavenged(int level, int index, TimeSpan elapsed, long entriesDeleted, long entriesKept,
+		long spaceSaved) {
+		Interlocked.Add(ref _spaceSaved, spaceSaved);
+		var evnt = new Event(Guid.NewGuid(), SystemEventTypes.ScavengeIndexCompleted, true,
+			new Dictionary<string, object> {
+				{"scavengeId", _scavengeId},
+				{"level", level},
+				{"index", index},
+				{"timeTaken", elapsed},
+				{"entriesDeleted", entriesDeleted},
+				{"entriesKept", entriesKept},
+				{"spaceSaved", spaceSaved},
+				{"wasScavenged", true},
+				{"nodeEndpoint", _nodeId},
+				{"errorMessage", ""}
+			}.ToJsonBytes(), null);
+
+		WriteScavengeChunkCompletedEvent(_streamName, evnt, _retryAttempts);
+	}
+
+	public void IndexTableNotScavenged(int level, int index, TimeSpan elapsed, long entriesKept,
+		string errorMessage) {
+		var evnt = new Event(Guid.NewGuid(), SystemEventTypes.ScavengeIndexCompleted, true,
+			new Dictionary<string, object> {
+				{"scavengeId", _scavengeId},
+				{"level", level},
+				{"index", index},
+				{"timeTaken", elapsed},
+				{"entriesDeleted", 0},
+				{"entriesKept", entriesKept},
+				{"spaceSaved", 0},
+				{"wasScavenged", false},
+				{"nodeEndpoint", _nodeId},
+				{"errorMessage", errorMessage}
+			}.ToJsonBytes(), null);
+
+		WriteScavengeChunkCompletedEvent(_streamName, evnt, _retryAttempts);
+	}
+
+	private void WriteScavengeChunkCompletedEvent(string streamId, Event eventToWrite, int retryCount) {
+		_ioDispatcher.WriteEvent(streamId, ExpectedVersion.Any, eventToWrite, SystemAccounts.System,
+			m => WriteScavengeChunkCompletedEventCompleted(m, streamId, eventToWrite, retryCount));
+	}
+
+	private void WriteScavengeChunkCompletedEventCompleted(ClientMessage.WriteEventsCompleted msg, string streamId,
+		Event eventToWrite, int retryCount) {
+		if (msg.Result != OperationResult.Success) {
+			if (retryCount > 0) {
+				WriteScavengeChunkCompletedEvent(streamId, eventToWrite, --retryCount);
+			} else {
+				Log.Error(
+					"Failed to write an event to the {stream} stream. Retry limit of {retryCount} reached. Reason: {reason}",
+					streamId, _retryAttempts, msg.Result);
+			}
+		}
+	}
+
+	private void WriteScavengeDetailEvent(string streamId, Event eventToWrite, int retryCount) {
+		_ioDispatcher.WriteEvent(streamId, ExpectedVersion.Any, eventToWrite, SystemAccounts.System,
+			x => WriteScavengeDetailEventCompleted(x, eventToWrite, streamId, retryCount));
+	}
+
+	private void WriteScavengeIndexEvent(Event linkToEvent, int retryCount) {
+		_ioDispatcher.WriteEvent(SystemStreams.ScavengesStream, ExpectedVersion.Any, linkToEvent,
+			SystemAccounts.System, m => WriteScavengeIndexEventCompleted(m, linkToEvent, retryCount));
+	}
+
+	private void WriteScavengeIndexEventCompleted(ClientMessage.WriteEventsCompleted msg, Event linkToEvent,
+		int retryCount) {
+		if (msg.Result != OperationResult.Success) {
+			if (retryCount > 0) {
+				Log.Error(
+					"Failed to write an event to the {stream} stream. Retrying {retry}/{retryCount}. Reason: {reason}",
+					SystemStreams.ScavengesStream, (_retryAttempts - retryCount) + 1, _retryAttempts, msg.Result);
+				WriteScavengeIndexEvent(linkToEvent, --retryCount);
+			} else {
+				Log.Error(
+					"Failed to write an event to the {stream} stream. Retry limit of {retryCount} reached. Reason: {reason}",
+					SystemStreams.ScavengesStream, _retryAttempts, msg.Result);
+			}
+		}
+	}
+
+	private void WriteScavengeDetailEventCompleted(ClientMessage.WriteEventsCompleted msg, Event eventToWrite,
+		string streamId, int retryCount) {
+		if (msg.Result != OperationResult.Success) {
+			if (retryCount > 0) {
+				Log.Error(
+					"Failed to write an event to the {stream} stream. Retrying {retry}/{retryCount}. Reason: {reason}",
+					streamId, (_retryAttempts - retryCount) + 1, _retryAttempts, msg.Result);
+				WriteScavengeDetailEvent(streamId, eventToWrite, --retryCount);
+			} else {
+				Log.Error(
+					"Failed to write an event to the {stream} stream. Retry limit of {retryCount} reached. Reason: {reason}",
+					streamId, _retryAttempts, msg.Result);
+			}
+		} else {
+			string eventLinkTo = string.Format("{0}@{1}", msg.FirstEventNumber, streamId);
+			var linkToIndexEvent = new Event(Guid.NewGuid(), SystemEventTypes.LinkTo, false, eventLinkTo, null);
+			WriteScavengeIndexEvent(linkToIndexEvent, _retryAttempts);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkScavengerLogManager.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkScavengerLogManager.cs
new file mode 100644
index 00000000000..d645f68dff4
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkScavengerLogManager.cs
@@ -0,0 +1,268 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Storage;
+using KurrentDB.Core.Services.UserManagement;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.TransactionLog.Chunks;
+
+public class TFChunkScavengerLogManager : ITFChunkScavengerLogManager {
+	private readonly string _nodeEndpoint;
+	private readonly TimeSpan _scavengeHistoryMaxAge;
+	private readonly IODispatcher _ioDispatcher;
+	private const int MaxRetryCount = 5;
+	private static readonly ILogger Log = Serilog.Log.ForContext<StorageScavenger>();
+	private int _isInitialised;
+
+	public TFChunkScavengerLogManager(string nodeEndpoint, TimeSpan scavengeHistoryMaxAge,
+		IODispatcher ioDispatcher) {
+		_nodeEndpoint = nodeEndpoint;
+		_scavengeHistoryMaxAge = scavengeHistoryMaxAge;
+		_ioDispatcher = ioDispatcher;
+	}
+
+	public void Initialise() {
+		// We only initialise on first election so we don't incorrectly mark running scavenges as interrupted.
+		if (Interlocked.Exchange(ref _isInitialised, 1) != 0)
+			return;
+
+		SetScavengeStreamMetadata();
+
+		Log.Debug("Searching for incomplete scavenges on node {nodeEndPoint}.", _nodeEndpoint);
+		GatherIncompleteScavenges(-1, new HashSet<string>(), new List<string>(), new List<string>());
+	}
+
+	public ITFChunkScavengerLog CreateLog() {
+		return CreateLogInternal(Guid.NewGuid().ToString());
+	}
+
+	private TFChunkScavengerLog CreateLogInternal(string scavengeId) {
+		return new TFChunkScavengerLog(_ioDispatcher, scavengeId, _nodeEndpoint, MaxRetryCount,
+			_scavengeHistoryMaxAge);
+	}
+
+	private void SetScavengeStreamMetadata() {
+		var metaStreamId = SystemStreams.MetastreamOf(SystemStreams.ScavengesStream);
+
+		_ioDispatcher.ReadBackward(metaStreamId, -1, 1, false, SystemAccounts.System, readResult => {
+			if (readResult.Result == ReadStreamResult.Success || readResult.Result == ReadStreamResult.NoStream) {
+				if (readResult.Events.Count is 1) {
+					var currentMetadata = StreamMetadata.FromJsonBytes(readResult.Events[0].Event.Data);
+					var hasProperACL = currentMetadata.Acl != null
+									&& currentMetadata.Acl.ReadRoles != null
+									&& currentMetadata.Acl.ReadRoles.Contains(x => x.Equals("$ops"));
+
+					if (currentMetadata.MaxAge == _scavengeHistoryMaxAge && hasProperACL) {
+						Log.Debug("Max age and $ops read permission already set for the {stream} stream.", SystemStreams.ScavengesStream);
+						return;
+					}
+				}
+
+				Log.Debug("Setting max age for the {stream} stream to {maxAge}.", SystemStreams.ScavengesStream,
+					_scavengeHistoryMaxAge);
+
+				Log.Debug("Setting $ops read permission for the {stream} stream", SystemStreams.ScavengesStream);
+
+				var acl = new StreamAcl(
+					new string[] { "$ops" },
+					new string[] { },
+					new string[] { },
+					new string[] { },
+					new string[] { }
+				);
+
+				var metadata = new StreamMetadata(maxAge: _scavengeHistoryMaxAge, acl: acl);
+				var metaStreamEvent = new Event(Guid.NewGuid(), SystemEventTypes.StreamMetadata, isJson: true,
+					data: metadata.ToJsonBytes(), metadata: null);
+				_ioDispatcher.WriteEvent(metaStreamId, ExpectedVersion.Any, metaStreamEvent,
+					SystemAccounts.System, m => {
+						if (m.Result != OperationResult.Success) {
+							Log.Error(
+								"Failed to write the $maxAge of {days} days and set $ops permission for the {stream} stream. Reason: {reason}",
+								_scavengeHistoryMaxAge.TotalDays, SystemStreams.ScavengesStream, m.Result);
+						}
+					});
+			}
+		});
+	}
+
+	private void GatherIncompleteScavenges(long from, ISet<string> completedScavenges,
+		IList<string> incompleteScavenges, IList<string> recentScavenges) {
+		_ioDispatcher.ReadBackward(SystemStreams.ScavengesStream, from, 20, true, SystemAccounts.System,
+			readResult => {
+				if (readResult.Result != ReadStreamResult.Success &&
+					readResult.Result != ReadStreamResult.NoStream) {
+					Log.Debug("Unable to read {stream} for scavenge log clean up. Result: {result}",
+						SystemStreams.ScavengesStream, readResult.Result);
+					return;
+				}
+
+				foreach (var ev in readResult.Events) {
+					if (ev.ResolveResult == ReadEventResult.Success) {
+						var dictionary = ev.Event.Data.ParseJson<Dictionary<string, object>>();
+
+						object entryNode;
+						if (!dictionary.TryGetValue("nodeEndpoint", out entryNode) ||
+							entryNode.ToString() != _nodeEndpoint) {
+							continue;
+						}
+
+						object scavengeIdEntry;
+						if (!dictionary.TryGetValue("scavengeId", out scavengeIdEntry)) {
+							Log.Warning("An entry in the scavenge log has no scavengeId");
+							continue;
+						}
+
+						var scavengeId = scavengeIdEntry.ToString();
+						if (recentScavenges.Count <= 1000) //bound size
+							recentScavenges.Add(scavengeId);
+
+						if (ev.Event.EventType == SystemEventTypes.ScavengeCompleted) {
+							completedScavenges.Add(scavengeId);
+						} else if (ev.Event.EventType == SystemEventTypes.ScavengeStarted) {
+							if (!completedScavenges.Contains(scavengeId)) {
+								incompleteScavenges.Add(scavengeId);
+							}
+						}
+					}
+				}
+
+				if (readResult.IsEndOfStream || readResult.Events is []) {
+					SetOpsPermissions(recentScavenges);
+					CompleteInterruptedScavenges(incompleteScavenges);
+				} else {
+					GatherIncompleteScavenges(readResult.NextEventNumber, completedScavenges, incompleteScavenges, recentScavenges);
+				}
+			});
+	}
+
+	private void SetOpsPermissions(IList<string> recentScavengeIds) {
+		//sets $ops permissions on last 30 $scavenges-<scavenge id> stream
+		//added for backward compatibility to make UI scavenge history work properly with $ops users
+
+		var last30ScavengeIds = new HashSet<string>();
+		foreach (var scavengeId in recentScavengeIds) {
+			if (last30ScavengeIds.Count >= 30)
+				break;
+			last30ScavengeIds.Add(scavengeId);
+		}
+
+		if (last30ScavengeIds.Count > 0)
+			Log.Debug("Setting $ops read permission on last {count} $scavenges-<scavenge id> streams.", last30ScavengeIds.Count);
+
+		foreach (var scavengeId in last30ScavengeIds) {
+			var acl = new StreamAcl(
+				new string[] { "$ops" },
+				new string[] { },
+				new string[] { },
+				new string[] { },
+				new string[] { }
+			);
+
+			var scavengeIdStream = SystemStreams.ScavengesStream + "-" + scavengeId;
+			var metaStreamId = SystemStreams.MetastreamOf(scavengeIdStream);
+			var metadata = new StreamMetadata(maxAge: _scavengeHistoryMaxAge, acl: acl);
+			var metaStreamEvent = new Event(Guid.NewGuid(), SystemEventTypes.StreamMetadata, isJson: true,
+				data: metadata.ToJsonBytes(), metadata: null);
+			_ioDispatcher.WriteEvent(metaStreamId, ExpectedVersion.Any, metaStreamEvent,
+				SystemAccounts.System, m => {
+					if (m.Result != OperationResult.Success) {
+						Log.Error(
+							"Failed to write the $maxAge of {days} and set $ops read permission for the {stream} stream. Reason: {reason}",
+							_scavengeHistoryMaxAge.TotalDays, scavengeIdStream, m.Result);
+					}
+				});
+		}
+	}
+
+	private void CompleteInterruptedScavenges(IList<string> incompletedScavenges) {
+		if (incompletedScavenges.Count == 0) {
+			Log.Debug("No incomplete scavenges found on node {nodeEndPoint}.", _nodeEndpoint);
+		} else {
+			Log.Information(
+				"Found {incomplete} incomplete scavenge{s} on node {nodeEndPoint}. Marking as failed:{newLine}{incompleteScavenges}",
+				incompletedScavenges.Count, incompletedScavenges.Count == 1 ? "" : "s", _nodeEndpoint,
+				Environment.NewLine, string.Join(Environment.NewLine, incompletedScavenges));
+		}
+
+		foreach (var incompletedScavenge in incompletedScavenges) {
+			GatherIncompleteScavengeStats(-1, new IncompleteScavengeStats(incompletedScavenge));
+		}
+	}
+
+	private void GatherIncompleteScavengeStats(long from, IncompleteScavengeStats incompleteScavengeStats) {
+		_ioDispatcher.ReadBackward(incompleteScavengeStats.ScavengeStream, from, 50, true, SystemAccounts.System,
+			readResult => {
+				if (readResult.Result != ReadStreamResult.Success &&
+					readResult.Result != ReadStreamResult.NoStream) {
+					Log.Debug("Unable to read {stream} for scavenge log clean up. Result: {result}",
+						incompleteScavengeStats.ScavengeStream, readResult.Result);
+					return;
+				}
+
+				foreach (var ev in readResult.Events) {
+					if (ev.ResolveResult == ReadEventResult.Success) {
+						var dictionary = ev.Event.Data.ParseJson<Dictionary<string, object>>();
+
+						if (ev.Event.EventType == SystemEventTypes.ScavengeChunksCompleted
+						 || ev.Event.EventType == SystemEventTypes.ScavengeMergeCompleted
+						 || ev.Event.EventType == SystemEventTypes.ScavengeIndexCompleted) {
+							if (dictionary.TryGetValue("spaceSaved", out var spaceSavedEntry)) {
+								incompleteScavengeStats.SpaceSaved += (long)spaceSavedEntry;
+							}
+							if (dictionary.TryGetValue("timeTaken", out var timeTakenEntry)) {
+								incompleteScavengeStats.TimeTaken += TimeSpan.Parse(timeTakenEntry.ToString());
+							}
+
+							if (ev.Event.EventType == SystemEventTypes.ScavengeChunksCompleted) {
+								if (dictionary.TryGetValue("chunkEndNumber", out var chunkEndNumberEntry)) {
+									incompleteScavengeStats.MaxChunkScavenged = Math.Max(incompleteScavengeStats.MaxChunkScavenged, (int)(long)chunkEndNumberEntry);
+								}
+							}
+						}
+					}
+				}
+
+				if (readResult.IsEndOfStream || readResult.Events is []) {
+					CompleteScavengeWithStats(incompleteScavengeStats);
+				} else {
+					GatherIncompleteScavengeStats(readResult.NextEventNumber, incompleteScavengeStats);
+				}
+			});
+	}
+
+	private void CompleteScavengeWithStats(IncompleteScavengeStats incompleteScavengeStats) {
+
+		var log = CreateLogInternal(incompleteScavengeStats.ScavengeId);
+
+		log.ScavengeCompleted(ScavengeResult.Interrupted,
+			"The node was restarted.",
+			incompleteScavengeStats.TimeTaken,
+			incompleteScavengeStats.SpaceSaved,
+			incompleteScavengeStats.MaxChunkScavenged);
+	}
+
+	class IncompleteScavengeStats {
+		public string ScavengeId { get; private set; }
+		public string ScavengeStream => string.Format("{0}-{1}", SystemStreams.ScavengesStream, ScavengeId);
+
+		public IncompleteScavengeStats(string scavengeId) {
+			ScavengeId = scavengeId;
+		}
+
+
+		public long SpaceSaved { get; set; }
+		public int MaxChunkScavenged { get; set; }
+		public TimeSpan TimeTaken { get; set; } = TimeSpan.Zero;
+
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkWriter.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkWriter.cs
new file mode 100644
index 00000000000..27ee7ddd5e8
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFChunkWriter.cs
@@ -0,0 +1,179 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using Serilog;
+using Serilog.Events;
+
+namespace KurrentDB.Core.TransactionLog.Chunks;
+
+// see CancellationToken comment at the top of TFChunk.cs
+public class TFChunkWriter : ITransactionFileWriter {
+	public long Position => _writerCheckpoint.ReadNonFlushed();
+	public long FlushedPosition => _writerCheckpoint.Read();
+
+	public TFChunk.TFChunk CurrentChunk {
+		get { return _currentChunk; }
+	}
+
+	public bool NeedsNewChunk => CurrentChunk is
+		null or                 // new database
+		{ IsReadOnly: true };   // database is at a chunk boundary
+
+	private readonly TFChunkDb _db;
+	private readonly ICheckpoint _writerCheckpoint;
+	private long _nextRecordPosition;
+	private bool _inTransaction;
+
+	private TFChunk.TFChunk _currentChunk;
+
+	private const int MaxChunkNumber = TFChunkManager.MaxChunksCount;
+	private const int MaxChunkNumberError = MaxChunkNumber - 25_000;
+	private const int MaxChunkNumberWarning = MaxChunkNumber - 50_000;
+
+	private static readonly ILogger Log = Serilog.Log.ForContext<TFChunkWriter>();
+
+	public TFChunkWriter(TFChunkDb db) {
+		Ensure.NotNull(db, "db");
+
+		_db = db;
+		_writerCheckpoint = db.Config.WriterCheckpoint;
+		_nextRecordPosition = _writerCheckpoint.Read();
+	}
+
+	public async ValueTask Open(CancellationToken token) {
+		if (_db.Manager.ChunksCount is 0) {
+			// new database
+			_currentChunk = null;
+		} else if ((_currentChunk = await _db.Manager.TryGetInitializedChunkFor(_nextRecordPosition, token)) is null) {
+			// we may have been at a chunk boundary and the new chunk wasn't yet created
+			if ((_currentChunk = await _db.Manager.TryGetInitializedChunkFor(_nextRecordPosition - 1, token)) is null)
+				throw new Exception($"Failed to get chunk for log position: {_nextRecordPosition}");
+		}
+	}
+
+	public bool CanWrite(int numBytes) {
+		return _currentChunk.ChunkHeader.ChunkEndPosition - _nextRecordPosition >= numBytes;
+	}
+
+	public async ValueTask<(bool, long)> Write(ILogRecord record, CancellationToken token) {
+		// Workaround: The transaction cannot be canceled in a middle, it should be atomic.
+		// There is no way to rollback it on cancellation
+		token.ThrowIfCancellationRequested();
+
+		OpenTransaction();
+
+		if (await WriteToTransaction(record, CancellationToken.None) is not { } result) {
+			await CompleteChunkInTransaction(CancellationToken.None);
+			await AddNewChunk(token: CancellationToken.None);
+			CommitTransaction();
+			await Flush(token);
+			return (false, _nextRecordPosition);
+		}
+
+		CommitTransaction();
+		return (true, result);
+	}
+
+	public void OpenTransaction() {
+		if (_inTransaction)
+			throw new InvalidOperationException("Attempted to open a new transaction while there was an ongoing transaction.");
+
+		_inTransaction = true;
+	}
+
+	public async ValueTask<long?> WriteToTransaction(ILogRecord record, CancellationToken token) {
+		return await _currentChunk.TryAppend(record, token) is { Success: true } result
+			? _nextRecordPosition = result.NewPosition + _currentChunk.ChunkHeader.ChunkStartPosition
+			: null;
+	}
+
+	public void CommitTransaction() {
+		if (!_inTransaction)
+			throw new InvalidOperationException("Attempted to commit a transaction while there was no ongoing transaction.");
+
+		_inTransaction = false;
+		_writerCheckpoint.Write(_nextRecordPosition);
+	}
+
+	public bool HasOpenTransaction() => _inTransaction;
+
+	public async ValueTask AddNewChunk(ChunkHeader chunkHeader = null,
+		ReadOnlyMemory<byte> transformHeader = default, int? chunkSize = null, CancellationToken token = default) {
+		var nextChunkNumber = _currentChunk?.ChunkHeader.ChunkEndNumber + 1 ?? 0;
+		VerifyChunkNumberLimits(nextChunkNumber);
+
+		_currentChunk = await (chunkHeader is null
+			? _db.Manager.AddNewChunk(token)
+			: _db.Manager.AddNewChunk(chunkHeader, transformHeader, chunkSize!.Value, token));
+	}
+
+	private async ValueTask CompleteChunkInTransaction(CancellationToken token) {
+		await _currentChunk.Complete(token);
+		_nextRecordPosition = _currentChunk.ChunkHeader.ChunkEndPosition;
+	}
+
+	public async ValueTask CompleteChunk(CancellationToken token) {
+		// Workaround: The transaction cannot be canceled in a middle, it should be atomic.
+		// There is no way to rollback it on cancellation
+		token.ThrowIfCancellationRequested();
+
+		OpenTransaction();
+		await CompleteChunkInTransaction(CancellationToken.None);
+		CommitTransaction();
+		await Flush(token);
+	}
+
+	private async ValueTask CompleteReplicatedRawChunkInTransaction(TFChunk.TFChunk rawChunk,
+		CancellationToken token) {
+		await rawChunk.CompleteRaw(token);
+		_currentChunk = await _db.Manager.SwitchInTempChunk(rawChunk, verifyHash: true,
+			removeChunksWithGreaterNumbers: true, token);
+
+		_nextRecordPosition = rawChunk.ChunkHeader.ChunkEndPosition;
+	}
+
+	public async ValueTask CompleteReplicatedRawChunk(TFChunk.TFChunk rawChunk, CancellationToken token) {
+		// Workaround: The transaction cannot be canceled in a middle, it should be atomic.
+		// There is no way to rollback it on cancellation
+		token.ThrowIfCancellationRequested();
+
+		OpenTransaction();
+		await CompleteReplicatedRawChunkInTransaction(rawChunk, CancellationToken.None);
+		CommitTransaction();
+		await Flush(token);
+	}
+
+	private static void VerifyChunkNumberLimits(int chunkNumber) {
+		switch (chunkNumber) {
+			case >= MaxChunkNumber:
+				throw new Exception($"Max chunk number limit reached: {MaxChunkNumber:N0}. Shutting down.");
+			case < MaxChunkNumberWarning:
+				break;
+			default: {
+				var level = chunkNumber >= MaxChunkNumberError ? LogEventLevel.Error : LogEventLevel.Warning;
+				Log.Write(level, "You are approaching the max chunk number limit: {chunkNumber:N0} / {maxChunkNumber:N0}. " +
+								 "The server will shut down when the limit is reached!", chunkNumber, MaxChunkNumber);
+				break;
+			}
+		}
+	}
+
+	public ValueTask DisposeAsync() => Flush(CancellationToken.None);
+
+	public async ValueTask Flush(CancellationToken token) {
+		Debug.Assert(HasOpenTransaction() is false);
+
+		if (_currentChunk is null) // the last chunk allocation failed
+			return;
+
+		await _currentChunk.Flush(token);
+		_writerCheckpoint.Flush();
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TFConsts.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TFConsts.cs
new file mode 100644
index 00000000000..3b58266e078
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TFConsts.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.TransactionLog.Chunks;
+
+public static class TFConsts {
+	public const int MaxLogRecordSize = 16 * 1024 * 1024; // 16Mb ought to be enough for everything?.. ;)
+	public const int LogRecordOverheadSize = 10000;
+	public const int EffectiveMaxLogRecordSize = MaxLogRecordSize - LogRecordOverheadSize;
+	public const int MidpointsDepth = 10;
+
+	public const int ChunkSize = 256 * 1024 * 1024;
+	public const int ChunkHeaderSize = 128;
+	public const int ChunkFooterSize = 128;
+	public const int ChunksCacheSize = 2 * (ChunkSize + ChunkHeaderSize + ChunkFooterSize);
+
+
+	public static TimeSpan MinFlushDelayMs = TimeSpan.FromMilliseconds(2);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Chunks/TransactionFileTracker.cs b/src/KurrentDB.Core/TransactionLog/Chunks/TransactionFileTracker.cs
new file mode 100644
index 00000000000..afe3bfa6fb3
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Chunks/TransactionFileTracker.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+using System.Collections.Generic;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Time;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.TransactionLog.Chunks;
+
+public class TFChunkTracker : ITransactionFileTracker {
+	private readonly LogicalChunkReadDistributionMetric _readDistribution;
+	private readonly DurationMetric _readDurationMetric;
+	private readonly CounterSubMetric _readBytes;
+	private readonly CounterSubMetric _readEvents;
+
+	public TFChunkTracker(
+		LogicalChunkReadDistributionMetric readDistribution,
+		DurationMetric readDurationMetric,
+		CounterSubMetric readBytes,
+		CounterSubMetric readEvents) {
+
+		_readDistribution = readDistribution;
+		_readDurationMetric = readDurationMetric;
+		_readBytes = readBytes;
+		_readEvents = readEvents;
+	}
+
+	public void OnRead(Instant start, ILogRecord record, ITransactionFileTracker.Source source) {
+		_readDistribution.Record(record);
+
+		_readDurationMetric.Record(
+			start,
+			new KeyValuePair<string, object>("source", source),
+			new KeyValuePair<string, object>("user", "")); // placeholder for later
+
+		if (record is not PrepareLogRecord prepare)
+			return;
+
+		_readBytes.Add(prepare.Data.Length + prepare.Metadata.Length);
+		_readEvents.Add(1);
+	}
+
+	public class NoOp : ITransactionFileTracker {
+		public void OnRead(Instant start, ILogRecord record, ITransactionFileTracker.Source source) {
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/FileNamingStrategy/IVersionedFileNamingStrategy.cs b/src/KurrentDB.Core/TransactionLog/FileNamingStrategy/IVersionedFileNamingStrategy.cs
new file mode 100644
index 00000000000..b92e5c91a77
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/FileNamingStrategy/IVersionedFileNamingStrategy.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.TransactionLog.FileNamingStrategy;
+
+// This abstracts a translation from logical chunk numbers (indexes) and
+// chunk versions, to chunk files in storage. Strictly it is more than a naming strategy
+// because it also reads the storage to list the chunks.
+public interface IVersionedFileNamingStrategy {
+	// Pure naming strategy
+	string Prefix { get; }
+	string GetFilenameFor(int index, int version);
+	string CreateTempFilename();
+	int GetIndexFor(ReadOnlySpan<char> fileName);
+	int GetVersionFor(ReadOnlySpan<char> fileName);
+
+	// Methods that rely on the state of the storage
+	string[] GetAllVersionsFor(int index);
+	string[] GetAllTempFiles();
+
+	// When we are creating a new version of a chunk at the given index, this determines
+	// the correct file name for it based on the existing version(s).
+	// defaultVersion is used if there are no existing versions.
+	string DetermineNewVersionFilenameForIndex(int index, int defaultVersion);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/FileNamingStrategy/VersionedPatternFileNamingStrategy.cs b/src/KurrentDB.Core/TransactionLog/FileNamingStrategy/VersionedPatternFileNamingStrategy.cs
new file mode 100644
index 00000000000..581d1fb896c
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/FileNamingStrategy/VersionedPatternFileNamingStrategy.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.TransactionLog.FileNamingStrategy;
+
+public class VersionedPatternFileNamingStrategy : IVersionedFileNamingStrategy {
+	private readonly string _path;
+	private readonly string _prefix;
+	private readonly Regex _pattern;
+
+	public string Prefix => _prefix;
+
+	public VersionedPatternFileNamingStrategy(string path, string prefix) {
+		Ensure.NotNull(path, "path");
+		Ensure.NotNull(prefix, "prefix");
+		_path = path;
+		_prefix = prefix;
+
+		_pattern = new Regex("^" + _prefix + @"\d{6}\.\d{6}$");
+	}
+
+	public string GetFilenameFor(int index, int version) {
+		Ensure.Nonnegative(index, "index");
+		Ensure.Nonnegative(version, "version");
+
+		return Path.Combine(_path, $"{_prefix}{index:000000}.{version:000000}");
+	}
+
+	public string DetermineNewVersionFilenameForIndex(int index, int defaultVersion) {
+		var allVersions = GetAllVersionsFor(index);
+
+		if (allVersions.Length == 0)
+			return GetFilenameFor(index, defaultVersion);
+
+		var lastFile = allVersions[0];
+		var lastVersionSpan = lastFile.AsSpan(lastFile.LastIndexOf('.') + 1);
+		if (!int.TryParse(lastVersionSpan, out var lastVersion))
+			throw new Exception($"Could not determine version from filename '{lastFile}'.");
+
+		return GetFilenameFor(index, lastVersion + 1);
+	}
+
+	public string[] GetAllVersionsFor(int index) {
+		var versions = Directory.EnumerateFiles(_path, $"{_prefix}{index:000000}.*")
+			.Where(x => _pattern.IsMatch(Path.GetFileName(x)))
+			.OrderByDescending(x => x, StringComparer.CurrentCultureIgnoreCase)
+			.ToArray();
+		return versions;
+	}
+
+	public int GetIndexFor(ReadOnlySpan<char> fileName) {
+		if (!_pattern.IsMatch(fileName))
+			throw new ArgumentException($"Invalid file name: {fileName}");
+
+		var start = _prefix.Length;
+		var end = fileName.Slice(_prefix.Length).IndexOf('.');
+
+		if (end < 0 || !int.TryParse(fileName[start..(end + _prefix.Length)], out var fileIndex))
+			throw new ArgumentException($"Invalid file name: {fileName}");
+
+		return fileIndex;
+	}
+
+	public int GetVersionFor(ReadOnlySpan<char> fileName) {
+		if (!_pattern.IsMatch(fileName))
+			throw new ArgumentException($"Invalid file name: {fileName}");
+
+		var dot = fileName.Slice(_prefix.Length).IndexOf('.');
+
+		if (dot < 0 || !int.TryParse(fileName[(dot + 1 + _prefix.Length)..], out var version))
+			throw new ArgumentException($"Invalid file name: {fileName}");
+
+		return version;
+	}
+
+	public string[] GetAllPresentFiles() {
+		var versions = Directory
+			.EnumerateFiles(_path, $"{_prefix}*.*")
+			.Where(x => _pattern.IsMatch(Path.GetFileName(x)))
+			.ToArray();
+		return versions;
+	}
+
+	public string CreateTempFilename() {
+		return Path.Combine(_path, $"{Guid.NewGuid()}.tmp");
+	}
+
+	public string[] GetAllTempFiles() {
+		return Directory.GetFiles(_path, "*.tmp");
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/ITransactionFileChaser.cs b/src/KurrentDB.Core/TransactionLog/ITransactionFileChaser.cs
new file mode 100644
index 00000000000..e3ba0fd30a9
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/ITransactionFileChaser.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+
+namespace KurrentDB.Core.TransactionLog;
+
+public interface ITransactionFileChaser : IDisposable {
+	ICheckpoint Checkpoint { get; }
+
+	void Open();
+
+	ValueTask<SeqReadResult> TryReadNext(CancellationToken token);
+
+	void Close();
+	void Flush();
+}
diff --git a/src/KurrentDB.Core/TransactionLog/ITransactionFileReader.cs b/src/KurrentDB.Core/TransactionLog/ITransactionFileReader.cs
new file mode 100644
index 00000000000..343d9b6e8a8
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/ITransactionFileReader.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.DataStructures;
+
+namespace KurrentDB.Core.TransactionLog;
+
+public interface ITransactionFileReader {
+	void Reposition(long position);
+
+	ValueTask<SeqReadResult> TryReadNext(CancellationToken token);
+	ValueTask<SeqReadResult> TryReadPrev(CancellationToken token);
+
+	ValueTask<RecordReadResult> TryReadAt(long position, bool couldBeScavenged, CancellationToken token);
+	ValueTask<bool> ExistsAt(long position, CancellationToken token);
+}
+
+public struct TFReaderLease : IDisposable {
+	public readonly ITransactionFileReader Reader;
+	private readonly ObjectPool<ITransactionFileReader> _pool;
+
+	public TFReaderLease(ObjectPool<ITransactionFileReader> pool) {
+		_pool = pool;
+		Reader = pool.Get();
+	}
+
+	public TFReaderLease(ITransactionFileReader reader) {
+		_pool = null;
+		Reader = reader;
+	}
+
+	void IDisposable.Dispose() {
+		if (_pool != null)
+			_pool.Return(Reader);
+	}
+
+	public void Reposition(long position) {
+		Reader.Reposition(position);
+	}
+
+	public ValueTask<SeqReadResult> TryReadNext(CancellationToken token)
+		=> Reader.TryReadNext(token);
+
+	public ValueTask<SeqReadResult> TryReadPrev(CancellationToken token) {
+		return Reader.TryReadPrev(token);
+	}
+
+	public ValueTask<bool> ExistsAt(long position, CancellationToken token) {
+		return Reader.ExistsAt(position, token);
+	}
+
+	public ValueTask<RecordReadResult> TryReadAt(long position, bool couldBeScavenged, CancellationToken token)
+		=> Reader.TryReadAt(position, couldBeScavenged, token);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/ITransactionFileTracker.cs b/src/KurrentDB.Core/TransactionLog/ITransactionFileTracker.cs
new file mode 100644
index 00000000000..2142894694c
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/ITransactionFileTracker.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Time;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.TransactionLog;
+
+public interface ITransactionFileTracker {
+	void OnRead(Instant start, ILogRecord record, Source source);
+
+	enum Source {
+		Unknown,
+		Archive,
+		ChunkCache,
+		FileSystem,
+	};
+}
diff --git a/src/KurrentDB.Core/TransactionLog/ITransactionFileWriter.cs b/src/KurrentDB.Core/TransactionLog/ITransactionFileWriter.cs
new file mode 100644
index 00000000000..d374ce83edd
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/ITransactionFileWriter.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.TransactionLog;
+
+public interface ITransactionFileWriter : IAsyncDisposable {
+	ValueTask Open(CancellationToken token);
+	bool CanWrite(int numBytes);
+	ValueTask<(bool, long)> Write(ILogRecord record, CancellationToken token);
+	void OpenTransaction();
+	ValueTask<long?> WriteToTransaction(ILogRecord record, CancellationToken token);
+	void CommitTransaction();
+	bool HasOpenTransaction();
+	ValueTask Flush(CancellationToken token);
+
+	long Position { get; }
+	long FlushedPosition { get; }
+}
diff --git a/src/KurrentDB.Core/TransactionLog/LogRecords/CommitLogRecord.cs b/src/KurrentDB.Core/TransactionLog/LogRecords/CommitLogRecord.cs
new file mode 100644
index 00000000000..9fb527780dc
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/LogRecords/CommitLogRecord.cs
@@ -0,0 +1,145 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using DotNext.Buffers;
+using DotNext.Buffers.Binary;
+using DotNext.IO;
+using KurrentDB.Common.Utils;
+using KurrentDB.LogCommon;
+
+namespace KurrentDB.Core.TransactionLog.LogRecords;
+
+public sealed class CommitLogRecord : LogRecord, IEquatable<CommitLogRecord> {
+	public const byte CommitRecordVersion = 1;
+
+	public long TransactionPosition { get; }
+	public long FirstEventNumber { get; }
+	public long SortKey { get; }
+	public Guid CorrelationId { get; }
+	public DateTime TimeStamp { get; }
+
+	public CommitLogRecord(long logPosition,
+		Guid correlationId,
+		long transactionPosition,
+		DateTime timeStamp,
+		long firstEventNumber,
+		byte commitRecordVersion = CommitRecordVersion)
+		: base(LogRecordType.Commit, commitRecordVersion, logPosition) {
+		Ensure.NotEmptyGuid(correlationId, "correlationId");
+		Ensure.Nonnegative(transactionPosition, "TransactionPosition");
+		Ensure.Nonnegative(firstEventNumber, "eventNumber");
+
+		TransactionPosition = transactionPosition;
+		FirstEventNumber = firstEventNumber;
+		SortKey = logPosition;
+		CorrelationId = correlationId;
+		TimeStamp = timeStamp;
+	}
+
+	internal CommitLogRecord(ref SequenceReader reader, byte version, long logPosition)
+		: base(LogRecordType.Commit, version, logPosition) {
+		if (version is not LogRecordVersion.LogRecordV0 and not LogRecordVersion.LogRecordV1)
+			throw new ArgumentException(
+				$"CommitRecord version {version} is incorrect. Supported version: {CommitRecordVersion}.");
+
+		TransactionPosition = reader.ReadLittleEndian<long>();
+		FirstEventNumber = version is LogRecordVersion.LogRecordV0
+			? AdjustVersion(reader.ReadLittleEndian<int>())
+			: reader.ReadLittleEndian<long>();
+		SortKey = reader.ReadLittleEndian<long>();
+		CorrelationId = reader.Read<Blittable<Guid>>().Value;
+		TimeStamp = new(reader.ReadLittleEndian<long>());
+
+		static long AdjustVersion(int version)
+			=> version is int.MaxValue ? long.MaxValue : version;
+	}
+
+	public override void WriteTo(ref BufferWriterSlim<byte> writer) {
+		base.WriteTo(ref writer);
+
+		writer.WriteLittleEndian(TransactionPosition);
+		if (Version is LogRecordVersion.LogRecordV0) {
+			int firstEventNumber = FirstEventNumber is long.MaxValue ? int.MaxValue : (int)FirstEventNumber;
+			writer.WriteLittleEndian(firstEventNumber);
+		} else {
+			writer.WriteLittleEndian(FirstEventNumber);
+		}
+
+		writer.WriteLittleEndian(SortKey);
+
+		Span<byte> correlationIdBuffer = writer.GetSpan(16);
+		CorrelationId.TryWriteBytes(correlationIdBuffer);
+		writer.Advance(16);
+
+		writer.WriteLittleEndian(TimeStamp.Ticks);
+	}
+
+	public override int GetSizeWithLengthPrefixAndSuffix() {
+		return sizeof(int) * 2                                                      /* Length prefix & suffix */
+		+ sizeof(long)                                                              /* TransactionPosition */
+		+ (Version is LogRecordVersion.LogRecordV0 ? sizeof(int) : sizeof(long))    /* Version */
+		+ sizeof(long)                                                              /* SortKey */
+		+ 16                                                                        /* CorrelationId */
+		+ sizeof(long)                                                              /* TimeStamp */
+		+ BaseSize;
+	}
+
+	public bool Equals(CommitLogRecord other) {
+		if (ReferenceEquals(null, other))
+			return false;
+		if (ReferenceEquals(this, other))
+			return true;
+		return other.LogPosition == LogPosition
+			   && other.TransactionPosition == TransactionPosition
+			   && other.FirstEventNumber == FirstEventNumber
+			   && other.SortKey == SortKey
+			   && other.CorrelationId == CorrelationId
+			   && other.TimeStamp.Equals(TimeStamp);
+	}
+
+	public override bool Equals(object obj) {
+		if (ReferenceEquals(null, obj))
+			return false;
+		if (ReferenceEquals(this, obj))
+			return true;
+		if (obj.GetType() != typeof(CommitLogRecord))
+			return false;
+		return Equals((CommitLogRecord)obj);
+	}
+
+	public override int GetHashCode() {
+		unchecked {
+			int result = LogPosition.GetHashCode();
+			result = (result * 397) ^ TransactionPosition.GetHashCode();
+			result = (result * 397) ^ FirstEventNumber.GetHashCode();
+			result = (result * 397) ^ SortKey.GetHashCode();
+			result = (result * 397) ^ CorrelationId.GetHashCode();
+			result = (result * 397) ^ TimeStamp.GetHashCode();
+			return result;
+		}
+	}
+
+	public static bool operator ==(CommitLogRecord left, CommitLogRecord right) {
+		return Equals(left, right);
+	}
+
+	public static bool operator !=(CommitLogRecord left, CommitLogRecord right) {
+		return !Equals(left, right);
+	}
+
+	public override string ToString() {
+		return string.Format("LogPosition: {0}, "
+							 + "TransactionPosition: {1}, "
+							 + "FirstEventNumber: {2}, "
+							 + "SortKey: {3}, "
+							 + "CorrelationId: {4}, "
+							 + "TimeStamp: {5}",
+			LogPosition,
+			TransactionPosition,
+			FirstEventNumber,
+			SortKey,
+			CorrelationId,
+			TimeStamp);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/LogRecords/EpochRecord.cs b/src/KurrentDB.Core/TransactionLog/LogRecords/EpochRecord.cs
new file mode 100644
index 00000000000..5d9048623b2
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/LogRecords/EpochRecord.cs
@@ -0,0 +1,95 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+
+namespace KurrentDB.Core.TransactionLog.LogRecords;
+
+public static class EpochRecordExtensions {
+	public static string AsString(this EpochRecord epoch) {
+		return string.Format("E{0}@{1}:{2:B}",
+			epoch == null ? -1 : epoch.EpochNumber,
+			epoch == null ? -1 : epoch.EpochPosition,
+			epoch == null ? Guid.Empty : epoch.EpochId);
+	}
+
+	public static string AsString(this Epoch epoch) {
+		return string.Format("E{0}@{1}:{2:B}",
+			epoch == null ? -1 : epoch.EpochNumber,
+			epoch == null ? -1 : epoch.EpochPosition,
+			epoch == null ? Guid.Empty : epoch.EpochId);
+	}
+}
+
+public class EpochRecord : IComparable {
+	public readonly long EpochPosition;
+	public readonly int EpochNumber;
+	public readonly Guid EpochId;
+
+	public readonly long PrevEpochPosition;
+	public readonly DateTime TimeStamp;
+	public readonly Guid LeaderInstanceId;
+
+	public EpochRecord(long epochPosition, int epochNumber, Guid epochId, long prevEpochPosition,
+		DateTime timeStamp, Guid leaderInstanceId) {
+		EpochPosition = epochPosition;
+		EpochNumber = epochNumber;
+		EpochId = epochId;
+		PrevEpochPosition = prevEpochPosition;
+		TimeStamp = timeStamp;
+		LeaderInstanceId = leaderInstanceId;
+	}
+
+	internal EpochRecord(EpochRecordDto dto)
+		: this(dto.EpochPosition, dto.EpochNumber, dto.EpochId, dto.PrevEpochPosition, dto.TimeStamp, dto.LeaderInstanceId) {
+	}
+
+	public byte[] AsSerialized() {
+		return new EpochRecordDto(this).ToJsonBytes();
+	}
+
+	public override string ToString() {
+		return string.Format(
+			"EpochPosition: {0}, EpochNumber: {1}, EpochId: {2}, PrevEpochPosition: {3}, TimeStamp: {4}, LeaderInstanceId: {5}",
+			EpochPosition,
+			EpochNumber,
+			EpochId,
+			PrevEpochPosition,
+			TimeStamp,
+			LeaderInstanceId);
+	}
+
+	public int CompareTo(object obj) {
+		if (obj == null)
+			return 1;
+		EpochRecord other = obj as EpochRecord;
+		if (other == null)
+			throw new ArgumentException("Object is not a Epoch Record");
+		return EpochNumber.CompareTo(other.EpochNumber);
+	}
+
+	internal class EpochRecordDto {
+		public long EpochPosition { get; set; }
+		public int EpochNumber { get; set; }
+		public Guid EpochId { get; set; }
+
+		public long PrevEpochPosition { get; set; }
+		public DateTime TimeStamp { get; set; }
+		public Guid LeaderInstanceId { get; set; }
+
+		public EpochRecordDto() {
+		}
+
+		public EpochRecordDto(EpochRecord rec) {
+			EpochPosition = rec.EpochPosition;
+			EpochNumber = rec.EpochNumber;
+			EpochId = rec.EpochId;
+
+			PrevEpochPosition = rec.PrevEpochPosition;
+			TimeStamp = rec.TimeStamp;
+			LeaderInstanceId = rec.LeaderInstanceId;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/LogRecords/ILogRecord.cs b/src/KurrentDB.Core/TransactionLog/LogRecords/ILogRecord.cs
new file mode 100644
index 00000000000..40973fbd35a
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/LogRecords/ILogRecord.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using DotNext.Buffers;
+using KurrentDB.LogCommon;
+
+namespace KurrentDB.Core.TransactionLog.LogRecords;
+
+public interface ILogRecord {
+	LogRecordType RecordType { get; }
+	byte Version { get; }
+	public long LogPosition { get; }
+	void WriteTo(ref BufferWriterSlim<byte> writer);
+	long GetNextLogPosition(long logicalPosition, int length);
+	long GetPrevLogPosition(long logicalPosition, int length);
+	int GetSizeWithLengthPrefixAndSuffix();
+}
diff --git a/src/KurrentDB.Core/TransactionLog/LogRecords/IPrepareLogRecord.cs b/src/KurrentDB.Core/TransactionLog/LogRecords/IPrepareLogRecord.cs
new file mode 100644
index 00000000000..efe1de366eb
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/LogRecords/IPrepareLogRecord.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.TransactionLog.LogRecords;
+
+// This interface specifies what the Storage, TF and Index machinery requires
+// in order to handle a prepare (i.e. data) record.
+// The V2 prepare implements it trivially
+public interface IPrepareLogRecord : ILogRecord {
+	PrepareFlags Flags { get; }
+	long TransactionPosition { get; }
+	int TransactionOffset { get; }
+	long ExpectedVersion { get; }
+	Guid EventId { get; }
+	Guid CorrelationId { get; }
+	DateTime TimeStamp { get; }
+	ReadOnlyMemory<byte> Data { get; }
+	ReadOnlyMemory<byte> Metadata { get; }
+}
+
+public interface IPrepareLogRecord<TStreamId> : IPrepareLogRecord {
+	TStreamId EventStreamId { get; }
+	TStreamId EventType { get; }
+
+	IPrepareLogRecord<TStreamId> CopyForRetry(long logPosition, long transactionPosition);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/LogRecords/ISystemLogRecord.cs b/src/KurrentDB.Core/TransactionLog/LogRecords/ISystemLogRecord.cs
new file mode 100644
index 00000000000..fe33ede702d
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/LogRecords/ISystemLogRecord.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.TransactionLog.LogRecords;
+
+public interface ISystemLogRecord : ILogRecord {
+	SystemRecordType SystemRecordType { get; }
+	EpochRecord GetEpochRecord();
+}
diff --git a/src/KurrentDB.Core/TransactionLog/LogRecords/LogRecord.cs b/src/KurrentDB.Core/TransactionLog/LogRecords/LogRecord.cs
new file mode 100644
index 00000000000..77c1c03162d
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/LogRecords/LogRecord.cs
@@ -0,0 +1,176 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Buffers;
+using DotNext.Buffers;
+using DotNext.Buffers.Binary;
+using DotNext.IO;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.LogCommon;
+
+namespace KurrentDB.Core.TransactionLog.LogRecords;
+
+public abstract class LogRecord : ILogRecord {
+	public static readonly ReadOnlyMemory<byte> NoData = Empty.ByteArray;
+
+	// RecordType + Version + LogPosition
+	protected const int BaseSize = sizeof(byte) + sizeof(byte) + sizeof(long);
+
+	public LogRecordType RecordType { get; }
+	public byte Version { get; }
+	public long LogPosition { get; }
+
+	public long GetNextLogPosition(long logicalPosition, int length) {
+		return logicalPosition + length + 2 * sizeof(int);
+	}
+
+	public long GetPrevLogPosition(long logicalPosition, int length) {
+		return logicalPosition - length - 2 * sizeof(int);
+	}
+
+	public static ILogRecord ReadFrom(ref SequenceReader reader) {
+		var header = reader.Read<Header>();
+
+		switch (header.Type) {
+			case LogRecordType.Prepare:
+				var logPosition = reader.ReadLittleEndian<long>();
+				Ensure.Nonnegative(logPosition, nameof(logPosition));
+				return new PrepareLogRecord(ref reader, header.Version, logPosition);
+
+			case LogRecordType.Commit:
+				logPosition = reader.ReadLittleEndian<long>();
+				Ensure.Nonnegative(logPosition, nameof(logPosition));
+				return new CommitLogRecord(ref reader, header.Version, logPosition);
+
+			case LogRecordType.System when header.Version > SystemLogRecord.SystemRecordVersion:
+				reader.Reset();
+				return new LogV3EpochLogRecord(reader.ReadToEnd().ToArray());
+
+			case LogRecordType.System:
+				logPosition = reader.ReadLittleEndian<long>();
+				Ensure.Nonnegative(logPosition, nameof(logPosition));
+				return new SystemLogRecord(ref reader, header.Version, logPosition);
+
+			case LogRecordType.StreamWrite:
+				reader.Reset();
+				return new LogV3StreamWriteRecord(reader.ReadToEnd().ToArray());
+
+			case LogRecordType.Stream:
+				reader.Reset();
+				return new LogV3StreamRecord(reader.ReadToEnd().ToArray());
+
+			case LogRecordType.EventType:
+				reader.Reset();
+				return new LogV3EventTypeRecord(reader.ReadToEnd().ToArray());
+
+			case LogRecordType.PartitionType:
+				reader.Reset();
+				return new PartitionTypeLogRecord(reader.ReadToEnd().ToArray());
+
+			case LogRecordType.Partition:
+				reader.Reset();
+				return new PartitionLogRecord(reader.ReadToEnd().ToArray());
+
+			default:
+				throw new ArgumentOutOfRangeException("recordType");
+		}
+	}
+
+	public static IPrepareLogRecord<TStreamId> Prepare<TStreamId>(IRecordFactory<TStreamId> factory, long logPosition, Guid correlationId, Guid eventId, long transactionPos,
+		int transactionOffset,
+		TStreamId eventStreamId, long expectedVersion, PrepareFlags flags, TStreamId eventType,
+		ReadOnlyMemory<byte> data, ReadOnlyMemory<byte> metadata, DateTime? timeStamp = null) {
+		return factory.CreatePrepare(logPosition, correlationId, eventId, transactionPos, transactionOffset,
+			eventStreamId, expectedVersion, timeStamp ?? DateTime.UtcNow, flags, eventType,
+			data, metadata);
+	}
+
+	public static CommitLogRecord Commit(long logPosition, Guid correlationId, long startPosition,
+		long eventNumber) {
+		return new CommitLogRecord(logPosition, correlationId, startPosition, DateTime.UtcNow, eventNumber);
+	}
+
+	public static IPrepareLogRecord<TStreamId> SingleWrite<TStreamId>(IRecordFactory<TStreamId> factory, long logPosition, Guid correlationId, Guid eventId,
+		TStreamId eventStreamId,
+		long expectedVersion, TStreamId eventType, ReadOnlyMemory<byte> data, ReadOnlyMemory<byte> metadata,
+		DateTime? timestamp = null, PrepareFlags? additionalFlags = null) {
+		return factory.CreatePrepare(logPosition, correlationId, eventId, logPosition, 0, eventStreamId,
+			expectedVersion,
+			timestamp ?? DateTime.UtcNow,
+			PrepareFlags.Data | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
+			(additionalFlags ?? PrepareFlags.None),
+			eventType, data, metadata);
+	}
+
+	public static IPrepareLogRecord<TStreamId> TransactionBegin<TStreamId>(IRecordFactory<TStreamId> factory, long logPos, Guid correlationId, TStreamId eventStreamId,
+		long expectedVersion) {
+		return factory.CreatePrepare(logPos, correlationId, Guid.NewGuid(), logPos, -1, eventStreamId,
+			expectedVersion,
+			DateTime.UtcNow, PrepareFlags.TransactionBegin, default, NoData, NoData);
+	}
+
+	public static IPrepareLogRecord<TStreamId> TransactionWrite<TStreamId>(IRecordFactory<TStreamId> factory, long logPosition, Guid correlationId, Guid eventId,
+		long transactionPos, int transactionOffset, TStreamId eventStreamId, TStreamId eventType, byte[] data,
+		byte[] metadata, bool isJson) {
+		return factory.CreatePrepare(logPosition, correlationId, eventId, transactionPos, transactionOffset,
+			eventStreamId, ExpectedVersion.Any, DateTime.UtcNow,
+			PrepareFlags.Data | (isJson ? PrepareFlags.IsJson : PrepareFlags.None),
+			eventType, data, metadata);
+	}
+
+	public static IPrepareLogRecord<TStreamId> TransactionEnd<TStreamId>(IRecordFactory<TStreamId> factory, long logPos, Guid correlationId, Guid eventId,
+		long transactionPos, TStreamId eventStreamId) {
+		return factory.CreatePrepare(logPos, correlationId, eventId, transactionPos, -1, eventStreamId,
+			ExpectedVersion.Any,
+			DateTime.UtcNow, PrepareFlags.TransactionEnd, default, NoData, NoData);
+	}
+
+	public static IPrepareLogRecord<TStreamId> DeleteTombstone<TStreamId>(IRecordFactory<TStreamId> factory, long logPosition, Guid correlationId, Guid eventId,
+		TStreamId eventStreamId, TStreamId eventType, long expectedVersion, PrepareFlags additionalFlags = PrepareFlags.None) {
+		return factory.CreatePrepare(logPosition, correlationId, eventId, logPosition, 0, eventStreamId,
+			expectedVersion, DateTime.UtcNow,
+			PrepareFlags.StreamDelete | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
+			additionalFlags,
+			eventType, NoData, NoData);
+	}
+
+	protected LogRecord(LogRecordType recordType, byte version, long logPosition) {
+		Ensure.Nonnegative(logPosition, "logPosition");
+		RecordType = recordType;
+		Version = version;
+		LogPosition = logPosition;
+	}
+
+	public virtual void WriteTo(ref BufferWriterSlim<byte> writer) {
+		writer.Add((byte)RecordType);
+		writer.Add(Version);
+		writer.WriteLittleEndian(LogPosition);
+	}
+
+	public abstract int GetSizeWithLengthPrefixAndSuffix();
+
+	private readonly struct Header : IBinaryFormattable<Header> {
+		private const int Size = sizeof(LogRecordType) + sizeof(byte);
+		internal readonly LogRecordType Type;
+		internal readonly byte Version;
+
+		private Header(ReadOnlySpan<byte> input) {
+			// Perf: Read the span from the last element to have just one range check inserted by JIT
+			Version = input[1];
+			Type = (LogRecordType)input[0];
+		}
+
+		public void Format(Span<byte> output) {
+			output[1] = Version;
+			output[0] = (byte)Type;
+		}
+
+		static int IBinaryFormattable<Header>.Size => Size;
+
+		static Header IBinaryFormattable<Header>.Parse(ReadOnlySpan<byte> input)
+			=> new(input);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/LogRecords/LogRecordExtensions.cs b/src/KurrentDB.Core/TransactionLog/LogRecords/LogRecordExtensions.cs
new file mode 100644
index 00000000000..35e9f54bdb5
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/LogRecords/LogRecordExtensions.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.LogCommon;
+
+namespace KurrentDB.Core.TransactionLog.LogRecords;
+
+public static class LogRecordExtensions {
+	public static bool IsTransactionBoundary(this ILogRecord rec) {
+		return rec.RecordType switch {
+			LogRecordType.Stream => false, // log v3 stream record
+			LogRecordType.EventType => false, // log v3 event type record
+			LogRecordType.Prepare => rec is IPrepareLogRecord prepare &&
+									 (!prepare.Flags.HasFlag(PrepareFlags.IsCommitted) || // explicit transaction
+									 prepare.Flags.HasFlag(PrepareFlags.TransactionEnd)), // last prepare in implicit transaction
+			_ => true
+		};
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/LogRecords/LogV3EpochLogRecord.cs b/src/KurrentDB.Core/TransactionLog/LogRecords/LogV3EpochLogRecord.cs
new file mode 100644
index 00000000000..30a33bbd60e
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/LogRecords/LogV3EpochLogRecord.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.LogV3;
+
+namespace KurrentDB.Core.TransactionLog.LogRecords;
+
+public class LogV3EpochLogRecord : LogV3Record<RecordView<Raw.EpochHeader>>, ISystemLogRecord {
+	public SystemRecordType SystemRecordType => SystemRecordType.Epoch;
+
+	public LogV3EpochLogRecord(
+		long logPosition,
+		DateTime timeStamp,
+		int epochNumber,
+		Guid epochId,
+		long prevEpochPosition,
+		Guid leaderInstanceId) : base() {
+
+		Record = RecordCreator.CreateEpochRecord(
+			timeStamp: timeStamp,
+			logPosition: logPosition,
+			epochNumber: epochNumber,
+			epochId: epochId,
+			prevEpochPosition: prevEpochPosition,
+			leaderInstanceId: leaderInstanceId);
+	}
+
+	public LogV3EpochLogRecord(ReadOnlyMemory<byte> bytes) : base() {
+		Record = new RecordView<Raw.EpochHeader>(bytes);
+	}
+
+	public EpochRecord GetEpochRecord() => new EpochRecord(
+		epochPosition: Record.Header.LogPosition,
+		epochNumber: Record.SubHeader.EpochNumber,
+		epochId: Record.Header.RecordId,
+		prevEpochPosition: Record.SubHeader.PrevEpochPosition,
+		timeStamp: Record.Header.TimeStamp,
+		leaderInstanceId: Record.SubHeader.LeaderInstanceId);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/LogRecords/LogV3EventTypeRecord.cs b/src/KurrentDB.Core/TransactionLog/LogRecords/LogV3EventTypeRecord.cs
new file mode 100644
index 00000000000..c03efc1a564
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/LogRecords/LogV3EventTypeRecord.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.LogV3;
+using KurrentDB.LogV3;
+
+namespace KurrentDB.Core.TransactionLog.LogRecords;
+
+public class LogV3EventTypeRecord : LogV3Record<StringPayloadRecord<Raw.EventTypeHeader>>, IEquatable<LogV3EventTypeRecord>, IPrepareLogRecord<uint> {
+
+	public uint EventStreamId => LogV3SystemStreams.EventTypesStreamNumber;
+	public PrepareFlags Flags => PrepareFlags.SingleWrite | PrepareFlags.IsCommitted | PrepareFlags.IsJson;
+	public long TransactionPosition => LogPosition;
+	public int TransactionOffset => 0;
+	public long ExpectedVersion => EventTypeIdConverter.ToEventNumber(Record.SubHeader.ReferenceNumber) - 1;
+	public Guid EventId => Record.Header.RecordId;
+	public Guid ParentEventId => Record.SubHeader.ParentEventTypeId;
+	public Guid CorrelationId { get; } = Guid.NewGuid();
+	public uint EventType => LogV3SystemEventTypes.EventTypeDefinedNumber;
+	// so we can see the event type in the webui if we want
+	public ReadOnlyMemory<byte> Data => Record.Payload;
+	public ReadOnlyMemory<byte> Metadata => ReadOnlyMemory<byte>.Empty;
+
+	public string EventTypeName => Record.StringPayload;
+	public uint EventTypeNumber => Record.SubHeader.ReferenceNumber;
+	public ushort EventTypeVersion => Record.SubHeader.Version;
+
+	public LogV3EventTypeRecord(
+		Guid eventTypeId,
+		Guid parentEventTypeId,
+		long logPosition,
+		DateTime timeStamp,
+		string eventType,
+		uint eventTypeNumber,
+		ushort eventTypeVersion,
+		Guid partitionId) : base() {
+
+		Record = RecordCreator.CreateEventTypeRecord(
+			eventTypeId: eventTypeId,
+			parentEventTypeId: parentEventTypeId,
+			timeStamp: timeStamp,
+			logPosition: logPosition,
+			name: eventType,
+			eventTypeNumber: eventTypeNumber,
+			eventTypeVersion: eventTypeVersion,
+			partitionId: partitionId);
+	}
+
+	public LogV3EventTypeRecord(ReadOnlyMemory<byte> bytes) : base() {
+		Record = StringPayloadRecord.Create(new RecordView<Raw.EventTypeHeader>(bytes));
+	}
+
+	public IPrepareLogRecord<uint> CopyForRetry(long logPosition, long transactionPosition) {
+		return new LogV3EventTypeRecord(
+			eventTypeId: Record.Header.RecordId,
+			timeStamp: Record.Header.TimeStamp,
+			logPosition: logPosition,
+			eventTypeNumber: Record.SubHeader.ReferenceNumber,
+			eventType: Record.StringPayload,
+			parentEventTypeId: Record.SubHeader.ParentEventTypeId,
+			eventTypeVersion: Record.SubHeader.Version,
+			partitionId: Record.SubHeader.PartitionId);
+	}
+
+	public bool Equals(LogV3EventTypeRecord other) {
+		if (other is null)
+			return false;
+		if (ReferenceEquals(this, other))
+			return true;
+		return
+			other.EventTypeName == EventTypeName &&
+			other.EventTypeNumber == EventTypeNumber &&
+			other.Record.Bytes.Span.SequenceEqual(Record.Bytes.Span);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/LogRecords/LogV3Record.cs b/src/KurrentDB.Core/TransactionLog/LogRecords/LogV3Record.cs
new file mode 100644
index 00000000000..804df5102b5
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/LogRecords/LogV3Record.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using DotNext.Buffers;
+using KurrentDB.LogCommon;
+using KurrentDB.LogV3;
+
+namespace KurrentDB.Core.TransactionLog.LogRecords;
+
+// This is the adapter to plug V3 records into the standard machinery.
+public class LogV3Record<TRecordView> : ILogRecord where TRecordView : IRecordView {
+	public TRecordView Record { get; init; }
+
+	public long GetNextLogPosition(long logicalPosition, int length) {
+		return logicalPosition + length + 2 * sizeof(int);
+	}
+
+	public long GetPrevLogPosition(long logicalPosition, int length) {
+		return logicalPosition - length - 2 * sizeof(int);
+	}
+
+	// probably only needs to be virtual temporarily
+	public virtual LogRecordType RecordType => Record.Header.Type;
+
+	public byte Version => Record.Header.Version;
+
+	public long LogPosition => Record.Header.LogPosition;
+	public int SizeOnDisk => 2 * sizeof(int) + Record.Bytes.Length;
+
+	public DateTime TimeStamp => Record.Header.TimeStamp;
+
+	public LogV3Record() {
+	}
+
+	public void WriteTo(ref BufferWriterSlim<byte> writer) {
+		writer.Write(Record.Bytes.Span);
+	}
+
+	public int GetSizeWithLengthPrefixAndSuffix() {
+		return 2 * sizeof(int) + Record.Bytes.Length;
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/LogRecords/LogV3StreamRecord.cs b/src/KurrentDB.Core/TransactionLog/LogRecords/LogV3StreamRecord.cs
new file mode 100644
index 00000000000..ada9170e4ec
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/LogRecords/LogV3StreamRecord.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.LogV3;
+using KurrentDB.LogV3;
+using StreamId = System.UInt32;
+
+namespace KurrentDB.Core.TransactionLog.LogRecords;
+
+// todo: when we have partition records etc there might be a baseclass to refactor
+// the string payload to.
+public class LogV3StreamRecord : LogV3Record<StringPayloadRecord<Raw.StreamHeader>>, IEquatable<LogV3StreamRecord>, IPrepareLogRecord<StreamId> {
+	public StreamId EventStreamId => LogV3SystemStreams.StreamsCreatedStreamNumber;
+	// so we can see the stream name in the webui if we want
+	public PrepareFlags Flags => PrepareFlags.SingleWrite | PrepareFlags.IsCommitted | PrepareFlags.IsJson;
+	public long TransactionPosition => LogPosition;
+	public int TransactionOffset => 0;
+	public long ExpectedVersion => StreamIdConverter.ToEventNumber(Record.SubHeader.ReferenceNumber) - 1;
+	public Guid EventId => Record.Header.RecordId;
+	public Guid CorrelationId { get; } = Guid.NewGuid();
+	public uint EventType => LogV3SystemEventTypes.StreamCreatedNumber;
+	// so we can see the stream name in the webui if we want
+	public ReadOnlyMemory<byte> Data => Record.Payload;
+	public ReadOnlyMemory<byte> Metadata => ReadOnlyMemory<byte>.Empty;
+
+	public string StreamName => Record.StringPayload;
+	public StreamId StreamNumber => Record.SubHeader.ReferenceNumber;
+
+	public LogV3StreamRecord(
+		Guid streamId,
+		long logPosition,
+		DateTime timeStamp,
+		uint streamNumber,
+		string streamName,
+		Guid partitionId) : base() {
+
+		Record = RecordCreator.CreateStreamRecord(
+			streamId: streamId,
+			timeStamp: timeStamp,
+			logPosition: logPosition,
+			streamNumber: streamNumber,
+			streamName: streamName,
+			partitionId: partitionId,
+			streamTypeId: Guid.Empty);
+	}
+
+	public LogV3StreamRecord(ReadOnlyMemory<byte> bytes) : base() {
+		Record = StringPayloadRecord.Create(new RecordView<Raw.StreamHeader>(bytes));
+	}
+
+	public IPrepareLogRecord<StreamId> CopyForRetry(long logPosition, long transactionPosition) {
+		return new LogV3StreamRecord(
+			streamId: Record.Header.RecordId,
+			timeStamp: Record.Header.TimeStamp,
+			logPosition: logPosition,
+			streamNumber: Record.SubHeader.ReferenceNumber,
+			streamName: Record.StringPayload,
+			partitionId: Record.SubHeader.PartitionId);
+	}
+
+	public bool Equals(LogV3StreamRecord other) {
+		if (other is null)
+			return false;
+		if (ReferenceEquals(this, other))
+			return true;
+		return
+			other.StreamName == StreamName &&
+			other.StreamNumber == StreamNumber &&
+			other.Record.Bytes.Span.SequenceEqual(Record.Bytes.Span);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/LogRecords/LogV3StreamWriteRecord.cs b/src/KurrentDB.Core/TransactionLog/LogRecords/LogV3StreamWriteRecord.cs
new file mode 100644
index 00000000000..040c3926dde
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/LogRecords/LogV3StreamWriteRecord.cs
@@ -0,0 +1,142 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.LogV3;
+using KurrentDB.LogCommon;
+using KurrentDB.LogV3;
+using StreamId = System.UInt32;
+
+namespace KurrentDB.Core.TransactionLog.LogRecords;
+
+// implements iprepare because currently the strem write contains exactly one event
+// but when we generalise it to contain muliple events i exect we will be able to remove
+// implementing iprepare here.
+public class LogV3StreamWriteRecord : LogV3Record<StreamWriteRecord>, IEquatable<LogV3StreamWriteRecord>, IPrepareLogRecord<StreamId> {
+	public LogV3StreamWriteRecord(ReadOnlyMemory<byte> bytes) : base() {
+		Record = new StreamWriteRecord(new RecordView<Raw.StreamWriteHeader>(bytes));
+	}
+
+	public LogV3StreamWriteRecord(
+		long logPosition,
+		long transactionPosition,
+		int transactionOffset,
+		Guid correlationId,
+		Guid eventId,
+		StreamId eventStreamId,
+		long expectedVersion,
+		DateTime timeStamp,
+		PrepareFlags flags,
+		uint eventType,
+		ReadOnlySpan<byte> data,
+		ReadOnlySpan<byte> metadata) {
+
+		Ensure.Nonnegative(logPosition, "logPosition");
+		Ensure.NotEmptyGuid(correlationId, "correlationId");
+		Ensure.NotEmptyGuid(eventId, "eventId");
+		Ensure.Nonnegative(transactionPosition, "transactionPosition");
+		if (transactionOffset < -1)
+			throw new ArgumentOutOfRangeException("transactionOffset");
+		if (eventStreamId < LogV3SystemStreams.FirstVirtualStream)
+			throw new ArgumentOutOfRangeException("eventStreamId", eventStreamId, null);
+		if (expectedVersion < Core.Data.ExpectedVersion.Any)
+			throw new ArgumentOutOfRangeException("expectedVersion");
+
+		Record = RecordCreator.CreateStreamWriteRecordForSingleEvent(
+			timeStamp: timeStamp,
+			correlationId: correlationId,
+			logPosition: logPosition,
+			transactionPosition: transactionPosition,
+			transactionOffset: transactionOffset,
+			streamNumber: eventStreamId,
+			startingEventNumber: expectedVersion + 1,
+			eventId: eventId,
+			eventTypeNumber: eventType,
+			eventData: data,
+			eventMetadata: metadata,
+			// todo: translate
+			eventFlags: (Raw.EventFlags)flags);
+	}
+
+	public override LogRecordType RecordType => LogRecordType.Prepare;
+
+	// todo: translate
+	public PrepareFlags Flags => (PrepareFlags)Record.Event.Header.Flags;
+	public long TransactionPosition => Record.SystemMetadata.TransactionPosition;
+	public int TransactionOffset => Record.SystemMetadata.TransactionOffset;
+	public long ExpectedVersion => Record.WriteId.StartingEventNumber - 1;
+	public StreamId EventStreamId => Record.WriteId.StreamNumber;
+	public Guid EventId => Record.Event.SystemMetadata.EventId;
+	public Guid CorrelationId => Record.SystemMetadata.CorrelationId;
+	public uint EventType => Record.Event.Header.EventTypeNumber;
+	public ReadOnlyMemory<byte> Data => Record.Event.Data;
+	public ReadOnlyMemory<byte> Metadata => Record.Event.Metadata;
+
+	public IPrepareLogRecord<StreamId> CopyForRetry(long logPosition, long transactionPosition) {
+		return new LogV3StreamWriteRecord(
+			logPosition: logPosition,
+			transactionPosition: transactionPosition,
+			transactionOffset: TransactionOffset,
+			correlationId: CorrelationId,
+			eventId: EventId,
+			eventStreamId: EventStreamId,
+			expectedVersion: ExpectedVersion,
+			timeStamp: TimeStamp,
+			flags: Flags,
+			eventType: EventType,
+			data: Data.Span,
+			metadata: Metadata.Span);
+	}
+
+	public bool Equals(LogV3StreamWriteRecord other) {
+		if (ReferenceEquals(null, other))
+			return false;
+		if (ReferenceEquals(this, other))
+			return true;
+		return other.Version == Version
+				&& other.LogPosition == LogPosition
+				&& other.TimeStamp.Equals(TimeStamp)
+				&& other.RecordType == RecordType
+				&& other.Flags == Flags
+				&& other.TransactionPosition == TransactionPosition
+				&& other.TransactionOffset == TransactionOffset
+				&& other.ExpectedVersion == ExpectedVersion
+				&& other.EventStreamId.Equals(EventStreamId)
+				&& other.EventId == EventId
+				&& other.CorrelationId == CorrelationId
+				&& other.EventType.Equals(EventType)
+				&& other.Data.Span.SequenceEqual(Data.Span)
+				&& other.Metadata.Span.SequenceEqual(Metadata.Span);
+	}
+
+	public override bool Equals(object obj) {
+		if (ReferenceEquals(null, obj))
+			return false;
+		if (ReferenceEquals(this, obj))
+			return true;
+		if (obj.GetType() != this.GetType())
+			return false;
+		return Equals((LogV3StreamWriteRecord)obj);
+	}
+
+	public override int GetHashCode() {
+		unchecked {
+			var result = Version.GetHashCode();
+			result = (result * 397) ^ LogPosition.GetHashCode();
+			result = (result * 397) ^ TimeStamp.GetHashCode();
+			result = (result * 397) ^ RecordType.GetHashCode();
+			result = (result * 397) ^ Flags.GetHashCode();
+			result = (result * 397) ^ TransactionPosition.GetHashCode();
+			result = (result * 397) ^ TransactionOffset;
+			result = (result * 397) ^ ExpectedVersion.GetHashCode();
+			result = (result * 397) ^ EventStreamId.GetHashCode();
+			result = (result * 397) ^ EventId.GetHashCode();
+			result = (result * 397) ^ CorrelationId.GetHashCode();
+			result = (result * 397) ^ EventType.GetHashCode();
+			result = (result * 397) ^ Data.GetHashCode();
+			result = (result * 397) ^ Metadata.GetHashCode();
+			return result;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/LogRecords/PartitionLogRecord.cs b/src/KurrentDB.Core/TransactionLog/LogRecords/PartitionLogRecord.cs
new file mode 100644
index 00000000000..f0c9e875b6e
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/LogRecords/PartitionLogRecord.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.LogV3;
+
+namespace KurrentDB.Core.TransactionLog.LogRecords;
+
+public class PartitionLogRecord : LogV3Record<StringPayloadRecord<Raw.PartitionHeader>> {
+	public PartitionLogRecord(DateTime timeStamp, long logPosition, Guid partitionId, Guid partitionTypeId,
+		Guid parentPartitionId, Raw.PartitionFlags flags, ushort referenceNumber, string name) {
+
+		Record = RecordCreator.CreatePartitionRecord(
+			timeStamp,
+			logPosition,
+			partitionId,
+			partitionTypeId,
+			parentPartitionId,
+			flags,
+			referenceNumber,
+			name);
+	}
+
+	public PartitionLogRecord(ReadOnlyMemory<byte> bytes) : base() {
+		Record = StringPayloadRecord.Create(new RecordView<Raw.PartitionHeader>(bytes));
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/LogRecords/PartitionTypeLogRecord.cs b/src/KurrentDB.Core/TransactionLog/LogRecords/PartitionTypeLogRecord.cs
new file mode 100644
index 00000000000..b648516b475
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/LogRecords/PartitionTypeLogRecord.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.LogV3;
+
+namespace KurrentDB.Core.TransactionLog.LogRecords;
+
+public class PartitionTypeLogRecord : LogV3Record<StringPayloadRecord<Raw.PartitionTypeHeader>> {
+	public PartitionTypeLogRecord(DateTime timeStamp, long logPosition, Guid partitionTypeId, Guid partitionId,
+		string name) {
+
+		Record = RecordCreator.CreatePartitionTypeRecord(
+			timeStamp,
+			logPosition,
+			partitionTypeId,
+			partitionId,
+			name);
+	}
+
+	public PartitionTypeLogRecord(ReadOnlyMemory<byte> bytes) : base() {
+		Record = StringPayloadRecord.Create(new RecordView<Raw.PartitionTypeHeader>(bytes));
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/LogRecords/PrepareLogRecord.cs b/src/KurrentDB.Core/TransactionLog/LogRecords/PrepareLogRecord.cs
new file mode 100644
index 00000000000..b440cdb21ca
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/LogRecords/PrepareLogRecord.cs
@@ -0,0 +1,342 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Buffers;
+using System.Diagnostics;
+using System.Text;
+using DotNext.Buffers;
+using DotNext.Buffers.Binary;
+using DotNext.IO;
+using DotNext.Text;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.LogCommon;
+
+namespace KurrentDB.Core.TransactionLog.LogRecords;
+
+[Flags]
+public enum PrepareFlags : ushort {
+	None = 0x00,
+	Data = 0x01, // prepare contains data
+	TransactionBegin = 0x02, // prepare starts transaction
+	TransactionEnd = 0x04, // prepare ends transaction
+	StreamDelete = 0x08, // prepare deletes stream
+
+	IsCommitted = 0x20, // prepare should be considered committed immediately, no commit will follow in TF
+						//Update = 0x30,                  // prepare updates previous instance of the same event, DANGEROUS!
+
+	IsJson = 0x100, // indicates data & metadata are valid json
+	IsRedacted = 0x200,
+
+	// aggregate flag set
+	// unused and easily confused with StreamDelete:  DeleteTombstone = TransactionBegin | TransactionEnd | StreamDelete,
+	SingleWrite = Data | TransactionBegin | TransactionEnd
+}
+
+public static class PrepareFlagsExtensions {
+	public static bool HasAllOf(this PrepareFlags flags, PrepareFlags flagSet) {
+		return (flags & flagSet) == flagSet;
+	}
+
+	public static bool HasAnyOf(this PrepareFlags flags, PrepareFlags flagSet) {
+		return (flags & flagSet) != 0;
+	}
+
+	public static bool HasNoneOf(this PrepareFlags flags, PrepareFlags flagSet) {
+		return (flags & flagSet) == 0;
+	}
+}
+
+public sealed class PrepareLogRecord : LogRecord, IEquatable<PrepareLogRecord>, IPrepareLogRecord<string> {
+	public const byte PrepareRecordVersion = 1;
+
+	public PrepareFlags Flags { get; }
+	public long TransactionPosition { get; }
+	public int TransactionOffset { get; }
+	public long ExpectedVersion { get; } // if IsCommitted is set, this is final EventNumber
+	public string EventStreamId { get; }
+	private int? _eventStreamIdSize;
+	public Guid EventId { get; }
+	public Guid CorrelationId { get; }
+	public DateTime TimeStamp { get; }
+	public string EventType { get; }
+	private int? _eventTypeSize;
+	public ReadOnlyMemory<byte> Data => Flags.HasFlag(PrepareFlags.IsRedacted) ? NoData : _dataOnDisk;
+	private readonly ReadOnlyMemory<byte> _dataOnDisk;
+	public ReadOnlyMemory<byte> Metadata { get; }
+
+	private int? _sizeOnDisk;
+
+	public long InMemorySize {
+		get {
+			return sizeof(LogRecordType)
+				   + 1
+				   + 8
+				   + sizeof(PrepareFlags)
+				   + 8
+				   + 4
+				   + 4
+				   + IntPtr.Size + EventStreamId.Length * 2
+				   + 16
+				   + 16
+				   + 8
+				   + IntPtr.Size + EventType.Length * 2
+				   + IntPtr.Size + _dataOnDisk.Length
+				   + IntPtr.Size + Metadata.Length;
+		}
+	}
+
+	// including length and suffix
+	private int ComputeSizeOnDisk() {
+		int eventStreamIdSize = _eventStreamIdSize ??= Encoding.UTF8.GetByteCount(EventStreamId);
+		int eventTypeSize = _eventTypeSize ??= Encoding.UTF8.GetByteCount(EventType);
+
+		return
+			2 * sizeof(int) /* Length prefix & suffix */
+			+ BaseSize
+			+ sizeof(ushort) /* Flags */
+			+ sizeof(long) /* TransactionPosition */
+			+ sizeof(int) /* TransactionOffset */
+			+ (Version is LogRecordVersion.LogRecordV0 ? sizeof(int) : sizeof(long)) /* ExpectedVersion */
+			+ StringSizeWithLengthPrefix(eventStreamIdSize) /* EventStreamId */
+			+ 16 /* EventId */
+			+ 16 /* CorrelationId */
+			+ sizeof(long) /* TimeStamp */
+			+ StringSizeWithLengthPrefix(eventTypeSize) /* EventType */
+			+ sizeof(int) /* Data length */
+			+ _dataOnDisk.Length /* Data */
+			+ sizeof(int) /* Metadata length */
+			+ Metadata.Length; /* Metadata */
+
+		// when written to disk, a string is prefixed with its length which is written as ULEB128
+		static int StringSizeWithLengthPrefix(int stringSize) {
+			Debug.Assert(stringSize >= 0);
+
+			return stringSize is 0 ? 1 : stringSize + int.Log2(stringSize) / 7 + 1;
+		}
+	}
+
+	public PrepareLogRecord(long logPosition,
+		Guid correlationId,
+		Guid eventId,
+		long transactionPosition,
+		int transactionOffset,
+		string eventStreamId,
+		int? eventStreamIdSize,
+		long expectedVersion,
+		DateTime timeStamp,
+		PrepareFlags flags,
+		string eventType,
+		int? eventTypeSize,
+		ReadOnlyMemory<byte> data,
+		ReadOnlyMemory<byte> metadata,
+		byte prepareRecordVersion = PrepareRecordVersion)
+		: base(LogRecordType.Prepare, prepareRecordVersion, logPosition) {
+		Ensure.NotEmptyGuid(correlationId, "correlationId");
+		Ensure.NotEmptyGuid(eventId, "eventId");
+		Ensure.Nonnegative(transactionPosition, "transactionPosition");
+		if (transactionOffset < -1)
+			throw new ArgumentOutOfRangeException("transactionOffset");
+		Ensure.NotNullOrEmpty(eventStreamId, "eventStreamId");
+		if (expectedVersion < Core.Data.ExpectedVersion.Any)
+			throw new ArgumentOutOfRangeException("expectedVersion");
+
+		Flags = flags;
+		TransactionPosition = transactionPosition;
+		TransactionOffset = transactionOffset;
+		ExpectedVersion = expectedVersion;
+		EventStreamId = eventStreamId;
+		_eventStreamIdSize = eventStreamIdSize;
+
+		EventId = eventId;
+		CorrelationId = correlationId;
+		TimeStamp = timeStamp;
+		EventType = eventType ?? string.Empty;
+		_eventTypeSize = eventTypeSize;
+		_dataOnDisk = data;
+		Metadata = metadata;
+		if (InMemorySize > TFConsts.MaxLogRecordSize)
+			throw new Exception("Record too large.");
+	}
+
+	internal PrepareLogRecord(ref SequenceReader reader, byte version, long logPosition)
+		: base(LogRecordType.Prepare, version, logPosition) {
+		if (version is not LogRecordVersion.LogRecordV0 and not LogRecordVersion.LogRecordV1)
+			throw new ArgumentException(
+				$"PrepareRecord version {version} is incorrect. Supported version: {PrepareRecordVersion}.");
+
+		var context = new DecodingContext(Encoding.UTF8, reuseDecoder: true);
+		Flags = (PrepareFlags)reader.ReadLittleEndian<ushort>();
+		TransactionPosition = reader.ReadLittleEndian<long>();
+		TransactionOffset = reader.ReadLittleEndian<int>();
+		ExpectedVersion = version is LogRecordVersion.LogRecordV0
+			? AdjustVersion(reader.ReadLittleEndian<int>())
+			: reader.ReadLittleEndian<long>();
+		EventStreamId = ReadString(ref reader, in context);
+		EventId = reader.Read<Blittable<Guid>>().Value;
+		CorrelationId = reader.Read<Blittable<Guid>>().Value;
+		TimeStamp = new(reader.ReadLittleEndian<long>());
+		EventType = ReadString(ref reader, in context);
+		_dataOnDisk = reader.ReadLittleEndian<int>() is var dataCount && dataCount > 0
+			? reader.Read(dataCount).ToArray()
+			: NoData;
+		Metadata = reader.ReadLittleEndian<int>() is var metadataCount && metadataCount > 0
+			? reader.Read(metadataCount).ToArray()
+			: NoData;
+
+		if (InMemorySize > TFConsts.MaxLogRecordSize)
+			throw new Exception("Record too large.");
+
+		static long AdjustVersion(int version)
+			=> version is int.MaxValue - 1 ? long.MaxValue - 1L : version;
+
+		static string ReadString(ref SequenceReader reader, in DecodingContext context) {
+			using var buffer = reader.Decode(in context, LengthFormat.Compressed);
+			return buffer.ToString();
+		}
+	}
+
+	public IPrepareLogRecord<string> CopyForRetry(long logPosition, long transactionPosition) {
+		return new PrepareLogRecord(
+			logPosition: logPosition,
+			correlationId: CorrelationId,
+			eventId: EventId,
+			transactionPosition: transactionPosition,
+			transactionOffset: TransactionOffset,
+			eventStreamId: EventStreamId,
+			eventStreamIdSize: _eventStreamIdSize,
+			expectedVersion: ExpectedVersion,
+			timeStamp: TimeStamp,
+			flags: Flags,
+			eventType: EventType,
+			eventTypeSize: _eventTypeSize,
+			data: _dataOnDisk,
+			metadata: Metadata);
+	}
+
+	public override void WriteTo(ref BufferWriterSlim<byte> writer) {
+		base.WriteTo(ref writer);
+
+		writer.WriteLittleEndian((ushort)Flags);
+		writer.WriteLittleEndian(TransactionPosition);
+		writer.WriteLittleEndian(TransactionOffset);
+		if (Version is LogRecordVersion.LogRecordV0) {
+			int expectedVersion = ExpectedVersion == long.MaxValue - 1 ? int.MaxValue - 1 : (int)ExpectedVersion;
+			writer.WriteLittleEndian(expectedVersion);
+		} else {
+			writer.WriteLittleEndian(ExpectedVersion);
+		}
+
+		_eventStreamIdSize ??= Encoding.UTF8.GetByteCount(EventStreamId);
+
+		// 7-bit encoded int from BinaryWriter is actually ULEB128, so we need to cast int to uint
+		// first to preserve binary compatibility
+		writer.WriteLeb128((uint)_eventStreamIdSize.GetValueOrDefault());
+		var buffer = writer.GetSpan(_eventStreamIdSize.GetValueOrDefault());
+		writer.Advance(Encoding.UTF8.GetBytes(EventStreamId, buffer));
+
+		buffer = writer.GetSpan(16);
+		EventId.TryWriteBytes(buffer);
+		writer.Advance(16);
+
+		buffer = writer.GetSpan(16);
+		CorrelationId.TryWriteBytes(buffer);
+		writer.Advance(16);
+
+		writer.WriteLittleEndian(TimeStamp.Ticks);
+
+		_eventTypeSize ??= Encoding.UTF8.GetByteCount(EventType);
+		writer.WriteLeb128((uint)_eventTypeSize.GetValueOrDefault());
+		buffer = writer.GetSpan(_eventTypeSize.GetValueOrDefault());
+		writer.Advance(Encoding.UTF8.GetBytes(EventType, buffer));
+
+		writer.Write(_dataOnDisk.Span, LengthFormat.LittleEndian);
+		writer.Write(Metadata.Span, LengthFormat.LittleEndian);
+	}
+
+	public override int GetSizeWithLengthPrefixAndSuffix()
+		=> _sizeOnDisk ??= ComputeSizeOnDisk();
+
+	public bool Equals(PrepareLogRecord other) {
+		if (ReferenceEquals(null, other))
+			return false;
+		if (ReferenceEquals(this, other))
+			return true;
+		return other.LogPosition == LogPosition
+			   && other.Flags == Flags
+			   && other.TransactionPosition == TransactionPosition
+			   && other.TransactionOffset == TransactionOffset
+			   && other.ExpectedVersion == ExpectedVersion
+			   && other.EventStreamId.Equals(EventStreamId)
+			   && other.EventId == EventId
+			   && other.CorrelationId == CorrelationId
+			   && other.TimeStamp.Equals(TimeStamp)
+			   && other.EventType.Equals(EventType)
+			   && other.Data.Span.SequenceEqual(Data.Span)
+			   && other._dataOnDisk.Span.SequenceEqual(_dataOnDisk.Span)
+			   && other.Metadata.Span.SequenceEqual(Metadata.Span);
+	}
+
+	public override bool Equals(object obj) {
+		if (ReferenceEquals(null, obj))
+			return false;
+		if (ReferenceEquals(this, obj))
+			return true;
+		if (obj.GetType() != typeof(PrepareLogRecord))
+			return false;
+		return Equals((PrepareLogRecord)obj);
+	}
+
+	public override int GetHashCode() {
+		unchecked {
+			int result = LogPosition.GetHashCode();
+			result = (result * 397) ^ Flags.GetHashCode();
+			result = (result * 397) ^ TransactionPosition.GetHashCode();
+			result = (result * 397) ^ TransactionOffset;
+			result = (result * 397) ^ ExpectedVersion.GetHashCode();
+			result = (result * 397) ^ EventStreamId.GetHashCode();
+
+			result = (result * 397) ^ EventId.GetHashCode();
+			result = (result * 397) ^ CorrelationId.GetHashCode();
+			result = (result * 397) ^ TimeStamp.GetHashCode();
+			result = (result * 397) ^ EventType.GetHashCode();
+			result = (result * 397) ^ _dataOnDisk.GetHashCode();
+			result = (result * 397) ^ Metadata.GetHashCode();
+			return result;
+		}
+	}
+
+	public static bool operator ==(PrepareLogRecord left, PrepareLogRecord right) {
+		return Equals(left, right);
+	}
+
+	public static bool operator !=(PrepareLogRecord left, PrepareLogRecord right) {
+		return !Equals(left, right);
+	}
+
+	public override string ToString() {
+		return string.Format("LogPosition: {0}, "
+							 + "Flags: {1}, "
+							 + "TransactionPosition: {2}, "
+							 + "TransactionOffset: {3}, "
+							 + "ExpectedVersion: {4}, "
+							 + "EventStreamId: {5}, "
+							 + "EventId: {6}, "
+							 + "CorrelationId: {7}, "
+							 + "TimeStamp: {8}, "
+							 + "EventType: {9}, "
+							 + "InMemorySize: {10}",
+			LogPosition,
+			Flags,
+			TransactionPosition,
+			TransactionOffset,
+			ExpectedVersion,
+			EventStreamId,
+			EventId,
+			CorrelationId,
+			TimeStamp,
+			EventType,
+			InMemorySize);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/LogRecords/PrepareLogRecordView.cs b/src/KurrentDB.Core/TransactionLog/LogRecords/PrepareLogRecordView.cs
new file mode 100644
index 00000000000..2463d72dc2b
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/LogRecords/PrepareLogRecordView.cs
@@ -0,0 +1,139 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.LogCommon;
+
+namespace KurrentDB.Core.TransactionLog.LogRecords;
+
+// Use when parsing of a full prepare log record isn't required and only some bits need to be inspected.
+// Note that the data structure is not aligned, so performance may degrade if heavily accessing properties.
+// Designed to be reusable to avoid GC pressure when making a pass through the database.
+public struct PrepareLogRecordView {
+	public byte Version { get; }
+	public long LogPosition => BitConverter.ToInt64(_record, 2);
+	public PrepareFlags Flags => (PrepareFlags)BitConverter.ToUInt16(_record, 10);
+	public long TransactionPosition => BitConverter.ToInt64(_record, 12);
+	public int TransactionOffset => BitConverter.ToInt32(_record, 20);
+	public long ExpectedVersion => _expectedVersion;
+	public ReadOnlySpan<byte> EventStreamId => _record.AsSpan(_streamIdOffset, _streamIdSize);
+	public Guid EventId => new Guid(_record.AsSpan(_eventIdOffset, 16).ToArray()); // allocates
+	public Guid CorrelationId => new Guid(_record.AsSpan(_correlationIdOffset, 16).ToArray()); // allocates
+	public DateTime TimeStamp => new DateTime(BitConverter.ToInt64(_record, _timestampOffset));
+	public ReadOnlySpan<byte> EventType => _record.AsSpan(_eventTypeOffset, _eventTypeSize);
+	public ReadOnlySpan<byte> Data => _record.AsSpan(_dataOffset, _dataSize);
+	public ReadOnlySpan<byte> Metadata => _record.AsSpan(_metadataOffset, _metadataSize);
+
+	private readonly byte[] _record;
+	private readonly int _length;
+	private readonly long _expectedVersion;
+	private readonly int _streamIdSize;
+	private readonly int _streamIdOffset;
+	private readonly int _eventIdOffset;
+	private readonly int _correlationIdOffset;
+	private readonly int _timestampOffset;
+	private readonly int _eventTypeSize;
+	private readonly int _eventTypeOffset;
+	private readonly int _dataSize;
+	private readonly int _dataOffset;
+	private readonly int _metadataSize;
+	private readonly int _metadataOffset;
+
+	public PrepareLogRecordView(byte[] record, int length) {
+		if (!BitConverter.IsLittleEndian)
+			throw new NotSupportedException();
+
+		_record = record;
+		_length = length;
+
+		Version = _record[1];
+		if (Version != LogRecordVersion.LogRecordV0 && Version != LogRecordVersion.LogRecordV1)
+			throw new ArgumentException(
+				$"PrepareRecord version {Version} is incorrect. Supported version: {PrepareLogRecord.PrepareRecordVersion}.");
+
+		var currentOffset = 24;
+
+		if (Version == LogRecordVersion.LogRecordV0) {
+			int expectedVersion = BitConverter.ToInt32(_record, currentOffset);
+			_expectedVersion = expectedVersion == int.MaxValue - 1 ? long.MaxValue - 1 : expectedVersion;
+			currentOffset += 4;
+		} else {
+			_expectedVersion = BitConverter.ToInt64(_record, 24);
+			currentOffset += 8;
+		}
+
+		_streamIdSize = Read7BitEncodedInt(_record.AsSpan(0, _length), ref currentOffset);
+		_streamIdOffset = currentOffset;
+		currentOffset += _streamIdSize;
+
+		_eventIdOffset = currentOffset;
+		currentOffset += 16;
+
+		_correlationIdOffset = currentOffset;
+		currentOffset += 16;
+
+		_timestampOffset = currentOffset;
+		currentOffset += 8;
+
+		_eventTypeSize = Read7BitEncodedInt(_record.AsSpan(0, _length), ref currentOffset);
+		_eventTypeOffset = currentOffset;
+		currentOffset += _eventTypeSize;
+
+		_dataSize = BitConverter.ToInt32(_record, currentOffset);
+		currentOffset += 4;
+		_dataOffset = currentOffset;
+		currentOffset += _dataSize;
+
+		_metadataSize = BitConverter.ToInt32(_record, currentOffset);
+		currentOffset += 4;
+		_metadataOffset = currentOffset;
+		currentOffset += _metadataSize;
+
+		if (currentOffset != _length) {
+			throw new ArgumentException($"Unexpected record length: {currentOffset}, expected: {_length}");
+		}
+
+		// this is smaller than the actual record size but should be good enough to detect potential corruption
+		// or reading at a wrong position
+		if (_streamIdSize + _dataSize + _metadataSize > TFConsts.MaxLogRecordSize)
+			throw new Exception("Record too large.");
+	}
+
+	public override string ToString() {
+		return $"Version: {Version}, " +
+			   $"LogPosition: {LogPosition}, " +
+			   $"Flags: {Flags}, " +
+			   $"TransactionPosition: {TransactionPosition}, " +
+			   $"TransactionOffset: {TransactionOffset}, " +
+			   $"ExpectedVersion: {ExpectedVersion}, " +
+			   $"EventStreamId: {Encoding.UTF8.GetString(EventStreamId.ToArray())}, " +
+			   $"EventId: {EventId}, " +
+			   $"CorrelationId: {CorrelationId}, " +
+			   $"TimeStamp: {TimeStamp}, " +
+			   $"EventType: {Encoding.UTF8.GetString(EventType.ToArray())}, " +
+			   $"Data size: {Data.Length}, " +
+			   $"Metadata size: {Metadata.Length}";
+	}
+
+	// copied and adapted from https://github.com/microsoft/referencesource/blob/master/mscorlib/system/io/binaryreader.cs
+	private static int Read7BitEncodedInt(ReadOnlySpan<byte> bytes, ref int offset) {
+		// Read out an Int32 7 bits at a time.  The high bit
+		// of the byte when on means to continue reading more bytes.
+		int count = 0;
+		int shift = 0;
+		byte b;
+		do {
+			// Check for a corrupted stream.  Read a max of 5 bytes.
+			// In a future version, add a DataFormatException.
+			if (shift == 5 * 7)  // 5 bytes max per Int32, shift += 7
+				throw new FormatException();
+
+			b = bytes[offset++];
+			count |= (b & 0x7F) << shift;
+			shift += 7;
+		} while ((b & 0x80) != 0);
+		return count;
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/LogRecords/SystemLogRecord.cs b/src/KurrentDB.Core/TransactionLog/LogRecords/SystemLogRecord.cs
new file mode 100644
index 00000000000..79bf2e0db3d
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/LogRecords/SystemLogRecord.cs
@@ -0,0 +1,164 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Buffers;
+using DotNext.Buffers;
+using DotNext.IO;
+using KurrentDB.Common.Utils;
+using KurrentDB.LogCommon;
+
+namespace KurrentDB.Core.TransactionLog.LogRecords;
+
+public enum SystemRecordType : byte {
+	Invalid = 0,
+	Epoch = 1
+}
+
+public enum SystemRecordSerialization : byte {
+	Invalid = 0,
+	Binary = 1,
+	Json = 2,
+	Bson = 3
+}
+
+public sealed class SystemLogRecord : LogRecord, IEquatable<SystemLogRecord>, ISystemLogRecord {
+	public const byte SystemRecordVersion = 0;
+
+	public DateTime TimeStamp { get; }
+	public SystemRecordType SystemRecordType { get; }
+	public SystemRecordSerialization SystemRecordSerialization { get; }
+	public long Reserved { get; }
+	public ReadOnlyMemory<byte> Data { get; }
+
+	public SystemLogRecord(long logPosition,
+		DateTime timeStamp,
+		SystemRecordType systemRecordType,
+		SystemRecordSerialization systemRecordSerialization,
+		byte[] data)
+		: base(LogRecordType.System, SystemRecordVersion, logPosition) {
+		TimeStamp = timeStamp;
+		SystemRecordType = systemRecordType;
+		SystemRecordSerialization = systemRecordSerialization;
+		Reserved = 0;
+		Data = data ?? NoData;
+	}
+
+	internal SystemLogRecord(ref SequenceReader reader, byte version, long logPosition)
+		: base(LogRecordType.System, version, logPosition) {
+		if (version is not SystemRecordVersion)
+			throw new ArgumentException(
+				$"SystemRecord version {version} is incorrect. Supported version: {SystemRecordVersion}.");
+
+		TimeStamp = new(reader.ReadLittleEndian<long>());
+		SystemRecordType =
+			(SystemRecordType)(reader.ReadLittleEndian<byte>()) is var recordType
+			&& recordType is not SystemRecordType.Invalid
+				? recordType
+				: throw new ArgumentException(
+					$"Invalid SystemRecordType {recordType} at LogPosition {logPosition}.");
+		SystemRecordSerialization =
+			(SystemRecordSerialization)(reader.ReadLittleEndian<byte>()) is var recordSer
+			&& recordSer is not SystemRecordSerialization.Invalid
+				? recordSer
+				: throw new ArgumentException(
+					$"Invalid SystemRecordSerialization {recordSer} at LogPosition {logPosition}.");
+		Reserved = reader.ReadLittleEndian<long>();
+		Data = reader.ReadLittleEndian<int>() is var dataCount && dataCount > 0
+			? reader.Read(dataCount).ToArray()
+			: NoData;
+	}
+
+	public EpochRecord GetEpochRecord() {
+		if (SystemRecordType != SystemRecordType.Epoch)
+			throw new ArgumentException(
+				string.Format("Unexpected type of system record. Requested: {0}, actual: {1}.",
+					SystemRecordType.Epoch, SystemRecordType));
+
+		switch (SystemRecordSerialization) {
+			case SystemRecordSerialization.Json: {
+				var dto = Data.ParseJson<EpochRecord.EpochRecordDto>();
+				return new EpochRecord(dto);
+			}
+			default:
+				throw new ArgumentOutOfRangeException(
+					$"Unexpected SystemRecordSerialization type: {SystemRecordSerialization}",
+					"SystemRecordSerialization");
+		}
+	}
+
+	public override void WriteTo(ref BufferWriterSlim<byte> writer) {
+		base.WriteTo(ref writer);
+
+		writer.WriteLittleEndian(TimeStamp.Ticks);
+		writer.Add((byte)SystemRecordType);
+		writer.Add((byte)SystemRecordSerialization);
+		writer.WriteLittleEndian(Reserved);
+		writer.Write(Data.Span, LengthFormat.LittleEndian);
+	}
+
+	public override int GetSizeWithLengthPrefixAndSuffix() {
+		return sizeof(int) * 2  /* Length prefix & suffix */
+			   + sizeof(long)   /* TimeStamp */
+			   + sizeof(byte)   /* SystemRecordType */
+			   + sizeof(byte)   /* SystemRecordSerialization */
+			   + sizeof(long)   /* Reserved */
+			   + sizeof(int)    /* Data.Length */
+			   + Data.Length    /* Data */
+			   + BaseSize;
+	}
+
+	public bool Equals(SystemLogRecord other) {
+		if (ReferenceEquals(null, other))
+			return false;
+		if (ReferenceEquals(this, other))
+			return true;
+		return other.LogPosition == LogPosition
+			   && other.TimeStamp.Equals(TimeStamp)
+			   && other.SystemRecordType == SystemRecordType
+			   && other.SystemRecordSerialization == SystemRecordSerialization
+			   && other.Reserved == Reserved;
+	}
+
+	public override bool Equals(object obj) {
+		if (ReferenceEquals(null, obj))
+			return false;
+		if (ReferenceEquals(this, obj))
+			return true;
+		if (obj.GetType() != typeof(SystemRecordType))
+			return false;
+		return Equals((SystemLogRecord)obj);
+	}
+
+	public override int GetHashCode() {
+		unchecked {
+			int result = LogPosition.GetHashCode();
+			result = (result * 397) ^ TimeStamp.GetHashCode();
+			result = (result * 397) ^ SystemRecordType.GetHashCode();
+			result = (result * 397) ^ SystemRecordSerialization.GetHashCode();
+			result = (result * 397) ^ Reserved.GetHashCode();
+			return result;
+		}
+	}
+
+	public static bool operator ==(SystemLogRecord left, SystemLogRecord right) {
+		return Equals(left, right);
+	}
+
+	public static bool operator !=(SystemLogRecord left, SystemLogRecord right) {
+		return !Equals(left, right);
+	}
+
+	public override string ToString() {
+		return string.Format("LogPosition: {0}, "
+							 + "TimeStamp: {1}, "
+							 + "SystemRecordType: {2}, "
+							 + "SystemRecordSerialization: {3}, "
+							 + "Reserved: {4}",
+			LogPosition,
+			TimeStamp,
+			SystemRecordType,
+			SystemRecordSerialization,
+			Reserved);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/ReadResults.cs b/src/KurrentDB.Core/TransactionLog/ReadResults.cs
new file mode 100644
index 00000000000..9e997fb3e9d
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/ReadResults.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.LogCommon;
+
+namespace KurrentDB.Core.TransactionLog;
+
+public readonly struct RecordReadResult {
+	public static readonly RecordReadResult Failure = new(false, -1, null, 0);
+
+	public readonly bool Success;
+	public readonly long NextPosition;
+	public readonly ILogRecord LogRecord;
+	public readonly int RecordLength;
+
+	public RecordReadResult(bool success, long nextPosition, ILogRecord logRecord, int recordLength) {
+		Success = success;
+		LogRecord = logRecord;
+		NextPosition = nextPosition;
+		RecordLength = recordLength;
+	}
+
+	public override string ToString() {
+		return string.Format("Success: {0}, NextPosition: {1}, RecordLength: {2}, LogRecord: {3}",
+			Success,
+			NextPosition,
+			RecordLength,
+			LogRecord);
+	}
+}
+
+public readonly struct RawReadResult {
+	public static readonly RawReadResult Failure = new RawReadResult(false, -1, null, 0);
+
+	public readonly bool Success;
+	public readonly long NextPosition;
+	public readonly byte[] RecordBuffer; // can be longer than the record
+	public readonly int RecordLength;
+
+	public LogRecordType RecordType => (LogRecordType)RecordBuffer[0];
+
+	public RawReadResult(bool success, long nextPosition, byte[] record, int recordLength) {
+		Success = success;
+		RecordBuffer = record;
+		NextPosition = nextPosition;
+		RecordLength = recordLength;
+	}
+
+	public override string ToString() {
+		return $"Success: {Success}, NextPosition: {NextPosition}, Record Length: {RecordLength}";
+	}
+}
+
+public readonly struct SeqReadResult {
+	public static readonly SeqReadResult Failure = new SeqReadResult(false, true, null, 0, -1, -1);
+
+	public readonly bool Success;
+	public readonly bool Eof;
+	public readonly ILogRecord LogRecord;
+	public readonly int RecordLength;
+	public readonly long RecordPrePosition;
+	public readonly long RecordPostPosition;
+
+	public SeqReadResult(bool success,
+		bool eof,
+		ILogRecord logRecord,
+		int recordLength,
+		long recordPrePosition,
+		long recordPostPosition) {
+		Success = success;
+		Eof = eof;
+		LogRecord = logRecord;
+		RecordLength = recordLength;
+		RecordPrePosition = recordPrePosition;
+		RecordPostPosition = recordPostPosition;
+	}
+
+	public override string ToString() {
+		return string.Format(
+			"Success: {0}, RecordLength: {1}, RecordPrePosition: {2}, RecordPostPosition: {3}, LogRecord: {4}",
+			Success,
+			RecordLength,
+			RecordPrePosition,
+			RecordPostPosition,
+			LogRecord);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/RecordWriteResult.cs b/src/KurrentDB.Core/TransactionLog/RecordWriteResult.cs
new file mode 100644
index 00000000000..0c9c539a210
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/RecordWriteResult.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.TransactionLog;
+
+public struct RecordWriteResult {
+	public bool Success;
+	public readonly long OldPosition;
+	public readonly long NewPosition;
+
+	public RecordWriteResult(bool success, long oldPosition, long newPosition) {
+		if (newPosition < oldPosition)
+			throw new ArgumentException("New position is less than old position.");
+
+		Success = success;
+		OldPosition = oldPosition;
+		NewPosition = newPosition;
+	}
+
+	public static RecordWriteResult Failed(long position) {
+		return new RecordWriteResult(false, position, position);
+	}
+
+	public static RecordWriteResult Successful(long oldPosition, long newPosition) {
+		return new RecordWriteResult(true, oldPosition, newPosition);
+	}
+
+	public override string ToString() {
+		return string.Format("Success: {0}, OldPosition: {1}, NewPosition: {2}", Success, OldPosition, NewPosition);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/AdvancingCheckpoint.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/AdvancingCheckpoint.cs
new file mode 100644
index 00000000000..4c5b75f3cfe
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/AdvancingCheckpoint.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging;
+
+// Compares positions to a checkpoint that only advances.
+// Only reads the underlying checkpoint when necessary.
+public class AdvancingCheckpoint {
+	private readonly Func<CancellationToken, ValueTask<long>> _readCheckpoint;
+	private long _cachedValue;
+
+	public AdvancingCheckpoint(Func<CancellationToken, ValueTask<long>> readCheckpoint) {
+		_readCheckpoint = readCheckpoint;
+	}
+
+	public async ValueTask<bool> IsGreaterThanOrEqualTo(long position, CancellationToken ct) {
+		if (_cachedValue >= position)
+			return true;
+
+		_cachedValue = await _readCheckpoint(ct);
+
+		return _cachedValue >= position;
+	}
+
+	public void Reset() {
+		_cachedValue = 0;
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/CollisionManagement/CollisionDetector.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/CollisionManagement/CollisionDetector.cs
new file mode 100644
index 00000000000..22990bc08a9
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/CollisionManagement/CollisionDetector.cs
@@ -0,0 +1,184 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Serilog;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.CollisionManagement;
+
+// add things to the collision detector and it keeps a list of things that collided.
+public class CollisionDetector<T> {
+	private static EqualityComparer<T> TComparer { get; } = EqualityComparer<T>.Default;
+
+	private readonly ILogger _logger;
+
+	// maps from hash to (any) user of that hash
+	private readonly IScavengeMap<ulong, T> _hashUsers;
+	private readonly ILongHasher<T> _hasher;
+
+	// store the values. could possibly store just the hashes instead but that would
+	// lose us information and it should be so rare that there are any collisions at all.
+	private readonly IScavengeMap<T, Unit> _collisions;
+
+	// the entire set of collisions, or null if invalidated
+	private Dictionary<T, Unit> _collisionsCache;
+	private Dictionary<ulong, Unit> _collisionsHashCache;
+
+	private long _newStreams;
+	private long _newCollisions;
+	private long _oldCollisions;
+
+	public CollisionDetector(
+		ILogger logger,
+		IScavengeMap<ulong, T> hashUsers,
+		IScavengeMap<T, Unit> collisionStorage,
+		ILongHasher<T> hasher) {
+		_logger = logger;
+		_hashUsers = hashUsers;
+		_collisions = collisionStorage;
+		_hasher = hasher;
+	}
+
+	public void LogStats() {
+		long hits = 0;
+		long misses = 0;
+
+		if (_hashUsers is LruCachingScavengeMap<ulong, T> lru)
+			lru.GetStats(out hits, out misses);
+
+		_logger.Debug(
+			"SCAVENGING: CollisionDetector stats: " +
+			"{newStreams:N0} new streams. {newCollisions:N0} new collisions. {oldCollisions:N0} old collisions. " +
+			"{hits:N0} hits. {misses:N0} misses.",
+			_newStreams, _newCollisions, _oldCollisions,
+			hits, misses);
+
+		_newStreams = 0;
+		_newCollisions = 0;
+		_oldCollisions = 0;
+	}
+
+	public void ClearCaches() {
+		_collisionsCache = null;
+		_collisionsHashCache = null;
+	}
+
+	public bool IsCollision(T item) {
+		EnsureCollisionsCache();
+		return _collisionsCache.TryGetValue(item, out _);
+	}
+
+	public bool IsCollisionHash(ulong hash) {
+		if (_collisionsHashCache == null) {
+			_collisionsHashCache = new Dictionary<ulong, Unit>();
+			foreach (var kvp in _collisions.AllRecords()) {
+				_collisionsHashCache[_hasher.Hash(kvp.Key)] = kvp.Value;
+			}
+		}
+		return _collisionsHashCache.TryGetValue(hash, out _);
+	}
+
+	public IEnumerable<T> AllCollisions() {
+		EnsureCollisionsCache();
+		return _collisionsCache.Keys;
+	}
+
+	private void EnsureCollisionsCache() {
+		if (_collisionsCache == null)
+			_collisionsCache = _collisions.AllRecords().ToDictionary(
+				x => x.Key,
+				x => x.Value);
+	}
+
+	// Proof by induction that DetectCollisions works
+	// either:
+	//   1. we have seen this stream before.
+	//       then either:
+	//       a. it was a collision the first time we saw it
+	//           - by induction (2a) we concluded it was a collision at that time and added it to the
+	//             collision list so we conclude it is a collision now
+	//             TICK
+	//       b. it was not a collision but has since been collided with by a newer stream.
+	//           - when it was collided (2a) with we noticed and added it to the collision list so
+	//             we conclude it is still a collision now
+	//             TICK
+	//       c. it was not a collision and still isn't
+	//           - so we look in the backing data to see if this hash is in use
+	//             it is, because we have seen this stream before, but since this is not a collision
+	//             the user of the stream turns out to be us.
+	//             conclude no collision
+	//             TICK
+	//
+	//   2. this is the first time we are seeing this stream.
+	//       then either:
+	//       a. it collides with any stream we have seen before
+	//           - so we look in the backing data to see if this hash is in use.
+	//             it is, because this is the colliding case.
+	//             we look up the record that uses this hash
+	//             the record MUST be for a different stream because this is the the first time
+	//                we are seeing this stream
+	//             collision detected.
+	//             add both streams to the collision list. we have their names and the hash.
+	//             NB it is possible that we are colliding with multiple streams,
+	//                    but they are already in the backing data
+	//                    because they are colliding with each other.
+	//             TICK
+	//       b. it does not collide with any stream we have seen before
+	//           - so we look in the backing data to see if there are any entries for this hash
+	//             there are not because this is the first time we are seeing this stream and it does
+	//                not collde.
+	//             conclude no collision, register this stream as the user.
+	//             TICK
+
+	// Adds an item and detects if it collides with other items that were already added.
+	// `collision` is only defined when returning NewCollision.
+	// in this way we can tell when anything that was not colliding becomes colliding.
+	public CollisionResult DetectCollisions(T item, out T collision) {
+		if (IsCollision(item)) {
+			collision = default;
+			_oldCollisions++;
+			return CollisionResult.OldCollision; // previously known collision. 1a or 1b.
+												 // _hashes must already have this hash, otherwise it wouldn't be a collision.
+												 // so no need to add it it.
+		}
+
+		// collision not previously known, but might be a new one now.
+		var itemHash = _hasher.Hash(item);
+		if (!_hashUsers.TryGetValue(itemHash, out collision)) {
+			// hash wasn't even in use. it is now.
+			_hashUsers[itemHash] = item;
+			_newStreams++;
+			return CollisionResult.NoCollision; // hash not in use, can be no collision. 2b
+		}
+
+		// hash in use, but maybe by the item itself.
+		if (TComparer.Equals(collision, item)) {
+			return CollisionResult.NoCollision; // no collision with oneself. 1c
+		}
+
+		// hash in use by a different item! found new collision. 2a
+		_collisions[item] = Unit.Instance;
+		_collisions[collision] = Unit.Instance;
+		ClearCaches();
+
+		_newCollisions++;
+		return CollisionResult.NewCollision;
+	}
+
+	public T LookupUniqueHashUser(ulong streamHash) {
+		if (!_hashUsers.TryGetValue(streamHash, out var stream))
+			throw new Exception($"Tried to get unique user for stream hash: {streamHash} but it is unused");
+
+		if (IsCollisionHash(streamHash)) {
+			var collisions = AllCollisions().Where(x => _hasher.Hash(x) == streamHash);
+			throw new Exception($"Tried to get unique user for stream hash: {streamHash} but there are multiple: {string.Join(",", collisions)}");
+		}
+
+		return stream;
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/CollisionManagement/CollisionMap.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/CollisionManagement/CollisionMap.cs
new file mode 100644
index 00000000000..8bbbcd91001
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/CollisionManagement/CollisionMap.cs
@@ -0,0 +1,82 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.CollisionManagement;
+
+// this class efficiently stores/retrieves data against keys that very rarely but sometimes have a
+// hash collision.
+// when there is a hash collision the key is stored explicitly with the value
+// otherwise it only stores the hashes and the values.
+//
+// in practice this allows us to
+//   1. store data for lots of streams with much reduced size and complexity
+//      because we rarely if ever need to store the stream name, and the hashes are fixed size
+//   2. when being read, inform the caller whether the key hash collides or not
+//
+// for retrieval, if you have the key (and it has been checked for collision) then this
+// will look in the right submap. if you have a handle then this will look into the submap
+// according to the kind of handle.
+public class CollisionMap<TKey, TValue> {
+	private readonly IScavengeMap<ulong, TValue> _nonCollisions;
+	private readonly IScavengeMap<TKey, TValue> _collisions;
+	private readonly ILongHasher<TKey> _hasher;
+	private readonly Func<TKey, bool> _isCollision;
+
+	public CollisionMap(
+		ILongHasher<TKey> hasher,
+		Func<TKey, bool> isCollision,
+		IScavengeMap<ulong, TValue> nonCollisions,
+		IScavengeMap<TKey, TValue> collisions) {
+
+		_hasher = hasher;
+		_isCollision = isCollision;
+		_nonCollisions = nonCollisions;
+		_collisions = collisions;
+	}
+
+	// the key must already be checked for collisions so that we know if it _isCollision
+	// (especially, be careful when converting a stream to its metastream or vice versa)
+	public bool TryGetValue(TKey key, out TValue value) =>
+		_isCollision(key)
+			? _collisions.TryGetValue(key, out value)
+			: _nonCollisions.TryGetValue(_hasher.Hash(key), out value);
+
+	public bool TryGetValue(StreamHandle<TKey> handle, out TValue value) {
+		switch (handle.Kind) {
+			case StreamHandle.Kind.Hash:
+				return _nonCollisions.TryGetValue(handle.StreamHash, out value);
+			case StreamHandle.Kind.Id:
+				return _collisions.TryGetValue(handle.StreamId, out value);
+			default:
+				throw new ArgumentOutOfRangeException(nameof(handle), handle, null);
+		}
+	}
+
+	public TValue this[TKey key] {
+		set {
+			if (_isCollision(key)) {
+				_collisions[key] = value;
+			} else {
+				_nonCollisions[_hasher.Hash(key)] = value;
+			}
+		}
+	}
+
+	// when a key that didn't used to be a collision, becomes a collision.
+	// the remove and the add must be performed atomically.
+	// but the overall operation is idempotent
+	public void NotifyCollision(TKey key) {
+		var hash = _hasher.Hash(key);
+		if (_nonCollisions.TryRemove(hash, out var value)) {
+			_collisions[key] = value;
+		} else {
+			// we are notified that the key is a collision, but we dont have any entry for it
+			// so nothing to do
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/CollisionManagement/MetastreamCollisionMap.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/CollisionManagement/MetastreamCollisionMap.cs
new file mode 100644
index 00000000000..90f16efee7f
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/CollisionManagement/MetastreamCollisionMap.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.CollisionManagement;
+
+public class MetastreamCollisionMap<TStreamId> : CollisionMap<TStreamId, MetastreamData> {
+
+	private readonly ILongHasher<TStreamId> _hasher;
+	private readonly Func<TStreamId, bool> _isCollision;
+	private readonly IMetastreamScavengeMap<ulong> _nonCollisions;
+	private readonly IMetastreamScavengeMap<TStreamId> _collisions;
+
+	public MetastreamCollisionMap(
+		ILongHasher<TStreamId> hasher,
+		Func<TStreamId, bool> isCollision,
+		IMetastreamScavengeMap<ulong> nonCollisions,
+		IMetastreamScavengeMap<TStreamId> collisions) :
+		base(
+			hasher, isCollision, nonCollisions, collisions) {
+
+		_hasher = hasher;
+		_isCollision = isCollision;
+		_nonCollisions = nonCollisions;
+		_collisions = collisions;
+	}
+
+	public void SetTombstone(TStreamId streamId) {
+		if (_isCollision(streamId))
+			_collisions.SetTombstone(streamId);
+		else
+			_nonCollisions.SetTombstone(_hasher.Hash(streamId));
+	}
+
+	public void SetDiscardPoint(TStreamId streamId, DiscardPoint discardPoint) {
+		if (_isCollision(streamId))
+			_collisions.SetDiscardPoint(streamId, discardPoint);
+		else
+			_nonCollisions.SetDiscardPoint(_hasher.Hash(streamId), discardPoint);
+	}
+
+	public void DeleteAll() {
+		_collisions.DeleteAll();
+		_nonCollisions.DeleteAll();
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/CollisionManagement/OriginalStreamCollisionMap.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/CollisionManagement/OriginalStreamCollisionMap.cs
new file mode 100644
index 00000000000..c235969bdf7
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/CollisionManagement/OriginalStreamCollisionMap.cs
@@ -0,0 +1,124 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.CollisionManagement;
+
+public class OriginalStreamCollisionMap<TStreamId> :
+	CollisionMap<TStreamId, OriginalStreamData> {
+
+	private readonly ILongHasher<TStreamId> _hasher;
+	private readonly Func<TStreamId, bool> _isCollision;
+	private readonly IOriginalStreamScavengeMap<ulong> _nonCollisions;
+	private readonly IOriginalStreamScavengeMap<TStreamId> _collisions;
+
+	public OriginalStreamCollisionMap(
+		ILongHasher<TStreamId> hasher,
+		Func<TStreamId, bool> isCollision,
+		IOriginalStreamScavengeMap<ulong> nonCollisions,
+		IOriginalStreamScavengeMap<TStreamId> collisions) :
+		base(
+			hasher, isCollision, nonCollisions, collisions) {
+
+		_hasher = hasher;
+		_isCollision = isCollision;
+		_nonCollisions = nonCollisions;
+		_collisions = collisions;
+	}
+
+	public void SetTombstone(TStreamId streamId) {
+		if (_isCollision(streamId))
+			_collisions.SetTombstone(streamId);
+		else
+			_nonCollisions.SetTombstone(_hasher.Hash(streamId));
+	}
+
+	public void SetMetadata(TStreamId streamId, StreamMetadata metadata) {
+		if (_isCollision(streamId))
+			_collisions.SetMetadata(streamId, metadata);
+		else
+			_nonCollisions.SetMetadata(_hasher.Hash(streamId), metadata);
+	}
+
+	public void SetDiscardPoints(
+		StreamHandle<TStreamId> handle,
+		CalculationStatus status,
+		DiscardPoint discardPoint,
+		DiscardPoint maybeDiscardPoint) {
+
+		switch (handle.Kind) {
+			case StreamHandle.Kind.Hash:
+				_nonCollisions.SetDiscardPoints(
+					key: handle.StreamHash,
+					status: status,
+					discardPoint: discardPoint,
+					maybeDiscardPoint: maybeDiscardPoint);
+				break;
+			case StreamHandle.Kind.Id:
+				_collisions.SetDiscardPoints(
+					key: handle.StreamId,
+					status: status,
+					discardPoint: discardPoint,
+					maybeDiscardPoint: maybeDiscardPoint);
+				break;
+			default:
+				throw new ArgumentOutOfRangeException(nameof(handle), handle, null);
+		}
+	}
+
+	public bool TryGetChunkExecutionInfo(TStreamId streamId, out ChunkExecutionInfo info) =>
+		_isCollision(streamId)
+			? _collisions.TryGetChunkExecutionInfo(streamId, out info)
+			: _nonCollisions.TryGetChunkExecutionInfo(_hasher.Hash(streamId), out info);
+
+	public void DeleteMany(bool deleteArchived) {
+		_collisions.DeleteMany(deleteArchived: deleteArchived);
+		_nonCollisions.DeleteMany(deleteArchived: deleteArchived);
+	}
+
+	// overall sequence is collisions ++ noncollisions
+	public IEnumerable<(StreamHandle<TStreamId>, OriginalStreamData)> EnumerateActive(
+		StreamHandle<TStreamId> checkpoint) {
+
+		IEnumerable<KeyValuePair<TStreamId, OriginalStreamData>> collisionsEnumerable;
+		IEnumerable<KeyValuePair<ulong, OriginalStreamData>> nonCollisionsEnumerable;
+
+		switch (checkpoint.Kind) {
+			case StreamHandle.Kind.None:
+				// no checkpoint, emit everything
+				collisionsEnumerable = _collisions.ActiveRecords();
+				nonCollisionsEnumerable = _nonCollisions.ActiveRecords();
+				break;
+
+			case StreamHandle.Kind.Id:
+				// checkpointed in the collisions. emit the rest of those, then the non-collisions
+				collisionsEnumerable = _collisions.ActiveRecordsFromCheckpoint(checkpoint.StreamId);
+				nonCollisionsEnumerable = _nonCollisions.ActiveRecords();
+				break;
+
+			case StreamHandle.Kind.Hash:
+				// checkpointed in the noncollisions. emit the rest of those
+				collisionsEnumerable = Enumerable.Empty<KeyValuePair<TStreamId, OriginalStreamData>>();
+				nonCollisionsEnumerable = _nonCollisions.ActiveRecordsFromCheckpoint(checkpoint.StreamHash);
+				break;
+
+			default:
+				throw new ArgumentOutOfRangeException(nameof(checkpoint), checkpoint.Kind, null);
+		}
+
+		foreach (var kvp in collisionsEnumerable) {
+			yield return (StreamHandle.ForStreamId(kvp.Key), kvp.Value);
+		}
+
+		foreach (var kvp in nonCollisionsEnumerable) {
+			yield return (StreamHandle.ForHash<TStreamId>(kvp.Key), kvp.Value);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Data/CalculationStatus.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/CalculationStatus.cs
new file mode 100644
index 00000000000..7346d2c7729
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/CalculationStatus.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+public enum CalculationStatus {
+	// Invalid
+	None = 0,
+
+	// Needs to be processed by calculator next time
+	Active = 1,
+
+	// Can be skipped over by calculator next time
+	Archived = 2,
+
+	// Can be deleted by cleaner when there are no chunks pending execution
+	Spent = 3,
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Data/ChunkExecutionInfo.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/ChunkExecutionInfo.cs
new file mode 100644
index 00000000000..481fda7c427
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/ChunkExecutionInfo.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+// For ChunkExecutor, which implements maxAge more accurately than the index executor
+public struct ChunkExecutionInfo : IEquatable<ChunkExecutionInfo> {
+	public ChunkExecutionInfo(
+		bool isTombstoned,
+		DiscardPoint discardPoint,
+		DiscardPoint maybeDiscardPoint,
+		TimeSpan? maxAge) {
+
+		IsTombstoned = isTombstoned;
+		DiscardPoint = discardPoint;
+		MaybeDiscardPoint = maybeDiscardPoint;
+		MaxAge = maxAge;
+	}
+
+	public bool IsTombstoned { get; }
+	public DiscardPoint DiscardPoint { get; }
+	public DiscardPoint MaybeDiscardPoint { get; }
+	public TimeSpan? MaxAge { get; }
+
+	public bool Equals(ChunkExecutionInfo other) =>
+		IsTombstoned == other.IsTombstoned &&
+		DiscardPoint == other.DiscardPoint &&
+		MaybeDiscardPoint == other.MaybeDiscardPoint &&
+		MaxAge == other.MaxAge;
+
+	// avoid the default, reflection based, implementations if we ever need to call these
+	public override int GetHashCode() => throw new NotImplementedException();
+	public override bool Equals(object other) => throw new NotImplementedException();
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Data/ChunkTimeStampRange.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/ChunkTimeStampRange.cs
new file mode 100644
index 00000000000..9093ba18787
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/ChunkTimeStampRange.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+// store a range per chunk so that the calculator can definitely get a timestamp range for each event
+// that is guaranteed to contain the real timestamp of that event.
+public readonly record struct ChunkTimeStampRange(DateTime Min, DateTime Max);
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Data/CollisionResult.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/CollisionResult.cs
new file mode 100644
index 00000000000..328cc8cefdc
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/CollisionResult.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+public enum CollisionResult {
+	NoCollision,
+	NewCollision, // collided with something that was not previously in a collision
+	OldCollision, // collided with something that was already in a collision
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Data/DiscardDecision.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/DiscardDecision.cs
new file mode 100644
index 00000000000..1571d5ac8b7
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/DiscardDecision.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+public enum DiscardDecision {
+	None,
+	Discard,
+	// calculator cannot tell conclusively, depends on record timestamp that it only has
+	// approximately. chunks can tell accurately because they have the precise timestamp.
+	// index will just keep such indexentries.
+	MaybeDiscard,
+	Keep,
+	AlreadyDiscarded,
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Data/DiscardPoint.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/DiscardPoint.cs
new file mode 100644
index 00000000000..44acb3fcd49
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/DiscardPoint.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+public readonly struct DiscardPoint : IEquatable<DiscardPoint> {
+	private DiscardPoint(long firstEventNumberToKeep) {
+		if (firstEventNumberToKeep < 0)
+			firstEventNumberToKeep = 0;
+
+		FirstEventNumberToKeep = firstEventNumberToKeep;
+	}
+
+	public static DiscardPoint DiscardBefore(long eventNumber) =>
+		new DiscardPoint(eventNumber);
+
+	public static DiscardPoint DiscardIncluding(long eventNumber) {
+		if (eventNumber == long.MaxValue)
+			throw new ArgumentOutOfRangeException(
+				nameof(eventNumber),
+				eventNumber,
+				"eventNumber must be less than long.MaxValue");
+
+		return DiscardBefore(eventNumber + 1);
+	}
+
+	public static DiscardPoint KeepAll { get; } = DiscardBefore(0);
+
+	public long FirstEventNumberToKeep { get; }
+
+	// Produces a discard point that discards when this OR that discard point would discard
+	// i.e. takes the bigger of the two.
+	public DiscardPoint Or(DiscardPoint x) =>
+		FirstEventNumberToKeep > x.FirstEventNumberToKeep ? this : x;
+
+	public static bool operator <(DiscardPoint x, DiscardPoint y) =>
+		x.FirstEventNumberToKeep < y.FirstEventNumberToKeep;
+
+	public static bool operator >(DiscardPoint x, DiscardPoint y) =>
+		x.FirstEventNumberToKeep > y.FirstEventNumberToKeep;
+
+	public static bool operator <=(DiscardPoint x, DiscardPoint y) =>
+		x.FirstEventNumberToKeep <= y.FirstEventNumberToKeep;
+
+	public static bool operator >=(DiscardPoint x, DiscardPoint y) =>
+		x.FirstEventNumberToKeep >= y.FirstEventNumberToKeep;
+
+	public static bool operator ==(DiscardPoint x, DiscardPoint y) =>
+		x.FirstEventNumberToKeep == y.FirstEventNumberToKeep;
+
+	public static bool operator !=(DiscardPoint x, DiscardPoint y) =>
+		x.FirstEventNumberToKeep != y.FirstEventNumberToKeep;
+
+	public bool Equals(DiscardPoint other) => this == other;
+
+	public override bool Equals(object obj) =>
+		obj is DiscardPoint that && this == that;
+
+	public override int GetHashCode() =>
+		FirstEventNumberToKeep.GetHashCode();
+
+	public bool ShouldDiscard(long eventNumber) {
+		Ensure.Nonnegative(eventNumber, nameof(eventNumber));
+		return eventNumber < FirstEventNumberToKeep;
+	}
+
+	public override string ToString() {
+		if (this == KeepAll)
+			return "Keep all";
+		else
+			return $"Discard before {FirstEventNumberToKeep}";
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Data/IndexExecutionInfo.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/IndexExecutionInfo.cs
new file mode 100644
index 00000000000..7a34164f13a
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/IndexExecutionInfo.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+public struct IndexExecutionInfo : IEquatable<IndexExecutionInfo> {
+	public IndexExecutionInfo(
+		bool isMetastream,
+		bool isTombstoned,
+		DiscardPoint discardPoint) {
+
+		IsMetastream = isMetastream;
+		IsTombstoned = isTombstoned;
+		DiscardPoint = discardPoint;
+	}
+
+	public bool IsMetastream { get; }
+
+	/// <summary>
+	/// True when the corresponding original stream is tombstoned
+	/// </summary>
+	public bool IsTombstoned { get; }
+
+	public DiscardPoint DiscardPoint { get; }
+
+	// avoid the default, reflection based, implementations if we ever need to call these
+	public override int GetHashCode() => throw new NotImplementedException();
+	public override bool Equals(object other) => throw new NotImplementedException();
+	public bool Equals(IndexExecutionInfo other) => throw new NotImplementedException();
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Data/MetastreamData.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/MetastreamData.cs
new file mode 100644
index 00000000000..32e119c0d36
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/MetastreamData.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+public struct MetastreamData : IEquatable<MetastreamData> {
+	public static MetastreamData Empty { get; } = new MetastreamData(
+		isTombstoned: false,
+		discardPoint: DiscardPoint.KeepAll);
+
+	public MetastreamData(
+		bool isTombstoned,
+		DiscardPoint discardPoint) {
+
+		IsTombstoned = isTombstoned;
+		DiscardPoint = discardPoint;
+	}
+
+	/// <summary>
+	/// True when the corresponding original stream is tombstoned
+	/// </summary>
+	public bool IsTombstoned { get; }
+
+	public DiscardPoint DiscardPoint { get; }
+
+	public bool Equals(MetastreamData other) =>
+		IsTombstoned == other.IsTombstoned &&
+		DiscardPoint == other.DiscardPoint;
+
+	// avoid the default, reflection based, implementations if we ever need to call these
+	public override int GetHashCode() => throw new NotImplementedException();
+	public override bool Equals(object other) => throw new NotImplementedException();
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Data/OriginalStreamData.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/OriginalStreamData.cs
new file mode 100644
index 00000000000..ddc60cfbc5e
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/OriginalStreamData.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+public class OriginalStreamData {
+
+	public OriginalStreamData() {
+	}
+
+	// Populated by Accumulator and Calculator. Read by Calculator and Cleaner.
+	public CalculationStatus Status { get; set; }
+
+	// Populated by Accumulator. Read by Calculator.
+	// (MaxAge also read by ChunkExecutor)
+	public long? MaxCount { get; set; }
+	public TimeSpan? MaxAge { get; set; }
+	public long? TruncateBefore { get; set; }
+	public bool IsTombstoned { get; set; }
+
+	// Populated by Calculator. Read by Calculator and Executors.
+	public DiscardPoint DiscardPoint { get; set; }
+	public DiscardPoint MaybeDiscardPoint { get; set; }
+
+	public override string ToString() =>
+		$"Status: {Status} " +
+		$"MaxCount: {MaxCount} " +
+		$"MaxAge: {MaxAge} " +
+		$"TruncateBefore: {TruncateBefore} " +
+		$"IsTombstoned: {IsTombstoned} " +
+		$"DiscardPoint: {DiscardPoint} " +
+		$"MaybeDiscardPoint: {MaybeDiscardPoint} " +
+		"";
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Data/RecordForExecutor.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/RecordForExecutor.cs
new file mode 100644
index 00000000000..5d1ce5f4827
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/RecordForExecutor.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+// this abstracts the actual log records from the chunk execution logic
+// TRecord is currently used as a LogRecord but in the future could just be bytes
+public abstract class RecordForExecutor<TStreamId, TRecord> {
+	public int Length { get; private set; }
+	public TRecord Record { get; private set; }
+
+	public class Prepare : RecordForExecutor<TStreamId, TRecord> {
+		public void SetRecord(
+			int length,
+			long logPosition,
+			TRecord record,
+			DateTime timeStamp,
+			TStreamId streamId,
+			bool isSelfCommitted,
+			bool isTombstone,
+			bool isTransactionBegin,
+			long eventNumber) {
+
+			Length = length;
+			LogPosition = logPosition;
+			Record = record;
+			TimeStamp = timeStamp;
+			StreamId = streamId;
+			IsSelfCommitted = isSelfCommitted;
+			IsTombstone = isTombstone;
+			IsTransactionBegin = isTransactionBegin;
+			EventNumber = eventNumber;
+		}
+
+		public long LogPosition { get; private set; }
+		public DateTime TimeStamp { get; private set; }
+		public TStreamId StreamId { get; private set; }
+		public bool IsSelfCommitted { get; private set; }
+		public bool IsTombstone { get; private set; }
+		public bool IsTransactionBegin { get; private set; }
+		public long EventNumber { get; private set; }
+	}
+
+	public class NonPrepare : RecordForExecutor<TStreamId, TRecord> {
+		public void SetRecord(
+			int length,
+			TRecord record) {
+
+			Length = length;
+			Record = record;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Data/ScavengeCheckpoint.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/ScavengeCheckpoint.cs
new file mode 100644
index 00000000000..0841a95c625
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/ScavengeCheckpoint.cs
@@ -0,0 +1,94 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+// The checkpoint stores which scavengepoint we are processing and where we are up to with it.
+
+public abstract class ScavengeCheckpoint {
+	protected ScavengeCheckpoint(ScavengePoint scavengePoint) {
+		ScavengePoint = scavengePoint;
+	}
+
+	public ScavengePoint ScavengePoint { get; }
+
+	public class Accumulating : ScavengeCheckpoint {
+		// Accumulating with null doneLogicalChunkNumber means we are accumulating now but havent
+		// accumulated anything.
+		public Accumulating(ScavengePoint scavengePoint, int? doneLogicalChunkNumber)
+			: base(scavengePoint) {
+			DoneLogicalChunkNumber = doneLogicalChunkNumber;
+		}
+
+		public int? DoneLogicalChunkNumber { get; }
+
+		public override string ToString() =>
+			$"Accumulating {ScavengePoint.GetName()} done " +
+				(DoneLogicalChunkNumber.HasValue
+					? $"Chunk {DoneLogicalChunkNumber}"
+					: "None");
+	}
+
+	public class Calculating<TStreamId> : ScavengeCheckpoint {
+		public Calculating(ScavengePoint scavengePoint, StreamHandle<TStreamId> doneStreamHandle)
+			: base(scavengePoint) {
+			DoneStreamHandle = doneStreamHandle;
+		}
+
+		public StreamHandle<TStreamId> DoneStreamHandle { get; }
+
+		public override string ToString() =>
+			$"Calculating {ScavengePoint.GetName()} done {DoneStreamHandle}";
+	}
+
+	public class ExecutingChunks : ScavengeCheckpoint {
+		public int? DoneLogicalChunkNumber { get; }
+
+		public ExecutingChunks(ScavengePoint scavengePoint, int? doneLogicalChunkNumber)
+			: base(scavengePoint) {
+			DoneLogicalChunkNumber = doneLogicalChunkNumber;
+		}
+
+		public override string ToString() =>
+			$"Executing chunks for {ScavengePoint.GetName()} done " +
+				(DoneLogicalChunkNumber.HasValue
+					? $"Chunk {DoneLogicalChunkNumber}"
+					: "None");
+	}
+
+	public class ExecutingIndex : ScavengeCheckpoint {
+		public ExecutingIndex(ScavengePoint scavengePoint)
+			: base(scavengePoint) {
+		}
+
+		public override string ToString() =>
+			$"Executing index for {ScavengePoint.GetName()}";
+	}
+
+	public class MergingChunks : ScavengeCheckpoint {
+		public MergingChunks(ScavengePoint scavengePoint)
+			: base(scavengePoint) {
+		}
+
+		public override string ToString() =>
+			$"Merging chunks for {ScavengePoint.GetName()}";
+	}
+
+	public class Cleaning : ScavengeCheckpoint {
+		public Cleaning(ScavengePoint scavengePoint)
+			: base(scavengePoint) {
+		}
+
+		public override string ToString() =>
+			$"Cleaning for {ScavengePoint.GetName()}";
+	}
+
+	public class Done : ScavengeCheckpoint {
+		public Done(ScavengePoint scavengePoint)
+			: base(scavengePoint) {
+		}
+
+		public override string ToString() =>
+			$"Done {ScavengePoint.GetName()}";
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Data/ScavengePoint.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/ScavengePoint.cs
new file mode 100644
index 00000000000..f4dc98e1f1b
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/ScavengePoint.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+public class ScavengePoint {
+	public ScavengePoint(long position, long eventNumber, DateTime effectiveNow, int threshold) {
+		Position = position;
+		EventNumber = eventNumber;
+		EffectiveNow = effectiveNow;
+		Threshold = threshold;
+	}
+
+	// the position to scavenge up to (exclusive)
+	public long Position { get; }
+
+	public long EventNumber { get; }
+
+	public DateTime EffectiveNow { get; }
+
+	// The minimum a physical chunk must weigh before we will execute it.
+	// Stored in the scavenge point so that (later) we could specify the threshold when
+	// running the scavenge, and have it affect that scavenge on all of the nodes.
+	public int Threshold { get; }
+
+	public string GetName() => $"SP-{EventNumber}";
+
+	public override string ToString() =>
+		$"{GetName()}. Position: {Position:N0}, EffectiveNow: {EffectiveNow}, Threshold: {Threshold}.";
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Data/ScavengePointPayload.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/ScavengePointPayload.cs
new file mode 100644
index 00000000000..b16155a4286
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/ScavengePointPayload.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+// These are stored in the data of the payload record
+public class ScavengePointPayload {
+	public int Threshold { get; set; }
+
+	public byte[] ToJsonBytes() =>
+		Json.ToJsonBytes(this);
+
+	public static ScavengePointPayload FromBytes(ReadOnlyMemory<byte> bytes) =>
+		Json.ParseJson<ScavengePointPayload>(bytes);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Data/StreamHandle.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/StreamHandle.cs
new file mode 100644
index 00000000000..7b55a1b80a0
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/StreamHandle.cs
@@ -0,0 +1,71 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+// Refers to a stream by name or by hash
+// This struct is json serialized, don't change the names naively
+// todo: consider making this not stream specific
+public struct StreamHandle {
+	public enum Kind : byte {
+		None,
+		Hash,
+		Id,
+	};
+
+	public static StreamHandle<TStreamId> ForHash<TStreamId>(ulong streamHash) {
+		return new StreamHandle<TStreamId>(kind: Kind.Hash, default, streamHash);
+	}
+
+	public static StreamHandle<TStreamId> ForStreamId<TStreamId>(TStreamId streamId) {
+		return new StreamHandle<TStreamId>(kind: Kind.Id, streamId, default);
+	}
+}
+
+// Refers to a stream by name or by hash
+// this unifies the entries, some just have the hash (when we know they do not collide)
+// some contain the full stream id (when they do collide)
+public readonly struct StreamHandle<TStreamId> : IEquatable<StreamHandle<TStreamId>> {
+	private static EqualityComparer<TStreamId> StreamIdComparer { get; } = EqualityComparer<TStreamId>.Default;
+
+	public readonly StreamHandle.Kind Kind;
+	public readonly TStreamId StreamId;
+	public readonly ulong StreamHash;
+
+	public StreamHandle(StreamHandle.Kind kind, TStreamId streamId, ulong streamHash) {
+		Kind = kind;
+		StreamId = streamId;
+		StreamHash = streamHash;
+	}
+
+	public override string ToString() {
+		switch (Kind) {
+			case StreamHandle.Kind.Hash:
+				return $"Hash: {StreamHash:N0}";
+			case StreamHandle.Kind.Id:
+				return $"Id: {StreamId}";
+			case StreamHandle.Kind.None:
+			default:
+				return $"None";
+		}
+	}
+
+	public override bool Equals(object other) {
+		if (other == null)
+			return false;
+		if (!(other is StreamHandle<TStreamId> x))
+			return false;
+		return Equals(x);
+	}
+
+	public bool Equals(StreamHandle<TStreamId> other) =>
+		Kind == other.Kind &&
+		StreamIdComparer.Equals(StreamId, other.StreamId) &&
+		StreamHash == other.StreamHash;
+
+	// avoid the default, reflection based, implementations if we ever need to call these
+	public override int GetHashCode() => throw new NotImplementedException();
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Data/Unit.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/Unit.cs
new file mode 100644
index 00000000000..4615ec4546b
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Data/Unit.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+public struct Unit : IEquatable<Unit> {
+	public static readonly Unit Instance = new Unit();
+
+	public override int GetHashCode() => 1;
+	public override bool Equals(object other) => other is Unit;
+	public bool Equals(Unit other) => true;
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ChunkManagerForChunkRemover.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ChunkManagerForChunkRemover.cs
new file mode 100644
index 00000000000..6dd14b1cf49
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ChunkManagerForChunkRemover.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.DbAccess;
+
+public class ChunkManagerForChunkRemover : IChunkManagerForChunkRemover {
+	private readonly TFChunkManager _manager;
+
+	public ChunkManagerForChunkRemover(TFChunkManager manager) {
+		_manager = manager;
+	}
+
+	public ValueTask<bool> SwitchInChunks(IReadOnlyList<string> locators, CancellationToken token) =>
+		_manager.SwitchInCompletedChunks(locators, token);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ChunkManagerForExecutor.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ChunkManagerForExecutor.cs
new file mode 100644
index 00000000000..1b87758ee61
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ChunkManagerForExecutor.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using KurrentDB.Core.Transforms;
+using Serilog;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.DbAccess;
+
+public class ChunkManagerForExecutor<TStreamId> : IChunkManagerForChunkExecutor<TStreamId, ILogRecord> {
+	private readonly ILogger _logger;
+	private readonly TFChunkManager _manager;
+	private readonly TFChunkDbConfig _dbConfig;
+	private readonly DbTransformManager _transformManager;
+
+	public ChunkManagerForExecutor(ILogger logger, TFChunkManager manager, TFChunkDbConfig dbConfig, DbTransformManager transformManager) {
+		_logger = logger;
+		_manager = manager;
+		_dbConfig = dbConfig;
+		_transformManager = transformManager;
+	}
+
+	public IChunkFileSystem FileSystem => _manager.FileSystem;
+
+	public async ValueTask<IChunkWriterForExecutor<TStreamId, ILogRecord>> CreateChunkWriter(
+		IChunkReaderForExecutor<TStreamId, ILogRecord> sourceChunk,
+		CancellationToken token)
+		=> await ChunkWriterForExecutor<TStreamId>.CreateAsync(_logger, this, _dbConfig, sourceChunk,
+			_transformManager, token);
+
+	public async ValueTask<IChunkReaderForExecutor<TStreamId, ILogRecord>> GetChunkReaderFor(long position, CancellationToken token) {
+		var tfChunk = await _manager.GetInitializedChunkFor(position, token);
+		return new ChunkReaderForExecutor<TStreamId>(tfChunk);
+	}
+
+	public async ValueTask<string> SwitchInTempChunk(
+		TFChunk chunk,
+		CancellationToken token) {
+
+		var tfChunk = await _manager.SwitchInTempChunk(
+			chunk: chunk,
+			verifyHash: false,
+			removeChunksWithGreaterNumbers: false,
+			token);
+
+		if (tfChunk is null) {
+			throw new Exception("Unexpected error: new chunk is null after switch");
+		}
+
+		return tfChunk.ChunkLocator;
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ChunkReaderForAccumulator.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ChunkReaderForAccumulator.cs
new file mode 100644
index 00000000000..5912ce62797
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ChunkReaderForAccumulator.cs
@@ -0,0 +1,127 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using KurrentDB.LogCommon;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.DbAccess;
+
+public class ChunkReaderForAccumulator<TStreamId> : IChunkReaderForAccumulator<TStreamId> {
+	private readonly TFChunkManager _manager;
+	private readonly IMetastreamLookup<TStreamId> _metaStreamLookup;
+	private readonly IStreamIdConverter<TStreamId> _streamIdConverter;
+	private readonly IReadOnlyCheckpoint _replicationChk;
+	private readonly int _chunkSize;
+
+	private readonly Func<int, byte[]> _getBuffer;
+	private readonly Action _releaseBuffer;
+
+	public ChunkReaderForAccumulator(
+		TFChunkManager manager,
+		IMetastreamLookup<TStreamId> metastreamLookup,
+		IStreamIdConverter<TStreamId> streamIdConverter,
+		IReadOnlyCheckpoint replicationChk,
+		int chunkSize) {
+
+		_manager = manager;
+		_metaStreamLookup = metastreamLookup;
+		_streamIdConverter = streamIdConverter;
+		_replicationChk = replicationChk;
+		_chunkSize = chunkSize;
+
+		var reusableRecordBuffer = new ReusableBuffer(8192);
+		_getBuffer = size => reusableRecordBuffer.AcquireAsByteArray(size);
+		_releaseBuffer = () => reusableRecordBuffer.Release();
+	}
+
+	public async IAsyncEnumerable<AccumulatorRecordType> ReadChunkInto(
+		int logicalChunkNumber,
+		RecordForAccumulator<TStreamId>.OriginalStreamRecord originalStreamRecord,
+		RecordForAccumulator<TStreamId>.MetadataStreamRecord metadataStreamRecord,
+		RecordForAccumulator<TStreamId>.TombStoneRecord tombStoneRecord,
+		[EnumeratorCancellation] CancellationToken token) {
+
+		// the physical chunk might contain several logical chunks, we are only interested in one of them
+		var chunk = await _manager.GetInitializedChunk(logicalChunkNumber, token);
+		long chunkStartPos = (long)_chunkSize * logicalChunkNumber;
+		long chunkEndPos = (long)_chunkSize * (logicalChunkNumber + 1);
+		long nextPos = chunkStartPos;
+
+		var replicationChk = _replicationChk.ReadNonFlushed();
+
+		while (true) {
+			if (nextPos >= chunkEndPos) // reached the end of this logical chunk
+				break;
+
+			if (nextPos >= replicationChk)
+				throw new InvalidOperationException(
+					$"Attempt to read at position: {nextPos} which is after the " +
+					$"replication checkpoint: {replicationChk}.");
+
+			var localPos = chunk.ChunkHeader.GetLocalLogPosition(nextPos);
+
+			var result = await chunk.TryReadClosestForwardRaw(localPos, _getBuffer, token);
+
+			if (!result.Success) {
+				// there is no need to release the reusable buffer here since result.Success is false
+				// when attempting to read outside the bounds of a chunk and thus, the buffer will not
+				// have been acquired. in other words, whenever the buffer is acquired, either result.Success
+				// is true or an exception is thrown.
+				break;
+			}
+
+			switch (result.RecordType) {
+				case LogRecordType.Prepare:
+					var prepareView = new PrepareLogRecordView(result.RecordBuffer, result.RecordLength);
+					var streamId = _streamIdConverter.ToStreamId(prepareView.EventStreamId);
+
+					if (prepareView.Flags.HasAnyOf(PrepareFlags.StreamDelete)) {
+						tombStoneRecord.Reset(
+							streamId,
+							prepareView.LogPosition,
+							prepareView.TimeStamp,
+							prepareView.ExpectedVersion + 1);
+						yield return AccumulatorRecordType.TombstoneRecord;
+
+					} else if (_metaStreamLookup.IsMetaStream(streamId)) {
+						metadataStreamRecord.Reset(
+							streamId,
+							prepareView.LogPosition,
+							prepareView.TimeStamp,
+							prepareView.ExpectedVersion + 1,
+							StreamMetadata.TryFromJsonBytes(prepareView.Version, prepareView.Data));
+						yield return AccumulatorRecordType.MetadataStreamRecord;
+
+					} else {
+						originalStreamRecord.Reset(
+							streamId,
+							prepareView.LogPosition,
+							prepareView.TimeStamp);
+						yield return AccumulatorRecordType.OriginalStreamRecord;
+					}
+
+					break;
+				case LogRecordType.Commit:
+					break;
+				case LogRecordType.System:
+					break;
+				default:
+					throw new ArgumentOutOfRangeException(nameof(result.RecordType),
+						$"Unexpected log record type: {result.RecordType}");
+			}
+
+			nextPos = chunk.ChunkHeader.GetGlobalLogPosition(result.NextPosition);
+			_releaseBuffer();
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ChunkReaderForExecutor.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ChunkReaderForExecutor.cs
new file mode 100644
index 00000000000..3844ac4ceaf
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ChunkReaderForExecutor.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using KurrentDB.LogCommon;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.DbAccess;
+
+public class ChunkReaderForExecutor<TStreamId> : IChunkReaderForExecutor<TStreamId, ILogRecord> {
+	private readonly TFChunk _chunk;
+
+	public ChunkReaderForExecutor(TFChunk chunk) {
+		_chunk = chunk;
+	}
+
+	public string Name => _chunk.ToString();
+
+	public int FileSize => _chunk.FileSize;
+
+	public int ChunkStartNumber => _chunk.ChunkHeader.ChunkStartNumber;
+
+	public int ChunkEndNumber => _chunk.ChunkHeader.ChunkEndNumber;
+
+	public bool IsReadOnly => _chunk.IsReadOnly;
+
+	public bool IsRemote => _chunk.IsRemote;
+
+	public long ChunkStartPosition => _chunk.ChunkHeader.ChunkStartPosition;
+
+	public long ChunkEndPosition => _chunk.ChunkHeader.ChunkEndPosition;
+
+	// similar to TFChunkScavenger.TraverseChunkBasic
+	public async IAsyncEnumerable<bool> ReadInto(
+		RecordForExecutor<TStreamId, ILogRecord>.NonPrepare nonPrepare,
+		RecordForExecutor<TStreamId, ILogRecord>.Prepare prepare,
+		[EnumeratorCancellation] CancellationToken token) {
+
+		var result = await _chunk.TryReadFirst(token);
+		while (result.Success) {
+			var record = result.LogRecord;
+			if (record.RecordType != LogRecordType.Prepare) {
+				nonPrepare.SetRecord(result.RecordLength, record);
+				yield return false;
+			} else {
+				var sourcePrepare = record as IPrepareLogRecord<TStreamId>;
+				prepare.SetRecord(
+					length: result.RecordLength,
+					logPosition: record.LogPosition,
+					record: record,
+					timeStamp: sourcePrepare.TimeStamp,
+					streamId: sourcePrepare.EventStreamId,
+					isSelfCommitted: sourcePrepare.Flags.HasAnyOf(PrepareFlags.IsCommitted),
+					isTombstone: sourcePrepare.Flags.HasAnyOf(PrepareFlags.StreamDelete),
+					isTransactionBegin: sourcePrepare.Flags.HasAnyOf(PrepareFlags.TransactionBegin),
+					eventNumber: sourcePrepare.ExpectedVersion + 1);
+				yield return true;
+			}
+
+			result = await _chunk.TryReadClosestForward(result.NextPosition, token);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ChunkReaderForIndexExecutor.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ChunkReaderForIndexExecutor.cs
new file mode 100644
index 00000000000..d217fb6b924
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ChunkReaderForIndexExecutor.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.DbAccess;
+
+public class ChunkReaderForIndexExecutor<TStreamId> : IChunkReaderForIndexExecutor<TStreamId> {
+	private readonly Func<TFReaderLease> _tfReaderFactory;
+
+	public ChunkReaderForIndexExecutor(Func<TFReaderLease> tfReaderFactory) {
+		_tfReaderFactory = tfReaderFactory;
+	}
+
+	public async ValueTask<Optional<TStreamId>> TryGetStreamId(long position, CancellationToken token) {
+		using var reader = _tfReaderFactory();
+		var result = await reader.TryReadAt(position, couldBeScavenged: true, token);
+		if (!result.Success) {
+			return Optional.None<TStreamId>();
+		}
+
+		if (result.LogRecord is not IPrepareLogRecord<TStreamId> prepare)
+			throw new Exception($"Record in index at position {position} is not a prepare");
+
+		return prepare.EventStreamId;
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ChunkWriterForExecutor.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ChunkWriterForExecutor.cs
new file mode 100644
index 00000000000..cdf5223c697
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ChunkWriterForExecutor.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using KurrentDB.Core.Transforms;
+using Serilog;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.DbAccess;
+
+public class ChunkWriterForExecutor<TStreamId> : IChunkWriterForExecutor<TStreamId, ILogRecord> {
+	private readonly ILogger _logger;
+	private readonly ChunkManagerForExecutor<TStreamId> _manager;
+	private readonly TFChunk _outputChunk;
+	private readonly ScavengedChunkWriter _scavengedChunkWriter;
+
+	private ChunkWriterForExecutor(
+		ILogger logger,
+		ChunkManagerForExecutor<TStreamId> manager,
+		TFChunk outputChunk) {
+
+		_logger = logger;
+		_manager = manager;
+		_outputChunk = outputChunk;
+		_scavengedChunkWriter = new ScavengedChunkWriter(outputChunk);
+	}
+
+	public static async ValueTask<ChunkWriterForExecutor<TStreamId>> CreateAsync(
+		ILogger logger,
+		ChunkManagerForExecutor<TStreamId> manager,
+		TFChunkDbConfig dbConfig,
+		IChunkReaderForExecutor<TStreamId, ILogRecord> sourceChunk,
+		DbTransformManager transformManager,
+		CancellationToken token) {
+
+		// from TFChunkScavenger.ScavengeChunk
+		var chunk = await TFChunk.CreateNew(
+			manager.FileSystem,
+			filename: Path.Combine(dbConfig.Path, Guid.NewGuid() + ".scavenge.tmp"),
+			chunkDataSize: dbConfig.ChunkSize,
+			chunkStartNumber: sourceChunk.ChunkStartNumber,
+			chunkEndNumber: sourceChunk.ChunkEndNumber,
+			isScavenged: true,
+			inMem: dbConfig.InMemDb,
+			unbuffered: dbConfig.Unbuffered,
+			writethrough: dbConfig.WriteThrough,
+			reduceFileCachePressure: dbConfig.ReduceFileCachePressure,
+			tracker: new TFChunkTracker.NoOp(),
+			getTransformFactory: transformManager,
+			token);
+
+		return new(logger, manager, chunk);
+	}
+
+	public string LocalFileName => _outputChunk.LocalFileName;
+
+	public ValueTask WriteRecord(RecordForExecutor<TStreamId, ILogRecord> record, CancellationToken token) =>
+		_scavengedChunkWriter.WriteRecord(record.Record, token);
+
+	public async ValueTask<(string NewFileName, long NewFileSize)> Complete(CancellationToken token) {
+		await _scavengedChunkWriter.Complete(token);
+
+		var newFileName = await _manager.SwitchInTempChunk(chunk: _outputChunk, token);
+		return (newFileName, _outputChunk.FileSize);
+	}
+
+	// tbh not sure why this distinction is important
+	public void Abort(bool deleteImmediately) {
+		if (deleteImmediately) {
+			_outputChunk.Dispose();
+			TFChunkScavenger<TStreamId>.DeleteTempChunk(_logger, LocalFileName, TFChunkScavenger.MaxRetryCount);
+		} else {
+			_outputChunk.MarkForDeletion();
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/IndexReaderForAccumulator.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/IndexReaderForAccumulator.cs
new file mode 100644
index 00000000000..9dc4d73d5b3
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/IndexReaderForAccumulator.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.DbAccess;
+
+public class IndexReaderForAccumulator<TStreamId> : IIndexReaderForAccumulator<TStreamId> {
+	private readonly IReadIndex<TStreamId> _readIndex;
+
+	public IndexReaderForAccumulator(IReadIndex<TStreamId> readIndex) {
+		_readIndex = readIndex;
+	}
+
+	// reads a stream forward but only returns event info not the full event.
+	public ValueTask<IndexReadEventInfoResult> ReadEventInfoForward(
+		StreamHandle<TStreamId> handle,
+		long fromEventNumber,
+		int maxCount,
+		ScavengePoint scavengePoint,
+		CancellationToken token) {
+
+		switch (handle.Kind) {
+			case StreamHandle.Kind.Hash:
+				// uses the index only
+				return _readIndex.ReadEventInfoForward_NoCollisions(
+					handle.StreamHash,
+					fromEventNumber,
+					maxCount,
+					scavengePoint.Position,
+					token);
+			case StreamHandle.Kind.Id:
+				// uses log to check for hash collisions
+				return _readIndex.ReadEventInfoForward_KnownCollisions(
+					handle.StreamId,
+					fromEventNumber,
+					maxCount,
+					scavengePoint.Position,
+					token);
+			default:
+				return ValueTask.FromException<IndexReadEventInfoResult>(new ArgumentOutOfRangeException(nameof(handle), handle, null));
+		}
+	}
+
+	// reads a stream backward but only returns event info not the full event.
+	public ValueTask<IndexReadEventInfoResult> ReadEventInfoBackward(
+		TStreamId streamId,
+		StreamHandle<TStreamId> handle,
+		long fromEventNumber,
+		int maxCount,
+		ScavengePoint scavengePoint,
+		CancellationToken token) {
+
+		switch (handle.Kind) {
+			case StreamHandle.Kind.Hash:
+				// uses the index only
+				return _readIndex.ReadEventInfoBackward_NoCollisions(
+					handle.StreamHash,
+					_ => streamId,
+					fromEventNumber,
+					maxCount,
+					scavengePoint.Position,
+					token);
+			case StreamHandle.Kind.Id:
+				// uses log to check for hash collisions
+				return _readIndex.ReadEventInfoBackward_KnownCollisions(
+					handle.StreamId,
+					fromEventNumber,
+					maxCount,
+					scavengePoint.Position,
+					token);
+			default:
+				return ValueTask.FromException<IndexReadEventInfoResult>(new ArgumentOutOfRangeException(nameof(handle), handle, null));
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/IndexReaderForCalculator.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/IndexReaderForCalculator.cs
new file mode 100644
index 00000000000..5c56ebec0bd
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/IndexReaderForCalculator.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.DbAccess;
+
+public class IndexReaderForCalculator<TStreamId> : IIndexReaderForCalculator<TStreamId> {
+	private readonly IReadIndex<TStreamId> _readIndex;
+	private readonly Func<TFReaderLease> _tfReaderFactory;
+	private readonly Func<ulong, TStreamId> _lookupUniqueHashUser;
+
+	public IndexReaderForCalculator(
+		IReadIndex<TStreamId> readIndex,
+		Func<TFReaderLease> tfReaderFactory,
+		Func<ulong, TStreamId> lookupUniqueHashUser) {
+
+		_readIndex = readIndex;
+		_tfReaderFactory = tfReaderFactory;
+		_lookupUniqueHashUser = lookupUniqueHashUser;
+	}
+
+	public ValueTask<long> GetLastEventNumber(
+		StreamHandle<TStreamId> handle,
+		ScavengePoint scavengePoint,
+		CancellationToken token) {
+
+		return handle.Kind switch {
+			StreamHandle.Kind.Hash =>
+				// tries as far as possible to use the index without consulting the log to fetch the last event number
+				_readIndex.GetStreamLastEventNumber_NoCollisions(handle.StreamHash, _lookupUniqueHashUser,
+					scavengePoint.Position, token),
+			StreamHandle.Kind.Id =>
+				// uses the index and the log to fetch the last event number
+				_readIndex.GetStreamLastEventNumber_KnownCollisions(handle.StreamId, scavengePoint.Position, token),
+			_ => ValueTask.FromException<long>(new ArgumentOutOfRangeException(nameof(handle), handle, null))
+		};
+	}
+
+	public ValueTask<IndexReadEventInfoResult> ReadEventInfoForward(
+		StreamHandle<TStreamId> handle,
+		long fromEventNumber,
+		int maxCount,
+		ScavengePoint scavengePoint,
+		CancellationToken token) {
+
+		return handle.Kind switch {
+			StreamHandle.Kind.Hash =>
+				// uses the index only
+				_readIndex.ReadEventInfoForward_NoCollisions(handle.StreamHash, fromEventNumber, maxCount,
+					scavengePoint.Position, token),
+			StreamHandle.Kind.Id =>
+				// uses log to check for hash collisions
+				_readIndex.ReadEventInfoForward_KnownCollisions(handle.StreamId, fromEventNumber, maxCount,
+					scavengePoint.Position, token),
+			_ => ValueTask.FromException<IndexReadEventInfoResult>(
+				new ArgumentOutOfRangeException(nameof(handle), handle, null))
+		};
+	}
+
+	public async ValueTask<bool> IsTombstone(long logPosition, CancellationToken token) {
+		using var reader = _tfReaderFactory();
+		var result = await reader.TryReadAt(logPosition, couldBeScavenged: true, token);
+
+		if (!result.Success)
+			return false;
+
+		if (result.LogRecord is not IPrepareLogRecord prepare)
+			throw new Exception(
+				$"Incorrect type of log record {result.LogRecord.RecordType}, " +
+				$"expected Prepare record.");
+
+		return prepare.Flags.HasAnyOf(PrepareFlags.StreamDelete);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/IndexScavenger.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/IndexScavenger.cs
new file mode 100644
index 00000000000..f83ffbebd23
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/IndexScavenger.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.DbAccess;
+
+public class IndexScavenger : IIndexScavenger {
+	private readonly ITableIndex _tableIndex;
+
+	public IndexScavenger(ITableIndex tableIndex) {
+		_tableIndex = tableIndex;
+	}
+
+	public ValueTask ScavengeIndex(
+		long scavengePoint,
+		Func<IndexEntry, CancellationToken, ValueTask<bool>> shouldKeep,
+		IIndexScavengerLog log,
+		CancellationToken cancellationToken) {
+
+		return _tableIndex.Scavenge(shouldKeep, log, cancellationToken);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/OldScavengeChunkMergerBackend.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/OldScavengeChunkMergerBackend.cs
new file mode 100644
index 00000000000..af908937864
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/OldScavengeChunkMergerBackend.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Serilog;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.DbAccess;
+
+public class OldScavengeChunkMergerBackend : IChunkMergerBackend {
+	private readonly ILogger _logger;
+	private readonly TFChunkDb _db;
+
+	public OldScavengeChunkMergerBackend(ILogger logger, TFChunkDb db) {
+		_logger = logger;
+		_db = db;
+	}
+
+	public ValueTask MergeChunks(
+		ITFChunkScavengerLog scavengerLogger,
+		Throttle throttle,
+		CancellationToken cancellationToken) {
+
+		// todo: if time permits we could look in more detail at this implementation and see if it
+		// could be improved or replaced.
+		// todo: if time permits we could stop after the chunk with the scavenge point
+		// todo: if time permits we could start with the minimum executed chunk this scavenge
+		// todo: if time permits we could add some way of checkpointing during the merges
+		// todo: move MergePhase to non-generic TFChunkScavenger
+		return TFChunkScavenger<string>.MergePhase(
+			logger: _logger,
+			db: _db,
+			maxChunkDataSize: _db.Config.ChunkSize,
+			scavengerLog: scavengerLogger,
+			throttle: throttle,
+			ct: cancellationToken);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ScavengePointSource.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ScavengePointSource.cs
new file mode 100644
index 00000000000..1554c56324f
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ScavengePointSource.cs
@@ -0,0 +1,158 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Serilog;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.DbAccess;
+
+public class ScavengePointSource : IScavengePointSource {
+	private readonly ILogger _logger;
+	private readonly IODispatcher _ioDispatcher;
+
+	public ScavengePointSource(ILogger logger, IODispatcher ioDispatcher) {
+		_logger = logger;
+		_ioDispatcher = ioDispatcher;
+	}
+
+	public async Task<ScavengePoint> GetLatestScavengePointOrDefaultAsync(
+		CancellationToken cancellationToken) {
+
+		_logger.Information("SCAVENGING: Getting latest scavenge point...");
+
+		var readTcs = new TaskCompletionSource<IReadOnlyList<ResolvedEvent>>(
+			TaskCreationOptions.RunContinuationsAsynchronously);
+		var endStreamPosition = -1;
+
+		_ioDispatcher.ReadBackward(
+			streamId: SystemStreams.ScavengePointsStream,
+			fromEventNumber: endStreamPosition,
+			maxCount: 1,
+			resolveLinks: false,
+			principal: SystemAccounts.System,
+			action: m => {
+				if (m.Result == ReadStreamResult.Success)
+					readTcs.TrySetResult(m.Events);
+				else if (m.Result == ReadStreamResult.NoStream)
+					readTcs.TrySetResult(Array.Empty<ResolvedEvent>());
+				else {
+					readTcs.TrySetException(new Exception(
+						$"Failed to get latest scavenge point: {m.Result}. {m.Error}"));
+				}
+			},
+			timeoutAction: () => {
+				readTcs.TrySetException(new Exception(
+					"Failed to get latest scavenge point: read timed out"));
+			},
+			corrId: Guid.NewGuid());
+
+		IReadOnlyList<ResolvedEvent> events;
+		using (cancellationToken.Register(() => readTcs.TrySetCanceled())) {
+			events = await readTcs.Task;
+		}
+
+		if (events is []) {
+			_logger.Information("SCAVENGING: No scavenge points exist");
+			return default;
+		} else if (events.Count is not 1) {
+			throw new Exception($"Expected 1 event but got {events.Count}");
+		}
+
+		var scavengePointEvent = events[0].Event;
+
+		if (scavengePointEvent.EventType != SystemEventTypes.ScavengePoint)
+			throw new Exception($"Last event in {SystemStreams.ScavengePointsStream} is not a scavenge point.");
+
+		var scavengePointPayload = ScavengePointPayload.FromBytes(scavengePointEvent.Data);
+
+		var scavengePoint = new ScavengePoint(
+			position: scavengePointEvent.LogPosition,
+			eventNumber: scavengePointEvent.EventNumber,
+			effectiveNow: scavengePointEvent.TimeStamp,
+			threshold: scavengePointPayload.Threshold);
+
+		_logger.Information("SCAVENGING: Latest scavenge point found is {scavengePoint}", scavengePoint);
+		return scavengePoint;
+	}
+
+	public async Task<ScavengePoint> AddScavengePointAsync(
+		long expectedVersion,
+		int threshold,
+		CancellationToken cancellationToken) {
+
+		_logger.Information("SCAVENGING: Adding new scavenge point #{eventNumber} with threshold {threshold}...",
+			expectedVersion + 1, threshold);
+
+		var payload = new ScavengePointPayload {
+			Threshold = threshold,
+		};
+
+		var writeTcs = new TaskCompletionSource<bool>(
+			TaskCreationOptions.RunContinuationsAsynchronously);
+		_ioDispatcher.WriteEvent(
+			streamId: SystemStreams.ScavengePointsStream,
+			expectedVersion: expectedVersion,
+			@event: new Event(
+				eventId: Guid.NewGuid(),
+				eventType: SystemEventTypes.ScavengePoint,
+				isJson: true,
+				data: payload.ToJsonBytes(),
+				metadata: null),
+			principal: SystemAccounts.System,
+			action: m => {
+				if (m.Result == OperationResult.Success) {
+					writeTcs.TrySetResult(true);
+				} else {
+					writeTcs.TrySetException(new Exception(
+						$"Failed to add new scavenge point: {m.Result}"));
+				}
+			}
+		);
+
+		try {
+			await writeTcs.Task.WaitAsync(TimeSpan.FromSeconds(5), cancellationToken);
+		} catch (TimeoutException ex) {
+			throw new TimeoutException("Timed out while trying to write a scavenge point", ex);
+		}
+
+		_logger.Information("SCAVENGING: Added new scavenge point.");
+
+		// initial chance to replicate (handy if we are follower)
+		await Task.Delay(500, cancellationToken);
+
+		const int MaxAttempts = 30;
+		var attempt = 0;
+		while (true) {
+			var scavengePoint = await GetLatestScavengePointOrDefaultAsync(cancellationToken);
+
+			// success
+			if (scavengePoint.EventNumber == expectedVersion + 1)
+				return scavengePoint;
+
+			// give up
+			if (++attempt > MaxAttempts)
+				throw new Exception(
+					$"Unable to read back new scavenge point {expectedVersion + 1}. " +
+					$"This node is most likely significantly behind the leader. " +
+					$"Allow it to catch up and then try again. ");
+
+			// retry
+			_logger.Information(
+				"SCAVENGING: Did not read new scavenge point. " +
+				"Found {actual} but expected {expected}. Retrying {attempt}/{maxAttempts}...",
+				scavengePoint.EventNumber, expectedVersion + 1, attempt, MaxAttempts);
+
+			await Task.Delay(1000, cancellationToken);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ScavengedChunkWriter.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ScavengedChunkWriter.cs
new file mode 100644
index 00000000000..e5634e15737
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/DbAccess/ScavengedChunkWriter.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.LogRecords;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.DbAccess;
+
+public class ScavengedChunkWriter {
+	const int BatchLength = 2000;
+	private readonly List<List<PosMap>> _posMapss;
+	private int _lastFlushedPage = -1;
+	private readonly TFChunk _outputChunk;
+
+	public ScavengedChunkWriter(TFChunk outputChunk) {
+		_outputChunk = outputChunk;
+
+		// list of lists to avoid having an enormous list which could make it to the LoH
+		// and to avoid expensive resize operations on large lists
+		_posMapss = new List<List<PosMap>>(capacity: BatchLength) {
+			new(capacity: BatchLength)
+		};
+	}
+
+	public async ValueTask WriteRecord(ILogRecord record, CancellationToken token) {
+		var posMap = await TFChunkScavenger.WriteRecord(_outputChunk, record, token);
+
+		// add the posmap in memory so we can write it when we complete
+		var lastBatch = _posMapss[^1];
+		if (lastBatch.Count >= BatchLength) {
+			lastBatch = new List<PosMap>(capacity: BatchLength);
+			_posMapss.Add(lastBatch);
+		}
+
+		lastBatch.Add(posMap);
+
+		// occasionally flush the chunk. based on TFChunkScavenger.ScavengeChunk
+		var currentPage = _outputChunk.RawWriterPosition / 4046;
+		if (currentPage - _lastFlushedPage > TFChunkScavenger.FlushPageInterval) {
+			await _outputChunk.Flush(token);
+			_lastFlushedPage = currentPage;
+		}
+	}
+
+	public async ValueTask Complete(CancellationToken token) {
+		// write posmap
+		var posMapCount = 0;
+		foreach (var list in _posMapss)
+			posMapCount += list.Count;
+
+		var unifiedPosMap = new List<PosMap>(capacity: posMapCount);
+		foreach (var list in _posMapss)
+			unifiedPosMap.AddRange(list);
+
+		await _outputChunk.CompleteScavenge(unifiedPosMap, token);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/InMemory/InMemoryChunkWeightScavengeMap.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/InMemory/InMemoryChunkWeightScavengeMap.cs
new file mode 100644
index 00000000000..27975a4d628
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/InMemory/InMemoryChunkWeightScavengeMap.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.InMemory;
+
+public class InMemoryChunkWeightScavengeMap :
+	InMemoryScavengeMap<int, float>,
+	IChunkWeightScavengeMap {
+
+	public bool AllWeightsAreZero() {
+		foreach (var kvp in AllRecords()) {
+			if (kvp.Value != 0) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	public void IncreaseWeight(int logicalChunkNumber, float extraWeight) {
+		if (!TryGetValue(logicalChunkNumber, out var weight))
+			weight = 0;
+		this[logicalChunkNumber] = weight + extraWeight;
+	}
+
+	public void ResetChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber) {
+		for (var i = startLogicalChunkNumber; i <= endLogicalChunkNumber; i++) {
+			TryRemove(i, out _);
+		}
+	}
+
+	public float SumChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber) {
+		var totalWeight = 0f;
+		for (var i = startLogicalChunkNumber; i <= endLogicalChunkNumber; i++) {
+			if (TryGetValue(i, out var weight)) {
+				totalWeight += weight;
+			}
+		}
+
+		return totalWeight;
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/InMemory/InMemoryMetastreamScavengeMap.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/InMemory/InMemoryMetastreamScavengeMap.cs
new file mode 100644
index 00000000000..34de76593e2
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/InMemory/InMemoryMetastreamScavengeMap.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.InMemory;
+
+public class InMemoryMetastreamScavengeMap<TKey> :
+	InMemoryScavengeMap<TKey, MetastreamData>,
+	IMetastreamScavengeMap<TKey> {
+
+	public void SetTombstone(TKey key) {
+		if (!TryGetValue(key, out var x))
+			x = new MetastreamData();
+
+		this[key] = new MetastreamData(
+			isTombstoned: true,
+			discardPoint: x.DiscardPoint);
+	}
+
+	public void SetDiscardPoint(TKey key, DiscardPoint discardPoint) {
+		if (!TryGetValue(key, out var x))
+			x = new MetastreamData();
+
+		this[key] = new MetastreamData(
+			isTombstoned: x.IsTombstoned,
+			discardPoint: discardPoint);
+	}
+
+	public void DeleteAll() {
+		foreach (var kvp in AllRecords()) {
+			TryRemove(kvp.Key, out _);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/InMemory/InMemoryOriginalStreamScavengeMap.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/InMemory/InMemoryOriginalStreamScavengeMap.cs
new file mode 100644
index 00000000000..cf09e4a0a64
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/InMemory/InMemoryOriginalStreamScavengeMap.cs
@@ -0,0 +1,104 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.InMemory;
+
+public class InMemoryOriginalStreamScavengeMap<TKey> :
+	InMemoryScavengeMap<TKey, OriginalStreamData>,
+	IOriginalStreamScavengeMap<TKey> {
+
+	public void SetTombstone(TKey key) {
+		if (!TryGetValue(key, out var x))
+			x = new OriginalStreamData();
+
+		this[key] = new OriginalStreamData {
+			DiscardPoint = x.DiscardPoint,
+			MaybeDiscardPoint = x.MaybeDiscardPoint,
+			MaxAge = x.MaxAge,
+			MaxCount = x.MaxCount,
+			TruncateBefore = x.TruncateBefore,
+
+			Status = CalculationStatus.Active,
+			IsTombstoned = true,
+		};
+	}
+
+	public void SetMetadata(TKey key, StreamMetadata metadata) {
+		if (!TryGetValue(key, out var x))
+			x = new OriginalStreamData();
+
+		this[key] = new OriginalStreamData {
+			MaybeDiscardPoint = x.MaybeDiscardPoint,
+			DiscardPoint = x.DiscardPoint,
+			IsTombstoned = x.IsTombstoned,
+
+			Status = CalculationStatus.Active,
+			MaxAge = metadata.MaxAge,
+			MaxCount = metadata.MaxCount,
+			TruncateBefore = metadata.TruncateBefore,
+		};
+	}
+
+	public void SetDiscardPoints(
+		TKey key,
+		CalculationStatus status,
+		DiscardPoint discardPoint,
+		DiscardPoint maybeDiscardPoint) {
+
+		if (!TryGetValue(key, out var x))
+			throw new Exception("this shouldn't happen");
+
+		this[key] = new OriginalStreamData {
+			IsTombstoned = x.IsTombstoned,
+			MaxAge = x.MaxAge,
+			MaxCount = x.MaxCount,
+			TruncateBefore = x.TruncateBefore,
+
+			Status = status,
+			DiscardPoint = discardPoint,
+			MaybeDiscardPoint = maybeDiscardPoint,
+		};
+	}
+
+	public bool TryGetChunkExecutionInfo(TKey key, out ChunkExecutionInfo info) {
+		if (!TryGetValue(key, out var data)) {
+			info = default;
+			return false;
+		}
+
+		info = new ChunkExecutionInfo(
+			isTombstoned: data.IsTombstoned,
+			discardPoint: data.DiscardPoint,
+			maybeDiscardPoint: data.MaybeDiscardPoint,
+			maxAge: data.MaxAge);
+
+		return true;
+	}
+
+	private bool Filter(KeyValuePair<TKey, OriginalStreamData> kvp) =>
+		kvp.Value.Status == CalculationStatus.Active;
+
+	public IEnumerable<KeyValuePair<TKey, OriginalStreamData>> ActiveRecords() =>
+		AllRecords().Where(Filter);
+
+	public IEnumerable<KeyValuePair<TKey, OriginalStreamData>> ActiveRecordsFromCheckpoint(TKey checkpoint) =>
+		// skip those which are before or equal to the checkpoint.
+		ActiveRecords().SkipWhile(x => Comparer<TKey>.Default.Compare(x.Key, checkpoint) <= 0);
+
+	public void DeleteMany(bool deleteArchived) {
+		foreach (var kvp in AllRecords()) {
+			if ((kvp.Value.Status == CalculationStatus.Spent) ||
+				(kvp.Value.Status == CalculationStatus.Archived && deleteArchived)) {
+
+				TryRemove(kvp.Key, out _);
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/InMemory/InMemoryScavengeBackend.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/InMemory/InMemoryScavengeBackend.cs
new file mode 100644
index 00000000000..f22471e7707
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/InMemory/InMemoryScavengeBackend.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.InMemory;
+
+public class InMemoryScavengeBackend : IScavengeStateBackend<string> {
+	public InMemoryScavengeBackend() {
+		var checkpointStore = new InMemoryScavengeMap<Unit, ScavengeCheckpoint>();
+
+		ChunkTimeStampRanges = new InMemoryScavengeMap<int, ChunkTimeStampRange>();
+		CollisionStorage = new InMemoryScavengeMap<string, Unit>();
+		Hashes = new InMemoryScavengeMap<ulong, string>();
+		MetaStorage = new InMemoryMetastreamScavengeMap<ulong>();
+		MetaCollisionStorage = new InMemoryMetastreamScavengeMap<string>();
+		OriginalStorage = new InMemoryOriginalStreamScavengeMap<ulong>();
+		OriginalCollisionStorage = new InMemoryOriginalStreamScavengeMap<string>();
+		CheckpointStorage = checkpointStore;
+		ChunkWeights = new InMemoryChunkWeightScavengeMap();
+		TransactionManager = new InMemoryTransactionManager(checkpointStore);
+	}
+
+	public IScavengeMap<int, ChunkTimeStampRange> ChunkTimeStampRanges { get; }
+
+	public IScavengeMap<string, Unit> CollisionStorage { get; }
+
+	public IScavengeMap<ulong, string> Hashes { get; }
+
+	public IMetastreamScavengeMap<ulong> MetaStorage { get; }
+
+	public IMetastreamScavengeMap<string> MetaCollisionStorage { get; }
+
+	public IOriginalStreamScavengeMap<ulong> OriginalStorage { get; }
+
+	public IOriginalStreamScavengeMap<string> OriginalCollisionStorage { get; }
+
+	public IScavengeMap<Unit, ScavengeCheckpoint> CheckpointStorage { get; }
+
+	public IChunkWeightScavengeMap ChunkWeights { get; }
+
+	public ITransactionManager TransactionManager { get; }
+
+	public void Dispose() {
+	}
+
+	public void LogStats() {
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/InMemory/InMemoryScavengeMap.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/InMemory/InMemoryScavengeMap.cs
new file mode 100644
index 00000000000..aa6a0039c56
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/InMemory/InMemoryScavengeMap.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.InMemory;
+
+public class InMemoryScavengeMap<TKey, TValue> : IScavengeMap<TKey, TValue> {
+	public InMemoryScavengeMap() {
+	}
+
+	private readonly Dictionary<TKey, TValue> _dict = new Dictionary<TKey, TValue>();
+
+	public TValue this[TKey key] {
+		set => _dict[key] = value;
+	}
+
+	public bool TryGetValue(TKey key, out TValue value) => _dict.TryGetValue(key, out value);
+
+	public IEnumerable<KeyValuePair<TKey, TValue>> AllRecords() =>
+		// naive copy so we can write to the values for the keys that we are iterating through.
+		_dict
+			.ToDictionary(x => x.Key, x => x.Value)
+			.OrderBy(x => x.Key);
+
+	public bool TryRemove(TKey key, out TValue value) {
+		_dict.TryGetValue(key, out value);
+		return _dict.Remove(key);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/InMemory/InMemoryTransactionFactory.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/InMemory/InMemoryTransactionFactory.cs
new file mode 100644
index 00000000000..90e187f56db
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/InMemory/InMemoryTransactionFactory.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.InMemory;
+
+public class InMemoryTransactionFactory : ITransactionFactory<int> {
+	int _transactionNumber;
+
+	public InMemoryTransactionFactory() {
+	}
+
+	public int Begin() {
+		return _transactionNumber++;
+	}
+
+	public void Commit(int transasction) {
+	}
+
+	public void Rollback(int transaction) {
+		throw new NotImplementedException();
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/InMemory/InMemoryTransactionManager.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/InMemory/InMemoryTransactionManager.cs
new file mode 100644
index 00000000000..b4e8fc8bae8
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/InMemory/InMemoryTransactionManager.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.InMemory;
+
+public class InMemoryTransactionManager : TransactionManager<int> {
+	public InMemoryTransactionManager(InMemoryScavengeMap<Unit, ScavengeCheckpoint> storage)
+		: base(new InMemoryTransactionFactory(), storage) {
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IAccumulator.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IAccumulator.cs
new file mode 100644
index 00000000000..9026b8278ad
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IAccumulator.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+// The Accumulator reads through the log up to the scavenge point
+// its purpose is to do any log scanning that is necessary for a scavenge _only once_
+// accumulating whatever state is necessary to avoid subsequent scans.
+//
+// in practice it populates the scavenge state with:
+//  1. the scavengable streams
+//  2. hash collisions between any streams
+//  3. most recent metadata and whether the stream is tombstoned
+//  4. discard points for metadata streams
+//  5. data for maxage calculations - maybe that can be another IScavengeMap
+public interface IAccumulator<TStreamId> {
+	ValueTask Accumulate(
+		ScavengePoint prevScavengePoint,
+		ScavengePoint scavengePoint,
+		IScavengeStateForAccumulator<TStreamId> state,
+		CancellationToken cancellationToken);
+
+	ValueTask Accumulate(
+		ScavengeCheckpoint.Accumulating checkpoint,
+		IScavengeStateForAccumulator<TStreamId> state,
+		CancellationToken cancellationToken);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/ICalculator.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/ICalculator.cs
new file mode 100644
index 00000000000..cd1bf18ad9f
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/ICalculator.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+// The Calculator calculates the DiscardPoints that depend on the ScavengePoint
+// (after which all the scavengable streams will have discard points calculated correctly)
+//
+// It also creates a heuristic for which chunks are most in need of scavenging.
+//
+// The job of calculating the DiscardPoints is split between the Accumulator and the Calculator.
+// The Accumulator calculates them for Metadata streams because (a) it is simple and
+// (b) it is updating the state for each metastream record anyway.
+// The Calculator calculates them for Original streams so save us updating them repeatedly as
+// we accumulate each event.
+//
+// For streams that do not collide (which is ~all of them) the calculation can be done index-only.
+// that is, without hitting the log at all.
+public interface ICalculator<TStreamId> {
+	ValueTask Calculate(
+		ScavengePoint scavengePoint,
+		IScavengeStateForCalculator<TStreamId> source,
+		CancellationToken cancellationToken);
+
+	ValueTask Calculate(ScavengeCheckpoint.Calculating<TStreamId> checkpoint,
+		IScavengeStateForCalculator<TStreamId> source,
+		CancellationToken cancellationToken);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkExecutor.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkExecutor.cs
new file mode 100644
index 00000000000..131a2087c6b
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkExecutor.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+// The chunk executor performs the actual removal of the log records
+public interface IChunkExecutor<TStreamId> {
+	ValueTask Execute(
+		ScavengePoint scavengePoint,
+		IScavengeStateForChunkExecutor<TStreamId> state,
+		ITFChunkScavengerLog scavengerLogger,
+		CancellationToken cancellationToken);
+
+	ValueTask Execute(
+		ScavengeCheckpoint.ExecutingChunks checkpoint,
+		IScavengeStateForChunkExecutor<TStreamId> state,
+		ITFChunkScavengerLog scavengerLogger,
+		CancellationToken cancellationToken);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkManagerForChunkExecutor.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkManagerForChunkExecutor.cs
new file mode 100644
index 00000000000..7f6c416b4c5
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkManagerForChunkExecutor.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+public interface IChunkManagerForChunkExecutor<TStreamId, TRecord> {
+	IChunkFileSystem FileSystem { get; }
+
+	ValueTask<IChunkWriterForExecutor<TStreamId, TRecord>> CreateChunkWriter(
+		IChunkReaderForExecutor<TStreamId, TRecord> sourceChunk,
+		CancellationToken token);
+
+	ValueTask<IChunkReaderForExecutor<TStreamId, TRecord>> GetChunkReaderFor(long position, CancellationToken token);
+}
+
+public interface IChunkManagerForChunkRemover {
+	ValueTask<bool> SwitchInChunks(IReadOnlyList<string> locators, CancellationToken token);
+}
+
+public interface IChunkWriterForExecutor<TStreamId, TRecord> {
+	string LocalFileName { get; }
+
+	ValueTask WriteRecord(RecordForExecutor<TStreamId, TRecord> record, CancellationToken token);
+
+	ValueTask<(string NewFileName, long NewFileSize)> Complete(CancellationToken token);
+
+	void Abort(bool deleteImmediately);
+}
+
+public interface IChunkReaderForExecutor<TStreamId, TRecord> {
+	string Name { get; }
+	int FileSize { get; }
+	int ChunkStartNumber { get; }
+	int ChunkEndNumber { get; }
+	bool IsReadOnly { get; }
+	bool IsRemote { get; }
+	long ChunkStartPosition { get; }
+	long ChunkEndPosition { get; }
+	IAsyncEnumerable<bool> ReadInto(
+		RecordForExecutor<TStreamId, TRecord>.NonPrepare nonPrepare,
+		RecordForExecutor<TStreamId, TRecord>.Prepare prepare,
+		CancellationToken token);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkMerger.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkMerger.cs
new file mode 100644
index 00000000000..271523cc3e7
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkMerger.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+public interface IChunkMerger {
+	ValueTask MergeChunks(
+		ScavengePoint scavengePoint,
+		IScavengeStateForChunkMerger state,
+		ITFChunkScavengerLog scavengerLogger,
+		CancellationToken cancellationToken);
+
+	ValueTask MergeChunks(
+		ScavengeCheckpoint.MergingChunks checkpoint,
+		IScavengeStateForChunkMerger state,
+		ITFChunkScavengerLog scavengerLogger,
+		CancellationToken cancellationToken);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkMergerBackend.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkMergerBackend.cs
new file mode 100644
index 00000000000..129e87332f2
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkMergerBackend.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+public interface IChunkMergerBackend {
+	ValueTask MergeChunks(
+		ITFChunkScavengerLog scavengerLogger,
+		Throttle throttle,
+		CancellationToken cancellationToken);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkReaderForAccumulator.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkReaderForAccumulator.cs
new file mode 100644
index 00000000000..042d1920a0e
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkReaderForAccumulator.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Threading;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+public interface IChunkReaderForAccumulator<TStreamId> {
+	// Each element in the enumerable indicates which of the three records has been populated for
+	// that iteration.
+	IAsyncEnumerable<AccumulatorRecordType> ReadChunkInto(
+		int logicalChunkNumber,
+		RecordForAccumulator<TStreamId>.OriginalStreamRecord originalStreamRecord,
+		RecordForAccumulator<TStreamId>.MetadataStreamRecord metadataStreamRecord,
+		RecordForAccumulator<TStreamId>.TombStoneRecord tombStoneRecord,
+		CancellationToken token);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkReaderForIndexExecutor.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkReaderForIndexExecutor.cs
new file mode 100644
index 00000000000..0dd3c20d06d
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkReaderForIndexExecutor.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+public interface IChunkReaderForIndexExecutor<TStreamId> {
+	ValueTask<Optional<TStreamId>> TryGetStreamId(long position, CancellationToken token);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkRemover.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkRemover.cs
new file mode 100644
index 00000000000..4288abec80f
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkRemover.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+// responsible for removing chunks that are present in the archive and no longer
+// needed locally according to the retention policy
+public interface IChunkRemover<TStreamId, TRecord> {
+	static IChunkRemover<TStreamId, TRecord> NoOp => NoOpChunkRemover<TStreamId, TRecord>.Instance;
+
+	// returns true iff removing
+	ValueTask<bool> StartRemovingIfNotRetained(
+		ScavengePoint scavengePoint,
+		IScavengeStateForChunkExecutorWorker<TStreamId> concurrentState,
+		IChunkReaderForExecutor<TStreamId, TRecord> physicalChunk,
+		CancellationToken ct);
+}
+
+file class NoOpChunkRemover<TStreamId, TRecord> : IChunkRemover<TStreamId, TRecord> {
+	public static NoOpChunkRemover<TStreamId, TRecord> Instance { get; } = new();
+
+	public ValueTask<bool> StartRemovingIfNotRetained(
+		ScavengePoint scavengePoint,
+		IScavengeStateForChunkExecutorWorker<TStreamId> concurrentState,
+		IChunkReaderForExecutor<TStreamId, TRecord> physicalChunk, CancellationToken ct) {
+
+		return new(false);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkWeightScavengeMap.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkWeightScavengeMap.cs
new file mode 100644
index 00000000000..b13bb16b7ae
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IChunkWeightScavengeMap.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+public interface IChunkWeightScavengeMap : IScavengeMap<int, float> {
+	bool AllWeightsAreZero();
+	void IncreaseWeight(int logicalChunkNumber, float extraWeight);
+	float SumChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber);
+	void ResetChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/ICleaner.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/ICleaner.cs
new file mode 100644
index 00000000000..71b617bc7e1
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/ICleaner.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+public interface ICleaner {
+	void Clean(
+		ScavengePoint scavengePoint,
+		IScavengeStateForCleaner state,
+		CancellationToken cancellationToken);
+
+	void Clean(
+		ScavengeCheckpoint.Cleaning checkpoint,
+		IScavengeStateForCleaner state,
+		CancellationToken cancellationToken);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IIndexExecutor.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IIndexExecutor.cs
new file mode 100644
index 00000000000..ff37b71486f
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IIndexExecutor.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+// the index executor performs the actual removal of the index entries
+// for non-colliding streams this is index-only
+public interface IIndexExecutor<TStreamId> {
+	ValueTask Execute(
+		ScavengePoint scavengePoint,
+		IScavengeStateForIndexExecutor<TStreamId> state,
+		IIndexScavengerLog scavengerLogger,
+		CancellationToken cancellationToken);
+
+	ValueTask Execute(
+		ScavengeCheckpoint.ExecutingIndex checkpoint,
+		IScavengeStateForIndexExecutor<TStreamId> state,
+		IIndexScavengerLog scavengerLogger,
+		CancellationToken cancellationToken);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IIndexReaderForAccumulator.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IIndexReaderForAccumulator.cs
new file mode 100644
index 00000000000..196702364c7
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IIndexReaderForAccumulator.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+public interface IIndexReaderForAccumulator<TStreamId> {
+	ValueTask<IndexReadEventInfoResult> ReadEventInfoForward(
+		StreamHandle<TStreamId> handle,
+		long fromEventNumber,
+		int maxCount,
+		ScavengePoint scavengePoint,
+		CancellationToken token);
+
+	ValueTask<IndexReadEventInfoResult> ReadEventInfoBackward(
+		TStreamId streamId,
+		StreamHandle<TStreamId> handle,
+		long fromEventNumber,
+		int maxCount,
+		ScavengePoint scavengePoint,
+		CancellationToken token);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IIndexReaderForCalculator.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IIndexReaderForCalculator.cs
new file mode 100644
index 00000000000..727eac121a0
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IIndexReaderForCalculator.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+public interface IIndexReaderForCalculator<TStreamId> {
+	ValueTask<long> GetLastEventNumber(StreamHandle<TStreamId> streamHandle, ScavengePoint scavengePoint, CancellationToken token);
+
+	ValueTask<IndexReadEventInfoResult> ReadEventInfoForward(
+		StreamHandle<TStreamId> stream,
+		long fromEventNumber,
+		int maxCount,
+		ScavengePoint scavengePoint,
+		CancellationToken token);
+
+	ValueTask<bool> IsTombstone(long logPosition, CancellationToken token);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IIndexScavenger.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IIndexScavenger.cs
new file mode 100644
index 00000000000..700dee8a93c
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IIndexScavenger.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+public interface IIndexScavenger {
+	ValueTask ScavengeIndex(
+		long scavengePoint,
+		Func<IndexEntry, CancellationToken, ValueTask<bool>> shouldKeep,
+		IIndexScavengerLog log,
+		CancellationToken cancellationToken);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IMetastreamScavengeMap.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IMetastreamScavengeMap.cs
new file mode 100644
index 00000000000..6e78a2f6289
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IMetastreamScavengeMap.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+public interface IMetastreamScavengeMap<TKey> :
+	IScavengeMap<TKey, MetastreamData> {
+
+	void SetTombstone(TKey key);
+
+	void SetDiscardPoint(TKey key, DiscardPoint discardPoint);
+
+	void DeleteAll();
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IOriginalStreamScavengeMap.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IOriginalStreamScavengeMap.cs
new file mode 100644
index 00000000000..4c1480dc2e9
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IOriginalStreamScavengeMap.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+public interface IOriginalStreamScavengeMap<TKey> :
+	IScavengeMap<TKey, OriginalStreamData> {
+
+	IEnumerable<KeyValuePair<TKey, OriginalStreamData>> ActiveRecords();
+
+	IEnumerable<KeyValuePair<TKey, OriginalStreamData>> ActiveRecordsFromCheckpoint(TKey checkpoint);
+
+	void SetTombstone(TKey key);
+
+	void SetMetadata(TKey key, StreamMetadata metadata);
+
+	void SetDiscardPoints(
+		TKey key,
+		CalculationStatus status,
+		DiscardPoint discardPoint,
+		DiscardPoint maybeDiscardPoint);
+
+	bool TryGetChunkExecutionInfo(TKey key, out ChunkExecutionInfo info);
+
+	void DeleteMany(bool deleteArchived);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IScavengeMap.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IScavengeMap.cs
new file mode 100644
index 00000000000..6c125898d95
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IScavengeMap.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+public interface IScavengeMap<TKey, TValue> {
+	bool TryGetValue(TKey key, out TValue value);
+	TValue this[TKey key] { set; }
+	bool TryRemove(TKey key, out TValue value);
+	IEnumerable<KeyValuePair<TKey, TValue>> AllRecords();
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IScavengePointSource.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IScavengePointSource.cs
new file mode 100644
index 00000000000..73ed47c2a2a
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IScavengePointSource.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+public interface IScavengePointSource {
+	// returns null when no scavenge point
+	Task<ScavengePoint> GetLatestScavengePointOrDefaultAsync(CancellationToken cancellationToken);
+	Task<ScavengePoint> AddScavengePointAsync(
+		long expectedVersion,
+		int threshold,
+		CancellationToken cancellationToken);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IScavengeState.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IScavengeState.cs
new file mode 100644
index 00000000000..39c51d197b6
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IScavengeState.cs
@@ -0,0 +1,152 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+public interface IScavengeState<TStreamId> :
+	IScavengeStateForAccumulator<TStreamId>,
+	IScavengeStateForCalculator<TStreamId>,
+	IScavengeStateForIndexExecutor<TStreamId>,
+	IScavengeStateForChunkMerger,
+	IScavengeStateForChunkExecutor<TStreamId>,
+	IScavengeStateForCleaner,
+	IDisposable {
+
+	void Init();
+
+	bool TryGetCheckpoint(out ScavengeCheckpoint checkpoint);
+
+	IEnumerable<TStreamId> AllCollisions();
+
+	void LogStats();
+}
+
+// all the components use these
+public interface IScavengeStateCommon {
+	// begin a transaction, returns the started transaction so that it can be
+	// committed or rolled back
+	ITransactionCompleter BeginTransaction();
+}
+
+// abstraction to allow the components to commit/rollback
+public interface ITransactionCompleter {
+	void Rollback();
+	void Commit(ScavengeCheckpoint checkpoint);
+}
+
+public interface ITransactionManager : ITransactionCompleter {
+	void Begin();
+	void RegisterOnRollback(Action onRollback);
+	void UnregisterOnRollback();
+}
+
+// abstraction for the backing store. memory, sqlite etc.
+public interface ITransactionFactory<TTransaction> {
+	TTransaction Begin();
+	void Rollback(TTransaction transaction);
+	void Commit(TTransaction transaction);
+}
+
+public interface IScavengeStateForAccumulator<TStreamId> :
+	IScavengeStateCommon,
+	IIncreaseChunkWeights {
+
+	// call this for each record as we accumulate through the log so that we can spot every hash
+	// collision to save ourselves work later.
+	// this affects multiple parts of the scavengestate and must be called within a transaction so
+	// that its effect is atomic
+	void DetectCollisions(TStreamId streamId);
+
+	void SetMetastreamDiscardPoint(TStreamId metastreamId, DiscardPoint discardPoint);
+
+	// for when the _original_ stream is tombstoned, the metadata stream can be removed entirely.
+	void SetMetastreamTombstone(TStreamId metastreamId);
+
+	void SetOriginalStreamMetadata(TStreamId originalStreamId, StreamMetadata metadata);
+
+	void SetOriginalStreamTombstone(TStreamId originalStreamId);
+
+	void SetChunkTimeStampRange(int logicalChunkNumber, ChunkTimeStampRange range);
+
+	StreamHandle<TStreamId> GetStreamHandle(TStreamId streamId);
+
+	void LogAccumulationStats();
+}
+
+public interface IScavengeStateForCalculatorReadOnly<TStreamId> {
+	// Calculator iterates through the scavengable original streams and their metadata
+	// it doesn't need to do anything with the metadata streams, accumulator has done those.
+	IEnumerable<(StreamHandle<TStreamId>, OriginalStreamData)> OriginalStreamsToCalculate(
+		StreamHandle<TStreamId> checkpoint);
+
+	bool TryGetChunkTimeStampRange(int logicaChunkNumber, out ChunkTimeStampRange range);
+}
+
+public interface IScavengeStateForCalculator<TStreamId> :
+	IScavengeStateForCalculatorReadOnly<TStreamId>,
+	IScavengeStateCommon,
+	IIncreaseChunkWeights {
+
+	void SetOriginalStreamDiscardPoints(
+		StreamHandle<TStreamId> streamHandle,
+		CalculationStatus status,
+		DiscardPoint discardPoint,
+		DiscardPoint maybeDiscardPoint);
+
+	TStreamId LookupUniqueHashUser(ulong streamHash);
+}
+
+public interface IIncreaseChunkWeights {
+	void IncreaseChunkWeight(int logicalChunkNumber, float extraWeight);
+}
+
+public interface IScavengeStateForChunkExecutor<TStreamId> : IScavengeStateCommon {
+	IScavengeStateForChunkExecutorWorker<TStreamId> BorrowStateForWorker();
+}
+
+// implementations must be thread-safe
+public interface IScavengeStateForChunkExecutorWorker<TStreamId> : IDisposable {
+	void ResetChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber);
+	float SumChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber);
+	bool TryGetChunkExecutionInfo(TStreamId streamId, out ChunkExecutionInfo info);
+	bool TryGetMetastreamData(TStreamId streamId, out MetastreamData metastreamData);
+	bool TryGetChunkTimeStampRange(int logicalChunkNumber, out ChunkTimeStampRange range);
+}
+
+public interface IScavengeStateForChunkMerger : IScavengeStateCommon {
+}
+
+public interface IScavengeStateForIndexExecutor<TStreamId> : IScavengeStateCommon {
+	bool IsCollision(ulong streamHash);
+	bool TryGetIndexExecutionInfo(
+		StreamHandle<TStreamId> streamHandle,
+		out IndexExecutionInfo info);
+	TStreamId LookupUniqueHashUser(ulong streamHash);
+}
+
+public interface IScavengeStateForCleaner : IScavengeStateCommon {
+	bool AllChunksExecuted();
+	void DeleteMetastreamData();
+	void DeleteOriginalStreamData(bool deleteArchived);
+}
+
+// this represents access to the actual state storage. these are grouped together into one inteface
+// so that they can be accessed transactionally
+public interface IScavengeStateBackend<TStreamId> : IDisposable {
+	void LogStats();
+	IScavengeMap<TStreamId, Unit> CollisionStorage { get; }
+	IScavengeMap<ulong, TStreamId> Hashes { get; }
+	IMetastreamScavengeMap<ulong> MetaStorage { get; }
+	IMetastreamScavengeMap<TStreamId> MetaCollisionStorage { get; }
+	IOriginalStreamScavengeMap<ulong> OriginalStorage { get; }
+	IOriginalStreamScavengeMap<TStreamId> OriginalCollisionStorage { get; }
+	IScavengeMap<Unit, ScavengeCheckpoint> CheckpointStorage { get; }
+	IScavengeMap<int, ChunkTimeStampRange> ChunkTimeStampRanges { get; }
+	IChunkWeightScavengeMap ChunkWeights { get; }
+	ITransactionManager TransactionManager { get; }
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IScavenger.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IScavenger.cs
new file mode 100644
index 00000000000..d7133777e21
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Interfaces/IScavenger.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+// There are two kinds of streams that we might want to remove events from
+//    - original streams (i.e. streams with metadata)
+//        - according to tombstone
+//        - according to metadata (maxage, maxcount, tb)
+//    - metadata streams
+//        - according to tombstone
+//        - maxcount 1
+//
+// In a nutshell:
+// - The Accumulator passes through the log once (in total, not per scavenge)
+//   accumulating state that we need and calculating some DiscardPoints.
+// - When a ScavengePoint is set, the Calculator uses it to finish calculating
+//   the DiscardPoints.
+// - The Chunk and Index Executors can then use this information to perform the
+//   actual record/indexEntry removal.
+// - Merger merges the chunks
+// - Cleaner removes parts of the scavenge state that are no longer needed
+//   (as determined by the calculator)
+public interface IScavenger : IDisposable {
+	string ScavengeId { get; }
+	Task<ScavengeResult> ScavengeAsync(CancellationToken cancellationToken);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/LruCachingScavengeMap.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/LruCachingScavengeMap.cs
new file mode 100644
index 00000000000..3ad8c089180
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/LruCachingScavengeMap.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging;
+
+// All access to the wrapped map must be via the cache.
+// Currently this is only used to cache the hash users. See comments below.
+public class LruCachingScavengeMap<TKey, TValue> : IScavengeMap<TKey, TValue> {
+	private readonly LRUCache<TKey, TValue> _cache;
+	private readonly IScavengeMap<TKey, TValue> _wrapped;
+	private long _hits;
+	private long _misses;
+
+	public LruCachingScavengeMap(string name, IScavengeMap<TKey, TValue> wrapped, int cacheMaxCount) {
+		_wrapped = wrapped;
+		_cache = new LRUCache<TKey, TValue>(name, cacheMaxCount);
+	}
+
+	public TValue this[TKey key] {
+		set {
+			_wrapped[key] = value;
+			_cache.Put(key, value);
+		}
+	}
+
+	public IEnumerable<KeyValuePair<TKey, TValue>> AllRecords() =>
+		_wrapped.AllRecords();
+
+	public bool TryGetValue(TKey key, out TValue value) {
+		if (_cache.TryGet(key, out value)) {
+			_hits++;
+			return true;
+		}
+
+		_misses++;
+
+		if (_wrapped.TryGetValue(key, out value)) {
+			_cache.Put(key, value);
+			return true;
+		}
+
+		// Currently this is only used to cache the hash users. As such if we TryGetValue and fail to
+		// find it then we will always be adding a value for that key immediately, so it is not
+		// useful to remember keys that are known to not exist.
+		return false;
+	}
+
+	public bool TryRemove(TKey key, out TValue value) {
+		_cache.Remove(key);
+		return _wrapped.TryRemove(key, out value);
+	}
+
+	public void GetStats(out long hits, out long misses) {
+		hits = _hits;
+		misses = _misses;
+		_hits = 0;
+		_misses = 0;
+	}
+}
diff --git a/src/EventStore.Core/TransactionLog/Scavenging/ParallelLoop.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/ParallelLoop.cs
similarity index 91%
rename from src/EventStore.Core/TransactionLog/Scavenging/ParallelLoop.cs
rename to src/KurrentDB.Core/TransactionLog/Scavenging/ParallelLoop.cs
index bc1e70e92fd..a3b4e2b2636 100644
--- a/src/EventStore.Core/TransactionLog/Scavenging/ParallelLoop.cs
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/ParallelLoop.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -5,9 +8,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 using DotNext.Runtime.CompilerServices;
-using EventStore.Common.Utils;
+using KurrentDB.Common.Utils;
 
-namespace EventStore.Core.TransactionLog.Scavenging;
+namespace KurrentDB.Core.TransactionLog.Scavenging;
 
 public static class ParallelLoop {
 	private static readonly Task<int> _neverComplete;
@@ -26,7 +29,7 @@ static ParallelLoop() {
 	//   - getCheckpointExclusive returns the checkpoint that can be emitted when all items up to
 	//     but excluding this one have been completed.
 	public static async ValueTask RunWithTrailingCheckpointAsync<T>(
-		IEnumerable<T> source,
+		IAsyncEnumerable<T> source,
 		int degreeOfParallelism,
 		Func<T, int> getCheckpointInclusive,
 		Func<T, int?> getCheckpointExclusive,
@@ -85,7 +88,7 @@ void EmitCheckpoint() {
 
 		// process the source
 		var slotsInUse = 0;
-		foreach (var item in source) {
+		await foreach (var item in source.WithCancellation(token)) {
 			endCheckpoint = getCheckpointInclusive(item);
 			if (slotsInUse < tasksInProgress.Length) {
 				PrepareProcessingItem(slotsInUse, item);
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/RecordForAccumulator.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/RecordForAccumulator.cs
new file mode 100644
index 00000000000..90a51688552
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/RecordForAccumulator.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging;
+
+public enum AccumulatorRecordType {
+	OriginalStreamRecord,
+	MetadataStreamRecord,
+	TombstoneRecord,
+}
+
+public abstract class RecordForAccumulator<TStreamId> {
+	public TStreamId StreamId { get; private set; }
+	public long LogPosition { get; private set; }
+	public DateTime TimeStamp { get; private set; }
+
+	protected void Reset(TStreamId streamId, long logPosition, DateTime timeStamp) {
+		StreamId = streamId;
+		LogPosition = logPosition;
+		TimeStamp = timeStamp;
+	}
+
+	// Record in original stream
+	public class OriginalStreamRecord : RecordForAccumulator<TStreamId> {
+		public new void Reset(TStreamId streamId, long logPosition, DateTime timeStamp) =>
+			base.Reset(streamId, logPosition, timeStamp);
+	}
+
+	// Record in metadata stream
+	public class MetadataStreamRecord : RecordForAccumulator<TStreamId> {
+		public void Reset(
+			TStreamId streamId,
+			long logPosition,
+			DateTime timeStamp,
+			long eventNumber,
+			StreamMetadata metadata) {
+
+			Reset(streamId, logPosition, timeStamp);
+			EventNumber = eventNumber;
+			Metadata = metadata;
+		}
+
+		public StreamMetadata Metadata { get; private set; }
+		public long EventNumber { get; private set; }
+	}
+
+	public class TombStoneRecord : RecordForAccumulator<TStreamId> {
+		public void Reset(
+			TStreamId streamId,
+			long logPosition,
+			DateTime timeStamp,
+			long eventNumber) {
+
+			Reset(streamId, logPosition, timeStamp);
+			EventNumber = eventNumber;
+		}
+
+		// old scavenge, index writer and index committer are set up to handle
+		// tombstones that have arbitrary event numbers, so let's handle them here
+		// in case it used to be possible to create them.
+		public long EventNumber { get; private set; }
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/ScavengeCheckpointJsonPersistence.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/ScavengeCheckpointJsonPersistence.cs
new file mode 100644
index 00000000000..5cfee5849cd
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/ScavengeCheckpointJsonPersistence.cs
@@ -0,0 +1,125 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using Newtonsoft.Json;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging;
+
+public class ScavengeCheckpointJsonPersistence<TStreamId> {
+	public enum Version {
+		None,
+		V0,
+	}
+
+	public enum Stage {
+		None = 0,
+		Accumulating = 1,
+		Calculating = 2,
+		ExecutingChunks = 3,
+		MergingChunks = 4,
+		ExecutingIndex = 5,
+		Cleaning = 6,
+		Done = 7,
+	}
+
+	public ScavengePoint ScavengePoint { get; set; }
+	public Version SchemaVersion { get; set; }
+	public Stage CheckpointStage { get; set; }
+	public int? DoneLogicalChunkNumber { get; set; }
+	public StreamHandle<TStreamId> DoneStreamHandle { get; set; }
+
+	public ScavengeCheckpoint ToDomain() {
+		switch (CheckpointStage) {
+			case Stage.Accumulating:
+				return new ScavengeCheckpoint.Accumulating(ScavengePoint, DoneLogicalChunkNumber);
+			case Stage.Calculating:
+				return new ScavengeCheckpoint.Calculating<TStreamId>(ScavengePoint, DoneStreamHandle);
+			case Stage.ExecutingChunks:
+				return new ScavengeCheckpoint.ExecutingChunks(ScavengePoint, DoneLogicalChunkNumber);
+			case Stage.MergingChunks:
+				return new ScavengeCheckpoint.MergingChunks(ScavengePoint);
+			case Stage.ExecutingIndex:
+				return new ScavengeCheckpoint.ExecutingIndex(ScavengePoint);
+			case Stage.Cleaning:
+				return new ScavengeCheckpoint.Cleaning(ScavengePoint);
+			case Stage.Done:
+				return new ScavengeCheckpoint.Done(ScavengePoint);
+			default:
+				throw new ArgumentOutOfRangeException(
+					nameof(CheckpointStage),
+					CheckpointStage,
+					null);
+		}
+	}
+
+	private static ScavengeCheckpointJsonPersistence<TStreamId> ToDto(ScavengeCheckpoint checkpoint) {
+		var dto = new ScavengeCheckpointJsonPersistence<TStreamId> {
+			SchemaVersion = Version.V0,
+			ScavengePoint = checkpoint.ScavengePoint,
+		};
+
+		switch (checkpoint) {
+			case ScavengeCheckpoint.Accumulating x:
+				dto.CheckpointStage = Stage.Accumulating;
+				dto.DoneLogicalChunkNumber = x.DoneLogicalChunkNumber;
+				break;
+
+			case ScavengeCheckpoint.Calculating<TStreamId> x:
+				dto.CheckpointStage = Stage.Calculating;
+				dto.DoneStreamHandle = x.DoneStreamHandle;
+				break;
+
+			case ScavengeCheckpoint.ExecutingChunks x:
+				dto.CheckpointStage = Stage.ExecutingChunks;
+				dto.DoneLogicalChunkNumber = x.DoneLogicalChunkNumber;
+				break;
+
+			case ScavengeCheckpoint.MergingChunks _:
+				dto.CheckpointStage = Stage.MergingChunks;
+				break;
+
+			case ScavengeCheckpoint.ExecutingIndex _:
+				dto.CheckpointStage = Stage.ExecutingIndex;
+				break;
+
+			case ScavengeCheckpoint.Cleaning _:
+				dto.CheckpointStage = Stage.Cleaning;
+				break;
+
+			case ScavengeCheckpoint.Done _:
+				dto.CheckpointStage = Stage.Done;
+				break;
+
+			default:
+				throw new ArgumentOutOfRangeException(
+					nameof(checkpoint),
+					checkpoint,
+					null);
+		}
+
+		return dto;
+	}
+
+	public static bool TryDeserialize(string input, out ScavengeCheckpoint checkpoint) {
+		try {
+			var dto = JsonConvert.DeserializeObject<ScavengeCheckpointJsonPersistence<TStreamId>>(
+				input,
+				Json.JsonSettings);
+			checkpoint = dto.ToDomain();
+			return checkpoint != null;
+		} catch {
+			// no op
+		}
+
+		checkpoint = default;
+		return false;
+	}
+
+	public static string Serialize(ScavengeCheckpoint checkpoint) {
+		var dto = ToDto(checkpoint);
+		return JsonConvert.SerializeObject(dto, Json.JsonSettings);
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/ScavengeOptionsCalculator.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/ScavengeOptionsCalculator.cs
new file mode 100644
index 00000000000..49616c3aeba
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/ScavengeOptionsCalculator.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Archive;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging;
+
+// Calculates the way to configure the scavenge based on various configuration sources
+public class ScavengeOptionsCalculator {
+	readonly ClusterVNodeOptions _vNodeOptions;
+	readonly ArchiveOptions _archiveOptions;
+	readonly ClientMessage.ScavengeDatabase _message;
+
+	public ScavengeOptionsCalculator(
+		ClusterVNodeOptions vNodeOptions,
+		ArchiveOptions archiveOptions,
+		ClientMessage.ScavengeDatabase message) {
+
+		_vNodeOptions = vNodeOptions;
+		_archiveOptions = archiveOptions;
+		_message = message;
+	}
+
+	// Archiving disables chunk merging because the two in combination make things
+	// more complex (locating chunks in the archive is more complicated if they
+	// are merged, and there may be subtleties if we try to merge a local chunk
+	// into a chunk that is located in the archive.
+	// Merging is also less important with archiving - we shouldn't have too many
+	// chunks locally because of the archive, and it is ok to have lots of physical
+	// files in the archive because we do not open file handles to all of them
+	// continuously
+	public bool MergeChunks =>
+		!_archiveOptions.Enabled &&
+		!_vNodeOptions.Database.DisableScavengeMerging;
+
+	public int ChunkExecutionThreshold => _message.Threshold ?? 0;
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/ScavengeState.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/ScavengeState.cs
new file mode 100644
index 00000000000..636b95b65ba
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/ScavengeState.cs
@@ -0,0 +1,384 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.DataStructures;
+using KurrentDB.Core.Index.Hashes;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.TransactionLog.Scavenging.CollisionManagement;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Serilog;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging;
+
+// This datastructure is read and written to by the Accumulator/Calculator/Executors.
+// They contain the scavenge logic, this is just the holder of the data.
+//
+// we store data for metadata streams and for original streams, but we need to store
+// different data for each so we have two maps. we have one collision detector since
+// we need to detect collisions between all of the streams.
+// we don't need to store data for every original stream, only ones that need scavenging.
+public class ScavengeState<TStreamId> : IScavengeState<TStreamId> {
+	private bool _initialized;
+	private IScavengeStateBackend<TStreamId> _backend;
+	private readonly ObjectPool<IScavengeStateBackend<TStreamId>> _backendPool;
+	private readonly int _hashUsersCacheCapacity;
+	private CollisionDetector<TStreamId> _collisionDetector;
+
+	// data stored keyed against metadata streams
+	private MetastreamCollisionMap<TStreamId> _metastreamDatas;
+
+	// data stored keyed against original (non-metadata) streams
+	private OriginalStreamCollisionMap<TStreamId> _originalStreamDatas;
+
+	private IScavengeMap<int, ChunkTimeStampRange> _chunkTimeStampRanges;
+	private IChunkWeightScavengeMap _chunkWeights;
+	private IScavengeMap<Unit, ScavengeCheckpoint> _checkpointStorage;
+	private ITransactionManager _transactionManager;
+
+	private readonly ILogger _logger;
+	private readonly ILongHasher<TStreamId> _hasher;
+	private readonly IMetastreamLookup<TStreamId> _metastreamLookup;
+
+	public ScavengeState(
+		ILogger logger,
+		ILongHasher<TStreamId> hasher,
+		IMetastreamLookup<TStreamId> metastreamLookup,
+		ObjectPool<IScavengeStateBackend<TStreamId>> backendPool,
+		int hashUsersCacheCapacity) {
+
+		_logger = logger;
+		_hasher = hasher;
+		_metastreamLookup = metastreamLookup;
+		_backendPool = backendPool;
+		_hashUsersCacheCapacity = hashUsersCacheCapacity;
+	}
+
+	public void Init() {
+		if (_initialized)
+			return;
+
+		_initialized = true;
+		_backend = _backendPool.Get();
+
+		// todo: in log v3 inject an implementation that doesn't store hash users
+		// since there are no collisions.
+		_collisionDetector = new CollisionDetector<TStreamId>(
+			logger: _logger,
+			hashUsers: new LruCachingScavengeMap<ulong, TStreamId>(
+				"HashUsers",
+				_backend.Hashes,
+				cacheMaxCount: _hashUsersCacheCapacity),
+			collisionStorage: _backend.CollisionStorage,
+			hasher: _hasher);
+
+		_checkpointStorage = _backend.CheckpointStorage;
+
+		_metastreamDatas = new MetastreamCollisionMap<TStreamId>(
+			_hasher,
+			_collisionDetector.IsCollision,
+			_backend.MetaStorage,
+			_backend.MetaCollisionStorage);
+
+		_originalStreamDatas = new OriginalStreamCollisionMap<TStreamId>(
+			_hasher,
+			_collisionDetector.IsCollision,
+			_backend.OriginalStorage,
+			_backend.OriginalCollisionStorage);
+
+		_chunkTimeStampRanges = _backend.ChunkTimeStampRanges;
+		_chunkWeights = _backend.ChunkWeights;
+
+		_transactionManager = _backend.TransactionManager;
+		_transactionManager.RegisterOnRollback(OnRollback);
+	}
+
+	public void Dispose() {
+		_transactionManager?.UnregisterOnRollback();
+		if (_backend != null)
+			_backendPool.Return(_backend);
+		_backendPool.Dispose();
+	}
+
+	private void OnRollback() {
+		// a transaction has been rolled back
+		// need to clear whatever we think we know about collisions to stop us mistaking a new
+		// collision for an old one.
+		_collisionDetector.ClearCaches();
+
+		// there is no need to clear the HashUsers LRU cache
+	}
+
+	public void LogStats() {
+		_backend.LogStats();
+	}
+
+	// reuses the same transaction object for multiple transactions.
+	// caller is reponsible for committing, rolling back, or disposing
+	// the transaction before calling BeginTransaction again
+	public ITransactionCompleter BeginTransaction() {
+		_transactionManager.Begin();
+		return _transactionManager;
+	}
+
+	public bool TryGetCheckpoint(out ScavengeCheckpoint checkpoint) =>
+		_checkpointStorage.TryGetValue(Unit.Instance, out checkpoint);
+
+	public IEnumerable<TStreamId> AllCollisions() {
+		return _collisionDetector.AllCollisions();
+	}
+
+	public bool TryGetOriginalStreamData(
+		TStreamId streamId,
+		out OriginalStreamData originalStreamData) =>
+
+		_originalStreamDatas.TryGetValue(streamId, out originalStreamData);
+
+	//
+	// FOR ACCUMULATOR
+	//
+
+	public void DetectCollisions(TStreamId streamId) {
+		var collisionResult = _collisionDetector.DetectCollisions(
+			streamId,
+			out var collision);
+
+		if (collisionResult == CollisionResult.NewCollision) {
+			_logger.Information(
+				"SCAVENGING: Detected collision between streams \"{streamId}\" and \"{previous}\"",
+				streamId, collision);
+
+			_metastreamDatas.NotifyCollision(collision);
+			_originalStreamDatas.NotifyCollision(collision);
+		}
+	}
+
+	public void SetMetastreamDiscardPoint(TStreamId metastreamId, DiscardPoint discardPoint) {
+		_metastreamDatas.SetDiscardPoint(metastreamId, discardPoint);
+	}
+
+	public void SetMetastreamTombstone(TStreamId metastreamId) {
+		_metastreamDatas.SetTombstone(metastreamId);
+	}
+
+	public void SetOriginalStreamMetadata(TStreamId originalStreamId, StreamMetadata metadata) {
+		_originalStreamDatas.SetMetadata(originalStreamId, metadata);
+	}
+
+	public void SetOriginalStreamTombstone(TStreamId originalStreamId) {
+		_originalStreamDatas.SetTombstone(originalStreamId);
+	}
+
+	public void SetChunkTimeStampRange(int logicalChunkNumber, ChunkTimeStampRange range) {
+		_chunkTimeStampRanges[logicalChunkNumber] = range;
+	}
+
+	public StreamHandle<TStreamId> GetStreamHandle(TStreamId streamId) =>
+		_collisionDetector.IsCollision(streamId) ?
+			StreamHandle.ForStreamId(streamId) :
+			StreamHandle.ForHash<TStreamId>(_hasher.Hash(streamId));
+
+	public void LogAccumulationStats() {
+		LogStats();
+		_collisionDetector.LogStats();
+	}
+
+	//
+	// FOR CALCULATOR
+	//
+
+	public IEnumerable<(StreamHandle<TStreamId>, OriginalStreamData)> OriginalStreamsToCalculate(
+		StreamHandle<TStreamId> checkpoint) {
+
+		return _originalStreamDatas.EnumerateActive(checkpoint);
+	}
+
+	public void SetOriginalStreamDiscardPoints(
+		StreamHandle<TStreamId> handle,
+		CalculationStatus status,
+		DiscardPoint discardPoint,
+		DiscardPoint maybeDiscardPoint) {
+
+		_originalStreamDatas.SetDiscardPoints(handle, status, discardPoint, maybeDiscardPoint);
+	}
+
+	public void IncreaseChunkWeight(int logicalChunkNumber, float extraWeight) {
+		_chunkWeights.IncreaseWeight(logicalChunkNumber, extraWeight);
+	}
+
+	public bool TryGetChunkTimeStampRange(int logicalChunkNumber, out ChunkTimeStampRange range) =>
+		_chunkTimeStampRanges.TryGetValue(logicalChunkNumber, out range);
+
+	public TStreamId LookupUniqueHashUser(ulong streamHash) =>
+		_collisionDetector.LookupUniqueHashUser(streamHash);
+
+	//
+	// FOR CHUNK EXECUTOR
+	//
+
+	// not guaranteed to be thread safe. allocations and queries, dont call this too often.
+	public IScavengeStateForChunkExecutorWorker<TStreamId> BorrowStateForWorker() {
+		var backend = _backendPool.Get();
+
+		var state = new ScavengeStateForChunkWorker<TStreamId>(
+			hasher: _hasher,
+			backend: backend,
+			collisions: AllCollisions().ToDictionary(x => x, x => Unit.Instance),
+			onDispose: () => _backendPool.Return(backend));
+		return state;
+	}
+
+	public float SumChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber) =>
+		_chunkWeights.SumChunkWeights(startLogicalChunkNumber, endLogicalChunkNumber);
+
+	public void ResetChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber) {
+		_chunkWeights.ResetChunkWeights(startLogicalChunkNumber, endLogicalChunkNumber);
+	}
+
+	public bool TryGetChunkExecutionInfo(
+		TStreamId streamId,
+		out ChunkExecutionInfo info) =>
+
+		_originalStreamDatas.TryGetChunkExecutionInfo(streamId, out info);
+
+	public bool TryGetMetastreamData(TStreamId streamId, out MetastreamData data) =>
+		_metastreamDatas.TryGetValue(streamId, out data);
+
+	//
+	// FOR INDEX EXECUTOR
+	//
+
+	public bool TryGetIndexExecutionInfo(
+		StreamHandle<TStreamId> handle,
+		out IndexExecutionInfo info) {
+
+		// here we know that the handle is of the correct kind
+		// but we do not know whether it is for a metastream or an originalstream.
+		switch (handle.Kind) {
+			case StreamHandle.Kind.Hash:
+				// not a collision, but we do not know whether it is a metastream or not.
+				// check both maps (better if we didnt have to though..)
+				return TryGetDiscardPointForOriginalStream(handle, out info)
+					|| TryGetDiscardPointForMetadataStream(handle, out info);
+			case StreamHandle.Kind.Id:
+				// collision, but at least we can tell whether it is a metastream or not.
+				// so just check one map.
+				return _metastreamLookup.IsMetaStream(handle.StreamId)
+					? TryGetDiscardPointForMetadataStream(handle, out info)
+					: TryGetDiscardPointForOriginalStream(handle, out info);
+			default:
+				throw new ArgumentOutOfRangeException(nameof(handle), handle, null);
+		}
+	}
+
+	private bool TryGetDiscardPointForMetadataStream(
+		StreamHandle<TStreamId> handle,
+		out IndexExecutionInfo info) {
+
+		if (!_metastreamDatas.TryGetValue(handle, out var data)) {
+			info = default;
+			return false;
+		}
+
+		info = new IndexExecutionInfo(
+			isMetastream: true,
+			isTombstoned: data.IsTombstoned,
+			discardPoint: data.DiscardPoint);
+		return true;
+	}
+
+	private bool TryGetDiscardPointForOriginalStream(
+		StreamHandle<TStreamId> handle,
+		out IndexExecutionInfo info) {
+
+		if (!_originalStreamDatas.TryGetValue(handle, out var data)) {
+			info = default;
+			return false;
+		}
+
+		info = new IndexExecutionInfo(
+			isMetastream: false,
+			isTombstoned: data.IsTombstoned,
+			discardPoint: data.DiscardPoint);
+		return true;
+	}
+
+	public bool IsCollision(ulong streamHash) {
+		return _collisionDetector.IsCollisionHash(streamHash);
+	}
+
+	//
+	// For cleaner
+	//
+
+	public bool AllChunksExecuted() =>
+		_chunkWeights.AllWeightsAreZero();
+
+	public void DeleteOriginalStreamData(bool deleteArchived) {
+		_originalStreamDatas.DeleteMany(deleteArchived: deleteArchived);
+	}
+
+	public void DeleteMetastreamData() {
+		_metastreamDatas.DeleteAll();
+	}
+}
+
+
+// in the chunk executor each worker gets its own state so that it has its own dbconnection and
+// prepared commands.
+public readonly struct ScavengeStateForChunkWorker<TStreamId> :
+	IScavengeStateForChunkExecutorWorker<TStreamId> {
+
+	private readonly MetastreamCollisionMap<TStreamId> _metastreamDatas;
+	private readonly OriginalStreamCollisionMap<TStreamId> _originalStreamDatas;
+	private readonly IScavengeMap<int, ChunkTimeStampRange> _chunkTimeStampRanges;
+	private readonly IChunkWeightScavengeMap _chunkWeights;
+	private readonly Action _onDispose;
+
+	public ScavengeStateForChunkWorker(
+		ILongHasher<TStreamId> hasher,
+		IScavengeStateBackend<TStreamId> backend,
+		Dictionary<TStreamId, Unit> collisions,
+		Action onDispose) {
+
+		_metastreamDatas = new MetastreamCollisionMap<TStreamId>(
+			hasher,
+			collisions.ContainsKey,
+			backend.MetaStorage,
+			backend.MetaCollisionStorage);
+
+		_originalStreamDatas = new OriginalStreamCollisionMap<TStreamId>(
+			hasher,
+			collisions.ContainsKey,
+			backend.OriginalStorage,
+			backend.OriginalCollisionStorage);
+
+		_chunkTimeStampRanges = backend.ChunkTimeStampRanges;
+		_chunkWeights = backend.ChunkWeights;
+
+		_onDispose = onDispose;
+	}
+
+	public float SumChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber) =>
+		_chunkWeights.SumChunkWeights(startLogicalChunkNumber, endLogicalChunkNumber);
+
+	public void ResetChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber) =>
+		_chunkWeights.ResetChunkWeights(startLogicalChunkNumber, endLogicalChunkNumber);
+
+	public bool TryGetChunkExecutionInfo(TStreamId streamId, out ChunkExecutionInfo info) =>
+		_originalStreamDatas.TryGetChunkExecutionInfo(streamId, out info);
+
+	public bool TryGetMetastreamData(TStreamId streamId, out MetastreamData data) =>
+		_metastreamDatas.TryGetValue(streamId, out data);
+
+	public bool TryGetChunkTimeStampRange(int logicalChunkNumber, out ChunkTimeStampRange range) =>
+		_chunkTimeStampRanges.TryGetValue(logicalChunkNumber, out range);
+
+	public void Dispose() {
+		_onDispose();
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/ScavengeStateExtensions.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/ScavengeStateExtensions.cs
new file mode 100644
index 00000000000..14d8a897ca5
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/ScavengeStateExtensions.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging;
+
+public static class ScavengeStateExtensions {
+	public static void SetCheckpoint(
+		this IScavengeStateCommon state,
+		ScavengeCheckpoint checkpoint) {
+
+		var transaction = state.BeginTransaction();
+		try {
+			transaction.Commit(checkpoint);
+		} catch {
+			transaction.Rollback();
+			throw;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/ScavengeStatusTracker.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/ScavengeStatusTracker.cs
new file mode 100644
index 00000000000..3786f76156f
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/ScavengeStatusTracker.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Metrics;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging;
+
+public interface IScavengeStatusTracker {
+	IDisposable StartActivity(string name);
+}
+
+public class ScavengeStatusTracker : IScavengeStatusTracker {
+	private static ActivityStatusSubMetric _subMetric;
+
+	public ScavengeStatusTracker(StatusMetric metric) {
+		_subMetric = new("Scavenge", metric);
+	}
+
+	public IDisposable StartActivity(string name) =>
+		_subMetric?.StartActivity(name + " Phase");
+
+	public class NoOp : IScavengeStatusTracker {
+		public IDisposable StartActivity(string name) => null;
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Scavenger.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Scavenger.cs
new file mode 100644
index 00000000000..7c24788ace1
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Scavenger.cs
@@ -0,0 +1,367 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Runtime.CompilerServices;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Serilog;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging;
+
+public class Scavenger<TStreamId> : IScavenger {
+	private readonly ILogger _logger;
+	private readonly Action _checkPreconditions;
+	private readonly IScavengeState<TStreamId> _state;
+	private readonly IAccumulator<TStreamId> _accumulator;
+	private readonly ICalculator<TStreamId> _calculator;
+	private readonly IChunkExecutor<TStreamId> _chunkExecutor;
+	private readonly IChunkMerger _chunkMerger;
+	private readonly IIndexExecutor<TStreamId> _indexExecutor;
+	private readonly ICleaner _cleaner;
+	private readonly IScavengePointSource _scavengePointSource;
+	private readonly ITFChunkScavengerLog _scavengerLogger;
+	private readonly IScavengeStatusTracker _statusTracker;
+	private readonly int _thresholdForNewScavenge;
+	private readonly bool _syncOnly;
+	private readonly Func<string> _getThrottleStats;
+
+	private readonly Dictionary<string, TimeSpan> _recordedTimes =
+		new Dictionary<string, TimeSpan>();
+
+	public Scavenger(
+		ILogger logger,
+		Action checkPreconditions,
+		IScavengeState<TStreamId> state,
+		IAccumulator<TStreamId> accumulator,
+		ICalculator<TStreamId> calculator,
+		IChunkExecutor<TStreamId> chunkExecutor,
+		IChunkMerger chunkMerger,
+		IIndexExecutor<TStreamId> indexExecutor,
+		ICleaner cleaner,
+		IScavengePointSource scavengePointSource,
+		ITFChunkScavengerLog scavengerLogger,
+		IScavengeStatusTracker statusTracker,
+		int thresholdForNewScavenge,
+		bool syncOnly,
+		Func<string> getThrottleStats) {
+
+		_logger = logger;
+		_checkPreconditions = checkPreconditions;
+		_state = state;
+		_accumulator = accumulator;
+		_calculator = calculator;
+		_chunkExecutor = chunkExecutor;
+		_chunkMerger = chunkMerger;
+		_indexExecutor = indexExecutor;
+		_cleaner = cleaner;
+		_scavengePointSource = scavengePointSource;
+		_scavengerLogger = scavengerLogger;
+		_statusTracker = statusTracker;
+		_thresholdForNewScavenge = thresholdForNewScavenge;
+		_syncOnly = syncOnly;
+		_getThrottleStats = getThrottleStats;
+	}
+
+	public string ScavengeId => _scavengerLogger.ScavengeId;
+
+	public void Dispose() {
+		_state.Dispose();
+	}
+
+	// following old scavenging design the returned task must complete successfully
+	[AsyncMethodBuilder(typeof(SpawningAsyncTaskMethodBuilder<>))] // get off the main queue
+	public async Task<ScavengeResult> ScavengeAsync(CancellationToken cancellationToken) {
+		_recordedTimes.Clear();
+		var stopwatch = Stopwatch.StartNew();
+		var result = ScavengeResult.Success;
+		string error = null;
+		try {
+			_logger.Debug("SCAVENGING: Scavenge Initializing State.");
+			_state.Init();
+			_state.LogStats();
+			_logger.Debug("SCAVENGING: Scavenge Started.");
+			LogCollisions();
+
+			_scavengerLogger.ScavengeStarted();
+
+			await RunInternal(_scavengerLogger, stopwatch, cancellationToken);
+
+			_logger.Debug(
+				"SCAVENGING: Scavenge Completed. Total time taken: {elapsed}. Total space saved: {spaceSaved}.",
+				stopwatch.Elapsed, _scavengerLogger.SpaceSaved);
+
+		} catch (OperationCanceledException) {
+			_logger.Information("SCAVENGING: Scavenge Stopped. Total time taken: {elapsed}.",
+				stopwatch.Elapsed);
+			result = ScavengeResult.Stopped;
+		} catch (Exception exc) {
+			result = ScavengeResult.Errored;
+			_logger.Error(exc, "SCAVENGING: Scavenge Failed. Total time taken: {elapsed}.",
+				stopwatch.Elapsed);
+			error = string.Format("Error while scavenging DB: {0}.", exc.Message);
+		} finally {
+			try {
+				_scavengerLogger.ScavengeCompleted(result, error, stopwatch.Elapsed);
+				LogCollisions();
+				LogTimes();
+			} catch (Exception ex) {
+				_logger.Error(
+					ex,
+					"SCAVENGING: Error whilst recording scavenge completed. " +
+					"Scavenge result: {result}, Elapsed: {elapsed}, Original error: {e}",
+					result, stopwatch.Elapsed, error);
+			}
+		}
+
+		return result;
+	}
+
+	private void LogCollisions() {
+		var collisions = _state.AllCollisions().ToArray();
+		_logger.Debug("SCAVENGING: {count} KNOWN COLLISIONS", collisions.Length);
+
+		foreach (var collision in collisions) {
+			_logger.Debug("SCAVENGING: KNOWN COLLISION: \"{collision}\"", collision);
+		}
+	}
+
+	private async Task RunInternal(
+		ITFChunkScavengerLog scavengerLogger,
+		Stopwatch stopwatch,
+		CancellationToken cancellationToken) {
+
+		_checkPreconditions();
+
+		// each component can be started with either
+		//  (i) a checkpoint that it wrote previously (it will continue from there)
+		//  (ii) fresh from a given scavengepoint
+		//
+		// so if we have a checkpoint from a component, start the scavenge by passing the checkpoint
+		// into that component and then starting each subsequent component fresh for that
+		// scavengepoint.
+		//
+		// otherwise, start the whole scavenge fresh from whichever scavengepoint is applicable.
+		if (!_state.TryGetCheckpoint(out var checkpoint)) {
+			// there is no checkpoint, so this is the first scavenge of this scavenge state
+			// (not necessarily the first scavenge of this database, old scavenged may have been run
+			// or new scavenges run and the scavenge state deleted)
+			_logger.Debug("SCAVENGING: Started a new scavenge with no checkpoint");
+			await StartNewAsync(
+				prevScavengePoint: null,
+				scavengerLogger,
+				stopwatch,
+				cancellationToken);
+
+		} else if (checkpoint is ScavengeCheckpoint.Done done) {
+			// start of a subsequent scavenge.
+			_logger.Debug("SCAVENGING: Started a new scavenge after checkpoint {checkpoint}", checkpoint);
+			await StartNewAsync(
+				prevScavengePoint: done.ScavengePoint,
+				scavengerLogger,
+				stopwatch,
+				cancellationToken);
+
+		} else {
+			// the other cases are continuing an incomplete scavenge
+			_logger.Debug("SCAVENGING: Continuing a scavenge from {checkpoint}", checkpoint);
+			switch (checkpoint) {
+				case ScavengeCheckpoint.Accumulating accumulating:
+					await Time(stopwatch, "Accumulation", cancellationToken =>
+							_accumulator.Accumulate(accumulating, _state, cancellationToken)
+						, cancellationToken);
+					await AfterAccumulation(
+						accumulating.ScavengePoint, scavengerLogger, stopwatch, cancellationToken);
+					break;
+				case ScavengeCheckpoint.Calculating<TStreamId> calculating:
+					await Time(stopwatch, "Calculation", cancellationToken =>
+							_calculator.Calculate(calculating, _state, cancellationToken),
+						cancellationToken);
+					await AfterCalculation(
+						calculating.ScavengePoint, scavengerLogger, stopwatch, cancellationToken);
+					break;
+				case ScavengeCheckpoint.ExecutingChunks executingChunks:
+					await Time(stopwatch, "Chunk execution", cancellationToken =>
+							_chunkExecutor.Execute(executingChunks, _state, scavengerLogger, cancellationToken),
+						cancellationToken);
+					await AfterChunkExecution(
+						executingChunks.ScavengePoint, scavengerLogger, stopwatch, cancellationToken);
+					break;
+				case ScavengeCheckpoint.MergingChunks mergingChunks:
+					await Time(stopwatch, "Chunk merging", cancellationToken =>
+							_chunkMerger.MergeChunks(mergingChunks, _state, scavengerLogger, cancellationToken),
+						cancellationToken);
+					await AfterChunkMerging(
+						mergingChunks.ScavengePoint, scavengerLogger, stopwatch, cancellationToken);
+					break;
+				case ScavengeCheckpoint.ExecutingIndex executingIndex:
+					await Time(stopwatch, "Index execution", cancellationToken =>
+							_indexExecutor.Execute(executingIndex, _state, scavengerLogger, cancellationToken),
+						cancellationToken);
+					await AfterIndexExecution(
+						executingIndex.ScavengePoint, stopwatch, cancellationToken);
+					break;
+				case ScavengeCheckpoint.Cleaning cleaning:
+					await Time(stopwatch, "Cleaning", cancellationToken => {
+						_cleaner.Clean(cleaning, _state, cancellationToken);
+						return ValueTask.CompletedTask;
+					}, cancellationToken);
+					AfterCleaning(cleaning.ScavengePoint);
+					break;
+				default:
+					throw new Exception($"Unexpected checkpoint: {checkpoint}");
+			}
+		}
+	}
+
+	private async ValueTask Time(Stopwatch stopwatch, string name, Func<CancellationToken, ValueTask> f, CancellationToken token) {
+		using var _ = _statusTracker.StartActivity(name);
+		_logger.Debug("SCAVENGING: Scavenge " + name + " Phase Started.");
+		var start = stopwatch.Elapsed;
+		await f(token);
+		var elapsed = stopwatch.Elapsed - start;
+		_state.LogStats();
+		_logger.Debug($"SCAVENGING: {_getThrottleStats()}");
+		_logger.Debug("SCAVENGING: Scavenge " + name + " Phase Completed. Took {elapsed}.", elapsed);
+		_recordedTimes[name] = elapsed;
+	}
+
+	private void LogTimes() {
+		foreach (var key in _recordedTimes.Keys.OrderBy(x => x)) {
+			_logger.Debug("SCAVENGING: {name} took {elapsed}", key, _recordedTimes[key]);
+		}
+	}
+
+	private async Task StartNewAsync(
+		ScavengePoint prevScavengePoint,
+		ITFChunkScavengerLog scavengerLogger,
+		Stopwatch stopwatch,
+		CancellationToken cancellationToken) {
+
+		// prevScavengePoint is the previous one that was completed
+		// latestScavengePoint is the latest one in the database
+		// nextScavengePoint is the one we are about to scavenge up to
+
+		ScavengePoint nextScavengePoint;
+		var latestScavengePoint = await _scavengePointSource
+			.GetLatestScavengePointOrDefaultAsync(cancellationToken);
+		if (latestScavengePoint == null) {
+			if (_syncOnly) {
+				_logger.Debug("SCAVENGING: No existing scavenge point to sync with, nothing to do.");
+				return;
+			} else {
+				_logger.Debug("SCAVENGING: Creating the first scavenge point.");
+				// no latest scavenge point, create the first one
+				nextScavengePoint = await _scavengePointSource
+					.AddScavengePointAsync(
+						ExpectedVersion.NoStream,
+						threshold: _thresholdForNewScavenge,
+						cancellationToken);
+			}
+		} else {
+			// got the latest scavenge point
+			if (prevScavengePoint == null ||
+				prevScavengePoint.EventNumber < latestScavengePoint.EventNumber) {
+				// the latest scavengepoint is suitable
+				_logger.Debug(
+					"SCAVENGING: Using existing scavenge point {scavengePointNumber}",
+					latestScavengePoint.EventNumber);
+				nextScavengePoint = latestScavengePoint;
+			} else {
+				if (_syncOnly) {
+					_logger.Debug("SCAVENGING: No existing scavenge point to sync with, nothing to do.");
+					return;
+				} else {
+					// the latest scavengepoint is the prev scavenge point, so create a new one
+					var expectedVersion = prevScavengePoint.EventNumber;
+					_logger.Debug(
+						"SCAVENGING: Creating the next scavenge point: {scavengePointNumber}",
+						expectedVersion + 1);
+
+					nextScavengePoint = await _scavengePointSource
+						.AddScavengePointAsync(
+							expectedVersion,
+							threshold: _thresholdForNewScavenge,
+							cancellationToken);
+				}
+			}
+		}
+
+		// we now have a nextScavengePoint.
+		await Time(stopwatch, "Accumulation", cancellationToken =>
+				_accumulator.Accumulate(prevScavengePoint, nextScavengePoint, _state, cancellationToken)
+			, cancellationToken);
+		await AfterAccumulation(nextScavengePoint, scavengerLogger, stopwatch, cancellationToken);
+	}
+
+	private async ValueTask AfterAccumulation(
+		ScavengePoint scavengepoint,
+		ITFChunkScavengerLog scavengerLogger,
+		Stopwatch stopwatch,
+		CancellationToken cancellationToken) {
+
+		LogCollisions();
+		await Time(stopwatch, "Calculation", cancellationToken =>
+			_calculator.Calculate(scavengepoint, _state, cancellationToken),
+			cancellationToken);
+		await AfterCalculation(scavengepoint, scavengerLogger, stopwatch, cancellationToken);
+	}
+
+	private async ValueTask AfterCalculation(
+		ScavengePoint scavengePoint,
+		ITFChunkScavengerLog scavengerLogger,
+		Stopwatch stopwatch,
+		CancellationToken cancellationToken) {
+
+		await Time(stopwatch, "Chunk execution", cancellationToken =>
+			_chunkExecutor.Execute(scavengePoint, _state, scavengerLogger, cancellationToken), cancellationToken);
+		await AfterChunkExecution(scavengePoint, scavengerLogger, stopwatch, cancellationToken);
+	}
+
+	private async ValueTask AfterChunkExecution(
+		ScavengePoint scavengePoint,
+		ITFChunkScavengerLog scavengerLogger,
+		Stopwatch stopwatch,
+		CancellationToken cancellationToken) {
+
+		await Time(stopwatch, "Chunk merging", cancellationToken =>
+			_chunkMerger.MergeChunks(scavengePoint, _state, scavengerLogger, cancellationToken), cancellationToken);
+		await AfterChunkMerging(scavengePoint, scavengerLogger, stopwatch, cancellationToken);
+	}
+
+	private async ValueTask AfterChunkMerging(
+		ScavengePoint scavengePoint,
+		ITFChunkScavengerLog scavengerLogger,
+		Stopwatch stopwatch,
+		CancellationToken cancellationToken) {
+
+		await Time(stopwatch, "Index execution", cancellationToken =>
+			_indexExecutor.Execute(scavengePoint, _state, scavengerLogger, cancellationToken),
+			cancellationToken);
+		await AfterIndexExecution(scavengePoint, stopwatch, cancellationToken);
+	}
+
+	private async ValueTask AfterIndexExecution(
+		ScavengePoint scavengePoint,
+		Stopwatch stopwatch,
+		CancellationToken cancellationToken) {
+
+		await Time(stopwatch, "Cleaning", cancellationToken => {
+			_cleaner.Clean(scavengePoint, _state, cancellationToken);
+			return ValueTask.CompletedTask;
+		}, cancellationToken);
+		AfterCleaning(scavengePoint);
+	}
+
+	private void AfterCleaning(ScavengePoint scavengePoint) {
+		_state.SetCheckpoint(new ScavengeCheckpoint.Done(scavengePoint));
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/IInitializeSqliteBackend.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/IInitializeSqliteBackend.cs
new file mode 100644
index 00000000000..f31a4284ece
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/IInitializeSqliteBackend.cs
@@ -0,0 +1,8 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+
+public interface IInitializeSqliteBackend {
+	void Initialize(SqliteBackend sqlite);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteBackend.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteBackend.cs
new file mode 100644
index 00000000000..6102addc945
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteBackend.cs
@@ -0,0 +1,232 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using Microsoft.Data.Sqlite;
+using Serilog;
+using SQLitePCL;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+
+public class SqliteBackend : IDisposable {
+	protected static readonly ILogger Log = Serilog.Log.ForContext<SqliteBackend>();
+	private readonly SqliteConnection _connection;
+	private SqliteTransaction _transaction;
+	private const int SqliteDuplicateKeyError = 19;
+
+	public const string CacheSize = "cache_size";
+	public const string PageCount = "page_count";
+	public const string PageSize = "page_size";
+	public const string Synchronous = "synchronous";
+	public const string JournalMode = "journal_mode";
+	public const string WalAutocheckpoint = "wal_autocheckpoint";
+
+	public SqliteBackend(SqliteConnection connection) {
+		_connection = connection;
+	}
+
+	public void Dispose() {
+		_connection.Close();
+		_connection.Dispose();
+	}
+
+	public void InitializeDb(string createSql) {
+		var createTableCmd = _connection.CreateCommand();
+		createTableCmd.CommandText = createSql;
+		createTableCmd.ExecuteNonQuery();
+	}
+
+	public SqliteCommand CreateCommand() {
+		return _connection.CreateCommand();
+	}
+
+	public bool ExecuteReadAndDelete<TValue>(SqliteCommand selectCmd, SqliteCommand deleteCmd,
+		Func<SqliteDataReader, TValue> getValue, out TValue value) {
+
+		if (ExecuteSingleRead(selectCmd, getValue, out value)) {
+			var affectedRows = ExecuteNonQuery(deleteCmd);
+
+			if (affectedRows == 1) {
+				return true;
+			}
+			if (affectedRows > 1) {
+				throw new SystemException("More values removed than expected!");
+			}
+		}
+
+		value = default;
+		return false;
+	}
+
+	public int ExecuteNonQuery(SqliteCommand cmd) {
+		try {
+			cmd.Transaction = _transaction;
+			return cmd.ExecuteNonQuery();
+		} catch (SqliteException e) when (e.SqliteErrorCode == SqliteDuplicateKeyError) {
+			throw new ArgumentException();
+		}
+	}
+
+	public bool ExecuteSingleRead<TValue>(SqliteCommand cmd, Func<SqliteDataReader, TValue> getValue, out TValue value) {
+		cmd.Transaction = _transaction;
+		using (var reader = cmd.ExecuteReader()) {
+			if (reader.Read()) {
+				value = getValue(reader);
+				return true;
+			}
+		}
+
+		value = default;
+		return false;
+	}
+
+	public IEnumerable<KeyValuePair<TKey, TValue>> ExecuteReader<TKey, TValue>(SqliteCommand cmd,
+		Func<SqliteDataReader, KeyValuePair<TKey, TValue>> toValue) {
+
+		cmd.Transaction = _transaction;
+		using (var reader = cmd.ExecuteReader()) {
+			while (reader.Read()) {
+				yield return toValue(reader);
+			}
+		}
+	}
+
+	public static T GetNullableFieldValue<T>(int ordinal, SqliteDataReader reader) {
+		if (!reader.IsDBNull(ordinal)) {
+			return reader.GetFieldValue<T>(ordinal);
+		}
+
+		return default;
+	}
+
+	public static TimeSpan? GetTimeSpanFromSeconds(int ordinal, SqliteDataReader reader) {
+		if (!reader.IsDBNull(ordinal)) {
+			return TimeSpan.FromSeconds(reader.GetFieldValue<long>(ordinal));
+		}
+
+		return null;
+	}
+
+	public SqliteTransaction BeginTransaction() {
+		_transaction = _connection.BeginTransaction();
+		return _transaction;
+	}
+
+	public void ClearTransaction() {
+		_transaction = null;
+
+#if MANUAL_SQLITE_CHECKPOINT
+		// This forces the WAL to checkpoint and restart (or throws), which means all the pages in
+		// the WAL are written into the database and the WAL continues to write from the beginning of
+		// the file. Its purpose is to
+		//    1. Demonstrate that this is possible - i.e. no readers or anything else preventing
+		//       the wal from being restarted, which could, if consistent, result in a very large WAL
+		//    2. Collect some data about how many pages needed to be moved
+		//
+		// We leave it off in production because
+		//    1. We don't necessarily want to do this after every commit (although our commits are
+		//       quite coarse-grained)
+		//    2. It can fail (legitimately?) on rollback when a scavenge is cancelled. We'd perhaps
+		//       only want to call this on successful commit.
+		//    3. it doesn't reuse the command or stopwatch.
+		try {
+			var sw = Stopwatch.StartNew();
+			using var cmd = _connection.CreateCommand();
+			cmd.CommandText = "PRAGMA wal_checkpoint(RESTART)";
+			using var reader = cmd.ExecuteReader();
+			if (reader.Read()) {
+				var blocked = reader.GetInt32(0);
+				var pagesModified = reader.GetInt32(1);
+				var pagesMoved = reader.GetInt32(2);
+				Log.Debug(
+					"Checkpointed and restarted the WAL in {elapsed}. blocked?: {blocked}. {pagesModified} pages modified. {pagesMoved} pages moved.",
+					sw.Elapsed, blocked, pagesModified, pagesMoved);
+			} else {
+				var msg = "Could not read result when checkpointing and restarting the WAL";
+				Log.Error(msg);
+				throw new Exception(msg);
+			}
+		} catch (Exception ex) {
+			Log.Error(ex, "Failed to checkpoint and restart the WAL");
+			throw;
+		}
+#endif
+	}
+
+	public Stats GetStats() {
+		var databaseSize = long.Parse(GetPragmaValue(PageSize)) * long.Parse(GetPragmaValue(PageCount));
+		var cacheSize = SqliteCacheSize.FromPragmaValue(GetPragmaValue(CacheSize));
+		return new Stats(raw.sqlite3_memory_used(), databaseSize, cacheSize.CacheSizeInBytes);
+	}
+
+	public void SetPragmaValue(string name, string value) {
+		using (var cmd = _connection.CreateCommand()) {
+			cmd.CommandText = $"PRAGMA {name}={value}";
+			cmd.ExecuteNonQuery();
+		}
+	}
+
+	public string GetPragmaValue(string name) {
+		var cmd = _connection.CreateCommand();
+		cmd.CommandText = "PRAGMA " + name;
+		var result = cmd.ExecuteScalar();
+
+		if (result != null) {
+			return result.ToString();
+		}
+
+		throw new Exception("Unexpected pragma result!");
+	}
+
+	public void SetCacheSize(long cacheSizeInBytes) {
+		// cache size in kibi bytes is passed as a negative value, otherwise it's amount of pages
+		var cacheSize = new SqliteCacheSize(cacheSizeInBytes);
+		SetPragmaValue(CacheSize, cacheSize.NegativeKibibytes.ToString());
+		var currentCacheSize = long.Parse(GetPragmaValue(CacheSize));
+		if (currentCacheSize != cacheSize.NegativeKibibytes) {
+			throw new Exception($"Failed to configure cache size, unexpected value: {currentCacheSize}");
+		}
+	}
+
+	public class Stats {
+		public Stats(long memoryUsage, long databaseSize, long cacheSize) {
+			MemoryUsage = memoryUsage;
+			DatabaseSize = databaseSize;
+			CacheSize = cacheSize;
+		}
+
+		public long MemoryUsage { get; }
+		public long DatabaseSize { get; }
+		public long CacheSize { get; }
+
+		public string PrettyPrint() {
+			var dbSizeMb = (float)DatabaseSize / 1_000_000;
+			var cacheSizeMb = (float)CacheSize / 1_000_000;
+			var memSizeMb = (float)MemoryUsage / 1_000_000;
+			return
+				$"ScavengeState size: {dbSizeMb:N2} MB. " +
+				$"Cache size: {cacheSizeMb:N2} MB. " +
+				$"Memory usage: {memSizeMb:N2} MB";
+		}
+	}
+
+	readonly struct SqliteCacheSize {
+		public SqliteCacheSize(long cacheSizeInBytes) {
+			CacheSizeInBytes = cacheSizeInBytes;
+		}
+
+		public static SqliteCacheSize FromPragmaValue(string value) {
+			var cacheSizeInKibiBytes = long.Parse(value);
+			return new SqliteCacheSize(-1 * cacheSizeInKibiBytes * 1024);
+		}
+
+		public long CacheSizeInBytes { get; }
+		public long NegativeKibibytes {
+			get {
+				var cacheSizeInKibiBytes = CacheSizeInBytes / 1024;
+				return -1 * cacheSizeInKibiBytes;
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteChunkTimeStampRangeScavengeMap.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteChunkTimeStampRangeScavengeMap.cs
new file mode 100644
index 00000000000..1937e68655b
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteChunkTimeStampRangeScavengeMap.cs
@@ -0,0 +1,181 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Microsoft.Data.Sqlite;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+
+public class SqliteChunkTimeStampRangeScavengeMap : IInitializeSqliteBackend, IScavengeMap<int, ChunkTimeStampRange> {
+	private AddCommand _add;
+	private GetCommand _get;
+	private DeleteCommand _delete;
+	private AllRecordsCommand _all;
+	private static Func<SqliteDataReader, ChunkTimeStampRange> _readChunkTimeStampRange;
+
+	private const string TableName = "ChunkTimeStampRanges";
+
+	public SqliteChunkTimeStampRangeScavengeMap() {
+		_readChunkTimeStampRange = reader => {
+			var min = new DateTime(reader.GetInt64(0), DateTimeKind.Utc);
+			var max = new DateTime(reader.GetInt64(1), DateTimeKind.Utc);
+			return new ChunkTimeStampRange(min, max);
+		};
+	}
+
+	public void Initialize(SqliteBackend sqlite) {
+		var sql = $@"
+				CREATE TABLE IF NOT EXISTS {TableName} (
+					key INTEGER PRIMARY KEY,
+					min INTEGER,
+					max INTEGER)";
+
+		sqlite.InitializeDb(sql);
+
+		_add = new AddCommand(TableName, sqlite);
+		_get = new GetCommand(TableName, sqlite);
+		_delete = new DeleteCommand(TableName, sqlite);
+		_all = new AllRecordsCommand(TableName, sqlite);
+	}
+
+	public ChunkTimeStampRange this[int key] {
+		set => _add.Execute(key, value);
+	}
+
+	public bool TryGetValue(int key, out ChunkTimeStampRange value) {
+		return _get.TryExecute(key, out value);
+	}
+
+	public bool TryRemove(int key, out ChunkTimeStampRange value) {
+		return _delete.TryExecute(key, out value);
+	}
+
+	public IEnumerable<KeyValuePair<int, ChunkTimeStampRange>> AllRecords() {
+		return _all.Execute();
+	}
+
+	private class AddCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly SqliteParameter _keyParam;
+		private readonly SqliteParameter _minParam;
+		private readonly SqliteParameter _maxParam;
+
+		public AddCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $@"
+					INSERT INTO {tableName}
+					VALUES($key, $min, $max)
+					ON CONFLICT(key) DO UPDATE SET min=$min, max=$max";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_keyParam = _cmd.Parameters.Add("$key", SqliteType.Integer);
+			_minParam = _cmd.Parameters.Add("$min", SqliteType.Integer);
+			_maxParam = _cmd.Parameters.Add("$max", SqliteType.Integer);
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+		}
+
+		public void Execute(int key, ChunkTimeStampRange value) {
+			_keyParam.Value = key;
+			_minParam.Value = value.Min.Ticks;
+			_maxParam.Value = value.Max.Ticks;
+			_sqlite.ExecuteNonQuery(_cmd);
+		}
+	}
+
+	private class GetCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly SqliteParameter _keyParam;
+
+		public GetCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $@"
+					SELECT min, max
+					FROM {tableName}
+					WHERE key = $key";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_keyParam = _cmd.Parameters.Add("$key", SqliteType.Integer);
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+		}
+
+		public bool TryExecute(int key, out ChunkTimeStampRange value) {
+			_keyParam.Value = key;
+			return _sqlite.ExecuteSingleRead(_cmd, _readChunkTimeStampRange, out value);
+		}
+	}
+
+	private class DeleteCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _selectCmd;
+		private readonly SqliteCommand _deleteCmd;
+		private readonly SqliteParameter _selectKeyParam;
+		private readonly SqliteParameter _deleteKeyParam;
+
+		public DeleteCommand(string tableName, SqliteBackend sqlite) {
+			var selectSql = $@"
+					SELECT min, max
+					FROM {tableName}
+					WHERE key = $key";
+
+			_selectCmd = sqlite.CreateCommand();
+			_selectCmd.CommandText = selectSql;
+			_selectKeyParam = _selectCmd.Parameters.Add("$key", SqliteType.Integer);
+			_selectCmd.Prepare();
+
+			var deleteSql = $@"
+					DELETE FROM {tableName}
+					WHERE key = $key";
+
+			_deleteCmd = sqlite.CreateCommand();
+			_deleteCmd.CommandText = deleteSql;
+			_deleteKeyParam = _deleteCmd.Parameters.Add("$key", SqliteType.Integer);
+			_deleteCmd.Prepare();
+
+			_sqlite = sqlite;
+		}
+
+		public bool TryExecute(int key, out ChunkTimeStampRange value) {
+			_selectKeyParam.Value = key;
+			_deleteKeyParam.Value = key;
+			return _sqlite.ExecuteReadAndDelete(_selectCmd, _deleteCmd, _readChunkTimeStampRange, out value);
+		}
+	}
+
+	private class AllRecordsCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly Func<SqliteDataReader, KeyValuePair<int, ChunkTimeStampRange>> _reader;
+
+		public AllRecordsCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $@"
+					SELECT min, max, key
+					FROM {tableName}
+					ORDER BY key";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+
+			_reader = reader => {
+				var chunkTimeStampRange = _readChunkTimeStampRange(reader);
+				var key = reader.GetFieldValue<int>(2);
+				return new KeyValuePair<int, ChunkTimeStampRange>(key, chunkTimeStampRange);
+			};
+		}
+
+		public IEnumerable<KeyValuePair<int, ChunkTimeStampRange>> Execute() {
+			return _sqlite.ExecuteReader(_cmd, _reader);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteChunkWeightScavengeMap.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteChunkWeightScavengeMap.cs
new file mode 100644
index 00000000000..6ec256afdc5
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteChunkWeightScavengeMap.cs
@@ -0,0 +1,155 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Microsoft.Data.Sqlite;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+
+public class SqliteChunkWeightScavengeMap : SqliteScavengeMap<int, float>, IChunkWeightScavengeMap {
+	private IncreaseWeightCommand _increaseWeight;
+	private AllWeightsAreZeroCommand _allWeightsAreZero;
+	private SumChunkWeightsCommand _sumChunkWeights;
+	private ResetChunkWeightsCommand _resetChunkWeights;
+
+	private const string MapName = "ChunkWeights";
+
+	public SqliteChunkWeightScavengeMap() : base(MapName) { }
+
+	public override void Initialize(SqliteBackend sqlite) {
+		base.Initialize(sqlite);
+
+		_increaseWeight = new IncreaseWeightCommand(TableName, sqlite);
+		_allWeightsAreZero = new AllWeightsAreZeroCommand(TableName, sqlite);
+		_sumChunkWeights = new SumChunkWeightsCommand(TableName, sqlite);
+		_resetChunkWeights = new ResetChunkWeightsCommand(TableName, sqlite);
+	}
+
+	public bool AllWeightsAreZero() {
+		return _allWeightsAreZero.Execute();
+	}
+
+	public void IncreaseWeight(int logicalChunkNumber, float extraWeight) {
+		_increaseWeight.Execute(logicalChunkNumber, extraWeight);
+	}
+
+	public float SumChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber) {
+		return _sumChunkWeights.Execute(startLogicalChunkNumber, endLogicalChunkNumber);
+	}
+
+	public void ResetChunkWeights(int startLogicalChunkNumber, int endLogicalChunkNumber) {
+		_resetChunkWeights.Execute(startLogicalChunkNumber, endLogicalChunkNumber);
+	}
+
+	private class IncreaseWeightCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly SqliteParameter _keyParam;
+		private readonly SqliteParameter _valueParam;
+
+		public IncreaseWeightCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $@"
+					INSERT INTO {tableName} (key, value)
+					VALUES($key, $value)
+				    ON CONFLICT(key) DO UPDATE SET value=value+$value";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_keyParam = _cmd.Parameters.Add("$key", SqliteType.Integer);
+			_valueParam = _cmd.Parameters.Add("$value", SqliteType.Real);
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+		}
+
+		public void Execute(int logicalChunkNumber, float extraWeight) {
+			_keyParam.Value = logicalChunkNumber;
+			_valueParam.Value = extraWeight;
+			_sqlite.ExecuteNonQuery(_cmd);
+		}
+	}
+
+	// All weights are zero if there do not exist any rows with a nonzero weight
+	private class AllWeightsAreZeroCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private Func<SqliteDataReader, bool> _reader;
+
+		public AllWeightsAreZeroCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $@"
+					SELECT EXISTS (
+						SELECT 1
+						FROM {tableName}
+						WHERE value <> 0
+					)";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+			_reader = reader => reader.GetBoolean(0);
+		}
+
+		public bool Execute() {
+			_sqlite.ExecuteSingleRead(_cmd, _reader, out var exists);
+			return !exists;
+		}
+	}
+
+	private class SumChunkWeightsCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly SqliteParameter _startParam;
+		private readonly SqliteParameter _endParam;
+		private Func<SqliteDataReader, float> _reader;
+
+		public SumChunkWeightsCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $@"
+					SELECT SUM(value)
+					FROM {tableName}
+					WHERE key BETWEEN $start AND $end";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_startParam = _cmd.Parameters.Add("$start", SqliteType.Integer);
+			_endParam = _cmd.Parameters.Add("$end", SqliteType.Integer);
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+			_reader = reader => reader.IsDBNull(0) ? 0 : reader.GetFloat(0);
+		}
+
+		public float Execute(int startLogicalChunkNumber, int endLogicalChunkNumber) {
+			_startParam.Value = startLogicalChunkNumber;
+			_endParam.Value = endLogicalChunkNumber;
+			_sqlite.ExecuteSingleRead(_cmd, _reader, out var value);
+			return value;
+		}
+	}
+
+	private class ResetChunkWeightsCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly SqliteParameter _startParam;
+		private readonly SqliteParameter _endParam;
+
+		public ResetChunkWeightsCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $"DELETE FROM {tableName} WHERE key BETWEEN $start AND $end";
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_startParam = _cmd.Parameters.Add("$start", SqliteType.Integer);
+			_endParam = _cmd.Parameters.Add("$end", SqliteType.Integer);
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+		}
+
+		public void Execute(int startLogicalChunkNumber, int endLogicalChunkNumber) {
+			_startParam.Value = startLogicalChunkNumber;
+			_endParam.Value = endLogicalChunkNumber;
+			_sqlite.ExecuteNonQuery(_cmd);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteCollisionScavengeMap.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteCollisionScavengeMap.cs
new file mode 100644
index 00000000000..922f0cd4832
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteCollisionScavengeMap.cs
@@ -0,0 +1,176 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Microsoft.Data.Sqlite;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+
+public class SqliteCollisionScavengeMap<TKey> : IInitializeSqliteBackend, IScavengeMap<TKey, Unit> {
+	private AddCommand _add;
+	private GetCommand _get;
+	private RemoveCommand _remove;
+	private AllRecordsCommand _all;
+
+	private const string TableName = "HashCollisions";
+
+	public void Initialize(SqliteBackend sqlite) {
+		var sql = $@"
+				CREATE TABLE IF NOT EXISTS {TableName} (
+					key {SqliteTypeMapping.GetTypeName<TKey>()} PRIMARY KEY)";
+
+		sqlite.InitializeDb(sql);
+
+		_add = new AddCommand(sqlite);
+		_get = new GetCommand(sqlite);
+		_all = new AllRecordsCommand(sqlite);
+		_remove = new RemoveCommand(sqlite);
+	}
+
+	public Unit this[TKey key] {
+		set => AddValue(key, value);
+	}
+
+	private void AddValue(TKey key, Unit _) {
+		_add.Execute(key);
+	}
+
+	public bool TryGetValue(TKey key, out Unit value) {
+		if (_get.TryExecute(key)) {
+			value = Unit.Instance;
+			return true;
+		}
+
+		return false;
+	}
+
+	public bool TryRemove(TKey key, out Unit value) {
+		if (_remove.TryExecute(key)) {
+			value = Unit.Instance;
+			return true;
+		}
+
+		return false;
+	}
+
+	public IEnumerable<KeyValuePair<TKey, Unit>> AllRecords() {
+		return _all.Execute();
+	}
+
+	private class AddCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly SqliteParameter _keyParam;
+
+		public AddCommand(SqliteBackend sqlite) {
+			var sql = $@"
+					INSERT INTO {TableName}
+					VALUES($key)
+					ON CONFLICT(key) DO UPDATE SET key=$key";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+		}
+
+		public void Execute(TKey key) {
+			_keyParam.Value = key;
+			_sqlite.ExecuteNonQuery(_cmd);
+		}
+	}
+
+	private class GetCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly SqliteParameter _keyParam;
+		private readonly Func<SqliteDataReader, Unit> _reader;
+
+		public GetCommand(SqliteBackend sqlite) {
+			var sql = $@"
+					SELECT key
+					FROM {TableName}
+					WHERE key = $key";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+			_reader = reader => Unit.Instance;
+		}
+
+		public bool TryExecute(TKey key) {
+			_keyParam.Value = key;
+			return _sqlite.ExecuteSingleRead(_cmd, _reader, out _);
+		}
+	}
+	private class RemoveCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _selectCmd;
+		private readonly SqliteCommand _deleteCmd;
+		private readonly SqliteParameter _selectKeyParam;
+		private readonly SqliteParameter _deleteKeyParam;
+		private readonly Func<SqliteDataReader, Unit> _reader;
+
+		public RemoveCommand(SqliteBackend sqlite) {
+			_sqlite = sqlite;
+			_reader = reader => Unit.Instance;
+
+			var selectSql = $@"
+					SELECT key
+					FROM {TableName}
+					WHERE key = $key";
+
+			_selectCmd = sqlite.CreateCommand();
+			_selectCmd.CommandText = selectSql;
+			_selectKeyParam = _selectCmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_selectCmd.Prepare();
+
+			var deleteSql = $@"
+					DELETE FROM {TableName}
+					WHERE key = $key";
+
+			_deleteCmd = sqlite.CreateCommand();
+			_deleteCmd.CommandText = deleteSql;
+			_deleteKeyParam = _deleteCmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_deleteCmd.Prepare();
+		}
+
+		public bool TryExecute(TKey key) {
+			_selectKeyParam.Value = key;
+			_deleteKeyParam.Value = key;
+			return _sqlite.ExecuteReadAndDelete(_selectCmd, _deleteCmd, _reader, out _);
+		}
+	}
+
+	private class AllRecordsCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly Func<SqliteDataReader, KeyValuePair<TKey, Unit>> _reader;
+
+		public AllRecordsCommand(SqliteBackend sqlite) {
+			var sql = $@"
+					SELECT key
+					FROM {TableName}
+					ORDER BY key";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+			_reader = reader => new KeyValuePair<TKey, Unit>(reader.GetFieldValue<TKey>(0), Unit.Instance);
+		}
+
+		public IEnumerable<KeyValuePair<TKey, Unit>> Execute() {
+			return _sqlite.ExecuteReader(_cmd, _reader);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteMetastreamScavengeMap.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteMetastreamScavengeMap.cs
new file mode 100644
index 00000000000..fc8a521d521
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteMetastreamScavengeMap.cs
@@ -0,0 +1,275 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Microsoft.Data.Sqlite;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+
+
+public class SqliteMetastreamScavengeMap<TKey> : IInitializeSqliteBackend, IMetastreamScavengeMap<TKey> {
+	private readonly string _keyTypeOverride;
+	private AddCommand _add;
+	private SetTombstoneCommand _setTombstone;
+	private SetDiscardPointCommand _setDiscardPoint;
+	private GetCommand _get;
+	private DeleteCommand _delete;
+	private DeleteAllCommand _deleteAll;
+	private AllRecordsCommand _all;
+	private static Func<SqliteDataReader, MetastreamData> _readMetastreamData;
+
+	private string TableName { get; }
+
+	public SqliteMetastreamScavengeMap(string name, string keyTypeOverride = null) {
+		TableName = name;
+		_keyTypeOverride = keyTypeOverride;
+		_readMetastreamData = reader => {
+			var isTombstoned = reader.GetBoolean(0);
+			var discardPoint = DiscardPoint.KeepAll;
+			var discardPointField = SqliteBackend.GetNullableFieldValue<long?>(1, reader);
+			if (discardPointField.HasValue) {
+				discardPoint = DiscardPoint.DiscardBefore(discardPointField.Value);
+			}
+
+			return new MetastreamData(isTombstoned, discardPoint);
+		};
+	}
+
+	public void Initialize(SqliteBackend sqlite) {
+		var keyType = _keyTypeOverride ?? SqliteTypeMapping.GetTypeName<TKey>();
+		var sql = $@"
+				CREATE TABLE IF NOT EXISTS {TableName} (
+					key {keyType} PRIMARY KEY,
+					isTombstoned INTEGER DEFAULT 0,
+					discardPoint INTEGER NULL)";
+
+		sqlite.InitializeDb(sql);
+
+		_add = new AddCommand(TableName, sqlite);
+		_setTombstone = new SetTombstoneCommand(TableName, sqlite);
+		_setDiscardPoint = new SetDiscardPointCommand(TableName, sqlite);
+		_get = new GetCommand(TableName, sqlite);
+		_delete = new DeleteCommand(TableName, sqlite);
+		_deleteAll = new DeleteAllCommand(TableName, sqlite);
+		_all = new AllRecordsCommand(TableName, sqlite);
+	}
+
+	public MetastreamData this[TKey key] {
+		set => _add.Execute(key, value);
+	}
+
+	public bool TryGetValue(TKey key, out MetastreamData value) {
+		return _get.TryExecute(key, out value);
+	}
+
+	public bool TryRemove(TKey key, out MetastreamData value) {
+		return _delete.TryExecute(key, out value);
+	}
+
+	public IEnumerable<KeyValuePair<TKey, MetastreamData>> AllRecords() {
+		return _all.Execute();
+	}
+
+	public void SetTombstone(TKey key) {
+		_setTombstone.Execute(key);
+	}
+
+	public void SetDiscardPoint(TKey key, DiscardPoint discardPoint) {
+		_setDiscardPoint.Execute(key, discardPoint);
+	}
+
+	public void DeleteAll() {
+		_deleteAll.Execute();
+	}
+
+	private class AddCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly SqliteParameter _keyParam;
+		private readonly SqliteParameter _isTombstonedParam;
+		private readonly SqliteParameter _discardPointParam;
+
+		public AddCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $@"
+					INSERT INTO {tableName}
+					VALUES($key, $isTombstoned, $discardPoint)
+					ON CONFLICT(key) DO UPDATE SET
+						isTombstoned=$isTombstoned,
+						discardPoint=$discardPoint";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_isTombstonedParam = _cmd.Parameters.Add("$isTombstoned", SqliteType.Integer);
+			_discardPointParam = _cmd.Parameters.Add("$discardPoint", SqliteType.Integer);
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+		}
+
+		public void Execute(TKey key, MetastreamData value) {
+			_keyParam.Value = key;
+			_isTombstonedParam.Value = value.IsTombstoned;
+			_discardPointParam.Value = value.DiscardPoint.FirstEventNumberToKeep;
+			_sqlite.ExecuteNonQuery(_cmd);
+		}
+	}
+
+	private class SetTombstoneCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly SqliteParameter _keyParam;
+
+		public SetTombstoneCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $@"
+					INSERT INTO {tableName} (key, isTombstoned)
+					VALUES($key, 1)
+					ON CONFLICT(key) DO UPDATE SET isTombstoned=1";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+		}
+
+		public void Execute(TKey key) {
+			_keyParam.Value = key;
+			_sqlite.ExecuteNonQuery(_cmd);
+		}
+	}
+
+	private class SetDiscardPointCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly SqliteParameter _keyParam;
+		private readonly SqliteParameter _discardPointParam;
+
+		public SetDiscardPointCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $@"
+					INSERT INTO {tableName} (key, discardPoint)
+					VALUES ($key, $discardPoint)
+					ON CONFLICT(key) DO UPDATE SET discardPoint = $discardPoint";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_discardPointParam = _cmd.Parameters.Add("$discardPoint", SqliteType.Integer);
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+		}
+
+		public void Execute(TKey key, DiscardPoint discardPoint) {
+			_keyParam.Value = key;
+			_discardPointParam.Value = discardPoint.FirstEventNumberToKeep;
+			_sqlite.ExecuteNonQuery(_cmd);
+		}
+	}
+
+	private class GetCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly SqliteParameter _keyParam;
+
+		public GetCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $@"
+					SELECT isTombstoned, discardPoint
+					FROM {tableName}
+					WHERE key = $key";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+		}
+
+		public bool TryExecute(TKey key, out MetastreamData value) {
+			_keyParam.Value = key;
+			return _sqlite.ExecuteSingleRead(_cmd, _readMetastreamData, out value);
+		}
+	}
+
+	private class DeleteCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _selectCmd;
+		private readonly SqliteCommand _deleteCmd;
+		private readonly SqliteParameter _selectKeyParam;
+		private readonly SqliteParameter _deleteKeyParam;
+
+		public DeleteCommand(string tableName, SqliteBackend sqlite) {
+			var selectSql = $"SELECT isTombstoned, discardPoint FROM {tableName} WHERE key = $key";
+			_selectCmd = sqlite.CreateCommand();
+			_selectCmd.CommandText = selectSql;
+			_selectKeyParam = _selectCmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_selectCmd.Prepare();
+
+			var deleteSql = $"DELETE FROM {tableName} WHERE key = $key";
+			_deleteCmd = sqlite.CreateCommand();
+			_deleteCmd.CommandText = deleteSql;
+			_deleteKeyParam = _deleteCmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_deleteCmd.Prepare();
+
+			_sqlite = sqlite;
+		}
+
+		public bool TryExecute(TKey key, out MetastreamData value) {
+			_selectKeyParam.Value = key;
+			_deleteKeyParam.Value = key;
+			return _sqlite.ExecuteReadAndDelete(_selectCmd, _deleteCmd, _readMetastreamData, out value);
+		}
+	}
+
+	private class DeleteAllCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _deleteCmd;
+
+		public DeleteAllCommand(string tableName, SqliteBackend sqlite) {
+			// sqlite treats this efficiently (as a truncate) https://www.sqlite.org/lang_delete.html
+			var deleteSql = $"DELETE FROM {tableName}";
+			_deleteCmd = sqlite.CreateCommand();
+			_deleteCmd.CommandText = deleteSql;
+			_deleteCmd.Prepare();
+
+			_sqlite = sqlite;
+		}
+
+		public void Execute() {
+			_sqlite.ExecuteNonQuery(_deleteCmd);
+		}
+	}
+
+	private class AllRecordsCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly Func<SqliteDataReader, KeyValuePair<TKey, MetastreamData>> _reader;
+
+		public AllRecordsCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $@"
+					SELECT isTombstoned, discardPoint, key
+					FROM {tableName}
+					ORDER BY key";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+			_reader = reader => {
+				var value = _readMetastreamData(reader);
+				var key = reader.GetFieldValue<TKey>(2);
+				return new KeyValuePair<TKey, MetastreamData>(key, value);
+			};
+		}
+
+		public IEnumerable<KeyValuePair<TKey, MetastreamData>> Execute() {
+			return _sqlite.ExecuteReader(_cmd, _reader);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteOriginalStreamScavengeMap.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteOriginalStreamScavengeMap.cs
new file mode 100644
index 00000000000..3fcee08878d
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteOriginalStreamScavengeMap.cs
@@ -0,0 +1,526 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Microsoft.Data.Sqlite;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+
+public class SqliteOriginalStreamScavengeMap<TKey> : IInitializeSqliteBackend, IOriginalStreamScavengeMap<TKey> {
+	private readonly string _keyTypeOverride;
+	private AddCommand _add;
+	private SetTombstoneCommand _setTombstone;
+	private SetMetadataCommand _setMetadata;
+	private SetDiscardPointsCommand _setDiscardPoints;
+	private GetCommand _get;
+	private GetChunkExecutionInfoCommand _getChunkExecutionInfo;
+	private DeleteCommand _delete;
+	private DeleteManyCommand _deleteMany;
+	private FromCheckpointCommand _fromCheckpoint;
+	private AllRecordsCommand _all;
+	private ActiveRecordsCommand _active;
+	private static Func<SqliteDataReader, OriginalStreamData> _readOriginalStreamData;
+
+	private string TableName { get; }
+
+	public SqliteOriginalStreamScavengeMap(string name, string keyTypeOverride = null) {
+		TableName = name;
+		_keyTypeOverride = keyTypeOverride;
+
+		_readOriginalStreamData = reader => {
+			var d = new OriginalStreamData();
+			d.IsTombstoned = reader.GetBoolean(0);
+			d.MaxAge = SqliteBackend.GetTimeSpanFromSeconds(1, reader);
+			d.MaxCount = SqliteBackend.GetNullableFieldValue<long?>(2, reader);
+			d.TruncateBefore = SqliteBackend.GetNullableFieldValue<long?>(3, reader);
+
+			var discardPoint = SqliteBackend.GetNullableFieldValue<long?>(4, reader);
+			if (discardPoint.HasValue) {
+				d.DiscardPoint = DiscardPoint.DiscardBefore(discardPoint.Value);
+			}
+
+			var maybeDiscardPoint = SqliteBackend.GetNullableFieldValue<long?>(5, reader);
+			if (maybeDiscardPoint.HasValue) {
+				d.MaybeDiscardPoint = DiscardPoint.DiscardBefore(maybeDiscardPoint.Value);
+			}
+
+			d.Status = reader.GetFieldValue<CalculationStatus>(6);
+
+			return d;
+		};
+	}
+
+	public void Initialize(SqliteBackend sqlite) {
+		var keyType = _keyTypeOverride ?? SqliteTypeMapping.GetTypeName<TKey>();
+		var sql = $@"
+				CREATE TABLE IF NOT EXISTS {TableName} (
+					key {keyType} PRIMARY KEY,
+					isTombstoned      INTEGER DEFAULT 0,
+					maxAge            INTEGER NULL,
+					maxCount          INTEGER NULL,
+					truncateBefore    INTEGER NULL,
+					discardPoint      INTEGER DEFAULT 0,
+					maybeDiscardPoint INTEGER DEFAULT 0,
+					status            INTEGER DEFAULT 0);
+				CREATE INDEX IF NOT EXISTS {TableName}KeyStatus ON {TableName} (status, key)";
+
+		sqlite.InitializeDb(sql);
+
+		_add = new AddCommand(TableName, sqlite);
+		_setTombstone = new SetTombstoneCommand(TableName, sqlite);
+		_setMetadata = new SetMetadataCommand(TableName, sqlite);
+		_setDiscardPoints = new SetDiscardPointsCommand(TableName, sqlite);
+		_get = new GetCommand(TableName, sqlite);
+		_getChunkExecutionInfo = new GetChunkExecutionInfoCommand(TableName, sqlite);
+		_delete = new DeleteCommand(TableName, sqlite);
+		_deleteMany = new DeleteManyCommand(TableName, sqlite);
+		_fromCheckpoint = new FromCheckpointCommand(TableName, sqlite);
+		_all = new AllRecordsCommand(TableName, sqlite);
+		_active = new ActiveRecordsCommand(TableName, sqlite);
+	}
+
+	public OriginalStreamData this[TKey key] {
+		set => _add.Execute(key, value);
+	}
+
+	public bool TryGetValue(TKey key, out OriginalStreamData value) {
+		return _get.TryExecute(key, out value);
+	}
+
+	public bool TryRemove(TKey key, out OriginalStreamData value) {
+		return _delete.TryExecute(key, out value);
+	}
+
+	public void SetTombstone(TKey key) {
+		_setTombstone.Execute(key);
+	}
+
+	public void SetMetadata(TKey key, StreamMetadata metadata) {
+		_setMetadata.Execute(key, metadata);
+	}
+
+	public void SetDiscardPoints(TKey key, CalculationStatus status, DiscardPoint discardPoint, DiscardPoint maybeDiscardPoint) {
+		_setDiscardPoints.Execute(key, status, discardPoint, maybeDiscardPoint);
+	}
+
+	public bool TryGetChunkExecutionInfo(TKey key, out ChunkExecutionInfo details) {
+		return _getChunkExecutionInfo.TryExecute(key, out details);
+	}
+
+	public IEnumerable<KeyValuePair<TKey, OriginalStreamData>> AllRecords() {
+		return _all.Execute();
+	}
+
+	public IEnumerable<KeyValuePair<TKey, OriginalStreamData>> ActiveRecords() {
+		return _active.Execute();
+	}
+
+	public IEnumerable<KeyValuePair<TKey, OriginalStreamData>> ActiveRecordsFromCheckpoint(TKey checkpoint) {
+		return _fromCheckpoint.Execute(checkpoint);
+	}
+
+	public void DeleteMany(bool deleteArchived) {
+		_deleteMany.Execute(deleteArchived);
+	}
+
+	private class AddCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly SqliteParameter _keyParam;
+		private readonly SqliteParameter _isTombstonedParam;
+		private readonly SqliteParameter _maxAgeParam;
+		private readonly SqliteParameter _maxCountParam;
+		private readonly SqliteParameter _truncateBeforeParam;
+		private readonly SqliteParameter _discardPointParam;
+		private readonly SqliteParameter _maybeDiscardPointParam;
+		private readonly SqliteParameter _statusParam;
+
+		public AddCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $@"
+					INSERT INTO {tableName} VALUES(
+						$key,
+						$isTombstoned,
+						$maxAge,
+						$maxCount,
+						$truncateBefore,
+						$discardPoint,
+						$maybeDiscardPoint,
+						$status)
+					ON CONFLICT(key) DO UPDATE SET
+						isTombstoned = $isTombstoned,
+						maxAge = $maxAge,
+						maxCount = $maxCount,
+						truncateBefore = $truncateBefore,
+						discardPoint = $discardPoint,
+						maybeDiscardPoint = $maybeDiscardPoint,
+						status = $status";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_isTombstonedParam = _cmd.Parameters.Add("$isTombstoned", SqliteType.Integer);
+			_maxAgeParam = _cmd.Parameters.Add("$maxAge", SqliteType.Integer);
+			_maxCountParam = _cmd.Parameters.Add("$maxCount", SqliteType.Integer);
+			_truncateBeforeParam = _cmd.Parameters.Add("$truncateBefore", SqliteType.Integer);
+			_discardPointParam = _cmd.Parameters.Add("$discardPoint", SqliteType.Integer);
+			_maybeDiscardPointParam = _cmd.Parameters.Add("$maybeDiscardPoint", SqliteType.Integer);
+			_statusParam = _cmd.Parameters.Add("$status", SqliteType.Integer);
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+		}
+
+		public void Execute(TKey key, OriginalStreamData value) {
+			_keyParam.Value = key;
+			_isTombstonedParam.Value = value.IsTombstoned;
+			_maxAgeParam.Value = value.MaxAge.HasValue ? (object)(long)value.MaxAge.Value.TotalSeconds : DBNull.Value;
+			_maxCountParam.Value = value.MaxCount.HasValue ? (object)value.MaxCount : DBNull.Value;
+			_truncateBeforeParam.Value =
+				value.TruncateBefore.HasValue ? (object)value.TruncateBefore : DBNull.Value;
+			_discardPointParam.Value = value.DiscardPoint.FirstEventNumberToKeep;
+			_maybeDiscardPointParam.Value = value.MaybeDiscardPoint.FirstEventNumberToKeep;
+			_statusParam.Value = value.Status;
+
+			_sqlite.ExecuteNonQuery(_cmd);
+		}
+	}
+
+	private class SetTombstoneCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly SqliteParameter _keyParam;
+
+		public SetTombstoneCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $@"
+					INSERT INTO {tableName} (key, isTombstoned, status)
+					VALUES ($key, 1, {(int)CalculationStatus.Active})
+					ON CONFLICT(key) DO UPDATE SET
+						isTombstoned = 1,
+						status = {(int)CalculationStatus.Active}";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+		}
+
+		public void Execute(TKey key) {
+			_keyParam.Value = key;
+			_sqlite.ExecuteNonQuery(_cmd);
+		}
+	}
+
+	private class SetMetadataCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly SqliteParameter _keyParam;
+		private readonly SqliteParameter _maxAgeParam;
+		private readonly SqliteParameter _maxCountParam;
+		private readonly SqliteParameter _truncateBeforeParam;
+
+		public SetMetadataCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $@"
+					INSERT INTO {tableName} (key, maxAge, maxCount, truncateBefore, status)
+					VALUES($key, $maxAge, $maxCount, $truncateBefore, {(int)CalculationStatus.Active})
+					ON CONFLICT(key) DO UPDATE SET
+						maxAge = $maxAge,
+						maxCount = $maxCount,
+						truncateBefore = $truncateBefore,
+						status = {(int)CalculationStatus.Active}";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_maxAgeParam = _cmd.Parameters.Add("$maxAge", SqliteType.Integer);
+			_maxCountParam = _cmd.Parameters.Add("$maxCount", SqliteType.Integer);
+			_truncateBeforeParam = _cmd.Parameters.Add("$truncateBefore", SqliteType.Integer);
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+		}
+
+		public void Execute(TKey key, StreamMetadata value) {
+			_keyParam.Value = key;
+			_maxAgeParam.Value = value.MaxAge.HasValue ? (object)(long)value.MaxAge.Value.TotalSeconds : DBNull.Value;
+			_maxCountParam.Value = value.MaxCount.HasValue ? (object)value.MaxCount : DBNull.Value;
+			_truncateBeforeParam.Value = value.TruncateBefore.HasValue ? (object)value.TruncateBefore : DBNull.Value;
+			_sqlite.ExecuteNonQuery(_cmd);
+		}
+	}
+
+	private class SetDiscardPointsCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly SqliteParameter _keyParam;
+		private readonly SqliteParameter _discardPointParam;
+		private readonly SqliteParameter _maybeDiscardPointParam;
+		private readonly SqliteParameter _statusParam;
+
+		public SetDiscardPointsCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $@"
+					INSERT INTO {tableName} (key, discardPoint, maybeDiscardPoint, status)
+					VALUES ($key, $discardPoint, $maybeDiscardPoint, $status)
+					ON CONFLICT(key) DO UPDATE SET
+						discardPoint = $discardPoint,
+						maybeDiscardPoint = $maybeDiscardPoint,
+						status = $status";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_discardPointParam = _cmd.Parameters.Add("$discardPoint", SqliteType.Integer);
+			_maybeDiscardPointParam = _cmd.Parameters.Add("$maybeDiscardPoint", SqliteType.Integer);
+			_statusParam = _cmd.Parameters.Add("$status", SqliteType.Integer);
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+		}
+
+		public void Execute(TKey key, CalculationStatus status, DiscardPoint discardPoint, DiscardPoint maybeDiscardPoint) {
+			_keyParam.Value = key;
+			_discardPointParam.Value = discardPoint.FirstEventNumberToKeep;
+			_maybeDiscardPointParam.Value = maybeDiscardPoint.FirstEventNumberToKeep;
+			_statusParam.Value = status;
+			_sqlite.ExecuteNonQuery(_cmd);
+		}
+	}
+
+	private class GetCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly SqliteParameter _keyParam;
+
+		public GetCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $@"
+					SELECT isTombstoned, maxAge, maxCount, truncateBefore, discardPoint, maybeDiscardPoint, status
+					FROM {tableName}
+					WHERE key = $key";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+		}
+
+		public bool TryExecute(TKey key, out OriginalStreamData value) {
+			_keyParam.Value = key;
+			return _sqlite.ExecuteSingleRead(_cmd, _readOriginalStreamData, out value);
+		}
+	}
+
+	private class GetChunkExecutionInfoCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly SqliteParameter _keyParam;
+		private readonly Func<SqliteDataReader, ChunkExecutionInfo> _reader;
+
+		public GetChunkExecutionInfoCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $@"
+					SELECT isTombstoned, maxAge, discardPoint, maybeDiscardPoint
+					FROM {tableName}
+					WHERE key = $key";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+			_reader = reader => {
+				var isTombstoned = reader.GetBoolean(0);
+				var maxAge = SqliteBackend.GetTimeSpanFromSeconds(1, reader);
+				var discardPoint = DiscardPoint.DiscardBefore(reader.GetFieldValue<long>(2));
+				var maybeDiscardPoint = DiscardPoint.DiscardBefore(reader.GetFieldValue<long>(3));
+				return new ChunkExecutionInfo(isTombstoned, discardPoint, maybeDiscardPoint, maxAge);
+			};
+		}
+
+		public bool TryExecute(TKey key, out ChunkExecutionInfo value) {
+			_keyParam.Value = key;
+			return _sqlite.ExecuteSingleRead(_cmd, _reader, out value);
+		}
+	}
+
+	private class DeleteCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _selectCmd;
+		private readonly SqliteCommand _deleteCmd;
+		private readonly SqliteParameter _selectKeyParam;
+		private readonly SqliteParameter _deleteKeyParam;
+
+		public DeleteCommand(string tableName, SqliteBackend sqlite) {
+			var selectSql = $@"
+					SELECT isTombstoned, maxAge, maxCount, truncateBefore, discardPoint, maybeDiscardPoint, status
+					FROM {tableName}
+					WHERE key = $key";
+
+			_selectCmd = sqlite.CreateCommand();
+			_selectCmd.CommandText = selectSql;
+			_selectKeyParam = _selectCmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_selectCmd.Prepare();
+
+			var deleteSql = $"DELETE FROM {tableName} WHERE key = $key";
+			_deleteCmd = sqlite.CreateCommand();
+			_deleteCmd.CommandText = deleteSql;
+			_deleteKeyParam = _deleteCmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_deleteCmd.Prepare();
+
+			_sqlite = sqlite;
+		}
+
+		public bool TryExecute(TKey key, out OriginalStreamData value) {
+			_selectKeyParam.Value = key;
+			_deleteKeyParam.Value = key;
+			return _sqlite.ExecuteReadAndDelete(_selectCmd, _deleteCmd, _readOriginalStreamData, out value);
+		}
+	}
+
+	private class DeleteManyCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _deleteCmd;
+		private readonly SqliteParameter _archiveStatusParam;
+
+		public DeleteManyCommand(string tableName, SqliteBackend sqlite) {
+			var deleteSql = $@"
+					DELETE FROM {tableName}
+					WHERE status = {(int)CalculationStatus.Spent} OR status = $archive";
+
+			_deleteCmd = sqlite.CreateCommand();
+			_deleteCmd.CommandText = deleteSql;
+			_archiveStatusParam = _deleteCmd.Parameters.Add("$archive", SqliteType.Integer);
+			_deleteCmd.Prepare();
+
+			_sqlite = sqlite;
+		}
+
+		public void Execute(bool deleteArchived) {
+			// only delete archived when requested, otherwise only delete Spent.
+			_archiveStatusParam.Value = deleteArchived ? CalculationStatus.Archived : CalculationStatus.Spent;
+			_sqlite.ExecuteNonQuery(_deleteCmd);
+		}
+	}
+
+	// the sqlite docs (https://www.sqlite.org/lang_select.html) say that without an orderby clause
+	// the order in which the rows are returned is undefined. so we include an orderby clause
+	// in FromCheckpointCommand and ActiveRecordsCommand to facilitate checkpointing and continuing
+	//
+	// the sqlite docs (https://www.sqlite.org/isolation.html) say that on a single connection the
+	// behaviour of running insert/update/delete during a select is safe, but undefined with respect
+	// to whether the updates will appear in the select. in particular, updating the current row
+	// may cause the row to reappear later in the select. we are ordering the select by key so in
+	// our case it seems doubtful that it will reappear because it would violate the orderby clause,
+	// but in the worse case we will just duplicate the effort but otherwise no harm is done.
+	// NB we no longer have a read open while writing
+	private class FromCheckpointCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly SqliteParameter _keyParam;
+		private readonly Func<SqliteDataReader, KeyValuePair<TKey, OriginalStreamData>> _reader;
+
+		public FromCheckpointCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $@"
+					SELECT isTombstoned, maxAge, maxCount, truncateBefore, discardPoint, maybeDiscardPoint, status, key
+					FROM {tableName}
+					WHERE key > $key AND status = {(int)CalculationStatus.Active}
+					ORDER BY key";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+			_reader = reader => {
+				var value = _readOriginalStreamData(reader);
+				var key = reader.GetFieldValue<TKey>(7);
+				return new KeyValuePair<TKey, OriginalStreamData>(key, value);
+			};
+		}
+
+		public IEnumerable<KeyValuePair<TKey, OriginalStreamData>> Execute(TKey key) {
+			_keyParam.Value = key;
+			return _sqlite.ExecuteReader(_cmd, _reader);
+		}
+	}
+
+	private class AllRecordsCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly Func<SqliteDataReader, KeyValuePair<TKey, OriginalStreamData>> _reader;
+
+		public AllRecordsCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $@"
+					SELECT
+						isTombstoned,
+						maxAge,
+						maxCount,
+						truncateBefore,
+						discardPoint,
+						maybeDiscardPoint,
+						status,
+						key
+					FROM {tableName}
+					ORDER BY key";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+			_reader = reader => {
+				var data = _readOriginalStreamData(reader);
+				var key = reader.GetFieldValue<TKey>(7);
+				return new KeyValuePair<TKey, OriginalStreamData>(key, data);
+			};
+		}
+
+		public IEnumerable<KeyValuePair<TKey, OriginalStreamData>> Execute() {
+			return _sqlite.ExecuteReader(_cmd, _reader);
+		}
+	}
+
+	private class ActiveRecordsCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly Func<SqliteDataReader, KeyValuePair<TKey, OriginalStreamData>> _reader;
+
+		public ActiveRecordsCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $@"
+					SELECT
+						isTombstoned,
+						maxAge,
+						maxCount,
+						truncateBefore,
+						discardPoint,
+						maybeDiscardPoint,
+						status,
+						key
+					FROM {tableName}
+					WHERE status = {(int)CalculationStatus.Active}
+					ORDER BY key";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+			_reader = reader => {
+				var data = _readOriginalStreamData(reader);
+				var key = reader.GetFieldValue<TKey>(7);
+				return new KeyValuePair<TKey, OriginalStreamData>(key, data);
+			};
+		}
+
+		public IEnumerable<KeyValuePair<TKey, OriginalStreamData>> Execute() {
+			return _sqlite.ExecuteReader(_cmd, _reader);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteScavengeBackend.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteScavengeBackend.cs
new file mode 100644
index 00000000000..78f48566280
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteScavengeBackend.cs
@@ -0,0 +1,172 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Microsoft.Data.Sqlite;
+using Serilog;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+
+// Encapsulates a connection to sqlite, complete with prepared statements and an API to access it
+public class SqliteScavengeBackend<TStreamId> : IScavengeStateBackend<TStreamId> {
+	// WAL with SYNCHRONOUS NORMAL means that
+	//  - commiting a transaction does not wait to it to flush to disk
+	//  - which is nice and quick, but means in powerloss the last x transactions
+	//    can be lost. the database will be in a valid state.
+	//  - this is suitable for us because scavenge will continue from the last
+	//    persisted checkpoint.
+	private const string SqliteWalJournalMode = "wal";
+	private const int SqliteNormalSynchronousValue = 1;
+	private const int WalAutocheckpointDisabled = 0;
+
+	private const int DefaultSqliteCacheSize = 2 * 1024 * 1024;
+	private const int DefaultSqlitePageSize = 16 * 1024;
+	private readonly ILogger _logger;
+	private readonly int _pageSizeInBytes;
+	private readonly long _cacheSizeInBytes;
+	private SqliteBackend _sqliteBackend;
+
+	private const int SchemaVersion = 1;
+
+	public IScavengeMap<TStreamId, Unit> CollisionStorage { get; private set; }
+	public IScavengeMap<ulong, TStreamId> Hashes { get; private set; }
+	public IMetastreamScavengeMap<ulong> MetaStorage { get; private set; }
+	public IMetastreamScavengeMap<TStreamId> MetaCollisionStorage { get; private set; }
+	public IOriginalStreamScavengeMap<ulong> OriginalStorage { get; private set; }
+	public IOriginalStreamScavengeMap<TStreamId> OriginalCollisionStorage { get; private set; }
+	public IScavengeMap<Unit, ScavengeCheckpoint> CheckpointStorage { get; private set; }
+	public IScavengeMap<int, ChunkTimeStampRange> ChunkTimeStampRanges { get; private set; }
+	public IChunkWeightScavengeMap ChunkWeights { get; private set; }
+	public ITransactionFactory<SqliteTransaction> TransactionFactory { get; private set; }
+	public ITransactionManager TransactionManager { get; private set; }
+
+	public SqliteScavengeBackend(
+		ILogger logger,
+		int pageSizeInBytes = DefaultSqlitePageSize,
+		long cacheSizeInBytes = DefaultSqliteCacheSize) {
+		Ensure.Positive(pageSizeInBytes, nameof(pageSizeInBytes));
+		Ensure.Positive(cacheSizeInBytes, nameof(cacheSizeInBytes));
+		_logger = logger;
+		_pageSizeInBytes = pageSizeInBytes;
+		_cacheSizeInBytes = cacheSizeInBytes;
+	}
+
+	public void Dispose() {
+		_sqliteBackend.Dispose();
+	}
+
+	public void Initialize(SqliteConnection connection) {
+		_sqliteBackend = new SqliteBackend(connection);
+
+		ConfigureFeatures();
+		InitializeSchemaVersion();
+
+		var collisionStorage = new SqliteCollisionScavengeMap<TStreamId>();
+		CollisionStorage = collisionStorage;
+
+		var hashes = new SqliteScavengeMap<ulong, TStreamId>("HashUsers", "INT");
+		Hashes = hashes;
+
+		// passing "INT" could increase the speed of the accumulation when the database becomes large
+		var metaStorage = new SqliteMetastreamScavengeMap<ulong>("MetastreamDatas"/*, "INT"*/);
+		MetaStorage = metaStorage;
+
+		var metaCollisionStorage = new SqliteMetastreamScavengeMap<TStreamId>("MetastreamDataCollisions");
+		MetaCollisionStorage = metaCollisionStorage;
+
+		// passing "INT" could increase the speed of the accumulation when the database becomes large
+		// but may slow down calculation and require adjustments to the iteration queries / indexes
+		var originalStorage = new SqliteOriginalStreamScavengeMap<ulong>("OriginalStreamDatas"/*, "INT"*/);
+		OriginalStorage = originalStorage;
+
+		var originalCollisionStorage = new SqliteOriginalStreamScavengeMap<TStreamId>("OriginalStreamDataCollisions");
+		OriginalCollisionStorage = originalCollisionStorage;
+
+		var checkpointStorage = new SqliteScavengeCheckpointMap<TStreamId>();
+		CheckpointStorage = checkpointStorage;
+
+		var chunkTimeStampRanges = new SqliteChunkTimeStampRangeScavengeMap();
+		ChunkTimeStampRanges = chunkTimeStampRanges;
+
+		var chunkWeights = new SqliteChunkWeightScavengeMap();
+		ChunkWeights = chunkWeights;
+
+		var transactionFactory = new SqliteTransactionFactory();
+		TransactionFactory = transactionFactory;
+
+		TransactionManager = new SqliteTransactionManager(TransactionFactory, CheckpointStorage);
+
+		var allMaps = new IInitializeSqliteBackend[] { collisionStorage, hashes, metaStorage, metaCollisionStorage,
+			originalStorage, originalCollisionStorage, checkpointStorage, chunkTimeStampRanges, chunkWeights,
+			transactionFactory};
+
+		foreach (var map in allMaps) {
+			map.Initialize(_sqliteBackend);
+		}
+	}
+
+	private void ConfigureFeatures() {
+		_logger.Debug("SCAVENGING: Setting page size to {pageSize:N0} bytes.", _pageSizeInBytes);
+		_sqliteBackend.SetPragmaValue(SqliteBackend.PageSize, _pageSizeInBytes.ToString());
+		var pageSize = int.Parse(_sqliteBackend.GetPragmaValue(SqliteBackend.PageSize));
+		if (pageSize != _pageSizeInBytes) {
+			// note we will fail to set it if the database already exists with a different page size
+			// the page size could be changed if the vacuumed the database
+			throw new Exception(
+				$"Failed to configure page size to {_pageSizeInBytes}. Actually {pageSize}. " +
+				$"This is probably a pre-existing database with a different page size.");
+		}
+
+		_sqliteBackend.SetPragmaValue(SqliteBackend.JournalMode, SqliteWalJournalMode);
+		var journalMode = _sqliteBackend.GetPragmaValue(SqliteBackend.JournalMode);
+		if (journalMode.ToLower() != SqliteWalJournalMode) {
+			throw new Exception($"Failed to configure journal mode, unexpected value: {journalMode}");
+		}
+
+#if MANUAL_SQLITE_CHECKPOINT
+		_sqliteBackend.SetPragmaValue(SqliteBackend.WalAutocheckpoint, WalAutocheckpointDisabled.ToString());
+		var autocheckpoint = int.Parse(_sqliteBackend.GetPragmaValue(SqliteBackend.WalAutocheckpoint));
+		if (autocheckpoint != WalAutocheckpointDisabled) {
+			throw new Exception($"Failed to configure wal autocheckpoint, unexpected value: {autocheckpoint}");
+		}
+#endif
+
+		_sqliteBackend.SetPragmaValue(SqliteBackend.Synchronous, SqliteNormalSynchronousValue.ToString());
+		var synchronousMode = int.Parse(_sqliteBackend.GetPragmaValue(SqliteBackend.Synchronous));
+		if (synchronousMode != SqliteNormalSynchronousValue) {
+			throw new Exception($"Failed to configure synchronous mode, unexpected value: {synchronousMode}");
+		}
+
+		_sqliteBackend.SetCacheSize(_cacheSizeInBytes);
+	}
+
+	private void InitializeSchemaVersion() {
+		var tableName = "SchemaVersion";
+
+		using (var cmd = _sqliteBackend.CreateCommand()) {
+			cmd.CommandText = $"CREATE TABLE IF NOT EXISTS {tableName} (version Integer PRIMARY KEY)";
+			cmd.ExecuteNonQuery();
+
+			cmd.CommandText = $"SELECT MAX(version) FROM {tableName}";
+			var currentVersion = cmd.ExecuteScalar();
+
+			if (currentVersion == DBNull.Value) {
+				cmd.CommandText = $"INSERT INTO {tableName} VALUES({SchemaVersion})";
+				cmd.ExecuteNonQuery();
+			} else if (currentVersion != null && (long)currentVersion < SchemaVersion) {
+				// need schema update
+			}
+		}
+	}
+
+	public SqliteBackend.Stats GetStats() {
+		return _sqliteBackend.GetStats();
+	}
+
+	public void LogStats() {
+		_logger.Debug($"SCAVENGING: {GetStats().PrettyPrint()}");
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteScavengeCheckpointMap.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteScavengeCheckpointMap.cs
new file mode 100644
index 00000000000..5d52b588188
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteScavengeCheckpointMap.cs
@@ -0,0 +1,132 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Microsoft.Data.Sqlite;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+
+public class SqliteScavengeCheckpointMap<TStreamId> : IInitializeSqliteBackend, IScavengeMap<Unit, ScavengeCheckpoint> {
+	private AddCommand _add;
+	private GetCommand _get;
+	private RemoveCommand _remove;
+
+	private const string TableName = "Checkpoint";
+
+	public void Initialize(SqliteBackend sqlite) {
+		var sql = $@"
+				CREATE TABLE IF NOT EXISTS {TableName} (
+					key Integer PRIMARY KEY,
+					value Text NOT NULL)";
+
+		sqlite.InitializeDb(sql);
+
+		_add = new AddCommand(sqlite);
+		_get = new GetCommand(sqlite);
+		_remove = new RemoveCommand(sqlite);
+	}
+
+	public ScavengeCheckpoint this[Unit key] {
+		set => AddValue(key, value);
+	}
+
+	private void AddValue(Unit _, ScavengeCheckpoint value) {
+		_add.Execute(value);
+	}
+
+	public bool TryGetValue(Unit key, out ScavengeCheckpoint value) {
+		return _get.TryExecute(out value);
+	}
+
+	public bool TryRemove(Unit key, out ScavengeCheckpoint value) {
+		return _remove.TryExecute(out value);
+	}
+
+	public IEnumerable<KeyValuePair<Unit, ScavengeCheckpoint>> AllRecords() {
+		throw new NotImplementedException();
+	}
+
+	private class AddCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly SqliteParameter _valueParam;
+
+		public AddCommand(SqliteBackend sqlite) {
+			var sql = $@"
+					INSERT INTO {TableName}
+					VALUES(0, $value)
+					ON CONFLICT(key) DO UPDATE SET value=$value";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_valueParam = _cmd.Parameters.Add("$value", SqliteType.Text);
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+		}
+
+		public void Execute(ScavengeCheckpoint value) {
+			_valueParam.Value = ScavengeCheckpointJsonPersistence<TStreamId>.Serialize(value);
+			_sqlite.ExecuteNonQuery(_cmd);
+		}
+	}
+
+	private class GetCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly Func<SqliteDataReader, ScavengeCheckpoint> _reader;
+
+		public GetCommand(SqliteBackend sqlite) {
+			var sql = $"SELECT value FROM {TableName} WHERE key = 0";
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+			_reader = reader => {
+				var ok = ScavengeCheckpointJsonPersistence<TStreamId>.TryDeserialize(reader.GetString(0), out var v);
+				// code executed here means a record was found, but deserialization might fail
+				// which should be handled as false (no record found), return null to indicate this.
+				return ok ? v : null;
+			};
+		}
+
+		public bool TryExecute(out ScavengeCheckpoint value) {
+			return _sqlite.ExecuteSingleRead(_cmd, _reader, out value) && value != null;
+		}
+	}
+
+	private class RemoveCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _selectCmd;
+		private readonly SqliteCommand _deleteCmd;
+		private readonly Func<SqliteDataReader, ScavengeCheckpoint> _reader;
+
+		public RemoveCommand(SqliteBackend sqlite) {
+			_sqlite = sqlite;
+			_reader = reader => {
+				var ok = ScavengeCheckpointJsonPersistence<TStreamId>.TryDeserialize(reader.GetString(0), out var v);
+				// code executed here means a record was found, but deserialization might fail
+				// which should be handled as false (no record found), return null to indicate this.
+				return ok ? v : null;
+			};
+
+			var selectSql = $"SELECT value FROM {TableName} WHERE key = 0";
+			_selectCmd = sqlite.CreateCommand();
+			_selectCmd.CommandText = selectSql;
+			_selectCmd.Prepare();
+
+			var deleteSql = $"DELETE FROM {TableName} WHERE key = 0";
+			_deleteCmd = sqlite.CreateCommand();
+			_deleteCmd.CommandText = deleteSql;
+			_deleteCmd.Prepare();
+		}
+
+		public bool TryExecute(out ScavengeCheckpoint value) {
+			return _sqlite.ExecuteReadAndDelete(_selectCmd, _deleteCmd, _reader, out value) && value != null;
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteScavengeMap.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteScavengeMap.cs
new file mode 100644
index 00000000000..d7d0cb55cd2
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteScavengeMap.cs
@@ -0,0 +1,206 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Microsoft.Data.Sqlite;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+
+public class SqliteScavengeMap<TKey, TValue> :
+	IInitializeSqliteBackend,
+	IScavengeMap<TKey, TValue> {
+
+	private AddCommand _add;
+	private GetCommand _get;
+	private RemoveCommand _delete;
+	private AllRecordsCommand _all;
+
+	private readonly Dictionary<Type, string> _sqliteTypeMap = new Dictionary<Type, string>() {
+		{typeof(int), nameof(SqliteType.Integer)},
+		{typeof(float), nameof(SqliteType.Real)},
+		{typeof(ulong), nameof(SqliteType.Integer)},
+		{typeof(string), nameof(SqliteType.Text)},
+	};
+	private readonly string _keyTypeOverride;
+
+	protected string TableName { get; }
+
+	public SqliteScavengeMap(string name, string keyTypeOverride = null) {
+		TableName = name;
+		_keyTypeOverride = keyTypeOverride;
+		AssertTypesAreSupported();
+	}
+
+	private void AssertTypesAreSupported() {
+		if (!IsSupportedType<TKey>()) {
+			throw new ArgumentException(
+				$"Scavenge map {TableName} has an unsupported type {typeof(TKey).Name} for key specified");
+		}
+
+		if (!IsSupportedType<TValue>()) {
+			throw new ArgumentException(
+				$"Scavenge map {TableName} has an unsupported type {typeof(TValue).Name} for value specified");
+		}
+	}
+
+	private bool IsSupportedType<T>() {
+		return _sqliteTypeMap.ContainsKey(typeof(T));
+	}
+
+	public virtual void Initialize(SqliteBackend sqlite) {
+		var keyType = _keyTypeOverride ?? SqliteTypeMapping.GetTypeName<TKey>();
+		var valueType = SqliteTypeMapping.GetTypeName<TValue>();
+		var createSql = $@"
+				CREATE TABLE IF NOT EXISTS {TableName} (
+					key {keyType} PRIMARY KEY,
+					value {valueType} NOT NULL)";
+
+		sqlite.InitializeDb(createSql);
+
+		_add = new AddCommand(TableName, sqlite);
+		_get = new GetCommand(TableName, sqlite);
+		_delete = new RemoveCommand(TableName, sqlite);
+		_all = new AllRecordsCommand(TableName, sqlite);
+	}
+
+	public TValue this[TKey key] {
+		set => AddValue(key, value);
+	}
+
+	private void AddValue(TKey key, TValue value) {
+		_add.Execute(key, value);
+	}
+
+	public bool TryGetValue(TKey key, out TValue value) {
+		return _get.TryExecute(key, out value);
+	}
+
+	public bool TryRemove(TKey key, out TValue value) {
+		return _delete.TryExecute(key, out value);
+	}
+
+	public IEnumerable<KeyValuePair<TKey, TValue>> AllRecords() {
+		return _all.Execute();
+	}
+
+	private class AddCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly SqliteParameter _keyParam;
+		private readonly SqliteParameter _valueParam;
+
+		public AddCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $@"
+					INSERT INTO {tableName}
+					VALUES($key, $value)
+					ON CONFLICT(key) DO UPDATE SET value=$value";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_valueParam = _cmd.Parameters.Add("$value", SqliteTypeMapping.Map<TKey>());
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+		}
+
+		public void Execute(TKey key, TValue value) {
+			_keyParam.Value = key;
+			_valueParam.Value = value;
+			_sqlite.ExecuteNonQuery(_cmd);
+		}
+	}
+
+	private class GetCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly SqliteParameter _keyParam;
+		private readonly Func<SqliteDataReader, TValue> _reader;
+
+		public GetCommand(string tableName, SqliteBackend sqlite) {
+			var selectSql = $@"
+					SELECT value
+					FROM {tableName}
+					WHERE key = $key";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = selectSql;
+			_keyParam = _cmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+			_reader = reader => reader.GetFieldValue<TValue>(0);
+		}
+
+		public bool TryExecute(TKey key, out TValue value) {
+			_keyParam.Value = key;
+			return _sqlite.ExecuteSingleRead(_cmd, _reader, out value);
+		}
+	}
+
+	private class RemoveCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _selectCmd;
+		private readonly SqliteCommand _deleteCmd;
+		private readonly SqliteParameter _selectKeyParam;
+		private readonly SqliteParameter _deleteKeyParam;
+		private readonly Func<SqliteDataReader, TValue> _reader;
+
+		public RemoveCommand(string tableName, SqliteBackend sqlite) {
+			var selectSql = $@"
+					SELECT value
+					FROM {tableName}
+					WHERE key = $key";
+
+			_selectCmd = sqlite.CreateCommand();
+			_selectCmd.CommandText = selectSql;
+			_selectKeyParam = _selectCmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_selectCmd.Prepare();
+
+			var deleteSql = $@"
+					DELETE FROM {tableName}
+					WHERE key = $key";
+
+			_deleteCmd = sqlite.CreateCommand();
+			_deleteCmd.CommandText = deleteSql;
+			_deleteKeyParam = _deleteCmd.Parameters.Add("$key", SqliteTypeMapping.Map<TKey>());
+			_deleteCmd.Prepare();
+
+			_sqlite = sqlite;
+			_reader = reader => reader.GetFieldValue<TValue>(0);
+		}
+
+		public bool TryExecute(TKey key, out TValue value) {
+			_selectKeyParam.Value = key;
+			_deleteKeyParam.Value = key;
+			return _sqlite.ExecuteReadAndDelete(_selectCmd, _deleteCmd, _reader, out value);
+		}
+	}
+
+	private class AllRecordsCommand {
+		private readonly SqliteBackend _sqlite;
+		private readonly SqliteCommand _cmd;
+		private readonly Func<SqliteDataReader, KeyValuePair<TKey, TValue>> _reader;
+
+		public AllRecordsCommand(string tableName, SqliteBackend sqlite) {
+			var sql = $@"
+					SELECT key, value
+					FROM {tableName}
+					ORDER BY key";
+
+			_cmd = sqlite.CreateCommand();
+			_cmd.CommandText = sql;
+			_cmd.Prepare();
+
+			_sqlite = sqlite;
+			_reader = reader => new KeyValuePair<TKey, TValue>(
+				reader.GetFieldValue<TKey>(0), reader.GetFieldValue<TValue>(1));
+		}
+
+		public IEnumerable<KeyValuePair<TKey, TValue>> Execute() {
+			return _sqlite.ExecuteReader(_cmd, _reader);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteTransactionFactory.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteTransactionFactory.cs
new file mode 100644
index 00000000000..79451be0444
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteTransactionFactory.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Microsoft.Data.Sqlite;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+
+public class SqliteTransactionFactory : IInitializeSqliteBackend, ITransactionFactory<SqliteTransaction> {
+	private SqliteBackend _sqliteBackend;
+
+	public void Initialize(SqliteBackend sqlite) {
+		_sqliteBackend = sqlite;
+	}
+
+	public SqliteTransaction Begin() {
+		return _sqliteBackend.BeginTransaction();
+	}
+
+	public void Rollback(SqliteTransaction transaction) {
+		transaction.Rollback();
+		transaction.Dispose();
+		_sqliteBackend.ClearTransaction();
+	}
+
+	public void Commit(SqliteTransaction transaction) {
+		transaction.Commit();
+		transaction.Dispose();
+		_sqliteBackend.ClearTransaction();
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteTransactionManager.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteTransactionManager.cs
new file mode 100644
index 00000000000..f146baa83eb
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteTransactionManager.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Microsoft.Data.Sqlite;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+
+public class SqliteTransactionManager : TransactionManager<SqliteTransaction> {
+	public SqliteTransactionManager(ITransactionFactory<SqliteTransaction> factory,
+		IScavengeMap<Unit, ScavengeCheckpoint> storage) : base(factory, storage) {
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteTypeMapping.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteTypeMapping.cs
new file mode 100644
index 00000000000..1f9dffca4fc
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Sqlite/SqliteTypeMapping.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using Microsoft.Data.Sqlite;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Sqlite;
+
+public static class SqliteTypeMapping {
+	private static readonly Dictionary<Type, SqliteType> _sqliteTypeMap = new Dictionary<Type, SqliteType>() {
+		{typeof(int), SqliteType.Integer},
+		{typeof(float), SqliteType.Real},
+		{typeof(long), SqliteType.Integer},
+		{typeof(ulong), SqliteType.Integer},
+		{typeof(string), SqliteType.Text},
+	};
+
+	/// <summary>
+	/// Returns the mapped SqliteType.
+	/// </summary>
+	public static SqliteType Map<T>() {
+		return _sqliteTypeMap[typeof(T)];
+	}
+
+	/// <summary>
+	/// Returns the name of the mapped type.
+	/// </summary>
+	public static string GetTypeName<T>() {
+		return Map<T>().ToString().ToUpper();
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/Accumulator.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/Accumulator.cs
new file mode 100644
index 00000000000..4ca0f0265f1
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/Accumulator.cs
@@ -0,0 +1,469 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Serilog;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Stages;
+
+public class Accumulator<TStreamId> : IAccumulator<TStreamId> {
+	private readonly ILogger _logger;
+	private readonly int _chunkSize;
+	private readonly IMetastreamLookup<TStreamId> _metastreamLookup;
+	private readonly IChunkReaderForAccumulator<TStreamId> _chunkReader;
+	private readonly IIndexReaderForAccumulator<TStreamId> _index;
+	private readonly int _cancellationCheckPeriod;
+	private readonly Throttle _throttle;
+
+	public Accumulator(
+		ILogger logger,
+		int chunkSize,
+		IMetastreamLookup<TStreamId> metastreamLookup,
+		IChunkReaderForAccumulator<TStreamId> chunkReader,
+		IIndexReaderForAccumulator<TStreamId> index,
+		int cancellationCheckPeriod,
+		Throttle throttle) {
+
+		_logger = logger;
+		_chunkSize = chunkSize;
+		_metastreamLookup = metastreamLookup;
+		_chunkReader = chunkReader;
+		_index = index;
+		_cancellationCheckPeriod = cancellationCheckPeriod;
+		_throttle = throttle;
+	}
+
+	// Start a new accumulation
+	public async ValueTask Accumulate(
+		ScavengePoint prevScavengePoint,
+		ScavengePoint scavengePoint,
+		IScavengeStateForAccumulator<TStreamId> state,
+		CancellationToken cancellationToken) {
+
+		_logger.Debug("SCAVENGING: Started new scavenge accumulation phase: {prevScavengePoint} to {scavengePoint}",
+			prevScavengePoint?.GetName() ?? "beginning of log",
+			scavengePoint.GetName());
+
+		var doneLogicalChunkNumber = default(int?);
+
+		if (prevScavengePoint != null) {
+			// scavenge point always closes a chunk, and we accumulate up to and including the
+			// scavenge point, so we have done the chunk with the prev scavenge point in it.
+			doneLogicalChunkNumber = (int)(prevScavengePoint.Position / _chunkSize);
+		}
+
+		var checkpoint = new ScavengeCheckpoint.Accumulating(
+			scavengePoint: scavengePoint,
+			doneLogicalChunkNumber: doneLogicalChunkNumber);
+		state.SetCheckpoint(checkpoint);
+		await Accumulate(checkpoint, state, cancellationToken);
+	}
+
+	// Continue accumulation for a particular scavenge point
+	public async ValueTask Accumulate(
+		ScavengeCheckpoint.Accumulating checkpoint,
+		IScavengeStateForAccumulator<TStreamId> state,
+		CancellationToken cancellationToken) {
+
+		_logger.Debug("SCAVENGING: Accumulating from checkpoint: {checkpoint}", checkpoint);
+		var stopwatch = new Stopwatch();
+
+		// bounds are ok because we wont try to read past the scavenge point
+		var logicalChunkNumber = checkpoint.DoneLogicalChunkNumber + 1 ?? 0;
+		var scavengePoint = checkpoint.ScavengePoint;
+		var weights = new WeightAccumulator(state);
+
+		// reusable objects to avoid GC pressure
+		var originalStreamRecord = new RecordForAccumulator<TStreamId>.OriginalStreamRecord();
+		var metadataStreamRecord = new RecordForAccumulator<TStreamId>.MetadataStreamRecord();
+		var tombstoneRecord = new RecordForAccumulator<TStreamId>.TombStoneRecord();
+
+		while (await AccumulateChunkAndRecordRange(
+				   scavengePoint,
+				   state,
+				   weights,
+				   logicalChunkNumber,
+				   originalStreamRecord,
+				   metadataStreamRecord,
+				   tombstoneRecord,
+				   stopwatch,
+				   cancellationToken)) {
+			logicalChunkNumber++;
+		}
+	}
+
+	private async ValueTask<bool> AccumulateChunkAndRecordRange(
+		ScavengePoint scavengePoint,
+		IScavengeStateForAccumulator<TStreamId> state,
+		WeightAccumulator weights,
+		int logicalChunkNumber,
+		RecordForAccumulator<TStreamId>.OriginalStreamRecord originalStreamRecord,
+		RecordForAccumulator<TStreamId>.MetadataStreamRecord metadataStreamRecord,
+		RecordForAccumulator<TStreamId>.TombStoneRecord tombStoneRecord,
+		Stopwatch stopwatch,
+		CancellationToken cancellationToken) {
+
+		stopwatch.Restart();
+
+		// for correctness it is important that any particular DetectCollisions call is contained
+		// within a transaction.
+		var transaction = state.BeginTransaction();
+		try {
+			var ret = await AccumulateChunk(
+				scavengePoint,
+				state,
+				weights,
+				logicalChunkNumber,
+				originalStreamRecord,
+				metadataStreamRecord,
+				tombStoneRecord,
+				cancellationToken);
+
+			if (ret.ChunkTimeStamps.Min <= ret.ChunkTimeStamps.Max) {
+				state.SetChunkTimeStampRange(
+					logicalChunkNumber: logicalChunkNumber,
+					ret.ChunkTimeStamps);
+			} else {
+				// empty range, no need to store it.
+			}
+
+			var accumulationElapsed = stopwatch.Elapsed;
+			var rate = ret.AccumulatedRecordsCount / accumulationElapsed.TotalSeconds;
+
+			weights.Flush();
+			var weightsElapsed = stopwatch.Elapsed;
+
+			transaction.Commit(new ScavengeCheckpoint.Accumulating(
+				scavengePoint,
+				doneLogicalChunkNumber: logicalChunkNumber));
+
+			var commitElapsed = stopwatch.Elapsed;
+
+			_logger.Debug(
+				"SCAVENGING: Accumulated {countAccumulatedRecords:N0} records " +
+				"({originals:N0} originals, {metadatas:N0} metadatas, {tombstones:N0} tombstones) " +
+				"in chunk {chunk} in {elapsed}. " +
+				"{rate:N2} records per second. " +
+				"Commit: {commitElapsed}. " +
+				"Chunk total: {chunkTotalElapsed}",
+				ret.AccumulatedRecordsCount,
+				ret.OriginalStreamRecordsCount, ret.MetaStreamRecordsCount, ret.TombstoneRecordsCount,
+				logicalChunkNumber, accumulationElapsed,
+				rate,
+				commitElapsed - weightsElapsed,
+				stopwatch.Elapsed);
+
+			state.LogAccumulationStats();
+
+			return ret.Continue;
+		} catch (Exception ex) {
+			if (ex is not OperationCanceledException) {
+				_logger.Error(ex, "SCAVENGING: Rolling back");
+			}
+
+			// invariant: there is always an open transaction whenever an exception can be thrown
+			transaction.Rollback();
+			throw;
+		}
+	}
+
+	// do not assume that record TimeStamps are non descending, clocks can change.
+	private async ValueTask<AccumulationResult> AccumulateChunk(
+		ScavengePoint scavengePoint,
+		IScavengeStateForAccumulator<TStreamId> state,
+		WeightAccumulator weights,
+		int logicalChunkNumber,
+		RecordForAccumulator<TStreamId>.OriginalStreamRecord originalStreamRecord,
+		RecordForAccumulator<TStreamId>.MetadataStreamRecord metadataStreamRecord,
+		RecordForAccumulator<TStreamId>.TombStoneRecord tombStoneRecord,
+		CancellationToken cancellationToken) {
+
+		var countAccumulatedRecords = 0;
+		var countOriginalStreamRecords = 0;
+		var countMetaStreamRecords = 0;
+		var countTombstoneRecords = 0;
+		// start with empty range and expand it as we discover records.
+		var chunkMinTimeStamp = DateTime.MaxValue;
+		var chunkMaxTimeStamp = DateTime.MinValue;
+		bool @continue;
+
+		var scavengePointPosition = scavengePoint.Position;
+
+		if ((long)logicalChunkNumber * _chunkSize > scavengePointPosition) {
+			// this can happen if we accumulated the chunk with the scavenge point in it
+			// then checkpointed that we have done so.
+			@continue = false;
+			goto Return;
+		}
+
+		var cancellationCheckCounter = 0;
+		await foreach (var recordType in _chunkReader.ReadChunkInto(
+					 logicalChunkNumber,
+					 originalStreamRecord,
+					 metadataStreamRecord,
+					 tombStoneRecord,
+					 cancellationToken)) {
+
+			RecordForAccumulator<TStreamId> record;
+			switch (recordType) {
+				case AccumulatorRecordType.OriginalStreamRecord:
+					ProcessOriginalStreamRecord(originalStreamRecord, state);
+					record = originalStreamRecord;
+					countOriginalStreamRecords++;
+					break;
+				case AccumulatorRecordType.MetadataStreamRecord:
+					await ProcessMetastreamRecord(metadataStreamRecord, scavengePoint, state, weights, cancellationToken);
+					record = metadataStreamRecord;
+					countMetaStreamRecords++;
+					break;
+				case AccumulatorRecordType.TombstoneRecord:
+					await ProcessTombstone(tombStoneRecord, scavengePoint, state, weights, cancellationToken);
+					record = tombStoneRecord;
+					countTombstoneRecords++;
+					break;
+				default:
+					throw new InvalidOperationException($"Unexpected recordType: {recordType}");
+			}
+
+			if (record.TimeStamp < chunkMinTimeStamp)
+				chunkMinTimeStamp = record.TimeStamp;
+
+			if (record.TimeStamp > chunkMaxTimeStamp)
+				chunkMaxTimeStamp = record.TimeStamp;
+
+			countAccumulatedRecords++;
+
+			if (record.LogPosition == scavengePointPosition) {
+				// accumulated the scavenge point, time to stop.
+				@continue = false;
+				goto Return;
+			} else if (record.LogPosition > scavengePointPosition) {
+				throw new Exception("Accumulator expected to find the scavenge point before now.");
+			}
+
+			if (++cancellationCheckCounter == _cancellationCheckPeriod) {
+				cancellationCheckCounter = 0;
+				cancellationToken.ThrowIfCancellationRequested();
+				_throttle.Rest(cancellationToken);
+			}
+		}
+
+		@continue = true;
+
+Return:
+		return new AccumulationResult {
+			AccumulatedRecordsCount = countAccumulatedRecords,
+			OriginalStreamRecordsCount = countOriginalStreamRecords,
+			MetaStreamRecordsCount = countMetaStreamRecords,
+			TombstoneRecordsCount = countTombstoneRecords,
+			ChunkTimeStamps = new() {
+				Min = chunkMinTimeStamp,
+				Max = chunkMaxTimeStamp,
+			},
+			Continue = @continue,
+		};
+	}
+
+	// For every* record in an original stream we need to see if its stream collides.
+	// its not so bad, because we have a cache
+	// * maybe not every.. once we are accumulating records that have never been scavenged then
+	// we only need to check records with eventnumber 0
+	//    (and perhaps -1 to cover transactions)
+	//    but we don't know when this starts. and we have to make sure it is impossible for a new
+	//    streams first event is anything other than 0.
+	private static void ProcessOriginalStreamRecord(
+		RecordForAccumulator<TStreamId>.OriginalStreamRecord record,
+		IScavengeStateForAccumulator<TStreamId> state) {
+
+		state.DetectCollisions(record.StreamId);
+	}
+
+	// For every record in a metadata stream
+	//   - check if the metastream or originalstream collide with anything
+	//   - store the metadata against the original stream so the calculator can calculate the
+	//         discard point.
+	//   - update the discard point of the metadatastream
+	//   - increase the weight of the chunk with the old metadata if applicable
+	// the actual type of the record isn't relevant. if it is in a metadata stream it affects
+	// the metadata. if its data parses to streammetadata then thats the metadata. if it doesn't
+	// parse, then it clears the metadata.
+	private async ValueTask ProcessMetastreamRecord(
+		RecordForAccumulator<TStreamId>.MetadataStreamRecord record,
+		ScavengePoint scavengePoint,
+		IScavengeStateForAccumulator<TStreamId> state,
+		WeightAccumulator weights,
+		CancellationToken token) {
+
+		var originalStreamId = _metastreamLookup.OriginalStreamOf(record.StreamId);
+		state.DetectCollisions(originalStreamId);
+		state.DetectCollisions(record.StreamId);
+
+		if (record.EventNumber < 0)
+			throw new InvalidOperationException(
+				$"Found metadata in transaction in stream {record.StreamId}");
+
+		var (isInOrder, replacedPosition) = await CheckMetadataOrdering(
+			record,
+			state.GetStreamHandle(record.StreamId),
+			scavengePoint,
+			token);
+
+		if (replacedPosition.HasValue) {
+			var logicalChunkNumber = (int)(replacedPosition.Value / _chunkSize);
+			weights.OnDiscard(logicalChunkNumber: logicalChunkNumber);
+		}
+
+		if (!isInOrder) {
+			_logger.Information("SCAVENGING: Accumulator found out of order metadata: {stream}:{eventNumber}",
+				record.StreamId,
+				record.EventNumber);
+			return;
+		}
+
+		if (_metastreamLookup.IsMetaStream(originalStreamId)) {
+			// record in a metadata stream of a metadata stream: $$$$xyz
+			// this does not set metadata for $$xyz (which is fixed at maxcount1)
+			// (see IndexReader.GetStreamMetadataCached)
+			// but it does, itself, have a fixed metadata of maxcount1, so move the discard point.
+		} else {
+			// record is in a standard metadata stream: $$xyz
+			// Update the Metadata for stream xyz
+			state.SetOriginalStreamMetadata(originalStreamId, record.Metadata);
+		}
+
+		// Update the discard point
+		var discardPoint = DiscardPoint.DiscardBefore(record.EventNumber);
+		if (discardPoint != DiscardPoint.KeepAll) {
+			state.SetMetastreamDiscardPoint(record.StreamId, discardPoint);
+		} else {
+			// no need to set a discard point for the first metadata record because
+			// there is nothing to discard.
+		}
+	}
+
+	// For every tombstone
+	//   - check if the stream collides
+	//   - set the istombstoned flag to true
+	//   - increase the weight of the chunk with the old metadata if applicable
+	private async ValueTask ProcessTombstone(
+		RecordForAccumulator<TStreamId>.TombStoneRecord record,
+		ScavengePoint scavengePoint,
+		IScavengeStateForAccumulator<TStreamId> state,
+		WeightAccumulator weights,
+		CancellationToken token) {
+
+		state.DetectCollisions(record.StreamId);
+
+		if (_metastreamLookup.IsMetaStream(record.StreamId)) {
+			// isn't possible to write a tombstone to a metadatastream, but spot it in case
+			// it ever was possible.
+			throw new InvalidOperationException(
+				$"Found Tombstone in metadata stream {record.StreamId}");
+		}
+
+		if (record.EventNumber < 0) {
+			throw new InvalidOperationException(
+				$"Found Tombstone in transaction in stream {record.StreamId}");
+		}
+
+		var originalStreamId = record.StreamId;
+		state.SetOriginalStreamTombstone(originalStreamId);
+
+		var metastreamId = _metastreamLookup.MetaStreamOf(originalStreamId);
+		// required before we do state operations with the metastreamId
+		state.DetectCollisions(metastreamId);
+		state.SetMetastreamTombstone(metastreamId);
+
+		// unlike metadata, a tombstone still takes effect even it is out of order in the log
+		// (because the index will still bless it with a max event number in the indexentry)
+		// so we don't need to check for order, but just need to get the last metadata record
+		// if any, and add weight for it.
+		// note that the metadata record is in a different stream to the tombstone
+		// note that since it is tombstoned, there wont be more metadata records coming so
+		// the last one really is the one we want.
+		var eventInfos = (await _index.ReadEventInfoBackward(
+			streamId: metastreamId,
+			handle: state.GetStreamHandle(metastreamId),
+			fromEventNumber: -1, // last
+			maxCount: 1,
+			scavengePoint: scavengePoint,
+			token)).EventInfos;
+
+		foreach (var eventInfo in eventInfos) {
+			var logicalChunkNumber = (int)(eventInfo.LogPosition / _chunkSize);
+			weights.OnDiscard(logicalChunkNumber: logicalChunkNumber);
+		}
+	}
+
+	private async ValueTask<(bool IsInOrder, long? ReplacedPosition)> CheckMetadataOrdering(
+		RecordForAccumulator<TStreamId>.MetadataStreamRecord record,
+		StreamHandle<TStreamId> metastreamId,
+		ScavengePoint scavengePoint,
+		CancellationToken token) {
+
+		// We have just received a metadata record.
+		// we need to achieve two things here
+		// 1. determine if this record is in order. if not we will skip over it and not apply it.
+		// 2. add appropriate weights
+		//     - this is the first metadata record -> no weight to add.
+		//     - we are displacing a record -> add weight to its chunk
+		//     - we are skipping over this record -> add weight to this records chunk
+		//
+		// todo: consider searching the rest of the eventInfos in the stream, not just 100 events
+		// but the chances of that many consecutive invalid metastream records being written is slim,
+		// and if the writes didn't produce the desired effect it is likely the user wrote the
+		// metadata successfully afterwards anyway.
+
+		// start from the event before us if possible, to see which event we are replacing.
+		var fromEventNumber = record.EventNumber == 0
+			? record.EventNumber
+			: record.EventNumber - 1;
+
+		var eventInfos = (await _index.ReadEventInfoForward(
+			handle: metastreamId,
+			fromEventNumber: fromEventNumber,
+			maxCount: 100,
+			scavengePoint: scavengePoint,
+			token)).EventInfos;
+
+		var isInOrder = true;
+		foreach (var eventInfo in eventInfos) {
+			if (eventInfo.LogPosition < record.LogPosition &&
+				eventInfo.EventNumber >= record.EventNumber) {
+
+				// found an event that is before us in the log but has our event number or higher.
+				// that record is the metadata that we will keep, skipping over this one.
+				isInOrder = false;
+			}
+		}
+
+		long? replacedPosition;
+		if (isInOrder) {
+			if (eventInfos.Length > 0 &&
+				eventInfos[0].EventNumber < record.EventNumber &&
+				eventInfos[0].LogPosition < record.LogPosition) {
+				replacedPosition = eventInfos[0].LogPosition;
+			} else {
+				replacedPosition = null;
+			}
+		} else {
+			replacedPosition = record.LogPosition;
+		}
+
+		return (isInOrder, replacedPosition);
+	}
+
+	private readonly record struct AccumulationResult(
+		int AccumulatedRecordsCount,
+		int OriginalStreamRecordsCount,
+		int MetaStreamRecordsCount,
+		int TombstoneRecordsCount,
+		ChunkTimeStampRange ChunkTimeStamps,
+		bool Continue);
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/Calculator.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/Calculator.cs
new file mode 100644
index 00000000000..bb48eeb602f
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/Calculator.cs
@@ -0,0 +1,318 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Serilog;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Stages;
+
+public class Calculator<TStreamId> : ICalculator<TStreamId> {
+	private readonly ILogger _logger;
+	private readonly IIndexReaderForCalculator<TStreamId> _index;
+	private readonly int _chunkSize;
+	private readonly int _cancellationCheckPeriod;
+	private readonly Buffer _buffer;
+	private readonly Throttle _throttle;
+
+	public class Buffer {
+		public Buffer(int size) {
+			Array = new (StreamHandle<TStreamId>, OriginalStreamData)[size];
+		}
+
+		public (StreamHandle<TStreamId>, OriginalStreamData)[] Array { get; init; }
+	}
+
+	public Calculator(
+		ILogger logger,
+		IIndexReaderForCalculator<TStreamId> index,
+		int chunkSize,
+		int cancellationCheckPeriod,
+		Buffer buffer,
+		Throttle throttle) {
+
+		_logger = logger;
+		_index = index;
+		_chunkSize = chunkSize;
+		_cancellationCheckPeriod = cancellationCheckPeriod;
+		_buffer = buffer;
+		_throttle = throttle;
+	}
+
+	public async ValueTask Calculate(
+		ScavengePoint scavengePoint,
+		IScavengeStateForCalculator<TStreamId> state,
+		CancellationToken cancellationToken) {
+
+		_logger.Debug("SCAVENGING: Started new scavenge calculation phase for {scavengePoint}",
+			scavengePoint.GetName());
+
+		var checkpoint = new ScavengeCheckpoint.Calculating<TStreamId>(
+			scavengePoint: scavengePoint,
+			doneStreamHandle: default);
+		state.SetCheckpoint(checkpoint);
+		await Calculate(checkpoint, state, cancellationToken);
+	}
+
+	public async ValueTask Calculate(ScavengeCheckpoint.Calculating<TStreamId> checkpoint,
+		IScavengeStateForCalculator<TStreamId> state,
+		CancellationToken cancellationToken) {
+
+		_logger.Debug("SCAVENGING: Calculating from checkpoint: {checkpoint}", checkpoint);
+		var stopwatch = Stopwatch.StartNew();
+
+		var weights = new WeightAccumulator(state);
+		var scavengePoint = checkpoint.ScavengePoint;
+		var streamCalc = new StreamCalculator<TStreamId>(_index, scavengePoint);
+		var eventCalc = new EventCalculator<TStreamId>(_chunkSize, _index, state, scavengePoint, streamCalc);
+
+		var cancellationCheckCounter = 0;
+		var periodStart = stopwatch.Elapsed;
+		var totalCounter = 0;
+
+		// iterate through the original (i.e. non-meta) streams that need scavenging (i.e.
+		// those that have metadata or tombstones)
+		// - for each one use the accumulated data to set/update the discard points of the stream.
+		// - along the way add weight to the affected chunks.
+		// note that the discard points will never discard the last event from the stream.
+		// there are limited scenarios when we do want to do this, (metadata streams when the main
+		// stream is tombstoned, and when UnsafeIgnoreHardDeletes is true) and they are governed by
+		// the IsTombstoned flags.
+
+		// we read a batch of streams at a time so that each time we commit there is no active read
+		// prevents any risk of the WAL not being able to reset.
+		static bool TryPopulateBuffer(
+			IScavengeStateForCalculator<TStreamId> state,
+			StreamHandle<TStreamId> checkpoint,
+			(StreamHandle<TStreamId>, OriginalStreamData)[] buffer,
+			out int count) {
+
+			count = 0;
+			var streams = state.OriginalStreamsToCalculate(checkpoint);
+			foreach (var stream in streams) {
+				buffer[count++] = stream;
+				if (count == buffer.Length)
+					break;
+			}
+
+			return count > 0;
+		}
+
+		var buffer = _buffer.Array;
+		var cp = checkpoint?.DoneStreamHandle ?? default;
+		while (TryPopulateBuffer(state, cp, buffer, out var countInBatch)) {
+			// for determinism it is important that IncreaseChunkWeight is called in a transaction with
+			// its calculation and checkpoint, otherwise the weight could be increased again on recovery
+			var transaction = state.BeginTransaction();
+			try {
+				for (int i = 0; i < countInBatch; i++) {
+					var (originalStreamHandle, originalStreamData) = buffer[i];
+					if (originalStreamData.Status != CalculationStatus.Active)
+						throw new InvalidOperationException(
+							$"Attempted to calculate a {originalStreamData.Status} record: {originalStreamData}");
+
+					streamCalc.SetStream(originalStreamHandle, originalStreamData);
+					var newStatus = await streamCalc.CalculateStatus(cancellationToken);
+
+					(var newDiscardPoint, var newMaybeDiscardPoint, cancellationCheckCounter) =
+						await CalculateDiscardPointsForOriginalStream(
+							eventCalc,
+							weights,
+							originalStreamHandle,
+							scavengePoint,
+							cancellationCheckCounter,
+							cancellationToken);
+
+					// don't allow the discard point to move backwards
+					if (newDiscardPoint < originalStreamData.DiscardPoint) {
+						newDiscardPoint = originalStreamData.DiscardPoint;
+					}
+
+					// don't allow the maybe discard point to move backwards
+					if (newMaybeDiscardPoint < originalStreamData.MaybeDiscardPoint) {
+						newMaybeDiscardPoint = originalStreamData.MaybeDiscardPoint;
+					}
+
+					if (newStatus == originalStreamData.Status &&
+						newDiscardPoint == originalStreamData.DiscardPoint &&
+						newMaybeDiscardPoint == originalStreamData.MaybeDiscardPoint) {
+
+						// nothing to update for this stream
+					} else {
+						state.SetOriginalStreamDiscardPoints(
+							streamHandle: originalStreamHandle,
+							status: newStatus,
+							discardPoint: newDiscardPoint,
+							maybeDiscardPoint: newMaybeDiscardPoint);
+					}
+
+					totalCounter++;
+				}
+
+				// the last stream we processed is in the calculator
+				cp = streamCalc.OriginalStreamHandle;
+				weights.Flush();
+				transaction.Commit(new ScavengeCheckpoint.Calculating<TStreamId>(
+					scavengePoint,
+					cp));
+
+				var elapsed = stopwatch.Elapsed;
+				LogRate($"period", countInBatch, elapsed - periodStart);
+				LogRate("total", totalCounter, elapsed);
+
+				periodStart = stopwatch.Elapsed;
+			} catch (Exception ex) {
+				if (ex is not OperationCanceledException) {
+					_logger.Error(ex, "SCAVENGING: Rolling back");
+				}
+				// invariant: there is always an open transaction whenever an exception can be thrown
+				transaction.Rollback();
+				throw;
+			}
+		}
+
+		LogRate("grand total (including rests)", totalCounter, stopwatch.Elapsed);
+		_throttle.Rest(cancellationToken);
+	}
+
+	private void LogRate(string name, int count, TimeSpan elapsed) {
+		var rate = count / elapsed.TotalSeconds;
+		_logger.Debug(
+			"SCAVENGING: Calculated in " + name + ": {count:N0} streams in {elapsed}. {rate:N2} streams per second",
+			count, elapsed, rate);
+	}
+
+	// This does two things.
+	// 1. Calculates and returns the discard points for this stream
+	// 2. Adds weight to the affected chunks so that they get scavenged.
+	//
+	// The calculator determines that we can definitely discard everything up to the discardPoint
+	// and we may be able to discard things between the discardPoint and the maybeDiscardPoint.
+	//
+	// We want to calculate the discard points from scratch, without considering what values they
+	// came out as last time.
+	private async ValueTask<(DiscardPoint DiscardPt, DiscardPoint MaybeDiscardPt, int CancellationCheckCounter)> CalculateDiscardPointsForOriginalStream(
+		EventCalculator<TStreamId> eventCalc,
+		WeightAccumulator weights,
+		StreamHandle<TStreamId> originalStreamHandle,
+		ScavengePoint scavengePoint,
+		int cancellationCheckCounter,
+		CancellationToken cancellationToken) {
+
+		var fromEventNumber = 0L;
+
+		var discardPoint = DiscardPoint.KeepAll;
+		var maybeDiscardPoint = DiscardPoint.KeepAll;
+
+		const int maxCount = 8192;
+
+		var first = true;
+		var allDiscardedSoFar = true;
+
+		while (true) {
+			// read in slices because the stream might be huge.
+			// note: when the handle is a hash the ReadEventInfoForward call is index-only
+			// note: the event infos are not necessarily contiguous
+			var result = await _index.ReadEventInfoForward(
+				originalStreamHandle,
+				fromEventNumber,
+				maxCount,
+				scavengePoint,
+				cancellationToken);
+
+			var slice = result.EventInfos;
+
+			foreach (var eventInfo in slice) {
+				// Check cancellation and rest occasionally
+				if (++cancellationCheckCounter == _cancellationCheckPeriod) {
+					cancellationCheckCounter = 0;
+					cancellationToken.ThrowIfCancellationRequested();
+					_throttle.Rest(cancellationToken);
+				}
+
+				eventCalc.SetEvent(eventInfo);
+
+				if (first) {
+					// this is the first event that is known to the index. advance the discard points
+					// to discard everything before here since they're already discarded. (we need
+					// this because the chunks haven't necessarily been executed yet so we want to
+					// make sure those records are removed when the chunks are scavenged. note that
+					// chunk weight has already been added for them, so no need to do that again.
+					discardPoint = DiscardPoint.DiscardBefore(eventInfo.EventNumber);
+					maybeDiscardPoint = discardPoint;
+					first = false;
+				}
+
+				switch (await eventCalc.DecideEvent(cancellationToken)) {
+					case DiscardDecision.Discard:
+						weights.OnDiscard(eventCalc.LogicalChunkNumber);
+						discardPoint = DiscardPoint.DiscardIncluding(eventInfo.EventNumber);
+						allDiscardedSoFar = true;
+						break;
+
+					case DiscardDecision.MaybeDiscard:
+						// add weight to the chunk so that this will be inspected more closely
+						// it is possible that we already added weight on a previous scavenge and are
+						// doing so again, but we must because the weight may have been reset
+						// by the previous scavenge
+						weights.OnMaybeDiscard(eventCalc.LogicalChunkNumber);
+						maybeDiscardPoint = DiscardPoint.DiscardIncluding(eventInfo.EventNumber);
+						allDiscardedSoFar = false;
+						break;
+
+					case DiscardDecision.AlreadyDiscarded:
+						// this event has already been deleted from the chunks but not from the index.
+						// we move the discard point forward only if all events before it have been or will be discarded for the following reasons:
+						//
+						// i) usually, there should be no gaps between the event numbers of a stream but this property is not guaranteed
+						// with the previous scavenger. if it happens that this event was in a stream gap and we always moved the discard point
+						// forward, we would end up deleting all the events that were present before the gap.
+						//
+						// ii) we do our best to delete stale entries from the index
+
+						if (allDiscardedSoFar)
+							discardPoint = DiscardPoint.DiscardIncluding(eventInfo.EventNumber);
+						break;
+
+					case DiscardDecision.Keep:
+						// found the first one to keep. we are done discarding. to help keep things
+						// simple, move the maybe up to the discardpoint if it is behind.
+						maybeDiscardPoint = maybeDiscardPoint.Or(discardPoint);
+						return (discardPoint, maybeDiscardPoint, cancellationCheckCounter);
+
+					default:
+						throw new Exception(
+							$"Invalid discard decision for stream {originalStreamHandle}.");
+				}
+			}
+
+			// we haven't found an event to definitely keep
+			if (result.IsEndOfStream) {
+				// we have finished reading the stream from the index,
+				// but not found any events to keep.
+				// we therefore didn't find any at all, or found some and discarded them all
+				// (the latter should not be possible)
+				if (first) {
+					// we didn't find any at all
+					// - the stream might actually be empty
+					// - the stream might have events after the scavenge point and old scavenge
+					//   has removed the ones before
+					// we didn't find anything to discard, so keep everything.
+					return (DiscardPoint.KeepAll, DiscardPoint.KeepAll, cancellationCheckCounter);
+				} else {
+					// we found some and discarded them all, oops.
+					throw new Exception(
+						$"Calculated that all events for stream {originalStreamHandle} " +
+						$"should be discarded. This should be impossible.");
+				}
+			} else {
+				// we aren't done reading slices, read the next slice.
+				fromEventNumber = result.NextEventNumber;
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/ChunkExecutor.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/ChunkExecutor.cs
new file mode 100644
index 00000000000..62e5de618df
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/ChunkExecutor.cs
@@ -0,0 +1,454 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Exceptions;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Serilog;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Stages;
+
+public class ChunkExecutor<TStreamId, TRecord> : IChunkExecutor<TStreamId> {
+	private readonly ILogger _logger;
+	private readonly IMetastreamLookup<TStreamId> _metastreamLookup;
+	private readonly IChunkRemover<TStreamId, TRecord> _chunkRemover;
+	private readonly IChunkManagerForChunkExecutor<TStreamId, TRecord> _chunkManager;
+	private readonly long _chunkSize;
+	private readonly bool _unsafeIgnoreHardDeletes;
+	private readonly int _cancellationCheckPeriod;
+	private readonly bool _isArchiver;
+	private readonly int _threads;
+	private readonly Throttle _throttle;
+
+	public ChunkExecutor(
+		ILogger logger,
+		IMetastreamLookup<TStreamId> metastreamLookup,
+		IChunkRemover<TStreamId, TRecord> chunkRemover,
+		IChunkManagerForChunkExecutor<TStreamId, TRecord> chunkManager,
+		long chunkSize,
+		bool unsafeIgnoreHardDeletes,
+		int cancellationCheckPeriod,
+		int threads,
+		bool isArchiver,
+		Throttle throttle) {
+
+		_logger = logger;
+		_metastreamLookup = metastreamLookup;
+		_chunkRemover = chunkRemover;
+		_chunkManager = chunkManager;
+		_chunkSize = chunkSize;
+		_unsafeIgnoreHardDeletes = unsafeIgnoreHardDeletes;
+		_cancellationCheckPeriod = cancellationCheckPeriod;
+		_isArchiver = isArchiver;
+		_threads = Math.Clamp(threads, TFChunkScavenger.MinThreadCount, TFChunkScavenger.MaxThreadCount);
+		_throttle = throttle;
+
+		if (_threads != threads) {
+			_logger.Warning("SCAVENGING: Number of threads specified ({SpecifiedThreads}) is out of range. Clamping to {AdjustedThreads}",
+				threads, _threads);
+		}
+	}
+
+	public ValueTask Execute(
+		ScavengePoint scavengePoint,
+		IScavengeStateForChunkExecutor<TStreamId> state,
+		ITFChunkScavengerLog scavengerLogger,
+		CancellationToken cancellationToken) {
+
+		_logger.Debug("SCAVENGING: Started new scavenge chunk execution phase for {scavengePoint}",
+			scavengePoint.GetName());
+
+		var checkpoint = new ScavengeCheckpoint.ExecutingChunks(
+			scavengePoint: scavengePoint,
+			doneLogicalChunkNumber: default);
+		state.SetCheckpoint(checkpoint);
+		return Execute(checkpoint, state, scavengerLogger, cancellationToken);
+	}
+
+	public async ValueTask Execute(
+		ScavengeCheckpoint.ExecutingChunks checkpoint,
+		IScavengeStateForChunkExecutor<TStreamId> state,
+		ITFChunkScavengerLog scavengerLogger,
+		CancellationToken cancellationToken) {
+
+		_logger.Debug("SCAVENGING: Executing chunks from checkpoint: {checkpoint}", checkpoint);
+
+		var startFromChunk = checkpoint?.DoneLogicalChunkNumber + 1 ?? 0;
+		var scavengePoint = checkpoint.ScavengePoint;
+
+		var physicalChunks = GetAllPhysicalChunks(startFromChunk, scavengePoint, cancellationToken);
+
+		var borrowedStates = new IScavengeStateForChunkExecutorWorker<TStreamId>[_threads];
+		var stopwatches = new Stopwatch[_threads];
+
+		for (var i = 0; i < borrowedStates.Length; i++) {
+			borrowedStates[i] = state.BorrowStateForWorker();
+			stopwatches[i] = new Stopwatch();
+		}
+
+		try {
+			await ParallelLoop.RunWithTrailingCheckpointAsync(
+				source: physicalChunks,
+				degreeOfParallelism: _threads,
+				getCheckpointInclusive: physicalChunk => physicalChunk.ChunkEndNumber,
+				getCheckpointExclusive: physicalChunk => {
+					if (physicalChunk.ChunkStartNumber == 0)
+						return null;
+					return physicalChunk.ChunkStartNumber - 1;
+				},
+				process: async (slot, physicalChunk, cancellationToken) => {
+					// this is called on other threads
+					var concurrentState = borrowedStates[slot];
+					var sw = stopwatches[slot];
+
+					// the physical chunks do not overlap in chunk range, so we can sum
+					// and reset them concurrently
+					var physicalWeight = concurrentState.SumChunkWeights(
+						physicalChunk.ChunkStartNumber,
+						physicalChunk.ChunkEndNumber);
+
+					if (physicalChunk.IsRemote) {
+						// Later the archiver node will scavenge remote chunks
+						// The other nodes will never scavenge them (because the archiver will)
+						_logger.Debug(
+							"SCAVENGING: Skipped physical chunk: {oldChunkName} " +
+							"with weight {physicalWeight:N0} because it is remote.",
+							physicalChunk.Name,
+							physicalWeight);
+
+					} else if (await _chunkRemover.StartRemovingIfNotRetained(
+						scavengePoint,
+						concurrentState,
+						physicalChunk,
+						cancellationToken)) {
+
+						// the chunk is being removed, but is not necessarily removed yet (it will wait
+						// for readers to complete)
+						// skip scavenging this chunk, still reset the weights (because there won't be
+						// any chunk left to have any weight).
+						// the removal was not dependent on the weight, so if the chunk is not removed
+						// (e.g. because we shutdown), then that is fine, it will just be removed next scavenge.
+						concurrentState.ResetChunkWeights(
+							physicalChunk.ChunkStartNumber,
+							physicalChunk.ChunkEndNumber);
+
+					} else if (_isArchiver) {
+						// Prevent the archive node from executing any chunks, which is important because it
+						// does not yet scavenge remote chunks, but we need to keep the remote and local chunks
+						// in sync (e.g. with the same weight) so that we do scavenge them later.
+						// (otherwise a scavenge with threshold -1 to execute all chunks would be necessary)
+						_logger.Debug(
+							"SCAVENGING: Skipped physical chunk: {oldChunkName} " +
+							"with weight {physicalWeight:N0} because we are the archiver.",
+							physicalChunk.Name,
+							physicalWeight);
+
+					} else if (physicalWeight > scavengePoint.Threshold || _unsafeIgnoreHardDeletes) {
+						await ExecutePhysicalChunk(
+							physicalWeight,
+							scavengePoint,
+							concurrentState,
+							scavengerLogger,
+							physicalChunk,
+							sw,
+							cancellationToken);
+
+						// resetting must happen after execution, but need not be in a transaction
+						// which is handy, because we cant run transactions concurrently very well
+						// https://www.sqlite.org/cgi/src/doc/begin-concurrent/doc/begin_concurrent.md)
+						concurrentState.ResetChunkWeights(
+							physicalChunk.ChunkStartNumber,
+							physicalChunk.ChunkEndNumber);
+
+					} else {
+						_logger.Debug(
+							"SCAVENGING: Skipped physical chunk: {oldChunkName} " +
+							"with weight {physicalWeight:N0}. The threshold is {threshold}.",
+							physicalChunk.Name,
+							physicalWeight, scavengePoint.Threshold);
+					}
+
+					cancellationToken.ThrowIfCancellationRequested();
+				},
+				emitCheckpoint: chunkEndNumber => {
+					// this is called on the thread that called the loop, which does not do any of
+					// the processing.
+					// it is called after an item has been processed and before the slot is used
+					// to process another item. this gives us a meaningful opportunity to rest.
+					state.SetCheckpoint(
+						new ScavengeCheckpoint.ExecutingChunks(
+							scavengePoint,
+							chunkEndNumber));
+
+					if (_threads == 1) {
+						_throttle.Rest(cancellationToken);
+					} else {
+						// running a multithreaded scavenge with throttle < 100
+						// is rejected by the AdminController.
+					}
+				},
+				token: cancellationToken);
+		} finally {
+			for (var i = 0; i < borrowedStates.Length; i++) {
+				borrowedStates[i].Dispose();
+			}
+		}
+	}
+
+	private async IAsyncEnumerable<IChunkReaderForExecutor<TStreamId, TRecord>> GetAllPhysicalChunks(
+		int startFromChunk,
+		ScavengePoint scavengePoint,
+		[EnumeratorCancellation] CancellationToken token) {
+
+		var scavengePos = _chunkSize * startFromChunk;
+		var upTo = scavengePoint.Position;
+		while (scavengePos < upTo) {
+			// in bounds because we stop before the scavenge point
+			var physicalChunk = await _chunkManager.GetChunkReaderFor(scavengePos, token);
+
+			if (!physicalChunk.IsReadOnly)
+				throw new Exception(
+					$"Reached open chunk before scavenge point. " +
+					$"Chunk {physicalChunk.ChunkStartNumber}. ScavengePoint: {upTo}.");
+
+			yield return physicalChunk;
+
+			scavengePos = physicalChunk.ChunkEndPosition;
+		}
+	}
+
+	private async ValueTask ExecutePhysicalChunk(
+		float physicalWeight,
+		ScavengePoint scavengePoint,
+		IScavengeStateForChunkExecutorWorker<TStreamId> state,
+		ITFChunkScavengerLog scavengerLogger,
+		IChunkReaderForExecutor<TStreamId, TRecord> sourceChunk,
+		Stopwatch sw,
+		CancellationToken cancellationToken) {
+
+		sw.Restart();
+
+		int chunkStartNumber = sourceChunk.ChunkStartNumber;
+		long chunkStartPos = sourceChunk.ChunkStartPosition;
+		int chunkEndNumber = sourceChunk.ChunkEndNumber;
+		long chunkEndPos = sourceChunk.ChunkEndPosition;
+		var oldChunkName = sourceChunk.Name;
+
+		_logger.Debug(
+			"SCAVENGING: Started to scavenge physical chunk: {oldChunkName} " +
+			"with weight {physicalWeight:N0}. " +
+			"{chunkStartNumber} => {chunkEndNumber} ({chunkStartPosition} => {chunkEndPosition})",
+			oldChunkName,
+			physicalWeight,
+			chunkStartNumber, chunkEndNumber, chunkStartPos, chunkEndPos);
+
+		IChunkWriterForExecutor<TStreamId, TRecord> outputChunk;
+		try {
+			outputChunk = await _chunkManager.CreateChunkWriter(sourceChunk, cancellationToken);
+			_logger.Debug(
+				"SCAVENGING: Resulting temp chunk file: {tmpChunkPath}.",
+				Path.GetFileName(outputChunk.LocalFileName));
+
+		} catch (IOException ex) {
+			_logger.Error(ex,
+				"IOException during creating new chunk for scavenging purposes. " +
+				"Stopping scavenging process...");
+			throw;
+		}
+
+		try {
+			var cancellationCheckCounter = 0;
+			var discardedCount = 0;
+			var keptCount = 0;
+
+			// nonPrepareRecord and prepareRecord ae reused through the iteration
+			var nonPrepareRecord = new RecordForExecutor<TStreamId, TRecord>.NonPrepare();
+			var prepareRecord = new RecordForExecutor<TStreamId, TRecord>.Prepare();
+
+			await foreach (var isPrepare in sourceChunk.ReadInto(nonPrepareRecord, prepareRecord, cancellationToken)) {
+				if (isPrepare) {
+					if (ShouldDiscard(state, scavengePoint, prepareRecord)) {
+						discardedCount++;
+					} else {
+						keptCount++;
+						await outputChunk.WriteRecord(prepareRecord, cancellationToken);
+					}
+				} else {
+					keptCount++;
+					await outputChunk.WriteRecord(nonPrepareRecord, cancellationToken);
+				}
+
+				if (++cancellationCheckCounter == _cancellationCheckPeriod) {
+					cancellationCheckCounter = 0;
+					cancellationToken.ThrowIfCancellationRequested();
+				}
+			}
+
+			_logger.Debug(
+				"SCAVENGING: Scavenging {oldChunkName} traversed {recordsCount:N0}. " +
+				" Kept {keptCount:N0}. Discarded {discardedCount:N0}",
+				oldChunkName, discardedCount + keptCount,
+				keptCount, discardedCount);
+
+			var (newFileName, newFileSize) = await outputChunk.Complete(cancellationToken);
+
+			var elapsed = sw.Elapsed;
+			_logger.Debug(
+				"SCAVENGING: Scavenging of chunks:"
+				+ "\n{oldChunkName}"
+				+ "\ncompleted in {elapsed}."
+				+ "\nNew chunk: {tmpChunkPath} --> #{chunkStartNumber}-{chunkEndNumber} ({newChunk})."
+				+ "\nOld chunk total size: {oldSize}, scavenged chunk size: {newSize}.",
+				oldChunkName,
+				elapsed,
+				Path.GetFileName(outputChunk.LocalFileName), chunkStartNumber, chunkEndNumber,
+				Path.GetFileName(newFileName),
+				sourceChunk.FileSize, newFileSize);
+
+			var spaceSaved = sourceChunk.FileSize - newFileSize;
+			scavengerLogger.ChunksScavenged(chunkStartNumber, chunkEndNumber, elapsed, spaceSaved);
+
+		} catch (FileBeingDeletedException exc) {
+			_logger.Information(
+				"SCAVENGING: Got FileBeingDeletedException exception during scavenging, that probably means some chunks were re-replicated."
+				+ "\nStopping scavenging and removing temp chunk '{tmpChunkPath}'..."
+				+ "\nException message: {e}.",
+				outputChunk.LocalFileName,
+				exc.Message);
+
+			outputChunk.Abort(deleteImmediately: true);
+			throw;
+
+		} catch (OperationCanceledException) {
+			_logger.Information("SCAVENGING: Cancelled at: {oldChunkName}", oldChunkName);
+			outputChunk.Abort(deleteImmediately: false);
+			throw;
+
+		} catch (Exception ex) {
+			_logger.Information(
+				ex,
+				"SCAVENGING: Got exception while scavenging chunk: #{chunkStartNumber}-{chunkEndNumber}.",
+				chunkStartNumber, chunkEndNumber);
+
+			outputChunk.Abort(deleteImmediately: true);
+			throw;
+		}
+	}
+
+	private bool ShouldDiscard(
+		IScavengeStateForChunkExecutorWorker<TStreamId> state,
+		ScavengePoint scavengePoint,
+		RecordForExecutor<TStreamId, TRecord>.Prepare record) {
+
+		// the discard points ought to be sufficient, but sometimes this will be quicker
+		// and it is a nice safety net
+		if (record.LogPosition >= scavengePoint.Position)
+			return false;
+
+		var details = GetStreamExecutionDetails(
+			state,
+			record.StreamId);
+
+		if (!record.IsSelfCommitted) {
+			// deal with transactions first. since it is not self committed, this prepare is
+			// associated with an explicit transaction. is one of: begin, data, end.
+			if (details.IsTombstoned) {
+				// explicit transaction in a tombstoned stream.
+				if (_unsafeIgnoreHardDeletes) {
+					// remove all prepares including the tombstone
+					return true;
+				} else {
+					// remove all the prepares except
+					// - the tombstone itself and
+					// - any TransactionBegins (because old scavenge keeps these if there is any
+					//   doubt about whether it has been committed)
+					if (record.IsTombstone || record.IsTransactionBegin) {
+						return false;
+					} else {
+						return true;
+					}
+				}
+			} else {
+				// keep it all.
+				// we could discard from transactions sometimes, either by accumulating a state for them
+				// or doing a similar trick as old scavenge and limiting it to transactions that were
+				// stated and commited in the same chunk. however for now this isn't considered so
+				// important because someone with transactions to scavenge has probably scavenged them
+				// already with old scavenge. could be added later
+				return false;
+			}
+		}
+
+		if (details.IsTombstoned) {
+			if (_unsafeIgnoreHardDeletes) {
+				// remove _everything_ for metadata and original streams
+				_logger.Information(
+					"SCAVENGING: Removing hard deleted stream tombstone for stream {stream} at position {transactionPosition}",
+					record.StreamId, record.LogPosition);
+				return true;
+			}
+
+			if (_metastreamLookup.IsMetaStream(record.StreamId)) {
+				// when the original stream is tombstoned we can discard the _whole_ metadata stream
+				return true;
+			}
+
+			// otherwise obey the discard points below.
+		}
+
+		// if discardPoint says discard then discard.
+		if (details.DiscardPoint.ShouldDiscard(record.EventNumber)) {
+			return true;
+		}
+
+		// if maybeDiscardPoint says discard then maybe we can discard - depends on maxage
+		if (!details.MaybeDiscardPoint.ShouldDiscard(record.EventNumber)) {
+			// both discard points said do not discard, so dont.
+			return false;
+		}
+
+		// discard said no, but maybe discard said yes
+		if (!details.MaxAge.HasValue) {
+			return false;
+		}
+
+		return record.TimeStamp < scavengePoint.EffectiveNow - details.MaxAge;
+	}
+
+	private ChunkExecutionInfo GetStreamExecutionDetails(
+		IScavengeStateForChunkExecutorWorker<TStreamId> state,
+		TStreamId streamId) {
+
+		if (_metastreamLookup.IsMetaStream(streamId)) {
+			if (!state.TryGetMetastreamData(streamId, out var metastreamData)) {
+				metastreamData = MetastreamData.Empty;
+			}
+
+			return new ChunkExecutionInfo(
+				isTombstoned: metastreamData.IsTombstoned,
+				discardPoint: metastreamData.DiscardPoint,
+				maybeDiscardPoint: DiscardPoint.KeepAll,
+				maxAge: null);
+		} else {
+			// original stream
+			if (state.TryGetChunkExecutionInfo(streamId, out var details)) {
+				return details;
+			} else {
+				return new ChunkExecutionInfo(
+					isTombstoned: false,
+					discardPoint: DiscardPoint.KeepAll,
+					maybeDiscardPoint: DiscardPoint.KeepAll,
+					maxAge: null);
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/ChunkMerger.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/ChunkMerger.cs
new file mode 100644
index 00000000000..884b66a907f
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/ChunkMerger.cs
@@ -0,0 +1,59 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Serilog;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Stages;
+
+public class ChunkMerger : IChunkMerger {
+	private readonly ILogger _logger;
+	private readonly bool _mergeChunks;
+	private readonly IChunkMergerBackend _backend;
+	private readonly Throttle _throttle;
+
+	public ChunkMerger(
+		ILogger logger,
+		bool mergeChunks,
+		IChunkMergerBackend backend,
+		Throttle throttle) {
+
+		_logger = logger;
+		_mergeChunks = mergeChunks;
+		_backend = backend;
+		_throttle = throttle;
+	}
+
+	public ValueTask MergeChunks(
+		ScavengePoint scavengePoint,
+		IScavengeStateForChunkMerger state,
+		ITFChunkScavengerLog scavengerLogger,
+		CancellationToken cancellationToken) {
+
+		_logger.Debug("SCAVENGING: Started new scavenge chunk merging phase for {scavengePoint}",
+			scavengePoint.GetName());
+
+		var checkpoint = new ScavengeCheckpoint.MergingChunks(scavengePoint);
+		state.SetCheckpoint(checkpoint);
+		return MergeChunks(checkpoint, state, scavengerLogger, cancellationToken);
+	}
+
+	public ValueTask MergeChunks(
+		ScavengeCheckpoint.MergingChunks checkpoint,
+		IScavengeStateForChunkMerger state,
+		ITFChunkScavengerLog scavengerLogger,
+		CancellationToken cancellationToken) {
+
+		if (_mergeChunks) {
+			_logger.Debug("SCAVENGING: Merging chunks from checkpoint: {checkpoint}", checkpoint);
+			return _backend.MergeChunks(scavengerLogger, _throttle, cancellationToken);
+		}
+
+		_logger.Debug("SCAVENGING: Merging chunks is disabled");
+		return ValueTask.CompletedTask;
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/ChunkRemover.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/ChunkRemover.cs
new file mode 100644
index 00000000000..01bb35222fe
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/ChunkRemover.cs
@@ -0,0 +1,176 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.TransactionLog.Chunks.TFChunk;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Serilog;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Stages;
+
+// responsible for removing chunks that are present in the archive and no longer
+// needed locally according to the retention policy
+public class ChunkRemover<TStreamId, TRecord> : IChunkRemover<TStreamId, TRecord> {
+	private readonly ILogger _logger;
+	private readonly AdvancingCheckpoint _archiveCheckpoint;
+	private readonly IChunkManagerForChunkRemover _chunkManager;
+	private readonly ILocatorCodec _locatorCodec;
+	private readonly TimeSpan _retainPeriod;
+	private readonly long _retainBytes;
+
+	public ChunkRemover(
+		ILogger logger,
+		AdvancingCheckpoint archiveCheckpoint,
+		IChunkManagerForChunkRemover chunkManager,
+		ILocatorCodec locatorCodec,
+		TimeSpan retainPeriod,
+		long retainBytes) {
+
+		_logger = logger;
+		_archiveCheckpoint = archiveCheckpoint;
+		_chunkManager = chunkManager;
+		_locatorCodec = locatorCodec;
+		_retainPeriod = retainPeriod;
+		_retainBytes = retainBytes;
+
+		_logger.Debug("SCAVENGING: Chunk retention criteria is Days: {Days}, LogicalBytes: {LogicalBytes}",
+			retainPeriod.Days,
+			retainBytes);
+	}
+
+	// returns true iff removing
+	public async ValueTask<bool> StartRemovingIfNotRetained(
+		ScavengePoint scavengePoint,
+		IScavengeStateForChunkExecutorWorker<TStreamId> concurrentState,
+		IChunkReaderForExecutor<TStreamId, TRecord> physicalChunk,
+		CancellationToken ct) {
+
+		if (physicalChunk.IsRemote) {
+			return false;
+		}
+
+		if (!ShouldRemoveForBytes(scavengePoint, physicalChunk)) {
+			_logger.Debug(
+				"SCAVENGING: ChunkRemover is keeping chunk {PhysicalChunk} because of " +
+				"the retention policy for bytes", physicalChunk.Name);
+			return false;
+		}
+
+		if (!ShouldRemoveForPeriod(scavengePoint, concurrentState, physicalChunk)) {
+			_logger.Debug(
+				"SCAVENGING: ChunkRemover is keeping chunk {PhysicalChunk} because of " +
+				"the retention policy for days", physicalChunk.Name);
+			return false;
+		}
+
+		if (!await IsConfirmedPresentInArchive(physicalChunk, ct)) {
+			_logger.Debug(
+				"SCAVENGING: ChunkRemover is keeping chunk {PhysicalChunk} because it " +
+				"is not confirmed present in the archive", physicalChunk.Name);
+			return false;
+		}
+
+		await SwitchOutPhysicalChunk(physicalChunk, ct);
+		return true;
+	}
+
+	// if the chunk isn't present in the archive there might be a problem with the archiver node
+	// however we don't want this to prevent us from being able to scavenge this node, so we keep
+	// this chunk rather than terminate the scavenge
+	private async ValueTask<bool> IsConfirmedPresentInArchive(
+		IChunkReaderForExecutor<TStreamId, TRecord> physicalChunk,
+		CancellationToken ct) {
+
+		var logicalChunkNumber = physicalChunk.ChunkEndNumber;
+
+		try {
+			var isPresent = await _archiveCheckpoint.IsGreaterThanOrEqualTo(physicalChunk.ChunkEndPosition, ct);
+			if (!isPresent) {
+				_logger.Warning(
+					"Logical chunk {LogicalChunkNumber} is not yet present in the archive",
+					logicalChunkNumber);
+			}
+			return isPresent;
+		} catch (Exception ex) when (ex is not OperationCanceledException) {
+			_logger.Warning(ex,
+				"Unable to determine existence of logical chunk {LogicalChunkNumber} in the archive.",
+				logicalChunkNumber);
+		}
+
+		return false;
+	}
+
+	private bool ShouldRemoveForBytes(
+		ScavengePoint scavengePoint,
+		IChunkReaderForExecutor<TStreamId, TRecord> physicalChunk) {
+
+		var removeBytesBefore = scavengePoint.Position - _retainBytes;
+		return physicalChunk.ChunkEndPosition < removeBytesBefore;
+	}
+
+	private bool ShouldRemoveForPeriod(
+		ScavengePoint scavengePoint,
+		IScavengeStateForChunkExecutorWorker<TStreamId> concurrentState,
+		IChunkReaderForExecutor<TStreamId, TRecord> physicalChunk) {
+
+		for (var logicalChunkNumber = physicalChunk.ChunkEndNumber;
+			logicalChunkNumber >= physicalChunk.ChunkStartNumber;
+			logicalChunkNumber--) {
+
+			if (concurrentState.TryGetChunkTimeStampRange(logicalChunkNumber, out var createdAtRange)) {
+				var removeBefore = scavengePoint.EffectiveNow - _retainPeriod;
+				return createdAtRange.Max < removeBefore;
+			} else {
+				// we don't have a time stamp range for this logical chunk, it had no prepares in during
+				// accumulation. we try an earlier logical chunk in this physical chunk.
+			}
+		}
+
+		// no time stamp for any logical chunk in this physical chunk. its possible to get here if the
+		// physical chunk doesn't have any prepares in it at all. it's fine to remove it.
+		return true;
+	}
+
+	private async ValueTask SwitchOutPhysicalChunk(
+		IChunkReaderForExecutor<TStreamId, TRecord> physicalChunk,
+		CancellationToken ct) {
+
+		var chunkStartNumber = physicalChunk.ChunkStartNumber;
+		var chunkEndNumber = physicalChunk.ChunkEndNumber;
+
+		_logger.Debug(
+			"SCAVENGING: Removing physical chunk: {oldChunkName} " +
+			"{chunkStartNumber} => {chunkEndNumber} ({chunkStartPosition} => {chunkEndPosition})",
+			physicalChunk.Name,
+			chunkStartNumber, chunkEndNumber,
+			physicalChunk.ChunkStartPosition, physicalChunk.ChunkEndPosition);
+
+		var numChunks = chunkEndNumber - chunkStartNumber + 1;
+		var locators = new string[numChunks];
+		for (var i = 0; i < locators.Length; i++) {
+			locators[i] = _locatorCodec.EncodeRemote(chunkStartNumber + i);
+		}
+
+		// begin the process of deleting the chunk
+		var switched = await _chunkManager.SwitchInChunks(locators, ct);
+
+		if (switched) {
+			// the switch has occurred, the physicalChunk will be deleted once any outstanding
+			// readers are returned.
+		} else {
+			// the start-end range did not align correctly, perhaps something else changed which physical
+			// chunks are present. this does not cause a problem but it should be very rare.
+			_logger.Warning(
+				"SCAVENGING: Did not remove physicalChunk: {oldChunkName} " +
+				"{chunkStartNumber} => {chunkEndNumber}. " +
+				"This will be retried next scavenge.",
+				physicalChunk.Name,
+				chunkStartNumber, chunkEndNumber);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/Cleaner.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/Cleaner.cs
new file mode 100644
index 00000000000..374523b4ad9
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/Cleaner.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Serilog;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Stages;
+
+public class Cleaner : ICleaner {
+	private readonly ILogger _logger;
+	private readonly bool _unsafeIgnoreHardDeletes;
+
+	public Cleaner(
+		ILogger logger,
+		bool unsafeIgnoreHardDeletes) {
+		_logger = logger;
+		_unsafeIgnoreHardDeletes = unsafeIgnoreHardDeletes;
+	}
+
+	public void Clean(
+		ScavengePoint scavengePoint,
+		IScavengeStateForCleaner state,
+		CancellationToken cancellationToken) {
+
+		_logger.Debug("SCAVENGING: Started new scavenge clean up phase for {scavengePoint}",
+			scavengePoint.GetName());
+
+		var checkpoint = new ScavengeCheckpoint.Cleaning(scavengePoint);
+		state.SetCheckpoint(checkpoint);
+		Clean(checkpoint, state, cancellationToken);
+	}
+
+	public void Clean(
+		ScavengeCheckpoint.Cleaning checkpoint,
+		IScavengeStateForCleaner state,
+		CancellationToken cancellationToken) {
+
+		_logger.Debug("SCAVENGING: Cleaning checkpoint: {checkpoint}", checkpoint);
+
+		cancellationToken.ThrowIfCancellationRequested();
+
+		// we clean up in a transaction, not so that we can checkpoint, but just to save lots of
+		// implicit transactions from being created
+		var transaction = state.BeginTransaction();
+		try {
+			CleanImpl(state, cancellationToken);
+			transaction.Commit(checkpoint);
+		} catch {
+			transaction.Rollback();
+			throw;
+		}
+	}
+
+	private void CleanImpl(
+		IScavengeStateForCleaner state,
+		CancellationToken cancellationToken) {
+
+		// constant time operation
+		if (state.AllChunksExecuted()) {
+			// Now we know we have successfully executed every chunk with weight.
+
+			_logger.Debug("SCAVENGING: Deleting metastream data");
+			state.DeleteMetastreamData();
+
+			cancellationToken.ThrowIfCancellationRequested();
+
+			_logger.Debug("SCAVENGING: Deleting originalstream data. Deleting archived: {deleteArchived}",
+				_unsafeIgnoreHardDeletes);
+			state.DeleteOriginalStreamData(deleteArchived: _unsafeIgnoreHardDeletes);
+
+		} else {
+			// one or more chunks was not executed, due to error or not meeting the threshold
+			// either way, we cannot clean up the stream datas
+			if (_unsafeIgnoreHardDeletes) {
+				// the chunk executor should have stopped the scavenge if it couldn't execute any
+				// chunk when this flag is set.
+				// we could have removed the tombstone without removing all the other records.
+				throw new Exception(
+					"UnsafeIgnoreHardDeletes is true but not all chunks have been executed");
+			} else {
+				_logger.Debug("SCAVENGING: Skipping cleanup because some chunks have not been executed");
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/EventCalculator.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/EventCalculator.cs
new file mode 100644
index 00000000000..a15cac3090c
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/EventCalculator.cs
@@ -0,0 +1,126 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Stages;
+
+// This calculates information about the event so that the main calculator can decide what to do
+public class EventCalculator<TStreamId> {
+	public EventCalculator(
+		int chunkSize,
+		IIndexReaderForCalculator<TStreamId> index,
+		IScavengeStateForCalculatorReadOnly<TStreamId> state,
+		ScavengePoint scavengePoint,
+		StreamCalculator<TStreamId> streamCalc) {
+
+		ChunkSize = chunkSize;
+		Index = index;
+		State = state;
+		ScavengePoint = scavengePoint;
+		Stream = streamCalc;
+	}
+
+	public void SetEvent(EventInfo eventInfo) {
+		EventInfo = eventInfo;
+	}
+
+	// State that doesn't change. scoped to the scavenge.
+	public int ChunkSize { get; }
+	public IIndexReaderForCalculator<TStreamId> Index { get; }
+	public IScavengeStateForCalculatorReadOnly<TStreamId> State { get; }
+	public ScavengePoint ScavengePoint { get; }
+	public StreamCalculator<TStreamId> Stream { get; }
+
+	// State that is scoped to the event.
+	public EventInfo EventInfo { get; private set; }
+
+	public bool IsOnOrAfterScavengePoint => EventInfo.LogPosition >= ScavengePoint.Position;
+
+	public int LogicalChunkNumber => (int)(EventInfo.LogPosition / ChunkSize);
+
+	public async ValueTask<DiscardDecision> DecideEvent(CancellationToken token) {
+		// Events in original streams can be discarded because of:
+		//   Tombstones, TruncateBefore, MaxCount, MaxAge.
+		//
+		// any one of these is enough to warrant a discard
+		// however none of them allow us to scavenge the last event
+		// or anything beyond the scavenge point, so we limit by that.
+
+		// respect the scavenge point
+		if (IsOnOrAfterScavengePoint) {
+			return DiscardDecision.Keep;
+		}
+
+		// keep last event in stream
+		// to be extra safe, we keep if it is after the 'last event' too, which should never happen.
+		if (EventInfo.EventNumber >= await Stream.GetLastEventNumber(token)) {
+			return DiscardDecision.Keep;
+		}
+
+		// for tombstoned streams, discard everything before the tombstone
+		if (Stream.IsTombstoned) {
+			// the tombstone is nearly always the last event and therefore already kept above ^
+			// BUT if the tombstone was created when event numbers were 32bit, and the index has
+			// not been _rebuilt_ since event numbers have been 64bit (merges and scavenges are not
+			// sufficient) then the tombstone will still appear in the index as having event number
+			// int.max instead of long.max. the system does not treat such a stream as deleted, so
+			// more events could be written and read after the tombstone, but rebuilding the index
+			// will make the whole stream deleted again.
+			//
+			// to avoid complicating this further in scavenge, we keep an eye out for such tombstones
+			// and keep the tombstone and any the events after it. without this check we would
+			// discard the tombstone and subsequent events except the last one, leaving the stream
+			// in a state where it is unclear why events were removed.
+			if (EventInfo.EventNumber == int.MaxValue && await Index.IsTombstone(EventInfo.LogPosition, token)) {
+				return DiscardDecision.Keep;
+			}
+
+			// we already know this is not the last event, so discard it.
+			return DiscardDecision.Discard;
+		}
+
+		// truncatebefore, maxcount
+		if ((await Stream.GetTruncateBeforeOrMaxCountDiscardPoint(token)).ShouldDiscard(EventInfo.EventNumber)) {
+			return DiscardDecision.Discard;
+		}
+
+		// up to maxage. keep if there is no maxage restriction
+		var cutoffTime = Stream.CutoffTime;
+		if (!cutoffTime.HasValue) {
+			return DiscardDecision.Keep;
+		}
+
+		// there is a maxage restriction
+		return ShouldDiscardForMaxAge(cutoffTime.Value);
+	}
+
+	private DiscardDecision ShouldDiscardForMaxAge(DateTime cutoffTime) {
+		// establish a range that the event was definitely created between.
+		if (!State.TryGetChunkTimeStampRange(LogicalChunkNumber, out var createdAtRange)) {
+			// we don't have a time stamp range for this chunk which implies that it was empty during accumulation.
+			// however while reading event infos from the index, we encountered an event from that chunk.
+			// this indicates that the event was deleted from the chunk but not from the index by the old scavenger.
+			return DiscardDecision.AlreadyDiscarded;
+		}
+
+		// range is guaranteed to be non-empty
+		if (cutoffTime <= createdAtRange.Min) {
+			// if the cutoff time is equal to the minimum then the record timestamp is definitely
+			// greater than or equal to the cutoff, so we keep it
+			return DiscardDecision.Keep;
+		}
+
+		if (createdAtRange.Max < cutoffTime) {
+			return DiscardDecision.Discard;
+		}
+
+		// it must be between min and max inclusive
+		return DiscardDecision.MaybeDiscard;
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/IndexExecutor.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/IndexExecutor.cs
new file mode 100644
index 00000000000..6da5cadfffe
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/IndexExecutor.cs
@@ -0,0 +1,188 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Index;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+using Serilog;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Stages;
+
+public class IndexExecutor<TStreamId> : IIndexExecutor<TStreamId> {
+	private readonly ILogger _logger;
+	private readonly IIndexScavenger _indexScavenger;
+	private readonly IChunkReaderForIndexExecutor<TStreamId> _streamLookup;
+	private readonly bool _unsafeIgnoreHardDeletes;
+	private readonly int _restPeriod;
+	private readonly Throttle _throttle;
+
+	public IndexExecutor(
+		ILogger logger,
+		IIndexScavenger indexScavenger,
+		IChunkReaderForIndexExecutor<TStreamId> streamLookup,
+		bool unsafeIgnoreHardDeletes,
+		int restPeriod,
+		Throttle throttle) {
+
+		_logger = logger;
+		_indexScavenger = indexScavenger;
+		_streamLookup = streamLookup;
+		_unsafeIgnoreHardDeletes = unsafeIgnoreHardDeletes;
+		_restPeriod = restPeriod;
+		_throttle = throttle;
+	}
+
+	public async ValueTask Execute(
+		ScavengePoint scavengePoint,
+		IScavengeStateForIndexExecutor<TStreamId> state,
+		IIndexScavengerLog scavengerLogger,
+		CancellationToken cancellationToken) {
+
+		_logger.Debug("SCAVENGING: Started new scavenge index execution phase for {scavengePoint}",
+			scavengePoint.GetName());
+
+		var checkpoint = new ScavengeCheckpoint.ExecutingIndex(scavengePoint);
+		state.SetCheckpoint(checkpoint);
+		await Execute(checkpoint, state, scavengerLogger, cancellationToken);
+	}
+
+	public ValueTask Execute(
+		ScavengeCheckpoint.ExecutingIndex checkpoint,
+		IScavengeStateForIndexExecutor<TStreamId> state,
+		IIndexScavengerLog scavengerLogger,
+		CancellationToken cancellationToken) {
+
+		_logger.Debug("SCAVENGING: Executing indexes from checkpoint: {checkpoint}", checkpoint);
+
+		return _indexScavenger.ScavengeIndex(
+			scavengePoint: checkpoint.ScavengePoint.Position,
+			shouldKeep: GenShouldKeep(
+				checkpoint.ScavengePoint,
+				state),
+			log: scavengerLogger,
+			cancellationToken: cancellationToken);
+	}
+
+	private Func<IndexEntry, CancellationToken, ValueTask<bool>> GenShouldKeep(
+		ScavengePoint scavengePoint,
+		IScavengeStateForIndexExecutor<TStreamId> state) {
+
+		// we cache some stream info between invocations of ShouldKeep out here since it will
+		// typically be invoked repeatedly for the same stream.
+		var currentHash = (ulong?)null;
+		var currentHashIsCollision = false;
+		var currentPosition = long.MaxValue;
+		var currentDiscardPoint = DiscardPoint.KeepAll;
+		var currentIsTombstoned = false;
+		var currentIsDefinitelyMetastream = false;
+
+		var restCounter = 0;
+		var scavengePointPosition = scavengePoint.Position;
+
+		async ValueTask<bool> ShouldKeep(IndexEntry indexEntry, CancellationToken token) {
+			// Rest occasionally
+			if (++restCounter == _restPeriod) {
+				restCounter = 0;
+				_throttle.Rest(token);
+			}
+
+			if (indexEntry.Position >= scavengePointPosition) {
+				// discard point will respect this anyway, but this is faster.
+				return true;
+			}
+
+			if (currentHash != indexEntry.Stream || currentHashIsCollision) {
+				// either the hash changed or (definitely on to a different stream) or
+				// the currentHash is a collision (maybe on to a different stream).
+				// need to set all 5 of the current* variables correctly.
+
+				currentHash = indexEntry.Stream;
+				currentHashIsCollision = state.IsCollision(indexEntry.Stream);
+				currentPosition = indexEntry.Position;
+
+				StreamHandle<TStreamId> handle;
+
+				if (currentHashIsCollision) {
+					// hash isn't enough to identify the stream. get its id.
+					switch (await _streamLookup.TryGetStreamId(indexEntry.Position, token)) {
+						case { HasValue: false }:
+							// there is no record at this position to get the stream from.
+							// we should definitely discard the entry (just like old index scavenge does)
+							// we can't even tell which stream it is for.
+							return false;
+						case var result:
+							// we got a streamId, which means we must have found a record at this
+							// position, but that doesn't necessarily mean we want to keep the IndexEntry
+							// the log record might still exist only because its chunk hasn't reached
+							// the threshold.
+							handle = StreamHandle.ForStreamId(result.ValueOrDefault);
+							break;
+					}
+				} else {
+					// not a collision, we can get the discard point by hash.
+					handle = StreamHandle.ForHash<TStreamId>(currentHash.Value);
+				}
+
+				if (state.TryGetIndexExecutionInfo(handle, out var info)) {
+					currentIsTombstoned = info.IsTombstoned;
+					currentDiscardPoint = info.DiscardPoint;
+					currentIsDefinitelyMetastream = info.IsMetastream;
+				} else {
+					// this stream has no scavenge data accumulated. therefore is has no metadata
+					// and is not tombstoned.
+					currentIsTombstoned = false;
+					currentDiscardPoint = DiscardPoint.KeepAll;
+					currentIsDefinitelyMetastream = false;
+					return true; // don't need this but may as well.
+				}
+			} else {
+				// same hash as the previous invocation, and it is not a collision, so it must be for
+				// the same stream, so the current* variables are already correct.
+
+				if (indexEntry.Position >= currentPosition) {
+					// ptables are arranged (hash, version, position) descending. so for a given hash
+					// we will iterate through the versions descending. previous bugs have allowed
+					// events to be written occasionally with the wrong version number. we spot this
+					// here and log about it.
+					var stream = default(TStreamId);
+					try {
+						stream = state.LookupUniqueHashUser(indexEntry.Stream);
+					} catch {
+						// probably this isn't possible
+					}
+
+					_logger.Debug(
+						"SCAVENGING: Found out of order index entry. " +
+						"Stream \"{stream}\" has index entry {indexEntry} but " +
+						"previously saw index entry with position {previousPosition}.",
+						stream, indexEntry,
+						currentPosition);
+				}
+				currentPosition = indexEntry.Position;
+			}
+
+			// all the current* variables are now set correctly.
+			if (currentIsTombstoned) {
+				if (_unsafeIgnoreHardDeletes) {
+					// remove _everything_ for metadata and original streams
+					return false;
+				}
+
+				if (currentIsDefinitelyMetastream) {
+					// when the original stream is tombstoned we can discard the _whole_ metastream
+					return false;
+				}
+
+				// otherwise obey the discard points below.
+			}
+
+			var shouldDiscard = currentDiscardPoint.ShouldDiscard(indexEntry.Version);
+			return !shouldDiscard;
+		}
+
+		return ShouldKeep;
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/StreamCalculator.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/StreamCalculator.cs
new file mode 100644
index 00000000000..2b357a714ef
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/StreamCalculator.cs
@@ -0,0 +1,119 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Stages;
+
+// the idea of this is we load some context into this class for the given stream
+// and then it helps us calculate and make decisions about what to keep.
+// and the calculations can be done on demand.
+// and can be unit tested separately if necessary
+// reused between streams to avoid allocations.
+public class StreamCalculator<TStreamId> {
+	public StreamCalculator(
+		IIndexReaderForCalculator<TStreamId> index,
+		ScavengePoint scavengePoint) {
+
+		Index = index;
+		ScavengePoint = scavengePoint;
+	}
+
+	public void SetStream(
+		StreamHandle<TStreamId> originalStreamHandle,
+		OriginalStreamData originalStreamData) {
+
+		_lastEventNumber = null;
+		_truncateBeforeOrMaxCountDiscardPoint = null;
+
+		OriginalStreamHandle = originalStreamHandle;
+		OriginalStreamData = originalStreamData;
+	}
+
+	// State that doesn't change. scoped to the scavenge.
+	public IIndexReaderForCalculator<TStreamId> Index { get; }
+	public ScavengePoint ScavengePoint { get; }
+
+	// State that is scoped to the stream
+	public StreamHandle<TStreamId> OriginalStreamHandle { get; private set; }
+	private OriginalStreamData OriginalStreamData { get; set; }
+
+	// Returns NoStream (-1) if there are no events before the scavenge point.
+	// Caller must handle that
+	private long? _lastEventNumber;
+
+	public async ValueTask<long> GetLastEventNumber(CancellationToken token) {
+		_lastEventNumber ??= await Index.GetLastEventNumber(OriginalStreamHandle, ScavengePoint, token);
+		return _lastEventNumber.GetValueOrDefault();
+	}
+
+	public DiscardPoint TruncateBeforeDiscardPoint =>
+		OriginalStreamData.TruncateBefore.HasValue
+			? DiscardPoint.DiscardBefore(OriginalStreamData.TruncateBefore.Value)
+			: DiscardPoint.KeepAll;
+
+	public async ValueTask<DiscardPoint> GetMaxCountDiscardPoint(CancellationToken token) =>
+		// if LastEventNumber is NoStream (-1) this will always KeepAll as intended
+		OriginalStreamData.MaxCount.HasValue
+			? DiscardPoint.DiscardIncluding(await GetLastEventNumber(token) - OriginalStreamData.MaxCount.Value)
+			: DiscardPoint.KeepAll;
+
+	private DiscardPoint? _truncateBeforeOrMaxCountDiscardPoint;
+
+	public async ValueTask<DiscardPoint> GetTruncateBeforeOrMaxCountDiscardPoint(CancellationToken token) {
+		_truncateBeforeOrMaxCountDiscardPoint ??= TruncateBeforeDiscardPoint.Or(await GetMaxCountDiscardPoint(token));
+		return _truncateBeforeOrMaxCountDiscardPoint.GetValueOrDefault();
+	}
+
+	public bool IsTombstoned => OriginalStreamData.IsTombstoned;
+
+	// We can discard the event when it is older than the cutoff
+	public DateTime? CutoffTime => ScavengePoint.EffectiveNow - OriginalStreamData.MaxAge;
+
+	// Calculates whether this stream needs recalculating, assuming the metadata and istombstoned
+	// do not change (either of these updates will cause the calculator to reactivate it).
+	public async ValueTask<CalculationStatus> CalculateStatus(CancellationToken token) {
+		if (OriginalStreamData.IsTombstoned) {
+			// discard points will not move after this, BUT it cannot be deleted because we might
+			// run a scavenge with UnsafeIgnoreHardDeletes in which case we will need to know this is
+			// tombstoned in order to discard the tombstone from the index.
+			return CalculationStatus.Archived;
+		}
+
+		if (OriginalStreamData.MaxAge.HasValue) {
+			//  because time will have passed so discard points might need moving
+			return CalculationStatus.Active;
+		}
+
+		if (OriginalStreamData.MaxCount.HasValue) {
+			// new events might have been added so discard point might need moving
+			// (unless the accumulator tracked when new events have been written per stream, but
+			// this would likely not be worth it.)
+			return CalculationStatus.Active;
+		}
+
+		var tb = OriginalStreamData.TruncateBefore;
+		if (tb.HasValue &&
+			tb.GetValueOrDefault() is not EventNumber.DeletedStream &&
+			await GetLastEventNumber(token) < tb.GetValueOrDefault()) {
+
+			// unspent TB. new events would cause the discard point to move.
+			// EventNumber.DeletedStream counts as spent because we would only need to
+			// recalculate if a new event is written but in that case the database will
+			// create for us a new metadata record, too.
+			// this also works if LastEventNumber is NoStream (-1)
+			return CalculationStatus.Active;
+		}
+
+		// Here it is not tombstoned, and the metadata is either a spent TB
+		// or empty (which could happen if there was metadata that was
+		// subsequently cleared).
+		// Discard points will no longer move, we can delete it.
+		return CalculationStatus.Spent;
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/WeightAccumulator.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/WeightAccumulator.cs
new file mode 100644
index 00000000000..532c7eda6ce
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Stages/WeightAccumulator.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging.Stages;
+
+public class WeightAccumulator {
+	const float DiscardWeight = 2.0f;
+	const float MaybeDiscardWeight = 1.0f;
+
+	private readonly IIncreaseChunkWeights _state;
+	private readonly Dictionary<int, float> _weights;
+
+	public WeightAccumulator(IIncreaseChunkWeights state) {
+		_state = state;
+		_weights = new Dictionary<int, float>();
+	}
+
+	public void OnDiscard(int logicalChunkNumber) => IncreaseChunkWeight(
+		logicalChunkNumber,
+		DiscardWeight);
+
+	public void OnMaybeDiscard(int logicalChunkNumber) => IncreaseChunkWeight(
+		logicalChunkNumber,
+		MaybeDiscardWeight);
+
+	private void IncreaseChunkWeight(int logicalChunkNumber, float extraWeight) {
+		if (_weights.TryGetValue(logicalChunkNumber, out var current)) {
+			_weights[logicalChunkNumber] = extraWeight + current;
+		} else {
+			_weights[logicalChunkNumber] = extraWeight;
+		}
+	}
+
+	public void Flush() {
+		foreach (var kvp in _weights) {
+			var logicalChunkNumber = kvp.Key;
+			var extraWeight = kvp.Value;
+			_state.IncreaseChunkWeight(logicalChunkNumber, extraWeight);
+		}
+		_weights.Clear();
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/Throttle.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/Throttle.cs
new file mode 100644
index 00000000000..c41dc48f55e
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/Throttle.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using Serilog;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging;
+
+// Call Rest from time to time and this will rest a suitable amount of time
+// to achieve an overall % time spent working approximately equal to activePercent.
+public class Throttle {
+	private readonly Stopwatch _stopwatch;
+	private readonly double _minimumRestMs;
+	private readonly double _logThresholdMs;
+	private readonly double _restFactor;
+	private readonly ManualResetEventSlim _mres;
+	private readonly ILogger _logger;
+	private double _totalRestingTimeMs;
+
+	public Throttle(
+		ILogger logger,
+		TimeSpan minimumRest,
+		TimeSpan restLoggingThreshold,
+		double activePercent) {
+
+		if (activePercent <= 0 || 100 < activePercent)
+			throw new ArgumentOutOfRangeException(nameof(activePercent), activePercent, null);
+
+		_logger = logger;
+		_stopwatch = new Stopwatch();
+		_minimumRestMs = minimumRest.TotalMilliseconds;
+		_logThresholdMs = restLoggingThreshold.TotalMilliseconds;
+		_restFactor = 1 - (activePercent / 100);
+
+		_mres = new ManualResetEventSlim(false, 0);
+		Reset();
+	}
+
+	public void Reset() {
+		_totalRestingTimeMs = 0;
+		_stopwatch.Restart();
+	}
+
+	public void Rest(CancellationToken cancellationToken) {
+		if (_restFactor == 0)
+			return;
+
+		var totalTimeMs = _stopwatch.Elapsed.TotalMilliseconds;
+
+		// we want to have achieved the right proportion after the rest
+		var timeToRestMs = (_restFactor * totalTimeMs - _totalRestingTimeMs) / (1 - _restFactor);
+
+		if (timeToRestMs < _minimumRestMs)
+			return;
+
+		var isLongRest = timeToRestMs >= _logThresholdMs;
+		if (isLongRest)
+			_logger.Debug("SCAVENGING: Resting {timeToRestMs:N0}ms", timeToRestMs);
+
+		_totalRestingTimeMs += timeToRestMs;
+
+		// nothing will set the mres, we just wait until we timeout or are cancelled
+		_mres.Wait((int)timeToRestMs, cancellationToken);
+
+		if (isLongRest)
+			_logger.Debug(PrettyPrint());
+	}
+
+	public string PrettyPrint() {
+		var totalMs = _stopwatch.Elapsed.TotalMilliseconds;
+		var totalActiveTimeMs = totalMs - _totalRestingTimeMs;
+		var activePercent = 100 * totalActiveTimeMs / totalMs;
+		return
+			$"Rested {TimeSpan.FromMilliseconds(_totalRestingTimeMs)} " +
+			$"out of {TimeSpan.FromMilliseconds(totalMs)}. " +
+			$"{activePercent:N2} percent active.";
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Scavenging/TransactionManager.cs b/src/KurrentDB.Core/TransactionLog/Scavenging/TransactionManager.cs
new file mode 100644
index 00000000000..df976981566
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Scavenging/TransactionManager.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.TransactionLog.Scavenging.Data;
+using KurrentDB.Core.TransactionLog.Scavenging.Interfaces;
+
+namespace KurrentDB.Core.TransactionLog.Scavenging;
+
+// This makes sure we dont accidentally start trying to nest transactions or begin them concurrently
+// and facilitates committing the open transaction with a checkpoint
+public class TransactionManager<TTransaction> : ITransactionManager {
+	private readonly ITransactionFactory<TTransaction> _factory;
+	private readonly IScavengeMap<Unit, ScavengeCheckpoint> _storage;
+	private Action _onRollback;
+	private bool _began;
+	private TTransaction _transaction;
+
+	public TransactionManager(
+		ITransactionFactory<TTransaction> factory,
+		IScavengeMap<Unit, ScavengeCheckpoint> storage) {
+
+		_factory = factory;
+		_storage = storage;
+	}
+
+	public void RegisterOnRollback(Action onRollback) {
+		if (_onRollback != null)
+			throw new InvalidOperationException();
+
+		_onRollback = onRollback;
+	}
+
+	public void UnregisterOnRollback() {
+		_onRollback = null;
+	}
+
+	public void Begin() {
+		if (_began)
+			throw new InvalidOperationException("Cannot begin a transaction that has already begun.");
+
+		_transaction = _factory.Begin();
+		_began = true;
+	}
+
+	public void Rollback() {
+		if (!_began)
+			throw new InvalidOperationException("Cannot rollback a transaction that has not begun.");
+
+		_factory.Rollback(_transaction);
+		_onRollback?.Invoke();
+		_began = false;
+	}
+
+	public void Commit(ScavengeCheckpoint checkpoint) {
+		if (!_began)
+			throw new InvalidOperationException("Cannot commit a transaction that has not begun.");
+
+		_storage[Unit.Instance] = checkpoint;
+
+		_factory.Commit(_transaction);
+		_began = false;
+	}
+}
diff --git a/src/KurrentDB.Core/TransactionLog/Unbuffered/UnbufferedFileStream.cs b/src/KurrentDB.Core/TransactionLog/Unbuffered/UnbufferedFileStream.cs
new file mode 100644
index 00000000000..587b4ca9d8f
--- /dev/null
+++ b/src/KurrentDB.Core/TransactionLog/Unbuffered/UnbufferedFileStream.cs
@@ -0,0 +1,295 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
+using Microsoft.Win32.SafeHandles;
+using RuntimeInformation = System.Runtime.RuntimeInformation;
+
+namespace KurrentDB.Core.TransactionLog.Unbuffered;
+
+//NOTE THIS DOES NOT SUPPORT ALL STREAM OPERATIONS AS YOU MIGHT EXPECT IT SUPPORTS WHAT WE USE!
+public unsafe class UnbufferedFileStream : Stream {
+	private static readonly INativeFile NativeFile;
+
+	private byte* _writeBuffer;
+	private byte* _readBuffer;
+	private readonly int _writeBufferSize;
+	private readonly int _readBufferSize;
+	private readonly IntPtr _writeBufferOriginal;
+	private readonly IntPtr _readBufferOriginal;
+	private readonly uint _blockSize;
+	private long _bufferedCount;
+	private bool _aligned;
+	private long _lastPosition;
+	private bool _needsFlush;
+	private SafeFileHandle _handle;
+	private long _readLocation = -1;
+	private bool _needsRead;
+
+	static UnbufferedFileStream() =>
+			NativeFile = RuntimeInformation.IsWindows ? new NativeFileWindows() : new NativeFileUnix();
+
+	private UnbufferedFileStream(SafeFileHandle handle, uint blockSize, int internalWriteBufferSize,
+	int internalReadBufferSize) {
+		_handle = handle;
+		_readBufferSize = internalReadBufferSize;
+		_writeBufferSize = internalWriteBufferSize;
+		_writeBufferOriginal = Marshal.AllocHGlobal((int)(internalWriteBufferSize + blockSize));
+		_readBufferOriginal = Marshal.AllocHGlobal((int)(internalReadBufferSize + blockSize));
+		_readBuffer = Align(_readBufferOriginal, blockSize);
+		_writeBuffer = Align(_writeBufferOriginal, blockSize);
+		_blockSize = blockSize;
+	}
+
+	private byte* Align(IntPtr buf, uint alignTo) {
+		//This makes an aligned buffer linux needs this.
+		//The buffer must originally be at least one alignment bigger!
+		var diff = alignTo - (buf.ToInt64() % alignTo);
+		var aligned = (IntPtr)(buf.ToInt64() + diff);
+		return (byte*)aligned;
+	}
+
+	public static UnbufferedFileStream Create(string path,
+		FileMode mode,
+		FileAccess acc,
+		FileShare share,
+		int internalWriteBufferSize,
+		int internalReadBufferSize,
+		bool writeThrough,
+		uint minBlockSize) {
+		var blockSize = NativeFile.GetDriveSectorSize(path);
+		blockSize = blockSize > minBlockSize ? blockSize : minBlockSize;
+		if (internalWriteBufferSize % blockSize != 0)
+			throw new Exception("write buffer size must be aligned to block size of " + blockSize + " bytes");
+		if (internalReadBufferSize % blockSize != 0)
+			throw new Exception("read buffer size must be aligned to block size of " + blockSize + " bytes");
+
+		var handle = NativeFile.CreateUnbufferedRW(path, acc, share, mode, writeThrough);
+		return new UnbufferedFileStream(handle, blockSize, internalWriteBufferSize, internalReadBufferSize);
+	}
+
+	public override void Flush() {
+		CheckDisposed();
+		if (!_needsFlush)
+			return;
+		var alignedbuffer = (int)GetLowestAlignment(_bufferedCount);
+		var positionAligned = GetLowestAlignment(_lastPosition);
+		if (!_aligned) {
+			SeekInternal(positionAligned, SeekOrigin.Begin);
+		}
+
+		if (_bufferedCount == alignedbuffer) {
+			InternalWrite(_writeBuffer, (uint)_bufferedCount);
+			_lastPosition = positionAligned + _bufferedCount;
+			_bufferedCount = 0;
+			_aligned = true;
+		} else {
+			var left = _bufferedCount - alignedbuffer;
+			InternalWrite(_writeBuffer, (uint)(alignedbuffer + _blockSize));
+			_lastPosition = positionAligned + alignedbuffer;
+			SetBuffer(alignedbuffer, left);
+			_bufferedCount = left;
+			_aligned = false;
+		}
+
+		_needsFlush = false;
+	}
+
+	private static void MemCopy(byte[] src, long srcOffset, byte* dest, long destOffset, long count) {
+		fixed (byte* p = src) {
+			MemCopy(p, srcOffset, dest, destOffset, count);
+		}
+	}
+
+	private static void MemCopy(byte* src, long srcOffset, byte[] dest, long destOffset, long count) {
+		fixed (byte* p = dest) {
+			MemCopy(src, srcOffset, p, destOffset, count);
+		}
+	}
+
+	private static void MemCopy(byte* src, long srcOffset, byte* dest, long destOffset, long count) {
+		byte* psrc = src + srcOffset;
+		byte* pdest = dest + destOffset;
+
+		for (var i = 0; i < count; i++) {
+			*pdest = *psrc;
+			pdest++;
+			psrc++;
+		}
+	}
+
+	private void SeekInternal(long positionAligned, SeekOrigin origin) {
+		NativeFile.Seek(_handle, positionAligned, origin);
+	}
+
+	private void InternalWrite(byte* buffer, uint count) {
+		var written = 0;
+		NativeFile.Write(_handle, buffer, count, ref written);
+	}
+
+	public override long Seek(long offset, SeekOrigin origin) {
+		long mungedOffset = offset;
+		CheckDisposed();
+		if (origin == SeekOrigin.Current)
+			throw new NotImplementedException("only supports seek origin begin/end");
+		if (origin == SeekOrigin.End)
+			mungedOffset = Length + offset;
+		var aligned = GetLowestAlignment(mungedOffset);
+		var left = (int)(mungedOffset - aligned);
+		Flush();
+		_bufferedCount = left;
+		_aligned = aligned == left;
+		_lastPosition = aligned;
+		//TODO cant do two seeks + a read here.
+		SeekInternal(aligned, SeekOrigin.Begin);
+		_needsRead = true;
+		return offset;
+	}
+
+	private long GetLowestAlignment(long offset) {
+		return offset - (offset % _blockSize);
+	}
+
+	public override void SetLength(long value) {
+		CheckDisposed();
+		var aligned = GetLowestAlignment(value);
+		aligned = aligned == value ? aligned : aligned + _blockSize;
+		NativeFile.SetFileSize(_handle, aligned);
+		if (Position > aligned)
+			Seek(aligned, SeekOrigin.Begin);
+	}
+
+	public override int Read(byte[] buffer, int offset, int count) {
+		CheckDisposed();
+		if (offset < 0 || buffer.Length < offset)
+			throw new ArgumentException("offset");
+		if (count < 0 || buffer.Length < count)
+			throw new ArgumentException("offset");
+		if (offset + count > buffer.Length)
+			throw new ArgumentException("offset + count must be less than size of array");
+		var position = GetLowestAlignment(Position);
+		var roffset = (int)(Position - position);
+
+		var bytesRead = _readBufferSize;
+		if (_readLocation + _readBufferSize <= position || _readLocation > position || _readLocation == -1) {
+			SeekInternal(position, SeekOrigin.Begin);
+			bytesRead = NativeFile.Read(_handle, _readBuffer, 0, _readBufferSize);
+			_readLocation = position;
+		} else if (_readLocation != position) {
+			roffset += (int)(position - _readLocation);
+		}
+
+		var bytesAvailable = bytesRead - roffset;
+		if (bytesAvailable <= 0)
+			return 0;
+		var toCopy = count > bytesAvailable ? bytesAvailable : count;
+
+		MemCopy(_readBuffer, roffset, buffer, offset, toCopy);
+		_bufferedCount += toCopy;
+		if (count - toCopy == 0)
+			return toCopy;
+		return toCopy + Read(buffer, offset + toCopy, count - toCopy);
+	}
+
+	public override void Write(byte[] buffer, int offset, int count) {
+		CheckDisposed();
+		var done = false;
+		long left = count;
+		long current = offset;
+		if (_needsRead) {
+			SeekInternal(_lastPosition, SeekOrigin.Begin);
+			NativeFile.Read(_handle, _writeBuffer, 0, (int)_blockSize);
+			SeekInternal(_lastPosition, SeekOrigin.Begin);
+			_needsRead = false;
+		}
+
+		while (!done) {
+			_needsFlush = true;
+			if (_bufferedCount + left < _writeBufferSize) {
+				CopyBuffer(buffer, current, left);
+				done = true;
+				current += left;
+			} else {
+				var toFill = _writeBufferSize - _bufferedCount;
+				CopyBuffer(buffer, current, toFill);
+				Flush();
+				left -= toFill;
+				current += toFill;
+				done = left == 0;
+			}
+		}
+	}
+
+	private void CopyBuffer(byte[] buffer, long offset, long count) {
+		MemCopy(buffer, offset, _writeBuffer, _bufferedCount, count);
+		_bufferedCount += count;
+	}
+
+	public override bool CanRead {
+		get {
+			CheckDisposed();
+			return true;
+		}
+	}
+
+	public override bool CanSeek {
+		get {
+			CheckDisposed();
+			return true;
+		}
+	}
+
+	public override bool CanWrite {
+		get {
+			CheckDisposed();
+			return true;
+		}
+	}
+
+	public override long Length {
+		get {
+			CheckDisposed();
+			return NativeFile.GetFileSize(_handle);
+		}
+	}
+
+	public override long Position {
+		get {
+			CheckDisposed();
+			if (_aligned)
+				return _lastPosition + _bufferedCount;
+			return GetLowestAlignment(_lastPosition) + _bufferedCount;
+		}
+		set {
+			CheckDisposed();
+			Seek(value, SeekOrigin.Begin);
+		}
+	}
+
+	private void SetBuffer(long alignedbuffer, long left) {
+		MemCopy(_writeBuffer, alignedbuffer, _writeBuffer, 0, left);
+	}
+
+	[Conditional("DEBUG")]
+	private void CheckDisposed() {
+		//only check in debug
+		if (_handle == null)
+			throw new ObjectDisposedException("object is disposed.");
+	}
+
+	protected override void Dispose(bool disposing) {
+		if (_handle == null)
+			return;
+		Flush();
+		_handle.Close();
+		_handle = null;
+		_readBuffer = (byte*)IntPtr.Zero;
+		_writeBuffer = (byte*)IntPtr.Zero;
+		Marshal.FreeHGlobal(_readBufferOriginal);
+		Marshal.FreeHGlobal(_writeBufferOriginal);
+		GC.SuppressFinalize(this);
+	}
+}
diff --git a/src/KurrentDB.Core/Transforms/DbTransformManager.cs b/src/KurrentDB.Core/Transforms/DbTransformManager.cs
new file mode 100644
index 00000000000..ad19a66636b
--- /dev/null
+++ b/src/KurrentDB.Core/Transforms/DbTransformManager.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Core.Transforms.Identity;
+using Serilog;
+
+namespace KurrentDB.Core.Transforms;
+
+public class DbTransformManager : IGetChunkTransformFactory {
+	private IReadOnlyList<IDbTransform> _transforms;
+	private IDbTransform _activeTransform;
+
+	private IDbTransform FindTransform(TransformType type) {
+		if (TryFindTransform(type, out var transform))
+			return transform;
+
+		throw new Exception($"Failed to load transform: {type}");
+	}
+
+	private bool TryFindTransform(TransformType type, out IDbTransform dbTransform) {
+		dbTransform = _transforms?.FirstOrDefault(t => t.Type == type);
+		return dbTransform != null;
+	}
+
+	private bool TryFindTransform(string name, out IDbTransform dbTransform) {
+		dbTransform = _transforms?.FirstOrDefault(t => t.Name == name);
+		return dbTransform != null;
+	}
+
+	public IChunkTransformFactory GetFactoryForNewChunk() => _activeTransform?.ChunkFactory ??
+															 throw new Exception("Active transform not set");
+
+	public IChunkTransformFactory GetFactoryForExistingChunk(TransformType type) => FindTransform(type).ChunkFactory;
+
+	public void LoadTransforms(IReadOnlyList<IDbTransform> transforms) {
+		_transforms = transforms;
+		Log.Information($"Loaded the following transforms: {string.Join(", ", transforms.Select(t => t.Type))}");
+
+		// the identity transform is always required
+		_ = FindTransform(TransformType.Identity);
+	}
+
+	public void SetActiveTransform(TransformType type) {
+		Log.Information($"Setting the active transform to: {type}");
+		_activeTransform = FindTransform(type);
+	}
+
+	public bool TrySetActiveTransform(string name) {
+		if (!TryFindTransform(name, out var transform))
+			return false;
+
+		_activeTransform = transform;
+		Log.Information($"Active transform set to: {_activeTransform.Type}");
+		return true;
+	}
+
+	public bool SupportsTransform(TransformType type) => TryFindTransform(type, out _);
+
+	public static DbTransformManager Default {
+		get {
+			var dbTransformManager = new DbTransformManager();
+			var identityDbTransform = new IdentityDbTransform();
+			dbTransformManager.LoadTransforms(new[] { identityDbTransform });
+			dbTransformManager.SetActiveTransform(TransformType.Identity);
+			return dbTransformManager;
+		}
+	}
+
+	public IChunkTransformFactory ForNewChunk() => GetFactoryForNewChunk();
+	public IChunkTransformFactory ForExistingChunk(TransformType type) => GetFactoryForExistingChunk(type);
+}
diff --git a/src/KurrentDB.Core/Transforms/IGetChunkTransformFactory.cs b/src/KurrentDB.Core/Transforms/IGetChunkTransformFactory.cs
new file mode 100644
index 00000000000..8ae4b598994
--- /dev/null
+++ b/src/KurrentDB.Core/Transforms/IGetChunkTransformFactory.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Transforms;
+
+public interface IGetChunkTransformFactory {
+	IChunkTransformFactory ForNewChunk();
+	IChunkTransformFactory ForExistingChunk(TransformType type);
+}
diff --git a/src/KurrentDB.Core/Transforms/Identity/IdentityChunkReadTransform.cs b/src/KurrentDB.Core/Transforms/Identity/IdentityChunkReadTransform.cs
new file mode 100644
index 00000000000..e1f26200862
--- /dev/null
+++ b/src/KurrentDB.Core/Transforms/Identity/IdentityChunkReadTransform.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Transforms.Identity;
+
+public sealed class IdentityChunkReadTransform : IChunkReadTransform {
+	public static readonly IdentityChunkReadTransform Instance = new();
+
+	private IdentityChunkReadTransform() {
+
+	}
+
+	public ChunkDataReadStream TransformData(ChunkDataReadStream stream) => stream;
+}
diff --git a/src/KurrentDB.Core/Transforms/Identity/IdentityChunkTransform.cs b/src/KurrentDB.Core/Transforms/Identity/IdentityChunkTransform.cs
new file mode 100644
index 00000000000..52c614de6eb
--- /dev/null
+++ b/src/KurrentDB.Core/Transforms/Identity/IdentityChunkTransform.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Transforms.Identity;
+
+public sealed class IdentityChunkTransform : IChunkTransform {
+	public IChunkReadTransform Read => IdentityChunkReadTransform.Instance;
+	public IChunkWriteTransform Write { get; } = new IdentityChunkWriteTransform();
+}
diff --git a/src/KurrentDB.Core/Transforms/Identity/IdentityChunkTransformFactory.cs b/src/KurrentDB.Core/Transforms/Identity/IdentityChunkTransformFactory.cs
new file mode 100644
index 00000000000..bcd7045b224
--- /dev/null
+++ b/src/KurrentDB.Core/Transforms/Identity/IdentityChunkTransformFactory.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Transforms.Identity;
+
+public sealed class IdentityChunkTransformFactory : IChunkTransformFactory {
+	public TransformType Type => TransformType.Identity;
+	public int TransformDataPosition(int dataPosition) => dataPosition;
+	public void CreateTransformHeader(Span<byte> transformHeader) => transformHeader.Clear();
+
+	public ValueTask ReadTransformHeader(Stream stream, Memory<byte> transformHeader, CancellationToken token)
+		=> token.IsCancellationRequested ? ValueTask.FromCanceled(token) : ValueTask.CompletedTask;
+
+	public IChunkTransform CreateTransform(ReadOnlySpan<byte> transformHeader) => new IdentityChunkTransform();
+
+	public int TransformHeaderLength => 0;
+}
diff --git a/src/KurrentDB.Core/Transforms/Identity/IdentityChunkWriteTransform.cs b/src/KurrentDB.Core/Transforms/Identity/IdentityChunkWriteTransform.cs
new file mode 100644
index 00000000000..42bbe3764f2
--- /dev/null
+++ b/src/KurrentDB.Core/Transforms/Identity/IdentityChunkWriteTransform.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using DotNext.Buffers;
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Transforms.Identity;
+
+public sealed class IdentityChunkWriteTransform : IChunkWriteTransform {
+	private ChunkDataWriteStream _stream;
+
+	public ChunkDataWriteStream TransformData(ChunkDataWriteStream stream) {
+		_stream = stream;
+		return _stream;
+	}
+
+	public ValueTask CompleteData(int footerSize, int alignmentSize, CancellationToken token) {
+		var chunkHeaderAndDataSize = (int)_stream.Position;
+		var alignedSize = GetAlignedSize(chunkHeaderAndDataSize + footerSize, alignmentSize);
+		var paddingSize = alignedSize - chunkHeaderAndDataSize - footerSize;
+		return paddingSize > 0
+			? WritePaddingAsync(_stream, paddingSize, token)
+			: ValueTask.CompletedTask;
+
+		static async ValueTask WritePaddingAsync(ChunkDataWriteStream stream, int paddingSize, CancellationToken token) {
+			using var buffer = Memory.AllocateExactly<byte>(paddingSize);
+			buffer.Span.Clear(); // ensure that the padding is zeroed
+			await stream.WriteAsync(buffer.Memory, token);
+		}
+	}
+
+	public async ValueTask<int> WriteFooter(ReadOnlyMemory<byte> footer, CancellationToken token) {
+		await _stream.ChunkFileStream.WriteAsync(footer, token);
+
+		// The underlying stream can implement buffered I/O, this is why we need to flush it
+		// to get the correct length (because some bytes can be in the internal buffer)
+		await _stream.ChunkFileStream.FlushAsync(token);
+		return (int)_stream.Position;
+	}
+
+	private static int GetAlignedSize(int size, int alignmentSize) {
+		var quotient = Math.DivRem(size, alignmentSize, out var remainder);
+
+		return remainder is 0 ? size : (quotient + 1) * alignmentSize;
+	}
+}
diff --git a/src/KurrentDB.Core/Transforms/Identity/IdentityDbTransform.cs b/src/KurrentDB.Core/Transforms/Identity/IdentityDbTransform.cs
new file mode 100644
index 00000000000..f09cc0204e3
--- /dev/null
+++ b/src/KurrentDB.Core/Transforms/Identity/IdentityDbTransform.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Core.Transforms.Identity;
+
+public sealed class IdentityDbTransform : IDbTransform {
+	public string Name => "identity";
+	public TransformType Type => TransformType.Identity;
+	public IChunkTransformFactory ChunkFactory { get; } = new IdentityChunkTransformFactory();
+}
diff --git a/src/KurrentDB.Core/Util/DefaultFiles.cs b/src/KurrentDB.Core/Util/DefaultFiles.cs
new file mode 100644
index 00000000000..9e34f174f96
--- /dev/null
+++ b/src/KurrentDB.Core/Util/DefaultFiles.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Runtime;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Core.Util;
+
+public static class DefaultFiles {
+	public static readonly string DefaultConfigFile = RuntimeInformation.IsWindows
+		? string.Empty
+		: "kurrentdb.conf";
+
+	public static readonly string LegacyEventStoreConfigFile = RuntimeInformation.IsWindows
+		? string.Empty
+		: "eventstore.conf";
+
+	public static string DefaultConfigPath =>
+		Path.Combine(Locations.DefaultConfigurationDirectory, DefaultConfigFile);
+	public static string LegacyEventStoreConfigPath =>
+		Path.Combine(Locations.LegacyConfigurationDirectory, LegacyEventStoreConfigFile);
+}
diff --git a/src/KurrentDB.Core/Util/FileUtil.cs b/src/KurrentDB.Core/Util/FileUtil.cs
new file mode 100644
index 00000000000..8ed924d16db
--- /dev/null
+++ b/src/KurrentDB.Core/Util/FileUtil.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+
+namespace KurrentDB.Core.Util;
+
+public static class FileUtils {
+	public static void DirectoryCopy(string sourceDirName, string destDirName, bool copySubDirs) {
+		// Get the subdirectories for the specified directory.
+		var dir = new DirectoryInfo(sourceDirName);
+
+		if (!dir.Exists)
+			throw new DirectoryNotFoundException("Source directory does not exist or could not be found: " +
+												 sourceDirName);
+
+		var subdirs = copySubDirs ? dir.GetDirectories() : null;
+
+		// If the destination directory doesn't exist, create it.
+		if (!Directory.Exists(destDirName))
+			Directory.CreateDirectory(destDirName);
+
+		// Get the files in the directory and copy them to the new location.
+		foreach (FileInfo file in dir.GetFiles()) {
+			file.CopyTo(Path.Combine(destDirName, file.Name), false);
+		}
+
+		if (copySubDirs) {
+			foreach (DirectoryInfo subdir in subdirs) {
+				DirectoryCopy(subdir.FullName, Path.Combine(destDirName, subdir.Name), true);
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Util/Functions.cs b/src/KurrentDB.Core/Util/Functions.cs
new file mode 100644
index 00000000000..0a460cafa65
--- /dev/null
+++ b/src/KurrentDB.Core/Util/Functions.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+using System;
+using KurrentDB.Core.Time;
+
+namespace KurrentDB.Core.Util;
+
+public static class Functions {
+	public static Func<T> Debounce<T>(this Func<T> func, TimeSpan timeout, IClock? clock = null) {
+		clock ??= Clock.Instance;
+		var seconds = timeout.TotalSeconds;
+		Instant lastCalled = default;
+		T? current = default;
+
+		return () => {
+			var now = clock.Now;
+			if (lastCalled == default || now.ElapsedSecondsSince(lastCalled) > seconds) {
+				current = func();
+				lastCalled = now;
+			}
+
+			return current!;
+		};
+	}
+}
diff --git a/src/KurrentDB.Core/Util/MD5Hash.cs b/src/KurrentDB.Core/Util/MD5Hash.cs
new file mode 100644
index 00000000000..2d9e24c48e4
--- /dev/null
+++ b/src/KurrentDB.Core/Util/MD5Hash.cs
@@ -0,0 +1,71 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Buffers;
+using System.IO;
+using System.Security.Cryptography;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using MD5 = KurrentDB.Core.Hashing.MD5;
+
+namespace KurrentDB.Core.Util;
+
+public class MD5Hash {
+	public static byte[] GetHashFor(Stream s) {
+		//when using this, it will calculate from this point to the END of the stream!
+		using (var md5 = MD5.Create())
+			return md5.ComputeHash(s);
+	}
+
+	public static byte[] GetHashFor(Stream s, int startPosition, long count) {
+		Ensure.Nonnegative(count, "count");
+
+		using (var md5 = MD5.Create()) {
+			ContinuousHashFor(md5, s, startPosition, count);
+			md5.TransformFinalBlock(Empty.ByteArray, 0, 0);
+			return md5.Hash;
+		}
+	}
+
+	public static void ContinuousHashFor(HashAlgorithm md5, Stream s, int startPosition, long count) {
+		Ensure.NotNull(md5, "md5");
+		Ensure.Nonnegative(count, "count");
+
+		if (s.Position != startPosition)
+			s.Position = startPosition;
+
+		var buffer = new byte[4096];
+		long toRead = count;
+		while (toRead > 0) {
+			int read = s.Read(buffer, 0, (int)Math.Min(toRead, buffer.Length));
+			if (read == 0)
+				break;
+
+			md5.TransformBlock(buffer, 0, read, null, 0);
+			toRead -= read;
+		}
+	}
+
+	public static async ValueTask ContinuousHashFor(IncrementalHash md5, Stream s, int startPosition, long count, CancellationToken token) {
+		Ensure.NotNull(md5, "md5");
+		Ensure.Nonnegative(count, "count");
+
+		if (s.Position != startPosition)
+			s.Position = startPosition;
+
+		var buffer = ArrayPool<byte>.Shared.Rent(4096);
+		try {
+			for (int bytesRead; count > 0L; count -= bytesRead) {
+				bytesRead = await s.ReadAsync(buffer.AsMemory(0, (int)Math.Min(count, buffer.Length)), token);
+				if (bytesRead is 0)
+					break;
+
+				md5.AppendData(buffer, 0, bytesRead);
+			}
+		} finally {
+			ArrayPool<byte>.Shared.Return(buffer);
+		}
+	}
+}
diff --git a/src/KurrentDB.Core/Util/MiniWeb.cs b/src/KurrentDB.Core/Util/MiniWeb.cs
new file mode 100644
index 00000000000..259d5025541
--- /dev/null
+++ b/src/KurrentDB.Core/Util/MiniWeb.cs
@@ -0,0 +1,133 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Services.Transport.Http;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.Codecs;
+using KurrentDB.Transport.Http.EntityManagement;
+using Serilog;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Core.Util;
+
+public class MiniWeb {
+	private readonly string _localWebRootPath;
+	private readonly string _fileSystemRoot;
+	private static readonly ILogger Logger = Log.ForContext<MiniWeb>();
+
+	public MiniWeb(string localWebRootPath) : this(localWebRootPath, GetWebRootFileSystemDirectory()) {
+	}
+
+	public MiniWeb(string localWebRootPath, string fileSystemRoot) {
+		Logger.Information("Starting MiniWeb for {localWebRootPath} ==> {fileSystemRoot}", localWebRootPath,
+			fileSystemRoot);
+		_localWebRootPath = localWebRootPath;
+		_fileSystemRoot = fileSystemRoot;
+	}
+
+	public void RegisterControllerActions(IHttpService service) {
+		var pattern = _localWebRootPath + "/{*remaining_path}";
+		Logger.Verbose("Binding MiniWeb to {path}", pattern);
+		service.RegisterAction(
+			new ControllerAction(pattern, HttpMethod.Get, Codec.NoCodecs, new ICodec[] { Codec.ManualEncoding }, new Operation(Operations.Node.StaticContent)),
+			OnStaticContent);
+	}
+
+	private void OnStaticContent(HttpEntityManager http, UriTemplateMatch match) {
+		var contentLocalPath = match.BoundVariables["remaining_path"];
+		ReplyWithContent(http, contentLocalPath);
+	}
+
+	private void ReplyWithContent(HttpEntityManager http, string contentLocalPath) {
+		//NOTE: this is fix for Mono incompatibility in UriTemplate behavior for /a/b{*C}
+		if (("/" + contentLocalPath).StartsWith(_localWebRootPath))
+			contentLocalPath = contentLocalPath.Substring(_localWebRootPath.Length);
+
+		//_logger.Trace("{contentLocalPath} requested from MiniWeb", contentLocalPath);
+		try {
+			var extensionToContentType = new Dictionary<string, string> {
+				{".png", "image/png"},
+				{".svg", "image/svg+xml"},
+				{".woff", "application/x-font-woff"},
+				{".woff2", "application/x-font-woff"},
+				{".ttf", "application/font-sfnt"},
+				{".jpg", "image/jpeg"},
+				{".jpeg", "image/jpeg"},
+				{".css", "text/css"},
+				{".htm", "text/html"},
+				{".html", "text/html"},
+				{".js", "application/javascript"},
+				{".json", "application/json"},
+				{".ico", "image/vnd.microsoft.icon"}
+			};
+
+			var extension = Path.GetExtension(contentLocalPath);
+			var fullPath = Path.Combine(_fileSystemRoot, contentLocalPath);
+
+			string contentType;
+			if (string.IsNullOrEmpty(extension)
+				|| !extensionToContentType.TryGetValue(extension.ToLower(), out contentType)
+				|| !File.Exists(fullPath)) {
+				Logger.Information("Replying 404 for {contentLocalPath} ==> {fullPath}", contentLocalPath, fullPath);
+				http.ReplyTextContent(
+					"Not Found", 404, "Not Found", ContentType.PlainText, null,
+					ex => Logger.Information(ex, "Error while replying from MiniWeb"));
+			} else {
+				var config = GetWebPageConfig(contentType);
+				var content = File.ReadAllBytes(fullPath);
+
+				http.Reply(content,
+					config.Code,
+					config.Description,
+					config.ContentType,
+					config.Encoding,
+					config.Headers,
+					ex => Logger.Information(ex, "Error while replying from MiniWeb"));
+			}
+		} catch (Exception ex) {
+			http.ReplyTextContent(ex.ToString(), 500, "Internal Server Error", ContentType.PlainText, null,
+				Console.WriteLine);
+		}
+	}
+
+	private static ResponseConfiguration GetWebPageConfig(string contentType) {
+		var encoding = contentType.StartsWith("image") ? null : Helper.UTF8NoBom;
+		int? cacheSeconds =
+#if RELEASE || CACHE_WEB_CONTENT
+                60*60; // 1 hour
+#else
+			null; // no caching
+#endif
+		// ReSharper disable ExpressionIsAlwaysNull
+		return Configure.Ok(contentType, encoding, null, cacheSeconds, isCachePublic: true);
+		// ReSharper restore ExpressionIsAlwaysNull
+	}
+
+	public static string GetWebRootFileSystemDirectory(string debugPath = null) {
+		string fileSystemWebRoot;
+		try {
+			if (!string.IsNullOrEmpty(debugPath)) {
+				var sf = new StackFrame(0, true);
+				var fileName = sf.GetFileName();
+				var sourceWebRootDirectory = string.IsNullOrEmpty(fileName)
+					? ""
+					: Path.GetFullPath(Path.Combine(fileName, @"..\..\..", debugPath));
+				fileSystemWebRoot = Directory.Exists(sourceWebRootDirectory)
+					? sourceWebRootDirectory
+					: Locations.WebContentDirectory;
+			} else {
+				fileSystemWebRoot = Locations.WebContentDirectory;
+			}
+		} catch (Exception) {
+			fileSystemWebRoot = Locations.WebContentDirectory;
+		}
+
+		return fileSystemWebRoot;
+	}
+}
diff --git a/src/KurrentDB.Core/Util/Opts.cs b/src/KurrentDB.Core/Util/Opts.cs
new file mode 100644
index 00000000000..240d25ed995
--- /dev/null
+++ b/src/KurrentDB.Core/Util/Opts.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Index;
+
+namespace KurrentDB.Core.Util;
+
+public static class Opts {
+	public const int ConnectionPendingSendBytesThresholdDefault = 10 * 1024 * 1024;
+
+	public const int ConnectionQueueSizeThresholdDefault = 50000;
+
+	public const int HashCollisionReadLimitDefault = 100;
+
+	public const bool FaultOutOfOrderProjectionsDefault = false;
+
+	public const int ProjectionsQueryExpiryDefault = 5;
+
+	public const int MaxProjectionStateSizeDefault = int.MaxValue;
+
+	public const byte IndexBitnessVersionDefault = PTableVersions.IndexV4;
+
+	public static readonly string AuthenticationTypeDefault = "internal";
+
+	public const bool SkipIndexScanOnReadsDefault = false;
+
+	public const long StreamExistenceFilterSizeDefault = 256_000_000;
+
+	public const int ScavengeBackendPageSizeDefault = 16 * 1024;
+
+	public const int ScavengeBackendCacheSizeDefault = 64 * 1024 * 1024;
+
+	public const int ScavengeHashUsersCacheCapacityDefault = 100_000;
+
+
+}
diff --git a/src/KurrentDB.Core/VNodeStatusChangeArgs.cs b/src/KurrentDB.Core/VNodeStatusChangeArgs.cs
new file mode 100644
index 00000000000..d1a423050e6
--- /dev/null
+++ b/src/KurrentDB.Core/VNodeStatusChangeArgs.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+
+namespace KurrentDB.Core;
+
+public class VNodeStatusChangeArgs : EventArgs {
+	public readonly VNodeState NewVNodeState;
+
+	public VNodeStatusChangeArgs(VNodeState newVNodeState) {
+		NewVNodeState = newVNodeState;
+	}
+}
diff --git a/src/KurrentDB.Diagnostics.LogsEndpointPlugin.Tests/JsonDirectoryFormatterTests.cs b/src/KurrentDB.Diagnostics.LogsEndpointPlugin.Tests/JsonDirectoryFormatterTests.cs
new file mode 100644
index 00000000000..c850f7ee346
--- /dev/null
+++ b/src/KurrentDB.Diagnostics.LogsEndpointPlugin.Tests/JsonDirectoryFormatterTests.cs
@@ -0,0 +1,189 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.Extensions.FileProviders;
+using Xunit;
+
+namespace KurrentDB.Diagnostics.LogsEndpointPlugin.Tests;
+
+public class JsonDirectoryFormatterTests {
+	[Fact]
+	public async Task formats_content_correctly() {
+		var dirContent = new List<IFileInfo>() {
+			TestFile.Named("file-1.json"),
+			TestFile.Named("file-2.json")
+		};
+
+		var json = await GenerateResponse(dirContent);
+
+		Assert.NotNull(json);
+		Assert.Equal(JsonValueKind.Array, json.GetValueKind());
+		Assert.Equal(dirContent.Count, json.AsArray().Count);
+	}
+
+	[Fact]
+	public async Task skips_directories() {
+		List<IFileInfo> files = [
+			TestFile.Named("file-1.json"),
+			TestFile.Named("file-2.json")
+		];
+		List<IFileInfo> directories = [
+			TestDirectory.Named("uploads")
+		];
+
+		var dirContent = new List<IFileInfo>(files).Concat(directories);
+
+		var json = await GenerateResponse(dirContent);
+
+		Assert.NotNull(json);
+		Assert.Equal(JsonValueKind.Array, json.GetValueKind());
+		Assert.Equal(files.Count, json.AsArray().Count);
+	}
+
+	[Fact]
+	public async Task only_returns_json_files() {
+		List<IFileInfo> jsonFiles = [
+			TestFile.Named("file-1.json"),
+			TestFile.Named("file-2.json")
+		];
+		List<IFileInfo> otherFiles = [
+			TestFile.Named("upload.exe"),
+			TestFile.Named("upload.jpg"),
+		];
+
+		var dirContent = new List<IFileInfo>(jsonFiles).Concat(otherFiles);
+
+		var json = await GenerateResponse(dirContent);
+
+		Assert.NotNull(json);
+		Assert.Equal(JsonValueKind.Array, json.GetValueKind());
+		Assert.Equal(jsonFiles.Count, json.AsArray().Count);
+	}
+
+	[Fact]
+	public async Task responds_with_most_recent_modification_first() {
+		var now = DateTimeOffset.Now;
+		List<IFileInfo> dirContent = [
+			TestFile.Named("monday.json").ModifiedAt(now.AddDays(-4)),
+			TestFile.Named("tuesday.json").ModifiedAt(now.AddDays(-3)),
+			TestFile.Named("wednesday.json").ModifiedAt(now.AddDays(-2)),
+			TestFile.Named("thursday.json").ModifiedAt(now.AddDays(-1)),
+			TestFile.Named("friday.json").ModifiedAt(now),
+		];
+
+		var json = await GenerateResponse(dirContent);
+
+		Assert.NotNull(json);
+		Assert.Equal(JsonValueKind.Array, json.GetValueKind());
+
+		var filenames = json.AsArray().Select(f => f?["name"]?.GetValue<string>());
+
+		Assert.Equal([
+			"friday.json",
+			"thursday.json",
+			"wednesday.json",
+			"tuesday.json",
+			"monday.json"
+		], filenames);
+	}
+
+	[Fact]
+	public async Task returns_a_maximum_of_1000_items() {
+		var dirContent = Enumerable
+			.Range(1, 2113)
+			.Select(i => TestFile
+				.Named($"log-file-{i}.json")
+				.ModifiedAt(DateTimeOffset.Now.AddDays(i)));
+
+		var json = await GenerateResponse(dirContent);
+
+		Assert.NotNull(json);
+		Assert.Equal(JsonValueKind.Array, json.GetValueKind());
+		Assert.Equal(1000, json.AsArray().Count);
+
+		Assert.Equal(
+			"log-file-2113.json",
+			json.AsArray().First()!["name"]!.GetValue<string>());
+	}
+
+	[Fact]
+	public async Task returns_a_date_as_local_time_with_time_zone_information() {
+		var now = DateTimeOffset.Now;
+		List<IFileInfo> dirContent = [
+			TestFile.Named("file-1.json").ModifiedAt(now),
+		];
+
+		var json = await GenerateResponse(dirContent);
+
+		Assert.NotNull(json);
+		Assert.Equal(JsonValueKind.Array, json.GetValueKind());
+		Assert.Equal(dirContent.Count, json.AsArray().Count);
+
+		Assert.Equal(
+			now.ToString("o"),
+			json.AsArray().First()!["lastModified"]!.GetValue<string>());
+	}
+
+	[Fact]
+	public async Task returns_an_empty_array_when_there_is_nothing_to_return() {
+		var json = await GenerateResponse(Array.Empty<IFileInfo>());
+
+		Assert.NotNull(json);
+		Assert.Equal(JsonValueKind.Array, json.GetValueKind());
+		Assert.Empty(json.AsArray());
+	}
+
+	private static async Task<JsonNode?> GenerateResponse(IEnumerable<IFileInfo> dirContent) {
+		var formatter = new JsonDirectoryFormatter();
+		var ctx = new DefaultHttpContext();
+		var stream = new MemoryStream();
+
+		ctx.Features.Set<IHttpResponseBodyFeature>(new StreamResponseBodyFeature(stream));
+
+		await formatter.GenerateContentAsync(ctx, dirContent);
+
+		stream.Position = 0;
+
+		return await JsonNode.ParseAsync(stream);
+	}
+
+	private static class TestDirectory {
+		public static TestFile Named(string name) {
+			return new TestFile(
+				Name: name,
+				Exists: true,
+				IsDirectory: true,
+				Length: 303,
+				LastModified: DateTimeOffset.Now,
+				PhysicalPath: null);
+		}
+	}
+
+	private record TestFile(bool Exists, bool IsDirectory, DateTimeOffset LastModified, long Length, string Name,
+		string? PhysicalPath) : IFileInfo {
+
+		public Stream CreateReadStream() {
+			throw new NotImplementedException();
+		}
+
+		public static TestFile Named(string name) {
+			return new TestFile(
+				Name: name,
+				Exists: true,
+				IsDirectory: false,
+				Length: 303,
+				LastModified: DateTimeOffset.Now,
+				PhysicalPath: null);
+		}
+
+		public TestFile ModifiedAt(DateTimeOffset offset) {
+			return this with {
+				LastModified = offset
+			};
+		}
+	}
+}
diff --git a/src/KurrentDB.Diagnostics.LogsEndpointPlugin.Tests/KurrentDB.Diagnostics.LogsEndpointPlugin.Tests.csproj b/src/KurrentDB.Diagnostics.LogsEndpointPlugin.Tests/KurrentDB.Diagnostics.LogsEndpointPlugin.Tests.csproj
new file mode 100644
index 00000000000..2b89612b0f3
--- /dev/null
+++ b/src/KurrentDB.Diagnostics.LogsEndpointPlugin.Tests/KurrentDB.Diagnostics.LogsEndpointPlugin.Tests.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+			<TargetFramework>net8.0</TargetFramework>
+			<ImplicitUsings>enable</ImplicitUsings>
+			<Nullable>enable</Nullable>
+			<IsPackable>false</IsPackable>
+			<IsPublishable>false</IsPublishable>
+			<IsTestProject>true</IsTestProject>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="FluentAssertions" Version="6.12.2" />
+		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3">
+					<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+					<PrivateAssets>all</PrivateAssets>
+			</PackageReference>
+			<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
+			<PackageReference Include="xunit" Version="2.9.2"/>
+			<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+					<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+					<PrivateAssets>all</PrivateAssets>
+			</PackageReference>
+			<PackageReference Include="coverlet.collector" Version="6.0.3">
+					<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+					<PrivateAssets>all</PrivateAssets>
+			</PackageReference>
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.Diagnostics.LogsEndpointPlugin\KurrentDB.Diagnostics.LogsEndpointPlugin.csproj" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.Diagnostics.LogsEndpointPlugin.Tests/LogsEndpointPluginTests.cs b/src/KurrentDB.Diagnostics.LogsEndpointPlugin.Tests/LogsEndpointPluginTests.cs
new file mode 100644
index 00000000000..a197b0064a8
--- /dev/null
+++ b/src/KurrentDB.Diagnostics.LogsEndpointPlugin.Tests/LogsEndpointPluginTests.cs
@@ -0,0 +1,208 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net;
+using System.Net.Http.Headers;
+using System.Security.Claims;
+using System.Text;
+using EventStore.Plugins;
+using EventStore.Plugins.Diagnostics;
+using EventStore.Plugins.Licensing;
+using FluentAssertions;
+using KurrentDB.Plugins.TestHelpers;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace KurrentDB.Diagnostics.LogsEndpointPlugin.Tests;
+
+public class LogsEndpointPluginTests :
+	IClassFixture<LicensedFixture>,
+	IClassFixture<UnlicensedFixture> {
+
+	private readonly LicensedFixture _fixture;
+	private readonly UnlicensedFixture _unlicensedFixture;
+	private const string Endpoint = "/admin/logs";
+
+	public LogsEndpointPluginTests(LicensedFixture fixture, UnlicensedFixture unlicensedFixture) {
+		_fixture = fixture;
+		_unlicensedFixture = unlicensedFixture;
+	}
+
+	[Fact]
+	public async Task does_not_throw_when_configuration_is_missing() {
+		var ex = await Record.ExceptionAsync(async () => {
+
+			var sut = new LogsEndpointPlugin();
+
+			var builder = WebApplication.CreateBuilder();
+
+			builder.Services.AddSingleton<ILicenseService>(new Fixtures.FakeLicenseService());
+			sut.ConfigureServices(builder.Services, builder.Configuration);
+
+			await using var app = builder.Build();
+
+			sut.ConfigureApplication(app, builder.Configuration);
+		});
+
+		Assert.Null(ex);
+	}
+
+	[Fact]
+	public async Task requires_authentication() {
+		var result = await _fixture.UnauthenticatedClient.GetAsync(Endpoint);
+
+		Assert.Equal(HttpStatusCode.Unauthorized, result.StatusCode);
+	}
+
+	[Fact]
+	public async Task is_available_at_endpoint() {
+		var result = await _fixture.AuthenticatedClient.GetAsync(Endpoint);
+
+		Assert.Equal(HttpStatusCode.OK, result.StatusCode);
+	}
+
+	[Theory]
+	[InlineData(true)]
+	[InlineData(false)]
+	public async Task respects_license(bool licensePresent) {
+		// given
+		LogsEndpointPluginFixture f = licensePresent ? _fixture : _unlicensedFixture;
+
+		// when
+		var result = await f.AuthenticatedClient.GetAsync(Endpoint);
+
+		// then
+		if (licensePresent) {
+			Assert.Equal(HttpStatusCode.OK, result.StatusCode);
+		} else {
+			Assert.Equal(HttpStatusCode.NotFound, result.StatusCode);
+		}
+	}
+
+	[Fact]
+	public void can_collect_telemetry() {
+		// given
+		var sut = new LogsEndpointPlugin();
+		using var collector = PluginDiagnosticsDataCollector.Start(sut.DiagnosticsName);
+
+		var config = new ConfigurationBuilder().Build();
+		var builder = WebApplication.CreateBuilder();
+		builder.Services.AddSingleton<ILicenseService>(new Fixtures.FakeLicenseService());
+
+		// when
+		((IPlugableComponent)sut).ConfigureServices(builder.Services, config);
+		var app = builder.Build();
+		((IPlugableComponent)sut).ConfigureApplication(app, config);
+
+		// then
+		collector.CollectedEvents(sut.DiagnosticsName).Should().ContainSingle().Which
+			.Data["enabled"].Should().Be(true);
+	}
+}
+
+public class LicensedFixture : LogsEndpointPluginFixture {
+	public LicensedFixture() : base(licensed: true) {
+	}
+}
+
+public class UnlicensedFixture : LogsEndpointPluginFixture {
+	public UnlicensedFixture() : base(licensed: false) {
+	}
+}
+
+public class LogsEndpointPluginFixture : IAsyncLifetime {
+	private WebApplication? _app;
+	private HttpClient? _authenticatedClient;
+	private HttpClient? _unauthenticatedClient;
+	private readonly bool _licensed;
+
+	public HttpClient AuthenticatedClient => _authenticatedClient!;
+	public HttpClient UnauthenticatedClient => _unauthenticatedClient!;
+
+	public LogsEndpointPluginFixture(bool licensed) {
+		_licensed = licensed;
+	}
+
+	public async Task InitializeAsync() {
+		var ip = "1.2.3.4";
+		var port = "99";
+		var fullPath = Path.Combine(Directory.GetCurrentDirectory(), $"{ip}-{port}-cluster-node");
+		Directory.CreateDirectory(fullPath);
+
+		var builder = WebApplication.CreateBuilder();
+		builder.WebHost.UseUrls("http://127.0.0.1:0");
+
+		builder.Configuration.AddInMemoryCollection(new Dictionary<string, string>() {
+			{$"{KurrentConfigurationConstants.Prefix}:Log", "./"},
+			{$"{KurrentConfigurationConstants.Prefix}:NodeIp", ip},
+			{$"{KurrentConfigurationConstants.Prefix}:NodePort", port}
+		}!);
+
+		var sut = new LogsEndpointPlugin();
+		builder.Services.AddSingleton<ILicenseService>(new Fixtures.FakeLicenseService(_licensed, "LOGS_ENDPOINT"));
+		sut.ConfigureServices(builder.Services, builder.Configuration);
+
+		_app = builder.Build();
+
+		_app.UseMiddleware<FakeBasicAuthMiddleware>();
+
+		sut.ConfigureApplication(_app, builder.Configuration);
+
+		await _app.StartAsync();
+
+		_authenticatedClient = new HttpClient() {
+			BaseAddress = new Uri(_app.Urls.First())
+		};
+		_authenticatedClient.BaseAddress = new Uri(_app!.Urls.First());
+		_authenticatedClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic",
+			Convert.ToBase64String(
+				Encoding.ASCII.GetBytes($"{FakeBasicAuthMiddleware.Username}:{FakeBasicAuthMiddleware.Password}")));
+
+		_unauthenticatedClient = new HttpClient() {
+			BaseAddress = new Uri(_app.Urls.First())
+		};
+		_unauthenticatedClient.BaseAddress = new Uri(_app!.Urls.First());
+	}
+
+	public async Task DisposeAsync() {
+		if (_app != null) {
+			await _app.DisposeAsync();
+		}
+	}
+
+	public class FakeBasicAuthMiddleware {
+		public const string Username = "fake";
+		public const string Password = "fake";
+
+		private readonly RequestDelegate _next;
+
+		public FakeBasicAuthMiddleware(RequestDelegate next) {
+			_next = next;
+		}
+
+		public async Task Invoke(HttpContext context) {
+			try {
+				var authHeader = AuthenticationHeaderValue.Parse(context.Request.Headers.Authorization!);
+				var credentialBytes = Convert.FromBase64String(authHeader.Parameter ?? "");
+				var credentials = Encoding.UTF8.GetString(credentialBytes).Split(':', 2);
+				var username = credentials[0];
+				var password = credentials[1];
+
+				if (username == Username && password == Password) {
+					context.User = new ClaimsPrincipal(new ClaimsIdentity(new[] {
+						new Claim(ClaimTypes.Name,"test-user"),
+						new Claim(ClaimTypes.Role,"$ops"),
+					}, "fake"));
+				}
+			} catch {
+				// noop
+			}
+
+			await _next(context);
+		}
+	}
+}
diff --git a/src/KurrentDB.Diagnostics.LogsEndpointPlugin/JsonDirectoryFormatter.cs b/src/KurrentDB.Diagnostics.LogsEndpointPlugin/JsonDirectoryFormatter.cs
new file mode 100644
index 00000000000..85897b2a63c
--- /dev/null
+++ b/src/KurrentDB.Diagnostics.LogsEndpointPlugin/JsonDirectoryFormatter.cs
@@ -0,0 +1,59 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.StaticFiles;
+using Microsoft.Extensions.FileProviders;
+
+namespace KurrentDB.Diagnostics.LogsEndpointPlugin;
+
+public class JsonDirectoryFormatter : IDirectoryFormatter {
+	// Implementation based on: https://github.com/dotnet/aspnetcore/blob/main/src/Middleware/StaticFiles/src/HtmlDirectoryFormatter.cs
+	private const string JsonUtf8 = "application/json; charset=utf-8";
+	private const string JsonExt = ".json";
+	private const int MaxResultCount = 1000;
+
+	public async Task GenerateContentAsync(HttpContext ctx, IEnumerable<IFileInfo> contents) {
+		ArgumentNullException.ThrowIfNull(ctx);
+		ArgumentNullException.ThrowIfNull(contents);
+
+		ctx.Response.ContentType = JsonUtf8;
+
+		if (HttpMethods.IsHead(ctx.Request.Method)) {
+			return;
+		}
+
+		var filesToList = contents
+			.Where(c => !c.IsDirectory && c.Name.EndsWith(JsonExt))
+			.ToList();
+
+		await using var response = ctx.Response.BodyWriter.AsStream();
+		await using var writer = new Utf8JsonWriter(response);
+
+		writer.WriteStartArray();
+
+		foreach (var fileInfo in filesToList.OrderByDescending(f => f.LastModified).Take(MaxResultCount)) {
+			writer.WriteStartObject();
+			writer.WriteString("name", fileInfo.Name);
+
+			if (fileInfo.PhysicalPath != null) {
+				var createdAt = File.GetCreationTime(fileInfo.PhysicalPath);
+				writer.WriteString("createdAt", createdAt.ToString("O"));
+			}
+
+			writer.WriteString("lastModified", fileInfo.LastModified.LocalDateTime.ToString("O"));
+			writer.WriteNumber("size", fileInfo.Length);
+			writer.WriteEndObject();
+		}
+
+		writer.WriteEndArray();
+
+		await writer.FlushAsync();
+	}
+}
diff --git a/src/KurrentDB.Diagnostics.LogsEndpointPlugin/KurrentDB.Diagnostics.LogsEndpointPlugin.csproj b/src/KurrentDB.Diagnostics.LogsEndpointPlugin/KurrentDB.Diagnostics.LogsEndpointPlugin.csproj
new file mode 100644
index 00000000000..db3d9831ae5
--- /dev/null
+++ b/src/KurrentDB.Diagnostics.LogsEndpointPlugin/KurrentDB.Diagnostics.LogsEndpointPlugin.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<OutputType>Library</OutputType>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
+	</PropertyGroup>
+	<PropertyGroup>
+		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+		<DebugSymbols>true</DebugSymbols>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="EventStore.Plugins" Version="25.2.5"/>
+		<PackageReference Include="Serilog" Version="4.1.0" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.Diagnostics.LogsEndpointPlugin/LogsEndpointPlugin.cs b/src/KurrentDB.Diagnostics.LogsEndpointPlugin/LogsEndpointPlugin.cs
new file mode 100644
index 00000000000..2d46fdcf77b
--- /dev/null
+++ b/src/KurrentDB.Diagnostics.LogsEndpointPlugin/LogsEndpointPlugin.cs
@@ -0,0 +1,147 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Net;
+using System.Threading.Tasks;
+using EventStore.Plugins.Diagnostics;
+using EventStore.Plugins.Licensing;
+using EventStore.Plugins.Subsystems;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.StaticFiles;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Logging;
+using Serilog;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Diagnostics.LogsEndpointPlugin;
+
+// TODO: use SubsystemPlugin now that it is more flexible about licence requirements and what to do when they fail
+public class LogsEndpointPlugin : ISubsystemsPlugin, ISubsystem {
+	public string Name => "LogsEndpoint";
+	public string Version => typeof(LogsEndpointPlugin).Assembly.GetName().Version!.ToString();
+	public string CommandLineName => "logs-endpoint";
+	public string DiagnosticsName => Name;
+	public KeyValuePair<string, object>[] DiagnosticsTags { get; } = [];
+	public bool Enabled { get; private set; } = true;
+	public string LicensePublicKey => LicenseConstants.LicensePublicKey;
+
+	private static readonly ILogger _logger = Log.ForContext<LogsEndpointPlugin>();
+	private const string EndpointPath = "/admin/logs";
+	private KurrentDBOptions _options;
+
+	public LogsEndpointPlugin() {
+		_logger.Information("LogsEndpointPlugin is loaded");
+	}
+
+	// ISubsystemsPlugin
+	public IReadOnlyList<ISubsystem> GetSubsystems() => new[] { this };
+
+	// ISubsystem
+	public void ConfigureServices(IServiceCollection services, IConfiguration configuration) {
+		_options = configuration.GetSection("KurrentDB").Get<KurrentDBOptions>();
+	}
+
+	void DisableEndpoint(Exception ex) {
+		_logger.Information("LogsEndpoint: Failed to get license, endpoint will not be available.");
+		Enabled = false;
+	}
+
+	public void ConfigureApplication(IApplicationBuilder builder, IConfiguration configuration) {
+		var diagnosticListener = new DiagnosticListener(DiagnosticsName);
+		var value = new PluginDiagnosticsData {
+			Source = DiagnosticsName,
+			Data = new() { ["enabled"] = Enabled },
+			CollectionMode = PluginDiagnosticsDataCollectionMode.Partial
+		};
+		diagnosticListener.Write(nameof(PluginDiagnosticsData), value);
+
+		var licenseService = builder.ApplicationServices.GetService<ILicenseService>();
+		var logger = builder.ApplicationServices.GetRequiredService<ILoggerFactory>().CreateLogger(GetType());
+
+		_ = LicenseMonitor.MonitorAsync(
+			featureName: Name,
+			requiredEntitlements: ["LOGS_ENDPOINT"],
+			licenseService: licenseService,
+			onLicenseException: DisableEndpoint,
+			logger: logger,
+			licensePublicKey: LicensePublicKey);
+
+		if (_options == null) {
+			_logger.Error("LogsEndpoint: Failed to get configuration, endpoint will not be available!");
+			return;
+		}
+
+		if (_options.Log == null) {
+			_logger.Error("LogsEndpoint: Failed to get the configured directory for log files, endpoint will not be available!");
+			return;
+		}
+
+		if (_options.NodeIp == null) {
+			_logger.Error("LogsEndpoint: Failed to get the configured node IP, endpoint will not be available!");
+			return;
+		}
+
+		if (_options.NodePort == null) {
+			_logger.Error("LogsEndpoint: Failed to get the configured node port, endpoint will not be available!");
+			return;
+		}
+
+		var logsDir = Path.Combine(_options.Log, $"{_options.NodeIp}-{_options.NodePort}-cluster-node");
+		logsDir = Path.GetFullPath(logsDir);
+		if (!Directory.Exists(logsDir)) {
+			_logger.Error("LogsEndpoint: Failed to find the log files directory at {logsDir}, endpoint will not be available", logsDir);
+			return;
+		}
+
+		ConfigureEndpoint(builder, logsDir);
+	}
+
+	private void ConfigureEndpoint(IApplicationBuilder builder, string logsDir) {
+		_logger.Information("LogsEndpoint: Serving logs from {dir} at endpoint {endpoint}", logsDir, EndpointPath);
+
+		builder.Map(EndpointPath, b => b
+			.Use(async (context, next) => {
+				if (!Enabled) {
+					context.Response.StatusCode = (int)HttpStatusCode.NotFound;
+				} else if (context.User.IsInRole("$ops") || context.User.IsInRole("$admins")) {
+					await next(context);
+				} else {
+					context.Response.StatusCode = (int)HttpStatusCode.Unauthorized;
+				}
+			})
+			.UseFileServer(new FileServerOptions {
+				EnableDirectoryBrowsing = true,
+				FileProvider = new PhysicalFileProvider(logsDir),
+				DirectoryBrowserOptions = {
+					Formatter = new JsonDirectoryFormatter(),
+					RedirectToAppendTrailingSlash = false,
+				},
+				StaticFileOptions = {
+					ContentTypeProvider = JsonOnlyContentTypeProvider(),
+				}
+			}));
+
+		static FileExtensionContentTypeProvider JsonOnlyContentTypeProvider() {
+			var c = new FileExtensionContentTypeProvider();
+			c.Mappings.Clear();
+			c.Mappings.Add(".json", "application/json");
+			return c;
+		}
+	}
+
+	public Task Start() => Task.CompletedTask;
+
+	public Task Stop() => Task.CompletedTask;
+
+	class KurrentDBOptions {
+		public string Log { get; set; }
+		public string NodeIp { get; set; }
+		public string NodePort { get; set; }
+	}
+}
diff --git a/src/KurrentDB.Licensing.Tests/AdHocLicenseProvider.cs b/src/KurrentDB.Licensing.Tests/AdHocLicenseProvider.cs
new file mode 100644
index 00000000000..edde73eb957
--- /dev/null
+++ b/src/KurrentDB.Licensing.Tests/AdHocLicenseProvider.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Reactive.Subjects;
+using EventStore.Plugins.Licensing;
+
+namespace KurrentDB.Licensing.Tests;
+
+public class AdHocLicenseProvider : ILicenseProvider {
+	public AdHocLicenseProvider(License license) {
+		LicenseSubject = new BehaviorSubject<License>(license);
+	}
+
+	public AdHocLicenseProvider(Exception ex) {
+		var licenses = new Subject<License>();
+		licenses.OnError(ex);
+		LicenseSubject = licenses;
+	}
+
+	public IObservable<License> Licenses => LicenseSubject;
+
+	public SubjectBase<License> LicenseSubject { get; private set; }
+}
diff --git a/src/KurrentDB.Licensing.Tests/FakeAuthenticationHandler.cs b/src/KurrentDB.Licensing.Tests/FakeAuthenticationHandler.cs
new file mode 100644
index 00000000000..f02a6c77ace
--- /dev/null
+++ b/src/KurrentDB.Licensing.Tests/FakeAuthenticationHandler.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net.Http.Headers;
+using System.Security.Claims;
+using System.Text;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace KurrentDB.Licensing.Tests;
+
+public class FakeAuthenticationHandler : AuthenticationHandler<AuthenticationSchemeOptions> {
+	public FakeAuthenticationHandler(IOptionsMonitor<AuthenticationSchemeOptions> options,
+		ILoggerFactory logger, UrlEncoder encoder)
+		: base(options, logger, encoder) {
+	}
+
+	public const string Username = "the_user";
+	public const string Password = "the_password";
+
+	protected override Task<AuthenticateResult> HandleAuthenticateAsync() {
+		try {
+			var authHeader = AuthenticationHeaderValue.Parse(Context.Request.Headers.Authorization!);
+			var credentialBytes = Convert.FromBase64String(authHeader.Parameter ?? "");
+			var credentials = Encoding.UTF8.GetString(credentialBytes).Split(':', 2);
+			var username = credentials[0];
+			var password = credentials[1];
+
+			if (username == Username && password == Password) {
+				var principal = new ClaimsPrincipal(new ClaimsIdentity(new[] {
+					new Claim(ClaimTypes.Name, Username),
+					new Claim(ClaimTypes.Role, "$ops"),
+				}, "fake"));
+				var ticket = new AuthenticationTicket(principal, "TestScheme");
+
+				return Task.FromResult(AuthenticateResult.Success(ticket));
+			}
+		} catch {
+			// noop
+		}
+
+		return Task.FromResult(AuthenticateResult.Fail("no"));
+	}
+}
diff --git a/src/KurrentDB.Licensing.Tests/Keygen/KeygenLicenseProviderTests.cs b/src/KurrentDB.Licensing.Tests/Keygen/KeygenLicenseProviderTests.cs
new file mode 100644
index 00000000000..ba25d2c0864
--- /dev/null
+++ b/src/KurrentDB.Licensing.Tests/Keygen/KeygenLicenseProviderTests.cs
@@ -0,0 +1,154 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Reactive.Subjects;
+using System.Threading.Tasks;
+using KurrentDB.Licensing.Keygen;
+using Xunit;
+
+namespace KurrentDB.Licensing.Tests.Keygen;
+
+public class KeygenLicenseProviderTests {
+	[Fact]
+	public async Task conclusive_valid() {
+		var licenses = new Subject<LicenseInfo>();
+		var sut = new KeygenLicenseProvider(
+			licenses);
+
+		licenses.OnNext(new LicenseInfo.Conclusive(
+			LicenseId: "license id",
+			Name: "acme",
+			Valid: true,
+			Trial: false,
+			Warning: false,
+			Detail: "is lookin good",
+			Expiry: DateTimeOffset.UtcNow + TimeSpan.FromHours(24 + 24 + 1),
+			Entitlements: ["FUTURE_TECH_3"]));
+
+		licenses.OnCompleted();
+		var esdbLicense = (await sut.Licenses.ToList()).Single();
+
+		Assert.True(await esdbLicense.ValidateAsync());
+		Assert.True(esdbLicense.HasEntitlement("FUTURE_TECH_3"));
+
+		var endpointInfo = LicenseSummary.SelectForEndpoint(esdbLicense);
+		Assert.Equal(9, endpointInfo.Count);
+		Assert.Equal("license id", endpointInfo["licenseId"]);
+		Assert.Equal("acme", endpointInfo["company"]);
+		Assert.Equal("false", endpointInfo["isTrial"]);
+		Assert.Equal("false", endpointInfo["isExpired"]);
+		Assert.Equal("true", endpointInfo["isValid"]);
+		Assert.Equal("true", endpointInfo["isFloating"]);
+		Assert.Equal("2.04", endpointInfo["daysRemaining"]);
+		Assert.Equal("0", endpointInfo["startDate"]);
+		Assert.Equal("is lookin good", endpointInfo["notes"]);
+
+		var telemetryInfo = LicenseSummary.SelectForTelemetry(esdbLicense);
+		Assert.Equal(4, telemetryInfo.Count);
+		Assert.Equal("license id", telemetryInfo["licenseId"]);
+		Assert.Equal(false, telemetryInfo["isTrial"]);
+		Assert.Equal(false, telemetryInfo["isExpired"]);
+		Assert.Equal(true, telemetryInfo["isValid"]);
+	}
+
+	[Fact]
+	public async Task conclusive_valid_but_expired() {
+		var licenses = new Subject<LicenseInfo>();
+		var sut = new KeygenLicenseProvider(
+			licenses);
+
+		licenses.OnNext(new LicenseInfo.Conclusive(
+			LicenseId: "license id",
+			Name: "acme",
+			Valid: true,
+			Trial: false,
+			Warning: false,
+			Detail: "is lookin good",
+			Expiry: DateTimeOffset.UtcNow - TimeSpan.FromHours(24 + 24 + 1),
+			Entitlements: ["FUTURE_TECH_3"]));
+
+		licenses.OnCompleted();
+		var esdbLicense = (await sut.Licenses.ToList()).Single();
+
+		Assert.True(await esdbLicense.ValidateAsync());
+		Assert.True(esdbLicense.HasEntitlement("FUTURE_TECH_3"));
+
+		var endpointInfo = LicenseSummary.SelectForEndpoint(esdbLicense);
+		Assert.Equal(9, endpointInfo.Count);
+		Assert.Equal("license id", endpointInfo["licenseId"]);
+		Assert.Equal("acme", endpointInfo["company"]);
+		Assert.Equal("false", endpointInfo["isTrial"]);
+		Assert.Equal("true", endpointInfo["isExpired"]);
+		Assert.Equal("true", endpointInfo["isValid"]);
+		Assert.Equal("true", endpointInfo["isFloating"]);
+		Assert.Equal("0.00", endpointInfo["daysRemaining"]);
+		Assert.Equal("0", endpointInfo["startDate"]);
+		Assert.Equal("is lookin good", endpointInfo["notes"]);
+
+		var telemetryInfo = LicenseSummary.SelectForTelemetry(esdbLicense);
+		Assert.Equal(4, telemetryInfo.Count);
+		Assert.Equal("license id", telemetryInfo["licenseId"]);
+		Assert.Equal(false, telemetryInfo["isTrial"]);
+		Assert.Equal(true, telemetryInfo["isExpired"]);
+		Assert.Equal(true, telemetryInfo["isValid"]);
+	}
+
+	[Fact]
+	public async Task conclusive_invalid() {
+		var licenses = new Subject<LicenseInfo>();
+		var sut = new KeygenLicenseProvider(
+			licenses);
+
+		licenses.OnNext(new LicenseInfo.Conclusive(
+			LicenseId: "license id",
+			Name: "acme",
+			Valid: false,
+			Trial: false,
+			Warning: false,
+			Detail: "License is suspended",
+			Expiry: DateTimeOffset.UtcNow + TimeSpan.FromHours(24 + 24 + 1),
+			Entitlements: ["FUTURE_TECH_3"]));
+
+		licenses.OnCompleted();
+
+		var ex = await Assert.ThrowsAnyAsync<Exception>(async () => await sut.Licenses.ToList());
+		Assert.Equal("Invalid license: acme. License is suspended", ex.Message);
+	}
+
+	[Fact]
+	public async Task inconclusive() {
+		var expectedDaysRemaining = (DateTimeOffset.MaxValue - DateTimeOffset.Now).TotalDays;
+		var licenses = new Subject<LicenseInfo>();
+		var sut = new KeygenLicenseProvider(
+			licenses);
+
+		licenses.OnNext(new LicenseInfo.Inconclusive());
+		licenses.OnCompleted();
+		var esdbLicense = (await sut.Licenses.ToList()).Single();
+
+		Assert.True(await esdbLicense.ValidateAsync());
+		Assert.True(esdbLicense.HasEntitlement("ALL"));
+
+		var endpointInfo = LicenseSummary.SelectForEndpoint(esdbLicense);
+		Assert.Equal(9, endpointInfo.Count);
+		Assert.Equal("Temporary License", endpointInfo["licenseId"]);
+		Assert.Equal("Kurrent, Inc", endpointInfo["company"]);
+		Assert.Equal("false", endpointInfo["isTrial"]);
+		Assert.Equal("false", endpointInfo["isExpired"]);
+		Assert.Equal("false", endpointInfo["isValid"]);
+		Assert.Equal("true", endpointInfo["isFloating"]);
+		Assert.Equal($"{expectedDaysRemaining:N2}", endpointInfo["daysRemaining"]);
+		Assert.Equal("0", endpointInfo["startDate"]);
+		Assert.Equal("License could not be validated. Please contact Kurrent support.", endpointInfo["notes"]);
+
+		var telemetryInfo = LicenseSummary.SelectForTelemetry(esdbLicense);
+		Assert.Equal(4, telemetryInfo.Count);
+		Assert.Equal("Temporary License", telemetryInfo["licenseId"]);
+		Assert.Equal(false, telemetryInfo["isTrial"]);
+		Assert.Equal(false, telemetryInfo["isExpired"]);
+		Assert.Equal(false, telemetryInfo["isValid"]);
+	}
+}
diff --git a/src/KurrentDB.Licensing.Tests/Keygen/KeygenLifecycleServiceTests.cs b/src/KurrentDB.Licensing.Tests/Keygen/KeygenLifecycleServiceTests.cs
new file mode 100644
index 00000000000..aeabd1cf9b1
--- /dev/null
+++ b/src/KurrentDB.Licensing.Tests/Keygen/KeygenLifecycleServiceTests.cs
@@ -0,0 +1,240 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using KurrentDB.Licensing.Keygen;
+using RestSharp;
+using Xunit;
+
+namespace KurrentDB.Licensing.Tests.Keygen;
+
+public sealed class KeygenLifecycleServiceTests : IDisposable {
+	readonly Channel<LicenseInfo> _licenses;
+	readonly KeygenSimulator _keygen;
+	readonly KeygenLifecycleService _sut;
+
+	public KeygenLifecycleServiceTests() {
+		_licenses = Channel.CreateUnbounded<LicenseInfo>();
+		var options = new KeygenClientOptions {
+			Licensing = new() {
+				LicenseKey = "the-key",
+			},
+			ReadOnlyReplica = true,
+			Archiver = true,
+		};
+		_keygen = new KeygenSimulator();
+		_sut = new KeygenLifecycleService(
+			new KeygenClient(
+				options,
+				new RestClient(
+					new RestClientOptions($"https://mock-key-gen") {
+						ConfigureMessageHandler = _ => _keygen,
+					})),
+			new Fingerprint(port: null),
+			revalidationDelay: TimeSpan.FromMilliseconds(10));
+
+		_sut.Licenses.Subscribe(async x => await _licenses.Writer.WriteAsync(x));
+	}
+
+	public void Dispose() {
+		_sut.Dispose();
+	}
+
+	async Task AssertNextLicense(LicenseInfo expected) {
+		var actual = await _licenses.Reader.ReadAsync();
+
+		if (expected is LicenseInfo.Conclusive expectedC) {
+			var actualC = Assert.IsType<LicenseInfo.Conclusive>(actual);
+			Assert.Equal(expectedC.LicenseId, actualC.LicenseId);
+			Assert.Equal(expectedC.Name, actualC.Name);
+			Assert.Equal(expectedC.Valid, actualC.Valid);
+			Assert.Equal(expectedC.Trial, actualC.Trial);
+			Assert.Equal(expectedC.Warning, actualC.Warning);
+			Assert.Equal(expectedC.Detail, actualC.Detail);
+			Assert.Equal(expectedC.Expiry, actualC.Expiry);
+			Assert.Equal(expectedC.Entitlements, actualC.Entitlements);
+
+		} else if (expected is LicenseInfo.Inconclusive) {
+			Assert.IsType<LicenseInfo.Inconclusive>(actual);
+
+		} else if (expected is LicenseInfo.RetryImmediately) {
+			Assert.IsType<LicenseInfo.RetryImmediately>(actual);
+		} else {
+			throw new ArgumentException("unexpected type");
+		}
+	}
+
+	[Fact]
+	public async Task when_license_validation_succeeds() {
+		await _sut.StartAsync(CancellationToken.None);
+
+		await _keygen.ShouldReceive_ValidationRequest();
+		await _keygen.ReplyWith_ValidationResponse("VALID");
+
+		await _keygen.ShouldReceive_EntitlementRequest();
+		await _keygen.ReplyWith_Entitlements("A_SPECIAL_ENTITLEMENT");
+
+		await AssertNextLicense(new LicenseInfo.Conclusive(
+			LicenseId: "the-license-id",
+			Name: "the name of the license",
+			Valid: true,
+			Trial: false,
+			Warning: false,
+			Detail: "valid",
+			Expiry: null,
+			Entitlements: ["A_SPECIAL_ENTITLEMENT"]));
+
+		await _keygen.ShouldReceive_GetMachine();
+		await _keygen.ReplyWith_Machine();
+
+		await _keygen.ShouldReceive_Heartbeat();
+		await _keygen.ReplyWith_HeartbeatResponse();
+
+		await _keygen.ShouldReceive_Heartbeat();
+		await _keygen.ReplyWith_HeartbeatResponse();
+	}
+
+	[Theory]
+	[InlineData("NO_MACHINES")]
+	[InlineData("FINGERPRINT_SCOPE_MISMATCH")]
+	public async Task when_license_validation_requires_machine_activation_which_succeeds(string code) {
+		await _sut.StartAsync(CancellationToken.None);
+
+		await _keygen.ShouldReceive_ValidationRequest();
+		await _keygen.ReplyWith_ValidationResponse(code);
+
+		await _keygen.ShouldReceive_ActivationRequest();
+		await _keygen.ReplyWith_ActivationSuccess();
+
+		await _keygen.ShouldReceive_ValidationRequest();
+	}
+
+	// when activating a machine, FINGERPRINT_TAKEN can be returned for two reasons
+	// https://github.com/keygen-sh/keygen-api/blob/master/features/api/v1/machines/create.feature
+	// 1. "Scenario: License creates a machine for their license with a duplicate fingerprint"
+	//      this can happen for us if two nodes using the same license on the same machine try to
+	//      activate it at the same time.
+	//      this is a temporary error which should be resolved by revalidating the license.
+	// 2. "Scenario: License creates a machine with a fingerprint matching another license's machine for a
+	//      policy-scoped machine uniqueness strategy (same policy)"
+	//      this can happen for us if we try to activate a machine for a trial license while the same machine
+	//      is active for a another trial license.
+	//      this is a conclusive error that should result in no license.
+	[Theory]
+	[InlineData("FINGERPRINT_TAKEN", "has already been taken", false)]
+	[InlineData("FINGERPRINT_TAKEN", "has already been taken for this policy", true)]
+	[InlineData("MACHINE_LIMIT_EXCEEDED", "machine limit exceeded", true)]
+	[InlineData("MACHINE_CORE_LIMIT_EXCEEDED", "core limit exceeded", true)]
+	[InlineData("something_we_didnt_anticipate", "another", false)]
+	public async Task when_license_validation_requires_machine_activation_which_fails(string code, string detail, bool conclusive) {
+		await _sut.StartAsync(CancellationToken.None);
+
+		await _keygen.ShouldReceive_ValidationRequest();
+		await _keygen.ReplyWith_ValidationResponse("NO_MACHINES");
+
+		await _keygen.ShouldReceive_ActivationRequest();
+		await _keygen.ReplyWith_ActivationError(code, detail);
+
+		if (conclusive) {
+			await AssertNextLicense(new LicenseInfo.Conclusive(
+				LicenseId: "Unknown",
+				Name: "Unknown",
+				Valid: false,
+				Trial: false,
+				Warning: true,
+				Detail: $"{code.ToLower()}. {detail}.",
+				Expiry: null,
+				Entitlements: []));
+		} else {
+			await AssertNextLicense(new LicenseInfo.Inconclusive());
+			await _keygen.ShouldReceive_ValidationRequest();
+		}
+	}
+
+	[Theory]
+	[InlineData("HEARTBEAT_NOT_STARTED")]
+	[InlineData("HEARTBEAT_DEAD")]
+	public async Task when_license_validation_requires_machine_deactivation_which_succeeds(string code) {
+		await _sut.StartAsync(CancellationToken.None);
+
+		await _keygen.ShouldReceive_ValidationRequest();
+		await _keygen.ReplyWith_ValidationResponse(code);
+
+		await _keygen.ShouldReceive_DeactivationRequest();
+		await _keygen.ReplyWith_DeactivationSuccess();
+
+		await _keygen.ShouldReceive_ValidationRequest();
+	}
+
+	[Fact]
+	public async Task when_license_validation_requires_machine_deactivation_which_fails() {
+		await _sut.StartAsync(CancellationToken.None);
+
+		await _keygen.ShouldReceive_ValidationRequest();
+		await _keygen.ReplyWith_ValidationResponse("HEARTBEAT_DEAD");
+
+		await _keygen.ShouldReceive_DeactivationRequest();
+		await _keygen.ReplyWith_DeactivationError();
+
+		await AssertNextLicense(new LicenseInfo.Inconclusive());
+		await _keygen.ShouldReceive_ValidationRequest();
+	}
+
+	[Fact]
+	public async Task when_license_validation_was_unanticipated() {
+		await _sut.StartAsync(CancellationToken.None);
+
+		await _keygen.ShouldReceive_ValidationRequest();
+		await _keygen.ReplyWith_ValidationResponse("something_we_didnt_anticipate");
+
+		await AssertNextLicense(new LicenseInfo.Conclusive(
+			LicenseId: "the-license-id",
+			Name: "the name of the license",
+			Valid: false,
+			Trial: false,
+			Warning: true,
+			Detail: "something_we_didnt_anticipate",
+			Expiry: null,
+			Entitlements: []));
+	}
+
+	[Theory]
+	[InlineData("LICENSE_INVALID", true)]
+	[InlineData("LICENSE_SUSPENDED", true)]
+	[InlineData("LICENSE_EXPIRED", true)]
+	[InlineData("something_we_didnt_anticipate", false)]
+	public async Task when_license_validation_fails(string code, bool conclusive) {
+		await _sut.StartAsync(CancellationToken.None);
+
+		await _keygen.ShouldReceive_ValidationRequest();
+		await _keygen.ReplyWith_Error(code);
+
+		if (conclusive) {
+			await AssertNextLicense(new LicenseInfo.Conclusive(
+				LicenseId: "Unknown",
+				Name: "Unknown",
+				Valid: false,
+				Trial: false,
+				Warning: true,
+				Detail: code.ToLower(),
+				Expiry: null,
+				Entitlements: []));
+		} else {
+			await AssertNextLicense(new LicenseInfo.Inconclusive());
+			await _keygen.ShouldReceive_ValidationRequest();
+		}
+	}
+
+	[Fact]
+	public async Task when_license_becomes_suspended() {
+		await when_license_validation_succeeds();
+
+		await _keygen.ShouldReceive_Heartbeat();
+		await _keygen.ReplyWith_Error("LICENSE_SUSPENDED");
+
+		await _keygen.ShouldReceive_ValidationRequest();
+	}
+}
diff --git a/src/KurrentDB.Licensing.Tests/Keygen/KeygenSimulator.Replies.cs b/src/KurrentDB.Licensing.Tests/Keygen/KeygenSimulator.Replies.cs
new file mode 100644
index 00000000000..40f3ab931a3
--- /dev/null
+++ b/src/KurrentDB.Licensing.Tests/Keygen/KeygenSimulator.Replies.cs
@@ -0,0 +1,100 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+using KurrentDB.Licensing.Keygen;
+
+namespace KurrentDB.Licensing.Tests.Keygen;
+
+partial class KeygenSimulator {
+	public async Task ReplyWith_ValidationResponse(string code) => await Send(
+		HttpStatusCode.OK,
+		new Models.ValidateLicenseResponse {
+			Data = new() {
+				Attributes = new() {
+					Name = "the name of the license",
+					Metadata = new() {
+						{ "trial", "false" }
+					}
+				},
+				Id = "the-license-id"
+			},
+			Meta = new() {
+				Code = code,
+				Detail = code.ToLower(),
+				Valid = code == "VALID",
+			},
+		});
+
+	public async Task ReplyWith_Error(string code) => await Send(
+		HttpStatusCode.Forbidden,
+		new Models.KeygenResponse<Models.KeygenAttributes, object, object> {
+			Errors = [
+				new() {
+					Title = code.ToLower(),
+					Code = code,
+				}
+			],
+		});
+
+	public async Task ReplyWith_Entitlements(params string[] entitlements) => await Send(
+		HttpStatusCode.OK,
+		new Models.EntitlementsResponse {
+			Data = entitlements.Select(x =>
+				new Models.KeygenData<Models.EntitlementAttributes, object>() {
+					Attributes = new() {
+						Name = x.ToLower(),
+						Code = x,
+						Metadata = [],
+					}
+				}
+			).ToArray(),
+		});
+
+	public async Task ReplyWith_Machine() => await Send(
+		HttpStatusCode.OK,
+		new Models.GetMachineResponse {
+			Data = new() {
+				Attributes = new() {
+					RequireHeartbeat = true,
+					HeartbeatDuration = 1,
+				}
+			}
+		});
+
+	public async Task ReplyWith_HeartbeatResponse() => await Send(
+		HttpStatusCode.OK,
+		new Models.HeartbeatResponse {
+			Data = new() {
+				Attributes = new() {
+					HeartbeatStatus = "ALIVE",
+				}
+			}
+		});
+
+	public async Task ReplyWith_ActivationSuccess() => await Send(
+		HttpStatusCode.OK,
+		new Models.ActivateMachineResponse {
+			Data = new(),
+		});
+
+	public async Task ReplyWith_ActivationError(string code, string detail) => await Send(
+		HttpStatusCode.UnprocessableContent,
+		new Models.ActivateMachineResponse {
+			Errors = [
+				new() {
+					Title = code.ToLower(),
+					Code = code,
+					Detail = detail,
+				}
+			],
+		});
+
+	public async Task ReplyWith_DeactivationSuccess() => await Send(
+		HttpStatusCode.NoContent, new { });
+
+	public async Task ReplyWith_DeactivationError() => await Send(
+		HttpStatusCode.NotFound, new { });
+}
diff --git a/src/KurrentDB.Licensing.Tests/Keygen/KeygenSimulator.Should.cs b/src/KurrentDB.Licensing.Tests/Keygen/KeygenSimulator.Should.cs
new file mode 100644
index 00000000000..e6bf9ea6823
--- /dev/null
+++ b/src/KurrentDB.Licensing.Tests/Keygen/KeygenSimulator.Should.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Runtime.InteropServices;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using KurrentDB.Licensing.Keygen;
+using Xunit;
+
+namespace KurrentDB.Licensing.Tests.Keygen;
+
+partial class KeygenSimulator {
+	public async Task<Models.ValidateLicenseRequest> ShouldReceive_ValidationRequest() {
+		var request = await Receive();
+		Assert.Equal("https://mock-key-gen/licenses/actions/validate-key", $"{request.RequestUri}");
+		Assert.Equal(HttpMethod.Post, request.Method);
+
+		var s = await request.Content!.ReadAsStringAsync();
+		var r = JsonSerializer.Deserialize<Models.ValidateLicenseRequest>(s, _serializerOptions)
+			?? throw new Exception("Could not deserialize request");
+
+		Assert.Equal("the-key", r.Meta.Key);
+		Assert.Equal(_fingerprint, r.Meta.Scope.Fingerprint);
+		return r;
+	}
+
+	public async Task ShouldReceive_EntitlementRequest() {
+		var request = await Receive();
+		Assert.Equal("https://mock-key-gen/licenses/the-license-id/entitlements?limit=100", $"{request.RequestUri}");
+		Assert.Equal(HttpMethod.Get, request.Method);
+	}
+
+	public async Task ShouldReceive_GetMachine() {
+		var request = await Receive();
+		Assert.Equal($"https://mock-key-gen/machines/{_fingerprint}", $"{request.RequestUri}");
+		Assert.Equal(HttpMethod.Get, request.Method);
+	}
+
+	public async Task ShouldReceive_Heartbeat() {
+		var request = await Receive();
+		Assert.Equal($"https://mock-key-gen/machines/{_fingerprint}/actions/ping", $"{request.RequestUri}");
+		Assert.Equal(HttpMethod.Post, request.Method);
+	}
+
+	public async Task ShouldReceive_ActivationRequest() {
+		var request = await Receive();
+		Assert.Equal($"https://mock-key-gen/machines", $"{request.RequestUri}");
+		Assert.Equal(HttpMethod.Post, request.Method);
+
+		var s = await request.Content!.ReadAsStringAsync();
+		var r = JsonNode.Parse(s);
+
+		var data = r!["data"];
+		Assert.Equal("machines", $"{data!["type"]}");
+
+		var attributes = data!["attributes"]!;
+		Assert.Equal(_fingerprint, $"{attributes["fingerprint"]}");
+		Assert.Equal(RuntimeInformation.OSDescription, $"{attributes["platform"]}");
+		Assert.Equal(Dns.GetHostName(), $"{attributes["name"]}");
+		Assert.Equal(Dns.GetHostName(), $"{attributes["hostname"]}");
+		Assert.Equal($"{Fingerprint.CpuCount}", $"{attributes["cores"]}");
+		Assert.Equal($"{Fingerprint.Ram}", $"{attributes["metadata"]!["ram"]}");
+		Assert.Equal($"true", $"{attributes["metadata"]!["readOnlyReplica"]}");
+		Assert.Equal($"true", $"{attributes["metadata"]!["archiver"]}");
+
+		var relationships = data!["relationships"]!["license"]!["data"];
+		Assert.Equal("licenses", $"{relationships!["type"]}");
+		Assert.Equal("the-license-id", $"{relationships!["id"]}");
+	}
+
+	public async Task ShouldReceive_DeactivationRequest() {
+		var request = await Receive();
+		Assert.Equal($"https://mock-key-gen/machines/{_fingerprint}", $"{request.RequestUri}");
+		Assert.Equal(HttpMethod.Delete, request.Method);
+	}
+}
diff --git a/src/KurrentDB.Licensing.Tests/Keygen/KeygenSimulator.cs b/src/KurrentDB.Licensing.Tests/Keygen/KeygenSimulator.cs
new file mode 100644
index 00000000000..82adfe0405c
--- /dev/null
+++ b/src/KurrentDB.Licensing.Tests/Keygen/KeygenSimulator.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using KurrentDB.Licensing.Keygen;
+using ContentType = KurrentDB.Transport.Http.ContentType;
+
+namespace KurrentDB.Licensing.Tests.Keygen;
+
+partial class KeygenSimulator : HttpMessageHandler {
+	readonly Channel<HttpRequestMessage> _requests;
+	readonly Channel<HttpResponseMessage> _responses;
+	readonly JsonSerializerOptions _serializerOptions;
+	readonly string _fingerprint = new Fingerprint(port: null).Get();
+
+	public KeygenSimulator() {
+		_requests = Channel.CreateUnbounded<HttpRequestMessage>();
+		_responses = Channel.CreateUnbounded<HttpResponseMessage>();
+		_serializerOptions = new JsonSerializerOptions {
+			PropertyNameCaseInsensitive = true,
+			PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+		};
+	}
+
+	protected override async Task<HttpResponseMessage> SendAsync(
+		HttpRequestMessage request,
+		CancellationToken cancellationToken) {
+
+		await _requests.Writer.WriteAsync(request, cancellationToken);
+		return await _responses.Reader.ReadAsync(cancellationToken);
+	}
+
+
+	Task<HttpRequestMessage> Receive() => _requests.Reader.ReadAsync()
+		.AsTask().WaitAsync(TimeSpan.FromSeconds(2));
+
+	async Task Send<TResponse>(HttpStatusCode httpStatusCode, TResponse response) {
+		var content = JsonSerializer.Serialize(response, _serializerOptions);
+		await _responses.Writer.WriteAsync(new HttpResponseMessage {
+			StatusCode = httpStatusCode,
+			Content = new StringContent(content, Encoding.UTF8, ContentType.Json)
+		});
+	}
+}
diff --git a/src/KurrentDB.Licensing.Tests/Keys.cs b/src/KurrentDB.Licensing.Tests/Keys.cs
new file mode 100644
index 00000000000..e6c11bddbdf
--- /dev/null
+++ b/src/KurrentDB.Licensing.Tests/Keys.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Cryptography;
+
+namespace KurrentDB.Licensing.Tests;
+
+public static class Keys {
+	static Keys() {
+		using var rsa = RSA.Create(512);
+		Public = Convert.ToBase64String(rsa.ExportRSAPublicKey());
+		Private = Convert.ToBase64String(rsa.ExportRSAPrivateKey());
+	}
+
+	public static string Public { get; }
+	public static string Private { get; }
+}
diff --git a/src/KurrentDB.Licensing.Tests/KurrentDB.Licensing.Tests.csproj b/src/KurrentDB.Licensing.Tests/KurrentDB.Licensing.Tests.csproj
new file mode 100644
index 00000000000..41187e26b9a
--- /dev/null
+++ b/src/KurrentDB.Licensing.Tests/KurrentDB.Licensing.Tests.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+	  <ProjectReference Include="..\KurrentDB.Core.Tests\KurrentDB.Core.Tests.csproj" />
+	  <ProjectReference Include="..\KurrentDB.Licensing\KurrentDB.Licensing.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+		<PackageReference Include="xunit" Version="2.9.3" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="coverlet.collector" Version="6.0.4">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.Licensing.Tests/LicenseServiceTests.cs b/src/KurrentDB.Licensing.Tests/LicenseServiceTests.cs
new file mode 100644
index 00000000000..63375b23a42
--- /dev/null
+++ b/src/KurrentDB.Licensing.Tests/LicenseServiceTests.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Licensing;
+using Microsoft.Extensions.Hosting;
+using Xunit;
+
+namespace KurrentDB.Licensing.Tests;
+
+public class LicenseServiceTests {
+	[Fact]
+	public async Task self_license_is_valid() {
+		var sut = new LicenseService(
+			new FakeLifetime(),
+			ex => { },
+			new AdHocLicenseProvider(new Exception()));
+		Assert.True(await sut.SelfLicense.ValidateAsync());
+	}
+
+	[Fact]
+	public async Task current_license_respects_provider() {
+		var licenseProvider = new AdHocLicenseProvider(License.Create([]));
+		var sut = new LicenseService(
+			new FakeLifetime(),
+			ex => { },
+			licenseProvider);
+		Assert.True(await sut.CurrentLicense!.ValidateAsync());
+
+		licenseProvider.LicenseSubject.OnError(new Exception("an error"));
+		Assert.Null(sut.CurrentLicense);
+	}
+
+	[Fact]
+	public void can_reject() {
+		var lifetime = new FakeLifetime();
+		var licenseProvider = new AdHocLicenseProvider(License.Create([]));
+		var shutdownRequested = false;
+		var sut = new LicenseService(
+			lifetime,
+			requestShutdown: ex => { shutdownRequested = true; },
+			licenseProvider);
+
+		sut.RejectLicense(new Exception("an error"));
+		lifetime.StartApplication();
+
+		Assert.True(shutdownRequested);
+	}
+
+	[Fact]
+	public void can_reject_after_startup() {
+		var lifetime = new FakeLifetime();
+		var licenseProvider = new AdHocLicenseProvider(License.Create([]));
+		var shutdownRequested = false;
+		var sut = new LicenseService(
+			lifetime,
+			requestShutdown: ex => { shutdownRequested = true; },
+			licenseProvider);
+
+		lifetime.StartApplication();
+		sut.RejectLicense(new Exception("an error"));
+
+		Assert.True(shutdownRequested);
+	}
+
+	class FakeLifetime : IHostApplicationLifetime {
+		readonly CancellationTokenSource _started = new();
+		readonly CancellationTokenSource _stopped = new();
+		readonly CancellationTokenSource _stopping = new();
+
+		public CancellationToken ApplicationStarted => _started.Token;
+
+		public CancellationToken ApplicationStopped => _stopped.Token;
+
+		public CancellationToken ApplicationStopping => _stopping.Token;
+
+		public void StartApplication() {
+			_started.Cancel();
+		}
+
+		public void StopApplication() {
+			_stopping.Cancel();
+			_stopped.Cancel();
+		}
+	}
+}
diff --git a/src/KurrentDB.Licensing.Tests/LicenseSummaryTests.cs b/src/KurrentDB.Licensing.Tests/LicenseSummaryTests.cs
new file mode 100644
index 00000000000..9e5b6dbe534
--- /dev/null
+++ b/src/KurrentDB.Licensing.Tests/LicenseSummaryTests.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using Xunit;
+
+namespace KurrentDB.Licensing.Tests;
+
+public class LicenseSummaryTests {
+	[Fact]
+	public void can_export_claims() {
+		var r = Random.Shared;
+		var sut = new LicenseSummary(
+			licenseId: "license123",
+			company: "company",
+			isTrial: r.Next(2) == 0,
+			expiry: DateTimeOffset.Now + TimeSpan.FromHours(1),
+			isValid: r.Next(2) == 0,
+			notes: "some notes");
+
+		var exported = new Dictionary<string, object>();
+		sut.ExportClaims(exported);
+
+		Assert.Equal(6, exported.Keys.Count);
+
+		Assert.Equal(sut.LicenseId, exported["licenseId"]);
+		Assert.Equal(sut.Company, exported["company"]);
+		Assert.Equal(sut.IsTrial, exported["isTrial"]);
+		Assert.Equal(sut.ExpiryUnixTimeSeconds, exported["expiryUnixTimeSeconds"]);
+		Assert.Equal(sut.IsValid, exported["isValid"]);
+		Assert.Equal(sut.Notes, exported["notes"]);
+	}
+
+	[Fact]
+	public void exposes_properties() {
+		var props = LicenseSummary.Properties;
+
+		Assert.Equal(6, props.Count);
+
+		Assert.Contains("licenseId", props);
+		Assert.Contains("company", props);
+		Assert.Contains("isTrial", props);
+		Assert.Contains("expiryUnixTimeSeconds", props);
+		Assert.Contains("isValid", props);
+		Assert.Contains("notes", props);
+	}
+}
diff --git a/src/KurrentDB.Licensing.Tests/LicensingPluginTests.cs b/src/KurrentDB.Licensing.Tests/LicensingPluginTests.cs
new file mode 100644
index 00000000000..f68dfb0c921
--- /dev/null
+++ b/src/KurrentDB.Licensing.Tests/LicensingPluginTests.cs
@@ -0,0 +1,173 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+using EventStore.Plugins;
+using EventStore.Plugins.Licensing;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace KurrentDB.Licensing.Tests;
+
+public class LicensingPluginTests : IAsyncLifetime {
+	private TestServer? _server;
+
+	public Task InitializeAsync() => Task.CompletedTask;
+
+	private static LicensingPlugin CreateUnLicensedSutAsync() {
+		return new LicensingPlugin(
+			ex => { },
+			new AdHocLicenseProvider(new Exception("license is expired, say")));
+	}
+
+	private static async Task<LicensingPlugin> CreateLicensedSutAsync(Dictionary<string, object> claims) {
+		var license = await License.CreateAsync(claims);
+		return new LicensingPlugin(
+			ex => { },
+			new AdHocLicenseProvider(license));
+	}
+
+	private static async Task<TestServer> InitializeServerAsync(LicensingPlugin sut) {
+		var server = new TestServer(sut);
+		await server.InitializeAsync();
+		return server;
+	}
+
+	public async Task DisposeAsync() {
+		if (_server != null) {
+			await _server.DisposeAsync();
+		}
+	}
+
+	[Fact]
+	public async Task given_licensed_then_endpoint_exposes_the_correct_claims() {
+		// given
+		var claims = new Dictionary<string, object> {
+			{"another_claim", "another_value" } // excluded from endpoint
+		};
+
+		new LicenseSummary(
+			licenseId: "license123",
+			company: "the_company",
+			isTrial: true,
+			expiry: new DateTimeOffset(1970, 1, 1, 0, 0, 55, default),
+			isValid: true,
+			notes: "somenotes")
+			.ExportClaims(claims);
+
+		var sut = await CreateLicensedSutAsync(claims);
+		_server = await InitializeServerAsync(sut);
+
+		// when
+		var result = await _server.AuthenticatedClient.GetAsync("/license");
+
+		// then
+		Assert.Equal(HttpStatusCode.OK, result.StatusCode);
+
+		var responseString = await result.Content.ReadAsStringAsync();
+		Assert.DoesNotContain("another", responseString);
+		Assert.Equal("""
+			{
+			  "isExpired": "true",
+			  "licenseId": "license123",
+			  "company": "the_company",
+			  "isTrial": "true",
+			  "daysRemaining": "0.00",
+			  "isValid": "true",
+			  "notes": "somenotes",
+			  "isFloating": "true",
+			  "startDate": "0"
+			}
+			""".Replace(" ", "").Replace(Environment.NewLine, ""),
+			responseString);
+	}
+
+	[Fact]
+	public async Task given_not_licensed_then_endpoint_returns_404() {
+		// given
+		var sut = CreateUnLicensedSutAsync();
+		_server = await InitializeServerAsync(sut);
+
+		// when
+		var result = await _server.AuthenticatedClient.GetAsync("/license");
+
+		// then
+		Assert.Equal(HttpStatusCode.NotFound, result.StatusCode);
+		var responseString = await result.Content.ReadAsStringAsync();
+		Assert.Equal("\"license is expired, say\"", responseString);
+	}
+
+	[Fact]
+	public async Task requires_authentication() {
+		// given
+		var sut = await CreateLicensedSutAsync(new Dictionary<string, object> {
+			{"isTrial", "true" }
+		});
+		_server = await InitializeServerAsync(sut);
+
+		// when
+		var result = await _server.UnauthenticatedClient.GetAsync("/license");
+
+		// then
+		Assert.Equal(HttpStatusCode.Unauthorized, result.StatusCode);
+		var responseString = await result.Content.ReadAsStringAsync();
+		Assert.Equal("", responseString);
+	}
+}
+
+public class TestServer(LicensingPlugin sut) : IAsyncLifetime {
+	private WebApplication? _app;
+	private HttpClient? _authenticatedClient;
+	private HttpClient? _unauthenticatedClient;
+
+	public HttpClient AuthenticatedClient => _authenticatedClient!;
+	public HttpClient UnauthenticatedClient => _unauthenticatedClient!;
+
+	public async Task InitializeAsync() {
+		var builder = WebApplication.CreateBuilder();
+		builder.WebHost.UseUrls("http://127.0.0.1:0");
+		builder.Services.AddAuthorization();
+		builder.Services.AddAuthentication(o => {
+			o.AddScheme<FakeAuthenticationHandler>("fake", "fake");
+		});
+
+		((IPlugableComponent)sut).ConfigureServices(builder.Services, builder.Configuration);
+		_app = builder.Build();
+		_app.UseRouting();
+		_app.UseAuthorization();
+
+		((IPlugableComponent)sut).ConfigureApplication(_app, builder.Configuration);
+
+		await _app.StartAsync();
+
+		// create the clients
+		_authenticatedClient = new HttpClient() {
+			BaseAddress = new Uri(_app.Urls.First())
+		};
+		_authenticatedClient.BaseAddress = new Uri(_app!.Urls.First());
+		_authenticatedClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue(
+			"Basic",
+			Convert.ToBase64String(Encoding.ASCII.GetBytes(
+				$"{FakeAuthenticationHandler.Username}:{FakeAuthenticationHandler.Password}")));
+
+		_unauthenticatedClient = new HttpClient() {
+			BaseAddress = new Uri(_app.Urls.First())
+		};
+		_unauthenticatedClient.BaseAddress = new Uri(_app!.Urls.First());
+	}
+
+	public async Task DisposeAsync() {
+		if (_app != null) {
+			await _app.DisposeAsync();
+		}
+	}
+}
diff --git a/src/KurrentDB.Licensing.Tests/TaskExtensions.cs b/src/KurrentDB.Licensing.Tests/TaskExtensions.cs
new file mode 100644
index 00000000000..72d75a0f5f8
--- /dev/null
+++ b/src/KurrentDB.Licensing.Tests/TaskExtensions.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Diagnostics;
+
+// ReSharper disable once CheckNamespace
+namespace System.Threading.Tasks;
+
+internal static class TaskExtensions {
+	public static Task<T> WithTimeout<T>(this Task<T> task, TimeSpan? timeout = null) =>
+		task.WithTimeout(timeout.HasValue ? (int)timeout.Value.TotalMilliseconds : 200);
+
+	public static async Task<T> WithTimeout<T>(this Task<T> task, int timeout) {
+		if (Debugger.IsAttached) {
+			timeout = Timeout.Infinite;
+		}
+		using var cts = new CancellationTokenSource();
+		if (task != await Task.WhenAny(task, Task.Delay(timeout, cts.Token)))
+			throw new TimeoutException();
+
+		await cts.CancelAsync();
+
+		return task.Result;
+	}
+
+}
diff --git a/src/KurrentDB.Licensing/ILicenseProvider.cs b/src/KurrentDB.Licensing/ILicenseProvider.cs
new file mode 100644
index 00000000000..081e10aeabb
--- /dev/null
+++ b/src/KurrentDB.Licensing/ILicenseProvider.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Licensing;
+
+namespace KurrentDB.Licensing;
+
+
+public class CurrentLicense {
+	public License? License { get; set; }
+	public Exception? Exception { get; set; }
+}
+
+public interface ILicenseProvider {
+	// An exception can be returned as well as a non null license, to allow the provider to
+	// provide a claimless license instance while still allowing the error
+	// that prevented a proper license from being generated to be visible.
+	IObservable<License> Licenses { get; }
+}
diff --git a/src/KurrentDB.Licensing/Keygen/Fingerprint.cs b/src/KurrentDB.Licensing/Keygen/Fingerprint.cs
new file mode 100644
index 00000000000..b66b96537f9
--- /dev/null
+++ b/src/KurrentDB.Licensing/Keygen/Fingerprint.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net.NetworkInformation;
+
+namespace KurrentDB.Licensing.Keygen;
+
+// Identifies this ESDB node
+// We want the fingerprint to be stable across restarts so that multiple restarts do
+// not use up the machine overage.
+// Each keygen machine object is associated with a single license.
+// Using another license with the same fingerprint will try to create another keygen machine object.
+// This can be rejected by the policy, but if it is permitted, both machines will have the same fingerprint.
+public class Fingerprint {
+	readonly string _nodeId;
+	private readonly int? _port;
+
+	public Fingerprint(int? port) {
+		var mac = NetworkInterface.GetAllNetworkInterfaces()
+			.FirstOrDefault(nic => nic.OperationalStatus == OperationalStatus.Up
+								   && nic.NetworkInterfaceType != NetworkInterfaceType.Loopback)
+			?.GetPhysicalAddress()?.ToString();
+		_nodeId = mac ?? Guid.NewGuid().ToString();
+		_port = port;
+	}
+
+	public static long Ram => GC.GetGCMemoryInfo().TotalAvailableMemoryBytes;
+
+	public static int CpuCount => Environment.ProcessorCount;
+
+	public string Get() {
+		var fingerPrint = $"{_nodeId} {CpuCount} {Ram}";
+		return _port is null ? fingerPrint : $"{_port} {fingerPrint}";
+	}
+}
diff --git a/src/KurrentDB.Licensing/Keygen/KeygenClient.cs b/src/KurrentDB.Licensing/Keygen/KeygenClient.cs
new file mode 100644
index 00000000000..acde48cf221
--- /dev/null
+++ b/src/KurrentDB.Licensing/Keygen/KeygenClient.cs
@@ -0,0 +1,120 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net;
+using System.Runtime.InteropServices;
+using System.Text.Json;
+using RestSharp;
+using Serilog;
+
+namespace KurrentDB.Licensing.Keygen;
+
+// REST client
+// responsible for
+// - authenticating ourselves with keygen
+// - authenticating the responses
+// - (de)serializing requests/responses
+// not responsible for interpreting the semantics of the reponses or business decisions
+// does not throw exceptions
+public sealed class KeygenClient : IDisposable {
+	const string ContentType = "application/vnd.api+json";
+
+	static readonly ILogger Log = Serilog.Log.ForContext<KeygenClient>();
+
+	static readonly JsonSerializerOptions JsonSerializerOptions = new() {
+		PropertyNamingPolicy = JsonNamingPolicy.CamelCase
+	};
+
+	readonly KeygenClientOptions _options;
+	readonly RestClient _client;
+
+	public KeygenClient(KeygenClientOptions options, RestClient restClient) {
+		_options = options;
+		_client = restClient;
+		_client.AcceptedContentTypes = [ContentType];
+		_client.AddDefaultHeader("Keygen-Accept-Signature", "algorithm=\"rsa-sha256\"");
+	}
+
+	public void Dispose() => _client.Dispose();
+
+	// Validates that this machine is licensed with this license.
+	// https://keygen.sh/docs/api/licenses/#licenses-actions-validate-key
+	public async Task<RestResponse<Models.ValidateLicenseResponse>> ValidateLicense(string fingerprint, CancellationToken cancellationToken) {
+		Log.Information("Validating license with fingerprint \"{Fingerprint}\"", fingerprint);
+		var request = new RestRequest("licenses/actions/validate-key")
+			.AddJsonBody(new Models.ValidateLicenseRequest(
+				Meta: new(
+					Key: _options.Licensing.LicenseKey,
+					Scope: new(Fingerprint: fingerprint))));
+
+		var response = await _client.ExecutePostAsync<Models.ValidateLicenseResponse>(request, cancellationToken);
+		return response;
+	}
+
+	// https://keygen.sh/docs/api/machines/#machines-create
+	public async Task<RestResponse<Models.ActivateMachineResponse>> ActivateMachine(string licenseId, string fingerprint, int cpu, long ram, CancellationToken cancellationToken) {
+		Log.Information("Activating machine");
+		var machineName = Dns.GetHostName();
+		var request = new RestRequest("machines", Method.Post)
+			.AddJsonBody(
+				new {
+					data = new {
+						type = "machines",
+						attributes = new {
+							fingerprint = fingerprint,
+							platform = RuntimeInformation.OSDescription,
+							name = machineName,
+							hostname = machineName,
+							cores = cpu,
+							metadata = new Dictionary<string, string> {
+								["ram"] = ram.ToString(),
+								["readOnlyReplica"] = _options.ReadOnlyReplica.ToString().ToLower(),
+								["archiver"] = _options.Archiver.ToString().ToLower(),
+							},
+						},
+						relationships = new {
+							license = new {
+								data = new {
+									type = "licenses",
+									id = licenseId
+								},
+							},
+						},
+					},
+				},
+				ContentType);
+
+		var response = await _client.ExecuteAsync<Models.ActivateMachineResponse>(request, cancellationToken);
+		return response;
+	}
+
+	// https://keygen.sh/docs/api/machines/#machines-delete
+	public async Task<RestResponse> DeactivateMachine(string fingerprint, CancellationToken cancellationToken) {
+		Log.Information("Deactivating machine");
+		var request = new RestRequest($"machines/{fingerprint}");
+		var response = await _client.DeleteAsync(request, cancellationToken);
+		return response;
+	}
+
+	// https://keygen.sh/docs/api/machines/#machines-retrieve
+	public async Task<RestResponse<Models.GetMachineResponse>> GetMachine(string fingerprint, CancellationToken cancellationToken) {
+		var request = new RestRequest($"machines/{fingerprint}");
+		var response = await _client.ExecuteAsync<Models.GetMachineResponse>(request, cancellationToken);
+		return response;
+	}
+
+	// https://keygen.sh/docs/api/machines/#machines-actions-ping
+	public async Task<RestResponse<Models.HeartbeatResponse>> SendHeartbeat(string fingerprint, CancellationToken cancellationToken) {
+		Log.Debug("Sending heartbeat");
+		var request = new RestRequest($"machines/{fingerprint}/actions/ping", Method.Post);
+		var response = await _client.ExecuteAsync<Models.HeartbeatResponse>(request, cancellationToken);
+		return response;
+	}
+
+	public async Task<RestResponse<Models.EntitlementsResponse>> GetEntitlements(string licenseId) {
+		var request = new RestRequest($"licenses/{licenseId}/entitlements");
+		request.AddQueryParameter("limit", 100); // only gets 10 entitlements by default
+		var response = await _client.ExecuteGetAsync<Models.EntitlementsResponse>(request);
+		return response;
+	}
+}
diff --git a/src/KurrentDB.Licensing/Keygen/KeygenClientOptions.cs b/src/KurrentDB.Licensing/Keygen/KeygenClientOptions.cs
new file mode 100644
index 00000000000..d003cab0ba6
--- /dev/null
+++ b/src/KurrentDB.Licensing/Keygen/KeygenClientOptions.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Licensing.Keygen;
+
+public record KeygenClientOptions {
+	public int NodePort { get; set; }
+
+	public bool Archiver { get; set; }
+
+	public bool ReadOnlyReplica { get; set; }
+
+	public LicensingOptions Licensing { get; set; } = new();
+
+	public record LicensingOptions {
+		public string LicenseKey { get; set; } = "";
+
+		public string? BaseUrl { get; set; }
+
+		public bool IncludePortInFingerprint { get; set; }
+	}
+}
diff --git a/src/KurrentDB.Licensing/Keygen/KeygenLicenseProvider.cs b/src/KurrentDB.Licensing/Keygen/KeygenLicenseProvider.cs
new file mode 100644
index 00000000000..741ec9c243f
--- /dev/null
+++ b/src/KurrentDB.Licensing/Keygen/KeygenLicenseProvider.cs
@@ -0,0 +1,99 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Reactive.Linq;
+using EventStore.Plugins.Licensing;
+using Serilog;
+using Serilog.Events;
+
+namespace KurrentDB.Licensing.Keygen;
+
+// This abstracts Keygen away from the rest of the system
+// responsible for translating the keygen output into an ESDB license (or not)
+// responsible for the business decisions of under what circumstances we want to grant an
+//    ESDB license to the rest of the system.
+public class KeygenLicenseProvider : ILicenseProvider {
+	private static readonly ILogger Log = Serilog.Log.ForContext<KeygenLicenseProvider>();
+
+	public KeygenLicenseProvider(
+		IObservable<LicenseInfo> keygenLicenses) {
+
+		// not sure that another subject is the right answer here
+		var licenses = keygenLicenses
+			.Select(licenseInfo => licenseInfo switch {
+				// we aren't yet sure what the license status is, grant everything so we don't break a production system
+				LicenseInfo.Inconclusive inconclusive => CreateLicense(inconclusive),
+
+				// we are sure what the license status is, turn it into a ESDB license or throw
+				LicenseInfo.Conclusive conclusion => CreateLicense(conclusion),
+
+				_ => null,
+			})
+			.Where(x => x is not null)
+			.Select(x => x!)
+			.Replay(1);
+		licenses.Connect();
+		Licenses = licenses;
+	}
+
+	public IObservable<License> Licenses { get; private set; }
+
+	// For some reason we were not able to detect if the users license is valid or not
+	// we play it safe and grant a license that allows access to all features, to avoid
+	// technical problems taking down production deployments.
+	// The primary means of protection against license tampering is the license agreement
+	static License CreateLicense(LicenseInfo.Inconclusive licenseInfo) {
+		Log.Warning("License could not be validated. Please contact Kurrent support.");
+
+		var summary = new LicenseSummary(
+			LicenseId: "Temporary License",
+			Company: "Kurrent, Inc",
+			IsTrial: false,
+			ExpiryUnixTimeSeconds: DateTimeOffset.MaxValue.ToUnixTimeSeconds(),
+			IsValid: false,
+			Notes: "License could not be validated. Please contact Kurrent support.");
+
+		return CreateLicense(summary, ["ALL"]);
+	}
+
+	static License CreateLicense(LicenseInfo.Conclusive licenseInfo) {
+		Log.Write(
+			licenseInfo.Warning
+				? LogEventLevel.Warning
+				: LogEventLevel.Information,
+			$"License {{Name}} {licenseInfo.Detail}. " +
+			"Valid: {Valid}. Trial: {Trial}. Expiry: {Expiry:O}",
+			licenseInfo.Name,
+			licenseInfo.Valid, licenseInfo.Trial, licenseInfo.Expiry);
+
+		if (licenseInfo.Expiry < DateTimeOffset.UtcNow)
+			Log.Warning($"The license expired at {licenseInfo.Expiry}");
+
+		// whether an expired license is valid or not is up to the policy in keygen
+		// so we don't need any logic for it here
+		if (!licenseInfo.Valid) {
+			Log.Warning("License {Name} is not valid", licenseInfo.Name);
+			throw new Exception($"Invalid license: {licenseInfo.Name}. {licenseInfo.Detail}");
+		}
+
+		var summary = new LicenseSummary(
+			LicenseId: licenseInfo.LicenseId,
+			Company: licenseInfo.Name, // todo: name may not necessarily be the company name, depends what we do in the keygen dashboard
+			IsTrial: licenseInfo.Trial,
+			ExpiryUnixTimeSeconds: (licenseInfo.Expiry ?? DateTimeOffset.MaxValue).ToUnixTimeSeconds(),
+			IsValid: licenseInfo.Valid,
+			Notes: licenseInfo.Detail);
+
+		return CreateLicense(summary, licenseInfo.Entitlements);
+	}
+
+	static License CreateLicense(LicenseSummary summary, string[] entitlements) {
+		var claims = entitlements.ToDictionary(
+			x => x,
+			x => (object)"true");
+
+		summary?.ExportClaims(claims);
+
+		return License.Create(claims: claims);
+	}
+}
diff --git a/src/KurrentDB.Licensing/Keygen/KeygenLifecycleService.cs b/src/KurrentDB.Licensing/Keygen/KeygenLifecycleService.cs
new file mode 100644
index 00000000000..b8aabca17ec
--- /dev/null
+++ b/src/KurrentDB.Licensing/Keygen/KeygenLifecycleService.cs
@@ -0,0 +1,275 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Diagnostics.CodeAnalysis;
+using System.Net;
+using System.Reactive.Subjects;
+using Microsoft.Extensions.Hosting;
+using RestSharp;
+using Serilog;
+
+namespace KurrentDB.Licensing.Keygen;
+
+// Uses a client to try to create and maintain a license activation for this machine fingerprint.
+// current status is available via the Licenses observable.
+// responsible for navigating the keygen lifecycle
+// not responsible for business decisions
+public sealed class KeygenLifecycleService : IHostedService, IDisposable {
+	private static readonly ILogger Log = Serilog.Log.ForContext<KeygenLifecycleService>();
+
+	readonly KeygenClient _client;
+	readonly string _fingerprint;
+	readonly TimeSpan _revalidationDelay;
+	readonly CancellationTokenSource _heartbeatCancellation = new();
+	readonly ReplaySubject<LicenseInfo> _licenses = new(bufferSize: 1);
+
+	public KeygenLifecycleService(KeygenClient client, Fingerprint fingerprint, TimeSpan revalidationDelay) {
+		_client = client;
+		_fingerprint = fingerprint.Get();
+		_revalidationDelay = revalidationDelay;
+	}
+
+	public IObservable<LicenseInfo> Licenses => _licenses;
+
+	public Task StartAsync(CancellationToken cancellationToken) {
+		Log.Information("Resources: {CpuCount} CPU, {Ram} MB RAM", Fingerprint.CpuCount, Fingerprint.Ram / 1024 / 1024);
+
+		_ = MainLoop(_heartbeatCancellation.Token);
+		return Task.CompletedTask;
+	}
+
+	public async Task StopAsync(CancellationToken cancellationToken) {
+		await _heartbeatCancellation.CancelAsync();
+	}
+
+	public void Dispose() {
+		_heartbeatCancellation.Cancel();
+		_heartbeatCancellation.Dispose();
+		_client.Dispose();
+	}
+
+	async Task MainLoop(CancellationToken cancellationToken) {
+		while (true) {
+			var info = await Validate(cancellationToken);
+			_licenses.OnNext(info);
+
+			switch (info) {
+				case LicenseInfo.RetryImmediately:
+					Log.Debug("License validation requested immediate retry for activation/deactivation");
+					await Task.Delay(TimeSpan.FromSeconds(1), cancellationToken);
+					break;
+
+				case LicenseInfo.Inconclusive:
+					Log.Warning("License validation was inconclusive");
+					await Task.Delay(_revalidationDelay, cancellationToken);
+					break;
+
+				case LicenseInfo.Conclusive conclusion:
+					Log.Information("License validation was conclusive");
+
+					if (!conclusion.Valid) {
+						// license is conclusively not valid. nothing else to do.
+						return;
+					}
+
+					await HeartbeatAsNecessary(cancellationToken);
+
+					// heartbeat process has failed, start over.
+					await Task.Delay(_revalidationDelay, cancellationToken);
+					break;
+			}
+		}
+	}
+
+	async Task<LicenseInfo> Validate(CancellationToken cancellationToken) {
+		var restResponse = await _client.ValidateLicense(_fingerprint, cancellationToken);
+		if (!TryGetParsedResponse(restResponse, "License validation", out var response, out var error)) {
+			return error.ToLicenseInfo();
+		}
+
+		var validationData = response.Meta;
+		var licenseData = response.Data;
+		var licenseAttributes = response.Data?.Attributes;
+
+		if (licenseData == null || validationData == null || licenseAttributes == null) {
+			Log.Warning("License validation missing expected data");
+			return LicenseInfo.Inconclusive.Instance;
+		}
+
+		var licenseName = licenseAttributes.Name;
+		switch (response.GetStatus()) {
+			case Models.LicenseStatus.InvalidNoMachines:
+			case Models.LicenseStatus.InvalidMachineMismatch:
+				return await Activate();
+
+			case Models.LicenseStatus.InvalidHeartbeatNotStarted:
+			case Models.LicenseStatus.InvalidHeartbeatDead:
+				return await Deactivate();
+
+			case Models.LicenseStatus.InvalidOther:
+				return CreateResult([]);
+		}
+
+		// status is Valid
+		var entitlementRestResponse = await _client.GetEntitlements(licenseData.Id);
+		if (!TryGetParsedResponse(entitlementRestResponse, "License GetEntitlements", out var entitlementResponse, out var entitlementError)) {
+			return entitlementError.ToLicenseInfo();
+		}
+
+		var entitlements = entitlementResponse.Data!.Select(x => x.Attributes).ToArray();
+		foreach (var entitlement in entitlements)
+			Log.Information("Available license entitlement: {Entitlement}", entitlement.Name);
+
+		return CreateResult(entitlements);
+
+		LicenseInfo CreateResult(Models.EntitlementAttributes[] entitlements) =>
+			new LicenseInfo.Conclusive(
+				LicenseId: licenseData.Id,
+				Name: licenseName,
+				Valid: validationData.Valid,
+				Trial: GetMetaBool("trial"),
+				Warning: validationData.Code != "VALID",
+				Detail: validationData.Detail,
+				Expiry: licenseAttributes.Expiry,
+				Entitlements: entitlements.Select(x => x.Code).ToArray());
+
+		bool GetMetaBool(string name) =>
+			licenseAttributes.Metadata.TryGetValue(name, out var value) &&
+			bool.Parse(value.ToString()?.ToLowerInvariant() ?? "false");
+
+		async Task<LicenseInfo> Activate() {
+			var restResponse = await _client.ActivateMachine(licenseData.Id, _fingerprint, Fingerprint.CpuCount, Fingerprint.Ram, cancellationToken);
+
+			if (!TryGetParsedResponse(restResponse, "License machine activation", out var response, out var error)) {
+				return error.ToLicenseInfo();
+			}
+
+			Log.Information("Machine activated");
+			return LicenseInfo.RetryImmediately.Instance;
+		}
+
+		async Task<LicenseInfo> Deactivate() {
+			var restResponse = await _client.DeactivateMachine(_fingerprint, cancellationToken);
+
+			if (restResponse.StatusCode != HttpStatusCode.NoContent) {
+				Log.Information("License machine deactivation failed");
+				return LicenseInfo.Inconclusive.Instance;
+			}
+
+			Log.Information("Machine deactivated");
+			return LicenseInfo.RetryImmediately.Instance;
+		}
+	}
+
+	// completes when the heartbeat fails
+	async Task HeartbeatAsNecessary(CancellationToken cancellationToken) {
+		var restResponse = await _client.GetMachine(_fingerprint, cancellationToken);
+		if (!TryGetParsedResponse(restResponse, "License GetMachine", out var response, out var _)) {
+			// doesn't matter what the error is, we will revalidate from the top.
+			return;
+		}
+
+		if (!response.RequiresHeartbeat) {
+			Log.Debug("No heartbeat required");
+			await Task.Delay(Timeout.Infinite, cancellationToken);
+		}
+
+		await MaintainHeartbeat(response.HeartbeatInterval, cancellationToken);
+	}
+
+	// completes when the heartbeat fails
+	async Task MaintainHeartbeat(int interval, CancellationToken cancellationToken) {
+		Log.Debug("Starting heartbeat with interval {Interval} seconds", interval);
+
+		var delay = TimeSpan.FromSeconds(interval > 10
+			? interval - 10
+			: interval / 5.0);
+
+		while (true) {
+			await Task.Delay(delay, cancellationToken);
+
+			var restResponse = await _client.SendHeartbeat(_fingerprint, cancellationToken);
+			if (!TryGetParsedResponse(restResponse, "License Heartbeat", out var response, out var _)) {
+				// doesn't matter what the error is, we will revalidate from the top.
+				return;
+			}
+
+			Log.Debug("Heartbeat Status: {Status}", response.HeartbeatStatus);
+
+			if (response.HeartbeatStatus != "ALIVE") {
+				return;
+			}
+		}
+	}
+
+	static bool TryGetParsedResponse<T>(
+		RestResponse<T> restResponse,
+		string operation,
+		[MaybeNullWhen(false)] out T response,
+		[MaybeNullWhen(true)] out Models.KeygenError error)
+		where T : Models.KeygenResponse {
+
+		if (restResponse.Data is not { } data) {
+			Log.Information($"{operation} returned no response. HttpStatus {{Status}}. ResponseStatus: {{ResponseStatus}}. Error: {{Error}}",
+				restResponse.StatusCode,
+				restResponse.ResponseStatus,
+				restResponse.ErrorMessage);
+			response = default;
+			error = new() {
+				Title = "No data",
+				Code = "ESDB_NO_DATA",
+				Detail = $"Received no data that we could parse",
+			};
+			return false;
+		}
+
+		response = data;
+
+		if (response.IsSuccess) {
+			error = default;
+			return true;
+		}
+
+		if (response.Errors.Length != 0) {
+			Log.Information($"{operation} (status {{Status}}) returned an error: {{Error}}",
+				restResponse.StatusCode, response.Errors[0]);
+			error = response.Errors[0];
+		} else {
+			Log.Information($"{operation} (status {{Status}}) failed with no error", restResponse.StatusCode);
+			error = new() {
+				Title = "No error",
+				Code = "ESDB_NO_ERROR",
+				Detail = "Received no data but no error either",
+			};
+		}
+
+		return false;
+	}
+}
+
+static class ErrorExtensions {
+	static readonly string[] ConclusiveErrors = [
+		// Policy determines the scope of a Machine Fingerprint (unique per Account/Policy/License)
+		"FINGERPRINT_TAKEN",
+		"LICENSE_EXPIRED",
+		"LICENSE_INVALID",
+		"LICENSE_SUSPENDED",
+		"MACHINE_CORE_LIMIT_EXCEEDED",
+		"MACHINE_LIMIT_EXCEEDED",
+		"MACHINE_PROCESS_LIMIT_EXCEEDED",
+	];
+
+	public static LicenseInfo ToLicenseInfo(this Models.KeygenError error) {
+		// FINGERPRINT_TAKEN is special, see when_license_validation_requires_machine_activation_which_fails
+		if (error.Code == "FINGERPRINT_TAKEN" && !error.Detail.Contains("policy"))
+			return LicenseInfo.Inconclusive.Instance;
+
+		if (!ConclusiveErrors.Contains(error.Code))
+			return LicenseInfo.Inconclusive.Instance;
+
+		var errorString = error.Title;
+		if (!string.IsNullOrWhiteSpace(error.Detail))
+			errorString = $"{errorString}. {error.Detail}.";
+		return LicenseInfo.Conclusive.FromError(errorString);
+	}
+}
diff --git a/src/KurrentDB.Licensing/Keygen/KeygenSignatureInterceptor.cs b/src/KurrentDB.Licensing/Keygen/KeygenSignatureInterceptor.cs
new file mode 100644
index 00000000000..a5c0efe96c7
--- /dev/null
+++ b/src/KurrentDB.Licensing/Keygen/KeygenSignatureInterceptor.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Cryptography;
+using System.Text;
+using RestSharp;
+using RestSharp.Interceptors;
+
+namespace KurrentDB.Licensing.Keygen;
+
+public class KeygenSignatureInterceptor : Interceptor {
+	readonly RSA _rsa;
+
+	public KeygenSignatureInterceptor() {
+		_rsa = RSA.Create();
+		_rsa.ImportFromPem(SigningKey);
+	}
+
+	public override ValueTask BeforeDeserialization(RestResponse response, CancellationToken cancellationToken) {
+		var verified = ValidateResponse(response);
+		if (!verified) {
+			throw new InvalidOperationException("Keygen signature verification failed");
+		}
+		return ValueTask.CompletedTask;
+	}
+
+	bool ValidateResponse(RestResponse response) {
+		var bytes = SHA256.HashData(response.RawBytes ?? []);
+		var digest = $"sha-256={Convert.ToBase64String(bytes)}";
+		var header = response.GetHeader("Digest");
+		if (header != digest)
+			return false;
+
+		var resource = response.ResponseUri!.AbsolutePath;
+		var signingData = $"""
+                           (request-target): {response.Request.Method.ToString().ToLowerInvariant()} {resource}
+                           host: api.keygen.sh
+                           date: {response.GetHeader("Date")}
+                           digest: {digest}
+                           """;
+		var signatureHeader = response.GetHeader("Keygen-Signature");
+		var signature = signatureHeader?.Split(", ")
+			.Select(x => {
+				var index = x.IndexOf('=');
+				return (x[..index], x[(index + 1)..].Trim('"'));
+			})
+			.Where(x => x.Item1 == "signature")
+			.Select(x => x.Item2)
+			.FirstOrDefault();
+		if (signature == null)
+			return false;
+
+		var data = Encoding.UTF8.GetBytes(signingData);
+		var sig = Convert.FromBase64String(signature);
+		var verified = _rsa.VerifyData(data, sig, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
+		return verified;
+	}
+
+	const string SigningKey = "";
+}
+
+static class ResponseExtensions {
+	public static string? GetHeader(this RestResponse response, string name) {
+		return response.Headers?.FirstOrDefault(x => x.Name == name)?.Value?.ToString();
+	}
+}
diff --git a/src/KurrentDB.Licensing/Keygen/LicenseInfo.cs b/src/KurrentDB.Licensing/Keygen/LicenseInfo.cs
new file mode 100644
index 00000000000..e0ecf9ea8e2
--- /dev/null
+++ b/src/KurrentDB.Licensing/Keygen/LicenseInfo.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Licensing.Keygen;
+
+public record LicenseInfo {
+	public record Conclusive(
+		string LicenseId,
+		string Name,
+		bool Valid,
+		bool Trial,
+		bool Warning,
+		string Detail,
+		DateTimeOffset? Expiry,
+		string[] Entitlements) : LicenseInfo {
+
+		public static Conclusive FromError(string error) => new(
+			LicenseId: "Unknown",
+			Name: "Unknown",
+			Valid: false,
+			Trial: false,
+			Warning: true,
+			Detail: error,
+			Expiry: null,
+			Entitlements: []);
+	}
+
+	public record Inconclusive : LicenseInfo {
+		public static Inconclusive Instance { get; } = new Inconclusive();
+	}
+
+	public record RetryImmediately : LicenseInfo {
+		public static RetryImmediately Instance { get; } = new RetryImmediately();
+	}
+}
+
diff --git a/src/KurrentDB.Licensing/Keygen/Models.cs b/src/KurrentDB.Licensing/Keygen/Models.cs
new file mode 100644
index 00000000000..e31abfc4ec7
--- /dev/null
+++ b/src/KurrentDB.Licensing/Keygen/Models.cs
@@ -0,0 +1,140 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Licensing.Keygen;
+
+public static class Models {
+	public record ValidateLicenseRequest(ValidateLicenseRequest.RequestMeta Meta) {
+		public record RequestMeta(string? Key, FingerprintScope Scope);
+		public record FingerprintScope(string Fingerprint);
+	}
+
+	// Is a given license currently valid for use with a given machine?
+	public class ValidateLicenseResponse : KeygenResponse<LicenseAttributes, LicenseValidationResult, LicenseRelationships> {
+		public LicenseStatus GetStatus() => Meta switch {
+			// TOO_MANY_MACHINES/CORES/PROCESSES can come back here, but in those cases all we care about
+			// is Valid or not which is determined by the overage strategy on the policy.
+			{ Valid: false, Code: "NO_MACHINES" } => LicenseStatus.InvalidNoMachines,
+			{ Valid: false, Code: "FINGERPRINT_SCOPE_MISMATCH" } => LicenseStatus.InvalidMachineMismatch,
+			{ Valid: false, Code: "HEARTBEAT_NOT_STARTED" } => LicenseStatus.InvalidHeartbeatNotStarted,
+			{ Valid: false, Code: "HEARTBEAT_DEAD" } => LicenseStatus.InvalidHeartbeatDead,
+			{ Valid: false } => LicenseStatus.InvalidOther,
+			{ Valid: true } => LicenseStatus.Valid,
+			_ => throw new ArgumentOutOfRangeException()
+		};
+	}
+
+	// this is the status of a license with respect to a machine
+	public enum LicenseStatus {
+		Unknown = 0,
+
+		// no machines associated with the license. Need to activate.
+		InvalidNoMachines,
+
+		// machines are associated with the license, but not this machine. Need to activate.
+		InvalidMachineMismatch,
+
+		// this machine is associated with the license but never heartbeated. Need to deactivate.
+		InvalidHeartbeatNotStarted,
+
+		// this machine is associated with the license but has stopped heartbeating. Need to deactivate.
+		InvalidHeartbeatDead,
+
+		// invalid but no action we can take automatically to recover.
+		InvalidOther,
+
+		Valid,
+	}
+
+	public class LicenseAttributes : KeygenAttributes {
+		public string Key { get; set; } = null!;
+		public DateTimeOffset? Expiry { get; set; }
+		public string Status { get; set; } = null!;
+		public bool Suspended { get; set; } = true;
+		public int MaxMachines { get; set; }
+		public int? MaxCores { get; set; }
+		public bool RequiresHeartbeat { get; set; }
+	}
+
+	public class LicenseValidationResult {
+		public DateTimeOffset Ts { get; set; }
+		public bool Valid { get; set; }
+		public string Detail { get; set; } = null!;
+		public string Code { get; set; } = null!;
+	}
+
+	public class LicenseRelationships {
+		public LinkData Product { get; set; } = null!;
+		public LinkData Policy { get; set; } = null!;
+	}
+
+	public class ActivateMachineResponse : KeygenResponse<MachineAttributes, object, object> {
+	}
+
+	public class HeartbeatResponse : KeygenResponse<MachineAttributes, object, object> {
+		public string HeartbeatStatus => Data?.Attributes.HeartbeatStatus ?? "UNKNOWN";
+	}
+
+	public class GetMachineResponse : KeygenResponse<MachineAttributes, object, object> {
+		public bool RequiresHeartbeat => Data?.Attributes.RequireHeartbeat == true;
+		public int HeartbeatInterval => Data?.Attributes.HeartbeatDuration ?? 0;
+	}
+
+	public class MachineAttributes : KeygenAttributes {
+		public bool RequireHeartbeat { get; set; }
+		public int HeartbeatDuration { get; set; }
+		public string HeartbeatStatus { get; set; } = null!;
+	}
+
+	public class EntitlementsResponse : KeygenListResponse<EntitlementAttributes, object, object>;
+
+	public class EntitlementAttributes : KeygenAttributes {
+		public string Code { get; set; } = null!;
+	}
+
+	public record Link(string Type, string Id);
+
+	public record LinkData(Link Data);
+
+	public class KeygenData<TAttributes, TRelationships> where TAttributes : KeygenAttributes where TRelationships : class {
+		public string Id { get; set; } = null!;
+		public TAttributes Attributes { get; set; } = null!;
+		public TRelationships? Relationships { get; init; }
+	}
+
+	public abstract class KeygenResponse {
+		abstract public bool IsSuccess { get; }
+		public KeygenError[] Errors { get; set; } = [];
+	}
+
+	public class KeygenResponse<TAttributes, TMeta, TRelationships> : KeygenResponse
+		where TAttributes : KeygenAttributes
+		where TMeta : class
+		where TRelationships : class {
+
+		public override bool IsSuccess => Data is not null;
+		public KeygenData<TAttributes, TRelationships>? Data { get; set; }
+		public TMeta? Meta { get; init; }
+	}
+
+	public class KeygenListResponse<TAttributes, TMeta, TRelationships> : KeygenResponse
+		where TAttributes : KeygenAttributes
+		where TMeta : class
+		where TRelationships : class {
+
+		public override bool IsSuccess => Data is not null;
+		public KeygenData<TAttributes, TRelationships>[]? Data { get; set; }
+		public TMeta? Meta { get; init; }
+	}
+
+	public record KeygenError {
+		public string Title { get; set; } = null!;
+		public string Detail { get; set; } = null!;
+		public string Code { get; set; } = null!;
+	}
+
+	public class KeygenAttributes {
+		public string Name { get; set; } = null!;
+		public Dictionary<string, object> Metadata { get; set; } = null!;
+	}
+}
diff --git a/src/KurrentDB.Licensing/KurrentDB.Licensing.csproj b/src/KurrentDB.Licensing/KurrentDB.Licensing.csproj
new file mode 100644
index 00000000000..560352cbe99
--- /dev/null
+++ b/src/KurrentDB.Licensing/KurrentDB.Licensing.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<FrameworkReference Include="Microsoft.AspNetCore.App" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="EventStore.Plugins" Version="25.2.5" />
+		<PackageReference Include="RestSharp" Version="112.1.0" />
+		<PackageReference Include="Serilog" Version="4.0.1" />
+	</ItemGroup>
+
+</Project>
diff --git a/src/KurrentDB.Licensing/LicenseService.cs b/src/KurrentDB.Licensing/LicenseService.cs
new file mode 100644
index 00000000000..a89260f3822
--- /dev/null
+++ b/src/KurrentDB.Licensing/LicenseService.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Licensing;
+using Microsoft.Extensions.Hosting;
+using Serilog;
+
+namespace KurrentDB.Licensing;
+
+public class LicenseService : ILicenseService {
+	private static readonly ILogger Log = Serilog.Log.ForContext<LicenseService>();
+	private readonly IHostApplicationLifetime _lifetime;
+	private readonly Action<Exception> _requestShutdown;
+
+	public LicenseService(
+		IHostApplicationLifetime lifetime,
+		Action<Exception> requestShutdown,
+		ILicenseProvider licenseProvider) {
+
+		_lifetime = lifetime;
+		_requestShutdown = requestShutdown;
+		SelfLicense = License.Create([]);
+		Licenses = licenseProvider.Licenses;
+		Licenses.Subscribe(
+			license => {
+				CurrentLicense = license;
+			},
+			ex => {
+				CurrentLicense = null;
+			});
+	}
+
+	public License SelfLicense { get; private set; }
+
+	public License? CurrentLicense { get; private set; }
+
+	public IObservable<License> Licenses { get; private set; }
+
+	public void RejectLicense(Exception ex) {
+		// we wait for the application to start before stopping it so that
+		// 1. we can log the error message after stopping, to be really clear what the cause was
+		// 2. stopping the application during startup results in several other exceptions being thrown which are just noise
+		_lifetime.ApplicationStarted.Register(() => {
+			_requestShutdown(ex);
+		});
+		_lifetime.ApplicationStopped.Register(() => Log.Fatal(ex.Message));
+
+		// belt and braces (in case the above fails due to application somehow never fully starting)
+		Task.Run(async () => {
+			await Task.Delay(TimeSpan.FromMinutes(1));
+			Log.Fatal(ex.Message);
+			_lifetime.StopApplication();
+		});
+	}
+}
diff --git a/src/KurrentDB.Licensing/LicenseSummary.cs b/src/KurrentDB.Licensing/LicenseSummary.cs
new file mode 100644
index 00000000000..0c2cb2d29d3
--- /dev/null
+++ b/src/KurrentDB.Licensing/LicenseSummary.cs
@@ -0,0 +1,110 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using EventStore.Plugins.Licensing;
+
+namespace KurrentDB.Licensing;
+
+public record LicenseSummary(
+	string LicenseId,
+	string Company,
+	bool IsTrial,
+	long ExpiryUnixTimeSeconds,
+	bool IsValid,
+	string Notes) {
+
+	static readonly string IsExpiredName = "isExpired";
+	static readonly string ExpiryUnixTimeSecondsName = ToCamelCase(nameof(ExpiryUnixTimeSeconds));
+
+	public LicenseSummary(string licenseId, string company, bool isTrial, DateTimeOffset expiry, bool isValid, string notes)
+		: this(licenseId, company, isTrial, expiry.ToUnixTimeSeconds(), isValid, notes) {
+	}
+
+	public void ExportClaims(in Dictionary<string, object> props) {
+		foreach (var property in GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance))
+			props.Add(ToCamelCase(property.Name), property.GetValue(this)!);
+	}
+
+	public static HashSet<string> Properties { get; } =
+		typeof(LicenseSummary).GetProperties(BindingFlags.Public | BindingFlags.Instance)
+			.Select(p => ToCamelCase(p.Name))
+			.ToHashSet();
+
+	public static Dictionary<string, object?> SelectForEndpoint(License license) {
+		var dict = new Dictionary<string, object?>();
+
+		dict[IsExpiredName] = "false";
+
+		foreach (var claim in license.Token.Claims ?? []) {
+			if (claim.Type == ExpiryUnixTimeSecondsName) {
+				var daysRemaining = CalcDaysRemaining(claim.Value);
+
+				dict["daysRemaining"] = $"{daysRemaining:N2}";
+				if (daysRemaining <= 0)
+					dict[IsExpiredName] = "true";
+
+			} else if (Properties.Contains(claim.Type)) {
+				dict[claim.Type] = claim.Value;
+			}
+		}
+
+		// needed for backwards compatibility with the webui
+		dict["isFloating"] = "true";
+		dict["startDate"] = "0";
+		return dict;
+	}
+
+	static double CalcDaysRemaining(string expiryUnixTimeSecondsString) {
+		var expiryUnixTimeSeconds = long.Parse(expiryUnixTimeSecondsString);
+		var expiry = DateTimeOffset.FromUnixTimeSeconds(expiryUnixTimeSeconds);
+		var daysRemaining = (expiry - DateTimeOffset.UtcNow).TotalDays;
+		daysRemaining = Math.Max(daysRemaining, 0);
+		return daysRemaining;
+	}
+
+	public static Dictionary<string, object?> SelectForTelemetry(License license) {
+		var dict = new Dictionary<string, object?>();
+
+		AddString(nameof(LicenseId), license, dict);
+		AddBool(nameof(IsTrial), license, dict);
+
+		if (TryGet(ExpiryUnixTimeSecondsName, license, out var _, out var value)) {
+			dict[IsExpiredName] = CalcDaysRemaining(value) <= 0;
+		}
+
+		AddBool(nameof(IsValid), license, dict);
+
+		static void AddString(string property, License license, Dictionary<string, object?> dict) {
+			if (TryGet(property, license, out var k, out var v))
+				dict[k] = v;
+		}
+
+		static void AddBool(string property, License license, Dictionary<string, object?> dict) {
+			if (TryGet(property, license, out var k, out var v) && bool.TryParse(v, out var b))
+				dict[k] = b;
+		}
+
+		static bool TryGet(string property, License l, out string key, [MaybeNullWhen(false)] out string value) {
+			key = ToCamelCase(property);
+			foreach (var claim in l.Token.Claims ?? []) {
+				if (key == claim.Type) {
+					value = claim.Value;
+					return true;
+				}
+			}
+			value = default;
+			return false;
+		};
+
+		return dict;
+	}
+
+	private static string ToCamelCase(string pascalCaseStr) {
+		if (string.IsNullOrEmpty(pascalCaseStr))
+			return pascalCaseStr;
+
+		return char.ToLower(pascalCaseStr[0]) + pascalCaseStr[1..];
+	}
+}
diff --git a/src/KurrentDB.Licensing/LicenseTelemetryService.cs b/src/KurrentDB.Licensing/LicenseTelemetryService.cs
new file mode 100644
index 00000000000..cf10c5b362d
--- /dev/null
+++ b/src/KurrentDB.Licensing/LicenseTelemetryService.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Licensing;
+using Microsoft.Extensions.Hosting;
+
+namespace KurrentDB.Licensing;
+
+public class LicenseTelemetryService : IHostedService {
+	private readonly ILicenseService _licenseProvider;
+	private readonly Action<Dictionary<string, object?>> _publish;
+
+	public LicenseTelemetryService(
+		ILicenseService licenseProvider,
+		Action<Dictionary<string, object?>> publish) {
+
+		_licenseProvider = licenseProvider;
+		_publish = publish;
+	}
+
+	public Task StartAsync(CancellationToken cancellationToken) {
+		License? current = null;
+		_licenseProvider.Licenses.Subscribe(
+			onNext: license => {
+				current = license;
+				var telemetry = LicenseSummary.SelectForTelemetry(license);
+				_publish(telemetry);
+			},
+			onError: ex => {
+				current = null;
+				_publish([]);
+			});
+
+		_ = TelemetryLoop();
+
+		return Task.CompletedTask;
+
+		async Task TelemetryLoop() {
+			while (true) {
+				await Task.Delay(TimeSpan.FromHours(1), cancellationToken);
+				if (current is { } currentLicense) {
+					var telemetry = LicenseSummary.SelectForTelemetry(currentLicense);
+					_publish(telemetry);
+				}
+			}
+		}
+	}
+
+	public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+}
diff --git a/src/KurrentDB.Licensing/LicensingPlugin.cs b/src/KurrentDB.Licensing/LicensingPlugin.cs
new file mode 100644
index 00000000000..026c7b2d4a6
--- /dev/null
+++ b/src/KurrentDB.Licensing/LicensingPlugin.cs
@@ -0,0 +1,113 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Reactive.Subjects;
+using EventStore.Plugins;
+using EventStore.Plugins.Diagnostics;
+using EventStore.Plugins.Licensing;
+using KurrentDB.Licensing.Keygen;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using RestSharp;
+using RestSharp.Authenticators.OAuth2;
+using Serilog;
+
+namespace KurrentDB.Licensing;
+
+// circumventing the license mechanism is against the ESLv2 license.
+public class LicensingPlugin : Plugin {
+	private static readonly ILogger Log = Serilog.Log.ForContext<LicensingPlugin>();
+
+	private readonly ILicenseProvider? _licenseProvider;
+	private readonly Action<Exception> _requestShutdown;
+
+	public LicensingPlugin(Action<Exception> requestShutdown) : this(requestShutdown, null) {
+	}
+
+	public LicensingPlugin(Action<Exception> requestShutdown, ILicenseProvider? licenseProvider) : base() {
+		_licenseProvider = licenseProvider;
+		_requestShutdown = requestShutdown;
+	}
+
+
+	public override void ConfigureApplication(IApplicationBuilder builder, IConfiguration configuration) {
+		var licenseService = builder.ApplicationServices.GetRequiredService<ILicenseService>();
+
+		License? currentLicense = null;
+		Exception? licenseError = null;
+		licenseService.Licenses.Subscribe(
+			license => {
+				currentLicense = license;
+				licenseError = null;
+			},
+			ex => {
+				currentLicense = null;
+				licenseError = ex;
+			});
+
+		builder.UseEndpoints(endpoints => endpoints
+			.MapGet("/license", (HttpContext context) => {
+				if (currentLicense is { } license)
+					return Results.Json(LicenseSummary.SelectForEndpoint(license));
+
+				if (licenseError is NoLicenseKeyException)
+					return Results.NotFound();
+
+				return Results.NotFound(licenseError?.Message ?? "Unknown eror");
+			})
+			.RequireAuthorization());
+	}
+
+	public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) {
+		var baseUrl = $"https://licensing.kurrent.io/v1/";
+		var clientOptions = configuration.GetSection("KurrentDB").Get<KeygenClientOptions>() ?? new();
+		if (clientOptions.Licensing.BaseUrl is not null) {
+			baseUrl = clientOptions.Licensing.BaseUrl;
+			Log.Information("Using custom licensing URL: {Url}. This requires permission from Kurrent, Inc.", baseUrl);
+		}
+
+		IObservable<LicenseInfo> licenses;
+
+		if (string.IsNullOrWhiteSpace(clientOptions.Licensing.LicenseKey)) {
+			var sub = new Subject<LicenseInfo>();
+			sub.OnError(new NoLicenseKeyException());
+			licenses = sub;
+		} else {
+			var lifecycleService = new KeygenLifecycleService(
+				new KeygenClient(
+					clientOptions,
+					restClient: new RestClient(
+						new RestClientOptions(baseUrl) {
+							Authenticator = new OAuth2AuthorizationRequestHeaderAuthenticator(clientOptions.Licensing.LicenseKey, "License"),
+							// todo: Interceptors = [new KeygenSignatureInterceptor()],
+						})),
+				new Fingerprint(clientOptions.Licensing.IncludePortInFingerprint ? clientOptions.NodePort : null),
+				revalidationDelay: TimeSpan.FromSeconds(10));
+
+			licenses = lifecycleService.Licenses;
+			services.AddHostedService(sp => lifecycleService);
+		}
+
+		services
+			// other components such as plugins can use this to subscribe to the licenses, inspect them, and reject them
+			.AddSingleton<ILicenseService>(sp => {
+				var licenseProvider =
+					_licenseProvider ??
+					new KeygenLicenseProvider(licenses);
+
+				return new LicenseService(
+					sp.GetRequiredService<IHostApplicationLifetime>(),
+					_requestShutdown,
+					licenseProvider);
+			})
+			.AddHostedService(sp => new LicenseTelemetryService(
+				sp.GetRequiredService<ILicenseService>(),
+				telemetry => PublishDiagnosticsData(telemetry, PluginDiagnosticsDataCollectionMode.Snapshot)));
+	}
+
+	class NoLicenseKeyException : Exception {
+	}
+}
diff --git a/src/KurrentDB.Licensing/licence-configuration-example.json b/src/KurrentDB.Licensing/licence-configuration-example.json
new file mode 100644
index 00000000000..8403e29fb17
--- /dev/null
+++ b/src/KurrentDB.Licensing/licence-configuration-example.json
@@ -0,0 +1,7 @@
+{
+  "KurrentDB": {
+    "Licensing": {
+      "LicenseKey": "Your key"
+    }
+  }
+}
diff --git a/src/KurrentDB.Licensing/licence-configuration-example.yaml b/src/KurrentDB.Licensing/licence-configuration-example.yaml
new file mode 100644
index 00000000000..befe7bd59ad
--- /dev/null
+++ b/src/KurrentDB.Licensing/licence-configuration-example.yaml
@@ -0,0 +1,2 @@
+Licensing:
+  LicenseKey: YourKey
diff --git a/src/EventStore.LogCommon/EventStore.LogCommon.csproj b/src/KurrentDB.LogCommon/KurrentDB.LogCommon.csproj
similarity index 100%
rename from src/EventStore.LogCommon/EventStore.LogCommon.csproj
rename to src/KurrentDB.LogCommon/KurrentDB.LogCommon.csproj
diff --git a/src/KurrentDB.LogCommon/LogRecordType.cs b/src/KurrentDB.LogCommon/LogRecordType.cs
new file mode 100644
index 00000000000..523372a0050
--- /dev/null
+++ b/src/KurrentDB.LogCommon/LogRecordType.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.LogCommon;
+
+public enum LogRecordType : byte {
+	Prepare = 0,
+	Commit = 1,
+	System = 2,
+	PartitionType = 3,
+	StreamType = 4,
+	EventType = 5,
+	ContentType = 6,
+	Partition = 7,
+	StreamWrite = 8,
+	TransactionStart = 9,
+	TransactionEnd = 10,
+	Stream = 11,
+}
diff --git a/src/KurrentDB.LogCommon/LogRecordVersion.cs b/src/KurrentDB.LogCommon/LogRecordVersion.cs
new file mode 100644
index 00000000000..78dddef557b
--- /dev/null
+++ b/src/KurrentDB.LogCommon/LogRecordVersion.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.LogCommon;
+
+public class LogRecordVersion {
+	public const byte LogRecordV0 = 0;
+	public const byte LogRecordV1 = 1;
+}
diff --git a/src/KurrentDB.LogV3.Tests/KurrentDB.LogV3.Tests.csproj b/src/KurrentDB.LogV3.Tests/KurrentDB.LogV3.Tests.csproj
new file mode 100644
index 00000000000..8f9f2e8b2d3
--- /dev/null
+++ b/src/KurrentDB.LogV3.Tests/KurrentDB.LogV3.Tests.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+		<PackageReference Include="ObjectLayoutInspector" Version="0.1.4" />
+		<PackageReference Include="System.Linq.Async" Version="6.0.1" />
+		<PackageReference Include="System.Net.Http" Version="4.3.4" />
+		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
+		<PackageReference Include="xunit" Version="2.9.3" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="coverlet.collector" Version="6.0.4">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.LogV3\KurrentDB.LogV3.csproj" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.LogV3.Tests/LayoutInspections.cs b/src/KurrentDB.LogV3.Tests/LayoutInspections.cs
new file mode 100644
index 00000000000..0e7be0c9396
--- /dev/null
+++ b/src/KurrentDB.LogV3.Tests/LayoutInspections.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using ObjectLayoutInspector;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace KurrentDB.LogV3.Tests;
+
+// For easily inspecting the layout of the structs
+public class LayoutInspections {
+	private readonly ITestOutputHelper _output;
+
+	public LayoutInspections(ITestOutputHelper output) {
+		_output = output;
+	}
+
+	[Theory]
+	[InlineData(typeof(Raw.RecordHeader))]
+	[InlineData(typeof(Raw.EpochHeader))]
+	[InlineData(typeof(Raw.EventHeader))]
+	[InlineData(typeof(Raw.PartitionHeader))]
+	[InlineData(typeof(Raw.PartitionTypeHeader))]
+	[InlineData(typeof(Raw.StreamHeader))]
+	[InlineData(typeof(Raw.StreamTypeHeader))]
+	[InlineData(typeof(Raw.StreamWriteHeader))]
+	[InlineData(typeof(Raw.EventTypeHeader))]
+	[InlineData(typeof(Raw.ContentTypeHeader))]
+	[InlineData(typeof(Raw.TransactionStartHeader))]
+	[InlineData(typeof(Raw.TransactionEndHeader))]
+	public void InspectLayout(Type t) {
+		var layout = TypeLayout.GetLayout(t);
+		_output.WriteLine(layout.ToString(recursively: false));
+	}
+}
diff --git a/src/KurrentDB.LogV3.Tests/RecordCreatorTests.cs b/src/KurrentDB.LogV3.Tests/RecordCreatorTests.cs
new file mode 100644
index 00000000000..88ce45e8743
--- /dev/null
+++ b/src/KurrentDB.LogV3.Tests/RecordCreatorTests.cs
@@ -0,0 +1,252 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Runtime.InteropServices;
+using KurrentDB.LogCommon;
+using Xunit;
+
+namespace KurrentDB.LogV3.Tests;
+
+public class RecordCreatorTests {
+	readonly Guid _guid1 = Guid.Parse("00000000-0000-0000-0000-000000000001");
+	readonly Guid _guid2 = Guid.Parse("00000000-0000-0000-0000-000000000002");
+	readonly Guid _guid3 = Guid.Parse("00000000-0000-0000-0000-000000000003");
+	readonly DateTime _dateTime1 = new(0x08_D9_15_80_C3_A1_00_00);
+	readonly int _int1 = 1;
+	readonly long _long1 = 1;
+	readonly long _long2 = 2;
+	readonly long _long3 = 3;
+	readonly long _long4 = 4;
+	readonly uint _uint1 = 5;
+	readonly ushort _ushort1 = 6;
+	readonly string _string1 = "one";
+	readonly Raw.EventFlags _prepareflags = (Raw.EventFlags)3;
+	readonly Raw.PartitionFlags _partitionFlags = (Raw.PartitionFlags)4;
+	readonly ReadOnlyMemory<byte> _bytes1 = new byte[] { 0x10 };
+	readonly ReadOnlyMemory<byte> _bytes2 = new byte[] { 0x20, 0x01 };
+	readonly ReadOnlyMemory<byte> _bytes3 = new byte[] { 0x30, 0x01, 0x01 };
+	readonly ReadOnlyMemory<byte> _bytes4 = new byte[] { 0x40, 0x01, 0x01, 0x01 };
+
+	[Fact]
+	public void can_create_epoch() {
+		var epochNumber = 5;
+		var record = RecordCreator.CreateEpochRecord(
+			timeStamp: _dateTime1,
+			logPosition: _long1,
+			epochNumber: epochNumber,
+			epochId: _guid1,
+			prevEpochPosition: _long2,
+			leaderInstanceId: _guid2);
+
+		Assert.Equal(LogRecordType.System, record.Header.Type);
+		Assert.Equal(LogRecordVersion.LogRecordV1, record.Header.Version);
+
+		Assert.Equal(_dateTime1, record.Header.TimeStamp);
+		Assert.Equal(_guid1, record.Header.RecordId);
+		Assert.Equal(_long1, record.Header.LogPosition);
+
+		Assert.Equal(epochNumber, record.SubHeader.EpochNumber);
+		Assert.Equal(_guid2, record.SubHeader.LeaderInstanceId);
+		Assert.Equal(_long2, record.SubHeader.PrevEpochPosition);
+	}
+
+	[Fact]
+	public void can_create_partition_record() {
+		var record = RecordCreator.CreatePartitionRecord(
+			timeStamp: _dateTime1,
+			logPosition: _long1,
+			partitionId: _guid1,
+			partitionTypeId: _guid2,
+			parentPartitionId: _guid3,
+			flags: _partitionFlags,
+			referenceNumber: _ushort1,
+			name: _string1);
+
+		Assert.Equal(LogRecordType.Partition, record.Header.Type);
+		Assert.Equal(LogRecordVersion.LogRecordV0, record.Header.Version);
+		Assert.Equal(_dateTime1, record.Header.TimeStamp);
+		Assert.Equal(_guid1, record.Header.RecordId);
+		Assert.Equal(_long1, record.Header.LogPosition);
+		Assert.Equal(_guid2, record.SubHeader.PartitionTypeId);
+		Assert.Equal(_guid3, record.SubHeader.ParentPartitionId);
+		Assert.Equal(_partitionFlags, record.SubHeader.Flags);
+		Assert.Equal(_ushort1, record.SubHeader.ReferenceNumber);
+		Assert.Equal(_string1, record.StringPayload);
+	}
+
+	[Fact]
+	public void can_create_partition_type_record() {
+		var record = RecordCreator.CreatePartitionTypeRecord(
+			timeStamp: _dateTime1,
+			logPosition: _long1,
+			partitionTypeId: _guid1,
+			partitionId: _guid2,
+			name: _string1);
+
+		Assert.Equal(LogRecordType.PartitionType, record.Header.Type);
+		Assert.Equal(LogRecordVersion.LogRecordV0, record.Header.Version);
+		Assert.Equal(_dateTime1, record.Header.TimeStamp);
+		Assert.Equal(_guid1, record.Header.RecordId);
+		Assert.Equal(_long1, record.Header.LogPosition);
+		Assert.Equal(_guid2, record.SubHeader.PartitionId);
+		Assert.Equal(_string1, record.StringPayload);
+	}
+
+	[Fact]
+	public void can_create_stream_record() {
+		var record = RecordCreator.CreateStreamRecord(
+			streamId: _guid1,
+			timeStamp: _dateTime1,
+			logPosition: _long1,
+			streamNumber: _uint1,
+			streamName: _string1,
+			partitionId: _guid2,
+			streamTypeId: _guid3);
+
+		Assert.Equal(LogRecordType.Stream, record.Header.Type);
+		Assert.Equal(LogRecordVersion.LogRecordV0, record.Header.Version);
+		Assert.Equal(_guid1, record.Header.RecordId);
+		Assert.Equal(_dateTime1, record.Header.TimeStamp);
+		Assert.Equal(_long1, record.Header.LogPosition);
+		Assert.Equal(_guid2, record.SubHeader.PartitionId);
+		Assert.Equal(_uint1, record.SubHeader.ReferenceNumber);
+		Assert.Equal(_guid3, record.SubHeader.StreamTypeId);
+		Assert.Equal(_string1, record.StringPayload);
+	}
+
+	[Fact]
+	public void can_create_stream_type_record() {
+		var record = RecordCreator.CreateStreamTypeRecord(
+			timeStamp: _dateTime1,
+			logPosition: _long1,
+			streamTypeId: _guid1,
+			partitionId: _guid2,
+			name: _string1);
+
+		Assert.Equal(LogRecordType.StreamType, record.Header.Type);
+		Assert.Equal(LogRecordVersion.LogRecordV0, record.Header.Version);
+		Assert.Equal(_dateTime1, record.Header.TimeStamp);
+		Assert.Equal(_guid1, record.Header.RecordId);
+		Assert.Equal(_long1, record.Header.LogPosition);
+		Assert.Equal(_guid2, record.SubHeader.PartitionId);
+		Assert.Equal(_string1, record.StringPayload);
+	}
+
+	[Fact]
+	public void can_create_event_type_record() {
+		var record = RecordCreator.CreateEventTypeRecord(
+			timeStamp: _dateTime1,
+			logPosition: _long1,
+			eventTypeId: _guid1,
+			parentEventTypeId: _guid2,
+			partitionId: _guid3,
+			eventTypeNumber: _uint1,
+			eventTypeVersion: _ushort1,
+			name: _string1);
+
+		Assert.Equal(LogRecordType.EventType, record.Header.Type);
+		Assert.Equal(LogRecordVersion.LogRecordV0, record.Header.Version);
+		Assert.Equal(_dateTime1, record.Header.TimeStamp);
+		Assert.Equal(_guid1, record.Header.RecordId);
+		Assert.Equal(_long1, record.Header.LogPosition);
+		Assert.Equal(_guid2, record.SubHeader.ParentEventTypeId);
+		Assert.Equal(_guid3, record.SubHeader.PartitionId);
+		Assert.Equal(_uint1, record.SubHeader.ReferenceNumber);
+		Assert.Equal(_ushort1, record.SubHeader.Version);
+		Assert.Equal(_string1, record.StringPayload);
+	}
+
+	[Fact]
+	public void can_create_content_type_record() {
+		var record = RecordCreator.CreateContentTypeRecord(
+			timeStamp: _dateTime1,
+			logPosition: _long1,
+			contentTypeId: _guid1,
+			partitionId: _guid2,
+			referenceNumber: _ushort1,
+			name: _string1);
+
+		Assert.Equal(LogRecordType.ContentType, record.Header.Type);
+		Assert.Equal(LogRecordVersion.LogRecordV0, record.Header.Version);
+		Assert.Equal(_dateTime1, record.Header.TimeStamp);
+		Assert.Equal(_guid1, record.Header.RecordId);
+		Assert.Equal(_long1, record.Header.LogPosition);
+		Assert.Equal(_guid2, record.SubHeader.PartitionId);
+		Assert.Equal(_ushort1, record.SubHeader.ReferenceNumber);
+		Assert.Equal(_string1, record.StringPayload);
+	}
+
+	[Fact]
+	public void can_create_stream_write_record_for_single_event() {
+		var record = RecordCreator.CreateStreamWriteRecordForSingleEvent(
+			timeStamp: _dateTime1,
+			correlationId: _guid1,
+			logPosition: _long1,
+			transactionPosition: _long2,
+			transactionOffset: _int1,
+			streamNumber: _long3,
+			startingEventNumber: _long4,
+			eventId: _guid2,
+			eventTypeNumber: _uint1,
+			eventData: _bytes3.Span,
+			eventMetadata: _bytes4.Span,
+			eventFlags: _prepareflags);
+
+		Assert.Equal(LogRecordType.StreamWrite, record.Header.Type);
+		Assert.Equal(LogRecordVersion.LogRecordV0, record.Header.Version);
+		Assert.Equal(_dateTime1, record.Header.TimeStamp);
+		Assert.Equal(_long1, record.Header.LogPosition);
+		Assert.Equal<Guid>(_guid1, record.SystemMetadata.CorrelationId);
+		Assert.Equal(_long2, record.SystemMetadata.TransactionPosition);
+		Assert.Equal(_int1, record.SystemMetadata.TransactionOffset);
+		Assert.Equal(0, record.SystemMetadata.StartingEventNumberRoot);
+		Assert.Equal(0, record.SystemMetadata.StartingEventNumberCategory);
+		Assert.Equal(0, record.WriteId.CategoryNumber);
+		Assert.Equal(0, record.WriteId.ParentTopicNumber);
+		Assert.Equal(0, record.WriteId.TopicNumber);
+		Assert.Equal(_long3, record.WriteId.StreamNumber);
+		Assert.Equal(_long4, record.WriteId.StartingEventNumber);
+		Assert.Equal<Guid>(_guid2, record.Event.SystemMetadata.EventId);
+		Assert.Equal(_uint1, record.Event.Header.EventTypeNumber);
+		Assert.Equal(MemoryMarshal.ToEnumerable(_bytes3), MemoryMarshal.ToEnumerable(record.Event.Data));
+		Assert.Equal(MemoryMarshal.ToEnumerable(_bytes4), MemoryMarshal.ToEnumerable(record.Event.Metadata));
+		Assert.Equal(_prepareflags, record.Event.Header.Flags);
+	}
+
+	[Fact]
+	public void can_create_transaction_start() {
+		var record = RecordCreator.CreateTransactionStartRecord(
+			timeStamp: _dateTime1,
+			logPosition: _long1,
+			transactionId: _guid1,
+			status: Raw.TransactionStatus.Failed,
+			type: Raw.TransactionType.MultipartTransaction,
+			recordCount: _uint1);
+
+		Assert.Equal(LogRecordType.TransactionStart, record.Header.Type);
+		Assert.Equal(LogRecordVersion.LogRecordV0, record.Header.Version);
+		Assert.Equal(_dateTime1, record.Header.TimeStamp);
+		Assert.Equal(_guid1, record.Header.RecordId);
+		Assert.Equal(_long1, record.Header.LogPosition);
+		Assert.Equal(Raw.TransactionStatus.Failed, record.SubHeader.Status);
+		Assert.Equal(Raw.TransactionType.MultipartTransaction, record.SubHeader.Type);
+		Assert.Equal(_uint1, record.SubHeader.RecordCount);
+	}
+
+	[Fact]
+	public void can_create_transaction_end() {
+		var record = RecordCreator.CreateTransactionEndRecord(
+			timeStamp: _dateTime1,
+			logPosition: _long1,
+			transactionId: _guid1,
+			recordCount: _uint1);
+
+		Assert.Equal(LogRecordType.TransactionEnd, record.Header.Type);
+		Assert.Equal(LogRecordVersion.LogRecordV0, record.Header.Version);
+		Assert.Equal(_dateTime1, record.Header.TimeStamp);
+		Assert.Equal(_guid1, record.Header.RecordId);
+		Assert.Equal(_long1, record.Header.LogPosition);
+		Assert.Equal(_uint1, record.SubHeader.RecordCount);
+	}
+}
diff --git a/src/KurrentDB.LogV3.Tests/RecordHeaderTests.cs b/src/KurrentDB.LogV3.Tests/RecordHeaderTests.cs
new file mode 100644
index 00000000000..890b84704b4
--- /dev/null
+++ b/src/KurrentDB.LogV3.Tests/RecordHeaderTests.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using Xunit;
+
+namespace KurrentDB.LogV3.Tests;
+
+public class RecordHeaderTests {
+	[Fact]
+	public void can_set_time_stamp() {
+		var header = new Raw.RecordHeader {
+			TimeStamp = new DateTime(2000, 03, 21),
+			Type = LogCommon.LogRecordType.EventType,
+			Version = 0x45,
+		};
+
+		var now = DateTime.UtcNow;
+		header.TimeStamp = now;
+
+		Assert.Equal(LogCommon.LogRecordType.EventType, header.Type);
+		Assert.Equal(0x45, header.Version);
+		Assert.Equal(now, header.TimeStamp, TimeSpan.FromMilliseconds(7));
+	}
+
+	[Fact]
+	public void can_get_time_stamp() {
+		var timeStamp = new DateTime(0x08_D9_15_80_C3_A1_00_00);
+		var header = new Raw.RecordHeader {
+			TimeStamp = timeStamp,
+		};
+
+		header.Type = LogCommon.LogRecordType.EventType;
+		header.Version = 0x45;
+
+		Assert.Equal(LogCommon.LogRecordType.EventType, header.Type);
+		Assert.Equal(0x45, header.Version);
+		Assert.Equal(timeStamp, header.TimeStamp);
+	}
+}
diff --git a/src/KurrentDB.LogV3.Tests/RecordLayoutTests.cs b/src/KurrentDB.LogV3.Tests/RecordLayoutTests.cs
new file mode 100644
index 00000000000..ccfa0e6f827
--- /dev/null
+++ b/src/KurrentDB.LogV3.Tests/RecordLayoutTests.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using ObjectLayoutInspector;
+using Xunit;
+
+namespace KurrentDB.LogV3.Tests;
+
+public class RecordLayoutTests {
+	void AssertSize<T>(int expectedSize, bool allowOverlap = false) {
+		Assert.Equal(expectedSize, Unsafe.SizeOf<T>());
+		Assert.Equal(expectedSize, Marshal.SizeOf<T>());
+
+		var layout = TypeLayout.GetLayout<T>();
+
+		// check that fields are aligned
+		foreach (var field in layout.Fields) {
+			var str = $"{field}";
+			if (str.Contains("padding"))
+				continue;
+
+			var fieldAlignment = field.Size;
+			if (str.Contains("Guid"))
+				fieldAlignment = 4;
+
+			Assert.True(field.Offset % fieldAlignment == 0, $"Field {field} is not aligned");
+		}
+
+		// check that fields don't overlap
+		if (allowOverlap)
+			return;
+
+		var minOffset = 0;
+		foreach (var field in layout.Fields) {
+			Assert.True(field.Offset >= minOffset, $"Field {field.Offset} overlaps");
+			minOffset = field.Offset + field.Size;
+		}
+
+		// note that we aren't checking whether fields are efficiently arranged...
+		// also not currently checking if the whole struct is correctly aligned, only the fields within.
+	}
+
+	[Fact] public void RecordHeaderLayout() => AssertSize<Raw.RecordHeader>(Raw.RecordHeader.Size, allowOverlap: true);
+	[Fact] public void EpochRecordHeaderLayout() => AssertSize<Raw.EpochHeader>(Raw.EpochHeader.Size);
+	[Fact] public void EventHeaderLayout() => AssertSize<Raw.EventHeader>(Raw.EventHeader.Size);
+	[Fact] public void PartitionHeaderLayout() => AssertSize<Raw.PartitionHeader>(Raw.PartitionHeader.Size);
+	[Fact] public void PartitionTypeHeaderLayout() => AssertSize<Raw.PartitionTypeHeader>(Raw.PartitionTypeHeader.Size);
+	[Fact] public void StreamHeaderLayout() => AssertSize<Raw.StreamHeader>(Raw.StreamHeader.Size);
+	[Fact] public void StreamTypeHeaderLayout() => AssertSize<Raw.StreamTypeHeader>(Raw.StreamTypeHeader.Size);
+	[Fact] public void StreamWriteHeaderLayout() => AssertSize<Raw.StreamWriteHeader>(Raw.StreamWriteHeader.Size);
+	[Fact] public void EventTypeHeaderLayout() => AssertSize<Raw.EventTypeHeader>(Raw.EventTypeHeader.Size);
+	[Fact] public void ContentTypeHeaderLayout() => AssertSize<Raw.ContentTypeHeader>(Raw.ContentTypeHeader.Size);
+	[Fact] public void TransactionStartHeaderLayout() => AssertSize<Raw.TransactionStartHeader>(Raw.TransactionStartHeader.Size);
+	[Fact] public void TransactionEndHeaderLayout() => AssertSize<Raw.TransactionEndHeader>(Raw.TransactionEndHeader.Size);
+}
diff --git a/src/KurrentDB.LogV3.Tests/StreamWriteIdTests.cs b/src/KurrentDB.LogV3.Tests/StreamWriteIdTests.cs
new file mode 100644
index 00000000000..23bc287e962
--- /dev/null
+++ b/src/KurrentDB.LogV3.Tests/StreamWriteIdTests.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using Xunit;
+
+namespace KurrentDB.LogV3.Tests;
+
+public class StreamWriteIdTests {
+	[Theory]
+	[InlineData(Raw.StreamWriteId.MaxStartingEventNumber + 2)]
+	[InlineData(-1)]
+	public void cant_set_starting_event_number_out_of_range(long x) {
+		var writeId = new Raw.StreamWriteId {
+			ParentTopicNumber = 15,
+		};
+
+		Assert.Throws<ArgumentOutOfRangeException>(() => {
+			writeId.StartingEventNumber = x;
+		});
+		Assert.Equal(15, writeId.ParentTopicNumber);
+	}
+
+	[Theory]
+	[InlineData(Raw.StreamWriteId.EventNumberDeletedStream)]
+	[InlineData(Raw.StreamWriteId.MaxStartingEventNumber)]
+	[InlineData(0)]
+	public void can_set_starting_event_number(long x) {
+		var writeId = new Raw.StreamWriteId {
+			StartingEventNumber = 123,
+			ParentTopicNumber = 15,
+		};
+
+		writeId.StartingEventNumber = x;
+
+		Assert.Equal(15, writeId.ParentTopicNumber);
+		Assert.Equal(x, writeId.StartingEventNumber);
+	}
+
+	[Fact]
+	public void can_get_starting_event_number() {
+		var writeId = new Raw.StreamWriteId {
+			StartingEventNumber = Raw.StreamWriteId.MaxStartingEventNumber,
+		};
+
+		writeId.ParentTopicNumber = 15;
+
+		Assert.Equal(15, writeId.ParentTopicNumber);
+		Assert.Equal(Raw.StreamWriteId.MaxStartingEventNumber, writeId.StartingEventNumber);
+	}
+}
diff --git a/src/KurrentDB.LogV3/EventRecord.cs b/src/KurrentDB.LogV3/EventRecord.cs
new file mode 100644
index 00000000000..7bed4287677
--- /dev/null
+++ b/src/KurrentDB.LogV3/EventRecord.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Buffers;
+using System.Runtime.InteropServices;
+
+namespace KurrentDB.LogV3;
+
+// View of an event in a stream write record
+public struct EventRecord {
+	private readonly ReadOnlyMemory<byte> _headerMemory;
+	private readonly ReadOnlyMemory<byte> _data;
+	private readonly ReadOnlyMemory<byte> _metadata;
+
+	public ref readonly Raw.EventHeader Header => ref MemoryMarshal.AsRef<Raw.EventHeader>(_headerMemory.Span);
+	public ReadOnlyMemory<byte> Data => _data;
+	public ReadOnlyMemory<byte> Metadata => _metadata;
+	public EventSystemMetadata SystemMetadata { get; }
+
+	// bytes already populated with a event record to read
+	public EventRecord(ReadOnlyMemory<byte> bytes) {
+		var slicer = bytes.Slicer();
+		_headerMemory = slicer.Slice(Raw.EventHeader.Size);
+
+		ref readonly var header = ref MemoryMarshal.AsRef<Raw.EventHeader>(_headerMemory.Span);
+
+		var systemMetadata = slicer.Slice(header.SystemMetadataSize);
+		_data = slicer.Slice(header.DataSize);
+		_metadata = slicer.Remaining;
+
+		SystemMetadata = EventSystemMetadata.Parser.ParseFrom(new ReadOnlySequence<byte>(systemMetadata));
+	}
+}
diff --git a/src/KurrentDB.LogV3/KurrentDB.LogV3.csproj b/src/KurrentDB.LogV3/KurrentDB.LogV3.csproj
new file mode 100644
index 00000000000..2dd1b4ff833
--- /dev/null
+++ b/src/KurrentDB.LogV3/KurrentDB.LogV3.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="Google.Protobuf" Version="3.27.2" />
+		<PackageReference Include="Grpc.Tools" Version="2.65.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+		</PackageReference>
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.LogCommon\KurrentDB.LogCommon.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+		<Protobuf Include="**/*.proto" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.LogV3/MemorySlicer.cs b/src/KurrentDB.LogV3/MemorySlicer.cs
new file mode 100644
index 00000000000..b0245299437
--- /dev/null
+++ b/src/KurrentDB.LogV3/MemorySlicer.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.LogV3;
+
+public static class MemoryExtensions {
+	public static MemorySlicer<T> Slicer<T>(this Memory<T> memory) =>
+		new MemorySlicer<T>(memory);
+
+	public static ReadOnlyMemorySlicer<T> Slicer<T>(this ReadOnlyMemory<T> memory) =>
+		new ReadOnlyMemorySlicer<T>(memory);
+}
+
+public struct MemorySlicer<T> {
+	public Memory<T> Remaining { get; private set; }
+
+	public MemorySlicer(Memory<T> source) {
+		Remaining = source;
+	}
+
+	public Memory<T> Slice(int length) {
+		var toReturn = Remaining[..length];
+		Remaining = Remaining[length..];
+		return toReturn;
+	}
+}
diff --git a/src/KurrentDB.LogV3/MutableRecordView.cs b/src/KurrentDB.LogV3/MutableRecordView.cs
new file mode 100644
index 00000000000..18f1eb9b61d
--- /dev/null
+++ b/src/KurrentDB.LogV3/MutableRecordView.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace KurrentDB.LogV3;
+
+// Mutable view of a record
+public struct MutableRecordView<TSubHeader> where TSubHeader : unmanaged {
+	private readonly SlicedRecord _sliced;
+
+	public Memory<byte> Bytes => _sliced.Bytes;
+	public ref Raw.RecordHeader Header => ref MemoryMarshal.AsRef<Raw.RecordHeader>(_sliced.HeaderMemory.Span);
+	public ref T RecordId<T>() where T : unmanaged =>
+		ref MemoryMarshal.AsRef<T>(_sliced.HeaderMemory[Raw.RecordHeader.RecordIdOffset..].Span);
+	public ref TSubHeader SubHeader => ref MemoryMarshal.AsRef<TSubHeader>(_sliced.SubHeaderMemory.Span);
+	public Memory<byte> Payload => _sliced.PayloadMemory;
+
+	public static implicit operator RecordView<TSubHeader>(MutableRecordView<TSubHeader> record) =>
+		new RecordView<TSubHeader>(record.Bytes);
+
+	public static MutableRecordView<TSubHeader> Create(int payloadLength) {
+		// todo: later consider pool, inject allocator/use a factory
+		// ideally we could grab space _in the chunk_ that we are about to write to
+		var length = CalculateLength(payloadLength);
+		var bytes = new byte[length].AsMemory()[..length];
+		return new MutableRecordView<TSubHeader>(bytes);
+	}
+
+	unsafe static int CalculateLength(int payloadSize) =>
+		Raw.RecordHeader.Size + sizeof(TSubHeader) + payloadSize;
+
+	public MutableRecordView(Memory<byte> bytes) {
+		_sliced = SlicedRecordCreator<TSubHeader>.Create(bytes);
+	}
+}
diff --git a/src/KurrentDB.LogV3/ProtoGuid.cs b/src/KurrentDB.LogV3/ProtoGuid.cs
new file mode 100644
index 00000000000..467c38e97d8
--- /dev/null
+++ b/src/KurrentDB.LogV3/ProtoGuid.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using Google.Protobuf;
+
+namespace KurrentDB.LogV3;
+
+// System.Guid.ToByteArray roundtrips with the ctor that takes byte[] as the argument
+// if changing this be careful not to break changing between endianness
+public partial class ProtoGuid {
+	public static implicit operator Guid(ProtoGuid x) {
+		if (x == null)
+			return default;
+
+		return new Guid(x.Bytes.ToByteArray());
+	}
+
+	public static implicit operator ProtoGuid(Guid x) {
+		return new ProtoGuid {
+			Bytes = ByteString.CopyFrom(x.ToByteArray()),
+		};
+	}
+}
diff --git a/src/EventStore.LogV3/Protos/event_system_metadata.proto b/src/KurrentDB.LogV3/Protos/event_system_metadata.proto
similarity index 81%
rename from src/EventStore.LogV3/Protos/event_system_metadata.proto
rename to src/KurrentDB.LogV3/Protos/event_system_metadata.proto
index 6cbc7b7443c..e41f3acdabb 100644
--- a/src/EventStore.LogV3/Protos/event_system_metadata.proto
+++ b/src/KurrentDB.LogV3/Protos/event_system_metadata.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package EventStore.LogV3;
+package KurrentDB.LogV3;
 
 import "Protos/proto_guid.proto";
 
diff --git a/src/KurrentDB.LogV3/Protos/proto_guid.proto b/src/KurrentDB.LogV3/Protos/proto_guid.proto
new file mode 100644
index 00000000000..b9218886e78
--- /dev/null
+++ b/src/KurrentDB.LogV3/Protos/proto_guid.proto
@@ -0,0 +1,6 @@
+syntax = "proto3";
+package KurrentDB.LogV3;
+
+message ProtoGuid {
+	bytes bytes = 1;
+}
diff --git a/src/EventStore.LogV3/Protos/stream_write_system_metadata.proto b/src/KurrentDB.LogV3/Protos/stream_write_system_metadata.proto
similarity index 91%
rename from src/EventStore.LogV3/Protos/stream_write_system_metadata.proto
rename to src/KurrentDB.LogV3/Protos/stream_write_system_metadata.proto
index 7d3f25ec385..85070542fea 100644
--- a/src/EventStore.LogV3/Protos/stream_write_system_metadata.proto
+++ b/src/KurrentDB.LogV3/Protos/stream_write_system_metadata.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package EventStore.LogV3;
+package KurrentDB.LogV3;
 
 import "Protos/proto_guid.proto";
 
diff --git a/src/KurrentDB.LogV3/Raw.cs b/src/KurrentDB.LogV3/Raw.cs
new file mode 100644
index 00000000000..4f238009395
--- /dev/null
+++ b/src/KurrentDB.LogV3/Raw.cs
@@ -0,0 +1,371 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Runtime.InteropServices;
+using KurrentDB.LogCommon;
+
+namespace KurrentDB.LogV3;
+
+public static class Raw {
+	public const long SixMostSignificantBytes = unchecked((long)0xFF_FF_FF_FF_FF_FF_00_00);
+	public const long TwoLeastSignificantBytes = unchecked(0x00_00_00_00_00_00_FF_FF);
+	public const long SixLeastSignificantBytes = unchecked(0x00_00_FF_FF_FF_FF_FF_FF);
+	public const long TwoMostSignificantBytes = unchecked((long)0xFF_FF_00_00_00_00_00_00);
+
+	[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
+	public struct RecordHeader {
+		[FieldOffset(0)] private LogRecordType _type;
+		[FieldOffset(1)] private byte _version;
+		[FieldOffset(0)] private long _ticks;
+		[FieldOffset(RecordIdOffset)] private Guid _recordId;
+
+		// todo: remove this if possible
+		[FieldOffset(RecordIdOffset + RecordIdSize)] private long _logPosition;
+		public const int Size = 32;
+		public const int RecordIdOffset = 8;
+		public const int RecordIdSize = 16;
+
+		public LogRecordType Type {
+			get => _type;
+			set => _type = value;
+		}
+
+		public byte Version {
+			get => _version;
+			set => _version = value;
+		}
+
+		public DateTime TimeStamp {
+			// little-endian. blank out the 2 LEAST significant bytes
+			get => new(_ticks & SixMostSignificantBytes);
+			set => _ticks =
+				(TwoLeastSignificantBytes & _ticks) |
+				(SixMostSignificantBytes & value.Ticks);
+		}
+
+		public Guid RecordId {
+			get => _recordId;
+			set => _recordId = value;
+		}
+
+		public long LogPosition {
+			get => _logPosition;
+			set => _logPosition = value;
+		}
+	}
+
+	[StructLayout(LayoutKind.Explicit, Size = RecordHeader.RecordIdSize, Pack = 1)]
+	public struct StreamWriteId {
+		// ~300 trillion
+		public const long MaxStartingEventNumber = SixLeastSignificantBytes - 1;
+		public const long EventNumberDeletedStream = long.MaxValue;
+
+		[FieldOffset(0)] private ushort _topicNumber;
+		[FieldOffset(2)] private ushort _categoryNumber;
+		[FieldOffset(4)] private uint _streamNumber;
+		[FieldOffset(8)] private long _startingEventNumber;
+		[FieldOffset(14)] private ushort _parentTopicNumber;
+
+		public ushort ParentTopicNumber {
+			get => _parentTopicNumber;
+			set => _parentTopicNumber = value;
+		}
+
+		public ushort TopicNumber {
+			get => _topicNumber;
+			set => _topicNumber = value;
+		}
+
+		public ushort CategoryNumber {
+			get => _categoryNumber;
+			set => _categoryNumber = value;
+		}
+
+		public uint StreamNumber {
+			get => _streamNumber;
+			set => _streamNumber = value;
+		}
+
+		public long StartingEventNumber {
+			// little-endian. must not write the 2 MOST significant bytes
+			get {
+				var x = _startingEventNumber & SixLeastSignificantBytes;
+				return x == SixLeastSignificantBytes ? EventNumberDeletedStream : x;
+			}
+			set {
+				if (value == EventNumberDeletedStream) {
+					_startingEventNumber |= SixLeastSignificantBytes;
+					return;
+				}
+
+				if ((value | SixLeastSignificantBytes) != SixLeastSignificantBytes)
+					throw new ArgumentOutOfRangeException(nameof(value), value, null);
+				_startingEventNumber =
+					(TwoMostSignificantBytes & _startingEventNumber) |
+					value;
+			}
+		}
+	}
+
+	[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
+	public struct EpochHeader {
+		[FieldOffset(0)] private Guid _leaderInstanceId;
+		[FieldOffset(16)] private long _prevEpochPosition;
+		[FieldOffset(24)] private int _epochNumber;
+		public const int Size = 28;
+
+		public Guid LeaderInstanceId {
+			get => _leaderInstanceId;
+			set => _leaderInstanceId = value;
+		}
+
+		public long PrevEpochPosition {
+			get => _prevEpochPosition;
+			set => _prevEpochPosition = value;
+		}
+
+		public int EpochNumber {
+			get => _epochNumber;
+			set => _epochNumber = value;
+		}
+	}
+
+	[Flags]
+	public enum EventFlags : ushort {
+	}
+
+	[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
+	public struct EventHeader {
+		[FieldOffset(0)] private uint _eventTypeNumber;
+		[FieldOffset(4)] private int _eventSize;
+		[FieldOffset(8)] private int _systemMetadataSize;
+		[FieldOffset(12)] private int _dataSize;
+		[FieldOffset(16)] private EventFlags _flags;
+		public const int Size = 18;
+
+		public uint EventTypeNumber {
+			get => _eventTypeNumber;
+			set => _eventTypeNumber = value;
+		}
+
+		public EventFlags Flags {
+			get => _flags;
+			set => _flags = value;
+		}
+
+		public int EventSize {
+			get => _eventSize;
+			set => _eventSize = value;
+		}
+
+		public int SystemMetadataSize {
+			get => _systemMetadataSize;
+			set => _systemMetadataSize = value;
+		}
+
+		public int DataSize {
+			get => _dataSize;
+			set => _dataSize = value;
+		}
+	}
+
+	[Flags]
+	public enum PartitionFlags : ushort {
+	}
+
+	[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
+	public struct PartitionHeader {
+		[FieldOffset(0)] private Guid _partitionTypeId;
+		[FieldOffset(16)] private Guid _parentPartitionId;
+		[FieldOffset(32)] private PartitionFlags _flags;
+		[FieldOffset(34)] private ushort _referenceNumber;
+		public const int Size = 36;
+
+		public Guid PartitionTypeId {
+			get => _partitionTypeId;
+			set => _partitionTypeId = value;
+		}
+
+		public Guid ParentPartitionId {
+			get => _parentPartitionId;
+			set => _parentPartitionId = value;
+		}
+
+		public PartitionFlags Flags {
+			get => _flags;
+			set => _flags = value;
+		}
+
+		public ushort ReferenceNumber {
+			get => _referenceNumber;
+			set => _referenceNumber = value;
+		}
+	}
+
+	[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
+	public struct PartitionTypeHeader {
+		[FieldOffset(0)] private Guid _partitionId;
+		public const int Size = 16;
+
+		public Guid PartitionId {
+			get => _partitionId;
+			set => _partitionId = value;
+		}
+	}
+
+	[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
+	public struct StreamHeader {
+		[FieldOffset(0)] private Guid _partitionId;
+		[FieldOffset(16)] private Guid _streamTypeId;
+		[FieldOffset(32)] private uint _referenceNumber;
+		public const int Size = 36;
+
+		public Guid PartitionId {
+			get => _partitionId;
+			set => _partitionId = value;
+		}
+
+		public Guid StreamTypeId {
+			get => _streamTypeId;
+			set => _streamTypeId = value;
+		}
+
+		public uint ReferenceNumber {
+			get => _referenceNumber;
+			set => _referenceNumber = value;
+		}
+	}
+
+	[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
+	public struct StreamTypeHeader {
+		[FieldOffset(0)] private Guid _partitionId;
+		public const int Size = 16;
+
+		public Guid PartitionId {
+			get => _partitionId;
+			set => _partitionId = value;
+		}
+	}
+
+	[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
+	public struct EventTypeHeader {
+		[FieldOffset(0)] private Guid _parentEventTypeId;
+		[FieldOffset(16)] private Guid _partitionId;
+		[FieldOffset(32)] private uint _referenceNumber;
+		[FieldOffset(36)] private ushort _version;
+
+		public const int Size = 38;
+
+		public Guid ParentEventTypeId {
+			get => _parentEventTypeId;
+			set => _parentEventTypeId = value;
+		}
+
+		public Guid PartitionId {
+			get => _partitionId;
+			set => _partitionId = value;
+		}
+
+		public uint ReferenceNumber {
+			get => _referenceNumber;
+			set => _referenceNumber = value;
+		}
+
+		public ushort Version {
+			get => _version;
+			set => _version = value;
+		}
+	}
+
+	[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
+	public struct ContentTypeHeader {
+		[FieldOffset(0)] private Guid _partitionId;
+		[FieldOffset(16)] private ushort _referenceNumber;
+
+		public const int Size = 18;
+
+		public Guid PartitionId {
+			get => _partitionId;
+			set => _partitionId = value;
+		}
+
+		public ushort ReferenceNumber {
+			get => _referenceNumber;
+			set => _referenceNumber = value;
+		}
+	}
+
+	[Flags]
+	public enum StreamWriteFlags : ushort {
+	}
+
+	[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
+	public struct StreamWriteHeader {
+		[FieldOffset(0)] private StreamWriteFlags _flags;
+		[FieldOffset(2)] private short _count;
+		[FieldOffset(4)] private int _metadataSize;
+		public const int Size = 8;
+
+		public StreamWriteFlags Flags {
+			get => _flags;
+			set => _flags = value;
+		}
+
+		public short Count {
+			get => _count;
+			set => _count = value;
+		}
+
+		public int MetadataSize {
+			get => _metadataSize;
+			set => _metadataSize = value;
+		}
+	}
+
+	public enum TransactionStatus : byte {
+		Prepare = 0,
+		Committed = 1,
+		Failed = 2,
+		Removed = 3
+	}
+
+	public enum TransactionType : byte {
+		StandardWrite = 0,
+		MultipartTransaction = 1
+	}
+
+	[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
+	public struct TransactionStartHeader {
+		[FieldOffset(0)] private uint _recordCount;
+		[FieldOffset(4)] private TransactionStatus _status;
+		[FieldOffset(5)] private TransactionType _type;
+		public const int Size = 6;
+
+		public TransactionStatus Status {
+			get => _status;
+			set => _status = value;
+		}
+
+		public TransactionType Type {
+			get => _type;
+			set => _type = value;
+		}
+
+		public uint RecordCount {
+			get => _recordCount;
+			set => _recordCount = value;
+		}
+	}
+
+	[StructLayout(LayoutKind.Explicit, Size = Size, Pack = 1)]
+	public struct TransactionEndHeader {
+		[FieldOffset(0)] private uint _recordCount;
+		public const int Size = 4;
+
+		public uint RecordCount {
+			get => _recordCount;
+			set => _recordCount = value;
+		}
+	}
+}
diff --git a/src/KurrentDB.LogV3/ReadOnlyMemorySlicer.cs b/src/KurrentDB.LogV3/ReadOnlyMemorySlicer.cs
new file mode 100644
index 00000000000..604db74a01c
--- /dev/null
+++ b/src/KurrentDB.LogV3/ReadOnlyMemorySlicer.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.LogV3;
+
+public struct ReadOnlyMemorySlicer<T> {
+	public ReadOnlyMemory<T> Remaining { get; private set; }
+
+	public ReadOnlyMemorySlicer(ReadOnlyMemory<T> source) {
+		Remaining = source;
+	}
+
+	public ReadOnlyMemory<T> Slice(int length) {
+		var toReturn = Remaining[..length];
+		Remaining = Remaining[length..];
+		return toReturn;
+	}
+}
diff --git a/src/KurrentDB.LogV3/ReadOnlySlicedRecord.cs b/src/KurrentDB.LogV3/ReadOnlySlicedRecord.cs
new file mode 100644
index 00000000000..6d0de40d0aa
--- /dev/null
+++ b/src/KurrentDB.LogV3/ReadOnlySlicedRecord.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.LogV3;
+
+public struct ReadOnlySlicedRecord {
+	public ReadOnlyMemory<byte> Bytes { get; init; }
+	public ReadOnlyMemory<byte> HeaderMemory { get; init; }
+	public ReadOnlyMemory<byte> SubHeaderMemory { get; init; }
+	public ReadOnlyMemory<byte> PayloadMemory { get; init; }
+}
diff --git a/src/KurrentDB.LogV3/RecordCreator.cs b/src/KurrentDB.LogV3/RecordCreator.cs
new file mode 100644
index 00000000000..2c8fb355187
--- /dev/null
+++ b/src/KurrentDB.LogV3/RecordCreator.cs
@@ -0,0 +1,402 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+using System.Text.Unicode;
+using Google.Protobuf;
+using KurrentDB.LogCommon;
+
+namespace KurrentDB.LogV3;
+
+// Nice-to-use wrappers for creating and populating the raw structures.
+public static class RecordCreator {
+	// these exist to make the code more obviously correct
+	private static byte CurrentVersion(this ref Raw.EpochHeader _) => LogRecordVersion.LogRecordV1;
+	private static byte CurrentVersion(this ref Raw.PartitionHeader _) => LogRecordVersion.LogRecordV0;
+	private static byte CurrentVersion(this ref Raw.PartitionTypeHeader _) => LogRecordVersion.LogRecordV0;
+	private static byte CurrentVersion(this ref Raw.StreamHeader _) => LogRecordVersion.LogRecordV0;
+	private static byte CurrentVersion(this ref Raw.StreamTypeHeader _) => LogRecordVersion.LogRecordV0;
+	private static byte CurrentVersion(this ref Raw.StreamWriteHeader _) => LogRecordVersion.LogRecordV0;
+	private static byte CurrentVersion(this ref Raw.EventTypeHeader _) => LogRecordVersion.LogRecordV0;
+	private static byte CurrentVersion(this ref Raw.ContentTypeHeader _) => LogRecordVersion.LogRecordV0;
+	private static byte CurrentVersion(this ref Raw.TransactionStartHeader _) => LogRecordVersion.LogRecordV0;
+	private static byte CurrentVersion(this ref Raw.TransactionEndHeader _) => LogRecordVersion.LogRecordV0;
+
+	private static LogRecordType Type(this ref Raw.EpochHeader _) => LogRecordType.System;
+	private static LogRecordType Type(this ref Raw.PartitionHeader _) => LogRecordType.Partition;
+	private static LogRecordType Type(this ref Raw.PartitionTypeHeader _) => LogRecordType.PartitionType;
+	private static LogRecordType Type(this ref Raw.StreamHeader _) => LogRecordType.Stream;
+	private static LogRecordType Type(this ref Raw.StreamTypeHeader _) => LogRecordType.StreamType;
+	private static LogRecordType Type(this ref Raw.StreamWriteHeader _) => LogRecordType.StreamWrite;
+	private static LogRecordType Type(this ref Raw.EventTypeHeader _) => LogRecordType.EventType;
+	private static LogRecordType Type(this ref Raw.ContentTypeHeader _) => LogRecordType.ContentType;
+	private static LogRecordType Type(this ref Raw.TransactionStartHeader _) => LogRecordType.TransactionStart;
+	private static LogRecordType Type(this ref Raw.TransactionEndHeader _) => LogRecordType.TransactionEnd;
+
+	// todo: limit of 100 bytes when we know a good way to report the error to the client.
+	// throwing here will crash the writer.
+	const int MaxStringBytes = int.MaxValue;
+	public static void PopulateString(string str, Span<byte> target) {
+		Utf8.FromUtf16(str, target, out _, out var bytesWritten, true, true);
+		if (bytesWritten > MaxStringBytes)
+			throw new ArgumentException($"Name \"{str}\" is longer than {MaxStringBytes} bytes: {bytesWritten}");
+	}
+
+	private static readonly Encoding _utf8NoBom = new UTF8Encoding(
+		encoderShouldEmitUTF8Identifier: false,
+		throwOnInvalidBytes: true);
+
+	public static RecordView<Raw.EpochHeader> CreateEpochRecord(
+		DateTime timeStamp,
+		long logPosition,
+		int epochNumber,
+		Guid epochId,
+		long prevEpochPosition,
+		Guid leaderInstanceId) {
+
+		var record = MutableRecordView<Raw.EpochHeader>.Create(payloadLength: 0);
+		ref var header = ref record.Header;
+		ref var subHeader = ref record.SubHeader;
+
+		header.Type = subHeader.Type();
+		header.Version = subHeader.CurrentVersion();
+		header.TimeStamp = timeStamp;
+		header.RecordId = epochId;
+		header.LogPosition = logPosition;
+
+		subHeader.EpochNumber = epochNumber;
+		subHeader.LeaderInstanceId = leaderInstanceId;
+		subHeader.PrevEpochPosition = prevEpochPosition;
+
+		return record;
+	}
+
+	public static StringPayloadRecord<Raw.PartitionHeader> CreatePartitionRecord(
+		DateTime timeStamp,
+		long logPosition,
+		Guid partitionId,
+		Guid partitionTypeId,
+		Guid parentPartitionId,
+		Raw.PartitionFlags flags,
+		ushort referenceNumber,
+		string name) {
+
+		var payloadLength = _utf8NoBom.GetByteCount(name);
+		var record = MutableRecordView<Raw.PartitionHeader>.Create(payloadLength);
+		ref var header = ref record.Header;
+		ref var subHeader = ref record.SubHeader;
+
+		header.Type = subHeader.Type();
+		header.Version = subHeader.CurrentVersion();
+		header.TimeStamp = timeStamp;
+		header.RecordId = partitionId;
+		header.LogPosition = logPosition;
+
+		subHeader.PartitionTypeId = partitionTypeId;
+		subHeader.ParentPartitionId = parentPartitionId;
+		subHeader.Flags = flags;
+		subHeader.ReferenceNumber = referenceNumber;
+		PopulateString(name, record.Payload.Span);
+
+		return StringPayloadRecord.Create(record);
+	}
+
+	public static StringPayloadRecord<Raw.PartitionTypeHeader> CreatePartitionTypeRecord(
+		DateTime timeStamp,
+		long logPosition,
+		Guid partitionTypeId,
+		Guid partitionId,
+		string name) {
+
+		var payloadLength = _utf8NoBom.GetByteCount(name);
+		var record = MutableRecordView<Raw.PartitionTypeHeader>.Create(payloadLength);
+		ref var header = ref record.Header;
+		ref var subHeader = ref record.SubHeader;
+
+		header.Type = subHeader.Type();
+		header.Version = subHeader.CurrentVersion();
+		header.TimeStamp = timeStamp;
+		header.RecordId = partitionTypeId;
+		header.LogPosition = logPosition;
+
+		subHeader.PartitionId = partitionId;
+		PopulateString(name, record.Payload.Span);
+
+		return StringPayloadRecord.Create(record);
+	}
+
+	public static StringPayloadRecord<Raw.StreamHeader> CreateStreamRecord(
+		Guid streamId,
+		DateTime timeStamp,
+		long logPosition,
+		uint streamNumber,
+		string streamName,
+		Guid partitionId,
+		Guid streamTypeId) {
+
+		var payloadLength = _utf8NoBom.GetByteCount(streamName);
+		var record = MutableRecordView<Raw.StreamHeader>.Create(payloadLength);
+		ref var header = ref record.Header;
+		ref var subHeader = ref record.SubHeader;
+
+		header.RecordId = streamId;
+		header.Type = subHeader.Type();
+		header.Version = subHeader.CurrentVersion();
+		header.TimeStamp = timeStamp;
+		header.LogPosition = logPosition;
+
+		subHeader.PartitionId = partitionId;
+		subHeader.StreamTypeId = streamTypeId;
+		subHeader.ReferenceNumber = streamNumber;
+
+		PopulateString(streamName, record.Payload.Span);
+
+		return StringPayloadRecord.Create(record);
+	}
+
+	public static StringPayloadRecord<Raw.StreamTypeHeader> CreateStreamTypeRecord(
+		DateTime timeStamp,
+		long logPosition,
+		Guid streamTypeId,
+		Guid partitionId,
+		string name) {
+
+		var payloadLength = _utf8NoBom.GetByteCount(name);
+		var record = MutableRecordView<Raw.StreamTypeHeader>.Create(payloadLength);
+		ref var header = ref record.Header;
+		ref var subHeader = ref record.SubHeader;
+
+		header.Type = subHeader.Type();
+		header.Version = subHeader.CurrentVersion();
+		header.TimeStamp = timeStamp;
+		header.RecordId = streamTypeId;
+		header.LogPosition = logPosition;
+
+		subHeader.PartitionId = partitionId;
+		PopulateString(name, record.Payload.Span);
+
+		return StringPayloadRecord.Create(record);
+	}
+
+	public static StringPayloadRecord<Raw.EventTypeHeader> CreateEventTypeRecord(
+		DateTime timeStamp,
+		long logPosition,
+		Guid eventTypeId,
+		Guid parentEventTypeId,
+		Guid partitionId,
+		uint eventTypeNumber,
+		ushort eventTypeVersion,
+		string name) {
+
+		var payloadLength = _utf8NoBom.GetByteCount(name);
+		var record = MutableRecordView<Raw.EventTypeHeader>.Create(payloadLength);
+		ref var header = ref record.Header;
+		ref var subHeader = ref record.SubHeader;
+
+		header.Type = subHeader.Type();
+		header.Version = subHeader.CurrentVersion();
+		header.TimeStamp = timeStamp;
+		header.RecordId = eventTypeId;
+		header.LogPosition = logPosition;
+
+		subHeader.ParentEventTypeId = parentEventTypeId;
+		subHeader.PartitionId = partitionId;
+		subHeader.ReferenceNumber = eventTypeNumber;
+		subHeader.Version = eventTypeVersion;
+		PopulateString(name, record.Payload.Span);
+
+		return StringPayloadRecord.Create(record);
+	}
+
+	public static StringPayloadRecord<Raw.ContentTypeHeader> CreateContentTypeRecord(
+		DateTime timeStamp,
+		long logPosition,
+		Guid contentTypeId,
+		Guid partitionId,
+		ushort referenceNumber,
+		string name) {
+
+		var payloadLength = _utf8NoBom.GetByteCount(name);
+		var record = MutableRecordView<Raw.ContentTypeHeader>.Create(payloadLength);
+		ref var header = ref record.Header;
+		ref var subHeader = ref record.SubHeader;
+
+		header.Type = subHeader.Type();
+		header.Version = subHeader.CurrentVersion();
+		header.TimeStamp = timeStamp;
+		header.RecordId = contentTypeId;
+		header.LogPosition = logPosition;
+
+		subHeader.PartitionId = partitionId;
+		subHeader.ReferenceNumber = referenceNumber;
+		PopulateString(name, record.Payload.Span);
+
+		return StringPayloadRecord.Create(record);
+	}
+
+	public static StreamWriteRecord CreateStreamWriteRecordForSingleEvent(
+		DateTime timeStamp,
+		Guid correlationId,
+		long logPosition,
+		long transactionPosition,
+		int transactionOffset,
+		long streamNumber,
+		long startingEventNumber,
+		Guid eventId,
+		uint eventTypeNumber,
+		ReadOnlySpan<byte> eventData,
+		ReadOnlySpan<byte> eventMetadata,
+		Raw.EventFlags eventFlags) {
+
+		var writeSystemMetadata = new StreamWriteSystemMetadata {
+			CorrelationId = correlationId,
+			TransactionPosition = transactionPosition,
+			TransactionOffset = transactionOffset,
+			StartingEventNumberRoot = 0,
+			StartingEventNumberCategory = 0,
+		};
+
+		var eventSystemMetadata = new EventSystemMetadata {
+			EventId = eventId,
+		};
+
+		var writeSystemMetadataSize = writeSystemMetadata.CalculateSize();
+		var eventSystemMetadataSize = eventSystemMetadata.CalculateSize();
+
+		var payloadLength = MeasureWritePayload(
+			recordMetadataSize: writeSystemMetadataSize,
+			eventSystemMetadataSize: eventSystemMetadataSize,
+			userData: eventData,
+			userMetadata: eventMetadata);
+
+		var record = MutableRecordView<Raw.StreamWriteHeader>.Create(payloadLength);
+		ref var header = ref record.Header;
+		ref var recordId = ref record.RecordId<Raw.StreamWriteId>();
+		ref var subHeader = ref record.SubHeader;
+
+		header.Type = subHeader.Type();
+		header.Version = subHeader.CurrentVersion();
+		header.TimeStamp = timeStamp;
+		header.LogPosition = logPosition;
+
+		recordId.ParentTopicNumber = 0;
+		recordId.TopicNumber = 0;
+		recordId.CategoryNumber = 0;
+		recordId.StreamNumber = (uint)streamNumber; // todo: remove cast
+		recordId.StartingEventNumber = startingEventNumber;
+
+		subHeader.Count = 1;
+		subHeader.Flags = 0;
+		subHeader.MetadataSize = writeSystemMetadataSize;
+
+		var slicer = record.Payload.Slicer();
+		writeSystemMetadata.WriteTo(slicer.Slice(subHeader.MetadataSize).Span);
+
+		PopulateEventSubRecord(
+			eventTypeNumber: eventTypeNumber,
+			flags: eventFlags,
+			systemMetadataSize: eventSystemMetadataSize,
+			systemMetadata: eventSystemMetadata,
+			data: eventData,
+			metadata: eventMetadata,
+			target: slicer.Remaining);
+
+		return new StreamWriteRecord(record);
+
+		static int MeasureWritePayload(
+			int recordMetadataSize,
+			int eventSystemMetadataSize,
+			ReadOnlySpan<byte> userData,
+			ReadOnlySpan<byte> userMetadata) {
+
+			var result =
+				recordMetadataSize +
+				MeasureForEventSubRecord(
+					systemMetadataSize: eventSystemMetadataSize,
+					data: userData,
+					metadata: userMetadata);
+			return result;
+		}
+
+		static int MeasureForEventSubRecord(
+			int systemMetadataSize,
+			ReadOnlySpan<byte> data,
+			ReadOnlySpan<byte> metadata) {
+
+			return
+				Raw.EventHeader.Size +
+				systemMetadataSize +
+				data.Length +
+				metadata.Length;
+		}
+
+		static void PopulateEventSubRecord(
+			uint eventTypeNumber,
+			Raw.EventFlags flags,
+			int systemMetadataSize,
+			EventSystemMetadata systemMetadata,
+			ReadOnlySpan<byte> data,
+			ReadOnlySpan<byte> metadata,
+			Memory<byte> target) {
+
+			var slicer = target.Slicer();
+			ref var header = ref slicer.SliceAs<Raw.EventHeader>();
+			header.EventTypeNumber = eventTypeNumber;
+			header.Flags = flags;
+			header.EventSize = MeasureForEventSubRecord(systemMetadataSize, data, metadata);
+			header.SystemMetadataSize = systemMetadataSize;
+			header.DataSize = data.Length;
+
+			systemMetadata.WriteTo(slicer.Slice(systemMetadataSize).Span);
+			data.CopyTo(slicer.Slice(header.DataSize).Span);
+			metadata.CopyTo(slicer.Remaining.Span);
+		}
+	}
+
+	public static RecordView<Raw.TransactionStartHeader> CreateTransactionStartRecord(
+		DateTime timeStamp,
+		long logPosition,
+		Guid transactionId,
+		Raw.TransactionStatus status,
+		Raw.TransactionType type,
+		uint recordCount) {
+
+		var record = MutableRecordView<Raw.TransactionStartHeader>.Create(payloadLength: 0);
+		ref var header = ref record.Header;
+		ref var subHeader = ref record.SubHeader;
+
+		header.Type = subHeader.Type();
+		header.Version = subHeader.CurrentVersion();
+		header.TimeStamp = timeStamp;
+		header.RecordId = transactionId;
+		header.LogPosition = logPosition;
+
+		subHeader.Status = status;
+		subHeader.Type = type;
+		subHeader.RecordCount = recordCount;
+
+		return record;
+	}
+
+	public static RecordView<Raw.TransactionEndHeader> CreateTransactionEndRecord(
+		DateTime timeStamp,
+		long logPosition,
+		Guid transactionId,
+		uint recordCount) {
+
+		var record = MutableRecordView<Raw.TransactionEndHeader>.Create(payloadLength: 0);
+		ref var header = ref record.Header;
+		ref var subHeader = ref record.SubHeader;
+
+		header.Type = subHeader.Type();
+		header.Version = subHeader.CurrentVersion();
+		header.TimeStamp = timeStamp;
+		header.RecordId = transactionId;
+		header.LogPosition = logPosition;
+
+		subHeader.RecordCount = recordCount;
+
+		return record;
+	}
+}
diff --git a/src/KurrentDB.LogV3/RecordView.cs b/src/KurrentDB.LogV3/RecordView.cs
new file mode 100644
index 00000000000..e99901814e2
--- /dev/null
+++ b/src/KurrentDB.LogV3/RecordView.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace KurrentDB.LogV3;
+
+public interface IRecordView {
+	ReadOnlyMemory<byte> Bytes { get; }
+	ref readonly Raw.RecordHeader Header { get; }
+	ReadOnlyMemory<byte> Payload { get; }
+}
+
+// Immutable, generic, view of a record
+public struct RecordView<TSubHeader> : IRecordView where TSubHeader : unmanaged {
+	private readonly ReadOnlySlicedRecord _sliced;
+
+	public ReadOnlyMemory<byte> Bytes => _sliced.Bytes;
+	public ref readonly Raw.RecordHeader Header => ref MemoryMarshal.AsRef<Raw.RecordHeader>(_sliced.HeaderMemory.Span);
+	public ref readonly T RecordId<T>() where T : unmanaged =>
+		ref MemoryMarshal.AsRef<T>(_sliced.HeaderMemory[Raw.RecordHeader.RecordIdOffset..].Span);
+	public ref readonly TSubHeader SubHeader => ref MemoryMarshal.AsRef<TSubHeader>(_sliced.SubHeaderMemory.Span);
+	public ReadOnlyMemory<byte> Payload => _sliced.PayloadMemory;
+	public int PayloadOffset => _sliced.HeaderMemory.Length + _sliced.SubHeaderMemory.Length;
+
+	public RecordView(ReadOnlyMemory<byte> bytes) {
+		_sliced = SlicedRecordCreator<TSubHeader>.Create(bytes);
+	}
+}
diff --git a/src/KurrentDB.LogV3/SlicedRecord.cs b/src/KurrentDB.LogV3/SlicedRecord.cs
new file mode 100644
index 00000000000..7fa35859daf
--- /dev/null
+++ b/src/KurrentDB.LogV3/SlicedRecord.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.LogV3;
+
+public struct SlicedRecord {
+	// todo: measure tradeoff between splitting these out on construction as we are
+	// (=> larger struct to copy around) vs getting rid of this struct and just
+	// splitting in the getters of the record
+	// (=> smaller struct but probably repeated bounds checks)
+	public Memory<byte> Bytes { get; init; }
+	public Memory<byte> HeaderMemory { get; init; }
+	public Memory<byte> SubHeaderMemory { get; init; }
+	public Memory<byte> PayloadMemory { get; init; }
+}
diff --git a/src/KurrentDB.LogV3/SlicedRecordCreator.cs b/src/KurrentDB.LogV3/SlicedRecordCreator.cs
new file mode 100644
index 00000000000..aab7f01e3ba
--- /dev/null
+++ b/src/KurrentDB.LogV3/SlicedRecordCreator.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.LogV3;
+
+// This class slices bytes up according to the headers in the desired record
+// It exists to keep the logic between the readonly/normal versions in the same place.
+public static class SlicedRecordCreator<TSubHeader> where TSubHeader : unmanaged {
+	public static SlicedRecord Create(Memory<byte> bytes) {
+		var slicer = bytes.Slicer();
+		return new SlicedRecord {
+			Bytes = slicer.Remaining,
+			HeaderMemory = slicer.Slice(Raw.RecordHeader.Size),
+			SubHeaderMemory = slicer.Slice<TSubHeader>(),
+			PayloadMemory = slicer.Remaining,
+		};
+	}
+
+	public static ReadOnlySlicedRecord Create(ReadOnlyMemory<byte> bytes) {
+		var slicer = bytes.Slicer();
+		return new ReadOnlySlicedRecord {
+			Bytes = slicer.Remaining,
+			HeaderMemory = slicer.Slice(Raw.RecordHeader.Size),
+			SubHeaderMemory = slicer.Slice<TSubHeader>(),
+			PayloadMemory = slicer.Remaining,
+		};
+	}
+}
diff --git a/src/KurrentDB.LogV3/SlicerExtensions.cs b/src/KurrentDB.LogV3/SlicerExtensions.cs
new file mode 100644
index 00000000000..07add943065
--- /dev/null
+++ b/src/KurrentDB.LogV3/SlicerExtensions.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace KurrentDB.LogV3;
+
+public static class SlicerExtensions {
+	public static ref T SliceAs<T>(this ref MemorySlicer<byte> slicer) where T : unmanaged =>
+		ref MemoryMarshal.AsRef<T>(slicer.Slice<T>().Span);
+
+	public unsafe static Memory<byte> Slice<T>(this ref MemorySlicer<byte> slicer) where T : unmanaged =>
+		slicer.Slice(sizeof(T));
+
+	public static ref readonly T SliceAs<T>(this ref ReadOnlyMemorySlicer<byte> slicer) where T : unmanaged =>
+		ref MemoryMarshal.AsRef<T>(slicer.Slice<T>().Span);
+
+	public unsafe static ReadOnlyMemory<byte> Slice<T>(this ref ReadOnlyMemorySlicer<byte> slicer) where T : unmanaged =>
+		slicer.Slice(sizeof(T));
+}
diff --git a/src/KurrentDB.LogV3/StreamWriteRecord.cs b/src/KurrentDB.LogV3/StreamWriteRecord.cs
new file mode 100644
index 00000000000..ea8f3282930
--- /dev/null
+++ b/src/KurrentDB.LogV3/StreamWriteRecord.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Buffers;
+using System.Runtime.InteropServices;
+
+namespace KurrentDB.LogV3;
+
+// View of a stream write record
+// interprets the payload
+public struct StreamWriteRecord : IRecordView {
+	private readonly ReadOnlyMemory<byte> _event;
+
+	public ReadOnlyMemory<byte> Bytes => Record.Bytes;
+	public RecordView<Raw.StreamWriteHeader> Record { get; }
+	public ref readonly Raw.RecordHeader Header => ref Record.Header;
+	public ref readonly Raw.StreamWriteId WriteId => ref Record.RecordId<Raw.StreamWriteId>();
+	public ref readonly Raw.StreamWriteHeader SubHeader => ref Record.SubHeader;
+	public ReadOnlyMemory<byte> Payload => Record.Payload;
+	public StreamWriteSystemMetadata SystemMetadata { get; }
+
+	public StreamWriteRecord(RecordView<Raw.StreamWriteHeader> record) {
+		Record = record;
+
+		var slicer = Record.Payload.Slicer();
+		var systemMetadata = slicer.Slice(Record.SubHeader.MetadataSize);
+		_event = slicer.Remaining;
+
+		SystemMetadata = StreamWriteSystemMetadata.Parser.ParseFrom(new ReadOnlySequence<byte>(systemMetadata));
+	}
+
+	public EventRecord Event {
+		get {
+			var slicer = _event.Slicer();
+			ref readonly var eventHeader = ref MemoryMarshal.AsRef<Raw.EventHeader>(slicer.Remaining.Span);
+			var eventBytes = slicer.Slice(eventHeader.EventSize);
+			return new EventRecord(eventBytes);
+		}
+	}
+}
diff --git a/src/KurrentDB.LogV3/StringPayloadRecord.cs b/src/KurrentDB.LogV3/StringPayloadRecord.cs
new file mode 100644
index 00000000000..39c37fd8066
--- /dev/null
+++ b/src/KurrentDB.LogV3/StringPayloadRecord.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+
+namespace KurrentDB.LogV3;
+
+// Several records have a payload which is a dynamically sized string
+public struct StringPayloadRecord {
+	public static StringPayloadRecord<TSubHeader> Create<TSubHeader>(RecordView<TSubHeader> record)
+		where TSubHeader : unmanaged =>
+		new(record);
+
+	public static StringPayloadRecord<TSubHeader> Create<TSubHeader>(MutableRecordView<TSubHeader> record)
+		where TSubHeader : unmanaged =>
+		new(record);
+}
+
+public struct StringPayloadRecord<TSubHeader> : IRecordView where TSubHeader : unmanaged {
+	public ReadOnlyMemory<byte> Bytes => Record.Bytes;
+	public RecordView<TSubHeader> Record { get; }
+
+	public ref readonly Raw.RecordHeader Header => ref Record.Header;
+	public ref readonly TSubHeader SubHeader => ref Record.SubHeader;
+	public ReadOnlyMemory<byte> Payload => Record.Payload;
+	public string StringPayload => Encoding.UTF8.GetString(Record.Payload.Span);
+
+	public StringPayloadRecord(RecordView<TSubHeader> record) {
+		Record = record;
+	}
+}
diff --git a/src/KurrentDB.MicroBenchmarks/KurrentDB.MicroBenchmarks.csproj b/src/KurrentDB.MicroBenchmarks/KurrentDB.MicroBenchmarks.csproj
new file mode 100644
index 00000000000..9c985894e64
--- /dev/null
+++ b/src/KurrentDB.MicroBenchmarks/KurrentDB.MicroBenchmarks.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.Projections.Core.Tests\KurrentDB.Projections.Core.Tests.csproj" />
+		<ProjectReference Include="..\KurrentDB.Projections.Core\KurrentDB.Projections.Core.csproj" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.MicroBenchmarks/Program.cs b/src/KurrentDB.MicroBenchmarks/Program.cs
new file mode 100644
index 00000000000..c01b57fa657
--- /dev/null
+++ b/src/KurrentDB.MicroBenchmarks/Program.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Configs;
+using BenchmarkDotNet.Running;
+using Jint;
+using Jint.Native;
+using Jint.Native.Json;
+using KurrentDB.Projections.Core.Services.Interpreted;
+using KurrentDB.Projections.Core.Tests.Services.Jint.Serialization;
+
+namespace KurrentDB.MicroBenchmarks;
+
+internal class Program {
+	static void Main(string[] args) {
+		var config = Debugger.IsAttached ? new DebugBuildConfig() { } : DefaultConfig.Instance;
+		BenchmarkRunner.Run<ProjectionSerializationBenchmarks>(config, args);
+	}
+}
+
+[MemoryDiagnoser]
+public class ProjectionSerializationBenchmarks {
+	private JsonSerializer _builtIn;
+	private JintProjectionStateHandler _handler;
+	private JsValue _stateInstance;
+
+	public ProjectionSerializationBenchmarks() {
+		var json = when_serializing_state.ReadJsonFromFile("big_state.json");
+
+		var engine = new Engine();
+		var parser = new JsonParser(engine);
+		_builtIn = new JsonSerializer(engine);
+		_handler = new JintProjectionStateHandler("", false, TimeSpan.FromMilliseconds(500), TimeSpan.FromMilliseconds(500));
+
+		_stateInstance = parser.Parse(json);
+
+	}
+
+	[Benchmark(Baseline = true)]
+	public void JintSerializer() {
+		var s = _builtIn.Serialize(_stateInstance, JsValue.Undefined, JsValue.Undefined).AsString();
+		if (string.IsNullOrEmpty(s))
+			throw new Exception("something went wrong");
+	}
+
+	[Benchmark]
+	public void CustomSerializer() {
+		var s = _handler.Serialize(_stateInstance);
+		if (string.IsNullOrEmpty(s))
+			throw new Exception("something went wrong");
+	}
+
+}
diff --git a/src/EventStore.NETCore.Compatibility/EventStore.NETCore.Compatibility.csproj b/src/KurrentDB.NETCore.Compatibility/KurrentDB.NETCore.Compatibility.csproj
similarity index 100%
rename from src/EventStore.NETCore.Compatibility/EventStore.NETCore.Compatibility.csproj
rename to src/KurrentDB.NETCore.Compatibility/KurrentDB.NETCore.Compatibility.csproj
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/Collections/ObjectModel/FreezableCollection.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/Collections/ObjectModel/FreezableCollection.cs
new file mode 100644
index 00000000000..c2ca805eabb
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/Collections/ObjectModel/FreezableCollection.cs
@@ -0,0 +1,64 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+namespace System.Collections.ObjectModel;
+
+using System;
+using System.Collections.Generic;
+using System.ServiceModel;
+
+class FreezableCollection<T> : Collection<T>, ICollection<T> {
+	bool frozen;
+
+	public FreezableCollection()
+		: base() {
+	}
+
+	public FreezableCollection(IList<T> list)
+		: base(list) {
+	}
+
+	public bool IsFrozen {
+		get {
+			return this.frozen;
+		}
+	}
+
+	bool ICollection<T>.IsReadOnly {
+		get {
+			return this.frozen;
+		}
+	}
+
+	public void Freeze() {
+		this.frozen = true;
+	}
+
+	protected override void ClearItems() {
+		ThrowIfFrozen();
+		base.ClearItems();
+	}
+
+	protected override void InsertItem(int index, T item) {
+		ThrowIfFrozen();
+		base.InsertItem(index, item);
+	}
+
+	protected override void RemoveItem(int index) {
+		ThrowIfFrozen();
+		base.RemoveItem(index);
+	}
+
+	protected override void SetItem(int index, T item) {
+		ThrowIfFrozen();
+		base.SetItem(index, item);
+	}
+
+	void ThrowIfFrozen() {
+		if (this.frozen) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.ObjectIsReadOnly));
+		}
+	}
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplate.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplate.cs
new file mode 100644
index 00000000000..b3cbc7163ee
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplate.cs
@@ -0,0 +1,1367 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+namespace System;
+
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Globalization;
+using System.Runtime;
+using System.Runtime.CompilerServices;
+using System.ServiceModel;
+using System.Text;
+using System.Threading;
+
+[TypeForwardedFrom("System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")]
+public class UriTemplate {
+	internal readonly int firstOptionalSegment;
+
+	internal readonly string originalTemplate;
+	internal readonly Dictionary<string, UriTemplateQueryValue> queries; // keys are original case specified in UriTemplate constructor, dictionary ignores case
+	internal readonly List<UriTemplatePathSegment> segments;
+	internal const string WildcardPath = "*";
+	readonly Dictionary<string, string> additionalDefaults; // keys are original case specified in UriTemplate constructor, dictionary ignores case
+	readonly string fragment;
+
+	readonly bool ignoreTrailingSlash;
+
+	const string NullableDefault = "null";
+	readonly WildcardInfo wildcard;
+	IDictionary<string, string> defaults;
+	ConcurrentDictionary<string, string> unescapedDefaults;
+
+	VariablesCollection variables;
+
+	// constructors validates that template is well-formed
+	public UriTemplate(string template)
+		: this(template, false) {
+	}
+	public UriTemplate(string template, bool ignoreTrailingSlash)
+		: this(template, ignoreTrailingSlash, null) {
+	}
+	public UriTemplate(string template, IDictionary<string, string> additionalDefaults)
+		: this(template, false, additionalDefaults) {
+	}
+	public UriTemplate(string template, bool ignoreTrailingSlash, IDictionary<string, string> additionalDefaults) {
+		if (template == null) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("template");
+		}
+		this.originalTemplate = template;
+		this.ignoreTrailingSlash = ignoreTrailingSlash;
+		this.segments = new List<UriTemplatePathSegment>();
+		this.queries = new Dictionary<string, UriTemplateQueryValue>(StringComparer.OrdinalIgnoreCase);
+
+		// parse it
+		string pathTemplate;
+		string queryTemplate;
+		// ignore a leading slash
+		if (template.StartsWith("/", StringComparison.Ordinal)) {
+			template = template.Substring(1);
+		}
+		// pull out fragment
+		int fragmentStart = template.IndexOf('#');
+		if (fragmentStart == -1) {
+			this.fragment = "";
+		} else {
+			this.fragment = template.Substring(fragmentStart + 1);
+			template = template.Substring(0, fragmentStart);
+		}
+		// pull out path and query
+		int queryStart = template.IndexOf('?');
+		if (queryStart == -1) {
+			queryTemplate = string.Empty;
+			pathTemplate = template;
+		} else {
+			queryTemplate = template.Substring(queryStart + 1);
+			pathTemplate = template.Substring(0, queryStart);
+		}
+		template = null; // to ensure we don't accidentally reference this variable any more
+
+		// setup path template and validate
+		if (!string.IsNullOrEmpty(pathTemplate)) {
+			int startIndex = 0;
+			while (startIndex < pathTemplate.Length) {
+				// Identify the next segment
+				int endIndex = pathTemplate.IndexOf('/', startIndex);
+				string segment;
+				if (endIndex != -1) {
+					segment = pathTemplate.Substring(startIndex, endIndex + 1 - startIndex);
+					startIndex = endIndex + 1;
+				} else {
+					segment = pathTemplate.Substring(startIndex);
+					startIndex = pathTemplate.Length;
+				}
+				// Checking for wildcard segment ("*") or ("{*<var name>}")
+				UriTemplatePartType wildcardType;
+				if ((startIndex == pathTemplate.Length) &&
+					UriTemplateHelpers.IsWildcardSegment(segment, out wildcardType)) {
+					switch (wildcardType) {
+						case UriTemplatePartType.Literal:
+							this.wildcard = new WildcardInfo(this);
+							break;
+
+						case UriTemplatePartType.Variable:
+							this.wildcard = new WildcardInfo(this, segment);
+							break;
+
+						default:
+							Fx.Assert("Error in identifying the type of the wildcard segment");
+							break;
+					}
+				} else {
+					this.segments.Add(UriTemplatePathSegment.CreateFromUriTemplate(segment, this));
+				}
+			}
+		}
+
+		// setup query template and validate
+		if (!string.IsNullOrEmpty(queryTemplate)) {
+			int startIndex = 0;
+			while (startIndex < queryTemplate.Length) {
+				// Identify the next query part
+				int endIndex = queryTemplate.IndexOf('&', startIndex);
+				int queryPartStart = startIndex;
+				int queryPartEnd;
+				if (endIndex != -1) {
+					queryPartEnd = endIndex;
+					startIndex = endIndex + 1;
+					if (startIndex >= queryTemplate.Length) {
+						throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
+							SR.UTQueryCannotEndInAmpersand, this.originalTemplate)));
+					}
+				} else {
+					queryPartEnd = queryTemplate.Length;
+					startIndex = queryTemplate.Length;
+				}
+				// Checking query part type; identifying key and value
+				int equalSignIndex = queryTemplate.IndexOf('=', queryPartStart, queryPartEnd - queryPartStart);
+				string key;
+				string value;
+				if (equalSignIndex >= 0) {
+					key = queryTemplate.Substring(queryPartStart, equalSignIndex - queryPartStart);
+					value = queryTemplate.Substring(equalSignIndex + 1, queryPartEnd - equalSignIndex - 1);
+				} else {
+					key = queryTemplate.Substring(queryPartStart, queryPartEnd - queryPartStart);
+					value = null;
+				}
+				if (string.IsNullOrEmpty(key)) {
+					throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
+						SR.UTQueryCannotHaveEmptyName, this.originalTemplate)));
+				}
+				if (UriTemplateHelpers.IdentifyPartType(key) != UriTemplatePartType.Literal) {
+					throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("template", SR.GetString(
+						SR.UTQueryMustHaveLiteralNames, this.originalTemplate));
+				}
+				// Adding a new entry to the queries dictionary
+				key = UrlUtility.UrlDecode(key, Encoding.UTF8);
+				if (this.queries.ContainsKey(key)) {
+					throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
+						SR.UTQueryNamesMustBeUnique, this.originalTemplate)));
+				}
+				this.queries.Add(key, UriTemplateQueryValue.CreateFromUriTemplate(value, this));
+			}
+		}
+
+		// Process additional defaults (if has some) :
+		if (additionalDefaults != null) {
+			if (this.variables == null) {
+				if (additionalDefaults.Count > 0) {
+					this.additionalDefaults = new Dictionary<string, string>(additionalDefaults, StringComparer.OrdinalIgnoreCase);
+				}
+			} else {
+				foreach (KeyValuePair<string, string> kvp in additionalDefaults) {
+					string uppercaseKey = kvp.Key.ToUpperInvariant();
+					if ((this.variables.DefaultValues != null) && this.variables.DefaultValues.ContainsKey(uppercaseKey)) {
+						throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("additionalDefaults",
+							SR.GetString(SR.UTAdditionalDefaultIsInvalid, kvp.Key, this.originalTemplate));
+					}
+					if (this.variables.PathSegmentVariableNames.Contains(uppercaseKey)) {
+						this.variables.AddDefaultValue(uppercaseKey, kvp.Value);
+					} else if (this.variables.QueryValueVariableNames.Contains(uppercaseKey)) {
+						throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
+							SR.GetString(SR.UTDefaultValueToQueryVarFromAdditionalDefaults, this.originalTemplate,
+							uppercaseKey)));
+					} else if (string.Compare(kvp.Value, UriTemplate.NullableDefault, StringComparison.OrdinalIgnoreCase) == 0) {
+						throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
+							SR.GetString(SR.UTNullableDefaultAtAdditionalDefaults, this.originalTemplate,
+							uppercaseKey)));
+					} else {
+						if (this.additionalDefaults == null) {
+							this.additionalDefaults = new Dictionary<string, string>(additionalDefaults.Count, StringComparer.OrdinalIgnoreCase);
+						}
+						this.additionalDefaults.Add(kvp.Key, kvp.Value);
+					}
+				}
+			}
+		}
+
+		// Validate defaults (if should)
+		if ((this.variables != null) && (this.variables.DefaultValues != null)) {
+			this.variables.ValidateDefaults(out this.firstOptionalSegment);
+		} else {
+			this.firstOptionalSegment = this.segments.Count;
+		}
+	}
+
+	public IDictionary<string, string> Defaults {
+		get {
+			if (this.defaults == null) {
+				Interlocked.CompareExchange<IDictionary<string, string>>(ref this.defaults, new UriTemplateDefaults(this), null);
+			}
+			return this.defaults;
+		}
+	}
+	public bool IgnoreTrailingSlash {
+		get {
+			return this.ignoreTrailingSlash;
+		}
+	}
+	public ReadOnlyCollection<string> PathSegmentVariableNames {
+		get {
+			if (this.variables == null) {
+				return VariablesCollection.EmptyCollection;
+			} else {
+				return this.variables.PathSegmentVariableNames;
+			}
+		}
+	}
+	public ReadOnlyCollection<string> QueryValueVariableNames {
+		get {
+			if (this.variables == null) {
+				return VariablesCollection.EmptyCollection;
+			} else {
+				return this.variables.QueryValueVariableNames;
+			}
+		}
+	}
+
+	internal bool HasNoVariables {
+		get {
+			return (this.variables == null);
+		}
+	}
+	internal bool HasWildcard {
+		get {
+			return (this.wildcard != null);
+		}
+	}
+
+	// make a Uri by subbing in the values, throw on bad input
+	public Uri BindByName(Uri baseAddress, IDictionary<string, string> parameters) {
+		return BindByName(baseAddress, parameters, false);
+	}
+	public Uri BindByName(Uri baseAddress, IDictionary<string, string> parameters, bool omitDefaults) {
+		if (baseAddress == null) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("baseAddress");
+		}
+		if (!baseAddress.IsAbsoluteUri) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("baseAddress", SR.GetString(
+				SR.UTBadBaseAddress));
+		}
+
+		BindInformation bindInfo;
+		if (this.variables == null) {
+			bindInfo = PrepareBindInformation(parameters, omitDefaults);
+		} else {
+			bindInfo = this.variables.PrepareBindInformation(parameters, omitDefaults);
+		}
+		return Bind(baseAddress, bindInfo, omitDefaults);
+	}
+	public Uri BindByName(Uri baseAddress, NameValueCollection parameters) {
+		return BindByName(baseAddress, parameters, false);
+	}
+	public Uri BindByName(Uri baseAddress, NameValueCollection parameters, bool omitDefaults) {
+		if (baseAddress == null) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("baseAddress");
+		}
+		if (!baseAddress.IsAbsoluteUri) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("baseAddress", SR.GetString(
+				SR.UTBadBaseAddress));
+		}
+
+		BindInformation bindInfo;
+		if (this.variables == null) {
+			bindInfo = PrepareBindInformation(parameters, omitDefaults);
+		} else {
+			bindInfo = this.variables.PrepareBindInformation(parameters, omitDefaults);
+		}
+		return Bind(baseAddress, bindInfo, omitDefaults);
+	}
+	public Uri BindByPosition(Uri baseAddress, params string[] values) {
+		if (baseAddress == null) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("baseAddress");
+		}
+		if (!baseAddress.IsAbsoluteUri) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("baseAddress", SR.GetString(
+				SR.UTBadBaseAddress));
+		}
+
+		BindInformation bindInfo;
+		if (this.variables == null) {
+			if (values.Length > 0) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(SR.GetString(
+					SR.UTBindByPositionNoVariables, this.originalTemplate, values.Length)));
+			}
+			bindInfo = new BindInformation(this.additionalDefaults);
+		} else {
+			bindInfo = this.variables.PrepareBindInformation(values);
+		}
+		return Bind(baseAddress, bindInfo, false);
+	}
+
+	// A note about UriTemplate equivalency:
+	//  The introduction of defaults and, more over, terminal defaults, broke the simple
+	//  intuative notion of equivalency between templates. We will define equivalent
+	//  templates as such based on the structure of them and not based on the set of uri
+	//  that are matched by them. The result is that, even though they do not match the
+	//  same set of uri's, the following templates are equivalent:
+	//      - "/foo/{bar}"
+	//      - "/foo/{bar=xyz}"
+	//  A direct result from the support for 'terminal defaults' is that the IsPathEquivalentTo
+	//  method, which was used both to determine the equivalence between templates, as 
+	//  well as verify that all the templates, combined together in the same PathEquivalentSet, 
+	//  are equivalent in thier path is no longer valid for both purposes. We will break 
+	//  it to two distinct methods, each will be called in a different case.
+	public bool IsEquivalentTo(UriTemplate other) {
+		if (other == null) {
+			return false;
+		}
+		if (other.segments == null || other.queries == null) {
+			// they never are null, but PreSharp is complaining, 
+			// and warning suppression isn't working
+			return false;
+		}
+		if (!IsPathFullyEquivalent(other)) {
+			return false;
+		}
+		if (!IsQueryEquivalent(other)) {
+			return false;
+		}
+		Fx.Assert(UriTemplateEquivalenceComparer.Instance.GetHashCode(this) == UriTemplateEquivalenceComparer.Instance.GetHashCode(other), "bad GetHashCode impl");
+		return true;
+	}
+
+	public UriTemplateMatch Match(Uri baseAddress, Uri candidate) {
+		if (baseAddress == null) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("baseAddress");
+		}
+		if (!baseAddress.IsAbsoluteUri) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("baseAddress", SR.GetString(
+				SR.UTBadBaseAddress));
+		}
+		if (candidate == null) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("candidate");
+		}
+
+		// ensure that the candidate is 'under' the base address
+		if (!candidate.IsAbsoluteUri) {
+			return null;
+		}
+		string basePath = UriTemplateHelpers.GetUriPath(baseAddress);
+		string candidatePath = UriTemplateHelpers.GetUriPath(candidate);
+		if (candidatePath.Length < basePath.Length) {
+			return null;
+		}
+		if (!candidatePath.StartsWith(basePath, StringComparison.OrdinalIgnoreCase)) {
+			return null;
+		}
+
+		// Identifying the relative segments \ checking matching to the path :
+		int numSegmentsInBaseAddress = baseAddress.Segments.Length;
+		string[] candidateSegments = candidate.Segments;
+		int numMatchedSegments;
+		Collection<string> relativeCandidateSegments;
+		if (!IsCandidatePathMatch(numSegmentsInBaseAddress, candidateSegments,
+			out numMatchedSegments, out relativeCandidateSegments)) {
+			return null;
+		}
+		// Checking matching to the query (if should) :
+		NameValueCollection candidateQuery = null;
+		if (!UriTemplateHelpers.CanMatchQueryTrivially(this)) {
+			candidateQuery = UriTemplateHelpers.ParseQueryString(candidate.Query);
+			if (!UriTemplateHelpers.CanMatchQueryInterestingly(this, candidateQuery, false)) {
+				return null;
+			}
+		}
+
+		// We matched; lets build the UriTemplateMatch
+		return CreateUriTemplateMatch(baseAddress, candidate, null, numMatchedSegments,
+			relativeCandidateSegments, candidateQuery);
+	}
+
+	public override string ToString() {
+		return this.originalTemplate;
+	}
+
+	internal string AddPathVariable(UriTemplatePartType sourceNature, string varDeclaration) {
+		bool hasDefaultValue;
+		return AddPathVariable(sourceNature, varDeclaration, out hasDefaultValue);
+	}
+	internal string AddPathVariable(UriTemplatePartType sourceNature, string varDeclaration,
+		out bool hasDefaultValue) {
+		if (this.variables == null) {
+			this.variables = new VariablesCollection(this);
+		}
+		return this.variables.AddPathVariable(sourceNature, varDeclaration, out hasDefaultValue);
+	}
+	internal string AddQueryVariable(string varDeclaration) {
+		if (this.variables == null) {
+			this.variables = new VariablesCollection(this);
+		}
+		return this.variables.AddQueryVariable(varDeclaration);
+	}
+
+	internal UriTemplateMatch CreateUriTemplateMatch(Uri baseUri, Uri uri, object data,
+		int numMatchedSegments, Collection<string> relativePathSegments, NameValueCollection uriQuery) {
+		UriTemplateMatch result = new UriTemplateMatch();
+		result.RequestUri = uri;
+		result.BaseUri = baseUri;
+		if (uriQuery != null) {
+			result.SetQueryParameters(uriQuery);
+		}
+		result.SetRelativePathSegments(relativePathSegments);
+		result.Data = data;
+		result.Template = this;
+		for (int i = 0; i < numMatchedSegments; i++) {
+			this.segments[i].Lookup(result.RelativePathSegments[i], result.BoundVariables);
+		}
+		if (this.wildcard != null) {
+			this.wildcard.Lookup(numMatchedSegments, result.RelativePathSegments,
+				result.BoundVariables);
+		} else if (numMatchedSegments < this.segments.Count) {
+			BindTerminalDefaults(numMatchedSegments, result.BoundVariables);
+		}
+		if (this.queries.Count > 0) {
+			foreach (KeyValuePair<string, UriTemplateQueryValue> kvp in this.queries) {
+				kvp.Value.Lookup(result.QueryParameters[kvp.Key], result.BoundVariables);
+				//UriTemplateHelpers.AssertCanonical(varName);
+			}
+		}
+		if (this.additionalDefaults != null) {
+			foreach (KeyValuePair<string, string> kvp in this.additionalDefaults) {
+				result.BoundVariables.Add(kvp.Key, UnescapeDefaultValue(kvp.Value));
+			}
+		}
+		Fx.Assert(result.RelativePathSegments.Count - numMatchedSegments >= 0, "bad segment computation");
+		result.SetWildcardPathSegmentsStart(numMatchedSegments);
+
+		return result;
+	}
+
+	internal bool IsPathPartiallyEquivalentAt(UriTemplate other, int segmentsCount) {
+		// Refer to the note on template equivalency at IsEquivalentTo
+		// This method checks if any uri with given number of segments, which can be matched
+		//  by this template, can be also matched by the other template.
+		Fx.Assert(segmentsCount >= this.firstOptionalSegment - 1, "How can that be? The Trie is constructed that way!");
+		Fx.Assert(segmentsCount <= this.segments.Count, "How can that be? The Trie is constructed that way!");
+		Fx.Assert(segmentsCount >= other.firstOptionalSegment - 1, "How can that be? The Trie is constructed that way!");
+		Fx.Assert(segmentsCount <= other.segments.Count, "How can that be? The Trie is constructed that way!");
+		for (int i = 0; i < segmentsCount; ++i) {
+			if (!this.segments[i].IsEquivalentTo(other.segments[i],
+				((i == segmentsCount - 1) && (this.ignoreTrailingSlash || other.ignoreTrailingSlash)))) {
+				return false;
+			}
+		}
+		return true;
+	}
+	internal bool IsQueryEquivalent(UriTemplate other) {
+		if (this.queries.Count != other.queries.Count) {
+			return false;
+		}
+		foreach (string key in this.queries.Keys) {
+			UriTemplateQueryValue utqv = this.queries[key];
+			UriTemplateQueryValue otherUtqv;
+			if (!other.queries.TryGetValue(key, out otherUtqv)) {
+				return false;
+			}
+			if (!utqv.IsEquivalentTo(otherUtqv)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	internal static Uri RewriteUri(Uri uri, string host) {
+		if (!string.IsNullOrEmpty(host)) {
+			string originalHostHeader = uri.Host + ((!uri.IsDefaultPort) ? ":" + uri.Port.ToString(CultureInfo.InvariantCulture) : string.Empty);
+			if (!String.Equals(originalHostHeader, host, StringComparison.OrdinalIgnoreCase)) {
+				Uri sourceUri = new Uri(String.Format(CultureInfo.InvariantCulture, "{0}://{1}", uri.Scheme, host));
+				return (new UriBuilder(uri) { Host = sourceUri.Host, Port = sourceUri.Port }).Uri;
+			}
+		}
+		return uri;
+	}
+
+	Uri Bind(Uri baseAddress, BindInformation bindInfo, bool omitDefaults) {
+		UriBuilder result = new UriBuilder(baseAddress);
+		int parameterIndex = 0;
+		int lastPathParameter = ((this.variables == null) ? -1 : this.variables.PathSegmentVariableNames.Count - 1);
+		int lastPathParameterToBind;
+		if (lastPathParameter == -1) {
+			lastPathParameterToBind = -1;
+		} else if (omitDefaults) {
+			lastPathParameterToBind = bindInfo.LastNonDefaultPathParameter;
+		} else {
+			lastPathParameterToBind = bindInfo.LastNonNullablePathParameter;
+		}
+		string[] parameters = bindInfo.NormalizedParameters;
+		IDictionary<string, string> extraQueryParameters = bindInfo.AdditionalParameters;
+		// Binding the path :
+		StringBuilder pathString = new StringBuilder(result.Path);
+		if (pathString[pathString.Length - 1] != '/') {
+			pathString.Append('/');
+		}
+		if (lastPathParameterToBind < lastPathParameter) {
+			// Binding all the parameters we need
+			int segmentIndex = 0;
+			while (parameterIndex <= lastPathParameterToBind) {
+				Fx.Assert(segmentIndex < this.segments.Count,
+					"Calculation of LastNonDefaultPathParameter,lastPathParameter or parameterIndex failed");
+				this.segments[segmentIndex++].Bind(parameters, ref parameterIndex, pathString);
+			}
+			Fx.Assert(parameterIndex == lastPathParameterToBind + 1,
+				"That is the exit criteria from the loop");
+			// Maybe we have some literals yet to bind
+			Fx.Assert(segmentIndex < this.segments.Count,
+				"Calculation of LastNonDefaultPathParameter,lastPathParameter or parameterIndex failed");
+			while (this.segments[segmentIndex].Nature == UriTemplatePartType.Literal) {
+				this.segments[segmentIndex++].Bind(parameters, ref parameterIndex, pathString);
+				Fx.Assert(parameterIndex == lastPathParameterToBind + 1,
+					"We have moved the parameter index in a literal binding");
+				Fx.Assert(segmentIndex < this.segments.Count,
+					"Calculation of LastNonDefaultPathParameter,lastPathParameter or parameterIndex failed");
+			}
+			// We're done; skip to the beggining of the query parameters
+			parameterIndex = lastPathParameter + 1;
+		} else if (this.segments.Count > 0 || this.wildcard != null) {
+			for (int i = 0; i < this.segments.Count; i++) {
+				this.segments[i].Bind(parameters, ref parameterIndex, pathString);
+			}
+			if (this.wildcard != null) {
+				this.wildcard.Bind(parameters, ref parameterIndex, pathString);
+			}
+		}
+		if (this.ignoreTrailingSlash && (pathString[pathString.Length - 1] == '/')) {
+			pathString.Remove(pathString.Length - 1, 1);
+		}
+		result.Path = pathString.ToString();
+		// Binding the query :
+		if ((this.queries.Count != 0) || (extraQueryParameters != null)) {
+			StringBuilder query = new StringBuilder("");
+			foreach (string key in this.queries.Keys) {
+				this.queries[key].Bind(key, parameters, ref parameterIndex, query);
+			}
+			if (extraQueryParameters != null) {
+				foreach (string key in extraQueryParameters.Keys) {
+					if (this.queries.ContainsKey(key.ToUpperInvariant())) {
+						// This can only be if the key passed has the same name as some literal key
+						throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("parameters", SR.GetString(
+							SR.UTBothLiteralAndNameValueCollectionKey, key));
+					}
+					string value = extraQueryParameters[key];
+					string escapedValue = (string.IsNullOrEmpty(value) ? string.Empty : UrlUtility.UrlEncode(value, Encoding.UTF8));
+					query.AppendFormat("&{0}={1}", UrlUtility.UrlEncode(key, Encoding.UTF8), escapedValue);
+				}
+			}
+			if (query.Length != 0) {
+				query.Remove(0, 1); // remove extra leading '&'
+			}
+			result.Query = query.ToString();
+		}
+		// Adding the fragment (if needed)
+		if (this.fragment != null) {
+			result.Fragment = this.fragment;
+		}
+
+		return result.Uri;
+	}
+	void BindTerminalDefaults(int numMatchedSegments, NameValueCollection boundParameters) {
+		Fx.Assert(!this.HasWildcard, "There are no terminal default when ends with wildcard");
+		Fx.Assert(numMatchedSegments < this.segments.Count, "Otherwise - no defaults to bind");
+		Fx.Assert(this.variables != null, "Otherwise - no default values to bind");
+		Fx.Assert(this.variables.DefaultValues != null, "Otherwise - no default values to bind");
+		for (int i = numMatchedSegments; i < this.segments.Count; i++) {
+			switch (this.segments[i].Nature) {
+				case UriTemplatePartType.Variable: {
+					UriTemplateVariablePathSegment vps = this.segments[i] as UriTemplateVariablePathSegment;
+					Fx.Assert(vps != null, "How can that be? That its nature");
+					this.variables.LookupDefault(vps.VarName, boundParameters);
+				}
+				break;
+
+				default:
+					Fx.Assert("We only support terminal defaults on Variable segments");
+					break;
+			}
+		}
+	}
+
+	bool IsCandidatePathMatch(int numSegmentsInBaseAddress, string[] candidateSegments,
+		out int numMatchedSegments, out Collection<string> relativeSegments) {
+		int numRelativeSegments = candidateSegments.Length - numSegmentsInBaseAddress;
+		Fx.Assert(numRelativeSegments >= 0, "bad segments num");
+		relativeSegments = new Collection<string>();
+		bool isStillMatch = true;
+		int relativeSegmentsIndex = 0;
+		while (isStillMatch && (relativeSegmentsIndex < numRelativeSegments)) {
+			string segment = candidateSegments[relativeSegmentsIndex + numSegmentsInBaseAddress];
+			// Mathcing to next regular segment in the template (if there is one); building the wire segment representation
+			if (relativeSegmentsIndex < this.segments.Count) {
+				bool ignoreSlash = (this.ignoreTrailingSlash && (relativeSegmentsIndex == numRelativeSegments - 1));
+				UriTemplateLiteralPathSegment lps = UriTemplateLiteralPathSegment.CreateFromWireData(segment);
+				if (!this.segments[relativeSegmentsIndex].IsMatch(lps, ignoreSlash)) {
+					isStillMatch = false;
+					break;
+				}
+				string relPathSeg = Uri.UnescapeDataString(segment);
+				if (lps.EndsWithSlash) {
+					Fx.Assert(relPathSeg.EndsWith("/", StringComparison.Ordinal), "problem with relative path segment");
+					relPathSeg = relPathSeg.Substring(0, relPathSeg.Length - 1); // trim slash
+				}
+				relativeSegments.Add(relPathSeg);
+			}
+			// Checking if the template has a wild card ('*') or a final star var segment ("{*<var name>}"
+			else if (this.HasWildcard) {
+				break;
+			} else {
+				isStillMatch = false;
+				break;
+			}
+			relativeSegmentsIndex++;
+		}
+		if (isStillMatch) {
+			numMatchedSegments = relativeSegmentsIndex;
+			// building the wire representation to segments that were matched to a wild card
+			if (relativeSegmentsIndex < numRelativeSegments) {
+				while (relativeSegmentsIndex < numRelativeSegments) {
+					string relPathSeg = Uri.UnescapeDataString(candidateSegments[relativeSegmentsIndex + numSegmentsInBaseAddress]);
+					if (relPathSeg.EndsWith("/", StringComparison.Ordinal)) {
+						relPathSeg = relPathSeg.Substring(0, relPathSeg.Length - 1); // trim slash
+					}
+					relativeSegments.Add(relPathSeg);
+					relativeSegmentsIndex++;
+				}
+			}
+			// Checking if we matched all required segments already
+			else if (numMatchedSegments < this.firstOptionalSegment) {
+				isStillMatch = false;
+			}
+		} else {
+			numMatchedSegments = 0;
+		}
+
+		return isStillMatch;
+	}
+
+	bool IsPathFullyEquivalent(UriTemplate other) {
+		// Refer to the note on template equivalency at IsEquivalentTo
+		// This method checks if both templates has a fully equivalent path.
+		if (this.HasWildcard != other.HasWildcard) {
+			return false;
+		}
+		if (this.segments.Count != other.segments.Count) {
+			return false;
+		}
+		for (int i = 0; i < this.segments.Count; ++i) {
+			if (!this.segments[i].IsEquivalentTo(other.segments[i],
+				(i == this.segments.Count - 1) && !this.HasWildcard && (this.ignoreTrailingSlash || other.ignoreTrailingSlash))) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	BindInformation PrepareBindInformation(IDictionary<string, string> parameters, bool omitDefaults) {
+		if (parameters == null) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("parameters");
+		}
+
+		IDictionary<string, string> extraParameters = new Dictionary<string, string>(UriTemplateHelpers.GetQueryKeyComparer());
+		foreach (KeyValuePair<string, string> kvp in parameters) {
+			if (string.IsNullOrEmpty(kvp.Key)) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("parameters",
+					SR.GetString(SR.UTBindByNameCalledWithEmptyKey));
+			}
+
+			extraParameters.Add(kvp);
+		}
+		BindInformation bindInfo;
+		ProcessDefaultsAndCreateBindInfo(omitDefaults, extraParameters, out bindInfo);
+		return bindInfo;
+	}
+	BindInformation PrepareBindInformation(NameValueCollection parameters, bool omitDefaults) {
+		if (parameters == null) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("parameters");
+		}
+
+		IDictionary<string, string> extraParameters = new Dictionary<string, string>(UriTemplateHelpers.GetQueryKeyComparer());
+		foreach (string key in parameters.AllKeys) {
+			if (string.IsNullOrEmpty(key)) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("parameters",
+					SR.GetString(SR.UTBindByNameCalledWithEmptyKey));
+			}
+
+			extraParameters.Add(key, parameters[key]);
+		}
+		BindInformation bindInfo;
+		ProcessDefaultsAndCreateBindInfo(omitDefaults, extraParameters, out bindInfo);
+		return bindInfo;
+	}
+	void ProcessDefaultsAndCreateBindInfo(bool omitDefaults, IDictionary<string, string> extraParameters,
+		out BindInformation bindInfo) {
+		Fx.Assert(extraParameters != null, "We are expected to create it at the calling PrepareBindInformation");
+		if (this.additionalDefaults != null) {
+			if (omitDefaults) {
+				foreach (KeyValuePair<string, string> kvp in this.additionalDefaults) {
+					string extraParameter;
+					if (extraParameters.TryGetValue(kvp.Key, out extraParameter)) {
+						if (string.Compare(extraParameter, kvp.Value, StringComparison.Ordinal) == 0) {
+							extraParameters.Remove(kvp.Key);
+						}
+					}
+				}
+			} else {
+				foreach (KeyValuePair<string, string> kvp in this.additionalDefaults) {
+					if (!extraParameters.ContainsKey(kvp.Key)) {
+						extraParameters.Add(kvp.Key, kvp.Value);
+					}
+				}
+			}
+		}
+		if (extraParameters.Count == 0) {
+			extraParameters = null;
+		}
+		bindInfo = new BindInformation(extraParameters);
+	}
+
+	string UnescapeDefaultValue(string escapedValue) {
+		if (string.IsNullOrEmpty(escapedValue)) {
+			return escapedValue;
+		}
+		if (this.unescapedDefaults == null) {
+			this.unescapedDefaults = new ConcurrentDictionary<string, string>(StringComparer.Ordinal);
+		}
+
+		return this.unescapedDefaults.GetOrAdd(escapedValue, Uri.UnescapeDataString);
+	}
+
+	struct BindInformation {
+		IDictionary<string, string> additionalParameters;
+		int lastNonDefaultPathParameter;
+		int lastNonNullablePathParameter;
+		string[] normalizedParameters;
+
+		public BindInformation(string[] normalizedParameters, int lastNonDefaultPathParameter,
+			int lastNonNullablePathParameter, IDictionary<string, string> additionalParameters) {
+			this.normalizedParameters = normalizedParameters;
+			this.lastNonDefaultPathParameter = lastNonDefaultPathParameter;
+			this.lastNonNullablePathParameter = lastNonNullablePathParameter;
+			this.additionalParameters = additionalParameters;
+		}
+		public BindInformation(IDictionary<string, string> additionalParameters) {
+			this.normalizedParameters = null;
+			this.lastNonDefaultPathParameter = -1;
+			this.lastNonNullablePathParameter = -1;
+			this.additionalParameters = additionalParameters;
+		}
+
+		public IDictionary<string, string> AdditionalParameters {
+			get {
+				return this.additionalParameters;
+			}
+		}
+		public int LastNonDefaultPathParameter {
+			get {
+				return this.lastNonDefaultPathParameter;
+			}
+		}
+		public int LastNonNullablePathParameter {
+			get {
+				return this.lastNonNullablePathParameter;
+			}
+		}
+		public string[] NormalizedParameters {
+			get {
+				return this.normalizedParameters;
+			}
+		}
+	}
+
+	class UriTemplateDefaults : IDictionary<string, string> {
+		Dictionary<string, string> defaults;
+		ReadOnlyCollection<string> keys;
+		ReadOnlyCollection<string> values;
+
+		public UriTemplateDefaults(UriTemplate template) {
+			this.defaults = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+			if ((template.variables != null) && (template.variables.DefaultValues != null)) {
+				foreach (KeyValuePair<string, string> kvp in template.variables.DefaultValues) {
+					this.defaults.Add(kvp.Key, kvp.Value);
+				}
+			}
+			if (template.additionalDefaults != null) {
+				foreach (KeyValuePair<string, string> kvp in template.additionalDefaults) {
+					this.defaults.Add(kvp.Key.ToUpperInvariant(), kvp.Value);
+				}
+			}
+			this.keys = new ReadOnlyCollection<string>(new List<string>(this.defaults.Keys));
+			this.values = new ReadOnlyCollection<string>(new List<string>(this.defaults.Values));
+		}
+
+		// ICollection<KeyValuePair<string, string>> Members
+		public int Count {
+			get {
+				return this.defaults.Count;
+			}
+		}
+		public bool IsReadOnly {
+			get {
+				return true;
+			}
+		}
+
+		// IDictionary<string, string> Members
+		public ICollection<string> Keys {
+			get {
+				return this.keys;
+			}
+		}
+		public ICollection<string> Values {
+			get {
+				return this.values;
+			}
+		}
+		public string this[string key] {
+			get {
+				return this.defaults[key];
+			}
+			set {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(
+					SR.GetString(SR.UTDefaultValuesAreImmutable)));
+			}
+		}
+
+		public void Add(string key, string value) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(
+				SR.GetString(SR.UTDefaultValuesAreImmutable)));
+		}
+
+		public void Add(KeyValuePair<string, string> item) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(
+				SR.GetString(SR.UTDefaultValuesAreImmutable)));
+		}
+		public void Clear() {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(
+				SR.GetString(SR.UTDefaultValuesAreImmutable)));
+		}
+		public bool Contains(KeyValuePair<string, string> item) {
+			return (this.defaults as ICollection<KeyValuePair<string, string>>).Contains(item);
+		}
+		public bool ContainsKey(string key) {
+			return this.defaults.ContainsKey(key);
+		}
+		public void CopyTo(KeyValuePair<string, string>[] array, int arrayIndex) {
+			(this.defaults as ICollection<KeyValuePair<string, string>>).CopyTo(array, arrayIndex);
+		}
+
+		// IEnumerable<KeyValuePair<string, string>> Members
+		public IEnumerator<KeyValuePair<string, string>> GetEnumerator() {
+			return this.defaults.GetEnumerator();
+		}
+		public bool Remove(string key) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(
+				SR.GetString(SR.UTDefaultValuesAreImmutable)));
+		}
+		public bool Remove(KeyValuePair<string, string> item) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(
+				SR.GetString(SR.UTDefaultValuesAreImmutable)));
+		}
+
+		// IEnumerable Members
+		System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() {
+			return this.defaults.GetEnumerator();
+		}
+		public bool TryGetValue(string key, out string value) {
+			return this.defaults.TryGetValue(key, out value);
+		}
+	}
+
+	class VariablesCollection {
+		readonly UriTemplate owner;
+		static ReadOnlyCollection<string> emptyStringCollection = null;
+		Dictionary<string, string> defaultValues; // key is the variable name (in uppercase; as appear in the variable names lists)
+		int firstNullablePathVariable;
+		List<string> pathSegmentVariableNames; // ToUpperInvariant, in order they occur in the original template string
+		ReadOnlyCollection<string> pathSegmentVariableNamesSnapshot = null;
+		List<UriTemplatePartType> pathSegmentVariableNature;
+		List<string> queryValueVariableNames; // ToUpperInvariant, in order they occur in the original template string
+		ReadOnlyCollection<string> queryValueVariableNamesSnapshot = null;
+
+		public VariablesCollection(UriTemplate owner) {
+			this.owner = owner;
+			this.pathSegmentVariableNames = new List<string>();
+			this.pathSegmentVariableNature = new List<UriTemplatePartType>();
+			this.queryValueVariableNames = new List<string>();
+			this.firstNullablePathVariable = -1;
+		}
+
+		public static ReadOnlyCollection<string> EmptyCollection {
+			get {
+				if (emptyStringCollection == null) {
+					emptyStringCollection = new ReadOnlyCollection<string>(new List<string>());
+				}
+				return emptyStringCollection;
+			}
+		}
+
+		public Dictionary<string, string> DefaultValues {
+			get {
+				return this.defaultValues;
+			}
+		}
+		public ReadOnlyCollection<string> PathSegmentVariableNames {
+			get {
+				if (this.pathSegmentVariableNamesSnapshot == null) {
+					Interlocked.CompareExchange<ReadOnlyCollection<string>>(ref this.pathSegmentVariableNamesSnapshot, new ReadOnlyCollection<string>(
+						this.pathSegmentVariableNames), null);
+				}
+				return this.pathSegmentVariableNamesSnapshot;
+			}
+		}
+		public ReadOnlyCollection<string> QueryValueVariableNames {
+			get {
+				if (this.queryValueVariableNamesSnapshot == null) {
+					Interlocked.CompareExchange<ReadOnlyCollection<string>>(ref this.queryValueVariableNamesSnapshot, new ReadOnlyCollection<string>(
+						this.queryValueVariableNames), null);
+				}
+				return this.queryValueVariableNamesSnapshot;
+			}
+		}
+
+		public void AddDefaultValue(string varName, string value) {
+			int varIndex = this.pathSegmentVariableNames.IndexOf(varName);
+			Fx.Assert(varIndex != -1, "Adding default value is restricted to path variables");
+			if ((this.owner.wildcard != null) && this.owner.wildcard.HasVariable &&
+				(varIndex == this.pathSegmentVariableNames.Count - 1)) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
+					SR.GetString(SR.UTStarVariableWithDefaultsFromAdditionalDefaults,
+					this.owner.originalTemplate, varName)));
+			}
+			if (this.pathSegmentVariableNature[varIndex] != UriTemplatePartType.Variable) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
+					SR.GetString(SR.UTDefaultValueToCompoundSegmentVarFromAdditionalDefaults,
+					this.owner.originalTemplate, varName)));
+			}
+			if (string.IsNullOrEmpty(value) ||
+				(string.Compare(value, UriTemplate.NullableDefault, StringComparison.OrdinalIgnoreCase) == 0)) {
+				value = null;
+			}
+			if (this.defaultValues == null) {
+				this.defaultValues = new Dictionary<string, string>();
+			}
+			this.defaultValues.Add(varName, value);
+		}
+
+		public string AddPathVariable(UriTemplatePartType sourceNature, string varDeclaration, out bool hasDefaultValue) {
+			Fx.Assert(sourceNature != UriTemplatePartType.Literal, "Literal path segments can't be the source for path variables");
+			string varName;
+			string defaultValue;
+			ParseVariableDeclaration(varDeclaration, out varName, out defaultValue);
+			hasDefaultValue = (defaultValue != null);
+			if (varName.IndexOf(UriTemplate.WildcardPath, StringComparison.Ordinal) != -1) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
+					SR.GetString(SR.UTInvalidWildcardInVariableOrLiteral, this.owner.originalTemplate, UriTemplate.WildcardPath)));
+			}
+			string uppercaseVarName = varName.ToUpperInvariant();
+			if (this.pathSegmentVariableNames.Contains(uppercaseVarName) ||
+				this.queryValueVariableNames.Contains(uppercaseVarName)) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
+					SR.GetString(SR.UTVarNamesMustBeUnique, this.owner.originalTemplate, varName)));
+			}
+			this.pathSegmentVariableNames.Add(uppercaseVarName);
+			this.pathSegmentVariableNature.Add(sourceNature);
+			if (hasDefaultValue) {
+				if (defaultValue == string.Empty) {
+					throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
+						SR.GetString(SR.UTInvalidDefaultPathValue, this.owner.originalTemplate,
+						varDeclaration, varName)));
+				}
+				if (string.Compare(defaultValue, UriTemplate.NullableDefault, StringComparison.OrdinalIgnoreCase) == 0) {
+					defaultValue = null;
+				}
+				if (this.defaultValues == null) {
+					this.defaultValues = new Dictionary<string, string>();
+				}
+				this.defaultValues.Add(uppercaseVarName, defaultValue);
+			}
+			return uppercaseVarName;
+		}
+		public string AddQueryVariable(string varDeclaration) {
+			string varName;
+			string defaultValue;
+			ParseVariableDeclaration(varDeclaration, out varName, out defaultValue);
+			if (varName.IndexOf(UriTemplate.WildcardPath, StringComparison.Ordinal) != -1) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
+					SR.GetString(SR.UTInvalidWildcardInVariableOrLiteral, this.owner.originalTemplate, UriTemplate.WildcardPath)));
+			}
+			if (defaultValue != null) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
+					SR.GetString(SR.UTDefaultValueToQueryVar, this.owner.originalTemplate,
+					varDeclaration, varName)));
+			}
+			string uppercaseVarName = varName.ToUpperInvariant();
+			if (this.pathSegmentVariableNames.Contains(uppercaseVarName) ||
+				this.queryValueVariableNames.Contains(uppercaseVarName)) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
+					SR.GetString(SR.UTVarNamesMustBeUnique, this.owner.originalTemplate, varName)));
+			}
+			this.queryValueVariableNames.Add(uppercaseVarName);
+			return uppercaseVarName;
+		}
+
+		public void LookupDefault(string varName, NameValueCollection boundParameters) {
+			Fx.Assert(this.defaultValues.ContainsKey(varName), "Otherwise, we don't have a value to bind");
+			boundParameters.Add(varName, owner.UnescapeDefaultValue(this.defaultValues[varName]));
+		}
+
+		public BindInformation PrepareBindInformation(IDictionary<string, string> parameters, bool omitDefaults) {
+			if (parameters == null) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("parameters");
+			}
+
+			string[] normalizedParameters = PrepareNormalizedParameters();
+			IDictionary<string, string> extraParameters = null;
+			foreach (string key in parameters.Keys) {
+				ProcessBindParameter(key, parameters[key], normalizedParameters, ref extraParameters);
+			}
+			BindInformation bindInfo;
+			ProcessDefaultsAndCreateBindInfo(omitDefaults, normalizedParameters, extraParameters, out bindInfo);
+			return bindInfo;
+		}
+		public BindInformation PrepareBindInformation(NameValueCollection parameters, bool omitDefaults) {
+			if (parameters == null) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("parameters");
+			}
+
+			string[] normalizedParameters = PrepareNormalizedParameters();
+			IDictionary<string, string> extraParameters = null;
+			foreach (string key in parameters.AllKeys) {
+				ProcessBindParameter(key, parameters[key], normalizedParameters, ref extraParameters);
+			}
+			BindInformation bindInfo;
+			ProcessDefaultsAndCreateBindInfo(omitDefaults, normalizedParameters, extraParameters, out bindInfo);
+			return bindInfo;
+		}
+		public BindInformation PrepareBindInformation(params string[] parameters) {
+			if (parameters == null) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("values");
+			}
+			if ((parameters.Length < this.pathSegmentVariableNames.Count) ||
+				(parameters.Length > this.pathSegmentVariableNames.Count + this.queryValueVariableNames.Count)) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
+					SR.GetString(SR.UTBindByPositionWrongCount, this.owner.originalTemplate,
+					this.pathSegmentVariableNames.Count, this.queryValueVariableNames.Count,
+					parameters.Length)));
+			}
+
+			string[] normalizedParameters;
+			if (parameters.Length == this.pathSegmentVariableNames.Count + this.queryValueVariableNames.Count) {
+				normalizedParameters = parameters;
+			} else {
+				normalizedParameters = new string[this.pathSegmentVariableNames.Count + this.queryValueVariableNames.Count];
+				parameters.CopyTo(normalizedParameters, 0);
+				for (int i = parameters.Length; i < normalizedParameters.Length; i++) {
+					normalizedParameters[i] = null;
+				}
+			}
+			int lastNonDefaultPathParameter;
+			int lastNonNullablePathParameter;
+			LoadDefaultsAndValidate(normalizedParameters, out lastNonDefaultPathParameter,
+				out lastNonNullablePathParameter);
+			return new BindInformation(normalizedParameters, lastNonDefaultPathParameter,
+				lastNonNullablePathParameter, this.owner.additionalDefaults);
+		}
+		public void ValidateDefaults(out int firstOptionalSegment) {
+			Fx.Assert(this.defaultValues != null, "We are checking this condition from the c'tor");
+			Fx.Assert(this.pathSegmentVariableNames.Count > 0, "Otherwise, how can we have default values");
+			// Finding the first valid nullable defaults
+			for (int i = this.pathSegmentVariableNames.Count - 1; (i >= 0) && (this.firstNullablePathVariable == -1); i--) {
+				string varName = this.pathSegmentVariableNames[i];
+				string defaultValue;
+				if (!this.defaultValues.TryGetValue(varName, out defaultValue)) {
+					this.firstNullablePathVariable = i + 1;
+				} else if (defaultValue != null) {
+					this.firstNullablePathVariable = i + 1;
+				}
+			}
+			if (this.firstNullablePathVariable == -1) {
+				this.firstNullablePathVariable = 0;
+			}
+			// Making sure that there are no nullables to the left of the first valid nullable
+			if (this.firstNullablePathVariable > 1) {
+				for (int i = this.firstNullablePathVariable - 2; i >= 0; i--) {
+					string varName = this.pathSegmentVariableNames[i];
+					string defaultValue;
+					if (this.defaultValues.TryGetValue(varName, out defaultValue)) {
+						if (defaultValue == null) {
+							throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
+								SR.GetString(SR.UTNullableDefaultMustBeFollowedWithNullables, this.owner.originalTemplate,
+								varName, this.pathSegmentVariableNames[i + 1])));
+						}
+					}
+				}
+			}
+			// Making sure that there are no Literals\WildCards to the right
+			// Based on the fact that only Variable Path Segments support default values,
+			//  if firstNullablePathVariable=N and pathSegmentVariableNames.Count=M then
+			//  the nature of the last M-N path segments should be StringNature.Variable; otherwise,
+			//  there was a literal segment in between. Also, there shouldn't be a wildcard.
+			if (this.firstNullablePathVariable < this.pathSegmentVariableNames.Count) {
+				if (this.owner.HasWildcard) {
+					throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
+						SR.GetString(SR.UTNullableDefaultMustNotBeFollowedWithWildcard,
+						this.owner.originalTemplate, this.pathSegmentVariableNames[this.firstNullablePathVariable])));
+				}
+				for (int i = this.pathSegmentVariableNames.Count - 1; i >= this.firstNullablePathVariable; i--) {
+					int segmentIndex = this.owner.segments.Count - (this.pathSegmentVariableNames.Count - i);
+					if (this.owner.segments[segmentIndex].Nature != UriTemplatePartType.Variable) {
+						throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
+							SR.GetString(SR.UTNullableDefaultMustNotBeFollowedWithLiteral,
+							this.owner.originalTemplate, this.pathSegmentVariableNames[this.firstNullablePathVariable],
+							this.owner.segments[segmentIndex].OriginalSegment)));
+					}
+				}
+			}
+			// Now that we have the firstNullablePathVariable set, lets calculate the firstOptionalSegment.
+			//  We already knows that the last M-N path segments (when M=pathSegmentVariableNames.Count and
+			//  N=firstNullablePathVariable) are optional (see the previos comment). We will start there and
+			//  move to the left, stopping at the first segment, which is not a variable or is a variable
+			//  and doesn't have a default value.
+			int numNullablePathVariables = (this.pathSegmentVariableNames.Count - this.firstNullablePathVariable);
+			firstOptionalSegment = this.owner.segments.Count - numNullablePathVariables;
+			if (!this.owner.HasWildcard) {
+				while (firstOptionalSegment > 0) {
+					UriTemplatePathSegment ps = this.owner.segments[firstOptionalSegment - 1];
+					if (ps.Nature != UriTemplatePartType.Variable) {
+						break;
+					}
+					UriTemplateVariablePathSegment vps = (ps as UriTemplateVariablePathSegment);
+					Fx.Assert(vps != null, "Should be; that's his nature");
+					if (!this.defaultValues.ContainsKey(vps.VarName)) {
+						break;
+					}
+					firstOptionalSegment--;
+				}
+			}
+		}
+
+		void AddAdditionalDefaults(ref IDictionary<string, string> extraParameters) {
+			if (extraParameters == null) {
+				extraParameters = this.owner.additionalDefaults;
+			} else {
+				foreach (KeyValuePair<string, string> kvp in this.owner.additionalDefaults) {
+					if (!extraParameters.ContainsKey(kvp.Key)) {
+						extraParameters.Add(kvp.Key, kvp.Value);
+					}
+				}
+			}
+		}
+		void LoadDefaultsAndValidate(string[] normalizedParameters, out int lastNonDefaultPathParameter,
+			out int lastNonNullablePathParameter) {
+			// First step - loading defaults
+			for (int i = 0; i < this.pathSegmentVariableNames.Count; i++) {
+				if (string.IsNullOrEmpty(normalizedParameters[i]) && (this.defaultValues != null)) {
+					this.defaultValues.TryGetValue(this.pathSegmentVariableNames[i], out normalizedParameters[i]);
+				}
+			}
+			// Second step - calculating bind constrains
+			lastNonDefaultPathParameter = this.pathSegmentVariableNames.Count - 1;
+			if ((this.defaultValues != null) &&
+				(this.owner.segments[this.owner.segments.Count - 1].Nature != UriTemplatePartType.Literal)) {
+				bool foundNonDefaultPathParameter = false;
+				while (!foundNonDefaultPathParameter && (lastNonDefaultPathParameter >= 0)) {
+					string defaultValue;
+					if (this.defaultValues.TryGetValue(this.pathSegmentVariableNames[lastNonDefaultPathParameter],
+						out defaultValue)) {
+						if (string.Compare(normalizedParameters[lastNonDefaultPathParameter],
+							defaultValue, StringComparison.Ordinal) != 0) {
+							foundNonDefaultPathParameter = true;
+						} else {
+							lastNonDefaultPathParameter--;
+						}
+					} else {
+						foundNonDefaultPathParameter = true;
+					}
+				}
+			}
+			if (this.firstNullablePathVariable > lastNonDefaultPathParameter) {
+				lastNonNullablePathParameter = this.firstNullablePathVariable - 1;
+			} else {
+				lastNonNullablePathParameter = lastNonDefaultPathParameter;
+			}
+			// Third step - validate
+			for (int i = 0; i <= lastNonNullablePathParameter; i++) {
+				// Skip validation for terminating star variable segment :
+				if (this.owner.HasWildcard && this.owner.wildcard.HasVariable &&
+					(i == this.pathSegmentVariableNames.Count - 1)) {
+					continue;
+				}
+				// Validate
+				if (string.IsNullOrEmpty(normalizedParameters[i])) {
+					throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("parameters",
+						SR.GetString(SR.BindUriTemplateToNullOrEmptyPathParam, this.pathSegmentVariableNames[i]));
+				}
+			}
+		}
+		void ParseVariableDeclaration(string varDeclaration, out string varName, out string defaultValue) {
+			if ((varDeclaration.IndexOf('{') != -1) || (varDeclaration.IndexOf('}') != -1)) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
+					SR.GetString(SR.UTInvalidVarDeclaration, this.owner.originalTemplate, varDeclaration)));
+			}
+			int equalSignIndex = varDeclaration.IndexOf('=');
+			switch (equalSignIndex) {
+				case -1:
+					varName = varDeclaration;
+					defaultValue = null;
+					break;
+
+				case 0:
+					throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
+						SR.GetString(SR.UTInvalidVarDeclaration, this.owner.originalTemplate, varDeclaration)));
+
+				default:
+					varName = varDeclaration.Substring(0, equalSignIndex);
+					defaultValue = varDeclaration.Substring(equalSignIndex + 1);
+					if (defaultValue.IndexOf('=') != -1) {
+						throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
+							SR.GetString(SR.UTInvalidVarDeclaration, this.owner.originalTemplate, varDeclaration)));
+					}
+					break;
+			}
+		}
+		string[] PrepareNormalizedParameters() {
+			string[] normalizedParameters = new string[this.pathSegmentVariableNames.Count + this.queryValueVariableNames.Count];
+			for (int i = 0; i < normalizedParameters.Length; i++) {
+				normalizedParameters[i] = null;
+			}
+			return normalizedParameters;
+		}
+		void ProcessBindParameter(string name, string value, string[] normalizedParameters,
+			ref IDictionary<string, string> extraParameters) {
+			if (string.IsNullOrEmpty(name)) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("parameters",
+					SR.GetString(SR.UTBindByNameCalledWithEmptyKey));
+			}
+
+			string uppercaseVarName = name.ToUpperInvariant();
+			int pathVarIndex = this.pathSegmentVariableNames.IndexOf(uppercaseVarName);
+			if (pathVarIndex != -1) {
+				normalizedParameters[pathVarIndex] = (string.IsNullOrEmpty(value) ? string.Empty : value);
+				return;
+			}
+			int queryVarIndex = this.queryValueVariableNames.IndexOf(uppercaseVarName);
+			if (queryVarIndex != -1) {
+				normalizedParameters[this.pathSegmentVariableNames.Count + queryVarIndex] = (string.IsNullOrEmpty(value) ? string.Empty : value);
+				return;
+			}
+			if (extraParameters == null) {
+				extraParameters = new Dictionary<string, string>(UriTemplateHelpers.GetQueryKeyComparer());
+			}
+			extraParameters.Add(name, value);
+		}
+		void ProcessDefaultsAndCreateBindInfo(bool omitDefaults, string[] normalizedParameters,
+			IDictionary<string, string> extraParameters, out BindInformation bindInfo) {
+			int lastNonDefaultPathParameter;
+			int lastNonNullablePathParameter;
+			LoadDefaultsAndValidate(normalizedParameters, out lastNonDefaultPathParameter,
+				out lastNonNullablePathParameter);
+			if (this.owner.additionalDefaults != null) {
+				if (omitDefaults) {
+					RemoveAdditionalDefaults(ref extraParameters);
+				} else {
+					AddAdditionalDefaults(ref extraParameters);
+				}
+			}
+			bindInfo = new BindInformation(normalizedParameters, lastNonDefaultPathParameter,
+				lastNonNullablePathParameter, extraParameters);
+		}
+		void RemoveAdditionalDefaults(ref IDictionary<string, string> extraParameters) {
+			if (extraParameters == null) {
+				return;
+			}
+
+			foreach (KeyValuePair<string, string> kvp in this.owner.additionalDefaults) {
+				string extraParameter;
+				if (extraParameters.TryGetValue(kvp.Key, out extraParameter)) {
+					if (string.Compare(extraParameter, kvp.Value, StringComparison.Ordinal) == 0) {
+						extraParameters.Remove(kvp.Key);
+					}
+				}
+			}
+			if (extraParameters.Count == 0) {
+				extraParameters = null;
+			}
+		}
+	}
+
+	class WildcardInfo {
+		readonly UriTemplate owner;
+		readonly string varName;
+
+		public WildcardInfo(UriTemplate owner) {
+			this.varName = null;
+			this.owner = owner;
+		}
+		public WildcardInfo(UriTemplate owner, string segment) {
+			Fx.Assert(!segment.EndsWith("/", StringComparison.Ordinal), "We are expecting to check this earlier");
+
+			bool hasDefault;
+			this.varName = owner.AddPathVariable(UriTemplatePartType.Variable,
+				segment.Substring(1 + WildcardPath.Length, segment.Length - 2 - WildcardPath.Length),
+				out hasDefault);
+			// Since this is a terminating star segment there shouldn't be a default
+			if (hasDefault) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
+					SR.GetString(SR.UTStarVariableWithDefaults, owner.originalTemplate,
+					segment, this.varName)));
+			}
+			this.owner = owner;
+		}
+
+		internal bool HasVariable {
+			get {
+				return (!string.IsNullOrEmpty(this.varName));
+			}
+		}
+
+		public void Bind(string[] values, ref int valueIndex, StringBuilder path) {
+			if (HasVariable) {
+				Fx.Assert(valueIndex < values.Length, "Not enough values to bind");
+				if (string.IsNullOrEmpty(values[valueIndex])) {
+					valueIndex++;
+				} else {
+					path.Append(values[valueIndex++]);
+				}
+			}
+		}
+		public void Lookup(int numMatchedSegments, Collection<string> relativePathSegments,
+			NameValueCollection boundParameters) {
+			Fx.Assert(numMatchedSegments == this.owner.segments.Count, "We should have matched the other segments");
+			if (HasVariable) {
+				StringBuilder remainingPath = new StringBuilder();
+				for (int i = numMatchedSegments; i < relativePathSegments.Count; i++) {
+					if (i < relativePathSegments.Count - 1) {
+						remainingPath.AppendFormat("{0}/", relativePathSegments[i]);
+					} else {
+						remainingPath.Append(relativePathSegments[i]);
+					}
+				}
+				boundParameters.Add(this.varName, remainingPath.ToString());
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateCompoundPathSegment.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateCompoundPathSegment.cs
new file mode 100644
index 00000000000..9ce575725da
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateCompoundPathSegment.cs
@@ -0,0 +1,396 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+namespace System;
+
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Runtime;
+using System.ServiceModel;
+using System.Text;
+
+// Thin wrapper around formatted string; use type system to help ensure we
+// are doing canonicalization right/consistently - the literal sections are held in an
+// un-escaped format
+// We are assuming that the string will be always built as Lit{Var}Lit[{Var}Lit[{Var}Lit[...]]],
+// when the first and last literals may be empty
+class UriTemplateCompoundPathSegment : UriTemplatePathSegment, IComparable<UriTemplateCompoundPathSegment> {
+	readonly string firstLiteral;
+	readonly List<VarAndLitPair> varLitPairs;
+
+	CompoundSegmentClass csClass;
+
+	UriTemplateCompoundPathSegment(string originalSegment, bool endsWithSlash, string firstLiteral)
+		: base(originalSegment, UriTemplatePartType.Compound, endsWithSlash) {
+		this.firstLiteral = firstLiteral;
+		this.varLitPairs = new List<VarAndLitPair>();
+	}
+	public static new UriTemplateCompoundPathSegment CreateFromUriTemplate(string segment, UriTemplate template) {
+		string origSegment = segment;
+		bool endsWithSlash = segment.EndsWith("/", StringComparison.Ordinal);
+		if (endsWithSlash) {
+			segment = segment.Remove(segment.Length - 1);
+		}
+
+		int nextVarStart = segment.IndexOf("{", StringComparison.Ordinal);
+		Fx.Assert(nextVarStart >= 0, "The method is only called after identifying a '{' character in the segment");
+		string firstLiteral = ((nextVarStart > 0) ? segment.Substring(0, nextVarStart) : string.Empty);
+		if (firstLiteral.IndexOf(UriTemplate.WildcardPath, StringComparison.Ordinal) != -1) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
+				SR.GetString(SR.UTInvalidWildcardInVariableOrLiteral, template.originalTemplate, UriTemplate.WildcardPath)));
+		}
+		UriTemplateCompoundPathSegment result = new UriTemplateCompoundPathSegment(origSegment, endsWithSlash,
+			((firstLiteral != string.Empty) ? Uri.UnescapeDataString(firstLiteral) : string.Empty));
+		do {
+			int nextVarEnd = segment.IndexOf("}", nextVarStart + 1, StringComparison.Ordinal);
+			if (nextVarEnd < nextVarStart + 2) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
+					SR.GetString(SR.UTInvalidFormatSegmentOrQueryPart, segment)));
+			}
+			bool hasDefault;
+			string varName = template.AddPathVariable(UriTemplatePartType.Compound,
+				segment.Substring(nextVarStart + 1, nextVarEnd - nextVarStart - 1), out hasDefault);
+			if (hasDefault) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
+					SR.GetString(SR.UTDefaultValueToCompoundSegmentVar, template, origSegment, varName)));
+			}
+			nextVarStart = segment.IndexOf("{", nextVarEnd + 1, StringComparison.Ordinal);
+			string literal;
+			if (nextVarStart > 0) {
+				if (nextVarStart == nextVarEnd + 1) {
+					throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("template",
+						SR.GetString(SR.UTDoesNotSupportAdjacentVarsInCompoundSegment, template, segment));
+				}
+				literal = segment.Substring(nextVarEnd + 1, nextVarStart - nextVarEnd - 1);
+			} else if (nextVarEnd + 1 < segment.Length) {
+				literal = segment.Substring(nextVarEnd + 1);
+			} else {
+				literal = string.Empty;
+			}
+			if (literal.IndexOf(UriTemplate.WildcardPath, StringComparison.Ordinal) != -1) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
+					SR.GetString(SR.UTInvalidWildcardInVariableOrLiteral, template.originalTemplate, UriTemplate.WildcardPath)));
+			}
+			if (literal.IndexOf('}') != -1) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
+					SR.GetString(SR.UTInvalidFormatSegmentOrQueryPart, segment)));
+			}
+			result.varLitPairs.Add(new VarAndLitPair(varName, ((literal == string.Empty) ? string.Empty : Uri.UnescapeDataString(literal))));
+		} while (nextVarStart > 0);
+
+		if (string.IsNullOrEmpty(result.firstLiteral)) {
+			if (string.IsNullOrEmpty(result.varLitPairs[result.varLitPairs.Count - 1].Literal)) {
+				result.csClass = CompoundSegmentClass.HasNoPrefixNorSuffix;
+			} else {
+				result.csClass = CompoundSegmentClass.HasOnlySuffix;
+			}
+		} else {
+			if (string.IsNullOrEmpty(result.varLitPairs[result.varLitPairs.Count - 1].Literal)) {
+				result.csClass = CompoundSegmentClass.HasOnlyPrefix;
+			} else {
+				result.csClass = CompoundSegmentClass.HasPrefixAndSuffix;
+			}
+		}
+
+		return result;
+	}
+
+	public override void Bind(string[] values, ref int valueIndex, StringBuilder path) {
+		Fx.Assert(valueIndex + this.varLitPairs.Count <= values.Length, "Not enough values to bind");
+		path.Append(this.firstLiteral);
+		for (int pairIndex = 0; pairIndex < this.varLitPairs.Count; pairIndex++) {
+			path.Append(values[valueIndex++]);
+			path.Append(this.varLitPairs[pairIndex].Literal);
+		}
+		if (this.EndsWithSlash) {
+			path.Append("/");
+		}
+	}
+	public override bool IsEquivalentTo(UriTemplatePathSegment other, bool ignoreTrailingSlash) {
+		if (other == null) {
+			Fx.Assert("why would we ever call this?");
+			return false;
+		}
+		if (!ignoreTrailingSlash && (this.EndsWithSlash != other.EndsWithSlash)) {
+			return false;
+		}
+		UriTemplateCompoundPathSegment otherAsCompound = other as UriTemplateCompoundPathSegment;
+		if (otherAsCompound == null) {
+			// if other can't be cast as a compound then it can't be equivalent
+			return false;
+		}
+		if (this.varLitPairs.Count != otherAsCompound.varLitPairs.Count) {
+			return false;
+		}
+		if (StringComparer.OrdinalIgnoreCase.Compare(this.firstLiteral, otherAsCompound.firstLiteral) != 0) {
+			return false;
+		}
+		for (int pairIndex = 0; pairIndex < this.varLitPairs.Count; pairIndex++) {
+			if (StringComparer.OrdinalIgnoreCase.Compare(this.varLitPairs[pairIndex].Literal,
+				otherAsCompound.varLitPairs[pairIndex].Literal) != 0) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+	public override bool IsMatch(UriTemplateLiteralPathSegment segment, bool ignoreTrailingSlash) {
+		if (!ignoreTrailingSlash && (this.EndsWithSlash != segment.EndsWithSlash)) {
+			return false;
+		}
+		return TryLookup(segment.AsUnescapedString(), null);
+	}
+	public override void Lookup(string segment, NameValueCollection boundParameters) {
+		if (!TryLookup(segment, boundParameters)) {
+			Fx.Assert("How can that be? Lookup is expected to be called after IsMatch");
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
+				SR.GetString(SR.UTCSRLookupBeforeMatch)));
+		}
+	}
+
+	bool TryLookup(string segment, NameValueCollection boundParameters) {
+		int segmentPosition = 0;
+		if (!string.IsNullOrEmpty(this.firstLiteral)) {
+			if (segment.StartsWith(this.firstLiteral, StringComparison.Ordinal)) {
+				segmentPosition = this.firstLiteral.Length;
+			} else {
+				return false;
+			}
+		}
+		for (int pairIndex = 0; pairIndex < this.varLitPairs.Count - 1; pairIndex++) {
+			int nextLiteralPosition = segment.IndexOf(this.varLitPairs[pairIndex].Literal, segmentPosition, StringComparison.Ordinal);
+			if (nextLiteralPosition < segmentPosition + 1) {
+				return false;
+			}
+			if (boundParameters != null) {
+				string varValue = segment.Substring(segmentPosition, nextLiteralPosition - segmentPosition);
+				boundParameters.Add(this.varLitPairs[pairIndex].VarName, varValue);
+			}
+			segmentPosition = nextLiteralPosition + this.varLitPairs[pairIndex].Literal.Length;
+		}
+		if (segmentPosition < segment.Length) {
+			if (string.IsNullOrEmpty(this.varLitPairs[varLitPairs.Count - 1].Literal)) {
+				if (boundParameters != null) {
+					boundParameters.Add(this.varLitPairs[varLitPairs.Count - 1].VarName,
+						segment.Substring(segmentPosition));
+				}
+				return true;
+			} else if ((segmentPosition + this.varLitPairs[varLitPairs.Count - 1].Literal.Length < segment.Length) &&
+				  segment.EndsWith(this.varLitPairs[varLitPairs.Count - 1].Literal, StringComparison.Ordinal)) {
+				if (boundParameters != null) {
+					boundParameters.Add(this.varLitPairs[varLitPairs.Count - 1].VarName,
+						segment.Substring(segmentPosition, segment.Length - segmentPosition - this.varLitPairs[varLitPairs.Count - 1].Literal.Length));
+				}
+				return true;
+			} else {
+				return false;
+			}
+		} else {
+			return false;
+		}
+	}
+
+	// A note about comparing compound segments:
+	//  We are using this for generating the sorted collections at the nodes of the UriTemplateTrieNode.
+	//  The idea is that we are sorting the segments based on preferred matching, when we have two
+	//  compound segments matching the same wire segment, we will give preference to the preceding one.
+	//  The order is based on the following concepts:
+	//   - We are defining four classes of compound segments: prefix+suffix, prefix-only, suffix-only 
+	//      and none
+	//   - Whenever we are comparing segments from different class the preferred one is the segment with
+	//      the prefared class, based on the order we defined them (p+s \ p \ s \ n).
+	//   - Within each class the preference is based on the prefix\suffix, while prefix has precedence 
+	//      over suffix if both exists.
+	//   - If after comparing the class, as well as the prefix\suffix, we didn't reach to a conclusion,
+	//      the preference is given to the segment with more variables parts.
+	//  This order mostly follows the intuitive common sense; the major issue comes from preferring the
+	//  prefix over the suffix in the case where both exist. This is derived from the problematic of any
+	//  other type of solution that don't prefere the prefix over the suffix or vice versa. To better 
+	//  understanding lets considered the following example:
+	//   In comparing 'foo{x}bar' and 'food{x}ar', unless we are preferring prefix or suffix, we have
+	//   to state that they have the same order. So is the case with 'foo{x}babar' and 'food{x}ar', which
+	//   will lead us to claiming the 'foo{x}bar' and 'foo{x}babar' are from the same order, which they
+	//   clearly are not. 
+	//  Taking other approaches to this problem results in similar cases. The only solution is preferring
+	//  either the prefix or the suffix over the other; since we already preferred prefix over suffix
+	//  implicitly (we preferred the prefix only class over the suffix only, we also prefared literal
+	//  over variable, if in the same path segment) that still maintain consistency.
+	//  Therefore:
+	//    - 'food{var}' should be before 'foo{var}'; '{x}.{y}.{z}' should be before '{x}.{y}'.
+	//    - the order between '{var}bar' and '{var}qux' is not important
+	//    - '{x}.{y}' and '{x}_{y}' should have the same order
+	//    - 'foo{x}bar' is less preferred than 'food{x}ar'
+	//  In the above third case - if we are opening the table with allowDuplicate=false, we will throw;
+	//  if we are opening it with allowDuplicate=true we will let it go and might match both templates
+	//  for certain wire candidates.
+	int IComparable<UriTemplateCompoundPathSegment>.CompareTo(UriTemplateCompoundPathSegment other) {
+		Fx.Assert(other != null, "We are only expected to get here for comparing real compound segments");
+
+		switch (this.csClass) {
+			case CompoundSegmentClass.HasPrefixAndSuffix:
+				switch (other.csClass) {
+					case CompoundSegmentClass.HasPrefixAndSuffix:
+						return CompareToOtherThatHasPrefixAndSuffix(other);
+
+					case CompoundSegmentClass.HasOnlyPrefix:
+					case CompoundSegmentClass.HasOnlySuffix:
+					case CompoundSegmentClass.HasNoPrefixNorSuffix:
+						return -1;
+
+					default:
+						Fx.Assert("Invalid other.CompoundSegmentClass");
+						return 0;
+				}
+
+			case CompoundSegmentClass.HasOnlyPrefix:
+				switch (other.csClass) {
+					case CompoundSegmentClass.HasPrefixAndSuffix:
+						return 1;
+
+					case CompoundSegmentClass.HasOnlyPrefix:
+						return CompareToOtherThatHasOnlyPrefix(other);
+
+					case CompoundSegmentClass.HasOnlySuffix:
+					case CompoundSegmentClass.HasNoPrefixNorSuffix:
+						return -1;
+
+					default:
+						Fx.Assert("Invalid other.CompoundSegmentClass");
+						return 0;
+				}
+
+			case CompoundSegmentClass.HasOnlySuffix:
+				switch (other.csClass) {
+					case CompoundSegmentClass.HasPrefixAndSuffix:
+					case CompoundSegmentClass.HasOnlyPrefix:
+						return 1;
+
+					case CompoundSegmentClass.HasOnlySuffix:
+						return CompareToOtherThatHasOnlySuffix(other);
+
+					case CompoundSegmentClass.HasNoPrefixNorSuffix:
+						return -1;
+
+					default:
+						Fx.Assert("Invalid other.CompoundSegmentClass");
+						return 0;
+				}
+
+			case CompoundSegmentClass.HasNoPrefixNorSuffix:
+				switch (other.csClass) {
+					case CompoundSegmentClass.HasPrefixAndSuffix:
+					case CompoundSegmentClass.HasOnlyPrefix:
+					case CompoundSegmentClass.HasOnlySuffix:
+						return 1;
+
+					case CompoundSegmentClass.HasNoPrefixNorSuffix:
+						return CompareToOtherThatHasNoPrefixNorSuffix(other);
+
+					default:
+						Fx.Assert("Invalid other.CompoundSegmentClass");
+						return 0;
+				}
+
+			default:
+				Fx.Assert("Invalid this.CompoundSegmentClass");
+				return 0;
+		}
+	}
+	int CompareToOtherThatHasPrefixAndSuffix(UriTemplateCompoundPathSegment other) {
+		Fx.Assert(this.csClass == CompoundSegmentClass.HasPrefixAndSuffix, "Otherwise, how did we got here?");
+		Fx.Assert(other.csClass == CompoundSegmentClass.HasPrefixAndSuffix, "Otherwise, how did we got here?");
+
+		// In this case we are determining the order based on the prefix of the two segments,
+		//  then by their suffix and then based on the number of variables
+		int prefixOrder = ComparePrefixToOtherPrefix(other);
+		if (prefixOrder == 0) {
+			int suffixOrder = CompareSuffixToOtherSuffix(other);
+			if (suffixOrder == 0) {
+				return (other.varLitPairs.Count - this.varLitPairs.Count);
+			} else {
+				return suffixOrder;
+			}
+		} else {
+			return prefixOrder;
+		}
+	}
+	int CompareToOtherThatHasOnlyPrefix(UriTemplateCompoundPathSegment other) {
+		Fx.Assert(this.csClass == CompoundSegmentClass.HasOnlyPrefix, "Otherwise, how did we got here?");
+		Fx.Assert(other.csClass == CompoundSegmentClass.HasOnlyPrefix, "Otherwise, how did we got here?");
+
+		// In this case we are determining the order based on the prefix of the two segments,
+		//  then based on the number of variables
+		int prefixOrder = ComparePrefixToOtherPrefix(other);
+		if (prefixOrder == 0) {
+			return (other.varLitPairs.Count - this.varLitPairs.Count);
+		} else {
+			return prefixOrder;
+		}
+	}
+	int CompareToOtherThatHasOnlySuffix(UriTemplateCompoundPathSegment other) {
+		Fx.Assert(this.csClass == CompoundSegmentClass.HasOnlySuffix, "Otherwise, how did we got here?");
+		Fx.Assert(other.csClass == CompoundSegmentClass.HasOnlySuffix, "Otherwise, how did we got here?");
+
+		// In this case we are determining the order based on the suffix of the two segments,
+		//  then based on the number of variables
+		int suffixOrder = CompareSuffixToOtherSuffix(other);
+		if (suffixOrder == 0) {
+			return (other.varLitPairs.Count - this.varLitPairs.Count);
+		} else {
+			return suffixOrder;
+		}
+	}
+	int CompareToOtherThatHasNoPrefixNorSuffix(UriTemplateCompoundPathSegment other) {
+		Fx.Assert(this.csClass == CompoundSegmentClass.HasNoPrefixNorSuffix, "Otherwise, how did we got here?");
+		Fx.Assert(other.csClass == CompoundSegmentClass.HasNoPrefixNorSuffix, "Otherwise, how did we got here?");
+
+		// In this case the order is determined by the number of variables
+		return (other.varLitPairs.Count - this.varLitPairs.Count);
+	}
+	int ComparePrefixToOtherPrefix(UriTemplateCompoundPathSegment other) {
+		return string.Compare(other.firstLiteral, this.firstLiteral, StringComparison.OrdinalIgnoreCase);
+	}
+	int CompareSuffixToOtherSuffix(UriTemplateCompoundPathSegment other) {
+		string reversedSuffix = ReverseString(this.varLitPairs[this.varLitPairs.Count - 1].Literal);
+		string reversedOtherSuffix = ReverseString(other.varLitPairs[other.varLitPairs.Count - 1].Literal);
+		return string.Compare(reversedOtherSuffix, reversedSuffix, StringComparison.OrdinalIgnoreCase);
+	}
+	static string ReverseString(string stringToReverse) {
+		char[] reversedString = new char[stringToReverse.Length];
+		for (int i = 0; i < stringToReverse.Length; i++) {
+			reversedString[i] = stringToReverse[stringToReverse.Length - i - 1];
+		}
+		return new string(reversedString);
+	}
+
+	enum CompoundSegmentClass {
+		Undefined,
+		HasPrefixAndSuffix,
+		HasOnlyPrefix,
+		HasOnlySuffix,
+		HasNoPrefixNorSuffix
+	}
+
+	struct VarAndLitPair {
+		readonly string literal;
+		readonly string varName;
+
+		public VarAndLitPair(string varName, string literal) {
+			this.varName = varName;
+			this.literal = literal;
+		}
+
+		public string Literal {
+			get {
+				return this.literal;
+			}
+		}
+		public string VarName {
+			get {
+				return this.varName;
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateEquivalenceComparer.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateEquivalenceComparer.cs
new file mode 100644
index 00000000000..035ebd17ca5
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateEquivalenceComparer.cs
@@ -0,0 +1,47 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+#pragma warning disable 1634, 1691 // Stops compiler from warning about unknown warnings (for Presharp)
+
+namespace System;
+
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.ServiceModel;
+
+[TypeForwardedFrom("System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")]
+public class UriTemplateEquivalenceComparer : IEqualityComparer<UriTemplate> {
+	static UriTemplateEquivalenceComparer instance;
+	internal static UriTemplateEquivalenceComparer Instance {
+		get {
+			if (instance == null) {
+				// lock-free, fine if we allocate more than one
+				instance = new UriTemplateEquivalenceComparer();
+			}
+			return instance;
+		}
+	}
+
+	public bool Equals(UriTemplate x, UriTemplate y) {
+		if (x == null) {
+			return y == null;
+		}
+		return x.IsEquivalentTo(y);
+	}
+	public int GetHashCode(UriTemplate obj) {
+		if (obj == null) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("obj");
+		}
+#pragma warning disable 56506 // obj.xxx is never null
+		// prefer final literal segment (common literal prefixes are common in some scenarios)
+		for (int i = obj.segments.Count - 1; i >= 0; --i) {
+			if (obj.segments[i].Nature == UriTemplatePartType.Literal) {
+				return obj.segments[i].GetHashCode();
+			}
+		}
+		return obj.segments.Count + obj.queries.Count;
+#pragma warning restore 56506
+	}
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateHelpers.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateHelpers.cs
new file mode 100644
index 00000000000..77feec95f00
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateHelpers.cs
@@ -0,0 +1,302 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+namespace System;
+
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime;
+using System.ServiceModel;
+
+static class UriTemplateHelpers {
+	static UriTemplateQueryComparer queryComparer = new UriTemplateQueryComparer();
+	static UriTemplateQueryKeyComparer queryKeyComperar = new UriTemplateQueryKeyComparer();
+
+	[Conditional("DEBUG")]
+	public static void AssertCanonical(string s) {
+		Fx.Assert(s == s.ToUpperInvariant(), "non-canonicalized");
+	}
+	public static bool CanMatchQueryInterestingly(UriTemplate ut, NameValueCollection query, bool mustBeEspeciallyInteresting) {
+		if (ut.queries.Count == 0) {
+			return false; // trivial, not interesting
+		}
+		string[] queryKeys = query.AllKeys;
+		foreach (KeyValuePair<string, UriTemplateQueryValue> kvp in ut.queries) {
+			string queryKeyName = kvp.Key;
+			if (kvp.Value.Nature == UriTemplatePartType.Literal) {
+				bool queryKeysContainsQueryVarName = false;
+				for (int i = 0; i < queryKeys.Length; ++i) {
+					if (StringComparer.OrdinalIgnoreCase.Equals(queryKeys[i], queryKeyName)) {
+						queryKeysContainsQueryVarName = true;
+						break;
+					}
+				}
+				if (!queryKeysContainsQueryVarName) {
+					return false;
+				}
+				if (kvp.Value == UriTemplateQueryValue.Empty) {
+					if (!string.IsNullOrEmpty(query[queryKeyName])) {
+						return false;
+					}
+				} else {
+					if (((UriTemplateLiteralQueryValue)(kvp.Value)).AsRawUnescapedString() != query[queryKeyName]) {
+						return false;
+					}
+				}
+			} else {
+				if (mustBeEspeciallyInteresting && Array.IndexOf(queryKeys, queryKeyName) == -1) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+	public static bool CanMatchQueryTrivially(UriTemplate ut) {
+		return (ut.queries.Count == 0);
+	}
+
+	public static void DisambiguateSamePath(UriTemplate[] array, int a, int b, bool allowDuplicateEquivalentUriTemplates) {
+		// [a,b) all have same path
+		// ensure queries make them unambiguous
+		Fx.Assert(b > a, "array bug");
+		// sort empty queries to front
+		Array.Sort<UriTemplate>(array, a, b - a, queryComparer);
+		if (b - a == 1) {
+			return; // if only one, cannot be ambiguous
+		}
+		if (!allowDuplicateEquivalentUriTemplates) {
+			// ensure at most one empty query and ignore it
+			if (array[a].queries.Count == 0) {
+				a++;
+			}
+			if (array[a].queries.Count == 0) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
+					SR.UTTDuplicate, array[a].ToString(), array[a - 1].ToString())));
+			}
+			if (b - a == 1) {
+				return; // if only one, cannot be ambiguous
+			}
+		} else {
+			while (a < b && array[a].queries.Count == 0)  // all equivalent
+			{
+				a++;
+			}
+			if (b - a <= 1) {
+				return;
+			}
+		}
+		Fx.Assert(b > a, "array bug");
+		// now consider non-empty queries
+		// more than one, so enforce that
+		// forall
+		//   exist set of querystringvars S where
+		//     every op has literal value foreach var in S, and
+		//     those literal tuples are different
+		EnsureQueriesAreDistinct(array, a, b, allowDuplicateEquivalentUriTemplates);
+	}
+
+	public static IEqualityComparer<string> GetQueryKeyComparer() {
+		return queryKeyComperar;
+	}
+
+	public static string GetUriPath(Uri uri) {
+		return uri.GetComponents(UriComponents.Path | UriComponents.KeepDelimiter, UriFormat.Unescaped);
+	}
+	public static bool HasQueryLiteralRequirements(UriTemplate ut) {
+		foreach (UriTemplateQueryValue utqv in ut.queries.Values) {
+			if (utqv.Nature == UriTemplatePartType.Literal) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public static UriTemplatePartType IdentifyPartType(string part) {
+		// Identifying the nature of a string - Literal|Compound|Variable
+		// Algorithem is based on the following steps:
+		// - Finding the position of the first open curlly brace ('{') and close curlly brace ('}') 
+		//    in the string
+		// - If we don't find any this is a Literal
+		// - otherwise, we validate that position of the close brace is at least two characters from 
+		//    the position of the open brace
+		// - Then we identify if we are dealing with a compound string or a single variable string
+		//    + var name is not at the string start --> Compound
+		//    + var name is shorter then the entire string (End < Length-2 or End==Length-2 
+		//       and string ends with '/') --> Compound
+		//    + otherwise --> Variable
+		int varStartIndex = part.IndexOf("{", StringComparison.Ordinal);
+		int varEndIndex = part.IndexOf("}", StringComparison.Ordinal);
+		if (varStartIndex == -1) {
+			if (varEndIndex != -1) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
+					SR.GetString(SR.UTInvalidFormatSegmentOrQueryPart, part)));
+			}
+			return UriTemplatePartType.Literal;
+		} else {
+			if (varEndIndex < varStartIndex + 2) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
+					SR.GetString(SR.UTInvalidFormatSegmentOrQueryPart, part)));
+			}
+			if (varStartIndex > 0) {
+				return UriTemplatePartType.Compound;
+			} else if ((varEndIndex < part.Length - 2) ||
+				  ((varEndIndex == part.Length - 2) && !part.EndsWith("/", StringComparison.Ordinal))) {
+				return UriTemplatePartType.Compound;
+			} else {
+				return UriTemplatePartType.Variable;
+			}
+		}
+	}
+	public static bool IsWildcardPath(string path) {
+		if (path.IndexOf('/') != -1) {
+			return false;
+		}
+		UriTemplatePartType partType;
+		return IsWildcardSegment(path, out partType);
+	}
+
+	[SuppressMessage("Microsoft.Design", "CA1021:AvoidOutParameters", Justification = "This is internal method that needs to return multiple things")]
+	public static bool IsWildcardSegment(string segment, out UriTemplatePartType type) {
+		type = IdentifyPartType(segment);
+		switch (type) {
+			case UriTemplatePartType.Literal:
+				return (string.Compare(segment, UriTemplate.WildcardPath, StringComparison.Ordinal) == 0);
+
+			case UriTemplatePartType.Compound:
+				return false;
+
+			case UriTemplatePartType.Variable:
+				return ((segment.IndexOf(UriTemplate.WildcardPath, StringComparison.Ordinal) == 1) &&
+					!segment.EndsWith("/", StringComparison.Ordinal) &&
+					(segment.Length > UriTemplate.WildcardPath.Length + 2));
+
+			default:
+				Fx.Assert("Bad part type identification !");
+				return false;
+		}
+	}
+	public static NameValueCollection ParseQueryString(string query) {
+		// We are adjusting the parsing of UrlUtility.ParseQueryString, which identify
+		//  ?wsdl as a null key with wsdl as a value
+		NameValueCollection result = UrlUtility.ParseQueryString(query);
+		string nullKeyValuesString = result[(string)null];
+		if (!string.IsNullOrEmpty(nullKeyValuesString)) {
+			result.Remove(null);
+			string[] nullKeyValues = nullKeyValuesString.Split(',');
+			for (int i = 0; i < nullKeyValues.Length; i++) {
+				result.Add(nullKeyValues[i], null);
+			}
+		}
+		return result;
+	}
+	static bool AllTemplatesAreEquivalent(IList<UriTemplate> array, int a, int b) {
+		for (int i = a; i < b - 1; ++i) {
+			if (!array[i].IsEquivalentTo(array[i + 1])) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	static void EnsureQueriesAreDistinct(UriTemplate[] array, int a, int b, bool allowDuplicateEquivalentUriTemplates) {
+		Dictionary<string, byte> queryVarNamesWithLiteralVals = new Dictionary<string, byte>(StringComparer.OrdinalIgnoreCase);
+		for (int i = a; i < b; ++i) {
+			foreach (KeyValuePair<string, UriTemplateQueryValue> kvp in array[i].queries) {
+				if (kvp.Value.Nature == UriTemplatePartType.Literal) {
+					if (!queryVarNamesWithLiteralVals.ContainsKey(kvp.Key)) {
+						queryVarNamesWithLiteralVals.Add(kvp.Key, 0);
+					}
+				}
+			}
+		}
+		// now we have set of possibilities:
+		// further refine to only those for whom all templates have literals
+		Dictionary<string, byte> queryVarNamesAllLiterals = new Dictionary<string, byte>(queryVarNamesWithLiteralVals);
+		for (int i = a; i < b; ++i) {
+			foreach (string s in queryVarNamesWithLiteralVals.Keys) {
+				if (!array[i].queries.ContainsKey(s) || (array[i].queries[s].Nature != UriTemplatePartType.Literal)) {
+					queryVarNamesAllLiterals.Remove(s);
+				}
+			}
+		}
+		queryVarNamesWithLiteralVals = null; // ensure we don't reference this variable any more
+											 // now we have the set of names that every operation has as a literal
+		if (queryVarNamesAllLiterals.Count == 0) {
+			if (allowDuplicateEquivalentUriTemplates && AllTemplatesAreEquivalent(array, a, b)) {
+				// we're ok, do nothing
+			} else {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
+					SR.UTTOtherAmbiguousQueries, array[a].ToString())));
+			}
+		}
+		// now just ensure that each template has a unique tuple of values for the names
+		string[][] upsLits = new string[b - a][];
+		for (int i = 0; i < b - a; ++i) {
+			upsLits[i] = GetQueryLiterals(array[i + a], queryVarNamesAllLiterals);
+		}
+		for (int i = 0; i < b - a; ++i) {
+			for (int j = i + 1; j < b - a; ++j) {
+				if (Same(upsLits[i], upsLits[j])) {
+					if (!array[i + a].IsEquivalentTo(array[j + a])) {
+						throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
+							SR.UTTAmbiguousQueries, array[a + i].ToString(), array[j + a].ToString())));
+					}
+					Fx.Assert(array[i + a].IsEquivalentTo(array[j + a]), "bad equiv logic");
+					if (!allowDuplicateEquivalentUriTemplates) {
+						throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
+							SR.UTTDuplicate, array[a + i].ToString(), array[j + a].ToString())));
+					}
+				}
+			}
+		}
+		// we're good.  whew!
+	}
+	static string[] GetQueryLiterals(UriTemplate up, Dictionary<string, byte> queryVarNames) {
+		string[] queryLitVals = new string[queryVarNames.Count];
+		int i = 0;
+		foreach (string queryVarName in queryVarNames.Keys) {
+			Fx.Assert(up.queries.ContainsKey(queryVarName), "query doesn't have name");
+			UriTemplateQueryValue utqv = up.queries[queryVarName];
+			Fx.Assert(utqv.Nature == UriTemplatePartType.Literal, "query for name is not literal");
+			if (utqv == UriTemplateQueryValue.Empty) {
+				queryLitVals[i] = null;
+			} else {
+				queryLitVals[i] = ((UriTemplateLiteralQueryValue)(utqv)).AsRawUnescapedString();
+			}
+			++i;
+		}
+		return queryLitVals;
+	}
+	static bool Same(string[] a, string[] b) {
+		Fx.Assert(a.Length == b.Length, "arrays not same length");
+		for (int i = 0; i < a.Length; ++i) {
+			if (a[i] != b[i]) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	class UriTemplateQueryComparer : IComparer<UriTemplate> {
+		public int Compare(UriTemplate x, UriTemplate y) {
+			// sort the empty queries to the front
+			return Comparer<int>.Default.Compare(x.queries.Count, y.queries.Count);
+		}
+	}
+	class UriTemplateQueryKeyComparer : IEqualityComparer<string> {
+		public bool Equals(string x, string y) {
+			return (string.Compare(x, y, StringComparison.OrdinalIgnoreCase) == 0);
+		}
+		public int GetHashCode(string obj) {
+			if (obj == null) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("obj");
+			}
+			return obj.ToUpperInvariant().GetHashCode();
+		}
+	}
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateLiteralPathSegment.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateLiteralPathSegment.cs
new file mode 100644
index 00000000000..733ae2b7103
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateLiteralPathSegment.cs
@@ -0,0 +1,115 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+namespace System;
+
+using System.Collections.Specialized;
+using System.Runtime;
+using System.ServiceModel;
+using System.Text;
+
+// thin wrapper around string; use type system to help ensure we
+// are doing canonicalization right/consistently
+class UriTemplateLiteralPathSegment : UriTemplatePathSegment, IComparable<UriTemplateLiteralPathSegment> {
+
+	// segment doesn't store trailing slash
+	readonly string segment;
+	static Uri dummyUri = new Uri("http://localhost");
+
+	UriTemplateLiteralPathSegment(string segment)
+		: base(segment, UriTemplatePartType.Literal, segment.EndsWith("/", StringComparison.Ordinal)) {
+		Fx.Assert(segment != null, "bad literal segment");
+		if (this.EndsWithSlash) {
+			this.segment = segment.Remove(segment.Length - 1);
+		} else {
+			this.segment = segment;
+		}
+	}
+	public static new UriTemplateLiteralPathSegment CreateFromUriTemplate(string segment, UriTemplate template) {
+		// run it through UriBuilder to escape-if-necessary it
+		if (string.Compare(segment, "/", StringComparison.Ordinal) == 0) {
+			// running an empty segment through UriBuilder has unexpected/wrong results
+			return new UriTemplateLiteralPathSegment("/");
+		}
+		if (segment.IndexOf(UriTemplate.WildcardPath, StringComparison.Ordinal) != -1) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new FormatException(
+				SR.GetString(SR.UTInvalidWildcardInVariableOrLiteral, template.originalTemplate, UriTemplate.WildcardPath)));
+		}
+		// '*' is not usually escaped by the Uri\UriBuilder to %2a, since we forbid passing a
+		// clear character and the workaroud is to pass the escaped form, we should replace the
+		// escaped form with the regular one.
+		segment = segment.Replace("%2a", "*").Replace("%2A", "*");
+		UriBuilder ub = new UriBuilder(dummyUri);
+		ub.Path = segment;
+		string escapedIfNecessarySegment = ub.Uri.AbsolutePath.Substring(1);
+		if (escapedIfNecessarySegment == string.Empty) {
+			// This path through UriBuilder will sometimes '----' various segments
+			// such as '../' and './'.  When this happens and the result is an empty
+			// string, we should just throw and tell the user we don't handle that.
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("segment",
+				SR.GetString(SR.UTInvalidFormatSegmentOrQueryPart, segment));
+		}
+		return new UriTemplateLiteralPathSegment(escapedIfNecessarySegment);
+	}
+	public static UriTemplateLiteralPathSegment CreateFromWireData(string segment) {
+		return new UriTemplateLiteralPathSegment(segment);
+	}
+
+	public string AsUnescapedString() {
+		Fx.Assert(this.segment != null, "this should only be called by Bind\\Lookup");
+		return Uri.UnescapeDataString(this.segment);
+	}
+	public override void Bind(string[] values, ref int valueIndex, StringBuilder path) {
+		if (this.EndsWithSlash) {
+			path.AppendFormat("{0}/", AsUnescapedString());
+		} else {
+			path.Append(AsUnescapedString());
+		}
+	}
+
+	public int CompareTo(UriTemplateLiteralPathSegment other) {
+		return StringComparer.OrdinalIgnoreCase.Compare(this.segment, other.segment);
+	}
+
+	public override bool Equals(object obj) {
+		UriTemplateLiteralPathSegment lps = obj as UriTemplateLiteralPathSegment;
+		if (lps == null) {
+			Fx.Assert("why would we ever call this?");
+			return false;
+		} else {
+			return ((this.EndsWithSlash == lps.EndsWithSlash) &&
+				StringComparer.OrdinalIgnoreCase.Equals(this.segment, lps.segment));
+		}
+	}
+	public override int GetHashCode() {
+		return StringComparer.OrdinalIgnoreCase.GetHashCode(this.segment);
+	}
+
+	public override bool IsEquivalentTo(UriTemplatePathSegment other, bool ignoreTrailingSlash) {
+		if (other == null) {
+			Fx.Assert("why would we ever call this?");
+			return false;
+		}
+		if (other.Nature != UriTemplatePartType.Literal) {
+			return false;
+		}
+		UriTemplateLiteralPathSegment otherAsLiteral = other as UriTemplateLiteralPathSegment;
+		Fx.Assert(otherAsLiteral != null, "The nature requires that this will be OK");
+		return IsMatch(otherAsLiteral, ignoreTrailingSlash);
+	}
+	public override bool IsMatch(UriTemplateLiteralPathSegment segment, bool ignoreTrailingSlash) {
+		if (!ignoreTrailingSlash && (segment.EndsWithSlash != this.EndsWithSlash)) {
+			return false;
+		}
+		return (CompareTo(segment) == 0);
+	}
+	public bool IsNullOrEmpty() {
+		return string.IsNullOrEmpty(this.segment);
+	}
+	public override void Lookup(string segment, NameValueCollection boundParameters) {
+		Fx.Assert(StringComparer.OrdinalIgnoreCase.Compare(AsUnescapedString(), segment) == 0,
+			"How can that be? Lookup is expected to be called after IsMatch");
+	}
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateLiteralQueryValue.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateLiteralQueryValue.cs
new file mode 100644
index 00000000000..36b4d079a02
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateLiteralQueryValue.cs
@@ -0,0 +1,68 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+namespace System;
+
+using System.Collections.Specialized;
+using System.Runtime;
+using System.Text;
+
+// thin wrapper around string; use type system to help ensure we
+// are doing canonicalization right/consistently
+class UriTemplateLiteralQueryValue : UriTemplateQueryValue, IComparable<UriTemplateLiteralQueryValue> {
+	readonly string value; // an unescaped representation
+
+	UriTemplateLiteralQueryValue(string value)
+		: base(UriTemplatePartType.Literal) {
+		Fx.Assert(value != null, "bad literal value");
+		this.value = value;
+	}
+	public static UriTemplateLiteralQueryValue CreateFromUriTemplate(string value) {
+		return new UriTemplateLiteralQueryValue(UrlUtility.UrlDecode(value, Encoding.UTF8));
+	}
+
+	public string AsEscapedString() {
+		return UrlUtility.UrlEncode(this.value, Encoding.UTF8);
+	}
+	public string AsRawUnescapedString() {
+		return this.value;
+	}
+	public override void Bind(string keyName, string[] values, ref int valueIndex, StringBuilder query) {
+		query.AppendFormat("&{0}={1}", UrlUtility.UrlEncode(keyName, Encoding.UTF8), AsEscapedString());
+	}
+
+	public int CompareTo(UriTemplateLiteralQueryValue other) {
+		return string.Compare(this.value, other.value, StringComparison.Ordinal);
+	}
+
+	public override bool Equals(object obj) {
+		UriTemplateLiteralQueryValue lqv = obj as UriTemplateLiteralQueryValue;
+		if (lqv == null) {
+			Fx.Assert("why would we ever call this?");
+			return false;
+		} else {
+			return this.value == lqv.value;
+		}
+	}
+	public override int GetHashCode() {
+		return this.value.GetHashCode();
+	}
+
+	public override bool IsEquivalentTo(UriTemplateQueryValue other) {
+		if (other == null) {
+			Fx.Assert("why would we ever call this?");
+			return false;
+		}
+		if (other.Nature != UriTemplatePartType.Literal) {
+			return false;
+		}
+		UriTemplateLiteralQueryValue otherAsLiteral = other as UriTemplateLiteralQueryValue;
+		Fx.Assert(otherAsLiteral != null, "The nature requires that this will be OK");
+		return (CompareTo(otherAsLiteral) == 0);
+	}
+	public override void Lookup(string value, NameValueCollection boundParameters) {
+		Fx.Assert(string.Compare(this.value, value, StringComparison.Ordinal) == 0, "How can that be?");
+	}
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateMatch.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateMatch.cs
new file mode 100644
index 00000000000..1cc21b47b5b
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateMatch.cs
@@ -0,0 +1,144 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+namespace System;
+
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Net;
+using System.Runtime;
+using System.Runtime.CompilerServices;
+using System.ServiceModel.Channels;
+
+[TypeForwardedFrom("System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")]
+public class UriTemplateMatch {
+	Uri baseUri;
+	NameValueCollection boundVariables;
+	object data;
+	NameValueCollection queryParameters;
+	Collection<string> relativePathSegments;
+	Uri requestUri;
+	UriTemplate template;
+	Collection<string> wildcardPathSegments;
+	int wildcardSegmentsStartOffset = -1;
+	Uri originalBaseUri;
+	HttpRequestMessageProperty requestProp;
+
+	public UriTemplateMatch() {
+	}
+
+	public Uri BaseUri   // the base address, untouched
+	{
+		get {
+			if (this.baseUri == null && this.originalBaseUri != null) {
+				this.baseUri = UriTemplate.RewriteUri(this.originalBaseUri, this.requestProp.Headers[HttpRequestHeader.Host]);
+			}
+			return this.baseUri;
+		}
+		set {
+			this.baseUri = value;
+			this.originalBaseUri = null;
+			this.requestProp = null;
+		}
+	}
+	public NameValueCollection BoundVariables // result of TryLookup, values are decoded
+	{
+		get {
+			if (this.boundVariables == null) {
+				this.boundVariables = new NameValueCollection();
+			}
+			return this.boundVariables;
+		}
+	}
+	public object Data {
+		get {
+			return this.data;
+		}
+		set {
+			this.data = value;
+		}
+	}
+	public NameValueCollection QueryParameters  // the result of UrlUtility.ParseQueryString (keys and values are decoded)
+	{
+		get {
+			if (this.queryParameters == null) {
+				PopulateQueryParameters();
+			}
+			return this.queryParameters;
+		}
+	}
+	public Collection<string> RelativePathSegments  // entire Path (after the base address), decoded
+	{
+		get {
+			if (this.relativePathSegments == null) {
+				this.relativePathSegments = new Collection<string>();
+			}
+			return this.relativePathSegments;
+		}
+	}
+	public Uri RequestUri  // uri on the wire, untouched
+	{
+		get {
+			return this.requestUri;
+		}
+		set {
+			this.requestUri = value;
+		}
+	}
+	public UriTemplate Template // which one got matched
+	{
+		get {
+			return this.template;
+		}
+		set {
+			this.template = value;
+		}
+	}
+	public Collection<string> WildcardPathSegments  // just the Path part matched by "*", decoded
+	{
+		get {
+			if (this.wildcardPathSegments == null) {
+				PopulateWildcardSegments();
+			}
+			return this.wildcardPathSegments;
+		}
+	}
+
+	internal void SetQueryParameters(NameValueCollection queryParameters) {
+		this.queryParameters = new NameValueCollection(queryParameters);
+	}
+	internal void SetRelativePathSegments(Collection<string> segments) {
+		Fx.Assert(segments != null, "segments != null");
+		this.relativePathSegments = segments;
+	}
+	internal void SetWildcardPathSegmentsStart(int startOffset) {
+		Fx.Assert(startOffset >= 0, "startOffset >= 0");
+		this.wildcardSegmentsStartOffset = startOffset;
+	}
+
+	internal void SetBaseUri(Uri originalBaseUri, HttpRequestMessageProperty requestProp) {
+		this.baseUri = null;
+		this.originalBaseUri = originalBaseUri;
+		this.requestProp = requestProp;
+	}
+
+	void PopulateQueryParameters() {
+		if (this.requestUri != null) {
+			this.queryParameters = UriTemplateHelpers.ParseQueryString(this.requestUri.Query);
+		} else {
+			this.queryParameters = new NameValueCollection();
+		}
+	}
+	void PopulateWildcardSegments() {
+		if (wildcardSegmentsStartOffset != -1) {
+			this.wildcardPathSegments = new Collection<string>();
+			for (int i = this.wildcardSegmentsStartOffset; i < this.RelativePathSegments.Count; ++i) {
+				this.wildcardPathSegments.Add(this.RelativePathSegments[i]);
+			}
+		} else {
+			this.wildcardPathSegments = new Collection<string>();
+		}
+	}
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateMatchException.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateMatchException.cs
new file mode 100644
index 00000000000..9841227f71c
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateMatchException.cs
@@ -0,0 +1,16 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+namespace System;
+
+using System.Runtime.CompilerServices;
+
+[TypeForwardedFrom("System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")]
+[Serializable]
+public class UriTemplateMatchException : SystemException {
+	public UriTemplateMatchException(string message)
+		: base(message) {
+	}
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplatePartType.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplatePartType.cs
new file mode 100644
index 00000000000..07585cf09f9
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplatePartType.cs
@@ -0,0 +1,12 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+namespace System;
+
+enum UriTemplatePartType {
+	Literal,
+	Compound,
+	Variable
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplatePathPartiallyEquivalentSet.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplatePathPartiallyEquivalentSet.cs
new file mode 100644
index 00000000000..d11b39742f7
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplatePathPartiallyEquivalentSet.cs
@@ -0,0 +1,35 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+namespace System;
+
+using System.Collections.Generic;
+
+// This class was named UriTemplatePathEquivalentSet in the Orcas bits, where it used to
+//  represent a set of uri templates, which are equivalent in thier path. The introduction
+//  of terminal defaults, caused it to be no longer true; now it is representing a set
+//  of templates, which are equivalent in their path till a certian point, which is stored
+//  in the segmentsCount field. To highlight that fact the class was renamed as
+//  UriTemplatePathPartiallyEquivalentSet.
+class UriTemplatePathPartiallyEquivalentSet {
+	List<KeyValuePair<UriTemplate, object>> kvps;
+	int segmentsCount;
+
+	public UriTemplatePathPartiallyEquivalentSet(int segmentsCount) {
+		this.segmentsCount = segmentsCount;
+		this.kvps = new List<KeyValuePair<UriTemplate, object>>();
+	}
+	public List<KeyValuePair<UriTemplate, object>> Items {
+		get {
+			return this.kvps;
+		}
+	}
+
+	public int SegmentsCount {
+		get {
+			return this.segmentsCount;
+		}
+	}
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplatePathSegment.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplatePathSegment.cs
new file mode 100644
index 00000000000..4caf18ee672
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplatePathSegment.cs
@@ -0,0 +1,75 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+namespace System;
+
+using System.Collections.Specialized;
+using System.Diagnostics;
+using System.Runtime;
+using System.Text;
+
+// This represents a Path segment, which can either be a Literal, a Variable or a Compound
+[DebuggerDisplay("Segment={originalSegment} Nature={nature}")]
+abstract class UriTemplatePathSegment {
+	readonly bool endsWithSlash;
+	readonly UriTemplatePartType nature;
+	readonly string originalSegment;
+
+	protected UriTemplatePathSegment(string originalSegment, UriTemplatePartType nature,
+		bool endsWithSlash) {
+		this.originalSegment = originalSegment;
+		this.nature = nature;
+		this.endsWithSlash = endsWithSlash;
+	}
+	public bool EndsWithSlash {
+		get {
+			return this.endsWithSlash;
+		}
+	}
+	public UriTemplatePartType Nature {
+		get {
+			return this.nature;
+		}
+	}
+
+	public string OriginalSegment {
+		get {
+			return this.originalSegment;
+		}
+	}
+	public static UriTemplatePathSegment CreateFromUriTemplate(string segment, UriTemplate template) {
+		// Identifying the type of segment - Literal|Compound|Variable
+		switch (UriTemplateHelpers.IdentifyPartType(segment)) {
+			case UriTemplatePartType.Literal:
+				return UriTemplateLiteralPathSegment.CreateFromUriTemplate(segment, template);
+
+			case UriTemplatePartType.Compound:
+				return UriTemplateCompoundPathSegment.CreateFromUriTemplate(segment, template);
+
+			case UriTemplatePartType.Variable:
+				if (segment.EndsWith("/", StringComparison.Ordinal)) {
+					string varName = template.AddPathVariable(UriTemplatePartType.Variable,
+						segment.Substring(1, segment.Length - 3));
+					return new UriTemplateVariablePathSegment(segment, true, varName);
+				} else {
+					string varName = template.AddPathVariable(UriTemplatePartType.Variable,
+						segment.Substring(1, segment.Length - 2));
+					return new UriTemplateVariablePathSegment(segment, false, varName);
+				}
+
+			default:
+				Fx.Assert("Invalid value from IdentifyStringNature");
+				return null;
+		}
+	}
+	public abstract void Bind(string[] values, ref int valueIndex, StringBuilder path);
+
+	public abstract bool IsEquivalentTo(UriTemplatePathSegment other, bool ignoreTrailingSlash);
+	public bool IsMatch(UriTemplateLiteralPathSegment segment) {
+		return IsMatch(segment, false);
+	}
+	public abstract bool IsMatch(UriTemplateLiteralPathSegment segment, bool ignoreTrailingSlash);
+	public abstract void Lookup(string segment, NameValueCollection boundParameters);
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateQueryValue.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateQueryValue.cs
new file mode 100644
index 00000000000..a69cb00d4a9
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateQueryValue.cs
@@ -0,0 +1,86 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+namespace System;
+
+using System.Collections.Specialized;
+using System.Runtime;
+using System.ServiceModel;
+using System.Text;
+
+// This represents a Query value, which can either be Empty, a Literal or a Variable
+abstract class UriTemplateQueryValue {
+
+	readonly UriTemplatePartType nature;
+	static UriTemplateQueryValue empty = new EmptyUriTemplateQueryValue();
+
+	protected UriTemplateQueryValue(UriTemplatePartType nature) {
+		this.nature = nature;
+	}
+
+	public static UriTemplateQueryValue Empty {
+		get {
+			return UriTemplateQueryValue.empty;
+		}
+	}
+
+	public UriTemplatePartType Nature {
+		get {
+			return this.nature;
+		}
+	}
+	public static UriTemplateQueryValue CreateFromUriTemplate(string value, UriTemplate template) {
+		// Checking for empty value
+		if (value == null) {
+			return UriTemplateQueryValue.Empty;
+		}
+		// Identifying the type of value - Literal|Compound|Variable
+		switch (UriTemplateHelpers.IdentifyPartType(value)) {
+			case UriTemplatePartType.Literal:
+				return UriTemplateLiteralQueryValue.CreateFromUriTemplate(value);
+
+			case UriTemplatePartType.Compound:
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
+					SR.UTQueryCannotHaveCompoundValue, template.originalTemplate)));
+
+			case UriTemplatePartType.Variable:
+				return new UriTemplateVariableQueryValue(template.AddQueryVariable(value.Substring(1, value.Length - 2)));
+
+			default:
+				Fx.Assert("Invalid value from IdentifyStringNature");
+				return null;
+		}
+	}
+
+	public static bool IsNullOrEmpty(UriTemplateQueryValue utqv) {
+		if (utqv == null) {
+			return true;
+		}
+		if (utqv == UriTemplateQueryValue.Empty) {
+			return true;
+		}
+		return false;
+	}
+	public abstract void Bind(string keyName, string[] values, ref int valueIndex, StringBuilder query);
+
+	public abstract bool IsEquivalentTo(UriTemplateQueryValue other);
+	public abstract void Lookup(string value, NameValueCollection boundParameters);
+
+	class EmptyUriTemplateQueryValue : UriTemplateQueryValue {
+		public EmptyUriTemplateQueryValue()
+			: base(UriTemplatePartType.Literal) {
+		}
+		public override void Bind(string keyName, string[] values, ref int valueIndex, StringBuilder query) {
+			query.AppendFormat("&{0}", UrlUtility.UrlEncode(keyName, Encoding.UTF8));
+		}
+
+		public override bool IsEquivalentTo(UriTemplateQueryValue other) {
+			return (other == UriTemplateQueryValue.Empty);
+		}
+		public override void Lookup(string value, NameValueCollection boundParameters) {
+			Fx.Assert(string.IsNullOrEmpty(value), "shouldn't have a value");
+		}
+	}
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateTable.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateTable.cs
new file mode 100644
index 00000000000..86675244e04
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateTable.cs
@@ -0,0 +1,484 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+namespace System;
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime;
+using System.Runtime.CompilerServices;
+using System.ServiceModel;
+
+// this class is thread-safe
+[TypeForwardedFrom("System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35")]
+public class UriTemplateTable {
+	Uri baseAddress;
+	string basePath;
+	Dictionary<string, FastPathInfo> fastPathTable; // key is uri.PathAndQuery, fastPathTable may be null
+	bool noTemplateHasQueryPart;
+	int numSegmentsInBaseAddress;
+	Uri originalUncanonicalizedBaseAddress;
+	UriTemplateTrieNode rootNode;
+	UriTemplatesCollection templates;
+	object thisLock;
+	bool addTrailingSlashToBaseAddress;
+
+	public UriTemplateTable()
+		: this(null, null, true) {
+	}
+	public UriTemplateTable(IEnumerable<KeyValuePair<UriTemplate, object>> keyValuePairs)
+		: this(null, keyValuePairs, true) {
+	}
+	public UriTemplateTable(Uri baseAddress)
+		: this(baseAddress, null, true) {
+	}
+
+	internal UriTemplateTable(Uri baseAddress, bool addTrailingSlashToBaseAddress)
+		: this(baseAddress, null, addTrailingSlashToBaseAddress) {
+	}
+
+	public UriTemplateTable(Uri baseAddress, IEnumerable<KeyValuePair<UriTemplate, object>> keyValuePairs)
+		: this(baseAddress, keyValuePairs, true) {
+	}
+
+	internal UriTemplateTable(Uri baseAddress, IEnumerable<KeyValuePair<UriTemplate, object>> keyValuePairs, bool addTrailingSlashToBaseAddress) {
+		if (baseAddress != null && !baseAddress.IsAbsoluteUri) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("baseAddress", SR.GetString(
+				SR.UTTMustBeAbsolute));
+		}
+
+		this.addTrailingSlashToBaseAddress = addTrailingSlashToBaseAddress;
+		this.originalUncanonicalizedBaseAddress = baseAddress;
+
+		if (keyValuePairs != null) {
+			this.templates = new UriTemplatesCollection(keyValuePairs);
+		} else {
+			this.templates = new UriTemplatesCollection();
+		}
+
+		this.thisLock = new object();
+		this.baseAddress = baseAddress;
+		NormalizeBaseAddress();
+	}
+
+	public Uri BaseAddress {
+		get {
+			return this.baseAddress;
+		}
+		set {
+			if (value == null) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("value");
+			}
+			lock (this.thisLock) {
+				if (this.IsReadOnly) {
+					throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(
+						SR.GetString(SR.UTTCannotChangeBaseAddress)));
+				} else {
+					if (!value.IsAbsoluteUri) {
+						throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("value", SR.GetString(
+							SR.UTTBaseAddressMustBeAbsolute));
+					} else {
+						this.originalUncanonicalizedBaseAddress = value;
+						this.baseAddress = value;
+						NormalizeBaseAddress();
+					}
+				}
+			}
+		}
+	}
+
+	public Uri OriginalBaseAddress {
+		get {
+			return this.originalUncanonicalizedBaseAddress;
+		}
+	}
+
+	public bool IsReadOnly {
+		get {
+			return this.templates.IsFrozen;
+		}
+	}
+	public IList<KeyValuePair<UriTemplate, object>> KeyValuePairs {
+		get {
+			return this.templates;
+		}
+	}
+
+	public void MakeReadOnly(bool allowDuplicateEquivalentUriTemplates) {
+		// idempotent
+		lock (this.thisLock) {
+			if (!this.IsReadOnly) {
+				this.templates.Freeze();
+				Validate(allowDuplicateEquivalentUriTemplates);
+				ConstructFastPathTable();
+			}
+		}
+	}
+	public Collection<UriTemplateMatch> Match(Uri uri) {
+		if (uri == null) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("uri");
+		}
+		if (!uri.IsAbsoluteUri) {
+			return None();
+		}
+
+		this.MakeReadOnly(true);
+
+		// Matching path :
+		Collection<String> relativeSegments;
+		IList<UriTemplateTableMatchCandidate> candidates;
+		if (!FastComputeRelativeSegmentsAndLookup(uri, out relativeSegments, out candidates)) {
+			return None();
+		}
+		// Matching query :
+		NameValueCollection queryParameters = null;
+		if (!this.noTemplateHasQueryPart && AtLeastOneCandidateHasQueryPart(candidates)) {
+			Collection<UriTemplateTableMatchCandidate> nextCandidates = new Collection<UriTemplateTableMatchCandidate>();
+			Fx.Assert(nextCandidates.Count == 0, "nextCandidates should be empty");
+
+			// then deal with query
+			queryParameters = UriTemplateHelpers.ParseQueryString(uri.Query);
+			bool mustBeEspeciallyInteresting = NoCandidateHasQueryLiteralRequirementsAndThereIsAnEmptyFallback(candidates);
+			for (int i = 0; i < candidates.Count; i++) {
+				if (UriTemplateHelpers.CanMatchQueryInterestingly(candidates[i].Template, queryParameters, mustBeEspeciallyInteresting)) {
+					nextCandidates.Add(candidates[i]);
+				}
+			}
+			if (nextCandidates.Count > 1) {
+				Fx.Assert(AllEquivalent(nextCandidates, 0, nextCandidates.Count), "demux algorithm problem, multiple non-equivalent matches");
+			}
+
+			if (nextCandidates.Count == 0) {
+				for (int i = 0; i < candidates.Count; i++) {
+					if (UriTemplateHelpers.CanMatchQueryTrivially(candidates[i].Template)) {
+						nextCandidates.Add(candidates[i]);
+					}
+				}
+			}
+			if (nextCandidates.Count == 0) {
+				return None();
+			}
+			if (nextCandidates.Count > 1) {
+				Fx.Assert(AllEquivalent(nextCandidates, 0, nextCandidates.Count), "demux algorithm problem, multiple non-equivalent matches");
+			}
+
+			candidates = nextCandidates;
+		}
+		// Verifying that we have not broken the allowDuplicates settings because of terminal defaults
+		//  This situation can be caused when we are hosting ".../" and ".../{foo=xyz}" in the same
+		//  table. They are not equivalent; yet they reside together in the same path partially-equivalent
+		//  set. If we hit a uri that ends up in that particular end-of-path set, we want to provide the
+		//  user only the 'best' match and not both; thus preventing inconsistancy between the MakeReadonly
+		//  settings and the matching results. We will assume that the 'best' matches will be the ones with
+		//  the smallest number of segments - this will prefer ".../" over ".../{x=1}[/...]".
+		if (NotAllCandidatesArePathFullyEquivalent(candidates)) {
+			Collection<UriTemplateTableMatchCandidate> nextCandidates = new Collection<UriTemplateTableMatchCandidate>();
+			int minSegmentsCount = -1;
+			for (int i = 0; i < candidates.Count; i++) {
+				UriTemplateTableMatchCandidate candidate = candidates[i];
+				if (minSegmentsCount == -1) {
+					minSegmentsCount = candidate.Template.segments.Count;
+					nextCandidates.Add(candidate);
+				} else if (candidate.Template.segments.Count < minSegmentsCount) {
+					minSegmentsCount = candidate.Template.segments.Count;
+					nextCandidates.Clear();
+					nextCandidates.Add(candidate);
+				} else if (candidate.Template.segments.Count == minSegmentsCount) {
+					nextCandidates.Add(candidate);
+				}
+			}
+			Fx.Assert(minSegmentsCount != -1, "At least the first entry in the list should be kept");
+			Fx.Assert(nextCandidates.Count >= 1, "At least the first entry in the list should be kept");
+			Fx.Assert(nextCandidates[0].Template.segments.Count == minSegmentsCount, "Trivial");
+			candidates = nextCandidates;
+		}
+
+		// Building the actual result
+		Collection<UriTemplateMatch> actualResults = new Collection<UriTemplateMatch>();
+		for (int i = 0; i < candidates.Count; i++) {
+			UriTemplateTableMatchCandidate candidate = candidates[i];
+			UriTemplateMatch match = candidate.Template.CreateUriTemplateMatch(this.originalUncanonicalizedBaseAddress,
+				uri, candidate.Data, candidate.SegmentsCount, relativeSegments, queryParameters);
+			actualResults.Add(match);
+		}
+		return actualResults;
+	}
+	public UriTemplateMatch MatchSingle(Uri uri) {
+		Collection<UriTemplateMatch> c = this.Match(uri);
+		if (c.Count == 0) {
+			return null;
+		}
+		if (c.Count == 1) {
+			return c[0];
+		}
+		throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new UriTemplateMatchException(SR.GetString(
+			SR.UTTMultipleMatches)));
+	}
+
+	[SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "This method is called within a Debug assert")]
+	static bool AllEquivalent(IList<UriTemplateTableMatchCandidate> list, int a, int b) {
+		for (int i = a; i < b - 1; ++i) {
+			if (!list[i].Template.IsPathPartiallyEquivalentAt(list[i + 1].Template, list[i].SegmentsCount)) {
+				return false;
+			}
+			if (!list[i].Template.IsQueryEquivalent(list[i + 1].Template)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	static bool AtLeastOneCandidateHasQueryPart(IList<UriTemplateTableMatchCandidate> candidates) {
+		for (int i = 0; i < candidates.Count; i++) {
+			if (!UriTemplateHelpers.CanMatchQueryTrivially(candidates[i].Template)) {
+				return true;
+			}
+		}
+		return false;
+	}
+	static bool NoCandidateHasQueryLiteralRequirementsAndThereIsAnEmptyFallback(
+		IList<UriTemplateTableMatchCandidate> candidates) {
+		bool thereIsAmEmptyFallback = false;
+		for (int i = 0; i < candidates.Count; i++) {
+			if (UriTemplateHelpers.HasQueryLiteralRequirements(candidates[i].Template)) {
+				return false;
+			}
+			if (candidates[i].Template.queries.Count == 0) {
+				thereIsAmEmptyFallback = true;
+			}
+		}
+		return thereIsAmEmptyFallback;
+	}
+
+	static Collection<UriTemplateMatch> None() {
+		return new Collection<UriTemplateMatch>();
+	}
+	static bool NotAllCandidatesArePathFullyEquivalent(IList<UriTemplateTableMatchCandidate> candidates) {
+		if (candidates.Count <= 1) {
+			return false;
+		}
+
+		int segmentsCount = -1;
+		for (int i = 0; i < candidates.Count; i++) {
+			if (segmentsCount == -1) {
+				segmentsCount = candidates[i].Template.segments.Count;
+			} else if (segmentsCount != candidates[i].Template.segments.Count) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	bool ComputeRelativeSegmentsAndLookup(Uri uri,
+		ICollection<string> relativePathSegments, // add to this
+		ICollection<UriTemplateTableMatchCandidate> candidates) // matched candidates
+	{
+		string[] uriSegments = uri.Segments;
+		int numRelativeSegments = uriSegments.Length - this.numSegmentsInBaseAddress;
+		Fx.Assert(numRelativeSegments >= 0, "bad num segments");
+		UriTemplateLiteralPathSegment[] uSegments = new UriTemplateLiteralPathSegment[numRelativeSegments];
+		for (int i = 0; i < numRelativeSegments; ++i) {
+			string seg = uriSegments[i + this.numSegmentsInBaseAddress];
+			// compute representation for matching
+			UriTemplateLiteralPathSegment lps = UriTemplateLiteralPathSegment.CreateFromWireData(seg);
+			uSegments[i] = lps;
+			// compute representation to project out into results
+			string relPathSeg = Uri.UnescapeDataString(seg);
+			if (lps.EndsWithSlash) {
+				Fx.Assert(relPathSeg.EndsWith("/", StringComparison.Ordinal), "problem with relative path segment");
+				relPathSeg = relPathSeg.Substring(0, relPathSeg.Length - 1); // trim slash
+			}
+			relativePathSegments.Add(relPathSeg);
+		}
+		return rootNode.Match(uSegments, candidates);
+	}
+	void ConstructFastPathTable() {
+		this.noTemplateHasQueryPart = true;
+		foreach (KeyValuePair<UriTemplate, object> kvp in this.templates) {
+			UriTemplate ut = kvp.Key;
+			if (!UriTemplateHelpers.CanMatchQueryTrivially(ut)) {
+				this.noTemplateHasQueryPart = false;
+			}
+			if (ut.HasNoVariables && !ut.HasWildcard) {
+				// eligible for fast path
+				if (this.fastPathTable == null) {
+					this.fastPathTable = new Dictionary<string, FastPathInfo>();
+				}
+				Uri uri = ut.BindByPosition(this.originalUncanonicalizedBaseAddress);
+				string uriPath = UriTemplateHelpers.GetUriPath(uri);
+				if (this.fastPathTable.ContainsKey(uriPath)) {
+					// nothing to do, we've already seen it
+				} else {
+					FastPathInfo fpInfo = new FastPathInfo();
+					if (ComputeRelativeSegmentsAndLookup(uri, fpInfo.RelativePathSegments,
+						fpInfo.Candidates)) {
+						fpInfo.Freeze();
+						this.fastPathTable.Add(uriPath, fpInfo);
+					}
+				}
+			}
+		}
+	}
+	// this method checks the literal cache for a match if none, goes through the slower path of cracking the segments
+	bool FastComputeRelativeSegmentsAndLookup(Uri uri, out Collection<string> relativePathSegments,
+		out IList<UriTemplateTableMatchCandidate> candidates) {
+		// Consider fast-path and lookup
+		// return false if not under base uri
+		string uriPath = UriTemplateHelpers.GetUriPath(uri);
+		FastPathInfo fpInfo = null;
+		if ((this.fastPathTable != null) && this.fastPathTable.TryGetValue(uriPath, out fpInfo)) {
+			relativePathSegments = fpInfo.RelativePathSegments;
+			candidates = fpInfo.Candidates;
+			VerifyThatFastPathAndSlowPathHaveSameResults(uri, relativePathSegments, candidates);
+			return true;
+		} else {
+			relativePathSegments = new Collection<string>();
+			candidates = new Collection<UriTemplateTableMatchCandidate>();
+			return SlowComputeRelativeSegmentsAndLookup(uri, uriPath, relativePathSegments, candidates);
+		}
+	}
+
+	void NormalizeBaseAddress() {
+		if (this.baseAddress != null) {
+			// ensure trailing slash on baseAddress, so that IsBaseOf will work later
+			UriBuilder ub = new UriBuilder(this.baseAddress);
+			if (this.addTrailingSlashToBaseAddress && !ub.Path.EndsWith("/", StringComparison.Ordinal)) {
+				ub.Path = ub.Path + "/";
+			}
+			ub.Host = "localhost"; // always normalize to localhost
+			ub.Port = -1;
+			ub.UserName = null;
+			ub.Password = null;
+			ub.Path = ub.Path.ToUpperInvariant();
+			ub.Scheme = Uri.UriSchemeHttp;
+			this.baseAddress = ub.Uri;
+			basePath = UriTemplateHelpers.GetUriPath(this.baseAddress);
+		}
+	}
+	bool SlowComputeRelativeSegmentsAndLookup(Uri uri, string uriPath, Collection<string> relativePathSegments,
+		ICollection<UriTemplateTableMatchCandidate> candidates) {
+		// ensure 'under' the base address
+		if (uriPath.Length < basePath.Length) {
+			return false;
+		}
+
+		if (!uriPath.StartsWith(basePath, StringComparison.OrdinalIgnoreCase)) {
+			return false;
+		} else {
+			// uriPath StartsWith basePath, but this check is not enough - basePath 'service1' should not match with uriPath 'service123'
+			// make sure that after the match the next character is /, this is to avoid a uriPath of the form /service12/ matching with a basepath of the form /service1
+			if (uriPath.Length > basePath.Length && !basePath.EndsWith("/", StringComparison.Ordinal) && uriPath[basePath.Length] != '/') {
+				return false;
+			}
+		}
+
+		return ComputeRelativeSegmentsAndLookup(uri, relativePathSegments, candidates);
+	}
+
+	void Validate(bool allowDuplicateEquivalentUriTemplates) {
+		if (this.baseAddress == null) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
+				SR.UTTBaseAddressNotSet)));
+		}
+		this.numSegmentsInBaseAddress = this.baseAddress.Segments.Length;
+		if (this.templates.Count == 0) {
+			throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
+				SR.UTTEmptyKeyValuePairs)));
+		}
+		// build the trie and
+		// validate that forall Uri u, at most one UriTemplate is a best match for u
+		rootNode = UriTemplateTrieNode.Make(this.templates, allowDuplicateEquivalentUriTemplates);
+	}
+	[Conditional("DEBUG")]
+	void VerifyThatFastPathAndSlowPathHaveSameResults(Uri uri, Collection<string> fastPathRelativePathSegments,
+		IList<UriTemplateTableMatchCandidate> fastPathCandidates) {
+		Collection<string> slowPathRelativePathSegments = new Collection<string>();
+		List<UriTemplateTableMatchCandidate> slowPathCandidates = new List<UriTemplateTableMatchCandidate>();
+		if (!SlowComputeRelativeSegmentsAndLookup(uri, UriTemplateHelpers.GetUriPath(uri),
+			slowPathRelativePathSegments, slowPathCandidates)) {
+			Fx.Assert("fast path yielded a result but slow path yielded no result");
+		}
+		// compare results
+		if (fastPathRelativePathSegments.Count != slowPathRelativePathSegments.Count) {
+			Fx.Assert("fast path yielded different number of segments from slow path");
+		}
+		for (int i = 0; i < fastPathRelativePathSegments.Count; ++i) {
+			if (fastPathRelativePathSegments[i] != slowPathRelativePathSegments[i]) {
+				Fx.Assert("fast path yielded different segments from slow path");
+			}
+		}
+		if (fastPathCandidates.Count != slowPathCandidates.Count) {
+			Fx.Assert("fast path yielded different number of candidates from slow path");
+		}
+		for (int i = 0; i < fastPathCandidates.Count; i++) {
+			if (!slowPathCandidates.Contains(fastPathCandidates[i])) {
+				Fx.Assert("fast path yielded different candidates from slow path");
+			}
+		}
+	}
+
+	class FastPathInfo {
+		FreezableCollection<UriTemplateTableMatchCandidate> candidates;
+		FreezableCollection<string> relativePathSegments;
+
+		public FastPathInfo() {
+			this.relativePathSegments = new FreezableCollection<string>();
+			this.candidates = new FreezableCollection<UriTemplateTableMatchCandidate>();
+		}
+		public Collection<UriTemplateTableMatchCandidate> Candidates {
+			get {
+				return this.candidates;
+			}
+		}
+
+		public Collection<string> RelativePathSegments {
+			get {
+				return this.relativePathSegments;
+			}
+		}
+
+		public void Freeze() {
+			this.relativePathSegments.Freeze();
+			this.candidates.Freeze();
+		}
+	}
+
+	class UriTemplatesCollection : FreezableCollection<KeyValuePair<UriTemplate, object>> {
+		public UriTemplatesCollection()
+			: base() {
+		}
+		[SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors", Justification = "This is a private class; virtual methods cannot be overriden")]
+		public UriTemplatesCollection(IEnumerable<KeyValuePair<UriTemplate, object>> keyValuePairs)
+			: base() {
+			foreach (KeyValuePair<UriTemplate, object> kvp in keyValuePairs) {
+				ThrowIfInvalid(kvp.Key, "keyValuePairs");
+				base.Add(kvp);
+			}
+		}
+
+		protected override void InsertItem(int index, KeyValuePair<UriTemplate, object> item) {
+			ThrowIfInvalid(item.Key, "item");
+			base.InsertItem(index, item);
+		}
+		protected override void SetItem(int index, KeyValuePair<UriTemplate, object> item) {
+			ThrowIfInvalid(item.Key, "item");
+			base.SetItem(index, item);
+		}
+
+		static void ThrowIfInvalid(UriTemplate template, string argName) {
+			if (template == null) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument(argName,
+					SR.GetString(SR.UTTNullTemplateKey));
+			}
+			if (template.IgnoreTrailingSlash) {
+				throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument(argName,
+					SR.GetString(SR.UTTInvalidTemplateKey, template));
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateTableMatchCandidate.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateTableMatchCandidate.cs
new file mode 100644
index 00000000000..ae66b335e2c
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateTableMatchCandidate.cs
@@ -0,0 +1,34 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+namespace System;
+
+struct UriTemplateTableMatchCandidate {
+	readonly object data;
+	readonly int segmentsCount;
+	readonly UriTemplate template;
+
+	public UriTemplateTableMatchCandidate(UriTemplate template, int segmentsCount, object data) {
+		this.template = template;
+		this.segmentsCount = segmentsCount;
+		this.data = data;
+	}
+	public object Data {
+		get {
+			return this.data;
+		}
+	}
+	public int SegmentsCount {
+		get {
+			return this.segmentsCount;
+		}
+	}
+
+	public UriTemplate Template {
+		get {
+			return this.template;
+		}
+	}
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateTrieIntraNodeLocation.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateTrieIntraNodeLocation.cs
new file mode 100644
index 00000000000..a3c27d159a3
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateTrieIntraNodeLocation.cs
@@ -0,0 +1,13 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+namespace System;
+
+enum UriTemplateTrieIntraNodeLocation {
+	BeforeLiteral,
+	AfterLiteral,
+	AfterCompound,
+	AfterVariable,
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateTrieLocation.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateTrieLocation.cs
new file mode 100644
index 00000000000..e9afb97ef4e
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateTrieLocation.cs
@@ -0,0 +1,15 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+namespace System;
+
+class UriTemplateTrieLocation {
+	public UriTemplateTrieIntraNodeLocation locationWithin;
+	public UriTemplateTrieNode node;
+	public UriTemplateTrieLocation(UriTemplateTrieNode n, UriTemplateTrieIntraNodeLocation i) {
+		this.node = n;
+		this.locationWithin = i;
+	}
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateTrieNode.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateTrieNode.cs
new file mode 100644
index 00000000000..a02fe92b651
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateTrieNode.cs
@@ -0,0 +1,642 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+namespace System;
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime;
+using System.ServiceModel;
+
+class UriTemplateTrieNode {
+	int depth; // relative segment depth (root = 0)
+	UriTemplatePathPartiallyEquivalentSet endOfPath; // matches the non-existent segment at the end of a slash-terminated path
+	AscendingSortedCompoundSegmentsCollection<UriTemplatePathPartiallyEquivalentSet> finalCompoundSegment; // matches e.g. "{var}.{var}"
+	Dictionary<UriTemplateLiteralPathSegment, UriTemplatePathPartiallyEquivalentSet> finalLiteralSegment; // matches e.g. "segmentThatDoesntEndInSlash"
+	UriTemplatePathPartiallyEquivalentSet finalVariableSegment; // matches e.g. "{var}"
+	AscendingSortedCompoundSegmentsCollection<UriTemplateTrieLocation> nextCompoundSegment; // all are AfterLiteral; matches e.g. "{var}.{var}/"
+	Dictionary<UriTemplateLiteralPathSegment, UriTemplateTrieLocation> nextLiteralSegment; // all are BeforeLiteral; matches e.g. "path/"
+	UriTemplateTrieLocation nextVariableSegment; // is BeforeLiteral; matches e.g. "{var}/"
+	UriTemplateTrieLocation onFailure; // points to parent, at 'after me'
+	UriTemplatePathPartiallyEquivalentSet star; // matches any "extra/path/segments" at the end
+
+	UriTemplateTrieNode(int depth) {
+		this.depth = depth;
+		this.nextLiteralSegment = null;
+		this.nextCompoundSegment = null;
+		this.finalLiteralSegment = null;
+		this.finalCompoundSegment = null;
+		this.finalVariableSegment = new UriTemplatePathPartiallyEquivalentSet(depth + 1);
+		this.star = new UriTemplatePathPartiallyEquivalentSet(depth);
+		this.endOfPath = new UriTemplatePathPartiallyEquivalentSet(depth);
+	}
+
+	public static UriTemplateTrieNode Make(IEnumerable<KeyValuePair<UriTemplate, object>> keyValuePairs,
+		bool allowDuplicateEquivalentUriTemplates) {
+		// given a UTT at MakeReadOnly time, build the trie
+		// note that root.onFailure == null;
+		UriTemplateTrieNode root = new UriTemplateTrieNode(0);
+		foreach (KeyValuePair<UriTemplate, object> kvp in keyValuePairs) {
+			Add(root, kvp);
+		}
+		Validate(root, allowDuplicateEquivalentUriTemplates);
+		return root;
+	}
+
+	public bool Match(UriTemplateLiteralPathSegment[] wireData, ICollection<UriTemplateTableMatchCandidate> candidates) {
+		UriTemplateTrieLocation currentLocation = new UriTemplateTrieLocation(this, UriTemplateTrieIntraNodeLocation.BeforeLiteral);
+		return GetMatch(currentLocation, wireData, candidates);
+	}
+
+	static void Add(UriTemplateTrieNode root, KeyValuePair<UriTemplate, object> kvp) {
+		// Currently UTT doesn't support teplates with ignoreTrailingSlash == true; thus we
+		//  don't care about supporting it in the trie as well.
+		UriTemplateTrieNode current = root;
+		UriTemplate ut = kvp.Key;
+		bool needProcessingOnFinalNode = ((ut.segments.Count == 0) || ut.HasWildcard ||
+			ut.segments[ut.segments.Count - 1].EndsWithSlash);
+		for (int i = 0; i < ut.segments.Count; ++i) {
+			if (i >= ut.firstOptionalSegment) {
+				current.endOfPath.Items.Add(kvp);
+			}
+			UriTemplatePathSegment ps = ut.segments[i];
+			if (!ps.EndsWithSlash) {
+				Fx.Assert(i == ut.segments.Count - 1, "only the last segment can !EndsWithSlash");
+				Fx.Assert(!ut.HasWildcard, "path star cannot have !EndsWithSlash");
+				switch (ps.Nature) {
+					case UriTemplatePartType.Literal:
+						current.AddFinalLiteralSegment(ps as UriTemplateLiteralPathSegment, kvp);
+						break;
+
+					case UriTemplatePartType.Compound:
+						current.AddFinalCompoundSegment(ps as UriTemplateCompoundPathSegment, kvp);
+						break;
+
+					case UriTemplatePartType.Variable:
+						current.finalVariableSegment.Items.Add(kvp);
+						break;
+
+					default:
+						Fx.Assert("Invalid value as PathSegment.Nature");
+						break;
+				}
+			} else {
+				Fx.Assert(ps.EndsWithSlash, "ps.EndsWithSlash");
+				switch (ps.Nature) {
+					case UriTemplatePartType.Literal:
+						current = current.AddNextLiteralSegment(ps as UriTemplateLiteralPathSegment);
+						break;
+
+					case UriTemplatePartType.Compound:
+						current = current.AddNextCompoundSegment(ps as UriTemplateCompoundPathSegment);
+						break;
+
+					case UriTemplatePartType.Variable:
+						current = current.AddNextVariableSegment();
+						break;
+
+					default:
+						Fx.Assert("Invalid value as PathSegment.Nature");
+						break;
+				}
+			}
+		}
+		if (needProcessingOnFinalNode) {
+			// if the last segment ended in a slash, there is still more to do
+			if (ut.HasWildcard) {
+				// e.g. "path1/path2/*"
+				current.star.Items.Add(kvp);
+			} else {
+				// e.g. "path1/path2/"
+				current.endOfPath.Items.Add(kvp);
+			}
+		}
+	}
+
+	static bool CheckMultipleMatches(IList<IList<UriTemplateTrieLocation>> locationsSet, UriTemplateLiteralPathSegment[] wireData,
+		ICollection<UriTemplateTableMatchCandidate> candidates) {
+		bool result = false;
+		for (int i = 0; ((i < locationsSet.Count) && !result); i++) {
+			for (int j = 0; j < locationsSet[i].Count; j++) {
+				if (GetMatch(locationsSet[i][j], wireData, candidates)) {
+					result = true;
+				}
+			}
+		}
+		return result;
+	}
+	static bool GetMatch(UriTemplateTrieLocation location, UriTemplateLiteralPathSegment[] wireData,
+		ICollection<UriTemplateTableMatchCandidate> candidates) {
+		int initialDepth = location.node.depth;
+		SingleLocationOrLocationsSet nextStep;
+		UriTemplatePathPartiallyEquivalentSet answer;
+		do {
+			if (TryMatch(wireData, location, out answer, out nextStep)) {
+				if (answer != null) {
+					for (int i = 0; i < answer.Items.Count; i++) {
+						candidates.Add(new UriTemplateTableMatchCandidate(answer.Items[i].Key, answer.SegmentsCount,
+							answer.Items[i].Value));
+					}
+				}
+				return true;
+			}
+			if (nextStep.IsSingle) {
+				location = nextStep.SingleLocation;
+			} else {
+				Fx.Assert(nextStep.LocationsSet != null, "This should be set to a valid value by TryMatch");
+				if (CheckMultipleMatches(nextStep.LocationsSet, wireData, candidates)) {
+					return true;
+				}
+				location = GetFailureLocationFromLocationsSet(nextStep.LocationsSet);
+			}
+		} while ((location != null) && (location.node.depth >= initialDepth));
+
+		// we walked the whole trie down and found nothing
+		return false;
+	}
+	static bool TryMatch(UriTemplateLiteralPathSegment[] wireUriSegments, UriTemplateTrieLocation currentLocation,
+		out UriTemplatePathPartiallyEquivalentSet success, out SingleLocationOrLocationsSet nextStep) {
+		// if returns true, success is set to answer
+		// if returns false, nextStep is set to next place to look
+		success = null;
+		nextStep = new SingleLocationOrLocationsSet();
+
+		if (wireUriSegments.Length <= currentLocation.node.depth) {
+			Fx.Assert(wireUriSegments.Length == 0 || wireUriSegments[wireUriSegments.Length - 1].EndsWithSlash,
+				"we should not have traversed this deep into the trie unless the wire path ended in a slash");
+
+			if (currentLocation.node.endOfPath.Items.Count != 0) {
+				// exact match of e.g. "path1/path2/"
+				success = currentLocation.node.endOfPath;
+				return true;
+			} else if (currentLocation.node.star.Items.Count != 0) {
+				// inexact match of e.g. WIRE("path1/path2/") against TEMPLATE("path1/path2/*")
+				success = currentLocation.node.star;
+				return true;
+			} else {
+				nextStep = new SingleLocationOrLocationsSet(currentLocation.node.onFailure);
+				return false;
+			}
+		} else {
+			UriTemplateLiteralPathSegment curWireSeg = wireUriSegments[currentLocation.node.depth];
+			bool considerLiteral = false;
+			bool considerCompound = false;
+			bool considerVariable = false;
+			bool considerStar = false;
+			switch (currentLocation.locationWithin) {
+				case UriTemplateTrieIntraNodeLocation.BeforeLiteral:
+					considerLiteral = true;
+					considerCompound = true;
+					considerVariable = true;
+					considerStar = true;
+					break;
+				case UriTemplateTrieIntraNodeLocation.AfterLiteral:
+					considerLiteral = false;
+					considerCompound = true;
+					considerVariable = true;
+					considerStar = true;
+					break;
+				case UriTemplateTrieIntraNodeLocation.AfterCompound:
+					considerLiteral = false;
+					considerCompound = false;
+					considerVariable = true;
+					considerStar = true;
+					break;
+				case UriTemplateTrieIntraNodeLocation.AfterVariable:
+					considerLiteral = false;
+					considerCompound = false;
+					considerVariable = false;
+					considerStar = true;
+					break;
+				default:
+					Fx.Assert("bad kind");
+					break;
+			}
+			if (curWireSeg.EndsWithSlash) {
+				IList<IList<UriTemplateTrieLocation>> compoundLocationsSet;
+
+				if (considerLiteral && currentLocation.node.nextLiteralSegment != null &&
+					currentLocation.node.nextLiteralSegment.ContainsKey(curWireSeg)) {
+					nextStep = new SingleLocationOrLocationsSet(currentLocation.node.nextLiteralSegment[curWireSeg]);
+					return false;
+				} else if (considerCompound && currentLocation.node.nextCompoundSegment != null &&
+					  AscendingSortedCompoundSegmentsCollection<UriTemplateTrieLocation>.Lookup(currentLocation.node.nextCompoundSegment, curWireSeg, out compoundLocationsSet)) {
+					nextStep = new SingleLocationOrLocationsSet(compoundLocationsSet);
+					return false;
+				} else if (considerVariable && currentLocation.node.nextVariableSegment != null &&
+					  !curWireSeg.IsNullOrEmpty()) {
+					nextStep = new SingleLocationOrLocationsSet(currentLocation.node.nextVariableSegment);
+					return false;
+				} else if (considerStar && currentLocation.node.star.Items.Count != 0) {
+					// matches e.g. WIRE("path1/path2/path3") and TEMPLATE("path1/*")
+					success = currentLocation.node.star;
+					return true;
+				} else {
+					nextStep = new SingleLocationOrLocationsSet(currentLocation.node.onFailure);
+					return false;
+				}
+			} else {
+				IList<IList<UriTemplatePathPartiallyEquivalentSet>> compoundPathEquivalentSets;
+
+				Fx.Assert(!curWireSeg.EndsWithSlash, "!curWireSeg.EndsWithSlash");
+				Fx.Assert(!curWireSeg.IsNullOrEmpty(), "!curWireSeg.IsNullOrEmpty()");
+				if (considerLiteral && currentLocation.node.finalLiteralSegment != null &&
+					currentLocation.node.finalLiteralSegment.ContainsKey(curWireSeg)) {
+					// matches e.g. WIRE("path1/path2") and TEMPLATE("path1/path2")
+					success = currentLocation.node.finalLiteralSegment[curWireSeg];
+					return true;
+				} else if (considerCompound && currentLocation.node.finalCompoundSegment != null &&
+					  AscendingSortedCompoundSegmentsCollection<UriTemplatePathPartiallyEquivalentSet>.Lookup(currentLocation.node.finalCompoundSegment, curWireSeg, out compoundPathEquivalentSets)) {
+					// matches e.g. WIRE("path1/path2") and TEMPLATE("path1/p{var}th2")
+					// we should take only the highest order match!
+					Fx.Assert(compoundPathEquivalentSets.Count >= 1, "Lookup is expected to return false otherwise");
+					Fx.Assert(compoundPathEquivalentSets[0].Count > 0, "Find shouldn't return empty sublists");
+					if (compoundPathEquivalentSets[0].Count == 1) {
+						success = compoundPathEquivalentSets[0][0];
+					} else {
+						success = new UriTemplatePathPartiallyEquivalentSet(currentLocation.node.depth + 1);
+						for (int i = 0; i < compoundPathEquivalentSets[0].Count; i++) {
+							success.Items.AddRange(compoundPathEquivalentSets[0][i].Items);
+						}
+					}
+					return true;
+				} else if (considerVariable && currentLocation.node.finalVariableSegment.Items.Count != 0) {
+					// matches e.g. WIRE("path1/path2") and TEMPLATE("path1/{var}")
+					success = currentLocation.node.finalVariableSegment;
+					return true;
+				} else if (considerStar && currentLocation.node.star.Items.Count != 0) {
+					// matches e.g. WIRE("path1/path2") and TEMPLATE("path1/*")
+					success = currentLocation.node.star;
+					return true;
+				} else {
+					nextStep = new SingleLocationOrLocationsSet(currentLocation.node.onFailure);
+					return false;
+				}
+			}
+		}
+	}
+
+	static UriTemplateTrieLocation GetFailureLocationFromLocationsSet(IList<IList<UriTemplateTrieLocation>> locationsSet) {
+		Fx.Assert(locationsSet != null, "Shouldn't be called on null set");
+		Fx.Assert(locationsSet.Count > 0, "Shouldn't be called on empty set");
+		Fx.Assert(locationsSet[0] != null, "Shouldn't be called on a set with null sub-lists");
+		Fx.Assert(locationsSet[0].Count > 0, "Shouldn't be called on a set with empty sub-lists");
+
+		return locationsSet[0][0].node.onFailure;
+	}
+
+	static void Validate(UriTemplateTrieNode root, bool allowDuplicateEquivalentUriTemplates) {
+		// walk the entire tree, and ensure that each PathEquivalentSet is ok (no ambiguous queries),
+		// verify thst compound segments didn't add potentialy multiple matchs;
+		// also Assert various data-structure invariants
+		Queue<UriTemplateTrieNode> nodesQueue = new Queue<UriTemplateTrieNode>();
+
+		UriTemplateTrieNode current = root;
+		while (true) {
+			// validate all the PathEquivalentSets that live in this node
+			Validate(current.endOfPath, allowDuplicateEquivalentUriTemplates);
+			Validate(current.finalVariableSegment, allowDuplicateEquivalentUriTemplates);
+			Validate(current.star, allowDuplicateEquivalentUriTemplates);
+			if (current.finalLiteralSegment != null) {
+				foreach (KeyValuePair<UriTemplateLiteralPathSegment, UriTemplatePathPartiallyEquivalentSet> kvp in current.finalLiteralSegment) {
+					Validate(kvp.Value, allowDuplicateEquivalentUriTemplates);
+				}
+			}
+			if (current.finalCompoundSegment != null) {
+				IList<IList<UriTemplatePathPartiallyEquivalentSet>> pesLists = current.finalCompoundSegment.Values;
+				for (int i = 0; i < pesLists.Count; i++) {
+					if (!allowDuplicateEquivalentUriTemplates && (pesLists[i].Count > 1)) {
+						throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
+							SR.UTTDuplicate, pesLists[i][0].Items[0].Key.ToString(), pesLists[i][1].Items[0].Key.ToString())));
+					}
+					for (int j = 0; j < pesLists[i].Count; j++) {
+						Validate(pesLists[i][j], allowDuplicateEquivalentUriTemplates);
+					}
+				}
+			}
+			// deal with children of this node
+			if (current.nextLiteralSegment != null) {
+				foreach (KeyValuePair<UriTemplateLiteralPathSegment, UriTemplateTrieLocation> kvp in current.nextLiteralSegment) {
+					Fx.Assert(kvp.Value.locationWithin == UriTemplateTrieIntraNodeLocation.BeforeLiteral, "forward-pointers should always point to a BeforeLiteral location");
+					Fx.Assert(kvp.Value.node.depth == current.depth + 1, "kvp.Value.node.depth == current.depth + 1");
+					Fx.Assert(kvp.Value.node.onFailure.node == current, "back pointer should point back to here");
+					Fx.Assert(kvp.Value.node.onFailure.locationWithin == UriTemplateTrieIntraNodeLocation.AfterLiteral, "back-pointer should be AfterLiteral");
+					nodesQueue.Enqueue(kvp.Value.node);
+				}
+			}
+			if (current.nextCompoundSegment != null) {
+				IList<IList<UriTemplateTrieLocation>> locations = current.nextCompoundSegment.Values;
+				for (int i = 0; i < locations.Count; i++) {
+					if (!allowDuplicateEquivalentUriTemplates && (locations[i].Count > 1)) {
+						// In the future we might ease up the restrictions and verify if there is realy
+						// a potential multiple match here; for now we are throwing.
+						UriTemplate firstTemplate = FindAnyUriTemplate(locations[i][0].node);
+						UriTemplate secondTemplate = FindAnyUriTemplate(locations[i][1].node);
+						throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(
+							SR.UTTDuplicate, firstTemplate.ToString(), secondTemplate.ToString())));
+					}
+					for (int j = 0; j < locations[i].Count; j++) {
+						UriTemplateTrieLocation location = locations[i][j];
+						Fx.Assert(location.locationWithin == UriTemplateTrieIntraNodeLocation.BeforeLiteral, "forward-pointers should always point to a BeforeLiteral location");
+						Fx.Assert(location.node.depth == current.depth + 1, "kvp.Value.node.depth == current.depth + 1");
+						Fx.Assert(location.node.onFailure.node == current, "back pointer should point back to here");
+						Fx.Assert(location.node.onFailure.locationWithin == UriTemplateTrieIntraNodeLocation.AfterCompound, "back-pointer should be AfterCompound");
+						nodesQueue.Enqueue(location.node);
+					}
+				}
+			}
+			if (current.nextVariableSegment != null) {
+				Fx.Assert(current.nextVariableSegment.locationWithin == UriTemplateTrieIntraNodeLocation.BeforeLiteral, "forward-pointers should always point to a BeforeLiteral location");
+				Fx.Assert(current.nextVariableSegment.node.depth == current.depth + 1, "current.nextVariableSegment.node.depth == current.depth + 1");
+				Fx.Assert(current.nextVariableSegment.node.onFailure.node == current, "back pointer should point back to here");
+				Fx.Assert(current.nextVariableSegment.node.onFailure.locationWithin == UriTemplateTrieIntraNodeLocation.AfterVariable, "back-pointer should be AfterVariable");
+				nodesQueue.Enqueue(current.nextVariableSegment.node);
+			}
+			// move on to next bit of work
+			if (nodesQueue.Count == 0) {
+				break;
+			}
+			current = nodesQueue.Dequeue();
+		}
+	}
+	static void Validate(UriTemplatePathPartiallyEquivalentSet pes, bool allowDuplicateEquivalentUriTemplates) {
+		// A set with 0 or 1 items is valid by definition
+		if (pes.Items.Count < 2) {
+			return;
+		}
+		// Assert all paths are partially-equivalent
+		for (int i = 0; i < pes.Items.Count - 1; ++i) {
+			Fx.Assert(pes.Items[i].Key.IsPathPartiallyEquivalentAt(pes.Items[i + 1].Key, pes.SegmentsCount),
+				"all elements of a PES must be path partially-equivalent");
+		}
+		// We will check that the queries disambiguate only for templates, which are
+		//  matched completely at the segments count; templates, which are match at
+		//  that point due to terminal defaults, will be ruled out.
+		UriTemplate[] a = new UriTemplate[pes.Items.Count];
+		int arrayIndex = 0;
+		foreach (KeyValuePair<UriTemplate, object> kvp in pes.Items) {
+			if (pes.SegmentsCount < kvp.Key.segments.Count) {
+				continue;
+			}
+			Fx.Assert(arrayIndex < a.Length, "We made enough room for all the items");
+			a[arrayIndex++] = kvp.Key;
+		}
+		// Ensure that queries disambiguate (if needed) :
+		if (arrayIndex > 0) {
+			UriTemplateHelpers.DisambiguateSamePath(a, 0, arrayIndex, allowDuplicateEquivalentUriTemplates);
+		}
+	}
+
+	static UriTemplate FindAnyUriTemplate(UriTemplateTrieNode node) {
+		while (node != null) {
+			if (node.endOfPath.Items.Count > 0) {
+				return node.endOfPath.Items[0].Key;
+			}
+			if (node.finalVariableSegment.Items.Count > 0) {
+				return node.finalVariableSegment.Items[0].Key;
+			}
+			if (node.star.Items.Count > 0) {
+				return node.star.Items[0].Key;
+			}
+			if (node.finalLiteralSegment != null) {
+				UriTemplatePathPartiallyEquivalentSet pes =
+					GetAnyDictionaryValue<UriTemplatePathPartiallyEquivalentSet>(node.finalLiteralSegment);
+				Fx.Assert(pes.Items.Count > 0, "Otherwise, why creating the dictionary?");
+				return pes.Items[0].Key;
+			}
+			if (node.finalCompoundSegment != null) {
+				UriTemplatePathPartiallyEquivalentSet pes = node.finalCompoundSegment.GetAnyValue();
+				Fx.Assert(pes.Items.Count > 0, "Otherwise, why creating the collection?");
+				return pes.Items[0].Key;
+			}
+
+			if (node.nextLiteralSegment != null) {
+				UriTemplateTrieLocation location =
+					GetAnyDictionaryValue<UriTemplateTrieLocation>(node.nextLiteralSegment);
+				node = location.node;
+			} else if (node.nextCompoundSegment != null) {
+				UriTemplateTrieLocation location = node.nextCompoundSegment.GetAnyValue();
+				node = location.node;
+			} else if (node.nextVariableSegment != null) {
+				node = node.nextVariableSegment.node;
+			} else {
+				node = null;
+			}
+		}
+		Fx.Assert("How did we got here without finding a UriTemplate earlier?");
+		return null;
+	}
+	static T GetAnyDictionaryValue<T>(IDictionary<UriTemplateLiteralPathSegment, T> dictionary) {
+		using (IEnumerator<T> valuesEnumerator = dictionary.Values.GetEnumerator()) {
+			valuesEnumerator.MoveNext();
+			return valuesEnumerator.Current;
+		}
+	}
+
+	void AddFinalCompoundSegment(UriTemplateCompoundPathSegment cps, KeyValuePair<UriTemplate, object> kvp) {
+		Fx.Assert(cps != null, "must be - based on the segment nature");
+		if (this.finalCompoundSegment == null) {
+			this.finalCompoundSegment = new AscendingSortedCompoundSegmentsCollection<UriTemplatePathPartiallyEquivalentSet>();
+		}
+		UriTemplatePathPartiallyEquivalentSet pes = this.finalCompoundSegment.Find(cps);
+		if (pes == null) {
+			pes = new UriTemplatePathPartiallyEquivalentSet(this.depth + 1);
+			this.finalCompoundSegment.Add(cps, pes);
+		}
+		pes.Items.Add(kvp);
+	}
+	void AddFinalLiteralSegment(UriTemplateLiteralPathSegment lps, KeyValuePair<UriTemplate, object> kvp) {
+		Fx.Assert(lps != null, "must be - based on the segment nature");
+		if (this.finalLiteralSegment != null && this.finalLiteralSegment.ContainsKey(lps)) {
+			this.finalLiteralSegment[lps].Items.Add(kvp);
+		} else {
+			if (this.finalLiteralSegment == null) {
+				this.finalLiteralSegment = new Dictionary<UriTemplateLiteralPathSegment, UriTemplatePathPartiallyEquivalentSet>();
+			}
+			UriTemplatePathPartiallyEquivalentSet pes = new UriTemplatePathPartiallyEquivalentSet(this.depth + 1);
+			pes.Items.Add(kvp);
+			this.finalLiteralSegment.Add(lps, pes);
+		}
+	}
+	UriTemplateTrieNode AddNextCompoundSegment(UriTemplateCompoundPathSegment cps) {
+		Fx.Assert(cps != null, "must be - based on the segment nature");
+		if (this.nextCompoundSegment == null) {
+			this.nextCompoundSegment = new AscendingSortedCompoundSegmentsCollection<UriTemplateTrieLocation>();
+		}
+		UriTemplateTrieLocation nextLocation = this.nextCompoundSegment.Find(cps);
+		if (nextLocation == null) {
+			UriTemplateTrieNode nextNode = new UriTemplateTrieNode(this.depth + 1);
+			nextNode.onFailure = new UriTemplateTrieLocation(this, UriTemplateTrieIntraNodeLocation.AfterCompound);
+			nextLocation = new UriTemplateTrieLocation(nextNode, UriTemplateTrieIntraNodeLocation.BeforeLiteral);
+			this.nextCompoundSegment.Add(cps, nextLocation);
+		}
+		return nextLocation.node;
+	}
+	UriTemplateTrieNode AddNextLiteralSegment(UriTemplateLiteralPathSegment lps) {
+		Fx.Assert(lps != null, "must be - based on the segment nature");
+		if (this.nextLiteralSegment != null && this.nextLiteralSegment.ContainsKey(lps)) {
+			return this.nextLiteralSegment[lps].node;
+		} else {
+			if (this.nextLiteralSegment == null) {
+				this.nextLiteralSegment = new Dictionary<UriTemplateLiteralPathSegment, UriTemplateTrieLocation>();
+			}
+			UriTemplateTrieNode newNode = new UriTemplateTrieNode(this.depth + 1);
+			newNode.onFailure = new UriTemplateTrieLocation(this, UriTemplateTrieIntraNodeLocation.AfterLiteral);
+			this.nextLiteralSegment.Add(lps, new UriTemplateTrieLocation(newNode, UriTemplateTrieIntraNodeLocation.BeforeLiteral));
+			return newNode;
+		}
+	}
+	UriTemplateTrieNode AddNextVariableSegment() {
+		if (this.nextVariableSegment != null) {
+			return this.nextVariableSegment.node;
+		} else {
+			UriTemplateTrieNode newNode = new UriTemplateTrieNode(this.depth + 1);
+			newNode.onFailure = new UriTemplateTrieLocation(this, UriTemplateTrieIntraNodeLocation.AfterVariable);
+			this.nextVariableSegment = new UriTemplateTrieLocation(newNode, UriTemplateTrieIntraNodeLocation.BeforeLiteral);
+			return newNode;
+		}
+	}
+
+	struct SingleLocationOrLocationsSet {
+		readonly bool isSingle;
+		readonly IList<IList<UriTemplateTrieLocation>> locationsSet;
+		readonly UriTemplateTrieLocation singleLocation;
+
+		public SingleLocationOrLocationsSet(UriTemplateTrieLocation singleLocation) {
+			this.isSingle = true;
+			this.singleLocation = singleLocation;
+			this.locationsSet = null;
+		}
+		public SingleLocationOrLocationsSet(IList<IList<UriTemplateTrieLocation>> locationsSet) {
+			this.isSingle = false;
+			this.singleLocation = null;
+			this.locationsSet = locationsSet;
+		}
+
+		public bool IsSingle {
+			get {
+				return this.isSingle;
+			}
+		}
+		public IList<IList<UriTemplateTrieLocation>> LocationsSet {
+			get {
+				Fx.Assert(!this.isSingle, "!this.isSingle");
+				return this.locationsSet;
+			}
+		}
+		public UriTemplateTrieLocation SingleLocation {
+			get {
+				Fx.Assert(this.isSingle, "this.isSingle");
+				return this.singleLocation;
+			}
+		}
+	}
+
+	class AscendingSortedCompoundSegmentsCollection<T>
+		where T : class {
+		SortedList<UriTemplateCompoundPathSegment, Collection<CollectionItem>> items;
+
+		public AscendingSortedCompoundSegmentsCollection() {
+			this.items = new SortedList<UriTemplateCompoundPathSegment, Collection<AscendingSortedCompoundSegmentsCollection<T>.CollectionItem>>();
+		}
+
+		public IList<IList<T>> Values {
+			get {
+				IList<IList<T>> results = new List<IList<T>>(this.items.Count);
+				for (int i = 0; i < this.items.Values.Count; i++) {
+					results.Add(new List<T>(this.items.Values[i].Count));
+					Fx.Assert(results.Count == i + 1, "We are adding item for each values collection");
+					for (int j = 0; j < this.items.Values[i].Count; j++) {
+						results[i].Add(this.items.Values[i][j].Value);
+						Fx.Assert(results[i].Count == j + 1, "We are adding item for each value in the collection");
+					}
+					Fx.Assert(results[i].Count == this.items.Values[i].Count, "We were supposed to add an item for each value in the collection");
+				}
+				Fx.Assert(results.Count == this.items.Values.Count, "We were supposed to add a sub-list for each values collection");
+				return results;
+			}
+		}
+
+		public void Add(UriTemplateCompoundPathSegment segment, T value) {
+			int index = this.items.IndexOfKey(segment);
+			if (index == -1) {
+				Collection<CollectionItem> subItems = new Collection<CollectionItem>();
+				subItems.Add(new CollectionItem(segment, value));
+				this.items.Add(segment, subItems);
+			} else {
+				Collection<CollectionItem> subItems = this.items.Values[index];
+				subItems.Add(new CollectionItem(segment, value));
+			}
+		}
+
+		public T Find(UriTemplateCompoundPathSegment segment) {
+			int index = this.items.IndexOfKey(segment);
+			if (index == -1) {
+				return null;
+			}
+			Collection<CollectionItem> subItems = this.items.Values[index];
+			for (int i = 0; i < subItems.Count; i++) {
+				if (subItems[i].Segment.IsEquivalentTo(segment, false)) {
+					return subItems[i].Value;
+				}
+			}
+			return null;
+		}
+		public IList<IList<T>> Find(UriTemplateLiteralPathSegment wireData) {
+			IList<IList<T>> results = new List<IList<T>>();
+			for (int i = 0; i < this.items.Values.Count; i++) {
+				List<T> sameOrderResults = null;
+				for (int j = 0; j < this.items.Values[i].Count; j++) {
+					if (this.items.Values[i][j].Segment.IsMatch(wireData)) {
+						if (sameOrderResults == null) {
+							sameOrderResults = new List<T>();
+						}
+						sameOrderResults.Add(this.items.Values[i][j].Value);
+					}
+				}
+				if (sameOrderResults != null) {
+					results.Add(sameOrderResults);
+				}
+			}
+			return results;
+		}
+
+		public T GetAnyValue() {
+			if (this.items.Values.Count > 0) {
+				Fx.Assert(this.items.Values[0].Count > 0, "We are not adding a sub-list unless there is at list one item");
+				return this.items.Values[0][0].Value;
+			} else {
+				return null;
+			}
+		}
+
+		public static bool Lookup(AscendingSortedCompoundSegmentsCollection<T> collection,
+			UriTemplateLiteralPathSegment wireData, out IList<IList<T>> results) {
+			results = collection.Find(wireData);
+			return ((results != null) && (results.Count > 0));
+		}
+
+		struct CollectionItem {
+			UriTemplateCompoundPathSegment segment;
+			T value;
+
+			public CollectionItem(UriTemplateCompoundPathSegment segment, T value) {
+				this.segment = segment;
+				this.value = value;
+			}
+
+			public UriTemplateCompoundPathSegment Segment {
+				get {
+					return this.segment;
+				}
+			}
+			public T Value {
+				get {
+					return this.value;
+				}
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateVariablePathSegment.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateVariablePathSegment.cs
new file mode 100644
index 00000000000..df6565f6f68
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateVariablePathSegment.cs
@@ -0,0 +1,55 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+namespace System;
+
+using System.Collections.Specialized;
+using System.Runtime;
+using System.Text;
+
+class UriTemplateVariablePathSegment : UriTemplatePathSegment {
+	readonly string varName;
+
+	public UriTemplateVariablePathSegment(string originalSegment, bool endsWithSlash, string varName)
+		: base(originalSegment, UriTemplatePartType.Variable, endsWithSlash) {
+		Fx.Assert(!string.IsNullOrEmpty(varName), "bad variable segment");
+		this.varName = varName;
+	}
+
+	public string VarName {
+		get {
+			return this.varName;
+		}
+	}
+	public override void Bind(string[] values, ref int valueIndex, StringBuilder path) {
+		Fx.Assert(valueIndex < values.Length, "Not enough values to bind");
+		if (this.EndsWithSlash) {
+			path.AppendFormat("{0}/", values[valueIndex++]);
+		} else {
+			path.Append(values[valueIndex++]);
+		}
+	}
+
+	public override bool IsEquivalentTo(UriTemplatePathSegment other, bool ignoreTrailingSlash) {
+		if (other == null) {
+			Fx.Assert("why would we ever call this?");
+			return false;
+		}
+		if (!ignoreTrailingSlash && (this.EndsWithSlash != other.EndsWithSlash)) {
+			return false;
+		}
+		return (other.Nature == UriTemplatePartType.Variable);
+	}
+	public override bool IsMatch(UriTemplateLiteralPathSegment segment, bool ignoreTrailingSlash) {
+		if (!ignoreTrailingSlash && (this.EndsWithSlash != segment.EndsWithSlash)) {
+			return false;
+		}
+		return (!segment.IsNullOrEmpty());
+	}
+	public override void Lookup(string segment, NameValueCollection boundParameters) {
+		Fx.Assert(!string.IsNullOrEmpty(segment), "How can that be? Lookup is expected to be called after IsMatch");
+		boundParameters.Add(this.varName, segment);
+	}
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateVariableQueryValue.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateVariableQueryValue.cs
new file mode 100644
index 00000000000..fec8d7d6dad
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/UriTemplateVariableQueryValue.cs
@@ -0,0 +1,39 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+namespace System;
+
+using System.Collections.Specialized;
+using System.Runtime;
+using System.Text;
+
+class UriTemplateVariableQueryValue : UriTemplateQueryValue {
+	readonly string varName;
+
+	public UriTemplateVariableQueryValue(string varName)
+		: base(UriTemplatePartType.Variable) {
+		Fx.Assert(!string.IsNullOrEmpty(varName), "bad variable segment");
+		this.varName = varName;
+	}
+	public override void Bind(string keyName, string[] values, ref int valueIndex, StringBuilder query) {
+		Fx.Assert(valueIndex < values.Length, "Not enough values to bind");
+		if (values[valueIndex] == null) {
+			valueIndex++;
+		} else {
+			query.AppendFormat("&{0}={1}", UrlUtility.UrlEncode(keyName, Encoding.UTF8), UrlUtility.UrlEncode(values[valueIndex++], Encoding.UTF8));
+		}
+	}
+
+	public override bool IsEquivalentTo(UriTemplateQueryValue other) {
+		if (other == null) {
+			Fx.Assert("why would we ever call this?");
+			return false;
+		}
+		return (other.Nature == UriTemplatePartType.Variable);
+	}
+	public override void Lookup(string value, NameValueCollection boundParameters) {
+		boundParameters.Add(this.varName, value);
+	}
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/stubs/DiagnosticUtility.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/stubs/DiagnosticUtility.cs
new file mode 100644
index 00000000000..6e3f4519019
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/stubs/DiagnosticUtility.cs
@@ -0,0 +1,22 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+namespace System.ServiceModel;
+
+internal sealed class DiagnosticUtility {
+	internal sealed class ExceptionUtility {
+		internal static Exception ThrowHelperArgumentNull(string paramName) {
+			throw new ArgumentNullException(paramName);
+		}
+
+		internal static Exception ThrowHelperArgument(string paramName, string message) {
+			throw new ArgumentException(message, paramName);
+		}
+
+		internal static Exception ThrowHelperError(Exception exception) {
+			throw exception;
+		}
+	}
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/stubs/Fx.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/stubs/Fx.cs
new file mode 100644
index 00000000000..23b7a529686
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/stubs/Fx.cs
@@ -0,0 +1,24 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+using System.Diagnostics;
+
+namespace System.Runtime;
+
+internal sealed class Fx {
+	internal static void Assert(bool condition, string message) {
+		Debug.Assert(condition, message);
+	}
+
+	internal static void Assert(string message) {
+		Debug.Assert(false, message);
+	}
+
+	internal static class Exception {
+		public static System.Exception ArgumentNull(string paramName) {
+			throw new ArgumentNullException(paramName);
+		}
+	}
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/stubs/SR.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/stubs/SR.cs
new file mode 100644
index 00000000000..e019db769db
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/stubs/SR.cs
@@ -0,0 +1,121 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//----------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//----------------------------------------------------------------
+
+namespace System.ServiceModel;
+
+using System.Globalization;
+using System.Resources;
+using System.Threading;
+
+internal sealed class SR {
+	internal const string BindUriTemplateToNullOrEmptyPathParam = "BindUriTemplateToNullOrEmptyPathParam";
+	internal const string ObjectIsReadOnly = "ObjectIsReadOnly";
+	internal const string UTAdditionalDefaultIsInvalid = "UTAdditionalDefaultIsInvalid";
+	internal const string UTBadBaseAddress = "UTBadBaseAddress";
+	internal const string UTBindByNameCalledWithEmptyKey = "UTBindByNameCalledWithEmptyKey";
+	internal const string UTBindByPositionNoVariables = "UTBindByPositionNoVariables";
+	internal const string UTBindByPositionWrongCount = "UTBindByPositionWrongCount";
+	internal const string UTBothLiteralAndNameValueCollectionKey = "UTBothLiteralAndNameValueCollectionKey";
+	internal const string UTCSRLookupBeforeMatch = "UTCSRLookupBeforeMatch";
+	internal const string UTDefaultValuesAreImmutable = "UTDefaultValuesAreImmutable";
+	internal const string UTDefaultValueToCompoundSegmentVar = "UTDefaultValueToCompoundSegmentVar";
+	internal const string UTDefaultValueToCompoundSegmentVarFromAdditionalDefaults = "UTDefaultValueToCompoundSegmentVarFromAdditionalDefaults";
+	internal const string UTDefaultValueToQueryVar = "UTDefaultValueToQueryVar";
+	internal const string UTDefaultValueToQueryVarFromAdditionalDefaults = "UTDefaultValueToQueryVarFromAdditionalDefaults";
+	internal const string UTDoesNotSupportAdjacentVarsInCompoundSegment = "UTDoesNotSupportAdjacentVarsInCompoundSegment";
+	internal const string UTInvalidDefaultPathValue = "UTInvalidDefaultPathValue";
+	internal const string UTInvalidFormatSegmentOrQueryPart = "UTInvalidFormatSegmentOrQueryPart";
+	internal const string UTInvalidVarDeclaration = "UTInvalidVarDeclaration";
+	internal const string UTInvalidWildcardInVariableOrLiteral = "UTInvalidWildcardInVariableOrLiteral";
+	internal const string UTNullableDefaultAtAdditionalDefaults = "UTNullableDefaultAtAdditionalDefaults";
+	internal const string UTNullableDefaultMustBeFollowedWithNullables = "UTNullableDefaultMustBeFollowedWithNullables";
+	internal const string UTNullableDefaultMustNotBeFollowedWithLiteral = "UTNullableDefaultMustNotBeFollowedWithLiteral";
+	internal const string UTNullableDefaultMustNotBeFollowedWithWildcard = "UTNullableDefaultMustNotBeFollowedWithWildcard";
+	internal const string UTQueryCannotEndInAmpersand = "UTQueryCannotEndInAmpersand";
+	internal const string UTQueryCannotHaveCompoundValue = "UTQueryCannotHaveCompoundValue";
+	internal const string UTQueryCannotHaveEmptyName = "UTQueryCannotHaveEmptyName";
+	internal const string UTQueryMustHaveLiteralNames = "UTQueryMustHaveLiteralNames";
+	internal const string UTQueryNamesMustBeUnique = "UTQueryNamesMustBeUnique";
+	internal const string UTStarVariableWithDefaults = "UTStarVariableWithDefaults";
+	internal const string UTStarVariableWithDefaultsFromAdditionalDefaults = "UTStarVariableWithDefaultsFromAdditionalDefaults";
+	internal const string UTTAmbiguousQueries = "UTTAmbiguousQueries";
+	internal const string UTTBaseAddressMustBeAbsolute = "UTTBaseAddressMustBeAbsolute";
+	internal const string UTTBaseAddressNotSet = "UTTBaseAddressNotSet";
+	internal const string UTTCannotChangeBaseAddress = "UTTCannotChangeBaseAddress";
+	internal const string UTTDuplicate = "UTTDuplicate";
+	internal const string UTTEmptyKeyValuePairs = "UTTEmptyKeyValuePairs";
+	internal const string UTTInvalidTemplateKey = "UTTInvalidTemplateKey";
+	internal const string UTTMultipleMatches = "UTTMultipleMatches";
+	internal const string UTTMustBeAbsolute = "UTTMustBeAbsolute";
+	internal const string UTTNullTemplateKey = "UTTNullTemplateKey";
+	internal const string UTTOtherAmbiguousQueries = "UTTOtherAmbiguousQueries";
+	internal const string UTVarNamesMustBeUnique = "UTVarNamesMustBeUnique";
+
+	private ResourceManager resources;
+	private static System.ServiceModel.SR loader;
+
+	internal SR() {
+		this.resources = new ResourceManager("System.ServiceModel", base.GetType().Assembly);
+	}
+
+	private static System.ServiceModel.SR GetLoader() {
+		if (loader == null) {
+			System.ServiceModel.SR sr = new System.ServiceModel.SR();
+			Interlocked.CompareExchange<System.ServiceModel.SR>(ref loader, sr, null);
+		}
+		return loader;
+	}
+
+	public static object GetObject(string name) {
+		System.ServiceModel.SR loader = GetLoader();
+		if (loader == null) {
+			return null;
+		}
+		return loader.resources.GetObject(name, Culture);
+	}
+
+	public static string GetString(string name) {
+		System.ServiceModel.SR loader = GetLoader();
+		if (loader == null) {
+			return null;
+		}
+		return loader.resources.GetString(name, Culture);
+	}
+
+	public static string GetString(string name, params object[] args) {
+		System.ServiceModel.SR loader = GetLoader();
+		if (loader == null) {
+			return null;
+		}
+		string format = loader.resources.GetString(name, Culture);
+		if ((args == null) || (args.Length <= 0)) {
+			return format;
+		}
+		for (int i = 0; i < args.Length; i++) {
+			string str2 = args[i] as string;
+			if ((str2 != null) && (str2.Length > 0x400)) {
+				args[i] = str2.Substring(0, 0x3fd) + "...";
+			}
+		}
+		return string.Format(CultureInfo.CurrentCulture, format, args);
+	}
+
+	public static string GetString(string name, out bool usedFallback) {
+		usedFallback = false;
+		return GetString(name);
+	}
+
+	private static CultureInfo Culture {
+		get {
+			return null;
+		}
+	}
+
+	public static ResourceManager Resources {
+		get {
+			return GetLoader().resources;
+		}
+	}
+}
diff --git a/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/stubs/UrlUtility.cs b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/stubs/UrlUtility.cs
new file mode 100644
index 00000000000..5282f7eb720
--- /dev/null
+++ b/src/KurrentDB.NETCore.Compatibility/System.UriTemplate/stubs/UrlUtility.cs
@@ -0,0 +1,510 @@
+#pragma warning disable IDE0073 // The file header does not match the required text
+//------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//------------------------------------------------------------
+
+namespace System.Runtime;
+
+using System.Collections;
+using System.Collections.Specialized;
+using System.Text;
+
+//copied from System.Web.HttpUtility code (renamed here) to remove dependency on System.Web.dll
+internal sealed class UrlUtility {
+	//  Query string parsing support
+	public static NameValueCollection ParseQueryString(string query) {
+		return ParseQueryString(query, Encoding.UTF8);
+	}
+
+	public static NameValueCollection ParseQueryString(string query, Encoding encoding) {
+		if (query == null) {
+			throw Fx.Exception.ArgumentNull("query");
+		}
+
+		if (encoding == null) {
+			throw Fx.Exception.ArgumentNull("encoding");
+		}
+
+		if (query.Length > 0 && query[0] == '?') {
+			query = query.Substring(1);
+		}
+
+		return new HttpValueCollection(query, encoding);
+	}
+
+	public static string UrlEncode(string str) {
+		if (str == null) {
+			return null;
+		}
+		return UrlEncode(str, Encoding.UTF8);
+	}
+
+	// URL encodes a path portion of a URL string and returns the encoded string.
+	public static string UrlPathEncode(string str) {
+		if (str == null) {
+			return null;
+		}
+
+		// recurse in case there is a query string
+		int i = str.IndexOf('?');
+		if (i >= 0) {
+			return UrlPathEncode(str.Substring(0, i)) + str.Substring(i);
+		}
+
+		// encode DBCS characters and spaces only
+		return UrlEncodeSpaces(UrlEncodeNonAscii(str, Encoding.UTF8));
+	}
+
+	public static string UrlEncode(string str, Encoding encoding) {
+		if (str == null) {
+			return null;
+		}
+		return Encoding.ASCII.GetString(UrlEncodeToBytes(str, encoding));
+	}
+
+	public static string UrlEncodeUnicode(string str) {
+		if (str == null)
+			return null;
+		return UrlEncodeUnicodeStringToStringInternal(str, false);
+
+	}
+
+	private static string UrlEncodeUnicodeStringToStringInternal(string s, bool ignoreAscii) {
+		int l = s.Length;
+		StringBuilder sb = new StringBuilder(l);
+
+		for (int i = 0; i < l; i++) {
+			char ch = s[i];
+
+			if ((ch & 0xff80) == 0) {  // 7 bit?
+				if (ignoreAscii || IsSafe(ch)) {
+					sb.Append(ch);
+				} else if (ch == ' ') {
+					sb.Append('+');
+				} else {
+					sb.Append('%');
+					sb.Append(IntToHex((ch >> 4) & 0xf));
+					sb.Append(IntToHex((ch) & 0xf));
+				}
+			} else { // arbitrary Unicode?
+				sb.Append("%u");
+				sb.Append(IntToHex((ch >> 12) & 0xf));
+				sb.Append(IntToHex((ch >> 8) & 0xf));
+				sb.Append(IntToHex((ch >> 4) & 0xf));
+				sb.Append(IntToHex((ch) & 0xf));
+			}
+		}
+
+		return sb.ToString();
+	}
+
+	//  Helper to encode the non-ASCII url characters only
+	static string UrlEncodeNonAscii(string str, Encoding e) {
+		if (string.IsNullOrEmpty(str)) {
+			return str;
+		}
+		if (e == null) {
+			e = Encoding.UTF8;
+		}
+		byte[] bytes = e.GetBytes(str);
+		bytes = UrlEncodeBytesToBytesInternalNonAscii(bytes, 0, bytes.Length, false);
+		return Encoding.ASCII.GetString(bytes);
+	}
+
+	//  Helper to encode spaces only
+	static string UrlEncodeSpaces(string str) {
+		if (str != null && str.IndexOf(' ') >= 0) {
+			str = str.Replace(" ", "%20");
+		}
+		return str;
+	}
+
+	public static byte[] UrlEncodeToBytes(string str, Encoding e) {
+		if (str == null) {
+			return null;
+		}
+		byte[] bytes = e.GetBytes(str);
+		return UrlEncodeBytesToBytesInternal(bytes, 0, bytes.Length, false);
+	}
+
+	//public static string UrlDecode(string str)
+	//{
+	//    if (str == null)
+	//        return null;
+	//    return UrlDecode(str, Encoding.UTF8);
+	//}
+
+	public static string UrlDecode(string str, Encoding e) {
+		if (str == null) {
+			return null;
+		}
+		return UrlDecodeStringFromStringInternal(str, e);
+	}
+
+	//  Implementation for encoding
+	static byte[] UrlEncodeBytesToBytesInternal(byte[] bytes, int offset, int count, bool alwaysCreateReturnValue) {
+		int cSpaces = 0;
+		int cUnsafe = 0;
+
+		// count them first
+		for (int i = 0; i < count; i++) {
+			char ch = (char)bytes[offset + i];
+
+			if (ch == ' ') {
+				cSpaces++;
+			} else if (!IsSafe(ch)) {
+				cUnsafe++;
+			}
+		}
+
+		// nothing to expand?
+		if (!alwaysCreateReturnValue && cSpaces == 0 && cUnsafe == 0) {
+			return bytes;
+		}
+
+		// expand not 'safe' characters into %XX, spaces to +s
+		byte[] expandedBytes = new byte[count + cUnsafe * 2];
+		int pos = 0;
+
+		for (int i = 0; i < count; i++) {
+			byte b = bytes[offset + i];
+			char ch = (char)b;
+
+			if (IsSafe(ch)) {
+				expandedBytes[pos++] = b;
+			} else if (ch == ' ') {
+				expandedBytes[pos++] = (byte)'+';
+			} else {
+				expandedBytes[pos++] = (byte)'%';
+				expandedBytes[pos++] = (byte)IntToHex((b >> 4) & 0xf);
+				expandedBytes[pos++] = (byte)IntToHex(b & 0x0f);
+			}
+		}
+
+		return expandedBytes;
+	}
+
+
+	static bool IsNonAsciiByte(byte b) {
+		return (b >= 0x7F || b < 0x20);
+	}
+
+	static byte[] UrlEncodeBytesToBytesInternalNonAscii(byte[] bytes, int offset, int count, bool alwaysCreateReturnValue) {
+		int cNonAscii = 0;
+
+		// count them first
+		for (int i = 0; i < count; i++) {
+			if (IsNonAsciiByte(bytes[offset + i])) {
+				cNonAscii++;
+			}
+		}
+
+		// nothing to expand?
+		if (!alwaysCreateReturnValue && cNonAscii == 0) {
+			return bytes;
+		}
+
+		// expand not 'safe' characters into %XX, spaces to +s
+		byte[] expandedBytes = new byte[count + cNonAscii * 2];
+		int pos = 0;
+
+		for (int i = 0; i < count; i++) {
+			byte b = bytes[offset + i];
+
+			if (IsNonAsciiByte(b)) {
+				expandedBytes[pos++] = (byte)'%';
+				expandedBytes[pos++] = (byte)IntToHex((b >> 4) & 0xf);
+				expandedBytes[pos++] = (byte)IntToHex(b & 0x0f);
+			} else {
+				expandedBytes[pos++] = b;
+			}
+		}
+
+		return expandedBytes;
+	}
+
+	static string UrlDecodeStringFromStringInternal(string s, Encoding e) {
+		int count = s.Length;
+		UrlDecoder helper = new UrlDecoder(count, e);
+
+		// go through the string's chars collapsing %XX and %uXXXX and
+		// appending each char as char, with exception of %XX constructs
+		// that are appended as bytes
+
+		for (int pos = 0; pos < count; pos++) {
+			char ch = s[pos];
+
+			if (ch == '+') {
+				ch = ' ';
+			} else if (ch == '%' && pos < count - 2) {
+				if (s[pos + 1] == 'u' && pos < count - 5) {
+					int h1 = HexToInt(s[pos + 2]);
+					int h2 = HexToInt(s[pos + 3]);
+					int h3 = HexToInt(s[pos + 4]);
+					int h4 = HexToInt(s[pos + 5]);
+
+					if (h1 >= 0 && h2 >= 0 && h3 >= 0 && h4 >= 0) {   // valid 4 hex chars
+						ch = (char)((h1 << 12) | (h2 << 8) | (h3 << 4) | h4);
+						pos += 5;
+
+						// only add as char
+						helper.AddChar(ch);
+						continue;
+					}
+				} else {
+					int h1 = HexToInt(s[pos + 1]);
+					int h2 = HexToInt(s[pos + 2]);
+
+					if (h1 >= 0 && h2 >= 0) {     // valid 2 hex chars
+						byte b = (byte)((h1 << 4) | h2);
+						pos += 2;
+
+						// don't add as char
+						helper.AddByte(b);
+						continue;
+					}
+				}
+			}
+
+			if ((ch & 0xFF80) == 0) {
+				helper.AddByte((byte)ch); // 7 bit have to go as bytes because of Unicode
+			} else {
+				helper.AddChar(ch);
+			}
+		}
+
+		return helper.GetString();
+	}
+
+	// Private helpers for URL encoding/decoding
+	static int HexToInt(char h) {
+		return (h >= '0' && h <= '9') ? h - '0' :
+		(h >= 'a' && h <= 'f') ? h - 'a' + 10 :
+		(h >= 'A' && h <= 'F') ? h - 'A' + 10 :
+		-1;
+	}
+
+	static char IntToHex(int n) {
+		//WCF CHANGE: CHANGED FROM Debug.Assert() to Fx.Assert()
+		Fx.Assert(n < 0x10, "n < 0x10");
+
+		if (n <= 9) {
+			return (char)(n + (int)'0');
+		} else {
+			return (char)(n - 10 + (int)'a');
+		}
+	}
+
+	// Set of safe chars, from RFC 1738.4 minus '+'
+	internal static bool IsSafe(char ch) {
+		if (ch >= 'a' && ch <= 'z' || ch >= 'A' && ch <= 'Z' || ch >= '0' && ch <= '9') {
+			return true;
+		}
+
+		switch (ch) {
+			case '-':
+			case '_':
+			case '.':
+			case '!':
+			case '*':
+			case '\'':
+			case '(':
+			case ')':
+				return true;
+		}
+
+		return false;
+	}
+
+	// Internal class to facilitate URL decoding -- keeps char buffer and byte buffer, allows appending of either chars or bytes
+	class UrlDecoder {
+		int _bufferSize;
+
+		// Accumulate characters in a special array
+		int _numChars;
+		char[] _charBuffer;
+
+		// Accumulate bytes for decoding into characters in a special array
+		int _numBytes;
+		byte[] _byteBuffer;
+
+		// Encoding to convert chars to bytes
+		Encoding _encoding;
+
+		void FlushBytes() {
+			if (_numBytes > 0) {
+				_numChars += _encoding.GetChars(_byteBuffer, 0, _numBytes, _charBuffer, _numChars);
+				_numBytes = 0;
+			}
+		}
+
+		internal UrlDecoder(int bufferSize, Encoding encoding) {
+			_bufferSize = bufferSize;
+			_encoding = encoding;
+
+			_charBuffer = new char[bufferSize];
+			// byte buffer created on demand
+		}
+
+		internal void AddChar(char ch) {
+			if (_numBytes > 0) {
+				FlushBytes();
+			}
+
+			_charBuffer[_numChars++] = ch;
+		}
+
+		internal void AddByte(byte b) {
+			// if there are no pending bytes treat 7 bit bytes as characters
+			// this optimization is temp disable as it doesn't work for some encodings
+
+			//if (_numBytes == 0 && ((b & 0x80) == 0)) {
+			//    AddChar((char)b);
+			//}
+			//else
+
+			{
+				if (_byteBuffer == null) {
+					_byteBuffer = new byte[_bufferSize];
+				}
+
+				_byteBuffer[_numBytes++] = b;
+			}
+		}
+
+		internal string GetString() {
+			if (_numBytes > 0) {
+				FlushBytes();
+			}
+
+			if (_numChars > 0) {
+				return new String(_charBuffer, 0, _numChars);
+			} else {
+				return string.Empty;
+			}
+		}
+	}
+
+	[Serializable]
+	class HttpValueCollection : NameValueCollection {
+		internal HttpValueCollection(string str, Encoding encoding)
+			: base(StringComparer.OrdinalIgnoreCase) {
+			if (!string.IsNullOrEmpty(str)) {
+				FillFromString(str, true, encoding);
+			}
+
+			IsReadOnly = false;
+		}
+
+		internal void FillFromString(string s, bool urlencoded, Encoding encoding) {
+			int l = (s != null) ? s.Length : 0;
+			int i = 0;
+
+			while (i < l) {
+				// find next & while noting first = on the way (and if there are more)
+
+				int si = i;
+				int ti = -1;
+
+				while (i < l) {
+					char ch = s[i];
+
+					if (ch == '=') {
+						if (ti < 0)
+							ti = i;
+					} else if (ch == '&') {
+						break;
+					}
+
+					i++;
+				}
+
+				// extract the name / value pair
+
+				string name = null;
+				string value = null;
+
+				if (ti >= 0) {
+					name = s.Substring(si, ti - si);
+					value = s.Substring(ti + 1, i - ti - 1);
+				} else {
+					value = s.Substring(si, i - si);
+				}
+
+				// add name / value pair to the collection
+
+				if (urlencoded) {
+					base.Add(
+					   UrlUtility.UrlDecode(name, encoding),
+					   UrlUtility.UrlDecode(value, encoding));
+				} else {
+					base.Add(name, value);
+				}
+
+				// trailing '&'
+
+				if (i == l - 1 && s[i] == '&') {
+					base.Add(null, string.Empty);
+				}
+
+				i++;
+			}
+		}
+
+		public override string ToString() {
+			return ToString(true, null);
+		}
+
+		string ToString(bool urlencoded, IDictionary excludeKeys) {
+			int n = Count;
+			if (n == 0)
+				return string.Empty;
+
+			StringBuilder s = new StringBuilder();
+			string key, keyPrefix, item;
+
+			for (int i = 0; i < n; i++) {
+				key = GetKey(i);
+
+				if (excludeKeys != null && key != null && excludeKeys[key] != null) {
+					continue;
+				}
+				if (urlencoded) {
+					key = UrlUtility.UrlEncodeUnicode(key);
+				}
+				keyPrefix = (!string.IsNullOrEmpty(key)) ? (key + "=") : string.Empty;
+
+				ArrayList values = (ArrayList)BaseGet(i);
+				int numValues = (values != null) ? values.Count : 0;
+
+				if (s.Length > 0) {
+					s.Append('&');
+				}
+
+				if (numValues == 1) {
+					s.Append(keyPrefix);
+					item = (string)values[0];
+					if (urlencoded)
+						item = UrlUtility.UrlEncodeUnicode(item);
+					s.Append(item);
+				} else if (numValues == 0) {
+					s.Append(keyPrefix);
+				} else {
+					for (int j = 0; j < numValues; j++) {
+						if (j > 0) {
+							s.Append('&');
+						}
+						s.Append(keyPrefix);
+						item = (string)values[j];
+						if (urlencoded) {
+							item = UrlUtility.UrlEncodeUnicode(item);
+						}
+						s.Append(item);
+					}
+				}
+			}
+
+			return s.ToString();
+		}
+	}
+}
diff --git a/src/KurrentDB.Native/KurrentDB.Native.csproj b/src/KurrentDB.Native/KurrentDB.Native.csproj
new file mode 100644
index 00000000000..42e546819d3
--- /dev/null
+++ b/src/KurrentDB.Native/KurrentDB.Native.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
+	</ItemGroup>
+	<ItemGroup>
+	  <ProjectReference Include="..\KurrentDB.SystemRuntime\KurrentDB.SystemRuntime.csproj" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.Native/TransactionLog/Unbuffered/ExtendedFileOptions.cs b/src/KurrentDB.Native/TransactionLog/Unbuffered/ExtendedFileOptions.cs
new file mode 100644
index 00000000000..324e3438214
--- /dev/null
+++ b/src/KurrentDB.Native/TransactionLog/Unbuffered/ExtendedFileOptions.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+// Resharper disable CheckNamespace
+
+namespace KurrentDB.Core.TransactionLog.Unbuffered;
+
+[Flags]
+public enum ExtendedFileOptions {
+	NoBuffering = unchecked((int)0x20000000),
+	Overlapped = unchecked((int)0x40000000),
+	SequentialScan = unchecked((int)0x08000000),
+	WriteThrough = unchecked((int)0x80000000)
+}
diff --git a/src/KurrentDB.Native/TransactionLog/Unbuffered/INativeFile.cs b/src/KurrentDB.Native/TransactionLog/Unbuffered/INativeFile.cs
new file mode 100644
index 00000000000..bc9289d5489
--- /dev/null
+++ b/src/KurrentDB.Native/TransactionLog/Unbuffered/INativeFile.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using Microsoft.Win32.SafeHandles;
+
+// Resharper disable CheckNamespace
+
+namespace KurrentDB.Core.TransactionLog.Unbuffered;
+
+public interface INativeFile {
+	uint GetDriveSectorSize(string path);
+	long GetPageSize(string path);
+	void SetFileSize(SafeFileHandle handle, long count);
+	unsafe void Write(SafeFileHandle handle, byte* buffer, uint count, ref int written);
+	unsafe int Read(SafeFileHandle handle, byte* buffer, int offset, int count);
+	long GetFileSize(SafeFileHandle handle);
+	SafeFileHandle Create(string path, FileAccess acc, FileShare readWrite, FileMode mode, int flags);
+
+	SafeFileHandle CreateUnbufferedRW(string path, FileAccess acc, FileShare share, FileMode mode,
+		bool writeThrough);
+
+	void Seek(SafeFileHandle handle, long position, SeekOrigin origin);
+}
diff --git a/src/KurrentDB.Native/TransactionLog/Unbuffered/MacCaching.cs b/src/KurrentDB.Native/TransactionLog/Unbuffered/MacCaching.cs
new file mode 100644
index 00000000000..a8d08f50505
--- /dev/null
+++ b/src/KurrentDB.Native/TransactionLog/Unbuffered/MacCaching.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Runtime.InteropServices;
+using Microsoft.Win32.SafeHandles;
+using Mono.Unix;
+using RuntimeInformation = System.Runtime.RuntimeInformation;
+
+// Resharper disable CheckNamespace
+
+namespace KurrentDB.Core.TransactionLog.Unbuffered;
+
+internal static class MacCaching {
+	// ReSharper disable once InconsistentNaming
+	private const uint MAC_F_NOCACHE = 48;
+
+	[DllImport("libc")]
+	static extern int fcntl(int fd, uint command, int arg);
+
+	public static void Disable(SafeFileHandle handle) {
+		if (!RuntimeInformation.IsOSX)
+			return;
+
+		long r;
+		do {
+			r = fcntl(handle.DangerousGetHandle().ToInt32(), MAC_F_NOCACHE, 1);
+		} while (UnixMarshal.ShouldRetrySyscall((int)r));
+
+		if (r == -1) {
+			UnixMarshal.ThrowExceptionForLastError();
+		}
+	}
+}
diff --git a/src/KurrentDB.Native/TransactionLog/Unbuffered/NativeFileUnix.cs b/src/KurrentDB.Native/TransactionLog/Unbuffered/NativeFileUnix.cs
new file mode 100644
index 00000000000..2c3c7f18416
--- /dev/null
+++ b/src/KurrentDB.Native/TransactionLog/Unbuffered/NativeFileUnix.cs
@@ -0,0 +1,147 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.ComponentModel;
+using System.IO;
+using System.Runtime;
+using Microsoft.Win32.SafeHandles;
+using Mono.Unix;
+using Mono.Unix.Native;
+
+// Resharper disable CheckNamespace
+
+namespace KurrentDB.Core.TransactionLog.Unbuffered;
+
+public unsafe class NativeFileUnix : INativeFile {
+	public uint GetDriveSectorSize(string path) {
+		return 0;
+	}
+
+	public long GetPageSize(string path) {
+		int r;
+		do {
+			r = (int)Syscall.sysconf(SysconfName._SC_PAGESIZE);
+		} while (UnixMarshal.ShouldRetrySyscall(r));
+
+		UnixMarshal.ThrowExceptionForLastErrorIf(r);
+		return r;
+	}
+
+	public void SetFileSize(SafeFileHandle handle, long count) {
+		int r;
+		do {
+			r = Syscall.ftruncate(handle.DangerousGetHandle().ToInt32(), count);
+		} while (UnixMarshal.ShouldRetrySyscall(r));
+
+		UnixMarshal.ThrowExceptionForLastErrorIf(r);
+		FSync(handle);
+	}
+
+	private static void FSync(SafeFileHandle handle) {
+		Syscall.fsync(handle.DangerousGetHandle().ToInt32());
+	}
+
+	public void Write(SafeFileHandle handle, byte* buffer, uint count, ref int written) {
+		int ret;
+		do {
+			ret = (int)Syscall.write(handle.DangerousGetHandle().ToInt32(), buffer, count);
+		} while (UnixMarshal.ShouldRetrySyscall(ret));
+
+		if (ret == -1) {
+			UnixMarshal.ThrowExceptionForLastErrorIf(ret);
+		}
+
+		written = (int)count;
+	}
+
+	public int Read(SafeFileHandle handle, byte* buffer, int offset, int count) {
+		int r;
+		do {
+			r = (int)Syscall.read(handle.DangerousGetHandle().ToInt32(), buffer, (ulong)count);
+		} while (UnixMarshal.ShouldRetrySyscall(r));
+
+		if (r == -1) {
+			UnixMarshal.ThrowExceptionForLastError();
+		}
+
+		return count;
+	}
+
+	public long GetFileSize(SafeFileHandle handle) {
+		Stat s;
+		int r;
+		do {
+			r = Syscall.fstat(handle.DangerousGetHandle().ToInt32(), out s);
+		} while (UnixMarshal.ShouldRetrySyscall(r));
+
+		UnixMarshal.ThrowExceptionForLastErrorIf(r);
+		return s.st_size;
+	}
+
+	//TODO UNBUFF use FileAccess etc or do custom?
+	public SafeFileHandle Create(string path, FileAccess acc, FileShare readWrite, FileMode mode, int flags) {
+		//TODO convert flags or separate methods?
+		return new SafeFileHandle((IntPtr)0, true);
+	}
+
+
+	public SafeFileHandle CreateUnbufferedRW(string path, FileAccess acc, FileShare share, FileMode mode,
+		bool writeThrough) {
+		//O_RDONLY is 0
+		var direct = RuntimeInformation.IsOSX ? OpenFlags.O_RDONLY : OpenFlags.O_DIRECT;
+		var flags = GetFlags(acc, mode) | direct;
+		var han = Syscall.open(path, flags, FilePermissions.S_IRWXU);
+		if (han < 0) {
+			throw new Win32Exception();
+		}
+
+		var handle = new SafeFileHandle((IntPtr)han, true);
+		if (handle.IsInvalid) {
+			throw new Exception("Invalid handle");
+		}
+
+		MacCaching.Disable(handle);
+
+		return handle;
+	}
+
+	private static OpenFlags GetFlags(FileAccess acc, FileMode mode) {
+		var flags = OpenFlags.O_RDONLY; //RDONLY is 0
+		switch (acc) {
+			case FileAccess.Read:
+				flags |= OpenFlags.O_RDONLY;
+				break;
+			case FileAccess.Write:
+				flags |= OpenFlags.O_WRONLY;
+				break;
+			case FileAccess.ReadWrite:
+				flags |= OpenFlags.O_RDWR;
+				break;
+		}
+
+		switch (mode) {
+			case FileMode.Append:
+				flags |= OpenFlags.O_APPEND;
+				break;
+			case FileMode.Create:
+			case FileMode.CreateNew:
+				flags |= OpenFlags.O_CREAT;
+				break;
+			case FileMode.Truncate:
+				flags |= OpenFlags.O_TRUNC;
+				break;
+		}
+
+		return flags;
+	}
+
+	public void Seek(SafeFileHandle handle, long position, SeekOrigin origin) {
+		int r;
+		do {
+			r = (int)Syscall.lseek(handle.DangerousGetHandle().ToInt32(), position, SeekFlags.SEEK_SET);
+		} while (UnixMarshal.ShouldRetrySyscall(r));
+
+		UnixMarshal.ThrowExceptionForLastErrorIf(r);
+	}
+}
diff --git a/src/KurrentDB.Native/TransactionLog/Unbuffered/NativeFileWindows.cs b/src/KurrentDB.Native/TransactionLog/Unbuffered/NativeFileWindows.cs
new file mode 100644
index 00000000000..0b5d7a5facc
--- /dev/null
+++ b/src/KurrentDB.Native/TransactionLog/Unbuffered/NativeFileWindows.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.ComponentModel;
+using System.IO;
+using Microsoft.Win32.SafeHandles;
+
+// Resharper disable CheckNamespace
+
+namespace KurrentDB.Core.TransactionLog.Unbuffered;
+
+public unsafe class NativeFileWindows : INativeFile {
+	public uint GetDriveSectorSize(string path) {
+		WinNative.GetDiskFreeSpace(Path.GetPathRoot(path), out _, out var size, out _, out _);
+		return size;
+	}
+
+	public long GetPageSize(string path) {
+		return GetDriveSectorSize(path);
+	}
+
+	public void SetFileSize(SafeFileHandle handle, long count) {
+		var low = (int)(count & 0xffffffff);
+		var high = (int)(count >> 32);
+		WinNative.SetFilePointer(handle, low, out high, WinNative.EMoveMethod.Begin);
+		if (!WinNative.SetEndOfFile(handle)) {
+			throw new Win32Exception();
+		}
+
+		FSync(handle);
+	}
+
+	private static void FSync(SafeFileHandle handle) {
+		WinNative.FlushFileBuffers(handle);
+	}
+
+	public void Write(SafeFileHandle handle, byte* buffer, uint count, ref int written) {
+		if (!WinNative.WriteFile(handle, buffer, count, ref written, IntPtr.Zero)) {
+			throw new Win32Exception();
+		}
+	}
+
+	public int Read(SafeFileHandle handle, byte* buffer, int offset, int count) {
+		var read = 0;
+
+		if (!WinNative.ReadFile(handle, buffer, count, ref read, 0)) {
+			throw new Win32Exception();
+		}
+
+		return read;
+	}
+
+	public long GetFileSize(SafeFileHandle handle) {
+		if (!WinNative.GetFileSizeEx(handle, out var size)) {
+			throw new Win32Exception();
+		}
+
+		return size;
+	}
+
+	//TODO UNBUFF use FileAccess etc or do custom?
+	public SafeFileHandle Create(string path, FileAccess acc, FileShare readWrite, FileMode mode, int flags) {
+		var handle = WinNative.CreateFile(path,
+			acc,
+			FileShare.ReadWrite,
+			IntPtr.Zero,
+			mode,
+			flags,
+			IntPtr.Zero);
+		if (handle.IsInvalid) {
+			throw new Win32Exception();
+		}
+
+		return handle;
+	}
+
+
+	public SafeFileHandle CreateUnbufferedRW(string path, FileAccess acc, FileShare share, FileMode mode,
+		bool writeThrough) {
+		var flags = ExtendedFileOptions.NoBuffering;
+		if (writeThrough)
+			flags = flags | ExtendedFileOptions.WriteThrough;
+		var handle = WinNative.CreateFile(path,
+			acc,
+			share,
+			IntPtr.Zero,
+			FileMode.OpenOrCreate,
+			(int)flags,
+			IntPtr.Zero);
+		if (handle.IsInvalid) {
+			throw new Win32Exception();
+		}
+
+		return handle;
+	}
+
+	public void Seek(SafeFileHandle handle, long position, SeekOrigin origin) {
+		var low = (int)(position & 0xffffffff);
+		var high = (int)(position >> 32);
+		var f = WinNative.SetFilePointer(handle, low, out high, WinNative.EMoveMethod.Begin);
+		if (f == WinNative.INVALID_SET_FILE_POINTER) {
+			throw new Win32Exception();
+		}
+	}
+}
diff --git a/src/KurrentDB.Native/TransactionLog/Unbuffered/WinNative.cs b/src/KurrentDB.Native/TransactionLog/Unbuffered/WinNative.cs
new file mode 100644
index 00000000000..0234cdc87e0
--- /dev/null
+++ b/src/KurrentDB.Native/TransactionLog/Unbuffered/WinNative.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
+using Microsoft.Win32.SafeHandles;
+
+// Resharper disable CheckNamespace
+
+namespace KurrentDB.Core.TransactionLog.Unbuffered;
+
+internal static unsafe class WinNative {
+	[DllImport("KERNEL32", SetLastError = true, CharSet = CharSet.Auto, BestFitMapping = false)]
+	public static extern bool GetDiskFreeSpace(string path,
+		out uint sectorsPerCluster,
+		out uint bytesPerSector,
+		out uint numberOfFreeClusters,
+		out uint totalNumberOfClusters);
+
+	[DllImport("kernel32.dll", SetLastError = true)]
+	internal static extern bool WriteFile(
+		SafeFileHandle hFile,
+		byte* aBuffer,
+		UInt32 cbToWrite,
+		ref int cbThatWereWritten,
+		IntPtr pOverlapped);
+
+	[DllImport("kernel32", SetLastError = true)]
+	public static extern bool ReadFile
+	(
+		SafeFileHandle hFile,
+		byte* pBuffer,
+		int numberOfBytesToRead,
+		ref int pNumberOfBytesRead,
+		int overlapped
+	);
+
+	[DllImport("kernel32.dll")]
+	public static extern bool GetFileSizeEx(SafeFileHandle hFile, out long lpFileSize);
+
+	[DllImport("kernel32.dll", SetLastError = true)]
+	internal static extern UInt32 SetFilePointer(
+		SafeFileHandle hFile,
+		Int32 cbDistanceToMove,
+		IntPtr pDistanceToMoveHigh,
+		EMoveMethod fMoveMethod);
+
+	[DllImport("KERNEL32", SetLastError = true, CharSet = CharSet.Auto, BestFitMapping = false)]
+	public static extern SafeFileHandle CreateFile(String fileName,
+		FileAccess desiredAccess,
+		FileShare shareMode,
+		IntPtr securityAttrs,
+		FileMode creationDisposition,
+		int flagsAndAttributes,
+		IntPtr templateFile);
+
+	public enum EMoveMethod : uint {
+		Begin = 0,
+		Current = 1,
+		End = 2
+	}
+
+	[DllImport("kernel32.dll", SetLastError = true)]
+	internal static extern bool SetEndOfFile(
+		SafeFileHandle hFile);
+
+	[DllImport("kernel32.dll", SetLastError = true)]
+	internal static extern bool FlushFileBuffers(SafeFileHandle filehandle);
+
+	[DllImport("kernel32.dll", SetLastError = true)]
+	[return: MarshalAs(UnmanagedType.Bool)]
+	public static extern bool CloseHandle(IntPtr hObject);
+
+	[DllImport("Kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+	public static extern int SetFilePointer(SafeFileHandle handle, int lDistanceToMove,
+		out int lpDistanceToMoveHigh, EMoveMethod dwMoveMethod);
+
+	// ReSharper disable once InconsistentNaming
+	public const int INVALID_SET_FILE_POINTER = -1;
+}
diff --git a/src/KurrentDB.OtlpExporterPlugin.Tests/FakeCollector.cs b/src/KurrentDB.OtlpExporterPlugin.Tests/FakeCollector.cs
new file mode 100644
index 00000000000..a857761c513
--- /dev/null
+++ b/src/KurrentDB.OtlpExporterPlugin.Tests/FakeCollector.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using Grpc.Core;
+using OpenTelemetry.Proto.Collector.Metrics.V1;
+
+namespace KurrentDB.OtlpExporterPlugin.Tests;
+
+public class FakeCollector(TaskCompletionSource<ExportMetricsServiceRequest> tcs) : MetricsService.MetricsServiceBase {
+	public override Task<ExportMetricsServiceResponse> Export(ExportMetricsServiceRequest request, ServerCallContext context) {
+		tcs.TrySetResult(request);
+		return Task.FromResult(new ExportMetricsServiceResponse());
+	}
+}
diff --git a/src/KurrentDB.OtlpExporterPlugin.Tests/FakeLogger.cs b/src/KurrentDB.OtlpExporterPlugin.Tests/FakeLogger.cs
new file mode 100644
index 00000000000..19f32b58064
--- /dev/null
+++ b/src/KurrentDB.OtlpExporterPlugin.Tests/FakeLogger.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using Serilog;
+using Serilog.Events;
+
+namespace KurrentDB.OtlpExporterPlugin.Tests;
+
+public class FakeLogger : ILogger {
+	public List<LogEvent> LogMessages { get; } = new();
+
+	public void Write(LogEvent logEvent) {
+		LogMessages.Add(logEvent);
+	}
+}
diff --git a/src/KurrentDB.OtlpExporterPlugin.Tests/KurrentDB.OtlpExporterPlugin.Tests.csproj b/src/KurrentDB.OtlpExporterPlugin.Tests/KurrentDB.OtlpExporterPlugin.Tests.csproj
new file mode 100644
index 00000000000..e44cc3dbded
--- /dev/null
+++ b/src/KurrentDB.OtlpExporterPlugin.Tests/KurrentDB.OtlpExporterPlugin.Tests.csproj
@@ -0,0 +1,38 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<IsTestProject>true</IsTestProject>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="FluentAssertions" Version="6.12.0" />
+		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
+		<PackageReference Include="Grpc.AspNetCore" Version="2.64.0" />
+		<PackageReference Include="Grpc.Tools" Version="2.65.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+		<PackageReference Include="System.Net.Http" Version="4.3.4" />
+		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
+		<PackageReference Include="xunit" Version="2.9.3" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="coverlet.collector" Version="6.0.4">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.OtlpExporterPlugin\KurrentDB.OtlpExporterPlugin.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Protobuf Include="**\*.proto" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.OtlpExporterPlugin.Tests/OtlpExporterPluginTests.cs b/src/KurrentDB.OtlpExporterPlugin.Tests/OtlpExporterPluginTests.cs
new file mode 100644
index 00000000000..acd1e981044
--- /dev/null
+++ b/src/KurrentDB.OtlpExporterPlugin.Tests/OtlpExporterPluginTests.cs
@@ -0,0 +1,94 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins;
+using EventStore.Plugins.Diagnostics;
+using EventStore.Plugins.Licensing;
+using FluentAssertions;
+using KurrentDB.Plugins.TestHelpers;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace KurrentDB.OtlpExporterPlugin.Tests;
+
+[Collection("OtlpSequentialTests")] // so that the PluginDiagnosticsDataCollectors do not conflict
+public class OtlpExporterPluginTests {
+	[Theory]
+	[InlineData(true)]
+	[InlineData(false)]
+	public void can_collect_telemetry(bool enabled) {
+		// given
+		using var sut = new OtlpExporterPlugin();
+		using var collector = PluginDiagnosticsDataCollector.Start(sut.DiagnosticsName);
+
+		IConfigurationBuilder configBuilder = new ConfigurationBuilder();
+
+		if (enabled)
+			configBuilder = configBuilder.AddInMemoryCollection(new Dictionary<string, string?> {
+				{$"{KurrentConfigurationConstants.Prefix}:OpenTelemetry:Otlp:Endpoint", "http://localhost:1234"},
+			});
+
+		var config = configBuilder.Build();
+
+		var builder = WebApplication.CreateBuilder();
+		builder.Services.AddSingleton<ILicenseService>(new Fixtures.FakeLicenseService());
+
+		// when
+		((IPlugableComponent)sut).ConfigureServices(
+			builder.Services,
+			config);
+
+		var app = builder.Build();
+		((IPlugableComponent)sut).ConfigureApplication(app, config);
+
+		// then
+		collector.CollectedEvents(sut.DiagnosticsName).Should().ContainSingle().Which
+			.Data["enabled"].Should().Be(enabled);
+	}
+
+	[Theory]
+	[InlineData(true, true, "OTLP_EXPORTER", false)]
+	[InlineData(true, false, "OTLP_EXPORTER", true)]
+	[InlineData(false, true, "OTLP_EXPORTER", false)]
+	[InlineData(false, false, "OTLP_EXPORTER", false)]
+	[InlineData(true, true, "NONE", true)]
+	[InlineData(true, false, "NONE", true)]
+	[InlineData(false, true, "NONE", false)]
+	[InlineData(false, false, "NONE", false)]
+	public void respects_license(bool enabled, bool licensePresent, string entitlement, bool expectedException) {
+		// given
+		using var sut = new OtlpExporterPlugin();
+
+		IConfigurationBuilder configBuilder = new ConfigurationBuilder();
+
+		if (enabled)
+			configBuilder = configBuilder.AddInMemoryCollection(new Dictionary<string, string?> {
+				{$"{KurrentConfigurationConstants.Prefix}:OpenTelemetry:Otlp:Endpoint", "http://localhost:1234"},
+			});
+
+		var config = configBuilder.Build();
+
+		var builder = WebApplication.CreateBuilder();
+
+		var licenseService = new Fixtures.FakeLicenseService(licensePresent, entitlement);
+		builder.Services.AddSingleton<ILicenseService>(licenseService);
+
+		((IPlugableComponent)sut).ConfigureServices(
+			builder.Services,
+			config);
+
+		var app = builder.Build();
+
+		// when
+		((IPlugableComponent)sut).ConfigureApplication(app, config);
+
+		// then
+		if (expectedException) {
+			Assert.NotNull(licenseService.RejectionException);
+		} else {
+			Assert.Null(licenseService.RejectionException);
+		}
+	}
+}
diff --git a/src/KurrentDB.OtlpExporterPlugin.Tests/OtlpExporterTests.cs b/src/KurrentDB.OtlpExporterPlugin.Tests/OtlpExporterTests.cs
new file mode 100644
index 00000000000..2c7dd235b1d
--- /dev/null
+++ b/src/KurrentDB.OtlpExporterPlugin.Tests/OtlpExporterTests.cs
@@ -0,0 +1,154 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Diagnostics.Metrics;
+using EventStore.Plugins;
+using EventStore.Plugins.Diagnostics;
+using EventStore.Plugins.Licensing;
+using FluentAssertions;
+using KurrentDB.Plugins.TestHelpers;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Server.Kestrel.Core;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using OpenTelemetry.Metrics;
+using OpenTelemetry.Proto.Collector.Metrics.V1;
+using OpenTelemetry.Resources;
+using Xunit;
+
+namespace KurrentDB.OtlpExporterPlugin.Tests;
+
+[Collection("OtlpSequentialTests")] // so that the PluginDiagnosticsDataCollectors do not conflict
+public class OtlpExporterTests {
+	private const string Endpoint = "http://localhost:6506";
+	private readonly FakeLogger _logger = new();
+
+	[Fact]
+	public void has_parameterless_constructor() {
+		// needed for all plugins
+		using var _ = Activator.CreateInstance<OtlpExporterPlugin>();
+	}
+
+	[Fact]
+	public async Task disabled_when_no_config() {
+		using var collector = PluginDiagnosticsDataCollector.Start("OtlpExporter");
+		await using var _ = await CreateServer(new(), []);
+		collector.CollectedEvents("OtlpExporter").Should().ContainSingle().Which
+			.Data["enabled"].Should().Be(false);
+	}
+
+	[Fact]
+	public async Task respects_expected_scrape_interval() {
+		await using var _ = await CreateServer(new(), new Dictionary<string, string?> {
+			{ $"{KurrentConfigurationConstants.Prefix}:OpenTelemetry:Otlp:Endpoint", Endpoint },
+			{ $"{KurrentConfigurationConstants.Prefix}:Metrics:ExpectedScrapeIntervalSeconds", "5" },
+		});
+		var log = Assert.Single(_logger.LogMessages);
+		Assert.Equal("OtlpExporter: Exporting metrics to http://localhost:6506/ every 5.0 seconds", log.RenderMessage());
+	}
+
+	[Fact]
+	public async Task export_interval_superceeds_expected_scrape_interval() {
+		await using var _ = await CreateServer(new(), new Dictionary<string, string?> {
+			{ $"{KurrentConfigurationConstants.Prefix}:OpenTelemetry:Otlp:Endpoint", Endpoint },
+			{ $"{KurrentConfigurationConstants.Prefix}:OpenTelemetry:Metrics:PeriodicExportingMetricReaderOptions:ExportIntervalMilliseconds", "5000" },
+			{ $"{KurrentConfigurationConstants.Prefix}:Metrics:ExpectedScrapeIntervalSeconds", "4" },
+		});
+		Assert.Collection(_logger.LogMessages,
+			log => Assert.Equal(
+				$"OtlpExporter: {KurrentConfigurationConstants.Prefix}:OpenTelemetry:Metrics:PeriodicExportingMetricReaderOptions:ExportIntervalMilliseconds " +
+				$"(5000 ms) does not match {KurrentConfigurationConstants.Prefix}:Metrics:ExpectedScrapeIntervalSeconds " +
+				"(4 s). Periodic maximum metrics may not be reported correctly.",
+				log.RenderMessage()),
+			log => Assert.Equal("OtlpExporter: Exporting metrics to http://localhost:6506/ every 5.0 seconds", log.RenderMessage()));
+	}
+
+	[Fact]
+	public async Task does_not_warn_when_settings_agree() {
+		await using var _ = await CreateServer(new(), new Dictionary<string, string?> {
+			{ $"{KurrentConfigurationConstants.Prefix}:OpenTelemetry:Otlp:Endpoint", Endpoint },
+			{ $"{KurrentConfigurationConstants.Prefix}:OpenTelemetry:Metrics:PeriodicExportingMetricReaderOptions:ExportIntervalMilliseconds", "5000" },
+			{ $"{KurrentConfigurationConstants.Prefix}:Metrics:ExpectedScrapeIntervalSeconds", "5" },
+		});
+		var log = Assert.Single(_logger.LogMessages);
+		Assert.Equal("OtlpExporter: Exporting metrics to http://localhost:6506/ every 5.0 seconds", log.RenderMessage());
+	}
+
+	[Fact]
+	public async Task exports_metrics() {
+		var meter = new Meter("EventStore.TestMeter", version: "1.0.0");
+		meter.CreateObservableCounter("test-counter", () => 7);
+
+		var tcs = new TaskCompletionSource<ExportMetricsServiceRequest>();
+
+		await using var _ = await CreateServer(tcs, new Dictionary<string, string?> {
+			{ $"{KurrentConfigurationConstants.Prefix}:OpenTelemetry:Otlp:Endpoint", Endpoint },
+			{ $"{KurrentConfigurationConstants.Prefix}:Metrics:ExpectedScrapeIntervalSeconds", "1" }
+		});
+
+		var log = Assert.Single(_logger.LogMessages);
+		Assert.Equal("OtlpExporter: Exporting metrics to http://localhost:6506/ every 1.0 seconds", log.RenderMessage());
+
+		if (await Task.WhenAny(tcs.Task, Task.Delay(15_000)) != tcs.Task)
+			throw new Exception("timed out");
+
+		var exportReceived = await tcs.Task;
+
+		var resourceMetric = Assert.Single(exportReceived.ResourceMetrics);
+		var scopeMetric = Assert.Single(resourceMetric.ScopeMetrics);
+		var metric = Assert.Single(scopeMetric.Metrics);
+		Assert.Equal("test-counter", metric.Name);
+		var dataPoint = Assert.Single(metric.Sum.DataPoints);
+		Assert.Equal(7, dataPoint.AsInt);
+	}
+
+	// server hosts the sut, and doubles up as a fake collector for exported metrics
+	private async Task<IAsyncDisposable> CreateServer(
+		TaskCompletionSource<ExportMetricsServiceRequest> receiveExport,
+		Dictionary<string, string?> configuration) {
+
+		var builder = WebApplication.CreateBuilder();
+		builder.Configuration.AddInMemoryCollection(configuration);
+		builder.WebHost
+			.UseUrls(Endpoint)
+			.ConfigureKestrel(x => x
+				.ConfigureEndpointDefaults(y => y.Protocols = HttpProtocols.Http2));
+		builder.Services
+			.AddSingleton<ILicenseService>(new Fixtures.FakeLicenseService())
+			.AddSingleton(new FakeCollector(receiveExport))
+			.AddGrpc().Services
+			.AddOpenTelemetry()
+				.WithMetrics(meterOptions => meterOptions
+					.SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("eventstore"))
+					.AddMeter("EventStore.TestMeter"));
+
+		var sut = new OtlpExporterPlugin(_logger);
+		((IPlugableComponent)sut).ConfigureServices(builder.Services, builder.Configuration);
+
+		var app = builder.Build();
+
+		app.MapGrpcService<FakeCollector>();
+		((IPlugableComponent)sut).ConfigureApplication(app, builder.Configuration);
+
+		await app.StartAsync();
+		return new AsyncDisposables(
+			new AsyncDisposable(sut),
+			app);
+	}
+
+	class AsyncDisposable(IDisposable disposable) : IAsyncDisposable {
+		public ValueTask DisposeAsync() {
+			disposable.Dispose();
+			return ValueTask.CompletedTask;
+		}
+	}
+
+	class AsyncDisposables(params IAsyncDisposable[] disposables) : IAsyncDisposable {
+		public async ValueTask DisposeAsync() {
+			foreach (var disposable in disposables) {
+				await disposable.DisposeAsync();
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/collector/README.md b/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/collector/README.md
new file mode 100644
index 00000000000..f82dbb0278b
--- /dev/null
+++ b/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/collector/README.md
@@ -0,0 +1,10 @@
+# OpenTelemetry Collector Proto
+
+This package describes the OpenTelemetry collector protocol.
+
+## Packages
+
+1. `common` package contains the common messages shared between different services.
+2. `trace` package contains the Trace Service protos.
+3. `metrics` package contains the Metrics Service protos.
+4. `logs` package contains the Logs Service protos.
diff --git a/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/collector/metrics/v1/metrics_service.proto b/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/collector/metrics/v1/metrics_service.proto
new file mode 100644
index 00000000000..dd48f1ad3a1
--- /dev/null
+++ b/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/collector/metrics/v1/metrics_service.proto
@@ -0,0 +1,79 @@
+// Copyright 2019, OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+package opentelemetry.proto.collector.metrics.v1;
+
+import "opentelemetry/proto/metrics/v1/metrics.proto";
+
+option csharp_namespace = "OpenTelemetry.Proto.Collector.Metrics.V1";
+option java_multiple_files = true;
+option java_package = "io.opentelemetry.proto.collector.metrics.v1";
+option java_outer_classname = "MetricsServiceProto";
+option go_package = "go.opentelemetry.io/proto/otlp/collector/metrics/v1";
+
+// Service that can be used to push metrics between one Application
+// instrumented with OpenTelemetry and a collector, or between a collector and a
+// central collector.
+service MetricsService {
+  // For performance reasons, it is recommended to keep this RPC
+  // alive for the entire life of the application.
+  rpc Export(ExportMetricsServiceRequest) returns (ExportMetricsServiceResponse) {}
+}
+
+message ExportMetricsServiceRequest {
+  // An array of ResourceMetrics.
+  // For data coming from a single resource this array will typically contain one
+  // element. Intermediary nodes (such as OpenTelemetry Collector) that receive
+  // data from multiple origins typically batch the data before forwarding further and
+  // in that case this array will contain multiple elements.
+  repeated opentelemetry.proto.metrics.v1.ResourceMetrics resource_metrics = 1;
+}
+
+message ExportMetricsServiceResponse {
+  // The details of a partially successful export request.
+  //
+  // If the request is only partially accepted
+  // (i.e. when the server accepts only parts of the data and rejects the rest)
+  // the server MUST initialize the `partial_success` field and MUST
+  // set the `rejected_<signal>` with the number of items it rejected.
+  //
+  // Servers MAY also make use of the `partial_success` field to convey
+  // warnings/suggestions to senders even when the request was fully accepted.
+  // In such cases, the `rejected_<signal>` MUST have a value of `0` and
+  // the `error_message` MUST be non-empty.
+  //
+  // A `partial_success` message with an empty value (rejected_<signal> = 0 and
+  // `error_message` = "") is equivalent to it not being set/present. Senders
+  // SHOULD interpret it the same way as in the full success case.
+  ExportMetricsPartialSuccess partial_success = 1;
+}
+
+message ExportMetricsPartialSuccess {
+  // The number of rejected data points.
+  //
+  // A `rejected_<signal>` field holding a `0` value indicates that the
+  // request was fully accepted.
+  int64 rejected_data_points = 1;
+
+  // A developer-facing human-readable message in English. It should be used
+  // either to explain why the server rejected parts of the data during a partial
+  // success or to convey warnings/suggestions during a full success. The message
+  // should offer guidance on how users can address such issues.
+  //
+  // error_message is an optional field. An error_message with an empty value
+  // is equivalent to it not being set.
+  string error_message = 2;
+}
diff --git a/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/collector/metrics/v1/metrics_service_http.yaml b/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/collector/metrics/v1/metrics_service_http.yaml
new file mode 100644
index 00000000000..a5456502607
--- /dev/null
+++ b/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/collector/metrics/v1/metrics_service_http.yaml
@@ -0,0 +1,9 @@
+# This is an API configuration to generate an HTTP/JSON -> gRPC gateway for the
+# OpenTelemetry service using github.com/grpc-ecosystem/grpc-gateway.
+type: google.api.Service
+config_version: 3
+http:
+ rules:
+ - selector: opentelemetry.proto.collector.metrics.v1.MetricsService.Export
+   post: /v1/metrics
+   body: "*"
\ No newline at end of file
diff --git a/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/collector/trace/v1/trace_service.proto b/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/collector/trace/v1/trace_service.proto
new file mode 100644
index 00000000000..d6fe67f9e55
--- /dev/null
+++ b/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/collector/trace/v1/trace_service.proto
@@ -0,0 +1,79 @@
+// Copyright 2019, OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+package opentelemetry.proto.collector.trace.v1;
+
+import "opentelemetry/proto/trace/v1/trace.proto";
+
+option csharp_namespace = "OpenTelemetry.Proto.Collector.Trace.V1";
+option java_multiple_files = true;
+option java_package = "io.opentelemetry.proto.collector.trace.v1";
+option java_outer_classname = "TraceServiceProto";
+option go_package = "go.opentelemetry.io/proto/otlp/collector/trace/v1";
+
+// Service that can be used to push spans between one Application instrumented with
+// OpenTelemetry and a collector, or between a collector and a central collector (in this
+// case spans are sent/received to/from multiple Applications).
+service TraceService {
+  // For performance reasons, it is recommended to keep this RPC
+  // alive for the entire life of the application.
+  rpc Export(ExportTraceServiceRequest) returns (ExportTraceServiceResponse) {}
+}
+
+message ExportTraceServiceRequest {
+  // An array of ResourceSpans.
+  // For data coming from a single resource this array will typically contain one
+  // element. Intermediary nodes (such as OpenTelemetry Collector) that receive
+  // data from multiple origins typically batch the data before forwarding further and
+  // in that case this array will contain multiple elements.
+  repeated opentelemetry.proto.trace.v1.ResourceSpans resource_spans = 1;
+}
+
+message ExportTraceServiceResponse {
+  // The details of a partially successful export request.
+  //
+  // If the request is only partially accepted
+  // (i.e. when the server accepts only parts of the data and rejects the rest)
+  // the server MUST initialize the `partial_success` field and MUST
+  // set the `rejected_<signal>` with the number of items it rejected.
+  //
+  // Servers MAY also make use of the `partial_success` field to convey
+  // warnings/suggestions to senders even when the request was fully accepted.
+  // In such cases, the `rejected_<signal>` MUST have a value of `0` and
+  // the `error_message` MUST be non-empty.
+  //
+  // A `partial_success` message with an empty value (rejected_<signal> = 0 and
+  // `error_message` = "") is equivalent to it not being set/present. Senders
+  // SHOULD interpret it the same way as in the full success case.
+  ExportTracePartialSuccess partial_success = 1;
+}
+
+message ExportTracePartialSuccess {
+  // The number of rejected spans.
+  //
+  // A `rejected_<signal>` field holding a `0` value indicates that the
+  // request was fully accepted.
+  int64 rejected_spans = 1;
+
+  // A developer-facing human-readable message in English. It should be used
+  // either to explain why the server rejected parts of the data during a partial
+  // success or to convey warnings/suggestions during a full success. The message
+  // should offer guidance on how users can address such issues.
+  //
+  // error_message is an optional field. An error_message with an empty value
+  // is equivalent to it not being set.
+  string error_message = 2;
+}
diff --git a/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/collector/trace/v1/trace_service_http.yaml b/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/collector/trace/v1/trace_service_http.yaml
new file mode 100644
index 00000000000..d091b3a8d53
--- /dev/null
+++ b/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/collector/trace/v1/trace_service_http.yaml
@@ -0,0 +1,9 @@
+# This is an API configuration to generate an HTTP/JSON -> gRPC gateway for the
+# OpenTelemetry service using github.com/grpc-ecosystem/grpc-gateway.
+type: google.api.Service
+config_version: 3
+http:
+ rules:
+ - selector: opentelemetry.proto.collector.trace.v1.TraceService.Export
+   post: /v1/traces
+   body: "*"
diff --git a/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/common/v1/common.proto b/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/common/v1/common.proto
new file mode 100644
index 00000000000..ff8a21a1fa0
--- /dev/null
+++ b/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/common/v1/common.proto
@@ -0,0 +1,81 @@
+// Copyright 2019, OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+package opentelemetry.proto.common.v1;
+
+option csharp_namespace = "OpenTelemetry.Proto.Common.V1";
+option java_multiple_files = true;
+option java_package = "io.opentelemetry.proto.common.v1";
+option java_outer_classname = "CommonProto";
+option go_package = "go.opentelemetry.io/proto/otlp/common/v1";
+
+// AnyValue is used to represent any type of attribute value. AnyValue may contain a
+// primitive value such as a string or integer or it may contain an arbitrary nested
+// object containing arrays, key-value lists and primitives.
+message AnyValue {
+  // The value is one of the listed fields. It is valid for all values to be unspecified
+  // in which case this AnyValue is considered to be "empty".
+  oneof value {
+    string string_value = 1;
+    bool bool_value = 2;
+    int64 int_value = 3;
+    double double_value = 4;
+    ArrayValue array_value = 5;
+    KeyValueList kvlist_value = 6;
+    bytes bytes_value = 7;
+  }
+}
+
+// ArrayValue is a list of AnyValue messages. We need ArrayValue as a message
+// since oneof in AnyValue does not allow repeated fields.
+message ArrayValue {
+  // Array of values. The array may be empty (contain 0 elements).
+  repeated AnyValue values = 1;
+}
+
+// KeyValueList is a list of KeyValue messages. We need KeyValueList as a message
+// since `oneof` in AnyValue does not allow repeated fields. Everywhere else where we need
+// a list of KeyValue messages (e.g. in Span) we use `repeated KeyValue` directly to
+// avoid unnecessary extra wrapping (which slows down the protocol). The 2 approaches
+// are semantically equivalent.
+message KeyValueList {
+  // A collection of key/value pairs of key-value pairs. The list may be empty (may
+  // contain 0 elements).
+  // The keys MUST be unique (it is not allowed to have more than one
+  // value with the same key).
+  repeated KeyValue values = 1;
+}
+
+// KeyValue is a key-value pair that is used to store Span attributes, Link
+// attributes, etc.
+message KeyValue {
+  string key = 1;
+  AnyValue value = 2;
+}
+
+// InstrumentationScope is a message representing the instrumentation scope information
+// such as the fully qualified name and version. 
+message InstrumentationScope {
+  // An empty instrumentation scope name means the name is unknown.
+  string name = 1;
+  string version = 2;
+
+  // Additional attributes that describe the scope. [Optional].
+  // Attribute keys MUST be unique (it is not allowed to have more than one
+  // attribute with the same key).
+  repeated KeyValue attributes = 3;
+  uint32 dropped_attributes_count = 4;
+}
diff --git a/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/metrics/v1/metrics.proto b/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/metrics/v1/metrics.proto
new file mode 100644
index 00000000000..19bb7ff8d53
--- /dev/null
+++ b/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/metrics/v1/metrics.proto
@@ -0,0 +1,691 @@
+// Copyright 2019, OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+package opentelemetry.proto.metrics.v1;
+
+import "opentelemetry/proto/common/v1/common.proto";
+import "opentelemetry/proto/resource/v1/resource.proto";
+
+option csharp_namespace = "OpenTelemetry.Proto.Metrics.V1";
+option java_multiple_files = true;
+option java_package = "io.opentelemetry.proto.metrics.v1";
+option java_outer_classname = "MetricsProto";
+option go_package = "go.opentelemetry.io/proto/otlp/metrics/v1";
+
+// MetricsData represents the metrics data that can be stored in a persistent
+// storage, OR can be embedded by other protocols that transfer OTLP metrics
+// data but do not implement the OTLP protocol.
+//
+// The main difference between this message and collector protocol is that
+// in this message there will not be any "control" or "metadata" specific to
+// OTLP protocol.
+//
+// When new fields are added into this message, the OTLP request MUST be updated
+// as well.
+message MetricsData {
+  // An array of ResourceMetrics.
+  // For data coming from a single resource this array will typically contain
+  // one element. Intermediary nodes that receive data from multiple origins
+  // typically batch the data before forwarding further and in that case this
+  // array will contain multiple elements.
+  repeated ResourceMetrics resource_metrics = 1;
+}
+
+// A collection of ScopeMetrics from a Resource.
+message ResourceMetrics {
+  reserved 1000;
+
+  // The resource for the metrics in this message.
+  // If this field is not set then no resource info is known.
+  opentelemetry.proto.resource.v1.Resource resource = 1;
+
+  // A list of metrics that originate from a resource.
+  repeated ScopeMetrics scope_metrics = 2;
+
+  // The Schema URL, if known. This is the identifier of the Schema that the resource data
+  // is recorded in. To learn more about Schema URL see
+  // https://opentelemetry.io/docs/specs/otel/schemas/#schema-url
+  // This schema_url applies to the data in the "resource" field. It does not apply
+  // to the data in the "scope_metrics" field which have their own schema_url field.
+  string schema_url = 3;
+}
+
+// A collection of Metrics produced by an Scope.
+message ScopeMetrics {
+  // The instrumentation scope information for the metrics in this message.
+  // Semantically when InstrumentationScope isn't set, it is equivalent with
+  // an empty instrumentation scope name (unknown).
+  opentelemetry.proto.common.v1.InstrumentationScope scope = 1;
+
+  // A list of metrics that originate from an instrumentation library.
+  repeated Metric metrics = 2;
+
+  // The Schema URL, if known. This is the identifier of the Schema that the metric data
+  // is recorded in. To learn more about Schema URL see
+  // https://opentelemetry.io/docs/specs/otel/schemas/#schema-url
+  // This schema_url applies to all metrics in the "metrics" field.
+  string schema_url = 3;
+}
+
+// Defines a Metric which has one or more timeseries.  The following is a
+// brief summary of the Metric data model.  For more details, see:
+//
+//   https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/data-model.md
+//
+//
+// The data model and relation between entities is shown in the
+// diagram below. Here, "DataPoint" is the term used to refer to any
+// one of the specific data point value types, and "points" is the term used
+// to refer to any one of the lists of points contained in the Metric.
+//
+// - Metric is composed of a metadata and data.
+// - Metadata part contains a name, description, unit.
+// - Data is one of the possible types (Sum, Gauge, Histogram, Summary).
+// - DataPoint contains timestamps, attributes, and one of the possible value type
+//   fields.
+//
+//     Metric
+//  +------------+
+//  |name        |
+//  |description |
+//  |unit        |     +------------------------------------+
+//  |data        |---> |Gauge, Sum, Histogram, Summary, ... |
+//  +------------+     +------------------------------------+
+//
+//    Data [One of Gauge, Sum, Histogram, Summary, ...]
+//  +-----------+
+//  |...        |  // Metadata about the Data.
+//  |points     |--+
+//  +-----------+  |
+//                 |      +---------------------------+
+//                 |      |DataPoint 1                |
+//                 v      |+------+------+   +------+ |
+//              +-----+   ||label |label |...|label | |
+//              |  1  |-->||value1|value2|...|valueN| |
+//              +-----+   |+------+------+   +------+ |
+//              |  .  |   |+-----+                    |
+//              |  .  |   ||value|                    |
+//              |  .  |   |+-----+                    |
+//              |  .  |   +---------------------------+
+//              |  .  |                   .
+//              |  .  |                   .
+//              |  .  |                   .
+//              |  .  |   +---------------------------+
+//              |  .  |   |DataPoint M                |
+//              +-----+   |+------+------+   +------+ |
+//              |  M  |-->||label |label |...|label | |
+//              +-----+   ||value1|value2|...|valueN| |
+//                        |+------+------+   +------+ |
+//                        |+-----+                    |
+//                        ||value|                    |
+//                        |+-----+                    |
+//                        +---------------------------+
+//
+// Each distinct type of DataPoint represents the output of a specific
+// aggregation function, the result of applying the DataPoint's
+// associated function of to one or more measurements.
+//
+// All DataPoint types have three common fields:
+// - Attributes includes key-value pairs associated with the data point
+// - TimeUnixNano is required, set to the end time of the aggregation
+// - StartTimeUnixNano is optional, but strongly encouraged for DataPoints
+//   having an AggregationTemporality field, as discussed below.
+//
+// Both TimeUnixNano and StartTimeUnixNano values are expressed as
+// UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January 1970.
+//
+// # TimeUnixNano
+//
+// This field is required, having consistent interpretation across
+// DataPoint types.  TimeUnixNano is the moment corresponding to when
+// the data point's aggregate value was captured.
+//
+// Data points with the 0 value for TimeUnixNano SHOULD be rejected
+// by consumers.
+//
+// # StartTimeUnixNano
+//
+// StartTimeUnixNano in general allows detecting when a sequence of
+// observations is unbroken.  This field indicates to consumers the
+// start time for points with cumulative and delta
+// AggregationTemporality, and it should be included whenever possible
+// to support correct rate calculation.  Although it may be omitted
+// when the start time is truly unknown, setting StartTimeUnixNano is
+// strongly encouraged.
+message Metric {
+  reserved 4, 6, 8;
+
+  // name of the metric.
+  string name = 1;
+
+  // description of the metric, which can be used in documentation.
+  string description = 2;
+
+  // unit in which the metric value is reported. Follows the format
+  // described by http://unitsofmeasure.org/ucum.html.
+  string unit = 3;
+
+  // Data determines the aggregation type (if any) of the metric, what is the
+  // reported value type for the data points, as well as the relatationship to
+  // the time interval over which they are reported.
+  oneof data {
+    Gauge gauge = 5;
+    Sum sum = 7;
+    Histogram histogram = 9;
+    ExponentialHistogram exponential_histogram = 10;
+    Summary summary = 11;
+  }
+
+  // Additional metadata attributes that describe the metric. [Optional].
+  // Attributes are non-identifying.
+  // Consumers SHOULD NOT need to be aware of these attributes.
+  // These attributes MAY be used to encode information allowing
+  // for lossless roundtrip translation to / from another data model.
+  // Attribute keys MUST be unique (it is not allowed to have more than one
+  // attribute with the same key).
+  repeated opentelemetry.proto.common.v1.KeyValue metadata = 12;
+}
+
+// Gauge represents the type of a scalar metric that always exports the
+// "current value" for every data point. It should be used for an "unknown"
+// aggregation.
+//
+// A Gauge does not support different aggregation temporalities. Given the
+// aggregation is unknown, points cannot be combined using the same
+// aggregation, regardless of aggregation temporalities. Therefore,
+// AggregationTemporality is not included. Consequently, this also means
+// "StartTimeUnixNano" is ignored for all data points.
+message Gauge {
+  repeated NumberDataPoint data_points = 1;
+}
+
+// Sum represents the type of a scalar metric that is calculated as a sum of all
+// reported measurements over a time interval.
+message Sum {
+  repeated NumberDataPoint data_points = 1;
+
+  // aggregation_temporality describes if the aggregator reports delta changes
+  // since last report time, or cumulative changes since a fixed start time.
+  AggregationTemporality aggregation_temporality = 2;
+
+  // If "true" means that the sum is monotonic.
+  bool is_monotonic = 3;
+}
+
+// Histogram represents the type of a metric that is calculated by aggregating
+// as a Histogram of all reported measurements over a time interval.
+message Histogram {
+  repeated HistogramDataPoint data_points = 1;
+
+  // aggregation_temporality describes if the aggregator reports delta changes
+  // since last report time, or cumulative changes since a fixed start time.
+  AggregationTemporality aggregation_temporality = 2;
+}
+
+// ExponentialHistogram represents the type of a metric that is calculated by aggregating
+// as a ExponentialHistogram of all reported double measurements over a time interval.
+message ExponentialHistogram {
+  repeated ExponentialHistogramDataPoint data_points = 1;
+
+  // aggregation_temporality describes if the aggregator reports delta changes
+  // since last report time, or cumulative changes since a fixed start time.
+  AggregationTemporality aggregation_temporality = 2;
+}
+
+// Summary metric data are used to convey quantile summaries,
+// a Prometheus (see: https://prometheus.io/docs/concepts/metric_types/#summary)
+// and OpenMetrics (see: https://github.com/OpenObservability/OpenMetrics/blob/4dbf6075567ab43296eed941037c12951faafb92/protos/prometheus.proto#L45)
+// data type. These data points cannot always be merged in a meaningful way.
+// While they can be useful in some applications, histogram data points are
+// recommended for new applications.
+message Summary {
+  repeated SummaryDataPoint data_points = 1;
+}
+
+// AggregationTemporality defines how a metric aggregator reports aggregated
+// values. It describes how those values relate to the time interval over
+// which they are aggregated.
+enum AggregationTemporality {
+  // UNSPECIFIED is the default AggregationTemporality, it MUST not be used.
+  AGGREGATION_TEMPORALITY_UNSPECIFIED = 0;
+
+  // DELTA is an AggregationTemporality for a metric aggregator which reports
+  // changes since last report time. Successive metrics contain aggregation of
+  // values from continuous and non-overlapping intervals.
+  //
+  // The values for a DELTA metric are based only on the time interval
+  // associated with one measurement cycle. There is no dependency on
+  // previous measurements like is the case for CUMULATIVE metrics.
+  //
+  // For example, consider a system measuring the number of requests that
+  // it receives and reports the sum of these requests every second as a
+  // DELTA metric:
+  //
+  //   1. The system starts receiving at time=t_0.
+  //   2. A request is received, the system measures 1 request.
+  //   3. A request is received, the system measures 1 request.
+  //   4. A request is received, the system measures 1 request.
+  //   5. The 1 second collection cycle ends. A metric is exported for the
+  //      number of requests received over the interval of time t_0 to
+  //      t_0+1 with a value of 3.
+  //   6. A request is received, the system measures 1 request.
+  //   7. A request is received, the system measures 1 request.
+  //   8. The 1 second collection cycle ends. A metric is exported for the
+  //      number of requests received over the interval of time t_0+1 to
+  //      t_0+2 with a value of 2.
+  AGGREGATION_TEMPORALITY_DELTA = 1;
+
+  // CUMULATIVE is an AggregationTemporality for a metric aggregator which
+  // reports changes since a fixed start time. This means that current values
+  // of a CUMULATIVE metric depend on all previous measurements since the
+  // start time. Because of this, the sender is required to retain this state
+  // in some form. If this state is lost or invalidated, the CUMULATIVE metric
+  // values MUST be reset and a new fixed start time following the last
+  // reported measurement time sent MUST be used.
+  //
+  // For example, consider a system measuring the number of requests that
+  // it receives and reports the sum of these requests every second as a
+  // CUMULATIVE metric:
+  //
+  //   1. The system starts receiving at time=t_0.
+  //   2. A request is received, the system measures 1 request.
+  //   3. A request is received, the system measures 1 request.
+  //   4. A request is received, the system measures 1 request.
+  //   5. The 1 second collection cycle ends. A metric is exported for the
+  //      number of requests received over the interval of time t_0 to
+  //      t_0+1 with a value of 3.
+  //   6. A request is received, the system measures 1 request.
+  //   7. A request is received, the system measures 1 request.
+  //   8. The 1 second collection cycle ends. A metric is exported for the
+  //      number of requests received over the interval of time t_0 to
+  //      t_0+2 with a value of 5.
+  //   9. The system experiences a fault and loses state.
+  //   10. The system recovers and resumes receiving at time=t_1.
+  //   11. A request is received, the system measures 1 request.
+  //   12. The 1 second collection cycle ends. A metric is exported for the
+  //      number of requests received over the interval of time t_1 to
+  //      t_0+1 with a value of 1.
+  //
+  // Note: Even though, when reporting changes since last report time, using
+  // CUMULATIVE is valid, it is not recommended. This may cause problems for
+  // systems that do not use start_time to determine when the aggregation
+  // value was reset (e.g. Prometheus).
+  AGGREGATION_TEMPORALITY_CUMULATIVE = 2;
+}
+
+// DataPointFlags is defined as a protobuf 'uint32' type and is to be used as a
+// bit-field representing 32 distinct boolean flags.  Each flag defined in this
+// enum is a bit-mask.  To test the presence of a single flag in the flags of
+// a data point, for example, use an expression like:
+//
+//   (point.flags & DATA_POINT_FLAGS_NO_RECORDED_VALUE_MASK) == DATA_POINT_FLAGS_NO_RECORDED_VALUE_MASK
+//
+enum DataPointFlags {
+  // The zero value for the enum. Should not be used for comparisons.
+  // Instead use bitwise "and" with the appropriate mask as shown above.
+  DATA_POINT_FLAGS_DO_NOT_USE = 0;
+
+  // This DataPoint is valid but has no recorded value.  This value
+  // SHOULD be used to reflect explicitly missing data in a series, as
+  // for an equivalent to the Prometheus "staleness marker".
+  DATA_POINT_FLAGS_NO_RECORDED_VALUE_MASK = 1;
+
+  // Bits 2-31 are reserved for future use.
+}
+
+// NumberDataPoint is a single data point in a timeseries that describes the
+// time-varying scalar value of a metric.
+message NumberDataPoint {
+  reserved 1;
+
+  // The set of key/value pairs that uniquely identify the timeseries from
+  // where this point belongs. The list may be empty (may contain 0 elements).
+  // Attribute keys MUST be unique (it is not allowed to have more than one
+  // attribute with the same key).
+  repeated opentelemetry.proto.common.v1.KeyValue attributes = 7;
+
+  // StartTimeUnixNano is optional but strongly encouraged, see the
+  // the detailed comments above Metric.
+  //
+  // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January
+  // 1970.
+  fixed64 start_time_unix_nano = 2;
+
+  // TimeUnixNano is required, see the detailed comments above Metric.
+  //
+  // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January
+  // 1970.
+  fixed64 time_unix_nano = 3;
+
+  // The value itself.  A point is considered invalid when one of the recognized
+  // value fields is not present inside this oneof.
+  oneof value {
+    double as_double = 4;
+    sfixed64 as_int = 6;
+  }
+
+  // (Optional) List of exemplars collected from
+  // measurements that were used to form the data point
+  repeated Exemplar exemplars = 5;
+
+  // Flags that apply to this specific data point.  See DataPointFlags
+  // for the available flags and their meaning.
+  uint32 flags = 8;
+}
+
+// HistogramDataPoint is a single data point in a timeseries that describes the
+// time-varying values of a Histogram. A Histogram contains summary statistics
+// for a population of values, it may optionally contain the distribution of
+// those values across a set of buckets.
+//
+// If the histogram contains the distribution of values, then both
+// "explicit_bounds" and "bucket counts" fields must be defined.
+// If the histogram does not contain the distribution of values, then both
+// "explicit_bounds" and "bucket_counts" must be omitted and only "count" and
+// "sum" are known.
+message HistogramDataPoint {
+  reserved 1;
+
+  // The set of key/value pairs that uniquely identify the timeseries from
+  // where this point belongs. The list may be empty (may contain 0 elements).
+  // Attribute keys MUST be unique (it is not allowed to have more than one
+  // attribute with the same key).
+  repeated opentelemetry.proto.common.v1.KeyValue attributes = 9;
+
+  // StartTimeUnixNano is optional but strongly encouraged, see the
+  // the detailed comments above Metric.
+  //
+  // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January
+  // 1970.
+  fixed64 start_time_unix_nano = 2;
+
+  // TimeUnixNano is required, see the detailed comments above Metric.
+  //
+  // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January
+  // 1970.
+  fixed64 time_unix_nano = 3;
+
+  // count is the number of values in the population. Must be non-negative. This
+  // value must be equal to the sum of the "count" fields in buckets if a
+  // histogram is provided.
+  fixed64 count = 4;
+
+  // sum of the values in the population. If count is zero then this field
+  // must be zero.
+  //
+  // Note: Sum should only be filled out when measuring non-negative discrete
+  // events, and is assumed to be monotonic over the values of these events.
+  // Negative events *can* be recorded, but sum should not be filled out when
+  // doing so.  This is specifically to enforce compatibility w/ OpenMetrics,
+  // see: https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#histogram
+  optional double sum = 5;
+
+  // bucket_counts is an optional field contains the count values of histogram
+  // for each bucket.
+  //
+  // The sum of the bucket_counts must equal the value in the count field.
+  //
+  // The number of elements in bucket_counts array must be by one greater than
+  // the number of elements in explicit_bounds array.
+  repeated fixed64 bucket_counts = 6;
+
+  // explicit_bounds specifies buckets with explicitly defined bounds for values.
+  //
+  // The boundaries for bucket at index i are:
+  //
+  // (-infinity, explicit_bounds[i]] for i == 0
+  // (explicit_bounds[i-1], explicit_bounds[i]] for 0 < i < size(explicit_bounds)
+  // (explicit_bounds[i-1], +infinity) for i == size(explicit_bounds)
+  //
+  // The values in the explicit_bounds array must be strictly increasing.
+  //
+  // Histogram buckets are inclusive of their upper boundary, except the last
+  // bucket where the boundary is at infinity. This format is intentionally
+  // compatible with the OpenMetrics histogram definition.
+  repeated double explicit_bounds = 7;
+
+  // (Optional) List of exemplars collected from
+  // measurements that were used to form the data point
+  repeated Exemplar exemplars = 8;
+
+  // Flags that apply to this specific data point.  See DataPointFlags
+  // for the available flags and their meaning.
+  uint32 flags = 10;
+
+  // min is the minimum value over (start_time, end_time].
+  optional double min = 11;
+
+  // max is the maximum value over (start_time, end_time].
+  optional double max = 12;
+}
+
+// ExponentialHistogramDataPoint is a single data point in a timeseries that describes the
+// time-varying values of a ExponentialHistogram of double values. A ExponentialHistogram contains
+// summary statistics for a population of values, it may optionally contain the
+// distribution of those values across a set of buckets.
+//
+message ExponentialHistogramDataPoint {
+  // The set of key/value pairs that uniquely identify the timeseries from
+  // where this point belongs. The list may be empty (may contain 0 elements).
+  // Attribute keys MUST be unique (it is not allowed to have more than one
+  // attribute with the same key).
+  repeated opentelemetry.proto.common.v1.KeyValue attributes = 1;
+
+  // StartTimeUnixNano is optional but strongly encouraged, see the
+  // the detailed comments above Metric.
+  //
+  // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January
+  // 1970.
+  fixed64 start_time_unix_nano = 2;
+
+  // TimeUnixNano is required, see the detailed comments above Metric.
+  //
+  // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January
+  // 1970.
+  fixed64 time_unix_nano = 3;
+
+  // count is the number of values in the population. Must be
+  // non-negative. This value must be equal to the sum of the "bucket_counts"
+  // values in the positive and negative Buckets plus the "zero_count" field.
+  fixed64 count = 4;
+
+  // sum of the values in the population. If count is zero then this field
+  // must be zero.
+  //
+  // Note: Sum should only be filled out when measuring non-negative discrete
+  // events, and is assumed to be monotonic over the values of these events.
+  // Negative events *can* be recorded, but sum should not be filled out when
+  // doing so.  This is specifically to enforce compatibility w/ OpenMetrics,
+  // see: https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#histogram
+  optional double sum = 5;
+  
+  // scale describes the resolution of the histogram.  Boundaries are
+  // located at powers of the base, where:
+  //
+  //   base = (2^(2^-scale))
+  //
+  // The histogram bucket identified by `index`, a signed integer,
+  // contains values that are greater than (base^index) and
+  // less than or equal to (base^(index+1)).
+  //
+  // The positive and negative ranges of the histogram are expressed
+  // separately.  Negative values are mapped by their absolute value
+  // into the negative range using the same scale as the positive range.
+  //
+  // scale is not restricted by the protocol, as the permissible
+  // values depend on the range of the data.
+  sint32 scale = 6;
+
+  // zero_count is the count of values that are either exactly zero or
+  // within the region considered zero by the instrumentation at the
+  // tolerated degree of precision.  This bucket stores values that
+  // cannot be expressed using the standard exponential formula as
+  // well as values that have been rounded to zero.
+  //
+  // Implementations MAY consider the zero bucket to have probability
+  // mass equal to (zero_count / count).
+  fixed64 zero_count = 7;
+
+  // positive carries the positive range of exponential bucket counts.
+  Buckets positive = 8;
+
+  // negative carries the negative range of exponential bucket counts.
+  Buckets negative = 9;
+
+  // Buckets are a set of bucket counts, encoded in a contiguous array
+  // of counts.
+  message Buckets {
+    // Offset is the bucket index of the first entry in the bucket_counts array.
+    // 
+    // Note: This uses a varint encoding as a simple form of compression.
+    sint32 offset = 1;
+
+    // bucket_counts is an array of count values, where bucket_counts[i] carries
+    // the count of the bucket at index (offset+i). bucket_counts[i] is the count
+    // of values greater than base^(offset+i) and less than or equal to
+    // base^(offset+i+1).
+    //
+    // Note: By contrast, the explicit HistogramDataPoint uses
+    // fixed64.  This field is expected to have many buckets,
+    // especially zeros, so uint64 has been selected to ensure
+    // varint encoding.
+    repeated uint64 bucket_counts = 2;
+  } 
+
+  // Flags that apply to this specific data point.  See DataPointFlags
+  // for the available flags and their meaning.
+  uint32 flags = 10;
+
+  // (Optional) List of exemplars collected from
+  // measurements that were used to form the data point
+  repeated Exemplar exemplars = 11;
+
+  // min is the minimum value over (start_time, end_time].
+  optional double min = 12;
+
+  // max is the maximum value over (start_time, end_time].
+  optional double max = 13;
+
+  // ZeroThreshold may be optionally set to convey the width of the zero
+  // region. Where the zero region is defined as the closed interval
+  // [-ZeroThreshold, ZeroThreshold].
+  // When ZeroThreshold is 0, zero count bucket stores values that cannot be
+  // expressed using the standard exponential formula as well as values that
+  // have been rounded to zero.
+  double zero_threshold = 14;
+}
+
+// SummaryDataPoint is a single data point in a timeseries that describes the
+// time-varying values of a Summary metric.
+message SummaryDataPoint {
+  reserved 1;
+
+  // The set of key/value pairs that uniquely identify the timeseries from
+  // where this point belongs. The list may be empty (may contain 0 elements).
+  // Attribute keys MUST be unique (it is not allowed to have more than one
+  // attribute with the same key).
+  repeated opentelemetry.proto.common.v1.KeyValue attributes = 7;
+
+  // StartTimeUnixNano is optional but strongly encouraged, see the
+  // the detailed comments above Metric.
+  //
+  // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January
+  // 1970.
+  fixed64 start_time_unix_nano = 2;
+
+  // TimeUnixNano is required, see the detailed comments above Metric.
+  //
+  // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January
+  // 1970.
+  fixed64 time_unix_nano = 3;
+
+  // count is the number of values in the population. Must be non-negative.
+  fixed64 count = 4;
+
+  // sum of the values in the population. If count is zero then this field
+  // must be zero.
+  //
+  // Note: Sum should only be filled out when measuring non-negative discrete
+  // events, and is assumed to be monotonic over the values of these events.
+  // Negative events *can* be recorded, but sum should not be filled out when
+  // doing so.  This is specifically to enforce compatibility w/ OpenMetrics,
+  // see: https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#summary
+  double sum = 5;
+
+  // Represents the value at a given quantile of a distribution.
+  //
+  // To record Min and Max values following conventions are used:
+  // - The 1.0 quantile is equivalent to the maximum value observed.
+  // - The 0.0 quantile is equivalent to the minimum value observed.
+  //
+  // See the following issue for more context:
+  // https://github.com/open-telemetry/opentelemetry-proto/issues/125
+  message ValueAtQuantile {
+    // The quantile of a distribution. Must be in the interval
+    // [0.0, 1.0].
+    double quantile = 1;
+
+    // The value at the given quantile of a distribution.
+    //
+    // Quantile values must NOT be negative.
+    double value = 2;
+  }
+
+  // (Optional) list of values at different quantiles of the distribution calculated
+  // from the current snapshot. The quantiles must be strictly increasing.
+  repeated ValueAtQuantile quantile_values = 6;
+
+  // Flags that apply to this specific data point.  See DataPointFlags
+  // for the available flags and their meaning.
+  uint32 flags = 8;
+}
+
+// A representation of an exemplar, which is a sample input measurement.
+// Exemplars also hold information about the environment when the measurement
+// was recorded, for example the span and trace ID of the active span when the
+// exemplar was recorded.
+message Exemplar {
+  reserved 1;
+
+  // The set of key/value pairs that were filtered out by the aggregator, but
+  // recorded alongside the original measurement. Only key/value pairs that were
+  // filtered out by the aggregator should be included
+  repeated opentelemetry.proto.common.v1.KeyValue filtered_attributes = 7;
+
+  // time_unix_nano is the exact time when this exemplar was recorded
+  //
+  // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January
+  // 1970.
+  fixed64 time_unix_nano = 2;
+
+  // The value of the measurement that was recorded. An exemplar is
+  // considered invalid when one of the recognized value fields is not present
+  // inside this oneof.
+  oneof value {
+    double as_double = 3;
+    sfixed64 as_int = 6;
+  }
+
+  // (Optional) Span ID of the exemplar trace.
+  // span_id may be missing if the measurement is not recorded inside a trace
+  // or if the trace is not sampled.
+  bytes span_id = 4;
+
+  // (Optional) Trace ID of the exemplar trace.
+  // trace_id may be missing if the measurement is not recorded inside a trace
+  // or if the trace is not sampled.
+  bytes trace_id = 5;
+}
diff --git a/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/resource/v1/resource.proto b/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/resource/v1/resource.proto
new file mode 100644
index 00000000000..6637560bc35
--- /dev/null
+++ b/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/resource/v1/resource.proto
@@ -0,0 +1,37 @@
+// Copyright 2019, OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+package opentelemetry.proto.resource.v1;
+
+import "opentelemetry/proto/common/v1/common.proto";
+
+option csharp_namespace = "OpenTelemetry.Proto.Resource.V1";
+option java_multiple_files = true;
+option java_package = "io.opentelemetry.proto.resource.v1";
+option java_outer_classname = "ResourceProto";
+option go_package = "go.opentelemetry.io/proto/otlp/resource/v1";
+
+// Resource information.
+message Resource {
+  // Set of attributes that describe the resource.
+  // Attribute keys MUST be unique (it is not allowed to have more than one
+  // attribute with the same key).
+  repeated opentelemetry.proto.common.v1.KeyValue attributes = 1;
+
+  // dropped_attributes_count is the number of dropped attributes. If the value is 0, then
+  // no attributes were dropped.
+  uint32 dropped_attributes_count = 2;
+}
diff --git a/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/trace/v1/trace.proto b/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/trace/v1/trace.proto
new file mode 100644
index 00000000000..5cb2f3ce1cd
--- /dev/null
+++ b/src/KurrentDB.OtlpExporterPlugin.Tests/opentelemetry/proto/trace/v1/trace.proto
@@ -0,0 +1,355 @@
+// Copyright 2019, OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+package opentelemetry.proto.trace.v1;
+
+import "opentelemetry/proto/common/v1/common.proto";
+import "opentelemetry/proto/resource/v1/resource.proto";
+
+option csharp_namespace = "OpenTelemetry.Proto.Trace.V1";
+option java_multiple_files = true;
+option java_package = "io.opentelemetry.proto.trace.v1";
+option java_outer_classname = "TraceProto";
+option go_package = "go.opentelemetry.io/proto/otlp/trace/v1";
+
+// TracesData represents the traces data that can be stored in a persistent storage,
+// OR can be embedded by other protocols that transfer OTLP traces data but do
+// not implement the OTLP protocol.
+//
+// The main difference between this message and collector protocol is that
+// in this message there will not be any "control" or "metadata" specific to
+// OTLP protocol.
+//
+// When new fields are added into this message, the OTLP request MUST be updated
+// as well.
+message TracesData {
+  // An array of ResourceSpans.
+  // For data coming from a single resource this array will typically contain
+  // one element. Intermediary nodes that receive data from multiple origins
+  // typically batch the data before forwarding further and in that case this
+  // array will contain multiple elements.
+  repeated ResourceSpans resource_spans = 1;
+}
+
+// A collection of ScopeSpans from a Resource.
+message ResourceSpans {
+  reserved 1000;
+
+  // The resource for the spans in this message.
+  // If this field is not set then no resource info is known.
+  opentelemetry.proto.resource.v1.Resource resource = 1;
+
+  // A list of ScopeSpans that originate from a resource.
+  repeated ScopeSpans scope_spans = 2;
+
+  // The Schema URL, if known. This is the identifier of the Schema that the resource data
+  // is recorded in. To learn more about Schema URL see
+  // https://opentelemetry.io/docs/specs/otel/schemas/#schema-url
+  // This schema_url applies to the data in the "resource" field. It does not apply
+  // to the data in the "scope_spans" field which have their own schema_url field.
+  string schema_url = 3;
+}
+
+// A collection of Spans produced by an InstrumentationScope.
+message ScopeSpans {
+  // The instrumentation scope information for the spans in this message.
+  // Semantically when InstrumentationScope isn't set, it is equivalent with
+  // an empty instrumentation scope name (unknown).
+  opentelemetry.proto.common.v1.InstrumentationScope scope = 1;
+
+  // A list of Spans that originate from an instrumentation scope.
+  repeated Span spans = 2;
+
+  // The Schema URL, if known. This is the identifier of the Schema that the span data
+  // is recorded in. To learn more about Schema URL see
+  // https://opentelemetry.io/docs/specs/otel/schemas/#schema-url
+  // This schema_url applies to all spans and span events in the "spans" field.
+  string schema_url = 3;
+}
+
+// A Span represents a single operation performed by a single component of the system.
+//
+// The next available field id is 17.
+message Span {
+  // A unique identifier for a trace. All spans from the same trace share
+  // the same `trace_id`. The ID is a 16-byte array. An ID with all zeroes OR
+  // of length other than 16 bytes is considered invalid (empty string in OTLP/JSON
+  // is zero-length and thus is also invalid).
+  //
+  // This field is required.
+  bytes trace_id = 1;
+
+  // A unique identifier for a span within a trace, assigned when the span
+  // is created. The ID is an 8-byte array. An ID with all zeroes OR of length
+  // other than 8 bytes is considered invalid (empty string in OTLP/JSON
+  // is zero-length and thus is also invalid).
+  //
+  // This field is required.
+  bytes span_id = 2;
+
+  // trace_state conveys information about request position in multiple distributed tracing graphs.
+  // It is a trace_state in w3c-trace-context format: https://www.w3.org/TR/trace-context/#tracestate-header
+  // See also https://github.com/w3c/distributed-tracing for more details about this field.
+  string trace_state = 3;
+
+  // The `span_id` of this span's parent span. If this is a root span, then this
+  // field must be empty. The ID is an 8-byte array.
+  bytes parent_span_id = 4;
+
+  // Flags, a bit field.
+  //
+  // Bits 0-7 (8 least significant bits) are the trace flags as defined in W3C Trace
+  // Context specification. To read the 8-bit W3C trace flag, use
+  // `flags & SPAN_FLAGS_TRACE_FLAGS_MASK`.
+  //
+  // See https://www.w3.org/TR/trace-context-2/#trace-flags for the flag definitions.
+  //
+  // Bits 8 and 9 represent the 3 states of whether a span's parent
+  // is remote. The states are (unknown, is not remote, is remote).
+  // To read whether the value is known, use `(flags & SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK) != 0`.
+  // To read whether the span is remote, use `(flags & SPAN_FLAGS_CONTEXT_IS_REMOTE_MASK) != 0`.
+  //
+  // When creating span messages, if the message is logically forwarded from another source
+  // with an equivalent flags fields (i.e., usually another OTLP span message), the field SHOULD
+  // be copied as-is. If creating from a source that does not have an equivalent flags field
+  // (such as a runtime representation of an OpenTelemetry span), the high 22 bits MUST
+  // be set to zero.
+  // Readers MUST NOT assume that bits 10-31 (22 most significant bits) will be zero.
+  //
+  // [Optional].
+  fixed32 flags = 16;
+
+  // A description of the span's operation.
+  //
+  // For example, the name can be a qualified method name or a file name
+  // and a line number where the operation is called. A best practice is to use
+  // the same display name at the same call point in an application.
+  // This makes it easier to correlate spans in different traces.
+  //
+  // This field is semantically required to be set to non-empty string.
+  // Empty value is equivalent to an unknown span name.
+  //
+  // This field is required.
+  string name = 5;
+
+  // SpanKind is the type of span. Can be used to specify additional relationships between spans
+  // in addition to a parent/child relationship.
+  enum SpanKind {
+    // Unspecified. Do NOT use as default.
+    // Implementations MAY assume SpanKind to be INTERNAL when receiving UNSPECIFIED.
+    SPAN_KIND_UNSPECIFIED = 0;
+
+    // Indicates that the span represents an internal operation within an application,
+    // as opposed to an operation happening at the boundaries. Default value.
+    SPAN_KIND_INTERNAL = 1;
+
+    // Indicates that the span covers server-side handling of an RPC or other
+    // remote network request.
+    SPAN_KIND_SERVER = 2;
+
+    // Indicates that the span describes a request to some remote service.
+    SPAN_KIND_CLIENT = 3;
+
+    // Indicates that the span describes a producer sending a message to a broker.
+    // Unlike CLIENT and SERVER, there is often no direct critical path latency relationship
+    // between producer and consumer spans. A PRODUCER span ends when the message was accepted
+    // by the broker while the logical processing of the message might span a much longer time.
+    SPAN_KIND_PRODUCER = 4;
+
+    // Indicates that the span describes consumer receiving a message from a broker.
+    // Like the PRODUCER kind, there is often no direct critical path latency relationship
+    // between producer and consumer spans.
+    SPAN_KIND_CONSUMER = 5;
+  }
+
+  // Distinguishes between spans generated in a particular context. For example,
+  // two spans with the same name may be distinguished using `CLIENT` (caller)
+  // and `SERVER` (callee) to identify queueing latency associated with the span.
+  SpanKind kind = 6;
+
+  // start_time_unix_nano is the start time of the span. On the client side, this is the time
+  // kept by the local machine where the span execution starts. On the server side, this
+  // is the time when the server's application handler starts running.
+  // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January 1970.
+  //
+  // This field is semantically required and it is expected that end_time >= start_time.
+  fixed64 start_time_unix_nano = 7;
+
+  // end_time_unix_nano is the end time of the span. On the client side, this is the time
+  // kept by the local machine where the span execution ends. On the server side, this
+  // is the time when the server application handler stops running.
+  // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January 1970.
+  //
+  // This field is semantically required and it is expected that end_time >= start_time.
+  fixed64 end_time_unix_nano = 8;
+
+  // attributes is a collection of key/value pairs. Note, global attributes
+  // like server name can be set using the resource API. Examples of attributes:
+  //
+  //     "/http/user_agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36"
+  //     "/http/server_latency": 300
+  //     "example.com/myattribute": true
+  //     "example.com/score": 10.239
+  //
+  // The OpenTelemetry API specification further restricts the allowed value types:
+  // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/common/README.md#attribute
+  // Attribute keys MUST be unique (it is not allowed to have more than one
+  // attribute with the same key).
+  repeated opentelemetry.proto.common.v1.KeyValue attributes = 9;
+
+  // dropped_attributes_count is the number of attributes that were discarded. Attributes
+  // can be discarded because their keys are too long or because there are too many
+  // attributes. If this value is 0, then no attributes were dropped.
+  uint32 dropped_attributes_count = 10;
+
+  // Event is a time-stamped annotation of the span, consisting of user-supplied
+  // text description and key-value pairs.
+  message Event {
+    // time_unix_nano is the time the event occurred.
+    fixed64 time_unix_nano = 1;
+
+    // name of the event.
+    // This field is semantically required to be set to non-empty string.
+    string name = 2;
+
+    // attributes is a collection of attribute key/value pairs on the event.
+    // Attribute keys MUST be unique (it is not allowed to have more than one
+    // attribute with the same key).
+    repeated opentelemetry.proto.common.v1.KeyValue attributes = 3;
+
+    // dropped_attributes_count is the number of dropped attributes. If the value is 0,
+    // then no attributes were dropped.
+    uint32 dropped_attributes_count = 4;
+  }
+
+  // events is a collection of Event items.
+  repeated Event events = 11;
+
+  // dropped_events_count is the number of dropped events. If the value is 0, then no
+  // events were dropped.
+  uint32 dropped_events_count = 12;
+
+  // A pointer from the current span to another span in the same trace or in a
+  // different trace. For example, this can be used in batching operations,
+  // where a single batch handler processes multiple requests from different
+  // traces or when the handler receives a request from a different project.
+  message Link {
+    // A unique identifier of a trace that this linked span is part of. The ID is a
+    // 16-byte array.
+    bytes trace_id = 1;
+
+    // A unique identifier for the linked span. The ID is an 8-byte array.
+    bytes span_id = 2;
+
+    // The trace_state associated with the link.
+    string trace_state = 3;
+
+    // attributes is a collection of attribute key/value pairs on the link.
+    // Attribute keys MUST be unique (it is not allowed to have more than one
+    // attribute with the same key).
+    repeated opentelemetry.proto.common.v1.KeyValue attributes = 4;
+
+    // dropped_attributes_count is the number of dropped attributes. If the value is 0,
+    // then no attributes were dropped.
+    uint32 dropped_attributes_count = 5;
+
+    // Flags, a bit field.
+    //
+    // Bits 0-7 (8 least significant bits) are the trace flags as defined in W3C Trace
+    // Context specification. To read the 8-bit W3C trace flag, use
+    // `flags & SPAN_FLAGS_TRACE_FLAGS_MASK`.
+    //
+    // See https://www.w3.org/TR/trace-context-2/#trace-flags for the flag definitions.
+    //
+    // Bits 8 and 9 represent the 3 states of whether the link is remote.
+    // The states are (unknown, is not remote, is remote).
+    // To read whether the value is known, use `(flags & SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK) != 0`.
+    // To read whether the link is remote, use `(flags & SPAN_FLAGS_CONTEXT_IS_REMOTE_MASK) != 0`.
+    //
+    // Readers MUST NOT assume that bits 10-31 (22 most significant bits) will be zero.
+    // When creating new spans, bits 10-31 (most-significant 22-bits) MUST be zero.
+    //
+    // [Optional].
+    fixed32 flags = 6;
+  }
+
+  // links is a collection of Links, which are references from this span to a span
+  // in the same or different trace.
+  repeated Link links = 13;
+
+  // dropped_links_count is the number of dropped links after the maximum size was
+  // enforced. If this value is 0, then no links were dropped.
+  uint32 dropped_links_count = 14;
+
+  // An optional final status for this span. Semantically when Status isn't set, it means
+  // span's status code is unset, i.e. assume STATUS_CODE_UNSET (code = 0).
+  Status status = 15;
+}
+
+// The Status type defines a logical error model that is suitable for different
+// programming environments, including REST APIs and RPC APIs.
+message Status {
+  reserved 1;
+
+  // A developer-facing human readable error message.
+  string message = 2;
+
+  // For the semantics of status codes see
+  // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/api.md#set-status
+  enum StatusCode {
+    // The default status.
+    STATUS_CODE_UNSET               = 0;
+    // The Span has been validated by an Application developer or Operator to 
+    // have completed successfully.
+    STATUS_CODE_OK                  = 1;
+    // The Span contains an error.
+    STATUS_CODE_ERROR               = 2;
+  };
+
+  // The status code.
+  StatusCode code = 3;
+}
+
+// SpanFlags represents constants used to interpret the
+// Span.flags field, which is protobuf 'fixed32' type and is to
+// be used as bit-fields. Each non-zero value defined in this enum is
+// a bit-mask.  To extract the bit-field, for example, use an
+// expression like:
+//
+//   (span.flags & SPAN_FLAGS_TRACE_FLAGS_MASK)
+//
+// See https://www.w3.org/TR/trace-context-2/#trace-flags for the flag definitions.
+//
+// Note that Span flags were introduced in version 1.1 of the
+// OpenTelemetry protocol.  Older Span producers do not set this
+// field, consequently consumers should not rely on the absence of a
+// particular flag bit to indicate the presence of a particular feature.
+enum SpanFlags {
+  // The zero value for the enum. Should not be used for comparisons.
+  // Instead use bitwise "and" with the appropriate mask as shown above.
+  SPAN_FLAGS_DO_NOT_USE = 0;
+
+  // Bits 0-7 are used for trace flags.
+  SPAN_FLAGS_TRACE_FLAGS_MASK = 0x000000FF;
+
+  // Bits 8 and 9 are used to indicate that the parent span or link span is remote.
+  // Bit 8 (`HAS_IS_REMOTE`) indicates whether the value is known.
+  // Bit 9 (`IS_REMOTE`) indicates whether the span or link is remote.
+  SPAN_FLAGS_CONTEXT_HAS_IS_REMOTE_MASK = 0x00000100;
+  SPAN_FLAGS_CONTEXT_IS_REMOTE_MASK = 0x00000200;
+
+  // Bits 10-31 are reserved for future use.
+}
diff --git a/src/KurrentDB.OtlpExporterPlugin/KurrentDB.OtlpExporterPlugin.csproj b/src/KurrentDB.OtlpExporterPlugin/KurrentDB.OtlpExporterPlugin.csproj
new file mode 100644
index 00000000000..8b941ef78c0
--- /dev/null
+++ b/src/KurrentDB.OtlpExporterPlugin/KurrentDB.OtlpExporterPlugin.csproj
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="EventStore.Plugins" Version="25.2.5" />
+		<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
+		<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
+		<PackageReference Include="Serilog" Version="4.0.1" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Update="otlp-exporter-example.yaml">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Update="otlp-exporter-example.json">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.OtlpExporterPlugin/OtlpExporterPlugin.cs b/src/KurrentDB.OtlpExporterPlugin/OtlpExporterPlugin.cs
new file mode 100644
index 00000000000..19afcdf8452
--- /dev/null
+++ b/src/KurrentDB.OtlpExporterPlugin/OtlpExporterPlugin.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using OpenTelemetry.Exporter;
+using OpenTelemetry.Metrics;
+using Serilog;
+
+namespace KurrentDB.OtlpExporterPlugin;
+
+public class OtlpExporterPlugin : SubsystemsPlugin {
+	public const string KurrentConfigurationPrefix = "KurrentDB";
+	private static readonly ILogger _staticLogger = Log.ForContext<OtlpExporterPlugin>();
+	private readonly ILogger _logger;
+
+	public OtlpExporterPlugin() : this(_staticLogger) {
+	}
+
+	public OtlpExporterPlugin(ILogger logger)
+		: base(
+			requiredEntitlements: ["OTLP_EXPORTER"]) {
+
+		_logger = logger;
+	}
+
+	public override (bool Enabled, string EnableInstructions) IsEnabled(IConfiguration configuration) {
+		var enabled = configuration.GetSection($"{KurrentConfigurationPrefix}:OpenTelemetry:Otlp").Exists();
+		return (enabled, $"No {KurrentConfigurationPrefix}:OpenTelemetry:Otlp configuration found. Not exporting metrics.");
+	}
+
+	public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) {
+		// there are two related settings
+		//
+		// "KurrentDB:Metrics:ExpectedScrapeIntervalSeconds"
+		//    this is how often (seconds) the metrics themselves expect to be scraped (they will hold on to
+		//    periodic maximum values long enough to ensure they are captured
+		//
+		// "KurrentDB:OpenTelemetry:Metrics:PeriodicExportingMetricReaderOptions:ExportIntervalMilliseconds"
+		//    this is how often (milliseconds) the metrics are exported from periodic exporters like this one
+		//
+		// we want to respect the OpenTelemetry setting, but the behaviour will make most sense if the two
+		// settings are in agreement with each other. therefore:
+		//    if ExportInterval is not set, derive it from ExpectedScrapeInterval
+		//    if ExportInterval is set, use it, but warn if it is out of sync with ExpectedScrapeInterval
+		//
+		// later it may be possible to use ExportInterval to drive ExpectedScrapeInterval in the main server,
+		// this would be a breaking change and we'd probably do it at the same time as the breaking change of
+		// removing the special handling of metricsconfig.json where ExpectedScrapeInterval is defined.
+
+		var scrapeIntervalSeconds = configuration.GetValue<int>($"{KurrentConfigurationPrefix}:Metrics:ExpectedScrapeIntervalSeconds");
+
+		services
+			.Configure<OtlpExporterOptions>(configuration.GetSection($"{KurrentConfigurationPrefix}:OpenTelemetry:Otlp"))
+			.Configure<MetricReaderOptions>(configuration.GetSection($"{KurrentConfigurationPrefix}:OpenTelemetry:Metrics"))
+			.AddOpenTelemetry()
+			.WithMetrics(o => o
+				.AddOtlpExporter((exporterOptions, metricReaderOptions) => {
+					var periodicOptions = metricReaderOptions.PeriodicExportingMetricReaderOptions;
+					if (periodicOptions.ExportIntervalMilliseconds is null) {
+						periodicOptions.ExportIntervalMilliseconds = scrapeIntervalSeconds * 1000;
+					} else if (periodicOptions.ExportIntervalMilliseconds != scrapeIntervalSeconds * 1000) {
+						_logger.Warning(
+							$"OtlpExporter: {KurrentConfigurationPrefix}:OpenTelemetry:Metrics:PeriodicExportingMetricReaderOptions:ExportIntervalMilliseconds " +
+							$"({{exportInterval}} ms) does not match {KurrentConfigurationPrefix}:Metrics:ExpectedScrapeIntervalSeconds " +
+							"({scrapeInterval} s). Periodic maximum metrics may not be reported correctly.",
+							periodicOptions.ExportIntervalMilliseconds, scrapeIntervalSeconds);
+					}
+
+					_logger.Information("OtlpExporter: Exporting metrics to {endpoint} every {interval:N1} seconds",
+						exporterOptions.Endpoint,
+						periodicOptions.ExportIntervalMilliseconds / 1000.0);
+				}));
+	}
+}
diff --git a/src/KurrentDB.OtlpExporterPlugin/otlp-exporter-example.json b/src/KurrentDB.OtlpExporterPlugin/otlp-exporter-example.json
new file mode 100644
index 00000000000..1507b2b1b1b
--- /dev/null
+++ b/src/KurrentDB.OtlpExporterPlugin/otlp-exporter-example.json
@@ -0,0 +1,9 @@
+{
+  "KurrentDB": {
+    "OpenTelemetry": {
+      "Otlp": {
+        "Endpoint": "http://localhost:4317"
+      }
+    }
+  }
+}
diff --git a/src/KurrentDB.OtlpExporterPlugin/otlp-exporter-example.yaml b/src/KurrentDB.OtlpExporterPlugin/otlp-exporter-example.yaml
new file mode 100644
index 00000000000..60c8f9da978
--- /dev/null
+++ b/src/KurrentDB.OtlpExporterPlugin/otlp-exporter-example.yaml
@@ -0,0 +1,3 @@
+OpenTelemetry:
+  Otlp:
+    Endpoint: http://localhost:4317
diff --git a/src/KurrentDB.POC.ConnectedSubsystemsPlugin/ConnectedSubsystemsPlugin.cs b/src/KurrentDB.POC.ConnectedSubsystemsPlugin/ConnectedSubsystemsPlugin.cs
new file mode 100644
index 00000000000..081789fe7ea
--- /dev/null
+++ b/src/KurrentDB.POC.ConnectedSubsystemsPlugin/ConnectedSubsystemsPlugin.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.IO;
+using EventStore.Plugins;
+using EventStore.Plugins.Subsystems;
+using KurrentDB.Common.Utils;
+using KurrentDB.PluginHosting;
+using KurrentDB.POC.IO.Core;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Serilog;
+
+namespace KurrentDB.POC.ConnectedSubsystemsPlugin;
+
+public class ConnectedSubsystemsPlugin : SubsystemsPlugin {
+	private static readonly ILogger Log = Serilog.Log.ForContext<ConnectedSubsystemsPlugin>();
+
+	public ConnectedSubsystemsPlugin() : base(version: "0.0.5", name: "ConnectedSubsystems") {
+	}
+
+	public override IReadOnlyList<ISubsystem> GetSubsystems() {
+		var conntectedSubsystemsDir = new DirectoryInfo(Locations.PluginsDirectory);
+		var pluginLoader = new PluginLoader(conntectedSubsystemsDir, typeof(IClient).Assembly);
+
+		var plugins = pluginLoader.Load<IConnectedSubsystemsPlugin>();
+		var subsystems = new List<ISubsystem> { this };
+		foreach (var plugin in plugins) {
+			Log.Information("Loaded ConnectedSubsystemsPlugin plugin: {plugin} {version}.",
+				plugin.CommandLineName,
+				plugin.Version);
+			subsystems.AddRange(plugin.GetSubsystems());
+		}
+
+		return subsystems;
+	}
+
+	public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) {
+		services.AddSingleton<IClient, InternalClient>();
+		services.AddSingleton<IOperationsClient, InternalOperationsClient>();
+	}
+}
diff --git a/src/KurrentDB.POC.ConnectedSubsystemsPlugin/InternalClient.cs b/src/KurrentDB.POC.ConnectedSubsystemsPlugin/InternalClient.cs
new file mode 100644
index 00000000000..5cbaf6013bf
--- /dev/null
+++ b/src/KurrentDB.POC.ConnectedSubsystemsPlugin/InternalClient.cs
@@ -0,0 +1,397 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.Transport.Common;
+using KurrentDB.Core.Services.Transport.Enumerators;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.POC.IO.Core;
+using Serilog;
+using CommonPosition = KurrentDB.Core.Services.Transport.Common.Position;
+using Event = KurrentDB.POC.IO.Core.Event;
+using Position = KurrentDB.POC.IO.Core.Position;
+
+namespace KurrentDB.POC.ConnectedSubsystemsPlugin;
+
+// this provides a client interface
+public class InternalClient : IClient {
+	private static readonly ILogger Log = Serilog.Log.ForContext<InternalClient>();
+
+	private const int MaxLiveEventBufferCount = 32;
+
+	private readonly IPublisher _publisher;
+	private readonly bool _requiresLeader;
+
+	private static readonly BoundedChannelOptions _boundedChannelOptions =
+		new(MaxLiveEventBufferCount) {
+			FullMode = BoundedChannelFullMode.Wait,
+			SingleReader = true,
+			SingleWriter = true
+		};
+
+	public InternalClient(IPublisher publisher, bool requiresLeader = false) {
+		_publisher = publisher;
+		_requiresLeader = requiresLeader;
+	}
+
+	public async Task WriteMetaDataMaxCountAsync(string stream, CancellationToken cancellationToken) {
+		var metadata = new StreamMetadata(maxCount: 3);
+		var data = metadata.ToJsonBytes();
+		var eventToWrite = new EventToWrite(Guid.NewGuid(), SystemEventTypes.StreamMetadata, "application/json", data,
+			null);
+
+		await WriteAsync(SystemStreams.MetastreamOf(stream), new[] { eventToWrite }, -2, cancellationToken);
+	}
+
+	public async Task<long> WriteAsync(string stream, EventToWrite[] events, long expectedVersion, CancellationToken cancellationToken) {
+
+		var appendResponseSource = new TaskCompletionSource<long>(TaskCreationOptions.RunContinuationsAsynchronously);
+		var envelope = new CallbackEnvelope(HandleWriteEventsCompleted);
+
+		//qq consider all the args
+		var correlationId = Guid.NewGuid(); //qq
+		_publisher.Publish(new ClientMessage.WriteEvents(
+			correlationId,
+			correlationId,
+			envelope,
+			requireLeader: _requiresLeader,
+			stream,
+			expectedVersion,
+			events.Select(evt =>
+				new Core.Data.Event(
+					evt.EventId, evt.EventType, isJson: evt.ContentType == "application/json",
+					evt.Data.ToArray(),
+					evt.Metadata.ToArray())).ToArray(),
+			SystemAccounts.System,
+			cancellationToken: cancellationToken));
+
+		return await appendResponseSource.Task.ConfigureAwait(false);
+
+		void HandleWriteEventsCompleted(Message message) {
+			if (message is ClientMessage.NotHandled notHandled) {
+				Exception ex = notHandled.Reason switch {
+					ClientMessage.NotHandled.Types.NotHandledReason.NotReady => new ResponseException.ServerNotReady(),
+					ClientMessage.NotHandled.Types.NotHandledReason.TooBusy => new ResponseException.ServerBusy(),
+					ClientMessage.NotHandled.Types.NotHandledReason.NotLeader or
+					ClientMessage.NotHandled.Types.NotHandledReason.IsReadOnly => new ResponseException.NotLeader(),
+					_ => new ResponseException.UnexpectedError($"NotHandled {notHandled.Reason}"),
+				};
+				appendResponseSource.TrySetException(ex);
+				return;
+			}
+
+			if (message is not ClientMessage.WriteEventsCompleted completed) {
+				appendResponseSource.TrySetException(new ResponseException.UnexpectedError($"Unexpected message {message}"));
+				return;
+			}
+
+			//qqqqqqqq
+			switch (completed.Result) {
+				case OperationResult.Success:
+					appendResponseSource.TrySetResult(completed.LastEventNumber);
+					return;
+				case OperationResult.PrepareTimeout:
+				case OperationResult.CommitTimeout:
+				case OperationResult.ForwardTimeout:
+					appendResponseSource.TrySetException(new ResponseException.Timeout(completed.Message));
+					return;
+				case OperationResult.WrongExpectedVersion:
+					//qq irl this is much more complicated see Streams.Append.cs
+					appendResponseSource.TrySetException(new ResponseException.WrongExpectedVersion(completed.Message));
+					return;
+				case OperationResult.StreamDeleted:
+					appendResponseSource.TrySetException(new ResponseException.StreamDeleted(completed.Message));
+					return;
+				case OperationResult.InvalidTransaction:
+					appendResponseSource.TrySetException(new ResponseException.UnexpectedError(completed.Message));
+					return;
+				case OperationResult.AccessDenied:
+					appendResponseSource.TrySetException(new ResponseException.AccessDenied(completed.Message));
+					return;
+				default:
+					appendResponseSource.TrySetException(new ResponseException.UnexpectedError(completed.Message));
+					return;
+			}
+		}
+	}
+
+	private static CommonPosition Convert(FromAll start) {
+		if (start == FromAll.Start)
+			return CommonPosition.Start;
+		else if (start == FromAll.End)
+			return CommonPosition.End;
+		else
+			return Convert(start.Position!.Value);
+	}
+
+	private static CommonPosition Convert(Position position) =>
+		new(position.CommitPosition, position.PreparePosition);
+
+	public IAsyncEnumerable<Event> SubscribeToAll(FromAll start, CancellationToken token) =>
+		//qq consider all these options
+		Create(
+			"SUBSCRIPTION TO $all",
+			() => new Enumerator.AllSubscription(
+				bus: _publisher,
+				expiryStrategy: new DefaultExpiryStrategy(),
+				checkpoint: Convert(start),
+				resolveLinks: false,
+				user: SystemAccounts.System,
+				requiresLeader: _requiresLeader,
+				cancellationToken: token));
+
+	public IAsyncEnumerable<Event> SubscribeToStream(string stream, CancellationToken token) =>
+		Create(
+			$"SUBSCRIPTION TO {stream}",
+			() => new Enumerator.StreamSubscription<string>(
+				streamName: stream,
+				bus: _publisher,
+				expiryStrategy: new DefaultExpiryStrategy(),
+				checkpoint: null,
+				resolveLinks: false,
+				user: SystemAccounts.System,
+				requiresLeader: _requiresLeader,
+				cancellationToken: token));
+
+	public IAsyncEnumerable<Event> ReadStreamBackwards(string stream, long maxCount, CancellationToken token) =>
+		Create(
+			$"Reading stream {stream} backwards for max {maxCount} events",
+			() => new Enumerator.ReadStreamBackwards(
+				bus: _publisher,
+				streamName: stream,
+				startRevision: StreamRevision.End,
+				maxCount: (ulong)maxCount,
+				resolveLinks: false,
+				user: SystemAccounts.System,
+				requiresLeader: _requiresLeader,
+				deadline: DateTime.UtcNow.AddSeconds(10),
+				cancellationToken: token,
+				compatibility: 1));
+
+	public IAsyncEnumerable<Event> ReadAllBackwardsAsync(Position position, long maxCount, CancellationToken token) =>
+		Create($"Reading from $all Backwards", () =>
+			new Enumerator.ReadAllBackwards(
+				bus: _publisher,
+				position: Convert(position),
+				maxCount: (ulong)maxCount,
+				resolveLinks: false,
+				user: SystemAccounts.System,
+				requiresLeader: _requiresLeader,
+				deadline: DateTime.UtcNow.AddSeconds(10),
+				cancellationToken: token
+			));
+
+	public IAsyncEnumerable<Event> ReadStreamForwards(string stream, long maxCount, CancellationToken token) =>
+		Create(
+			$"Reading stream {stream} forwards for max {maxCount} events",
+			() => new Enumerator.ReadStreamForwards(
+				bus: _publisher,
+				streamName: stream,
+				startRevision: StreamRevision.Start,
+				maxCount: (ulong)maxCount,
+				resolveLinks: false,
+				user: SystemAccounts.System,
+				requiresLeader: _requiresLeader,
+				deadline: DateTime.UtcNow.AddSeconds(10),
+				cancellationToken: token,
+				compatibility: 1));
+
+	public async Task DeleteStreamAsync(string stream, long expectedVersion, CancellationToken cancellationToken) {
+		var appendResponseSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+		var envelope = new CallbackEnvelope(HandleDeleteStreamCompleted);
+
+		var correlationId = Guid.NewGuid();
+		_publisher.Publish(new ClientMessage.DeleteStream(
+			correlationId,
+			correlationId,
+			envelope,
+			requireLeader: _requiresLeader,
+			stream,
+			expectedVersion,
+			hardDelete: false,
+			SystemAccounts.System,
+			cancellationToken: cancellationToken));
+
+		await appendResponseSource.Task.ConfigureAwait(false);
+
+		void HandleDeleteStreamCompleted(Message message) {
+			if (message is ClientMessage.NotHandled notHandled) {
+				Exception ex = notHandled.Reason switch {
+					ClientMessage.NotHandled.Types.NotHandledReason.NotReady => new ResponseException.ServerNotReady(),
+					ClientMessage.NotHandled.Types.NotHandledReason.TooBusy => new ResponseException.ServerBusy(),
+					ClientMessage.NotHandled.Types.NotHandledReason.NotLeader or
+					ClientMessage.NotHandled.Types.NotHandledReason.IsReadOnly => new ResponseException.NotLeader(),
+					_ => new ResponseException.UnexpectedError($"NotHandled {notHandled.Reason}"),
+				};
+				appendResponseSource.TrySetException(ex);
+				return;
+			}
+
+			if (message is not ClientMessage.DeleteStreamCompleted completed) {
+				appendResponseSource.TrySetException(new ResponseException.UnexpectedError($"Unexpected message {message}"));
+				return;
+			}
+
+			switch (completed.Result) {
+				case OperationResult.Success:
+					appendResponseSource.TrySetResult();
+					return;
+				case OperationResult.PrepareTimeout:
+				case OperationResult.CommitTimeout:
+				case OperationResult.ForwardTimeout:
+					appendResponseSource.TrySetException(new ResponseException.Timeout(completed.Message));
+					return;
+				case OperationResult.WrongExpectedVersion:
+					appendResponseSource.TrySetException(new ResponseException.WrongExpectedVersion(completed.Message));
+					return;
+				case OperationResult.StreamDeleted:
+					appendResponseSource.TrySetException(new ResponseException.StreamDeleted(completed.Message));
+					return;
+				case OperationResult.InvalidTransaction:
+					appendResponseSource.TrySetException(new ResponseException.UnexpectedError(completed.Message));
+					return;
+				case OperationResult.AccessDenied:
+					appendResponseSource.TrySetException(new ResponseException.AccessDenied(completed.Message));
+					return;
+				default:
+					appendResponseSource.TrySetException(new ResponseException.UnexpectedError(completed.Message));
+					return;
+			}
+		}
+	}
+
+	private static Event ConvertEvent(ref ResolvedEvent evt) {
+		var e = evt.OriginalEvent;
+		return new Event(
+			eventId: e.EventId,
+			created: e.TimeStamp,
+			stream: e.EventStreamId,
+			eventNumber: (ulong)e.EventNumber,
+			eventType: e.EventType,
+			contentType: e.IsJson ? "application/json" : "application/octet-stream",
+			commitPosition: (ulong)evt.OriginalPosition!.Value.CommitPosition,
+			preparePosition: (ulong)evt.OriginalPosition!.Value.PreparePosition,
+			isRedacted: e.Flags.HasAllOf(PrepareFlags.IsRedacted),
+			data: e.Data,
+			metadata: e.Metadata);
+	}
+
+	private static IAsyncEnumerable<Event> Create(
+		string message,
+		Func<IAsyncEnumerator<ReadResponse>> enumeratorFactory) {
+
+		return new LoggingEnumerable<ReadResponse>(enumeratorFactory, message)
+			.MapExceptions()
+			.Select(x => {
+				if (x is ReadResponse.StreamNotFound y)
+					throw new ResponseException.StreamNotFound(y.StreamName);
+				return x;
+			})
+			.OfType<ReadResponse.EventReceived>()
+			.Select(x => ConvertEvent(ref x.Event));
+	}
+
+	class LoggingEnumerable<T> : IAsyncEnumerable<T> {
+		private readonly Func<IAsyncEnumerator<T>> _enumeratorFactory;
+		private readonly string _message;
+
+		public LoggingEnumerable(Func<IAsyncEnumerator<T>> enumeratorFactory, string message) {
+			_enumeratorFactory = enumeratorFactory;
+			_message = message;
+		}
+
+		public IAsyncEnumerator<T> GetAsyncEnumerator(CancellationToken cancellationToken = default) {
+			return new LoggingEnumerator<T>(_enumeratorFactory(), _message);
+		}
+	}
+
+	sealed class LoggingEnumerator<T> : IAsyncEnumerator<T> {
+		private readonly string _message;
+		private readonly IAsyncEnumerator<T> _wrapped;
+
+		public LoggingEnumerator(IAsyncEnumerator<T> wrapped, string message) {
+			_wrapped = wrapped;
+			_message = message;
+			Log.Information("Internal Client: Started {message}", _message);
+		}
+
+		public T Current => _wrapped.Current;
+
+		public ValueTask DisposeAsync() {
+			Log.Information("Internal Client: Ended {message}", _message);
+			return _wrapped.DisposeAsync();
+		}
+
+		public ValueTask<bool> MoveNextAsync() {
+			return _wrapped.MoveNextAsync();
+		}
+	}
+}
+
+public static class IAsyncEnumerableExtenions {
+	public static bool TryMap(this Exception ex, out Exception mapped) {
+		mapped = ex.Map();
+		return mapped != ex;
+	}
+
+	private static Exception Map(this Exception ex) => ex switch {
+		ReadResponseException.AccessDenied =>
+			new ResponseException.AccessDenied(ex),
+
+		ReadResponseException.NotHandled.ServerNotReady =>
+			new ResponseException.ServerNotReady(ex),
+
+		ReadResponseException.NotHandled.ServerBusy =>
+			new ResponseException.ServerBusy(ex),
+
+		ReadResponseException.NotHandled.LeaderInfo or
+		ReadResponseException.NotHandled.NoLeaderInfo =>
+			new ResponseException.NotLeader(ex),
+
+		ReadResponseException.StreamDeleted =>
+			new ResponseException.StreamDeleted(ex),
+
+		ReadResponseException.Timeout =>
+			new ResponseException.Timeout(ex),
+
+		OperationCanceledException =>
+			ex,
+
+		ReadResponseException.InvalidPosition or
+		ReadResponseException.UnknownError or
+		ReadResponseException.UnknownMessage or
+		_ =>
+			new ResponseException.UnexpectedError(ex),
+	};
+
+	public static async IAsyncEnumerable<T> MapExceptions<T>(
+		this IAsyncEnumerable<T> self) {
+
+		await Task.Yield();
+
+		await using var enumerator = self.GetAsyncEnumerator();
+		while (true) {
+			try {
+				if (!await enumerator.MoveNextAsync())
+					break;
+
+			} catch (Exception ex) when (ex.TryMap(out var mapped)) {
+				throw mapped;
+			}
+
+			yield return enumerator.Current;
+		}
+	}
+}
diff --git a/src/KurrentDB.POC.ConnectedSubsystemsPlugin/InternalOperationsClient.cs b/src/KurrentDB.POC.ConnectedSubsystemsPlugin/InternalOperationsClient.cs
new file mode 100644
index 00000000000..3bafbebc814
--- /dev/null
+++ b/src/KurrentDB.POC.ConnectedSubsystemsPlugin/InternalOperationsClient.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.POC.IO.Core;
+
+namespace KurrentDB.POC.ConnectedSubsystemsPlugin;
+
+public class InternalOperationsClient : IOperationsClient {
+	readonly IPublisher _publisher;
+
+	public InternalOperationsClient(IPublisher publisher) {
+		_publisher = publisher;
+	}
+
+	public void Resign() {
+		_publisher.Publish(new ClientMessage.ResignNode());
+	}
+}
diff --git a/src/KurrentDB.POC.ConnectedSubsystemsPlugin/KurrentDB.POC.ConnectedSubsystemsPlugin.csproj b/src/KurrentDB.POC.ConnectedSubsystemsPlugin/KurrentDB.POC.ConnectedSubsystemsPlugin.csproj
new file mode 100644
index 00000000000..f8636dba7bf
--- /dev/null
+++ b/src/KurrentDB.POC.ConnectedSubsystemsPlugin/KurrentDB.POC.ConnectedSubsystemsPlugin.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.Core\KurrentDB.Core.csproj" />
+		<ProjectReference Include="..\KurrentDB.PluginHosting\KurrentDB.PluginHosting.csproj" />
+		<ProjectReference Include="..\KurrentDB.POC.IO.Core\KurrentDB.POC.IO.Core.csproj" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.POC.IO.Core/Event.cs b/src/KurrentDB.POC.IO.Core/Event.cs
new file mode 100644
index 00000000000..8ed81de274c
--- /dev/null
+++ b/src/KurrentDB.POC.IO.Core/Event.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.POC.IO.Core;
+
+//qq move, rename? and does this want to be events or records
+//qq we probably want to reuse these, and we may want part of the pipline to transform them
+// but they should be immutable so that parallel parts of the pipeline don't trip each other up.
+public class Event {
+	public Guid EventId { get; init; }
+	public DateTime Created { get; init; }
+	public string Stream { get; init; }
+	public ulong EventNumber { get; init; }
+	public string EventType { get; init; }
+	public string ContentType { get; init; }
+	//qq do these want to be long or ulong
+	public ulong CommitPosition { get; init; }
+	public ulong PreparePosition { get; init; }
+	public bool IsRedacted { get; init; }
+	public ReadOnlyMemory<byte> Data { get; init; }
+	public ReadOnlyMemory<byte> Metadata { get; init; }
+
+	public Event(
+		Guid eventId,
+		DateTime created,
+		string stream,
+		ulong eventNumber,
+		string eventType,
+		string contentType,
+		ulong commitPosition,
+		ulong preparePosition,
+		bool isRedacted,
+		ReadOnlyMemory<byte> data,
+		ReadOnlyMemory<byte> metadata) {
+
+		EventId = eventId;
+		Created = created;
+		Stream = stream;
+		EventNumber = eventNumber;
+		EventType = eventType;
+		ContentType = contentType;
+		CommitPosition = commitPosition;
+		PreparePosition = preparePosition;
+		IsRedacted = isRedacted;
+		Data = data;
+		Metadata = metadata;
+	}
+}
diff --git a/src/KurrentDB.POC.IO.Core/EventToWrite.cs b/src/KurrentDB.POC.IO.Core/EventToWrite.cs
new file mode 100644
index 00000000000..552c903ea6c
--- /dev/null
+++ b/src/KurrentDB.POC.IO.Core/EventToWrite.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.POC.IO.Core;
+
+public class EventToWrite {
+	public Guid EventId { get; init; }
+	public string EventType { get; init; }
+	public string ContentType { get; init; }
+	public ReadOnlyMemory<byte> Data { get; init; }
+	public ReadOnlyMemory<byte> Metadata { get; init; }
+
+	public EventToWrite(
+		Guid eventId,
+		string eventType,
+		string contentType,
+		ReadOnlyMemory<byte> data,
+		ReadOnlyMemory<byte> metadata) {
+
+		EventId = eventId;
+		EventType = eventType;
+		ContentType = contentType;
+		Data = data;
+		Metadata = metadata;
+	}
+}
diff --git a/src/KurrentDB.POC.IO.Core/IAsyncEnumerableExtentions.cs b/src/KurrentDB.POC.IO.Core/IAsyncEnumerableExtentions.cs
new file mode 100644
index 00000000000..12686a14d81
--- /dev/null
+++ b/src/KurrentDB.POC.IO.Core/IAsyncEnumerableExtentions.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+
+namespace KurrentDB.POC.IO.Core;
+
+public static class IAsyncEnumerableExtentions {
+	public static async Task ToChannelAsync<T>(
+		this IAsyncEnumerable<T> self,
+		ChannelWriter<T> writer,
+		CancellationToken ct) {
+
+		await foreach (var x in self.WithCancellation(ct)) {
+			await writer.WriteAsync(x, ct);
+		}
+	}
+
+	public static async IAsyncEnumerable<T> HandleStreamNotFound<T>(
+		this IAsyncEnumerable<T> self) {
+
+		await Task.Yield();
+
+		await using var enumerator = self.GetAsyncEnumerator();
+		while (true) {
+			try {
+				if (!await enumerator.MoveNextAsync())
+					break;
+			} catch (ResponseException.StreamNotFound) {
+				break;
+			}
+
+			yield return enumerator.Current;
+		}
+	}
+}
diff --git a/src/KurrentDB.POC.IO.Core/IClient.cs b/src/KurrentDB.POC.IO.Core/IClient.cs
new file mode 100644
index 00000000000..d8e01a324ee
--- /dev/null
+++ b/src/KurrentDB.POC.IO.Core/IClient.cs
@@ -0,0 +1,115 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.POC.IO.Core;
+
+public readonly record struct Position(ulong CommitPosition, ulong PreparePosition) {
+	public static readonly Position Start = new(0, 0);
+
+	public static readonly Position End = new(ulong.MaxValue, ulong.MaxValue);
+
+	public static bool operator <(Position a, Position b) {
+		if (a.CommitPosition != b.CommitPosition) {
+			return a.CommitPosition < b.CommitPosition;
+		}
+
+		return a.PreparePosition < b.PreparePosition;
+	}
+
+	public static bool operator >(Position p1, Position p2) => p2 < p1;
+}
+
+// This exists to prevent people constructing a position when subscribing to all and expecting
+// to receive the event at that position in their subscription. The subscribe call is expecting
+// a checkpoint of the last received event and the `After` method makes that intuitive
+public readonly record struct FromAll(Position? Position) {
+	public static readonly FromAll Start = new(null);
+
+	public static readonly FromAll End = new(Core.Position.End);
+
+	public static FromAll After(Position position) => new(position);
+}
+
+public static class ExpectedVersion {
+	public const long Any = -2;
+	public const long NoStream = -1;
+}
+
+public interface IClient {
+	//qq consider what api we actually want here
+	// and clearly define the semantics such that we get the same behaviour from internal and external
+	// wrt exception handling etc.
+
+	Task WriteMetaDataMaxCountAsync(string stream, CancellationToken cancellationToken);
+	Task<long> WriteAsync(string stream, EventToWrite[] events, long expectedVersion, CancellationToken cancellationToken);
+	IAsyncEnumerable<Event> SubscribeToAll(FromAll start, CancellationToken cancellationToken);
+	IAsyncEnumerable<Event> SubscribeToStream(string stream, CancellationToken cancellationToken);
+	IAsyncEnumerable<Event> ReadStreamForwards(string stream, long maxCount, CancellationToken cancellationToken);
+	IAsyncEnumerable<Event> ReadStreamBackwards(string stream, long maxCount, CancellationToken cancellationToken);
+	IAsyncEnumerable<Event> ReadAllBackwardsAsync(Position position, long maxCount, CancellationToken cancellationToken);
+	Task DeleteStreamAsync(string stream, long expectedVersion, CancellationToken cancellationToken);
+
+	async Task<long> WriteAsyncRetry(string stream, EventToWrite[] events, long expectedVersion,
+		CancellationToken cancellationToken, int maxRetries = 50) {
+
+		ResponseException? lastException = null;
+		for (var i = 0; i < maxRetries; i++) {
+			try {
+				return await WriteAsync(stream, events, expectedVersion, cancellationToken);
+			} catch (ResponseException e) {
+				switch (e) {
+					case ResponseException.ServerBusy:
+					case ResponseException.ServerNotReady:
+					case ResponseException.Timeout:
+						break;
+					default:
+						throw;
+				}
+
+				lastException = e;
+				await Task.Delay(TimeSpan.FromSeconds(30), cancellationToken);
+			}
+		}
+
+		throw lastException!;
+	}
+
+	class None : IClient {
+		public IAsyncEnumerable<Event> SubscribeToAll(FromAll start, CancellationToken cancellationToken) {
+			throw new NotImplementedException();
+		}
+
+		public IAsyncEnumerable<Event> SubscribeToStream(string stream, CancellationToken cancellationToken) {
+			throw new NotImplementedException();
+		}
+
+		public IAsyncEnumerable<Event> ReadStreamForwards(string stream, long maxCount, CancellationToken cancellationToken) {
+			throw new NotImplementedException();
+		}
+
+		public IAsyncEnumerable<Event> ReadStreamBackwards(string stream, long maxCount, CancellationToken cancellationToken) {
+			throw new NotImplementedException();
+		}
+
+		public IAsyncEnumerable<Event> ReadAllBackwardsAsync(Position position, long maxCount, CancellationToken cancellationToken) {
+			throw new NotImplementedException();
+		}
+
+		public Task DeleteStreamAsync(string stream, long expectedVersion, CancellationToken cancellationToken) {
+			throw new NotImplementedException();
+		}
+
+		public Task WriteMetaDataMaxCountAsync(string stream, CancellationToken cancellationToken) {
+			throw new NotImplementedException();
+		}
+
+		public Task<long> WriteAsync(string stream, EventToWrite[] events, long expectedVersion, CancellationToken cancellationToken) {
+			throw new NotImplementedException();
+		}
+	}
+}
diff --git a/src/KurrentDB.POC.IO.Core/IConnectedSubsystemsPlugin.cs b/src/KurrentDB.POC.IO.Core/IConnectedSubsystemsPlugin.cs
new file mode 100644
index 00000000000..6543337da81
--- /dev/null
+++ b/src/KurrentDB.POC.IO.Core/IConnectedSubsystemsPlugin.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using EventStore.Plugins.Subsystems;
+
+namespace KurrentDB.POC.IO.Core;
+
+// Necessary for now because of how PluginLoader works.
+// Later it may be possible to remove this interface entirely.
+public interface IConnectedSubsystemsPlugin {
+	string Name { get; }
+	string Version { get; }
+	string CommandLineName { get; }
+	IReadOnlyList<ISubsystem> GetSubsystems();
+}
diff --git a/src/KurrentDB.POC.IO.Core/IOperationsClient.cs b/src/KurrentDB.POC.IO.Core/IOperationsClient.cs
new file mode 100644
index 00000000000..e4a03996ecc
--- /dev/null
+++ b/src/KurrentDB.POC.IO.Core/IOperationsClient.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.POC.IO.Core;
+
+/// <summary>
+/// A client abstraction used for administrative operations.
+/// </summary>
+public interface IOperationsClient {
+	/// <summary>
+	/// Demotes the current node to a follower if it is a leader. Don't expect the node to be demoted immediately. The
+	/// call start demotion process.
+	/// </summary>
+	void Resign();
+}
diff --git a/src/KurrentDB.POC.IO.Core/ISink.cs b/src/KurrentDB.POC.IO.Core/ISink.cs
new file mode 100644
index 00000000000..d3983246fcc
--- /dev/null
+++ b/src/KurrentDB.POC.IO.Core/ISink.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.POC.IO.Core;
+
+public interface ISink {
+
+	public Uri Config { get; }
+
+	public Task Write(Event e, CancellationToken ct);
+}
diff --git a/src/KurrentDB.POC.IO.Core/KurrentDB.POC.IO.Core.csproj b/src/KurrentDB.POC.IO.Core/KurrentDB.POC.IO.Core.csproj
new file mode 100644
index 00000000000..7d5f82c8b40
--- /dev/null
+++ b/src/KurrentDB.POC.IO.Core/KurrentDB.POC.IO.Core.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="EventStore.Plugins" Version="25.2.5" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.POC.IO.Core/ResponseException.cs b/src/KurrentDB.POC.IO.Core/ResponseException.cs
new file mode 100644
index 00000000000..68a940051d0
--- /dev/null
+++ b/src/KurrentDB.POC.IO.Core/ResponseException.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.POC.IO.Core;
+
+public abstract class ResponseException : Exception {
+	protected ResponseException() : base() { }
+	protected ResponseException(string? message) : base(message) { }
+	protected ResponseException(string? message, Exception inner) : base(message, inner) { }
+
+	/// Request was not authorized
+	public class AccessDenied : ResponseException {
+		public AccessDenied(string message) : base(message) { }
+		public AccessDenied(Exception inner) : base(null, inner) { }
+	}
+
+	public class NotAuthenticated : ResponseException {
+		public NotAuthenticated(Exception inner) : base(null, inner) { }
+	}
+
+	public class NotLeader : ResponseException {
+		public NotLeader() { }
+		public NotLeader(Exception inner) : base(null, inner) { }
+	}
+
+	public class SubscriptionDropped : ResponseException {
+		public SubscriptionDropped() { }
+		public SubscriptionDropped(string stream, string reason) :
+			base($"Subscription to {stream} was dropped {reason}.") { }
+	}
+
+	public class ServerBusy : ResponseException {
+		public ServerBusy() { }
+		public ServerBusy(Exception inner) : base(null, inner) { }
+	}
+
+	public class ServerNotReady : ResponseException {
+		public ServerNotReady() { }
+		public ServerNotReady(Exception inner) : base(null, inner) { }
+	}
+
+	public class StreamDeleted : ResponseException {
+		public StreamDeleted(string message) : base(message) { }
+		public StreamDeleted(Exception inner) : base(null, inner) { }
+	}
+
+	public class StreamNotFound : ResponseException {
+		public StreamNotFound(string message) : base(message) {
+		}
+	}
+
+	public class Timeout : ResponseException {
+		public Timeout(string message) : base(message) { }
+		public Timeout(Exception inner) : base(null, inner) { }
+	}
+
+	public class UnexpectedError : ResponseException {
+		public UnexpectedError(string message) : base(message) { }
+		public UnexpectedError(Exception inner) : base(null, inner) { }
+	}
+
+	public class WrongExpectedVersion : ResponseException {
+		public WrongExpectedVersion(string message) : base(message) { }
+		public WrongExpectedVersion(Exception inner) : base(null, inner) { }
+	}
+}
diff --git a/src/KurrentDB.POC.IO.Core/Serialization/EnumConverterWithDefault.cs b/src/KurrentDB.POC.IO.Core/Serialization/EnumConverterWithDefault.cs
new file mode 100644
index 00000000000..bd5c60cdee6
--- /dev/null
+++ b/src/KurrentDB.POC.IO.Core/Serialization/EnumConverterWithDefault.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace KurrentDB.POC.IO.Core.Serialization;
+
+public class EnumConverterWithDefault<T> : JsonConverter<T> where T : struct, Enum {
+	public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+		var s = reader.GetString();
+		if (!Enum.TryParse<T>(s, true, out var result) || !Enum.IsDefined(result))
+			return default;
+		return result;
+	}
+
+	public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options) {
+		writer.WriteStringValue(value.ToString());
+	}
+}
diff --git a/src/EventStore.PluginHosting/EventStore.PluginHosting.csproj b/src/KurrentDB.PluginHosting/KurrentDB.PluginHosting.csproj
similarity index 100%
rename from src/EventStore.PluginHosting/EventStore.PluginHosting.csproj
rename to src/KurrentDB.PluginHosting/KurrentDB.PluginHosting.csproj
diff --git a/src/KurrentDB.PluginHosting/PluginLoader.cs b/src/KurrentDB.PluginHosting/PluginLoader.cs
new file mode 100644
index 00000000000..abf77f5168c
--- /dev/null
+++ b/src/KurrentDB.PluginHosting/PluginLoader.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.Loader;
+
+namespace KurrentDB.PluginHosting;
+
+public sealed class PluginLoader : IDisposable {
+	private readonly DirectoryInfo _rootPluginDirectory;
+	private readonly PluginLoadContext[] _contexts;
+
+	private IEnumerable<DirectoryInfo> PluginDirectories {
+		get {
+			if (!_rootPluginDirectory.Exists) {
+				yield break;
+			}
+
+			yield return _rootPluginDirectory;
+			foreach (var pluginDirectory in _rootPluginDirectory.EnumerateDirectories()) {
+				yield return pluginDirectory;
+			}
+		}
+	}
+
+	public PluginLoader(DirectoryInfo rootPluginDirectory, Assembly shared = null) {
+		_rootPluginDirectory = rootPluginDirectory ?? throw new ArgumentNullException(nameof(rootPluginDirectory));
+		_contexts = PluginDirectories.Select(directory => new PluginLoadContext(directory, shared)).ToArray();
+	}
+
+	public IEnumerable<T> Load<T>() where T : class {
+		foreach (var loadContext in _contexts)
+			foreach (var assembly in loadContext.Assemblies)
+				foreach (var pluginType in assembly.GetExportedTypes())
+					if (typeof(T).IsAssignableFrom(pluginType) && !pluginType.IsAbstract && !pluginType.IsInterface)
+						yield return (T)Activator.CreateInstance(pluginType);
+	}
+
+	public void Dispose() {
+		foreach (var context in _contexts) {
+			context.Unload();
+		}
+	}
+
+	private class PluginLoadContext : AssemblyLoadContext {
+		private static readonly string[] Shared = { "Serilog", "YamlDotNet", "EventStore.Plugins" };
+		private readonly Assembly _shared;
+		private readonly AssemblyDependencyResolver _resolver;
+
+		public PluginLoadContext(DirectoryInfo directory, Assembly shared) : base(true) {
+			_resolver = new AssemblyDependencyResolver(directory.FullName);
+			foreach (var library in directory.GetFiles("*.dll")
+				.Where(file => !Shared.Contains(Path.GetFileNameWithoutExtension(file.Name)))) {
+				try {
+					LoadFromAssemblyPath(library.FullName);
+				} catch (BadImageFormatException) {
+					// We shouldn't be loading this dll. Ignore it
+				}
+			}
+			_shared = shared;
+		}
+
+		protected override Assembly Load(AssemblyName assemblyName) {
+			if (assemblyName.Name == _shared?.GetName().Name) {
+				// dont load the dependency at all, use this one from another context
+				return _shared;
+			}
+
+			var path = _resolver.ResolveAssemblyToPath(assemblyName);
+			if (path != null) {
+				// load the dependency into this context
+				return LoadFromAssemblyPath(path);
+			} else {
+				// load the dependency into the default context
+				return null;
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Plugins.TestHelpers/Fixtures.cs b/src/KurrentDB.Plugins.TestHelpers/Fixtures.cs
new file mode 100644
index 00000000000..a6d598d9cd1
--- /dev/null
+++ b/src/KurrentDB.Plugins.TestHelpers/Fixtures.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Reactive.Subjects;
+using EventStore.Plugins.Licensing;
+using Microsoft.IdentityModel.JsonWebTokens;
+
+namespace KurrentDB.Plugins.TestHelpers;
+
+public static class Fixtures {
+	static readonly Dictionary<string, string> _hardCodedTokens = new() {
+		{ "AUTO_SCAVENGE", "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJlc2RiIiwiaXNzIjoiZXNkYiIsImV4cCI6MTgyNDQ1NjgyOCwianRpIjoiMTU3NDk2N2MtMmVkNC00OGZhLWIyNjItYTdhMGQzYTA1NTczIiwic3ViIjoiRVNEQiBUZXN0cyIsIklzVHJpYWwiOiJUcnVlIiwiSXNFeHBpcmVkIjoiRmFsc2UiLCJJc1ZhbGlkIjoiVHJ1ZSIsIklzRmxvYXRpbmciOiJUcnVlIiwiRGF5c1JlbWFpbmluZyI6IjEiLCJTdGFydERhdGUiOiIyNi8wNC8yMDI0IDAwOjAwOjAwICswMTowMCIsIkFVVE9fU0NBVkVOR0UiOiJ0cnVlIiwiaWF0IjoxNzI5ODQ4ODI4LCJuYmYiOjE3Mjk4NDg4Mjh9.jaQ58MxlqM2oORJw9bWJzvdTzwWxFeo-624SMN52Rm2j6HLvWsT2_jFTb_Xi-rXmP1C7KlJCQEMhksV_5QdsiRi37oao1fcxfywOBHQkPMqx2Hd1CMWq1_DAY0az12fRSrR9h3L_yIiez2coRNFKkc5mZSq2KHoZre0WWXbMUDL1RheG1KNTxL2qBelyYVMYRZ7lXfsUpgzahOTR36QTtWYETBbtzik8ZujINhYGUhqbGLtGO3Ad3kTqPQVB6MMDNgE6F-ZHLMrXPR08fJNYrkxcB8WoSbelzPduPN6tMJeyn1e6jYO3oOUBZZsD2tdX_Pai1qw4fiZlZlPycbYOBQ" },
+		{ "ENCRYPTION_AT_REST", "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJlc2RiIiwiaXNzIjoiZXNkYiIsImV4cCI6MTgyNDQ1NjgyOSwianRpIjoiOTBiOWJkMGItZDQ3NS00NGQ0LWI2MjQtYjRiNzU1ZWI0ZmMxIiwic3ViIjoiRVNEQiBUZXN0cyIsIklzVHJpYWwiOiJUcnVlIiwiSXNFeHBpcmVkIjoiRmFsc2UiLCJJc1ZhbGlkIjoiVHJ1ZSIsIklzRmxvYXRpbmciOiJUcnVlIiwiRGF5c1JlbWFpbmluZyI6IjEiLCJTdGFydERhdGUiOiIyNi8wNC8yMDI0IDAwOjAwOjAwICswMTowMCIsIkVOQ1JZUFRJT05fQVRfUkVTVCI6InRydWUiLCJpYXQiOjE3Mjk4NDg4MjksIm5iZiI6MTcyOTg0ODgyOX0.AOMV7xhVds03oOdIhKQWRezooJl5tGtt4vGXmtq7cAzuoze5CC93svfJwYIui0Y5CG5yP32qEY-4YI7w41aROEEWXXa7DvWaefk2h-3a7zcrtol24klkmoscKkylAEy9xuxarqDaUh0Z2ooILuq1JmNnGKbzxGQ_khZKqS5-OpYVzcGY0iNpK49Td-ue5pPrJ7meuEHUJWWudw7Wv9MzUo1lR40bRqFn0xHUXeA4KDHQPAhjOVp_1isVTN7eWGq00Rz-c-8JT-4Beg7yFfVg0Vr2rHvxbWvk32BOHhHxHxUlfbzhLzAkpUQoZqRSWdjL3fvpeEhXsHD-riw1uIxZRA" },
+		{ "LDAPS_AUTHENTICATION", "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJlc2RiIiwiaXNzIjoiZXNkYiIsImV4cCI6MTgyNDQ1NjgyOSwianRpIjoiZDc0OWM3ODAtNWIyNi00ZDlkLTljMzctMGI4ZTVmZDg2MDgwIiwic3ViIjoiRVNEQiBUZXN0cyIsIklzVHJpYWwiOiJUcnVlIiwiSXNFeHBpcmVkIjoiRmFsc2UiLCJJc1ZhbGlkIjoiVHJ1ZSIsIklzRmxvYXRpbmciOiJUcnVlIiwiRGF5c1JlbWFpbmluZyI6IjEiLCJTdGFydERhdGUiOiIyNi8wNC8yMDI0IDAwOjAwOjAwICswMTowMCIsIkxEQVBTX0FVVEhFTlRJQ0FUSU9OIjoidHJ1ZSIsImlhdCI6MTcyOTg0ODgyOSwibmJmIjoxNzI5ODQ4ODI5fQ.GOLUghP1kht56zWXYj4-A1nilRlCfrjIWP5gTUjh1UA1cbDuMqOn-UfddM2GnesBz07PbwOt6vgZwHvhyO1CU2w-sAGpZKTykZ9Jj5lk_TZ068yDcEUBDcfk1v-Zc_wlG9GYzr8WssXkAs0O1L1vdsVB3R2G_ZtmU_TYtN93ojQVMrMt6ZzvxkZTe-dMgsycXXBOS1tSi_IkwagawtMJCogGaUHdsnlWdzFVZkcpOiIHCZl1aoP30uDxSLKC8VKHoqnZWSo2AXVLeoJpoVLm4lr86AIGGtg5FNzVsFcPpzfdHau5DSfFeHfhpXMislbCO4Lzdd2khKVPDjiaVRLXFA" },
+		{ "LEGACY_AUTHORIZATION_WITH_STREAM_AUTHORIZATION_DISABLED", "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJlc2RiIiwiaXNzIjoiZXNkYiIsImV4cCI6MTgyNDQ1NjgyOSwianRpIjoiMjI0MTI5NzEtNjlhZS00YzZmLWFmNDktNGNjN2IwY2UzZWI0Iiwic3ViIjoiRVNEQiBUZXN0cyIsIklzVHJpYWwiOiJUcnVlIiwiSXNFeHBpcmVkIjoiRmFsc2UiLCJJc1ZhbGlkIjoiVHJ1ZSIsIklzRmxvYXRpbmciOiJUcnVlIiwiRGF5c1JlbWFpbmluZyI6IjEiLCJTdGFydERhdGUiOiIyNi8wNC8yMDI0IDAwOjAwOjAwICswMTowMCIsIkxFR0FDWV9BVVRIT1JJWkFUSU9OX1dJVEhfU1RSRUFNX0FVVEhPUklaQVRJT05fRElTQUJMRUQiOiJ0cnVlIiwiaWF0IjoxNzI5ODQ4ODI5LCJuYmYiOjE3Mjk4NDg4Mjl9.a1uKQrzBhzulOlM69HB44g3pDTW9B9OdJ01QDrqxiIBlBy1pmsZAMIk4e29eQBWcOUyd5V5LnjJyqGPp8TBa9Y-co5ul-3cD3-HkEazsrYo4gJrRZsShCUJpIxzMWuRLrm6UnPhwFEQplm18KHPjg-j3M7_DQV6kwsJa_fCCNrc-61WIwaheFcoZqq8puKjQRFSUsamKnixamHtJ0i6DOlMmhxfb_8KDL0LTzLceGeP_bIodYUJm-G0upaks_Q8ZmKS2lPQjlfIz570y7m7vTqQYkGkkKKvmrYY6rrtZMJX33dHBLljywQoP6oMyZDrGKs-MQfKnQZz6OiwKHxxfig" },
+		{ "LOGS_ENDPOINT", "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJlc2RiIiwiaXNzIjoiZXNkYiIsImV4cCI6MTgyNDQ1NjgyOSwianRpIjoiMzVhOWY4N2YtMTc1YS00MjZhLWIzNjYtNGYyY2FlZDliYmFhIiwic3ViIjoiRVNEQiBUZXN0cyIsIklzVHJpYWwiOiJUcnVlIiwiSXNFeHBpcmVkIjoiRmFsc2UiLCJJc1ZhbGlkIjoiVHJ1ZSIsIklzRmxvYXRpbmciOiJUcnVlIiwiRGF5c1JlbWFpbmluZyI6IjEiLCJTdGFydERhdGUiOiIyNi8wNC8yMDI0IDAwOjAwOjAwICswMTowMCIsIkxPR1NfRU5EUE9JTlQiOiJ0cnVlIiwiaWF0IjoxNzI5ODQ4ODI5LCJuYmYiOjE3Mjk4NDg4Mjl9.MxD5X7zh4MdWSgX6CncwVvf_6EFRoXEDwwrnQ1CSqAmHv0rCxvjqZKNjBhWDWWO_z1O_JtQ71Mkt1TCbTYKHMHf_v8Sp45kzojF3BirdFHfL_pqlDO4hhwNuzuL58Xzy9TO6bMUJrQMLuRSMqoYDDthP8uUBCS8IGa2dEm_knpKReZLIrG8qQ3Mmx1wUkuHKJVvh_5WB5mvg9GvDPBcw4R929lYy-qSP23SsXDbRF38vST7oODrvhNNv3ECA8Oo11FdbfpDnm2zzf7lAun8kwrsRD70NrYnO0kydbdikyFTbvS2p0_yG1mtfMkKgriO2SsLLshjYlzUmPZvUQzRSKA" },
+		{ "MD5", "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJlc2RiIiwiaXNzIjoiZXNkYiIsImV4cCI6MTgyNDQ1NjgyOSwianRpIjoiNzljMjFiZGItMGQ2Mi00MDJkLTlmNjYtYjBhYzE1NmExZjhiIiwic3ViIjoiRVNEQiBUZXN0cyIsIklzVHJpYWwiOiJUcnVlIiwiSXNFeHBpcmVkIjoiRmFsc2UiLCJJc1ZhbGlkIjoiVHJ1ZSIsIklzRmxvYXRpbmciOiJUcnVlIiwiRGF5c1JlbWFpbmluZyI6IjEiLCJTdGFydERhdGUiOiIyNi8wNC8yMDI0IDAwOjAwOjAwICswMTowMCIsIk1ENSI6InRydWUiLCJpYXQiOjE3Mjk4NDg4MjksIm5iZiI6MTcyOTg0ODgyOX0.DtiaMagnEbVSCVbJbOjhY8VYfojfiYlg1P8rPshw-DCvUmNG9QHLs_EJYZAWzUoMgQKt1UEa6a-mITqT6aTzyVAXnHRGcqEEaiQATHjWueFSm7NXfMvdthJFhh__vcqYbaqPBVAtuGsNval2PhqecXf1YnpwzGjlOJQm2weEmrD1i643r6T-OgDHPxC2hAh5wc9hy_dd0Xkgp_bdQ96RbB6yxUDjyF8KWJlZ0I6dVZXnoJnYwIhG6RARiPfX1JaqJsEWaL1sAAITygINqxooXNBjKTWQlgAZbT9jg59A4UB38YAhG6IZAhCzBQJVhWzw0DfBApE7Roeg9og2MWqAPA" },
+		{ "OAUTH_AUTHENTICATION", "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJlc2RiIiwiaXNzIjoiZXNkYiIsImV4cCI6MTgyNDQ1NjgyOSwianRpIjoiYzZmMDQ1NDQtNzkwZS00MTBiLTg5NjMtNzdlNmUzZjA2ZDAyIiwic3ViIjoiRVNEQiBUZXN0cyIsIklzVHJpYWwiOiJUcnVlIiwiSXNFeHBpcmVkIjoiRmFsc2UiLCJJc1ZhbGlkIjoiVHJ1ZSIsIklzRmxvYXRpbmciOiJUcnVlIiwiRGF5c1JlbWFpbmluZyI6IjEiLCJTdGFydERhdGUiOiIyNi8wNC8yMDI0IDAwOjAwOjAwICswMTowMCIsIk9BVVRIX0FVVEhFTlRJQ0FUSU9OIjoidHJ1ZSIsImlhdCI6MTcyOTg0ODgyOSwibmJmIjoxNzI5ODQ4ODI5fQ.LArwI3dhiQNbTtCiUfjW_9IDpbeVyAGrFOnClNOrremg1zgbpRjZ0Erumi6TGx7kWaTmmutqFXKGdp0xiFyMZEv7tK9Lyf1gZeqN4pnoTFjPMU1hzVzqUR9pqG8tBsPWxWNLck0DyBiQ3FPgexmleAVCoYicXiV7bYiw_rrHYjTZ5jQnuApCmQhjPiYg6XGsVS-8sH1IgcVYE_R3hkEne93XFqLyXbUNW1oBIU16UjURnMEwZFlN2m_pJkfo445AHNH-TUxwwkJOcU9ha4Nd2mPWR9lZ82HPZp5rCeNCChgrMck4zOIE2Hpu_JqVCsC8F3FCS5oUQauXSNAQKJC6mg" },
+		{ "OTLP_EXPORTER", "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJlc2RiIiwiaXNzIjoiZXNkYiIsImV4cCI6MTgyNDQ1NjgyOSwianRpIjoiM2ZlMzg5NjAtMWRmNC00ZjFhLTlkY2EtNTU2Mjc0MTZhOGQ2Iiwic3ViIjoiRVNEQiBUZXN0cyIsIklzVHJpYWwiOiJUcnVlIiwiSXNFeHBpcmVkIjoiRmFsc2UiLCJJc1ZhbGlkIjoiVHJ1ZSIsIklzRmxvYXRpbmciOiJUcnVlIiwiRGF5c1JlbWFpbmluZyI6IjEiLCJTdGFydERhdGUiOiIyNi8wNC8yMDI0IDAwOjAwOjAwICswMTowMCIsIk9UTFBfRVhQT1JURVIiOiJ0cnVlIiwiaWF0IjoxNzI5ODQ4ODI5LCJuYmYiOjE3Mjk4NDg4Mjl9.nPGgyP4qGz6fzbTXFbBc_vplJ-nN_nXXDnMBXQ3Qr8e8QFCSrkikHtx1qKurtg2YVMDdAuXsKAFnU7M3iuCIuRESfSfseonMeVCNOhf6S4ziyffCeBvmDhw6lyDQ-BsGCzsuSpMwslZXfhqR7GXkbwojA4HsKEaSqK1ifzbmfsYlfZGa0MdMnBMLGfI_hGzDkOi4ALMfAHvPN9fo8Gru7LZyMOGTkDtN00BI0XDT71dnGylYjXLa15pO2HfHAi09fAZAamelghPc4cBuz6kliFhqDhnaQ8m-EE_q7BrCtEyQvJbOcA9Jv_hsA4nKhzAriNyzKbDZQS82FbAGgObMBw" },
+		{ "STREAM_POLICY_AUTHORIZATION", "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJlc2RiIiwiaXNzIjoiZXNkYiIsImV4cCI6MTgyNDQ1NjgyOSwianRpIjoiMmIzMjlmOWMtNGFlZC00ZDlkLWJjOTEtYTQ4YWFkZWRiNTE0Iiwic3ViIjoiRVNEQiBUZXN0cyIsIklzVHJpYWwiOiJUcnVlIiwiSXNFeHBpcmVkIjoiRmFsc2UiLCJJc1ZhbGlkIjoiVHJ1ZSIsIklzRmxvYXRpbmciOiJUcnVlIiwiRGF5c1JlbWFpbmluZyI6IjEiLCJTdGFydERhdGUiOiIyNi8wNC8yMDI0IDAwOjAwOjAwICswMTowMCIsIlNUUkVBTV9QT0xJQ1lfQVVUSE9SSVpBVElPTiI6InRydWUiLCJpYXQiOjE3Mjk4NDg4MjksIm5iZiI6MTcyOTg0ODgyOX0.ZigSD46YoSWSiozvGQXJ7FXgtEallqyTSvfcywCO_Z_d8cRlCJRb27bzJ1q4UtrBP99SBbttN2etmzyCZhhASAH55W4oo1Vh9iEbBu3uiH8ZPdBD8_V4v83djh70Fux0JUpQWcFq8bBsscXdg7fE2MpaRU004Ei3C03P3Es8jtsXRJ6rkkFFsa0NIQtPnmj44lZfAnU5A_BgamW6_OoPHjB1vEA9LUquQ5p7ovZxK1cv2lgs0lh3drYFyflqI1sAqJof4HCmMV1oK4U-1j9UhGov6J7TWtvSfbpiRToQayGe8yKmYEqydhQhgFlNBfjvv11Z_1uWyVyItopl7W5o9g" },
+		{ "TCP_CLIENT_PLUGIN", "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJlc2RiIiwiaXNzIjoiZXNkYiIsImV4cCI6MTgyNDQ1NjgyOSwianRpIjoiM2RlZGU4YzktNTk2MS00OTY5LWExOGUtM2IyOWZjZTA3OTM2Iiwic3ViIjoiRVNEQiBUZXN0cyIsIklzVHJpYWwiOiJUcnVlIiwiSXNFeHBpcmVkIjoiRmFsc2UiLCJJc1ZhbGlkIjoiVHJ1ZSIsIklzRmxvYXRpbmciOiJUcnVlIiwiRGF5c1JlbWFpbmluZyI6IjEiLCJTdGFydERhdGUiOiIyNi8wNC8yMDI0IDAwOjAwOjAwICswMTowMCIsIlRDUF9DTElFTlRfUExVR0lOIjoidHJ1ZSIsImlhdCI6MTcyOTg0ODgyOSwibmJmIjoxNzI5ODQ4ODI5fQ.dLUmYsB_dygcHKd6roHSCbY3zycECwBeZscnu53jvJUo_OxDAWmw3ZeVigr8qHNH2v8GJbIhB49gcuCcOX3txTGTc_kcDxM4nlLec_hoUvNPFRgzYQ2dCFq8aukLJh_N-FBzg1SI7X5aK20bBBbrVqPykC6NOTuP0CBSKL8ZCf2UyIq9qr4TtL6IEZ7jEd1QHDPHv2T--XdXhRgdBhWaqa4HyUQlUy1MJ58_5jJ4EEL5cpTbZPWbWMC4UYx7AjpGxTn36kTdz4ApsEzUuepH6Ir7wycdxAXl64xMoktBNOAdcD6AElJSFUJP8qU0gge_40jGEJBDXBOBdoa6eqFbLQ" },
+		{ "USER_CERTIFICATES", "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJlc2RiIiwiaXNzIjoiZXNkYiIsImV4cCI6MTgyNDQ1NjgyOSwianRpIjoiNTYyZDQxYjYtMDNhOC00NDcwLTg2YWMtNGZhODYyYzNkMDczIiwic3ViIjoiRVNEQiBUZXN0cyIsIklzVHJpYWwiOiJUcnVlIiwiSXNFeHBpcmVkIjoiRmFsc2UiLCJJc1ZhbGlkIjoiVHJ1ZSIsIklzRmxvYXRpbmciOiJUcnVlIiwiRGF5c1JlbWFpbmluZyI6IjEiLCJTdGFydERhdGUiOiIyNi8wNC8yMDI0IDAwOjAwOjAwICswMTowMCIsIlVTRVJfQ0VSVElGSUNBVEVTIjoidHJ1ZSIsImlhdCI6MTcyOTg0ODgyOSwibmJmIjoxNzI5ODQ4ODI5fQ.Zu-2tta3JPOsRD13GDM7LH6Wby24IQKlwyvDMQ_hFc5cFHfkmqoeFGuOO4C9yzbf2eWxbi_sDopm8CC0Cwkb2HGTkX1hpMxbJEdub5wnwsQG_rhqP8ljOUqcUYKCjtF04cFoCXF5PCTKH73KXMaCvE-BXoMhL0u8SU5wnNEw6g_qdLWf7I9JFauaPvBXE0VBH1F9hDtY1oVN2wR7VhGXtnAj8suU2nDVBRpSlQErGJqcHQXptQUXRx-QoUxNFsSmXSBeicUOKrYGwsEApnTSx7EKv-T68SbeQf-S_pRScJzxNvmB5B5Unq6oca1rNH55VyHWK0x-SVNYcNglpnuPCg" },
+		{ "NONE", "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJlc2RiIiwiaXNzIjoiZXNkYiIsImV4cCI6MTgyNDQ1NjgyOSwianRpIjoiOTVmZTY2YzAtMDRkMi00MjExLWI1ZGQtNTAyM2MyYTAxMGFiIiwic3ViIjoiRVNEQiBUZXN0cyIsIklzVHJpYWwiOiJUcnVlIiwiSXNFeHBpcmVkIjoiRmFsc2UiLCJJc1ZhbGlkIjoiVHJ1ZSIsIklzRmxvYXRpbmciOiJUcnVlIiwiRGF5c1JlbWFpbmluZyI6IjEiLCJTdGFydERhdGUiOiIyNi8wNC8yMDI0IDAwOjAwOjAwICswMTowMCIsIk5PTkUiOiJ0cnVlIiwiaWF0IjoxNzI5ODQ4ODI5LCJuYmYiOjE3Mjk4NDg4Mjl9.R24i-ZAow3BhRaST3n25Uc_nQ184k83YRZZ0oRcWbU9B9XNLRH0Iegj0HmkyzkT50I4gcIJOIfcO6mIPp4Y959CP7aTAlt7XEnXoGF0GwsfXatAxy4iXG8Gpya7INgMoWEeN0v8eDH8_OVmnieOxeba9ex5j1oAW_FtQDMzcFjAeErpW__8zmkCsn6GzvlhdLE4e3r2wjshvrTTcS_1fvSVjQZov5ce2sVBJPegjCLO_QGiIBK9QTnpHrhe6KCYje6fSTjgty0V1Qj22bftvrXreYzQijPrnC_ek1BwV-A1JvacZugMCPIy8WvE5jE3hVYRWGGUzQZ-CibPGsjudYA" },
+	};
+
+	public class FakeLicenseService : ILicenseService {
+		public FakeLicenseService(bool createLicense = true, string? entitlement = null) {
+			var license = new License(new JsonWebToken(_hardCodedTokens[entitlement ?? "NONE"]));
+			SelfLicense = license;
+
+			if (createLicense) {
+				CurrentLicense = license;
+				Licenses = new BehaviorSubject<License>(license);
+			} else {
+				var licenses = new Subject<License>();
+				licenses.OnError(new Exception("no license"));
+				Licenses = licenses;
+			}
+		}
+
+		public License SelfLicense { get; }
+
+		public License? CurrentLicense { get; }
+
+		public IObservable<License> Licenses { get; }
+
+		public void RejectLicense(Exception ex) {
+			RejectionException = ex;
+		}
+
+		public Exception? RejectionException { get; private set; }
+	}
+}
diff --git a/src/KurrentDB.Plugins.TestHelpers/KurrentConfigurationConstants.cs b/src/KurrentDB.Plugins.TestHelpers/KurrentConfigurationConstants.cs
new file mode 100644
index 00000000000..9fdabfc47ad
--- /dev/null
+++ b/src/KurrentDB.Plugins.TestHelpers/KurrentConfigurationConstants.cs
@@ -0,0 +1,8 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Plugins.TestHelpers;
+
+public static class KurrentConfigurationConstants {
+	public const string Prefix = "KurrentDB";
+}
diff --git a/src/KurrentDB.Plugins.TestHelpers/KurrentDB.Plugins.TestHelpers.csproj b/src/KurrentDB.Plugins.TestHelpers/KurrentDB.Plugins.TestHelpers.csproj
new file mode 100644
index 00000000000..2b19d418e3c
--- /dev/null
+++ b/src/KurrentDB.Plugins.TestHelpers/KurrentDB.Plugins.TestHelpers.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="EventStore.Plugins" Version="25.2.5" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.Projections.Core.Javascript.Tests/Bus/SynchronousScheduler.cs b/src/KurrentDB.Projections.Core.Javascript.Tests/Bus/SynchronousScheduler.cs
new file mode 100644
index 00000000000..3a14051d64c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Javascript.Tests/Bus/SynchronousScheduler.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Messaging;
+
+// Resharper disable CheckNamespace
+
+namespace KurrentDB.Core.Bus;
+
+public sealed class SynchronousScheduler(string name = "Test", bool watchSlowMsg = true) : InMemoryBus(name, watchSlowMsg), IPublisher {
+	public void Publish(Message msg) {
+		ArgumentNullException.ThrowIfNull(msg);
+
+		var task = DispatchAsync(msg, CancellationToken.None);
+		if (task.IsCompleted) {
+			task.GetAwaiter().GetResult();
+		} else {
+			var wrapperTask = task.AsTask();
+
+			try {
+				wrapperTask.Wait();
+			} catch (AggregateException e) when (e.InnerExceptions is [var innerEx]) {
+				throw innerEx;
+			} finally {
+				wrapperTask.Dispose();
+			}
+		}
+	}
+
+	ValueTask IAsyncHandle<Message>.HandleAsync(Message msg, CancellationToken token)
+		=> DispatchAsync(msg, token);
+}
diff --git a/src/KurrentDB.Projections.Core.Javascript.Tests/Integration/MetadataSerializationTests.cs b/src/KurrentDB.Projections.Core.Javascript.Tests/Integration/MetadataSerializationTests.cs
new file mode 100644
index 00000000000..f79185478c8
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Javascript.Tests/Integration/MetadataSerializationTests.cs
@@ -0,0 +1,85 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text.Json;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using Xunit;
+
+namespace KurrentDB.Projections.Core.Javascript.Tests.Integration;
+
+public class MetadataSerializationTests : ProjectionRuntimeScenario {
+	[Fact]
+	public async Task CanHandleNulls() {
+		var notification = Notify("emitted-stream");
+
+
+		await WriteEvents("source-stream", ExpectedVersion.NoStream,
+			new Event(Guid.NewGuid(), "foo", true,
+				JsonSerializer.SerializeToUtf8Bytes(new object()), Array.Empty<byte>()));
+
+		var js = @"
+fromStream('source-stream').
+    when({
+        $any: function (s, e) {
+            emit('emitted-stream',
+			'event-type',
+			e,
+			{test:null});
+		}
+	});
+";
+		await SendProjectionMessage<ProjectionManagementMessage.Updated>(envelope =>
+			new ProjectionManagementMessage.Command.Post(envelope, ProjectionMode.Continuous,
+				"can-handle-null-metadata", ProjectionManagementMessage.RunAs.System, "js", js,
+				true, true, true,
+				false,
+				true));
+
+		await notification.WaitAsync(TestTimeout);
+		var events = await ReadStream("emitted-stream", 0);
+		var e = Assert.Single(events);
+		JsonDocument doc = JsonDocument.Parse(e.Event.Metadata);
+		Assert.True(doc.RootElement.TryGetProperty("test", out var prop));
+		Assert.Equal(JsonValueKind.Null, prop.ValueKind);
+	}
+
+	[Fact]
+	public async Task CanHandleEscapedMetadata() {
+		var notification = Notify("emitted-stream");
+
+		await WriteEvents("source-stream", ExpectedVersion.NoStream,
+			new Event(Guid.NewGuid(), "foo", true,
+				JsonSerializer.SerializeToUtf8Bytes(new object()), Array.Empty<byte>()));
+
+		var js = @"
+fromStream('source-stream').
+    when({
+        $any: function (s, e) {
+            emit('emitted-stream',
+			'event-type',
+			e,
+			{test:""\""some-data\""""});
+		}
+	});
+";
+		await SendProjectionMessage<ProjectionManagementMessage.Updated>(envelope =>
+			new ProjectionManagementMessage.Command.Post(envelope, ProjectionMode.Continuous,
+				"can-handle-null-metadata", ProjectionManagementMessage.RunAs.System, "js", js,
+				true, true, true,
+				false,
+				true));
+
+
+		await notification.WaitAsync(TestTimeout);
+		var events = await ReadStream("emitted-stream", 0);
+		var e = Assert.Single(events);
+		JsonDocument doc = JsonDocument.Parse(e.Event.Metadata);
+		Assert.True(doc.RootElement.TryGetProperty("test", out var prop));
+		Assert.Equal(JsonValueKind.String, prop.ValueKind);
+		Assert.Equal("\"some-data\"", prop.GetString());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Javascript.Tests/Integration/ProjectionRuntimeScenario.cs b/src/KurrentDB.Projections.Core.Javascript.Tests/Integration/ProjectionRuntimeScenario.cs
new file mode 100644
index 00000000000..deb9b3108e9
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Javascript.Tests/Integration/ProjectionRuntimeScenario.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Options;
+using KurrentDB.Core;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Services.Transport.Http;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Core.Util;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace KurrentDB.Projections.Core.Javascript.Tests.Integration;
+
+public abstract class ProjectionRuntimeScenario : SubsystemScenario {
+	static readonly IConfiguration EmptyConfiguration = new ConfigurationBuilder().AddInMemoryCollection().Build();
+
+	protected ProjectionRuntimeScenario() : base(CreateRuntime, "$et", new CancellationTokenSource(Debugger.IsAttached ? 5 * 60 * 1000 : 5 * 1000).Token) {
+
+	}
+
+	static (Func<ValueTask>, IPublisher) CreateRuntime(SynchronousScheduler mainBus, IQueuedHandler mainQueue, ICheckpoint writerCheckpoint) {
+		var options = new ProjectionSubsystemOptions(3, ProjectionType.All, true, TimeSpan.FromMinutes(5), false, 500, 500, Opts.MaxProjectionStateSizeDefault);
+		var config = new TFChunkDbConfig("mem", 10000, 0, writerCheckpoint, new InMemoryCheckpoint(-1), new InMemoryCheckpoint(-1), new InMemoryCheckpoint(-1), new InMemoryCheckpoint(-1), new InMemoryCheckpoint(-1), new InMemoryCheckpoint(-1), new InMemoryCheckpoint(-1), true);
+		var db = new TFChunkDb(config);
+		var qs = new QueueStatsManager();
+		var timeProvider = new RealTimeProvider();
+		var ts = new TimerService(new TimerBasedScheduler(new RealTimer(), timeProvider));
+		var sc = new StandardComponents(db.Config, mainQueue, mainBus, ts, timeProvider, null, new IHttpService[] { }, mainBus, qs, new(), new());
+
+		var subsystem = new ProjectionsSubsystem(options);
+
+		var builder = WebApplication.CreateBuilder();
+		builder.Services.AddGrpc();
+		builder.Services.AddSingleton(sc);
+		subsystem.ConfigureServices(builder.Services, new ConfigurationBuilder().Build());
+
+		subsystem.ConfigureApplication(builder.Build().UseRouting(), EmptyConfiguration);
+		subsystem.Start();
+
+		return (() => {
+#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
+			subsystem.Stop();
+#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
+			return db.DisposeAsync();
+		}, subsystem.LeaderInputQueue);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Javascript.Tests/Integration/SubsystemScenario.cs b/src/KurrentDB.Projections.Core.Javascript.Tests/Integration/SubsystemScenario.cs
new file mode 100644
index 00000000000..95d626bd71b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Javascript.Tests/Integration/SubsystemScenario.cs
@@ -0,0 +1,347 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Security.Claims;
+using System.Text;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using Xunit;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+
+namespace KurrentDB.Projections.Core.Javascript.Tests.Integration;
+
+public abstract class SubsystemScenario : IHandle<Message>, IAsyncLifetime {
+	private readonly Func<ValueTask> _stop;
+	private readonly SynchronousScheduler _mainBus;
+	private readonly IQueuedHandler _mainQueue;
+
+	private readonly InMemoryCheckpoint _writerCheckpoint;
+	private readonly MiniStore _miniStore;
+	protected CancellationToken TestTimeout { get; }
+	private readonly Task _complete;
+	private readonly IPublisher _subsystemCommands;
+	private readonly Task _ready;
+	readonly ConcurrentDictionary<string, TaskCompletionSource<bool>> _notifications;
+
+	protected SubsystemScenario(Func<SynchronousScheduler, IQueuedHandler, ICheckpoint, (Func<ValueTask> stopAction, IPublisher subsystemCommands)> createSubsystem, string readyStream, CancellationToken testTimeout) {
+		_mainBus = new SynchronousScheduler("main");
+		_mainQueue = new QueuedHandlerThreadPool(_mainBus, "bossQ", new QueueStatsManager(), new());
+		_writerCheckpoint = new InMemoryCheckpoint(0);
+		_miniStore = new MiniStore(_writerCheckpoint, _mainQueue);
+		TestTimeout = testTimeout;
+		_complete = _miniStore.NotifyAll(TestTimeout);
+		_notifications = new ConcurrentDictionary<string, TaskCompletionSource<bool>>();
+		_ready = Notify(readyStream);
+		_mainBus.Subscribe(this);
+		(_stop, _subsystemCommands) = createSubsystem(_mainBus, _mainQueue, _writerCheckpoint);
+	}
+
+	protected virtual void OnMainBusMessage(Message msg) { }
+
+	public async Task InitializeAsync() {
+		_mainQueue.Start();
+		_mainQueue.Publish(new SystemMessage.SystemCoreReady());
+		_mainQueue.Publish(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+		await _ready.WaitAsync(TestTimeout);
+	}
+
+	public async Task DisposeAsync() {
+		_miniStore.Complete();
+		await _complete;
+		await _stop();
+		await _mainQueue.Stop();
+	}
+
+	protected async Task<(long commitPosition, long nextRevision)> WriteEvents(string stream, long expectedRevision, params Event[] events) {
+		var responseEnvelope = new TellMeWhenItsDone(TestTimeout);
+		_mainQueue.Publish(new ClientMessage.WriteEvents(Guid.NewGuid(), Guid.NewGuid(),
+			responseEnvelope, false, stream, expectedRevision,
+			events, null, null));
+		var msg = await responseEnvelope.Task.WaitAsync(TestTimeout);
+		var resp = Assert.IsType<ClientMessage.WriteEventsCompleted>(msg);
+		Assert.Equal(OperationResult.Success, resp.Result);
+		return (resp.CommitPosition, resp.CurrentVersion);
+	}
+	protected async Task<IReadOnlyList<ResolvedEvent>> ReadStream(string stream, int from) {
+		var tmwid = new TellMeWhenItsDone(TestTimeout);
+		_mainQueue.Publish(new ClientMessage.ReadStreamEventsForward(Guid.NewGuid(),
+			Guid.NewGuid(), tmwid, stream, from, 100, true, false, null,
+			ClaimsPrincipal.Current, replyOnExpired: false, null, null));
+		var msg = await tmwid.Task.WaitAsync(TestTimeout);
+		var rr = Assert.IsType<ClientMessage.ReadStreamEventsForwardCompleted>(msg);
+		return rr.Events;
+	}
+
+	protected async Task<TResponse> SendProjectionMessage<TResponse>(Func<IEnvelope,
+		ProjectionManagementMessage.Command.ControlMessage> requestFactory)
+		where TResponse : Message {
+		var tmwid = new TellMeWhenItsDone(TestTimeout);
+		_subsystemCommands.Publish(requestFactory(tmwid));
+		var msg = await tmwid.Task.WaitAsync(TestTimeout);
+		return Assert.IsType<TResponse>(msg);
+	}
+	class TellMeWhenItsDone : IEnvelope {
+		private readonly TaskCompletionSource<Message> _completion;
+		private readonly CancellationTokenRegistration _registration;
+
+		public TellMeWhenItsDone(CancellationToken token) {
+			_completion = new TaskCompletionSource<Message>(TaskCreationOptions.RunContinuationsAsynchronously);
+			_registration = token.Register(static o => {
+				if (o is not TellMeWhenItsDone state)
+					return;
+				state._registration.Dispose();
+				state._completion.TrySetCanceled(state._registration.Token);
+			}, this);
+		}
+
+		public Task<Message> Task => _completion.Task;
+
+		public void ReplyWith<T>(T message) where T : Message {
+			_completion.TrySetResult(message);
+		}
+	}
+
+	protected Task Notify(string streamName) {
+		return _notifications.GetOrAdd(streamName, new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously)).Task;
+	}
+
+	public void Handle(Message message) {
+		switch (message) {
+			case SystemMessage.SystemCoreReady:
+			case SystemMessage.BecomeLeader:
+			case ProjectionCoreServiceMessage.SubComponentStarted:
+			case AwakeServiceMessage.SubscribeAwake:
+			case SystemMessage.SubSystemInitialized:
+				return;
+			case ClientMessage.ReadStreamEventsForward m:
+				_miniStore.Handle(m);
+				return;
+			case ClientMessage.ReadStreamEventsBackward m:
+				_miniStore.Handle(m);
+				return;
+			case ClientMessage.ReadAllEventsForward m:
+				_miniStore.Handle(m);
+				return;
+			case ClientMessage.WriteEvents m:
+				_miniStore.Handle(m);
+				return;
+			case StorageMessage.EventCommitted e:
+				CheckNotifications(e);
+				break;
+		}
+		OnMainBusMessage(message);
+	}
+
+	private void CheckNotifications(StorageMessage.EventCommitted e) {
+		if (_notifications.TryRemove(e.Event.EventStreamId, out var tcs)) {
+			tcs.TrySetResult(true);
+		}
+	}
+
+	protected ResolvedEvent AtLogPosition(long position) {
+		return _miniStore.AtPosition(position);
+	}
+
+	//A super mini in memory event store purely for testing the projection runtime
+	class MiniStore :
+		IHandle<ClientMessage.ReadStreamEventsForward>,
+		IHandle<ClientMessage.ReadAllEventsForward>,
+		IHandle<ClientMessage.ReadStreamEventsBackward>,
+	IHandle<ClientMessage.WriteEvents> {
+		private readonly ICheckpoint _checkpoint;
+		private readonly IPublisher _bus;
+		private readonly List<ResolvedEvent> _all;
+		private readonly Dictionary<string, List<ResolvedEvent>> _streams;
+		private readonly Channel<int> _notifications;
+
+		public MiniStore(ICheckpoint checkpoint, IPublisher bus) {
+			_checkpoint = checkpoint;
+			_bus = bus;
+			_all = new List<ResolvedEvent>();
+			_streams = new Dictionary<string, List<ResolvedEvent>>();
+			_notifications = Channel.CreateUnbounded<int>(new UnboundedChannelOptions() { AllowSynchronousContinuations = false, SingleReader = true, SingleWriter = true });
+		}
+
+		public async Task NotifyAll(CancellationToken cancellationToken) {
+			try {
+				int next = 0;
+				await foreach (var upTo in
+							   _notifications.Reader.ReadAllAsync(cancellationToken)) {
+					while (next < upTo) {
+						var nextEvent = _all[next].OriginalEvent;
+						_bus.Publish(new StorageMessage.EventCommitted(next, nextEvent, upTo - 1 == next));
+						next++;
+					}
+
+					if (cancellationToken.IsCancellationRequested)
+						break;
+				}
+			} catch (Exception ex) when (ex is TaskCanceledException or OperationCanceledException) { }
+		}
+		public void Handle(ClientMessage.ReadStreamEventsForward message) {
+			ClientMessage.ReadStreamEventsForwardCompleted response;
+			if (_streams.TryGetValue(message.EventStreamId, out var events)) {
+				var from = (int)message.FromEventNumber;
+				response = new ClientMessage.ReadStreamEventsForwardCompleted(
+					message.CorrelationId, message.EventStreamId, message.FromEventNumber,
+					message.MaxCount, ReadStreamResult.Success,
+					events.Skip(from).Take(message.MaxCount).ToArray(), StreamMetadata.Empty,
+					false, null, Math.Min(from + message.MaxCount + 1, events.Count),
+					events.Count - 1, from + message.MaxCount >= events.Count,
+					_checkpoint.Read());
+
+			} else {
+				response = new ClientMessage.ReadStreamEventsForwardCompleted(
+					message.CorrelationId, message.EventStreamId, message.FromEventNumber,
+					message.MaxCount, ReadStreamResult.NoStream, Array.Empty<ResolvedEvent>(),
+					StreamMetadata.Empty, false, null, -1, -1, true, _checkpoint.Read());
+			}
+			message.Envelope.ReplyWith(response);
+		}
+
+		public void Handle(ClientMessage.ReadAllEventsForward message) {
+			ClientMessage.ReadAllEventsForwardCompleted response;
+			if (message.CommitPosition < _all.Count) {
+				var resolvedEvents = _all.Skip((int)message.CommitPosition).Take(message.MaxCount).ToArray();
+				var next = (int)Math.Min(_all.Count, message.CommitPosition + message.MaxCount);
+				var prev = Math.Max(0, message.CommitPosition - 1);
+				response = new ClientMessage.ReadAllEventsForwardCompleted(
+					message.CorrelationId, ReadAllResult.Success, null,
+					resolvedEvents, StreamMetadata.Empty, false, message.MaxCount,
+					new TFPos(message.CommitPosition, message.PreparePosition), new TFPos(next, next), new TFPos(prev, prev > 0 ? prev : long.MaxValue), _checkpoint.Read());
+			} else {
+				response = new ClientMessage.ReadAllEventsForwardCompleted(
+					message.CorrelationId, ReadAllResult.Success, null,
+					Array.Empty<ResolvedEvent>(), StreamMetadata.Empty, false, message.MaxCount,
+					new TFPos(message.CommitPosition, message.PreparePosition), new TFPos(message.CommitPosition, message.PreparePosition), new TFPos(0, long.MaxValue), _checkpoint.Read());
+			}
+			message.Envelope.ReplyWith(response);
+
+		}
+
+		public void Handle(ClientMessage.ReadStreamEventsBackward message) {
+			ClientMessage.ReadStreamEventsBackwardCompleted response;
+			if (_streams.TryGetValue(message.EventStreamId, out var events)) {
+				var from = (int)message.FromEventNumber;
+				response = new ClientMessage.ReadStreamEventsBackwardCompleted(
+					message.CorrelationId, message.EventStreamId, message.FromEventNumber,
+					message.MaxCount, ReadStreamResult.Success,
+					events.AsEnumerable().Reverse().Skip(from).Take(message.MaxCount).ToArray(), StreamMetadata.Empty,
+					false, null, Math.Max(from - message.MaxCount, 0),
+					events.Count - 1, from + message.MaxCount >= events.Count,
+					_checkpoint.Read());
+
+			} else {
+				response = new ClientMessage.ReadStreamEventsBackwardCompleted(
+					message.CorrelationId, message.EventStreamId, message.FromEventNumber,
+					message.MaxCount, ReadStreamResult.NoStream, Array.Empty<ResolvedEvent>(),
+					StreamMetadata.Empty, false, null, -1, -1, true, _checkpoint.Read());
+			}
+			message.Envelope.ReplyWith(response);
+		}
+
+		public void Handle(ClientMessage.WriteEvents message) {
+			ClientMessage.WriteEventsCompleted response;
+			if (_streams.TryGetValue(message.EventStreamId, out var events)) {
+				if (message.ExpectedVersion == ExpectedVersion.Any ||
+					message.ExpectedVersion == events.Count - 1) {
+					response = WriteEvents(message, events);
+				} else {
+					response = new ClientMessage.WriteEventsCompleted(message.CorrelationId,
+						OperationResult.WrongExpectedVersion, "Wrong expected version",
+						_streams.Count - 1);
+				}
+			} else {
+				if (message.ExpectedVersion is ExpectedVersion.Any or ExpectedVersion.NoStream) {
+					events = new List<ResolvedEvent>();
+					_streams.Add(message.EventStreamId, events);
+					response = WriteEvents(message, events);
+				} else {
+					response = new ClientMessage.WriteEventsCompleted(message.CorrelationId,
+						OperationResult.WrongExpectedVersion, "Wrong expected version",
+						ExpectedVersion.NoStream);
+				}
+			}
+
+			message.Envelope.ReplyWith(response);
+
+			_notifications.Writer.TryWrite((int)_checkpoint.Read());
+		}
+		ClientMessage.WriteEventsCompleted WriteEvents(ClientMessage.WriteEvents message, List<ResolvedEvent> events) {
+			var stored = new List<ResolvedEvent>();
+			for (int i = 0; i < message.Events.Length; i++) {
+				var position = _all.Count + i;
+				var revision = events.Count + i;
+				var current = message.Events[i];
+
+				var flags = PrepareFlags.IsCommitted | PrepareFlags.Data;
+				if (current.IsJson)
+					flags |= PrepareFlags.IsJson;
+				if (i == 0)
+					flags |= PrepareFlags.TransactionBegin;
+				if (i == message.Events.Length - 1)
+					flags |= PrepareFlags.TransactionEnd;
+
+				var record = new EventRecord(revision, position, message.CorrelationId,
+					current.EventId, _all.Count, i, message.EventStreamId, -1, DateTime.Now,
+					flags, current.EventType, current.Data, current.Metadata);
+				if (current.EventType == SystemEventTypes.LinkTo) {
+					var data = Encoding.UTF8.GetString(current.Data);
+					var parts = data.Split('@', 2);
+					var number = int.Parse(parts[0]);
+					var stream = parts[1];
+					if (_streams.TryGetValue(stream, out var links) &&
+						links.Count > number) {
+						stored.Add(ResolvedEvent.ForResolvedLink(links[number].OriginalEvent, record, position));
+					} else {
+						stored.Add(ResolvedEvent.ForFailedResolvedLink(record, ReadEventResult.NotFound));
+					}
+				} else {
+					stored.Add(ResolvedEvent.ForUnresolvedEvent(record, position));
+				}
+
+				if (stored.Count > 1) {
+					if (stored[i].OriginalPosition < stored[i - 1].OriginalPosition) {
+						Debug.WriteLine("500");
+					}
+				}
+			}
+
+			var response = new ClientMessage.WriteEventsCompleted(message.CorrelationId,
+				events.Count, Math.Max(0, events.Count + stored.Count - 1),
+				_all.Count + stored.Count, _all.Count + stored.Count);
+			events.AddRange(stored);
+			_all.AddRange(stored);
+			_checkpoint.Write(_all.Count);
+			_checkpoint.Flush();
+			return response;
+
+		}
+
+		public void Complete() {
+			_notifications.Writer.TryComplete();
+		}
+
+		public ResolvedEvent AtPosition(long position) {
+			var local = (int)position;
+			if (local < 0 || local >= _all.Count)
+				return default;
+			return _all[local];
+		}
+	}
+}
+
diff --git a/src/KurrentDB.Projections.Core.Javascript.Tests/Integration/TestPollyFills.cs b/src/KurrentDB.Projections.Core.Javascript.Tests/Integration/TestPollyFills.cs
new file mode 100644
index 00000000000..2691c59f663
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Javascript.Tests/Integration/TestPollyFills.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+
+namespace KurrentDB.Projections.Core.Javascript.Tests.Integration;
+
+public static class TestPollyFills {
+	public static async Task WaitAsync(this Task toWaitFor, CancellationToken cancellationToken) {
+		var tcs = new TaskCompletionSource();
+		await using var reg = cancellationToken.Register(() => { tcs.TrySetCanceled(); });
+		var result = await Task.WhenAny(tcs.Task, toWaitFor);
+		await result;
+	}
+	public static async Task<T> WaitAsync<T>(this Task<T> toWaitFor, CancellationToken cancellationToken) {
+		var tcs = new TaskCompletionSource<T>();
+		await using var reg = cancellationToken.Register(() => { tcs.TrySetCanceled(); });
+		var result = await Task.WhenAny(tcs.Task, toWaitFor);
+		return await result;
+	}
+
+	public static Event[] LikeBeforeTheyWereSaved(this IReadOnlyList<ResolvedEvent> events) {
+		return events.Select(x => new Event(x.Event.EventId, x.Event.EventType, x.Event.IsJson,
+			x.Event.Data.ToArray(), x.Event.Metadata.ToArray())).ToArray();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Javascript.Tests/KurrentDB.Projections.Core.Javascript.Tests.csproj b/src/KurrentDB.Projections.Core.Javascript.Tests/KurrentDB.Projections.Core.Javascript.Tests.csproj
new file mode 100644
index 00000000000..feda7169890
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Javascript.Tests/KurrentDB.Projections.Core.Javascript.Tests.csproj
@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<IsPackable>false</IsPackable>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+	<ItemGroup>
+		<None Remove="Specs\account-balancer.js" />
+		<None Remove="Specs\account-closer.js" />
+		<None Remove="Specs\by-category-spec.json" />
+		<None Remove="Specs\by-category.js" />
+		<None Remove="Specs\event-data.js" />
+		<None Remove="Specs\event-data-spec.json" />
+	</ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Include="Specs\account-balancer.js" />
+		<EmbeddedResource Include="Specs\account-closer.js" />
+		<EmbeddedResource Include="Specs\by-category-spec.json" />
+		<EmbeddedResource Include="Specs\by-category.js" />
+		<EmbeddedResource Include="Specs\event-data.js" />
+		<EmbeddedResource Include="Specs\event-data-spec.json" />
+		<EmbeddedResource Include="Specs\account-spec.json" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+		<PackageReference Include="xunit" Version="2.9.3" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="coverlet.collector" Version="6.0.4">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.Projections.Core\KurrentDB.Projections.Core.csproj" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.Projections.Core.Javascript.Tests/SpecRunner.cs b/src/KurrentDB.Projections.Core.Javascript.Tests/SpecRunner.cs
new file mode 100644
index 00000000000..ac8b780d34d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Javascript.Tests/SpecRunner.cs
@@ -0,0 +1,471 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Interpreted;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Xunit;
+using Xunit.Abstractions;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Javascript.Tests;
+
+public class SpecRunner {
+	private readonly ITestOutputHelper _output;
+
+	public SpecRunner(ITestOutputHelper output) {
+		_output = output;
+	}
+
+	private static readonly Encoding Utf8NoBom = new UTF8Encoding(false, true);
+
+	public static IEnumerable<object[]> GetTestCases() {
+		var assembly = typeof(SpecRunner).Assembly;
+		var specs = assembly.GetManifestResourceNames().Where(x => x.EndsWith("-spec.json"));
+		foreach (var spec in specs) {
+			JsonDocument doc;
+			using (var stream = assembly.GetManifestResourceStream(spec)) {
+				doc = JsonDocument.Parse(stream!);
+			}
+
+			var projection = doc.RootElement.GetProperty("projection").GetString();
+			Assert.False(string.IsNullOrWhiteSpace(projection));
+			var projectionSourceName = assembly.GetManifestResourceNames()
+				.SingleOrDefault(x => x.EndsWith($"{projection}.js"));
+			Assert.NotNull(projectionSourceName);
+			string source;
+			using (var stream = assembly.GetManifestResourceStream(projectionSourceName!)) {
+				Assert.NotNull(stream);
+				using (var sr = new StreamReader(stream!)) {
+					source = sr.ReadToEnd();
+				}
+			}
+
+			List<InputEventSequence> sequences = new();
+			foreach (var inputEvent in doc.RootElement.GetProperty("input").EnumerateArray()) {
+				var stream = inputEvent.GetProperty("streamId").GetString();
+				Assert.NotNull(stream);
+				var sequence = new InputEventSequence(stream!);
+				sequences.Add(sequence);
+				foreach (var e in inputEvent.GetProperty("events").EnumerateArray()) {
+					var et = e.GetProperty("eventType").GetString();
+					Assert.NotNull(et);
+					bool skip = false;
+					if (e.TryGetProperty("skip", out var skipElement)) {
+						skip = skipElement.GetBoolean();
+					}
+
+					var initializedPartitions = new List<string>();
+					if (e.TryGetProperty("initializedPartitions", out var partitions)) {
+						foreach (var element in partitions.EnumerateArray()) {
+							initializedPartitions.Add(element.GetString()!);
+						}
+					}
+					var expectedStates = new Dictionary<string, string?>();
+					int stateCount = 0;
+					if (e.TryGetProperty("states", out var states)) {
+						foreach (var state in states.EnumerateArray()) {
+							stateCount++;
+							var expectedStateNode = state.GetProperty("state");
+							var expectedState = expectedStateNode.ValueKind == JsonValueKind.Null ? null : expectedStateNode.GetRawText();
+							if (!expectedStates.TryAdd(state.GetProperty("partition").GetString()!,
+								expectedState)) {
+								throw new InvalidOperationException("Duplicate state");
+							}
+						}
+					}
+					if (stateCount > 2)
+						throw new InvalidOperationException("Cannot specify more than 2 states");
+
+					sequence.Events.Add(new InputEvent(et!, e.GetProperty("data").GetRawText(), e.TryGetProperty("metadata", out var metadata) ? metadata.GetRawText() : null, initializedPartitions, expectedStates, skip, e.TryGetProperty("eventId", out var idElement) && idElement.TryGetGuid(out var id) ? id : Guid.NewGuid()));
+				}
+			}
+
+			var output = doc.RootElement.GetProperty("output");
+			var sdb = new SourceDefinitionBuilder();
+			var config = output.GetProperty("config");
+			foreach (var item in config.EnumerateObject()) {
+				switch (item.Name) {
+					case "definesStateTransform":
+						if (item.Value.GetBoolean())
+							sdb.SetDefinesStateTransform();
+						break;
+					case "handlesDeletedNotifications":
+						sdb.SetHandlesStreamDeletedNotifications(item.Value.GetBoolean());
+						break;
+					case "producesResults":
+						if (item.Value.GetBoolean())
+							sdb.SetOutputState();
+						break;
+					case "definesFold":
+						if (item.Value.GetBoolean())
+							sdb.SetDefinesFold();
+						break;
+					case "resultStreamName":
+						sdb.SetResultStreamNameOption(item.Value.GetString());
+						break;
+					case "partitionResultStreamNamePattern":
+						sdb.SetPartitionResultStreamNamePatternOption(item.Value.GetString());
+						break;
+					case "$includeLinks":
+						sdb.SetIncludeLinks(item.Value.GetBoolean());
+						break;
+					case "reorderEvents":
+						sdb.SetReorderEvents(item.Value.GetBoolean());
+						break;
+					case "processingLag":
+						sdb.SetProcessingLag(item.Value.GetInt32());
+						break;
+					case "biState":
+						sdb.SetIsBiState(item.Value.GetBoolean());
+						break;
+					case "categories":
+						foreach (var c in item.Value.EnumerateArray()) {
+							sdb.FromCategory(c.GetString());
+						}
+						break;
+					case "partitioned":
+						if (item.Value.GetBoolean())
+							sdb.SetByCustomPartitions();
+						break;
+					case "events":
+						foreach (var e in item.Value.EnumerateArray()) {
+							sdb.IncludeEvent(e.GetString());
+						}
+						break;
+					case "allEvents":
+						if (item.Value.GetBoolean()) {
+							sdb.AllEvents();
+						} else {
+							sdb.NotAllEvents();
+						}
+						break;
+					case "allStreams":
+						if (item.Value.GetBoolean()) {
+							sdb.FromAll();
+						}
+						break;
+					default:
+						throw new Exception($"unexpected property in expected config {item.Name}");
+				}
+			}
+#nullable disable
+
+			List<OutputEvent> expectedEmittedEvents = new();
+			if (output.TryGetProperty("emitted", out var expectedEmittedElement)) {
+				foreach (var element in expectedEmittedElement.EnumerateObject()) {
+					var stream = element.Name;
+					foreach (var eventElement in element.Value.EnumerateArray()) {
+						if (eventElement.ValueKind == JsonValueKind.String) {
+							expectedEmittedEvents.Add(
+								new OutputEvent(stream, "$>", eventElement.GetString(), null));
+						}
+					}
+				}
+			}
+			JintProjectionStateHandler runner = null;
+			IQuerySources definition = null;
+
+			IQuerySources expectedDefinition = sdb.Build();
+			yield return WithOutput($"{projection} compiles", o => {
+				runner = new JintProjectionStateHandler(source, true,
+					compilationTimeout: TimeSpan.FromMilliseconds(200),
+					executionTimeout: TimeSpan.FromMilliseconds(200));
+			});
+
+			yield return For($"{projection} getDefinition", () => {
+				definition = runner.GetSourceDefinition();
+			});
+
+			yield return For($"{projection} qs.AllStreams", () => Assert.Equal(expectedDefinition.AllStreams, definition.AllStreams));
+			yield return For($"{projection} qs.Categories", () => Assert.Equal(expectedDefinition.Categories, definition.Categories));
+			yield return For($"{projection} qs.Streams", () => Assert.Equal(expectedDefinition.Streams, definition.Streams));
+			yield return For($"{projection} qs.AllEvents", () => Assert.Equal(expectedDefinition.AllEvents, definition.AllEvents));
+			yield return For($"{projection} qs.Events", () => Assert.Equal(expectedDefinition.Events, definition.Events));
+			yield return For($"{projection} qs.ByStreams", () => Assert.Equal(expectedDefinition.ByStreams, definition.ByStreams));
+			yield return For($"{projection} qs.ByCustomPartitions", () => Assert.Equal(expectedDefinition.ByCustomPartitions, definition.ByCustomPartitions));
+			yield return For($"{projection} qs.DefinesStateTransform", () => Assert.Equal(expectedDefinition.DefinesStateTransform, definition.DefinesStateTransform));
+			yield return For($"{projection} qs.DefinesFold", () => Assert.Equal(expectedDefinition.DefinesFold, definition.DefinesFold));
+			yield return For($"{projection} qs.HandlesDeletedNotifications", () => Assert.Equal(expectedDefinition.HandlesDeletedNotifications, definition.HandlesDeletedNotifications));
+			yield return For($"{projection} qs.ProducesResults", () => Assert.Equal(expectedDefinition.ProducesResults, definition.ProducesResults));
+			yield return For($"{projection} qs.IsBiState", () => Assert.Equal(expectedDefinition.IsBiState, definition.IsBiState));
+			yield return For($"{projection} qs.IncludeLinksOption", () => Assert.Equal(expectedDefinition.IncludeLinksOption, definition.IncludeLinksOption));
+			yield return For($"{projection} qs.ResultStreamNameOption", () => Assert.Equal(expectedDefinition.ResultStreamNameOption, definition.ResultStreamNameOption));
+			yield return For($"{projection} qs.PartitionResultStreamNamePatternOption", () => Assert.Equal(expectedDefinition.PartitionResultStreamNamePatternOption,
+				definition.PartitionResultStreamNamePatternOption));
+			yield return For($"{projection} qs.ReorderEventsOption", () => Assert.Equal(expectedDefinition.ReorderEventsOption, definition.ReorderEventsOption));
+			yield return For($"{projection} qs.ProcessingLagOption", () => Assert.Equal(expectedDefinition.ProcessingLagOption, definition.ProcessingLagOption));
+			yield return For($"{projection} qs.LimitingCommitPosition", () => Assert.Equal(expectedDefinition.LimitingCommitPosition, definition.LimitingCommitPosition));
+			var partitionedState = new Dictionary<string, string>();
+			var sharedStateInitialized = false;
+			var revision = new Dictionary<string, long>();
+			List<EmittedEventEnvelope> actualEmittedEvents = new();
+
+			for (int i = 0; i < sequences.Count; i++) {
+				var sequence = sequences[i];
+				if (!revision.TryGetValue(sequence.Stream, out _)) {
+					revision[sequence.Stream] = 0;
+				}
+				for (int j = 0; j < sequences[i].Events.Count; j++) {
+					var logPosition = i * 100 + j;
+					var flags = PrepareFlags.IsJson | PrepareFlags.Data;
+					if (j == 0)
+						flags |= PrepareFlags.TransactionBegin;
+					if (j == sequence.Events.Count - 1)
+						flags |= PrepareFlags.TransactionEnd;
+
+					/*Sequence:
+					Get partition if bycustom partition or by stream
+						if the partition is null or an empty string skip this event (NB: need to indicate that an event should be skipped)
+					load the state if it doesn't exist or tell the projection to init state
+					init shared if it doesn't exist
+					if init was state was called, call created
+					if processing a delete, call partition deleted (NB: bistate partitions do not support deletes)
+					process the event
+					save any shared state if it isn't null
+					save any state
+					save emitted events to verify later
+					*/
+					var @event = sequence.Events[j];
+					var body = JObject.Parse(@event.Body).ToString(Formatting.Indented);
+					var metadata = Array.Empty<byte>();
+					if (@event.Metadata != null) {
+						metadata = Utf8NoBom.GetBytes(JObject.Parse(@event.Metadata).ToString(Formatting.Indented));
+					}
+					var er = new EventRecord(
+						revision[sequence.Stream], logPosition, Guid.NewGuid(), @event.EventId, i, j,
+						sequence.Stream, i, DateTime.Now, flags, @event.EventType,
+						Utf8NoBom.GetBytes(body), metadata);
+					var e = new ResolvedEvent(KurrentDB.Core.Data.ResolvedEvent.ForUnresolvedEvent(er, logPosition), Array.Empty<byte>());
+					if (@event.Skip) {
+						yield return For($"{projection} skips {er.EventNumber}@{sequence.Stream}",
+							() => Assert.Null(runner.GetStatePartition(CheckpointTag.Empty, "", e)));
+					} else {
+						var expectedPartition = "";
+						if (expectedDefinition.DefinesFold) {
+							if (@event.ExpectedStates.Any()) {
+								expectedPartition = @event.ExpectedStates
+									.SingleOrDefault(x => string.Empty != x.Key).Key ?? string.Empty;
+								if (expectedPartition != string.Empty) {
+									yield return For(
+										$"{projection} {er.EventNumber}@{sequence.Stream} returns expected partition",
+										() => Assert.Equal(expectedPartition,
+											runner.GetStatePartition(CheckpointTag.Empty, "", e)));
+									foreach (var initializedState in @event.InitializedPartitions) {
+										yield return For(
+											$"should not have already initialized \"{initializedState}\" at {er.EventNumber}@{sequence.Stream}",
+											() => Assert.DoesNotContain(initializedState,
+												(IReadOnlyDictionary<string, string>)partitionedState));
+									}
+								}
+
+								if (expectedDefinition.IsBiState && !sharedStateInitialized) {
+									sharedStateInitialized = true;
+									yield return For("initializes shared state without error", () => {
+										runner.InitializeShared();
+									});
+								}
+
+								if (!@event.InitializedPartitions.Contains(expectedPartition)) {
+									yield return For(
+										$"can load current state at {er.EventNumber}@{sequence.Stream}",
+										() => {
+											Assert.True(
+												partitionedState.TryGetValue(expectedPartition, out var value),
+												$"did not find expected state for partition{expectedPartition}");
+											runner.Load(value);
+										});
+								} else {
+									yield return For(
+										$"initializes new state at {er.EventNumber}@{sequence.Stream}",
+										() => {
+											var ex = Record.Exception(() => runner.Initialize());
+											Assert.Null(ex);
+										});
+
+									yield return For(
+										$"handles created partition \"{expectedPartition}\" at {er.EventNumber}@{sequence.Stream}",
+										() => {
+											var result = runner.ProcessPartitionCreated(expectedPartition,
+												CheckpointTag.Empty, e, out var emittedEvents);
+											if (emittedEvents != null && emittedEvents.Length > 0) {
+												actualEmittedEvents.AddRange(emittedEvents);
+											}
+
+											Assert.True(result);
+										});
+								}
+							}
+
+							yield return For(
+								$"process event {@event.EventType} at {er.EventNumber}@{sequence.Stream}",
+								() => {
+									Assert.True(runner.ProcessEvent(expectedPartition, CheckpointTag.Empty, "", e,
+										out var newState, out var newSharedState, out var emittedEvents), "Process event should always return true");
+									if (newSharedState != null)
+										partitionedState[""] = newSharedState;
+									partitionedState[expectedPartition] = newState;
+									if (emittedEvents != null && emittedEvents.Length > 0) {
+										actualEmittedEvents.AddRange(emittedEvents);
+									}
+								});
+							if (@event.ExpectedStates.Any()) {
+								foreach (var expectedState in @event.ExpectedStates) {
+									yield return For(
+										$"state \"{expectedState.Key}\" exists at {er.EventNumber}@{sequence.Stream}",
+										() => Assert.Contains(expectedState.Key,
+											(IReadOnlyDictionary<string, string>)partitionedState));
+									yield return For(
+										$"state \"{expectedState.Key}\" is correct at {er.EventNumber}@{sequence.Stream}",
+										() => {
+											if (string.IsNullOrEmpty(expectedState.Value)) {
+												Assert.Null(partitionedState[expectedState.Key]);
+											} else {
+												Assert.True(partitionedState.ContainsKey(expectedState.Key), $"partition does not contain key {expectedState.Key}");
+												Assert.NotNull(partitionedState[expectedState.Key]);
+												Assert.NotEmpty(partitionedState[expectedState.Key]);
+												var expected = Sort(expectedState.Value, "expected");
+												var actual = Sort(partitionedState[expectedState.Key], "actual");
+												Assert.Equal(expected.ToString(Formatting.Indented),
+													actual.ToString(Formatting.Indented));
+											}
+										});
+								}
+							}
+						}
+					}
+
+					revision[sequence.Stream] = revision[sequence.Stream] + 1;
+				}
+
+
+			}
+
+			if (expectedEmittedEvents.Count == 0) {
+				yield return For("Should have no emitted events", () => {
+					Assert.Empty(actualEmittedEvents);
+				});
+			} else {
+				foreach (var emitted in expectedEmittedEvents) {
+					yield return For(
+						$"Expected event {emitted.StreamId} {emitted.Type} {(emitted.Type == "$>" ? emitted.Data : "")} was emitted",
+						() => {
+							Assert.Contains(actualEmittedEvents, eee => eee.Event.Data == emitted.Data);
+						});
+				}
+			}
+
+			object[] For(string name, Action a) {
+				return new object[]{ new TestDefinition(Name(name),_ => {
+					a();
+					return default;
+				})};
+			}
+
+			object[] WithOutput(string name, Action<ITestOutputHelper> a) {
+				return new object[]{ new TestDefinition(Name(name),o => {
+					a(o);
+					return default;
+				})};
+			}
+
+			string Name(string name) {
+				if (name.StartsWith(projection!))
+					return name;
+				return $"{projection} {name}";
+			}
+		}
+
+		static JObject Sort(string json, string name) {
+			JObject root;
+			try {
+				root = JObject.Parse(json);
+			} catch {
+				throw;
+			}
+			return new(root.Properties().OrderBy(x => x.Name));
+		}
+	}
+
+	[Theory]
+	[MemberData(nameof(GetTestCases))]
+	public Task Test(TestDefinition def) {
+		return def.Execute(_output).AsTask();
+	}
+
+	public class TestDefinition {
+		private readonly string _name;
+		private readonly Func<ITestOutputHelper, ValueTask> _step;
+
+		public TestDefinition(string name, Func<ITestOutputHelper, ValueTask> step) {
+			_name = name;
+			_step = step;
+		}
+
+		public ValueTask Execute(ITestOutputHelper output) {
+			return _step(output);
+		}
+
+		public override string ToString() {
+			return _name;
+		}
+	}
+
+	class InputEventSequence {
+		public string Stream { get; }
+		private readonly List<InputEvent> _events;
+		public List<InputEvent> Events => _events;
+
+		public InputEventSequence(string stream) {
+			Stream = stream;
+			_events = new List<InputEvent>();
+		}
+	}
+
+	class InputEvent {
+		public string EventType { get; }
+		public string Body { get; }
+		public string Metadata { get; }
+		public IReadOnlyList<string> InitializedPartitions { get; }
+		public IReadOnlyDictionary<string, string> ExpectedStates { get; }
+		public bool Skip { get; }
+		public Guid EventId { get; }
+
+		public InputEvent(string eventType, string body, string metadata, IReadOnlyList<string> initializedPartitions, IReadOnlyDictionary<string, string> expectedStates, bool skip, Guid eventId) {
+			EventType = eventType;
+			Body = body;
+			Metadata = metadata;
+			InitializedPartitions = initializedPartitions;
+			ExpectedStates = expectedStates;
+			Skip = skip;
+			EventId = eventId;
+		}
+	}
+
+	class OutputEvent {
+		public string StreamId { get; }
+		public string Type { get; }
+		public string Data { get; }
+		public string Metadata { get; }
+
+		public OutputEvent(string streamId, string type, string data, string metadata) {
+			StreamId = streamId;
+			Type = type;
+			Data = data;
+			Metadata = metadata;
+		}
+	}
+}
diff --git a/src/EventStore.Projections.Core.Javascript.Tests/Specs/account-balancer.js b/src/KurrentDB.Projections.Core.Javascript.Tests/Specs/account-balancer.js
similarity index 100%
rename from src/EventStore.Projections.Core.Javascript.Tests/Specs/account-balancer.js
rename to src/KurrentDB.Projections.Core.Javascript.Tests/Specs/account-balancer.js
diff --git a/src/EventStore.Projections.Core.Javascript.Tests/Specs/account-closer.js b/src/KurrentDB.Projections.Core.Javascript.Tests/Specs/account-closer.js
similarity index 100%
rename from src/EventStore.Projections.Core.Javascript.Tests/Specs/account-closer.js
rename to src/KurrentDB.Projections.Core.Javascript.Tests/Specs/account-closer.js
diff --git a/src/EventStore.Projections.Core.Javascript.Tests/Specs/account-spec.json b/src/KurrentDB.Projections.Core.Javascript.Tests/Specs/account-spec.json
similarity index 100%
rename from src/EventStore.Projections.Core.Javascript.Tests/Specs/account-spec.json
rename to src/KurrentDB.Projections.Core.Javascript.Tests/Specs/account-spec.json
diff --git a/src/EventStore.Projections.Core.Javascript.Tests/Specs/by-category-spec.json b/src/KurrentDB.Projections.Core.Javascript.Tests/Specs/by-category-spec.json
similarity index 100%
rename from src/EventStore.Projections.Core.Javascript.Tests/Specs/by-category-spec.json
rename to src/KurrentDB.Projections.Core.Javascript.Tests/Specs/by-category-spec.json
diff --git a/src/EventStore.Projections.Core.Javascript.Tests/Specs/by-category.js b/src/KurrentDB.Projections.Core.Javascript.Tests/Specs/by-category.js
similarity index 100%
rename from src/EventStore.Projections.Core.Javascript.Tests/Specs/by-category.js
rename to src/KurrentDB.Projections.Core.Javascript.Tests/Specs/by-category.js
diff --git a/src/EventStore.Projections.Core.Javascript.Tests/Specs/event-data-spec.json b/src/KurrentDB.Projections.Core.Javascript.Tests/Specs/event-data-spec.json
similarity index 100%
rename from src/EventStore.Projections.Core.Javascript.Tests/Specs/event-data-spec.json
rename to src/KurrentDB.Projections.Core.Javascript.Tests/Specs/event-data-spec.json
diff --git a/src/EventStore.Projections.Core.Javascript.Tests/Specs/event-data.js b/src/KurrentDB.Projections.Core.Javascript.Tests/Specs/event-data.js
similarity index 100%
rename from src/EventStore.Projections.Core.Javascript.Tests/Specs/event-data.js
rename to src/KurrentDB.Projections.Core.Javascript.Tests/Specs/event-data.js
diff --git a/src/EventStore.Projections.Core.Javascript.Tests/Specs/sample-events.json b/src/KurrentDB.Projections.Core.Javascript.Tests/Specs/sample-events.json
similarity index 100%
rename from src/EventStore.Projections.Core.Javascript.Tests/Specs/sample-events.json
rename to src/KurrentDB.Projections.Core.Javascript.Tests/Specs/sample-events.json
diff --git a/src/KurrentDB.Projections.Core.Tests/AssertEx.cs b/src/KurrentDB.Projections.Core.Tests/AssertEx.cs
new file mode 100644
index 00000000000..9ab8d624364
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/AssertEx.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests;
+
+public static class AssertEx {
+	public static void AreEqual(IQuerySources expected, IQuerySources actual) {
+		Assert.AreEqual(expected.AllEvents, actual.AllEvents, $"Expected {nameof(expected.AllEvents)} to be {expected.AllEvents} but was {actual.AllEvents}");
+		Assert.AreEqual(expected.AllStreams, actual.AllStreams, $"Expected {nameof(expected.AllStreams)} to be {expected.AllStreams} but was {actual.AllStreams}");
+		Assert.AreEqual(expected.ByCustomPartitions, actual.ByCustomPartitions, $"Expected {nameof(expected.ByCustomPartitions)} to be {expected.ByCustomPartitions} but was {actual.ByCustomPartitions}");
+		Assert.AreEqual(expected.ByStreams, actual.ByStreams, $"Expected {nameof(expected.ByStreams)} to be {expected.ByStreams} but was {actual.ByStreams}");
+		Assert.AreEqual(expected.DefinesFold, actual.DefinesFold, $"Expected {nameof(expected.DefinesFold)} to be {expected.DefinesFold} but was {actual.DefinesFold}");
+		Assert.AreEqual(expected.DefinesStateTransform, actual.DefinesStateTransform, $"Expected {nameof(expected.DefinesStateTransform)} to be {expected.DefinesStateTransform} but was {actual.DefinesStateTransform}");
+
+		Assert.AreEqual(expected.IncludeLinksOption, actual.IncludeLinksOption, $"Expected {nameof(expected.IncludeLinksOption)} to be {expected.IncludeLinksOption} but was {actual.IncludeLinksOption}");
+		Assert.AreEqual(expected.IsBiState, actual.IsBiState, $"Expected {nameof(expected.IsBiState)} to be {expected.IsBiState} but was {actual.IsBiState}");
+		Assert.AreEqual(expected.LimitingCommitPosition, actual.LimitingCommitPosition, $"Expected {nameof(expected.LimitingCommitPosition)} to be {expected.LimitingCommitPosition} but was {actual.LimitingCommitPosition}");
+		Assert.AreEqual(expected.PartitionResultStreamNamePatternOption, actual.PartitionResultStreamNamePatternOption, $"Expected {nameof(expected.PartitionResultStreamNamePatternOption)} to be {expected.PartitionResultStreamNamePatternOption} but was {actual.PartitionResultStreamNamePatternOption}");
+		Assert.AreEqual(expected.ProcessingLagOption, actual.ProcessingLagOption, $"Expected {nameof(expected.ProcessingLagOption)} to be {expected.ProcessingLagOption} but was {actual.ProcessingLagOption}");
+		Assert.AreEqual(expected.ProducesResults, actual.ProducesResults, $"Expected {nameof(expected.ProducesResults)} to be {expected.ProducesResults} but was {actual.ProducesResults}");
+		Assert.AreEqual(expected.ReorderEventsOption, actual.ReorderEventsOption, $"Expected {nameof(expected.ReorderEventsOption)} to be {expected.ReorderEventsOption} but was {actual.ReorderEventsOption}");
+		Assert.AreEqual(expected.ResultStreamNameOption, actual.ResultStreamNameOption, $"Expected {nameof(expected.ResultStreamNameOption)} to be {expected.ResultStreamNameOption} but was {actual.ResultStreamNameOption}");
+		Assert.AreEqual(expected.HandlesDeletedNotifications, actual.HandlesDeletedNotifications, $"Expected {nameof(expected.HandlesDeletedNotifications)} to be {expected.HandlesDeletedNotifications} but was {actual.HandlesDeletedNotifications}");
+		AssertWithName(nameof(expected.Categories), expected.Categories, actual.Categories);
+		AssertWithName(nameof(expected.Events), expected.Events, actual.Events);
+		AssertWithName(nameof(expected.Streams), expected.Streams, actual.Streams);
+
+		static void AssertWithName(string name, string[] expected, string[] actual) {
+			try {
+				Assert.AreEqual(expected, actual);
+			} catch (Exception ex) {
+				var msg = name + ex.Message;
+				throw new Exception(msg);
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/CallbackSubscriber.cs b/src/KurrentDB.Projections.Core.Tests/CallbackSubscriber.cs
new file mode 100644
index 00000000000..8f043fef3c9
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/CallbackSubscriber.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Projections.Core.Tests;
+
+public static class CallbackSubscriber {
+	class Impl<T> : IHandle<T> where T : Message {
+		private readonly Action<T> _callback;
+
+		public Impl(Action<T> callback) {
+			_callback = callback;
+		}
+
+		public void Handle(T message) {
+			_callback(message);
+		}
+	}
+
+	public static IHandle<T> Create<T>(Action<T> callback) where T : Message {
+		return new Impl<T>(callback);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/Cluster/specification_with_standard_projections_runnning.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/Cluster/specification_with_standard_projections_runnning.cs
new file mode 100644
index 00000000000..88be766cdc1
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/Cluster/specification_with_standard_projections_runnning.cs
@@ -0,0 +1,308 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Common.Log;
+using EventStore.ClientAPI.Projections;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+using ExpectedVersion = EventStore.ClientAPI.ExpectedVersion;
+using ResolvedEvent = EventStore.ClientAPI.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.Cluster;
+
+[Category("ClientAPI")]
+public abstract class specification_with_standard_projections_runnning<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	protected MiniClusterNode<TLogFormat, TStreamId>[] _nodes = new MiniClusterNode<TLogFormat, TStreamId>[3];
+	protected Endpoints[] _nodeEndpoints = new Endpoints[3];
+	protected IEventStoreConnection _conn;
+	private readonly ProjectionsSubsystem[] _projections = new ProjectionsSubsystem[3];
+	protected UserCredentials _admin = DefaultData.AdminCredentials;
+	protected ProjectionsManager _manager;
+
+	protected class Endpoints {
+		public readonly IPEndPoint InternalTcp;
+		public readonly IPEndPoint ExternalTcp;
+		public readonly IPEndPoint HttpEndPoint;
+		private readonly int[] _ports;
+
+		public Endpoints(int internalTcp, int externalTcp, int httpPort) {
+			var testIp = Environment.GetEnvironmentVariable("ES-TESTIP");
+
+			var address = string.IsNullOrEmpty(testIp) ? IPAddress.Loopback : IPAddress.Parse(testIp);
+			InternalTcp = new IPEndPoint(address, internalTcp);
+			ExternalTcp = new IPEndPoint(address, externalTcp);
+			HttpEndPoint = new IPEndPoint(address, httpPort);
+
+			_ports = new[] { internalTcp, httpPort, externalTcp };
+		}
+
+		public IEnumerable<int> Ports => _ports;
+	}
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+#if (!DEBUG)
+            Assert.Ignore("These tests require DEBUG conditional");
+#else
+		_nodeEndpoints[0] = new Endpoints(
+			PortsHelper.GetAvailablePort(IPAddress.Loopback),
+			PortsHelper.GetAvailablePort(IPAddress.Loopback),
+			PortsHelper.GetAvailablePort(IPAddress.Loopback));
+		_nodeEndpoints[1] = new Endpoints(
+			PortsHelper.GetAvailablePort(IPAddress.Loopback),
+			PortsHelper.GetAvailablePort(IPAddress.Loopback),
+			PortsHelper.GetAvailablePort(IPAddress.Loopback));
+		_nodeEndpoints[2] = new Endpoints(
+			PortsHelper.GetAvailablePort(IPAddress.Loopback),
+			PortsHelper.GetAvailablePort(IPAddress.Loopback),
+			PortsHelper.GetAvailablePort(IPAddress.Loopback));
+
+		_nodes[0] = CreateNode(0,
+			_nodeEndpoints[0], new[] { _nodeEndpoints[0].HttpEndPoint });
+		_nodes[1] = CreateNode(1,
+			_nodeEndpoints[1], new[] { _nodeEndpoints[1].HttpEndPoint });
+		_nodes[2] = CreateNode(2,
+			_nodeEndpoints[2], new[] { _nodeEndpoints[2].HttpEndPoint });
+		WaitIdle();
+
+		var projectionsStarted = _projections.Select(p => SystemProjections.Created(p.LeaderInputBus)).ToArray();
+
+		foreach (var node in _nodes) {
+			await node.Start();
+			node.WaitIdle();
+		}
+
+		await Task.WhenAll(_nodes.Select(x => x.Started)).WithTimeout(TimeSpan.FromSeconds(30));
+
+		_conn = EventStoreConnection.Create(_nodes[0].ExternalTcpEndPoint);
+		await _conn.ConnectAsync().WithTimeout();
+
+		_manager = new ProjectionsManager(
+			new ConsoleLogger(),
+			_nodes.Single(x => x.NodeState == VNodeState.Leader).HttpEndPoint,
+			TimeSpan.FromMilliseconds(10000));
+
+		if (GivenStandardProjectionsRunning()) {
+			await Task.WhenAny(projectionsStarted).WithTimeout(TimeSpan.FromSeconds(10));
+			await EnableStandardProjections().WithTimeout(TimeSpan.FromMinutes(2));
+		}
+
+		WaitIdle();
+
+		try {
+			await Given().WithTimeout();
+		} catch (Exception ex) {
+			throw new Exception("Given Failed", ex);
+		}
+
+		try {
+			await When().WithTimeout();
+		} catch (Exception ex) {
+			throw new Exception("When Failed", ex);
+		}
+#endif
+	}
+
+	private MiniClusterNode<TLogFormat, TStreamId> CreateNode(int index, Endpoints endpoints, EndPoint[] gossipSeeds) {
+		_projections[index] = new ProjectionsSubsystem(new ProjectionSubsystemOptions(1, ProjectionType.All, false, TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault), Opts.FaultOutOfOrderProjectionsDefault, 500, 250, Opts.MaxProjectionStateSizeDefault));
+		var node = new MiniClusterNode<TLogFormat, TStreamId>(
+			PathName, index, endpoints.InternalTcp,
+			endpoints.ExternalTcp, endpoints.HttpEndPoint,
+			subsystems: [_projections[index]], gossipSeeds: gossipSeeds);
+		return node;
+	}
+
+	[TearDown]
+	public async Task PostTestAsserts() {
+		var all = await _manager.ListAllAsync(_admin);
+		if (all.Any(p => p.Name == "Faulted"))
+			Assert.Fail("Projections faulted while running the test" + "\r\n" + all);
+	}
+
+	protected async Task EnableStandardProjections() {
+		await EnableProjection(ProjectionNamesBuilder.StandardProjections.EventByCategoryStandardProjection);
+		await EnableProjection(ProjectionNamesBuilder.StandardProjections.EventByTypeStandardProjection);
+		await EnableProjection(ProjectionNamesBuilder.StandardProjections.StreamByCategoryStandardProjection);
+		await EnableProjection(ProjectionNamesBuilder.StandardProjections.StreamsStandardProjection);
+	}
+
+	protected async Task DisableStandardProjections() {
+		await DisableProjection(ProjectionNamesBuilder.StandardProjections.EventByCategoryStandardProjection);
+		await DisableProjection(ProjectionNamesBuilder.StandardProjections.EventByTypeStandardProjection);
+		await DisableProjection(ProjectionNamesBuilder.StandardProjections.StreamByCategoryStandardProjection);
+		await DisableProjection(ProjectionNamesBuilder.StandardProjections.StreamsStandardProjection);
+	}
+
+	protected virtual bool GivenStandardProjectionsRunning() {
+		return true;
+	}
+
+	protected async Task EnableProjection(string name) {
+		for (int i = 1; i <= 10; i++) {
+			try {
+				await _manager.EnableAsync(name, _admin);
+			} catch (Exception) {
+				if (i == 10)
+					throw;
+				await Task.Delay(5000);
+			}
+		}
+
+		await Task.Delay(1000); /* workaround for race condition when multiple projections are being enabled simultaneously */
+	}
+
+	protected Task DisableProjection(string name) {
+		return _manager.DisableAsync(name, _admin);
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		_conn.Close();
+		await Task.WhenAll(
+			_nodes[0].Shutdown(),
+			_nodes[1].Shutdown(),
+			_nodes[2].Shutdown());
+		await base.TestFixtureTearDown();
+	}
+
+	protected virtual Task When() => Task.CompletedTask;
+
+	protected virtual Task Given() => Task.CompletedTask;
+
+	protected Task PostEvent(string stream, string eventType, string data) {
+		return _conn.AppendToStreamAsync(stream, ExpectedVersion.Any, new[] { CreateEvent(eventType, data) });
+	}
+
+	protected Task HardDeleteStream(string stream) {
+		return _conn.DeleteStreamAsync(stream, ExpectedVersion.Any, true, _admin);
+	}
+
+	protected Task SoftDeleteStream(string stream) {
+		return _conn.DeleteStreamAsync(stream, ExpectedVersion.Any, false, _admin);
+	}
+
+	protected static EventData CreateEvent(string type, string data) {
+		return new EventData(Guid.NewGuid(), type, true, Encoding.UTF8.GetBytes(data), new byte[0]);
+	}
+
+	protected void WaitIdle() {
+#if DEBUG
+		_nodes[0].WaitIdle();
+		_nodes[1].WaitIdle();
+		_nodes[2].WaitIdle();
+#endif
+	}
+
+#pragma warning disable 1998
+	protected async Task AssertStreamTailAsync(string streamId, params string[] events) {
+#pragma warning restore 1998
+#if DEBUG
+		var result = await _conn.ReadStreamEventsBackwardAsync(streamId, -1, events.Length, true, _admin);
+		switch (result.Status) {
+			case SliceReadStatus.StreamDeleted:
+				Assert.Fail("Stream '{0}' is deleted", streamId);
+				break;
+			case SliceReadStatus.StreamNotFound:
+				Assert.Fail("Stream '{0}' does not exist", streamId);
+				break;
+			case SliceReadStatus.Success:
+				var resultEventsReversed = result.Events.Reverse().ToArray();
+				if (resultEventsReversed.Length < events.Length)
+					DumpFailed("Stream does not contain enough events", streamId, events, result.Events);
+				else {
+					for (var index = 0; index < events.Length; index++) {
+						var parts = events[index].Split(new char[] { ':' }, 2);
+						var eventType = parts[0];
+						var eventData = parts[1];
+
+						if (resultEventsReversed[index].Event.EventType != eventType)
+							DumpFailed("Invalid event type", streamId, events, resultEventsReversed);
+						else if (resultEventsReversed[index].Event.DebugDataView() != eventData)
+							DumpFailed("Invalid event body", streamId, events, resultEventsReversed);
+					}
+				}
+
+				break;
+		}
+#endif
+	}
+
+#pragma warning disable 1998
+	protected async Task DumpStreamAsync(string streamId) {
+#pragma warning restore 1998
+#if DEBUG
+		var result = await _conn.ReadStreamEventsBackwardAsync(streamId, -1, 100, true, _admin);
+		switch (result.Status) {
+			case SliceReadStatus.StreamDeleted:
+				Assert.Fail("Stream '{0}' is deleted", streamId);
+				break;
+			case SliceReadStatus.StreamNotFound:
+				Assert.Fail("Stream '{0}' does not exist", streamId);
+				break;
+			case SliceReadStatus.Success:
+				Dump("Dumping..", streamId, result.Events.Reverse().ToArray());
+				break;
+		}
+#endif
+	}
+
+#if DEBUG
+	private void DumpFailed(string message, string streamId, string[] events, ResolvedEvent[] resultEvents) {
+		var expected = events.Aggregate("", (a, v) => a + ", " + v);
+		var actual = resultEvents.Aggregate(
+			"", (a, v) => a + ", " + v.Event.EventType + ":" + v.Event.DebugDataView());
+
+		var actualMeta = resultEvents.Aggregate(
+			"", (a, v) => a + "\r\n" + v.Event.EventType + ":" + v.Event.DebugMetadataView());
+
+
+		Assert.Fail(
+			"Stream: '{0}'\r\n{1}\r\n\r\nExisting events: \r\n{2}\r\n Expected events: \r\n{3}\r\n\r\nActual metas:{4}",
+			streamId,
+			message, actual, expected, actualMeta);
+	}
+
+	private void Dump(string message, string streamId, ResolvedEvent[] resultEvents) {
+		var actual = resultEvents.Aggregate(
+			"", (a, v) => a + ", " + v.OriginalEvent.EventType + ":" + v.OriginalEvent.DebugDataView());
+
+		var actualMeta = resultEvents.Aggregate(
+			"", (a, v) => a + "\r\n" + v.OriginalEvent.EventType + ":" + v.OriginalEvent.DebugMetadataView());
+
+		Debug.WriteLine(
+			"Stream: '{0}'\r\n{1}\r\n\r\nExisting events: \r\n{2}\r\n \r\nActual metas:{3}", streamId,
+			message, actual, actualMeta);
+	}
+#endif
+
+	protected async Task PostProjection(string query) {
+		await _manager.CreateContinuousAsync("test-projection", query, _admin);
+		WaitIdle();
+	}
+}
+
+[Explicit]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class vnode_cluster_specification<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	[Test, Explicit]
+	public async Task vnode_cluster_starts() {
+		await PostProjection(@"fromStream('$user-admin').outputState()");
+		await AssertStreamTailAsync("$projections-test-projection-result", "Result:{}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/RecordedEventExtensions.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/RecordedEventExtensions.cs
new file mode 100644
index 00000000000..51150fac14c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/RecordedEventExtensions.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text;
+using EventStore.ClientAPI;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI;
+
+internal static class RecordedEventExtensions {
+	public static string DebugDataView(this RecordedEvent source) => Encoding.UTF8.GetString(source.Data);
+	public static string DebugMetadataView(this RecordedEvent source) => Encoding.UTF8.GetString(source.Metadata);
+}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/event_by_type_index.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/event_by_type_index.cs
similarity index 88%
rename from src/EventStore.Projections.Core.Tests/ClientAPI/event_by_type_index.cs
rename to src/KurrentDB.Projections.Core.Tests/ClientAPI/event_by_type_index.cs
index b9d5f093e25..6d06110a7b6 100644
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/event_by_type_index.cs
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/event_by_type_index.cs
@@ -1,9 +1,11 @@
-using System;
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System.Threading.Tasks;
-using EventStore.Core.Tests;
+using KurrentDB.Core.Tests;
 using NUnit.Framework;
 
-namespace EventStore.Projections.Core.Tests.ClientAPI {
+namespace KurrentDB.Projections.Core.Tests.ClientAPI {
 	namespace event_by_type_index {
 		public abstract class with_existing_events<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
 			protected override async Task Given() {
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/event_by_type_index/when_reverting_after_index_catches_up.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/event_by_type_index/when_reverting_after_index_catches_up.cs
new file mode 100644
index 00000000000..5a8b2db42f4
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/event_by_type_index/when_reverting_after_index_catches_up.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.event_by_type_index;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_reverting_after_index_catches_up<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		WaitIdle();
+		await PostProjection(@"
+fromAll().foreachStream().when({
+    $init: function(){return {a:0}},
+    type1: function(s,e){s.a++},
+    type2: function(s,e){s.a++},
+    $deleted: function(s,e){s.deleted=1;},
+}).outputState();
+");
+		await _manager.AbortAsync("test-projection", _admin);
+		WaitIdle();
+
+		await EnableStandardProjections();
+		WaitIdle();
+		await DisableStandardProjections();
+		WaitIdle();
+		await EnableStandardProjections();
+		WaitIdle();
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await _manager.EnableAsync("test-projection", _admin);
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":1}", "Result:{\"a\":2}");
+		await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":1}", "Result:{\"a\":2}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/list_projections.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/list_projections.cs
new file mode 100644
index 00000000000..86b453c45ba
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/list_projections.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class list_projections<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	const string TestProjection =
+		"fromAll().when({$init: function (state, ev) {return {};},ConversationStarted: function (state, ev) {state.lastBatchSent = ev;return state;}});";
+
+	[Test]
+	public async Task list_all_projections_works() {
+		var x = await _manager.ListAllAsync(new UserCredentials("admin", "changeit"));
+		Assert.AreEqual(true, x.Any());
+		Assert.IsTrue(x.Any(p => p.Name == "$streams"));
+	}
+
+	[Test]
+	public async Task list_oneTime_projections_works() {
+		await _manager.CreateOneTimeAsync(TestProjection, new UserCredentials("admin", "changeit"));
+		var x = await _manager.ListOneTimeAsync(new UserCredentials("admin", "changeit"));
+		Assert.AreEqual(true, x.Any(p => p.Mode == "OneTime"));
+	}
+
+	[Test]
+	public async Task list_continuous_projections_works() {
+		var nameToTest = Guid.NewGuid().ToString();
+		await _manager.CreateContinuousAsync(nameToTest, TestProjection, new UserCredentials("admin", "changeit"));
+		var x = await _manager.ListContinuousAsync(new UserCredentials("admin", "changeit"));
+		Assert.AreEqual(true, x.Any(p => p.Name == nameToTest));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/projectionsManager/SpecificationWithNodeAndProjectionsManager.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/projectionsManager/SpecificationWithNodeAndProjectionsManager.cs
new file mode 100644
index 00000000000..5e063642665
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/projectionsManager/SpecificationWithNodeAndProjectionsManager.cs
@@ -0,0 +1,130 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Common.Log;
+using EventStore.ClientAPI.Projections;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.ClientAPI.Helpers;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.projectionsManager;
+
+public abstract class SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	protected MiniNode<TLogFormat, TStreamId> _node;
+	protected ProjectionsManager _projManager;
+	protected IEventStoreConnection _connection;
+	protected UserCredentials _credentials;
+	protected TimeSpan _timeout;
+	protected string _tag;
+	private Task _systemProjectionsCreated;
+	private ProjectionsSubsystem _projectionsSubsystem;
+
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+		_credentials = new UserCredentials(SystemUsers.Admin, SystemUsers.DefaultAdminPassword);
+		_timeout = TimeSpan.FromSeconds(20);
+		// Check if a node is running in ProjectionsManagerTestSuiteMarkerBase
+		_tag = "_1";
+
+		_node = CreateNode();
+		await _node.Start().WithTimeout(_timeout);
+
+		await _systemProjectionsCreated.WithTimeout(_timeout);
+
+		_connection = TestConnection.Create(_node.TcpEndPoint);
+		await _connection.ConnectAsync();
+
+		_projManager = new ProjectionsManager(new ConsoleLogger(), _node.HttpEndPoint, _timeout, _node.HttpMessageHandler);
+		try {
+			await Given().WithTimeout(_timeout);
+		} catch (Exception ex) {
+			throw new Exception("Given Failed", ex);
+		}
+
+		try {
+			await When().WithTimeout(_timeout);
+		} catch (Exception ex) {
+			throw new Exception("When Failed", ex);
+		}
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		_connection.Close();
+		await _node.Shutdown();
+
+		await base.TestFixtureTearDown();
+	}
+
+	public abstract Task Given();
+	public abstract Task When();
+
+	protected MiniNode<TLogFormat, TStreamId> CreateNode() {
+		_projectionsSubsystem = new ProjectionsSubsystem(new ProjectionSubsystemOptions(1, ProjectionType.All, false, TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault), Opts.FaultOutOfOrderProjectionsDefault, 500, 250, Opts.MaxProjectionStateSizeDefault));
+		_systemProjectionsCreated = SystemProjections.Created(_projectionsSubsystem.LeaderInputBus);
+		return new MiniNode<TLogFormat, TStreamId>(
+			PathName, inMemDb: true,
+			subsystems: [_projectionsSubsystem]);
+	}
+
+	protected EventData CreateEvent(string eventType, string data) {
+		return new EventData(Guid.NewGuid(), eventType, true, Encoding.UTF8.GetBytes(data), null);
+	}
+
+	protected Task PostEvent(string stream, string eventType, string data) {
+		return _connection.AppendToStreamAsync(stream, ExpectedVersion.Any, new[] { CreateEvent(eventType, data) });
+	}
+
+	protected Task CreateOneTimeProjection() {
+		var query = CreateStandardQuery(Guid.NewGuid().ToString());
+		return _projManager.CreateOneTimeAsync(query, _credentials);
+	}
+
+	protected Task CreateContinuousProjection(string projectionName) {
+		var query = CreateStandardQuery(Guid.NewGuid().ToString());
+		return _projManager.CreateContinuousAsync(projectionName, query, _credentials);
+	}
+
+	protected string CreateStandardQuery(string stream) {
+		return @"fromStream(""" + stream + @""")
+                .when({
+                    ""$any"":function(s,e) {
+                        s.count = 1;
+                        return s;
+                    }
+            });";
+	}
+
+	protected string CreateEmittingQuery(string stream, string emittingStream) {
+		return @"fromStream(""" + stream + @""")
+                .when({
+                    ""$any"":function(s,e) {
+                        emit(""" + emittingStream + @""", ""emittedEvent"", e);
+                    }
+                });";
+	}
+
+	private List<string> _systemProjections =>
+		typeof(ProjectionNamesBuilder.StandardProjections).GetFields(
+				BindingFlags.Public |
+				BindingFlags.Static |
+				BindingFlags.FlattenHierarchy)
+			.Where(x => x.IsLiteral && !x.IsInitOnly)
+			.Select(x => x.GetRawConstantValue().ToString())
+			.ToList();
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/projectionsManager/projectionsManagerTests.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/projectionsManager/projectionsManagerTests.cs
new file mode 100644
index 00000000000..e6255178f68
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/projectionsManager/projectionsManagerTests.cs
@@ -0,0 +1,355 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using EventStore.ClientAPI.Projections;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Tests;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.projectionsManager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+[Category("ProjectionsManager")]
+public class when_creating_one_time_projection<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
+	private string _streamName;
+	private string _query;
+
+	public override async Task Given() {
+		_streamName = "test-stream-" + Guid.NewGuid().ToString();
+		await PostEvent(_streamName, "testEvent", "{\"A\":\"1\"}");
+		await PostEvent(_streamName, "testEvent", "{\"A\":\"2\"}");
+
+		_query = CreateStandardQuery(_streamName);
+	}
+
+	public override Task When() {
+		return _projManager.CreateOneTimeAsync(_query, _credentials);
+	}
+
+	[Test]
+	public async Task should_create_projection() {
+		var projections = await _projManager.ListOneTimeAsync(_credentials);
+		Assert.AreEqual(1, projections.Count);
+	}
+}
+
+[Category("ProjectionsManager")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_creating_transient_projection<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
+	private string _streamName;
+	private string _projectionName;
+	private string _query;
+
+	public override async Task Given() {
+		_streamName = "test-stream-" + Guid.NewGuid().ToString();
+		_projectionName = "when_creating_transient_projection";
+		await PostEvent(_streamName, "testEvent", "{\"A\":\"1\"}");
+		await PostEvent(_streamName, "testEvent", "{\"A\":\"2\"}");
+
+		_query = CreateStandardQuery(_streamName);
+	}
+
+	public override Task When() {
+		return _projManager.CreateTransientAsync(_projectionName, _query, _credentials);
+	}
+
+	[Test]
+	public async Task should_create_projection() {
+		var status = await _projManager.GetStatusAsync(_projectionName, _credentials);
+		Assert.IsNotEmpty(status);
+	}
+}
+
+[Category("ProjectionsManager")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_creating_continuous_projection<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
+	private string _streamName;
+	private string _emittedStreamName;
+	private string _projectionName;
+	private string _query;
+	private string _projectionId;
+
+	public override async Task Given() {
+		_streamName = "test-stream-" + Guid.NewGuid().ToString();
+		_projectionName = "when_creating_continuous_projection";
+		_emittedStreamName = "emittedStream-" + Guid.NewGuid().ToString();
+		await PostEvent(_streamName, "testEvent", "{\"A\":\"1\"}");
+		await PostEvent(_streamName, "testEvent", "{\"A\":\"2\"}");
+
+		_query = CreateEmittingQuery(_streamName, _emittedStreamName);
+	}
+
+	public override Task When() {
+		return _projManager.CreateContinuousAsync(_projectionName, _query, _credentials);
+	}
+
+	[Test]
+	public async Task should_create_projection() {
+		var allProjections = await _projManager.ListContinuousAsync(_credentials);
+		var proj = allProjections.FirstOrDefault(x => x.EffectiveName == _projectionName);
+		_projectionId = proj.Name;
+		Assert.IsNotNull(proj);
+	}
+
+	[Test]
+	public async Task should_have_turn_on_emit_to_stream() {
+		var events = await _connection
+			.ReadEventAsync(string.Format("$projections-{0}", _projectionId), 0, true, _credentials);
+		var data = Encoding.UTF8.GetString(events.Event.Value.Event.Data);
+		var eventData = data.ParseJson<JObject>();
+		Assert.IsTrue((bool)eventData["emitEnabled"]);
+	}
+}
+
+[Category("ProjectionsManager")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_creating_continuous_projection_with_track_emitted_streams<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
+	private string _streamName;
+	private string _emittedStreamName;
+	private string _projectionName;
+	private string _query;
+	private string _projectionId;
+
+	public override async Task Given() {
+		_streamName = "test-stream-" + Guid.NewGuid().ToString();
+		_projectionName = "when_creating_continuous_projection_with_track_emitted_streams";
+		_emittedStreamName = "emittedStream-" + Guid.NewGuid().ToString();
+		await PostEvent(_streamName, "testEvent", "{\"A\":\"1\"}");
+
+		_query = CreateEmittingQuery(_streamName, _emittedStreamName);
+	}
+
+	public override Task When() {
+		return _projManager.CreateContinuousAsync(_projectionName, _query, true, _credentials);
+	}
+
+	[Test]
+	public async Task should_create_projection() {
+		var allProjections = await _projManager.ListContinuousAsync(_credentials);
+		var proj = allProjections.FirstOrDefault(x => x.EffectiveName == _projectionName);
+		_projectionId = proj.Name;
+		Assert.IsNotNull(proj);
+	}
+
+	[Test]
+	public async Task should_enable_track_emitted_streams() {
+		var events = await _connection
+			.ReadEventAsync(string.Format("$projections-{0}", _projectionId), 0, true, _credentials);
+		var data = Encoding.UTF8.GetString(events.Event.Value.Event.Data);
+		var eventData = data.ParseJson<JObject>();
+		Assert.IsTrue((bool)eventData["trackEmittedStreams"]);
+	}
+}
+
+[Category("ProjectionsManager")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_disabling_projections<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
+	private string _streamName;
+	private string _projectionName;
+	private string _query;
+
+	public override async Task Given() {
+		_streamName = "test-stream-" + Guid.NewGuid().ToString();
+		_projectionName = "when_disabling_projection";
+		await PostEvent(_streamName, "testEvent", "{\"A\":\"1\"}");
+		await PostEvent(_streamName, "testEvent", "{\"A\":\"2\"}");
+
+		_query = CreateStandardQuery(_streamName);
+
+		await _projManager.CreateContinuousAsync(_projectionName, _query, _credentials);
+	}
+
+	public override Task When() {
+		return _projManager.DisableAsync(_projectionName, _credentials);
+	}
+
+	[Test]
+	public async Task should_stop_the_projection() {
+		var projectionStatus = await _projManager.GetStatusAsync(_projectionName, _credentials);
+		var status = projectionStatus.ParseJson<JObject>()["status"].ToString();
+		Assert.IsTrue(status.Contains("Stopped"));
+	}
+}
+
+[Category("ProjectionsManager")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_enabling_projections<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
+	private string _streamName;
+	private string _projectionName;
+	private string _query;
+
+	public override async Task Given() {
+		_streamName = "test-stream-" + Guid.NewGuid().ToString();
+		_projectionName = "when_enabling_projections";
+		await PostEvent(_streamName, "testEvent", "{\"A\":\"1\"}");
+		await PostEvent(_streamName, "testEvent", "{\"A\":\"2\"}");
+
+		_query = CreateStandardQuery(_streamName);
+
+		await _projManager.CreateContinuousAsync(_projectionName, _query, _credentials);
+		await _projManager.DisableAsync(_projectionName, _credentials);
+	}
+
+	public override Task When() {
+		return _projManager.EnableAsync(_projectionName, _credentials);
+	}
+
+	[Test]
+	public async Task should_reenable_projection() {
+		var projectionStatus = await _projManager.GetStatusAsync(_projectionName, _credentials);
+		var status = projectionStatus.ParseJson<JObject>()["status"].ToString();
+		Assert.IsTrue(status.Contains("Running"));
+	}
+}
+
+[Category("ProjectionsManager")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_listing_the_projections<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
+	private List<ProjectionDetails> _result;
+
+	public override Task Given() {
+		return CreateContinuousProjection(Guid.NewGuid().ToString());
+	}
+
+	public override async Task When() {
+		_result = await _projManager.ListAllAsync(_credentials);
+	}
+
+	[Test]
+	public void should_return_all_projections() {
+		Assert.IsNotEmpty(_result);
+	}
+}
+
+[Category("ProjectionsManager")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_listing_one_time_projections<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
+	private List<ProjectionDetails> _result;
+
+	public override Task Given() {
+		return CreateOneTimeProjection();
+	}
+
+	public override async Task When() {
+		_result = (await _projManager.ListOneTimeAsync(_credentials)).ToList();
+	}
+
+	[Test]
+	public void should_return_projections() {
+		Assert.IsNotEmpty(_result);
+	}
+}
+
+[Category("ProjectionsManager")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_listing_continuous_projections<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
+	private List<ProjectionDetails> _result;
+	private string _projectionName;
+
+	public override Task Given() {
+		_projectionName = Guid.NewGuid().ToString();
+		return CreateContinuousProjection(_projectionName);
+	}
+
+	public override async Task When() {
+		_result = (await _projManager.ListContinuousAsync(_credentials)).ToList();
+	}
+
+	[Test]
+	public void should_return_continuous_projections() {
+		Assert.IsTrue(_result.Any(x => x.EffectiveName == _projectionName));
+	}
+}
+
+[Category("ProjectionsManager")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_a_projection_is_running<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
+	private string _projectionName;
+	private string _streamName;
+	private string _query;
+
+	public override async Task Given() {
+		_projectionName = "when_getting_projection_information";
+		_streamName = "test-stream-" + Guid.NewGuid().ToString();
+
+		await PostEvent(_streamName, "testEvent", "{\"A\":\"1\"}");
+		await PostEvent(_streamName, "testEvent", "{\"A\":\"2\"}");
+	}
+
+	public override Task When() {
+		_query = CreateStandardQuery(_streamName);
+		return _projManager.CreateContinuousAsync(_projectionName, _query, _credentials);
+	}
+
+	[Test]
+	public async Task should_be_able_to_get_the_projection_state() {
+		var state = await _projManager.GetStateAsync(_projectionName, _credentials);
+		Assert.IsNotEmpty(state);
+	}
+
+	[Test]
+	public async Task should_be_able_to_get_the_projection_status() {
+		var status = await _projManager.GetStatusAsync(_projectionName, _credentials);
+		Assert.IsNotEmpty(status);
+	}
+
+	[Test]
+	public async Task should_be_able_to_get_the_projection_result() {
+		var result = await _projManager.GetResultAsync(_projectionName, _credentials);
+		Assert.AreEqual("{\"count\":1}", result);
+	}
+
+	[Test]
+	public async Task should_be_able_to_get_the_projection_query() {
+		var query = await _projManager.GetQueryAsync(_projectionName, _credentials);
+		Assert.AreEqual(_query, query);
+	}
+}
+
+[Category("ProjectionsManager")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_updating_a_projection_query<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
+	private string _projectionName;
+	private string _streamName;
+	private string _newQuery;
+
+	public override async Task Given() {
+		_projectionName = "when_updating_a_projection_query";
+		_streamName = "test-stream-" + Guid.NewGuid().ToString();
+
+		await PostEvent(_streamName, "testEvent", "{\"A\":\"1\"}");
+		await PostEvent(_streamName, "testEvent", "{\"A\":\"2\"}");
+
+		var origQuery = CreateStandardQuery(_streamName);
+		_newQuery = CreateStandardQuery("DifferentStream");
+		await _projManager.CreateContinuousAsync(_projectionName, origQuery, _credentials);
+	}
+
+	public override Task When() {
+		return _projManager.UpdateQueryAsync(_projectionName, _newQuery, _credentials);
+	}
+
+	[Test]
+	public async Task should_update_the_projection_query() {
+		var query = await _projManager.GetQueryAsync(_projectionName, _credentials);
+		Assert.AreEqual(_newQuery, query);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/specification_with_standard_projections_runnning.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/specification_with_standard_projections_runnning.cs
new file mode 100644
index 00000000000..1baf7501854
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/specification_with_standard_projections_runnning.cs
@@ -0,0 +1,259 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Common.Log;
+using EventStore.ClientAPI.Projections;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+using ResolvedEvent = EventStore.ClientAPI.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI;
+
+[Category("ClientAPI")]
+public abstract class specification_with_standard_projections_runnning<TLogFormat, TStreamId> : SpecificationWithDirectoryPerTestFixture {
+	protected IEventStoreConnection _conn;
+	protected UserCredentials _admin = DefaultData.AdminCredentials;
+	protected ProjectionsManager _manager;
+	protected QueryManager _queryManager;
+
+	private Task _projectionsCreated;
+	private ProjectionsSubsystem _projections;
+	private MiniNode<TLogFormat, TStreamId> _node;
+
+	[OneTimeSetUp]
+	public override async Task TestFixtureSetUp() {
+		await base.TestFixtureSetUp();
+
+		var projectionWorkerThreadCount = GivenWorkerThreadCount();
+		var configuration = new ProjectionSubsystemOptions(
+			projectionWorkerThreadCount,
+			ProjectionType.All,
+			false,
+			TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault),
+			Opts.FaultOutOfOrderProjectionsDefault,
+			500,
+			250, Opts.MaxProjectionStateSizeDefault);
+		_projections = new ProjectionsSubsystem(configuration);
+		_node = new MiniNode<TLogFormat, TStreamId>(
+			PathName, inMemDb: true,
+			subsystems: [_projections]);
+		_projectionsCreated = SystemProjections.Created(_projections.LeaderInputBus);
+
+		await _node.Start();
+		_conn = EventStoreConnection.Create(ConnectionSettings.Create()
+			.DisableServerCertificateValidation()
+			.Build(), _node.TcpEndPoint);
+		await _conn.ConnectAsync();
+
+		_manager = new ProjectionsManager(
+			new ConsoleLogger(),
+			_node.HttpEndPoint,
+			TimeSpan.FromMilliseconds(20000),
+			_node.HttpMessageHandler);
+
+		_queryManager = new QueryManager(
+			new ConsoleLogger(),
+			_node.HttpEndPoint,
+			TimeSpan.FromMilliseconds(20000),
+			TimeSpan.FromMilliseconds(20000),
+			_node.HttpMessageHandler);
+
+		WaitIdle();
+
+		if (GivenStandardProjectionsRunning())
+			await EnableStandardProjections();
+
+		WaitIdle();
+		try {
+			await Given().WithTimeout(TimeSpan.FromSeconds(10));
+		} catch (Exception ex) {
+			throw new Exception("Given Failed", ex);
+		}
+
+		try {
+			await When().WithTimeout(TimeSpan.FromSeconds(10));
+		} catch (Exception ex) {
+			throw new Exception("When Failed", ex);
+		}
+	}
+
+	protected virtual int GivenWorkerThreadCount() {
+		return 1;
+	}
+
+	[TearDown]
+	public async Task PostTestAsserts() {
+		var all = await _manager.ListAllAsync(_admin);
+		if (all.Any(p => p.Name == "Faulted"))
+			Assert.Fail("Projections faulted while running the test" + "\r\n" + all);
+	}
+
+	protected async Task EnableStandardProjections() {
+		await _projectionsCreated;
+		await EnableProjection(ProjectionNamesBuilder.StandardProjections.EventByCategoryStandardProjection);
+		await EnableProjection(ProjectionNamesBuilder.StandardProjections.EventByTypeStandardProjection);
+		await EnableProjection(ProjectionNamesBuilder.StandardProjections.StreamByCategoryStandardProjection);
+		await EnableProjection(ProjectionNamesBuilder.StandardProjections.StreamsStandardProjection);
+	}
+
+	protected async Task DisableStandardProjections() {
+		await DisableProjection(ProjectionNamesBuilder.StandardProjections.EventByCategoryStandardProjection);
+		await DisableProjection(ProjectionNamesBuilder.StandardProjections.EventByTypeStandardProjection);
+		await DisableProjection(ProjectionNamesBuilder.StandardProjections.StreamByCategoryStandardProjection);
+		await DisableProjection(ProjectionNamesBuilder.StandardProjections.StreamsStandardProjection);
+	}
+
+	protected virtual bool GivenStandardProjectionsRunning() {
+		return true;
+	}
+
+	protected Task EnableProjection(string name) {
+		return _manager.EnableAsync(name, _admin);
+	}
+
+	protected Task DisableProjection(string name) {
+		return _manager.DisableAsync(name, _admin);
+	}
+
+	[OneTimeTearDown]
+	public override async Task TestFixtureTearDown() {
+		if (_conn != null)
+			_conn.Close();
+
+		if (_node != null)
+			await _node.Shutdown();
+
+		await base.TestFixtureTearDown();
+	}
+
+	protected virtual Task When() => Task.CompletedTask;
+
+	protected virtual Task Given() => Task.CompletedTask;
+
+	protected Task PostEvent(string stream, string eventType, string data) {
+		return _conn.AppendToStreamAsync(stream, ExpectedVersion.Any, CreateEvent(eventType, data));
+	}
+
+	protected Task HardDeleteStream(string stream) {
+		return _conn.DeleteStreamAsync(stream, ExpectedVersion.Any, true, _admin);
+	}
+
+	protected Task SoftDeleteStream(string stream) {
+		return _conn.DeleteStreamAsync(stream, ExpectedVersion.Any, false, _admin);
+	}
+
+	protected static EventData CreateEvent(string type, string data) {
+		return new EventData(Guid.NewGuid(), type, true, Encoding.UTF8.GetBytes(data), new byte[0]);
+	}
+
+	protected void WaitIdle(int multiplier = 1) {
+#if DEBUG
+		_node.WaitIdle();
+#endif
+	}
+
+#pragma warning disable 1998
+	protected async Task AssertStreamTail(string streamId, params string[] events) {
+#pragma warning restore 1998
+#if DEBUG
+		await Task.Delay(TimeSpan.FromMilliseconds(500));
+		var result = await _conn.ReadStreamEventsBackwardAsync(streamId, -1, events.Length, true, _admin);
+		switch (result.Status) {
+			case SliceReadStatus.StreamDeleted:
+				Assert.Fail("Stream '{0}' is deleted", streamId);
+				break;
+			case SliceReadStatus.StreamNotFound:
+				Assert.Fail("Stream '{0}' does not exist", streamId);
+				break;
+			case SliceReadStatus.Success:
+				var resultEventsReversed = result.Events.Reverse().ToArray();
+				if (resultEventsReversed.Length < events.Length)
+					DumpFailed("Stream does not contain enough events", streamId, events, result.Events);
+				else {
+					for (var index = 0; index < events.Length; index++) {
+						var parts = events[index].Split(new char[] { ':' }, 2);
+						var eventType = parts[0];
+						var eventData = parts[1];
+
+						if (resultEventsReversed[index].Event.EventType != eventType)
+							DumpFailed("Invalid event type", streamId, events, resultEventsReversed);
+						else if (resultEventsReversed[index].Event.DebugDataView() != eventData)
+							DumpFailed("Invalid event body", streamId, events, resultEventsReversed);
+					}
+				}
+
+				break;
+		}
+#endif
+	}
+
+#pragma warning disable 1998
+	protected async Task DumpStream(string streamId) {
+#pragma warning restore 1998
+#if DEBUG
+		var result = await _conn.ReadStreamEventsBackwardAsync(streamId, -1, 100, true, _admin);
+		switch (result.Status) {
+			case SliceReadStatus.StreamDeleted:
+				Assert.Fail("Stream '{0}' is deleted", streamId);
+				break;
+			case SliceReadStatus.StreamNotFound:
+				Assert.Fail("Stream '{0}' does not exist", streamId);
+				break;
+			case SliceReadStatus.Success:
+				Dump("Dumping..", streamId, result.Events.Reverse().ToArray());
+				break;
+		}
+#endif
+	}
+
+#if DEBUG
+	private void DumpFailed(string message, string streamId, string[] events, ResolvedEvent[] resultEvents) {
+		var expected = events.Aggregate("", (a, v) => a + ", " + v);
+		var actual = resultEvents.Aggregate(
+			"", (a, v) => a + ", " + v.Event.EventType + ":" + v.Event.DebugDataView());
+
+		var actualMeta = resultEvents.Aggregate(
+			"", (a, v) => a + "\r\n" + v.Event.EventType + ":" + v.Event.DebugMetadataView());
+
+
+		Assert.Fail(
+			"Stream: '{0}'\r\n{1}\r\n\r\nExisting events: \r\n{2}\r\n Expected events: \r\n{3}\r\n\r\nActual metas:{4}",
+			streamId,
+			message, actual, expected, actualMeta);
+	}
+
+	protected void Dump(string message, string streamId, ResolvedEvent[] resultEvents) {
+		var actual = resultEvents.Aggregate(
+			"", (a, v) => a + ", " + v.OriginalEvent.EventType + ":" + v.OriginalEvent.DebugDataView());
+
+		var actualMeta = resultEvents.Aggregate(
+			"", (a, v) => a + "\r\n" + v.OriginalEvent.EventType + ":" + v.OriginalEvent.DebugMetadataView());
+
+
+		Debug.WriteLine(
+			"Stream: '{0}'\r\n{1}\r\n\r\nExisting events: \r\n{2}\r\n \r\nActual metas:{3}", streamId,
+			message, actual, actualMeta);
+	}
+#endif
+
+	protected async Task PostProjection(string query) {
+		await _manager.CreateContinuousAsync("test-projection", query, _admin);
+		WaitIdle();
+	}
+
+	protected async Task PostQuery(string query) {
+		await _manager.CreateTransientAsync("query", query, _admin);
+		WaitIdle();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_executing_query/with_long_from_all_query/when_getting_result.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_executing_query/with_long_from_all_query/when_getting_result.cs
new file mode 100644
index 00000000000..66c0114d1ca
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_executing_query/with_long_from_all_query/when_getting_result.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_executing_query.with_long_from_all_query;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_getting_result<TLogFormat, TStreamId>
+	: specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override async Task Given() {
+		await base.Given();
+
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type1", "{}");
+
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	public async Task waits_for_results() {
+		const string query = @"
+fromAll().when({
+    $init: function(){return {count:0}},
+    type1: function(s,e){
+        var start = new Date();
+        while(new Date()-start < 150){}
+
+        s.count++;
+    },
+});
+";
+
+		var result = await _queryManager
+			.ExecuteAsync("query", query, TimeSpan.FromMilliseconds(100), TimeSpan.FromMilliseconds(5000), _admin)
+;
+		Assert.AreEqual("{\"count\":3}", result);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_executing_query/with_long_from_all_query/when_getting_result_and_timeout_exceeded.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_executing_query/with_long_from_all_query/when_getting_result_and_timeout_exceeded.cs
new file mode 100644
index 00000000000..a4ec03dde24
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_executing_query/with_long_from_all_query/when_getting_result_and_timeout_exceeded.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.ClientAPI.Exceptions;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+using static KurrentDB.Core.Tests.AssertEx;
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_executing_query.with_long_from_all_query;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_getting_result_and_timeout_exceeded<TLogFormat, TStreamId>
+	: specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override async Task Given() {
+		await base.Given();
+
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type1", "{}");
+
+		WaitIdle();
+	}
+
+	[Test, Category("Network"), Timeout(60000)]
+	public async Task throws_exception() {
+		const string query = @"
+fromAll().when({
+    $init: function(){return {count:0}},
+    type1: function(s,e){
+        var start = new Date();
+        while(new Date()-start < 1e7){}
+
+        s.count++;
+    },
+});
+";
+		await ThrowsAsync<OperationTimedOutException>(() => _queryManager.ExecuteAsync("query", query,
+			TimeSpan.FromMilliseconds(100), TimeSpan.FromMilliseconds(5000), _admin));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_created/with_from_all_any_foreach_projection/when_running_and_events_are_posted.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_created/with_from_all_any_foreach_projection/when_running_and_events_are_posted.cs
new file mode 100644
index 00000000000..19e04133c80
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_created/with_from_all_any_foreach_projection/when_running_and_events_are_posted.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_created.with_from_all_any_foreach_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_running_and_events_are_posted<TLogFormat, TStreamId>
+	: specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		WaitIdle();
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await PostProjection(@"
+fromAll().foreachStream().when({
+    $init: function(){return {a:0}},
+    $any: function(s,e) {s.a++;},
+    $created: function(s,e){s.a++;},
+}).outputState();
+");
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	public async Task receives_created_notification() {
+		await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":3}");
+		await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":3}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_created/with_from_all_foreach_projection/when_running_and_events_are_indexed.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_created/with_from_all_foreach_projection/when_running_and_events_are_indexed.cs
new file mode 100644
index 00000000000..ca40ecf03b0
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_created/with_from_all_foreach_projection/when_running_and_events_are_indexed.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_created.with_from_all_foreach_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_running_and_events_are_indexed<TLogFormat, TStreamId>
+	: specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await PostProjection(@"
+fromAll().foreachStream().when({
+    $init: function(){return {a:0}},
+    type1: function(s,e){s.a++;},
+    type2: function(s,e){s.a++;},
+    $created: function(s,e){s.a++;},
+}).outputState();
+");
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":3}");
+		await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":3}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_created/with_from_category_foreach_projection/when_running_and_events_are_indexed.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_created/with_from_category_foreach_projection/when_running_and_events_are_indexed.cs
new file mode 100644
index 00000000000..c79c52e0b32
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_created/with_from_category_foreach_projection/when_running_and_events_are_indexed.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_created.with_from_category_foreach_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_running_and_events_are_indexed<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		WaitIdle();
+		await EnableStandardProjections();
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await PostProjection(@"
+fromCategory('stream').foreachStream().when({
+    $init: function(){return {a:0}},
+    type1: function(s,e){s.a++;},
+    type2: function(s,e){s.a++;},
+    $created: function(s,e){s.a++;},
+}).outputState();
+");
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":3}");
+		await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":3}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/recovery/when_running_and_a_stream_gets_deleted_before_recovery.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/recovery/when_running_and_a_stream_gets_deleted_before_recovery.cs
new file mode 100644
index 00000000000..f0ab88f997b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/recovery/when_running_and_a_stream_gets_deleted_before_recovery.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_any_foreach_projection.
+	recovery;
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_running_and_a_stream_gets_deleted_before_recovery<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		WaitIdle();
+		await PostProjection(@"
+fromAll().foreachStream().when({
+    $init: function(){return {a:0}},
+    $any: function(s,e){s.a++},
+    $deleted: function(s,e){s.deleted=1;},
+}).outputState();
+");
+		WaitIdle();
+		await _manager.AbortAsync("test-projection", _admin);
+		WaitIdle();
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await HardDeleteStream("stream-1");
+		WaitIdle();
+		await _manager.EnableAsync("test-projection", _admin);
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
+		await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":2}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/recovery/when_running_and_events_are_posted.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/recovery/when_running_and_events_are_posted.cs
new file mode 100644
index 00000000000..e1da282726a
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/recovery/when_running_and_events_are_posted.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_any_foreach_projection.
+	recovery;
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_running_and_events_are_posted<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		WaitIdle();
+		await PostProjection(@"
+fromAll().foreachStream().when({
+    $init: function(){return {a:0}},
+    $any: function(s,e){s.a++},
+    $deleted: function(s,e){s.deleted=1;},
+}).outputState();
+");
+		WaitIdle();
+		await HardDeleteStream("stream-1");
+		WaitIdle();
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await _manager.AbortAsync("test-projection", _admin);
+		WaitIdle();
+		await _manager.EnableAsync("test-projection", _admin);
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
+		await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":2}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted.cs
new file mode 100644
index 00000000000..76a8d58cd1e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_any_foreach_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_running_and_events_are_posted<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		await HardDeleteStream("stream-1");
+		WaitIdle();
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await PostProjection(@"
+fromAll().foreachStream().when({
+    $init: function(){return {a:0}},
+    $any: function(s,e){s.a++},
+    $deleted: function(s,e){s.deleted=1;},
+}).outputState();
+");
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
+		await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":2}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted_but_a_stream_and_tombstone_postponed.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted_but_a_stream_and_tombstone_postponed.cs
new file mode 100644
index 00000000000..a69c57cde15
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted_but_a_stream_and_tombstone_postponed.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_any_foreach_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_running_and_events_are_posted_but_a_stream_and_tombstone_postponed<TLogFormat, TStreamId> :
+	specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		WaitIdle();
+
+		await PostProjection(@"
+fromAll().foreachStream().when({
+    $init: function(){return {a:0}},
+    $any: function(s,e){s.a++},
+    $deleted: function(s,e){s.deleted=1;},
+}).outputState();
+");
+		WaitIdle();
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		WaitIdle();
+		await HardDeleteStream("stream-1");
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted_but_tombstone.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted_but_tombstone.cs
new file mode 100644
index 00000000000..e0d1a6011da
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted_but_tombstone.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_any_foreach_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_running_and_events_are_posted_but_tombstone<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		WaitIdle();
+		await PostProjection(@"
+fromAll().foreachStream().when({
+    $init: function(){return {a:0}},
+    $any: function(s,e){s.a++},
+    $deleted: function(s,e){s.deleted=1;},
+}).outputState();
+");
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await HardDeleteStream("stream-1");
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted_including_tombstone.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted_including_tombstone.cs
new file mode 100644
index 00000000000..6e2f9f7316d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_events_are_posted_including_tombstone.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_any_foreach_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_running_and_events_are_posted_including_tombstone<TLogFormat, TStreamId> :
+	specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await HardDeleteStream("stream-1");
+		WaitIdle();
+		await EnableStandardProjections();
+		WaitIdle();
+	}
+
+	protected override async Task When() {
+		await base.When();
+
+		await PostProjection(@"
+fromAll().foreachStream().when({
+    $init: function(){return {a:0}},
+    $any: function(s,e){s.a++},
+    $deleted: function(s,e){s.deleted=1;},
+}).outputState();
+");
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_then_other_events_tombstone_ant_other_events.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_then_other_events_tombstone_ant_other_events.cs
new file mode 100644
index 00000000000..8ecb4c11e89
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_any_foreach_projection/when_running_and_then_other_events_tombstone_ant_other_events.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_any_foreach_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_running_and_then_other_events_tombstone_ant_other_events<TLogFormat, TStreamId> :
+		specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostProjection(@"
+fromAll().foreachStream().when({
+    $init: function(){return {a:0}},
+    $any: function(s,e){s.a++},
+    $deleted: function(s,e){s.deleted=1;},
+}).outputState();
+");
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		WaitIdle();
+		await HardDeleteStream("stream-1");
+		WaitIdle();
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		await PostEvent("stream-3", "type1", "{}");
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail(
+			"$projections-test-projection-stream-1-result", "Result:{\"a\":2}", "Result:{\"a\":2,\"deleted\":1}");
+		await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":4}");
+		await AssertStreamTail("$projections-test-projection-stream-3-result", "Result:{\"a\":1}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/recovery/when_running_and_events_are_indexed.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/recovery/when_running_and_events_are_indexed.cs
new file mode 100644
index 00000000000..753cf642325
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/recovery/when_running_and_events_are_indexed.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_foreach_projection.recovery;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_running_and_events_are_indexed<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		WaitIdle();
+		await EnableStandardProjections();
+		WaitIdle();
+		await PostProjection(@"
+fromAll().foreachStream().when({
+    $init: function(){return {a:0}},
+    type1: function(s,e){s.a++},
+    type2: function(s,e){s.a++},
+    $deleted: function(s,e){s.deleted=1},
+}).outputState();
+");
+		WaitIdle();
+		await HardDeleteStream("stream-1");
+		WaitIdle();
+		await DisableStandardProjections();
+		WaitIdle();
+		await EnableStandardProjections();
+		WaitIdle();
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await _manager.AbortAsync("test-projection", _admin);
+		WaitIdle();
+		await _manager.EnableAsync("test-projection", _admin);
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
+		await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":2}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/recovery/when_running_and_events_get_indexed_before_recovery.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/recovery/when_running_and_events_get_indexed_before_recovery.cs
new file mode 100644
index 00000000000..ed5ca464958
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/recovery/when_running_and_events_get_indexed_before_recovery.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_foreach_projection.recovery;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_running_and_events_get_indexed_before_recovery<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		WaitIdle();
+		await PostProjection(@"
+fromAll().foreachStream().when({
+    $init: function(){return {a:0}},
+    type1: function(s,e){s.a++},
+    type2: function(s,e){s.a++},
+    $deleted: function(s,e){s.deleted=1},
+}).outputState();
+");
+		WaitIdle();
+		await HardDeleteStream("stream-1");
+		WaitIdle();
+		await _manager.AbortAsync("test-projection", _admin);
+		WaitIdle();
+		await EnableStandardProjections();
+		WaitIdle();
+		await DisableStandardProjections();
+		WaitIdle();
+		await EnableStandardProjections();
+		WaitIdle();
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await _manager.EnableAsync("test-projection", _admin);
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
+		await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":2}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed.cs
new file mode 100644
index 00000000000..167626d3bcd
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed.cs
@@ -0,0 +1,59 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_foreach_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_running_and_events_are_indexed<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		WaitIdle();
+		await EnableStandardProjections();
+		WaitIdle();
+		await HardDeleteStream("stream-1");
+		WaitIdle();
+		await DisableStandardProjections();
+		WaitIdle();
+
+		// required to flush index checkpoint
+		{
+			await EnableStandardProjections();
+			WaitIdle();
+			await DisableStandardProjections();
+			WaitIdle();
+		}
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await PostProjection(@"
+fromAll().foreachStream().when({
+    $init: function(){return {}},
+    type1: function(s,e){s.a=(s.a||0) + 1},
+    type2: function(s,e){s.a=(s.a||0) + 1},
+    $deleted: function(s,e){s.deleted=1},
+}).outputState();
+");
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	[Ignore("Regression")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"deleted\":1}");
+		await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":2}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed_but_a_stream_and_tombstone.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed_but_a_stream_and_tombstone.cs
new file mode 100644
index 00000000000..016cf70f43e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed_but_a_stream_and_tombstone.cs
@@ -0,0 +1,59 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_foreach_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_running_and_events_are_indexed_but_a_stream_and_tombstone<TLogFormat, TStreamId> :
+	specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		WaitIdle();
+		await EnableStandardProjections();
+		WaitIdle();
+		await DisableStandardProjections();
+		WaitIdle();
+
+		// required to flush index checkpoint
+		{
+			await EnableStandardProjections();
+			WaitIdle();
+			await DisableStandardProjections();
+			WaitIdle();
+		}
+
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await HardDeleteStream("stream-1");
+		WaitIdle();
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await PostProjection(@"
+fromAll().foreachStream().when({
+    $init: function(){return {a:0}},
+    type1: function(s,e){s.a++},
+    type2: function(s,e){s.a++},
+    $deleted: function(s,e){s.deleted=1},
+}).outputState();
+");
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed_but_more_events_and_tombstone.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed_but_more_events_and_tombstone.cs
new file mode 100644
index 00000000000..9a151e7077a
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed_but_more_events_and_tombstone.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_foreach_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_running_and_events_are_indexed_but_more_events_and_tombstone<TLogFormat, TStreamId> :
+	specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		WaitIdle();
+		await EnableStandardProjections();
+		WaitIdle();
+		await DisableStandardProjections();
+		;
+		WaitIdle();
+
+		// required to flush index checkpoint
+		{
+			await EnableStandardProjections();
+			WaitIdle();
+			await DisableStandardProjections();
+			WaitIdle();
+		}
+
+		await PostEvent("stream-1", "type2", "{}");
+		await HardDeleteStream("stream-1");
+		WaitIdle();
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await PostProjection(@"
+fromAll().foreachStream().when({
+    $init: function(){return {a:0}},
+    type1: function(s,e){s.a++},
+    type2: function(s,e){},
+    $deleted: function(s,e){s.deleted=1},
+}).outputState();
+");
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":0,\"deleted\":1}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed_but_tombstone.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed_but_tombstone.cs
new file mode 100644
index 00000000000..908700b89c6
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_events_are_indexed_but_tombstone.cs
@@ -0,0 +1,59 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_foreach_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_running_and_events_are_indexed_but_tombstone<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		WaitIdle();
+		await EnableStandardProjections();
+		WaitIdle();
+		await DisableStandardProjections();
+		WaitIdle();
+
+		// required to flush index checkpoint
+		{
+			await EnableStandardProjections();
+			WaitIdle();
+			await DisableStandardProjections();
+			WaitIdle();
+		}
+
+
+		await HardDeleteStream("stream-1");
+		WaitIdle();
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await PostProjection(@"
+fromAll().foreachStream().when({
+    $init: function(){return {}},
+    type1: function(s,e){s.a=1},
+    type2: function(s,e){s.a=1},
+    $deleted: function(s,e){s.deleted=1},
+}).outputState();
+");
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"deleted\":1}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_no_indexing.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_no_indexing.cs
new file mode 100644
index 00000000000..1be764aef39
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_no_indexing.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_foreach_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_running_and_no_indexing<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		WaitIdle();
+		await PostProjection(@"
+fromAll().foreachStream().when({
+    $init: function(){return {}},
+    type1: function(s,e){s.a=1},
+    type2: function(s,e){s.a=1},
+    $deleted: function(s,e){s.deleted=1;},
+}).outputState();
+");
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await HardDeleteStream("stream-1");
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail(
+			"$projections-test-projection-stream-1-result", "Result:{\"a\":1}", "Result:{\"a\":1,\"deleted\":1}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_no_indexing_and_other_events.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_no_indexing_and_other_events.cs
new file mode 100644
index 00000000000..f557aec0702
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_all_foreach_projection/when_running_and_no_indexing_and_other_events.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_all_foreach_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_running_and_no_indexing_and_other_events<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		WaitIdle();
+		await PostProjection(@"
+fromAll().foreachStream().when({
+    $init: function(){return {a:0}},
+    type1: function(s,e){s.a++},
+    type2: function(s,e){s.a++},
+    $deleted: function(s,e){s.deleted=1;},
+}).outputState();
+");
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await HardDeleteStream("stream-1");
+		WaitIdle();
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		await PostEvent("stream-3", "type1", "{}");
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail(
+			"$projections-test-projection-stream-1-result", "Result:{\"a\":2}", "Result:{\"a\":2,\"deleted\":1}");
+		await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":4}");
+		await AssertStreamTail("$projections-test-projection-stream-3-result", "Result:{\"a\":1}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/recovery/when_running_and_events_are_indexed.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/recovery/when_running_and_events_are_indexed.cs
new file mode 100644
index 00000000000..7abd8bc2958
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/recovery/when_running_and_events_are_indexed.cs
@@ -0,0 +1,59 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_category_foreach_projection.
+	recovery;
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+// ReSharper disable once InconsistentNaming
+public class when_running_and_events_are_indexed<TLogFormat, TStreamId>
+	: specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		WaitIdle();
+		await EnableStandardProjections();
+		WaitIdle();
+		await PostProjection(@"
+fromCategory('stream').foreachStream().when({
+    $init: function(){return {a:0}},
+    type1: function(s,e){s.a++},
+    type2: function(s,e){s.a++},
+    $deleted: function(s,e){s.deleted=1},
+}).outputState();
+");
+		WaitIdle();
+		await HardDeleteStream("stream-1");
+		WaitIdle();
+		//todo replace with a deterministic fix rather than just covering the potential race condition #2236
+		await PostEvent("stream-3", "type1", "{}");
+		await PostEvent("stream-3", "type2", "{}");
+		WaitIdle();
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await _manager.AbortAsync("test-projection", _admin);
+		WaitIdle();
+		await _manager.EnableAsync("test-projection", _admin);
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	[Ignore("Regression")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
+		await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":2}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/recovery/when_running_and_events_get_indexed_before_recovery.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/recovery/when_running_and_events_get_indexed_before_recovery.cs
new file mode 100644
index 00000000000..7b3bd95111f
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/recovery/when_running_and_events_get_indexed_before_recovery.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_category_foreach_projection.
+	recovery;
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_running_and_events_get_indexed_before_recovery<TLogFormat, TStreamId>
+	: specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		WaitIdle();
+		await EnableStandardProjections();
+		WaitIdle();
+		await PostProjection(@"
+fromCategory('stream').foreachStream().when({
+    $init: function(){return {a:0}},
+    type1: function(s,e){s.a++},
+    type2: function(s,e){s.a++},
+    $deleted: function(s,e){s.deleted=1},
+}).outputState();
+");
+		WaitIdle();
+		await HardDeleteStream("stream-1");
+		WaitIdle();
+		await _manager.AbortAsync("test-projection", _admin);
+		WaitIdle();
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await _manager.EnableAsync("test-projection", _admin);
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	[Ignore("Regression")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
+		await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":2}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed.cs
new file mode 100644
index 00000000000..d509272e8cc
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_category_foreach_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_running_and_events_are_indexed<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		await HardDeleteStream("stream-1");
+		WaitIdle();
+		await EnableStandardProjections();
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await PostProjection(@"
+fromCategory('stream').foreachStream().when({
+    $init: function(){return {}},
+    type1: function(s,e){s.a=(s.a||0) + 1},
+    type2: function(s,e){s.a=(s.a||0) + 1},
+    $deleted: function(s,e){s.deleted=1},
+}).outputState();
+");
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	[Ignore("Regression")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"deleted\":1}");
+		await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":2}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed_but_a_stream_and_tombstone_postponed.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed_but_a_stream_and_tombstone_postponed.cs
new file mode 100644
index 00000000000..eb13c8e459c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed_but_a_stream_and_tombstone_postponed.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_category_foreach_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+// ReSharper disable once InconsistentNaming
+public class when_running_and_events_are_indexed_but_a_stream_and_tombstone_postponed<TLogFormat, TStreamId> :
+	specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		WaitIdle();
+		await EnableStandardProjections();
+		WaitIdle();
+		await DisableStandardProjections();
+		WaitIdle();
+
+		await PostProjection(@"
+fromCategory('stream').foreachStream().when({
+    $init: function(){return {a:0}},
+    type1: function(s,e){s.a++},
+    type2: function(s,e){s.a++},
+    $deleted: function(s,e){s.deleted=1},
+}).outputState();
+");
+		WaitIdle();
+		// SUT projection must have been joined heading reader
+		await EnableStandardProjections();
+		WaitIdle();
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await PostEvent("stream-3", "type1", "{}");
+		await PostEvent("stream-3", "type2", "{}");
+		WaitIdle();
+		WaitIdle();
+		await HardDeleteStream("stream-1");
+		WaitIdle();
+		await PostEvent("stream-3", "type1", "{}");
+		await PostEvent("stream-3", "type2", "{}");
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	[Ignore("Regression")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed_but_tombstone.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed_but_tombstone.cs
new file mode 100644
index 00000000000..0b06e063ca7
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed_but_tombstone.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_category_foreach_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_running_and_events_are_indexed_but_tombstone<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		WaitIdle();
+		await EnableStandardProjections();
+		WaitIdle();
+		await PostProjection(@"
+fromCategory('stream').foreachStream().when({
+    $init: function(){return {a:0}},
+    type1: function(s,e){s.a++},
+    type2: function(s,e){s.a++},
+    $deleted: function(s,e){s.deleted=1},
+}).outputState();
+");
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await HardDeleteStream("stream-1");
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	[Ignore("Regression")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":2,\"deleted\":1}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed_including_tombstone.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed_including_tombstone.cs
new file mode 100644
index 00000000000..5f971ee281b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_events_are_indexed_including_tombstone.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_category_foreach_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_running_and_events_are_indexed_including_tombstone<TLogFormat, TStreamId> :
+	specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await HardDeleteStream("stream-1");
+		WaitIdle();
+		await EnableStandardProjections();
+		WaitIdle();
+	}
+
+	protected override async Task When() {
+		await base.When();
+
+		await PostProjection(@"
+fromCategory('stream').foreachStream().when({
+    $init: function(){return {a:0}},
+    type1: function(s,e){s.a++},
+    type2: function(s,e){s.a++},
+    $deleted: function(s,e){s.deleted=1},
+}).outputState();
+");
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	[Ignore("Regression")]
+	public async Task receives_deleted_notification() {
+		await DumpStream("$ce-stream");
+		await AssertStreamTail("$projections-test-projection-stream-1-result", "Result:{\"a\":0,\"deleted\":1}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_then_other_events_tombstone_ant_other_events.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_then_other_events_tombstone_ant_other_events.cs
new file mode 100644
index 00000000000..db1c08c1173
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/when_handling_deleted/with_from_category_foreach_projection/when_running_and_then_other_events_tombstone_ant_other_events.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.ClientAPI.when_handling_deleted.with_from_category_foreach_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_running_and_then_other_events_tombstone_ant_other_events<TLogFormat, TStreamId> :
+		specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	protected override bool GivenStandardProjectionsRunning() {
+		return false;
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		await PostProjection(@"
+fromCategory('stream').foreachStream().when({
+    $init: function(){return {a:0}},
+    type1: function(s,e){s.a++},
+    type2: function(s,e){s.a++},
+    $deleted: function(s,e){s.deleted=1;},
+}).outputState();
+");
+		WaitIdle();
+		await EnableStandardProjections();
+	}
+
+	protected override async Task When() {
+		await base.When();
+		await PostEvent("stream-1", "type1", "{}");
+		await PostEvent("stream-1", "type2", "{}");
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		WaitIdle();
+		await HardDeleteStream("stream-1");
+		WaitIdle();
+		await PostEvent("stream-2", "type1", "{}");
+		await PostEvent("stream-2", "type2", "{}");
+		await PostEvent("stream-3", "type1", "{}");
+		WaitIdle();
+	}
+
+	[Test, Category("Network")]
+	[Ignore("Regression")]
+	public async Task receives_deleted_notification() {
+		await AssertStreamTail(
+			"$projections-test-projection-stream-1-result", "Result:{\"a\":2}", "Result:{\"a\":2,\"deleted\":1}");
+		await AssertStreamTail("$projections-test-projection-stream-2-result", "Result:{\"a\":4}");
+		await AssertStreamTail("$projections-test-projection-stream-3-result", "Result:{\"a\":1}");
+	}
+}
diff --git a/src/EventStore.Projections.Core.Tests/ClientAPI/with_standard_projections_running.cs b/src/KurrentDB.Projections.Core.Tests/ClientAPI/with_standard_projections_running.cs
similarity index 92%
rename from src/EventStore.Projections.Core.Tests/ClientAPI/with_standard_projections_running.cs
rename to src/KurrentDB.Projections.Core.Tests/ClientAPI/with_standard_projections_running.cs
index c8948036341..71874a1d029 100644
--- a/src/EventStore.Projections.Core.Tests/ClientAPI/with_standard_projections_running.cs
+++ b/src/KurrentDB.Projections.Core.Tests/ClientAPI/with_standard_projections_running.cs
@@ -1,15 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Text;
 using System.Threading.Tasks;
 using EventStore.ClientAPI;
-using EventStore.Core.Bus;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
 using Newtonsoft.Json.Linq;
 using NUnit.Framework;
 
-namespace EventStore.Projections.Core.Tests.ClientAPI {
+namespace KurrentDB.Projections.Core.Tests.ClientAPI {
 	namespace with_standard_projections_running {
 		public abstract class when_deleting_stream_base<TLogFormat, TStreamId>
 			: specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
diff --git a/src/KurrentDB.Projections.Core.Tests/Integration/link_metadata/when_running_a_query_using_link_metadata.cs b/src/KurrentDB.Projections.Core.Tests/Integration/link_metadata/when_running_a_query_using_link_metadata.cs
new file mode 100644
index 00000000000..5329eb20a86
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Integration/link_metadata/when_running_a_query_using_link_metadata.cs
@@ -0,0 +1,70 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Management;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Integration.link_metadata;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_running_a_query_using_link_metadata<TLogFormat, TStreamId> : specification_with_a_v8_query_posted<TLogFormat, TStreamId> {
+	protected override void GivenEvents() {
+		ExistingEvent("stream", SystemEventTypes.LinkTo, "{\"a\":1}", "0@account-01");
+		ExistingEvent("stream", SystemEventTypes.LinkTo, "{\"a\":2}", "1@account-01");
+		ExistingEvent("stream", SystemEventTypes.LinkTo, "{\"a\":10}", "0@account-02");
+
+		ExistingEvent("account-01", "test", "", "{\"a\":1}", isJson: true);
+		ExistingEvent("account-01", "test", "", "{\"a\":2}", isJson: true);
+		ExistingEvent("account-02", "test", "", "{\"a\":10}", isJson: true);
+	}
+
+	protected override string GivenQuery() {
+		return @"
+fromStream('stream').when({
+    $any: function(s, e) {
+        // test
+        if (JSON.stringify(e.body) != JSON.stringify(e.linkMetadata))
+            throw 'invalid link metadata ' + JSON.stringify(e.linkMetadata) + ' expected is ' + JSON.stringify(e.body);
+
+        return e.linkMetadata;
+    }
+}).outputState()
+";
+	}
+
+	[Test]
+	public void just() {
+		AssertLastEvent("$projections-query-result", "{\"a\":10}", skip: 1 /* $eof */);
+	}
+
+	[Test]
+	public void state_becomes_completed() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetStatistics(
+				_bus, null, _projectionName, false));
+
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+				.Single()
+				.Projections.Length);
+		Assert.AreEqual(
+			_projectionName,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+				.Single()
+				.Projections.Single()
+				.Name);
+		Assert.AreEqual(
+			ManagedProjectionState.Completed,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+				.Single()
+				.Projections.Single()
+				.LeaderStatus);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Integration/scenarios/when_deleting_already_categorized_stream.cs b/src/KurrentDB.Projections.Core.Tests/Integration/scenarios/when_deleting_already_categorized_stream.cs
new file mode 100644
index 00000000000..2763b3eae0e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Integration/scenarios/when_deleting_already_categorized_stream.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Integration.scenarios;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_deleting_already_categorized_stream<TLogFormat, TStreamId> : specification_with_a_v8_query_posted<TLogFormat, TStreamId> {
+	protected override void GivenEvents() {
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		foreach (var e in base.When())
+			yield return e;
+		yield return CreateWriteEvent("chat-1", "ChatMessage", @"
+    {
+      ""sender"": ""Greg"",
+      ""message"": ""Hi"",
+      ""time"": ""03:45:30""
+    }");
+		yield return CreateWriteEvent("chat-1", "ChatMessage", @"
+    {
+      ""sender"": ""Ronan"",
+      ""message"": ""starbucks"",
+      ""time"": ""03:45:31""
+    }");
+		yield return CreateWriteEvent("chat-1", "ChatMessage", @"
+    {
+      ""sender"": ""James"",
+      ""message"": ""herpherp"",
+      ""time"": ""03:45:32""
+    }");
+		yield return CreateWriteEvent("chat-2", "ChatMessage", @"
+    {
+      ""sender"": ""Rob"",
+      ""message"": ""starbucks"",
+      ""time"": ""03:45:30""
+    }");
+		yield return CreateWriteEvent("chat-2", "ChatMessage", @"
+    {
+      ""sender"": ""Ronan"",
+      ""message"": ""put the moose in the chocolate"",
+      ""time"": ""03:45:31""
+    }");
+		var corrId = Guid.NewGuid();
+		yield return
+			new ClientMessage.DeleteStream(
+				corrId, corrId, Envelope, false, "chat-2", ExpectedVersion.Any, true, null);
+		yield return CreateNewProjectionMessage("test1", @"
+fromCategory('chat').when({
+    ChatMessage: function(s, e) {
+        copyTo('out1', e);
+    }
+})
+");
+	}
+
+	protected override bool GivenInitializeSystemProjections() {
+		return true;
+	}
+
+	protected override bool GivenStartSystemProjections() {
+		return true;
+	}
+
+	protected override string GivenQuery() {
+		return "";
+	}
+
+	[Test, Explicit]
+	public void just() {
+		DumpStream("$$chat-2");
+		DumpStream("$ce-chat");
+		DumpStream("out1");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Integration/scenarios/when_recategorizing_chat_events_by_users.cs b/src/KurrentDB.Projections.Core.Tests/Integration/scenarios/when_recategorizing_chat_events_by_users.cs
new file mode 100644
index 00000000000..9ca4a776317
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Integration/scenarios/when_recategorizing_chat_events_by_users.cs
@@ -0,0 +1,138 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Integration.scenarios;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_recategorizing_chat_events_by_users<TLogFormat, TStreamId> : specification_with_a_v8_query_posted<TLogFormat, TStreamId> {
+	protected override void GivenEvents() {
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		foreach (var e in base.When())
+			yield return e;
+		yield return CreateWriteEvent("chat-1", "ChatMessage", @"
+    {
+      ""sender"": ""Greg"",
+      ""message"": ""Hi"",
+      ""time"": ""03:45:30""
+    }");
+		yield return CreateWriteEvent("chat-1", "ChatMessage", @"
+    {
+      ""sender"": ""Ronan"",
+      ""message"": ""starbucks"",
+      ""time"": ""03:45:31""
+    }");
+		yield return CreateWriteEvent("chat-1", "ChatMessage", @"
+    {
+      ""sender"": ""James"",
+      ""message"": ""herpherp"",
+      ""time"": ""03:45:32""
+    }");
+		yield return CreateWriteEvent("chat-2", "ChatMessage", @"
+    {
+      ""sender"": ""Rob"",
+      ""message"": ""starbucks"",
+      ""time"": ""03:45:30""
+    }");
+		yield return CreateWriteEvent("chat-2", "ChatMessage", @"
+    {
+      ""sender"": ""Ronan"",
+      ""message"": ""put the moose in the chocolate"",
+      ""time"": ""03:45:31""
+    }");
+		yield return CreateQueryMessage("query1", @"
+fromCategory(""chat"")
+    .foreachStream()
+    .when({
+        $init: function() {
+            return { count: 0 }
+        },
+        ChatMessage: function(state, event) {
+            state.count += 1;
+            return state;
+        }
+    });
+");
+		yield return CreateQueryMessage("query2", @"
+fromCategory(""user"")
+    .foreachStream()
+    .when({
+        $init: function() {
+            return { count: 0 }
+        },
+        ChatMessage: function(state, event) {
+            state.count += 1;
+            return state;
+        }
+    });
+");
+	}
+
+	protected override bool GivenInitializeSystemProjections() {
+		return true;
+	}
+
+	protected override bool GivenStartSystemProjections() {
+		return true;
+	}
+
+	protected override string GivenQuery() {
+		return "";
+	}
+
+	protected override IEnumerable<string> GivenOtherProjections() {
+		yield return @"
+fromCategory(""chat"")
+.when({
+    ChatMessage: function(state, event) {
+        var userStream = ""user-"" + event.body.sender;
+        linkTo(userStream, event);
+    }
+})";
+
+		yield return @"
+fromCategory(""user"")
+    .foreachStream()
+    .when({
+        $init: function() {
+            return { count: 0 }
+        },
+        ChatMessage: function(state, event) {
+            state.count += 1;
+            return state;
+        }
+    }).outputState();
+";
+	}
+
+	[Test]
+	public void query1_returns_correct_result() {
+		AssertStreamTailWithLinks(
+			"$projections-query1-result", @"Result:{""count"":3}", @"Result:{""count"":2}", "$Eof:");
+	}
+
+	[Test]
+	public void query2_returns_correct_result() {
+		AssertStreamTailWithLinks(
+			"$projections-query2-result", @"Result:{""count"":1}", @"Result:{""count"":2}", @"Result:{""count"":1}",
+			@"Result:{""count"":1}", "$Eof:");
+	}
+
+	[Test]
+	public void other_1_projection_produces_correct_results() {
+		AssertStreamTail(
+			"$projections-other_1-result", "0@$projections-other_1-user-Greg-result",
+			"0@$projections-other_1-user-Ronan-result", "0@$projections-other_1-user-James-result",
+			"0@$projections-other_1-user-Rob-result", "1@$projections-other_1-user-Ronan-result");
+		AssertStreamTailWithLinks(
+			"$projections-other_1-result", @"Result:{""count"":1}", @"Result:{""count"":1}",
+			@"Result:{""count"":1}",
+			@"Result:{""count"":1}", @"Result:{""count"":2}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Integration/specification_with_a_v8_query_posted.cs b/src/KurrentDB.Projections.Core.Tests/Integration/specification_with_a_v8_query_posted.cs
new file mode 100644
index 00000000000..08c6ea44cc0
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Integration/specification_with_a_v8_query_posted.cs
@@ -0,0 +1,126 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using DotNext;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+namespace KurrentDB.Projections.Core.Tests.Integration;
+
+public abstract class specification_with_a_v8_query_posted<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	protected string _projectionName;
+	protected string _projectionSource;
+	protected ProjectionMode _projectionMode;
+	protected bool _checkpointsEnabled;
+	protected bool _trackEmittedStreams;
+	protected bool _emitEnabled;
+	protected bool _startSystemProjections;
+
+	protected override void Given() {
+		base.Given();
+		AllWritesSucceed();
+		NoOtherStreams();
+		GivenEvents();
+		EnableReadAll();
+		_projectionName = "query";
+		_projectionSource = GivenQuery();
+		_projectionMode = ProjectionMode.Transient;
+		_checkpointsEnabled = false;
+		_trackEmittedStreams = false;
+		_emitEnabled = false;
+		_startSystemProjections = GivenStartSystemProjections();
+	}
+
+	protected override Tuple<SynchronousScheduler, IPublisher, SynchronousScheduler, Guid>[] GivenProcessingQueues() {
+		SynchronousScheduler[] buses = [new("1"), new("2")];
+		SynchronousScheduler[] outBuses = [new("o1"), new("o2")];
+		_otherQueues = [new(buses[0], _timeProvider), new(buses[1], _timeProvider)];
+		return [
+			Tuple.Create(
+				buses[0],
+				_otherQueues[0].As<IPublisher>(),
+				outBuses[0],
+				Guid.NewGuid()),
+			Tuple.Create(
+				buses[1],
+				_otherQueues[1].As<IPublisher>(),
+				outBuses[1],
+				Guid.NewGuid())
+		];
+	}
+
+	protected abstract void GivenEvents();
+
+	protected abstract string GivenQuery();
+
+	protected virtual bool GivenStartSystemProjections() {
+		return false;
+	}
+
+	protected Message CreateQueryMessage(string name, string source) {
+		return new ProjectionManagementMessage.Command.Post(
+			_bus, ProjectionMode.Transient, name,
+			ProjectionManagementMessage.RunAs.System, "JS", source, enabled: true, checkpointsEnabled: false,
+			trackEmittedStreams: false,
+			emitEnabled: false);
+	}
+
+	protected Message CreateNewProjectionMessage(string name, string source) {
+		return new ProjectionManagementMessage.Command.Post(
+			_bus, ProjectionMode.Continuous, name, ProjectionManagementMessage.RunAs.System,
+			"JS", source, enabled: true, checkpointsEnabled: true, trackEmittedStreams: true, emitEnabled: true);
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+		if (_startSystemProjections) {
+			yield return
+				new ProjectionManagementMessage.Command.Enable(
+					Envelope, ProjectionNamesBuilder.StandardProjections.StreamsStandardProjection,
+					ProjectionManagementMessage.RunAs.System);
+			yield return
+				new ProjectionManagementMessage.Command.Enable(
+					Envelope, ProjectionNamesBuilder.StandardProjections.StreamByCategoryStandardProjection,
+					ProjectionManagementMessage.RunAs.System);
+			yield return
+				new ProjectionManagementMessage.Command.Enable(
+					Envelope, ProjectionNamesBuilder.StandardProjections.EventByCategoryStandardProjection,
+					ProjectionManagementMessage.RunAs.System);
+			yield return
+				new ProjectionManagementMessage.Command.Enable(
+					Envelope, ProjectionNamesBuilder.StandardProjections.EventByTypeStandardProjection,
+					ProjectionManagementMessage.RunAs.System);
+		}
+
+		var otherProjections = GivenOtherProjections();
+		var index = 0;
+		foreach (var source in otherProjections) {
+			yield return
+				(new ProjectionManagementMessage.Command.Post(
+					_bus, ProjectionMode.Continuous, "other_" + index,
+					ProjectionManagementMessage.RunAs.System, "JS", source, enabled: true, checkpointsEnabled: true,
+					trackEmittedStreams: true,
+					emitEnabled: true));
+			index++;
+		}
+
+		if (!string.IsNullOrEmpty(_projectionSource)) {
+			yield return
+				(new ProjectionManagementMessage.Command.Post(
+					_bus, _projectionMode, _projectionName,
+					ProjectionManagementMessage.RunAs.System, "JS", _projectionSource, enabled: true,
+					checkpointsEnabled: _checkpointsEnabled, emitEnabled: _emitEnabled,
+					trackEmittedStreams: _trackEmittedStreams));
+		}
+	}
+
+	protected virtual IEnumerable<string> GivenOtherProjections() {
+		return new string[0];
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Integration/system_projections/when_changing_categorization_projection_configurations.cs b/src/KurrentDB.Projections.Core.Tests/Integration/system_projections/when_changing_categorization_projection_configurations.cs
new file mode 100644
index 00000000000..1f7578a31a7
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Integration/system_projections/when_changing_categorization_projection_configurations.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Integration.system_projections;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_changing_categorization_projection_configurations_to_first<TLogFormat, TStreamId> : specification_with_a_v8_query_posted<TLogFormat, TStreamId> {
+	protected override void GivenEvents() {
+		ExistingEvent("account-000-01", "test", "", "{\"a\":1}", isJson: true);
+		ExistingEvent("account-000-01", "test", "", "{\"a\":2}", isJson: true);
+		ExistingEvent("account-000-02", "test", "", "{\"a\":10}", isJson: true);
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		foreach (var e in base.When())
+			yield return e;
+		string query = "first\r\n-";
+		yield return
+			new ProjectionManagementMessage.Command.UpdateQuery(
+				Envelope, ProjectionNamesBuilder.StandardProjections.StreamByCategoryStandardProjection,
+				ProjectionManagementMessage.RunAs.System, query: query, emitEnabled: null);
+		yield return
+			new ProjectionManagementMessage.Command.UpdateQuery(
+				Envelope, ProjectionNamesBuilder.StandardProjections.EventByCategoryStandardProjection,
+				ProjectionManagementMessage.RunAs.System, query: query, emitEnabled: null);
+		yield return
+			new ProjectionManagementMessage.Command.Enable(
+				Envelope, ProjectionNamesBuilder.StandardProjections.StreamByCategoryStandardProjection,
+				ProjectionManagementMessage.RunAs.System);
+		yield return
+			new ProjectionManagementMessage.Command.Enable(
+				Envelope, ProjectionNamesBuilder.StandardProjections.EventByCategoryStandardProjection,
+				ProjectionManagementMessage.RunAs.System);
+	}
+
+	protected override bool GivenInitializeSystemProjections() {
+		return true;
+	}
+
+	protected override bool GivenStartSystemProjections() {
+		return false;
+	}
+
+	protected override string GivenQuery() {
+		return "";
+	}
+
+	[Test]
+	public void streams_are_categorized() {
+		AssertStreamTail("$category-account", "account-000-01", "account-000-02");
+	}
+
+	[Test]
+	public void events_are_categorized() {
+		AssertStreamTail("$ce-account", "0@account-000-01", "1@account-000-01", "0@account-000-02");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Integration/system_projections/when_recategorizing_events.cs b/src/KurrentDB.Projections.Core.Tests/Integration/system_projections/when_recategorizing_events.cs
new file mode 100644
index 00000000000..4d911e7e896
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Integration/system_projections/when_recategorizing_events.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Integration.system_projections;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_recategorizing_events<TLogFormat, TStreamId> : specification_with_a_v8_query_posted<TLogFormat, TStreamId> {
+	protected override void GivenEvents() {
+		ExistingEvent("account-01", "test", "", "{\"a\":1}", isJson: true);
+		ExistingEvent("account-01", "test", "", "{\"a\":2}", isJson: true);
+		ExistingEvent("account-02", "test", "", "{\"a\":10}", isJson: true);
+
+		ExistingEvent("categorized-0", SystemEventTypes.LinkTo, "{\"a\":2}", "1@account-01");
+		ExistingEvent("categorized-0", SystemEventTypes.LinkTo, "{\"a\":10}", "0@account-02");
+		ExistingEvent("categorized-1", SystemEventTypes.LinkTo, "{\"a\":1}", "0@account-01");
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		foreach (var e in base.When())
+			yield return e;
+	}
+
+	protected override bool GivenInitializeSystemProjections() {
+		return true;
+	}
+
+	protected override bool GivenStartSystemProjections() {
+		return true;
+	}
+
+	protected override string GivenQuery() {
+		return "";
+	}
+
+	[Test]
+	public void streams_are_categorized() {
+		AssertStreamTail("$category-account", "account-01", "account-02");
+		AssertStreamTail("$category-categorized", "categorized-0", "categorized-1");
+	}
+
+	[Test]
+	public void events_are_categorized() {
+		AssertStreamTail("$ce-account", "0@account-01", "1@account-01", "0@account-02");
+	}
+
+	[Test]
+	public void links_are_categorized() {
+		AssertStreamTail("$ce-categorized", "1@account-01", "0@account-02", "0@account-01");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Integration/system_projections/when_recategorizing_events_while_running.cs b/src/KurrentDB.Projections.Core.Tests/Integration/system_projections/when_recategorizing_events_while_running.cs
new file mode 100644
index 00000000000..fb376fe226d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Integration/system_projections/when_recategorizing_events_while_running.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Integration.system_projections;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_recategorizing_events_while_running<TLogFormat, TStreamId> : specification_with_a_v8_query_posted<TLogFormat, TStreamId> {
+	protected override void GivenEvents() {
+		ExistingEvent("account-01", "test", "", "{\"a\":1}", isJson: true);
+		ExistingEvent("account-01", "test", "", "{\"a\":2}", isJson: true);
+		ExistingEvent("account-02", "test", "", "{\"a\":10}", isJson: true);
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		foreach (var e in base.When())
+			yield return e;
+		yield return CreateWriteEvent("categorized-0", SystemEventTypes.LinkTo, "1@account-01", "{\"a\":2}");
+		yield return CreateWriteEvent("categorized-0", SystemEventTypes.LinkTo, "0@account-02", "{\"a\":10}");
+		yield return CreateWriteEvent("categorized-1", SystemEventTypes.LinkTo, "0@account-01", "{\"a\":1}");
+	}
+
+	protected override bool GivenInitializeSystemProjections() {
+		return true;
+	}
+
+	protected override bool GivenStartSystemProjections() {
+		return true;
+	}
+
+	protected override string GivenQuery() {
+		return "";
+	}
+
+	[Test]
+	public void streams_are_categorized() {
+		AssertStreamTail("$category-account", "account-01", "account-02");
+		AssertStreamTail("$category-categorized", "categorized-0", "categorized-1");
+	}
+
+	[Test]
+	public void events_are_categorized() {
+		AssertStreamTail("$ce-account", "0@account-01", "1@account-01", "0@account-02");
+	}
+
+	[Test]
+	public void links_are_categorized() {
+		AssertStreamTail("$ce-categorized", "1@account-01", "0@account-02", "0@account-01");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Integration/system_projections/when_running_system_projections.cs b/src/KurrentDB.Projections.Core.Tests/Integration/system_projections/when_running_system_projections.cs
new file mode 100644
index 00000000000..1f140eabf7c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Integration/system_projections/when_running_system_projections.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Integration.system_projections;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_running_system_projections<TLogFormat, TStreamId> : specification_with_a_v8_query_posted<TLogFormat, TStreamId> {
+	protected override void GivenEvents() {
+		ExistingEvent("account-01", "test", "", "{\"a\":1}", isJson: true);
+		ExistingEvent("account-01", "test", "", "{\"a\":2}", isJson: true);
+		ExistingEvent("account-02", "test", "", "{\"a\":10}", isJson: true);
+		ExistingEvent("account-000-02", "test", "", "{\"a\":10}", isJson: true);
+
+		ExistingEvent("stream", SystemEventTypes.LinkTo, "{\"a\":1}", "0@account-01");
+		ExistingEvent("stream", SystemEventTypes.LinkTo, "{\"a\":2}", "1@account-01");
+		ExistingEvent("stream", SystemEventTypes.LinkTo, "{\"a\":10}", "0@account-02");
+
+		ExistingEvent("stream-1", SystemEventTypes.LinkTo, "{\"a\":10}", "1@account-01");
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		foreach (var e in base.When())
+			yield return e;
+		yield return CreateWriteEvent("test-1", "test1", "{}", "{}", isJson: true);
+		yield return CreateWriteEvent("test-2", SystemEventTypes.LinkTo, "0@test-1", "{}", isJson: true);
+	}
+
+	protected override bool GivenInitializeSystemProjections() {
+		return true;
+	}
+
+	protected override bool GivenStartSystemProjections() {
+		return true;
+	}
+
+	protected override string GivenQuery() {
+		return "";
+	}
+
+	[Test]
+	public void streams_are_categorized() {
+		AssertStreamTail("$category-stream", "stream-1");
+		AssertStreamTail("$category-test", "test-1", "test-2");
+		AssertStreamTail("$category-account", "account-01", "account-02", "account-000-02");
+	}
+
+	[Test]
+	public void streams_are_indexed() {
+		AssertStreamContains(
+			"$streams", "0@account-01", "0@account-02", "0@stream", "0@test-1", "0@test-2", "0@stream-1",
+			"0@account-000-02");
+	}
+
+	[Test]
+	public void events_are_categorized() {
+		AssertStreamTail("$ce-stream", "1@account-01");
+		AssertStreamTail("$ce-test", "0@test-1", "0@test-1");
+		AssertStreamTail("$ce-account", "0@account-01", "1@account-01", "0@account-02", "0@account-000-02");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/KurrentDB.Projections.Core.Tests.csproj b/src/KurrentDB.Projections.Core.Tests/KurrentDB.Projections.Core.Tests.csproj
new file mode 100644
index 00000000000..6c337623457
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/KurrentDB.Projections.Core.Tests.csproj
@@ -0,0 +1,55 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+	</PropertyGroup>
+	<ItemGroup>
+		<Compile Remove="Services\checkpoint_strategy\**" />
+		<EmbeddedResource Remove="Services\checkpoint_strategy\**" />
+		<None Remove="Services\checkpoint_strategy\**" />
+	</ItemGroup>
+	<ItemGroup>
+		<Compile Remove="Playground\Launchpad.cs" />
+		<Compile Remove="Playground\Launchpad2.cs" />
+		<Compile Remove="Playground\Launchpad3.cs" />
+		<Compile Remove="Playground\LaunchpadBase.cs" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Remove="Services\Jint\Serialization\big_state.json" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+		<PackageReference Include="NUnit" Version="3.14.0" />
+		<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+		<PackageReference Include="Serilog.Sinks.TextWriter" Version="3.0.0" />
+		<PackageReference Include="Google.Protobuf" Version="3.27.2" />
+		<PackageReference Include="Grpc.Tools" Version="2.65.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+		</PackageReference>
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.Common\KurrentDB.Common.csproj" />
+		<ProjectReference Include="..\KurrentDB.Core.Tests\KurrentDB.Core.Tests.csproj" />
+		<ProjectReference Include="..\KurrentDB.Core.Tests\KurrentDB.Core.Tests.csproj" />
+		<ProjectReference Include="..\KurrentDB.Core\KurrentDB.Core.csproj" />
+		<ProjectReference Include="..\KurrentDB.Projections.Core\KurrentDB.Projections.Core.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+		<Protobuf Include="..\Protos\Grpc\projections.proto" Link="Protos\projections.proto" GrpcServices="Client" ProtoRoot="../Protos/Grpc" Access="Internal" />
+	</ItemGroup>
+	<ItemGroup>
+		<Content Include="Queries\1Query.js">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Include="Services\Jint\Serialization\big_state.json" />
+	</ItemGroup>
+	<!-- TODO(jen20): Decide what is correct here -->
+	<PropertyGroup>
+		<IsMac>false</IsMac>
+		<IsMac Condition="'$(OS)' == 'Unix' And Exists ('/Library/Frameworks')">true</IsMac>
+	</PropertyGroup>
+</Project>
diff --git a/src/KurrentDB.Projections.Core.Tests/Other/Stopwatch.cs b/src/KurrentDB.Projections.Core.Tests/Other/Stopwatch.cs
new file mode 100644
index 00000000000..8cf363740c9
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Other/Stopwatch.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Tests.Helpers;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Other;
+
+[TestFixture]
+class Stopwatch {
+	[Test]
+	public void MeasureStopwatch() {
+		var sw = new System.Diagnostics.Stopwatch();
+		var measured = new System.Diagnostics.Stopwatch();
+		sw.Reset();
+		sw.Start();
+		measured.Start();
+		measured.Stop();
+		TestHelper.Consume(measured.ElapsedMilliseconds);
+		sw.Stop();
+		TestHelper.Consume(sw.ElapsedMilliseconds);
+		measured.Reset();
+		sw.Reset();
+
+		sw.Start();
+		sw.Stop();
+		var originalTime = sw.ElapsedMilliseconds;
+		sw.Reset();
+
+		sw.Start();
+		for (var i = 0; i < 1000000; i++) {
+			measured.Start();
+			measured.Stop();
+			TestHelper.Consume(measured.ElapsedMilliseconds);
+		}
+
+		sw.Stop();
+		var measuredTime = sw.ElapsedMilliseconds;
+		Console.WriteLine(measuredTime - originalTime);
+	}
+}
diff --git a/src/EventStore.Projections.Core.Tests/Other/claims_serialization.cs b/src/KurrentDB.Projections.Core.Tests/Other/claims_serialization.cs
similarity index 77%
rename from src/EventStore.Projections.Core.Tests/Other/claims_serialization.cs
rename to src/KurrentDB.Projections.Core.Tests/Other/claims_serialization.cs
index cd6bda62d2c..16f909172db 100644
--- a/src/EventStore.Projections.Core.Tests/Other/claims_serialization.cs
+++ b/src/KurrentDB.Projections.Core.Tests/Other/claims_serialization.cs
@@ -1,10 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System.Security.Claims;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Management;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Management;
 using NUnit.Framework;
 
-namespace EventStore.Projections.Core.Tests.Other;
+namespace KurrentDB.Projections.Core.Tests.Other;
 
 [TestFixture]
 public class claims_serialization {
@@ -23,7 +26,7 @@ public void should_serialize_principal_name() {
 	[Test]
 	public void should_only_serialize_role() {
 		var roleClaim = new Claim(ClaimTypes.Role, "$admins");
-		var claimsIdentity = new ClaimsIdentity(new [] {
+		var claimsIdentity = new ClaimsIdentity(new[] {
 			new(ClaimTypes.Name, "foo-name"),
 			roleClaim,
 			new("uid", "foo-uid"),
diff --git a/src/KurrentDB.Projections.Core.Tests/Other/json_serialization.cs b/src/KurrentDB.Projections.Core.Tests/Other/json_serialization.cs
new file mode 100644
index 00000000000..179c61f52d0
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Other/json_serialization.cs
@@ -0,0 +1,205 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Other;
+
+[TestFixture]
+class can_serialize_and_deserialize {
+	private ProjectionVersion _version;
+
+	[SetUp]
+	public void setup() {
+		_version = new ProjectionVersion(1, 0, 0);
+	}
+
+	[Test]
+	public void position_based_checkpoint_tag() {
+		CheckpointTag tag = CheckpointTag.FromPosition(1, -1, 0);
+		byte[] bytes = tag.ToJsonBytes(_version);
+		string instring = Helper.UTF8NoBom.GetString(bytes);
+		Console.WriteLine(instring);
+
+		CheckpointTag back = instring.ParseCheckpointTagJson();
+		Assert.AreEqual(tag, back);
+	}
+
+	[Test]
+	public void prepare_position_based_checkpoint_tag_zero() {
+		CheckpointTag tag = CheckpointTag.FromPreparePosition(1, 0);
+		byte[] bytes = tag.ToJsonBytes(_version);
+		string instring = Helper.UTF8NoBom.GetString(bytes);
+		Console.WriteLine(instring);
+
+		CheckpointTag back = instring.ParseCheckpointTagJson();
+		Assert.AreEqual(tag, back);
+	}
+
+	[Test]
+	public void prepare_position_based_checkpoint_tag_minus_one() {
+		CheckpointTag tag = CheckpointTag.FromPreparePosition(1, -1);
+		byte[] bytes = tag.ToJsonBytes(_version);
+		string instring = Helper.UTF8NoBom.GetString(bytes);
+		Console.WriteLine(instring);
+
+		CheckpointTag back = instring.ParseCheckpointTagJson();
+		Assert.AreEqual(tag, back);
+	}
+
+	[Test]
+	public void prepare_position_based_checkpoint_tag() {
+		CheckpointTag tag = CheckpointTag.FromPreparePosition(1, 1234);
+		byte[] bytes = tag.ToJsonBytes(_version);
+		string instring = Helper.UTF8NoBom.GetString(bytes);
+		Console.WriteLine(instring);
+
+		CheckpointTag back = instring.ParseCheckpointTagJson();
+		Assert.AreEqual(tag, back);
+	}
+
+	[Test]
+	public void stream_based_checkpoint_tag() {
+		CheckpointTag tag = CheckpointTag.FromStreamPosition(1, "$ce-account", 12345);
+		byte[] bytes = tag.ToJsonBytes(_version);
+		string instring = Helper.UTF8NoBom.GetString(bytes);
+		Console.WriteLine(instring);
+
+		CheckpointTag back = instring.ParseCheckpointTagJson();
+		Assert.AreEqual(tag, back);
+		Assert.IsNull(back.CommitPosition);
+	}
+
+	[Test]
+	public void streams_based_checkpoint_tag() {
+		CheckpointTag tag = CheckpointTag.FromStreamPositions(1, new Dictionary<string, long> { { "a", 1 }, { "b", 2 } });
+		byte[] bytes = tag.ToJsonBytes(_version);
+		string instring = Helper.UTF8NoBom.GetString(bytes);
+		Console.WriteLine(instring);
+
+		CheckpointTag back = instring.ParseCheckpointTagJson();
+		Assert.AreEqual(tag, back);
+		Assert.IsNull(back.CommitPosition);
+	}
+
+	[Test]
+	public void event_by_type_index_based_checkpoint_tag() {
+		CheckpointTag tag = CheckpointTag.FromEventTypeIndexPositions(
+			0, new TFPos(100, 50), new Dictionary<string, long> { { "a", 1 }, { "b", 2 } });
+		byte[] bytes = tag.ToJsonBytes(_version);
+		string instring = Helper.UTF8NoBom.GetString(bytes);
+		Console.WriteLine(instring);
+
+		CheckpointTag back = instring.ParseCheckpointTagJson();
+		Assert.AreEqual(tag, back);
+	}
+
+	[Test]
+	public void phase_based_checkpoint_tag_completed() {
+		CheckpointTag tag = CheckpointTag.FromPhase(2, completed: false);
+		byte[] bytes = tag.ToJsonBytes(_version);
+		string instring = Helper.UTF8NoBom.GetString(bytes);
+		Console.WriteLine(instring);
+
+		CheckpointTag back = instring.ParseCheckpointTagJson();
+		Assert.AreEqual(tag, back);
+	}
+
+	[Test]
+	public void phase_based_checkpoint_tag_incomplete() {
+		CheckpointTag tag = CheckpointTag.FromPhase(0, completed: true);
+		byte[] bytes = tag.ToJsonBytes(_version);
+		string instring = Helper.UTF8NoBom.GetString(bytes);
+		Console.WriteLine(instring);
+
+		CheckpointTag back = instring.ParseCheckpointTagJson();
+		Assert.AreEqual(tag, back);
+	}
+
+	[Test]
+	public void by_stream_based_checkpoint_tag() {
+		CheckpointTag tag = CheckpointTag.FromByStreamPosition(0, "catalog", 1, "data", 2, 12345);
+		byte[] bytes = tag.ToJsonBytes(_version);
+		string instring = Helper.UTF8NoBom.GetString(bytes);
+		Console.WriteLine(instring);
+
+		CheckpointTag back = instring.ParseCheckpointTagJson();
+		Assert.AreEqual(tag, back);
+	}
+
+	[Test]
+	public void by_stream_based_checkpoint_tag_zero() {
+		CheckpointTag tag = CheckpointTag.FromByStreamPosition(0, "catalog", -1, null, -1, 12345);
+		byte[] bytes = tag.ToJsonBytes(_version);
+		string instring = Helper.UTF8NoBom.GetString(bytes);
+		Console.WriteLine(instring);
+
+		CheckpointTag back = instring.ParseCheckpointTagJson();
+		Assert.AreEqual(tag, back);
+	}
+
+	[Test]
+	public void extra_metadata_are_preserved() {
+		CheckpointTag tag = CheckpointTag.FromPosition(0, -1, 0);
+		var extra = new Dictionary<string, JToken> { { "$$a", new JRaw("\"b\"") }, { "$$c", new JRaw("\"d\"") } };
+		byte[] bytes = tag.ToJsonBytes(_version, extra);
+		string instring = Helper.UTF8NoBom.GetString(bytes);
+		Console.WriteLine(instring);
+
+		CheckpointTagVersion back = instring.ParseCheckpointTagVersionExtraJson(_version);
+		Assert.IsNotNull(back.ExtraMetadata);
+		JToken v;
+		Assert.IsTrue(back.ExtraMetadata.TryGetValue("$$a", out v));
+		Assert.AreEqual("b", (string)((JValue)v).Value);
+		Assert.IsTrue(back.ExtraMetadata.TryGetValue("$$c", out v));
+		Assert.AreEqual("d", (string)((JValue)v).Value);
+	}
+
+	[Test]
+	public void can_deserialize_readonly_fields() {
+		TestData data = new TestData("123");
+		byte[] bytes = data.ToJsonBytes();
+		string instring = Helper.UTF8NoBom.GetString(bytes);
+		Console.WriteLine(instring);
+
+		TestData back = instring.ParseJson<TestData>();
+		Assert.AreEqual(data, back);
+	}
+
+	private class TestData {
+		public readonly string Data;
+
+		public TestData(string data) {
+			Data = data;
+		}
+
+		protected bool Equals(TestData other) {
+			return string.Equals(Data, other.Data);
+		}
+
+		public override bool Equals(object obj) {
+			if (ReferenceEquals(null, obj))
+				return false;
+			if (ReferenceEquals(this, obj))
+				return true;
+			if (obj.GetType() != GetType())
+				return false;
+			return Equals((TestData)obj);
+		}
+
+		public override int GetHashCode() {
+			return (Data != null ? Data.GetHashCode() : 0);
+		}
+
+		public override string ToString() {
+			return string.Format("Data: {0}", Data);
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Other/when_matching_remaining_path.cs b/src/KurrentDB.Projections.Core.Tests/Other/when_matching_remaining_path.cs
new file mode 100644
index 00000000000..7f1a4b59f50
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Other/when_matching_remaining_path.cs
@@ -0,0 +1,161 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Other;
+
+[TestFixture, Ignore("Until resolved in MONO")]
+class when_matching_remaining_path {
+	private UriTemplate _urlTemplate;
+	private UriTemplateMatch _match;
+
+	[SetUp]
+	public void setup() {
+		_urlTemplate = new UriTemplate("/a/b/{*C}");
+		_match = _urlTemplate.Match(new Uri("http://localhost"), new Uri("http://localhost/a/b/123"));
+	}
+
+	[Test]
+	public void bound_variable_c_is_available() {
+		Assert.IsTrue(_match.BoundVariables.AllKeys.Contains("C"));
+	}
+
+	[Test]
+	public void bound_variable_c_contains_remaining_path() {
+		Assert.AreEqual("123", _match.BoundVariables["C"]);
+	}
+}
+
+[TestFixture, Ignore("Until resolved in MONO")]
+class when_matching_remaining_multi_segment_path {
+	private UriTemplate _urlTemplate;
+	private UriTemplateMatch _match;
+
+	[SetUp]
+	public void setup() {
+		_urlTemplate = new UriTemplate("/a/b/{*C}");
+		_match = _urlTemplate.Match(new Uri("http://localhost"), new Uri("http://localhost/a/b/123/456"));
+	}
+
+	[Test]
+	public void bound_variable_c_is_available() {
+		Assert.IsTrue(_match.BoundVariables.AllKeys.Contains("C"));
+	}
+
+	[Test]
+	public void bound_variable_c_contains_remaining_path() {
+		Assert.AreEqual("123/456", _match.BoundVariables["C"]);
+	}
+}
+
+
+[TestFixture]
+class when_matching_uri_with_missing_query_variable {
+	private UriTemplate _urlTemplate;
+	private UriTemplateMatch _match;
+
+	[SetUp]
+	public void setup() {
+		_urlTemplate = new UriTemplate("/a/b?c={C}");
+		_match = _urlTemplate.Match(new Uri("http://localhost"), new Uri("http://localhost/a/b"));
+	}
+
+	[Test]
+	public void match_succeeds() {
+		Assert.IsTrue(_match != null);
+	}
+
+	[Test]
+	public void bound_variable_c_is_null() {
+		Assert.AreEqual(null, _match.BoundVariables["C"]);
+	}
+}
+
+[TestFixture]
+class url_segments {
+	[Test]
+	public void are_not_untumatically_unescaped() {
+		var uri = new Uri("http://fake/a%24a%20/123$");
+		Assert.AreEqual(3, uri.Segments.Length);
+		Assert.AreEqual("/", uri.Segments[0]);
+		Assert.AreEqual("a%24a%20/", uri.Segments[1]);
+		Assert.AreEqual("123$", uri.Segments[2]);
+	}
+
+	[Test]
+	public void are_not_automatically_unescaped2() {
+		var ub = new UriBuilder();
+		ub.Scheme = "http";
+		ub.Host = "fake";
+		ub.Path = "/a%24a%20/123$";
+		var uri = ub.Uri;
+		Assert.AreEqual(3, uri.Segments.Length);
+		Assert.AreEqual("/", uri.Segments[0]);
+		Assert.AreEqual("a%24a%20/", uri.Segments[1]);
+		Assert.AreEqual("123$", uri.Segments[2]);
+	}
+}
+
+[TestFixture]
+class when_matching_escaped_urls {
+	[Test]
+	public void Dump() {
+		var result = new List<Tuple<char, string>>();
+		for (char i = (char)1; i <= 127; i++) {
+			try {
+				var unescaped = "/z" + i + "z/";
+				var escaped = "/z" + Uri.HexEscape(i) + "z/";
+
+				var unescapedTemplate = new UriTemplate(unescaped);
+				var escapedTemplate = new UriTemplate(escaped);
+
+				Func<string, UriTemplate, bool> m =
+					(s, template) =>
+						template.Match(new Uri("http://localhost"), new Uri("http://localhost" + s)) != null;
+
+				result.Add(Tuple.Create(i, string.Format(
+					"e=>e {1}  e=>u {2}  u=>e {3} u=>u {4}", new String(i, 1), m(escaped, escapedTemplate),
+					m(unescaped, escapedTemplate), m(escaped, unescapedTemplate),
+					m(unescaped, unescapedTemplate))));
+			} catch (Exception) {
+				result.Add(
+					Tuple.Create(i, string.Format("EXCEPTION")));
+			}
+		}
+
+		foreach (var tuple in
+			from i in result
+			group i by i.Item2
+			into g
+			orderby g.Key
+			select g
+		) {
+			Console.WriteLine(tuple.Key);
+			Console.Write("   ");
+			foreach (var i in tuple) {
+				if (char.IsWhiteSpace(i.Item1))
+					Console.Write(Uri.HexEscape(i.Item1));
+				else
+					Console.Write(i.Item1);
+			}
+
+			Console.WriteLine();
+		}
+	}
+
+	private static void Matches(string template, string candidate) {
+		var urlTemplate = new UriTemplate(template);
+		var match = urlTemplate.Match(new Uri("http://localhost"), new Uri("http://localhost" + candidate));
+		Assert.IsNotNull(match);
+	}
+
+	private static void DoesNotMatch(string template, string candidate) {
+		var urlTemplate = new UriTemplate(template);
+		var match = urlTemplate.Match(new Uri("http://localhost"), new Uri("http://localhost" + candidate));
+		Assert.IsNull(match);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Playground/BusTestingExtentions.cs b/src/KurrentDB.Projections.Core.Tests/Playground/BusTestingExtentions.cs
new file mode 100644
index 00000000000..a5fa7c3a877
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Playground/BusTestingExtentions.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Projections.Core.Tests.Playground;
+
+public static class BusTestingExtentions {
+	private class Handler<T> : IHandle<T> where T : Message {
+		private readonly Action<T> _handler;
+
+		public Handler(Action<T> handler) {
+			_handler = handler;
+		}
+
+		public void Handle(T message) {
+			_handler(message);
+		}
+	}
+
+	public static void Subscribe<T>(this ISubscriber self, Action<T> handler) where T : Message {
+		self.Subscribe(new Handler<T>(handler));
+	}
+}
diff --git a/src/EventStore.Projections.Core.Tests/Playground/Launchpad.cs b/src/KurrentDB.Projections.Core.Tests/Playground/Launchpad.cs
similarity index 100%
rename from src/EventStore.Projections.Core.Tests/Playground/Launchpad.cs
rename to src/KurrentDB.Projections.Core.Tests/Playground/Launchpad.cs
diff --git a/src/EventStore.Projections.Core.Tests/Playground/Launchpad2.cs b/src/KurrentDB.Projections.Core.Tests/Playground/Launchpad2.cs
similarity index 100%
rename from src/EventStore.Projections.Core.Tests/Playground/Launchpad2.cs
rename to src/KurrentDB.Projections.Core.Tests/Playground/Launchpad2.cs
diff --git a/src/EventStore.Projections.Core.Tests/Playground/Launchpad3.cs b/src/KurrentDB.Projections.Core.Tests/Playground/Launchpad3.cs
similarity index 100%
rename from src/EventStore.Projections.Core.Tests/Playground/Launchpad3.cs
rename to src/KurrentDB.Projections.Core.Tests/Playground/Launchpad3.cs
diff --git a/src/EventStore.Projections.Core.Tests/Playground/LaunchpadBase.cs b/src/KurrentDB.Projections.Core.Tests/Playground/LaunchpadBase.cs
similarity index 100%
rename from src/EventStore.Projections.Core.Tests/Playground/LaunchpadBase.cs
rename to src/KurrentDB.Projections.Core.Tests/Playground/LaunchpadBase.cs
diff --git a/src/EventStore.Projections.Core.Tests/Queries/1Query.js b/src/KurrentDB.Projections.Core.Tests/Queries/1Query.js
similarity index 100%
rename from src/EventStore.Projections.Core.Tests/Queries/1Query.js
rename to src/KurrentDB.Projections.Core.Tests/Queries/1Query.js
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/Scenarios/specification_with_js_query_posted.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/Scenarios/specification_with_js_query_posted.cs
new file mode 100644
index 00000000000..f35f9c979d9
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/Scenarios/specification_with_js_query_posted.cs
@@ -0,0 +1,127 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using DotNext;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint.Scenarios;
+
+public abstract class specification_with_js_query_posted<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	protected string _projectionName;
+	protected string _projectionSource;
+	protected ProjectionMode _projectionMode;
+	protected bool _checkpointsEnabled;
+	protected bool _trackEmittedStreams;
+	protected bool _emitEnabled;
+	protected bool _startSystemProjections;
+
+
+	protected override void Given() {
+		base.Given();
+		AllWritesSucceed();
+		NoOtherStreams();
+		GivenEvents();
+		EnableReadAll();
+		_projectionName = "query";
+		_projectionSource = GivenQuery();
+		_projectionMode = ProjectionMode.Transient;
+		_checkpointsEnabled = false;
+		_trackEmittedStreams = false;
+		_emitEnabled = false;
+		_startSystemProjections = GivenStartSystemProjections();
+	}
+
+	protected override Tuple<SynchronousScheduler, IPublisher, SynchronousScheduler, Guid>[] GivenProcessingQueues() {
+		SynchronousScheduler[] buses = [new("1"), new("2")];
+		SynchronousScheduler[] outBuses = [new("o1"), new("o2")];
+		_otherQueues = [new(buses[0], _timeProvider), new(buses[1], _timeProvider)];
+		return [
+			Tuple.Create(
+				buses[0],
+				_otherQueues[0].As<IPublisher>(),
+				outBuses[0],
+				Guid.NewGuid()),
+			Tuple.Create(
+				buses[1],
+				_otherQueues[1].As<IPublisher>(),
+				outBuses[1],
+				Guid.NewGuid())
+		];
+	}
+
+	protected abstract void GivenEvents();
+
+	protected abstract string GivenQuery();
+
+	protected virtual bool GivenStartSystemProjections() {
+		return false;
+	}
+
+	protected Message CreateQueryMessage(string name, string source) {
+		return new ProjectionManagementMessage.Command.Post(
+			_bus, ProjectionMode.Transient, name,
+			ProjectionManagementMessage.RunAs.System, "JS", source, enabled: true, checkpointsEnabled: false,
+			trackEmittedStreams: false,
+			emitEnabled: false);
+	}
+
+	protected Message CreateNewProjectionMessage(string name, string source) {
+		return new ProjectionManagementMessage.Command.Post(
+			_bus, ProjectionMode.Continuous, name, ProjectionManagementMessage.RunAs.System,
+			"INTERPRETED", source, enabled: true, checkpointsEnabled: true, trackEmittedStreams: true, emitEnabled: true);
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+		if (_startSystemProjections) {
+			yield return
+				new ProjectionManagementMessage.Command.Enable(
+					Envelope, ProjectionNamesBuilder.StandardProjections.StreamsStandardProjection,
+					ProjectionManagementMessage.RunAs.System);
+			yield return
+				new ProjectionManagementMessage.Command.Enable(
+					Envelope, ProjectionNamesBuilder.StandardProjections.StreamByCategoryStandardProjection,
+					ProjectionManagementMessage.RunAs.System);
+			yield return
+				new ProjectionManagementMessage.Command.Enable(
+					Envelope, ProjectionNamesBuilder.StandardProjections.EventByCategoryStandardProjection,
+					ProjectionManagementMessage.RunAs.System);
+			yield return
+				new ProjectionManagementMessage.Command.Enable(
+					Envelope, ProjectionNamesBuilder.StandardProjections.EventByTypeStandardProjection,
+					ProjectionManagementMessage.RunAs.System);
+		}
+
+		var otherProjections = GivenOtherProjections();
+		var index = 0;
+		foreach (var source in otherProjections) {
+			yield return
+				(new ProjectionManagementMessage.Command.Post(
+					_bus, ProjectionMode.Continuous, "other_" + index,
+					ProjectionManagementMessage.RunAs.System, "JS", source, enabled: true, checkpointsEnabled: true,
+					trackEmittedStreams: true,
+					emitEnabled: true));
+			index++;
+		}
+
+		if (!string.IsNullOrEmpty(_projectionSource)) {
+			yield return
+				(new ProjectionManagementMessage.Command.Post(
+					_bus, _projectionMode, _projectionName,
+					ProjectionManagementMessage.RunAs.System, "JS", _projectionSource, enabled: true,
+					checkpointsEnabled: _checkpointsEnabled, emitEnabled: _emitEnabled,
+					trackEmittedStreams: _trackEmittedStreams));
+		}
+	}
+
+	protected virtual IEnumerable<string> GivenOtherProjections() {
+		return new string[0];
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/Scenarios/when_deleting_already_categorized_stream.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/Scenarios/when_deleting_already_categorized_stream.cs
new file mode 100644
index 00000000000..37ad238408c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/Scenarios/when_deleting_already_categorized_stream.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint.Scenarios;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(long))]
+public class when_deleting_already_categorized_stream<TLogFormat, TStreamId> : specification_with_js_query_posted<TLogFormat, TStreamId> {
+	protected override void GivenEvents() {
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		foreach (var e in base.When())
+			yield return e;
+		yield return CreateWriteEvent("chat-1", "ChatMessage", @"
+    {
+      ""sender"": ""Greg"",
+      ""message"": ""Hi"",
+      ""time"": ""03:45:30""
+    }");
+		yield return CreateWriteEvent("chat-1", "ChatMessage", @"
+    {
+      ""sender"": ""Ronan"",
+      ""message"": ""starbucks"",
+      ""time"": ""03:45:31""
+    }");
+		yield return CreateWriteEvent("chat-1", "ChatMessage", @"
+    {
+      ""sender"": ""James"",
+      ""message"": ""herpherp"",
+      ""time"": ""03:45:32""
+    }");
+		yield return CreateWriteEvent("chat-2", "ChatMessage", @"
+    {
+      ""sender"": ""Rob"",
+      ""message"": ""starbucks"",
+      ""time"": ""03:45:30""
+    }");
+		yield return CreateWriteEvent("chat-2", "ChatMessage", @"
+    {
+      ""sender"": ""Ronan"",
+      ""message"": ""put the moose in the chocolate"",
+      ""time"": ""03:45:31""
+    }");
+		var corrId = Guid.NewGuid();
+		yield return
+			new ClientMessage.DeleteStream(
+				corrId, corrId, Envelope, false, "chat-2", ExpectedVersion.Any, true, null);
+		yield return CreateNewProjectionMessage("test1", @"
+fromCategory('chat').when({
+    ChatMessage: function(s, e) {
+        copyTo('out1', e);
+    }
+})
+");
+	}
+
+	protected override bool GivenInitializeSystemProjections() {
+		return true;
+	}
+
+	protected override bool GivenStartSystemProjections() {
+		return true;
+	}
+
+	protected override string GivenQuery() {
+		return "";
+	}
+
+	[Test, Explicit]
+	public void just() {
+		DumpStream("$$chat-2");
+		DumpStream("$ce-chat");
+		DumpStream("out1");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/Scenarios/when_recategorizing_chat_events_by_users.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/Scenarios/when_recategorizing_chat_events_by_users.cs
new file mode 100644
index 00000000000..d3b0a779698
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/Scenarios/when_recategorizing_chat_events_by_users.cs
@@ -0,0 +1,138 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint.Scenarios;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(long))]
+public class when_recategorizing_chat_events_by_users<TLogFormat, TStream> : specification_with_js_query_posted<TLogFormat, TStream> {
+	protected override void GivenEvents() {
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		foreach (var e in base.When())
+			yield return e;
+		yield return CreateWriteEvent("chat-1", "ChatMessage", @"
+    {
+      ""sender"": ""Greg"",
+      ""message"": ""Hi"",
+      ""time"": ""03:45:30""
+    }");
+		yield return CreateWriteEvent("chat-1", "ChatMessage", @"
+    {
+      ""sender"": ""Ronan"",
+      ""message"": ""starbucks"",
+      ""time"": ""03:45:31""
+    }");
+		yield return CreateWriteEvent("chat-1", "ChatMessage", @"
+    {
+      ""sender"": ""James"",
+      ""message"": ""herpherp"",
+      ""time"": ""03:45:32""
+    }");
+		yield return CreateWriteEvent("chat-2", "ChatMessage", @"
+    {
+      ""sender"": ""Rob"",
+      ""message"": ""starbucks"",
+      ""time"": ""03:45:30""
+    }");
+		yield return CreateWriteEvent("chat-2", "ChatMessage", @"
+    {
+      ""sender"": ""Ronan"",
+      ""message"": ""put the moose in the chocolate"",
+      ""time"": ""03:45:31""
+    }");
+		yield return CreateQueryMessage("query1", @"
+fromCategory(""chat"")
+    .foreachStream()
+    .when({
+        $init: function() {
+            return { count: 0 }
+        },
+        ChatMessage: function(state, event) {
+            state.count += 1;
+            return state;
+        }
+    });
+");
+		yield return CreateQueryMessage("query2", @"
+fromCategory(""user"")
+    .foreachStream()
+    .when({
+        $init: function() {
+            return { count: 0 }
+        },
+        ChatMessage: function(state, event) {
+            state.count += 1;
+            return state;
+        }
+    });
+");
+	}
+
+	protected override bool GivenInitializeSystemProjections() {
+		return true;
+	}
+
+	protected override bool GivenStartSystemProjections() {
+		return true;
+	}
+
+	protected override string GivenQuery() {
+		return "";
+	}
+
+	protected override IEnumerable<string> GivenOtherProjections() {
+		yield return @"
+fromCategory(""chat"")
+.when({
+    ChatMessage: function(state, event) {
+        var userStream = ""user-"" + event.body.sender;
+        linkTo(userStream, event);
+    }
+})";
+
+		yield return @"
+fromCategory(""user"")
+    .foreachStream()
+    .when({
+        $init: function() {
+            return { count: 0 }
+        },
+        ChatMessage: function(state, event) {
+            state.count += 1;
+            return state;
+        }
+    }).outputState();
+";
+	}
+
+	[Test]
+	public void query1_returns_correct_result() {
+		AssertStreamTailWithLinks(
+			"$projections-query1-result", @"Result:{""count"":3}", @"Result:{""count"":2}", "$Eof:");
+	}
+
+	[Test]
+	public void query2_returns_correct_result() {
+		AssertStreamTailWithLinks(
+			"$projections-query2-result", @"Result:{""count"":1}", @"Result:{""count"":2}", @"Result:{""count"":1}",
+			@"Result:{""count"":1}", "$Eof:");
+	}
+
+	[Test]
+	public void other_1_projection_produces_correct_results() {
+		AssertStreamTail(
+			"$projections-other_1-result", "0@$projections-other_1-user-Greg-result",
+			"0@$projections-other_1-user-Ronan-result", "0@$projections-other_1-user-James-result",
+			"0@$projections-other_1-user-Rob-result", "1@$projections-other_1-user-Ronan-result");
+		AssertStreamTailWithLinks(
+			"$projections-other_1-result", @"Result:{""count"":1}", @"Result:{""count"":1}",
+			@"Result:{""count"":1}",
+			@"Result:{""count"":1}", @"Result:{""count"":2}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/Scenarios/when_running_a_query_using_link_metadata.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/Scenarios/when_running_a_query_using_link_metadata.cs
new file mode 100644
index 00000000000..932d76ed8f9
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/Scenarios/when_running_a_query_using_link_metadata.cs
@@ -0,0 +1,70 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Management;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint.Scenarios;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_running_a_query_using_link_metadata<TLogFormat, TStream> : specification_with_js_query_posted<TLogFormat, TStream> {
+	protected override void GivenEvents() {
+		ExistingEvent("stream", SystemEventTypes.LinkTo, "{\"a\":1}", "0@account-01");
+		ExistingEvent("stream", SystemEventTypes.LinkTo, "{\"a\":2}", "1@account-01");
+		ExistingEvent("stream", SystemEventTypes.LinkTo, "{\"a\":10}", "0@account-02");
+
+		ExistingEvent("account-01", "test", "", "{\"a\":1}", isJson: true);
+		ExistingEvent("account-01", "test", "", "{\"a\":2}", isJson: true);
+		ExistingEvent("account-02", "test", "", "{\"a\":10}", isJson: true);
+	}
+
+	protected override string GivenQuery() {
+		return @"
+fromStream('stream').when({
+    $any: function(s, e) {
+        // test
+        if (JSON.stringify(e.body) != JSON.stringify(e.linkMetadata))
+            throw 'invalid link metadata ' + JSON.stringify(e.linkMetadata) + ' expected is ' + JSON.stringify(e.body);
+
+        return e.linkMetadata;
+    }
+}).outputState()
+";
+	}
+
+	[Test]
+	public void just() {
+		AssertLastEvent("$projections-query-result", "{\"a\":10}", skip: 1 /* $eof */);
+	}
+
+	[Test]
+	public void state_becomes_completed() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetStatistics(
+				_bus, null, _projectionName, false));
+
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+				.Single()
+				.Projections.Length);
+		Assert.AreEqual(
+			_projectionName,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+				.Single()
+				.Projections.Single()
+				.Name);
+		Assert.AreEqual(
+			ManagedProjectionState.Completed,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+				.Single()
+				.Projections.Single()
+				.LeaderStatus);
+	}
+}
diff --git a/src/EventStore.Projections.Core.Tests/Services/Jint/Serialization/big_state.json b/src/KurrentDB.Projections.Core.Tests/Services/Jint/Serialization/big_state.json
similarity index 100%
rename from src/EventStore.Projections.Core.Tests/Services/Jint/Serialization/big_state.json
rename to src/KurrentDB.Projections.Core.Tests/Services/Jint/Serialization/big_state.json
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/Serialization/when_serializing_state.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/Serialization/when_serializing_state.cs
new file mode 100644
index 00000000000..25d4801b2f6
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/Serialization/when_serializing_state.cs
@@ -0,0 +1,169 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Numerics;
+using System.Text.Json;
+using Jint;
+using Jint.Native;
+using Jint.Native.Json;
+using KurrentDB.Projections.Core.Services.Interpreted;
+using NUnit.Framework;
+using JsonSerializer = Jint.Native.Json.JsonSerializer;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint.Serialization;
+
+[TestFixture]
+public class when_serializing_state {
+	private readonly Engine _engine;
+	private readonly JintProjectionStateHandler _sut;
+	private readonly JsonSerializer _builtIn;
+	private readonly JsonParser _parser;
+
+	public when_serializing_state() {
+		_engine = new Engine();
+		_parser = new JsonParser(_engine);
+		_builtIn = new JsonSerializer(_engine);
+		_sut = new JintProjectionStateHandler(
+			source: "",
+			enableContentTypeValidation: false,
+			compilationTimeout: TimeSpan.FromMilliseconds(500),
+			executionTimeout: TimeSpan.FromMilliseconds(500));
+	}
+
+	private void RoundTrip(string json, bool ignoreCase = false) {
+		var instance = _parser.Parse(json);
+		var builtInSerialized = _builtIn.Serialize(instance, JsValue.Undefined, JsValue.Undefined).AsString();
+		var serialized = _sut.Serialize(instance);
+
+		if (ignoreCase) {
+			Assert.IsTrue(
+				string.Equals(builtInSerialized, serialized, StringComparison.OrdinalIgnoreCase),
+				$"old {_builtIn} new {serialized}");
+			Assert.IsTrue(
+				string.Equals(json, serialized, StringComparison.OrdinalIgnoreCase),
+				$"in {json} out {serialized}");
+		} else {
+			Assert.AreEqual(builtInSerialized, serialized, "different to old serializer");
+			Assert.AreEqual(json, serialized, "did not round trip");
+		}
+	}
+
+	[Test]
+	public void round_trip_objects() {
+		RoundTrip(@"{}");
+		RoundTrip(@"{""foo"":123,""bar"":456}");
+		RoundTrip(@"{""fo o"":[1,2,3]}");
+		RoundTrip(@"{"" foo"":{}}");
+		RoundTrip(@"{""foo "":true}");
+	}
+
+	[Test]
+	public void round_trip_arrays() {
+		RoundTrip(@"[]");
+		RoundTrip(@"[[],3]");
+		RoundTrip(@"[3,[]]");
+		RoundTrip(@"[{},[[],null],{"""":[4,5,6]}]");
+	}
+
+	[Test]
+	public void round_trip_values() {
+		RoundTrip(@"""stringvalue""");
+		RoundTrip(@"34");
+		RoundTrip(@"{""foo"":""bar""}");
+		RoundTrip(@"[1,4,5,8]");
+		RoundTrip(@"true");
+		RoundTrip(@"false");
+		RoundTrip(@"null");
+	}
+
+	[Test]
+	public void round_trip_strings() {
+		RoundTrip(@"""""");
+		RoundTrip(@""" """);
+		RoundTrip(@"""foo""");
+		RoundTrip(@"""\""""");
+		RoundTrip(@"""\\""");
+		RoundTrip(@"""/""");
+		RoundTrip(@"""\b""");
+		RoundTrip(@"""\f""");
+		RoundTrip(@"""\n""");
+		RoundTrip(@"""\r""");
+		RoundTrip(@"""\t""");
+		RoundTrip(@"""€""");
+	}
+
+	[Test]
+	public void round_trip_numbers() {
+		//RoundTrip("18446744073709551615");
+		//RoundTrip("-18446744073709551615");
+		//RoundTrip("18446744073709551616");
+		//RoundTrip("-18446744073709551616");
+		RoundTrip("5");
+		RoundTrip("5E+123", ignoreCase: true);
+		RoundTrip("5E-123", ignoreCase: true);
+		RoundTrip("-5E-123", ignoreCase: true);
+		RoundTrip("-50");
+		RoundTrip("0");
+		RoundTrip("-0.03");
+		RoundTrip("0.0123");
+		RoundTrip("-0.0123");
+		RoundTrip("-1.23E-123", ignoreCase: true);
+	}
+
+	[Test]
+	public void big_int() {
+		var serialized = _sut.Serialize(new JsBigInt(BigInteger.Parse("20000000000000000000")));
+		Assert.AreEqual(@"""20000000000000000000""", serialized);
+	}
+
+	[Test]
+	public void undefined() {
+		var serialized = _sut.Serialize(JsValue.Undefined);
+		Assert.AreEqual(@"null", serialized);
+	}
+
+	[Test]
+	public void undefined_property() {
+		var instance = new JsObject(_engine);
+		instance.Set("foo", JsValue.Undefined);
+		instance.Set("bar", "baz");
+		var serialized = _sut.Serialize(instance);
+		Assert.AreEqual(@"{""bar"":""baz""}", serialized);
+	}
+
+	[Test]
+	public void whitespace() {
+		// nothing. we only want to test the serializer in this file, not the parser.
+	}
+
+	[Test]
+	public void big_state() {
+		var json = ReadJsonFromFile("big_state.json");
+		var instance = _parser.Parse(json);
+		var serialized = _sut.Serialize(instance);
+		Assert.AreEqual(json, serialized);
+	}
+
+	public static string ReadJsonFromFile(string filename) {
+		var assembly = typeof(when_serializing_state).Assembly;
+		var availableFiles = assembly.GetManifestResourceNames();
+		var streamName = availableFiles.Where(
+			x => x.StartsWith(typeof(when_serializing_state).Namespace) && x.EndsWith(filename)
+			).SingleOrDefault();
+		if (streamName == null)
+			throw new InvalidOperationException($"Could not find {filename}");
+		using var stream = assembly.GetManifestResourceStream(streamName);
+
+		var doc = JsonDocument.Parse(stream);
+		using var ms = new MemoryStream();
+		var writer = new Utf8JsonWriter(ms);
+		doc.WriteTo(writer);
+		writer.Flush();
+		ms.Position = 0;
+		using var sr = new StreamReader(ms);
+		return sr.ReadToEnd();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/TestFixtureWithInterpretedProjection.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/TestFixtureWithInterpretedProjection.cs
new file mode 100644
index 00000000000..9c189d785ee
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/TestFixtureWithInterpretedProjection.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+public abstract class TestFixtureWithInterpretedProjection {
+	protected ProjectionStateHandlerFactory _stateHandlerFactory;
+	protected IProjectionStateHandler _stateHandler;
+	protected List<string> _logged;
+	protected string _projection;
+	protected string _state = null;
+	protected string _sharedState = null;
+	protected IQuerySources _source;
+	protected TimeSpan CompilationTimeout { get; set; } = TimeSpan.FromMilliseconds(1000);
+	protected TimeSpan ExecutionTimeout { get; set; } = TimeSpan.FromMilliseconds(500);
+
+	[SetUp]
+	public void Setup() {
+		_state = null;
+		_projection = null;
+		Given();
+		_logged = new List<string>();
+		_stateHandlerFactory =
+			new ProjectionStateHandlerFactory(CompilationTimeout, ExecutionTimeout);
+		_stateHandler = CreateStateHandler();
+		_source = _stateHandler.GetSourceDefinition();
+
+		if (_state != null)
+			_stateHandler.Load(_state);
+		else
+			_stateHandler.Initialize();
+
+		if (_sharedState != null)
+			_stateHandler.LoadShared(_sharedState);
+		When();
+	}
+
+	protected const string _projectionType = "js";
+
+	protected virtual IProjectionStateHandler CreateStateHandler() {
+		return _stateHandlerFactory.Create(
+			_projectionType, _projection, true, null, logger: (s, _) => {
+				if (s.StartsWith("P:"))
+					Console.WriteLine(s);
+				else
+					_logged.Add(s);
+			}); // skip prelude debug output
+	}
+
+	protected virtual void When() {
+	}
+
+	protected abstract void Given();
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/specification_with_event_handled.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/specification_with_event_handled.cs
new file mode 100644
index 00000000000..dea7b24ae64
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/specification_with_event_handled.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+public abstract class specification_with_event_handled : TestFixtureWithInterpretedProjection {
+	protected ResolvedEvent _handledEvent;
+	protected string _newState;
+	protected string _newSharedState;
+	protected EmittedEventEnvelope[] _emittedEventEnvelopes;
+
+	protected override void When() {
+		_stateHandler.ProcessEvent(
+			"",
+			CheckpointTag.FromPosition(
+				0, _handledEvent.Position.CommitPosition, _handledEvent.Position.PreparePosition), "",
+			_handledEvent,
+			out _newState, out _newSharedState, out _emittedEventEnvelopes);
+	}
+
+	protected static ResolvedEvent CreateSampleEvent(
+		string streamId, int sequenceNumber, string eventType, string data, TFPos tfPos) {
+		return new ResolvedEvent(
+			streamId, sequenceNumber, streamId, sequenceNumber, true, tfPos, Guid.NewGuid(), eventType, true, data,
+			"{}", "{\"position_meta\":1}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_creating_jint_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_creating_jint_projection.cs
new file mode 100644
index 00000000000..47db96a0303
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_creating_jint_projection.cs
@@ -0,0 +1,163 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using Jint.Runtime;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+class when_creating_jint_projection {
+	private ProjectionStateHandlerFactory _stateHandlerFactory;
+	private const string _projectionType = "js";
+
+	[SetUp]
+	public void Setup() {
+		_stateHandlerFactory =
+			new ProjectionStateHandlerFactory(TimeSpan.FromMilliseconds(250), TimeSpan.FromMilliseconds(100));
+	}
+
+	[Test, Category(_projectionType)]
+	public void it_can_be_created() {
+		using (_stateHandlerFactory.Create(_projectionType, @"", true, null)) {
+		}
+	}
+
+	[Test, Category(_projectionType)]
+	public void js_syntax_errors_are_reported() {
+		try {
+			using (_stateHandlerFactory.Create(_projectionType, @"log(1;", true, null, logger: (s, _) => { })) {
+			}
+		} catch (Exception ex) {
+			Assert.IsInstanceOf<JavaScriptException>(ex);
+		}
+	}
+
+	[Test, Category(_projectionType)]
+	public void js_exceptions_errors_are_reported() {
+		try {
+			using (_stateHandlerFactory.Create(_projectionType, @"throw 123;", true, null, logger: (s, _) => { })) {
+			}
+		} catch (Exception ex) {
+			Assert.IsInstanceOf<JavaScriptException>(ex);
+			Assert.AreEqual("123", ex.Message);
+		}
+	}
+
+	[Test, Category(_projectionType)]
+	public void long_compilation_times_out() {
+		try {
+			using (_stateHandlerFactory.Create(_projectionType,
+				@"
+                                var i = 0;
+                                while (true) i++;
+                    ",
+				true,
+				null,
+				logger: (s, _) => { })) {
+			}
+		} catch (Exception ex) {
+			Assert.IsInstanceOf<TimeoutException>(ex);
+		}
+	}
+
+	[Test, Category(_projectionType)]
+	public void long_execution_times_out() {
+		try {
+			using (var h = _stateHandlerFactory.Create(_projectionType,
+				@"
+                        fromAll().when({
+                            $any: function (s, e) {
+                                log('1');
+                                var i = 0;
+                                while (true) i++;
+                            }
+                        });
+                    ",
+				true,
+				null,
+				logger: Console.WriteLine)) {
+				h.Initialize();
+				string newState;
+				EmittedEventEnvelope[] emittedevents;
+				h.ProcessEvent(
+					"partition",
+					CheckpointTag.FromPosition(0, 100, 50),
+					"stream",
+					"event",
+					"",
+					Guid.NewGuid(),
+					1,
+					"", "{}",
+					out newState, out emittedevents);
+			}
+		} catch (Exception ex) {
+			Assert.IsInstanceOf<TimeoutException>(ex);
+		}
+	}
+
+	[Test, Category(_projectionType)]
+	public void long_post_processing_times_out() {
+		try {
+			using (var h = _stateHandlerFactory.Create(_projectionType,
+				@"
+                        fromAll().when({
+                            $any: function (s, e) {
+                                return {};
+                            }
+                        })
+                        .transformBy(function(s){
+                                log('1');
+                                var i = 0;
+                                while (true) i++;
+                        });
+                    ",
+				true,
+				null,
+				logger: Console.WriteLine)) {
+				h.Initialize();
+				string newState;
+				EmittedEventEnvelope[] emittedevents;
+				h.ProcessEvent(
+					"partition", CheckpointTag.FromPosition(0, 100, 50), "stream", "event", "", Guid.NewGuid(), 1,
+					"", "{}",
+					out newState, out emittedevents);
+				h.TransformStateToResult();
+			}
+		} catch (Exception ex) {
+			Assert.IsInstanceOf<TimeoutException>(ex);
+		}
+	}
+
+	[Test, Category(_projectionType)]
+	public void long_execution_times_out_many() {
+		for (var i = 0; i < 10; i++) {
+			try {
+				using (var h = _stateHandlerFactory.Create(
+					_projectionType, @"
+                    fromAll().when({
+                        $any: function (s, e) {
+                            log('1');
+                            var i = 0;
+                            while (true) i++;
+                        }
+                    });
+                ", true, null, logger: Console.WriteLine)) {
+					h.Initialize();
+					string newState;
+					EmittedEventEnvelope[] emittedevents;
+					h.ProcessEvent(
+						"partition", CheckpointTag.FromPosition(0, 100, 50), "stream", "event", "", Guid.NewGuid(),
+						1,
+						"", "{}", out newState, out emittedevents);
+					Assert.Fail("Timeout didn't happen");
+				}
+			} catch (TimeoutException) {
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_defining_a_js_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_defining_a_js_projection.cs
new file mode 100644
index 00000000000..e97cc575672
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_defining_a_js_projection.cs
@@ -0,0 +1,531 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+[TestFixture]
+public class when_defining_a_js_projection {
+	private const string _projectionType = "INTERPRETED";
+	[TestFixture]
+	public class with_from_all_source : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                   fromAll().when({
+                        $any:function(state, event) {
+                            return state;
+                        }});
+                ";
+			_state = @"{""count"": 0}";
+		}
+
+		[Test, Category(_projectionType)]
+		public void source_definition_is_correct() {
+			var expected = SourceDefinitionBuilder.From(b => {
+				b.FromAll();
+				b.AllEvents();
+			});
+			AssertEx.AreEqual(expected, _source);
+		}
+	}
+
+	[TestFixture]
+	public class with_from_stream : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                    fromStream('stream1').when({
+                        $any:function(state, event) {
+                            return state;
+                        }});
+                ";
+			_state = @"{""count"": 0}";
+		}
+
+		[Test, Category(_projectionType)]
+		public void source_definition_is_correct() {
+			var expected = SourceDefinitionBuilder.From(b => {
+				b.AllEvents();
+				b.FromStream("stream1");
+			});
+			AssertEx.AreEqual(expected, _source);
+		}
+	}
+
+	[TestFixture]
+	public class with_multiple_from_streams : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                    fromStreams(['stream1', 'stream2', 'stream3']).when({
+                    $any: function(state, event) {
+                            return state;
+                        }});
+                ";
+			_state = @"{""count"": 0}";
+		}
+
+		[Test, Category(_projectionType)]
+		public void source_definition_is_correct() {
+			var expected = SourceDefinitionBuilder.From(b => {
+				b.AllEvents();
+				b.FromStream("stream1");
+				b.FromStream("stream2");
+				b.FromStream("stream3");
+			});
+			AssertEx.AreEqual(expected, _source);
+		}
+	}
+
+	[TestFixture]
+	public class with_multiple_from_streams_plain : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                    fromStreams('stream1', 'stream2', 'stream3').when({
+                        $any:function(state, event) {
+                            return state;
+                        }});
+                ";
+			_state = @"{""count"": 0}";
+		}
+
+		[Test, Category(_projectionType)]
+		public void source_definition_is_correct() {
+			var expected = SourceDefinitionBuilder.From(b => {
+				b.AllEvents();
+				b.FromStream("stream1");
+				b.FromStream("stream2");
+				b.FromStream("stream3");
+			});
+			AssertEx.AreEqual(expected, _source);
+		}
+	}
+
+	[TestFixture]
+	public class with_multiple_from_categories : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                    fromCategories(['category1', 'category2', 'category3']).when({
+                    $any: function(state, event) {
+                            return state;
+                        }});
+                ";
+			_state = @"{""count"": 0}";
+		}
+
+		[Test, Category(_projectionType)]
+		public void source_definition_is_correct() {
+			var expected = SourceDefinitionBuilder.From(b => {
+				b.AllEvents();
+				b.FromStream("$ce-category1");
+				b.FromStream("$ce-category2");
+				b.FromStream("$ce-category3");
+			});
+			AssertEx.AreEqual(expected, _source);
+		}
+	}
+
+	[TestFixture]
+	public class with_multiple_from_categories_plain : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                    fromCategories('category1', 'category2', 'category3').when({
+                        $any:function(state, event) {
+                            return state;
+                        }});
+                ";
+			_state = @"{""count"": 0}";
+		}
+
+		[Test, Category(_projectionType)]
+		public void source_definition_is_correct() {
+			var expected = SourceDefinitionBuilder.From(b => {
+				b.AllEvents();
+				b.FromStream("$ce-category1");
+				b.FromStream("$ce-category2");
+				b.FromStream("$ce-category3");
+			});
+			AssertEx.AreEqual(expected, _source);
+		}
+	}
+
+	[TestFixture]
+	public class with_from_category : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                    fromCategory('category1').when({
+                        $any:function(state, event) {
+                            return state;
+                        }});
+                ";
+			_state = @"{""count"": 0}";
+		}
+
+		[Test, Category(_projectionType)]
+		public void source_definition_is_correct() {
+			var expected = SourceDefinitionBuilder.From(b => {
+				b.AllEvents();
+				b.FromCategory("category1");
+			});
+			AssertEx.AreEqual(expected, _source);
+		}
+	}
+
+	[TestFixture]
+	public class with_from_category_by_stream : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                    fromCategory('category1').foreachStream().when({
+                        $any:function(state, event) {
+                            return state;
+                        }});
+                ";
+			_state = @"{""count"": 0}";
+		}
+
+		[Test, Category(_projectionType)]
+		public void source_definition_is_correct() {
+			var expected = SourceDefinitionBuilder.From(b => {
+				b.AllEvents();
+				b.FromCategory("category1");
+				b.SetByStream();
+			});
+			AssertEx.AreEqual(expected, _source);
+		}
+	}
+
+	[TestFixture]
+	public class with_from_all_by_custom_partitions : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                    fromAll().partitionBy(function(event){
+                        return event.eventType;
+                    }).when({
+                        $any:function(state, event) {
+                            return state;
+                        }});
+                ";
+			_state = @"{""count"": 0}";
+		}
+
+		[Test]
+		public void source_definition_is_correct() {
+			var expected = SourceDefinitionBuilder.From(b => {
+				b.AllEvents();
+				b.FromAll();
+				b.SetByCustomPartitions();
+			});
+			AssertEx.AreEqual(expected, _source);
+		}
+	}
+
+	[TestFixture]
+	public class with_output_to : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                    fromAll()
+                    .when({
+                        $any:function(state, event) {
+                            return state;
+                        }})
+                    .$defines_state_transform();
+                ";
+			_state = @"{""count"": 0}";
+		}
+
+		[Test]
+		public void source_definition_is_correct() {
+			var expected = SourceDefinitionBuilder.From(b => {
+				b.AllEvents();
+				b.FromAll();
+				b.SetDefinesStateTransform();
+				b.SetOutputState();
+			});
+			AssertEx.AreEqual(expected, _source);
+		}
+	}
+
+	[TestFixture]
+	public class with_transform_by : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                    fromAll().when({
+                        $any:function(state, event) {
+                            return state;
+                        }}).transformBy(function(s) {return s;});
+                ";
+			_state = @"{""count"": 0}";
+		}
+
+		[Test, Category(_projectionType)]
+		public void source_definition_is_correct() {
+			var expected = SourceDefinitionBuilder.From(b => {
+				b.AllEvents();
+				b.FromAll();
+				b.SetDefinesStateTransform();
+				b.SetOutputState();
+			});
+			AssertEx.AreEqual(expected, _source);
+		}
+	}
+
+	public class with_filter_by : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                    fromAll().when({
+                        some: function(state, event) {
+                            return state;
+                        }
+                    }).filterBy(function(s) {return true;});
+                ";
+			_state = @"{""count"": 0}";
+		}
+
+		[Test, Category(_projectionType)]
+		public void source_definition_is_correct() {
+			var expected = SourceDefinitionBuilder.From(b => {
+				b.FromAll();
+				b.IncludeEvent("some");
+				b.SetDefinesStateTransform();
+				b.SetOutputState();
+			});
+			AssertEx.AreEqual(expected, _source);
+		}
+	}
+
+	public class with_output_state : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                    var z = fromAll().outputState();
+                ";
+			_state = @"{""count"": 0}";
+		}
+
+		[Test, Category(_projectionType)]
+		public void source_definition_is_correct() {
+			var expected = SourceDefinitionBuilder.From(b => {
+				b.AllEvents();
+				b.FromAll();
+				b.NoWhen();
+				b.SetOutputState();
+			});
+			AssertEx.AreEqual(expected, _source);
+		}
+	}
+
+	public class without_when : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                    var z = fromAll();
+                ";
+			_state = @"{""count"": 0}";
+		}
+
+		[Test, Category(_projectionType)]
+		public void source_definition_is_correct() {
+			var expected = SourceDefinitionBuilder.From(b => {
+				b.AllEvents();
+				b.FromAll();
+				b.NoWhen();
+			});
+			AssertEx.AreEqual(expected, _source);
+		}
+	}
+
+	public class with_when : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                    var z = fromAll().when({a: function(s,e) {}});
+                ";
+			_state = @"{""count"": 0}";
+		}
+
+		[Test, Category(_projectionType)]
+		public void source_definition_is_correct() {
+			var expected = SourceDefinitionBuilder.From(b => {
+				b.FromAll();
+				b.IncludeEvent("a");
+			});
+			AssertEx.AreEqual(expected, _source);
+		}
+	}
+
+	[TestFixture]
+	public class with_state_stream_name_option : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                    options({
+                        resultStreamName: 'state-stream',
+                    });
+                    fromAll().when({
+                        $any:function(state, event) {
+                            return state;
+                        }});
+                ";
+			_state = @"{""count"": 0}";
+		}
+
+		[Test, Category(_projectionType)]
+		public void source_definition_is_correct() {
+			var expected = SourceDefinitionBuilder.From(b => {
+				b.AllEvents();
+				b.FromAll();
+				b.SetResultStreamNameOption("state-stream");
+			});
+			AssertEx.AreEqual(expected, _source);
+		}
+	}
+
+	[TestFixture]
+	public class with_include_links_option : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                    options({
+                        $includeLinks: true,
+                    });
+                    fromAll().when({
+                        $any:function(state, event) {
+                            return state;
+                        }});
+                ";
+			_state = @"{""count"": 0}";
+		}
+
+		[Test, Category(_projectionType)]
+		public void source_definition_is_correct() {
+			var expected = SourceDefinitionBuilder.From(b => {
+				b.AllEvents();
+				b.FromAll();
+				b.SetIncludeLinks();
+			});
+			AssertEx.AreEqual(expected, _source);
+		}
+	}
+
+	[TestFixture]
+	public class with_bi_state_option : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                    options({
+                        biState: true,
+                    });
+                    fromAll().when({
+                        $any:function(state, sharedState, event) {
+                            return state;
+                        }});
+                ";
+			_state = @"{""count"": 0}";
+		}
+
+		[Test, Category(_projectionType)]
+		public void source_definition_is_correct() {
+			var expected = SourceDefinitionBuilder.From(b => {
+				b.AllEvents();
+				b.FromAll();
+				b.SetDefinesFold();
+				b.SetIsBiState(true);
+			});
+			AssertEx.AreEqual(expected, _source);
+		}
+	}
+
+	[TestFixture]
+	public class with_reorder_events_option : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                    options({
+                        reorderEvents: true,
+                        processingLag: 500,
+                    });
+                    fromAll().when({
+                        $any:function(state, event) {
+                            return state;
+                        }});
+                ";
+			_state = @"{""count"": 0}";
+		}
+
+		[Test, Category(_projectionType)]
+		public void source_definition_is_correct() {
+			var expected = SourceDefinitionBuilder.From(b => {
+				b.AllEvents();
+				b.FromAll();
+				b.SetProcessingLag(500);
+				b.SetReorderEvents(true);
+			});
+			AssertEx.AreEqual(expected, _source);
+		}
+	}
+
+	[TestFixture]
+	public class with_multiple_option_statements : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                    options({
+                        reorderEvents: false,
+                        processingLag: 500,
+                    });
+                    options({
+                        reorderEvents: true,
+                    });
+                    fromAll().when({
+                        $any:function(state, event) {
+                            return state;
+                        }});
+                ";
+			_state = @"{""count"": 0}";
+		}
+
+		[Test, Category(_projectionType)]
+		public void source_definition_is_correct() {
+			var expected = SourceDefinitionBuilder.From(b => {
+				b.AllEvents();
+				b.FromAll();
+				b.SetProcessingLag(500);
+				b.SetReorderEvents(true);
+			});
+			AssertEx.AreEqual(expected, _source);
+		}
+	}
+
+	[TestFixture]
+	public class with_foreach_and_deleted_notification_handled : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"fromAll().foreachStream().when({
+                $deleted: function(){}
+            })";
+			_state = @"{}";
+		}
+
+		[Test]
+		public void source_definition_is_correct() {
+			var expected = SourceDefinitionBuilder.From(b => {
+				b.AllEvents();
+				b.FromAll();
+				b.SetByStream();
+				b.SetHandlesStreamDeletedNotifications();
+			});
+			AssertEx.AreEqual(expected, _source);
+		}
+	}
+
+	[TestFixture]
+	public class with_deleted_notification_handled : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"fromAll().when({
+                $deleted: function(){}
+            })";
+			_state = @"{}";
+		}
+
+		[Test]
+		public void source_definition_is_correct() {
+			var expected = SourceDefinitionBuilder.From(b => {
+				b.AllEvents();
+				b.FromAll();
+				b.SetHandlesStreamDeletedNotifications();
+			});
+			AssertEx.AreEqual(expected, _source);
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_initializing_state.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_initializing_state.cs
new file mode 100644
index 00000000000..e728cfee66b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_initializing_state.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+[TestFixture]
+public class when_initializing_state : TestFixtureWithInterpretedProjection {
+	protected override void Given() {
+		_projection = @"
+                fromAll().when({
+                    $init: function() {
+                        return { test: '1' };
+                    },
+
+                    type1: function(state, event) {
+                        return state;
+                    },
+                }).transformBy(function(s) { return s;});
+            ";
+	}
+
+	[Test, Category(_projectionType)]
+	public void process_event_should_return_initialized_state() {
+		string state;
+		EmittedEventEnvelope[] emittedEvents;
+		_stateHandler.ProcessEvent(
+			"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category",
+			Guid.NewGuid(), 0, "metadata", @"{""a"":""b""}", out state, out emittedEvents);
+		Assert.IsTrue(state.Contains("\"test\":\"1\""));
+	}
+
+	[Test, Category(_projectionType)]
+	public void transform_state_should_return_initialized_state() {
+		var result = _stateHandler.TransformStateToResult();
+		Assert.IsTrue(result.Contains("\"test\":\"1\""));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_js_projection_loading_state.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_js_projection_loading_state.cs
new file mode 100644
index 00000000000..47c8175b684
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_js_projection_loading_state.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+[TestFixture]
+public class when_js_projection_loading_state : TestFixtureWithInterpretedProjection {
+	protected override void Given() {
+		_projection = @"
+                fromAll().when({$any:
+                    function(state, event) {
+                        return state;
+                    }
+                });
+            ";
+		_state = @"{""A"":""A"",""B"":""B""}";
+	}
+
+	[Test, Category(_projectionType)]
+	public void the_state_is_loaded() {
+		string state;
+		EmittedEventEnvelope[] emittedEvents;
+		_stateHandler.ProcessEvent(
+			"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
+			"metadata",
+			@"{""x"":""y""}", out state, out emittedEvents);
+
+		Assert.AreEqual(_state, state);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_not_returning_state_from_a_js_handler.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_not_returning_state_from_a_js_handler.cs
new file mode 100644
index 00000000000..fb68eccfa1d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_not_returning_state_from_a_js_handler.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+[TestFixture]
+public class when_not_returning_state_from_a_js_handler : TestFixtureWithInterpretedProjection {
+	protected override void Given() {
+		_projection = @"
+                fromAll().when({$any: function(state, event) {
+                    state.newValue = 'new';
+                }});
+            ";
+	}
+
+	[Test, Category(_projectionType)]
+	public void process_event_should_return_updated_state() {
+		string state;
+		EmittedEventEnvelope[] emittedEvents;
+		_stateHandler.ProcessEvent(
+			"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category",
+			Guid.NewGuid(), 0, "metadata", @"{""a"":""b""}", out state, out emittedEvents);
+		Assert.IsTrue(state.Contains("\"newValue\":\"new\""));
+	}
+
+	[Test, Category(_projectionType)]
+	public void process_event_returns_true() {
+		string state;
+		EmittedEventEnvelope[] emittedEvents;
+		var result = _stateHandler.ProcessEvent(
+			"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category",
+			Guid.NewGuid(), 0, "metadata", @"{""a"":""b""}", out state, out emittedEvents);
+
+		Assert.IsTrue(result);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_partitioning_by_custom_rule.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_partitioning_by_custom_rule.cs
new file mode 100644
index 00000000000..52facf9bb88
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_partitioning_by_custom_rule.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+[TestFixture]
+public class when_partitioning_by_custom_rule : TestFixtureWithInterpretedProjection {
+	protected override void Given() {
+		_projection = @"
+                fromAll().partitionBy(function(event){
+                    return event.body.region;
+                }).when({$any:function(event, state) {
+                    return {};
+                }});
+            ";
+	}
+
+	[Test]
+	public void get_state_partition_returns_correct_result() {
+		var result = _stateHandler.GetStatePartition(
+			CheckpointTag.FromPosition(0, 100, 50), "category",
+			new ResolvedEvent(
+				"stream1", 0, "stream1", 0, false, new TFPos(100, 50), Guid.NewGuid(), "type1", true,
+				@"{""region"":""Europe""}", "metadata"));
+
+		Assert.AreEqual("Europe", result);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_partitioning_by_custom_rule_returning_a_number.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_partitioning_by_custom_rule_returning_a_number.cs
new file mode 100644
index 00000000000..f3a1e565124
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_partitioning_by_custom_rule_returning_a_number.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+[TestFixture]
+public class when_partitioning_by_custom_rule_returning_a_number : TestFixtureWithInterpretedProjection {
+	protected override void Given() {
+		_projection = @"
+                fromAll().partitionBy(function(event){
+                    return event.body.index;
+                }).when({$any:function(event, state) {
+                    return {};
+                }});
+            ";
+	}
+
+	[Test]
+	public void get_state_partition_returns_correct_result() {
+		var result = _stateHandler.GetStatePartition(
+			CheckpointTag.FromPosition(0, 100, 50), "category",
+			new ResolvedEvent(
+				"stream1", 0, "stream1", 0, false, new TFPos(100, 50), Guid.NewGuid(), "type1", true,
+				@"{""index"": 42}", "metadata"));
+
+		Assert.AreEqual("42", result);
+	}
+
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_faulting_js_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_faulting_js_projection.cs
new file mode 100644
index 00000000000..6df8be355b4
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_faulting_js_projection.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using Jint.Runtime;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+public class when_running_a_faulting_js_projection {
+	[TestFixture]
+	public class when_event_handler_throws : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                    fromAll();
+                    on_any(function(state, event) {
+                        log(state.count);
+                        throw ""failed"";
+                        return state;
+                    });
+                ";
+			_state = @"{""count"": 0}";
+		}
+
+		[Test, Category(_projectionType)]
+		public void process_event_throws_javascript_exception() {
+			try {
+				string state;
+				EmittedEventEnvelope[] emittedEvents;
+				_stateHandler.ProcessEvent(
+					"", CheckpointTag.FromPosition(0, 10, 5), "stream1", "type1", "category", Guid.NewGuid(), 0,
+					"metadata",
+					@"{""a"":""b""}", out state, out emittedEvents);
+			} catch (Exception ex) {
+				Assert.IsInstanceOf<JavaScriptException>(ex);
+				Assert.AreEqual("failed", ex.Message);
+			}
+		}
+	}
+
+	[TestFixture]
+	public class when_state_transform_throws : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                    fromAll().when({$any: function(state, event) {
+                        return state;
+                    }})
+                    .transformBy(function (s) { throw ""failed"";});
+                ";
+			_state = @"{""count"": 0}";
+		}
+
+		[Test, Category(_projectionType)]
+		public void process_event_throws_javascript_exception() {
+			try {
+				string state;
+				EmittedEventEnvelope[] emittedEvents;
+				Assert.DoesNotThrow(() => _stateHandler.ProcessEvent(
+					"", CheckpointTag.FromPosition(0, 10, 5), "stream1", "type1", "category", Guid.NewGuid(), 0,
+					"metadata",
+					@"{""a"":""b""}", out state, out emittedEvents));
+				_stateHandler.TransformStateToResult();
+			} catch (Exception ex) {
+				Assert.IsInstanceOf<JavaScriptException>(ex);
+				Assert.AreEqual("failed", ex.Message);
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_emitting_invalid_events.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_emitting_invalid_events.cs
new file mode 100644
index 00000000000..555053fac1d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_emitting_invalid_events.cs
@@ -0,0 +1,107 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+public abstract class when_running_a_js_projection_emitting_invalid_events : TestFixtureWithInterpretedProjection {
+
+	protected override void Given() {
+		_projection = @"
+			              fromAll().when({$any:
+			                  function(state, event) {
+			                      emit(" + FormatEmitParameters + @");
+			                  return {};
+			              }});
+			          ";
+	}
+
+	protected virtual string StreamId => "'testStream'";
+	protected virtual string EventType => "'testEventType'";
+	protected virtual string EventBody => "{}";
+	protected virtual string FormatEmitParameters => $"{StreamId}, {EventType}, {EventBody}";
+	protected virtual bool IsNull => false;
+	protected abstract string ParameterName { get; }
+	[Test, Category(_projectionType)]
+	public void process_event_faults() {
+		string state;
+		EmittedEventEnvelope[] emittedEvents;
+		TestDelegate td = () =>
+			_stateHandler.ProcessEvent(
+				"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
+				"metadata",
+				@"{""a"":""b""}", out state, out emittedEvents);
+		var ae = IsNull ? Assert.Throws<ArgumentNullException>(td) : Assert.Throws<ArgumentException>(td);
+		Assert.AreEqual(ParameterName, ae.ParamName);
+	}
+
+	public class null_stream : when_running_a_js_projection_emitting_invalid_events {
+		protected override string ParameterName => "streamId";
+		protected override string StreamId => "null";
+		protected override bool IsNull => true;
+	}
+
+	public class empty_stream : when_running_a_js_projection_emitting_invalid_events {
+		protected override string ParameterName => "streamId";
+		protected override string StreamId => "''";
+		protected override bool IsNull => true;
+	}
+
+	public class object_stream : when_running_a_js_projection_emitting_invalid_events {
+		protected override string ParameterName => "streamId";
+		protected override string StreamId => "{\"a\":\"b\"}";
+	}
+
+	public class undefined_stream : when_running_a_js_projection_emitting_invalid_events {
+		protected override string ParameterName => "streamId";
+		protected override string StreamId => "undefined";
+		protected override bool IsNull => true;
+
+	}
+
+
+	public class null_eventtype : when_running_a_js_projection_emitting_invalid_events {
+		protected override string ParameterName => "eventName";
+		protected override string EventType => "null";
+		protected override bool IsNull => true;
+	}
+
+	public class empty_eventtype : when_running_a_js_projection_emitting_invalid_events {
+		protected override string ParameterName => "eventName";
+		protected override string EventType => "''";
+		protected override bool IsNull => true;
+	}
+
+	public class object_eventtype : when_running_a_js_projection_emitting_invalid_events {
+		protected override string ParameterName => "eventName";
+		protected override string EventType => "{\"a\":\"b\"}";
+	}
+
+	public class undefined_eventtype : when_running_a_js_projection_emitting_invalid_events {
+		protected override string ParameterName => "eventName";
+		protected override string EventType => "undefined";
+		protected override bool IsNull => true;
+	}
+
+	public class null_eventbody : when_running_a_js_projection_emitting_invalid_events {
+		protected override string ParameterName => "eventBody";
+		protected override string EventBody => "null";
+		protected override bool IsNull => true;
+	}
+
+	public class nonobject_eventbody : when_running_a_js_projection_emitting_invalid_events {
+		protected override string ParameterName => "eventBody";
+		protected override string EventBody => "'test'";
+	}
+
+	public class undefined_eventbody : when_running_a_js_projection_emitting_invalid_events {
+		protected override string ParameterName => "eventBody";
+		protected override bool IsNull => true;
+		protected override string EventBody => "undefined";
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_emitting_invalid_links.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_emitting_invalid_links.cs
new file mode 100644
index 00000000000..b2eb5dcaba6
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_emitting_invalid_links.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+public class when_running_a_js_projection_emitting_invalid_links : TestFixtureWithInterpretedProjection {
+	protected override void Given() {
+		_projection = @"
+                fromAll().when({$any:
+                    function(state, event) {
+						event = {};
+                    linkTo('output-stream', event);
+                    return {};
+                }});
+            ";
+	}
+
+	[Test, Category(_projectionType)]
+	public void process_event_does_not_allow_emitted_event() {
+		var ex = Assert.Throws<Exception>(() => {
+			_stateHandler.ProcessEvent(
+				"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
+				"metadata",
+				@"{""a"":""b""}", out _, out var emittedEvents);
+		});
+		Assert.AreEqual("Invalid link to event undefined@undefined", ex.Message);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_emitting_metadata.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_emitting_metadata.cs
new file mode 100644
index 00000000000..95ce5afe035
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_emitting_metadata.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+[TestFixture]
+public class when_running_a_js_projection_emitting_metadata : TestFixtureWithInterpretedProjection {
+	protected override void Given() {
+		_projection = @"
+                fromAll().when({$any:
+                    function(state, event) {
+                    emit('output-stream' + event.sequenceNumber, 'emitted-event' + event.sequenceNumber, {a: JSON.parse(event.bodyRaw).a}, {m1: 1, m2: ""2""});
+                    return {};
+                }});
+            ";
+	}
+
+	[Test, Category(_projectionType)]
+	public void process_event_returns_true() {
+		string state;
+		EmittedEventEnvelope[] emittedEvents;
+		var result = _stateHandler.ProcessEvent(
+			"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
+			"metadata",
+			@"{""a"":""b""}", out state, out emittedEvents);
+
+		Assert.IsTrue(result);
+	}
+
+	[Test, Category(_projectionType)]
+	public void process_event_returns_emitted_event() {
+		string state;
+		EmittedEventEnvelope[] emittedEvents;
+		_stateHandler.ProcessEvent(
+			"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
+			"metadata",
+			@"{""a"":""b""}", out state, out emittedEvents);
+
+		Assert.IsNotNull(emittedEvents);
+		Assert.AreEqual(1, emittedEvents.Length);
+		Assert.AreEqual("emitted-event0", emittedEvents[0].Event.EventType);
+		Assert.AreEqual("output-stream0", emittedEvents[0].Event.StreamId);
+		Assert.AreEqual(@"{""a"":""b""}", emittedEvents[0].Event.Data);
+		var extraMetaData = emittedEvents[0].Event.ExtraMetaData().ToArray();
+		Assert.IsNotNull(extraMetaData);
+		Assert.AreEqual(2, extraMetaData.Length);
+	}
+
+	[Test, Category(_projectionType), Category("Manual"), Explicit]
+	public void can_pass_though_millions_of_events() {
+		int i;
+		var sw = Stopwatch.StartNew();
+		for (i = 0; i < 100000000; i++) {
+			EmittedEventEnvelope[] emittedEvents;
+			_stateHandler.ProcessEvent(
+				"", CheckpointTag.FromPosition(0, i * 10 + 20, i * 10 + 10), "stream" + i, "type" + i, "category",
+				Guid.NewGuid(), i, "metadata", @"{""a"":""" + i + @"""}", out _, out emittedEvents);
+
+			Assert.IsNotNull(emittedEvents);
+			Assert.AreEqual(1, emittedEvents.Length);
+			Assert.AreEqual("emitted-event" + i, emittedEvents[0].Event.EventType);
+			Assert.AreEqual("output-stream" + i, emittedEvents[0].Event.StreamId);
+			Assert.AreEqual(@"{""a"":""" + i + @"""}", emittedEvents[0].Event.Data);
+			if (sw.Elapsed > TimeSpan.FromSeconds(120))
+				break;
+		}
+
+		Console.WriteLine(i);
+
+		//TODO: replace with an actual benchmark
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_with_transform_by.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_with_transform_by.cs
new file mode 100644
index 00000000000..06383537a80
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_js_projection_with_transform_by.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+[TestFixture]
+public class when_running_a_js_projection_with_transform_by : TestFixtureWithInterpretedProjection {
+	protected override void Given() {
+		_projection = @"
+                fromAll().when({
+                    $any: function(state, event) {
+                        state.a = '1';
+                        return state;
+                    }
+                })
+                .transformBy(function(state) {
+                    state.b = '2';
+                    return state;
+                });
+            ";
+	}
+
+	[Test, Category(_projectionType)]
+	public void transform_state_returns_correct_result() {
+		string state;
+		EmittedEventEnvelope[] emittedEvents;
+		_stateHandler.ProcessEvent(
+			"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
+			"metadata",
+			@"{}", out state, out emittedEvents);
+		var result = _stateHandler.TransformStateToResult();
+
+		Assert.IsNotNull(result);
+		Assert.AreEqual(@"{""a"":""1"",""b"":""2""}", result);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_projection_with_created_handler.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_projection_with_created_handler.cs
new file mode 100644
index 00000000000..be97ee62422
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_projection_with_created_handler.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+[TestFixture]
+public class when_running_a_projection_with_created_handler : TestFixtureWithInterpretedProjection {
+	protected override void Given() {
+		_projection = @"
+                fromAll().foreachStream().when({
+                    $created: function(s, e) {
+                        emit('stream1', 'event1', {a:1});
+                    }
+                });
+            ";
+		_state = @"{}";
+	}
+
+	[Test, Category(_projectionType)]
+	public void returns_emitted_events() {
+		var e = new ResolvedEvent(
+			"stream", 0, "stream", 0, false, new TFPos(1000, 900), Guid.NewGuid(), "event", true, "{}",
+			"{\"m\":1}");
+
+		EmittedEventEnvelope[] emittedEvents;
+		_stateHandler.ProcessPartitionCreated(
+			"partition", CheckpointTag.FromPosition(0, 10, 5), e, out emittedEvents);
+
+		Assert.IsNotNull(emittedEvents);
+		Assert.AreEqual(1, emittedEvents.Length);
+		Assert.AreEqual("stream1", emittedEvents[0].Event.StreamId);
+		Assert.AreEqual("event1", emittedEvents[0].Event.EventType);
+		Assert.AreEqual("{\"a\":1}", emittedEvents[0].Event.Data);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_v8_projection_emitting_stream_links.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_v8_projection_emitting_stream_links.cs
new file mode 100644
index 00000000000..edea1b23b3d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_v8_projection_emitting_stream_links.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+[TestFixture]
+public class when_running_a_v8_projection_emitting_stream_links : TestFixtureWithInterpretedProjection {
+	protected override void Given() {
+		_projection = @"
+                fromAll().when({$any:
+                    function(state, event) {
+                    linkStreamTo('output-stream' + event.sequenceNumber, 'stream' + event.sequenceNumber);
+                    return {};
+                }});
+            ";
+	}
+
+	[Test, Category(_projectionType)]
+	public void process_event_returns_true() {
+		string state;
+		EmittedEventEnvelope[] emittedEvents;
+		var result = _stateHandler.ProcessEvent(
+			"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
+			"metadata",
+			@"{""a"":""b""}", out state, out emittedEvents);
+
+		Assert.IsTrue(result);
+	}
+
+	[Test, Category(_projectionType)]
+	public void process_event_returns_emitted_event() {
+		string state;
+		EmittedEventEnvelope[] emittedEvents;
+		_stateHandler.ProcessEvent(
+			"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
+			"metadata",
+			@"{""a"":""b""}", out state, out emittedEvents);
+
+		Assert.IsNotNull(emittedEvents);
+		Assert.AreEqual(1, emittedEvents.Length);
+		Assert.AreEqual("$@", emittedEvents[0].Event.EventType);
+		Assert.AreEqual("output-stream0", emittedEvents[0].Event.StreamId);
+		Assert.AreEqual("stream0", emittedEvents[0].Event.Data);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_v8_projection_with_not_passing_filter_by.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_v8_projection_with_not_passing_filter_by.cs
new file mode 100644
index 00000000000..b175cb99f65
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_a_v8_projection_with_not_passing_filter_by.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+[TestFixture]
+public class when_running_a_v8_projection_with_not_passing_filter_by : TestFixtureWithInterpretedProjection {
+	protected override void Given() {
+		_projection = @"
+                fromAll().when({$any:
+                    function(state, event) {
+                        state.a = event.body.a;
+                        return state;
+                    }
+                })
+                .filterBy(function(state) {
+                    return state.a == '2';
+                });
+            ";
+	}
+
+	[Test, Category(_projectionType)]
+	public void filter_by_that_passes_returns_correct_result() {
+		string state;
+		EmittedEventEnvelope[] emittedEvents;
+		_stateHandler.ProcessEvent(
+			"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
+			"metadata",
+			@"{""a"":""2""}", out state, out emittedEvents);
+		var result = _stateHandler.TransformStateToResult();
+
+		Assert.IsNotNull(result);
+		Assert.AreEqual(@"{""a"":""2""}", result);
+	}
+
+	[Test, Category(_projectionType)]
+	public void filter_by_that_does_not_pass_returns_correct_result() {
+		string state;
+		EmittedEventEnvelope[] emittedEvents;
+		_stateHandler.ProcessEvent(
+			"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
+			"metadata",
+			@"{""a"":""3""}", out state, out emittedEvents);
+		var result = _stateHandler.TransformStateToResult();
+
+		Assert.IsNull(result);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_bi_state_js_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_bi_state_js_projection.cs
new file mode 100644
index 00000000000..7ea1513a964
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_bi_state_js_projection.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text.Json;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+[TestFixture]
+public class when_running_bi_state_js_projection : TestFixtureWithInterpretedProjection {
+	protected override void Given() {
+		_projection = @"
+                options({
+                    biState: true,
+                });
+                fromAll().foreachStream().when({
+                    type1: function(state, event) {
+                        state[0].count = state[0].count + 1;
+                        state[1].sharedCount = state[1].sharedCount + 1;
+                        return state;
+                    }});
+            ";
+		_state = @"{""count"": 0}";
+		_sharedState = @"{""sharedCount"": 0}";
+	}
+
+	[Test, Category(_projectionType)]
+	public void process_event_counts_events() {
+		_stateHandler.ProcessEvent(
+			"", CheckpointTag.FromPosition(0, 10, 5), "stream1", "type1", "category", Guid.NewGuid(), 0, "metadata",
+			@"{""a"":""b""}", out var state, out var sharedState, out var emittedEvents);
+
+		Assert.Null(emittedEvents);
+		Assert.NotNull(state);
+		Assert.NotNull(sharedState);
+		var stateJson = JsonDocument.Parse(state);
+		var sharedJson = JsonDocument.Parse(sharedState);
+		Assert.True(stateJson.RootElement.TryGetProperty("count", out var stateCount));
+		Assert.AreEqual(JsonValueKind.Number, stateCount.ValueKind);
+		Assert.AreEqual(1, stateCount.GetInt32());
+
+		Assert.True(sharedJson.RootElement.TryGetProperty("sharedCount", out var sharedCount));
+		Assert.AreEqual(JsonValueKind.Number, sharedCount.ValueKind);
+		Assert.AreEqual(1, sharedCount.GetInt32());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_body_reflecting_v8_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_body_reflecting_v8_projection.cs
new file mode 100644
index 00000000000..f2fb5584ef2
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_body_reflecting_v8_projection.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+[TestFixture]
+public class when_running_body_reflecting_v8_projection : TestFixtureWithInterpretedProjection {
+	protected override void Given() {
+		_projection = @"
+                fromAll().when({$any:
+                    function(state, event) {
+                        if (event.body)
+                            return event.body;
+                            else return {};
+                    }
+                });
+            ";
+	}
+
+	[Test, Category(_projectionType)]
+	public void process_event_should_reflect_event() {
+		string state;
+		EmittedEventEnvelope[] emittedEvents;
+		_stateHandler.ProcessEvent(
+			"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
+			"metadata",
+			@"{""a"":""b""}", out state, out emittedEvents);
+		Assert.AreEqual(@"{""a"":""b""}", state);
+	}
+
+	[Test, Category(_projectionType)]
+	public void process_event_should_not_reflect_non_json_events_even_if_valid_json() {
+		string state;
+		EmittedEventEnvelope[] emittedEvents;
+		_stateHandler.ProcessEvent(
+			"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
+			"metadata",
+			@"{""a"":""b""}", out state, out emittedEvents, isJson: false);
+		Assert.AreEqual(@"{}", state);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_counting_js_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_counting_js_projection.cs
new file mode 100644
index 00000000000..acd172986d7
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_counting_js_projection.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Globalization;
+using System.Text.Json;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+[TestFixture]
+public class when_running_counting_js_projection : TestFixtureWithInterpretedProjection {
+	protected override void Given() {
+		_projection = @"
+                fromAll().when({$any:
+                    function(state, event) {
+                        state.count = state.count + 1;
+                        return state;
+                    }});
+            ";
+		_state = @"{""count"": 0}";
+	}
+
+	[Test, Category(_projectionType)]
+	public void process_event_counts_events() {
+		string state;
+		EmittedEventEnvelope[] emittedEvents;
+		_stateHandler.ProcessEvent(
+			"", CheckpointTag.FromPosition(0, 10, 5), "stream1", "type1", "category", Guid.NewGuid(), 0, "metadata",
+			@"{""a"":""b""}", out state, out emittedEvents);
+		_stateHandler.ProcessEvent(
+			"", CheckpointTag.FromPosition(0, 20, 15), "stream1", "type1", "category", Guid.NewGuid(), 1,
+			"metadata",
+			@"{""a"":""b""}", out state, out emittedEvents);
+
+
+		Assert.Null(emittedEvents);
+		Assert.NotNull(state);
+
+		var stateJson = JsonDocument.Parse(state);
+		Assert.True(stateJson.RootElement.TryGetProperty("count", out var stateCount));
+		Assert.AreEqual(JsonValueKind.Number, stateCount.ValueKind);
+		Assert.AreEqual(2, stateCount.GetInt32());
+
+	}
+
+	[Test, Category(_projectionType), Category("Manual"), Explicit]
+	public void can_handle_million_events() {
+		for (var i = 0; i < 1000000; i++) {
+			_logged.Clear();
+			string state;
+			EmittedEventEnvelope[] emittedEvents;
+			_stateHandler.ProcessEvent(
+				"", CheckpointTag.FromPosition(0, i * 10, i * 10 - 5), "stream" + i, "type" + i, "category",
+				Guid.NewGuid(), 0,
+				"metadata", @"{""a"":""" + i + @"""}", out state, out emittedEvents);
+			Assert.AreEqual(1, _logged.Count);
+			Assert.AreEqual((i + 1).ToString(CultureInfo.InvariantCulture), _logged[_logged.Count - 1]);
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_emitting_js_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_emitting_js_projection.cs
new file mode 100644
index 00000000000..93755821a46
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_emitting_js_projection.cs
@@ -0,0 +1,86 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+[TestFixture]
+public class when_running_emitting_js_projection : TestFixtureWithInterpretedProjection {
+	protected override void Given() {
+		_projection = @"
+                fromAll().when({$any:
+                    function(state, event) {
+					let targetMetadata = Object.assign({}, event.metadata);
+					targetMetadata.g = 'h';
+					targetMetadata.i = 10;
+                    emit('output-stream' + event.sequenceNumber, 'emitted-event' + event.sequenceNumber, {a: JSON.parse(event.bodyRaw).a}, targetMetadata);
+                    return {};
+                }});
+            ";
+	}
+
+	[Test, Category(_projectionType)]
+	public void process_event_returns_true() {
+		string state;
+		EmittedEventEnvelope[] emittedEvents;
+		var result = _stateHandler.ProcessEvent(
+			"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
+			"{\"d\":\"e\"}",
+			@"{""a"":""b""}", out state, out emittedEvents);
+
+		Assert.IsTrue(result);
+	}
+
+	[Test, Category(_projectionType)]
+	public void process_event_returns_emitted_event() {
+		string state;
+		EmittedEventEnvelope[] emittedEvents;
+		_stateHandler.ProcessEvent(
+			"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
+			"{\"d\":\"e\"}",
+			@"{""a"":""b""}", out state, out emittedEvents);
+
+		Assert.IsNotNull(emittedEvents);
+		Assert.AreEqual(1, emittedEvents.Length);
+		Assert.AreEqual("emitted-event0", emittedEvents[0].Event.EventType);
+		Assert.AreEqual("output-stream0", emittedEvents[0].Event.StreamId);
+		Assert.AreEqual(@"{""a"":""b""}", emittedEvents[0].Event.Data);
+		var metadata = new Dictionary<string, string>(emittedEvents[0].Event.ExtraMetaData());
+		Assert.AreEqual("\"e\"", metadata["d"]);
+		Assert.AreEqual("\"h\"", metadata["g"]);
+		Assert.AreEqual("10", metadata["i"]);
+	}
+	//todo: actual benchmark
+	[Test, Category(_projectionType), Category("Manual"), Explicit]
+	public void can_pass_though_millions_of_events() {
+		var i = 0;
+		var sw = Stopwatch.StartNew();
+
+		for (i = 0; i < 100000000; i++) {
+			string state;
+			EmittedEventEnvelope[] emittedEvents;
+			_stateHandler.ProcessEvent(
+				"", CheckpointTag.FromPosition(0, i * 10 + 20, i * 10 + 10), "stream" + i, "type" + i, "category",
+				Guid.NewGuid(), i,
+				"{\"d\":\"e\"}", @"{""a"":""" + i + @"""}", out state, out emittedEvents);
+
+			Assert.IsNotNull(emittedEvents);
+			Assert.AreEqual(1, emittedEvents.Length);
+			Assert.AreEqual("emitted-event" + i, emittedEvents[0].Event.EventType);
+			Assert.AreEqual("output-stream" + i, emittedEvents[0].Event.StreamId);
+			Assert.AreEqual(@"{""a"":""" + i + @"""}", emittedEvents[0].Event.Data);
+
+			if (sw.Elapsed > TimeSpan.FromSeconds(120))
+				break;
+		}
+
+		Console.WriteLine($"processed: {i}");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_with_content_type_validation.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_with_content_type_validation.cs
new file mode 100644
index 00000000000..5e7ef564223
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_running_with_content_type_validation.cs
@@ -0,0 +1,117 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+public class when_running_with_content_type_validation {
+	[TestFixture]
+	public class when_running_with_content_type_validation_enabled : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                fromAll().when({$any:
+                    function(state, event) {
+                    linkTo('output-stream' + event.sequenceNumber, event);
+                    return {};
+                }});
+            ";
+		}
+
+		protected override IProjectionStateHandler CreateStateHandler() {
+			return _stateHandlerFactory.Create(
+				_projectionType, _projection,
+				enableContentTypeValidation: true,
+				null,
+				logger: (s, _) => {
+					if (s.StartsWith("P:"))
+						Console.WriteLine(s);
+					else
+						_logged.Add(s);
+				}); // skip prelude debug output
+		}
+
+		[Test, Category(_projectionType)]
+		public void process_null_json_event_does_not_emit() {
+			string state = null;
+			EmittedEventEnvelope[] emittedEvents = null;
+
+			var result = _stateHandler.ProcessEvent(
+				"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
+				"metadata",
+				null, out state, out emittedEvents, isJson: true);
+
+			Assert.IsNull(emittedEvents);
+		}
+
+		[Test, Category(_projectionType)]
+		public void process_null_non_json_event_does_emit() {
+			string state = null;
+			EmittedEventEnvelope[] emittedEvents = null;
+
+			var result = _stateHandler.ProcessEvent(
+				"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
+				"metadata",
+				null, out state, out emittedEvents, isJson: false);
+
+			Assert.IsNotNull(emittedEvents);
+			Assert.AreEqual(1, emittedEvents.Length);
+		}
+	}
+
+	[TestFixture]
+	public class when_running_with_content_type_validation_disabled : TestFixtureWithInterpretedProjection {
+		protected override void Given() {
+			_projection = @"
+                fromAll().when({$any:
+                    function(state, event) {
+                    linkTo('output-stream' + event.sequenceNumber, event);
+                    return {};
+                }});
+            ";
+		}
+
+		protected override IProjectionStateHandler CreateStateHandler() {
+			return _stateHandlerFactory.Create(
+				_projectionType, _projection,
+				enableContentTypeValidation: false,
+				projectionExecutionTimeout: null,
+				logger: (s, _) => {
+					if (s.StartsWith("P:"))
+						Console.WriteLine(s);
+					else
+						_logged.Add(s);
+				}); // skip prelude debug output
+		}
+
+		[Test, Category(_projectionType)]
+		public void process_null_json_event_does_not_emit() {
+			string state = null;
+			EmittedEventEnvelope[] emittedEvents = null;
+
+			var result = _stateHandler.ProcessEvent(
+				"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
+				"metadata",
+				null, out state, out emittedEvents, isJson: true);
+
+			Assert.IsNull(emittedEvents);
+		}
+
+		[Test, Category(_projectionType)]
+		public void process_null_non_json_event_does_not_emit() {
+			string state = null;
+			EmittedEventEnvelope[] emittedEvents = null;
+
+			var result = _stateHandler.ProcessEvent(
+				"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
+				"metadata",
+				null, out state, out emittedEvents, isJson: false);
+
+			Assert.IsNull(emittedEvents);
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_specifying_meta_data_for_linked_event.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_specifying_meta_data_for_linked_event.cs
new file mode 100644
index 00000000000..0c6b7bc8f03
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/when_specifying_meta_data_for_linked_event.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+public class when_specifying_meta_data_for_linked_event : TestFixtureWithInterpretedProjection {
+	protected override void Given() {
+		_projection = @"
+            fromAll().when({$any:
+                function(state, event) {
+                linkTo('output-stream', event, {'meta': 'data'});
+                return {};
+            }});
+        ";
+	}
+
+	[Test, Category(_projectionType)]
+	public void meta_data_should_be_set() {
+		string state = null;
+		EmittedEventEnvelope[] emittedEvents = null;
+
+		var result = _stateHandler.ProcessEvent(
+			"", CheckpointTag.FromPosition(0, 20, 10), "stream1", "type1", "category", Guid.NewGuid(), 0,
+			"metadata",
+			null, out state, out emittedEvents, isJson: false);
+
+		Assert.IsNotNull(emittedEvents);
+		Assert.AreEqual(1, emittedEvents.Length);
+		Assert.IsNotNull(emittedEvents[0].Event);
+
+		var metaData = emittedEvents[0].Event.ExtraMetaData();
+		CollectionAssert.AreEquivalent(new Dictionary<string, string> { { "meta", "\"data\"" } }, metaData);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/with_deleted_notification_handled.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/with_deleted_notification_handled.cs
new file mode 100644
index 00000000000..2ed9af7da9b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/with_deleted_notification_handled.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+[TestFixture]
+public class with_deleted_notification_handled : TestFixtureWithInterpretedProjection {
+	protected override void Given() {
+		_projection = @"fromAll().foreachStream().when({
+                $deleted: function(){}
+            })";
+		_state = @"{}";
+	}
+
+	[Test]
+	public void source_definition_is_correct() {
+		Assert.AreEqual(true, _source.HandlesDeletedNotifications);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/with_foreach_and_deleted_notification_handled.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/with_foreach_and_deleted_notification_handled.cs
new file mode 100644
index 00000000000..e124e94165b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/with_foreach_and_deleted_notification_handled.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+[TestFixture]
+public class with_foreach_and_deleted_notification_handled : TestFixtureWithInterpretedProjection {
+	protected override void Given() {
+		_projection = @"fromAll().foreachStream().when({
+                $deleted: function(){}
+            })";
+		_state = @"{}";
+	}
+
+	[Test]
+	public void source_definition_is_correct() {
+		Assert.AreEqual(true, _source.HandlesDeletedNotifications);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/with_no_when_statement.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/with_no_when_statement.cs
new file mode 100644
index 00000000000..af7ac3417f7
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/with_no_when_statement.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+[TestFixture]
+public class with_no_when_statement : specification_with_event_handled {
+	protected override void Given() {
+		_projection = @"fromAll();";
+		_state = @"{}";
+		_handledEvent = CreateSampleEvent("stream", 0, "event_type", "{\"data\":1}", new TFPos(100, 50));
+	}
+
+	[Test]
+	public void returns_event_data_as_state() {
+		Assert.AreEqual("{\"data\":1}", _newState);
+		Assert.IsTrue(_emittedEventEnvelopes == null || !_emittedEventEnvelopes.Any());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/Jint/with_return_link_metadata.cs b/src/KurrentDB.Projections.Core.Tests/Services/Jint/with_return_link_metadata.cs
new file mode 100644
index 00000000000..e923f51dc91
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/Jint/with_return_link_metadata.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.Jint;
+
+[TestFixture]
+public class with_return_link_metadata : specification_with_event_handled {
+	protected override void Given() {
+		_projection = @"fromAll().when({$any:function(s,e){
+                return e.linkMetadata;
+            }})";
+		_state = @"{}";
+		_handledEvent = CreateSampleEvent("stream", 0, "event_type", "{\"data\":1}", new TFPos(100, 50));
+	}
+
+	[Test]
+	public void returns_position_metadata_as_state() {
+		Assert.AreEqual("{\"position_meta\":1}", _newState);
+		Assert.IsTrue(_emittedEventEnvelopes == null || !_emittedEventEnvelopes.Any());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/SpecificationWithEmittedStreamsTrackerAndDeleter.cs b/src/KurrentDB.Projections.Core.Tests/Services/SpecificationWithEmittedStreamsTrackerAndDeleter.cs
new file mode 100644
index 00000000000..b8bd2494904
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/SpecificationWithEmittedStreamsTrackerAndDeleter.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.ClientAPI;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using IODispatcherDelayedMessage = KurrentDB.Core.Helpers.IODispatcherDelayedMessage;
+
+namespace KurrentDB.Projections.Core.Tests.Services;
+
+public abstract class SpecificationWithEmittedStreamsTrackerAndDeleter<TLogFormat, TStreamId> : SpecificationWithMiniNode<TLogFormat, TStreamId> {
+	protected IEmittedStreamsTracker _emittedStreamsTracker;
+	protected IEmittedStreamsDeleter _emittedStreamsDeleter;
+	protected ProjectionNamesBuilder _projectionNamesBuilder;
+	protected ClientMessage.ReadStreamEventsForwardCompleted _readCompleted;
+	protected IODispatcher _ioDispatcher;
+	protected bool _trackEmittedStreams = true;
+	protected string _projectionName = "test_projection";
+
+	protected override Task Given() {
+		_ioDispatcher = new IODispatcher(_node.Node.MainQueue, _node.Node.MainQueue, true);
+		_node.Node.MainBus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_ioDispatcher.BackwardReader);
+		_node.Node.MainBus.Subscribe<ClientMessage.NotHandled>(_ioDispatcher.BackwardReader);
+		_node.Node.MainBus.Subscribe(_ioDispatcher.ForwardReader);
+		_node.Node.MainBus.Subscribe(_ioDispatcher.Writer);
+		_node.Node.MainBus.Subscribe(_ioDispatcher.StreamDeleter);
+		_node.Node.MainBus.Subscribe(_ioDispatcher.Awaker);
+		_node.Node.MainBus.Subscribe<IODispatcherDelayedMessage>(_ioDispatcher);
+		_node.Node.MainBus.Subscribe<ClientMessage.NotHandled>(_ioDispatcher);
+		_projectionNamesBuilder = ProjectionNamesBuilder.CreateForTest(_projectionName);
+		_emittedStreamsTracker = new EmittedStreamsTracker(_ioDispatcher,
+			new ProjectionConfig(null, 1000, 1000 * 1000, 100, 500, true, true, false, false,
+				_trackEmittedStreams, 10000, 1, null), _projectionNamesBuilder);
+		_emittedStreamsDeleter = new EmittedStreamsDeleter(_ioDispatcher,
+			_projectionNamesBuilder.GetEmittedStreamsName(),
+			_projectionNamesBuilder.GetEmittedStreamsCheckpointName());
+		return Task.CompletedTask;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/TestFixtureWithProjectionCoreService.cs b/src/KurrentDB.Projections.Core.Tests/Services/TestFixtureWithProjectionCoreService.cs
new file mode 100644
index 00000000000..54121c2df14
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/TestFixtureWithProjectionCoreService.cs
@@ -0,0 +1,141 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Bus.Helpers;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services;
+
+public class TestFixtureWithProjectionCoreService {
+	class GuardBusToTriggerFixingIfUsed : IQueuedHandler, ISubscriber, IPublisher {
+		public void Handle(Message message) {
+			throw new NotImplementedException();
+		}
+
+		public void Publish(Message message) {
+			throw new NotImplementedException();
+		}
+
+		public void Start() => throw new NotImplementedException();
+
+		public Task Stop() => Task.FromException(new NotImplementedException());
+
+		public void RequestStop() {
+			throw new NotImplementedException();
+		}
+
+		public void Subscribe<T>(IAsyncHandle<T> handler) where T : Message {
+			throw new NotImplementedException();
+		}
+
+		public void Unsubscribe<T>(IAsyncHandle<T> handler) where T : Message {
+			throw new NotImplementedException();
+		}
+	}
+	public class TestCoreProjection : ICoreProjection {
+		public List<EventReaderSubscriptionMessage.CommittedEventReceived> HandledMessages =
+			new List<EventReaderSubscriptionMessage.CommittedEventReceived>();
+
+		public void Handle(CoreProjectionProcessingMessage.CheckpointCompleted message) {
+			throw new NotImplementedException();
+		}
+
+		public void Handle(CoreProjectionProcessingMessage.CheckpointLoaded message) {
+			throw new NotImplementedException();
+		}
+
+
+		public void Handle(CoreProjectionProcessingMessage.RestartRequested message) {
+			throw new NotImplementedException();
+		}
+
+		public void Handle(CoreProjectionProcessingMessage.Failed message) {
+			throw new NotImplementedException();
+		}
+
+		public void Handle(CoreProjectionProcessingMessage.PrerecordedEventsLoaded message) {
+			throw new NotImplementedException();
+		}
+	}
+
+	protected TestHandler<Message> _consumer;
+	protected SynchronousScheduler _bus;
+	protected ProjectionCoreService _service;
+	protected EventReaderCoreService _readerService;
+
+	private ReaderSubscriptionDispatcher _subscriptionDispatcher;
+
+	protected Guid _workerId;
+
+	[SetUp]
+	public virtual void Setup() {
+		_consumer = new TestHandler<Message>();
+		_bus = new();
+		_bus.Subscribe(_consumer);
+		ICheckpoint writerCheckpoint = new InMemoryCheckpoint(1000);
+		var ioDispatcher = new IODispatcher(_bus, _bus, true);
+		_readerService = new EventReaderCoreService(_bus, ioDispatcher, 10, writerCheckpoint,
+			runHeadingReader: true, faultOutOfOrderProjections: true);
+		_subscriptionDispatcher =
+			new ReaderSubscriptionDispatcher(_bus);
+		_workerId = Guid.NewGuid();
+		var guardBus = new GuardBusToTriggerFixingIfUsed();
+		var configuration = new ProjectionsStandardComponents(1, ProjectionType.All, guardBus, guardBus, guardBus, guardBus, true,
+			 500, 250, Opts.MaxProjectionStateSizeDefault);
+		_service = new ProjectionCoreService(
+			_workerId, _bus, _bus, _subscriptionDispatcher, new RealTimeProvider(), ioDispatcher, configuration);
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CheckpointSuggested>());
+		_bus.Subscribe(_subscriptionDispatcher
+			.CreateSubscriber<EventReaderSubscriptionMessage.CommittedEventReceived>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.EofReached>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionEofReached>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionDeleted>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ProgressChanged>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.SubscriptionStarted>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.NotAuthorized>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ReaderAssignedReader>());
+
+		var instanceCorrelationId = Guid.NewGuid();
+		_readerService.Handle(new ReaderCoreServiceMessage.StartReader(instanceCorrelationId));
+		_service.Handle(new ProjectionCoreServiceMessage.StartCore(instanceCorrelationId));
+	}
+
+	protected IReaderStrategy CreateReaderStrategy() {
+		var result = new SourceDefinitionBuilder();
+		result.FromAll();
+		result.AllEvents();
+		return ReaderStrategy.Create(
+			"test",
+			0,
+			result.Build(),
+			new RealTimeProvider(),
+			stopOnEof: false,
+			runAs: null);
+	}
+
+	protected static ResolvedEvent CreateEvent() {
+		return new ResolvedEvent(
+			"test", -1, "test", -1, false, new TFPos(10, 5), new TFPos(10, 5), Guid.NewGuid(), "t", false,
+			new byte[0], new byte[0], null, null, default(DateTime));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/TestTask.cs b/src/KurrentDB.Projections.Core.Tests/Services/TestTask.cs
new file mode 100644
index 00000000000..6bac5f786bf
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/TestTask.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing;
+
+namespace KurrentDB.Projections.Core.Tests.Services;
+
+public class TestTask : StagedTask {
+	private readonly int _steps;
+	private readonly int _completeImmediatelyUpToStage;
+	private readonly object[] _stageCorrelations;
+	private Action<int, object> _readyForStage;
+	private int _startedOnStage;
+
+	public TestTask(
+		object initialCorrelationId, int steps, int completeImmediatelyUpToStage = -1,
+		object[] stageCorrelations = null)
+		: base(initialCorrelationId) {
+		_steps = steps;
+		_completeImmediatelyUpToStage = completeImmediatelyUpToStage;
+		_stageCorrelations = stageCorrelations;
+		_startedOnStage = -1;
+	}
+
+	public bool StartedOn(int onStage) {
+		return _startedOnStage >= onStage;
+	}
+
+	public override void Process(int onStage, Action<int, object> readyForStage) {
+		_readyForStage = readyForStage;
+		_startedOnStage = onStage;
+		if (_startedOnStage <= _completeImmediatelyUpToStage)
+			Complete();
+	}
+
+	public void Complete() {
+		var correlationId = _stageCorrelations != null ? _stageCorrelations[_startedOnStage] : InitialCorrelationId;
+		_readyForStage(_startedOnStage == _steps - 1 ? -1 : _startedOnStage + 1, correlationId);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_catalog_stream.cs b/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_catalog_stream.cs
new file mode 100644
index 00000000000..dbc6afcad34
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_catalog_stream.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+#pragma warning disable 1718 // allow a == a comparison
+
+namespace KurrentDB.Projections.Core.Tests.Services.checkpoint_tag;
+
+[TestFixture]
+public class checkpoint_tag_by_stream_position {
+	private readonly CheckpointTag _a = CheckpointTag.FromStreamPosition(1, "stream", 9);
+	private readonly CheckpointTag _b = CheckpointTag.FromStreamPosition(1, "stream", 15);
+	private readonly CheckpointTag _c = CheckpointTag.FromStreamPosition(1, "stream", 29);
+
+	[Test]
+	public void equal_equals() {
+		Assert.IsTrue(_a.Equals(_a));
+	}
+
+	[Test]
+	public void equal_operator() {
+		Assert.IsTrue(_b == _b);
+	}
+
+	[Test]
+	public void less_operator() {
+		Assert.IsTrue(_a < _b);
+	}
+
+	[Test]
+	public void less_or_equal_operator() {
+		Assert.IsTrue(_a <= _b);
+		Assert.IsTrue(_c <= _c);
+	}
+
+	[Test]
+	public void greater_operator() {
+		Assert.IsTrue(_b > _a);
+	}
+
+	[Test]
+	public void greater_or_equal_operator() {
+		Assert.IsTrue(_b >= _a);
+		Assert.IsTrue(_c >= _c);
+	}
+}
+#pragma warning restore 1718
+
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_event_type_index_positions.cs b/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_event_type_index_positions.cs
new file mode 100644
index 00000000000..854f2c5d556
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_event_type_index_positions.cs
@@ -0,0 +1,105 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+#pragma warning disable 1718 // allow a == a comparison
+
+namespace KurrentDB.Projections.Core.Tests.Services.checkpoint_tag;
+
+[TestFixture]
+public class checkpoint_tag_by_event_type_index_positions {
+	private readonly CheckpointTag _a1 = CheckpointTag.FromEventTypeIndexPositions(
+		1, new TFPos(100, 50), new Dictionary<string, long> { { "a", 1 } });
+
+	private readonly CheckpointTag _a1_prime = CheckpointTag.FromEventTypeIndexPositions(
+		1, new TFPos(100, 50), new Dictionary<string, long> { { "a", 0 } });
+
+	private readonly CheckpointTag _b1 = CheckpointTag.FromEventTypeIndexPositions(
+		1, new TFPos(200, 150), new Dictionary<string, long> { { "b", 1 } });
+
+	private readonly CheckpointTag _a1b1 = CheckpointTag.FromEventTypeIndexPositions(
+		1, new TFPos(300, 250), new Dictionary<string, long> { { "a", 1 }, { "b", 1 } });
+
+	private readonly CheckpointTag _a2b1 = CheckpointTag.FromEventTypeIndexPositions(
+		1, new TFPos(400, 350), new Dictionary<string, long> { { "a", 2 }, { "b", 1 } });
+
+	private readonly CheckpointTag _a2b1_after = CheckpointTag.FromEventTypeIndexPositions(
+		1, new TFPos(430, 420), new Dictionary<string, long> { { "a", 2 }, { "b", 1 } });
+
+	private readonly CheckpointTag _a1b2 = CheckpointTag.FromEventTypeIndexPositions(
+		1, new TFPos(500, 450), new Dictionary<string, long> { { "a", 1 }, { "b", 2 } });
+
+	private readonly CheckpointTag _a2b2 = CheckpointTag.FromEventTypeIndexPositions(
+		1, new TFPos(600, 550), new Dictionary<string, long> { { "a", 2 }, { "b", 2 } });
+
+	[Test]
+	public void equal_equals() {
+		Assert.IsTrue(_a1.Equals(_a1));
+	}
+
+	[Test]
+	public void equal_but_different_index_positions_still_equals() {
+		Assert.IsTrue(_a1.Equals(_a1_prime));
+	}
+
+	[Test]
+	public void equal_operator() {
+		Assert.IsTrue(_a2b1 == _a2b1);
+	}
+
+	[Test]
+	public void less_operator() {
+		Assert.IsTrue(_a1 < _a1b1);
+		Assert.IsTrue(_a1 < _a1b2);
+		Assert.IsTrue(_a1 < _a2b2);
+		Assert.IsTrue(_a2b1 < _a2b1_after);
+		Assert.IsFalse(_a1b2 < _a1b2);
+		Assert.IsFalse(_a1b2 < _a1b1);
+		Assert.IsFalse(_a1b2 < _a2b1);
+		Assert.IsTrue(_a1 < _b1);
+	}
+
+	[Test]
+	public void less_or_equal_operator() {
+		Assert.IsTrue(_a1 <= _a1b1);
+		Assert.IsTrue(_a1 <= _a1b2);
+		Assert.IsTrue(_a1 <= _a2b2);
+		Assert.IsTrue(_a2b1 <= _a2b1_after);
+		Assert.IsTrue(_a1b2 <= _a1b2);
+		Assert.IsFalse(_a1b2 <= _a1b1);
+		Assert.IsFalse(_a1b2 <= _a2b1);
+		Assert.IsTrue(_a1 <= _b1);
+	}
+
+	[Test]
+	public void greater_operator() {
+		Assert.IsFalse(_a1 > _a1b1);
+		Assert.IsFalse(_a1 > _a1b2);
+		Assert.IsFalse(_a1 > _a2b2);
+		Assert.IsFalse(_a2b1 > _a2b1_after);
+		Assert.IsTrue(_a2b1_after > _a2b1);
+		Assert.IsFalse(_a1b2 > _a1b2);
+		Assert.IsTrue(_a1b2 > _a1b1);
+		Assert.IsTrue(_a1b2 > _a2b1);
+		Assert.IsFalse(_a1 > _b1);
+	}
+
+	[Test]
+	public void greater_or_equal_operator() {
+		Assert.IsFalse(_a1 >= _a1b1);
+		Assert.IsFalse(_a1 >= _a1b2);
+		Assert.IsFalse(_a1 >= _a2b2);
+		Assert.IsFalse(_a2b1 >= _a2b1_after);
+		Assert.IsTrue(_a2b1_after >= _a2b1);
+		Assert.IsTrue(_a1b2 >= _a1b2);
+		Assert.IsTrue(_a1b2 >= _a1b1);
+		Assert.IsTrue(_a1b2 >= _a2b1);
+		Assert.IsFalse(_a1 >= _b1);
+	}
+}
+#pragma warning restore 1718
+
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_event_type_index_positions_when_updating.cs b/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_event_type_index_positions_when_updating.cs
new file mode 100644
index 00000000000..636f50e72d0
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_event_type_index_positions_when_updating.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.checkpoint_tag;
+
+[TestFixture]
+public class checkpoint_tag_by_event_type_index_positions_when_updating {
+	private readonly CheckpointTag _a1b1 = CheckpointTag.FromEventTypeIndexPositions(
+		1, new TFPos(100, 50), new Dictionary<string, long> { { "a", 1 }, { "b", 1 } });
+
+	[Test]
+	public void updated_tf_only_position_is_correct() {
+		var updated = _a1b1.UpdateEventTypeIndexPosition(new TFPos(200, 50));
+		Assert.AreEqual(1, updated.Streams["a"]);
+		Assert.AreEqual(new TFPos(200, 50), updated.Position);
+	}
+
+	[Test]
+	public void updated_tf_position_is_correct() {
+		var updated = _a1b1.UpdateEventTypeIndexPosition(new TFPos(200, 50), "a", 2);
+		Assert.AreEqual(2, updated.Streams["a"]);
+		Assert.AreEqual(new TFPos(200, 50), updated.Position);
+	}
+
+	[Test]
+	public void other_stream_position_is_correct() {
+		var updated = _a1b1.UpdateEventTypeIndexPosition(new TFPos(200, 50), "a", 2);
+		Assert.AreEqual(1, updated.Streams["b"]);
+	}
+
+	[Test]
+	public void streams_are_correct() {
+		var updated = _a1b1.UpdateEventTypeIndexPosition(new TFPos(200, 50), "a", 2);
+		Assert.AreEqual(2, updated.Streams.Count);
+		Assert.IsTrue(updated.Streams.Any(v => v.Key == "a"));
+		Assert.IsTrue(updated.Streams.Any(v => v.Key == "b"));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_phase.cs b/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_phase.cs
new file mode 100644
index 00000000000..b483fd64866
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_phase.cs
@@ -0,0 +1,73 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+#pragma warning disable 1718
+
+namespace KurrentDB.Projections.Core.Tests.Services.checkpoint_tag;
+
+[TestFixture]
+public class checkpoint_tag_by_phase {
+	private readonly CheckpointTag _p0 = CheckpointTag.FromPosition(0, 1000, 9);
+	private readonly CheckpointTag _p1a = CheckpointTag.FromPhase(1, completed: false);
+	private readonly CheckpointTag _p1b = CheckpointTag.FromPhase(1, completed: true);
+	private readonly CheckpointTag _p2 = CheckpointTag.FromPosition(2, 30, 29);
+	private readonly CheckpointTag _p3 = CheckpointTag.FromPosition(3, 30, 29);
+
+	private readonly CheckpointTag _p4 = CheckpointTag.FromEventTypeIndexPositions(
+		4, new TFPos(200, 150), new Dictionary<string, long> { { "a", 1 } });
+
+	[Test]
+	public void equal_equals() {
+		Assert.IsTrue(_p0.Equals(_p0));
+		Assert.IsTrue(_p1a.Equals(_p1a));
+		Assert.IsTrue(_p1b.Equals(_p1b));
+		Assert.IsFalse(_p1a.Equals(_p1b));
+		Assert.IsTrue(_p2.Equals(_p2));
+		Assert.IsTrue(_p3.Equals(_p3));
+		Assert.IsFalse(_p2.Equals(_p3));
+	}
+
+	[Test]
+	public void equal_operator() {
+		Assert.IsTrue(_p1a == _p1a);
+		Assert.IsTrue(_p1a != _p1b);
+	}
+
+	[Test]
+	public void less_operator() {
+		Assert.IsTrue(_p0 < _p1a);
+		Assert.IsTrue(_p2 < _p3);
+		Assert.IsTrue(_p3 < _p4);
+		Assert.IsTrue(_p1a < _p1b);
+	}
+
+	[Test]
+	public void less_or_equal_operator() {
+		Assert.IsTrue(_p1b <= _p2);
+		Assert.IsTrue(_p2 <= _p4);
+		Assert.IsTrue(_p3 <= _p3);
+	}
+
+	[Test]
+	public void greater_operator() {
+		Assert.IsTrue(_p4 > _p1a);
+		Assert.IsTrue(_p1b > _p1a);
+	}
+
+	[Test]
+	public void greater_or_equal_operator() {
+		Assert.IsFalse(_p1a >= _p1b);
+		Assert.IsTrue(_p1a >= _p1a);
+		Assert.IsTrue(_p1a >= _p0);
+		Assert.IsTrue(_p4 >= _p3);
+		Assert.IsTrue(_p3 >= _p1a);
+		Assert.IsTrue(_p2 >= _p2);
+	}
+}
+
+#pragma warning restore 1718
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_prepare_position.cs b/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_prepare_position.cs
new file mode 100644
index 00000000000..6f73645c2f3
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_prepare_position.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#pragma warning disable 1718
+
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.checkpoint_tag;
+
+[TestFixture]
+public class checkpoint_tag_by_prepare_position {
+	private readonly CheckpointTag _aa = CheckpointTag.FromPreparePosition(1, 9);
+	private readonly CheckpointTag _b1 = CheckpointTag.FromPreparePosition(1, 15);
+	private readonly CheckpointTag _b2 = CheckpointTag.FromPreparePosition(1, 15);
+	private readonly CheckpointTag _cc = CheckpointTag.FromPreparePosition(1, 29);
+	private readonly CheckpointTag _d1 = CheckpointTag.FromPreparePosition(1, 35);
+	private readonly CheckpointTag _d2 = CheckpointTag.FromPreparePosition(1, 35);
+
+	[Test]
+	public void equal_equals() {
+		Assert.IsTrue(_aa.Equals(_aa));
+	}
+
+	[Test]
+	public void equal_operator() {
+		Assert.IsTrue(_b1 == _b1);
+		Assert.IsTrue(_b1 == _b2);
+	}
+
+	[Test]
+	public void less_operator() {
+		Assert.IsTrue(_aa < _b1);
+	}
+
+	[Test]
+	public void less_or_equal_operator() {
+		Assert.IsTrue(_aa <= _b1);
+		Assert.IsTrue(_b1 <= _b2);
+		Assert.IsTrue(_b2 <= _b2);
+	}
+
+	[Test]
+	public void greater_operator() {
+		Assert.IsTrue(_d1 > _cc);
+		Assert.IsFalse(_d2 > _d1);
+		Assert.IsFalse(_d2 > _d2);
+	}
+
+	[Test]
+	public void greater_or_equal_operator() {
+		Assert.IsTrue(_d1 >= _cc);
+		Assert.IsTrue(_d2 >= _d1);
+		Assert.IsTrue(_b2 >= _b2);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_stream_position.cs b/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_stream_position.cs
new file mode 100644
index 00000000000..47b9cf784d1
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_stream_position.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+#pragma warning disable 1718 // allow a == a comparison
+
+namespace KurrentDB.Projections.Core.Tests.Services.checkpoint_tag;
+
+[TestFixture]
+public class checkpoint_tag_by_catalog_stream {
+	private readonly CheckpointTag _a = CheckpointTag.FromByStreamPosition(0, "catalog", 1, "data", 10, 12345);
+	private readonly CheckpointTag _b = CheckpointTag.FromByStreamPosition(0, "catalog", 1, "data", 20, 12345);
+	private readonly CheckpointTag _c = CheckpointTag.FromByStreamPosition(0, "catalog", 2, "data2", 20, 12345);
+
+	[Test]
+	public void equal_equals() {
+		Assert.IsTrue(_a.Equals(_a));
+	}
+
+	[Test]
+	public void equal_operator() {
+		Assert.IsTrue(_b == _b);
+	}
+
+	[Test]
+	public void less_operator() {
+		Assert.IsTrue(_a < _b);
+	}
+
+	[Test]
+	public void less_or_equal_operator() {
+		Assert.IsTrue(_a <= _b);
+		Assert.IsTrue(_c <= _c);
+	}
+
+	[Test]
+	public void greater_operator() {
+		Assert.IsTrue(_b > _a);
+	}
+
+	[Test]
+	public void greater_or_equal_operator() {
+		Assert.IsTrue(_b >= _a);
+		Assert.IsTrue(_c >= _c);
+	}
+}
+#pragma warning restore 1718
+
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_stream_positions.cs b/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_stream_positions.cs
new file mode 100644
index 00000000000..8b3634ad8bf
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_stream_positions.cs
@@ -0,0 +1,89 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+#pragma warning disable 1718 // allow a == a comparison
+
+namespace KurrentDB.Projections.Core.Tests.Services.checkpoint_tag;
+
+[TestFixture]
+public class checkpoint_tag_by_stream_positions {
+	private readonly CheckpointTag _a1 = CheckpointTag.FromStreamPositions(
+		1, new Dictionary<string, long> { { "a", 1 } });
+
+	private readonly CheckpointTag _b1 = CheckpointTag.FromStreamPositions(
+		1, new Dictionary<string, long> { { "b", 1 } });
+
+	private readonly CheckpointTag _a1b1 = CheckpointTag.FromStreamPositions(
+		1, new Dictionary<string, long> { { "a", 1 }, { "b", 1 } });
+
+	private readonly CheckpointTag _a2b1 = CheckpointTag.FromStreamPositions(
+		1, new Dictionary<string, long> { { "a", 2 }, { "b", 1 } });
+
+	private readonly CheckpointTag _a1b2 = CheckpointTag.FromStreamPositions(
+		1, new Dictionary<string, long> { { "a", 1 }, { "b", 2 } });
+
+	private readonly CheckpointTag _a2b2 = CheckpointTag.FromStreamPositions(
+		1, new Dictionary<string, long> { { "a", 2 }, { "b", 2 } });
+
+	[Test]
+	public void equal_equals() {
+		Assert.IsTrue(_a1.Equals(_a1));
+	}
+
+	[Test]
+	public void equal_operator() {
+		Assert.IsTrue(_a2b1 == _a2b1);
+	}
+
+	[Test]
+	public void less_operator() {
+		Assert.IsTrue(_a1 < _a1b1);
+		Assert.IsTrue(_a1 < _a1b2);
+		Assert.IsTrue(_a1 < _a2b2);
+		Assert.IsFalse(_a1b2 < _a1b2);
+		Assert.IsFalse(_a1b2 < _a1b1);
+		Assert.Throws<InvalidOperationException>(() => TestHelper.Consume(_a1b2 < _a2b1));
+		Assert.Throws<InvalidOperationException>(() => TestHelper.Consume(_a1 < _b1));
+	}
+
+	[Test]
+	public void less_or_equal_operator() {
+		Assert.IsTrue(_a1 <= _a1b1);
+		Assert.IsTrue(_a1 <= _a1b2);
+		Assert.IsTrue(_a1 <= _a2b2);
+		Assert.IsTrue(_a1b2 <= _a1b2);
+		Assert.IsFalse(_a1b2 <= _a1b1);
+		Assert.Throws<InvalidOperationException>(() => TestHelper.Consume(_a1b2 <= _a2b1));
+		Assert.Throws<InvalidOperationException>(() => TestHelper.Consume(_a1 <= _b1));
+	}
+
+	[Test]
+	public void greater_operator() {
+		Assert.IsFalse(_a1 > _a1b1);
+		Assert.IsFalse(_a1 > _a1b2);
+		Assert.IsFalse(_a1 > _a2b2);
+		Assert.IsFalse(_a1b2 > _a1b2);
+		Assert.IsTrue(_a1b2 > _a1b1);
+		Assert.Throws<InvalidOperationException>(() => TestHelper.Consume(_a1b2 > _a2b1));
+		Assert.Throws<InvalidOperationException>(() => TestHelper.Consume(_a1 > _b1));
+	}
+
+	[Test]
+	public void greater_or_equal_operator() {
+		Assert.IsFalse(_a1 >= _a1b1);
+		Assert.IsFalse(_a1 >= _a1b2);
+		Assert.IsFalse(_a1 >= _a2b2);
+		Assert.IsTrue(_a1b2 >= _a1b2);
+		Assert.IsTrue(_a1b2 >= _a1b1);
+		Assert.Throws<InvalidOperationException>(() => TestHelper.Consume(_a1b2 >= _a2b1));
+		Assert.Throws<InvalidOperationException>(() => TestHelper.Consume(_a1 >= _b1));
+	}
+}
+#pragma warning restore 1718
+
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_stream_positions_when_updating.cs b/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_stream_positions_when_updating.cs
new file mode 100644
index 00000000000..d005cd3ffc3
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_stream_positions_when_updating.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.checkpoint_tag;
+
+[TestFixture]
+public class checkpoint_tag_by_stream_positions_when_updating {
+	private readonly CheckpointTag _a1b1 = CheckpointTag.FromStreamPositions(
+		1, new Dictionary<string, long> { { "a", 1 }, { "b", 1 } });
+
+	[Test]
+	public void updated_position_is_correct() {
+		var updated = _a1b1.UpdateStreamPosition("a", 2);
+		Assert.AreEqual(2, updated.Streams["a"]);
+	}
+
+	[Test]
+	public void other_stream_position_is_correct() {
+		var updated = _a1b1.UpdateStreamPosition("a", 2);
+		Assert.AreEqual(1, updated.Streams["b"]);
+	}
+
+	[Test]
+	public void streams_are_correct() {
+		var updated = _a1b1.UpdateStreamPosition("a", 2);
+		Assert.AreEqual(2, updated.Streams.Count);
+		Assert.IsTrue(updated.Streams.Any(v => v.Key == "a"));
+		Assert.IsTrue(updated.Streams.Any(v => v.Key == "b"));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_tf_position.cs b/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_tf_position.cs
new file mode 100644
index 00000000000..0feb63f0d94
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_by_tf_position.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+#pragma warning disable 1718 // allow a == a comparison
+
+namespace KurrentDB.Projections.Core.Tests.Services.checkpoint_tag;
+
+[TestFixture]
+public class checkpoint_tag_by_tf_position {
+	private readonly CheckpointTag _aa = CheckpointTag.FromPosition(1, 10, 9);
+	private readonly CheckpointTag _b1 = CheckpointTag.FromPosition(1, 20, 15);
+	private readonly CheckpointTag _b2 = CheckpointTag.FromPosition(1, 20, 17);
+	private readonly CheckpointTag _cc = CheckpointTag.FromPosition(1, 30, 29);
+	private readonly CheckpointTag _d1 = CheckpointTag.FromPosition(1, 40, 35);
+	private readonly CheckpointTag _d2 = CheckpointTag.FromPosition(1, 40, 36);
+
+	[Test]
+	public void equal_equals() {
+		Assert.IsTrue(_aa.Equals(_aa));
+	}
+
+	[Test]
+	public void equal_operator() {
+		Assert.IsTrue(_b1 == _b1);
+	}
+
+	[Test]
+	public void less_operator() {
+		Assert.IsTrue(_aa < _b1);
+		Assert.IsTrue(_b1 < _b2);
+	}
+
+	[Test]
+	public void less_or_equal_operator() {
+		Assert.IsTrue(_aa <= _b1);
+		Assert.IsTrue(_b1 <= _b2);
+		Assert.IsTrue(_b2 <= _b2);
+	}
+
+	[Test]
+	public void greater_operator() {
+		Assert.IsTrue(_d1 > _cc);
+		Assert.IsTrue(_d2 > _d1);
+	}
+
+	[Test]
+	public void greater_or_equal_operator() {
+		Assert.IsTrue(_d1 >= _cc);
+		Assert.IsTrue(_d2 >= _d1);
+		Assert.IsTrue(_b2 >= _b2);
+	}
+}
+#pragma warning restore 1718
+
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_phase.cs b/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_phase.cs
new file mode 100644
index 00000000000..6a461b89c62
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_phase.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+#pragma warning disable 1718 // allow a == a comparison
+
+namespace KurrentDB.Projections.Core.Tests.Services.checkpoint_tag;
+
+[TestFixture]
+public class checkpoint_tag_phase {
+	private readonly CheckpointTag _p0 = CheckpointTag.FromPosition(0, 1000, 9);
+	private readonly CheckpointTag _p1a = CheckpointTag.FromPosition(1, 500, 400);
+	private readonly CheckpointTag _p1b = CheckpointTag.FromPosition(1, 500, 450);
+	private readonly CheckpointTag _p2 = CheckpointTag.FromPosition(2, 30, 29);
+	private readonly CheckpointTag _p3 = CheckpointTag.FromStreamPosition(3, "stream", 100);
+
+	private readonly CheckpointTag _p4 = CheckpointTag.FromEventTypeIndexPositions(
+		4, new TFPos(200, 150), new Dictionary<string, long> { { "a", 1 } });
+
+	[Test]
+	public void equal_equals() {
+		Assert.IsTrue(_p0.Equals(_p0));
+		Assert.IsTrue(_p1a.Equals(_p1a));
+		Assert.IsTrue(_p1b.Equals(_p1b));
+		Assert.IsTrue(_p2.Equals(_p2));
+		Assert.IsTrue(_p3.Equals(_p3));
+	}
+
+	[Test]
+	public void equal_operator() {
+		Assert.IsTrue(_p1a == _p1a);
+	}
+
+	[Test]
+	public void less_operator() {
+		Assert.IsTrue(_p0 < _p1a);
+		Assert.IsTrue(_p2 < _p3);
+		Assert.IsTrue(_p3 < _p4);
+	}
+
+	[Test]
+	public void less_or_equal_operator() {
+		Assert.IsTrue(_p1b <= _p2);
+		Assert.IsTrue(_p2 <= _p4);
+		Assert.IsTrue(_p3 <= _p3);
+	}
+
+	[Test]
+	public void greater_operator() {
+		Assert.IsTrue(_p4 > _p1a);
+		Assert.IsTrue(_p1b > _p1a);
+	}
+
+	[Test]
+	public void greater_or_equal_operator() {
+		Assert.IsTrue(_p1a >= _p0);
+		Assert.IsTrue(_p4 >= _p3);
+		Assert.IsTrue(_p3 >= _p1a);
+		Assert.IsTrue(_p2 >= _p2);
+	}
+}
+#pragma warning restore 1718
+
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_to_from_json.cs b/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_to_from_json.cs
new file mode 100644
index 00000000000..05fdeb8098b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/checkpoint_tag/checkpoint_tag_to_from_json.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using Newtonsoft.Json;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.checkpoint_tag;
+
+[TestFixture]
+public class checkpoint_tag_to_from_json {
+	[Test]
+	public void stream_position_should_not_overflow() {
+		var checkpointTag = CheckpointTag.FromStreamPosition(1, "test", 9876543210L);
+		var json = checkpointTag.ToJsonString();
+
+		var jsonReader = new JsonTextReader(new StringReader(json));
+		var checkpointTagFromJson = CheckpointTag.FromJson(jsonReader, new ProjectionVersion(0, 0, 0));
+		Assert.AreEqual(9876543210L, checkpointTagFromJson.Tag.Streams["test"]);
+	}
+
+	[Test]
+	public void data_and_catalog_position_should_not_overflow() {
+		var checkpointTag =
+			CheckpointTag.FromByStreamPosition(1, "catalog", 9876543210L, "data", 9876543211L, 9876543212L);
+		var json = checkpointTag.ToJsonString();
+
+		var jsonReader = new JsonTextReader(new StringReader(json));
+		var checkpointTagFromJson = CheckpointTag.FromJson(jsonReader, new ProjectionVersion(0, 0, 0));
+		Assert.AreEqual(9876543210L, checkpointTagFromJson.Tag.CatalogPosition);
+		Assert.AreEqual(9876543211L, checkpointTagFromJson.Tag.DataPosition);
+	}
+
+	[Test]
+	public void prepare_and_commit_positions_should_not_overflow() {
+		var checkpointTag =
+			CheckpointTag.FromPosition(1, 9876543210L, 9876543211L);
+		var json = checkpointTag.ToJsonString();
+
+		var jsonReader = new JsonTextReader(new StringReader(json));
+		var checkpointTagFromJson = CheckpointTag.FromJson(jsonReader, new ProjectionVersion(0, 0, 0));
+		Assert.AreEqual(9876543210L, checkpointTagFromJson.Tag.CommitPosition);
+		Assert.AreEqual(9876543211L, checkpointTagFromJson.Tag.PreparePosition);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_restarting_with_projection_type_all.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_restarting_with_projection_type_all.cs
new file mode 100644
index 00000000000..ae51f22f0f5
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_restarting_with_projection_type_all.cs
@@ -0,0 +1,171 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_coordinator;
+
+[TestFixture]
+public class when_restarting_with_projection_type_all {
+	private FakePublisher[] queues;
+	private FakePublisher publisher;
+	private ProjectionCoreCoordinator _coordinator;
+	private Guid instanceCorrelationId = Guid.NewGuid();
+	private Guid queueId;
+
+	[SetUp]
+	public void Setup() {
+		queues = new List<FakePublisher>() { new FakePublisher() }.ToArray();
+		publisher = new FakePublisher();
+
+		_coordinator =
+			new ProjectionCoreCoordinator(ProjectionType.All, queues, publisher);
+
+		// Start components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(instanceCorrelationId));
+
+		// All components started
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStarted(EventReaderCoreService.SubComponentName,
+				instanceCorrelationId));
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStarted(ProjectionCoreService.SubComponentName,
+				instanceCorrelationId));
+
+		// Stop components, but don't handle any sub component stopped messages
+		_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(instanceCorrelationId));
+
+		var stopCore = queues[0].Messages.OfType<ProjectionCoreServiceMessage.StopCore>().First();
+		queueId = stopCore.QueueId;
+		//clear queues for clearer testing
+		queues[0].Messages.Clear();
+	}
+
+	[Test]
+	public void should_not_start_if_subcomponents_not_stopped() {
+		// None of the subcomponents have been stopped
+
+		// Start Components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StartReader).Count);
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StartCore).Count);
+	}
+
+	[Test]
+	public void should_not_start_if_not_all_subcomponents_stopped() {
+		// Not all subcomponents stopped
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
+				queueId));
+
+		// Start Components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StartReader).Count);
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StartCore).Count);
+	}
+
+	[Test]
+	public void should_start_if_subcomponents_stopped_before_starting_components_again() {
+		// All components have been stopped
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
+				queueId));
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStopped(ProjectionCoreService.SubComponentName,
+				queueId));
+
+		// Start components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+
+		Assert.AreEqual(1, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StartReader).Count);
+		Assert.AreEqual(1, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StartCore).Count);
+	}
+
+	[Test]
+	public void should_not_stop_if_all_subcomponents_not_started() {
+		var restartCorrelationId = Guid.NewGuid();
+
+		// All subcomponents stopped
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
+				queueId));
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStopped(ProjectionCoreService.SubComponentName,
+				queueId));
+
+		// Start components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(restartCorrelationId));
+
+		// Some components started, but not all
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStarted(EventReaderCoreService.SubComponentName,
+				restartCorrelationId));
+
+		queues[0].Messages.Clear();
+		// Attempt to stop the components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(restartCorrelationId));
+
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StopReader).Count);
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StopCore).Count);
+	}
+
+	[Test]
+	public void should_not_stop_if_not_started() {
+		// All components stopped
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
+				queueId));
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStopped(ProjectionCoreService.SubComponentName,
+				queueId));
+
+		queues[0].Messages.Clear();
+		// Stop components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(instanceCorrelationId));
+
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StopReader).Count);
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StopCore).Count);
+	}
+
+	[Test]
+	public void should_not_stop_if_correlation_id_is_different() {
+		var restartCorrelationId = Guid.NewGuid();
+
+		// All components stopped
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
+				queueId));
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStopped(ProjectionCoreService.SubComponentName,
+				queueId));
+
+		// Start Components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(restartCorrelationId));
+
+		// All components started
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStarted(EventReaderCoreService.SubComponentName,
+				restartCorrelationId));
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStarted(ProjectionCoreService.SubComponentName,
+				restartCorrelationId));
+
+		queues[0].Messages.Clear();
+		// Stop components with a different correlation id
+		var incorrectCorrelationId = Guid.NewGuid();
+		_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(incorrectCorrelationId));
+
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StopReader).Count);
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StopCore).Count);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_restarting_with_projection_type_none.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_restarting_with_projection_type_none.cs
new file mode 100644
index 00000000000..18997510b45
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_restarting_with_projection_type_none.cs
@@ -0,0 +1,101 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_coordinator;
+
+[TestFixture]
+public class when_restarting_with_projection_type_none {
+	private FakePublisher[] queues;
+	private FakePublisher publisher;
+	private ProjectionCoreCoordinator _coordinator;
+	private Guid instanceCorrelationId = Guid.NewGuid();
+	private Guid queueId;
+
+	[SetUp]
+	public void Setup() {
+		queues = new List<FakePublisher>() { new FakePublisher() }.ToArray();
+		publisher = new FakePublisher();
+
+		_coordinator =
+			new ProjectionCoreCoordinator(ProjectionType.None, queues, publisher);
+
+		// Start components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(instanceCorrelationId));
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStarted(EventReaderCoreService.SubComponentName,
+				instanceCorrelationId));
+
+		// Stop components but don't handle component stopped
+		_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(instanceCorrelationId));
+
+		var stopReader = queues[0].Messages.OfType<ReaderCoreServiceMessage.StopReader>().First();
+		queueId = stopReader.QueueId;
+		//clear queues for clearer testing
+		queues[0].Messages.Clear();
+	}
+
+	[Test]
+	public void should_not_start_reader_if_subcomponents_not_stopped() {
+		// None of the subcomponents stopped
+
+		// Start components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StartReader).Count);
+	}
+
+
+	[Test]
+	public void should_start_reader_if_subcomponents_stopped_before_starting_components_again() {
+		// Component stopped
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
+				queueId));
+
+		// Start component
+		_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+
+		Assert.AreEqual(1, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StartReader).Count);
+	}
+
+	[Test]
+	public void should_not_stop_reader_if_subcomponents_not_started_yet() {
+		var newInstanceCorrelationId = Guid.NewGuid();
+
+		// Stop components
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
+				queueId));
+
+		// Start components but don't handle component started
+		_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(newInstanceCorrelationId));
+
+		// Stop components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(newInstanceCorrelationId));
+
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StopReader).Count);
+	}
+
+	[Test]
+	public void should_not_stop_reader_if_subcomponents_not_started() {
+		// Stop components
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
+				queueId));
+
+		// Stop components without starting
+		_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(Guid.NewGuid()));
+
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StopReader).Count);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_restarting_with_projection_type_system.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_restarting_with_projection_type_system.cs
new file mode 100644
index 00000000000..2cf1aee555f
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_restarting_with_projection_type_system.cs
@@ -0,0 +1,171 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_coordinator;
+
+[TestFixture]
+public class when_restarting_with_projection_type_system {
+	private FakePublisher[] queues;
+	private FakePublisher publisher;
+	private ProjectionCoreCoordinator _coordinator;
+	private Guid instanceCorrelationId = Guid.NewGuid();
+	private Guid queueId;
+
+	[SetUp]
+	public void Setup() {
+		queues = new List<FakePublisher>() { new FakePublisher() }.ToArray();
+		publisher = new FakePublisher();
+
+		_coordinator =
+			new ProjectionCoreCoordinator(ProjectionType.System, queues, publisher);
+
+		// Start components and handle started
+		_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(instanceCorrelationId));
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStarted(EventReaderCoreService.SubComponentName,
+				instanceCorrelationId));
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStarted(ProjectionCoreService.SubComponentName,
+				instanceCorrelationId));
+
+		// Stop components but don't handle stopped
+		_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(instanceCorrelationId));
+
+		var stopCore = queues[0].Messages.OfType<ProjectionCoreServiceMessage.StopCore>().First();
+		queueId = stopCore.QueueId;
+		//clear queues for clearer testing
+		queues[0].Messages.Clear();
+	}
+
+	[Test]
+	public void should_not_start_if_subcomponents_not_stopped() {
+		// None of the subcomponents stopped
+
+		// Start Components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StartReader).Count);
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StartCore).Count);
+	}
+
+	[Test]
+	public void should_not_start_if_not_all_subcomponents_stopped() {
+		// Not all components stopped
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
+				queueId));
+
+		// Start Components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StartReader).Count);
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StartCore).Count);
+	}
+
+	[Test]
+	public void should_start_if_subcomponents_stopped_before_starting_components_again() {
+		// All components stopped
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
+				queueId));
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStopped(ProjectionCoreService.SubComponentName,
+				queueId));
+
+		// Start components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+
+		Assert.AreEqual(1, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StartReader).Count);
+		Assert.AreEqual(1, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StartCore).Count);
+	}
+
+	[Test]
+	public void should_not_stop_if_all_subcomponents_not_started() {
+		var newInstanceCorrelationId = Guid.NewGuid();
+
+		// All components stopped
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
+				queueId));
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStopped(ProjectionCoreService.SubComponentName,
+				queueId));
+
+		queues[0].Messages.Clear();
+
+		// Start components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(newInstanceCorrelationId));
+
+		// Not all subcomponents started
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStarted(EventReaderCoreService.SubComponentName,
+				newInstanceCorrelationId));
+
+		// Stop components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(newInstanceCorrelationId));
+
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StopReader).Count);
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StopCore).Count);
+	}
+
+	[Test]
+	public void should_not_stop_if_not_started() {
+		// All components stopped
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
+				queueId));
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStopped(ProjectionCoreService.SubComponentName,
+				queueId));
+
+		queues[0].Messages.Clear();
+
+		// Stop components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(Guid.NewGuid()));
+
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StopReader).Count);
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StopCore).Count);
+	}
+
+	[Test]
+	public void should_not_stop_if_correlation_id_is_different() {
+		var newInstanceCorrelationId = Guid.NewGuid();
+
+		// All components stopped
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStopped(EventReaderCoreService.SubComponentName,
+				queueId));
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStopped(ProjectionCoreService.SubComponentName,
+				queueId));
+
+		// Start components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(newInstanceCorrelationId));
+
+		// All components started
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStarted(EventReaderCoreService.SubComponentName,
+				newInstanceCorrelationId));
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStarted(ProjectionCoreService.SubComponentName,
+				newInstanceCorrelationId));
+
+		queues[0].Messages.Clear();
+		// Stop components with a different correlation id
+		var incorrectCorrelationId = Guid.NewGuid();
+		_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(incorrectCorrelationId));
+
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StopReader).Count);
+		Assert.AreEqual(0, queues[0].Messages.FindAll(x => x is ProjectionCoreServiceMessage.StopCore).Count);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_starting_with_projection_type_all.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_starting_with_projection_type_all.cs
new file mode 100644
index 00000000000..0831332ce5c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_starting_with_projection_type_all.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Management;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_coordinator;
+
+[TestFixture]
+public class when_starting_with_projection_type_all {
+	private FakePublisher[] queues;
+	private FakePublisher publisher;
+	private ProjectionCoreCoordinator _coordinator;
+
+	[SetUp]
+	public void Setup() {
+		queues = new List<FakePublisher>() { new FakePublisher() }.ToArray();
+		publisher = new FakePublisher();
+
+		_coordinator =
+			new ProjectionCoreCoordinator(ProjectionType.All, queues, publisher);
+		_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+	}
+
+	[Test]
+	public void should_publish_start_reader_messages() {
+		Assert.AreEqual(1, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StartReader).Count);
+	}
+
+	[Test]
+	public void should_publish_start_core_messages() {
+		Assert.AreEqual(1,
+			queues[0].Messages.FindAll(x => x.GetType() == typeof(ProjectionCoreServiceMessage.StartCore)).Count);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_starting_with_projection_type_none.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_starting_with_projection_type_none.cs
new file mode 100644
index 00000000000..ae81d7f0190
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_starting_with_projection_type_none.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Management;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_coordinator;
+
+[TestFixture]
+public class when_starting_with_projection_type_none {
+	private FakePublisher[] queues;
+	private FakePublisher publisher;
+	private ProjectionCoreCoordinator _coordinator;
+
+	[SetUp]
+	public void Setup() {
+		queues = new List<FakePublisher>() { new FakePublisher() }.ToArray();
+		publisher = new FakePublisher();
+
+		_coordinator =
+			new ProjectionCoreCoordinator(ProjectionType.None, queues, publisher);
+		_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+	}
+
+	[Test]
+	public void should_publish_start_reader_messages() {
+		Assert.AreEqual(1, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StartReader).Count);
+	}
+
+	[Test]
+	public void should_not_publish_start_core_messages() {
+		Assert.AreEqual(0,
+			queues[0].Messages.FindAll(x => x.GetType() == typeof(ProjectionCoreServiceMessage.StartCore)).Count);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_starting_with_projection_type_system.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_starting_with_projection_type_system.cs
new file mode 100644
index 00000000000..ddcfdd986c4
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_starting_with_projection_type_system.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Management;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_coordinator;
+
+[TestFixture]
+public class when_starting_with_projection_type_system {
+	private FakePublisher[] queues;
+	private FakePublisher publisher;
+	private ProjectionCoreCoordinator _coordinator;
+
+	[SetUp]
+	public void Setup() {
+		queues = new List<FakePublisher>() { new FakePublisher() }.ToArray();
+		publisher = new FakePublisher();
+
+		_coordinator =
+			new ProjectionCoreCoordinator(ProjectionType.System, queues, publisher);
+		_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+	}
+
+	[Test]
+	public void should_publish_start_reader_messages() {
+		Assert.AreEqual(1, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StartReader).Count);
+	}
+
+	[Test]
+	public void should_publish_start_core_messages() {
+		Assert.AreEqual(1,
+			queues[0].Messages.FindAll(x => x.GetType() == typeof(ProjectionCoreServiceMessage.StartCore)).Count);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_stopping_with_projection_type_all.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_stopping_with_projection_type_all.cs
new file mode 100644
index 00000000000..b35fdbec67e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_stopping_with_projection_type_all.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_coordinator;
+
+[TestFixture]
+public class when_stopping_with_projection_type_all {
+	private FakePublisher[] queues;
+	private FakePublisher publisher;
+	private ProjectionCoreCoordinator _coordinator;
+
+	private List<ProjectionCoreServiceMessage.StopCore> stopCoreMessages =
+		new List<ProjectionCoreServiceMessage.StopCore>();
+
+	[SetUp]
+	public void Setup() {
+		queues = new List<FakePublisher>() { new FakePublisher() }.ToArray();
+		publisher = new FakePublisher();
+
+		var instanceCorrelationId = Guid.NewGuid();
+		_coordinator =
+			new ProjectionCoreCoordinator(ProjectionType.All, queues, publisher);
+
+		// Start all sub components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(instanceCorrelationId));
+
+		// All components started
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStarted(EventReaderCoreService.SubComponentName,
+				instanceCorrelationId));
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStarted(ProjectionCoreService.SubComponentName,
+				instanceCorrelationId));
+
+		// Stop Components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(instanceCorrelationId));
+
+		// Publish SubComponent stopped messages for the projection core service
+		stopCoreMessages = queues[0].Messages
+			.FindAll(x => x.GetType() == typeof(ProjectionCoreServiceMessage.StopCore))
+			.Select(x => x as ProjectionCoreServiceMessage.StopCore)
+			.ToList();
+		foreach (var msg in stopCoreMessages)
+			_coordinator.Handle(
+				new ProjectionCoreServiceMessage.SubComponentStopped(ProjectionCoreService.SubComponentName,
+					msg.QueueId));
+	}
+
+	[Test]
+	public void should_publish_stop_core_messages() {
+		Assert.AreEqual(1, stopCoreMessages.Count);
+	}
+
+	[Test]
+	public void should_publish_stop_reader_messages_after_core_stopped() {
+		Assert.AreEqual(1, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StopReader).Count);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_stopping_with_projection_type_none.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_stopping_with_projection_type_none.cs
new file mode 100644
index 00000000000..d8f74ac59af
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_stopping_with_projection_type_none.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_coordinator;
+
+[TestFixture]
+public class when_stopping_with_projection_type_none {
+	private FakePublisher[] queues;
+	private FakePublisher publisher;
+	private ProjectionCoreCoordinator _coordinator;
+
+	[SetUp]
+	public void Setup() {
+		queues = new List<FakePublisher>() { new FakePublisher() }.ToArray();
+		publisher = new FakePublisher();
+
+		var instanceCorrelationId = Guid.NewGuid();
+		_coordinator =
+			new ProjectionCoreCoordinator(ProjectionType.None, queues, publisher);
+
+		// Start components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(instanceCorrelationId));
+
+		// start sub components
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStarted(EventReaderCoreService.SubComponentName,
+				instanceCorrelationId));
+
+		//force stop
+		_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(instanceCorrelationId));
+	}
+
+	[Test]
+	public void should_publish_stop_reader_messages() {
+		Assert.AreEqual(1, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StopReader).Count);
+	}
+
+	[Test]
+	public void should_not_publish_stop_core_messages() {
+		Assert.AreEqual(0,
+			queues[0].Messages.FindAll(x => x.GetType() == typeof(ProjectionCoreServiceMessage.StopCore)).Count);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_stopping_with_projection_type_system.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_stopping_with_projection_type_system.cs
new file mode 100644
index 00000000000..fe6f2d3909e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_coordinator/when_stopping_with_projection_type_system.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_coordinator;
+
+[TestFixture]
+public class when_stopping_with_projection_type_system {
+	private FakePublisher[] queues;
+	private FakePublisher publisher;
+	private ProjectionCoreCoordinator _coordinator;
+
+	private List<ProjectionCoreServiceMessage.StopCore> stopCoreMessages =
+		new List<ProjectionCoreServiceMessage.StopCore>();
+
+	[SetUp]
+	public void Setup() {
+		queues = new List<FakePublisher>() { new FakePublisher() }.ToArray();
+		publisher = new FakePublisher();
+
+		var instanceCorrelationId = Guid.NewGuid();
+		_coordinator =
+			new ProjectionCoreCoordinator(ProjectionType.System, queues, publisher);
+
+		// Start components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StartComponents(instanceCorrelationId));
+
+		// Start all sub components
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStarted(EventReaderCoreService.SubComponentName,
+				instanceCorrelationId));
+		_coordinator.Handle(
+			new ProjectionCoreServiceMessage.SubComponentStarted(ProjectionCoreService.SubComponentName,
+				instanceCorrelationId));
+
+		// Stop components
+		_coordinator.Handle(new ProjectionSubsystemMessage.StopComponents(instanceCorrelationId));
+
+		// Publish SubComponent stopped messages for the projection core service
+		stopCoreMessages = queues[0].Messages.OfType<ProjectionCoreServiceMessage.StopCore>().ToList();
+		foreach (var msg in stopCoreMessages)
+			_coordinator.Handle(
+				new ProjectionCoreServiceMessage.SubComponentStopped(ProjectionCoreService.SubComponentName,
+					msg.QueueId));
+	}
+
+	[Test]
+	public void should_publish_stop_core_messages() {
+		Assert.AreEqual(1, stopCoreMessages.Count);
+	}
+
+	[Test]
+	public void should_publish_stop_reader_messages() {
+		Assert.AreEqual(1, queues[0].Messages.FindAll(x => x is ReaderCoreServiceMessage.StopReader).Count);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/FakeProjectionHandler.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/FakeProjectionHandler.cs
new file mode 100644
index 00000000000..3e1ec81b7ca
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/FakeProjectionHandler.cs
@@ -0,0 +1,225 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+public class FakeProjectionStateHandler : IProjectionStateHandler {
+	public int _initializeCalled = 0;
+	public int _initializeSharedCalled = 0;
+	public int _loadCalled = 0;
+	public int _eventsProcessed = 0;
+	public int _partitionCreatedProcessed = 0;
+	public string _loadedState = null;
+	public string _lastProcessedStreamId;
+	public string _lastProcessedEventType;
+	public Guid _lastProcessedEventId;
+	public long _lastProcessedSequencenumber;
+	public string _lastProcessedMetadata;
+	public string _lastProcessedData;
+	public string _lastPartition;
+	public const string _emit1Data = @"{""emit"":1}";
+	public const string _emit2Data = @"{""emit"":2}";
+	public const string _emit3Data = @"{""emit"":3}";
+	public const string _emit1StreamId = "/emit1";
+	public const string _emit2StreamId = "/emit2";
+	public const string _emit1EventType = "emit1_event_type";
+	public const string _emit2EventType = "emit2_event_type";
+
+	private readonly bool _failOnInitialize;
+	private readonly bool _failOnLoad;
+	private readonly bool _failOnProcessEvent;
+	private readonly bool _failOnGetPartition;
+	private readonly Action<SourceDefinitionBuilder> _configureBuilder;
+	private readonly IQuerySources _definition;
+
+	public FakeProjectionStateHandler(string source, Action<string, object[]> logger) {
+		_definition = source.ParseJson<QuerySourcesDefinition>();
+	}
+
+	public FakeProjectionStateHandler(
+		bool failOnInitialize = false, bool failOnLoad = false, bool failOnProcessEvent = false,
+		bool failOnGetPartition = true,
+		Action<SourceDefinitionBuilder> configureBuilder = null) {
+		_failOnInitialize = failOnInitialize;
+		_failOnLoad = failOnLoad;
+		_failOnProcessEvent = failOnProcessEvent;
+		_failOnGetPartition = failOnGetPartition;
+		_configureBuilder = configureBuilder;
+	}
+
+	public void ConfigureSourceProcessingStrategy(SourceDefinitionBuilder builder) {
+		if (_configureBuilder != null)
+			_configureBuilder(builder);
+		else {
+			builder.FromAll();
+			builder.AllEvents();
+			builder.SetDefinesStateTransform();
+			builder.SetOutputState();
+		}
+	}
+
+	public void Load(string state) {
+		if (_failOnLoad)
+			throw new Exception("LOAD_FAILED");
+		_loadCalled++;
+		_loadedState = state;
+	}
+
+	public void LoadShared(string state) {
+		throw new NotImplementedException();
+	}
+
+	public void Initialize() {
+		if (_failOnInitialize)
+			throw new Exception("INITIALIZE_FAILED");
+		_initializeCalled++;
+		_loadedState = "";
+	}
+
+	public void InitializeShared() {
+		if (_failOnInitialize)
+			throw new Exception("INITIALIZE_SHARED_FAILED");
+		_initializeSharedCalled++;
+		_loadedState = "";
+	}
+
+
+	public string GetStatePartition(CheckpointTag eventPosition, string category, ResolvedEvent data) {
+		if (_failOnGetPartition)
+			throw new Exception("GetStatePartition FAILED");
+		return "region-a";
+	}
+
+	public bool ProcessEvent(
+		string partition, CheckpointTag eventPosition, string category1, ResolvedEvent data,
+		out string newState, out string newSharedState, out EmittedEventEnvelope[] emittedEvents) {
+		newSharedState = null;
+		if (_failOnProcessEvent)
+			throw new Exception("PROCESS_EVENT_FAILED");
+		_lastProcessedStreamId = data.EventStreamId;
+		_lastProcessedEventType = data.EventType;
+		_lastProcessedEventId = data.EventId;
+		_lastProcessedSequencenumber = data.EventSequenceNumber;
+		_lastProcessedMetadata = data.Metadata;
+		_lastProcessedData = data.Data;
+		_lastPartition = partition;
+
+		_eventsProcessed++;
+		switch (data.EventType) {
+			case "skip_this_type":
+				newState = null;
+				emittedEvents = null;
+				return false;
+			case "handle_this_type":
+				_loadedState = newState = data.Data;
+				emittedEvents = null;
+				return true;
+			case "append":
+				_loadedState = newState = _loadedState + data.Data;
+				emittedEvents = null;
+				return true;
+			case "no_state_emit1_type":
+				_loadedState = newState = "";
+				emittedEvents = new[] {
+					new EmittedEventEnvelope(
+						new EmittedDataEvent(
+							_emit1StreamId, Guid.NewGuid(), _emit1EventType, true, _emit1Data, null, eventPosition,
+							null)),
+				};
+				return true;
+			case "emit1_type":
+				_loadedState = newState = data.Data;
+				emittedEvents = new[] {
+					new EmittedEventEnvelope(
+						new EmittedDataEvent(
+							_emit1StreamId, Guid.NewGuid(), _emit1EventType, true, _emit1Data, null, eventPosition,
+							null)),
+				};
+				return true;
+			case "emit22_type":
+				_loadedState = newState = data.Data;
+				emittedEvents = new[] {
+					new EmittedEventEnvelope(
+						new EmittedDataEvent(
+							_emit2StreamId, Guid.NewGuid(), _emit2EventType, true, _emit1Data, null, eventPosition,
+							null)),
+					new EmittedEventEnvelope(
+						new EmittedDataEvent(
+							_emit2StreamId, Guid.NewGuid(), _emit2EventType, true, _emit2Data, null, eventPosition,
+							null)),
+				};
+				return true;
+			case "emit212_type":
+				_loadedState = newState = data.Data;
+				emittedEvents = new[] {
+					new EmittedEventEnvelope(
+						new EmittedDataEvent(
+							_emit2StreamId, Guid.NewGuid(), _emit2EventType, true, _emit1Data, null, eventPosition,
+							null)),
+					new EmittedEventEnvelope(
+						new EmittedDataEvent(
+							_emit1StreamId, Guid.NewGuid(), _emit1EventType, true, _emit2Data, null, eventPosition,
+							null)),
+					new EmittedEventEnvelope(
+						new EmittedDataEvent(
+							_emit2StreamId, Guid.NewGuid(), _emit2EventType, true, _emit3Data, null, eventPosition,
+							null)),
+				};
+				return true;
+			case "emit12_type":
+				_loadedState = newState = data.Data;
+				emittedEvents = new[] {
+					new EmittedEventEnvelope(
+						new EmittedDataEvent(
+							_emit1StreamId, Guid.NewGuid(), _emit1EventType, true, _emit1Data, null, eventPosition,
+							null)),
+					new EmittedEventEnvelope(
+						new EmittedDataEvent(
+							_emit2StreamId, Guid.NewGuid(), _emit2EventType, true, _emit2Data, null, eventPosition,
+							null)),
+				};
+				return true;
+			case "just_emit":
+				newState = _loadedState;
+				emittedEvents = new[] {
+					new EmittedEventEnvelope(
+						new EmittedDataEvent(
+							_emit1StreamId, Guid.NewGuid(), _emit1EventType, true, _emit1Data, null, eventPosition,
+							null)),
+				};
+				return true;
+			default:
+				throw new NotSupportedException();
+		}
+	}
+
+	public bool ProcessPartitionCreated(string partition, CheckpointTag createPosition, ResolvedEvent data,
+		out EmittedEventEnvelope[] emittedEvents) {
+		_partitionCreatedProcessed++;
+		emittedEvents = null;
+		return true;
+	}
+
+	public bool ProcessPartitionDeleted(string partition, CheckpointTag deletePosition, out string newState) {
+		throw new NotImplementedException();
+	}
+
+	public string TransformStateToResult() {
+		return _loadedState;
+	}
+
+	public void Dispose() {
+	}
+
+	public IQuerySources GetSourceDefinition() {
+		return _definition ?? SourceDefinitionBuilder.From(ConfigureSourceProcessingStrategy);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/TestCheckpointManagerMessageHandler.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/TestCheckpointManagerMessageHandler.cs
new file mode 100644
index 00000000000..0f892741248
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/TestCheckpointManagerMessageHandler.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Projections.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+public class TestCheckpointManagerMessageHandler : IProjectionCheckpointManager, IEmittedStreamContainer {
+	public readonly List<CoreProjectionProcessingMessage.ReadyForCheckpoint> HandledMessages =
+		new List<CoreProjectionProcessingMessage.ReadyForCheckpoint>();
+
+	public readonly List<CoreProjectionProcessingMessage.RestartRequested> HandledRestartRequestedMessages =
+		new List<CoreProjectionProcessingMessage.RestartRequested>();
+
+	public readonly List<CoreProjectionProcessingMessage.Failed> HandledFailedMessages =
+		new List<CoreProjectionProcessingMessage.Failed>();
+
+	public readonly List<CoreProjectionProcessingMessage.EmittedStreamWriteCompleted> HandledWriteCompletedMessage =
+		new List<CoreProjectionProcessingMessage.EmittedStreamWriteCompleted>();
+
+	public readonly List<CoreProjectionProcessingMessage.EmittedStreamAwaiting> HandledStreamAwaitingMessage =
+		new List<CoreProjectionProcessingMessage.EmittedStreamAwaiting>();
+
+	public void Handle(CoreProjectionProcessingMessage.ReadyForCheckpoint message) {
+		HandledMessages.Add(message);
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.RestartRequested message) {
+		HandledRestartRequestedMessages.Add(message);
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.Failed message) {
+		HandledFailedMessages.Add(message);
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.EmittedStreamAwaiting message) {
+		HandledStreamAwaitingMessage.Add(message);
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.EmittedStreamWriteCompleted message) {
+		HandledWriteCompletedMessage.Add(message);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/TestFixtureUtils.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/TestFixtureUtils.cs
new file mode 100644
index 00000000000..37ed80a2839
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/TestFixtureUtils.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+public static class TestFixtureUtils {
+	public static IEnumerable<ClientMessage.WriteEvents> ToStream(
+		this IEnumerable<ClientMessage.WriteEvents> self, string streamId) {
+		return self.Where(v => v.EventStreamId == streamId);
+	}
+
+	public static List<ClientMessage.WriteEvents> ToStream(
+		this List<ClientMessage.WriteEvents> self, string streamId) {
+		return self.Where(v => v.EventStreamId == streamId).ToList();
+	}
+
+	public static IEnumerable<Event> OfEventType(
+		this IEnumerable<ClientMessage.WriteEvents> self, string type) {
+		return self.SelectMany(v => v.Events).Where(v => v.EventType == type);
+	}
+
+	public static IEnumerable<Event> ExceptOfEventType(
+		this IEnumerable<ClientMessage.WriteEvents> self, string type) {
+		return self.SelectMany(v => v.Events).Where(v => v.EventType != type);
+	}
+
+	public static List<Event> OfEventType(
+		this List<ClientMessage.WriteEvents> self, string type) {
+		return self.SelectMany(v => v.Events).Where(v => v.EventType == type).ToList();
+	}
+
+	public static List<ClientMessage.WriteEvents> WithEventType(
+		this List<ClientMessage.WriteEvents> self, string type) {
+		return self.Where(v => v.Events.Any(m => m.EventType == type)).ToList();
+	}
+
+	public static IEnumerable<T> OfTypes<T, T1, T2>(this IEnumerable<object> source) where T1 : T where T2 : T {
+		return source.OfType<T>().Where(v => v is T1 || v is T2);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/TestFixtureWithCoreProjection.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/TestFixtureWithCoreProjection.cs
new file mode 100644
index 00000000000..11e34418479
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/TestFixtureWithCoreProjection.cs
@@ -0,0 +1,145 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Tests.Bus.Helpers;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+public abstract class TestFixtureWithCoreProjection<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	protected CoreProjection _coreProjection;
+	protected TestHandler<ReaderSubscriptionManagement.Subscribe> _subscribeProjectionHandler;
+	protected TestHandler<ClientMessage.WriteEvents> _writeEventHandler;
+	protected Guid _firstWriteCorrelationId;
+	protected FakeProjectionStateHandler _stateHandler;
+	protected int _checkpointHandledThreshold = 5;
+	protected int _checkpointUnhandledBytesThreshold = 10000;
+	protected Action<SourceDefinitionBuilder> _configureBuilderByQuerySource = null;
+	protected Guid _projectionCorrelationId;
+	private bool _createTempStreams = false;
+	protected ProjectionConfig _projectionConfig;
+	protected ProjectionVersion _version;
+	protected string _projectionName;
+	protected Guid _workerId;
+
+	protected override void Given1() {
+		_version = new ProjectionVersion(1, 0, 0);
+		_projectionName = "projection";
+	}
+
+	[SetUp]
+	public void setup() {
+		_subscribeProjectionHandler = new TestHandler<ReaderSubscriptionManagement.Subscribe>();
+		_writeEventHandler = new TestHandler<ClientMessage.WriteEvents>();
+		_bus.Subscribe(_subscribeProjectionHandler);
+		_bus.Subscribe(_writeEventHandler);
+
+
+		_stateHandler = GivenProjectionStateHandler();
+		_firstWriteCorrelationId = Guid.NewGuid();
+		_workerId = Guid.NewGuid();
+		var dispatcher = new ProjectionManagerMessageDispatcher(new Dictionary<Guid, IPublisher>
+			{{_workerId, GetInputQueue()}});
+		_projectionCorrelationId = Guid.NewGuid();
+		_projectionConfig = GivenProjectionConfig();
+		var projectionProcessingStrategy = GivenProjectionProcessingStrategy();
+		_coreProjection = GivenCoreProjection(projectionProcessingStrategy);
+		_bus.Subscribe<CoreProjectionProcessingMessage.CheckpointCompleted>(_coreProjection);
+		_bus.Subscribe<CoreProjectionProcessingMessage.CheckpointLoaded>(_coreProjection);
+		_bus.Subscribe<CoreProjectionProcessingMessage.PrerecordedEventsLoaded>(_coreProjection);
+		_bus.Subscribe<CoreProjectionProcessingMessage.RestartRequested>(_coreProjection);
+		_bus.Subscribe<CoreProjectionProcessingMessage.Failed>(_coreProjection);
+		_bus.Subscribe(new AdHocHandler<ProjectionCoreServiceMessage.CoreTick>(tick => tick.Action()));
+		PreWhen();
+		When();
+	}
+
+	protected virtual CoreProjection
+		GivenCoreProjection(ProjectionProcessingStrategy projectionProcessingStrategy) {
+		return projectionProcessingStrategy.Create(
+			_projectionCorrelationId,
+			_bus,
+			_workerId,
+			SystemAccounts.System,
+			_bus,
+			_ioDispatcher,
+			_subscriptionDispatcher,
+			_timeProvider);
+	}
+
+	protected virtual ProjectionProcessingStrategy GivenProjectionProcessingStrategy() {
+		return CreateProjectionProcessingStrategy();
+	}
+
+	protected ProjectionProcessingStrategy CreateProjectionProcessingStrategy() {
+		return new ContinuousProjectionProcessingStrategy(
+			_projectionName, _version, _stateHandler, _projectionConfig, _stateHandler.GetSourceDefinition(), null,
+			_subscriptionDispatcher, true, Opts.MaxProjectionStateSizeDefault);
+	}
+
+	protected ProjectionProcessingStrategy CreateQueryProcessingStrategy() {
+		return new QueryProcessingStrategy(
+			_projectionName, _version, _stateHandler, _projectionConfig, _stateHandler.GetSourceDefinition(), null,
+			_subscriptionDispatcher, true, Opts.MaxProjectionStateSizeDefault);
+	}
+
+	protected virtual ProjectionConfig GivenProjectionConfig() {
+		return new ProjectionConfig(
+			null, _checkpointHandledThreshold, _checkpointUnhandledBytesThreshold, GivenPendingEventsThreshold(),
+			GivenMaxWriteBatchLength(), GivenEmitEventEnabled(), GivenCheckpointsEnabled(), _createTempStreams,
+			GivenStopOnEof(), GivenTrackEmittedStreams(), GivenCheckpointAfterMs(),
+			GivenMaximumAllowedWritesInFlight(), null);
+	}
+
+	protected virtual int GivenMaxWriteBatchLength() {
+		return 250;
+	}
+
+	protected virtual int GivenPendingEventsThreshold() {
+		return 1000;
+	}
+
+	protected virtual bool GivenStopOnEof() {
+		return false;
+	}
+
+	protected virtual bool GivenCheckpointsEnabled() {
+		return true;
+	}
+
+	protected virtual bool GivenTrackEmittedStreams() {
+		return true;
+	}
+
+	protected virtual bool GivenEmitEventEnabled() {
+		return true;
+	}
+
+	protected virtual int GivenCheckpointAfterMs() {
+		return 10000;
+	}
+
+	protected virtual int GivenMaximumAllowedWritesInFlight() {
+		return 1;
+	}
+
+	protected virtual FakeProjectionStateHandler GivenProjectionStateHandler() {
+		return new FakeProjectionStateHandler(configureBuilder: _configureBuilderByQuerySource);
+	}
+
+	protected new virtual void PreWhen() {
+	}
+
+	protected new abstract void When();
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/TestFixtureWithCoreProjectionLoaded.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/TestFixtureWithCoreProjectionLoaded.cs
new file mode 100644
index 00000000000..3f132f11771
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/TestFixtureWithCoreProjectionLoaded.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+public abstract class TestFixtureWithCoreProjectionLoaded<TLogFormat, TStreamId> : TestFixtureWithCoreProjection<TLogFormat, TStreamId> {
+	protected override void PreWhen() {
+		_coreProjection.LoadStopped();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/TestFixtureWithCoreProjectionStarted.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/TestFixtureWithCoreProjectionStarted.cs
new file mode 100644
index 00000000000..4ba3a9243ca
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/TestFixtureWithCoreProjectionStarted.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Projections.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+public abstract class TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> : TestFixtureWithCoreProjection<TLogFormat, TStreamId> {
+	protected Guid _subscriptionId;
+
+	protected override void PreWhen() {
+		_coreProjection.Start();
+		var lastSubscribe =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionManagement.Subscribe>().LastOrDefault();
+		_subscriptionId = lastSubscribe != null ? lastSubscribe.SubscriptionId : Guid.NewGuid();
+		_bus.Publish(new EventReaderSubscriptionMessage.ReaderAssignedReader(_subscriptionId, Guid.NewGuid()));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/TestFixtureWithExistingEvents.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/TestFixtureWithExistingEvents.cs
new file mode 100644
index 00000000000..2c4cc46bde6
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/TestFixtureWithExistingEvents.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.AwakeReaderService;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Messaging;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+public abstract class TestFixtureWithExistingEvents<TLogFormat, TStreamId> : KurrentDB.Core.Tests.Helpers.TestFixtureWithExistingEvents<TLogFormat, TStreamId>,
+	IHandle<ProjectionCoreServiceMessage.CoreTick> {
+	protected ReaderSubscriptionDispatcher _subscriptionDispatcher;
+
+	private bool _ticksAreHandledImmediately;
+	protected AwakeService AwakeService;
+
+	protected override void Given1() {
+		base.Given1();
+		_ticksAreHandledImmediately = false;
+	}
+
+	[SetUp]
+	public void SetUp() {
+		_subscriptionDispatcher = new ReaderSubscriptionDispatcher(_bus);
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CommittedEventReceived>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CheckpointSuggested>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.EofReached>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionEofReached>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionDeleted>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ProgressChanged>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.SubscriptionStarted>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.NotAuthorized>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ReaderAssignedReader>());
+		_bus.Subscribe<ProjectionCoreServiceMessage.CoreTick>(this);
+
+		AwakeService = new AwakeService();
+		_bus.Subscribe<StorageMessage.EventCommitted>(AwakeService);
+		_bus.Subscribe<StorageMessage.TfEofAtNonCommitRecord>(AwakeService);
+		_bus.Subscribe<AwakeServiceMessage.SubscribeAwake>(AwakeService);
+		_bus.Subscribe<AwakeServiceMessage.UnsubscribeAwake>(AwakeService);
+		_bus.Subscribe(new UnwrapEnvelopeHandler());
+	}
+
+	public void Handle(ProjectionCoreServiceMessage.CoreTick message) {
+		if (_ticksAreHandledImmediately)
+			message.Action();
+	}
+
+	protected void TicksAreHandledImmediately() {
+		_ticksAreHandledImmediately = true;
+	}
+
+	protected ClientMessage.WriteEvents CreateWriteEvent(
+		string streamId, string eventType, string data, string metadata = null, bool isJson = true,
+		Guid? correlationId = null) {
+		return new ClientMessage.WriteEvents(
+			Guid.NewGuid(), correlationId ?? Guid.NewGuid(), GetInputQueue(), false, streamId,
+			ExpectedVersion.Any, new Event(Guid.NewGuid(), eventType, isJson, data, metadata), null);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/TestFixtureWithReadWriteDispatchers.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/TestFixtureWithReadWriteDispatchers.cs
new file mode 100644
index 00000000000..b35c89d8db2
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/TestFixtureWithReadWriteDispatchers.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+public abstract class TestFixtureWithReadWriteDispatchers :
+	KurrentDB.Core.Tests.Helpers.TestFixtureWithReadWriteDispatchers {
+	protected ReaderSubscriptionDispatcher _subscriptionDispatcher;
+
+	[SetUp]
+	public void SetUp() {
+		_subscriptionDispatcher = new ReaderSubscriptionDispatcher(_bus);
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CommittedEventReceived>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CheckpointSuggested>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.EofReached>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionEofReached>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionDeleted>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ProgressChanged>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.SubscriptionStarted>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.NotAuthorized>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ReaderAssignedReader>());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/another_epoch/when_loading_an_existing_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/another_epoch/when_loading_an_existing_projection.cs
new file mode 100644
index 00000000000..afc67fc86e7
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/another_epoch/when_loading_an_existing_projection.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.another_epoch;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_starting_an_existing_projection<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	private string _testProjectionState = @"{""test"":1}";
+
+	protected override void Given() {
+		_version = new ProjectionVersion(1, 2, 2);
+		ExistingEvent(
+			"$projections-projection-result", "Result",
+			@"{""v"":1, ""c"": 100, ""p"": 50}", _testProjectionState);
+		ExistingEvent(
+			"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
+			@"{""v"":1, ""c"": 100, ""p"": 50}", _testProjectionState);
+		ExistingEvent(
+			"$projections-projection-result", "Result",
+			@"{""v"":1, ""c"": 200, ""p"": 150}", _testProjectionState);
+		ExistingEvent(
+			"$projections-projection-result", "Result",
+			@"{""v"":1, ""c"": 300, ""p"": 250}", _testProjectionState);
+	}
+
+	protected override void When() {
+	}
+
+
+	[Test]
+	public void should_subscribe_from_the_beginning() {
+		Assert.AreEqual(1, _subscribeProjectionHandler.HandledMessages.Count);
+		Assert.AreEqual(0, _subscribeProjectionHandler.HandledMessages[0].FromPosition.Position.CommitPosition);
+		Assert.AreEqual(-1, _subscribeProjectionHandler.HandledMessages[0].FromPosition.Position.PreparePosition);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/FakeCoreProjection.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/FakeCoreProjection.cs
new file mode 100644
index 00000000000..e44803d55d4
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/FakeCoreProjection.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Bus;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Phases;
+using KurrentDB.Projections.Core.Services.Processing.WorkItems;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.checkpoint_manager;
+
+public class FakeCoreProjection : ICoreProjection,
+	ICoreProjectionForProcessingPhase,
+	IHandle<EventReaderSubscriptionMessage.ReaderAssignedReader> {
+	public readonly List<CoreProjectionProcessingMessage.CheckpointCompleted> _checkpointCompletedMessages =
+		new List<CoreProjectionProcessingMessage.CheckpointCompleted>();
+
+	public readonly List<CoreProjectionProcessingMessage.CheckpointLoaded> _checkpointLoadedMessages =
+		new List<CoreProjectionProcessingMessage.CheckpointLoaded>();
+
+	public readonly List<CoreProjectionProcessingMessage.PrerecordedEventsLoaded> _prerecordedEventsLoadedMessages =
+		new List<CoreProjectionProcessingMessage.PrerecordedEventsLoaded>();
+
+	public readonly List<CoreProjectionProcessingMessage.Failed> _failedMessages =
+		new List<CoreProjectionProcessingMessage.Failed>();
+
+	public void Handle(CoreProjectionProcessingMessage.CheckpointCompleted message) {
+		_checkpointCompletedMessages.Add(message);
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.CheckpointLoaded message) {
+		_checkpointLoadedMessages.Add(message);
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.RestartRequested message) {
+		throw new NotImplementedException();
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.Failed message) {
+		_failedMessages.Add(message);
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.PrerecordedEventsLoaded message) {
+		_prerecordedEventsLoadedMessages.Add(message);
+	}
+
+	public void CompletePhase() {
+		CompletePhaseInvoked++;
+	}
+
+	public void SetFaulted(string reason) {
+		throw new NotImplementedException();
+	}
+
+	public void SetFaulted(Exception ex) {
+		throw new NotImplementedException();
+	}
+
+	public void SetFaulting(string reason) {
+		throw new NotImplementedException();
+	}
+
+	public void SetCurrentCheckpointSuggestedWorkItem(CheckpointSuggestedWorkItem checkpointSuggestedWorkItem) {
+		throw new NotImplementedException();
+	}
+
+	public void EnsureTickPending() {
+		throw new NotImplementedException();
+	}
+
+	public CheckpointTag LastProcessedEventPosition {
+		get { throw new NotImplementedException(); }
+	}
+
+	public int SubscribedInvoked { get; set; }
+	public int CompletePhaseInvoked { get; set; }
+
+	public void Subscribed() {
+		SubscribedInvoked++;
+	}
+
+	public void Handle(EventReaderSubscriptionMessage.ReaderAssignedReader message) {
+		throw new NotImplementedException();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/TestFixtureWithCoreProjectionCheckpointManager.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/TestFixtureWithCoreProjectionCheckpointManager.cs
new file mode 100644
index 00000000000..c5bf8c5ca11
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/TestFixtureWithCoreProjectionCheckpointManager.cs
@@ -0,0 +1,107 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.checkpoint_manager;
+
+public abstract class TestFixtureWithCoreProjectionCheckpointManager<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	protected DefaultCheckpointManager _manager;
+	protected FakeCoreProjection _projection;
+	protected ProjectionConfig _config;
+	protected int _checkpointHandledThreshold;
+	protected int _checkpointUnhandledBytesThreshold;
+	protected int _pendingEventsThreshold;
+	protected int _maxWriteBatchLength;
+	protected bool _emitEventEnabled;
+	protected bool _checkpointsEnabled;
+	protected bool _trackEmittedStreams;
+	protected int _checkpointAfterMs;
+	protected int _maximumAllowedWritesInFlight;
+	protected bool _producesResults;
+	protected bool _definesFold = true;
+	protected Guid _projectionCorrelationId;
+	private string _projectionCheckpointStreamId;
+	protected bool _createTempStreams;
+	protected bool _stopOnEof;
+	protected ProjectionNamesBuilder _namingBuilder;
+	protected CoreProjectionCheckpointWriter _checkpointWriter;
+	protected CoreProjectionCheckpointReader _checkpointReader;
+	protected string _projectionName;
+	protected ProjectionVersion _projectionVersion;
+	protected int _maxProjectionStateSize = Opts.MaxProjectionStateSizeDefault;
+
+	[SetUp]
+	public void setup() {
+		Given();
+		_namingBuilder = ProjectionNamesBuilder.CreateForTest("projection");
+		_config = new ProjectionConfig(null, _checkpointHandledThreshold, _checkpointUnhandledBytesThreshold,
+			_pendingEventsThreshold, _maxWriteBatchLength, _emitEventEnabled,
+			_checkpointsEnabled, _createTempStreams, _stopOnEof, _trackEmittedStreams, _checkpointAfterMs,
+			_maximumAllowedWritesInFlight, null);
+		When();
+	}
+
+	protected new virtual void When() {
+		_projectionVersion = new ProjectionVersion(1, 0, 0);
+		_projectionName = "projection";
+		_checkpointWriter = new CoreProjectionCheckpointWriter(
+			_namingBuilder.MakeCheckpointStreamName(), _ioDispatcher, _projectionVersion, _projectionName);
+		_checkpointReader = new CoreProjectionCheckpointReader(
+			GetInputQueue(), _projectionCorrelationId, _ioDispatcher, _projectionCheckpointStreamId,
+			_projectionVersion, _checkpointsEnabled);
+		_manager = GivenCheckpointManager();
+	}
+
+	protected virtual DefaultCheckpointManager GivenCheckpointManager() {
+		return new DefaultCheckpointManager(
+			_bus, _projectionCorrelationId, _projectionVersion, null, _ioDispatcher, _config, _projectionName,
+			new StreamPositionTagger(0, "stream"), _namingBuilder, _checkpointsEnabled, _producesResults,
+			_definesFold,
+			_checkpointWriter, _maxProjectionStateSize);
+	}
+
+	protected new virtual void Given() {
+		_projectionCheckpointStreamId = "$projections-projection-checkpoint";
+		_projectionCorrelationId = Guid.NewGuid();
+		_projection = new FakeCoreProjection();
+		_bus.Subscribe<CoreProjectionProcessingMessage.CheckpointCompleted>(_projection);
+		_bus.Subscribe<CoreProjectionProcessingMessage.CheckpointLoaded>(_projection);
+		_bus.Subscribe<CoreProjectionProcessingMessage.PrerecordedEventsLoaded>(_projection);
+		_bus.Subscribe<CoreProjectionProcessingMessage.RestartRequested>(_projection);
+		_bus.Subscribe<CoreProjectionProcessingMessage.Failed>(_projection);
+		_bus.Subscribe<EventReaderSubscriptionMessage.ReaderAssignedReader>(_projection);
+
+		_bus.Subscribe(_subscriptionDispatcher
+			.CreateSubscriber<EventReaderSubscriptionMessage.CommittedEventReceived>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CheckpointSuggested>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.EofReached>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionEofReached>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionDeleted>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ProgressChanged>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.NotAuthorized>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ReaderAssignedReader>());
+		_checkpointHandledThreshold = 2;
+		_checkpointUnhandledBytesThreshold = 5;
+		_pendingEventsThreshold = 5;
+		_maxWriteBatchLength = 5;
+		_maximumAllowedWritesInFlight = 1;
+		_emitEventEnabled = true;
+		_checkpointsEnabled = true;
+		_producesResults = true;
+		_definesFold = true;
+		_createTempStreams = false;
+		_stopOnEof = false;
+		NoStream(_projectionCheckpointStreamId);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/checkpoint_manager_with_partition.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/checkpoint_manager_with_partition.cs
new file mode 100644
index 00000000000..0cd6a4b05ea
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/checkpoint_manager_with_partition.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.checkpoint_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class checkpoint_manager_with_partition<TLogFormat, TStreamId> :
+	TestFixtureWithCoreProjectionCheckpointManager<TLogFormat, TStreamId> {
+	[Test]
+	public void when_loading_partition_state_for_a_partition() {
+		var checkpointMetadata = @"{
+				  ""$v"": ""1:-1:0:1"",
+				  ""$s"": {
+					""$ce-Evnt"": 0
+				  }
+				}";
+		PartitionState state = new PartitionState("{\"foo\":1}", "{\"bar\":1}", CheckpointTag.Empty);
+		var serializedState = state.Serialize();
+		var partition = "abc";
+		ExistingEvent(_namingBuilder.MakePartitionCheckpointStreamName(partition), "$Checkpoint",
+			checkpointMetadata, serializedState);
+		_manager.BeginLoadPartitionStateAt(partition, CheckpointTag.Empty, state => {
+			Assert.AreEqual(serializedState, state.Serialize());
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/TestFixtureWithMultiStreamCheckpointManager.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/TestFixtureWithMultiStreamCheckpointManager.cs
new file mode 100644
index 00000000000..99466231ec7
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/TestFixtureWithMultiStreamCheckpointManager.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.checkpoint_manager.multi_stream;
+
+public abstract class TestFixtureWithMultiStreamCheckpointManager<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionCheckpointManager<TLogFormat, TStreamId> {
+	protected new string[] _streams;
+
+	protected override void Given() {
+		base.Given();
+		_projectionVersion = new ProjectionVersion(1, 0, 0);
+		_streams = new[] { "a", "b", "c" };
+	}
+
+	protected override DefaultCheckpointManager GivenCheckpointManager() {
+		return new MultiStreamMultiOutputCheckpointManager(
+			_bus, _projectionCorrelationId, _projectionVersion, null, _ioDispatcher, _config, _projectionName,
+			new MultiStreamPositionTagger(0, _streams), _namingBuilder, _checkpointsEnabled, true, true,
+			_checkpointWriter, Opts.MaxProjectionStateSizeDefault);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_prerecording_event_order.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_prerecording_event_order.cs
new file mode 100644
index 00000000000..12dfa2f474e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_prerecording_event_order.cs
@@ -0,0 +1,74 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.checkpoint_manager.multi_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_prerecording_event_order<TLogFormat, TStreamId> : TestFixtureWithMultiStreamCheckpointManager<TLogFormat, TStreamId> {
+	private ResolvedEvent _event1;
+	private ResolvedEvent _event2;
+
+	protected override void Given() {
+		base.Given();
+		_streams = new[] { "pa", "pb" };
+		ExistingEvent("a", "test1", "{}", "{}");
+		ExistingEvent("b", "test1", "{}", "{}");
+
+		ExistingEvent("pa", "$>", "1@a", "{$o:\"oa\"}");
+		ExistingEvent("pb", "$>", "1@b", "{$o:\"ob\"}");
+
+		_event1 = new ResolvedEvent("pa", 1, "a", 1, true, new TFPos(200, 150), Guid.NewGuid(), "test1", true, "{}",
+			"{}", "{$o:\"oa\"");
+		_event2 = new ResolvedEvent("pb", 1, "b", 1, true, new TFPos(300, 250), Guid.NewGuid(), "test1", true, "{}",
+			"{}", "{$o:\"ob\"");
+
+		NoOtherStreams();
+		AllWritesSucceed();
+	}
+
+	protected override void When() {
+		base.When();
+		Action noop = () => { };
+		_manager.Initialize();
+		_checkpointReader.BeginLoadState();
+		var checkpointLoaded =
+			_consumer.HandledMessages.OfType<CoreProjectionProcessingMessage.CheckpointLoaded>().First();
+		_checkpointWriter.StartFrom(checkpointLoaded.CheckpointTag, checkpointLoaded.CheckpointEventNumber);
+		_manager.BeginLoadPrerecordedEvents(checkpointLoaded.CheckpointTag);
+
+		_manager.Start(CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "pa", -1 }, { "pb", -1 } }),
+			null);
+		_manager.RecordEventOrder(_event1,
+			CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "pa", 1 }, { "pb", -1 } }),
+			committed: noop);
+		_manager.RecordEventOrder(_event2,
+			CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "pa", 1 }, { "pb", 1 } }),
+			committed: noop);
+	}
+
+	[Test]
+	public void writes_correct_link_tos() {
+		var writeEvents =
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
+				.SelectMany(v => v.Events)
+				.Where(v => v.EventType == SystemEventTypes.LinkTo)
+				.ToArray();
+		Assert.AreEqual(2, writeEvents.Length);
+		Assert.AreEqual("1@pa", Helper.UTF8NoBom.GetString(writeEvents[0].Data));
+		Assert.AreEqual("1@pb", Helper.UTF8NoBom.GetString(writeEvents[1].Data));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_and_enqueue_prerecorded_events_read_times_out.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_and_enqueue_prerecorded_events_read_times_out.cs
new file mode 100644
index 00000000000..ccd3b650c12
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_and_enqueue_prerecorded_events_read_times_out.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+using IODispatcherDelayedMessage = KurrentDB.Core.Helpers.IODispatcherDelayedMessage;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.checkpoint_manager.multi_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_starting_and_enqueue_prerecorded_events_read_times_out<TLogFormat, TStreamId> : with_multi_stream_checkpoint_manager<TLogFormat, TStreamId>,
+	IHandle<TimerMessage.Schedule>,
+	IHandle<CoreProjectionProcessingMessage.PrerecordedEventsLoaded> {
+	private bool _hasTimedOut;
+	private Guid _timeoutCorrelationId;
+	private ManualResetEventSlim _mre = new ManualResetEventSlim();
+	private CoreProjectionProcessingMessage.PrerecordedEventsLoaded _eventsLoadedMessage;
+
+	public override void When() {
+		_bus.Subscribe<TimerMessage.Schedule>(this);
+		_bus.Subscribe<CoreProjectionProcessingMessage.PrerecordedEventsLoaded>(this);
+
+		_checkpointManager.Initialize();
+		var positions = new Dictionary<string, long> { { "a", 1 }, { "b", 1 }, { "c", 1 } };
+		_checkpointManager.BeginLoadPrerecordedEvents(CheckpointTag.FromStreamPositions(0, positions));
+
+		if (!_mre.Wait(10000)) {
+			Assert.Fail("Timed out waiting for pre recorded events loaded message");
+		}
+	}
+
+	public override void Handle(ClientMessage.ReadStreamEventsBackward message) {
+		if (!_hasTimedOut && message.EventStreamId == "a") {
+			_hasTimedOut = true;
+			_timeoutCorrelationId = message.CorrelationId;
+			return;
+		}
+
+		base.Handle(message);
+	}
+
+	public void Handle(TimerMessage.Schedule message) {
+		var delay = message.ReplyMessage as IODispatcherDelayedMessage;
+		if (delay != null && delay.MessageCorrelationId == _timeoutCorrelationId) {
+			message.Reply();
+		}
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.PrerecordedEventsLoaded message) {
+		_eventsLoadedMessage = message;
+		_mre.Set();
+	}
+
+	[Test]
+	public void should_send_prerecorded_events_message() {
+		Assert.IsNotNull(_eventsLoadedMessage);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_and_read_prerecorded_events_successfully.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_and_read_prerecorded_events_successfully.cs
new file mode 100644
index 00000000000..d2ce3849820
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_and_read_prerecorded_events_successfully.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Threading;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.checkpoint_manager.multi_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_starting_and_read_prerecorded_events_successfully<TLogFormat, TStreamId> : with_multi_stream_checkpoint_manager<TLogFormat, TStreamId>,
+	IHandle<CoreProjectionProcessingMessage.PrerecordedEventsLoaded> {
+	private ManualResetEventSlim _mre = new ManualResetEventSlim();
+	private CoreProjectionProcessingMessage.PrerecordedEventsLoaded _eventsLoadedMessage;
+
+	public override void When() {
+		_bus.Subscribe<CoreProjectionProcessingMessage.PrerecordedEventsLoaded>(this);
+
+		_checkpointManager.Initialize();
+		var positions = new Dictionary<string, long> { { "a", 1 }, { "b", 1 }, { "c", 1 } };
+		_checkpointManager.BeginLoadPrerecordedEvents(CheckpointTag.FromStreamPositions(0, positions));
+
+		if (!_mre.Wait(10000)) {
+			Assert.Fail("Timed out waiting for pre recorded events loaded message");
+		}
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.PrerecordedEventsLoaded message) {
+		_eventsLoadedMessage = message;
+		_mre.Set();
+	}
+
+	[Test]
+	public void should_send_prerecorded_events_message() {
+		Assert.IsNotNull(_eventsLoadedMessage);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_and_read_prerecorded_events_times_out.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_and_read_prerecorded_events_times_out.cs
new file mode 100644
index 00000000000..91c7cea11a3
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_and_read_prerecorded_events_times_out.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+using IODispatcherDelayedMessage = KurrentDB.Core.Helpers.IODispatcherDelayedMessage;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.checkpoint_manager.multi_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_starting_and_read_prerecorded_events_times_out<TLogFormat, TStreamId> : with_multi_stream_checkpoint_manager<TLogFormat, TStreamId>,
+	IHandle<TimerMessage.Schedule>,
+	IHandle<CoreProjectionProcessingMessage.PrerecordedEventsLoaded> {
+	private bool _hasTimedOut;
+	private Guid _timeoutCorrelationId;
+	private ManualResetEventSlim _mre = new ManualResetEventSlim();
+	private CoreProjectionProcessingMessage.PrerecordedEventsLoaded _eventsLoadedMessage;
+
+	public override void When() {
+		_bus.Subscribe<TimerMessage.Schedule>(this);
+		_bus.Subscribe<CoreProjectionProcessingMessage.PrerecordedEventsLoaded>(this);
+
+		_checkpointManager.Initialize();
+		var positions = new Dictionary<string, long> { { "a", 1 }, { "b", 1 }, { "c", 1 } };
+		_checkpointManager.BeginLoadPrerecordedEvents(CheckpointTag.FromStreamPositions(0, positions));
+
+		if (!_mre.Wait(10000)) {
+			Assert.Fail("Timed out waiting for pre recorded events loaded message");
+		}
+	}
+
+	public override void Handle(ClientMessage.ReadStreamEventsBackward message) {
+		if (!_hasTimedOut) {
+			_hasTimedOut = true;
+			_timeoutCorrelationId = message.CorrelationId;
+			return;
+		}
+
+		base.Handle(message);
+	}
+
+	public void Handle(TimerMessage.Schedule message) {
+		var delay = message.ReplyMessage as IODispatcherDelayedMessage;
+		if (delay != null && delay.MessageCorrelationId == _timeoutCorrelationId) {
+			message.Reply();
+		}
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.PrerecordedEventsLoaded message) {
+		_eventsLoadedMessage = message;
+		_mre.Set();
+	}
+
+	[Test]
+	public void should_send_prerecorded_events_message() {
+		Assert.IsNotNull(_eventsLoadedMessage);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_with_prerecorded_events_after_the_last_checkpoint.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_with_prerecorded_events_after_the_last_checkpoint.cs
new file mode 100644
index 00000000000..fb393fa58ca
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_with_prerecorded_events_after_the_last_checkpoint.cs
@@ -0,0 +1,133 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.checkpoint_manager.multi_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_starting_with_prerecorded_events_after_the_last_checkpoint<TLogFormat, TStreamId> :
+	TestFixtureWithMultiStreamCheckpointManager<TLogFormat, TStreamId> {
+	private readonly CheckpointTag _tag1 =
+		CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "a", 0 }, { "b", 0 }, { "c", 1 } });
+
+	private readonly CheckpointTag _tag2 =
+		CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "a", 1 }, { "b", 0 }, { "c", 1 } });
+
+	private readonly CheckpointTag _tag3 =
+		CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "a", 1 }, { "b", 1 }, { "c", 1 } });
+
+	protected override void Given() {
+		base.Given();
+		ExistingEvent(
+			"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
+			@"{""s"": {""a"": 0, ""b"": 0, ""c"": 0}}", "{}");
+		ExistingEvent("a", "StreamCreated", "", "");
+		ExistingEvent("b", "StreamCreated", "", "");
+		ExistingEvent("c", "StreamCreated", "", "");
+		ExistingEvent("d", "StreamCreated", "", "");
+
+		ExistingEvent("a", "Event", "", @"{""data"":""a""");
+		ExistingEvent("b", "Event", "bb", @"{""data"":""b""");
+		ExistingEvent("c", "$>", "{$o:\"org\"}", @"1@d");
+		ExistingEvent("d", "Event", "dd", @"{""data"":""d""");
+
+		ExistingEvent(
+			"$projections-projection-order", "$>", @"{""s"": {""a"": 0, ""b"": 0, ""c"": 0}}", "0@c");
+		ExistingEvent(
+			"$projections-projection-order", "$>", @"{""s"": {""a"": 0, ""b"": 0, ""c"": 1}}", "1@c");
+		ExistingEvent(
+			"$projections-projection-order", "$>", @"{""s"": {""a"": 1, ""b"": 0, ""c"": 1}}", "1@a");
+		ExistingEvent(
+			"$projections-projection-order", "$>", @"{""s"": {""a"": 1, ""b"": 1, ""c"": 1}}", "1@b");
+	}
+
+	protected override void When() {
+		base.When();
+		_checkpointReader.BeginLoadState();
+		var checkpointLoaded =
+			_consumer.HandledMessages.OfType<CoreProjectionProcessingMessage.CheckpointLoaded>().First();
+		_checkpointWriter.StartFrom(checkpointLoaded.CheckpointTag, checkpointLoaded.CheckpointEventNumber);
+		_manager.BeginLoadPrerecordedEvents(checkpointLoaded.CheckpointTag);
+	}
+
+	[Test]
+	public void sends_correct_checkpoint_loaded_message() {
+		Assert.AreEqual(1, _projection._checkpointLoadedMessages.Count);
+		Assert.AreEqual(
+			CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "a", 0 }, { "b", 0 }, { "c", 0 } }),
+			_projection._checkpointLoadedMessages.Single().CheckpointTag);
+		Assert.AreEqual("{}", _projection._checkpointLoadedMessages.Single().CheckpointData);
+	}
+
+	[Test]
+	public void sends_correct_preprecoded_events_loaded_message() {
+		Assert.AreEqual(1, _projection._prerecordedEventsLoadedMessages.Count);
+		Assert.AreEqual(
+			CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "a", 1 }, { "b", 1 }, { "c", 1 } }),
+			_projection._prerecordedEventsLoadedMessages.Single().CheckpointTag);
+	}
+
+	[Test]
+	public void sends_commited_event_received_messages_in_correct_order() {
+		var messages = HandledMessages.OfType<EventReaderSubscriptionMessage.CommittedEventReceived>().ToList();
+		Assert.AreEqual(3, messages.Count);
+
+		var message1 = messages[0];
+		var message2 = messages[1];
+		var message3 = messages[2];
+
+		Assert.AreEqual(_tag1, message1.CheckpointTag);
+		Assert.AreEqual(_tag2, message2.CheckpointTag);
+		Assert.AreEqual(_tag3, message3.CheckpointTag);
+	}
+
+	[Test]
+	public void sends_correct_commited_event_received_messages() {
+		var messages = HandledMessages.OfType<EventReaderSubscriptionMessage.CommittedEventReceived>().ToList();
+		Assert.AreEqual(3, messages.Count);
+
+		var message1 = messages[0];
+		var message2 = messages[1];
+		var message3 = messages[2];
+
+		Assert.AreEqual(@"{""data"":""d""", message1.Data.Data);
+		Assert.AreEqual(@"{""data"":""a""", message2.Data.Data);
+		Assert.AreEqual(@"{""data"":""b""", message3.Data.Data);
+
+		Assert.AreEqual(@"dd", message1.Data.Metadata);
+		Assert.IsNull(message2.Data.Metadata);
+		Assert.AreEqual(@"bb", message3.Data.Metadata);
+
+		Assert.AreEqual("{$o:\"org\"}", message1.Data.PositionMetadata);
+		Assert.IsNull(message2.Data.PositionMetadata);
+		Assert.IsNull(message3.Data.PositionMetadata);
+
+		Assert.AreEqual("Event", message1.Data.EventType);
+		Assert.AreEqual("Event", message2.Data.EventType);
+		Assert.AreEqual("Event", message3.Data.EventType);
+
+		Assert.AreEqual("c", message1.Data.PositionStreamId);
+		Assert.AreEqual("a", message2.Data.PositionStreamId);
+		Assert.AreEqual("b", message3.Data.PositionStreamId);
+
+		Assert.AreEqual("d", message1.Data.EventStreamId);
+		Assert.AreEqual("a", message2.Data.EventStreamId);
+		Assert.AreEqual("b", message3.Data.EventStreamId);
+
+		Assert.AreEqual(_projectionCorrelationId, message1.SubscriptionId);
+		Assert.AreEqual(_projectionCorrelationId, message2.SubscriptionId);
+		Assert.AreEqual(_projectionCorrelationId, message3.SubscriptionId);
+
+		Assert.AreEqual(true, message1.Data.ResolvedLinkTo);
+		Assert.AreEqual(false, message2.Data.ResolvedLinkTo);
+		Assert.AreEqual(false, message3.Data.ResolvedLinkTo);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_with_prerecorded_events_before_the_last_checkpoint.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_with_prerecorded_events_before_the_last_checkpoint.cs
new file mode 100644
index 00000000000..3cf610fec87
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_with_prerecorded_events_before_the_last_checkpoint.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.checkpoint_manager.multi_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_starting_with_prerecorded_events_before_the_last_checkpoint<TLogFormat, TStreamId> :
+	TestFixtureWithMultiStreamCheckpointManager<TLogFormat, TStreamId> {
+	protected override void Given() {
+		base.Given();
+		ExistingEvent(
+			"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
+			@"{""s"": {""a"": 0, ""b"": 1, ""c"": 0}}", "{}");
+		ExistingEvent("a", "StreamCreated", "", "");
+		ExistingEvent("b", "StreamCreated", "", "");
+		ExistingEvent("c", "StreamCreated", "", "");
+		ExistingEvent("d", "StreamCreated", "", "");
+
+		ExistingEvent("a", "Event", "", @"{""data"":""a""");
+		ExistingEvent("b", "Event", "bb", @"{""data"":""b""");
+		ExistingEvent("c", "$>", "{$o:\"org\"}", @"1@d");
+		ExistingEvent("d", "Event", "dd", @"{""data"":""d""");
+
+		// Lots of pre-recorded events before the checkpoint.
+		for (int i = 0; i < 1000; i++) {
+			ExistingEvent(
+				"$projections-projection-order", "$>", @"{""s"": {""a"": 0, ""b"": 0, ""c"": 0}}", "0@c");
+		}
+
+		// Pre-recorded event at checkpoint
+		ExistingEvent(
+			"$projections-projection-order", "$>", @"{""s"": {""a"": 0, ""b"": 1, ""c"": 0}}", "1@b");
+	}
+
+	protected override void When() {
+		base.When();
+		_checkpointReader.BeginLoadState();
+		var checkpointLoaded =
+			_consumer.HandledMessages.OfType<CoreProjectionProcessingMessage.CheckpointLoaded>().First();
+		_checkpointWriter.StartFrom(checkpointLoaded.CheckpointTag, checkpointLoaded.CheckpointEventNumber);
+		_manager.BeginLoadPrerecordedEvents(checkpointLoaded.CheckpointTag);
+	}
+
+	[Test]
+	public void stops_reading_prerecorded_events_after_found_checkpoint() {
+		Assert.AreEqual(1,
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsBackward>()
+				.Count(_ => _.EventStreamId == "$projections-projection-order"));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_with_prerecorded_events_in_past_epoch.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_with_prerecorded_events_in_past_epoch.cs
new file mode 100644
index 00000000000..25a3eaccba2
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/when_starting_with_prerecorded_events_in_past_epoch.cs
@@ -0,0 +1,94 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.checkpoint_manager.multi_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_starting_with_prerecorded_events_in_past_epoch<TLogFormat, TStreamId> : TestFixtureWithMultiStreamCheckpointManager<TLogFormat, TStreamId> {
+	private readonly CheckpointTag _tag1 =
+		CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "a", 0 }, { "b", 0 }, { "c", 1 } });
+
+	private readonly CheckpointTag _tag2 =
+		CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "a", 1 }, { "b", 0 }, { "c", 1 } });
+
+	//private readonly CheckpointTag _tag3 =CheckpointTag.FromStreamPositions(new Dictionary<string, int> {{"a", 1}, {"b", 1}, {"c", 1}});
+
+	protected override void Given() {
+		base.Given();
+		_projectionVersion = new ProjectionVersion(1, 2, 2);
+		ExistingEvent(
+			"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
+			@"{""v"":2, ""s"": {""a"": 0, ""b"": 0, ""c"": 0}}",
+			"{}");
+		ExistingEvent("a", "StreamCreated", "", "");
+		ExistingEvent("b", "StreamCreated", "", "");
+		ExistingEvent("c", "StreamCreated", "", "");
+
+		ExistingEvent("a", "Event", "", @"{""data"":""a""");
+		ExistingEvent("b", "Event", "", @"{""data"":""b""");
+		ExistingEvent("c", "Event", "", @"{""data"":""c""");
+
+		ExistingEvent("$projections-projection-order", "$>", @"{""v"":1, ""s"": {""a"": 0, ""b"": 0, ""c"": 0}}",
+			"0@c");
+		ExistingEvent("$projections-projection-order", "$>", @"{""v"":1, ""s"": {""a"": 0, ""b"": 0, ""c"": 1}}",
+			"1@c");
+		ExistingEvent("$projections-projection-order", "$>", @"{""v"":1, ""s"": {""a"": 1, ""b"": 0, ""c"": 1}}",
+			"1@a");
+		ExistingEvent("$projections-projection-order", "$>", @"{""v"":1, ""s"": {""a"": 1, ""b"": 1, ""c"": 1}}",
+			"1@b");
+		ExistingEvent("$projections-projection-order", "$>", @"{""v"":2, ""s"": {""a"": 0, ""b"": 0, ""c"": 0}}",
+			"0@c");
+		ExistingEvent("$projections-projection-order", "$>", @"{""v"":2, ""s"": {""a"": 0, ""b"": 0, ""c"": 1}}",
+			"1@c");
+		ExistingEvent("$projections-projection-order", "$>", @"{""v"":2, ""s"": {""a"": 1, ""b"": 0, ""c"": 1}}",
+			"1@a");
+	}
+
+	protected override void When() {
+		base.When();
+		_checkpointReader.BeginLoadState();
+		var checkpointLoaded =
+			_consumer.HandledMessages.OfType<CoreProjectionProcessingMessage.CheckpointLoaded>().First();
+		_checkpointWriter.StartFrom(checkpointLoaded.CheckpointTag, checkpointLoaded.CheckpointEventNumber);
+		_manager.BeginLoadPrerecordedEvents(checkpointLoaded.CheckpointTag);
+	}
+
+	[Test]
+	public void sends_correct_checkpoint_loaded_message() {
+		Assert.AreEqual(1, _projection._checkpointLoadedMessages.Count);
+		Assert.AreEqual(
+			CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "a", 0 }, { "b", 0 }, { "c", 0 } }),
+			_projection._checkpointLoadedMessages.Single().CheckpointTag);
+		Assert.AreEqual("{}", _projection._checkpointLoadedMessages.Single().CheckpointData);
+	}
+
+	[Test]
+	public void sends_correct_prerecorded_events_loaded_message() {
+		Assert.AreEqual(1, _projection._prerecordedEventsLoadedMessages.Count);
+		Assert.AreEqual(
+			CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "a", 1 }, { "b", 0 }, { "c", 1 } }),
+			_projection._prerecordedEventsLoadedMessages.Single().CheckpointTag);
+	}
+
+	[Test]
+	public void sends_committed_event_received_messages_in_correct_order() {
+		var messages = HandledMessages.OfType<EventReaderSubscriptionMessage.CommittedEventReceived>().ToList();
+		Assert.AreEqual(2, messages.Count);
+
+		var message1 = messages[0];
+		var message2 = messages[1];
+
+		Assert.AreEqual(_tag1, message1.CheckpointTag);
+		Assert.AreEqual(_tag2, message2.CheckpointTag);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/with_multi_stream_checkpoint_manager.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/with_multi_stream_checkpoint_manager.cs
new file mode 100644
index 00000000000..5ef141db962
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/multi_stream/with_multi_stream_checkpoint_manager.cs
@@ -0,0 +1,102 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Tests.Helpers.IODispatcherTests;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.checkpoint_manager.multi_stream;
+
+public abstract class with_multi_stream_checkpoint_manager<TLogFormat, TStreamId> : IHandle<ClientMessage.ReadStreamEventsBackward> {
+	protected readonly SynchronousScheduler _bus = new();
+	protected readonly Guid _projectionId = Guid.NewGuid();
+	protected readonly string[] _streams = new string[] { "a", "b", "c" };
+	protected readonly string _projectionName = "test_projection";
+
+	protected IODispatcher _ioDispatcher;
+	protected ProjectionVersion _projectionVersion;
+	protected ProjectionConfig _projectionConfig;
+	protected PositionTagger _positionTagger;
+	protected ProjectionNamesBuilder _namingBuilder;
+	protected CoreProjectionCheckpointWriter _coreProjectionCheckpointWriter;
+	protected MultiStreamMultiOutputCheckpointManager _checkpointManager;
+
+	private bool _hasRead;
+
+	[OneTimeSetUp]
+	public void TestFixtureSetUp() {
+		_ioDispatcher = new IODispatcher(_bus, _bus, true);
+		_projectionVersion = new ProjectionVersion(3, 1, 2);
+		_projectionConfig = new ProjectionConfig(SystemAccounts.System, 10, 1000, 1000, 10, true, true, true,
+			false,
+			false, 5000, 10, null);
+		_positionTagger = new MultiStreamPositionTagger(3, _streams);
+		_positionTagger.AdjustTag(CheckpointTag.FromStreamPositions(3,
+			new Dictionary<string, long> { { "a", 0 }, { "b", 0 }, { "c", 0 } }));
+		_namingBuilder = ProjectionNamesBuilder.CreateForTest("projection");
+
+		IODispatcherTestHelpers.SubscribeIODispatcher(_ioDispatcher, _bus);
+		_bus.Subscribe<ClientMessage.ReadStreamEventsBackward>(this);
+
+		_coreProjectionCheckpointWriter = new CoreProjectionCheckpointWriter(
+			_namingBuilder.MakeCheckpointStreamName(), _ioDispatcher,
+			_projectionVersion, _projectionName);
+
+		_checkpointManager = new MultiStreamMultiOutputCheckpointManager(_bus, _projectionId, _projectionVersion,
+			SystemAccounts.System,
+			_ioDispatcher, _projectionConfig, _projectionName, _positionTagger, _namingBuilder, true, true, false,
+			_coreProjectionCheckpointWriter, Opts.MaxProjectionStateSizeDefault);
+
+		When();
+	}
+
+	public abstract void When();
+
+	public virtual void Handle(ClientMessage.ReadStreamEventsBackward message) {
+		if (message.EventStreamId == _namingBuilder.GetOrderStreamName())
+			message.Envelope.ReplyWith(ReadOrderStream(message));
+		if (message.EventStreamId == "a")
+			message.Envelope.ReplyWith(ReadTestStream(message));
+	}
+
+	public ClientMessage.ReadStreamEventsBackwardCompleted ReadOrderStream(
+		ClientMessage.ReadStreamEventsBackward message) {
+		ResolvedEvent[] events;
+		if (!_hasRead) {
+			var checkpoint =
+				CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "a", 5 }, { "b", 5 }, { "c", 5 } });
+			events = IODispatcherTestHelpers.CreateResolvedEvent<TLogFormat, TStreamId>(message.EventStreamId, "$>",
+				"10@a", checkpoint.ToJsonString(new ProjectionVersion(3, 0, 1)));
+			_hasRead = true;
+		} else {
+			events = new ResolvedEvent[0] { };
+		}
+
+		return new ClientMessage.ReadStreamEventsBackwardCompleted(message.CorrelationId, message.EventStreamId,
+			message.FromEventNumber,
+			message.MaxCount, ReadStreamResult.Success, events, null, true, "",
+			message.FromEventNumber - events.Length, message.FromEventNumber, true, 10000);
+	}
+
+	public ClientMessage.ReadStreamEventsBackwardCompleted ReadTestStream(
+		ClientMessage.ReadStreamEventsBackward message) {
+		var events =
+			IODispatcherTestHelpers.CreateResolvedEvent<TLogFormat, TStreamId>(message.EventStreamId, "testevent", "{ \"data\":1 }");
+		return new ClientMessage.ReadStreamEventsBackwardCompleted(message.CorrelationId, message.EventStreamId,
+			message.FromEventNumber,
+			message.MaxCount, ReadStreamResult.Success, events, null, true, "", message.FromEventNumber - 1,
+			message.FromEventNumber, true, 10000);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_a_checkpoint_has_been_completed_and_requesting_checkpoint_to_stop.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_a_checkpoint_has_been_completed_and_requesting_checkpoint_to_stop.cs
new file mode 100644
index 00000000000..73f1bd319f0
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_a_checkpoint_has_been_completed_and_requesting_checkpoint_to_stop.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.checkpoint_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_a_checkpoint_has_been_completed_and_requesting_checkpoint_to_stop<TLogFormat, TStreamId> :
+	TestFixtureWithCoreProjectionCheckpointManager<TLogFormat, TStreamId> {
+	private Exception _exception;
+
+	protected override void Given() {
+		AllWritesSucceed();
+		base.Given();
+		this._checkpointHandledThreshold = 2; //NOTE: does not play any role anymore here
+	}
+
+	protected override void When() {
+		base.When();
+		_exception = null;
+		try {
+			_checkpointReader.BeginLoadState();
+			var checkpointLoaded =
+				_consumer.HandledMessages.OfType<CoreProjectionProcessingMessage.CheckpointLoaded>().First();
+			_checkpointWriter.StartFrom(checkpointLoaded.CheckpointTag, checkpointLoaded.CheckpointEventNumber);
+			_manager.BeginLoadPrerecordedEvents(checkpointLoaded.CheckpointTag);
+
+			_manager.Start(CheckpointTag.FromStreamPosition(0, "stream", 10), null);
+			//                _manager.StateUpdated("", @"{""state"":""state1""}");
+			_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 11), 77.7f);
+			//                _manager.StateUpdated("", @"{""state"":""state2""}");
+			_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 12), 77.8f);
+			_manager.CheckpointSuggested(CheckpointTag.FromStreamPosition(0, "stream", 12), 77.8f);
+			_manager.Stopping();
+		} catch (Exception ex) {
+			_exception = ex;
+		}
+	}
+
+	[Test]
+	public void does_not_throw() {
+		Assert.IsNull(_exception);
+	}
+
+	[Test]
+	public void two_checkpoints_are_completed() {
+		Assert.AreEqual(2, _projection._checkpointCompletedMessages.Count);
+	}
+
+
+	[Test]
+	public void only_one_checkpoint_has_been_written() {
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
+				.ToStream("$projections-projection-checkpoint")
+				.Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_a_core_projection_checkpoint_manager_has_been_created.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_a_core_projection_checkpoint_manager_has_been_created.cs
new file mode 100644
index 00000000000..781aef5afbc
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_a_core_projection_checkpoint_manager_has_been_created.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.checkpoint_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_a_core_projection_checkpoint_manager_has_been_created<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionCheckpointManager<TLogFormat, TStreamId> {
+	[Test]
+	public void stopping_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => { _manager.Stopping(); });
+	}
+
+	[Test]
+	public void stopped_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => { _manager.Stopped(); });
+	}
+
+	[Test]
+	public void event_processed_throws_invalid_operation_exception() {
+		//            _manager.StateUpdated("", @"{""state"":""state""}");
+		Assert.Throws<InvalidOperationException>(() => {
+			_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 10), 77.7f);
+		});
+	}
+
+	[Test]
+	public void checkpoint_suggested_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_manager.CheckpointSuggested(CheckpointTag.FromStreamPosition(0, "stream", 10), 77.7f);
+		});
+	}
+
+	[Test]
+	public void ready_for_checkpoint_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_manager.Handle(new CoreProjectionProcessingMessage.ReadyForCheckpoint(null));
+		});
+	}
+
+	[Test]
+	public void can_begin_load_state() {
+		_checkpointWriter.StartFrom(CheckpointTag.FromPosition(0, 0, -1), ExpectedVersion.NoStream);
+	}
+
+	[Test]
+	public void can_be_started() {
+		_manager.Start(CheckpointTag.FromStreamPosition(0, "stream", 10), null);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_a_default_checkpoint_manager_has_been_reinitialized.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_a_default_checkpoint_manager_has_been_reinitialized.cs
new file mode 100644
index 00000000000..a9833dadea1
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_a_default_checkpoint_manager_has_been_reinitialized.cs
@@ -0,0 +1,89 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.checkpoint_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_a_default_checkpoint_manager_has_been_reinitialized<TLogFormat, TStreamId> :
+	TestFixtureWithCoreProjectionCheckpointManager<TLogFormat, TStreamId> {
+	//private Exception _exception;
+
+	protected override void Given() {
+		AllWritesSucceed();
+		base.Given();
+		_checkpointHandledThreshold = 2;
+	}
+
+	protected override void When() {
+		base.When();
+		//_exception = null;
+		try {
+			_checkpointReader.BeginLoadState();
+			var checkpointLoaded =
+				_consumer.HandledMessages.OfType<CoreProjectionProcessingMessage.CheckpointLoaded>().First();
+			_checkpointWriter.StartFrom(checkpointLoaded.CheckpointTag, checkpointLoaded.CheckpointEventNumber);
+			_manager.BeginLoadPrerecordedEvents(checkpointLoaded.CheckpointTag);
+
+			_manager.Start(CheckpointTag.FromStreamPosition(0, "stream", 10), null);
+			//                _manager.StateUpdated("", @"{""state"":""state1""}");
+			_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 11), 77.7f);
+			//                _manager.StateUpdated("", @"{""state"":""state2""}");
+			_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 12), 77.7f);
+			_manager.Initialize();
+			_checkpointReader.Initialize();
+		} catch (Exception) {
+			//_exception = ex;
+		}
+	}
+
+
+	[Test]
+	public void stopping_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => { _manager.Stopping(); });
+	}
+
+	[Test]
+	public void stopped_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => { _manager.Stopped(); });
+	}
+
+	[Test]
+	public void event_processed_throws_invalid_operation_exception() {
+		//            _manager.StateUpdated("", @"{""state"":""state""}");
+		Assert.Throws<InvalidOperationException>(() => {
+			_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 10), 77.7f);
+		});
+	}
+
+	[Test]
+	public void checkpoint_suggested_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_manager.CheckpointSuggested(CheckpointTag.FromStreamPosition(0, "stream", 10), 77.7f);
+		});
+	}
+
+	[Test]
+	public void ready_for_checkpoint_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_manager.Handle(new CoreProjectionProcessingMessage.ReadyForCheckpoint(null));
+		});
+	}
+
+	[Test]
+	public void can_begin_load_state() {
+		_checkpointReader.BeginLoadState();
+	}
+
+	[Test]
+	public void can_be_started() {
+		_manager.Start(CheckpointTag.FromStreamPosition(0, "stream", 10), null);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_beginning_to_load_state_the_core_projection_checkpoint_manager.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_beginning_to_load_state_the_core_projection_checkpoint_manager.cs
new file mode 100644
index 00000000000..5cc00845284
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_beginning_to_load_state_the_core_projection_checkpoint_manager.cs
@@ -0,0 +1,82 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.checkpoint_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_beginning_to_load_state_the_core_projection_checkpoint_manager<TLogFormat, TStreamId> :
+	TestFixtureWithCoreProjectionCheckpointManager<TLogFormat, TStreamId> {
+	private Exception _exception;
+
+	protected override void When() {
+		base.When();
+		_exception = null;
+		try {
+			_checkpointReader.BeginLoadState();
+		} catch (Exception ex) {
+			_exception = ex;
+		}
+	}
+
+	[Test]
+	public void it_can_be_invoked() {
+		Assert.IsNull(_exception);
+	}
+
+	[Test]
+	public void start_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => { _checkpointReader.BeginLoadState(); });
+	}
+
+	[Test]
+	public void stopping_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => { _manager.Stopping(); });
+	}
+
+	[Test]
+	public void stopped_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => { _manager.Stopped(); });
+	}
+
+	[Test]
+	public void event_processed_throws_invalid_operation_exception() {
+		//            _manager.StateUpdated("", @"{""state"":""state""}");
+		Assert.Throws<InvalidOperationException>(() => {
+			_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 10), 77.7f);
+		});
+	}
+
+	[Test]
+	public void checkpoint_suggested_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_manager.CheckpointSuggested(CheckpointTag.FromStreamPosition(0, "stream", 10), 77.7f);
+		});
+	}
+
+	[Test]
+	public void ready_for_checkpoint_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_manager.Handle(new CoreProjectionProcessingMessage.ReadyForCheckpoint(null));
+		});
+	}
+
+	[Test]
+	public void can_be_started() {
+		_manager.Start(CheckpointTag.FromStreamPosition(0, "stream", 10), null);
+	}
+
+	[Test]
+	public void cannot_be_started_from_incompatible_checkpoint_tag() {
+		//TODO: move to when loaded
+		Assert.Throws<InvalidOperationException>(() => {
+			_manager.Start(CheckpointTag.FromStreamPosition(0, "stream1", 10), null);
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_creating_a_default_checkpoint_manager.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_creating_a_default_checkpoint_manager.cs
new file mode 100644
index 00000000000..d42142f4005
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_creating_a_default_checkpoint_manager.cs
@@ -0,0 +1,105 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.checkpoint_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_creating_a_default_checkpoint_manager<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionCheckpointManager<TLogFormat, TStreamId> {
+	private CoreProjectionCheckpointWriter _coreProjectionCheckpointWriter;
+
+	protected override void When() {
+		// do not create
+		_coreProjectionCheckpointWriter =
+			new CoreProjectionCheckpointWriter(
+				_namingBuilder.MakeCheckpointStreamName(), _ioDispatcher, _projectionVersion, _projectionName);
+		_namingBuilder = ProjectionNamesBuilder.CreateForTest("projection");
+	}
+
+	[Test]
+	public void it_can_be_created() {
+		_manager = new DefaultCheckpointManager(
+			_bus, _projectionCorrelationId, new ProjectionVersion(1, 0, 0), null, _ioDispatcher, _config,
+			"projection", new StreamPositionTagger(0, "stream"), _namingBuilder, _checkpointsEnabled,
+			_producesResults, _definesFold, _coreProjectionCheckpointWriter, Opts.MaxProjectionStateSizeDefault);
+	}
+
+	[Test]
+	public void null_publisher_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			_manager = new DefaultCheckpointManager(
+				null, _projectionCorrelationId, new ProjectionVersion(1, 0, 0), null, _ioDispatcher, _config,
+				"projection", new StreamPositionTagger(0, "stream"), _namingBuilder, _checkpointsEnabled,
+				_producesResults, _definesFold, _coreProjectionCheckpointWriter, Opts.MaxProjectionStateSizeDefault);
+		});
+	}
+
+	[Test]
+	public void null_io_dispatcher_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			_manager = new DefaultCheckpointManager(
+				_bus, _projectionCorrelationId, new ProjectionVersion(1, 0, 0), null, null, _config, "projection",
+				new StreamPositionTagger(0, "stream"), _namingBuilder, _checkpointsEnabled, _producesResults,
+				_definesFold, _coreProjectionCheckpointWriter, Opts.MaxProjectionStateSizeDefault);
+		});
+	}
+
+	[Test]
+	public void null_projection_config_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			_manager = new DefaultCheckpointManager(
+				_bus, _projectionCorrelationId, new ProjectionVersion(1, 0, 0), null, _ioDispatcher, null,
+				"projection",
+				new StreamPositionTagger(0, "stream"), _namingBuilder, _checkpointsEnabled, _producesResults,
+				_definesFold, _coreProjectionCheckpointWriter, Opts.MaxProjectionStateSizeDefault);
+		});
+	}
+
+	[Test]
+	public void null_projection_name_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			_manager = new DefaultCheckpointManager(
+				_bus, _projectionCorrelationId, new ProjectionVersion(1, 0, 0), null, _ioDispatcher, _config, null,
+				new StreamPositionTagger(0, "stream"), _namingBuilder, _checkpointsEnabled, _producesResults,
+				_definesFold, _coreProjectionCheckpointWriter, Opts.MaxProjectionStateSizeDefault);
+		});
+	}
+
+	[Test]
+	public void null_position_tagger_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			_manager = new DefaultCheckpointManager(
+				_bus, _projectionCorrelationId, new ProjectionVersion(1, 0, 0), null, _ioDispatcher, _config,
+				"projection", null, _namingBuilder, _checkpointsEnabled, _producesResults,
+				_definesFold, _coreProjectionCheckpointWriter, Opts.MaxProjectionStateSizeDefault);
+		});
+	}
+
+	[Test]
+	public void empty_projection_checkpoint_stream_id_throws_argument_exception() {
+		Assert.Throws<ArgumentException>(() => {
+			_manager = new DefaultCheckpointManager(
+				_bus, _projectionCorrelationId, new ProjectionVersion(1, 0, 0), null, _ioDispatcher, _config, "",
+				new StreamPositionTagger(0, "stream"), _namingBuilder, _checkpointsEnabled, _producesResults,
+				_definesFold, _coreProjectionCheckpointWriter, Opts.MaxProjectionStateSizeDefault);
+		});
+	}
+
+	[Test]
+	public void empty_projection_name_throws_argument_exception() {
+		Assert.Throws<ArgumentException>(() => {
+			_manager = new DefaultCheckpointManager(
+				_bus, _projectionCorrelationId, new ProjectionVersion(1, 0, 0), null, _ioDispatcher, _config, "",
+				new StreamPositionTagger(0, "stream"), _namingBuilder, _checkpointsEnabled, _producesResults,
+				_definesFold, _coreProjectionCheckpointWriter, Opts.MaxProjectionStateSizeDefault);
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_multiple_event_processed_received_the_core_projection_checkpoint_manager.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_multiple_event_processed_received_the_core_projection_checkpoint_manager.cs
new file mode 100644
index 00000000000..dc1668f1bab
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_multiple_event_processed_received_the_core_projection_checkpoint_manager.cs
@@ -0,0 +1,85 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.checkpoint_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_multiple_event_processed_received_the_core_projection_checkpoint_manager<TLogFormat, TStreamId> :
+	TestFixtureWithCoreProjectionCheckpointManager<TLogFormat, TStreamId> {
+	private Exception _exception;
+
+	protected override void Given() {
+		AllWritesSucceed();
+		base.Given();
+		this._checkpointHandledThreshold = 2;
+	}
+
+	protected override void When() {
+		base.When();
+		_exception = null;
+		try {
+			_checkpointReader.BeginLoadState();
+			var checkpointLoaded =
+				_consumer.HandledMessages.OfType<CoreProjectionProcessingMessage.CheckpointLoaded>().First();
+			_checkpointWriter.StartFrom(checkpointLoaded.CheckpointTag, checkpointLoaded.CheckpointEventNumber);
+			_manager.BeginLoadPrerecordedEvents(checkpointLoaded.CheckpointTag);
+
+			_manager.Start(CheckpointTag.FromStreamPosition(0, "stream", 10), null);
+			//                _manager.StateUpdated("", @"{""state"":""state1""}");
+			_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 11), 77.7f);
+			//                _manager.StateUpdated("", @"{""state"":""state2""}");
+			_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 12), 77.7f);
+		} catch (Exception ex) {
+			_exception = ex;
+		}
+	}
+
+	[Test]
+	public void messages_are_handled() {
+		Assert.IsNull(_exception);
+	}
+
+	[Test]
+	public void accepts_stopping() {
+		_manager.Stopping();
+	}
+
+	[Test]
+	public void accepts_stopped() {
+		_manager.Stopped();
+	}
+
+	[Test]
+	public void accepts_event_processed() {
+		//            _manager.StateUpdated("", @"{""state"":""state""}");
+		_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 13), 77.7f);
+	}
+
+	[Test]
+	public void event_processed_at_the_start_position_throws_invalid_operation_exception() {
+		//            _manager.StateUpdated("", @"{""state"":""state""}");
+		Assert.Throws<InvalidOperationException>(() => {
+			_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 10), 77.7f);
+		});
+	}
+
+	[Test]
+	public void accepts_checkpoint_suggested() {
+		_manager.CheckpointSuggested(CheckpointTag.FromStreamPosition(0, "stream", 13), 77.7f);
+	}
+
+	[Test]
+	public void checkpoint_suggested_at_the_start_position_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_manager.CheckpointSuggested(CheckpointTag.FromStreamPosition(0, "stream", 10), 77.7f);
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_projection_state_is_too_large.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_projection_state_is_too_large.cs
new file mode 100644
index 00000000000..6d82217c9ad
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_projection_state_is_too_large.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.checkpoint_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+public class when_projection_state_is_too_large<TLogFormat, TStreamId> :
+	TestFixtureWithCoreProjectionCheckpointManager<TLogFormat, TStreamId> {
+	private Exception _exception;
+
+	protected override void Given() {
+		AllWritesSucceed();
+		base.Given();
+		this._checkpointHandledThreshold = 2;
+		this._maxProjectionStateSize = 1024 * 1024;
+	}
+
+	protected override void When() {
+		base.When();
+		_exception = null;
+		try {
+			_checkpointReader.BeginLoadState();
+			var checkpointLoaded =
+				_consumer.HandledMessages.OfType<CoreProjectionProcessingMessage.CheckpointLoaded>().First();
+			_checkpointWriter.StartFrom(checkpointLoaded.CheckpointTag, checkpointLoaded.CheckpointEventNumber);
+			_manager.BeginLoadPrerecordedEvents(checkpointLoaded.CheckpointTag);
+
+			// Initial checkpoint and state
+			var initialCheckpointTag = CheckpointTag.FromStreamPosition(0, "stream", 10);
+			_manager.Start(initialCheckpointTag, null);
+			var oldState = new PartitionState("", "", initialCheckpointTag);
+
+			// checkpoint and state after first event processed
+			var firstEventCheckpointTag = CheckpointTag.FromStreamPosition(0, "stream", 11);
+			var newState = new PartitionState("{ \"state\": \"foo\"}", "",
+				firstEventCheckpointTag);
+			_manager.StateUpdated("", oldState, newState);
+			_manager.EventProcessed(firstEventCheckpointTag, 55.5f);
+
+			// second event processed fails, as the state is too large
+			var secondEventCheckpointTag = CheckpointTag.FromStreamPosition(0, "stream", 12);
+			oldState = newState;
+			newState = new PartitionState($"{{ \"state\": \"{new string('*', _maxProjectionStateSize)}\"}}", "",
+				firstEventCheckpointTag);
+			_manager.StateUpdated("", oldState, newState);
+			_manager.EventProcessed(secondEventCheckpointTag, 77.7f);
+		} catch (Exception ex) {
+			_exception = ex;
+		}
+	}
+
+	[Test]
+	public void messages_are_handled() {
+		Assert.IsNull(_exception);
+	}
+
+	[Test]
+	public void publishes_projection_failed_message() {
+		var failedMessages = _consumer.HandledMessages.OfType<CoreProjectionProcessingMessage.Failed>().ToArray();
+		Assert.AreEqual(1, failedMessages.Length);
+		Assert.True(failedMessages[0].Reason.Contains("exceeds the configured MaxProjectionStateSize"));
+	}
+
+	[Test]
+	public void the_second_event_is_not_processed() {
+		var stats = new ProjectionStatistics();
+		_manager.GetStatistics(stats);
+		Assert.AreEqual(1, stats.EventsProcessedAfterRestart);
+		Assert.AreEqual(55.5f, stats.Progress);
+		Assert.AreEqual(CheckpointTag.FromStreamPosition(0, "stream", 11).ToString(), stats.Position);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_starting_the_core_projection_checkpoint_manager.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_starting_the_core_projection_checkpoint_manager.cs
new file mode 100644
index 00000000000..0e16ce5a19b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_manager/when_starting_the_core_projection_checkpoint_manager.cs
@@ -0,0 +1,86 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.checkpoint_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_starting_the_core_projection_checkpoint_manager<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionCheckpointManager<TLogFormat, TStreamId> {
+	private Exception _exception;
+
+	protected override void Given() {
+		base.Given();
+		AllWritesSucceed();
+	}
+
+	protected override void When() {
+		base.When();
+		_exception = null;
+		try {
+			_checkpointReader.BeginLoadState();
+			var checkpointLoaded =
+				_consumer.HandledMessages.OfType<CoreProjectionProcessingMessage.CheckpointLoaded>().First();
+			_checkpointWriter.StartFrom(checkpointLoaded.CheckpointTag, checkpointLoaded.CheckpointEventNumber);
+			_manager.BeginLoadPrerecordedEvents(checkpointLoaded.CheckpointTag);
+
+			_manager.Start(CheckpointTag.FromStreamPosition(0, "stream", 10), null);
+		} catch (Exception ex) {
+			_exception = ex;
+		}
+	}
+
+	[Test]
+	public void it_can_be_started() {
+		Assert.IsNull(_exception);
+	}
+
+	[Test]
+	public void start_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_manager.Start(CheckpointTag.FromStreamPosition(0, "stream", 10), null);
+		});
+	}
+
+	[Test]
+	public void accepts_stopping() {
+		_manager.Stopping();
+	}
+
+	[Test]
+	public void accepts_stopped() {
+		_manager.Stopped();
+	}
+
+	[Test]
+	public void accepts_event_processed() {
+		//            _manager.StateUpdated("", @"{""state"":""state""}");
+		_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 11), 77.7f);
+	}
+
+	[Test]
+	public void event_processed_at_the_start_position_throws_invalid_operation_exception() {
+		//            _manager.StateUpdated("", @"{""state"":""state""}");
+		Assert.Throws<InvalidOperationException>(() => {
+			_manager.EventProcessed(CheckpointTag.FromStreamPosition(0, "stream", 10), 77.7f);
+		});
+	}
+
+	[Test]
+	public void accepts_checkpoint_suggested() {
+		_manager.CheckpointSuggested(CheckpointTag.FromStreamPosition(0, "stream", 11), 77.7f);
+		Assert.AreEqual(1, _projection._checkpointCompletedMessages.Count);
+	}
+
+	[Test]
+	public void accepts_checkpoint_suggested_even_at_the_start_position_but_does_not_complete_it() {
+		_manager.CheckpointSuggested(CheckpointTag.FromStreamPosition(0, "stream", 10), 77.7f);
+		Assert.AreEqual(0, _projection._checkpointCompletedMessages.Count);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_suggested.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_suggested.cs
new file mode 100644
index 00000000000..23a10c10a67
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/checkpoint_suggested.cs
@@ -0,0 +1,141 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+public static class checkpoint_suggested {
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_the_checkpoint_is_suggested<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+		protected override void Given() {
+			_checkpointHandledThreshold = 10;
+			_checkpointUnhandledBytesThreshold = 41;
+			_configureBuilderByQuerySource = source => {
+				source.FromAll();
+				source.IncludeEvent("non-existing");
+			};
+			NoStream("$projections-projection-state");
+			NoStream("$projections-projection-order");
+			AllWritesToSucceed("$projections-projection-order");
+			NoStream("$projections-projection-checkpoint");
+			NoStream(FakeProjectionStateHandler._emit1StreamId);
+			AllWritesSucceed();
+		}
+
+		protected override void When() {
+			//projection subscribes here
+			_bus.Publish(
+				new EventReaderSubscriptionMessage.CheckpointSuggested(
+					_subscriptionId,
+					CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(140, 130),
+						new Dictionary<string, long> { { "non-existing", -1 } }), 55.5f, 0));
+		}
+
+		[Test]
+		public void a_projection_checkpoint_event_is_published() {
+			// projection checkpoint is written even though no events are passing the projection event filter
+			Assert.AreEqual(
+				1,
+				_writeEventHandler.HandledMessages.Count(v =>
+					v.Events.Any(e => e.EventType == ProjectionEventTypes.ProjectionCheckpoint)));
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_the_second_checkpoint_is_suggested<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+		protected override void Given() {
+			_checkpointHandledThreshold = 10;
+			_checkpointUnhandledBytesThreshold = 41;
+			_configureBuilderByQuerySource = source => {
+				source.FromAll();
+				source.IncludeEvent("non-existing");
+			};
+			NoStream("$$$projections-projection-order");
+			NoStream("$projections-projection-order");
+			AllWritesToSucceed("$$$projections-projection-order");
+			AllWritesToSucceed("$projections-projection-order");
+
+			NoStream("$$$projections-projection-checkpoint");
+			NoStream("$projections-projection-checkpoint");
+			AllWritesToSucceed("$$$projections-projection-checkpoint");
+
+			NoStream(FakeProjectionStateHandler._emit1StreamId);
+			AllWritesQueueUp();
+		}
+
+		protected override void When() {
+			//projection subscribes here
+			_bus.Publish(
+				new EventReaderSubscriptionMessage.CheckpointSuggested(
+					_subscriptionId,
+					CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(140, 130),
+						new Dictionary<string, long> { { "non-existing", -1 } }), 55.5f, 0));
+			_bus.Publish(
+				new EventReaderSubscriptionMessage.CheckpointSuggested(
+					_subscriptionId,
+					CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(160, 150),
+						new Dictionary<string, long> { { "non-existing", -1 } }), 55.6f, 1));
+		}
+
+		[Test]
+		public void a_projection_checkpoint_event_is_published() {
+			// projection checkpoint is written even though no events are passing the projection event filter
+			Assert.AreEqual(
+				1,
+				_writeEventHandler.HandledMessages.Count(v =>
+					v.Events.Any(e => e.EventType == ProjectionEventTypes.ProjectionCheckpoint)));
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_the_second_checkpoint_is_suggested_and_write_succeeds<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+		protected override void Given() {
+			_checkpointHandledThreshold = 10;
+			_checkpointUnhandledBytesThreshold = 41;
+			_configureBuilderByQuerySource = source => {
+				source.FromAll();
+				source.IncludeEvent("non-existing");
+			};
+			NoStream("$projections-projection-state");
+			NoStream("$projections-projection-order");
+			AllWritesToSucceed("$projections-projection-order");
+			NoStream("$projections-projection-checkpoint");
+			NoStream(FakeProjectionStateHandler._emit1StreamId);
+			AllWritesSucceed();
+		}
+
+		protected override void When() {
+			//projection subscribes here
+			_bus.Publish(
+				new EventReaderSubscriptionMessage.CheckpointSuggested(
+					_subscriptionId,
+					CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(140, 130),
+						new Dictionary<string, long> { { "non-existing", -1 } }), 55.5f, 0));
+			_bus.Publish(
+				new EventReaderSubscriptionMessage.CheckpointSuggested(
+					_subscriptionId,
+					CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(160, 150),
+						new Dictionary<string, long> { { "non-existing", -1 } }), 55.6f, 1));
+		}
+
+		[Test]
+		public void a_projection_checkpoint_event_is_published() {
+			// projection checkpoint is written even though no events are passing the projection event filter
+			Assert.AreEqual(
+				2,
+				_writeEventHandler.HandledMessages.Count(v =>
+					v.Events.Any(e => e.EventType == ProjectionEventTypes.ProjectionCheckpoint)));
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/multi_phase/specification_with_multi_phase_core_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/multi_phase/specification_with_multi_phase_core_projection.cs
new file mode 100644
index 00000000000..b3c815f8fb3
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/multi_phase/specification_with_multi_phase_core_projection.cs
@@ -0,0 +1,408 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using KurrentDB.Projections.Core.Services.Processing.Phases;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using Serilog;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.multi_phase;
+
+abstract class specification_with_multi_phase_core_projection<TLogFormat, TStreamId> : TestFixtureWithCoreProjection<TLogFormat, TStreamId> {
+	private FakeCheckpointManager _phase1checkpointManager;
+	private FakeCheckpointManager _phase2checkpointManager;
+	private IEmittedStreamsTracker _emittedStreamsTracker;
+	private FakeProjectionProcessingPhase _phase1;
+	private FakeProjectionProcessingPhase _phase2;
+	private IReaderStrategy _phase1readerStrategy;
+	private IReaderStrategy _phase2readerStrategy;
+
+	class FakeProjectionProcessingStrategy : ProjectionProcessingStrategy {
+		private readonly FakeProjectionProcessingPhase _phase1;
+		private readonly FakeProjectionProcessingPhase _phase2;
+
+		public FakeProjectionProcessingStrategy(
+			string name, ProjectionVersion projectionVersion, ILogger logger, FakeProjectionProcessingPhase phase1,
+			FakeProjectionProcessingPhase phase2)
+			: base(name, projectionVersion, logger, Opts.MaxProjectionStateSizeDefault) {
+			_phase1 = phase1;
+			_phase2 = phase2;
+		}
+
+		protected override IQuerySources GetSourceDefinition() {
+			return new QuerySourcesDefinition {
+				AllStreams = true,
+				AllEvents = true,
+				ByStreams = true,
+				Options = new QuerySourcesDefinitionOptions()
+			};
+		}
+
+		public override bool GetStopOnEof() {
+			return true;
+		}
+
+		public override bool GetUseCheckpoints() {
+			return false;
+		}
+
+		public override bool GetRequiresRootPartition() {
+			return false;
+		}
+
+		public override bool GetProducesRunningResults() {
+			return true;
+		}
+
+		public override void EnrichStatistics(ProjectionStatistics info) {
+		}
+
+		public override IProjectionProcessingPhase[] CreateProcessingPhases(
+			IPublisher publisher,
+			IPublisher inputQueue,
+			Guid projectionCorrelationId,
+			PartitionStateCache partitionStateCache,
+			Action updateStatistics,
+			CoreProjection coreProjection,
+			ProjectionNamesBuilder namingBuilder,
+			ITimeProvider timeProvider,
+			IODispatcher ioDispatcher,
+			CoreProjectionCheckpointWriter coreProjectionCheckpointWriter) {
+			return new IProjectionProcessingPhase[] { _phase1, _phase2 };
+		}
+	}
+
+	internal class FakeProjectionProcessingPhase : IProjectionProcessingPhase {
+		private readonly int _phase;
+		private readonly specification_with_multi_phase_core_projection<TLogFormat, TStreamId> _specification;
+		private readonly ICoreProjectionCheckpointManager _checkpointManager;
+		private readonly IEmittedStreamsTracker _emittedStreamsTracker;
+		private readonly IReaderStrategy _readerStrategy;
+
+		private bool _initializedFromCheckpoint;
+		private CheckpointTag _initializedFromCheckpointAt;
+		private PhaseState _state;
+		private Guid _subscriptionId;
+		private int _subscribeInvoked;
+
+		public FakeProjectionProcessingPhase(int phase,
+			specification_with_multi_phase_core_projection<TLogFormat, TStreamId> specification,
+			ICoreProjectionCheckpointManager checkpointManager, IReaderStrategy readerStrategy,
+			IEmittedStreamsTracker emittedStreamsTracker) {
+			_phase = phase;
+			_specification = specification;
+			_checkpointManager = checkpointManager;
+			_readerStrategy = readerStrategy;
+			_emittedStreamsTracker = emittedStreamsTracker;
+		}
+
+		public void Dispose() {
+			throw new NotImplementedException();
+		}
+
+		public void Handle(CoreProjectionManagementMessage.GetState message) {
+			throw new NotImplementedException();
+		}
+
+		public void Handle(CoreProjectionManagementMessage.GetResult message) {
+			throw new NotImplementedException();
+		}
+
+		public void Handle(CoreProjectionProcessingMessage.PrerecordedEventsLoaded message) {
+			throw new NotImplementedException();
+		}
+
+		public CheckpointTag AdjustTag(CheckpointTag tag) {
+			return tag;
+		}
+
+		public void InitializeFromCheckpoint(CheckpointTag checkpointTag) {
+			_initializedFromCheckpoint = true;
+			_initializedFromCheckpointAt = checkpointTag;
+		}
+
+		public void SetProjectionState(PhaseState state) {
+			_state = state;
+		}
+
+		public void ProcessEvent() {
+			ProcessEventInvoked++;
+		}
+
+		public void Subscribe(CheckpointTag from, bool fromCheckpoint) {
+			_subscribeInvoked++;
+			_subscriptionId = Guid.NewGuid();
+			_specification._coreProjection.Subscribed();
+		}
+
+		public void EnsureUnsubscribed() {
+			throw new NotImplementedException();
+		}
+
+		public CheckpointTag MakeZeroCheckpointTag() {
+			return CheckpointTag.FromPhase(_phase, completed: false);
+		}
+
+		public ICoreProjectionCheckpointManager CheckpointManager {
+			get { return _checkpointManager; }
+		}
+
+		public IEmittedStreamsTracker EmittedStreamsTracker {
+			get { return _emittedStreamsTracker; }
+		}
+
+		public IReaderStrategy ReaderStrategy {
+			get { return _readerStrategy; }
+		}
+
+		public bool InitializedFromCheckpoint {
+			get { return _initializedFromCheckpoint; }
+		}
+
+		public CheckpointTag InitializedFromCheckpointAt {
+			get { return _initializedFromCheckpointAt; }
+		}
+
+		public PhaseState State {
+			get { return _state; }
+		}
+
+		public Guid SubscriptionId {
+			get { return _subscriptionId; }
+		}
+
+		public bool Unsubscribed_ {
+			get { return false; }
+		}
+
+		public int ProcessEventInvoked { get; set; }
+
+		public int SubscribeInvoked {
+			get { return _subscribeInvoked; }
+			set { _subscribeInvoked = value; }
+		}
+
+		public void GetStatistics(ProjectionStatistics info) {
+		}
+
+		public void Complete() {
+			_specification._coreProjection.CompletePhase();
+		}
+	}
+
+	internal class FakeCheckpointManager : ICoreProjectionCheckpointManager, IEmittedEventWriter {
+		private readonly IPublisher _publisher;
+		private readonly Guid _projectionCorrelationId;
+
+		private bool _started;
+		private CheckpointTag _startedAt;
+		private CheckpointTag _lastEvent;
+		private float _progress;
+		private bool _stopped;
+		private bool _stopping;
+		private readonly List<EmittedEventEnvelope> _emittedEvents = new List<EmittedEventEnvelope>();
+
+		public FakeCheckpointManager(IPublisher publisher, Guid projectionCorrelationId) {
+			_publisher = publisher;
+			_projectionCorrelationId = projectionCorrelationId;
+		}
+
+		public void Initialize() {
+		}
+
+		public void Start(CheckpointTag checkpointTag, PartitionState rootPartitionState) {
+			_started = true;
+			_startedAt = checkpointTag;
+			_lastEvent = checkpointTag;
+		}
+
+		public void Stopping() {
+			_stopping = true;
+			_publisher.Publish(
+				new CoreProjectionProcessingMessage.CheckpointCompleted(_projectionCorrelationId, _lastEvent));
+		}
+
+		public void Stopped() {
+			_stopped = true;
+		}
+
+		public void GetStatistics(ProjectionStatistics info) {
+		}
+
+		public void NewPartition(string partition, CheckpointTag eventCheckpointTag) {
+			throw new NotImplementedException();
+		}
+
+		public void EventsEmitted(
+			EmittedEventEnvelope[] scheduledWrites, Guid causedBy, string correlationId) {
+			EmittedEvents.AddRange(scheduledWrites);
+		}
+
+		public void StateUpdated(string partition, PartitionState oldState, PartitionState newState) {
+			throw new NotImplementedException();
+		}
+
+		public void PartitionCompleted(string partition) {
+		}
+
+		public void EventProcessed(CheckpointTag checkpointTag, float progress) {
+			_lastEvent = checkpointTag;
+		}
+
+		public bool CheckpointSuggested(CheckpointTag checkpointTag, float progress) {
+			throw new NotImplementedException();
+		}
+
+		public void Progress(float progress) {
+			_progress = progress;
+		}
+
+		public void BeginLoadState() {
+			_publisher.Publish(
+				new CoreProjectionProcessingMessage.CheckpointLoaded(
+					_projectionCorrelationId, CheckpointTag.FromPosition(0, 0, -1), "", 0));
+		}
+
+		public void BeginLoadPrerecordedEvents(CheckpointTag checkpointTag) {
+			_publisher.Publish(
+				new CoreProjectionProcessingMessage.PrerecordedEventsLoaded(_projectionCorrelationId,
+					checkpointTag));
+		}
+
+		public void BeginLoadPartitionStateAt(string statePartition, CheckpointTag requestedStateCheckpointTag,
+			Action<PartitionState> loadCompleted) {
+			throw new NotImplementedException();
+		}
+
+		public void RecordEventOrder(ResolvedEvent resolvedEvent, CheckpointTag orderCheckpointTag,
+			Action committed) {
+			throw new NotImplementedException();
+		}
+
+		public CheckpointTag LastProcessedEventPosition {
+			get { return _lastEvent; }
+		}
+
+		public bool Started {
+			get { return _started; }
+		}
+
+		public CheckpointTag StartedAt {
+			get { return _startedAt; }
+		}
+
+		public float Progress_ {
+			get { return _progress; }
+		}
+
+		public bool Stopped_ {
+			get { return _stopped; }
+		}
+
+		public bool Stopping_ {
+			get { return _stopping; }
+		}
+
+		public List<EmittedEventEnvelope> EmittedEvents {
+			get { return _emittedEvents; }
+		}
+	}
+
+	protected class FakeReaderStrategy : IReaderStrategy {
+		private readonly int _phase;
+
+		public FakeReaderStrategy(int phase) {
+			_phase = phase;
+		}
+
+		public bool IsReadingOrderRepeatable {
+			get { throw new NotImplementedException(); }
+		}
+
+		public EventFilter EventFilter {
+			get { throw new NotImplementedException(); }
+		}
+
+		public PositionTagger PositionTagger {
+			get { return new TransactionFilePositionTagger(Phase); }
+		}
+
+		public int Phase {
+			get { return _phase; }
+		}
+
+		public IReaderSubscription CreateReaderSubscription(
+			IPublisher publisher, CheckpointTag fromCheckpointTag, Guid subscriptionId,
+			ReaderSubscriptionOptions readerSubscriptionOptions) {
+			throw new NotImplementedException();
+		}
+
+		public IEventReader CreatePausedEventReader(
+			Guid eventReaderId, IPublisher publisher, IODispatcher ioDispatcher, CheckpointTag checkpointTag,
+			bool stopOnEof, int? stopAfterNEvents) {
+			throw new NotImplementedException();
+		}
+	}
+
+	public class FakeEmittedStreamsTracker : IEmittedStreamsTracker {
+		public void Initialize() {
+		}
+
+		public void TrackEmittedStream(EmittedEvent[] emittedEvents) {
+		}
+	}
+
+	public FakeCheckpointManager Phase1CheckpointManager {
+		get { return _phase1checkpointManager; }
+	}
+
+	public FakeCheckpointManager Phase2CheckpointManager {
+		get { return _phase2checkpointManager; }
+	}
+
+
+	public FakeProjectionProcessingPhase Phase1 {
+		get { return _phase1; }
+	}
+
+	public FakeProjectionProcessingPhase Phase2 {
+		get { return _phase2; }
+	}
+
+	protected override ProjectionProcessingStrategy GivenProjectionProcessingStrategy() {
+		_phase1checkpointManager = new FakeCheckpointManager(_bus, _projectionCorrelationId);
+		_phase2checkpointManager = new FakeCheckpointManager(_bus, _projectionCorrelationId);
+		_emittedStreamsTracker = new FakeEmittedStreamsTracker();
+		_phase1readerStrategy = GivenPhase1ReaderStrategy();
+		_phase2readerStrategy = GivenPhase2ReaderStrategy();
+		_phase1 = new FakeProjectionProcessingPhase(0, this, Phase1CheckpointManager, _phase1readerStrategy,
+			_emittedStreamsTracker);
+		_phase2 = new FakeProjectionProcessingPhase(1, this, Phase2CheckpointManager, _phase2readerStrategy,
+			_emittedStreamsTracker);
+		return new FakeProjectionProcessingStrategy(
+			_projectionName, _version, Log.Logger, Phase1, Phase2);
+	}
+
+	protected virtual FakeReaderStrategy GivenPhase2ReaderStrategy() {
+		return new FakeReaderStrategy(1);
+	}
+
+	protected virtual FakeReaderStrategy GivenPhase1ReaderStrategy() {
+		return new FakeReaderStrategy(0);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/multi_phase/when_completing_phase1_of_a_multiphase_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/multi_phase/when_completing_phase1_of_a_multiphase_projection.cs
new file mode 100644
index 00000000000..c74fe7e9365
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/multi_phase/when_completing_phase1_of_a_multiphase_projection.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.multi_phase;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+class when_completing_phase1_of_a_multiphase_projection<TLogFormat, TStreamId> : specification_with_multi_phase_core_projection<TLogFormat, TStreamId> {
+	protected override void When() {
+		_coreProjection.Start();
+		Phase1.Complete();
+	}
+
+	[Test]
+	public void stops_phase1_checkpoint_manager() {
+		Assert.IsTrue(Phase1CheckpointManager.Stopped_);
+	}
+
+	[Test]
+	public void initializes_phase2() {
+		Assert.IsTrue(Phase2.InitializedFromCheckpoint);
+	}
+
+	[Test]
+	public void updates_checkpoint_tag_phase() {
+		Assert.AreEqual(1, _coreProjection.LastProcessedEventPosition.Phase);
+	}
+
+	[Test]
+	public void publishes_subscribe_message() {
+		Assert.AreEqual(1, Phase2.SubscribeInvoked);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/multi_phase/when_creating_a_multi_phase_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/multi_phase/when_creating_a_multi_phase_projection.cs
new file mode 100644
index 00000000000..da2b26bc78b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/multi_phase/when_creating_a_multi_phase_projection.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.multi_phase;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+class when_creating_a_multi_phase_projection<TLogFormat, TStreamId> : specification_with_multi_phase_core_projection<TLogFormat, TStreamId> {
+	protected override void When() {
+	}
+
+	[Test]
+	public void it_is_created() {
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/multi_phase/when_starting_a_multi_phase_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/multi_phase/when_starting_a_multi_phase_projection.cs
new file mode 100644
index 00000000000..e50e77e4156
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/multi_phase/when_starting_a_multi_phase_projection.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.multi_phase;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+class when_starting_a_multi_phase_projection<TLogFormat, TStreamId> : specification_with_multi_phase_core_projection<TLogFormat, TStreamId> {
+	protected override void When() {
+		_coreProjection.Start();
+	}
+
+	[Test]
+	public void it_starts() {
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/multi_phase/when_starting_phase2_without_a_reader_strategy.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/multi_phase/when_starting_phase2_without_a_reader_strategy.cs
new file mode 100644
index 00000000000..3fe32e27697
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/multi_phase/when_starting_phase2_without_a_reader_strategy.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.multi_phase;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+class when_starting_phase2_without_a_reader_strategy<TLogFormat, TStreamId> : specification_with_multi_phase_core_projection<TLogFormat, TStreamId> {
+	protected override FakeReaderStrategy GivenPhase2ReaderStrategy() {
+		return null;
+	}
+
+	protected override void When() {
+		_coreProjection.Start();
+		Phase1.Complete();
+	}
+
+	[Test]
+	public void initializes_phase2() {
+		Assert.IsTrue(Phase2.InitializedFromCheckpoint);
+	}
+
+	[Test]
+	public void updates_checkpoint_tag_phase() {
+		Assert.AreEqual(1, _coreProjection.LastProcessedEventPosition.Phase);
+	}
+
+	[Test]
+	public void starts_processing_phase2() {
+		Assert.AreEqual(1, Phase2.ProcessEventInvoked);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/the_non_started_checkpoint.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/the_non_started_checkpoint.cs
new file mode 100644
index 00000000000..084d4246525
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/the_non_started_checkpoint.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.projection_checkpoint;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class the_non_started_checkpoint<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private ProjectionCheckpoint _checkpoint;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_checkpoint = new ProjectionCheckpoint(
+			_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
+			CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
+	}
+
+	[Test]
+	public void prepare_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_checkpoint.Prepare(CheckpointTag.FromPosition(0, 200, 150));
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/the_started_checkpoint_with_some_events_emitted.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/the_started_checkpoint_with_some_events_emitted.cs
new file mode 100644
index 00000000000..0ddbeaeddc4
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/the_started_checkpoint_with_some_events_emitted.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.projection_checkpoint;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class the_started_checkpoint_with_some_events_emitted<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private ProjectionCheckpoint _checkpoint;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		;
+		_checkpoint = new ProjectionCheckpoint(
+			_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
+			CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
+		_checkpoint.Start();
+		_checkpoint.ValidateOrderAndEmitEvents(
+			new[] {
+				new EmittedEventEnvelope(new EmittedDataEvent(
+					"stream2", Guid.NewGuid(), "type", true, "data2", null, CheckpointTag.FromPosition(0, 120, 110),
+					null)),
+				new EmittedEventEnvelope(new EmittedDataEvent(
+					"stream2", Guid.NewGuid(), "type", true, "data4", null, CheckpointTag.FromPosition(0, 120, 110),
+					null)),
+			});
+		_checkpoint.ValidateOrderAndEmitEvents(
+			new[] {
+				new EmittedEventEnvelope(new EmittedDataEvent(
+					"stream1", Guid.NewGuid(), "type", true, "data", null, CheckpointTag.FromPosition(0, 140, 130),
+					null))
+			});
+		_checkpoint.ValidateOrderAndEmitEvents(
+			new[] {
+				new EmittedEventEnvelope(new EmittedDataEvent(
+					"stream1", Guid.NewGuid(), "type", true, "data", null, CheckpointTag.FromPosition(0, 160, 150),
+					null))
+			});
+	}
+
+	[Test]
+	public void requesting_checkpoints_with_position_before_the_last_known_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_checkpoint.Prepare(CheckpointTag.FromPosition(0, 140, 130));
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_creating_a_projection_checkpoint.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_creating_a_projection_checkpoint.cs
new file mode 100644
index 00000000000..5274055c4ec
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_creating_a_projection_checkpoint.cs
@@ -0,0 +1,70 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.projection_checkpoint;
+
+[TestFixture]
+public class when_creating_a_projection_checkpoint {
+	private FakePublisher _fakePublisher;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+	private IODispatcher _ioDispatcher;
+
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_fakePublisher = new FakePublisher();
+		_ioDispatcher = new IODispatcher(_fakePublisher, _fakePublisher, true);
+	}
+
+	[Test]
+	public void null_publisher_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			new ProjectionCheckpoint(
+				null, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
+				CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
+		});
+	}
+
+	[Test]
+	public void null_io_dispatcher_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			new ProjectionCheckpoint(
+				_fakePublisher, null, new ProjectionVersion(1, 0, 0), null, _readyHandler,
+				CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
+		});
+	}
+
+	[Test]
+	public void null_ready_handler_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			new ProjectionCheckpoint(
+				_fakePublisher, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, null,
+				CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
+		});
+	}
+
+	[Test]
+	public void commit_position_less_than_or_equal_to_prepare_position_throws_argument_exception() {
+		Assert.Throws<ArgumentException>(() => {
+			new ProjectionCheckpoint(
+				_fakePublisher, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
+				CheckpointTag.FromPosition(0, 100, 101), new TransactionFilePositionTagger(0), 250, 1);
+		});
+	}
+
+	[Test]
+	public void it_can_be_created() {
+		new ProjectionCheckpoint(
+			_fakePublisher, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
+			CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_before_from_position_the_projection_checkpoint.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_before_from_position_the_projection_checkpoint.cs
new file mode 100644
index 00000000000..78b1ffe1794
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_before_from_position_the_projection_checkpoint.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.projection_checkpoint;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_emitting_events_before_from_position_the_projection_checkpoint<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private ProjectionCheckpoint _checkpoint;
+	private Exception _lastException;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_checkpoint = new ProjectionCheckpoint(
+			_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
+			CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
+		try {
+			_checkpoint.ValidateOrderAndEmitEvents(
+				new[] {
+					new EmittedEventEnvelope(
+						new EmittedDataEvent(
+							"stream1", Guid.NewGuid(), "type", true, "data", null,
+							CheckpointTag.FromPosition(0, 40, 30), null))
+				});
+		} catch (Exception ex) {
+			_lastException = ex;
+		}
+	}
+
+	[Test]
+	public void throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => {
+			if (_lastException != null)
+				throw _lastException;
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_in_backward_order_to_the_same_stream_the_projection_checkpoint.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_in_backward_order_to_the_same_stream_the_projection_checkpoint.cs
new file mode 100644
index 00000000000..7d60df4dc10
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_in_backward_order_to_the_same_stream_the_projection_checkpoint.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.projection_checkpoint;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_emitting_events_in_backward_order_to_the_same_stream_the_projection_checkpoint<TLogFormat, TStreamId> :
+		TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private ProjectionCheckpoint _checkpoint;
+	private Exception _lastException;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_checkpoint = new ProjectionCheckpoint(
+			_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
+			CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
+		try {
+			_checkpoint.ValidateOrderAndEmitEvents(
+				new[] {
+					new EmittedEventEnvelope(
+						new EmittedDataEvent(
+							"stream1", Guid.NewGuid(), "type", true, "data", null,
+							CheckpointTag.FromPosition(0, 140, 130), null))
+				});
+			_checkpoint.ValidateOrderAndEmitEvents(
+				new[] {
+					new EmittedEventEnvelope(
+						new EmittedDataEvent(
+							"stream1", Guid.NewGuid(), "type", true, "data2", null,
+							CheckpointTag.FromPosition(0, 120, 110), null))
+				});
+		} catch (Exception ex) {
+			_lastException = ex;
+		}
+	}
+
+	[Test]
+	public void throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => {
+			if (_lastException != null)
+				throw _lastException;
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_in_correct_order_the_started_projection_checkpoint.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_in_correct_order_the_started_projection_checkpoint.cs
new file mode 100644
index 00000000000..0c9fdcd07f6
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_in_correct_order_the_started_projection_checkpoint.cs
@@ -0,0 +1,110 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.projection_checkpoint;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_emitting_events_in_correct_order_the_started_projection_checkpoint<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private ProjectionCheckpoint _checkpoint;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	protected override void Given() {
+		AllWritesQueueUp();
+		AllWritesToSucceed("$$stream1");
+		AllWritesToSucceed("$$stream2");
+		AllWritesToSucceed("$$stream3");
+		NoOtherStreams();
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_checkpoint = new ProjectionCheckpoint(
+			_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
+			CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
+		_checkpoint.Start();
+		_checkpoint.ValidateOrderAndEmitEvents(
+			new[] {
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream2", Guid.NewGuid(), "type1", true, "data2", null,
+						CheckpointTag.FromPosition(0, 120, 110), null)),
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream3", Guid.NewGuid(), "type2", true, "data3", null,
+						CheckpointTag.FromPosition(0, 120, 110), null)),
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream2", Guid.NewGuid(), "type3", true, "data4", null,
+						CheckpointTag.FromPosition(0, 120, 110), null)),
+			});
+		_checkpoint.ValidateOrderAndEmitEvents(
+			new[] {
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream1", Guid.NewGuid(), "type4", true, "data", null,
+						CheckpointTag.FromPosition(0, 140, 130), null))
+			});
+		OneWriteCompletes(); //stream2
+		OneWriteCompletes(); //stream3
+	}
+
+	[Test]
+	public void should_publish_write_events() {
+		var writeEvents =
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
+				.ExceptOfEventType(SystemEventTypes.StreamMetadata);
+		Assert.AreEqual(4, writeEvents.Count());
+	}
+
+	[Test]
+	public void should_publish_write_events_to_correct_streams() {
+		Assert.IsTrue(
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Any(v => v.EventStreamId == "stream1"));
+		Assert.IsTrue(
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Any(v => v.EventStreamId == "stream2"));
+		Assert.IsTrue(
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Any(v => v.EventStreamId == "stream3"));
+	}
+
+	[Test]
+	public void should_group_events_to_the_same_stream_caused_by_the_same_event() {
+		// this is important for the projection to be able to recover by CausedBy.  Unless we commit all the events
+		// to the stream in a single transaction we can get into situation when only part of events CausedBy the same event
+		// are present in a stream
+		Assert.AreEqual(
+			2,
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Single(v => v.EventStreamId == "stream2")
+				.Events.Length);
+	}
+
+	[Test]
+	public void should_not_write_a_second_group_until_the_first_write_completes() {
+		_checkpoint.ValidateOrderAndEmitEvents(
+			new[] {
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream1", Guid.NewGuid(), "type", true, "data", null,
+						CheckpointTag.FromPosition(0, 170, 160), null))
+			});
+		var writeRequests =
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Where(v => v.EventStreamId == "stream1");
+		var writeEvents = writeRequests.Single();
+		writeEvents.Envelope.ReplyWith(
+			new ClientMessage.WriteEventsCompleted(writeEvents.CorrelationId, 0, 0, -1, -1));
+		Assert.AreEqual(2, writeRequests.Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_the_non_started_checkpoint.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_the_non_started_checkpoint.cs
new file mode 100644
index 00000000000..a8fa06ce051
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_the_non_started_checkpoint.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.projection_checkpoint;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_emitting_events_the_non_started_checkpoint<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private ProjectionCheckpoint _checkpoint;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_checkpoint = new ProjectionCheckpoint(
+			_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
+			CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
+		_checkpoint.ValidateOrderAndEmitEvents(
+			new[] {
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream2", Guid.NewGuid(), "type", true, "data2", null,
+						CheckpointTag.FromPosition(0, 120, 110), null)),
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream3", Guid.NewGuid(), "type", true, "data3", null,
+						CheckpointTag.FromPosition(0, 120, 110), null)),
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream2", Guid.NewGuid(), "type", true, "data4", null,
+						CheckpointTag.FromPosition(0, 120, 110), null)),
+			});
+		_checkpoint.ValidateOrderAndEmitEvents(
+			new[] {
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream1", Guid.NewGuid(), "type", true, "data", null,
+						CheckpointTag.FromPosition(0, 140, 130), null))
+			});
+	}
+
+	[Test]
+	public void does_not_publish_write_events() {
+		Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_with_maximum_allowed_writes_in_flight_set.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_with_maximum_allowed_writes_in_flight_set.cs
new file mode 100644
index 00000000000..2f342fe9fe6
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_with_maximum_allowed_writes_in_flight_set.cs
@@ -0,0 +1,125 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Common;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.projection_checkpoint;
+
+
+[TestFixture(typeof(LogFormat.V2), typeof(string), 1)]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), 1)]
+[TestFixture(typeof(LogFormat.V2), typeof(string), 2)]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), 2)]
+[TestFixture(typeof(LogFormat.V2), typeof(string), 3)]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), 3)]
+public class when_emitting_events_with_maximum_allowed_writes_in_flight_set<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private ProjectionCheckpoint _checkpoint;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	private int _maximumNumberOfAllowedWritesInFlight;
+
+	public when_emitting_events_with_maximum_allowed_writes_in_flight_set(
+		int maximumNumberOfAllowedWritesInFlight) {
+		_maximumNumberOfAllowedWritesInFlight = maximumNumberOfAllowedWritesInFlight;
+	}
+
+	protected override void Given() {
+		AllWritesQueueUp();
+		AllWritesToSucceed("$$stream1");
+		AllWritesToSucceed("$$stream2");
+		AllWritesToSucceed("$$stream3");
+		NoOtherStreams();
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_checkpoint = new ProjectionCheckpoint(
+			_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
+			CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250,
+			_maximumNumberOfAllowedWritesInFlight);
+		_checkpoint.Start();
+		_checkpoint.ValidateOrderAndEmitEvents(
+			new[] {
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream1", Guid.NewGuid(), "type1", true, "data1", null,
+						CheckpointTag.FromPosition(0, 120, 110), null)),
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream2", Guid.NewGuid(), "type2", true, "data2", null,
+						CheckpointTag.FromPosition(0, 120, 110), null)),
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream3", Guid.NewGuid(), "type3", true, "data3", null,
+						CheckpointTag.FromPosition(0, 120, 110), null)),
+			});
+	}
+
+	[Test]
+	public void should_have_the_same_number_writes_in_flight_as_configured() {
+		var writeEvents =
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
+				.ExceptOfEventType(SystemEventTypes.StreamMetadata);
+		Assert.AreEqual(_maximumNumberOfAllowedWritesInFlight, writeEvents.Count());
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_emitting_events_with_maximum_allowed_writes_in_flight_set_to_unlimited<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private ProjectionCheckpoint _checkpoint;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	protected override void Given() {
+		AllWritesQueueUp();
+		AllWritesToSucceed("$$stream1");
+		AllWritesToSucceed("$$stream2");
+		AllWritesToSucceed("$$stream3");
+		NoOtherStreams();
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_checkpoint = new ProjectionCheckpoint(
+			_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
+			CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250,
+			AllowedWritesInFlight.Unbounded);
+		_checkpoint.Start();
+		_checkpoint.ValidateOrderAndEmitEvents(
+			new[] {
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream1", Guid.NewGuid(), "type1", true, "data1", null,
+						CheckpointTag.FromPosition(0, 120, 110), null)),
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream2", Guid.NewGuid(), "type2", true, "data2", null,
+						CheckpointTag.FromPosition(0, 120, 110), null)),
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream3", Guid.NewGuid(), "type3", true, "data3", null,
+						CheckpointTag.FromPosition(0, 120, 110), null)),
+			});
+	}
+
+	[Test]
+	public void should_have_as_many_writes_in_flight_as_requested() {
+		var writeEvents =
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
+				.ExceptOfEventType(SystemEventTypes.StreamMetadata);
+		Assert.AreEqual(3, writeEvents.Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_with_null_streamId.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_with_null_streamId.cs
new file mode 100644
index 00000000000..6ba662718c5
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_emitting_events_with_null_streamId.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.projection_checkpoint;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_emitting_events_with_null_streamId<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private ProjectionCheckpoint _checkpoint;
+	private Exception _lastException;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_checkpoint = new ProjectionCheckpoint(
+			_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
+			CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
+		try {
+			_checkpoint.ValidateOrderAndEmitEvents(
+				new[] {
+					new EmittedEventEnvelope(
+						new EmittedDataEvent(
+							null, Guid.NewGuid(), "type", true, "data", null, CheckpointTag.FromPosition(0, 40, 30),
+							null))
+				});
+		} catch (Exception ex) {
+			_lastException = ex;
+		}
+	}
+
+	[Test]
+	public void throws_invalid_operation_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			if (_lastException != null)
+				throw _lastException;
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_handling_stream_awaiting_message.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_handling_stream_awaiting_message.cs
new file mode 100644
index 00000000000..50dadc8b0f7
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_handling_stream_awaiting_message.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.Replication;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.projection_checkpoint;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_stream_awaiting_message<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private ProjectionCheckpoint _checkpoint;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+	private FakeEnvelope _fakeEnvelope;
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_checkpoint = new ProjectionCheckpoint(
+			_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
+			CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
+
+		_fakeEnvelope = new FakeEnvelope();
+		_checkpoint.Handle(
+			new CoreProjectionProcessingMessage.EmittedStreamAwaiting("awaiting_stream", _fakeEnvelope));
+	}
+
+	[Test]
+	public void broadcasts_write_completed_to_awaiting_streams() {
+		_checkpoint.Handle(new CoreProjectionProcessingMessage.EmittedStreamWriteCompleted("completed_stream"));
+		Assert.AreEqual(1, _fakeEnvelope.Replies.Count);
+		Assert.IsInstanceOf<CoreProjectionProcessingMessage.EmittedStreamWriteCompleted>(_fakeEnvelope.Replies[0]);
+	}
+
+	[Test]
+	public void does_not_broadcast_second_write_completed_to_awaiting_streams() {
+		_checkpoint.Handle(new CoreProjectionProcessingMessage.EmittedStreamWriteCompleted("completed_stream1"));
+		_checkpoint.Handle(new CoreProjectionProcessingMessage.EmittedStreamWriteCompleted("completed_stream2"));
+		Assert.AreEqual(1, _fakeEnvelope.Replies.Count);
+		Assert.IsInstanceOf<CoreProjectionProcessingMessage.EmittedStreamWriteCompleted>(_fakeEnvelope.Replies[0]);
+		Assert.AreEqual("completed_stream1",
+			((CoreProjectionProcessingMessage.EmittedStreamWriteCompleted)_fakeEnvelope.Replies[0]).StreamId);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_requesting_checkpoint_after_all_writes_completed.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_requesting_checkpoint_after_all_writes_completed.cs
new file mode 100644
index 00000000000..fdf64991785
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_requesting_checkpoint_after_all_writes_completed.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.projection_checkpoint;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_requesting_checkpoint_after_all_writes_completed<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private ProjectionCheckpoint _checkpoint;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	protected override void Given() {
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_checkpoint = new ProjectionCheckpoint(
+			_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
+			CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
+		_checkpoint.Start();
+		_checkpoint.ValidateOrderAndEmitEvents(
+			new[] {
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream2", Guid.NewGuid(), "type", true, "data2", null,
+						CheckpointTag.FromPosition(0, 120, 110), null)),
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream2", Guid.NewGuid(), "type", true, "data4", null,
+						CheckpointTag.FromPosition(0, 120, 110), null)),
+			});
+		_checkpoint.ValidateOrderAndEmitEvents(
+			new[] {
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream1", Guid.NewGuid(), "type", true, "data", null,
+						CheckpointTag.FromPosition(0, 140, 130), null))
+			});
+		var writes = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().ToArray();
+		writes[0].Envelope.ReplyWith(new ClientMessage.WriteEventsCompleted(writes[0].CorrelationId, 0, 0, -1, -1));
+		writes[1].Envelope.ReplyWith(new ClientMessage.WriteEventsCompleted(writes[1].CorrelationId, 0, 0, -1, -1));
+		_checkpoint.Prepare(CheckpointTag.FromPosition(0, 200, 150));
+		//TODO: test whether checkpoint does not allow positions before last emitted event caused by position
+	}
+
+	[Test]
+	public void ready_for_checkpoint_immediately() {
+		Assert.AreEqual(
+			1, _readyHandler.HandledMessages.OfType<CoreProjectionProcessingMessage.ReadyForCheckpoint>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_requesting_checkpoint_before_all_writes_completed.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_requesting_checkpoint_before_all_writes_completed.cs
new file mode 100644
index 00000000000..a14a12c0f46
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_requesting_checkpoint_before_all_writes_completed.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.projection_checkpoint;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_requesting_checkpoint_before_all_writes_completed<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private ProjectionCheckpoint _checkpoint;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	protected override void Given() {
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_checkpoint = new ProjectionCheckpoint(
+			_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
+			CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250, 1);
+		_checkpoint.Start();
+		_checkpoint.ValidateOrderAndEmitEvents(
+			new[] {
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream2", Guid.NewGuid(), "type", true, "data2", null,
+						CheckpointTag.FromPosition(0, 120, 110), null)),
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream2", Guid.NewGuid(), "type", true, "data4", null,
+						CheckpointTag.FromPosition(0, 120, 110), null)),
+			});
+		_checkpoint.ValidateOrderAndEmitEvents(
+			new[] {
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream1", Guid.NewGuid(), "type", true, "data", null,
+						CheckpointTag.FromPosition(0, 140, 130), null))
+			});
+		_checkpoint.ValidateOrderAndEmitEvents(
+			new[] {
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream1", Guid.NewGuid(), "type", true, "data", null,
+						CheckpointTag.FromPosition(0, 160, 150), null))
+			});
+		_checkpoint.Prepare(CheckpointTag.FromPosition(0, 200, 150));
+	}
+
+	[Test]
+	public void not_ready_for_checkpoint_immediately() {
+		Assert.AreEqual(0,
+			_consumer.HandledMessages.OfType<CoreProjectionProcessingMessage.ReadyForCheckpoint>().Count());
+	}
+
+	[Test]
+	public void ready_for_checkpoint_after_all_writes_complete() {
+		var writes = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().ToArray();
+		writes[0].Envelope.ReplyWith(new ClientMessage.WriteEventsCompleted(writes[0].CorrelationId, 0, 0, -1, -1));
+		writes[1].Envelope.ReplyWith(new ClientMessage.WriteEventsCompleted(writes[1].CorrelationId, 0, 0, -1, -1));
+		writes = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().ToArray();
+		writes[2].Envelope.ReplyWith(new ClientMessage.WriteEventsCompleted(writes[2].CorrelationId, 0, 0, -1, -1));
+
+		Assert.AreEqual(1,
+			_readyHandler.HandledMessages.OfType<CoreProjectionProcessingMessage.ReadyForCheckpoint>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_starting_the_projection_checkpoint_with_some_events_already_emitted.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_starting_the_projection_checkpoint_with_some_events_already_emitted.cs
new file mode 100644
index 00000000000..db090962dcb
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_starting_the_projection_checkpoint_with_some_events_already_emitted.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Common;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.projection_checkpoint;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_starting_the_projection_checkpoint_with_some_events_already_emitted<TLogFormat, TStreamId> :
+	TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private ProjectionCheckpoint _checkpoint;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	protected override void Given() {
+		NoStream("stream1");
+		NoStream("stream2");
+		NoStream("stream3");
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_checkpoint = new ProjectionCheckpoint(
+			_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
+			CheckpointTag.FromPosition(0, 100, 50), new TransactionFilePositionTagger(0), 250,
+			AllowedWritesInFlight.Unbounded);
+		_checkpoint.ValidateOrderAndEmitEvents(
+			new[] {
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream2", Guid.NewGuid(), "type", true, "data2", null,
+						CheckpointTag.FromPosition(0, 120, 110), null)),
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream3", Guid.NewGuid(), "type", true, "data3", null,
+						CheckpointTag.FromPosition(0, 120, 110), null)),
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream2", Guid.NewGuid(), "type", true, "data4", null,
+						CheckpointTag.FromPosition(0, 120, 110), null)),
+			});
+		_checkpoint.ValidateOrderAndEmitEvents(
+			new[] {
+				new EmittedEventEnvelope(
+					new EmittedDataEvent(
+						"stream1", Guid.NewGuid(), "type", true, "data", null,
+						CheckpointTag.FromPosition(0, 140, 130), null))
+			});
+		_checkpoint.Start();
+	}
+
+	[Test]
+	public void should_publish_write_events() {
+		Assert.AreEqual(3, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_the_projection_checkpoint_has_been_started.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_the_projection_checkpoint_has_been_started.cs
new file mode 100644
index 00000000000..8915c48f386
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint/when_the_projection_checkpoint_has_been_started.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.projection_checkpoint;
+
+[TestFixture]
+public class when_the_projection_checkpoint_has_been_started : TestFixtureWithReadWriteDispatchers {
+	private ProjectionCheckpoint _checkpoint;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_checkpoint = new ProjectionCheckpoint(
+			_bus, _ioDispatcher, new ProjectionVersion(1, 0, 0), null, _readyHandler,
+			CheckpointTag.FromPosition(0, 0, -1), new TransactionFilePositionTagger(0), 250, 1);
+		_checkpoint.Start();
+	}
+
+	[Test]
+	public void start_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => { _checkpoint.Start(); });
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint_reader/when_projection_reader_reads_successfully.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint_reader/when_projection_reader_reads_successfully.cs
new file mode 100644
index 00000000000..e81133ff645
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint_reader/when_projection_reader_reads_successfully.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.projection_checkpoint_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_projection_reader_reads_successfully<TLogFormat, TStreamId> : with_projection_checkpoint_reader<TLogFormat, TStreamId>,
+	IHandle<CoreProjectionProcessingMessage.CheckpointLoaded> {
+	private ManualResetEventSlim _mre = new ManualResetEventSlim();
+	private CoreProjectionProcessingMessage.CheckpointLoaded _checkpointLoaded;
+
+	public override void When() {
+		_bus.Subscribe<CoreProjectionProcessingMessage.CheckpointLoaded>(this);
+
+		_reader.Initialize();
+		_reader.BeginLoadState();
+		if (!_mre.Wait(10000)) {
+			Assert.Fail("Timed out waiting for checkpoint to load");
+		}
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.CheckpointLoaded message) {
+		_checkpointLoaded = message;
+		_mre.Set();
+	}
+
+	[Test]
+	public void should_load_checkpoint() {
+		Assert.IsNotNull(_checkpointLoaded);
+		Assert.AreEqual(_checkpointLoaded.ProjectionId, _projectionId);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint_reader/when_projection_reader_times_out_on_read.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint_reader/when_projection_reader_times_out_on_read.cs
new file mode 100644
index 00000000000..ec8784bc1c5
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint_reader/when_projection_reader_times_out_on_read.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Helpers.IODispatcherTests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+using IODispatcherDelayedMessage = KurrentDB.Core.Helpers.IODispatcherDelayedMessage;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.projection_checkpoint_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_projection_reader_times_out_on_read<TLogFormat, TStreamId> : with_projection_checkpoint_reader<TLogFormat, TStreamId>,
+	IHandle<CoreProjectionProcessingMessage.CheckpointLoaded>,
+	IHandle<TimerMessage.Schedule> {
+	private ManualResetEventSlim _mre = new ManualResetEventSlim();
+	private CoreProjectionProcessingMessage.CheckpointLoaded _checkpointLoaded;
+	private bool _hasTimedOut;
+	private Guid _timeoutCorrelationId;
+
+	public override void When() {
+		_bus.Subscribe<CoreProjectionProcessingMessage.CheckpointLoaded>(this);
+		_bus.Subscribe<TimerMessage.Schedule>(this);
+
+		_reader.Initialize();
+		_reader.BeginLoadState();
+		if (!_mre.Wait(10000)) {
+			Assert.Fail("Timed out waiting for checkpoint to load");
+		}
+	}
+
+	public override void Handle(ClientMessage.ReadStreamEventsBackward message) {
+		if (!_hasTimedOut) {
+			_timeoutCorrelationId = message.CorrelationId;
+			_hasTimedOut = true;
+			return;
+		}
+
+		var evnts = IODispatcherTestHelpers.CreateResolvedEvent<TLogFormat, TStreamId>(message.EventStreamId,
+			ProjectionEventTypes.ProjectionCheckpoint, "[]",
+			@"{
+                    ""$v"": ""1:-1:3:3"",
+                    ""$c"": 269728,
+                    ""$p"": 269728
+                }");
+		var reply = new ClientMessage.ReadStreamEventsBackwardCompleted(message.CorrelationId,
+			message.EventStreamId, message.FromEventNumber, message.MaxCount, ReadStreamResult.Success,
+			evnts, null, true, "", 0, 0, true, 10000);
+		message.Envelope.ReplyWith(reply);
+	}
+
+	public void Handle(TimerMessage.Schedule message) {
+		var delay = message.ReplyMessage as IODispatcherDelayedMessage;
+		if (delay != null && delay.MessageCorrelationId == _timeoutCorrelationId) {
+			message.Reply();
+		}
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.CheckpointLoaded message) {
+		_checkpointLoaded = message;
+		_mre.Set();
+	}
+
+	[Test]
+	public void should_load_checkpoint() {
+		Assert.IsNotNull(_checkpointLoaded);
+		Assert.AreEqual(_checkpointLoaded.ProjectionId, _projectionId);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint_reader/with_projection_checkpoint_reader.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint_reader/with_projection_checkpoint_reader.cs
new file mode 100644
index 00000000000..c26ee27ac82
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/projection_checkpoint_reader/with_projection_checkpoint_reader.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Helpers.IODispatcherTests;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection.projection_checkpoint_reader;
+
+public abstract class with_projection_checkpoint_reader<TLogFormat, TStreamId> : IHandle<ClientMessage.ReadStreamEventsBackward> {
+	protected readonly string _projectionCheckpointStreamId = "projection-checkpoint-stream";
+	protected readonly Guid _projectionId = Guid.NewGuid();
+
+	protected SynchronousScheduler _bus = new();
+	protected IODispatcher _ioDispatcher;
+	protected ProjectionVersion _projectionVersion;
+	protected CoreProjectionCheckpointReader _reader;
+
+	[OneTimeSetUp]
+	public void TestFixtureSetUp() {
+		_ioDispatcher = new IODispatcher(_bus, _bus, true);
+		IODispatcherTestHelpers.SubscribeIODispatcher(_ioDispatcher, _bus);
+		_bus.Subscribe<ClientMessage.ReadStreamEventsBackward>(this);
+		_projectionVersion = new ProjectionVersion(1, 2, 3);
+		_reader = new CoreProjectionCheckpointReader(_bus, _projectionId, _ioDispatcher,
+			_projectionCheckpointStreamId, _projectionVersion, true);
+		When();
+	}
+
+	public abstract void When();
+
+	public virtual void Handle(ClientMessage.ReadStreamEventsBackward message) {
+		var evnts = IODispatcherTestHelpers.CreateResolvedEvent<TLogFormat, TStreamId>(message.EventStreamId,
+			ProjectionEventTypes.ProjectionCheckpoint, "[]",
+			@"{
+                    ""$v"": ""1:-1:3:3"",
+                    ""$c"": 269728,
+                    ""$p"": 269728
+                }");
+		var reply = new ClientMessage.ReadStreamEventsBackwardCompleted(message.CorrelationId,
+			message.EventStreamId, message.FromEventNumber, message.MaxCount, ReadStreamResult.Success,
+			evnts, null, true, "", 0, 0, true, 10000);
+		message.Envelope.ReplyWith(reply);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_creating_a_new_partitiion_the_projection_should.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_creating_a_new_partitiion_the_projection_should.cs
new file mode 100644
index 00000000000..84736c1bd21
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_creating_a_new_partitiion_the_projection_should.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_creating_a_new_partitiion_the_projection_should<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	private Guid _eventId;
+
+	protected override void Given() {
+		_configureBuilderByQuerySource = source => {
+			source.FromAll();
+			source.AllEvents();
+			source.SetByStream();
+			source.SetDefinesStateTransform();
+		};
+		TicksAreHandledImmediately();
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	protected override void When() {
+		//projection subscribes here
+		_eventId = Guid.NewGuid();
+		_consumer.HandledMessages.Clear();
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"account-01", -1, "account-01", -1, false, new TFPos(120, 110), _eventId, "handle_this_type",
+					false, "data", "metadata"), _subscriptionId, 0));
+	}
+
+	[Test]
+	public void passes_partition_created_notification_to_the_handler() {
+		Assert.AreEqual(1, _stateHandler._partitionCreatedProcessed);
+		Assert.Inconclusive();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_creating_a_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_creating_a_projection.cs
new file mode 100644
index 00000000000..da8e3a8cb28
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_creating_a_projection.cs
@@ -0,0 +1,314 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture]
+public class when_creating_a_projection {
+	[SetUp]
+	public void Setup() {
+		var fakePublisher = new FakePublisher();
+		_ioDispatcher = new IODispatcher(fakePublisher, fakePublisher, true);
+
+		_subscriptionDispatcher = new ReaderSubscriptionDispatcher(new FakePublisher());
+	}
+
+	private readonly ProjectionConfig _defaultProjectionConfig = new ProjectionConfig(
+		null, 5, 10, 1000, 250, true, true, true, true, true, 10000, 1, null);
+
+	private IODispatcher _ioDispatcher;
+
+
+	private ReaderSubscriptionDispatcher _subscriptionDispatcher;
+
+	[Test]
+	public void
+		a_checkpoint_threshold_less_tan_checkpoint_handled_threshold_throws_argument_out_of_range_exception() {
+		Assert.Throws<ArgumentException>(() => {
+			IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
+			var version = new ProjectionVersion(1, 0, 0);
+			var projectionConfig = new ProjectionConfig(null, 10, 5, 1000, 250, true, true, false, false,
+				true, 10000, 1, null);
+			new ContinuousProjectionProcessingStrategy(
+				"projection",
+				version,
+				projectionStateHandler,
+				projectionConfig,
+				projectionStateHandler.GetSourceDefinition(),
+				null,
+				_subscriptionDispatcher,
+				true, Opts.MaxProjectionStateSizeDefault).Create(
+				Guid.NewGuid(),
+				new FakePublisher(),
+				Guid.NewGuid(),
+				SystemAccounts.System,
+				new FakePublisher(),
+				_ioDispatcher,
+				_subscriptionDispatcher,
+				new RealTimeProvider());
+		});
+	}
+
+	[Test]
+	public void a_negative_checkpoint_handled_interval_throws_argument_out_of_range_exception() {
+		Assert.Throws<ArgumentOutOfRangeException>(() => {
+			IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
+			var version = new ProjectionVersion(1, 0, 0);
+			var projectionConfig = new ProjectionConfig(null, -1, 10, 1000, 250, true, true, false, false,
+				true, 10000, 1, null);
+			new ContinuousProjectionProcessingStrategy(
+				"projection",
+				version,
+				projectionStateHandler,
+				projectionConfig,
+				projectionStateHandler.GetSourceDefinition(),
+				null,
+				_subscriptionDispatcher,
+				true, Opts.MaxProjectionStateSizeDefault).Create(
+				Guid.NewGuid(),
+				new FakePublisher(),
+				Guid.NewGuid(),
+				SystemAccounts.System,
+				new FakePublisher(),
+				_ioDispatcher,
+				_subscriptionDispatcher,
+				new RealTimeProvider());
+		});
+	}
+
+	[Test]
+	public void a_null_io_dispatcher__throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
+			var version = new ProjectionVersion(1, 0, 0);
+			new ContinuousProjectionProcessingStrategy(
+				"projection",
+				version,
+				projectionStateHandler,
+				_defaultProjectionConfig,
+				projectionStateHandler.GetSourceDefinition(),
+				null,
+				_subscriptionDispatcher,
+				true, Opts.MaxProjectionStateSizeDefault).Create(
+				Guid.NewGuid(),
+				new FakePublisher(),
+				Guid.NewGuid(),
+				SystemAccounts.System,
+				new FakePublisher(),
+				null,
+				_subscriptionDispatcher,
+				new RealTimeProvider());
+		});
+	}
+
+	[Test]
+	public void a_null_name_throws_argument_null_excveption() {
+		Assert.Throws<ArgumentNullException>(() => {
+			IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
+			var version = new ProjectionVersion(1, 0, 0);
+			new ContinuousProjectionProcessingStrategy(
+				null,
+				version,
+				projectionStateHandler,
+				_defaultProjectionConfig,
+				projectionStateHandler.GetSourceDefinition(),
+				null,
+				_subscriptionDispatcher,
+				true, Opts.MaxProjectionStateSizeDefault).Create(
+				Guid.NewGuid(),
+				new FakePublisher(),
+				Guid.NewGuid(),
+				SystemAccounts.System,
+				new FakePublisher(),
+				_ioDispatcher,
+				_subscriptionDispatcher,
+				new RealTimeProvider());
+		});
+	}
+
+	[Test]
+	public void a_null_publisher_throws_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
+			var version = new ProjectionVersion(1, 0, 0);
+			new ContinuousProjectionProcessingStrategy(
+				"projection",
+				version,
+				projectionStateHandler,
+				_defaultProjectionConfig,
+				projectionStateHandler.GetSourceDefinition(),
+				null,
+				_subscriptionDispatcher,
+				true, Opts.MaxProjectionStateSizeDefault).Create(
+				Guid.NewGuid(),
+				new FakePublisher(),
+				Guid.NewGuid(),
+				SystemAccounts.System,
+				null,
+				_ioDispatcher,
+				_subscriptionDispatcher,
+				new RealTimeProvider());
+		});
+	}
+
+	[Test]
+	public void a_null_input_queue_throws_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
+			var version = new ProjectionVersion(1, 0, 0);
+			new ContinuousProjectionProcessingStrategy(
+				"projection",
+				version,
+				projectionStateHandler,
+				_defaultProjectionConfig,
+				projectionStateHandler.GetSourceDefinition(),
+				null,
+				_subscriptionDispatcher,
+				true, Opts.MaxProjectionStateSizeDefault).Create(
+				Guid.NewGuid(),
+				null,
+				Guid.NewGuid(),
+				SystemAccounts.System,
+				new FakePublisher(),
+				_ioDispatcher,
+				_subscriptionDispatcher,
+				new RealTimeProvider());
+		});
+	}
+
+	[Test]
+	public void a_null_run_as_does_not_throw_exception() {
+		IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
+		var version = new ProjectionVersion(1, 0, 0);
+		new ContinuousProjectionProcessingStrategy(
+			"projection",
+			version,
+			projectionStateHandler,
+			_defaultProjectionConfig,
+			projectionStateHandler.GetSourceDefinition(),
+			null,
+			_subscriptionDispatcher,
+			true, Opts.MaxProjectionStateSizeDefault).Create(
+			Guid.NewGuid(),
+			new FakePublisher(),
+			Guid.NewGuid(),
+			null,
+			new FakePublisher(),
+			_ioDispatcher,
+			_subscriptionDispatcher,
+			new RealTimeProvider());
+	}
+
+	[Test]
+	public void a_null_subscription_dispatcher__throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
+			var version = new ProjectionVersion(1, 0, 0);
+			new ContinuousProjectionProcessingStrategy(
+				"projection",
+				version,
+				projectionStateHandler,
+				_defaultProjectionConfig,
+				projectionStateHandler.GetSourceDefinition(),
+				null,
+				_subscriptionDispatcher,
+				true, Opts.MaxProjectionStateSizeDefault).Create(
+				Guid.NewGuid(),
+				new FakePublisher(),
+				Guid.NewGuid(),
+				SystemAccounts.System,
+				new FakePublisher(),
+				_ioDispatcher,
+				null,
+				new RealTimeProvider());
+		});
+	}
+
+	[Test]
+	public void a_null_time_provider__throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
+			var version = new ProjectionVersion(1, 0, 0);
+			new ContinuousProjectionProcessingStrategy(
+				"projection",
+				version,
+				projectionStateHandler,
+				_defaultProjectionConfig,
+				projectionStateHandler.GetSourceDefinition(),
+				null,
+				_subscriptionDispatcher,
+				true, Opts.MaxProjectionStateSizeDefault).Create(
+				Guid.NewGuid(),
+				new FakePublisher(),
+				Guid.NewGuid(),
+				SystemAccounts.System,
+				new FakePublisher(),
+				_ioDispatcher,
+				_subscriptionDispatcher,
+				null);
+		});
+	}
+
+	[Test]
+	public void a_zero_checkpoint_handled_threshold_throws_argument_out_of_range_exception() {
+		Assert.Throws<ArgumentOutOfRangeException>(() => {
+			IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
+			var version = new ProjectionVersion(1, 0, 0);
+			var projectionConfig = new ProjectionConfig(null, 0, 10, 1000, 250, true, true, false, false,
+				true, 10000, 1, null);
+			new ContinuousProjectionProcessingStrategy(
+				"projection",
+				version,
+				projectionStateHandler,
+				projectionConfig,
+				projectionStateHandler.GetSourceDefinition(),
+				null,
+				_subscriptionDispatcher,
+				true, Opts.MaxProjectionStateSizeDefault).Create(
+				Guid.NewGuid(),
+				new FakePublisher(),
+				Guid.NewGuid(),
+				SystemAccounts.System,
+				new FakePublisher(),
+				_ioDispatcher,
+				_subscriptionDispatcher,
+				new RealTimeProvider());
+		});
+	}
+
+	[Test]
+	public void an_empty_name_throws_argument_exception() {
+		Assert.Throws<ArgumentException>(() => {
+			IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
+			var version = new ProjectionVersion(1, 0, 0);
+			new ContinuousProjectionProcessingStrategy(
+				"",
+				version,
+				projectionStateHandler,
+				_defaultProjectionConfig,
+				projectionStateHandler.GetSourceDefinition(),
+				null,
+				_subscriptionDispatcher,
+				true, Opts.MaxProjectionStateSizeDefault).Create(
+				Guid.NewGuid(),
+				new FakePublisher(),
+				Guid.NewGuid(),
+				SystemAccounts.System,
+				new FakePublisher(),
+				_ioDispatcher,
+				_subscriptionDispatcher,
+				new RealTimeProvider());
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_killing_a_projection_and_an_event_is_received.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_killing_a_projection_and_an_event_is_received.cs
new file mode 100644
index 00000000000..b980f33c217
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_killing_a_projection_and_an_event_is_received.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_killing_a_projection_and_an_event_is_received<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	private Guid _lastEventIdBeforeKill;
+
+	protected override void Given() {
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	protected override void When() {
+		//receive first event
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110), Guid.NewGuid(),
+					"handle_this_type", false, "data1", "metadata"), _subscriptionId, 0));
+
+		//receive second event
+		_lastEventIdBeforeKill = Guid.NewGuid();
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(140, 130),
+					_lastEventIdBeforeKill,
+					"handle_this_type", false, "data2", "metadata"), _subscriptionId, 1));
+
+		//kill the projection
+		_coreProjection.Kill();
+
+		//receive third event
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(160, 150), Guid.NewGuid(),
+					"handle_this_type", false, "data3", "metadata"), _subscriptionId, 2));
+	}
+
+	[Test]
+	public void event_received_after_kill_is_not_processed() {
+		Assert.AreEqual(2, _stateHandler._eventsProcessed);
+		Assert.AreEqual(_lastEventIdBeforeKill, _stateHandler._lastProcessedEventId);
+		Assert.AreEqual("data2", _stateHandler._lastProcessedData);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_loading_a_new_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_loading_a_new_projection.cs
new file mode 100644
index 00000000000..e5056a10b70
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_loading_a_new_projection.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_loading_a_new_projection<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionLoaded<TLogFormat, TStreamId> {
+	protected override void Given() {
+		NoStream("$projections-projection-result");
+		NoStream("$projections-projection-order");
+		AllWritesToSucceed("$projections-projection-order");
+		NoStream("$projections-projection-checkpoint");
+	}
+
+	protected override void When() {
+	}
+
+	[Test]
+	public void should_not_subscribe() {
+		Assert.AreEqual(0, _subscribeProjectionHandler.HandledMessages.Count);
+	}
+
+	[Test]
+	public void should_not_initialize_projection_state_handler() {
+		Assert.AreEqual(0, _stateHandler._initializeCalled);
+	}
+
+	[Test]
+	public void should_not_publish_started_message() {
+		Assert.AreEqual(0, _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Started>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_loading_an_existing_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_loading_an_existing_projection.cs
new file mode 100644
index 00000000000..b37126f9081
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_loading_an_existing_projection.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_loading_an_existing_projection<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionLoaded<TLogFormat, TStreamId> {
+	private string _testProjectionState = @"{""test"":1}";
+
+	protected override void Given() {
+		ExistingEvent(
+			"$projections-projection-result", "Result",
+			@"{""c"": 100, ""p"": 50}", _testProjectionState);
+		ExistingEvent(
+			"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
+			@"{""c"": 100, ""p"": 50}", _testProjectionState);
+		ExistingEvent(
+			"$projections-projection-result", "Result",
+			@"{""c"": 200, ""p"": 150}", _testProjectionState);
+		ExistingEvent(
+			"$projections-projection-result", "Result",
+			@"{""c"": 300, ""p"": 250}", _testProjectionState);
+	}
+
+	protected override void When() {
+	}
+
+
+	[Test]
+	public void should_not_subscribe() {
+		Assert.AreEqual(0, _subscribeProjectionHandler.HandledMessages.Count);
+	}
+
+	[Test]
+	public void should_not_load_projection_state_handler() {
+		Assert.AreEqual(0, _stateHandler._loadCalled);
+	}
+
+	[Test]
+	public void should_not_publish_started_message() {
+		Assert.AreEqual(0, _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Started>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_receiving_a_committed_event_the_projection_should.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_receiving_a_committed_event_the_projection_should.cs
new file mode 100644
index 00000000000..a5306b55586
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_receiving_a_committed_event_the_projection_should.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_receiving_a_committed_event_the_projection_should<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	private Guid _eventId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	protected override void When() {
+		//projection subscribes here
+		_eventId = Guid.NewGuid();
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110), _eventId,
+					"handle_this_type", false, "data", "metadata"), _subscriptionId, 0));
+	}
+
+	[Test]
+	public void update_state_snapshot_at_correct_position() {
+		Assert.AreEqual(1, _writeEventHandler.HandledMessages.OfEventType("Result").Count);
+
+		var metedata =
+			_writeEventHandler.HandledMessages.OfEventType("Result")[0].Metadata
+				.ParseCheckpointTagVersionExtraJson(default(ProjectionVersion));
+
+		Assert.AreEqual(120, metedata.Tag.CommitPosition);
+		Assert.AreEqual(110, metedata.Tag.PreparePosition);
+	}
+
+	[Test]
+	public void pass_event_to_state_handler() {
+		Assert.AreEqual(1, _stateHandler._eventsProcessed);
+		Assert.AreEqual("/event_category/1", _stateHandler._lastProcessedStreamId);
+		Assert.AreEqual("handle_this_type", _stateHandler._lastProcessedEventType);
+		Assert.AreEqual(_eventId, _stateHandler._lastProcessedEventId);
+		//TODO: support sequence numbers here
+		Assert.AreEqual("metadata", _stateHandler._lastProcessedMetadata);
+		Assert.AreEqual("data", _stateHandler._lastProcessedData);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_receiving_a_committed_event_the_projection_with_partitioned_state_by_custom_rule_should.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_receiving_a_committed_event_the_projection_with_partitioned_state_by_custom_rule_should.cs
new file mode 100644
index 00000000000..e35b32f43f6
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_receiving_a_committed_event_the_projection_with_partitioned_state_by_custom_rule_should.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_receiving_a_committed_event_the_projection_with_partitioned_state_by_custom_rule_should<TLogFormat, TStreamId> :
+	TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	private Guid _eventId;
+
+	protected override void Given() {
+		_configureBuilderByQuerySource = source => {
+			source.FromAll();
+			source.AllEvents();
+			source.SetByCustomPartitions();
+			source.SetDefinesStateTransform();
+			source.SetOutputState();
+		};
+		TicksAreHandledImmediately();
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	protected override FakeProjectionStateHandler GivenProjectionStateHandler() {
+		return new FakeProjectionStateHandler(
+			configureBuilder: _configureBuilderByQuerySource, failOnGetPartition: false);
+	}
+
+	protected override void When() {
+		//projection subscribes here
+		_eventId = Guid.NewGuid();
+		_consumer.HandledMessages.Clear();
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"account-01", -1, "account-01", -1, false, new TFPos(120, 110), _eventId,
+					"handle_this_type", false, "data", "metadata"), _subscriptionId, 0));
+	}
+
+	[Test]
+	public void request_partition_state_from_the_correct_stream() {
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsBackward>()
+				.Count(v => v.EventStreamId == "$projections-projection-region-a-checkpoint"));
+	}
+
+	[Test]
+	public void update_state_snapshot_is_written_to_the_correct_stream() {
+		Assert.AreEqual(1, _writeEventHandler.HandledMessages.OfEventType("Result").Count);
+		var message = _writeEventHandler.HandledMessages.WithEventType("Result")[0];
+		Assert.AreEqual("$projections-projection-region-a-result", message.EventStreamId);
+	}
+
+	[Test]
+	public void pass_partition_name_to_state_handler() {
+		Assert.AreEqual("region-a", _stateHandler._lastPartition);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_receiving_a_committed_event_the_projection_with_partitioned_state_should.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_receiving_a_committed_event_the_projection_with_partitioned_state_should.cs
new file mode 100644
index 00000000000..1bdcc5194c1
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_receiving_a_committed_event_the_projection_with_partitioned_state_should.cs
@@ -0,0 +1,105 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_receiving_a_committed_event_the_projection_with_partitioned_state_should<TLogFormat, TStreamId> :
+	TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	private Guid _eventId;
+
+	protected override void Given() {
+		_configureBuilderByQuerySource = source => {
+			source.FromAll();
+			source.AllEvents();
+			source.SetByStream();
+			source.SetDefinesStateTransform();
+			source.SetOutputState();
+		};
+		TicksAreHandledImmediately();
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	protected override void When() {
+		//projection subscribes here
+		_eventId = Guid.NewGuid();
+		_consumer.HandledMessages.Clear();
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"account-01", -1, "account-01", -1, false, new TFPos(120, 110), _eventId,
+					"handle_this_type", false, "data", "metadata"), _subscriptionId, 0));
+	}
+
+	[Test]
+	public void request_partition_state_from_the_correct_stream() {
+		// 1 - for load state
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsBackward>()
+				.Count(v => v.EventStreamId == "$projections-projection-account-01-checkpoint"));
+	}
+
+	[Test]
+	public void update_state_snapshot_is_written_to_the_correct_stream() {
+		var writeEvents =
+			_writeEventHandler.HandledMessages.Where(v => v.Events.Any(e => e.EventType == "Result")).ToList();
+		Assert.AreEqual(1, writeEvents.Count);
+
+		var message = writeEvents[0];
+		Assert.AreEqual("$projections-projection-account-01-result", message.EventStreamId);
+	}
+
+	[Test]
+	public void update_state_snapshot_at_correct_position() {
+		var writeEvents =
+			_writeEventHandler.HandledMessages.Where(v => v.Events.Any(e => e.EventType == "Result")).ToList();
+		Assert.AreEqual(1, writeEvents.Count);
+
+		var metedata = writeEvents[0].Events[0].Metadata
+			.ParseCheckpointTagVersionExtraJson(default(ProjectionVersion));
+
+		Assert.AreEqual(120, metedata.Tag.CommitPosition);
+		Assert.AreEqual(110, metedata.Tag.PreparePosition);
+	}
+
+	[Test]
+	public void pass_event_to_state_handler() {
+		Assert.AreEqual(1, _stateHandler._eventsProcessed);
+		Assert.AreEqual("account-01", _stateHandler._lastProcessedStreamId);
+		Assert.AreEqual("handle_this_type", _stateHandler._lastProcessedEventType);
+		Assert.AreEqual(_eventId, _stateHandler._lastProcessedEventId);
+		//TODO: support sequence numbers here
+		Assert.AreEqual("metadata", _stateHandler._lastProcessedMetadata);
+		Assert.AreEqual("data", _stateHandler._lastProcessedData);
+	}
+
+	[Test]
+	public void register_new_partition_state_stream() {
+		var writes =
+			_writeEventHandler.HandledMessages.Where(v => v.EventStreamId == "$projections-projection-partitions")
+				.ToArray();
+		Assert.AreEqual(1, writes.Length);
+		var write = writes[0];
+
+		Assert.AreEqual(1, write.Events.Length);
+
+		var @event = write.Events[0];
+
+		Assert.AreEqual("account-01", Helper.UTF8NoBom.GetString(@event.Data));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_receiving_committed_event_the_projection_with_existing_partitioned_state_should.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_receiving_committed_event_the_projection_with_existing_partitioned_state_should.cs
new file mode 100644
index 00000000000..14518f1e885
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_receiving_committed_event_the_projection_with_existing_partitioned_state_should.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_receiving_committed_event_the_projection_with_existing_partitioned_state_should<TLogFormat, TStreamId> :
+	TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	private Guid _eventId;
+	private string _testProjectionState = @"{""test"":1}";
+
+	protected override void Given() {
+		_configureBuilderByQuerySource = source => {
+			source.FromAll();
+			source.AllEvents();
+			source.SetByStream();
+		};
+		TicksAreHandledImmediately();
+		NoStream("$projections-projection-result");
+		NoStream("$projections-projection-order");
+		AllWritesToSucceed("$projections-projection-order");
+		ExistingEvent(
+			"$projections-projection-partitions", "PartitionCreated",
+			@"{""c"": 100, ""p"": 50}", "account-01");
+		ExistingEvent(
+			"$projections-projection-account-01-result", "Result",
+			@"{""c"": 100, ""p"": 50}", _testProjectionState);
+		ExistingEvent(
+			"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
+			@"{""c"": 100, ""p"": 50}", _testProjectionState);
+		AllWritesSucceed();
+	}
+
+	protected override void When() {
+		//projection subscribes here
+		_eventId = Guid.NewGuid();
+		_consumer.HandledMessages.Clear();
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"account-01", 2, "account-01", 2, false, new TFPos(120, 110), _eventId,
+					"handle_this_type", false, "data1", "metadata"), _subscriptionId, 0));
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"account-01", 3, "account-01", 3, false, new TFPos(160, 150), _eventId, "append", false,
+					"$", "metadata"),
+				_subscriptionId, 1));
+	}
+
+	[Test]
+	public void register_new_partition_state_stream_only_once() {
+		var writes =
+			_writeEventHandler.HandledMessages.Where(v => v.EventStreamId == "$projections-projection-partitions")
+				.ToArray();
+		Assert.AreEqual(0, writes.Length);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_receiving_committed_events_the_projection_with_partitioned_state_should.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_receiving_committed_events_the_projection_with_partitioned_state_should.cs
new file mode 100644
index 00000000000..221cb6d9c71
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_receiving_committed_events_the_projection_with_partitioned_state_should.cs
@@ -0,0 +1,110 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_receiving_committed_events_the_projection_with_partitioned_state_should<TLogFormat, TStreamId> :
+	TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	private Guid _eventId;
+
+	protected override void Given() {
+		_configureBuilderByQuerySource = source => {
+			source.FromAll();
+			source.AllEvents();
+			source.SetByStream();
+			source.SetDefinesFold();
+			source.SetOutputState();
+		};
+		TicksAreHandledImmediately();
+		NoOtherStreams();
+		AllWritesSucceed();
+	}
+
+	protected override void When() {
+		//projection subscribes here
+		_eventId = Guid.NewGuid();
+		_consumer.HandledMessages.Clear();
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"account-01", 1, "account-01", 1, false, new TFPos(120, 110), _eventId,
+					"handle_this_type", false, "data1", "metadata"), _subscriptionId, 0));
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"account-02", 2, "account-02", 2, false, new TFPos(140, 130), _eventId,
+					"handle_this_type", false, "data2", "metadata"), _subscriptionId, 1));
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"account-01", 2, "account-01", 2, false, new TFPos(160, 150), _eventId, "append", false,
+					"$", "metadata"),
+				_subscriptionId, 2));
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"account-02", 3, "account-02", 3, false, new TFPos(180, 170), _eventId, "append", false,
+					"$", "metadata"),
+				_subscriptionId, 3));
+	}
+
+	[Test]
+	public void request_partition_state_from_the_correct_stream() {
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsBackward>()
+				.Count(v => v.EventStreamId == "$projections-projection-account-01-checkpoint"));
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsBackward>()
+				.Count(v => v.EventStreamId == "$projections-projection-account-02-checkpoint"));
+	}
+
+	[Test]
+	public void update_state_snapshots_are_written_to_the_correct_stream() {
+		var writeEvents =
+			_writeEventHandler.HandledMessages.Where(v => v.Events.Any(e => e.EventType == "Result")).ToList();
+		Assert.AreEqual(4, writeEvents.Count);
+		Assert.AreEqual("$projections-projection-account-01-result", writeEvents[0].EventStreamId);
+		Assert.AreEqual("$projections-projection-account-02-result", writeEvents[1].EventStreamId);
+		Assert.AreEqual("$projections-projection-account-01-result", writeEvents[2].EventStreamId);
+		Assert.AreEqual("$projections-projection-account-02-result", writeEvents[3].EventStreamId);
+	}
+
+	[Test]
+	public void update_state_snapshots_are_correct() {
+		var writeEvents =
+			_writeEventHandler.HandledMessages.Where(v => v.Events.Any(e => e.EventType == "Result")).ToList();
+		Assert.AreEqual(4, writeEvents.Count);
+		Assert.AreEqual("data1", Helper.UTF8NoBom.GetString(writeEvents[0].Events[0].Data));
+		Assert.AreEqual("data2", Helper.UTF8NoBom.GetString(writeEvents[1].Events[0].Data));
+		Assert.AreEqual("data1$", Helper.UTF8NoBom.GetString(writeEvents[2].Events[0].Data));
+		Assert.AreEqual("data2$", Helper.UTF8NoBom.GetString(writeEvents[3].Events[0].Data));
+	}
+
+	[Test]
+	public void register_new_partition_state_stream_only_once() {
+		var writes =
+			_writeEventHandler.HandledMessages.Where(v => v.EventStreamId == "$projections-projection-partitions")
+				.ToArray();
+		Assert.AreEqual(2, writes.Length);
+
+		Assert.AreEqual(1, writes[0].Events.Length);
+		Assert.AreEqual("account-01", Helper.UTF8NoBom.GetString(writes[0].Events[0].Data));
+
+		Assert.AreEqual(1, writes[1].Events.Length);
+		Assert.AreEqual("account-02", Helper.UTF8NoBom.GetString(writes[1].Events[0].Data));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_receiving_committed_events_the_projection_without_when.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_receiving_committed_events_the_projection_without_when.cs
new file mode 100644
index 00000000000..5aff1e6cc4c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_receiving_committed_events_the_projection_without_when.cs
@@ -0,0 +1,123 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Text;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+public abstract class specification_with_query_without_when<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	protected Guid _eventId;
+
+	protected override bool GivenCheckpointsEnabled() {
+		return false;
+	}
+
+	protected override bool GivenEmitEventEnabled() {
+		return false;
+	}
+
+	protected override bool GivenStopOnEof() {
+		return true;
+	}
+
+	protected override int GivenPendingEventsThreshold() {
+		return 0;
+	}
+
+	protected override ProjectionProcessingStrategy GivenProjectionProcessingStrategy() {
+		return CreateQueryProcessingStrategy();
+	}
+
+	protected override void Given() {
+		_checkpointHandledThreshold = 0;
+		_checkpointUnhandledBytesThreshold = 0;
+		_configureBuilderByQuerySource = source => {
+			source.FromAll();
+			source.AllEvents();
+			source.NoWhen();
+		};
+		TicksAreHandledImmediately();
+		NoOtherStreams();
+		AllWritesSucceed();
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_receiving_committed_events_the_projection_without_when<TLogFormat, TStreamId> : specification_with_query_without_when<TLogFormat, TStreamId> {
+	protected override void When() {
+		//projection subscribes here
+		_eventId = Guid.NewGuid();
+		_consumer.HandledMessages.Clear();
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"account-01", 1, "account-01", 1, false, new TFPos(120, 110), _eventId, "handle_this_type",
+					false, "data1", "metadata"), _subscriptionId, 0));
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"account-02", 2, "account-02", 2, false, new TFPos(140, 130), _eventId, "handle_this_type",
+					false, "data2", "metadata"), _subscriptionId, 1));
+	}
+
+	[Test]
+	public void update_state_snapshots_are_written_to_the_correct_stream() {
+		var writeEvents =
+			_writeEventHandler.HandledMessages.Where(v => v.Events.Any(e => e.EventType == "Result")).ToList();
+		Assert.AreEqual(2, writeEvents.Count);
+		Assert.AreEqual("$projections-projection-result", writeEvents[0].EventStreamId);
+		Assert.AreEqual("$projections-projection-result", writeEvents[1].EventStreamId);
+		Assert.AreEqual("data1", Encoding.UTF8.GetString(writeEvents[0].Events[0].Data));
+		Assert.AreEqual("data2", Encoding.UTF8.GetString(writeEvents[1].Events[0].Data));
+	}
+}
+
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_handling_event_does_not_change_state_the_projection_without_when<TLogFormat, TStreamId> : specification_with_query_without_when<TLogFormat, TStreamId> {
+	protected override void When() {
+		//projection subscribes here
+		_eventId = Guid.NewGuid();
+		_consumer.HandledMessages.Clear();
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"account-01", 1, "account-01", 1, false, new TFPos(120, 110), _eventId, "handle_this_type",
+					false, "data1", "metadata"), _subscriptionId, 0));
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"account-01", 2, "account-01", 2, false, new TFPos(140, 130), _eventId, "handle_this_type",
+					false, "data1", "metadata"), _subscriptionId, 1));
+	}
+
+	[Test, Ignore("To be fixed")]
+	public void result_events_are_produced_for_each_received_event() {
+		var writeEvents =
+			_writeEventHandler.HandledMessages.Where(v => v.Events.Any(e => e.EventType == "Result")).ToList();
+		Assert.AreEqual(2, writeEvents.Count);
+		Assert.AreEqual("$projections-projection-result", writeEvents[0].EventStreamId);
+		Assert.AreEqual("$projections-projection-result", writeEvents[1].EventStreamId);
+		Assert.AreEqual("data1", Encoding.UTF8.GetString(writeEvents[0].Events[0].Data));
+		Assert.AreEqual("data1", Encoding.UTF8.GetString(writeEvents[1].Events[0].Data));
+	}
+
+	[Test]
+	public void no_result_removed_events_are_produced() {
+		var writeEvents =
+			_writeEventHandler.HandledMessages.Where(v => v.Events.Any(e => e.EventType == "ResultRemoved"))
+				.ToList();
+		Assert.AreEqual(0, writeEvents.Count);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_starting_a_new_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_starting_a_new_projection.cs
new file mode 100644
index 00000000000..b4ab23aa582
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_starting_a_new_projection.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_starting_a_new_projection<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	protected override void Given() {
+		NoStream("$projections-projection-result");
+		NoStream("$projections-projection-order");
+		AllWritesToSucceed("$projections-projection-order");
+		NoStream("$projections-projection-checkpoint");
+	}
+
+	protected override void When() {
+	}
+
+	[Test]
+	public void should_subscribe_from_beginning() {
+		Assert.AreEqual(1, _subscribeProjectionHandler.HandledMessages.Count);
+		Assert.AreEqual(0, _subscribeProjectionHandler.HandledMessages[0].FromPosition.Position.CommitPosition);
+		Assert.AreEqual(-1, _subscribeProjectionHandler.HandledMessages[0].FromPosition.Position.PreparePosition);
+	}
+
+	[Test]
+	public void should_publish_started_message() {
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Started>().Count());
+		var startedMessage = _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Started>().Single();
+		Assert.AreEqual(_projectionCorrelationId, startedMessage.ProjectionId);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_starting_a_new_projection_and_an_event_is_received.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_starting_a_new_projection_and_an_event_is_received.cs
new file mode 100644
index 00000000000..040de909b05
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_starting_a_new_projection_and_an_event_is_received.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_starting_a_new_projection_and_an_event_is_received<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	protected override void Given() {
+		NoStream("$projections-projection-result");
+		NoStream("$projections-projection-order");
+		AllWritesToSucceed("$projections-projection-order");
+		NoStream("$projections-projection-checkpoint");
+	}
+
+	protected override void When() {
+		var eventId = Guid.NewGuid();
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110), eventId,
+					"handle_this_type", false, "data", "metadata"), _subscriptionId, 0));
+	}
+
+	[Test]
+	public void should_initialize_projection_state_handler() {
+		Assert.AreEqual(1, _stateHandler._initializeCalled);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_starting_a_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_starting_a_projection.cs
new file mode 100644
index 00000000000..e5b1c0f4c2d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_starting_a_projection.cs
@@ -0,0 +1,108 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Tests.Bus.Helpers;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using NUnit.Framework;
+using IODispatcherDelayedMessage = KurrentDB.Core.Helpers.IODispatcherDelayedMessage;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture]
+public class when_starting_a_projection {
+	private const string _projectionStateStream = "$projections-projection-result";
+	private const string _projectionCheckpointStream = "$projections-projection-checkpoint";
+	private CoreProjection _coreProjection;
+	private SynchronousScheduler _bus;
+	private TestHandler<ClientMessage.ReadStreamEventsBackward> _listEventsHandler;
+	private IODispatcher _ioDispatcher;
+	private ReaderSubscriptionDispatcher _subscriptionDispatcher;
+	private ProjectionConfig _projectionConfig;
+
+	[SetUp]
+	public void setup() {
+		_bus = new();
+		_listEventsHandler = new TestHandler<ClientMessage.ReadStreamEventsBackward>();
+		_bus.Subscribe(_listEventsHandler);
+		_ioDispatcher = new IODispatcher(_bus, _bus, true);
+		_subscriptionDispatcher = new ReaderSubscriptionDispatcher(_bus);
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CommittedEventReceived>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CheckpointSuggested>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.EofReached>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionEofReached>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionDeleted>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ProgressChanged>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.SubscriptionStarted>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.NotAuthorized>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ReaderAssignedReader>());
+		_bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_ioDispatcher.BackwardReader);
+		_bus.Subscribe<ClientMessage.NotHandled>(_ioDispatcher.BackwardReader);
+		_bus.Subscribe(_ioDispatcher.ForwardReader);
+		_bus.Subscribe(_ioDispatcher.Writer);
+		_bus.Subscribe<IODispatcherDelayedMessage>(_ioDispatcher);
+		_bus.Subscribe<ClientMessage.NotHandled>(_ioDispatcher);
+		IProjectionStateHandler projectionStateHandler = new FakeProjectionStateHandler();
+		_projectionConfig =
+			new ProjectionConfig(null, 5, 10, 1000, 250, true, true, false, false, true, 10000, 1, null);
+		var version = new ProjectionVersion(1, 0, 0);
+		var projectionProcessingStrategy = new ContinuousProjectionProcessingStrategy(
+			"projection", version, projectionStateHandler, _projectionConfig,
+			projectionStateHandler.GetSourceDefinition(), null, _subscriptionDispatcher, true, Opts.MaxProjectionStateSizeDefault);
+		_coreProjection = projectionProcessingStrategy.Create(
+			Guid.NewGuid(),
+			_bus,
+			Guid.NewGuid(),
+			SystemAccounts.System,
+			_bus,
+			_ioDispatcher,
+			_subscriptionDispatcher,
+			new RealTimeProvider());
+		_coreProjection.Start();
+	}
+
+	[Test]
+	public void should_request_state_snapshot() {
+		Assert.IsTrue(_listEventsHandler.HandledMessages.Count == 1);
+	}
+
+	[Test]
+	public void should_request_state_snapshot_on_correct_stream() {
+		Assert.AreEqual(_projectionCheckpointStream, _listEventsHandler.HandledMessages[0].EventStreamId);
+	}
+
+	[Test]
+	public async Task should_accept_no_event_stream_response() {
+		await _bus.DispatchAsync(
+			new ClientMessage.ReadStreamEventsBackwardCompleted(
+				_listEventsHandler.HandledMessages[0].CorrelationId,
+				_listEventsHandler.HandledMessages[0].EventStreamId, 100, 100, ReadStreamResult.NoStream,
+				new ResolvedEvent[0], null, false, string.Empty, -1, -1, true, 1000));
+	}
+
+	[Test]
+	public async Task should_accept_events_not_found_response() {
+		await _bus.DispatchAsync(
+			new ClientMessage.ReadStreamEventsBackwardCompleted(
+				_listEventsHandler.HandledMessages[0].CorrelationId,
+				_listEventsHandler.HandledMessages[0].EventStreamId, 100, 100, ReadStreamResult.Success,
+				new ResolvedEvent[0], null, false, string.Empty, -1, -1, false, 1000));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection.cs
new file mode 100644
index 00000000000..e5bcefe1cf5
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_starting_an_existing_projection<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	private string _testProjectionState = @"{""test"":1}";
+
+	protected override void Given() {
+		ExistingEvent(
+			"$projections-projection-result", "Result",
+			@"{""c"": 100, ""p"": 50}", _testProjectionState);
+		ExistingEvent(
+			"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
+			@"{""c"": 100, ""p"": 50}", _testProjectionState);
+		ExistingEvent(
+			"$projections-projection-result", "Result",
+			@"{""c"": 200, ""p"": 150}", _testProjectionState);
+		ExistingEvent(
+			"$projections-projection-result", "Result",
+			@"{""c"": 300, ""p"": 250}", _testProjectionState);
+	}
+
+	protected override void When() {
+	}
+
+
+	[Test]
+	public void should_subscribe_from_the_last_known_checkpoint_position() {
+		Assert.AreEqual(1, _subscribeProjectionHandler.HandledMessages.Count);
+		Assert.AreEqual(100, _subscribeProjectionHandler.HandledMessages[0].FromPosition.Position.CommitPosition);
+		Assert.AreEqual(50, _subscribeProjectionHandler.HandledMessages[0].FromPosition.Position.PreparePosition);
+	}
+
+	[Test]
+	public void should_publish_started_message() {
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Started>().Count());
+		var startedMessage = _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Started>().Single();
+		Assert.AreEqual(_projectionCorrelationId, startedMessage.ProjectionId);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection_and_an_event_is_received.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection_and_an_event_is_received.cs
new file mode 100644
index 00000000000..9c5530ce401
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection_and_an_event_is_received.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_starting_an_existing_projection_and_an_event_is_received<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	private string _testProjectionState = @"{""test"":1}";
+
+	protected override void Given() {
+		ExistingEvent(
+			"$projections-projection-result", "Result", @"{""c"": 100, ""p"": 50}",
+			_testProjectionState);
+		ExistingEvent(
+			"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
+			@"{""c"": 100, ""p"": 50}", _testProjectionState);
+		ExistingEvent(
+			"$projections-projection-result", "Result", @"{""c"": 200, ""p"": 150}",
+			_testProjectionState);
+		ExistingEvent(
+			"$projections-projection-result", "Result", @"{""c"": 300, ""p"": 250}",
+			_testProjectionState);
+		NoStream("$projections-projection-order");
+		AllWritesToSucceed("$projections-projection-order");
+	}
+
+	protected override void When() {
+		var eventId = Guid.NewGuid();
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110), eventId,
+					"append", false, "data", "metadata"), _subscriptionId, 0));
+	}
+
+
+	[Test]
+	public void should_load_projection_state_handler() {
+		Assert.AreEqual(1, _stateHandler._loadCalled);
+		Assert.AreEqual(_testProjectionState + "data", _stateHandler._loadedState);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection_missing_last_emitted_event_and_state_snapshot.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection_missing_last_emitted_event_and_state_snapshot.cs
new file mode 100644
index 00000000000..9bcc72de9fb
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection_missing_last_emitted_event_and_state_snapshot.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_starting_an_existing_projection_missing_last_emitted_event_and_state_snapshot<TLogFormat, TStreamId> :
+	TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	private readonly Guid _causedByEventId = Guid.NewGuid();
+
+	protected override void Given() {
+		ExistingEvent(
+			"$projections-projection-result", "Result", @"{""c"": 100, ""p"": 50}", "{}");
+		ExistingEvent(
+			"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
+			@"{""c"": 100, ""p"": 50}", "{}");
+
+		ExistingEvent(
+			FakeProjectionStateHandler._emit1StreamId, FakeProjectionStateHandler._emit1EventType,
+			@"{""c"": 120, ""p"": 110}", FakeProjectionStateHandler._emit1Data);
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	protected override void When() {
+		//projection subscribes here
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
+					_causedByEventId, "emit12_type", false, "data",
+					"metadata"), _subscriptionId, 0));
+	}
+
+	[Test]
+	public void should_write_second_emitted_event_and_state_snapshot() {
+		Assert.AreEqual(1, _writeEventHandler.HandledMessages.OfEventType("Result").Count);
+		Assert.AreEqual(
+			1, _writeEventHandler.HandledMessages.OfEventType(FakeProjectionStateHandler._emit2EventType).Count);
+
+		Assert.IsTrue(
+			_writeEventHandler.HandledMessages.Any(
+				v => Helper.UTF8NoBom.GetString(v.Events[0].Data) == FakeProjectionStateHandler._emit2Data));
+		Assert.IsTrue(_writeEventHandler.HandledMessages.Any(v => v.Events[0].EventType == "Result"));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection_missing_last_state_snapshot.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection_missing_last_state_snapshot.cs
new file mode 100644
index 00000000000..4dcd619b4e6
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_starting_an_existing_projection_missing_last_state_snapshot.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_starting_an_existing_projection_missing_last_state_snapshot<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	private readonly Guid _causedByEventId = Guid.NewGuid();
+
+	protected override void Given() {
+		ExistingEvent(
+			"$projections-projection-result", "Result", @"{""c"": 100, ""p"": 50}", "{}");
+		ExistingEvent(
+			"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
+			@"{""c"": 100, ""p"": 50}", "{}");
+		ExistingEvent(
+			FakeProjectionStateHandler._emit1StreamId, FakeProjectionStateHandler._emit1EventType,
+			@"{""c"": 120, ""p"": 110}", FakeProjectionStateHandler._emit1Data);
+		NoStream("$projections-projection-order");
+		AllWritesToSucceed("$projections-projection-order");
+	}
+
+	protected override void When() {
+		//projection subscribes here
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
+					_causedByEventId, "emit1_type", false, "data",
+					"metadata"), _subscriptionId, 0));
+	}
+
+	[Test]
+	public void should_not_emit_events_but_write_the_new_state_snapshot() {
+		Assert.AreEqual(2, _writeEventHandler.HandledMessages.Count);
+
+		var data = Helper.UTF8NoBom.GetString(_writeEventHandler.HandledMessages[1].Events[0].Data);
+		Assert.AreEqual("data", data);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_stopping_a_projection_with_existing_state_without_updating_the_state.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_stopping_a_projection_with_existing_state_without_updating_the_state.cs
new file mode 100644
index 00000000000..161336a7cd2
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_stopping_a_projection_with_existing_state_without_updating_the_state.cs
@@ -0,0 +1,62 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_stopping_a_projection_with_existing_state_without_updating_the_state<TLogFormat, TStreamId> :
+		TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	private string _testProjectionState = @"{""test"":1}";
+
+	protected override void Given() {
+		//write existing checkpoint
+		ExistingEvent(
+			"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
+			@"{""c"": 100, ""p"": 50}", _testProjectionState);
+
+		AllWritesQueueUp();
+	}
+
+	protected override void When() {
+		//force write of another checkpoint
+		_bus.Publish(
+			new EventReaderSubscriptionMessage.CheckpointSuggested(
+				_subscriptionId, CheckpointTag.FromPosition(0, 160, 150), 77.7f, 0));
+
+		_coreProjection.Stop();
+	}
+
+	[Test]
+	public void a_projection_checkpoint_event_is_published() {
+		AllWriteComplete();
+		Assert.AreEqual(
+			1,
+			_writeEventHandler.HandledMessages.Count(v =>
+				v.Events.Any(e => e.EventType == ProjectionEventTypes.ProjectionCheckpoint)));
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Stopped>().Count());
+	}
+
+	[Test]
+	public void previous_state_is_saved_in_checkpoint_event() {
+		AllWriteComplete();
+		Assert.AreEqual(
+			1,
+			_writeEventHandler.HandledMessages.Count(
+				v => v.Events.Any(
+					e => e.EventType == ProjectionEventTypes.ProjectionCheckpoint
+						 && Helper.UTF8NoBom.GetString(e.Data).Equals("[" + _testProjectionState + "]")
+				)
+			)
+		);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_suspending_a_projection_and_an_event_is_received.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_suspending_a_projection_and_an_event_is_received.cs
new file mode 100644
index 00000000000..3001622733b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_suspending_a_projection_and_an_event_is_received.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_suspending_a_projection_and_an_event_is_received<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	private Guid _lastEventIdBeforeSuspension;
+
+	protected override void Given() {
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	protected override void When() {
+		//receive first event
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110), Guid.NewGuid(),
+					"handle_this_type", false, "data1", "metadata"), _subscriptionId, 0));
+
+		//receive second event
+		_lastEventIdBeforeSuspension = Guid.NewGuid();
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(140, 130),
+					_lastEventIdBeforeSuspension,
+					"handle_this_type", false, "data2", "metadata"), _subscriptionId, 1));
+
+		//suspend the projection
+		var suspended = _coreProjection.Suspend();
+		Assert.True(suspended, "Projection was not suspended");
+
+		//receive third event
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(160, 150), Guid.NewGuid(),
+					"handle_this_type", false, "data3", "metadata"), _subscriptionId, 2));
+	}
+
+	[Test]
+	public void event_received_after_suspend_is_not_processed() {
+		Assert.AreEqual(2, _stateHandler._eventsProcessed);
+		Assert.AreEqual(_lastEventIdBeforeSuspension, _stateHandler._lastProcessedEventId);
+		Assert.AreEqual("data2", _stateHandler._lastProcessedData);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_projection_with_pending_checkpoint_is_stopped.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_projection_with_pending_checkpoint_is_stopped.cs
new file mode 100644
index 00000000000..b817a8f8b90
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_projection_with_pending_checkpoint_is_stopped.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_the_projection_with_pending_checkpoint_is_stopped<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	protected override void Given() {
+		_checkpointHandledThreshold = 2;
+		NoStream("$projections-projection-result");
+		NoStream("$projections-projection-order");
+		AllWritesToSucceed("$projections-projection-order");
+		NoStream("$projections-projection-checkpoint");
+		NoStream(FakeProjectionStateHandler._emit1StreamId);
+		AllWritesQueueUp();
+	}
+
+	protected override void When() {
+		//projection subscribes here
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
+					Guid.NewGuid(), "handle_this_type", false, "data1",
+					"metadata"), _subscriptionId, 0));
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(140, 130),
+					Guid.NewGuid(), "handle_this_type", false, "data2",
+					"metadata"), _subscriptionId, 1));
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(160, 150),
+					Guid.NewGuid(), "handle_this_type", false, "data3",
+					"metadata"), _subscriptionId, 2));
+		_bus.Publish(
+			new EventReaderSubscriptionMessage.CheckpointSuggested(
+				_subscriptionId, CheckpointTag.FromPosition(0, 160, 150), 77.7f, 3));
+		_coreProjection.Stop();
+	}
+
+	[Test]
+	public void a_projection_checkpoint_event_is_published() {
+		AllWriteComplete();
+		Assert.AreEqual(
+			1,
+			_writeEventHandler.HandledMessages.Count(v =>
+				v.Events.Any(e => e.EventType == ProjectionEventTypes.ProjectionCheckpoint)));
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Stopped>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_projection_with_pending_writes_is_stopped.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_projection_with_pending_writes_is_stopped.cs
new file mode 100644
index 00000000000..a05752696aa
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_projection_with_pending_writes_is_stopped.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_the_projection_with_pending_writes_is_stopped<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	protected override void Given() {
+		_checkpointHandledThreshold = 2;
+		NoStream("$projections-projection-result");
+		NoStream("$projections-projection-order");
+		AllWritesToSucceed("$projections-projection-order");
+		NoStream("$projections-projection-checkpoint");
+		NoStream(FakeProjectionStateHandler._emit1StreamId);
+		AllWritesQueueUp();
+	}
+
+	protected override void When() {
+		//projection subscribes here
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
+					Guid.NewGuid(), "handle_this_type", false, "data1",
+					"metadata"), _subscriptionId, 0));
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(140, 130),
+					Guid.NewGuid(), "handle_this_type", false, "data2",
+					"metadata"), _subscriptionId, 1));
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(160, 150),
+					Guid.NewGuid(), "handle_this_type", false, "data3",
+					"metadata"), _subscriptionId, 2));
+		_coreProjection.Stop();
+	}
+
+	[Test]
+	public void a_projection_checkpoint_event_is_published() {
+		AllWriteComplete();
+		Assert.AreEqual(
+			1,
+			_writeEventHandler.HandledMessages.Count(v =>
+				v.Events.Any(e => e.EventType == ProjectionEventTypes.ProjectionCheckpoint)));
+	}
+
+	[Test]
+	public void other_events_are_not_written_after_the_checkpoint_write() {
+		AllWriteComplete();
+		var index =
+			_writeEventHandler.HandledMessages.FindIndex(
+				v => v.Events.Any(e => e.EventType == ProjectionEventTypes.ProjectionCheckpoint));
+		Assert.AreEqual(index + 1, _writeEventHandler.HandledMessages.Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_emit_an_event_the_projection_should.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_emit_an_event_the_projection_should.cs
new file mode 100644
index 00000000000..a5fd6744023
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_emit_an_event_the_projection_should.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_the_state_handler_does_emit_an_event_the_projection_should<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	private Guid _causingEventId;
+
+	protected override void Given() {
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	protected override void When() {
+		//projection subscribes here
+		_causingEventId = Guid.NewGuid();
+		var committedEventReceived =
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
+					_causingEventId, "no_state_emit1_type", false, "data",
+					"metadata"), _subscriptionId, 0);
+		_bus.Publish(committedEventReceived);
+	}
+
+	[Test]
+	public void write_the_emitted_event() {
+		Assert.IsTrue(
+			_writeEventHandler.HandledMessages.Any(
+				v => Helper.UTF8NoBom.GetString(v.Events[0].Data) == FakeProjectionStateHandler._emit1Data));
+	}
+
+	[Test]
+	public void set_a_caused_by_position_attributes() {
+		var metadata = _writeEventHandler.HandledMessages[0].Events[0].Metadata
+			.ParseCheckpointTagVersionExtraJson(default(ProjectionVersion));
+		Assert.AreEqual(120, metadata.Tag.CommitPosition);
+		Assert.AreEqual(110, metadata.Tag.PreparePosition);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_emit_multiple_interleaved_events_into_the_same_stream_the_projection_should.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_emit_multiple_interleaved_events_into_the_same_stream_the_projection_should.cs
new file mode 100644
index 00000000000..6fdf07d16a0
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_emit_multiple_interleaved_events_into_the_same_stream_the_projection_should.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_the_state_handler_does_emit_multiple_interleaved_events_into_the_same_stream_the_projection_should<TLogFormat, TStreamId> :
+		TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	protected override void Given() {
+		ExistingEvent(
+			"$projections-projection-result", "Result", @"{""c"": 100, ""p"": 50}", "{}");
+		ExistingEvent(
+			"$projections-projection-result", ProjectionEventTypes.ProjectionCheckpoint,
+			@"{""c"": 100, ""p"": 50}", "{}");
+		NoStream(FakeProjectionStateHandler._emit1StreamId);
+		NoStream(FakeProjectionStateHandler._emit2StreamId);
+	}
+
+	protected override void When() {
+		//projection subscribes here
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
+					Guid.NewGuid(), "emit212_type", false, "data",
+					"metadata"), _subscriptionId, 0));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_emit_multiple_subsequent_events_into_the_same_stream_the_projection_should.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_emit_multiple_subsequent_events_into_the_same_stream_the_projection_should.cs
new file mode 100644
index 00000000000..665ade2df9e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_emit_multiple_subsequent_events_into_the_same_stream_the_projection_should.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_the_state_handler_does_emit_multiple_subsequent_events_into_the_same_stream_the_projection_should<TLogFormat, TStreamId> :
+		TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	protected override void Given() {
+		ExistingEvent(
+			"$projections-projection-result", "Result", @"{""c"": 100, ""p"": 50}", "{}");
+		ExistingEvent(
+			"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
+			@"{""c"": 100, ""p"": 50}", "{}");
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	protected override void When() {
+		//projection subscribes here
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
+					Guid.NewGuid(), "emit22_type", false, "data",
+					"metadata"), _subscriptionId, 0));
+	}
+
+
+	[Test]
+	public void write_events_in_a_single_transaction() {
+		Assert.IsTrue(_writeEventHandler.HandledMessages.Any(v => v.Events.Length == 2));
+	}
+
+	[Test]
+	public void write_all_the_emitted_events() {
+		Assert.AreEqual(
+			2, _writeEventHandler.HandledMessages.Single(v => v.EventStreamId == "/emit2").Events.Length);
+	}
+
+	[Test]
+	public void write_events_in_correct_order() {
+		Assert.AreEqual(
+			FakeProjectionStateHandler._emit1Data,
+			Helper.UTF8NoBom.GetString(
+				_writeEventHandler.HandledMessages.Single(v => v.EventStreamId == "/emit2").Events[0].Data));
+		Assert.AreEqual(
+			FakeProjectionStateHandler._emit2Data,
+			Helper.UTF8NoBom.GetString(
+				_writeEventHandler.HandledMessages.Single(v => v.EventStreamId == "/emit2").Events[1].Data));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_not_process_event_the_projection_should.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_not_process_event_the_projection_should.cs
new file mode 100644
index 00000000000..5c3af8d8c99
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_not_process_event_the_projection_should.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_the_state_handler_does_not_process_event_the_projection_should<TLogFormat, TStreamId> :
+	TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	protected override void Given() {
+		ExistingEvent(
+			"$projections-projection-result", "Result", @"{""c"": 100, ""p"": 50}", "{}");
+		ExistingEvent(
+			"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
+			@"{""c"": 100, ""p"": 50}", "{}");
+	}
+
+	protected override void When() {
+		//projection subscribes here
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
+					new TFPos(120, 110),
+					Guid.NewGuid(), "skip_this_type", false, new byte[0], new byte[0], null, null,
+					default(DateTime)),
+				_subscriptionId, 0));
+	}
+
+	[Test]
+	public void not_update_state_snapshot() {
+		Assert.AreEqual(0, _writeEventHandler.HandledMessages.Count);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_process_an_event_the_projection_should.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_process_an_event_the_projection_should.cs
new file mode 100644
index 00000000000..95ebcb1c3d7
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_does_process_an_event_the_projection_should.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_the_state_handler_does_process_an_event_the_projection_should<TLogFormat, TStreamId> :
+	TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	protected override void Given() {
+		ExistingEvent(
+			"$projections-projection-result", "Result", @"{""c"": 100, ""p"": 50}", "{}");
+		ExistingEvent(
+			"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
+			@"{""c"": 100, ""p"": 50}", "{}");
+		NoStream("$projections-projection-order");
+		AllWritesToSucceed("$projections-projection-order");
+	}
+
+	protected override void When() {
+		//projection subscribes here
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
+					Guid.NewGuid(), "handle_this_type", false, "data",
+					"metadata"), _subscriptionId, 0));
+	}
+
+	[Test]
+	public void write_the_new_state_snapshot() {
+		Assert.AreEqual(1, _writeEventHandler.HandledMessages.OfEventType("Result").Count);
+
+		var data = Helper.UTF8NoBom.GetString(_writeEventHandler.HandledMessages.OfEventType("Result")[0].Data);
+		Assert.AreEqual("data", data);
+	}
+
+	[Test]
+	public void emit_a_state_updated_event() {
+		Assert.AreEqual(1, _writeEventHandler.HandledMessages.OfEventType("Result").Count);
+
+		var @event = _writeEventHandler.HandledMessages.OfEventType("Result")[0];
+		Assert.AreEqual("Result", @event.EventType);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_fails_to_load_state_the_projection_should.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_fails_to_load_state_the_projection_should.cs
new file mode 100644
index 00000000000..f31f4226384
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_fails_to_load_state_the_projection_should.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_the_state_handler_fails_to_load_state_the_projection_should<TLogFormat, TStreamId> : TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	protected override void Given() {
+		ExistingEvent(
+			"$projections-projection-result", "Result", @"{""c"": 100, ""p"": 50}", "{}");
+		ExistingEvent(
+			"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
+			@"{""c"": 100, ""p"": 50}", "{}");
+		NoStream("$projections-projection-order");
+		AllWritesToSucceed("$projections-projection-order");
+	}
+
+	protected override FakeProjectionStateHandler GivenProjectionStateHandler() {
+		return new FakeProjectionStateHandler(failOnLoad: true);
+	}
+
+	protected override void When() {
+		//projection subscribes here
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
+					Guid.NewGuid(), "handle_this_type", false, "data",
+					"metadata"), _subscriptionId, 0));
+	}
+
+	[Test]
+	public void should_publish_faulted_message() {
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Faulted>().Count());
+	}
+
+	[Test]
+	public void not_emit_a_state_updated_event() {
+		Assert.AreEqual(0, _writeEventHandler.HandledMessages.OfEventType("StateUpdate").Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_fails_to_process_an_event_the_projection_should.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_fails_to_process_an_event_the_projection_should.cs
new file mode 100644
index 00000000000..e8a4512352c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_fails_to_process_an_event_the_projection_should.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_the_state_handler_fails_to_process_an_event_the_projection_should<TLogFormat, TStreamId> :
+	TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	protected override void Given() {
+		ExistingEvent(
+			"$projections-projection-result", "Result", @"{""c"": 100, ""p"": 50}", "{}");
+		ExistingEvent(
+			"$projections-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
+			@"{""c"": 100, ""p"": 50}", "{}");
+		NoStream("$projections-projection-order");
+		AllWritesToSucceed("$projections-projection-order");
+	}
+
+	protected override FakeProjectionStateHandler GivenProjectionStateHandler() {
+		return new FakeProjectionStateHandler(failOnProcessEvent: true);
+	}
+
+	protected override void When() {
+		//projection subscribes here
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
+					Guid.NewGuid(), "handle_this_type", false, "data",
+					"metadata"), _subscriptionId, 0));
+	}
+
+	[Test]
+	public void should_publish_faulted_message() {
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Faulted>().Count());
+	}
+
+	[Test]
+	public void not_emit_a_state_updated_event() {
+		Assert.AreEqual(0, _writeEventHandler.HandledMessages.OfEventType("Result").Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_with_configured_state_stream_does_process_an_event_the_projection_should.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_with_configured_state_stream_does_process_an_event_the_projection_should.cs
new file mode 100644
index 00000000000..bd660c06eaa
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_the_state_handler_with_configured_state_stream_does_process_an_event_the_projection_should.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_the_state_handler_with_configured_state_stream_does_process_an_event_the_projection_should<TLogFormat, TStreamId> :
+	TestFixtureWithCoreProjectionStarted<TLogFormat, TStreamId> {
+	protected override void Given() {
+		_configureBuilderByQuerySource = source => {
+			source.FromAll();
+			source.AllEvents();
+			source.SetResultStreamNameOption("state-stream");
+			source.SetDefinesStateTransform();
+			source.SetOutputState();
+		};
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	protected override void When() {
+		//projection subscribes here
+		_bus.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.Sample(
+				new ResolvedEvent(
+					"/event_category/1", -1, "/event_category/1", -1, false, new TFPos(120, 110),
+					Guid.NewGuid(), "handle_this_type", false, "data",
+					"metadata"), _subscriptionId, 0));
+	}
+
+	[Test]
+	public void write_the_new_state_snapshot() {
+		Assert.AreEqual(1, _writeEventHandler.HandledMessages.ToStream("state-stream").Count);
+
+		var message = _writeEventHandler.HandledMessages.ToStream("state-stream")[0];
+		var data = Helper.UTF8NoBom.GetString(message.Events[0].Data);
+		Assert.AreEqual("data", data);
+		Assert.AreEqual("state-stream", message.EventStreamId);
+	}
+
+	[Test]
+	public void emit_a_state_updated_event() {
+		Assert.AreEqual(1, _writeEventHandler.HandledMessages.ToStream("state-stream").Count);
+
+		var @event = _writeEventHandler.HandledMessages.ToStream("state-stream")[0].Events[0];
+		Assert.AreEqual("Result", @event.EventType);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_writing_projection_persisted_state_races_with_stream_deletion.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_writing_projection_persisted_state_races_with_stream_deletion.cs
new file mode 100644
index 00000000000..0fd5e77c233
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_projection/when_writing_projection_persisted_state_races_with_stream_deletion.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Tests.Services.projections_manager;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_projection;
+
+/**
+ * tests whether race condition exists or not; currently deleting a projection involves following operations
+ * 1. Deleting projection "sub-streams" (checkpoint, emitted, etc. streams)
+ * 2. Writing new projection persisted state to $projection-<projection_name> stream
+ *
+ * steps 1 and 2 are independent and gives rise to race condition :
+ * * if step 2 completes after step 1, multiple ProjectionManagement.Internal.Deleted events will be published
+ * * in addition, if step 2 completes shortly after step 1, WrongExpectedVersion will be encountered
+ */
+
+public static class when_writing_projection_persisted_state_races_with_stream_deletion {
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_projection_persisted_state_write_races_with_projections_substream_deletion<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+		private const string _projectionName = "my-projection";
+
+		protected override void Given() {
+			base.Given();
+			NoOtherStreams();
+			AllWritesSucceed();
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+			yield return
+				(new ProjectionManagementMessage.Command.Post(
+					_bus, ProjectionMode.Continuous, _projectionName,
+					ProjectionManagementMessage.RunAs.System, "native:" + typeof(FakeProjection).AssemblyQualifiedName,
+					@"", enabled: true, checkpointsEnabled: true,
+					emitEnabled: false, trackEmittedStreams: false));
+			yield return
+				new ProjectionManagementMessage.Command.Disable(_bus, _projectionName, ProjectionManagementMessage.RunAs.System);
+			yield return new ProjectionManagementMessage.Command.Delete(new NoopEnvelope(), _projectionName, ProjectionManagementMessage.RunAs.System,
+				true, false, false);
+		}
+
+		[Test]
+		public void should_publish_single_projection_deleted_event() {
+			Assert.AreEqual(
+				1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Internal.Deleted>().Count());
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_service/when_a_subscribed_projection_handler_throws.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_service/when_a_subscribed_projection_handler_throws.cs
new file mode 100644
index 00000000000..a898577034f
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_service/when_a_subscribed_projection_handler_throws.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+using KurrentDB.Projections.Core.Tests.Services.event_reader.heading_event_reader;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_service;
+
+[TestFixture]
+public class when_a_subscribed_projection_handler_throws : TestFixtureWithProjectionCoreService {
+	[SetUp]
+	public new void Setup() {
+		var readerStrategy = new FakeReaderStrategy();
+		var projectionCorrelationId = Guid.NewGuid();
+		_readerService.Handle(
+			new ReaderSubscriptionManagement.Subscribe(
+				projectionCorrelationId, CheckpointTag.FromPosition(0, 0, 0), readerStrategy,
+				new ReaderSubscriptionOptions(1000, 2000, 10000, false, stopAfterNEvents: null, true)));
+		_readerService.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				readerStrategy.EventReaderId, new TFPos(20, 10), "throws", 10, false, Guid.NewGuid(),
+				"type", false, new byte[0], new byte[0]));
+	}
+
+	[Test]
+	public void projection_is_notified_that_it_is_to_fault() {
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.Failed>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/core_service/when_unsubscribing_a_subscribed_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/core_service/when_unsubscribing_a_subscribed_projection.cs
new file mode 100644
index 00000000000..4c7e2410b1e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/core_service/when_unsubscribing_a_subscribed_projection.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.core_service;
+
+[TestFixture]
+public class when_unsubscribing_a_subscribed_projection : TestFixtureWithProjectionCoreService {
+	private TestCoreProjection _committedeventHandler;
+	private Guid _projectionCorrelationId;
+
+	//private TestCoreProjection _committedeventHandler2;
+	private Guid _projectionCorrelationId2;
+
+	[SetUp]
+	public new void Setup() {
+		_committedeventHandler = new TestCoreProjection();
+		//_committedeventHandler2 = new TestCoreProjection();
+		_projectionCorrelationId = Guid.NewGuid();
+		_projectionCorrelationId2 = Guid.NewGuid();
+		_readerService.Handle(
+			new ReaderSubscriptionManagement.Subscribe(
+				_projectionCorrelationId, CheckpointTag.FromPosition(0, 0, 0), CreateReaderStrategy(),
+				new ReaderSubscriptionOptions(1000, 2000, 10000, false, stopAfterNEvents: null, enableContentTypeValidation: true)));
+		_readerService.Handle(
+			new ReaderSubscriptionManagement.Subscribe(
+				_projectionCorrelationId2, CheckpointTag.FromPosition(0, 0, 0), CreateReaderStrategy(),
+				new ReaderSubscriptionOptions(1000, 2000, 10000, false, stopAfterNEvents: null, enableContentTypeValidation: true)));
+		// when
+		_readerService.Handle(new ReaderSubscriptionManagement.Unsubscribe(_projectionCorrelationId));
+	}
+
+	[Test]
+	public void committed_events_are_no_longer_distributed_to_the_projection() {
+		_readerService.Handle(
+			new ReaderSubscriptionMessage.CommittedEventDistributed(_projectionCorrelationId, CreateEvent()));
+		Assert.AreEqual(0, _committedeventHandler.HandledMessages.Count);
+	}
+
+	[Test]
+	public void the_projection_cannot_be_resumed() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_readerService.Handle(new ReaderSubscriptionManagement.Resume(_projectionCorrelationId));
+			_readerService.Handle(
+				new ReaderSubscriptionMessage.CommittedEventDistributed(_projectionCorrelationId, CreateEvent()));
+			Assert.AreEqual(0, _committedeventHandler.HandledMessages.Count);
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/a_checkpoint_requested_on_a_non_started_stream.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/a_checkpoint_requested_on_a_non_started_stream.cs
new file mode 100644
index 00000000000..81fceabbefa
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/a_checkpoint_requested_on_a_non_started_stream.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture]
+public class a_checkpoint_requested_on_a_non_started_stream : TestFixtureWithReadWriteDispatchers {
+	private EmittedStream _stream;
+
+	private TestCheckpointManagerMessageHandler _readyHandler;
+	private Exception _caughtException;
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		;
+		_stream = new EmittedStream(
+			"test",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50), new ProjectionVersion(1, 0, 0),
+			new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _bus, _ioDispatcher,
+			_readyHandler);
+		try {
+			_stream.Checkpoint();
+		} catch (Exception ex) {
+			_caughtException = ex;
+		}
+	}
+
+	[Test]
+	public void throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => {
+			if (_caughtException != null)
+				throw _caughtException;
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/another_epoch/when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/another_epoch/when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream.cs
new file mode 100644
index 00000000000..31d9adbf244
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/another_epoch/when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream.cs
@@ -0,0 +1,107 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream.another_epoch;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	protected override void Given() {
+		ExistingEvent("test_stream", "type", @"{""v"": 1, ""c"": 100, ""p"": 50}", "data");
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_stream = new EmittedStream(
+			"test_stream",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
+			new ProjectionVersion(1, 2, 2), new TransactionFilePositionTagger(0),
+			CheckpointTag.FromPosition(0, 0, -1),
+			_bus, _ioDispatcher, _readyHandler);
+		_stream.Start();
+	}
+
+	[Test]
+	public void requests_restart_if_different_smaller_tag() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 100, 50), CheckpointTag.FromPosition(0, 40, 20))
+			});
+		Assert.AreEqual(
+			0,
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
+				.ExceptOfEventType(SystemEventTypes.StreamMetadata)
+				.Count());
+		Assert.AreEqual(1, _readyHandler.HandledRestartRequestedMessages.Count());
+	}
+
+	[Test]
+	public void publishes_all_events_even_with_smaller_tag() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 40, 20), null)
+			});
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
+				.ExceptOfEventType(SystemEventTypes.StreamMetadata)
+				.Count());
+	}
+
+	[Test]
+	public void requests_restart_even_if_expected_tag_is_the_same_but_epoch() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 200, 150), CheckpointTag.FromPosition(0, 100, 50))
+			});
+		Assert.AreEqual(
+			0,
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
+				.ExceptOfEventType(SystemEventTypes.StreamMetadata)
+				.Count());
+		Assert.AreEqual(1, _readyHandler.HandledRestartRequestedMessages.Count());
+	}
+
+	[Test]
+	public void metadata_include_correct_version() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 200, 150), null)
+			});
+		var metaData =
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
+				.OfEventType("type")
+				.Single()
+				.Metadata.ParseCheckpointTagVersionExtraJson(default(ProjectionVersion));
+		Assert.AreEqual(new ProjectionVersion(1, 2, 2), metaData.Version);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/another_epoch/when_handling_emits_with_previously_written_events_at_the_same_position.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/another_epoch/when_handling_emits_with_previously_written_events_at_the_same_position.cs
new file mode 100644
index 00000000000..dc8db6178be
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/another_epoch/when_handling_emits_with_previously_written_events_at_the_same_position.cs
@@ -0,0 +1,110 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream.another_epoch;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_handling_emits_with_previously_written_events_at_the_same_position<TLogFormat, TStreamId> : core_projection.TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+	private long _1;
+	private long _2;
+	private long _3;
+
+	protected override void Given() {
+		AllWritesQueueUp();
+		AllWritesToSucceed("$$test_stream");
+		//NOTE: it is possible for a batch of events to be partially written if it contains links
+		ExistingEvent("test_stream", "type1", @"{""v"": 1, ""c"": 100, ""p"": 50}", "data");
+		ExistingEvent("test_stream", "type2", @"{""v"": 1, ""c"": 100, ""p"": 50}", "data");
+		NoOtherStreams();
+	}
+
+	private EmittedEvent[] CreateEventBatch() {
+		return new EmittedEvent[] {
+			new EmittedDataEvent(
+				(string)"test_stream", Guid.NewGuid(), (string)"type1", (bool)true,
+				(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
+				v => _1 = v),
+			new EmittedDataEvent(
+				(string)"test_stream", Guid.NewGuid(), (string)"type2", (bool)true,
+				(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
+				v => _2 = v),
+			new EmittedDataEvent(
+				(string)"test_stream", Guid.NewGuid(), (string)"type3", (bool)true,
+				(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
+				v => _3 = v)
+		};
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_stream = new EmittedStream(
+			"test_stream",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
+			new ProjectionVersion(1, 2, 2), new TransactionFilePositionTagger(0),
+			CheckpointTag.FromPosition(0, 100, 50),
+			_bus, _ioDispatcher, _readyHandler);
+		_stream.Start();
+		_stream.EmitEvents(CreateEventBatch());
+		OneWriteCompletes();
+	}
+
+	[Test]
+	public void truncates_existing_stream_at_correct_position() {
+		var writes =
+			HandledMessages.OfType<ClientMessage.WriteEvents>()
+				.OfEventType(SystemEventTypes.StreamMetadata)
+				.ToArray();
+		Assert.AreEqual(1, writes.Length);
+		HelperExtensions.AssertJson(new { ___tb = 2 }, writes[0].Data.ParseJson<JObject>());
+	}
+
+	[Test]
+	public void publishes_all_events() {
+		var writtenEvents =
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
+				.ExceptOfEventType(SystemEventTypes.StreamMetadata)
+				.ToArray();
+		Assert.AreEqual(3, writtenEvents.Length);
+		Assert.AreEqual("type1", writtenEvents[0].EventType);
+		Assert.AreEqual("type2", writtenEvents[1].EventType);
+		Assert.AreEqual("type3", writtenEvents[2].EventType);
+	}
+
+	[Test]
+	public void updates_stream_metadata() {
+		var writes =
+			HandledMessages.OfType<ClientMessage.WriteEvents>()
+				.OfEventType(SystemEventTypes.StreamMetadata)
+				.ToArray();
+		Assert.AreEqual(1, writes.Length);
+	}
+
+	[Test]
+	public void reports_correct_event_numbers() {
+		Assert.AreEqual(2, _1);
+		Assert.AreEqual(3, _2);
+		Assert.AreEqual(4, _3);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/another_epoch/when_handling_emits_with_previously_written_events_in_different_epochs.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/another_epoch/when_handling_emits_with_previously_written_events_in_different_epochs.cs
new file mode 100644
index 00000000000..9c88384493a
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/another_epoch/when_handling_emits_with_previously_written_events_in_different_epochs.cs
@@ -0,0 +1,93 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream.another_epoch;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_handling_emits_with_previously_written_events_in_different_epochs<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+	private long _1;
+	private long _2;
+	private long _3;
+
+	protected override void Given() {
+		AllWritesQueueUp();
+		//NOTE: it is possible for a batch of events to be partially written if it contains links
+		ExistingEvent("test_stream", "type1", @"{""v"": 1, ""c"": 100, ""p"": 50}", "data");
+		ExistingEvent("test_stream", "type1", @"{""v"": 2, ""c"": 100, ""p"": 50}", "data");
+	}
+
+	private EmittedEvent[] CreateEventBatch() {
+		return new EmittedEvent[] {
+			new EmittedDataEvent(
+				(string)"test_stream", Guid.NewGuid(), (string)"type1", (bool)true,
+				(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
+				v => _1 = v),
+			new EmittedDataEvent(
+				(string)"test_stream", Guid.NewGuid(), (string)"type2", (bool)true,
+				(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
+				v => _2 = v),
+			new EmittedDataEvent(
+				(string)"test_stream", Guid.NewGuid(), (string)"type3", (bool)true,
+				(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
+				v => _3 = v)
+		};
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_stream = new EmittedStream(
+			"test_stream",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
+			new ProjectionVersion(1, 2, 2), new TransactionFilePositionTagger(0),
+			CheckpointTag.FromPosition(0, 20, 10),
+			_bus, _ioDispatcher, _readyHandler);
+		_stream.Start();
+		_stream.EmitEvents(CreateEventBatch());
+		OneWriteCompletes();
+	}
+
+	[Test]
+	public void publishes_all_events() {
+		var writtenEvents =
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().SelectMany(v => v.Events).ToArray();
+		Assert.AreEqual(2, writtenEvents.Length);
+		Assert.AreEqual("type2", writtenEvents[0].EventType);
+		Assert.AreEqual("type3", writtenEvents[1].EventType);
+	}
+
+	[Test]
+	public void updates_stream_metadata() {
+		var writes =
+			HandledMessages.OfType<ClientMessage.WriteEvents>()
+				.OfEventType(SystemEventTypes.StreamMetadata)
+				.ToArray();
+		Assert.AreEqual(0, writes.Length);
+	}
+
+
+	[Test]
+	public void reports_correct_event_numbers() {
+		Assert.AreEqual(1, _1);
+		Assert.AreEqual(2, _2);
+		Assert.AreEqual(3, _3);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/another_projection/when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/another_projection/when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream.cs
new file mode 100644
index 00000000000..bce9ce6e261
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/another_projection/when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream.another_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	protected override void Given() {
+		ExistingEvent("test_stream", "type", @"{""v"": ""2:3:4"", ""c"": 100, ""p"": 50}", "data");
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_stream = new EmittedStream(
+			"test_stream",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
+			new ProjectionVersion(1, 2, 2), new TransactionFilePositionTagger(0),
+			CheckpointTag.FromPosition(0, 0, -1),
+			_bus, _ioDispatcher, _readyHandler);
+		_stream.Start();
+	}
+
+	[Test]
+	public void fails_the_projection() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 100, 50), CheckpointTag.FromPosition(0, 40, 20))
+			});
+		Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
+		Assert.AreEqual(1, _readyHandler.HandledFailedMessages.Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_a_read_completes_before_a_timeout_in_recovery.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_a_read_completes_before_a_timeout_in_recovery.cs
new file mode 100644
index 00000000000..2e31cddbacd
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_a_read_completes_before_a_timeout_in_recovery.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_a_read_completes_before_a_timeout_in_recovery<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private const string TestStreamId = "test_stream";
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+	private List<TimerMessage.Schedule> timerMessages = new();
+
+	protected override void Given() {
+		AllWritesQueueUp();
+		ExistingEvent(TestStreamId, "type", @"{""c"": 100, ""p"": 50}", "data");
+		ReadsBackwardQueuesUp();
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_bus.Subscribe(new AdHocHandler<TimerMessage.Schedule>(msg => timerMessages.Add(msg)));
+
+		_stream = new EmittedStream(
+			TestStreamId,
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
+			new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
+			CheckpointTag.FromPosition(0, 40, 30),
+			_bus, _ioDispatcher, _readyHandler);
+		_stream.Start();
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					TestStreamId, Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 200, 150), null)
+			});
+		CompleteOneReadBackwards();
+	}
+
+	[Test]
+	public void should_not_retry_the_read_upon_the_read_timing_out() {
+		var timerMessage = timerMessages.FirstOrDefault();
+		Assert.NotNull(timerMessage,
+			$"Expected a {nameof(TimerMessage.Schedule)} to have been published, but none were received");
+		timerMessage.Reply();
+
+		var readEventsBackwards = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsBackward>()
+			.Where(x => x.EventStreamId == TestStreamId);
+
+		Assert.AreEqual(1, readEventsBackwards.Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_a_read_times_out_in_recovery.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_a_read_times_out_in_recovery.cs
new file mode 100644
index 00000000000..e1506c9a29f
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_a_read_times_out_in_recovery.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_a_read_times_out_in_recovery<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private const string TestStreamId = "test_stream";
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+	private List<TimerMessage.Schedule> timerMessages = new();
+
+	protected override void Given() {
+		AllWritesQueueUp();
+		ExistingEvent(TestStreamId, "type", @"{""c"": 100, ""p"": 50}", "data");
+		ReadsBackwardQueuesUp();
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_bus.Subscribe(new AdHocHandler<TimerMessage.Schedule>(msg => timerMessages.Add(msg)));
+
+		_stream = new EmittedStream(
+			TestStreamId,
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
+			new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
+			CheckpointTag.FromPosition(0, 40, 30),
+			_bus, _ioDispatcher, _readyHandler);
+		_stream.Start();
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					TestStreamId, Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 200, 150), null)
+			});
+	}
+
+	[Test]
+	public void should_retry_the_read_upon_the_read_timing_out() {
+		var timerMessage = timerMessages.FirstOrDefault();
+		Assert.NotNull(timerMessage,
+			$"Expected a {nameof(TimerMessage.Schedule)} to have been published, but none were received");
+
+		timerMessage.Reply();
+
+		var readEventsBackwards = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsBackward>()
+						.Where(x => x.EventStreamId == TestStreamId).ToArray();
+		Assert.AreEqual(2, readEventsBackwards.Length);
+		Assert.AreEqual(readEventsBackwards[0].FromEventNumber, readEventsBackwards[1].FromEventNumber);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested.cs
new file mode 100644
index 00000000000..14f37ce3013
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture]
+public class when_checkpoint_requested : TestFixtureWithReadWriteDispatchers {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		;
+		_stream = new EmittedStream(
+			"test",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50), new ProjectionVersion(1, 0, 0),
+			new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _bus, _ioDispatcher,
+			_readyHandler);
+		_stream.Start();
+		_stream.Checkpoint();
+	}
+
+	[Test]
+	public void emit_events_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_stream.EmitEvents(
+				new[] {
+					new EmittedDataEvent(
+						"test", Guid.NewGuid(), "type2", true, "data2", null, CheckpointTag.FromPosition(0, -1, -1),
+						null)
+				});
+		});
+	}
+
+	[Test]
+	public void checkpoint_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => { _stream.Checkpoint(); });
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested_but_disabled.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested_but_disabled.cs
new file mode 100644
index 00000000000..1b50d0f5e2f
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested_but_disabled.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture]
+public class when_checkpoint_requested_but_disabled : TestFixtureWithReadWriteDispatchers {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+	private Exception _exception;
+
+	[SetUp]
+	public void setup() {
+		_exception = null;
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_stream = new EmittedStream(
+			"test",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50), new ProjectionVersion(1, 0, 0),
+			new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _bus, _ioDispatcher,
+			_readyHandler,
+			noCheckpoints: true);
+		_stream.Start();
+		try {
+			_stream.Checkpoint();
+		} catch (Exception ex) {
+			_exception = ex;
+		}
+	}
+
+	[Test]
+	public void invalid_operation_exceptioon_is_thrown() {
+		Assert.IsNotNull(_exception);
+		Assert.IsInstanceOf<InvalidOperationException>(_exception);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested_with_all_writes_already_completed.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested_with_all_writes_already_completed.cs
new file mode 100644
index 00000000000..fdd0b679ca4
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested_with_all_writes_already_completed.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_checkpoint_requested_with_all_writes_already_completed<TLogFormat, TStreamId> : core_projection.TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	protected override void Given() {
+		base.Given();
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	[SetUp]
+	public void Setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_stream = new EmittedStream(
+			"test",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50), new ProjectionVersion(1, 0, 0),
+			new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _bus, _ioDispatcher,
+			_readyHandler);
+		_stream.Start();
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test", Guid.NewGuid(), "type", true, "data", null, CheckpointTag.FromPosition(0, 10, 5), null)
+			});
+		var msg = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().First();
+		_bus.Publish(new ClientMessage.WriteEventsCompleted(msg.CorrelationId, 0, 0, -1, -1));
+		_stream.Checkpoint();
+	}
+
+	[Test]
+	public void publishes_ready_for_checkpoint() {
+		Assert.IsTrue(
+			_readyHandler.HandledMessages.ContainsSingle<CoreProjectionProcessingMessage.ReadyForCheckpoint>());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested_with_pending_writes.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested_with_pending_writes.cs
new file mode 100644
index 00000000000..27384d098a7
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_checkpoint_requested_with_pending_writes.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_checkpoint_requested_with_pending_writes<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	protected override void Given() {
+		base.Given();
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		;
+		_stream = new EmittedStream(
+			"test",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50), new ProjectionVersion(1, 0, 0),
+			new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _bus, _ioDispatcher,
+			_readyHandler);
+		_stream.Start();
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test", Guid.NewGuid(), "type", true, "data", null, CheckpointTag.FromPosition(0, 100, 50),
+					null)
+			});
+		_stream.Checkpoint();
+	}
+
+	[Test]
+	public void does_not_publish_ready_for_checkpoint_immediately() {
+		Assert.AreEqual(
+			0, _consumer.HandledMessages.OfType<CoreProjectionProcessingMessage.ReadyForCheckpoint>().Count());
+	}
+
+	[Test]
+	public void publishes_ready_for_checkpoint_on_handling_last_write_events_completed() {
+		var msg = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().First();
+		_bus.Publish(new ClientMessage.WriteEventsCompleted(msg.CorrelationId, 0, 0, -1, -1));
+		Assert.AreEqual(
+			1, _readyHandler.HandledMessages.OfType<CoreProjectionProcessingMessage.ReadyForCheckpoint>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_creating_an_emitted_stream.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_creating_an_emitted_stream.cs
new file mode 100644
index 00000000000..31825af4768
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_creating_an_emitted_stream.cs
@@ -0,0 +1,129 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture]
+public class when_creating_an_emitted_stream {
+	private FakePublisher _fakePublisher;
+	private IODispatcher _ioDispatcher;
+
+
+	[SetUp]
+	public void setup() {
+		_fakePublisher = new FakePublisher();
+		_ioDispatcher = new IODispatcher(_fakePublisher, _fakePublisher, true);
+	}
+
+	[Test]
+	public void null_stream_id_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			new EmittedStream(
+				null,
+				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+					new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50),
+				new ProjectionVersion(1, 0, 0),
+				new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _fakePublisher,
+				_ioDispatcher,
+				new TestCheckpointManagerMessageHandler());
+		});
+	}
+
+	[Test]
+	public void null_writer_configuration_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			new EmittedStream(
+				null, null, new ProjectionVersion(1, 0, 0),
+				new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _fakePublisher,
+				_ioDispatcher,
+				new TestCheckpointManagerMessageHandler());
+		});
+	}
+
+	[Test]
+	public void empty_stream_id_throws_argument_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			new EmittedStream(
+				"",
+				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+					new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50),
+				new ProjectionVersion(1, 0, 0),
+				new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _fakePublisher,
+				_ioDispatcher,
+				new TestCheckpointManagerMessageHandler());
+		});
+	}
+
+	[Test]
+	public void null_from_throws_argument_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			new EmittedStream(
+				"",
+				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+					new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50),
+				new ProjectionVersion(1, 0, 0),
+				new TransactionFilePositionTagger(0), null, _fakePublisher, _ioDispatcher,
+				new TestCheckpointManagerMessageHandler());
+		});
+	}
+
+	[Test]
+	public void null_publisher_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			new EmittedStream(
+				"test",
+				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+					new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50),
+				new ProjectionVersion(1, 0, 0),
+				new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), null, _ioDispatcher,
+				new TestCheckpointManagerMessageHandler());
+		});
+	}
+
+	[Test]
+	public void null_io_dispatcher_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			new EmittedStream(
+				"test",
+				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+					new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50),
+				new ProjectionVersion(1, 0, 0),
+				new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _fakePublisher, null,
+				new TestCheckpointManagerMessageHandler());
+		});
+	}
+
+	[Test]
+	public void null_ready_handler_throws_argumenbt_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			new EmittedStream(
+				"test",
+				new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+					new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50),
+				new ProjectionVersion(1, 0, 0),
+				new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _fakePublisher,
+				_ioDispatcher, null);
+		});
+	}
+
+	[Test]
+	public void it_can_be_created() {
+		new EmittedStream(
+			"test",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50), new ProjectionVersion(1, 0, 0),
+			new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _fakePublisher,
+			_ioDispatcher,
+			new TestCheckpointManagerMessageHandler());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_a_timeout.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_a_timeout.cs
new file mode 100644
index 00000000000..efd389f58b2
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_a_timeout.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_a_timeout<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	protected override void Given() {
+		AllWritesQueueUp();
+		ExistingEvent("test_stream", "type1", @"{""v"": 1, ""c"": 100, ""p"": 50}", "data");
+		ExistingEvent("test_stream", "type1", @"{""v"": 2, ""c"": 100, ""p"": 50}", "data");
+	}
+
+	private EmittedEvent[] CreateEventBatch() {
+		return new EmittedEvent[] {
+			new EmittedDataEvent(
+				(string)"test_stream", Guid.NewGuid(), (string)"type1", (bool)true,
+				(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
+				null),
+			new EmittedDataEvent(
+				(string)"test_stream", Guid.NewGuid(), (string)"type2", (bool)true,
+				(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
+				null),
+			new EmittedDataEvent(
+				(string)"test_stream", Guid.NewGuid(), (string)"type3", (bool)true,
+				(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
+				null)
+		};
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_stream = new EmittedStream(
+			"test_stream",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
+			new ProjectionVersion(1, 2, 2), new TransactionFilePositionTagger(0), CheckpointTag.Empty,
+			_bus, _ioDispatcher, _readyHandler);
+		_stream.Start();
+		_stream.EmitEvents(CreateEventBatch());
+
+		CompleteWriteWithResult(OperationResult.CommitTimeout);
+	}
+
+	[Test]
+	public void should_retry_the_write_with_the_same_events() {
+		var current = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Last();
+		while (_consumer.HandledMessages.Last().GetType() ==
+			   typeof(TimerMessage.Schedule)) {
+			var message =
+				_consumer.HandledMessages.Last() as TimerMessage.Schedule;
+			message.Envelope.ReplyWith(message.ReplyMessage);
+
+			CompleteWriteWithResult(OperationResult.CommitTimeout);
+
+			var last = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Last();
+
+			Assert.AreEqual(current.EventStreamId, last.EventStreamId);
+			Assert.AreEqual(current.Events, last.Events);
+
+			current = last;
+		}
+
+		Assert.AreEqual(1,
+			_readyHandler.HandledFailedMessages.OfType<CoreProjectionProcessingMessage.Failed>().Count(),
+			"Should fail the projection after exhausting all the write retries");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_the_not_started_stream.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_the_not_started_stream.cs
new file mode 100644
index 00000000000..a5b8c0f22e8
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_the_not_started_stream.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_an_emit_the_not_started_stream<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private EmittedStream _stream;
+
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	protected override void Given() {
+		base.Given();
+		NoStream("test");
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		;
+		_stream = new EmittedStream(
+			"test",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50), new ProjectionVersion(1, 0, 0),
+			new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _bus, _ioDispatcher,
+			_readyHandler);
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test", Guid.NewGuid(), "type", true, "data", null, CheckpointTag.FromPosition(0, 200, 150),
+					null)
+			});
+	}
+
+	[Test]
+	public void does_not_publish_write_events() {
+		Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
+	}
+
+	[Test]
+	public void publishes_write_events_when_started() {
+		_stream.Start();
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_the_started_in_recovery_stream.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_the_started_in_recovery_stream.cs
new file mode 100644
index 00000000000..4666c426934
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_the_started_in_recovery_stream.cs
@@ -0,0 +1,99 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_an_emit_the_started_in_recovery_stream<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	protected override void Given() {
+		AllWritesQueueUp();
+		ExistingEvent("test_stream", "type", @"{""c"": 100, ""p"": 50}", "data");
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_stream = new EmittedStream(
+			"test_stream",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
+			new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
+			CheckpointTag.FromPosition(0, 40, 30),
+			_bus, _ioDispatcher, _readyHandler);
+		_stream.Start();
+	}
+
+	[Test]
+	public void throws_if_position_is_prior_to_from_position() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_stream.EmitEvents(
+				new[] {
+					new EmittedDataEvent(
+						"test_stream", Guid.NewGuid(), "type", true, "data", null,
+						CheckpointTag.FromPosition(0, 20, 10), null)
+				});
+		});
+	}
+
+	[Test]
+	public void does_not_publish_already_published_events() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 100, 50), null)
+			});
+		Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
+	}
+
+	[Test]
+	public void publishes_not_yet_published_events() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 200, 150), null)
+			});
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
+	}
+
+	[Test]
+	public void does_not_reply_with_write_completed_message() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 200, 150), null)
+			});
+		Assert.AreEqual(0, _readyHandler.HandledWriteCompletedMessage.Count);
+	}
+
+	[Test]
+	public void reply_with_write_completed_message_when_write_completes() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 200, 150), null)
+			});
+		OneWriteCompletes();
+		Assert.IsTrue(_readyHandler.HandledWriteCompletedMessage.Any(v => v.StreamId == "test_stream"));
+		// more than one is ok
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_to_the_nonexisting_stream.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_to_the_nonexisting_stream.cs
new file mode 100644
index 00000000000..daf5afe89e4
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_to_the_nonexisting_stream.cs
@@ -0,0 +1,109 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_an_emit_to_the_nonexisting_stream<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	protected override void Given() {
+		AllWritesQueueUp();
+		AllWritesToSucceed("$$test_stream");
+		NoOtherStreams();
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_stream = new EmittedStream(
+			"test_stream",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
+			new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
+			CheckpointTag.FromPosition(0, 40, 30),
+			_bus, _ioDispatcher, _readyHandler);
+		_stream.Start();
+	}
+
+	[Test]
+	public void throws_if_position_is_prior_to_from_position() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_stream.EmitEvents(
+				new[] {
+					new EmittedDataEvent(
+						"test_stream", Guid.NewGuid(), "type", true, "data", null,
+						CheckpointTag.FromPosition(0, 20, 10), null)
+				});
+		});
+	}
+
+	[Test]
+	public void publishes_already_published_events() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 100, 50), null)
+			});
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
+				.ExceptOfEventType(SystemEventTypes.StreamMetadata)
+				.Count());
+	}
+
+	[Test]
+	public void publishes_not_yet_published_events() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 200, 150), null)
+			});
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
+				.ExceptOfEventType(SystemEventTypes.StreamMetadata)
+				.Count());
+	}
+
+	[Test]
+	public void does_not_reply_with_write_completed_message() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 200, 150), null)
+			});
+		Assert.AreEqual(0, _readyHandler.HandledWriteCompletedMessage.Count);
+	}
+
+	[Test]
+	public void reply_with_write_completed_message_when_write_completes() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 200, 150), null)
+			});
+		OneWriteCompletes();
+		Assert.IsTrue(_readyHandler.HandledWriteCompletedMessage.Any(v => v.StreamId == "test_stream"));
+		// more than one is ok
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_caused_by_and_correlation_id.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_caused_by_and_correlation_id.cs
new file mode 100644
index 00000000000..9cd7cd8a8ca
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_caused_by_and_correlation_id.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_an_emit_with_caused_by_and_correlation_id<TLogFormat, TStreamId> : core_projection.TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+	private EmittedDataEvent _emittedDataEvent;
+	private Guid _causedBy;
+	private string _correlationId;
+
+	protected override void Given() {
+		AllWritesQueueUp();
+		AllWritesToSucceed("$$test_stream");
+		NoOtherStreams();
+	}
+
+	[SetUp]
+	public void setup() {
+		_causedBy = Guid.NewGuid();
+		_correlationId = "correlation_id";
+
+		_emittedDataEvent = new EmittedDataEvent(
+			"test_stream", Guid.NewGuid(), "type", true, "data", null, CheckpointTag.FromPosition(0, 200, 150),
+			null);
+
+		_emittedDataEvent.SetCausedBy(_causedBy);
+		_emittedDataEvent.SetCorrelationId(_correlationId);
+
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_stream = new EmittedStream(
+			"test_stream",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
+			new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
+			CheckpointTag.FromPosition(0, 40, 30),
+			_bus, _ioDispatcher, _readyHandler);
+		_stream.Start();
+		_stream.EmitEvents(new[] { _emittedDataEvent });
+	}
+
+
+	[Test]
+	public void publishes_write_events() {
+		var writeEvents =
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
+				.ExceptOfEventType(SystemEventTypes.StreamMetadata)
+				.ToArray();
+		Assert.AreEqual(1, writeEvents.Length);
+		var writeEvent = writeEvents.Single();
+		Assert.NotNull(writeEvent.Metadata);
+		var metadata = Helper.UTF8NoBom.GetString(writeEvent.Metadata);
+		HelperExtensions.AssertJson(
+			new { ___causedBy = _causedBy, ___correlationId = _correlationId }, metadata.ParseJson<JObject>());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_committed_callback.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_committed_callback.cs
new file mode 100644
index 00000000000..f9af6f90d54
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_committed_callback.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_an_emit_with_committed_callback<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	protected override void Given() {
+		ExistingEvent("test_stream", "type", @"{""c"": 100, ""p"": 50}", "data");
+		AllWritesSucceed();
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_stream = new EmittedStream(
+			"test_stream",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
+			new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
+			CheckpointTag.FromPosition(0, 0, -1),
+			_bus, _ioDispatcher, _readyHandler);
+		_stream.Start();
+	}
+
+	[Test]
+	public void completes_already_published_events() {
+		var invoked = false;
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					(string)"test_stream", Guid.NewGuid(), (string)"type", (bool)true,
+					(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50),
+					(CheckpointTag)null, v => invoked = true)
+			});
+		Assert.IsTrue(invoked);
+	}
+
+	[Test]
+	public void completes_not_yet_published_events() {
+		var invoked = false;
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					(string)"test_stream", Guid.NewGuid(), (string)"type", (bool)true,
+					(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 200, 150),
+					(CheckpointTag)null, v => invoked = true)
+			});
+		Assert.IsTrue(invoked);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream.cs
new file mode 100644
index 00000000000..e8d218dfd65
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream.cs
@@ -0,0 +1,102 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_handling_an_emit_with_expected_tag_the_started_in_recovery_stream<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	protected override void Given() {
+		ExistingEvent("test_stream", "type", @"{""c"": 100, ""p"": 50}", "data");
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_stream = new EmittedStream(
+			"test_stream",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
+			new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
+			CheckpointTag.FromPosition(0, 0, -1),
+			_bus, _ioDispatcher, _readyHandler);
+		_stream.Start();
+	}
+
+	[Test]
+	public void does_not_publish_already_published_events() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 100, 50), CheckpointTag.FromPosition(0, 40, 20))
+			});
+		Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
+	}
+
+	[Test]
+	public void publishes_not_yet_published_events_if_expected_tag_is_the_same() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 200, 150), CheckpointTag.FromPosition(0, 100, 50))
+			});
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
+	}
+
+	[Test]
+	public void does_not_publish_not_yet_published_events_if_expected_tag_is_before_last_event_tag() {
+		//TODO: is it corrupted dB case?
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 200, 150), CheckpointTag.FromPosition(0, 40, 20))
+			});
+		Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
+	}
+
+	[Test]
+	public void correct_stream_id_is_set_on_write_events_message() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 200, 150), CheckpointTag.FromPosition(0, 100, 50))
+			});
+		Assert.AreEqual(
+			"test_stream", _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Single().EventStreamId);
+	}
+
+	[Test]
+	public void metadata_include_commit_and_prepare_positions() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 200, 150), CheckpointTag.FromPosition(0, 100, 50))
+			});
+		var metaData =
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Single().Events[0].Metadata
+				.ParseCheckpointTagVersionExtraJson(default(ProjectionVersion));
+		Assert.AreEqual(200, metaData.Tag.CommitPosition);
+		Assert.AreEqual(150, metaData.Tag.PreparePosition);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_extra_metadata.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_extra_metadata.cs
new file mode 100644
index 00000000000..ef0d9d382c9
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_extra_metadata.cs
@@ -0,0 +1,71 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_an_emit_with_extra_metadata<TLogFormat, TStreamId> : core_projection.TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	protected override void Given() {
+		AllWritesQueueUp();
+		ExistingEvent("test_stream", "type", @"{""c"": 100, ""p"": 50}", "data");
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_stream = new EmittedStream(
+			"test_stream",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
+			new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
+			CheckpointTag.FromPosition(0, 40, 30),
+			_bus, _ioDispatcher, _readyHandler);
+		_stream.Start();
+
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data",
+					new ExtraMetaData(new Dictionary<string, string> {{"a", "1"}, {"b", "{}"}}),
+					CheckpointTag.FromPosition(0, 200, 150), null)
+			});
+	}
+
+	[Test]
+	public void publishes_not_yet_published_events() {
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
+	}
+
+	[Test]
+	public void combines_checkpoint_tag_with_extra_metadata() {
+		var writeEvent = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Single();
+
+		Assert.AreEqual(1, writeEvent.Events.Length);
+		var @event = writeEvent.Events[0];
+		var metadata = Helper.UTF8NoBom.GetString(@event.Metadata).ParseJson<JObject>();
+
+		HelperExtensions.AssertJson(new { a = 1, b = new { } }, metadata);
+		var checkpoint = @event.Metadata.ParseCheckpointTagJson();
+		Assert.AreEqual(CheckpointTag.FromPosition(0, 200, 150), checkpoint);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_not_ready_event.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_not_ready_event.cs
new file mode 100644
index 00000000000..6689bfab541
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_not_ready_event.cs
@@ -0,0 +1,82 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_an_emit_with_not_ready_event<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	protected override void Given() {
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_stream = new EmittedStream(
+			"test_stream",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
+			new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
+			CheckpointTag.FromPosition(0, 0, -1),
+			_bus, _ioDispatcher, _readyHandler);
+		_stream.Start();
+	}
+
+	[Test]
+	public void replies_with_await_message() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedLinkTo(
+					"test_stream", Guid.NewGuid(), "other_stream", CheckpointTag.FromPosition(0, 1100, 1000), null)
+			});
+		Assert.AreEqual(1, _readyHandler.HandledStreamAwaitingMessage.Count);
+		Assert.AreEqual("test_stream", _readyHandler.HandledStreamAwaitingMessage[0].StreamId);
+	}
+
+	[Test]
+	public void processes_write_on_write_completed_if_ready() {
+		var linkTo = new EmittedLinkTo(
+			"test_stream", Guid.NewGuid(), "other_stream", CheckpointTag.FromPosition(0, 1100, 1000), null);
+		_stream.EmitEvents(new[] { linkTo });
+		linkTo.SetTargetEventNumber(1);
+		_stream.Handle(new CoreProjectionProcessingMessage.EmittedStreamWriteCompleted("other_stream"));
+
+		Assert.AreEqual(1, _readyHandler.HandledStreamAwaitingMessage.Count);
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
+				.OfEventType(SystemEventTypes.LinkTo)
+				.Count());
+	}
+
+	[Test]
+	public void replies_with_await_message_on_write_completed_if_not_yet_ready() {
+		var linkTo = new EmittedLinkTo(
+			"test_stream", Guid.NewGuid(), "other_stream", CheckpointTag.FromPosition(0, 1100, 1000), null);
+		_stream.EmitEvents(new[] { linkTo });
+		_stream.Handle(new CoreProjectionProcessingMessage.EmittedStreamWriteCompleted("one_more_stream"));
+
+		Assert.AreEqual(2, _readyHandler.HandledStreamAwaitingMessage.Count);
+		Assert.AreEqual("test_stream", _readyHandler.HandledStreamAwaitingMessage[0].StreamId);
+		Assert.AreEqual("test_stream", _readyHandler.HandledStreamAwaitingMessage[1].StreamId);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_stream_metadata.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_stream_metadata.cs
new file mode 100644
index 00000000000..de8ca5c4a5b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_stream_metadata.cs
@@ -0,0 +1,89 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_an_emit_with_stream_metadata_to_empty_stream<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+	private EmittedStream.WriterConfiguration.StreamMetadata _streamMetadata;
+	private EmittedStream.WriterConfiguration _writerConfiguration;
+
+	protected override void Given() {
+		AllWritesQueueUp();
+		NoStream("test_stream");
+		_streamMetadata = new EmittedStream.WriterConfiguration.StreamMetadata(maxCount: 10);
+		_writerConfiguration = new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+			_streamMetadata, null, maxWriteBatchLength: 50);
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_stream = new EmittedStream(
+			"test_stream", _writerConfiguration, new ProjectionVersion(1, 0, 0),
+			new TransactionFilePositionTagger(0),
+			CheckpointTag.FromPosition(0, 40, 30), _bus, _ioDispatcher, _readyHandler);
+		_stream.Start();
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 200, 150), null)
+			});
+	}
+
+	[Test]
+	public void publishes_write_stream_metadata() {
+		Assert.AreEqual(
+			1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().ToStream("$$test_stream").Count());
+	}
+
+	[Test]
+	public void does_not_write_stream_metadata_second_time() {
+		OneWriteCompletes();
+		OneWriteCompletes();
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 400, 350), null)
+			});
+		Assert.AreEqual(
+			1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().ToStream("$$test_stream").Count());
+	}
+
+	[Test]
+	public void publishes_write_emitted_event_on_write_stream_metadata_completed() {
+		OneWriteCompletes();
+		Assert.AreEqual(
+			1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().ToStream("test_stream").Count());
+	}
+
+	[Test]
+	public void does_not_reply_with_write_completed_message() {
+		Assert.AreEqual(0, _readyHandler.HandledWriteCompletedMessage.Count);
+	}
+
+	[Test]
+	public void reply_with_write_completed_message_when_write_completes() {
+		OneWriteCompletes();
+		OneWriteCompletes();
+		Assert.IsTrue(_readyHandler.HandledWriteCompletedMessage.Any(v => v.StreamId == "test_stream"));
+		// more than one is ok
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_write_as_configured.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_write_as_configured.cs
new file mode 100644
index 00000000000..8226940fbde
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_an_emit_with_write_as_configured.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Security.Claims;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_an_emit_with_write_as_configured<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+	private ClaimsPrincipal _writeAs;
+
+	protected override void Given() {
+		AllWritesQueueUp();
+		ExistingEvent("test_stream", "type", @"{""c"": 100, ""p"": 50}", "data");
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_writeAs = new ClaimsPrincipal(new ClaimsIdentity(new[] { new Claim(ClaimTypes.Role, "test-user") }, "ES-Test"));
+		_stream = new EmittedStream(
+			"test_stream",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), _writeAs, maxWriteBatchLength: 50),
+			new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
+			CheckpointTag.FromPosition(0, 40, 30),
+			_bus, _ioDispatcher, _readyHandler);
+		_stream.Start();
+
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 200, 150), null)
+			});
+	}
+
+	[Test]
+	public void publishes_not_yet_published_events() {
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
+	}
+
+	[Test]
+	public void publishes_write_event_with_correct_user_account() {
+		var writeEvent = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Single();
+
+		Assert.AreSame(_writeAs, writeEvent.User);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_emits_in_invalid_order.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_emits_in_invalid_order.cs
new file mode 100644
index 00000000000..5b038c26b42
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_emits_in_invalid_order.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_emits_in_invalid_order<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	protected override void Given() {
+		ExistingEvent("test_stream", "type", @"{""c"": 100, ""p"": 50}", "data");
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_stream = new EmittedStream(
+			"test_stream",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
+			new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
+			CheckpointTag.FromPosition(0, 40, 30),
+			_bus, _ioDispatcher, _readyHandler);
+		_stream.Start();
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 100, 90), null)
+			});
+	}
+
+	[Test]
+	public void throws_if_position_is_prior_to_the_last_event_position() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_stream.EmitEvents(
+				new[] {
+					new EmittedDataEvent(
+						"test_stream", Guid.NewGuid(), "type", true, "data", null,
+						CheckpointTag.FromPosition(0, 80, 70), null)
+				});
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_emits_with_previously_written_events.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_emits_with_previously_written_events.cs
new file mode 100644
index 00000000000..938d4068f55
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_emits_with_previously_written_events.cs
@@ -0,0 +1,158 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_emits_with_previously_written_events<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	protected override void Given() {
+		AllWritesQueueUp();
+		ExistingEvent("test_stream", "type1", @"{""c"": 100, ""p"": 50}", "data");
+		ExistingEvent("test_stream", "type2", @"{""c"": 200, ""p"": 150}", "data");
+		ExistingEvent("test_stream", "type3", @"{""c"": 300, ""p"": 250}", "data");
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_stream = new EmittedStream(
+			"test_stream",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
+			new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
+			CheckpointTag.FromPosition(0, 100, 50), _bus, _ioDispatcher, _readyHandler);
+		_stream.Start();
+	}
+
+	[Test]
+	public void does_not_publish_already_published_events() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type2", true, "data", null,
+					CheckpointTag.FromPosition(0, 200, 150), null)
+			});
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type3", true, "data", null,
+					CheckpointTag.FromPosition(0, 300, 250), null)
+			});
+		Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
+	}
+
+	[Test]
+	public void does_not_fail_the_projection_if_events_are_skipped() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type3", true, "data", null,
+					CheckpointTag.FromPosition(0, 300, 250), null)
+			});
+		Assert.AreEqual(0, _readyHandler.HandledFailedMessages.Count);
+		Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
+	}
+
+	[Test]
+	public void fails_the_projection_if_events_are_at_different_positions() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type3", true, "data", null,
+					CheckpointTag.FromPosition(0, 250, 220), null)
+			});
+		Assert.AreEqual(1, _readyHandler.HandledFailedMessages.Count);
+		Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
+	}
+
+	[Test]
+	public void publishes_not_yet_published_events() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 400, 350), null)
+			});
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
+	}
+
+	[Test]
+	public void replies_with_write_completed_message_for_existing_events() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type2", true, "data", null,
+					CheckpointTag.FromPosition(0, 200, 150), null)
+			});
+		Assert.AreEqual(1, _readyHandler.HandledWriteCompletedMessage.Count);
+	}
+
+	[Test]
+	public void retrieves_event_number_for_previously_written_events() {
+		long eventNumber = -1;
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					(string)"test_stream", Guid.NewGuid(), (string)"type2", (bool)true,
+					(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 200, 150),
+					(CheckpointTag)null, v => eventNumber = v)
+			});
+		Assert.AreEqual(1, eventNumber);
+	}
+
+	[Test]
+	public void reply_with_write_completed_message_when_write_completes() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "type", true, "data", null,
+					CheckpointTag.FromPosition(0, 400, 350), null)
+			});
+		OneWriteCompletes();
+		Assert.IsTrue(_readyHandler.HandledWriteCompletedMessage.Any(v => v.StreamId == "test_stream"));
+		// more than one is ok
+	}
+
+	[Test]
+	public void reports_event_number_for_new_events() {
+		long eventNumber = -1;
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					(string)"test_stream", Guid.NewGuid(), (string)"type", (bool)true,
+					(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 400, 350),
+					(CheckpointTag)null, v => eventNumber = v)
+			});
+		OneWriteCompletes();
+		Assert.AreEqual(3, eventNumber);
+	}
+
+	[Test]
+	public void does_not_fail_if_link_event_target_does_not_exist() {
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test_stream", Guid.NewGuid(), "$>", true, "0@foobar", null,
+					CheckpointTag.FromPosition(0, 150, 100), null)
+			});
+		Assert.AreEqual(0, _readyHandler.HandledFailedMessages.Count);
+		Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.ReadEvent>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_emits_with_previously_written_events_at_the_same_position.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_emits_with_previously_written_events_at_the_same_position.cs
new file mode 100644
index 00000000000..03fe46b9107
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_handling_emits_with_previously_written_events_at_the_same_position.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_handling_emits_with_previously_written_events_at_the_same_position<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+	private long _1;
+	private long _2;
+	private long _3;
+
+	protected override void Given() {
+		AllWritesQueueUp();
+		//NOTE: it is possible for a batch of events to be partially written if it contains links
+		ExistingEvent("test_stream", "type1", @"{""c"": 100, ""p"": 50}", "data");
+		ExistingEvent("test_stream", "type2", @"{""c"": 100, ""p"": 50}", "data");
+	}
+
+	private EmittedEvent[] CreateEventBatch() {
+		return new EmittedEvent[] {
+			new EmittedDataEvent(
+				(string)"test_stream", Guid.NewGuid(), (string)"type1", (bool)true,
+				(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
+				v => _1 = v),
+			new EmittedDataEvent(
+				(string)"test_stream", Guid.NewGuid(), (string)"type2", (bool)true,
+				(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
+				v => _2 = v),
+			new EmittedDataEvent(
+				(string)"test_stream", Guid.NewGuid(), (string)"type3", (bool)true,
+				(string)"data", (ExtraMetaData)null, CheckpointTag.FromPosition(0, 100, 50), (CheckpointTag)null,
+				v => _3 = v)
+		};
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_stream = new EmittedStream(
+			"test_stream",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, maxWriteBatchLength: 50),
+			new ProjectionVersion(1, 0, 0), new TransactionFilePositionTagger(0),
+			CheckpointTag.FromPosition(0, 20, 10),
+			_bus, _ioDispatcher, _readyHandler);
+		_stream.Start();
+		_stream.EmitEvents(CreateEventBatch());
+		OneWriteCompletes();
+	}
+
+	[Test]
+	public void publishes_not_yet_written_events_only() {
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
+		var writeMessage = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Single();
+		Assert.AreEqual(1, writeMessage.Events.Length);
+		Assert.AreEqual("type3", writeMessage.Events[0].EventType);
+	}
+
+	[Test]
+	public void reports_correct_event_numbers() {
+		Assert.AreEqual(0, _1);
+		Assert.AreEqual(1, _2);
+		Assert.AreEqual(2, _3);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_the_stream_is_started.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_the_stream_is_started.cs
new file mode 100644
index 00000000000..d089ee85a6e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_the_stream_is_started.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture]
+public class when_the_stream_is_started : TestFixtureWithReadWriteDispatchers {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		_stream = new EmittedStream(
+			"test",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50), new ProjectionVersion(1, 0, 0),
+			new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _bus, _ioDispatcher,
+			_readyHandler);
+		;
+		_stream.Start();
+	}
+
+	[Test]
+	public void start_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => { _stream.Start(); });
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_the_stream_is_started_with_already_emitted_events.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_the_stream_is_started_with_already_emitted_events.cs
new file mode 100644
index 00000000000..01c7936e367
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_stream/when_the_stream_is_started_with_already_emitted_events.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_stream;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_the_stream_is_started_with_already_emitted_events<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private EmittedStream _stream;
+	private TestCheckpointManagerMessageHandler _readyHandler;
+
+	protected override void Given() {
+		base.Given();
+		NoStream("test");
+	}
+
+	[SetUp]
+	public void setup() {
+		_readyHandler = new TestCheckpointManagerMessageHandler();
+		;
+		_stream = new EmittedStream(
+			"test",
+			new EmittedStream.WriterConfiguration(new EmittedStreamsWriter(_ioDispatcher),
+				new EmittedStream.WriterConfiguration.StreamMetadata(), null, 50), new ProjectionVersion(1, 0, 0),
+			new TransactionFilePositionTagger(0), CheckpointTag.FromPosition(0, 0, -1), _bus, _ioDispatcher,
+			_readyHandler);
+		_stream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					"test", Guid.NewGuid(), "type", true, "data", null, CheckpointTag.FromPosition(0, 100, 50),
+					null)
+			});
+		_stream.Start();
+	}
+
+	[Test]
+	public void publishes_write_events() {
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/when_checkpoint_read_times_out.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/when_checkpoint_read_times_out.cs
new file mode 100644
index 00000000000..cb7b335460e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/when_checkpoint_read_times_out.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+using IODispatcherDelayedMessage = KurrentDB.Core.Helpers.IODispatcherDelayedMessage;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_streams_deleter.when_deleting;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_checkpoint_read_times_out<TLogFormat, TStreamId> : with_emitted_stream_deleter<TLogFormat, TStreamId>,
+	IHandle<TimerMessage.Schedule> {
+	protected Action _onDeleteStreamCompleted;
+	private ManualResetEventSlim _mre = new ManualResetEventSlim();
+	private List<ClientMessage.DeleteStream> _deleteMessages = new List<ClientMessage.DeleteStream>();
+	private bool _hasTimerTimedOut;
+
+	private Guid _timedOutCorrelationId;
+
+	public override void When() {
+		_bus.Subscribe<TimerMessage.Schedule>(this);
+		_onDeleteStreamCompleted = () => { _mre.Set(); };
+
+		_deleter.DeleteEmittedStreams(_onDeleteStreamCompleted);
+	}
+
+	public override void Handle(ClientMessage.ReadStreamEventsBackward message) {
+		if (message.CorrelationId == _timedOutCorrelationId) {
+			return;
+		} else {
+			base.Handle(message);
+		}
+	}
+
+	public override void Handle(ClientMessage.DeleteStream message) {
+		_deleteMessages.Add(message);
+		message.Envelope.ReplyWith(new ClientMessage.DeleteStreamCompleted(
+			message.CorrelationId, OperationResult.Success, String.Empty));
+	}
+
+	public void Handle(TimerMessage.Schedule message) {
+		if (!_hasTimerTimedOut) {
+			var delay = message.ReplyMessage as IODispatcherDelayedMessage;
+			if (delay != null) {
+				_timedOutCorrelationId = delay.MessageCorrelationId.Value;
+				_hasTimerTimedOut = true;
+				message.Reply();
+			}
+		}
+	}
+
+	[Test]
+	public void should_have_deleted_the_tracked_emitted_stream() {
+		if (!_mre.Wait(10000)) {
+			Assert.Fail("Timed out waiting for event to be deleted");
+		}
+
+		Assert.AreEqual(_testStreamName, _deleteMessages[0].EventStreamId);
+		Assert.AreEqual(_checkpointName, _deleteMessages[1].EventStreamId);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/when_delete_stream_succeeds.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/when_delete_stream_succeeds.cs
new file mode 100644
index 00000000000..b937fd6222b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/when_delete_stream_succeeds.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_streams_deleter.when_deleting;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_delete_stream_succeeds<TLogFormat, TStreamId> : with_emitted_stream_deleter<TLogFormat, TStreamId> {
+	protected Action _onDeleteStreamCompleted;
+	private readonly ManualResetEventSlim _mre = new ManualResetEventSlim();
+	private readonly List<ClientMessage.DeleteStream> _deleteMessages = new List<ClientMessage.DeleteStream>();
+
+	public override void When() {
+		_onDeleteStreamCompleted = () => { _mre.Set(); };
+
+		_deleter.DeleteEmittedStreams(_onDeleteStreamCompleted);
+	}
+
+	public override void Handle(ClientMessage.DeleteStream message) {
+		_deleteMessages.Add(message);
+		message.Envelope.ReplyWith(new ClientMessage.DeleteStreamCompleted(
+			message.CorrelationId, OperationResult.Success, String.Empty));
+	}
+
+	[Test]
+	public void should_have_deleted_the_tracked_emitted_stream() {
+		if (!_mre.Wait(10000)) {
+			Assert.Fail("Timed out waiting for event to be deleted");
+		}
+
+		Assert.AreEqual(_testStreamName, _deleteMessages[0].EventStreamId);
+		Assert.AreEqual(_checkpointName, _deleteMessages[1].EventStreamId);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/when_emitted_streams_read_times_out.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/when_emitted_streams_read_times_out.cs
new file mode 100644
index 00000000000..7cbe04f1474
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/when_emitted_streams_read_times_out.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+using IODispatcherDelayedMessage = KurrentDB.Core.Helpers.IODispatcherDelayedMessage;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_streams_deleter.when_deleting;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_emitted_streams_read_times_out<TLogFormat, TStreamId> : with_emitted_stream_deleter<TLogFormat, TStreamId>,
+	IHandle<TimerMessage.Schedule> {
+	protected Action _onDeleteStreamCompleted;
+	private ManualResetEventSlim _mre = new ManualResetEventSlim();
+	private List<ClientMessage.DeleteStream> _deleteMessages = new List<ClientMessage.DeleteStream>();
+	private bool _hasTimedOut;
+
+	private Guid _timedOutCorrelationId;
+
+	public override void When() {
+		_bus.Subscribe<TimerMessage.Schedule>(this);
+		_onDeleteStreamCompleted = () => { _mre.Set(); };
+
+		_deleter.DeleteEmittedStreams(_onDeleteStreamCompleted);
+	}
+
+	public override void Handle(ClientMessage.ReadStreamEventsForward message) {
+		if (!_hasTimedOut) {
+			_hasTimedOut = true;
+			_timedOutCorrelationId = message.CorrelationId;
+			return;
+		} else {
+			base.Handle(message);
+		}
+	}
+
+	public override void Handle(ClientMessage.DeleteStream message) {
+		_deleteMessages.Add(message);
+		message.Envelope.ReplyWith(new ClientMessage.DeleteStreamCompleted(
+			message.CorrelationId, OperationResult.Success, String.Empty));
+	}
+
+	public void Handle(TimerMessage.Schedule message) {
+		var delay = message.ReplyMessage as IODispatcherDelayedMessage;
+		if (delay != null && delay.MessageCorrelationId.Value == _timedOutCorrelationId) {
+			message.Reply();
+		}
+	}
+
+	[Test]
+	public void should_have_deleted_the_tracked_emitted_stream() {
+		if (!_mre.Wait(10000)) {
+			Assert.Fail("Timed out waiting for event to be deleted");
+		}
+
+		Assert.AreEqual(_testStreamName, _deleteMessages[0].EventStreamId);
+		Assert.AreEqual(_checkpointName, _deleteMessages[1].EventStreamId);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_an_existing_emitted_streams_stream.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_an_existing_emitted_streams_stream.cs
new file mode 100644
index 00000000000..e4e9bbcdd9c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_an_existing_emitted_streams_stream.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_streams_deleter.when_deleting;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_an_existing_emitted_streams_stream<TLogFormat, TStreamId> : SpecificationWithEmittedStreamsTrackerAndDeleter<TLogFormat, TStreamId> {
+	protected Action _onDeleteStreamCompleted;
+	protected ManualResetEvent _resetEvent = new ManualResetEvent(false);
+	private string _testStreamName = "test_stream";
+	private ManualResetEvent _eventAppeared = new ManualResetEvent(false);
+	private UserCredentials _credentials;
+
+	protected override async Task Given() {
+		_credentials = new UserCredentials("admin", "changeit");
+		_onDeleteStreamCompleted = () => { _resetEvent.Set(); };
+
+		await base.Given();
+		var sub = await _conn.SubscribeToStreamAsync(_projectionNamesBuilder.GetEmittedStreamsName(), true, (s, evnt) => {
+			_eventAppeared.Set();
+			return Task.CompletedTask;
+		}, userCredentials: _credentials);
+
+		_emittedStreamsTracker.TrackEmittedStream(new EmittedEvent[] {
+			new EmittedDataEvent(
+				_testStreamName, Guid.NewGuid(), "type1", true,
+				"data", null, CheckpointTag.FromPosition(0, 100, 50), null),
+		});
+
+		if (!_eventAppeared.WaitOne(TimeSpan.FromSeconds(5))) {
+			Assert.Fail("Timed out waiting for emitted stream event");
+		}
+
+		sub.Unsubscribe();
+
+		var emittedStreamResult =
+			await _conn.ReadStreamEventsForwardAsync(_projectionNamesBuilder.GetEmittedStreamsName(), 0, 1, false,
+				_credentials);
+		Assert.AreEqual(1, emittedStreamResult.Events.Length);
+		Assert.AreEqual(SliceReadStatus.Success, emittedStreamResult.Status);
+	}
+
+	protected override Task When() {
+		_emittedStreamsDeleter.DeleteEmittedStreams(_onDeleteStreamCompleted);
+		if (!_resetEvent.WaitOne(TimeSpan.FromSeconds(10))) {
+			throw new Exception("Timed out waiting callback.");
+		}
+
+		return Task.CompletedTask;
+	}
+
+	[Test]
+	public async Task should_have_deleted_the_tracked_emitted_stream() {
+		var result = await _conn.ReadStreamEventsForwardAsync(_testStreamName, 0, 1, false,
+			new UserCredentials("admin", "changeit"));
+		Assert.AreEqual(SliceReadStatus.StreamNotFound, result.Status);
+	}
+
+
+	[Test]
+	public async Task should_have_deleted_the_checkpoint_stream() {
+		var result = await _conn.ReadStreamEventsForwardAsync(_projectionNamesBuilder.GetEmittedStreamsCheckpointName(),
+			0, 1, false, new UserCredentials("admin", "changeit"));
+		Assert.AreEqual(SliceReadStatus.StreamNotFound, result.Status);
+	}
+
+	[Test]
+	public async Task should_have_deleted_the_emitted_streams_stream() {
+		var result = await _conn.ReadStreamEventsForwardAsync(_projectionNamesBuilder.GetEmittedStreamsName(), 0, 1,
+			false, new UserCredentials("admin", "changeit"));
+		Assert.AreEqual(SliceReadStatus.StreamNotFound, result.Status);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_emitted_stream_deleter.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_emitted_stream_deleter.cs
new file mode 100644
index 00000000000..62d4c063d8e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_emitted_stream_deleter.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests.Helpers.IODispatcherTests;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_streams_deleter.when_deleting;
+
+public abstract class with_emitted_stream_deleter<TLogFormat, TStreamId> : IHandle<ClientMessage.ReadStreamEventsForward>,
+	IHandle<ClientMessage.ReadStreamEventsBackward>,
+	IHandle<ClientMessage.DeleteStream> {
+	protected SynchronousScheduler _bus = new();
+	protected IODispatcher _ioDispatcher;
+	protected EmittedStreamsDeleter _deleter;
+	protected ProjectionNamesBuilder _projectionNamesBuilder;
+	protected string _projectionName = "test_projection";
+	protected string _checkpointName;
+	protected string _testStreamName = "test_stream";
+	private bool _hasReadForward;
+
+	[OneTimeSetUp]
+	protected virtual void SetUp() {
+		_ioDispatcher = new IODispatcher(_bus, _bus, true);
+		_projectionNamesBuilder = ProjectionNamesBuilder.CreateForTest(_projectionName);
+		_checkpointName = _projectionNamesBuilder.GetEmittedStreamsCheckpointName();
+
+		_deleter = new EmittedStreamsDeleter(_ioDispatcher,
+			_projectionNamesBuilder.GetEmittedStreamsName(),
+			_checkpointName);
+
+		IODispatcherTestHelpers.SubscribeIODispatcher(_ioDispatcher, _bus);
+
+		_bus.Subscribe<ClientMessage.ReadStreamEventsForward>(this);
+		_bus.Subscribe<ClientMessage.ReadStreamEventsBackward>(this);
+		_bus.Subscribe<ClientMessage.DeleteStream>(this);
+
+		When();
+	}
+
+	public abstract void When();
+
+	public virtual void Handle(ClientMessage.ReadStreamEventsBackward message) {
+		var events = IODispatcherTestHelpers.CreateResolvedEvent<TLogFormat, TStreamId>(message.EventStreamId,
+			ProjectionEventTypes.ProjectionCheckpoint, "0");
+		var reply = new ClientMessage.ReadStreamEventsBackwardCompleted(message.CorrelationId,
+			message.EventStreamId, message.FromEventNumber, message.MaxCount,
+			ReadStreamResult.Success, events, null, false, String.Empty, 0, message.FromEventNumber, true, 1000);
+
+		message.Envelope.ReplyWith(reply);
+	}
+
+	public virtual void Handle(ClientMessage.ReadStreamEventsForward message) {
+		ClientMessage.ReadStreamEventsForwardCompleted reply;
+
+		if (!_hasReadForward) {
+			_hasReadForward = true;
+			var events = IODispatcherTestHelpers.CreateResolvedEvent<TLogFormat, TStreamId>(message.EventStreamId,
+				ProjectionEventTypes.ProjectionCheckpoint, _testStreamName);
+			reply = new ClientMessage.ReadStreamEventsForwardCompleted(message.CorrelationId, message.EventStreamId,
+				message.FromEventNumber, message.MaxCount,
+				ReadStreamResult.Success, events, null, false, String.Empty, message.FromEventNumber + 1,
+				message.FromEventNumber, true, 1000);
+		} else {
+			reply = new ClientMessage.ReadStreamEventsForwardCompleted(message.CorrelationId, message.EventStreamId,
+				message.FromEventNumber, message.MaxCount,
+				ReadStreamResult.Success, new ResolvedEvent[] { }, null, false, String.Empty,
+				message.FromEventNumber, message.FromEventNumber, true, 1000);
+		}
+
+		message.Envelope.ReplyWith(reply);
+	}
+
+	public abstract void Handle(ClientMessage.DeleteStream message);
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_multiple_tracked_streams.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_multiple_tracked_streams.cs
new file mode 100644
index 00000000000..5cd75922aa0
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_multiple_tracked_streams.cs
@@ -0,0 +1,91 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_streams_deleter.when_deleting;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_multiple_tracked_streams<TLogFormat, TStreamId> : SpecificationWithEmittedStreamsTrackerAndDeleter<TLogFormat, TStreamId> {
+	protected Action _onDeleteStreamCompleted;
+	protected ManualResetEvent _resetEvent = new ManualResetEvent(false);
+	protected CountdownEvent _eventAppeared;
+	private int _numberOfTrackedEvents = 200;
+	private string _testStreamFormat = "test_stream_{0}";
+	private UserCredentials _credentials;
+
+	protected override async Task Given() {
+		_credentials = new UserCredentials("admin", "changeit");
+		_eventAppeared = new CountdownEvent(_numberOfTrackedEvents);
+		_onDeleteStreamCompleted = () => { _resetEvent.Set(); };
+		await base.Given();
+
+		var sub = await _conn.SubscribeToStreamAsync(_projectionNamesBuilder.GetEmittedStreamsName(), true, (s, evnt) => {
+			_eventAppeared.Signal();
+			return Task.CompletedTask;
+		}, userCredentials: _credentials);
+
+		for (int i = 0; i < _numberOfTrackedEvents; i++) {
+			await _conn.AppendToStreamAsync(String.Format(_testStreamFormat, i), ExpectedVersion.Any,
+				new EventData(Guid.NewGuid(), "type1", true, Helper.UTF8NoBom.GetBytes("data"), null));
+			_emittedStreamsTracker.TrackEmittedStream(new EmittedEvent[] {
+				new EmittedDataEvent(
+					String.Format(_testStreamFormat, i), Guid.NewGuid(), "type1", true,
+					"data", null, CheckpointTag.FromPosition(0, 100, 50), null),
+			});
+		}
+
+		if (!_eventAppeared.Wait(TimeSpan.FromSeconds(10))) {
+			Assert.Fail("Timed out waiting for emitted streams");
+		}
+
+		var emittedStreamResult =
+			await _conn.ReadStreamEventsForwardAsync(_projectionNamesBuilder.GetEmittedStreamsName(), 0,
+				_numberOfTrackedEvents, false, _credentials);
+		Assert.AreEqual(_numberOfTrackedEvents, emittedStreamResult.Events.Length);
+		Assert.AreEqual(SliceReadStatus.Success, emittedStreamResult.Status);
+	}
+
+	protected override Task When() {
+		_emittedStreamsDeleter.DeleteEmittedStreams(_onDeleteStreamCompleted);
+		if (!_resetEvent.WaitOne(TimeSpan.FromSeconds(10))) {
+			throw new Exception("Timed out waiting callback.");
+		}
+
+		return Task.CompletedTask;
+	}
+
+	[Test]
+	public async Task should_have_deleted_the_tracked_emitted_streams() {
+		for (int i = 0; i < _numberOfTrackedEvents; i++) {
+			var result = await _conn.ReadStreamEventsForwardAsync(String.Format(_testStreamFormat, i), 0, 1, false,
+				new UserCredentials("admin", "changeit"));
+			Assert.AreEqual(SliceReadStatus.StreamNotFound, result.Status);
+		}
+	}
+
+
+	[Test]
+	public async Task should_have_deleted_the_checkpoint_stream() {
+		var result = await _conn.ReadStreamEventsForwardAsync(_projectionNamesBuilder.GetEmittedStreamsCheckpointName(),
+			0, 1, false, new UserCredentials("admin", "changeit"));
+		Assert.AreEqual(SliceReadStatus.StreamNotFound, result.Status);
+	}
+
+	[Test]
+	public async Task should_have_deleted_the_emitted_streams_stream() {
+		var result = await _conn.ReadStreamEventsForwardAsync(_projectionNamesBuilder.GetEmittedStreamsName(), 0, 1,
+			false, new UserCredentials("admin", "changeit"));
+		Assert.AreEqual(SliceReadStatus.StreamNotFound, result.Status);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_no_emitted_streams_stream.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_no_emitted_streams_stream.cs
new file mode 100644
index 00000000000..4dd45e7df81
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_deleter/when_deleting/with_no_emitted_streams_stream.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Core.Tests;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_streams_deleter.when_deleting;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_no_emitted_streams_stream<TLogFormat, TStreamId> : SpecificationWithEmittedStreamsTrackerAndDeleter<TLogFormat, TStreamId> {
+	protected Action _onDeleteStreamCompleted;
+	protected ManualResetEvent _resetEvent = new ManualResetEvent(false);
+
+	protected override Task Given() {
+		_onDeleteStreamCompleted = () => { _resetEvent.Set(); };
+		return base.Given();
+	}
+
+	protected override Task When() {
+		_emittedStreamsDeleter.DeleteEmittedStreams(_onDeleteStreamCompleted);
+		return Task.CompletedTask;
+	}
+
+	[Test]
+	public void should_have_called_completed() {
+		if (!_resetEvent.WaitOne(TimeSpan.FromSeconds(10))) {
+			throw new Exception("Timed out waiting callback.");
+		}
+
+		;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_tracker/when_tracking/with_tracking_disabled.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_tracker/when_tracking/with_tracking_disabled.cs
new file mode 100644
index 00000000000..8e42c10a611
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_tracker/when_tracking/with_tracking_disabled.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_streams_tracker.when_tracking;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_tracking_disabled<TLogFormat, TStreamId> : SpecificationWithEmittedStreamsTrackerAndDeleter<TLogFormat, TStreamId> {
+	private CountdownEvent _eventAppeared = new CountdownEvent(1);
+	private UserCredentials _credentials = new UserCredentials("admin", "changeit");
+
+	protected override TimeSpan Timeout { get; } = TimeSpan.FromSeconds(10);
+
+	protected override Task Given() {
+		_trackEmittedStreams = false;
+		return base.Given();
+	}
+
+	protected override async Task When() {
+		var sub = await _conn.SubscribeToStreamAsync(_projectionNamesBuilder.GetEmittedStreamsName(), true, (s, evnt) => {
+			_eventAppeared.Signal();
+			return Task.CompletedTask;
+		}, userCredentials: _credentials);
+
+		_emittedStreamsTracker.TrackEmittedStream(new EmittedEvent[] {
+			new EmittedDataEvent(
+				"test_stream", Guid.NewGuid(), "type1", true,
+				"data", null, CheckpointTag.FromPosition(0, 100, 50), null, null)
+		});
+
+		_eventAppeared.Wait(TimeSpan.FromSeconds(5));
+		sub.Unsubscribe();
+	}
+
+	[Test]
+	public async Task should_write_a_stream_tracked_event() {
+		var result = await _conn.ReadStreamEventsForwardAsync(_projectionNamesBuilder.GetEmittedStreamsName(), 0, 200,
+			false, _credentials);
+		Assert.AreEqual(0, result.Events.Length);
+		Assert.AreEqual(1, _eventAppeared.CurrentCount); //no event appeared should get through
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_tracker/when_tracking/with_tracking_enabled.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_tracker/when_tracking/with_tracking_enabled.cs
new file mode 100644
index 00000000000..4fd117787aa
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_tracker/when_tracking/with_tracking_enabled.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_streams_tracker.when_tracking;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_tracking_enabled<TLogFormat, TStreamId> : SpecificationWithEmittedStreamsTrackerAndDeleter<TLogFormat, TStreamId> {
+	private CountdownEvent _eventAppeared = new CountdownEvent(1);
+	private UserCredentials _credentials = new UserCredentials("admin", "changeit");
+
+	protected override async Task When() {
+		var sub = await _conn.SubscribeToStreamAsync(_projectionNamesBuilder.GetEmittedStreamsName(), true, (s, evnt) => {
+			_eventAppeared.Signal();
+			return Task.CompletedTask;
+		}, userCredentials: _credentials);
+
+		_emittedStreamsTracker.TrackEmittedStream(new EmittedEvent[] {
+			new EmittedDataEvent(
+				"test_stream", Guid.NewGuid(), "type1", true,
+				"data", null, CheckpointTag.FromPosition(0, 100, 50), null, null)
+		});
+
+		_eventAppeared.Wait(TimeSpan.FromSeconds(5));
+		sub.Unsubscribe();
+	}
+
+	[Test]
+	public async Task should_write_a_stream_tracked_event() {
+		var result = await _conn.ReadStreamEventsForwardAsync(_projectionNamesBuilder.GetEmittedStreamsName(), 0, 200,
+			false, _credentials);
+		Assert.AreEqual(1, result.Events.Length);
+		Assert.AreEqual("test_stream", Helper.UTF8NoBom.GetString(result.Events[0].Event.Data));
+		Assert.AreEqual(0, _eventAppeared.CurrentCount);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_tracker/when_tracking/with_tracking_enabled_with_duplicate_event_streams.cs b/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_tracker/when_tracking/with_tracking_enabled_with_duplicate_event_streams.cs
new file mode 100644
index 00000000000..8904f2c3b65
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/emitted_streams_tracker/when_tracking/with_tracking_enabled_with_duplicate_event_streams.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.emitted_streams_tracker.when_tracking;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_tracking_enabled_with_duplicate_event_streams<TLogFormat, TStreamId> : SpecificationWithEmittedStreamsTrackerAndDeleter<TLogFormat, TStreamId> {
+	private CountdownEvent _eventAppeared = new CountdownEvent(2);
+	private UserCredentials _credentials = new UserCredentials("admin", "changeit");
+
+	protected override TimeSpan Timeout { get; } = TimeSpan.FromSeconds(10);
+
+	protected override async Task When() {
+		var sub = await _conn.SubscribeToStreamAsync(_projectionNamesBuilder.GetEmittedStreamsName(), true, (s, evnt) => {
+			_eventAppeared.Signal();
+			return Task.CompletedTask;
+		}, userCredentials: _credentials);
+
+		_emittedStreamsTracker.TrackEmittedStream(new EmittedEvent[] {
+			new EmittedDataEvent(
+				"test_stream", Guid.NewGuid(), "type1", true,
+				"data", null, CheckpointTag.FromPosition(0, 100, 50), null, null),
+			new EmittedDataEvent(
+				"test_stream", Guid.NewGuid(), "type1", true,
+				"data", null, CheckpointTag.FromPosition(0, 100, 50), null, null)
+		});
+
+		_eventAppeared.Wait(TimeSpan.FromSeconds(5));
+		sub.Unsubscribe();
+	}
+
+	[Test]
+	public async Task should_at_best_attempt_to_track_a_unique_list_of_streams() {
+		var result = await _conn.ReadStreamEventsForwardAsync(_projectionNamesBuilder.GetEmittedStreamsName(), 0, 200,
+			false, _credentials);
+		Assert.AreEqual(1, result.Events.Length);
+		Assert.AreEqual("test_stream", Helper.UTF8NoBom.GetString(result.Events[0].Event.Data));
+		Assert.AreEqual(1, _eventAppeared.CurrentCount); //only 1 event appeared should get through
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_filter/TestFixtureWithEventFilter.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/TestFixtureWithEventFilter.cs
new file mode 100644
index 00000000000..184e604e141
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/TestFixtureWithEventFilter.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_filter;
+
+public class TestFixtureWithEventFilter {
+	protected SourceDefinitionBuilder _builder;
+	protected EventFilter _ef;
+	protected Exception _exception;
+
+	[SetUp]
+	public void Setup() {
+		_builder = new SourceDefinitionBuilder();
+		Given();
+		When();
+	}
+
+	protected virtual void Given() {
+	}
+
+	protected virtual void When() {
+		_ef = null;
+		try {
+			var sources = _builder.Build();
+			_ef =
+				ReaderStrategy.Create("test", 0, sources, new RealTimeProvider(), stopOnEof: false, runAs: null)
+					.EventFilter;
+		} catch (Exception ex) {
+			_exception = ex;
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_filter/empty_event_filter.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/empty_event_filter.cs
new file mode 100644
index 00000000000..a84d71f66d6
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/empty_event_filter.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_filter;
+
+[TestFixture]
+public class empty_event_filter : TestFixtureWithEventFilter {
+	[Test]
+	public void cannot_be_built() {
+		Assert.IsAssignableFrom(typeof(InvalidOperationException), _exception);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_filter/include_everything_event_filter.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/include_everything_event_filter.cs
new file mode 100644
index 00000000000..c8cc7098753
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/include_everything_event_filter.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.ClientAPI.Common;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_filter;
+
+[TestFixture]
+public class include_everything_event_filter : TestFixtureWithEventFilter {
+	protected override void Given() {
+		_builder.FromAll();
+		_builder.AllEvents();
+	}
+
+	[Test]
+	public void can_be_built() {
+		Assert.IsNotNull(_ef);
+	}
+
+	[Test]
+	public void does_not_pass_categorized_event() {
+		Assert.IsFalse(_ef.Passes(true, "$ce-stream", "event"));
+	}
+
+	[Test]
+	public void passes_uncategorized_event() {
+		Assert.IsTrue(_ef.Passes(false, "stream", "event"));
+	}
+
+	[Test]
+	public void passes_stream_deleted_event() {
+		Assert.IsTrue(_ef.Passes(false, "stream", SystemEventTypes.StreamMetadata, isStreamDeletedEvent: true));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_filter/include_everything_handling_deleted_notifications_event_filter.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/include_everything_handling_deleted_notifications_event_filter.cs
new file mode 100644
index 00000000000..5a6d263842f
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/include_everything_handling_deleted_notifications_event_filter.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.ClientAPI.Common;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_filter;
+
+[TestFixture]
+public class include_everything_handling_deleted_notifications_event_filter : TestFixtureWithEventFilter {
+	protected override void Given() {
+		_builder.FromAll();
+		_builder.AllEvents();
+		_builder.SetHandlesStreamDeletedNotifications();
+		_builder.SetByStream();
+	}
+
+	[Test]
+	public void can_be_built() {
+		Assert.IsNotNull(_ef);
+	}
+
+	[Test]
+	public void does_not_pass_categorized_event() {
+		Assert.IsFalse(_ef.Passes(true, "$ce-stream", "event"));
+	}
+
+	[Test]
+	public void passes_uncategorized_event() {
+		Assert.IsTrue(_ef.Passes(false, "stream", "event"));
+	}
+
+	[Test]
+	public void does_not_pass_stream_deleted_event() {
+		Assert.IsFalse(_ef.Passes(false, "stream", SystemEventTypes.StreamMetadata, isStreamDeletedEvent: true));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_filter/just_all_events_event_filter.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/just_all_events_event_filter.cs
new file mode 100644
index 00000000000..73c469ca7da
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/just_all_events_event_filter.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_filter;
+
+[TestFixture]
+public class just_all_events_event_filter : TestFixtureWithEventFilter {
+	[Test]
+	public void cannot_be_built() {
+		Assert.IsAssignableFrom(typeof(InvalidOperationException), _exception);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_filter/just_from_all_event_filter.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/just_from_all_event_filter.cs
new file mode 100644
index 00000000000..4435739fad8
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/just_from_all_event_filter.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_filter;
+
+[TestFixture]
+public class just_from_all_event_filter : TestFixtureWithEventFilter {
+	[Test]
+	public void cannot_be_built() {
+		Assert.IsAssignableFrom(typeof(InvalidOperationException), _exception);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_filter/specific_category_event_filter.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/specific_category_event_filter.cs
new file mode 100644
index 00000000000..f2679da6a94
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/specific_category_event_filter.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_filter;
+
+[TestFixture]
+public class specific_category_event_filter : TestFixtureWithEventFilter {
+	protected override void Given() {
+		_builder.FromCategory("category");
+		_builder.AllEvents();
+	}
+
+	[Test]
+	public void can_be_built() {
+		Assert.IsNotNull(_ef);
+	}
+
+	[Test]
+	public void passes_event_with_correct_category() {
+		Assert.IsTrue(_ef.Passes(true, "$ce-category", "event"));
+	}
+
+	[Test]
+	public void does_not_pass_event_with_incorrect_category() {
+		Assert.IsFalse(_ef.Passes(true, "$ce-another", "event"));
+	}
+
+	[Test]
+	public void does_not_pass_uncategorized_event() {
+		Assert.IsFalse(_ef.Passes(false, "stream", "event"));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_filter/specific_event_event_filter.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/specific_event_event_filter.cs
new file mode 100644
index 00000000000..239abd9a1a5
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/specific_event_event_filter.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_filter;
+
+[TestFixture]
+public class specific_event_event_filter : TestFixtureWithEventFilter {
+	protected override void Given() {
+		_builder.FromAll();
+		_builder.IncludeEvent("event");
+	}
+
+	[Test]
+	public void can_be_built() {
+		Assert.IsNotNull(_ef);
+	}
+
+	[Test]
+	public void does_not_pass_categorized_event_with_correct_event_name() {
+		Assert.IsFalse(_ef.Passes(true, "stream", "event"));
+	}
+
+	[Test]
+	public void does_not_pass_categorized_event_with_incorrect_event_name() {
+		Assert.IsFalse(_ef.Passes(true, "stream", "incorrect_event"));
+	}
+
+	[Test]
+	public void passes_uncategorized_event_with_correct_event_name() {
+		Assert.IsTrue(_ef.Passes(false, "stream", "event"));
+	}
+
+	[Test]
+	public void does_not_pass_uncategorized_event_with_incorrect_event_name() {
+		Assert.IsFalse(_ef.Passes(true, "stream", "incorrect_event"));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_filter/specific_events_event_filter.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/specific_events_event_filter.cs
new file mode 100644
index 00000000000..65b41eccf3b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/specific_events_event_filter.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_filter;
+
+[TestFixture]
+public class specific_events_event_filter : TestFixtureWithEventFilter {
+	protected override void Given() {
+		_builder.FromAll();
+		_builder.IncludeEvent("eventOne");
+		_builder.IncludeEvent("eventTwo");
+	}
+
+	[Test]
+	public void can_be_built() {
+		Assert.IsNotNull(_ef);
+	}
+
+	[Test]
+	public void should_allow_non_linked_events() {
+		Assert.IsTrue(_ef.Passes(false, "stream", "eventOne"));
+	}
+
+	[Test]
+	public void should_allow_events_from_event_type_stream() {
+		Assert.IsTrue(_ef.Passes(true, "$et-eventOne", "eventOne"));
+	}
+
+	[Test]
+	public void should_not_allow_events_from_event_type_stream_that_is_not_included() {
+		Assert.IsFalse(_ef.Passes(true, "$et-eventThree", "eventThree"));
+	}
+
+	[Test]
+	public void should_not_allow_events_from_system_streams() {
+		Assert.IsFalse(_ef.Passes(false, "$ct-test", "eventOne"));
+	}
+
+	[Test]
+	public void should_not_allow_linked_events_from_system_streams() {
+		Assert.IsFalse(_ef.Passes(true, "$ct-test", "eventOne"));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_filter/specific_stream_and_category_event_filter.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/specific_stream_and_category_event_filter.cs
new file mode 100644
index 00000000000..e1505590c8e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/specific_stream_and_category_event_filter.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_filter;
+
+[TestFixture]
+public class specific_stream_and_category_event_filter : TestFixtureWithEventFilter {
+	protected override void Given() {
+		_builder.FromCategory("category");
+		_builder.FromStream("/test");
+		_builder.AllEvents();
+	}
+
+	[Test]
+	public void cannot_be_built() {
+		Assert.IsAssignableFrom(typeof(InvalidOperationException), _exception);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_filter/specific_stream_event_filter.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/specific_stream_event_filter.cs
new file mode 100644
index 00000000000..435ca5063b7
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/specific_stream_event_filter.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_filter;
+
+[TestFixture]
+public class specific_stream_event_filter : TestFixtureWithEventFilter {
+	protected override void Given() {
+		_builder.FromStream("/test");
+		_builder.AllEvents();
+	}
+
+	[Test]
+	public void can_be_built() {
+		Assert.IsNotNull(_ef);
+	}
+
+	[Test]
+	public void passes_categorized_event_with_correct_stream_id() {
+		//NOTE: this is possible if you read from $ce-account stream
+		// this is not the same as reading an account category as you can see at
+		// least StreamCreate even there
+		Assert.IsTrue(_ef.Passes(true, "/test", "event"));
+	}
+
+	[Test]
+	public void does_not_pass_categorized_event_with_incorrect_stream_id() {
+		Assert.IsFalse(_ef.Passes(true, "incorrect_stream", "event"));
+	}
+
+	[Test]
+	public void passes_uncategorized_event_with_correct_stream_id() {
+		Assert.IsTrue(_ef.Passes(false, "/test", "event"));
+	}
+
+	[Test]
+	public void does_not_pass_uncategorized_event_with_incorrect_stream_id() {
+		Assert.IsFalse(_ef.Passes(true, "incorrect_stream", "event"));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_filter/specific_streams_event_filter.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/specific_streams_event_filter.cs
new file mode 100644
index 00000000000..ace1b645657
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_filter/specific_streams_event_filter.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_filter;
+
+[TestFixture]
+public class specific_streams_event_filter : TestFixtureWithEventFilter {
+	protected override void Given() {
+		_builder.FromStream("a");
+		_builder.FromStream("b");
+		_builder.AllEvents();
+	}
+
+	[Test]
+	public void can_be_built() {
+		Assert.IsNotNull(_ef);
+	}
+
+	[Test]
+	public void passes_categorized_event_with_correct_stream_id() {
+		//NOTE: this is possible if you read from $ce-account stream
+		// this is not the same as reading an account category as you can see at
+		// least StreamCreate even there
+		Assert.IsTrue(_ef.Passes(true, "a", "event"));
+	}
+
+	[Test]
+	public void does_not_pass_categorized_event_with_incorrect_stream_id() {
+		Assert.IsFalse(_ef.Passes(true, "incorrect_stream", "event"));
+	}
+
+	[Test]
+	public void passes_uncategorized_event_with_correct_stream_id() {
+		Assert.IsTrue(_ef.Passes(false, "b", "event"));
+	}
+
+	[Test]
+	public void does_not_pass_uncategorized_event_with_incorrect_stream_id() {
+		Assert.IsFalse(_ef.Passes(true, "incorrect_stream", "event"));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_position.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_position.cs
new file mode 100644
index 00000000000..1de9b7ff4dc
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_position.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Data;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services;
+
+#pragma warning disable 1718 // allow a == a comparison
+[TestFixture]
+public class event_position {
+	private readonly TFPos _aa = new TFPos(10, 9);
+	private readonly TFPos _b1 = new TFPos(20, 15);
+	private readonly TFPos _b2 = new TFPos(20, 17);
+	private readonly TFPos _cc = new TFPos(30, 29);
+	private readonly TFPos _d1 = new TFPos(40, 35);
+	private readonly TFPos _d2 = new TFPos(40, 36);
+
+	[Test]
+	public void equal_equals() {
+		Assert.IsTrue(_aa.Equals(_aa));
+	}
+
+	[Test]
+	public void equal_operator() {
+		Assert.IsTrue(_b1 == _b1);
+	}
+
+	[Test]
+	public void less_operator() {
+		Assert.IsTrue(_aa < _b1);
+		Assert.IsTrue(_b1 < _b2);
+	}
+
+	[Test]
+	public void less_or_equal_operator() {
+		Assert.IsTrue(_aa <= _b1);
+		Assert.IsTrue(_b1 <= _b2);
+		Assert.IsTrue(_b2 <= _b2);
+	}
+
+	[Test]
+	public void greater_operator() {
+		Assert.IsTrue(_d1 > _cc);
+		Assert.IsTrue(_d2 > _d1);
+	}
+
+	[Test]
+	public void greater_or_equal_operator() {
+		Assert.IsTrue(_d1 >= _cc);
+		Assert.IsTrue(_d2 >= _d1);
+		Assert.IsTrue(_b2 >= _b2);
+	}
+}
+#pragma warning restore 1718
+
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/TestFixtureWithEventReaderService.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/TestFixtureWithEventReaderService.cs
new file mode 100644
index 00000000000..4b21446e94b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/TestFixtureWithEventReaderService.cs
@@ -0,0 +1,91 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader;
+
+public class TestFixtureWithEventReaderService<TLogFormat, TStreamId> : core_projection.TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	protected EventReaderCoreService _readerService;
+
+	protected override void Given1() {
+		base.Given1();
+		EnableReadAll();
+	}
+
+	protected override ManualQueue GiveInputQueue() {
+		return new ManualQueue(_bus, _timeProvider);
+	}
+
+	[SetUp]
+	public void Setup() {
+		_bus.Subscribe(_consumer);
+
+		ICheckpoint writerCheckpoint = new InMemoryCheckpoint(1000);
+		_readerService = new EventReaderCoreService(
+			GetInputQueue(), _ioDispatcher, 10, writerCheckpoint, runHeadingReader: GivenHeadingReaderRunning(),
+			faultOutOfOrderProjections: true);
+		_subscriptionDispatcher = new ReaderSubscriptionDispatcher(GetInputQueue());
+
+
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CheckpointSuggested>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CommittedEventReceived>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.EofReached>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionEofReached>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ProgressChanged>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.SubscriptionStarted>());
+		_bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.NotAuthorized>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ReaderAssignedReader>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.Failed>());
+		_bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.SubscribeTimeout>());
+
+		_bus.Subscribe<ReaderCoreServiceMessage.StartReader>(_readerService);
+		_bus.Subscribe<ReaderCoreServiceMessage.StopReader>(_readerService);
+		_bus.Subscribe<ReaderSubscriptionMessage.CommittedEventDistributed>(_readerService);
+		_bus.Subscribe<ReaderSubscriptionMessage.EventReaderEof>(_readerService);
+		_bus.Subscribe<ReaderSubscriptionMessage.EventReaderPartitionEof>(_readerService);
+		_bus.Subscribe<ReaderSubscriptionMessage.EventReaderPartitionDeleted>(_readerService);
+		_bus.Subscribe<ReaderSubscriptionMessage.EventReaderNotAuthorized>(_readerService);
+		_bus.Subscribe<ReaderSubscriptionMessage.EventReaderIdle>(_readerService);
+		_bus.Subscribe<ReaderSubscriptionMessage.EventReaderStarting>(_readerService);
+		_bus.Subscribe<ReaderSubscriptionManagement.Pause>(_readerService);
+		_bus.Subscribe<ReaderSubscriptionManagement.Resume>(_readerService);
+		_bus.Subscribe<ReaderSubscriptionManagement.Subscribe>(_readerService);
+		_bus.Subscribe<ReaderSubscriptionManagement.Unsubscribe>(_readerService);
+
+		GivenAdditionalServices();
+
+		_bus.Publish(new ReaderCoreServiceMessage.StartReader(Guid.NewGuid()));
+
+		WhenLoop();
+	}
+
+	protected virtual bool GivenHeadingReaderRunning() {
+		return false;
+	}
+
+	protected virtual void GivenAdditionalServices() {
+	}
+
+	protected Guid GetReaderId() {
+		var readerAssignedMessage =
+			_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.ReaderAssignedReader>().LastOrDefault();
+		Assert.IsNotNull(readerAssignedMessage);
+		var reader = readerAssignedMessage.ReaderId;
+		return reader;
+	}
+}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/all_streams_with_links_event_reader/when_including_links.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/all_streams_with_links_event_reader/when_including_links.cs
similarity index 80%
rename from src/EventStore.Projections.Core.Tests/Services/event_reader/all_streams_with_links_event_reader/when_including_links.cs
rename to src/KurrentDB.Projections.Core.Tests/Services/event_reader/all_streams_with_links_event_reader/when_including_links.cs
index b403eae5663..fe6e1d3b0db 100644
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/all_streams_with_links_event_reader/when_including_links.cs
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/all_streams_with_links_event_reader/when_including_links.cs
@@ -1,15 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
 using NUnit.Framework;
 
-namespace EventStore.Projections.Core.Tests.Services.event_reader.all_streams_with_links_event_reader {
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.all_streams_with_links_event_reader {
 	namespace when_including_links {
 		[TestFixture(typeof(LogFormat.V2), typeof(string))]
 		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/all_streams_with_links_event_reader/when_not_including_links.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/all_streams_with_links_event_reader/when_not_including_links.cs
similarity index 80%
rename from src/EventStore.Projections.Core.Tests/Services/event_reader/all_streams_with_links_event_reader/when_not_including_links.cs
rename to src/KurrentDB.Projections.Core.Tests/Services/event_reader/all_streams_with_links_event_reader/when_not_including_links.cs
index 1de699fcb73..6e19d4d5517 100644
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/all_streams_with_links_event_reader/when_not_including_links.cs
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/all_streams_with_links_event_reader/when_not_including_links.cs
@@ -1,15 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
 using NUnit.Framework;
 
-namespace EventStore.Projections.Core.Tests.Services.event_reader.all_streams_with_links_event_reader {
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.all_streams_with_links_event_reader {
 	namespace when_not_including_links {
 		[TestFixture(typeof(LogFormat.V2), typeof(string))]
 		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/EventByTypeIndexEventReaderTestFixture.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/EventByTypeIndexEventReaderTestFixture.cs
similarity index 81%
rename from src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/EventByTypeIndexEventReaderTestFixture.cs
rename to src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/EventByTypeIndexEventReaderTestFixture.cs
index f4a8f6f80e6..c5f951c450e 100644
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/EventByTypeIndexEventReaderTestFixture.cs
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/EventByTypeIndexEventReaderTestFixture.cs
@@ -1,10 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Tests.Services.core_projection;
-using ResolvedEvent = EventStore.Core.Data.ResolvedEvent;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.event_by_type_index_event_reader;
 
 public abstract class EventByTypeIndexEventReaderTestFixture<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
 	public Guid CompleteForwardStreamRead(string streamId, Guid corrId, params ResolvedEvent[] events) {
@@ -40,7 +46,7 @@ public Guid CompleteBackwardStreamRead(string streamId, Guid corrId, params Reso
 
 	public Guid TimeoutRead(string streamId, Guid corrId) {
 		var timeoutMessage = _consumer.HandledMessages
-			.OfType<EventStore.Core.Services.TimerService.TimerMessage.Schedule>().Last(x =>
+			.OfType<TimerMessage.Schedule>().Last(x =>
 				((ProjectionManagementMessage.Internal.ReadTimeout)x.ReplyMessage).StreamId == streamId);
 		var correlationId = ((ProjectionManagementMessage.Internal.ReadTimeout)timeoutMessage.ReplyMessage)
 			.CorrelationId;
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_index_based_checkpoint_read_timeout_occurs.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_index_based_checkpoint_read_timeout_occurs.cs
new file mode 100644
index 00000000000..f6a269ee0c2
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_index_based_checkpoint_read_timeout_occurs.cs
@@ -0,0 +1,103 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.EventByType;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.event_by_type_index_event_reader;
+
+[Category("test")]
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_index_based_checkpoint_read_timeout_occurs<TLogFormat, TStreamId> : EventByTypeIndexEventReaderTestFixture<TLogFormat, TStreamId> {
+	private EventByTypeIndexEventReader _eventReader;
+	private Guid _distributionCorrelationId;
+	private Guid _checkpointStreamCorrelationId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	private FakeTimeProvider _fakeTimeProvider;
+
+	[SetUp]
+	public new void When() {
+		_distributionCorrelationId = Guid.NewGuid();
+		_fakeTimeProvider = new FakeTimeProvider();
+		var fromPositions = new Dictionary<string, long>();
+		fromPositions.Add("$et-eventTypeOne", 0);
+		fromPositions.Add("$et-eventTypeTwo", 0);
+		_eventReader = new EventByTypeIndexEventReader(_bus, _distributionCorrelationId,
+			null, new[] { "eventTypeOne", "eventTypeTwo" },
+			false, new TFPos(0, 0),
+			fromPositions, true,
+			_fakeTimeProvider,
+			stopOnEof: true);
+
+		_eventReader.Resume();
+
+		_checkpointStreamCorrelationId = TimeoutRead("$et", Guid.Empty);
+
+		CompleteForwardStreamRead("$et-eventTypeOne", Guid.Empty, new[] {
+			ResolvedEvent.ForUnresolvedEvent(
+				new EventRecord(
+					1, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "$et-eventTypeOne", ExpectedVersion.Any,
+					DateTime.UtcNow,
+					PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
+					PrepareFlags.IsJson,
+					"$>", Helper.UTF8NoBom.GetBytes("0@test-stream"),
+					Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(50, 50))))),
+			ResolvedEvent.ForUnresolvedEvent(
+				new EventRecord(
+					2, 150, Guid.NewGuid(), Guid.NewGuid(), 150, 0, "$et-eventTypeOne", ExpectedVersion.Any,
+					DateTime.UtcNow,
+					PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+					"$>", Helper.UTF8NoBom.GetBytes("1@test-stream"),
+					Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(150, 150)))))
+		});
+
+		CompleteForwardStreamRead("$et-eventTypeTwo", Guid.Empty, new[] {
+			ResolvedEvent.ForUnresolvedEvent(
+				new EventRecord(
+					1, 100, Guid.NewGuid(), Guid.NewGuid(), 100, 0, "$et-eventTypeTwo", ExpectedVersion.Any,
+					DateTime.UtcNow,
+					PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
+					PrepareFlags.IsJson,
+					"$>", Helper.UTF8NoBom.GetBytes("2@test-stream"),
+					Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(100, 100))))),
+			ResolvedEvent.ForUnresolvedEvent(
+				new EventRecord(
+					2, 200, Guid.NewGuid(), Guid.NewGuid(), 200, 0, "$et-eventTypeTwo", ExpectedVersion.Any,
+					DateTime.UtcNow,
+					PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+					"$>", Helper.UTF8NoBom.GetBytes("3@test-stream"),
+					Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(200, 200)))))
+		});
+	}
+
+	[Test]
+	public void should_not_deliver_events() {
+		Assert.AreEqual(0,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+	}
+
+	[Test]
+	public void should_attempt_another_checkpoint_read() {
+		var checkpointReads = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsBackward>()
+			.Where(x => x.EventStreamId == "$et");
+
+		Assert.AreEqual(checkpointReads.First().CorrelationId, _checkpointStreamCorrelationId);
+		Assert.AreEqual(1, checkpointReads.Skip(1).Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_index_based_read_completes_before_timeout.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_index_based_read_completes_before_timeout.cs
new file mode 100644
index 00000000000..2552f1fe6ac
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_index_based_read_completes_before_timeout.cs
@@ -0,0 +1,93 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.EventByType;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.event_by_type_index_event_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_index_based_read_completes_before_timeout<TLogFormat, TStreamId> : EventByTypeIndexEventReaderTestFixture<TLogFormat, TStreamId> {
+	private EventByTypeIndexEventReader _eventReader;
+	private Guid _distributionCorrelationId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	private FakeTimeProvider _fakeTimeProvider;
+
+	[SetUp]
+	public new void When() {
+		_distributionCorrelationId = Guid.NewGuid();
+		_fakeTimeProvider = new FakeTimeProvider();
+		var fromPositions = new Dictionary<string, long>();
+		fromPositions.Add("$et-eventTypeOne", 0);
+		fromPositions.Add("$et-eventTypeTwo", 0);
+		_eventReader = new EventByTypeIndexEventReader(_bus, _distributionCorrelationId,
+			null, new string[] { "eventTypeOne", "eventTypeTwo" },
+			false, new TFPos(-1, -1),
+			fromPositions, true,
+			_fakeTimeProvider,
+			stopOnEof: true);
+
+		_eventReader.Resume();
+
+		var correlationId = CompleteForwardStreamRead("$et-eventTypeOne", Guid.Empty, new[] {
+			ResolvedEvent.ForUnresolvedEvent(
+				new EventRecord(
+					1, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "$et-eventTypeOne", ExpectedVersion.Any,
+					DateTime.UtcNow,
+					PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
+					PrepareFlags.IsJson,
+					"$>", Helper.UTF8NoBom.GetBytes("0@test-stream"),
+					Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(50, 50))))),
+			ResolvedEvent.ForUnresolvedEvent(
+				new EventRecord(
+					2, 150, Guid.NewGuid(), Guid.NewGuid(), 150, 0, "$et-eventTypeOne", ExpectedVersion.Any,
+					DateTime.UtcNow,
+					PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+					"$>", Helper.UTF8NoBom.GetBytes("1@test-stream"),
+					Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(150, 150)))))
+		});
+
+		TimeoutRead("$et-eventTypeOne", correlationId);
+
+		correlationId = CompleteForwardStreamRead("$et-eventTypeTwo", Guid.Empty, new[] {
+			ResolvedEvent.ForUnresolvedEvent(
+				new EventRecord(
+					1, 100, Guid.NewGuid(), Guid.NewGuid(), 100, 0, "$et-eventTypeTwo", ExpectedVersion.Any,
+					DateTime.UtcNow,
+					PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
+					PrepareFlags.IsJson,
+					"$>", Helper.UTF8NoBom.GetBytes("2@test-stream"),
+					Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(100, 100))))),
+			ResolvedEvent.ForUnresolvedEvent(
+				new EventRecord(
+					2, 200, Guid.NewGuid(), Guid.NewGuid(), 200, 0, "$et-eventTypeTwo", ExpectedVersion.Any,
+					DateTime.UtcNow,
+					PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+					"$>", Helper.UTF8NoBom.GetBytes("3@test-stream"),
+					Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(200, 200)))))
+		});
+
+		TimeoutRead("$et-eventTypeTwo", correlationId);
+	}
+
+	[Test]
+	public void should_deliver_events() {
+		Assert.AreEqual(3,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_index_based_read_timeout_occurs.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_index_based_read_timeout_occurs.cs
new file mode 100644
index 00000000000..2bdab77a63e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_index_based_read_timeout_occurs.cs
@@ -0,0 +1,111 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.EventByType;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.event_by_type_index_event_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_index_based_read_timeout_occurs<TLogFormat, TStreamId> : EventByTypeIndexEventReaderTestFixture<TLogFormat, TStreamId> {
+	private EventByTypeIndexEventReader _eventReader;
+	private Guid _distributionCorrelationId;
+	private Guid _eventTypeOneStreamReadCorrelationId;
+	private Guid _eventTypeTwoStreamReadCorrelationId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	private FakeTimeProvider _fakeTimeProvider;
+
+	[SetUp]
+	public new void When() {
+		_distributionCorrelationId = Guid.NewGuid();
+		_fakeTimeProvider = new FakeTimeProvider();
+		var fromPositions = new Dictionary<string, long>();
+		fromPositions.Add("$et-eventTypeOne", 0);
+		fromPositions.Add("$et-eventTypeTwo", 0);
+		_eventReader = new EventByTypeIndexEventReader(_bus, _distributionCorrelationId,
+			null, new string[] { "eventTypeOne", "eventTypeTwo" },
+			false, new TFPos(0, 0),
+			fromPositions, true,
+			_fakeTimeProvider,
+			stopOnEof: true);
+
+		_eventReader.Resume();
+
+		_eventTypeOneStreamReadCorrelationId = TimeoutRead("$et-eventTypeOne", Guid.Empty);
+
+		CompleteForwardStreamRead("$et-eventTypeOne", _eventTypeOneStreamReadCorrelationId, new[] {
+			ResolvedEvent.ForUnresolvedEvent(
+				new EventRecord(
+					1, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "$et-eventTypeOne", ExpectedVersion.Any,
+					DateTime.UtcNow,
+					PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
+					PrepareFlags.IsJson,
+					"$>", Helper.UTF8NoBom.GetBytes("0@test-stream"),
+					Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(50, 50))))),
+			ResolvedEvent.ForUnresolvedEvent(
+				new EventRecord(
+					2, 150, Guid.NewGuid(), Guid.NewGuid(), 150, 0, "$et-eventTypeOne", ExpectedVersion.Any,
+					DateTime.UtcNow,
+					PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+					"$>", Helper.UTF8NoBom.GetBytes("1@test-stream"),
+					Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(150, 150)))))
+		});
+
+		_eventTypeTwoStreamReadCorrelationId = TimeoutRead("$et-eventTypeTwo", Guid.Empty);
+
+		CompleteForwardStreamRead("$et-eventTypeTwo", _eventTypeTwoStreamReadCorrelationId, new[] {
+			ResolvedEvent.ForUnresolvedEvent(
+				new EventRecord(
+					1, 100, Guid.NewGuid(), Guid.NewGuid(), 100, 0, "$et-eventTypeTwo", ExpectedVersion.Any,
+					DateTime.UtcNow,
+					PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
+					PrepareFlags.IsJson,
+					"$>", Helper.UTF8NoBom.GetBytes("2@test-stream"),
+					Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(100, 100))))),
+			ResolvedEvent.ForUnresolvedEvent(
+				new EventRecord(
+					2, 200, Guid.NewGuid(), Guid.NewGuid(), 200, 0, "$et-eventTypeTwo", ExpectedVersion.Any,
+					DateTime.UtcNow,
+					PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+					"$>", Helper.UTF8NoBom.GetBytes("3@test-stream"),
+					Helper.UTF8NoBom.GetBytes(TFPosToMetadata(new TFPos(200, 200)))))
+		});
+	}
+
+	[Test]
+	public void should_not_deliver_events() {
+		Assert.AreEqual(0,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+	}
+
+	[Test]
+	public void should_attempt_another_read_for_the_timed_out_reads() {
+		var eventTypeOneStreamReads = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Where(x => x.EventStreamId == "$et-eventTypeOne");
+
+		Assert.AreEqual(eventTypeOneStreamReads.First().CorrelationId, _eventTypeOneStreamReadCorrelationId);
+		Assert.AreEqual(1, eventTypeOneStreamReads.Skip(1).Count());
+
+		var eventTypeTwoStreamReads = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Where(x => x.EventStreamId == "$et-eventTypeTwo");
+
+		Assert.AreEqual(eventTypeTwoStreamReads.First().CorrelationId, _eventTypeTwoStreamReadCorrelationId);
+		Assert.AreEqual(1, eventTypeTwoStreamReads.Skip(1).Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_tf_based_read_completes_before_timeout.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_tf_based_read_completes_before_timeout.cs
new file mode 100644
index 00000000000..06aa547eddd
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_tf_based_read_completes_before_timeout.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.EventByType;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.event_by_type_index_event_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_tf_based_read_completes_before_timeout<TLogFormat, TStreamId> : EventByTypeIndexEventReaderTestFixture<TLogFormat, TStreamId> {
+	private EventByTypeIndexEventReader _eventReader;
+	private Guid _distributionCorrelationId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	private FakeTimeProvider _fakeTimeProvider;
+
+	[SetUp]
+	public new void When() {
+		_distributionCorrelationId = Guid.NewGuid();
+		_fakeTimeProvider = new FakeTimeProvider();
+		var fromPositions = new Dictionary<string, long>();
+		fromPositions.Add("$et-eventTypeOne", 0);
+		fromPositions.Add("$et-eventTypeTwo", 0);
+		_eventReader = new EventByTypeIndexEventReader(_bus, _distributionCorrelationId,
+			null, new string[] { "eventTypeOne", "eventTypeTwo" },
+			false, new TFPos(0, 0),
+			fromPositions, true,
+			_fakeTimeProvider,
+			stopOnEof: true);
+
+		_eventReader.Resume();
+
+		CompleteForwardStreamRead("$et-eventTypeOne", Guid.Empty);
+		CompleteForwardStreamRead("$et-eventTypeTwo", Guid.Empty);
+		CompleteBackwardStreamRead("$et", Guid.Empty);
+
+		var correlationId = CompleteForwardAllStreamRead(Guid.Empty, new[] {
+			ResolvedEvent.ForUnresolvedEvent(
+				new EventRecord(
+					1, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "test_stream", ExpectedVersion.Any,
+					_fakeTimeProvider.UtcNow,
+					PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+					"eventTypeOne", new byte[] {1}, new byte[] {2}), 100),
+			ResolvedEvent.ForUnresolvedEvent(
+				new EventRecord(
+					2, 150, Guid.NewGuid(), Guid.NewGuid(), 150, 0, "test_stream", ExpectedVersion.Any,
+					_fakeTimeProvider.UtcNow,
+					PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+					"eventTypeTwo", new byte[] {1}, new byte[] {2}), 200),
+		});
+
+		TimeoutRead("$all", correlationId);
+	}
+
+	[Test]
+	public void should_deliver_events() {
+		Assert.AreEqual(2,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_tf_based_read_timeout_occurs.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_tf_based_read_timeout_occurs.cs
new file mode 100644
index 00000000000..262c98134b5
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_event_reader/when_tf_based_read_timeout_occurs.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.EventByType;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.event_by_type_index_event_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_tf_based_read_timeout_occurs<TLogFormat, TStreamId> : EventByTypeIndexEventReaderTestFixture<TLogFormat, TStreamId> {
+	private EventByTypeIndexEventReader _eventReader;
+	private Guid _distributionCorrelationId;
+	private Guid _readAllEventsForwardCorrelationId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	private FakeTimeProvider _fakeTimeProvider;
+
+	[SetUp]
+	public new void When() {
+		_distributionCorrelationId = Guid.NewGuid();
+		_fakeTimeProvider = new FakeTimeProvider();
+		var fromPositions = new Dictionary<string, long>();
+		fromPositions.Add("$et-eventTypeOne", 0);
+		fromPositions.Add("$et-eventTypeTwo", 0);
+		_eventReader = new EventByTypeIndexEventReader(_bus, _distributionCorrelationId,
+			null, new string[] { "eventTypeOne", "eventTypeTwo" },
+			false, new TFPos(0, 0),
+			fromPositions, true,
+			_fakeTimeProvider,
+			stopOnEof: true);
+
+		_eventReader.Resume();
+
+		CompleteForwardStreamRead("$et-eventTypeOne", Guid.Empty);
+		CompleteForwardStreamRead("$et-eventTypeTwo", Guid.Empty);
+		CompleteBackwardStreamRead("$et", Guid.Empty);
+
+		_readAllEventsForwardCorrelationId = TimeoutRead("$all", Guid.Empty);
+
+		CompleteForwardAllStreamRead(_readAllEventsForwardCorrelationId, new[] {
+			ResolvedEvent.ForUnresolvedEvent(
+				new EventRecord(
+					1, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "test_stream", ExpectedVersion.Any,
+					_fakeTimeProvider.UtcNow,
+					PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+					"eventTypeOne", new byte[] {1}, new byte[] {2}), 100),
+			ResolvedEvent.ForUnresolvedEvent(
+				new EventRecord(
+					2, 150, Guid.NewGuid(), Guid.NewGuid(), 150, 0, "test_stream", ExpectedVersion.Any,
+					_fakeTimeProvider.UtcNow,
+					PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+					"eventTypeTwo", new byte[] {1}, new byte[] {2}), 200),
+		});
+	}
+
+	[Test]
+	public void should_not_deliver_events() {
+		Assert.AreEqual(0,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+	}
+
+	[Test]
+	public void should_attempt_another_read_for_the_timed_out_reads() {
+		var readAllEventsForwardMessages = _consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>();
+
+		Assert.AreEqual(readAllEventsForwardMessages.First().CorrelationId, _readAllEventsForwardCorrelationId);
+		Assert.AreEqual(1, readAllEventsForwardMessages.Skip(1).Count());
+	}
+}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_reader/catching_up/index_checkpoint.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_reader/catching_up/index_checkpoint.cs
similarity index 83%
rename from src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_reader/catching_up/index_checkpoint.cs
rename to src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_reader/catching_up/index_checkpoint.cs
index d959658b57c..013e62156f5 100644
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_reader/catching_up/index_checkpoint.cs
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_reader/catching_up/index_checkpoint.cs
@@ -1,18 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
 using NUnit.Framework;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
 
-namespace EventStore.Projections.Core.Tests.Services.event_reader.event_by_type_index_reader.catching_up {
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.event_by_type_index_reader.catching_up {
 	namespace index_checkpoint {
 		abstract class with_some_indexed_events<TLogFormat, TStreamId> : TestFixtureWithEventReaderService<TLogFormat, TStreamId> {
 			protected Guid _subscriptionId;
@@ -39,7 +41,7 @@ protected override void Given() {
 				_subscriptionId = Guid.NewGuid();
 				_sourceDefinition = new QuerySourcesDefinition {
 					AllStreams = true,
-					Events = new[] {"type1", "type2"},
+					Events = new[] { "type1", "type2" },
 					Options = new QuerySourcesDefinitionOptions { }
 				};
 				_readerStrategy = ReaderStrategy.Create(
@@ -69,10 +71,10 @@ public void returns_events_in_original_order() {
 
 				Assert.That(
 					(from e in receivedEvents
-						orderby e.Data.EventSequenceNumber
-						select e.Data.EventSequenceNumber)
+					 orderby e.Data.EventSequenceNumber
+					 select e.Data.EventSequenceNumber)
 					.SequenceEqual(from e in receivedEvents
-						select e.Data.EventSequenceNumber),
+								   select e.Data.EventSequenceNumber),
 					"Incorrect event order received");
 			}
 		}
@@ -84,19 +86,19 @@ protected override void GivenInitialIndexState() {
 				ExistingEvent("$et-type1", "$>", TFPosToMetadata(_tfPos1), "0@test-stream");
 
 
-				// NOTE: do not configure $et and $et-type2 to delay ReadCompleted on this stream 
+				// NOTE: do not configure $et and $et-type2 to delay ReadCompleted on this stream
 				// ExistingEvent("$et-type2", "$>", TFPosToMetadata(_tfPos2), "1@test-stream");
 				// NoStream("$et");
 			}
 
 			protected override IEnumerable<WhenStep> When() {
 				var fromZeroPosition = CheckpointTag.FromEventTypeIndexPositions(
-					0, new TFPos(0, -1), new Dictionary<string, long> {{"type1", -1}, {"type2", -1}});
+					0, new TFPos(0, -1), new Dictionary<string, long> { { "type1", -1 }, { "type2", -1 } });
 				yield return
 					new ReaderSubscriptionManagement.Subscribe(
 						_subscriptionId, fromZeroPosition, _readerStrategy, _readerSubscriptionOptions);
 				//DisableTimer();
-				yield return CreateWriteEvent("test-stream", "type1", "{Data: 3}", "{}");
+				yield return CreateWriteEvent("test-stream", "type1", """{"Data": 3}""", "{}");
 				_tfPos3 = _all.Last(v => v.Value.EventStreamId == "test-stream").Key;
 
 				yield return
@@ -138,13 +140,13 @@ protected override void GivenInitialIndexState() {
 				ExistingEvent("$et-type2", "$>", TFPosToMetadata(_tfPos2), "1@test-stream");
 
 
-				// NOTE: do not configure $et to delay ReadCompleted on this stream 
+				// NOTE: do not configure $et to delay ReadCompleted on this stream
 				// NoStream("$et");
 			}
 
 			protected override IEnumerable<WhenStep> When() {
 				var fromZeroPosition = CheckpointTag.FromEventTypeIndexPositions(
-					0, new TFPos(0, -1), new Dictionary<string, long> {{"type1", -1}, {"type2", -1}});
+					0, new TFPos(0, -1), new Dictionary<string, long> { { "type1", -1 }, { "type2", -1 } });
 				yield return
 					new ReaderSubscriptionManagement.Subscribe(
 						_subscriptionId, fromZeroPosition, _readerStrategy, _readerSubscriptionOptions);
@@ -160,7 +162,7 @@ public void returns_just_first_event_which_is_safe_to_return() {
 				var receivedEvents =
 					_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.CommittedEventReceived>().ToArray();
 
-				//NOTE: 
+				//NOTE:
 				// the first event is safe to read as we know the next event in another stream
 				// the second event is not safe as there is no more events in the first stream and checkpoint is not yet available
 				Assert.AreEqual(1, receivedEvents.Length);
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_reader/catching_up/when_one_event_type_has_been_never_emitted.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_reader/catching_up/when_one_event_type_has_been_never_emitted.cs
similarity index 80%
rename from src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_reader/catching_up/when_one_event_type_has_been_never_emitted.cs
rename to src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_reader/catching_up/when_one_event_type_has_been_never_emitted.cs
index e9f4e11394b..e4afc5439d3 100644
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_reader/catching_up/when_one_event_type_has_been_never_emitted.cs
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_reader/catching_up/when_one_event_type_has_been_never_emitted.cs
@@ -1,17 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
 using NUnit.Framework;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
 
-namespace EventStore.Projections.Core.Tests.Services.event_reader.event_by_type_index_reader.catching_up {
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.event_by_type_index_reader.catching_up {
 	namespace when_one_event_type_has_been_never_emitted {
 		abstract class with_one_event_type_has_been_never_emitted<TLogFormat, TStreamId> : TestFixtureWithEventReaderService<TLogFormat, TStreamId> {
 			protected const int TailLength = 10;
@@ -45,7 +47,7 @@ protected override void Given() {
 				_subscriptionId = Guid.NewGuid();
 				_sourceDefinition = new QuerySourcesDefinition {
 					AllStreams = true,
-					Events = new[] {"type1", "type2"},
+					Events = new[] { "type1", "type2" },
 					Options = new QuerySourcesDefinitionOptions { }
 				};
 				_readerStrategy = ReaderStrategy.Create(
@@ -83,10 +85,10 @@ public void returns_events_in_original_order() {
 
 				Assert.That(
 					(from e in receivedEvents
-						orderby e.Data.EventSequenceNumber
-						select e.Data.EventSequenceNumber)
+					 orderby e.Data.EventSequenceNumber
+					 select e.Data.EventSequenceNumber)
 					.SequenceEqual(from e in receivedEvents
-						select e.Data.EventSequenceNumber),
+								   select e.Data.EventSequenceNumber),
 					"Incorrect event order received");
 			}
 		}
@@ -109,7 +111,7 @@ protected override void GivenInitialIndexState() {
 
 			protected override IEnumerable<WhenStep> When() {
 				var fromZeroPosition = CheckpointTag.FromEventTypeIndexPositions(
-					0, new TFPos(0, -1), new Dictionary<string, long> {{"type1", -1}, {"type2", -1}});
+					0, new TFPos(0, -1), new Dictionary<string, long> { { "type1", -1 }, { "type2", -1 } });
 				yield return
 					new ReaderSubscriptionManagement.Subscribe(
 						_subscriptionId, fromZeroPosition, _readerStrategy, _readerSubscriptionOptions);
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_reader/catching_up/when_reordering_happens_in_event_by_type_index.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_reader/catching_up/when_reordering_happens_in_event_by_type_index.cs
similarity index 84%
rename from src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_reader/catching_up/when_reordering_happens_in_event_by_type_index.cs
rename to src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_reader/catching_up/when_reordering_happens_in_event_by_type_index.cs
index 676308aa866..12e39bfaf76 100644
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/event_by_type_index_reader/catching_up/when_reordering_happens_in_event_by_type_index.cs
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_by_type_index_reader/catching_up/when_reordering_happens_in_event_by_type_index.cs
@@ -1,18 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
 using NUnit.Framework;
 
-namespace EventStore.Projections.Core.Tests.Services.event_reader.event_by_type_index_reader.catching_up {
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.event_by_type_index_reader.catching_up {
 	namespace when_reordering_happens_in_event_by_type_index {
 		abstract class ReadingReorderedEventsInTheIndexTestFixture<TLogFormat, TStreamId> : TestFixtureWithEventReaderService<TLogFormat, TStreamId> {
 			protected Guid _subscriptionId;
@@ -40,7 +42,7 @@ protected override void Given() {
 				_subscriptionId = Guid.NewGuid();
 				_sourceDefinition = new QuerySourcesDefinition {
 					AllStreams = true,
-					Events = new[] {"type1", "type2"},
+					Events = new[] { "type1", "type2" },
 					Options = new QuerySourcesDefinitionOptions { }
 				};
 				_readerStrategy = ReaderStrategy.Create(
@@ -78,8 +80,8 @@ public void returns_events_in_original_order() {
 					_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.CommittedEventReceived>().ToArray();
 
 				Assert.That(
-					new long[] {0, 1, 2}.SequenceEqual(from e in receivedEvents
-						select e.Data.EventSequenceNumber),
+					new long[] { 0, 1, 2 }.SequenceEqual(from e in receivedEvents
+														 select e.Data.EventSequenceNumber),
 					"Incorrect event order received");
 			}
 		}
@@ -95,7 +97,7 @@ protected override void GivenInitialIndexState() {
 
 			protected override IEnumerable<WhenStep> When() {
 				var fromZeroPosition = CheckpointTag.FromEventTypeIndexPositions(
-					0, new TFPos(0, -1), new Dictionary<string, long> {{"type1", -1}, {"type2", -1}});
+					0, new TFPos(0, -1), new Dictionary<string, long> { { "type1", -1 }, { "type2", -1 } });
 				yield return
 					new ReaderSubscriptionManagement.Subscribe(
 						_subscriptionId, fromZeroPosition, _readerStrategy, _readerSubscriptionOptions);
@@ -135,7 +137,7 @@ protected override void GivenInitialIndexState() {
 
 			protected override IEnumerable<WhenStep> When() {
 				var fromZeroPosition = CheckpointTag.FromEventTypeIndexPositions(
-					0, new TFPos(0, -1), new Dictionary<string, long> {{"type1", -1}, {"type2", -1}});
+					0, new TFPos(0, -1), new Dictionary<string, long> { { "type1", -1 }, { "type2", -1 } });
 				yield return
 					new ReaderSubscriptionManagement.Subscribe(
 						_subscriptionId, fromZeroPosition, _readerStrategy, _readerSubscriptionOptions);
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/event_reader_core_service/when_handling_subscribe_requests.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_reader_core_service/when_handling_subscribe_requests.cs
similarity index 85%
rename from src/EventStore.Projections.Core.Tests/Services/event_reader/event_reader_core_service/when_handling_subscribe_requests.cs
rename to src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_reader_core_service/when_handling_subscribe_requests.cs
index cade0936d8c..2369f409d9f 100644
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/event_reader_core_service/when_handling_subscribe_requests.cs
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/event_reader_core_service/when_handling_subscribe_requests.cs
@@ -1,21 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
-using EventStore.Projections.Core.Tests.Services.event_reader.heading_event_reader;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+using KurrentDB.Projections.Core.Tests.Services.event_reader.heading_event_reader;
 using NUnit.Framework;
 
-namespace EventStore.Projections.Core.Tests.Services.event_reader.event_reader_core_service;
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.event_reader_core_service;
 [TestFixture(typeof(LogFormat.V2), typeof(string))]
 [TestFixture(typeof(LogFormat.V3), typeof(uint))]
-public class when_handling_subscribe_requests<TLogFormat, TStreamId> :TestFixtureWithEventReaderService<TLogFormat, TStreamId> {
-	private readonly ReaderSubscriptionOptions _defaultOptions = new (1000, 10, 1000, false, null, false);
+public class when_handling_subscribe_requests<TLogFormat, TStreamId> : TestFixtureWithEventReaderService<TLogFormat, TStreamId> {
+	private readonly ReaderSubscriptionOptions _defaultOptions = new(1000, 10, 1000, false, null, false);
 	[Test]
 	public void should_publish_subscription_failed_if_the_reader_is_not_running() {
 		EventReaderSubscriptionMessage.Failed failedMessage = null;
@@ -65,7 +68,7 @@ public void should_publish_subscription_failed_if_creating_the_paused_event_read
 		Assert.True(failedMessage.Reason.Contains(nameof(FakeReaderSubscriptionThatThrows)));
 	}
 
-	private class FakeReaderStrategyThatThrows :IReaderStrategy {
+	private class FakeReaderStrategyThatThrows : IReaderStrategy {
 		private readonly bool _throwOnCreateSubscription;
 		private readonly bool _throwOnCreatePausedReader;
 
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/FakeReaderSubscription.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/FakeReaderSubscription.cs
new file mode 100644
index 00000000000..c925fe2c90e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/FakeReaderSubscription.cs
@@ -0,0 +1,183 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.heading_event_reader;
+
+public class FakeReaderSubscription : IReaderSubscription {
+	private readonly IPublisher _publisher;
+	private readonly Guid _subscriptionId;
+
+	public FakeReaderSubscription() {
+		_subscriptionId = Guid.NewGuid();
+	}
+
+	public FakeReaderSubscription(IPublisher publisher, Guid subscriptionId) {
+		_publisher = publisher;
+		_subscriptionId = subscriptionId;
+	}
+	private readonly List<ReaderSubscriptionMessage.CommittedEventDistributed> _receivedEvents =
+		new List<ReaderSubscriptionMessage.CommittedEventDistributed>();
+
+	private readonly List<ReaderSubscriptionMessage.EventReaderIdle> _receivedIdleNotifications =
+		new List<ReaderSubscriptionMessage.EventReaderIdle>();
+
+	private readonly List<ReaderSubscriptionMessage.EventReaderStarting> _receivedStartingNotifications =
+		new List<ReaderSubscriptionMessage.EventReaderStarting>();
+
+	private readonly List<ReaderSubscriptionMessage.EventReaderEof> _receivedEofNotifications =
+		new List<ReaderSubscriptionMessage.EventReaderEof>();
+
+	private readonly List<ReaderSubscriptionMessage.EventReaderPartitionEof> _receivedPartitionEofNotifications =
+		new List<ReaderSubscriptionMessage.EventReaderPartitionEof>();
+
+	private readonly List<ReaderSubscriptionMessage.EventReaderPartitionDeleted>
+		_receivedPartitionDeletedNotifications =
+			new List<ReaderSubscriptionMessage.EventReaderPartitionDeleted>();
+
+	private readonly List<ReaderSubscriptionMessage.EventReaderNotAuthorized> _receivedNotAuthorizedNotifications =
+		new List<ReaderSubscriptionMessage.EventReaderNotAuthorized>();
+
+	public void Handle(ReaderSubscriptionMessage.CommittedEventDistributed message) {
+		if (message.Data != null && message.Data.PositionStreamId == "throws") {
+			throw new Exception("Bad Handler");
+		}
+
+		_receivedEvents.Add(message);
+		_publisher?.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived
+				.FromCommittedEventDistributed(message,
+				CheckpointTag.Empty, "", _subscriptionId, 0));
+	}
+
+	public List<ReaderSubscriptionMessage.CommittedEventDistributed> ReceivedEvents {
+		get { return _receivedEvents; }
+	}
+
+	public List<ReaderSubscriptionMessage.EventReaderIdle> ReceivedIdleNotifications {
+		get { return _receivedIdleNotifications; }
+	}
+
+	public List<ReaderSubscriptionMessage.EventReaderStarting> ReceivedStartingNotifications {
+		get { return _receivedStartingNotifications; }
+	}
+
+	public List<ReaderSubscriptionMessage.EventReaderEof> ReceivedEofNotifications {
+		get { return _receivedEofNotifications; }
+	}
+
+	public List<ReaderSubscriptionMessage.EventReaderPartitionEof> ReceivedPartitionEofNotifications {
+		get { return _receivedPartitionEofNotifications; }
+	}
+
+	public List<ReaderSubscriptionMessage.EventReaderPartitionDeleted> ReceivedPartitionDeletedNotifications {
+		get { return _receivedPartitionDeletedNotifications; }
+	}
+
+	public List<ReaderSubscriptionMessage.EventReaderNotAuthorized> ReceivedNotAuthorizedNotifications {
+		get { return _receivedNotAuthorizedNotifications; }
+	}
+
+	public void Handle(ReaderSubscriptionMessage.EventReaderIdle message) {
+		_receivedIdleNotifications.Add(message);
+	}
+
+	public void Handle(ReaderSubscriptionMessage.EventReaderStarting message) {
+		_receivedStartingNotifications.Add(message);
+	}
+
+	public void Handle(ReaderSubscriptionMessage.EventReaderEof message) {
+		_receivedEofNotifications.Add(message);
+	}
+
+	public void Handle(ReaderSubscriptionMessage.EventReaderPartitionEof message) {
+		_receivedPartitionEofNotifications.Add(message);
+	}
+
+	public void Handle(ReaderSubscriptionMessage.EventReaderPartitionDeleted message) {
+		_receivedPartitionDeletedNotifications.Add(message);
+	}
+
+	public void Handle(ReaderSubscriptionMessage.EventReaderNotAuthorized message) {
+		_receivedNotAuthorizedNotifications.Add(message);
+	}
+
+	public void Handle(ReaderSubscriptionMessage.Faulted message) {
+		//ignore
+	}
+
+	public void Handle(ReaderSubscriptionMessage.ReportProgress message) {
+		//ignore
+	}
+
+	public string Tag {
+		get { return "FakeReaderSubscription"; }
+	}
+
+	public Guid SubscriptionId {
+		get { return Guid.Empty; }
+	}
+
+	private FakeEventReader _eventReader;
+
+	public FakeEventReader EventReader {
+		get { return _eventReader; }
+	}
+
+	public IEventReader CreatePausedEventReader(
+		IPublisher publisher, IODispatcher ioDispatcher, Guid forkedEventReaderId) {
+		_eventReader = new FakeEventReader(forkedEventReaderId);
+		return _eventReader;
+	}
+}
+
+public class FakeEventReader : IEventReader {
+	public Guid EventReaderId { get; private set; }
+
+	public FakeEventReader(Guid eventReaderId) {
+		EventReaderId = eventReaderId;
+	}
+
+	public void Dispose() {
+	}
+
+	public void Pause() {
+	}
+
+	public void Resume() {
+	}
+
+	public void SendNotAuthorized() {
+	}
+}
+
+public class FakeReaderStrategy : IReaderStrategy {
+	public EventFilter EventFilter { get; set; }
+	public bool IsReadingOrderRepeatable { get; set; }
+	public PositionTagger PositionTagger { get; set; }
+	private FakeReaderSubscription _subscription;
+
+	public Guid EventReaderId {
+		get { return _subscription.EventReader.EventReaderId; }
+	}
+
+	public IEventReader CreatePausedEventReader(Guid eventReaderId, IPublisher publisher, IODispatcher ioDispatcher,
+		CheckpointTag checkpointTag, bool stopOnEof, int? stopAfterNEvents) {
+		throw new NotImplementedException();
+	}
+
+	public IReaderSubscription CreateReaderSubscription(IPublisher publisher, CheckpointTag fromCheckpointTag,
+		Guid subscriptionId, ReaderSubscriptionOptions readerSubscriptionOptions) {
+		_subscription = new FakeReaderSubscription(publisher, subscriptionId);
+		return _subscription;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_heading_event_reader_has_been_created.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_heading_event_reader_has_been_created.cs
new file mode 100644
index 00000000000..491e9a5d1a2
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_heading_event_reader_has_been_created.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+using HeadingEventReader = KurrentDB.Projections.Core.Services.Processing.TransactionFile.HeadingEventReader;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.heading_event_reader;
+
+[TestFixture]
+public class when_heading_event_reader_has_been_created : TestFixtureWithReadWriteDispatchers {
+	private HeadingEventReader _point;
+	private Exception _exception;
+
+	[SetUp]
+	public void setup() {
+		_exception = null;
+		try {
+			_point = new HeadingEventReader(10, _bus);
+		} catch (Exception ex) {
+			_exception = ex;
+		}
+	}
+
+	[Test]
+	public void it_has_been_created() {
+		Assert.IsNull(_exception, ((object)_exception ?? "").ToString());
+	}
+
+	[Test]
+	public void stop_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => { _point.Stop(); });
+	}
+
+	[Test]
+	public void try_subscribe_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_point.TrySubscribe(Guid.NewGuid(), new FakeReaderSubscription(), 10);
+		});
+	}
+
+	[Test]
+	public void usubscribe_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => { _point.Unsubscribe(Guid.NewGuid()); });
+	}
+
+	[Test]
+	public void handle_throws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_point.Handle(
+				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					Guid.NewGuid(), new TFPos(20, 10), "stream", 10, false, Guid.NewGuid(), "type", false,
+					new byte[0], new byte[0]));
+		});
+	}
+
+	[Test]
+	public void can_be_started() {
+		var eventReaderId = Guid.NewGuid();
+		_point.Start(
+			eventReaderId,
+			new TransactionFileEventReader(_bus, eventReaderId, null, new TFPos(0, -1), new RealTimeProvider()));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_starting_a_heading_event_reader.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_starting_a_heading_event_reader.cs
new file mode 100644
index 00000000000..8339e766b1c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_starting_a_heading_event_reader.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+using HeadingEventReader = KurrentDB.Projections.Core.Services.Processing.TransactionFile.HeadingEventReader;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.heading_event_reader;
+
+[TestFixture]
+public class when_starting_a_heading_event_reader : TestFixtureWithReadWriteDispatchers {
+	private HeadingEventReader _point;
+	private Exception _exception;
+	private Guid _distibutionPointCorrelationId;
+
+	[SetUp]
+	public void setup() {
+		_exception = null;
+		try {
+			_point = new HeadingEventReader(10, _bus);
+		} catch (Exception ex) {
+			_exception = ex;
+		}
+
+		Assume.That(_exception == null);
+
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_point.Start(
+			_distibutionPointCorrelationId,
+			new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(0, -1),
+				new RealTimeProvider()));
+	}
+
+	[Test]
+	public void transaction_file_reader_publishes_read_events_from_tf() {
+		Assert.IsTrue(_consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>().Any());
+	}
+
+	[Test]
+	public void can_handle_events() {
+		_point.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_distibutionPointCorrelationId, new TFPos(20, 10), "stream", 10, false, Guid.NewGuid(),
+				"type", false, new byte[0], new byte[0]));
+	}
+
+	[Test]
+	public void can_be_stopped() {
+		_point.Stop();
+	}
+
+
+	[Test]
+	public void cannot_suibscribe_even_from_reader_zero_position() {
+		var subscribed = _point.TrySubscribe(Guid.NewGuid(), new FakeReaderSubscription(), -1);
+		Assert.AreEqual(false, subscribed);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_handles_an_event.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_handles_an_event.cs
new file mode 100644
index 00000000000..8b0fb295c9a
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_handles_an_event.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+using HeadingEventReader = KurrentDB.Projections.Core.Services.Processing.TransactionFile.HeadingEventReader;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.heading_event_reader;
+
+[TestFixture]
+public class when_the_heading_event_reader_handles_an_event : TestFixtureWithReadWriteDispatchers {
+	private HeadingEventReader _point;
+	private Exception _exception;
+	private Guid _distibutionPointCorrelationId;
+
+	[SetUp]
+	public void setup() {
+		_exception = null;
+		try {
+			_point = new HeadingEventReader(10, _bus);
+		} catch (Exception ex) {
+			_exception = ex;
+		}
+
+		Assume.That(_exception == null);
+
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_point.Start(
+			_distibutionPointCorrelationId,
+			new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(0, -1),
+				new RealTimeProvider()));
+		_point.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_distibutionPointCorrelationId, new TFPos(20, 10), "stream", 10, false, Guid.NewGuid(),
+				"type", false, new byte[0], new byte[0]));
+	}
+
+	[Test]
+	public void can_handle_next_event() {
+		_point.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_distibutionPointCorrelationId, new TFPos(40, 30), "stream", 12, false, Guid.NewGuid(),
+				"type", false, new byte[0], new byte[0]));
+	}
+
+	//TODO: SW1
+	/*
+			[Test]
+			public void can_handle_special_update_position_event()
+			{
+				_point.Handle(
+					new ProjectionCoreServiceMessage.CommittedEventDistributed(
+						_distibutionPointCorrelationId, new EventPosition(long.MinValue, 30), "stream", 12, false, null));
+			}
+	*/
+
+	[Test]
+	public void cannot_handle_previous_event() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_point.Handle(
+				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					_distibutionPointCorrelationId, new TFPos(5, 0), "stream", 8, false, Guid.NewGuid(), "type",
+					false, new byte[0], new byte[0]));
+		});
+	}
+
+	[Test]
+	public void a_projection_can_be_subscribed_after_event_position() {
+		var subscribed = _point.TrySubscribe(Guid.NewGuid(), new FakeReaderSubscription(), 30);
+		Assert.AreEqual(true, subscribed);
+	}
+
+	[Test]
+	public void a_projection_cannot_be_subscribed_at_earlier_position() {
+		var subscribed = _point.TrySubscribe(Guid.NewGuid(), new FakeReaderSubscription(), 10);
+		Assert.AreEqual(false, subscribed);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_subscribes_a_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_subscribes_a_projection.cs
new file mode 100644
index 00000000000..3c98fefc73e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_subscribes_a_projection.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+using HeadingEventReader = KurrentDB.Projections.Core.Services.Processing.TransactionFile.HeadingEventReader;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.heading_event_reader;
+
+[TestFixture]
+public class when_the_heading_event_reader_subscribes_a_projection : TestFixtureWithReadWriteDispatchers {
+	private HeadingEventReader _point;
+	private Exception _exception;
+	private Guid _distibutionPointCorrelationId;
+	private FakeReaderSubscription _subscription;
+	private Guid _projectionSubscriptionId;
+
+	[SetUp]
+	public void setup() {
+		_exception = null;
+		try {
+			_point = new HeadingEventReader(10, _bus);
+		} catch (Exception ex) {
+			_exception = ex;
+		}
+
+		Assume.That(_exception == null);
+
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_point.Start(
+			_distibutionPointCorrelationId,
+			new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(0, -1),
+				new RealTimeProvider()));
+		_point.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_distibutionPointCorrelationId, new TFPos(20, 10), "stream", 10, false, Guid.NewGuid(),
+				"type", false, new byte[0], new byte[0]));
+		_point.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_distibutionPointCorrelationId, new TFPos(40, 30), "stream", 11, false, Guid.NewGuid(),
+				"type", false, new byte[0], new byte[0]));
+		_subscription = new FakeReaderSubscription();
+		_projectionSubscriptionId = Guid.NewGuid();
+		_point.TrySubscribe(_projectionSubscriptionId, _subscription, 30);
+	}
+
+
+	[Test]
+	public void projection_receives_at_least_one_cached_event_before_the_subscription_position() {
+		Assert.AreEqual(true, _subscription.ReceivedEvents.Any(v => v.Data.Position.PreparePosition <= 30));
+	}
+
+	[Test]
+	public void projection_receives_all_the_previously_handled_events_after_the_subscription_position() {
+		Assert.AreEqual(true, _subscription.ReceivedEvents.Any(v => v.Data.Position.PreparePosition == 30));
+	}
+
+	[Test]
+	public void it_can_be_unsubscribed() {
+		_point.Unsubscribe(_projectionSubscriptionId);
+	}
+
+	[Test]
+	public void no_other_projection_can_subscribe_with_the_same_projection_id() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_point.TrySubscribe(_projectionSubscriptionId, _subscription, 30);
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_unsubscribes_a_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_unsubscribes_a_projection.cs
new file mode 100644
index 00000000000..ec228dbe943
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_unsubscribes_a_projection.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+using HeadingEventReader = KurrentDB.Projections.Core.Services.Processing.TransactionFile.HeadingEventReader;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.heading_event_reader;
+
+[TestFixture]
+public class when_the_heading_event_reader_unsubscribes_a_projection : TestFixtureWithReadWriteDispatchers {
+	private HeadingEventReader _point;
+	private Exception _exception;
+	private Guid _distibutionPointCorrelationId;
+	private FakeReaderSubscription _subscription;
+	private Guid _projectionSubscriptionId;
+
+	[SetUp]
+	public void setup() {
+		_exception = null;
+		try {
+			_point = new HeadingEventReader(10, _bus);
+		} catch (Exception ex) {
+			_exception = ex;
+		}
+
+		Assume.That(_exception == null);
+
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_point.Start(
+			_distibutionPointCorrelationId,
+			new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(0, -1),
+				new RealTimeProvider()));
+		_point.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_distibutionPointCorrelationId, new TFPos(20, 10), "stream", 10, false, Guid.NewGuid(),
+				"type", false, new byte[0], new byte[0]));
+		_point.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_distibutionPointCorrelationId, new TFPos(40, 30), "stream", 11, false, Guid.NewGuid(),
+				"type", false, new byte[0], new byte[0]));
+		_subscription = new FakeReaderSubscription();
+		_projectionSubscriptionId = Guid.NewGuid();
+		var subscribed = _point.TrySubscribe(_projectionSubscriptionId, _subscription, 30);
+		Assert.IsTrue(subscribed); // ensure we really unsubscribing.. even if it is tested elsewhere
+		_point.Unsubscribe(_projectionSubscriptionId);
+	}
+
+
+	[Test]
+	public void projection_does_not_receive_any_events_after_unsubscribing() {
+		var count = _subscription.ReceivedEvents.Count;
+		_point.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_distibutionPointCorrelationId, new TFPos(60, 50), "stream", 12, false, Guid.NewGuid(),
+				"type", false, new byte[0], new byte[0]));
+		Assert.AreEqual(count, _subscription.ReceivedEvents.Count);
+	}
+
+	[Test]
+	public void it_cannot_be_unsubscribed_twice() {
+		Assert.Throws<InvalidOperationException>(() => { _point.Unsubscribe(_projectionSubscriptionId); });
+	}
+
+	[Test]
+	public void projection_can_resubscribe_with() {
+		var subscribed = _point.TrySubscribe(_projectionSubscriptionId, _subscription, 30);
+		Assert.AreEqual(true, subscribed);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_a_cached_event_and_throws.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_a_cached_event_and_throws.cs
new file mode 100644
index 00000000000..46f491a5f78
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_a_cached_event_and_throws.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+using HeadingEventReader = KurrentDB.Projections.Core.Services.Processing.TransactionFile.HeadingEventReader;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.heading_event_reader;
+
+[TestFixture]
+public class when_the_heading_event_reader_with_a_subscribed_projection_handles_a_cached_event_and_throws :
+	TestFixtureWithReadWriteDispatchers {
+	private HeadingEventReader _point;
+	private Guid _distibutionPointCorrelationId;
+	private Guid _projectionSubscriptionId;
+
+	[SetUp]
+	public void setup() {
+		_point = new HeadingEventReader(10, _bus);
+
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_point.Start(
+			_distibutionPointCorrelationId,
+			new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(0, -1),
+				new RealTimeProvider()));
+		_point.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_distibutionPointCorrelationId, new TFPos(20, 10), "throws", 10, false, Guid.NewGuid(),
+				"type", false, new byte[0], new byte[0]));
+		_point.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_distibutionPointCorrelationId, new TFPos(40, 30), "throws", 11, false, Guid.NewGuid(),
+				"type", false, new byte[0], new byte[0]));
+		_projectionSubscriptionId = Guid.NewGuid();
+		_point.TrySubscribe(_projectionSubscriptionId, new FakeReaderSubscription(), 30);
+	}
+
+
+	[Test]
+	public void projection_is_notified_that_it_is_to_fault() {
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.Failed>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_a_live_event_and_throws.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_a_live_event_and_throws.cs
new file mode 100644
index 00000000000..d98b3f1bd8e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_a_live_event_and_throws.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+using HeadingEventReader = KurrentDB.Projections.Core.Services.Processing.TransactionFile.HeadingEventReader;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.heading_event_reader;
+
+[TestFixture]
+public class when_the_heading_event_reader_with_a_subscribed_projection_handles_a_live_event_and_throws :
+	TestFixtureWithReadWriteDispatchers {
+	private HeadingEventReader _point;
+	private Guid _distibutionPointCorrelationId;
+	private Guid _projectionSubscriptionId;
+
+	[SetUp]
+	public void setup() {
+		_point = new HeadingEventReader(10, _bus);
+
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_point.Start(
+			_distibutionPointCorrelationId,
+			new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(0, -1),
+				new RealTimeProvider()));
+		_point.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_distibutionPointCorrelationId, new TFPos(20, 10), "stream", 10, false, Guid.NewGuid(),
+				"type", false, new byte[0], new byte[0]));
+		_point.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_distibutionPointCorrelationId, new TFPos(40, 30), "stream", 11, false, Guid.NewGuid(),
+				"type", false, new byte[0], new byte[0]));
+		_projectionSubscriptionId = Guid.NewGuid();
+		_point.TrySubscribe(_projectionSubscriptionId, new FakeReaderSubscription(), 30);
+		_point.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_distibutionPointCorrelationId, new TFPos(60, 50), "throws", 12, false, Guid.NewGuid(),
+				"type", false, new byte[0], new byte[0]));
+	}
+
+	[Test]
+	public void projection_is_notified_that_it_is_to_fault() {
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.Failed>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_an_event.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_an_event.cs
new file mode 100644
index 00000000000..36baa37e5ef
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_an_event.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+using HeadingEventReader = KurrentDB.Projections.Core.Services.Processing.TransactionFile.HeadingEventReader;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.heading_event_reader;
+
+[TestFixture]
+public class when_the_heading_event_reader_with_a_subscribed_projection_handles_an_event :
+	TestFixtureWithReadWriteDispatchers {
+	private HeadingEventReader _point;
+	private Exception _exception;
+	private Guid _distibutionPointCorrelationId;
+	private FakeReaderSubscription _subscription;
+	private Guid _projectionSubscriptionId;
+
+	[SetUp]
+	public void setup() {
+		_exception = null;
+		try {
+			_point = new HeadingEventReader(10, _bus);
+		} catch (Exception ex) {
+			_exception = ex;
+		}
+
+		Assume.That(_exception == null);
+
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_point.Start(
+			_distibutionPointCorrelationId,
+			new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(0, -1),
+				new RealTimeProvider()));
+		_point.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_distibutionPointCorrelationId, new TFPos(20, 10), "stream", 10, false, Guid.NewGuid(),
+				"type", false, new byte[0], new byte[0]));
+		_point.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_distibutionPointCorrelationId, new TFPos(40, 30), "stream", 11, false, Guid.NewGuid(),
+				"type", false, new byte[0], new byte[0]));
+		_subscription = new FakeReaderSubscription();
+		_projectionSubscriptionId = Guid.NewGuid();
+		_point.TrySubscribe(_projectionSubscriptionId, _subscription, 30);
+		_point.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_distibutionPointCorrelationId, new TFPos(60, 50), "stream", 12, false, Guid.NewGuid(),
+				"type", false, new byte[0], new byte[0]));
+	}
+
+
+	[Test]
+	public void projection_receives_events_after_the_subscription_point() {
+		Assert.AreEqual(50, _subscription.ReceivedEvents.Last().Data.Position.PreparePosition);
+	}
+
+	[Test]
+	public void it_can_be_unsubscribed() {
+		_point.Unsubscribe(_projectionSubscriptionId);
+	}
+
+	[Test]
+	public void no_other_projection_can_subscribe_with_the_same_projection_id() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_point.TrySubscribe(_projectionSubscriptionId, _subscription, 30);
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_an_idle_notification.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_an_idle_notification.cs
new file mode 100644
index 00000000000..7ebdc405011
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/heading_event_reader/when_the_heading_event_reader_with_a_subscribed_projection_handles_an_idle_notification.cs
@@ -0,0 +1,62 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+using HeadingEventReader = KurrentDB.Projections.Core.Services.Processing.TransactionFile.HeadingEventReader;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.heading_event_reader;
+
+[TestFixture]
+public class when_the_heading_event_reader_with_a_subscribed_projection_handles_an_idle_notification :
+	TestFixtureWithReadWriteDispatchers {
+	private HeadingEventReader _point;
+
+	//private Exception _exception;
+	private Guid _distibutionPointCorrelationId;
+	private FakeReaderSubscription _subscription;
+	private Guid _projectionSubscriptionId;
+
+	[SetUp]
+	public void setup() {
+		//_exception = null;
+		try {
+			_point = new HeadingEventReader(10, _bus);
+		} catch (Exception) {
+			//_exception = ex;
+		}
+
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_point.Start(
+			_distibutionPointCorrelationId,
+			new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(0, -1),
+				new RealTimeProvider()));
+		DateTime timestamp = DateTime.UtcNow;
+		_point.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_distibutionPointCorrelationId, new TFPos(20, 10), "stream", 10, false, Guid.NewGuid(),
+				"type", false, new byte[0], new byte[0], timestamp));
+		_point.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_distibutionPointCorrelationId, new TFPos(40, 30), "stream", 11, false, Guid.NewGuid(),
+				"type", false, new byte[0], new byte[0], timestamp.AddMilliseconds(1)));
+		_subscription = new FakeReaderSubscription();
+		_projectionSubscriptionId = Guid.NewGuid();
+		_point.TrySubscribe(_projectionSubscriptionId, _subscription, 30);
+		_point.Handle(
+			new ReaderSubscriptionMessage.EventReaderIdle(
+				_distibutionPointCorrelationId, timestamp.AddMilliseconds(1100)));
+	}
+
+
+	[Test]
+	public void projection_receives_events_after_the_subscription_point() {
+		Assert.AreEqual(1, _subscription.ReceivedIdleNotifications.Count());
+	}
+}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/reordering.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/reordering.cs
similarity index 75%
rename from src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/reordering.cs
rename to src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/reordering.cs
index b2fc5fd790a..20d124c7642 100644
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/multi_stream_reader/reordering.cs
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/reordering.cs
@@ -1,18 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
 using System.Linq;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Strategies;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+using NUnit.Framework;
 
-namespace EventStore.Projections.Core.Tests.Services.event_reader.multi_stream_reader {
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.multi_stream_reader {
 	namespace reordering {
 		abstract class with_multi_stream_reader<TLogFormat, TStreamId> : TestFixtureWithEventReaderService<TLogFormat, TStreamId> {
 			protected Guid _subscriptionId;
@@ -34,9 +35,9 @@ protected override void Given() {
 
 				_subscriptionId = Guid.NewGuid();
 				_sourceDefinition = new QuerySourcesDefinition {
-					Streams = new[] {"stream-a", "stream-b"},
+					Streams = new[] { "stream-a", "stream-b" },
 					AllEvents = true,
-					Options = new QuerySourcesDefinitionOptions {ReorderEvents = true, ProcessingLag = 100}
+					Options = new QuerySourcesDefinitionOptions { ReorderEvents = true, ProcessingLag = 100 }
 				};
 				_readerStrategy = ReaderStrategy.Create(
 					"test",
@@ -74,8 +75,8 @@ public void returns_events_in_original_order() {
 
 				Assert.That(
 					(from e in receivedEvents
-						orderby e.Data.Position.PreparePosition
-						select e.Data.Position.PreparePosition).SequenceEqual(
+					 orderby e.Data.Position.PreparePosition
+					 select e.Data.Position.PreparePosition).SequenceEqual(
 						from e in receivedEvents
 						select e.Data.Position.PreparePosition), "Incorrect event order received");
 			}
@@ -90,7 +91,7 @@ protected override void GivenOtherEvents() {
 			protected override IEnumerable<WhenStep> When() {
 				var fromZeroPosition =
 					CheckpointTag.FromStreamPositions(0,
-						new Dictionary<string, long> {{"stream-a", -1}, {"stream-b", -1}});
+						new Dictionary<string, long> { { "stream-a", -1 }, { "stream-b", -1 } });
 				yield return
 					new ReaderSubscriptionManagement.Subscribe(
 						_subscriptionId, fromZeroPosition, _readerStrategy, _readerSubscriptionOptions);
@@ -110,19 +111,19 @@ protected override IEnumerable<WhenStep> When() {
 				yield return
 					new ClientMessage.TransactionWrite(
 						Guid.NewGuid(), correlationId, GetInputQueue(), true, transactionId,
-						new[] {new Event(Guid.NewGuid(), "type1", true, "{Data: 3, Transacted=true}", "{}")}, null);
+						new[] { new Event(Guid.NewGuid(), "type1", true, "{Data: 3, Transacted=true}", "{}") }, null);
 
 				correlationId = Guid.NewGuid();
 				yield return
 					new ClientMessage.WriteEvents(
 						Guid.NewGuid(), correlationId, GetInputQueue(), true, "stream-b", 0,
-						new[] {new Event(Guid.NewGuid(), "type1", true, "{Data: 4}", "{}")}, null);
+						new[] { new Event(Guid.NewGuid(), "type1", true, "{Data: 4}", "{}") }, null);
 
 				correlationId = Guid.NewGuid();
 				yield return
 					new ClientMessage.TransactionWrite(
 						Guid.NewGuid(), correlationId, GetInputQueue(), true, transactionId,
-						new[] {new Event(Guid.NewGuid(), "type1", true, "{Data: 5, Transacted=true}", "{}")}, null);
+						new[] { new Event(Guid.NewGuid(), "type1", true, "{Data: 5, Transacted=true}", "{}") }, null);
 
 				correlationId = Guid.NewGuid();
 				yield return
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_creating.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_creating.cs
new file mode 100644
index 00000000000..52bfc2812f3
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_creating.cs
@@ -0,0 +1,82 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.multi_stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_creating<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private string[] _abStreams;
+	private Dictionary<string, long> _ab12Tag;
+	private new RealTimeProvider _timeProvider;
+
+	[SetUp]
+	public void setup() {
+		_timeProvider = new RealTimeProvider();
+		_ab12Tag = new Dictionary<string, long> { { "a", 1 }, { "b", 2 } };
+		_abStreams = new[] { "a", "b" };
+	}
+
+	[Test]
+	public void it_can_be_created() {
+		new MultiStreamEventReader(
+			_ioDispatcher, _bus, Guid.NewGuid(), null, 0, _abStreams, _ab12Tag, false, _timeProvider);
+	}
+
+	[Test]
+	public void null_publisher_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			new MultiStreamEventReader(
+				_ioDispatcher, null, Guid.NewGuid(), null, 0, _abStreams, _ab12Tag, false, _timeProvider);
+		});
+	}
+
+	[Test]
+	public void empty_event_reader_id_throws_argument_exception() {
+		Assert.Throws<ArgumentException>(() => {
+			new MultiStreamEventReader(
+				_ioDispatcher, _bus, Guid.Empty, null, 0, _abStreams, _ab12Tag, false, _timeProvider);
+		});
+	}
+
+	[Test]
+	public void null_streams_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			new MultiStreamEventReader(
+				_ioDispatcher, _bus, Guid.NewGuid(), null, 0, null, _ab12Tag, false, _timeProvider);
+		});
+	}
+
+	[Test]
+	public void null_time_provider_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			new MultiStreamEventReader(_ioDispatcher, _bus, Guid.NewGuid(), null, 0, _abStreams, _ab12Tag, false,
+				null);
+		});
+	}
+
+	[Test]
+	public void empty_streams_throws_argument_exception() {
+		Assert.Throws<ArgumentException>(() => {
+			new MultiStreamEventReader(
+				_ioDispatcher, _bus, Guid.NewGuid(), null, 0, new string[0], _ab12Tag, false, _timeProvider);
+		});
+	}
+
+	[Test]
+	public void invalid_from_tag_throws_argument_exception() {
+		Assert.Throws<ArgumentException>(() => {
+			new MultiStreamEventReader(
+				_ioDispatcher, _bus, Guid.NewGuid(), null, 0, _abStreams,
+				new Dictionary<string, long> { { "a", 1 }, { "c", 2 } }, false, _timeProvider);
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_deleted_streams.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_deleted_streams.cs
new file mode 100644
index 00000000000..9c9c5c187e5
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_deleted_streams.cs
@@ -0,0 +1,149 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.multi_stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_deleted_streams<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private MultiStreamEventReader _edp;
+	private string[] _streamNames;
+	private Dictionary<string, long> _streamPositions;
+	private Guid _distibutionPointCorrelationId;
+	private long _fromSequenceNumber = 10;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+		_streamNames = new[] { "stream1", "stream2" };
+		_streamPositions = new Dictionary<string, long> { { "stream1", 10 }, { "stream2", _fromSequenceNumber } };
+	}
+
+	[SetUp]
+	public new void When() {
+		_distibutionPointCorrelationId = Guid.NewGuid();
+
+		_edp = new MultiStreamEventReader(
+			_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _streamNames, _streamPositions, false,
+			new RealTimeProvider());
+
+		_edp.Resume();
+	}
+
+	private void HandleEvents(string stream, long[] eventNumbers) {
+		string eventType = "event_type";
+		List<ResolvedEvent> events = new List<ResolvedEvent>();
+
+		foreach (long eventNumber in eventNumbers) {
+			events.Add(
+				ResolvedEvent.ForUnresolvedEvent(
+					new EventRecord(
+						eventNumber, 50 * (eventNumber + 1), Guid.NewGuid(), Guid.NewGuid(), 50 * (eventNumber + 1),
+						0, stream, ExpectedVersion.Any, DateTime.UtcNow,
+						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+						eventType, new byte[] { 0 }, new byte[] { 0 }
+					)
+				)
+			);
+		}
+
+		long start, end;
+		if (eventNumbers.Length > 0) {
+			start = eventNumbers[0];
+			end = eventNumbers[eventNumbers.Length - 1];
+		} else {
+			start = _fromSequenceNumber;
+			end = _fromSequenceNumber;
+		}
+
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == stream).CorrelationId;
+
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, stream, start, 100, ReadStreamResult.Success, events.ToArray(), null, false, "",
+				start + 1, end, true, 200)
+		);
+	}
+
+	private void HandleEvents(string stream, long start, long end) {
+		List<long> eventNumbers = new List<long>();
+		for (long i = start; i <= end; i++)
+			eventNumbers.Add(i);
+		HandleEvents(stream, eventNumbers.ToArray());
+	}
+
+	private void HandleDeletedStream(string stream, long sequenceNumber, ReadStreamResult result) {
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == stream).CorrelationId;
+
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, stream, sequenceNumber, 100, result, new ResolvedEvent[] { }, null, false, "", -1,
+				sequenceNumber, true, 200)
+		);
+	}
+
+	[Test]
+	public void when_no_stream_and_sequence_num_equal_to_minus_one_should_not_publish_partition_deleted_message() {
+		HandleDeletedStream(_streamNames[0], -1, ReadStreamResult.NoStream);
+		//trigger event delivery:
+		HandleEvents(_streamNames[1], _fromSequenceNumber, _fromSequenceNumber);
+
+		Assert.AreEqual(0,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().Count());
+	}
+
+	[Test]
+	public void when_no_stream_and_sequence_num_equal_to_zero_should_publish_partition_deleted_message() {
+		HandleDeletedStream(_streamNames[0], 0, ReadStreamResult.NoStream);
+		//trigger event delivery:
+		HandleEvents(_streamNames[1], _fromSequenceNumber, _fromSequenceNumber);
+
+		Assert.AreEqual(1,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().Count());
+		Assert.AreEqual(_streamNames[0],
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().First()
+				.Partition);
+	}
+
+	[Test]
+	public void when_no_stream_and_sequence_num_greater_than_zero_should_publish_partition_deleted_message() {
+		HandleDeletedStream(_streamNames[0], 100, ReadStreamResult.NoStream);
+		//trigger event delivery:
+		HandleEvents(_streamNames[1], _fromSequenceNumber, _fromSequenceNumber);
+
+		Assert.AreEqual(1,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().Count());
+		Assert.AreEqual(_streamNames[0],
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().First()
+				.Partition);
+	}
+
+	[Test]
+	public void when_stream_deleted_should_publish_partition_deleted_message() {
+		HandleDeletedStream(_streamNames[0], 0, ReadStreamResult.StreamDeleted);
+		//trigger event delivery:
+		HandleEvents(_streamNames[1], _fromSequenceNumber, _fromSequenceNumber);
+
+		Assert.AreEqual(1,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().Count());
+		Assert.AreEqual(_streamNames[0],
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().First()
+				.Partition);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_eof_for_all_streams_and_idle_eof.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_eof_for_all_streams_and_idle_eof.cs
new file mode 100644
index 00000000000..7c8ebea2ee9
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_eof_for_all_streams_and_idle_eof.cs
@@ -0,0 +1,109 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.multi_stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_eof_for_all_streams_and_idle_eof<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private MultiStreamEventReader _edp;
+	private Guid _distibutionPointCorrelationId;
+	private Guid _firstEventId;
+	private Guid _secondEventId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	private string[] _abStreams;
+	private Dictionary<string, long> _ab12Tag;
+	private FakeTimeProvider _fakeTimeProvider;
+
+	[SetUp]
+	public new void When() {
+		_ab12Tag = new Dictionary<string, long> { { "a", 1 }, { "b", 2 } };
+		_abStreams = new[] { "a", "b" };
+
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_fakeTimeProvider = new FakeTimeProvider();
+		_edp = new MultiStreamEventReader(
+			_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
+			_fakeTimeProvider);
+		_edp.Resume();
+		_firstEventId = Guid.NewGuid();
+		_secondEventId = Guid.NewGuid();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "a").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "a", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any,
+							_fakeTimeProvider.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+				}, null, false, "", 2, 1, true, 200));
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "b").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "b", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 100, Guid.NewGuid(), _secondEventId, 100, 0, "b", ExpectedVersion.Any,
+							_fakeTimeProvider.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+				}, null, false, "", 3, 2, true, 200));
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "a").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "a", 100, 100, ReadStreamResult.Success, new ResolvedEvent[] { }, null, false, "", 2,
+				1, true, 400));
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "b").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "b", 100, 100, ReadStreamResult.Success, new ResolvedEvent[] { }, null, false, "", 3,
+				2, true, 400));
+		_fakeTimeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(500));
+		correlationId = ((ClientMessage.ReadStreamEventsForward)(_consumer.HandledMessages
+			.OfType<AwakeServiceMessage.SubscribeAwake>().Last().ReplyWithMessage)).CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "a", 100, 100, ReadStreamResult.Success, new ResolvedEvent[] { }, null, false, "", 2,
+				1, true, 600));
+	}
+
+	[Test]
+	public void publishes_event_distribution_idle_messages() {
+		Assert.AreEqual(2, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderIdle>().Count());
+		var first = _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderIdle>().First();
+		var second = _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderIdle>().Skip(1).First();
+
+		Assert.AreEqual(first.CorrelationId, _distibutionPointCorrelationId);
+		Assert.AreEqual(second.CorrelationId, _distibutionPointCorrelationId);
+
+		Assert.AreEqual(TimeSpan.FromMilliseconds(500), second.IdleTimestampUtc - first.IdleTimestampUtc);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed.cs
new file mode 100644
index 00000000000..d5191247633
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed.cs
@@ -0,0 +1,114 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.multi_stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_read_completed<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private MultiStreamEventReader _edp;
+	private Guid _distibutionPointCorrelationId;
+	private Guid _firstEventId;
+	private Guid _secondEventId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	private string[] _abStreams;
+	private Dictionary<string, long> _ab12Tag;
+
+	[SetUp]
+	public new void When() {
+		_ab12Tag = new Dictionary<string, long> { { "a", 1 }, { "b", 2 } };
+		_abStreams = new[] { "a", "b" };
+
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_edp = new MultiStreamEventReader(
+			_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
+			new RealTimeProvider());
+		_edp.Resume();
+		_firstEventId = Guid.NewGuid();
+		_secondEventId = Guid.NewGuid();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "a").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "a", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any, DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 100, Guid.NewGuid(), _secondEventId, 100, 0, "a", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 3, 4, false, 200));
+	}
+
+	[Test]
+	public void cannot_be_resumed() {
+		Assert.Throws<InvalidOperationException>(() => { _edp.Resume(); });
+	}
+
+	[Test]
+	public void cannot_be_paused() {
+		_edp.Pause();
+	}
+
+	[Test]
+	public void does_not_publish_committed_event_received_messages() {
+		Assert.AreEqual(
+			0, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+	}
+
+	[Test]
+	public void publishes_read_events_from_beginning_with_correct_next_event_number() {
+		// do not publish new read requests until we consume already available events
+		Assert.AreEqual(2, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+				.Last(v => v.EventStreamId == "a")
+				.FromEventNumber);
+	}
+
+	[Test]
+	public void cannot_handle_repeated_read_events_completed() {
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "a").CorrelationId;
+		Assert.Throws<InvalidOperationException>(() => {
+			_edp.Handle(
+				new ClientMessage.ReadStreamEventsForwardCompleted(
+					correlationId, "a", 100, 100, ReadStreamResult.Success,
+					new[] {
+						ResolvedEvent.ForUnresolvedEvent(
+							new EventRecord(
+								2, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "a", ExpectedVersion.Any,
+								DateTime.UtcNow,
+								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin |
+								PrepareFlags.TransactionEnd,
+								"event_type", new byte[0], new byte[0]))
+					}, null, false, "", 3, 4, false, 100));
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_and_no_stream.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_and_no_stream.cs
new file mode 100644
index 00000000000..1c6f97568a4
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_and_no_stream.cs
@@ -0,0 +1,151 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.multi_stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_read_completed_and_no_stream<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private MultiStreamEventReader _edp;
+	private Guid _distibutionPointCorrelationId;
+	private Guid _firstEventId;
+	private Guid _secondEventId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	private string[] _abStreams;
+	private Dictionary<string, long> _ab12Tag;
+
+	[SetUp]
+	public new void When() {
+		_ab12Tag = new Dictionary<string, long> { { "a", 1 }, { "b", 0 } };
+		_abStreams = new[] { "a", "b" };
+
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_edp = new MultiStreamEventReader(
+			_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
+			new RealTimeProvider());
+		_edp.Resume();
+		_firstEventId = Guid.NewGuid();
+		_secondEventId = Guid.NewGuid();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "a").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "a", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any, DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 100, Guid.NewGuid(), _secondEventId, 100, 0, "a", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 3, 2, true, 200));
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "b").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "b", 100, 100, ReadStreamResult.Success, new ResolvedEvent[0], null, false, "",
+				-1, ExpectedVersion.NoStream, true, 200));
+	}
+
+	[Test]
+	public void publishes_read_events_from_beginning_with_correct_next_event_number() {
+		Assert.AreEqual(3, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
+		Assert.IsTrue(
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+				.Any(m => m.EventStreamId == "a"));
+		Assert.IsTrue(
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+				.Any(m => m.EventStreamId == "b"));
+		Assert.AreEqual(
+			3,
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+				.Last(m => m.EventStreamId == "a")
+				.FromEventNumber);
+		Assert.AreEqual(
+			0,
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+				.Last(m => m.EventStreamId == "b")
+				.FromEventNumber);
+	}
+
+	[Test]
+	public void publishes_correct_committed_event_received_messages() {
+		Assert.AreEqual(
+			3, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+		var first =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().First();
+		var second =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
+				.Skip(1)
+				.First();
+		var third =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
+				.Skip(2)
+				.First();
+
+		Assert.IsNull(third.Data);
+		Assert.AreEqual(100, third.SafeTransactionFileReaderJoinPosition);
+
+		Assert.AreEqual("event_type1", first.Data.EventType);
+		Assert.AreEqual("event_type2", second.Data.EventType);
+		Assert.AreEqual(_firstEventId, first.Data.EventId);
+		Assert.AreEqual(_secondEventId, second.Data.EventId);
+		Assert.AreEqual(1, first.Data.Data[0]);
+		Assert.AreEqual(2, first.Data.Metadata[0]);
+		Assert.AreEqual(3, second.Data.Data[0]);
+		Assert.AreEqual(4, second.Data.Metadata[0]);
+		Assert.AreEqual("a", first.Data.EventStreamId);
+		Assert.AreEqual("a", second.Data.EventStreamId);
+		Assert.AreEqual(50, first.Data.Position.PreparePosition);
+		Assert.AreEqual(100, second.Data.Position.PreparePosition);
+		Assert.AreEqual(-1, first.Data.Position.CommitPosition);
+		Assert.AreEqual(-1, second.Data.Position.CommitPosition);
+		Assert.AreEqual(50, first.SafeTransactionFileReaderJoinPosition);
+		Assert.AreEqual(100, second.SafeTransactionFileReaderJoinPosition);
+	}
+
+
+	[Test]
+	public void publishes_subscribe_awake() {
+		Assert.AreEqual(2, _consumer.HandledMessages.OfType<AwakeServiceMessage.SubscribeAwake>().Count());
+	}
+
+	[Test]
+	public void can_handle_following_read_events_completed() {
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				_distibutionPointCorrelationId, "a", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							3, 250, Guid.NewGuid(), Guid.NewGuid(), 250, 0, "a", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type", new byte[0], new byte[0]))
+				}, null, false, "", 4, 3, true, 300));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams.cs
new file mode 100644
index 00000000000..8bbbb7a894d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams.cs
@@ -0,0 +1,210 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.multi_stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_read_completed_for_all_streams<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private MultiStreamEventReader _edp;
+	private Guid _distibutionPointCorrelationId;
+	private Guid _firstEventId;
+	private Guid _secondEventId;
+	private Guid _thirdEventId;
+	private Guid _fourthEventId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	private string[] _abStreams;
+	private Dictionary<string, long> _ab12Tag;
+
+	[SetUp]
+	public new void When() {
+		_ab12Tag = new Dictionary<string, long> { { "a", 1 }, { "b", 2 } };
+		_abStreams = new[] { "a", "b" };
+
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_edp = new MultiStreamEventReader(
+			_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
+			new RealTimeProvider());
+		_edp.Resume();
+		_firstEventId = Guid.NewGuid();
+		_secondEventId = Guid.NewGuid();
+		_thirdEventId = Guid.NewGuid();
+		_fourthEventId = Guid.NewGuid();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "a").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "a", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any, DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
+							PrepareFlags.IsJson,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 150, Guid.NewGuid(), _secondEventId, 150, 0, "a", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 3, 2, true, 200));
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "b").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "b", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 100, Guid.NewGuid(), _thirdEventId, 100, 0, "b", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							3, 200, Guid.NewGuid(), _fourthEventId, 200, 0, "b", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 4, 3, true, 200));
+	}
+
+	[Test]
+	public void cannot_be_resumed() {
+		Assert.Throws<InvalidOperationException>(() => { _edp.Resume(); });
+	}
+
+	[Test]
+	public void cannot_be_paused() {
+		_edp.Pause();
+	}
+
+	[Test]
+	public void publishes_correct_committed_event_received_messages() {
+		Assert.AreEqual(
+			3, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+		var first =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().First();
+		var second =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
+				.Skip(1)
+				.First();
+
+		Assert.AreEqual("event_type1", first.Data.EventType);
+		Assert.AreEqual("event_type1", second.Data.EventType);
+		Assert.AreEqual(_firstEventId, first.Data.EventId);
+		Assert.AreEqual(_thirdEventId, second.Data.EventId);
+		Assert.AreEqual(1, first.Data.Data[0]);
+		Assert.AreEqual(2, first.Data.Metadata[0]);
+		Assert.AreEqual(1, second.Data.Data[0]);
+		Assert.AreEqual(2, second.Data.Metadata[0]);
+		Assert.AreEqual("a", first.Data.EventStreamId);
+		Assert.AreEqual("b", second.Data.EventStreamId);
+		Assert.AreEqual(50, first.Data.Position.PreparePosition);
+		Assert.AreEqual(100, second.Data.Position.PreparePosition);
+		Assert.AreEqual(-1, first.Data.Position.CommitPosition);
+		Assert.AreEqual(-1, second.Data.Position.CommitPosition);
+		Assert.AreEqual(50, first.SafeTransactionFileReaderJoinPosition);
+		Assert.AreEqual(100, second.SafeTransactionFileReaderJoinPosition);
+	}
+
+	[Test]
+	public void publishes_read_events_from_beginning_with_correct_next_event_number() {
+		Assert.AreEqual(3, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
+		Assert.IsTrue(
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+				.Any(m => m.EventStreamId == "a"));
+		Assert.IsTrue(
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+				.Any(m => m.EventStreamId == "b"));
+		Assert.AreEqual(
+			3,
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+				.Last(m => m.EventStreamId == "a")
+				.FromEventNumber);
+		Assert.AreEqual(
+			2, // still first read request
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+				.Last(m => m.EventStreamId == "b")
+				.FromEventNumber);
+	}
+
+	[Test]
+	public void cannot_handle_repeated_read_events_completed() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_edp.Handle(
+				new ClientMessage.ReadStreamEventsForwardCompleted(
+					_distibutionPointCorrelationId, "stream", 100, 100, ReadStreamResult.Success,
+					new[] {
+						ResolvedEvent.ForUnresolvedEvent(
+							new EventRecord(
+								10, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "stream", ExpectedVersion.Any,
+								DateTime.UtcNow,
+								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin |
+								PrepareFlags.TransactionEnd,
+								"event_type", new byte[0], new byte[0]))
+					}, null, false, "", 11, 10, true, 100));
+		});
+	}
+
+	[Test]
+	public void can_handle_following_read_events_completed() {
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "a").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "a", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							3, 250, Guid.NewGuid(), Guid.NewGuid(), 250, 0, "a", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type", new byte[0], new byte[0]))
+				}, null, false, "", 4, 4, false, 300));
+	}
+
+	[Test]
+	public void publishes_committed_event_received_messages_in_correct_order() {
+		Assert.AreEqual(
+			3, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+		var first =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
+				.Skip(0)
+				.First();
+		var second =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
+				.Skip(1)
+				.First();
+		var third =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
+				.Skip(2)
+				.First();
+
+		Assert.AreEqual(first.Data.EventId, _firstEventId);
+		Assert.AreEqual(second.Data.EventId, _thirdEventId);
+		Assert.AreEqual(third.Data.EventId, _secondEventId);
+
+		Assert.IsTrue(first.Data.IsJson);
+		Assert.IsFalse(second.Data.IsJson);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams_after_pause_requested.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams_after_pause_requested.cs
new file mode 100644
index 00000000000..4023a7a4f07
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams_after_pause_requested.cs
@@ -0,0 +1,125 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.multi_stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_read_completed_for_all_streams_after_pause_requested<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private MultiStreamEventReader _edp;
+	private Guid _distibutionPointCorrelationId;
+	private Guid _firstEventId;
+	private Guid _secondEventId;
+	private Guid _thirdEventId;
+	private Guid _fourthEventId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	private string[] _abStreams;
+	private Dictionary<string, long> _ab12Tag;
+
+	[SetUp]
+	public new void When() {
+		_ab12Tag = new Dictionary<string, long> { { "a", 1 }, { "b", 2 } };
+		_abStreams = new[] { "a", "b" };
+
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_edp = new MultiStreamEventReader(
+			_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
+			new RealTimeProvider());
+		_edp.Resume();
+		_firstEventId = Guid.NewGuid();
+		_secondEventId = Guid.NewGuid();
+		_thirdEventId = Guid.NewGuid();
+		_fourthEventId = Guid.NewGuid();
+		_edp.Pause();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "a").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "a", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any, DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 150, Guid.NewGuid(), _secondEventId, 150, 0, "a", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 3, 2, true, 200));
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "b").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "b", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 100, Guid.NewGuid(), _thirdEventId, 100, 0, "b", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							3, 200, Guid.NewGuid(), _fourthEventId, 200, 0, "b", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 4, 3, true, 200));
+	}
+
+	[Test]
+	public void can_be_resumed() {
+		_edp.Resume();
+	}
+
+	[Test]
+	public void cannot_be_paused() {
+		Assert.Throws<InvalidOperationException>(() => { _edp.Pause(); });
+	}
+
+	[Test]
+	public void publishes_correct_number_of_committed_event_received_messages() {
+		Assert.AreEqual(
+			3, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+	}
+
+	[Test]
+	public void cannot_handle_following_read_events_completed() {
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "a").CorrelationId;
+		Assert.Throws<InvalidOperationException>(() => {
+			_edp.Handle(
+				new ClientMessage.ReadStreamEventsForwardCompleted(
+					correlationId, "a", 100, 100, ReadStreamResult.Success,
+					new[] {
+						ResolvedEvent.ForUnresolvedEvent(
+							new EventRecord(
+								3, 250, Guid.NewGuid(), Guid.NewGuid(), 250, 0, "a", ExpectedVersion.Any,
+								DateTime.UtcNow,
+								PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin |
+								PrepareFlags.TransactionEnd,
+								"event_type", new byte[0], new byte[0]))
+					}, null, false, "", 4, 4, false, 300));
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams_and_eofs.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams_and_eofs.cs
new file mode 100644
index 00000000000..83e1765013b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams_and_eofs.cs
@@ -0,0 +1,199 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.multi_stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_read_completed_for_all_streams_and_eofs<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private MultiStreamEventReader _edp;
+	private Guid _distibutionPointCorrelationId;
+	private Guid _firstEventId;
+	private Guid _secondEventId;
+	private Guid _thirdEventId;
+	private Guid _fourthEventId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	private string[] _abStreams;
+	private Dictionary<string, long> _ab12Tag;
+
+	[SetUp]
+	public new void When() {
+		_ab12Tag = new Dictionary<string, long> { { "a", 1 }, { "b", 2 } };
+		_abStreams = new[] { "a", "b" };
+
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_edp = new MultiStreamEventReader(
+			_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
+			new RealTimeProvider());
+		_edp.Resume();
+		_firstEventId = Guid.NewGuid();
+		_secondEventId = Guid.NewGuid();
+		_thirdEventId = Guid.NewGuid();
+		_fourthEventId = Guid.NewGuid();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "a").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "a", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any, DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 150, Guid.NewGuid(), _secondEventId, 150, 0, "a", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 3, 2, true, 200));
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "a").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "b", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 100, Guid.NewGuid(), _thirdEventId, 100, 0, "b", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							3, 200, Guid.NewGuid(), _fourthEventId, 200, 0, "b", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 4, 3, true, 200));
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "a").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "a", 100, 100, ReadStreamResult.Success, new ResolvedEvent[0], null, false, "", 3,
+				2, true, 400));
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "b").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "b", 100, 100, ReadStreamResult.Success, new ResolvedEvent[0], null, false, "", 4,
+				3, true, 400));
+	}
+
+	[Test]
+	public void publishes_correct_committed_event_received_messages() {
+		Assert.AreEqual(
+			6, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+		var first =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().First();
+		var fifth =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
+				.Skip(4)
+				.First();
+		var sixth =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
+				.Skip(5)
+				.First();
+
+		Assert.AreEqual("event_type1", first.Data.EventType);
+		Assert.IsNull(fifth.Data);
+		Assert.IsNull(sixth.Data);
+		Assert.AreEqual(_firstEventId, first.Data.EventId);
+		Assert.AreEqual(1, first.Data.Data[0]);
+		Assert.AreEqual(2, first.Data.Metadata[0]);
+		Assert.AreEqual("a", first.Data.EventStreamId);
+		Assert.IsNull(fifth.Data);
+		//            Assert.IsNullOrEmpty("", fifth.EventStreamId);
+		Assert.AreEqual(50, first.Data.Position.PreparePosition);
+		//            Assert.AreEqual(0, fifth.Position.PreparePosition);
+		Assert.AreEqual(-1, first.Data.Position.CommitPosition);
+		//            Assert.AreEqual(0, fifth.Position.CommitPosition);
+		Assert.AreEqual(50, first.SafeTransactionFileReaderJoinPosition);
+		//            Assert.AreEqual(200, fifth.SafeTransactionFileReaderJoinPosition);
+		Assert.AreEqual(400, sixth.SafeTransactionFileReaderJoinPosition);
+	}
+
+	[Test]
+	public void publishes_read_events_from_beginning_with_correct_next_event_number() {
+		Assert.AreEqual(4, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
+		Assert.IsTrue(
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+				.Any(m => m.EventStreamId == "a"));
+		Assert.IsTrue(
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+				.Any(m => m.EventStreamId == "b"));
+		Assert.AreEqual(
+			3,
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+				.Last(m => m.EventStreamId == "a")
+				.FromEventNumber);
+		Assert.AreEqual(
+			4,
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+				.Last(m => m.EventStreamId == "b")
+				.FromEventNumber);
+	}
+
+	[Test]
+	public void publishes_subscribe_awake() {
+		Assert.AreEqual(4, _consumer.HandledMessages.OfType<AwakeServiceMessage.SubscribeAwake>().Count());
+	}
+
+
+	[Test]
+	public void publishes_committed_event_received_messages_in_correct_order() {
+		Assert.AreEqual(
+			6, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+		var first =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
+				.Skip(0)
+				.First();
+		var second =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
+				.Skip(1)
+				.First();
+		var third =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
+				.Skip(2)
+				.First();
+		var fourth =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
+				.Skip(3)
+				.First();
+		var fifth =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
+				.Skip(4)
+				.First();
+		var sixth =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
+				.Skip(5)
+				.First();
+
+		Assert.AreEqual(first.Data.EventId, _firstEventId);
+		Assert.AreEqual(second.Data.EventId, _thirdEventId);
+		Assert.AreEqual(third.Data.EventId, _secondEventId);
+		Assert.AreEqual(fourth.Data.EventId, _fourthEventId);
+		Assert.IsNull(fifth.Data);
+		Assert.IsNull(sixth.Data);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams_then_pause_requested_then_eof.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams_then_pause_requested_then_eof.cs
new file mode 100644
index 00000000000..8152617352c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_read_completed_for_all_streams_then_pause_requested_then_eof.cs
@@ -0,0 +1,126 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.multi_stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_read_completed_for_all_streams_then_pause_requested_then_eof<TLogFormat, TStreamId> :
+	TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private MultiStreamEventReader _edp;
+	private Guid _distibutionPointCorrelationId;
+	private Guid _firstEventId;
+	private Guid _secondEventId;
+	private Guid _thirdEventId;
+	private Guid _fourthEventId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	private string[] _abStreams;
+	private Dictionary<string, long> _ab12Tag;
+
+	[SetUp]
+	public new void When() {
+		_ab12Tag = new Dictionary<string, long> { { "a", 1 }, { "b", 2 } };
+		_abStreams = new[] { "a", "b" };
+
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_edp = new MultiStreamEventReader(
+			_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
+			new RealTimeProvider());
+		_edp.Resume();
+		_firstEventId = Guid.NewGuid();
+		_secondEventId = Guid.NewGuid();
+		_thirdEventId = Guid.NewGuid();
+		_fourthEventId = Guid.NewGuid();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "a").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "a", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any, DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 100, Guid.NewGuid(), _secondEventId, 100, 0, "a", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 3, 2, true, 200));
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "b").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "b", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 150, Guid.NewGuid(), _thirdEventId, 150, 0, "b", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							3, 200, Guid.NewGuid(), _fourthEventId, 200, 0, "b", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 4, 3, true, 200));
+		_edp.Pause();
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "a").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "a", 100, 100, ReadStreamResult.Success, new ResolvedEvent[] { }, null, false, "", 3,
+				2, true, 400));
+	}
+
+	[Test]
+	public void publishes_read_events_from_beginning_with_correct_next_event_number() {
+		Assert.AreEqual(3, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
+		Assert.IsTrue(
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+				.Any(m => m.EventStreamId == "a"));
+		Assert.IsTrue(
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+				.Any(m => m.EventStreamId == "b"));
+		Assert.AreEqual(
+			3,
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+				.Last(m => m.EventStreamId == "a")
+				.FromEventNumber);
+		Assert.AreEqual(
+			2,
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+				.Last(m => m.EventStreamId == "b")
+				.FromEventNumber);
+	}
+
+	[Test]
+	public void does_not_publish_schedule() {
+		Assert.AreEqual(0,
+			_consumer.HandledMessages.OfType<TimerMessage.Schedule>().Where(x =>
+				x.ReplyMessage.GetType() != typeof(ProjectionManagementMessage.Internal.ReadTimeout)).Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_after_event_zero.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_after_event_zero.cs
new file mode 100644
index 00000000000..e2337b2391d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_after_event_zero.cs
@@ -0,0 +1,136 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.multi_stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_handling_streams_with_deleted_events_and_reader_starting_after_event_zero<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private MultiStreamEventReader _edp;
+	private int _fromSequenceNumber;
+	private string[] _streamNames;
+	private Dictionary<string, long> _streamPositions;
+	private Guid _distibutionPointCorrelationId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+		_fromSequenceNumber = 10;
+		_streamNames = new[] { "stream1", "stream2" };
+		_streamPositions = new Dictionary<string, long> { { "stream1", _fromSequenceNumber }, { "stream2", 100 } };
+	}
+
+	[SetUp]
+	public new void When() {
+		_distibutionPointCorrelationId = Guid.NewGuid();
+
+		_edp = new MultiStreamEventReader(
+			_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _streamNames, _streamPositions, false,
+			new RealTimeProvider());
+
+		_edp.Resume();
+	}
+
+	private void HandleEvents(string stream, long[] eventNumbers) {
+		string eventType = "event_type";
+		List<ResolvedEvent> events = new List<ResolvedEvent>();
+
+		foreach (long eventNumber in eventNumbers) {
+			events.Add(
+				ResolvedEvent.ForUnresolvedEvent(
+					new EventRecord(
+						eventNumber, 50 * (eventNumber + 1), Guid.NewGuid(), Guid.NewGuid(), 50 * (eventNumber + 1),
+						0, stream, ExpectedVersion.Any, DateTime.UtcNow,
+						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+						eventType, new byte[] { 0 }, new byte[] { 0 }
+					)
+				)
+			);
+		}
+
+		long start, end;
+		if (eventNumbers.Length > 0) {
+			start = eventNumbers[0];
+			end = eventNumbers[eventNumbers.Length - 1];
+		} else {
+			start = _fromSequenceNumber;
+			end = _fromSequenceNumber;
+		}
+
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == stream).CorrelationId;
+
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, stream, start, 100, ReadStreamResult.Success, events.ToArray(), null, false, "",
+				start + 1, end, true, 200)
+		);
+	}
+
+	private void HandleEvents(string stream, long start, long end) {
+		List<long> eventNumbers = new List<long>();
+		for (long i = start; i <= end; i++)
+			eventNumbers.Add(i);
+		HandleEvents(stream, eventNumbers.ToArray());
+	}
+
+	[Test]
+	public void allows_first_event_to_be_equal_to_sequence_number() {
+		long eventSequenceNumber = _fromSequenceNumber;
+
+		Assert.DoesNotThrow(() => {
+			HandleEvents(_streamNames[0], eventSequenceNumber, eventSequenceNumber);
+			//to trigger event delivery:
+			HandleEvents(_streamNames[1], 100, 101);
+		});
+	}
+
+	[Test]
+	public void should_not_allow_first_event_to_be_greater_than_sequence_number() {
+		long eventSequenceNumber = _fromSequenceNumber + 5;
+
+		HandleEvents(_streamNames[0], eventSequenceNumber, eventSequenceNumber);
+		//to trigger event delivery:
+		HandleEvents(_streamNames[1], 100, 101);
+
+		Assert.AreEqual(1, HandledMessages.OfType<ReaderSubscriptionMessage.Faulted>().Count());
+	}
+
+	[Test]
+	public void should_not_allow_first_event_to_be_less_than_sequence_number() {
+		long eventSequenceNumber = _fromSequenceNumber - 1;
+
+		HandleEvents(_streamNames[0], eventSequenceNumber, eventSequenceNumber);
+		//to trigger event delivery:
+		HandleEvents(_streamNames[1], 100, 101);
+
+		Assert.AreEqual(1, HandledMessages.OfType<ReaderSubscriptionMessage.Faulted>().Count());
+	}
+
+	[Test]
+	public void events_after_first_event_should_not_be_in_sequence() {
+		//_fromSequenceNumber+2 has been omitted
+		HandleEvents(_streamNames[0],
+			new long[] {
+				_fromSequenceNumber, _fromSequenceNumber + 1, _fromSequenceNumber + 3, _fromSequenceNumber + 4
+			});
+		//to trigger event delivery:
+		HandleEvents(_streamNames[1], 100, 101);
+
+		Assert.AreEqual(2, HandledMessages.OfType<ReaderSubscriptionMessage.Faulted>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_at_event_zero.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_at_event_zero.cs
new file mode 100644
index 00000000000..314f1cee402
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_at_event_zero.cs
@@ -0,0 +1,139 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.multi_stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_handling_streams_with_deleted_events_and_reader_starting_at_event_zero<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private MultiStreamEventReader _edp;
+	private int _fromSequenceNumber;
+	private string[] _streamNames;
+	private Dictionary<string, long> _streamPositions;
+	private Guid _distibutionPointCorrelationId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+		_fromSequenceNumber = 0;
+		_streamNames = new[] { "stream1", "stream2" };
+		_streamPositions = new Dictionary<string, long> { { "stream1", _fromSequenceNumber }, { "stream2", 100 } };
+	}
+
+	[SetUp]
+	public new void When() {
+		_distibutionPointCorrelationId = Guid.NewGuid();
+
+		_edp = new MultiStreamEventReader(
+			_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _streamNames, _streamPositions, false,
+			new RealTimeProvider());
+
+		_edp.Resume();
+	}
+
+	private void HandleEvents(string stream, long[] eventNumbers) {
+		string eventType = "event_type";
+		List<ResolvedEvent> events = new List<ResolvedEvent>();
+
+		foreach (long eventNumber in eventNumbers) {
+			events.Add(
+				ResolvedEvent.ForUnresolvedEvent(
+					new EventRecord(
+						eventNumber, 50 * (eventNumber + 1), Guid.NewGuid(), Guid.NewGuid(), 50 * (eventNumber + 1),
+						0, stream, ExpectedVersion.Any, DateTime.UtcNow,
+						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+						eventType, new byte[] { 0 }, new byte[] { 0 }
+					)
+				)
+			);
+		}
+
+		long start, end;
+		if (eventNumbers.Length > 0) {
+			start = eventNumbers[0];
+			end = eventNumbers[eventNumbers.Length - 1];
+		} else {
+			start = _fromSequenceNumber;
+			end = _fromSequenceNumber;
+		}
+
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == stream).CorrelationId;
+
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, stream, start, 100, ReadStreamResult.Success, events.ToArray(), null, false, "",
+				start + 1, end, true, 200)
+		);
+	}
+
+	private void HandleEvents(string stream, long start, long end) {
+		List<long> eventNumbers = new List<long>();
+		for (long i = start; i <= end; i++)
+			eventNumbers.Add(i);
+		HandleEvents(stream, eventNumbers.ToArray());
+	}
+
+	[Test]
+	public void allows_first_event_to_be_equal_to_sequence_number() {
+		long eventSequenceNumber = _fromSequenceNumber;
+
+		Assert.DoesNotThrow(() => {
+			HandleEvents(_streamNames[0], eventSequenceNumber, eventSequenceNumber);
+			//to trigger event delivery:
+			HandleEvents(_streamNames[1], 100, 101);
+		});
+	}
+
+	[Test]
+	public void allows_first_event_to_be_greater_than_sequence_number() {
+		long eventSequenceNumber = _fromSequenceNumber + 5;
+
+		Assert.DoesNotThrow(() => {
+			HandleEvents(_streamNames[0], eventSequenceNumber, eventSequenceNumber);
+			//to trigger event delivery:
+			HandleEvents(_streamNames[1], 100, 101);
+		});
+	}
+
+	[Test]
+	public void events_after_first_event_should_not_be_in_sequence() {
+		//_fromSequenceNumber+2 has been omitted
+		HandleEvents(_streamNames[0],
+			new long[] {
+				_fromSequenceNumber, _fromSequenceNumber + 1, _fromSequenceNumber + 3, _fromSequenceNumber + 4
+			});
+		//to trigger event delivery:
+		HandleEvents(_streamNames[1], 100, 101);
+
+		Assert.AreEqual(2, HandledMessages.OfType<ReaderSubscriptionMessage.Faulted>().Count());
+	}
+
+	[Test]
+	public void events_fault_message_for_out_of_sequence_events_should_be() {
+		//_fromSequenceNumber+2 has been omitted
+		HandleEvents(_streamNames[0],
+			new long[] {
+				_fromSequenceNumber, _fromSequenceNumber + 1, _fromSequenceNumber + 3, _fromSequenceNumber + 4
+			});
+		//to trigger event delivery:
+		HandleEvents(_streamNames[1], 100, 101);
+
+		Assert.IsTrue(HandledMessages.OfType<ReaderSubscriptionMessage.Faulted>().First().Reason
+			.Contains(" was expected in the stream "));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_has_been_created.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_has_been_created.cs
new file mode 100644
index 00000000000..418004f78fa
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_has_been_created.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.multi_stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_has_been_created<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private MultiStreamEventReader _edp;
+	private Guid _distibutionPointCorrelationId;
+	private string[] _abStreams;
+	private Dictionary<string, long> _ab12Tag;
+
+	[SetUp]
+	public new void When() {
+		_ab12Tag = new Dictionary<string, long> { { "a", 1 }, { "b", 2 } };
+		_abStreams = new[] { "a", "b" };
+
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_edp = new MultiStreamEventReader(
+			_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
+			new RealTimeProvider());
+	}
+
+	[Test]
+	public void it_can_be_resumed() {
+		_edp.Resume();
+	}
+
+	[Test]
+	public void it_cannot_be_paused() {
+		Assert.Throws<InvalidOperationException>(() => { _edp.Pause(); });
+	}
+
+	[Test]
+	public void handle_read_events_completed_throws() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_edp.Handle(
+				new ClientMessage.ReadStreamEventsForwardCompleted(
+					_distibutionPointCorrelationId, "a", 100, 100, ReadStreamResult.Success, new ResolvedEvent[0],
+					null, false, "", -1, 4, true, 100));
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_onetime_reader_handles_eof.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_onetime_reader_handles_eof.cs
new file mode 100644
index 00000000000..2932d49ffdb
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_onetime_reader_handles_eof.cs
@@ -0,0 +1,101 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.multi_stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_onetime_reader_handles_eof<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private MultiStreamEventReader _edp;
+	private Guid _distibutionPointCorrelationId;
+	private Guid _firstEventId;
+	private Guid _secondEventId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	private string[] _abStreams;
+	private Dictionary<string, long> _ab12Tag;
+	private FakeTimeProvider _fakeTimeProvider;
+
+	[SetUp]
+	public new void When() {
+		_ab12Tag = new Dictionary<string, long> { { "a", 1 }, { "b", 2 } };
+		_abStreams = new[] { "a", "b" };
+
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_fakeTimeProvider = new FakeTimeProvider();
+		_edp = new MultiStreamEventReader(
+			_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
+			_fakeTimeProvider, stopOnEof: true);
+		_edp.Resume();
+		_firstEventId = Guid.NewGuid();
+		_secondEventId = Guid.NewGuid();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "a").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "a", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any,
+							_fakeTimeProvider.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+				}, null, false, "", 2, 1, true, 200));
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "b").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "b", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 100, Guid.NewGuid(), _secondEventId, 100, 0, "b", ExpectedVersion.Any,
+							_fakeTimeProvider.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+				}, null, false, "", 3, 2, true, 200));
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "a").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "a", 100, 100, ReadStreamResult.Success, new ResolvedEvent[] { }, null, false, "", 2,
+				1, true, 400));
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "b").CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "b", 100, 100, ReadStreamResult.Success, new ResolvedEvent[] { }, null, false, "", 3,
+				2, true, 400));
+	}
+
+	[Test]
+	public void publishes_eof_message() {
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderEof>().Count());
+		var first = _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderEof>().First();
+		Assert.AreEqual(first.CorrelationId, _distibutionPointCorrelationId);
+	}
+
+	[Test]
+	public void does_not_publish_read_messages_anymore() {
+		Assert.AreEqual(4, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_read_completes_before_timeout.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_read_completes_before_timeout.cs
new file mode 100644
index 00000000000..ab0fa4ca89f
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_read_completes_before_timeout.cs
@@ -0,0 +1,92 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.multi_stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_read_completes_before_timeout<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private MultiStreamEventReader _eventReader;
+	private Guid _distibutionPointCorrelationId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	private string[] _abStreams;
+	private Dictionary<string, long> _ab12Tag;
+
+	[SetUp]
+	public new void When() {
+		_ab12Tag = new Dictionary<string, long> { { "a", 1 }, { "b", 2 } };
+		_abStreams = new[] { "a", "b" };
+
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_eventReader = new MultiStreamEventReader(
+			_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
+			new RealTimeProvider());
+		_eventReader.Resume();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "a").CorrelationId;
+		_eventReader.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "a", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							1, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "a", ExpectedVersion.Any, DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
+							PrepareFlags.IsJson,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 150, Guid.NewGuid(), Guid.NewGuid(), 150, 0, "a", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 3, 2, true, 200));
+		_eventReader.Handle(
+			new ProjectionManagementMessage.Internal.ReadTimeout(correlationId, "a"));
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "b").CorrelationId;
+		_eventReader.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "b", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 100, Guid.NewGuid(), Guid.NewGuid(), 100, 0, "b", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							3, 200, Guid.NewGuid(), Guid.NewGuid(), 200, 0, "b", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 4, 3, true, 200));
+		_eventReader.Handle(
+			new ProjectionManagementMessage.Internal.ReadTimeout(correlationId, "b"));
+	}
+
+	[Test]
+	public void should_deliver_events() {
+		Assert.AreEqual(3,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_read_for_one_stream_completes_but_times_out_for_another.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_read_for_one_stream_completes_but_times_out_for_another.cs
new file mode 100644
index 00000000000..f740c53f77d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_read_for_one_stream_completes_but_times_out_for_another.cs
@@ -0,0 +1,117 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.multi_stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_read_for_one_stream_completes_but_times_out_for_another<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private MultiStreamEventReader _eventReader;
+	private Guid _distibutionPointCorrelationId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	private string[] _abStreams;
+	private Dictionary<string, long> _ab12Tag;
+
+	[SetUp]
+	public new void When() {
+		_ab12Tag = new Dictionary<string, long> { { "a", 1 }, { "b", 2 } };
+		_abStreams = new[] { "a", "b" };
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_eventReader = new MultiStreamEventReader(
+			_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
+			new RealTimeProvider());
+		_eventReader.Resume();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "a").CorrelationId;
+		_eventReader.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "a", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							1, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "a", ExpectedVersion.Any, DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
+							PrepareFlags.IsJson,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 150, Guid.NewGuid(), Guid.NewGuid(), 150, 0, "a", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 3, 2, true, 200));
+		//timeout follows
+		_eventReader.Handle(
+			new ProjectionManagementMessage.Internal.ReadTimeout(correlationId, "a"));
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "b").CorrelationId;
+		_eventReader.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "b", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 100, Guid.NewGuid(), Guid.NewGuid(), 100, 0, "b", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							3, 200, Guid.NewGuid(), Guid.NewGuid(), 200, 0, "b", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 4, 3, true, 200));
+		//timeout follows
+		_eventReader.Handle(
+			new ProjectionManagementMessage.Internal.ReadTimeout(correlationId, "b"));
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "a").CorrelationId;
+		_consumer.HandledMessages.Clear();
+		//timeout before read completes
+		_eventReader.Handle(
+			new ProjectionManagementMessage.Internal.ReadTimeout(correlationId, "a"));
+		_eventReader.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "a", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							3, 300, Guid.NewGuid(), Guid.NewGuid(), 300, 0, "a", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
+							PrepareFlags.IsJson,
+							"event_type1", new byte[] {4}, new byte[] {6})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							4, 400, Guid.NewGuid(), Guid.NewGuid(), 400, 0, "a", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {6}, new byte[] {8}))
+				}, null, false, "", 3, 2, true, 200));
+	}
+
+	[Test]
+	public void should_not_deliver_events_from_last_read() {
+		Assert.AreEqual(0,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_read_timeout_occurs.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_read_timeout_occurs.cs
new file mode 100644
index 00000000000..d60f3dbb44e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_read_timeout_occurs.cs
@@ -0,0 +1,109 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.multi_stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_read_timeout_occurs<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private MultiStreamEventReader _eventReader;
+	private Guid _distibutionPointCorrelationId;
+	private Guid _streamReadACorrelationId;
+	private Guid _streamReadBCorrelationId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	private string[] _abStreams;
+	private Dictionary<string, long> _ab12Tag;
+
+	[SetUp]
+	public new void When() {
+		_ab12Tag = new Dictionary<string, long> { { "a", 1 }, { "b", 2 } };
+		_abStreams = new[] { "a", "b" };
+
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_eventReader = new MultiStreamEventReader(
+			_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
+			new RealTimeProvider());
+		_eventReader.Resume();
+		_streamReadACorrelationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "a").CorrelationId;
+		_eventReader.Handle(
+			new ProjectionManagementMessage.Internal.ReadTimeout(_streamReadACorrelationId, "a"));
+		_eventReader.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				_streamReadACorrelationId, "a", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							1, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "a", ExpectedVersion.Any, DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
+							PrepareFlags.IsJson,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 150, Guid.NewGuid(), Guid.NewGuid(), 150, 0, "a", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 3, 2, true, 200));
+		_streamReadBCorrelationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == "b").CorrelationId;
+		_eventReader.Handle(
+			new ProjectionManagementMessage.Internal.ReadTimeout(_streamReadBCorrelationId, "b"));
+		_eventReader.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				_streamReadBCorrelationId, "b", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 100, Guid.NewGuid(), Guid.NewGuid(), 100, 0, "b", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							3, 200, Guid.NewGuid(), Guid.NewGuid(), 200, 0, "b", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 4, 3, true, 200));
+	}
+
+	[Test]
+	public void should_not_deliver_events() {
+		Assert.AreEqual(0,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+	}
+
+	[Test]
+	public void should_attempt_another_read_for_the_timed_out_reads() {
+		var streamAReads = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Where(x => x.EventStreamId == "a");
+
+		Assert.AreEqual(streamAReads.First().CorrelationId, _streamReadACorrelationId);
+		Assert.AreEqual(1, streamAReads.Skip(1).Count());
+
+		var streamBReads = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Where(x => x.EventStreamId == "b");
+
+		Assert.AreEqual(streamBReads.First().CorrelationId, _streamReadBCorrelationId);
+		Assert.AreEqual(1, streamBReads.Skip(1).Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_resuming.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_resuming.cs
new file mode 100644
index 00000000000..ef2bd26c68b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/multi_stream_reader/when_resuming.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.multi_stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_resuming<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private MultiStreamEventReader _edp;
+	private Guid _distibutionPointCorrelationId;
+
+	private string[] _abStreams;
+	private Dictionary<string, long> _ab12Tag;
+
+	[SetUp]
+	public new void When() {
+		_ab12Tag = new Dictionary<string, long> { { "a", 1 }, { "b", 2 } };
+		_abStreams = new[] { "a", "b" };
+
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_edp = new MultiStreamEventReader(
+			_ioDispatcher, _bus, _distibutionPointCorrelationId, null, 0, _abStreams, _ab12Tag, false,
+			new RealTimeProvider());
+
+		_edp.Resume();
+	}
+
+	[Test]
+	public void it_cannot_be_resumed() {
+		Assert.Throws<InvalidOperationException>(() => { _edp.Resume(); });
+	}
+
+	[Test]
+	public void it_cannot_be_paused() {
+		_edp.Pause();
+	}
+
+	[Test]
+	public void it_publishes_read_events_from_beginning() {
+		Assert.AreEqual(2, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
+		Assert.IsTrue(
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+				.Any(m => m.EventStreamId == "a"));
+		Assert.IsTrue(
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+				.Any(m => m.EventStreamId == "b"));
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+				.Single(m => m.EventStreamId == "a")
+				.FromEventNumber);
+		Assert.AreEqual(
+			2,
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+				.Single(m => m.EventStreamId == "b")
+				.FromEventNumber);
+	}
+
+	[Test]
+	public void can_handle_read_events_completed() {
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				_distibutionPointCorrelationId, "a", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							1, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "a", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type", new byte[0], new byte[0]), 0)
+				}, null, false, "", 2, 4, false, 100));
+	}
+}
diff --git a/src/EventStore.Projections.Core.Tests/Services/event_reader/reader_subscription_dispatcher.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/reader_subscription_dispatcher.cs
similarity index 90%
rename from src/EventStore.Projections.Core.Tests/Services/event_reader/reader_subscription_dispatcher.cs
rename to src/KurrentDB.Projections.Core.Tests/Services/event_reader/reader_subscription_dispatcher.cs
index 167d293ddf8..9cf8f02dfc9 100644
--- a/src/EventStore.Projections.Core.Tests/Services/event_reader/reader_subscription_dispatcher.cs
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/reader_subscription_dispatcher.cs
@@ -1,20 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Settings;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Subscriptions;
-using EventStore.Projections.Core.Tests.Services.event_reader.heading_event_reader;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Settings;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+using KurrentDB.Projections.Core.Tests.Services.event_reader.heading_event_reader;
 using NUnit.Framework;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
 
-namespace EventStore.Projections.Core.Tests.Services.event_reader;
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader;
 
 [TestFixture(typeof(LogFormat.V2), typeof(string))]
 [TestFixture(typeof(LogFormat.V3), typeof(uint))]
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_creating_stream_event_reader.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_creating_stream_event_reader.cs
new file mode 100644
index 00000000000..1b00bf2fed0
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_creating_stream_event_reader.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_creating_stream_event_reader<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	[Test]
+	public void it_can_be_created() {
+		new StreamEventReader(_bus, Guid.NewGuid(), null, "stream", 0, new RealTimeProvider(), false,
+			produceStreamDeletes: false);
+	}
+
+	[Test]
+	public void null_publisher_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			new StreamEventReader(null, Guid.NewGuid(), null, "stream", 0, new RealTimeProvider(), false,
+				produceStreamDeletes: false);
+		});
+	}
+
+	[Test]
+	public void empty_event_reader_id_throws_argument_exception() {
+		Assert.Throws<ArgumentException>(() => {
+			new StreamEventReader(_bus, Guid.Empty, null, "stream", 0, new RealTimeProvider(), false,
+				produceStreamDeletes: false);
+		});
+	}
+
+	[Test]
+	public void null_stream_name_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			new StreamEventReader(_bus, Guid.NewGuid(), null, null, 0, new RealTimeProvider(), false,
+				produceStreamDeletes: false);
+		});
+	}
+
+	[Test]
+	public void empty_stream_name_throws_argument_exception() {
+		Assert.Throws<ArgumentException>(() => {
+			new StreamEventReader(_bus, Guid.NewGuid(), null, "", 0, new RealTimeProvider(), false,
+				produceStreamDeletes: false);
+		});
+	}
+
+	[Test]
+	public void negative_event_sequence_number_throws_argument_exception() {
+		Assert.Throws<ArgumentException>(() => {
+			new StreamEventReader(_bus, Guid.NewGuid(), null, "", -1, new RealTimeProvider(), false,
+				produceStreamDeletes: false);
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_deleted_streams.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_deleted_streams.cs
new file mode 100644
index 00000000000..1e2cd4106d6
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_deleted_streams.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_deleted_streams<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private StreamEventReader _edp;
+	private string _streamName;
+	private Guid _distibutionPointCorrelationId;
+	private long _fromSequenceNumber = 10;
+	private FakeTimeProvider _fakeTimeProvider;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+		_streamName = "stream1";
+		_fromSequenceNumber = 10;
+	}
+
+	[SetUp]
+	public new void When() {
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_fakeTimeProvider = new FakeTimeProvider();
+		_edp = new StreamEventReader(_bus, _distibutionPointCorrelationId, null, _streamName, _fromSequenceNumber,
+			_fakeTimeProvider, false, produceStreamDeletes: false);
+		_edp.Resume();
+	}
+
+	private void HandleEvents(string stream, long[] eventNumbers) {
+		string eventType = "event_type";
+		List<ResolvedEvent> events = new List<ResolvedEvent>();
+
+		foreach (long eventNumber in eventNumbers) {
+			events.Add(
+				ResolvedEvent.ForUnresolvedEvent(
+					new EventRecord(
+						eventNumber, 50 * (eventNumber + 1), Guid.NewGuid(), Guid.NewGuid(), 50 * (eventNumber + 1),
+						0, stream, ExpectedVersion.Any, DateTime.UtcNow,
+						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+						eventType, new byte[] { 0 }, new byte[] { 0 }
+					)
+				)
+			);
+		}
+
+		long start, end;
+		if (eventNumbers.Length > 0) {
+			start = eventNumbers[0];
+			end = eventNumbers[eventNumbers.Length - 1];
+		} else {
+			start = _fromSequenceNumber;
+			end = _fromSequenceNumber;
+		}
+
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == stream).CorrelationId;
+
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, stream, start, 100, ReadStreamResult.Success, events.ToArray(), null, false, "",
+				start + 1, end, true, 200)
+		);
+	}
+
+	private void HandleEvents(string stream, long start, long end) {
+		List<long> eventNumbers = new List<long>();
+		for (long i = start; i <= end; i++)
+			eventNumbers.Add(i);
+		HandleEvents(stream, eventNumbers.ToArray());
+	}
+
+	private void HandleDeletedStream(string stream, long sequenceNumber, ReadStreamResult result) {
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Last(x => x.EventStreamId == stream).CorrelationId;
+
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, stream, sequenceNumber, 100, result, new ResolvedEvent[] { }, null, false, "", -1,
+				sequenceNumber, true, 200)
+		);
+	}
+
+	[Test]
+	public void when_no_stream_and_sequence_num_equal_to_minus_one_should_not_publish_partition_deleted_message() {
+		HandleDeletedStream(_streamName, -1, ReadStreamResult.NoStream);
+		Assert.AreEqual(0,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().Count());
+	}
+
+	[Test]
+	public void when_no_stream_and_sequence_num_equal_to_zero_should_publish_partition_deleted_message() {
+		HandleDeletedStream(_streamName, 0, ReadStreamResult.NoStream);
+		Assert.AreEqual(1,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().Count());
+		Assert.AreEqual(_streamName,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().First()
+				.Partition);
+	}
+
+	[Test]
+	public void when_no_stream_and_sequence_num_greater_than_zero_should_publish_partition_deleted_message() {
+		HandleDeletedStream(_streamName, 100, ReadStreamResult.NoStream);
+		Assert.AreEqual(1,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().Count());
+		Assert.AreEqual(_streamName,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().First()
+				.Partition);
+	}
+
+	[Test]
+	public void when_stream_deleted_should_publish_partition_deleted_message() {
+		HandleDeletedStream(_streamName, 0, ReadStreamResult.StreamDeleted);
+		Assert.AreEqual(1,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().Count());
+		Assert.AreEqual(_streamName,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().First()
+				.Partition);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_eof_and_idle_eof.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_eof_and_idle_eof.cs
new file mode 100644
index 00000000000..9b40e98d9c6
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_eof_and_idle_eof.cs
@@ -0,0 +1,96 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_eof_and_idle_eof<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private StreamEventReader _edp;
+
+	//private Guid _publishWithCorrelationId;
+	private Guid _distibutionPointCorrelationId;
+	private Guid _firstEventId;
+	private Guid _secondEventId;
+	private FakeTimeProvider _fakeTimeProvider;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	[SetUp]
+	public new void When() {
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_fakeTimeProvider = new FakeTimeProvider();
+		_edp = new StreamEventReader(_bus, _distibutionPointCorrelationId, null, "stream", 10, _fakeTimeProvider,
+			false,
+			produceStreamDeletes: false);
+		_edp.Resume();
+		_firstEventId = Guid.NewGuid();
+		_secondEventId = Guid.NewGuid();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
+			.CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "stream", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							10, 50, Guid.NewGuid(), _firstEventId, 50, 0, "stream", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							11, 100, Guid.NewGuid(), _secondEventId, 100, 0, "stream", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 12, 11, true, 200));
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
+			.CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "stream", 100, 100, ReadStreamResult.Success,
+				new ResolvedEvent[] { }, null, false, "", 12, 11, true, 400));
+		_fakeTimeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(500));
+		correlationId = ((ClientMessage.ReadStreamEventsForward)(_consumer.HandledMessages
+			.OfType<AwakeServiceMessage.SubscribeAwake>().Last().ReplyWithMessage)).CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "stream", 100, 100, ReadStreamResult.Success,
+				new ResolvedEvent[] { }, null, false, "", 12, 11, true, 400));
+	}
+
+	[Test]
+	public void publishes_event_distribution_idle_messages() {
+		Assert.AreEqual(
+			2, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderIdle>().Count());
+		var first =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderIdle>().First();
+		var second =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderIdle>()
+				.Skip(1)
+				.First();
+
+		Assert.AreEqual(first.CorrelationId, _distibutionPointCorrelationId);
+		Assert.AreEqual(second.CorrelationId, _distibutionPointCorrelationId);
+
+		Assert.AreEqual(TimeSpan.FromMilliseconds(500), second.IdleTimestampUtc - first.IdleTimestampUtc);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_no_stream.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_no_stream.cs
new file mode 100644
index 00000000000..2556ab95c2f
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_no_stream.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_no_stream<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private StreamEventReader _edp;
+	private Guid _distibutionPointCorrelationId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	[SetUp]
+	public new void When() {
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_edp = new StreamEventReader(_bus, _distibutionPointCorrelationId, null, "stream", 0,
+			new RealTimeProvider(), false,
+			produceStreamDeletes: false);
+		_edp.Resume();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
+			.CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "stream", 100, 100,
+				ReadStreamResult.NoStream, new ResolvedEvent[0], null, false, "", -1, ExpectedVersion.NoStream,
+				true, 200));
+	}
+
+	[Test]
+	public void cannot_be_resumed() {
+		Assert.Throws<InvalidOperationException>(() => { _edp.Resume(); });
+	}
+
+	[Test]
+	public void cannot_be_paused() {
+		_edp.Pause();
+	}
+
+	[Test]
+	public void publishes_read_events_from_beginning_with_correct_next_event_number() {
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
+		Assert.AreEqual(
+			"stream",
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last().EventStreamId);
+		Assert.AreEqual(
+			0, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last().FromEventNumber);
+	}
+
+	[Test]
+	public void publishes_correct_committed_event_received_messages() {
+		Assert.AreEqual(
+			1, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+		var first =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Single();
+		Assert.IsNull(first.Data);
+		Assert.AreEqual(200, first.SafeTransactionFileReaderJoinPosition);
+	}
+
+	[Test]
+	public void publishes_subscribe_awake() {
+		Assert.AreEqual(2, _consumer.HandledMessages.OfType<AwakeServiceMessage.SubscribeAwake>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_read_completed_and_eof.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_read_completed_and_eof.cs
new file mode 100644
index 00000000000..0dd72235ecb
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_read_completed_and_eof.cs
@@ -0,0 +1,121 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_read_completed_and_eof<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private StreamEventReader _edp;
+	private Guid _distibutionPointCorrelationId;
+	private Guid _firstEventId;
+	private Guid _secondEventId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	[SetUp]
+	public new void When() {
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_edp = new StreamEventReader(_bus, _distibutionPointCorrelationId, null, "stream", 10,
+			new RealTimeProvider(), false,
+			produceStreamDeletes: false);
+		_edp.Resume();
+		_firstEventId = Guid.NewGuid();
+		_secondEventId = Guid.NewGuid();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
+			.CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "stream", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							10, 50, Guid.NewGuid(), _firstEventId, 50, 0, "stream", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							11, 100, Guid.NewGuid(), _secondEventId, 100, 0, "stream", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 12, 11, true, 200));
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
+			.CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "stream", 100, 100, ReadStreamResult.Success, new ResolvedEvent[0]
+				, null, false, "", 12, 11, true, 400));
+	}
+
+	[Test]
+	public void cannot_be_resumed() {
+		Assert.Throws<InvalidOperationException>(() => { _edp.Resume(); });
+	}
+
+	[Test]
+	public void cannot_be_paused() {
+		_edp.Pause();
+	}
+
+	[Test]
+	public void publishes_correct_committed_event_received_messages() {
+		Assert.AreEqual(
+			3, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+		var first =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().First();
+		var second =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
+				.Skip(1)
+				.First();
+		var third =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
+				.Skip(2)
+				.First();
+		Assert.IsNull(third.Data);
+		Assert.AreEqual(400, third.SafeTransactionFileReaderJoinPosition);
+
+		Assert.AreEqual("event_type1", first.Data.EventType);
+		Assert.AreEqual("event_type2", second.Data.EventType);
+		Assert.AreEqual(_firstEventId, first.Data.EventId);
+		Assert.AreEqual(_secondEventId, second.Data.EventId);
+		Assert.AreEqual(1, first.Data.Data[0]);
+		Assert.AreEqual(2, first.Data.Metadata[0]);
+		Assert.AreEqual(3, second.Data.Data[0]);
+		Assert.AreEqual(4, second.Data.Metadata[0]);
+		Assert.AreEqual("stream", first.Data.EventStreamId);
+		Assert.AreEqual("stream", second.Data.EventStreamId);
+		Assert.AreEqual(50, first.Data.Position.PreparePosition);
+		Assert.AreEqual(100, second.Data.Position.PreparePosition);
+		Assert.AreEqual(-1, first.Data.Position.CommitPosition);
+		Assert.AreEqual(-1, second.Data.Position.CommitPosition);
+		Assert.AreEqual(50, first.Data.EventOrLinkTargetPosition.PreparePosition);
+		Assert.AreEqual(100, second.Data.EventOrLinkTargetPosition.PreparePosition);
+		Assert.AreEqual(-1, first.Data.EventOrLinkTargetPosition.CommitPosition);
+		Assert.AreEqual(-1, second.Data.EventOrLinkTargetPosition.CommitPosition);
+		Assert.AreEqual(50, first.SafeTransactionFileReaderJoinPosition);
+		Assert.AreEqual(100, second.SafeTransactionFileReaderJoinPosition);
+	}
+
+	[Test]
+	public void publishes_subscribe_awake() {
+		Assert.AreEqual(2, _consumer.HandledMessages.OfType<AwakeServiceMessage.SubscribeAwake>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_read_completed_stream_event_reader.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_read_completed_stream_event_reader.cs
new file mode 100644
index 00000000000..3a786801930
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_read_completed_stream_event_reader.cs
@@ -0,0 +1,151 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_read_completed_stream_event_reader<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private StreamEventReader _edp;
+	private Guid _distibutionPointCorrelationId;
+	private Guid _firstEventId;
+	private Guid _secondEventId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	[SetUp]
+	public new void When() {
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_edp = new StreamEventReader(_bus, _distibutionPointCorrelationId, null, "stream", 10,
+			new RealTimeProvider(), false,
+			produceStreamDeletes: false);
+		_edp.Resume();
+		_firstEventId = Guid.NewGuid();
+		_secondEventId = Guid.NewGuid();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
+			.CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "stream", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							10, 50, Guid.NewGuid(), _firstEventId, 50, 0, "stream", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							11, 100, Guid.NewGuid(), _secondEventId, 100, 0, "stream", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
+							PrepareFlags.IsJson,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 12, 11, true, 200));
+	}
+
+	[Test]
+	public void cannot_be_resumed() {
+		Assert.Throws<InvalidOperationException>(() => { _edp.Resume(); });
+	}
+
+	[Test]
+	public void cannot_be_paused() {
+		_edp.Pause();
+	}
+
+	[Test]
+	public void publishes_correct_committed_event_received_messages() {
+		Assert.AreEqual(
+			2, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+		var first =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().First();
+		var second =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
+				.Skip(1)
+				.First();
+
+		Assert.AreEqual("event_type1", first.Data.EventType);
+		Assert.AreEqual("event_type2", second.Data.EventType);
+		Assert.AreEqual(_firstEventId, first.Data.EventId);
+		Assert.AreEqual(_secondEventId, second.Data.EventId);
+		Assert.AreEqual(1, first.Data.Data[0]);
+		Assert.AreEqual(2, first.Data.Metadata[0]);
+		Assert.AreEqual(3, second.Data.Data[0]);
+		Assert.AreEqual(4, second.Data.Metadata[0]);
+		Assert.AreEqual("stream", first.Data.EventStreamId);
+		Assert.AreEqual("stream", second.Data.EventStreamId);
+		Assert.AreEqual(50, first.Data.Position.PreparePosition);
+		Assert.AreEqual(100, second.Data.Position.PreparePosition);
+		Assert.AreEqual(-1, first.Data.Position.CommitPosition);
+		Assert.AreEqual(-1, second.Data.Position.CommitPosition);
+		Assert.AreEqual(50, first.Data.EventOrLinkTargetPosition.PreparePosition);
+		Assert.AreEqual(100, second.Data.EventOrLinkTargetPosition.PreparePosition);
+		Assert.AreEqual(-1, first.Data.EventOrLinkTargetPosition.CommitPosition);
+		Assert.AreEqual(-1, second.Data.EventOrLinkTargetPosition.CommitPosition);
+		Assert.AreEqual(50, first.SafeTransactionFileReaderJoinPosition);
+		Assert.AreEqual(100, second.SafeTransactionFileReaderJoinPosition);
+		Assert.IsFalse(first.Data.IsJson);
+		Assert.IsTrue(second.Data.IsJson);
+	}
+
+	[Test]
+	public void publishes_read_events_from_beginning_with_correct_next_event_number() {
+		Assert.AreEqual(2, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
+		Assert.AreEqual(
+			"stream",
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last().EventStreamId);
+		Assert.AreEqual(
+			12, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last().FromEventNumber);
+	}
+
+	[Test]
+	public void cannot_handle_repeated_read_events_completed() {
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
+			.CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "stream", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							10, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "stream", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type", new byte[0], new byte[0]))
+				}, null, false, "", 11, 10, true, 100));
+		Assert.AreEqual(1, HandledMessages.OfType<ReaderSubscriptionMessage.Faulted>().Count());
+	}
+
+	[Test]
+	public void can_handle_following_read_events_completed() {
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
+			.CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "stream", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							12, 250, Guid.NewGuid(), Guid.NewGuid(), 250, 0, "stream", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type", new byte[0], new byte[0]))
+				}, null, false, "", 13, 11, true, 300));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_read_completed_then_pause_then_eof.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_read_completed_then_pause_then_eof.cs
new file mode 100644
index 00000000000..f3936f3d78e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_read_completed_then_pause_then_eof.cs
@@ -0,0 +1,123 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_read_completed_then_pause_then_eof<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private StreamEventReader _edp;
+	private Guid _distibutionPointCorrelationId;
+	private Guid _firstEventId;
+	private Guid _secondEventId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	[SetUp]
+	public new void When() {
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_edp = new StreamEventReader(_bus, _distibutionPointCorrelationId, null, "stream", 10,
+			new RealTimeProvider(), false,
+			produceStreamDeletes: false);
+		_edp.Resume();
+		_firstEventId = Guid.NewGuid();
+		_secondEventId = Guid.NewGuid();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
+			.CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "stream", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							10, 50, Guid.NewGuid(), _firstEventId, 50, 0, "stream", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							11, 100, Guid.NewGuid(), _secondEventId, 100, 0, "stream", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 12, 11, true, 200));
+		_edp.Pause();
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
+			.CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "stream", 100, 100, ReadStreamResult.Success, new ResolvedEvent[0]
+				, null, false, "", 12, 11, true, 400));
+	}
+
+	[Test]
+	public void can_be_resumed() {
+		_edp.Resume();
+	}
+
+	[Test]
+	public void cannot_be_paused() {
+		Assert.Throws<InvalidOperationException>(() => { _edp.Pause(); });
+	}
+
+	[Test]
+	public void publishes_correct_committed_event_received_messages() {
+		Assert.AreEqual(
+			3, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+		var first =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().First();
+		var second =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
+				.Skip(1)
+				.First();
+		var third =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>()
+				.Skip(2)
+				.First();
+		Assert.IsNull(third.Data);
+		Assert.AreEqual(400, third.SafeTransactionFileReaderJoinPosition);
+
+		Assert.AreEqual("event_type1", first.Data.EventType);
+		Assert.AreEqual("event_type2", second.Data.EventType);
+		Assert.AreEqual(_firstEventId, first.Data.EventId);
+		Assert.AreEqual(_secondEventId, second.Data.EventId);
+		Assert.AreEqual(1, first.Data.Data[0]);
+		Assert.AreEqual(2, first.Data.Metadata[0]);
+		Assert.AreEqual(3, second.Data.Data[0]);
+		Assert.AreEqual(4, second.Data.Metadata[0]);
+		Assert.AreEqual("stream", first.Data.EventStreamId);
+		Assert.AreEqual("stream", second.Data.EventStreamId);
+		Assert.AreEqual(50, first.Data.Position.PreparePosition);
+		Assert.AreEqual(100, second.Data.Position.PreparePosition);
+		Assert.AreEqual(-1, first.Data.Position.CommitPosition);
+		Assert.AreEqual(-1, second.Data.Position.CommitPosition);
+		Assert.AreEqual(50, first.Data.EventOrLinkTargetPosition.PreparePosition);
+		Assert.AreEqual(100, second.Data.EventOrLinkTargetPosition.PreparePosition);
+		Assert.AreEqual(-1, first.Data.EventOrLinkTargetPosition.CommitPosition);
+		Assert.AreEqual(-1, second.Data.EventOrLinkTargetPosition.CommitPosition);
+		Assert.AreEqual(50, first.SafeTransactionFileReaderJoinPosition);
+		Assert.AreEqual(100, second.SafeTransactionFileReaderJoinPosition);
+	}
+
+	[Test]
+	public void does_not_publish_schedule() {
+		Assert.AreEqual(0,
+			_consumer.HandledMessages.OfType<TimerMessage.Schedule>().Where(x =>
+				x.ReplyMessage.GetType() != typeof(ProjectionManagementMessage.Internal.ReadTimeout)).Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_soft_deleted_stream_with_a_single_event_event_reader.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_soft_deleted_stream_with_a_single_event_event_reader.cs
new file mode 100644
index 00000000000..ab758129ce5
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_soft_deleted_stream_with_a_single_event_event_reader.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_soft_deleted_stream_with_a_single_event_event_reader<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private StreamEventReader _streamEventReader;
+	private Guid _distibutionPointCorrelationId;
+	private Guid _firstEventId;
+	private Guid _secondEventId;
+	private string _streamId = Guid.NewGuid().ToString();
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_streamEventReader = new StreamEventReader(_bus, _distibutionPointCorrelationId, null, _streamId, 0,
+			new RealTimeProvider(), false,
+			produceStreamDeletes: false);
+		_streamEventReader.Resume();
+		_firstEventId = Guid.NewGuid();
+		_secondEventId = Guid.NewGuid();
+	}
+
+	[SetUp]
+	public new void When() {
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
+			.CorrelationId;
+		_streamEventReader.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, _streamId, 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							10, 50, Guid.NewGuid(), _firstEventId, 50, 0, _streamId, ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							11, 100, Guid.NewGuid(), _secondEventId, 100, 0, _streamId, ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd |
+							PrepareFlags.IsJson,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 12, 11, true, 200));
+	}
+
+	[Test]
+	public void should_handle_the_2_events() {
+		Assert.AreEqual(2,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+
+		var first = _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().First();
+		Assert.AreEqual(first.Data.EventId, _firstEventId,
+			String.Format("Expected the first event to be {0}, but got {1}", _firstEventId, first.Data.EventId));
+		var second = _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Skip(1)
+			.First();
+		Assert.AreEqual(second.Data.EventId, _secondEventId,
+			String.Format("Expected the second event to be {0}, but got {1}", _secondEventId, second.Data.EventId));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_after_event_zero.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_after_event_zero.cs
new file mode 100644
index 00000000000..c74afa0ba7d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_after_event_zero.cs
@@ -0,0 +1,117 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_handling_streams_with_deleted_events_and_reader_starting_after_event_zero<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private StreamEventReader _edp;
+	private int _fromSequenceNumber;
+	const string _streamName = "stream";
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+		_fromSequenceNumber = 10;
+	}
+
+	[SetUp]
+	public new void When() {
+		_edp = new StreamEventReader(_bus, Guid.NewGuid(), null, _streamName, _fromSequenceNumber,
+			new RealTimeProvider(), false,
+			produceStreamDeletes: false);
+		_edp.Resume();
+	}
+
+	private void HandleEvents(long[] eventNumbers) {
+		string eventType = "event_type";
+		List<ResolvedEvent> events = new List<ResolvedEvent>();
+
+		foreach (long eventNumber in eventNumbers) {
+			events.Add(
+				ResolvedEvent.ForUnresolvedEvent(
+					new EventRecord(
+						eventNumber, 50 * (eventNumber + 1), Guid.NewGuid(), Guid.NewGuid(), 50 * (eventNumber + 1),
+						0, _streamName, ExpectedVersion.Any, DateTime.UtcNow,
+						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+						eventType, new byte[] { 0 }, new byte[] { 0 }
+					)
+				)
+			);
+		}
+
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
+			.CorrelationId;
+
+		long start, end;
+		if (eventNumbers.Length > 0) {
+			start = eventNumbers[0];
+			end = eventNumbers[eventNumbers.Length - 1];
+		} else {
+			start = _fromSequenceNumber;
+			end = _fromSequenceNumber;
+		}
+
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, _streamName, start, 100, ReadStreamResult.Success, events.ToArray(), null, false, "",
+				start + 1, end, true, 200)
+		);
+	}
+
+	private void HandleEvents(long start, long end) {
+		List<long> eventNumbers = new List<long>();
+		for (long i = start; i <= end; i++)
+			eventNumbers.Add(i);
+		HandleEvents(eventNumbers.ToArray());
+	}
+
+	[Test]
+	public void allows_first_event_to_be_equal_to_sequence_number() {
+		long eventSequenceNumber = _fromSequenceNumber;
+
+		Assert.DoesNotThrow(() => { HandleEvents(eventSequenceNumber, eventSequenceNumber); });
+	}
+
+	[Test]
+	public void should_not_allow_first_event_to_be_greater_than_sequence_number() {
+		long eventSequenceNumber = _fromSequenceNumber + 5;
+
+		HandleEvents(eventSequenceNumber, eventSequenceNumber);
+
+		Assert.AreEqual(1, HandledMessages.OfType<ReaderSubscriptionMessage.Faulted>().Count());
+	}
+
+	[Test]
+	public void should_not_allow_first_event_to_be_less_than_sequence_number() {
+		long eventSequenceNumber = _fromSequenceNumber - 1;
+
+		HandleEvents(eventSequenceNumber, eventSequenceNumber);
+
+		Assert.AreEqual(1, HandledMessages.OfType<ReaderSubscriptionMessage.Faulted>().Count());
+	}
+
+	[Test]
+	public void events_after_second_event_should_not_be_in_sequence() {
+		//_fromSequenceNumber+2 has been omitted
+		HandleEvents(new long[]
+			{_fromSequenceNumber, _fromSequenceNumber + 1, _fromSequenceNumber + 3, _fromSequenceNumber + 4});
+
+		Assert.AreEqual(2, HandledMessages.OfType<ReaderSubscriptionMessage.Faulted>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_at_event_zero.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_at_event_zero.cs
new file mode 100644
index 00000000000..4391c1cd487
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_handling_streams_with_deleted_events_and_reader_starting_at_event_zero.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_handling_streams_with_deleted_events_and_reader_starting_at_event_zero<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private StreamEventReader _edp;
+	private int _fromSequenceNumber;
+	const string _streamName = "stream";
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+		_fromSequenceNumber = 0;
+	}
+
+	[SetUp]
+	public new void When() {
+		_edp = new StreamEventReader(_bus, Guid.NewGuid(), null, _streamName, _fromSequenceNumber,
+			new RealTimeProvider(), false,
+			produceStreamDeletes: false);
+		_edp.Resume();
+	}
+
+	private void HandleEvents(long[] eventNumbers) {
+		string eventType = "event_type";
+		List<ResolvedEvent> events = new List<ResolvedEvent>();
+
+		foreach (long eventNumber in eventNumbers) {
+			events.Add(
+				ResolvedEvent.ForUnresolvedEvent(
+					new EventRecord(
+						eventNumber, 50 * (eventNumber + 1), Guid.NewGuid(), Guid.NewGuid(), 50 * (eventNumber + 1),
+						0, _streamName, ExpectedVersion.Any, DateTime.UtcNow,
+						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+						eventType, new byte[] { 0 }, new byte[] { 0 }
+					)
+				)
+			);
+		}
+
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
+			.CorrelationId;
+
+		long start, end;
+		if (eventNumbers.Length > 0) {
+			start = eventNumbers[0];
+			end = eventNumbers[eventNumbers.Length - 1];
+		} else {
+			start = _fromSequenceNumber;
+			end = _fromSequenceNumber;
+		}
+
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, _streamName, start, 100, ReadStreamResult.Success, events.ToArray(), null, false, "",
+				start + 1, end, true, 200)
+		);
+	}
+
+	private void HandleEvents(long start, long end) {
+		List<long> eventNumbers = new List<long>();
+		for (long i = start; i <= end; i++)
+			eventNumbers.Add(i);
+		HandleEvents(eventNumbers.ToArray());
+	}
+
+	[Test]
+	public void allows_first_event_to_be_equal_to_sequence_number() {
+		long eventSequenceNumber = _fromSequenceNumber;
+
+		Assert.DoesNotThrow(() => { HandleEvents(eventSequenceNumber, eventSequenceNumber); });
+	}
+
+	[Test]
+	public void allows_first_event_to_be_greater_than_sequence_number() {
+		long eventSequenceNumber = _fromSequenceNumber + 5;
+
+		Assert.DoesNotThrow(() => { HandleEvents(eventSequenceNumber, eventSequenceNumber); });
+	}
+
+	[Test]
+	public void events_after_second_event_should_not_be_in_sequence() {
+		//_fromSequenceNumber+2 has been omitted
+		HandleEvents(new long[]
+			{_fromSequenceNumber, _fromSequenceNumber + 1, _fromSequenceNumber + 3, _fromSequenceNumber + 4});
+
+		Assert.AreEqual(2, HandledMessages.OfType<ReaderSubscriptionMessage.Faulted>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_onetime_reader_handles_eof.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_onetime_reader_handles_eof.cs
new file mode 100644
index 00000000000..3ec3a6ce4df
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_onetime_reader_handles_eof.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_onetime_reader_handles_eof<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private StreamEventReader _edp;
+
+	//private Guid _publishWithCorrelationId;
+	private Guid _distibutionPointCorrelationId;
+	private Guid _firstEventId;
+	private Guid _secondEventId;
+	private FakeTimeProvider _fakeTimeProvider;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	[SetUp]
+	public new void When() {
+		//_publishWithCorrelationId = Guid.NewGuid();
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_fakeTimeProvider = new FakeTimeProvider();
+		_edp = new StreamEventReader(_bus, _distibutionPointCorrelationId, null, "stream", 10, _fakeTimeProvider,
+			resolveLinkTos: false, stopOnEof: true, produceStreamDeletes: false);
+		_edp.Resume();
+		_firstEventId = Guid.NewGuid();
+		_secondEventId = Guid.NewGuid();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
+			.CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "stream", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							10, 50, Guid.NewGuid(), _firstEventId, 50, 0, "stream", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							11, 100, Guid.NewGuid(), _secondEventId, 100, 0, "stream", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 12, 11, true, 200));
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
+			.CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "stream", 100, 100, ReadStreamResult.Success, new ResolvedEvent[] { }, null, false,
+				"", 12, 11, true, 400));
+	}
+
+	[Test]
+	public void publishes_eof_message() {
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderEof>().Count());
+		var first = _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderEof>().First();
+		Assert.AreEqual(first.CorrelationId, _distibutionPointCorrelationId);
+	}
+
+	[Test]
+	public void does_not_publish_read_messages_anymore() {
+		Assert.AreEqual(2, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_paused_then_handling_no_stream.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_paused_then_handling_no_stream.cs
new file mode 100644
index 00000000000..ea6bf697f2e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_paused_then_handling_no_stream.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_paused_then_handling_no_stream<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private StreamEventReader _edp;
+	private Guid _distibutionPointCorrelationId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	[SetUp]
+	public new void When() {
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_edp = new StreamEventReader(_bus, _distibutionPointCorrelationId, null, "stream", 0,
+			new RealTimeProvider(), false,
+			produceStreamDeletes: false);
+		_edp.Resume();
+		_edp.Pause();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
+			.CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "stream", 100, 100, ReadStreamResult.NoStream, new ResolvedEvent[0]
+				, null, false, "", -1, ExpectedVersion.NoStream, true, 200));
+	}
+
+	[Test]
+	public void can_be_resumed() {
+		_edp.Resume();
+	}
+
+	[Test]
+	public void cannot_be_paused() {
+		Assert.Throws<InvalidOperationException>(() => { _edp.Pause(); });
+	}
+
+	[Test]
+	public void publishes_read_events_from_beginning_with_correct_next_event_number() {
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
+		Assert.AreEqual(
+			"stream",
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last().EventStreamId);
+		Assert.AreEqual(
+			0, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last().FromEventNumber);
+	}
+
+	[Test]
+	public void publishes_correct_committed_event_received_messages() {
+		Assert.AreEqual(
+			1, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+		var first =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Single();
+		Assert.IsNull(first.Data);
+		Assert.AreEqual(200, first.SafeTransactionFileReaderJoinPosition);
+	}
+
+	[Test]
+	public void does_not_publish_schedule() {
+		Assert.AreEqual(0,
+			_consumer.HandledMessages.OfType<TimerMessage.Schedule>().Where(x =>
+				x.ReplyMessage.GetType() != typeof(ProjectionManagementMessage.Internal.ReadTimeout)).Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_read_completes_before_timeout.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_read_completes_before_timeout.cs
new file mode 100644
index 00000000000..938bb9f78c5
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_read_completes_before_timeout.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_read_completes_before_timeout<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private StreamEventReader _eventReader;
+	private Guid _distributionCorrelationId;
+	private FakeTimeProvider _fakeTimeProvider;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	[SetUp]
+	public new void When() {
+		_distributionCorrelationId = Guid.NewGuid();
+		_fakeTimeProvider = new FakeTimeProvider();
+		_eventReader = new StreamEventReader(_bus, _distributionCorrelationId, null, "stream", 10,
+			_fakeTimeProvider,
+			resolveLinkTos: false, stopOnEof: true, produceStreamDeletes: false);
+		_eventReader.Resume();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
+			.CorrelationId;
+		_eventReader.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				correlationId, "stream", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							10, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "stream", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							11, 100, Guid.NewGuid(), Guid.NewGuid(), 100, 0, "stream", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 12, 11, true, 200));
+		_eventReader.Handle(
+			new ProjectionManagementMessage.Internal.ReadTimeout(correlationId, "stream"));
+	}
+
+	[Test]
+	public void should_deliver_events() {
+		Assert.AreEqual(2,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_read_timeout_occurs.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_read_timeout_occurs.cs
new file mode 100644
index 00000000000..c3b282725be
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_read_timeout_occurs.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_read_timeout_occurs<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private StreamEventReader _eventReader;
+	private Guid _distributionCorrelationId;
+	private FakeTimeProvider _fakeTimeProvider;
+	private Guid _readCorrelationId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	[SetUp]
+	public new void When() {
+		_distributionCorrelationId = Guid.NewGuid();
+		_fakeTimeProvider = new FakeTimeProvider();
+		_eventReader = new StreamEventReader(_bus, _distributionCorrelationId, null, "stream", 10,
+			_fakeTimeProvider,
+			resolveLinkTos: false, stopOnEof: true, produceStreamDeletes: false);
+		_eventReader.Resume();
+		_readCorrelationId = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Last()
+			.CorrelationId;
+		_eventReader.Handle(
+			new ProjectionManagementMessage.Internal.ReadTimeout(_readCorrelationId, "stream"));
+		_eventReader.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				_readCorrelationId, "stream", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							10, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "stream", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2})),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							11, 100, Guid.NewGuid(), Guid.NewGuid(), 100, 0, "stream", ExpectedVersion.Any,
+							DateTime.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type2", new byte[] {3}, new byte[] {4}))
+				}, null, false, "", 12, 11, true, 200));
+	}
+
+	[Test]
+	public void should_not_deliver_events() {
+		Assert.AreEqual(0,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+	}
+
+	[Test]
+	public void should_attempt_another_read_for_the_timed_out_reads() {
+		var reads = _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>()
+			.Where(x => x.EventStreamId == "stream");
+
+		Assert.AreEqual(reads.First().CorrelationId, _readCorrelationId);
+		Assert.AreEqual(1, reads.Skip(1).Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_resuming_stream_event_reader.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_resuming_stream_event_reader.cs
new file mode 100644
index 00000000000..316d253c1ee
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_resuming_stream_event_reader.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_resuming_stream_event_reader<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private StreamEventReader _edp;
+	private Guid _distibutionPointCorrelationId;
+
+	[SetUp]
+	public new void When() {
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_edp = new StreamEventReader(_bus, _distibutionPointCorrelationId, null, "stream", 10,
+			new RealTimeProvider(), false,
+			produceStreamDeletes: false);
+		_edp.Resume();
+	}
+
+	[Test]
+	public void it_cannot_be_resumed() {
+		Assert.Throws<InvalidOperationException>(() => { _edp.Resume(); });
+	}
+
+	[Test]
+	public void it_cannot_be_paused() {
+		_edp.Pause();
+	}
+
+	[Test]
+	public void it_publishes_read_events_from_beginning() {
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Count());
+		Assert.AreEqual(
+			"stream",
+			_consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Single().EventStreamId);
+		Assert.AreEqual(
+			10, _consumer.HandledMessages.OfType<ClientMessage.ReadStreamEventsForward>().Single().FromEventNumber);
+	}
+
+	[Test]
+	public void can_handle_read_events_completed() {
+		_edp.Handle(
+			new ClientMessage.ReadStreamEventsForwardCompleted(
+				_distibutionPointCorrelationId, "stream", 100, 100, ReadStreamResult.Success,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(new EventRecord(
+						10, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "stream", ExpectedVersion.Any,
+						DateTime.UtcNow,
+						PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+						"event_type", new byte[0], new byte[0]), 0)
+				}, null, false, "", 11, 10, true, 100));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_stream_event_reader_has_been_created.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_stream_event_reader_has_been_created.cs
new file mode 100644
index 00000000000..0204a0ef1b8
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/stream_reader/when_stream_event_reader_has_been_created.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.stream_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_stream_event_reader_has_been_created<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private StreamEventReader _edp;
+
+	//private Guid _publishWithCorrelationId;
+	private Guid _distibutionPointCorrelationId;
+
+	[SetUp]
+	public new void When() {
+		//_publishWithCorrelationId = Guid.NewGuid();
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_edp = new StreamEventReader(_bus, _distibutionPointCorrelationId, null, "stream", 0,
+			new RealTimeProvider(), false,
+			produceStreamDeletes: false);
+	}
+
+	[Test]
+	public void it_can_be_resumed() {
+		_edp.Resume();
+	}
+
+	[Test]
+	public void it_cannot_be_paused() {
+		Assert.Throws<InvalidOperationException>(() => { _edp.Pause(); });
+	}
+
+	[Test]
+	public void handle_read_events_completed_throws() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_edp.Handle(
+				new ClientMessage.ReadStreamEventsForwardCompleted(
+					_distibutionPointCorrelationId, "stream", 100, 100, ReadStreamResult.Success,
+					new ResolvedEvent[0], null, false, "", -1, 4, true, 100));
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_handling_eof_and_idle_eof.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_handling_eof_and_idle_eof.cs
new file mode 100644
index 00000000000..3476e53d528
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_handling_eof_and_idle_eof.cs
@@ -0,0 +1,95 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.transaction_file_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_eof_and_idle_eof<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private TransactionFileEventReader _edp;
+	private Guid _distibutionPointCorrelationId;
+	private Guid _firstEventId;
+	private Guid _secondEventId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	private FakeTimeProvider _fakeTimeProvider;
+
+	[SetUp]
+	public new void When() {
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_fakeTimeProvider = new FakeTimeProvider();
+		_edp = new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(100, 50),
+			_fakeTimeProvider,
+			deliverEndOfTFPosition: false);
+		_edp.Resume();
+		_firstEventId = Guid.NewGuid();
+		_secondEventId = Guid.NewGuid();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>().Last()
+			.CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadAllEventsForwardCompleted(
+				correlationId, ReadAllResult.Success, null,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any,
+							_fakeTimeProvider.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2}), 100),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 150, Guid.NewGuid(), _secondEventId, 150, 0, "b", ExpectedVersion.Any,
+							_fakeTimeProvider.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2}), 200),
+				}, null, false, 100,
+				new TFPos(200, 150), new TFPos(500, -1), new TFPos(100, 50), 500));
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>().Last().CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadAllEventsForwardCompleted(
+				correlationId, ReadAllResult.Success, null,
+				new ResolvedEvent[0], null, false, 100, new TFPos(), new TFPos(), new TFPos(),
+				500));
+		_fakeTimeProvider.AddToUtcTime(TimeSpan.FromMilliseconds(500));
+		correlationId = ((ClientMessage.ReadAllEventsForward)(_consumer.HandledMessages
+			.OfType<AwakeServiceMessage.SubscribeAwake>().Last().ReplyWithMessage)).CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadAllEventsForwardCompleted(
+				correlationId, ReadAllResult.Success, null,
+				new ResolvedEvent[0], null, false, 100, new TFPos(), new TFPos(), new TFPos(),
+				500));
+	}
+
+	[Test]
+	public void publishes_event_distribution_idle_messages() {
+		Assert.AreEqual(
+			2, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderIdle>().Count());
+		var first =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderIdle>().First();
+		var second =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderIdle>()
+				.Skip(1)
+				.First();
+
+		Assert.AreEqual(first.CorrelationId, _distibutionPointCorrelationId);
+		Assert.AreEqual(second.CorrelationId, _distibutionPointCorrelationId);
+
+		Assert.AreEqual(TimeSpan.FromMilliseconds(500), second.IdleTimestampUtc - first.IdleTimestampUtc);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_handling_stream_hard_deleted.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_handling_stream_hard_deleted.cs
new file mode 100644
index 00000000000..745682be86d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_handling_stream_hard_deleted.cs
@@ -0,0 +1,73 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.transaction_file_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_stream_hard_deleted<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private TransactionFileEventReader _edp;
+	private Guid _distibutionPointCorrelationId;
+	private Guid _firstEventId;
+	private Guid _secondEventId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	private FakeTimeProvider _fakeTimeProvider;
+
+	[SetUp]
+	public new void When() {
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_fakeTimeProvider = new FakeTimeProvider();
+		_edp = new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(100, 50),
+			_fakeTimeProvider,
+			deliverEndOfTFPosition: false);
+		_edp.Resume();
+		_firstEventId = Guid.NewGuid();
+		_secondEventId = Guid.NewGuid();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>().Last()
+			.CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadAllEventsForwardCompleted(
+				correlationId, ReadAllResult.Success, null,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any,
+							_fakeTimeProvider.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2}), 100),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 150, Guid.NewGuid(), _secondEventId, 150, 0, "a", ExpectedVersion.Any,
+							_fakeTimeProvider.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							SystemEventTypes.StreamDeleted, new byte[] {1}, new byte[] {2}), 200),
+				}, null, false, 100,
+				new TFPos(200, 150), new TFPos(500, -1), new TFPos(100, 50), 500));
+	}
+
+	[Test]
+	public void publishes_event_reader_partition_deleted_messages() {
+		var deleteds =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().ToArray();
+		Assert.AreEqual(1, deleteds.Count());
+		Assert.AreEqual("a", deleteds[0].Partition);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_handling_stream_soft_deleted.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_handling_stream_soft_deleted.cs
new file mode 100644
index 00000000000..ad1bd7a9c6d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_handling_stream_soft_deleted.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Core.Data.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.transaction_file_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_handling_stream_soft_deleted<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private TransactionFileEventReader _edp;
+	private Guid _distibutionPointCorrelationId;
+	private Guid _firstEventId;
+	private Guid _secondEventId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	private FakeTimeProvider _fakeTimeProvider;
+
+	[SetUp]
+	public new void When() {
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_fakeTimeProvider = new FakeTimeProvider();
+		_edp = new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(100, 50),
+			_fakeTimeProvider,
+			deliverEndOfTFPosition: false);
+		_edp.Resume();
+		_firstEventId = Guid.NewGuid();
+		_secondEventId = Guid.NewGuid();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>().Last()
+			.CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadAllEventsForwardCompleted(
+				correlationId, ReadAllResult.Success, null,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any,
+							_fakeTimeProvider.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2}), 100),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 150, Guid.NewGuid(), _secondEventId, 150, 0, "$$a", ExpectedVersion.Any,
+							_fakeTimeProvider.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							SystemEventTypes.StreamMetadata,
+							new StreamMetadata(truncateBefore: EventNumber.DeletedStream).ToJsonBytes(),
+							new byte[] {2}), 200),
+				}, null, false, 100, new TFPos(200, 150), new TFPos(500, -1),
+				new TFPos(100, 50), 500));
+	}
+
+	[Test]
+	public void publishes_event_reader_partition_deleted_messages() {
+		var deleteds =
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderPartitionDeleted>().ToArray();
+		Assert.AreEqual(1, deleteds.Count());
+		Assert.AreEqual("a", deleteds[0].Partition);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_onetime_reader_handles_eof.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_onetime_reader_handles_eof.cs
new file mode 100644
index 00000000000..1275b45549e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_onetime_reader_handles_eof.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.transaction_file_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_onetime_reader_handles_eof<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private TransactionFileEventReader _edp;
+	private Guid _distibutionPointCorrelationId;
+	private Guid _firstEventId;
+	private Guid _secondEventId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	private FakeTimeProvider _fakeTimeProvider;
+
+	[SetUp]
+	public new void When() {
+		_distibutionPointCorrelationId = Guid.NewGuid();
+		_fakeTimeProvider = new FakeTimeProvider();
+		_edp = new TransactionFileEventReader(_bus, _distibutionPointCorrelationId, null, new TFPos(100, 50),
+			_fakeTimeProvider,
+			deliverEndOfTFPosition: false, stopOnEof: true);
+		_edp.Resume();
+		_firstEventId = Guid.NewGuid();
+		_secondEventId = Guid.NewGuid();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>().Last()
+			.CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadAllEventsForwardCompleted(
+				correlationId, ReadAllResult.Success, null,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							1, 50, Guid.NewGuid(), _firstEventId, 50, 0, "a", ExpectedVersion.Any,
+							_fakeTimeProvider.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2}), 100),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 150, Guid.NewGuid(), _secondEventId, 150, 0, "b", ExpectedVersion.Any,
+							_fakeTimeProvider.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2}), 200),
+				}, null, false, 100, new TFPos(200, 150), new TFPos(500, -1), new TFPos(100, 50), 500));
+		correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>().Last().CorrelationId;
+		_edp.Handle(
+			new ClientMessage.ReadAllEventsForwardCompleted(
+				correlationId, ReadAllResult.Success, null,
+				new ResolvedEvent[0], null, false, 100, new TFPos(), new TFPos(), new TFPos(),
+				500));
+	}
+
+	[Test]
+	public void publishes_eof_message() {
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderEof>().Count());
+		var first = _consumer.HandledMessages.OfType<ReaderSubscriptionMessage.EventReaderEof>().First();
+		Assert.AreEqual(first.CorrelationId, _distibutionPointCorrelationId);
+	}
+
+	[Test]
+	public void does_not_publish_read_messages_anymore() {
+		Assert.AreEqual(2, _consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_read_completes_before_timeout.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_read_completes_before_timeout.cs
new file mode 100644
index 00000000000..89fcb7ed408
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_read_completes_before_timeout.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.transaction_file_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_read_completes_before_timeout<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private TransactionFileEventReader _eventReader;
+	private Guid _distributionCorrelationId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	private FakeTimeProvider _fakeTimeProvider;
+
+	[SetUp]
+	public new void When() {
+		_distributionCorrelationId = Guid.NewGuid();
+		_fakeTimeProvider = new FakeTimeProvider();
+		_eventReader = new TransactionFileEventReader(_bus, _distributionCorrelationId, null, new TFPos(100, 50),
+			_fakeTimeProvider,
+			deliverEndOfTFPosition: false, stopOnEof: true);
+		_eventReader.Resume();
+		var correlationId = _consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>().Last()
+			.CorrelationId;
+		_eventReader.Handle(
+			new ClientMessage.ReadAllEventsForwardCompleted(
+				correlationId, ReadAllResult.Success, null,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							1, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "a", ExpectedVersion.Any,
+							_fakeTimeProvider.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2}), 100),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 150, Guid.NewGuid(), Guid.NewGuid(), 150, 0, "b", ExpectedVersion.Any,
+							_fakeTimeProvider.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2}), 200),
+				}, null, false, 100, new TFPos(200, 150), new TFPos(500, -1), new TFPos(100, 50), 500));
+		_eventReader.Handle(
+			new ProjectionManagementMessage.Internal.ReadTimeout(correlationId, "$all"));
+	}
+
+	[Test]
+	public void should_deliver_events() {
+		Assert.AreEqual(2,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_read_timeout_occurs.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_read_timeout_occurs.cs
new file mode 100644
index 00000000000..111b2a9f2c6
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reader/transaction_file_reader/when_read_timeout_occurs.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reader.transaction_file_reader;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_read_timeout_occurs<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private TransactionFileEventReader _eventReader;
+	private Guid _distributionCorrelationId;
+	private Guid _readAllEventsForwardCorrelationId;
+
+	protected override void Given() {
+		TicksAreHandledImmediately();
+	}
+
+	private FakeTimeProvider _fakeTimeProvider;
+
+	[SetUp]
+	public new void When() {
+		_distributionCorrelationId = Guid.NewGuid();
+		_fakeTimeProvider = new FakeTimeProvider();
+		_eventReader = new TransactionFileEventReader(_bus, _distributionCorrelationId, null, new TFPos(100, 50),
+			_fakeTimeProvider,
+			deliverEndOfTFPosition: false, stopOnEof: true);
+		_eventReader.Resume();
+		_readAllEventsForwardCorrelationId = _consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>()
+			.Last().CorrelationId;
+		_eventReader.Handle(
+			new ProjectionManagementMessage.Internal.ReadTimeout(_readAllEventsForwardCorrelationId, "$all"));
+		_eventReader.Handle(
+			new ClientMessage.ReadAllEventsForwardCompleted(
+				_readAllEventsForwardCorrelationId, ReadAllResult.Success, null,
+				new[] {
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							1, 50, Guid.NewGuid(), Guid.NewGuid(), 50, 0, "a", ExpectedVersion.Any,
+							_fakeTimeProvider.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2}), 100),
+					ResolvedEvent.ForUnresolvedEvent(
+						new EventRecord(
+							2, 150, Guid.NewGuid(), Guid.NewGuid(), 150, 0, "b", ExpectedVersion.Any,
+							_fakeTimeProvider.UtcNow,
+							PrepareFlags.SingleWrite | PrepareFlags.TransactionBegin | PrepareFlags.TransactionEnd,
+							"event_type1", new byte[] {1}, new byte[] {2}), 200),
+				}, null, false, 100, new TFPos(200, 150), new TFPos(500, -1), new TFPos(100, 50), 500));
+	}
+
+	[Test]
+	public void should_not_deliver_events() {
+		Assert.AreEqual(0,
+			_consumer.HandledMessages.OfType<ReaderSubscriptionMessage.CommittedEventDistributed>().Count());
+	}
+
+	[Test]
+	public void should_attempt_another_read_for_the_timed_out_reads() {
+		var readAllEventsForwardMessages = _consumer.HandledMessages.OfType<ClientMessage.ReadAllEventsForward>();
+
+		Assert.AreEqual(readAllEventsForwardMessages.First().CorrelationId, _readAllEventsForwardCorrelationId);
+		Assert.AreEqual(1, readAllEventsForwardMessages.Skip(1).Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/TestFixtureWithEventReorderingProjectionSubscription.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/TestFixtureWithEventReorderingProjectionSubscription.cs
new file mode 100644
index 00000000000..015d6d304ae
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/TestFixtureWithEventReorderingProjectionSubscription.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+using KurrentDB.Projections.Core.Tests.Services.projection_subscription;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reordering_projection_subscription;
+
+public abstract class TestFixtureWithEventReorderingProjectionSubscription : TestFixtureWithProjectionSubscription {
+	protected int _timeBetweenEvents;
+	protected int _processingLagMs;
+
+	protected override void Given() {
+		_timeBetweenEvents = 1100;
+		_processingLagMs = 500;
+		base.Given();
+		_source = builder => {
+			builder.FromStream("a");
+			builder.FromStream("b");
+			builder.AllEvents();
+			builder.SetReorderEvents(true);
+			builder.SetProcessingLag(1000); // ms
+		};
+	}
+
+	protected override IReaderSubscription CreateProjectionSubscription() {
+		return new EventReorderingReaderSubscription(_bus,
+			_projectionCorrelationId,
+			CheckpointTag.FromStreamPositions(0,
+				new Dictionary<string, long> { { "a", ExpectedVersion.NoStream }, { "b", ExpectedVersion.NoStream } }),
+			_readerStrategy,
+			_timeProvider,
+			_checkpointUnhandledBytesThreshold, _checkpointProcessedEventsThreshold, _checkpointAfterMs,
+			_processingLagMs,
+			false,
+			null,
+			false);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_creating_projection_subscription.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_creating_projection_subscription.cs
new file mode 100644
index 00000000000..7cd236ce564
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_creating_projection_subscription.cs
@@ -0,0 +1,104 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reordering_projection_subscription;
+
+[TestFixture]
+public class when_creating_projection_subscription {
+	[Test]
+	public void it_can_be_created() {
+		new EventReorderingReaderSubscription(
+			new FakePublisher(),
+			Guid.NewGuid(),
+			CheckpointTag.FromPosition(0, 0, -1),
+			CreateReaderStrategy(),
+			new FakeTimeProvider(),
+			1000,
+			2000,
+			10000,
+			500,
+			false,
+			null,
+			false);
+	}
+
+	[Test]
+	public void null_publisher_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			new EventReorderingReaderSubscription(
+				null,
+				Guid.NewGuid(),
+				CheckpointTag.FromPosition(0, 0, -1),
+				CreateReaderStrategy(),
+				new FakeTimeProvider(),
+				1000,
+				2000,
+				10000,
+				500,
+				false,
+				null,
+				false);
+		});
+	}
+
+	[Test]
+	public void null_describe_source_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			new EventReorderingReaderSubscription(
+				new FakePublisher(),
+				Guid.NewGuid(),
+				CheckpointTag.FromPosition(0, 0, -1),
+				null,
+				new FakeTimeProvider(),
+				1000,
+				2000,
+				10000,
+				500,
+				false,
+				null,
+				false);
+		});
+	}
+
+	[Test]
+	public void null_time_provider_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			new EventReorderingReaderSubscription(
+				new FakePublisher(),
+				Guid.NewGuid(),
+				CheckpointTag.FromPosition(0, 0, -1),
+				CreateReaderStrategy(),
+				null,
+				1000,
+				2000,
+				10000,
+				500,
+				false,
+				null,
+				false);
+		});
+	}
+
+	private IReaderStrategy CreateReaderStrategy() {
+		var result = new SourceDefinitionBuilder();
+		result.FromAll();
+		result.AllEvents();
+		return ReaderStrategy.Create(
+			"test",
+			0,
+			result.Build(),
+			new RealTimeProvider(),
+			stopOnEof: false,
+			runAs: null);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_a_second_event_after_the_delay.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_a_second_event_after_the_delay.cs
new file mode 100644
index 00000000000..d982762cc78
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_a_second_event_after_the_delay.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reordering_projection_subscription;
+
+[TestFixture]
+public class when_handling_a_second_event_after_the_delay : TestFixtureWithEventReorderingProjectionSubscription {
+	private Guid _firstEventId;
+	private DateTime _firstEventTimestamp;
+#pragma warning disable 108, 114
+	private int _timeBetweenEvents;
+#pragma warning restore 108, 114
+
+	protected override void When() {
+		_firstEventId = Guid.NewGuid();
+		_firstEventTimestamp = DateTime.UtcNow;
+		_timeBetweenEvents = 1100;
+
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(200, 150), "a", 1, false, _firstEventId, "bad-event-type", false,
+				new byte[0], new byte[0], _firstEventTimestamp));
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(300, 250), "a", 2, false, Guid.NewGuid(), "bad-event-type", false,
+				new byte[0], new byte[0], _firstEventTimestamp.AddMilliseconds(_timeBetweenEvents)));
+	}
+
+	[Test]
+	public void no_events_are_passed_to_downstream_handler_immediately() {
+		Assert.AreEqual(1, _eventHandler.HandledMessages.Count);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_an_event_after_the_delay_and_reordering_is_required.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_an_event_after_the_delay_and_reordering_is_required.cs
new file mode 100644
index 00000000000..60d409528e3
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_an_event_after_the_delay_and_reordering_is_required.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reordering_projection_subscription;
+
+[TestFixture]
+public class when_handling_an_event_after_the_delay_and_reordering_is_required :
+	TestFixtureWithEventReorderingProjectionSubscription {
+	private Guid _firstEventId;
+	private DateTime _firstEventTimestamp;
+	private Guid _secondEventId;
+
+	protected override void When() {
+		_firstEventId = Guid.NewGuid();
+		_secondEventId = Guid.NewGuid();
+		_firstEventTimestamp = DateTime.UtcNow;
+
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(200, 150), "a", 1, false, _secondEventId, "bad-event-type", false,
+				new byte[0], new byte[0], _firstEventTimestamp));
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(300, 100), "b", 1, false, _firstEventId, "bad-event-type", false,
+				new byte[0], new byte[0], _firstEventTimestamp.AddMilliseconds(1)));
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(310, 305), "a", 2, false, Guid.NewGuid(), "bad-event-type", false,
+				new byte[0], new byte[0], _firstEventTimestamp.AddMilliseconds(_timeBetweenEvents)));
+	}
+
+	[Test]
+	public void first_two_events_are_reordered() {
+		Assert.AreEqual(2, _eventHandler.HandledMessages.Count);
+		var first = _eventHandler.HandledMessages[0];
+		var second = _eventHandler.HandledMessages[1];
+		Assert.AreEqual(_firstEventId, first.Data.EventId);
+		Assert.AreEqual(_secondEventId, second.Data.EventId);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_an_idle_notification_and_reordering_is_required.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_an_idle_notification_and_reordering_is_required.cs
new file mode 100644
index 00000000000..5cc7076b882
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_an_idle_notification_and_reordering_is_required.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reordering_projection_subscription;
+
+[TestFixture]
+public class when_handling_an_idle_notification_and_reordering_is_required :
+	TestFixtureWithEventReorderingProjectionSubscription {
+	private Guid _firstEventId;
+	private DateTime _firstEventTimestamp;
+	private Guid _secondEventId;
+
+	protected override void When() {
+		_firstEventId = Guid.NewGuid();
+		_secondEventId = Guid.NewGuid();
+		_firstEventTimestamp = DateTime.UtcNow;
+
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(200, 150), "a", 1, false, _secondEventId, "bad-event-type", false,
+				new byte[0], new byte[0], _firstEventTimestamp));
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(300, 100), "b", 1, false, _firstEventId, "bad-event-type", false,
+				new byte[0], new byte[0], _firstEventTimestamp.AddMilliseconds(1)));
+		_subscription.Handle(
+			new ReaderSubscriptionMessage.EventReaderIdle(
+				Guid.NewGuid(), _firstEventTimestamp.AddMilliseconds(_timeBetweenEvents)));
+	}
+
+	[Test]
+	public void events_are_reordered() {
+		Assert.AreEqual(2, _eventHandler.HandledMessages.Count);
+		var first = _eventHandler.HandledMessages[0];
+		var second = _eventHandler.HandledMessages[1];
+		Assert.AreEqual(_firstEventId, first.Data.EventId);
+		Assert.AreEqual(_secondEventId, second.Data.EventId);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_committed_event_passing_the_filter.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_committed_event_passing_the_filter.cs
new file mode 100644
index 00000000000..72a4084cd3f
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_committed_event_passing_the_filter.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reordering_projection_subscription;
+
+[TestFixture]
+public class
+	when_handling_committed_event_passing_the_filter : TestFixtureWithEventReorderingProjectionSubscription {
+	protected override void When() {
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(200, 150), "a", 1, false, Guid.NewGuid(), "bad-event-type", false,
+				new byte[0], new byte[0]));
+	}
+
+	[Test]
+	public void event_is_not_passed_to_downstream_handler_immediately() {
+		Assert.AreEqual(0, _eventHandler.HandledMessages.Count);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_duplicate_events.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_duplicate_events.cs
new file mode 100644
index 00000000000..5a8d659d0cc
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_duplicate_events.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reordering_projection_subscription;
+
+[TestFixture]
+public class when_handling_duplicate_events : TestFixtureWithEventReorderingProjectionSubscription {
+	private DateTime _timestamp;
+
+	protected override void When() {
+		_timestamp = DateTime.UtcNow;
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_projectionCorrelationId, new TFPos(200, 150), "a", 1, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0], _timestamp));
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_projectionCorrelationId, new TFPos(100, 50), "a", 0, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0], _timestamp.AddMilliseconds(1)));
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_projectionCorrelationId, new TFPos(200, 150), "a", 1, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0], _timestamp.AddMilliseconds(1)));
+		_subscription.Handle(
+			new ReaderSubscriptionMessage.EventReaderIdle(
+				_projectionCorrelationId, _timestamp.AddMilliseconds(1100)));
+	}
+
+	[Test]
+	public void duplicates_are_not_passed_to_downstream_handler() {
+		Assert.AreEqual(2, _eventHandler.HandledMessages.Count);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_two_subsequent_events.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_two_subsequent_events.cs
new file mode 100644
index 00000000000..fe27ebf6872
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_handling_two_subsequent_events.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reordering_projection_subscription;
+
+[TestFixture]
+public class when_handling_two_subsequent_events : TestFixtureWithEventReorderingProjectionSubscription {
+	private Guid _firstEventId;
+	private DateTime _firstEventTimestamp;
+#pragma warning disable 108, 114
+	private int _timeBetweenEvents;
+#pragma warning restore 108, 114
+
+	protected override void When() {
+		_firstEventId = Guid.NewGuid();
+		_firstEventTimestamp = DateTime.UtcNow;
+		_timeBetweenEvents = 1;
+
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(200, 150), "a", 1, false, _firstEventId, "bad-event-type", false,
+				new byte[0], new byte[0], _firstEventTimestamp));
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(300, 250), "a", 2, false, Guid.NewGuid(), "bad-event-type", false,
+				new byte[0], new byte[0], _firstEventTimestamp.AddMilliseconds(_timeBetweenEvents)));
+	}
+
+	[Test]
+	public void no_events_are_passed_to_downstream_handler_immediately() {
+		Assert.AreEqual(0, _eventHandler.HandledMessages.Count);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_receiving_multiple_events_not_passing_event_filter.cs b/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_receiving_multiple_events_not_passing_event_filter.cs
new file mode 100644
index 00000000000..eb8f74ea868
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/event_reordering_projection_subscription/when_receiving_multiple_events_not_passing_event_filter.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.event_reordering_projection_subscription;
+
+[TestFixture]
+public class when_receiving_multiple_events_not_passing_event_filter :
+	TestFixtureWithEventReorderingProjectionSubscription {
+	private DateTime _timestamp;
+
+	protected override void Given() {
+		base.Given();
+		_source = builder => {
+			builder.FromStream("a");
+			builder.FromStream("b");
+			builder.IncludeEvent("specific-event");
+			builder.SetReorderEvents(true);
+			builder.SetProcessingLag(1000); // ms
+		};
+	}
+
+	protected override void When() {
+		_timestamp = DateTime.UtcNow;
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_projectionCorrelationId, new TFPos(200, 150), "a", 1, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0], _timestamp));
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_projectionCorrelationId, new TFPos(2000, 950), "a", 2, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0], _timestamp.AddMilliseconds(1)));
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				_projectionCorrelationId, new TFPos(2100, 2050), "b", 1, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0], _timestamp.AddMilliseconds(1)));
+		_subscription.Handle(
+			new ReaderSubscriptionMessage.EventReaderIdle(
+				_projectionCorrelationId, _timestamp.AddMilliseconds(1100)));
+	}
+
+	[Test]
+	public void checkpoint_suggested_message_is_published_once_for_interval() {
+		Assert.AreEqual(1, _checkpointHandler.HandledMessages.Count);
+		Assert.AreEqual(2, _checkpointHandler.HandledMessages[0].CheckpointTag.Streams["a"]);
+		Assert.AreEqual(1, _checkpointHandler.HandledMessages[0].CheckpointTag.Streams["b"]);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/feed_reader/TestFixtureWithFeedReaderService.cs b/src/KurrentDB.Projections.Core.Tests/Services/feed_reader/TestFixtureWithFeedReaderService.cs
new file mode 100644
index 00000000000..92be52ceca0
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/feed_reader/TestFixtureWithFeedReaderService.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.EventReaders.Feeds;
+using KurrentDB.Projections.Core.Tests.Services.event_reader;
+
+namespace KurrentDB.Projections.Core.Tests.Services.feed_reader;
+
+public abstract class TestFixtureWithFeedReaderService<TLogFormat, TStreamId> : TestFixtureWithEventReaderService<TLogFormat, TStreamId> {
+	protected FeedReaderService _feedReaderService;
+
+	protected override void Given1() {
+		base.Given1();
+		EnableReadAll();
+	}
+
+	protected override void GivenAdditionalServices() {
+		_feedReaderService = new FeedReaderService(_subscriptionDispatcher, _timeProvider);
+		_bus.Subscribe(_feedReaderService);
+	}
+}
diff --git a/src/EventStore.Projections.Core.Tests/Services/feed_reader/feed_reader.cs b/src/KurrentDB.Projections.Core.Tests/Services/feed_reader/feed_reader.cs
similarity index 88%
rename from src/EventStore.Projections.Core.Tests/Services/feed_reader/feed_reader.cs
rename to src/KurrentDB.Projections.Core.Tests/Services/feed_reader/feed_reader.cs
index 8685e994fae..7e342d7c77d 100644
--- a/src/EventStore.Projections.Core.Tests/Services/feed_reader/feed_reader.cs
+++ b/src/KurrentDB.Projections.Core.Tests/Services/feed_reader/feed_reader.cs
@@ -1,23 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.Tests.Bus.Helpers;
-using EventStore.Projections.Core.EventReaders.Feeds;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Messages.EventReaders.Feeds;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
 using System.Linq;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using ResolvedEvent = EventStore.Projections.Core.Services.Processing.ResolvedEvent;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Bus.Helpers;
+using KurrentDB.Projections.Core.EventReaders.Feeds;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Messages.EventReaders.Feeds;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
 
-namespace EventStore.Projections.Core.Tests.Services.feed_reader {
+namespace KurrentDB.Projections.Core.Tests.Services.feed_reader {
 	namespace feed_reader {
 		[TestFixture]
 		public class when_creating {
@@ -31,7 +33,7 @@ public class when_creating {
 			public void SetUp() {
 				_bus = new SynchronousScheduler();
 				_subscriptionDispatcher = new ReaderSubscriptionDispatcher(_bus);
-				_testQueryDefinition = new QuerySourcesDefinition {AllStreams = true, AllEvents = true};
+				_testQueryDefinition = new QuerySourcesDefinition { AllStreams = true, AllEvents = true };
 			}
 
 			[Test]
@@ -146,7 +148,7 @@ protected virtual CheckpointTag GivenFromPosition() {
 		[TestFixture]
 		public class when_starting : FeedReaderSpecification {
 			protected override QuerySourcesDefinition GivenQuerySource() {
-				return new QuerySourcesDefinition {AllStreams = true, AllEvents = true};
+				return new QuerySourcesDefinition { AllStreams = true, AllEvents = true };
 			}
 
 			protected override void When() {
@@ -175,7 +177,7 @@ public class when_handling_committed_events : FeedReaderSpecification {
 			private int _number;
 
 			protected override QuerySourcesDefinition GivenQuerySource() {
-				return new QuerySourcesDefinition {AllStreams = true, AllEvents = true};
+				return new QuerySourcesDefinition { AllStreams = true, AllEvents = true };
 			}
 
 			protected override void Given() {
@@ -212,7 +214,7 @@ public class when_handling_eof_message : FeedReaderSpecification {
 			private int _maxN;
 
 			protected override QuerySourcesDefinition GivenQuerySource() {
-				return new QuerySourcesDefinition {AllStreams = true, AllEvents = true};
+				return new QuerySourcesDefinition { AllStreams = true, AllEvents = true };
 			}
 
 			protected override void Given() {
@@ -277,8 +279,7 @@ protected override void Given() {
 				ExistingEvent("test-stream", "type1", "{}", "{Data: 2}");
 				ExistingEvent("test-stream", "type2", "{}", "{Data: 3}");
 
-				_querySourcesDefinition = new QuerySourcesDefinition
-					{Streams = new[] {"test-stream"}, AllEvents = true};
+				_querySourcesDefinition = new QuerySourcesDefinition { Streams = new[] { "test-stream" }, AllEvents = true };
 				_fromPosition = CheckpointTag.FromStreamPosition(0, "test-stream", -1);
 				_maxEvents = 2;
 			}
@@ -316,8 +317,7 @@ protected override void Given() {
 				ExistingEvent("test-stream", "type1", "{}", "{Data: 2}");
 				ExistingEvent("test-stream", "type2", "{}", "{Data: 3}");
 
-				_querySourcesDefinition = new QuerySourcesDefinition
-					{Streams = new[] {"test-stream"}, AllEvents = true};
+				_querySourcesDefinition = new QuerySourcesDefinition { Streams = new[] { "test-stream" }, AllEvents = true };
 				_fromPosition = CheckpointTag.FromStreamPosition(0, "test-stream", -1);
 				_maxEvents = 2;
 			}
diff --git a/src/EventStore.Projections.Core.Tests/Services/feed_reader/feed_reader_by_event_indexes.cs b/src/KurrentDB.Projections.Core.Tests/Services/feed_reader/feed_reader_by_event_indexes.cs
similarity index 82%
rename from src/EventStore.Projections.Core.Tests/Services/feed_reader/feed_reader_by_event_indexes.cs
rename to src/KurrentDB.Projections.Core.Tests/Services/feed_reader/feed_reader_by_event_indexes.cs
index 2638205ef71..48ed7ec7713 100644
--- a/src/EventStore.Projections.Core.Tests/Services/feed_reader/feed_reader_by_event_indexes.cs
+++ b/src/KurrentDB.Projections.Core.Tests/Services/feed_reader/feed_reader_by_event_indexes.cs
@@ -1,17 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Messages.EventReaders.Feeds;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Messages.EventReaders.Feeds;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
 using NUnit.Framework;
 
-namespace EventStore.Projections.Core.Tests.Services.feed_reader {
+namespace KurrentDB.Projections.Core.Tests.Services.feed_reader {
 	namespace feed_reader_by_event_indexes {
 		[TestFixture(typeof(LogFormat.V2), typeof(string))]
 		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
@@ -39,11 +40,11 @@ protected override void Given() {
 
 				_querySourcesDefinition = new QuerySourcesDefinition {
 					AllStreams = true,
-					Events = new[] {"type1", "type2"},
+					Events = new[] { "type1", "type2" },
 					Options = new QuerySourcesDefinitionOptions { }
 				};
 				_fromPosition = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(0, -1),
-					new Dictionary<string, long> {{"type1", -1}, {"type2", -1}});
+					new Dictionary<string, long> { { "type1", -1 }, { "type2", -1 } });
 				_maxEvents = 1; // reading the first event
 			}
 
@@ -69,7 +70,7 @@ public void returns_correct_last_reader_position() {
 				var feedPage = _consumer.HandledMessages.OfType<FeedReaderMessage.FeedPage>().Single();
 				Assert.AreEqual(
 					CheckpointTag.FromEventTypeIndexPositions(0, _tfPos1,
-						new Dictionary<string, long> {{"type1", 0}, {"type2", -1}}), feedPage.LastReaderPosition);
+						new Dictionary<string, long> { { "type1", 0 }, { "type2", -1 } }), feedPage.LastReaderPosition);
 			}
 		}
 
@@ -96,11 +97,11 @@ protected override void Given() {
 				NoStream("$et");
 				_querySourcesDefinition = new QuerySourcesDefinition {
 					AllStreams = true,
-					Events = new[] {"type1", "type2"},
+					Events = new[] { "type1", "type2" },
 					Options = new QuerySourcesDefinitionOptions { }
 				};
 				_fromPosition = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(0, -1),
-					new Dictionary<string, long> {{"type1", -1}, {"type2", -1}});
+					new Dictionary<string, long> { { "type1", -1 }, { "type2", -1 } });
 				_maxEvents = 3;
 			}
 
@@ -126,14 +127,14 @@ public void returns_correct_last_reader_position() {
 				var feedPage = _consumer.HandledMessages.OfType<FeedReaderMessage.FeedPage>().Single();
 				Assert.AreEqual(
 					CheckpointTag.FromEventTypeIndexPositions(0, _tfPos3,
-						new Dictionary<string, long> {{"type1", 1}, {"type2", 0}}), feedPage.LastReaderPosition);
+						new Dictionary<string, long> { { "type1", 1 }, { "type2", 0 } }), feedPage.LastReaderPosition);
 			}
 
 			[Test]
 			public void returns_correct_event_sequence() {
 				var feedPage = _consumer.HandledMessages.OfType<FeedReaderMessage.FeedPage>().Single();
 				Assert.That(
-					new long[] {0, 1, 2}.SequenceEqual(
+					new long[] { 0, 1, 2 }.SequenceEqual(
 						feedPage.Events.Select(e => e.ResolvedEvent.EventSequenceNumber).OrderBy(v => v)));
 			}
 		}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/grpc_service/ProjectionsStatisticsTests.cs b/src/KurrentDB.Projections.Core.Tests/Services/grpc_service/ProjectionsStatisticsTests.cs
new file mode 100644
index 00000000000..5144bea7295
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/grpc_service/ProjectionsStatisticsTests.cs
@@ -0,0 +1,105 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Client;
+using EventStore.Client.Projections;
+using Grpc.Core;
+using Grpc.Net.Client;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Tests.ClientAPI.projectionsManager;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.grpc_service;
+
+[TestFixture]
+public class ProjectionsStatisticsTests : SpecificationWithNodeAndProjectionsManager<LogFormat.V2, string> {
+	private EventStore.Client.Projections.Projections.ProjectionsClient _client;
+	private GrpcChannel _channel;
+	private StatisticsResp _invalidProjectionStatistics;
+	private StatisticsResp _validProjectionStatistics;
+
+	public override async Task Given() {
+		_channel = GrpcChannel.ForAddress(
+			new Uri($"https://{_node.HttpEndPoint}"),
+			new GrpcChannelOptions {
+				HttpHandler = _node.HttpMessageHandler,
+			});
+
+		_client = new EventStore.Client.Projections.Projections.ProjectionsClient(_channel);
+		await _client.CreateAsync(new CreateReq {
+			Options = new CreateReq.Types.Options {
+				Continuous = new CreateReq.Types.Options.Types.Continuous {
+					Name = "invalid-projection",
+					EmitEnabled = false,
+					TrackEmittedStreams = false,
+				},
+				Query = "something invalid"
+			},
+		}, GetCallOptions());
+		await _client.CreateAsync(new CreateReq {
+			Options = new CreateReq.Types.Options {
+				Continuous = new CreateReq.Types.Options.Types.Continuous {
+					Name = "valid-projection",
+					EmitEnabled = false,
+					TrackEmittedStreams = false,
+				},
+				Query = "fromAll().when({})"
+			},
+		}, GetCallOptions());
+	}
+
+	public override async Task When() {
+		var statuses = _client.Statistics(new StatisticsReq {
+			Options = new StatisticsReq.Types.Options {
+				All = new Empty()
+			}
+		}, GetCallOptions());
+		while (await statuses.ResponseStream.MoveNext(CancellationToken.None)) {
+			var status = statuses.ResponseStream.Current;
+			if (status.Details.Name == "invalid-projection") {
+				_invalidProjectionStatistics = status;
+			}
+			if (status.Details.Name == "valid-projection") {
+				_validProjectionStatistics = status;
+			}
+		}
+	}
+	[Test]
+	public void invalid_projection_should_have_default_values() {
+		Assert.AreEqual("invalid-projection", _invalidProjectionStatistics.Details.EffectiveName);
+		Assert.AreEqual("Faulted", _invalidProjectionStatistics.Details.Status);
+		Assert.AreEqual(string.Empty, _invalidProjectionStatistics.Details.CheckpointStatus);
+		Assert.AreEqual(string.Empty, _invalidProjectionStatistics.Details.Position);
+		Assert.AreEqual(string.Empty, _invalidProjectionStatistics.Details.LastCheckpoint);
+	}
+
+	[Test]
+	public void valid_projection_should_have_correct_values() {
+		Assert.AreEqual("valid-projection", _validProjectionStatistics.Details.EffectiveName);
+		Assert.AreEqual("Running", _validProjectionStatistics.Details.Status);
+		Assert.AreEqual(string.Empty, _validProjectionStatistics.Details.CheckpointStatus);
+		Assert.AreEqual("C:0/P:-1", _validProjectionStatistics.Details.Position);
+		Assert.AreEqual("C:0/P:-1", _validProjectionStatistics.Details.LastCheckpoint);
+	}
+
+	public override Task TestFixtureTearDown() {
+		_channel.Dispose();
+		return base.TestFixtureTearDown();
+	}
+
+	protected CallOptions GetCallOptions() {
+		var credentials = CallCredentials.FromInterceptor((_, metadata) => {
+			metadata.Add(new Metadata.Entry("authorization",
+				$"Basic {Convert.ToBase64String("admin:changeit"u8.ToArray())}"));
+			return Task.CompletedTask;
+		});
+		return new(credentials: credentials,
+			deadline: Debugger.IsAttached
+				? DateTime.UtcNow.AddDays(1)
+				: new DateTime?());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/grpc_service/ServerFeaturesTests.cs b/src/KurrentDB.Projections.Core.Tests/Services/grpc_service/ServerFeaturesTests.cs
new file mode 100644
index 00000000000..3ffc3a057a0
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/grpc_service/ServerFeaturesTests.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.Client;
+using EventStore.Client.ServerFeatures;
+using Google.Protobuf.Reflection;
+using Grpc.Net.Client;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Tests.ClientAPI.projectionsManager;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.grpc_service;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class ServerFeaturesTests<TLogFormat, TStreamId> : SpecificationWithNodeAndProjectionsManager<TLogFormat, TStreamId> {
+	private List<SupportedMethod> _supportedEndPoints = new();
+	private List<SupportedMethod> _expectedEndPoints = new();
+
+	public override Task Given() {
+		_expectedEndPoints.AddRange(GetEndPoints(EventStore.Client.Projections.Projections.Descriptor));
+		var createEndPoint = _expectedEndPoints.FirstOrDefault(ep => ep.MethodName.Contains("create"));
+		createEndPoint?.Features.Add("track_emitted_streams");
+
+		return Task.CompletedTask;
+	}
+
+	public override async Task When() {
+
+		using var channel = GrpcChannel.ForAddress(
+			new Uri($"https://{_node.HttpEndPoint}"),
+			new GrpcChannelOptions {
+				HttpHandler = _node.HttpMessageHandler
+			});
+		var client = new ServerFeatures.ServerFeaturesClient(channel);
+
+		var resp = await client.GetSupportedMethodsAsync(new Empty());
+		_supportedEndPoints = resp.Methods.Where(x => x.ServiceName.Contains("projections")).ToList();
+	}
+
+	private SupportedMethod[] GetEndPoints(ServiceDescriptor desc) =>
+		desc.Methods.Select(x => new SupportedMethod {
+			MethodName = x.Name.ToLower(),
+			ServiceName = x.Service.FullName.ToLower()
+		}).ToArray();
+
+	[Test]
+	public void should_receive_expected_endpoints() {
+		CollectionAssert.AreEquivalent(_expectedEndPoints, _supportedEndPoints);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/handlers/categorize_events_by_correlation_id.cs b/src/KurrentDB.Projections.Core.Tests/Services/handlers/categorize_events_by_correlation_id.cs
new file mode 100644
index 00000000000..5b608c7af84
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/handlers/categorize_events_by_correlation_id.cs
@@ -0,0 +1,312 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Standard;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.handlers;
+
+public static class categorize_events_by_correlation_id {
+	[TestFixture]
+	public class when_handling_simple_event {
+		private ByCorrelationId _handler;
+		private string _state;
+		private EmittedEventEnvelope[] _emittedEvents;
+		private bool _result;
+		private DateTime _dateTime;
+
+		[SetUp]
+		public void when() {
+			_handler = new ByCorrelationId("", Console.WriteLine);
+			_handler.Initialize();
+			_dateTime = DateTime.UtcNow;
+			var dataBytes = Encoding.ASCII.GetBytes("{}");
+			var metadataBytes = Encoding.ASCII.GetBytes("{\"$correlationId\":\"testing1\"}");
+
+			string sharedState;
+			_result = _handler.ProcessEvent(
+				"", CheckpointTag.FromPosition(0, 200, 150), null,
+				new ResolvedEvent(
+					"cat1-stream1", 10, "cat1-stream1", 10, false, new TFPos(200, 150), new TFPos(200, 150),
+					Guid.NewGuid(),
+					"event_type", true, dataBytes, metadataBytes, null, null, _dateTime), out _state,
+				out sharedState, out _emittedEvents);
+		}
+
+		[Test]
+		public void result_is_true() {
+			Assert.IsTrue(_result);
+		}
+
+		[Test]
+		public void state_stays_null() {
+			Assert.IsNull(_state);
+		}
+
+		[Test]
+		public void emits_correct_link() {
+			Assert.NotNull(_emittedEvents);
+			Assert.AreEqual(1, _emittedEvents.Length);
+			var @event = _emittedEvents[0].Event;
+			Assert.AreEqual("$>", @event.EventType);
+			Assert.AreEqual("$bc-testing1", @event.StreamId);
+			Assert.AreEqual("10@cat1-stream1", @event.Data);
+
+			string eventTimestampJson = null;
+			var extraMetadata = @event.ExtraMetaData();
+			foreach (var kvp in extraMetadata) {
+				if (kvp.Key.Equals("$eventTimestamp")) {
+					eventTimestampJson = kvp.Value;
+				}
+			}
+
+			Assert.NotNull(eventTimestampJson);
+			Assert.AreEqual("\"" + _dateTime.ToString("yyyy-MM-ddTHH:mm:ss.ffffffZ") + "\"", eventTimestampJson);
+		}
+	}
+
+	[TestFixture]
+	public class when_handling_link_to_event {
+		private ByCorrelationId _handler;
+		private string _state;
+		private EmittedEventEnvelope[] _emittedEvents;
+		private bool _result;
+		private DateTime _dateTime;
+		private Guid _eventId;
+
+		[SetUp]
+		public void when() {
+			_handler = new ByCorrelationId("", Console.WriteLine);
+			_handler.Initialize();
+			_dateTime = DateTime.UtcNow;
+			string sharedState;
+
+			var dataBytes = Encoding.ASCII.GetBytes("10@cat1-stream1");
+			var metadataBytes =
+				Encoding.ASCII.GetBytes("{\"$correlationId\":\"testing2\", \"$whatever\":\"hello\"}");
+			var myEvent = new ResolvedEvent("cat2-stream2", 20, "cat2-stream2", 20, true, new TFPos(200, 150),
+				new TFPos(200, 150), Guid.NewGuid(), "$>", true, dataBytes, metadataBytes, null, null, _dateTime);
+
+			_eventId = myEvent.EventId;
+			_result = _handler.ProcessEvent(
+				"", CheckpointTag.FromPosition(0, 200, 150), null,
+				myEvent, out _state, out sharedState, out _emittedEvents);
+		}
+
+		[Test]
+		public void result_is_true() {
+			Assert.IsTrue(_result);
+		}
+
+		[Test]
+		public void state_stays_null() {
+			Assert.IsNull(_state);
+		}
+
+		[Test]
+		public void emits_correct_link() {
+			Assert.NotNull(_emittedEvents);
+			Assert.AreEqual(1, _emittedEvents.Length);
+			var @event = _emittedEvents[0].Event;
+			Assert.AreEqual("$>", @event.EventType);
+			Assert.AreEqual("$bc-testing2", @event.StreamId);
+			Assert.AreEqual("10@cat1-stream1", @event.Data);
+
+			string eventTimestampJson = null;
+			string linkJson = null;
+			var extraMetadata = @event.ExtraMetaData();
+			foreach (var kvp in extraMetadata) {
+				switch (kvp.Key) {
+					case "$eventTimestamp":
+						eventTimestampJson = kvp.Value;
+						break;
+					case "$link":
+						linkJson = kvp.Value;
+						break;
+				}
+			}
+
+			Assert.NotNull(eventTimestampJson);
+			Assert.AreEqual("\"" + _dateTime.ToString("yyyy-MM-ddTHH:mm:ss.ffffffZ") + "\"", eventTimestampJson);
+
+			//the link's metadata should be copied to $link.metadata and id to $link.eventId
+			Assert.NotNull(linkJson);
+			var link = JObject.Parse(linkJson);
+			Assert.AreEqual(link.GetValue("eventId").ToObject<string>(), _eventId.ToString());
+
+			var linkMetadata = (JObject)link.GetValue("metadata");
+			Assert.AreEqual(linkMetadata.GetValue("$correlationId").ToObject<string>(), "testing2");
+			Assert.AreEqual(linkMetadata.GetValue("$whatever").ToObject<string>(), "hello");
+		}
+	}
+
+	[TestFixture]
+	public class when_handling_non_json_event {
+		private ByCorrelationId _handler;
+		private string _state;
+		private EmittedEventEnvelope[] _emittedEvents;
+		private bool _result;
+
+		[SetUp]
+		public void when() {
+			_handler = new ByCorrelationId("", Console.WriteLine);
+			_handler.Initialize();
+			string sharedState;
+			_result = _handler.ProcessEvent(
+				"", CheckpointTag.FromPosition(0, 200, 150), null,
+				new ResolvedEvent(
+					"cat1-stream1", 10, "cat1-stream1", 10, false, new TFPos(200, 150), Guid.NewGuid(),
+					"event_type", false, "non_json_data", "non_json_metadata"), out _state, out sharedState,
+				out _emittedEvents);
+		}
+
+		[Test]
+		public void result_is_false() {
+			Assert.IsFalse(_result);
+		}
+
+		[Test]
+		public void state_stays_null() {
+			Assert.IsNull(_state);
+		}
+
+		[Test]
+		public void does_not_emit_link() {
+			Assert.IsNull(_emittedEvents);
+		}
+	}
+
+	[TestFixture]
+	public class when_handling_json_event_with_no_correlation_id {
+		private ByCorrelationId _handler;
+		private string _state;
+		private EmittedEventEnvelope[] _emittedEvents;
+		private bool _result;
+
+		[SetUp]
+		public void when() {
+			_handler = new ByCorrelationId("", Console.WriteLine);
+			_handler.Initialize();
+			string sharedState;
+			_result = _handler.ProcessEvent(
+				"", CheckpointTag.FromPosition(0, 200, 150), null,
+				new ResolvedEvent(
+					"cat1-stream1", 10, "cat1-stream1", 10, false, new TFPos(200, 150), Guid.NewGuid(),
+					"event_type", true, "{}", "{}"), out _state, out sharedState, out _emittedEvents);
+		}
+
+		[Test]
+		public void result_is_false() {
+			Assert.IsFalse(_result);
+		}
+
+		[Test]
+		public void state_stays_null() {
+			Assert.IsNull(_state);
+		}
+
+		[Test]
+		public void does_not_emit_link() {
+			Assert.IsNull(_emittedEvents);
+		}
+	}
+
+	[TestFixture]
+	public class when_handling_json_event_with_non_json_metadata {
+		private ByCorrelationId _handler;
+		private string _state;
+		private EmittedEventEnvelope[] _emittedEvents;
+		private bool _result;
+
+		[SetUp]
+		public void when() {
+			_handler = new ByCorrelationId("", Console.WriteLine);
+			_handler.Initialize();
+			string sharedState;
+			_result = _handler.ProcessEvent(
+				"", CheckpointTag.FromPosition(0, 200, 150), null,
+				new ResolvedEvent(
+					"cat1-stream1", 10, "cat1-stream1", 10, false, new TFPos(200, 150), Guid.NewGuid(),
+					"event_type", true, "{}", "non_json_metadata"), out _state, out sharedState,
+				out _emittedEvents);
+		}
+
+		[Test]
+		public void result_is_false() {
+			Assert.IsFalse(_result);
+		}
+
+		[Test]
+		public void state_stays_null() {
+			Assert.IsNull(_state);
+		}
+
+		[Test]
+		public void does_not_emit_link() {
+			Assert.IsNull(_emittedEvents);
+		}
+	}
+
+	[TestFixture]
+	public class with_custom_valid_correlation_id_property {
+		private ByCorrelationId _handler;
+		private string _state;
+		private EmittedEventEnvelope[] _emittedEvents;
+		private bool _result;
+		private string source = "{\"correlationIdProperty\":\"$myCorrelationId\"}";
+
+		[SetUp]
+		public void when() {
+			_handler = new ByCorrelationId(source, Console.WriteLine);
+			_handler.Initialize();
+			string sharedState;
+			_result = _handler.ProcessEvent(
+				"", CheckpointTag.FromPosition(0, 200, 150), null,
+				new ResolvedEvent(
+					"cat1-stream1", 10, "cat1-stream1", 10, false, new TFPos(200, 150), Guid.NewGuid(),
+					"event_type", true, "{}", "{\"$myCorrelationId\":\"testing1\"}"), out _state, out sharedState,
+				out _emittedEvents);
+		}
+
+		[Test]
+		public void result_is_true() {
+			Assert.IsTrue(_result);
+		}
+
+		[Test]
+		public void state_stays_null() {
+			Assert.IsNull(_state);
+		}
+
+		[Test]
+		public void emits_correct_link() {
+			Assert.NotNull(_emittedEvents);
+			Assert.AreEqual(1, _emittedEvents.Length);
+			var @event = _emittedEvents[0].Event;
+			Assert.AreEqual("$>", @event.EventType);
+			Assert.AreEqual("$bc-testing1", @event.StreamId);
+			Assert.AreEqual("10@cat1-stream1", @event.Data);
+		}
+	}
+
+	[TestFixture]
+	public class with_custom_invalid_correlation_id_property {
+		private string source = "{\"thisisnotvalid\":\"$myCorrelationId\"}";
+
+		[SetUp]
+		public void when() {
+		}
+
+		[Test]
+		public void should_throw_invalid_operation_exception() {
+			Assert.Throws<InvalidOperationException>(() => { new ByCorrelationId(source, Console.WriteLine); });
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/handlers/categorize_events_by_stream_path.cs b/src/KurrentDB.Projections.Core.Tests/Services/handlers/categorize_events_by_stream_path.cs
new file mode 100644
index 00000000000..c7a50e59666
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/handlers/categorize_events_by_stream_path.cs
@@ -0,0 +1,227 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Standard;
+using NUnit.Framework;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Tests.Services.handlers;
+
+public static class categorize_events_by_stream_path {
+	[TestFixture]
+	public class when_handling_simple_event {
+		private CategorizeEventsByStreamPath _handler;
+		private string _state;
+		private EmittedEventEnvelope[] _emittedEvents;
+		private bool _result;
+
+		[SetUp]
+		public void when() {
+			_handler = new CategorizeEventsByStreamPath("-", Console.WriteLine);
+			_handler.Initialize();
+			string sharedState;
+			_result = _handler.ProcessEvent(
+				"", CheckpointTag.FromPosition(0, 200, 150), null,
+				new ResolvedEvent(
+					"cat1-stream1", 10, "cat1-stream1", 10, false, new TFPos(200, 150), Guid.NewGuid(),
+					"event_type", true, "{}", "{}"), out _state, out sharedState, out _emittedEvents);
+		}
+
+		[Test]
+		public void result_is_true() {
+			Assert.IsTrue(_result);
+		}
+
+		[Test]
+		public void state_stays_null() {
+			Assert.IsNull(_state);
+		}
+
+		[Test]
+		public void emits_correct_link() {
+			Assert.NotNull(_emittedEvents);
+			Assert.AreEqual(1, _emittedEvents.Length);
+			var @event = _emittedEvents[0].Event;
+			Assert.AreEqual("$>", @event.EventType);
+			Assert.AreEqual("$ce-cat1", @event.StreamId);
+			Assert.AreEqual("10@cat1-stream1", @event.Data);
+		}
+	}
+
+	[TestFixture]
+	public class when_handling_link_to_event {
+		private CategorizeEventsByStreamPath _handler;
+		private string _state;
+		private EmittedEventEnvelope[] _emittedEvents;
+		private bool _result;
+
+		[SetUp]
+		public void when() {
+			_handler = new CategorizeEventsByStreamPath("-", Console.WriteLine);
+			_handler.Initialize();
+			string sharedState;
+			_result = _handler.ProcessEvent(
+				"", CheckpointTag.FromPosition(0, 200, 150), null,
+				new ResolvedEvent(
+					"cat2-stream2", 20, "cat2-stream2", 20, true, new TFPos(200, 150), Guid.NewGuid(),
+					"$>", true, "10@cat1-stream1", "{}"), out _state, out sharedState, out _emittedEvents);
+		}
+
+		[Test]
+		public void result_is_true() {
+			Assert.IsTrue(_result);
+		}
+
+		[Test]
+		public void state_stays_null() {
+			Assert.IsNull(_state);
+		}
+
+		[Test]
+		public void emits_correct_link() {
+			Assert.NotNull(_emittedEvents);
+			Assert.AreEqual(1, _emittedEvents.Length);
+			var @event = _emittedEvents[0].Event;
+			Assert.AreEqual("$>", @event.EventType);
+			Assert.AreEqual("$ce-cat2", @event.StreamId);
+			Assert.AreEqual("10@cat1-stream1", @event.Data);
+		}
+	}
+
+	[TestFixture]
+	public class when_handling_normal_stream_metadata_event {
+		private CategorizeEventsByStreamPath _handler;
+		private string _state;
+		private EmittedEventEnvelope[] _emittedEvents;
+		private bool _result;
+
+		[SetUp]
+		public void when() {
+			_handler = new CategorizeEventsByStreamPath("-", Console.WriteLine);
+			_handler.Initialize();
+			string sharedState;
+			_result = _handler.ProcessEvent(
+				"", CheckpointTag.FromPosition(0, 200, 150), null,
+				new ResolvedEvent(
+					"$$cat3-stream3", 20, "$$cat3-stream3", 20, true, new TFPos(200, 150), Guid.NewGuid(),
+					"$metadata", true, "{}", "{}"), out _state, out sharedState, out _emittedEvents);
+		}
+
+		[Test]
+		public void result_is_true() {
+			Assert.IsTrue(_result);
+		}
+
+		[Test]
+		public void state_stays_null() {
+			Assert.IsNull(_state);
+		}
+
+		[Test]
+		public void does_not_emit_events() {
+			Assert.IsNull(_emittedEvents);
+		}
+	}
+
+	[TestFixture]
+	public class when_handling_soft_deleted_stream_metadata_event {
+		private CategorizeEventsByStreamPath _handler;
+		private string _state;
+		private EmittedEventEnvelope[] _emittedEvents;
+		private bool _result;
+
+		[SetUp]
+		public void when() {
+			_handler = new CategorizeEventsByStreamPath("-", Console.WriteLine);
+			_handler.Initialize();
+			string sharedState;
+			_result = _handler.ProcessEvent(
+				"", CheckpointTag.FromPosition(0, 200, 150), null,
+				new ResolvedEvent(
+					"$$cat4-stream4", 20, "$$cat4-stream4", 20, true, new TFPos(200, 150), Guid.NewGuid(),
+					"$metadata", true, "{ \"$tb\": " + long.MaxValue + " }", "{}"), out _state, out sharedState, out _emittedEvents);
+		}
+
+		[Test]
+		public void result_is_true() {
+			Assert.IsTrue(_result);
+		}
+
+		[Test]
+		public void state_stays_null() {
+			Assert.IsNull(_state);
+		}
+
+		[Test]
+		public void emits_correct_link() {
+			Assert.NotNull(_emittedEvents);
+			Assert.AreEqual(1, _emittedEvents.Length);
+			var @event = _emittedEvents[0].Event;
+			Assert.AreEqual("$>", @event.EventType);
+			Assert.AreEqual("$ce-cat4", @event.StreamId);
+			Assert.AreEqual("20@$$cat4-stream4", @event.Data);
+			var metadata = new Dictionary<string, string>();
+			foreach (var kvp in @event.ExtraMetaData()) {
+				metadata[kvp.Key] = kvp.Value;
+			}
+			Assert.NotNull(metadata["$o"]);
+			Assert.AreEqual("\"cat4-stream4\"", metadata["$o"]);
+			Assert.NotNull(metadata["$deleted"]);
+			Assert.AreEqual("-1", metadata["$deleted"]);
+		}
+	}
+
+	[TestFixture]
+	public class when_handling_hard_deleted_stream_event {
+		private CategorizeEventsByStreamPath _handler;
+		private string _state;
+		private EmittedEventEnvelope[] _emittedEvents;
+		private bool _result;
+
+		[SetUp]
+		public void when() {
+			_handler = new CategorizeEventsByStreamPath("-", Console.WriteLine);
+			_handler.Initialize();
+			string sharedState;
+			_result = _handler.ProcessEvent(
+				"", CheckpointTag.FromPosition(0, 200, 150), null,
+				new ResolvedEvent(
+					"cat5-stream5", 20, "cat5-stream5", 20, true, new TFPos(200, 150), Guid.NewGuid(),
+					"$streamDeleted", true, "{}", "{}"), out _state, out sharedState, out _emittedEvents);
+		}
+
+		[Test]
+		public void result_is_true() {
+			Assert.IsTrue(_result);
+		}
+
+		[Test]
+		public void state_stays_null() {
+			Assert.IsNull(_state);
+		}
+
+		[Test]
+		public void emits_correct_link() {
+			Assert.NotNull(_emittedEvents);
+			Assert.AreEqual(1, _emittedEvents.Length);
+			var @event = _emittedEvents[0].Event;
+			Assert.AreEqual("$>", @event.EventType);
+			Assert.AreEqual("$ce-cat5", @event.StreamId);
+			Assert.AreEqual("20@cat5-stream5", @event.Data);
+
+			var metadata = new Dictionary<string, string>();
+			foreach (var kvp in @event.ExtraMetaData()) {
+				metadata[kvp.Key] = kvp.Value;
+			}
+			Assert.NotNull(metadata["$o"]);
+			Assert.AreEqual("\"cat5-stream5\"", metadata["$o"]);
+			Assert.NotNull(metadata["$deleted"]);
+			Assert.AreEqual("-1", metadata["$deleted"]);
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/http_service/authorization_tests.cs b/src/KurrentDB.Projections.Core.Tests/Services/http_service/authorization_tests.cs
new file mode 100644
index 00000000000..fd7c4f8037b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/http_service/authorization_tests.cs
@@ -0,0 +1,203 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Tests.ClientAPI.Cluster;
+using NUnit.Framework;
+using ContentType = KurrentDB.Transport.Http.ContentType;
+
+namespace KurrentDB.Projections.Core.Tests.Services.http_service;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class Authorization<TLogFormat, TStreamId> : specification_with_standard_projections_runnning<TLogFormat, TStreamId> {
+	private Dictionary<string, HttpClient> _httpClients = new Dictionary<string, HttpClient>();
+	private TimeSpan _timeout = TimeSpan.FromSeconds(10);
+	private int _leaderId;
+
+	private HttpClient CreateHttpClient(string username, string password) {
+		var client = new HttpClient(new HttpClientHandler {
+			AllowAutoRedirect = false
+		}) {
+			Timeout = _timeout
+		};
+		if (!string.IsNullOrEmpty(username)) {
+			client.DefaultRequestHeaders.Authorization =
+				new AuthenticationHeaderValue(
+					"Basic", Convert.ToBase64String(
+						Encoding.ASCII.GetBytes(
+							$"{username}:{password}")));
+		}
+
+		return client;
+	}
+
+	private async Task<int> SendRequest(HttpClient client, HttpMethod method, string url, string body, string contentType) {
+		using var request = new HttpRequestMessage { Method = method, RequestUri = new Uri(url) };
+
+		if (body != null) {
+			var bodyBytes = Helper.UTF8NoBom.GetBytes(body);
+			var stream = new MemoryStream(bodyBytes);
+			var content = new StreamContent(stream);
+			content.Headers.ContentLength = bodyBytes.Length;
+			if (contentType != null)
+				content.Headers.ContentType = new MediaTypeHeaderValue(contentType);
+			request.Content = content;
+		}
+
+		var result = await client.SendAsync(request);
+		return (int)result.StatusCode;
+	}
+
+	private HttpMethod GetHttpMethod(string method) {
+		switch (method) {
+			case "GET":
+				return HttpMethod.Get;
+			case "POST":
+				return HttpMethod.Post;
+			case "PUT":
+				return HttpMethod.Put;
+			case "DELETE":
+				return HttpMethod.Delete;
+			default:
+				throw new Exception("Unknown Http Method");
+		}
+	}
+
+	private int GetAuthLevel(string userAuthorizationLevel) {
+		switch (userAuthorizationLevel) {
+			case "None":
+				return 0;
+			case "User":
+				return 1;
+			case "Ops":
+				return 2;
+			case "Admin":
+				return 3;
+			default:
+				throw new Exception("Unknown authorization level");
+		}
+	}
+	public async Task CreateUser(string username, string password) {
+		for (int trial = 1; trial <= 5; trial++) {
+			try {
+				var dataStr = string.Format("{{loginName: '{0}', fullName: '{1}', password: '{2}', groups: []}}", username, username, password);
+				var data = Helper.UTF8NoBom.GetBytes(dataStr);
+				var stream = new MemoryStream(data);
+				var content = new StreamContent(stream);
+				content.Headers.Add("Content-Type", ContentType.Json);
+
+				var res = await _httpClients["Admin"].PostAsync(
+					string.Format("http://{0}/users/", _nodes[_leaderId].HttpEndPoint),
+					content
+				);
+				res.EnsureSuccessStatusCode();
+				break;
+			} catch (HttpRequestException) {
+				if (trial == 5) {
+					throw new Exception(string.Format("Error creating user: {0}", username));
+				}
+				await Task.Delay(1000);
+			}
+		}
+	}
+
+	protected override async Task Given() {
+		await base.Given();
+		//find the leader node
+		for (int i = 0; i < _nodes.Length; i++) {
+			if (_nodes[i].NodeState == VNodeState.Leader) {
+				_leaderId = i;
+				break;
+			}
+		}
+
+		_httpClients["Admin"] = CreateHttpClient("admin", "changeit");
+		_httpClients["Ops"] = CreateHttpClient("ops", "changeit");
+		await CreateUser("user", "changeit");
+		_httpClients["User"] = CreateHttpClient("user", "changeit");
+		_httpClients["None"] = CreateHttpClient(null, null);
+	}
+
+	[OneTimeTearDown]
+	public override Task TestFixtureTearDown() {
+		foreach (var kvp in _httpClients) {
+			kvp.Value.Dispose();
+		}
+		return base.TestFixtureTearDown();
+	}
+	//just using Ignore not being honored for Combinatorial tests in the dotnet test runner
+	//[Test, Combinatorial, Ignore("Invalid URl templates, retained for future refactoring")]
+	public async Task authorization_tests(
+		[Values(
+			"None",
+			"User",
+			"Ops",
+			"Admin"
+		)] string userAuthorizationLevel,
+		[Values(
+			"/web/es/js/projections/{*remaining_path};GET;None",
+			"/web/es/js/projections/v8/Prelude/{*remaining_path};GET;None",
+			"/web/projections;GET;None",
+			"/projections;GET;User",
+			"/projections/any;GET;User",
+			"/projections/all-non-transient;GET;User",
+			"/projections/transient;GET;User",
+			"/projections/onetime;GET;User",
+			"/projections/continuous;GET;User",
+			"/projections/transient?name=name&type=type&enabled={enabled};POST;User", /* /projections/transient?name={name}&type={type}&enabled={enabled} */
+			"/projections/onetime?name=name&type=type&enabled={enabled}&checkpoints={checkpoints}&emit={emit}&trackemittedstreams={trackemittedstreams};POST;Ops", /* /projections/onetime?name={name}&type={type}&enabled={enabled}&checkpoints={checkpoints}&emit={emit}&trackemittedstreams={trackemittedstreams} */
+			"/projections/continuous?name=name&type=type&enabled={enabled}&emit={emit}&trackemittedstreams={trackemittedstreams};POST;Ops", /* /projections/continuous?name={name}&type={type}&enabled={enabled}&emit={emit}&trackemittedstreams={trackemittedstreams} */
+			"/projection/name/query?config={config};GET;User", /* /projection/{name}/query?config={config} */
+			"/projection/name/query?type={type}&emit={emit};PUT;User", /* /projection/{name}/query?type={type}&emit={emit} */
+			"/projection/name;GET;User", /* /projection/{name} */
+			"/projection/name?deleteStateStream={deleteStateStream}&deleteCheckpointStream={deleteCheckpointStream}&deleteEmittedStreams={deleteEmittedStreams};DELETE;Ops", /* /projection/{name}?deleteStateStream={deleteStateStream}&deleteCheckpointStream={deleteCheckpointStream}&deleteEmittedStreams={deleteEmittedStreams} */
+			"/projection/name/statistics;GET;User", /* projection/{name}/statistics */
+			"/projections/read-events;POST;User",
+			"/projection/{name}/state?partition={partition};GET;User",
+			"/projection/{name}/result?partition={partition};GET;User",
+			"/projection/{name}/command/disable?enableRunAs={enableRunAs};POST;User",
+			"/projection/{name}/command/enable?enableRunAs={enableRunAs};POST;User",
+			"/projection/{name}/command/reset?enableRunAs={enableRunAs};POST;User",
+			"/projection/{name}/command/abort?enableRunAs={enableRunAs};POST;User",
+			"/projection/{name}/config;GET;Ops",
+			"/projection/{name}/config;PUT;Ops"
+			/*"/sys/subsystems;GET;Ops"*/ /* this endpoint has been commented since this controller is not registered when using a MiniNode */
+		)] string httpEndpointDetails
+	) {
+		/*use the leader node endpoint to avoid any redirects*/
+		var nodeEndpoint = _nodes[_leaderId].HttpEndPoint;
+		var httpEndpointTokens = httpEndpointDetails.Split(';');
+		var endpointUrl = httpEndpointTokens[0];
+		var httpMethod = GetHttpMethod(httpEndpointTokens[1]);
+		var requiredMinAuthorizationLevel = httpEndpointTokens[2];
+
+		var url = $"http://{nodeEndpoint}{endpointUrl}";
+		var body = GetData(httpMethod, endpointUrl);
+		var contentType = httpMethod == HttpMethod.Post || httpMethod == HttpMethod.Put || httpMethod == HttpMethod.Delete ? ContentType.Json : null;
+		var statusCode = await SendRequest(_httpClients[userAuthorizationLevel], httpMethod, url, body, contentType);
+
+		if (GetAuthLevel(userAuthorizationLevel) >= GetAuthLevel(requiredMinAuthorizationLevel)) {
+			Assert.AreNotEqual(401, statusCode);
+		} else {
+			Assert.AreEqual(401, statusCode);
+		}
+	}
+
+	private string GetData(HttpMethod httpMethod, string url) {
+		if (httpMethod == HttpMethod.Post || httpMethod == HttpMethod.Put || httpMethod == HttpMethod.Delete) {
+			return "{}";
+		} else {
+			return null;
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/mixed_checkpoint_tags.cs b/src/KurrentDB.Projections.Core.Tests/Services/mixed_checkpoint_tags.cs
new file mode 100644
index 00000000000..e5a450e0851
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/mixed_checkpoint_tags.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services;
+
+[TestFixture]
+public class mixed_checkpoint_tags {
+	private readonly CheckpointTag _a = CheckpointTag.FromStreamPosition(0, "stream1", 9);
+	private readonly CheckpointTag _b = CheckpointTag.FromStreamPosition(0, "stream2", 15);
+	private readonly CheckpointTag _c = CheckpointTag.FromPosition(0, 50, 29);
+
+	[Test]
+	public void are_not_equal() {
+		Assert.AreNotEqual(_a, _b);
+		Assert.AreNotEqual(_a, _c);
+		Assert.AreNotEqual(_b, _c);
+
+		Assert.IsTrue(_a != _b);
+		Assert.IsTrue(_a != _c);
+		Assert.IsTrue(_b != _c);
+	}
+
+	[Test]
+	public void cannot_be_compared() {
+		Assert.IsTrue(throws(() => _a > _b));
+		Assert.IsTrue(throws(() => _a >= _b));
+		Assert.IsTrue(throws(() => _a > _c));
+		Assert.IsTrue(throws(() => _a >= _c));
+		Assert.IsTrue(throws(() => _b > _c));
+		Assert.IsTrue(throws(() => _b >= _c));
+		Assert.IsTrue(throws(() => _a < _b));
+		Assert.IsTrue(throws(() => _a <= _b));
+		Assert.IsTrue(throws(() => _a < _c));
+		Assert.IsTrue(throws(() => _a <= _c));
+		Assert.IsTrue(throws(() => _b < _c));
+		Assert.IsTrue(throws(() => _b <= _c));
+	}
+
+	private bool throws(Func<bool> func) {
+		try {
+			func();
+			return false;
+		} catch (Exception) {
+			return true;
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/not_started_event_distribution_point_should.cs b/src/KurrentDB.Projections.Core.Tests/Services/not_started_event_distribution_point_should.cs
new file mode 100644
index 00000000000..b9d5b43b1b1
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/not_started_event_distribution_point_should.cs
@@ -0,0 +1,3 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/partition_state/partition_state.cs b/src/KurrentDB.Projections.Core.Tests/Services/partition_state/partition_state.cs
new file mode 100644
index 00000000000..1a6b5771f01
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/partition_state/partition_state.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.partition_state;
+
+public static class partition_state {
+	[TestFixture]
+	public class when_creating {
+		[Test]
+		public void throws_argument_null_exception_if_state_is_null() {
+			Assert.Throws<ArgumentNullException>(() => {
+				new PartitionState(null, "result", CheckpointTag.FromPosition(0, 100, 50));
+			});
+		}
+
+		[Test]
+		public void throws_argument_null_exception_if_caused_by_is_null() {
+			Assert.Throws<ArgumentNullException>(() => { new PartitionState("state", "result", null); });
+		}
+
+		[Test]
+		public void can_be_created() {
+			new PartitionState("state", "result", CheckpointTag.FromPosition(0, 100, 50));
+		}
+	}
+
+	[TestFixture]
+	public class can_be_deserialized_from_serialized_form {
+		[Test]
+		public void simple_object() {
+			AssertCorrect(@"");
+			AssertCorrect(@"{""a"":""b""}");
+			AssertCorrect(@"{""a"":""b"",""c"":1}");
+			AssertCorrect(@"{""z"":null,""a"":""b"",""c"":1}");
+		}
+
+		[Test]
+		public void complex_object() {
+			AssertCorrect(@"{""a"":""b"",""c"":[1,2,3]}");
+			AssertCorrect(@"{""a"":""b"",""c"":{""a"":""b""}}");
+			AssertCorrect(@"{""a"":""b"",""c"":[{},[],null]}");
+		}
+
+		[Test]
+		public void array() {
+			AssertCorrect(@"[]");
+			AssertCorrect(@"[""one"",""two""]");
+			AssertCorrect(@"[{""data"":{}}]");
+		}
+
+		[Test]
+		public void dates() {
+			foreach (var info in TimeZoneInfo.GetSystemTimeZones())
+				AssertCorrect($@"[""{DateTimeOffset.UtcNow.ToOffset(info.BaseUtcOffset):yyyy-MM-ddThh:mm:sszzz}""]");
+		}
+
+		[Test]
+		public void null_deserialization() {
+			var deserialized = PartitionState.Deserialize(null, CheckpointTag.FromPosition(0, 100, 50));
+			Assert.AreEqual("", deserialized.State);
+			Assert.IsNull(deserialized.Result);
+		}
+
+		private void AssertCorrect(string state, string result = null) {
+			var partitionState = new PartitionState(state, result, CheckpointTag.FromPosition(0, 100, 50));
+			var serialized = partitionState.Serialize();
+			var deserialized = PartitionState.Deserialize(serialized, CheckpointTag.FromPosition(0, 100, 50));
+
+			Assert.AreEqual(partitionState.State, deserialized.State);
+			Assert.AreEqual(partitionState.Result, deserialized.Result);
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_caching_a_parition_state.cs b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_caching_a_parition_state.cs
new file mode 100644
index 00000000000..1e550d5df76
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_caching_a_parition_state.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.partition_state_cache;
+
+[TestFixture]
+public class when_caching_a_parition_state {
+	private PartitionStateCache _cache;
+	private CheckpointTag _cachedAtCheckpointTag;
+
+	[SetUp]
+	public void when() {
+		_cache = new PartitionStateCache();
+		_cachedAtCheckpointTag = CheckpointTag.FromPosition(0, 1000, 900);
+		_cache.CachePartitionState(
+			"partition", new PartitionState("data", null, _cachedAtCheckpointTag));
+	}
+
+	[Test]
+	public void the_state_cannot_be_retrieved_as_locked() {
+		Assert.Throws<InvalidOperationException>(() => {
+			var state = _cache.GetLockedPartitionState("partition");
+			Assert.AreEqual("data", state.State);
+		});
+	}
+
+	[Test]
+	public void the_state_can_be_retrieved() {
+		var state = _cache.TryGetPartitionState("partition");
+		Assert.AreEqual("data", state.State);
+	}
+
+	[Test]
+	public void the_state_can_be_retrieved_as_unlocked_and_relocked_at_later_position() {
+		var state = _cache.TryGetAndLockPartitionState("partition", CheckpointTag.FromPosition(0, 1500, 1400));
+		Assert.AreEqual("data", state.State);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_caching_a_parition_state_as_locked.cs b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_caching_a_parition_state_as_locked.cs
new file mode 100644
index 00000000000..13a5c880efc
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_caching_a_parition_state_as_locked.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.partition_state_cache;
+
+[TestFixture]
+public class when_caching_a_parition_state_as_locked {
+	private PartitionStateCache _cache;
+	private CheckpointTag _cachedAtCheckpointTag;
+
+	[SetUp]
+	public void when() {
+		_cache = new PartitionStateCache();
+		_cachedAtCheckpointTag = CheckpointTag.FromPosition(0, 1000, 900);
+		_cache.CacheAndLockPartitionState("partition", new PartitionState("data", null, _cachedAtCheckpointTag),
+			_cachedAtCheckpointTag);
+	}
+
+	[Test]
+	public void the_state_can_be_retrieved_as_locked() {
+		var state = _cache.GetLockedPartitionState("partition");
+		Assert.AreEqual("data", state.State);
+	}
+
+	[Test]
+	public void the_state_can_be_retrieved() {
+		var state = _cache.TryGetPartitionState("partition");
+		Assert.AreEqual("data", state.State);
+	}
+
+	[Test]
+	public void the_state_can_be_retrieved_as_unlocked_and_relocked_at_later_position() {
+		var state = _cache.TryGetAndLockPartitionState("partition", CheckpointTag.FromPosition(0, 1500, 1400));
+		Assert.AreEqual("data", state.State);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_relocking_the_state_at_earlier_position.cs b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_relocking_the_state_at_earlier_position.cs
new file mode 100644
index 00000000000..f250df01eae
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_relocking_the_state_at_earlier_position.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.partition_state_cache;
+
+[TestFixture]
+public class when_relocking_the_state_at_earlier_position {
+	private PartitionStateCache _cache;
+	private CheckpointTag _cachedAtCheckpointTag;
+
+	[SetUp]
+	public void given() {
+		//given
+		_cache = new PartitionStateCache();
+		_cachedAtCheckpointTag = CheckpointTag.FromPosition(0, 1000, 900);
+		_cache.CacheAndLockPartitionState("partition", new PartitionState("data", null, _cachedAtCheckpointTag),
+			_cachedAtCheckpointTag);
+	}
+
+	[Test]
+	public void thorws_invalid_operation_exception() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_cache.TryGetAndLockPartitionState("partition", CheckpointTag.FromPosition(0, 500, 400));
+		});
+	}
+
+	[Test]
+	public void the_state_can_be_retrieved() {
+		var state = _cache.TryGetPartitionState("partition");
+		Assert.AreEqual("data", state.State);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_relocking_the_state_at_later_position.cs b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_relocking_the_state_at_later_position.cs
new file mode 100644
index 00000000000..ee143328ee5
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_relocking_the_state_at_later_position.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.partition_state_cache;
+
+[TestFixture]
+public class when_relocking_the_state_at_later_position {
+	private PartitionStateCache _cache;
+	private CheckpointTag _cachedAtCheckpointTag;
+	private PartitionState _relockedData;
+
+	[SetUp]
+	public void given() {
+		//given
+		_cache = new PartitionStateCache();
+		_cachedAtCheckpointTag = CheckpointTag.FromPosition(0, 1000, 900);
+		_cache.CacheAndLockPartitionState("partition", new PartitionState("data", null, _cachedAtCheckpointTag),
+			_cachedAtCheckpointTag);
+		_relockedData = _cache.TryGetAndLockPartitionState("partition", CheckpointTag.FromPosition(0, 2000, 1900));
+	}
+
+	[Test]
+	public void returns_correct_cached_data() {
+		Assert.AreEqual("data", _relockedData.State);
+	}
+
+	[Test]
+	public void relocked_state_can_be_retrieved_as_locked() {
+		var state = _cache.GetLockedPartitionState("partition");
+		Assert.AreEqual("data", state.State);
+	}
+
+	[Test]
+	public void cannot_be_relocked_at_the_previous_position() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_cache.TryGetAndLockPartitionState("partition", _cachedAtCheckpointTag);
+		});
+	}
+
+	[Test]
+	public void the_state_can_be_retrieved() {
+		var state = _cache.TryGetPartitionState("partition");
+		Assert.AreEqual("data", state.State);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_relocking_the_state_at_the_same_position.cs b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_relocking_the_state_at_the_same_position.cs
new file mode 100644
index 00000000000..61c184d759b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_relocking_the_state_at_the_same_position.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.partition_state_cache;
+
+[TestFixture]
+public class when_relocking_the_state_at_the_same_position {
+	private PartitionStateCache _cache;
+	private CheckpointTag _cachedAtCheckpointTag;
+
+	[SetUp]
+	public void given() {
+		//given
+		_cache = new PartitionStateCache();
+		_cachedAtCheckpointTag = CheckpointTag.FromPosition(0, 1000, 900);
+		_cache.CacheAndLockPartitionState("partition", new PartitionState("data", null, _cachedAtCheckpointTag),
+			_cachedAtCheckpointTag);
+	}
+
+	[Test]
+	public void thorws_invalid_operation_exception_if_not_allowed() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_cache.TryGetAndLockPartitionState("partition", CheckpointTag.FromPosition(0, 1000, 900));
+		});
+	}
+
+	[Test]
+	public void the_state_can_be_retrieved() {
+		var state = _cache.TryGetPartitionState("partition");
+		Assert.AreEqual("data", state.State);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_the_partition_state_cache_has_been_created.cs b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_the_partition_state_cache_has_been_created.cs
new file mode 100644
index 00000000000..b489eba41f4
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_the_partition_state_cache_has_been_created.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.partition_state_cache;
+
+[TestFixture]
+public class when_the_partition_state_cache_has_been_created {
+	private PartitionStateCache _cache;
+	private Exception _exception;
+
+	[SetUp]
+	public void when() {
+		try {
+			_cache = new PartitionStateCache();
+		} catch (Exception ex) {
+			_exception = ex;
+		}
+	}
+
+	[Test]
+	public void it_has_been_created() {
+		Assert.IsNotNull(_cache, ((object)_exception ?? "").ToString());
+	}
+
+	[Test]
+	public void state_can_be_cached() {
+		CheckpointTag at = CheckpointTag.FromPosition(0, 100, 90);
+		_cache.CacheAndLockPartitionState("partition", new PartitionState("data", null, at), at);
+	}
+
+	[Test]
+	public void no_items_are_cached() {
+		Assert.AreEqual(0, _cache.CachedItemCount);
+	}
+
+	[Test]
+	public void random_item_cannot_be_retrieved_as_locked() {
+		Assert.IsNull(
+			_cache.TryGetAndLockPartitionState(
+				"random", CheckpointTag.FromPosition(0, 200, 190)),
+			"Cache should be empty");
+	}
+
+	[Test]
+	public void random_item_cannot_be_retrieved() {
+		Assert.IsNull(_cache.TryGetPartitionState("random"), "Cache should be empty");
+	}
+
+	[Test]
+	public void root_partition_state_cannot_be_retrieved() {
+		Assert.IsNull(
+			_cache.TryGetAndLockPartitionState(
+				"", CheckpointTag.FromPosition(0, 200, 190)),
+			"Cache should be empty");
+	}
+
+	[Test]
+	public void unlock_succeeds() {
+		_cache.Unlock(CheckpointTag.FromPosition(0, 300, 290));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_the_partition_state_cache_has_been_reinitialized.cs b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_the_partition_state_cache_has_been_reinitialized.cs
new file mode 100644
index 00000000000..35bebf224de
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_the_partition_state_cache_has_been_reinitialized.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.partition_state_cache;
+
+[TestFixture]
+public class when_the_partition_state_cache_has_been_reinitialized {
+	private PartitionStateCache _cache;
+	private CheckpointTag _cachedAtCheckpointTag1;
+	private CheckpointTag _cachedAtCheckpointTag2;
+	private CheckpointTag _cachedAtCheckpointTag3;
+
+	[SetUp]
+	public void setup() {
+		//given
+		_cache = new PartitionStateCache(10);
+		_cachedAtCheckpointTag1 = CheckpointTag.FromPosition(0, 1000, 900);
+		for (var i = 0; i < 15; i++) {
+			CheckpointTag at = CheckpointTag.FromPosition(0, 1000 + (i * 100), 1000 + (i * 100) - 50);
+			_cache.CacheAndLockPartitionState("partition1", new PartitionState("data1", null, at), at);
+		}
+
+		_cachedAtCheckpointTag2 = CheckpointTag.FromPosition(0, 20100, 20050);
+		_cachedAtCheckpointTag3 = CheckpointTag.FromPosition(0, 20200, 20150);
+		_cache.CacheAndLockPartitionState(
+			"partition1", new PartitionState("data1", null, _cachedAtCheckpointTag1), _cachedAtCheckpointTag1);
+		_cache.CacheAndLockPartitionState(
+			"partition2", new PartitionState("data2", null, _cachedAtCheckpointTag2), _cachedAtCheckpointTag2);
+		_cache.CacheAndLockPartitionState(
+			"partition3", new PartitionState("data3", null, _cachedAtCheckpointTag3), _cachedAtCheckpointTag3);
+		_cache.Unlock(_cachedAtCheckpointTag2);
+		// when
+		_cache.Initialize();
+	}
+
+	[Test]
+	public void state_can_be_cached() {
+		CheckpointTag at = CheckpointTag.FromPosition(0, 100, 90);
+		_cache.CacheAndLockPartitionState("partition", new PartitionState("data", null, at), at);
+	}
+
+	[Test]
+	public void no_items_are_cached() {
+		Assert.AreEqual(0, _cache.CachedItemCount);
+	}
+
+	[Test]
+	public void random_item_cannot_be_retrieved_as_locked() {
+		Assert.IsNull(
+			_cache.TryGetAndLockPartitionState(
+				"random", CheckpointTag.FromPosition(0, 200, 190)),
+			"Cache should be empty");
+	}
+
+	[Test]
+	public void random_item_cannot_be_retrieved() {
+		Assert.IsNull(_cache.TryGetPartitionState("random"), "Cache should be empty");
+	}
+
+	[Test]
+	public void root_partition_state_cannot_be_retrieved() {
+		Assert.IsNull(
+			_cache.TryGetAndLockPartitionState(
+				"", CheckpointTag.FromPosition(0, 200, 190)),
+			"Cache should be empty");
+	}
+
+	[Test]
+	public void unlock_succeeds() {
+		_cache.Unlock(CheckpointTag.FromPosition(0, 300, 290));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_unlocking_an_overflowed_cache.cs b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_unlocking_an_overflowed_cache.cs
new file mode 100644
index 00000000000..0c3fb88a67d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_unlocking_an_overflowed_cache.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.partition_state_cache;
+
+[TestFixture]
+public class when_unlocking_an_overflowed_cache {
+	private PartitionStateCache _cache;
+	private CheckpointTag _cachedAtCheckpointTag1;
+	private CheckpointTag _cachedAtCheckpointTag2;
+	private CheckpointTag _cachedAtCheckpointTag3;
+
+	[SetUp]
+	public void setup() {
+		//given
+		_cache = new PartitionStateCache(10);
+		_cachedAtCheckpointTag1 = CheckpointTag.FromPosition(0, 1000, 900);
+		for (var i = 0; i < 15; i++) {
+			CheckpointTag at = CheckpointTag.FromPosition(0, 1000 + (i * 100), 1000 + (i * 100) - 50);
+			_cache.CacheAndLockPartitionState("partition1", new PartitionState("data1", null, at), at);
+		}
+
+		_cachedAtCheckpointTag2 = CheckpointTag.FromPosition(0, 20100, 20050);
+		_cachedAtCheckpointTag3 = CheckpointTag.FromPosition(0, 20200, 20150);
+		_cache.CacheAndLockPartitionState(
+			"partition1", new PartitionState("data1", null, _cachedAtCheckpointTag1), _cachedAtCheckpointTag1);
+		_cache.CacheAndLockPartitionState(
+			"partition2", new PartitionState("data2", null, _cachedAtCheckpointTag2), _cachedAtCheckpointTag2);
+		_cache.CacheAndLockPartitionState(
+			"partition3", new PartitionState("data3", null, _cachedAtCheckpointTag3), _cachedAtCheckpointTag3);
+		// when
+		_cache.Unlock(_cachedAtCheckpointTag2);
+	}
+
+	[Test]
+	public void partitions_locked_before_the_unlock_position_cannot_be_retrieved_as_locked() {
+		Assert.Throws<InvalidOperationException>(() => { _cache.GetLockedPartitionState("partition1"); });
+	}
+
+	[Test]
+	public void
+		the_first_partition_locked_before_the_unlock_position_cannot_be_retrieved_and_relocked_at_later_position() {
+		var data = _cache.TryGetAndLockPartitionState(
+			"partition1", CheckpointTag.FromPosition(0, 25000, 24000));
+		Assert.AreEqual("data1", data.State);
+	}
+
+	[Test]
+	public void partitions_locked_at_the_unlock_position_cannot_be_retrieved_as_locked() {
+		Assert.Throws<InvalidOperationException>(() => { _cache.GetLockedPartitionState("partition2"); });
+	}
+
+	[Test]
+	public void the_still_cached_unlocked_state_can_be_retrieved() {
+		var state = _cache.TryGetPartitionState("partition2");
+		Assert.AreEqual("data2", state.State);
+	}
+
+	[Test]
+	public void partitions_locked_at_the_unlock_position_can_be_retrieved_and_relocked_at_later_position() {
+		var data = _cache.TryGetAndLockPartitionState(
+			"partition2", CheckpointTag.FromPosition(0, 25000, 24000));
+		Assert.AreEqual("data2", data.State);
+	}
+
+	[Test]
+	public void partitions_locked_after_the_unlock_position_can_be_retrieved_as_locked() {
+		var data = _cache.GetLockedPartitionState("partition3");
+		Assert.AreEqual("data3", data.State);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_unlocking_and_forgetting_part_of_cached_states.cs b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_unlocking_and_forgetting_part_of_cached_states.cs
new file mode 100644
index 00000000000..e4b88a26f14
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_unlocking_and_forgetting_part_of_cached_states.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.partition_state_cache;
+
+[TestFixture]
+public class when_unlocking_and_forgetting_part_of_cached_states {
+	private PartitionStateCache _cache;
+	private CheckpointTag _cachedAtCheckpointTag1;
+	private CheckpointTag _cachedAtCheckpointTag2;
+	private CheckpointTag _cachedAtCheckpointTag3;
+
+	[SetUp]
+	public void setup() {
+		//given
+		_cache = new PartitionStateCache();
+		_cachedAtCheckpointTag1 = CheckpointTag.FromPosition(0, 1000, 900);
+		_cachedAtCheckpointTag2 = CheckpointTag.FromPosition(0, 1200, 1100);
+		_cachedAtCheckpointTag3 = CheckpointTag.FromPosition(0, 1400, 1300);
+		_cache.CacheAndLockPartitionState(
+			"partition1", new PartitionState("data1", null, _cachedAtCheckpointTag1), _cachedAtCheckpointTag1);
+		_cache.CacheAndLockPartitionState(
+			"partition2", new PartitionState("data2", null, _cachedAtCheckpointTag2), _cachedAtCheckpointTag2);
+		_cache.CacheAndLockPartitionState(
+			"partition3", new PartitionState("data3", null, _cachedAtCheckpointTag3), _cachedAtCheckpointTag3);
+		// when
+		_cache.Unlock(_cachedAtCheckpointTag2, forgetUnlocked: true);
+	}
+
+	[Test]
+	public void partitions_locked_before_the_unlock_position_cannot_be_retrieved_as_locked() {
+		Assert.Throws<InvalidOperationException>(() => { _cache.GetLockedPartitionState("partition1"); });
+	}
+
+	[Test]
+	public void partitions_locked_before_the_unlock_position_cannot_be_retrieved_and_relocked_at_later_position() {
+		var data = _cache.TryGetAndLockPartitionState("partition1", CheckpointTag.FromPosition(0, 1600, 1500));
+		Assert.IsNull(data);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_unlocking_part_of_cached_states.cs b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_unlocking_part_of_cached_states.cs
new file mode 100644
index 00000000000..0946a54189c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_cache/when_unlocking_part_of_cached_states.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.partition_state_cache;
+
+[TestFixture]
+public class when_unlocking_part_of_cached_states {
+	private PartitionStateCache _cache;
+	private CheckpointTag _cachedAtCheckpointTag1;
+	private CheckpointTag _cachedAtCheckpointTag2;
+	private CheckpointTag _cachedAtCheckpointTag3;
+
+	[SetUp]
+	public void setup() {
+		//given
+		_cache = new PartitionStateCache();
+		_cachedAtCheckpointTag1 = CheckpointTag.FromPosition(0, 1000, 900);
+		_cachedAtCheckpointTag2 = CheckpointTag.FromPosition(0, 1200, 1100);
+		_cachedAtCheckpointTag3 = CheckpointTag.FromPosition(0, 1400, 1300);
+		_cache.CacheAndLockPartitionState(
+			"partition1", new PartitionState("data1", null, _cachedAtCheckpointTag1), _cachedAtCheckpointTag1);
+		_cache.CacheAndLockPartitionState(
+			"partition2", new PartitionState("data2", null, _cachedAtCheckpointTag2), _cachedAtCheckpointTag2);
+		_cache.CacheAndLockPartitionState(
+			"partition3", new PartitionState("data3", null, _cachedAtCheckpointTag3), _cachedAtCheckpointTag3);
+		// when
+		_cache.Unlock(_cachedAtCheckpointTag2);
+	}
+
+	[Test]
+	public void partitions_locked_before_the_unlock_position_cannot_be_retrieved_as_locked() {
+		Assert.Throws<InvalidOperationException>(() => { _cache.GetLockedPartitionState("partition1"); });
+	}
+
+	[Test]
+	public void partitions_locked_before_the_unlock_position_can_be_retrieved_and_relocked_at_later_position() {
+		var data = _cache.TryGetAndLockPartitionState(
+			"partition1", CheckpointTag.FromPosition(0, 1600, 1500));
+		Assert.AreEqual("data1", data.State);
+	}
+
+
+	[Test]
+	public void partitions_locked_at_the_unlock_position_cannot_be_retrieved_as_locked() {
+		Assert.Throws<InvalidOperationException>(() => { _cache.GetLockedPartitionState("partition2"); });
+	}
+
+	[Test]
+	public void partitions_locked_at_the_unlock_position_cannot_be_retrieved_as_relocked_at_later_position() {
+		var data = _cache.TryGetAndLockPartitionState(
+			"partition2", CheckpointTag.FromPosition(0, 1600, 1500));
+		Assert.AreEqual("data2", data.State);
+	}
+
+	[Test]
+	public void partitions_locked_after_the_unlock_position_can_be_retrieved_as_locked() {
+		var data = _cache.GetLockedPartitionState("partition3");
+		Assert.AreEqual("data3", data.State);
+	}
+
+	[Test]
+	public void no_other_partition_states_can_be_locked_before_the_unlock_position() {
+		Assert.Throws<InvalidOperationException>(() => {
+			CheckpointTag at = CheckpointTag.FromPosition(0, 1040, 1030);
+			_cache.CacheAndLockPartitionState("partition4", new PartitionState("data4", null, at), at);
+		});
+	}
+
+	[Test]
+	public void cached_partition_states_cannot_be_locked_before_the_unlock_position() {
+		Assert.Throws<InvalidOperationException>(() => {
+			_cache.TryGetAndLockPartitionState(
+				"partition1", CheckpointTag.FromPosition(0, 1040, 1030));
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/partition_state_update_manager/FakeEventWriter.cs b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_update_manager/FakeEventWriter.cs
new file mode 100644
index 00000000000..d08277256ca
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_update_manager/FakeEventWriter.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+namespace KurrentDB.Projections.Core.Tests.Services.partition_state_update_manager;
+
+class FakeEventWriter : IEventWriter {
+	private readonly List<EmittedEvent[]> _writes = new List<EmittedEvent[]>();
+
+	public List<EmittedEvent[]> Writes {
+		get { return _writes; }
+	}
+
+	public void ValidateOrderAndEmitEvents(EmittedEventEnvelope[] events) {
+		Writes.Add(events.Select(v => v.Event).ToArray());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/partition_state_update_manager/when_created.cs b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_update_manager/when_created.cs
new file mode 100644
index 00000000000..40c87a60345
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_update_manager/when_created.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.partition_state_update_manager;
+
+[TestFixture]
+public class when_created {
+	private PartitionStateUpdateManager _updateManager;
+
+	[SetUp]
+	public void setup() {
+		_updateManager = new PartitionStateUpdateManager(ProjectionNamesBuilder.CreateForTest("projection"));
+	}
+
+	[Test]
+	public void handles_state_updated() {
+		_updateManager.StateUpdated("partition",
+			new PartitionState("state", null, CheckpointTag.FromPosition(0, 100, 50)),
+			CheckpointTag.FromPosition(0, 200, 150));
+	}
+
+	[Test]
+	public void emit_events_does_not_write_any_events() {
+		_updateManager.EmitEvents(new FakeEventWriter());
+	}
+
+	class FakeEventWriter : IEventWriter {
+		public void ValidateOrderAndEmitEvents(EmittedEventEnvelope[] events) {
+			Assert.Fail("Should not write any events");
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/partition_state_update_manager/when_creating.cs b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_update_manager/when_creating.cs
new file mode 100644
index 00000000000..dd9ace5d591
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_update_manager/when_creating.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.partition_state_update_manager;
+
+[TestFixture]
+public class when_creating {
+	[Test]
+	public void no_exceptions_are_thrown() {
+		new PartitionStateUpdateManager(ProjectionNamesBuilder.CreateForTest("projection"));
+	}
+
+	[Test]
+	public void null_naming_builder_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => { new PartitionStateUpdateManager(null); });
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/partition_state_update_manager/when_state_updated.cs b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_update_manager/when_state_updated.cs
new file mode 100644
index 00000000000..d14727dc241
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_update_manager/when_state_updated.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.partition_state_update_manager;
+
+[TestFixture]
+public class when_state_updated {
+	private PartitionStateUpdateManager _updateManager;
+	private CheckpointTag _zero = CheckpointTag.FromPosition(0, 100, 50);
+	private CheckpointTag _one = CheckpointTag.FromPosition(0, 200, 150);
+	private CheckpointTag _two = CheckpointTag.FromPosition(0, 300, 250);
+
+	[SetUp]
+	public void setup() {
+		_updateManager = new PartitionStateUpdateManager(ProjectionNamesBuilder.CreateForTest("projection"));
+		_updateManager.StateUpdated("partition", new PartitionState("{\"state\":1}", null, _one), _zero);
+	}
+
+	[Test]
+	public void handles_state_updated_for_the_same_partition() {
+		_updateManager.StateUpdated("partition", new PartitionState("{\"state\":1}", null, _two), _one);
+	}
+
+	[Test]
+	public void handles_state_updated_for_another_partition() {
+		_updateManager.StateUpdated("partition", new PartitionState("{\"state\":1}", null, _two), _one);
+	}
+
+	[Test]
+	public void emit_events_writes_single_state_updated_event() {
+		var eventWriter = new FakeEventWriter();
+		_updateManager.EmitEvents(eventWriter);
+		Assert.AreEqual(1, eventWriter.Writes.Count);
+		Assert.AreEqual(1, eventWriter.Writes[0].Length);
+	}
+
+	[Test]
+	public void emit_events_writes_correct_state_data() {
+		var eventWriter = new FakeEventWriter();
+		_updateManager.EmitEvents(eventWriter);
+		EmittedEvent @event = eventWriter.Writes[0][0];
+		Assert.AreEqual("[{\"state\":1}]", @event.Data);
+	}
+
+	[Test]
+	public void emit_events_writes_event_with_correct_caused_by_tag() {
+		var eventWriter = new FakeEventWriter();
+		_updateManager.EmitEvents(eventWriter);
+		EmittedEvent @event = eventWriter.Writes[0][0];
+		Assert.AreEqual(_one, @event.CausedByTag);
+	}
+
+	[Test]
+	public void emit_events_writes_event_with_correct_expected_tag() {
+		var eventWriter = new FakeEventWriter();
+		_updateManager.EmitEvents(eventWriter);
+		EmittedEvent @event = eventWriter.Writes[0][0];
+		Assert.AreEqual(_zero, @event.ExpectedTag);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/partition_state_update_manager/when_state_updated_twice.cs b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_update_manager/when_state_updated_twice.cs
new file mode 100644
index 00000000000..dd6d7fbca5c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_update_manager/when_state_updated_twice.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.partition_state_update_manager;
+
+[TestFixture]
+public class when_state_updated_twice {
+	private PartitionStateUpdateManager _updateManager;
+	private CheckpointTag _zero = CheckpointTag.FromPosition(0, 100, 50);
+	private CheckpointTag _one = CheckpointTag.FromPosition(0, 200, 150);
+	private CheckpointTag _two = CheckpointTag.FromPosition(0, 300, 250);
+	private CheckpointTag _three = CheckpointTag.FromPosition(0, 400, 350);
+
+	[SetUp]
+	public void setup() {
+		_updateManager = new PartitionStateUpdateManager(ProjectionNamesBuilder.CreateForTest("projection"));
+		_updateManager.StateUpdated("partition", new PartitionState("{\"state\":1}", null, _one), _zero);
+		_updateManager.StateUpdated("partition", new PartitionState("{\"state\":2}", null, _two), _one);
+	}
+
+	[Test]
+	public void handles_state_updated_for_the_same_partition() {
+		_updateManager.StateUpdated("partition", new PartitionState("{\"state\":1}", null, _three), _two);
+	}
+
+	[Test]
+	public void handles_state_updated_for_another_partition() {
+		_updateManager.StateUpdated("partition", new PartitionState("{\"state\":1}", null, _three), _two);
+	}
+
+	[Test]
+	public void emit_events_writes_single_state_updated_event() {
+		var eventWriter = new FakeEventWriter();
+		_updateManager.EmitEvents(eventWriter);
+		Assert.AreEqual(1, eventWriter.Writes.Count);
+		Assert.AreEqual(1, eventWriter.Writes[0].Length);
+	}
+
+	[Test]
+	public void emit_events_writes_correct_state_data() {
+		var eventWriter = new FakeEventWriter();
+		_updateManager.EmitEvents(eventWriter);
+		EmittedEvent @event = eventWriter.Writes[0][0];
+		Assert.AreEqual("[{\"state\":2}]", @event.Data);
+	}
+
+	[Test]
+	public void emit_events_writes_event_with_correct_caused_by_tag() {
+		var eventWriter = new FakeEventWriter();
+		_updateManager.EmitEvents(eventWriter);
+		EmittedEvent @event = eventWriter.Writes[0][0];
+		Assert.AreEqual(_two, @event.CausedByTag);
+	}
+
+	[Test]
+	public void emit_events_writes_event_with_correct_expected_tag() {
+		var eventWriter = new FakeEventWriter();
+		_updateManager.EmitEvents(eventWriter);
+		EmittedEvent @event = eventWriter.Writes[0][0];
+		Assert.AreEqual(_zero, @event.ExpectedTag);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/partition_state_update_manager/when_two_states_were_updated.cs b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_update_manager/when_two_states_were_updated.cs
new file mode 100644
index 00000000000..bb76d002fae
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/partition_state_update_manager/when_two_states_were_updated.cs
@@ -0,0 +1,86 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.partition_state_update_manager;
+
+[TestFixture]
+public class when_two_states_were_updated {
+	private PartitionStateUpdateManager _updateManager;
+	private readonly CheckpointTag _zero = CheckpointTag.FromPosition(0, 100, 50);
+	private readonly CheckpointTag _one = CheckpointTag.FromPosition(0, 200, 150);
+	private readonly CheckpointTag _two = CheckpointTag.FromPosition(0, 300, 250);
+	private readonly CheckpointTag _three = CheckpointTag.FromPosition(0, 400, 350);
+
+	[SetUp]
+	public void setup() {
+		_updateManager = new PartitionStateUpdateManager(ProjectionNamesBuilder.CreateForTest("projection"));
+		_updateManager.StateUpdated("partition1", new PartitionState("{\"state\":1}", null, _one), _zero);
+		_updateManager.StateUpdated("partition2", new PartitionState("{\"state\":2}", null, _two), _zero);
+	}
+
+	[Test]
+	public void handles_state_updated_for_the_same_partition() {
+		_updateManager.StateUpdated("partition1", new PartitionState("{\"state\":0}", null, _three), _two);
+	}
+
+	[Test]
+	public void handles_state_updated_for_another_partition() {
+		_updateManager.StateUpdated("partition3", new PartitionState("{\"state\":0}", null, _three), _two);
+	}
+
+	[Test]
+	public void emit_events_writes_both_state_updated_event() {
+		var eventWriter = new FakeEventWriter();
+		_updateManager.EmitEvents(eventWriter);
+		Assert.AreEqual(2, (eventWriter.Writes.SelectMany(write => write)).Count());
+	}
+
+	[Test]
+	public void emit_events_writes_to_correct_streams() {
+		var eventWriter = new FakeEventWriter();
+		_updateManager.EmitEvents(eventWriter);
+		var events = eventWriter.Writes.SelectMany(write => write).ToArray();
+		Assert.IsTrue(events.Any((v => "$projections-projection-partition1-checkpoint" == v.StreamId)));
+		Assert.IsTrue(events.Any((v => "$projections-projection-partition2-checkpoint" == v.StreamId)));
+	}
+
+	[Test]
+	public void emit_events_writes_correct_state_data() {
+		var eventWriter = new FakeEventWriter();
+		_updateManager.EmitEvents(eventWriter);
+		var events = eventWriter.Writes.SelectMany(write => write).ToArray();
+		var event1 = events.Single(v => "$projections-projection-partition1-checkpoint" == v.StreamId);
+		var event2 = events.Single(v => "$projections-projection-partition2-checkpoint" == v.StreamId);
+
+		Assert.AreEqual("[{\"state\":1}]", event1.Data);
+		Assert.AreEqual("[{\"state\":2}]", event2.Data);
+	}
+
+	[Test]
+	public void emit_events_writes_event_with_correct_caused_by_tag() {
+		var eventWriter = new FakeEventWriter();
+		_updateManager.EmitEvents(eventWriter);
+		var events = eventWriter.Writes.SelectMany(write => write).ToArray();
+		var event1 = events.Single(v => "$projections-projection-partition1-checkpoint" == v.StreamId);
+		var event2 = events.Single(v => "$projections-projection-partition2-checkpoint" == v.StreamId);
+		Assert.AreEqual(_one, event1.CausedByTag);
+		Assert.AreEqual(_two, event2.CausedByTag);
+	}
+
+	[Test]
+	public void emit_events_writes_event_with_correct_expected_tag() {
+		var eventWriter = new FakeEventWriter();
+		_updateManager.EmitEvents(eventWriter);
+		var events = eventWriter.Writes.SelectMany(write => write).ToArray();
+		var event1 = events.Single(v => "$projections-projection-partition1-checkpoint" == v.StreamId);
+		var event2 = events.Single(v => "$projections-projection-partition2-checkpoint" == v.StreamId);
+		Assert.AreEqual(_zero, event1.ExpectedTag);
+		Assert.AreEqual(_zero, event2.ExpectedTag);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/paused_at_event_distribution_point.cs b/src/KurrentDB.Projections.Core.Tests/Services/paused_at_event_distribution_point.cs
new file mode 100644
index 00000000000..b9d5b43b1b1
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/paused_at_event_distribution_point.cs
@@ -0,0 +1,3 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/event_by_type_index_position_tagger.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/event_by_type_index_position_tagger.cs
new file mode 100644
index 00000000000..180cd3d506a
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/event_by_type_index_position_tagger.cs
@@ -0,0 +1,244 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.EventByType;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.event_by_type_index_position_tagger;
+
+[TestFixture]
+public class event_by_type_index_position_tagger {
+	private ReaderSubscriptionMessage.CommittedEventDistributed _zeroEvent;
+	private ReaderSubscriptionMessage.CommittedEventDistributed _firstEvent;
+	private ReaderSubscriptionMessage.CommittedEventDistributed _secondEvent;
+	private ReaderSubscriptionMessage.CommittedEventDistributed _thirdEvent;
+
+	[SetUp]
+	public void setup() {
+		_zeroEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+			Guid.NewGuid(), new TFPos(-1, 120), new TFPos(20, 10), "$et-type1", 0, "stream1", 0, true,
+			Guid.NewGuid(), "type1", true, Helper.UTF8NoBom.GetBytes("{}"), new byte[0], null, 10f);
+
+		_firstEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+			Guid.NewGuid(), new TFPos(-1, 130), new TFPos(30, 20), "$et-type2", 0, "stream1", 1, true,
+			Guid.NewGuid(), "type2", true, Helper.UTF8NoBom.GetBytes("{}"), new byte[0], null, 20f);
+
+		_secondEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+			Guid.NewGuid(), new TFPos(-1, 140), new TFPos(50, 40), "$et-type1", 1, "stream2", 0, false,
+			Guid.NewGuid(), "type1", true, Helper.UTF8NoBom.GetBytes("{}"), new byte[0], null, 30f);
+
+		_thirdEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+			Guid.NewGuid(), new TFPos(-1, 150), new TFPos(70, 60), "$et-type2", 1, "stream2", 1, false,
+			Guid.NewGuid(), "type2", true, Helper.UTF8NoBom.GetBytes("{}"), new byte[0], null, 40f);
+	}
+
+	[Test]
+	public void can_be_created() {
+		var t = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		new PositionTracker(t);
+	}
+
+	[Test]
+	public void is_message_after_checkpoint_tag_after_case() {
+		var t = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		var result =
+			t.IsMessageAfterCheckpointTag(
+				CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(10, 5),
+					new Dictionary<string, long> { { "type1", 0 }, { "type2", -1 } }), _firstEvent);
+		Assert.IsTrue(result);
+	}
+
+	[Test]
+	public void is_message_after_checkpoint_tag_tf_only_after_case() {
+		var t = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		var result =
+			t.IsMessageAfterCheckpointTag(
+				CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(10, 5),
+					new Dictionary<string, long> { { "type1", 0 }, { "type2", 0 } }), _firstEvent);
+		Assert.IsTrue(result);
+	}
+
+	[Test]
+	public void is_message_after_checkpoint_tag_before_case() {
+		var t = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		var result =
+			t.IsMessageAfterCheckpointTag(
+				CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(40, 35),
+					new Dictionary<string, long> { { "type1", 2 }, { "type2", 2 } }),
+				_firstEvent);
+		Assert.IsFalse(result);
+	}
+
+	[Test]
+	public void is_message_after_checkpoint_tag_tf_only_before_case() {
+		var t = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		var result =
+			t.IsMessageAfterCheckpointTag(
+				CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(40, 35),
+					new Dictionary<string, long> { { "type1", 0 }, { "type2", 0 } }),
+				_firstEvent);
+		Assert.IsFalse(result);
+	}
+
+	[Test]
+	public void is_message_after_checkpoint_tag_equal_case() {
+		var t = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		var result =
+			t.IsMessageAfterCheckpointTag(
+				CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(30, 20),
+					new Dictionary<string, long> { { "type1", 0 }, { "type2", 0 } }),
+				_firstEvent);
+		Assert.IsFalse(result);
+	}
+
+	[Test]
+	public void is_message_after_checkpoint_tag_tf_only_equal_case() {
+		var t = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		var result =
+			t.IsMessageAfterCheckpointTag(
+				CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(30, 20),
+					new Dictionary<string, long> { { "type1", -1 }, { "type2", -1 } }),
+				_firstEvent);
+		Assert.IsFalse(result);
+	}
+
+	[Test]
+	public void is_message_after_checkpoint_tag_incompatible_streams_case() {
+		var t = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		var result =
+			t.IsMessageAfterCheckpointTag(
+				CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(30, 20),
+					new Dictionary<string, long> { { "type1", -1 }, { "type3", -1 } }),
+				_firstEvent);
+		Assert.IsFalse(result);
+	}
+
+
+	[Test]
+	public void null_streams_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => { new EventByTypeIndexPositionTagger(0, null); });
+	}
+
+	[Test]
+	public void empty_streams_throws_argument_exception() {
+		Assert.Throws<ArgumentException>(() => { new EventByTypeIndexPositionTagger(0, new string[] { }); });
+	}
+
+	[Test]
+	public void position_checkpoint_tag_is_incompatible() {
+		var t = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		Assert.IsFalse(t.IsCompatible(CheckpointTag.FromPosition(0, 1000, 500)));
+	}
+
+	[Test]
+	public void streams_checkpoint_tag_is_incompatible() {
+		var t = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		Assert.IsFalse(
+			t.IsCompatible(
+				CheckpointTag.FromStreamPositions(0,
+					new Dictionary<string, long> { { "$et-type1", 100 }, { "$et-type2", 150 } })));
+	}
+
+	[Test]
+	public void another_events_checkpoint_tag_is_compatible() {
+		var t = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		Assert.IsFalse(
+			t.IsCompatible(
+				CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(100, 50),
+					new Dictionary<string, long> { { "type1", 100 }, { "type3", 150 } })));
+	}
+
+	[Test]
+	public void the_same_events_checkpoint_tag_is_compatible() {
+		var t = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		Assert.IsTrue(
+			t.IsCompatible(
+				CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(100, 50),
+					new Dictionary<string, long> { { "type1", 100 }, { "type2", 150 } })));
+	}
+
+	[Test]
+	public void adjust_compatible_tag_returns_the_same_tag() {
+		var t = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		var tag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(100, 50),
+			new Dictionary<string, long> { { "type1", 1 }, { "type2", 2 } });
+		Assert.AreEqual(tag, t.AdjustTag(tag));
+	}
+
+	[Test]
+	public void can_adjust_tf_position_tag() {
+		var t = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		var tag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(100, 50),
+			new Dictionary<string, long> { { "type1", 1 }, { "type2", 2 } });
+		var original = CheckpointTag.FromPosition(0, 100, 50);
+		Assert.AreEqual(tag, t.AdjustTag(original));
+	}
+
+	[Test]
+	public void zero_position_tag_is_before_first_event_possible() {
+		var t = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		var zero = t.MakeZeroCheckpointTag();
+
+		var zeroFromEvent = t.MakeCheckpointTag(zero, _zeroEvent);
+
+		Assert.IsTrue(zeroFromEvent > zero);
+	}
+
+	[Test]
+	public void can_update_by_tf_event_if_with_prior_index_position() {
+		var t = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		var linkEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+			Guid.NewGuid(), new TFPos(180, 170), "$et-type2", 1, false, Guid.NewGuid(), "$>", false,
+			Helper.UTF8NoBom.GetBytes("0@stream2"), new byte[0]);
+		var tag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(70, 60),
+			new Dictionary<string, long> { { "type1", 2 }, { "type2", 2 } });
+		var updated = t.MakeCheckpointTag(tag, linkEvent);
+		Assert.AreEqual(new TFPos(180, 170), updated.Position);
+		Assert.AreEqual(2, updated.Streams["type1"]);
+		Assert.AreEqual(2, updated.Streams["type2"]);
+	}
+
+	[Test]
+	public void cannot_update_by_prior_tf_position() {
+		var t = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		var linkEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+			Guid.NewGuid(), new TFPos(180, 170), "$et-type2", 1, false, Guid.NewGuid(), "$>", false,
+			Helper.UTF8NoBom.GetBytes("0@stream2"), new byte[0]);
+		var tag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(270, 260),
+			new Dictionary<string, long> { { "type1", 2 }, { "type2", 2 } });
+		Assert.Throws<InvalidOperationException>(() => { t.MakeCheckpointTag(tag, linkEvent); });
+	}
+
+	[Test]
+	public void produced_checkpoint_tags_are_correctly_ordered() {
+		var t = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		var zero = t.MakeZeroCheckpointTag();
+
+		var zeroEvent = t.MakeCheckpointTag(zero, _zeroEvent);
+		var zeroEvent2 = t.MakeCheckpointTag(zeroEvent, _zeroEvent);
+		var first = t.MakeCheckpointTag(zeroEvent2, _firstEvent);
+		var second = t.MakeCheckpointTag(first, _secondEvent);
+		var second2 = t.MakeCheckpointTag(zeroEvent, _secondEvent);
+		var third = t.MakeCheckpointTag(second, _thirdEvent);
+
+		Assert.IsTrue(zeroEvent > zero);
+		Assert.IsTrue(first > zero);
+		Assert.IsTrue(second > first);
+
+		Assert.AreEqual(zeroEvent2, zeroEvent);
+		Assert.AreEqual(second, second2); // strong order (by tf)
+		Assert.IsTrue(second2 > zeroEvent);
+		Assert.IsTrue(second2 > first);
+
+		Assert.IsTrue(third > second);
+		Assert.IsTrue(third > first);
+		Assert.IsTrue(third > zeroEvent);
+		Assert.IsTrue(third > zero);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_creating_event_by_type_index_position_tracker.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_creating_event_by_type_index_position_tracker.cs
new file mode 100644
index 00000000000..9327464fc0a
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_creating_event_by_type_index_position_tracker.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.EventByType;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.event_by_type_index_position_tagger;
+
+[TestFixture]
+public class when_creating_event_by_type_index_position_tracker {
+	private EventByTypeIndexPositionTagger _tagger;
+	private PositionTracker _positionTracker;
+
+	[SetUp]
+	public void when() {
+		_tagger = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		_positionTracker = new PositionTracker(_tagger);
+	}
+
+	[Test]
+	public void it_can_be_updated_with_correct_event_types() {
+		// even not initialized (UpdateToZero can be removed)
+		var newTag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(100, 50),
+			new Dictionary<string, long> { { "type1", 10 }, { "type2", 20 } });
+		_positionTracker.UpdateByCheckpointTagInitial(newTag);
+	}
+
+	[Test]
+	public void it_cannot_be_updated_with_other_event_types() {
+		var newTag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(100, 50),
+			new Dictionary<string, long> { { "type1", 10 }, { "type3", 20 } });
+		Assert.Throws<InvalidOperationException>(() => { _positionTracker.UpdateByCheckpointTagInitial(newTag); });
+	}
+
+	[Test]
+	public void it_cannot_be_updated_forward() {
+		var newTag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(100, 50),
+			new Dictionary<string, long> { { "type1", 10 }, { "type2", 20 } });
+		Assert.Throws<InvalidOperationException>(() => { _positionTracker.UpdateByCheckpointTagForward(newTag); });
+	}
+
+	[Test]
+	public void initial_position_cannot_be_set_twice() {
+		Assert.Throws<InvalidOperationException>(() => {
+			var newTag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(100, 50),
+				new Dictionary<string, long> { { "type1", 10 }, { "type2", 20 } });
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+		});
+	}
+
+	[Test]
+	public void it_can_be_updated_to_zero() {
+		_positionTracker.UpdateByCheckpointTagInitial(_tagger.MakeZeroCheckpointTag());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_updating_event_by_type_index_position_tracker_from_a_tag.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_updating_event_by_type_index_position_tracker_from_a_tag.cs
new file mode 100644
index 00000000000..aafe102f3dd
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_updating_event_by_type_index_position_tracker_from_a_tag.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.EventByType;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.event_by_type_index_position_tagger;
+
+[TestFixture]
+public class when_updating_event_by_type_index_position_tracker_from_a_tag {
+	private EventByTypeIndexPositionTagger _tagger;
+	private CheckpointTag _tag;
+	private PositionTracker _positionTracker;
+
+	[SetUp]
+	public void When() {
+		// given
+		var tagger = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		var tracker = new PositionTracker(tagger);
+
+		var newTag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(10, 5),
+			new Dictionary<string, long> { { "type1", 1 }, { "type2", 2 } });
+
+		tracker.UpdateByCheckpointTagInitial(newTag);
+		_tag = tracker.LastTag;
+		_tagger = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		_positionTracker = new PositionTracker(_tagger);
+		// when
+
+		_positionTracker.UpdateByCheckpointTagInitial(_tag);
+	}
+
+	[Test]
+	public void stream_position_is_updated() {
+		Assert.AreEqual(1, _positionTracker.LastTag.Streams["type1"]);
+		Assert.AreEqual(2, _positionTracker.LastTag.Streams["type2"]);
+	}
+
+	[Test]
+	public void tf_stream_position_is_updated() {
+		Assert.AreEqual(new TFPos(10, 5), _positionTracker.LastTag.Position);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_updating_event_by_type_index_position_tracker_to_zero.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_updating_event_by_type_index_position_tracker_to_zero.cs
new file mode 100644
index 00000000000..d2eef0706ef
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_updating_event_by_type_index_position_tracker_to_zero.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.EventByType;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.event_by_type_index_position_tagger;
+
+[TestFixture]
+public class when_updating_event_by_type_index_position_tracker_to_zero {
+	private EventByTypeIndexPositionTagger _tagger;
+	private PositionTracker _positionTracker;
+
+	[SetUp]
+	public void When() {
+		_tagger = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		_positionTracker = new PositionTracker(_tagger);
+		// when
+
+		_positionTracker.UpdateByCheckpointTagInitial(_tagger.MakeZeroCheckpointTag());
+	}
+
+	[Test]
+	public void streams_are_set_up() {
+		Assert.Contains("type1", _positionTracker.LastTag.Streams.Keys);
+		Assert.Contains("type2", _positionTracker.LastTag.Streams.Keys);
+	}
+
+	[Test]
+	public void stream_position_is_minus_one() {
+		Assert.AreEqual(ExpectedVersion.NoStream, _positionTracker.LastTag.Streams["type1"]);
+		Assert.AreEqual(ExpectedVersion.NoStream, _positionTracker.LastTag.Streams["type2"]);
+	}
+
+	[Test]
+	public void tf_position_is_zero() {
+		Assert.AreEqual(new TFPos(0, -1), _positionTracker.LastTag.Position);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_updating_postion_event_by_type_index_position_tracker.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_updating_postion_event_by_type_index_position_tracker.cs
new file mode 100644
index 00000000000..68c188c90c6
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/event_by_type_index_position_tagger/when_updating_postion_event_by_type_index_position_tracker.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.EventByType;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.event_by_type_index_position_tagger;
+
+[TestFixture]
+public class when_updating_postion_event_by_type_index_position_tracker {
+	private EventByTypeIndexPositionTagger _tagger;
+	private PositionTracker _positionTracker;
+
+	[SetUp]
+	public void When() {
+		// given
+		_tagger = new EventByTypeIndexPositionTagger(0, new[] { "type1", "type2" });
+		_positionTracker = new PositionTracker(_tagger);
+		var newTag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(10, 5),
+			new Dictionary<string, long> { { "type1", 1 }, { "type2", 2 } });
+		var newTag2 = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(20, 15),
+			new Dictionary<string, long> { { "type1", 1 }, { "type2", 3 } });
+		_positionTracker.UpdateByCheckpointTagInitial(newTag);
+		_positionTracker.UpdateByCheckpointTagForward(newTag2);
+	}
+
+	[Test]
+	public void stream_position_is_updated() {
+		Assert.AreEqual(1, _positionTracker.LastTag.Streams["type1"]);
+		Assert.AreEqual(3, _positionTracker.LastTag.Streams["type2"]);
+	}
+
+	[Test]
+	public void tf_position_is_updated() {
+		Assert.AreEqual(new TFPos(20, 15), _positionTracker.LastTag.Position);
+	}
+
+	[Test]
+	public void cannot_update_to_the_same_position() {
+		var newTag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(20, 15),
+			new Dictionary<string, long> { { "type1", 1 }, { "type2", 3 } });
+		Assert.Throws<InvalidOperationException>(() => { _positionTracker.UpdateByCheckpointTagForward(newTag); });
+	}
+
+	[Test]
+	public void can_update_to_the_same_index_position_but_tf() {
+		var newTag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(30, 25),
+			new Dictionary<string, long> { { "type1", 1 }, { "type2", 3 } });
+		_positionTracker.UpdateByCheckpointTagForward(newTag);
+	}
+
+	[Test]
+	public void it_cannot_be_updated_with_other_stream() {
+		// even not initialized (UpdateToZero can be removed)
+		var newTag = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(30, 25),
+			new Dictionary<string, long> { { "type1", 1 }, { "type3", 3 } });
+		Assert.Throws<InvalidOperationException>(() => { _positionTracker.UpdateByCheckpointTagForward(newTag); });
+	}
+
+	//TODO: write tests on updating with incompatible snapshot loaded
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/multistream_position_tagger.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/multistream_position_tagger.cs
new file mode 100644
index 00000000000..e71d62892b6
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/multistream_position_tagger.cs
@@ -0,0 +1,174 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.multistream_position_tagger;
+
+[TestFixture]
+public class multistream_position_tagger {
+	private ReaderSubscriptionMessage.CommittedEventDistributed _zeroEvent;
+	private ReaderSubscriptionMessage.CommittedEventDistributed _firstEvent;
+	private ReaderSubscriptionMessage.CommittedEventDistributed _secondEvent;
+	private ReaderSubscriptionMessage.CommittedEventDistributed _thirdEvent;
+
+	[SetUp]
+	public void setup() {
+		_zeroEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+			Guid.NewGuid(), new TFPos(10, 0), "stream1", 0, false, Guid.NewGuid(), "StreamCreated", false,
+			new byte[0], new byte[0]);
+		_firstEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+			Guid.NewGuid(), new TFPos(30, 20), "stream1", 1, false, Guid.NewGuid(), "Data", true,
+			Helper.UTF8NoBom.GetBytes("{}"), new byte[0]);
+		_secondEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+			Guid.NewGuid(), new TFPos(50, 40), "stream2", 0, false, Guid.NewGuid(), "StreamCreated", false,
+			new byte[0], new byte[0]);
+		_thirdEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+			Guid.NewGuid(), new TFPos(70, 60), "stream2", 1, false, Guid.NewGuid(), "Data", true,
+			Helper.UTF8NoBom.GetBytes("{}"), new byte[0]);
+	}
+
+	[Test]
+	public void can_be_created() {
+		var t = new MultiStreamPositionTagger(0, new[] { "stream1", "stream2" });
+		new PositionTracker(t);
+	}
+
+	[Test]
+	public void is_message_after_checkpoint_tag_after_case() {
+		var t = new MultiStreamPositionTagger(0, new[] { "stream1", "stream2" });
+		var result =
+			t.IsMessageAfterCheckpointTag(
+				CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "stream1", 0 }, { "stream2", 0 } }),
+				_firstEvent);
+		Assert.IsTrue(result);
+	}
+
+	[Test]
+	public void is_message_after_checkpoint_tag_before_case() {
+		var t = new MultiStreamPositionTagger(0, new[] { "stream1", "stream2" });
+		var result =
+			t.IsMessageAfterCheckpointTag(
+				CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "stream1", 2 }, { "stream2", 2 } }),
+				_firstEvent);
+		Assert.IsFalse(result);
+	}
+
+	[Test]
+	public void is_message_after_checkpoint_tag_equal_case() {
+		var t = new MultiStreamPositionTagger(0, new[] { "stream1", "stream2" });
+		var result =
+			t.IsMessageAfterCheckpointTag(
+				CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "stream1", 1 }, { "stream2", 1 } }),
+				_firstEvent);
+		Assert.IsFalse(result);
+	}
+
+	[Test]
+	public void is_message_after_checkpoint_tag_incompatible_streams_case() {
+		var t = new MultiStreamPositionTagger(0, new[] { "stream-other", "stream2" });
+		var result =
+			t.IsMessageAfterCheckpointTag(
+				CheckpointTag.FromStreamPositions(0,
+					new Dictionary<string, long> { { "stream-other", 0 }, { "stream2", 0 } }),
+				_firstEvent);
+		Assert.IsFalse(result);
+	}
+
+
+	[Test]
+	public void null_streams_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => { new MultiStreamPositionTagger(0, null); });
+	}
+
+	[Test]
+	public void empty_streams_throws_argument_exception() {
+		Assert.Throws<ArgumentException>(() => { new MultiStreamPositionTagger(0, new string[] { }); });
+	}
+
+	[Test]
+	public void position_checkpoint_tag_is_incompatible() {
+		var t = new MultiStreamPositionTagger(0, new[] { "stream1", "stream2" });
+		Assert.IsFalse(t.IsCompatible(CheckpointTag.FromPosition(0, 1000, 500)));
+	}
+
+	[Test]
+	public void another_streams_checkpoint_tag_is_incompatible() {
+		var t = new MultiStreamPositionTagger(0, new[] { "stream1", "stream2" });
+		Assert.IsFalse(
+			t.IsCompatible(
+				CheckpointTag.FromStreamPositions(0,
+					new Dictionary<string, long> { { "stream2", 100 }, { "stream3", 150 } })));
+	}
+
+	[Test]
+	public void the_same_stream_checkpoint_tag_is_compatible() {
+		var t = new MultiStreamPositionTagger(0, new[] { "stream1", "stream2" });
+		Assert.IsTrue(
+			t.IsCompatible(
+				CheckpointTag.FromStreamPositions(0,
+					new Dictionary<string, long> { { "stream1", 100 }, { "stream2", 150 } })));
+	}
+
+	[Test]
+	public void adjust_compatible_tag_returns_the_same_tag() {
+		var t = new MultiStreamPositionTagger(0, new[] { "stream1", "stream2" });
+		var tag = CheckpointTag.FromStreamPositions(0,
+			new Dictionary<string, long> { { "stream1", 1 }, { "stream2", 2 } });
+		Assert.AreEqual(tag, t.AdjustTag(tag));
+	}
+
+	[Test]
+	public void can_adjust_stream_position_tag() {
+		var t = new MultiStreamPositionTagger(0, new[] { "stream1", "stream2" });
+		var tag = CheckpointTag.FromStreamPositions(0,
+			new Dictionary<string, long> { { "stream1", 1 }, { "stream2", -1 } });
+		var original = CheckpointTag.FromStreamPosition(0, "stream1", 1);
+		Assert.AreEqual(tag, t.AdjustTag(original));
+	}
+
+	[Test]
+	public void zero_position_tag_is_before_first_event_possible() {
+		var t = new MultiStreamPositionTagger(0, new[] { "stream1", "stream2" });
+		var zero = t.MakeZeroCheckpointTag();
+
+		var zeroFromEvent = t.MakeCheckpointTag(zero, _zeroEvent);
+
+		Assert.IsTrue(zeroFromEvent > zero);
+	}
+
+	[Test]
+	public void produced_checkpoint_tags_are_correctly_ordered() {
+		var t = new MultiStreamPositionTagger(0, new[] { "stream1", "stream2" });
+		var zero = t.MakeZeroCheckpointTag();
+
+		var zeroEvent = t.MakeCheckpointTag(zero, _zeroEvent);
+		var zeroEvent2 = t.MakeCheckpointTag(zeroEvent, _zeroEvent);
+		var first = t.MakeCheckpointTag(zeroEvent2, _firstEvent);
+		var second = t.MakeCheckpointTag(first, _secondEvent);
+		var second2 = t.MakeCheckpointTag(zeroEvent, _secondEvent);
+		var third = t.MakeCheckpointTag(second, _thirdEvent);
+
+		Assert.IsTrue(zeroEvent > zero);
+		Assert.IsTrue(first > zero);
+		Assert.IsTrue(second > first);
+
+		Assert.AreEqual(zeroEvent2, zeroEvent);
+		Assert.AreNotEqual(second, second2);
+		Assert.IsTrue(second2 > zeroEvent);
+		Assert.Throws<InvalidOperationException>(() => TestHelper.Consume(second2 > first));
+
+		Assert.IsTrue(third > second);
+		Assert.IsTrue(third > first);
+		Assert.IsTrue(third > zeroEvent);
+		Assert.IsTrue(third > zero);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_creating_multistream_postion_tracker.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_creating_multistream_postion_tracker.cs
new file mode 100644
index 00000000000..cf369419c07
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_creating_multistream_postion_tracker.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.multistream_position_tagger;
+
+[TestFixture]
+public class when_creating_multistream_postion_tracker {
+	private MultiStreamPositionTagger _tagger;
+	private PositionTracker _positionTracker;
+
+	[SetUp]
+	public void when() {
+		_tagger = new MultiStreamPositionTagger(0, new[] { "stream1", "stream2" });
+		_positionTracker = new PositionTracker(_tagger);
+	}
+
+	[Test]
+	public void it_can_be_updated_with_correct_streams() {
+		// even not initialized (UpdateToZero can be removed)
+		var newTag =
+			CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "stream1", 10 }, { "stream2", 20 } });
+		_positionTracker.UpdateByCheckpointTagInitial(newTag);
+	}
+
+	[Test]
+	public void it_cannot_be_updated_with_other_streams() {
+		Assert.Throws<InvalidOperationException>(() => {
+			var newTag = CheckpointTag.FromStreamPositions(0,
+				new Dictionary<string, long> { { "stream1", 10 }, { "stream3", 20 } });
+			_positionTracker.UpdateByCheckpointTagInitial(newTag);
+		});
+	}
+
+	[Test]
+	public void it_cannot_be_updated_forward() {
+		Assert.Throws<InvalidOperationException>(() => {
+			var newTag = CheckpointTag.FromStreamPositions(0,
+				new Dictionary<string, long> { { "stream1", 10 }, { "stream2", 20 } });
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+		});
+	}
+
+	[Test]
+	public void initial_position_cannot_be_set_twice() {
+		Assert.Throws<InvalidOperationException>(() => {
+			var newTag = CheckpointTag.FromStreamPositions(0,
+				new Dictionary<string, long> { { "stream1", 10 }, { "stream2", 20 } });
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+		});
+	}
+
+	[Test]
+	public void it_can_be_updated_to_zero() {
+		_positionTracker.UpdateByCheckpointTagInitial(_tagger.MakeZeroCheckpointTag());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_updating_multistream_postion_tracker_from_a_tag.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_updating_multistream_postion_tracker_from_a_tag.cs
new file mode 100644
index 00000000000..a1bda36ec74
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_updating_multistream_postion_tracker_from_a_tag.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.multistream_position_tagger;
+
+[TestFixture]
+public class when_updating_multistream_postion_tracker_from_a_tag {
+	private MultiStreamPositionTagger _tagger;
+	private CheckpointTag _tag;
+	private PositionTracker _positionTracker;
+
+	[SetUp]
+	public void When() {
+		// given
+		var tagger = new MultiStreamPositionTagger(0, new[] { "stream1", "stream2" });
+		var tracker = new PositionTracker(tagger);
+
+		var newTag =
+			CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "stream1", 1 }, { "stream2", 2 } });
+		tracker.UpdateByCheckpointTagInitial(newTag);
+		_tag = tracker.LastTag;
+		_tagger = new MultiStreamPositionTagger(0, new[] { "stream1", "stream2" });
+		_positionTracker = new PositionTracker(_tagger);
+		// when
+
+		_positionTracker.UpdateByCheckpointTagInitial(_tag);
+	}
+
+	[Test]
+	public void stream_position_is_updated() {
+		Assert.AreEqual(1, _positionTracker.LastTag.Streams["stream1"]);
+		Assert.AreEqual(2, _positionTracker.LastTag.Streams["stream2"]);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_updating_multistream_postion_tracker_to_zero.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_updating_multistream_postion_tracker_to_zero.cs
new file mode 100644
index 00000000000..dfe63bae484
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_updating_multistream_postion_tracker_to_zero.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.multistream_position_tagger;
+
+[TestFixture]
+public class when_updating_multistream_postion_tracker_to_zero {
+	private MultiStreamPositionTagger _tagger;
+	private PositionTracker _positionTracker;
+
+	[SetUp]
+	public void When() {
+		_tagger = new MultiStreamPositionTagger(0, new[] { "stream1", "stream2" });
+		_positionTracker = new PositionTracker(_tagger);
+		// when
+
+		_positionTracker.UpdateByCheckpointTagInitial(_tagger.MakeZeroCheckpointTag());
+	}
+
+	[Test]
+	public void streams_are_set_up() {
+		Assert.Contains("stream1", _positionTracker.LastTag.Streams.Keys);
+		Assert.Contains("stream2", _positionTracker.LastTag.Streams.Keys);
+	}
+
+	[Test]
+	public void stream_position_is_minus_one() {
+		Assert.AreEqual(ExpectedVersion.NoStream, _positionTracker.LastTag.Streams["stream1"]);
+		Assert.AreEqual(ExpectedVersion.NoStream, _positionTracker.LastTag.Streams["stream2"]);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_updating_postion_multistream_position_tracker.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_updating_postion_multistream_position_tracker.cs
new file mode 100644
index 00000000000..4d9511d7586
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/multistream_position_tagger/when_updating_postion_multistream_position_tracker.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.multistream_position_tagger;
+
+[TestFixture]
+public class when_updating_postion_multistream_position_tracker {
+	private MultiStreamPositionTagger _tagger;
+	private PositionTracker _positionTracker;
+
+	[SetUp]
+	public void When() {
+		// given
+		_tagger = new MultiStreamPositionTagger(0, new[] { "stream1", "stream2" });
+		_positionTracker = new PositionTracker(_tagger);
+		var newTag =
+			CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "stream1", 1 }, { "stream2", 2 } });
+		var newTag2 =
+			CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "stream1", 1 }, { "stream2", 3 } });
+		_positionTracker.UpdateByCheckpointTagInitial(newTag);
+		_positionTracker.UpdateByCheckpointTagForward(newTag2);
+	}
+
+	[Test]
+	public void stream_position_is_updated() {
+		Assert.AreEqual(1, _positionTracker.LastTag.Streams["stream1"]);
+		Assert.AreEqual(3, _positionTracker.LastTag.Streams["stream2"]);
+	}
+
+
+	[Test]
+	public void cannot_update_to_the_same_postion() {
+		Assert.Throws<InvalidOperationException>(() => {
+			var newTag =
+				CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "stream1", 1 }, { "stream2", 3 } });
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+		});
+	}
+
+	[Test]
+	public void it_cannot_be_updated_with_other_stream() {
+		Assert.Throws<InvalidOperationException>(() => {
+			// even not initialized (UpdateToZero can be removed)
+			var newTag =
+				CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "stream1", 3 }, { "stream3", 2 } });
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+		});
+	}
+
+	//TODO: write tests on updating with incompatible snapshot loaded
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/prepare_position_tagger.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/prepare_position_tagger.cs
new file mode 100644
index 00000000000..e6d3d5949a5
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/prepare_position_tagger.cs
@@ -0,0 +1,105 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.prepare_position_tagger;
+
+[TestFixture]
+public class prepare_position_tagger {
+	private ReaderSubscriptionMessage.CommittedEventDistributed _zeroEvent;
+	private ReaderSubscriptionMessage.CommittedEventDistributed _firstEvent;
+	private ReaderSubscriptionMessage.CommittedEventDistributed _secondEvent;
+
+	[SetUp]
+	public void setup() {
+		_zeroEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+			Guid.NewGuid(), new TFPos(10, 0), "stream", 0, false, Guid.NewGuid(), "StreamCreated", false,
+			new byte[0], new byte[0]);
+		_firstEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+			Guid.NewGuid(), new TFPos(0, 20), "stream", 1, false, Guid.NewGuid(), "Data", true,
+			Helper.UTF8NoBom.GetBytes("{}"), new byte[0]);
+		_secondEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+			Guid.NewGuid(), new TFPos(50, 40), "stream", 2, false, Guid.NewGuid(), "Data", true,
+			Helper.UTF8NoBom.GetBytes("{}"), new byte[0]);
+	}
+
+	[Test]
+	public void can_be_created() {
+		new PreparePositionTagger(0);
+	}
+
+	[Test]
+	public void is_message_after_checkpoint_tag_after_case() {
+		var t = new PreparePositionTagger(0);
+		var result = t.IsMessageAfterCheckpointTag(CheckpointTag.FromPreparePosition(0, 10), _firstEvent);
+		Assert.IsTrue(result);
+	}
+
+	[Test]
+	public void is_message_after_checkpoint_tag_before_case() {
+		var t = new PreparePositionTagger(0);
+		var result = t.IsMessageAfterCheckpointTag(CheckpointTag.FromPreparePosition(0, 40), _firstEvent);
+		Assert.IsFalse(result);
+	}
+
+	[Test]
+	public void is_message_after_checkpoint_tag_equal_case() {
+		var t = new PreparePositionTagger(0);
+		var result = t.IsMessageAfterCheckpointTag(CheckpointTag.FromPreparePosition(0, 20), _firstEvent);
+		Assert.IsFalse(result);
+	}
+
+	[Test]
+	public void prepare_position_checkpoint_tag_is_compatible() {
+		var t = new PreparePositionTagger(0);
+		Assert.IsTrue(t.IsCompatible(CheckpointTag.FromPreparePosition(0, 500)));
+	}
+
+	[Test]
+	public void tf_position_checkpoint_tag_is_incompatible() {
+		var t = new PreparePositionTagger(0);
+		Assert.IsFalse(t.IsCompatible(CheckpointTag.FromPosition(0, 510, 500)));
+	}
+
+	[Test]
+	public void stream_checkpoint_tag_is_incompatible() {
+		var t = new PreparePositionTagger(0);
+		Assert.IsFalse(t.IsCompatible(CheckpointTag.FromStreamPosition(0, "stream2", 100)));
+	}
+
+	[Test]
+	public void zero_position_tag_is_before_first_event_possible() {
+		var t = new PreparePositionTagger(0);
+		var zero = t.MakeZeroCheckpointTag();
+
+		var zeroFromEvent = t.MakeCheckpointTag(zero, _zeroEvent);
+
+		Assert.IsTrue(zeroFromEvent > zero);
+	}
+
+	[Test]
+	public void produced_checkpoint_tags_are_correctly_ordered() {
+		var t = new PreparePositionTagger(0);
+		var zero = t.MakeZeroCheckpointTag();
+
+		var zeroEvent = t.MakeCheckpointTag(zero, _zeroEvent);
+		var zeroEvent2 = t.MakeCheckpointTag(zeroEvent, _zeroEvent);
+		var first = t.MakeCheckpointTag(zeroEvent2, _firstEvent);
+		var second = t.MakeCheckpointTag(first, _secondEvent);
+		var second2 = t.MakeCheckpointTag(zero, _secondEvent);
+
+		Assert.IsTrue(zeroEvent > zero);
+		Assert.IsTrue(first > zero);
+		Assert.IsTrue(second > first);
+
+		Assert.AreEqual(zeroEvent2, zeroEvent);
+		Assert.AreEqual(second, second2);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_creating_prepare_postion_tracker.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_creating_prepare_postion_tracker.cs
new file mode 100644
index 00000000000..4a13ecedd27
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_creating_prepare_postion_tracker.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.prepare_position_tagger;
+
+[TestFixture]
+public class when_creating_prepare_postion_tracker {
+	private PositionTagger _tagger;
+	private PositionTracker _positionTracker;
+
+	[SetUp]
+	public void when() {
+		_tagger = new PreparePositionTagger(0);
+		_positionTracker = new PositionTracker(_tagger);
+	}
+
+	[Test]
+	public void it_can_be_updated() {
+		// even not initialized (UpdateToZero can be removed)
+		var newTag = CheckpointTag.FromPreparePosition(0, 50);
+		_positionTracker.UpdateByCheckpointTagInitial(newTag);
+	}
+
+	[Test]
+	public void initial_position_cannot_be_set_twice() {
+		Assert.Throws<InvalidOperationException>(() => {
+			var newTag = CheckpointTag.FromPreparePosition(0, 50);
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+		});
+	}
+
+	[Test]
+	public void it_can_be_updated_to_zero() {
+		_positionTracker.UpdateByCheckpointTagInitial(_tagger.MakeZeroCheckpointTag());
+	}
+
+	[Test]
+	public void it_cannot_be_updated_forward() {
+		Assert.Throws<InvalidOperationException>(() => {
+			var newTag = CheckpointTag.FromPreparePosition(0, 50);
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_reinitializing_prepapre_postion_tracker.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_reinitializing_prepapre_postion_tracker.cs
new file mode 100644
index 00000000000..39f1bb4f746
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_reinitializing_prepapre_postion_tracker.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.prepare_position_tagger;
+
+[TestFixture]
+public class when_reinitializing_prepapre_postion_tracker {
+	private PositionTagger _tagger;
+	private CheckpointTag _tag;
+	private PositionTracker _positionTracker;
+
+	[SetUp]
+	public void When() {
+		// given
+		var tagger = new PreparePositionTagger(0);
+		var positionTracker = new PositionTracker(tagger);
+
+		var newTag = CheckpointTag.FromPreparePosition(0, 50);
+		positionTracker.UpdateByCheckpointTagInitial(newTag);
+		_tag = positionTracker.LastTag;
+		_tagger = new PreparePositionTagger(0);
+		_positionTracker = new PositionTracker(_tagger);
+		_positionTracker.UpdateByCheckpointTagInitial(_tag);
+		// when
+
+
+		_positionTracker.Initialize();
+	}
+
+	[Test]
+	public void it_can_be_updated() {
+		// even not initialized (UpdateToZero can be removed)
+		var newTag = CheckpointTag.FromPreparePosition(0, 50);
+		_positionTracker.UpdateByCheckpointTagInitial(newTag);
+	}
+
+	[Test]
+	public void initial_position_cannot_be_set_twice() {
+		Assert.Throws<InvalidOperationException>(() => {
+			var newTag = CheckpointTag.FromPreparePosition(0, 50);
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+		});
+	}
+
+	[Test]
+	public void it_can_be_updated_to_zero() {
+		_positionTracker.UpdateByCheckpointTagInitial(_tagger.MakeZeroCheckpointTag());
+	}
+
+	[Test]
+	public void it_cannot_be_updated_forward() {
+		Assert.Throws<InvalidOperationException>(() => {
+			var newTag = CheckpointTag.FromPreparePosition(0, 50);
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_updating_postion_tagger_from_a_tag.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_updating_postion_tagger_from_a_tag.cs
new file mode 100644
index 00000000000..2dae4674776
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_updating_postion_tagger_from_a_tag.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.prepare_position_tagger;
+
+[TestFixture]
+public class when_updating_postion_tagger_from_a_tag {
+	private PositionTagger _tagger;
+	private CheckpointTag _tag;
+	private PositionTracker _positionTracker;
+
+	[SetUp]
+	public void When() {
+		// given
+		var tagger = new PreparePositionTagger(0);
+		var positionTracker = new PositionTracker(tagger);
+
+		var newTag = CheckpointTag.FromPreparePosition(0, 50);
+		positionTracker.UpdateByCheckpointTagInitial(newTag);
+		_tag = positionTracker.LastTag;
+		_tagger = new PreparePositionTagger(0);
+		_positionTracker = new PositionTracker(_tagger);
+		// when
+
+		_positionTracker.UpdateByCheckpointTagInitial(_tag);
+	}
+
+	[Test]
+	public void position_is_updated() {
+		Assert.AreEqual(50, _positionTracker.LastTag.PreparePosition);
+		Assert.IsNull(_positionTracker.LastTag.CommitPosition);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_updating_prepare_postion_tracker.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_updating_prepare_postion_tracker.cs
new file mode 100644
index 00000000000..8aaa7900f58
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/prepare_position_tagger/when_updating_prepare_postion_tracker.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.prepare_position_tagger;
+
+[TestFixture]
+public class when_updating_prepare_postion_tracker {
+	private PositionTagger _tagger;
+	private PositionTracker _positionTracker;
+
+	[SetUp]
+	public void When() {
+		// given
+		_tagger = new PreparePositionTagger(0);
+		_positionTracker = new PositionTracker(_tagger);
+		var newTag = CheckpointTag.FromPreparePosition(0, 50);
+		_positionTracker.UpdateByCheckpointTagInitial(newTag);
+	}
+
+	[Test]
+	public void checkpoint_tag_is_for_correct_position() {
+		Assert.AreEqual(50, _positionTracker.LastTag.Position.PreparePosition);
+	}
+
+	[Test]
+	public void cannot_update_to_the_same_postion() {
+		Assert.Throws<InvalidOperationException>(() => {
+			var newTag = CheckpointTag.FromPreparePosition(0, 50);
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/stream_position_tagger.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/stream_position_tagger.cs
new file mode 100644
index 00000000000..cfcc6f43c2b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/stream_position_tagger.cs
@@ -0,0 +1,142 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.stream_position_tagger;
+
+[TestFixture]
+public class stream_position_tagger {
+	private ReaderSubscriptionMessage.CommittedEventDistributed _zeroEvent;
+	private ReaderSubscriptionMessage.CommittedEventDistributed _firstEvent;
+	private ReaderSubscriptionMessage.CommittedEventDistributed _secondEvent;
+
+	[SetUp]
+	public void setup() {
+		_zeroEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+			Guid.NewGuid(), new TFPos(10, 0), "stream1", 0, false, Guid.NewGuid(), "StreamCreated", false,
+			new byte[0], new byte[0]);
+		_firstEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+			Guid.NewGuid(), new TFPos(30, 20), "stream1", 1, false, Guid.NewGuid(), "Data", true,
+			Helper.UTF8NoBom.GetBytes("{}"), new byte[0]);
+		_secondEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+			Guid.NewGuid(), new TFPos(50, 40), "stream1", 2, false, Guid.NewGuid(), "Data", true,
+			Helper.UTF8NoBom.GetBytes("{}"), new byte[0]);
+	}
+
+	[Test]
+	public void can_be_created() {
+		var t = new StreamPositionTagger(0, "stream1");
+		new PositionTracker(t);
+	}
+
+	[Test]
+	public void is_message_after_checkpoint_tag_after_case() {
+		var t = new StreamPositionTagger(0, "stream1");
+		var result = t.IsMessageAfterCheckpointTag(CheckpointTag.FromStreamPosition(0, "stream1", 0), _firstEvent);
+		Assert.IsTrue(result);
+	}
+
+	[Test]
+	public void is_message_after_checkpoint_tag_before_case() {
+		var t = new StreamPositionTagger(0, "stream1");
+		var result = t.IsMessageAfterCheckpointTag(CheckpointTag.FromStreamPosition(0, "stream1", 2), _firstEvent);
+		Assert.IsFalse(result);
+	}
+
+	[Test]
+	public void is_message_after_checkpoint_tag_equal_case() {
+		var t = new StreamPositionTagger(0, "stream1");
+		var result = t.IsMessageAfterCheckpointTag(CheckpointTag.FromStreamPosition(0, "stream1", 1), _firstEvent);
+		Assert.IsFalse(result);
+	}
+
+	[Test]
+	public void is_message_after_checkpoint_tag_incompatible_case() {
+		// events from other streams are not after any tag
+		var t = new StreamPositionTagger(0, "stream-other");
+		var result = t.IsMessageAfterCheckpointTag(CheckpointTag.FromStreamPosition(0, "stream1", 1), _firstEvent);
+		Assert.IsFalse(result);
+	}
+
+
+	[Test]
+	public void null_stream_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => { new StreamPositionTagger(0, null); });
+	}
+
+	[Test]
+	public void empty_stream_throws_argument_exception() {
+		Assert.Throws<ArgumentException>(() => { new StreamPositionTagger(0, ""); });
+	}
+
+	[Test]
+	public void position_checkpoint_tag_is_incompatible() {
+		var t = new StreamPositionTagger(0, "stream1");
+		Assert.IsFalse(t.IsCompatible(CheckpointTag.FromPosition(0, 1000, 500)));
+	}
+
+	[Test]
+	public void anothe_stream_checkpoint_tag_is_incompatible() {
+		var t = new StreamPositionTagger(0, "stream1");
+		Assert.IsFalse(t.IsCompatible(CheckpointTag.FromStreamPosition(0, "stream2", 100)));
+	}
+
+	[Test]
+	public void the_same_stream_checkpoint_tag_is_compatible() {
+		var t = new StreamPositionTagger(0, "stream1");
+		Assert.IsTrue(t.IsCompatible(CheckpointTag.FromStreamPosition(0, "stream1", 100)));
+	}
+
+	[Test]
+	public void adjust_compatible_tag_returns_the_same_tag() {
+		var t = new StreamPositionTagger(0, "stream1");
+		var tag = CheckpointTag.FromStreamPosition(0, "stream1", 1);
+		Assert.AreEqual(tag, t.AdjustTag(tag));
+	}
+
+	[Test]
+	public void can_adjust_multi_stream_position_tag() {
+		var t = new StreamPositionTagger(0, "stream1");
+		var tag = CheckpointTag.FromStreamPosition(0, "stream1", 1);
+		var original =
+			CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "stream1", 1 }, { "stream2", 2 } });
+		Assert.AreEqual(tag, t.AdjustTag(original));
+	}
+
+	[Test]
+	public void zero_position_tag_is_before_first_event_possible() {
+		var t = new StreamPositionTagger(0, "stream1");
+		var zero = t.MakeZeroCheckpointTag();
+
+		var zeroFromEvent = t.MakeCheckpointTag(zero, _zeroEvent);
+
+		Assert.IsTrue(zeroFromEvent > zero);
+	}
+
+	[Test]
+	public void produced_checkpoint_tags_are_correctly_ordered() {
+		var t = new StreamPositionTagger(0, "stream1");
+		var zero = t.MakeZeroCheckpointTag();
+
+		var zeroEvent = t.MakeCheckpointTag(zero, _zeroEvent);
+		var zeroEvent2 = t.MakeCheckpointTag(zeroEvent, _zeroEvent);
+		var first = t.MakeCheckpointTag(zeroEvent2, _firstEvent);
+		var second = t.MakeCheckpointTag(first, _secondEvent);
+		var second2 = t.MakeCheckpointTag(zero, _secondEvent);
+
+		Assert.IsTrue(zeroEvent > zero);
+		Assert.IsTrue(first > zero);
+		Assert.IsTrue(second > first);
+
+		Assert.AreEqual(zeroEvent2, zeroEvent);
+		Assert.AreEqual(second, second2);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_creating_stream_postion_tracker.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_creating_stream_postion_tracker.cs
new file mode 100644
index 00000000000..f5aaeb334d6
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_creating_stream_postion_tracker.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.stream_position_tagger;
+
+[TestFixture]
+public class when_creating_stream_postion_tracker {
+	private StreamPositionTagger _tagger;
+	private PositionTracker _positionTracker;
+
+	[SetUp]
+	public void when() {
+		_tagger = new StreamPositionTagger(0, "stream1");
+		_positionTracker = new PositionTracker(_tagger);
+	}
+
+	[Test]
+	public void it_can_be_updated_with_correct_stream() {
+		// even not initialized (UpdateToZero can be removed)
+		var newTag = CheckpointTag.FromStreamPosition(0, "stream1", 1);
+		_positionTracker.UpdateByCheckpointTagInitial(newTag);
+	}
+
+	[Test]
+	public void it_cannot_be_updated_with_other_stream() {
+		Assert.Throws<InvalidOperationException>(() => {
+			var newTag = CheckpointTag.FromStreamPosition(0, "other_stream1", 1);
+			_positionTracker.UpdateByCheckpointTagInitial(newTag);
+		});
+	}
+
+	[Test]
+	public void it_cannot_be_updated_forward() {
+		Assert.Throws<InvalidOperationException>(() => {
+			var newTag = CheckpointTag.FromStreamPosition(0, "stream1", 1);
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+		});
+	}
+
+	[Test]
+	public void initial_position_cannot_be_set_twice() {
+		Assert.Throws<InvalidOperationException>(() => {
+			var newTag = CheckpointTag.FromStreamPosition(0, "stream1", 1);
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+		});
+	}
+
+	[Test]
+	public void it_can_be_updated_to_zero() {
+		_positionTracker.UpdateByCheckpointTagInitial(_tagger.MakeZeroCheckpointTag());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_updating_postion_stream_position_tracker.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_updating_postion_stream_position_tracker.cs
new file mode 100644
index 00000000000..ec97f084b5d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_updating_postion_stream_position_tracker.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.stream_position_tagger;
+
+[TestFixture]
+public class when_updating_postion_stream_position_tracker {
+	private StreamPositionTagger _tagger;
+	private PositionTracker _positionTracker;
+
+	[SetUp]
+	public void When() {
+		// given
+		_tagger = new StreamPositionTagger(0, "stream1");
+		_positionTracker = new PositionTracker(_tagger);
+		var newTag = CheckpointTag.FromStreamPosition(0, "stream1", 1);
+		var newTag2 = CheckpointTag.FromStreamPosition(0, "stream1", 2);
+		_positionTracker.UpdateByCheckpointTagInitial(newTag);
+		_positionTracker.UpdateByCheckpointTagForward(newTag2);
+	}
+
+	[Test]
+	public void stream_position_is_updated() {
+		Assert.AreEqual(2, _positionTracker.LastTag.Streams["stream1"]);
+	}
+
+
+	[Test]
+	public void cannot_update_to_the_same_postion() {
+		Assert.Throws<InvalidOperationException>(() => {
+			var newTag = CheckpointTag.FromStreamPosition(0, "stream1", 2);
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+		});
+	}
+
+	[Test]
+	public void it_cannot_be_updated_with_other_stream() {
+		Assert.Throws<InvalidOperationException>(() => {
+			// even not initialized (UpdateToZero can be removed)
+			var newTag = CheckpointTag.FromStreamPosition(0, "other_stream1", 2);
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+		});
+	}
+
+	//TODO: write tests on updating with incompatible snapshot loaded
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_updating_stream_postion_tracker_from_a_tag.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_updating_stream_postion_tracker_from_a_tag.cs
new file mode 100644
index 00000000000..fa89dc1d168
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_updating_stream_postion_tracker_from_a_tag.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.stream_position_tagger;
+
+[TestFixture]
+public class when_updating_stream_postion_tracker_from_a_tag {
+	private StreamPositionTagger _tagger;
+	private CheckpointTag _tag;
+	private PositionTracker _positionTracker;
+
+	[SetUp]
+	public void When() {
+		// given
+		var tagger = new StreamPositionTagger(0, "stream1");
+		var tracker = new PositionTracker(tagger);
+
+		var newTag = CheckpointTag.FromStreamPosition(0, "stream1", 1);
+		tracker.UpdateByCheckpointTagInitial(newTag);
+		_tag = tracker.LastTag;
+		_tagger = new StreamPositionTagger(0, "stream1");
+		_positionTracker = new PositionTracker(_tagger);
+		// when
+
+		_positionTracker.UpdateByCheckpointTagInitial(_tag);
+	}
+
+	[Test]
+	public void stream_position_is_updated() {
+		Assert.AreEqual(1, _positionTracker.LastTag.Streams["stream1"]);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_updating_stream_postion_tracker_to_zero.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_updating_stream_postion_tracker_to_zero.cs
new file mode 100644
index 00000000000..17f96788ed8
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/stream_position_tagger/when_updating_stream_postion_tracker_to_zero.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.stream_position_tagger;
+
+[TestFixture]
+public class when_updating_stream_postion_tracker_to_zero {
+	private StreamPositionTagger _tagger;
+	private PositionTracker _positionTracker;
+
+	[SetUp]
+	public void When() {
+		_tagger = new StreamPositionTagger(0, "stream1");
+		_positionTracker = new PositionTracker(_tagger);
+		// when
+
+		_positionTracker.UpdateByCheckpointTagInitial(_tagger.MakeZeroCheckpointTag());
+	}
+
+	[Test]
+	public void streams_are_set_up() {
+		Assert.Contains("stream1", _positionTracker.LastTag.Streams.Keys);
+	}
+
+	[Test]
+	public void stream_position_is_minus_one() {
+		Assert.AreEqual(-1, _positionTracker.LastTag.Streams["stream1"]);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/transaction_file_position_tagger.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/transaction_file_position_tagger.cs
new file mode 100644
index 00000000000..432a2d2d035
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/transaction_file_position_tagger.cs
@@ -0,0 +1,116 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.transaction_file_position_tagger;
+
+[TestFixture]
+public class transaction_file_position_tagger {
+	private ReaderSubscriptionMessage.CommittedEventDistributed _zeroEvent;
+	private ReaderSubscriptionMessage.CommittedEventDistributed _firstEvent;
+	private ReaderSubscriptionMessage.CommittedEventDistributed _secondEvent;
+
+	[SetUp]
+	public void setup() {
+		_zeroEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+			Guid.NewGuid(), new TFPos(10, 0), "stream", 0, false, Guid.NewGuid(), "StreamCreated", false,
+			new byte[0], new byte[0]);
+		_firstEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+			Guid.NewGuid(), new TFPos(30, 20), "stream", 1, false, Guid.NewGuid(), "Data", true,
+			Helper.UTF8NoBom.GetBytes("{}"), new byte[0]);
+		_secondEvent = ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+			Guid.NewGuid(), new TFPos(50, 40), "stream", 2, false, Guid.NewGuid(), "Data", true,
+			Helper.UTF8NoBom.GetBytes("{}"), new byte[0]);
+	}
+
+	[Test]
+	public void can_be_created() {
+		new TransactionFilePositionTagger(0);
+	}
+
+	[Test]
+	public void is_message_after_checkpoint_tag_after_case() {
+		var t = new TransactionFilePositionTagger(0);
+		var result = t.IsMessageAfterCheckpointTag(CheckpointTag.FromPosition(0, 20, 10), _firstEvent);
+		Assert.IsTrue(result);
+	}
+
+	[Test]
+	public void is_message_after_checkpoint_tag_before_case() {
+		var t = new TransactionFilePositionTagger(0);
+		var result = t.IsMessageAfterCheckpointTag(CheckpointTag.FromPosition(0, 50, 40), _firstEvent);
+		Assert.IsFalse(result);
+	}
+
+	[Test]
+	public void is_message_after_checkpoint_tag_equal_case() {
+		var t = new TransactionFilePositionTagger(0);
+		var result = t.IsMessageAfterCheckpointTag(CheckpointTag.FromPosition(0, 30, 20), _firstEvent);
+		Assert.IsFalse(result);
+	}
+
+	[Test]
+	public void position_checkpoint_tag_is_compatible() {
+		var t = new TransactionFilePositionTagger(0);
+		Assert.IsTrue(t.IsCompatible(CheckpointTag.FromPosition(0, 1000, 500)));
+	}
+
+	[Test]
+	public void stream_checkpoint_tag_is_incompatible() {
+		var t = new TransactionFilePositionTagger(0);
+		Assert.IsFalse(t.IsCompatible(CheckpointTag.FromStreamPosition(0, "stream2", 100)));
+	}
+
+	[Test]
+	public void adjust_compatible_tag_returns_the_same_tag() {
+		var t = new TransactionFilePositionTagger(0);
+		var tag = CheckpointTag.FromPosition(0, 100, 50);
+		Assert.AreSame(tag, t.AdjustTag(tag));
+	}
+
+	[Test]
+	public void can_adjust_tf_position_tag() {
+		var t = new TransactionFilePositionTagger(0);
+		var tag = CheckpointTag.FromPosition(0, 100, 50);
+		var original = CheckpointTag.FromEventTypeIndexPositions(0, new TFPos(100, 50),
+			new Dictionary<string, long> { { "type1", 1 }, { "type2", 2 } });
+		Assert.AreEqual(tag, t.AdjustTag(original));
+	}
+
+	[Test]
+	public void zero_position_tag_is_before_first_event_possible() {
+		var t = new TransactionFilePositionTagger(0);
+		var zero = t.MakeZeroCheckpointTag();
+
+		var zeroFromEvent = t.MakeCheckpointTag(zero, _zeroEvent);
+
+		Assert.IsTrue(zeroFromEvent > zero);
+	}
+
+	[Test]
+	public void produced_checkpoint_tags_are_correctly_ordered() {
+		var t = new TransactionFilePositionTagger(0);
+		var zero = t.MakeZeroCheckpointTag();
+
+		var zeroEvent = t.MakeCheckpointTag(zero, _zeroEvent);
+		var zeroEvent2 = t.MakeCheckpointTag(zeroEvent, _zeroEvent);
+		var first = t.MakeCheckpointTag(zeroEvent2, _firstEvent);
+		var second = t.MakeCheckpointTag(first, _secondEvent);
+		var second2 = t.MakeCheckpointTag(zero, _secondEvent);
+
+		Assert.IsTrue(zeroEvent > zero);
+		Assert.IsTrue(first > zero);
+		Assert.IsTrue(second > first);
+
+		Assert.AreEqual(zeroEvent2, zeroEvent);
+		Assert.AreEqual(second, second2);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_creating_transaction_file_postion_tracker.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_creating_transaction_file_postion_tracker.cs
new file mode 100644
index 00000000000..a43f17d6e95
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_creating_transaction_file_postion_tracker.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.transaction_file_position_tagger;
+
+[TestFixture]
+public class when_creating_transaction_file_postion_tracker {
+	private PositionTagger _tagger;
+	private PositionTracker _positionTracker;
+
+	[SetUp]
+	public void when() {
+		_tagger = new TransactionFilePositionTagger(0);
+		_positionTracker = new PositionTracker(_tagger);
+	}
+
+	[Test]
+	public void it_can_be_updated() {
+		// even not initialized (UpdateToZero can be removed)
+		var newTag = CheckpointTag.FromPosition(0, 100, 50);
+		_positionTracker.UpdateByCheckpointTagInitial(newTag);
+	}
+
+	[Test]
+	public void initial_position_cannot_be_set_twice() {
+		Assert.Throws<InvalidOperationException>(() => {
+			var newTag = CheckpointTag.FromPosition(0, 100, 50);
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+		});
+	}
+
+	[Test]
+	public void it_can_be_updated_to_zero() {
+		_positionTracker.UpdateByCheckpointTagInitial(_tagger.MakeZeroCheckpointTag());
+	}
+
+	[Test]
+	public void it_cannot_be_updated_forward() {
+		Assert.Throws<InvalidOperationException>(() => {
+			var newTag = CheckpointTag.FromPosition(0, 100, 50);
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_reinitializing_transaction_file_postion_tracker.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_reinitializing_transaction_file_postion_tracker.cs
new file mode 100644
index 00000000000..6d861f9694c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_reinitializing_transaction_file_postion_tracker.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.transaction_file_position_tagger;
+
+[TestFixture]
+public class when_reinitializing_transaction_file_postion_tracker {
+	private PositionTagger _tagger;
+	private CheckpointTag _tag;
+	private PositionTracker _positionTracker;
+
+	[SetUp]
+	public void When() {
+		// given
+		var tagger = new TransactionFilePositionTagger(0);
+		var positionTracker = new PositionTracker(tagger);
+
+		var newTag = CheckpointTag.FromPosition(0, 100, 50);
+		positionTracker.UpdateByCheckpointTagInitial(newTag);
+		_tag = positionTracker.LastTag;
+		_tagger = new TransactionFilePositionTagger(0);
+		_positionTracker = new PositionTracker(_tagger);
+		_positionTracker.UpdateByCheckpointTagInitial(_tag);
+		// when
+
+
+		_positionTracker.Initialize();
+	}
+
+	[Test]
+	public void it_can_be_updated() {
+		// even not initialized (UpdateToZero can be removed)
+		var newTag = CheckpointTag.FromPosition(0, 100, 50);
+		_positionTracker.UpdateByCheckpointTagInitial(newTag);
+	}
+
+	[Test]
+	public void initial_position_cannot_be_set_twice() {
+		Assert.Throws<InvalidOperationException>(() => {
+			var newTag = CheckpointTag.FromPosition(0, 100, 50);
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+		});
+	}
+
+	[Test]
+	public void it_can_be_updated_to_zero() {
+		_positionTracker.UpdateByCheckpointTagInitial(_tagger.MakeZeroCheckpointTag());
+	}
+
+	[Test]
+	public void it_cannot_be_updated_forward() {
+		Assert.Throws<InvalidOperationException>(() => {
+			var newTag = CheckpointTag.FromPosition(0, 100, 50);
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_updating_postion_tagger_from_a_tag.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_updating_postion_tagger_from_a_tag.cs
new file mode 100644
index 00000000000..901d59d177e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_updating_postion_tagger_from_a_tag.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.transaction_file_position_tagger;
+
+[TestFixture]
+public class when_updating_postion_tagger_from_a_tag {
+	private PositionTagger _tagger;
+	private CheckpointTag _tag;
+	private PositionTracker _positionTracker;
+
+	[SetUp]
+	public void When() {
+		// given
+		var tagger = new TransactionFilePositionTagger(0);
+		var positionTracker = new PositionTracker(tagger);
+
+		var newTag = CheckpointTag.FromPosition(0, 100, 50);
+		positionTracker.UpdateByCheckpointTagInitial(newTag);
+		_tag = positionTracker.LastTag;
+		_tagger = new TransactionFilePositionTagger(0);
+		_positionTracker = new PositionTracker(_tagger);
+		// when
+
+		_positionTracker.UpdateByCheckpointTagInitial(_tag);
+	}
+
+	[Test]
+	public void position_is_updated() {
+		Assert.AreEqual(50, _positionTracker.LastTag.PreparePosition);
+		Assert.AreEqual(100, _positionTracker.LastTag.CommitPosition);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_updating_transaction_file_postion_tracker.cs b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_updating_transaction_file_postion_tracker.cs
new file mode 100644
index 00000000000..b3b394430e6
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/position_tagging/transaction_file_position_tagger/when_updating_transaction_file_postion_tracker.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.position_tagging.transaction_file_position_tagger;
+
+[TestFixture]
+public class when_updating_transaction_file_postion_tracker {
+	private PositionTagger _tagger;
+	private PositionTracker _positionTracker;
+
+	[SetUp]
+	public void When() {
+		// given
+		_tagger = new TransactionFilePositionTagger(0);
+		_positionTracker = new PositionTracker(_tagger);
+		var newTag = CheckpointTag.FromPosition(0, 100, 50);
+		_positionTracker.UpdateByCheckpointTagInitial(newTag);
+	}
+
+	[Test]
+	public void checkpoint_tag_is_for_correct_position() {
+		Assert.AreEqual(new TFPos(100, 50), _positionTracker.LastTag.Position);
+	}
+
+	[Test]
+	public void cannot_update_to_the_same_postion() {
+		Assert.Throws<InvalidOperationException>(() => {
+			var newTag = CheckpointTag.FromPosition(0, 100, 50);
+			_positionTracker.UpdateByCheckpointTagForward(newTag);
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projection_core_service/when_stopping_the_projection_core_service.cs b/src/KurrentDB.Projections.Core.Tests/Services/projection_core_service/when_stopping_the_projection_core_service.cs
new file mode 100644
index 00000000000..c3e9708bede
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projection_core_service/when_stopping_the_projection_core_service.cs
@@ -0,0 +1,125 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projection_core_service;
+
+[TestFixture]
+public class when_stopping_the_projection_core_service_with_no_running_projections
+	: TestFixtureWithProjectionCoreService {
+	private readonly Guid _stopCorrelationId = Guid.NewGuid();
+
+	[SetUp]
+	public override void Setup() {
+		base.Setup();
+		_service.Handle(new ProjectionCoreServiceMessage.StopCore(_stopCorrelationId));
+	}
+
+	[Test]
+	public void should_handle_subcomponent_stopped() {
+		var componentStopped = _consumer.HandledMessages
+			.OfType<ProjectionCoreServiceMessage.SubComponentStopped>()
+			.LastOrDefault(x => x.SubComponent == "ProjectionCoreService");
+		Assert.IsNotNull(componentStopped);
+		Assert.AreEqual(_stopCorrelationId, componentStopped.QueueId);
+	}
+}
+
+[TestFixture]
+public class when_stopping_the_projection_core_service_with_running_projections
+	: TestFixtureWithProjectionCoreService {
+	private readonly Guid _projectionId = Guid.NewGuid();
+	private readonly Guid _stopCorrelationId = Guid.NewGuid();
+
+	[SetUp]
+	public override void Setup() {
+		base.Setup();
+		_bus.Subscribe<CoreProjectionStatusMessage.Suspended>(_service);
+		_service.Handle(new CoreProjectionManagementMessage.CreateAndPrepare(
+			_projectionId, _workerId, "test-projection",
+			new ProjectionVersion(), new ProjectionConfig(null, 1000, 1000 * 1000, 100, 500, true, true, false, false, true, 10000,
+				1, 250),
+			"JS", "fromStream('$user-admin').outputState()", true));
+		_service.Handle(new ProjectionCoreServiceMessage.StopCore(_stopCorrelationId));
+	}
+
+	[Test]
+	public void should_handle_projection_suspended_message() {
+		var suspended = _consumer.HandledMessages
+			.OfType<CoreProjectionStatusMessage.Suspended>()
+			.LastOrDefault(x => x.ProjectionId == _projectionId);
+		Assert.IsNotNull(suspended);
+	}
+
+	[Test]
+	public void should_handle_subcomponent_stopped() {
+		var componentStopped = _consumer.HandledMessages
+			.OfType<ProjectionCoreServiceMessage.SubComponentStopped>()
+			.LastOrDefault(x => x.SubComponent == "ProjectionCoreService");
+		Assert.IsNotNull(componentStopped);
+	}
+}
+
+[TestFixture]
+public class when_stopping_the_projection_core_service_times_out_suspending_projections
+	: TestFixtureWithProjectionCoreService {
+	private readonly Guid _projectionId = Guid.NewGuid();
+	private readonly Guid _stopCorrelationId = Guid.NewGuid();
+
+	[SetUp]
+	public override void Setup() {
+		base.Setup();
+		// Don't subscribe to the suspended message
+		_bus.Unsubscribe<CoreProjectionStatusMessage.Suspended>(_service);
+		_service.Handle(new CoreProjectionManagementMessage.CreateAndPrepare(
+			_projectionId, _workerId, "test-projection",
+			new ProjectionVersion(), new ProjectionConfig(null, 1000, 1000 * 1000, 100, 500, true, true, false, false, true, 10000,
+				1, 250),
+			"JS", "fromStream('$user-admin').outputState()", true));
+		_service.Handle(new ProjectionCoreServiceMessage.StopCore(_stopCorrelationId));
+		_service.Handle(new ProjectionCoreServiceMessage.StopCoreTimeout(_stopCorrelationId));
+	}
+
+	[Test]
+	public void should_handle_subcomponent_stopped() {
+		var componentStopped = _consumer.HandledMessages
+			.OfType<ProjectionCoreServiceMessage.SubComponentStopped>()
+			.LastOrDefault(x => x.SubComponent == "ProjectionCoreService");
+		Assert.IsNotNull(componentStopped);
+	}
+}
+
+[TestFixture]
+public class when_stopping_the_projection_core_service_and_timeout_for_wrong_correlation_received
+	: TestFixtureWithProjectionCoreService {
+	private readonly Guid _projectionId = Guid.NewGuid();
+	private readonly Guid _stopCorrelationId = Guid.NewGuid();
+
+	[SetUp]
+	public override void Setup() {
+		base.Setup();
+		// Don't subscribe to the suspended message
+		_bus.Unsubscribe<CoreProjectionStatusMessage.Suspended>(_service);
+		_service.Handle(new CoreProjectionManagementMessage.CreateAndPrepare(
+			_projectionId, _workerId, "test-projection",
+			new ProjectionVersion(), new ProjectionConfig(null, 1000, 1000 * 1000, 100, 500, true, true, false, false, true, 10000,
+				1, 250),
+			"JS", "fromStream('$user-admin').outputState()", true));
+		_service.Handle(new ProjectionCoreServiceMessage.StopCore(_stopCorrelationId));
+		_service.Handle(new ProjectionCoreServiceMessage.StopCoreTimeout(Guid.NewGuid()));
+	}
+
+	[Test]
+	public void should_not_handle_subcomponent_stopped() {
+		var componentStopped = _consumer.HandledMessages
+			.OfType<ProjectionCoreServiceMessage.SubComponentStopped>()
+			.LastOrDefault(x => x.SubComponent == "ProjectionCoreService");
+		Assert.IsNull(componentStopped);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/TestFixtureWithProjectionSubscription.cs b/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/TestFixtureWithProjectionSubscription.cs
new file mode 100644
index 00000000000..6ebb9b3f743
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/TestFixtureWithProjectionSubscription.cs
@@ -0,0 +1,108 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Bus.Helpers;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projection_subscription;
+
+public abstract class TestFixtureWithProjectionSubscription {
+	protected Guid _projectionCorrelationId;
+	protected TestHandler<EventReaderSubscriptionMessage.CommittedEventReceived> _eventHandler;
+	protected TestHandler<EventReaderSubscriptionMessage.CheckpointSuggested> _checkpointHandler;
+	protected TestHandler<EventReaderSubscriptionMessage.ProgressChanged> _progressHandler;
+	protected TestHandler<EventReaderSubscriptionMessage.SubscriptionStarted> _subscriptionStartedHandler;
+	protected TestHandler<EventReaderSubscriptionMessage.NotAuthorized> _notAuthorizedHandler;
+	protected TestHandler<EventReaderSubscriptionMessage.EofReached> _eofHandler;
+	protected TestHandler<EventReaderSubscriptionMessage.PartitionEofReached> _partitionEofHandler;
+	protected TestHandler<EventReaderSubscriptionMessage.PartitionDeleted> _partitionDeletedHandler;
+	protected IReaderSubscription _subscription;
+	protected ITimeProvider _timeProvider;
+	protected SynchronousScheduler _bus;
+	protected Action<SourceDefinitionBuilder> _source = null;
+	protected int _checkpointUnhandledBytesThreshold;
+	protected int _checkpointProcessedEventsThreshold;
+	protected int _checkpointAfterMs;
+	protected IReaderStrategy _readerStrategy;
+
+	[SetUp]
+	public void setup() {
+		_checkpointUnhandledBytesThreshold = 1000;
+		_checkpointProcessedEventsThreshold = 2000;
+		_checkpointAfterMs = 10000;
+		_timeProvider = new RealTimeProvider();
+		Given();
+		_bus = new();
+		_projectionCorrelationId = Guid.NewGuid();
+		_eventHandler = new TestHandler<EventReaderSubscriptionMessage.CommittedEventReceived>();
+		_checkpointHandler = new TestHandler<EventReaderSubscriptionMessage.CheckpointSuggested>();
+		_progressHandler = new TestHandler<EventReaderSubscriptionMessage.ProgressChanged>();
+		_subscriptionStartedHandler = new TestHandler<EventReaderSubscriptionMessage.SubscriptionStarted>();
+		_notAuthorizedHandler = new TestHandler<EventReaderSubscriptionMessage.NotAuthorized>();
+		_eofHandler = new TestHandler<EventReaderSubscriptionMessage.EofReached>();
+		_partitionEofHandler = new TestHandler<EventReaderSubscriptionMessage.PartitionEofReached>();
+		_partitionDeletedHandler = new TestHandler<EventReaderSubscriptionMessage.PartitionDeleted>();
+
+		_bus.Subscribe(_eventHandler);
+		_bus.Subscribe(_checkpointHandler);
+		_bus.Subscribe(_progressHandler);
+		_bus.Subscribe(_eofHandler);
+		_bus.Subscribe(_partitionEofHandler);
+		_readerStrategy = CreateCheckpointStrategy();
+		_subscription = CreateProjectionSubscription();
+
+
+		When();
+	}
+
+	protected virtual IReaderSubscription CreateProjectionSubscription() {
+		return new ReaderSubscription(
+			"Test Subscription",
+			_bus,
+			_projectionCorrelationId,
+			_readerStrategy.PositionTagger.MakeZeroCheckpointTag(),
+			_readerStrategy,
+			_timeProvider,
+			_checkpointUnhandledBytesThreshold,
+			_checkpointProcessedEventsThreshold,
+			_checkpointAfterMs,
+			false,
+			null,
+			false);
+	}
+
+	protected virtual void Given() {
+	}
+
+	protected abstract void When();
+
+	protected virtual IReaderStrategy CreateCheckpointStrategy() {
+		var readerBuilder = new SourceDefinitionBuilder();
+		if (_source != null) {
+			_source(readerBuilder);
+		} else {
+			readerBuilder.FromAll();
+			readerBuilder.AllEvents();
+		}
+
+		var config = new ProjectionConfig(null, 1000, 1000 * 1000, 100, 500, true, true, false, false, true, 10000,
+			1, 250);
+		IQuerySources sources = readerBuilder.Build();
+		var readerStrategy = ReaderStrategy.Create(
+			"test",
+			0,
+			sources,
+			_timeProvider,
+			stopOnEof: false,
+			runAs: config.RunAs);
+		return readerStrategy;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/failing_test_github_issue_2785.cs b/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/failing_test_github_issue_2785.cs
new file mode 100644
index 00000000000..1519ffed8e8
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/failing_test_github_issue_2785.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projection_subscription;
+
+public class
+	failing_test_github_issue_2785 :
+		TestFixtureWithProjectionSubscription {
+
+	protected override void Given() {
+		_source = source => {
+			source.FromAll();
+			source.IncludeEvent("good-event-type");
+		};
+	}
+
+	protected override void When() {
+	}
+
+	[Test]
+	public void should_gracefully_handle_resolved_linkto_events() {
+		var stream = "any-stream-name";
+		var eventType = "any-event-type";
+		var position = new TFPos(-1, 200); //resolved linkTo event with incomplete TF position
+		var resolvedLinkToEvent = true;
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), position, stream, 1, resolvedLinkToEvent, Guid.NewGuid(),
+				eventType, false, new byte[0], new byte[0]));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_creating_projection_subscription.cs b/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_creating_projection_subscription.cs
new file mode 100644
index 00000000000..e72440b661f
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_creating_projection_subscription.cs
@@ -0,0 +1,104 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projection_subscription;
+
+[TestFixture]
+public class when_creating_projection_subscription {
+	[Test]
+	public void it_can_be_created() {
+		new ReaderSubscription(
+			"Test Subscription",
+			new FakePublisher(),
+			Guid.NewGuid(),
+			CheckpointTag.FromPosition(0, 0, -1),
+			CreateReaderStrategy(),
+			new FakeTimeProvider(),
+			1000,
+			2000,
+			10000,
+			false,
+			null,
+			false);
+	}
+
+	[Test]
+	public void null_publisher_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			new ReaderSubscription(
+				"Test Subscription",
+				null,
+				Guid.NewGuid(),
+				CheckpointTag.FromPosition(0, 0, -1),
+				CreateReaderStrategy(),
+				new FakeTimeProvider(),
+				1000,
+				2000,
+				10000,
+				false,
+				null,
+				false);
+		});
+	}
+
+	[Test]
+	public void null_checkpoint_strategy_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			new ReaderSubscription(
+				"Test Subscription",
+				new FakePublisher(),
+				Guid.NewGuid(),
+				CheckpointTag.FromPosition(0, 0, -1),
+				null,
+				new FakeTimeProvider(),
+				1000,
+				2000,
+				10000,
+				false,
+				null,
+				false);
+		});
+	}
+
+	[Test]
+	public void null_time_provider_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			new ReaderSubscription(
+				"Test Subscription",
+				new FakePublisher(),
+				Guid.NewGuid(),
+				CheckpointTag.FromPosition(0, 0, -1),
+				CreateReaderStrategy(),
+				null,
+				1000,
+				2000,
+				10000,
+				false,
+				null,
+				false);
+		});
+	}
+
+	private IReaderStrategy CreateReaderStrategy() {
+		var result = new SourceDefinitionBuilder();
+		result.FromAll();
+		result.AllEvents();
+		return ReaderStrategy.Create(
+			"test",
+			0,
+			result.Build(),
+			new RealTimeProvider(),
+			stopOnEof: false,
+			runAs: null);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_handling_committed_event_passing_the_filter.cs b/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_handling_committed_event_passing_the_filter.cs
new file mode 100644
index 00000000000..e7b927829a8
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_handling_committed_event_passing_the_filter.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projection_subscription;
+
+[TestFixture]
+public class when_handling_committed_event_passing_the_filter : TestFixtureWithProjectionSubscription {
+	protected override void When() {
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(200, 150), "test-stream", 1, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0]));
+	}
+
+	[Test]
+	public void event_is_passed_to_downstream_handler() {
+		Assert.AreEqual(1, _eventHandler.HandledMessages.Count);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_handling_duplicate_events.cs b/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_handling_duplicate_events.cs
new file mode 100644
index 00000000000..d6c7c0d74a0
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_handling_duplicate_events.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projection_subscription;
+
+[TestFixture]
+public class when_handling_duplicate_events : TestFixtureWithProjectionSubscription {
+	protected override void When() {
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(200, 150), "test-stream", 1, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0]));
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(100, 50), "test-stream", 0, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0]));
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(200, 150), "test-stream", 1, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0]));
+	}
+
+	[Test]
+	public void duplicates_are_not_passed_to_downstream_handler() {
+		Assert.AreEqual(1, _eventHandler.HandledMessages.Count);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_handling_enough_events_for_a_checkpoint_after_specified_time_elapses.cs b/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_handling_enough_events_for_a_checkpoint_after_specified_time_elapses.cs
new file mode 100644
index 00000000000..d83dc0efd8d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_handling_enough_events_for_a_checkpoint_after_specified_time_elapses.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projection_subscription;
+
+[TestFixture]
+public class
+	when_handling_enough_events_for_a_checkpoint_after_specified_time_elapses :
+		TestFixtureWithProjectionSubscription {
+	protected override void Given() {
+		_checkpointAfterMs = 1000;
+		_checkpointProcessedEventsThreshold = 1;
+		_timeProvider = new FakeTimeProvider();
+	}
+
+	protected override void When() {
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(200, 200), "test-stream", 1, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0]));
+		_checkpointHandler.HandledMessages.Clear();
+		((FakeTimeProvider)_timeProvider).AddToUtcTime(TimeSpan.FromMilliseconds(_checkpointAfterMs + 1));
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(300, 300), "test-stream", 1, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0]));
+	}
+
+	[Test]
+	public void checkpoint_is_suggested() {
+		Assert.AreEqual(1, _checkpointHandler.HandledMessages.Count);
+	}
+}
+
+[TestFixture]
+public class
+	when_handling_enough_events_for_a_checkpoint_after_specified_time_elapses_and_not_passing_filter :
+		TestFixtureWithProjectionSubscription {
+	protected override void Given() {
+		_source = source => {
+			source.FromAll();
+			source.IncludeEvent("specific-event");
+		};
+		_checkpointAfterMs = 1000;
+		_checkpointUnhandledBytesThreshold = 50;
+		_checkpointProcessedEventsThreshold = 1;
+		_timeProvider = new FakeTimeProvider();
+	}
+
+	protected override void When() {
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(200, 200), "test-stream", 1, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0]));
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(300, 300), "test-stream", 1, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0]));
+		_checkpointHandler.HandledMessages.Clear();
+		((FakeTimeProvider)_timeProvider).AddToUtcTime(TimeSpan.FromMilliseconds(_checkpointAfterMs + 1));
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(400, 400), "test-stream", 1, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0]));
+	}
+
+	[Test]
+	public void checkpoint_is_suggested() {
+		Assert.AreEqual(1, _checkpointHandler.HandledMessages.Count);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_handling_enough_events_for_a_checkpoint_before_specified_time_elapses.cs b/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_handling_enough_events_for_a_checkpoint_before_specified_time_elapses.cs
new file mode 100644
index 00000000000..ed613dc91a6
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_handling_enough_events_for_a_checkpoint_before_specified_time_elapses.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projection_subscription;
+
+[TestFixture]
+public class
+	when_handling_enough_events_for_a_checkpoint_before_specified_time_elapses :
+		TestFixtureWithProjectionSubscription {
+	protected override void Given() {
+		_checkpointAfterMs = 1000;
+		_checkpointProcessedEventsThreshold = 1;
+		_timeProvider = new FakeTimeProvider();
+	}
+
+	protected override void When() {
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(200, 200), "test-stream", 1, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0]));
+		_checkpointHandler.HandledMessages.Clear();
+		((FakeTimeProvider)_timeProvider).AddToUtcTime(TimeSpan.FromMilliseconds(_checkpointAfterMs));
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(300, 300), "test-stream", 1, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0]));
+	}
+
+	[Test]
+	public void checkpoint_is_not_suggested() {
+		Assert.AreEqual(0, _checkpointHandler.HandledMessages.Count);
+	}
+}
+
+[TestFixture]
+public class
+	when_handling_enough_events_for_a_checkpoint_before_specified_time_elapses_and_not_passing_filter :
+		TestFixtureWithProjectionSubscription {
+	protected override void Given() {
+		_source = source => {
+			source.FromAll();
+			source.IncludeEvent("specific-event");
+		};
+		_checkpointAfterMs = 1000;
+		_checkpointUnhandledBytesThreshold = 50;
+		_checkpointProcessedEventsThreshold = 1;
+		_timeProvider = new FakeTimeProvider();
+	}
+
+	protected override void When() {
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(200, 200), "test-stream", 1, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0]));
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(300, 300), "test-stream", 1, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0]));
+		_checkpointHandler.HandledMessages.Clear();
+		((FakeTimeProvider)_timeProvider).AddToUtcTime(TimeSpan.FromMilliseconds(_checkpointAfterMs));
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(400, 400), "test-stream", 1, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0]));
+	}
+
+	[Test]
+	public void checkpoint_is_not_suggested() {
+		Assert.AreEqual(0, _checkpointHandler.HandledMessages.Count);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_handling_events_with_content_type_validation.cs b/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_handling_events_with_content_type_validation.cs
new file mode 100644
index 00000000000..adf1b6f56ba
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_handling_events_with_content_type_validation.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projection_subscription;
+
+public class when_handling_events_with_content_type_validation {
+	[TestFixture]
+	public class given_json_events_and_content_type_validation_enabled : TestFixtureWithProjectionSubscription {
+		protected override void When() {
+			_subscription.Handle(
+				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					Guid.NewGuid(), new TFPos(100, 100), "test-stream", 0, false, Guid.NewGuid(),
+					"null-json", true, null, null));
+			_subscription.Handle(
+				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					Guid.NewGuid(), new TFPos(200, 200), "test-stream", 1, false, Guid.NewGuid(),
+					"invalid-json", true, Encoding.UTF8.GetBytes("{foo:bar}"), new byte[0]));
+			_subscription.Handle(
+				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					Guid.NewGuid(), new TFPos(300, 300), "test-stream", 2, false, Guid.NewGuid(),
+					"valid-json", true, Encoding.UTF8.GetBytes("{\"foo\":\"bar\"}"), new byte[0]));
+		}
+
+		protected override IReaderSubscription CreateProjectionSubscription() {
+			return new ReaderSubscription(
+				"Test Subscription",
+				_bus,
+				_projectionCorrelationId,
+				_readerStrategy.PositionTagger.MakeZeroCheckpointTag(),
+				_readerStrategy,
+				_timeProvider,
+				_checkpointUnhandledBytesThreshold,
+				_checkpointProcessedEventsThreshold,
+				_checkpointAfterMs,
+				false,
+				null,
+				true);
+		}
+
+		[Test]
+		public void only_the_valid_json_is_handled() {
+			Assert.AreEqual(1, _eventHandler.HandledMessages.Count);
+			Assert.AreEqual("valid-json", _eventHandler.HandledMessages[0].Data.EventType);
+		}
+	}
+
+	[TestFixture]
+	public class given_non_json_events_and_content_type_validation_enabled : TestFixtureWithProjectionSubscription {
+		protected override void When() {
+			_subscription.Handle(
+				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					Guid.NewGuid(), new TFPos(100, 100), "test-stream", 0, false, Guid.NewGuid(),
+					"null-event", false, null, null));
+			_subscription.Handle(
+				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					Guid.NewGuid(), new TFPos(200, 200), "test-stream", 1, false, Guid.NewGuid(),
+					"plain-text", false, Encoding.UTF8.GetBytes("foo bar"), new byte[0]));
+			_subscription.Handle(
+				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					Guid.NewGuid(), new TFPos(300, 300), "test-stream", 2, false, Guid.NewGuid(),
+					"valid-json", false, Encoding.UTF8.GetBytes("{\"foo\":\"bar\"}"), new byte[0]));
+		}
+
+		protected override IReaderSubscription CreateProjectionSubscription() {
+			return new ReaderSubscription(
+				"Test Subscription",
+				_bus,
+				_projectionCorrelationId,
+				_readerStrategy.PositionTagger.MakeZeroCheckpointTag(),
+				_readerStrategy,
+				_timeProvider,
+				_checkpointUnhandledBytesThreshold,
+				_checkpointProcessedEventsThreshold,
+				_checkpointAfterMs,
+				false,
+				null,
+				true);
+		}
+
+		[Test]
+		public void all_events_are_handled() {
+			Assert.AreEqual(3, _eventHandler.HandledMessages.Count);
+		}
+	}
+
+	[TestFixture]
+	public class given_json_and_non_json_events_and_content_type_validation_disabled : TestFixtureWithProjectionSubscription {
+		protected override void When() {
+			_subscription.Handle(
+				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					Guid.NewGuid(), new TFPos(100, 100), "test-stream", 0, false, Guid.NewGuid(),
+					"null-json", true, null, null));
+			_subscription.Handle(
+				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					Guid.NewGuid(), new TFPos(200, 200), "test-stream", 1, false, Guid.NewGuid(),
+					"invalid-json", true, Encoding.UTF8.GetBytes("{foo:bar}"), new byte[0]));
+			_subscription.Handle(
+				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					Guid.NewGuid(), new TFPos(300, 300), "test-stream", 2, false, Guid.NewGuid(),
+					"valid-json", true, Encoding.UTF8.GetBytes("{\"foo\":\"bar\"}"), new byte[0]));
+			_subscription.Handle(
+				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					Guid.NewGuid(), new TFPos(400, 400), "test-stream", 3, false, Guid.NewGuid(),
+					"null-event", false, null, null));
+			_subscription.Handle(
+				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					Guid.NewGuid(), new TFPos(500, 500), "test-stream", 4, false, Guid.NewGuid(),
+					"plain-text", false, Encoding.UTF8.GetBytes("foo bar"), new byte[0]));
+			_subscription.Handle(
+				ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					Guid.NewGuid(), new TFPos(600, 600), "test-stream", 5, false, Guid.NewGuid(),
+					"valid-json", false, Encoding.UTF8.GetBytes("{\"foo\":\"bar\"}"), new byte[0]));
+		}
+
+		protected override IReaderSubscription CreateProjectionSubscription() {
+			return new ReaderSubscription(
+				"Test Subscription",
+				_bus,
+				_projectionCorrelationId,
+				_readerStrategy.PositionTagger.MakeZeroCheckpointTag(),
+				_readerStrategy,
+				_timeProvider,
+				_checkpointUnhandledBytesThreshold,
+				_checkpointProcessedEventsThreshold,
+				_checkpointAfterMs,
+				false,
+				null,
+				false);
+		}
+
+		[Test]
+		public void all_events_are_handled() {
+			Assert.AreEqual(6, _eventHandler.HandledMessages.Count);
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_handling_events_with_different_event_filters.cs b/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_handling_events_with_different_event_filters.cs
new file mode 100644
index 00000000000..4cfb43c2025
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_handling_events_with_different_event_filters.cs
@@ -0,0 +1,99 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projection_subscription;
+
+[TestFixture("$all", "good-event-type", "any-stream", "bad-event-type", true, true)]
+[TestFixture("$all", "good-event-type", "any-stream", "bad-event-type", true, false)]
+[TestFixture("$all", "good-event-type", "any-stream", "bad-event-type", false, true)]
+[TestFixture("$all", "good-event-type", "any-stream", "bad-event-type", false, false)]
+[TestFixture("$all", "good-event-type", "any-stream", "good-event-type", true, true)]
+[TestFixture("$all", "good-event-type", "any-stream", "good-event-type", true, false)]
+[TestFixture("$all", "good-event-type", "any-stream", "good-event-type", false, true)]
+[TestFixture("$all", "good-event-type", "any-stream", "good-event-type", false, false)]
+[TestFixture("good-stream", "good-event-type", "good-stream", "good-event-type", true, true)]
+[TestFixture("good-stream", "good-event-type", "good-stream", "good-event-type", true, false)]
+[TestFixture("good-stream", "good-event-type", "good-stream", "good-event-type", false, true)]
+[TestFixture("good-stream", "good-event-type", "good-stream", "good-event-type", false, false)]
+[TestFixture("good-stream", "good-event-type", "good-stream", "bad-event-type", true, true)]
+[TestFixture("good-stream", "good-event-type", "good-stream", "bad-event-type", true, false)]
+[TestFixture("good-stream", "good-event-type", "good-stream", "bad-event-type", false, true)]
+[TestFixture("good-stream", "good-event-type", "good-stream", "bad-event-type", false, false)]
+[TestFixture("good-stream", "good-event-type", "bad-stream", "good-event-type", false, true)]
+[TestFixture("good-stream", "good-event-type", "bad-stream", "good-event-type", false, false)]
+[TestFixture("good-stream", "good-event-type", "bad-stream", "bad-event-type", false, true)]
+[TestFixture("good-stream", "good-event-type", "bad-stream", "bad-event-type", false, false)]
+public class
+	when_handling_events_with_different_event_filters :
+		TestFixtureWithProjectionSubscription {
+	private string _sourceStream;
+	private string _sourceEventType;
+	private string _stream;
+	private string _eventType;
+	private bool _exceedUnhandledBytesThreshold;
+	private bool _checkpointIfEventsProcessed;
+	private int _processedEvents;
+
+	public when_handling_events_with_different_event_filters(
+		string sourceStream, string sourceEventType, string stream, string eventType, bool exceedUnhandledBytesThreshold, bool checkpointIfEventsProcessed) {
+		_sourceStream = sourceStream;
+		_sourceEventType = sourceEventType;
+		_stream = stream;
+		_eventType = eventType;
+		_exceedUnhandledBytesThreshold = exceedUnhandledBytesThreshold;
+		_checkpointIfEventsProcessed = checkpointIfEventsProcessed;
+		var passesEventFilter = (sourceStream == "$all" || stream == sourceStream) && eventType == sourceEventType;
+		_processedEvents = passesEventFilter ? 1 : 0;
+	}
+
+	protected override void Given() {
+		_source = source => {
+			if (_sourceStream == "$all") {
+				source.FromAll();
+			} else {
+				source.FromStream(_sourceStream);
+			}
+			source.IncludeEvent(_sourceEventType);
+		};
+		_checkpointAfterMs = 1000;
+		_checkpointProcessedEventsThreshold = _checkpointIfEventsProcessed ? 1 : 2;
+		_checkpointUnhandledBytesThreshold = 4096;
+		_timeProvider = new FakeTimeProvider();
+	}
+
+	protected override void When() {
+		var firstPosition = new TFPos(200, 200);
+		var offset = _exceedUnhandledBytesThreshold
+			? (_checkpointUnhandledBytesThreshold + 1)
+			: _checkpointUnhandledBytesThreshold;
+		var secondPosition = new TFPos(firstPosition.CommitPosition + offset, firstPosition.PreparePosition + offset);
+
+		//send a first event for checkpointing initialization if necessary
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), firstPosition, "a-random-stream-name", 1, false, Guid.NewGuid(),
+				"a-random-event-type", false, new byte[0], new byte[0]));
+
+		_checkpointHandler.HandledMessages.Clear();
+
+		//send a second event to trigger checkpoint if necessary
+		((FakeTimeProvider)_timeProvider).AddToUtcTime(TimeSpan.FromMilliseconds(_checkpointAfterMs + 1));
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), secondPosition, _stream, 1, false, Guid.NewGuid(),
+				_eventType, false, new byte[0], new byte[0]));
+	}
+
+	[Test]
+	public void checkpoint_is_suggested_when_processed_events_threshold_exceeded_or_unhandled_bytes_threshold_exceeded() {
+		var shouldCheckpoint = (_processedEvents >= _checkpointProcessedEventsThreshold) ||
+							   (_processedEvents == 0 && _exceedUnhandledBytesThreshold);
+		Assert.AreEqual(shouldCheckpoint ? 1 : 0, _checkpointHandler.HandledMessages.Count);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_handling_multiple_committed_event_passing_the_filter.cs b/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_handling_multiple_committed_event_passing_the_filter.cs
new file mode 100644
index 00000000000..6bb15e9283a
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_handling_multiple_committed_event_passing_the_filter.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projection_subscription;
+
+[TestFixture]
+public class when_handling_multiple_committed_event_passing_the_filter : TestFixtureWithProjectionSubscription {
+	protected override void Given() {
+		base.Given();
+		_checkpointProcessedEventsThreshold = 2;
+	}
+
+	protected override void When() {
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(200, 150), "test-stream", 1, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0]));
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(300, 250), "test-stream", 2, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0]));
+	}
+
+	[Test]
+	public void events_passed_to_downstream_handler_have_correct_subscription_sequence_numbers() {
+		Assert.AreEqual(2, _eventHandler.HandledMessages.Count);
+
+		Assert.AreEqual(0, _eventHandler.HandledMessages[0].SubscriptionMessageSequenceNumber);
+		Assert.AreEqual(1, _eventHandler.HandledMessages[1].SubscriptionMessageSequenceNumber);
+	}
+
+	[Test]
+	public void suggests_a_checkpoint() {
+		Assert.AreEqual(1, _checkpointHandler.HandledMessages.Count);
+		Assert.AreEqual(CheckpointTag.FromPosition(0, 300, 250),
+			_checkpointHandler.HandledMessages[0].CheckpointTag);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_receiving_multiple_events_not_passing_event_filter.cs b/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_receiving_multiple_events_not_passing_event_filter.cs
new file mode 100644
index 00000000000..a68b25123bd
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projection_subscription/when_receiving_multiple_events_not_passing_event_filter.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projection_subscription;
+
+[TestFixture]
+public class when_receiving_multiple_events_not_passing_event_filter : TestFixtureWithProjectionSubscription {
+	protected override void Given() {
+		_source = source => {
+			source.FromAll();
+			source.IncludeEvent("specific-event");
+		};
+	}
+
+	protected override void When() {
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(200, 150), "test-stream", 1, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0]));
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(2000, 1950), "test-stream", 2, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0]));
+		_subscription.Handle(
+			ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+				Guid.NewGuid(), new TFPos(2100, 2050), "test-stream", 2, false, Guid.NewGuid(),
+				"bad-event-type", false, new byte[0], new byte[0]));
+	}
+
+	[Test]
+	public void checkpoint_suggested_message_is_published_once_for_interval() {
+		Assert.AreEqual(1, _checkpointHandler.HandledMessages.Count);
+		Assert.AreEqual(2000, _checkpointHandler.HandledMessages[0].CheckpointTag.CommitPosition);
+		Assert.AreEqual(1950, _checkpointHandler.HandledMessages[0].CheckpointTag.PreparePosition);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projection_version/when_comparing.cs b/src/KurrentDB.Projections.Core.Tests/Services/projection_version/when_comparing.cs
new file mode 100644
index 00000000000..2abcad0d7cf
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projection_version/when_comparing.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projection_version;
+
+[TestFixture]
+public class when_comparing {
+	[Test]
+	public void equal() {
+		var v1 = new ProjectionVersion(10, 5, 6);
+		var v2 = new ProjectionVersion(10, 5, 6);
+
+		Assert.AreEqual(v1, v2);
+	}
+
+	[Test]
+	public void not_equal_id() {
+		var v1 = new ProjectionVersion(10, 5, 6);
+		var v2 = new ProjectionVersion(11, 5, 6);
+
+		Assert.AreNotEqual(v1, v2);
+	}
+
+	[Test]
+	public void not_equal_epoch() {
+		var v1 = new ProjectionVersion(10, 5, 6);
+		var v2 = new ProjectionVersion(11, 6, 6);
+
+		Assert.AreNotEqual(v1, v2);
+	}
+
+	[Test]
+	public void not_equal_version() {
+		var v1 = new ProjectionVersion(10, 5, 6);
+		var v2 = new ProjectionVersion(10, 5, 7);
+
+		Assert.AreNotEqual(v1, v2);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/FakeBiStateProjection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/FakeBiStateProjection.cs
new file mode 100644
index 00000000000..2c1f350540e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/FakeBiStateProjection.cs
@@ -0,0 +1,89 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+public class FakeBiStateProjection : IProjectionStateHandler {
+	private readonly string _query;
+	private readonly Action<string, object[]> _logger;
+
+	public FakeBiStateProjection(string query, Action<string, object[]> logger) {
+		_query = query;
+		_logger = logger;
+	}
+
+	public void Dispose() {
+	}
+
+	private void Log(string msg, params object[] args) {
+		_logger(msg, args);
+	}
+
+	public void ConfigureSourceProcessingStrategy(SourceDefinitionBuilder builder) {
+		Log("ConfigureSourceProcessingStrategy(" + builder + ")");
+		builder.FromAll();
+		builder.AllEvents();
+		builder.SetByStream();
+		builder.SetIsBiState(true);
+	}
+
+	public void Load(string state) {
+		Log("Load(" + state + ")");
+	}
+
+	public void LoadShared(string state) {
+		Log("LoadShared(" + state + ")");
+	}
+
+	public void Initialize() {
+		Log("Initialize");
+	}
+
+	public void InitializeShared() {
+		Log("InitializeShared");
+	}
+
+	public string GetStatePartition(CheckpointTag eventPosition, string category, ResolvedEvent data) {
+		Log("GetStatePartition(" + "..." + ")");
+		throw new NotImplementedException();
+	}
+
+	public bool ProcessEvent(
+		string partition, CheckpointTag eventPosition, string category1, ResolvedEvent data, out string newState,
+		out string newSharedState, out EmittedEventEnvelope[] emittedEvents) {
+		newSharedState = null;
+		if (data.EventType == "fail" || _query == "fail")
+			throw new Exception("failed");
+		Log("ProcessEvent(" + "..." + ")");
+		newState = "{\"data\": 1}";
+		newSharedState = "{\"data\": 2}";
+		emittedEvents = null;
+		return true;
+	}
+
+	public bool ProcessPartitionCreated(string partition, CheckpointTag createPosition, ResolvedEvent data,
+		out EmittedEventEnvelope[] emittedEvents) {
+		Log("ProcessPartitionCreated");
+		emittedEvents = null;
+		return false;
+	}
+
+	public bool ProcessPartitionDeleted(string partition, CheckpointTag deletePosition, out string newState) {
+		throw new NotImplementedException();
+	}
+
+	public string TransformStateToResult() {
+		throw new NotImplementedException();
+	}
+
+	public IQuerySources GetSourceDefinition() {
+		return SourceDefinitionBuilder.From(ConfigureSourceProcessingStrategy);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/FakeForeachStreamProjection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/FakeForeachStreamProjection.cs
new file mode 100644
index 00000000000..f3bfdfb0c39
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/FakeForeachStreamProjection.cs
@@ -0,0 +1,92 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+public class FakeForeachStreamProjection : IProjectionStateHandler {
+	private readonly string _query;
+	private readonly Action<string, object[]> _logger;
+	private string _state;
+
+	public FakeForeachStreamProjection(string query, Action<string, object[]> logger) {
+		_query = query;
+		_logger = logger;
+	}
+
+	public void Dispose() {
+	}
+
+	private void Log(string msg, params object[] args) {
+		_logger(msg, args);
+	}
+
+	public void ConfigureSourceProcessingStrategy(SourceDefinitionBuilder builder) {
+		Log("ConfigureSourceProcessingStrategy(" + builder + ")");
+		builder.FromAll();
+		builder.AllEvents();
+		builder.SetByStream();
+		builder.SetDefinesStateTransform();
+	}
+
+	public void Load(string state) {
+		Log("Load(" + state + ")");
+		_state = state;
+	}
+
+	public void LoadShared(string state) {
+		throw new NotImplementedException();
+	}
+
+	public void Initialize() {
+		Log("Initialize");
+		_state = "";
+	}
+
+	public void InitializeShared() {
+		Log("InitializeShared");
+		throw new NotImplementedException();
+	}
+
+	public string GetStatePartition(CheckpointTag eventPosition, string category, ResolvedEvent data) {
+		Log("GetStatePartition(" + "..." + ")");
+		return @data.EventStreamId;
+	}
+
+	public bool ProcessEvent(
+		string partition, CheckpointTag eventPosition, string category1, ResolvedEvent data,
+		out string newState, out string newSharedState, out EmittedEventEnvelope[] emittedEvents) {
+		newSharedState = null;
+		if (data.EventType == "fail" || _query == "fail")
+			throw new Exception("failed");
+		Log("ProcessEvent(" + "..." + ")");
+		newState = "{\"data\": " + _state + data + "}";
+		emittedEvents = null;
+		return true;
+	}
+
+	public bool ProcessPartitionCreated(string partition, CheckpointTag createPosition, ResolvedEvent data,
+		out EmittedEventEnvelope[] emittedEvents) {
+		Log("Process ProcessPartitionCreated");
+		emittedEvents = null;
+		return false;
+	}
+
+	public bool ProcessPartitionDeleted(string partition, CheckpointTag deletePosition, out string newState) {
+		throw new NotImplementedException();
+	}
+
+	public string TransformStateToResult() {
+		return _state;
+	}
+
+	public IQuerySources GetSourceDefinition() {
+		return SourceDefinitionBuilder.From(ConfigureSourceProcessingStrategy);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/FakeProjection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/FakeProjection.cs
new file mode 100644
index 00000000000..57383d44c4b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/FakeProjection.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+public class FakeProjection : IProjectionStateHandler {
+	private readonly string _query;
+	private readonly Action<string, object[]> _logger;
+
+	public FakeProjection(string query, Action<string, object[]> logger) {
+		_query = query;
+		_logger = logger;
+	}
+
+	public void Dispose() {
+	}
+
+	private void Log(string msg, params object[] args) {
+		_logger(msg, args);
+	}
+
+	public void ConfigureSourceProcessingStrategy(SourceDefinitionBuilder builder) {
+		Log("ConfigureSourceProcessingStrategy(" + builder + ")");
+		builder.FromAll();
+		builder.AllEvents();
+	}
+
+	public void Load(string state) {
+		Log("Load(" + state + ")");
+		throw new NotImplementedException();
+	}
+
+	public void LoadShared(string state) {
+		throw new NotImplementedException();
+	}
+
+	public void Initialize() {
+		Log("Initialize");
+	}
+
+	public void InitializeShared() {
+		Log("InitializeShared");
+	}
+
+	public string GetStatePartition(CheckpointTag eventPosition, string category, ResolvedEvent data) {
+		Log("GetStatePartition(" + "..." + ")");
+		throw new NotImplementedException();
+	}
+
+	public bool ProcessEvent(
+		string partition, CheckpointTag eventPosition, string category1, ResolvedEvent data,
+		out string newState, out string newSharedState, out EmittedEventEnvelope[] emittedEvents) {
+		newSharedState = null;
+		if (data.EventType == "fail" || _query == "fail")
+			throw new Exception("failed");
+		Log("ProcessEvent(" + "..." + ")");
+		newState = "{\"data\": 1}";
+		emittedEvents = null;
+		return true;
+	}
+
+	public bool ProcessPartitionCreated(string partition, CheckpointTag createPosition, ResolvedEvent data,
+		out EmittedEventEnvelope[] emittedEvents) {
+		Log("Process ProcessPartitionCreated");
+		emittedEvents = null;
+		return false;
+	}
+
+	public bool ProcessPartitionDeleted(string partition, CheckpointTag deletePosition, out string newState) {
+		throw new NotImplementedException();
+	}
+
+	public string TransformStateToResult() {
+		throw new NotImplementedException();
+	}
+
+	public IQuerySources GetSourceDefinition() {
+		return SourceDefinitionBuilder.From(ConfigureSourceProcessingStrategy);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/TestFixtureWithProjectionCoreAndManagementServices.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/TestFixtureWithProjectionCoreAndManagementServices.cs
new file mode 100644
index 00000000000..774b00a4241
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/TestFixtureWithProjectionCoreAndManagementServices.cs
@@ -0,0 +1,263 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using DotNext;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Monitoring.Stats;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Messaging;
+using KurrentDB.Projections.Core.Metrics;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+using IODispatcherDelayedMessage = KurrentDB.Core.Helpers.IODispatcherDelayedMessage;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+public abstract class TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> : core_projection.TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	protected class GuardBusToTriggerFixingIfUsed : IQueuedHandler, IPublisher, ISubscriber {
+		public void Handle(Message message) {
+			throw new NotImplementedException();
+		}
+
+		public void Publish(Message message) {
+			throw new NotImplementedException();
+		}
+
+		public void Start() => throw new NotImplementedException();
+
+		public Task Stop() => Task.FromException(new NotImplementedException());
+
+		public void RequestStop() {
+			throw new NotImplementedException();
+		}
+
+		public QueueStats GetStatistics() {
+			throw new NotImplementedException();
+		}
+
+		public void Subscribe<T>(IAsyncHandle<T> handler) where T : Message {
+			throw new NotImplementedException();
+		}
+
+		public void Unsubscribe<T>(IAsyncHandle<T> handler) where T : Message {
+			throw new NotImplementedException();
+		}
+	}
+	protected ProjectionManager _manager;
+	protected ProjectionManagerMessageDispatcher _managerMessageDispatcher;
+	private bool _initializeSystemProjections;
+	protected Tuple<SynchronousScheduler, IPublisher, SynchronousScheduler, Guid>[] _processingQueues;
+	private ProjectionCoreCoordinator _coordinator;
+
+	protected override void Given1() {
+		base.Given1();
+		_initializeSystemProjections = GivenInitializeSystemProjections();
+		if (!_initializeSystemProjections) {
+			ExistingEvent(ProjectionNamesBuilder.ProjectionsRegistrationStream,
+				ProjectionEventTypes.ProjectionsInitialized, "", "");
+		}
+	}
+
+	protected virtual bool GivenInitializeSystemProjections() {
+		return false;
+	}
+
+	protected override ManualQueue GiveInputQueue() {
+		return new ManualQueue(_bus, _timeProvider);
+	}
+
+	[SetUp]
+	public void Setup() {
+		//TODO: this became an integration test - proper ProjectionCoreService and ProjectionManager testing is required as well
+		_bus.Subscribe(_consumer);
+
+		_processingQueues = GivenProcessingQueues();
+		var queues = _processingQueues.ToDictionary(v => v.Item4, v => v.Item1.As<IPublisher>());
+		_managerMessageDispatcher = new ProjectionManagerMessageDispatcher(queues);
+		_manager = new ProjectionManager(
+			GetInputQueue(),
+			GetInputQueue(),
+			queues,
+			_timeProvider,
+			ProjectionType.All,
+			_ioDispatcher,
+			TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault),
+			IProjectionTracker.NoOp,
+			_initializeSystemProjections);
+
+		_coordinator = new ProjectionCoreCoordinator(
+			ProjectionType.All,
+			queues.Values.ToArray(),
+			_bus);
+
+		_bus.Subscribe<ProjectionManagementMessage.Internal.CleanupExpired>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Internal.Deleted>(_manager);
+		_bus.Subscribe<CoreProjectionStatusMessage.Started>(_manager);
+		_bus.Subscribe<CoreProjectionStatusMessage.Stopped>(_manager);
+		_bus.Subscribe<CoreProjectionStatusMessage.Prepared>(_manager);
+		_bus.Subscribe<CoreProjectionStatusMessage.Faulted>(_manager);
+		_bus.Subscribe<CoreProjectionStatusMessage.StateReport>(_manager);
+		_bus.Subscribe<CoreProjectionStatusMessage.ResultReport>(_manager);
+		_bus.Subscribe<CoreProjectionStatusMessage.StatisticsReport>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.Post>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.PostBatch>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.UpdateQuery>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.GetQuery>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.Delete>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.GetStatistics>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.GetState>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.GetResult>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.Disable>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.Enable>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.Abort>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.SetRunAs>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.Reset>(_manager);
+		_bus.Subscribe<ClientMessage.WriteEventsCompleted>(_manager);
+		_bus.Subscribe<ClientMessage.ReadStreamEventsForwardCompleted>(_manager);
+		_bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_manager);
+		_bus.Subscribe<ClientMessage.DeleteStreamCompleted>(_manager);
+		_bus.Subscribe<ProjectionSubsystemMessage.StartComponents>(_manager);
+		_bus.Subscribe<ProjectionSubsystemMessage.StopComponents>(_manager);
+		_bus.Subscribe<ProjectionSubsystemMessage.StartComponents>(_coordinator);
+		_bus.Subscribe<ProjectionSubsystemMessage.StopComponents>(_coordinator);
+
+		if (GetInputQueue() != _processingQueues.First().Item2) {
+			_bus.Subscribe<CoreProjectionManagementControlMessage>(
+				_managerMessageDispatcher);
+		}
+
+		foreach (var q in _processingQueues)
+			SetUpCoreServices(q.Item4, q.Item1, q.Item2, q.Item3);
+
+		//Given();
+		WhenLoop();
+	}
+
+	protected virtual Tuple<SynchronousScheduler, IPublisher, SynchronousScheduler, Guid>[] GivenProcessingQueues() {
+		return new[] {
+			Tuple.Create(_bus, GetInputQueue(), (SynchronousScheduler)null, Guid.NewGuid())
+		};
+	}
+
+	private void SetUpCoreServices(
+		Guid workerId,
+		SynchronousScheduler bus,
+		IPublisher inputQueue,
+		SynchronousScheduler output_) {
+		var output = (output_ ?? inputQueue);
+		ICheckpoint writerCheckpoint = new InMemoryCheckpoint(1000);
+		var readerService = new EventReaderCoreService(
+			output,
+			_ioDispatcher,
+			10,
+			writerCheckpoint,
+			runHeadingReader: true, faultOutOfOrderProjections: true);
+		_subscriptionDispatcher = new ReaderSubscriptionDispatcher(inputQueue);
+
+		bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CheckpointSuggested>());
+		bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.CommittedEventReceived>());
+		bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.EofReached>());
+		bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionEofReached>());
+		bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.PartitionDeleted>());
+		bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ProgressChanged>());
+		bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.SubscriptionStarted>());
+		bus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.NotAuthorized>());
+		bus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.ReaderAssignedReader>());
+
+		var ioDispatcher = new IODispatcher(output, inputQueue, true);
+
+		var guardBus = new GuardBusToTriggerFixingIfUsed();
+		var configuration = new ProjectionsStandardComponents(1, ProjectionType.All, guardBus, guardBus, guardBus, guardBus, true,
+			500, 250, Opts.MaxProjectionStateSizeDefault);
+		var coreService = new ProjectionCoreService(
+			workerId,
+			inputQueue,
+			output,
+			_subscriptionDispatcher,
+			_timeProvider,
+			ioDispatcher,
+			configuration);
+
+		bus.Subscribe<CoreProjectionManagementMessage.CreateAndPrepare>(coreService);
+		bus.Subscribe<CoreProjectionManagementMessage.CreatePrepared>(coreService);
+		bus.Subscribe<CoreProjectionManagementMessage.Dispose>(coreService);
+		bus.Subscribe<CoreProjectionManagementMessage.Start>(coreService);
+		bus.Subscribe<CoreProjectionManagementMessage.LoadStopped>(coreService);
+		bus.Subscribe<CoreProjectionManagementMessage.Stop>(coreService);
+		bus.Subscribe<CoreProjectionManagementMessage.Kill>(coreService);
+		bus.Subscribe<CoreProjectionManagementMessage.GetState>(coreService);
+		bus.Subscribe<CoreProjectionManagementMessage.GetResult>(coreService);
+		bus.Subscribe<CoreProjectionProcessingMessage.CheckpointCompleted>(coreService);
+		bus.Subscribe<CoreProjectionProcessingMessage.CheckpointLoaded>(coreService);
+		bus.Subscribe<CoreProjectionProcessingMessage.PrerecordedEventsLoaded>(coreService);
+		bus.Subscribe<CoreProjectionProcessingMessage.RestartRequested>(coreService);
+		bus.Subscribe<CoreProjectionProcessingMessage.Failed>(coreService);
+		bus.Subscribe<ClientMessage.ReadStreamEventsForwardCompleted>(ioDispatcher.ForwardReader);
+		bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(ioDispatcher.BackwardReader);
+		bus.Subscribe<ClientMessage.NotHandled>(ioDispatcher.BackwardReader);
+		bus.Subscribe<ClientMessage.WriteEventsCompleted>(ioDispatcher.Writer);
+		bus.Subscribe<ClientMessage.DeleteStreamCompleted>(ioDispatcher.StreamDeleter);
+		bus.Subscribe<IODispatcherDelayedMessage>(ioDispatcher.Awaker);
+		bus.Subscribe<IODispatcherDelayedMessage>(ioDispatcher);
+		bus.Subscribe<ProjectionCoreServiceMessage.StartCore>(coreService);
+		bus.Subscribe<ProjectionCoreServiceMessage.StopCore>(coreService);
+		bus.Subscribe<ReaderCoreServiceMessage.StartReader>(readerService);
+		bus.Subscribe<ReaderCoreServiceMessage.StopReader>(readerService);
+		bus.Subscribe<ProjectionCoreServiceMessage.CoreTick>(coreService);
+		bus.Subscribe<ReaderSubscriptionMessage.CommittedEventDistributed>(readerService);
+		bus.Subscribe<ReaderSubscriptionMessage.EventReaderEof>(readerService);
+		bus.Subscribe<ReaderSubscriptionMessage.EventReaderPartitionEof>(readerService);
+		bus.Subscribe<ReaderSubscriptionMessage.EventReaderPartitionDeleted>(readerService);
+		bus.Subscribe<ReaderSubscriptionMessage.EventReaderNotAuthorized>(readerService);
+		bus.Subscribe<ReaderSubscriptionMessage.EventReaderIdle>(readerService);
+		bus.Subscribe<ReaderSubscriptionMessage.EventReaderStarting>(readerService);
+		bus.Subscribe<ReaderSubscriptionManagement.Pause>(readerService);
+		bus.Subscribe<ReaderSubscriptionManagement.Resume>(readerService);
+		bus.Subscribe<ReaderSubscriptionManagement.Subscribe>(readerService);
+		bus.Subscribe<ReaderSubscriptionManagement.Unsubscribe>(readerService);
+
+		if (output_ != null) {
+			bus.Subscribe(new UnwrapEnvelopeHandler());
+			output_.Subscribe(Forwarder.Create<CoreProjectionStatusMessage.StateReport>(GetInputQueue()));
+			output_.Subscribe(Forwarder.Create<CoreProjectionStatusMessage.ResultReport>(GetInputQueue()));
+			output_.Subscribe(Forwarder.Create<CoreProjectionStatusMessage.StatisticsReport>(GetInputQueue()));
+			output_.Subscribe(Forwarder.Create<CoreProjectionStatusMessage.Started>(GetInputQueue()));
+			output_.Subscribe(Forwarder.Create<CoreProjectionStatusMessage.Stopped>(GetInputQueue()));
+			output_.Subscribe(Forwarder.Create<CoreProjectionStatusMessage.Faulted>(GetInputQueue()));
+			output_.Subscribe(Forwarder.Create<CoreProjectionStatusMessage.Prepared>(GetInputQueue()));
+			output_.Subscribe(
+				Forwarder.Create<ProjectionManagementMessage.Command.ControlMessage>(GetInputQueue()));
+			output_.Subscribe(Forwarder.Create<AwakeServiceMessage.SubscribeAwake>(GetInputQueue()));
+			output_.Subscribe(Forwarder.Create<AwakeServiceMessage.UnsubscribeAwake>(GetInputQueue()));
+			output_.Subscribe(Forwarder.Create<Message>(inputQueue)); // forward all
+
+			var forwarder = new RequestResponseQueueForwarder(
+				inputQueue: inputQueue,
+				externalRequestQueue: GetInputQueue());
+			// forwarded messages
+			output_.Subscribe<ClientMessage.ReadEvent>(forwarder);
+			output_.Subscribe<ClientMessage.ReadStreamEventsBackward>(forwarder);
+			output_.Subscribe<ClientMessage.ReadStreamEventsForward>(forwarder);
+			output_.Subscribe<ClientMessage.ReadAllEventsForward>(forwarder);
+			output_.Subscribe<ClientMessage.WriteEvents>(forwarder);
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/bi_state/a_new_posted_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/bi_state/a_new_posted_projection.cs
new file mode 100644
index 00000000000..9a53099f736
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/bi_state/a_new_posted_projection.cs
@@ -0,0 +1,127 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager.bi_state;
+
+public static class a_new_posted_projection {
+	public abstract class Base<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+		protected string _projectionName;
+		protected string _projectionSource;
+		protected Type _fakeProjectionType;
+		protected ProjectionMode _projectionMode;
+		protected bool _checkpointsEnabled;
+		protected bool _trackEmittedStreams;
+		protected bool _emitEnabled;
+
+		protected override void Given() {
+			base.Given();
+			AllWritesSucceed();
+			NoOtherStreams();
+
+			_projectionName = "test-projection";
+			_projectionSource = @"";
+			_fakeProjectionType = typeof(FakeBiStateProjection);
+			_projectionMode = ProjectionMode.Continuous;
+			_checkpointsEnabled = true;
+			_trackEmittedStreams = true;
+			_emitEnabled = false;
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+			yield return
+				(new ProjectionManagementMessage.Command.Post(
+					_bus, _projectionMode, _projectionName,
+					ProjectionManagementMessage.RunAs.System, "native:" + _fakeProjectionType.AssemblyQualifiedName,
+					_projectionSource, enabled: true, checkpointsEnabled: _checkpointsEnabled,
+					trackEmittedStreams: _trackEmittedStreams,
+					emitEnabled: _emitEnabled));
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_get_state<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var m in base.When())
+				yield return m;
+			yield return (
+				new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, ""));
+		}
+
+		[Test]
+		public void returns_correct_state() {
+			Assert.AreEqual(
+				1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
+			Assert.AreEqual(
+				_projectionName,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().Name);
+			Assert.AreEqual(
+				"", _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().State);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_stopping<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
+		private Guid _reader;
+
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var m in base.When())
+				yield return m;
+
+			var readerAssignedMessage =
+				_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.ReaderAssignedReader>()
+					.LastOrDefault();
+			Assert.IsNotNull(readerAssignedMessage);
+			_reader = readerAssignedMessage.ReaderId;
+
+			yield return
+				(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					_reader, new TFPos(100, 50), new TFPos(100, 50), "stream1", 1, "stream1", 1, false,
+					Guid.NewGuid(),
+					"type", false, Helper.UTF8NoBom.GetBytes("1"), new byte[0], 100, 33.3f));
+
+			yield return
+				(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					_reader, new TFPos(200, 150), new TFPos(200, 150), "stream2", 1, "stream2", 1, false,
+					Guid.NewGuid(),
+					"type", false, Helper.UTF8NoBom.GetBytes("1"), new byte[0], 100, 33.3f));
+
+			yield return
+				new ProjectionManagementMessage.Command.Disable(
+					_bus, _projectionName, ProjectionManagementMessage.RunAs.System);
+		}
+
+		[Test]
+		public void writes_both_stream_and_shared_partition_checkpoints() {
+			var writeProjectionCheckpoints =
+				HandledMessages.OfType<ClientMessage.WriteEvents>()
+					.OfEventType(ProjectionEventTypes.ProjectionCheckpoint).ToArray();
+			var writeCheckpoints =
+				HandledMessages.OfType<ClientMessage.WriteEvents>()
+					.OfEventType(ProjectionEventTypes.PartitionCheckpoint).ToArray();
+
+			Assert.AreEqual(1, writeProjectionCheckpoints.Length);
+			Assert.AreEqual(@"[{""data"": 2}]", Encoding.UTF8.GetString(writeProjectionCheckpoints[0].Data));
+			Assert.AreEqual(2, writeCheckpoints.Length);
+
+			Assert.That(
+				writeCheckpoints.All(
+					v => Encoding.UTF8.GetString(v.Data) == @"[{""data"": 1},{""data"": 1}]"));
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/continuous/a_new_posted_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/continuous/a_new_posted_projection.cs
new file mode 100644
index 00000000000..2fdc8932e73
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/continuous/a_new_posted_projection.cs
@@ -0,0 +1,218 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager.continuous;
+
+public static class a_new_posted_projection {
+	public abstract class Base<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+		protected string _projectionName;
+		protected string _projectionSource;
+		protected Type _fakeProjectionType;
+		protected ProjectionMode _projectionMode;
+		protected bool _checkpointsEnabled;
+		protected bool _trackEmittedStreams;
+		protected bool _emitEnabled;
+		protected bool _projectionEnabled;
+
+		protected override void Given() {
+			base.Given();
+
+			_projectionName = "test-projection";
+			_projectionSource = @"";
+			_fakeProjectionType = typeof(FakeProjection);
+			_projectionMode = ProjectionMode.Continuous;
+			_checkpointsEnabled = true;
+			_trackEmittedStreams = true;
+			_emitEnabled = true;
+			_projectionEnabled = true;
+
+			NoStream("$projections-test-projection-checkpoint");
+			NoStream("$projections-test-projection-order");
+			NoOtherStreams();
+			AllWritesSucceed();
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+			yield return (
+				new ProjectionManagementMessage.Command.Post(
+					_bus, _projectionMode, _projectionName,
+					ProjectionManagementMessage.RunAs.System,
+					"native:" + _fakeProjectionType.AssemblyQualifiedName, _projectionSource,
+					enabled: _projectionEnabled,
+					checkpointsEnabled: _checkpointsEnabled, trackEmittedStreams: _trackEmittedStreams,
+					emitEnabled: _emitEnabled));
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_get_query<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var m in base.When())
+				yield return m;
+			yield return
+				(new ProjectionManagementMessage.Command.GetQuery(
+					_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
+		}
+
+		[Test]
+		public void returns_correct_source() {
+			Assert.AreEqual(
+				1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
+			var projectionQuery =
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
+			Assert.AreEqual(_projectionName, projectionQuery.Name);
+			Assert.AreEqual("", projectionQuery.Query);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_get_state<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
+		protected override void Given() {
+			base.Given();
+			EnableReadAll();
+			ExistingEvent("temp1", "test1", "{}", "{}");
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var m in base.When())
+				yield return m;
+			yield return (new ProjectionManagementMessage.Command.GetState(_bus,
+				_projectionName, ""));
+		}
+
+		[Test]
+		public void returns_correct_state() {
+			Assert.AreEqual(
+				1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
+			Assert.AreEqual(
+				_projectionName,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().Name);
+			//at least projection initializaed message is here
+			Assert.AreEqual(
+				"{\"data\": 1}",
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().State);
+			Assert.AreEqual(
+				_all.Last(v => !SystemStreams.IsSystemStream(v.Value.EventStreamId)).Key,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>()
+					.Single()
+					.Position.Position);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_failing<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var m in base.When())
+				yield return m;
+			var readerAssignedMessage =
+				_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.ReaderAssignedReader>()
+					.LastOrDefault();
+			Assert.IsNotNull(readerAssignedMessage);
+			var reader = readerAssignedMessage.ReaderId;
+
+			yield return
+				(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					reader, new TFPos(100, 50), new TFPos(100, 50), "stream", 1, "stream", 1, false, Guid.NewGuid(),
+					"fail", false, new byte[0], new byte[0], 100, 33.3f));
+		}
+
+		[Test]
+		public void publishes_faulted_message() {
+			Assert.AreEqual(1, _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Faulted>().Count());
+		}
+
+		[Test]
+		public void the_projection_status_becomes_faulted() {
+			_manager.Handle(
+				new ProjectionManagementMessage.Command.GetStatistics(
+					_bus, null, _projectionName, false));
+
+			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+			Assert.AreEqual(
+				1,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Length);
+			Assert.AreEqual(
+				_projectionName,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.Name);
+			Assert.AreEqual(
+				ManagedProjectionState.Faulted,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.LeaderStatus);
+		}
+	}
+}
+
+public class an_expired_projection {
+	public abstract class Base<TLogFormat, TStreamId> : a_new_posted_projection.Base<TLogFormat, TStreamId> {
+		protected Guid _reader;
+
+		protected override void Given() {
+			AllWritesSucceed();
+			base.Given();
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var m in base.When())
+				yield return m;
+			var readerAssignedMessage =
+				_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.ReaderAssignedReader>()
+					.LastOrDefault();
+			Assert.IsNotNull(readerAssignedMessage);
+			_reader = readerAssignedMessage.ReaderId;
+
+			yield return
+				(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					_reader, new TFPos(100, 50), new TFPos(100, 50), "stream", 1, "stream", 1, false,
+					Guid.NewGuid(),
+					"type", false, new byte[0], new byte[0], 100, 33.3f));
+			_timeProvider.AddToUtcTime(TimeSpan.FromMinutes(6));
+			yield return Yield;
+			foreach (var m in _consumer.HandledMessages.OfType<TimerMessage.Schedule>().ToArray())
+				m.Envelope.ReplyWith(m.ReplyMessage);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_retrieving_statistics<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var s in base.When())
+				yield return s;
+			_consumer.HandledMessages.Clear();
+			yield return (
+				new ProjectionManagementMessage.Command.GetStatistics(
+					_bus, null, _projectionName, false));
+		}
+
+		[Test]
+		public void projection_is_not_deleted() {
+			Assert.IsFalse(_consumer.HandledMessages.OfType<ProjectionManagementMessage.NotFound>().Any());
+			var res = _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+				.First(x => x.Projections.Any(y => y.Name == _projectionName));
+			Assert.AreEqual("Running", res.Projections.First(x => x.Name == _projectionName).Status);
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/continuous/a_running_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/continuous/a_running_projection.cs
new file mode 100644
index 00000000000..106912b4e3d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/continuous/a_running_projection.cs
@@ -0,0 +1,295 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Management;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager.continuous;
+
+public class a_running_projection {
+	public abstract class Base<TLogFormat, TStreamId> : a_new_posted_projection.Base<TLogFormat, TStreamId> {
+		protected Guid _reader;
+
+		protected override void Given() {
+			base.Given();
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var m in base.When())
+				yield return m;
+			var readerAssignedMessage =
+				_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.ReaderAssignedReader>()
+					.LastOrDefault();
+			if (_projectionEnabled) {
+				Assert.IsNotNull(readerAssignedMessage);
+				_reader = readerAssignedMessage.ReaderId;
+
+				yield return
+					(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+						_reader, new TFPos(100, 50), new TFPos(100, 50), "stream", 1, "stream", 1, false,
+						Guid.NewGuid(), "type", false, new byte[0], new byte[0], 100, 33.3f));
+			} else
+				_reader = Guid.Empty;
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_stopping<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var m in base.When())
+				yield return m;
+
+			yield return
+				(new ProjectionManagementMessage.Command.Disable(
+					_bus, _projectionName, ProjectionManagementMessage.RunAs.System));
+			for (var i = 0; i < 50; i++) {
+				yield return
+					(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+						_reader, new TFPos(100 * i + 200, 150), new TFPos(100 * i + 200, 150), "stream", 1 + i + 1,
+						"stream", 1 + i + 1, false, Guid.NewGuid(), "type", false, new byte[0], new byte[0],
+						100 * i + 200, 33.3f));
+			}
+		}
+
+		[Test]
+		public void pause_message_is_published() {
+			Assert.Inconclusive("actually in unsubscribes...");
+		}
+
+		[Test]
+		public void unsubscribe_message_is_published() {
+			Assert.Inconclusive("actually in unsubscribes...");
+		}
+
+
+		[Test]
+		public void the_projection_status_becomes_stopped_disabled() {
+			_manager.Handle(
+				new ProjectionManagementMessage.Command.GetStatistics(
+					_bus, null, _projectionName, false));
+
+			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+			Assert.AreEqual(
+				1,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Length);
+			Assert.AreEqual(
+				_projectionName,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.Name);
+			Assert.AreEqual(
+				ManagedProjectionState.Stopped,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.LeaderStatus);
+			Assert.AreEqual(
+				false,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.Enabled);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_handling_event<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var m in base.When())
+				yield return m;
+			yield return
+				(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					_reader, new TFPos(200, 150), new TFPos(200, 150), "stream", 2, "stream", 2, false,
+					Guid.NewGuid(), "type", false, new byte[0], new byte[0], 100, 33.3f));
+		}
+
+		[Test]
+		public void the_projection_status_remains_running_enabled() {
+			_manager.Handle(
+				new ProjectionManagementMessage.Command.GetStatistics(
+					_bus, null, _projectionName, false));
+
+			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+			Assert.AreEqual(
+				1,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Length);
+			Assert.AreEqual(
+				_projectionName,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.Name);
+			Assert.AreEqual(
+				ManagedProjectionState.Running,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.LeaderStatus);
+			Assert.AreEqual(
+				true,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.Enabled);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_resetting<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
+		protected override void Given() {
+			base.Given();
+			_projectionEnabled = false;
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var m in base.When())
+				yield return m;
+
+			yield return
+				(new ProjectionManagementMessage.Command.Reset(
+					_bus, _projectionName, ProjectionManagementMessage.RunAs.System));
+		}
+
+		[Test]
+		public void the_projection_epoch_changes() {
+			_manager.Handle(
+				new ProjectionManagementMessage.Command.GetStatistics(
+					_bus, null, _projectionName, false));
+
+			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+			Assert.AreEqual(
+				1,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Length);
+			Assert.AreEqual(
+				1,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.Epoch);
+			Assert.AreEqual(
+				1,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.Version);
+		}
+
+		[Test]
+		public void the_projection_status_is_enabled_running() {
+			_manager.Handle(
+				new ProjectionManagementMessage.Command.GetStatistics(
+					_bus, null, _projectionName, false));
+
+			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+			Assert.AreEqual(
+				1,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Length);
+			Assert.AreEqual(
+				ManagedProjectionState.Stopped,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.LeaderStatus);
+			Assert.AreEqual(
+				false,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.Enabled);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_resetting_and_starting<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
+		protected override void Given() {
+			base.Given();
+			_projectionEnabled = false;
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var m in base.When())
+				yield return m;
+			yield return
+				(new ProjectionManagementMessage.Command.Reset(
+					_bus, _projectionName, ProjectionManagementMessage.RunAs.System));
+			yield return
+				(new ProjectionManagementMessage.Command.Enable(
+					_bus, _projectionName, ProjectionManagementMessage.RunAs.System));
+			yield return
+				(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					_reader, new TFPos(100, 150), new TFPos(100, 150), "stream", 1 + 1, "stream", 1 + 1, false,
+					Guid.NewGuid(), "type", false, new byte[0], new byte[0], 200, 33.3f));
+		}
+
+		[Test]
+		public void the_projection_epoch_changes() {
+			_manager.Handle(
+				new ProjectionManagementMessage.Command.GetStatistics(
+					_bus, null, _projectionName, false));
+
+			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+			Assert.AreEqual(
+				1,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Length);
+			Assert.AreEqual(
+				1,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.Epoch);
+			Assert.AreEqual(
+				2,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.Version);
+		}
+
+		[Test]
+		public void the_projection_status_is_enabled_running() {
+			_manager.Handle(
+				new ProjectionManagementMessage.Command.GetStatistics(
+					_bus, null, _projectionName, false));
+
+			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+			Assert.AreEqual(
+				1,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Length);
+			Assert.AreEqual(
+				ManagedProjectionState.Running,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.LeaderStatus);
+			Assert.AreEqual(
+				true,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.Enabled);
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/managed_projection/when_creating_a_managed_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/managed_projection/when_creating_a_managed_projection.cs
new file mode 100644
index 00000000000..2247a1eebad
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/managed_projection/when_creating_a_managed_projection.cs
@@ -0,0 +1,114 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Management;
+using NUnit.Framework;
+using core_projection_TestFixtureWithReadWriteDispatchers = KurrentDB.Projections.Core.Tests.Services.core_projection.TestFixtureWithReadWriteDispatchers;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager.managed_projection;
+
+[TestFixture]
+public class when_creating_a_managed_projection : core_projection_TestFixtureWithReadWriteDispatchers {
+	private new ITimeProvider _timeProvider;
+
+	private
+		RequestResponseDispatcher<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>
+		_getStateDispatcher;
+
+	private
+		RequestResponseDispatcher
+		<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>
+		_getResultDispatcher;
+
+	[SetUp]
+	public void setup() {
+		_timeProvider = new FakeTimeProvider();
+		_getStateDispatcher =
+			new RequestResponseDispatcher
+				<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>(
+					_bus,
+					v => v.CorrelationId,
+					v => v.CorrelationId,
+					_bus);
+		_getResultDispatcher =
+			new RequestResponseDispatcher
+				<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>(
+					_bus,
+					v => v.CorrelationId,
+					v => v.CorrelationId,
+					_bus);
+	}
+
+
+	[Test]
+	public void empty_guid_throws_invalid_argument_exception() {
+		Assert.Throws<ArgumentException>(() => {
+			new ManagedProjection(
+				Guid.NewGuid(),
+				Guid.Empty,
+				1,
+				"name",
+				true,
+				null,
+				_streamDispatcher,
+				_writeDispatcher,
+				_readDispatcher,
+				_bus,
+				_timeProvider,
+				_getStateDispatcher,
+				_getResultDispatcher,
+				_ioDispatcher,
+				TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault));
+		});
+	}
+
+	[Test]
+	public void null_name_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			new ManagedProjection(
+				Guid.NewGuid(),
+				Guid.NewGuid(),
+				1,
+				null,
+				true,
+				null,
+				_streamDispatcher,
+				_writeDispatcher,
+				_readDispatcher,
+				_bus,
+				_timeProvider,
+				_getStateDispatcher,
+				_getResultDispatcher,
+				_ioDispatcher,
+				TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault));
+		});
+	}
+
+	[Test]
+	public void empty_name_throws_argument_exception() {
+		Assert.Throws<ArgumentException>(() => {
+			new ManagedProjection(
+				Guid.NewGuid(),
+				Guid.NewGuid(),
+				1,
+				"",
+				true,
+				null,
+				_streamDispatcher,
+				_writeDispatcher,
+				_readDispatcher,
+				_bus,
+				_timeProvider,
+				_getStateDispatcher,
+				_getResultDispatcher,
+				_ioDispatcher,
+				TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault));
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/managed_projection/when_loading_a_managed_projection_state.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/managed_projection/when_loading_a_managed_projection_state.cs
new file mode 100644
index 00000000000..124d7b5c5bf
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/managed_projection/when_loading_a_managed_projection_state.cs
@@ -0,0 +1,121 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager.managed_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_loading_a_managed_projection_state<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private new ITimeProvider _timeProvider;
+
+	private ManagedProjection _mp;
+
+	protected override void Given() {
+		_timeProvider = new FakeTimeProvider();
+		_mp = new ManagedProjection(
+			Guid.NewGuid(),
+			Guid.NewGuid(),
+			1,
+			"name",
+			true,
+			null,
+			_streamDispatcher,
+			_writeDispatcher,
+			_readDispatcher,
+			_bus,
+			_timeProvider, new RequestResponseDispatcher
+				<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>(
+					_bus,
+					v => v.CorrelationId,
+					v => v.CorrelationId,
+					_bus), new RequestResponseDispatcher
+				<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>(
+					_bus,
+					v => v.CorrelationId,
+					v => v.CorrelationId,
+					_bus),
+			_ioDispatcher,
+			TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault));
+	}
+
+	[Test]
+	public void null_handler_type_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			ProjectionManagementMessage.Command.Post message = new ProjectionManagementMessage.Command.Post(
+				new NoopEnvelope(), ProjectionMode.OneTime, "name", ProjectionManagementMessage.RunAs.Anonymous,
+				(string)null, @"log(1);", enabled: true, checkpointsEnabled: false, emitEnabled: false,
+				trackEmittedStreams: false);
+			_mp.InitializeNew(
+				new ManagedProjection.PersistedState {
+					Enabled = message.Enabled,
+					HandlerType = message.HandlerType,
+					Query = message.Query,
+					Mode = message.Mode,
+					EmitEnabled = message.EmitEnabled,
+					CheckpointsDisabled = !message.CheckpointsEnabled,
+					Epoch = -1,
+					Version = -1,
+					RunAs = message.EnableRunAs ? SerializedRunAs.SerializePrincipal(message.RunAs) : null,
+				},
+				null);
+		});
+	}
+
+	[Test]
+	public void empty_handler_type_throws_argument_null_exception() {
+		Assert.Throws<ArgumentException>(() => {
+			ProjectionManagementMessage.Command.Post message = new ProjectionManagementMessage.Command.Post(
+				new NoopEnvelope(), ProjectionMode.OneTime, "name", ProjectionManagementMessage.RunAs.Anonymous, "",
+				@"log(1);", enabled: true, checkpointsEnabled: false, emitEnabled: false,
+				trackEmittedStreams: false);
+			_mp.InitializeNew(
+				new ManagedProjection.PersistedState {
+					Enabled = message.Enabled,
+					HandlerType = message.HandlerType,
+					Query = message.Query,
+					Mode = message.Mode,
+					EmitEnabled = message.EmitEnabled,
+					CheckpointsDisabled = !message.CheckpointsEnabled,
+					Epoch = -1,
+					Version = -1,
+					RunAs = message.EnableRunAs ? SerializedRunAs.SerializePrincipal(message.RunAs) : null,
+				},
+				null);
+		});
+	}
+
+	[Test]
+	public void null_query_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			ProjectionManagementMessage.Command.Post message = new ProjectionManagementMessage.Command.Post(
+				new NoopEnvelope(), ProjectionMode.OneTime, "name", ProjectionManagementMessage.RunAs.Anonymous,
+				"JS", query: null, enabled: true, checkpointsEnabled: false, emitEnabled: false,
+				trackEmittedStreams: false);
+			_mp.InitializeNew(
+				new ManagedProjection.PersistedState {
+					Enabled = message.Enabled,
+					HandlerType = message.HandlerType,
+					Query = message.Query,
+					Mode = message.Mode,
+					EmitEnabled = message.EmitEnabled,
+					CheckpointsDisabled = !message.CheckpointsEnabled,
+					Epoch = -1,
+					Version = -1,
+					RunAs = message.EnableRunAs ? SerializedRunAs.SerializePrincipal(message.RunAs) : null,
+				},
+				null);
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/managed_projection/when_loading_existing_projection_state.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/managed_projection/when_loading_existing_projection_state.cs
new file mode 100644
index 00000000000..b223278d745
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/managed_projection/when_loading_existing_projection_state.cs
@@ -0,0 +1,133 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager.managed_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_loading_existing_projection_state_with_no_projection_subsystem_version<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private new ITimeProvider _timeProvider;
+	private string _projectionName = Guid.NewGuid().ToString();
+
+	private ManagedProjection _mp;
+
+	protected override void Given() {
+		var persistedState = new ManagedProjection.PersistedState {
+			Enabled = true,
+			HandlerType = "JS",
+			Query = @"log(1);",
+			Mode = ProjectionMode.Continuous,
+			EmitEnabled = true,
+			CheckpointsDisabled = true,
+			Epoch = -1,
+			Version = -1,
+			RunAs = SerializedRunAs.SerializePrincipal(ProjectionManagementMessage.RunAs.Anonymous)
+		};
+		ExistingEvent(ProjectionNamesBuilder.ProjectionsStreamPrefix + _projectionName,
+			ProjectionEventTypes.ProjectionUpdated, "", persistedState.ToJson());
+
+		_timeProvider = new FakeTimeProvider();
+		_mp = new ManagedProjection(
+			Guid.NewGuid(),
+			Guid.NewGuid(),
+			1,
+			"name",
+			true,
+			null,
+			_streamDispatcher,
+			_writeDispatcher,
+			_readDispatcher,
+			_bus,
+			_timeProvider, new RequestResponseDispatcher
+				<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>(
+					_bus,
+					v => v.CorrelationId,
+					v => v.CorrelationId,
+					_bus), new RequestResponseDispatcher
+				<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>(
+					_bus,
+					v => v.CorrelationId,
+					v => v.CorrelationId,
+					_bus),
+			_ioDispatcher,
+			TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault));
+	}
+
+	[Test]
+	public void content_type_validation_is_disabled() {
+		_mp.InitializeExisting(_projectionName);
+		Assert.False(_mp.EnableContentTypeValidation);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_loading_existing_projection_state_with_projection_subsystem_version<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private new ITimeProvider _timeProvider;
+	private string _projectionName = Guid.NewGuid().ToString();
+
+	private ManagedProjection _mp;
+
+	protected override void Given() {
+		var persistedState = new ManagedProjection.PersistedState {
+			Enabled = true,
+			HandlerType = "JS",
+			Query = @"log(1);",
+			Mode = ProjectionMode.Continuous,
+			EmitEnabled = true,
+			CheckpointsDisabled = true,
+			Epoch = -1,
+			Version = -1,
+			RunAs = SerializedRunAs.SerializePrincipal(ProjectionManagementMessage.RunAs.Anonymous),
+			ProjectionSubsystemVersion = 4
+		};
+		ExistingEvent(ProjectionNamesBuilder.ProjectionsStreamPrefix + _projectionName,
+			ProjectionEventTypes.ProjectionUpdated, "", persistedState.ToJson());
+
+		_timeProvider = new FakeTimeProvider();
+		_mp = new ManagedProjection(
+			Guid.NewGuid(),
+			Guid.NewGuid(),
+			1,
+			"name",
+			true,
+			null,
+			_streamDispatcher,
+			_writeDispatcher,
+			_readDispatcher,
+			_bus,
+			_timeProvider, new RequestResponseDispatcher
+				<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>(
+					_bus,
+					v => v.CorrelationId,
+					v => v.CorrelationId,
+					_bus), new RequestResponseDispatcher
+				<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>(
+					_bus,
+					v => v.CorrelationId,
+					v => v.CorrelationId,
+					_bus),
+			_ioDispatcher,
+			TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault));
+	}
+
+	[Test]
+	public void content_type_validation_is_enabled() {
+		_mp.InitializeExisting(_projectionName);
+		Assert.True(_mp.EnableContentTypeValidation);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/managed_projection/when_persisted_state_write_fails.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/managed_projection/when_persisted_state_write_fails.cs
new file mode 100644
index 00000000000..20dfc7900ba
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/managed_projection/when_persisted_state_write_fails.cs
@@ -0,0 +1,125 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager.managed_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string), OperationResult.CommitTimeout)]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), OperationResult.CommitTimeout)]
+[TestFixture(typeof(LogFormat.V2), typeof(string), OperationResult.ForwardTimeout)]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), OperationResult.ForwardTimeout)]
+[TestFixture(typeof(LogFormat.V2), typeof(string), OperationResult.PrepareTimeout)]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), OperationResult.PrepareTimeout)]
+public class when_persisted_state_write_fails<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private new ITimeProvider _timeProvider;
+	private ManagedProjection _managedProjection;
+	private Guid _coreProjectionId;
+	private string _projectionName;
+	private string _projectionDefinitionStreamId;
+	private Guid _originalPersistedStateEventId;
+
+	private OperationResult _failureCondition;
+
+	public when_persisted_state_write_fails(OperationResult failureCondition) {
+		_failureCondition = failureCondition;
+	}
+
+	protected override ManualQueue GiveInputQueue() {
+		return new ManualQueue(_bus, _timeProvider);
+	}
+
+	[SetUp]
+	public void SetUp() {
+		AllWritesQueueUp();
+		WhenLoop();
+	}
+
+	protected override void Given() {
+		_projectionName = "projectionName";
+		_projectionDefinitionStreamId = ProjectionNamesBuilder.ProjectionsStreamPrefix + _projectionName;
+		_coreProjectionId = Guid.NewGuid();
+		_timeProvider = new FakeTimeProvider();
+		_managedProjection = new ManagedProjection(
+			Guid.NewGuid(),
+			Guid.NewGuid(),
+			1,
+			_projectionName,
+			true,
+			null,
+			_streamDispatcher,
+			_writeDispatcher,
+			_readDispatcher,
+			_bus,
+			_timeProvider, new RequestResponseDispatcher
+				<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>(
+					_bus,
+					v => v.CorrelationId,
+					v => v.CorrelationId,
+					_bus),
+			new RequestResponseDispatcher
+				<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>(
+					_bus,
+					v => v.CorrelationId,
+					v => v.CorrelationId,
+					_bus),
+			_ioDispatcher,
+			TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault));
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		ProjectionManagementMessage.Command.Post message = new ProjectionManagementMessage.Command.Post(
+			Envelope, ProjectionMode.OneTime, _projectionName, ProjectionManagementMessage.RunAs.System,
+			typeof(FakeForeachStreamProjection), "", true, false, false, false);
+		_managedProjection.InitializeNew(
+			new ManagedProjection.PersistedState {
+				Enabled = message.Enabled,
+				HandlerType = message.HandlerType,
+				Query = message.Query,
+				Mode = message.Mode,
+				EmitEnabled = message.EmitEnabled,
+				CheckpointsDisabled = !message.CheckpointsEnabled,
+				Epoch = -1,
+				Version = -1,
+				RunAs = message.EnableRunAs ? SerializedRunAs.SerializePrincipal(message.RunAs) : null,
+			},
+			null);
+
+		var sourceDefinition = new FakeForeachStreamProjection("", Console.WriteLine).GetSourceDefinition();
+		var projectionSourceDefinition = ProjectionSourceDefinition.From(sourceDefinition);
+
+		_managedProjection.Handle(
+			new CoreProjectionStatusMessage.Prepared(
+				_coreProjectionId, projectionSourceDefinition));
+
+		_originalPersistedStateEventId = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
+			.Where(x => x.EventStreamId == _projectionDefinitionStreamId).First().Events[0].EventId;
+
+		CompleteWriteWithResult(_failureCondition);
+
+		_consumer.HandledMessages.Clear();
+
+		yield break;
+	}
+
+	[Test]
+	public void should_retry_writing_the_persisted_state_with_the_same_event_id() {
+		var eventId = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
+			.Where(x => x.EventStreamId == _projectionDefinitionStreamId).First().Events[0].EventId;
+		Assert.AreEqual(eventId, _originalPersistedStateEventId);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/managed_projection/when_starting_a_managed_projection_without_follower_projections.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/managed_projection/when_starting_a_managed_projection_without_follower_projections.cs
new file mode 100644
index 00000000000..ab985bda1a9
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/managed_projection/when_starting_a_managed_projection_without_follower_projections.cs
@@ -0,0 +1,100 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager.managed_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_starting_a_managed_projection_without_follower_projections<TLogFormat, TStreamId> : core_projection.TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private new ITimeProvider _timeProvider;
+
+	private ManagedProjection _mp;
+	private Guid _coreProjectionId;
+	private string _projectionName;
+
+	[SetUp]
+	public new void SetUp() {
+		WhenLoop();
+	}
+
+	protected override ManualQueue GiveInputQueue() {
+		return new ManualQueue(_bus, _timeProvider);
+	}
+
+	protected override void Given() {
+		_projectionName = "projection";
+		_coreProjectionId = Guid.NewGuid();
+		_timeProvider = new FakeTimeProvider();
+		_mp = new ManagedProjection(
+			Guid.NewGuid(),
+			Guid.NewGuid(),
+			1,
+			"name",
+			true,
+			null,
+			_streamDispatcher,
+			_writeDispatcher,
+			_readDispatcher,
+			_bus,
+			_timeProvider, new RequestResponseDispatcher
+				<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>(
+					_bus,
+					v => v.CorrelationId,
+					v => v.CorrelationId,
+					_bus), new RequestResponseDispatcher
+				<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>(
+					_bus,
+					v => v.CorrelationId,
+					v => v.CorrelationId,
+					_bus), _ioDispatcher,
+			TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault));
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		ProjectionManagementMessage.Command.Post message = new ProjectionManagementMessage.Command.Post(
+			Envelope, ProjectionMode.Transient, _projectionName, ProjectionManagementMessage.RunAs.System,
+			typeof(FakeForeachStreamProjection), "", true, false, false, false);
+		_mp.InitializeNew(
+			new ManagedProjection.PersistedState {
+				Enabled = message.Enabled,
+				HandlerType = message.HandlerType,
+				Query = message.Query,
+				Mode = message.Mode,
+				EmitEnabled = message.EmitEnabled,
+				CheckpointsDisabled = !message.CheckpointsEnabled,
+				Epoch = -1,
+				Version = -1,
+				RunAs = message.EnableRunAs ? SerializedRunAs.SerializePrincipal(message.RunAs) : null,
+			},
+			null);
+
+		var sourceDefinition = new FakeForeachStreamProjection("", Console.WriteLine).GetSourceDefinition();
+		var projectionSourceDefinition = ProjectionSourceDefinition.From(sourceDefinition);
+
+		_mp.Handle(
+			new CoreProjectionStatusMessage.Prepared(
+				_coreProjectionId, projectionSourceDefinition));
+		yield break;
+	}
+
+	[Test]
+	public void publishes_start_message() {
+		var startMessage = HandledMessages.OfType<CoreProjectionManagementMessage.Start>().LastOrDefault();
+		Assert.IsNotNull(startMessage);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/managed_projection/when_updating_projection_config.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/managed_projection/when_updating_projection_config.cs
new file mode 100644
index 00000000000..68d6ecbf1ba
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/managed_projection/when_updating_projection_config.cs
@@ -0,0 +1,448 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Common;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager.managed_projection;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+public class when_initializing_projection_with_default_options<TLogFormat, TStreamId> : projection_config_test_base<TLogFormat, TStreamId> {
+	private ManagedProjection _mp;
+	private Guid _projectionId = Guid.NewGuid();
+	private ProjectionManagementMessage.ProjectionConfig _config;
+	private EventRecord _persistedStateWrite;
+
+	private ManagedProjection.PersistedState _persistedState = new ManagedProjection.PersistedState {
+		Enabled = true,
+		HandlerType = "JS",
+		Query = "fromAll().when({});",
+		Mode = ProjectionMode.Continuous,
+		CheckpointsDisabled = null,
+		Epoch = null,
+		Version = null,
+		RunAs = null,
+		EmitEnabled = null,
+		TrackEmittedStreams = null,
+		CheckpointAfterMs = (int)ProjectionConsts.CheckpointAfterMs.TotalMilliseconds,
+		CheckpointHandledThreshold = ProjectionConsts.CheckpointHandledThreshold,
+		CheckpointUnhandledBytesThreshold = ProjectionConsts.CheckpointUnhandledBytesThreshold,
+		MaxAllowedWritesInFlight = ProjectionConsts.MaxAllowedWritesInFlight,
+		ProjectionExecutionTimeout = null,
+		CreateTempStreams = null
+	};
+
+	public when_initializing_projection_with_default_options() {
+		AllWritesQueueUp();
+	}
+
+	protected override void Given() {
+		_timeProvider = new FakeTimeProvider();
+		_mp = CreateManagedProjection();
+
+		_mp.InitializeNew(
+			_persistedState,
+			null);
+		_mp.Handle(new CoreProjectionStatusMessage.Prepared(_projectionId, new ProjectionSourceDefinition()));
+
+		// Complete write of persisted state to start projection
+		OneWriteCompletes();
+		_config = GetProjectionConfig(_mp);
+		_persistedStateWrite = _streams[ProjectionStreamId].LastOrDefault();
+	}
+
+	[Test]
+	public void projection_execution_timeout_should_be_null() {
+		Assert.IsNotNull(_config);
+		Assert.IsNull(_config.ProjectionExecutionTimeout, "ProjectionExecutionTimeout");
+	}
+
+	[Test]
+	public void emit_options_should_default_to_false() {
+		Assert.IsNotNull(_config);
+		Assert.AreEqual(false, _config.EmitEnabled, "EmitEnabled");
+		Assert.AreEqual(false, _config.TrackEmittedStreams, "TrackEmittedStreams");
+	}
+
+	[Test]
+	public void persisted_state_should_leave_fallback_options_unset() {
+		Assert.IsNotNull(_persistedStateWrite);
+		var actualState = _persistedStateWrite.Data.ParseJson<ManagedProjection.PersistedState>();
+		Assert.IsNull(actualState.ProjectionExecutionTimeout, "ProjectionExecutionTimeout");
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_initializing_projection_with_persisted_state<TLogFormat, TStreamId> : projection_config_test_base<TLogFormat, TStreamId> {
+	private ManagedProjection _mp;
+	private Guid _projectionId = Guid.NewGuid();
+	private ProjectionManagementMessage.ProjectionConfig _config;
+	private EventRecord _persistedStateWrite;
+
+	private ManagedProjection.PersistedState _persistedState = new ManagedProjection.PersistedState {
+		Enabled = true,
+		HandlerType = "JS",
+		Query = "fromAll().when({});",
+		Mode = ProjectionMode.Continuous,
+		CheckpointsDisabled = false,
+		Epoch = -1,
+		Version = -1,
+		RunAs = SerializedRunAs.SerializePrincipal(ProjectionManagementMessage.RunAs.Anonymous),
+		EmitEnabled = false,
+		TrackEmittedStreams = true,
+		CheckpointAfterMs = 1,
+		CheckpointHandledThreshold = 2,
+		CheckpointUnhandledBytesThreshold = 3,
+		PendingEventsThreshold = 4,
+		MaxWriteBatchLength = 5,
+		MaxAllowedWritesInFlight = 6,
+		ProjectionExecutionTimeout = 11
+	};
+
+	public when_initializing_projection_with_persisted_state() {
+		AllWritesQueueUp();
+	}
+
+	protected override void Given() {
+		_timeProvider = new FakeTimeProvider();
+		_mp = CreateManagedProjection();
+
+		_mp.InitializeNew(
+			_persistedState,
+			null);
+		_mp.Handle(new CoreProjectionStatusMessage.Prepared(_projectionId, new ProjectionSourceDefinition()));
+
+		// Complete write of persisted state to start projection
+		OneWriteCompletes();
+		_config = GetProjectionConfig(_mp);
+		_persistedStateWrite = _streams[ProjectionStreamId].LastOrDefault();
+	}
+
+	[Test]
+	public void config_should_be_same_as_persisted_state() {
+		Assert.IsNotNull(_config);
+		Assert.AreEqual(_persistedState.EmitEnabled, _config.EmitEnabled, "EmitEnabled");
+		Assert.AreEqual(_persistedState.TrackEmittedStreams, _config.TrackEmittedStreams, "TrackEmittedStreams");
+		Assert.AreEqual(_persistedState.CheckpointAfterMs, _config.CheckpointAfterMs, "CheckpointAfterMs");
+		Assert.AreEqual(_persistedState.CheckpointHandledThreshold, _config.CheckpointHandledThreshold,
+			"CheckpointHandledThreshold");
+		Assert.AreEqual(_persistedState.CheckpointUnhandledBytesThreshold,
+			_config.CheckpointUnhandledBytesThreshold, "CheckpointUnhandledBytesThreshold");
+		Assert.AreEqual(_persistedState.PendingEventsThreshold, _config.PendingEventsThreshold,
+			"PendingEventsThreshold");
+		Assert.AreEqual(_persistedState.MaxWriteBatchLength, _config.MaxWriteBatchLength, "MaxWriteBatchLength");
+		Assert.AreEqual(_persistedState.MaxAllowedWritesInFlight, _config.MaxAllowedWritesInFlight,
+			"MaxAllowedWritesInFlight");
+		Assert.AreEqual(_persistedState.ProjectionExecutionTimeout, _config.ProjectionExecutionTimeout,
+			"ProjectionExecutionTimeout");
+	}
+
+	[Test]
+	public void persisted_state_is_written_correctly() {
+		Assert.IsNotNull(_persistedStateWrite);
+		var actualState = _persistedStateWrite.Data.ParseJson<ManagedProjection.PersistedState>();
+
+		Assert.AreEqual(_persistedState.EmitEnabled, actualState.EmitEnabled, "EmitEnabled");
+		Assert.AreEqual(_persistedState.TrackEmittedStreams, actualState.TrackEmittedStreams, "TrackEmittedStreams");
+		Assert.AreEqual(_persistedState.CheckpointAfterMs, actualState.CheckpointAfterMs, "CheckpointAfterMs");
+		Assert.AreEqual(_persistedState.CheckpointHandledThreshold, actualState.CheckpointHandledThreshold,
+			"CheckpointHandledThreshold");
+		Assert.AreEqual(_persistedState.CheckpointUnhandledBytesThreshold,
+			actualState.CheckpointUnhandledBytesThreshold, "CheckpointUnhandledBytesThreshold");
+		Assert.AreEqual(_persistedState.PendingEventsThreshold, actualState.PendingEventsThreshold,
+			"PendingEventsThreshold");
+		Assert.AreEqual(_persistedState.MaxWriteBatchLength, actualState.MaxWriteBatchLength, "MaxWriteBatchLength");
+		Assert.AreEqual(_persistedState.MaxAllowedWritesInFlight, actualState.MaxAllowedWritesInFlight,
+			"MaxAllowedWritesInFlight");
+		Assert.AreEqual(_persistedState.ProjectionExecutionTimeout, actualState.ProjectionExecutionTimeout,
+			"ProjectionExecutionTimeout");
+	}
+}
+
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+public class when_updating_projection_config_to_remove_execution_timeout<TLogFormat, TStreamId> : projection_config_test_base<TLogFormat, TStreamId> {
+	private ManagedProjection _mp;
+	private Guid _projectionId = Guid.NewGuid();
+	private ProjectionManagementMessage.ProjectionConfig _config;
+	private EventRecord _persistedStateWrite;
+	private ProjectionManagementMessage.Command.UpdateConfig _updateConfig;
+
+	private ManagedProjection.PersistedState _persistedState => new ManagedProjection.PersistedState {
+		Enabled = false,
+		HandlerType = "JS",
+		Query = "fromAll().when({});",
+		Mode = ProjectionMode.Continuous,
+		CheckpointsDisabled = false,
+		Epoch = -1,
+		Version = -1,
+		RunAs = SerializedRunAs.SerializePrincipal(ProjectionManagementMessage.RunAs.Anonymous),
+		EmitEnabled = false,
+		TrackEmittedStreams = true,
+		CheckpointAfterMs = 1,
+		CheckpointHandledThreshold = 2,
+		CheckpointUnhandledBytesThreshold = 3,
+		PendingEventsThreshold = 4,
+		MaxWriteBatchLength = 5,
+		MaxAllowedWritesInFlight = 6,
+		ProjectionExecutionTimeout = 11
+	};
+
+	public when_updating_projection_config_to_remove_execution_timeout() {
+		AllWritesQueueUp();
+	}
+
+	protected override void Given() {
+		_timeProvider = new FakeTimeProvider();
+		_mp = CreateManagedProjection();
+
+		_mp.InitializeNew(
+			_persistedState,
+			null);
+		_mp.Handle(new CoreProjectionStatusMessage.Prepared(_projectionId, new ProjectionSourceDefinition()));
+		OneWriteCompletes();
+		_mp.Handle(new CoreProjectionStatusMessage.Stopped(_projectionId, ProjectionName, false));
+
+		_updateConfig = new ProjectionManagementMessage.Command.UpdateConfig(
+			new NoopEnvelope(), ProjectionName, _persistedState.EmitEnabled ?? false, _persistedState.TrackEmittedStreams ?? false,
+			_persistedState.CheckpointAfterMs, _persistedState.CheckpointHandledThreshold, _persistedState.CheckpointUnhandledBytesThreshold,
+			_persistedState.PendingEventsThreshold, _persistedState.MaxWriteBatchLength, _persistedState.MaxAllowedWritesInFlight,
+			_persistedState.RunAs,
+			projectionExecutionTimeout: null);
+		_mp.Handle(_updateConfig);
+		OneWriteCompletes();
+
+		_config = GetProjectionConfig(_mp);
+		_persistedStateWrite = _streams[ProjectionStreamId].LastOrDefault();
+
+	}
+
+	[Test]
+	public void config_should_have_null_projection_execution_timeout() {
+		Assert.IsNotNull(_config);
+		Assert.IsNull(_config.ProjectionExecutionTimeout, "ProjectionExecutionTimeout");
+	}
+
+	[Test]
+	public void persisted_state_should_have_null_projection_execution_timeout() {
+		Assert.IsNotNull(_persistedStateWrite);
+		var actualState = _persistedStateWrite.Data.ParseJson<ManagedProjection.PersistedState>();
+		Assert.IsNull(actualState.ProjectionExecutionTimeout, "ProjectionExecutionTimeout");
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_updating_projection_config_of_faulted_projection<TLogFormat, TStreamId> : projection_config_test_base<TLogFormat, TStreamId> {
+	private ManagedProjection _mp;
+	private Guid _projectionId = Guid.NewGuid();
+	private Exception _thrownException;
+	private ProjectionManagementMessage.Command.UpdateConfig _updateConfig;
+
+	public when_updating_projection_config_of_faulted_projection() {
+		AllWritesQueueUp();
+	}
+
+	protected override void Given() {
+		_timeProvider = new FakeTimeProvider();
+		_mp = CreateManagedProjection();
+		_mp.InitializeNew(
+			new ManagedProjection.PersistedState {
+				Enabled = false,
+				HandlerType = "JS",
+				Query = "fromAll().when({});",
+				Mode = ProjectionMode.Continuous,
+				EmitEnabled = true,
+				CheckpointsDisabled = false,
+				Epoch = -1,
+				Version = -1,
+				RunAs = SerializedRunAs.SerializePrincipal(ProjectionManagementMessage.RunAs.Anonymous),
+				ProjectionExecutionTimeout = 11
+			},
+			null);
+
+		_mp.Handle(new CoreProjectionStatusMessage.Prepared(_projectionId, new ProjectionSourceDefinition()));
+		OneWriteCompletes();
+		_consumer.HandledMessages.Clear();
+
+		_mp.Handle(new CoreProjectionStatusMessage.Faulted(
+			_projectionId,
+			"test"));
+
+		_updateConfig = CreateConfig();
+		try {
+			_mp.Handle(_updateConfig);
+		} catch (Exception ex) {
+			_thrownException = ex;
+		}
+	}
+
+	[Test]
+	public void persisted_state_is_written() {
+		var writeEvents = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().ToList();
+		Assert.AreEqual(1, writeEvents.Count());
+		Assert.AreEqual(ProjectionStreamId, writeEvents[0].EventStreamId);
+	}
+
+	[Test]
+	public void config_update_does_not_throw_exception() {
+		Assert.IsNull(_thrownException);
+	}
+
+	[Test]
+	public void config_is_updated() {
+		var getConfigResult = GetProjectionConfig(_mp);
+
+		Assert.IsNotNull(getConfigResult);
+		Assert.AreEqual(_updateConfig.EmitEnabled, getConfigResult.EmitEnabled);
+		Assert.AreEqual(_updateConfig.TrackEmittedStreams, getConfigResult.TrackEmittedStreams);
+		Assert.AreEqual(_updateConfig.CheckpointAfterMs, getConfigResult.CheckpointAfterMs);
+		Assert.AreEqual(_updateConfig.CheckpointHandledThreshold, getConfigResult.CheckpointHandledThreshold);
+		Assert.AreEqual(_updateConfig.CheckpointUnhandledBytesThreshold,
+			getConfigResult.CheckpointUnhandledBytesThreshold);
+		Assert.AreEqual(_updateConfig.PendingEventsThreshold, getConfigResult.PendingEventsThreshold);
+		Assert.AreEqual(_updateConfig.MaxWriteBatchLength, getConfigResult.MaxWriteBatchLength);
+		Assert.AreEqual(_updateConfig.MaxAllowedWritesInFlight, getConfigResult.MaxAllowedWritesInFlight);
+	}
+}
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_updating_projection_config_of_running_projection<TLogFormat, TStreamId> : projection_config_test_base<TLogFormat, TStreamId> {
+	private ManagedProjection _mp;
+	private Guid _projectionId = Guid.NewGuid();
+
+	private ManagedProjection.PersistedState _persistedState = new ManagedProjection.PersistedState {
+		Enabled = true,
+		HandlerType = "JS",
+		Query = "fromAll().when({});",
+		Mode = ProjectionMode.Continuous,
+		CheckpointsDisabled = false,
+		Epoch = -1,
+		Version = -1,
+		RunAs = SerializedRunAs.SerializePrincipal(ProjectionManagementMessage.RunAs.Anonymous),
+		EmitEnabled = false,
+		TrackEmittedStreams = true,
+		CheckpointAfterMs = 1,
+		CheckpointHandledThreshold = 2,
+		CheckpointUnhandledBytesThreshold = 3,
+		PendingEventsThreshold = 4,
+		MaxWriteBatchLength = 5,
+		MaxAllowedWritesInFlight = 6,
+		ProjectionExecutionTimeout = 11
+	};
+
+	private InvalidOperationException _thrownException;
+
+	public when_updating_projection_config_of_running_projection() {
+		AllWritesQueueUp();
+	}
+
+	protected override void Given() {
+		_timeProvider = new FakeTimeProvider();
+		_mp = CreateManagedProjection();
+
+		_mp.InitializeNew(
+			_persistedState,
+			null);
+		_mp.Handle(new CoreProjectionStatusMessage.Prepared(_projectionId, new ProjectionSourceDefinition()));
+
+		// Complete write of persisted state to start projection
+		OneWriteCompletes();
+
+		try {
+			_mp.Handle(CreateConfig());
+		} catch (InvalidOperationException ex) {
+			_thrownException = ex;
+		}
+	}
+
+	[Test]
+	public void should_throw_exception_when_trying_to_update_config() {
+		Assert.IsNotNull(_thrownException);
+	}
+
+	[Test]
+	public void config_should_remain_unchanged() {
+		var getConfigResult = GetProjectionConfig(_mp);
+
+		Assert.IsNotNull(getConfigResult);
+		Assert.AreEqual(_persistedState.EmitEnabled, getConfigResult.EmitEnabled, "EmitEnabled");
+		Assert.AreEqual(_persistedState.TrackEmittedStreams, getConfigResult.TrackEmittedStreams,
+			"TrackEmittedStreams");
+		Assert.AreEqual(_persistedState.CheckpointAfterMs, getConfigResult.CheckpointAfterMs, "CheckpointAfterMs");
+		Assert.AreEqual(_persistedState.CheckpointHandledThreshold, getConfigResult.CheckpointHandledThreshold,
+			"CheckpointHandledThreshold");
+		Assert.AreEqual(_persistedState.CheckpointUnhandledBytesThreshold,
+			getConfigResult.CheckpointUnhandledBytesThreshold, "CheckpointUnhandledBytesThreshold");
+		Assert.AreEqual(_persistedState.PendingEventsThreshold, getConfigResult.PendingEventsThreshold,
+			"PendingEventsThreshold");
+		Assert.AreEqual(_persistedState.MaxWriteBatchLength, getConfigResult.MaxWriteBatchLength,
+			"MaxWriteBatchLength");
+		Assert.AreEqual(_persistedState.MaxAllowedWritesInFlight, getConfigResult.MaxAllowedWritesInFlight,
+			"MaxAllowedWritesInFlight");
+		Assert.AreEqual(_persistedState.ProjectionExecutionTimeout, getConfigResult.ProjectionExecutionTimeout,
+			"ProjectionExecutionTimeout");
+	}
+}
+
+public abstract class projection_config_test_base<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	protected const string ProjectionName = "name";
+	protected readonly string ProjectionStreamId = ProjectionNamesBuilder.ProjectionsStreamPrefix + ProjectionName;
+	protected ManagedProjection CreateManagedProjection() {
+		return new ManagedProjection(
+			Guid.NewGuid(),
+			Guid.NewGuid(),
+			1,
+			ProjectionName,
+			true,
+			null,
+			_streamDispatcher,
+			_writeDispatcher,
+			_readDispatcher,
+			_bus,
+			_timeProvider, new RequestResponseDispatcher
+				<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>(
+					_bus,
+					v => v.CorrelationId,
+					v => v.CorrelationId,
+					_bus), new RequestResponseDispatcher
+				<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>(
+					_bus,
+					v => v.CorrelationId,
+					v => v.CorrelationId,
+					_bus),
+			_ioDispatcher,
+			TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault));
+	}
+
+	protected ProjectionManagementMessage.Command.UpdateConfig CreateConfig() {
+		return new ProjectionManagementMessage.Command.UpdateConfig(
+			new NoopEnvelope(), ProjectionName, true, false, 100, 200, 300, 400, 500, 600,
+			ProjectionManagementMessage.RunAs.Anonymous, ClusterVNodeOptions.ProjectionOptions.DefaultProjectionExecutionTimeout);
+	}
+
+	protected ProjectionManagementMessage.ProjectionConfig GetProjectionConfig(ManagedProjection mp) {
+		ProjectionManagementMessage.ProjectionConfig getConfigResult = null;
+		mp.Handle(new ProjectionManagementMessage.Command.GetConfig(
+			new CallbackEnvelope(m => getConfigResult = (ProjectionManagementMessage.ProjectionConfig)m), "name",
+			SerializedRunAs.SerializePrincipal(ProjectionManagementMessage.RunAs.Anonymous)));
+		return getConfigResult;
+	}
+}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/query/a_completed_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/query/a_completed_projection.cs
similarity index 86%
rename from src/EventStore.Projections.Core.Tests/Services/projections_manager/query/a_completed_projection.cs
rename to src/KurrentDB.Projections.Core.Tests/Services/projections_manager/query/a_completed_projection.cs
index 564f3992185..f2903266681 100644
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/query/a_completed_projection.cs
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/query/a_completed_projection.cs
@@ -1,15 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using EventStore.Core.Data;
-using EventStore.Core.Messaging;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Management;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
 using NUnit.Framework;
-using EventStore.Projections.Core.Services.Processing;
 
-namespace EventStore.Projections.Core.Tests.Services.projections_manager.query {
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager.query {
 	namespace a_completed_projection {
 		public abstract class Base<TLogFormat, TStreamId> : a_new_posted_projection.Base<TLogFormat, TStreamId> {
 			protected Guid _reader;
@@ -22,7 +24,8 @@ protected override void Given() {
 			}
 
 			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
+				foreach (var m in base.When())
+					yield return m;
 
 				var readerAssignedMessage =
 					_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.ReaderAssignedReader>()
@@ -43,7 +46,8 @@ protected override IEnumerable<WhenStep> When() {
 		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
 		public class when_stopping<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
 			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
+				foreach (var m in base.When())
+					yield return m;
 
 				yield return
 					(new ProjectionManagementMessage.Command.Disable(
@@ -87,7 +91,8 @@ public void the_projection_status_becomes_completed_disabled() {
 		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
 		public class when_starting<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
 			protected override IEnumerable<WhenStep> When() {
-				foreach (var m in base.When()) yield return m;
+				foreach (var m in base.When())
+					yield return m;
 				yield return
 					(new ProjectionManagementMessage.Command.Enable(
 						_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/query/a_failed_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/query/a_failed_projection.cs
new file mode 100644
index 00000000000..19cbdc01825
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/query/a_failed_projection.cs
@@ -0,0 +1,165 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Management;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager.query;
+
+public class a_failed_projection {
+	public abstract class Base<TLogFormat, TStreamId> : a_new_posted_projection.Base<TLogFormat, TStreamId> {
+		protected override void Given() {
+			base.Given();
+			_projectionSource = "fail";
+			NoOtherStreams();
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var m in base.When())
+				yield return m;
+			var readerAssignedMessage =
+				_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.ReaderAssignedReader>()
+					.LastOrDefault();
+			Assert.IsNotNull(readerAssignedMessage);
+			var reader = readerAssignedMessage.ReaderId;
+			yield return
+				(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					reader, new TFPos(100, 50), new TFPos(100, 50), "stream", 1, "stream", 1, false, Guid.NewGuid(),
+					"event", false, new byte[0], new byte[0], 100, 33.3f));
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_updating_query<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var m in base.When())
+				yield return m;
+			yield return
+				(new ProjectionManagementMessage.Command.UpdateQuery(
+					_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous,
+					@"", null));
+		}
+
+		[Test]
+		public void the_projection_status_becomes_running() {
+			_manager.Handle(
+				new ProjectionManagementMessage.Command.GetStatistics(
+					_bus, null, _projectionName, false));
+
+			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+			Assert.AreEqual(
+				1,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Length);
+			Assert.AreEqual(
+				_projectionName,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.Name);
+			Assert.AreEqual(
+				ManagedProjectionState.Running,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.LeaderStatus);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_stopping<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var m in base.When())
+				yield return m;
+			yield return
+				(new ProjectionManagementMessage.Command.Disable(
+					_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
+		}
+
+		[Test]
+		public void the_projection_status_becomes_faulted_disabled() {
+			_manager.Handle(
+				new ProjectionManagementMessage.Command.GetStatistics(
+					_bus, null, _projectionName, false));
+
+			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+			Assert.AreEqual(
+				1,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Length);
+			Assert.AreEqual(
+				_projectionName,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.Name);
+			Assert.AreEqual(
+				ManagedProjectionState.Stopped,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.LeaderStatus);
+			Assert.AreEqual(
+				false,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.Enabled);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_starting<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var m in base.When())
+				yield return m;
+			yield return
+				(new ProjectionManagementMessage.Command.Enable(
+					_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
+		}
+
+		[Test]
+		public void the_projection_status_becomes_running_enabled() // as we restart
+		{
+			_manager.Handle(
+				new ProjectionManagementMessage.Command.GetStatistics(
+					_bus, null, _projectionName, false));
+
+			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+			Assert.AreEqual(
+				1,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Length);
+			Assert.AreEqual(
+				_projectionName,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.Name);
+			Assert.AreEqual(
+				ManagedProjectionState.Running,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.LeaderStatus);
+			Assert.AreEqual(
+				true,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.Enabled);
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/query/a_new_posted_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/query/a_new_posted_projection.cs
new file mode 100644
index 00000000000..aae9c455b67
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/query/a_new_posted_projection.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager.query;
+
+public static class a_new_posted_projection {
+	public abstract class Base<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+		protected string _projectionName;
+		protected string _projectionSource;
+		protected Type _fakeProjectionType;
+		protected ProjectionMode _projectionMode;
+		protected bool _checkpointsEnabled;
+		protected bool _trackEmittedStreams;
+		protected bool _emitEnabled;
+
+		protected override void Given() {
+			base.Given();
+
+			_projectionName = "test-projection";
+			_projectionSource = @"";
+			_fakeProjectionType = typeof(FakeProjection);
+			_projectionMode = ProjectionMode.Transient;
+			_checkpointsEnabled = false;
+			_trackEmittedStreams = false;
+			_emitEnabled = false;
+			NoOtherStreams();
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+			yield return
+				(new ProjectionManagementMessage.Command.Post(
+					_bus, _projectionMode, _projectionName,
+					ProjectionManagementMessage.RunAs.System, "native:" + _fakeProjectionType.AssemblyQualifiedName,
+					_projectionSource, enabled: true, checkpointsEnabled: _checkpointsEnabled,
+					emitEnabled: _emitEnabled, trackEmittedStreams: _trackEmittedStreams));
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_get_query<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var m in base.When())
+				yield return m;
+			yield return
+				(new ProjectionManagementMessage.Command.GetQuery(
+					_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
+		}
+
+		[Test]
+		public void returns_correct_source() {
+			Assert.AreEqual(
+				1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
+			var projectionQuery =
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
+			Assert.AreEqual(_projectionName, projectionQuery.Name);
+			Assert.AreEqual("", projectionQuery.Query);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_get_state<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var m in base.When())
+				yield return m;
+			yield return (
+				new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, ""));
+		}
+
+		[Test]
+		public void returns_correct_state() {
+			Assert.AreEqual(
+				1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
+			Assert.AreEqual(
+				_projectionName,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().Name);
+			Assert.AreEqual(
+				"", _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().State);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_failing<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var m in base.When())
+				yield return m;
+			var readerAssignedMessage =
+				_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.ReaderAssignedReader>()
+					.LastOrDefault();
+			Assert.IsNotNull(readerAssignedMessage);
+			var reader = readerAssignedMessage.ReaderId;
+
+			yield return
+				(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					reader, new TFPos(100, 50), new TFPos(100, 50), "stream", 1, "stream", 1, false, Guid.NewGuid(),
+					"fail", false, new byte[0], new byte[0], 100, 33.3f));
+		}
+
+		[Test]
+		public void publishes_faulted_message() {
+			Assert.AreEqual(1, _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Faulted>().Count());
+		}
+
+		[Test]
+		public void the_projection_status_becomes_faulted() {
+			_manager.Handle(
+				new ProjectionManagementMessage.Command.GetStatistics(
+					_bus, null, _projectionName, false));
+
+			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+			Assert.AreEqual(
+				1,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Length);
+			Assert.AreEqual(
+				_projectionName,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.Name);
+			Assert.AreEqual(
+				ManagedProjectionState.Faulted,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.LeaderStatus);
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/query/a_running_foreach_stream_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/query/a_running_foreach_stream_projection.cs
new file mode 100644
index 00000000000..3b8c9e2d9a8
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/query/a_running_foreach_stream_projection.cs
@@ -0,0 +1,126 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager.query;
+
+public class a_running_foreach_stream_projection {
+	public abstract class Base<TLogFormat, TStreamId> : a_new_posted_projection.Base<TLogFormat, TStreamId> {
+		protected Guid _reader;
+
+		protected override void Given() {
+			base.Given();
+			_fakeProjectionType = typeof(FakeForeachStreamProjection);
+			_projectionMode = ProjectionMode.Transient;
+			_checkpointsEnabled = false;
+			_emitEnabled = false;
+			AllWritesSucceed();
+			NoOtherStreams();
+			//NOTE: do not respond to reads from the following stream
+			//NoStream("$projections-test-projection-stream-checkpoint");
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var m in base.When())
+				yield return m;
+			var readerAssignedMessage =
+				_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.ReaderAssignedReader>()
+					.LastOrDefault();
+			Assert.IsNotNull(readerAssignedMessage);
+			_reader = readerAssignedMessage.ReaderId;
+
+			_consumer.HandledMessages.Clear();
+
+			yield return
+				(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					_reader, new TFPos(100, 50), new TFPos(100, 50), "stream1", 1, "stream1", 1, false,
+					Guid.NewGuid(),
+					"type", false, Helper.UTF8NoBom.GetBytes("1"), new byte[0], 100, 33.3f));
+			yield return
+				(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					_reader, new TFPos(200, 150), new TFPos(200, 150), "stream2", 1, "stream2", 1, false,
+					Guid.NewGuid(),
+					"type", false, Helper.UTF8NoBom.GetBytes("1"), new byte[0], 100, 33.3f));
+			yield return
+				(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					_reader, new TFPos(300, 250), new TFPos(300, 250), "stream3", 1, "stream3", 1, false,
+					Guid.NewGuid(),
+					"type", false, Helper.UTF8NoBom.GetBytes("1"), new byte[0], 100, 33.3f));
+			yield return
+				(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					_reader, new TFPos(400, 350), new TFPos(400, 350), "stream1", 2, "stream1", 2, false,
+					Guid.NewGuid(),
+					"type", false, Helper.UTF8NoBom.GetBytes("1"), new byte[0], 100, 33.3f));
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_receiving_eof<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var m in base.When())
+				yield return m;
+
+			yield return (new ReaderSubscriptionMessage.EventReaderEof(_reader));
+		}
+
+		[Test]
+		public void the_projection_status_becomes_completed_enabled() {
+			_manager.Handle(
+				new ProjectionManagementMessage.Command.GetStatistics(
+					_bus, null, _projectionName, false));
+
+			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+			Assert.AreEqual(
+				1,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Length);
+			Assert.AreEqual(
+				_projectionName,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.Name);
+			Assert.AreEqual(
+				ManagedProjectionState.Completed,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.LeaderStatus);
+			Assert.AreEqual(
+				true,
+				_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+					.Single()
+					.Projections.Single()
+					.Enabled);
+		}
+
+		[Test]
+		public void writes_result_stream() {
+			List<EventRecord> resultsStream;
+			Assert.IsTrue((_streams.TryGetValue("$projections-test-projection-result", out resultsStream)));
+			Assert.AreEqual(3 + 1 /* $Eof */, resultsStream.Count);
+		}
+
+		[Test]
+		public void does_not_write_to_any_other_streams() {
+			Assert.IsEmpty(
+				HandledMessages.OfType<ClientMessage.WriteEvents>()
+					.Where(v => v.EventStreamId != "$projections-test-projection-result")
+					.Where(v => v.EventStreamId != "$$$projections-test-projection-result")
+					.Select(v => v.EventStreamId));
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/query/a_running_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/query/a_running_projection.cs
new file mode 100644
index 00000000000..6575023c44c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/query/a_running_projection.cs
@@ -0,0 +1,154 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Management;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager.query {
+	namespace a_running_projection {
+		public abstract class Base<TLogFormat, TStreamId> : a_new_posted_projection.Base<TLogFormat, TStreamId> {
+			protected Guid _reader;
+
+			protected override void Given() {
+				base.Given();
+				AllWritesSucceed();
+				NoOtherStreams();
+			}
+
+			protected override IEnumerable<WhenStep> When() {
+				foreach (var m in base.When())
+					yield return m;
+				var readerAssignedMessage =
+					_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.ReaderAssignedReader>()
+						.LastOrDefault();
+				Assert.IsNotNull(readerAssignedMessage);
+				_reader = readerAssignedMessage.ReaderId;
+				_consumer.HandledMessages.Clear();
+				yield return
+					(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+						_reader, new TFPos(100, 50), new TFPos(100, 50), "stream", 1, "stream", 1, false,
+						Guid.NewGuid(),
+						"type", false, new byte[0], new byte[0], 100, 33.3f));
+			}
+		}
+
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		public class when_handling_eof<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
+			protected override IEnumerable<WhenStep> When() {
+				foreach (var m in base.When())
+					yield return m;
+
+				yield return (new ReaderSubscriptionMessage.EventReaderEof(_reader));
+			}
+
+			[Test]
+			public void pause_message_is_published() {
+				Assert.Inconclusive("actually in unsubscribes...");
+			}
+
+
+			[Test]
+			public void the_projection_status_becomes_completed_enabled() {
+				_manager.Handle(
+					new ProjectionManagementMessage.Command.GetStatistics(
+						_bus, null, _projectionName, false));
+
+				Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+				Assert.AreEqual(
+					1,
+					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+						.Single()
+						.Projections.Length);
+				Assert.AreEqual(
+					_projectionName,
+					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+						.Single()
+						.Projections.Single()
+						.Name);
+				Assert.AreEqual(
+					ManagedProjectionState.Completed,
+					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+						.Single()
+						.Projections.Single()
+						.LeaderStatus);
+				Assert.AreEqual(
+					true,
+					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+						.Single()
+						.Projections.Single()
+						.Enabled);
+			}
+
+			[Test]
+			public void writes_result_stream() {
+				List<EventRecord> resultsStream;
+				Assert.IsTrue((_streams.TryGetValue("$projections-test-projection-result", out resultsStream)));
+				Assert.AreEqual(1 + 1 /* $Eof*/, resultsStream.Count);
+				Assert.AreEqual("{\"data\": 1}", Encoding.UTF8.GetString(resultsStream[0].Data.Span));
+			}
+
+			[Test]
+			public void does_not_write_to_any_other_streams() {
+				Assert.IsEmpty(
+					HandledMessages.OfType<ClientMessage.WriteEvents>()
+						.Where(v => v.EventStreamId != "$projections-test-projection-result")
+						.Where(v => v.EventStreamId != "$$$projections-test-projection-result")
+						.Select(v => v.EventStreamId));
+			}
+		}
+
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		public class when_handling_event<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
+			protected override IEnumerable<WhenStep> When() {
+				foreach (var m in base.When())
+					yield return m;
+				yield return
+					(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+						_reader, new TFPos(200, 150), new TFPos(200, 150), "stream", 2, "stream", 1, false,
+						Guid.NewGuid(), "type", false, new byte[0], new byte[0], 100, 33.3f));
+			}
+
+			[Test]
+			public void the_projection_status_remains_running_enabled() {
+				_manager.Handle(
+					new ProjectionManagementMessage.Command.GetStatistics(
+						_bus, null, _projectionName, false));
+
+				Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+				Assert.AreEqual(
+					1,
+					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+						.Single()
+						.Projections.Length);
+				Assert.AreEqual(
+					_projectionName,
+					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+						.Single()
+						.Projections.Single()
+						.Name);
+				Assert.AreEqual(
+					ManagedProjectionState.Running,
+					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+						.Single()
+						.Projections.Single()
+						.LeaderStatus);
+				Assert.AreEqual(
+					true,
+					_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+						.Single()
+						.Projections.Single()
+						.Enabled);
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/query/an_expired_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/query/an_expired_projection.cs
new file mode 100644
index 00000000000..b7d9475be6e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/query/an_expired_projection.cs
@@ -0,0 +1,82 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager.query;
+
+public class an_expired_projection {
+	public abstract class Base<TLogFormat, TStreamId> : a_new_posted_projection.Base<TLogFormat, TStreamId> {
+		protected Guid _reader;
+
+		protected override void Given() {
+			AllWritesSucceed();
+			base.Given();
+		}
+
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var m in base.When())
+				yield return m;
+			var readerAssignedMessage =
+				_consumer.HandledMessages.OfType<EventReaderSubscriptionMessage.ReaderAssignedReader>()
+					.LastOrDefault();
+			Assert.IsNotNull(readerAssignedMessage);
+			_reader = readerAssignedMessage.ReaderId;
+
+			yield return
+				(ReaderSubscriptionMessage.CommittedEventDistributed.Sample(
+					_reader, new TFPos(100, 50), new TFPos(100, 50), "stream", 1, "stream", 1, false,
+					Guid.NewGuid(),
+					"type", false, new byte[0], new byte[0], 100, 33.3f));
+			_timeProvider.AddToUtcTime(TimeSpan.FromMinutes(6));
+			yield return Yield;
+			foreach (var m in _consumer.HandledMessages.OfType<TimerMessage.Schedule>().ToArray())
+				m.Envelope.ReplyWith(m.ReplyMessage);
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_retrieving_statistics<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var s in base.When())
+				yield return s;
+			_consumer.HandledMessages.Clear();
+			yield return (
+				new ProjectionManagementMessage.Command.GetStatistics(
+					_bus, null, _projectionName, false));
+		}
+
+		[Test]
+		public void projection_is_not_found() {
+			Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.NotFound>().Count());
+			Assert.IsFalse(_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Any());
+		}
+	}
+
+	[TestFixture(typeof(LogFormat.V2), typeof(string))]
+	[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+	public class when_deleted_on_expiry<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
+		protected override IEnumerable<WhenStep> When() {
+			foreach (var s in base.When())
+				yield return s;
+			_consumer.HandledMessages.Clear();
+		}
+
+		[Test]
+		public void projection_deletion_should_not_be_written() {
+			var registrationEvents = _streams["$projections-$all"];
+			Assert.AreEqual(1, registrationEvents.Count(e => e.EventType == "$ProjectionsInitialized"));
+			Assert.AreEqual(0,
+				registrationEvents.Count(e => Helper.UTF8NoBom.GetString(e.Data.ToArray()) == _projectionName));
+		}
+	}
+}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/race_conditions_when_successive_writes_are_quick.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/race_conditions_when_successive_writes_are_quick.cs
similarity index 94%
rename from src/EventStore.Projections.Core.Tests/Services/projections_manager/race_conditions_when_successive_writes_are_quick.cs
rename to src/KurrentDB.Projections.Core.Tests/Services/projections_manager/race_conditions_when_successive_writes_are_quick.cs
index a6a83c9a54d..e20d69baad4 100644
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/race_conditions_when_successive_writes_are_quick.cs
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/race_conditions_when_successive_writes_are_quick.cs
@@ -1,18 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Threading;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Tests;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Core.Tests.Services.Replication;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Tests.Services.Replication;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
 using NUnit.Framework;
 
-namespace EventStore.Projections.Core.Tests.Services.projections_manager;
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
 
 public abstract class race_conditions_when_successive_writes_are_quick {
 	public abstract class
@@ -29,7 +31,8 @@ protected override void Given() {
 		}
 
 		protected override IEnumerable<WhenStep> When() {
-			foreach (var m in base.When()) yield return m;
+			foreach (var m in base.When())
+				yield return m;
 			yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
 		}
 
@@ -55,14 +58,14 @@ protected void Process() {
 	[TestFixture(typeof(LogFormat.V3), typeof(uint), false, true)]
 	[TestFixture(typeof(LogFormat.V3), typeof(uint), false, false)]
 	public class create_create_race_condition<TLogFormat, TStreamId> : Base<TLogFormat, TStreamId> {
-		
+
 		private readonly bool shouldBatchCreate1;
 		private readonly bool shouldBatchCreate2;
 		public create_create_race_condition(bool shouldBatchCreate1, bool shouldBatchCreate2) {
 			this.shouldBatchCreate1 = shouldBatchCreate1;
 			this.shouldBatchCreate2 = shouldBatchCreate2;
 		}
-		
+
 		private WhenStep GetCreate(string name, bool batch) {
 			if (batch) {
 				var projectionPost = new ProjectionManagementMessage.Command.PostBatch.ProjectionPost(
@@ -79,14 +82,15 @@ private WhenStep GetCreate(string name, bool batch) {
 				_projectionSource, enabled: true, checkpointsEnabled: true,
 				emitEnabled: false, trackEmittedStreams: false));
 		}
-		
+
 		protected override void Given() {
 			base.Given();
 			AllWritesQueueUp();
 		}
 
 		protected override IEnumerable<WhenStep> When() {
-			foreach (var m in base.When()) yield return m;
+			foreach (var m in base.When())
+				yield return m;
 			yield return GetCreate(_projection1, shouldBatchCreate1);
 			yield return GetCreate(_projection2, shouldBatchCreate2);
 		}
@@ -125,14 +129,15 @@ public class create_delete_race_condition<TLogFormat, TStreamId> : Base<TLogForm
 		public create_delete_race_condition(bool shouldBatchCreate) {
 			this.shouldBatchCreate = shouldBatchCreate;
 		}
-		
+
 		protected override void Given() {
 			base.Given();
 			AllWritesSucceed();
 		}
 
 		protected override IEnumerable<WhenStep> When() {
-			foreach (var m in base.When()) yield return m;
+			foreach (var m in base.When())
+				yield return m;
 			yield return
 				(new ProjectionManagementMessage.Command.Post(_bus, ProjectionMode.Continuous,
 					_projection1,
@@ -146,7 +151,7 @@ private IEnumerable<WhenStep> TestMessages(Guid projectionToDeletedId) {
 			yield return
 				(new ProjectionManagementMessage.Internal.Deleted(_projection1, projectionToDeletedId));
 		}
-		
+
 		private WhenStep GetCreate(string name) {
 			if (shouldBatchCreate) {
 				var projectionPost = new ProjectionManagementMessage.Command.PostBatch.ProjectionPost(
@@ -223,7 +228,8 @@ protected override void Given() {
 		}
 
 		protected override IEnumerable<WhenStep> When() {
-			foreach (var m in base.When()) yield return m;
+			foreach (var m in base.When())
+				yield return m;
 			yield return (new ProjectionManagementMessage.Command.Post(_bus,
 				ProjectionMode.Continuous,
 				_projection1,
@@ -306,7 +312,8 @@ protected override void Given() {
 		}
 
 		protected override IEnumerable<WhenStep> When() {
-			foreach (var m in base.When()) yield return m;
+			foreach (var m in base.When())
+				yield return m;
 			yield return
 				(new ProjectionManagementMessage.Command.Post(_bus, ProjectionMode.Continuous,
 					_projection1,
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/runas/when_posting_a_persistent_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/runas/when_posting_a_persistent_projection.cs
new file mode 100644
index 00000000000..bb47685b7be
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/runas/when_posting_a_persistent_projection.cs
@@ -0,0 +1,169 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager.runas {
+	namespace when_posting_a_persistent_projection {
+		[Ignore("Persistent projections are admin only")]
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		public class Authenticated<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+			private string _projectionName;
+			private ClaimsPrincipal _testUserPrincipal;
+
+			private string _projectionBody = @"fromAll().when({$any:function(s,e){return s;}});";
+
+			protected override void Given() {
+				_projectionName = "test-projection";
+				_projectionBody = @"fromAll().when({$any:function(s,e){return s;}});";
+				_testUserPrincipal = new ClaimsPrincipal(new ClaimsIdentity(
+					new[] {
+						new Claim(ClaimTypes.Name,"test-user"),
+						new Claim(ClaimTypes.Role,"test-role1"),
+						new Claim(ClaimTypes.Role,"test-role2")
+					}
+					, "ES-Test"));
+
+				AllWritesSucceed();
+				NoOtherStreams();
+			}
+
+			protected override IEnumerable<WhenStep> When() {
+				yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
+				yield return
+					new ProjectionManagementMessage.Command.Post(
+						GetInputQueue(), ProjectionMode.Continuous, _projectionName,
+						new ProjectionManagementMessage.RunAs(_testUserPrincipal), "JS", _projectionBody, enabled: true,
+						checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true, enableRunAs: true);
+			}
+
+			[Test, Ignore("Persistent projections are admin only")]
+			public void anonymous_cannot_retrieve_projection_query() {
+				GetInputQueue()
+					.Publish(
+						new ProjectionManagementMessage.Command.GetQuery(
+							Envelope, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
+				_queue.Process();
+
+				Assert.IsTrue(HandledMessages.OfType<ProjectionManagementMessage.NotAuthorized>().Any());
+			}
+
+			[Test]
+			public void projection_owner_can_retrieve_projection_query() {
+				GetInputQueue()
+					.Publish(
+						new ProjectionManagementMessage.Command.GetQuery(
+							Envelope, _projectionName, new ProjectionManagementMessage.RunAs(_testUserPrincipal)));
+				_queue.Process();
+
+				var query = HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().FirstOrDefault();
+				Assert.NotNull(query);
+				Assert.AreEqual(_projectionBody, query.Query);
+			}
+		}
+
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		public class Anonymous<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+			private string _projectionName;
+
+			private string _projectionBody = @"fromAll().when({$any:function(s,e){return s;}});";
+
+			protected override void Given() {
+				_projectionName = "test-projection";
+				_projectionBody = @"fromAll().when({$any:function(s,e){return s;}});";
+
+				AllWritesSucceed();
+				NoOtherStreams();
+			}
+
+			protected override IEnumerable<WhenStep> When() {
+				yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
+				yield return
+					new ProjectionManagementMessage.Command.Post(
+						GetInputQueue(), ProjectionMode.Continuous, _projectionName,
+						ProjectionManagementMessage.RunAs.Anonymous, "JS", _projectionBody, enabled: true,
+						checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true, enableRunAs: true);
+			}
+
+			[Test]
+			public void replies_with_not_authorized() {
+				Assert.IsTrue(HandledMessages.OfType<ProjectionManagementMessage.NotAuthorized>().Any());
+			}
+		}
+	}
+
+	namespace when_setting_new_runas_account {
+		public abstract class with_runas_projection<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+			protected string _projectionName;
+			protected ClaimsPrincipal _testUserPrincipal;
+			protected ClaimsPrincipal _testUserPrincipal2;
+
+			protected string _projectionBody = @"fromAll().when({$any:function(s,e){return s;}});";
+
+			protected override void Given() {
+				_projectionName = "test-projection";
+				_projectionBody = @"fromAll().when({$any:function(s,e){return s;}});";
+				_testUserPrincipal = new ClaimsPrincipal(new ClaimsIdentity(
+					new[] {
+						new Claim(ClaimTypes.Name,"test-user"),
+						new Claim(ClaimTypes.Role,"test-role1"),
+						new Claim(ClaimTypes.Role,"test-role2")
+					}
+					, "ES-Test"));
+				_testUserPrincipal2 = new ClaimsPrincipal(new ClaimsIdentity(
+					new[] {
+						new Claim(ClaimTypes.Name,"test-user2"),
+						new Claim(ClaimTypes.Role,"test-role2"),
+						new Claim(ClaimTypes.Role,"test-role3")
+					}
+					, "ES-Test"));
+
+				AllWritesSucceed();
+				NoOtherStreams();
+			}
+
+			protected override IEnumerable<WhenStep> PreWhen() {
+				yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
+				yield return
+					new ProjectionManagementMessage.Command.Post(
+						GetInputQueue(), ProjectionMode.Continuous, _projectionName,
+						new ProjectionManagementMessage.RunAs(_testUserPrincipal), "JS", _projectionBody, enabled: true,
+						checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true, enableRunAs: true);
+			}
+		}
+
+		[Ignore("Persistent projections are admin only")]
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		public class as_another_user<TLogFormat, TStreamId> : with_runas_projection<TLogFormat, TStreamId> {
+			protected override IEnumerable<WhenStep> When() {
+				yield return
+					new ProjectionManagementMessage.Command.SetRunAs(
+						Envelope, _projectionName, new ProjectionManagementMessage.RunAs(_testUserPrincipal2),
+						ProjectionManagementMessage.Command.SetRunAs.SetRemove.Set);
+			}
+
+			[Test]
+			public void new_projection_owner_can_retrieve_projection_query() {
+				GetInputQueue()
+					.Publish(
+						new ProjectionManagementMessage.Command.GetQuery(
+							Envelope, _projectionName, new ProjectionManagementMessage.RunAs(_testUserPrincipal2)));
+				_queue.Process();
+
+				var query = HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().FirstOrDefault();
+				Assert.NotNull(query);
+				Assert.AreEqual(_projectionBody, query.Query);
+			}
+		}
+	}
+}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_manager/runas/when_posting_a_transient_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/runas/when_posting_a_transient_projection.cs
similarity index 88%
rename from src/EventStore.Projections.Core.Tests/Services/projections_manager/runas/when_posting_a_transient_projection.cs
rename to src/KurrentDB.Projections.Core.Tests/Services/projections_manager/runas/when_posting_a_transient_projection.cs
index 085277d9e19..2d476283041 100644
--- a/src/EventStore.Projections.Core.Tests/Services/projections_manager/runas/when_posting_a_transient_projection.cs
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/runas/when_posting_a_transient_projection.cs
@@ -1,14 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Security.Claims;
-using EventStore.Core.Messaging;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
 using NUnit.Framework;
-using System.Linq;
-using EventStore.Core.Tests;
 
-namespace EventStore.Projections.Core.Tests.Services.projections_manager.runas {
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager.runas {
 	namespace when_posting_a_transient_projection {
 		[TestFixture(typeof(LogFormat.V2), typeof(string))]
 		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
@@ -22,9 +24,9 @@ protected override void Given() {
 				_projectionName = "test-projection";
 				_projectionBody = @"fromAll().when({$any:function(s,e){return s;}});";
 				_testUserPrincipal = new ClaimsPrincipal(new ClaimsIdentity(
-					new [] {
+					new[] {
 						new Claim(ClaimTypes.Name,"test-user"),
-						new Claim(ClaimTypes.Role,"test-role1"), 
+						new Claim(ClaimTypes.Role,"test-role1"),
 						new Claim(ClaimTypes.Role,"test-role2")
 					}
 					, "ES-Test"));
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/specification_with_projection_management_service.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/specification_with_projection_management_service.cs
new file mode 100644
index 00000000000..0f0d142245f
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/specification_with_projection_management_service.cs
@@ -0,0 +1,119 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.AwakeReaderService;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Metrics;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+using IODispatcherDelayedMessage = KurrentDB.Core.Helpers.IODispatcherDelayedMessage;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+public abstract class specification_with_projection_management_service<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	protected ProjectionManager _manager;
+	protected ProjectionManagerMessageDispatcher _managerMessageDispatcher;
+	private bool _initializeSystemProjections;
+	protected AwakeService AwakeService;
+
+
+	protected override void Given1() {
+		base.Given1();
+		_initializeSystemProjections = GivenInitializeSystemProjections();
+		if (!_initializeSystemProjections) {
+			ExistingEvent(ProjectionNamesBuilder.ProjectionsRegistrationStream,
+				ProjectionEventTypes.ProjectionsInitialized, "", "");
+		}
+	}
+
+	protected virtual bool GivenInitializeSystemProjections() {
+		return false;
+	}
+
+	protected override ManualQueue GiveInputQueue() {
+		return new ManualQueue(_bus, _timeProvider);
+	}
+
+	[SetUp]
+	public void Setup() {
+		//TODO: this became an integration test - proper ProjectionCoreService and ProjectionManager testing is required as well
+		_bus.Subscribe(_consumer);
+
+		var queues = GivenCoreQueues();
+		_managerMessageDispatcher = new ProjectionManagerMessageDispatcher(queues);
+		_manager = new ProjectionManager(
+			GetInputQueue(),
+			GetInputQueue(),
+			queues,
+			_timeProvider,
+			ProjectionType.All,
+			_ioDispatcher,
+			TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault),
+			IProjectionTracker.NoOp,
+			_initializeSystemProjections);
+
+		IPublisher inputQueue = GetInputQueue();
+		IPublisher publisher = GetInputQueue();
+		var ioDispatcher = new IODispatcher(publisher, inputQueue, true);
+		_bus.Subscribe<ProjectionManagementMessage.Internal.CleanupExpired>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Internal.Deleted>(_manager);
+		_bus.Subscribe<CoreProjectionStatusMessage.Started>(_manager);
+		_bus.Subscribe<CoreProjectionStatusMessage.Stopped>(_manager);
+		_bus.Subscribe<CoreProjectionStatusMessage.Prepared>(_manager);
+		_bus.Subscribe<CoreProjectionStatusMessage.Faulted>(_manager);
+		_bus.Subscribe<CoreProjectionStatusMessage.StateReport>(_manager);
+		_bus.Subscribe<CoreProjectionStatusMessage.ResultReport>(_manager);
+		_bus.Subscribe<CoreProjectionStatusMessage.StatisticsReport>(_manager);
+
+		_bus.Subscribe<ProjectionManagementMessage.Command.Post>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.PostBatch>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.UpdateQuery>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.GetQuery>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.Delete>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.GetStatistics>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.GetState>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.GetResult>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.Disable>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.Enable>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.Abort>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.SetRunAs>(_manager);
+		_bus.Subscribe<ProjectionManagementMessage.Command.Reset>(_manager);
+		_bus.Subscribe<ClientMessage.WriteEventsCompleted>(_manager);
+		_bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_manager);
+		_bus.Subscribe<ClientMessage.WriteEventsCompleted>(_manager);
+		_bus.Subscribe<ProjectionSubsystemMessage.StartComponents>(_manager);
+		_bus.Subscribe<ProjectionSubsystemMessage.StopComponents>(_manager);
+		_bus.Subscribe<CoreProjectionManagementControlMessage>(_managerMessageDispatcher);
+
+		_bus.Subscribe<ClientMessage.ReadStreamEventsForwardCompleted>(ioDispatcher.ForwardReader);
+		_bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(ioDispatcher.BackwardReader);
+		_bus.Subscribe<ClientMessage.NotHandled>(ioDispatcher.BackwardReader);
+		_bus.Subscribe<ClientMessage.WriteEventsCompleted>(ioDispatcher.Writer);
+		_bus.Subscribe<ClientMessage.DeleteStreamCompleted>(ioDispatcher.StreamDeleter);
+		_bus.Subscribe<IODispatcherDelayedMessage>(ioDispatcher.Awaker);
+		_bus.Subscribe<IODispatcherDelayedMessage>(ioDispatcher);
+
+		AwakeService = new AwakeService();
+		_bus.Subscribe<StorageMessage.EventCommitted>(AwakeService);
+		_bus.Subscribe<StorageMessage.TfEofAtNonCommitRecord>(AwakeService);
+		_bus.Subscribe<AwakeServiceMessage.SubscribeAwake>(AwakeService);
+		_bus.Subscribe<AwakeServiceMessage.UnsubscribeAwake>(AwakeService);
+
+
+		Given();
+		WhenLoop();
+	}
+
+	protected abstract Dictionary<Guid, IPublisher> GivenCoreQueues();
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/verify_persistent_state_rules_for_deleting_streams.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/verify_persistent_state_rules_for_deleting_streams.cs
new file mode 100644
index 00000000000..3e75b2df945
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/verify_persistent_state_rules_for_deleting_streams.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Management;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture]
+public class VerifyPersistentStateRulesForDeletingStreams {
+	[Test]
+	[TestCase(true, true, true)]
+	[TestCase(false, true, false)]
+	[TestCase(true, false, false)]
+	[TestCase(false, false, false)]
+	public void EmitStreamNeedsDeletedAsExpected(bool emitEnabled, bool deleteEmitStreams, bool expectedResult) {
+		ManagedProjection.PersistedState persistedState = new ManagedProjection.PersistedState();
+
+		persistedState.EmitEnabled = emitEnabled;
+		persistedState.DeleteEmittedStreams = deleteEmitStreams;
+
+		Assert.IsTrue(persistedState.EmitStreamNeedsDeleted() == expectedResult);
+	}
+
+	[Test]
+	[TestCase(true, true, false)]
+	[TestCase(false, true, true)]
+	[TestCase(true, false, false)]
+	[TestCase(false, false, false)]
+	public void CheckpointStreamNeedsDeletedAsExpected(bool checkPointsDisabled, bool deleteCheckpointStreams, bool expectedResult) {
+		ManagedProjection.PersistedState persistedState = new ManagedProjection.PersistedState();
+
+		persistedState.CheckpointsDisabled = checkPointsDisabled;
+		persistedState.DeleteCheckpointStream = deleteCheckpointStreams;
+
+		Assert.IsTrue(persistedState.CheckpointStreamNeedsDeleted() == expectedResult);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_a_disabled_projection_has_been_loaded.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_a_disabled_projection_has_been_loaded.cs
new file mode 100644
index 00000000000..bfadb9d1a34
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_a_disabled_projection_has_been_loaded.cs
@@ -0,0 +1,93 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_a_disabled_projection_has_been_loaded<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	protected override void Given() {
+		base.Given();
+		NoStream("$projections-test-projection-result");
+		NoStream("$projections-test-projection-order");
+		AllWritesToSucceed("$projections-test-projection-order");
+		NoStream("$projections-test-projection-checkpoint");
+		ExistingEvent(ProjectionNamesBuilder.ProjectionsRegistrationStream, ProjectionEventTypes.ProjectionCreated,
+			null, "test-projection");
+		ExistingEvent(
+			"$projections-test-projection", ProjectionEventTypes.ProjectionUpdated, null,
+			@"{
+                    ""Query"":""fromAll(); on_any(function(){});log('hello-from-projection-definition');"",
+                    ""Mode"":""3"",
+                    ""Enabled"":false,
+                    ""HandlerType"":""JS"",
+                    ""SourceDefinition"":{
+                        ""AllEvents"":true,
+                        ""AllStreams"":true,
+                    }
+                }");
+		AllWritesSucceed();
+	}
+
+	private string _projectionName;
+
+	protected override IEnumerable<WhenStep> When() {
+		_projectionName = "test-projection";
+		yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
+	}
+
+	[Test]
+	public void the_projection_source_can_be_retrieved() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetQuery(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
+		var projectionQuery =
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
+		Assert.AreEqual(_projectionName, projectionQuery.Name);
+	}
+
+	[Test]
+	public void the_projection_status_is_stopped() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetStatistics(_bus, null, _projectionName,
+				false));
+
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Length);
+		Assert.AreEqual(
+			_projectionName,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Single()
+				.Name);
+		Assert.AreEqual(
+			ManagedProjectionState.Stopped,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Single()
+				.LeaderStatus);
+	}
+
+	[Test]
+	public void the_projection_state_can_be_retrieved() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, ""));
+		_queue.Process();
+
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
+		Assert.AreEqual(
+			_projectionName,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().Name);
+		Assert.AreEqual(
+			"", _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().State);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_creating_projection_manager.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_creating_projection_manager.cs
new file mode 100644
index 00000000000..fbb65e0d9ec
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_creating_projection_manager.cs
@@ -0,0 +1,120 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Metrics;
+using KurrentDB.Projections.Core.Services.Management;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture]
+public class when_creating_projection_manager {
+	private ITimeProvider _timeProvider;
+	private Dictionary<Guid, IPublisher> _queues;
+	private IODispatcher _ioDispatcher;
+
+	[SetUp]
+	public void setup() {
+		_timeProvider = new FakeTimeProvider();
+		_queues = new Dictionary<Guid, IPublisher> { { Guid.NewGuid(), new FakePublisher() } };
+		var fakePublisher = new FakePublisher();
+		new ProjectionCoreCoordinator(
+			ProjectionType.All,
+			_queues.Values.ToArray(),
+			fakePublisher);
+		_ioDispatcher = new IODispatcher(fakePublisher, fakePublisher, true);
+	}
+
+	[Test]
+	public void it_can_be_created() {
+		using (
+			new ProjectionManager(
+				new FakePublisher(),
+				new FakePublisher(),
+				_queues,
+				_timeProvider,
+				ProjectionType.All,
+				_ioDispatcher,
+				TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault),
+				IProjectionTracker.NoOp)) {
+		}
+	}
+
+	[Test]
+	public void null_main_queue_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			using (
+				new ProjectionManager(
+					null,
+					new FakePublisher(),
+					_queues,
+					_timeProvider,
+					ProjectionType.All,
+					_ioDispatcher,
+					TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault),
+					IProjectionTracker.NoOp)) {
+			}
+		});
+	}
+
+	[Test]
+	public void null_publisher_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			using (
+				new ProjectionManager(
+					new FakePublisher(),
+					null,
+					_queues,
+					_timeProvider,
+					ProjectionType.All,
+					_ioDispatcher,
+					TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault),
+					IProjectionTracker.NoOp)) {
+			}
+		});
+	}
+
+	[Test]
+	public void null_queues_throws_argument_null_exception() {
+		Assert.Throws<ArgumentNullException>(() => {
+			using (
+				new ProjectionManager(
+					new FakePublisher(),
+					new FakePublisher(),
+					null,
+					_timeProvider,
+					ProjectionType.All,
+					_ioDispatcher,
+					TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault),
+					IProjectionTracker.NoOp)) {
+			}
+		});
+	}
+
+	[Test]
+	public void empty_queues_throws_argument_exception() {
+		Assert.Throws<ArgumentException>(() => {
+			using (
+				new ProjectionManager(
+					new FakePublisher(),
+					new FakePublisher(),
+					new Dictionary<Guid, IPublisher>(),
+					_timeProvider,
+					ProjectionType.All,
+					_ioDispatcher,
+					TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault),
+					IProjectionTracker.NoOp)) {
+			}
+		});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_faulted_persistent_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_faulted_persistent_projection.cs
new file mode 100644
index 00000000000..12bf6aa9737
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_faulted_persistent_projection.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_deleting_a_faulted_persistent_projection<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	private string _projectionName;
+	private const string _projectionCheckpointStream = "$projections-test-projection-checkpoint";
+	private const string _projectionEmittedStreamsStream = "$projections-test-projection-emittedstreams";
+
+	protected override void Given() {
+		_projectionName = "test-projection";
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
+		yield return
+			new ProjectionManagementMessage.Command.Post(
+				_bus, ProjectionMode.Continuous, _projectionName,
+				ProjectionManagementMessage.RunAs.System, "JS", @"faulted_projection",
+				enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true);
+		yield return
+			new ProjectionManagementMessage.Command.Delete(
+				_bus, _projectionName,
+				ProjectionManagementMessage.RunAs.System, true, true, true);
+	}
+
+	[Test, Category("v8")]
+	public void a_projection_deleted_event_is_written() {
+		Assert.AreEqual(
+			true,
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Any(x =>
+				x.Events[0].EventType == ProjectionEventTypes.ProjectionDeleted &&
+				Helper.UTF8NoBom.GetString(x.Events[0].Data) == _projectionName));
+	}
+
+	[Test, Category("v8")]
+	public void should_have_attempted_to_delete_the_checkpoint_stream() {
+		Assert.IsTrue(
+			_consumer.HandledMessages.OfType<ClientMessage.DeleteStream>()
+				.Any(x => x.EventStreamId == _projectionCheckpointStream));
+	}
+
+	[Test, Category("v8")]
+	public void should_have_attempted_to_delete_the_emitted_streams_stream() {
+		Assert.IsTrue(
+			_consumer.HandledMessages.OfType<ClientMessage.DeleteStream>()
+				.Any(x => x.EventStreamId == _projectionEmittedStreamsStream));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection.cs
new file mode 100644
index 00000000000..c755996f240
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_deleting_a_persistent_projection<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	private string _projectionName;
+	private const string _projectionCheckpointStream = "$projections-test-projection-checkpoint";
+	private const string _projectionEmittedStreamsStream = "$projections-test-projection-emittedstreams";
+
+	protected override void Given() {
+		_projectionName = "test-projection";
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
+		yield return
+			new ProjectionManagementMessage.Command.Post(
+				_bus, ProjectionMode.Continuous, _projectionName,
+				ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
+				enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true);
+		yield return
+			new ProjectionManagementMessage.Command.Disable(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.System);
+		yield return
+			new ProjectionManagementMessage.Command.Delete(
+				_bus, _projectionName,
+				ProjectionManagementMessage.RunAs.System, true, true, true);
+	}
+
+	[Test, Category("v8")]
+	public void a_projection_deleted_event_is_written() {
+		Assert.AreEqual(
+			true,
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Any(x =>
+				x.Events[0].EventType == ProjectionEventTypes.ProjectionDeleted &&
+				Helper.UTF8NoBom.GetString(x.Events[0].Data) == _projectionName));
+	}
+
+	[Test, Category("v8")]
+	public void should_have_attempted_to_delete_the_checkpoint_stream() {
+		Assert.IsTrue(
+			_consumer.HandledMessages.OfType<ClientMessage.DeleteStream>()
+				.Any(x => x.EventStreamId == _projectionCheckpointStream));
+	}
+
+	[Test, Category("v8")]
+	public void should_have_attempted_to_delete_the_emitted_streams_stream() {
+		Assert.IsTrue(
+			_consumer.HandledMessages.OfType<ClientMessage.DeleteStream>()
+				.Any(x => x.EventStreamId == _projectionEmittedStreamsStream));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_emitted_not_enabled.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_emitted_not_enabled.cs
new file mode 100644
index 00000000000..19ec049175b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_emitted_not_enabled.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class WhenDeletingAPersistentProjectionAndEmittedNotEnabled<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	private string _projectionName;
+
+	protected override void Given() {
+		_projectionName = "test-projection";
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
+		yield return
+			new ProjectionManagementMessage.Command.Post(
+														 _bus, ProjectionMode.Continuous, _projectionName,
+														 ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
+														 enabled: true, checkpointsEnabled: true, emitEnabled: false, trackEmittedStreams: false);
+		yield return
+			new ProjectionManagementMessage.Command.Disable(
+															_bus, _projectionName, ProjectionManagementMessage.RunAs.System);
+		yield return
+			new ProjectionManagementMessage.Command.Delete(
+														   _bus, _projectionName,
+														   ProjectionManagementMessage.RunAs.System, true, true, true);
+	}
+
+	[Test, Category("v8")]
+	public void a_projection_deleted_event_is_written() {
+		var deletedStreamEvents = _consumer.HandledMessages.OfType<ClientMessage.DeleteStream>().ToList();
+
+		Assert.AreEqual(deletedStreamEvents.Count, 1);
+
+		Assert.AreEqual(deletedStreamEvents.First().EventStreamId, $"$projections-{_projectionName}-checkpoint");
+
+		Assert.AreEqual(true, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Any(x => x.Events[0].EventType == ProjectionEventTypes.ProjectionDeleted && Helper.UTF8NoBom.GetString(x.Events[0].Data) == _projectionName));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_keep_checkpoint_stream.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_keep_checkpoint_stream.cs
new file mode 100644
index 00000000000..136318d7912
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_keep_checkpoint_stream.cs
@@ -0,0 +1,62 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_deleting_a_persistent_projection_and_keep_checkpoint_stream<TLogFormat, TStreamId> :
+		TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	private string _projectionName;
+	private const string _projectionStateStream = "$projections-test-projection-result";
+	private const string _projectionCheckpointStream = "$projections-test-projection-checkpoint";
+
+	protected override void Given() {
+		_projectionName = "test-projection";
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
+		yield return
+			new ProjectionManagementMessage.Command.Post(
+				_bus, ProjectionMode.Continuous, _projectionName,
+				ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
+				enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true);
+		yield return
+			new ProjectionManagementMessage.Command.Disable(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.System);
+		yield return
+			new ProjectionManagementMessage.Command.Delete(
+				_bus, _projectionName,
+				ProjectionManagementMessage.RunAs.System, false, false, false);
+	}
+
+	[Test, Category("v8")]
+	public void a_projection_deleted_event_is_written() {
+		Assert.AreEqual(
+			true,
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Any(x =>
+				x.Events[0].EventType == ProjectionEventTypes.ProjectionDeleted &&
+				Helper.UTF8NoBom.GetString(x.Events[0].Data) == _projectionName));
+	}
+
+	[Test, Category("v8")]
+	public void should_not_have_attempted_to_delete_the_checkpoint_stream() {
+		Assert.IsFalse(
+			_consumer.HandledMessages.OfType<ClientMessage.DeleteStream>()
+				.Any(x => x.EventStreamId == _projectionCheckpointStream));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_keep_emitted_streams_stream.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_keep_emitted_streams_stream.cs
new file mode 100644
index 00000000000..05c675efbc0
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_keep_emitted_streams_stream.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_deleting_a_persistent_projection_and_keep_emitted_streams_stream<TLogFormat, TStreamId> :
+		TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	private string _projectionName;
+	private const string _projectionEmittedStreamsStream = "$projections-test-projection-emittedstreams";
+
+	protected override void Given() {
+		_projectionName = "test-projection";
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
+		yield return
+			new ProjectionManagementMessage.Command.Post(
+				_bus, ProjectionMode.Continuous, _projectionName,
+				ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
+				enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true);
+		yield return
+			new ProjectionManagementMessage.Command.Disable(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.System);
+		yield return
+			new ProjectionManagementMessage.Command.Delete(
+				_bus, _projectionName,
+				ProjectionManagementMessage.RunAs.System, false, false, false);
+	}
+
+	[Test, Category("v8")]
+	public void a_projection_deleted_event_is_written() {
+		Assert.AreEqual(
+			true,
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Any(x =>
+				x.Events[0].EventType == ProjectionEventTypes.ProjectionDeleted &&
+				Helper.UTF8NoBom.GetString(x.Events[0].Data) == _projectionName));
+	}
+
+	[Test, Category("v8")]
+	public void should_not_have_attempted_to_delete_the_emitted_streams_stream() {
+		Assert.IsFalse(
+			_consumer.HandledMessages.OfType<ClientMessage.DeleteStream>()
+				.Any(x => x.EventStreamId == _projectionEmittedStreamsStream));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_not_authorised.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_not_authorised.cs
new file mode 100644
index 00000000000..f4c1bba7a18
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_and_not_authorised.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_deleting_a_persistent_projection_and_not_authorised<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	private string _projectionName;
+
+	protected override void Given() {
+		_projectionName = "test-projection";
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
+		yield return
+			new ProjectionManagementMessage.Command.Post(
+				_bus, ProjectionMode.Continuous, _projectionName,
+				ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
+				enabled: true, checkpointsEnabled: true, emitEnabled: false, trackEmittedStreams: true);
+		yield return
+			new ProjectionManagementMessage.Command.Disable(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.System);
+		yield return
+			new ProjectionManagementMessage.Command.Delete(
+				_bus, _projectionName,
+				ProjectionManagementMessage.RunAs.Anonymous, false, false, false);
+	}
+
+	[Test, Category("v8")]
+	public void a_projection_deleted_event_is_not_written() {
+		Assert.AreNotEqual(
+			ProjectionEventTypes.ProjectionDeleted,
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Last().Events[0].EventType,
+			$"{ProjectionEventTypes.ProjectionDeleted} event was not supposed to be written");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_with_default_options.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_with_default_options.cs
new file mode 100644
index 00000000000..407bed44fcc
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_persistent_projection_with_default_options.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_deleting_a_persistent_projection_with_default_options<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	private string _projectionName;
+
+	protected override void Given() {
+		_projectionName = "test-projection";
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
+		yield return
+			new ProjectionManagementMessage.Command.Post(
+				_bus, ProjectionMode.Continuous, _projectionName,
+				ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
+				enabled: true, checkpointsEnabled: true, emitEnabled: false, trackEmittedStreams: true);
+		yield return
+			new ProjectionManagementMessage.Command.Disable(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.System);
+		yield return
+			new ProjectionManagementMessage.Command.Delete(
+				_bus, _projectionName,
+				ProjectionManagementMessage.RunAs.System, true, true, true);
+	}
+
+	[Test, Category("v8")]
+	public void a_projection_deleted_event_is_written() {
+		var deletedStreamEvents = _consumer.HandledMessages.OfType<ClientMessage.DeleteStream>().ToList();
+		Assert.AreEqual(true, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Any(x => x.Events[0].EventType == ProjectionEventTypes.ProjectionDeleted && Helper.UTF8NoBom.GetString(x.Events[0].Data) == _projectionName));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_running_persistent_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_running_persistent_projection.cs
new file mode 100644
index 00000000000..2df9af0dc61
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_running_persistent_projection.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_deleting_a_running_persistent_projection<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	private string _projectionName;
+	private const string _projectionCheckpointStream = "$projections-test-projection-checkpoint";
+
+	protected override void Given() {
+		_projectionName = "test-projection";
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
+		yield return
+			new ProjectionManagementMessage.Command.Post(
+				_bus, ProjectionMode.Continuous, _projectionName,
+				ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
+				enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true);
+		yield return
+			new ProjectionManagementMessage.Command.Delete(
+				_bus, _projectionName,
+				ProjectionManagementMessage.RunAs.System, true, true, false);
+	}
+
+	[Test, Category("v8")]
+	public void a_projection_deleted_event_is_not_written() {
+		var projectionDeletedEventExists = _consumer.HandledMessages.Any(x =>
+			x.GetType() == typeof(ClientMessage.WriteEvents) &&
+			((ClientMessage.WriteEvents)x).Events[0].EventType == ProjectionEventTypes.ProjectionDeleted);
+		Assert.IsFalse(projectionDeletedEventExists,
+			$"Expected that the {ProjectionEventTypes.ProjectionDeleted} event not to have been written");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_system_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_system_projection.cs
new file mode 100644
index 00000000000..b086dde1736
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_deleting_a_system_projection.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+using LogV3StreamId = System.UInt32;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+public class SystemProjectionNames : IEnumerable {
+	public IEnumerator GetEnumerator() {
+		foreach (var projection in typeof(ProjectionNamesBuilder.StandardProjections).GetFields(
+				BindingFlags.Public |
+				BindingFlags.Static |
+				BindingFlags.FlattenHierarchy)
+			.Where(x => x.IsLiteral && !x.IsInitOnly)
+			.Select(x => x.GetRawConstantValue())) {
+			yield return new[] { typeof(LogFormat.V2), typeof(string), projection };
+			yield return new[] { typeof(LogFormat.V3), typeof(LogV3StreamId), projection };
+		}
+	}
+}
+
+[TestFixture, TestFixtureSource(typeof(SystemProjectionNames))]
+public class when_deleting_a_system_projection<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	private string _systemProjectionName;
+
+	public when_deleting_a_system_projection(string projectionName) {
+		_systemProjectionName = projectionName;
+	}
+
+	protected override bool GivenInitializeSystemProjections() {
+		return true;
+	}
+
+	protected override void Given() {
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
+		yield return
+			new ProjectionManagementMessage.Command.Disable(
+				_bus, _systemProjectionName, ProjectionManagementMessage.RunAs.System);
+		yield return
+			new ProjectionManagementMessage.Command.Delete(
+				_bus, _systemProjectionName,
+				ProjectionManagementMessage.RunAs.System, false, false, false);
+	}
+
+	[Test, Category("v8")]
+	public void a_projection_deleted_event_is_not_written() {
+		Assert.IsFalse(
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Any(x =>
+				x.Events[0].EventType == ProjectionEventTypes.ProjectionDeleted &&
+				Helper.UTF8NoBom.GetString(x.Events[0].Data) == _systemProjectionName));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_posting_a_persistent_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_posting_a_persistent_projection.cs
new file mode 100644
index 00000000000..e5cb420cecd
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_posting_a_persistent_projection.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_posting_a_persistent_projection<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	private string _projectionName;
+
+	protected override void Given() {
+		_projectionName = "test-projection";
+		AllWritesQueueUp();
+		NoOtherStreams();
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
+		yield return
+			new ProjectionManagementMessage.Command.Post(
+				_bus, ProjectionMode.Continuous, _projectionName,
+				ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
+				enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true);
+		OneWriteCompletes();
+	}
+
+	[Test, Category("v8")]
+	public void the_projection_status_is_writing() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetStatistics(_bus, null, _projectionName,
+				true));
+		Assert.AreEqual(
+			ManagedProjectionState.Prepared,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections[0]
+				.LeaderStatus);
+	}
+
+	[Test, Category("v8")]
+	public void a_projection_created_event_is_written() {
+		var createdEventWrite = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().FirstOrDefault();
+		Assert.NotNull(createdEventWrite);
+		Assert.AreEqual(ProjectionNamesBuilder.ProjectionsRegistrationStream, createdEventWrite.EventStreamId);
+		Assert.AreEqual(ProjectionEventTypes.ProjectionCreated, createdEventWrite.Events[0].EventType);
+		Assert.AreEqual(_projectionName, Helper.UTF8NoBom.GetString(createdEventWrite.Events[0].Data));
+	}
+
+	[Test, Category("v8")]
+	public void persisted_projection_state_is_written_with_empty_execution_timeout() {
+		var persistedStateStream = ProjectionNamesBuilder.ProjectionsStreamPrefix + _projectionName;
+		var persistedStateWrite = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
+			.FirstOrDefault(x => x.EventStreamId == persistedStateStream);
+
+		Assert.NotNull(persistedStateWrite);
+		Assert.AreEqual(ProjectionEventTypes.ProjectionUpdated, persistedStateWrite.Events[0].EventType);
+		var actualState = persistedStateWrite.Events[0].Data.ParseJson<ManagedProjection.PersistedState>();
+		Assert.IsNull(actualState.ProjectionExecutionTimeout);
+	}
+
+	[Test, Category("v8")]
+	public void a_projection_updated_message_is_not_published() {
+		// not published until all writes complete
+		Assert.AreEqual(0, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Updated>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_posting_a_persistent_projection_and_registration_write_fails.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_posting_a_persistent_projection_and_registration_write_fails.cs
new file mode 100644
index 00000000000..0d6f8b61bf2
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_posting_a_persistent_projection_and_registration_write_fails.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string), OperationResult.CommitTimeout)]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), OperationResult.CommitTimeout)]
+[TestFixture(typeof(LogFormat.V2), typeof(string), OperationResult.ForwardTimeout)]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), OperationResult.ForwardTimeout)]
+[TestFixture(typeof(LogFormat.V2), typeof(string), OperationResult.PrepareTimeout)]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), OperationResult.PrepareTimeout)]
+public class
+	when_posting_a_persistent_projection_and_registration_write_fails<TLogFormat, TStreamId> :
+		TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	private OperationResult _failureCondition;
+
+	public when_posting_a_persistent_projection_and_registration_write_fails(OperationResult failureCondition) {
+		_failureCondition = failureCondition;
+	}
+
+	protected override void Given() {
+		NoStream("$projections-test-projection-order");
+		AllWritesToSucceed("$projections-test-projection-order");
+		NoStream("$projections-test-projection-checkpoint");
+		NoOtherStreams();
+		AllWritesQueueUp();
+	}
+
+	private string _projectionName;
+
+	protected override IEnumerable<WhenStep> When() {
+		_projectionName = "test-projection";
+		yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
+		yield return
+			new ProjectionManagementMessage.Command.Post(
+				_bus, ProjectionMode.Continuous, _projectionName,
+				ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
+				enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true);
+	}
+
+	[Test, Category("v8")]
+	public void retries_creating_the_projection_only_the_specified_number_of_times_and_the_same_event_id() {
+		int retryCount = 0;
+		var projectionRegistrationWrite = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
+			.Where(x => x.EventStreamId == ProjectionNamesBuilder.ProjectionsRegistrationStream).Last();
+		var eventId = projectionRegistrationWrite.Events[0].EventId;
+		while (projectionRegistrationWrite != null) {
+			Assert.AreEqual(eventId, projectionRegistrationWrite.Events[0].EventId);
+			projectionRegistrationWrite.Envelope.ReplyWith(new ClientMessage.WriteEventsCompleted(
+				projectionRegistrationWrite.CorrelationId, _failureCondition,
+				Enum.GetName(typeof(OperationResult), _failureCondition)));
+			_queue.Process();
+			projectionRegistrationWrite = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>()
+				.Where(x => x.EventStreamId == ProjectionNamesBuilder.ProjectionsRegistrationStream)
+				.LastOrDefault();
+			if (projectionRegistrationWrite != null) {
+				retryCount++;
+			}
+
+			_consumer.HandledMessages.Clear();
+		}
+
+		Assert.AreEqual(ProjectionManager.ProjectionCreationRetryCount, retryCount);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_posting_a_persistent_projection_and_writes_succeed.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_posting_a_persistent_projection_and_writes_succeed.cs
new file mode 100644
index 00000000000..21084034156
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_posting_a_persistent_projection_and_writes_succeed.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_posting_a_persistent_projection_and_writes_succeed<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	protected override void Given() {
+		NoStream("$projections-test-projection-order");
+		AllWritesToSucceed("$projections-test-projection-order");
+		NoStream("$projections-test-projection-checkpoint");
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	private string _projectionName;
+
+	protected override IEnumerable<WhenStep> When() {
+		_projectionName = "test-projection";
+		yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
+		yield return
+			new ProjectionManagementMessage.Command.Post(
+				_bus, ProjectionMode.Continuous, _projectionName,
+				ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
+				enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true);
+	}
+
+	[Test, Category("v8")]
+	public void projection_status_is_running() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetStatistics(_bus, null, _projectionName,
+				true));
+		Assert.AreEqual(
+			ManagedProjectionState.Running,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections[0]
+				.LeaderStatus);
+	}
+
+	[Test, Category("v8")]
+	public void a_projection_updated_event_is_written() {
+		Assert.IsTrue(
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Any(
+				v => v.Events[0].EventType == ProjectionEventTypes.ProjectionUpdated));
+	}
+
+	[Test, Category("v8")]
+	public void a_projection_updated_message_is_published() {
+		// not published until writes complete
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Updated>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_posting_an_onetime_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_posting_an_onetime_projection.cs
new file mode 100644
index 00000000000..4fc44ceb08d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_posting_an_onetime_projection.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_posting_an_onetime_projection<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	protected override void Given() {
+		NoOtherStreams();
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+		yield return
+			(new ProjectionManagementMessage.Command.Post(
+				_bus, ProjectionManagementMessage.RunAs.Anonymous,
+				@"fromAll().when({$any:function(s,e){return s;}});", enabled: true));
+	}
+
+	[Test, Category("v8")]
+	public void projection_updated_is_published() {
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Updated>().Count());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_reading_registered_projections/with_no_stream.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_reading_registered_projections/with_no_stream.cs
new file mode 100644
index 00000000000..34235d3c6cc
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_reading_registered_projections/with_no_stream.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager.when_reading_registered_projections;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class with_no_stream<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	protected override void Given() {
+		AllWritesSucceed();
+		NoStream(ProjectionNamesBuilder.ProjectionsRegistrationStream);
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
+	}
+
+	protected override bool GivenInitializeSystemProjections() {
+		return false;
+	}
+
+	[Test]
+	public void it_should_write_the_projections_initialized_event() {
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count(x =>
+			x.EventStreamId == ProjectionNamesBuilder.ProjectionsRegistrationStream &&
+			x.Events[0].EventType == ProjectionEventTypes.ProjectionsInitialized));
+	}
+
+	[Test]
+	public void it_should_not_write_any_projection_created_events() {
+		Assert.AreEqual(0, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count(x =>
+			x.EventStreamId == ProjectionNamesBuilder.ProjectionsRegistrationStream &&
+			x.Events[0].EventType == ProjectionEventTypes.ProjectionCreated));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_reading_registered_projections/with_no_stream_and_intialize_system_projections.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_reading_registered_projections/with_no_stream_and_intialize_system_projections.cs
new file mode 100644
index 00000000000..f5a1ef5b1c4
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_reading_registered_projections/with_no_stream_and_intialize_system_projections.cs
@@ -0,0 +1,70 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+using LogV3StreamId = System.UInt32;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager.when_reading_registered_projections;
+
+[TestFixture, TestFixtureSource(typeof(SystemProjectionNames))]
+public class with_no_stream_and_intialize_system_projections<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	private string _systemProjectionName;
+
+	public with_no_stream_and_intialize_system_projections(string projectionName) {
+		_systemProjectionName = projectionName;
+	}
+
+	protected override void Given() {
+		AllWritesSucceed();
+		NoStream(ProjectionNamesBuilder.ProjectionsRegistrationStream);
+		NoOtherStreams();
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
+	}
+
+	protected override bool GivenInitializeSystemProjections() {
+		return true;
+	}
+
+	[Test]
+	public void it_should_write_the_projections_initialized_event() {
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count(x =>
+			x.EventStreamId == ProjectionNamesBuilder.ProjectionsRegistrationStream &&
+			x.Events[0].EventType == ProjectionEventTypes.ProjectionsInitialized));
+	}
+
+	[Test]
+	public void it_should_write_the_system_projection_created_event() {
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Count(x =>
+			x.EventStreamId == ProjectionNamesBuilder.ProjectionsRegistrationStream &&
+			x.Events.All(e => e.EventType == ProjectionEventTypes.ProjectionCreated) &&
+			x.Events.Any(e => Helper.UTF8NoBom.GetString(e.Data) == _systemProjectionName)));
+	}
+}
+
+public class SystemProjectionNames : IEnumerable {
+	public IEnumerator GetEnumerator() {
+		foreach (var projection in typeof(ProjectionNamesBuilder.StandardProjections).GetFields(
+				BindingFlags.Public |
+				BindingFlags.Static |
+				BindingFlags.FlattenHierarchy)
+			.Where(x => x.IsLiteral && !x.IsInitOnly)
+			.Select(x => x.GetRawConstantValue())) {
+			yield return new[] { typeof(LogFormat.V2), typeof(string), projection };
+			yield return new[] { typeof(LogFormat.V3), typeof(LogV3StreamId), projection };
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_recreating_a_deleted_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_recreating_a_deleted_projection.cs
new file mode 100644
index 00000000000..0f28b61f72c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_recreating_a_deleted_projection.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_recreating_a_deleted_projection<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	private string _projectionName;
+
+	protected override void Given() {
+		_projectionName = "test-projection";
+		AllWritesSucceed();
+		NoOtherStreams();
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
+		yield return
+			new ProjectionManagementMessage.Command.Post(
+				_bus, ProjectionMode.Continuous, _projectionName,
+				ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
+				enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true);
+		yield return
+			new ProjectionManagementMessage.Command.Disable(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.System);
+		yield return
+			new ProjectionManagementMessage.Command.Delete(
+				_bus, _projectionName,
+				ProjectionManagementMessage.RunAs.System, true, true, false);
+		yield return
+			new ProjectionManagementMessage.Command.Post(
+				_bus, ProjectionMode.Continuous, _projectionName,
+				ProjectionManagementMessage.RunAs.System, "JS", @"fromAll().when({$any:function(s,e){return s;}});",
+				enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true);
+	}
+
+	[Test, Category("v8")]
+	public void a_projection_created_event_should_be_written() {
+		Assert.AreEqual(
+			ProjectionEventTypes.ProjectionCreated,
+			_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().First().Events[0].EventType);
+		Assert.AreEqual(
+			_projectionName,
+			Helper.UTF8NoBom.GetString(_consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().First()
+				.Events[0].Data));
+	}
+
+	[Test, Category("v8")]
+	public void it_can_be_listed() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetStatistics(_bus, null, null, false));
+
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count(
+				v => v.Projections.Any(p => p.Name == _projectionName)));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_requesting_partition_state_from_a_stopped_foreach_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_requesting_partition_state_from_a_stopped_foreach_projection.cs
new file mode 100644
index 00000000000..bd990f19ab4
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_requesting_partition_state_from_a_stopped_foreach_projection.cs
@@ -0,0 +1,71 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_requesting_partition_state_from_a_stopped_foreach_projection<TLogFormat, TStreamId> :
+	TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	protected override void Given() {
+		NoStream("$projections-test-projection-order");
+		ExistingEvent(ProjectionNamesBuilder.ProjectionsRegistrationStream, ProjectionEventTypes.ProjectionCreated,
+			null, "test-projection");
+		ExistingEvent(
+			"$projections-test-projection", ProjectionEventTypes.ProjectionUpdated, null,
+			@"{""Query"":""fromCategory('test').foreachStream().when({'e': function(s,e){}})"",
+                    ""Mode"":""3"", ""Enabled"":false, ""HandlerType"":""JS"",
+                    ""SourceDefinition"":{
+                        ""AllEvents"":true,
+                        ""AllStreams"":false,
+                        ""Streams"":[""$ce-test""]
+                    }
+                }");
+		ExistingEvent("$projections-test-projection-a-checkpoint", ProjectionEventTypes.PartitionCheckpoint,
+			@"{""s"":{""$ce-test"": 9}}", @"{""data"":1}");
+		NoStream("$projections-test-projection-b-checkpoint");
+		ExistingEvent("$projections-test-projection-checkpoint", ProjectionEventTypes.ProjectionCheckpoint,
+			@"{""s"":{""$ce-test"": 10}}", @"{}");
+		AllWritesSucceed();
+	}
+
+	private string _projectionName;
+
+	protected override IEnumerable<WhenStep> When() {
+		_projectionName = "test-projection";
+		// when
+		yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+	}
+
+	[Test]
+	public void the_projection_state_can_be_retrieved() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, "a"));
+		_queue.Process();
+
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
+
+		var first = _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().First();
+		Assert.AreEqual(_projectionName, first.Name);
+		Assert.AreEqual(@"{""data"":1}", first.State);
+
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, "b"));
+		_queue.Process();
+
+		Assert.AreEqual(2, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
+		var second = _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Skip(1)
+			.First();
+		Assert.AreEqual(_projectionName, second.Name);
+		Assert.AreEqual("", second.State);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_starting_the_projection_manager_with_duplicate_projection_created.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_starting_the_projection_manager_with_duplicate_projection_created.cs
new file mode 100644
index 00000000000..70793410465
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_starting_the_projection_manager_with_duplicate_projection_created.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Metrics;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class
+	when_starting_the_projection_manager_with_duplicate_projection_created<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private new ITimeProvider _timeProvider;
+	private ProjectionManager _manager;
+	private Guid _workerId;
+
+	protected override void Given() {
+		_workerId = Guid.NewGuid();
+		ExistingEvent(ProjectionNamesBuilder.ProjectionsRegistrationStream, ProjectionEventTypes.ProjectionCreated,
+			null, "projection1");
+		ExistingEvent(ProjectionNamesBuilder.ProjectionsRegistrationStream, ProjectionEventTypes.ProjectionCreated,
+			null, "projection1");
+		ExistingEvent(
+			"$projections-projection1", ProjectionEventTypes.ProjectionUpdated, null,
+			@"{""Query"":""fromAll(); on_any(function(){});log('hello-from-projection-definition');"", ""Mode"":""3"", ""Enabled"":true, ""HandlerType"":""JS""}");
+	}
+
+	[SetUp]
+	public void setup() {
+		_timeProvider = new FakeTimeProvider();
+		var queues = new Dictionary<Guid, IPublisher> { { _workerId, _bus } };
+		_manager = new ProjectionManager(
+			_bus,
+			_bus,
+			queues,
+			_timeProvider,
+			ProjectionType.All,
+			_ioDispatcher,
+			TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault),
+			IProjectionTracker.NoOp);
+		_bus.Subscribe<ClientMessage.WriteEventsCompleted>(_manager);
+		_bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_manager);
+		_bus.Subscribe<ClientMessage.ReadStreamEventsForwardCompleted>(_manager);
+		_manager.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+	}
+
+	[TearDown]
+	public void TearDown() {
+		_manager.Dispose();
+	}
+
+	[Test]
+	public void projection_status_is_preparing() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetStatistics(_bus, null, "projection1",
+				true));
+		Assert.AreEqual(
+			ManagedProjectionState.Preparing,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().SingleOrDefault(
+				v => v.Projections[0].Name == "projection1").Projections[0].LeaderStatus);
+	}
+
+	[Test]
+	public void projection_id_is_latest() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetStatistics(_bus, null, "projection1",
+				true));
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().SingleOrDefault(
+				v => v.Projections[0].Name == "projection1").Projections[0].ProjectionId);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_starting_the_projection_manager_with_existing_partially_created_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_starting_the_projection_manager_with_existing_partially_created_projection.cs
new file mode 100644
index 00000000000..90bea49edf2
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_starting_the_projection_manager_with_existing_partially_created_projection.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Metrics;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_starting_the_projection_manager_with_existing_partially_created_projection<TLogFormat, TStreamId> :
+	TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private ProjectionManager _manager;
+	private new ITimeProvider _timeProvider;
+	private Guid _workerId;
+
+	protected override void Given() {
+		_workerId = Guid.NewGuid();
+		ExistingEvent(ProjectionNamesBuilder.ProjectionsRegistrationStream, ProjectionEventTypes.ProjectionCreated,
+			null, "projection1");
+		NoStream("$projections-projection1");
+	}
+
+
+	[SetUp]
+	public void setup() {
+		_timeProvider = new FakeTimeProvider();
+		var queues = new Dictionary<Guid, IPublisher> { { _workerId, _bus } };
+		_manager = new ProjectionManager(
+			_bus,
+			_bus,
+			queues,
+			_timeProvider,
+			ProjectionType.All,
+			_ioDispatcher,
+			TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault),
+			IProjectionTracker.NoOp);
+		_bus.Subscribe<ClientMessage.WriteEventsCompleted>(_manager);
+		_bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_manager);
+		_bus.Subscribe<ClientMessage.ReadStreamEventsForwardCompleted>(_manager);
+		_manager.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+	}
+
+	[TearDown]
+	public void TearDown() {
+		_manager.Dispose();
+	}
+
+	[Test]
+	public void projection_status_can_be_retrieved() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetStatistics(_bus, null, "projection1",
+				true));
+		Assert.IsNotNull(
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().SingleOrDefault(
+				v => v.Projections[0].Name == "projection1"));
+	}
+
+	[Test]
+	public void projection_status_is_creating() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetStatistics(_bus, null, "projection1",
+				true));
+		Assert.AreEqual(
+			ManagedProjectionState.Creating,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().SingleOrDefault(
+				v => v.Projections[0].Name == "projection1").Projections[0].LeaderStatus);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_starting_the_projection_manager_with_existing_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_starting_the_projection_manager_with_existing_projection.cs
new file mode 100644
index 00000000000..bc4c27ee723
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_starting_the_projection_manager_with_existing_projection.cs
@@ -0,0 +1,108 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Nodes;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Services.TimeService;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Metrics;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Tests.Services.core_projection;
+using NUnit.Framework;
+using TelemetryMessage = KurrentDB.Core.Telemetry.TelemetryMessage;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_starting_the_projection_manager_with_existing_projection<TLogFormat, TStreamId> : TestFixtureWithExistingEvents<TLogFormat, TStreamId> {
+	private new ITimeProvider _timeProvider;
+	private ProjectionManager _manager;
+	private Guid _workerId;
+
+	protected override void Given() {
+		_workerId = Guid.NewGuid();
+		ExistingEvent(ProjectionNamesBuilder.ProjectionsRegistrationStream, ProjectionEventTypes.ProjectionCreated,
+			null, "projection1");
+		ExistingEvent(
+			"$projections-projection1", ProjectionEventTypes.ProjectionUpdated, null,
+			@"{""Query"":""fromAll(); on_any(function(){});log('hello-from-projection-definition');"", ""Mode"":""3"", ""Enabled"":true, ""HandlerType"":""JS""}");
+	}
+
+
+	[SetUp]
+	public void setup() {
+		_timeProvider = new FakeTimeProvider();
+		var queues = new Dictionary<Guid, IPublisher> { { _workerId, _bus } };
+		_manager = new ProjectionManager(
+			_bus,
+			_bus,
+			queues,
+			_timeProvider,
+			ProjectionType.All,
+			_ioDispatcher,
+			TimeSpan.FromMinutes(Opts.ProjectionsQueryExpiryDefault),
+			IProjectionTracker.NoOp);
+		_bus.Subscribe<ClientMessage.WriteEventsCompleted>(_manager);
+		_bus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_manager);
+		_bus.Subscribe<ClientMessage.ReadStreamEventsForwardCompleted>(_manager);
+		_manager.Handle(new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+	}
+
+	[TearDown]
+	public void TearDown() {
+		_manager.Dispose();
+	}
+
+	[Test]
+	public void projection_status_can_be_retrieved() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetStatistics(_bus, null, "projection1",
+				true));
+		Assert.IsNotNull(
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().SingleOrDefault(
+				v => v.Projections[0].Name == "projection1"));
+	}
+
+	[Test]
+	public void projection_status_is_starting() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetStatistics(_bus, null, "projection1",
+				true));
+		Assert.AreEqual(
+			ManagedProjectionState.Preparing,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().SingleOrDefault(
+				v => v.Projections[0].Name == "projection1").Projections[0].LeaderStatus);
+	}
+
+	[Test]
+	public void projection_telemetry_working() {
+		_manager.Handle(
+			new TelemetryMessage.Request(
+				_bus));
+
+		var actual = _consumer.HandledMessages.OfType<TelemetryMessage.Response>().Single();
+
+		Assert.AreEqual("projections", actual.Key);
+		Assert.AreEqual(
+			new JsonObject {
+				["customProjectionCount"] = 1,
+				["standardProjectionCount"] = 0,
+				["customProjectionRunningCount"] = 0,
+				["standardProjectionRunningCount"] = 0,
+				["totalCount"] = 1,
+				["totalRunningCount"] = 0,
+			}.ToJsonString(),
+			actual.Value.ToJsonString());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_the_onetime_projection_has_been_posted.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_the_onetime_projection_has_been_posted.cs
new file mode 100644
index 00000000000..09dc5a2751e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_the_onetime_projection_has_been_posted.cs
@@ -0,0 +1,90 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_the_onetime_projection_has_been_posted<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	private string _projectionName;
+	private string _projectionQuery;
+
+	protected override void Given() {
+		NoOtherStreams();
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		_projectionQuery = @"fromAll(); on_any(function(){});log(1);";
+		yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+		yield return
+			(new ProjectionManagementMessage.Command.Post(
+				_bus, ProjectionManagementMessage.RunAs.Anonymous, _projectionQuery,
+				enabled: true));
+		_projectionName = _consumer.HandledMessages.OfType<ProjectionManagementMessage.Updated>().Single().Name;
+	}
+
+	[Test, Category("v8")]
+	public void it_has_been_posted() {
+		Assert.IsFalse(string.IsNullOrEmpty(_projectionName));
+	}
+
+	[Test, Category("v8")]
+	public void it_cab_be_listed() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetStatistics(_bus, null, null, false));
+
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count(
+				v => v.Projections.Any(p => p.Name == _projectionName)));
+	}
+
+	[Test, Category("v8")]
+	public void the_projection_status_can_be_retrieved() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetStatistics(
+				_bus, null, _projectionName, false));
+
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Length);
+		Assert.AreEqual(
+			_projectionName,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Single()
+				.Name);
+	}
+
+	[Test, Category("v8")]
+	public void the_projection_state_can_be_retrieved() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, ""));
+		_queue.Process();
+
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
+		Assert.AreEqual(
+			_projectionName,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().Name);
+		Assert.AreEqual(
+			"", _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().State);
+	}
+
+	[Test, Category("v8")]
+	public void the_projection_source_can_be_retrieved() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetQuery(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
+		var projectionQuery = _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>()
+			.Single();
+		Assert.AreEqual(_projectionName, projectionQuery.Name);
+		Assert.AreEqual(_projectionQuery, projectionQuery.Query);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_the_projections_initialized_write_fails.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_the_projections_initialized_write_fails.cs
new file mode 100644
index 00000000000..e7233118287
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_the_projections_initialized_write_fails.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string), OperationResult.CommitTimeout)]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), OperationResult.CommitTimeout)]
+[TestFixture(typeof(LogFormat.V2), typeof(string), OperationResult.PrepareTimeout)]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), OperationResult.PrepareTimeout)]
+[TestFixture(typeof(LogFormat.V2), typeof(string), OperationResult.ForwardTimeout)]
+[TestFixture(typeof(LogFormat.V3), typeof(uint), OperationResult.ForwardTimeout)]
+public class
+	when_writing_the_projections_initialized_event_fails<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+
+	private OperationResult _failureCondition;
+
+	public when_writing_the_projections_initialized_event_fails(OperationResult failureCondition) {
+		_failureCondition = failureCondition;
+	}
+
+	protected override void Given() {
+		AllWritesQueueUp();
+		NoStream(ProjectionNamesBuilder.ProjectionsRegistrationStream);
+	}
+
+	protected override bool GivenInitializeSystemProjections() {
+		return false;
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		yield return new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid());
+	}
+
+	[Test, Category("v8")]
+	public void retries_writing_with_the_same_event_id() {
+		int retryCount = 0;
+		var projectionsInitializedWrite = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Where(x =>
+			x.EventStreamId == ProjectionNamesBuilder.ProjectionsRegistrationStream &&
+			x.Events[0].EventType == ProjectionEventTypes.ProjectionsInitialized).Last();
+		var eventId = projectionsInitializedWrite.Events[0].EventId;
+		while (retryCount < 5) {
+			Assert.AreEqual(eventId, projectionsInitializedWrite.Events[0].EventId);
+			projectionsInitializedWrite.Envelope.ReplyWith(new ClientMessage.WriteEventsCompleted(
+				projectionsInitializedWrite.CorrelationId, _failureCondition,
+				Enum.GetName(typeof(OperationResult), _failureCondition)));
+			_queue.Process();
+			projectionsInitializedWrite = _consumer.HandledMessages.OfType<ClientMessage.WriteEvents>().Where(x =>
+				x.EventStreamId == ProjectionNamesBuilder.ProjectionsRegistrationStream &&
+				x.Events[0].EventType == ProjectionEventTypes.ProjectionsInitialized).LastOrDefault();
+			if (projectionsInitializedWrite != null) {
+				retryCount++;
+			}
+
+			_consumer.HandledMessages.Clear();
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_updating_a_disabled_projection_query_text.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_updating_a_disabled_projection_query_text.cs
new file mode 100644
index 00000000000..5da4033cd75
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_updating_a_disabled_projection_query_text.cs
@@ -0,0 +1,95 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_updating_a_disabled_projection_query_text<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	protected override void Given() {
+		NoStream("$projections-test-projection");
+		NoStream("$projections-test-projection-result");
+		NoStream("$projections-test-projection-order");
+		AllWritesToSucceed("$projections-test-projection-order");
+		NoStream("$projections-test-projection-checkpoint");
+		AllWritesSucceed();
+	}
+
+	private string _projectionName;
+	private string _newProjectionSource;
+
+	protected override IEnumerable<WhenStep> When() {
+		_projectionName = "test-projection";
+		yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+		yield return
+			(new ProjectionManagementMessage.Command.Post(
+				_bus, ProjectionMode.Continuous, _projectionName,
+				ProjectionManagementMessage.RunAs.System, "JS", @"fromAll(); on_any(function(){});log(1);",
+				enabled: false, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true));
+		// when
+		_newProjectionSource = @"fromAll(); on_any(function(){});log(2);";
+		yield return
+			(new ProjectionManagementMessage.Command.UpdateQuery(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.System,
+				_newProjectionSource, emitEnabled: null));
+	}
+
+	[Test, Category("v8")]
+	public void the_projection_source_can_be_retrieved() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetQuery(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
+		var projectionQuery =
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
+		Assert.AreEqual(_projectionName, projectionQuery.Name);
+		Assert.AreEqual(_newProjectionSource, projectionQuery.Query);
+	}
+
+	[Test, Category("v8")]
+	public void the_projection_status_is_still_stopped() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetStatistics(_bus, null, _projectionName,
+				false));
+
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Length);
+		Assert.AreEqual(
+			_projectionName,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+				.Single()
+				.Projections.Single()
+				.Name);
+		Assert.AreEqual(
+			ManagedProjectionState.Stopped,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+				.Single()
+				.Projections.Single()
+				.LeaderStatus);
+	}
+
+	[Test, Category("v8")]
+	public void the_projection_state_can_be_retrieved() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, ""));
+		_queue.Process();
+
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
+		Assert.AreEqual(
+			_projectionName,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().Name);
+		Assert.AreEqual(
+			"", _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().State);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_updating_a_faulted_projection_query_text_invalid_defintion.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_updating_a_faulted_projection_query_text_invalid_defintion.cs
new file mode 100644
index 00000000000..e40a3f314e0
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_updating_a_faulted_projection_query_text_invalid_defintion.cs
@@ -0,0 +1,96 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_updating_a_faulted_projection_query_text_invalid_defintion<TLogFormat, TStreamId> :
+	TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	protected override void Given() {
+		NoStream("$projections-test-projection");
+		NoStream("$projections-test-projection-result");
+		NoStream("$projections-test-projection-order");
+		AllWritesToSucceed("$projections-test-projection-order");
+		NoStream("$projections-test-projection-checkpoint");
+		AllWritesSucceed();
+	}
+
+	private string _projectionName;
+	private string _newProjectionSource;
+
+	protected override IEnumerable<WhenStep> When() {
+		_projectionName = "test-projection";
+		yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+		yield return
+			(new ProjectionManagementMessage.Command.Post(
+				_bus, ProjectionMode.Continuous, _projectionName,
+				ProjectionManagementMessage.RunAs.System, "JS", @"fromAll(); on_any(function(){});log(1****);",
+				enabled: false, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true));
+		// when
+		_newProjectionSource = @"fromAll(); on_any(function(){});log(2);";
+		yield return
+			(new ProjectionManagementMessage.Command.UpdateQuery(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.System,
+				_newProjectionSource, emitEnabled: null));
+	}
+
+	[Test, Category("v8")]
+	public void the_projection_source_can_be_retrieved() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetQuery(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
+		var projectionQuery =
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
+		Assert.AreEqual(_projectionName, projectionQuery.Name);
+		Assert.AreEqual(_newProjectionSource, projectionQuery.Query);
+	}
+
+	[Test, Category("v8")]
+	public void the_projection_status_is_stopped() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetStatistics(_bus, null, _projectionName,
+				false));
+
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Length);
+		Assert.AreEqual(
+			_projectionName,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+				.Single()
+				.Projections.Single()
+				.Name);
+		Assert.AreEqual(
+			ManagedProjectionState.Stopped,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>()
+				.Single()
+				.Projections.Single()
+				.LeaderStatus);
+	}
+
+	[Test, Category("v8")]
+	public void the_projection_state_can_be_retrieved() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, ""));
+		_queue.Process();
+
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
+		Assert.AreEqual(
+			_projectionName,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().Name);
+		Assert.AreEqual(
+			"", _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().State);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_updating_a_persistent_projection_emit_enabled_option.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_updating_a_persistent_projection_emit_enabled_option.cs
new file mode 100644
index 00000000000..479419731bb
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_updating_a_persistent_projection_emit_enabled_option.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_updating_a_persistent_projection_emit_enabled_option<TLogFormat, TStreamId> :
+	TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	protected override void Given() {
+		NoStream("$projections-test-projection");
+		NoStream("$projections-test-projection-result");
+		NoStream("$projections-test-projection-order");
+		AllWritesToSucceed("$projections-test-projection-order");
+		NoStream("$projections-test-projection-checkpoint");
+		AllWritesSucceed();
+	}
+
+	private string _projectionName;
+	private string _source;
+
+	protected override IEnumerable<WhenStep> When() {
+		_projectionName = "test-projection";
+		_source = @"fromAll(); on_any(function(){});log(1);";
+		yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+		yield return
+			(new ProjectionManagementMessage.Command.Post(
+				_bus, ProjectionMode.Continuous, _projectionName,
+				ProjectionManagementMessage.RunAs.System, "JS", _source, enabled: true, checkpointsEnabled: true,
+				emitEnabled: true, trackEmittedStreams: true));
+		// when
+		yield return
+			(new ProjectionManagementMessage.Command.UpdateQuery(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.System,
+				_source, emitEnabled: false));
+	}
+
+	[Test, Category("v8")]
+	public void emit_enabled_options_remains_unchanged() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetQuery(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
+		var projectionQuery =
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
+		Assert.AreEqual(_projectionName, projectionQuery.Name);
+		Assert.AreEqual(false, projectionQuery.EmitEnabled);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_updating_a_persistent_projection_query_text.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_updating_a_persistent_projection_query_text.cs
new file mode 100644
index 00000000000..6579f216c94
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_updating_a_persistent_projection_query_text.cs
@@ -0,0 +1,111 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_updating_a_persistent_projection_query_text<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	protected override void Given() {
+		NoStream("$projections-test-projection");
+		NoStream("$projections-test-projection-result");
+		NoStream("$projections-test-projection-order");
+		AllWritesToSucceed("$projections-test-projection-order");
+		NoStream("$projections-test-projection-checkpoint");
+		AllWritesSucceed();
+	}
+
+	private string _projectionName;
+	private string _newProjectionSource;
+
+	protected override IEnumerable<WhenStep> When() {
+		_projectionName = "test-projection";
+		yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+		yield return
+			(new ProjectionManagementMessage.Command.Post(
+				_bus, ProjectionMode.Continuous, _projectionName,
+				ProjectionManagementMessage.RunAs.System, "JS",
+				@"fromAll(); on_any(function(){return {};});log(1);",
+				enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true));
+		// when
+		_newProjectionSource = @"fromAll().when({a:function(){return {};}});log(2);";
+		yield return
+			(new ProjectionManagementMessage.Command.UpdateQuery(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.System,
+				_newProjectionSource, emitEnabled: null));
+	}
+
+	[Test, Category("v8")]
+	public void the_projection_source_can_be_retrieved() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetQuery(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
+		var projectionQuery =
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
+		Assert.AreEqual(_projectionName, projectionQuery.Name);
+		Assert.AreEqual(_newProjectionSource, projectionQuery.Query);
+	}
+
+	[Test, Category("v8")]
+	public void emit_enabled_options_remains_unchanged() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetQuery(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
+		var projectionQuery =
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
+		Assert.AreEqual(_projectionName, projectionQuery.Name);
+		Assert.AreEqual(true, projectionQuery.EmitEnabled);
+	}
+
+	[Test, Category("v8")]
+	public void the_projection_status_is_still_running() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetStatistics(_bus, null, _projectionName,
+				false));
+
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Length);
+		Assert.AreEqual(
+			_projectionName,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Single()
+				.Name);
+		Assert.AreEqual(
+			ManagedProjectionState.Running,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Single()
+				.LeaderStatus);
+	}
+
+	[Test, Category("v8")]
+	public void the_projection_state_can_be_retrieved() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, ""));
+		_queue.Process();
+
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
+		Assert.AreEqual(
+			_projectionName,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().Name);
+		Assert.AreEqual( // empty? why?
+			"", _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().State);
+	}
+
+	[Test, Category("v8")]
+	public void correct_query_has_been_prepared() {
+		var lastPrepared = _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Prepared>().LastOrDefault();
+		Assert.IsNotNull(lastPrepared);
+		Assert.IsFalse(lastPrepared.SourceDefinition.AllEvents);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_updating_a_persistent_system_projection_query_text.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_updating_a_persistent_system_projection_query_text.cs
new file mode 100644
index 00000000000..8ed2a99c9b7
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_updating_a_persistent_system_projection_query_text.cs
@@ -0,0 +1,110 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_updating_a_continous_system_projection_query_text<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	protected override void Given() {
+		NoStream("$projections-$by_correlation_id");
+		NoStream("$projections-$by_correlation_id-result");
+		NoStream("$projections-$by_correlation_id-order");
+		AllWritesToSucceed("$projections-$by_correlation_id-order");
+		NoStream("$projections-$by_correlation_id-checkpoint");
+		AllWritesSucceed();
+	}
+
+	private string _projectionName;
+	private string _newProjectionSource;
+
+	protected override IEnumerable<WhenStep> When() {
+		_projectionName = "$by_correlation_id";
+		yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+		yield return
+			(new ProjectionManagementMessage.Command.Post(
+				_bus, ProjectionMode.Continuous, _projectionName,
+				ProjectionManagementMessage.RunAs.System, "native:KurrentDB.Projections.Core.Standard.ByCorrelationId", "{\"correlationIdProperty\":\"$myCorrelationId\"}",
+				enabled: true, checkpointsEnabled: true, emitEnabled: true, trackEmittedStreams: true));
+		// when
+		_newProjectionSource = "{\"correlationIdProperty\":\"$updateCorrelationId\"}";
+		yield return
+			(new ProjectionManagementMessage.Command.UpdateQuery(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.System,
+				_newProjectionSource, emitEnabled: null));
+	}
+
+	[Test, Category("v8")]
+	public void the_projection_source_can_be_retrieved() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetQuery(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
+		var projectionQuery =
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
+		Assert.AreEqual(_projectionName, projectionQuery.Name);
+		Assert.AreEqual(_newProjectionSource, projectionQuery.Query);
+	}
+
+	[Test, Category("v8")]
+	public void emit_enabled_options_remains_unchanged() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetQuery(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
+		var projectionQuery =
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
+		Assert.AreEqual(_projectionName, projectionQuery.Name);
+		Assert.AreEqual(true, projectionQuery.EmitEnabled);
+	}
+
+	[Test, Category("v8")]
+	public void the_projection_status_is_still_running() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetStatistics(_bus, null, _projectionName,
+				false));
+
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Length);
+		Assert.AreEqual(
+			_projectionName,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Single()
+				.Name);
+		Assert.AreEqual(
+			ManagedProjectionState.Running,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Single()
+				.LeaderStatus);
+	}
+
+	[Test, Category("v8")]
+	public void the_projection_state_can_be_retrieved() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, ""));
+		_queue.Process();
+
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
+		Assert.AreEqual(
+			_projectionName,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().Name);
+		Assert.AreEqual( // empty? why?
+			"", _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().State);
+	}
+
+	[Test, Category("v8")]
+	public void correct_query_has_been_prepared() {
+		var lastPrepared = _consumer.HandledMessages.OfType<CoreProjectionStatusMessage.Prepared>().LastOrDefault();
+		Assert.IsNotNull(lastPrepared);
+		Assert.IsTrue(lastPrepared.SourceDefinition.AllEvents);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_updating_an_onetime_projection_query_text.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_updating_an_onetime_projection_query_text.cs
new file mode 100644
index 00000000000..256855837f8
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_updating_an_onetime_projection_query_text.cs
@@ -0,0 +1,86 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_updating_an_onetime_projection_query_text<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	private string _projectionName;
+	private string _newProjectionSource;
+
+	protected override void Given() {
+		NoOtherStreams();
+	}
+
+	[Test, Category("v8")]
+	public void the_projection_source_can_be_retrieved() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetQuery(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
+		var projectionQuery =
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
+		Assert.AreEqual(_projectionName, projectionQuery.Name);
+		Assert.AreEqual(_newProjectionSource, projectionQuery.Query);
+	}
+
+	[Test, Category("v8")]
+	public void the_projection_status_is_still_running() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetStatistics(_bus, null, _projectionName,
+				false));
+
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Length);
+		Assert.AreEqual(
+			_projectionName,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Single()
+				.Name);
+		Assert.AreEqual(
+			ManagedProjectionState.Running,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Single()
+				.LeaderStatus);
+	}
+
+	[Test, Category("v8")]
+	public void the_projection_state_can_be_retrieved() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, ""));
+		_queue.Process();
+
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
+		Assert.AreEqual(
+			_projectionName,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().Name);
+		Assert.AreEqual(
+			"", _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().State);
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		_projectionName = "test-projection";
+		yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+		yield return
+			(new ProjectionManagementMessage.Command.Post(
+				_bus, ProjectionMode.Transient, _projectionName,
+				ProjectionManagementMessage.RunAs.Anonymous, "JS", @"fromAll(); on_any(function(){});log(1);",
+				enabled: true, checkpointsEnabled: false, emitEnabled: false, trackEmittedStreams: true));
+		// when
+		_newProjectionSource = @"fromAll(); on_any(function(){});log(2);";
+		yield return
+			(new ProjectionManagementMessage.Command.UpdateQuery(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous,
+				_newProjectionSource, emitEnabled: null));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_updating_an_onetime_system_projection_query_text.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_updating_an_onetime_system_projection_query_text.cs
new file mode 100644
index 00000000000..974bde84ba9
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_manager/when_updating_an_onetime_system_projection_query_text.cs
@@ -0,0 +1,86 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+public class when_updating_an_onetime_system_projection_query_text<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	private string _projectionName;
+	private string _newProjectionSource;
+
+	protected override void Given() {
+		NoOtherStreams();
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		_projectionName = "$by_correlation_id";
+		yield return (new ProjectionSubsystemMessage.StartComponents(Guid.NewGuid()));
+		yield return
+			(new ProjectionManagementMessage.Command.Post(
+				_bus, ProjectionMode.Transient, _projectionName,
+				ProjectionManagementMessage.RunAs.Anonymous, "native:KurrentDB.Projections.Core.Standard.ByCorrelationId", "{\"correlationIdProperty\":\"$myCorrelationId\"}",
+				enabled: true, checkpointsEnabled: false, emitEnabled: false, trackEmittedStreams: true));
+		// when
+		_newProjectionSource = "{\"correlationIdProperty\":\"$updateCorrelationId\"}";
+		yield return
+			(new ProjectionManagementMessage.Command.UpdateQuery(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous,
+				_newProjectionSource, emitEnabled: null));
+	}
+
+	[Test, Category("v8")]
+	public void the_projection_source_can_be_retrieved() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetQuery(
+				_bus, _projectionName, ProjectionManagementMessage.RunAs.Anonymous));
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Count());
+		var projectionQuery =
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionQuery>().Single();
+		Assert.AreEqual(_projectionName, projectionQuery.Name);
+		Assert.AreEqual(_newProjectionSource, projectionQuery.Query);
+	}
+
+	[Test, Category("v8")]
+	public void the_projection_status_is_still_running() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetStatistics(_bus, null, _projectionName,
+				false));
+
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Count());
+		Assert.AreEqual(
+			1,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Length);
+		Assert.AreEqual(
+			_projectionName,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Single()
+				.Name);
+		Assert.AreEqual(
+			ManagedProjectionState.Running,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Single().Projections.Single()
+				.LeaderStatus);
+	}
+
+	[Test, Category("v8")]
+	public void the_projection_state_can_be_retrieved() {
+		_manager.Handle(
+			new ProjectionManagementMessage.Command.GetState(_bus, _projectionName, ""));
+		_queue.Process();
+
+		Assert.AreEqual(1, _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Count());
+		Assert.AreEqual(
+			_projectionName,
+			_consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().Name);
+		Assert.AreEqual(
+			"", _consumer.HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().Single().State);
+	}
+}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_system/updating_projections/updating_projection_sources.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_system/updating_projections/updating_projection_sources.cs
similarity index 89%
rename from src/EventStore.Projections.Core.Tests/Services/projections_system/updating_projections/updating_projection_sources.cs
rename to src/KurrentDB.Projections.Core.Tests/Services/projections_system/updating_projections/updating_projection_sources.cs
index 370b11106c5..f3597650427 100644
--- a/src/EventStore.Projections.Core.Tests/Services/projections_system/updating_projections/updating_projection_sources.cs
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_system/updating_projections/updating_projection_sources.cs
@@ -1,17 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
-using EventStore.Core.Tests.Helpers;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
 using System.Linq;
-using EventStore.Projections.Core.Services.Processing;
-using NUnit.Framework;
-using EventStore.Common.Utils;
-using EventStore.Core.Tests;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
 using Newtonsoft.Json.Linq;
+using NUnit.Framework;
 
-namespace EventStore.Projections.Core.Tests.Services.projections_system.updating_projections {
+namespace KurrentDB.Projections.Core.Tests.Services.projections_system.updating_projections {
 	namespace updating_projection_sources {
 		public abstract class with_updated_projection<TLogFormat, TStreamId> : with_projection_config<TLogFormat, TStreamId> {
 			private ProjectionManagementMessage.Statistics _allStatistics;
@@ -115,7 +117,7 @@ protected override string GivenUpdatedSource() {
 
 			[Test]
 			public void correct_event_sequence_has_been_processed() {
-				HelperExtensions.AssertJson(new {d = new[] {1, 5, 6}}, _stateData);
+				HelperExtensions.AssertJson(new { d = new[] { 1, 5, 6 } }, _stateData);
 			}
 
 			[Test]
@@ -123,7 +125,7 @@ public void projection_position_is_correct() {
 				var pos = GetTfPos("stream5", 0);
 				Assert.AreEqual(
 					CheckpointTag.FromEventTypeIndexPositions(0, pos,
-						new Dictionary<string, long> {{"type1", 1}, {"type3", 1}}), _state.Position);
+						new Dictionary<string, long> { { "type1", 1 }, { "type3", 1 } }), _state.Position);
 			}
 		}
 
@@ -154,7 +156,7 @@ protected override string GivenUpdatedSource() {
 
 			[Test]
 			public void correct_event_sequence_has_been_processed() {
-				HelperExtensions.AssertJson(new {d = new[] {1, 2, 3, 5, 6, 10}}, _stateData);
+				HelperExtensions.AssertJson(new { d = new[] { 1, 2, 3, 5, 6, 10 } }, _stateData);
 			}
 
 			[Test]
@@ -162,7 +164,7 @@ public void projection_position_is_correct() {
 				var pos = GetTfPos("stream5", 0);
 				Assert.AreEqual(
 					CheckpointTag.FromEventTypeIndexPositions(0, pos,
-						new Dictionary<string, long> {{"type1", 1}, {"type3", 1}}), _state.Position);
+						new Dictionary<string, long> { { "type1", 1 }, { "type3", 1 } }), _state.Position);
 			}
 		}
 
@@ -191,14 +193,14 @@ protected override string GivenUpdatedSource() {
 
 			[Test]
 			public void correct_event_sequence_has_been_processed() {
-				HelperExtensions.AssertJson(new {d = new[] {1, 2, 3, 4, 5, 6}}, _stateData);
+				HelperExtensions.AssertJson(new { d = new[] { 1, 2, 3, 4, 5, 6 } }, _stateData);
 			}
 
 			[Test]
 			public void projection_position_is_correct() {
 				var pos = GetTfPos("stream2", 1);
 				Assert.That(
-					CheckpointTag.FromEventTypeIndexPositions(0, pos, new Dictionary<string, long> {{"type3", 1}}) <=
+					CheckpointTag.FromEventTypeIndexPositions(0, pos, new Dictionary<string, long> { { "type3", 1 } }) <=
 					_state.Position);
 			}
 		}
@@ -229,7 +231,7 @@ protected override string GivenUpdatedSource() {
 
 			[Test]
 			public void correct_event_sequence_has_been_processed() {
-				HelperExtensions.AssertJson(new {d = new[] {1, 2, 3, 5, 6, 7, 8, 9, 10}}, _stateData);
+				HelperExtensions.AssertJson(new { d = new[] { 1, 2, 3, 5, 6, 7, 8, 9, 10 } }, _stateData);
 			}
 
 			[Test]
@@ -265,13 +267,13 @@ protected override string GivenUpdatedSource() {
 
 			[Test, Ignore("No position with stream tag yet")]
 			public void correct_event_sequence_has_been_processed() {
-				HelperExtensions.AssertJson(new {d = new[] {1, 2, 6}}, _stateData);
+				HelperExtensions.AssertJson(new { d = new[] { 1, 2, 6 } }, _stateData);
 			}
 
 			[Test]
 			public void projection_position_is_correct() {
 				Assert.AreEqual(
-					CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"stream1", 1}, {"stream2", 1}}),
+					CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "stream1", 1 }, { "stream2", 1 } }),
 					_state.Position);
 			}
 		}
@@ -301,7 +303,7 @@ protected override string GivenUpdatedSource() {
 
 			[Test]
 			public void correct_event_sequence_has_been_processed() {
-				HelperExtensions.AssertJson(new {d = new[] {1, 2, 3, 6}}, _stateData);
+				HelperExtensions.AssertJson(new { d = new[] { 1, 2, 3, 6 } }, _stateData);
 			}
 
 			[Test]
@@ -335,13 +337,13 @@ protected override string GivenUpdatedSource() {
 
 			[Test, Ignore("No position in multi-stream tag")]
 			public void correct_event_sequence_has_been_processed() {
-				HelperExtensions.AssertJson(new {d = new[] {1, 2, 3, 6, 7, 8}}, _stateData);
+				HelperExtensions.AssertJson(new { d = new[] { 1, 2, 3, 6, 7, 8 } }, _stateData);
 			}
 
 			[Test]
 			public void projection_position_is_correct() {
 				Assert.AreEqual(
-					CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> {{"stream2", 1}, {"stream3", 3}}),
+					CheckpointTag.FromStreamPositions(0, new Dictionary<string, long> { { "stream2", 1 }, { "stream3", 3 } }),
 					_state.Position);
 			}
 		}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_system/when_requesting_state_from_a_faulted_projection.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_system/when_requesting_state_from_a_faulted_projection.cs
new file mode 100644
index 00000000000..96389b23b81
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_system/when_requesting_state_from_a_faulted_projection.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_system;
+
+[TestFixture(typeof(LogFormat.V2), typeof(string))]
+[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+class when_requesting_state_from_a_faulted_projection<TLogFormat, TStreamId> : with_projection_config<TLogFormat, TStreamId> {
+	private TFPos _message1Position;
+
+	protected override void Given() {
+		base.Given();
+		NoOtherStreams();
+		_message1Position = ExistingEvent("stream1", "message1", null, "{}");
+
+		_projectionSource = @"fromAll().when({message1: function(s,e){ throw 1; }});";
+	}
+
+	protected override IEnumerable<WhenStep> When() {
+		yield return
+			new ProjectionManagementMessage.Command.Post(
+				Envelope, ProjectionMode.Continuous, _projectionName, ProjectionManagementMessage.RunAs.System,
+				"js",
+				_projectionSource, enabled: true, checkpointsEnabled: true, emitEnabled: true,
+				trackEmittedStreams: true);
+		yield return Yield;
+		yield return new ProjectionManagementMessage.Command.GetState(Envelope, _projectionName, "");
+	}
+
+	protected override bool GivenStartSystemProjections() {
+		return true;
+	}
+
+	[Test]
+	public void reported_state_is_before_the_fault_position() {
+		var states = HandledMessages.OfType<ProjectionManagementMessage.ProjectionState>().ToArray();
+		Assert.AreEqual(1, states.Length);
+		var state = states[0];
+
+		Assert.That(state.Position.Streams.Count == 1);
+		Assert.That(state.Position.Streams.Keys.First() == "message1");
+		Assert.That(state.Position.Streams["message1"] == -1);
+		Assert.That(
+			state.Position.Position <= _message1Position, "{0} <= {1}", state.Position.Position, _message1Position);
+	}
+}
diff --git a/src/EventStore.Projections.Core.Tests/Services/projections_system/when_starting_up.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_system/when_starting_up.cs
similarity index 88%
rename from src/EventStore.Projections.Core.Tests/Services/projections_system/when_starting_up.cs
rename to src/KurrentDB.Projections.Core.Tests/Services/projections_system/when_starting_up.cs
index 00ce985f534..2ee015f3f05 100644
--- a/src/EventStore.Projections.Core.Tests/Services/projections_system/when_starting_up.cs
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_system/when_starting_up.cs
@@ -1,16 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using NUnit.Framework;
-using EventStore.Core.Messages;
-using System;
 using System.Net;
-using EventStore.Core.Cluster;
-using EventStore.Core.Data;
-using EventStore.Core.Tests;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Tests;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using NUnit.Framework;
 
-namespace EventStore.Projections.Core.Tests.Services.projections_system {
+namespace KurrentDB.Projections.Core.Tests.Services.projections_system {
 	namespace startup {
 		[TestFixture(typeof(LogFormat.V2), typeof(string))]
 		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_system/with_projection_config.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_system/with_projection_config.cs
new file mode 100644
index 00000000000..07270173c37
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_system/with_projection_config.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_system;
+
+public abstract class with_projection_config<TLogFormat, TStreamId> : with_projections_subsystem<TLogFormat, TStreamId> {
+	protected string _projectionName;
+	protected string _projectionSource;
+	protected bool _checkpointsEnabled;
+	protected bool _trackEmittedStreams;
+	protected bool _emitEnabled;
+
+	protected override void Given() {
+		base.Given();
+
+		_projectionName = "test-projection";
+		_projectionSource = @"";
+		_checkpointsEnabled = true;
+		_trackEmittedStreams = true;
+		_emitEnabled = true;
+
+		NoStream(ProjectionNamesBuilder.ProjectionsStreamPrefix + _projectionName + "-checkpoint");
+		NoStream(ProjectionNamesBuilder.ProjectionsStreamPrefix + _projectionName + "-order");
+		NoStream(ProjectionNamesBuilder.ProjectionsStreamPrefix + _projectionName + "-emittedstreams");
+		AllWritesSucceed();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/projections_system/with_projections_subsystem.cs b/src/KurrentDB.Projections.Core.Tests/Services/projections_system/with_projections_subsystem.cs
new file mode 100644
index 00000000000..d8979356dcf
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/projections_system/with_projections_subsystem.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Tests.Services.projections_manager;
+
+namespace KurrentDB.Projections.Core.Tests.Services.projections_system;
+
+public abstract class with_projections_subsystem<TLogFormat, TStreamId> : TestFixtureWithProjectionCoreAndManagementServices<TLogFormat, TStreamId> {
+	protected bool _startSystemProjections;
+	protected Guid _instanceCorrelation = Guid.NewGuid();
+
+	protected override bool GivenInitializeSystemProjections() {
+		return true;
+	}
+
+	protected override void Given1() {
+		base.Given1();
+		_startSystemProjections = GivenStartSystemProjections();
+		AllWritesSucceed();
+		NoOtherStreams();
+		EnableReadAll();
+	}
+
+	protected virtual bool GivenStartSystemProjections() {
+		return false;
+	}
+
+	protected override IEnumerable<WhenStep> PreWhen() {
+		yield return (new ProjectionSubsystemMessage.StartComponents(_instanceCorrelation));
+		yield return Yield;
+		if (_startSystemProjections) {
+			yield return
+				new ProjectionManagementMessage.Command.GetStatistics(Envelope, ProjectionMode.AllNonTransient,
+					null, false)
+				;
+			var statistics = HandledMessages.OfType<ProjectionManagementMessage.Statistics>().Last();
+			foreach (var projection in statistics.Projections) {
+				if (projection.Status != "Running")
+					yield return
+						new ProjectionManagementMessage.Command.Enable(
+							Envelope, projection.Name, ProjectionManagementMessage.RunAs.Anonymous);
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/result_emitter/result_emitter.cs b/src/KurrentDB.Projections.Core.Tests/Services/result_emitter/result_emitter.cs
new file mode 100644
index 00000000000..68803e4f1d7
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/result_emitter/result_emitter.cs
@@ -0,0 +1,176 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.result_emitter;
+
+public static class result_emitter {
+	[TestFixture]
+	public class when_creating {
+		private ProjectionNamesBuilder _namesBuilder;
+
+		[SetUp]
+		public void setup() {
+			_namesBuilder = ProjectionNamesBuilder.CreateForTest("projection");
+		}
+
+		[Test]
+		public void it_can_be_created() {
+			new ResultEventEmitter(_namesBuilder);
+		}
+
+		[Test]
+		public void null_names_builder_throws_argument_null_exception() {
+			Assert.Throws<ArgumentNullException>(() => { new ResultEventEmitter(null); });
+		}
+	}
+
+	[TestFixture]
+	public class when_result_updated {
+		private ProjectionNamesBuilder _namesBuilder;
+		private ResultEventEmitter _re;
+		private string _partition;
+		private string _projection;
+		private CheckpointTag _resultAt;
+		private EmittedEventEnvelope[] _emittedEvents;
+		private string _result;
+
+		[SetUp]
+		public void setup() {
+			Given();
+			When();
+		}
+
+		private void Given() {
+			_projection = "projection";
+			_resultAt = CheckpointTag.FromPosition(0, 100, 50);
+			_partition = "partition";
+			_result = "{\"result\":1}";
+			_namesBuilder = ProjectionNamesBuilder.CreateForTest(_projection);
+			_re = new ResultEventEmitter(_namesBuilder);
+		}
+
+		private void When() {
+			_emittedEvents = _re.ResultUpdated(_partition, _result, _resultAt);
+		}
+
+		[Test]
+		public void emits_result_event() {
+			Assert.NotNull(_emittedEvents);
+			Assert.AreEqual(2, _emittedEvents.Length);
+			var @event = _emittedEvents[0];
+			var link = _emittedEvents[1].Event;
+
+			Assert.AreEqual("Result", @event.Event.EventType);
+			Assert.AreEqual(_result, @event.Event.Data);
+			Assert.AreEqual("$projections-projection-partition-result", @event.Event.StreamId);
+			Assert.AreEqual(_resultAt, @event.Event.CausedByTag);
+			Assert.IsNull(@event.Event.ExpectedTag);
+
+			Assert.AreEqual("$>", link.EventType);
+			((EmittedLinkTo)link).SetTargetEventNumber(1);
+			Assert.AreEqual("1@$projections-projection-partition-result", link.Data);
+			Assert.AreEqual("$projections-projection-result", link.StreamId);
+			Assert.AreEqual(_resultAt, link.CausedByTag);
+			Assert.IsNull(link.ExpectedTag);
+		}
+	}
+
+	[TestFixture]
+	public class when_result_removed {
+		private ProjectionNamesBuilder _namesBuilder;
+		private ResultEventEmitter _re;
+		private string _partition;
+		private string _projection;
+		private CheckpointTag _resultAt;
+		private EmittedEventEnvelope[] _emittedEvents;
+
+		[SetUp]
+		public void setup() {
+			Given();
+			When();
+		}
+
+		private void Given() {
+			_projection = "projection";
+			_resultAt = CheckpointTag.FromPosition(0, 100, 50);
+			_partition = "partition";
+			_namesBuilder = ProjectionNamesBuilder.CreateForTest(_projection);
+			_re = new ResultEventEmitter(_namesBuilder);
+		}
+
+		private void When() {
+			_emittedEvents = _re.ResultUpdated(_partition, null, _resultAt);
+		}
+
+		[Test]
+		public void emits_result_event() {
+			Assert.NotNull(_emittedEvents);
+			Assert.AreEqual(2, _emittedEvents.Length);
+			var @event = _emittedEvents[0];
+			var link = _emittedEvents[1].Event;
+
+			Assert.AreEqual("ResultRemoved", @event.Event.EventType);
+			Assert.IsNull(@event.Event.Data);
+			Assert.AreEqual("$projections-projection-partition-result", @event.Event.StreamId);
+			Assert.AreEqual(_resultAt, @event.Event.CausedByTag);
+			Assert.IsNull(@event.Event.ExpectedTag);
+
+			Assert.AreEqual("$>", link.EventType);
+			((EmittedLinkTo)link).SetTargetEventNumber(1);
+			Assert.AreEqual("1@$projections-projection-partition-result", link.Data);
+			Assert.AreEqual("$projections-projection-result", link.StreamId);
+			Assert.AreEqual(_resultAt, link.CausedByTag);
+			Assert.IsNull(link.ExpectedTag);
+		}
+	}
+
+	[TestFixture]
+	public class when_result_updated_on_root_partition {
+		private ProjectionNamesBuilder _namesBuilder;
+		private ResultEventEmitter _re;
+		private string _partition;
+		private string _projection;
+		private CheckpointTag _resultAt;
+		private EmittedEventEnvelope[] _emittedEvents;
+		private string _result;
+
+		[SetUp]
+		public void setup() {
+			Given();
+			When();
+		}
+
+		private void Given() {
+			_projection = "projection";
+			_resultAt = CheckpointTag.FromPosition(0, 100, 50);
+			_partition = "";
+			_result = "{\"result\":1}";
+			_namesBuilder = ProjectionNamesBuilder.CreateForTest(_projection);
+			_re = new ResultEventEmitter(_namesBuilder);
+		}
+
+		private void When() {
+			_emittedEvents = _re.ResultUpdated(_partition, _result, _resultAt);
+		}
+
+		[Test]
+		public void emits_result_event() {
+			Assert.NotNull(_emittedEvents);
+			Assert.AreEqual(1, _emittedEvents.Length);
+			var @event = _emittedEvents[0].Event;
+
+			Assert.AreEqual("Result", @event.EventType);
+			Assert.AreEqual(_result, @event.Data);
+			Assert.AreEqual("$projections-projection-result", @event.StreamId);
+			Assert.AreEqual(_resultAt, @event.CausedByTag);
+			Assert.IsNull(@event.ExpectedTag);
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/staged_processing_queue.cs b/src/KurrentDB.Projections.Core.Tests/Services/staged_processing_queue.cs
new file mode 100644
index 00000000000..776baea1b59
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/staged_processing_queue.cs
@@ -0,0 +1,437 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services;
+
+public class staged_processing_queue {
+	[TestFixture]
+	public class when_creating {
+		private StagedProcessingQueue _q;
+
+		[SetUp]
+		public void when() {
+			_q = new StagedProcessingQueue(new[] { true });
+		}
+
+		[Test]
+		public void it_can_be_created() {
+			Assert.IsNotNull(_q);
+		}
+
+		[Test]
+		public void task_can_be_enqueued() {
+			_q.Enqueue(new TestTask(1, 1));
+		}
+
+		[Test]
+		public void process_does_not_proces_anything() {
+			var processed = _q.Process();
+			Assert.IsFalse(processed);
+		}
+	}
+
+	[TestFixture]
+	public class when_enqueuing_a_one_step_task {
+		private StagedProcessingQueue _q;
+		private TestTask _t1;
+
+		[SetUp]
+		public void when() {
+			_q = new StagedProcessingQueue(new[] { true });
+			_t1 = new TestTask(1, 1);
+			_q.Enqueue(_t1);
+		}
+
+		[Test]
+		public void process_executes_the_task_at_stage_zero() {
+			_q.Process();
+
+			Assert.That(_t1.StartedOn(0));
+		}
+
+		[Test]
+		public void process_returns_true() {
+			var processed = _q.Process();
+
+			Assert.IsTrue(processed);
+		}
+	}
+
+	[TestFixture]
+	public class when_enqueuing_a_two_step_task_and_the_first_step_completes_immediately {
+		private StagedProcessingQueue _q;
+		private TestTask _t1;
+
+		[SetUp]
+		public void when() {
+			_q = new StagedProcessingQueue(new[] { true, true });
+			_t1 = new TestTask(1, 2, 0);
+			_q.Enqueue(_t1);
+		}
+
+		[Test]
+		public void process_executes_the_task_up_to_stage_one() {
+			_q.Process(max: 2);
+
+			Assert.That(_t1.StartedOn(1));
+		}
+	}
+
+	[TestFixture]
+	public class when_reinitializing {
+		private StagedProcessingQueue _q;
+		private TestTask _t1;
+
+		[SetUp]
+		public void when() {
+			_q = new StagedProcessingQueue(new[] { true, true });
+			_t1 = new TestTask(1, 2, 0);
+			_q.Enqueue(_t1);
+			_q.Initialize();
+		}
+
+		[Test]
+		public void process_does_not_execute_a_task() {
+			_q.Process();
+
+			Assert.That(!_t1.StartedOn(0));
+		}
+
+		[Test]
+		public void queue_length_iz_zero() {
+			Assert.AreEqual(0, _q.Count);
+		}
+
+		[Test]
+		public void task_can_be_enqueued() {
+			_q.Enqueue(new TestTask(1, 1));
+		}
+	}
+
+	[TestFixture]
+	public class when_enqueuing_a_two_step_task_and_both_steps_complete_immediately {
+		private StagedProcessingQueue _q;
+		private TestTask _t1;
+
+		[SetUp]
+		public void when() {
+			_q = new StagedProcessingQueue(new[] { true, true });
+			_t1 = new TestTask(1, 2, 1);
+			_q.Enqueue(_t1);
+		}
+
+		[Test]
+		public void queue_becomes_empty() {
+			_q.Process(max: 2);
+
+			Assert.That(_q.IsEmpty);
+		}
+
+		[Test]
+		public void process_returns_true() {
+			var processed = _q.Process(max: 2);
+
+			Assert.IsTrue(processed);
+		}
+	}
+
+	[TestFixture]
+	public class when_enqueuing_two_related_one_step_tasks {
+		private StagedProcessingQueue _q;
+		private TestTask _t1;
+		private TestTask _t2;
+
+		[SetUp]
+		public void when() {
+			_q = new StagedProcessingQueue(new[] { true, true });
+			_t1 = new TestTask(1, 1);
+			_t2 = new TestTask(1, 1);
+			_q.Enqueue(_t1);
+			_q.Enqueue(_t2);
+		}
+
+		[Test]
+		public void two_process_execute_only_the_first_task() {
+			_q.Process();
+			_q.Process();
+
+			Assert.That(_t1.StartedOn(0));
+			Assert.That(!_t2.StartedOn(0));
+		}
+	}
+
+	[TestFixture]
+	public class when_enqueuing_two_related_one_step_tasks_one_by_one {
+		private StagedProcessingQueue _q;
+		private TestTask _t1;
+		private TestTask _t2;
+
+		[SetUp]
+		public void when() {
+			_q = new StagedProcessingQueue(new[] { true, true });
+			_t1 = new TestTask(1, 1, 1);
+			_t2 = new TestTask(1, 1, 1);
+			_q.Enqueue(_t1);
+			_q.Process();
+			_q.Enqueue(_t2);
+			_q.Process();
+		}
+
+		[Test]
+		public void two_process_execute_only_the_first_task() {
+			Assert.That(_t1.StartedOn(0));
+			Assert.That(_t2.StartedOn(0));
+		}
+	}
+
+	[TestFixture]
+	public class when_enqueuing_two_two_step_tasks_that_relate_on_first_stage {
+		private StagedProcessingQueue _q;
+		private TestTask _t1;
+		private TestTask _t2;
+
+		[SetUp]
+		public void when() {
+			_q = new StagedProcessingQueue(new[] { true, true });
+			_t1 = new TestTask(null, 2, stageCorrelations: new object[] { "a", "a" });
+			_t2 = new TestTask(null, 2, stageCorrelations: new object[] { "a", "a" });
+			_q.Enqueue(_t1);
+			_q.Enqueue(_t2);
+		}
+
+		[Test]
+		public void first_task_starts_on_second_stage_on_first_stage_completion() {
+			_q.Process();
+			_q.Process();
+
+			_t1.Complete();
+
+			_q.Process();
+
+			Assert.That(_t1.StartedOn(1));
+		}
+
+		[Test]
+		public void second_task_does_not_start_on_second_stage_on_first_stage_completion() {
+			_q.Process();
+			_q.Process();
+
+			_t2.Complete();
+
+			_q.Process();
+			_q.Process();
+
+			Assert.That(!_t2.StartedOn(1));
+		}
+
+		[Test]
+		public void second_task_does_not_start_on_both_task_completion_on_the_first_stage() {
+			_q.Process();
+			_q.Process();
+
+			_t1.Complete();
+			_t2.Complete();
+
+			_q.Process();
+			_q.Process();
+
+			Assert.That(!_t2.StartedOn(1));
+		}
+
+		[Test]
+		public void second_task_starts_on_the_first_task_completion_on_the_first_stage() {
+			_q.Process();
+			_q.Process();
+
+			_t1.Complete();
+			_t2.Complete();
+
+			_q.Process();
+			_q.Process();
+
+			_t1.Complete();
+
+			_q.Process();
+
+
+			Assert.That(_t2.StartedOn(1));
+		}
+	}
+
+	[TestFixture]
+	public class when_enqueuing_two_two_step_tasks_and_the_second_completes_first {
+		private StagedProcessingQueue _q;
+		private TestTask _t1;
+		private TestTask _t2;
+
+		[SetUp]
+		public void when() {
+			_q = new StagedProcessingQueue(new[] { true, true });
+			_t1 = new TestTask(1, 2);
+			_t2 = new TestTask(2, 2, 0);
+			_q.Enqueue(_t1);
+			_q.Enqueue(_t2);
+			_q.Process(max: 2);
+			_q.Process(max: 2);
+			_q.Process(max: 2);
+		}
+
+		[Test]
+		public void process_waits_for_the_first_task_to_complete() {
+			Assert.That(_t1.StartedOn(0));
+			Assert.That(_t2.StartedOn(0));
+		}
+
+		[Test]
+		public void first_task_completed_unblocks_both_tasks() {
+			_t1.Complete();
+			_q.Process();
+			_q.Process();
+
+			Assert.That(_t1.StartedOn(1));
+			Assert.That(_t2.StartedOn(1));
+		}
+	}
+
+	[TestFixture]
+	public class when_enqueuing_two_async_async_sync_step_tasks_and_the_second_completes_first {
+		private StagedProcessingQueue _q;
+		private TestTask _t1;
+		private TestTask _t2;
+
+		[SetUp]
+		public void when() {
+			_q = new StagedProcessingQueue(new[] { false, false, true });
+			_t1 = new TestTask(1, 3);
+			_t2 = new TestTask(2, 3, 0);
+			_q.Enqueue(_t1);
+			_q.Enqueue(_t2);
+			_q.Process(max: 3);
+			_q.Process(max: 3);
+			_q.Process(max: 3);
+		}
+
+		[Test]
+		public void start_processing_second_task_on_stage_one() {
+			Assert.That(_t1.StartedOn(0));
+			Assert.That(_t2.StartedOn(1));
+		}
+
+		[Test]
+		public void first_task_completed_unblocks_both_tasks() {
+			_t1.Complete();
+			_q.Process();
+			_q.Process();
+
+			Assert.That(_t1.StartedOn(1));
+			Assert.That(_t2.StartedOn(1));
+		}
+	}
+
+	[TestFixture]
+	public class when_enqueuing_three_async_async_sync_step_tasks_and_they_complete_starting_from_second {
+		private StagedProcessingQueue _q;
+		private TestTask _t1;
+		private TestTask _t2;
+		private TestTask _t3;
+
+		[SetUp]
+		public void when() {
+			_q = new StagedProcessingQueue(new[] { false, false, true });
+			_t1 = new TestTask(1, 3);
+			_t2 = new TestTask(2, 3, 0);
+			_t3 = new TestTask(3, 3, 0);
+			_q.Enqueue(_t1);
+			_q.Enqueue(_t2);
+			_q.Enqueue(_t3);
+			_q.Process(max: 3);
+			_q.Process(max: 3);
+			_q.Process(max: 3);
+		}
+
+		[Test]
+		public void start_processing_second_and_third_tasks_on_stage_one() {
+			Assert.That(_t1.StartedOn(0));
+			Assert.That(_t2.StartedOn(1));
+			Assert.That(_t3.StartedOn(1));
+		}
+
+		[Test]
+		public void first_task_keeps_other_blocked_at_stage_two() {
+			_t1.Complete();
+			_q.Process(max: 2);
+			_q.Process(max: 2);
+			_t2.Complete();
+			_t3.Complete();
+			_q.Process();
+			Assert.That(!_t2.StartedOn(2));
+			Assert.That(!_t3.StartedOn(2));
+		}
+
+		[Test]
+		public void first_task_completed_at_stage_one_unblock_all() {
+			_t1.Complete();
+			_q.Process();
+			_q.Process();
+			_t2.Complete();
+			_t3.Complete();
+			_q.Process();
+			_t1.Complete();
+			_q.Process();
+			_q.Process();
+			_q.Process();
+
+			Assert.That(_t2.StartedOn(2));
+			Assert.That(_t3.StartedOn(2));
+		}
+	}
+
+	[TestFixture]
+	public class when_enqueuing_two_one_step_tasks {
+		private StagedProcessingQueue _q;
+		private TestTask _t1;
+		private TestTask _t2;
+
+		[SetUp]
+		public void when() {
+			_q = new StagedProcessingQueue(new[] { true, true });
+			_t1 = new TestTask(1, 1);
+			_t2 = new TestTask(2, 1);
+			_q.Enqueue(_t1);
+			_q.Enqueue(_t2);
+		}
+
+		[Test]
+		public void two_process_execute_both_tasks_at_stage_zero() {
+			_q.Process();
+			_q.Process();
+
+			Assert.That(_t1.StartedOn(0));
+			Assert.That(_t2.StartedOn(0));
+		}
+	}
+
+
+	[TestFixture]
+	public class when_changing_correlation_id_on_unordered_stage {
+		private StagedProcessingQueue _q;
+		private TestTask _t1;
+
+		[SetUp]
+		public void when() {
+			_q = new StagedProcessingQueue(new[] { false });
+			_t1 = new TestTask(Guid.NewGuid(), 1, stageCorrelations: new object[] { "a" });
+			_q.Enqueue(_t1);
+		}
+
+		[Test]
+		public void first_task_starts_on_second_stage_on_first_stage_completion() {
+			_q.Process();
+			Assert.Throws<InvalidOperationException>(() => { _t1.Complete(); });
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Services/write_query_result_phase/creating.cs b/src/KurrentDB.Projections.Core.Tests/Services/write_query_result_phase/creating.cs
new file mode 100644
index 00000000000..3caae0d443e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Services/write_query_result_phase/creating.cs
@@ -0,0 +1,156 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Tests;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using KurrentDB.Projections.Core.Services.Processing.Phases;
+using KurrentDB.Projections.Core.Tests.Services.core_projection.checkpoint_manager;
+using KurrentDB.Projections.Core.Tests.Services.core_projection.multi_phase;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Services.write_query_result_phase {
+	namespace creating {
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		class when_creating<TLogFormat, TStreamId> {
+			[Test]
+			public void it_can_be_created() {
+				var coreProjection = new FakeCoreProjection();
+				var stateCache = new PartitionStateCache();
+				var bus = new SynchronousScheduler();
+				var fakeCheckpointManager =
+					new specification_with_multi_phase_core_projection<TLogFormat, TStreamId>.FakeCheckpointManager(bus, Guid.NewGuid());
+				var fakeEmittedStreamsTracker =
+					new specification_with_multi_phase_core_projection<TLogFormat, TStreamId>.FakeEmittedStreamsTracker();
+				TestHelper.Consume(
+					new WriteQueryResultProjectionProcessingPhase(
+						bus,
+						1,
+						"result-stream",
+						coreProjection,
+						stateCache,
+						fakeCheckpointManager,
+						fakeCheckpointManager,
+						fakeEmittedStreamsTracker));
+			}
+		}
+
+		abstract class specification_with_write_query_result_projection_processing_phase<TLogFormat, TStreamId> {
+			protected WriteQueryResultProjectionProcessingPhase _phase;
+			protected specification_with_multi_phase_core_projection<TLogFormat, TStreamId>.FakeCheckpointManager _checkpointManager;
+			protected specification_with_multi_phase_core_projection<TLogFormat, TStreamId>.FakeEmittedStreamsTracker _emittedStreamsTracker;
+			protected SynchronousScheduler _publisher;
+			protected PartitionStateCache _stateCache;
+			protected string _resultStreamName;
+			protected FakeCoreProjection _coreProjection;
+
+			[SetUp]
+			public void SetUp() {
+				_stateCache = GivenStateCache();
+				_publisher = new();
+				_coreProjection = new FakeCoreProjection();
+				_checkpointManager = new specification_with_multi_phase_core_projection<TLogFormat, TStreamId>.FakeCheckpointManager(
+					_publisher, Guid.NewGuid());
+				_emittedStreamsTracker = new specification_with_multi_phase_core_projection<TLogFormat, TStreamId>.FakeEmittedStreamsTracker();
+				_resultStreamName = "result-stream";
+				_phase = new WriteQueryResultProjectionProcessingPhase(
+					_publisher,
+					1,
+					_resultStreamName,
+					_coreProjection,
+					_stateCache,
+					_checkpointManager,
+					_checkpointManager,
+					_emittedStreamsTracker);
+				When();
+			}
+
+			protected virtual PartitionStateCache GivenStateCache() {
+				var stateCache = new PartitionStateCache();
+
+				stateCache.CachePartitionState(
+					"a", new PartitionState("{}", null, CheckpointTag.FromPhase(0, completed: false)));
+				stateCache.CachePartitionState(
+					"b", new PartitionState("{}", null, CheckpointTag.FromPhase(0, completed: false)));
+				stateCache.CachePartitionState(
+					"c", new PartitionState("{}", null, CheckpointTag.FromPhase(0, completed: false)));
+				return stateCache;
+			}
+
+			protected abstract void When();
+
+			[TearDown]
+			public void TearDown() {
+				_phase = null;
+			}
+		}
+
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		class when_created<TLogFormat, TStreamId> : specification_with_write_query_result_projection_processing_phase<TLogFormat, TStreamId> {
+			protected override void When() {
+			}
+
+			[Test]
+			public void can_be_initialized_from_phase_checkpoint() {
+				_phase.InitializeFromCheckpoint(CheckpointTag.FromPhase(1, completed: false));
+			}
+
+			[Test]
+			public void process_event_throws_invalid_operation_exception() {
+				Assert.Throws<InvalidOperationException>(() => { _phase.ProcessEvent(); });
+			}
+		}
+
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		class when_subscribing<TLogFormat, TStreamId> : specification_with_write_query_result_projection_processing_phase<TLogFormat, TStreamId> {
+			protected override void When() {
+				_phase.Subscribe(CheckpointTag.FromPhase(1, completed: false), false);
+			}
+
+			[Test]
+			public void notifies_core_projection_with_subscribed() {
+				Assert.AreEqual(1, _coreProjection.SubscribedInvoked);
+			}
+		}
+
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		class when_processing_event<TLogFormat, TStreamId> : specification_with_write_query_result_projection_processing_phase<TLogFormat, TStreamId> {
+			protected override void When() {
+				_phase.Subscribe(CheckpointTag.FromPhase(1, completed: false), false);
+				_phase.SetProjectionState(PhaseState.Running);
+				_phase.ProcessEvent();
+			}
+
+			[Test]
+			public void writes_query_results() {
+				Assert.AreEqual(3, _checkpointManager.EmittedEvents.Count(v => v.Event.EventType == "Result"));
+			}
+		}
+
+		[TestFixture(typeof(LogFormat.V2), typeof(string))]
+		[TestFixture(typeof(LogFormat.V3), typeof(uint))]
+		class
+			when_completed_query_processing_event<TLogFormat, TStreamId> : specification_with_write_query_result_projection_processing_phase<TLogFormat, TStreamId> {
+			protected override void When() {
+				_phase.Subscribe(CheckpointTag.FromPhase(1, completed: false), false);
+				_phase.SetProjectionState(PhaseState.Running);
+				_phase.ProcessEvent();
+				_phase.SetProjectionState(PhaseState.Stopped);
+				_phase.ProcessEvent();
+			}
+
+			[Test]
+			public void writes_query_results_only_once() {
+				Assert.AreEqual(3, _checkpointManager.EmittedEvents.Count(v => v.Event.EventType == "Result"));
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Subsystem/TestFixtureWithProjectionSubsystem.cs b/src/KurrentDB.Projections.Core.Tests/Subsystem/TestFixtureWithProjectionSubsystem.cs
new file mode 100644
index 00000000000..ab4a1f3f5bb
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Subsystem/TestFixtureWithProjectionSubsystem.cs
@@ -0,0 +1,129 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Options;
+using KurrentDB.Core;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Services.Transport.Http;
+using KurrentDB.Core.Tests.TransactionLog;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Messages;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Subsystem;
+
+public class TestFixtureWithProjectionSubsystem {
+	private StandardComponents _standardComponents;
+
+	protected ProjectionsSubsystem Subsystem;
+	protected const int WaitTimeoutMs = 3000;
+
+	private readonly ManualResetEvent _stopReceived = new ManualResetEvent(false);
+	private ProjectionSubsystemMessage.StopComponents _lastStopMessage;
+
+	private readonly ManualResetEvent _startReceived = new ManualResetEvent(false);
+	private ProjectionSubsystemMessage.StartComponents _lastStartMessage;
+
+	protected Task Started { get; private set; }
+
+	static readonly IConfiguration EmptyConfiguration = new ConfigurationBuilder().AddInMemoryCollection().Build();
+
+	private StandardComponents CreateStandardComponents() {
+		var dbConfig = TFChunkHelper.CreateDbConfig(Path.Combine(Path.GetTempPath(), "ES-Projections"), 0);
+		var mainQueue = new QueuedHandlerThreadPool
+		(new AdHocHandler<Message>(msg => {
+			/* Ignore messages */
+		}), "MainQueue", new QueueStatsManager(), new());
+		var mainBus = new InMemoryBus("mainBus");
+		var threadBasedScheduler = new ThreadBasedScheduler(new QueueStatsManager(), new());
+		var timerService = new TimerService(threadBasedScheduler);
+
+		return new StandardComponents(dbConfig, mainQueue, mainBus,
+			timerService, timeProvider: null, httpForwarder: null, httpServices: new IHttpService[] { },
+			networkSendService: null, queueStatsManager: new QueueStatsManager(),
+			trackers: new(), new());
+	}
+
+	[OneTimeSetUp]
+	public void SetUp() {
+		_standardComponents = CreateStandardComponents();
+
+		var builder = WebApplication.CreateBuilder();
+		builder.Services.AddGrpc();
+		builder.Services.AddSingleton(_standardComponents);
+
+		Subsystem = new ProjectionsSubsystem(
+			new ProjectionSubsystemOptions(1, ProjectionType.All, true, TimeSpan.FromSeconds(3), true, 500, 250, Opts.MaxProjectionStateSizeDefault));
+
+		Subsystem.ConfigureServices(builder.Services, new ConfigurationBuilder().Build());
+		Subsystem.ConfigureApplication(builder.Build().UseRouting(), EmptyConfiguration);
+
+		// Unsubscribe from the actual components so we can test in isolation
+		Subsystem.LeaderInputBus.Unsubscribe<ProjectionSubsystemMessage.ComponentStarted>(Subsystem);
+		Subsystem.LeaderInputBus.Unsubscribe<ProjectionSubsystemMessage.ComponentStopped>(Subsystem);
+
+		Subsystem.LeaderInputBus.Subscribe(new AdHocHandler<Message>(
+			msg => {
+				switch (msg) {
+					case ProjectionSubsystemMessage.StartComponents start: {
+						_lastStartMessage = start;
+						_startReceived.Set();
+						break;
+					}
+					case ProjectionSubsystemMessage.StopComponents stop: {
+						_lastStopMessage = stop;
+						_stopReceived.Set();
+						break;
+					}
+				}
+			}));
+
+		Started = Subsystem.Start();
+
+		Given();
+	}
+
+	[OneTimeTearDown]
+	public void TearDown() {
+		_standardComponents.TimerService.Dispose();
+	}
+
+	protected virtual void Given() {
+	}
+
+	protected ProjectionSubsystemMessage.StartComponents WaitForStartMessage
+		(string timeoutMsg = null, bool failOnTimeout = true) {
+		timeoutMsg ??= "Timed out waiting for Start Components";
+		if (_startReceived.WaitOne(WaitTimeoutMs))
+			return _lastStartMessage;
+		if (failOnTimeout)
+			Assert.Fail(timeoutMsg);
+		return null;
+	}
+
+	protected ProjectionSubsystemMessage.StopComponents WaitForStopMessage(string timeoutMsg = null) {
+		timeoutMsg ??= "Timed out waiting for Stop Components";
+		if (_stopReceived.WaitOne(WaitTimeoutMs)) {
+			return _lastStopMessage;
+		}
+
+		Assert.Fail(timeoutMsg);
+		return null;
+	}
+
+	protected void ResetMessageEvents() {
+		_stopReceived.Reset();
+		_startReceived.Reset();
+		_lastStopMessage = null;
+		_lastStartMessage = null;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Subsystem/when_projection_subsystem_restarting.cs b/src/KurrentDB.Projections.Core.Tests/Subsystem/when_projection_subsystem_restarting.cs
new file mode 100644
index 00000000000..8f1810ce3ab
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Subsystem/when_projection_subsystem_restarting.cs
@@ -0,0 +1,299 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+
+// ReSharper disable InconsistentNaming
+
+namespace KurrentDB.Projections.Core.Tests.Subsystem;
+
+
+[TestFixture]
+public class when_projection_subsystem_restarted
+	: TestFixtureWithProjectionSubsystem {
+	private Guid _instanceCorrelation;
+	private Message _restartResponse;
+
+	protected override void Given() {
+		Subsystem.Handle(new SystemMessage.SystemCoreReady());
+		Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+
+		var startMsg = WaitForStartMessage();
+		ResetMessageEvents();
+		_instanceCorrelation = startMsg.InstanceCorrelationId;
+
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
+			ProjectionManager.ServiceName, _instanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
+			ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
+
+		Subsystem.Handle(new ProjectionSubsystemMessage.RestartSubsystem(
+			new CallbackEnvelope(message => _restartResponse = message)));
+	}
+
+	[Test]
+	public void should_respond_that_subsystem_is_restarting() {
+		Assert.IsInstanceOf<ProjectionSubsystemMessage.SubsystemRestarting>(_restartResponse);
+	}
+
+	[Test]
+	public void should_stop_the_subsystem() {
+		var stopMsg = WaitForStopMessage();
+		Assert.AreEqual(_instanceCorrelation, stopMsg.InstanceCorrelationId);
+	}
+
+	[Test]
+	public void should_start_the_subsystem_when_fully_stopped() {
+		WaitForStopMessage();
+
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
+			ProjectionManager.ServiceName, _instanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
+			ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionManager.ServiceName));
+		Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionCoreService.SubComponentName));
+
+		var restartMsg = WaitForStartMessage("Timed out waiting for restart StartComponents");
+
+		Assert.AreNotEqual(_instanceCorrelation, restartMsg.InstanceCorrelationId);
+	}
+}
+
+[TestFixture, Explicit]
+public class when_projection_subsystem_restarted_twice
+	: TestFixtureWithProjectionSubsystem {
+	private Guid _instanceCorrelation;
+	private Guid _restartInstanceCorrelation;
+
+	private Message _secondRestartResponse;
+
+	protected override void Given() {
+		// Start subsystem
+		Subsystem.Handle(new SystemMessage.SystemCoreReady());
+		Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+
+		var startMsg = WaitForStartMessage();
+		ResetMessageEvents();
+		_instanceCorrelation = startMsg.InstanceCorrelationId;
+
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
+			ProjectionManager.ServiceName, _instanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
+			ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
+
+		// Restart subsystem
+		Subsystem.Handle(new ProjectionSubsystemMessage.RestartSubsystem(new NoopEnvelope()));
+
+		WaitForStopMessage("Timed out waiting for StopComponents on first restart");
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
+			ProjectionManager.ServiceName, _instanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
+			ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionManager.ServiceName));
+		Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionCoreService.SubComponentName));
+
+		var restartMsg = WaitForStartMessage("Timed out waiting for StartComponents on first restart");
+		ResetMessageEvents();
+		_restartInstanceCorrelation = restartMsg.InstanceCorrelationId;
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
+			ProjectionManager.ServiceName, _restartInstanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
+			ProjectionCoreCoordinator.ComponentName, _restartInstanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionManager.ServiceName));
+		Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionCoreService.SubComponentName));
+
+		Subsystem.Handle(new ProjectionSubsystemMessage.RestartSubsystem(
+			new CallbackEnvelope(message => _secondRestartResponse = message)));
+	}
+
+	[Test]
+	public void should_respond_success_on_second_restart() {
+		Assert.IsInstanceOf<ProjectionSubsystemMessage.SubsystemRestarting>(_secondRestartResponse);
+	}
+
+	[Test]
+	public void should_stop_the_subsystem() {
+		var stopMsg = WaitForStopMessage("Timed out waiting for StopComponents on second restart");
+		Assert.AreEqual(_restartInstanceCorrelation, stopMsg.InstanceCorrelationId);
+	}
+
+	[Test]
+	public void should_start_the_subsystem() {
+		WaitForStopMessage("Timed out waiting for StopComponents on second restart");
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
+			ProjectionManager.ServiceName, _restartInstanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
+			ProjectionCoreCoordinator.ComponentName, _restartInstanceCorrelation));
+
+		var restartMsg = WaitForStartMessage("Timed out waiting for StartComponents on second restart");
+		Assert.AreNotEqual(_restartInstanceCorrelation, restartMsg.InstanceCorrelationId);
+	}
+}
+
+[TestFixture]
+public class when_projection_subsystem_restarting_and_node_becomes_unknown
+	: TestFixtureWithProjectionSubsystem {
+	private Guid _instanceCorrelation;
+	private ProjectionSubsystemMessage.StopComponents _stopMsg;
+
+	protected override void Given() {
+		Subsystem.Handle(new SystemMessage.SystemCoreReady());
+		Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+
+		var startMsg = WaitForStartMessage();
+		ResetMessageEvents();
+		_instanceCorrelation = startMsg.InstanceCorrelationId;
+
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
+			ProjectionManager.ServiceName, _instanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
+			ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
+
+		Subsystem.Handle(new ProjectionSubsystemMessage.RestartSubsystem(new NoopEnvelope()));
+
+		_stopMsg = WaitForStopMessage();
+
+		// Become unknown before components stopped
+		Subsystem.Handle(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
+
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
+			ProjectionManager.ServiceName, _instanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
+			ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionManager.ServiceName));
+		Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionCoreService.SubComponentName));
+	}
+
+	[Test]
+	public void should_stop_the_subsystem_for_the_restart() {
+		Assert.AreEqual(_instanceCorrelation, _stopMsg.InstanceCorrelationId);
+	}
+
+	[Test]
+	public void should_not_start_the_subsystem() {
+		var startMsg = WaitForStartMessage(failOnTimeout: false);
+		Assert.IsNull(startMsg);
+	}
+}
+
+[TestFixture]
+public class when_projection_subsystem_starting_and_told_to_restart
+	: TestFixtureWithProjectionSubsystem {
+	private Message _restartResponse;
+
+	protected override void Given() {
+		Subsystem.Handle(new SystemMessage.SystemCoreReady());
+		Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+
+		WaitForStartMessage();
+
+		// Restart subsystem before fully started
+		Subsystem.Handle(new ProjectionSubsystemMessage.RestartSubsystem(
+			new CallbackEnvelope(message => _restartResponse = message)));
+	}
+
+	[Test]
+	public void should_report_restart_failure() {
+		Assert.IsInstanceOf<ProjectionSubsystemMessage.InvalidSubsystemRestart>(_restartResponse);
+	}
+}
+
+[TestFixture]
+public class when_projection_subsystem_stopping_and_told_to_restart
+	: TestFixtureWithProjectionSubsystem {
+	private Guid _instanceCorrelation;
+	private Message _restartResponse;
+
+	protected override void Given() {
+		Subsystem.Handle(new SystemMessage.SystemCoreReady());
+		Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+
+		var startMsg = WaitForStartMessage();
+		ResetMessageEvents();
+		_instanceCorrelation = startMsg.InstanceCorrelationId;
+
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
+			ProjectionManager.ServiceName, _instanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
+			ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionManager.ServiceName));
+		Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionCoreService.SubComponentName));
+
+		Subsystem.Handle(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
+
+		WaitForStopMessage();
+
+		// Restart subsystem before fully stopped
+		Subsystem.Handle(new ProjectionSubsystemMessage.RestartSubsystem(
+			new CallbackEnvelope(message => _restartResponse = message)));
+	}
+
+	[Test]
+	public void should_report_restart_failure() {
+		Assert.IsInstanceOf<ProjectionSubsystemMessage.InvalidSubsystemRestart>(_restartResponse);
+	}
+}
+
+[TestFixture]
+public class when_projection_subsystem_restarting_and_told_to_restart
+	: TestFixtureWithProjectionSubsystem {
+	private Guid _instanceCorrelation;
+	private Message _restartResponse;
+
+	protected override void Given() {
+		Subsystem.Handle(new SystemMessage.SystemCoreReady());
+		Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+
+		var startMsg = WaitForStartMessage();
+		_instanceCorrelation = startMsg.InstanceCorrelationId;
+
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
+			ProjectionManager.ServiceName, _instanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
+			ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionManager.ServiceName));
+		Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionCoreService.SubComponentName));
+
+		// First restart
+		Subsystem.Handle(new ProjectionSubsystemMessage.RestartSubsystem(new NoopEnvelope()));
+
+		WaitForStopMessage();
+
+		// Restart subsystem before finished restart
+		Subsystem.Handle(new ProjectionSubsystemMessage.RestartSubsystem(
+			new CallbackEnvelope(message => _restartResponse = message)));
+	}
+
+	[Test]
+	public void should_report_restart_failure() {
+		Assert.IsInstanceOf<ProjectionSubsystemMessage.InvalidSubsystemRestart>(_restartResponse);
+	}
+}
+
+[TestFixture]
+public class when_projection_subsystem_stopped_and_told_to_restart
+	: TestFixtureWithProjectionSubsystem {
+	private Message _restartResponse;
+
+	protected override void Given() {
+		Subsystem.Handle(new SystemMessage.SystemCoreReady());
+		// Don't start the subsystem
+		Subsystem.Handle(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
+
+		// Restart subsystem while stopped
+		Subsystem.Handle(new ProjectionSubsystemMessage.RestartSubsystem(
+			new CallbackEnvelope(message => _restartResponse = message)));
+	}
+
+	[Test]
+	public void should_report_restart_failure() {
+		Assert.IsInstanceOf<ProjectionSubsystemMessage.InvalidSubsystemRestart>(_restartResponse);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/Subsystem/when_projection_subsystem_starting.cs b/src/KurrentDB.Projections.Core.Tests/Subsystem/when_projection_subsystem_starting.cs
new file mode 100644
index 00000000000..d3bc2b7301c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/Subsystem/when_projection_subsystem_starting.cs
@@ -0,0 +1,196 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests.Subsystem;
+
+[TestFixture]
+public class when_projection_subsystem_starting_and_all_components_started
+	: TestFixtureWithProjectionSubsystem {
+	private readonly ManualResetEventSlim _initializedReceived = new ManualResetEventSlim();
+
+	protected override void Given() {
+		Subsystem.LeaderOutputBus.Subscribe(
+			new AdHocHandler<ProjectionSubsystemMessage.ComponentStarted>(msg => {
+				_initializedReceived.Set();
+			}));
+
+		Subsystem.Handle(new SystemMessage.SystemCoreReady());
+		Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+	}
+
+	[Test]
+	public void should_publish_all_components_started() {
+		if (!_initializedReceived.Wait(WaitTimeoutMs)) {
+			Assert.Fail("Timed out waiting for Subsystem Initialized");
+		}
+	}
+}
+
+[TestFixture]
+public class when_projection_subsystem_starting_and_wrong_components_started
+	: TestFixtureWithProjectionSubsystem {
+	private readonly ManualResetEventSlim _initializedReceived = new ManualResetEventSlim();
+
+	protected override void Given() {
+		Subsystem.Handle(new SystemMessage.SystemCoreReady());
+		Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+
+		WaitForStartMessage();
+
+		var wrongCorrelation = Guid.NewGuid();
+
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
+			ProjectionManager.ServiceName, wrongCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
+			ProjectionCoreCoordinator.ComponentName, wrongCorrelation));
+	}
+
+	[Test]
+	public void should_ignore_component_started_for_incorrect_correlation() {
+		Assert.False(Started.Wait(WaitTimeoutMs));
+	}
+}
+
+[TestFixture]
+public class when_projection_subsystem_started_and_leader_changes
+	: TestFixtureWithProjectionSubsystem {
+	private Guid _instanceCorrelation;
+
+	protected override void Given() {
+		Subsystem.Handle(new SystemMessage.SystemCoreReady());
+		Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+
+		var startMsg = WaitForStartMessage();
+		_instanceCorrelation = startMsg.InstanceCorrelationId;
+
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
+			ProjectionManager.ServiceName, _instanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
+			ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
+
+		Subsystem.Handle(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
+	}
+
+	[Test]
+	public void should_stop_the_subsystem_with_start_correlation() {
+		var stopMessage = WaitForStopMessage();
+		Assert.NotNull(stopMessage);
+		Assert.AreEqual(_instanceCorrelation, stopMessage.InstanceCorrelationId);
+	}
+}
+
+[TestFixture]
+public class when_projection_subsystem_stopping_and_all_components_stopped
+	: TestFixtureWithProjectionSubsystem {
+	private Guid _instanceCorrelation;
+
+	protected override void Given() {
+		Subsystem.Handle(new SystemMessage.SystemCoreReady());
+		Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+
+		var startMessage = WaitForStartMessage();
+		ResetMessageEvents();
+		_instanceCorrelation = startMessage.InstanceCorrelationId;
+
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
+			ProjectionManager.ServiceName, _instanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
+			ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
+
+		Subsystem.Handle(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
+
+		WaitForStopMessage();
+
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
+			ProjectionManager.ServiceName, _instanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
+			ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionManager.ServiceName));
+		Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionCoreService.SubComponentName));
+	}
+
+	[Test]
+	public void should_allow_starting_the_subsystem_again() {
+		Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+		var startMessage = WaitForStartMessage();
+
+		Assert.AreNotEqual(_instanceCorrelation, startMessage.InstanceCorrelationId);
+	}
+}
+
+[TestFixture]
+public class when_projection_subsystem_starting_and_node_becomes_unknown
+	: TestFixtureWithProjectionSubsystem {
+	private Guid _instanceCorrelation;
+
+	protected override void Given() {
+		Subsystem.Handle(new SystemMessage.SystemCoreReady());
+		Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+
+		var startMessage = WaitForStartMessage();
+		_instanceCorrelation = startMessage.InstanceCorrelationId;
+
+		// Become unknown before components started
+		Subsystem.Handle(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
+
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
+			ProjectionManager.ServiceName, _instanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
+			ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
+	}
+
+	[Test]
+	public void should_stop_the_subsystem() {
+		var stopMessage = WaitForStopMessage();
+		Assert.AreEqual(_instanceCorrelation, stopMessage.InstanceCorrelationId);
+	}
+}
+
+[TestFixture]
+public class when_projection_subsystem_stopping_and_node_becomes_leader
+	: TestFixtureWithProjectionSubsystem {
+	private Guid _instanceCorrelation;
+
+	protected override void Given() {
+		Subsystem.Handle(new SystemMessage.SystemCoreReady());
+		Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+
+		var startMessage = WaitForStartMessage();
+		ResetMessageEvents();
+		_instanceCorrelation = startMessage.InstanceCorrelationId;
+
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
+			ProjectionManager.ServiceName, _instanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStarted(
+			ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
+
+		// Become unknown to stop the subsystem
+		Subsystem.Handle(new SystemMessage.BecomeUnknown(Guid.NewGuid()));
+		WaitForStopMessage();
+
+		// Become leader again before subsystem fully stopped
+		Subsystem.Handle(new SystemMessage.BecomeLeader(Guid.NewGuid()));
+
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
+			ProjectionManager.ServiceName, _instanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.ComponentStopped(
+			ProjectionCoreCoordinator.ComponentName, _instanceCorrelation));
+		Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionManager.ServiceName));
+		Subsystem.Handle(new ProjectionSubsystemMessage.IODispatcherDrained(ProjectionCoreService.SubComponentName));
+	}
+
+	[Test]
+	public void should_start_the_subsystem_again() {
+		var startMessages = WaitForStartMessage();
+		Assert.AreNotEqual(_instanceCorrelation, startMessages.InstanceCorrelationId);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/SystemProjections.cs b/src/KurrentDB.Projections.Core.Tests/SystemProjections.cs
new file mode 100644
index 00000000000..c65883e8381
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/SystemProjections.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing;
+
+namespace KurrentDB.Projections.Core.Tests;
+
+internal static class SystemProjections {
+	public static Task Created(ISubscriber bus) {
+		var systemProjectionsReady =
+			typeof(ProjectionNamesBuilder.StandardProjections).GetFields(
+					BindingFlags.Public |
+					BindingFlags.Static |
+					BindingFlags.FlattenHierarchy)
+				.Where(x => x.IsLiteral && !x.IsInitOnly)
+				.Select(x => x.GetRawConstantValue().ToString())
+				.ToDictionary(x => x, _ => new TaskCompletionSource<bool>());
+
+		bus.Subscribe(new AdHocHandler<CoreProjectionStatusMessage.Stopped>(m => {
+			if (!systemProjectionsReady.TryGetValue(m.Name, out var ready))
+				return;
+			ready.TrySetResult(true);
+		}));
+
+		return Task.WhenAll(systemProjectionsReady.Values.Select(x => x.Task));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core.Tests/TestsInitFixture.cs b/src/KurrentDB.Projections.Core.Tests/TestsInitFixture.cs
new file mode 100644
index 00000000000..f6cfd8983a7
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.Tests/TestsInitFixture.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using NUnit.Framework;
+
+namespace KurrentDB.Projections.Core.Tests;
+
+[SetUpFixture]
+public class TestsInitFixture {
+	private readonly KurrentDB.Core.Tests.TestsInitFixture _initFixture =
+		new KurrentDB.Core.Tests.TestsInitFixture();
+
+	[OneTimeSetUp]
+	public void SetUp() {
+		_initFixture.SetUp();
+	}
+
+	[OneTimeTearDown]
+	public void TearDown() {
+		_initFixture.TearDown();
+	}
+}
diff --git a/src/EventStore.Projections.Core.XUnit.Tests/CheckpointManagers/MultiStreamMultiOutputCheckpointManagerTests.cs b/src/KurrentDB.Projections.Core.XUnit.Tests/CheckpointManagers/MultiStreamMultiOutputCheckpointManagerTests.cs
similarity index 89%
rename from src/EventStore.Projections.Core.XUnit.Tests/CheckpointManagers/MultiStreamMultiOutputCheckpointManagerTests.cs
rename to src/KurrentDB.Projections.Core.XUnit.Tests/CheckpointManagers/MultiStreamMultiOutputCheckpointManagerTests.cs
index 07a4d934a92..57020a53249 100644
--- a/src/EventStore.Projections.Core.XUnit.Tests/CheckpointManagers/MultiStreamMultiOutputCheckpointManagerTests.cs
+++ b/src/KurrentDB.Projections.Core.XUnit.Tests/CheckpointManagers/MultiStreamMultiOutputCheckpointManagerTests.cs
@@ -1,22 +1,26 @@
-using EventStore.Core.Helpers;
-using EventStore.Core.Messages;
-using EventStore.Core.Services;
-using EventStore.Core.Services.UserManagement;
-using EventStore.Core.Tests.Fakes;
-using EventStore.Core.Tests.Services.Replication;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Processing;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using EventStore.Projections.Core.XUnit.Tests.TestHelpers;
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Tests.Fakes;
+using KurrentDB.Core.Tests.Services.Replication;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using KurrentDB.Projections.Core.XUnit.Tests.TestHelpers;
 using Xunit;
-using ExistingEvent = EventStore.Projections.Core.XUnit.Tests.TestHelpers.ExistingStreamsHelper.ExistingEvent;
+using ExistingEvent = KurrentDB.Projections.Core.XUnit.Tests.TestHelpers.ExistingStreamsHelper.ExistingEvent;
 
-namespace EventStore.Projections.Core.XUnit.Tests.CheckpointManagers;
+namespace KurrentDB.Projections.Core.XUnit.Tests.CheckpointManagers;
 
 /// More tests for MultiStreamMultiOutputCheckpointManager exist in the NUnit tests,
-/// and derive from <see cref="EventStore.Projections.Core.Tests.Services.core_projection.checkpoint_manager.multi_stream.TestFixtureWithMultiStreamCheckpointManager"/>
+/// and derive from <see cref="Core.Tests.Services.core_projection.checkpoint_manager.multi_stream.TestFixtureWithMultiStreamCheckpointManager"/>
 public class MultiStreamMultiOutputCheckpointManagerTests {
 	private const string ProjectionName = "test-projection";
 	private const string OrderStreamName = $"$projections-{ProjectionName}-order";
@@ -35,7 +39,7 @@ public MultiStreamMultiOutputCheckpointManagerTests() {
 		var envelope = new FakeEnvelope();
 		_ioDispatcher = new IODispatcher(_publisher, envelope);
 		_checkpointWriter = new CoreProjectionCheckpointWriter(
-				namingBuilder.MakeCheckpointStreamName(),_ioDispatcher, projectionVersion, ProjectionName);
+			namingBuilder.MakeCheckpointStreamName(), _ioDispatcher, projectionVersion, ProjectionName);
 		_existingStreams = new ExistingStreamsHelper();
 
 		var projectionConfig = new ProjectionConfig(SystemAccounts.System, 10, 1000, 20, 2,
@@ -45,7 +49,7 @@ public MultiStreamMultiOutputCheckpointManagerTests() {
 		_sut = new MultiStreamMultiOutputCheckpointManager(
 			_publisher, projectionId, projectionVersion, SystemAccounts.System, _ioDispatcher, projectionConfig, ProjectionName,
 			positionTagger, namingBuilder, usePersistentCheckpoints: true, producesRunningResults: true, definesFold: false,
-			_checkpointWriter);
+			_checkpointWriter, Opts.MaxProjectionStateSizeDefault);
 	}
 
 	[Theory]
diff --git a/src/KurrentDB.Projections.Core.XUnit.Tests/KurrentDB.Projections.Core.XUnit.Tests.csproj b/src/KurrentDB.Projections.Core.XUnit.Tests/KurrentDB.Projections.Core.XUnit.Tests.csproj
new file mode 100644
index 00000000000..a2a411e2627
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.XUnit.Tests/KurrentDB.Projections.Core.XUnit.Tests.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\KurrentDB.Core.Tests\KurrentDB.Core.Tests.csproj" />
+      <ProjectReference Include="..\KurrentDB.Projections.Core\KurrentDB.Projections.Core.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="coverlet.collector" Version="6.0.4">
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+      <PackageReference Include="xunit" Version="2.9.3" />
+      <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
+    </ItemGroup>
+
+</Project>
diff --git a/src/EventStore.Projections.Core.XUnit.Tests/Metrics/ProjectionMetricsTests.cs b/src/KurrentDB.Projections.Core.XUnit.Tests/Metrics/ProjectionMetricsTests.cs
similarity index 80%
rename from src/EventStore.Projections.Core.XUnit.Tests/Metrics/ProjectionMetricsTests.cs
rename to src/KurrentDB.Projections.Core.XUnit.Tests/Metrics/ProjectionMetricsTests.cs
index 16d536a8786..d4eadfc0936 100644
--- a/src/EventStore.Projections.Core.XUnit.Tests/Metrics/ProjectionMetricsTests.cs
+++ b/src/KurrentDB.Projections.Core.XUnit.Tests/Metrics/ProjectionMetricsTests.cs
@@ -1,10 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System.Diagnostics.Metrics;
-using EventStore.Projections.Core.Metrics;
-using EventStore.Projections.Core.Services;
-using EventStore.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Metrics;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Management;
 using Xunit;
 
-namespace EventStore.Projections.Core.XUnit.Tests.Metrics;
+namespace KurrentDB.Projections.Core.XUnit.Tests.Metrics;
 
 public class ProjectionMetricsTests {
 	readonly ProjectionTracker _sut = new();
@@ -58,7 +61,8 @@ static Action<Measurement<T>> AssertMeasurement<T>(
 
 		actualMeasurement => {
 			Assert.Equal(expectedValue, actualMeasurement.Value);
-			if (actualMeasurement.Tags == null) return;
+			if (actualMeasurement.Tags == null)
+				return;
 
 			Assert.Equal(
 				tags,
diff --git a/src/KurrentDB.Projections.Core.XUnit.Tests/ProjectionManagement/ProjectionStateHandlerFactoryTests.cs b/src/KurrentDB.Projections.Core.XUnit.Tests/ProjectionManagement/ProjectionStateHandlerFactoryTests.cs
new file mode 100644
index 00000000000..5bf2cec8689
--- /dev/null
+++ b/src/KurrentDB.Projections.Core.XUnit.Tests/ProjectionManagement/ProjectionStateHandlerFactoryTests.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Standard;
+using Xunit;
+
+namespace KurrentDB.Projections.Core.XUnit.Tests.ProjectionManagement;
+
+public class ProjectionStateHandlerFactoryTests {
+	private ProjectionStateHandlerFactory _sut;
+	public ProjectionStateHandlerFactoryTests() {
+		_sut = new ProjectionStateHandlerFactory(TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(1));
+	}
+
+	private static (Type HandlerType, string Source)[] StandardProjections => [
+		new (typeof(IndexStreams), ""),
+		new (typeof(CategorizeStreamByPath), "first\r\n-"),
+		new (typeof(CategorizeEventsByStreamPath), "first\r\n-"),
+		new (typeof(IndexEventsByEventType), ""),
+		new (typeof(ByCorrelationId), "{\"correlationIdProperty\":\"$correlationId\"}")
+	];
+
+	private const string LegacyProjectionNamespace = "EventStore.Projections.Core.Standard";
+	public static TheoryData<string, string, Type> SystemProjectionsData {
+		get {
+			var data = new TheoryData<string, string, Type>();
+			foreach (var projection in StandardProjections) {
+				data.Add($"native:{projection.HandlerType.Namespace}.{projection.HandlerType.Name}", projection.Source, projection.HandlerType);
+				data.Add($"native:{LegacyProjectionNamespace}.{projection.HandlerType.Name}", projection.Source, projection.HandlerType);
+			}
+			return data;
+		}
+	}
+
+	[Theory]
+	[MemberData(nameof(SystemProjectionsData))]
+	public void can_create_system_projections(string factoryType, string source, Type expectedType) {
+		var result = _sut.Create(factoryType, source, true, 1000);
+		Assert.IsType(expectedType, result);
+	}
+}
diff --git a/src/EventStore.Projections.Core.XUnit.Tests/TestHelpers/ExistingStreamsHelper.cs b/src/KurrentDB.Projections.Core.XUnit.Tests/TestHelpers/ExistingStreamsHelper.cs
similarity index 92%
rename from src/EventStore.Projections.Core.XUnit.Tests/TestHelpers/ExistingStreamsHelper.cs
rename to src/KurrentDB.Projections.Core.XUnit.Tests/TestHelpers/ExistingStreamsHelper.cs
index 46ccb854250..803495b1e6f 100644
--- a/src/EventStore.Projections.Core.XUnit.Tests/TestHelpers/ExistingStreamsHelper.cs
+++ b/src/KurrentDB.Projections.Core.XUnit.Tests/TestHelpers/ExistingStreamsHelper.cs
@@ -1,9 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System.Text;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.TransactionLog.LogRecords;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.TransactionLog.LogRecords;
 
-namespace EventStore.Projections.Core.XUnit.Tests.TestHelpers;
+namespace KurrentDB.Projections.Core.XUnit.Tests.TestHelpers;
 
 // TODO: Flesh out this helper as more tests need it
 public class ExistingStreamsHelper {
diff --git a/src/EventStore.Projections.Core.XUnit.Tests/TestHelpers/FakePositionTagger.cs b/src/KurrentDB.Projections.Core.XUnit.Tests/TestHelpers/FakePositionTagger.cs
similarity index 77%
rename from src/EventStore.Projections.Core.XUnit.Tests/TestHelpers/FakePositionTagger.cs
rename to src/KurrentDB.Projections.Core.XUnit.Tests/TestHelpers/FakePositionTagger.cs
index 0a2762c39fc..7b2c7dba05c 100644
--- a/src/EventStore.Projections.Core.XUnit.Tests/TestHelpers/FakePositionTagger.cs
+++ b/src/KurrentDB.Projections.Core.XUnit.Tests/TestHelpers/FakePositionTagger.cs
@@ -1,7 +1,10 @@
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
 
-namespace EventStore.Projections.Core.XUnit.Tests.TestHelpers;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.XUnit.Tests.TestHelpers;
 
 // TODO: Flesh out this helper as more tests need it
 public class FakePositionTagger : PositionTagger {
diff --git a/src/KurrentDB.Projections.Core/Common/AllowedWritesInFlight.cs b/src/KurrentDB.Projections.Core/Common/AllowedWritesInFlight.cs
new file mode 100644
index 00000000000..1ffcc68d8b0
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Common/AllowedWritesInFlight.cs
@@ -0,0 +1,8 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Common;
+
+public static class AllowedWritesInFlight {
+	public const int Unbounded = 0;
+}
diff --git a/src/KurrentDB.Projections.Core/Common/ProjectionConsts.cs b/src/KurrentDB.Projections.Core/Common/ProjectionConsts.cs
new file mode 100644
index 00000000000..c0fc474e9ce
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Common/ProjectionConsts.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Projections.Core.Common;
+
+public static class ProjectionConsts {
+	public const int CheckpointHandledThreshold = 4000;
+	public const int PendingEventsThreshold = 5000;
+	public const int MaxWriteBatchLength = 500;
+	public const int CheckpointUnhandledBytesThreshold = 10 * 1000 * 1000;
+	public const int MaxAllowedWritesInFlight = AllowedWritesInFlight.Unbounded;
+	public static TimeSpan CheckpointAfterMs = TimeSpan.FromSeconds(0);
+}
diff --git a/src/KurrentDB.Projections.Core/EventReaders/Feeds/FeedReader.cs b/src/KurrentDB.Projections.Core/EventReaders/Feeds/FeedReader.cs
new file mode 100644
index 00000000000..ce4a6c1fad8
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/EventReaders/Feeds/FeedReader.cs
@@ -0,0 +1,136 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Messages.EventReaders.Feeds;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+
+namespace KurrentDB.Projections.Core.EventReaders.Feeds;
+
+public class FeedReader : IHandle<EventReaderSubscriptionMessage.CommittedEventReceived>,
+	IHandle<EventReaderSubscriptionMessage.EofReached>,
+	IHandle<EventReaderSubscriptionMessage.PartitionEofReached>,
+	IHandle<EventReaderSubscriptionMessage.CheckpointSuggested>,
+	IHandle<EventReaderSubscriptionMessage.NotAuthorized> {
+	private readonly
+		ReaderSubscriptionDispatcher _subscriptionDispatcher;
+
+	private readonly ClaimsPrincipal _user;
+
+	private readonly QuerySourcesDefinition _querySource;
+	private readonly CheckpointTag _fromPosition;
+	private readonly int _maxEvents;
+	private readonly Guid _requestCorrelationId;
+
+	private readonly List<TaggedResolvedEvent> _batch = new List<TaggedResolvedEvent>();
+	private readonly IEnvelope _replyEnvelope;
+	private readonly ITimeProvider _timeProvider;
+
+	private Guid _subscriptionId;
+	private CheckpointTag _lastReaderPosition;
+
+	public static FeedReader Create(
+		ReaderSubscriptionDispatcher readerSubscriptionDispatcher, FeedReaderMessage.ReadPage message, ITimeProvider timeProvider) {
+		return new FeedReader(
+			readerSubscriptionDispatcher, message.User, message.QuerySource, message.FromPosition, message.MaxEvents,
+			message.CorrelationId, message.Envelope, timeProvider);
+	}
+
+	public FeedReader(
+		ReaderSubscriptionDispatcher subscriptionDispatcher, ClaimsPrincipal user,
+		QuerySourcesDefinition querySource, CheckpointTag fromPosition,
+		int maxEvents, Guid requestCorrelationId, IEnvelope replyEnvelope, ITimeProvider timeProvider) {
+		ArgumentNullException.ThrowIfNull(subscriptionDispatcher);
+		ArgumentNullException.ThrowIfNull(querySource);
+		ArgumentNullException.ThrowIfNull(fromPosition);
+		ArgumentNullException.ThrowIfNull(replyEnvelope);
+		if (maxEvents <= 0)
+			throw new ArgumentException("non-negative expected", nameof(maxEvents));
+
+		_subscriptionDispatcher = subscriptionDispatcher;
+		_user = user;
+		_querySource = querySource;
+		_fromPosition = fromPosition;
+		_maxEvents = maxEvents;
+		_requestCorrelationId = requestCorrelationId;
+		_replyEnvelope = replyEnvelope;
+		_timeProvider = timeProvider;
+	}
+
+	public void Start() {
+		var readerStrategy = ReaderStrategy.Create(
+			_querySource.ToJson(), // tag
+			0,
+			_querySource,
+			_timeProvider,
+			stopOnEof: true,
+			runAs: _user);
+
+		//TODO: make reader mode explicit
+		var readerOptions = new ReaderSubscriptionOptions(
+			1024 * 1024,
+			checkpointAfterMs: 10000,
+			checkpointProcessedEventsThreshold: null,
+			stopOnEof: true,
+			stopAfterNEvents: _maxEvents,
+			// The projection must be stopped for debugging, so will enable content type validation automatically
+			enableContentTypeValidation: true);
+
+		_subscriptionId = Guid.NewGuid();
+		_subscriptionDispatcher.PublishSubscribe(
+			new ReaderSubscriptionManagement.Subscribe(
+				_subscriptionId, _fromPosition, readerStrategy, readerOptions), this, false);
+	}
+
+	public void Handle(EventReaderSubscriptionMessage.CommittedEventReceived message) {
+		_lastReaderPosition = message.CheckpointTag;
+		_batch.Add(new TaggedResolvedEvent(message.Data, message.CheckpointTag));
+	}
+
+	public void Handle(EventReaderSubscriptionMessage.EofReached message) {
+		_lastReaderPosition = message.CheckpointTag;
+		Reply();
+		Unsubscribe();
+	}
+
+	public void Handle(EventReaderSubscriptionMessage.PartitionEofReached message) {
+		_lastReaderPosition = message.CheckpointTag;
+	}
+
+	public void Handle(EventReaderSubscriptionMessage.CheckpointSuggested message) {
+		throw new NotSupportedException();
+	}
+
+	private void Unsubscribe() {
+		_subscriptionDispatcher.Cancel(_subscriptionId);
+	}
+
+	private void Reply() {
+		_replyEnvelope.ReplyWith(
+			new FeedReaderMessage.FeedPage(
+				_requestCorrelationId, FeedReaderMessage.FeedPage.ErrorStatus.Success, _batch.ToArray(),
+				_lastReaderPosition));
+	}
+
+	private void ReplyNotAuthorized() {
+		_replyEnvelope.ReplyWith(
+			new FeedReaderMessage.FeedPage(
+				_requestCorrelationId, FeedReaderMessage.FeedPage.ErrorStatus.NotAuthorized, null,
+				_lastReaderPosition));
+	}
+
+	public void Handle(EventReaderSubscriptionMessage.NotAuthorized message) {
+		ReplyNotAuthorized();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/EventReaders/Feeds/FeedReaderService.cs b/src/KurrentDB.Projections.Core/EventReaders/Feeds/FeedReaderService.cs
new file mode 100644
index 00000000000..44e6a0a5eab
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/EventReaders/Feeds/FeedReaderService.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Projections.Core.Messages.EventReaders.Feeds;
+using KurrentDB.Projections.Core.Services;
+
+namespace KurrentDB.Projections.Core.EventReaders.Feeds;
+
+public class FeedReaderService : IHandle<FeedReaderMessage.ReadPage> {
+	private readonly ReaderSubscriptionDispatcher _subscriptionDispatcher;
+
+	private readonly ITimeProvider _timeProvider;
+
+	public FeedReaderService(ReaderSubscriptionDispatcher subscriptionDispatcher, ITimeProvider timeProvider) {
+		_subscriptionDispatcher = subscriptionDispatcher;
+		_timeProvider = timeProvider;
+	}
+
+	public void Handle(FeedReaderMessage.ReadPage message) {
+		var reader = FeedReader.Create(_subscriptionDispatcher, message, _timeProvider);
+		reader.Start();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/KurrentDB.Projections.Core.csproj b/src/KurrentDB.Projections.Core/KurrentDB.Projections.Core.csproj
new file mode 100644
index 00000000000..2020b375c54
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/KurrentDB.Projections.Core.csproj
@@ -0,0 +1,44 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+	</PropertyGroup>
+	<ItemGroup>
+		<None Remove="Prelude\1Prelude.js" />
+		<None Remove="Prelude\Modules.js" />
+		<None Remove="Prelude\ModulesExecuted.js" />
+		<None Remove="Prelude\Projections.js" />
+	</ItemGroup>
+	<ItemGroup>
+		<Content Include="Prelude\1Prelude.js">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+		<Content Include="Prelude\Modules.js">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+		<Content Include="Prelude\ModulesExecuted.js">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+		<Content Include="Prelude\Projections.js">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Grpc.Tools" Version="2.65.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Jint" Version="4.0.3" />
+		<ProjectReference Include="..\KurrentDB.Common\KurrentDB.Common.csproj" />
+		<ProjectReference Include="..\KurrentDB.Core\KurrentDB.Core.csproj" />
+		<ProjectReference Include="..\KurrentDB.Transport.Http\KurrentDB.Transport.Http.csproj" />
+		<ProjectReference Include="..\KurrentDB.SourceGenerators\KurrentDB.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+	</ItemGroup>
+	<ItemGroup>
+		<Protobuf Include="../Protos/Grpc/projections.proto" GrpcServices="Server" LinkBase="Services/Grpc" Access="Internal">
+			<Link>Services\Grpc\Protos\projections.proto</Link>
+		</Protobuf>
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.Projections.Core/Messages/CoreProjectionCheckpointWriterMessage.cs b/src/KurrentDB.Projections.Core/Messages/CoreProjectionCheckpointWriterMessage.cs
new file mode 100644
index 00000000000..28fc90132f2
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messages/CoreProjectionCheckpointWriterMessage.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Messaging;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.Messages;
+
+public static partial class CoreProjectionCheckpointWriterMessage {
+	[DerivedMessage(ProjectionMessage.CoreProcessing)]
+	public sealed partial class CheckpointWritten : Message {
+		private readonly CheckpointTag _position;
+
+		public CheckpointWritten(CheckpointTag position) {
+			_position = position;
+		}
+
+		public CheckpointTag Position {
+			get { return _position; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreProcessing)]
+	public sealed partial class RestartRequested : Message {
+		public string Reason {
+			get { return _reason; }
+		}
+
+		private readonly string _reason;
+
+		public RestartRequested(string reason) {
+			_reason = reason;
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Messages/CoreProjectionManagementControlMessage.cs b/src/KurrentDB.Projections.Core/Messages/CoreProjectionManagementControlMessage.cs
new file mode 100644
index 00000000000..6d41bbfff3e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messages/CoreProjectionManagementControlMessage.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Projections.Core.Messages;
+
+[DerivedMessage]
+public abstract partial class CoreProjectionManagementControlMessage : CoreProjectionManagementMessageBase {
+	private readonly Guid _workerId;
+
+	public Guid WorkerId {
+		get { return _workerId; }
+	}
+
+	public CoreProjectionManagementControlMessage(Guid projectionId, Guid workerId)
+		: base(projectionId) {
+		_workerId = workerId;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Messages/CoreProjectionManagementMessage.cs b/src/KurrentDB.Projections.Core/Messages/CoreProjectionManagementMessage.cs
new file mode 100644
index 00000000000..942be415e3d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messages/CoreProjectionManagementMessage.cs
@@ -0,0 +1,211 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+
+namespace KurrentDB.Projections.Core.Messages;
+
+public static partial class CoreProjectionManagementMessage {
+	[DerivedMessage(ProjectionMessage.CoreManagement)]
+	public partial class Start : CoreProjectionManagementControlMessage {
+		public Start(Guid projectionId, Guid workerId)
+			: base(projectionId, workerId) {
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreManagement)]
+	public partial class LoadStopped : CoreProjectionManagementControlMessage {
+		public LoadStopped(Guid correlationId, Guid workerId)
+			: base(correlationId, workerId) {
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreManagement)]
+	public partial class Stop : CoreProjectionManagementControlMessage {
+		public Stop(Guid projectionId, Guid workerId)
+			: base(projectionId, workerId) {
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreManagement)]
+	public partial class Kill : CoreProjectionManagementControlMessage {
+		public Kill(Guid projectionId, Guid workerId)
+			: base(projectionId, workerId) {
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreManagement)]
+	public partial class GetState : CoreProjectionManagementControlMessage {
+		private readonly Guid _correlationId;
+		private readonly string _partition;
+
+		public GetState(Guid correlationId, Guid projectionId, string partition, Guid workerId)
+			: base(projectionId, workerId) {
+			if (partition == null)
+				throw new ArgumentNullException("partition");
+			_correlationId = correlationId;
+			_partition = partition;
+		}
+
+		public string Partition {
+			get { return _partition; }
+		}
+
+		public Guid CorrelationId {
+			get { return _correlationId; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreManagement)]
+	public partial class GetResult : CoreProjectionManagementControlMessage {
+		private readonly Guid _correlationId;
+		private readonly string _partition;
+
+		public GetResult(Guid correlationId, Guid projectionId, string partition, Guid workerId)
+			: base(projectionId, workerId) {
+			if (partition == null)
+				throw new ArgumentNullException("partition");
+			_correlationId = correlationId;
+			_partition = partition;
+		}
+
+		public string Partition {
+			get { return _partition; }
+		}
+
+		public Guid CorrelationId {
+			get { return _correlationId; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreManagement)]
+	public partial class CreateAndPrepare : CoreProjectionManagementControlMessage {
+		private readonly ProjectionConfig _config;
+		private readonly string _handlerType;
+		private readonly string _query;
+		private readonly string _name;
+		private readonly ProjectionVersion _version;
+		private readonly bool _enableContentTypeValidation;
+
+		public CreateAndPrepare(
+			Guid projectionId,
+			Guid workerId,
+			string name,
+			ProjectionVersion version,
+			ProjectionConfig config,
+			string handlerType,
+			string query,
+			bool enableContentTypeValidation)
+			: base(projectionId, workerId) {
+			_name = name;
+			_version = version;
+			_config = config;
+			_handlerType = handlerType;
+			_query = query;
+			_enableContentTypeValidation = enableContentTypeValidation;
+		}
+
+		public ProjectionConfig Config {
+			get { return _config; }
+		}
+
+		public string Name {
+			get { return _name; }
+		}
+
+		public ProjectionVersion Version {
+			get { return _version; }
+		}
+
+		public string HandlerType {
+			get { return _handlerType; }
+		}
+
+		public string Query {
+			get { return _query; }
+		}
+
+		public bool EnableContentTypeValidation {
+			get { return _enableContentTypeValidation; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreManagement)]
+	public partial class CreatePrepared : CoreProjectionManagementControlMessage {
+		private readonly ProjectionConfig _config;
+		private readonly QuerySourcesDefinition _sourceDefinition;
+		private readonly string _handlerType;
+		private readonly string _query;
+		private readonly string _name;
+		private readonly ProjectionVersion _version;
+		private readonly bool _enableContentTypeValidation;
+
+		public CreatePrepared(
+			Guid projectionId,
+			Guid workerId,
+			string name,
+			ProjectionVersion version,
+			ProjectionConfig config,
+			QuerySourcesDefinition sourceDefinition,
+			string handlerType,
+			string query,
+			bool enableContentTypeValidation)
+			: base(projectionId, workerId) {
+			if (name == null)
+				throw new ArgumentNullException("name");
+			if (config == null)
+				throw new ArgumentNullException("config");
+			if (sourceDefinition == null)
+				throw new ArgumentNullException("sourceDefinition");
+			if (handlerType == null)
+				throw new ArgumentNullException("handlerType");
+			if (query == null)
+				throw new ArgumentNullException("query");
+			_name = name;
+			_version = version;
+			_config = config;
+			_sourceDefinition = sourceDefinition;
+			_handlerType = handlerType;
+			_query = query;
+			_enableContentTypeValidation = enableContentTypeValidation;
+		}
+
+		public ProjectionConfig Config {
+			get { return _config; }
+		}
+
+		public string Name {
+			get { return _name; }
+		}
+
+		public QuerySourcesDefinition SourceDefinition {
+			get { return _sourceDefinition; }
+		}
+
+		public ProjectionVersion Version {
+			get { return _version; }
+		}
+
+		public string HandlerType {
+			get { return _handlerType; }
+		}
+
+		public string Query {
+			get { return _query; }
+		}
+
+		public bool EnableContentTypeValidation {
+			get { return _enableContentTypeValidation; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreManagement)]
+	public partial class Dispose : CoreProjectionManagementControlMessage {
+		public Dispose(Guid projectionId, Guid workerId)
+			: base(projectionId, workerId) {
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Messages/CoreProjectionManagementMessageBase.cs b/src/KurrentDB.Projections.Core/Messages/CoreProjectionManagementMessageBase.cs
new file mode 100644
index 00000000000..23a3295f044
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messages/CoreProjectionManagementMessageBase.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Projections.Core.Messages;
+
+[DerivedMessage]
+public abstract partial class CoreProjectionManagementMessageBase : Message {
+	private readonly Guid _projectionIdId;
+
+	protected CoreProjectionManagementMessageBase(Guid projectionId) {
+		_projectionIdId = projectionId;
+	}
+
+	public Guid ProjectionId {
+		get { return _projectionIdId; }
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Messages/CoreProjectionProcessingMessage.cs b/src/KurrentDB.Projections.Core/Messages/CoreProjectionProcessingMessage.cs
new file mode 100644
index 00000000000..067e159b0a8
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messages/CoreProjectionProcessingMessage.cs
@@ -0,0 +1,151 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.Messages;
+
+public static partial class CoreProjectionProcessingMessage {
+	[DerivedMessage]
+	public abstract partial class Message : KurrentDB.Core.Messaging.Message {
+		private readonly Guid _projectionId;
+
+		protected Message(Guid projectionId) {
+			_projectionId = projectionId;
+		}
+
+		public Guid ProjectionId {
+			get { return _projectionId; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreProcessing)]
+	public partial class CheckpointLoaded : Message {
+		private readonly CheckpointTag _checkpointTag;
+		private readonly string _checkpointData;
+		private readonly long _checkpointEventNumber;
+
+		public CheckpointLoaded(
+			Guid projectionId, CheckpointTag checkpointTag, string checkpointData, long checkpointEventNumber)
+			: base(projectionId) {
+			_checkpointTag = checkpointTag;
+			_checkpointData = checkpointData;
+			_checkpointEventNumber = checkpointEventNumber;
+		}
+
+		public CheckpointTag CheckpointTag {
+			get { return _checkpointTag; }
+		}
+
+		public string CheckpointData {
+			get { return _checkpointData; }
+		}
+
+		public long CheckpointEventNumber {
+			get { return _checkpointEventNumber; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreProcessing)]
+	public partial class PrerecordedEventsLoaded : Message {
+		private readonly CheckpointTag _checkpointTag;
+
+		public PrerecordedEventsLoaded(Guid projectionId, CheckpointTag checkpointTag)
+			: base(projectionId) {
+			_checkpointTag = checkpointTag;
+		}
+
+		public CheckpointTag CheckpointTag {
+			get { return _checkpointTag; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreProcessing)]
+	public partial class CheckpointCompleted : Message {
+		private readonly CheckpointTag _checkpointTag;
+
+		public CheckpointCompleted(Guid projectionId, CheckpointTag checkpointTag)
+			: base(projectionId) {
+			_checkpointTag = checkpointTag;
+		}
+
+		public CheckpointTag CheckpointTag {
+			get { return _checkpointTag; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreProcessing)]
+	public partial class RestartRequested : Message {
+		private readonly string _reason;
+
+		public RestartRequested(Guid projectionId, string reason)
+			: base(projectionId) {
+			_reason = reason;
+		}
+
+		public string Reason {
+			get { return _reason; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreProcessing)]
+	public partial class Failed : Message {
+		private readonly string _reason;
+
+		public Failed(Guid projectionId, string reason)
+			: base(projectionId) {
+			_reason = reason;
+		}
+
+		public string Reason {
+			get { return _reason; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreProcessing)]
+	public partial class ReadyForCheckpoint : KurrentDB.Core.Messaging.Message {
+		private readonly object _sender;
+
+		public ReadyForCheckpoint(object sender) {
+			_sender = sender;
+		}
+
+		public object Sender {
+			get { return _sender; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreProcessing)]
+	public partial class EmittedStreamAwaiting : KurrentDB.Core.Messaging.Message {
+		private readonly IEnvelope _envelope;
+		private readonly string _streamId;
+
+		public EmittedStreamAwaiting(string streamId, IEnvelope envelope) {
+			_envelope = envelope;
+			_streamId = streamId;
+		}
+
+		public string StreamId {
+			get { return _streamId; }
+		}
+
+		public IEnvelope Envelope {
+			get { return _envelope; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreProcessing)]
+	public partial class EmittedStreamWriteCompleted : KurrentDB.Core.Messaging.Message {
+		private readonly string _streamId;
+
+		public EmittedStreamWriteCompleted(string streamId) {
+			_streamId = streamId;
+		}
+
+		public string StreamId {
+			get { return _streamId; }
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Messages/CoreProjectionStatusMessage.cs b/src/KurrentDB.Projections.Core/Messages/CoreProjectionStatusMessage.cs
new file mode 100644
index 00000000000..8733367f898
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messages/CoreProjectionStatusMessage.cs
@@ -0,0 +1,167 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.Messages;
+
+public static partial class CoreProjectionStatusMessage {
+	[DerivedMessage(ProjectionMessage.CoreStatus)]
+	public partial class CoreProjectionStatusMessageBase : CoreProjectionManagementMessageBase {
+		protected CoreProjectionStatusMessageBase(Guid projectionId)
+			: base(projectionId) {
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreStatus)]
+	public partial class Started : CoreProjectionStatusMessageBase {
+		public string Name { get; }
+		public Started(Guid projectionId, string name)
+			: base(projectionId) {
+			Name = name;
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreStatus)]
+	public partial class Faulted : CoreProjectionStatusMessageBase {
+		private readonly string _faultedReason;
+
+		public Faulted(Guid projectionId, string faultedReason)
+			: base(projectionId) {
+			_faultedReason = faultedReason;
+		}
+
+		public string FaultedReason {
+			get { return _faultedReason; }
+		}
+	}
+
+	[DerivedMessage]
+	public abstract partial class DataReportBase : CoreProjectionStatusMessageBase {
+		private readonly Guid _correlationId;
+		private readonly string _partition;
+		private readonly CheckpointTag _position;
+
+		protected DataReportBase(Guid correlationId, Guid projectionId, string partition, CheckpointTag position)
+			: base(projectionId) {
+			_correlationId = correlationId;
+			_partition = partition;
+			_position = position;
+		}
+
+		public string Partition {
+			get { return _partition; }
+		}
+
+		public Guid CorrelationId {
+			get { return _correlationId; }
+		}
+
+		public CheckpointTag Position {
+			get { return _position; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreStatus)]
+	public partial class StateReport : DataReportBase {
+		private readonly string _state;
+
+		public StateReport(
+			Guid correlationId,
+			Guid projectionId,
+			string partition,
+			string state,
+			CheckpointTag position)
+			: base(correlationId, projectionId, partition, position) {
+			_state = state;
+		}
+
+		public string State {
+			get { return _state; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreStatus)]
+	public partial class ResultReport : DataReportBase {
+		private readonly string _result;
+
+		public ResultReport(
+			Guid correlationId,
+			Guid projectionId,
+			string partition,
+			string result,
+			CheckpointTag position)
+			: base(correlationId, projectionId, partition, position) {
+			_result = result;
+		}
+
+		public string Result {
+			get { return _result; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreStatus)]
+	public partial class StatisticsReport : CoreProjectionStatusMessageBase {
+		private readonly ProjectionStatistics _statistics;
+		private readonly int _sequentialNumber;
+
+		public StatisticsReport(Guid projectionId, ProjectionStatistics statistics, int sequentialNumber)
+			: base(projectionId) {
+			_statistics = statistics;
+			_sequentialNumber = sequentialNumber;
+		}
+
+		public ProjectionStatistics Statistics {
+			get { return _statistics; }
+		}
+
+		public int SequentialNumber {
+			get { return _sequentialNumber; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreStatus)]
+	public partial class Prepared : CoreProjectionStatusMessageBase {
+		private readonly ProjectionSourceDefinition _sourceDefinition;
+
+		public Prepared(Guid projectionId, ProjectionSourceDefinition sourceDefinition)
+			: base(projectionId) {
+			_sourceDefinition = sourceDefinition;
+		}
+
+		public ProjectionSourceDefinition SourceDefinition {
+			get { return _sourceDefinition; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreStatus)]
+	public partial class Suspended : CoreProjectionStatusMessageBase {
+		public Suspended(Guid projectionId)
+			: base(projectionId) {
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.CoreStatus)]
+	public partial class Stopped : CoreProjectionStatusMessageBase {
+		private readonly bool _completed;
+		private readonly string _name;
+
+		public Stopped(Guid projectionId, string name, bool completed)
+			: base(projectionId) {
+			_completed = completed;
+			_name = name;
+		}
+
+		public bool Completed {
+			get { return _completed; }
+		}
+
+		public string Name {
+			get { return _name; }
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Messages/EventReaderSubscriptionMessageBase.cs b/src/KurrentDB.Projections.Core/Messages/EventReaderSubscriptionMessageBase.cs
new file mode 100644
index 00000000000..639e59e011a
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messages/EventReaderSubscriptionMessageBase.cs
@@ -0,0 +1,239 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.Messages;
+
+public static partial class EventReaderSubscriptionMessage {
+	/// <summary>
+	/// A CheckpointSuggested message is sent to core projection
+	/// to allow bookmarking a position that can be used to
+	/// restore the projection processing (typically
+	/// an event at this position does not satisfy projection filter)
+	/// </summary>
+	[DerivedMessage(ProjectionMessage.EventReaderSubscription)]
+	public partial class CheckpointSuggested : EventReaderSubscriptionMessageBase {
+		public CheckpointSuggested(
+			Guid subscriptionId, CheckpointTag checkpointTag, float progress,
+			long subscriptionMessageSequenceNumber, object source = null)
+			: base(subscriptionId, checkpointTag, progress, subscriptionMessageSequenceNumber, source) {
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.EventReaderSubscription)]
+	public partial class ProgressChanged : EventReaderSubscriptionMessageBase {
+		public ProgressChanged(
+			Guid subscriptionId, CheckpointTag checkpointTag, float progress,
+			long subscriptionMessageSequenceNumber, object source = null)
+			: base(subscriptionId, checkpointTag, progress, subscriptionMessageSequenceNumber, source) {
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.EventReaderSubscription)]
+	public partial class SubscriptionStarted : EventReaderSubscriptionMessageBase {
+		private readonly long _startingLastCommitPosition;
+
+		public long StartingLastCommitPosition {
+			get { return _startingLastCommitPosition; }
+		}
+
+		public SubscriptionStarted(
+			Guid subscriptionId, CheckpointTag checkpointTag, long startingLastCommitPosition,
+			long subscriptionMessageSequenceNumber, object source = null)
+			: base(subscriptionId, checkpointTag, 0f, subscriptionMessageSequenceNumber, source) {
+			_startingLastCommitPosition = startingLastCommitPosition;
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.EventReaderSubscription)]
+	public sealed partial class NotAuthorized : EventReaderSubscriptionMessageBase {
+		public NotAuthorized(
+			Guid subscriptionId, CheckpointTag checkpointTag, float progress,
+			long subscriptionMessageSequenceNumber,
+			object source = null)
+			: base(subscriptionId, checkpointTag, progress, subscriptionMessageSequenceNumber, source) {
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.EventReaderSubscription)]
+	public sealed partial class SubscribeTimeout : EventReaderSubscriptionMessageBase {
+		public SubscribeTimeout(Guid subscriptionId)
+			: base(subscriptionId, CheckpointTag.Empty, 100.0f, -1, null) {
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.EventReaderSubscription)]
+	public sealed partial class Failed : EventReaderSubscriptionMessageBase {
+		private readonly string _reason;
+
+		public string Reason {
+			get { return _reason; }
+		}
+
+		public Failed(Guid subscriptionId, string reason)
+			: base(subscriptionId, CheckpointTag.Empty, 100.0f, -1, null) {
+			_reason = reason;
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.EventReaderSubscription)]
+	public partial class EofReached : EventReaderSubscriptionMessageBase {
+		public EofReached(
+			Guid subscriptionId, CheckpointTag checkpointTag,
+			long subscriptionMessageSequenceNumber, object source = null)
+			: base(subscriptionId, checkpointTag, 100.0f, subscriptionMessageSequenceNumber, source) {
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.EventReaderSubscription)]
+	public partial class PartitionEofReached : EventReaderSubscriptionMessageBase {
+		private readonly string _partition;
+
+		public string Partition {
+			get { return _partition; }
+		}
+
+		public PartitionEofReached(
+			Guid subscriptionId, CheckpointTag checkpointTag, string partition,
+			long subscriptionMessageSequenceNumber, object source = null)
+			: base(subscriptionId, checkpointTag, 100.0f, subscriptionMessageSequenceNumber, source) {
+			_partition = partition;
+		}
+	}
+
+	/// <summary>
+	/// NOTEL the PartitionDeleted may appear out-of-order and is not guaranteed
+	/// to appear at the same sequence position in a recovery
+	/// </summary>
+	[DerivedMessage(ProjectionMessage.EventReaderSubscription)]
+	public partial class PartitionDeleted : EventReaderSubscriptionMessageBase {
+		private readonly string _partition;
+
+		public string Partition {
+			get { return _partition; }
+		}
+
+		public PartitionDeleted(
+			Guid subscriptionId, CheckpointTag checkpointTag, string partition,
+			long subscriptionMessageSequenceNumber, object source = null)
+			: base(subscriptionId, checkpointTag, 100.0f, subscriptionMessageSequenceNumber, source) {
+			_partition = partition;
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.EventReaderSubscription)]
+	public partial class CommittedEventReceived : EventReaderSubscriptionMessageBase {
+		public static CommittedEventReceived Sample(
+			ResolvedEvent data, Guid subscriptionId, long subscriptionMessageSequenceNumber) {
+			return new CommittedEventReceived(
+				subscriptionId, 0, null, data, 77.7f, subscriptionMessageSequenceNumber);
+		}
+
+		public static CommittedEventReceived Sample(
+			ResolvedEvent data, CheckpointTag checkpointTag, Guid subscriptionId,
+			long subscriptionMessageSequenceNumber) {
+			return new CommittedEventReceived(
+				subscriptionId, checkpointTag, null, data, 77.7f, subscriptionMessageSequenceNumber, null);
+		}
+
+		private readonly ResolvedEvent _data;
+
+		private readonly string _eventCategory;
+
+		private CommittedEventReceived(
+			Guid subscriptionId, CheckpointTag checkpointTag, string eventCategory, ResolvedEvent data,
+			float progress, long subscriptionMessageSequenceNumber, object source)
+			: base(subscriptionId, checkpointTag, progress, subscriptionMessageSequenceNumber, source) {
+			if (data == null)
+				throw new ArgumentNullException("data");
+			_data = data;
+			_eventCategory = eventCategory;
+		}
+
+		private CommittedEventReceived(
+			Guid subscriptionId, int phase, string eventCategory, ResolvedEvent data, float progress,
+			long subscriptionMessageSequenceNumber)
+			: this(
+				subscriptionId,
+				CheckpointTag.FromPosition(phase, data.Position.CommitPosition, data.Position.PreparePosition),
+				eventCategory, data, progress, subscriptionMessageSequenceNumber, null) {
+		}
+
+		public ResolvedEvent Data {
+			get { return _data; }
+		}
+
+		public string EventCategory {
+			get { return _eventCategory; }
+		}
+
+		public static CommittedEventReceived FromCommittedEventDistributed(
+			ReaderSubscriptionMessage.CommittedEventDistributed message, CheckpointTag checkpointTag,
+			string eventCategory, Guid subscriptionId, long subscriptionMessageSequenceNumber) {
+			return new CommittedEventReceived(
+				subscriptionId, checkpointTag, eventCategory, message.Data, message.Progress,
+				subscriptionMessageSequenceNumber, message.Source);
+		}
+
+		public override string ToString() {
+			return CheckpointTag.ToString();
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.EventReaderSubscription)]
+	public partial class ReaderAssignedReader : EventReaderSubscriptionMessageBase {
+		private readonly Guid _readerId;
+
+		public ReaderAssignedReader(Guid subscriptionId, Guid readerId)
+			: base(subscriptionId, null, 0, 0, null) {
+			_readerId = readerId;
+		}
+
+		public Guid ReaderId {
+			get { return _readerId; }
+		}
+	}
+}
+
+[DerivedMessage]
+public abstract partial class EventReaderSubscriptionMessageBase : Message {
+	private readonly Guid _subscriptionId;
+	private readonly long _subscriptionMessageSequenceNumber;
+	private readonly object _source;
+	private readonly CheckpointTag _checkpointTag;
+	private readonly float _progress;
+
+	internal EventReaderSubscriptionMessageBase(Guid subscriptionId, CheckpointTag checkpointTag, float progress,
+		long subscriptionMessageSequenceNumber, object source) {
+		_subscriptionId = subscriptionId;
+		_checkpointTag = checkpointTag;
+		_progress = progress;
+		_subscriptionMessageSequenceNumber = subscriptionMessageSequenceNumber;
+		_source = source;
+	}
+
+
+	public CheckpointTag CheckpointTag {
+		get { return _checkpointTag; }
+	}
+
+	public float Progress {
+		get { return _progress; }
+	}
+
+	public long SubscriptionMessageSequenceNumber {
+		get { return _subscriptionMessageSequenceNumber; }
+	}
+
+	public Guid SubscriptionId {
+		get { return _subscriptionId; }
+	}
+
+	public object Source {
+		get { return _source; }
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Messages/EventReaders/Feeds/FeedReaderMessage.cs b/src/KurrentDB.Projections.Core/Messages/EventReaders/Feeds/FeedReaderMessage.cs
new file mode 100644
index 00000000000..8ff734892a2
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messages/EventReaders/Feeds/FeedReaderMessage.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.Messages.EventReaders.Feeds;
+
+public static partial class FeedReaderMessage {
+	[DerivedMessage]
+	public abstract partial class FeedReaderMessageBase : Message {
+	}
+
+	[DerivedMessage(ProjectionMessage.FeedReader)]
+	public sealed partial class ReadPage : FeedReaderMessageBase {
+		public readonly Guid CorrelationId;
+		public readonly IEnvelope Envelope;
+		public readonly ClaimsPrincipal User;
+
+		public readonly QuerySourcesDefinition QuerySource;
+		public readonly CheckpointTag FromPosition;
+		public readonly int MaxEvents;
+
+		public ReadPage(
+			Guid correlationId, IEnvelope envelope, ClaimsPrincipal user, QuerySourcesDefinition querySource,
+			CheckpointTag fromPosition,
+			int maxEvents) {
+			User = user;
+			CorrelationId = correlationId;
+			Envelope = envelope;
+			QuerySource = querySource;
+			FromPosition = fromPosition;
+			MaxEvents = maxEvents;
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.FeedReader)]
+	public sealed partial class FeedPage : FeedReaderMessageBase {
+		public enum ErrorStatus {
+			Success,
+			NotAuthorized
+		}
+
+		public readonly Guid CorrelationId;
+		public readonly ErrorStatus Error;
+		public readonly TaggedResolvedEvent[] Events;
+		public readonly CheckpointTag LastReaderPosition;
+
+		public FeedPage(
+			Guid correlationId, ErrorStatus error, TaggedResolvedEvent[] events, CheckpointTag lastReaderPosition) {
+			CorrelationId = correlationId;
+			Error = error;
+			Events = events;
+			LastReaderPosition = lastReaderPosition;
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Messages/ICoreProjection.cs b/src/KurrentDB.Projections.Core/Messages/ICoreProjection.cs
new file mode 100644
index 00000000000..c4d51197c3a
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messages/ICoreProjection.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Bus;
+
+namespace KurrentDB.Projections.Core.Messages;
+
+public interface ICoreProjection :
+	IHandle<CoreProjectionProcessingMessage.CheckpointLoaded>,
+	IHandle<CoreProjectionProcessingMessage.PrerecordedEventsLoaded>,
+	IHandle<CoreProjectionProcessingMessage.CheckpointCompleted>,
+	IHandle<CoreProjectionProcessingMessage.RestartRequested>,
+	IHandle<CoreProjectionProcessingMessage.Failed> {
+}
diff --git a/src/KurrentDB.Projections.Core/Messages/IProjectionCheckpointManager.cs b/src/KurrentDB.Projections.Core/Messages/IProjectionCheckpointManager.cs
new file mode 100644
index 00000000000..85742c0fe4a
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messages/IProjectionCheckpointManager.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Bus;
+
+namespace KurrentDB.Projections.Core.Messages;
+
+public interface IProjectionCheckpointManager : IHandle<CoreProjectionProcessingMessage.ReadyForCheckpoint>,
+	IHandle<CoreProjectionProcessingMessage.RestartRequested>,
+	IHandle<CoreProjectionProcessingMessage.Failed> {
+}
+
+public interface IEmittedStreamContainer : IProjectionCheckpointManager,
+	IHandle<CoreProjectionProcessingMessage.EmittedStreamAwaiting>,
+	IHandle<CoreProjectionProcessingMessage.EmittedStreamWriteCompleted> {
+}
diff --git a/src/KurrentDB.Projections.Core/Messages/IQuerySources.cs b/src/KurrentDB.Projections.Core/Messages/IQuerySources.cs
new file mode 100644
index 00000000000..fbc7f5bc582
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messages/IQuerySources.cs
@@ -0,0 +1,59 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Messages;
+
+public interface IQuerySources {
+	bool AllStreams { get; }
+
+	string[] Categories { get; }
+
+	string[] Streams { get; }
+
+	bool AllEvents { get; }
+
+	string[] Events { get; }
+
+	bool ByStreams { get; }
+
+	bool ByCustomPartitions { get; }
+
+	bool DefinesStateTransform { get; }
+
+	bool DefinesFold { get; }
+
+	bool HandlesDeletedNotifications { get; }
+
+	bool ProducesResults { get; }
+
+	bool IsBiState { get; }
+
+	bool IncludeLinksOption { get; }
+
+	string ResultStreamNameOption { get; }
+
+	string PartitionResultStreamNamePatternOption { get; }
+
+	bool ReorderEventsOption { get; }
+
+	int? ProcessingLagOption { get; }
+
+	long? LimitingCommitPosition { get; }
+}
+
+public static class QuerySourcesExtensions {
+	public static bool HasStreams(this IQuerySources sources) {
+		var streams = sources.Streams;
+		return streams != null && streams.Length > 0;
+	}
+
+	public static bool HasCategories(this IQuerySources sources) {
+		var categories = sources.Categories;
+		return categories != null && categories.Length > 0;
+	}
+
+	public static bool HasEvents(this IQuerySources sources) {
+		var events = sources.Events;
+		return events != null && events.Length > 0;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Messages/ProjectionCoreServiceMessage.cs b/src/KurrentDB.Projections.Core/Messages/ProjectionCoreServiceMessage.cs
new file mode 100644
index 00000000000..ad9e3d43769
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messages/ProjectionCoreServiceMessage.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Projections.Core.Messages;
+
+public static partial class ProjectionCoreServiceMessage {
+	[DerivedMessage(ProjectionMessage.ServiceMessage)]
+	public partial class StartCore : Message {
+		public readonly Guid InstanceCorrelationId;
+
+		public StartCore(Guid instanceCorrelationId) {
+			InstanceCorrelationId = instanceCorrelationId;
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.ServiceMessage)]
+	public partial class StopCore : Message {
+		public Guid QueueId { get; }
+
+		public StopCore(Guid queueId) {
+			QueueId = queueId;
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.ServiceMessage)]
+	public partial class StopCoreTimeout : Message {
+		public Guid QueueId { get; }
+
+		public StopCoreTimeout(Guid queueId) {
+			QueueId = queueId;
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.ServiceMessage)]
+	public partial class CoreTick : Message {
+		private readonly Action _action;
+
+		public CoreTick(Action action) {
+			_action = action;
+		}
+
+		public Action Action {
+			get { return _action; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.ServiceMessage)]
+	public partial class SubComponentStarted : Message {
+		public string SubComponent { get; }
+		public Guid InstanceCorrelationId { get; }
+
+		public SubComponentStarted(string subComponent, Guid instanceCorrelationId) {
+			InstanceCorrelationId = instanceCorrelationId;
+			SubComponent = subComponent;
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.ServiceMessage)]
+	public partial class SubComponentStopped : Message {
+		public readonly string SubComponent;
+
+		public Guid QueueId { get; }
+
+		public SubComponentStopped(string subComponent, Guid queueId) {
+			SubComponent = subComponent;
+			QueueId = queueId;
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Messages/ProjectionManagementMessage.cs b/src/KurrentDB.Projections.Core/Messages/ProjectionManagementMessage.cs
new file mode 100644
index 00000000000..01d70937723
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messages/ProjectionManagementMessage.cs
@@ -0,0 +1,859 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.Messages;
+
+public static partial class ProjectionManagementMessage {
+	public static partial class Command {
+		[DerivedMessage]
+		public abstract partial class ControlMessage : Message {
+			private readonly IEnvelope _envelope;
+			public readonly RunAs RunAs;
+
+			protected ControlMessage(IEnvelope envelope, RunAs runAs) {
+				_envelope = envelope;
+				RunAs = runAs;
+			}
+
+			public IEnvelope Envelope {
+				get { return _envelope; }
+			}
+		}
+
+		[DerivedMessage(ProjectionMessage.Management)]
+		public partial class PostBatch : ControlMessage {
+			public ProjectionPost[] Projections { get; }
+
+			public PostBatch(
+				IEnvelope envelope, RunAs runAs, ProjectionPost[] projections)
+				: base(envelope, runAs) {
+				Projections = projections;
+			}
+
+			public class ProjectionPost {
+				public ProjectionMode Mode { get; }
+				public RunAs RunAs { get; }
+				public string Name { get; }
+				public string HandlerType { get; }
+				public string Query { get; }
+				public bool Enabled { get; }
+				public bool CheckpointsEnabled { get; }
+				public bool EmitEnabled { get; }
+				public bool EnableRunAs { get; }
+				public bool TrackEmittedStreams { get; }
+
+				public ProjectionPost(
+					ProjectionMode mode, RunAs runAs, string name, string handlerType, string query,
+					bool enabled, bool checkpointsEnabled, bool emitEnabled, bool enableRunAs,
+					bool trackEmittedStreams) {
+					Mode = mode;
+					RunAs = runAs;
+					Name = name;
+					HandlerType = handlerType;
+					Query = query;
+					Enabled = enabled;
+					CheckpointsEnabled = checkpointsEnabled;
+					EmitEnabled = emitEnabled;
+					EnableRunAs = enableRunAs;
+					TrackEmittedStreams = trackEmittedStreams;
+				}
+			}
+		}
+
+		[DerivedMessage(ProjectionMessage.Management)]
+		public partial class Post : ControlMessage {
+			private readonly ProjectionMode _mode;
+			private readonly string _name;
+			private readonly string _handlerType;
+			private readonly string _query;
+			private readonly bool _enabled;
+			private readonly bool _checkpointsEnabled;
+			private readonly bool _emitEnabled;
+			private readonly bool _enableRunAs;
+			private readonly bool _trackEmittedStreams;
+
+			public Post(
+				IEnvelope envelope, ProjectionMode mode, string name, RunAs runAs, string handlerType, string query,
+				bool enabled, bool checkpointsEnabled, bool emitEnabled, bool trackEmittedStreams,
+				bool enableRunAs = false)
+				: base(envelope, runAs) {
+				_name = name;
+				_handlerType = handlerType;
+				_mode = mode;
+				_query = query;
+				_enabled = enabled;
+				_checkpointsEnabled = checkpointsEnabled;
+				_emitEnabled = emitEnabled;
+				_trackEmittedStreams = trackEmittedStreams;
+				_enableRunAs = enableRunAs;
+			}
+
+			public Post(
+				IEnvelope envelope, ProjectionMode mode, string name, RunAs runAs, Type handlerType, string query,
+				bool enabled, bool checkpointsEnabled, bool emitEnabled, bool trackEmittedStreams,
+				bool enableRunAs = false)
+				: base(envelope, runAs) {
+				_name = name;
+				_handlerType = "native:" + handlerType.Namespace + "." + handlerType.Name;
+				_mode = mode;
+				_query = query;
+				_enabled = enabled;
+				_checkpointsEnabled = checkpointsEnabled;
+				_emitEnabled = emitEnabled;
+				_trackEmittedStreams = trackEmittedStreams;
+				_enableRunAs = enableRunAs;
+			}
+
+			// shortcut for posting ad-hoc JS queries
+			public Post(IEnvelope envelope, RunAs runAs, string query, bool enabled)
+				: base(envelope, runAs) {
+				_name = Guid.NewGuid().ToString("D");
+				_handlerType = "JS";
+				_mode = ProjectionMode.Transient;
+				_query = query;
+				_enabled = enabled;
+				_checkpointsEnabled = false;
+				_emitEnabled = false;
+				_trackEmittedStreams = false;
+			}
+
+			public ProjectionMode Mode {
+				get { return _mode; }
+			}
+
+			public string Query {
+				get { return _query; }
+			}
+
+			public string Name {
+				get { return _name; }
+			}
+
+			public string HandlerType {
+				get { return _handlerType; }
+			}
+
+			public bool Enabled {
+				get { return _enabled; }
+			}
+
+			public bool EmitEnabled {
+				get { return _emitEnabled; }
+			}
+
+			public bool CheckpointsEnabled {
+				get { return _checkpointsEnabled; }
+			}
+
+			public bool EnableRunAs {
+				get { return _enableRunAs; }
+			}
+
+			public bool TrackEmittedStreams {
+				get { return _trackEmittedStreams; }
+			}
+		}
+
+		[DerivedMessage(ProjectionMessage.Management)]
+		public partial class Disable : ControlMessage {
+			private readonly string _name;
+
+			public Disable(IEnvelope envelope, string name, RunAs runAs)
+				: base(envelope, runAs) {
+				_name = name;
+			}
+
+			public string Name {
+				get { return _name; }
+			}
+		}
+
+		[DerivedMessage(ProjectionMessage.Management)]
+		public partial class Enable : ControlMessage {
+			private readonly string _name;
+
+			public Enable(IEnvelope envelope, string name, RunAs runAs)
+				: base(envelope, runAs) {
+				_name = name;
+			}
+
+			public string Name {
+				get { return _name; }
+			}
+		}
+
+		[DerivedMessage(ProjectionMessage.Management)]
+		public partial class Abort : ControlMessage {
+			private readonly string _name;
+
+			public Abort(IEnvelope envelope, string name, RunAs runAs)
+				: base(envelope, runAs) {
+				_name = name;
+			}
+
+			public string Name {
+				get { return _name; }
+			}
+		}
+
+		[DerivedMessage(ProjectionMessage.Management)]
+		public partial class SetRunAs : ControlMessage {
+			public enum SetRemove {
+				Set,
+				Remove
+			};
+
+			private readonly string _name;
+			private readonly SetRemove _action;
+
+			public SetRunAs(IEnvelope envelope, string name, RunAs runAs, SetRemove action)
+				: base(envelope, runAs) {
+				_name = name;
+				_action = action;
+			}
+
+			public string Name {
+				get { return _name; }
+			}
+
+			public SetRemove Action {
+				get { return _action; }
+			}
+		}
+
+		[DerivedMessage(ProjectionMessage.Management)]
+		public partial class UpdateQuery : ControlMessage {
+			private readonly string _name;
+			private readonly string _query;
+			private readonly bool? _emitEnabled;
+
+			public UpdateQuery(
+				IEnvelope envelope, string name, RunAs runAs, string query, bool? emitEnabled)
+				: base(envelope, runAs) {
+				_name = name;
+				_query = query;
+				_emitEnabled = emitEnabled;
+			}
+
+			public string Query {
+				get { return _query; }
+			}
+
+			public string Name {
+				get { return _name; }
+			}
+
+			public bool? EmitEnabled {
+				get { return _emitEnabled; }
+			}
+		}
+
+		[DerivedMessage(ProjectionMessage.Management)]
+		public partial class Reset : ControlMessage {
+			private readonly string _name;
+
+			public Reset(IEnvelope envelope, string name, RunAs runAs)
+				: base(envelope, runAs) {
+				_name = name;
+			}
+
+			public string Name {
+				get { return _name; }
+			}
+		}
+
+		[DerivedMessage(ProjectionMessage.Management)]
+		public partial class Delete : ControlMessage {
+			private readonly string _name;
+			private readonly bool _deleteCheckpointStream;
+			private readonly bool _deleteStateStream;
+			private readonly bool _deleteEmittedStreams;
+
+			public Delete(
+				IEnvelope envelope, string name, RunAs runAs, bool deleteCheckpointStream, bool deleteStateStream,
+				bool deleteEmittedStreams)
+				: base(envelope, runAs) {
+				_name = name;
+				_deleteCheckpointStream = deleteCheckpointStream;
+				_deleteStateStream = deleteStateStream;
+				_deleteEmittedStreams = deleteEmittedStreams;
+			}
+
+			public string Name {
+				get { return _name; }
+			}
+
+			public bool DeleteCheckpointStream {
+				get { return _deleteCheckpointStream; }
+			}
+
+			public bool DeleteStateStream {
+				get { return _deleteStateStream; }
+			}
+
+			public bool DeleteEmittedStreams {
+				get { return _deleteEmittedStreams; }
+			}
+		}
+
+		[DerivedMessage(ProjectionMessage.Management)]
+		public partial class GetQuery : ControlMessage {
+			private readonly string _name;
+
+			public GetQuery(IEnvelope envelope, string name, RunAs runAs) :
+				base(envelope, runAs) {
+				_name = name;
+			}
+
+			public string Name {
+				get { return _name; }
+			}
+		}
+
+		[DerivedMessage(ProjectionMessage.Management)]
+		public partial class GetConfig : ControlMessage {
+			private readonly string _name;
+
+			public GetConfig(IEnvelope envelope, string name, RunAs runAs) :
+				base(envelope, runAs) {
+				_name = name;
+			}
+
+			public string Name {
+				get { return _name; }
+			}
+		}
+
+		[DerivedMessage(ProjectionMessage.Management)]
+		public partial class UpdateConfig : ControlMessage {
+			private readonly string _name;
+			private readonly bool _emitEnabled;
+			private readonly bool _trackEmittedStreams;
+			private readonly int _checkpointAfterMs;
+			private readonly int _checkpointHandledThreshold;
+			private readonly int _checkpointUnhandledBytesThreshold;
+			private readonly int _pendingEventsThreshold;
+			private readonly int _maxWriteBatchLength;
+			private readonly int _maxAllowedWritesInFlight;
+			private readonly int? _projectionExecutionTimeout;
+
+			public UpdateConfig(IEnvelope envelope, string name, bool emitEnabled, bool trackEmittedStreams,
+				int checkpointAfterMs,
+				int checkpointHandledThreshold, int checkpointUnhandledBytesThreshold, int pendingEventsThreshold,
+				int maxWriteBatchLength, int maxAllowedWritesInFlight, RunAs runAs, int? projectionExecutionTimeout) :
+				base(envelope, runAs) {
+				_name = name;
+				_emitEnabled = emitEnabled;
+				_trackEmittedStreams = trackEmittedStreams;
+				_checkpointAfterMs = checkpointAfterMs;
+				_checkpointHandledThreshold = checkpointHandledThreshold;
+				_checkpointUnhandledBytesThreshold = checkpointUnhandledBytesThreshold;
+				_pendingEventsThreshold = pendingEventsThreshold;
+				_maxWriteBatchLength = maxWriteBatchLength;
+				_maxAllowedWritesInFlight = maxAllowedWritesInFlight;
+				_projectionExecutionTimeout = projectionExecutionTimeout;
+			}
+
+			public string Name {
+				get { return _name; }
+			}
+
+			public bool EmitEnabled {
+				get { return _emitEnabled; }
+			}
+
+			public bool TrackEmittedStreams {
+				get { return _trackEmittedStreams; }
+			}
+
+			public int CheckpointAfterMs {
+				get { return _checkpointAfterMs; }
+			}
+
+			public int CheckpointHandledThreshold {
+				get { return _checkpointHandledThreshold; }
+			}
+
+			public int CheckpointUnhandledBytesThreshold {
+				get { return _checkpointUnhandledBytesThreshold; }
+			}
+
+			public int PendingEventsThreshold {
+				get { return _pendingEventsThreshold; }
+			}
+
+			public int MaxWriteBatchLength {
+				get { return _maxWriteBatchLength; }
+			}
+
+			public int MaxAllowedWritesInFlight {
+				get { return _maxAllowedWritesInFlight; }
+			}
+
+			public int? ProjectionExecutionTimeout { get => _projectionExecutionTimeout; }
+		}
+
+		[DerivedMessage(ProjectionMessage.Management)]
+		public partial class GetStatistics : Message {
+			private readonly IEnvelope _envelope;
+			private readonly ProjectionMode? _mode;
+			private readonly string _name;
+			private readonly bool _includeDeleted;
+
+			public GetStatistics(IEnvelope envelope, ProjectionMode? mode, string name, bool includeDeleted) {
+				_envelope = envelope;
+				_mode = mode;
+				_name = name;
+				_includeDeleted = includeDeleted;
+			}
+
+			public ProjectionMode? Mode {
+				get { return _mode; }
+			}
+
+			public string Name {
+				get { return _name; }
+			}
+
+			public bool IncludeDeleted {
+				get { return _includeDeleted; }
+			}
+
+			public IEnvelope Envelope {
+				get { return _envelope; }
+			}
+		}
+
+		[DerivedMessage(ProjectionMessage.Management)]
+		public partial class GetState : Message {
+			private readonly IEnvelope _envelope;
+			private readonly string _name;
+			private readonly string _partition;
+
+			public GetState(IEnvelope envelope, string name, string partition) {
+				if (envelope == null)
+					throw new ArgumentNullException("envelope");
+				if (name == null)
+					throw new ArgumentNullException("name");
+				if (partition == null)
+					throw new ArgumentNullException("partition");
+				_envelope = envelope;
+				_name = name;
+				_partition = partition;
+			}
+
+			public string Name {
+				get { return _name; }
+			}
+
+			public IEnvelope Envelope {
+				get { return _envelope; }
+			}
+
+			public string Partition {
+				get { return _partition; }
+			}
+		}
+
+		[DerivedMessage(ProjectionMessage.Management)]
+		public partial class GetResult : Message {
+			private readonly IEnvelope _envelope;
+			private readonly string _name;
+			private readonly string _partition;
+
+			public GetResult(IEnvelope envelope, string name, string partition) {
+				if (envelope == null)
+					throw new ArgumentNullException("envelope");
+				if (name == null)
+					throw new ArgumentNullException("name");
+				if (partition == null)
+					throw new ArgumentNullException("partition");
+				_envelope = envelope;
+				_name = name;
+				_partition = partition;
+			}
+
+			public string Name {
+				get { return _name; }
+			}
+
+			public IEnvelope Envelope {
+				get { return _envelope; }
+			}
+
+			public string Partition {
+				get { return _partition; }
+			}
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.Management)]
+	public partial class OperationFailed : Message {
+		private readonly string _reason;
+
+		public OperationFailed(string reason) {
+			_reason = reason;
+		}
+
+		public string Reason {
+			get { return _reason; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.Management)]
+	public partial class NotFound : OperationFailed {
+		public NotFound()
+			: base("Not Found") {
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.Management)]
+	public partial class NotAuthorized : OperationFailed {
+		public NotAuthorized()
+			: base("Not authorized") {
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.Management)]
+	public partial class Conflict : OperationFailed {
+		public Conflict(string reason)
+			: base(reason) {
+		}
+	}
+
+	public sealed class RunAs {
+		private readonly ClaimsPrincipal _runAs;
+
+		public RunAs(ClaimsPrincipal runAs) {
+			_runAs = runAs;
+		}
+
+		private static readonly RunAs _anonymous = new RunAs(SystemAccounts.Anonymous);
+		private static readonly RunAs _system = new RunAs(SystemAccounts.System);
+
+		public static RunAs Anonymous {
+			get { return _anonymous; }
+		}
+
+		public static RunAs System {
+			get { return _system; }
+		}
+
+		public ClaimsPrincipal Principal {
+			get { return _runAs; }
+		}
+
+		public static bool ValidateRunAs(ProjectionMode mode, ReadWrite readWrite, ClaimsPrincipal existingRunAs,
+			Command.ControlMessage message, bool replace = false) {
+			if (mode > ProjectionMode.Transient && readWrite == ReadWrite.Write
+												&& (message.RunAs == null || message.RunAs.Principal == null
+																		  || !(
+																				   message.RunAs.Principal.LegacyRoleCheck(SystemRoles.Admins)
+																		  		|| message.RunAs.Principal.LegacyRoleCheck(SystemRoles.Operations)
+																			  ))) {
+				message.Envelope.ReplyWith(new NotAuthorized());
+				return false;
+			}
+
+			if (replace && message.RunAs.Principal == null) {
+				message.Envelope.ReplyWith(new NotAuthorized());
+				return false;
+			}
+
+			if (replace && message.RunAs.Principal != null)
+				return true; // enable this operation while no projection permissions are defined
+
+			return true;
+
+			//if (existingRunAs == null)
+			//    return true;
+			//if (message.RunAs1.Principal == null
+			//    || !string.Equals(
+			//        existingRunAs.Identity.Name, message.RunAs1.Principal.Identity.Name,
+			//        StringComparison.OrdinalIgnoreCase))
+			//{
+			//    message.Envelope.ReplyWith(new NotAuthorized());
+			//    return false;
+			//}
+			//return true;
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.Management)]
+	public partial class Updated : Message {
+		private readonly string _name;
+
+		public Updated(string name) {
+			_name = name;
+		}
+
+		public string Name {
+			get { return _name; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.Management)]
+	public partial class Statistics : Message {
+		private readonly ProjectionStatistics[] _projections;
+
+		public Statistics(ProjectionStatistics[] projections) {
+			_projections = projections;
+		}
+
+		public ProjectionStatistics[] Projections {
+			get { return _projections; }
+		}
+	}
+
+	[DerivedMessage]
+	public abstract partial class ProjectionDataBase : Message {
+		private readonly string _name;
+		private readonly string _partition;
+		private readonly CheckpointTag _position;
+		private readonly Exception _exception;
+
+		protected ProjectionDataBase(
+			string name, string partition, CheckpointTag position, Exception exception = null) {
+			_name = name;
+			_partition = partition;
+			_position = position;
+			_exception = exception;
+		}
+
+		public string Name {
+			get { return _name; }
+		}
+
+		public Exception Exception {
+			get { return _exception; }
+		}
+
+		public string Partition {
+			get { return _partition; }
+		}
+
+		public CheckpointTag Position {
+			get { return _position; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.Management)]
+	public partial class ProjectionState : ProjectionDataBase {
+		private readonly string _state;
+
+		public ProjectionState(
+			string name, string partition, string state, CheckpointTag position, Exception exception = null)
+			: base(name, partition, position, exception) {
+			_state = state;
+		}
+
+		public string State {
+			get { return _state; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.Management)]
+	public partial class ProjectionResult : ProjectionDataBase {
+		private readonly string _result;
+
+		public ProjectionResult(
+			string name, string partition, string result, CheckpointTag position, Exception exception = null)
+			: base(name, partition, position, exception) {
+			_result = result;
+		}
+
+		public string Result {
+			get { return _result; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.Management)]
+	public partial class ProjectionQuery : Message {
+		private readonly string _name;
+		private readonly string _query;
+		private readonly bool _emitEnabled;
+		private readonly ProjectionSourceDefinition _definition;
+		private readonly ProjectionOutputConfig _outputConfig;
+		private readonly string _projectionType;
+		private readonly bool? _trackEmittedStreams;
+		private readonly bool? _checkpointsEnabled;
+
+		public ProjectionQuery(
+			string name,
+			string query,
+			bool emitEnabled,
+			string projectionType,
+			bool? trackEmittedStreams,
+			bool? checkpointsEnabled,
+			ProjectionSourceDefinition definition,
+			ProjectionOutputConfig outputConfig) {
+			_name = name;
+			_query = query;
+			_emitEnabled = emitEnabled;
+			_projectionType = projectionType;
+			_trackEmittedStreams = trackEmittedStreams;
+			_checkpointsEnabled = checkpointsEnabled;
+			_definition = definition;
+			_outputConfig = outputConfig;
+		}
+
+		public string Name {
+			get { return _name; }
+		}
+
+		public string Query {
+			get { return _query; }
+		}
+
+		public bool EmitEnabled {
+			get { return _emitEnabled; }
+		}
+
+		public bool? TrackEmittedStreams {
+			get { return _trackEmittedStreams; }
+		}
+
+		public bool? CheckpointsEnabled {
+			get { return _checkpointsEnabled; }
+		}
+
+		public string Type {
+			get { return _projectionType; }
+		}
+
+		public ProjectionSourceDefinition Definition {
+			get { return _definition; }
+		}
+
+		public ProjectionOutputConfig OutputConfig {
+			get { return _outputConfig; }
+		}
+	}
+
+	public static partial class Internal {
+		[DerivedMessage(ProjectionMessage.Management)]
+		public partial class CleanupExpired : Message {
+		}
+
+		[DerivedMessage(ProjectionMessage.Management)]
+		public partial class ReadTimeout : Message {
+			private readonly Guid _correlationId;
+			private readonly string _streamId;
+			private readonly Dictionary<string, object> _parameters;
+
+			public Guid CorrelationId {
+				get { return _correlationId; }
+			}
+
+			public string StreamId {
+				get { return _streamId; }
+			}
+
+			public Dictionary<string, object> Parameters {
+				get { return _parameters; }
+			}
+
+			public ReadTimeout(Guid correlationId, string streamId, Dictionary<string, object> parameters) {
+				_correlationId = correlationId;
+				_streamId = streamId;
+				_parameters = parameters;
+			}
+
+			public ReadTimeout(Guid correlationId, string streamId) : this(correlationId, streamId,
+				new Dictionary<string, object>()) {
+			}
+		}
+
+		[DerivedMessage(ProjectionMessage.Management)]
+		public partial class Deleted : Message {
+			private readonly string _name;
+			private readonly Guid _id;
+
+			public Deleted(string name, Guid id) {
+				_name = name;
+				_id = id;
+			}
+
+			public string Name {
+				get { return _name; }
+			}
+
+			public Guid Id {
+				get { return _id; }
+			}
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.Management)]
+	public partial class ProjectionConfig : Message {
+		private readonly bool _emitEnabled;
+		private readonly bool _trackEmittedStreams;
+		private readonly int _checkpointAfterMs;
+		private readonly int _checkpointHandledThreshold;
+		private readonly int _checkpointUnhandledBytesThreshold;
+		private readonly int _pendingEventsThreshold;
+		private readonly int _maxWriteBatchLength;
+		private readonly int _maxAllowedWritesInFlight;
+		private readonly int? _projectionExecutionTimeout;
+
+		public ProjectionConfig(bool emitEnabled, bool trackEmittedStreams, int checkpointAfterMs,
+			int checkpointHandledThreshold,
+			int checkpointUnhandledBytesThreshold, int pendingEventsThreshold, int maxWriteBatchLength,
+			int maxAllowedWritesInFlight, int? projectionExecutionTimeout) {
+			_emitEnabled = emitEnabled;
+			_trackEmittedStreams = trackEmittedStreams;
+			_checkpointAfterMs = checkpointAfterMs;
+			_checkpointHandledThreshold = checkpointHandledThreshold;
+			_checkpointUnhandledBytesThreshold = checkpointUnhandledBytesThreshold;
+			_pendingEventsThreshold = pendingEventsThreshold;
+			_maxWriteBatchLength = maxWriteBatchLength;
+			_maxAllowedWritesInFlight = maxAllowedWritesInFlight;
+			_projectionExecutionTimeout = projectionExecutionTimeout;
+		}
+
+		public bool EmitEnabled {
+			get { return _emitEnabled; }
+		}
+
+		public bool TrackEmittedStreams {
+			get { return _trackEmittedStreams; }
+		}
+
+		public int CheckpointAfterMs {
+			get { return _checkpointAfterMs; }
+		}
+
+		public int CheckpointHandledThreshold {
+			get { return _checkpointHandledThreshold; }
+		}
+
+		public int CheckpointUnhandledBytesThreshold {
+			get { return _checkpointUnhandledBytesThreshold; }
+		}
+
+		public int PendingEventsThreshold {
+			get { return _pendingEventsThreshold; }
+		}
+
+		public int MaxWriteBatchLength {
+			get { return _maxWriteBatchLength; }
+		}
+
+		public int MaxAllowedWritesInFlight {
+			get { return _maxAllowedWritesInFlight; }
+		}
+
+		public int? ProjectionExecutionTimeout { get => _projectionExecutionTimeout; }
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Messages/ProjectionMessage.cs b/src/KurrentDB.Projections.Core/Messages/ProjectionMessage.cs
new file mode 100644
index 00000000000..74c5c22c225
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messages/ProjectionMessage.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Messages;
+
+// The name of this enum and its members are used for metrics
+public enum ProjectionMessage {
+	None,
+	CoreManagement,
+	CoreProcessing,
+	CoreStatus,
+	EventReaderSubscription,
+	FeedReader,
+	Management,
+	Misc,
+	ReaderCoreService,
+	ReaderSubscription,
+	ReaderSubscriptionManagement,
+	ServiceMessage,
+	Subsystem,
+}
diff --git a/src/KurrentDB.Projections.Core/Messages/ProjectionSubsystemMessage.cs b/src/KurrentDB.Projections.Core/Messages/ProjectionSubsystemMessage.cs
new file mode 100644
index 00000000000..fa46e1cda87
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messages/ProjectionSubsystemMessage.cs
@@ -0,0 +1,82 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Projections.Core.Messages;
+
+public static partial class ProjectionSubsystemMessage {
+	[DerivedMessage(ProjectionMessage.Subsystem)]
+	public partial class RestartSubsystem : Message {
+		public IEnvelope ReplyEnvelope { get; }
+
+		public RestartSubsystem(IEnvelope replyEnvelope) {
+			ReplyEnvelope = replyEnvelope;
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.Subsystem)]
+	public partial class InvalidSubsystemRestart : Message {
+		public string SubsystemState { get; }
+		public string Reason { get; }
+
+		public InvalidSubsystemRestart(string subsystemState, string reason) {
+			SubsystemState = subsystemState;
+			Reason = reason;
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.Subsystem)]
+	public partial class SubsystemRestarting : Message {
+	}
+
+	[DerivedMessage(ProjectionMessage.Subsystem)]
+	public partial class StartComponents : Message {
+		public Guid InstanceCorrelationId { get; }
+
+		public StartComponents(Guid instanceCorrelationId) {
+			InstanceCorrelationId = instanceCorrelationId;
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.Subsystem)]
+	public partial class ComponentStarted : Message {
+		public string ComponentName { get; }
+		public Guid InstanceCorrelationId { get; }
+
+		public ComponentStarted(string componentName, Guid instanceCorrelationId) {
+			ComponentName = componentName;
+			InstanceCorrelationId = instanceCorrelationId;
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.Subsystem)]
+	public partial class StopComponents : Message {
+		public Guid InstanceCorrelationId { get; }
+
+		public StopComponents(Guid instanceCorrelationId) {
+			InstanceCorrelationId = instanceCorrelationId;
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.Subsystem)]
+	public partial class ComponentStopped : Message {
+		public string ComponentName { get; }
+		public Guid InstanceCorrelationId { get; }
+
+		public ComponentStopped(string componentName, Guid instanceCorrelationId) {
+			ComponentName = componentName;
+			InstanceCorrelationId = instanceCorrelationId;
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.Subsystem)]
+	public partial class IODispatcherDrained : Message {
+		public string ComponentName { get; }
+
+		public IODispatcherDrained(string componentName) {
+			ComponentName = componentName;
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Messages/QuerySourcesDefinition.cs b/src/KurrentDB.Projections.Core/Messages/QuerySourcesDefinition.cs
new file mode 100644
index 00000000000..65b1726f03b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messages/QuerySourcesDefinition.cs
@@ -0,0 +1,96 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Runtime.Serialization;
+
+namespace KurrentDB.Projections.Core.Messages;
+
+[DataContract]
+public class QuerySourcesDefinition : IQuerySources {
+	[DataMember(Name = "allStreams")] public bool AllStreams { get; set; }
+
+	[DataMember(Name = "categories")] public string[] Categories { get; set; }
+
+	[DataMember(Name = "streams")] public string[] Streams { get; set; }
+
+	[DataMember(Name = "allEvents")] public bool AllEvents { get; set; }
+
+	[DataMember(Name = "events")] public string[] Events { get; set; }
+
+	[DataMember(Name = "byStreams")] public bool ByStreams { get; set; }
+
+	[DataMember(Name = "byCustomPartitions")]
+	public bool ByCustomPartitions { get; set; }
+
+	[DataMember(Name = "limitingCommitPosition")]
+	public long? LimitingCommitPosition { get; set; }
+
+	bool IQuerySources.DefinesStateTransform {
+		get { return Options != null && Options.DefinesStateTransform; }
+	}
+
+	bool IQuerySources.ProducesResults {
+		get { return Options != null && Options.ProducesResults; }
+	}
+
+	bool IQuerySources.DefinesFold {
+		get { return Options != null && Options.DefinesFold; }
+	}
+
+	bool IQuerySources.HandlesDeletedNotifications {
+		get { return Options != null && Options.HandlesDeletedNotifications; }
+	}
+
+	bool IQuerySources.IncludeLinksOption {
+		get { return Options != null && Options.IncludeLinks; }
+	}
+
+	string IQuerySources.ResultStreamNameOption {
+		get { return Options != null ? Options.ResultStreamName : null; }
+	}
+
+	string IQuerySources.PartitionResultStreamNamePatternOption {
+		get { return Options != null ? Options.PartitionResultStreamNamePattern : null; }
+	}
+
+	bool IQuerySources.ReorderEventsOption {
+		get { return Options != null && Options.ReorderEvents; }
+	}
+
+	int? IQuerySources.ProcessingLagOption {
+		get { return Options != null ? Options.ProcessingLag : null; }
+	}
+
+	bool IQuerySources.IsBiState {
+		get { return Options != null ? Options.IsBiState : false; }
+	}
+
+	[DataMember(Name = "options")] public QuerySourcesDefinitionOptions Options { get; set; }
+
+	public static QuerySourcesDefinition From(IQuerySources sources) {
+		return new QuerySourcesDefinition {
+			AllEvents = sources.AllEvents,
+			AllStreams = sources.AllStreams,
+			ByStreams = sources.ByStreams,
+			ByCustomPartitions = sources.ByCustomPartitions,
+			Categories = (sources.Categories ?? new string[0]).ToArray(),
+			Events = (sources.Events ?? new string[0]).ToArray(),
+			Streams = (sources.Streams ?? new string[0]).ToArray(),
+			LimitingCommitPosition = sources.LimitingCommitPosition,
+			Options =
+				new QuerySourcesDefinitionOptions {
+					DefinesStateTransform = sources.DefinesStateTransform,
+					ProducesResults = sources.ProducesResults,
+					DefinesFold = sources.DefinesFold,
+					HandlesDeletedNotifications = sources.HandlesDeletedNotifications,
+					IncludeLinks = sources.IncludeLinksOption,
+					PartitionResultStreamNamePattern = sources.PartitionResultStreamNamePatternOption,
+					ProcessingLag = sources.ProcessingLagOption.GetValueOrDefault(),
+					IsBiState = sources.IsBiState,
+					ReorderEvents = sources.ReorderEventsOption,
+					ResultStreamName = sources.ResultStreamNameOption,
+				}
+		};
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Messages/QuerySourcesDefinitionOptions.cs b/src/KurrentDB.Projections.Core/Messages/QuerySourcesDefinitionOptions.cs
new file mode 100644
index 00000000000..9e0663cf71a
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messages/QuerySourcesDefinitionOptions.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Runtime.Serialization;
+
+namespace KurrentDB.Projections.Core.Messages;
+
+[DataContract]
+public class QuerySourcesDefinitionOptions {
+	[DataMember(Name = "producesResults")] public bool ProducesResults { get; set; }
+
+	[DataMember(Name = "definesFold")] public bool DefinesFold { get; set; }
+
+	[DataMember(Name = "handlesDeletedNotifications")]
+	public bool HandlesDeletedNotifications { get; set; }
+
+	[DataMember(Name = "definesStateTransform")]
+	public bool DefinesStateTransform { get; set; }
+
+	[DataMember(Name = "resultStreamName")]
+	public string ResultStreamName { get; set; }
+
+	[DataMember(Name = "partitionResultStreamNamePattern")]
+	public string PartitionResultStreamNamePattern { get; set; }
+
+	[DataMember(Name = "$includeLinks")] public bool IncludeLinks { get; set; }
+
+	[DataMember(Name = "reorderEvents")] public bool ReorderEvents { get; set; }
+
+	[DataMember(Name = "processingLag")] public int? ProcessingLag { get; set; }
+
+	[DataMember(Name = "biState")] public bool IsBiState { get; set; }
+}
diff --git a/src/KurrentDB.Projections.Core/Messages/ReaderCoreServiceMessage.cs b/src/KurrentDB.Projections.Core/Messages/ReaderCoreServiceMessage.cs
new file mode 100644
index 00000000000..534c8fd5fae
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messages/ReaderCoreServiceMessage.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Projections.Core.Messages;
+
+public static partial class ReaderCoreServiceMessage {
+	[DerivedMessage(ProjectionMessage.ReaderCoreService)]
+	public partial class StartReader : Message {
+		public Guid InstanceCorrelationId { get; }
+
+		public StartReader(Guid instanceCorrelationId) {
+			InstanceCorrelationId = instanceCorrelationId;
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.ReaderCoreService)]
+	public partial class StopReader : Message {
+		public Guid QueueId { get; }
+
+		public StopReader(Guid queueId) {
+			QueueId = queueId;
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Messages/ReaderSubscriptionManagement.cs b/src/KurrentDB.Projections.Core/Messages/ReaderSubscriptionManagement.cs
new file mode 100644
index 00000000000..70996c09eb7
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messages/ReaderSubscriptionManagement.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+
+namespace KurrentDB.Projections.Core.Messages;
+
+public static partial class ReaderSubscriptionManagement {
+	[DerivedMessage]
+	public abstract partial class ReaderSubscriptionManagementMessage : Message {
+		private readonly Guid _subscriptionId;
+
+		protected ReaderSubscriptionManagementMessage(Guid subscriptionId) {
+			_subscriptionId = subscriptionId;
+		}
+
+		public Guid SubscriptionId {
+			get { return _subscriptionId; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.ReaderSubscriptionManagement)]
+	public partial class Subscribe : ReaderSubscriptionManagementMessage {
+		private readonly CheckpointTag _fromPosition;
+		private readonly IReaderStrategy _readerStrategy;
+		private readonly ReaderSubscriptionOptions _options;
+
+		public Subscribe(
+			Guid subscriptionId, CheckpointTag from,
+			IReaderStrategy readerStrategy, ReaderSubscriptionOptions readerSubscriptionOptions) : base(
+			subscriptionId) {
+			if (@from == null)
+				throw new ArgumentNullException("from");
+			if (readerStrategy == null)
+				throw new ArgumentNullException("readerStrategy");
+			_fromPosition = @from;
+			_readerStrategy = readerStrategy;
+			_options = readerSubscriptionOptions;
+		}
+
+		public CheckpointTag FromPosition {
+			get { return _fromPosition; }
+		}
+
+		public IReaderStrategy ReaderStrategy {
+			get { return _readerStrategy; }
+		}
+
+		public ReaderSubscriptionOptions Options {
+			get { return _options; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.ReaderSubscriptionManagement)]
+	public partial class Pause : ReaderSubscriptionManagementMessage {
+		public Pause(Guid subscriptionId)
+			: base(subscriptionId) {
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.ReaderSubscriptionManagement)]
+	public partial class Resume : ReaderSubscriptionManagementMessage {
+		public Resume(Guid subscriptionId)
+			: base(subscriptionId) {
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.ReaderSubscriptionManagement)]
+	public partial class Unsubscribe : ReaderSubscriptionManagementMessage {
+		public Unsubscribe(Guid subscriptionId)
+			: base(subscriptionId) {
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Messages/ReaderSubscriptionMessage.cs b/src/KurrentDB.Projections.Core/Messages/ReaderSubscriptionMessage.cs
new file mode 100644
index 00000000000..f6a189fffde
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messages/ReaderSubscriptionMessage.cs
@@ -0,0 +1,233 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Messages;
+
+public static partial class ReaderSubscriptionMessage {
+	[DerivedMessage(ProjectionMessage.ReaderSubscription)]
+	public partial class SubscriptionMessage : Message {
+		private readonly Guid _correlationId;
+		private readonly CheckpointTag _preTagged;
+		private readonly object _source;
+
+		public SubscriptionMessage(Guid correlationId, CheckpointTag preTagged, object source) {
+			_correlationId = correlationId;
+			_preTagged = preTagged;
+			_source = source;
+		}
+
+		public Guid CorrelationId {
+			get { return _correlationId; }
+		}
+
+		public CheckpointTag PreTagged {
+			get { return _preTagged; }
+		}
+
+		public object Source {
+			get { return _source; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.ReaderSubscription)]
+	public partial class EventReaderIdle : SubscriptionMessage {
+		private readonly DateTime _idleTimestampUtc;
+
+		public EventReaderIdle(Guid correlationId, DateTime idleTimestampUtc, object source = null)
+			: base(correlationId, null, source) {
+			_idleTimestampUtc = idleTimestampUtc;
+		}
+
+		public DateTime IdleTimestampUtc {
+			get { return _idleTimestampUtc; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.ReaderSubscription)]
+	public sealed partial class EventReaderStarting : SubscriptionMessage {
+		private readonly long _lastCommitPosition;
+
+		public EventReaderStarting(Guid correlationId, long lastCommitPosition, object source = null)
+			: base(correlationId, null, source) {
+			_lastCommitPosition = lastCommitPosition;
+		}
+
+		public long LastCommitPosition {
+			get { return _lastCommitPosition; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.ReaderSubscription)]
+	public partial class EventReaderEof : SubscriptionMessage {
+		private readonly bool _maxEventsReached;
+
+		public EventReaderEof(Guid correlationId, bool maxEventsReached = false, object source = null)
+			: base(correlationId, null, source) {
+			_maxEventsReached = maxEventsReached;
+		}
+
+		public bool MaxEventsReached {
+			get { return _maxEventsReached; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.ReaderSubscription)]
+	public partial class EventReaderPartitionEof : SubscriptionMessage {
+		private readonly string _partition;
+
+		public EventReaderPartitionEof(
+			Guid correlationId, string partition, CheckpointTag preTagged, object source = null)
+			: base(correlationId, preTagged, source) {
+			_partition = partition;
+		}
+
+		public string Partition {
+			get { return _partition; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.ReaderSubscription)]
+	public partial class EventReaderPartitionDeleted : SubscriptionMessage {
+		private readonly string _partition;
+		private readonly long? _lastEventNumber;
+		private readonly TFPos? _deleteLinkOrEventPosition;
+		private readonly TFPos? _deleteEventOrLinkTargetPosition;
+		private readonly string _positionStreamId;
+		private readonly long? _positionEventNumber;
+
+		public EventReaderPartitionDeleted(
+			Guid correlationId, string partition, long? lastEventNumber, TFPos? deleteLinkOrEventPosition,
+			TFPos? deleteEventOrLinkTargetPosition, string positionStreamId, long? positionEventNumber,
+			CheckpointTag preTagged = null, object source = null)
+			: base(correlationId, preTagged, source) {
+			_partition = partition;
+			_lastEventNumber = lastEventNumber;
+			_deleteLinkOrEventPosition = deleteLinkOrEventPosition;
+			_deleteEventOrLinkTargetPosition = deleteEventOrLinkTargetPosition;
+			_positionStreamId = positionStreamId;
+			_positionEventNumber = positionEventNumber;
+		}
+
+		public string Partition {
+			get { return _partition; }
+		}
+
+		public long? LastEventNumber {
+			get { return _lastEventNumber; }
+		}
+
+		public TFPos? DeleteEventOrLinkTargetPosition {
+			get { return _deleteEventOrLinkTargetPosition; }
+		}
+
+		public string PositionStreamId {
+			get { return _positionStreamId; }
+		}
+
+		public long? PositionEventNumber {
+			get { return _positionEventNumber; }
+		}
+
+		public TFPos? DeleteLinkOrEventPosition {
+			get { return _deleteLinkOrEventPosition; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.ReaderSubscription)]
+	public sealed partial class EventReaderNotAuthorized : SubscriptionMessage {
+		public EventReaderNotAuthorized(Guid correlationId, object source = null)
+			: base(correlationId, null, source) {
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.ReaderSubscription)]
+	public partial class CommittedEventDistributed : SubscriptionMessage {
+		public static CommittedEventDistributed Sample(
+			Guid correlationId, TFPos position, TFPos originalPosition, string positionStreamId,
+			long positionSequenceNumber,
+			string eventStreamId, long eventSequenceNumber, bool resolvedLinkTo, Guid eventId, string eventType,
+			bool isJson, byte[] data, byte[] metadata, long? safeTransactionFileReaderJoinPosition,
+			float progress) {
+			return new CommittedEventDistributed(
+				correlationId,
+				new ResolvedEvent(
+					positionStreamId, positionSequenceNumber, eventStreamId, eventSequenceNumber, resolvedLinkTo,
+					position, originalPosition, eventId, eventType, isJson, data, metadata, null, null,
+					default(DateTime)),
+				safeTransactionFileReaderJoinPosition, progress);
+		}
+
+		public static CommittedEventDistributed Sample(
+			Guid correlationId, TFPos position, string eventStreamId, long eventSequenceNumber,
+			bool resolvedLinkTo, Guid eventId, string eventType, bool isJson, byte[] data, byte[] metadata,
+			DateTime? timestamp = null) {
+			return new CommittedEventDistributed(
+				correlationId,
+				new ResolvedEvent(
+					eventStreamId, eventSequenceNumber, eventStreamId, eventSequenceNumber, resolvedLinkTo,
+					position,
+					position, eventId, eventType, isJson, data, metadata, null, null,
+					timestamp.GetValueOrDefault()),
+				position.PreparePosition, 11.1f);
+		}
+
+		private readonly ResolvedEvent _data;
+		private readonly long? _safeTransactionFileReaderJoinPosition;
+		private readonly float _progress;
+
+		//NOTE: committed event with null event _data means - end of the source reached.
+		// Current last available TF commit position is in _position.CommitPosition
+		// TODO: separate message?
+
+		public CommittedEventDistributed(
+			Guid correlationId, ResolvedEvent data, long? safeTransactionFileReaderJoinPosition, float progress,
+			object source = null, CheckpointTag preTagged = null)
+			: base(correlationId, preTagged, source) {
+			_data = data;
+			_safeTransactionFileReaderJoinPosition = safeTransactionFileReaderJoinPosition;
+			_progress = progress;
+		}
+
+		public CommittedEventDistributed(Guid correlationId, ResolvedEvent data, CheckpointTag preTagged = null)
+			: this(correlationId, data, data.Position.PreparePosition, 11.1f, preTagged) {
+		}
+
+		public ResolvedEvent Data {
+			get { return _data; }
+		}
+
+		public long? SafeTransactionFileReaderJoinPosition {
+			get { return _safeTransactionFileReaderJoinPosition; }
+		}
+
+		public float Progress {
+			get { return _progress; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.ReaderSubscription)]
+	public partial class Faulted : SubscriptionMessage {
+		private readonly string _reason;
+
+		public Faulted(
+			Guid correlationId, string reason, object source = null)
+			: base(correlationId, null, source) {
+			_reason = reason;
+		}
+
+		public string Reason {
+			get { return _reason; }
+		}
+	}
+
+	[DerivedMessage(ProjectionMessage.ReaderSubscription)]
+	public partial class ReportProgress : SubscriptionMessage {
+		public ReportProgress(Guid correlationId, object source = null) : base(correlationId, null, source) { }
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Messaging/PublishToWrapEnvelop.cs b/src/KurrentDB.Projections.Core/Messaging/PublishToWrapEnvelop.cs
new file mode 100644
index 00000000000..f87fecb61b9
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messaging/PublishToWrapEnvelop.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+
+namespace KurrentDB.Projections.Core.Messaging;
+
+class PublishToWrapEnvelop : IEnvelope {
+	private readonly IPublisher _publisher;
+	private readonly IEnvelope _nestedEnevelop;
+
+	public PublishToWrapEnvelop(IPublisher publisher, IEnvelope nestedEnevelop) {
+		_publisher = publisher;
+		_nestedEnevelop = nestedEnevelop;
+	}
+
+	public void ReplyWith<T>(T message) where T : Message {
+		_publisher.Publish(new UnwrapEnvelopeMessage(() => _nestedEnevelop.ReplyWith(message)));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Messaging/UnwrapEnvelopeHandler.cs b/src/KurrentDB.Projections.Core/Messaging/UnwrapEnvelopeHandler.cs
new file mode 100644
index 00000000000..532f6bda742
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messaging/UnwrapEnvelopeHandler.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Bus;
+
+namespace KurrentDB.Projections.Core.Messaging;
+
+public class UnwrapEnvelopeHandler : IHandle<UnwrapEnvelopeMessage> {
+	public void Handle(UnwrapEnvelopeMessage message) {
+		message.Action();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Messaging/UnwrapEnvelopeMessage.cs b/src/KurrentDB.Projections.Core/Messaging/UnwrapEnvelopeMessage.cs
new file mode 100644
index 00000000000..1360d3d1b59
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Messaging/UnwrapEnvelopeMessage.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Projections.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Messaging;
+
+[DerivedMessage(ProjectionMessage.Misc)]
+public partial class UnwrapEnvelopeMessage : Message {
+	private readonly Action _action;
+
+	public UnwrapEnvelopeMessage(Action action) {
+		_action = action;
+	}
+
+	public Action Action {
+		get { return _action; }
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Metrics/IProjectionTracker.cs b/src/KurrentDB.Projections.Core/Metrics/IProjectionTracker.cs
new file mode 100644
index 00000000000..854f75b31d6
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Metrics/IProjectionTracker.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services;
+
+namespace KurrentDB.Projections.Core.Metrics;
+
+public interface IProjectionTracker {
+	void OnNewStats(ProjectionStatistics[] newStats);
+
+	public static IProjectionTracker NoOp => NoOpTracker.Instance;
+}
+
+file sealed class NoOpTracker : IProjectionTracker {
+	public static NoOpTracker Instance { get; } = new();
+
+	public void OnNewStats(ProjectionStatistics[] newStats) { }
+}
diff --git a/src/EventStore.Projections.Core/Metrics/ProjectionTracker.cs b/src/KurrentDB.Projections.Core/Metrics/ProjectionTracker.cs
similarity index 86%
rename from src/EventStore.Projections.Core/Metrics/ProjectionTracker.cs
rename to src/KurrentDB.Projections.Core/Metrics/ProjectionTracker.cs
index 7e0817b7edd..64d688bab11 100644
--- a/src/EventStore.Projections.Core/Metrics/ProjectionTracker.cs
+++ b/src/KurrentDB.Projections.Core/Metrics/ProjectionTracker.cs
@@ -1,10 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Metrics;
 using System.Linq;
-using EventStore.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services;
 
-namespace EventStore.Projections.Core.Metrics;
+namespace KurrentDB.Projections.Core.Metrics;
 
 public class ProjectionTracker : IProjectionTracker {
 	private ProjectionStatistics[] _currentStats = [];
diff --git a/src/EventStore.Projections.Core/Prelude/1Prelude.js b/src/KurrentDB.Projections.Core/Prelude/1Prelude.js
similarity index 100%
rename from src/EventStore.Projections.Core/Prelude/1Prelude.js
rename to src/KurrentDB.Projections.Core/Prelude/1Prelude.js
diff --git a/src/EventStore.Projections.Core/Prelude/Modules.js b/src/KurrentDB.Projections.Core/Prelude/Modules.js
similarity index 100%
rename from src/EventStore.Projections.Core/Prelude/Modules.js
rename to src/KurrentDB.Projections.Core/Prelude/Modules.js
diff --git a/src/EventStore.Projections.Core/Prelude/ModulesExecuted.js b/src/KurrentDB.Projections.Core/Prelude/ModulesExecuted.js
similarity index 100%
rename from src/EventStore.Projections.Core/Prelude/ModulesExecuted.js
rename to src/KurrentDB.Projections.Core/Prelude/ModulesExecuted.js
diff --git a/src/EventStore.Projections.Core/Prelude/Projections.js b/src/KurrentDB.Projections.Core/Prelude/Projections.js
similarity index 100%
rename from src/EventStore.Projections.Core/Prelude/Projections.js
rename to src/KurrentDB.Projections.Core/Prelude/Projections.js
diff --git a/src/KurrentDB.Projections.Core/ProjectionCoreWorkersNode.cs b/src/KurrentDB.Projections.Core/ProjectionCoreWorkersNode.cs
new file mode 100644
index 00000000000..954ce55dc54
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/ProjectionCoreWorkersNode.cs
@@ -0,0 +1,123 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using KurrentDB.Common.Options;
+using KurrentDB.Core;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Messages.EventReaders.Feeds;
+using KurrentDB.Projections.Core.Messaging;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+
+namespace KurrentDB.Projections.Core;
+
+public static class ProjectionCoreWorkersNode {
+	public static Dictionary<Guid, CoreWorker> CreateCoreWorkers(
+		StandardComponents standardComponents,
+		ProjectionsStandardComponents projectionsStandardComponents) {
+		var coreWorkers = new Dictionary<Guid, CoreWorker>();
+		while (coreWorkers.Count < projectionsStandardComponents.ProjectionWorkerThreadCount) {
+			var coreInputBus = new InMemoryBus("bus");
+			var coreInputQueue = new QueuedHandlerThreadPool(coreInputBus,
+				"Projection Core #" + coreWorkers.Count,
+				standardComponents.QueueStatsManager,
+				standardComponents.QueueTrackers,
+				groupName: "Projection Core");
+			var coreOutputBus = new InMemoryBus("output bus");
+			var coreOutputQueue = new QueuedHandlerThreadPool(coreOutputBus,
+				"Projection Core #" + coreWorkers.Count + " output",
+				standardComponents.QueueStatsManager,
+				standardComponents.QueueTrackers,
+				groupName: "Projection Core");
+			var workerId = Guid.NewGuid();
+			var projectionNode = new ProjectionWorkerNode(
+				workerId,
+				standardComponents.DbConfig,
+				inputQueue: coreInputQueue,
+				outputQueue: coreOutputQueue,
+				coreOutputBus,
+				standardComponents.TimeProvider,
+				projectionsStandardComponents.RunProjections,
+				projectionsStandardComponents.FaultOutOfOrderProjections,
+				projectionsStandardComponents.LeaderOutputQueue,
+				projectionsStandardComponents);
+			projectionNode.SetupMessaging(coreInputBus);
+
+			var forwarder = new RequestResponseQueueForwarder(
+				inputQueue: coreInputQueue,
+				externalRequestQueue: standardComponents.MainQueue);
+			// forwarded messages
+			var coreOutput = projectionNode.CoreOutputBus;
+			coreOutput.Subscribe<ClientMessage.ReadEvent>(forwarder);
+			coreOutput.Subscribe<ClientMessage.ReadStreamEventsBackward>(forwarder);
+			coreOutput.Subscribe<ClientMessage.ReadStreamEventsForward>(forwarder);
+			coreOutput.Subscribe<ClientMessage.ReadAllEventsForward>(forwarder);
+			coreOutput.Subscribe<ClientMessage.WriteEvents>(forwarder);
+			coreOutput.Subscribe<ClientMessage.DeleteStream>(forwarder);
+			coreOutput.Subscribe<ProjectionCoreServiceMessage.SubComponentStarted>(forwarder);
+			coreOutput.Subscribe<ProjectionCoreServiceMessage.SubComponentStopped>(forwarder);
+
+			if (projectionsStandardComponents.RunProjections >= ProjectionType.System) {
+				coreOutput.Subscribe(
+					Forwarder.Create<AwakeServiceMessage.SubscribeAwake>(standardComponents.MainQueue));
+				coreOutput.Subscribe(
+					Forwarder.Create<AwakeServiceMessage.UnsubscribeAwake>(standardComponents.MainQueue));
+				coreOutput.Subscribe(
+					Forwarder.Create<ProjectionSubsystemMessage.IODispatcherDrained>(projectionsStandardComponents
+						.LeaderOutputQueue));
+			}
+
+			coreOutput.Subscribe<TimerMessage.Schedule>(standardComponents.TimerService);
+
+			coreOutput.Subscribe(Forwarder.Create<Message>(coreInputQueue)); // forward all
+
+			coreInputBus.Subscribe(new UnwrapEnvelopeHandler());
+
+			coreWorkers.Add(workerId, new CoreWorker(workerId, coreInputQueue, coreOutputQueue));
+		}
+
+		var queues = coreWorkers.Select(v => v.Value.CoreInputQueue).ToArray();
+		var coordinator = new ProjectionCoreCoordinator(
+			projectionsStandardComponents.RunProjections,
+			queues,
+			projectionsStandardComponents.LeaderOutputQueue);
+
+		coordinator.SetupMessaging(projectionsStandardComponents.LeaderInputBus);
+		projectionsStandardComponents.LeaderInputBus.Subscribe(
+			Forwarder.CreateBalancing<FeedReaderMessage.ReadPage>(coreWorkers
+				.Select(x => x.Value.CoreInputQueue)
+				.ToArray()));
+		return coreWorkers;
+	}
+}
+
+public class CoreWorker {
+	public Guid WorkerId { get; }
+	public IQueuedHandler CoreInputQueue { get; }
+	public IQueuedHandler CoreOutputQueue { get; }
+
+	public CoreWorker(Guid workerId, IQueuedHandler inputQueue, IQueuedHandler outputQueue) {
+		WorkerId = workerId;
+		CoreInputQueue = inputQueue;
+		CoreOutputQueue = outputQueue;
+	}
+
+	public void Start() {
+		CoreInputQueue.Start();
+		CoreOutputQueue.Start();
+	}
+
+	public async Task Stop() {
+		await CoreInputQueue.Stop();
+		await CoreOutputQueue.Stop();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/ProjectionManagerNode.cs b/src/KurrentDB.Projections.Core/ProjectionManagerNode.cs
new file mode 100644
index 00000000000..588cf600533
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/ProjectionManagerNode.cs
@@ -0,0 +1,165 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Common.Options;
+using KurrentDB.Core;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Messaging;
+using KurrentDB.Projections.Core.Metrics;
+using KurrentDB.Projections.Core.Services.Http;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+using IODispatcherDelayedMessage = KurrentDB.Core.Helpers.IODispatcherDelayedMessage;
+using TelemetryMessage = KurrentDB.Core.Telemetry.TelemetryMessage;
+
+namespace KurrentDB.Projections.Core;
+
+public class ProjectionManagerNode {
+	public static void CreateManagerService(
+		StandardComponents standardComponents,
+		ProjectionsStandardComponents projectionsStandardComponents,
+		IDictionary<Guid, IPublisher> queues,
+		TimeSpan projectionQueryExpiry,
+		IProjectionTracker projectionTracker) {
+		IPublisher inputQueue = projectionsStandardComponents.LeaderInputQueue;
+		IPublisher outputQueue = projectionsStandardComponents.LeaderOutputQueue;
+		var ioDispatcher = new IODispatcher(outputQueue, inputQueue, true);
+
+		var projectionsController = new ProjectionsController(
+			standardComponents.HttpForwarder,
+			inputQueue,
+			standardComponents.NetworkSendService);
+
+		var forwarder = new RequestResponseQueueForwarder(
+			inputQueue: projectionsStandardComponents.LeaderInputQueue,
+			externalRequestQueue: standardComponents.MainQueue);
+
+		if (projectionsStandardComponents.RunProjections != ProjectionType.None) {
+			foreach (var httpService in standardComponents.HttpServices) {
+				httpService.SetupController(projectionsController);
+			}
+		}
+
+		var projectionManagerMessageDispatcher = new ProjectionManagerMessageDispatcher(queues);
+
+		var projectionManager = new ProjectionManager(
+			inputQueue,
+			outputQueue,
+			queues,
+			new RealTimeProvider(),
+			projectionsStandardComponents.RunProjections,
+			ioDispatcher,
+			projectionQueryExpiry,
+			projectionTracker);
+
+		SubscribeMainBus(
+			projectionsStandardComponents.LeaderInputBus,
+			projectionManager,
+			projectionsStandardComponents.RunProjections,
+			ioDispatcher,
+			projectionManagerMessageDispatcher);
+
+
+		SubscribeOutputBus(standardComponents, projectionsStandardComponents, forwarder, ioDispatcher);
+	}
+
+	private static void SubscribeMainBus(
+		ISubscriber mainBus,
+		ProjectionManager projectionManager,
+		ProjectionType runProjections,
+		IODispatcher ioDispatcher,
+		ProjectionManagerMessageDispatcher projectionManagerMessageDispatcher) {
+		if (runProjections >= ProjectionType.System) {
+			mainBus.Subscribe<ProjectionManagementMessage.Command.Post>(projectionManager);
+			mainBus.Subscribe<ProjectionManagementMessage.Command.PostBatch>(projectionManager);
+			mainBus.Subscribe<ProjectionManagementMessage.Command.UpdateQuery>(projectionManager);
+			mainBus.Subscribe<ProjectionManagementMessage.Command.GetQuery>(projectionManager);
+			mainBus.Subscribe<ProjectionManagementMessage.Command.Delete>(projectionManager);
+			mainBus.Subscribe<ProjectionManagementMessage.Command.GetStatistics>(projectionManager);
+			mainBus.Subscribe<ProjectionManagementMessage.Command.GetState>(projectionManager);
+			mainBus.Subscribe<ProjectionManagementMessage.Command.GetResult>(projectionManager);
+			mainBus.Subscribe<ProjectionManagementMessage.Command.Disable>(projectionManager);
+			mainBus.Subscribe<ProjectionManagementMessage.Command.Enable>(projectionManager);
+			mainBus.Subscribe<ProjectionManagementMessage.Command.Abort>(projectionManager);
+			mainBus.Subscribe<ProjectionManagementMessage.Command.SetRunAs>(projectionManager);
+			mainBus.Subscribe<ProjectionManagementMessage.Command.Reset>(projectionManager);
+			mainBus.Subscribe<ProjectionManagementMessage.Command.GetConfig>(projectionManager);
+			mainBus.Subscribe<ProjectionManagementMessage.Command.UpdateConfig>(projectionManager);
+			mainBus.Subscribe<ProjectionManagementMessage.Internal.CleanupExpired>(projectionManager);
+			mainBus.Subscribe<ProjectionManagementMessage.Internal.Deleted>(projectionManager);
+			mainBus.Subscribe<CoreProjectionStatusMessage.Started>(projectionManager);
+			mainBus.Subscribe<CoreProjectionStatusMessage.Stopped>(projectionManager);
+			mainBus.Subscribe<CoreProjectionStatusMessage.Faulted>(projectionManager);
+			mainBus.Subscribe<CoreProjectionStatusMessage.Prepared>(projectionManager);
+			mainBus.Subscribe<CoreProjectionStatusMessage.StateReport>(projectionManager);
+			mainBus.Subscribe<CoreProjectionStatusMessage.ResultReport>(projectionManager);
+			mainBus.Subscribe<CoreProjectionStatusMessage.StatisticsReport>(projectionManager);
+			mainBus.Subscribe<ProjectionSubsystemMessage.StartComponents>(projectionManager);
+			mainBus.Subscribe<ProjectionSubsystemMessage.StopComponents>(projectionManager);
+		}
+
+		mainBus.Subscribe<ClientMessage.WriteEventsCompleted>(projectionManager);
+		mainBus.Subscribe<ClientMessage.DeleteStreamCompleted>(projectionManager);
+		mainBus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(projectionManager);
+		mainBus.Subscribe<ClientMessage.ReadStreamEventsForwardCompleted>(projectionManager);
+		mainBus.Subscribe<TelemetryMessage.Request>(projectionManager);
+
+		mainBus.Subscribe(ioDispatcher.Awaker);
+		mainBus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(ioDispatcher.BackwardReader);
+		mainBus.Subscribe<ClientMessage.NotHandled>(ioDispatcher.BackwardReader);
+		mainBus.Subscribe(ioDispatcher.ForwardReader);
+		mainBus.Subscribe(ioDispatcher.StreamDeleter);
+		mainBus.Subscribe(ioDispatcher.Writer);
+		mainBus.Subscribe(ioDispatcher.EventReader);
+		mainBus.Subscribe<IODispatcherDelayedMessage>(ioDispatcher);
+		mainBus.Subscribe<ClientMessage.NotHandled>(ioDispatcher);
+
+		mainBus.Subscribe(projectionManagerMessageDispatcher);
+	}
+
+	private static void SubscribeOutputBus(
+		StandardComponents standardComponents,
+		ProjectionsStandardComponents projectionsStandardComponents,
+		RequestResponseQueueForwarder forwarder,
+		IODispatcher ioDispatcher) {
+		var managerOutput = projectionsStandardComponents.LeaderOutputBus;
+		managerOutput.Subscribe<ClientMessage.ReadEvent>(forwarder);
+		managerOutput.Subscribe<ClientMessage.ReadStreamEventsBackward>(forwarder);
+		managerOutput.Subscribe<ClientMessage.ReadStreamEventsForward>(forwarder);
+		managerOutput.Subscribe<ClientMessage.WriteEvents>(forwarder);
+		managerOutput.Subscribe<ClientMessage.DeleteStream>(forwarder);
+		managerOutput.Subscribe(Forwarder.Create<Message>(projectionsStandardComponents.LeaderInputQueue));
+		managerOutput.Subscribe<ClientMessage.NotHandled>(ioDispatcher);
+
+		managerOutput.Subscribe<TimerMessage.Schedule>(standardComponents.TimerService);
+		managerOutput.Subscribe(Forwarder.Create<AwakeServiceMessage.SubscribeAwake>(standardComponents.MainQueue));
+		managerOutput.Subscribe(
+			Forwarder.Create<AwakeServiceMessage.UnsubscribeAwake>(standardComponents.MainQueue));
+		managerOutput.Subscribe<SystemMessage.SubSystemInitialized>(forwarder);
+
+		// self forward all
+		standardComponents.MainBus.Subscribe(
+			Forwarder.Create<SystemMessage.StateChangeMessage>(projectionsStandardComponents.LeaderInputQueue));
+		standardComponents.MainBus.Subscribe(
+			Forwarder.Create<SystemMessage.SystemCoreReady>(projectionsStandardComponents.LeaderInputQueue));
+		standardComponents.MainBus.Subscribe(
+			Forwarder.Create<SystemMessage.EpochWritten>(projectionsStandardComponents.LeaderInputQueue));
+		standardComponents.MainBus.Subscribe(
+			Forwarder.Create<ProjectionCoreServiceMessage.SubComponentStarted>(projectionsStandardComponents
+				.LeaderInputQueue));
+		standardComponents.MainBus.Subscribe(
+			Forwarder.Create<ProjectionCoreServiceMessage.SubComponentStopped>(projectionsStandardComponents
+				.LeaderInputQueue));
+		standardComponents.MainBus.Subscribe(
+			Forwarder.Create<TelemetryMessage.Request>(projectionsStandardComponents.LeaderInputQueue));
+		projectionsStandardComponents.LeaderInputBus.Subscribe(new UnwrapEnvelopeHandler());
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/ProjectionWorkerNode.cs b/src/KurrentDB.Projections.Core/ProjectionWorkerNode.cs
new file mode 100644
index 00000000000..7bff2469b0b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/ProjectionWorkerNode.cs
@@ -0,0 +1,160 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Options;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.TransactionLog.Chunks;
+using KurrentDB.Projections.Core.EventReaders.Feeds;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using IODispatcherDelayedMessage = KurrentDB.Core.Helpers.IODispatcherDelayedMessage;
+
+namespace KurrentDB.Projections.Core;
+
+public class ProjectionWorkerNode {
+	private readonly ProjectionType _runProjections;
+	private readonly ProjectionCoreService _projectionCoreService;
+	private readonly ISubscriber _coreOutputBus;
+	private readonly EventReaderCoreService _eventReaderCoreService;
+
+	private readonly ReaderSubscriptionDispatcher _subscriptionDispatcher;
+
+	private readonly FeedReaderService _feedReaderService;
+	private readonly IODispatcher _ioDispatcher;
+	private readonly IPublisher _leaderOutputQueue;
+
+	public ProjectionWorkerNode(
+		Guid workerId,
+		TFChunkDbConfig dbConfig,
+		IPublisher inputQueue,
+		IPublisher outputQueue,
+		ISubscriber outputBus,
+		ITimeProvider timeProvider,
+		ProjectionType runProjections,
+		bool faultOutOfOrderProjections,
+		IPublisher leaderOutputQueue,
+		ProjectionsStandardComponents configuration) {
+		_runProjections = runProjections;
+		Ensure.NotNull(dbConfig, "dbConfig");
+
+		_leaderOutputQueue = leaderOutputQueue;
+		_coreOutputBus = outputBus;
+
+		_subscriptionDispatcher = new ReaderSubscriptionDispatcher(outputQueue);
+
+		_ioDispatcher = new IODispatcher(outputQueue, inputQueue, true);
+		_eventReaderCoreService = new EventReaderCoreService(
+			outputQueue,
+			_ioDispatcher,
+			10,
+			dbConfig.WriterCheckpoint,
+			runHeadingReader: runProjections >= ProjectionType.System,
+			faultOutOfOrderProjections: faultOutOfOrderProjections);
+
+		_feedReaderService = new FeedReaderService(_subscriptionDispatcher, timeProvider);
+		if (runProjections >= ProjectionType.System) {
+			_projectionCoreService = new ProjectionCoreService(
+				workerId,
+				inputQueue,
+				outputQueue,
+				_subscriptionDispatcher,
+				timeProvider,
+				_ioDispatcher,
+				configuration);
+		}
+	}
+
+	public ISubscriber CoreOutputBus {
+		get { return _coreOutputBus; }
+	}
+
+	public void SetupMessaging(ISubscriber coreInputBus) {
+		coreInputBus.Subscribe(_subscriptionDispatcher
+			.CreateSubscriber<EventReaderSubscriptionMessage.CheckpointSuggested>());
+		coreInputBus.Subscribe(_subscriptionDispatcher
+			.CreateSubscriber<EventReaderSubscriptionMessage.CommittedEventReceived>());
+		coreInputBus.Subscribe(
+			_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.EofReached>());
+		coreInputBus.Subscribe(_subscriptionDispatcher
+			.CreateSubscriber<EventReaderSubscriptionMessage.PartitionEofReached>());
+		coreInputBus.Subscribe(_subscriptionDispatcher
+			.CreateSubscriber<EventReaderSubscriptionMessage.PartitionDeleted>());
+		coreInputBus.Subscribe(_subscriptionDispatcher
+			.CreateSubscriber<EventReaderSubscriptionMessage.ProgressChanged>());
+		coreInputBus.Subscribe(_subscriptionDispatcher
+			.CreateSubscriber<EventReaderSubscriptionMessage.SubscriptionStarted>());
+		coreInputBus.Subscribe(_subscriptionDispatcher
+			.CreateSubscriber<EventReaderSubscriptionMessage.NotAuthorized>());
+		coreInputBus.Subscribe(_subscriptionDispatcher
+			.CreateSubscriber<EventReaderSubscriptionMessage.ReaderAssignedReader>());
+		coreInputBus.Subscribe(_subscriptionDispatcher
+			.CreateSubscriber<EventReaderSubscriptionMessage.SubscribeTimeout>());
+		coreInputBus.Subscribe(_subscriptionDispatcher.CreateSubscriber<EventReaderSubscriptionMessage.Failed>());
+
+		coreInputBus.Subscribe(_feedReaderService);
+
+		if (_runProjections >= ProjectionType.System) {
+			coreInputBus.Subscribe<ProjectionCoreServiceMessage.StartCore>(_projectionCoreService);
+			coreInputBus.Subscribe<ProjectionCoreServiceMessage.StopCore>(_projectionCoreService);
+			coreInputBus.Subscribe<ProjectionCoreServiceMessage.StopCoreTimeout>(_projectionCoreService);
+			coreInputBus.Subscribe<ProjectionCoreServiceMessage.CoreTick>(_projectionCoreService);
+			coreInputBus.Subscribe<CoreProjectionManagementMessage.CreateAndPrepare>(_projectionCoreService);
+			coreInputBus.Subscribe<CoreProjectionManagementMessage.CreatePrepared>(_projectionCoreService);
+			coreInputBus.Subscribe<CoreProjectionManagementMessage.Dispose>(_projectionCoreService);
+			coreInputBus.Subscribe<CoreProjectionManagementMessage.Start>(_projectionCoreService);
+			coreInputBus.Subscribe<CoreProjectionManagementMessage.LoadStopped>(_projectionCoreService);
+			coreInputBus.Subscribe<CoreProjectionManagementMessage.Stop>(_projectionCoreService);
+			coreInputBus.Subscribe<CoreProjectionManagementMessage.Kill>(_projectionCoreService);
+			coreInputBus.Subscribe<CoreProjectionManagementMessage.GetState>(_projectionCoreService);
+			coreInputBus.Subscribe<CoreProjectionManagementMessage.GetResult>(_projectionCoreService);
+			coreInputBus.Subscribe<ClientMessage.ReadStreamEventsForwardCompleted>(_ioDispatcher.ForwardReader);
+			coreInputBus.Subscribe<ClientMessage.ReadStreamEventsBackwardCompleted>(_ioDispatcher.BackwardReader);
+			coreInputBus.Subscribe<ClientMessage.NotHandled>(_ioDispatcher.BackwardReader);
+			coreInputBus.Subscribe<ClientMessage.ReadEventCompleted>(_ioDispatcher.EventReader);
+			coreInputBus.Subscribe<ClientMessage.WriteEventsCompleted>(_ioDispatcher.Writer);
+			coreInputBus.Subscribe<ClientMessage.DeleteStreamCompleted>(_ioDispatcher.StreamDeleter);
+			coreInputBus.Subscribe<IODispatcherDelayedMessage>(_ioDispatcher.Awaker);
+			coreInputBus.Subscribe<IODispatcherDelayedMessage>(_ioDispatcher);
+			coreInputBus.Subscribe<ClientMessage.NotHandled>(_ioDispatcher);
+			coreInputBus.Subscribe<CoreProjectionProcessingMessage.CheckpointCompleted>(_projectionCoreService);
+			coreInputBus.Subscribe<CoreProjectionProcessingMessage.CheckpointLoaded>(_projectionCoreService);
+			coreInputBus.Subscribe<CoreProjectionProcessingMessage.PrerecordedEventsLoaded>(_projectionCoreService);
+			coreInputBus.Subscribe<CoreProjectionProcessingMessage.RestartRequested>(_projectionCoreService);
+			coreInputBus.Subscribe<CoreProjectionProcessingMessage.Failed>(_projectionCoreService);
+			coreInputBus.Subscribe<CoreProjectionStatusMessage.Suspended>(_projectionCoreService);
+			//NOTE: message forwarding is set up outside (for Read/Write events)
+
+			// Forward messages back to projection manager
+			coreInputBus.Subscribe(
+				Forwarder.Create<ProjectionManagementMessage.Command.ControlMessage>(_leaderOutputQueue));
+			coreInputBus.Subscribe(
+				Forwarder.Create<CoreProjectionStatusMessage.CoreProjectionStatusMessageBase>(_leaderOutputQueue));
+			coreInputBus.Subscribe(
+				Forwarder.Create<CoreProjectionStatusMessage.DataReportBase>(_leaderOutputQueue));
+		}
+
+		coreInputBus.Subscribe<ReaderCoreServiceMessage.StartReader>(_eventReaderCoreService);
+		coreInputBus.Subscribe<ReaderCoreServiceMessage.StopReader>(_eventReaderCoreService);
+		coreInputBus.Subscribe<ReaderSubscriptionManagement.Subscribe>(_eventReaderCoreService);
+		coreInputBus.Subscribe<ReaderSubscriptionManagement.Unsubscribe>(_eventReaderCoreService);
+		coreInputBus.Subscribe<ReaderSubscriptionManagement.Pause>(_eventReaderCoreService);
+		coreInputBus.Subscribe<ReaderSubscriptionManagement.Resume>(_eventReaderCoreService);
+		coreInputBus.Subscribe<ReaderSubscriptionMessage.CommittedEventDistributed>(_eventReaderCoreService);
+		coreInputBus.Subscribe<ReaderSubscriptionMessage.EventReaderIdle>(_eventReaderCoreService);
+		coreInputBus.Subscribe<ReaderSubscriptionMessage.EventReaderStarting>(_eventReaderCoreService);
+		coreInputBus.Subscribe<ReaderSubscriptionMessage.EventReaderEof>(_eventReaderCoreService);
+		coreInputBus.Subscribe<ReaderSubscriptionMessage.EventReaderPartitionEof>(_eventReaderCoreService);
+		coreInputBus.Subscribe<ReaderSubscriptionMessage.EventReaderPartitionDeleted>(_eventReaderCoreService);
+		coreInputBus.Subscribe<ReaderSubscriptionMessage.EventReaderNotAuthorized>(_eventReaderCoreService);
+		coreInputBus.Subscribe<ReaderSubscriptionMessage.Faulted>(_eventReaderCoreService);
+		coreInputBus.Subscribe<ReaderSubscriptionMessage.ReportProgress>(_eventReaderCoreService);
+		//NOTE: message forwarding is set up outside (for Read/Write events)
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/ProjectionsStandardComponents.cs b/src/KurrentDB.Projections.Core/ProjectionsStandardComponents.cs
new file mode 100644
index 00000000000..8c181457b4f
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/ProjectionsStandardComponents.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Bus;
+
+namespace KurrentDB.Projections.Core;
+
+public class ProjectionsStandardComponents {
+	public ProjectionsStandardComponents(
+		int projectionWorkerThreadCount,
+		ProjectionType runProjections,
+		ISubscriber leaderOutputBus,
+		IPublisher leaderOutputQueue,
+		ISubscriber leaderInputBus,
+		IPublisher leaderInputQueue,
+		bool faultOutOfOrderProjections, int projectionCompilationTimeout, int projectionExecutionTimeout,
+		int maxProjectionStateSize) {
+		ProjectionWorkerThreadCount = projectionWorkerThreadCount;
+		RunProjections = runProjections;
+		LeaderOutputBus = leaderOutputBus;
+		LeaderOutputQueue = leaderOutputQueue;
+		LeaderInputQueue = leaderInputQueue;
+		LeaderInputBus = leaderInputBus;
+		FaultOutOfOrderProjections = faultOutOfOrderProjections;
+		ProjectionCompilationTimeout = projectionCompilationTimeout;
+		ProjectionExecutionTimeout = projectionExecutionTimeout;
+		MaxProjectionStateSize = maxProjectionStateSize;
+	}
+
+	public int ProjectionWorkerThreadCount { get; }
+
+	public ProjectionType RunProjections { get; }
+
+	public ISubscriber LeaderOutputBus { get; }
+	public IPublisher LeaderOutputQueue { get; }
+
+	public IPublisher LeaderInputQueue { get; }
+	public ISubscriber LeaderInputBus { get; }
+
+	public bool FaultOutOfOrderProjections { get; }
+
+	public int ProjectionCompilationTimeout { get; }
+
+	public int ProjectionExecutionTimeout { get; }
+
+	public int MaxProjectionStateSize { get; }
+}
diff --git a/src/KurrentDB.Projections.Core/ProjectionsSubsystem.cs b/src/KurrentDB.Projections.Core/ProjectionsSubsystem.cs
new file mode 100644
index 00000000000..7f1890db16d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/ProjectionsSubsystem.cs
@@ -0,0 +1,441 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Metrics;
+using System.Linq;
+using System.Threading.Tasks;
+using DotNext;
+using EventStore.Plugins.Authorization;
+using EventStore.Plugins.Subsystems;
+using EventStore.Projections.Core.Services.Grpc;
+using KurrentDB.Common.Configuration;
+using KurrentDB.Common.Options;
+using KurrentDB.Core;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.AwakeReaderService;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Metrics;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Serilog;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Projections.Core;
+
+public record ProjectionSubsystemOptions(
+	int ProjectionWorkerThreadCount,
+	ProjectionType RunProjections,
+	bool StartStandardProjections,
+	TimeSpan ProjectionQueryExpiry,
+	bool FaultOutOfOrderProjections,
+	int CompilationTimeout,
+	int ExecutionTimeout,
+	int MaxProjectionStateSize);
+
+public sealed class ProjectionsSubsystem : ISubsystem,
+	IHandle<SystemMessage.SystemCoreReady>,
+	IHandle<SystemMessage.StateChangeMessage>,
+	IHandle<CoreProjectionStatusMessage.Stopped>,
+	IHandle<CoreProjectionStatusMessage.Started>,
+	IHandle<ProjectionSubsystemMessage.RestartSubsystem>,
+	IHandle<ProjectionSubsystemMessage.ComponentStarted>,
+	IHandle<ProjectionSubsystemMessage.ComponentStopped>,
+	IHandle<ProjectionSubsystemMessage.IODispatcherDrained> {
+
+	static readonly ILogger Logger = Log.ForContext<ProjectionsSubsystem>();
+
+	public const int VERSION = 4;
+	public const int CONTENT_TYPE_VALIDATION_VERSION = 4;
+
+	private readonly int _projectionWorkerThreadCount;
+	private readonly ProjectionType _runProjections;
+	private readonly bool _startStandardProjections;
+	private readonly TimeSpan _projectionsQueryExpiry;
+
+	private readonly InMemoryBus _leaderInputBus;
+	private readonly InMemoryBus _leaderOutputBus;
+
+	private IQueuedHandler _leaderInputQueue;
+	private IQueuedHandler _leaderOutputQueue;
+
+	private IDictionary<Guid, CoreWorker> _coreWorkers;
+	private Dictionary<Guid, IPublisher> _queueMap;
+	private bool _subsystemStarted;
+	private readonly TaskCompletionSource _subsystemInitialized;
+
+	private readonly bool _faultOutOfOrderProjections;
+
+	private readonly int _compilationTimeout;
+	private readonly int _executionTimeout;
+	private readonly int _maxProjectionStateSize;
+
+	private readonly int _componentCount;
+	private readonly int _dispatcherCount;
+	private bool _restarting;
+	private int _pendingComponentStarts;
+	private int _runningComponentCount;
+	private int _runningDispatchers;
+
+	private VNodeState _nodeState;
+	private SubsystemState _subsystemState = SubsystemState.NotReady;
+	private Guid _instanceCorrelationId;
+	private IProjectionTracker _projectionTracker = IProjectionTracker.NoOp;
+
+	private readonly List<string> _standardProjections = new List<string> {
+		"$by_category",
+		"$stream_by_category",
+		"$streams",
+		"$by_event_type",
+		"$by_correlation_id"
+	};
+
+	public ProjectionsSubsystem(ProjectionSubsystemOptions projectionSubsystemOptions) {
+		if (projectionSubsystemOptions.RunProjections <= ProjectionType.System)
+			_projectionWorkerThreadCount = 1;
+		else
+			_projectionWorkerThreadCount = projectionSubsystemOptions.ProjectionWorkerThreadCount;
+
+		_runProjections = projectionSubsystemOptions.RunProjections;
+		// Projection manager & Projection Core Coordinator
+		// The manager only starts when projections are running
+		_componentCount = _runProjections == ProjectionType.None ? 1 : 2;
+
+		// Projection manager & each projection core worker
+		_dispatcherCount = 1 + _projectionWorkerThreadCount;
+
+		_startStandardProjections = projectionSubsystemOptions.StartStandardProjections;
+		_projectionsQueryExpiry = projectionSubsystemOptions.ProjectionQueryExpiry;
+		_faultOutOfOrderProjections = projectionSubsystemOptions.FaultOutOfOrderProjections;
+
+		_leaderInputBus = new InMemoryBus("manager input bus");
+		_leaderOutputBus = new InMemoryBus("ProjectionManagerAndCoreCoordinatorOutput");
+
+		_subsystemInitialized = new();
+		_executionTimeout = projectionSubsystemOptions.ExecutionTimeout;
+		_compilationTimeout = projectionSubsystemOptions.CompilationTimeout;
+		_maxProjectionStateSize = projectionSubsystemOptions.MaxProjectionStateSize;
+	}
+
+	public IPublisher LeaderOutputQueue => _leaderOutputQueue;
+	public IPublisher LeaderInputQueue => _leaderInputQueue;
+	public ISubscriber LeaderOutputBus => _leaderOutputBus;
+	public ISubscriber LeaderInputBus => _leaderInputBus;
+
+	public string Name => "Projections";
+	public string DiagnosticsName => Name;
+	public KeyValuePair<string, object>[] DiagnosticsTags => [];
+	public string Version => VERSION.ToString();
+	public bool Enabled => true;
+	public string LicensePublicKey => string.Empty;
+
+	public void ConfigureApplication(IApplicationBuilder builder, IConfiguration configuration) {
+		var standardComponents = builder.ApplicationServices.GetRequiredService<StandardComponents>();
+
+		_leaderInputQueue = new QueuedHandlerThreadPool(
+			_leaderInputBus,
+			"Projections Leader",
+			standardComponents.QueueStatsManager,
+			standardComponents.QueueTrackers
+		);
+		_leaderOutputQueue = new QueuedHandlerThreadPool(
+			_leaderOutputBus,
+			"Projections Leader",
+			standardComponents.QueueStatsManager,
+			standardComponents.QueueTrackers
+		);
+
+		LeaderInputBus.Subscribe<ProjectionSubsystemMessage.RestartSubsystem>(this);
+		LeaderInputBus.Subscribe<ProjectionSubsystemMessage.ComponentStarted>(this);
+		LeaderInputBus.Subscribe<ProjectionSubsystemMessage.ComponentStopped>(this);
+		LeaderInputBus.Subscribe<ProjectionSubsystemMessage.IODispatcherDrained>(this);
+		LeaderInputBus.Subscribe<SystemMessage.SystemCoreReady>(this);
+		LeaderInputBus.Subscribe<SystemMessage.StateChangeMessage>(this);
+
+		var projectionsStandardComponents = new ProjectionsStandardComponents(
+			_projectionWorkerThreadCount,
+			_runProjections,
+			leaderOutputBus: _leaderOutputBus,
+			leaderOutputQueue: _leaderOutputQueue,
+			leaderInputBus: _leaderInputBus,
+			leaderInputQueue: _leaderInputQueue,
+			_faultOutOfOrderProjections,
+			_compilationTimeout,
+			_executionTimeout,
+			_maxProjectionStateSize);
+
+		CreateAwakerService(standardComponents);
+		_coreWorkers = ProjectionCoreWorkersNode.CreateCoreWorkers(standardComponents, projectionsStandardComponents);
+		_queueMap = _coreWorkers.ToDictionary(v => v.Key, v => v.Value.CoreInputQueue.As<IPublisher>());
+
+		ConfigureProjectionMetrics(standardComponents.MetricsConfiguration);
+
+		ProjectionManagerNode.CreateManagerService(standardComponents, projectionsStandardComponents, _queueMap,
+			_projectionsQueryExpiry, _projectionTracker);
+		LeaderInputBus.Subscribe<CoreProjectionStatusMessage.Stopped>(this);
+		LeaderInputBus.Subscribe<CoreProjectionStatusMessage.Started>(this);
+
+		builder.UseEndpoints(endpoints => endpoints.MapGrpcService<ProjectionManagement>());
+	}
+
+	private void ConfigureProjectionMetrics(MetricsConfiguration conf) {
+		if (!conf.ProjectionStats)
+			return;
+
+		var projectionMeter = new Meter(conf.ProjectionsMeterName, version: "1.0.0");
+		var serviceName = conf.ServiceName;
+
+		var tracker = new ProjectionTracker();
+		_projectionTracker = tracker;
+
+		projectionMeter.CreateObservableCounter($"{serviceName}-projection-events-processed-after-restart-total", tracker.ObserveEventsProcessed);
+		projectionMeter.CreateObservableUpDownCounter($"{serviceName}-projection-progress", tracker.ObserveProgress);
+		projectionMeter.CreateObservableUpDownCounter($"{serviceName}-projection-running", tracker.ObserveRunning);
+		projectionMeter.CreateObservableUpDownCounter($"{serviceName}-projection-status", tracker.ObserveStatus);
+	}
+
+	public void ConfigureServices(IServiceCollection services, IConfiguration configuration) =>
+		services.AddSingleton(provider => new ProjectionManagement(_leaderInputQueue, provider.GetRequiredService<IAuthorizationProvider>()));
+
+	private static void CreateAwakerService(StandardComponents standardComponents) {
+		var awakeReaderService = new AwakeService();
+		standardComponents.MainBus.Subscribe<StorageMessage.EventCommitted>(awakeReaderService);
+		standardComponents.MainBus.Subscribe<StorageMessage.TfEofAtNonCommitRecord>(awakeReaderService);
+		standardComponents.MainBus.Subscribe<AwakeServiceMessage.SubscribeAwake>(awakeReaderService);
+		standardComponents.MainBus.Subscribe<AwakeServiceMessage.UnsubscribeAwake>(awakeReaderService);
+	}
+
+	public void Handle(SystemMessage.SystemCoreReady message) {
+		if (_subsystemState != SubsystemState.NotReady)
+			return;
+		_subsystemState = SubsystemState.Ready;
+		if (_nodeState == VNodeState.Leader) {
+			StartComponents();
+			return;
+		}
+		if (_nodeState == VNodeState.Follower || _nodeState == VNodeState.ReadOnlyReplica) {
+			PublishInitialized();
+		}
+	}
+
+	public void Handle(SystemMessage.StateChangeMessage message) {
+		_nodeState = message.State;
+		if (_subsystemState == SubsystemState.NotReady)
+			return;
+
+		if (_nodeState == VNodeState.Leader) {
+			StartComponents();
+			return;
+		}
+
+		if (_nodeState == VNodeState.Follower || _nodeState == VNodeState.ReadOnlyReplica) {
+			PublishInitialized();
+		}
+		StopComponents();
+	}
+
+	private void StartComponents() {
+		if (_nodeState != VNodeState.Leader) {
+			Logger.Debug("PROJECTIONS SUBSYSTEM: Not starting because node is not leader. Current node state: {nodeState}",
+				_nodeState);
+			return;
+		}
+		if (_subsystemState != SubsystemState.Ready && _subsystemState != SubsystemState.Stopped) {
+			Logger.Debug("PROJECTIONS SUBSYSTEM: Not starting because system is not ready or stopped. Current Subsystem state: {subsystemState}",
+				_subsystemState);
+			return;
+		}
+		if (_runningComponentCount > 0) {
+			Logger.Warning("PROJECTIONS SUBSYSTEM: Subsystem is stopped, but components are still running.");
+			return;
+		}
+
+		_subsystemState = SubsystemState.Starting;
+		_restarting = false;
+		_instanceCorrelationId = Guid.NewGuid();
+		Logger.Information("PROJECTIONS SUBSYSTEM: Starting components for Instance: {instanceCorrelationId}", _instanceCorrelationId);
+		_pendingComponentStarts = _componentCount;
+		LeaderInputQueue.Publish(new ProjectionSubsystemMessage.StartComponents(_instanceCorrelationId));
+	}
+
+	private void StopComponents() {
+		if (_subsystemState != SubsystemState.Started) {
+			Logger.Debug("PROJECTIONS SUBSYSTEM: Not stopping because subsystem is not in a started state. Current Subsystem state: {state}", _subsystemState);
+			return;
+		}
+
+		Logger.Information("PROJECTIONS SUBSYSTEM: Stopping components for Instance: {instanceCorrelationId}", _instanceCorrelationId);
+		_subsystemState = SubsystemState.Stopping;
+		LeaderInputQueue.Publish(new ProjectionSubsystemMessage.StopComponents(_instanceCorrelationId));
+	}
+
+	public void Handle(ProjectionSubsystemMessage.RestartSubsystem message) {
+		if (_restarting) {
+			var info = "PROJECTIONS SUBSYSTEM: Not restarting because the subsystem is already being restarted.";
+			Logger.Information(info);
+			message.ReplyEnvelope.ReplyWith(new ProjectionSubsystemMessage.InvalidSubsystemRestart("Restarting", info));
+			return;
+		}
+
+		if (_subsystemState != SubsystemState.Started) {
+			var info =
+				$"PROJECTIONS SUBSYSTEM: Not restarting because the subsystem is not started. Current subsystem state: {_subsystemState}";
+			Logger.Information(info);
+			message.ReplyEnvelope.ReplyWith(new ProjectionSubsystemMessage.InvalidSubsystemRestart(_subsystemState.ToString(), info));
+			return;
+		}
+
+		Logger.Information("PROJECTIONS SUBSYSTEM: Restarting subsystem.");
+		_restarting = true;
+		StopComponents();
+		message.ReplyEnvelope.ReplyWith(new ProjectionSubsystemMessage.SubsystemRestarting());
+	}
+
+	public void Handle(ProjectionSubsystemMessage.ComponentStarted message) {
+		if (message.InstanceCorrelationId != _instanceCorrelationId) {
+			Logger.Debug(
+				"PROJECTIONS SUBSYSTEM: Received component started for incorrect instance id. " +
+				"Requested: {requestedCorrelationId} | Current: {instanceCorrelationId}",
+				message.InstanceCorrelationId, _instanceCorrelationId);
+			return;
+		}
+
+		if (_pendingComponentStarts <= 0 || _subsystemState != SubsystemState.Starting)
+			return;
+
+		Logger.Debug("PROJECTIONS SUBSYSTEM: Component '{componentName}' started for Instance: {instanceCorrelationId}",
+			message.ComponentName, message.InstanceCorrelationId);
+		_pendingComponentStarts--;
+		_runningComponentCount++;
+
+		if (_pendingComponentStarts == 0) {
+			AllComponentsStarted();
+		}
+	}
+
+	public void Handle(ProjectionSubsystemMessage.IODispatcherDrained message) {
+		_runningDispatchers--;
+		Logger.Information(
+			"PROJECTIONS SUBSYSTEM: IO Dispatcher from {componentName} has been drained. {runningCount} of {totalCount} queues empty.",
+			message.ComponentName, _runningDispatchers, _dispatcherCount);
+		FinishStopping();
+	}
+
+	private void AllComponentsStarted() {
+		Logger.Information("PROJECTIONS SUBSYSTEM: All components started for Instance: {instanceCorrelationId}",
+			_instanceCorrelationId);
+		_subsystemState = SubsystemState.Started;
+		_runningDispatchers = _dispatcherCount;
+
+		PublishInitialized();
+
+		if (_nodeState != VNodeState.Leader) {
+			Logger.Information("PROJECTIONS SUBSYSTEM: Node state is no longer Leader. Stopping projections. Current node state: {nodeState}",
+				_nodeState);
+			StopComponents();
+		}
+	}
+
+	public void Handle(ProjectionSubsystemMessage.ComponentStopped message) {
+		if (message.InstanceCorrelationId != _instanceCorrelationId) {
+			Logger.Debug(
+				"PROJECTIONS SUBSYSTEM: Received component stopped for incorrect correlation id. " +
+				"Requested: {requestedCorrelationId} | Instance: {instanceCorrelationId}",
+				message.InstanceCorrelationId, _instanceCorrelationId);
+			return;
+		}
+
+		if (_subsystemState != SubsystemState.Stopping)
+			return;
+
+		Logger.Debug("PROJECTIONS SUBSYSTEM: Component '{componentName}' stopped for Instance: {instanceCorrelationId}",
+			message.ComponentName, message.InstanceCorrelationId);
+		_runningComponentCount--;
+		if (_runningComponentCount < 0) {
+			Logger.Warning("PROJECTIONS SUBSYSTEM: Got more component stopped messages than running components.");
+			_runningComponentCount = 0;
+		}
+
+		FinishStopping();
+	}
+
+	private void FinishStopping() {
+		if (_runningDispatchers > 0)
+			return;
+		if (_runningComponentCount > 0)
+			return;
+
+		Logger.Information(
+			"PROJECTIONS SUBSYSTEM: All components stopped and dispatchers drained for Instance: {correlationId}",
+			_instanceCorrelationId);
+		_subsystemState = SubsystemState.Stopped;
+
+		if (_restarting) {
+			StartComponents();
+			return;
+		}
+
+		if (_nodeState == VNodeState.Leader) {
+			Logger.Information("PROJECTIONS SUBSYSTEM: Node state has changed to Leader. Starting projections.");
+			StartComponents();
+		}
+	}
+
+	private void PublishInitialized() {
+		_subsystemInitialized.TrySetResult();
+	}
+
+	public Task Start() {
+		if (_subsystemStarted == false) {
+			_leaderInputQueue?.Start();
+			_leaderOutputQueue?.Start();
+
+			foreach (var queue in _coreWorkers)
+				queue.Value.Start();
+		}
+
+		_subsystemStarted = true;
+
+		return _subsystemInitialized.Task;
+	}
+
+	public async Task Stop() {
+		if (_subsystemStarted) {
+			await (_leaderInputQueue?.Stop() ?? Task.CompletedTask);
+			foreach (var queue in _coreWorkers)
+				await queue.Value.Stop();
+		}
+
+		_subsystemStarted = false;
+	}
+
+	public void Handle(CoreProjectionStatusMessage.Stopped message) {
+		if (_startStandardProjections) {
+			if (_standardProjections.Contains(message.Name)) {
+				_standardProjections.Remove(message.Name);
+				var envelope = new NoopEnvelope();
+				LeaderInputQueue.Publish(new ProjectionManagementMessage.Command.Enable(envelope, message.Name,
+					ProjectionManagementMessage.RunAs.System));
+			}
+		}
+	}
+
+	public void Handle(CoreProjectionStatusMessage.Started message) {
+		_standardProjections.Remove(message.Name);
+	}
+
+	private enum SubsystemState {
+		NotReady,
+		Ready,
+		Starting,
+		Started,
+		Stopping,
+		Stopped
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Create.cs b/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Create.cs
new file mode 100644
index 00000000000..fed3a92c6bd
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Create.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.Client.Projections;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using static EventStore.Client.Projections.CreateReq.Types.Options;
+
+// ReSharper disable CheckNamespace
+
+namespace EventStore.Projections.Core.Services.Grpc;
+
+internal partial class ProjectionManagement {
+	private static readonly Operation CreateOperation = new Operation(Operations.Projections.Create);
+
+	public override async Task<CreateResp> Create(CreateReq request, ServerCallContext context) {
+		var createdSource = new TaskCompletionSource<bool>();
+		var options = request.Options;
+
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, CreateOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+		const string handlerType = "JS";
+		var name = options.ModeCase switch {
+			ModeOneofCase.Continuous => options.Continuous.Name,
+			ModeOneofCase.Transient => options.Transient.Name,
+			ModeOneofCase.OneTime => Guid.NewGuid().ToString("D"),
+			_ => throw new InvalidOperationException()
+		};
+		var projectionMode = options.ModeCase switch {
+			ModeOneofCase.Continuous => ProjectionMode.Continuous,
+			ModeOneofCase.Transient => ProjectionMode.Transient,
+			ModeOneofCase.OneTime => ProjectionMode.OneTime,
+			_ => throw new InvalidOperationException()
+		};
+		var emitEnabled = options.ModeCase switch {
+			ModeOneofCase.Continuous => options.Continuous.EmitEnabled,
+			_ => false
+		};
+		var trackEmittedStreams = (options.ModeCase, emitEnabled, options.Continuous?.TrackEmittedStreams) switch {
+			(ModeOneofCase.Continuous, true, true) => true,
+			(ModeOneofCase.Continuous, false, true) =>
+				throw new InvalidOperationException("EmitEnabled must be set to true to track emitted streams."),
+			_ => false
+		};
+		var checkpointsEnabled = options.ModeCase switch {
+			ModeOneofCase.Continuous => true,
+			ModeOneofCase.OneTime => false,
+			ModeOneofCase.Transient => false,
+			_ => throw new InvalidOperationException()
+		};
+
+		var runAs = new ProjectionManagementMessage.RunAs(user);
+
+		var envelope = new CallbackEnvelope(OnMessage);
+
+		_publisher.Publish(new ProjectionManagementMessage.Command.Post(envelope, projectionMode, name, runAs,
+			handlerType, options.Query, true, checkpointsEnabled, emitEnabled, trackEmittedStreams, true));
+
+		await createdSource.Task;
+
+		return new CreateResp();
+
+		void OnMessage(Message message) {
+			if (message is not ProjectionManagementMessage.Updated) {
+				createdSource.TrySetException(UnknownMessage<ProjectionManagementMessage.Updated>(message));
+				return;
+			}
+
+			createdSource.TrySetResult(true);
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Delete.cs b/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Delete.cs
new file mode 100644
index 00000000000..2e6e990cae0
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Delete.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.Client.Projections;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+using KurrentDB.Projections.Core.Messages;
+
+// ReSharper disable CheckNamespace
+
+namespace EventStore.Projections.Core.Services.Grpc;
+
+internal partial class ProjectionManagement {
+	private static readonly Operation DeleteOperation = new Operation(Operations.Projections.Delete);
+	public override async Task<DeleteResp> Delete(DeleteReq request, ServerCallContext context) {
+		var deletedSource = new TaskCompletionSource<bool>();
+		var options = request.Options;
+
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, DeleteOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+		var name = options.Name;
+		var deleteCheckpointStream = options.DeleteCheckpointStream;
+		var deleteStateStream = options.DeleteStateStream;
+		var deleteEmittedStreams = options.DeleteEmittedStreams;
+		var runAs = new ProjectionManagementMessage.RunAs(user);
+
+		var envelope = new CallbackEnvelope(OnMessage);
+
+		_publisher.Publish(new ProjectionManagementMessage.Command.Delete(envelope, name, runAs,
+			deleteCheckpointStream, deleteStateStream, deleteEmittedStreams));
+
+		await deletedSource.Task;
+
+		return new DeleteResp();
+
+		void OnMessage(Message message) {
+			switch (message) {
+				case ProjectionManagementMessage.Updated:
+					deletedSource.TrySetResult(true);
+					break;
+				case ProjectionManagementMessage.NotFound:
+					deletedSource.TrySetException(ProjectionNotFound(name));
+					break;
+				default:
+					deletedSource.TrySetException(UnknownMessage<ProjectionManagementMessage.Updated>(message));
+					break;
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Disable.cs b/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Disable.cs
new file mode 100644
index 00000000000..4d52ef07516
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Disable.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.Client.Projections;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+using KurrentDB.Projections.Core.Messages;
+
+// ReSharper disable CheckNamespace
+
+namespace EventStore.Projections.Core.Services.Grpc;
+
+internal partial class ProjectionManagement {
+	private static readonly Operation DisableOperation = new Operation(Operations.Projections.Disable);
+	public override async Task<DisableResp> Disable(DisableReq request, ServerCallContext context) {
+		var disableSource = new TaskCompletionSource<bool>();
+
+		var options = request.Options;
+
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, DisableOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+		var name = options.Name;
+		var runAs = new ProjectionManagementMessage.RunAs(user);
+
+		var envelope = new CallbackEnvelope(OnMessage);
+
+		_publisher.Publish(options.WriteCheckpoint
+			? new ProjectionManagementMessage.Command.Disable(envelope, name, runAs)
+			: (Message)new ProjectionManagementMessage.Command.Abort(envelope, name, runAs));
+
+		await disableSource.Task;
+
+		return new DisableResp();
+
+		void OnMessage(Message message) {
+			switch (message) {
+				case ProjectionManagementMessage.Updated:
+					disableSource.TrySetResult(true);
+					break;
+				case ProjectionManagementMessage.NotFound:
+					disableSource.TrySetException(ProjectionNotFound(name));
+					break;
+				default:
+					disableSource.TrySetException(UnknownMessage<ProjectionManagementMessage.Updated>(message));
+					break;
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Enable.cs b/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Enable.cs
new file mode 100644
index 00000000000..c20a943b296
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Enable.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.Client.Projections;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+using KurrentDB.Projections.Core.Messages;
+
+// ReSharper disable CheckNamespace
+
+namespace EventStore.Projections.Core.Services.Grpc;
+
+internal partial class ProjectionManagement {
+	private static readonly Operation EnableOperation = new Operation(Operations.Projections.Enable);
+	public override async Task<EnableResp> Enable(EnableReq request, ServerCallContext context) {
+		var enableSource = new TaskCompletionSource<bool>();
+
+		var options = request.Options;
+
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, EnableOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+		var name = options.Name;
+		var runAs = new ProjectionManagementMessage.RunAs(user);
+
+		var envelope = new CallbackEnvelope(OnMessage);
+
+		_publisher.Publish(new ProjectionManagementMessage.Command.Enable(envelope, name, runAs));
+
+		await enableSource.Task;
+
+		return new EnableResp();
+
+		void OnMessage(Message message) {
+			switch (message) {
+				case ProjectionManagementMessage.Updated:
+					enableSource.TrySetResult(true);
+					break;
+				case ProjectionManagementMessage.NotFound:
+					enableSource.TrySetException(ProjectionNotFound(name));
+					break;
+				default:
+					enableSource.TrySetException(UnknownMessage<ProjectionManagementMessage.Updated>(message));
+					break;
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Reset.cs b/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Reset.cs
new file mode 100644
index 00000000000..ff32f6a4609
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Reset.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.Client.Projections;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+using KurrentDB.Projections.Core.Messages;
+
+// ReSharper disable CheckNamespace
+
+namespace EventStore.Projections.Core.Services.Grpc;
+
+internal partial class ProjectionManagement {
+	private static readonly Operation ResetOperation = new Operation(Operations.Projections.Create);
+	public override async Task<ResetResp> Reset(ResetReq request, ServerCallContext context) {
+		var resetSource = new TaskCompletionSource<bool>();
+
+		var options = request.Options;
+
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, ResetOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+		var name = options.Name;
+		var runAs = new ProjectionManagementMessage.RunAs(user);
+
+		var envelope = new CallbackEnvelope(OnMessage);
+
+		_publisher.Publish(new ProjectionManagementMessage.Command.Reset(envelope, name, runAs));
+
+		await resetSource.Task;
+
+		return new ResetResp();
+
+		void OnMessage(Message message) {
+			switch (message) {
+				case ProjectionManagementMessage.Updated:
+					resetSource.TrySetResult(true);
+					break;
+				case ProjectionManagementMessage.NotFound:
+					resetSource.TrySetException(ProjectionNotFound(name));
+					break;
+				default:
+					resetSource.TrySetException(UnknownMessage<ProjectionManagementMessage.Updated>(message));
+					break;
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.RestartSubsystem.cs b/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.RestartSubsystem.cs
new file mode 100644
index 00000000000..3c919b5bd58
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.RestartSubsystem.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using EventStore.Client;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+using KurrentDB.Projections.Core.Messages;
+
+// ReSharper disable CheckNamespace
+
+namespace EventStore.Projections.Core.Services.Grpc;
+
+internal partial class ProjectionManagement {
+	private static readonly Operation RestartOperation = new Operation(Operations.Projections.Restart);
+
+	public override async Task<Empty> RestartSubsystem(Empty empty, ServerCallContext context) {
+		var restart = new TaskCompletionSource<bool>();
+		var envelope = new CallbackEnvelope(OnMessage);
+
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, RestartOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		_publisher.Publish(new ProjectionSubsystemMessage.RestartSubsystem(envelope));
+
+		await restart.Task;
+		return new Empty();
+
+		void OnMessage(Message message) {
+			switch (message) {
+				case ProjectionSubsystemMessage.SubsystemRestarting _:
+					restart.TrySetResult(true);
+					break;
+				case ProjectionSubsystemMessage.InvalidSubsystemRestart fail:
+					restart.TrySetException(InvalidSubsystemRestart(fail.SubsystemState));
+					break;
+				default:
+					restart.TrySetException(
+						UnknownMessage<ProjectionSubsystemMessage.SubsystemRestarting>(message));
+					break;
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Result.cs b/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Result.cs
new file mode 100644
index 00000000000..ce35d8cde94
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Result.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text.Json;
+using System.Threading.Tasks;
+using EventStore.Client.Projections;
+using EventStore.Plugins.Authorization;
+using Google.Protobuf.WellKnownTypes;
+using Grpc.Core;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+using KurrentDB.Projections.Core.Messages;
+
+// ReSharper disable CheckNamespace
+
+namespace EventStore.Projections.Core.Services.Grpc;
+
+internal partial class ProjectionManagement {
+	private static readonly Operation ResultOperation = new Operation(Operations.Projections.Result);
+	private static readonly Operation StateOperation = new Operation(Operations.Projections.State);
+	public override async Task<ResultResp> Result(ResultReq request, ServerCallContext context) {
+
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, ResultOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		var resultSource = new TaskCompletionSource<Value>();
+		var options = request.Options;
+
+		var name = options.Name;
+		var partition = options.Partition ?? string.Empty;
+
+		var envelope = new CallbackEnvelope(OnMessage);
+
+		_publisher.Publish(new ProjectionManagementMessage.Command.GetResult(envelope, name, partition));
+
+		return new ResultResp {
+			Result = await resultSource.Task
+		};
+
+		void OnMessage(Message message) {
+			switch (message) {
+				case ProjectionManagementMessage.ProjectionResult result:
+					if (string.IsNullOrEmpty(result.Result)) {
+						resultSource.TrySetResult(new Value {
+							StructValue = new Struct()
+						});
+					} else {
+						var document = JsonDocument.Parse(result.Result);
+						resultSource.TrySetResult(GetProtoValue(document.RootElement));
+					}
+					break;
+				case ProjectionManagementMessage.NotFound:
+					resultSource.TrySetException(ProjectionNotFound(name));
+					break;
+				default:
+					resultSource.TrySetException(UnknownMessage<ProjectionManagementMessage.ProjectionResult>(message));
+					break;
+			}
+		}
+	}
+
+	public override async Task<StateResp> State(StateReq request, ServerCallContext context) {
+
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, StateOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+		var resultSource = new TaskCompletionSource<Value>();
+
+		var options = request.Options;
+
+		var name = options.Name;
+		var partition = options.Partition ?? string.Empty;
+
+		var envelope = new CallbackEnvelope(OnMessage);
+
+		_publisher.Publish(new ProjectionManagementMessage.Command.GetState(envelope, name, partition));
+
+		return new StateResp {
+			State = await resultSource.Task
+		};
+
+		void OnMessage(Message message) {
+			switch (message) {
+				case ProjectionManagementMessage.ProjectionState result:
+					if (string.IsNullOrEmpty(result.State)) {
+						resultSource.TrySetResult(new Value {
+							StructValue = new Struct()
+						});
+					} else {
+						var document = JsonDocument.Parse(result.State);
+						resultSource.TrySetResult(GetProtoValue(document.RootElement));
+					}
+					break;
+				case ProjectionManagementMessage.NotFound:
+					resultSource.TrySetException(ProjectionNotFound(name));
+					break;
+				default:
+					resultSource.TrySetException(UnknownMessage<ProjectionManagementMessage.ProjectionState>(message));
+					break;
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Statistics.cs b/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Statistics.cs
new file mode 100644
index 00000000000..e8f8654a83e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Statistics.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.Client.Projections;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using static EventStore.Client.Projections.StatisticsReq.Types.Options;
+
+// ReSharper disable CheckNamespace
+
+namespace EventStore.Projections.Core.Services.Grpc;
+
+internal partial class ProjectionManagement {
+	private static readonly Operation StatisticsOperation = new Operation(Operations.Projections.Statistics);
+	public override async Task Statistics(StatisticsReq request, IServerStreamWriter<StatisticsResp> responseStream,
+		ServerCallContext context) {
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, StatisticsOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		var statsSource = new TaskCompletionSource<ProjectionStatistics[]>();
+
+		var options = request.Options;
+		var name = string.IsNullOrEmpty(options.Name) ? null : options.Name;
+		var mode = options.ModeCase switch {
+			ModeOneofCase.Continuous => ProjectionMode.Continuous,
+			ModeOneofCase.Transient => ProjectionMode.Transient,
+			ModeOneofCase.OneTime => ProjectionMode.OneTime,
+			_ => default(Nullable<ProjectionMode>)
+		};
+
+		var envelope = new CallbackEnvelope(OnMessage);
+
+		_publisher.Publish(new ProjectionManagementMessage.Command.GetStatistics(envelope, mode, name, true));
+
+		foreach (var stats in Array.ConvertAll(await statsSource.Task, s => new StatisticsResp.Types.Details {
+			BufferedEvents = s.BufferedEvents,
+			CheckpointStatus = s.CheckpointStatus ?? string.Empty,
+			CoreProcessingTime = s.CoreProcessingTime,
+			EffectiveName = s.EffectiveName ?? string.Empty,
+			Epoch = s.Epoch,
+			EventsProcessedAfterRestart = s.EventsProcessedAfterRestart,
+			LastCheckpoint = s.LastCheckpoint ?? string.Empty,
+			Mode = s.Mode.ToString(),
+			Name = s.Name,
+			ReadsInProgress = s.ReadsInProgress,
+			PartitionsCached = s.PartitionsCached,
+			Position = s.Position ?? string.Empty,
+			Progress = s.Progress,
+			StateReason = s.StateReason ?? string.Empty,
+			Status = s.Status ?? string.Empty,
+			Version = s.Version,
+			WritePendingEventsAfterCheckpoint = s.WritePendingEventsAfterCheckpoint,
+			WritePendingEventsBeforeCheckpoint = s.WritePendingEventsBeforeCheckpoint,
+			WritesInProgress = s.WritesInProgress
+		})) {
+			await responseStream.WriteAsync(new StatisticsResp { Details = stats });
+		}
+
+		void OnMessage(Message message) {
+			switch (message) {
+				case ProjectionManagementMessage.Statistics statistics:
+					statsSource.TrySetResult(statistics.Projections);
+					break;
+				case ProjectionManagementMessage.NotFound:
+					statsSource.TrySetException(ProjectionNotFound(name));
+					break;
+				default:
+					statsSource.TrySetException(UnknownMessage<ProjectionManagementMessage.Statistics>(message));
+					break;
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Update.cs b/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Update.cs
new file mode 100644
index 00000000000..5372a74126c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.Update.cs
@@ -0,0 +1,62 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading.Tasks;
+using EventStore.Client.Projections;
+using EventStore.Plugins.Authorization;
+using Grpc.Core;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.Transport.Grpc;
+using KurrentDB.Projections.Core.Messages;
+using static EventStore.Client.Projections.UpdateReq.Types.Options;
+
+// ReSharper disable CheckNamespace
+
+namespace EventStore.Projections.Core.Services.Grpc;
+
+internal partial class ProjectionManagement {
+	private static readonly Operation UpdateOperation = new Operation(Operations.Projections.Update);
+	public override async Task<UpdateResp> Update(UpdateReq request, ServerCallContext context) {
+		var updatedSource = new TaskCompletionSource<bool>();
+		var options = request.Options;
+
+		var user = context.GetHttpContext().User;
+		if (!await _authorizationProvider.CheckAccessAsync(user, UpdateOperation, context.CancellationToken)) {
+			throw RpcExceptions.AccessDenied();
+		}
+
+		var name = options.Name;
+		var query = options.Query;
+		bool? emitEnabled = (options.EmitOptionCase, options.EmitEnabled) switch {
+			(EmitOptionOneofCase.EmitEnabled, true) => true,
+			(EmitOptionOneofCase.EmitEnabled, false) => false,
+			(EmitOptionOneofCase.NoEmitOptions, _) => default,
+			_ => throw new InvalidOperationException()
+		};
+		var runAs = new ProjectionManagementMessage.RunAs(user);
+
+		var envelope = new CallbackEnvelope(OnMessage);
+		_publisher.Publish(
+			new ProjectionManagementMessage.Command.UpdateQuery(envelope, name, runAs, query,
+				emitEnabled));
+
+		await updatedSource.Task;
+
+		return new UpdateResp();
+
+		void OnMessage(Message message) {
+			switch (message) {
+				case ProjectionManagementMessage.Updated:
+					updatedSource.TrySetResult(true);
+					break;
+				case ProjectionManagementMessage.NotFound:
+					updatedSource.TrySetException(ProjectionNotFound(name));
+					break;
+				default:
+					updatedSource.TrySetException(UnknownMessage<ProjectionManagementMessage.Updated>(message));
+					break;
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.cs b/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.cs
new file mode 100644
index 00000000000..d857a72bbb9
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Grpc/ProjectionManagement.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Text.Json;
+using EventStore.Core.Services.Transport.Grpc;
+using EventStore.Plugins.Authorization;
+using Google.Protobuf.WellKnownTypes;
+using Grpc.Core;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+
+
+// ReSharper disable CheckNamespace
+
+namespace EventStore.Client.Projections {
+	partial class Projections {
+		partial class ProjectionsBase : ServiceBase {
+		}
+	}
+}
+
+namespace EventStore.Projections.Core.Services.Grpc {
+	internal partial class ProjectionManagement : Client.Projections.Projections.ProjectionsBase {
+		private readonly IPublisher _publisher;
+		private readonly IAuthorizationProvider _authorizationProvider;
+
+		public ProjectionManagement(IPublisher publisher, IAuthorizationProvider authorizationProvider) {
+			if (publisher == null)
+				throw new ArgumentNullException(nameof(publisher));
+			if (authorizationProvider == null)
+				throw new ArgumentNullException(nameof(authorizationProvider));
+			_publisher = publisher;
+			_authorizationProvider = authorizationProvider;
+		}
+
+		private static Exception UnknownMessage<T>(Message message) where T : Message =>
+			new RpcException(
+				new Status(StatusCode.Unknown,
+					$"Envelope callback expected {typeof(T).Name}, received {message.GetType().Name} instead"));
+		private static Exception InvalidSubsystemRestart(string state) =>
+			new RpcException(
+				new Status(StatusCode.FailedPrecondition,
+					$"Projection Subsystem cannot be restarted as it is in the wrong state: {state}"));
+
+		private static Exception ProjectionNotFound(string name) =>
+			new RpcException(new Status(StatusCode.NotFound, $"Projection '{name}' not found"));
+
+		private static Value GetProtoValue(JsonElement element) =>
+			element.ValueKind switch {
+				JsonValueKind.Null => new Value { NullValue = NullValue.NullValue },
+				JsonValueKind.Array => new Value {
+					ListValue = new ListValue {
+						Values = {
+							element.EnumerateArray().Select(GetProtoValue)
+						}
+					}
+				},
+				JsonValueKind.False => new Value { BoolValue = false },
+				JsonValueKind.True => new Value { BoolValue = true },
+				JsonValueKind.String => new Value { StringValue = element.GetString() },
+				JsonValueKind.Number => new Value { NumberValue = element.GetDouble() },
+				JsonValueKind.Object => new Value { StructValue = GetProtoStruct(element) },
+				JsonValueKind.Undefined => new Value(),
+				_ => throw new InvalidOperationException()
+			};
+
+		private static Struct GetProtoStruct(JsonElement element) {
+			var structValue = new Struct();
+			foreach (var property in element.EnumerateObject()) {
+				structValue.Fields.Add(property.Name, GetProtoValue(property.Value));
+			}
+
+			return structValue;
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Http/ProjectionStatisticsHttpFormatted.cs b/src/KurrentDB.Projections.Core/Services/Http/ProjectionStatisticsHttpFormatted.cs
new file mode 100644
index 00000000000..a8898484b83
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Http/ProjectionStatisticsHttpFormatted.cs
@@ -0,0 +1,91 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Projections.Core.Services.Http;
+
+public class ProjectionStatisticsHttpFormatted {
+	public ProjectionStatisticsHttpFormatted(ProjectionStatistics source, Func<string, string> makeAbsoluteUrl) {
+		this.Status = source.Status;
+		this.StateReason = source.StateReason;
+		this.Name = source.Name;
+		this.EffectiveName = source.Name;
+		this.Epoch = source.Epoch;
+		this.Version = source.Version;
+		this.Mode = source.Mode;
+		this.Position = (source.Position ?? (object)"").ToString();
+		this.Progress = source.Progress;
+		this.LastCheckpoint = source.LastCheckpoint;
+		this.EventsProcessedAfterRestart = source.EventsProcessedAfterRestart;
+		this.BufferedEvents = source.BufferedEvents;
+		this.CheckpointStatus = source.CheckpointStatus;
+		this.WritePendingEventsBeforeCheckpoint = source.WritePendingEventsBeforeCheckpoint;
+		this.WritePendingEventsAfterCheckpoint = source.WritePendingEventsAfterCheckpoint;
+		this.ReadsInProgress = source.ReadsInProgress;
+		this.WritesInProgress = source.WritesInProgress;
+		this.CoreProcessingTime = source.CoreProcessingTime;
+		this.PartitionsCached = source.PartitionsCached;
+		var statusLocalUrl = "/projection/" + source.Name;
+		this.StatusUrl = makeAbsoluteUrl(statusLocalUrl);
+		this.StateUrl = makeAbsoluteUrl(statusLocalUrl + "/state");
+		this.ResultUrl = makeAbsoluteUrl(statusLocalUrl + "/result");
+		this.QueryUrl = makeAbsoluteUrl(statusLocalUrl + "/query?config=yes");
+		if (!string.IsNullOrEmpty(source.ResultStreamName))
+			this.ResultStreamUrl = makeAbsoluteUrl("/streams/" + Uri.EscapeDataString(source.ResultStreamName));
+		this.DisableCommandUrl = makeAbsoluteUrl(statusLocalUrl + "/command/disable");
+		this.EnableCommandUrl = makeAbsoluteUrl(statusLocalUrl + "/command/enable");
+	}
+
+	public long CoreProcessingTime { get; set; }
+
+	public long Version { get; set; }
+
+	public long Epoch { get; set; }
+
+	public string EffectiveName { get; set; }
+
+	public int WritesInProgress { get; set; }
+
+	public int ReadsInProgress { get; set; }
+
+	public int PartitionsCached { get; set; }
+
+	public string Status { get; set; }
+
+	public string StateReason { get; set; }
+
+	public string Name { get; set; }
+
+	public ProjectionMode Mode { get; set; }
+
+	public string Position { get; set; }
+
+	public float Progress { get; set; }
+
+	public string LastCheckpoint { get; set; }
+
+	public int EventsProcessedAfterRestart { get; set; }
+
+	public string StatusUrl { get; set; }
+
+	public string StateUrl { get; set; }
+
+	public string ResultUrl { get; set; }
+
+	public string QueryUrl { get; set; }
+
+	public string ResultStreamUrl { get; set; }
+
+	public string EnableCommandUrl { get; set; }
+
+	public string DisableCommandUrl { get; set; }
+
+	public string CheckpointStatus { get; set; }
+
+	public int BufferedEvents { get; set; }
+
+	public int WritePendingEventsBeforeCheckpoint { get; set; }
+
+	public int WritePendingEventsAfterCheckpoint { get; set; }
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Http/ProjectionsController.cs b/src/KurrentDB.Projections.Core/Services/Http/ProjectionsController.cs
new file mode 100644
index 00000000000..13a888620df
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Http/ProjectionsController.cs
@@ -0,0 +1,665 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using EventStore.Plugins.Authorization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Transport.Http;
+using KurrentDB.Core.Services.Transport.Http.Controllers;
+using KurrentDB.Core.Util;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Messages.EventReaders.Feeds;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Transport.Http;
+using KurrentDB.Transport.Http.Codecs;
+using KurrentDB.Transport.Http.EntityManagement;
+using Newtonsoft.Json.Linq;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Projections.Core.Services.Http;
+
+public class ProjectionsController : CommunicationController {
+	private static readonly ILogger Log = Serilog.Log.ForContext<ProjectionsController>();
+
+	private static readonly ICodec[] SupportedCodecs = { Codec.Json };
+
+	private readonly MiniWeb _clusterNodeJs;
+	private readonly MiniWeb _miniWebPrelude;
+	private readonly IHttpForwarder _httpForwarder;
+	private readonly IPublisher _networkSendQueue;
+
+	public ProjectionsController(IHttpForwarder httpForwarder, IPublisher publisher, IPublisher networkSendQueue)
+		: base(publisher) {
+		_httpForwarder = httpForwarder;
+
+		_clusterNodeJs = new MiniWeb("/web/es/js/projections", Locations.ProjectionsDirectory);
+
+		_networkSendQueue = networkSendQueue;
+		_miniWebPrelude = new MiniWeb("/web/es/js/projections/v8/Prelude", Locations.PreludeDirectory);
+	}
+
+	protected override void SubscribeCore(IHttpService service) {
+		_clusterNodeJs.RegisterControllerActions(service);
+
+		_miniWebPrelude.RegisterControllerActions(service);
+
+		HttpHelpers.RegisterRedirectAction(service, "/web/projections", "/web/projections.htm");
+
+		Register(service, "/projections",
+			HttpMethod.Get, OnProjections, Codec.NoCodecs, new ICodec[] { Codec.ManualEncoding }, new Operation(Operations.Projections.List));
+		Register(service, "/projections/restart",
+			HttpMethod.Post, OnProjectionsRestart, new ICodec[] { Codec.ManualEncoding }, SupportedCodecs, new Operation(Operations.Projections.Restart));
+		Register(service, "/projections/any",
+			HttpMethod.Get, OnProjectionsGetAny, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.List));
+		Register(service, "/projections/all-non-transient",
+			HttpMethod.Get, OnProjectionsGetAllNonTransient, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.List));
+		Register(service, "/projections/transient",
+			HttpMethod.Get, OnProjectionsGetTransient, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.List));
+		Register(service, "/projections/onetime",
+			HttpMethod.Get, OnProjectionsGetOneTime, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.List));
+		Register(service, "/projections/continuous",
+			HttpMethod.Get, OnProjectionsGetContinuous, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.List));
+		Register(service, "/projections/transient?name={name}&type={type}&enabled={enabled}",
+			HttpMethod.Post, OnProjectionsPostTransient, new ICodec[] { Codec.ManualEncoding }, SupportedCodecs, new Operation(Operations.Projections.Create).WithParameter(Operations.Projections.Parameters.Query));
+		Register(service,
+			"/projections/onetime?name={name}&type={type}&enabled={enabled}&checkpoints={checkpoints}&emit={emit}&trackemittedstreams={trackemittedstreams}",
+			HttpMethod.Post, OnProjectionsPostOneTime, new ICodec[] { Codec.ManualEncoding }, SupportedCodecs, new Operation(Operations.Projections.Create).WithParameter(Operations.Projections.Parameters.OneTime));
+		Register(service,
+			"/projections/continuous?name={name}&type={type}&enabled={enabled}&emit={emit}&trackemittedstreams={trackemittedstreams}",
+			HttpMethod.Post, OnProjectionsPostContinuous, new ICodec[] { Codec.ManualEncoding }, SupportedCodecs, new Operation(Operations.Projections.Create).WithParameter(Operations.Projections.Parameters.Continuous));
+		Register(service, "/projection/{name}/query?config={config}",
+			HttpMethod.Get, OnProjectionQueryGet, Codec.NoCodecs, new ICodec[] { Codec.ManualEncoding }, new Operation(Operations.Projections.Read));
+		Register(service, "/projection/{name}/query?type={type}&emit={emit}",
+			HttpMethod.Put, OnProjectionQueryPut, new ICodec[] { Codec.ManualEncoding }, SupportedCodecs, new Operation(Operations.Projections.Update)); /* source of transient projections can be set by a normal user. Authorization checks are done internally for non-transient projections. */
+		Register(service, "/projection/{name}",
+			HttpMethod.Get, OnProjectionStatusGet, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.Status));
+		Register(service,
+			"/projection/{name}?deleteStateStream={deleteStateStream}&deleteCheckpointStream={deleteCheckpointStream}&deleteEmittedStreams={deleteEmittedStreams}",
+			HttpMethod.Delete, OnProjectionDelete, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.Delete));
+		Register(service, "/projection/{name}/statistics",
+			HttpMethod.Get, OnProjectionStatisticsGet, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.Statistics));
+		Register(service, "/projections/read-events",
+			HttpMethod.Post, OnProjectionsReadEvents, SupportedCodecs, SupportedCodecs, new Operation(Operations.Projections.DebugProjection));
+		Register(service, "/projection/{name}/state?partition={partition}",
+			HttpMethod.Get, OnProjectionStateGet, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.State));
+		Register(service, "/projection/{name}/result?partition={partition}",
+			HttpMethod.Get, OnProjectionResultGet, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.Result));
+		Register(service, "/projection/{name}/command/disable?enableRunAs={enableRunAs}",
+			HttpMethod.Post, OnProjectionCommandDisable, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.Disable)); /* transient projections can be stopped by a normal user. Authorization checks are done internally for non-transient projections.*/
+		Register(service, "/projection/{name}/command/enable?enableRunAs={enableRunAs}",
+			HttpMethod.Post, OnProjectionCommandEnable, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.Enable)); /* transient projections can be enabled by a normal user. Authorization checks are done internally for non-transient projections.*/
+		Register(service, "/projection/{name}/command/reset?enableRunAs={enableRunAs}",
+			HttpMethod.Post, OnProjectionCommandReset, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.Reset)); /* transient projections can be reset by a normal user (when debugging). Authorization checks are done internally for non-transient projections.*/
+		Register(service, "/projection/{name}/command/abort?enableRunAs={enableRunAs}",
+			HttpMethod.Post, OnProjectionCommandAbort, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.Abort)); /* transient projections can be aborted by a normal user. Authorization checks are done internally for non-transient projections.*/
+		Register(service, "/projection/{name}/config",
+			HttpMethod.Get, OnProjectionConfigGet, Codec.NoCodecs, SupportedCodecs, new Operation(Operations.Projections.ReadConfiguration));
+		Register(service, "/projection/{name}/config",
+			HttpMethod.Put, OnProjectionConfigPut, SupportedCodecs, SupportedCodecs, new Operation(Operations.Projections.UpdateConfiguration));
+	}
+
+	private void OnProjections(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+
+		http.ReplyTextContent(
+			"Moved", 302, "Found", ContentType.PlainText,
+			new[] {
+				new KeyValuePair<string, string>(
+					"Location", new Uri(match.BaseUri, "/web/projections.htm").AbsoluteUri)
+			}, x => Log.Debug(x, "Reply Text Content Failed."));
+	}
+
+	private void OnProjectionsRestart(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+
+		var envelope = new SendToHttpEnvelope<ProjectionSubsystemMessage.SubsystemRestarting>(_networkSendQueue, http,
+			(e, message) => e.To("Restarting"),
+			(e, message) => {
+				switch (message) {
+					case ProjectionSubsystemMessage.SubsystemRestarting _:
+						return Configure.Ok(e.ContentType);
+					default:
+						return Configure.InternalServerError();
+				}
+			}, CreateErrorEnvelope(http)
+		);
+
+		Publish(new ProjectionSubsystemMessage.RestartSubsystem(envelope));
+	}
+
+	private void OnProjectionsGetAny(HttpEntityManager http, UriTemplateMatch match) {
+		ProjectionsGet(http, match, null);
+	}
+
+	private void OnProjectionsGetAllNonTransient(HttpEntityManager http, UriTemplateMatch match) {
+		ProjectionsGet(http, match, ProjectionMode.AllNonTransient);
+	}
+
+	private void OnProjectionsGetTransient(HttpEntityManager http, UriTemplateMatch match) {
+		ProjectionsGet(http, match, ProjectionMode.Transient);
+	}
+
+	private void OnProjectionsGetOneTime(HttpEntityManager http, UriTemplateMatch match) {
+		ProjectionsGet(http, match, ProjectionMode.OneTime);
+	}
+
+	private void OnProjectionsGetContinuous(HttpEntityManager http, UriTemplateMatch match) {
+		ProjectionsGet(http, match, ProjectionMode.Continuous);
+	}
+
+	private void OnProjectionsPostTransient(HttpEntityManager http, UriTemplateMatch match) {
+		ProjectionsPost(http, match, ProjectionMode.Transient, match.BoundVariables["name"]);
+	}
+
+	private void OnProjectionsPostOneTime(HttpEntityManager http, UriTemplateMatch match) {
+		ProjectionsPost(http, match, ProjectionMode.OneTime, match.BoundVariables["name"]);
+	}
+
+	private void OnProjectionsPostContinuous(HttpEntityManager http, UriTemplateMatch match) {
+		ProjectionsPost(http, match, ProjectionMode.Continuous, match.BoundVariables["name"]);
+	}
+
+	private void OnProjectionQueryGet(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+
+		SendToHttpEnvelope<ProjectionManagementMessage.ProjectionQuery> envelope;
+		var withConfig = IsOn(match, "config", false);
+		if (withConfig)
+			envelope = new SendToHttpEnvelope<ProjectionManagementMessage.ProjectionQuery>(
+				_networkSendQueue, http, QueryConfigFormatter, QueryConfigConfigurator, CreateErrorEnvelope(http));
+		else
+			envelope = new SendToHttpEnvelope<ProjectionManagementMessage.ProjectionQuery>(
+				_networkSendQueue, http, QueryFormatter, QueryConfigurator, CreateErrorEnvelope(http));
+		Publish(new ProjectionManagementMessage.Command.GetQuery(envelope, match.BoundVariables["name"],
+			GetRunAs(http, match)));
+	}
+
+	private void OnProjectionQueryPut(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+
+		var envelope = new SendToHttpEnvelope<ProjectionManagementMessage.Updated>(
+			_networkSendQueue, http, DefaultFormatter, OkResponseConfigurator, CreateErrorEnvelope(http));
+		var emitEnabled = IsOn(match, "emit", null);
+		http.ReadTextRequestAsync(
+			(o, s) =>
+				Publish(
+			new ProjectionManagementMessage.Command.UpdateQuery(
+				envelope, match.BoundVariables["name"], GetRunAs(http, match),
+				s, emitEnabled: emitEnabled)), Console.WriteLine);
+	}
+
+	private void OnProjectionConfigGet(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+
+		var envelope = new SendToHttpEnvelope<ProjectionManagementMessage.ProjectionConfig>(
+			_networkSendQueue, http, ProjectionConfigFormatter, ProjectionConfigConfigurator, CreateErrorEnvelope(http));
+		Publish(
+			new ProjectionManagementMessage.Command.GetConfig(
+				envelope, match.BoundVariables["name"], GetRunAs(http, match)));
+	}
+
+	private void OnProjectionConfigPut(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+
+		var envelope = new SendToHttpEnvelope<ProjectionManagementMessage.Updated>(
+			_networkSendQueue, http, DefaultFormatter, OkResponseConfigurator, CreateErrorEnvelope(http));
+		http.ReadTextRequestAsync(
+			(o, s) => {
+				var config = http.RequestCodec.From<ProjectionConfigData>(s);
+				if (config == null) {
+					SendBadRequest(o, "Failed to parse the projection config");
+					return;
+				}
+
+				if (config.ProjectionExecutionTimeout is not null && config.ProjectionExecutionTimeout <= 0) {
+					SendBadRequest(o, $"projectionExecutionTimeout should be positive. Found : {config.ProjectionExecutionTimeout}");
+					return;
+				}
+				var message = new ProjectionManagementMessage.Command.UpdateConfig(
+					envelope, match.BoundVariables["name"], config.EmitEnabled, config.TrackEmittedStreams,
+					config.CheckpointAfterMs, config.CheckpointHandledThreshold,
+					config.CheckpointUnhandledBytesThreshold, config.PendingEventsThreshold,
+					config.MaxWriteBatchLength, config.MaxAllowedWritesInFlight, GetRunAs(http, match), config.ProjectionExecutionTimeout);
+				Publish(message);
+			}, ex => Log.Debug("Failed to update projection configuration. Error: {e}", ex));
+	}
+
+	private void OnProjectionCommandDisable(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+
+		var envelope = new SendToHttpEnvelope<ProjectionManagementMessage.Updated>(
+			_networkSendQueue, http, DefaultFormatter, OkResponseConfigurator, CreateErrorEnvelope(http));
+		Publish(new ProjectionManagementMessage.Command.Disable(envelope, match.BoundVariables["name"],
+			GetRunAs(http, match)));
+	}
+
+	private void OnProjectionCommandEnable(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+
+		var envelope = new SendToHttpEnvelope<ProjectionManagementMessage.Updated>(
+			_networkSendQueue, http, DefaultFormatter, OkResponseConfigurator, CreateErrorEnvelope(http));
+		var name = match.BoundVariables["name"];
+		Publish(new ProjectionManagementMessage.Command.Enable(envelope, name, GetRunAs(http, match)));
+	}
+
+	private void OnProjectionCommandReset(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+
+		var envelope = new SendToHttpEnvelope<ProjectionManagementMessage.Updated>(
+			_networkSendQueue, http, DefaultFormatter, OkResponseConfigurator, CreateErrorEnvelope(http));
+		Publish(new ProjectionManagementMessage.Command.Reset(envelope, match.BoundVariables["name"],
+			GetRunAs(http, match)));
+	}
+
+	private void OnProjectionCommandAbort(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+
+		var envelope = new SendToHttpEnvelope<ProjectionManagementMessage.Updated>(
+			_networkSendQueue, http, DefaultFormatter, OkResponseConfigurator, CreateErrorEnvelope(http));
+		Publish(new ProjectionManagementMessage.Command.Abort(envelope, match.BoundVariables["name"],
+			GetRunAs(http, match)));
+	}
+
+	private void OnProjectionStatusGet(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+
+		var envelope =
+			new SendToHttpWithConversionEnvelope
+				<ProjectionManagementMessage.Statistics, ProjectionStatisticsHttpFormatted>(
+					_networkSendQueue, http, DefaultFormatter, OkNoCacheResponseConfigurator,
+					status => new ProjectionStatisticsHttpFormatted(status.Projections[0], s => MakeUrl(http, s)),
+					CreateErrorEnvelope(http));
+		Publish(new ProjectionManagementMessage.Command.GetStatistics(envelope, null, match.BoundVariables["name"],
+			true));
+	}
+
+	private void OnProjectionDelete(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+
+		var envelope = new SendToHttpEnvelope<ProjectionManagementMessage.Updated>(
+			_networkSendQueue, http, DefaultFormatter, OkResponseConfigurator, CreateErrorEnvelope(http));
+		Publish(
+			new ProjectionManagementMessage.Command.Delete(
+				envelope, match.BoundVariables["name"], GetRunAs(http, match),
+				IsOn(match, "deleteCheckpointStream", false),
+				IsOn(match, "deleteStateStream", false),
+				IsOn(match, "deleteEmittedStreams", false)));
+	}
+
+	private void OnProjectionStatisticsGet(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+
+		var envelope =
+			new SendToHttpWithConversionEnvelope
+				<ProjectionManagementMessage.Statistics, ProjectionsStatisticsHttpFormatted>(
+					_networkSendQueue, http, DefaultFormatter, OkNoCacheResponseConfigurator,
+					status => new ProjectionsStatisticsHttpFormatted(status, s => MakeUrl(http, s)),
+					CreateErrorEnvelope(http));
+		Publish(new ProjectionManagementMessage.Command.GetStatistics(envelope, null, match.BoundVariables["name"],
+			true));
+	}
+
+	private void OnProjectionStateGet(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+
+		var envelope = new SendToHttpEnvelope<ProjectionManagementMessage.ProjectionState>(
+			_networkSendQueue, http, StateFormatter, StateConfigurator, CreateErrorEnvelope(http));
+		Publish(
+			new ProjectionManagementMessage.Command.GetState(
+				envelope, match.BoundVariables["name"], match.BoundVariables["partition"] ?? ""));
+	}
+
+	private void OnProjectionResultGet(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+
+		var envelope = new SendToHttpEnvelope<ProjectionManagementMessage.ProjectionResult>(
+			_networkSendQueue, http, ResultFormatter, ResultConfigurator, CreateErrorEnvelope(http));
+		Publish(
+			new ProjectionManagementMessage.Command.GetResult(
+				envelope, match.BoundVariables["name"], match.BoundVariables["partition"] ?? ""));
+	}
+
+	public class ReadEventsBody {
+		public QuerySourcesDefinition Query { get; set; }
+		public JObject Position { get; set; }
+		public int? MaxEvents { get; set; }
+	}
+
+	private void OnProjectionsReadEvents(HttpEntityManager http, UriTemplateMatch match) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+
+		var envelope = new SendToHttpEnvelope<FeedReaderMessage.FeedPage>(
+			_networkSendQueue, http, FeedPageFormatter, FeedPageConfigurator, CreateErrorEnvelope(http));
+
+		http.ReadTextRequestAsync(
+			(o, body) => {
+				var bodyParsed = body.ParseJson<ReadEventsBody>();
+				var fromPosition = CheckpointTag.FromJson(
+					new JTokenReader(bodyParsed.Position), new ProjectionVersion(0, 0, 0));
+
+
+				Publish(
+					new FeedReaderMessage.ReadPage(
+						Guid.NewGuid(),
+						envelope,
+						http.User,
+						bodyParsed.Query,
+						fromPosition.Tag,
+						bodyParsed.MaxEvents ?? 10));
+			},
+			x => Log.Debug(x, "Read Request Body Failed."));
+	}
+
+	private void ProjectionsGet(HttpEntityManager http, UriTemplateMatch match, ProjectionMode? mode) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+
+		var envelope =
+			new SendToHttpWithConversionEnvelope<ProjectionManagementMessage.Statistics,
+				ProjectionsStatisticsHttpFormatted>(
+				_networkSendQueue, http, DefaultFormatter, OkNoCacheResponseConfigurator,
+				status => new ProjectionsStatisticsHttpFormatted(status, s => MakeUrl(http, s)),
+				CreateErrorEnvelope(http));
+		Publish(new ProjectionManagementMessage.Command.GetStatistics(envelope, mode, null, true));
+	}
+
+	private void ProjectionsPost(HttpEntityManager http, UriTemplateMatch match, ProjectionMode mode, string name) {
+		if (_httpForwarder.ForwardRequest(http))
+			return;
+
+		var envelope = new SendToHttpEnvelope<ProjectionManagementMessage.Updated>(
+			_networkSendQueue, http, DefaultFormatter, (codec, message) => {
+				var localPath = string.Format("/projection/{0}", message.Name);
+				var url = MakeUrl(http, localPath);
+				return new ResponseConfiguration(
+					201, "Created", codec.ContentType, codec.Encoding,
+					new KeyValuePair<string, string>("Location", url));
+			}, CreateErrorEnvelope(http));
+		http.ReadTextRequestAsync(
+			(o, s) => {
+				ProjectionManagementMessage.Command.Post postMessage;
+				string handlerType = match.BoundVariables["type"] ?? "JS";
+				bool emitEnabled = IsOn(match, "emit", false);
+				bool checkpointsEnabled = mode >= ProjectionMode.Continuous || IsOn(match, "checkpoints", false);
+				bool enabled = IsOn(match, "enabled", def: true);
+				bool trackEmittedStreams = IsOn(match, "trackemittedstreams", def: false);
+				if (!emitEnabled) {
+					trackEmittedStreams = false;
+				}
+
+				var runAs = GetRunAs(http, match);
+				if (mode <= ProjectionMode.OneTime && string.IsNullOrEmpty(name))
+					postMessage = new ProjectionManagementMessage.Command.Post(
+						envelope, mode, Guid.NewGuid().ToString("D"), runAs, handlerType, s, enabled: enabled,
+						checkpointsEnabled: checkpointsEnabled, emitEnabled: emitEnabled,
+						trackEmittedStreams: trackEmittedStreams, enableRunAs: true);
+				else
+					postMessage = new ProjectionManagementMessage.Command.Post(
+						envelope, mode, name, runAs, handlerType, s, enabled: enabled,
+						checkpointsEnabled: checkpointsEnabled, emitEnabled: emitEnabled,
+						trackEmittedStreams: trackEmittedStreams, enableRunAs: true);
+				Publish(postMessage);
+			}, x => Log.Debug(x, "Reply Text Body Failed."));
+	}
+
+	private ResponseConfiguration
+		StateConfigurator(ICodec codec, ProjectionManagementMessage.ProjectionState state) {
+		if (state.Exception != null)
+			return Configure.InternalServerError();
+		else
+			return state.Position != null
+				? Configure.Ok(ContentType.Json, Helper.UTF8NoBom, null, null, false,
+					new KeyValuePair<string, string>(SystemHeaders.ProjectionPosition, state.Position.ToJsonString()),
+					new KeyValuePair<string, string>(SystemHeaders.LegacyProjectionPosition, state.Position.ToJsonString()))
+				: Configure.Ok(ContentType.Json, Helper.UTF8NoBom, null, null, false);
+	}
+
+	private ResponseConfiguration ResultConfigurator(ICodec codec,
+		ProjectionManagementMessage.ProjectionResult state) {
+		if (state.Exception != null)
+			return Configure.InternalServerError();
+		else
+			return state.Position != null
+				? Configure.Ok(ContentType.Json, Helper.UTF8NoBom, null, null, false,
+					new KeyValuePair<string, string>(SystemHeaders.ProjectionPosition, state.Position.ToJsonString()),
+					new KeyValuePair<string, string>(SystemHeaders.LegacyProjectionPosition, state.Position.ToJsonString()))
+				: Configure.Ok(ContentType.Json, Helper.UTF8NoBom, null, null, false);
+	}
+
+	private ResponseConfiguration FeedPageConfigurator(ICodec codec, FeedReaderMessage.FeedPage page) {
+		if (page.Error == FeedReaderMessage.FeedPage.ErrorStatus.NotAuthorized)
+			return Configure.Unauthorized();
+		return Configure.Ok(ContentType.Json, Helper.UTF8NoBom, null, null, false);
+	}
+
+	private string StateFormatter(ICodec codec, ProjectionManagementMessage.ProjectionState state) {
+		if (state.Exception != null)
+			return state.Exception.ToString();
+		else
+			return state.State;
+	}
+
+	private string ResultFormatter(ICodec codec, ProjectionManagementMessage.ProjectionResult state) {
+		if (state.Exception != null)
+			return state.Exception.ToString();
+		else
+			return state.Result;
+	}
+
+	private string FeedPageFormatter(ICodec codec, FeedReaderMessage.FeedPage page) {
+		if (page.Error != FeedReaderMessage.FeedPage.ErrorStatus.Success)
+			return null;
+
+		return new {
+			CorrelationId = page.CorrelationId,
+			ReaderPosition = page.LastReaderPosition.ToJsonRaw(),
+			Events = (from e in page.Events
+					  let resolvedEvent = e.ResolvedEvent
+					  let isJson = resolvedEvent.IsJson
+					  let data = isJson
+						  ? EatException(() => (object)(resolvedEvent.Data.ParseJson<JObject>()), resolvedEvent.Data)
+						  : resolvedEvent.Data
+					  let metadata = isJson
+						  ? EatException(() => (object)(resolvedEvent.Metadata.ParseJson<JObject>()),
+							  resolvedEvent.Metadata)
+						  : resolvedEvent.Metadata
+					  let linkMetadata = isJson
+						  ? EatException(() => (object)(resolvedEvent.PositionMetadata.ParseJson<JObject>()),
+							  resolvedEvent.PositionMetadata)
+						  : resolvedEvent.PositionMetadata
+					  select new {
+						  EventStreamId = resolvedEvent.EventStreamId,
+						  EventNumber = resolvedEvent.EventSequenceNumber,
+						  EventType = resolvedEvent.EventType,
+						  Data = data,
+						  Metadata = metadata,
+						  LinkMetadata = linkMetadata,
+						  IsJson = isJson,
+						  ReaderPosition = e.ReaderPosition.ToJsonRaw(),
+					  }).ToArray()
+		}.ToJson();
+	}
+
+	private ResponseConfiguration
+		QueryConfigurator(ICodec codec, ProjectionManagementMessage.ProjectionQuery state) {
+		return Configure.Ok("application/javascript", Helper.UTF8NoBom, null, null, false);
+	}
+
+	private string QueryFormatter(ICodec codec, ProjectionManagementMessage.ProjectionQuery state) {
+		return state.Query;
+	}
+
+	private string QueryConfigFormatter(ICodec codec, ProjectionManagementMessage.ProjectionQuery state) {
+		return state.ToJson();
+	}
+
+	private ResponseConfiguration QueryConfigConfigurator(ICodec codec,
+		ProjectionManagementMessage.ProjectionQuery state) {
+		return Configure.Ok(ContentType.Json, Helper.UTF8NoBom, null, null, false);
+	}
+
+	private string ProjectionConfigFormatter(ICodec codec, ProjectionManagementMessage.ProjectionConfig config) {
+		return config.ToJson();
+	}
+
+	private ResponseConfiguration ProjectionConfigConfigurator(ICodec codec,
+		ProjectionManagementMessage.ProjectionConfig state) {
+		return Configure.Ok(ContentType.Json, Helper.UTF8NoBom, null, null, false);
+	}
+
+	private ResponseConfiguration OkResponseConfigurator<T>(ICodec codec, T message) {
+		return new ResponseConfiguration(200, "OK", codec.ContentType, Helper.UTF8NoBom);
+	}
+
+	private ResponseConfiguration OkNoCacheResponseConfigurator<T>(ICodec codec, T message) {
+		return Configure.Ok(codec.ContentType, codec.Encoding, null, null, false);
+	}
+
+	private IEnvelope CreateErrorEnvelope(HttpEntityManager http) {
+		return new SendToHttpEnvelope<ProjectionManagementMessage.NotFound>(
+			_networkSendQueue,
+			http,
+			NotFoundFormatter,
+			NotFoundConfigurator,
+			new SendToHttpEnvelope<ProjectionManagementMessage.NotAuthorized>(
+				_networkSendQueue,
+				http,
+				NotAuthorizedFormatter,
+				NotAuthorizedConfigurator,
+				new SendToHttpEnvelope<ProjectionManagementMessage.Conflict>(
+					_networkSendQueue,
+					http,
+					ConflictFormatter,
+					ConflictConfigurator,
+					new SendToHttpEnvelope<ProjectionManagementMessage.OperationFailed>(
+						_networkSendQueue,
+						http,
+						OperationFailedFormatter,
+						OperationFailedConfigurator,
+						new SendToHttpEnvelope<ProjectionSubsystemMessage.InvalidSubsystemRestart>(
+							_networkSendQueue,
+							http,
+							InvalidSubsystemRestartFormatter,
+							InvalidSubsystemRestartConfigurator,
+							null)))));
+	}
+
+	private ResponseConfiguration NotFoundConfigurator(ICodec codec, ProjectionManagementMessage.NotFound message) {
+		return new ResponseConfiguration(404, "Not Found", ContentType.PlainText, Helper.UTF8NoBom);
+	}
+
+	private string NotFoundFormatter(ICodec codec, ProjectionManagementMessage.NotFound message) {
+		return message.Reason;
+	}
+
+	private ResponseConfiguration NotAuthorizedConfigurator(
+		ICodec codec, ProjectionManagementMessage.NotAuthorized message) {
+		return new ResponseConfiguration(401, "Not Authorized", ContentType.PlainText, Encoding.UTF8);
+	}
+
+	private string NotAuthorizedFormatter(ICodec codec, ProjectionManagementMessage.NotAuthorized message) {
+		return message.Reason;
+	}
+
+	private ResponseConfiguration OperationFailedConfigurator(
+		ICodec codec, ProjectionManagementMessage.OperationFailed message) {
+		return new ResponseConfiguration(500, "Failed", ContentType.PlainText, Helper.UTF8NoBom);
+	}
+
+	private string OperationFailedFormatter(ICodec codec, ProjectionManagementMessage.OperationFailed message) {
+		return message.Reason;
+	}
+
+	private ResponseConfiguration ConflictConfigurator(
+		ICodec codec, ProjectionManagementMessage.OperationFailed message) {
+		return new ResponseConfiguration(409, "Conflict", ContentType.PlainText, Helper.UTF8NoBom);
+	}
+
+	private string ConflictFormatter(ICodec codec, ProjectionManagementMessage.OperationFailed message) {
+		return message.Reason;
+	}
+
+	private static string DefaultFormatter<T>(ICodec codec, T message) {
+		return codec.To(message);
+	}
+
+	private ResponseConfiguration InvalidSubsystemRestartConfigurator(ICodec codec, ProjectionSubsystemMessage.InvalidSubsystemRestart message) {
+		return new ResponseConfiguration(HttpStatusCode.BadRequest, "Bad Request", ContentType.PlainText,
+			Helper.UTF8NoBom);
+	}
+
+	private string InvalidSubsystemRestartFormatter(ICodec codec, ProjectionSubsystemMessage.InvalidSubsystemRestart message) {
+		return message.Reason;
+	}
+
+
+	private static ProjectionManagementMessage.RunAs GetRunAs(HttpEntityManager http, UriTemplateMatch match) {
+		return new ProjectionManagementMessage.RunAs(http.User);
+	}
+
+	private static bool? IsOn(UriTemplateMatch match, string option, bool? def) {
+		var rawValue = match.BoundVariables[option];
+		if (string.IsNullOrEmpty(rawValue))
+			return def;
+		var value = rawValue.ToLowerInvariant();
+		if ("yes" == value || "true" == value || "1" == value)
+			return true;
+		if ("no" == value || "false" == value || "0" == value)
+			return false;
+		//TODO: throw?
+		return def;
+	}
+
+	private static bool IsOn(UriTemplateMatch match, string option, bool def) {
+		var rawValue = match.BoundVariables[option];
+		if (string.IsNullOrEmpty(rawValue))
+			return def;
+		var value = rawValue.ToLowerInvariant();
+		return "yes" == value || "true" == value || "1" == value;
+	}
+
+	public static T EatException<T>(Func<T> func, T defaultValue = default(T)) {
+		Ensure.NotNull(func, "func");
+		try {
+			return func();
+		} catch (Exception) {
+			return defaultValue;
+		}
+	}
+
+	public class ProjectionConfigData {
+		public bool EmitEnabled { get; set; }
+		public bool TrackEmittedStreams { get; set; }
+		public int CheckpointAfterMs { get; set; }
+		public int CheckpointHandledThreshold { get; set; }
+		public int CheckpointUnhandledBytesThreshold { get; set; }
+		public int PendingEventsThreshold { get; set; }
+		public int MaxWriteBatchLength { get; set; }
+		public int MaxAllowedWritesInFlight { get; set; }
+
+		public int? ProjectionExecutionTimeout { get; set; }
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Http/ProjectionsStatisticsHttpFormatted.cs b/src/KurrentDB.Projections.Core/Services/Http/ProjectionsStatisticsHttpFormatted.cs
new file mode 100644
index 00000000000..81da3a16d28
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Http/ProjectionsStatisticsHttpFormatted.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Projections.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Services.Http;
+
+public class ProjectionsStatisticsHttpFormatted {
+	private readonly ProjectionStatisticsHttpFormatted[] _projections;
+
+	public ProjectionsStatisticsHttpFormatted(
+		ProjectionManagementMessage.Statistics source, Func<string, string> makeAbsouteUrl) {
+		_projections =
+			source.Projections.Select(v => new ProjectionStatisticsHttpFormatted(v, makeAbsouteUrl)).ToArray();
+	}
+
+	public ProjectionStatisticsHttpFormatted[] Projections {
+		get { return _projections; }
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/IProjectionStateHandler.cs b/src/KurrentDB.Projections.Core/Services/IProjectionStateHandler.cs
new file mode 100644
index 00000000000..509bfcc01f7
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/IProjectionStateHandler.cs
@@ -0,0 +1,94 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Services;
+
+public interface ISourceDefinitionSource {
+	IQuerySources GetSourceDefinition();
+}
+
+
+public interface IProjectionStateHandler : IDisposable, ISourceDefinitionSource {
+	void Load(string state);
+	void LoadShared(string state);
+	void Initialize();
+	void InitializeShared();
+
+	/// <summary>
+	/// Get state partition from the event
+	/// </summary>
+	/// <returns>partition name</returns>
+	string GetStatePartition(CheckpointTag eventPosition, string category, ResolvedEvent data);
+
+	/// <summary>
+	/// Processes event and updates internal state if necessary.
+	/// </summary>
+	/// <returns>true - if event was processed (new state must be returned) </returns>
+	bool ProcessEvent(
+		string partition, CheckpointTag eventPosition, string category, ResolvedEvent @event, out string newState,
+		out string newSharedState, out EmittedEventEnvelope[] emittedEvents);
+
+	/// <summary>
+	/// Processes partition created notification and updates internal state if necessary.
+	/// </summary>
+	/// <param name="partition"></param>
+	/// <param name="createPosition"></param>
+	/// <param name="event"></param>
+	/// <param name="emittedEvents"></param>
+	/// <returns>true - if notification was processed (new state must be returned)</returns>
+	bool ProcessPartitionCreated(
+		string partition, CheckpointTag createPosition, ResolvedEvent @event,
+		out EmittedEventEnvelope[] emittedEvents);
+
+	/// <summary>
+	/// Processes partition deleted notification and updates internal state if necessary.
+	/// </summary>
+	/// <returns>true - if event was processed (new state must be returned) </returns>
+	bool ProcessPartitionDeleted(string partition, CheckpointTag deletePosition, out string newState);
+
+	/// <summary>
+	/// Transforms current state into a projection result.  Should not call any emit/linkTo etc
+	/// </summary>
+	/// <returns>result JSON or NULL if current state has been skipped</returns>
+	string TransformStateToResult();
+}
+
+public interface IProjectionCheckpointHandler {
+	void ProcessNewCheckpoint(CheckpointTag checkpointPosition, out EmittedEventEnvelope[] emittedEvents);
+}
+
+public static class ProjectionStateHandlerTestExtensions {
+	public static bool ProcessEvent(
+		this IProjectionStateHandler self, string partition, CheckpointTag eventPosition, string streamId,
+		string eventType, string category, Guid eventId, long eventSequenceNumber, string metadata, string data,
+		out string state, out EmittedEventEnvelope[] emittedEvents, bool isJson = true) {
+		string ignoredSharedState;
+		return self.ProcessEvent(
+			partition, eventPosition, category,
+			new ResolvedEvent(
+				streamId, eventSequenceNumber, streamId, eventSequenceNumber, false, new TFPos(0, -1), eventId,
+				eventType, isJson, data, metadata), out state, out ignoredSharedState, out emittedEvents);
+	}
+
+	public static bool ProcessEvent(
+		this IProjectionStateHandler self, string partition, CheckpointTag eventPosition, string streamId,
+		string eventType, string category, Guid eventId, long eventSequenceNumber, string metadata, string data,
+		out string state, out string sharedState, out EmittedEventEnvelope[] emittedEvents, bool isJson = true) {
+		return self.ProcessEvent(
+			partition, eventPosition, category,
+			new ResolvedEvent(
+				streamId, eventSequenceNumber, streamId, eventSequenceNumber, false, new TFPos(0, -1), eventId,
+				eventType, isJson, data, metadata), out state, out sharedState, out emittedEvents);
+	}
+
+	public static string GetNativeHandlerName(this Type handlerType) {
+		return "native:" + handlerType.Namespace + "." + handlerType.Name;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Interpreted/JintProjectionStateHandler.cs b/src/KurrentDB.Projections.Core/Services/Interpreted/JintProjectionStateHandler.cs
new file mode 100644
index 00000000000..0235b2542fe
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Interpreted/JintProjectionStateHandler.cs
@@ -0,0 +1,1227 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Buffers;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Text.Encodings.Web;
+using System.Text.Json;
+using Jint;
+using Jint.Native;
+using Jint.Native.Function;
+using Jint.Native.Json;
+using Jint.Native.Object;
+using Jint.Runtime;
+using Jint.Runtime.Descriptors;
+using Jint.Runtime.Interop;
+using KurrentDB.Core.Services;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using ILogger = Serilog.ILogger;
+
+
+#nullable enable
+namespace KurrentDB.Projections.Core.Services.Interpreted;
+
+public class JintProjectionStateHandler : IProjectionStateHandler {
+	private readonly ILogger _logger = Serilog.Log.ForContext<JintProjectionStateHandler>();
+	private readonly bool _enableContentTypeValidation;
+	private static readonly Stopwatch _sw = Stopwatch.StartNew();
+	private readonly Engine _engine;
+	private readonly SourceDefinitionBuilder _definitionBuilder;
+	private readonly List<EmittedEventEnvelope> _emitted;
+	private readonly InterpreterRuntime _interpreterRuntime;
+	private readonly JsonParser _parser;
+	private CheckpointTag? _currentPosition;
+
+	private JsValue _state;
+	private JsValue _sharedState;
+
+	public JintProjectionStateHandler(string source, bool enableContentTypeValidation, TimeSpan compilationTimeout, TimeSpan executionTimeout) {
+
+		_enableContentTypeValidation = enableContentTypeValidation;
+		_definitionBuilder = new SourceDefinitionBuilder();
+		_definitionBuilder.NoWhen();
+		_definitionBuilder.AllEvents();
+		TimeConstraint timeConstraint = new(compilationTimeout, executionTimeout);
+		_engine = new Engine(opts => opts.Constraint(timeConstraint).DisableStringCompilation());
+		_state = JsValue.Undefined;
+		_sharedState = JsValue.Undefined;
+		_interpreterRuntime = new InterpreterRuntime(_engine, _definitionBuilder);
+		_engine.Global.FastAddProperty("log", new ClrFunction(_engine, "log", Log), false, false, false);
+
+		timeConstraint.Compiling();
+		_engine.Execute(source);
+		timeConstraint.Executing();
+		_parser = _interpreterRuntime.SwitchToExecutionMode();
+
+
+		_engine.Global.FastAddProperty("emit", new ClrFunction(_engine, "emit", Emit, 4), true, false, true);
+		_engine.Global.FastAddProperty("linkTo", new ClrFunction(_engine, "linkTo", LinkTo, 3), true, false, true);
+		_engine.Global.FastAddProperty("linkStreamTo", new ClrFunction(_engine, "linkStreamTo", LinkStreamTo, 3), true, false, true);
+		_engine.Global.FastAddProperty("copyTo", new ClrFunction(_engine, "copyTo", CopyTo, 3), true, false, true);
+		_emitted = new List<EmittedEventEnvelope>();
+	}
+
+	public void Dispose() {
+		_engine.Dispose();
+	}
+
+	public IQuerySources GetSourceDefinition() {
+		_engine.Constraints.Reset();
+		return _definitionBuilder.Build();
+	}
+
+	public void Load(string? state) {
+		_engine.Constraints.Reset();
+		if (state != null) {
+			var jsValue = _parser.Parse(state);
+			LoadCurrentState(jsValue);
+		} else {
+			LoadCurrentState(JsValue.Null);
+		}
+	}
+
+	private void LoadCurrentState(JsValue jsValue) {
+		if (_definitionBuilder.IsBiState) {
+			if (_state == null || _state == JsValue.Undefined)
+				_state = new JsArray(_engine, new[]
+				{
+					JsValue.Undefined, JsValue.Undefined
+				});
+
+			_state.AsArray()[0] = jsValue;
+		} else {
+			_state = jsValue;
+		}
+	}
+
+	public void LoadShared(string? state) {
+		_engine.Constraints.Reset();
+		if (state != null) {
+			var jsValue = _parser.Parse(state);
+			LoadCurrentSharedState(jsValue);
+		} else {
+			LoadCurrentSharedState(JsValue.Null);
+		}
+	}
+
+	private void LoadCurrentSharedState(JsValue jsValue) {
+		if (_definitionBuilder.IsBiState) {
+			if (_state == null || _state == JsValue.Undefined)
+				_state = new JsArray(_engine, new[]
+				{
+					JsValue.Undefined, JsValue.Undefined,
+				});
+
+			_state.AsArray()[1] = jsValue;
+		} else {
+			_state = jsValue;
+		}
+	}
+
+	public void Initialize() {
+		_engine.Constraints.Reset();
+		var state = _interpreterRuntime.InitializeState();
+		LoadCurrentState(state);
+
+	}
+
+	public void InitializeShared() {
+		_engine.Constraints.Reset();
+		_sharedState = _interpreterRuntime.InitializeSharedState();
+		LoadCurrentSharedState(_sharedState);
+	}
+
+	public string? GetStatePartition(CheckpointTag eventPosition, string category, ResolvedEvent data) {
+		_currentPosition = eventPosition;
+		_engine.Constraints.Reset();
+		var envelope = CreateEnvelope("", data, category);
+		var partition = _interpreterRuntime.GetPartition(envelope);
+		if (partition == JsValue.Null || partition == JsValue.Undefined || !(partition.IsString() || partition.IsNumber()))
+			return null;
+
+		return partition.IsNumber() ? partition.AsNumber().ToString() : partition.AsString();
+	}
+
+	public bool ProcessPartitionCreated(string partition, CheckpointTag createPosition, ResolvedEvent @event,
+		out EmittedEventEnvelope[]? emittedEvents) {
+		_engine.Constraints.Reset();
+		_currentPosition = createPosition;
+		var envelope = CreateEnvelope(partition, @event, "");
+		_interpreterRuntime.HandleCreated(_state, envelope);
+
+		emittedEvents = _emitted.Count > 0 ? _emitted.ToArray() : null;
+		_emitted.Clear();
+		return true;
+	}
+
+	public bool ProcessPartitionDeleted(string partition, CheckpointTag deletePosition, out string? newState) {
+		_engine.Constraints.Reset();
+		_currentPosition = deletePosition;
+
+		_interpreterRuntime.HandleDeleted(_state, partition, false);
+		newState = ConvertToStringHandlingNulls(_state);
+		return true;
+	}
+
+	public string? TransformStateToResult() {
+		_engine.Constraints.Reset();
+		var result = _interpreterRuntime.TransformStateToResult(_state);
+		if (result == JsValue.Null || result == JsValue.Undefined)
+			return null;
+		return Serialize(result);
+	}
+
+	public bool ProcessEvent(string partition, CheckpointTag eventPosition, string category, ResolvedEvent @event,
+		out string? newState, out string? newSharedState, out EmittedEventEnvelope[]? emittedEvents) {
+		_currentPosition = eventPosition;
+		_engine.Constraints.Reset();
+		if ((@event.IsJson && string.IsNullOrWhiteSpace(@event.Data)) ||
+			(!_enableContentTypeValidation && !@event.IsJson && string.IsNullOrEmpty(@event.Data))) {
+			PrepareOutput(out newState, out newSharedState, out emittedEvents);
+			return true;
+		}
+
+		var envelope = CreateEnvelope(partition, @event, category);
+		_state = _interpreterRuntime.Handle(_state, envelope);
+		PrepareOutput(out newState, out newSharedState, out emittedEvents);
+		return true;
+	}
+
+	private void PrepareOutput(out string? newState, out string? newSharedState, out EmittedEventEnvelope[]? emittedEvents) {
+		emittedEvents = _emitted.Count > 0 ? _emitted.ToArray() : null;
+		_emitted.Clear();
+		if (_definitionBuilder.IsBiState && _state.IsArray()) {
+			var arr = _state.AsArray();
+			if (arr.TryGetValue(0, out var state)) {
+				if (_state.IsString()) {
+					newState = _state.AsString();
+				} else {
+					newState = ConvertToStringHandlingNulls(state);
+				}
+			} else {
+				newState = "";
+			}
+
+			if (arr.TryGetValue(1, out var sharedState)) {
+				newSharedState = ConvertToStringHandlingNulls(sharedState);
+			} else {
+				newSharedState = null;
+			}
+
+		} else if (_state.IsString()) {
+			newState = _state.AsString();
+			newSharedState = null;
+		} else {
+			newState = ConvertToStringHandlingNulls(_state);
+			newSharedState = null;
+		}
+	}
+
+	private string? ConvertToStringHandlingNulls(JsValue value) {
+		if (value.IsNull() || value.IsUndefined())
+			return null;
+		return Serialize(value);
+	}
+
+	JsValue Emit(JsValue thisValue, JsValue[] parameters) {
+		if (parameters.Length < 3)
+			throw new ArgumentException("invalid number of parameters");
+
+		string stream = EnsureNonNullStringValue(parameters.At(0), "streamId");
+		var eventType = EnsureNonNullStringValue(parameters.At(1), "eventName");
+		var eventBody = EnsureNonNullObjectValue(parameters.At(2), "eventBody");
+
+		if (parameters.Length == 4 && !parameters.At(3).IsObject())
+#pragma warning disable CA2208 // ReSharper disable once NotResolvedInText
+			throw new ArgumentException("object expected", "metadata");
+#pragma warning restore CA2208
+
+		var data = Serialize(eventBody);
+		ExtraMetaData? metadata = null;
+		if (parameters.Length == 4) {
+			var md = parameters.At(3).AsObject();
+			var d = new Dictionary<string, string?>();
+			foreach (var kvp in md.GetOwnProperties()) {
+				if (kvp.Value.Value.Type is Types.Empty or Types.Undefined)
+					continue;
+				d.Add(kvp.Key.AsString(), Serialize(kvp.Value.Value));
+			}
+
+			metadata = new ExtraMetaData(d);
+		}
+		_emitted.Add(new EmittedEventEnvelope(new EmittedDataEvent(stream, Guid.NewGuid(), eventType, true, data, metadata, _currentPosition, null)));
+		return JsValue.Undefined;
+	}
+
+	private static ObjectInstance EnsureNonNullObjectValue(JsValue parameter, string parameterName) {
+		if (parameter == JsValue.Null || parameter == JsValue.Undefined)
+			throw new ArgumentNullException(parameterName);
+		if (!parameter.IsObject())
+			throw new ArgumentException("object expected", parameterName);
+		return parameter.AsObject();
+	}
+
+	private static string EnsureNonNullStringValue(JsValue parameter, string parameterName) {
+		if (parameter != JsValue.Null &&
+			parameter.IsString() &&
+			(parameter.AsString() is { } value &&
+			 !string.IsNullOrWhiteSpace(value)))
+			return value;
+
+		if (parameter == JsValue.Null || parameter == JsValue.Undefined || parameter.IsString())
+			throw new ArgumentNullException(parameterName);
+
+		throw new ArgumentException("string expected", parameterName);
+	}
+
+	string? AsString(JsValue? value, bool formatForRaw) {
+		return value switch {
+			JsBoolean b => b.AsBoolean() ? "true" : "false",
+			JsString s => formatForRaw ? $"\"{s.AsString()}\"" : s.AsString(),
+			JsNumber n => n.AsNumber().ToString(CultureInfo.InvariantCulture),
+			JsNull => null,
+			JsUndefined => null, { } v => Serialize(value),
+			_ => null
+		};
+	}
+
+	JsValue LinkTo(JsValue thisValue, JsValue[] parameters) {
+		if (parameters.Length != 2 && parameters.Length != 3)
+			throw new ArgumentException("wrong number of parameters");
+		var stream = EnsureNonNullStringValue(parameters.At(0), "streamId");
+		var @event = EnsureNonNullObjectValue(parameters.At(1), "event");
+
+		if (!@event.TryGetValue("sequenceNumber", out var numberValue) | !@event.TryGetValue("streamId", out var sourceValue) || !numberValue.IsNumber()
+			 || !sourceValue.IsString()) {
+			throw new Exception($"Invalid link to event {numberValue}@{sourceValue}");
+		}
+
+		var number = (long)numberValue.AsNumber();
+		var source = sourceValue.AsString();
+		ExtraMetaData? metadata = null;
+		if (parameters.Length == 3) {
+			var md = EnsureNonNullObjectValue(parameters.At(2), "metaData");
+			var d = new Dictionary<string, string?>();
+			foreach (var kvp in md.GetOwnProperties()) {
+				d.Add(kvp.Key.AsString(), AsString(kvp.Value.Value, true));
+			}
+			metadata = new ExtraMetaData(d);
+		}
+
+		_emitted.Add(new EmittedEventEnvelope(
+			new EmittedDataEvent(stream, Guid.NewGuid(), SystemEventTypes.LinkTo, false, $"{number}@{source}", metadata, _currentPosition, null)));
+		return JsValue.Undefined;
+	}
+
+	JsValue LinkStreamTo(JsValue thisValue, JsValue[] parameters) {
+
+		var stream = EnsureNonNullStringValue(parameters.At(0), "streamId");
+		var linkedStreamId = EnsureNonNullStringValue(parameters.At(1), "linkedStreamId");
+		if (parameters.Length == 3) {
+
+		}
+
+		ExtraMetaData? metadata = null;
+		if (parameters.Length == 3) {
+			var md = parameters.At(4).AsObject();
+			var d = new Dictionary<string, string?>();
+			foreach (var kvp in md.GetOwnProperties()) {
+				d.Add(kvp.Key.AsString(), AsString(kvp.Value.Value, true));
+			}
+			metadata = new ExtraMetaData(d);
+		}
+		_emitted.Add(new EmittedEventEnvelope(
+			new EmittedDataEvent(stream, Guid.NewGuid(), SystemEventTypes.StreamReference, false, linkedStreamId, metadata, _currentPosition, null)));
+		return JsValue.Undefined;
+	}
+
+	JsValue CopyTo(JsValue thisValue, JsValue[] parameters) {
+		return JsValue.Undefined;
+	}
+
+	void Log(string message) {
+		_logger.Debug(message, Array.Empty<object>());
+	}
+
+	private JsValue Log(JsValue thisValue, JsValue[] parameters) {
+		if (parameters.Length == 0)
+			return JsValue.Undefined;
+		if (parameters.Length == 1) {
+			var p0 = parameters.At(0);
+			if (p0 != null && p0.IsPrimitive())
+				Log(p0.ToString());
+			if (p0 is ObjectInstance oi)
+				Log(Serialize(oi));
+			return JsValue.Undefined;
+		}
+
+
+		if (parameters.Length > 1) {
+			var sb = new StringBuilder();
+			for (int i = 0; i < parameters.Length; i++) {
+				if (i > 1)
+					sb.Append(" ,");
+				var p = parameters.At(i);
+				if (p != null && p.IsPrimitive())
+					Log(p.ToString());
+				if (p is ObjectInstance oi)
+					sb.Append(Serialize(oi));
+			}
+
+			Log(sb.ToString());
+		}
+		return JsValue.Undefined;
+	}
+
+	class TimeConstraint : Constraint {
+		private readonly TimeSpan _compilationTimeout;
+		private readonly TimeSpan _executionTimeout;
+		private TimeSpan _start;
+		private TimeSpan _timeout;
+		private bool _executing;
+
+		public TimeConstraint(TimeSpan compilationTimeout, TimeSpan executionTimeout) {
+			_compilationTimeout = compilationTimeout;
+			_executionTimeout = executionTimeout;
+			_timeout = _compilationTimeout;
+		}
+
+		public void Compiling() {
+			_timeout = _compilationTimeout;
+			_executing = false;
+		}
+
+		public void Executing() {
+			_timeout = _executionTimeout;
+			_executing = true;
+
+		}
+		public override void Reset() {
+			_start = _sw.Elapsed;
+		}
+
+		public override void Check() {
+			if (_sw.Elapsed - _start >= _timeout) {
+				if (Debugger.IsAttached)
+					return;
+				var action = _executing ? "execute" : "compile";
+				throw new TimeoutException($"Projection script took too long to {action} (took: {_sw.Elapsed - _start:c}, allowed: {_timeout:c}");
+			}
+		}
+	}
+
+	class InterpreterRuntime : ObjectInstance {
+
+		private readonly Dictionary<string, ScriptFunction> _handlers;
+		private readonly List<(TransformType, ScriptFunction)> _transforms;
+		private readonly List<ScriptFunction> _createdHandlers;
+		private ScriptFunction? _init;
+		private ScriptFunction? _initShared;
+		private ScriptFunction? _any;
+		private ScriptFunction? _deleted;
+		private ScriptFunction? _partitionFunction;
+
+		private readonly JsValue _whenInstance;
+		private readonly JsValue _partitionByInstance;
+		private readonly JsValue _outputStateInstance;
+		private readonly JsValue _foreachStreamInstance;
+		private readonly JsValue _transformByInstance;
+		private readonly JsValue _filterByInstance;
+		private readonly JsValue _outputToInstance;
+		private readonly JsValue _definesStateTransformInstance;
+
+		private readonly SourceDefinitionBuilder _definitionBuilder;
+		private readonly JsonParser _parser;
+
+		private static readonly Dictionary<string, Action<InterpreterRuntime>> _possibleProperties = new Dictionary<string, Action<InterpreterRuntime>>() {
+			["when"] = i => i.FastAddProperty("when", i._whenInstance, true, false, true),
+			["partitionBy"] = i => i.FastAddProperty("partitionBy", i._partitionByInstance, true, false, true),
+			["outputState"] = i => i.FastAddProperty("outputState", i._outputStateInstance, true, false, true),
+			["foreachStream"] = i => i.FastAddProperty("foreachStream", i._foreachStreamInstance, true, false, true),
+			["transformBy"] = i => i.FastAddProperty("transformBy", i._transformByInstance, true, false, true),
+			["filterBy"] = i => i.FastAddProperty("filterBy", i._filterByInstance, true, false, true),
+			["outputTo"] = i => i.FastAddProperty("outputTo", i._outputToInstance, true, false, true),
+			["$defines_state_transform"] = i => i.FastAddProperty("$defines_state_transform", i._definesStateTransformInstance, true, false, true),
+		};
+
+		private static readonly Dictionary<string, string[]> _availableProperties = new Dictionary<string, string[]>() {
+			["fromStream"] = new[] { "when", "partitionBy", "outputState" },
+			["fromAll"] = new[] { "when", "partitionBy", "outputState", "foreachStream" },
+			["fromStreams"] = new[] { "when", "partitionBy", "outputState" },
+			["fromCategory"] = new[] { "when", "partitionBy", "outputState", "foreachStream" },
+			["when"] = new[] { "transformBy", "filterBy", "outputState", "outputTo", "$defines_state_transform" },
+			["foreachStream"] = new[] { "when" },
+			["outputState"] = new[] { "transformBy", "filterBy", "outputTo" },
+			["partitionBy"] = new[] { "when" },
+			["transformBy"] = new[] { "transformBy", "filterBy", "outputState", "outputTo" },
+			["filterBy"] = new[] { "transformBy", "filterBy", "outputState", "outputTo" },
+			["outputTo"] = Array.Empty<string>(),
+			["execution"] = Array.Empty<string>()
+		};
+
+		private static readonly Dictionary<string, Action<SourceDefinitionBuilder, JsValue>> _setters =
+			new Dictionary<string, Action<SourceDefinitionBuilder, JsValue>>(StringComparer.OrdinalIgnoreCase) {
+				{"$includeLinks", (options, value) => options.SetIncludeLinks(value.IsBoolean()? value.AsBoolean() : throw new Exception("Invalid value"))},
+				{"reorderEvents", (options, value) => options.SetReorderEvents(value.IsBoolean()? value.AsBoolean(): throw new Exception("Invalid value"))},
+				{"processingLag", (options, value) => options.SetProcessingLag(value.IsNumber() ? (int)value.AsNumber() : throw new Exception("Invalid value"))},
+				{"resultStreamName", (options, value) => options.SetResultStreamNameOption(value.IsString() ? value.AsString() : throw new Exception("Invalid value"))},
+				{"biState", (options, value) => options.SetIsBiState(value.IsBoolean()? value.AsBoolean() : throw new Exception("Invalid value"))},
+			};
+
+		private readonly List<string> _definitionFunctions;
+
+		public InterpreterRuntime(Engine engine, SourceDefinitionBuilder builder) : base(engine) {
+
+			_definitionBuilder = builder;
+			_handlers = new Dictionary<string, ScriptFunction>(StringComparer.Ordinal);
+			_createdHandlers = new List<ScriptFunction>();
+			_transforms = new List<(TransformType, ScriptFunction)>();
+			_parser = new JsonParser(engine);
+			_definitionFunctions = new List<string>();
+			AddDefinitionFunction("options", SetOptions, 1);
+			AddDefinitionFunction("fromStream", FromStream, 1);
+			AddDefinitionFunction("fromCategory", FromCategory, 4);
+			AddDefinitionFunction("fromCategories", FromCategory, 4);
+			AddDefinitionFunction("fromAll", FromAll, 0);
+			AddDefinitionFunction("fromStreams", FromStreams, 1);
+			AddDefinitionFunction("on_event", OnEvent, 1);
+			AddDefinitionFunction("on_any", OnAny, 1);
+			_whenInstance = new ClrFunction(engine, "when", When, 1);
+			_partitionByInstance = new ClrFunction(engine, "partitionBy", PartitionBy, 1);
+			_outputStateInstance = new ClrFunction(engine, "outputState", OutputState, 1);
+			_foreachStreamInstance = new ClrFunction(engine, "foreachStream", ForEachStream, 1);
+			_transformByInstance = new ClrFunction(engine, "transformBy", TransformBy, 1);
+			_filterByInstance = new ClrFunction(engine, "filterBy", FilterBy, 1);
+			_outputToInstance = new ClrFunction(engine, "outputTo", OutputTo, 1);
+			_definesStateTransformInstance = new ClrFunction(engine, "$defines_state_transform", DefinesStateTransform);
+
+		}
+
+		private void AddDefinitionFunction(string name, Func<JsValue, JsValue[], JsValue> func, int length) {
+			_definitionFunctions.Add(name);
+			_engine.Global.FastAddProperty(name, new ClrFunction(_engine, name, func, length), true, false, true);
+		}
+
+		private JsValue FromStream(JsValue _, JsValue[] parameters) {
+			var stream = parameters.At(0);
+			if (stream is not JsString)
+				throw new ArgumentException("stream");
+			_definitionBuilder.FromStream(stream.AsString());
+			RestrictProperties("fromStream");
+
+			return this;
+		}
+
+		private JsValue FromCategory(JsValue thisValue, JsValue[] parameters) {
+			if (parameters.Length == 0)
+				return this;
+			if (parameters.Length == 1 && parameters.At(0).IsArray()) {
+				foreach (var cat in parameters.At(0).AsArray()) {
+					if (cat is not JsString s) {
+						throw new ArgumentException("categories");
+					}
+					_definitionBuilder.FromStream($"$ce-{s.AsString()}");
+				}
+			} else if (parameters.Length > 1) {
+				foreach (var cat in parameters) {
+					if (cat is not JsString s) {
+						throw new ArgumentException("categories");
+					}
+					_definitionBuilder.FromStream($"$ce-{s.AsString()}");
+				}
+			} else {
+				var p0 = parameters.At(0);
+				if (p0 is not JsString s)
+					throw new ArgumentException("category");
+				_definitionBuilder.FromCategory(s.AsString());
+			}
+
+			RestrictProperties("fromCategory");
+
+			return this;
+		}
+
+		private JsValue When(JsValue thisValue, JsValue[] parameters) {
+			if (parameters.At(0) is ObjectInstance handlers) {
+				foreach (var kvp in handlers.GetOwnProperties()) {
+					if (kvp.Key.IsString() && kvp.Value.Value is ScriptFunction) {
+						var key = kvp.Key.AsString();
+						AddHandler(key, (ScriptFunction)kvp.Value.Value);
+					}
+				}
+			}
+			_definitionBuilder.SetDefinesFold();
+			RestrictProperties("when");
+			return this;
+		}
+
+		private JsValue PartitionBy(JsValue thisValue, JsValue[] parameters) {
+			if (parameters.At(0) is ScriptFunction partitionFunction) {
+				_definitionBuilder.SetByCustomPartitions();
+
+
+				_partitionFunction = partitionFunction;
+				RestrictProperties("partitionBy");
+				return this;
+			}
+
+			throw new ArgumentException("partitionBy");
+		}
+
+		private JsValue ForEachStream(JsValue thisValue, JsValue[] parameters) {
+			_definitionBuilder.SetByStream();
+			RestrictProperties("foreachStream");
+			return this;
+		}
+
+		private JsValue OutputState(JsValue thisValue, JsValue[] parameters) {
+			RestrictProperties("outputState");
+			_definitionBuilder.SetOutputState();
+			return this;
+		}
+
+		private JsValue OutputTo(JsValue thisValue, JsValue[] parameters) {
+			if (parameters.Length != 1 && parameters.Length != 2)
+				throw new ArgumentException("invalid number of parameters");
+			if (!parameters.At(0).IsString())
+#pragma warning disable CA2208 // ReSharper disable NotResolvedInText
+				throw new ArgumentException("expected string value", "resultStream");
+			if (parameters.Length == 2 && !parameters.At(1).IsString())
+				throw new ArgumentException("expected string value", "partitionResultStreamPattern");
+#pragma warning restore CA2208 // ReSharper restore NotResolvedInText
+			_definitionBuilder.SetResultStreamNameOption(parameters.At(0).AsString());
+			if (parameters.Length == 2)
+				_definitionBuilder.SetPartitionResultStreamNamePatternOption(parameters.At(1).AsString());
+			RestrictProperties("outputTo");
+			return this;
+		}
+
+		private JsValue DefinesStateTransform(JsValue thisValue, JsValue[] parameters) {
+			_definitionBuilder.SetDefinesStateTransform();
+			_definitionBuilder.SetOutputState();
+			return Undefined;
+		}
+
+		private JsValue FilterBy(JsValue thisValue, JsValue[] parameters) {
+			if (parameters.At(0) is ScriptFunction fi) {
+				_definitionBuilder.SetDefinesStateTransform();
+				_definitionBuilder.SetOutputState();
+				_transforms.Add((TransformType.Filter, fi));
+				RestrictProperties("filterBy");
+				return this;
+			}
+
+			throw new ArgumentException("expected function");
+		}
+
+		private JsValue TransformBy(JsValue thisValue, JsValue[] parameters) {
+			if (parameters.At(0) is ScriptFunction fi) {
+				_definitionBuilder.SetDefinesStateTransform();
+				_definitionBuilder.SetOutputState();
+				_transforms.Add((TransformType.Transform, fi));
+				RestrictProperties("transformBy");
+				return this;
+			}
+
+			throw new ArgumentException("expected function");
+		}
+
+		private JsValue OnEvent(JsValue thisValue, JsValue[] parameters) {
+			if (parameters.Length != 2)
+				throw new ArgumentException("invalid number of parameters");
+			var eventName = parameters.At(0);
+			var handler = parameters.At(1);
+			if (!eventName.IsString())
+				throw new ArgumentException("eventName");
+			if (handler is not ScriptFunction fi)
+				throw new ArgumentException("eventHandler");
+			AddHandler(eventName.AsString(), fi);
+			return Undefined;
+		}
+
+		private JsValue OnAny(JsValue thisValue, JsValue[] parameters) {
+			if (parameters.Length != 1)
+				throw new ArgumentException("invalid number of parameters");
+			if (parameters.At(0) is not ScriptFunction fi)
+				throw new ArgumentException("eventHandler");
+			AddHandler("$any", fi);
+			return Undefined;
+		}
+
+		private void AddHandler(string name, ScriptFunction handler) {
+			switch (name) {
+				case "$init":
+					_init = handler;
+					break;
+				case "$initShared":
+					_definitionBuilder.SetIsBiState(true);
+					_initShared = handler;
+					break;
+				case "$any":
+					_any = handler;
+					_definitionBuilder.AllEvents();
+					break;
+				case "$created":
+					_createdHandlers.Add(handler);
+					break;
+				case "$deleted" when !_definitionBuilder.IsBiState:
+					_definitionBuilder.SetHandlesStreamDeletedNotifications();
+					_deleted = handler;
+					break;
+				case "$deleted" when _definitionBuilder.IsBiState:
+					throw new Exception("Cannot handle deletes in bi-state projections");
+				default:
+					_definitionBuilder.NotAllEvents();
+					_definitionBuilder.IncludeEvent(name);
+					_handlers.Add(name, handler);
+					break;
+			}
+		}
+
+		private void RestrictProperties(string state) {
+			var allowed = _availableProperties[state];
+			var current = GetOwnPropertyKeys();
+			foreach (var p in current) {
+				if (!allowed.Contains(p.AsString())) {
+					RemoveOwnProperty(p);
+				}
+			}
+
+			foreach (var p in allowed) {
+				if (!HasOwnProperty(p)) {
+					_possibleProperties[p](this);
+				}
+			}
+		}
+
+		public JsValue InitializeState() {
+			return _init == null ? new JsObject(Engine) : _init.Call();
+		}
+
+		public JsValue InitializeSharedState() {
+			return _initShared == null ? new JsObject(Engine) : _initShared.Call();
+		}
+
+		public JsValue Handle(JsValue state, EventEnvelope eventEnvelope) {
+			JsValue newState;
+			if (_handlers.TryGetValue(eventEnvelope.EventType, out var handler)) {
+				newState = handler.Call(state, FromObject(Engine, eventEnvelope));
+			} else if (_any != null) {
+				newState = _any.Call(state, FromObject(Engine, eventEnvelope));
+			} else {
+				newState = eventEnvelope.BodyRaw;
+			}
+			return newState == Undefined ? state : newState;
+		}
+
+		public JsValue TransformStateToResult(JsValue state) {
+			foreach (var (type, transform) in _transforms) {
+				switch (type) {
+					case TransformType.Transform:
+						state = transform.Call(state);
+						break;
+					case TransformType.Filter: {
+						var result = transform.Call(state);
+						if (!(result.IsBoolean() && result.AsBoolean()) || result == Null || result == Undefined) {
+							return Null;
+						}
+						break;
+					}
+					case TransformType.None:
+						throw new InvalidOperationException("Unknown transform type");
+				}
+
+				if (state == Null || state == Undefined)
+					return Null;
+			}
+
+			return state;
+		}
+
+		JsValue FromAll(JsValue _, JsValue[] __) {
+			_definitionBuilder.FromAll();
+			RestrictProperties("fromAll");
+			return this;
+		}
+
+		JsValue FromStreams(JsValue _, JsValue[] parameters) {
+			IEnumerator<JsValue>? streams = null;
+			try {
+				streams = parameters.At(0).IsArray() ? parameters.At(0).AsArray().GetEnumerator() : parameters.AsEnumerable().GetEnumerator();
+				while (streams.MoveNext()) {
+					if (!streams.Current.IsString())
+						throw new ArgumentException("streams");
+					_definitionBuilder.FromStream(streams.Current.AsString());
+				}
+			} finally {
+				streams?.Dispose();
+			}
+
+			RestrictProperties("fromStreams");
+			return this;
+		}
+
+
+		JsValue SetOptions(JsValue thisValue, JsValue[] parameters) {
+			var p0 = parameters.At(0);
+			if (p0 is ObjectInstance opts) {
+				foreach (var kvp in opts.GetOwnProperties()) {
+					if (_setters.TryGetValue(kvp.Key.AsString(), out var setter)) {
+						setter(_definitionBuilder, kvp.Value.Value);
+					} else {
+						throw new Exception($"Unrecognized option: {kvp.Key}");
+					}
+				}
+			}
+
+			return Undefined;
+		}
+
+		public JsValue GetPartition(EventEnvelope envelope) {
+			if (_partitionFunction != null)
+				return _partitionFunction.Call(envelope);
+			return Null;
+		}
+
+		public void HandleCreated(JsValue state, EventEnvelope envelope) {
+			for (int i = 0; i < _createdHandlers.Count; i++) {
+				_createdHandlers[i].Call(Undefined, new[] { state, envelope });
+			}
+		}
+
+		enum TransformType {
+			None,
+			Filter,
+			Transform
+		}
+
+		public JsonParser SwitchToExecutionMode() {
+			RestrictProperties("execution");
+			foreach (var globalProp in _definitionFunctions) {
+				_engine.Global.RemoveOwnProperty(globalProp);
+			}
+			return _parser;
+		}
+
+
+		public void HandleDeleted(JsValue state, string partition, bool isSoftDelete) {
+			if (_deleted != null) {
+				_deleted.Call(this, new JsValue[] { state, Null, partition, isSoftDelete });
+			}
+		}
+	}
+
+	EventEnvelope CreateEnvelope(string partition, ResolvedEvent @event, string category) {
+		var envelope = new EventEnvelope(_engine, _parser, this);
+		envelope.Partition = partition;
+		envelope.BodyRaw = @event.Data;
+		envelope.MetadataRaw = @event.Metadata;
+		envelope.StreamId = @event.EventStreamId;
+		envelope.EventId = @event.EventId.ToString("D");
+		envelope.EventType = @event.EventType;
+		envelope.LinkMetadataRaw = @event.PositionMetadata;
+		envelope.IsJson = @event.IsJson;
+		envelope.Category = category;
+		envelope.SequenceNumber = @event.EventSequenceNumber;
+		return envelope;
+	}
+	sealed class EventEnvelope : ObjectInstance {
+		private readonly JsonParser _parser;
+		private readonly JintProjectionStateHandler _parent;
+
+		public string StreamId {
+			set => SetOwnProperty("streamId", new PropertyDescriptor(value, false, true, false));
+		}
+		public long SequenceNumber {
+			set => SetOwnProperty("sequenceNumber", new PropertyDescriptor(value, false, true, false));
+		}
+
+		public string EventType {
+			get => _parent.AsString(Get("eventType"), false) ?? "";
+			set => SetOwnProperty("eventType", new PropertyDescriptor(value, false, true, false));
+		}
+
+		public JsValue Body {
+			get {
+				if (TryGetValue("body", out var value) && value is ObjectInstance oi)
+					return oi;
+				if (EnsureBody(out JsValue objectInstance))
+					return objectInstance;
+
+				return Undefined;
+			}
+		}
+
+		private bool EnsureBody(out JsValue objectInstance) {
+			if (IsJson && TryGetValue("bodyRaw", out var raw) && raw is not JsUndefined) {
+				var body = raw.IsNull() ? raw : _parser.Parse(raw.AsString());
+				var pd = new PropertyDescriptor(body, false, true, false);
+				SetOwnProperty("body", pd);
+				SetOwnProperty("data", pd);
+				objectInstance = (ObjectInstance)body;
+				return true;
+			}
+
+			objectInstance = Undefined;
+			return false;
+		}
+
+		public bool IsJson {
+			get => Get("isJson").AsBoolean();
+			set => SetOwnProperty("isJson", new PropertyDescriptor(value, false, true, false));
+		}
+
+		public string? BodyRaw {
+			get => _parent.AsString(Get("bodyRaw"), false);
+			set => SetOwnProperty("bodyRaw", new PropertyDescriptor(value, false, true, false));
+		}
+
+		private JsValue Metadata {
+			get {
+				if (TryGetValue("metadata", out var value) && value is ObjectInstance oi)
+					return oi;
+				if (EnsureMetadata(out value))
+					return value;
+
+				return Undefined;
+			}
+		}
+
+		private bool EnsureMetadata(out JsValue value) {
+			if (TryGetValue("metadataRaw", out var raw) && raw is not JsUndefined) {
+				var metadata = raw.IsNull() ? raw : _parser.Parse(raw.AsString());
+				SetOwnProperty("metadata", new PropertyDescriptor(metadata, false, true, false));
+				{
+					value = metadata;
+					return true;
+				}
+			}
+
+			value = Undefined;
+			return false;
+		}
+
+		public string MetadataRaw {
+			set => FastSetProperty("metadataRaw", new PropertyDescriptor(value, false, true, false));
+		}
+
+		private JsValue LinkMetadata {
+			get {
+				if (TryGetValue("linkMetadata", out var value) && value is ObjectInstance oi)
+					return oi;
+				if (EnsureLinkMetadata(out value))
+					return value;
+
+				return Undefined;
+			}
+		}
+
+		private bool EnsureLinkMetadata(out JsValue value) {
+			if (TryGetValue("linkMetadataRaw", out var raw) && raw is not JsUndefined) {
+				var metadata = raw.IsNull() ? raw : _parser.Parse(raw.AsString());
+				SetOwnProperty("linkMetadata", new PropertyDescriptor(metadata, false, true, false));
+				{
+					value = metadata;
+					return true;
+				}
+			}
+
+			value = Undefined;
+			return false;
+		}
+
+		public string LinkMetadataRaw {
+			set => SetOwnProperty("linkMetadataRaw", new PropertyDescriptor(value, false, true, false));
+		}
+
+		public string Partition {
+			set => SetOwnProperty("partition", new PropertyDescriptor(value, false, true, false));
+		}
+
+		public string Category {
+			set => SetOwnProperty("category", new PropertyDescriptor(value, false, true, false));
+		}
+
+		public string EventId {
+			set => SetOwnProperty("eventId", new PropertyDescriptor(value, false, true, false));
+		}
+
+		public EventEnvelope(Engine engine, JsonParser parser, JintProjectionStateHandler parent) : base(engine) {
+			_parser = parser;
+			_parent = parent;
+		}
+
+		public override JsValue Get(JsValue property, JsValue receiver) {
+			if (property == "body" || property == "data") {
+				return Body;
+			}
+
+			if (property == "metadata") {
+				return Metadata;
+			}
+
+			if (property == "linkMetadata") {
+				return LinkMetadata;
+			}
+			return base.Get(property, receiver);
+		}
+
+		public override List<JsValue> GetOwnPropertyKeys(Types types = Types.String | Types.Symbol) {
+			var list = base.GetOwnPropertyKeys(types);
+			return list;
+		}
+
+		public override IEnumerable<KeyValuePair<JsValue, PropertyDescriptor>> GetOwnProperties() {
+			if (!HasOwnProperty("body")) {
+				EnsureBody(out _);
+			}
+
+			if (!HasOwnProperty("metadata")) {
+				EnsureMetadata(out _);
+			}
+
+			if (!HasOwnProperty("linkMetadata")) {
+				EnsureLinkMetadata(out _);
+			}
+
+			var list = base.GetOwnProperties();
+
+			return list;
+		}
+	}
+
+	private readonly Serializer _serializer = new Serializer();
+	public string Serialize(JsValue value) {
+		var serialized = _serializer.Serialize(value);
+		return Encoding.UTF8.GetString(serialized.Span);
+	}
+
+	private class Serializer {
+		private readonly WriteState[] _iterators;
+		private readonly ArrayBufferWriter<byte> _bufferWriter;
+		private readonly Utf8JsonWriter _writer;
+		private readonly Dictionary<string, JsonEncodedText> _knownPropertyNames;
+		private int _depth;
+
+		public Serializer() {
+			_iterators = new WriteState[64];
+			_bufferWriter = new ArrayBufferWriter<byte>(1024 * 1024);
+			_writer = new Utf8JsonWriter(
+				_bufferWriter,
+				new JsonWriterOptions {
+					Indented = false,
+					SkipValidation = true,
+					Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+				});
+			_knownPropertyNames = new Dictionary<string, JsonEncodedText>();
+		}
+
+		public ReadOnlyMemory<byte> Serialize(JsValue value) {
+			_depth = 0;
+			_bufferWriter.Clear();
+			_writer.Reset();
+
+			if (value is JsArray array) {
+				_iterators[_depth] = new WriteState(array);
+			} else if (value is ObjectInstance oi) {
+				_iterators[_depth] = new WriteState(oi);
+			} else {
+				_iterators[_depth] = new WriteState(value);
+			}
+			ref var current = ref _iterators[0];
+
+			while (current.Write(_writer, ref _depth, _iterators, _knownPropertyNames)) {
+				current = ref _iterators[_depth];
+			}
+			_writer.Flush();
+			return _bufferWriter.WrittenMemory;
+
+		}
+
+		struct WriteState {
+			private enum Type {
+				Complete,
+				Array,
+				Object,
+				Primitive,
+			}
+
+			private static readonly IEnumerator<KeyValuePair<JsValue, PropertyDescriptor>> _emptyIterator =
+				new NoopIterator();
+
+			class NoopIterator : IEnumerator<KeyValuePair<JsValue, PropertyDescriptor>> {
+				public KeyValuePair<JsValue, PropertyDescriptor> Current => default;
+
+				object? IEnumerator.Current => default;
+
+				public void Dispose() {
+				}
+
+				public bool MoveNext() {
+					return false;
+				}
+
+				public void Reset() {
+				}
+			}
+
+			public WriteState(JsArray instance) {
+				_position = -1;
+				_length = (int)instance.Length;
+				_instance = instance;
+				_type = Type.Array;
+				_started = false;
+				_iterator = _emptyIterator;
+			}
+
+			public WriteState(ObjectInstance instance) {
+				_position = -1;
+				_length = -1;
+				_instance = JsValue.Null;
+				_type = Type.Object;
+				_started = false;
+				_iterator = instance.GetOwnProperties().GetEnumerator();
+			}
+
+			public WriteState(JsValue instance) {
+				if (instance.Type == Types.Object)
+					throw new ArgumentException("Primitive overload called for object instance");
+				_position = -1;
+				_length = -1;
+				_instance = instance;
+				_type = Type.Primitive;
+				_started = false;
+				_iterator = _emptyIterator;
+			}
+
+			private readonly JsValue _instance;
+			private readonly IEnumerator<KeyValuePair<JsValue, PropertyDescriptor>> _iterator;
+			private readonly Type _type;
+			private readonly int _length;
+			private int _position;
+			private bool _started;
+
+			[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+			public bool Write(
+				Utf8JsonWriter writer,
+				ref int depth,
+				WriteState[] writeStates,
+				Dictionary<string, JsonEncodedText> knownPropertyNames) {
+
+				switch (_type) {
+					case Type.Array:
+						if (_position == -1) {
+							writer.WriteStartArray();
+							_position++;
+						}
+						var instance = (JsArray)_instance;
+						for (; _position < _length; _position++) {
+							var value = instance[(uint)_position];
+							if (value.Type == Types.Object) {
+								if (value is JsArray ai) {
+									writeStates[++depth] = new WriteState(ai);
+								} else {
+									writeStates[++depth] = new WriteState(value.AsObject());
+								}
+								_position++;
+								return true;
+							}
+							SerializePrimitive(value, writer);
+						}
+						writer.WriteEndArray();
+						break;
+					case Type.Object:
+						if (!_started) {
+							writer.WriteStartObject();
+							_started = true;
+						}
+						while (_iterator.MoveNext()) {
+							var (name, propertyDescriptor) = _iterator.Current;
+							var value = propertyDescriptor.Value;
+							if (value.Type == Types.Undefined)
+								continue;
+
+							WriteMaybeCachedPropertyName(name.AsString(), knownPropertyNames, writer);
+							if (value.Type == Types.Object) {
+								if (value is JsArray ai) {
+									writeStates[++depth] = new WriteState(ai);
+								} else {
+									writeStates[++depth] = new WriteState(value.AsObject());
+								}
+								_position++;
+								return true;
+							} else {
+								SerializePrimitive(value, writer);
+							}
+
+						}
+
+						writer.WriteEndObject();
+						break;
+					case Type.Primitive:
+						SerializePrimitive(_instance, writer);
+						break;
+				}
+				writeStates[depth] = default;
+				depth--;
+				return depth >= 0;
+			}
+		}
+
+		[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+		private static void WriteMaybeCachedPropertyName(string name, Dictionary<string, JsonEncodedText> knownPropertyNames, Utf8JsonWriter writer) {
+			if (!knownPropertyNames.TryGetValue(name, out var propertyName)) {
+				propertyName = JsonEncodedText.Encode(name);
+				if (knownPropertyNames.Count < 1000) {
+					knownPropertyNames.Add(name, propertyName);
+				}
+			}
+			writer.WritePropertyName(propertyName);
+		}
+
+		[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
+		static void SerializePrimitive(JsValue value, Utf8JsonWriter writer) {
+
+			switch (value.Type) {
+				case Types.Null:
+				case Types.Undefined:
+				case Types.Empty:
+					writer.WriteNullValue();
+					break;
+				case Types.Boolean:
+					if (ReferenceEquals(value, JsBoolean.False))
+						writer.WriteBooleanValue(false);
+					else
+						writer.WriteBooleanValue(true);
+					break;
+				case Types.Number:
+					writer.WriteNumberValue(value.AsNumber());
+					break;
+				case Types.BigInt:
+					writer.WriteStringValue(value.ToString());
+					break;
+				case Types.String:
+					writer.WriteStringValue(value.AsString());
+					break;
+				default:
+					throw new Exception($"Cannot serialize {value.Type} as primitive");
+			}
+		}
+	}
+}
+
+internal static class ObjectInstanceExtensions {
+	public static void FastAddProperty(this ObjectInstance target, string name, JsValue value, bool writable, bool enumerable, bool configurable) {
+		target.FastSetProperty(name, new PropertyDescriptor(value, writable, enumerable, configurable));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Management/ManagedProjection.cs b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjection.cs
new file mode 100644
index 00000000000..96af121d95e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjection.cs
@@ -0,0 +1,1126 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading;
+using FastSerialization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Projections.Core.Common;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Management.ManagedProjectionStates;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Utils;
+using Serilog;
+using ILogger = Serilog.ILogger;
+using ReadStreamResult = KurrentDB.Core.Data.ReadStreamResult;
+
+namespace KurrentDB.Projections.Core.Services.Management;
+
+
+public static class PersistedStateExtensions {
+	public static Boolean CheckpointStreamNeedsDeleted(this ManagedProjection.PersistedState persistedState) {
+		return persistedState.DeleteCheckpointStream && persistedState.CheckpointsDisabled.GetValueOrDefault() == false;
+	}
+
+	public static Boolean EmitStreamNeedsDeleted(this ManagedProjection.PersistedState persistedState) {
+		return (persistedState.DeleteEmittedStreams && persistedState.EmitEnabled.GetValueOrDefault());
+	}
+}
+
+/// <summary>
+/// managed projection controls start/stop/create/update/delete lifecycle of the projection.
+/// </summary>
+public class ManagedProjection : IDisposable {
+	public class PersistedState {
+		public string HandlerType { get; set; }
+		public string Query { get; set; }
+		public ProjectionMode Mode { get; set; }
+		public bool Enabled { get; set; }
+		public bool Deleted { get; set; }
+		public bool Deleting { get; set; }
+		public bool DeleteEmittedStreams { get; set; }
+		public bool DeleteCheckpointStream { get; set; }
+		public bool DeleteStateStream { get; set; }
+		public int NumberOfPrequisitesMetForDeletion;
+		public string Message { get; set; }
+
+		public ProjectionSourceDefinition SourceDefinition { get; set; }
+		public bool? EmitEnabled { get; set; }
+		public bool? CreateTempStreams { get; set; }
+		public bool? CheckpointsDisabled { get; set; }
+		public bool? TrackEmittedStreams { get; set; }
+		public long? Epoch { get; set; }
+		public long? Version { get; set; }
+		public SerializedRunAs RunAs { get; set; }
+		public int CheckpointHandledThreshold { get; set; }
+		public int CheckpointAfterMs { get; set; }
+		public int CheckpointUnhandledBytesThreshold { get; set; }
+		public int PendingEventsThreshold { get; set; }
+		public int MaxWriteBatchLength { get; set; }
+		public int MaxAllowedWritesInFlight { get; set; }
+		public int? ProjectionSubsystemVersion { get; set; }
+
+		public int? ProjectionExecutionTimeout { get; set; }
+
+		public PersistedState() {
+			CheckpointHandledThreshold = ProjectionConsts.CheckpointHandledThreshold;
+			CheckpointAfterMs = (int)ProjectionConsts.CheckpointAfterMs.TotalMilliseconds;
+			CheckpointUnhandledBytesThreshold = ProjectionConsts.CheckpointUnhandledBytesThreshold;
+			PendingEventsThreshold = ProjectionConsts.PendingEventsThreshold;
+			MaxWriteBatchLength = ProjectionConsts.MaxWriteBatchLength;
+			MaxAllowedWritesInFlight = ProjectionConsts.MaxAllowedWritesInFlight;
+		}
+	}
+
+	private readonly IPublisher _output;
+
+	private readonly RequestResponseDispatcher<ClientMessage.DeleteStream, ClientMessage.DeleteStreamCompleted>
+		_streamDispatcher;
+
+	private readonly RequestResponseDispatcher<ClientMessage.WriteEvents, ClientMessage.WriteEventsCompleted>
+		_writeDispatcher;
+
+	private readonly ReadDispatcher _readDispatcher;
+
+	private readonly
+		RequestResponseDispatcher
+		<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>
+		_getStateDispatcher;
+
+	private readonly
+		RequestResponseDispatcher
+		<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>
+		_getResultDispatcher;
+
+
+	private readonly ILogger _logger;
+	private readonly ITimeProvider _timeProvider;
+	private readonly Guid _workerId;
+	private readonly Guid _id;
+	private readonly long _projectionId;
+	private readonly string _name;
+	private readonly bool _enabledToRun;
+	private ManagedProjectionState _state;
+	internal PersistedState PersistedProjectionState = new PersistedState();
+
+	private bool _persistedStateLoaded = false;
+
+	private string _faultedReason;
+
+	private ProjectionStatistics _lastReceivedStatistics;
+	private DateTime _lastAccessed;
+	private long _lastWrittenVersion = -1;
+
+	private ClaimsPrincipal _runAs;
+	internal bool Prepared;
+	internal bool Created;
+	private bool _pendingWritePersistedState;
+	private readonly TimeSpan _projectionsQueryExpiry;
+
+	private ManagedProjectionStateBase _stateHandler;
+	private IEnvelope _lastReplyEnvelope;
+	private bool _writing;
+	private IODispatcher _ioDispatcher;
+	private ProjectionConfig _projectionConfig;
+	private IEmittedStreamsDeleter _emittedStreamsDeleter;
+
+	public ManagedProjection(
+		Guid workerId,
+		Guid id,
+		long projectionId,
+		string name,
+		bool enabledToRun,
+		ILogger logger,
+		RequestResponseDispatcher<ClientMessage.DeleteStream, ClientMessage.DeleteStreamCompleted> streamDispatcher,
+		RequestResponseDispatcher<ClientMessage.WriteEvents, ClientMessage.WriteEventsCompleted> writeDispatcher,
+		ReadDispatcher readDispatcher,
+		IPublisher output,
+		ITimeProvider timeProvider,
+		RequestResponseDispatcher<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>
+			getStateDispatcher,
+		RequestResponseDispatcher
+			<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>
+			getResultDispatcher,
+		IODispatcher ioDispatcher,
+		TimeSpan projectionQueryExpiry) {
+		if (id == Guid.Empty)
+			throw new ArgumentException("id");
+		if (name == null)
+			throw new ArgumentNullException("name");
+		if (output == null)
+			throw new ArgumentNullException("output");
+		if (getStateDispatcher == null)
+			throw new ArgumentNullException("getStateDispatcher");
+		if (getResultDispatcher == null)
+			throw new ArgumentNullException("getResultDispatcher");
+		if (name == "")
+			throw new ArgumentException("name");
+		_workerId = workerId;
+		_id = id;
+		_projectionId = projectionId;
+		_name = name;
+		_enabledToRun = enabledToRun;
+		_logger = logger ?? Log.ForContext<ManagedProjection>();
+		_streamDispatcher = streamDispatcher;
+		_writeDispatcher = writeDispatcher;
+		_readDispatcher = readDispatcher;
+		_output = output;
+		_timeProvider = timeProvider;
+		_getStateDispatcher = getStateDispatcher;
+		_getResultDispatcher = getResultDispatcher;
+		_lastAccessed = _timeProvider.UtcNow;
+		_ioDispatcher = ioDispatcher;
+		_projectionsQueryExpiry = projectionQueryExpiry;
+	}
+
+	private string HandlerType {
+		get { return PersistedProjectionState.HandlerType; }
+	}
+
+	private string Query {
+		get { return PersistedProjectionState.Query; }
+	}
+
+	private bool Enabled {
+		get { return PersistedProjectionState.Enabled; }
+		set { PersistedProjectionState.Enabled = value; }
+	}
+
+	private bool IsMultiStream {
+		get {
+			return PersistedProjectionState.SourceDefinition != null &&
+				   PersistedProjectionState.SourceDefinition.Streams != null &&
+				   PersistedProjectionState.SourceDefinition.Streams.Length > 1;
+		}
+	}
+
+	public bool Deleted {
+		get { return PersistedProjectionState.Deleted; }
+		private set { PersistedProjectionState.Deleted = value; }
+	}
+
+	public bool Deleting {
+		get { return PersistedProjectionState.Deleting; }
+		private set { PersistedProjectionState.Deleting = value; }
+	}
+
+	public Guid Id {
+		get { return _id; }
+	}
+
+	public ProjectionMode Mode {
+		get { return PersistedProjectionState.Mode; }
+	}
+
+	public ClaimsPrincipal RunAs {
+		get { return _runAs; }
+	}
+
+	public bool EnableContentTypeValidation {
+		get {
+			return PersistedProjectionState.ProjectionSubsystemVersion >=
+				   ProjectionsSubsystem.CONTENT_TYPE_VALIDATION_VERSION;
+		}
+	}
+
+	internal void SetState(ManagedProjectionState value) {
+		_state = value;
+		switch (value) {
+			case ManagedProjectionState.Aborted:
+				_stateHandler = new AbortedState(this);
+				break;
+			case ManagedProjectionState.Aborting:
+				_stateHandler = new AbortingState(this);
+				break;
+			case ManagedProjectionState.Completed:
+				_stateHandler = new CompletedState(this);
+				break;
+			case ManagedProjectionState.Creating:
+			case ManagedProjectionState.Loading:
+			case ManagedProjectionState.Loaded:
+				_stateHandler = new CreatingLoadingLoadedState(this);
+				break;
+			case ManagedProjectionState.Faulted:
+				_stateHandler = new FaultedState(this);
+				break;
+			case ManagedProjectionState.LoadingStopped:
+				_stateHandler = new LoadingStateState(this);
+				break;
+			case ManagedProjectionState.Prepared:
+				_stateHandler = new PreparedState(this);
+				break;
+			case ManagedProjectionState.Preparing:
+				_stateHandler = new PreparingState(this);
+				break;
+			case ManagedProjectionState.Running:
+				_stateHandler = new RunningState(this);
+				break;
+			case ManagedProjectionState.Starting:
+				_stateHandler = new StartingState(this);
+				break;
+			case ManagedProjectionState.Stopped:
+				_stateHandler = new StoppedState(this);
+				break;
+			case ManagedProjectionState.Stopping:
+				_stateHandler = new StoppingState(this);
+				break;
+			case ManagedProjectionState.Deleting:
+				_stateHandler = new DeletingState(this);
+				break;
+			default:
+				throw InvalidProjectionState(value);
+		}
+	}
+
+	public void Dispose() {
+		DisposeCoreProjection();
+	}
+
+	public ProjectionStatistics GetStatistics() {
+		ProjectionStatistics status;
+		if (_lastReceivedStatistics == null) {
+			status = new ProjectionStatistics {
+				Name = _name,
+				EffectiveName = _name,
+				ProjectionId = _projectionId,
+				Epoch = -1,
+				Version = -1,
+				Mode = Mode,
+				Status = _state.EnumValueName(),
+				LeaderStatus = _state
+			};
+		} else {
+			status = _lastReceivedStatistics.Clone();
+			status.Mode = Mode;
+			status.Name = _name;
+			status.ProjectionId = _projectionId;
+			var enabledSuffix =
+				((_state == ManagedProjectionState.Stopped || _state == ManagedProjectionState.Faulted) && Enabled
+					? " (Enabled)"
+					: "");
+			status.Status = (status.Status == "Stopped" && _state == ManagedProjectionState.Completed
+								? _state.EnumValueName()
+								: (!status.Status.StartsWith(_state.EnumValueName())
+									? _state.EnumValueName() + "/" + status.Status
+									: status.Status)) + enabledSuffix;
+			status.LeaderStatus = _state;
+		}
+
+		if (_state == ManagedProjectionState.Faulted)
+			status.StateReason = _faultedReason;
+		status.Enabled = Enabled;
+		return status;
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.GetState message) {
+		_lastAccessed = _timeProvider.UtcNow;
+		if (_state >= ManagedProjectionState.Running) {
+			_getStateDispatcher.Publish(
+				new CoreProjectionManagementMessage.GetState(Guid.NewGuid(), Id, message.Partition, _workerId),
+				m =>
+					message.Envelope.ReplyWith(
+						new ProjectionManagementMessage.ProjectionState(_name, m.Partition, m.State, m.Position)));
+		} else {
+			message.Envelope.ReplyWith(
+				new ProjectionManagementMessage.ProjectionState(
+					message.Name, message.Partition, "", position: null));
+		}
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.GetResult message) {
+		_lastAccessed = _timeProvider.UtcNow;
+		if (_state >= ManagedProjectionState.Running) {
+			_getResultDispatcher.Publish(
+				new CoreProjectionManagementMessage.GetResult(Guid.NewGuid(), Id, message.Partition, _workerId),
+				m =>
+					message.Envelope.ReplyWith(
+						new ProjectionManagementMessage.ProjectionResult(_name, m.Partition, m.Result,
+							m.Position)));
+		} else {
+			message.Envelope.ReplyWith(
+				new ProjectionManagementMessage.ProjectionResult(
+					message.Name, message.Partition, "", position: null));
+		}
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.GetQuery message) {
+		_lastAccessed = _timeProvider.UtcNow;
+
+		var emitEnabled = PersistedProjectionState.EmitEnabled ?? false;
+
+		var projectionOutputConfig = new ProjectionOutputConfig {
+			ResultStreamName =
+				PersistedProjectionState.SourceDefinition == null
+					? ""
+					: new ProjectionNamesBuilder(_name, PersistedProjectionState.SourceDefinition)
+						.GetResultStreamName()
+		};
+
+		message.Envelope.ReplyWith(
+			new ProjectionManagementMessage.ProjectionQuery(
+				_name,
+				Query,
+				emitEnabled,
+				PersistedProjectionState.Mode.ToString(),
+				PersistedProjectionState.TrackEmittedStreams,
+				!PersistedProjectionState.CheckpointsDisabled,
+				PersistedProjectionState.SourceDefinition,
+				projectionOutputConfig));
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.UpdateQuery message) {
+		_lastAccessed = _timeProvider.UtcNow;
+
+		Prepared = false;
+		UpdateQuery(message);
+		UpdateProjectionVersion();
+		SetLastReplyEnvelope(message.Envelope);
+		StopUnlessPreparedOrLoaded();
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.Disable message) {
+		_lastAccessed = _timeProvider.UtcNow;
+		SetLastReplyEnvelope(message.Envelope);
+		Disable();
+		UpdateProjectionVersion();
+		StopUnlessPreparedOrLoaded();
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.Abort message) {
+		_lastAccessed = _timeProvider.UtcNow;
+		UpdateProjectionVersion();
+		SetLastReplyEnvelope(message.Envelope);
+		Disable();
+		Abort();
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.Enable message) {
+		_lastAccessed = _timeProvider.UtcNow;
+		if (Enabled
+			&& !(_state == ManagedProjectionState.Completed || _state == ManagedProjectionState.Faulted
+															|| _state == ManagedProjectionState.Aborted ||
+															_state == ManagedProjectionState.Loaded
+															|| _state == ManagedProjectionState.Prepared ||
+															_state == ManagedProjectionState.Stopped)) {
+			//Projection is probably Running
+			message.Envelope.ReplyWith(new ProjectionManagementMessage.Updated(message.Name));
+			return;
+		}
+
+		Enable();
+		_pendingWritePersistedState = true;
+		UpdateProjectionVersion();
+		SetLastReplyEnvelope(message.Envelope);
+		StopUnlessPreparedOrLoaded();
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.SetRunAs message) {
+		_lastAccessed = _timeProvider.UtcNow;
+		Prepared = false;
+		SetRunAs(message);
+		UpdateProjectionVersion();
+		SetLastReplyEnvelope(message.Envelope);
+		StopUnlessPreparedOrLoaded();
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.Delete message) {
+		if ((_state != ManagedProjectionState.Stopped && _state != ManagedProjectionState.Faulted) &&
+			Mode != ProjectionMode.Transient)
+			throw new InvalidOperationException("Cannot delete a projection that hasn't been stopped or faulted.");
+		_lastAccessed = _timeProvider.UtcNow;
+
+		PersistedProjectionState.DeleteCheckpointStream = message.DeleteCheckpointStream;
+		PersistedProjectionState.DeleteStateStream = message.DeleteStateStream;
+		PersistedProjectionState.DeleteEmittedStreams = message.DeleteEmittedStreams;
+
+		if (PersistedProjectionState.CheckpointStreamNeedsDeleted()) {
+			PersistedProjectionState.NumberOfPrequisitesMetForDeletion++;
+		}
+
+		if ((PersistedProjectionState.EmitEnabled ?? false) &&
+			((PersistedProjectionState.TrackEmittedStreams ?? false) &&
+			 PersistedProjectionState.DeleteEmittedStreams)) {
+			PersistedProjectionState.NumberOfPrequisitesMetForDeletion++;
+		}
+
+		if ((PersistedProjectionState.EmitEnabled ?? false) && IsMultiStream) {
+			PersistedProjectionState.NumberOfPrequisitesMetForDeletion++;
+		}
+
+		Delete();
+		UpdateProjectionVersion();
+		SetLastReplyEnvelope(message.Envelope);
+		SetState(ManagedProjectionState.Deleting);
+		StopUnlessPreparedOrLoaded();
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.GetConfig message) {
+		_lastAccessed = _timeProvider.UtcNow;
+
+		var emitEnabled = PersistedProjectionState.EmitEnabled ?? false;
+		var trackEmittedStreams = PersistedProjectionState.TrackEmittedStreams ?? false;
+
+		message.Envelope.ReplyWith(
+			new ProjectionManagementMessage.ProjectionConfig(emitEnabled, trackEmittedStreams,
+				PersistedProjectionState.CheckpointAfterMs,
+				PersistedProjectionState.CheckpointHandledThreshold,
+				PersistedProjectionState.CheckpointUnhandledBytesThreshold,
+				PersistedProjectionState.PendingEventsThreshold,
+				PersistedProjectionState.MaxWriteBatchLength,
+				PersistedProjectionState.MaxAllowedWritesInFlight,
+				PersistedProjectionState.ProjectionExecutionTimeout));
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.UpdateConfig message) {
+		if ((_state != ManagedProjectionState.Stopped && _state != ManagedProjectionState.Faulted) &&
+			Mode != ProjectionMode.Transient)
+			throw new InvalidOperationException(
+				"Cannot update the config of a projection that hasn't been stopped or faulted.");
+		_lastAccessed = _timeProvider.UtcNow;
+
+		PersistedProjectionState.EmitEnabled = message.EmitEnabled;
+		PersistedProjectionState.TrackEmittedStreams = message.TrackEmittedStreams;
+		PersistedProjectionState.CheckpointAfterMs = message.CheckpointAfterMs;
+		PersistedProjectionState.CheckpointHandledThreshold = message.CheckpointHandledThreshold;
+		PersistedProjectionState.CheckpointUnhandledBytesThreshold = message.CheckpointUnhandledBytesThreshold;
+		PersistedProjectionState.PendingEventsThreshold = message.PendingEventsThreshold;
+		PersistedProjectionState.MaxWriteBatchLength = message.MaxWriteBatchLength;
+		PersistedProjectionState.MaxAllowedWritesInFlight = message.MaxAllowedWritesInFlight;
+		PersistedProjectionState.ProjectionExecutionTimeout = message.ProjectionExecutionTimeout;
+
+		UpdateProjectionVersion();
+		_pendingWritePersistedState = true;
+		WritePersistedState(CreatePersistedStateEvent(Guid.NewGuid(), PersistedProjectionState,
+			ProjectionNamesBuilder.ProjectionsStreamPrefix + _name));
+
+		message.Envelope.ReplyWith(new ProjectionManagementMessage.Updated(message.Name));
+	}
+
+	public void DeleteProjectionStreams() {
+		var sourceDefinition = PersistedProjectionState.SourceDefinition ?? new ProjectionSourceDefinition();
+		var projectionNamesBuilder = new ProjectionNamesBuilder(_name, sourceDefinition);
+
+		if (PersistedProjectionState.EmitStreamNeedsDeleted() && IsMultiStream) {
+			DeleteStream(projectionNamesBuilder.GetOrderStreamName(), DeleteIfConditionsAreMet);
+		}
+
+		if (PersistedProjectionState.CheckpointStreamNeedsDeleted()) {
+			DeleteStream(projectionNamesBuilder.MakeCheckpointStreamName(), DeleteIfConditionsAreMet);
+		}
+
+		if (PersistedProjectionState.EmitStreamNeedsDeleted()) {
+			if (_emittedStreamsDeleter == null) {
+				_emittedStreamsDeleter = new EmittedStreamsDeleter(_ioDispatcher, projectionNamesBuilder.GetEmittedStreamsName(), projectionNamesBuilder.GetEmittedStreamsCheckpointName());
+			}
+
+			_emittedStreamsDeleter.DeleteEmittedStreams(DeleteIfConditionsAreMet);
+		}
+
+		if (!PersistedProjectionState.CheckpointStreamNeedsDeleted() &&
+			!PersistedProjectionState.EmitStreamNeedsDeleted()) {
+			DeleteIfConditionsAreMet();
+		}
+	}
+
+	private void DeleteIfConditionsAreMet() {
+		if (Interlocked.Decrement(ref PersistedProjectionState.NumberOfPrequisitesMetForDeletion) <= 0) {
+			Deleted = true;
+			Deleting = false;
+			Reply();
+		}
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.Reset message) {
+		_lastAccessed = _timeProvider.UtcNow;
+		Prepared = false;
+		_pendingWritePersistedState = true;
+		Reset();
+		UpdateProjectionVersion();
+		SetLastReplyEnvelope(message.Envelope);
+		StopUnlessPreparedOrLoaded();
+	}
+
+	public void Handle(ProjectionManagementMessage.Internal.CleanupExpired message) {
+		if (IsExpiredProjection()) {
+			if (_state == ManagedProjectionState.Creating) {
+				// NOTE: workaround for stop not working on creating state (just ignore them)
+				return;
+			}
+
+			_logger.Warning(
+				"Transient projection {projection} has expired and will be deleted. Last accessed at {lastAccessed}",
+				_name, _lastAccessed);
+			Handle(
+				new ProjectionManagementMessage.Command.Delete(
+					new NoopEnvelope(),
+					_name,
+					ProjectionManagementMessage.RunAs.System,
+					false,
+					false,
+					false));
+		}
+	}
+
+	public void Handle(CoreProjectionStatusMessage.Started message) {
+		_stateHandler.Started();
+	}
+
+	public void Handle(CoreProjectionStatusMessage.Stopped message) {
+		_stateHandler.Stopped(message);
+		if (Deleting) {
+			SetState(ManagedProjectionState.Deleting);
+		}
+	}
+
+	public void Handle(CoreProjectionStatusMessage.Faulted message) {
+		_stateHandler.Faulted(message);
+	}
+
+	public void Handle(CoreProjectionStatusMessage.Prepared message) {
+		_stateHandler.Prepared(message);
+	}
+
+	public void Handle(CoreProjectionStatusMessage.StatisticsReport message) {
+		_lastReceivedStatistics = message.Statistics;
+	}
+
+	private void SetRunAs(ProjectionManagementMessage.Command.SetRunAs message) {
+		PersistedProjectionState.RunAs =
+			message.Action == ProjectionManagementMessage.Command.SetRunAs.SetRemove.Set
+				? SerializedRunAs.SerializePrincipal(message.RunAs)
+				: null;
+		_runAs = SerializedRunAs.DeserializePrincipal(PersistedProjectionState.RunAs);
+		_pendingWritePersistedState = true;
+	}
+
+	private void SetLastReplyEnvelope(IEnvelope envelope) {
+		if (_lastReplyEnvelope != null)
+			_lastReplyEnvelope.ReplyWith(
+				new ProjectionManagementMessage.OperationFailed("Aborted by subsequent operation"));
+		_lastReplyEnvelope = envelope;
+	}
+
+	private void Reset() {
+		UpdateProjectionVersion(force: true);
+		PersistedProjectionState.Epoch = PersistedProjectionState.Version;
+	}
+
+	private bool IsExpiredProjection() {
+		return Mode == ProjectionMode.Transient &&
+			   _lastAccessed.Add(_projectionsQueryExpiry) < _timeProvider.UtcNow && _persistedStateLoaded;
+	}
+
+	public void InitializeNew(PersistedState persistedState, IEnvelope replyEnvelope) {
+		LoadPersistedState(persistedState);
+		UpdateProjectionVersion();
+		_pendingWritePersistedState = true;
+		SetLastReplyEnvelope(replyEnvelope);
+		PrepareOrWriteStartOrLoadStopped();
+	}
+
+	public void InitializeExisting(string name) {
+		SetState(ManagedProjectionState.Loading);
+		ReadPersistedState(name);
+	}
+
+	private void ReadPersistedState(string name) {
+		var corrId = Guid.NewGuid();
+		_readDispatcher.Publish(
+			new ClientMessage.ReadStreamEventsBackward(
+				corrId, corrId, _readDispatcher.Envelope, ProjectionNamesBuilder.ProjectionsStreamPrefix + name, -1,
+				1,
+				resolveLinkTos: false, requireLeader: false, validationStreamVersion: null,
+				user: SystemAccounts.System,
+				expires: DateTime.MaxValue),
+			new ReadStreamEventsBackwardHandlers.Optimistic(PersistedStateReadCompleted));
+	}
+
+	private void PersistedStateReadCompleted(ClientMessage.ReadStreamEventsBackwardCompleted completed) {
+		if (completed.Result == ReadStreamResult.Success && completed.Events.Count is 1) {
+			var persistedState = completed.Events[0].Event.Data.ParseJson<PersistedState>();
+
+			_lastWrittenVersion = completed.Events[0].Event.EventNumber;
+			FixUpOldFormat(completed, persistedState);
+			FixupOldProjectionModes(persistedState);
+			FixUpOldProjectionRunAs(persistedState);
+
+			LoadPersistedState(persistedState);
+			//TODO: encapsulate this into managed projection
+			SetState(ManagedProjectionState.Loaded);
+			_pendingWritePersistedState = false;
+			SetLastReplyEnvelope(null);
+			PrepareOrWriteStartOrLoadStopped();
+			return;
+		}
+
+		SetState(ManagedProjectionState.Creating);
+
+		_logger.Verbose(
+			"Projection manager did not find any projection configuration records in the {stream} stream.  Projection stays in CREATING state",
+			completed.EventStreamId);
+	}
+
+	private void FixUpOldProjectionRunAs(PersistedState persistedState) {
+		if (persistedState.RunAs == null || string.IsNullOrEmpty(persistedState.RunAs.Name)) {
+			_runAs = SystemAccounts.System;
+			persistedState.RunAs = SerializedRunAs.SerializePrincipal(ProjectionManagementMessage.RunAs.System);
+		}
+	}
+
+	private void FixUpOldFormat(ClientMessage.ReadStreamEventsBackwardCompleted completed,
+		PersistedState persistedState) {
+		if (persistedState.Version == null) {
+			persistedState.Version = completed.Events[0].Event.EventNumber;
+			persistedState.Epoch = -1;
+		}
+
+		if (_lastWrittenVersion > persistedState.Version)
+			persistedState.Version = _lastWrittenVersion;
+	}
+
+	private void FixupOldProjectionModes(PersistedState persistedState) {
+		switch ((int)persistedState.Mode) {
+			case 2: // old continuous
+				persistedState.Mode = ProjectionMode.Continuous;
+				break;
+			case 3: // old persistent
+				persistedState.Mode = ProjectionMode.Continuous;
+				persistedState.EmitEnabled = persistedState.EmitEnabled ?? true;
+				break;
+		}
+	}
+
+	private void LoadPersistedState(PersistedState persistedState) {
+		var handlerType = persistedState.HandlerType;
+		var query = persistedState.Query;
+
+		if (handlerType == null)
+			throw new ArgumentNullException("persistedState", "HandlerType");
+		if (query == null)
+			throw new ArgumentNullException("persistedState", "Query");
+		if (handlerType == "")
+			throw new ArgumentException("HandlerType", "persistedState");
+
+		if (_state != ManagedProjectionState.Creating && _state != ManagedProjectionState.Loading)
+			throw new InvalidOperationException("LoadPersistedState is now allowed in this state");
+
+		PersistedProjectionState = persistedState;
+		_runAs = SerializedRunAs.DeserializePrincipal(persistedState.RunAs);
+		_persistedStateLoaded = true;
+	}
+
+	internal void WriteStartOrLoadStopped() {
+		if (_pendingWritePersistedState)
+			WritePersistedState(CreatePersistedStateEvent(Guid.NewGuid(), PersistedProjectionState,
+				ProjectionNamesBuilder.ProjectionsStreamPrefix + _name));
+		else
+			StartOrLoadStopped();
+	}
+
+	internal void StartCompleted() {
+		Reply();
+	}
+
+	private ClientMessage.WriteEvents CreatePersistedStateEvent(Guid correlationId, PersistedState persistedState,
+		string eventStreamId) {
+		return new ClientMessage.WriteEvents(
+			correlationId, correlationId, _writeDispatcher.Envelope, true, eventStreamId, ExpectedVersion.Any,
+			new Event(Guid.NewGuid(), ProjectionEventTypes.ProjectionUpdated, true, persistedState.ToJsonBytes(),
+				Empty.ByteArray),
+			SystemAccounts.System);
+	}
+
+	private void WritePersistedState(ClientMessage.WriteEvents persistedStateEvent) {
+		if (Mode == ProjectionMode.Transient) {
+			//TODO: move to common completion procedure
+			_lastWrittenVersion = PersistedProjectionState.Version ?? -1;
+			_pendingWritePersistedState = false;
+			StartOrLoadStopped();
+			return;
+		}
+
+		_writing = true;
+		_writeDispatcher.Publish(
+			persistedStateEvent,
+			m => WritePersistedStateCompleted(m, persistedStateEvent, persistedStateEvent.EventStreamId));
+	}
+
+	private void WritePersistedStateCompleted(ClientMessage.WriteEventsCompleted message,
+		ClientMessage.WriteEvents eventToRetry, string eventStreamId) {
+		if (!_writing) {
+			_logger.Error("Projection definition write completed in non writing state. ({projection})", _name);
+		}
+
+		if (message.Result == OperationResult.Success) {
+			_logger.Information("'{projection}' projection source has been written", _name);
+			_pendingWritePersistedState = false;
+			var writtenEventNumber = message.FirstEventNumber;
+			if (writtenEventNumber != (PersistedProjectionState.Version ?? writtenEventNumber))
+				throw new Exception("Projection version and event number mismatch");
+			_lastWrittenVersion = (PersistedProjectionState.Version ?? writtenEventNumber);
+			StartOrLoadStopped();
+			return;
+		}
+
+		_logger.Information(
+			"Projection '{projection}' source has not been written to {stream}. Error: {e}",
+			_name,
+			eventStreamId,
+			Enum.GetName(typeof(OperationResult), message.Result));
+		if (message.Result == OperationResult.CommitTimeout || message.Result == OperationResult.ForwardTimeout
+															|| message.Result == OperationResult.PrepareTimeout
+															|| message.Result ==
+															OperationResult.WrongExpectedVersion) {
+			_logger.Information("Retrying write projection source for {projection}", _name);
+			WritePersistedState(eventToRetry);
+		} else
+			throw new NotSupportedException("Unsupported error code received");
+	}
+
+	private void DeleteStream(string streamId, Action completed) {
+		//delete checkpoint stream
+		var correlationId = Guid.NewGuid();
+		_streamDispatcher.Publish(new ClientMessage.DeleteStream(
+			correlationId,
+			correlationId,
+			_writeDispatcher.Envelope,
+			true,
+			streamId,
+			ExpectedVersion.Any,
+			false,
+			SystemAccounts.System), m => DeleteStreamCompleted(m, streamId, completed));
+	}
+
+	private void DeleteStreamCompleted(ClientMessage.DeleteStreamCompleted message, string streamId,
+		Action completed) {
+		// currently, WrongExpectedVersion is returned when deleting non-existing streams, even when specifying ExpectedVersion.Any.
+		// it is not too intuitive but changing the response would break the contract and compatibility with TCP/gRPC/web clients or require adding a new error code to all clients.
+		// note: we don't need to check if CurrentVersion == -1 here to make sure it's a non-existing stream since the deletion is done with ExpectedVersion.Any
+		if (message.Result == OperationResult.WrongExpectedVersion) {
+			// stream was never created
+			_logger.Information("PROJECTIONS: Projection Stream '{stream}' was not deleted since it does not exist", streamId);
+			completed();
+			return;
+		}
+		if (message.Result == OperationResult.Success || message.Result == OperationResult.StreamDeleted) {
+			_logger.Information("PROJECTIONS: Projection Stream '{stream}' deleted", streamId);
+			completed();
+			return;
+		}
+
+		_logger.Information(
+			"PROJECTIONS: Projection stream '{stream}' could not be deleted. Error: {e}",
+			streamId,
+			Enum.GetName(typeof(OperationResult), message.Result));
+		if (message.Result == OperationResult.CommitTimeout ||
+			message.Result == OperationResult.ForwardTimeout) {
+			DeleteStream(streamId, completed);
+		} else
+			throw new NotSupportedException("Unsupported error code received");
+	}
+
+	private void Prepare(Message message) {
+		if (_state >= ManagedProjectionState.Preparing) {
+			DisposeCoreProjection();
+			SetState(ManagedProjectionState.Loaded);
+		}
+
+		//note: set running before start as coreProjection.start() can respond with faulted
+		SetState(ManagedProjectionState.Preparing);
+		_output.Publish(message);
+	}
+
+	private void Start() {
+		if (!Enabled)
+			throw new InvalidOperationException("Projection is disabled");
+		SetState(ManagedProjectionState.Starting);
+		_output.Publish(new CoreProjectionManagementMessage.Start(Id, _workerId));
+	}
+
+	private void LoadStopped() {
+		SetState(ManagedProjectionState.LoadingStopped);
+		_output.Publish(new CoreProjectionManagementMessage.LoadStopped(Id, _workerId));
+	}
+
+	private void DisposeCoreProjection() {
+		Created = false;
+		_output.Publish(new CoreProjectionManagementMessage.Dispose(Id, _workerId));
+	}
+
+	private void Enable() {
+		Enabled = true;
+	}
+
+	private Message CreateCreateAndPrepareMessage(ProjectionConfig config) {
+		return new CoreProjectionManagementMessage.CreateAndPrepare(
+				Id,
+				_workerId,
+				_name,
+				new ProjectionVersion(_projectionId, PersistedProjectionState.Epoch ?? 0,
+					PersistedProjectionState.Version ?? 0),
+				config,
+				HandlerType,
+				Query,
+				EnableContentTypeValidation);
+	}
+
+	private CoreProjectionManagementMessage.CreatePrepared CreatePreparedMessage(ProjectionConfig config) {
+		if (PersistedProjectionState.SourceDefinition == null)
+			throw new Exception(
+				"The projection cannot be loaded as stopped as it was stored in the old format.  Update the projection query text to force prepare");
+
+		var createProjectionMessage = new CoreProjectionManagementMessage.CreatePrepared(
+			Id,
+			_workerId,
+			_name,
+			new ProjectionVersion(_projectionId, PersistedProjectionState.Epoch ?? 0,
+				PersistedProjectionState.Version ?? 1),
+			config,
+			QuerySourcesDefinition.From(PersistedProjectionState.SourceDefinition),
+			HandlerType,
+			Query,
+			EnableContentTypeValidation);
+		return createProjectionMessage;
+	}
+
+	private void StopUnlessPreparedOrLoaded() {
+		switch (_state) {
+			case ManagedProjectionState.Prepared:
+			case ManagedProjectionState.Loaded:
+				PrepareOrWriteStartOrLoadStopped();
+				break;
+			case ManagedProjectionState.Stopped:
+			case ManagedProjectionState.Completed:
+			case ManagedProjectionState.Aborted:
+			case ManagedProjectionState.Faulted:
+				SetState(ManagedProjectionState.Stopped);
+				PrepareOrWriteStartOrLoadStopped();
+				return;
+			case ManagedProjectionState.Deleting:
+				PrepareOrWriteStartOrLoadStopped();
+				break;
+			case ManagedProjectionState.Loading:
+			case ManagedProjectionState.Creating:
+				throw new InvalidOperationException(
+					string.Format(
+						"Cannot stop a projection in the '{0}' state",
+						Enum.GetName(typeof(ManagedProjectionState), _state)));
+			case ManagedProjectionState.Stopping:
+			case ManagedProjectionState.Aborting:
+				return;
+			case ManagedProjectionState.Running:
+			case ManagedProjectionState.Starting:
+				SetState(ManagedProjectionState.Stopping);
+				_output.Publish(new CoreProjectionManagementMessage.Stop(Id, _workerId));
+				break;
+			default:
+				throw InvalidProjectionState(_state);
+		}
+	}
+
+	private void Abort() {
+		switch (_state) {
+			case ManagedProjectionState.Stopped:
+			case ManagedProjectionState.Completed:
+			case ManagedProjectionState.Aborted:
+			case ManagedProjectionState.Faulted:
+			case ManagedProjectionState.Loaded:
+				PrepareOrWriteStartOrLoadStopped();
+				return;
+			case ManagedProjectionState.Loading:
+			case ManagedProjectionState.Creating:
+				throw new InvalidOperationException(
+					string.Format(
+						"Cannot stop a projection in the '{0}' state",
+						Enum.GetName(typeof(ManagedProjectionState), _state)));
+			case ManagedProjectionState.Stopping:
+				SetState(ManagedProjectionState.Aborting);
+				_output.Publish(new CoreProjectionManagementMessage.Kill(Id, _workerId));
+				return;
+			case ManagedProjectionState.Aborting:
+				return;
+			case ManagedProjectionState.Running:
+			case ManagedProjectionState.Starting:
+				SetState(ManagedProjectionState.Aborting);
+				_output.Publish(new CoreProjectionManagementMessage.Kill(Id, _workerId));
+				break;
+			default:
+				throw InvalidProjectionState(_state);
+		}
+	}
+
+
+	public void Fault(string reason) {
+		_logger.Error("The '{projection}' projection faulted due to '{e}'", _name, reason);
+		SetState(ManagedProjectionState.Faulted);
+		_faultedReason = reason;
+	}
+
+	private ProjectionConfig CreateDefaultProjectionConfiguration() {
+		var checkpointsEnabled = PersistedProjectionState.CheckpointsDisabled != true;
+		var trackEmittedStreams = PersistedProjectionState.TrackEmittedStreams == true;
+		var maximumCheckpointCount = checkpointsEnabled ? PersistedProjectionState.CheckpointHandledThreshold : 0;
+		var checkpointAfterMs = checkpointsEnabled ? PersistedProjectionState.CheckpointAfterMs : 0;
+		var checkpointUnhandledBytesThreshold =
+			checkpointsEnabled ? PersistedProjectionState.CheckpointUnhandledBytesThreshold : 0;
+		var pendingEventsThreshold = PersistedProjectionState.PendingEventsThreshold;
+		var maxWriteBatchLength = PersistedProjectionState.MaxWriteBatchLength;
+		var maximumAllowedWritesInFlight = PersistedProjectionState.MaxAllowedWritesInFlight;
+		var emitEventEnabled = PersistedProjectionState.EmitEnabled == true;
+		var createTempStreams = PersistedProjectionState.CreateTempStreams == true;
+		var stopOnEof = PersistedProjectionState.Mode <= ProjectionMode.OneTime;
+		var projectionExecutionTimeout = PersistedProjectionState.ProjectionExecutionTimeout;
+
+		var projectionConfig = new ProjectionConfig(
+			_runAs,
+			maximumCheckpointCount,
+			checkpointUnhandledBytesThreshold,
+			pendingEventsThreshold,
+			maxWriteBatchLength,
+			emitEventEnabled,
+			checkpointsEnabled,
+			createTempStreams,
+			stopOnEof,
+			trackEmittedStreams,
+			checkpointAfterMs,
+			maximumAllowedWritesInFlight,
+			projectionExecutionTimeout);
+		return projectionConfig;
+	}
+
+	private void StartOrLoadStopped() {
+		if (_state == ManagedProjectionState.Prepared) {
+			if (Enabled && _enabledToRun)
+				Start();
+			else {
+				LoadStopped();
+			}
+		} else if (_state == ManagedProjectionState.Aborted ||
+				   _state == ManagedProjectionState.Completed ||
+				   _state == ManagedProjectionState.Faulted ||
+				   _state == ManagedProjectionState.Stopped ||
+				   _state == ManagedProjectionState.Deleting)
+			Reply();
+		else
+			throw InvalidProjectionState(_state);
+	}
+
+	private void UpdateQuery(ProjectionManagementMessage.Command.UpdateQuery message) {
+		PersistedProjectionState.Query = message.Query;
+		PersistedProjectionState.EmitEnabled = message.EmitEnabled ?? PersistedProjectionState.EmitEnabled;
+		_pendingWritePersistedState = true;
+		if (_state == ManagedProjectionState.Completed) {
+			Reset();
+		}
+	}
+
+	private void Disable() {
+		Enabled = false;
+		_pendingWritePersistedState = true;
+	}
+
+	public void PrepareOrWriteStartOrLoadStopped() {
+		if (_state == ManagedProjectionState.Prepared) {
+			WriteStartOrLoadStopped();
+			return;
+		}
+
+		if (Prepared && Created && !(Enabled && _enabledToRun)) {
+			WriteStartOrLoadStopped();
+			return;
+		}
+
+		_projectionConfig = CreateDefaultProjectionConfiguration();
+
+		var prepareMessage = !(Enabled && _enabledToRun) && !_pendingWritePersistedState
+			? CreatePreparedMessage(_projectionConfig)
+			: CreateCreateAndPrepareMessage(_projectionConfig);
+
+		Prepare(prepareMessage);
+	}
+
+	private void Reply() {
+		if (_lastReplyEnvelope != null)
+			_lastReplyEnvelope.ReplyWith(new ProjectionManagementMessage.Updated(_name));
+		_lastReplyEnvelope = null;
+		if (Deleted && !_pendingWritePersistedState) {
+			DisposeCoreProjection();
+			_output.Publish(new ProjectionManagementMessage.Internal.Deleted(_name, Id));
+		}
+	}
+
+	private void Delete() {
+		Enabled = false;
+		Deleted = false;
+		Deleting = true;
+		_pendingWritePersistedState = true;
+	}
+
+	private void UpdateProjectionVersion(bool force = false) {
+		if (_lastWrittenVersion == PersistedProjectionState.Version) {
+			PersistedProjectionState.Version++;
+			PersistedProjectionState.ProjectionSubsystemVersion = ProjectionsSubsystem.VERSION;
+		} else if (force)
+			throw new ApplicationException(
+				"Internal error: projection definition must be saved before forced updating version");
+	}
+
+	private static InvalidOperationException InvalidProjectionState(ManagedProjectionState state) =>
+		new InvalidOperationException($"Did not expect {nameof(ManagedProjectionState)} in state {state}.");
+}
+
+public class SerializedRunAs {
+	public string Name { get; set; }
+	public string[] Roles { get; set; }
+
+	public static implicit operator SerializedRunAs(ProjectionManagementMessage.RunAs runAs) {
+		return runAs == null ? null : SerializePrincipal(runAs);
+	}
+
+	public static implicit operator ProjectionManagementMessage.RunAs(SerializedRunAs runAs) {
+		return new ProjectionManagementMessage.RunAs(DeserializePrincipal(runAs));
+	}
+
+	public static SerializedRunAs SerializePrincipal(ProjectionManagementMessage.RunAs runAs) {
+		if (runAs?.Principal == null || runAs.Principal.HasClaim(x => x.Type == ClaimTypes.Anonymous))
+			return null; // anonymous
+		if (runAs.Principal == SystemAccounts.System)
+			return new SerializedRunAs { Name = "$system" };
+
+		var principal = runAs.Principal;
+		var roles = principal.Claims
+			.Where(x => x.Type == ClaimTypes.Role)
+			.Select(c => $"{c.Type}$$${c.Value}").ToArray();
+		return new SerializedRunAs { Name = runAs.Principal.Identity.Name, Roles = roles };
+	}
+
+	public static ClaimsPrincipal DeserializePrincipal(SerializedRunAs runAs) {
+		if (runAs?.Name == null)
+			return SystemAccounts.Anonymous;
+		if (runAs.Name == "$system") //TODO: make sure nobody else uses it
+			return SystemAccounts.System;
+		var claims = runAs.Roles.Select(x => x.Split("$$$")).Select(x => {
+			return x.Length switch {
+				1 => new Claim(ClaimTypes.Role, x[0]),
+				2 => new Claim(x[0], x[1]),
+				_ => throw new SerializationException("Could not deserialize run as")
+			};
+
+		}).ToList();
+		if (!claims.Exists(x => x.Type == ClaimTypes.Name)) {
+			claims.Add(new Claim(ClaimTypes.Name, runAs.Name));
+		}
+
+		return new ClaimsPrincipal(new ClaimsIdentity(claims, "ES-Projections"));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionState.cs b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionState.cs
new file mode 100644
index 00000000000..6751fa5fe75
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionState.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Services.Management;
+
+public enum ManagedProjectionState {
+	Creating,
+	Loading,
+	Loaded,
+	Preparing,
+	Prepared,
+	Starting,
+	LoadingStopped,
+	Running,
+	Stopping,
+	Aborting,
+	Stopped,
+	Completed,
+	Aborted,
+	Faulted,
+	Deleting,
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/AbortedState.cs b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/AbortedState.cs
new file mode 100644
index 00000000000..fbb9e01e168
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/AbortedState.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Services.Management.ManagedProjectionStates;
+
+class AbortedState : ManagedProjectionStateBase {
+	public AbortedState(ManagedProjection managedProjection)
+		: base(managedProjection) {
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/AbortingState.cs b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/AbortingState.cs
new file mode 100644
index 00000000000..9ecaff5ecb3
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/AbortingState.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Services.Management.ManagedProjectionStates;
+
+class AbortingState : ManagedProjectionStateBase {
+	public AbortingState(ManagedProjection managedProjection)
+		: base(managedProjection) {
+	}
+
+	protected internal override void Stopped(CoreProjectionStatusMessage.Stopped message) {
+		_managedProjection.SetState(ManagedProjectionState.Aborted);
+		_managedProjection.PrepareOrWriteStartOrLoadStopped();
+	}
+
+	protected internal override void Faulted(CoreProjectionStatusMessage.Faulted message) {
+		_managedProjection.SetState(ManagedProjectionState.Aborted);
+		_managedProjection.PrepareOrWriteStartOrLoadStopped();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/CompletedState.cs b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/CompletedState.cs
new file mode 100644
index 00000000000..d9de9887b78
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/CompletedState.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Services.Management.ManagedProjectionStates;
+
+class CompletedState : ManagedProjectionStateBase {
+	public CompletedState(ManagedProjection managedProjection)
+		: base(managedProjection) {
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/CreatingLoadingLoadedState.cs b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/CreatingLoadingLoadedState.cs
new file mode 100644
index 00000000000..21e32e84042
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/CreatingLoadingLoadedState.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Services.Management.ManagedProjectionStates;
+
+class CreatingLoadingLoadedState : ManagedProjectionStateBase {
+	public CreatingLoadingLoadedState(ManagedProjection managedProjection)
+		: base(managedProjection) {
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/DeletingState.cs b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/DeletingState.cs
new file mode 100644
index 00000000000..89d87f86a6a
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/DeletingState.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Services.Management.ManagedProjectionStates;
+
+class DeletingState : ManagedProjectionStateBase {
+	public DeletingState(ManagedProjection managedProjection)
+		: base(managedProjection) {
+		managedProjection.DeleteProjectionStreams();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/FaultedState.cs b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/FaultedState.cs
new file mode 100644
index 00000000000..512a9f69010
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/FaultedState.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Services.Management.ManagedProjectionStates;
+
+class FaultedState : ManagedProjectionStateBase {
+	public FaultedState(ManagedProjection managedProjection)
+		: base(managedProjection) {
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/LoadingStateState.cs b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/LoadingStateState.cs
new file mode 100644
index 00000000000..1848a80cf3f
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/LoadingStateState.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Services.Management.ManagedProjectionStates;
+
+class LoadingStateState : ManagedProjectionStateBase {
+	public LoadingStateState(ManagedProjection managedProjection)
+		: base(managedProjection) {
+	}
+
+	protected internal override void Stopped(CoreProjectionStatusMessage.Stopped message) {
+		_managedProjection.SetState(ManagedProjectionState.Stopped);
+		_managedProjection.PrepareOrWriteStartOrLoadStopped();
+	}
+
+	protected internal override void Faulted(CoreProjectionStatusMessage.Faulted message) {
+		SetFaulted(message.FaultedReason);
+		_managedProjection.PrepareOrWriteStartOrLoadStopped();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/ManagedProjectionStateBase.cs b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/ManagedProjectionStateBase.cs
new file mode 100644
index 00000000000..4692b0a9e18
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/ManagedProjectionStateBase.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Services.Management.ManagedProjectionStates;
+
+internal abstract class ManagedProjectionStateBase {
+	protected readonly ManagedProjection _managedProjection;
+
+	protected ManagedProjectionStateBase(ManagedProjection managedProjection) {
+		_managedProjection = managedProjection;
+	}
+
+	private void Unexpected(string message) {
+		_managedProjection.Fault(message + " in " + this.GetType().Name);
+	}
+
+	protected void SetFaulted(string reason) {
+		_managedProjection.Fault(reason);
+	}
+
+	protected internal virtual void Started() {
+		Unexpected("Unexpected 'STARTED' message");
+	}
+
+	protected internal virtual void Stopped(CoreProjectionStatusMessage.Stopped message) {
+		Unexpected("Unexpected 'STOPPED' message");
+	}
+
+	protected internal virtual void Faulted(CoreProjectionStatusMessage.Faulted message) {
+		Unexpected("Unexpected 'FAULTED' message");
+	}
+
+	protected internal virtual void Prepared(CoreProjectionStatusMessage.Prepared message) {
+		Unexpected("Unexpected 'PREPARED' message");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/PreparedState.cs b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/PreparedState.cs
new file mode 100644
index 00000000000..09673d4bf03
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/PreparedState.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Services.Management.ManagedProjectionStates;
+
+class PreparedState : ManagedProjectionStateBase {
+	public PreparedState(ManagedProjection managedProjection)
+		: base(managedProjection) {
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/PreparingState.cs b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/PreparingState.cs
new file mode 100644
index 00000000000..cf3ce7b442e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/PreparingState.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Services.Management.ManagedProjectionStates;
+
+class PreparingState : ManagedProjectionStateBase {
+	public PreparingState(ManagedProjection managedProjection)
+		: base(managedProjection) {
+	}
+
+	protected internal override void Faulted(CoreProjectionStatusMessage.Faulted message) {
+		SetFaulted(message.FaultedReason);
+		_managedProjection.PersistedProjectionState.SourceDefinition = null;
+		_managedProjection.WriteStartOrLoadStopped();
+	}
+
+	protected internal override void Prepared(CoreProjectionStatusMessage.Prepared message) {
+		_managedProjection.SetState(ManagedProjectionState.Prepared);
+		_managedProjection.PersistedProjectionState.SourceDefinition = message.SourceDefinition;
+		_managedProjection.Prepared = true;
+		_managedProjection.Created = true;
+		_managedProjection.WriteStartOrLoadStopped();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/RunningState.cs b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/RunningState.cs
new file mode 100644
index 00000000000..bf51f00b283
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/RunningState.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Services.Management.ManagedProjectionStates;
+
+class RunningState : ManagedProjectionStateBase {
+	public RunningState(ManagedProjection managedProjection)
+		: base(managedProjection) {
+	}
+
+	protected internal override void Faulted(CoreProjectionStatusMessage.Faulted message) {
+		SetFaulted(message.FaultedReason);
+	}
+
+	protected internal override void Started() {
+		// do nothing - may mean second pahse started
+		//TODO: stop sending second Started
+	}
+
+	protected internal override void Stopped(CoreProjectionStatusMessage.Stopped message) {
+		if (message.Completed)
+			_managedProjection.SetState(ManagedProjectionState.Completed);
+		else
+			base.Stopped(message);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/StartingState.cs b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/StartingState.cs
new file mode 100644
index 00000000000..c618f3335cc
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/StartingState.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Services.Management.ManagedProjectionStates;
+
+class StartingState : ManagedProjectionStateBase {
+	public StartingState(ManagedProjection managedProjection)
+		: base(managedProjection) {
+	}
+
+	protected internal override void Started() {
+		_managedProjection.SetState(ManagedProjectionState.Running);
+		_managedProjection.StartCompleted();
+	}
+
+	protected internal override void Faulted(CoreProjectionStatusMessage.Faulted message) {
+		SetFaulted(message.FaultedReason);
+		_managedProjection.StartCompleted();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/StoppedState.cs b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/StoppedState.cs
new file mode 100644
index 00000000000..040d2498a64
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/StoppedState.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Services.Management.ManagedProjectionStates;
+
+class StoppedState : ManagedProjectionStateBase {
+	public StoppedState(ManagedProjection managedProjection)
+		: base(managedProjection) {
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/StoppingState.cs b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/StoppingState.cs
new file mode 100644
index 00000000000..23a6670cd63
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Management/ManagedProjectionStates/StoppingState.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Services.Management.ManagedProjectionStates;
+
+class StoppingState : ManagedProjectionStateBase {
+	public StoppingState(ManagedProjection managedProjection)
+		: base(managedProjection) {
+	}
+
+	protected internal override void Stopped(CoreProjectionStatusMessage.Stopped message) {
+		_managedProjection.SetState(
+			message.Completed ? ManagedProjectionState.Completed : ManagedProjectionState.Stopped);
+		_managedProjection.PrepareOrWriteStartOrLoadStopped();
+	}
+
+	protected internal override void Faulted(CoreProjectionStatusMessage.Faulted message) {
+		SetFaulted(message.FaultedReason);
+		_managedProjection.PrepareOrWriteStartOrLoadStopped();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Management/ProjectionCoreCoordinator.cs b/src/KurrentDB.Projections.Core/Services/Management/ProjectionCoreCoordinator.cs
new file mode 100644
index 00000000000..e120f70f404
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Management/ProjectionCoreCoordinator.cs
@@ -0,0 +1,170 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Common.Options;
+using KurrentDB.Core.Bus;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing;
+using Serilog;
+
+namespace KurrentDB.Projections.Core.Services.Management;
+
+public class ProjectionCoreCoordinator
+	: IHandle<ProjectionSubsystemMessage.StartComponents>,
+		IHandle<ProjectionSubsystemMessage.StopComponents>,
+		IHandle<ProjectionCoreServiceMessage.SubComponentStarted>,
+		IHandle<ProjectionCoreServiceMessage.SubComponentStopped> {
+	public const string ComponentName = "ProjectionCoreCoordinator";
+
+	private readonly ILogger Log = Serilog.Log.ForContext<ProjectionCoreCoordinator>();
+	private readonly ProjectionType _runProjections;
+
+	private readonly Dictionary<Guid, IPublisher> _queues = new Dictionary<Guid, IPublisher>();
+	private readonly IPublisher _publisher;
+
+	private int _pendingSubComponentsStarts;
+	private int _activeSubComponents;
+
+	private Guid _instanceCorrelationId = Guid.Empty;
+	private CoreCoordinatorState _currentState = CoreCoordinatorState.Stopped;
+
+	public ProjectionCoreCoordinator(
+		ProjectionType runProjections,
+		IReadOnlyList<IPublisher> queues,
+		IPublisher publisher) {
+		_runProjections = runProjections;
+		_queues = queues.ToDictionary(_ => Guid.NewGuid(), q => q);
+		_publisher = publisher;
+	}
+
+	public void Handle(ProjectionSubsystemMessage.StartComponents message) {
+		if (_currentState != CoreCoordinatorState.Stopped) {
+			Log.Debug("PROJECTIONS: Projection Core Coordinator cannot start components as it's not stopped. Correlation: {correlation}",
+				message.InstanceCorrelationId);
+			return;
+		}
+		_instanceCorrelationId = message.InstanceCorrelationId;
+		Log.Debug("PROJECTIONS: Projection Core Coordinator component starting. Correlation: {correlation}",
+			_instanceCorrelationId);
+		Start();
+	}
+
+	public void Handle(ProjectionSubsystemMessage.StopComponents message) {
+		if (_currentState != CoreCoordinatorState.Started) {
+			Log.Debug("PROJECTIONS: Projection Core Coordinator cannot stop components as it's not started. Correlation: {correlation}",
+				message.InstanceCorrelationId);
+			return;
+		}
+		if (_instanceCorrelationId != message.InstanceCorrelationId) {
+			Log.Debug("PROJECTIONS: Projection Core Coordinator received stop request for incorrect correlation id." +
+					  "Current: {correlationId}. Requested: {requestedCorrelationId}", _instanceCorrelationId, message.InstanceCorrelationId);
+			return;
+		}
+		Stop(message);
+	}
+
+	private void Start() {
+		if (_currentState != CoreCoordinatorState.Stopped) {
+			Log.Warning("PROJECTIONS: Projection Core Coordinated tried to start when not stopped.");
+			return;
+		}
+		Log.Debug("PROJECTIONS: Starting Projections Core Coordinator");
+		_pendingSubComponentsStarts = 0;
+		_activeSubComponents = 0;
+		_currentState = CoreCoordinatorState.Starting;
+
+		foreach (var queue in _queues.Values) {
+			queue.Publish(new ReaderCoreServiceMessage.StartReader(_instanceCorrelationId));
+			_pendingSubComponentsStarts += 1 /*EventReaderCoreService*/;
+
+			if (_runProjections >= ProjectionType.System) {
+				queue.Publish(new ProjectionCoreServiceMessage.StartCore(_instanceCorrelationId));
+				_pendingSubComponentsStarts += 1; /*ProjectionCoreService*/
+			}
+		}
+	}
+
+	private void Stop(ProjectionSubsystemMessage.StopComponents message) {
+		if (_currentState != CoreCoordinatorState.Started) {
+			Log.Debug("PROJECTIONS: Projections Core Coordinator trying to stop when not started. " +
+					  "Current state: {currentState}. StopCorrelation: {correlation}", _currentState,
+				message.InstanceCorrelationId);
+			return;
+		}
+
+		Log.Debug("PROJECTIONS: Stopping Projections Core Coordinator");
+		_currentState = CoreCoordinatorState.Stopping;
+		foreach (var queue in _queues) {
+			if (_runProjections >= ProjectionType.System) {
+				queue.Value.Publish(new ProjectionCoreServiceMessage.StopCore(queue.Key));
+			} else {
+				// TODO: Find out why projections still run even when ProjectionType.None
+				queue.Value.Publish(new ReaderCoreServiceMessage.StopReader(queue.Key));
+			}
+		}
+	}
+
+	public void Handle(ProjectionCoreServiceMessage.SubComponentStarted message) {
+		if (_currentState != CoreCoordinatorState.Starting) {
+			Log.Debug("PROJECTIONS: Projection Core Coordinator received SubComponent Started when not starting. " +
+				"SubComponent: {subComponent}, InstanceCorrelationId: {correlationId}, CurrentState: {currentState}",
+				message.SubComponent, message.InstanceCorrelationId, _currentState);
+			return;
+		}
+		if (message.InstanceCorrelationId != _instanceCorrelationId) {
+			Log.Debug("PROJECTIONS: Projection Core Coordinator received SubComponent Started for wrong correlation id. " +
+				"SubComponent: {subComponent}, RequestedCorrelation: {requestedCorrelation}, InstanceCorrelationId: {correlationId}",
+				message.SubComponent, message.InstanceCorrelationId, _instanceCorrelationId);
+			return;
+		}
+		_pendingSubComponentsStarts--;
+		_activeSubComponents++;
+		Log.Debug("PROJECTIONS: SubComponent Started: {subComponent}", message.SubComponent);
+
+		if (_pendingSubComponentsStarts == 0) {
+			_publisher.Publish(
+				new ProjectionSubsystemMessage.ComponentStarted(ComponentName, _instanceCorrelationId));
+			_currentState = CoreCoordinatorState.Started;
+		}
+	}
+
+	public void Handle(ProjectionCoreServiceMessage.SubComponentStopped message) {
+		if (_currentState != CoreCoordinatorState.Stopping) {
+			Log.Debug("PROJECTIONS: Projection Core Coordinator received SubComponent Stopped when not stopping. " +
+					  "SubComponent: {subComponent}, CurrentState: {currentState}",
+				message.SubComponent, _currentState);
+			return;
+		}
+		_activeSubComponents--;
+		Log.Debug("PROJECTIONS: SubComponent Stopped: {subComponent}", message.SubComponent);
+
+		if (message.SubComponent == ProjectionCoreService.SubComponentName) {
+			if (!_queues.TryGetValue(message.QueueId, out var queue))
+				return;
+			queue.Publish(new ReaderCoreServiceMessage.StopReader(message.QueueId));
+		}
+
+		if (_activeSubComponents == 0) {
+			_publisher.Publish(
+				new ProjectionSubsystemMessage.ComponentStopped(ComponentName, _instanceCorrelationId));
+			_currentState = CoreCoordinatorState.Stopped;
+		}
+	}
+
+	public void SetupMessaging(ISubscriber bus) {
+		bus.Subscribe<ProjectionCoreServiceMessage.SubComponentStarted>(this);
+		bus.Subscribe<ProjectionCoreServiceMessage.SubComponentStopped>(this);
+		bus.Subscribe<ProjectionSubsystemMessage.StartComponents>(this);
+		bus.Subscribe<ProjectionSubsystemMessage.StopComponents>(this);
+	}
+
+	private enum CoreCoordinatorState {
+		Stopped,
+		Stopping,
+		Starting,
+		Started
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Management/ProjectionManager.cs b/src/KurrentDB.Projections.Core/Services/Management/ProjectionManager.cs
new file mode 100644
index 00000000000..0da8795bd30
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Management/ProjectionManager.cs
@@ -0,0 +1,1380 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Nodes;
+using KurrentDB.Common.Options;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Projections.Core.Common;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Metrics;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Standard;
+using Serilog;
+using ILogger = Serilog.ILogger;
+using OperationResult = KurrentDB.Core.Messages.OperationResult;
+using TelemetryMessage = KurrentDB.Core.Telemetry.TelemetryMessage;
+
+namespace KurrentDB.Projections.Core.Services.Management;
+
+public class ProjectionManager
+	: IDisposable,
+		IHandle<ClientMessage.ReadStreamEventsBackwardCompleted>,
+		IHandle<ClientMessage.ReadStreamEventsForwardCompleted>,
+		IHandle<ClientMessage.WriteEventsCompleted>,
+		IHandle<ClientMessage.DeleteStreamCompleted>,
+		IHandle<ProjectionManagementMessage.Command.Post>,
+		IHandle<ProjectionManagementMessage.Command.PostBatch>,
+		IHandle<ProjectionManagementMessage.Command.UpdateQuery>,
+		IHandle<ProjectionManagementMessage.Command.GetQuery>,
+		IHandle<ProjectionManagementMessage.Command.Delete>,
+		IHandle<ProjectionManagementMessage.Command.GetStatistics>,
+		IHandle<ProjectionManagementMessage.Command.GetState>,
+		IHandle<ProjectionManagementMessage.Command.GetResult>,
+		IHandle<ProjectionManagementMessage.Command.Disable>,
+		IHandle<ProjectionManagementMessage.Command.Enable>,
+		IHandle<ProjectionManagementMessage.Command.Abort>,
+		IHandle<ProjectionManagementMessage.Command.SetRunAs>,
+		IHandle<ProjectionManagementMessage.Command.Reset>,
+		IHandle<ProjectionManagementMessage.Command.GetConfig>,
+		IHandle<ProjectionManagementMessage.Command.UpdateConfig>,
+		IHandle<ProjectionSubsystemMessage.StartComponents>,
+		IHandle<ProjectionSubsystemMessage.StopComponents>,
+		IHandle<ProjectionManagementMessage.Internal.CleanupExpired>,
+		IHandle<ProjectionManagementMessage.Internal.Deleted>,
+		IHandle<CoreProjectionStatusMessage.Started>,
+		IHandle<CoreProjectionStatusMessage.Stopped>,
+		IHandle<CoreProjectionStatusMessage.Faulted>,
+		IHandle<CoreProjectionStatusMessage.Prepared>,
+		IHandle<CoreProjectionStatusMessage.StateReport>,
+		IHandle<CoreProjectionStatusMessage.ResultReport>,
+		IHandle<CoreProjectionStatusMessage.StatisticsReport>,
+		IHandle<TelemetryMessage.Request> {
+	public const int ProjectionQueryId = -2;
+	public const int ProjectionCreationRetryCount = 1;
+	public const string ServiceName = "ProjectionManager";
+
+	private readonly ILogger _logger = Log.ForContext<ProjectionManager>();
+
+	private readonly IPublisher _inputQueue;
+	private readonly IPublisher _publisher;
+	private readonly Tuple<Guid, IPublisher>[] _queues;
+	private readonly Guid[] _workers;
+	private readonly TimeSpan _projectionsQueryExpiry;
+
+	private readonly ITimeProvider _timeProvider;
+	private readonly ProjectionType _runProjections;
+	private readonly bool _initializeSystemProjections;
+	private readonly Dictionary<string, ManagedProjection> _projections;
+	private readonly Dictionary<Guid, string> _projectionsMap;
+
+	private readonly RequestResponseDispatcher<ClientMessage.WriteEvents, ClientMessage.WriteEventsCompleted>
+		_writeDispatcher;
+
+	private readonly RequestResponseDispatcher<ClientMessage.DeleteStream, ClientMessage.DeleteStreamCompleted>
+		_streamDispatcher;
+
+	private readonly
+		RequestResponseDispatcher
+		<ClientMessage.ReadStreamEventsForward, ClientMessage.ReadStreamEventsForwardCompleted>
+		_readForwardDispatcher;
+
+	private readonly ReadDispatcher _readDispatcher;
+
+	private int _readEventsBatchSize = 100;
+
+	private int _lastUsedQueue = 0;
+	private bool _started;
+	private bool _projectionsStarted;
+	private long _projectionsRegistrationExpectedVersion = 0;
+	private bool _isWritePending = false;
+	private HashSet<string> _projectionsRegistrationState = new HashSet<string>();
+	private readonly IEnvelope _publishEnvelope;
+
+	private readonly
+		RequestResponseDispatcher<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>
+		_getStateDispatcher;
+
+	private readonly
+		RequestResponseDispatcher
+		<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>
+		_getResultDispatcher;
+
+	private readonly IODispatcher _ioDispatcher;
+
+	private Guid _instanceCorrelationId = Guid.Empty;
+	private IProjectionTracker _projectionTracker;
+	private readonly TimeSpan _interval = TimeSpan.FromMilliseconds(2000);
+	private readonly TimerMessage.Schedule _getStats;
+
+	public ProjectionManager(
+		IPublisher inputQueue,
+		IPublisher publisher,
+		IDictionary<Guid, IPublisher> queueMap,
+		ITimeProvider timeProvider,
+		ProjectionType runProjections,
+		IODispatcher ioDispatcher,
+		TimeSpan projectionQueryExpiry,
+		IProjectionTracker projectionTracker,
+		bool initializeSystemProjections = true) {
+		if (inputQueue == null)
+			throw new ArgumentNullException("inputQueue");
+		if (publisher == null)
+			throw new ArgumentNullException("publisher");
+		if (queueMap == null)
+			throw new ArgumentNullException("queueMap");
+		if (queueMap.Count == 0)
+			throw new ArgumentException("At least one queue is required", "queueMap");
+
+		_inputQueue = inputQueue;
+		_publisher = publisher;
+		_queues = queueMap.Select(v => Tuple.Create(v.Key, v.Value)).ToArray();
+		_workers = _queues.Select(v => v.Item1).ToArray();
+
+		_timeProvider = timeProvider;
+		_runProjections = runProjections;
+		_initializeSystemProjections = initializeSystemProjections;
+		_ioDispatcher = ioDispatcher;
+		_projectionsQueryExpiry = projectionQueryExpiry;
+		_projectionTracker = projectionTracker;
+
+		_writeDispatcher =
+			new RequestResponseDispatcher<ClientMessage.WriteEvents, ClientMessage.WriteEventsCompleted>(
+				publisher,
+				v => v.CorrelationId,
+				v => v.CorrelationId,
+				_inputQueue);
+		_readDispatcher = new ReadDispatcher(
+			publisher,
+			v => v.CorrelationId,
+			v => v.CorrelationId,
+			v => v.CorrelationId,
+			_inputQueue);
+		_readForwardDispatcher =
+			new RequestResponseDispatcher
+				<ClientMessage.ReadStreamEventsForward, ClientMessage.ReadStreamEventsForwardCompleted>(
+					publisher,
+					v => v.CorrelationId,
+					v => v.CorrelationId,
+					_inputQueue);
+		_streamDispatcher =
+			new RequestResponseDispatcher<ClientMessage.DeleteStream, ClientMessage.DeleteStreamCompleted>(
+				publisher,
+				v => v.CorrelationId,
+				v => v.CorrelationId,
+				_inputQueue);
+
+		_projections = new Dictionary<string, ManagedProjection>();
+		_projectionsMap = new Dictionary<Guid, string>();
+		_publishEnvelope = _inputQueue;
+		_getStateDispatcher =
+			new RequestResponseDispatcher
+				<CoreProjectionManagementMessage.GetState, CoreProjectionStatusMessage.StateReport>(
+					_publisher,
+					v => v.CorrelationId,
+					v => v.CorrelationId,
+					_inputQueue);
+		_getResultDispatcher =
+			new RequestResponseDispatcher
+				<CoreProjectionManagementMessage.GetResult, CoreProjectionStatusMessage.ResultReport>(
+					_publisher,
+					v => v.CorrelationId,
+					v => v.CorrelationId,
+					_inputQueue);
+		_getStats = TimerMessage.Schedule.Create(_interval, _inputQueue,
+			new ProjectionManagementMessage.Command.GetStatistics(new CallbackEnvelope(PushStatsToProjectionTracker), ProjectionMode.AllNonTransient, null, true));
+	}
+
+	private void PushStatsToProjectionTracker(Message message) {
+		if (message is ProjectionManagementMessage.Statistics stats) {
+			_projectionTracker.OnNewStats(stats.Projections);
+		}
+		_publisher.Publish(_getStats);
+	}
+
+	public void Handle(ProjectionSubsystemMessage.StartComponents message) {
+		if (_started) {
+			_logger.Debug("PROJECTIONS: Projection manager already started. Correlation: {correlation}",
+				message.InstanceCorrelationId);
+			return;
+		}
+
+		_instanceCorrelationId = message.InstanceCorrelationId;
+		_logger.Debug("PROJECTIONS: Starting Projections Manager. Correlation: {correlation}", _instanceCorrelationId);
+
+		_started = true;
+		if (_runProjections >= ProjectionType.System)
+			StartExistingProjections(
+				() => {
+					_projectionsStarted = true;
+					_publisher.Publish(_getStats);
+					ScheduleExpire();
+				});
+		_publisher.Publish(new ProjectionSubsystemMessage.ComponentStarted(ServiceName, _instanceCorrelationId));
+	}
+
+	public void Handle(ProjectionSubsystemMessage.StopComponents message) {
+		if (!_started) {
+			_logger.Debug("PROJECTIONS: Projection manager already stopped. Correlation: {correlation}",
+				message.InstanceCorrelationId);
+			return;
+		}
+
+		if (_instanceCorrelationId != message.InstanceCorrelationId) {
+			_logger.Debug("PROJECTIONS: Projection Manager received stop request for incorrect correlation id." +
+						  "Current: {correlationId}. Requested: {requestedCorrelationId}", _instanceCorrelationId, message.InstanceCorrelationId);
+			return;
+		}
+		_logger.Debug("PROJECTIONS: Stopping Projections Manager. Correlation {correlation}", _instanceCorrelationId);
+		Stop();
+	}
+
+	private void ScheduleExpire() {
+		if (!_projectionsStarted)
+			return;
+		_publisher.Publish(
+			TimerMessage.Schedule.Create(
+				TimeSpan.FromSeconds(60),
+				_publishEnvelope,
+				new ProjectionManagementMessage.Internal.CleanupExpired()));
+	}
+
+	private void Stop() {
+		_started = false;
+		_projectionsStarted = false;
+		_ioDispatcher.StartDraining(() =>
+			_publisher.Publish(new ProjectionSubsystemMessage.IODispatcherDrained(ServiceName)));
+
+		_projections.Clear();
+		_projectionsMap.Clear();
+
+		_publisher.Publish(new ProjectionSubsystemMessage.ComponentStopped(ServiceName, _instanceCorrelationId));
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.Post message) {
+		if (!_projectionsStarted)
+			return;
+
+		if (message.Mode == ProjectionMode.Transient) {
+			var transientProjection = new PendingProjection(ProjectionQueryId, message);
+			if (!ValidateProjections(new[] { transientProjection }, message))
+				return;
+
+			PostNewTransientProjection(transientProjection, message.Envelope);
+		} else {
+			if (_isWritePending) {
+				DelayMessage(message);
+			} else {
+				var expectedVersion = _projectionsRegistrationExpectedVersion;
+				var pendingProjections = new Dictionary<string, PendingProjection> {
+					{message.Name, new PendingProjection(expectedVersion + 1, message)}
+				};
+				if (!ValidateProjections(pendingProjections.Values.ToArray(), message))
+					return;
+
+				PostNewProjections(pendingProjections, expectedVersion, message.Envelope);
+			}
+		}
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.PostBatch message) {
+		if (!_projectionsStarted || !message.Projections.Any())
+			return;
+
+		if (message.Projections.Any(p => p.Mode == ProjectionMode.Transient)) {
+			message.Envelope.ReplyWith(
+				new ProjectionManagementMessage.OperationFailed(
+					"Transient projections in batches are not supported."));
+			return;
+		}
+		if (_isWritePending) {
+			DelayMessage(message);
+		} else {
+			var expectedVersion = _projectionsRegistrationExpectedVersion;
+			var pendingProjections = new Dictionary<string, PendingProjection>();
+
+			var projectionId = expectedVersion + 1;
+			foreach (var projection in message.Projections) {
+				pendingProjections.Add(projection.Name, new PendingProjection(projectionId, projection));
+				projectionId++;
+			}
+
+			if (!ValidateProjections(pendingProjections.Values.ToArray(), message))
+				return;
+
+			PostNewProjections(pendingProjections, expectedVersion, message.Envelope);
+		}
+	}
+
+	private bool ValidateProjections(
+		PendingProjection[] projections,
+		ProjectionManagementMessage.Command.ControlMessage message) {
+		var duplicateNames = new List<string>();
+
+		foreach (var projection in projections) {
+			if (!ProjectionManagementMessage.RunAs.ValidateRunAs(
+					projection.Mode,
+					ReadWrite.Write,
+					null,
+					message,
+					replace: projection.EnableRunAs)) {
+
+				_logger.Information("PROJECTIONS: Projections batch rejected due to invalid RunAs");
+				message.Envelope.ReplyWith(
+					new ProjectionManagementMessage.OperationFailed("Invalid RunAs"));
+				return false;
+			}
+
+			if (string.IsNullOrWhiteSpace(projection.Name)) {
+				message.Envelope.ReplyWith(
+					new ProjectionManagementMessage.OperationFailed("Projection name is required"));
+				return false;
+			}
+
+			if (_projectionsRegistrationState.Contains(projection.Name)) {
+				duplicateNames.Add(projection.Name);
+			}
+		}
+
+		if (duplicateNames.Any()) {
+			var duplicatesMsg = $"Duplicate projection names : {string.Join(", ", duplicateNames)}";
+			_logger.Debug($"PROJECTIONS: Conflict. {duplicatesMsg}");
+			message.Envelope.ReplyWith(
+				new ProjectionManagementMessage.Conflict(duplicatesMsg));
+			return false;
+		}
+
+		return true;
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.Delete message) {
+		if (!_projectionsStarted)
+			return;
+		var projection = GetProjection(message.Name);
+		if (projection == null) {
+			message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
+			return;
+		}
+
+		if (IsSystemProjection(message.Name)) {
+			message.Envelope.ReplyWith(
+				new ProjectionManagementMessage.OperationFailed(
+					"We currently don't allow for the deletion of System Projections."));
+			return;
+		}
+
+		if (!ProjectionManagementMessage.RunAs.ValidateRunAs(projection.Mode, ReadWrite.Write, projection.RunAs,
+			message))
+			return;
+		try {
+			projection.Handle(message);
+		} catch (InvalidOperationException ex) {
+			message.Envelope.ReplyWith(new ProjectionManagementMessage.OperationFailed(ex.Message));
+		}
+	}
+
+	private bool IsSystemProjection(string name) {
+		return name == ProjectionNamesBuilder.StandardProjections.EventByCategoryStandardProjection ||
+			   name == ProjectionNamesBuilder.StandardProjections.EventByTypeStandardProjection ||
+			   name == ProjectionNamesBuilder.StandardProjections.StreamByCategoryStandardProjection ||
+			   name == ProjectionNamesBuilder.StandardProjections.StreamsStandardProjection ||
+			   name == ProjectionNamesBuilder.StandardProjections.EventByCorrIdStandardProjection;
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.GetQuery message) {
+		if (!_projectionsStarted)
+			return;
+		var projection = GetProjection(message.Name);
+		if (projection == null)
+			message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
+		else {
+			if (!ProjectionManagementMessage.RunAs.ValidateRunAs(projection.Mode, ReadWrite.Read, projection.RunAs,
+				message))
+				return;
+			projection.Handle(message);
+		}
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.UpdateQuery message) {
+		if (!_projectionsStarted)
+			return;
+		_logger.Information(
+			"Updating '{projection}' projection source to '{source}`",
+			message.Name,
+			message.Query);
+		var projection = GetProjection(message.Name);
+
+		if (projection == null)
+			message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
+		else {
+			if (!ProjectionManagementMessage.RunAs.ValidateRunAs(projection.Mode, ReadWrite.Write, projection.RunAs,
+				message))
+				return;
+			projection.Handle(message); // update query text
+		}
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.Disable message) {
+		if (!_projectionsStarted)
+			return;
+		_logger.Information("Disabling '{projection}' projection", message.Name);
+
+		var projection = GetProjection(message.Name);
+		if (projection == null)
+			message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
+		else {
+			if (!ProjectionManagementMessage.RunAs.ValidateRunAs(projection.Mode, ReadWrite.Write, projection.RunAs,
+				message))
+				return;
+			projection.Handle(message);
+		}
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.Enable message) {
+		if (!_projectionsStarted)
+			return;
+		_logger.Information("Enabling '{projection}' projection", message.Name);
+
+		var projection = GetProjection(message.Name);
+		if (projection == null) {
+			_logger.Error("DBG: PROJECTION *{projection}* NOT FOUND.", message.Name);
+			message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
+		} else {
+			if (!ProjectionManagementMessage.RunAs.ValidateRunAs(projection.Mode, ReadWrite.Write, projection.RunAs,
+				message))
+				return;
+			projection.Handle(message);
+		}
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.Abort message) {
+		if (!_projectionsStarted)
+			return;
+		_logger.Information("Aborting '{projection}' projection", message.Name);
+
+		var projection = GetProjection(message.Name);
+		if (projection == null)
+			message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
+		else {
+			if (!ProjectionManagementMessage.RunAs.ValidateRunAs(projection.Mode, ReadWrite.Write, projection.RunAs,
+				message))
+				return;
+			projection.Handle(message);
+		}
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.SetRunAs message) {
+		if (!_projectionsStarted)
+			return;
+		_logger.Information("Setting RunAs1 account for '{projection}' projection", message.Name);
+
+		var projection = GetProjection(message.Name);
+		if (projection == null) {
+			_logger.Error("DBG: PROJECTION *{projection}* NOT FOUND.", message.Name);
+			message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
+		} else {
+			if (
+				!ProjectionManagementMessage.RunAs.ValidateRunAs(
+					projection.Mode, ReadWrite.Write, projection.RunAs, message,
+					message.Action == ProjectionManagementMessage.Command.SetRunAs.SetRemove.Set))
+				return;
+
+			projection.Handle(message);
+		}
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.Reset message) {
+		if (!_projectionsStarted)
+			return;
+		_logger.Information("Resetting '{projection}' projection", message.Name);
+
+		var projection = GetProjection(message.Name);
+		if (projection == null) {
+			_logger.Error("DBG: PROJECTION *{projection}* NOT FOUND.", message.Name);
+			message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
+		} else {
+			if (!ProjectionManagementMessage.RunAs.ValidateRunAs(projection.Mode, ReadWrite.Write, projection.RunAs,
+				message))
+				return;
+			projection.Handle(message);
+		}
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.GetStatistics message) {
+		if (!_projectionsStarted)
+			return;
+		if (!string.IsNullOrEmpty(message.Name)) {
+			var projection = GetProjection(message.Name);
+			if (projection == null)
+				message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
+			else
+				message.Envelope.ReplyWith(
+					new ProjectionManagementMessage.Statistics(new[] { projection.GetStatistics() }));
+
+		} else {
+			var statuses = (from projectionNameValue in _projections
+							let projection = projectionNameValue.Value
+							where !projection.Deleted
+							where
+								message.Mode == null || message.Mode == projection.Mode
+													 || (message.Mode.GetValueOrDefault() == ProjectionMode.AllNonTransient
+														 && projection.Mode != ProjectionMode.Transient)
+							let status = projection.GetStatistics()
+							select status).ToArray();
+			message.Envelope.ReplyWith(new ProjectionManagementMessage.Statistics(statuses));
+		}
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.GetState message) {
+		if (!_projectionsStarted)
+			return;
+		var projection = GetProjection(message.Name);
+		if (projection == null)
+			message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
+		else
+			projection.Handle(message);
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.GetResult message) {
+		if (!_projectionsStarted)
+			return;
+		var projection = GetProjection(message.Name);
+		if (projection == null)
+			message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
+		else
+			projection.Handle(message);
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.GetConfig message) {
+		if (!_projectionsStarted)
+			return;
+		var projection = GetProjection(message.Name);
+		if (projection == null)
+			message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
+		else {
+			if (!ProjectionManagementMessage.RunAs.ValidateRunAs(projection.Mode, ReadWrite.Read, projection.RunAs,
+				message))
+				return;
+			projection.Handle(message);
+		}
+	}
+
+	public void Handle(ProjectionManagementMessage.Command.UpdateConfig message) {
+		if (!_projectionsStarted)
+			return;
+		var projection = GetProjection(message.Name);
+		if (projection == null)
+			message.Envelope.ReplyWith(new ProjectionManagementMessage.NotFound());
+		else {
+			if (!ProjectionManagementMessage.RunAs.ValidateRunAs(projection.Mode, ReadWrite.Read, projection.RunAs,
+				message))
+				return;
+			try {
+				projection.Handle(message);
+			} catch (InvalidOperationException ex) {
+				message.Envelope.ReplyWith(new ProjectionManagementMessage.OperationFailed(ex.Message));
+				return;
+			}
+		}
+	}
+
+	public void Handle(ProjectionManagementMessage.Internal.CleanupExpired message) {
+		ScheduleExpire();
+		CleanupExpired();
+	}
+
+	private void CleanupExpired() {
+		foreach (var managedProjection in _projections.ToArray()) {
+			managedProjection.Value.Handle(new ProjectionManagementMessage.Internal.CleanupExpired());
+		}
+	}
+
+	public void Handle(CoreProjectionStatusMessage.Started message) {
+		string name;
+		if (_projectionsMap.TryGetValue(message.ProjectionId, out name)) {
+			var projection = _projections[name];
+			projection.Handle(message);
+		}
+	}
+
+	public void Handle(CoreProjectionStatusMessage.Stopped message) {
+		string name;
+		if (_projectionsMap.TryGetValue(message.ProjectionId, out name)) {
+			var projection = _projections[name];
+			projection.Handle(message);
+		}
+	}
+
+	public void Handle(CoreProjectionStatusMessage.Faulted message) {
+		string name;
+		if (_projectionsMap.TryGetValue(message.ProjectionId, out name)) {
+			var projection = _projections[name];
+			projection.Handle(message);
+		}
+	}
+
+	public void Handle(CoreProjectionStatusMessage.Prepared message) {
+		string name;
+		if (_projectionsMap.TryGetValue(message.ProjectionId, out name)) {
+			var projection = _projections[name];
+			projection.Handle(message);
+		}
+	}
+
+	public void Handle(CoreProjectionStatusMessage.StateReport message) {
+		_getStateDispatcher.Handle(message);
+	}
+
+	public void Handle(CoreProjectionStatusMessage.ResultReport message) {
+		_getResultDispatcher.Handle(message);
+	}
+
+	public void Handle(CoreProjectionStatusMessage.StatisticsReport message) {
+		string name;
+		if (_projectionsMap.TryGetValue(message.ProjectionId, out name)) {
+			var projection = _projections[name];
+			projection.Handle(message);
+		}
+	}
+
+	public void Handle(ClientMessage.ReadStreamEventsBackwardCompleted message) {
+		_readDispatcher.Handle(message);
+	}
+
+	public void Handle(ClientMessage.ReadStreamEventsForwardCompleted message) {
+		_readForwardDispatcher.Handle(message);
+	}
+
+	public void Handle(ClientMessage.WriteEventsCompleted message) {
+		_writeDispatcher.Handle(message);
+	}
+
+	public void Handle(ClientMessage.DeleteStreamCompleted message) {
+		_streamDispatcher.Handle(message);
+	}
+
+	public void Handle(ProjectionManagementMessage.Internal.Deleted message) {
+		var projection = GetProjection(message.Name);
+
+		if (projection == null)
+			return;
+
+		if (projection.Mode == ProjectionMode.Transient) {
+			// We don't need to write a delete, as transient projections don't write creations
+			_projections.Remove(message.Name);
+			_projectionsMap.Remove(message.Id);
+			_projectionsRegistrationState.Remove(message.Name);
+			return;
+		}
+
+		if (_isWritePending) {
+			DelayMessage(message);
+		} else {
+			DeleteProjection(message,
+				expVer => {
+					_projections.Remove(message.Name);
+					_projectionsMap.Remove(message.Id);
+					_projectionsRegistrationState.Remove(message.Name);
+					_projectionsRegistrationExpectedVersion = expVer;
+				});
+		}
+	}
+
+	private void DeleteProjection(
+		ProjectionManagementMessage.Internal.Deleted message, Action<long> completed, int retryCount = ProjectionCreationRetryCount) {
+		var corrId = Guid.NewGuid();
+		var writeDelete = new ClientMessage.WriteEvents(
+				corrId,
+				corrId,
+				_writeDispatcher.Envelope,
+				true,
+				ProjectionNamesBuilder.ProjectionsRegistrationStream,
+				_projectionsRegistrationExpectedVersion,
+				new Event(
+					Guid.NewGuid(),
+					ProjectionEventTypes.ProjectionDeleted,
+					false,
+					Helper.UTF8NoBom.GetBytes(message.Name),
+					Empty.ByteArray),
+				SystemAccounts.System);
+
+		_isWritePending = true;
+		_writeDispatcher.Publish(
+			writeDelete,
+			m => WriteProjectionDeletedCompleted(m, writeDelete, message, completed, retryCount));
+	}
+
+	public void Dispose() {
+		foreach (var projection in _projections.Values)
+			projection.Dispose();
+		_projections.Clear();
+	}
+
+	private ManagedProjection GetProjection(string name) {
+		ManagedProjection result;
+		return _projections.TryGetValue(name, out result) ? result : null;
+	}
+
+	private void StartExistingProjections(Action completed) {
+		var registeredProjections = new Dictionary<string, long>();
+		ReadProjectionsList(
+			registeredProjections,
+			r => StartRegisteredProjections(r, completed));
+	}
+
+	private void ReadProjectionsList(
+		IDictionary<string, long> registeredProjections,
+		Action<IDictionary<string, long>> completedAction,
+		long from = 0) {
+
+		_logger.Debug("PROJECTIONS: Reading Existing Projections from {stream}", ProjectionNamesBuilder.ProjectionsRegistrationStream);
+		var corrId = Guid.NewGuid();
+		_readForwardDispatcher.Publish(
+			new ClientMessage.ReadStreamEventsForward(
+				corrId,
+				corrId,
+				_readDispatcher.Envelope,
+				ProjectionNamesBuilder.ProjectionsRegistrationStream,
+				from,
+				_readEventsBatchSize,
+				resolveLinkTos: false,
+				requireLeader: false,
+				validationStreamVersion: null,
+				user: SystemAccounts.System,
+				replyOnExpired: false,
+				expires: DateTime.MaxValue),
+			m => OnProjectionsListReadCompleted(m, registeredProjections, from, completedAction));
+	}
+
+	private void OnProjectionsListReadCompleted(
+		ClientMessage.ReadStreamEventsForwardCompleted msg,
+		IDictionary<string, long> registeredProjections,
+		long requestedFrom,
+		Action<IDictionary<string, long>> completedAction) {
+		switch (msg.Result) {
+			case ReadStreamResult.Success:
+				foreach (var evnt in msg.Events) {
+					var projectionId = evnt.Event.EventNumber;
+					if (projectionId == 0)
+						projectionId = Int32.MaxValue - 1;
+					if (evnt.Event.EventType == ProjectionEventTypes.ProjectionsInitialized) {
+						registeredProjections.Add(ProjectionEventTypes.ProjectionsInitialized, projectionId);
+						continue;
+					}
+
+					var projectionName = Helper.UTF8NoBom.GetString(evnt.Event.Data.Span);
+					if (string.IsNullOrEmpty(projectionName)
+						|| _projections.ContainsKey(projectionName)) {
+						_logger.Warning(
+							"PROJECTIONS: The following projection: {projection} has a duplicate registration event.",
+							projectionName);
+						continue;
+					}
+
+					if (evnt.Event.EventType == ProjectionEventTypes.ProjectionCreated) {
+						if (registeredProjections.ContainsKey(projectionName)) {
+							registeredProjections[projectionName] = projectionId;
+							_logger.Warning(
+								"PROJECTIONS: The following projection: {projection} has a duplicate created event. Using projection Id {projectionId}",
+								projectionName, projectionId);
+							continue;
+						}
+
+						registeredProjections.Add(projectionName, projectionId);
+					} else if (evnt.Event.EventType == ProjectionEventTypes.ProjectionDeleted) {
+						registeredProjections.Remove(projectionName);
+					}
+				}
+				_projectionsRegistrationExpectedVersion = msg.LastEventNumber;
+
+				if (!msg.IsEndOfStream) {
+					ReadProjectionsList(registeredProjections, completedAction, from: msg.NextEventNumber);
+					return;
+				}
+
+				break;
+			case ReadStreamResult.StreamDeleted:
+			case ReadStreamResult.Error:
+			case ReadStreamResult.AccessDenied:
+				_logger.Fatal(
+					"There was an error reading the projections list due to {e}. Projections could not be loaded.",
+					msg.Result);
+				return;
+		}
+		completedAction(registeredProjections);
+	}
+
+	private void StartRegisteredProjections(IDictionary<string, long> registeredProjections,
+		Action completedAction) {
+		if (!registeredProjections.Any()) {
+			_logger.Debug("PROJECTIONS: No projections were found in {stream}, starting from empty stream",
+				ProjectionNamesBuilder.ProjectionsRegistrationStream);
+			WriteProjectionsInitialized(
+				() => {
+					completedAction();
+					CreateSystemProjections();
+				},
+				Guid.NewGuid());
+			return;
+		}
+
+		List<string> projections = registeredProjections
+			.Where(x => x.Key != ProjectionEventTypes.ProjectionsInitialized)
+			.Select(x => x.Key).ToList();
+
+		_logger.Debug(
+			"PROJECTIONS: Found the following projections in {stream}: {projections}",
+			ProjectionNamesBuilder.ProjectionsRegistrationStream,
+			projections);
+
+		foreach (var projection in projections)
+			_projectionsRegistrationState.Add(projection);
+
+		//create any missing system projections
+		CreateSystemProjections(registeredProjections.Select(x => x.Key).ToList());
+
+		foreach (var projectionRegistration in registeredProjections.Where(x =>
+			x.Key != ProjectionEventTypes.ProjectionsInitialized)) {
+			int queueIndex = GetNextWorkerIndex();
+			var managedProjection = CreateManagedProjectionInstance(
+				projectionRegistration.Key,
+				projectionRegistration.Value,
+				Guid.NewGuid(),
+				_workers[queueIndex]);
+			managedProjection.InitializeExisting(projectionRegistration.Key);
+		}
+
+		completedAction();
+	}
+
+	private bool IsProjectionEnabledToRunByMode(string projectionName) {
+		return _runProjections >= ProjectionType.All
+			   || _runProjections == ProjectionType.System && projectionName.StartsWith("$");
+	}
+
+	private void WriteProjectionsInitialized(Action action, Guid registrationEventId) {
+		var corrId = Guid.NewGuid();
+		_writeDispatcher.Publish(
+			new ClientMessage.WriteEvents(
+				corrId,
+				corrId,
+				_writeDispatcher.Envelope,
+				true,
+				ProjectionNamesBuilder.ProjectionsRegistrationStream,
+				ExpectedVersion.NoStream,
+				new Event(registrationEventId, ProjectionEventTypes.ProjectionsInitialized, false, Empty.ByteArray,
+					Empty.ByteArray),
+				SystemAccounts.System),
+			completed => WriteProjectionsInitializedCompleted(completed, registrationEventId, action));
+	}
+
+	private void WriteProjectionsInitializedCompleted(ClientMessage.WriteEventsCompleted completed,
+		Guid registrationEventId, Action action) {
+		switch (completed.Result) {
+			case OperationResult.Success:
+				action();
+				break;
+			case OperationResult.CommitTimeout:
+			case OperationResult.ForwardTimeout:
+			case OperationResult.PrepareTimeout:
+				WriteProjectionsInitialized(action, registrationEventId);
+				break;
+			default:
+				_logger.Fatal("Cannot initialize projections subsystem. Cannot write a fake projection");
+				break;
+		}
+	}
+
+	private void CreateSystemProjections() {
+		CreateSystemProjections(new List<string>());
+	}
+
+	private void CreateSystemProjections(List<string> existingSystemProjections) {
+		var systemProjections = new List<ProjectionManagementMessage.Command.PostBatch.ProjectionPost>();
+
+		if (!_initializeSystemProjections) {
+			return;
+		}
+
+		if (!existingSystemProjections.Contains(ProjectionNamesBuilder.StandardProjections
+			.StreamsStandardProjection))
+			systemProjections.Add(CreateSystemProjectionPost(
+				ProjectionNamesBuilder.StandardProjections.StreamsStandardProjection,
+				typeof(IndexStreams),
+				""));
+
+		if (!existingSystemProjections.Contains(ProjectionNamesBuilder.StandardProjections
+			.StreamByCategoryStandardProjection))
+			systemProjections.Add(CreateSystemProjectionPost(
+				ProjectionNamesBuilder.StandardProjections.StreamByCategoryStandardProjection,
+				typeof(CategorizeStreamByPath),
+				"first\r\n-"));
+
+		if (!existingSystemProjections.Contains(ProjectionNamesBuilder.StandardProjections
+			.EventByCategoryStandardProjection))
+			systemProjections.Add(CreateSystemProjectionPost(
+				ProjectionNamesBuilder.StandardProjections.EventByCategoryStandardProjection,
+				typeof(CategorizeEventsByStreamPath),
+				"first\r\n-"));
+
+		if (!existingSystemProjections.Contains(ProjectionNamesBuilder.StandardProjections
+			.EventByTypeStandardProjection))
+			systemProjections.Add(CreateSystemProjectionPost(
+				ProjectionNamesBuilder.StandardProjections.EventByTypeStandardProjection,
+				typeof(IndexEventsByEventType),
+				""));
+
+		if (!existingSystemProjections.Contains(ProjectionNamesBuilder.StandardProjections
+			.EventByCorrIdStandardProjection))
+			systemProjections.Add(CreateSystemProjectionPost(
+				ProjectionNamesBuilder.StandardProjections.EventByCorrIdStandardProjection,
+				typeof(ByCorrelationId),
+				"{\"correlationIdProperty\":\"$correlationId\"}"));
+
+		IEnvelope envelope = new NoopEnvelope();
+		var postBatchMessage = new ProjectionManagementMessage.Command.PostBatch(
+			envelope, ProjectionManagementMessage.RunAs.System, systemProjections.ToArray());
+		_publisher.Publish(postBatchMessage);
+	}
+
+	private ProjectionManagementMessage.Command.PostBatch.ProjectionPost CreateSystemProjectionPost
+		(string name, Type handlerType, string config) {
+		return new ProjectionManagementMessage.Command.PostBatch.ProjectionPost(
+			ProjectionMode.Continuous,
+			ProjectionManagementMessage.RunAs.System,
+			name,
+			"native:" + handlerType.Namespace + "." + handlerType.Name,
+			config,
+			enabled: false,
+			checkpointsEnabled: true,
+			emitEnabled: true,
+			trackEmittedStreams: false,
+			enableRunAs: true);
+	}
+
+	private void PostNewTransientProjection(PendingProjection projection, IEnvelope replyEnvelope) {
+		var initializer = projection.CreateInitializer(replyEnvelope);
+		ReadProjectionPossibleStream(projection.Name,
+			m => ReadProjectionPossibleStreamCompleted
+				(m, initializer, replyEnvelope));
+	}
+
+	private void PostNewProjections
+		(IDictionary<string, PendingProjection> newProjections, long expectedVersion, IEnvelope replyEnvelope) {
+		var corrId = Guid.NewGuid();
+		var events = new List<Event>();
+
+		foreach (var projection in newProjections.Values) {
+			if (projection.Mode >= ProjectionMode.OneTime) {
+				var eventId = Guid.NewGuid();
+				events.Add(new Event(
+					eventId,
+					ProjectionEventTypes.ProjectionCreated,
+					false,
+					Helper.UTF8NoBom.GetBytes(projection.Name),
+					Empty.ByteArray));
+			} else {
+				_logger.Warning("PROJECTIONS: Should not be processing transient projections here.");
+			}
+		}
+
+		if (!events.Any())
+			return;
+
+		var writeEvents = new ClientMessage.WriteEvents(
+			corrId,
+			corrId,
+			_writeDispatcher.Envelope,
+			true,
+			ProjectionNamesBuilder.ProjectionsRegistrationStream,
+			expectedVersion,
+			events.ToArray(),
+			SystemAccounts.System);
+
+		_isWritePending = true;
+		_writeDispatcher.Publish(
+			writeEvents,
+			m => WriteNewProjectionsCompleted
+				(m, writeEvents, newProjections, replyEnvelope));
+	}
+
+
+	private void WriteNewProjectionsCompleted(ClientMessage.WriteEventsCompleted completed,
+		ClientMessage.WriteEvents write,
+		IDictionary<string, PendingProjection> newProjections,
+		IEnvelope envelope, int retryCount = ProjectionCreationRetryCount) {
+
+		_isWritePending = false;
+		if (completed.Result == OperationResult.Success) {
+			foreach (var name in newProjections.Keys)
+				_projectionsRegistrationState.Add(name);
+
+			_projectionsRegistrationExpectedVersion = completed.LastEventNumber;
+			StartNewlyRegisteredProjections(newProjections, OnProjectionsRegistrationCaughtUp, envelope);
+			return;
+		}
+
+		_logger.Information(
+			"PROJECTIONS: Created event for projections has not been written to {stream}: {projections}. Error: {error}",
+			ProjectionNamesBuilder.ProjectionsRegistrationStream,
+			newProjections.Keys,
+			Enum.GetName(typeof(OperationResult), completed.Result));
+
+		if (completed.Result == OperationResult.ForwardTimeout ||
+			completed.Result == OperationResult.PrepareTimeout ||
+			completed.Result == OperationResult.CommitTimeout) {
+			if (retryCount > 0) {
+				_logger.Information("PROJECTIONS: Retrying write projection creations for {projections}",
+					newProjections.Keys);
+				_isWritePending = true;
+				_writeDispatcher.Publish(
+					write,
+					m => WriteNewProjectionsCompleted
+						(m, write, newProjections, envelope, retryCount - 1));
+				return;
+			}
+		}
+
+		envelope.ReplyWith(new ProjectionManagementMessage.OperationFailed(
+			string.Format(
+				"The projections '{0}' could not be created because the registration could not be written due to {1}",
+				string.Join(", ", newProjections.Keys), completed.Result)));
+	}
+
+	private void StartNewlyRegisteredProjections
+		(IDictionary<string, PendingProjection> newProjections,
+		Action completedAction, IEnvelope replyEnvelope) {
+
+		if (!newProjections.Any()) {
+			replyEnvelope.ReplyWith(
+				new ProjectionManagementMessage.OperationFailed("Projections were invalid"));
+			return;
+		}
+
+		_logger.Debug(
+			"PROJECTIONS: Found the following new projections in {stream}: {projections}",
+			ProjectionNamesBuilder.ProjectionsRegistrationStream,
+			newProjections.Keys);
+
+		try {
+			foreach (var projection in newProjections.Values) {
+				var initializer = projection.CreateInitializer(replyEnvelope);
+				ReadProjectionPossibleStream(projection.Name,
+					m => ReadProjectionPossibleStreamCompleted
+						(m, initializer, replyEnvelope));
+			}
+		} catch (Exception ex) {
+			replyEnvelope.ReplyWith(new ProjectionManagementMessage.OperationFailed(ex.Message));
+		}
+
+		completedAction();
+	}
+
+	private void ReadProjectionPossibleStream(
+		string projectionName,
+		Action<ClientMessage.ReadStreamEventsBackwardCompleted> onComplete) {
+		var corrId = Guid.NewGuid();
+		_readDispatcher.Publish(
+			new ClientMessage.ReadStreamEventsBackward(
+				corrId,
+				corrId,
+				_readDispatcher.Envelope,
+				ProjectionNamesBuilder.ProjectionsStreamPrefix + projectionName,
+				0,
+				_readEventsBatchSize,
+				resolveLinkTos: false,
+				requireLeader: false,
+				validationStreamVersion: null,
+				user: SystemAccounts.System,
+				expires: DateTime.MaxValue),
+			new ReadStreamEventsBackwardHandlers.Optimistic(onComplete));
+	}
+
+	private void ReadProjectionPossibleStreamCompleted(
+		ClientMessage.ReadStreamEventsBackwardCompleted completed,
+		NewProjectionInitializer initializer,
+		IEnvelope replyEnvelope) {
+
+		long version = -1;
+		if (completed.Result == ReadStreamResult.Success) {
+			version = completed.LastEventNumber + 1;
+		}
+
+		try {
+			int queueIndex = GetNextWorkerIndex();
+			initializer.
+				CreateAndInitializeNewProjection(this, Guid.NewGuid(), _workers[queueIndex],
+				version: version);
+		} catch (Exception ex) {
+			replyEnvelope.ReplyWith(new ProjectionManagementMessage.OperationFailed(ex.Message));
+		}
+	}
+
+	private void OnProjectionsRegistrationCaughtUp() {
+		_logger.Debug($"PROJECTIONS: Caught up with projections registration. Next expected version: {_projectionsRegistrationExpectedVersion}");
+	}
+
+	private void WriteProjectionDeletedCompleted(ClientMessage.WriteEventsCompleted writeCompleted,
+		ClientMessage.WriteEvents writeDelete,
+		ProjectionManagementMessage.Internal.Deleted message,
+		Action<long> onCompleted,
+		int retryCount) {
+
+		_isWritePending = false;
+		if (writeCompleted.Result == OperationResult.Success) {
+			onCompleted?.Invoke(writeCompleted.LastEventNumber);
+			return;
+		}
+
+		_logger.Information(
+			"PROJECTIONS: Projection '{projection}' deletion has not been written to {stream}. Error: {e}",
+			message.Name,
+			ProjectionNamesBuilder.ProjectionsRegistrationStream,
+			Enum.GetName(typeof(OperationResult), writeCompleted.Result));
+
+		if (writeCompleted.Result == OperationResult.CommitTimeout || writeCompleted.Result == OperationResult.ForwardTimeout
+																   || writeCompleted.Result == OperationResult.PrepareTimeout) {
+			if (retryCount > 0) {
+				_logger.Information("PROJECTIONS: Retrying write projection deletion for {projection}", message.Name);
+				_isWritePending = true;
+				_writeDispatcher.Publish(
+					writeDelete,
+					m => WriteProjectionDeletedCompleted(m, writeDelete, message, onCompleted, retryCount - 1));
+				return;
+			}
+		}
+
+		if (writeCompleted.Result == OperationResult.WrongExpectedVersion) {
+			_logger.Error("PROJECTIONS: Got wrong expected version writing projection deletion for {projection}.",
+				message.Name);
+			return;
+		}
+
+		_logger.Error(
+			"PROJECTIONS: The projection '{0}' could not be deleted because the deletion event could not be written due to {1}",
+			message.Name, writeCompleted.Result);
+	}
+
+	private void DelayMessage(Message messageToDelay) {
+		_publisher.Publish(TimerMessage.Schedule.Create(TimeSpan.FromSeconds(2), _inputQueue, messageToDelay));
+	}
+
+	public class NewProjectionInitializer {
+		private readonly long _projectionId;
+		private readonly bool _enabled;
+		private readonly string _handlerType;
+		private readonly string _query;
+		private readonly ProjectionMode _projectionMode;
+		private readonly bool _emitEnabled;
+		private readonly bool _checkpointsEnabled;
+		private readonly bool _trackEmittedStreams;
+		private readonly bool _enableRunAs;
+		private readonly ProjectionManagementMessage.RunAs _runAs;
+		private readonly IEnvelope _replyEnvelope;
+		private readonly string _name;
+
+		public NewProjectionInitializer(
+			long projectionId,
+			string name,
+			ProjectionMode projectionMode,
+			string handlerType,
+			string query,
+			bool enabled,
+			bool emitEnabled,
+			bool checkpointsEnabled,
+			bool enableRunAs,
+			bool trackEmittedStreams,
+			ProjectionManagementMessage.RunAs runAs,
+			IEnvelope replyEnvelope) {
+			if (projectionMode >= ProjectionMode.Continuous && !checkpointsEnabled)
+				throw new InvalidOperationException("Continuous mode requires checkpoints");
+
+			if (emitEnabled && !checkpointsEnabled)
+				throw new InvalidOperationException("Emit requires checkpoints");
+
+			_projectionId = projectionId;
+			_enabled = enabled;
+			_handlerType = handlerType;
+			_query = query;
+			_projectionMode = projectionMode;
+			_emitEnabled = emitEnabled;
+			_checkpointsEnabled = checkpointsEnabled;
+			_trackEmittedStreams = trackEmittedStreams;
+			_enableRunAs = enableRunAs;
+			_runAs = runAs;
+			_replyEnvelope = replyEnvelope;
+			_name = name;
+		}
+
+		public void CreateAndInitializeNewProjection(
+			ProjectionManager projectionManager,
+			Guid projectionCorrelationId,
+			Guid workerId,
+			long? version = -1) {
+			var projection = projectionManager.CreateManagedProjectionInstance(
+				_name,
+				_projectionId,
+				projectionCorrelationId,
+				workerId);
+			projection.InitializeNew(
+				new ManagedProjection.PersistedState {
+					Enabled = _enabled,
+					HandlerType = _handlerType,
+					Query = _query,
+					Mode = _projectionMode,
+					EmitEnabled = _emitEnabled,
+					CheckpointsDisabled = !_checkpointsEnabled,
+					TrackEmittedStreams = _trackEmittedStreams,
+					CheckpointHandledThreshold = ProjectionConsts.CheckpointHandledThreshold,
+					CheckpointAfterMs = (int)ProjectionConsts.CheckpointAfterMs.TotalMilliseconds,
+					MaxAllowedWritesInFlight = ProjectionConsts.MaxAllowedWritesInFlight,
+					Epoch = -1,
+					Version = version,
+					RunAs = _enableRunAs ? SerializedRunAs.SerializePrincipal(_runAs) : null,
+					ProjectionSubsystemVersion = ProjectionsSubsystem.VERSION,
+					ProjectionExecutionTimeout = null
+				},
+				_replyEnvelope);
+		}
+	}
+
+	private ManagedProjection CreateManagedProjectionInstance(
+		string name,
+		long projectionId,
+		Guid projectionCorrelationId,
+		Guid workerID) {
+		var enabledToRun = IsProjectionEnabledToRunByMode(name);
+		var workerId = workerID;
+		var managedProjectionInstance = new ManagedProjection(
+			workerId,
+			projectionCorrelationId,
+			projectionId,
+			name,
+			enabledToRun,
+			_logger,
+			_streamDispatcher,
+			_writeDispatcher,
+			_readDispatcher,
+			_publisher,
+			_timeProvider,
+			_getStateDispatcher,
+			_getResultDispatcher,
+			_ioDispatcher,
+			_projectionsQueryExpiry);
+
+		_projectionsMap.Add(projectionCorrelationId, name);
+		_projections.Add(name, managedProjectionInstance);
+		_logger.Debug("Adding projection {projectionCorrelationId}@{projection} to list", projectionCorrelationId,
+			name);
+		return managedProjectionInstance;
+	}
+
+	private int GetNextWorkerIndex() {
+		if (_lastUsedQueue >= _workers.Length)
+			_lastUsedQueue = 0;
+		var queueIndex = _lastUsedQueue;
+		_lastUsedQueue++;
+		return queueIndex;
+	}
+
+	public class PendingProjection {
+		public ProjectionMode Mode { get; }
+		public SerializedRunAs RunAs { get; }
+		public string Name { get; }
+		public string HandlerType { get; }
+		public string Query { get; }
+		public bool Enabled { get; }
+		public bool CheckpointsEnabled { get; }
+		public bool EmitEnabled { get; }
+		public bool EnableRunAs { get; }
+		public bool TrackEmittedStreams { get; }
+		public long ProjectionId { get; }
+
+		public PendingProjection(
+			long projectionId, ProjectionMode mode, SerializedRunAs runAs, string name, string handlerType, string query,
+			bool enabled, bool checkpointsEnabled, bool emitEnabled, bool enableRunAs,
+			bool trackEmittedStreams) {
+			ProjectionId = projectionId;
+			Mode = mode;
+			RunAs = runAs;
+			Name = name;
+			HandlerType = handlerType;
+			Query = query;
+			Enabled = enabled;
+			CheckpointsEnabled = checkpointsEnabled;
+			EmitEnabled = emitEnabled;
+			EnableRunAs = enableRunAs;
+			TrackEmittedStreams = trackEmittedStreams;
+		}
+
+		public PendingProjection(long projectionId, ProjectionManagementMessage.Command.PostBatch.ProjectionPost projection)
+			: this(projectionId, projection.Mode, projection.RunAs, projection.Name, projection.HandlerType,
+				projection.Query, projection.Enabled, projection.CheckpointsEnabled,
+				projection.EmitEnabled, projection.EnableRunAs, projection.TrackEmittedStreams) { }
+
+		public PendingProjection(long projectionId, ProjectionManagementMessage.Command.Post projection)
+			: this(projectionId, projection.Mode, projection.RunAs, projection.Name, projection.HandlerType,
+				projection.Query, projection.Enabled, projection.CheckpointsEnabled,
+				projection.EmitEnabled, projection.EnableRunAs, projection.TrackEmittedStreams) { }
+
+		public NewProjectionInitializer CreateInitializer(IEnvelope replyEnvelope) {
+			return new NewProjectionInitializer(
+				ProjectionId,
+				Name,
+				Mode,
+				HandlerType,
+				Query,
+				Enabled,
+				EmitEnabled,
+				CheckpointsEnabled,
+				EnableRunAs,
+				TrackEmittedStreams,
+				RunAs,
+				replyEnvelope);
+		}
+	}
+
+	public void Handle(TelemetryMessage.Request message) {
+		var customProjectionCount = 0;
+		var customProjectionRunningCount = 0;
+		var standardProjectionCount = 0;
+		var standardProjectionRunningCount = 0;
+
+		foreach (var proj in _projections.Values) {
+			if (proj.Mode != ProjectionMode.Continuous)
+				continue;
+
+			var stats = proj.GetStatistics();
+
+			if (stats.Name.StartsWith("$")) {
+				standardProjectionCount += 1;
+
+				if (stats.Status.Contains("Running"))
+					standardProjectionRunningCount += 1;
+			} else {
+				customProjectionCount += 1;
+
+				if (stats.Status.Contains("Running"))
+					customProjectionRunningCount += 1;
+			}
+		}
+
+		message.Envelope.ReplyWith(new TelemetryMessage.Response("projections", new JsonObject {
+			["customProjectionCount"] = customProjectionCount,
+			["standardProjectionCount"] = standardProjectionCount,
+			["customProjectionRunningCount"] = customProjectionRunningCount,
+			["standardProjectionRunningCount"] = standardProjectionRunningCount,
+			["totalCount"] = customProjectionCount + standardProjectionCount,
+			["totalRunningCount"] = customProjectionRunningCount + standardProjectionRunningCount,
+		}));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Management/ProjectionManagerMessageDispatcher.cs b/src/KurrentDB.Projections.Core/Services/Management/ProjectionManagerMessageDispatcher.cs
new file mode 100644
index 00000000000..3d1b4c76ff4
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Management/ProjectionManagerMessageDispatcher.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Projections.Core.Messages;
+using Serilog;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Projections.Core.Services.Management;
+
+public class ProjectionManagerMessageDispatcher
+	: IHandle<CoreProjectionManagementControlMessage> {
+	private readonly ILogger _logger = Log.ForContext<ProjectionManager>();
+	private readonly IDictionary<Guid, IPublisher> _queueMap;
+
+	public ProjectionManagerMessageDispatcher(IDictionary<Guid, IPublisher> queueMap) {
+		_queueMap = queueMap;
+	}
+
+	public void Handle(CoreProjectionManagementControlMessage message) {
+		DispatchWorkerMessage(message, message.WorkerId);
+	}
+
+	private void DispatchWorkerMessage(Message message, Guid workerId) {
+		IPublisher worker;
+		if (_queueMap.TryGetValue(workerId, out worker))
+			worker.Publish(message);
+		else
+			_logger.Information("Cannot find a worker with ID: {workerId}", workerId);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Management/ProjectionStateHandlerFactory.cs b/src/KurrentDB.Projections.Core/Services/Management/ProjectionStateHandlerFactory.cs
new file mode 100644
index 00000000000..a7174140d14
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Management/ProjectionStateHandlerFactory.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Projections.Core.Services.Interpreted;
+
+namespace KurrentDB.Projections.Core.Services.Management;
+
+
+
+public class ProjectionStateHandlerFactory {
+	private readonly TimeSpan _javascriptCompilationTimeout;
+	private readonly TimeSpan _javascriptExecutionTimeout;
+
+	public ProjectionStateHandlerFactory(TimeSpan javascriptCompilationTimeout, TimeSpan javascriptExecutionTimeout) {
+		_javascriptCompilationTimeout = javascriptCompilationTimeout;
+		_javascriptExecutionTimeout = javascriptExecutionTimeout;
+	}
+	public IProjectionStateHandler Create(
+		string factoryType, string source,
+		bool enableContentTypeValidation,
+		int? projectionExecutionTimeout,
+		Action<string, object[]> logger = null) {
+		var colonPos = factoryType.IndexOf(':');
+		string kind = null;
+		string rest = null;
+		if (colonPos > 0) {
+			kind = factoryType.Substring(0, colonPos);
+			rest = factoryType.Substring(colonPos + 1);
+		} else {
+			kind = factoryType;
+		}
+
+		IProjectionStateHandler result;
+		var executionTimeout = projectionExecutionTimeout is > 0
+			? TimeSpan.FromMilliseconds(projectionExecutionTimeout.Value)
+			: _javascriptExecutionTimeout;
+		switch (kind.ToLowerInvariant()) {
+			case "js":
+				result = new JintProjectionStateHandler(source, enableContentTypeValidation,
+					_javascriptCompilationTimeout, executionTimeout);
+				break;
+			case "native":
+				// Allow loading native projections from previous versions
+				rest = rest?.Replace("EventStore", "KurrentDB");
+
+				var type = Type.GetType(rest);
+				if (type == null) {
+					type =
+						AppDomain.CurrentDomain.GetAssemblies()
+							.Select(v => v.GetType(rest))
+							.FirstOrDefault(v => v != null);
+				}
+
+				var handler = Activator.CreateInstance(type, source, logger);
+				result = (IProjectionStateHandler)handler;
+				break;
+			default:
+				throw new NotSupportedException(string.Format("'{0}' handler type is not supported", factoryType));
+		}
+
+		return result;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/CheckpointTag.cs b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/CheckpointTag.cs
new file mode 100644
index 00000000000..755671c8795
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/CheckpointTag.cs
@@ -0,0 +1,788 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+public class CheckpointTag : IComparable<CheckpointTag> {
+	public readonly int Phase;
+
+	public readonly TFPos Position;
+
+	//TODO: rename to StreamsOrEventTypes or just Positions
+	public readonly Dictionary<string, long> Streams;
+
+	public readonly string CatalogStream;
+	public readonly string DataStream;
+	public readonly long CatalogPosition;
+	public readonly long DataPosition;
+
+	internal enum Mode {
+		Phase,
+		Position,
+		Stream,
+		MultiStream,
+		EventTypeIndex,
+		PreparePosition,
+		ByStream
+	}
+
+	private CheckpointTag(int phase, bool completed) {
+		Phase = phase;
+		Position = completed ? new TFPos(long.MaxValue, long.MaxValue) : new TFPos(long.MinValue, long.MinValue);
+		Streams = null;
+		Mode_ = CalculateMode();
+	}
+
+	private CheckpointTag(int phase, TFPos position, Dictionary<string, long> streams) {
+		Phase = phase;
+		Position = position;
+		Streams = streams;
+		Mode_ = CalculateMode();
+	}
+
+	private CheckpointTag(int phase, long preparePosition) {
+		Phase = phase;
+		Position = new TFPos(long.MinValue, preparePosition);
+		Mode_ = CalculateMode();
+	}
+
+	private CheckpointTag(int phase, TFPos position) {
+		Phase = phase;
+		Position = position;
+		Mode_ = CalculateMode();
+	}
+
+	private CheckpointTag(int phase, IDictionary<string, long> streams) {
+		Phase = phase;
+		foreach (var stream in streams) {
+			if (stream.Key == "")
+				throw new ArgumentException("Empty stream name", "streams");
+			if (stream.Value < 0 && stream.Value != ExpectedVersion.NoStream)
+				throw new ArgumentException("Invalid sequence number", "streams");
+		}
+
+		Streams = new Dictionary<string, long>(streams); // clone
+		Position = new TFPos(Int64.MinValue, Int64.MinValue);
+		Mode_ = CalculateMode();
+	}
+
+	private CheckpointTag(int phase, IDictionary<string, long> eventTypes, TFPos position) {
+		Phase = phase;
+		Position = position;
+		foreach (var stream in eventTypes) {
+			if (stream.Key == "")
+				throw new ArgumentException("Empty stream name", "eventTypes");
+			if (stream.Value < 0 && stream.Value != ExpectedVersion.NoStream)
+				throw new ArgumentException("Invalid sequence number", "eventTypes");
+		}
+
+		Streams = new Dictionary<string, long>(eventTypes); // clone
+		Mode_ = CalculateMode();
+	}
+
+	private CheckpointTag(int phase, string stream, long sequenceNumber) {
+		Phase = phase;
+		if (stream == null)
+			throw new ArgumentNullException("stream");
+		if (stream == "")
+			throw new ArgumentException("stream");
+		if (sequenceNumber < 0 && sequenceNumber != ExpectedVersion.NoStream)
+			throw new ArgumentException("sequenceNumber");
+		Position = new TFPos(Int64.MinValue, Int64.MinValue);
+		Streams = new Dictionary<string, long> { { stream, sequenceNumber } };
+		Mode_ = CalculateMode();
+	}
+
+	private CheckpointTag(
+		int phase, string catalogStream, long catalogPosition, string dataStream, long dataPosition,
+		long commitPosition) {
+		Phase = phase;
+		CatalogStream = catalogStream;
+		CatalogPosition = catalogPosition;
+		DataStream = dataStream;
+		DataPosition = dataPosition;
+		Position = new TFPos(commitPosition, Int64.MinValue);
+		Mode_ = Mode.ByStream;
+	}
+
+	private Mode CalculateMode() {
+		if (Streams == null || Streams.Count == 0)
+			if (Position.CommitPosition == Int64.MinValue && Position.PreparePosition == Int64.MinValue)
+				return Mode.Phase;
+			else if (Position.CommitPosition == Int64.MaxValue && Position.PreparePosition == Int64.MaxValue)
+				return Mode.Phase;
+			else if (Position.CommitPosition == Int64.MinValue && Position.PreparePosition != Int64.MinValue)
+				return Mode.PreparePosition;
+			else
+				return Mode.Position;
+		if (Position != new TFPos(Int64.MinValue, Int64.MinValue))
+			return Mode.EventTypeIndex;
+		if (Streams.Count == 1)
+			return Mode.Stream;
+		return Mode.MultiStream;
+	}
+
+	public static bool operator >(CheckpointTag left, CheckpointTag right) {
+		if (ReferenceEquals(left, right))
+			return false;
+		if (!ReferenceEquals(left, null) && ReferenceEquals(right, null))
+			return true;
+		if (ReferenceEquals(left, null) && !ReferenceEquals(right, null))
+			return false;
+		if (left.Phase > right.Phase)
+			return true;
+		if (left.Phase < right.Phase)
+			return false;
+		var leftMode = left.Mode_;
+		var rightMode = right.Mode_;
+		UpgradeModes(ref leftMode, ref rightMode);
+		if (leftMode != rightMode)
+			throw new NotSupportedException("Cannot compare checkpoint tags in different modes");
+		switch (leftMode) {
+			case Mode.ByStream:
+				CheckCatalogCompatibility(left, right);
+				return left.CatalogPosition > right.CatalogPosition
+					   || (left.CatalogPosition == right.CatalogPosition && left.DataPosition > right.DataPosition);
+			case Mode.Phase:
+				return left.Position > right.Position;
+			case Mode.Position:
+			case Mode.EventTypeIndex:
+				return left.Position > right.Position;
+			case Mode.PreparePosition:
+				return left.PreparePosition > right.PreparePosition;
+			case Mode.Stream:
+				if (left.Streams.Keys.First() != right.Streams.Keys.First())
+					throw new InvalidOperationException("Cannot compare checkpoint tags across different streams");
+				var result = left.Streams.Values.First() > right.Streams.Values.First();
+				return result;
+			case Mode.MultiStream:
+				long rvalue;
+				bool anyLeftGreater = left.Streams.Any(l =>
+					!right.Streams.TryGetValue(l.Key, out rvalue) || l.Value > rvalue);
+
+				long lvalue;
+				bool anyRightGreater = right.Streams.Any(r =>
+					!left.Streams.TryGetValue(r.Key, out lvalue) || r.Value > lvalue);
+
+				if (anyLeftGreater && anyRightGreater)
+					ThrowIncomparable(left, right);
+				return anyLeftGreater;
+			default:
+				throw new NotSupportedException("Checkpoint tag mode is not supported in comparison");
+		}
+	}
+
+	private static void CheckCatalogCompatibility(CheckpointTag left, CheckpointTag right) {
+		if (left.CatalogStream != right.CatalogStream)
+			throw new Exception("Cannot compare tags with different catalog streams");
+	}
+
+	private static void ThrowIncomparable(CheckpointTag left, CheckpointTag right) {
+		throw new InvalidOperationException(
+			string.Format("Incomparable multi-stream checkpoint tags. '{0}' and '{1}'", left, right));
+	}
+
+	public static bool operator >=(CheckpointTag left, CheckpointTag right) {
+		if (ReferenceEquals(left, right))
+			return true;
+		if (!ReferenceEquals(left, null) && ReferenceEquals(right, null))
+			return true;
+		if (ReferenceEquals(left, null) && !ReferenceEquals(right, null))
+			return false;
+		if (left.Phase > right.Phase)
+			return true;
+		if (left.Phase < right.Phase)
+			return false;
+		var leftMode = left.Mode_;
+		var rightMode = right.Mode_;
+		UpgradeModes(ref leftMode, ref rightMode);
+		if (leftMode != rightMode)
+			throw new NotSupportedException("Cannot compare checkpoint tags in different modes");
+		switch (leftMode) {
+			case Mode.ByStream:
+				CheckCatalogCompatibility(left, right);
+				return left.CatalogPosition > right.CatalogPosition
+					   || (left.CatalogPosition == right.CatalogPosition &&
+						   left.DataPosition >= right.DataPosition);
+			case Mode.Phase:
+				return left.Position >= right.Position;
+			case Mode.Position:
+			case Mode.EventTypeIndex:
+				return left.Position >= right.Position;
+			case Mode.PreparePosition:
+				return left.PreparePosition >= right.PreparePosition;
+			case Mode.Stream:
+				if (left.Streams.Keys.First() != right.Streams.Keys.First())
+					throw new InvalidOperationException("Cannot compare checkpoint tags across different streams");
+				var result = left.Streams.Values.First() >= right.Streams.Values.First();
+				return result;
+			case Mode.MultiStream:
+				long rvalue;
+				bool anyLeftGreater = left.Streams.Any(l =>
+					!right.Streams.TryGetValue(l.Key, out rvalue) || l.Value > rvalue);
+
+				long lvalue;
+				bool anyRightGreater = right.Streams.Any(r =>
+					!left.Streams.TryGetValue(r.Key, out lvalue) || r.Value > lvalue);
+
+				if (anyLeftGreater && anyRightGreater)
+					ThrowIncomparable(left, right);
+				return !anyRightGreater;
+			default:
+				throw new NotSupportedException("Checkpoint tag mode is not supported in comparison");
+		}
+	}
+
+	public static bool operator <(CheckpointTag left, CheckpointTag right) {
+		return !(left >= right);
+	}
+
+	public static bool operator <=(CheckpointTag left, CheckpointTag right) {
+		return !(left > right);
+	}
+
+	public static bool operator ==(CheckpointTag left, CheckpointTag right) {
+		return Equals(left, right);
+	}
+
+	public static bool operator !=(CheckpointTag left, CheckpointTag right) {
+		return !(left == right);
+	}
+
+	protected bool Equals(CheckpointTag other) {
+		if (Phase != other.Phase)
+			return false;
+		var leftMode = Mode_;
+		var rightMode = other.Mode_;
+		if (leftMode != rightMode)
+			return false;
+		UpgradeModes(ref leftMode, ref rightMode);
+		switch (leftMode) {
+			case Mode.ByStream:
+				return CatalogStream == other.CatalogStream && CatalogPosition == other.CatalogPosition
+															&& DataStream == other.DataStream &&
+															DataPosition == other.DataPosition
+															&& CommitPosition == other.CommitPosition;
+			case Mode.Phase:
+				return Position == other.Position;
+			case Mode.EventTypeIndex:
+				// NOTE: we ignore stream positions as they are only suggestion on
+				//       where to start to gain better performance
+				goto case Mode.Position;
+			case Mode.Position:
+				return Position == other.Position;
+			case Mode.PreparePosition:
+				return PreparePosition == other.PreparePosition;
+			case Mode.Stream:
+				if (Streams.Keys.First() != other.Streams.Keys.First())
+					return false;
+				var result = Streams.Values.First() == other.Streams.Values.First();
+				return result;
+			case Mode.MultiStream:
+				long rvalue = 0;
+				return Streams.Count == other.Streams.Count
+					   && Streams.All(l => other.Streams.TryGetValue(l.Key, out rvalue) && l.Value == rvalue);
+			default:
+				throw new NotSupportedException("Checkpoint tag mode is not supported in comparison");
+		}
+	}
+
+	public override bool Equals(object obj) {
+		if (ReferenceEquals(null, obj))
+			return false;
+		if (ReferenceEquals(this, obj))
+			return true;
+		if (obj.GetType() != GetType())
+			return false;
+		return Equals((CheckpointTag)obj);
+	}
+
+	public override int GetHashCode() {
+		return Position.GetHashCode();
+	}
+
+
+	public long? CommitPosition {
+		get {
+			var commitPosition = Position.CommitPosition;
+			switch (Mode_) {
+				case Mode.ByStream:
+					return commitPosition == long.MinValue ? (long?)null : commitPosition;
+				case Mode.Position:
+				case Mode.EventTypeIndex:
+					return commitPosition;
+				default:
+					return null;
+			}
+		}
+	}
+
+	public long? PreparePosition {
+		get {
+			switch (Mode_) {
+				case Mode.Position:
+				case Mode.PreparePosition:
+				case Mode.EventTypeIndex:
+					return Position.PreparePosition;
+				default:
+					return null;
+			}
+		}
+	}
+
+	public static CheckpointTag Empty {
+		get { return _empty; }
+	}
+
+	internal readonly Mode Mode_;
+	private static readonly CheckpointTag _empty = new CheckpointTag(-1, false);
+
+	public static CheckpointTag FromPhase(int phase, bool completed) {
+		return new CheckpointTag(phase, completed);
+	}
+
+	public static CheckpointTag FromPosition(int phase, long commitPosition, long preparePosition) {
+		return new CheckpointTag(phase, new TFPos(commitPosition, preparePosition));
+	}
+
+	public static CheckpointTag FromPosition(int phase, TFPos position) {
+		return new CheckpointTag(phase, position);
+	}
+
+	public static CheckpointTag FromPreparePosition(int phase, long preparePosition) {
+		return new CheckpointTag(phase, preparePosition);
+	}
+
+	public static CheckpointTag FromStreamPosition(int phase, string stream, long sequenceNumber) {
+		return new CheckpointTag(phase, stream, sequenceNumber);
+	}
+
+	public static CheckpointTag FromStreamPositions(int phase, IDictionary<string, long> streams) {
+		// streams cloned inside
+		return new CheckpointTag(phase, streams);
+	}
+
+	public static CheckpointTag FromEventTypeIndexPositions(int phase, TFPos position,
+		IDictionary<string, long> streams) {
+		// streams cloned inside
+		return new CheckpointTag(phase, streams, position);
+	}
+
+	public static CheckpointTag FromByStreamPosition(
+		int phase, string catalogStream, long catalogPosition, string dataStream, long dataPosition,
+		long commitPosition) {
+		return new CheckpointTag(phase, catalogStream, catalogPosition, dataStream, dataPosition, commitPosition);
+	}
+
+	public int CompareTo(CheckpointTag other) {
+		return this < other ? -1 : (this > other ? 1 : 0);
+	}
+
+	public override string ToString() {
+		string result;
+		switch (Mode_) {
+			case Mode.Phase:
+				return "Phase: " + Phase + (Completed ? " (completed)" : "");
+			case Mode.Position:
+				result = Position.ToString();
+				break;
+			case Mode.PreparePosition:
+				result = PreparePosition.ToString();
+				break;
+			case Mode.Stream:
+				result = Streams.Keys.First() + ": " + Streams.Values.First();
+				break;
+			case Mode.MultiStream:
+			case Mode.EventTypeIndex:
+				var sb = new StringBuilder();
+				if (Mode_ == Mode.EventTypeIndex) {
+					sb.Append(Position.ToString());
+					sb.Append("; ");
+				}
+
+				foreach (var stream in Streams) {
+					sb.AppendFormat("{0}: {1}; ", stream.Key, stream.Value);
+				}
+
+				result = sb.ToString();
+				break;
+			case Mode.ByStream:
+				result = string.Format(
+					"{0}:{1}/{2}:{3}/{4}", CatalogStream, CatalogPosition, DataStream, DataPosition,
+					CommitPosition);
+				break;
+			default:
+				return "Unsupported mode: " + Mode_.ToString();
+		}
+
+		if (Phase == 0)
+			return result;
+		else {
+			return "(" + Phase + ") " + result;
+		}
+	}
+
+	public bool Completed {
+		get { return Position.CommitPosition == Int64.MaxValue; }
+	}
+
+	private static void UpgradeModes(ref Mode leftMode, ref Mode rightMode) {
+		if (leftMode == Mode.Stream && rightMode == Mode.MultiStream) {
+			leftMode = Mode.MultiStream;
+			return;
+		}
+
+		if (leftMode == Mode.MultiStream && rightMode == Mode.Stream) {
+			rightMode = Mode.MultiStream;
+			return;
+		}
+
+		if (leftMode == Mode.Position && rightMode == Mode.EventTypeIndex) {
+			leftMode = Mode.EventTypeIndex;
+			return;
+		}
+
+		if (leftMode == Mode.EventTypeIndex && rightMode == Mode.Position) {
+			rightMode = Mode.EventTypeIndex;
+			return;
+		}
+	}
+
+	public CheckpointTag UpdateStreamPosition(string streamId, long eventSequenceNumber) {
+		if (Mode_ != Mode.MultiStream)
+			throw new ArgumentException("Invalid tag mode", "tag");
+		var resultDictionary = PatchStreamsDictionary(streamId, eventSequenceNumber);
+		return FromStreamPositions(Phase, resultDictionary);
+	}
+
+	public CheckpointTag UpdateEventTypeIndexPosition(TFPos position, string eventType, long eventSequenceNumber) {
+		if (Mode_ != Mode.EventTypeIndex)
+			throw new ArgumentException("Invalid tag mode", "tag");
+		var resultDictionary = PatchStreamsDictionary(eventType, eventSequenceNumber);
+		return FromEventTypeIndexPositions(Phase, position, resultDictionary);
+	}
+
+	public CheckpointTag UpdateEventTypeIndexPosition(TFPos position) {
+		if (Mode_ != Mode.EventTypeIndex)
+			throw new ArgumentException("Invalid tag mode", "tag");
+		return FromEventTypeIndexPositions(Phase, position, Streams);
+	}
+
+	private Dictionary<string, long> PatchStreamsDictionary(string streamId, long eventSequenceNumber) {
+		var resultDictionary = new Dictionary<string, long>();
+		var was = false;
+		foreach (var stream in Streams) {
+			if (stream.Key == streamId) {
+				was = true;
+				if (eventSequenceNumber < stream.Value)
+					resultDictionary.Add(stream.Key, stream.Value);
+				else
+					resultDictionary.Add(stream.Key, eventSequenceNumber);
+			} else {
+				resultDictionary.Add(stream.Key, stream.Value);
+			}
+		}
+
+		if (!was)
+			throw new ArgumentException("Key not found: " + streamId, "streamId");
+		if (resultDictionary.Count < Streams.Count)
+			resultDictionary.Add(streamId, eventSequenceNumber);
+		return resultDictionary;
+	}
+
+	public byte[] ToJsonBytes(ProjectionVersion projectionVersion,
+		IEnumerable<KeyValuePair<string, JToken>> extraMetaData = null) {
+		if (projectionVersion.ProjectionId == -1)
+			throw new ArgumentException("projectionId is required", "projectionVersion");
+
+		using (var memoryStream = new MemoryStream()) {
+			using (var textWriter = new StreamWriter(memoryStream, Helper.UTF8NoBom))
+			using (var jsonWriter = new JsonTextWriter(textWriter)) {
+				WriteTo(projectionVersion, extraMetaData, jsonWriter);
+			}
+
+			return memoryStream.ToArray();
+		}
+	}
+
+	public string ToJsonString(ProjectionVersion projectionVersion,
+		IEnumerable<KeyValuePair<string, JToken>> extraMetaData = null) {
+		if (projectionVersion.ProjectionId == -1)
+			throw new ArgumentException("projectionId is required", "projectionVersion");
+
+		using (var textWriter = new StringWriter()) {
+			using (var jsonWriter = new JsonTextWriter(textWriter)) {
+				WriteTo(projectionVersion, extraMetaData, jsonWriter);
+			}
+
+			return textWriter.ToString();
+		}
+	}
+
+	public string ToJsonString(IEnumerable<KeyValuePair<string, JToken>> extraMetaData = null) {
+		using (var textWriter = new StringWriter()) {
+			using (var jsonWriter = new JsonTextWriter(textWriter)) {
+				WriteTo(default(ProjectionVersion), extraMetaData, jsonWriter);
+			}
+
+			return textWriter.ToString();
+		}
+	}
+
+	public JRaw ToJsonRaw(IEnumerable<KeyValuePair<string, JToken>> extraMetaData = null) {
+		using (var textWriter = new StringWriter()) {
+			using (var jsonWriter = new JsonTextWriter(textWriter)) {
+				WriteTo(default(ProjectionVersion), extraMetaData, jsonWriter);
+			}
+
+			return new JRaw(textWriter.ToString());
+		}
+	}
+
+	public void WriteTo(ProjectionVersion projectionVersion,
+		IEnumerable<KeyValuePair<string, JToken>> extraMetaData, JsonWriter jsonWriter) {
+		jsonWriter.WriteStartObject();
+		if (projectionVersion.ProjectionId > 0) {
+			jsonWriter.WritePropertyName("$v");
+			WriteVersion(projectionVersion, jsonWriter);
+		}
+
+		if (Phase != 0) {
+			jsonWriter.WritePropertyName("$ph");
+			jsonWriter.WriteValue(Phase);
+		}
+
+		switch (Mode_) {
+			case Mode.Phase:
+				jsonWriter.WritePropertyName("$cp");
+				jsonWriter.WriteValue(Completed);
+				break;
+			case Mode.Position:
+			case Mode.EventTypeIndex:
+				jsonWriter.WritePropertyName("$c");
+				jsonWriter.WriteValue(CommitPosition.GetValueOrDefault());
+				jsonWriter.WritePropertyName("$p");
+				jsonWriter.WriteValue(PreparePosition.GetValueOrDefault());
+				if (Mode_ == Mode.EventTypeIndex)
+					goto case Mode.MultiStream;
+				break;
+			case Mode.PreparePosition:
+				jsonWriter.WritePropertyName("$p");
+				jsonWriter.WriteValue(PreparePosition.GetValueOrDefault());
+				break;
+			case Mode.Stream:
+			case Mode.MultiStream:
+				jsonWriter.WritePropertyName("$s");
+				jsonWriter.WriteStartObject();
+				foreach (var stream in Streams) {
+					jsonWriter.WritePropertyName(stream.Key);
+					jsonWriter.WriteValue(stream.Value);
+				}
+
+				jsonWriter.WriteEndObject();
+				break;
+			case Mode.ByStream:
+				jsonWriter.WritePropertyName("$m");
+				jsonWriter.WriteValue("bs");
+				jsonWriter.WritePropertyName("$c");
+				jsonWriter.WriteValue(CommitPosition.GetValueOrDefault());
+				jsonWriter.WritePropertyName("$s");
+				jsonWriter.WriteStartArray();
+				jsonWriter.WriteStartObject();
+				jsonWriter.WritePropertyName(CatalogStream);
+				jsonWriter.WriteValue(CatalogPosition);
+				jsonWriter.WriteEndObject();
+				if (!string.IsNullOrEmpty(DataStream)) {
+					jsonWriter.WriteStartObject();
+					jsonWriter.WritePropertyName(DataStream);
+					jsonWriter.WriteValue(DataPosition);
+					jsonWriter.WriteEndObject();
+				}
+
+				jsonWriter.WriteEndArray();
+				break;
+		}
+
+		if (extraMetaData != null) {
+			foreach (var pair in extraMetaData) {
+				jsonWriter.WritePropertyName(pair.Key);
+				pair.Value.WriteTo(jsonWriter);
+			}
+		}
+
+		jsonWriter.WriteEndObject();
+	}
+
+	private static void WriteVersion(ProjectionVersion projectionVersion, JsonWriter jsonWriter) {
+		jsonWriter.WriteValue(
+			projectionVersion.ProjectionId + ":" + projectionVersion.Epoch + ":" + projectionVersion.Version + ":"
+			+ ProjectionsSubsystem.VERSION);
+	}
+
+	public static CheckpointTagVersion FromJson(JsonReader reader, ProjectionVersion current,
+		bool skipStartObject = false) {
+		if (!skipStartObject)
+			Check(reader.Read(), reader);
+		Check(JsonToken.StartObject, reader);
+		long? commitPosition = null;
+		long? preparePosition = null;
+		string catalogStream = null;
+		string dataStream = null;
+		long? catalogPosition = null;
+		long? dataPosition = null;
+		bool byStreamMode = false;
+		Dictionary<string, long> streams = null;
+		Dictionary<string, JToken> extra = null;
+		var projectionId = current.ProjectionId;
+		var projectionEpoch = 0;
+		int projectionVersion = 0;
+		var projectionSystemVersion = 0;
+		int projectionPhase = 0;
+		while (true) {
+			Check(reader.Read(), reader);
+			if (reader.TokenType == JsonToken.EndObject)
+				break;
+			Check(JsonToken.PropertyName, reader);
+			var name = (string)reader.Value;
+			switch (name) {
+				case "$cp":
+					Check(reader.Read(), reader);
+					var completed = (bool)reader.Value;
+					commitPosition = completed ? Int64.MaxValue : Int64.MinValue;
+					preparePosition = completed ? Int64.MaxValue : Int64.MinValue;
+					break;
+				case "$v":
+				case "v":
+					Check(reader.Read(), reader);
+					if (reader.ValueType == typeof(long)) {
+						var v = (int)(long)reader.Value;
+						if (v > 0) // TODO: remove this if with time
+							projectionVersion = v;
+					} else {
+						//TODO: better handle errors
+						var v = (string)reader.Value;
+						string[] parts = v.Split(':');
+						if (parts.Length == 2) {
+							projectionVersion = Int32.Parse(parts[1]);
+						} else {
+							projectionId = Int32.Parse(parts[0]);
+							projectionEpoch = Int32.Parse(parts[1]);
+							projectionVersion = Int32.Parse(parts[2]);
+							if (parts.Length >= 4)
+								projectionSystemVersion = Int32.Parse(parts[3]);
+						}
+					}
+
+					break;
+				case "$c":
+				case "c":
+				case "commitPosition":
+					Check(reader.Read(), reader);
+					commitPosition = (long)reader.Value;
+					break;
+				case "$p":
+				case "p":
+				case "preparePosition":
+					Check(reader.Read(), reader);
+					preparePosition = (long)reader.Value;
+					break;
+				case "$s":
+				case "s":
+				case "streams":
+					Check(reader.Read(), reader);
+					if (reader.TokenType == JsonToken.StartArray) {
+						Check(reader.Read(), reader);
+						Check(JsonToken.StartObject, reader);
+						Check(reader.Read(), reader);
+						Check(JsonToken.PropertyName, reader);
+						catalogStream = (string)reader.Value;
+						Check(reader.Read(), reader);
+						catalogPosition = (long)reader.Value;
+						Check(reader.Read(), reader);
+						Check(JsonToken.EndObject, reader);
+
+						Check(reader.Read(), reader);
+						if (reader.TokenType == JsonToken.StartObject) {
+							Check(reader.Read(), reader);
+							Check(JsonToken.PropertyName, reader);
+							dataStream = (string)reader.Value;
+							Check(reader.Read(), reader);
+							dataPosition = (long)reader.Value;
+							Check(reader.Read(), reader);
+							Check(JsonToken.EndObject, reader);
+							Check(reader.Read(), reader);
+						}
+
+						Check(JsonToken.EndArray, reader);
+					} else {
+						Check(JsonToken.StartObject, reader);
+						streams = new Dictionary<string, long>();
+						while (true) {
+							Check(reader.Read(), reader);
+							if (reader.TokenType == JsonToken.EndObject)
+								break;
+							Check(JsonToken.PropertyName, reader);
+							var streamName = (string)reader.Value;
+							Check(reader.Read(), reader);
+							long position = (long)reader.Value;
+							streams.Add(streamName, position);
+						}
+					}
+
+					break;
+				case "$ph":
+					Check(reader.Read(), reader);
+					projectionPhase = (int)(long)reader.Value;
+					break;
+				case "$m":
+					Check(reader.Read(), reader);
+					var readMode = (string)reader.Value;
+					if (readMode != "bs")
+						throw new ApplicationException("Unknown checkpoint tag mode: " + readMode);
+					byStreamMode = true;
+					break;
+				default:
+					if (extra == null)
+						extra = new Dictionary<string, JToken>();
+					Check(reader.Read(), reader);
+					var jToken = JToken.ReadFrom(reader);
+					extra.Add(name, jToken);
+					break;
+			}
+		}
+
+		return new CheckpointTagVersion {
+			Tag =
+				byStreamMode
+					? new CheckpointTag(
+						projectionPhase, catalogStream, catalogPosition.GetValueOrDefault(), dataStream,
+						dataPosition ?? -1, commitPosition.GetValueOrDefault())
+					: new CheckpointTag(
+						projectionPhase,
+						new TFPos(commitPosition ?? Int64.MinValue, preparePosition ?? Int64.MinValue), streams),
+			Version = new ProjectionVersion(projectionId, projectionEpoch, projectionVersion),
+			SystemVersion = projectionSystemVersion,
+			ExtraMetadata = extra,
+		};
+	}
+
+	public static void Check(JsonToken type, JsonReader reader) {
+		if (reader.TokenType != type)
+			throw new Exception("Invalid JSON");
+	}
+
+	public static void Check(bool read, JsonReader reader) {
+		if (!read)
+			throw new Exception("Invalid JSON");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/CheckpointTagExtensions.cs b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/CheckpointTagExtensions.cs
new file mode 100644
index 00000000000..81f7657e366
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/CheckpointTagExtensions.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+public static class CheckpointTagExtensions {
+	public static CheckpointTag ParseCheckpointTagJson(this string source) {
+		if (string.IsNullOrEmpty(source))
+			return null;
+		var reader = new JsonTextReader(new StringReader(source));
+		return CheckpointTag.FromJson(reader, default(ProjectionVersion)).Tag;
+	}
+
+	public static CheckpointTag ParseCheckpointTagJson(this byte[] source) {
+		if (source == null || source.Length == 0)
+			return null;
+		var reader = new JsonTextReader(new StreamReader(new MemoryStream(source)));
+		return CheckpointTag.FromJson(reader, default(ProjectionVersion)).Tag;
+	}
+
+	public static CheckpointTag ParseCheckpointTagJson(this ReadOnlyMemory<byte> source) {
+		if (source.Length == 0)
+			return null;
+		var reader = new JsonTextReader(new StreamReader(new MemoryStream(source.ToArray())));
+		return CheckpointTag.FromJson(reader, default(ProjectionVersion)).Tag;
+	}
+
+	public static CheckpointTagVersion ParseCheckpointTagVersionExtraJson(this byte[] source,
+		ProjectionVersion current) {
+		if (source == null || source.Length == 0)
+			return new CheckpointTagVersion { Version = new ProjectionVersion(current.ProjectionId, 0, 0), Tag = null };
+		var reader = new JsonTextReader(new StreamReader(new MemoryStream(source)));
+		return CheckpointTag.FromJson(reader, current);
+	}
+
+	public static CheckpointTagVersion ParseCheckpointTagVersionExtraJson(this ReadOnlyMemory<byte> source,
+		ProjectionVersion current) {
+		if (source.Length == 0)
+			return new CheckpointTagVersion { Version = new ProjectionVersion(current.ProjectionId, 0, 0), Tag = null };
+		var reader = new JsonTextReader(new StreamReader(new MemoryStream(source.ToArray())));
+		return CheckpointTag.FromJson(reader, current);
+	}
+
+	public static CheckpointTagVersion ParseCheckpointTagVersionExtraJson(this string source,
+		ProjectionVersion current) {
+		if (string.IsNullOrEmpty(source))
+			return new CheckpointTagVersion { Version = new ProjectionVersion(current.ProjectionId, 0, 0), Tag = null };
+		var reader = new JsonTextReader(new StringReader(source));
+		return CheckpointTag.FromJson(reader, current);
+	}
+
+	public static Dictionary<string, JToken> ParseCheckpointExtraJson(this string source) {
+		if (string.IsNullOrEmpty(source))
+			return null;
+		var reader = new JsonTextReader(new StringReader(source));
+		return CheckpointTag.FromJson(reader, default(ProjectionVersion)).ExtraMetadata;
+	}
+
+	public static string ParseCheckpointTagCorrelationId(this string source) {
+		try {
+			if (string.IsNullOrEmpty(source))
+				return null;
+			var reader = new JsonTextReader(new StringReader(source));
+			if (!reader.Read())
+				return null;
+			if (reader.TokenType != JsonToken.StartObject)
+				return null;
+			while (true) {
+				CheckpointTag.Check(reader.Read(), reader);
+				if (reader.TokenType == JsonToken.EndObject)
+					break;
+				if (reader.TokenType != JsonToken.PropertyName)
+					return null;
+				var name = (string)reader.Value;
+				switch (name) {
+					default:
+						if (!reader.Read())
+							return null;
+						var jToken = JToken.ReadFrom(reader);
+						if (name == "$correlationId")
+							return jToken.ToString();
+						break;
+				}
+			}
+
+			return null;
+		} catch (JsonReaderException) {
+			return null;
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/CheckpointTagVersion.cs b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/CheckpointTagVersion.cs
new file mode 100644
index 00000000000..ce07d201f5e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/CheckpointTagVersion.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+public struct CheckpointTagVersion {
+	public ProjectionVersion Version;
+	public int SystemVersion;
+	public CheckpointTag Tag;
+	public Dictionary<string, JToken> ExtraMetadata;
+
+	public CheckpointTag AdjustBy(PositionTagger tagger, ProjectionVersion version) {
+		if (SystemVersion == ProjectionsSubsystem.VERSION && Version.Version == version.Version
+														  && Version.ProjectionId == version.ProjectionId)
+			return Tag;
+
+		return tagger.AdjustTag(Tag);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/CoreProjectionCheckpointManager.cs b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/CoreProjectionCheckpointManager.cs
new file mode 100644
index 00000000000..1bcee4cf7b5
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/CoreProjectionCheckpointManager.cs
@@ -0,0 +1,405 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics.Contracts;
+using KurrentDB.Core.Bus;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using Serilog;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+public abstract class CoreProjectionCheckpointManager : IProjectionCheckpointManager,
+	ICoreProjectionCheckpointManager,
+	IEmittedEventWriter {
+	protected readonly ProjectionNamesBuilder _namingBuilder;
+	protected readonly ProjectionConfig _projectionConfig;
+	protected readonly ILogger _logger;
+	protected readonly int _maxProjectionStateSize;
+
+	private readonly bool _usePersistentCheckpoints;
+
+	protected readonly IPublisher _publisher;
+	private readonly Guid _projectionCorrelationId;
+	private readonly CheckpointTag _zeroTag;
+
+
+	protected ProjectionCheckpoint _currentCheckpoint;
+	private ProjectionCheckpoint _closingCheckpoint;
+	internal CheckpointTag _requestedCheckpointPosition;
+	private bool _inCheckpoint;
+	private PartitionState _requestedCheckpointState;
+	private CheckpointTag _lastCompletedCheckpointPosition;
+	private readonly PositionTracker _lastProcessedEventPosition;
+	private float _lastProcessedEventProgress;
+
+	private int _eventsProcessedAfterRestart;
+	private bool _started;
+	protected bool _stopping;
+	protected bool _stopped;
+
+	private PartitionState _currentProjectionState;
+
+	protected CoreProjectionCheckpointManager(
+		IPublisher publisher,
+		Guid projectionCorrelationId,
+		ProjectionConfig projectionConfig,
+		string name,
+		PositionTagger positionTagger,
+		ProjectionNamesBuilder namingBuilder,
+		bool usePersistentCheckpoints,
+		int maxProjectionStateSize) {
+		if (publisher == null)
+			throw new ArgumentNullException("publisher");
+		if (projectionConfig == null)
+			throw new ArgumentNullException("projectionConfig");
+		if (name == null)
+			throw new ArgumentNullException("name");
+		if (positionTagger == null)
+			throw new ArgumentNullException("positionTagger");
+		if (namingBuilder == null)
+			throw new ArgumentNullException("namingBuilder");
+		if (name == "")
+			throw new ArgumentException("name");
+		if (maxProjectionStateSize <= 0)
+			throw new ArgumentException(nameof(maxProjectionStateSize));
+
+		_lastProcessedEventPosition = new PositionTracker(positionTagger);
+		_zeroTag = positionTagger.MakeZeroCheckpointTag();
+
+		_publisher = publisher;
+		_projectionCorrelationId = projectionCorrelationId;
+		_projectionConfig = projectionConfig;
+		_logger = Log.ForContext<CoreProjectionCheckpointManager>();
+		_namingBuilder = namingBuilder;
+		_usePersistentCheckpoints = usePersistentCheckpoints;
+		_requestedCheckpointState = new PartitionState("", null, _zeroTag);
+		_currentProjectionState = new PartitionState("", null, _zeroTag);
+		_maxProjectionStateSize = maxProjectionStateSize;
+	}
+
+	protected abstract ProjectionCheckpoint CreateProjectionCheckpoint(CheckpointTag checkpointPosition);
+
+	protected abstract void BeginWriteCheckpoint(
+		CheckpointTag requestedCheckpointPosition, string requestedCheckpointState);
+
+	protected abstract void CapturePartitionStateUpdated(string partition, PartitionState oldState,
+		PartitionState newState);
+
+	protected abstract void EmitPartitionCheckpoints();
+
+	public abstract void RecordEventOrder(ResolvedEvent resolvedEvent, CheckpointTag orderCheckpointTag,
+		Action committed);
+
+	public abstract void BeginLoadPartitionStateAt(
+		string statePartition, CheckpointTag requestedStateCheckpointTag, Action<PartitionState> loadCompleted);
+
+	public abstract void PartitionCompleted(string partition);
+
+	public virtual void Initialize() {
+		if (_currentCheckpoint != null)
+			_currentCheckpoint.Dispose();
+		if (_closingCheckpoint != null)
+			_closingCheckpoint.Dispose();
+		_currentCheckpoint = null;
+		_closingCheckpoint = null;
+		_requestedCheckpointPosition = null;
+		_inCheckpoint = false;
+		_requestedCheckpointState = new PartitionState("", null, _zeroTag);
+		_lastCompletedCheckpointPosition = null;
+		_lastProcessedEventPosition.Initialize();
+		_lastProcessedEventProgress = -1;
+
+		_eventsProcessedAfterRestart = 0;
+		_started = false;
+		_stopping = false;
+		_stopped = false;
+		_currentProjectionState = new PartitionState("", null, _zeroTag);
+	}
+
+	public virtual void Start(CheckpointTag checkpointTag, PartitionState rootPartitionState) {
+		Contract.Requires(_currentCheckpoint == null);
+		if (_started)
+			throw new InvalidOperationException("Already started");
+		_started = true;
+
+		if (rootPartitionState != null)
+			_currentProjectionState = rootPartitionState;
+
+		_lastProcessedEventPosition.UpdateByCheckpointTagInitial(checkpointTag);
+		_lastProcessedEventProgress = -1;
+		_lastCompletedCheckpointPosition = checkpointTag;
+		_requestedCheckpointPosition = null;
+		_currentCheckpoint = CreateProjectionCheckpoint(_lastProcessedEventPosition.LastTag);
+		_currentCheckpoint.Start();
+	}
+
+	public void Stopping() {
+		EnsureStarted();
+		if (_stopping)
+			throw new InvalidOperationException("Already stopping");
+		_stopping = true;
+		RequestCheckpointToStop();
+	}
+
+	public void Stopped() {
+		EnsureStarted();
+		_started = false;
+		_stopped = true;
+
+		if (_currentCheckpoint != null)
+			_currentCheckpoint.Dispose();
+		_currentCheckpoint = null;
+
+		if (_closingCheckpoint != null)
+			_closingCheckpoint.Dispose();
+		_closingCheckpoint = null;
+	}
+
+	public virtual void GetStatistics(ProjectionStatistics info) {
+		info.Position = (_lastProcessedEventPosition.LastTag ?? (object)"").ToString();
+		info.Progress = _lastProcessedEventProgress;
+		info.LastCheckpoint = _lastCompletedCheckpointPosition != null
+			? _lastCompletedCheckpointPosition.ToString()
+			: "";
+		info.EventsProcessedAfterRestart = _eventsProcessedAfterRestart;
+		info.WritePendingEventsBeforeCheckpoint = _closingCheckpoint != null
+			? _closingCheckpoint.GetWritePendingEvents()
+			: 0;
+		info.WritePendingEventsAfterCheckpoint = (_currentCheckpoint != null
+			? _currentCheckpoint.GetWritePendingEvents()
+			: 0);
+		info.ReadsInProgress = /*_readDispatcher.ActiveRequestCount*/
+			+ +(_closingCheckpoint != null ? _closingCheckpoint.GetReadsInProgress() : 0)
+			+ (_currentCheckpoint != null ? _currentCheckpoint.GetReadsInProgress() : 0);
+		info.WritesInProgress = (_closingCheckpoint != null ? _closingCheckpoint.GetWritesInProgress() : 0)
+								+ (_currentCheckpoint != null ? _currentCheckpoint.GetWritesInProgress() : 0);
+		info.CheckpointStatus = _inCheckpoint ? "Requested" : "";
+	}
+
+	public void StateUpdated(
+		string partition, PartitionState oldState, PartitionState newState) {
+		if (_stopped)
+			return;
+		EnsureStarted();
+		if (_stopping)
+			throw new InvalidOperationException("Stopping");
+
+		if (partition == "" && newState.State == null) // ignore non-root partitions and non-changed states
+			throw new NotSupportedException("Internal check");
+
+		if (!CheckStateSize(newState, partition)) {
+			return;
+		}
+
+		if (_usePersistentCheckpoints && partition != "")
+			CapturePartitionStateUpdated(partition, oldState, newState);
+
+		if (partition == "")
+			_currentProjectionState = newState;
+	}
+
+	private bool CheckStateSize(PartitionState result, string partition) {
+		if (result.Size > _maxProjectionStateSize) {
+			var partitionMessage = partition == string.Empty ? string.Empty : $" in partition '{partition}'";
+			Failed(
+				$"The state size of projection '{_namingBuilder.EffectiveProjectionName}'{partitionMessage} is {result.Size:N0} bytes " +
+				$"which exceeds the configured MaxProjectionStateSize of {_maxProjectionStateSize:N0} bytes.");
+			return false;
+		}
+
+		return true;
+	}
+
+	public void EventProcessed(CheckpointTag checkpointTag, float progress) {
+		if (_stopped)
+			return;
+		EnsureStarted();
+		if (_stopping)
+			throw new InvalidOperationException("Stopping");
+		_eventsProcessedAfterRestart++;
+		_lastProcessedEventPosition.UpdateByCheckpointTagForward(checkpointTag);
+		_lastProcessedEventProgress = progress;
+		// running state only
+	}
+
+	public void EventsEmitted(EmittedEventEnvelope[] scheduledWrites, Guid causedBy, string correlationId) {
+		if (_stopped)
+			return;
+		EnsureStarted();
+		if (_stopping)
+			throw new InvalidOperationException("Stopping");
+		if (scheduledWrites != null) {
+			foreach (var @event in scheduledWrites) {
+				var emittedEvent = @event.Event;
+				if (string.IsNullOrEmpty(@event.Event.StreamId)) {
+					Failed("Cannot write to a null stream id");
+					return;
+				}
+
+				emittedEvent.SetCausedBy(causedBy);
+				emittedEvent.SetCorrelationId(correlationId);
+			}
+
+			_currentCheckpoint.ValidateOrderAndEmitEvents(scheduledWrites);
+		}
+	}
+
+	public bool CheckpointSuggested(CheckpointTag checkpointTag, float progress) {
+		if (!_usePersistentCheckpoints)
+			throw new InvalidOperationException("Checkpoints are not used");
+		if (_stopped || _stopping)
+			return true;
+		EnsureStarted();
+		if (checkpointTag != _lastProcessedEventPosition.LastTag) // allow checkpoint at the current position
+			_lastProcessedEventPosition.UpdateByCheckpointTagForward(checkpointTag);
+		_lastProcessedEventProgress = progress;
+		return RequestCheckpoint(_lastProcessedEventPosition);
+	}
+
+	public void Progress(float progress) {
+		if (_stopping || _stopped)
+			return;
+		_lastProcessedEventProgress = progress < -1 ? -1 : progress;
+	}
+
+	public CheckpointTag LastProcessedEventPosition {
+		get { return _lastProcessedEventPosition.LastTag; }
+	}
+
+
+	public void Handle(CoreProjectionProcessingMessage.ReadyForCheckpoint message) {
+		// ignore any messages - typically when faulted
+		if (_stopped)
+			return;
+		// ignore any messages from previous checkpoints probably before RestartRequested
+		if (message.Sender != _closingCheckpoint)
+			return;
+		if (!_inCheckpoint)
+			throw new InvalidOperationException();
+		if (_usePersistentCheckpoints)
+			BeginWriteCheckpoint(_requestedCheckpointPosition, _requestedCheckpointState.Serialize());
+		else
+			CheckpointWritten(_requestedCheckpointPosition);
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.RestartRequested message) {
+		if (_stopped)
+			return;
+		RequestRestart(message.Reason);
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.Failed message) {
+		if (_stopped)
+			return;
+		Failed(message.Reason);
+	}
+
+	protected void PrerecordedEventsLoaded(CheckpointTag checkpointTag) {
+		_publisher.Publish(
+			new CoreProjectionProcessingMessage.PrerecordedEventsLoaded(_projectionCorrelationId, checkpointTag));
+	}
+
+	private void RequestCheckpointToStop() {
+		EnsureStarted();
+		if (!_stopping)
+			throw new InvalidOperationException("Not stopping");
+		if (_inCheckpoint) // checkpoint in progress.  no other writes will happen, so we can stop here.
+			return;
+		// do not request checkpoint if no events were processed since last checkpoint
+		//NOTE: we ignore _usePersistentCheckpoints flag as we need to flush final writes before query object
+		// has been disposed
+		if ( /* _usePersistentCheckpoints && */
+			_lastCompletedCheckpointPosition < _lastProcessedEventPosition.LastTag) {
+			RequestCheckpoint(_lastProcessedEventPosition, forcePrepareCheckpoint: true);
+			return;
+		}
+
+		_publisher.Publish(
+			new CoreProjectionProcessingMessage.CheckpointCompleted(
+				_projectionCorrelationId, _lastCompletedCheckpointPosition));
+	}
+
+	protected void EnsureStarted() {
+		if (!_started)
+			throw new InvalidOperationException("Not started");
+	}
+
+	/// <returns>true - if checkpoint has beem completed in-sync</returns>
+	private bool RequestCheckpoint(PositionTracker lastProcessedEventPosition,
+		bool forcePrepareCheckpoint = false) {
+		if (!forcePrepareCheckpoint && !_usePersistentCheckpoints)
+			throw new InvalidOperationException("Checkpoints are not allowed");
+		if (_inCheckpoint)
+			throw new InvalidOperationException("Checkpoint in progress");
+		return StartCheckpoint(lastProcessedEventPosition, _currentProjectionState);
+	}
+
+	/// <returns>true - if checkpoint has been completed in-sync</returns>
+	private bool StartCheckpoint(PositionTracker lastProcessedEventPosition, PartitionState projectionState) {
+		Contract.Requires(_closingCheckpoint == null);
+		if (projectionState == null)
+			throw new ArgumentNullException("projectionState");
+
+		CheckpointTag requestedCheckpointPosition = lastProcessedEventPosition.LastTag;
+		if (requestedCheckpointPosition == _lastCompletedCheckpointPosition)
+			return true; // either suggested or requested to stop
+
+		if (_usePersistentCheckpoints) // do not emit any events if we do not use persistent checkpoints
+			EmitPartitionCheckpoints();
+
+		_inCheckpoint = true;
+		_requestedCheckpointPosition = requestedCheckpointPosition;
+		_requestedCheckpointState = projectionState;
+		_closingCheckpoint = _currentCheckpoint;
+		_currentCheckpoint = CreateProjectionCheckpoint(requestedCheckpointPosition);
+		// checkpoint only after assigning new current checkpoint, as it may call back immediately
+		_closingCheckpoint.Prepare(requestedCheckpointPosition);
+		return false; // even if prepare completes in sync it notifies the world by a message
+	}
+
+	protected void SendPrerecordedEvent(
+		KurrentDB.Core.Data.ResolvedEvent pair, CheckpointTag positionTag,
+		long prerecordedEventMessageSequenceNumber) {
+		var committedEvent = new ReaderSubscriptionMessage.CommittedEventDistributed(
+			Guid.Empty, new ResolvedEvent(pair, null), null, -1, source: this.GetType());
+		_publisher.Publish(
+			EventReaderSubscriptionMessage.CommittedEventReceived.FromCommittedEventDistributed(
+				committedEvent, positionTag, null, _projectionCorrelationId,
+				prerecordedEventMessageSequenceNumber));
+	}
+
+
+	protected void RequestRestart(string reason) {
+		_stopped = true; // ignore messages
+		_publisher.Publish(new CoreProjectionProcessingMessage.RestartRequested(_projectionCorrelationId, reason));
+	}
+
+	private void Failed(string reason) {
+		_stopped = true; // ignore messages
+		_publisher.Publish(new CoreProjectionProcessingMessage.Failed(_projectionCorrelationId, reason));
+	}
+
+	protected void CheckpointWritten(CheckpointTag lastCompletedCheckpointPosition) {
+		Contract.Requires(_closingCheckpoint != null);
+		_lastCompletedCheckpointPosition = lastCompletedCheckpointPosition;
+		_closingCheckpoint.Dispose();
+		_closingCheckpoint = null;
+		if (!_stopping)
+			// ignore any writes pending in the current checkpoint (this is not the best, but they will never hit the storage, so it is safe)
+			_currentCheckpoint.Start();
+		_inCheckpoint = false;
+
+		//NOTE: the next checkpoint will start by completing checkpoint work item
+		_publisher.Publish(
+			new CoreProjectionProcessingMessage.CheckpointCompleted(
+				_projectionCorrelationId, _lastCompletedCheckpointPosition));
+	}
+
+	public virtual void BeginLoadPrerecordedEvents(CheckpointTag checkpointTag) {
+		PrerecordedEventsLoaded(checkpointTag);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/CoreProjectionCheckpointReader.cs b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/CoreProjectionCheckpointReader.cs
new file mode 100644
index 00000000000..c0684641d63
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/CoreProjectionCheckpointReader.cs
@@ -0,0 +1,124 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Projections.Core.Messages;
+using Serilog;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+public class CoreProjectionCheckpointReader : ICoreProjectionCheckpointReader {
+	private readonly IPublisher _publisher;
+	private readonly Guid _projectionCorrelationId;
+	private readonly IODispatcher _ioDispatcher;
+	private readonly string _projectionCheckpointStreamId;
+	private readonly bool _useCheckpoints;
+	private readonly ILogger _logger = Log.ForContext<CoreProjectionCheckpointReader>();
+
+	private bool _stateRequested;
+
+	private long _nextStateIndexToRequest;
+	private ProjectionVersion _projectionVersion;
+	private Guid _readRequestId;
+	private long _lastWrittenCheckpointEventNumber;
+
+	public CoreProjectionCheckpointReader(
+		IPublisher publisher, Guid projectionCorrelationId, IODispatcher ioDispatcher,
+		string projectionCheckpointStreamId, ProjectionVersion projectionVersion, bool useCheckpoints) {
+		_publisher = publisher;
+		_projectionCorrelationId = projectionCorrelationId;
+		_ioDispatcher = ioDispatcher;
+		_projectionCheckpointStreamId = projectionCheckpointStreamId;
+		_projectionVersion = projectionVersion;
+		_useCheckpoints = useCheckpoints;
+	}
+
+	public void BeginLoadState() {
+		if (_stateRequested)
+			throw new InvalidOperationException("State has been already requested");
+		BeforeBeginLoadState();
+		_stateRequested = true;
+		if (_useCheckpoints) {
+			RequestLoadState();
+		} else {
+			CheckpointLoaded(null, null);
+		}
+	}
+
+	public void Initialize() {
+		_ioDispatcher.BackwardReader.Cancel(_readRequestId);
+		_readRequestId = Guid.Empty;
+		_stateRequested = false;
+	}
+
+	protected void BeforeBeginLoadState() {
+		_lastWrittenCheckpointEventNumber = ExpectedVersion.NoStream;
+		_nextStateIndexToRequest = -1; // from the end
+	}
+
+	protected void RequestLoadState() {
+		const int recordsToRequest = 10;
+		_readRequestId = Guid.NewGuid();
+		_ioDispatcher.ReadBackward(
+			_projectionCheckpointStreamId, _nextStateIndexToRequest, recordsToRequest, false,
+			SystemAccounts.System, OnLoadStateReadRequestCompleted,
+			() => {
+				_logger.Warning("Read forward of stream {stream} timed out. Retrying.", _projectionCheckpointStreamId);
+				RequestLoadState();
+			}, _readRequestId);
+	}
+
+
+	private void OnLoadStateReadRequestCompleted(ClientMessage.ReadStreamEventsBackwardCompleted message) {
+		if (message.Events is not []) {
+			var checkpoint = message.Events
+				.Where(v => v.Event.EventType == ProjectionEventTypes.ProjectionCheckpoint).Select(x => x.Event)
+				.FirstOrDefault();
+			if (checkpoint != null) {
+				var parsed = checkpoint.Metadata.ParseCheckpointTagVersionExtraJson(_projectionVersion);
+				if (parsed.Version.ProjectionId != _projectionVersion.ProjectionId
+					|| _projectionVersion.Epoch > parsed.Version.Version) {
+					_lastWrittenCheckpointEventNumber = checkpoint.EventNumber;
+					CheckpointLoaded(null, null);
+				} else {
+					//TODO: check epoch and correctly set _lastWrittenCheckpointEventNumber
+					var checkpointData = Helper.UTF8NoBom.GetString(checkpoint.Data.Span);
+					_lastWrittenCheckpointEventNumber = checkpoint.EventNumber;
+					var adjustedTag = parsed.Tag; // the same projection and epoch, handle upgrades internally
+					CheckpointLoaded(adjustedTag, checkpointData);
+				}
+
+				return;
+			}
+		}
+
+		if (message.NextEventNumber != -1) {
+			_nextStateIndexToRequest = message.NextEventNumber;
+			RequestLoadState();
+			return;
+		}
+
+		_lastWrittenCheckpointEventNumber = message.LastEventNumber;
+		CheckpointLoaded(null, null);
+	}
+
+
+	protected void CheckpointLoaded(CheckpointTag checkpointTag, string checkpointData) {
+		if (checkpointTag == null) // no checkpoint data found
+		{
+			checkpointData = null;
+		}
+
+		_publisher.Publish(
+			new CoreProjectionProcessingMessage.CheckpointLoaded(
+				_projectionCorrelationId, checkpointTag, checkpointData, _lastWrittenCheckpointEventNumber));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/CoreProjectionCheckpointWriter.cs b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/CoreProjectionCheckpointWriter.cs
new file mode 100644
index 00000000000..30ba68633fa
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/CoreProjectionCheckpointWriter.cs
@@ -0,0 +1,214 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Projections.Core.Messages;
+using Serilog;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+public class CoreProjectionCheckpointWriter {
+	private readonly string _projectionCheckpointStreamId;
+	private readonly ILogger _logger;
+	private readonly IODispatcher _ioDispatcher;
+	private readonly ProjectionVersion _projectionVersion;
+	private readonly string _name;
+
+	private Guid _writeRequestId;
+	private int _inCheckpointWriteAttempt;
+	private long _lastWrittenCheckpointEventNumber;
+	private Event _checkpointEventToBePublished;
+	private CheckpointTag _requestedCheckpointPosition;
+	private IEnvelope _envelope;
+	private const int MaxNumberOfRetries = 12;
+	private const int MinAttemptWarnThreshold = 5;
+	private bool _metaStreamWritten;
+	private Random _random = new Random();
+	private bool _largeCheckpointWarningLogged = false;
+
+	public CoreProjectionCheckpointWriter(
+		string projectionCheckpointStreamId, IODispatcher ioDispatcher, ProjectionVersion projectionVersion,
+		string name) {
+		_projectionCheckpointStreamId = projectionCheckpointStreamId;
+		_logger = Log.ForContext<CoreProjectionCheckpointWriter>();
+		_ioDispatcher = ioDispatcher;
+		_projectionVersion = projectionVersion;
+		_name = name;
+	}
+
+	public void BeginWriteCheckpoint(IEnvelope envelope,
+		CheckpointTag requestedCheckpointPosition, string requestedCheckpointState) {
+		_envelope = envelope;
+		_requestedCheckpointPosition = requestedCheckpointPosition;
+		_inCheckpointWriteAttempt = 1;
+		//TODO: pass correct expected version
+		_checkpointEventToBePublished = new Event(
+			Guid.NewGuid(), ProjectionEventTypes.ProjectionCheckpoint, true,
+			requestedCheckpointState == null ? null : Helper.UTF8NoBom.GetBytes(requestedCheckpointState),
+			requestedCheckpointPosition.ToJsonBytes(projectionVersion: _projectionVersion));
+		PublishWriteStreamMetadataAndCheckpointEventDelayed();
+	}
+
+	private void WriteCheckpointEventCompleted(
+		string eventStreamId, OperationResult operationResult, long firstWrittenEventNumber) {
+		if (_inCheckpointWriteAttempt == 0)
+			throw new InvalidOperationException();
+		if (operationResult == OperationResult.Success) {
+			if (_logger != null)
+				_logger.Verbose(
+					"Checkpoint has been written for projection {projection} at sequence number {firstWrittenEventNumber} (current)",
+					_name,
+					firstWrittenEventNumber);
+			_lastWrittenCheckpointEventNumber = firstWrittenEventNumber;
+
+			_inCheckpointWriteAttempt = 0;
+			_envelope.ReplyWith(
+				new CoreProjectionCheckpointWriterMessage.CheckpointWritten(_requestedCheckpointPosition));
+		} else {
+			if (_logger != null) {
+				_logger.Information(
+					"Failed to write projection checkpoint to stream {stream}. Error: {e}", eventStreamId,
+					Enum.GetName(typeof(OperationResult), operationResult));
+			}
+
+			switch (operationResult) {
+				case OperationResult.WrongExpectedVersion:
+					_envelope.ReplyWith(new CoreProjectionProcessingMessage.Failed(Guid.Empty,
+						$"Checkpoint stream `{eventStreamId}` has been written to from the outside"
+					));
+					break;
+				case OperationResult.PrepareTimeout:
+				case OperationResult.ForwardTimeout:
+				case OperationResult.CommitTimeout:
+					if (_inCheckpointWriteAttempt >= MaxNumberOfRetries) {
+						//The first parameter is not needed in this case as the CoreProjectionCheckpointManager takes care of filling in the projection id when it reconstructs the message
+						_envelope.ReplyWith(new CoreProjectionProcessingMessage.Failed(Guid.Empty,
+							string.Format(
+								"After retrying {0} times, we failed to write the checkpoint for {1} to {2} due to a {3}",
+								MaxNumberOfRetries, _name, eventStreamId,
+								Enum.GetName(typeof(OperationResult), operationResult))));
+						_inCheckpointWriteAttempt = 0;
+						return;
+					}
+
+					_inCheckpointWriteAttempt++;
+					PublishWriteStreamMetadataAndCheckpointEventDelayed();
+					break;
+				default:
+					throw new NotSupportedException("Unsupported error code received");
+			}
+		}
+	}
+
+	private void PublishWriteStreamMetadataAndCheckpointEventDelayed() {
+		var attempt = _inCheckpointWriteAttempt;
+		var delayInSeconds = CalculateBackoffTimeSecs(attempt);
+		if (delayInSeconds == 0)
+			PublishWriteStreamMetadataAndCheckpointEvent();
+		else {
+			if (attempt >= MinAttemptWarnThreshold && _logger != null) {
+				_logger.Warning("Attempt: {attempt} to write checkpoint for {projection} at {requestedCheckpointPosition} with expected version number {lastWrittenCheckpointEventNumber}. Backing off for {time} second(s).",
+					attempt,
+					_name,
+					_requestedCheckpointPosition,
+					_lastWrittenCheckpointEventNumber,
+					delayInSeconds);
+			}
+			_ioDispatcher.Delay(
+				TimeSpan.FromSeconds(delayInSeconds),
+				_ => PublishWriteStreamMetadataAndCheckpointEvent());
+		}
+	}
+
+	private void PublishWriteStreamMetadataAndCheckpointEvent() {
+		if (_logger != null)
+			_logger.Verbose(
+				"Writing checkpoint for {projection} at {requestedCheckpointPosition} with expected version number {lastWrittenCheckpointEventNumber}",
+				_name, _requestedCheckpointPosition, _lastWrittenCheckpointEventNumber);
+		if (!_metaStreamWritten)
+			PublishWriteStreamMetadata();
+		else
+			PublishWriteCheckpointEvent();
+	}
+
+	private void PublishWriteStreamMetadata() {
+		var metaStreamId = SystemStreams.MetastreamOf(_projectionCheckpointStreamId);
+		_writeRequestId = _ioDispatcher.WriteEvent(
+			metaStreamId, ExpectedVersion.Any, CreateStreamMetadataEvent(), SystemAccounts.System, msg => {
+				switch (msg.Result) {
+					case OperationResult.Success:
+						_metaStreamWritten = true;
+						PublishWriteCheckpointEvent();
+						break;
+					default:
+						WriteCheckpointEventCompleted(metaStreamId, msg.Result, ExpectedVersion.Invalid);
+						break;
+				}
+			});
+	}
+
+	private Event CreateStreamMetadataEvent() {
+		var eventId = Guid.NewGuid();
+		var acl = new StreamAcl(
+			readRole: SystemRoles.Admins, writeRole: SystemRoles.Admins,
+			deleteRole: SystemRoles.Admins, metaReadRole: SystemRoles.All,
+			metaWriteRole: SystemRoles.Admins);
+		var metadata = new StreamMetadata(maxCount: 2, maxAge: null, cacheControl: null, acl: acl);
+		var dataBytes = metadata.ToJsonBytes();
+		return new Event(eventId, SystemEventTypes.StreamMetadata, isJson: true, data: dataBytes, metadata: null);
+	}
+
+	private void PublishWriteCheckpointEvent() {
+		CheckpointSizeCheck();
+		_writeRequestId = _ioDispatcher.WriteEvent(
+			_projectionCheckpointStreamId, _lastWrittenCheckpointEventNumber, _checkpointEventToBePublished,
+			SystemAccounts.System,
+			msg => WriteCheckpointEventCompleted(_projectionCheckpointStreamId, msg.Result, msg.FirstEventNumber));
+	}
+
+	private void CheckpointSizeCheck() {
+		if (!_largeCheckpointWarningLogged && _checkpointEventToBePublished.Data.Length >= 8_000_000) {
+			Log.Warning(
+				"Checkpoint size for the Projection {projectionName} is greater than 8 MB. Checkpoint size for a projection should be less than 16 MB. Current checkpoint size for Projection {projectionName} is {stateSize} MB.",
+				_name, _name,
+				_checkpointEventToBePublished.Data.Length / Math.Pow(10, 6));
+			_largeCheckpointWarningLogged = true;
+		}
+	}
+
+	public void Initialize() {
+		_checkpointEventToBePublished = null;
+		_inCheckpointWriteAttempt = 0;
+		_ioDispatcher.Writer.Cancel(_writeRequestId);
+		_lastWrittenCheckpointEventNumber = ExpectedVersion.Invalid;
+		_metaStreamWritten = false;
+	}
+
+	public void GetStatistics(ProjectionStatistics info) {
+		info.WritesInProgress = ((_inCheckpointWriteAttempt != 0) ? 1 : 0) + info.WritesInProgress;
+		info.CheckpointStatus = _inCheckpointWriteAttempt > 0
+			? "Writing (" + _inCheckpointWriteAttempt + ")"
+			: info.CheckpointStatus;
+	}
+
+	public void StartFrom(CheckpointTag checkpointTag, long checkpointEventNumber) {
+		_lastWrittenCheckpointEventNumber = checkpointEventNumber;
+		_metaStreamWritten = checkpointEventNumber != ExpectedVersion.NoStream;
+	}
+
+	private int CalculateBackoffTimeSecs(int attempt) {
+		attempt--;
+		if (attempt == 0)
+			return 0;
+		var expBackoff = attempt < 9 ? (1 << attempt) : 256;
+		return _random.Next(1, expBackoff + 1);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/DefaultCheckpointManager.cs b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/DefaultCheckpointManager.cs
new file mode 100644
index 00000000000..7889aae1350
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/DefaultCheckpointManager.cs
@@ -0,0 +1,177 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+public class DefaultCheckpointManager : CoreProjectionCheckpointManager,
+	IHandle<CoreProjectionCheckpointWriterMessage.CheckpointWritten>,
+	IHandle<CoreProjectionCheckpointWriterMessage.RestartRequested> {
+	private readonly ClaimsPrincipal _runAs;
+	private readonly CheckpointTag _zeroTag;
+	private int _readRequestsInProgress;
+	private readonly HashSet<Guid> _loadStateRequests = new HashSet<Guid>();
+
+	protected readonly ProjectionVersion _projectionVersion;
+	protected readonly IODispatcher _ioDispatcher;
+	private readonly PositionTagger _positionTagger;
+	private readonly CoreProjectionCheckpointWriter _coreProjectionCheckpointWriter;
+	private PartitionStateUpdateManager _partitionStateUpdateManager;
+
+	public DefaultCheckpointManager(
+		IPublisher publisher, Guid projectionCorrelationId, ProjectionVersion projectionVersion, ClaimsPrincipal runAs,
+		IODispatcher ioDispatcher, ProjectionConfig projectionConfig, string name, PositionTagger positionTagger,
+		ProjectionNamesBuilder namingBuilder, bool usePersistentCheckpoints, bool producesRunningResults,
+		bool definesFold,
+		CoreProjectionCheckpointWriter coreProjectionCheckpointWriter, int maxProjectionStateSize)
+		: base(
+			publisher, projectionCorrelationId, projectionConfig, name, positionTagger, namingBuilder,
+			usePersistentCheckpoints, maxProjectionStateSize) {
+		if (ioDispatcher == null)
+			throw new ArgumentNullException("ioDispatcher");
+		_projectionVersion = projectionVersion;
+		_runAs = runAs;
+		_ioDispatcher = ioDispatcher;
+		_positionTagger = positionTagger;
+		_coreProjectionCheckpointWriter = coreProjectionCheckpointWriter;
+		_zeroTag = positionTagger.MakeZeroCheckpointTag();
+	}
+
+	protected override void BeginWriteCheckpoint(
+		CheckpointTag requestedCheckpointPosition, string requestedCheckpointState) {
+		_requestedCheckpointPosition = requestedCheckpointPosition;
+		_coreProjectionCheckpointWriter.BeginWriteCheckpoint(
+			new SendToThisEnvelope(this), requestedCheckpointPosition, requestedCheckpointState);
+	}
+
+	public override void RecordEventOrder(
+		ResolvedEvent resolvedEvent, CheckpointTag orderCheckpointTag, Action committed) {
+		committed();
+	}
+
+	public override void PartitionCompleted(string partition) {
+		_partitionStateUpdateManager.PartitionCompleted(partition);
+	}
+
+	public override void Initialize() {
+		base.Initialize();
+		_partitionStateUpdateManager = null;
+		foreach (var requestId in _loadStateRequests)
+			_ioDispatcher.BackwardReader.Cancel(requestId);
+		_loadStateRequests.Clear();
+		_coreProjectionCheckpointWriter.Initialize();
+		_requestedCheckpointPosition = null;
+		_readRequestsInProgress = 0;
+	}
+
+	public override void GetStatistics(ProjectionStatistics info) {
+		base.GetStatistics(info);
+		info.ReadsInProgress += _readRequestsInProgress;
+		_coreProjectionCheckpointWriter.GetStatistics(info);
+	}
+
+	public override void BeginLoadPartitionStateAt(
+		string statePartition, CheckpointTag requestedStateCheckpointTag, Action<PartitionState> loadCompleted) {
+		var stateEventType = ProjectionEventTypes.PartitionCheckpoint;
+		var partitionCheckpointStreamName = _namingBuilder.MakePartitionCheckpointStreamName(statePartition);
+
+		ReadPartitionStream(partitionCheckpointStreamName, -1, requestedStateCheckpointTag, loadCompleted,
+			stateEventType);
+	}
+
+	private void ReadPartitionStream(string partitionStreamName, long eventNumber,
+		CheckpointTag requestedStateCheckpointTag,
+		Action<PartitionState> loadCompleted, string stateEventType) {
+		_readRequestsInProgress++;
+		var requestId = Guid.NewGuid();
+		_ioDispatcher.ReadBackward(
+			partitionStreamName, eventNumber, 1, false, SystemAccounts.System,
+			m =>
+				OnLoadPartitionStateReadStreamEventsBackwardCompleted(
+					m, requestedStateCheckpointTag, loadCompleted, partitionStreamName, stateEventType),
+			() => {
+				_logger.Warning("Read backward for stream {stream} timed out. Retrying", partitionStreamName);
+				_loadStateRequests.Remove(requestId);
+				_readRequestsInProgress--;
+				ReadPartitionStream(partitionStreamName, eventNumber, requestedStateCheckpointTag, loadCompleted,
+					stateEventType);
+			}, requestId);
+		if (requestId != Guid.Empty)
+			_loadStateRequests.Add(requestId);
+	}
+
+	private void OnLoadPartitionStateReadStreamEventsBackwardCompleted(
+		ClientMessage.ReadStreamEventsBackwardCompleted message, CheckpointTag requestedStateCheckpointTag,
+		Action<PartitionState> loadCompleted, string partitionStreamName, string stateEventType) {
+		_loadStateRequests.Remove(message.CorrelationId);
+
+		_readRequestsInProgress--;
+		if (message.Events.Count is 1) {
+			EventRecord @event = message.Events[0].Event;
+			if (@event.EventType == stateEventType) {
+				var parsed = @event.Metadata.ParseCheckpointTagVersionExtraJson(_projectionVersion);
+				if (parsed.Version.ProjectionId != _projectionVersion.ProjectionId
+					|| _projectionVersion.Epoch > parsed.Version.Version) {
+					var state = new PartitionState("", null, _zeroTag);
+					loadCompleted(state);
+					return;
+				} else {
+					var loadedStateCheckpointTag = parsed.AdjustBy(_positionTagger, _projectionVersion);
+					var state = PartitionState.Deserialize(
+						Helper.UTF8NoBom.GetString(@event.Data.Span), loadedStateCheckpointTag);
+					loadCompleted(state);
+					return;
+				}
+			}
+		}
+
+		if (message.NextEventNumber == -1) {
+			var state = new PartitionState("", null, _zeroTag);
+			loadCompleted(state);
+			return;
+		}
+
+		ReadPartitionStream(partitionStreamName, message.NextEventNumber, requestedStateCheckpointTag,
+			loadCompleted, stateEventType);
+	}
+
+	protected override ProjectionCheckpoint CreateProjectionCheckpoint(CheckpointTag checkpointPosition) {
+		return new ProjectionCheckpoint(
+			_publisher, _ioDispatcher, _projectionVersion, _runAs, this, checkpointPosition, _positionTagger,
+			_projectionConfig.MaxWriteBatchLength, _projectionConfig.MaximumAllowedWritesInFlight, _logger);
+	}
+
+	public void Handle(CoreProjectionCheckpointWriterMessage.CheckpointWritten message) {
+		CheckpointWritten(message.Position);
+	}
+
+	public void Handle(CoreProjectionCheckpointWriterMessage.RestartRequested message) {
+		RequestRestart(message.Reason);
+	}
+
+	protected override void CapturePartitionStateUpdated(string partition, PartitionState oldState,
+		PartitionState newState) {
+		if (_partitionStateUpdateManager == null)
+			_partitionStateUpdateManager = new PartitionStateUpdateManager(_namingBuilder);
+		_partitionStateUpdateManager.StateUpdated(partition, newState, oldState.CausedBy);
+	}
+
+	protected override void EmitPartitionCheckpoints() {
+		if (_partitionStateUpdateManager != null) {
+			_partitionStateUpdateManager.EmitEvents(_currentCheckpoint);
+			_partitionStateUpdateManager = null;
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/ICoreProjectionCheckpointManager.cs b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/ICoreProjectionCheckpointManager.cs
new file mode 100644
index 00000000000..f56fad04cf3
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/ICoreProjectionCheckpointManager.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+public interface ICoreProjectionCheckpointManager {
+	void Initialize();
+	void Start(CheckpointTag checkpointTag, PartitionState rootPartitionState);
+	void Stopping();
+	void Stopped();
+	void GetStatistics(ProjectionStatistics info);
+
+
+	void StateUpdated(string partition, PartitionState oldState, PartitionState newState);
+	void PartitionCompleted(string partition);
+	void EventProcessed(CheckpointTag checkpointTag, float progress);
+
+	/// <summary>
+	/// Suggests a checkpoint which may complete immediately or be delayed
+	/// </summary>
+	/// <param name="checkpointTag"></param>
+	/// <param name="progress"></param>
+	/// <returns>true - if checkpoint has been completed (or skipped)</returns>
+	bool CheckpointSuggested(CheckpointTag checkpointTag, float progress);
+
+	void Progress(float progress);
+
+	void BeginLoadPrerecordedEvents(CheckpointTag checkpointTag);
+
+	void BeginLoadPartitionStateAt(
+		string statePartition, CheckpointTag requestedStateCheckpointTag,
+		Action<PartitionState> loadCompleted);
+
+	void RecordEventOrder(ResolvedEvent resolvedEvent, CheckpointTag orderCheckpointTag, Action committed);
+	CheckpointTag LastProcessedEventPosition { get; }
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/ICoreProjectionCheckpointReader.cs b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/ICoreProjectionCheckpointReader.cs
new file mode 100644
index 00000000000..469dd2155fd
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/ICoreProjectionCheckpointReader.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+public interface ICoreProjectionCheckpointReader {
+	void BeginLoadState();
+	void Initialize();
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/IEmittedEventWriter.cs b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/IEmittedEventWriter.cs
new file mode 100644
index 00000000000..13b97665076
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/IEmittedEventWriter.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+public interface IEmittedEventWriter {
+	void EventsEmitted(EmittedEventEnvelope[] scheduledWrites, Guid causedBy, string correlationId);
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/IEventWriter.cs b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/IEventWriter.cs
new file mode 100644
index 00000000000..6243f5fa6e3
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/IEventWriter.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+public interface IEventWriter {
+	void ValidateOrderAndEmitEvents(EmittedEventEnvelope[] events);
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/PositionTagger.cs b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/PositionTagger.cs
new file mode 100644
index 00000000000..95eea643143
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/PositionTagger.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+public abstract class PositionTagger {
+	public readonly int Phase;
+
+	public PositionTagger(int phase) {
+		Phase = phase;
+	}
+
+	public abstract bool IsMessageAfterCheckpointTag(
+		CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent);
+
+	public abstract CheckpointTag MakeCheckpointTag(
+		CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent);
+
+	public abstract CheckpointTag MakeCheckpointTag(
+		CheckpointTag previous, ReaderSubscriptionMessage.EventReaderPartitionEof partitionEof);
+
+	public abstract CheckpointTag MakeCheckpointTag(
+		CheckpointTag previous, ReaderSubscriptionMessage.EventReaderPartitionDeleted partitionDeleted);
+
+	public abstract CheckpointTag MakeZeroCheckpointTag();
+
+	public abstract bool IsCompatible(CheckpointTag checkpointTag);
+
+	public abstract CheckpointTag AdjustTag(CheckpointTag tag);
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/PositionTracker.cs b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/PositionTracker.cs
new file mode 100644
index 00000000000..8c6cd369e1e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/PositionTracker.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+public class PositionTracker {
+	private readonly PositionTagger _positionTagger;
+	private CheckpointTag _lastTag = null;
+
+	public PositionTracker(PositionTagger positionTagger) {
+		_positionTagger = positionTagger;
+	}
+
+	public CheckpointTag LastTag {
+		get { return _lastTag; }
+	}
+
+	public void UpdateByCheckpointTagForward(CheckpointTag newTag) {
+		if (_lastTag == null)
+			throw new InvalidOperationException("Initial position was not set");
+		if (newTag <= _lastTag)
+			throw new InvalidOperationException(
+				string.Format("Event at checkpoint tag {0} has been already processed", newTag));
+		InternalUpdate(newTag);
+	}
+
+	public void UpdateByCheckpointTagInitial(CheckpointTag checkpointTag) {
+		if (_lastTag != null)
+			throw new InvalidOperationException("Position tagger has be already updated");
+		InternalUpdate(checkpointTag);
+	}
+
+	private void InternalUpdate(CheckpointTag newTag) {
+		if (!_positionTagger.IsCompatible(newTag))
+			throw new InvalidOperationException("Cannot update by incompatible checkpoint tag");
+		_lastTag = newTag;
+	}
+
+	public void Initialize() {
+		_lastTag = null;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/ProjectionCheckpoint.cs b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/ProjectionCheckpoint.cs
new file mode 100644
index 00000000000..438f01f1976
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Checkpointing/ProjectionCheckpoint.cs
@@ -0,0 +1,219 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Projections.Core.Common;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+public class ProjectionCheckpoint : IDisposable, IEmittedStreamContainer, IEventWriter {
+	private readonly int _maxWriteBatchLength;
+	private readonly ILogger _logger;
+
+	private readonly Dictionary<string, EmittedStream> _emittedStreams = new Dictionary<string, EmittedStream>();
+	private readonly ClaimsPrincipal _runAs;
+	private readonly CheckpointTag _from;
+	private CheckpointTag _last;
+	private readonly IProjectionCheckpointManager _readyHandler;
+	private readonly PositionTagger _positionTagger;
+
+	private bool _checkpointRequested = false;
+	private int _requestedCheckpoints;
+	private bool _started = false;
+
+	private readonly IODispatcher _ioDispatcher;
+	private readonly IPublisher _publisher;
+
+	private readonly ProjectionVersion _projectionVersion;
+
+	private List<IEnvelope> _awaitingStreams;
+
+	private Guid[] _writeQueueIds;
+	private int _maximumAllowedWritesInFlight;
+
+	public ProjectionCheckpoint(
+		IPublisher publisher,
+		IODispatcher ioDispatcher,
+		ProjectionVersion projectionVersion,
+		ClaimsPrincipal runAs,
+		IProjectionCheckpointManager readyHandler,
+		CheckpointTag from,
+		PositionTagger positionTagger,
+		int maxWriteBatchLength,
+		int maximumAllowedWritesInFlight,
+		ILogger logger = null) {
+		if (publisher == null)
+			throw new ArgumentNullException("publisher");
+		if (ioDispatcher == null)
+			throw new ArgumentNullException("ioDispatcher");
+		if (readyHandler == null)
+			throw new ArgumentNullException("readyHandler");
+		if (positionTagger == null)
+			throw new ArgumentNullException("positionTagger");
+		if (from.CommitPosition < from.PreparePosition)
+			throw new ArgumentException("from");
+		//NOTE: fromCommit can be equal fromPrepare on 0 position.  Is it possible anytime later? Ignoring for now.
+		_maximumAllowedWritesInFlight = maximumAllowedWritesInFlight;
+		_publisher = publisher;
+		_ioDispatcher = ioDispatcher;
+		_projectionVersion = projectionVersion;
+		_runAs = runAs;
+		_readyHandler = readyHandler;
+		_positionTagger = positionTagger;
+		_from = _last = from;
+		_maxWriteBatchLength = maxWriteBatchLength;
+		_logger = logger;
+		_writeQueueIds = Enumerable.Range(0, _maximumAllowedWritesInFlight).Select(x => Guid.NewGuid()).ToArray();
+	}
+
+	public void Start() {
+		if (_started)
+			throw new InvalidOperationException("Projection has been already started");
+		_started = true;
+		foreach (var stream in _emittedStreams.Values) {
+			stream.Start();
+		}
+	}
+
+	public void ValidateOrderAndEmitEvents(EmittedEventEnvelope[] events) {
+		UpdateLastPosition(events);
+		EnsureCheckpointNotRequested();
+
+		var groupedEvents = events.GroupBy(v => v.Event.StreamId);
+		foreach (var eventGroup in groupedEvents) {
+			EmitEventsToStream(eventGroup.Key, eventGroup.ToArray());
+		}
+	}
+
+	private void UpdateLastPosition(EmittedEventEnvelope[] events) {
+		foreach (var emittedEvent in events) {
+			if (emittedEvent.Event.CausedByTag > _last)
+				_last = emittedEvent.Event.CausedByTag;
+		}
+	}
+
+	private void ValidateCheckpointPosition(CheckpointTag position) {
+		if (position <= _from)
+			throw new InvalidOperationException(
+				string.Format(
+					"Checkpoint position before or equal to the checkpoint start position. Requested: '{0}' Started: '{1}'",
+					position, _from));
+		if (position < _last)
+			throw new InvalidOperationException(
+				string.Format(
+					"Checkpoint position before last handled position. Requested: '{0}' Last: '{1}'", position,
+					_last));
+	}
+
+	public void Prepare(CheckpointTag position) {
+		if (!_started)
+			throw new InvalidOperationException("Projection has not been started");
+		ValidateCheckpointPosition(position);
+		_checkpointRequested = true;
+		_requestedCheckpoints = 1; // avoid multiple checkpoint ready messages if already ready
+		foreach (var emittedStream in _emittedStreams.Values) {
+			_requestedCheckpoints++;
+			emittedStream.Checkpoint();
+		}
+
+		_requestedCheckpoints--;
+		OnCheckpointCompleted();
+	}
+
+	private void EnsureCheckpointNotRequested() {
+		if (_checkpointRequested)
+			throw new InvalidOperationException("Checkpoint requested");
+	}
+
+	private void EmitEventsToStream(string streamId, EmittedEventEnvelope[] emittedEvents) {
+		if (string.IsNullOrEmpty(streamId))
+			throw new ArgumentNullException("streamId");
+		EmittedStream stream;
+		if (!_emittedStreams.TryGetValue(streamId, out stream)) {
+			var streamMetadata = emittedEvents.Length > 0 ? emittedEvents[0].StreamMetadata : null;
+
+			var writeQueueId = _maximumAllowedWritesInFlight == AllowedWritesInFlight.Unbounded
+				? (Guid?)null
+				: _writeQueueIds[_emittedStreams.Count % _maximumAllowedWritesInFlight];
+
+			IEmittedStreamsWriter writer;
+			if (writeQueueId == null)
+				writer = new EmittedStreamsWriter(_ioDispatcher);
+			else
+				writer = new QueuedEmittedStreamsWriter(_ioDispatcher, writeQueueId.Value);
+
+			var writerConfiguration = new EmittedStream.WriterConfiguration(
+				writer, streamMetadata, _runAs, maxWriteBatchLength: _maxWriteBatchLength, logger: _logger);
+
+			stream = new EmittedStream(streamId, writerConfiguration, _projectionVersion, _positionTagger, _from,
+				_publisher, _ioDispatcher, this);
+
+			if (_started)
+				stream.Start();
+			_emittedStreams.Add(streamId, stream);
+		}
+
+		stream.EmitEvents(emittedEvents.Select(v => v.Event).ToArray());
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.ReadyForCheckpoint message) {
+		_requestedCheckpoints--;
+		OnCheckpointCompleted();
+	}
+
+	private void OnCheckpointCompleted() {
+		if (_requestedCheckpoints == 0) {
+			_readyHandler.Handle(new CoreProjectionProcessingMessage.ReadyForCheckpoint(this));
+		}
+	}
+
+	public int GetWritePendingEvents() {
+		return _emittedStreams.Values.Sum(v => v.GetWritePendingEvents());
+	}
+
+	public int GetWritesInProgress() {
+		return _emittedStreams.Values.Sum(v => v.GetWritesInProgress());
+	}
+
+	public int GetReadsInProgress() {
+		return _emittedStreams.Values.Sum(v => v.GetReadsInProgress());
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.RestartRequested message) {
+		_readyHandler.Handle(message);
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.Failed message) {
+		_readyHandler.Handle(message);
+	}
+
+	public void Dispose() {
+		if (_emittedStreams != null)
+			foreach (var stream in _emittedStreams.Values)
+				stream.Dispose();
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.EmittedStreamAwaiting message) {
+		if (_awaitingStreams == null)
+			_awaitingStreams = new List<IEnvelope>();
+		_awaitingStreams.Add(message.Envelope);
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.EmittedStreamWriteCompleted message) {
+		var awaitingStreams = _awaitingStreams;
+		_awaitingStreams = null; // still awaiting will re-register
+		if (awaitingStreams != null)
+			foreach (var stream in awaitingStreams)
+				stream.ReplyWith(message);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/CoreProjection.cs b/src/KurrentDB.Projections.Core/Services/Processing/CoreProjection.cs
new file mode 100644
index 00000000000..f6a3369ed4c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/CoreProjection.cs
@@ -0,0 +1,635 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using KurrentDB.Projections.Core.Services.Processing.Phases;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using KurrentDB.Projections.Core.Services.Processing.WorkItems;
+using KurrentDB.Projections.Core.Utils;
+using Serilog;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Projections.Core.Services.Processing;
+
+
+public class CoreProjection : IDisposable,
+	ICoreProjection,
+	ICoreProjectionForProcessingPhase,
+	IHandle<CoreProjectionManagementMessage.GetState>,
+	IHandle<CoreProjectionManagementMessage.GetResult> {
+	[Flags]
+	private enum State : uint {
+		Initial = 0x80000000,
+		LoadStateRequested = 0x2,
+		StateLoaded = 0x4,
+		Subscribed = 0x8,
+		Running = 0x10,
+		Stopping = 0x40,
+		Stopped = 0x80,
+		FaultedStopping = 0x100,
+		Faulted = 0x200,
+		CompletingPhase = 0x400,
+		PhaseCompleted = 0x800,
+		Suspended = 0x900,
+	}
+
+	private readonly string _name;
+	private readonly ProjectionVersion _version;
+
+	private readonly IPublisher _publisher;
+	private readonly IODispatcher _ioDispatcher;
+
+	private readonly ProjectionProcessingStrategy _projectionProcessingStrategy;
+	private readonly Guid _workerId;
+	internal readonly Guid _projectionCorrelationId;
+	private readonly IPublisher _inputQueue;
+	private readonly ClaimsPrincipal _runAs;
+
+	private readonly ILogger _logger;
+
+	private State _state;
+
+	private string _faultedReason;
+
+	private readonly PartitionStateCache _partitionStateCache;
+	private ICoreProjectionCheckpointManager _checkpointManager;
+	private readonly ICoreProjectionCheckpointReader _checkpointReader;
+
+	private bool _tickPending;
+
+	private bool _startOnLoad;
+	private bool _completed;
+
+	private CheckpointSuggestedWorkItem _checkpointSuggestedWorkItem;
+	private IProjectionProcessingPhase _projectionProcessingPhase;
+	private readonly bool _stopOnEof;
+	private readonly IProjectionProcessingPhase[] _projectionProcessingPhases;
+	private readonly CoreProjectionCheckpointWriter _coreProjectionCheckpointWriter;
+	private readonly bool _requiresRootPartition;
+	private readonly Action<ProjectionStatistics> _enrichStatistics;
+
+	private int _statisticsSequentialNumber;
+	private bool _disposed;
+
+	public CoreProjection(
+		ProjectionProcessingStrategy projectionProcessingStrategy,
+		ProjectionVersion version,
+		Guid projectionCorrelationId,
+		IPublisher inputQueue,
+		Guid workerId,
+		ClaimsPrincipal runAs,
+		IPublisher publisher,
+		IODispatcher ioDispatcher,
+		ReaderSubscriptionDispatcher subscriptionDispatcher,
+		ILogger logger,
+		ProjectionNamesBuilder namingBuilder,
+		CoreProjectionCheckpointWriter coreProjectionCheckpointWriter,
+		PartitionStateCache partitionStateCache,
+		string effectiveProjectionName,
+		ITimeProvider timeProvider) {
+		if (publisher == null)
+			throw new ArgumentNullException("publisher");
+		if (ioDispatcher == null)
+			throw new ArgumentNullException("ioDispatcher");
+		if (subscriptionDispatcher == null)
+			throw new ArgumentNullException("subscriptionDispatcher");
+
+		_projectionProcessingStrategy = projectionProcessingStrategy;
+		_projectionCorrelationId = projectionCorrelationId;
+		_inputQueue = inputQueue;
+		_workerId = workerId;
+		_runAs = runAs;
+		_name = effectiveProjectionName;
+		_version = version;
+		_stopOnEof = projectionProcessingStrategy.GetStopOnEof();
+		_logger = logger ?? Log.ForContext<CoreProjection>();
+		_publisher = publisher;
+		_ioDispatcher = ioDispatcher;
+		_partitionStateCache = partitionStateCache;
+		_requiresRootPartition = projectionProcessingStrategy.GetRequiresRootPartition();
+		var useCheckpoints = projectionProcessingStrategy.GetUseCheckpoints();
+
+		_coreProjectionCheckpointWriter = coreProjectionCheckpointWriter;
+
+		_projectionProcessingPhases = projectionProcessingStrategy.CreateProcessingPhases(
+			publisher,
+			inputQueue,
+			projectionCorrelationId,
+			partitionStateCache,
+			UpdateStatistics,
+			this,
+			namingBuilder,
+			timeProvider,
+			ioDispatcher,
+			coreProjectionCheckpointWriter);
+
+
+		//NOTE: currently assuming the first checkpoint manager to be able to load any state
+		_checkpointReader = new CoreProjectionCheckpointReader(
+			publisher,
+			_projectionCorrelationId,
+			ioDispatcher,
+			namingBuilder.MakeCheckpointStreamName(),
+			_version,
+			useCheckpoints);
+		_enrichStatistics = projectionProcessingStrategy.EnrichStatistics;
+		GoToState(State.Initial);
+	}
+
+	private void BeginPhase(IProjectionProcessingPhase processingPhase, CheckpointTag startFrom,
+		PartitionState rootPartitionState) {
+		_projectionProcessingPhase = processingPhase;
+		_projectionProcessingPhase.SetProjectionState(PhaseState.Starting);
+		_checkpointManager = processingPhase.CheckpointManager;
+
+		_projectionProcessingPhase.InitializeFromCheckpoint(startFrom);
+		_checkpointManager.Start(startFrom, rootPartitionState);
+	}
+
+	private void UpdateStatistics() {
+		if (_disposed)
+			return;
+		int sequentialNumber = _statisticsSequentialNumber++;
+		var info = new ProjectionStatistics();
+		GetStatistics(info);
+		_publisher.Publish(
+			new CoreProjectionStatusMessage.StatisticsReport(_projectionCorrelationId, info, sequentialNumber));
+	}
+
+	public void Start() {
+		EnsureState(State.Initial);
+		_startOnLoad = true;
+		GoToState(State.LoadStateRequested);
+	}
+
+	public void LoadStopped() {
+		_startOnLoad = false;
+		EnsureState(State.Initial);
+		GoToState(State.LoadStateRequested);
+	}
+
+	public void Stop() {
+		EnsureState(
+			State.LoadStateRequested | State.StateLoaded | State.Subscribed | State.Running | State.PhaseCompleted
+			| State.CompletingPhase);
+		try {
+			if (_state == State.LoadStateRequested || _state == State.PhaseCompleted)
+				GoToState(State.Stopped);
+			else
+				GoToState(State.Stopping);
+		} catch (Exception ex) {
+			SetFaulted(ex);
+		}
+	}
+
+	public void Kill() {
+		if (_state != State.Stopped)
+			GoToState(State.Stopped);
+	}
+
+	public bool Suspend() {
+		if (_state == State.Stopped || _state == State.Suspended)
+			return false;
+
+		GoToState(State.Suspended);
+		return true;
+	}
+
+	private void EnterSuspended() {
+		EnsureUnsubscribed();
+		_publisher.Publish(new CoreProjectionStatusMessage.Suspended(_projectionCorrelationId));
+	}
+
+	private void GetStatistics(ProjectionStatistics info) {
+		_checkpointManager.GetStatistics(info);
+		if (float.IsNaN(info.Progress) || float.IsNegativeInfinity(info.Progress)
+									   || float.IsPositiveInfinity(info.Progress)) {
+			info.Progress = -2.0f;
+		}
+
+		info.Status = _state.EnumValueName() + info.Status;
+		info.Name = _name;
+		info.EffectiveName = _name;
+		info.ProjectionId = _version.ProjectionId;
+		info.Epoch = _version.Epoch;
+		info.Version = _version.Version;
+		info.StateReason = "";
+		info.BufferedEvents = 0;
+		info.PartitionsCached = _partitionStateCache.CachedItemCount;
+		_enrichStatistics(info);
+		if (_projectionProcessingPhase != null)
+			_projectionProcessingPhase.GetStatistics(info);
+	}
+
+	public void CompletePhase() {
+		if (_state != State.Running)
+			return;
+		if (!_stopOnEof)
+			throw new InvalidOperationException("!_projectionConfig.StopOnEof");
+		_completed = true;
+		_checkpointManager.Progress(100.0f);
+		GoToState(State.CompletingPhase);
+	}
+
+	public void Handle(CoreProjectionManagementMessage.GetState message) {
+		if (_state == State.LoadStateRequested || _state == State.StateLoaded ||
+			_projectionProcessingPhase == null) {
+			_publisher.Publish(
+				new CoreProjectionStatusMessage.StateReport(
+					message.CorrelationId, _projectionCorrelationId, message.Partition, state: null,
+					position: null));
+			return;
+		}
+
+		EnsureState(
+			State.Running | State.Stopping | State.Stopped | State.FaultedStopping | State.Faulted
+			| State.CompletingPhase | State.PhaseCompleted);
+
+		_projectionProcessingPhase.Handle(message);
+	}
+
+	public void Handle(CoreProjectionManagementMessage.GetResult message) {
+		if (_state == State.LoadStateRequested || _state == State.StateLoaded ||
+			_projectionProcessingPhase == null) {
+			_publisher.Publish(
+				new CoreProjectionStatusMessage.ResultReport(
+					message.CorrelationId, _projectionCorrelationId, message.Partition, result: null,
+					position: null));
+			return;
+		}
+
+		EnsureState(
+			State.Running | State.Stopping | State.Stopped | State.FaultedStopping | State.Faulted
+			| State.CompletingPhase | State.PhaseCompleted);
+
+		_projectionProcessingPhase.Handle(message);
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.CheckpointCompleted message) {
+		CheckpointCompleted(message.CheckpointTag);
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.CheckpointLoaded message) {
+		EnsureState(State.LoadStateRequested);
+		try {
+			var checkpointTag = message.CheckpointTag;
+			var phase = checkpointTag == null ? 0 : checkpointTag.Phase;
+			var projectionProcessingPhase = _projectionProcessingPhases[phase];
+			if (checkpointTag == null)
+				checkpointTag = projectionProcessingPhase.MakeZeroCheckpointTag();
+			checkpointTag = projectionProcessingPhase.AdjustTag(checkpointTag);
+			//TODO: initialize projection state here (test it)
+			//TODO: write test to ensure projection state is correctly loaded from a checkpoint and posted back when enough empty records processed
+			//TODO: handle errors
+			_coreProjectionCheckpointWriter.StartFrom(checkpointTag, message.CheckpointEventNumber);
+
+			PartitionState rootPartitionState = null;
+			if (_requiresRootPartition) {
+				rootPartitionState = PartitionState.Deserialize(message.CheckpointData, checkpointTag);
+				_partitionStateCache.CacheAndLockPartitionState("", rootPartitionState, null);
+			}
+
+			BeginPhase(projectionProcessingPhase, checkpointTag, rootPartitionState);
+			GoToState(State.StateLoaded);
+			if (_startOnLoad) {
+				_projectionProcessingPhase.Subscribe(checkpointTag, fromCheckpoint: true);
+			} else
+				GoToState(State.Stopped);
+		} catch (Exception ex) {
+			SetFaulted(ex);
+		}
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.PrerecordedEventsLoaded message) {
+		EnsureState(State.StateLoaded);
+		try {
+			_projectionProcessingPhase.Handle(message);
+		} catch (Exception ex) {
+			SetFaulted(ex);
+		}
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.RestartRequested message) {
+		_logger.Information(
+			"Projection '{projection}'({projectionCorrelationId}) restart has been requested due to: '{reason}'",
+			_name, _projectionCorrelationId,
+			message.Reason);
+		if (_state != State.Running) {
+			SetFaulted(
+				string.Format(
+					"A concurrency violation was detected, but the projection is not running. Current state is: {0}.  The reason for the restart is: '{1}' ",
+					_state, message.Reason));
+			return;
+		}
+
+		CompleteCheckpointSuggestedWorkItem();
+		EnsureUnsubscribed();
+		GoToState(State.Initial);
+		Start();
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.Failed message) {
+		SetFaulted(message.Reason);
+	}
+
+	public void EnsureUnsubscribed() {
+		if (_projectionProcessingPhase != null)
+			_projectionProcessingPhase.EnsureUnsubscribed();
+	}
+
+	private void GoToState(State state) {
+		if (_state == State.Suspended) {
+			_logger.Debug($"Projection {_name} has been suspended for a subsystem restart. Cannot go to state {state}");
+			return;
+		}
+		//            _logger.Trace("CP: {projection} {stateFrom} => {stateTo}", _name, _state, state);
+		var wasStopped = _state == State.Stopped || _state == State.Faulted || _state == State.PhaseCompleted;
+		var wasStopping = _state == State.Stopping || _state == State.FaultedStopping
+												   || _state == State.CompletingPhase;
+		var wasStarting = _state == State.LoadStateRequested || _state == State.StateLoaded
+															 || _state == State.Subscribed;
+		var wasStarted = _state == State.Subscribed || _state == State.Running || _state == State.Stopping
+						 || _state == State.FaultedStopping || _state == State.CompletingPhase;
+		var wasRunning = _state == State.Running;
+		var stateChanged = _state != state;
+		_state = state; // set state before transition to allow further state change
+		switch (state) {
+			case State.Stopped:
+			case State.Faulted:
+			case State.PhaseCompleted:
+				if (wasStarted && !wasStopped)
+					_checkpointManager.Stopped();
+				break;
+			case State.Stopping:
+			case State.FaultedStopping:
+			case State.CompletingPhase:
+				if (wasStarted && !wasStopping)
+					_checkpointManager.Stopping();
+				break;
+		}
+
+
+		if (_projectionProcessingPhase != null) // null while loading state
+			switch (state) {
+				case State.LoadStateRequested:
+				case State.StateLoaded:
+				case State.Subscribed:
+					if (!wasStarting)
+						_projectionProcessingPhase.SetProjectionState(PhaseState.Starting);
+					break;
+				case State.Running:
+					if (!wasRunning)
+						_projectionProcessingPhase.SetProjectionState(PhaseState.Running);
+					break;
+				case State.Faulted:
+				case State.FaultedStopping:
+					if (wasRunning)
+						_projectionProcessingPhase.SetProjectionState(PhaseState.Stopped);
+					break;
+				case State.Stopped:
+				case State.Stopping:
+				case State.CompletingPhase:
+				case State.PhaseCompleted:
+					if (wasRunning)
+						_projectionProcessingPhase.SetProjectionState(PhaseState.Stopped);
+					break;
+				default:
+					_projectionProcessingPhase.SetProjectionState(PhaseState.Unknown);
+					break;
+			}
+		switch (state) {
+			case State.Initial:
+				EnterInitial();
+				break;
+			case State.LoadStateRequested:
+				EnterLoadStateRequested();
+				break;
+			case State.StateLoaded:
+				EnterStateLoaded();
+				break;
+			case State.Subscribed:
+				EnterSubscribed();
+				break;
+			case State.Running:
+				EnterRunning();
+				break;
+			case State.Stopping:
+				EnterStopping();
+				break;
+			case State.Stopped:
+				EnterStopped();
+				break;
+			case State.FaultedStopping:
+				EnterFaultedStopping();
+				break;
+			case State.Faulted:
+				EnterFaulted();
+				break;
+			case State.CompletingPhase:
+				EnterCompletingPhase();
+				break;
+			case State.PhaseCompleted:
+				EnterPhaseCompleted();
+				break;
+			case State.Suspended:
+				EnterSuspended();
+				break;
+			default:
+				throw new Exception();
+		}
+
+		if (stateChanged)
+			UpdateStatistics();
+	}
+
+	private void EnterInitial() {
+		_completed = false;
+		_partitionStateCache.Initialize();
+		_projectionProcessingPhase = null;
+		_checkpointManager = _projectionProcessingPhases[0].CheckpointManager;
+		var emittedStreamsTracker = _projectionProcessingPhases[0].EmittedStreamsTracker;
+		emittedStreamsTracker.Initialize();
+		_checkpointManager.Initialize();
+		_checkpointReader.Initialize();
+		_tickPending = false;
+		if (_requiresRootPartition)
+			_partitionStateCache.CacheAndLockPartitionState("", new PartitionState("", null, CheckpointTag.Empty),
+				null);
+		// NOTE: this is to workaround exception in GetState requests submitted by client
+	}
+
+	private void EnterLoadStateRequested() {
+		_checkpointReader.BeginLoadState();
+	}
+
+	private void EnterStateLoaded() {
+	}
+
+	private void EnterSubscribed() {
+		if (_startOnLoad) {
+			GoToState(State.Running);
+		} else
+			GoToState(State.Stopped);
+	}
+
+	private void EnterRunning() {
+		try {
+			_publisher.Publish(
+				new CoreProjectionStatusMessage.Started(_projectionCorrelationId, _name));
+			_projectionProcessingPhase.ProcessEvent();
+		} catch (Exception ex) {
+			SetFaulted(ex);
+		}
+	}
+
+	private void EnterStopping() {
+		EnsureUnsubscribed();
+	}
+
+	private void EnterStopped() {
+		EnsureUnsubscribed();
+		_publisher.Publish(new CoreProjectionStatusMessage.Stopped(_projectionCorrelationId, _name, _completed));
+	}
+
+	private void EnterFaultedStopping() {
+		EnsureUnsubscribed();
+	}
+
+	private void EnterFaulted() {
+		EnsureUnsubscribed();
+		_publisher.Publish(
+			new CoreProjectionStatusMessage.Faulted(_projectionCorrelationId, _faultedReason));
+	}
+
+	private void EnterCompletingPhase() {
+	}
+
+	private void EnterPhaseCompleted() {
+		var completedPhaseIndex = _checkpointManager.LastProcessedEventPosition.Phase;
+		if (completedPhaseIndex == _projectionProcessingPhases.Length - 1) {
+			Stop();
+		} else {
+			var nextPhase = _projectionProcessingPhases[completedPhaseIndex + 1];
+			var nextPhaseZeroPosition = nextPhase.MakeZeroCheckpointTag();
+			BeginPhase(nextPhase, nextPhaseZeroPosition, null);
+			_projectionProcessingPhase.Subscribe(nextPhaseZeroPosition, fromCheckpoint: false);
+		}
+	}
+
+	private void EnsureState(State expectedStates) {
+		if ((_state & expectedStates) == 0) {
+			throw new Exception(
+				string.Format("Current state is {0}. Expected states are: {1}", _state, expectedStates));
+		}
+	}
+
+	private void Tick() {
+		// ignore any ticks received when not pending. this may happen when restart requested
+		if (!_tickPending)
+			return;
+		// process messages in almost all states as we now ignore work items when processing
+		if (_state == State.LoadStateRequested) {
+			_tickPending = false;
+			return;
+		}
+
+		EnsureState(
+			State.Running | State.Stopping | State.Stopped | State.FaultedStopping | State.Faulted
+			| State.CompletingPhase | State.PhaseCompleted);
+
+		try {
+			_tickPending = false;
+			_projectionProcessingPhase.ProcessEvent();
+		} catch (Exception ex) {
+			SetFaulted(ex);
+		}
+	}
+
+
+	public void Dispose() {
+		_disposed = true;
+		EnsureUnsubscribed();
+		if (_projectionProcessingPhase != null)
+			_projectionProcessingPhase.Dispose();
+	}
+
+	public void EnsureTickPending() {
+		// ticks are requested when an async operation is completed or when an item is being processed
+		// thus, the tick message is removed from the queue when it does not process any work item (and
+		// it is renewed therefore)
+		if (_tickPending)
+			return;
+		_tickPending = true;
+		_publisher.Publish(new ProjectionCoreServiceMessage.CoreTick(Tick));
+	}
+
+	public void SetFaulted(Exception ex) {
+		SetFaulted(ex.Message + "\r\n" + (ex.StackTrace ?? "").ToString());
+	}
+
+	public void SetFaulted(string reason) {
+		if (_state != State.FaultedStopping && _state != State.Faulted)
+			_faultedReason = reason;
+		if (_state != State.Faulted)
+			GoToState(State.Faulted);
+	}
+
+	public void SetFaulting(string reason) {
+		if (_state != State.FaultedStopping && _state != State.Faulted) {
+			_faultedReason = reason;
+			GoToState(State.FaultedStopping);
+		}
+	}
+
+	private void CheckpointCompleted(CheckpointTag lastCompletedCheckpointPosition) {
+		CompleteCheckpointSuggestedWorkItem();
+		// all emitted events caused by events before the checkpoint position have been written
+		// unlock states, so the cache can be clean up as they can now be safely reloaded from the ES
+		_partitionStateCache.Unlock(lastCompletedCheckpointPosition);
+
+		switch (_state) {
+			case State.Stopping:
+				GoToState(State.Stopped);
+				break;
+			case State.FaultedStopping:
+				GoToState(State.Faulted);
+				break;
+			case State.CompletingPhase:
+				GoToState(State.PhaseCompleted);
+				break;
+		}
+	}
+
+	public void SetCurrentCheckpointSuggestedWorkItem(CheckpointSuggestedWorkItem checkpointSuggestedWorkItem) {
+		if (_checkpointSuggestedWorkItem != null && checkpointSuggestedWorkItem != null)
+			throw new InvalidOperationException("Checkpoint in progress");
+		if (_checkpointSuggestedWorkItem == null && checkpointSuggestedWorkItem == null)
+			throw new InvalidOperationException("No checkpoint in progress");
+		_checkpointSuggestedWorkItem = checkpointSuggestedWorkItem;
+	}
+
+	private void CompleteCheckpointSuggestedWorkItem() {
+		var workItem = _checkpointSuggestedWorkItem;
+		if (workItem != null) {
+			_checkpointSuggestedWorkItem = null;
+			workItem.CheckpointCompleted();
+			EnsureTickPending();
+		}
+	}
+
+
+	public CheckpointTag LastProcessedEventPosition {
+		get { return _checkpointManager.LastProcessedEventPosition; }
+	}
+
+	public void Subscribed() {
+		GoToState(State.Subscribed);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/CoreProjectionQueue.cs b/src/KurrentDB.Projections.Core/Services/Processing/CoreProjectionQueue.cs
new file mode 100644
index 00000000000..942180bbdb0
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/CoreProjectionQueue.cs
@@ -0,0 +1,156 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.WorkItems;
+
+namespace KurrentDB.Projections.Core.Services.Processing;
+
+public class CoreProjectionQueue {
+	private readonly StagedProcessingQueue _queuePendingEvents;
+
+	private readonly IPublisher _publisher;
+	private readonly int _pendingEventsThreshold;
+
+	private CheckpointTag _lastEnqueuedEventTag;
+	private bool _justInitialized;
+	private bool _subscriptionPaused;
+
+	public event Action EnsureTickPending {
+		add { _queuePendingEvents.EnsureTickPending += value; }
+		remove { _queuePendingEvents.EnsureTickPending -= value; }
+	}
+
+	public CoreProjectionQueue(IPublisher publisher, int pendingEventsThreshold, bool orderedPartitionProcessing) {
+		_queuePendingEvents =
+			new StagedProcessingQueue(
+				new[] {
+					true /* record event order - async with ordered output*/, true
+					/* get state partition - ordered as it may change correlation id - sync */,
+					false
+					/* load foreach state - async- unordered completion*/,
+					orderedPartitionProcessing
+					/* process Js - unordered/ordered - inherently unordered/ordered completion*/,
+					true
+					/* write emits - ordered - async ordered completion*/,
+					false /* complete item */
+				});
+		_publisher = publisher;
+		_pendingEventsThreshold = pendingEventsThreshold;
+	}
+
+	public bool IsRunning {
+		get { return _isRunning; }
+	}
+
+	public bool ProcessEvent() {
+		var processed = false;
+		if (_queuePendingEvents.Count > 0) {
+			processed = ProcessOneEventBatch();
+		} else if (_queuePendingEvents.Count == 0 && _subscriptionPaused && !_unsubscribed) {
+			ResumeSubscription();
+		}
+
+		return processed;
+	}
+
+	public int GetBufferedEventCount() {
+		return _queuePendingEvents.Count;
+	}
+
+	public void EnqueueTask(WorkItem workItem, CheckpointTag workItemCheckpointTag,
+		bool allowCurrentPosition = false) {
+		ValidateQueueingOrder(workItemCheckpointTag, allowCurrentPosition);
+		workItem.SetProjectionQueue(this);
+		workItem.SetCheckpointTag(workItemCheckpointTag);
+		_queuePendingEvents.Enqueue(workItem);
+	}
+
+	public void EnqueueOutOfOrderTask(WorkItem workItem) {
+		if (_lastEnqueuedEventTag == null)
+			throw new InvalidOperationException(
+				"Cannot enqueue an out-of-order task.  The projection position is currently unknown.");
+		workItem.SetProjectionQueue(this);
+		workItem.SetCheckpointTag(_lastEnqueuedEventTag);
+		_queuePendingEvents.Enqueue(workItem);
+	}
+
+	public void InitializeQueue(CheckpointTag startingPosition) {
+		_subscriptionPaused = false;
+		_unsubscribed = false;
+		_subscriptionId = Guid.Empty;
+
+		_queuePendingEvents.Initialize();
+
+		_lastEnqueuedEventTag = startingPosition;
+		_justInitialized = true;
+	}
+
+	public string GetStatus() {
+		return (_subscriptionPaused ? "/Paused" : "");
+	}
+
+	private void ValidateQueueingOrder(CheckpointTag eventTag, bool allowCurrentPosition = false) {
+		if (eventTag < _lastEnqueuedEventTag ||
+			(!(allowCurrentPosition || _justInitialized) && eventTag <= _lastEnqueuedEventTag))
+			throw new InvalidOperationException(
+				string.Format(
+					"Invalid order.  Last known tag is: '{0}'.  Current tag is: '{1}'", _lastEnqueuedEventTag,
+					eventTag));
+		_justInitialized = _justInitialized && (eventTag == _lastEnqueuedEventTag);
+		_lastEnqueuedEventTag = eventTag;
+	}
+
+	private void PauseSubscription() {
+		if (_subscriptionId == Guid.Empty)
+			throw new InvalidOperationException("Not subscribed");
+		if (!_subscriptionPaused && !_unsubscribed) {
+			_subscriptionPaused = true;
+			_publisher.Publish(
+				new ReaderSubscriptionManagement.Pause(_subscriptionId));
+		}
+	}
+
+	private void ResumeSubscription() {
+		if (_subscriptionId == Guid.Empty)
+			throw new InvalidOperationException("Not subscribed");
+		if (_subscriptionPaused && !_unsubscribed) {
+			_subscriptionPaused = false;
+			_publisher.Publish(
+				new ReaderSubscriptionManagement.Resume(_subscriptionId));
+		}
+	}
+
+	private bool _unsubscribed;
+	private Guid _subscriptionId;
+	private bool _isRunning;
+
+	private bool ProcessOneEventBatch() {
+		if (_queuePendingEvents.Count > _pendingEventsThreshold)
+			PauseSubscription();
+		var processed = _queuePendingEvents.Process(max: 30);
+		if (_subscriptionPaused && _queuePendingEvents.Count < _pendingEventsThreshold / 2)
+			ResumeSubscription();
+
+		return processed;
+	}
+
+	public void Unsubscribed() {
+		_unsubscribed = true;
+	}
+
+	public void Subscribed(Guid currentSubscriptionId) {
+		if (_unsubscribed)
+			throw new InvalidOperationException("Unsubscribed");
+		if (_subscriptionId != Guid.Empty)
+			throw new InvalidOperationException("Already subscribed");
+		_subscriptionId = currentSubscriptionId;
+	}
+
+	public void SetIsRunning(bool isRunning) {
+		_isRunning = isRunning;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedDataEvent.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedDataEvent.cs
new file mode 100644
index 00000000000..384b5c7d109
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedDataEvent.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+public class EmittedDataEvent : EmittedEvent {
+	private readonly string _data;
+	private readonly ExtraMetaData _metadata;
+	private readonly bool _isJson;
+
+	public EmittedDataEvent(
+		string streamId, Guid eventId,
+		string eventType, bool isJson, string data, ExtraMetaData metadata, CheckpointTag causedByTag,
+		CheckpointTag expectedTag,
+		Action<long> onCommitted = null)
+		: base(streamId, eventId, eventType, causedByTag, expectedTag, onCommitted) {
+		_isJson = isJson;
+		_data = data;
+		_metadata = metadata;
+	}
+
+	public override string Data {
+		get { return _data; }
+	}
+
+	public ExtraMetaData Metadata {
+		get { return _metadata; }
+	}
+
+	public override bool IsJson {
+		get { return _isJson; }
+	}
+
+	public override bool IsReady() {
+		return true;
+	}
+
+	public override IEnumerable<KeyValuePair<string, string>> ExtraMetaData() {
+		return _metadata == null ? null : _metadata.Metadata;
+	}
+
+	public override string ToString() {
+		return string.Format("Event Id: {0}, Event Type: {1}, Data: {2}", EventId, EventType, Data);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedEvent.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedEvent.cs
new file mode 100644
index 00000000000..098cdce743a
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedEvent.cs
@@ -0,0 +1,70 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+public abstract class EmittedEvent {
+	public readonly string StreamId;
+	public readonly Guid EventId;
+	public readonly string EventType;
+	private readonly CheckpointTag _causedByTag;
+	private readonly CheckpointTag _expectedTag;
+	private readonly Action<long> _onCommitted;
+	private Guid _causedBy;
+	private string _correlationId;
+
+	protected EmittedEvent(
+		string streamId, Guid eventId,
+		string eventType, CheckpointTag causedByTag, CheckpointTag expectedTag, Action<long> onCommitted = null) {
+		if (causedByTag == null)
+			throw new ArgumentNullException("causedByTag");
+		StreamId = streamId;
+		EventId = eventId;
+		EventType = eventType;
+		_causedByTag = causedByTag;
+		_expectedTag = expectedTag;
+		_onCommitted = onCommitted;
+	}
+
+	public abstract string Data { get; }
+
+	public CheckpointTag CausedByTag {
+		get { return _causedByTag; }
+	}
+
+	public CheckpointTag ExpectedTag {
+		get { return _expectedTag; }
+	}
+
+	public Action<long> OnCommitted {
+		get { return _onCommitted; }
+	}
+
+	public Guid CausedBy {
+		get { return _causedBy; }
+	}
+
+	public string CorrelationId {
+		get { return _correlationId; }
+	}
+
+	public abstract bool IsJson { get; }
+
+	public abstract bool IsReady();
+
+	public virtual IEnumerable<KeyValuePair<string, string>> ExtraMetaData() {
+		return null;
+	}
+
+	public void SetCausedBy(Guid causedBy) {
+		_causedBy = causedBy;
+	}
+
+	public void SetCorrelationId(string correlationId) {
+		_correlationId = correlationId;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedEventEnvelope.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedEventEnvelope.cs
new file mode 100644
index 00000000000..45bdad32e12
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedEventEnvelope.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+public sealed class EmittedEventEnvelope {
+	public readonly EmittedEvent Event;
+	public readonly EmittedStream.WriterConfiguration.StreamMetadata StreamMetadata;
+
+	public EmittedEventEnvelope(
+		EmittedEvent @event, EmittedStream.WriterConfiguration.StreamMetadata streamMetadata = null) {
+		Event = @event;
+		StreamMetadata = streamMetadata;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedEventResolutionNeeded.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedEventResolutionNeeded.cs
new file mode 100644
index 00000000000..75726198643
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedEventResolutionNeeded.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+sealed class EmittedEventResolutionNeeded : IValidatedEmittedEvent {
+	public string StreamId { get; }
+	public long Revision { get; }
+	public Tuple<CheckpointTag, string, long> TopCommitted { get; }
+
+	public EmittedEventResolutionNeeded(string streamId, long revision, Tuple<CheckpointTag, string, long> topCommitted) {
+		StreamId = streamId;
+		Revision = revision;
+		TopCommitted = topCommitted;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedLinkTo.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedLinkTo.cs
new file mode 100644
index 00000000000..e0f47d5f364
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedLinkTo.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Globalization;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+public class EmittedLinkTo : EmittedEvent {
+	private readonly string _targetStreamId;
+	private long? _eventNumber;
+
+	public EmittedLinkTo(
+		string streamId, Guid eventId,
+		string targetStreamId, CheckpointTag causedByTag, CheckpointTag expectedTag,
+		Action<long> onCommitted = null)
+		: base(streamId, eventId, "$>", causedByTag, expectedTag, onCommitted) {
+		_targetStreamId = targetStreamId;
+	}
+
+	public EmittedLinkTo(
+		string streamId, Guid eventId,
+		string targetStreamId, int targetEventNumber, CheckpointTag causedByTag, CheckpointTag expectedTag,
+		string originalStreamId = null)
+		: base(streamId, eventId, "$>", causedByTag, expectedTag, null) {
+		_eventNumber = targetEventNumber;
+		_targetStreamId = targetStreamId;
+	}
+
+	public override string Data {
+		get {
+			if (!IsReady())
+				throw new InvalidOperationException("Link target has not been yet committed");
+			return
+				_eventNumber.Value.ToString(CultureInfo.InvariantCulture) + "@" + _targetStreamId;
+		}
+	}
+
+	public override bool IsJson {
+		get { return false; }
+	}
+
+	public override bool IsReady() {
+		return _eventNumber != null;
+	}
+
+	public void SetTargetEventNumber(long eventNumber) {
+		if (_eventNumber != null)
+			throw new InvalidOperationException("Target event number has been already set");
+		_eventNumber = eventNumber;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedLinkToWithRecategorization.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedLinkToWithRecategorization.cs
new file mode 100644
index 00000000000..2a7876287ca
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/EmittedLinkToWithRecategorization.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using Newtonsoft.Json;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+public class EmittedLinkToWithRecategorization : EmittedEvent {
+	private readonly string _target;
+	private readonly string _originalStreamId;
+	private readonly int? _streamDeletedAt;
+
+	public EmittedLinkToWithRecategorization(
+		string streamId, Guid eventId, string target, CheckpointTag causedByTag, CheckpointTag expectedTag,
+		string originalStreamId, int? streamDeletedAt)
+		: base(streamId, eventId, "$>", causedByTag, expectedTag, null) {
+		_target = target;
+		_originalStreamId = originalStreamId;
+		_streamDeletedAt = streamDeletedAt;
+	}
+
+	public override string Data {
+		get { return _target; }
+	}
+
+	public override bool IsJson {
+		get { return false; }
+	}
+
+	public override bool IsReady() {
+		return true;
+	}
+
+	public override IEnumerable<KeyValuePair<string, string>> ExtraMetaData() {
+		if (!string.IsNullOrEmpty(_originalStreamId))
+			yield return new KeyValuePair<string, string>("$o", JsonConvert.ToString(_originalStreamId));
+		if (_streamDeletedAt != null)
+			yield return new KeyValuePair<string, string>("$deleted", JsonConvert.ToString(_streamDeletedAt.Value));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/ErroredEmittedEvent.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/ErroredEmittedEvent.cs
new file mode 100644
index 00000000000..0ce9c9b3636
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/ErroredEmittedEvent.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+sealed class ErroredEmittedEvent : IValidatedEmittedEvent {
+	public Exception Exception { get; private set; }
+
+	public ErroredEmittedEvent(InvalidEmittedEventSequenceException exception) {
+		Exception = exception;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/ExtraMetaData.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/ExtraMetaData.cs
new file mode 100644
index 00000000000..9c8771ba24a
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/ExtraMetaData.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json.Linq;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+public class ExtraMetaData {
+	private readonly Dictionary<string, string> _metadata;
+
+	public ExtraMetaData(Dictionary<string, JRaw> metadata) {
+		_metadata = metadata.ToDictionary(v => v.Key, v => v.Value.ToString());
+	}
+
+	public ExtraMetaData(Dictionary<string, string> metadata) {
+		_metadata = metadata.ToDictionary(v => v.Key, v => v.Value);
+	}
+
+	public Dictionary<string, string> Metadata {
+		get { return _metadata; }
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/IValidatedEmittedEvent.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/IValidatedEmittedEvent.cs
new file mode 100644
index 00000000000..d4c7942129a
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/IValidatedEmittedEvent.cs
@@ -0,0 +1,6 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+interface IValidatedEmittedEvent { }
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/IgnoredEmittedEvent.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/IgnoredEmittedEvent.cs
new file mode 100644
index 00000000000..1077a378cf3
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/IgnoredEmittedEvent.cs
@@ -0,0 +1,7 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+sealed class IgnoredEmittedEvent : IValidatedEmittedEvent {
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/ValidEmittedEvent.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/ValidEmittedEvent.cs
new file mode 100644
index 00000000000..e6581a73e9f
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedEvents/ValidEmittedEvent.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+sealed class ValidEmittedEvent : IValidatedEmittedEvent {
+	public CheckpointTag Checkpoint { get; private set; }
+	public string EventType { get; private set; }
+	public long Revision { get; private set; }
+
+	public ValidEmittedEvent(CheckpointTag checkpoint, string eventType, long revision) {
+		Checkpoint = checkpoint;
+		EventType = eventType;
+		Revision = revision;
+	}
+}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedStream.WriterConfiguration.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedStream.WriterConfiguration.cs
similarity index 84%
rename from src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedStream.WriterConfiguration.cs
rename to src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedStream.WriterConfiguration.cs
index 5657866fdf1..94565f08797 100644
--- a/src/EventStore.Projections.Core/Services/Processing/Emitting/EmittedStream.WriterConfiguration.cs
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedStream.WriterConfiguration.cs
@@ -1,11 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Security.Claims;
 using Serilog;
 
-namespace EventStore.Projections.Core.Services.Processing.Emitting;
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting;
 
-public partial class EmittedStream
-{
+public partial class EmittedStream {
 	public class WriterConfiguration {
 		private readonly ClaimsPrincipal _writeAs;
 		private readonly int _maxWriteBatchLength;
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedStream.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedStream.cs
new file mode 100644
index 00000000000..163e681bffc
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedStream.cs
@@ -0,0 +1,732 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using Newtonsoft.Json.Linq;
+using Serilog;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting;
+
+public partial class EmittedStream : IDisposable,
+	IHandle<CoreProjectionProcessingMessage.EmittedStreamWriteCompleted> {
+	private readonly IODispatcher _ioDispatcher;
+	private readonly IPublisher _publisher;
+
+	private readonly ILogger _logger;
+	private readonly string _streamId;
+	private readonly string _metadataStreamId;
+	private readonly WriterConfiguration _writerConfiguration;
+	private readonly ProjectionVersion _projectionVersion;
+	private readonly ClaimsPrincipal _writeAs;
+	private readonly PositionTagger _positionTagger;
+	private readonly CheckpointTag _zeroPosition;
+	private readonly CheckpointTag _fromCheckpointPosition;
+	private readonly IEmittedStreamContainer _readyHandler;
+	private static readonly string LinkEventType = "$>";
+	private static readonly char[] LinkToSeparator = new[] { '@' };
+
+	private readonly Stack<Tuple<CheckpointTag, string, long>> _alreadyCommittedEvents =
+		new Stack<Tuple<CheckpointTag, string, long>>();
+
+	private readonly Queue<EmittedEvent> _pendingWrites = new Queue<EmittedEvent>();
+
+	private bool _checkpointRequested;
+	private bool _awaitingWriteCompleted;
+	private bool _awaitingMetadataWriteCompleted;
+	private bool _awaitingReady;
+	private bool _awaitingListEventsCompleted;
+	private bool _started;
+	private bool _awaitingLinkToResolution;
+
+	private readonly int _maxWriteBatchLength;
+	private CheckpointTag _lastCommittedOrSubmittedEventPosition; // TODO: rename
+	private bool _metadataStreamCreated;
+	private CheckpointTag _lastQueuedEventPosition;
+	private Event[] _submittedToWriteEvents;
+	private EmittedEvent[] _submittedToWriteEmittedEvents;
+	private long _lastKnownEventNumber = ExpectedVersion.Invalid;
+	private long _retrievedNextEventNumber = ExpectedVersion.Invalid;
+	private readonly bool _noCheckpoints;
+	private bool _disposed;
+	private bool _recoveryCompleted;
+	private Event _submittedWriteMetaStreamEvent;
+	private const int MaxRetryCount = 12;
+	private const int MinAttemptWarnThreshold = 5;
+	private Guid _pendingRequestCorrelationId;
+	private Random _random = new Random();
+
+	public EmittedStream(
+		string streamId, WriterConfiguration writerConfiguration, ProjectionVersion projectionVersion,
+		PositionTagger positionTagger, CheckpointTag fromCheckpointPosition, IPublisher publisher,
+		IODispatcher ioDispatcher,
+		IEmittedStreamContainer readyHandler, bool noCheckpoints = false) {
+		if (string.IsNullOrEmpty(streamId))
+			throw new ArgumentNullException("streamId");
+		if (writerConfiguration == null)
+			throw new ArgumentNullException("writerConfiguration");
+		if (positionTagger == null)
+			throw new ArgumentNullException("positionTagger");
+		if (fromCheckpointPosition == null)
+			throw new ArgumentNullException("fromCheckpointPosition");
+		if (publisher == null)
+			throw new ArgumentNullException("publisher");
+		if (ioDispatcher == null)
+			throw new ArgumentNullException("ioDispatcher");
+		if (readyHandler == null)
+			throw new ArgumentNullException("readyHandler");
+		_streamId = streamId;
+		_metadataStreamId = SystemStreams.MetastreamOf(streamId);
+		_writerConfiguration = writerConfiguration;
+		_projectionVersion = projectionVersion;
+		_writeAs = writerConfiguration.WriteAs;
+		_positionTagger = positionTagger;
+		_zeroPosition = positionTagger.MakeZeroCheckpointTag();
+		_fromCheckpointPosition = fromCheckpointPosition;
+		_lastQueuedEventPosition = null;
+		_publisher = publisher;
+		_ioDispatcher = ioDispatcher;
+		_readyHandler = readyHandler;
+		_maxWriteBatchLength = writerConfiguration.MaxWriteBatchLength;
+		_logger = writerConfiguration.Logger;
+		_noCheckpoints = noCheckpoints;
+	}
+
+	public void EmitEvents(EmittedEvent[] events) {
+		if (events == null)
+			throw new ArgumentNullException("events");
+		CheckpointTag groupCausedBy = null;
+		foreach (var @event in events) {
+			if (groupCausedBy == null) {
+				groupCausedBy = @event.CausedByTag;
+				if (!(_lastQueuedEventPosition != null && groupCausedBy > _lastQueuedEventPosition) &&
+					!(_lastQueuedEventPosition == null && groupCausedBy >= _fromCheckpointPosition))
+					throw new InvalidOperationException(
+						string.Format("Invalid event order.  '{0}' goes after '{1}'", @event.CausedByTag,
+							_lastQueuedEventPosition));
+				_lastQueuedEventPosition = groupCausedBy;
+			} else if (@event.CausedByTag != groupCausedBy)
+				throw new ArgumentException("events must share the same CausedByTag");
+
+			if (@event.StreamId != _streamId)
+				throw new ArgumentException("Invalid streamId", "events");
+		}
+
+		EnsureCheckpointNotRequested();
+		foreach (var @event in events)
+			_pendingWrites.Enqueue(@event);
+		ProcessWrites();
+	}
+
+	public void Checkpoint() {
+		EnsureCheckpointsEnabled();
+		EnsureStreamStarted();
+		EnsureCheckpointNotRequested();
+		_checkpointRequested = true;
+		ProcessRequestedCheckpoint();
+	}
+
+	public void Start() {
+		EnsureCheckpointNotRequested();
+		if (_started)
+			throw new InvalidOperationException("Stream is already started");
+		_started = true;
+		ProcessWrites();
+	}
+
+	public int GetWritePendingEvents() {
+		return _pendingWrites.Count;
+	}
+
+	public int GetWritesInProgress() {
+		return (_awaitingWriteCompleted ? 1 : 0) + (_awaitingMetadataWriteCompleted ? 1 : 0);
+	}
+
+	public int GetReadsInProgress() {
+		return _awaitingListEventsCompleted ? 1 : 0;
+	}
+
+	private void HandleWriteEventsCompleted(ClientMessage.WriteEventsCompleted message, int retryCount) {
+		if (!_awaitingWriteCompleted)
+			throw new InvalidOperationException("WriteEvents has not been submitted");
+		if (_disposed)
+			return;
+		_awaitingWriteCompleted = false;
+		if (message.Result == OperationResult.Success) {
+			_lastKnownEventNumber = message.FirstEventNumber + _submittedToWriteEvents.Length - 1;
+			NotifyEventsCommitted(_submittedToWriteEmittedEvents, message.FirstEventNumber);
+			OnWriteCompleted();
+			return;
+		}
+
+		if (_logger != null) {
+			_logger.Information("Failed to write events to stream {stream}. Error: {e}",
+				_streamId,
+				Enum.GetName(typeof(OperationResult), message.Result));
+		}
+
+		switch (message.Result) {
+			case OperationResult.WrongExpectedVersion:
+				RequestRestart(string.Format(
+					"The '{0}' stream has been written to from the outside. Expected Version: {1}, Current Version: {2}. Checkpoint: {3}.",
+					_streamId, _lastKnownEventNumber, message.CurrentVersion, _fromCheckpointPosition));
+				break;
+			case OperationResult.PrepareTimeout:
+			case OperationResult.ForwardTimeout:
+			case OperationResult.CommitTimeout:
+				if (retryCount > 0) {
+					PublishWriteEvents(--retryCount);
+				} else {
+					Failed(string.Format(
+						"Failed to write events to {0}. Retry limit of {1} reached. Reason: {2}. Checkpoint: {3}.",
+						_streamId, MaxRetryCount, message.Result, _fromCheckpointPosition));
+				}
+
+				break;
+			default:
+				throw new NotSupportedException("Unsupported error code received");
+		}
+	}
+
+	private void RequestRestart(string reason) {
+		_readyHandler.Handle(new CoreProjectionProcessingMessage.RestartRequested(Guid.Empty, reason));
+	}
+
+	private void Failed(string reason) {
+		_readyHandler.Handle(new CoreProjectionProcessingMessage.Failed(Guid.Empty, reason));
+	}
+
+	private void ReadStreamEventsBackwardCompleted(ClientMessage.ReadStreamEventsBackwardCompleted message,
+		CheckpointTag lastCheckpointPosition) {
+		if (!_awaitingListEventsCompleted)
+			throw new InvalidOperationException("ReadStreamEventsBackward has not been requested");
+		if (_disposed)
+			return;
+		if (message.CorrelationId != _pendingRequestCorrelationId)
+			return;
+		if (message.Result == ReadStreamResult.StreamDeleted) {
+			Failed($"Stream : {_streamId} is deleted. Cannot emit events to it");
+			return;
+		}
+
+		_pendingRequestCorrelationId = Guid.Empty;
+		_awaitingListEventsCompleted = false;
+
+		var newPhysicalStream = message.LastEventNumber == ExpectedVersion.NoStream;
+		_retrievedNextEventNumber = newPhysicalStream
+			? (message.StreamMetadata != null ? (message.StreamMetadata.TruncateBefore ?? 0) : 0)
+			: message.LastEventNumber + 1;
+
+		if (_lastCommittedOrSubmittedEventPosition == null) {
+			var parsed = default(CheckpointTagVersion);
+			if (!newPhysicalStream && message.Events is not []) {
+				parsed = message.Events[0].Event.Metadata.ParseCheckpointTagVersionExtraJson(_projectionVersion);
+				if (parsed.Tag == null) {
+					Failed(string.Format(
+						"The '{0}' stream managed by projection {1} has been written to from the outside.",
+						_streamId, _projectionVersion.ProjectionId));
+					return;
+				}
+
+				if (_projectionVersion.ProjectionId != parsed.Version.ProjectionId) {
+					Failed(
+						string.Format(
+							"Multiple projections emitting to the same stream detected.  Stream: '{0}'. Last event projection: '{1}'.  Emitting projection: '{2}'",
+							_streamId, parsed.Version.ProjectionId, _projectionVersion.ProjectionId));
+					return;
+				}
+			}
+
+			var newLogicalStream = newPhysicalStream
+								   || (_projectionVersion.ProjectionId != parsed.Version.ProjectionId ||
+									   _projectionVersion.Epoch > parsed.Version.Version);
+
+			_lastKnownEventNumber = newPhysicalStream ? ExpectedVersion.NoStream : message.LastEventNumber;
+
+			if (newLogicalStream) {
+				_lastCommittedOrSubmittedEventPosition = _zeroPosition;
+				_metadataStreamCreated = false;
+			} else {
+				//TODO: verify order - as we are reading backward
+				try {
+					_lastCommittedOrSubmittedEventPosition = parsed.AdjustBy(_positionTagger, _projectionVersion);
+					_metadataStreamCreated = true; // should exist or no need to create
+				} catch (NotSupportedException ex) {
+					Failed(ex.Message);
+				}
+			}
+		}
+
+		var stop = CollectAlreadyCommittedEvents(message, lastCheckpointPosition);
+
+		if (stop)
+			try {
+				SubmitWriteEventsInRecovery();
+			} catch (InvalidEmittedEventSequenceException ex) {
+				Failed(ex.Message);
+			}
+		else
+			SubmitListEvents(lastCheckpointPosition, message.NextEventNumber);
+	}
+
+	private bool CollectAlreadyCommittedEvents(
+		ClientMessage.ReadStreamEventsBackwardCompleted message, CheckpointTag lastCheckpointPosition) {
+		var stop = false;
+		foreach (var e in message.Events) {
+			var checkpointTagVersion = e.Event.Metadata.ParseCheckpointTagVersionExtraJson(_projectionVersion);
+			var ourEpoch = checkpointTagVersion.Version.ProjectionId == _projectionVersion.ProjectionId
+						   && checkpointTagVersion.Version.Version >= _projectionVersion.Epoch;
+
+			if (IsV1StreamCreatedEvent(e))
+				continue;
+
+			if (checkpointTagVersion.Tag == null) {
+				Failed(
+					string.Format(
+						"A unstamped event found. Stream: '{0}'. EventNumber: '{1}'", message.EventStreamId,
+						e.OriginalEventNumber));
+				return true;
+			}
+
+			var doStop = !ourEpoch;
+			if (!doStop) {
+				//NOTE: may need to compare with last pre-recorded event
+				//      but should not push to alreadyCommitted if source changed (must be at checkpoint)
+				var adjustedTag = checkpointTagVersion.AdjustBy(_positionTagger, _projectionVersion);
+				doStop = adjustedTag <= lastCheckpointPosition;
+			}
+
+			if (doStop)
+			// ignore any events prior to the requested lastCheckpointPosition (== first emitted event position)
+			{
+				stop = true;
+				break;
+			}
+
+			var eventType = e.Event.EventType;
+			_alreadyCommittedEvents.Push(Tuple.Create(checkpointTagVersion.Tag, eventType, e.Event.EventNumber));
+		}
+
+		return stop || message.IsEndOfStream;
+	}
+
+	private static bool IsV1StreamCreatedEvent(KurrentDB.Core.Data.ResolvedEvent e) {
+		return e.Link == null && e.OriginalEventNumber == 0
+							  && (e.OriginalEvent.EventType == SystemEventTypes.V1__StreamCreatedImplicit__
+								  || e.OriginalEvent.EventType == SystemEventTypes.V1__StreamCreated__);
+	}
+
+	private void ProcessWrites() {
+		if (_started && !_awaitingListEventsCompleted && !_awaitingWriteCompleted
+			&& !_awaitingMetadataWriteCompleted && _pendingWrites.Count > 0) {
+			if (_lastCommittedOrSubmittedEventPosition == null)
+				SubmitListEvents(_fromCheckpointPosition);
+			else
+				SubmitWriteEventsInRecovery();
+		}
+	}
+
+	private void SubmitListEvents(CheckpointTag upTo, long fromEventNumber = -1) {
+		if (_awaitingWriteCompleted || _awaitingMetadataWriteCompleted || _awaitingListEventsCompleted)
+			throw new Exception();
+		_awaitingListEventsCompleted = true;
+		_pendingRequestCorrelationId = Guid.NewGuid();
+		_ioDispatcher.ReadBackward(
+			_streamId, fromEventNumber, 1, resolveLinks: false, principal: SystemAccounts.System,
+			action: completed => ReadStreamEventsBackwardCompleted(completed, upTo),
+			corrId: _pendingRequestCorrelationId,
+			timeoutAction: CreateReadTimeoutAction(_pendingRequestCorrelationId, upTo, fromEventNumber));
+	}
+
+	private Action CreateReadTimeoutAction(Guid correlationId, CheckpointTag upTo, long fromEventNumber) {
+		return () => {
+			if (correlationId != _pendingRequestCorrelationId)
+				return;
+			_pendingRequestCorrelationId = Guid.Empty;
+			_awaitingListEventsCompleted = false;
+			SubmitListEvents(upTo, fromEventNumber);
+		};
+	}
+
+	private void SubmitWriteMetadata() {
+		if (_awaitingWriteCompleted || _awaitingMetadataWriteCompleted || _awaitingListEventsCompleted)
+			throw new Exception();
+		var streamAcl = _streamId.StartsWith("$")
+			? new StreamAcl(SystemRoles.All, null, null, SystemRoles.All, null)
+			: new StreamAcl((string)null, null, null, null, null);
+
+		var streamMetadata = new StreamMetadata(
+			_writerConfiguration.MaxCount, _writerConfiguration.MaxAge, acl: streamAcl,
+			truncateBefore: _retrievedNextEventNumber == 0 ? (long?)null : _retrievedNextEventNumber);
+
+		_submittedWriteMetaStreamEvent = new Event(
+			Guid.NewGuid(), SystemEventTypes.StreamMetadata, true, streamMetadata.ToJsonBytes(), null);
+
+		_awaitingMetadataWriteCompleted = true;
+
+		PublishWriteMetaStream(MaxRetryCount);
+	}
+
+	private void PublishWriteMetaStream(int retryCount) {
+		int attempt = MaxRetryCount - retryCount + 1;
+		var delayInSeconds = CalculateBackoffTimeSecs(attempt);
+		if (attempt >= MinAttemptWarnThreshold && _logger != null) {
+			_logger.Warning("Attempt: {attempt} to write events to stream {stream}. Backing off for {time} second(s).",
+				attempt,
+				_metadataStreamId,
+				delayInSeconds);
+		}
+
+		if (delayInSeconds == 0) {
+			_writerConfiguration.Writer.WriteEvents(
+				_metadataStreamId, ExpectedVersion.Any, new Event[] { _submittedWriteMetaStreamEvent }, _writeAs,
+				m => HandleMetadataWriteCompleted(m, retryCount));
+		} else {
+			_ioDispatcher.Delay(TimeSpan.FromSeconds(delayInSeconds),
+				_ => _writerConfiguration.Writer.WriteEvents(
+					_metadataStreamId, ExpectedVersion.Any, new Event[] { _submittedWriteMetaStreamEvent }, _writeAs,
+					m => HandleMetadataWriteCompleted(m, retryCount)));
+		}
+	}
+
+	private void HandleMetadataWriteCompleted(ClientMessage.WriteEventsCompleted message, int retryCount) {
+		if (!_awaitingMetadataWriteCompleted)
+			throw new InvalidOperationException("WriteEvents to metadata stream has not been submitted");
+		if (_disposed)
+			return;
+		if (message.Result == OperationResult.Success) {
+			_metadataStreamCreated = true;
+			_awaitingMetadataWriteCompleted = false;
+			PublishWriteEvents(MaxRetryCount);
+			return;
+		}
+
+		if (_logger != null) {
+			_logger.Information("Failed to write events to stream {stream}. Error: {e}",
+				_metadataStreamId,
+				Enum.GetName(typeof(OperationResult), message.Result));
+		}
+
+		switch (message.Result) {
+			case OperationResult.WrongExpectedVersion:
+				RequestRestart(string.Format("The '{0}' stream has been written to from the outside",
+					_metadataStreamId));
+				break;
+			case OperationResult.PrepareTimeout:
+			case OperationResult.ForwardTimeout:
+			case OperationResult.CommitTimeout:
+				if (retryCount > 0) {
+					PublishWriteMetaStream(--retryCount);
+				} else {
+					Failed(string.Format(
+						"Failed to write an events to {0}. Retry limit of {1} reached. Reason: {2}",
+						_metadataStreamId, MaxRetryCount, message.Result));
+				}
+
+				break;
+			default:
+				throw new NotSupportedException("Unsupported error code received");
+		}
+	}
+
+	private void SubmitWriteEvents() {
+		if (_awaitingWriteCompleted || _awaitingMetadataWriteCompleted || _awaitingListEventsCompleted)
+			throw new Exception();
+		if (!_metadataStreamCreated)
+			if (_lastCommittedOrSubmittedEventPosition != _zeroPosition)
+				throw new Exception("Internal error");
+		var events = new List<Event>();
+		var emittedEvents = new List<EmittedEvent>();
+		while (_pendingWrites.Count > 0 && events.Count < _maxWriteBatchLength) {
+			var e = _pendingWrites.Peek();
+			if (!e.IsReady()) {
+				_readyHandler.Handle(
+					new CoreProjectionProcessingMessage.EmittedStreamAwaiting(
+						_streamId, new SendToThisEnvelope(this)));
+				_awaitingReady = true;
+				break;
+			}
+
+			_pendingWrites.Dequeue();
+
+			var expectedTag = e.ExpectedTag;
+			var causedByTag = e.CausedByTag;
+			if (expectedTag != null)
+				if (DetectConcurrencyViolations(expectedTag)) {
+					RequestRestart(
+						string.Format(
+							"Wrong expected tag while submitting write event request to the '{0}' stream.  The last known stream tag is: '{1}'  the expected tag is: '{2}'",
+							_streamId, _lastCommittedOrSubmittedEventPosition, expectedTag));
+					return;
+				}
+
+			_lastCommittedOrSubmittedEventPosition = causedByTag;
+			try {
+				events.Add(
+					new Event(
+						e.EventId, e.EventType, e.IsJson, e.Data != null ? Helper.UTF8NoBom.GetBytes(e.Data) : null,
+						e.CausedByTag.ToJsonBytes(_projectionVersion, MetadataWithCausedByAndCorrelationId(e))));
+			} catch (ArgumentException ex) {
+				Failed(string.Format("Failed to write the event: {0} to stream: {1} failed. Reason: {2}.", e,
+					_streamId, ex.Message));
+				return;
+			}
+
+			emittedEvents.Add(e);
+		}
+
+		_submittedToWriteEvents = events.ToArray();
+		_submittedToWriteEmittedEvents = emittedEvents.ToArray();
+
+		if (_submittedToWriteEvents.Length > 0)
+			PublishWriteEvents(MaxRetryCount);
+	}
+
+	private IEnumerable<KeyValuePair<string, JToken>> MetadataWithCausedByAndCorrelationId(
+		EmittedEvent emittedEvent) {
+		var extraMetaData = emittedEvent.ExtraMetaData();
+		var correlationIdFound = false;
+		if (extraMetaData != null)
+			foreach (var valuePair in from pair in extraMetaData
+									  where pair.Key != "$causedBy"
+									  select pair) {
+				if (valuePair.Key == "$correlationId")
+					correlationIdFound = true;
+				yield return new KeyValuePair<string, JToken>(valuePair.Key, new JRaw(valuePair.Value));
+			}
+
+		if (emittedEvent.CausedBy != Guid.Empty)
+			yield return
+				new KeyValuePair<string, JToken>(
+					"$causedBy", JValue.CreateString(emittedEvent.CausedBy.ToString("D")));
+		if (!correlationIdFound && !string.IsNullOrEmpty(emittedEvent.CorrelationId))
+			yield return
+				new KeyValuePair<string, JToken>("$correlationId", JValue.CreateString(emittedEvent.CorrelationId));
+	}
+
+	private bool DetectConcurrencyViolations(CheckpointTag expectedTag) {
+		//NOTE: the comment below is not longer actual
+		//      Keeping it for reference only
+		//      We do back-read all the streams when loading state, so we know exactly which version to expect
+
+		//TODO: if the following statement is about event order stream - let write null event into this stream
+		//NOTE: the following condition is only meant to detect concurrency violations when
+		// another instance of the projection (running in the another node etc) has been writing to
+		// the same stream.  However, the expected tag sometimes can be greater than last actually written tag
+		// This happens when a projection is restarted from a checkpoint and the checkpoint has been made at
+		// position not updating the projection state
+		return expectedTag != _lastCommittedOrSubmittedEventPosition;
+	}
+
+	private void PublishWriteEvents(int retryCount) {
+		if (!_metadataStreamCreated) {
+			SubmitWriteMetadata();
+			return;
+		}
+
+		_awaitingWriteCompleted = true;
+		int attempt = MaxRetryCount - retryCount + 1;
+		var delayInSeconds = CalculateBackoffTimeSecs(attempt);
+		if (attempt >= MinAttemptWarnThreshold && _logger != null) {
+			_logger.Warning("Attempt: {attempt} to write events to stream {stream}. Backing off for {time} second(s).",
+				attempt,
+				_streamId,
+				delayInSeconds);
+		}
+
+		if (delayInSeconds == 0) {
+			_writerConfiguration.Writer.WriteEvents(
+				_streamId, _lastKnownEventNumber, _submittedToWriteEvents, _writeAs,
+				m => HandleWriteEventsCompleted(m, retryCount));
+		} else {
+			_ioDispatcher.Delay(TimeSpan.FromSeconds(delayInSeconds),
+				_ => _writerConfiguration.Writer.WriteEvents(
+					_streamId, _lastKnownEventNumber, _submittedToWriteEvents, _writeAs,
+					m => HandleWriteEventsCompleted(m, retryCount)));
+		}
+	}
+
+	private int CalculateBackoffTimeSecs(int attempt) {
+		attempt--;
+		if (attempt == 0)
+			return 0;
+		var expBackoff = attempt < 9 ? (1 << attempt) : 256;
+		return _random.Next(1, expBackoff + 1);
+	}
+
+	private void EnsureCheckpointNotRequested() {
+		if (_checkpointRequested)
+			throw new InvalidOperationException("Checkpoint requested");
+	}
+
+	private void EnsureStreamStarted() {
+		if (!_started)
+			throw new InvalidOperationException("Not started");
+	}
+
+	private void OnWriteCompleted() {
+		NotifyWriteCompleted();
+		ProcessWrites();
+		ProcessRequestedCheckpoint();
+	}
+
+	private void NotifyWriteCompleted() {
+		_readyHandler.Handle(new CoreProjectionProcessingMessage.EmittedStreamWriteCompleted(_streamId));
+	}
+
+	private void ProcessRequestedCheckpoint() {
+		if (_checkpointRequested && !_awaitingWriteCompleted && !_awaitingMetadataWriteCompleted
+			&& _pendingWrites.Count == 0) {
+			EnsureCheckpointsEnabled();
+			_readyHandler.Handle(new CoreProjectionProcessingMessage.ReadyForCheckpoint(this));
+		}
+	}
+
+	private void EnsureCheckpointsEnabled() {
+		if (_noCheckpoints)
+			throw new InvalidOperationException("Checkpoints disabled");
+	}
+
+	private void SubmitWriteEventsInRecovery() {
+		SubmitWriteEventsInRecoveryLoop(false);
+	}
+
+	private void SubmitWriteEventsInRecoveryLoop(bool anyFound) {
+		if (_awaitingLinkToResolution)
+			return;
+
+		while (_pendingWrites.Count > 0) {
+			var eventToWrite = _pendingWrites.Peek();
+			if (eventToWrite.CausedByTag > _lastCommittedOrSubmittedEventPosition ||
+				_alreadyCommittedEvents.Count == 0)
+				RecoveryCompleted();
+			if (_recoveryCompleted) {
+				if (anyFound)
+					NotifyWriteCompleted(); // unlock pending write-resolves if any
+				SubmitWriteEvents();
+				return;
+			}
+
+			var report = ValidateEmittedEventInRecoveryMode(eventToWrite);
+
+			if (report is IgnoredEmittedEvent) {
+				Log.Verbose($"Emitted event ignored because it links to an event that no longer exists: eventId: {eventToWrite.EventId}, eventType: {eventToWrite.EventId}, checkpoint: {eventToWrite.CorrelationId}, causedBy: {eventToWrite.CausedBy}");
+				continue;
+			}
+
+			if (report is ErroredEmittedEvent error)
+				throw error.Exception;
+
+			if (report is ValidEmittedEvent valid) {
+				anyFound = true;
+				NotifyEventCommitted(eventToWrite, valid.Revision);
+				_pendingWrites.Dequeue();
+			}
+
+			if (report is EmittedEventResolutionNeeded resolution) {
+				_awaitingLinkToResolution = true;
+				_ioDispatcher.ReadEvent(resolution.StreamId, resolution.Revision, _writeAs, resp => {
+					OnEmittedLinkEventResolved(anyFound, eventToWrite, resolution.TopCommitted, resp);
+				}, () => {
+					Log.Warning(
+						"Timed out reading original event for emitted event at revision {eventNumber} in stream '{streamName}'.",
+						resolution.Revision, resolution.StreamId);
+				}, Guid.NewGuid());
+				break;
+			}
+		}
+
+		if (_pendingWrites.Count == 0)
+			OnWriteCompleted();
+	}
+
+	private IValidatedEmittedEvent ValidateEmittedEventInRecoveryMode(EmittedEvent eventToWrite) {
+		var topAlreadyCommitted = _alreadyCommittedEvents.Pop();
+
+		if (topAlreadyCommitted.Item1 < eventToWrite.CausedByTag)
+			return new IgnoredEmittedEvent();
+
+		var failed = topAlreadyCommitted.Item1 != eventToWrite.CausedByTag ||
+					 topAlreadyCommitted.Item2 != eventToWrite.EventType;
+
+		if (failed && eventToWrite.EventType.Equals(LinkEventType)) {
+			// We check if the linked event still exists. If not, we skip that emitted event.
+			var parts = eventToWrite.Data.Split(LinkToSeparator, 2);
+			var streamId = parts[1];
+			if (!long.TryParse(parts[0], out long eventNumber))
+				throw new Exception($"Unexpected exception: Emitted event is an invalid link event: Body ({eventToWrite.Data}) CausedByTag ({eventToWrite.CausedByTag}) StreamId ({eventToWrite.StreamId})");
+
+			return new EmittedEventResolutionNeeded(streamId, eventNumber, topAlreadyCommitted);
+		}
+
+		if (failed) {
+			var error = CreateSequenceException(topAlreadyCommitted, eventToWrite);
+			return new ErroredEmittedEvent(error);
+		}
+
+		return new ValidEmittedEvent(topAlreadyCommitted.Item1, topAlreadyCommitted.Item2, topAlreadyCommitted.Item3);
+	}
+
+	// Used when we need to resolve a link event to see if it points to an event that no longer exists. If that
+	// event no longer exists, we skip it and resume the recovery process.
+	private void OnEmittedLinkEventResolved(bool anyFound, EmittedEvent eventToWrite, Tuple<CheckpointTag, string, long> topAlreadyCommitted, ClientMessage.ReadEventCompleted resp) {
+		if (resp.Result != ReadEventResult.StreamDeleted && resp.Result != ReadEventResult.NotFound && resp.Result != ReadEventResult.NoStream && resp.Result != ReadEventResult.Success) {
+			throw CreateSequenceException(topAlreadyCommitted, eventToWrite);
+		}
+
+		if (resp.Result == ReadEventResult.Success) {
+			anyFound = true;
+			NotifyEventCommitted(eventToWrite, topAlreadyCommitted.Item3);
+		} else {
+			Log.Verbose($"Emitted event ignored after resolution because it links to an event that no longer exists: eventId: {eventToWrite.EventId}, eventType: {eventToWrite.EventId}, checkpoint: {eventToWrite.CorrelationId}, causedBy: {eventToWrite.CausedBy}");
+		}
+		_pendingWrites.Dequeue();
+		_awaitingLinkToResolution = false;
+		SubmitWriteEventsInRecoveryLoop(anyFound);
+	}
+
+	private InvalidEmittedEventSequenceException CreateSequenceException(
+		Tuple<CheckpointTag, string, long> committed, EmittedEvent eventToWrite) {
+		return new InvalidEmittedEventSequenceException(
+			$"An event emitted in recovery for stream {_streamId} differs from the originally emitted event. Existing('{committed.Item2}', '{committed.Item1}'). New('{eventToWrite.EventType}', '{eventToWrite.CausedByTag}')"
+		);
+	}
+
+	private void RecoveryCompleted() {
+		_recoveryCompleted = true;
+	}
+
+	private static void NotifyEventsCommitted(EmittedEvent[] events, long firstEventNumber) {
+		var sequenceNumber = firstEventNumber;
+		foreach (var e in events)
+			NotifyEventCommitted(e, sequenceNumber++);
+	}
+
+	private static void NotifyEventCommitted(EmittedEvent @event, long eventNumber) {
+		if (@event.OnCommitted != null)
+			@event.OnCommitted(eventNumber);
+	}
+
+	public void Dispose() {
+		_disposed = true;
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.EmittedStreamWriteCompleted message) {
+		if (!_awaitingReady)
+			throw new InvalidOperationException("AwaitingReady state required");
+		ProcessWrites();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedStreamsDeleter.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedStreamsDeleter.cs
new file mode 100644
index 00000000000..be9926db7c9
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedStreamsDeleter.cs
@@ -0,0 +1,164 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.UserManagement;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting;
+
+public class EmittedStreamsDeleter : IEmittedStreamsDeleter {
+	private static readonly ILogger Log = Serilog.Log.ForContext<EmittedStreamsDeleter>();
+	private readonly IODispatcher _ioDispatcher;
+	private readonly int _checkPointThreshold = 4000;
+	private int _numberOfEventsProcessed = 0;
+	private const int RetryLimit = 3;
+	private int _retryCount = RetryLimit;
+	private readonly string _emittedStreamsId;
+	private readonly string _emittedStreamsCheckpointStreamId;
+
+	public EmittedStreamsDeleter(IODispatcher ioDispatcher, string emittedStreamsId,
+		string emittedStreamsCheckpointStreamId) {
+		_ioDispatcher = ioDispatcher;
+		_emittedStreamsId = emittedStreamsId;
+		_emittedStreamsCheckpointStreamId = emittedStreamsCheckpointStreamId;
+	}
+
+	public void DeleteEmittedStreams(Action onEmittedStreamsDeleted) {
+		_ioDispatcher.ReadBackward(_emittedStreamsCheckpointStreamId, -1, 1, false, SystemAccounts.System,
+			result => {
+				var deleteFromPosition = GetPositionToDeleteFrom(result);
+				DeleteEmittedStreamsFrom(deleteFromPosition, onEmittedStreamsDeleted);
+			},
+			() => DeleteEmittedStreams(onEmittedStreamsDeleted),
+			Guid.NewGuid());
+	}
+
+	private int GetPositionToDeleteFrom(ClientMessage.ReadStreamEventsBackwardCompleted onReadCompleted) {
+		int deleteFromPosition = 0;
+		if (onReadCompleted.Result is ReadStreamResult.Success) {
+			if (onReadCompleted.Events is not []) {
+				var checkpoint = onReadCompleted.Events
+					.Where(v => v.Event.EventType == ProjectionEventTypes.ProjectionCheckpoint).Select(x => x.Event)
+					.FirstOrDefault();
+				if (checkpoint != null) {
+					deleteFromPosition = checkpoint.Data.ParseJson<int>();
+				}
+			}
+		}
+
+		return deleteFromPosition;
+	}
+
+	private void DeleteEmittedStreamsFrom(long fromPosition, Action onEmittedStreamsDeleted) {
+		_ioDispatcher.ReadForward(_emittedStreamsId, fromPosition, 1, false, SystemAccounts.System,
+			x => ReadCompleted(x, onEmittedStreamsDeleted),
+			() => DeleteEmittedStreamsFrom(fromPosition, onEmittedStreamsDeleted),
+			Guid.NewGuid());
+	}
+
+	private void ReadCompleted(ClientMessage.ReadStreamEventsForwardCompleted onReadCompleted,
+		Action onEmittedStreamsDeleted) {
+		if (onReadCompleted.Result is ReadStreamResult.Success or ReadStreamResult.NoStream) {
+			if (onReadCompleted.Events is [] && !onReadCompleted.IsEndOfStream) {
+				DeleteEmittedStreamsFrom(onReadCompleted.NextEventNumber, onEmittedStreamsDeleted);
+				return;
+			}
+
+			if (onReadCompleted.Events is []) {
+				_ioDispatcher.DeleteStream(_emittedStreamsCheckpointStreamId, ExpectedVersion.Any, false,
+					SystemAccounts.System, x => {
+						// currently, WrongExpectedVersion is returned when deleting non-existing streams, even when specifying ExpectedVersion.Any.
+						// it is not too intuitive but changing the response would break the contract and compatibility with TCP/gRPC/web clients or require adding a new error code to all clients.
+						// note: we don't need to check if CurrentVersion == -1 here to make sure it's a non-existing stream since the deletion is done with ExpectedVersion.Any
+						if (x.Result == OperationResult.WrongExpectedVersion) {
+							// stream was never created
+							Log.Information("PROJECTIONS: Projection Stream '{stream}' was not deleted since it does not exist", _emittedStreamsCheckpointStreamId);
+						} else if (x.Result == OperationResult.Success || x.Result == OperationResult.StreamDeleted) {
+							Log.Information("PROJECTIONS: Projection Stream '{stream}' deleted",
+								_emittedStreamsCheckpointStreamId);
+						} else {
+							Log.Error("PROJECTIONS: Failed to delete projection stream '{stream}'. Reason: {e}",
+								_emittedStreamsCheckpointStreamId, x.Result);
+						}
+
+						_ioDispatcher.DeleteStream(_emittedStreamsId, ExpectedVersion.Any, false,
+							SystemAccounts.System, y => {
+								// currently, WrongExpectedVersion is returned when deleting non-existing streams, even when specifying ExpectedVersion.Any.
+								// it is not too intuitive but changing the response would break the contract and compatibility with TCP/gRPC/web clients or require adding a new error code to all clients.
+								// note: we don't need to check if CurrentVersion == -1 here to make sure it's a non-existing stream since the deletion is done with ExpectedVersion.Any
+								if (x.Result == OperationResult.WrongExpectedVersion) {
+									// stream was never created
+									Log.Information("PROJECTIONS: Projection Stream '{stream}' was not deleted since it does not exist", _emittedStreamsId);
+								} else if (y.Result == OperationResult.Success ||
+										   y.Result == OperationResult.StreamDeleted) {
+									Log.Information("PROJECTIONS: Projection Stream '{stream}' deleted",
+										_emittedStreamsId);
+								} else {
+									Log.Error(
+										"PROJECTIONS: Failed to delete projection stream '{stream}'. Reason: {e}",
+										_emittedStreamsId, y.Result);
+								}
+
+								onEmittedStreamsDeleted();
+							});
+					});
+			} else {
+				var streamId = Helper.UTF8NoBom.GetString(onReadCompleted.Events[0].Event.Data.Span);
+				_ioDispatcher.DeleteStream(streamId, ExpectedVersion.Any, false, SystemAccounts.System,
+					x => DeleteStreamCompleted(x, onEmittedStreamsDeleted, streamId,
+						onReadCompleted.Events[0].OriginalEventNumber));
+			}
+		}
+	}
+
+	private void DeleteStreamCompleted(ClientMessage.DeleteStreamCompleted deleteStreamCompleted,
+		Action onEmittedStreamsDeleted, string streamId, long eventNumber) {
+		if (deleteStreamCompleted.Result == OperationResult.Success ||
+			deleteStreamCompleted.Result == OperationResult.StreamDeleted) {
+			_retryCount = RetryLimit;
+			_numberOfEventsProcessed++;
+			if (_numberOfEventsProcessed >= _checkPointThreshold) {
+				_numberOfEventsProcessed = 0;
+				TryMarkCheckpoint(eventNumber);
+			}
+
+			DeleteEmittedStreamsFrom(eventNumber + 1, onEmittedStreamsDeleted);
+		} else {
+			if (_retryCount == 0) {
+				Log.Error(
+					"PROJECTIONS: Retry limit reached, could not delete stream: {stream}. Manual intervention is required and you may need to delete this stream manually",
+					streamId);
+				_retryCount = RetryLimit;
+				DeleteEmittedStreamsFrom(eventNumber + 1, onEmittedStreamsDeleted);
+				return;
+			}
+
+			Log.Error(
+				"PROJECTIONS: Failed to delete emitted stream {stream}, Retrying ({retryCount}/{maxRetryCount}). Reason: {reason}",
+				streamId, (RetryLimit - _retryCount) + 1, RetryLimit, deleteStreamCompleted.Result);
+			_retryCount--;
+			DeleteEmittedStreamsFrom(eventNumber, onEmittedStreamsDeleted);
+		}
+	}
+
+	private void TryMarkCheckpoint(long eventNumber) {
+		_ioDispatcher.WriteEvent(_emittedStreamsCheckpointStreamId, ExpectedVersion.Any,
+			new Event(Guid.NewGuid(), ProjectionEventTypes.PartitionCheckpoint, true, eventNumber.ToJson(), null),
+			SystemAccounts.System, x => {
+				if (x.Result == OperationResult.Success) {
+					Log.Debug("PROJECTIONS: Emitted Stream Deletion Checkpoint written at {eventNumber}",
+						eventNumber);
+				} else {
+					Log.Debug(
+						"PROJECTIONS: Emitted Stream Deletion Checkpoint Failed to be written at {eventNumber}",
+						eventNumber);
+				}
+			});
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedStreamsTracker.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedStreamsTracker.cs
new file mode 100644
index 00000000000..9524765773d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedStreamsTracker.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.Storage.ReaderIndex;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.Settings;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting;
+
+public class EmittedStreamsTracker : IEmittedStreamsTracker {
+	private static readonly ILogger Log = Serilog.Log.ForContext<EmittedStreamsTracker>();
+	private readonly IODispatcher _ioDispatcher;
+	private readonly ProjectionConfig _projectionConfig;
+	private readonly ProjectionNamesBuilder _projectionNamesBuilder;
+
+	private readonly BoundedCache<string, string> _streamIdCache = new BoundedCache<string, string>(int.MaxValue,
+		ESConsts.CommitedEventsMemCacheLimit, x => 16 + 4 + IntPtr.Size + 2 * x.Length);
+
+	private const int MaxRetryCount = 3;
+	private readonly object _locker = new object();
+
+	public EmittedStreamsTracker(IODispatcher ioDispatcher, ProjectionConfig projectionConfig,
+		ProjectionNamesBuilder projectionNamesBuilder) {
+		_ioDispatcher = ioDispatcher;
+		_projectionConfig = projectionConfig;
+		_projectionNamesBuilder = projectionNamesBuilder;
+	}
+
+	public void Initialize() {
+		ReadEmittedStreamStreamIdsIntoCache(0); //start from the beginning
+	}
+
+	private void ReadEmittedStreamStreamIdsIntoCache(long position) {
+		_ioDispatcher.ReadForward(_projectionNamesBuilder.GetEmittedStreamsName(), position, 1, false,
+			SystemAccounts.System, x => {
+				if (x.Events is not []) {
+					for (int i = 0; i < x.Events.Count; i++) {
+						var streamId = Helper.UTF8NoBom.GetString(x.Events[i].Event.Data.Span);
+						lock (_locker) {
+							_streamIdCache.PutRecord(streamId, streamId, false);
+						}
+					}
+				}
+
+				if (!x.IsEndOfStream) {
+					ReadEmittedStreamStreamIdsIntoCache(x.NextEventNumber);
+				}
+			}, () => {
+				Log.Error(
+					"Timed out reading emitted stream ids into cache from {streamName} at position {position}.",
+					_projectionNamesBuilder.GetEmittedStreamsName(), position);
+			}, Guid.NewGuid());
+	}
+
+	public void TrackEmittedStream(EmittedEvent[] emittedEvents) {
+		if (!_projectionConfig.TrackEmittedStreams)
+			return;
+		foreach (var emittedEvent in emittedEvents) {
+			string streamId;
+			if (!_streamIdCache.TryGetRecord(emittedEvent.StreamId, out streamId)) {
+				var trackEvent = new Event(Guid.NewGuid(), ProjectionEventTypes.StreamTracked, false,
+					Helper.UTF8NoBom.GetBytes(emittedEvent.StreamId), null);
+				lock (_locker) {
+					_streamIdCache.PutRecord(emittedEvent.StreamId, emittedEvent.StreamId, false);
+				}
+
+				WriteEvent(trackEvent, MaxRetryCount);
+			}
+		}
+	}
+
+	private void WriteEvent(Event evnt, int retryCount) {
+		_ioDispatcher.WriteEvent(_projectionNamesBuilder.GetEmittedStreamsName(), ExpectedVersion.Any, evnt,
+			SystemAccounts.System,
+			x => OnWriteComplete(x, evnt, Helper.UTF8NoBom.GetString(evnt.Data), retryCount));
+	}
+
+	private void OnWriteComplete(ClientMessage.WriteEventsCompleted completed, Event evnt, string streamId,
+		int retryCount) {
+		if (completed.Result != OperationResult.Success) {
+			if (retryCount > 0) {
+				WriteEvent(evnt, retryCount - 1);
+			} else {
+				Log.Error(
+					"PROJECTIONS: Failed to write a tracked stream id of {stream} to the {emittedStream} stream. Retry limit of {maxRetryCount} reached. Reason: {e}",
+					streamId, _projectionNamesBuilder.GetEmittedStreamsName(), MaxRetryCount, completed.Result);
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedStreamsWriter.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedStreamsWriter.cs
new file mode 100644
index 00000000000..32a9f7b1723
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/EmittedStreamsWriter.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting;
+
+public class EmittedStreamsWriter : IEmittedStreamsWriter {
+	private IODispatcher _ioDispatcher;
+
+	public EmittedStreamsWriter(IODispatcher ioDispatcher) {
+		_ioDispatcher = ioDispatcher;
+	}
+
+	public void WriteEvents(string streamId, long expectedVersion, Event[] events, ClaimsPrincipal writeAs,
+		Action<ClientMessage.WriteEventsCompleted> complete) {
+		_ioDispatcher.WriteEvents(streamId, expectedVersion, events, writeAs, complete);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/IEmittedStreamsDeleter.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/IEmittedStreamsDeleter.cs
new file mode 100644
index 00000000000..73909896a8c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/IEmittedStreamsDeleter.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting;
+
+public interface IEmittedStreamsDeleter {
+	void DeleteEmittedStreams(Action onEmittedStreamsDeleted);
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/IEmittedStreamsTracker.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/IEmittedStreamsTracker.cs
new file mode 100644
index 00000000000..389f866dad9
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/IEmittedStreamsTracker.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting;
+
+public interface IEmittedStreamsTracker {
+	void TrackEmittedStream(EmittedEvent[] emittedEvents);
+	void Initialize();
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/IEmittedStreamsWriter.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/IEmittedStreamsWriter.cs
new file mode 100644
index 00000000000..a944aea4b9b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/IEmittedStreamsWriter.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting;
+
+public interface IEmittedStreamsWriter {
+	void WriteEvents(string streamId, long expectedVersion, Event[] events, ClaimsPrincipal writeAs,
+		Action<ClientMessage.WriteEventsCompleted> complete);
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/IResultEventEmitter.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/IResultEventEmitter.cs
new file mode 100644
index 00000000000..78909a0c00e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/IResultEventEmitter.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting;
+
+public interface IResultEventEmitter {
+	EmittedEventEnvelope[] ResultUpdated(string partition, string result, CheckpointTag at);
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/InvalidEmittedEventSequenceException.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/InvalidEmittedEventSequenceException.cs
new file mode 100644
index 00000000000..b77f5100747
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/InvalidEmittedEventSequenceException.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting;
+
+class InvalidEmittedEventSequenceException : Exception {
+	public InvalidEmittedEventSequenceException(string message)
+		: base(message) {
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/NoopResultEventEmitter.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/NoopResultEventEmitter.cs
new file mode 100644
index 00000000000..1e79c62f52e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/NoopResultEventEmitter.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting;
+
+public class NoopResultEventEmitter : IResultEventEmitter {
+	public EmittedEventEnvelope[] ResultUpdated(string partition, string result, CheckpointTag at) {
+		throw new NotSupportedException("No results are expected from the projection");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/QueuedEmittedStreamsWriter.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/QueuedEmittedStreamsWriter.cs
new file mode 100644
index 00000000000..25ba1495661
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/QueuedEmittedStreamsWriter.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting;
+
+public class QueuedEmittedStreamsWriter : IEmittedStreamsWriter {
+	private IODispatcher _ioDispatcher;
+	private Guid _writeQueueId;
+
+	public QueuedEmittedStreamsWriter(IODispatcher ioDispatcher, Guid writeQueueId) {
+		_ioDispatcher = ioDispatcher;
+		_writeQueueId = writeQueueId;
+	}
+
+	public void WriteEvents(string streamId, long expectedVersion, Event[] events, ClaimsPrincipal writeAs,
+		Action<ClientMessage.WriteEventsCompleted> complete) {
+		_ioDispatcher.QueueWriteEvents(_writeQueueId, streamId, expectedVersion, events, writeAs, complete);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Emitting/ResultEventEmitter.cs b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/ResultEventEmitter.cs
new file mode 100644
index 00000000000..79e525782f5
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Emitting/ResultEventEmitter.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Emitting;
+
+public class ResultEventEmitter : IResultEventEmitter {
+	private readonly ProjectionNamesBuilder _namesBuilder;
+
+	private readonly EmittedStream.WriterConfiguration.StreamMetadata _resultStreamMetadata =
+		new EmittedStream.WriterConfiguration.StreamMetadata( /* TBD */);
+
+	public ResultEventEmitter(ProjectionNamesBuilder namesBuilder) {
+		if (namesBuilder == null)
+			throw new ArgumentNullException("namesBuilder");
+		_namesBuilder = namesBuilder;
+	}
+
+	public EmittedEventEnvelope[] ResultUpdated(string partition, string result, CheckpointTag at) {
+		return CreateResultUpdatedEvents(partition, result, at);
+	}
+
+	private EmittedEventEnvelope[] CreateResultUpdatedEvents(string partition, string projectionResult,
+		CheckpointTag at) {
+		var streamId = _namesBuilder.MakePartitionResultStreamName(partition);
+		var allResultsStreamId = _namesBuilder.GetResultStreamName();
+		if (string.IsNullOrEmpty(partition)) {
+			var result =
+				new EmittedEventEnvelope(
+					projectionResult == null
+						? new EmittedDataEvent(
+							streamId, Guid.NewGuid(), "ResultRemoved", true, null, null, at, null)
+						: new EmittedDataEvent(
+							streamId, Guid.NewGuid(), "Result", true, projectionResult, null, at, null),
+					_resultStreamMetadata);
+
+			return new[] { result };
+		} else {
+			var linkTo = new EmittedLinkTo(allResultsStreamId, Guid.NewGuid(), streamId, at, null);
+			var linkToEnvelope = new EmittedEventEnvelope(linkTo, _resultStreamMetadata);
+			var result =
+				new EmittedEventEnvelope(
+					projectionResult == null
+						? new EmittedDataEvent(
+							streamId, Guid.NewGuid(), "ResultRemoved", true, null, null, at, null,
+							linkTo.SetTargetEventNumber)
+						: new EmittedDataEvent(
+							streamId, Guid.NewGuid(), "Result", true, projectionResult, null, at, null,
+							linkTo.SetTargetEventNumber), _resultStreamMetadata);
+			return new[] { result, linkToEnvelope };
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventFilter.cs b/src/KurrentDB.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventFilter.cs
new file mode 100644
index 00000000000..496f4d5150a
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventFilter.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Services;
+
+namespace KurrentDB.Projections.Core.Services.Processing.EventByType;
+
+public class EventByTypeIndexEventFilter : EventFilter {
+	private readonly HashSet<string> _streams;
+
+	public EventByTypeIndexEventFilter(HashSet<string> events)
+		: base(false, false, events) {
+		_streams = new HashSet<string>(from eventType in events
+									   select "$et-" + eventType);
+	}
+
+	protected override bool DeletedNotificationPasses(string positionStreamId) {
+		return true;
+	}
+
+	public override bool PassesSource(bool resolvedFromLinkTo, string positionStreamId, string eventType) {
+		if (_streams.Contains(positionStreamId))
+			return true;
+		return !resolvedFromLinkTo && !SystemStreams.IsSystemStream(positionStreamId);
+	}
+
+	public override string GetCategory(string positionStreamId) {
+		return null;
+	}
+}
diff --git a/src/EventStore.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.IndexBased.cs b/src/KurrentDB.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.IndexBased.cs
similarity index 88%
rename from src/EventStore.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.IndexBased.cs
rename to src/KurrentDB.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.IndexBased.cs
index 81408b1ec9a..53f13c9a80e 100644
--- a/src/EventStore.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.IndexBased.cs
+++ b/src/KurrentDB.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.IndexBased.cs
@@ -1,21 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.AwakeReaderService;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Settings;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-
-namespace EventStore.Projections.Core.Services.Processing.EventByType;
-
-public partial class EventByTypeIndexEventReader
-{
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Settings;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+
+namespace KurrentDB.Projections.Core.Services.Processing.EventByType;
+
+public partial class EventByTypeIndexEventReader {
 	private class IndexBased : State,
 		IHandle<ClientMessage.ReadStreamEventsForwardCompleted>,
 		IHandle<ClientMessage.ReadStreamEventsBackwardCompleted>,
@@ -69,7 +71,7 @@ public void Handle(ClientMessage.ReadStreamEventsForwardCompleted message) {
 			//we may receive read replies in any order (we read multiple streams)
 			if (message.TfLastCommitPosition > _reader._lastPosition)
 				_reader._lastPosition = message.TfLastCommitPosition;
-			if (message.EventStreamId == "$et") {
+			if (message.EventStreamId is "$et") {
 				ReadIndexCheckpointStreamCompleted(message.Result, message.Events);
 				return;
 			}
@@ -78,7 +80,8 @@ public void Handle(ClientMessage.ReadStreamEventsForwardCompleted message) {
 				return;
 
 			lock (_lock) {
-				if (!_pendingRequests.Values.Any(x => x == message.CorrelationId)) return;
+				if (!_pendingRequests.Values.Any(x => x == message.CorrelationId))
+					return;
 			}
 
 			if (!_streamToEventType.ContainsKey(message.EventStreamId))
@@ -95,7 +98,7 @@ public void Handle(ClientMessage.ReadStreamEventsForwardCompleted message) {
 					break;
 				case ReadStreamResult.Success:
 					_reader.UpdateNextStreamPosition(message.EventStreamId, message.NextEventNumber);
-					_eofs[message.EventStreamId] = (message.Events.Length == 0) && message.IsEndOfStream;
+					_eofs[message.EventStreamId] = message.Events is [] && message.IsEndOfStream;
 					EnqueueEvents(message);
 					ProcessBuffersAndContinue(eventStreamId: message.EventStreamId);
 					break;
@@ -106,10 +109,13 @@ public void Handle(ClientMessage.ReadStreamEventsForwardCompleted message) {
 		}
 
 		public void Handle(ProjectionManagementMessage.Internal.ReadTimeout message) {
-			if (_disposed) return;
-			if (_reader.Paused) return;
+			if (_disposed)
+				return;
+			if (_reader.Paused)
+				return;
 			lock (_lock) {
-				if (!_pendingRequests.Values.Any(x => x == message.CorrelationId)) return;
+				if (!_pendingRequests.Values.Any(x => x == message.CorrelationId))
+					return;
 			}
 
 			if (message.StreamId == "$et") {
@@ -150,7 +156,7 @@ public void Handle(ClientMessage.ReadStreamEventsBackwardCompleted message) {
 		}
 
 		private void EnqueueEvents(ClientMessage.ReadStreamEventsForwardCompleted message) {
-			for (int index = 0; index < message.Events.Length; index++) {
+			for (int index = 0; index < message.Events.Count; index++) {
 				var @event = message.Events[index].Event;
 				var @link = message.Events[index].Link;
 				EventRecord positionEvent = (link ?? @event);
@@ -179,7 +185,7 @@ private bool BeforeTheLastKnownIndexCheckpoint(TFPos tfPosition) {
 		}
 
 		private void ReadIndexCheckpointStreamCompleted(
-			ReadStreamResult result, EventStore.Core.Data.ResolvedEvent[] events) {
+			ReadStreamResult result, IReadOnlyList<KurrentDB.Core.Data.ResolvedEvent> events) {
 			if (_disposed)
 				return;
 
@@ -195,7 +201,7 @@ private void ReadIndexCheckpointStreamCompleted(
 					ProcessBuffersAndContinue(null);
 					break;
 				case ReadStreamResult.Success:
-					if (events.Length == 0) {
+					if (events is []) {
 						_indexStreamEof = true;
 						if (_lastKnownIndexCheckpointPosition == null)
 							_lastKnownIndexCheckpointPosition = default(TFPos);
@@ -334,7 +340,7 @@ private void RequestEvents(string stream, bool delay) {
 
 			var readEventsForward = new ClientMessage.ReadStreamEventsForward(
 				corrId, corrId, new SendToThisEnvelope(this), stream,
-				_reader._fromPositions[stream], EventByTypeIndexEventReader.MaxReadCount, _reader._resolveLinkTos,
+				_reader._fromPositions[stream], MaxReadCount, _reader._resolveLinkTos,
 				false, null,
 				_readAs,
 				replyOnExpired: false);
@@ -347,7 +353,7 @@ private void RequestEvents(string stream, bool delay) {
 			_reader.PublishIORequest(delay, readEventsForward, timeoutMessage, corrId);
 		}
 
-		private void DeliverEventRetrievedByIndex(EventStore.Core.Data.ResolvedEvent pair, float progress,
+		private void DeliverEventRetrievedByIndex(KurrentDB.Core.Data.ResolvedEvent pair, float progress,
 			TFPos position) {
 			//TODO: add event sequence validation for inside the index stream
 			var resolvedEvent = new ResolvedEvent(pair, null);
@@ -375,13 +381,13 @@ private bool ShouldSwitch() {
 				return false;
 			Queue<PendingEvent> q;
 			var shouldSwitch = _lastKnownIndexCheckpointPosition != null
-			                   && _streamToEventType.Keys.All(
-				                   v =>
-					                   _eofs[v]
-					                   || _buffers.TryGetValue(v, out q) && q.Count > 0
-					                                                     &&
-					                                                     !BeforeTheLastKnownIndexCheckpoint(
-						                                                     q.Peek().TfPosition));
+							   && _streamToEventType.Keys.All(
+								   v =>
+									   _eofs[v]
+									   || _buffers.TryGetValue(v, out q) && q.Count > 0
+																		 &&
+																		 !BeforeTheLastKnownIndexCheckpoint(
+																			 q.Peek().TfPosition));
 			return shouldSwitch;
 		}
 	}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.PendingEvent.cs b/src/KurrentDB.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.PendingEvent.cs
new file mode 100644
index 00000000000..905599e91e7
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.PendingEvent.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Data;
+
+namespace KurrentDB.Projections.Core.Services.Processing.EventByType;
+
+public partial class EventByTypeIndexEventReader {
+	private class PendingEvent {
+		public readonly KurrentDB.Core.Data.ResolvedEvent ResolvedEvent;
+		public readonly float Progress;
+		public readonly TFPos TfPosition;
+
+		public PendingEvent(KurrentDB.Core.Data.ResolvedEvent resolvedEvent, TFPos tfPosition, float progress) {
+			ResolvedEvent = resolvedEvent;
+			Progress = progress;
+			TfPosition = tfPosition;
+		}
+	}
+}
diff --git a/src/EventStore.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.State.cs b/src/KurrentDB.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.State.cs
similarity index 82%
rename from src/EventStore.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.State.cs
rename to src/KurrentDB.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.State.cs
index a2f04e42992..fee4c72b29c 100644
--- a/src/EventStore.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.State.cs
+++ b/src/KurrentDB.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.State.cs
@@ -1,13 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Security.Claims;
-using EventStore.Core.Data;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Standard;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Standard;
 
-namespace EventStore.Projections.Core.Services.Processing.EventByType;
+namespace KurrentDB.Projections.Core.Services.Processing.EventByType;
 
-public partial class EventByTypeIndexEventReader
-{
+public partial class EventByTypeIndexEventReader {
 	private abstract class State : IDisposable {
 		public abstract void RequestEvents();
 		public abstract bool AreEventsRequested();
@@ -22,7 +24,7 @@ protected State(EventByTypeIndexEventReader reader, ClaimsPrincipal readAs) {
 		}
 
 		protected void DeliverEvent(float progress, ResolvedEvent resolvedEvent, TFPos position,
-			EventStore.Core.Data.ResolvedEvent pair) {
+			KurrentDB.Core.Data.ResolvedEvent pair) {
 			if (resolvedEvent.EventOrLinkTargetPosition <= _reader._lastEventPosition)
 				return;
 			_reader._lastEventPosition = resolvedEvent.EventOrLinkTargetPosition;
diff --git a/src/EventStore.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.TfBased.cs b/src/KurrentDB.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.TfBased.cs
similarity index 85%
rename from src/EventStore.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.TfBased.cs
rename to src/KurrentDB.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.TfBased.cs
index f4a6eefeea6..a3709633621 100644
--- a/src/EventStore.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.TfBased.cs
+++ b/src/KurrentDB.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.TfBased.cs
@@ -1,19 +1,21 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
-using EventStore.Core.Bus;
-using EventStore.Core.Data;
-using EventStore.Core.Messages;
-using EventStore.Core.Messaging;
-using EventStore.Core.Services.TimerService;
-using EventStore.Core.Settings;
-using EventStore.Projections.Core.Messages;
-
-namespace EventStore.Projections.Core.Services.Processing.EventByType;
-
-public partial class EventByTypeIndexEventReader
-{
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Settings;
+using KurrentDB.Projections.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Services.Processing.EventByType;
+
+public partial class EventByTypeIndexEventReader {
 	private class TfBased : State,
 		IHandle<ClientMessage.ReadAllEventsForwardCompleted>,
 		IHandle<ProjectionManagementMessage.Internal.ReadTimeout> {
@@ -58,7 +60,7 @@ public void Handle(ClientMessage.ReadAllEventsForwardCompleted message) {
 			_tfEventsRequested = false;
 			switch (message.Result) {
 				case ReadAllResult.Success:
-					var eof = message.Events.Length == 0;
+					var eof = message.Events is [];
 					_eof = eof;
 					var willDispose = _reader._stopOnEof && eof;
 					_fromTfPosition = message.NextPos;
@@ -87,7 +89,7 @@ public void Handle(ClientMessage.ReadAllEventsForwardCompleted message) {
 								_reader.UpdateNextStreamPosition(link.EventStreamId, link.EventNumber + 1);
 								// recover unresolved link event
 								var unresolvedLinkEvent =
-									EventStore.Core.Data.ResolvedEvent.ForUnresolvedEvent(link,
+									KurrentDB.Core.Data.ResolvedEvent.ForUnresolvedEvent(link,
 										originalTfPosition.CommitPosition);
 								DeliverEventRetrievedFromTf(
 									unresolvedLinkEvent, 100.0f * link.LogPosition / message.TfLastCommitPosition,
@@ -111,9 +113,12 @@ public void Handle(ClientMessage.ReadAllEventsForwardCompleted message) {
 		}
 
 		public void Handle(ProjectionManagementMessage.Internal.ReadTimeout message) {
-			if (_disposed) return;
-			if (_reader.Paused) return;
-			if (message.CorrelationId != _pendingRequestCorrelationId) return;
+			if (_disposed)
+				return;
+			if (_reader.Paused)
+				return;
+			if (message.CorrelationId != _pendingRequestCorrelationId)
+				return;
 
 			_tfEventsRequested = false;
 			_reader.PauseOrContinueProcessing();
@@ -134,7 +139,7 @@ private void RequestTfEvents(bool delay) {
 				_pendingRequestCorrelationId, _pendingRequestCorrelationId, new SendToThisEnvelope(this),
 				_fromTfPosition.CommitPosition,
 				_fromTfPosition.PreparePosition == -1 ? 0 : _fromTfPosition.PreparePosition,
-				EventByTypeIndexEventReader.MaxReadCount,
+				MaxReadCount,
 				true, false, null, _readAs, replyOnExpired: false);
 
 			var timeoutMessage = TimerMessage.Schedule.Create(
@@ -155,7 +160,7 @@ private void DeliverLastCommitPosition(TFPos lastPosition) {
 			//TODO: check was is passed here
 		}
 
-		private void DeliverEventRetrievedFromTf(EventStore.Core.Data.ResolvedEvent pair, float progress,
+		private void DeliverEventRetrievedFromTf(KurrentDB.Core.Data.ResolvedEvent pair, float progress,
 			TFPos position) {
 			var resolvedEvent = new ResolvedEvent(pair, null);
 
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.cs b/src/KurrentDB.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.cs
new file mode 100644
index 00000000000..fa5b75a31fc
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/EventByType/EventByTypeIndexEventReader.cs
@@ -0,0 +1,122 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+
+namespace KurrentDB.Projections.Core.Services.Processing.EventByType;
+
+public partial class EventByTypeIndexEventReader : EventReader {
+	public const int MaxReadCount = 50;
+	private readonly HashSet<string> _eventTypes;
+	private readonly bool _resolveLinkTos;
+	private readonly bool _includeDeletedStreamNotification;
+	private readonly ITimeProvider _timeProvider;
+
+	private State _state;
+	private TFPos _lastEventPosition;
+	private readonly Dictionary<string, long> _fromPositions;
+	private readonly Dictionary<string, string> _streamToEventType;
+	private long _lastPosition;
+
+	public EventByTypeIndexEventReader(
+		IPublisher publisher,
+		Guid eventReaderCorrelationId,
+		ClaimsPrincipal readAs,
+		string[] eventTypes,
+		bool includeDeletedStreamNotification,
+		TFPos fromTfPosition,
+		Dictionary<string, long> fromPositions,
+		bool resolveLinkTos,
+		ITimeProvider timeProvider,
+		bool stopOnEof = false)
+		: base(publisher, eventReaderCorrelationId, readAs, stopOnEof) {
+		if (eventTypes == null)
+			throw new ArgumentNullException("eventTypes");
+		if (timeProvider == null)
+			throw new ArgumentNullException("timeProvider");
+		if (eventTypes.Length == 0)
+			throw new ArgumentException("empty", "eventTypes");
+
+		_includeDeletedStreamNotification = includeDeletedStreamNotification;
+		_timeProvider = timeProvider;
+		_eventTypes = new HashSet<string>(eventTypes);
+		if (includeDeletedStreamNotification)
+			_eventTypes.Add("$deleted");
+		_streamToEventType = eventTypes.ToDictionary(v => "$et-" + v, v => v);
+		_lastEventPosition = fromTfPosition;
+		_resolveLinkTos = resolveLinkTos;
+
+		ValidateTag(fromPositions);
+
+		_fromPositions = fromPositions;
+		_state = new IndexBased(_eventTypes, this, readAs);
+	}
+
+	private void ValidateTag(Dictionary<string, long> fromPositions) {
+		if (_eventTypes.Count != fromPositions.Count)
+			throw new ArgumentException("Number of streams does not match", "fromPositions");
+
+		foreach (var stream in _streamToEventType.Keys.Where(stream => !fromPositions.ContainsKey(stream))) {
+			throw new ArgumentException(
+				String.Format("The '{0}' stream position has not been set", stream), "fromPositions");
+		}
+	}
+
+
+	public override void Dispose() {
+		_state.Dispose();
+		base.Dispose();
+	}
+
+	protected override void RequestEvents() {
+		if (_disposed || PauseRequested || Paused)
+			return;
+		_state.RequestEvents();
+	}
+
+	protected override bool AreEventsRequested() {
+		return _state.AreEventsRequested();
+	}
+
+	private void PublishIORequest(bool delay, Message readEventsForward, Message timeoutMessage,
+		Guid correlationId) {
+		if (delay) {
+			_publisher.Publish(
+				new AwakeServiceMessage.SubscribeAwake(
+					_publisher, correlationId, null,
+					new TFPos(_lastPosition, _lastPosition), readEventsForward));
+		} else {
+			_publisher.Publish(readEventsForward);
+			_publisher.Publish(timeoutMessage);
+		}
+	}
+
+	private void UpdateNextStreamPosition(string eventStreamId, long nextPosition) {
+		long streamPosition;
+		if (!_fromPositions.TryGetValue(eventStreamId, out streamPosition))
+			streamPosition = -1;
+		if (nextPosition > streamPosition)
+			_fromPositions[eventStreamId] = nextPosition;
+	}
+
+	private void DoSwitch(TFPos lastKnownIndexCheckpointPosition) {
+		if (Paused || PauseRequested || _disposed)
+			throw new InvalidOperationException("_paused || _pauseRequested || _disposed");
+
+		// skip reading TF up to last know index checkpoint position
+		// as we could only gethere if there is no more indexed events before this point
+		if (lastKnownIndexCheckpointPosition > _lastEventPosition)
+			_lastEventPosition = lastKnownIndexCheckpointPosition;
+
+		_state = new TfBased(_timeProvider, this, _lastEventPosition, this._publisher, ReadAs);
+		_state.RequestEvents();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/EventByType/EventByTypeIndexPositionTagger.cs b/src/KurrentDB.Projections.Core/Services/Processing/EventByType/EventByTypeIndexPositionTagger.cs
new file mode 100644
index 00000000000..d30d2c86f91
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/EventByType/EventByTypeIndexPositionTagger.cs
@@ -0,0 +1,136 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.Services.Processing.EventByType;
+
+public class EventByTypeIndexPositionTagger : PositionTagger {
+	private readonly HashSet<string> _streams;
+	private readonly HashSet<string> _eventTypes;
+	private readonly Dictionary<string, string> _streamToEventType;
+
+	public EventByTypeIndexPositionTagger(
+		int phase, string[] eventTypes, bool includeStreamDeletedNotification = false)
+		: base(phase) {
+		if (eventTypes == null)
+			throw new ArgumentNullException("eventTypes");
+		if (eventTypes.Length == 0)
+			throw new ArgumentException("eventTypes");
+		_eventTypes = new HashSet<string>(eventTypes);
+		if (includeStreamDeletedNotification)
+			_eventTypes.Add("$deleted");
+		_streams = new HashSet<string>(from eventType in eventTypes
+									   select "$et-" + eventType);
+		_streamToEventType = eventTypes.ToDictionary(v => "$et-" + v, v => v);
+	}
+
+	public override bool IsMessageAfterCheckpointTag(
+		CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
+		if (previous.Phase < Phase)
+			return true;
+		if (previous.Mode_ != CheckpointTag.Mode.EventTypeIndex)
+			throw new ArgumentException("Mode.EventTypeIndex expected", "previous");
+		if (committedEvent.Data.EventOrLinkTargetPosition.CommitPosition <= 0)
+			throw new ArgumentException("complete TF position required", "committedEvent");
+
+		return committedEvent.Data.EventOrLinkTargetPosition > previous.Position;
+	}
+
+	public override CheckpointTag MakeCheckpointTag(
+		CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
+		if (previous.Phase != Phase)
+			throw new ArgumentException(
+				string.Format("Invalid checkpoint tag phase.  Expected: {0} Was: {1}", Phase, previous.Phase));
+
+		if (committedEvent.Data.EventOrLinkTargetPosition < previous.Position)
+			throw new InvalidOperationException(
+				string.Format(
+					"Cannot make a checkpoint tag at earlier position. '{0}' < '{1}'",
+					committedEvent.Data.EventOrLinkTargetPosition, previous.Position));
+		var byIndex = _streams.Contains(committedEvent.Data.PositionStreamId);
+		return byIndex
+			? previous.UpdateEventTypeIndexPosition(
+				committedEvent.Data.EventOrLinkTargetPosition,
+				_streamToEventType[committedEvent.Data.PositionStreamId],
+				committedEvent.Data.PositionSequenceNumber)
+			: previous.UpdateEventTypeIndexPosition(committedEvent.Data.EventOrLinkTargetPosition);
+	}
+
+	public override CheckpointTag MakeCheckpointTag(CheckpointTag previous,
+		ReaderSubscriptionMessage.EventReaderPartitionEof partitionEof) {
+		throw new NotImplementedException();
+	}
+
+	public override CheckpointTag MakeCheckpointTag(
+		CheckpointTag previous, ReaderSubscriptionMessage.EventReaderPartitionDeleted partitionDeleted) {
+		if (previous.Phase != Phase)
+			throw new ArgumentException(
+				string.Format("Invalid checkpoint tag phase.  Expected: {0} Was: {1}", Phase, previous.Phase));
+
+		if (partitionDeleted.DeleteEventOrLinkTargetPosition < previous.Position)
+			throw new InvalidOperationException(
+				string.Format(
+					"Cannot make a checkpoint tag at earlier position. '{0}' < '{1}'",
+					partitionDeleted.DeleteEventOrLinkTargetPosition, previous.Position));
+		var byIndex = _streams.Contains(partitionDeleted.PositionStreamId);
+		//TODO: handle invalid partition deleted messages without required values
+		return byIndex
+			? previous.UpdateEventTypeIndexPosition(
+				partitionDeleted.DeleteEventOrLinkTargetPosition.Value,
+				_streamToEventType[partitionDeleted.PositionStreamId],
+				partitionDeleted.PositionEventNumber.Value)
+			: previous.UpdateEventTypeIndexPosition(partitionDeleted.DeleteEventOrLinkTargetPosition.Value);
+	}
+
+	public override CheckpointTag MakeZeroCheckpointTag() {
+		return CheckpointTag.FromEventTypeIndexPositions(
+			Phase, new TFPos(0, -1), _eventTypes.ToDictionary(v => v, v => ExpectedVersion.NoStream));
+	}
+
+	public override bool IsCompatible(CheckpointTag checkpointTag) {
+		//TODO: should Stream be supported here as well if in the set?
+		return checkpointTag.Mode_ == CheckpointTag.Mode.EventTypeIndex
+			   && checkpointTag.Streams.All(v => _eventTypes.Contains(v.Key));
+	}
+
+	public override CheckpointTag AdjustTag(CheckpointTag tag) {
+		if (tag.Phase < Phase)
+			return tag;
+		if (tag.Phase > Phase)
+			throw new ArgumentException(
+				string.Format("Invalid checkpoint tag phase.  Expected less or equal to: {0} Was: {1}", Phase,
+					tag.Phase), "tag");
+
+		if (tag.Mode_ == CheckpointTag.Mode.EventTypeIndex) {
+			long p;
+			return CheckpointTag.FromEventTypeIndexPositions(
+				tag.Phase, tag.Position,
+				_eventTypes.ToDictionary(v => v, v => tag.Streams.TryGetValue(v, out p) ? p : -1));
+		}
+
+		switch (tag.Mode_) {
+			case CheckpointTag.Mode.MultiStream:
+				throw new NotSupportedException(
+					"Conversion from MultiStream to EventTypeIndex position tag is not supported");
+			case CheckpointTag.Mode.Stream:
+				throw new NotSupportedException(
+					"Conversion from Stream to EventTypeIndex position tag is not supported");
+			case CheckpointTag.Mode.PreparePosition:
+				throw new NotSupportedException(
+					"Conversion from PreparePosition to EventTypeIndex position tag is not supported");
+			case CheckpointTag.Mode.Position:
+				return CheckpointTag.FromEventTypeIndexPositions(
+					tag.Phase, tag.Position, _eventTypes.ToDictionary(v => v, v => (long)-1));
+			default:
+				throw new NotSupportedException(string.Format(
+					"The given checkpoint is invalid. Possible causes might include having written an event to the projection's managed stream. The bad checkpoint: {0}",
+					tag.ToString()));
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/EventFilter.cs b/src/KurrentDB.Projections.Core/Services/Processing/EventFilter.cs
new file mode 100644
index 00000000000..7eef938e38a
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/EventFilter.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Projections.Core.Services.Processing;
+
+public abstract class EventFilter {
+	private readonly bool _allEvents;
+	private readonly bool _includeDeletedStreamEvents;
+	private readonly HashSet<string> _events;
+
+	/// <summary>
+	///
+	/// </summary>
+	/// <param name="allEvents"></param>
+	/// <param name="includeDeletedStreamEvents">indicates whether non-link stream tombstone or
+	/// metastream stream deleted events should be included. Links resolved into metastream
+	/// stream deleted events are not restricted</param>
+	/// <param name="events"></param>
+	protected EventFilter(bool allEvents, bool includeDeletedStreamEvents, HashSet<string> events) {
+		_allEvents = allEvents;
+		_includeDeletedStreamEvents = includeDeletedStreamEvents;
+		_events = events;
+	}
+
+	public bool Passes(
+		bool resolvedFromLinkTo, string eventStreamId, string eventName, bool isStreamDeletedEvent = false) {
+		return (PassesSource(resolvedFromLinkTo, eventStreamId, eventName))
+			   && ((_allEvents || _events != null && _events.Contains(eventName))
+				   && (!isStreamDeletedEvent || _includeDeletedStreamEvents));
+	}
+
+	public bool PassesValidation(bool isJson, ReadOnlyMemory<byte> data) {
+		return !isJson || data.IsValidUtf8Json();
+	}
+
+	protected abstract bool DeletedNotificationPasses(string positionStreamId);
+	public abstract bool PassesSource(bool resolvedFromLinkTo, string positionStreamId, string eventType);
+	public abstract string GetCategory(string positionStreamId);
+
+	public bool PassesDeleteNotification(string positionStreamId) {
+		return !_includeDeletedStreamEvents && DeletedNotificationPasses(positionStreamId);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/EventProcessedResult.cs b/src/KurrentDB.Projections.Core/Services/Processing/EventProcessedResult.cs
new file mode 100644
index 00000000000..6c6f5b2f39b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/EventProcessedResult.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+
+namespace KurrentDB.Projections.Core.Services.Processing;
+
+public class EventProcessedResult {
+	private readonly EmittedEventEnvelope[] _emittedEvents;
+	private readonly PartitionState _oldState;
+	private readonly PartitionState _newState;
+	private readonly PartitionState _oldSharedState;
+	private readonly PartitionState _newSharedState;
+	private readonly string _partition;
+	private readonly CheckpointTag _checkpointTag;
+	private readonly Guid _causedBy;
+	private readonly string _correlationId;
+	private readonly bool _isPartitionTombstone;
+
+	public EventProcessedResult(
+		string partition, CheckpointTag checkpointTag, PartitionState oldState, PartitionState newState,
+		PartitionState oldSharedState, PartitionState newSharedState, EmittedEventEnvelope[] emittedEvents,
+		Guid causedBy, string correlationId, bool isPartitionTombstone = false) {
+		if (partition == null)
+			throw new ArgumentNullException("partition");
+		if (checkpointTag == null)
+			throw new ArgumentNullException("checkpointTag");
+		_emittedEvents = emittedEvents;
+		_causedBy = causedBy;
+		_correlationId = correlationId;
+		_isPartitionTombstone = isPartitionTombstone;
+		_oldState = oldState;
+		_newState = newState;
+		_oldSharedState = oldSharedState;
+		_newSharedState = newSharedState;
+		_partition = partition;
+		_checkpointTag = checkpointTag;
+	}
+
+	public EmittedEventEnvelope[] EmittedEvents {
+		get { return _emittedEvents; }
+	}
+
+	public PartitionState OldState {
+		get { return _oldState; }
+	}
+
+	/// <summary>
+	/// null - means no state change
+	/// </summary>
+	public PartitionState NewState {
+		get { return _newState; }
+	}
+
+	public PartitionState OldSharedState {
+		get { return _oldSharedState; }
+	}
+
+	/// <summary>
+	/// null - means no state change
+	/// </summary>
+	public PartitionState NewSharedState {
+		get { return _newSharedState; }
+	}
+
+	public string Partition {
+		get { return _partition; }
+	}
+
+	public CheckpointTag CheckpointTag {
+		get { return _checkpointTag; }
+	}
+
+	public Guid CausedBy {
+		get { return _causedBy; }
+	}
+
+	public string CorrelationId {
+		get { return _correlationId; }
+	}
+
+	public bool IsPartitionTombstone {
+		get { return _isPartitionTombstone; }
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/EventReader.cs b/src/KurrentDB.Projections.Core/Services/Processing/EventReader.cs
new file mode 100644
index 00000000000..2256a426ace
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/EventReader.cs
@@ -0,0 +1,145 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.Services.Processing;
+
+public abstract class EventReader : IEventReader {
+	protected readonly Guid EventReaderCorrelationId;
+	private readonly ClaimsPrincipal _readAs;
+	protected readonly IPublisher _publisher;
+
+	protected readonly bool _stopOnEof;
+	private bool _paused = true;
+	private bool _pauseRequested = true;
+	protected bool _disposed;
+	private bool _startingSent;
+
+	protected EventReader(IPublisher publisher, Guid eventReaderCorrelationId, ClaimsPrincipal readAs, bool stopOnEof) {
+		if (publisher == null)
+			throw new ArgumentNullException("publisher");
+		if (eventReaderCorrelationId == Guid.Empty)
+			throw new ArgumentException("eventReaderCorrelationId");
+		_publisher = publisher;
+		EventReaderCorrelationId = eventReaderCorrelationId;
+		_readAs = readAs;
+		_stopOnEof = stopOnEof;
+	}
+
+	protected bool PauseRequested {
+		get { return _pauseRequested; }
+	}
+
+	protected bool Paused {
+		get { return _paused; }
+	}
+
+	protected ClaimsPrincipal ReadAs {
+		get { return _readAs; }
+	}
+
+	public void Resume() {
+		if (_disposed)
+			throw new InvalidOperationException("Disposed");
+		if (!_pauseRequested)
+			throw new InvalidOperationException("Is not paused");
+		if (!_paused) {
+			_pauseRequested = false;
+			return;
+		}
+
+		_paused = false;
+		_pauseRequested = false;
+		//            _logger.Trace("Resuming event distribution {eventReaderCorrelationId} at '{at}'", EventReaderCorrelationId, FromAsText());
+		RequestEvents();
+	}
+
+	public void Pause() {
+		if (_disposed)
+			return; // due to possible self disposed
+
+		if (_pauseRequested)
+			throw new InvalidOperationException("Pause has been already requested");
+		_pauseRequested = true;
+		if (!AreEventsRequested())
+			_paused = true;
+		//            _logger.Trace("Pausing event distribution {eventReaderCorrelationId} at '{at}'", EventReaderCorrelationId, FromAsText());
+	}
+
+	public virtual void Dispose() {
+		_disposed = true;
+	}
+
+	protected abstract bool AreEventsRequested();
+	protected abstract void RequestEvents();
+
+	protected void SendEof() {
+		if (_stopOnEof) {
+			_publisher.Publish(new ReaderSubscriptionMessage.EventReaderEof(EventReaderCorrelationId));
+			Dispose();
+		}
+	}
+
+	protected void SendPartitionEof(string partition, CheckpointTag preTagged) {
+		if (_disposed)
+			return;
+		_publisher.Publish(
+			new ReaderSubscriptionMessage.EventReaderPartitionEof(EventReaderCorrelationId, partition, preTagged));
+	}
+
+	protected void SendPartitionDeleted_WhenReadingDataStream(
+		string partition, long? lastEventNumber, TFPos? deletedLinkOrEventPosition, TFPos? deletedEventPosition,
+		string positionStreamId,
+		int? positionEventNumber, CheckpointTag preTagged = null) {
+		if (_disposed)
+			return;
+		_publisher.Publish(
+			new ReaderSubscriptionMessage.EventReaderPartitionDeleted(
+				EventReaderCorrelationId, partition, lastEventNumber, deletedLinkOrEventPosition,
+				deletedEventPosition, positionStreamId, positionEventNumber, preTagged));
+	}
+
+	public void SendNotAuthorized() {
+		if (_disposed)
+			return;
+		_publisher.Publish(new ReaderSubscriptionMessage.EventReaderNotAuthorized(EventReaderCorrelationId));
+		Dispose();
+	}
+
+	protected static long? GetLastCommitPositionFrom(ClientMessage.ReadStreamEventsForwardCompleted msg) {
+		return (msg.IsEndOfStream
+				|| msg.Result == ReadStreamResult.NoStream
+				|| msg.Result == ReadStreamResult.StreamDeleted)
+			? (msg.TfLastCommitPosition == -1 ? (long?)null : msg.TfLastCommitPosition)
+			: (long?)null;
+	}
+
+	protected void PauseOrContinueProcessing() {
+		if (_disposed)
+			return;
+		if (_pauseRequested)
+			_paused = !AreEventsRequested();
+		else
+			RequestEvents();
+	}
+
+	private void SendStarting(long startingLastCommitPosition) {
+		_publisher.Publish(
+			new ReaderSubscriptionMessage.EventReaderStarting(EventReaderCorrelationId,
+				startingLastCommitPosition));
+	}
+
+	protected void NotifyIfStarting(long startingLastCommitPosition) {
+		if (!_startingSent) {
+			_startingSent = true;
+			SendStarting(startingLastCommitPosition);
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/EventReaderCoreService.cs b/src/KurrentDB.Projections.Core/Services/Processing/EventReaderCoreService.cs
new file mode 100644
index 00000000000..6a80c357d23
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/EventReaderCoreService.cs
@@ -0,0 +1,369 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Core.TransactionLog.Checkpoint;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+using Serilog;
+using HeadingEventReader = KurrentDB.Projections.Core.Services.Processing.TransactionFile.HeadingEventReader;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Projections.Core.Services.Processing;
+
+public class EventReaderCoreService :
+	IHandle<ReaderCoreServiceMessage.StartReader>,
+	IHandle<ReaderCoreServiceMessage.StopReader>,
+	IHandle<ReaderSubscriptionManagement.Subscribe>,
+	IHandle<ReaderSubscriptionManagement.Unsubscribe>,
+	IHandle<ReaderSubscriptionManagement.Pause>,
+	IHandle<ReaderSubscriptionManagement.Resume>,
+	IHandle<ReaderSubscriptionMessage.CommittedEventDistributed>,
+	IHandle<ReaderSubscriptionMessage.EventReaderIdle>,
+	IHandle<ReaderSubscriptionMessage.EventReaderStarting>,
+	IHandle<ReaderSubscriptionMessage.EventReaderNotAuthorized>,
+	IHandle<ReaderSubscriptionMessage.EventReaderEof>,
+	IHandle<ReaderSubscriptionMessage.EventReaderPartitionEof>,
+	IHandle<ReaderSubscriptionMessage.EventReaderPartitionDeleted>,
+	IHandle<ReaderSubscriptionMessage.Faulted>,
+	IHandle<ReaderSubscriptionMessage.ReportProgress> {
+	public const string SubComponentName = "EventReaderCoreService";
+
+	private readonly IPublisher _publisher;
+	private readonly IODispatcher _ioDispatcher;
+	private readonly ILogger _logger = Log.ForContext<ProjectionCoreService>();
+	private bool _stopped = true;
+
+	private readonly Dictionary<Guid, IReaderSubscription> _subscriptions =
+		new Dictionary<Guid, IReaderSubscription>();
+
+	private readonly Dictionary<Guid, IEventReader> _eventReaders = new Dictionary<Guid, IEventReader>();
+
+	private readonly Dictionary<Guid, Guid> _subscriptionEventReaders = new Dictionary<Guid, Guid>();
+	private readonly Dictionary<Guid, Guid> _eventReaderSubscriptions = new Dictionary<Guid, Guid>();
+	private readonly HashSet<Guid> _pausedSubscriptions = new HashSet<Guid>();
+	private readonly HeadingEventReader _headingEventReader;
+	private readonly ICheckpoint _writerCheckpoint;
+	private readonly bool _runHeadingReader;
+	private readonly bool _faultOutOfOrderProjections;
+	private readonly IEnvelope _publishEnvelope;
+	private Guid _defaultEventReaderId;
+	private Guid _reportProgressId;
+
+	public EventReaderCoreService(
+		IPublisher publisher, IODispatcher ioDispatcher, int eventCacheSize,
+		ICheckpoint writerCheckpoint, bool runHeadingReader, bool faultOutOfOrderProjections) {
+		_publisher = publisher;
+		_ioDispatcher = ioDispatcher;
+		if (runHeadingReader)
+			_headingEventReader = new HeadingEventReader(eventCacheSize, _publisher);
+		_writerCheckpoint = writerCheckpoint;
+		_runHeadingReader = runHeadingReader;
+		_faultOutOfOrderProjections = faultOutOfOrderProjections;
+		_publishEnvelope = publisher;
+	}
+
+	public void Handle(ReaderSubscriptionManagement.Pause message) {
+		if (!_pausedSubscriptions.Add(message.SubscriptionId))
+			throw new InvalidOperationException("Already paused projection");
+
+		IReaderSubscription projectionSubscription;
+		if (!_subscriptions.TryGetValue(message.SubscriptionId, out projectionSubscription))
+			return; // may be already unsubscribed when self-unsubscribing
+
+		var eventReaderId = _subscriptionEventReaders[message.SubscriptionId];
+		if (eventReaderId == Guid.Empty) // head
+		{
+			_subscriptionEventReaders.Remove(message.SubscriptionId);
+			_headingEventReader.Unsubscribe(message.SubscriptionId);
+			var forkedEventReaderId = Guid.NewGuid();
+			var forkedEventReader = projectionSubscription.CreatePausedEventReader(
+				_publisher, _ioDispatcher, forkedEventReaderId);
+			_subscriptionEventReaders.Add(message.SubscriptionId, forkedEventReaderId);
+			_eventReaderSubscriptions.Add(forkedEventReaderId, message.SubscriptionId);
+			_eventReaders.Add(forkedEventReaderId, forkedEventReader);
+			_publisher.Publish(
+				new EventReaderSubscriptionMessage.ReaderAssignedReader(
+					message.SubscriptionId, forkedEventReaderId));
+		} else {
+			_eventReaders[eventReaderId].Pause();
+		}
+	}
+
+	public void Handle(ReaderSubscriptionManagement.Resume message) {
+		if (!_pausedSubscriptions.Remove(message.SubscriptionId))
+			throw new InvalidOperationException("Not a paused projection");
+		var eventReader = _subscriptionEventReaders[message.SubscriptionId];
+		_eventReaders[eventReader].Resume();
+	}
+
+	public void Handle(ReaderSubscriptionManagement.Subscribe message) {
+		if (_stopped) {
+			_publisher.Publish(
+				new EventReaderSubscriptionMessage.Failed(
+					message.SubscriptionId, $"{nameof(EventReaderCoreService)} is stopped"));
+			return;
+		}
+
+		var fromCheckpointTag = message.FromPosition;
+		var subscriptionId = message.SubscriptionId;
+		try {
+			var projectionSubscription = message.ReaderStrategy.CreateReaderSubscription(
+				_publisher, fromCheckpointTag, message.SubscriptionId, message.Options);
+			_subscriptions.Add(subscriptionId, projectionSubscription);
+
+			var distributionPointCorrelationId = Guid.NewGuid();
+			var eventReader = projectionSubscription.CreatePausedEventReader(
+				_publisher, _ioDispatcher, distributionPointCorrelationId);
+			_eventReaders.Add(distributionPointCorrelationId, eventReader);
+			_subscriptionEventReaders.Add(subscriptionId, distributionPointCorrelationId);
+			_eventReaderSubscriptions.Add(distributionPointCorrelationId, subscriptionId);
+			_publisher.Publish(
+				new EventReaderSubscriptionMessage.ReaderAssignedReader(
+					subscriptionId, distributionPointCorrelationId));
+			eventReader.Resume();
+		} catch (Exception ex) {
+			_publisher.Publish(new EventReaderSubscriptionMessage.Failed(
+				subscriptionId, ex.ToString()));
+		}
+	}
+
+	public void Handle(ReaderSubscriptionManagement.Unsubscribe message) {
+		if (!_pausedSubscriptions.Contains(message.SubscriptionId))
+			Handle(new ReaderSubscriptionManagement.Pause(message.SubscriptionId));
+		var eventReaderId = Guid.Empty;
+		_subscriptionEventReaders.TryGetValue(message.SubscriptionId, out eventReaderId);
+		if (eventReaderId != Guid.Empty) {
+			_eventReaders[eventReaderId].Dispose();
+			_eventReaders.Remove(eventReaderId);
+			_eventReaderSubscriptions.Remove(eventReaderId);
+			_publisher.Publish(
+				new EventReaderSubscriptionMessage.ReaderAssignedReader(message.SubscriptionId, Guid.Empty));
+		}
+
+		_pausedSubscriptions.Remove(message.SubscriptionId);
+		_subscriptionEventReaders.Remove(message.SubscriptionId);
+		_subscriptions.Remove(message.SubscriptionId);
+	}
+
+	public void Handle(ReaderSubscriptionMessage.CommittedEventDistributed message) {
+		Guid projectionId;
+		if (_stopped)
+			return;
+		if (_runHeadingReader && _headingEventReader.Handle(message))
+			return;
+		if (!_eventReaderSubscriptions.TryGetValue(message.CorrelationId, out projectionId))
+			return; // unsubscribed
+
+		if (TrySubscribeHeadingEventReader(message, projectionId))
+			return;
+		if (message.Data != null) {
+			try {
+				_subscriptions[projectionId].Handle(message);
+			} catch (Exception ex) {
+				var subscription = _subscriptions[projectionId];
+				Handle(new ReaderSubscriptionManagement.Unsubscribe(subscription.SubscriptionId));
+				_publisher.Publish(new EventReaderSubscriptionMessage.Failed(subscription.SubscriptionId,
+					string.Format("The subscription failed to handle an event {0}:{1}@{2} because {3}",
+						message.Data.EventStreamId, message.Data.EventType, message.Data.EventSequenceNumber,
+						ex.Message)));
+			}
+		}
+	}
+
+	public void Handle(ReaderSubscriptionMessage.EventReaderIdle message) {
+		Guid projectionId;
+		if (_stopped)
+			return;
+		if (_runHeadingReader && _headingEventReader.Handle(message))
+			return;
+		if (!_eventReaderSubscriptions.TryGetValue(message.CorrelationId, out projectionId))
+			return; // unsubscribed
+		_subscriptions[projectionId].Handle(message);
+	}
+
+	public void Handle(ReaderSubscriptionMessage.EventReaderStarting message) {
+		Guid projectionId;
+		if (_stopped)
+			return;
+		if (!_eventReaderSubscriptions.TryGetValue(message.CorrelationId, out projectionId))
+			return; // unsubscribed
+		_subscriptions[projectionId].Handle(message);
+	}
+
+	public void Handle(ReaderSubscriptionMessage.EventReaderEof message) {
+		Guid projectionId;
+		if (_stopped)
+			return;
+		if (!_eventReaderSubscriptions.TryGetValue(message.CorrelationId, out projectionId))
+			return; // unsubscribed
+		_subscriptions[projectionId].Handle(message);
+
+		//            _pausedSubscriptions.Add(projectionId); // it is actually disposed -- workaround
+		//            Handle(new ReaderSubscriptionManagement.Unsubscribe(projectionId));
+	}
+
+	public void Handle(ReaderSubscriptionMessage.EventReaderPartitionEof message) {
+		Guid projectionId;
+		if (_stopped)
+			return;
+		if (!_eventReaderSubscriptions.TryGetValue(message.CorrelationId, out projectionId))
+			return; // unsubscribed
+		_subscriptions[projectionId].Handle(message);
+	}
+
+	public void Handle(ReaderSubscriptionMessage.EventReaderPartitionDeleted message) {
+		Guid projectionId;
+		if (_stopped)
+			return;
+		if (_runHeadingReader && _headingEventReader.Handle(message))
+			return;
+		if (!_eventReaderSubscriptions.TryGetValue(message.CorrelationId, out projectionId))
+			return; // unsubscribed
+		_subscriptions[projectionId].Handle(message);
+	}
+
+	public void Handle(ReaderSubscriptionMessage.EventReaderNotAuthorized message) {
+		Guid projectionId;
+		if (_stopped)
+			return;
+		if (!_eventReaderSubscriptions.TryGetValue(message.CorrelationId, out projectionId))
+			return; // unsubscribed
+		_subscriptions[projectionId].Handle(message);
+
+		_pausedSubscriptions.Add(projectionId); // it is actually disposed -- workaround
+		Handle(new ReaderSubscriptionManagement.Unsubscribe(projectionId));
+	}
+
+	public void Handle(ReaderSubscriptionMessage.Faulted message) {
+		Guid projectionId;
+		if (_stopped)
+			return;
+		if (!_eventReaderSubscriptions.TryGetValue(message.CorrelationId, out projectionId))
+			return; // unsubscribed
+
+		if (!_faultOutOfOrderProjections && message.Reason.Contains("was expected in the stream")) {
+			// Log without fault the projection
+			_logger.Verbose(message.Reason);
+			return;
+		}
+
+		var subscription = _subscriptions[projectionId];
+		Handle(new ReaderSubscriptionManagement.Unsubscribe(subscription.SubscriptionId));
+		_publisher.Publish(new EventReaderSubscriptionMessage.Failed(subscription.SubscriptionId, message.Reason));
+	}
+
+	public void Handle(ReaderSubscriptionMessage.ReportProgress message) {
+		if (_stopped || message.CorrelationId != _reportProgressId)
+			return;
+
+		foreach (var subscription in _subscriptions.Values) {
+			subscription.Handle(message);
+		}
+
+		_reportProgressId = Guid.NewGuid();
+		_publisher.Publish(TimerMessage.Schedule.Create(TimeSpan.FromMilliseconds(500), _publishEnvelope, new ReaderSubscriptionMessage.ReportProgress(_reportProgressId)));
+	}
+
+	private void StartReaders() {
+		//TODO: do we need to clear subscribed projections here?
+		//TODO: do we need to clear subscribed distribution points here?
+		_stopped = false;
+		_defaultEventReaderId = Guid.NewGuid();
+		var transactionFileReader = new TransactionFileEventReader(
+			_publisher,
+			_defaultEventReaderId,
+			SystemAccounts.System,
+			new TFPos(_writerCheckpoint.Read(), -1),
+			new RealTimeProvider(),
+			deliverEndOfTFPosition: false);
+
+		_eventReaders.Add(_defaultEventReaderId, transactionFileReader);
+		if (_runHeadingReader)
+			_headingEventReader.Start(_defaultEventReaderId, transactionFileReader);
+	}
+
+	private void StopReaders(ReaderCoreServiceMessage.StopReader message) {
+		if (_eventReaders.TryGetValue(_defaultEventReaderId, out var eventReader)) {
+			eventReader.Dispose();
+			_eventReaders.Remove(_defaultEventReaderId);
+			_eventReaderSubscriptions.Remove(_defaultEventReaderId);
+		}
+		_defaultEventReaderId = Guid.Empty;
+
+		if (_subscriptions.Count > 0) {
+			_logger.Information("_subscriptions is not empty after all the projections have been killed");
+			_subscriptions.Clear();
+		}
+
+		if (_eventReaders.Count > 0) {
+			_logger.Information("_eventReaders is not empty after all the projections have been killed");
+			_eventReaders.Clear();
+		}
+
+		if (_subscriptionEventReaders.Count > 0) {
+			_logger.Information("_subscriptionEventReaders is not empty after all the projections have been killed");
+			_subscriptionEventReaders.Clear();
+		}
+
+		if (_eventReaderSubscriptions.Count > 0) {
+			_logger.Information("_eventReaderSubscriptions is not empty after all the projections have been killed");
+			_eventReaderSubscriptions.Clear();
+		}
+
+		if (_runHeadingReader)
+			_headingEventReader.Stop();
+		_stopped = true;
+
+		_publisher.Publish(
+			new ProjectionCoreServiceMessage.SubComponentStopped(SubComponentName, message.QueueId));
+	}
+
+	private bool TrySubscribeHeadingEventReader(
+		ReaderSubscriptionMessage.CommittedEventDistributed message, Guid projectionId) {
+		if (message.SafeTransactionFileReaderJoinPosition == null)
+			return false;
+
+		if (!_runHeadingReader)
+			return false;
+
+		if (_pausedSubscriptions.Contains(projectionId))
+			return false;
+
+		var projectionSubscription = _subscriptions[projectionId];
+
+		if (
+			!_headingEventReader.TrySubscribe(
+				projectionId, projectionSubscription, message.SafeTransactionFileReaderJoinPosition.Value))
+			return false;
+
+		Guid eventReaderId = message.CorrelationId;
+		_eventReaders[eventReaderId].Dispose();
+		_eventReaders.Remove(eventReaderId);
+		_eventReaderSubscriptions.Remove(eventReaderId);
+		_subscriptionEventReaders[projectionId] = Guid.Empty;
+		_publisher.Publish(
+			new EventReaderSubscriptionMessage.ReaderAssignedReader(message.CorrelationId, Guid.Empty));
+		return true;
+	}
+
+	public void Handle(ReaderCoreServiceMessage.StartReader message) {
+		StartReaders();
+		_publisher.Publish(new ProjectionCoreServiceMessage.SubComponentStarted(
+			SubComponentName, message.InstanceCorrelationId));
+		_reportProgressId = Guid.NewGuid();
+		_publisher.Publish(TimerMessage.Schedule.Create(TimeSpan.FromMilliseconds(500), _publishEnvelope, new ReaderSubscriptionMessage.ReportProgress(_reportProgressId)));
+	}
+
+	public void Handle(ReaderCoreServiceMessage.StopReader message) {
+		StopReaders(message);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/IEventReader.cs b/src/KurrentDB.Projections.Core/Services/Processing/IEventReader.cs
new file mode 100644
index 00000000000..5ed40e9b0c8
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/IEventReader.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Projections.Core.Services.Processing;
+
+public interface IEventReader : IDisposable {
+	void Resume();
+	void Pause();
+	void SendNotAuthorized();
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/MultiStream/MultiStreamEventFilter.cs b/src/KurrentDB.Projections.Core/Services/Processing/MultiStream/MultiStreamEventFilter.cs
new file mode 100644
index 00000000000..193d5434c5e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/MultiStream/MultiStreamEventFilter.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+
+namespace KurrentDB.Projections.Core.Services.Processing.MultiStream;
+
+public class MultiStreamEventFilter : EventFilter {
+	private readonly HashSet<string> _streams;
+
+	public MultiStreamEventFilter(HashSet<string> streams, bool allEvents, HashSet<string> events)
+		: base(allEvents, false, events) {
+		_streams = streams;
+	}
+
+	protected override bool DeletedNotificationPasses(string positionStreamId) {
+		return false;
+	}
+
+	public override bool PassesSource(bool resolvedFromLinkTo, string positionStreamId, string eventType) {
+		return _streams.Contains(positionStreamId);
+	}
+
+	public override string GetCategory(string positionStreamId) {
+		return null;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/MultiStream/MultiStreamEventReader.cs b/src/KurrentDB.Projections.Core/Services/Processing/MultiStream/MultiStreamEventReader.cs
new file mode 100644
index 00000000000..b1efa3a4255
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/MultiStream/MultiStreamEventReader.cs
@@ -0,0 +1,372 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Settings;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+using UnwrapEnvelopeMessage = KurrentDB.Projections.Core.Messaging.UnwrapEnvelopeMessage;
+
+namespace KurrentDB.Projections.Core.Services.Processing.MultiStream;
+
+public class MultiStreamEventReader : EventReader,
+	IHandle<ClientMessage.ReadStreamEventsForwardCompleted>,
+	IHandle<ProjectionManagementMessage.Internal.ReadTimeout> {
+	private readonly HashSet<string> _streams;
+	private CheckpointTag _fromPositions;
+	private readonly bool _resolveLinkTos;
+	private readonly ITimeProvider _timeProvider;
+
+	private readonly HashSet<string> _eventsRequested = new HashSet<string>();
+	private readonly Dictionary<string, long?> _preparePositions = new Dictionary<string, long?>();
+
+	// event, link, progress
+	// null element in a queue means stream deleted
+	private readonly Dictionary<string, Queue<Tuple<KurrentDB.Core.Data.ResolvedEvent, float>>> _buffers =
+		new Dictionary<string, Queue<Tuple<KurrentDB.Core.Data.ResolvedEvent, float>>>();
+
+	private const int _maxReadCount = 111;
+	private long? _safePositionToJoin;
+	private readonly ConcurrentDictionary<string, bool> _eofs;
+	private int _deliveredEvents;
+	private long _lastPosition;
+
+	private readonly ConcurrentDictionary<string, Guid> _pendingRequests;
+
+	public MultiStreamEventReader(
+		IODispatcher ioDispatcher, IPublisher publisher, Guid eventReaderCorrelationId, ClaimsPrincipal readAs,
+		int phase,
+		string[] streams, Dictionary<string, long> fromPositions, bool resolveLinkTos, ITimeProvider timeProvider,
+		bool stopOnEof = false, int? stopAfterNEvents = null)
+		: base(publisher, eventReaderCorrelationId, readAs, stopOnEof) {
+		if (streams == null)
+			throw new ArgumentNullException("streams");
+		if (timeProvider == null)
+			throw new ArgumentNullException("timeProvider");
+		if (streams.Length == 0)
+			throw new ArgumentException("streams");
+		_streams = new HashSet<string>(streams);
+		_eofs = new ConcurrentDictionary<string, bool>(_streams.ToDictionary(v => v, v => false));
+		var positions = CheckpointTag.FromStreamPositions(phase, fromPositions);
+		ValidateTag(positions);
+		_fromPositions = positions;
+		_resolveLinkTos = resolveLinkTos;
+		_timeProvider = timeProvider;
+		_pendingRequests = new ConcurrentDictionary<string, Guid>();
+		foreach (var stream in streams) {
+			_pendingRequests[stream] = Guid.Empty;
+			_preparePositions.Add(stream, null);
+		}
+	}
+
+	private void ValidateTag(CheckpointTag fromPositions) {
+		if (_streams.Count != fromPositions.Streams.Count)
+			throw new ArgumentException("Number of streams does not match", "fromPositions");
+
+		foreach (var stream in _streams) {
+			if (!fromPositions.Streams.ContainsKey(stream))
+				throw new ArgumentException(
+					string.Format("The '{0}' stream position has not been set", stream), "fromPositions");
+		}
+	}
+
+	protected override void RequestEvents() {
+		if (PauseRequested || Paused)
+			return;
+		if (_eofs.Any(v => v.Value))
+			_publisher.Publish(
+				TimerMessage.Schedule.Create(
+					TimeSpan.FromMilliseconds(250), _publisher,
+					new UnwrapEnvelopeMessage(ProcessBuffers2)));
+		foreach (var stream in _streams)
+			RequestEvents(stream, delay: _eofs[stream]);
+	}
+
+	private void ProcessBuffers2() {
+		ProcessBuffers();
+		CheckIdle();
+	}
+
+	protected override bool AreEventsRequested() {
+		return _eventsRequested.Count != 0;
+	}
+
+	public void Handle(ClientMessage.ReadStreamEventsForwardCompleted message) {
+		if (_disposed)
+			return;
+		if (!_streams.Contains(message.EventStreamId))
+			throw new InvalidOperationException(string.Format("Invalid stream name: {0}", message.EventStreamId));
+		if (!_eventsRequested.Contains(message.EventStreamId))
+			throw new InvalidOperationException("Read events has not been requested");
+		if (Paused)
+			throw new InvalidOperationException("Paused");
+		if (!_pendingRequests.Values.Any(x => x == message.CorrelationId))
+			return;
+
+		_lastPosition = message.TfLastCommitPosition;
+		switch (message.Result) {
+			case ReadStreamResult.StreamDeleted:
+			case ReadStreamResult.NoStream:
+				_eofs[message.EventStreamId] = true;
+				UpdateSafePositionToJoin(message.EventStreamId, MessageToLastCommitPosition(message));
+				if (message.Result == ReadStreamResult.StreamDeleted
+					|| (message.Result == ReadStreamResult.NoStream && message.LastEventNumber >= 0))
+					EnqueueItem(null, message.EventStreamId);
+				ProcessBuffers();
+				_eventsRequested.Remove(message.EventStreamId);
+				PauseOrContinueProcessing();
+				CheckIdle();
+				CheckEof();
+				break;
+			case ReadStreamResult.Success:
+				if (message.Events is [] && message.IsEndOfStream) {
+					// the end
+					_eofs[message.EventStreamId] = true;
+					UpdateSafePositionToJoin(message.EventStreamId, MessageToLastCommitPosition(message));
+					CheckIdle();
+					CheckEof();
+				} else {
+					_eofs[message.EventStreamId] = false;
+					if (message.Events is []) {
+						_fromPositions.Streams[message.EventStreamId] = message.NextEventNumber;
+					}
+					for (int index = 0; index < message.Events.Count; index++) {
+						var @event = message.Events[index].Event;
+						var @link = message.Events[index].Link;
+						EventRecord positionEvent = (link ?? @event);
+						UpdateSafePositionToJoin(
+							positionEvent.EventStreamId, EventPairToPosition(message.Events[index]));
+						Tuple<KurrentDB.Core.Data.ResolvedEvent, float> itemToEnqueue = Tuple.Create(
+							message.Events[index],
+							100.0f * (link ?? @event).EventNumber / message.LastEventNumber);
+						EnqueueItem(itemToEnqueue, positionEvent.EventStreamId);
+					}
+				}
+
+				ProcessBuffers();
+				_eventsRequested.Remove(message.EventStreamId);
+				PauseOrContinueProcessing();
+				break;
+			case ReadStreamResult.AccessDenied:
+				SendNotAuthorized();
+				return;
+			default:
+				throw new NotSupportedException(
+					string.Format("ReadEvents result code was not recognized. Code: {0}", message.Result));
+		}
+	}
+
+	public void Handle(ProjectionManagementMessage.Internal.ReadTimeout message) {
+		if (_disposed)
+			return;
+		if (Paused)
+			return;
+		if (!_pendingRequests.Values.Any(x => x == message.CorrelationId))
+			return;
+
+		_eventsRequested.Remove(message.StreamId);
+		PauseOrContinueProcessing();
+	}
+
+	private void EnqueueItem(Tuple<KurrentDB.Core.Data.ResolvedEvent, float> itemToEnqueue, string streamId) {
+		Queue<Tuple<KurrentDB.Core.Data.ResolvedEvent, float>> queue;
+		if (!_buffers.TryGetValue(streamId, out queue)) {
+			queue = new Queue<Tuple<KurrentDB.Core.Data.ResolvedEvent, float>>();
+			_buffers.Add(streamId, queue);
+		}
+
+		//TODO: progress calculation below is incorrect.  sum(current)/sum(last_event) where sum by all streams
+		queue.Enqueue(itemToEnqueue);
+	}
+
+	private void CheckEof() {
+		if (_eofs.All(v => v.Value))
+			SendEof();
+	}
+
+	private void CheckIdle() {
+		if (_eofs.All(v => v.Value))
+			_publisher.Publish(
+				new ReaderSubscriptionMessage.EventReaderIdle(EventReaderCorrelationId, _timeProvider.UtcNow));
+	}
+
+	private void ProcessBuffers() {
+		if (_disposed)
+			return;
+		if (_safePositionToJoin == null)
+			return;
+		while (true) {
+			var anyNonEmpty = false;
+
+			var anyEvent = false;
+			var minStreamId = "";
+			var minPosition = GetMaxPosition();
+
+			var anyDeletedStream = false;
+			var deletedStreamId = "";
+
+			foreach (var buffer in _buffers) {
+				if (buffer.Value.Count == 0)
+					continue;
+				anyNonEmpty = true;
+				var head = buffer.Value.Peek();
+
+				var currentStreamId = buffer.Key;
+
+				if (head != null) {
+					var itemPosition = GetItemPosition(head);
+					if (_safePositionToJoin != null
+						&& itemPosition.CompareTo(_safePositionToJoin.GetValueOrDefault()) <= 0
+						&& itemPosition.CompareTo(minPosition) < 0) {
+						minPosition = itemPosition;
+						minStreamId = currentStreamId;
+						anyEvent = true;
+					}
+				} else {
+					anyDeletedStream = true;
+					deletedStreamId = currentStreamId;
+				}
+			}
+
+			if (!anyEvent && !anyDeletedStream) {
+				if (!anyNonEmpty)
+					DeliverSafePositionToJoin();
+				break;
+			}
+
+			if (anyEvent) {
+				var minHead = _buffers[minStreamId].Dequeue();
+				DeliverEvent(minHead.Item1, minHead.Item2);
+
+				if (_buffers[minStreamId].Count == 0)
+					PauseOrContinueProcessing();
+			}
+
+			if (anyDeletedStream) {
+				_buffers[deletedStreamId].Dequeue();
+				SendPartitionDeleted_WhenReadingDataStream(deletedStreamId, -1, null, null, null, null);
+			}
+		}
+	}
+
+	private void RequestEvents(string stream, bool delay) {
+		if (_disposed)
+			throw new InvalidOperationException("Disposed");
+		if (PauseRequested || Paused)
+			throw new InvalidOperationException("Paused or pause requested");
+
+		if (_eventsRequested.Contains(stream))
+			return;
+		Queue<Tuple<KurrentDB.Core.Data.ResolvedEvent, float>> queue;
+		if (_buffers.TryGetValue(stream, out queue) && queue.Count > 0)
+			return;
+		_eventsRequested.Add(stream);
+
+		var pendingRequestCorrelationId = Guid.NewGuid();
+		_pendingRequests[stream] = pendingRequestCorrelationId;
+
+		var readEventsForward = new ClientMessage.ReadStreamEventsForward(
+			Guid.NewGuid(), pendingRequestCorrelationId, new SendToThisEnvelope(this), stream,
+			_fromPositions.Streams[stream],
+			_maxReadCount, _resolveLinkTos, false, null, ReadAs, replyOnExpired: false);
+		if (delay) {
+			_publisher.Publish(
+				new AwakeServiceMessage.SubscribeAwake(
+					_publisher, Guid.NewGuid(), null,
+					new TFPos(_lastPosition, _lastPosition),
+					CreateReadTimeoutMessage(pendingRequestCorrelationId, stream)));
+			_publisher.Publish(
+				new AwakeServiceMessage.SubscribeAwake(
+					_publisher, Guid.NewGuid(), null,
+					new TFPos(_lastPosition, _lastPosition), readEventsForward));
+		} else {
+			_publisher.Publish(readEventsForward);
+			ScheduleReadTimeoutMessage(pendingRequestCorrelationId, stream);
+		}
+	}
+
+	private void ScheduleReadTimeoutMessage(Guid correlationId, string streamId) {
+		_publisher.Publish(CreateReadTimeoutMessage(correlationId, streamId));
+	}
+
+	private Message CreateReadTimeoutMessage(Guid correlationId, string streamId) {
+		return TimerMessage.Schedule.Create(
+			TimeSpan.FromMilliseconds(ESConsts.ReadRequestTimeout),
+			new SendToThisEnvelope(this),
+			new ProjectionManagementMessage.Internal.ReadTimeout(correlationId, streamId));
+	}
+
+	private void DeliverSafePositionToJoin() {
+		if (_stopOnEof || _safePositionToJoin == null)
+			return;
+		// deliver if already available
+		_publisher.Publish(
+			new ReaderSubscriptionMessage.CommittedEventDistributed(
+				EventReaderCorrelationId, null, PositionToSafeJoinPosition(_safePositionToJoin), 100.0f,
+				source: this.GetType()));
+	}
+
+	private void UpdateSafePositionToJoin(string streamId, long? preparePosition) {
+		_preparePositions[streamId] = preparePosition;
+		if (_preparePositions.All(v => v.Value != null))
+			_safePositionToJoin = _preparePositions.Min(v => v.Value.GetValueOrDefault());
+	}
+
+	private void DeliverEvent(KurrentDB.Core.Data.ResolvedEvent pair, float progress) {
+		_deliveredEvents++;
+		var positionEvent = pair.OriginalEvent;
+		string streamId = positionEvent.EventStreamId;
+		long fromPosition = _fromPositions.Streams[streamId];
+
+		//if events have been deleted from the beginning of the stream, start from the first event we find
+		if (fromPosition == 0 && positionEvent.EventNumber > 0) {
+			fromPosition = positionEvent.EventNumber;
+		}
+
+		if (positionEvent.EventNumber != fromPosition) {
+			// This can happen when the original stream has $maxAge/$maxCount set
+			_publisher.Publish(new ReaderSubscriptionMessage.Faulted(EventReaderCorrelationId, string.Format(
+				"Event number {0} was expected in the stream {1}, but event number {2} was received. This may happen if events have been deleted from the beginning of your stream, please reset your projection.",
+				fromPosition, streamId, positionEvent.EventNumber), this.GetType()));
+			return;
+		}
+
+		_fromPositions = _fromPositions.UpdateStreamPosition(streamId, positionEvent.EventNumber + 1);
+		_publisher.Publish(
+			//TODO: publish both link and event data
+			new ReaderSubscriptionMessage.CommittedEventDistributed(
+				EventReaderCorrelationId, new ResolvedEvent(pair, null),
+				_stopOnEof ? (long?)null : positionEvent.LogPosition, progress, source: this.GetType()));
+	}
+
+	private long? EventPairToPosition(KurrentDB.Core.Data.ResolvedEvent resolvedEvent) {
+		return resolvedEvent.OriginalEvent.LogPosition;
+	}
+
+	private long? MessageToLastCommitPosition(ClientMessage.ReadStreamEventsForwardCompleted message) {
+		return GetLastCommitPositionFrom(message);
+	}
+
+	private long GetItemPosition(Tuple<KurrentDB.Core.Data.ResolvedEvent, float> head) {
+		return head.Item1.OriginalEvent.LogPosition;
+	}
+
+	private long GetMaxPosition() {
+		return long.MaxValue;
+	}
+
+	private long? PositionToSafeJoinPosition(long? safePositionToJoin) {
+		return safePositionToJoin;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/MultiStream/MultiStreamMultiOutputCheckpointManager.Item.cs b/src/KurrentDB.Projections.Core/Services/Processing/MultiStream/MultiStreamMultiOutputCheckpointManager.Item.cs
new file mode 100644
index 00000000000..db75855945a
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/MultiStream/MultiStreamMultiOutputCheckpointManager.Item.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.Services.Processing.MultiStream;
+
+public partial class MultiStreamMultiOutputCheckpointManager {
+	private class Item {
+		internal KurrentDB.Core.Data.ResolvedEvent? _result;
+		private readonly CheckpointTag _tag;
+
+		public Item(CheckpointTag tag) {
+			_tag = tag;
+		}
+
+		public CheckpointTag Tag {
+			get { return _tag; }
+		}
+
+		public void SetLoadedEvent(KurrentDB.Core.Data.ResolvedEvent eventLinkPair) {
+			_result = eventLinkPair;
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/MultiStream/MultiStreamMultiOutputCheckpointManager.cs b/src/KurrentDB.Projections.Core/Services/Processing/MultiStream/MultiStreamMultiOutputCheckpointManager.cs
new file mode 100644
index 00000000000..d0395109ba1
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/MultiStream/MultiStreamMultiOutputCheckpointManager.cs
@@ -0,0 +1,231 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+
+namespace KurrentDB.Projections.Core.Services.Processing.MultiStream;
+
+public partial class MultiStreamMultiOutputCheckpointManager : DefaultCheckpointManager, IEmittedStreamContainer {
+	private readonly PositionTagger _positionTagger;
+	private CheckpointTag _lastOrderCheckpointTag; //TODO: use position tracker to ensure order?
+	private EmittedStream _orderStream;
+	private bool _orderStreamReadingCompleted;
+	private int _loadingItemsCount;
+	private readonly Stack<Item> _loadQueue = new Stack<Item>();
+	private CheckpointTag _loadingPrerecordedEventsFrom;
+	private static readonly char[] _linkToSeparator = new[] { '@' };
+
+	public MultiStreamMultiOutputCheckpointManager(
+		IPublisher publisher, Guid projectionCorrelationId, ProjectionVersion projectionVersion, ClaimsPrincipal runAs,
+		IODispatcher ioDispatcher, ProjectionConfig projectionConfig, string name, PositionTagger positionTagger,
+		ProjectionNamesBuilder namingBuilder, bool usePersistentCheckpoints, bool producesRunningResults,
+		bool definesFold,
+		CoreProjectionCheckpointWriter coreProjectionCheckpointWriter, int maxProjectionStateSize)
+		: base(
+			publisher, projectionCorrelationId, projectionVersion, runAs, ioDispatcher, projectionConfig, name,
+			positionTagger, namingBuilder, usePersistentCheckpoints, producesRunningResults, definesFold,
+			coreProjectionCheckpointWriter, maxProjectionStateSize) {
+		_positionTagger = positionTagger;
+	}
+
+	public override void Initialize() {
+		base.Initialize();
+		_lastOrderCheckpointTag = null;
+		if (_orderStream != null)
+			_orderStream.Dispose();
+		_orderStream = null;
+	}
+
+	public override void Start(CheckpointTag checkpointTag, PartitionState rootPartitionState) {
+		base.Start(checkpointTag, rootPartitionState);
+		_orderStream = CreateOrderStream(checkpointTag);
+		_orderStream.Start();
+	}
+
+	public override void RecordEventOrder(
+		ResolvedEvent resolvedEvent, CheckpointTag orderCheckpointTag, Action committed) {
+		EnsureStarted();
+		if (_stopping)
+			throw new InvalidOperationException("Stopping");
+		var orderStreamName = _namingBuilder.GetOrderStreamName();
+		//TODO: -order stream requires correctly configured event expiration.
+		// the best is to truncate using $startFrom, but $maxAge should be also acceptable
+		_orderStream.EmitEvents(
+			new[] {
+				new EmittedDataEvent(
+					orderStreamName, Guid.NewGuid(), "$>",
+					false, resolvedEvent.PositionSequenceNumber + "@" + resolvedEvent.PositionStreamId, null,
+					orderCheckpointTag, _lastOrderCheckpointTag, v => committed())
+			});
+		_lastOrderCheckpointTag = orderCheckpointTag;
+	}
+
+	private EmittedStream CreateOrderStream(CheckpointTag from) {
+		//TODO: this stream requires $startFrom to be updated from time to time to reduce space taken
+		return new EmittedStream(
+			/* MUST NEVER SEND READY MESSAGE */
+			_namingBuilder.GetOrderStreamName(),
+			new EmittedStream.WriterConfiguration(
+				new EmittedStreamsWriter(_ioDispatcher), new EmittedStream.WriterConfiguration.StreamMetadata(),
+				SystemAccounts.System, 100, _logger),
+			_projectionVersion, _positionTagger, @from, _publisher, _ioDispatcher, this, noCheckpoints: true);
+	}
+
+	public override void GetStatistics(ProjectionStatistics info) {
+		base.GetStatistics(info);
+		if (_orderStream != null) {
+			info.WritePendingEventsAfterCheckpoint += _orderStream.GetWritePendingEvents();
+			info.ReadsInProgress += _orderStream.GetReadsInProgress();
+			info.WritesInProgress += _orderStream.GetWritesInProgress();
+		}
+	}
+
+
+	public override void BeginLoadPrerecordedEvents(CheckpointTag checkpointTag) {
+		BeginLoadPrerecordedEventsChunk(checkpointTag, -1);
+	}
+
+	private void BeginLoadPrerecordedEventsChunk(CheckpointTag checkpointTag, long fromEventNumber) {
+		_loadingPrerecordedEventsFrom = checkpointTag;
+		_ioDispatcher.ReadBackward(
+			_namingBuilder.GetOrderStreamName(), fromEventNumber, 100, false, SystemAccounts.System,
+			completed => {
+				switch (completed.Result) {
+					case ReadStreamResult.NoStream:
+						_lastOrderCheckpointTag = _positionTagger.MakeZeroCheckpointTag();
+						PrerecordedEventsLoaded(checkpointTag);
+						break;
+					case ReadStreamResult.Success:
+						var epochEnded = false;
+						foreach (var @event in completed.Events) {
+							var parsed = @event.Event.Metadata.ParseCheckpointTagVersionExtraJson(
+								_projectionVersion);
+							//TODO: throw exception if different projectionID?
+							if (_projectionVersion.ProjectionId != parsed.Version.ProjectionId
+								|| _projectionVersion.Epoch > parsed.Version.Version) {
+								epochEnded = true;
+								break;
+							}
+
+							var tag = parsed.AdjustBy(_positionTagger, _projectionVersion);
+							//NOTE: even if this tag <= checkpointTag we set last tag
+							// this is to know the exact last tag to request when writing
+							if (_lastOrderCheckpointTag == null)
+								_lastOrderCheckpointTag = tag;
+
+							if (tag <= checkpointTag) {
+								SetOrderStreamReadCompleted();
+								return;
+							}
+
+							EnqueuePrerecordedEvent(@event.Event, tag);
+						}
+
+						if (epochEnded || completed.IsEndOfStream)
+							SetOrderStreamReadCompleted();
+						else
+							BeginLoadPrerecordedEventsChunk(checkpointTag, completed.NextEventNumber);
+						break;
+					default:
+						throw new Exception("Cannot read order stream");
+				}
+			}, () => {
+				_logger.Warning("Read backward of stream {stream} timed out. Retrying",
+					_namingBuilder.GetOrderStreamName());
+				BeginLoadPrerecordedEventsChunk(checkpointTag, fromEventNumber);
+			}, Guid.NewGuid());
+	}
+
+	private void EnqueuePrerecordedEvent(EventRecord @event, CheckpointTag tag) {
+		if (@event == null)
+			throw new ArgumentNullException("event");
+		if (tag == null)
+			throw new ArgumentNullException("tag");
+		if (@event.EventType != "$>")
+			throw new ArgumentException("linkto ($>) event expected", "event");
+
+		_loadingItemsCount++;
+
+		var item = new Item(tag);
+		_loadQueue.Push(item);
+		//NOTE: we do manual link-to resolution as we write links to the position events
+		//      which may in turn be a link.  This is necessary to provide a correct
+		//       ResolvedEvent when replaying from the -order stream
+		var linkTo = Helper.UTF8NoBom.GetString(@event.Data.Span);
+		string[] parts = linkTo.Split(_linkToSeparator, 2);
+		long eventNumber = long.Parse(parts[0]);
+		string streamId = parts[1];
+
+		ReadPrerecordedEventStream(streamId, eventNumber, completed => {
+			switch (completed.Result) {
+				case ReadStreamResult.Success:
+				case ReadStreamResult.NoStream:
+				case ReadStreamResult.StreamDeleted:
+					if (completed.Events.Count is 1)
+						item.SetLoadedEvent(completed.Events[0]);
+					_loadingItemsCount--;
+					CheckAllEventsLoaded();
+					break;
+				default:
+					throw new Exception(string.Format("Cannot read {0}. Error: {1}", linkTo, completed.Error));
+			}
+		});
+	}
+
+	private void ReadPrerecordedEventStream(string streamId, long eventNumber,
+		Action<ClientMessage.ReadStreamEventsBackwardCompleted> action) {
+		_ioDispatcher.ReadBackward(
+			streamId, eventNumber, 1, true, SystemAccounts.System, action, () => {
+				_logger.Warning("Read backward of stream {stream} timed out. Retrying", streamId);
+				ReadPrerecordedEventStream(streamId, eventNumber, action);
+			}, Guid.NewGuid());
+	}
+
+	private void CheckAllEventsLoaded() {
+		CheckpointTag lastTag = null;
+		if (_orderStreamReadingCompleted && _loadingItemsCount == 0) {
+			var number = 0;
+			while (_loadQueue.Count > 0) {
+				var item = _loadQueue.Pop();
+				var @event = item._result;
+				lastTag = item.Tag;
+				if (@event.HasValue) {
+					SendPrerecordedEvent(@event.Value, lastTag, number);
+					number++;
+				}
+			}
+
+			_loadingItemsCount = -1; // completed - do not dispatch one more time
+			PrerecordedEventsLoaded(lastTag ?? _loadingPrerecordedEventsFrom);
+		}
+	}
+
+	private void SetOrderStreamReadCompleted() {
+		_orderStreamReadingCompleted = true;
+		CheckAllEventsLoaded();
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.EmittedStreamAwaiting message) {
+		if (_stopped)
+			return;
+		throw new NotImplementedException();
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.EmittedStreamWriteCompleted message) {
+		if (_stopped)
+			return;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/MultiStream/MultiStreamPositionTagger.cs b/src/KurrentDB.Projections.Core/Services/Processing/MultiStream/MultiStreamPositionTagger.cs
new file mode 100644
index 00000000000..037b849b0fd
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/MultiStream/MultiStreamPositionTagger.cs
@@ -0,0 +1,103 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.Services.Processing.MultiStream;
+
+public class MultiStreamPositionTagger : PositionTagger {
+	private readonly HashSet<string> _streams;
+
+	public MultiStreamPositionTagger(int phase, string[] streams) : base(phase) {
+		if (streams == null)
+			throw new ArgumentNullException("streams");
+		if (streams.Length == 0)
+			throw new ArgumentException("streams");
+		_streams = new HashSet<string>(streams);
+	}
+
+	public override bool IsMessageAfterCheckpointTag(
+		CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
+		if (previous.Phase < Phase)
+			return true;
+		if (previous.Mode_ != CheckpointTag.Mode.MultiStream)
+			throw new ArgumentException("Mode.MultiStream expected", "previous");
+		return _streams.Contains(committedEvent.Data.PositionStreamId)
+			   && committedEvent.Data.PositionSequenceNumber >
+			   previous.Streams[committedEvent.Data.PositionStreamId];
+	}
+
+	public override CheckpointTag MakeCheckpointTag(
+		CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
+		if (previous.Phase != Phase)
+			throw new ArgumentException(
+				string.Format("Invalid checkpoint tag phase.  Expected: {0} Was: {1}", Phase, previous.Phase));
+
+		if (!_streams.Contains(committedEvent.Data.PositionStreamId))
+			throw new InvalidOperationException(
+				string.Format("Invalid stream '{0}'", committedEvent.Data.EventStreamId));
+		return previous.UpdateStreamPosition(
+			committedEvent.Data.PositionStreamId, committedEvent.Data.PositionSequenceNumber);
+	}
+
+	public override CheckpointTag MakeCheckpointTag(CheckpointTag previous,
+		ReaderSubscriptionMessage.EventReaderPartitionEof partitionEof) {
+		throw new NotImplementedException();
+	}
+
+	public override CheckpointTag MakeCheckpointTag(CheckpointTag previous,
+		ReaderSubscriptionMessage.EventReaderPartitionDeleted partitionDeleted) {
+		throw new NotSupportedException();
+	}
+
+	public override CheckpointTag MakeZeroCheckpointTag() {
+		return CheckpointTag.FromStreamPositions(Phase,
+			_streams.ToDictionary(v => v, v => (long)ExpectedVersion.NoStream));
+	}
+
+	public override bool IsCompatible(CheckpointTag checkpointTag) {
+		//TODO: should Stream be supported here as well if in the set?
+		return checkpointTag.Mode_ == CheckpointTag.Mode.MultiStream
+			   && checkpointTag.Streams.All(v => _streams.Contains(v.Key));
+	}
+
+	public override CheckpointTag AdjustTag(CheckpointTag tag) {
+		if (tag.Phase < Phase)
+			return tag;
+		if (tag.Phase > Phase)
+			throw new ArgumentException(
+				string.Format("Invalid checkpoint tag phase.  Expected less or equal to: {0} Was: {1}", Phase,
+					tag.Phase), "tag");
+
+		if (tag.Mode_ == CheckpointTag.Mode.MultiStream) {
+			long p;
+			return CheckpointTag.FromStreamPositions(
+				tag.Phase, _streams.ToDictionary(v => v, v => tag.Streams.TryGetValue(v, out p) ? p : -1));
+		}
+
+		switch (tag.Mode_) {
+			case CheckpointTag.Mode.EventTypeIndex:
+				throw new NotSupportedException(
+					"Conversion from EventTypeIndex to MultiStream position tag is not supported");
+			case CheckpointTag.Mode.Stream:
+				long p;
+				return CheckpointTag.FromStreamPositions(
+					tag.Phase, _streams.ToDictionary(v => v, v => tag.Streams.TryGetValue(v, out p) ? p : -1));
+			case CheckpointTag.Mode.PreparePosition:
+				throw new NotSupportedException(
+					"Conversion from PreparePosition to MultiStream position tag is not supported");
+			case CheckpointTag.Mode.Position:
+				throw new NotSupportedException(
+					"Conversion from Position to MultiStream position tag is not supported");
+			default:
+				throw new NotSupportedException(string.Format(
+					"The given checkpoint is invalid. Possible causes might include having written an event to the projection's managed stream. The bad checkpoint: {0}",
+					tag.ToString()));
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Partitioning/ByHandleStatePartitionSelector.cs b/src/KurrentDB.Projections.Core/Services/Processing/Partitioning/ByHandleStatePartitionSelector.cs
new file mode 100644
index 00000000000..890d04187dd
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Partitioning/ByHandleStatePartitionSelector.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Partitioning;
+
+public class ByHandleStatePartitionSelector : StatePartitionSelector {
+	private readonly IProjectionStateHandler _handler;
+
+	public ByHandleStatePartitionSelector(IProjectionStateHandler handler) {
+		_handler = handler;
+	}
+
+	public override string GetStatePartition(EventReaderSubscriptionMessage.CommittedEventReceived @event) {
+		return _handler.GetStatePartition(@event.CheckpointTag, @event.EventCategory, @event.Data);
+	}
+
+	public override bool EventReaderBasePartitionDeletedIsSupported() {
+		return false;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Partitioning/ByStreamStatePartitionSelector.cs b/src/KurrentDB.Projections.Core/Services/Processing/Partitioning/ByStreamStatePartitionSelector.cs
new file mode 100644
index 00000000000..4c4a0370075
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Partitioning/ByStreamStatePartitionSelector.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Services;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using Newtonsoft.Json.Linq;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Partitioning;
+
+public class ByStreamStatePartitionSelector : StatePartitionSelector {
+	public override string GetStatePartition(EventReaderSubscriptionMessage.CommittedEventReceived @event) {
+		if (@event.Data.ResolvedLinkTo && @event.Data.PositionMetadata != null) {
+			var extra = @event.Data.PositionMetadata.ParseCheckpointExtraJson();
+			JToken v;
+			if (extra != null && extra.TryGetValue("$o", out v)) {
+				//TODO: handle exceptions properly
+				var originalStream = (string)((JValue)v).Value;
+				return originalStream;
+			}
+		}
+
+		var eventStreamId = @event.Data.EventStreamId;
+		return SystemStreams.IsMetastream(eventStreamId)
+			? eventStreamId.Substring("$$".Length)
+			: eventStreamId;
+	}
+
+	public override bool EventReaderBasePartitionDeletedIsSupported() {
+		return true;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Partitioning/NoopStatePartitionSelector.cs b/src/KurrentDB.Projections.Core/Services/Processing/Partitioning/NoopStatePartitionSelector.cs
new file mode 100644
index 00000000000..46d02c38375
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Partitioning/NoopStatePartitionSelector.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Partitioning;
+
+public class NoopStatePartitionSelector : StatePartitionSelector {
+	public override string GetStatePartition(EventReaderSubscriptionMessage.CommittedEventReceived @event) {
+		return "";
+	}
+
+	public override bool EventReaderBasePartitionDeletedIsSupported() {
+		return false;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Partitioning/PartitionState.cs b/src/KurrentDB.Projections.Core/Services/Processing/Partitioning/PartitionState.cs
new file mode 100644
index 00000000000..16dbcafb277
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Partitioning/PartitionState.cs
@@ -0,0 +1,92 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Partitioning;
+
+public class PartitionState {
+	private static readonly JsonSerializerSettings JsonSettings = new JsonSerializerSettings {
+		DateParseHandling = DateParseHandling.None,
+	};
+
+	public bool IsChanged(PartitionState newState) {
+		return State != newState.State || Result != newState.Result;
+	}
+
+	public static PartitionState Deserialize(string serializedState, CheckpointTag causedBy) {
+		if (serializedState == null)
+			return new PartitionState("", null, causedBy);
+
+		JToken state = null;
+		JToken result = null;
+
+		if (!string.IsNullOrEmpty(serializedState)) {
+			var deserialized = JsonConvert.DeserializeObject(serializedState, JsonSettings);
+			var array = deserialized as JArray;
+			if (array != null && array.Count > 0) {
+				state = array[0] as JToken;
+				if (array.Count == 2) {
+					result = array[1] as JToken;
+				}
+			} else {
+				state = deserialized as JObject;
+			}
+		}
+
+		var stateJson = state != null ? state.ToCanonicalJson() : "";
+		var resultJson = result != null ? result.ToCanonicalJson() : null;
+
+		return new PartitionState(stateJson, resultJson, causedBy);
+	}
+
+	private static void Error(JsonTextReader reader, string message) {
+		throw new Exception(string.Format("{0} (At: {1}, {2})", message, reader.LineNumber, reader.LinePosition));
+	}
+
+	private readonly string _state;
+	private readonly string _result;
+	private readonly CheckpointTag _causedBy;
+	private readonly int _size;
+
+	public PartitionState(string state, string result, CheckpointTag causedBy) {
+		if (state == null)
+			throw new ArgumentNullException("state");
+		if (causedBy == null)
+			throw new ArgumentNullException("causedBy");
+
+		_state = state;
+		_result = result;
+		_causedBy = causedBy;
+		_size = _state.Length + (_result?.Length ?? 0);
+	}
+
+	public string State {
+		get { return _state; }
+	}
+
+	public CheckpointTag CausedBy {
+		get { return _causedBy; }
+	}
+
+	public string Result {
+		get { return _result; }
+	}
+
+	public int Size {
+		get { return _size; }
+	}
+
+	public string Serialize() {
+		var state = _state;
+		if (state == "" && Result != null)
+			throw new Exception("state == \"\" && Result != null");
+		return Result != null
+			? "[" + state + "," + _result + "]"
+			: "[" + state + "]";
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Partitioning/PartitionStateCache.cs b/src/KurrentDB.Projections.Core/Services/Processing/Partitioning/PartitionStateCache.cs
new file mode 100644
index 00000000000..88624a3c045
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Partitioning/PartitionStateCache.cs
@@ -0,0 +1,159 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Partitioning;
+
+public class PartitionStateCache {
+	private readonly int _maxCachedPartitions;
+
+	private readonly LinkedList<Tuple<CheckpointTag, string>> _cacheOrder =
+		new LinkedList<Tuple<CheckpointTag, string>>();
+
+	private readonly Dictionary<string, Tuple<PartitionState, CheckpointTag>> _partitionStates =
+		new Dictionary<string, Tuple<PartitionState, CheckpointTag>>();
+
+	private int _cachedItemCount;
+
+	private CheckpointTag _unlockedBefore;
+	private readonly CheckpointTag _zeroPosition;
+
+	public PartitionStateCache(int maxCachedPartitions = 4000) {
+		_zeroPosition = CheckpointTag.Empty;
+		_unlockedBefore = CheckpointTag.Empty;
+		_maxCachedPartitions = maxCachedPartitions;
+	}
+
+	public int CachedItemCount {
+		get { return _cachedItemCount; }
+	}
+
+	public void Initialize() {
+		_partitionStates.Clear();
+		_cachedItemCount = 0;
+
+		_cacheOrder.Clear();
+		_unlockedBefore = _zeroPosition;
+	}
+
+	public void CacheAndLockPartitionState(string partition, PartitionState data, CheckpointTag at) {
+		if (partition == null)
+			throw new ArgumentNullException("partition");
+		if (data == null)
+			throw new ArgumentNullException("data");
+		EnsureCanLockPartitionAt(partition, at);
+
+		_partitionStates[partition] = Tuple.Create(data, at);
+		_cachedItemCount = _partitionStates.Count;
+
+		if (!string.IsNullOrEmpty(partition)) // cached forever - for root state
+			_cacheOrder.AddLast(Tuple.Create(at, partition));
+		CleanUp();
+	}
+
+	public void CachePartitionState(string partition, PartitionState data) {
+		if (partition == null)
+			throw new ArgumentNullException("partition");
+		if (data == null)
+			throw new ArgumentNullException("data");
+
+		_partitionStates[partition] = Tuple.Create(data, _zeroPosition);
+		_cachedItemCount = _partitionStates.Count;
+
+		_cacheOrder.AddFirst(Tuple.Create(_zeroPosition, partition));
+		CleanUp();
+	}
+
+	public PartitionState TryGetAndLockPartitionState(string partition, CheckpointTag lockAt) {
+		if (partition == null)
+			throw new ArgumentNullException("partition");
+		Tuple<PartitionState, CheckpointTag> stateData;
+		if (!_partitionStates.TryGetValue(partition, out stateData))
+			return null;
+		EnsureCanLockPartitionAt(partition, lockAt);
+		if (lockAt != null && lockAt <= stateData.Item2)
+			throw new InvalidOperationException(
+				string.Format(
+					"Attempt to relock the '{0}' partition state locked at the '{1}' position at the earlier position '{2}'",
+					partition, stateData.Item2, lockAt));
+
+		_partitionStates[partition] = Tuple.Create(stateData.Item1, lockAt);
+		_cachedItemCount = _partitionStates.Count;
+
+		if (!string.IsNullOrEmpty(partition)) // cached forever - for root state
+			_cacheOrder.AddLast(Tuple.Create(lockAt, partition));
+		CleanUp();
+		return stateData.Item1;
+	}
+
+	public PartitionState TryGetPartitionState(string partition) {
+		if (partition == null)
+			throw new ArgumentNullException("partition");
+		Tuple<PartitionState, CheckpointTag> stateData;
+		if (!_partitionStates.TryGetValue(partition, out stateData))
+			return null;
+		return stateData.Item1;
+	}
+
+	public PartitionState GetLockedPartitionState(string partition) {
+		Tuple<PartitionState, CheckpointTag> stateData;
+		if (!_partitionStates.TryGetValue(partition, out stateData)) {
+			throw new InvalidOperationException(
+				string.Format(
+					"Partition '{0}' state was requested as locked but it is missing in the cache.", partition));
+		}
+
+		if (stateData.Item2 != null && stateData.Item2 <= _unlockedBefore)
+			throw new InvalidOperationException(
+				string.Format(
+					"Partition '{0}' state was requested as locked but it is cached as unlocked", partition));
+		return stateData.Item1;
+	}
+
+	public void Unlock(CheckpointTag beforeCheckpoint, bool forgetUnlocked = false) {
+		_unlockedBefore = beforeCheckpoint;
+		CleanUp(removeAllUnlocked: forgetUnlocked);
+	}
+
+	private void CleanUp(bool removeAllUnlocked = false) {
+		while (removeAllUnlocked || _cacheOrder.Count > _maxCachedPartitions * 5
+								 || CachedItemCount > _maxCachedPartitions) {
+			if (_cacheOrder.Count == 0)
+				break;
+			Tuple<CheckpointTag, string> top = _cacheOrder.FirstOrDefault();
+			if (top.Item1 >= _unlockedBefore)
+				break; // other entries were locked after the checkpoint (or almost .. order is not very strong)
+			_cacheOrder.RemoveFirst();
+			Tuple<PartitionState, CheckpointTag> entry;
+			if (!_partitionStates.TryGetValue(top.Item2, out entry))
+				continue; // already removed
+			if (entry.Item2 >= _unlockedBefore)
+				continue; // was relocked
+
+			_partitionStates.Remove(top.Item2);
+			_cachedItemCount = _partitionStates.Count;
+		}
+	}
+
+	private void EnsureCanLockPartitionAt(string partition, CheckpointTag at) {
+		if (partition == null)
+			throw new ArgumentNullException("partition");
+		if (at == null && partition != "")
+			throw new InvalidOperationException("Only the root partition can be locked forever");
+		if (partition == "" && at != null)
+			throw new InvalidOperationException("Root partition must be locked forever");
+		if (at != null && at <= _unlockedBefore)
+			throw new InvalidOperationException(
+				string.Format(
+					"Attempt to lock the '{0}' partition state at the position '{1}' before the unlocked position '{2}'",
+					partition, at, _unlockedBefore));
+	}
+
+	public IEnumerable<Tuple<string, PartitionState>> Enumerate() {
+		return _partitionStates.Select(v => Tuple.Create(v.Key, v.Value.Item1)).ToList();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Partitioning/PartitionStateUpdateManager.cs b/src/KurrentDB.Projections.Core/Services/Processing/Partitioning/PartitionStateUpdateManager.cs
new file mode 100644
index 00000000000..8ccf2e68b43
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Partitioning/PartitionStateUpdateManager.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Partitioning;
+
+public class PartitionStateUpdateManager {
+	private class State {
+		public PartitionState PartitionState;
+		public CheckpointTag ExpectedTag;
+	}
+
+	private readonly Dictionary<string, State> _states = new Dictionary<string, State>();
+	private readonly ProjectionNamesBuilder _namingBuilder;
+
+	private readonly EmittedStream.WriterConfiguration.StreamMetadata _partitionCheckpointStreamMetadata =
+		new EmittedStream.WriterConfiguration.StreamMetadata(maxCount: 2);
+
+	public PartitionStateUpdateManager(ProjectionNamesBuilder namingBuilder) {
+		if (namingBuilder == null)
+			throw new ArgumentNullException("namingBuilder");
+		_namingBuilder = namingBuilder;
+	}
+
+	public void StateUpdated(string partition, PartitionState state, CheckpointTag basedOn) {
+		State stateEntry;
+		if (_states.TryGetValue(partition, out stateEntry)) {
+			stateEntry.PartitionState = state;
+		} else {
+			_states.Add(partition, new State { PartitionState = state, ExpectedTag = basedOn });
+		}
+	}
+
+	public void EmitEvents(IEventWriter eventWriter) {
+		if (_states.Count > 0) {
+			var list = new List<EmittedEventEnvelope>();
+			foreach (var entry in _states) {
+				var partition = entry.Key;
+				var streamId = _namingBuilder.MakePartitionCheckpointStreamName(partition);
+				var data = entry.Value.PartitionState.Serialize();
+				var causedBy = entry.Value.PartitionState.CausedBy;
+				var expectedTag = entry.Value.ExpectedTag;
+				list.Add(
+					new EmittedEventEnvelope(
+						new EmittedDataEvent(
+							streamId, Guid.NewGuid(), ProjectionEventTypes.PartitionCheckpoint, true,
+							data, null, causedBy, expectedTag), _partitionCheckpointStreamMetadata));
+			}
+
+			//NOTE: order yb is required to satisfy internal emit events validation
+			// which ensures that events are ordered by causedBy tag.
+			// it is too strong check, but ...
+			eventWriter.ValidateOrderAndEmitEvents(list.OrderBy(v => v.Event.CausedByTag).ToArray());
+		}
+	}
+
+	public void PartitionCompleted(string partition) {
+		_states.Remove(partition);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Partitioning/StatePartitionSelector.cs b/src/KurrentDB.Projections.Core/Services/Processing/Partitioning/StatePartitionSelector.cs
new file mode 100644
index 00000000000..609e6fa739d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Partitioning/StatePartitionSelector.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Partitioning;
+
+public abstract class StatePartitionSelector {
+	public abstract string GetStatePartition(EventReaderSubscriptionMessage.CommittedEventReceived @event);
+	public abstract bool EventReaderBasePartitionDeletedIsSupported();
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Phases/EventProcessingProjectionProcessingPhase.cs b/src/KurrentDB.Projections.Core/Services/Processing/Phases/EventProcessingProjectionProcessingPhase.cs
new file mode 100644
index 00000000000..5b8be52fa44
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Phases/EventProcessingProjectionProcessingPhase.cs
@@ -0,0 +1,389 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using KurrentDB.Core.Bus;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using KurrentDB.Projections.Core.Services.Processing.WorkItems;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Phases;
+
+public class EventProcessingProjectionProcessingPhase : EventSubscriptionBasedProjectionProcessingPhase,
+	IHandle<EventReaderSubscriptionMessage.CommittedEventReceived>,
+	IHandle<EventReaderSubscriptionMessage.PartitionEofReached>,
+	IHandle<EventReaderSubscriptionMessage.PartitionDeleted>,
+	IEventProcessingProjectionPhase {
+	private readonly IProjectionStateHandler _projectionStateHandler;
+	private readonly bool _definesStateTransform;
+	private readonly StatePartitionSelector _statePartitionSelector;
+	private readonly bool _isBiState;
+
+	private string _handlerPartition;
+
+	//private bool _sharedStateSet;
+	private readonly Stopwatch _stopwatch;
+
+
+	public EventProcessingProjectionProcessingPhase(
+		CoreProjection coreProjection,
+		Guid projectionCorrelationId,
+		IPublisher publisher,
+		IPublisher inputQueue,
+		ProjectionConfig projectionConfig,
+		Action updateStatistics,
+		IProjectionStateHandler projectionStateHandler,
+		PartitionStateCache partitionStateCache,
+		bool definesStateTransform,
+		string projectionName,
+		ILogger logger,
+		CheckpointTag zeroCheckpointTag,
+		ICoreProjectionCheckpointManager coreProjectionCheckpointManager,
+		StatePartitionSelector statePartitionSelector,
+		ReaderSubscriptionDispatcher subscriptionDispatcher,
+		IReaderStrategy readerStrategy,
+		IResultWriter resultWriter,
+		bool useCheckpoints,
+		bool stopOnEof,
+		bool isBiState,
+		bool orderedPartitionProcessing,
+		IEmittedStreamsTracker emittedStreamsTracker,
+		bool enableContentTypeValidation)
+		: base(
+			publisher,
+			inputQueue,
+			coreProjection,
+			projectionCorrelationId,
+			coreProjectionCheckpointManager,
+			projectionConfig,
+			projectionName,
+			logger,
+			zeroCheckpointTag,
+			partitionStateCache,
+			resultWriter,
+			updateStatistics,
+			subscriptionDispatcher,
+			readerStrategy,
+			useCheckpoints,
+			stopOnEof,
+			orderedPartitionProcessing,
+			isBiState,
+			emittedStreamsTracker,
+			enableContentTypeValidation) {
+		_projectionStateHandler = projectionStateHandler;
+		_definesStateTransform = definesStateTransform;
+		_statePartitionSelector = statePartitionSelector;
+		_isBiState = isBiState;
+
+		_stopwatch = new Stopwatch();
+	}
+
+	public void Handle(EventReaderSubscriptionMessage.CommittedEventReceived message) {
+		//TODO:  make sure this is no longer required : if (_state != State.StateLoaded)
+		if (IsOutOfOrderSubscriptionMessage(message))
+			return;
+		RegisterSubscriptionMessage(message);
+		try {
+			CheckpointTag eventTag = message.CheckpointTag;
+			var committedEventWorkItem = new CommittedEventWorkItem(this, message, _statePartitionSelector);
+			_processingQueue.EnqueueTask(committedEventWorkItem, eventTag);
+			if (_state == PhaseState.Running) // prevent processing mostly one projection
+				EnsureTickPending();
+		} catch (Exception ex) {
+			_coreProjection.SetFaulted(ex);
+		}
+	}
+
+	public void Handle(EventReaderSubscriptionMessage.PartitionDeleted message) {
+		//TODO:  make sure this is no longer required : if (_state != State.StateLoaded)
+		if (IsOutOfOrderSubscriptionMessage(message))
+			return;
+		RegisterSubscriptionMessage(message);
+		try {
+			if (_statePartitionSelector.EventReaderBasePartitionDeletedIsSupported()) {
+				var partitionDeletedWorkItem = new PartitionDeletedWorkItem(this, message);
+				_processingQueue.EnqueueOutOfOrderTask(partitionDeletedWorkItem);
+				if (_state == PhaseState.Running) // prevent processing mostly one projection
+					EnsureTickPending();
+			}
+		} catch (Exception ex) {
+			_coreProjection.SetFaulted(ex);
+		}
+	}
+
+	public void Handle(EventReaderSubscriptionMessage.PartitionEofReached message) {
+		if (IsOutOfOrderSubscriptionMessage(message))
+			return;
+		RegisterSubscriptionMessage(message);
+		try {
+			var partitionCompletedWorkItem = new PartitionCompletedWorkItem(
+				this, _checkpointManager, message.Partition, message.CheckpointTag);
+			_processingQueue.EnqueueTask(
+				partitionCompletedWorkItem, message.CheckpointTag, allowCurrentPosition: true);
+			ProcessEvent();
+		} catch (Exception ex) {
+			_coreProjection.SetFaulted(ex);
+		}
+	}
+
+	public EventProcessedResult ProcessCommittedEvent(
+		EventReaderSubscriptionMessage.CommittedEventReceived message, string partition) {
+		switch (_state) {
+			case PhaseState.Running:
+				var result = InternalProcessCommittedEvent(partition, message);
+				return result;
+			case PhaseState.Stopped:
+				_logger.Error("Ignoring committed event in stopped state");
+				return null;
+			default:
+				throw new NotSupportedException();
+		}
+	}
+
+	public EventProcessedResult ProcessPartitionDeleted(string partition, CheckpointTag deletedPosition) {
+		switch (_state) {
+			case PhaseState.Running:
+				var result = InternalProcessPartitionDeleted(partition, deletedPosition);
+				return result;
+			case PhaseState.Stopped:
+				_logger.Error("Ignoring committed event in stopped state");
+				return null;
+			default:
+				throw new NotSupportedException();
+		}
+	}
+
+	private EventProcessedResult InternalProcessCommittedEvent(
+		string partition, EventReaderSubscriptionMessage.CommittedEventReceived message) {
+		string newState;
+		string projectionResult;
+		EmittedEventEnvelope[] emittedEvents;
+		//TODO: support shared state
+		string newSharedState;
+		var hasBeenProcessed = SafeProcessEventByHandler(
+			partition, message, out newState, out newSharedState, out projectionResult, out emittedEvents);
+		if (hasBeenProcessed) {
+			var newPartitionState = new PartitionState(newState, projectionResult, message.CheckpointTag);
+			var newSharedPartitionState = newSharedState != null
+				? new PartitionState(newSharedState, null, message.CheckpointTag)
+				: null;
+
+			return InternalCommittedEventProcessed(
+				partition, message, emittedEvents, newPartitionState, newSharedPartitionState);
+		}
+
+		return null;
+	}
+
+	private EventProcessedResult InternalProcessPartitionDeleted(
+		string partition, CheckpointTag deletedPosition) {
+		string newState;
+		string projectionResult;
+		var hasBeenProcessed = SafeProcessPartitionDeletedByHandler(
+			partition, deletedPosition, out newState, out projectionResult);
+		if (hasBeenProcessed) {
+			var newPartitionState = new PartitionState(newState, projectionResult, deletedPosition);
+
+			return InternalPartitionDeletedProcessed(partition, deletedPosition, newPartitionState);
+		}
+
+		return null;
+	}
+
+	private bool SafeProcessEventByHandler(
+		string partition, EventReaderSubscriptionMessage.CommittedEventReceived message, out string newState,
+		out string newSharedState, out string projectionResult, out EmittedEventEnvelope[] emittedEvents) {
+		projectionResult = null;
+		//TODO: not emitting (optimized) projection handlers can skip serializing state on each processed event
+		bool hasBeenProcessed;
+		try {
+			hasBeenProcessed = ProcessEventByHandler(
+				partition, message, out newState, out newSharedState, out projectionResult, out emittedEvents);
+		} catch (Exception ex) {
+			// update progress to reflect exact fault position
+			_checkpointManager.Progress(message.Progress);
+			SetFaulting(
+				String.Format(
+					"The {0} projection failed to process an event.\r\nHandler: {1}\r\nEvent Position: {2}\r\n\r\nMessage:\r\n\r\n{3}",
+					_projectionName, GetHandlerTypeName(), message.CheckpointTag, ex.Message), ex);
+			newState = null;
+			newSharedState = null;
+			emittedEvents = null;
+			hasBeenProcessed = false;
+		}
+
+		newState = newState ?? "";
+		return hasBeenProcessed;
+	}
+
+	private bool SafeProcessPartitionDeletedByHandler(
+		string partition, CheckpointTag deletedPosition, out string newState,
+		out string projectionResult) {
+		projectionResult = null;
+		//TODO: not emitting (optimized) projection handlers can skip serializing state on each processed event
+		bool hasBeenProcessed;
+		try {
+			hasBeenProcessed = ProcessPartitionDeletedByHandler(
+				partition, deletedPosition, out newState, out projectionResult);
+		} catch (Exception ex) {
+			SetFaulting(
+				String.Format(
+					"The {0} projection failed to process a delete partition notification.\r\nHandler: {1}\r\nEvent Position: {2}\r\n\r\nMessage:\r\n\r\n{3}",
+					_projectionName, GetHandlerTypeName(), deletedPosition, ex.Message), ex);
+			newState = null;
+			hasBeenProcessed = false;
+		}
+
+		newState = newState ?? "";
+		return hasBeenProcessed;
+	}
+
+	private string GetHandlerTypeName() {
+		return _projectionStateHandler.GetType().Namespace + "." + _projectionStateHandler.GetType().Name;
+	}
+
+	private bool ProcessEventByHandler(
+		string partition, EventReaderSubscriptionMessage.CommittedEventReceived message, out string newState,
+		out string newSharedState, out string projectionResult, out EmittedEventEnvelope[] emittedEvents) {
+		projectionResult = null;
+		var newPatitionInitialized = InitOrLoadHandlerState(partition);
+		_stopwatch.Start();
+		EmittedEventEnvelope[] eventsEmittedOnInitialization = null;
+		if (newPatitionInitialized) {
+			_projectionStateHandler.ProcessPartitionCreated(
+				partition, message.CheckpointTag, message.Data, out eventsEmittedOnInitialization);
+		}
+
+		var result = _projectionStateHandler.ProcessEvent(
+			partition, message.CheckpointTag, message.EventCategory, message.Data, out newState, out newSharedState,
+			out emittedEvents);
+		if (result) {
+			var oldState = _partitionStateCache.GetLockedPartitionState(partition);
+			//TODO: depending on query processing final state to result transformation should happen either here (if EOF) on while writing results
+			if ( /*_producesRunningResults && */oldState.State != newState) {
+				if (_definesStateTransform) {
+					projectionResult = _projectionStateHandler.TransformStateToResult();
+				} else {
+					projectionResult = newState;
+				}
+			} else {
+				projectionResult = oldState.Result;
+			}
+		}
+
+		_stopwatch.Stop();
+		if (eventsEmittedOnInitialization != null) {
+			if (emittedEvents == null || emittedEvents.Length == 0)
+				emittedEvents = eventsEmittedOnInitialization;
+			else
+				emittedEvents = eventsEmittedOnInitialization.Concat(emittedEvents).ToArray();
+		}
+
+		return result;
+	}
+
+	private bool ProcessPartitionDeletedByHandler(
+		string partition, CheckpointTag deletePosition, out string newState,
+		out string projectionResult) {
+		projectionResult = null;
+		InitOrLoadHandlerState(partition);
+		_stopwatch.Start();
+		var result = _projectionStateHandler.ProcessPartitionDeleted(
+			partition, deletePosition, out newState);
+		if (result) {
+			var oldState = _partitionStateCache.GetLockedPartitionState(partition);
+			//TODO: depending on query processing final state to result transformation should happen either here (if EOF) on while writing results
+			if ( /*_producesRunningResults && */oldState.State != newState) {
+				if (_definesStateTransform) {
+					projectionResult = _projectionStateHandler.TransformStateToResult();
+				} else {
+					projectionResult = newState;
+				}
+			} else {
+				projectionResult = oldState.Result;
+			}
+		}
+
+		_stopwatch.Stop();
+		return result;
+	}
+
+	/// <summary>
+	/// initializes or loads existing partition state
+	/// </summary>
+	/// <param name="partition"></param>
+	/// <returns>true - if new partition state was initialized</returns>
+	private bool InitOrLoadHandlerState(string partition) {
+		if (_handlerPartition == partition)
+			return false;
+
+		var newState = _partitionStateCache.GetLockedPartitionState(partition);
+		_handlerPartition = partition;
+		var initialized = false;
+		if (newState != null && !String.IsNullOrEmpty(newState.State))
+			_projectionStateHandler.Load(newState.State);
+		else {
+			initialized = true;
+			_projectionStateHandler.Initialize();
+		}
+
+		//if (!_sharedStateSet && _isBiState)
+		if (_isBiState) {
+			var newSharedState = _partitionStateCache.GetLockedPartitionState("");
+			if (newSharedState != null && !String.IsNullOrEmpty(newSharedState.State))
+				_projectionStateHandler.LoadShared(newSharedState.State);
+			else
+				_projectionStateHandler.InitializeShared();
+		}
+
+		return initialized;
+	}
+
+	public override void NewCheckpointStarted(CheckpointTag at) {
+		if (!(_state == PhaseState.Running || _state == PhaseState.Starting)) {
+			_logger.Debug("Starting a checkpoint in non-runnable state");
+			return;
+		}
+
+		var checkpointHandler = _projectionStateHandler as IProjectionCheckpointHandler;
+		if (checkpointHandler != null) {
+			EmittedEventEnvelope[] emittedEvents;
+			try {
+				checkpointHandler.ProcessNewCheckpoint(at, out emittedEvents);
+			} catch (Exception ex) {
+				var faultedReason =
+					String.Format(
+						"The {0} projection failed to process a checkpoint start.\r\nHandler: {1}\r\nEvent Position: {2}\r\n\r\nMessage:\r\n\r\n{3}",
+						_projectionName, GetHandlerTypeName(), at, ex.Message);
+				SetFaulting(faultedReason, ex);
+				emittedEvents = null;
+			}
+
+			if (emittedEvents != null && emittedEvents.Length > 0) {
+				if (!ValidateEmittedEvents(emittedEvents))
+					return;
+
+				if (_state == PhaseState.Running || _state == PhaseState.Starting)
+					_resultWriter.EventsEmitted(
+						emittedEvents, Guid.Empty, correlationId: null);
+			}
+		}
+	}
+
+	public override void GetStatistics(ProjectionStatistics info) {
+		base.GetStatistics(info);
+		info.CoreProcessingTime = _stopwatch.ElapsedMilliseconds;
+	}
+
+	public override void Dispose() {
+		if (_projectionStateHandler != null)
+			_projectionStateHandler.Dispose();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Phases/EventSubscriptionBasedProjectionProcessingPhase.ProgressResultWriter.cs b/src/KurrentDB.Projections.Core/Services/Processing/Phases/EventSubscriptionBasedProjectionProcessingPhase.ProgressResultWriter.cs
new file mode 100644
index 00000000000..c4a1cbfb6a0
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Phases/EventSubscriptionBasedProjectionProcessingPhase.ProgressResultWriter.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Phases;
+
+public abstract partial class EventSubscriptionBasedProjectionProcessingPhase {
+	internal class ProgressResultWriter : IProgressResultWriter {
+		private readonly EventSubscriptionBasedProjectionProcessingPhase _phase;
+		private readonly IResultWriter _resultWriter;
+
+		public ProgressResultWriter(EventSubscriptionBasedProjectionProcessingPhase phase,
+			IResultWriter resultWriter) {
+			_phase = phase;
+			_resultWriter = resultWriter;
+		}
+
+		public void WriteProgress(float progress) {
+			_resultWriter.WriteProgress(_phase._currentSubscriptionId, progress);
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Phases/EventSubscriptionBasedProjectionProcessingPhase.cs b/src/KurrentDB.Projections.Core/Services/Processing/Phases/EventSubscriptionBasedProjectionProcessingPhase.cs
new file mode 100644
index 00000000000..58bbcb8f493
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Phases/EventSubscriptionBasedProjectionProcessingPhase.cs
@@ -0,0 +1,584 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics.Contracts;
+using System.Linq;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+using KurrentDB.Projections.Core.Services.Processing.WorkItems;
+using ILogger = Serilog.ILogger;
+using UnwrapEnvelopeMessage = KurrentDB.Projections.Core.Messaging.UnwrapEnvelopeMessage;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Phases;
+
+public abstract partial class EventSubscriptionBasedProjectionProcessingPhase : IProjectionPhaseCompleter,
+	IProjectionPhaseCheckpointManager,
+	IHandle<EventReaderSubscriptionMessage.ProgressChanged>,
+	IHandle<EventReaderSubscriptionMessage.SubscriptionStarted>,
+	IHandle<EventReaderSubscriptionMessage.NotAuthorized>,
+	IHandle<EventReaderSubscriptionMessage.EofReached>,
+	IHandle<EventReaderSubscriptionMessage.CheckpointSuggested>,
+	IHandle<EventReaderSubscriptionMessage.ReaderAssignedReader>,
+	IHandle<EventReaderSubscriptionMessage.Failed>,
+	IHandle<EventReaderSubscriptionMessage.SubscribeTimeout>,
+	IProjectionProcessingPhase,
+	IProjectionPhaseStateManager {
+	protected readonly IPublisher _publisher;
+	private readonly IPublisher _inputQueue;
+	protected readonly ICoreProjectionForProcessingPhase _coreProjection;
+	protected readonly Guid _projectionCorrelationId;
+	protected readonly ICoreProjectionCheckpointManager _checkpointManager;
+	protected readonly IProgressResultWriter _progressResultWriter;
+	protected readonly ProjectionConfig _projectionConfig;
+	protected readonly string _projectionName;
+	protected readonly ILogger _logger;
+	protected readonly CheckpointTag _zeroCheckpointTag;
+	protected readonly CoreProjectionQueue _processingQueue;
+	protected readonly PartitionStateCache _partitionStateCache;
+	protected readonly ReaderSubscriptionDispatcher _subscriptionDispatcher;
+	protected readonly IReaderStrategy _readerStrategy;
+	protected readonly IResultWriter _resultWriter;
+	protected readonly bool _useCheckpoints;
+	protected long _expectedSubscriptionMessageSequenceNumber = -1;
+	protected Guid _currentSubscriptionId;
+	protected PhaseSubscriptionState _subscriptionState;
+	protected PhaseState _state;
+	protected readonly bool _stopOnEof;
+	private readonly bool _isBiState;
+	protected readonly IEmittedStreamsTracker _emittedStreamsTracker;
+	protected readonly bool _enableContentTypeValidation;
+
+	private readonly Action _updateStatistics;
+
+	protected EventSubscriptionBasedProjectionProcessingPhase(
+		IPublisher publisher,
+		IPublisher inputQueue,
+		ICoreProjectionForProcessingPhase coreProjection,
+		Guid projectionCorrelationId,
+		ICoreProjectionCheckpointManager checkpointManager,
+		ProjectionConfig projectionConfig,
+		string projectionName,
+		ILogger logger,
+		CheckpointTag zeroCheckpointTag,
+		PartitionStateCache partitionStateCache,
+		IResultWriter resultWriter,
+		Action updateStatistics,
+		ReaderSubscriptionDispatcher subscriptionDispatcher,
+		IReaderStrategy readerStrategy,
+		bool useCheckpoints,
+		bool stopOnEof,
+		bool orderedPartitionProcessing,
+		bool isBiState,
+		IEmittedStreamsTracker emittedStreamsTracker,
+		bool enableContentTypeValidation) {
+		_publisher = publisher;
+		_inputQueue = inputQueue;
+		_coreProjection = coreProjection;
+		_projectionCorrelationId = projectionCorrelationId;
+		_checkpointManager = checkpointManager;
+		_projectionConfig = projectionConfig;
+		_projectionName = projectionName;
+		_logger = logger;
+		_zeroCheckpointTag = zeroCheckpointTag;
+		_partitionStateCache = partitionStateCache;
+		_resultWriter = resultWriter;
+		_updateStatistics = updateStatistics;
+		_processingQueue = new CoreProjectionQueue(publisher,
+			projectionConfig.PendingEventsThreshold,
+			orderedPartitionProcessing);
+		_processingQueue.EnsureTickPending += EnsureTickPending;
+		_subscriptionDispatcher = subscriptionDispatcher;
+		_readerStrategy = readerStrategy;
+		_useCheckpoints = useCheckpoints;
+		_stopOnEof = stopOnEof;
+		_isBiState = isBiState;
+		_progressResultWriter = new ProgressResultWriter(this, _resultWriter);
+		_inutQueueEnvelope = _inputQueue;
+		_emittedStreamsTracker = emittedStreamsTracker;
+		_enableContentTypeValidation = enableContentTypeValidation;
+	}
+
+	public void UnlockAndForgetBefore(CheckpointTag checkpointTag) {
+		_partitionStateCache.Unlock(checkpointTag, forgetUnlocked: true);
+	}
+
+	public CheckpointTag LastProcessedEventPosition {
+		get { return _coreProjection.LastProcessedEventPosition; }
+	}
+
+	public ICoreProjectionCheckpointManager CheckpointManager {
+		get { return _checkpointManager; }
+	}
+
+	public IEmittedStreamsTracker EmittedStreamsTracker {
+		get { return _emittedStreamsTracker; }
+	}
+
+	protected bool IsOutOfOrderSubscriptionMessage(EventReaderSubscriptionMessageBase message) {
+		if (_currentSubscriptionId != message.SubscriptionId)
+			return true;
+		if (_expectedSubscriptionMessageSequenceNumber != message.SubscriptionMessageSequenceNumber)
+			throw new InvalidOperationException("Out of order message detected");
+		return false;
+	}
+
+	protected void RegisterSubscriptionMessage(EventReaderSubscriptionMessageBase message) {
+		_expectedSubscriptionMessageSequenceNumber = message.SubscriptionMessageSequenceNumber + 1;
+	}
+
+	protected void EnsureTickPending() {
+		_coreProjection.EnsureTickPending();
+	}
+
+	public void ProcessEvent() {
+		_processingQueue.ProcessEvent();
+		EnsureUpdateStatisticksTickPending();
+	}
+
+	private void EnsureUpdateStatisticksTickPending() {
+		if (_updateStatisticsTicketPending)
+			return;
+		_updateStatisticsTicketPending = true;
+		_publisher.Publish(
+			TimerMessage.Schedule.Create(
+				_updateInterval,
+				_inutQueueEnvelope,
+				new UnwrapEnvelopeMessage(MarkTicketReceivedAndUpdateStatistics)));
+	}
+
+	private void MarkTicketReceivedAndUpdateStatistics() {
+		_updateStatisticsTicketPending = false;
+		UpdateStatistics();
+	}
+
+	private void UpdateStatistics() {
+		if (_updateStatistics != null)
+			_updateStatistics();
+	}
+
+	public void Handle(EventReaderSubscriptionMessage.ProgressChanged message) {
+		if (IsOutOfOrderSubscriptionMessage(message))
+			return;
+		RegisterSubscriptionMessage(message);
+		try {
+			var progressWorkItem =
+				new ProgressWorkItem(_checkpointManager, _progressResultWriter, message.Progress);
+			_processingQueue.EnqueueTask(progressWorkItem, message.CheckpointTag, allowCurrentPosition: true);
+			ProcessEvent();
+		} catch (Exception ex) {
+			_coreProjection.SetFaulted(ex);
+		}
+	}
+
+	public void Handle(EventReaderSubscriptionMessage.SubscriptionStarted message) {
+		if (IsOutOfOrderSubscriptionMessage(message))
+			return;
+		RegisterSubscriptionMessage(message);
+		try {
+			_subscriptionStartedAtLastCommitPosition = message.StartingLastCommitPosition;
+		} catch (Exception ex) {
+			_coreProjection.SetFaulted(ex);
+		}
+	}
+
+	public void Handle(EventReaderSubscriptionMessage.NotAuthorized message) {
+		if (IsOutOfOrderSubscriptionMessage(message))
+			return;
+		RegisterSubscriptionMessage(message);
+		try {
+			var progressWorkItem = new NotAuthorizedWorkItem();
+			_processingQueue.EnqueueTask(progressWorkItem, message.CheckpointTag, allowCurrentPosition: true);
+			ProcessEvent();
+		} catch (Exception ex) {
+			_coreProjection.SetFaulted(ex);
+		}
+	}
+
+	public void Unsubscribed() {
+		_subscriptionDispatcher.Cancel(_projectionCorrelationId);
+		_subscriptionState = PhaseSubscriptionState.Unsubscribed;
+		_processingQueue.Unsubscribed();
+	}
+
+	public void Handle(EventReaderSubscriptionMessage.EofReached message) {
+		if (IsOutOfOrderSubscriptionMessage(message))
+			return;
+		RegisterSubscriptionMessage(message);
+		try {
+			Unsubscribed();
+			var completedWorkItem = new CompletedWorkItem(this);
+			_processingQueue.EnqueueTask(completedWorkItem, message.CheckpointTag, allowCurrentPosition: true);
+			ProcessEvent();
+		} catch (Exception ex) {
+			_coreProjection.SetFaulted(ex);
+		}
+	}
+
+	public void Handle(EventReaderSubscriptionMessage.CheckpointSuggested message) {
+		if (IsOutOfOrderSubscriptionMessage(message))
+			return;
+		RegisterSubscriptionMessage(message);
+		try {
+			if (_useCheckpoints) {
+				CheckpointTag checkpointTag = message.CheckpointTag;
+				var checkpointSuggestedWorkItem =
+					new CheckpointSuggestedWorkItem(this, message, _checkpointManager);
+				_processingQueue.EnqueueTask(checkpointSuggestedWorkItem, checkpointTag,
+					allowCurrentPosition: true);
+			}
+
+			ProcessEvent();
+		} catch (Exception ex) {
+			_coreProjection.SetFaulted(ex);
+		}
+	}
+
+	public void Handle(CoreProjectionManagementMessage.GetState message) {
+		try {
+			var getStateWorkItem = new GetStateWorkItem(
+				_publisher, message.CorrelationId, message.ProjectionId, this, message.Partition);
+			_processingQueue.EnqueueOutOfOrderTask(getStateWorkItem);
+			ProcessEvent();
+		} catch (Exception ex) {
+			_publisher.Publish(
+				new CoreProjectionStatusMessage.StateReport(
+					message.CorrelationId, _projectionCorrelationId, message.Partition, state: null,
+					position: null));
+			_coreProjection.SetFaulted(ex);
+		}
+	}
+
+	public void Handle(CoreProjectionManagementMessage.GetResult message) {
+		try {
+			var getResultWorkItem = new GetResultWorkItem(
+				_publisher, message.CorrelationId, message.ProjectionId, this, message.Partition);
+			_processingQueue.EnqueueOutOfOrderTask(getResultWorkItem);
+			ProcessEvent();
+		} catch (Exception ex) {
+			_publisher.Publish(
+				new CoreProjectionStatusMessage.ResultReport(
+					message.CorrelationId, _projectionCorrelationId, message.Partition, result: null,
+					position: null));
+			_coreProjection.SetFaulted(ex);
+		}
+	}
+
+	public void Handle(EventReaderSubscriptionMessage.SubscribeTimeout message) {
+		if (_subscriptionState is not PhaseSubscriptionState.Subscribing
+			|| message.SubscriptionId != _currentSubscriptionId)
+			return;
+		SubscriptionFailed("Reader subscription timed out");
+	}
+
+	public void Handle(EventReaderSubscriptionMessage.Failed message) => SubscriptionFailed(message.Reason);
+
+	private void SubscriptionFailed(string reason) {
+		if (_subscriptionState is PhaseSubscriptionState.Subscribed or PhaseSubscriptionState.Subscribing)
+			_subscriptionDispatcher.Cancel(_currentSubscriptionId);
+		_subscriptionState = PhaseSubscriptionState.Failed;
+		_coreProjection.SetFaulted(reason);
+	}
+
+	protected void UnsubscribeFromPreRecordedOrderEvents() {
+		// projectionCorrelationId is used as a subscription identifier for delivery
+		// of pre-recorded order events recovered by checkpoint manager
+		_subscriptionDispatcher.Cancel(_projectionCorrelationId);
+		_subscriptionState = PhaseSubscriptionState.Unsubscribed;
+	}
+
+	public void Subscribed(Guid subscriptionId) {
+		_processingQueue.Subscribed(subscriptionId);
+	}
+
+	public ReaderSubscriptionOptions GetSubscriptionOptions() {
+		return new ReaderSubscriptionOptions(
+			_projectionConfig.CheckpointUnhandledBytesThreshold, _projectionConfig.CheckpointHandledThreshold,
+			_projectionConfig.CheckpointAfterMs,
+			_stopOnEof, stopAfterNEvents: null, _enableContentTypeValidation);
+	}
+
+	protected void SubscribeReaders(CheckpointTag checkpointTag) {
+		_expectedSubscriptionMessageSequenceNumber = 0;
+		_currentSubscriptionId = Guid.NewGuid();
+		Subscribed(_currentSubscriptionId);
+		var readerStrategy = _readerStrategy;
+		if (readerStrategy != null) {
+			_subscriptionState = PhaseSubscriptionState.Subscribing;
+			_subscriptionDispatcher.PublishSubscribe(
+				new ReaderSubscriptionManagement.Subscribe(
+					_currentSubscriptionId, checkpointTag, readerStrategy,
+					GetSubscriptionOptions()), this, scheduleTimeout: true);
+		} else {
+			_coreProjection.Subscribed();
+		}
+	}
+
+	public void SubscribeToPreRecordedOrderEvents() {
+		var coreProjection = (CoreProjection)_coreProjection;
+		// projectionCorrelationId is used as a subscription identifier for delivery
+		// of pre-recorded order events recovered by checkpoint manager
+		_expectedSubscriptionMessageSequenceNumber = 0;
+		_currentSubscriptionId = coreProjection._projectionCorrelationId;
+		_subscriptionDispatcher.Subscribed(coreProjection._projectionCorrelationId, this);
+		// even if it is not a real subscription we need to unsubscribe
+		_subscriptionState = PhaseSubscriptionState.Subscribed;
+	}
+
+	public virtual void Subscribe(CheckpointTag from, bool fromCheckpoint) {
+		Contract.Assert(_checkpointManager.LastProcessedEventPosition == @from);
+		if (fromCheckpoint) {
+			SubscribeToPreRecordedOrderEvents();
+			_checkpointManager.BeginLoadPrerecordedEvents(@from);
+		} else
+			SubscribeReaders(@from);
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.PrerecordedEventsLoaded message) {
+		UnsubscribeFromPreRecordedOrderEvents();
+		SubscribeReaders(message.CheckpointTag);
+	}
+
+	public CheckpointTag AdjustTag(CheckpointTag tag) {
+		return _readerStrategy.PositionTagger.AdjustTag(tag);
+	}
+
+	protected void SetFaulting(string faultedReason, Exception ex = null) {
+		if (_logger != null) {
+			if (ex != null)
+				_logger.Error(ex, faultedReason);
+			else
+				_logger.Error(faultedReason);
+		}
+
+		_coreProjection.SetFaulting(faultedReason);
+	}
+
+	protected bool ValidateEmittedEvents(EmittedEventEnvelope[] emittedEvents) {
+		if (!_projectionConfig.EmitEventEnabled) {
+			if (emittedEvents != null && emittedEvents.Length > 0) {
+				SetFaulting("'emit' is not allowed by the projection/configuration/mode");
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	public abstract void NewCheckpointStarted(CheckpointTag at);
+
+	public void InitializeFromCheckpoint(CheckpointTag checkpointTag) {
+		_subscriptionState = PhaseSubscriptionState.Unknown;
+		// this can be old checkpoint
+		var adjustedCheckpointTag = _readerStrategy.PositionTagger.AdjustTag(checkpointTag);
+		_processingQueue.InitializeQueue(adjustedCheckpointTag);
+	}
+
+	public int GetBufferedEventCount() {
+		return _processingQueue.GetBufferedEventCount();
+	}
+
+	public string GetStatus() {
+		return _processingQueue.GetStatus();
+	}
+
+	protected EventProcessedResult InternalCommittedEventProcessed(
+		string partition, EventReaderSubscriptionMessage.CommittedEventReceived message,
+		EmittedEventEnvelope[] emittedEvents, PartitionState newPartitionState,
+		PartitionState newSharedPartitionState) {
+		if (_subscriptionState != PhaseSubscriptionState.Subscribed)
+			_logger?.Verbose("Got CommittedEventReceived in {state} SubscriptionState, but expected to be in {expectedState}",
+				_subscriptionState, PhaseSubscriptionState.Subscribed);
+
+		if (!ValidateEmittedEvents(emittedEvents))
+			return null;
+
+		bool eventsWereEmitted = emittedEvents != null;
+		var oldState = _partitionStateCache.GetLockedPartitionState(partition);
+		var oldSharedState = _isBiState ? _partitionStateCache.GetLockedPartitionState("") : null;
+		bool changed = oldState.IsChanged(newPartitionState)
+					   || (_isBiState && oldSharedState.IsChanged(newSharedPartitionState));
+
+		PartitionState partitionState = null;
+		// NOTE: projectionResult cannot change independently unless projection definition has changed
+		if (changed) {
+			var lockPartitionStateAt = partition != "" ? message.CheckpointTag : null;
+			partitionState = newPartitionState;
+			_partitionStateCache.CacheAndLockPartitionState(partition, partitionState, lockPartitionStateAt);
+			if (_isBiState) {
+				_partitionStateCache.CacheAndLockPartitionState("", newSharedPartitionState, null);
+			}
+		}
+
+		if (changed || eventsWereEmitted) {
+			var correlationId =
+				message.Data.IsJson ? message.Data.Metadata.ParseCheckpointTagCorrelationId() : null;
+			return new EventProcessedResult(
+				partition, message.CheckpointTag, oldState, partitionState, oldSharedState, newSharedPartitionState,
+				emittedEvents, message.Data.EventId, correlationId);
+		} else
+			return null;
+	}
+
+	protected EventProcessedResult InternalPartitionDeletedProcessed(
+		string partition, CheckpointTag deletePosition,
+		PartitionState newPartitionState
+	) {
+		var oldState = _partitionStateCache.GetLockedPartitionState(partition);
+		var oldSharedState = _isBiState ? _partitionStateCache.GetLockedPartitionState("") : null;
+		bool changed = oldState.IsChanged(newPartitionState);
+
+
+		PartitionState partitionState = null;
+		// NOTE: projectionResult cannot change independently unless projection definition has changed
+		if (changed) {
+			var lockPartitionStateAt = partition != "" ? deletePosition : null;
+			partitionState = newPartitionState;
+			_partitionStateCache.CacheAndLockPartitionState(partition, partitionState, lockPartitionStateAt);
+		}
+
+		return new EventProcessedResult(
+			partition, deletePosition, oldState, partitionState, oldSharedState, null, null, Guid.Empty, null,
+			isPartitionTombstone: true);
+	}
+
+	public void BeginGetPartitionStateAt(
+		string statePartition, CheckpointTag at, Action<PartitionState> loadCompleted, bool lockLoaded) {
+		if (statePartition == "") // root is always cached
+		{
+			// root partition is always locked
+			var state = _partitionStateCache.TryGetAndLockPartitionState(statePartition, null);
+			loadCompleted(state);
+		} else {
+			var s = lockLoaded
+				? _partitionStateCache.TryGetAndLockPartitionState(statePartition, at)
+				: _partitionStateCache.TryGetPartitionState(statePartition);
+			if (s != null)
+				loadCompleted(s);
+			else {
+				Action<PartitionState> completed = state => {
+					if (lockLoaded)
+						_partitionStateCache.CacheAndLockPartitionState(statePartition, state, at);
+					else
+						_partitionStateCache.CachePartitionState(statePartition, state);
+					loadCompleted(state);
+				};
+				if (_projectionConfig.CheckpointsEnabled) {
+					_checkpointManager.BeginLoadPartitionStateAt(statePartition, at, completed);
+				} else {
+					var state = new PartitionState("", null, _zeroCheckpointTag);
+					completed(state);
+				}
+			}
+		}
+	}
+
+	public void FinalizeEventProcessing(
+		EventProcessedResult result, CheckpointTag eventCheckpointTag, float progress) {
+		if (_state == PhaseState.Running) {
+			//TODO: move to separate projection method and cache result in work item
+			if (result != null) {
+				_resultWriter.AccountPartition(result);
+				if (_projectionConfig.EmitEventEnabled && result.EmittedEvents != null) {
+					_resultWriter.EventsEmitted(
+						result.EmittedEvents, result.CausedBy, result.CorrelationId);
+					_emittedStreamsTracker.TrackEmittedStream(result.EmittedEvents.Select(x => x.Event).ToArray());
+				}
+
+				if (result.NewState != null) {
+					_resultWriter.WriteRunningResult(result);
+					_checkpointManager.StateUpdated(result.Partition, result.OldState, result.NewState);
+				}
+
+				if (result.NewSharedState != null) {
+					_checkpointManager.StateUpdated("", result.OldSharedState, result.NewSharedState);
+				}
+			}
+
+			_checkpointManager.EventProcessed(eventCheckpointTag, progress);
+			_progressResultWriter.WriteProgress(progress);
+		}
+	}
+
+	public void EmitEofResult(
+		string partition, string resultBody, CheckpointTag causedBy, Guid causedByGuid, string correlationId) {
+		_resultWriter.WriteEofResult(
+			_currentSubscriptionId, partition, resultBody, causedBy, causedByGuid, correlationId);
+	}
+
+	public void RecordEventOrder(ResolvedEvent resolvedEvent, CheckpointTag orderCheckpointTag, Action completed) {
+		switch (_state) {
+			case PhaseState.Running:
+				_checkpointManager.RecordEventOrder(
+					resolvedEvent, orderCheckpointTag, completed);
+				break;
+			case PhaseState.Stopped:
+				_logger.Error("Should not receive events in stopped state anymore");
+				completed(); // allow collecting events for debugging
+				break;
+		}
+	}
+
+	public void Complete() {
+		//NOTE: no need for EnsureUnsubscribed  as EOF
+		Unsubscribed();
+		_coreProjection.CompletePhase();
+	}
+
+	public void SetCurrentCheckpointSuggestedWorkItem(CheckpointSuggestedWorkItem checkpointSuggestedWorkItem) {
+		_coreProjection.SetCurrentCheckpointSuggestedWorkItem(checkpointSuggestedWorkItem);
+	}
+
+	public virtual void GetStatistics(ProjectionStatistics info) {
+		info.Status = info.Status + GetStatus();
+		info.BufferedEvents += GetBufferedEventCount();
+	}
+
+	public CheckpointTag MakeZeroCheckpointTag() {
+		return _zeroCheckpointTag;
+	}
+
+	public void EnsureUnsubscribed() {
+		if (_subscriptionState is PhaseSubscriptionState.Subscribed) {
+			Unsubscribed();
+			// this way we distinguish pre-recorded events subscription
+			if (_currentSubscriptionId != _projectionCorrelationId)
+				_publisher.Publish(
+					new ReaderSubscriptionManagement.Unsubscribe(_currentSubscriptionId));
+		}
+	}
+
+	protected long _subscriptionStartedAtLastCommitPosition;
+	private readonly IEnvelope _inutQueueEnvelope;
+	private readonly TimeSpan _updateInterval = TimeSpan.FromMilliseconds(250);
+	private bool _updateStatisticsTicketPending;
+
+	public void Handle(EventReaderSubscriptionMessage.ReaderAssignedReader message) {
+		if (_state != PhaseState.Starting)
+			return;
+		if (_subscriptionState is not PhaseSubscriptionState.Subscribing
+			|| message.SubscriptionId != _currentSubscriptionId)
+			return;
+		_subscriptionState = PhaseSubscriptionState.Subscribed;
+		_coreProjection.Subscribed();
+	}
+
+	public abstract void Dispose();
+
+	public void SetProjectionState(PhaseState state) {
+		var starting = _state == PhaseState.Starting && state == PhaseState.Running;
+
+		_state = state;
+		_processingQueue.SetIsRunning(state == PhaseState.Running);
+		if (starting)
+			NewCheckpointStarted(LastProcessedEventPosition);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Phases/ICoreProjectionForProcessingPhase.cs b/src/KurrentDB.Projections.Core/Services/Processing/Phases/ICoreProjectionForProcessingPhase.cs
new file mode 100644
index 00000000000..b0caadb0ce7
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Phases/ICoreProjectionForProcessingPhase.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.WorkItems;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Phases;
+
+public interface ICoreProjectionForProcessingPhase {
+	void CompletePhase();
+	void SetFaulted(string reason);
+	void SetFaulted(Exception ex);
+	void SetFaulting(string reason);
+	void SetCurrentCheckpointSuggestedWorkItem(CheckpointSuggestedWorkItem checkpointSuggestedWorkItem);
+	void EnsureTickPending();
+	CheckpointTag LastProcessedEventPosition { get; }
+	void Subscribed();
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Phases/IEventProcessingPhase.cs b/src/KurrentDB.Projections.Core/Services/Processing/Phases/IEventProcessingPhase.cs
new file mode 100644
index 00000000000..4ce756148ab
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Phases/IEventProcessingPhase.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using KurrentDB.Projections.Core.Services.Processing.WorkItems;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Phases;
+
+public interface IProjectionPhaseCompleter {
+	void Complete();
+}
+
+public interface IProjectionPhaseCheckpointManager {
+	void NewCheckpointStarted(CheckpointTag checkpointTag);
+	void SetCurrentCheckpointSuggestedWorkItem(CheckpointSuggestedWorkItem checkpointSuggestedWorkItem);
+}
+
+public interface IProjectionPhaseStateManager {
+	void BeginGetPartitionStateAt(
+		string statePartition, CheckpointTag at, Action<PartitionState> loadCompleted,
+		bool lockLoaded);
+
+	void UnlockAndForgetBefore(CheckpointTag checkpointTag);
+
+	CheckpointTag LastProcessedEventPosition { get; }
+}
+
+public interface IEventProcessingProjectionPhase : IProjectionPhaseStateManager {
+	EventProcessedResult ProcessCommittedEvent(EventReaderSubscriptionMessage.CommittedEventReceived message,
+		string partition);
+
+	void FinalizeEventProcessing(
+		EventProcessedResult result, CheckpointTag eventCheckpointTag, float progress);
+
+	void RecordEventOrder(ResolvedEvent resolvedEvent, CheckpointTag orderCheckpointTag, Action completed);
+
+	void EmitEofResult(
+		string partition, string resultBody, CheckpointTag causedBy, Guid causedByGuid, string correlationId);
+
+	EventProcessedResult ProcessPartitionDeleted(string partition, CheckpointTag deletedPosition);
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Phases/IProgressResultWriter.cs b/src/KurrentDB.Projections.Core/Services/Processing/Phases/IProgressResultWriter.cs
new file mode 100644
index 00000000000..aee5f85328a
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Phases/IProgressResultWriter.cs
@@ -0,0 +1,8 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Services.Processing.Phases;
+
+public interface IProgressResultWriter {
+	void WriteProgress(float progress);
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Phases/IProjectionProcessingPhase.cs b/src/KurrentDB.Projections.Core/Services/Processing/Phases/IProjectionProcessingPhase.cs
new file mode 100644
index 00000000000..b71d050b47d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Phases/IProjectionProcessingPhase.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Phases;
+
+public interface IProjectionProcessingPhase : IDisposable,
+	IHandle<CoreProjectionManagementMessage.GetState>,
+	IHandle<CoreProjectionManagementMessage.GetResult>,
+	IHandle<CoreProjectionProcessingMessage.PrerecordedEventsLoaded> {
+	CheckpointTag AdjustTag(CheckpointTag tag);
+
+	void InitializeFromCheckpoint(CheckpointTag checkpointTag);
+
+	//TODO: remove from - it is passed for validation purpose only
+	void Subscribe(CheckpointTag from, bool fromCheckpoint);
+
+	void ProcessEvent();
+
+	void EnsureUnsubscribed();
+
+	void SetProjectionState(PhaseState state);
+
+	void GetStatistics(ProjectionStatistics info);
+
+	CheckpointTag MakeZeroCheckpointTag();
+	ICoreProjectionCheckpointManager CheckpointManager { get; }
+	IEmittedStreamsTracker EmittedStreamsTracker { get; }
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Phases/PhasePositionTagger.cs b/src/KurrentDB.Projections.Core/Services/Processing/Phases/PhasePositionTagger.cs
new file mode 100644
index 00000000000..59716ea645b
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Phases/PhasePositionTagger.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Phases;
+
+public class PhasePositionTagger : PositionTagger {
+	public PhasePositionTagger(int phase) : base(phase) {
+	}
+
+	public override bool IsMessageAfterCheckpointTag(
+		CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
+		throw new NotSupportedException();
+	}
+
+	public override CheckpointTag MakeCheckpointTag(
+		CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
+		throw new NotSupportedException();
+	}
+
+	public override CheckpointTag MakeCheckpointTag(CheckpointTag previous,
+		ReaderSubscriptionMessage.EventReaderPartitionEof partitionEof) {
+		throw new NotSupportedException();
+	}
+
+	public override CheckpointTag MakeCheckpointTag(CheckpointTag previous,
+		ReaderSubscriptionMessage.EventReaderPartitionDeleted partitionDeleted) {
+		throw new NotSupportedException();
+	}
+
+	public override CheckpointTag MakeZeroCheckpointTag() {
+		return CheckpointTag.FromPhase(Phase, completed: false);
+	}
+
+	public override bool IsCompatible(CheckpointTag checkpointTag) {
+		return checkpointTag.Mode_ == CheckpointTag.Mode.Phase;
+	}
+
+	public override CheckpointTag AdjustTag(CheckpointTag tag) {
+		if (tag.Phase < Phase)
+			return tag;
+		if (tag.Phase > Phase)
+			throw new ArgumentException(
+				string.Format("Invalid checkpoint tag phase.  Expected less or equal to: {0} Was: {1}", Phase,
+					tag.Phase), "tag");
+
+		if (tag.Mode_ == CheckpointTag.Mode.Phase) {
+			return tag;
+		}
+
+		throw new NotSupportedException("Conversion to phase based checkpoint tag is not supported");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Phases/PhaseState.cs b/src/KurrentDB.Projections.Core/Services/Processing/Phases/PhaseState.cs
new file mode 100644
index 00000000000..47fb3489dbe
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Phases/PhaseState.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Services.Processing.Phases;
+
+public enum PhaseState {
+	Unknown,
+	Stopped,
+	Starting,
+	Running,
+}
+
+public enum PhaseSubscriptionState {
+	Unknown = 0,
+	Unsubscribed,
+	Subscribing,
+	Subscribed,
+	Failed
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Phases/WriteQueryEofProjectionProcessingPhase.cs b/src/KurrentDB.Projections.Core/Services/Processing/Phases/WriteQueryEofProjectionProcessingPhase.cs
new file mode 100644
index 00000000000..0b05d2f0d55
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Phases/WriteQueryEofProjectionProcessingPhase.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Bus;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Phases;
+
+public sealed class WriteQueryEofProjectionProcessingPhase : WriteQueryResultProjectionProcessingPhaseBase {
+	public WriteQueryEofProjectionProcessingPhase(
+		IPublisher publisher,
+		int phase,
+		string resultStream,
+		ICoreProjectionForProcessingPhase coreProjection,
+		PartitionStateCache stateCache,
+		ICoreProjectionCheckpointManager checkpointManager,
+		IEmittedEventWriter emittedEventWriter,
+		IEmittedStreamsTracker emittedStreamsTracker)
+		: base(publisher, phase, resultStream, coreProjection, stateCache, checkpointManager, emittedEventWriter,
+			emittedStreamsTracker) {
+	}
+
+	protected override IEnumerable<EmittedEventEnvelope> WriteResults(CheckpointTag phaseCheckpointTag) {
+		// do nothing
+		yield break;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Phases/WriteQueryResultProjectionProcessingPhase.cs b/src/KurrentDB.Projections.Core/Services/Processing/Phases/WriteQueryResultProjectionProcessingPhase.cs
new file mode 100644
index 00000000000..329ccc8e0a8
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Phases/WriteQueryResultProjectionProcessingPhase.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Bus;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Phases;
+
+public sealed class WriteQueryResultProjectionProcessingPhase : WriteQueryResultProjectionProcessingPhaseBase {
+	public WriteQueryResultProjectionProcessingPhase(
+		IPublisher publisher,
+		int phase,
+		string resultStream,
+		ICoreProjectionForProcessingPhase coreProjection,
+		PartitionStateCache stateCache,
+		ICoreProjectionCheckpointManager checkpointManager,
+		IEmittedEventWriter emittedEventWriter,
+		IEmittedStreamsTracker emittedStreamsTracker)
+		: base(publisher, phase, resultStream, coreProjection, stateCache, checkpointManager, emittedEventWriter,
+			emittedStreamsTracker) {
+	}
+
+	protected override IEnumerable<EmittedEventEnvelope> WriteResults(CheckpointTag phaseCheckpointTag) {
+		var items = _stateCache.Enumerate();
+		EmittedStream.WriterConfiguration.StreamMetadata streamMetadata = null;
+		return from item in items
+			   let partitionState = item.Item2
+			   select
+				   new EmittedEventEnvelope(
+					   new EmittedDataEvent(
+						   _resultStream,
+						   Guid.NewGuid(),
+						   "Result",
+						   true,
+						   partitionState.Result,
+						   null,
+						   phaseCheckpointTag,
+						   null),
+					   streamMetadata);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Phases/WriteQueryResultProjectionProcessingPhaseBase.cs b/src/KurrentDB.Projections.Core/Services/Processing/Phases/WriteQueryResultProjectionProcessingPhaseBase.cs
new file mode 100644
index 00000000000..63aab522348
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Phases/WriteQueryResultProjectionProcessingPhaseBase.cs
@@ -0,0 +1,163 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Bus;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Phases;
+
+public abstract class WriteQueryResultProjectionProcessingPhaseBase : IProjectionProcessingPhase {
+	private readonly IPublisher _publisher;
+	private readonly int _phase;
+	protected readonly string _resultStream;
+	private readonly ICoreProjectionForProcessingPhase _coreProjection;
+	protected readonly PartitionStateCache _stateCache;
+	protected readonly ICoreProjectionCheckpointManager _checkpointManager;
+	protected readonly IEmittedEventWriter _emittedEventWriter;
+	protected readonly IEmittedStreamsTracker _emittedStreamsTracker;
+	private bool _subscribed;
+	private PhaseState _projectionState;
+
+	public WriteQueryResultProjectionProcessingPhaseBase(
+		IPublisher publisher,
+		int phase,
+		string resultStream,
+		ICoreProjectionForProcessingPhase coreProjection,
+		PartitionStateCache stateCache,
+		ICoreProjectionCheckpointManager checkpointManager,
+		IEmittedEventWriter emittedEventWriter,
+		IEmittedStreamsTracker emittedStreamsTracker) {
+		if (resultStream == null)
+			throw new ArgumentNullException("resultStream");
+		if (coreProjection == null)
+			throw new ArgumentNullException("coreProjection");
+		if (stateCache == null)
+			throw new ArgumentNullException("stateCache");
+		if (checkpointManager == null)
+			throw new ArgumentNullException("checkpointManager");
+		if (emittedEventWriter == null)
+			throw new ArgumentNullException("emittedEventWriter");
+		if (emittedStreamsTracker == null)
+			throw new ArgumentNullException("emittedStreamsTracker");
+		if (string.IsNullOrEmpty(resultStream))
+			throw new ArgumentException("resultStream");
+
+		_publisher = publisher;
+		_phase = phase;
+		_resultStream = resultStream;
+		_coreProjection = coreProjection;
+		_stateCache = stateCache;
+		_checkpointManager = checkpointManager;
+		_emittedEventWriter = emittedEventWriter;
+		_emittedStreamsTracker = emittedStreamsTracker;
+	}
+
+	public ICoreProjectionCheckpointManager CheckpointManager {
+		get { return _checkpointManager; }
+	}
+
+	public IEmittedStreamsTracker EmittedStreamsTracker {
+		get { return _emittedStreamsTracker; }
+	}
+
+	public void Dispose() {
+	}
+
+	public void Handle(CoreProjectionManagementMessage.GetState message) {
+		var state = _stateCache.TryGetPartitionState(message.Partition);
+		var stateString = state != null ? state.State : null;
+		_publisher.Publish(
+			new CoreProjectionStatusMessage.StateReport(
+				message.CorrelationId,
+				message.CorrelationId,
+				message.Partition,
+				state: stateString,
+				position: null));
+	}
+
+	public void Handle(CoreProjectionManagementMessage.GetResult message) {
+		var state = _stateCache.TryGetPartitionState(message.Partition);
+		var resultString = state != null ? state.Result : null;
+		_publisher.Publish(
+			new CoreProjectionStatusMessage.ResultReport(
+				message.CorrelationId,
+				message.CorrelationId,
+				message.Partition,
+				result: resultString,
+				position: null));
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.PrerecordedEventsLoaded message) {
+		throw new NotImplementedException();
+	}
+
+	public CheckpointTag AdjustTag(CheckpointTag tag) {
+		return tag;
+	}
+
+	public void InitializeFromCheckpoint(CheckpointTag checkpointTag) {
+		_subscribed = false;
+	}
+
+	public void ProcessEvent() {
+		if (!_subscribed)
+			throw new InvalidOperationException();
+		if (_projectionState != PhaseState.Running)
+			return;
+
+		var phaseCheckpointTag = CheckpointTag.FromPhase(_phase, completed: true);
+		var writeResults = WriteResults(phaseCheckpointTag);
+
+		var writeEofResults = WriteEofEvent(phaseCheckpointTag);
+
+		_emittedEventWriter.EventsEmitted(writeResults.Concat(writeEofResults).ToArray(), Guid.Empty, null);
+
+		_checkpointManager.EventProcessed(phaseCheckpointTag, 100.0f);
+		_coreProjection.CompletePhase();
+	}
+
+	private IEnumerable<EmittedEventEnvelope> WriteEofEvent(CheckpointTag phaseCheckpointTag) {
+		EmittedStream.WriterConfiguration.StreamMetadata streamMetadata = null;
+		yield return
+			new EmittedEventEnvelope(
+				new EmittedDataEvent(
+					_resultStream,
+					Guid.NewGuid(),
+					"$Eof",
+					true,
+					null,
+					null,
+					phaseCheckpointTag,
+					null),
+				streamMetadata);
+	}
+
+	protected abstract IEnumerable<EmittedEventEnvelope> WriteResults(CheckpointTag phaseCheckpointTag);
+
+	public void Subscribe(CheckpointTag from, bool fromCheckpoint) {
+		_subscribed = true;
+		_coreProjection.Subscribed();
+	}
+
+	public void SetProjectionState(PhaseState state) {
+		_projectionState = state;
+	}
+
+	public void GetStatistics(ProjectionStatistics info) {
+		info.Status = info.Status + "/Writing results";
+	}
+
+	public CheckpointTag MakeZeroCheckpointTag() {
+		return CheckpointTag.FromPhase(_phase, completed: false);
+	}
+
+	public void EnsureUnsubscribed() {
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/ProjectionCoreService.cs b/src/KurrentDB.Projections.Core/Services/Processing/ProjectionCoreService.cs
new file mode 100644
index 00000000000..e0d7233da47
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/ProjectionCoreService.cs
@@ -0,0 +1,315 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Management;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using Serilog;
+
+namespace KurrentDB.Projections.Core.Services.Processing;
+
+public class ProjectionCoreService
+	: IHandle<ProjectionCoreServiceMessage.StartCore>,
+		IHandle<ProjectionCoreServiceMessage.StopCore>,
+		IHandle<ProjectionCoreServiceMessage.CoreTick>,
+		IHandle<CoreProjectionManagementMessage.CreateAndPrepare>,
+		IHandle<CoreProjectionManagementMessage.CreatePrepared>,
+		IHandle<CoreProjectionManagementMessage.Dispose>,
+		IHandle<CoreProjectionManagementMessage.Start>,
+		IHandle<CoreProjectionManagementMessage.LoadStopped>,
+		IHandle<CoreProjectionManagementMessage.Stop>,
+		IHandle<CoreProjectionManagementMessage.Kill>,
+		IHandle<CoreProjectionManagementMessage.GetState>,
+		IHandle<CoreProjectionManagementMessage.GetResult>,
+		IHandle<CoreProjectionProcessingMessage.CheckpointCompleted>,
+		IHandle<CoreProjectionProcessingMessage.CheckpointLoaded>,
+		IHandle<CoreProjectionProcessingMessage.PrerecordedEventsLoaded>,
+		IHandle<CoreProjectionProcessingMessage.RestartRequested>,
+		IHandle<CoreProjectionProcessingMessage.Failed>,
+		IHandle<ProjectionCoreServiceMessage.StopCoreTimeout>,
+		IHandle<CoreProjectionStatusMessage.Suspended> {
+	public const string SubComponentName = "ProjectionCoreService";
+
+	private readonly Guid _workerId;
+	private readonly IPublisher _publisher;
+	private readonly IPublisher _inputQueue;
+	private readonly ILogger _logger = Log.ForContext<ProjectionCoreService>();
+
+	private readonly Dictionary<Guid, CoreProjection> _projections = new Dictionary<Guid, CoreProjection>();
+
+	private readonly IODispatcher _ioDispatcher;
+
+	private readonly ReaderSubscriptionDispatcher _subscriptionDispatcher;
+
+	private readonly ITimeProvider _timeProvider;
+	private readonly ProcessingStrategySelector _processingStrategySelector;
+
+	private bool _stopping;
+	private readonly Dictionary<Guid, CoreProjection> _suspendingProjections = new Dictionary<Guid, CoreProjection>();
+	private Guid _stopQueueId = Guid.Empty;
+	private int _projectionStopTimeoutMs = 5000;
+	private readonly ProjectionStateHandlerFactory _factory;
+
+	public ProjectionCoreService(
+		Guid workerId,
+		IPublisher inputQueue,
+		IPublisher publisher,
+		ReaderSubscriptionDispatcher subscriptionDispatcher,
+		ITimeProvider timeProvider,
+		IODispatcher ioDispatcher,
+		ProjectionsStandardComponents configuration) {
+		_workerId = workerId;
+		_inputQueue = inputQueue;
+		_publisher = publisher;
+		_ioDispatcher = ioDispatcher;
+		_subscriptionDispatcher = subscriptionDispatcher;
+		_timeProvider = timeProvider;
+		_processingStrategySelector = new ProcessingStrategySelector(_subscriptionDispatcher, configuration.MaxProjectionStateSize);
+		_factory = new ProjectionStateHandlerFactory(TimeSpan.FromMilliseconds(configuration.ProjectionCompilationTimeout),
+			TimeSpan.FromMilliseconds(configuration.ProjectionExecutionTimeout));
+	}
+
+	public ILogger Logger {
+		get { return _logger; }
+	}
+
+	public void Handle(ProjectionCoreServiceMessage.StartCore message) {
+		_publisher.Publish(new ProjectionCoreServiceMessage.SubComponentStarted(
+			SubComponentName, message.InstanceCorrelationId));
+	}
+
+	public void Handle(ProjectionCoreServiceMessage.StopCore message) {
+		_stopQueueId = message.QueueId;
+		StopProjections();
+	}
+
+	private void StopProjections() {
+		_stopping = true;
+
+		_ioDispatcher.StartDraining(
+			() => _publisher.Publish(new ProjectionSubsystemMessage.IODispatcherDrained(SubComponentName)));
+
+		var allProjections = _projections.Values.ToArray();
+		foreach (var projection in allProjections) {
+			var requiresStopping = projection.Suspend();
+			if (requiresStopping) {
+				_suspendingProjections.Add(projection._projectionCorrelationId, projection);
+			}
+		}
+
+		if (_suspendingProjections.IsEmpty()) {
+			FinishStopping();
+		} else {
+			_publisher.Publish(TimerMessage.Schedule.Create(
+				TimeSpan.FromMilliseconds(_projectionStopTimeoutMs),
+				_inputQueue,
+				new ProjectionCoreServiceMessage.StopCoreTimeout(_stopQueueId)));
+		}
+	}
+
+	public void Handle(ProjectionCoreServiceMessage.StopCoreTimeout message) {
+		if (message.QueueId != _stopQueueId)
+			return;
+		_logger.Debug("PROJECTIONS: Suspending projections in Projection Core Service timed out. Force stopping.");
+		FinishStopping();
+	}
+
+	public void Handle(CoreProjectionStatusMessage.Suspended message) {
+		if (!_stopping)
+			return;
+
+		_suspendingProjections.Remove(message.ProjectionId);
+		if (_suspendingProjections.Count == 0) {
+			FinishStopping();
+		}
+	}
+
+	private void FinishStopping() {
+		if (!_stopping)
+			return;
+
+		_projections.Clear();
+		_stopping = false;
+		_publisher.Publish(new ProjectionCoreServiceMessage.SubComponentStopped(
+			nameof(ProjectionCoreService), _stopQueueId));
+		_stopQueueId = Guid.Empty;
+	}
+
+	public void Handle(ProjectionCoreServiceMessage.CoreTick message) {
+		message.Action();
+	}
+
+	public void Handle(CoreProjectionManagementMessage.CreateAndPrepare message) {
+		try {
+			//TODO: factory method can throw
+			var stateHandler = CreateStateHandler(_factory,
+				_logger,
+				message.HandlerType,
+				message.Query,
+				message.EnableContentTypeValidation,
+				message.Config.ProjectionExecutionTimeout);
+
+			string name = message.Name;
+			var sourceDefinition = ProjectionSourceDefinition.From(stateHandler.GetSourceDefinition());
+
+			var projectionVersion = message.Version;
+			var projectionConfig = message.Config;
+			var namesBuilder = new ProjectionNamesBuilder(name, sourceDefinition);
+
+			var projectionProcessingStrategy = _processingStrategySelector.CreateProjectionProcessingStrategy(
+				name,
+				projectionVersion,
+				namesBuilder,
+				sourceDefinition,
+				projectionConfig,
+				stateHandler,
+				message.HandlerType,
+				message.Query,
+				message.EnableContentTypeValidation);
+
+			CreateCoreProjection(message.ProjectionId, projectionConfig.RunAs, projectionProcessingStrategy);
+			_publisher.Publish(
+				new CoreProjectionStatusMessage.Prepared(
+					message.ProjectionId, sourceDefinition));
+		} catch (Exception ex) {
+			_publisher.Publish(
+				new CoreProjectionStatusMessage.Faulted(message.ProjectionId, ex.Message));
+		}
+	}
+
+	public void Handle(CoreProjectionManagementMessage.CreatePrepared message) {
+		try {
+			var name = message.Name;
+			var sourceDefinition = ProjectionSourceDefinition.From(message.SourceDefinition);
+			var projectionVersion = message.Version;
+			var projectionConfig = message.Config;
+			var namesBuilder = new ProjectionNamesBuilder(name, sourceDefinition);
+
+			var projectionProcessingStrategy = _processingStrategySelector.CreateProjectionProcessingStrategy(
+				name,
+				projectionVersion,
+				namesBuilder,
+				sourceDefinition,
+				projectionConfig,
+				null,
+				message.HandlerType,
+				message.Query,
+				message.EnableContentTypeValidation);
+
+			CreateCoreProjection(message.ProjectionId, projectionConfig.RunAs, projectionProcessingStrategy);
+			_publisher.Publish(
+				new CoreProjectionStatusMessage.Prepared(
+					message.ProjectionId, sourceDefinition));
+		} catch (Exception ex) {
+			_publisher.Publish(
+				new CoreProjectionStatusMessage.Faulted(message.ProjectionId, ex.Message));
+		}
+	}
+
+	private void CreateCoreProjection(
+		Guid projectionCorrelationId, ClaimsPrincipal runAs, ProjectionProcessingStrategy processingStrategy) {
+		var projection = processingStrategy.Create(
+			projectionCorrelationId,
+			_inputQueue,
+			_workerId,
+			runAs,
+			_publisher,
+			_ioDispatcher,
+			_subscriptionDispatcher,
+			_timeProvider);
+		_projections.Add(projectionCorrelationId, projection);
+	}
+
+	public void Handle(CoreProjectionManagementMessage.Dispose message) {
+		CoreProjection projection;
+		if (_projections.TryGetValue(message.ProjectionId, out projection)) {
+			_projections.Remove(message.ProjectionId);
+			projection.Dispose();
+		}
+	}
+
+	public void Handle(CoreProjectionManagementMessage.Start message) {
+		var projection = _projections[message.ProjectionId];
+		projection.Start();
+	}
+
+	public void Handle(CoreProjectionManagementMessage.LoadStopped message) {
+		var projection = _projections[message.ProjectionId];
+		projection.LoadStopped();
+	}
+
+	public void Handle(CoreProjectionManagementMessage.Stop message) {
+		var projection = _projections[message.ProjectionId];
+		projection.Stop();
+	}
+
+	public void Handle(CoreProjectionManagementMessage.Kill message) {
+		var projection = _projections[message.ProjectionId];
+		projection.Kill();
+	}
+
+	public void Handle(CoreProjectionManagementMessage.GetState message) {
+		CoreProjection projection;
+		if (_projections.TryGetValue(message.ProjectionId, out projection))
+			projection.Handle(message);
+	}
+
+	public void Handle(CoreProjectionManagementMessage.GetResult message) {
+		CoreProjection projection;
+		if (_projections.TryGetValue(message.ProjectionId, out projection))
+			projection.Handle(message);
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.CheckpointCompleted message) {
+		CoreProjection projection;
+		if (_projections.TryGetValue(message.ProjectionId, out projection))
+			projection.Handle(message);
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.CheckpointLoaded message) {
+		CoreProjection projection;
+		if (_projections.TryGetValue(message.ProjectionId, out projection))
+			projection.Handle(message);
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.PrerecordedEventsLoaded message) {
+		CoreProjection projection;
+		if (_projections.TryGetValue(message.ProjectionId, out projection))
+			projection.Handle(message);
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.RestartRequested message) {
+		CoreProjection projection;
+		if (_projections.TryGetValue(message.ProjectionId, out projection))
+			projection.Handle(message);
+	}
+
+	public void Handle(CoreProjectionProcessingMessage.Failed message) {
+		CoreProjection projection;
+		if (_projections.TryGetValue(message.ProjectionId, out projection))
+			projection.Handle(message);
+	}
+
+	public static IProjectionStateHandler CreateStateHandler(ProjectionStateHandlerFactory factory,
+		ILogger logger,
+		string handlerType,
+		string query,
+		bool enableContentTypeValidation,
+		int? projectionExecutionTimeout) {
+		var stateHandler = factory.Create(
+			handlerType,
+			query,
+			enableContentTypeValidation,
+			projectionExecutionTimeout,
+			logger: logger.Verbose);
+		return stateHandler;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/ProjectionNamesBuilder.cs b/src/KurrentDB.Projections.Core/Services/Processing/ProjectionNamesBuilder.cs
new file mode 100644
index 00000000000..8c177c75d9d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/ProjectionNamesBuilder.cs
@@ -0,0 +1,112 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Services.Processing;
+
+public class ProjectionNamesBuilder {
+	public static class StandardProjections {
+		public const string StreamsStandardProjection = "$streams";
+		public const string StreamByCategoryStandardProjection = "$stream_by_category";
+		public const string EventByCategoryStandardProjection = "$by_category";
+		public const string EventByTypeStandardProjection = "$by_event_type";
+		public const string EventByCorrIdStandardProjection = "$by_correlation_id";
+	}
+
+	public static ProjectionNamesBuilder CreateForTest(string name) {
+		return new ProjectionNamesBuilder(name);
+	}
+
+	private readonly string _name;
+	private readonly IQuerySources _sources;
+	private readonly string _resultStreamName;
+	private readonly string _partitionCatalogStreamName;
+	private readonly string _checkpointStreamName;
+	private readonly string _orderStreamName;
+	private readonly string _emittedStreamsName;
+	private readonly string _emittedStreamsCheckpointName;
+
+	private ProjectionNamesBuilder(string name)
+		: this(name, new QuerySourcesDefinition()) {
+	}
+
+	public ProjectionNamesBuilder(string name, IQuerySources sources) {
+		if (sources == null)
+			throw new ArgumentNullException("sources");
+		_name = name;
+		_sources = sources;
+		_resultStreamName = _sources.ResultStreamNameOption
+							?? ProjectionsStreamPrefix + EffectiveProjectionName + ProjectionsStateStreamSuffix;
+		_partitionCatalogStreamName = ProjectionsStreamPrefix + EffectiveProjectionName
+															  + ProjectionPartitionCatalogStreamSuffix;
+		_checkpointStreamName =
+			ProjectionsStreamPrefix + EffectiveProjectionName + ProjectionCheckpointStreamSuffix;
+		_orderStreamName = ProjectionsStreamPrefix + EffectiveProjectionName + ProjectionOrderStreamSuffix;
+		_emittedStreamsName = ProjectionsStreamPrefix + EffectiveProjectionName + ProjectionEmittedStreamSuffix;
+		_emittedStreamsCheckpointName = ProjectionsStreamPrefix + EffectiveProjectionName +
+										ProjectionEmittedStreamSuffix + ProjectionCheckpointStreamSuffix;
+	}
+
+	public string EffectiveProjectionName {
+		get { return _name; }
+	}
+
+
+	private string GetPartitionResultStreamName(string partitionName) {
+		return String.Format(GetPartitionResultStreamNamePattern(), partitionName);
+	}
+
+	public string GetResultStreamName() {
+		return _resultStreamName;
+	}
+
+	public string GetPartitionResultStreamNamePattern() {
+		return _sources.PartitionResultStreamNamePatternOption
+			   ?? ProjectionsStreamPrefix + EffectiveProjectionName + "-{0}" + ProjectionsStateStreamSuffix;
+	}
+
+	public const string ProjectionsStreamPrefix = "$projections-";
+	private const string ProjectionsStateStreamSuffix = "-result";
+	private const string ProjectionCheckpointStreamSuffix = "-checkpoint";
+	private const string ProjectionEmittedStreamSuffix = "-emittedstreams";
+	private const string ProjectionOrderStreamSuffix = "-order";
+	private const string ProjectionPartitionCatalogStreamSuffix = "-partitions";
+	public const string ProjectionsRegistrationStream = "$projections-$all";
+
+	public string GetPartitionCatalogStreamName() {
+		return _partitionCatalogStreamName;
+	}
+
+	public string MakePartitionResultStreamName(string statePartition) {
+		return String.IsNullOrEmpty(statePartition)
+			? GetResultStreamName()
+			: GetPartitionResultStreamName(statePartition);
+	}
+
+	public string MakePartitionCheckpointStreamName(string statePartition) {
+		if (String.IsNullOrEmpty(statePartition))
+			throw new InvalidOperationException("Root partition cannot have a partition checkpoint stream");
+
+		return ProjectionsStreamPrefix + EffectiveProjectionName + "-" + statePartition
+			   + ProjectionCheckpointStreamSuffix;
+	}
+
+
+	public string MakeCheckpointStreamName() {
+		return _checkpointStreamName;
+	}
+
+	public string GetEmittedStreamsName() {
+		return _emittedStreamsName;
+	}
+
+	public string GetEmittedStreamsCheckpointName() {
+		return _emittedStreamsCheckpointName;
+	}
+
+	public string GetOrderStreamName() {
+		return _orderStreamName;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/ProjectionOutputConfig.cs b/src/KurrentDB.Projections.Core/Services/Processing/ProjectionOutputConfig.cs
new file mode 100644
index 00000000000..c9d9dfeb9dd
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/ProjectionOutputConfig.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Runtime.Serialization;
+
+namespace KurrentDB.Projections.Core.Services.Processing;
+
+[DataContract]
+public class ProjectionOutputConfig {
+	[DataMember] public string ResultStreamName { get; set; }
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/ProjectionSourceDefinition.cs b/src/KurrentDB.Projections.Core/Services/Processing/ProjectionSourceDefinition.cs
new file mode 100644
index 00000000000..c9ce72f9709
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/ProjectionSourceDefinition.cs
@@ -0,0 +1,142 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Runtime.Serialization;
+using KurrentDB.Projections.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Services.Processing;
+
+[DataContract]
+public class ProjectionSourceDefinition : IQuerySources {
+	[DataMember] public bool AllEvents { get; set; }
+
+	[DataMember] public bool AllStreams { get; set; }
+
+	[DataMember] public bool ByStream { get; set; }
+
+	[DataMember] public bool ByCustomPartitions { get; set; }
+
+	[DataMember] public string[] Categories { get; set; }
+
+	[DataMember] public string[] Events { get; set; }
+
+	[DataMember] public string[] Streams { get; set; }
+
+	[DataMember] public long? LimitingCommitPosition { get; set; }
+
+	[DataMember] public QuerySourceOptions Options { get; set; }
+
+	bool IQuerySources.DefinesStateTransform {
+		get { return Options != null && Options.DefinesStateTransform; }
+	}
+
+	bool IQuerySources.ProducesResults {
+		get { return Options != null && Options.ProducesResults; }
+	}
+
+	bool IQuerySources.DefinesFold {
+		get { return Options != null && Options.DefinesFold; }
+	}
+
+	bool IQuerySources.HandlesDeletedNotifications {
+		get { return Options != null && Options.HandlesDeletedNotifications; }
+	}
+
+	bool IQuerySources.IncludeLinksOption {
+		get { return Options != null && Options.IncludeLinks; }
+	}
+
+	string IQuerySources.ResultStreamNameOption {
+		get { return Options != null ? Options.ResultStreamName : null; }
+	}
+
+	string IQuerySources.PartitionResultStreamNamePatternOption {
+		get { return Options != null ? Options.PartitionResultStreamNamePattern : null; }
+	}
+
+	bool IQuerySources.ReorderEventsOption {
+		get { return Options != null && Options.ReorderEvents; }
+	}
+
+	int? IQuerySources.ProcessingLagOption {
+		get { return Options != null ? Options.ProcessingLag : (int?)null; }
+	}
+
+	bool IQuerySources.IsBiState {
+		get { return Options != null ? Options.IsBiState : false; }
+	}
+
+	bool IQuerySources.ByStreams {
+		get { return ByStream; }
+	}
+
+	public static ProjectionSourceDefinition From(IQuerySources sources) {
+		return new ProjectionSourceDefinition {
+			AllEvents = sources.AllEvents,
+			AllStreams = sources.AllStreams,
+			ByStream = sources.ByStreams,
+			ByCustomPartitions = sources.ByCustomPartitions,
+			Categories = (sources.Categories ?? new string[0]).ToArray(),
+			Events = (sources.Events ?? new string[0]).ToArray(),
+			Streams = (sources.Streams ?? new string[0]).ToArray(),
+			LimitingCommitPosition = sources.LimitingCommitPosition,
+			Options =
+				new QuerySourceOptions {
+					DefinesStateTransform = sources.DefinesStateTransform,
+					ProducesResults = sources.ProducesResults,
+					DefinesFold = sources.DefinesFold,
+					HandlesDeletedNotifications = sources.HandlesDeletedNotifications,
+					IncludeLinks = sources.IncludeLinksOption,
+					PartitionResultStreamNamePattern = sources.PartitionResultStreamNamePatternOption,
+					ProcessingLag = sources.ProcessingLagOption.GetValueOrDefault(),
+					IsBiState = sources.IsBiState,
+					ReorderEvents = sources.ReorderEventsOption,
+					ResultStreamName = sources.ResultStreamNameOption,
+				},
+		};
+	}
+
+	private bool Equals(string[] a, string[] b) {
+		bool aEmpty = (a == null || a.Length == 0);
+		bool bEmpty = (b == null || b.Length == 0);
+		if (aEmpty && bEmpty)
+			return true;
+		if (aEmpty || bEmpty)
+			return false;
+		return a.SequenceEqual(b);
+	}
+
+	protected bool Equals(ProjectionSourceDefinition other) {
+		return AllEvents.Equals(other.AllEvents) && AllStreams.Equals(other.AllStreams)
+												 && ByStream.Equals(other.ByStream) &&
+												 ByCustomPartitions.Equals(other.ByCustomPartitions)
+												 && Equals(Categories, other.Categories) &&
+												 Equals(Events, other.Events)
+												 && Equals(Streams, other.Streams)
+												 && LimitingCommitPosition == other.LimitingCommitPosition &&
+												 Equals(Options, other.Options);
+	}
+
+	public override bool Equals(object obj) {
+		if (ReferenceEquals(null, obj))
+			return false;
+		if (ReferenceEquals(this, obj))
+			return true;
+		if (obj.GetType() != this.GetType())
+			return false;
+		return Equals((ProjectionSourceDefinition)obj);
+	}
+
+	public override int GetHashCode() {
+		unchecked {
+			int hashCode = AllEvents.GetHashCode();
+			hashCode = (hashCode * 397) ^ AllStreams.GetHashCode();
+			hashCode = (hashCode * 397) ^ ByStream.GetHashCode();
+			hashCode = (hashCode * 397) ^ ByCustomPartitions.GetHashCode();
+			hashCode = (hashCode * 397) ^ LimitingCommitPosition.GetHashCode();
+			hashCode = (hashCode * 397) ^ (Options != null ? Options.GetHashCode() : 0);
+			return hashCode;
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/ProjectionVersion.cs b/src/KurrentDB.Projections.Core/Services/Processing/ProjectionVersion.cs
new file mode 100644
index 00000000000..7f9afc4571f
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/ProjectionVersion.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Services.Processing;
+
+public struct ProjectionVersion {
+	public readonly long ProjectionId;
+	public readonly long Epoch;
+	public readonly long Version;
+
+	public ProjectionVersion(long projectionId, long epoch, long version) {
+		ProjectionId = projectionId;
+		Epoch = epoch;
+		Version = version;
+	}
+
+	public bool Equals(ProjectionVersion other) {
+		return ProjectionId == other.ProjectionId && Epoch == other.Epoch && Version == other.Version;
+	}
+
+	public override bool Equals(object obj) {
+		if (ReferenceEquals(null, obj))
+			return false;
+		return obj is ProjectionVersion && Equals((ProjectionVersion)obj);
+	}
+
+	public override int GetHashCode() {
+		unchecked {
+			var hashCode = ProjectionId.GetHashCode();
+			hashCode = (hashCode * 397) ^ Epoch.GetHashCode();
+			hashCode = (hashCode * 397) ^ Version.GetHashCode();
+			return hashCode;
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/QuerySourceOptions.cs b/src/KurrentDB.Projections.Core/Services/Processing/QuerySourceOptions.cs
new file mode 100644
index 00000000000..3dd33b42fb7
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/QuerySourceOptions.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Runtime.Serialization;
+
+namespace KurrentDB.Projections.Core.Services.Processing;
+
+[DataContract]
+public class QuerySourceOptions {
+	[DataMember] public string ResultStreamName { get; set; }
+
+	[DataMember] public string PartitionResultStreamNamePattern { get; set; }
+
+	[DataMember] public bool ReorderEvents { get; set; }
+
+	[DataMember] public int ProcessingLag { get; set; }
+
+	[DataMember] public bool IsBiState { get; set; }
+
+	[DataMember] public bool DefinesStateTransform { get; set; }
+
+	[DataMember] public bool ProducesResults { get; set; }
+
+	[DataMember] public bool DefinesFold { get; set; }
+
+	[DataMember] public bool HandlesDeletedNotifications { get; set; }
+
+	[DataMember] public bool IncludeLinks { get; set; }
+
+	protected bool Equals(QuerySourceOptions other) {
+		return string.Equals(ResultStreamName, other.ResultStreamName)
+			   && string.Equals(PartitionResultStreamNamePattern, other.PartitionResultStreamNamePattern)
+			   && ReorderEvents.Equals(other.ReorderEvents) && ProcessingLag == other.ProcessingLag
+			   && IsBiState.Equals(other.IsBiState) && DefinesStateTransform.Equals(other.DefinesStateTransform)
+			   && ProducesResults.Equals(other.ProducesResults) && DefinesFold.Equals(other.DefinesFold)
+			   && HandlesDeletedNotifications.Equals(other.HandlesDeletedNotifications)
+			   && IncludeLinks.Equals(other.IncludeLinks);
+	}
+
+	public override bool Equals(object obj) {
+		if (ReferenceEquals(null, obj))
+			return false;
+		if (ReferenceEquals(this, obj))
+			return true;
+		if (obj.GetType() != this.GetType())
+			return false;
+		return Equals((QuerySourceOptions)obj);
+	}
+
+	public override int GetHashCode() {
+		unchecked {
+			int hashCode = (ResultStreamName != null ? ResultStreamName.GetHashCode() : 0);
+			hashCode = (hashCode * 397) ^ (PartitionResultStreamNamePattern != null
+				? PartitionResultStreamNamePattern.GetHashCode()
+				: 0);
+			hashCode = (hashCode * 397) ^ ReorderEvents.GetHashCode();
+			hashCode = (hashCode * 397) ^ ProcessingLag;
+			hashCode = (hashCode * 397) ^ IsBiState.GetHashCode();
+			hashCode = (hashCode * 397) ^ DefinesStateTransform.GetHashCode();
+			hashCode = (hashCode * 397) ^ ProducesResults.GetHashCode();
+			hashCode = (hashCode * 397) ^ DefinesFold.GetHashCode();
+			hashCode = (hashCode * 397) ^ HandlesDeletedNotifications.GetHashCode();
+			hashCode = (hashCode * 397) ^ IncludeLinks.GetHashCode();
+			return hashCode;
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/RequestResponseQueueForwarder.cs b/src/KurrentDB.Projections.Core/Services/Processing/RequestResponseQueueForwarder.cs
new file mode 100644
index 00000000000..a95351a61ec
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/RequestResponseQueueForwarder.cs
@@ -0,0 +1,98 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Messaging;
+
+namespace KurrentDB.Projections.Core.Services.Processing;
+
+public class RequestResponseQueueForwarder : IHandle<ClientMessage.ReadEvent>,
+	IHandle<ClientMessage.ReadStreamEventsBackward>,
+	IHandle<ClientMessage.ReadStreamEventsForward>,
+	IHandle<ClientMessage.ReadAllEventsForward>,
+	IHandle<ClientMessage.WriteEvents>,
+	IHandle<ClientMessage.DeleteStream>,
+	IHandle<SystemMessage.SubSystemInitialized>,
+	IHandle<ProjectionCoreServiceMessage.SubComponentStarted>,
+	IHandle<ProjectionCoreServiceMessage.SubComponentStopped> {
+	private readonly IPublisher _externalRequestQueue;
+	private readonly IPublisher _inputQueue;
+
+	public RequestResponseQueueForwarder(IPublisher inputQueue, IPublisher externalRequestQueue) {
+		_inputQueue = inputQueue;
+		_externalRequestQueue = externalRequestQueue;
+	}
+
+	public void Handle(ClientMessage.ReadEvent msg) {
+		_externalRequestQueue.Publish(
+			new ClientMessage.ReadEvent(
+				msg.InternalCorrId, msg.CorrelationId, new PublishToWrapEnvelop(_inputQueue, msg.Envelope),
+				msg.EventStreamId, msg.EventNumber, msg.ResolveLinkTos, msg.RequireLeader, msg.User));
+	}
+
+	public void Handle(ClientMessage.WriteEvents msg) {
+		_externalRequestQueue.Publish(
+			new ClientMessage.WriteEvents(
+				msg.InternalCorrId, msg.CorrelationId, new PublishToWrapEnvelop(_inputQueue, msg.Envelope), true,
+				msg.EventStreamId, msg.ExpectedVersion, msg.Events, msg.User));
+	}
+
+	public void Handle(ClientMessage.DeleteStream msg) {
+		_externalRequestQueue.Publish(
+			new ClientMessage.DeleteStream(
+				msg.InternalCorrId, msg.CorrelationId, new PublishToWrapEnvelop(_inputQueue, msg.Envelope), true,
+				msg.EventStreamId, msg.ExpectedVersion, msg.HardDelete, msg.User));
+	}
+
+	// Historically the forwarding we do here has discarded the Expiration of the msg when forwarding it, resetting it
+	// to the default, which is 10 seconds from now. We should probably propagate the Expiration of all the source messages.
+	// However, in this fix we make the minimum impact change necessary which is to only pass the expiration that we
+	// need (DateTime.MaxValue) and only for the messages that we need.
+	public void Handle(ClientMessage.ReadStreamEventsBackward msg) {
+		_externalRequestQueue.Publish(
+			new ClientMessage.ReadStreamEventsBackward(
+				msg.InternalCorrId, msg.CorrelationId, new PublishToWrapEnvelop(_inputQueue, msg.Envelope),
+				msg.EventStreamId, msg.FromEventNumber, msg.MaxCount, msg.ResolveLinkTos, msg.RequireLeader,
+				msg.ValidationStreamVersion, msg.User,
+				expires: msg.Expires == DateTime.MaxValue ? msg.Expires : null));
+	}
+
+	public void Handle(ClientMessage.ReadStreamEventsForward msg) {
+		_externalRequestQueue.Publish(
+			new ClientMessage.ReadStreamEventsForward(
+				msg.InternalCorrId, msg.CorrelationId, new PublishToWrapEnvelop(_inputQueue, msg.Envelope),
+				msg.EventStreamId, msg.FromEventNumber, msg.MaxCount, msg.ResolveLinkTos, msg.RequireLeader,
+				msg.ValidationStreamVersion, msg.User, replyOnExpired: false,
+				expires: msg.Expires == DateTime.MaxValue ? msg.Expires : null));
+	}
+
+	public void Handle(ClientMessage.ReadAllEventsForward msg) {
+		_externalRequestQueue.Publish(
+			new ClientMessage.ReadAllEventsForward(
+				msg.InternalCorrId, msg.CorrelationId, new PublishToWrapEnvelop(_inputQueue, msg.Envelope),
+				msg.CommitPosition, msg.PreparePosition, msg.MaxCount, msg.ResolveLinkTos, msg.RequireLeader,
+				msg.ValidationTfLastCommitPosition, msg.User, replyOnExpired: false));
+	}
+
+	public void Handle(SystemMessage.SubSystemInitialized msg) {
+		_externalRequestQueue.Publish(
+			new SystemMessage.SubSystemInitialized(msg.SubSystemName));
+	}
+
+	void IHandle<ProjectionCoreServiceMessage.SubComponentStarted>.Handle(
+		ProjectionCoreServiceMessage.SubComponentStarted message) {
+		_externalRequestQueue.Publish(
+			new ProjectionCoreServiceMessage.SubComponentStarted(message.SubComponent, message.InstanceCorrelationId)
+		);
+	}
+
+	void IHandle<ProjectionCoreServiceMessage.SubComponentStopped>.Handle(
+		ProjectionCoreServiceMessage.SubComponentStopped message) {
+		_externalRequestQueue.Publish(
+			new ProjectionCoreServiceMessage.SubComponentStopped(message.SubComponent, message.QueueId)
+		);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/ResolvedEvent.cs b/src/KurrentDB.Projections.Core/Services/Processing/ResolvedEvent.cs
new file mode 100644
index 00000000000..5498857ea88
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/ResolvedEvent.cs
@@ -0,0 +1,217 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.TransactionLog.LogRecords;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Standard;
+using Newtonsoft.Json.Linq;
+
+namespace KurrentDB.Projections.Core.Services.Processing;
+
+public class ResolvedEvent {
+	private readonly string _eventStreamId;
+	private readonly long _eventSequenceNumber;
+	private readonly bool _resolvedLinkTo;
+
+	private readonly string _positionStreamId;
+	private readonly long _positionSequenceNumber;
+	private readonly TFPos _position;
+	private readonly TFPos _eventOrLinkTargetPosition;
+	private readonly TFPos _linkOrEventPosition;
+
+
+	public readonly Guid EventId;
+	public readonly string EventType;
+	public readonly bool IsJson;
+	public readonly DateTime Timestamp;
+
+	public readonly ReadOnlyMemory<byte> DataMemory;
+
+	public readonly string Data;
+	public readonly string Metadata;
+	public readonly string PositionMetadata;
+	public readonly string StreamMetadata;
+	public readonly bool IsLinkToDeletedStream;
+	public readonly bool IsLinkToDeletedStreamTombstone;
+
+	public ResolvedEvent(KurrentDB.Core.Data.ResolvedEvent resolvedEvent, byte[] streamMetadata) {
+		var positionEvent = resolvedEvent.Link ?? resolvedEvent.Event;
+		_linkOrEventPosition = resolvedEvent.OriginalPosition.GetValueOrDefault();
+		var @event = resolvedEvent.Event;
+		_positionStreamId = positionEvent.EventStreamId;
+		_positionSequenceNumber = positionEvent.EventNumber;
+		_eventStreamId = @event != null ? @event.EventStreamId : null;
+		_eventSequenceNumber = @event != null ? @event.EventNumber : -1;
+		_resolvedLinkTo = positionEvent != @event;
+		_position = resolvedEvent.OriginalPosition ?? new TFPos(-1, positionEvent.LogPosition);
+		EventId = @event != null ? @event.EventId : Guid.Empty;
+		EventType = @event != null ? @event.EventType : null;
+		IsJson = @event != null && (@event.Flags & PrepareFlags.IsJson) != 0;
+		Timestamp = positionEvent.TimeStamp;
+
+		DataMemory = @event?.Data ?? ReadOnlyMemory<byte>.Empty;
+
+		//TODO: handle utf-8 conversion exception
+		Data = @event != null && @event.Data.Length > 0 ? Helper.UTF8NoBom.GetString(@event.Data.Span) : null;
+		Metadata = @event != null && @event.Metadata.Length > 0 ? Helper.UTF8NoBom.GetString(@event.Metadata.Span) : null;
+		PositionMetadata = _resolvedLinkTo
+			? (positionEvent.Metadata.Length > 0 ? Helper.UTF8NoBom.GetString(positionEvent.Metadata.Span) : null)
+			: null;
+		StreamMetadata = streamMetadata != null ? Helper.UTF8NoBom.GetString(streamMetadata) : null;
+
+		TFPos eventOrLinkTargetPosition;
+		if (_resolvedLinkTo) {
+			Dictionary<string, JToken> extraMetadata = null;
+			if (positionEvent.Metadata.Length > 0 && positionEvent.Metadata.Length > 0) {
+				//TODO: parse JSON only when unresolved link and just tag otherwise
+				CheckpointTag tag;
+				if (resolvedEvent.Link != null && resolvedEvent.Event == null) {
+					var checkpointTagJson =
+						positionEvent.Metadata.ParseCheckpointTagVersionExtraJson(default(ProjectionVersion));
+					tag = checkpointTagJson.Tag;
+					extraMetadata = checkpointTagJson.ExtraMetadata;
+
+					var parsedPosition = tag.Position;
+
+					eventOrLinkTargetPosition = parsedPosition != new TFPos(long.MinValue, long.MinValue)
+						? parsedPosition
+						: new TFPos(-1, positionEvent.LogPosition);
+				} else {
+					tag = positionEvent.Metadata.ParseCheckpointTagJson();
+					var parsedPosition = tag.Position;
+					if (parsedPosition == new TFPos(long.MinValue, long.MinValue) &&
+						@event.Metadata.IsValidUtf8Json()) {
+						tag = @event.Metadata.ParseCheckpointTagJson();
+						if (tag != null) {
+							parsedPosition = tag.Position;
+						}
+					}
+
+					eventOrLinkTargetPosition = parsedPosition != new TFPos(long.MinValue, long.MinValue)
+						? parsedPosition
+						: new TFPos(-1, resolvedEvent.Event.LogPosition);
+				}
+			} else {
+				eventOrLinkTargetPosition = @event != null
+					? new TFPos(-1, @event.LogPosition)
+					: new TFPos(-1, positionEvent.LogPosition);
+			}
+
+			JToken deletedValue;
+			IsLinkToDeletedStreamTombstone = extraMetadata != null
+											 && extraMetadata.TryGetValue("$deleted", out deletedValue);
+			if (resolvedEvent.ResolveResult == ReadEventResult.NoStream
+				|| resolvedEvent.ResolveResult == ReadEventResult.StreamDeleted || IsLinkToDeletedStreamTombstone) {
+				IsLinkToDeletedStream = true;
+				var streamId = SystemEventTypes.StreamReferenceEventToStreamId(
+					SystemEventTypes.LinkTo, resolvedEvent.Link.Data);
+				_eventStreamId = streamId;
+			}
+		} else {
+			// not a link
+			eventOrLinkTargetPosition = resolvedEvent.OriginalPosition ?? new TFPos(-1, positionEvent.LogPosition);
+		}
+
+		_eventOrLinkTargetPosition = eventOrLinkTargetPosition;
+	}
+
+	// Called from tests only
+	public ResolvedEvent(
+		string positionStreamId, long positionSequenceNumber, string eventStreamId, long eventSequenceNumber,
+		bool resolvedLinkTo, TFPos position, TFPos eventOrLinkTargetPosition, Guid eventId, string eventType,
+		bool isJson, byte[] data,
+		byte[] metadata, byte[] positionMetadata, byte[] streamMetadata, DateTime timestamp) {
+		_positionStreamId = positionStreamId;
+		_positionSequenceNumber = positionSequenceNumber;
+		_eventStreamId = eventStreamId;
+		_eventSequenceNumber = eventSequenceNumber;
+		_resolvedLinkTo = resolvedLinkTo;
+		_position = position;
+		_eventOrLinkTargetPosition = eventOrLinkTargetPosition;
+		EventId = eventId;
+		EventType = eventType;
+		IsJson = isJson;
+		Timestamp = timestamp;
+
+		DataMemory = data ?? ReadOnlyMemory<byte>.Empty;
+
+		//TODO: handle utf-8 conversion exception
+		Data = data != null ? Helper.UTF8NoBom.GetString(data) : null;
+		Metadata = metadata != null ? Helper.UTF8NoBom.GetString(metadata) : null;
+		PositionMetadata = positionMetadata != null ? Helper.UTF8NoBom.GetString(positionMetadata) : null;
+		StreamMetadata = streamMetadata != null ? Helper.UTF8NoBom.GetString(streamMetadata) : null;
+	}
+
+	// Called from tests only
+	public ResolvedEvent(
+		string positionStreamId, long positionSequenceNumber, string eventStreamId, long eventSequenceNumber,
+		bool resolvedLinkTo, TFPos position, Guid eventId, string eventType, bool isJson, string data,
+		string metadata, string positionMetadata = null, string streamMetadata = null) {
+		DateTime timestamp = default(DateTime);
+		if (Guid.Empty == eventId)
+			throw new ArgumentException("Empty eventId provided.");
+		if (string.IsNullOrEmpty(eventType))
+			throw new ArgumentException("Empty eventType provided.");
+
+		_positionStreamId = positionStreamId;
+		_positionSequenceNumber = positionSequenceNumber;
+		_eventStreamId = eventStreamId;
+		_eventSequenceNumber = eventSequenceNumber;
+		_resolvedLinkTo = resolvedLinkTo;
+		_position = position;
+		EventId = eventId;
+		EventType = eventType;
+		IsJson = isJson;
+		Timestamp = timestamp;
+
+		DataMemory = data is not null ? Helper.UTF8NoBom.GetBytes(data) : ReadOnlyMemory<byte>.Empty;
+		Data = data;
+		Metadata = metadata;
+		PositionMetadata = positionMetadata;
+		StreamMetadata = streamMetadata;
+	}
+
+	public string EventStreamId {
+		get { return _eventStreamId; }
+	}
+
+	public long EventSequenceNumber {
+		get { return _eventSequenceNumber; }
+	}
+
+	public bool ResolvedLinkTo {
+		get { return _resolvedLinkTo; }
+	}
+
+	public string PositionStreamId {
+		get { return _positionStreamId; }
+	}
+
+	public long PositionSequenceNumber {
+		get { return _positionSequenceNumber; }
+	}
+
+	public TFPos Position {
+		get { return _position; }
+	}
+
+	public TFPos EventOrLinkTargetPosition {
+		get { return _eventOrLinkTargetPosition; }
+	}
+
+	public TFPos LinkOrEventPosition {
+		get { return _linkOrEventPosition; }
+	}
+
+	public bool IsStreamDeletedEvent {
+		get {
+			string temp;
+			return StreamDeletedHelper.IsStreamDeletedEvent(EventStreamId, EventType, Data, out temp);
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/SingleStream/CategoryEventFilter.cs b/src/KurrentDB.Projections.Core/Services/Processing/SingleStream/CategoryEventFilter.cs
new file mode 100644
index 00000000000..fb175d0fc4d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/SingleStream/CategoryEventFilter.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+
+namespace KurrentDB.Projections.Core.Services.Processing.SingleStream;
+
+public class CategoryEventFilter : EventFilter {
+	private readonly string _category;
+	private readonly string _categoryStream;
+
+	public CategoryEventFilter(string category, bool allEvents, HashSet<string> events)
+		: base(allEvents, false, events) {
+		_category = category;
+		_categoryStream = "$ce-" + category;
+	}
+
+	protected override bool DeletedNotificationPasses(string positionStreamId) {
+		return _categoryStream == positionStreamId;
+	}
+
+	public override bool PassesSource(bool resolvedFromLinkTo, string positionStreamId, string eventType) {
+		return resolvedFromLinkTo && _categoryStream == positionStreamId;
+	}
+
+	public override string GetCategory(string positionStreamId) {
+		if (!positionStreamId.StartsWith("$ce-"))
+			throw new ArgumentException(string.Format("'{0}' is not a category stream", positionStreamId),
+				"positionStreamId");
+		return positionStreamId.Substring("$ce-".Length);
+	}
+
+	public override string ToString() {
+		return string.Format("Category: {0}, CategoryStream: {1}", _category, _categoryStream);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/SingleStream/StreamEventFilter.cs b/src/KurrentDB.Projections.Core/Services/Processing/SingleStream/StreamEventFilter.cs
new file mode 100644
index 00000000000..867c9fdf0db
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/SingleStream/StreamEventFilter.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+
+namespace KurrentDB.Projections.Core.Services.Processing.SingleStream;
+
+public class StreamEventFilter : EventFilter {
+	private readonly string _streamId;
+
+	public StreamEventFilter(string streamId, bool allEvents, HashSet<string> events)
+		: base(allEvents, false, events) {
+		_streamId = streamId;
+	}
+
+	protected override bool DeletedNotificationPasses(string positionStreamId) {
+		return positionStreamId == _streamId;
+	}
+
+	public override bool PassesSource(bool resolvedFromLinkTo, string positionStreamId, string eventType) {
+		return positionStreamId == _streamId;
+	}
+
+	public override string GetCategory(string positionStreamId) {
+		return null;
+	}
+
+	public override string ToString() {
+		return string.Format("StreamId: {0}", _streamId);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/SingleStream/StreamEventReader.cs b/src/KurrentDB.Projections.Core/Services/Processing/SingleStream/StreamEventReader.cs
new file mode 100644
index 00000000000..919e0faf197
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/SingleStream/StreamEventReader.cs
@@ -0,0 +1,253 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Settings;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Standard;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+
+namespace KurrentDB.Projections.Core.Services.Processing.SingleStream;
+
+public class StreamEventReader : EventReader,
+	IHandle<ClientMessage.ReadStreamEventsForwardCompleted>,
+	IHandle<ProjectionManagementMessage.Internal.ReadTimeout> {
+	private readonly string _streamName;
+	private long _fromSequenceNumber;
+	private readonly ITimeProvider _timeProvider;
+	private readonly bool _resolveLinkTos;
+	private readonly bool _produceStreamDeletes;
+
+	private bool _eventsRequested;
+	private int _maxReadCount = 111;
+	private long _lastPosition;
+	private bool _eof;
+	private Guid _pendingRequestCorrelationId;
+
+	public StreamEventReader(
+		IPublisher publisher,
+		Guid eventReaderCorrelationId,
+		ClaimsPrincipal readAs,
+		string streamName,
+		long fromSequenceNumber,
+		ITimeProvider timeProvider,
+		bool resolveLinkTos,
+		bool produceStreamDeletes,
+		bool stopOnEof = false)
+		: base(publisher, eventReaderCorrelationId, readAs, stopOnEof) {
+		if (fromSequenceNumber < 0)
+			throw new ArgumentException("fromSequenceNumber");
+		if (streamName == null)
+			throw new ArgumentNullException("streamName");
+		if (string.IsNullOrEmpty(streamName))
+			throw new ArgumentException("streamName");
+		_streamName = streamName;
+		_fromSequenceNumber = fromSequenceNumber;
+		_timeProvider = timeProvider;
+		_resolveLinkTos = resolveLinkTos;
+		_produceStreamDeletes = produceStreamDeletes;
+	}
+
+	protected override bool AreEventsRequested() {
+		return _eventsRequested;
+	}
+
+	public void Handle(ClientMessage.ReadStreamEventsForwardCompleted message) {
+		if (_disposed)
+			return;
+		if (!_eventsRequested)
+			throw new InvalidOperationException("Read events has not been requested");
+		if (message.EventStreamId != _streamName)
+			throw new InvalidOperationException(
+				string.Format("Invalid stream name: {0}.  Expected: {1}", message.EventStreamId, _streamName));
+		if (Paused)
+			throw new InvalidOperationException("Paused");
+		if (message.CorrelationId != _pendingRequestCorrelationId) {
+			return;
+		}
+
+		_eventsRequested = false;
+		_lastPosition = message.TfLastCommitPosition;
+		NotifyIfStarting(message.TfLastCommitPosition);
+		switch (message.Result) {
+			case ReadStreamResult.StreamDeleted:
+				_eof = true;
+				DeliverSafeJoinPosition(GetLastCommitPositionFrom(message)); // allow joining heading distribution
+				PauseOrContinueProcessing();
+				SendIdle();
+				SendPartitionDeleted_WhenReadingDataStream(_streamName, -1, null, null, null, null);
+				SendEof();
+				break;
+			case ReadStreamResult.NoStream:
+				_eof = true;
+				DeliverSafeJoinPosition(GetLastCommitPositionFrom(message)); // allow joining heading distribution
+				PauseOrContinueProcessing();
+				SendIdle();
+				if (message.LastEventNumber >= 0)
+					SendPartitionDeleted_WhenReadingDataStream(_streamName, message.LastEventNumber, null, null,
+						null, null);
+				SendEof();
+				break;
+			case ReadStreamResult.Success:
+				var oldFromSequenceNumber = StartFrom(message, _fromSequenceNumber);
+				_fromSequenceNumber = message.NextEventNumber;
+				var eof = message.Events is [] && message.IsEndOfStream;
+				_eof = eof;
+				var willDispose = eof && _stopOnEof;
+
+				if (!willDispose) {
+					PauseOrContinueProcessing();
+				}
+
+				if (eof) {
+					// the end
+					DeliverSafeJoinPosition(GetLastCommitPositionFrom(message));
+					SendIdle();
+					SendEof();
+				} else {
+					for (int index = 0; index < message.Events.Count; index++) {
+						var @event = message.Events[index].Event;
+						var @link = message.Events[index].Link;
+						DeliverEvent(message.Events[index],
+							100.0f * (link ?? @event).EventNumber / message.LastEventNumber,
+							ref oldFromSequenceNumber);
+					}
+				}
+
+				break;
+			case ReadStreamResult.AccessDenied:
+				SendNotAuthorized();
+				return;
+			default:
+				throw new NotSupportedException(
+					string.Format("ReadEvents result code was not recognized. Code: {0}", message.Result));
+		}
+	}
+
+	public void Handle(ProjectionManagementMessage.Internal.ReadTimeout message) {
+		if (_disposed)
+			return;
+		if (Paused)
+			return;
+		if (message.CorrelationId != _pendingRequestCorrelationId)
+			return;
+
+		_eventsRequested = false;
+		PauseOrContinueProcessing();
+	}
+
+	private long StartFrom(ClientMessage.ReadStreamEventsForwardCompleted message, long fromSequenceNumber) {
+		if (fromSequenceNumber != 0)
+			return fromSequenceNumber;
+		if (message.Events is not []) {
+			return message.Events[0].OriginalEventNumber;
+		}
+
+		return fromSequenceNumber;
+	}
+
+	private void SendIdle() {
+		_publisher.Publish(
+			new ReaderSubscriptionMessage.EventReaderIdle(EventReaderCorrelationId, _timeProvider.UtcNow));
+	}
+
+	protected override void RequestEvents() {
+		if (_disposed)
+			throw new InvalidOperationException("Disposed");
+		if (_eventsRequested)
+			throw new InvalidOperationException("Read operation is already in progress");
+		if (PauseRequested || Paused)
+			throw new InvalidOperationException("Paused or pause requested");
+		_eventsRequested = true;
+
+		_pendingRequestCorrelationId = Guid.NewGuid();
+		var readEventsForward = CreateReadEventsMessage(_pendingRequestCorrelationId);
+		if (_eof) {
+			_publisher.Publish(
+				new AwakeServiceMessage.SubscribeAwake(
+					_publisher, Guid.NewGuid(), null,
+					new TFPos(_lastPosition, _lastPosition),
+					CreateReadTimeoutMessage(_pendingRequestCorrelationId, _streamName)));
+			_publisher.Publish(
+				new AwakeServiceMessage.SubscribeAwake(
+					_publisher, Guid.NewGuid(), null,
+					new TFPos(_lastPosition, _lastPosition), readEventsForward));
+		} else {
+			_publisher.Publish(readEventsForward);
+			ScheduleReadTimeoutMessage(_pendingRequestCorrelationId, _streamName);
+		}
+	}
+
+	private void ScheduleReadTimeoutMessage(Guid correlationId, string streamId) {
+		_publisher.Publish(CreateReadTimeoutMessage(correlationId, streamId));
+	}
+
+	private Message CreateReadTimeoutMessage(Guid correlationId, string streamId) {
+		return TimerMessage.Schedule.Create(
+			TimeSpan.FromMilliseconds(ESConsts.ReadRequestTimeout),
+			new SendToThisEnvelope(this),
+			new ProjectionManagementMessage.Internal.ReadTimeout(correlationId, streamId));
+	}
+
+	private Message CreateReadEventsMessage(Guid readCorrelationId) {
+		return new ClientMessage.ReadStreamEventsForward(
+			readCorrelationId, readCorrelationId, new SendToThisEnvelope(this), _streamName, _fromSequenceNumber,
+			_maxReadCount, _resolveLinkTos, false, null, ReadAs, replyOnExpired: false);
+	}
+
+	private void DeliverSafeJoinPosition(long? safeJoinPosition) {
+		if (_stopOnEof || safeJoinPosition == null || safeJoinPosition == -1)
+			return; //TODO: this should not happen, but StorageReader does not return it now
+		_publisher.Publish(
+			new ReaderSubscriptionMessage.CommittedEventDistributed(
+				EventReaderCorrelationId, null, safeJoinPosition, 100.0f, source: this.GetType()));
+	}
+
+	private void DeliverEvent(KurrentDB.Core.Data.ResolvedEvent pair, float progress, ref long sequenceNumber) {
+		EventRecord positionEvent = pair.OriginalEvent;
+		if (positionEvent.EventNumber != sequenceNumber) {
+			// This can happen when the original stream has $maxAge/$maxCount set
+			_publisher.Publish(new ReaderSubscriptionMessage.Faulted(EventReaderCorrelationId, string.Format(
+				"Event number {0} was expected in the stream {1}, but event number {2} was received. This may happen if events have been deleted from the beginning of your stream, please reset your projection.",
+				sequenceNumber, _streamName, positionEvent.EventNumber), this.GetType()));
+			return;
+		}
+
+		sequenceNumber = positionEvent.EventNumber + 1;
+		var resolvedEvent = new ResolvedEvent(pair, null);
+
+		string deletedPartitionStreamId;
+
+		if (resolvedEvent.IsLinkToDeletedStream && !resolvedEvent.IsLinkToDeletedStreamTombstone)
+			return;
+
+		bool isDeletedStreamEvent =
+			StreamDeletedHelper.IsStreamDeletedEventOrLinkToStreamDeletedEvent(resolvedEvent, pair.ResolveResult,
+				out deletedPartitionStreamId);
+
+		if (isDeletedStreamEvent) {
+			var deletedPartition = deletedPartitionStreamId;
+
+			if (_produceStreamDeletes)
+				_publisher.Publish(
+					//TODO: publish both link and event data
+					new ReaderSubscriptionMessage.EventReaderPartitionDeleted(
+						EventReaderCorrelationId, deletedPartition, source: this.GetType(), lastEventNumber: -1,
+						deleteEventOrLinkTargetPosition: null,
+						deleteLinkOrEventPosition: resolvedEvent.EventOrLinkTargetPosition,
+						positionStreamId: resolvedEvent.PositionStreamId,
+						positionEventNumber: resolvedEvent.PositionSequenceNumber));
+		} else if (!resolvedEvent.IsStreamDeletedEvent)
+			_publisher.Publish(
+				//TODO: publish both link and event data
+				new ReaderSubscriptionMessage.CommittedEventDistributed(
+					EventReaderCorrelationId, resolvedEvent, _stopOnEof ? (long?)null : positionEvent.LogPosition,
+					progress, source: this.GetType()));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/SingleStream/StreamPositionTagger.cs b/src/KurrentDB.Projections.Core/Services/Processing/SingleStream/StreamPositionTagger.cs
new file mode 100644
index 00000000000..cab9431f5e2
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/SingleStream/StreamPositionTagger.cs
@@ -0,0 +1,109 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.Services.Processing.SingleStream;
+
+public class StreamPositionTagger : PositionTagger {
+	private readonly string _stream;
+
+	public StreamPositionTagger(int phase, string stream) : base(phase) {
+		if (stream == null)
+			throw new ArgumentNullException("stream");
+		if (string.IsNullOrEmpty(stream))
+			throw new ArgumentException("stream");
+		_stream = stream;
+	}
+
+	public override bool IsMessageAfterCheckpointTag(
+		CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
+		if (previous.Phase < Phase)
+			return true;
+		if (previous.Mode_ != CheckpointTag.Mode.Stream)
+			throw new ArgumentException("Mode.Stream expected", "previous");
+		return committedEvent.Data.PositionStreamId == _stream
+			   && committedEvent.Data.PositionSequenceNumber > previous.Streams[_stream];
+	}
+
+	public override CheckpointTag MakeCheckpointTag(
+		CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
+		if (previous.Phase != Phase)
+			throw new ArgumentException(
+				string.Format("Invalid checkpoint tag phase.  Expected: {0} Was: {1}", Phase, previous.Phase));
+
+		if (committedEvent.Data.PositionStreamId != _stream)
+			throw new InvalidOperationException(
+				string.Format(
+					"Invalid stream '{0}'.  Expected stream is '{1}'", committedEvent.Data.EventStreamId, _stream));
+		return CheckpointTag.FromStreamPosition(previous.Phase, committedEvent.Data.PositionStreamId,
+			committedEvent.Data.PositionSequenceNumber);
+	}
+
+	public override CheckpointTag MakeCheckpointTag(CheckpointTag previous,
+		ReaderSubscriptionMessage.EventReaderPartitionEof partitionEof) {
+		throw new NotImplementedException();
+	}
+
+	public override CheckpointTag MakeCheckpointTag(
+		CheckpointTag previous, ReaderSubscriptionMessage.EventReaderPartitionDeleted partitionDeleted) {
+		if (previous.Phase != Phase)
+			throw new ArgumentException(
+				string.Format("Invalid checkpoint tag phase.  Expected: {0} Was: {1}", Phase, previous.Phase));
+
+		if (partitionDeleted.PositionStreamId != _stream)
+			throw new InvalidOperationException(
+				string.Format(
+					"Invalid stream '{0}'.  Expected stream is '{1}'", partitionDeleted.Partition, _stream));
+
+		// return ordinary checkpoint tag (suitable for fromCategory.foreachStream as well as for regular fromStream
+		return CheckpointTag.FromStreamPosition(
+			previous.Phase, partitionDeleted.PositionStreamId, partitionDeleted.PositionEventNumber.Value);
+	}
+
+	public override CheckpointTag MakeZeroCheckpointTag() {
+		return CheckpointTag.FromStreamPosition(Phase, _stream, -1);
+	}
+
+	public override bool IsCompatible(CheckpointTag checkpointTag) {
+		return checkpointTag.Mode_ == CheckpointTag.Mode.Stream && checkpointTag.Streams.Keys.First() == _stream;
+	}
+
+	public override CheckpointTag AdjustTag(CheckpointTag tag) {
+		if (tag.Phase < Phase)
+			return tag;
+		if (tag.Phase > Phase)
+			throw new ArgumentException(
+				string.Format("Invalid checkpoint tag phase.  Expected less or equal to: {0} Was: {1}", Phase,
+					tag.Phase), "tag");
+
+
+		if (tag.Mode_ == CheckpointTag.Mode.Stream) {
+			long p;
+			return CheckpointTag.FromStreamPosition(
+				tag.Phase, _stream, tag.Streams.TryGetValue(_stream, out p) ? p : -1);
+		}
+
+		switch (tag.Mode_) {
+			case CheckpointTag.Mode.EventTypeIndex:
+				throw new NotSupportedException(
+					"Conversion from EventTypeIndex to Stream position tag is not supported");
+			case CheckpointTag.Mode.PreparePosition:
+				throw new NotSupportedException(
+					"Conversion from PreparePosition to Stream position tag is not supported");
+			case CheckpointTag.Mode.MultiStream:
+				long p;
+				return CheckpointTag.FromStreamPosition(
+					tag.Phase, _stream, tag.Streams.TryGetValue(_stream, out p) ? p : -1);
+			case CheckpointTag.Mode.Position:
+				throw new NotSupportedException("Conversion from Position to Stream position tag is not supported");
+			default:
+				throw new NotSupportedException(string.Format(
+					"The given checkpoint is invalid. Possible causes might include having written an event to the projection's managed stream. The bad checkpoint: {0}",
+					tag.ToString()));
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/SourceDefinitionBuilder.cs b/src/KurrentDB.Projections.Core/Services/Processing/SourceDefinitionBuilder.cs
new file mode 100644
index 00000000000..2a48d6558b8
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/SourceDefinitionBuilder.cs
@@ -0,0 +1,194 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Projections.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Services.Processing;
+
+public sealed class SourceDefinitionBuilder : IQuerySources {
+	private readonly QuerySourceOptions _options = new QuerySourceOptions();
+	private bool _allStreams;
+	private List<string> _categories;
+	private List<string> _streams;
+	private bool _allEvents;
+	private List<string> _events;
+	private bool _byStream;
+	private bool _byCustomPartitions;
+	private long? _limitingCommitPosition;
+
+	public SourceDefinitionBuilder() {
+		_options.DefinesFold = true;
+	}
+
+	public void FromAll() {
+		_allStreams = true;
+	}
+
+	public void FromCategory(string categoryName) {
+		if (_categories == null)
+			_categories = new List<string>();
+		_categories.Add(categoryName);
+	}
+
+	public void FromStream(string streamName) {
+		if (_streams == null)
+			_streams = new List<string>();
+		_streams.Add(streamName);
+	}
+
+	public void AllEvents() {
+		_allEvents = true;
+	}
+
+	public void NotAllEvents() {
+		_allEvents = false;
+	}
+
+	public void SetIncludeLinks(bool includeLinks = true) {
+		_options.IncludeLinks = includeLinks;
+	}
+
+	public void IncludeEvent(string eventName) {
+		if (_events == null)
+			_events = new List<string>();
+		_events.Add(eventName);
+	}
+
+	public void SetByStream() {
+		_byStream = true;
+	}
+
+	public void SetByCustomPartitions() {
+		_byCustomPartitions = true;
+	}
+
+	public void SetDefinesStateTransform() {
+		_options.DefinesStateTransform = true;
+	}
+
+	public void SetOutputState() {
+		_options.ProducesResults = true;
+	}
+
+	public void NoWhen() {
+		_options.DefinesFold = false;
+	}
+
+	public void SetDefinesFold() {
+		_options.DefinesFold = true;
+	}
+
+	public void SetResultStreamNameOption(string resultStreamName) {
+		_options.ResultStreamName = String.IsNullOrWhiteSpace(resultStreamName) ? null : resultStreamName;
+	}
+
+	public void SetPartitionResultStreamNamePatternOption(string partitionResultStreamNamePattern) {
+		_options.PartitionResultStreamNamePattern = String.IsNullOrWhiteSpace(partitionResultStreamNamePattern)
+			? null
+			: partitionResultStreamNamePattern;
+	}
+
+	public void SetReorderEvents(bool reorderEvents) {
+		_options.ReorderEvents = reorderEvents;
+	}
+
+	public void SetProcessingLag(int processingLag) {
+		_options.ProcessingLag = processingLag;
+	}
+
+	public void SetIsBiState(bool isBiState) {
+		_options.IsBiState = isBiState;
+	}
+
+	public void SetHandlesStreamDeletedNotifications(bool value = true) {
+		_options.HandlesDeletedNotifications = value;
+	}
+
+	public bool AllStreams {
+		get { return _allStreams; }
+	}
+
+	public string[] Categories {
+		get { return _categories != null ? _categories.ToArray() : null; }
+	}
+
+	public string[] Streams {
+		get { return _streams != null ? _streams.ToArray() : null; }
+	}
+
+	bool IQuerySources.AllEvents {
+		get { return _allEvents; }
+	}
+
+	public string[] Events {
+		get { return _events != null ? _events.ToArray() : null; }
+	}
+
+	public bool ByStreams {
+		get { return _byStream; }
+	}
+
+	public bool ByCustomPartitions {
+		get { return _byCustomPartitions; }
+	}
+
+	public long? LimitingCommitPosition {
+		get { return _limitingCommitPosition; }
+	}
+
+	public bool DefinesStateTransform {
+		get { return _options.DefinesStateTransform; }
+	}
+
+	public bool ProducesResults {
+		get { return _options.ProducesResults; }
+	}
+
+	public bool DefinesFold {
+		get { return _options.DefinesFold; }
+	}
+
+	public bool HandlesDeletedNotifications {
+		get { return _options.HandlesDeletedNotifications; }
+	}
+
+	public bool IncludeLinksOption {
+		get { return _options.IncludeLinks; }
+	}
+
+	public string ResultStreamNameOption {
+		get { return _options.ResultStreamName; }
+	}
+
+	public string PartitionResultStreamNamePatternOption {
+		get { return _options.PartitionResultStreamNamePattern; }
+	}
+
+	public bool ReorderEventsOption {
+		get { return _options.ReorderEvents; }
+	}
+
+	public int? ProcessingLagOption {
+		get { return _options.ProcessingLag; }
+	}
+
+	public bool IsBiState {
+		get { return _options.IsBiState; }
+	}
+
+	public static IQuerySources From(Action<SourceDefinitionBuilder> configure) {
+		var b = new SourceDefinitionBuilder();
+		configure(b);
+		return b.Build();
+	}
+
+	public IQuerySources Build() {
+		return QuerySourcesDefinition.From(this);
+	}
+
+	public void SetLimitingCommitPosition(long limitingCommitPosition) {
+		_limitingCommitPosition = limitingCommitPosition;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/StagedProcessingQueue.cs b/src/KurrentDB.Projections.Core/Services/Processing/StagedProcessingQueue.cs
new file mode 100644
index 00000000000..f1eddf1c5bb
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/StagedProcessingQueue.cs
@@ -0,0 +1,269 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace KurrentDB.Projections.Core.Services.Processing;
+
+/// <summary>
+/// Staged processing queue allows queued processing of multi-step tasks.  The
+/// processing order allows multiple tasks to be processed at the same time with a constraint
+/// a) ordered stage: all preceding tasks in the queue has already started processing at the given stage.
+/// b) unordered stage: no items with the same correlation_id are in the queue before current item
+///
+/// For instance:  multiple foreach sub-projections can request state to be loaded, then they can process
+/// it and store.  But no subprojection can process events prior to preceding projections has completed processing.
+/// </summary>
+public class StagedProcessingQueue {
+	private class TaskEntry {
+		public readonly StagedTask Task;
+		public readonly long Sequence;
+		public bool Busy;
+		public object BusyCorrelationId;
+		public TaskEntry PreviousByCorrelation;
+		public TaskEntry NextByCorrelation;
+		public TaskEntry Next;
+		public bool Completed;
+		public int ReadForStage;
+
+		public TaskEntry(StagedTask task, long sequence) {
+			Task = task;
+			ReadForStage = -1;
+			Sequence = sequence;
+		}
+
+		public override string ToString() {
+			return string.Format("ReadForStage: {3},  Busy: {1}, Completed: {2} => {0}", Task, Busy, Completed,
+				ReadForStage);
+		}
+	}
+
+	private class StageEntry {
+		public TaskEntry Entry;
+		public StageEntry Next;
+	}
+
+	private readonly bool[] _orderedStage;
+	private readonly Dictionary<object, TaskEntry> _correlationLastEntries = new Dictionary<object, TaskEntry>();
+	private StageEntry[] _byUnorderedStageFirst; // null means all processed? so append need to set it?
+	private StageEntry[] _byUnorderedStageLast; // null means all processed? so append need to set it?
+	private TaskEntry[] _byOrderedStageLast; // null means all processed? so append need to set it?
+	private long _sequence = 0;
+	private TaskEntry _first;
+	private TaskEntry _last;
+	private int _count;
+	private readonly int _maxStage;
+	public event Action EnsureTickPending;
+
+	public StagedProcessingQueue(bool[] orderedStage) {
+		_orderedStage = orderedStage.ToArray();
+		_byUnorderedStageFirst = new StageEntry[_orderedStage.Length];
+		_byUnorderedStageLast = new StageEntry[_orderedStage.Length];
+		_byOrderedStageLast = new TaskEntry[_orderedStage.Length];
+		_maxStage = _orderedStage.Length - 1;
+	}
+
+	public bool IsEmpty {
+		get { return _count == 0; }
+	}
+
+	public int Count {
+		get { return _count; }
+	}
+
+	public void Enqueue(StagedTask stagedTask) {
+		var entry = new TaskEntry(stagedTask, ++_sequence);
+		if (_first == null) {
+			_first = entry;
+			_last = entry;
+			_count = 1;
+		} else {
+			_last.Next = entry;
+			_last = entry;
+			_count++;
+		}
+
+		// re-initialize already completed queues
+		for (var stage = 0; stage <= _maxStage; stage++)
+			if (_orderedStage[stage] && _byOrderedStageLast[stage] == null)
+				_byOrderedStageLast[stage] = entry;
+
+		SetEntryCorrelation(entry, stagedTask.InitialCorrelationId);
+		EnqueueForStage(entry, 0);
+	}
+
+	public bool Process(int max = 1) {
+		int processed = 0;
+		int fromStage = _maxStage;
+		while (_count > 0 && processed < max) {
+			RemoveCompleted();
+			var entry = GetEntryToProcess(fromStage);
+			if (entry == null)
+				break;
+			ProcessEntry(entry);
+			fromStage = entry.ReadForStage;
+			processed++;
+		}
+
+		return processed > 0;
+	}
+
+	private void ProcessEntry(TaskEntry entry) {
+		// here we should be at the first StagedTask of current processing level which is not busy
+		entry.Busy = true;
+		AdvanceStage(entry.ReadForStage, entry);
+		entry.Task.Process(
+			entry.ReadForStage,
+			(readyForStage, newCorrelationId) => CompleteTaskProcessing(entry, readyForStage, newCorrelationId));
+	}
+
+	private TaskEntry GetEntryToProcess(int fromStage) {
+		var stageIndex = fromStage;
+		while (stageIndex >= 0) {
+			TaskEntry task = null;
+			if (!_orderedStage[stageIndex]) {
+				if (_byUnorderedStageFirst[stageIndex] != null
+					&& _byUnorderedStageFirst[stageIndex].Entry.PreviousByCorrelation == null) {
+					var stageEntry = _byUnorderedStageFirst[stageIndex];
+					task = stageEntry.Entry;
+				}
+			} else {
+				var taskEntry = _byOrderedStageLast[stageIndex];
+				if (taskEntry != null && taskEntry.ReadForStage == stageIndex && !taskEntry.Busy
+					&& !taskEntry.Completed && taskEntry.PreviousByCorrelation == null)
+					task = taskEntry;
+			}
+
+			if (task == null) {
+				stageIndex--;
+				continue;
+			}
+
+			if (task.ReadForStage != stageIndex)
+				throw new Exception();
+			return task;
+		}
+
+		return null;
+	}
+
+	private void RemoveCompleted() {
+		while (_first != null && _first.Completed) {
+			var task = _first;
+			_first = task.Next;
+			if (_first == null)
+				_last = null;
+			_count--;
+			if (task.BusyCorrelationId != null) {
+				var nextByCorrelation = task.NextByCorrelation;
+				if (nextByCorrelation != null) {
+					if (nextByCorrelation.PreviousByCorrelation != task)
+						throw new Exception("Invalid linked list by correlation");
+					task.NextByCorrelation = null;
+					nextByCorrelation.PreviousByCorrelation = null;
+					if (!_orderedStage[nextByCorrelation.ReadForStage])
+						EnqueueForStage(nextByCorrelation, nextByCorrelation.ReadForStage);
+				} else {
+					// remove the last one
+					_correlationLastEntries.Remove(task.BusyCorrelationId);
+				}
+			}
+		}
+	}
+
+	private void CompleteTaskProcessing(TaskEntry entry, int readyForStage, object newCorrelationId) {
+		if (!entry.Busy)
+			throw new InvalidOperationException("Task was not in progress");
+		entry.Busy = false;
+		SetEntryCorrelation(entry, newCorrelationId);
+		if (readyForStage < 0) {
+			MarkCompletedTask(entry);
+			if (entry == _first)
+				RemoveCompleted();
+		} else
+			EnqueueForStage(entry, readyForStage);
+
+		if (EnsureTickPending != null)
+			EnsureTickPending();
+	}
+
+	private void EnqueueForStage(TaskEntry entry, int readyForStage) {
+		entry.ReadForStage = readyForStage;
+		if (!_orderedStage[readyForStage] && (entry.PreviousByCorrelation == null)) {
+			var stageEntry = new StageEntry { Entry = entry, Next = null };
+			if (_byUnorderedStageFirst[readyForStage] != null) {
+				_byUnorderedStageLast[readyForStage].Next = stageEntry;
+				_byUnorderedStageLast[readyForStage] = stageEntry;
+			} else {
+				_byUnorderedStageFirst[readyForStage] = stageEntry;
+				_byUnorderedStageLast[readyForStage] = stageEntry;
+			}
+		}
+	}
+
+	private void AdvanceStage(int stage, TaskEntry entry) {
+		if (!_orderedStage[stage]) {
+			if (_byUnorderedStageFirst[stage].Entry != entry)
+				throw new ArgumentException(
+					string.Format("entry is not a head of the queue at the stage {0}", stage), "entry");
+			_byUnorderedStageFirst[stage] = _byUnorderedStageFirst[stage].Next;
+			if (_byUnorderedStageFirst[stage] == null)
+				_byUnorderedStageLast[stage] = null;
+		} else {
+			if (_byOrderedStageLast[stage] != entry)
+				throw new ArgumentException(
+					string.Format("entry is not a head of the queue at the stage {0}", stage), "entry");
+			_byOrderedStageLast[stage] = entry.Next;
+		}
+	}
+
+	private void SetEntryCorrelation(TaskEntry entry, object newCorrelationId) {
+		if (!Equals(entry.BusyCorrelationId, newCorrelationId)) {
+			if (entry.ReadForStage != -1 && !_orderedStage[entry.ReadForStage])
+				throw new InvalidOperationException("Cannot set busy correlation id at non-ordered stage");
+			if (entry.BusyCorrelationId != null)
+				throw new InvalidOperationException("Busy correlation id has been already set");
+
+			entry.BusyCorrelationId = newCorrelationId;
+			if (newCorrelationId != null) {
+				TaskEntry lastEntry;
+				if (_correlationLastEntries.TryGetValue(newCorrelationId, out lastEntry)) {
+					if (entry.Sequence < lastEntry.Sequence)
+						//NOTE: should never happen as we require ordered stage or initialization
+						throw new InvalidOperationException(
+							"Cannot inject task correlation id before another task with the same correlation id");
+					lastEntry.NextByCorrelation = entry;
+					entry.PreviousByCorrelation = lastEntry;
+					_correlationLastEntries[newCorrelationId] = entry;
+				} else
+					_correlationLastEntries.Add(newCorrelationId, entry);
+			}
+		}
+	}
+
+	private void MarkCompletedTask(TaskEntry entry) {
+		entry.Completed = true;
+	}
+
+	public void Initialize() {
+		_correlationLastEntries.Clear();
+		_byUnorderedStageFirst = new StageEntry[_orderedStage.Length];
+		_byUnorderedStageLast = new StageEntry[_orderedStage.Length];
+		_byOrderedStageLast = new TaskEntry[_orderedStage.Length];
+		_count = 0;
+		_first = null;
+		_last = null;
+	}
+}
+
+public abstract class StagedTask {
+	public readonly object InitialCorrelationId;
+
+	protected StagedTask(object initialCorrelationId) {
+		InitialCorrelationId = initialCorrelationId;
+	}
+
+	public abstract void Process(int onStage, Action<int, object> readyForStage);
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Strategies/ContinuousProjectionProcessingStrategy.cs b/src/KurrentDB.Projections.Core/Services/Processing/Strategies/ContinuousProjectionProcessingStrategy.cs
new file mode 100644
index 00000000000..07796a25b99
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Strategies/ContinuousProjectionProcessingStrategy.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using KurrentDB.Projections.Core.Services.Processing.Phases;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Strategies;
+
+public class ContinuousProjectionProcessingStrategy : DefaultProjectionProcessingStrategy {
+	public ContinuousProjectionProcessingStrategy(
+		string name, ProjectionVersion projectionVersion, IProjectionStateHandler stateHandler,
+		ProjectionConfig projectionConfig, IQuerySources sourceDefinition, ILogger logger,
+		ReaderSubscriptionDispatcher subscriptionDispatcher, bool enableContentTypeValidation, int maxProjectionStateSize)
+		: base(
+			name, projectionVersion, stateHandler, projectionConfig, sourceDefinition, logger,
+			subscriptionDispatcher, enableContentTypeValidation, maxProjectionStateSize) {
+	}
+
+	public override bool GetStopOnEof() {
+		return false;
+	}
+
+	public override bool GetUseCheckpoints() {
+		return _projectionConfig.CheckpointsEnabled;
+	}
+
+	public override bool GetProducesRunningResults() {
+		return _sourceDefinition.ProducesResults;
+	}
+
+	protected override IProjectionProcessingPhase[] CreateProjectionProcessingPhases(
+		IPublisher publisher,
+		IPublisher inputQueue,
+		Guid projectionCorrelationId,
+		ProjectionNamesBuilder namingBuilder,
+		PartitionStateCache partitionStateCache,
+		CoreProjection coreProjection,
+		IODispatcher ioDispatcher,
+		IProjectionProcessingPhase firstPhase) {
+		return new IProjectionProcessingPhase[] { firstPhase };
+	}
+
+	protected override IResultEventEmitter CreateFirstPhaseResultEmitter(ProjectionNamesBuilder namingBuilder) {
+		return _sourceDefinition.ProducesResults
+			? new ResultEventEmitter(namingBuilder)
+			: (IResultEventEmitter)new NoopResultEventEmitter();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Strategies/DefaultProjectionProcessingStrategy.cs b/src/KurrentDB.Projections.Core/Services/Processing/Strategies/DefaultProjectionProcessingStrategy.cs
new file mode 100644
index 00000000000..2cad0da2b75
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Strategies/DefaultProjectionProcessingStrategy.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using KurrentDB.Projections.Core.Services.Processing.Phases;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Strategies;
+
+public abstract class DefaultProjectionProcessingStrategy : EventReaderBasedProjectionProcessingStrategy {
+	private readonly IProjectionStateHandler _stateHandler;
+
+	protected DefaultProjectionProcessingStrategy(
+		string name, ProjectionVersion projectionVersion, IProjectionStateHandler stateHandler,
+		ProjectionConfig projectionConfig, IQuerySources sourceDefinition, ILogger logger,
+		ReaderSubscriptionDispatcher subscriptionDispatcher, bool enableContentTypeValidation, int maxProjectionStateSize)
+		: base(name, projectionVersion, projectionConfig, sourceDefinition, logger, subscriptionDispatcher,
+			enableContentTypeValidation, maxProjectionStateSize) {
+		_stateHandler = stateHandler;
+	}
+
+	protected override IProjectionProcessingPhase CreateFirstProcessingPhase(
+		IPublisher publisher,
+		IPublisher inputQueue,
+		Guid projectionCorrelationId,
+		PartitionStateCache partitionStateCache,
+		Action updateStatistics,
+		CoreProjection coreProjection,
+		ReaderSubscriptionDispatcher subscriptionDispatcher,
+		CheckpointTag zeroCheckpointTag,
+		ICoreProjectionCheckpointManager checkpointManager,
+		IReaderStrategy readerStrategy,
+		IResultWriter resultWriter,
+		IEmittedStreamsTracker emittedStreamsTracker) {
+		var statePartitionSelector = CreateStatePartitionSelector();
+
+		var orderedPartitionProcessing = _sourceDefinition.ByStreams && _sourceDefinition.IsBiState;
+		return new EventProcessingProjectionProcessingPhase(
+			coreProjection,
+			projectionCorrelationId,
+			publisher,
+			inputQueue,
+			_projectionConfig,
+			updateStatistics,
+			_stateHandler,
+			partitionStateCache,
+			_sourceDefinition.DefinesStateTransform,
+			_name,
+			_logger,
+			zeroCheckpointTag,
+			checkpointManager,
+			statePartitionSelector,
+			subscriptionDispatcher,
+			readerStrategy,
+			resultWriter,
+			_projectionConfig.CheckpointsEnabled,
+			this.GetStopOnEof(),
+			_sourceDefinition.IsBiState,
+			orderedPartitionProcessing: orderedPartitionProcessing,
+			emittedStreamsTracker: emittedStreamsTracker,
+			enableContentTypeValidation: _enableContentTypeValidation);
+	}
+
+	protected virtual StatePartitionSelector CreateStatePartitionSelector() {
+		return _sourceDefinition.ByCustomPartitions
+			? new ByHandleStatePartitionSelector(_stateHandler)
+			: (_sourceDefinition.ByStreams
+				? (StatePartitionSelector)new ByStreamStatePartitionSelector()
+				: new NoopStatePartitionSelector());
+	}
+}
diff --git a/src/EventStore.Projections.Core/Services/Processing/Strategies/EventReaderBasedProjectionProcessingStrategy.cs b/src/KurrentDB.Projections.Core/Services/Processing/Strategies/EventReaderBasedProjectionProcessingStrategy.cs
similarity index 83%
rename from src/EventStore.Projections.Core/Services/Processing/Strategies/EventReaderBasedProjectionProcessingStrategy.cs
rename to src/KurrentDB.Projections.Core/Services/Processing/Strategies/EventReaderBasedProjectionProcessingStrategy.cs
index 86062f9559b..dea9d7ece85 100644
--- a/src/EventStore.Projections.Core/Services/Processing/Strategies/EventReaderBasedProjectionProcessingStrategy.cs
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Strategies/EventReaderBasedProjectionProcessingStrategy.cs
@@ -1,15 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System;
-using EventStore.Core.Bus;
-using EventStore.Core.Helpers;
-using EventStore.Core.Services.TimerService;
-using EventStore.Projections.Core.Messages;
-using EventStore.Projections.Core.Services.Processing.Checkpointing;
-using EventStore.Projections.Core.Services.Processing.Emitting;
-using EventStore.Projections.Core.Services.Processing.MultiStream;
-using EventStore.Projections.Core.Services.Processing.Partitioning;
-using EventStore.Projections.Core.Services.Processing.Phases;
-
-namespace EventStore.Projections.Core.Services.Processing.Strategies;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using KurrentDB.Projections.Core.Services.Processing.Phases;
+using Serilog;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Strategies;
 
 public abstract class EventReaderBasedProjectionProcessingStrategy : ProjectionProcessingStrategy {
 	protected readonly ProjectionConfig _projectionConfig;
@@ -20,8 +24,9 @@ public abstract class EventReaderBasedProjectionProcessingStrategy : ProjectionP
 
 	protected EventReaderBasedProjectionProcessingStrategy(
 		string name, ProjectionVersion projectionVersion, ProjectionConfig projectionConfig,
-		IQuerySources sourceDefinition, Serilog.ILogger logger, ReaderSubscriptionDispatcher subscriptionDispatcher, bool enableContentTypeValidation)
-		: base(name, projectionVersion, logger) {
+		IQuerySources sourceDefinition, ILogger logger, ReaderSubscriptionDispatcher subscriptionDispatcher,
+		bool enableContentTypeValidation, int maxProjectionStateSize)
+		: base(name, projectionVersion, logger, maxProjectionStateSize) {
 		_projectionConfig = projectionConfig;
 		_sourceDefinition = sourceDefinition;
 		_subscriptionDispatcher = subscriptionDispatcher;
@@ -149,13 +154,13 @@ protected virtual ICoreProjectionCheckpointManager CreateCheckpointManager(
 				publisher, projectionCorrelationId, _projectionVersion, _projectionConfig.RunAs, ioDispatcher,
 				_projectionConfig, _name, readerStrategy.PositionTagger, namingBuilder,
 				_projectionConfig.CheckpointsEnabled, GetProducesRunningResults(), definesFold,
-				coreProjectionCheckpointWriter);
+				coreProjectionCheckpointWriter, _maxProjectionStateSize);
 		} else {
 			return new DefaultCheckpointManager(
 				publisher, projectionCorrelationId, _projectionVersion, _projectionConfig.RunAs, ioDispatcher,
 				_projectionConfig, _name, readerStrategy.PositionTagger, namingBuilder,
 				_projectionConfig.CheckpointsEnabled, GetProducesRunningResults(), definesFold,
-				coreProjectionCheckpointWriter);
+				coreProjectionCheckpointWriter, _maxProjectionStateSize);
 		}
 	}
 
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Strategies/IReaderStrategy.cs b/src/KurrentDB.Projections.Core/Services/Processing/Strategies/IReaderStrategy.cs
new file mode 100644
index 00000000000..c3a8afbf4cc
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Strategies/IReaderStrategy.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Strategies;
+
+public interface IReaderStrategy {
+	bool IsReadingOrderRepeatable { get; }
+	EventFilter EventFilter { get; }
+	PositionTagger PositionTagger { get; }
+
+	IReaderSubscription CreateReaderSubscription(
+		IPublisher publisher, CheckpointTag fromCheckpointTag, Guid subscriptionId,
+		ReaderSubscriptionOptions readerSubscriptionOptions);
+
+	IEventReader CreatePausedEventReader(
+		Guid eventReaderId, IPublisher publisher, IODispatcher ioDispatcher, CheckpointTag checkpointTag,
+		bool stopOnEof, int? stopAfterNEvents);
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Strategies/IResultWriter.cs b/src/KurrentDB.Projections.Core/Services/Processing/Strategies/IResultWriter.cs
new file mode 100644
index 00000000000..069bf1e31c6
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Strategies/IResultWriter.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Strategies;
+
+public interface IResultWriter {
+	//NOTE: subscriptionId should not be here.  Reconsider how to pass it to follower projection result writer
+	void WriteEofResult(
+		Guid subscriptionId, string partition, string resultBody, CheckpointTag causedBy, Guid causedByGuid,
+		string correlationId);
+
+	void WriteRunningResult(EventProcessedResult result);
+
+	void AccountPartition(EventProcessedResult result);
+
+	void EventsEmitted(EmittedEventEnvelope[] scheduledWrites, Guid causedBy, string correlationId);
+
+	void WriteProgress(Guid subscriptionId, float progress);
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Strategies/ProcessingStrategySelector.cs b/src/KurrentDB.Projections.Core/Services/Processing/Strategies/ProcessingStrategySelector.cs
new file mode 100644
index 00000000000..0042432c6fd
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Strategies/ProcessingStrategySelector.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Messages;
+using Serilog;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Strategies;
+
+public class ProcessingStrategySelector {
+	private readonly ILogger _logger = Log.ForContext<ProcessingStrategySelector>();
+	private readonly ReaderSubscriptionDispatcher _subscriptionDispatcher;
+	private readonly int _maxProjectionStateSize;
+
+	public ProcessingStrategySelector(
+		ReaderSubscriptionDispatcher subscriptionDispatcher, int maxProjectionStateSize) {
+		_subscriptionDispatcher = subscriptionDispatcher;
+		_maxProjectionStateSize = maxProjectionStateSize;
+	}
+
+	public ProjectionProcessingStrategy CreateProjectionProcessingStrategy(
+		string name,
+		ProjectionVersion projectionVersion,
+		ProjectionNamesBuilder namesBuilder,
+		IQuerySources sourceDefinition,
+		ProjectionConfig projectionConfig,
+		IProjectionStateHandler stateHandler, string handlerType, string query, bool enableContentTypeValidation) {
+
+		return projectionConfig.StopOnEof
+			? (ProjectionProcessingStrategy)
+			new QueryProcessingStrategy(
+				name,
+				projectionVersion,
+				stateHandler,
+				projectionConfig,
+				sourceDefinition,
+				_logger,
+				_subscriptionDispatcher,
+				enableContentTypeValidation,
+				_maxProjectionStateSize)
+			: new ContinuousProjectionProcessingStrategy(
+				name,
+				projectionVersion,
+				stateHandler,
+				projectionConfig,
+				sourceDefinition,
+				_logger,
+				_subscriptionDispatcher,
+				enableContentTypeValidation,
+				_maxProjectionStateSize);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Strategies/ProjectionProcessingStrategy.cs b/src/KurrentDB.Projections.Core/Services/Processing/Strategies/ProjectionProcessingStrategy.cs
new file mode 100644
index 00000000000..66fd78bc6da
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Strategies/ProjectionProcessingStrategy.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using KurrentDB.Projections.Core.Services.Processing.Phases;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Strategies;
+
+public abstract class ProjectionProcessingStrategy {
+	protected readonly string _name;
+	protected readonly ProjectionVersion _projectionVersion;
+	protected readonly ILogger _logger;
+	protected readonly int _maxProjectionStateSize;
+
+	protected ProjectionProcessingStrategy(string name, ProjectionVersion projectionVersion, ILogger logger, int maxProjectionStateSize) {
+		_name = name;
+		_projectionVersion = projectionVersion;
+		_logger = logger;
+		_maxProjectionStateSize = maxProjectionStateSize;
+	}
+
+	public CoreProjection Create(
+		Guid projectionCorrelationId,
+		IPublisher inputQueue,
+		Guid workerId,
+		ClaimsPrincipal runAs,
+		IPublisher publisher,
+		IODispatcher ioDispatcher,
+		ReaderSubscriptionDispatcher subscriptionDispatcher,
+		ITimeProvider timeProvider) {
+		if (inputQueue == null)
+			throw new ArgumentNullException("inputQueue");
+		//if (runAs == null) throw new ArgumentNullException("runAs");
+		if (publisher == null)
+			throw new ArgumentNullException("publisher");
+		if (ioDispatcher == null)
+			throw new ArgumentNullException("ioDispatcher");
+		if (timeProvider == null)
+			throw new ArgumentNullException("timeProvider");
+
+		var namingBuilder = new ProjectionNamesBuilder(_name, GetSourceDefinition());
+
+		var coreProjectionCheckpointWriter =
+			new CoreProjectionCheckpointWriter(
+				namingBuilder.MakeCheckpointStreamName(),
+				ioDispatcher,
+				_projectionVersion,
+				namingBuilder.EffectiveProjectionName);
+
+		var partitionStateCache = new PartitionStateCache();
+
+		return new CoreProjection(
+			this,
+			_projectionVersion,
+			projectionCorrelationId,
+			inputQueue,
+			workerId,
+			runAs,
+			publisher,
+			ioDispatcher,
+			subscriptionDispatcher,
+			_logger,
+			namingBuilder,
+			coreProjectionCheckpointWriter,
+			partitionStateCache,
+			namingBuilder.EffectiveProjectionName,
+			timeProvider);
+	}
+
+	protected abstract IQuerySources GetSourceDefinition();
+
+	public abstract bool GetStopOnEof();
+	public abstract bool GetUseCheckpoints();
+	public abstract bool GetRequiresRootPartition();
+	public abstract bool GetProducesRunningResults();
+	public abstract void EnrichStatistics(ProjectionStatistics info);
+
+	public abstract IProjectionProcessingPhase[] CreateProcessingPhases(
+		IPublisher publisher,
+		IPublisher inputQueue,
+		Guid projectionCorrelationId,
+		PartitionStateCache partitionStateCache,
+		Action updateStatistics,
+		CoreProjection coreProjection,
+		ProjectionNamesBuilder namingBuilder,
+		ITimeProvider timeProvider,
+		IODispatcher ioDispatcher,
+		CoreProjectionCheckpointWriter coreProjectionCheckpointWriter);
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Strategies/QueryProcessingStrategy.cs b/src/KurrentDB.Projections.Core/Services/Processing/Strategies/QueryProcessingStrategy.cs
new file mode 100644
index 00000000000..2f12a40ef33
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Strategies/QueryProcessingStrategy.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Services.UserManagement;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using KurrentDB.Projections.Core.Services.Processing.Phases;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Strategies;
+
+public class QueryProcessingStrategy : DefaultProjectionProcessingStrategy {
+	public QueryProcessingStrategy(
+		string name, ProjectionVersion projectionVersion, IProjectionStateHandler stateHandler,
+		ProjectionConfig projectionConfig, IQuerySources sourceDefinition, ILogger logger,
+		ReaderSubscriptionDispatcher subscriptionDispatcher, bool enableContentTypeValidation, int maxProjectionStateSize)
+		: base(
+			name, projectionVersion, stateHandler, projectionConfig, sourceDefinition, logger,
+			subscriptionDispatcher, enableContentTypeValidation, maxProjectionStateSize) {
+	}
+
+	public override bool GetStopOnEof() {
+		return true;
+	}
+
+	public override bool GetUseCheckpoints() {
+		return false;
+	}
+
+	public override bool GetProducesRunningResults() {
+		return !_sourceDefinition.DefinesFold;
+	}
+
+	protected override IProjectionProcessingPhase[] CreateProjectionProcessingPhases(
+		IPublisher publisher, IPublisher inputQueue, Guid projectionCorrelationId,
+		ProjectionNamesBuilder namingBuilder,
+		PartitionStateCache partitionStateCache, CoreProjection coreProjection, IODispatcher ioDispatcher,
+		IProjectionProcessingPhase firstPhase) {
+		var coreProjectionCheckpointWriter =
+			new CoreProjectionCheckpointWriter(
+				namingBuilder.MakeCheckpointStreamName(), ioDispatcher, _projectionVersion, _name);
+		var checkpointManager2 = new DefaultCheckpointManager(
+			publisher, projectionCorrelationId, _projectionVersion, SystemAccounts.System, ioDispatcher,
+			_projectionConfig, _name, new PhasePositionTagger(1), namingBuilder, GetUseCheckpoints(), false,
+			_sourceDefinition.DefinesFold, coreProjectionCheckpointWriter, _maxProjectionStateSize);
+
+		IProjectionProcessingPhase writeResultsPhase;
+		if (GetProducesRunningResults())
+			writeResultsPhase = new WriteQueryEofProjectionProcessingPhase(
+				publisher,
+				1,
+				namingBuilder.GetResultStreamName(),
+				coreProjection,
+				partitionStateCache,
+				checkpointManager2,
+				checkpointManager2,
+				firstPhase.EmittedStreamsTracker);
+		else
+			writeResultsPhase = new WriteQueryResultProjectionProcessingPhase(
+				publisher,
+				1,
+				namingBuilder.GetResultStreamName(),
+				coreProjection,
+				partitionStateCache,
+				checkpointManager2,
+				checkpointManager2,
+				firstPhase.EmittedStreamsTracker);
+
+		return new[] { firstPhase, writeResultsPhase };
+	}
+
+	protected override IResultEventEmitter CreateFirstPhaseResultEmitter(ProjectionNamesBuilder namingBuilder) {
+		return new ResultEventEmitter(namingBuilder);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Strategies/ReaderStrategy.cs b/src/KurrentDB.Projections.Core/Services/Processing/Strategies/ReaderStrategy.cs
new file mode 100644
index 00000000000..fbef37d017c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Strategies/ReaderStrategy.cs
@@ -0,0 +1,299 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.EventByType;
+using KurrentDB.Projections.Core.Services.Processing.MultiStream;
+using KurrentDB.Projections.Core.Services.Processing.SingleStream;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+using KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Strategies;
+
+public class ReaderStrategy : IReaderStrategy {
+	private readonly bool _allStreams;
+	private readonly HashSet<string> _categories;
+	private readonly HashSet<string> _streams;
+	private readonly bool _allEvents;
+	private readonly bool _includeLinks;
+	private readonly HashSet<string> _events;
+	private readonly bool _includeStreamDeletedNotification;
+	private readonly bool _reorderEvents;
+	private readonly ClaimsPrincipal _runAs;
+	private readonly int _processingLag;
+
+
+	private readonly EventFilter _eventFilter;
+	private readonly PositionTagger _positionTagger;
+	private readonly ITimeProvider _timeProvider;
+
+	private readonly string _tag;
+	private readonly int _phase;
+
+	public static IReaderStrategy Create(
+		string tag,
+		int phase,
+		IQuerySources sources,
+		ITimeProvider timeProvider,
+		bool stopOnEof,
+		ClaimsPrincipal runAs) {
+		if (!sources.AllStreams && !sources.HasCategories() && !sources.HasStreams())
+			throw new InvalidOperationException("None of streams and categories are included");
+		if (!sources.AllEvents && !sources.HasEvents())
+			throw new InvalidOperationException("None of events are included");
+		if (sources.HasStreams() && sources.HasCategories())
+			throw new InvalidOperationException(
+				"Streams and categories cannot be included in a filter at the same time");
+		if (sources.AllStreams && (sources.HasCategories() || sources.HasStreams()))
+			throw new InvalidOperationException("Both FromAll and specific categories/streams cannot be set");
+		if (sources.AllEvents && sources.HasEvents())
+			throw new InvalidOperationException("Both AllEvents and specific event filters cannot be set");
+
+		if (sources.ByStreams && sources.HasStreams())
+			throw new InvalidOperationException(
+				"foreachStream projections are not supported on stream based sources");
+
+		if (sources.ReorderEventsOption) {
+			if (sources.AllStreams)
+				throw new InvalidOperationException("Event reordering cannot be used with fromAll()");
+			if (!(sources.HasStreams() && sources.Streams.Length > 1)) {
+				throw new InvalidOperationException(
+					"Event reordering is only available in fromStreams([]) projections");
+			}
+
+			if (sources.ProcessingLagOption < 50)
+				throw new InvalidOperationException("Event reordering requires processing lag at least of 50ms");
+		}
+
+		if (sources.HandlesDeletedNotifications && !sources.ByStreams)
+			throw new InvalidOperationException(
+				"Deleted stream notifications are only supported with foreachStream()");
+
+		var readerStrategy = new ReaderStrategy(
+			tag,
+			phase,
+			sources.AllStreams,
+			sources.Categories,
+			sources.Streams,
+			sources.AllEvents,
+			sources.IncludeLinksOption,
+			sources.Events,
+			sources.HandlesDeletedNotifications,
+			sources.ProcessingLagOption,
+			sources.ReorderEventsOption,
+			runAs,
+			timeProvider);
+		return readerStrategy;
+	}
+
+	private ReaderStrategy(
+		string tag,
+		int phase,
+		bool allStreams,
+		string[] categories,
+		string[] streams,
+		bool allEvents,
+		bool includeLinks,
+		string[] events,
+		bool includeStreamDeletedNotification,
+		int? processingLag,
+		bool reorderEvents,
+		ClaimsPrincipal runAs,
+		ITimeProvider timeProvider) {
+		_tag = tag;
+		_phase = phase;
+		_allStreams = allStreams;
+		_categories = categories != null && categories.Length > 0 ? new HashSet<string>(categories) : null;
+		_streams = streams != null && streams.Length > 0 ? new HashSet<string>(streams) : null;
+		_allEvents = allEvents;
+		_includeLinks = includeLinks;
+		_events = events != null && events.Length > 0 ? new HashSet<string>(events) : null;
+		_includeStreamDeletedNotification = includeStreamDeletedNotification;
+		_processingLag = processingLag.GetValueOrDefault();
+		_reorderEvents = reorderEvents;
+		_runAs = runAs;
+
+		_eventFilter = CreateEventFilter();
+		_positionTagger = CreatePositionTagger();
+		_timeProvider = timeProvider;
+	}
+
+	public bool IsReadingOrderRepeatable {
+		get { return !(_streams != null && _streams.Count > 1); }
+	}
+
+	public EventFilter EventFilter {
+		get { return _eventFilter; }
+	}
+
+	public PositionTagger PositionTagger {
+		get { return _positionTagger; }
+	}
+
+	public int Phase {
+		get { return _phase; }
+	}
+
+	public IReaderSubscription CreateReaderSubscription(
+		IPublisher publisher, CheckpointTag fromCheckpointTag, Guid subscriptionId,
+		ReaderSubscriptionOptions readerSubscriptionOptions) {
+		if (_reorderEvents)
+			return new EventReorderingReaderSubscription(
+				publisher,
+				subscriptionId,
+				fromCheckpointTag,
+				this,
+				_timeProvider,
+				readerSubscriptionOptions.CheckpointUnhandledBytesThreshold,
+				readerSubscriptionOptions.CheckpointProcessedEventsThreshold,
+				readerSubscriptionOptions.CheckpointAfterMs,
+				_processingLag,
+				readerSubscriptionOptions.StopOnEof,
+				readerSubscriptionOptions.StopAfterNEvents,
+				readerSubscriptionOptions.EnableContentTypeValidation);
+		else
+			return new ReaderSubscription(
+				_tag,
+				publisher,
+				subscriptionId,
+				fromCheckpointTag,
+				this,
+				_timeProvider,
+				readerSubscriptionOptions.CheckpointUnhandledBytesThreshold,
+				readerSubscriptionOptions.CheckpointProcessedEventsThreshold,
+				readerSubscriptionOptions.CheckpointAfterMs,
+				readerSubscriptionOptions.StopOnEof,
+				readerSubscriptionOptions.StopAfterNEvents,
+				readerSubscriptionOptions.EnableContentTypeValidation);
+	}
+
+	public IEventReader CreatePausedEventReader(
+		Guid eventReaderId, IPublisher publisher, IODispatcher ioDispatcher, CheckpointTag checkpointTag,
+		bool stopOnEof, int? stopAfterNEvents) {
+		if (_allStreams && _events != null && _events.Count >= 1) {
+			//IEnumerable<string> streams = GetEventIndexStreams();
+			return CreatePausedEventIndexEventReader(
+				eventReaderId, ioDispatcher, publisher, checkpointTag, stopOnEof, stopAfterNEvents, true, _events,
+				_includeStreamDeletedNotification);
+		}
+
+		if (_allStreams) {
+			var eventReader = new TransactionFileEventReader(publisher, eventReaderId, _runAs,
+				new TFPos(checkpointTag.CommitPosition.Value, checkpointTag.PreparePosition.Value), _timeProvider,
+				deliverEndOfTFPosition: true, stopOnEof: stopOnEof, resolveLinkTos: false);
+			return eventReader;
+		}
+
+		if (_streams != null && _streams.Count == 1) {
+			var streamName = checkpointTag.Streams.Keys.First();
+			//TODO: handle if not the same
+			return CreatePausedStreamEventReader(
+				eventReaderId, ioDispatcher, publisher, checkpointTag, streamName, stopOnEof, resolveLinkTos: true,
+				stopAfterNEvents: stopAfterNEvents, produceStreamDeletes: _includeStreamDeletedNotification);
+		}
+
+		if (_categories != null && _categories.Count == 1) {
+			var streamName = checkpointTag.Streams.Keys.First();
+			return CreatePausedStreamEventReader(
+				eventReaderId, ioDispatcher, publisher, checkpointTag, streamName, stopOnEof, resolveLinkTos: true,
+				stopAfterNEvents: stopAfterNEvents, produceStreamDeletes: _includeStreamDeletedNotification);
+		}
+
+		if (_streams != null && _streams.Count > 1) {
+			return CreatePausedMultiStreamEventReader(
+				eventReaderId, ioDispatcher, publisher, checkpointTag, stopOnEof, stopAfterNEvents, true, _streams);
+		}
+
+		throw new NotSupportedException();
+	}
+
+	//TODO: clean up $deleted event notification vs $streamDeleted event
+
+	private EventFilter CreateEventFilter() {
+		if (_allStreams && _events != null && _events.Count >= 1)
+			return new EventByTypeIndexEventFilter(_events);
+		if (_allStreams)
+			//NOTE: a projection cannot handle both stream deleted notifications
+			// and real stream tombstone/stream deleted events as they have the same position
+			// and thus processing cannot be correctly checkpointed
+			return new TransactionFileEventFilter(
+				_allEvents, !_includeStreamDeletedNotification, _events, includeLinks: _includeLinks);
+		if (_categories != null && _categories.Count == 1)
+			return new CategoryEventFilter(_categories.First(), _allEvents, _events);
+		if (_categories != null)
+			throw new NotSupportedException();
+		if (_streams != null && _streams.Count == 1)
+			return new StreamEventFilter(_streams.First(), _allEvents, _events);
+		if (_streams != null && _streams.Count > 1)
+			return new MultiStreamEventFilter(_streams, _allEvents, _events);
+		throw new NotSupportedException();
+	}
+
+	private PositionTagger CreatePositionTagger() {
+		if (_allStreams && _events != null && _events.Count >= 1)
+			return new EventByTypeIndexPositionTagger(_phase, _events.ToArray(), _includeStreamDeletedNotification);
+		if (_allStreams && _reorderEvents)
+			return new PreparePositionTagger(_phase);
+		if (_allStreams)
+			return new TransactionFilePositionTagger(_phase);
+		if (_categories != null && _categories.Count == 1)
+			//TODO: '-' is a hardcoded separator
+			return new StreamPositionTagger(_phase, "$ce-" + _categories.First());
+		if (_categories != null)
+			throw new NotSupportedException();
+		if (_streams != null && _streams.Count == 1)
+			return new StreamPositionTagger(_phase, _streams.First());
+		if (_streams != null && _streams.Count > 1)
+			return new MultiStreamPositionTagger(_phase, _streams.ToArray());
+		//TODO: consider passing projection phase from outside (above)
+		throw new NotSupportedException();
+	}
+
+
+	private IEventReader CreatePausedStreamEventReader(
+		Guid eventReaderId, IODispatcher ioDispatcher, IPublisher publisher, CheckpointTag checkpointTag,
+		string streamName, bool stopOnEof, int? stopAfterNEvents, bool resolveLinkTos, bool produceStreamDeletes) {
+		var lastProcessedSequenceNumber = checkpointTag.Streams.Values.First();
+		var fromSequenceNumber = lastProcessedSequenceNumber + 1;
+		var eventReader = new StreamEventReader(publisher, eventReaderId, _runAs, streamName, fromSequenceNumber,
+			_timeProvider,
+			resolveLinkTos, produceStreamDeletes, stopOnEof);
+		return eventReader;
+	}
+
+	private IEventReader CreatePausedEventIndexEventReader(
+		Guid eventReaderId, IODispatcher ioDispatcher, IPublisher publisher, CheckpointTag checkpointTag,
+		bool stopOnEof, int? stopAfterNEvents, bool resolveLinkTos, IEnumerable<string> eventTypes,
+		bool includeStreamDeletedNotification) {
+		//NOTE: just optimization - anyway if reading from TF events may reappear
+		long p;
+		var nextPositions = eventTypes.ToDictionary(
+			v => "$et-" + v, v => checkpointTag.Streams.TryGetValue(v, out p) ? p + 1 : 0);
+
+		if (includeStreamDeletedNotification)
+			nextPositions.Add("$et-$deleted", checkpointTag.Streams.TryGetValue("$deleted", out p) ? p + 1 : 0);
+
+		return new EventByTypeIndexEventReader(publisher, eventReaderId, _runAs, eventTypes.ToArray(),
+			includeStreamDeletedNotification,
+			checkpointTag.Position, nextPositions, resolveLinkTos, _timeProvider, stopOnEof);
+	}
+
+	private IEventReader CreatePausedMultiStreamEventReader(
+		Guid eventReaderId, IODispatcher ioDispatcher, IPublisher publisher, CheckpointTag checkpointTag,
+		bool stopOnEof, int? stopAfterNEvents, bool resolveLinkTos, IEnumerable<string> streams) {
+		var nextPositions = checkpointTag.Streams.ToDictionary(v => v.Key, v => v.Value + 1);
+
+		return new MultiStreamEventReader(
+			ioDispatcher, publisher, eventReaderId, _runAs, Phase, streams.ToArray(), nextPositions, resolveLinkTos,
+			_timeProvider, stopOnEof, stopAfterNEvents);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Strategies/ResultWriter.cs b/src/KurrentDB.Projections.Core/Services/Processing/Strategies/ResultWriter.cs
new file mode 100644
index 00000000000..253b7e670b0
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Strategies/ResultWriter.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Strategies;
+
+public class ResultWriter : IResultWriter {
+	private readonly IResultEventEmitter _resultEventEmitter;
+	private readonly IEmittedEventWriter _coreProjectionCheckpointManager;
+	private readonly bool _producesRunningResults;
+	private readonly CheckpointTag _zeroCheckpointTag;
+	private readonly string _partitionCatalogStreamName;
+
+	public ResultWriter(
+		IResultEventEmitter resultEventEmitter, IEmittedEventWriter coreProjectionCheckpointManager,
+		bool producesRunningResults, CheckpointTag zeroCheckpointTag, string partitionCatalogStreamName) {
+		_resultEventEmitter = resultEventEmitter;
+		_coreProjectionCheckpointManager = coreProjectionCheckpointManager;
+		_producesRunningResults = producesRunningResults;
+		_zeroCheckpointTag = zeroCheckpointTag;
+		_partitionCatalogStreamName = partitionCatalogStreamName;
+	}
+
+	public void WriteEofResult(
+		Guid subscriptionId, string partition, string resultBody, CheckpointTag causedBy, Guid causedByGuid,
+		string correlationId) {
+		if (resultBody != null)
+			WriteResult(partition, resultBody, causedBy, causedByGuid, correlationId);
+	}
+
+	private void WriteResult(
+		string partition, string resultBody, CheckpointTag causedBy, Guid causedByGuid, string correlationId) {
+		var resultEvents = ResultUpdated(partition, resultBody, causedBy);
+		if (resultEvents != null)
+			_coreProjectionCheckpointManager.EventsEmitted(resultEvents, causedByGuid, correlationId);
+	}
+
+	public void WriteRunningResult(EventProcessedResult result) {
+		if (!_producesRunningResults)
+			return;
+		var oldState = result.OldState;
+		var newState = result.NewState;
+		var resultBody = newState.Result;
+		if (oldState.Result != resultBody) {
+			var partition = result.Partition;
+			var causedBy = newState.CausedBy;
+			WriteResult(
+				partition, resultBody, causedBy, result.CausedBy, result.CorrelationId);
+		}
+	}
+
+	private EmittedEventEnvelope[] ResultUpdated(string partition, string result, CheckpointTag causedBy) {
+		return _resultEventEmitter.ResultUpdated(partition, result, causedBy);
+	}
+
+	protected EmittedEventEnvelope[] RegisterNewPartition(string partition, CheckpointTag at) {
+		return new[] {
+			new EmittedEventEnvelope(
+				new EmittedDataEvent(
+					_partitionCatalogStreamName, Guid.NewGuid(), "$partition", false, partition,
+					null, at, null))
+		};
+	}
+
+	public void AccountPartition(EventProcessedResult result) {
+		if (_producesRunningResults)
+			if (result.Partition != "" && result.OldState.CausedBy == _zeroCheckpointTag) {
+				var resultEvents = RegisterNewPartition(result.Partition, result.CheckpointTag);
+				if (resultEvents != null)
+					_coreProjectionCheckpointManager.EventsEmitted(
+						resultEvents, Guid.Empty, correlationId: null);
+			}
+	}
+
+	public void EventsEmitted(
+		EmittedEventEnvelope[] scheduledWrites, Guid causedBy, string correlationId) {
+		_coreProjectionCheckpointManager.EventsEmitted(
+			scheduledWrites, causedBy, correlationId);
+	}
+
+	public void WriteProgress(Guid subscriptionId, float progress) {
+		// intentionally does nothing
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Subscriptions/EventReorderingReaderSubscription.cs b/src/KurrentDB.Projections.Core/Services/Processing/Subscriptions/EventReorderingReaderSubscription.cs
new file mode 100644
index 00000000000..6a88745609e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Subscriptions/EventReorderingReaderSubscription.cs
@@ -0,0 +1,104 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+
+public class EventReorderingReaderSubscription : ReaderSubscriptionBase, IReaderSubscription {
+	private readonly SortedList<long, ReaderSubscriptionMessage.CommittedEventDistributed> _buffer =
+		new SortedList<long, ReaderSubscriptionMessage.CommittedEventDistributed>();
+
+	private readonly int _processingLagMs;
+
+	public EventReorderingReaderSubscription(
+		IPublisher publisher,
+		Guid subscriptionId,
+		CheckpointTag @from,
+		IReaderStrategy readerStrategy,
+		ITimeProvider timeProvider,
+		long? checkpointUnhandledBytesThreshold,
+		int? checkpointProcessedEventsThreshold,
+		int checkpointAfterMs,
+		int processingLagMs,
+		bool stopOnEof,
+		int? stopAfterNEvents,
+		bool enableContentTypeValidation)
+		: base(
+			publisher,
+			subscriptionId,
+			@from,
+			readerStrategy,
+			timeProvider,
+			checkpointUnhandledBytesThreshold,
+			checkpointProcessedEventsThreshold,
+			checkpointAfterMs,
+			stopOnEof,
+			stopAfterNEvents,
+			enableContentTypeValidation) {
+		_processingLagMs = processingLagMs;
+	}
+
+	public void Handle(ReaderSubscriptionMessage.CommittedEventDistributed message) {
+		if (message.Data == null)
+			throw new NotSupportedException();
+		ReaderSubscriptionMessage.CommittedEventDistributed existing;
+		// ignore duplicate messages (when replaying from heading event distribution point)
+		if (!_buffer.TryGetValue(message.Data.Position.PreparePosition, out existing)) {
+			_buffer.Add(message.Data.Position.PreparePosition, message);
+			var maxTimestamp = _buffer.Max(v => v.Value.Data.Timestamp);
+			ProcessAllFor(maxTimestamp);
+		}
+	}
+
+	private void ProcessAllFor(DateTime maxTimestamp) {
+		//NOTE: this is the most straightforward implementation
+		//TODO: build proper data structure when the approach is finalized
+		bool processed;
+		do {
+			processed = ProcessFor(maxTimestamp);
+		} while (processed);
+	}
+
+	private bool ProcessFor(DateTime maxTimestamp) {
+		if (_buffer.Count == 0)
+			return false;
+		var first = _buffer.ElementAt(0);
+		if ((maxTimestamp - first.Value.Data.Timestamp).TotalMilliseconds > _processingLagMs) {
+			_buffer.RemoveAt(0);
+			ProcessOne(first.Value);
+			return true;
+		}
+
+		return false;
+	}
+
+	public void Handle(ReaderSubscriptionMessage.EventReaderIdle message) {
+		ProcessAllFor(message.IdleTimestampUtc);
+	}
+
+
+	protected override void EofReached() {
+		// flush all available events as wqe reached eof (currently onetime projections only)
+		ProcessAllFor(DateTime.MaxValue);
+	}
+
+	public new void Handle(ReaderSubscriptionMessage.EventReaderPartitionEof message) {
+		throw new NotSupportedException();
+	}
+
+	public void Handle(ReaderSubscriptionMessage.EventReaderPartitionDeleted message) {
+		throw new NotSupportedException();
+	}
+
+	public void Handle(ReaderSubscriptionMessage.ReportProgress message) {
+		NotifyProgress();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Subscriptions/IReaderSubscription.cs b/src/KurrentDB.Projections.Core/Services/Processing/Subscriptions/IReaderSubscription.cs
new file mode 100644
index 00000000000..e5d1120dda0
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Subscriptions/IReaderSubscription.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Projections.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+
+public interface IReaderSubscription : IHandle<ReaderSubscriptionMessage.CommittedEventDistributed>,
+	IHandle<ReaderSubscriptionMessage.EventReaderIdle>,
+	IHandle<ReaderSubscriptionMessage.EventReaderStarting>,
+	IHandle<ReaderSubscriptionMessage.EventReaderEof>,
+	IHandle<ReaderSubscriptionMessage.EventReaderPartitionEof>,
+	IHandle<ReaderSubscriptionMessage.EventReaderPartitionDeleted>,
+	IHandle<ReaderSubscriptionMessage.EventReaderNotAuthorized>,
+	IHandle<ReaderSubscriptionMessage.ReportProgress> {
+	string Tag { get; }
+	Guid SubscriptionId { get; }
+	IEventReader CreatePausedEventReader(IPublisher publisher, IODispatcher ioDispatcher, Guid forkedEventReaderId);
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Subscriptions/ReaderSubscription.cs b/src/KurrentDB.Projections.Core/Services/Processing/Subscriptions/ReaderSubscription.cs
new file mode 100644
index 00000000000..3e5ec89ae3a
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Subscriptions/ReaderSubscription.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+
+public class ReaderSubscription : ReaderSubscriptionBase, IReaderSubscription {
+	public ReaderSubscription(
+		string tag,
+		IPublisher publisher,
+		Guid subscriptionId,
+		CheckpointTag @from,
+		IReaderStrategy readerStrategy,
+		ITimeProvider timeProvider,
+		long? checkpointUnhandledBytesThreshold,
+		int? checkpointProcessedEventsThreshold,
+		int checkpointAfterMs,
+		bool stopOnEof,
+		int? stopAfterNEvents,
+		bool enableContentTypeValidation)
+		: base(
+			publisher,
+			subscriptionId,
+			@from,
+			readerStrategy,
+			timeProvider,
+			checkpointUnhandledBytesThreshold,
+			checkpointProcessedEventsThreshold,
+			checkpointAfterMs,
+			stopOnEof,
+			stopAfterNEvents,
+			enableContentTypeValidation) {
+		_tag = tag;
+	}
+
+	public void Handle(ReaderSubscriptionMessage.CommittedEventDistributed message) {
+		ProcessOne(message);
+	}
+
+	public void Handle(ReaderSubscriptionMessage.EventReaderIdle message) {
+		ForceProgressValue(100);
+	}
+
+	public void Handle(ReaderSubscriptionMessage.EventReaderPartitionDeleted message) {
+		if (!base._eventFilter.PassesDeleteNotification(message.PositionStreamId))
+			return;
+		var deletePosition = _positionTagger.MakeCheckpointTag(_positionTracker.LastTag, message);
+		PublishPartitionDeleted(message.Partition, deletePosition);
+	}
+
+	public void Handle(ReaderSubscriptionMessage.ReportProgress message) {
+		NotifyProgress();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Subscriptions/ReaderSubscriptionBase.cs b/src/KurrentDB.Projections.Core/Services/Processing/Subscriptions/ReaderSubscriptionBase.cs
new file mode 100644
index 00000000000..072bd8c3dcd
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Subscriptions/ReaderSubscriptionBase.cs
@@ -0,0 +1,263 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Helpers;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Strategies;
+using Serilog;
+
+namespace KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+
+public class ReaderSubscriptionBase {
+	private readonly IPublisher _publisher;
+	private readonly IReaderStrategy _readerStrategy;
+	private readonly ITimeProvider _timeProvider;
+	private readonly long? _checkpointUnhandledBytesThreshold;
+	private readonly int? _checkpointProcessedEventsThreshold;
+	private readonly bool _stopOnEof;
+	private readonly int? _stopAfterNEvents;
+	protected readonly EventFilter _eventFilter;
+	protected readonly PositionTagger _positionTagger;
+	protected readonly PositionTracker _positionTracker;
+	private long? _lastPassedOrCheckpointedEventPosition;
+	private float _progress = -1;
+	private long _subscriptionMessageSequenceNumber;
+	private int _eventsSinceLastCheckpointSuggestedOrStart;
+	private readonly Guid _subscriptionId;
+	private bool _eofReached;
+	protected string _tag;
+	private TimeSpan _checkpointAfter;
+	private DateTime _lastCheckpointTime = DateTime.MinValue;
+	private bool _enableContentTypeValidation;
+	private ILogger _logger;
+	private CheckpointTag _lastCheckpointTag;
+
+	protected ReaderSubscriptionBase(
+		IPublisher publisher,
+		Guid subscriptionId,
+		CheckpointTag @from,
+		IReaderStrategy readerStrategy,
+		ITimeProvider timeProvider,
+		long? checkpointUnhandledBytesThreshold,
+		int? checkpointProcessedEventsThreshold,
+		int checkpointAfterMs,
+		bool stopOnEof,
+		int? stopAfterNEvents,
+		bool enableContentTypeValidation) {
+		if (publisher == null)
+			throw new ArgumentNullException("publisher");
+		if (readerStrategy == null)
+			throw new ArgumentNullException("readerStrategy");
+		if (timeProvider == null)
+			throw new ArgumentNullException("timeProvider");
+		if (checkpointProcessedEventsThreshold > 0 && stopAfterNEvents > 0)
+			throw new ArgumentException("checkpointProcessedEventsThreshold > 0 && stopAfterNEvents > 0");
+
+		_publisher = publisher;
+		_readerStrategy = readerStrategy;
+		_timeProvider = timeProvider;
+		_checkpointUnhandledBytesThreshold = checkpointUnhandledBytesThreshold;
+		_checkpointProcessedEventsThreshold = checkpointProcessedEventsThreshold;
+		_checkpointAfter = TimeSpan.FromMilliseconds(checkpointAfterMs);
+		_stopOnEof = stopOnEof;
+		_stopAfterNEvents = stopAfterNEvents;
+		_subscriptionId = subscriptionId;
+		_lastPassedOrCheckpointedEventPosition = null;
+
+		_eventFilter = readerStrategy.EventFilter;
+
+		_positionTagger = readerStrategy.PositionTagger;
+		_positionTracker = new PositionTracker(_positionTagger);
+		_positionTracker.UpdateByCheckpointTagInitial(@from);
+		_lastCheckpointTag = _positionTracker.LastTag;
+		_enableContentTypeValidation = enableContentTypeValidation;
+		_logger = Log.ForContext<ReaderSubscriptionBase>();
+	}
+
+	public string Tag {
+		get { return _tag; }
+	}
+
+	public Guid SubscriptionId {
+		get { return _subscriptionId; }
+	}
+
+	protected void ProcessOne(ReaderSubscriptionMessage.CommittedEventDistributed message) {
+		if (_eofReached)
+			return; // eof may be set by reach N events
+
+		// NOTE: we may receive here messages from heading event distribution point
+		// and they may not pass out source filter.  Discard them first
+		var roundedProgress = (float)Math.Round(message.Progress, 1);
+		bool progressChanged = _progress != roundedProgress;
+
+		bool passesStreamSourceFilter = _eventFilter.PassesSource(message.Data.ResolvedLinkTo, message.Data.PositionStreamId, message.Data.EventType);
+		bool passesEventFilter = _eventFilter.Passes(message.Data.ResolvedLinkTo, message.Data.PositionStreamId, message.Data.EventType, message.Data.IsStreamDeletedEvent);
+		bool isValid = !_enableContentTypeValidation || _eventFilter.PassesValidation(message.Data.IsJson, message.Data.DataMemory);
+		if (!isValid) {
+			_logger.Verbose($"Event {message.Data.EventSequenceNumber}@{message.Data.EventStreamId} is not valid json. Data: ({message.Data.Data})");
+		}
+
+		CheckpointTag eventCheckpointTag = null;
+
+		if (passesStreamSourceFilter) {
+			// NOTE: after joining heading distribution point it delivers all cached events to the subscription
+			// some of this events we may have already received. The delivered events may have different order
+			// (in case of partially ordered cases multi-stream reader etc). We discard all the messages that are not
+			// after the last available checkpoint tag
+
+			//NOTE: older events can appear here when replaying events from the heading event reader
+			//      or when event-by-type-index reader reads TF and both event and resolved-event appear as output
+			if (!_positionTagger.IsMessageAfterCheckpointTag(_positionTracker.LastTag, message))
+				return;
+
+			eventCheckpointTag = _positionTagger.MakeCheckpointTag(_positionTracker.LastTag, message);
+			_positionTracker.UpdateByCheckpointTagForward(eventCheckpointTag);
+		}
+
+		var now = _timeProvider.UtcNow;
+		var timeDifference = now - _lastCheckpointTime;
+		if (isValid && passesEventFilter) {
+			Debug.Assert(passesStreamSourceFilter, "Event passes event filter but not source filter");
+			Debug.Assert(eventCheckpointTag != null, "Event checkpoint tag is null");
+
+			_lastPassedOrCheckpointedEventPosition = message.Data.Position.PreparePosition;
+			var convertedMessage =
+				EventReaderSubscriptionMessage.CommittedEventReceived.FromCommittedEventDistributed(
+					message, eventCheckpointTag, _eventFilter.GetCategory(message.Data.PositionStreamId),
+					_subscriptionId, _subscriptionMessageSequenceNumber++);
+			_publisher.Publish(convertedMessage);
+			_eventsSinceLastCheckpointSuggestedOrStart++;
+			if (_checkpointProcessedEventsThreshold > 0
+				&& timeDifference > _checkpointAfter
+				&& _eventsSinceLastCheckpointSuggestedOrStart >= _checkpointProcessedEventsThreshold
+				&& _lastCheckpointTag != _positionTracker.LastTag)
+				SuggestCheckpoint(message);
+			if (_stopAfterNEvents > 0 && _eventsSinceLastCheckpointSuggestedOrStart >= _stopAfterNEvents)
+				NEventsReached();
+		} else {
+			if (_checkpointUnhandledBytesThreshold > 0
+				&& timeDifference > _checkpointAfter
+				&& (_lastPassedOrCheckpointedEventPosition != null
+					&& message.Data.Position.PreparePosition - _lastPassedOrCheckpointedEventPosition.Value
+					> _checkpointUnhandledBytesThreshold)
+				&& _lastCheckpointTag != _positionTracker.LastTag)
+				SuggestCheckpoint(message);
+			else if (progressChanged)
+				_progress = roundedProgress;
+		}
+
+		// initialize checkpointing based on first message
+		if (_lastPassedOrCheckpointedEventPosition == null)
+			_lastPassedOrCheckpointedEventPosition = message.Data.Position.PreparePosition;
+	}
+
+	private void NEventsReached() {
+		ProcessEofAndEmitEof();
+	}
+
+	protected void NotifyProgress() {
+		_publisher.Publish(new EventReaderSubscriptionMessage.ProgressChanged(
+			_subscriptionId,
+			_positionTracker.LastTag,
+			_progress,
+			_subscriptionMessageSequenceNumber++));
+	}
+
+	/// <summary>
+	/// Forces a progression value.
+	/// </summary>
+	/// <param name="value">a percentage rate. For example if the progress is 42%, value parameter must be 42</param>
+	protected void ForceProgressValue(float value) {
+		_progress = value;
+	}
+
+	protected void PublishPartitionDeleted(string partition, CheckpointTag deletePosition) {
+		_publisher.Publish(
+			new EventReaderSubscriptionMessage.PartitionDeleted(
+				_subscriptionId, deletePosition, partition, _subscriptionMessageSequenceNumber++));
+	}
+
+	private void PublishStartingAt(long startingLastCommitPosition) {
+		_publisher.Publish(
+			new EventReaderSubscriptionMessage.SubscriptionStarted(
+				_subscriptionId, _positionTracker.LastTag, startingLastCommitPosition,
+				_subscriptionMessageSequenceNumber++));
+	}
+
+	private void SuggestCheckpoint(ReaderSubscriptionMessage.CommittedEventDistributed message) {
+		_lastPassedOrCheckpointedEventPosition = message.Data.Position.PreparePosition;
+		_lastCheckpointTag = _positionTracker.LastTag;
+		_publisher.Publish(
+			new EventReaderSubscriptionMessage.CheckpointSuggested(
+				_subscriptionId, _positionTracker.LastTag, message.Progress,
+				_subscriptionMessageSequenceNumber++));
+		_eventsSinceLastCheckpointSuggestedOrStart = 0;
+		_lastCheckpointTime = _timeProvider.UtcNow;
+	}
+
+	public IEventReader CreatePausedEventReader(IPublisher publisher, IODispatcher ioDispatcher,
+		Guid eventReaderId) {
+		if (_eofReached)
+			throw new InvalidOperationException("Onetime projection has already reached the eof position");
+		//            _logger.Trace("Creating an event distribution point at '{lastTag}'", _positionTracker.LastTag);
+		return _readerStrategy.CreatePausedEventReader(
+			eventReaderId, publisher, ioDispatcher, _positionTracker.LastTag, _stopOnEof, _stopAfterNEvents);
+	}
+
+	public void Handle(ReaderSubscriptionMessage.EventReaderEof message) {
+		if (_eofReached)
+			return; // self eof-reached, but reader is still running
+
+		if (_stopOnEof)
+			ProcessEofAndEmitEof();
+	}
+
+	private void ProcessEofAndEmitEof() {
+		_eofReached = true;
+		EofReached();
+		_publisher.Publish(
+			new EventReaderSubscriptionMessage.EofReached(
+				_subscriptionId,
+				_positionTracker.LastTag,
+				_subscriptionMessageSequenceNumber++));
+		// self unsubscribe
+		_publisher.Publish(new ReaderSubscriptionManagement.Unsubscribe(_subscriptionId));
+	}
+
+	public void Handle(ReaderSubscriptionMessage.EventReaderPartitionEof message) {
+		if (_eofReached)
+			return; // self eof-reached, but reader is still running
+
+		var eventCheckpointTag = _positionTagger.MakeCheckpointTag(_positionTracker.LastTag, message);
+
+		_publisher.Publish(
+			new EventReaderSubscriptionMessage.PartitionEofReached(
+				_subscriptionId, eventCheckpointTag, message.Partition,
+				_subscriptionMessageSequenceNumber++));
+	}
+
+	public void Handle(ReaderSubscriptionMessage.EventReaderNotAuthorized message) {
+		if (_eofReached)
+			return; // self eof-reached, but reader is still running
+
+		if (_stopOnEof) {
+			_eofReached = true;
+		}
+		_publisher.Publish(
+			new EventReaderSubscriptionMessage.NotAuthorized(
+				_subscriptionId, _positionTracker.LastTag, _progress, _subscriptionMessageSequenceNumber++));
+	}
+
+	public void Handle(ReaderSubscriptionMessage.EventReaderStarting message) {
+		PublishStartingAt(message.LastCommitPosition);
+	}
+
+	protected virtual void EofReached() {
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/Subscriptions/ReaderSubscriptionOptions.cs b/src/KurrentDB.Projections.Core/Services/Processing/Subscriptions/ReaderSubscriptionOptions.cs
new file mode 100644
index 00000000000..e04994359e2
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/Subscriptions/ReaderSubscriptionOptions.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+
+public class ReaderSubscriptionOptions {
+	private readonly long _checkpointUnhandledBytesThreshold;
+	private readonly int? _checkpointProcessedEventsThreshold;
+	private readonly int _checkpointAfterMs;
+	private readonly bool _stopOnEof;
+	private readonly int? _stopAfterNEvents;
+	private readonly bool _enableContentTypeValidation;
+
+	public ReaderSubscriptionOptions(
+		long checkpointUnhandledBytesThreshold, int? checkpointProcessedEventsThreshold, int checkpointAfterMs,
+		bool stopOnEof, int? stopAfterNEvents, bool enableContentTypeValidation) {
+		_checkpointUnhandledBytesThreshold = checkpointUnhandledBytesThreshold;
+		_checkpointProcessedEventsThreshold = checkpointProcessedEventsThreshold;
+		_checkpointAfterMs = checkpointAfterMs;
+		_stopOnEof = stopOnEof;
+		_stopAfterNEvents = stopAfterNEvents;
+		_enableContentTypeValidation = enableContentTypeValidation;
+	}
+
+	public long CheckpointUnhandledBytesThreshold {
+		get { return _checkpointUnhandledBytesThreshold; }
+	}
+
+	public int? CheckpointProcessedEventsThreshold {
+		get { return _checkpointProcessedEventsThreshold; }
+	}
+
+	public int CheckpointAfterMs {
+		get { return _checkpointAfterMs; }
+	}
+
+	public bool StopOnEof {
+		get { return _stopOnEof; }
+	}
+
+	public int? StopAfterNEvents {
+		get { return _stopAfterNEvents; }
+	}
+
+	public bool EnableContentTypeValidation {
+		get { return _enableContentTypeValidation; }
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/TaggedResolvedEvent.cs b/src/KurrentDB.Projections.Core/Services/Processing/TaggedResolvedEvent.cs
new file mode 100644
index 00000000000..d261d4ff4f5
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/TaggedResolvedEvent.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.Services.Processing;
+
+public sealed class TaggedResolvedEvent {
+	public readonly ResolvedEvent ResolvedEvent;
+	public readonly CheckpointTag ReaderPosition;
+
+	public TaggedResolvedEvent(ResolvedEvent resolvedEvent, CheckpointTag readerPosition) {
+		ResolvedEvent = resolvedEvent;
+		ReaderPosition = readerPosition;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.CommittedEventItem.cs b/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.CommittedEventItem.cs
new file mode 100644
index 00000000000..2e1cd40f133
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.CommittedEventItem.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+
+namespace KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+
+public partial class HeadingEventReader {
+	private class CommittedEventItem : Item {
+		public readonly ReaderSubscriptionMessage.CommittedEventDistributed Message;
+
+		public CommittedEventItem(ReaderSubscriptionMessage.CommittedEventDistributed message)
+			: base(message.Data.Position) {
+			Message = message;
+		}
+
+		public override void Handle(IReaderSubscription subscription) {
+			subscription.Handle(Message);
+		}
+
+		public override string ToString() {
+			return string.Format(
+				"{0} : {2}@{1}",
+				Message.Data.EventType,
+				Message.Data.PositionStreamId,
+				Message.Data.PositionSequenceNumber);
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.Item.cs b/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.Item.cs
new file mode 100644
index 00000000000..dfd9fecdb4d
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.Item.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+
+namespace KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+
+public partial class HeadingEventReader {
+	private abstract class Item {
+		public readonly TFPos Position;
+
+		protected Item(TFPos position) {
+			Position = position;
+		}
+
+		public abstract void Handle(IReaderSubscription subscription);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.PartitionDeletedItem.cs b/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.PartitionDeletedItem.cs
new file mode 100644
index 00000000000..dd4c86f1a10
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.PartitionDeletedItem.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+
+namespace KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+
+public partial class HeadingEventReader {
+	private class PartitionDeletedItem : Item {
+		public readonly ReaderSubscriptionMessage.EventReaderPartitionDeleted Message;
+
+		public PartitionDeletedItem(ReaderSubscriptionMessage.EventReaderPartitionDeleted message)
+			: base(message.DeleteLinkOrEventPosition.Value) {
+			Message = message;
+		}
+
+		public override void Handle(IReaderSubscription subscription) {
+			subscription.Handle(Message);
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.cs b/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.cs
new file mode 100644
index 00000000000..080617128b9
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/HeadingEventReader.cs
@@ -0,0 +1,224 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Subscriptions;
+
+namespace KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+
+public partial class HeadingEventReader {
+	private IEventReader _headEventReader;
+	private TFPos _subscribeFromPosition = new TFPos(long.MaxValue, long.MaxValue);
+
+	private readonly Queue<Item> _lastMessages = new Queue<Item>();
+
+	private readonly int _eventCacheSize;
+
+	private readonly Dictionary<Guid, IReaderSubscription> _headSubscribers =
+		new Dictionary<Guid, IReaderSubscription>();
+
+	private Guid _eventReaderId;
+
+	private bool _started;
+
+	private TFPos _lastEventPosition = new TFPos(0, -1);
+	private TFPos _lastDeletePosition = new TFPos(0, -1);
+
+	private IPublisher _publisher;
+
+	public HeadingEventReader(int eventCacheSize, IPublisher publisher) {
+		_eventCacheSize = eventCacheSize;
+		_publisher = publisher;
+	}
+
+	public bool Handle(ReaderSubscriptionMessage.CommittedEventDistributed message) {
+		EnsureStarted();
+		if (message.CorrelationId != _eventReaderId)
+			return false;
+		if (message.Data == null)
+			return true;
+
+		ValidateEventOrder(message);
+
+		CacheRecentMessage(message);
+		DistributeMessage(message);
+		return true;
+	}
+
+	public bool Handle(ReaderSubscriptionMessage.EventReaderPartitionDeleted message) {
+		EnsureStarted();
+		if (message.CorrelationId != _eventReaderId)
+			return false;
+
+		ValidateEventOrder(message);
+
+
+		CacheRecentMessage(message);
+		DistributeMessage(message);
+		return true;
+	}
+
+	public bool Handle(ReaderSubscriptionMessage.EventReaderIdle message) {
+		EnsureStarted();
+		if (message.CorrelationId != _eventReaderId)
+			return false;
+		DistributeMessage(message);
+		return true;
+	}
+
+	private void ValidateEventOrder(ReaderSubscriptionMessage.CommittedEventDistributed message) {
+		if (_lastEventPosition >= message.Data.Position || _lastDeletePosition > message.Data.Position)
+			throw new InvalidOperationException(
+				string.Format(
+					"Invalid committed event order.  Last: '{0}' Received: '{1}'  LastDelete: '{2}'",
+					_lastEventPosition, message.Data.Position, _lastEventPosition));
+		_lastEventPosition = message.Data.Position;
+	}
+
+	private void ValidateEventOrder(ReaderSubscriptionMessage.EventReaderPartitionDeleted message) {
+		if (_lastEventPosition > message.DeleteLinkOrEventPosition.Value
+			|| _lastDeletePosition >= message.DeleteLinkOrEventPosition.Value)
+			throw new InvalidOperationException(
+				string.Format(
+					"Invalid partition deleted event order.  Last: '{0}' Received: '{1}'  LastDelete: '{2}'",
+					_lastEventPosition, message.DeleteLinkOrEventPosition.Value, _lastEventPosition));
+		_lastDeletePosition = message.DeleteLinkOrEventPosition.Value;
+	}
+
+	public void Start(Guid eventReaderId, IEventReader eventReader) {
+		if (_started)
+			throw new InvalidOperationException("Already started");
+		_eventReaderId = eventReaderId;
+		_headEventReader = eventReader;
+		//Guid.Empty means head distribution point
+		_started = true; // started before resume due to old style test with immediate callback
+		_headEventReader.Resume();
+	}
+
+	public void Stop() {
+		EnsureStarted();
+		_headEventReader.Pause();
+		_headEventReader = null;
+		EmptyCache();
+		_started = false;
+	}
+
+	public bool TrySubscribe(
+		Guid projectionId, IReaderSubscription readerSubscription, long fromTransactionFilePosition) {
+		EnsureStarted();
+		if (_headSubscribers.ContainsKey(projectionId))
+			throw new InvalidOperationException(
+				string.Format("Projection '{0}' has been already subscribed", projectionId));
+		if (_subscribeFromPosition.CommitPosition <= fromTransactionFilePosition) {
+			if (!DispatchRecentMessagesTo(readerSubscription, fromTransactionFilePosition)) {
+				return false;
+			}
+
+			AddSubscriber(projectionId, readerSubscription);
+			return true;
+		}
+
+		return false;
+	}
+
+	public void Unsubscribe(Guid projectionId) {
+		EnsureStarted();
+		if (!_headSubscribers.ContainsKey(projectionId))
+			throw new InvalidOperationException(
+				string.Format("Projection '{0}' has not been subscribed", projectionId));
+		_headSubscribers.Remove(projectionId);
+	}
+
+	private bool DispatchRecentMessagesTo(IReaderSubscription subscription, long fromTransactionFilePosition) {
+		foreach (var m in _lastMessages) {
+			if (m.Position.CommitPosition >= fromTransactionFilePosition) {
+				try {
+					m.Handle(subscription);
+				} catch (Exception ex) {
+					var item = m as CommittedEventItem;
+					string message;
+					if (item != null) {
+						message = string.Format(
+							"The heading subscription failed to handle a recently cached event {0}:{1}@{2} because {3}",
+							item.Message.Data.EventStreamId, item.Message.Data.EventType,
+							item.Message.Data.PositionSequenceNumber, ex.Message);
+					} else {
+						message = string.Format(
+							"The heading subscription failed to handle a recently cached deleted event at position {0} because {1}",
+							m.Position, ex.Message);
+					}
+
+					_publisher.Publish(
+						new EventReaderSubscriptionMessage.Failed(subscription.SubscriptionId, message));
+					return false;
+				}
+			}
+		}
+
+		return true;
+	}
+
+	private void DistributeMessage(ReaderSubscriptionMessage.CommittedEventDistributed message) {
+		foreach (var subscriber in _headSubscribers.Values) {
+			try {
+				subscriber.Handle(message);
+			} catch (Exception ex) {
+				_publisher.Publish(new EventReaderSubscriptionMessage.Failed(subscriber.SubscriptionId,
+					string.Format("The heading subscription failed to handle an event {0}:{1}@{2} because {3}",
+						message.Data.EventStreamId, message.Data.EventType, message.Data.PositionSequenceNumber,
+						ex.Message)));
+			}
+		}
+	}
+
+	private void DistributeMessage(ReaderSubscriptionMessage.EventReaderPartitionDeleted message) {
+		foreach (var subscriber in _headSubscribers.Values)
+			subscriber.Handle(message);
+	}
+
+	private void DistributeMessage(ReaderSubscriptionMessage.EventReaderIdle message) {
+		foreach (var subscriber in _headSubscribers.Values)
+			subscriber.Handle(message);
+	}
+
+	private void CacheRecentMessage(ReaderSubscriptionMessage.CommittedEventDistributed message) {
+		_lastMessages.Enqueue(new CommittedEventItem(message));
+		CleanUpCache();
+	}
+
+	private void CacheRecentMessage(ReaderSubscriptionMessage.EventReaderPartitionDeleted message) {
+		_lastMessages.Enqueue(new PartitionDeletedItem(message));
+		CleanUpCache();
+	}
+
+	private void CleanUpCache() {
+		if (_lastMessages.Count > _eventCacheSize) {
+			var removed = _lastMessages.Dequeue();
+			// as we may have multiple items at the same position it is important to
+			// remove them together as we may subscribe in the middle otherwise
+			while (_lastMessages.Count > 0 && _lastMessages.Peek().Position == removed.Position)
+				_lastMessages.Dequeue();
+		}
+
+		var lastAvailableCommittedEvent = _lastMessages.Peek();
+		_subscribeFromPosition = lastAvailableCommittedEvent.Position;
+	}
+
+	private void EmptyCache() {
+		_lastMessages.Clear();
+		_subscribeFromPosition = new TFPos(long.MaxValue, long.MaxValue);
+	}
+
+	private void AddSubscriber(Guid publishWithCorrelationId, IReaderSubscription subscription) {
+		_headSubscribers.Add(publishWithCorrelationId, subscription);
+	}
+
+	private void EnsureStarted() {
+		if (!_started)
+			throw new InvalidOperationException("Not started");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/PreparePositionTagger.cs b/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/PreparePositionTagger.cs
new file mode 100644
index 00000000000..61bee24f829
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/PreparePositionTagger.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+
+public class PreparePositionTagger : PositionTagger {
+	public PreparePositionTagger(int phase)
+		: base(phase) {
+	}
+
+	public override bool IsMessageAfterCheckpointTag(
+		CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
+		if (previous.Phase < Phase)
+			return true;
+		return committedEvent.Data.Position.PreparePosition > previous.PreparePosition;
+	}
+
+	public override CheckpointTag MakeCheckpointTag(
+		CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
+		if (previous.Phase != Phase)
+			throw new ArgumentException(
+				string.Format("Invalid checkpoint tag phase.  Expected: {0} Was: {1}", Phase, previous.Phase));
+
+		return CheckpointTag.FromPreparePosition(previous.Phase, committedEvent.Data.Position.PreparePosition);
+	}
+
+	public override CheckpointTag MakeCheckpointTag(
+		CheckpointTag previous, ReaderSubscriptionMessage.EventReaderPartitionEof partitionEof) {
+		throw new NotImplementedException();
+	}
+
+	public override CheckpointTag MakeCheckpointTag(
+		CheckpointTag previous, ReaderSubscriptionMessage.EventReaderPartitionDeleted partitionDeleted) {
+		throw new NotSupportedException();
+	}
+
+	public override CheckpointTag MakeZeroCheckpointTag() {
+		return CheckpointTag.FromPreparePosition(Phase, -1);
+	}
+
+	public override bool IsCompatible(CheckpointTag checkpointTag) {
+		return checkpointTag.Mode_ == CheckpointTag.Mode.PreparePosition;
+	}
+
+	public override CheckpointTag AdjustTag(CheckpointTag tag) {
+		if (tag.Phase < Phase)
+			return tag;
+		if (tag.Phase > Phase)
+			throw new ArgumentException(
+				string.Format(
+					"Invalid checkpoint tag phase.  Expected less or equal to: {0} Was: {1}", Phase, tag.Phase),
+				"tag");
+
+		if (tag.Mode_ == CheckpointTag.Mode.PreparePosition)
+			return tag;
+
+		switch (tag.Mode_) {
+			case CheckpointTag.Mode.EventTypeIndex:
+				throw new NotSupportedException(
+					"Conversion from EventTypeIndex to PreparePosition position tag is not supported");
+			case CheckpointTag.Mode.Stream:
+				throw new NotSupportedException(
+					"Conversion from Stream to PreparePosition position tag is not supported");
+			case CheckpointTag.Mode.MultiStream:
+				throw new NotSupportedException(
+					"Conversion from MultiStream to PreparePosition position tag is not supported");
+			case CheckpointTag.Mode.Position:
+				throw new NotSupportedException(
+					"Conversion from Position to PreparePosition position tag is not supported");
+			default:
+				throw new NotSupportedException(string.Format(
+					"The given checkpoint is invalid. Possible causes might include having written an event to the projection's managed stream. The bad checkpoint: {0}",
+					tag.ToString()));
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/TransactionFileEventFilter.cs b/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/TransactionFileEventFilter.cs
new file mode 100644
index 00000000000..32e15da0c78
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/TransactionFileEventFilter.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using KurrentDB.Core.Services;
+
+namespace KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+
+public class TransactionFileEventFilter : EventFilter {
+	private readonly bool _includeLinks;
+
+	public TransactionFileEventFilter(
+		bool allEvents, bool includeDeletedStreamEvents, HashSet<string> events, bool includeLinks = false)
+		: base(allEvents, includeDeletedStreamEvents, events) {
+		_includeLinks = includeLinks;
+	}
+
+	protected override bool DeletedNotificationPasses(string positionStreamId) {
+		return true;
+	}
+
+	public override bool PassesSource(bool resolvedFromLinkTo, string positionStreamId, string eventType) {
+		if (!_includeLinks && eventType == SystemEventTypes.LinkTo)
+			return false;
+		return (_includeLinks || !resolvedFromLinkTo)
+			   && (!SystemStreams.IsSystemStream(positionStreamId)
+				   || SystemStreams.IsMetastream(positionStreamId)
+				   && !SystemStreams.IsSystemStream(SystemStreams.OriginalStreamOf(positionStreamId)));
+	}
+
+	public override string GetCategory(string positionStreamId) {
+		return null;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/TransactionFileEventReader.cs b/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/TransactionFileEventReader.cs
new file mode 100644
index 00000000000..05ca4407e98
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/TransactionFileEventReader.cs
@@ -0,0 +1,204 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Settings;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Standard;
+using AwakeServiceMessage = KurrentDB.Core.Services.AwakeReaderService.AwakeServiceMessage;
+
+namespace KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+
+public class TransactionFileEventReader : EventReader,
+	IHandle<ClientMessage.ReadAllEventsForwardCompleted>,
+	IHandle<ProjectionManagementMessage.Internal.ReadTimeout> {
+	private bool _eventsRequested;
+	private int _maxReadCount = 250;
+	private TFPos _from;
+	private readonly bool _deliverEndOfTfPosition;
+	private readonly bool _resolveLinkTos;
+	private readonly ITimeProvider _timeProvider;
+	private long _lastPosition;
+	private bool _eof;
+	private Guid _pendingRequestCorrelationId;
+
+	public TransactionFileEventReader(
+		IPublisher publisher,
+		Guid eventReaderCorrelationId,
+		ClaimsPrincipal readAs,
+		TFPos @from,
+		ITimeProvider timeProvider,
+		bool stopOnEof = false,
+		bool deliverEndOfTFPosition = true,
+		bool resolveLinkTos = true)
+		: base(publisher, eventReaderCorrelationId, readAs, stopOnEof) {
+		if (publisher == null)
+			throw new ArgumentNullException("publisher");
+		_from = @from;
+		_deliverEndOfTfPosition = deliverEndOfTFPosition;
+		_resolveLinkTos = resolveLinkTos;
+		_timeProvider = timeProvider;
+	}
+
+	protected override bool AreEventsRequested() {
+		return _eventsRequested;
+	}
+
+	public void Handle(ClientMessage.ReadAllEventsForwardCompleted message) {
+		if (_disposed)
+			return;
+		if (!_eventsRequested)
+			throw new InvalidOperationException("Read events has not been requested");
+		if (Paused)
+			throw new InvalidOperationException("Paused");
+		if (message.CorrelationId != _pendingRequestCorrelationId) {
+			return;
+		}
+
+		_eventsRequested = false;
+		_lastPosition = message.TfLastCommitPosition;
+		if (message.Result == ReadAllResult.AccessDenied) {
+			SendNotAuthorized();
+			return;
+		}
+
+		var eof = message.Events is [] && message.IsEndOfStream;
+		_eof = eof;
+		var willDispose = _stopOnEof && eof;
+		var oldFrom = _from;
+		_from = message.NextPos;
+
+		if (!willDispose) {
+			PauseOrContinueProcessing();
+		}
+
+		if (eof) {
+			// the end
+			if (_deliverEndOfTfPosition)
+				DeliverLastCommitPosition(_from);
+			// allow joining heading distribution
+			SendIdle();
+			SendEof();
+		} else {
+			for (int index = 0; index < message.Events.Count; index++) {
+				var @event = message.Events[index];
+				DeliverEvent(@event, message.TfLastCommitPosition, oldFrom);
+			}
+		}
+	}
+
+	public void Handle(ProjectionManagementMessage.Internal.ReadTimeout message) {
+		if (_disposed)
+			return;
+		if (Paused)
+			return;
+		if (message.CorrelationId != _pendingRequestCorrelationId)
+			return;
+
+		_eventsRequested = false;
+		PauseOrContinueProcessing();
+	}
+
+	private void SendIdle() {
+		_publisher.Publish(
+			new ReaderSubscriptionMessage.EventReaderIdle(EventReaderCorrelationId, _timeProvider.UtcNow));
+	}
+
+	protected override void RequestEvents() {
+		if (_disposed)
+			throw new InvalidOperationException("Disposed");
+		if (_eventsRequested)
+			throw new InvalidOperationException("Read operation is already in progress");
+		if (PauseRequested || Paused)
+			throw new InvalidOperationException("Paused or pause requested");
+		_eventsRequested = true;
+
+		_pendingRequestCorrelationId = Guid.NewGuid();
+		var readEventsForward = CreateReadEventsMessage(_pendingRequestCorrelationId);
+		if (_eof) {
+			_publisher.Publish(
+				new AwakeServiceMessage.SubscribeAwake(
+					_publisher, Guid.NewGuid(), null,
+					new TFPos(_lastPosition, _lastPosition),
+					CreateReadTimeoutMessage(_pendingRequestCorrelationId, "$all")));
+			_publisher.Publish(
+				new AwakeServiceMessage.SubscribeAwake(
+					_publisher, Guid.NewGuid(), null,
+					new TFPos(_lastPosition, _lastPosition), readEventsForward));
+		} else {
+			_publisher.Publish(readEventsForward);
+			ScheduleReadTimeoutMessage(_pendingRequestCorrelationId, "$all");
+		}
+	}
+
+	private void ScheduleReadTimeoutMessage(Guid correlationId, string streamId) {
+		_publisher.Publish(CreateReadTimeoutMessage(correlationId, streamId));
+	}
+
+	private Message CreateReadTimeoutMessage(Guid correlationId, string streamId) {
+		return TimerMessage.Schedule.Create(
+			TimeSpan.FromMilliseconds(ESConsts.ReadRequestTimeout),
+			new SendToThisEnvelope(this),
+			new ProjectionManagementMessage.Internal.ReadTimeout(correlationId, streamId));
+	}
+
+	private Message CreateReadEventsMessage(Guid correlationId) {
+		return new ClientMessage.ReadAllEventsForward(
+			correlationId, correlationId, new SendToThisEnvelope(this), _from.CommitPosition,
+			_from.PreparePosition == -1 ? _from.CommitPosition : _from.PreparePosition, _maxReadCount,
+			_resolveLinkTos, false, null, ReadAs, replyOnExpired: false);
+	}
+
+	private void DeliverLastCommitPosition(TFPos lastPosition) {
+		if (_stopOnEof)
+			return;
+		_publisher.Publish(
+			new ReaderSubscriptionMessage.CommittedEventDistributed(
+				EventReaderCorrelationId, null, lastPosition.PreparePosition, 100.0f, source: this.GetType()));
+		//TODO: check was is passed here
+	}
+
+	private void DeliverEvent(
+		KurrentDB.Core.Data.ResolvedEvent @event, long lastCommitPosition, TFPos currentFrom) {
+		EventRecord linkEvent = @event.Link;
+		EventRecord targetEvent = @event.Event ?? linkEvent;
+		EventRecord positionEvent = (linkEvent ?? targetEvent);
+
+		TFPos receivedPosition = @event.OriginalPosition.Value;
+		if (currentFrom > receivedPosition)
+			throw new Exception(
+				string.Format(
+					"ReadFromTF returned events in incorrect order.  Last known position is: {0}.  Received position is: {1}",
+					currentFrom, receivedPosition));
+
+		var resolvedEvent = new ResolvedEvent(@event, null);
+
+		string deletedPartitionStreamId;
+		if (resolvedEvent.IsLinkToDeletedStream && !resolvedEvent.IsLinkToDeletedStreamTombstone)
+			return;
+
+		bool isDeletedStreamEvent = StreamDeletedHelper.IsStreamDeletedEventOrLinkToStreamDeletedEvent(
+			resolvedEvent, @event.ResolveResult, out deletedPartitionStreamId);
+
+		_publisher.Publish(
+			new ReaderSubscriptionMessage.CommittedEventDistributed(
+				EventReaderCorrelationId,
+				resolvedEvent,
+				_stopOnEof ? (long?)null : receivedPosition.PreparePosition,
+				100.0f * positionEvent.LogPosition / lastCommitPosition,
+				source: this.GetType()));
+		if (isDeletedStreamEvent)
+			_publisher.Publish(
+				new ReaderSubscriptionMessage.EventReaderPartitionDeleted(
+					EventReaderCorrelationId, deletedPartitionStreamId, source: this.GetType(), lastEventNumber: -1,
+					deleteEventOrLinkTargetPosition: resolvedEvent.EventOrLinkTargetPosition,
+					deleteLinkOrEventPosition: resolvedEvent.LinkOrEventPosition,
+					positionStreamId: positionEvent.EventStreamId, positionEventNumber: positionEvent.EventNumber));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/TransactionFilePositionTagger.cs b/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/TransactionFilePositionTagger.cs
new file mode 100644
index 00000000000..c7bf9333232
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/TransactionFile/TransactionFilePositionTagger.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.Services.Processing.TransactionFile;
+
+public class TransactionFilePositionTagger : PositionTagger {
+	public TransactionFilePositionTagger(int phase)
+		: base(phase) {
+	}
+
+	public override bool IsCompatible(CheckpointTag checkpointTag) {
+		return checkpointTag.Mode_ == CheckpointTag.Mode.Position;
+	}
+
+	public override CheckpointTag AdjustTag(CheckpointTag tag) {
+		if (tag.Phase < Phase)
+			return tag;
+		if (tag.Phase > Phase)
+			throw new ArgumentException(
+				string.Format("Invalid checkpoint tag phase.  Expected less or equal to: {0} Was: {1}", Phase,
+					tag.Phase), "tag");
+
+		if (tag.Mode_ == CheckpointTag.Mode.Position)
+			return tag;
+
+		switch (tag.Mode_) {
+			case CheckpointTag.Mode.EventTypeIndex:
+				return CheckpointTag.FromPosition(
+					tag.Phase, tag.Position.CommitPosition, tag.Position.PreparePosition);
+			case CheckpointTag.Mode.Stream:
+				throw new NotSupportedException("Conversion from Stream to Position position tag is not supported");
+			case CheckpointTag.Mode.MultiStream:
+				throw new NotSupportedException(
+					"Conversion from MultiStream to Position position tag is not supported");
+			case CheckpointTag.Mode.PreparePosition:
+				throw new NotSupportedException(
+					"Conversion from PreparePosition to Position position tag is not supported");
+			default:
+				throw new NotSupportedException(string.Format(
+					"The given checkpoint is invalid. Possible causes might include having written an event to the projection's managed stream. The bad checkpoint: {0}",
+					tag.ToString()));
+		}
+	}
+
+	public override bool IsMessageAfterCheckpointTag(
+		CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
+		if (previous.Phase < Phase)
+			return true;
+		if (previous.Mode_ != CheckpointTag.Mode.Position)
+			throw new ArgumentException("Mode.Position expected", "previous");
+		return committedEvent.Data.Position > previous.Position;
+	}
+
+	public override CheckpointTag MakeCheckpointTag(
+		CheckpointTag previous, ReaderSubscriptionMessage.CommittedEventDistributed committedEvent) {
+		if (previous.Phase != Phase)
+			throw new ArgumentException(
+				string.Format("Invalid checkpoint tag phase.  Expected: {0} Was: {1}", Phase, previous.Phase));
+
+		return CheckpointTag.FromPosition(previous.Phase, committedEvent.Data.Position);
+	}
+
+	public override CheckpointTag MakeCheckpointTag(CheckpointTag previous,
+		ReaderSubscriptionMessage.EventReaderPartitionEof partitionEof) {
+		throw new NotImplementedException();
+	}
+
+	public override CheckpointTag MakeCheckpointTag(CheckpointTag previous,
+		ReaderSubscriptionMessage.EventReaderPartitionDeleted partitionDeleted) {
+		if (previous.Phase != Phase)
+			throw new ArgumentException(
+				string.Format("Invalid checkpoint tag phase.  Expected: {0} Was: {1}", Phase, previous.Phase));
+
+		if (partitionDeleted.DeleteLinkOrEventPosition == null)
+			throw new ArgumentException(
+				"Invalid partiton deleted message. deleteEventOrLinkTargetPosition required");
+
+		return CheckpointTag.FromPosition(previous.Phase, partitionDeleted.DeleteLinkOrEventPosition.Value);
+	}
+
+	public override CheckpointTag MakeZeroCheckpointTag() {
+		return CheckpointTag.FromPosition(Phase, 0, -1);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/CheckpointSuggestedWorkItem.cs b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/CheckpointSuggestedWorkItem.cs
new file mode 100644
index 00000000000..6285fe967c2
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/CheckpointSuggestedWorkItem.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Phases;
+
+namespace KurrentDB.Projections.Core.Services.Processing.WorkItems;
+
+public class CheckpointSuggestedWorkItem : CheckpointWorkItemBase {
+	private readonly IProjectionPhaseCheckpointManager _projectionPhase;
+	private readonly EventReaderSubscriptionMessage.CheckpointSuggested _message;
+	private readonly ICoreProjectionCheckpointManager _checkpointManager;
+
+	private bool _completed = false;
+	private bool _completeRequested = false;
+
+	public CheckpointSuggestedWorkItem(
+		IProjectionPhaseCheckpointManager projectionPhase,
+		EventReaderSubscriptionMessage.CheckpointSuggested message,
+		ICoreProjectionCheckpointManager checkpointManager)
+		: base() {
+		_projectionPhase = projectionPhase;
+		_message = message;
+		_checkpointManager = checkpointManager;
+	}
+
+	protected override void WriteOutput() {
+		_projectionPhase.SetCurrentCheckpointSuggestedWorkItem(this);
+		if (_checkpointManager.CheckpointSuggested(_message.CheckpointTag, _message.Progress)) {
+			_projectionPhase.SetCurrentCheckpointSuggestedWorkItem(null);
+			_completed = true;
+		}
+
+		_projectionPhase.NewCheckpointStarted(_message.CheckpointTag);
+		NextStage();
+	}
+
+	protected override void CompleteItem() {
+		if (_completed)
+			NextStage();
+		else
+			_completeRequested = true;
+	}
+
+	internal void CheckpointCompleted() {
+		if (_completeRequested)
+			NextStage();
+		else
+			_completed = true;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/CheckpointWorkItemBase.cs b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/CheckpointWorkItemBase.cs
new file mode 100644
index 00000000000..137102a33af
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/CheckpointWorkItemBase.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Services.Processing.WorkItems;
+
+public class CheckpointWorkItemBase : WorkItem {
+	private static readonly object _correlationId = new object();
+
+	protected CheckpointWorkItemBase()
+		: base(_correlationId) {
+		_requiresRunning = true;
+	}
+
+	protected CheckpointWorkItemBase(object correlation)
+		: base(correlation) {
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/CommittedEventWorkItem.cs b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/CommittedEventWorkItem.cs
new file mode 100644
index 00000000000..bc623b9e2ee
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/CommittedEventWorkItem.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using KurrentDB.Projections.Core.Services.Processing.Phases;
+
+namespace KurrentDB.Projections.Core.Services.Processing.WorkItems;
+
+class CommittedEventWorkItem : WorkItem {
+	private readonly EventReaderSubscriptionMessage.CommittedEventReceived _message;
+	private string _partition;
+	private readonly IEventProcessingProjectionPhase _projection;
+	private readonly StatePartitionSelector _statePartitionSelector;
+	private EventProcessedResult _eventProcessedResult;
+
+	public CommittedEventWorkItem(
+		IEventProcessingProjectionPhase projection, EventReaderSubscriptionMessage.CommittedEventReceived message,
+		StatePartitionSelector statePartitionSelector)
+		: base(null) {
+		_projection = projection;
+		_statePartitionSelector = statePartitionSelector;
+		_message = message;
+		_requiresRunning = true;
+	}
+
+	protected override void RecordEventOrder() {
+		_projection.RecordEventOrder(_message.Data, _message.CheckpointTag, () => NextStage());
+	}
+
+	protected override void GetStatePartition() {
+		_partition = _statePartitionSelector.GetStatePartition(_message);
+		if (_partition == null)
+			// skip processing of events not mapped to any partition
+			NextStage();
+		else
+			NextStage(_partition);
+	}
+
+	protected override void Load(CheckpointTag checkpointTag) {
+		if (_partition == null) {
+			NextStage();
+			return;
+		}
+
+		// we load partition state even if stopping etc.  should we skip?
+		_projection.BeginGetPartitionStateAt(
+			_partition, _message.CheckpointTag, LoadCompleted, lockLoaded: true);
+	}
+
+	private void LoadCompleted(PartitionState state) {
+		NextStage();
+	}
+
+	protected override void ProcessEvent() {
+		if (_partition == null) {
+			NextStage();
+			return;
+		}
+
+		var eventProcessedResult = _projection.ProcessCommittedEvent(_message, _partition);
+		if (eventProcessedResult != null)
+			SetEventProcessedResult(eventProcessedResult);
+		NextStage();
+	}
+
+	protected override void WriteOutput() {
+		if (_partition == null) {
+			NextStage();
+			return;
+		}
+
+		_projection.FinalizeEventProcessing(_eventProcessedResult, _message.CheckpointTag, _message.Progress);
+		NextStage();
+	}
+
+	private void SetEventProcessedResult(EventProcessedResult eventProcessedResult) {
+		_eventProcessedResult = eventProcessedResult;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/CompletedWorkItem.cs b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/CompletedWorkItem.cs
new file mode 100644
index 00000000000..30c999dc835
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/CompletedWorkItem.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing.Phases;
+
+namespace KurrentDB.Projections.Core.Services.Processing.WorkItems;
+
+class CompletedWorkItem : CheckpointWorkItemBase {
+	private readonly IProjectionPhaseCompleter _projection;
+
+	public CompletedWorkItem(IProjectionPhaseCompleter projection)
+		: base() {
+		_projection = projection;
+	}
+
+	protected override void WriteOutput() {
+		_projection.Complete();
+		NextStage();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/GetDataWorkItemBase.cs b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/GetDataWorkItemBase.cs
new file mode 100644
index 00000000000..25eda0f360f
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/GetDataWorkItemBase.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using KurrentDB.Projections.Core.Services.Processing.Phases;
+
+namespace KurrentDB.Projections.Core.Services.Processing.WorkItems;
+
+abstract class GetDataWorkItemBase : WorkItem {
+	protected readonly IPublisher _publisher;
+	protected readonly string _partition;
+	protected Guid _correlationId;
+	protected Guid _projectionId;
+	private readonly IProjectionPhaseStateManager _projection;
+	private PartitionState _state;
+	private CheckpointTag _lastProcessedCheckpointTag;
+
+	protected GetDataWorkItemBase(
+		IPublisher publisher,
+		Guid correlationId,
+		Guid projectionId,
+		IProjectionPhaseStateManager projection,
+		string partition)
+		: base(null) {
+		if (partition == null)
+			throw new ArgumentNullException("partition");
+		_publisher = publisher;
+		_partition = partition;
+		_correlationId = correlationId;
+		_projectionId = projectionId;
+		_projection = projection;
+	}
+
+	protected override void GetStatePartition() {
+		NextStage(_partition);
+	}
+
+	protected override void Load(CheckpointTag checkpointTag) {
+		_lastProcessedCheckpointTag = _projection.LastProcessedEventPosition;
+		_projection.BeginGetPartitionStateAt(
+			_partition,
+			_lastProcessedCheckpointTag,
+			LoadCompleted,
+			lockLoaded: false);
+	}
+
+	private void LoadCompleted(PartitionState state) {
+		_state = state;
+		NextStage();
+	}
+
+	protected override void WriteOutput() {
+		Reply(_state, _lastProcessedCheckpointTag);
+		NextStage();
+	}
+
+	protected abstract void Reply(PartitionState state, CheckpointTag checkpointTag);
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/GetResultWorkItem.cs b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/GetResultWorkItem.cs
new file mode 100644
index 00000000000..83544ffb886
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/GetResultWorkItem.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using KurrentDB.Projections.Core.Services.Processing.Phases;
+
+namespace KurrentDB.Projections.Core.Services.Processing.WorkItems;
+
+class GetResultWorkItem : GetDataWorkItemBase {
+	public GetResultWorkItem(
+		IPublisher publisher,
+		Guid correlationId,
+		Guid projectionId,
+		IProjectionPhaseStateManager projection,
+		string partition)
+		: base(publisher, correlationId, projectionId, projection, partition) {
+	}
+
+	protected override void Reply(PartitionState state, CheckpointTag checkpointTag) {
+		if (state == null)
+			_publisher.Publish(
+				new CoreProjectionStatusMessage.ResultReport(
+					_correlationId,
+					_projectionId,
+					_partition,
+					null,
+					checkpointTag));
+		else
+			_publisher.Publish(
+				new CoreProjectionStatusMessage.ResultReport(
+					_correlationId,
+					_projectionId,
+					_partition,
+					state.Result,
+					checkpointTag));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/GetStateWorkItem.cs b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/GetStateWorkItem.cs
new file mode 100644
index 00000000000..73d247bb028
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/GetStateWorkItem.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Bus;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using KurrentDB.Projections.Core.Services.Processing.Phases;
+
+namespace KurrentDB.Projections.Core.Services.Processing.WorkItems;
+
+class GetStateWorkItem : GetDataWorkItemBase {
+	public GetStateWorkItem(
+		IPublisher publisher,
+		Guid correlationId,
+		Guid projectionId,
+		IProjectionPhaseStateManager projection,
+		string partition)
+		: base(publisher, correlationId, projectionId, projection, partition) {
+	}
+
+	protected override void Reply(PartitionState state, CheckpointTag checkpointTag) {
+		if (state == null)
+			_publisher.Publish(
+				new CoreProjectionStatusMessage.StateReport(
+					_correlationId,
+					_projectionId,
+					_partition,
+					null,
+					checkpointTag));
+		else
+			_publisher.Publish(
+				new CoreProjectionStatusMessage.StateReport(
+					_correlationId,
+					_projectionId,
+					_partition,
+					state.State,
+					checkpointTag));
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/NotAuthorizedWorkItem.cs b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/NotAuthorizedWorkItem.cs
new file mode 100644
index 00000000000..f7756b77f94
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/NotAuthorizedWorkItem.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Projections.Core.Services.Processing.WorkItems;
+
+class NotAuthorizedWorkItem : CheckpointWorkItemBase {
+	public NotAuthorizedWorkItem()
+		: base(null) {
+	}
+
+	protected override void ProcessEvent() {
+		throw new Exception("Projection cannot read its source. Not authorized.");
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/PartitionCompletedWorkItem.cs b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/PartitionCompletedWorkItem.cs
new file mode 100644
index 00000000000..ad7cbcb497a
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/PartitionCompletedWorkItem.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using KurrentDB.Projections.Core.Services.Processing.Phases;
+
+namespace KurrentDB.Projections.Core.Services.Processing.WorkItems;
+
+class PartitionCompletedWorkItem : CheckpointWorkItemBase {
+	private readonly IEventProcessingProjectionPhase _projection;
+	private readonly ICoreProjectionCheckpointManager _checkpointManager;
+	private readonly string _partition;
+	private readonly CheckpointTag _checkpointTag;
+	private PartitionState _state;
+
+	public PartitionCompletedWorkItem(
+		IEventProcessingProjectionPhase projection, ICoreProjectionCheckpointManager checkpointManager,
+		string partition, CheckpointTag checkpointTag)
+		: base() {
+		_projection = projection;
+		_checkpointManager = checkpointManager;
+		_partition = partition;
+		_checkpointTag = checkpointTag;
+	}
+
+	protected override void Load(CheckpointTag checkpointTag) {
+		if (_partition == null)
+			throw new NotSupportedException();
+		_projection.BeginGetPartitionStateAt(_partition, _checkpointTag, LoadCompleted, lockLoaded: false);
+	}
+
+	private void LoadCompleted(PartitionState obj) {
+		_state = obj;
+		NextStage();
+	}
+
+	protected override void WriteOutput() {
+		_projection.EmitEofResult(_partition, _state.Result, _checkpointTag, Guid.Empty, null);
+		//NOTE: write output is an ordered processing stage
+		//      thus all the work items before have been already processed
+		//      and as we are processing in the stream-by-stream mode
+		//      it is safe to clean everything before this position up
+		_projection.UnlockAndForgetBefore(_checkpointTag);
+		_checkpointManager.PartitionCompleted(_partition);
+		NextStage();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/PartitionDeletedWorkItem.cs b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/PartitionDeletedWorkItem.cs
new file mode 100644
index 00000000000..0c8573adf1c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/PartitionDeletedWorkItem.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Partitioning;
+using KurrentDB.Projections.Core.Services.Processing.Phases;
+
+namespace KurrentDB.Projections.Core.Services.Processing.WorkItems;
+
+class PartitionDeletedWorkItem : WorkItem {
+	private readonly EventReaderSubscriptionMessage.PartitionDeleted _message;
+	private readonly string _partition;
+	private readonly IEventProcessingProjectionPhase _projection;
+	private EventProcessedResult _eventProcessedResult;
+
+	public PartitionDeletedWorkItem(
+		IEventProcessingProjectionPhase projection, EventReaderSubscriptionMessage.PartitionDeleted message)
+		: base(null) {
+		_partition = message.Partition;
+		_projection = projection;
+		_message = message;
+		_requiresRunning = true;
+	}
+
+	protected override void GetStatePartition() {
+		NextStage(_partition);
+	}
+
+	protected override void Load(CheckpointTag checkpointTag) {
+		// we load partition state even if stopping etc.  should we skip?
+		_projection.BeginGetPartitionStateAt(_partition, _message.CheckpointTag, LoadCompleted, lockLoaded: true);
+	}
+
+	private void LoadCompleted(PartitionState state) {
+		NextStage();
+	}
+
+	protected override void ProcessEvent() {
+		if (_partition == null) {
+			NextStage();
+			return;
+		}
+
+		var eventProcessedResult = _projection.ProcessPartitionDeleted(_partition, _message.CheckpointTag);
+		if (eventProcessedResult != null)
+			SetEventProcessedResult(eventProcessedResult);
+		NextStage();
+	}
+
+	protected override void WriteOutput() {
+		if (_partition == null) {
+			NextStage();
+			return;
+		}
+
+		_projection.FinalizeEventProcessing(_eventProcessedResult, _message.CheckpointTag, _message.Progress);
+		NextStage();
+	}
+
+	private void SetEventProcessedResult(EventProcessedResult eventProcessedResult) {
+		_eventProcessedResult = eventProcessedResult;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/ProgressWorkItem.cs b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/ProgressWorkItem.cs
new file mode 100644
index 00000000000..03cc09a1511
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/ProgressWorkItem.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Phases;
+
+namespace KurrentDB.Projections.Core.Services.Processing.WorkItems;
+
+class ProgressWorkItem : CheckpointWorkItemBase {
+	private readonly ICoreProjectionCheckpointManager _checkpointManager;
+	private readonly IProgressResultWriter _resultWriter;
+	private readonly float _progress;
+
+	public ProgressWorkItem(ICoreProjectionCheckpointManager checkpointManager, IProgressResultWriter resultWriter,
+		float progress)
+		: base(null) {
+		_checkpointManager = checkpointManager;
+		_resultWriter = resultWriter;
+		_progress = progress;
+	}
+
+	protected override void WriteOutput() {
+		_checkpointManager.Progress(_progress);
+		_resultWriter.WriteProgress(_progress);
+		NextStage();
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/WorkItem.cs b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/WorkItem.cs
new file mode 100644
index 00000000000..49d78826413
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/Processing/WorkItems/WorkItem.cs
@@ -0,0 +1,98 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+
+namespace KurrentDB.Projections.Core.Services.Processing.WorkItems;
+
+public abstract class WorkItem : StagedTask {
+	private readonly int _lastStage;
+	private Action<int, object> _complete;
+	private int _onStage;
+	private CheckpointTag _checkpointTag;
+	private object _lastStageCorrelationId;
+	private CoreProjectionQueue _queue;
+	protected bool _requiresRunning;
+
+	protected WorkItem(object initialCorrelationId)
+		: base(initialCorrelationId) {
+		_lastStage = 5;
+	}
+
+	protected CoreProjectionQueue Queue {
+		get { return _queue; }
+	}
+
+	public override void Process(int onStage, Action<int, object> readyForStage) {
+		if (_checkpointTag == null)
+			throw new InvalidOperationException("CheckpointTag has not been initialized");
+		_complete = readyForStage;
+		_onStage = onStage;
+		//TODO:
+		if (_requiresRunning && !Queue.IsRunning)
+			NextStage();
+		else {
+			switch (onStage) {
+				case 0:
+					RecordEventOrder();
+					break;
+				case 1:
+					GetStatePartition();
+					break;
+				case 2:
+					Load(_checkpointTag);
+					break;
+				case 3:
+					ProcessEvent();
+					break;
+				case 4:
+					WriteOutput();
+					break;
+				case 5:
+					CompleteItem();
+					break;
+				default:
+					throw new NotSupportedException();
+			}
+		}
+	}
+
+	protected virtual void RecordEventOrder() {
+		NextStage();
+	}
+
+	protected virtual void GetStatePartition() {
+		NextStage();
+	}
+
+	protected virtual void Load(CheckpointTag checkpointTag) {
+		NextStage();
+	}
+
+	protected virtual void ProcessEvent() {
+		NextStage();
+	}
+
+	protected virtual void WriteOutput() {
+		NextStage();
+	}
+
+
+	protected virtual void CompleteItem() {
+		NextStage();
+	}
+
+	protected void NextStage(object newCorrelationId = null) {
+		_lastStageCorrelationId = newCorrelationId ?? _lastStageCorrelationId ?? InitialCorrelationId;
+		_complete(_onStage == _lastStage ? -1 : _onStage + 1, _lastStageCorrelationId);
+	}
+
+	public void SetCheckpointTag(CheckpointTag checkpointTag) {
+		_checkpointTag = checkpointTag;
+	}
+
+	public void SetProjectionQueue(CoreProjectionQueue coreProjectionQueue) {
+		_queue = coreProjectionQueue;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/ProjectionConfig.cs b/src/KurrentDB.Projections.Core/Services/ProjectionConfig.cs
new file mode 100644
index 00000000000..567bc662a4a
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/ProjectionConfig.cs
@@ -0,0 +1,115 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Security.Claims;
+using KurrentDB.Projections.Core.Common;
+
+namespace KurrentDB.Projections.Core.Services;
+
+public class ProjectionConfig {
+	private readonly ClaimsPrincipal _runAs;
+	private readonly int _checkpointHandledThreshold;
+	private readonly int _checkpointUnhandledBytesThreshold;
+	private readonly int _pendingEventsThreshold;
+	private readonly int _maxWriteBatchLength;
+	private readonly bool _emitEventEnabled;
+	private readonly bool _checkpointsEnabled;
+	private readonly bool _createTempStreams;
+	private readonly bool _stopOnEof;
+	private readonly bool _trackEmittedStreams;
+	private readonly int _checkpointAfterMs;
+	private readonly int _maximumAllowedWritesInFlight;
+
+	public ProjectionConfig(ClaimsPrincipal runAs, int checkpointHandledThreshold, int checkpointUnhandledBytesThreshold,
+		int pendingEventsThreshold, int maxWriteBatchLength, bool emitEventEnabled, bool checkpointsEnabled,
+		bool createTempStreams, bool stopOnEof, bool trackEmittedStreams,
+		int checkpointAfterMs, int maximumAllowedWritesInFlight, int? projectionExecutionTimeout) {
+		if (checkpointsEnabled) {
+			if (checkpointHandledThreshold <= 0)
+				throw new ArgumentOutOfRangeException("checkpointHandledThreshold");
+			if (checkpointUnhandledBytesThreshold < checkpointHandledThreshold)
+				throw new ArgumentException(
+					"Checkpoint threshold cannot be less than checkpoint handled threshold");
+		} else {
+			if (checkpointHandledThreshold != 0)
+				throw new ArgumentOutOfRangeException("checkpointHandledThreshold must be 0");
+			if (checkpointUnhandledBytesThreshold != 0)
+				throw new ArgumentException("checkpointUnhandledBytesThreshold must be 0");
+		}
+
+		if (maximumAllowedWritesInFlight < AllowedWritesInFlight.Unbounded) {
+			throw new ArgumentException(
+				$"The Maximum Number of Allowed Writes in Flight cannot be less than {AllowedWritesInFlight.Unbounded}");
+		}
+
+		if (projectionExecutionTimeout is not null && projectionExecutionTimeout <= 0) {
+			throw new ArgumentException(
+				$"The projection execution timeout should be positive. Found : {projectionExecutionTimeout}");
+		}
+
+		_runAs = runAs;
+		_checkpointHandledThreshold = checkpointHandledThreshold;
+		_checkpointUnhandledBytesThreshold = checkpointUnhandledBytesThreshold;
+		_pendingEventsThreshold = pendingEventsThreshold;
+		_maxWriteBatchLength = maxWriteBatchLength;
+		_emitEventEnabled = emitEventEnabled;
+		_checkpointsEnabled = checkpointsEnabled;
+		_createTempStreams = createTempStreams;
+		_stopOnEof = stopOnEof;
+		_trackEmittedStreams = trackEmittedStreams;
+		_checkpointAfterMs = checkpointAfterMs;
+		_maximumAllowedWritesInFlight = maximumAllowedWritesInFlight;
+		ProjectionExecutionTimeout = projectionExecutionTimeout;
+	}
+
+	public int CheckpointHandledThreshold {
+		get { return _checkpointHandledThreshold; }
+	}
+
+	public int CheckpointUnhandledBytesThreshold {
+		get { return _checkpointUnhandledBytesThreshold; }
+	}
+
+	public int MaxWriteBatchLength {
+		get { return _maxWriteBatchLength; }
+	}
+
+	public bool EmitEventEnabled {
+		get { return _emitEventEnabled; }
+	}
+
+	public bool CheckpointsEnabled {
+		get { return _checkpointsEnabled; }
+	}
+
+	public int PendingEventsThreshold {
+		get { return _pendingEventsThreshold; }
+	}
+
+	public bool CreateTempStreams {
+		get { return _createTempStreams; }
+	}
+
+	public bool StopOnEof {
+		get { return _stopOnEof; }
+	}
+
+	public ClaimsPrincipal RunAs {
+		get { return _runAs; }
+	}
+
+	public bool TrackEmittedStreams {
+		get { return _trackEmittedStreams; }
+	}
+
+	public int CheckpointAfterMs {
+		get { return _checkpointAfterMs; }
+	}
+
+	public int MaximumAllowedWritesInFlight {
+		get { return _maximumAllowedWritesInFlight; }
+	}
+
+	public int? ProjectionExecutionTimeout { get; }
+}
diff --git a/src/KurrentDB.Projections.Core/Services/ProjectionMode.cs b/src/KurrentDB.Projections.Core/Services/ProjectionMode.cs
new file mode 100644
index 00000000000..cb369910ce9
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/ProjectionMode.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Services;
+
+public enum ProjectionMode {
+	Transient = 0,
+	OneTime = 1,
+
+	//____1 = 1,
+	//____2 = 2,
+	//____3 = 3,
+	Continuous = 4,
+	AllNonTransient = 999,
+}
diff --git a/src/KurrentDB.Projections.Core/Services/ProjectionStatistics.cs b/src/KurrentDB.Projections.Core/Services/ProjectionStatistics.cs
new file mode 100644
index 00000000000..e2a563418b1
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/ProjectionStatistics.cs
@@ -0,0 +1,125 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Projections.Core.Services.Management;
+
+namespace KurrentDB.Projections.Core.Services;
+
+public class ProjectionStatistics {
+	//TODO: resolve name collisions...
+
+	public string Status { get; set; }
+
+	public bool Enabled { get; set; }
+
+	public ManagedProjectionState LeaderStatus { get; set; }
+
+	public string StateReason { get; set; }
+
+	public string Name { get; set; }
+
+	public long ProjectionId { get; set; }
+
+	public long Epoch { get; set; }
+
+	public long Version { get; set; }
+
+	public ProjectionMode Mode { get; set; }
+
+	public string Position { get; set; }
+
+	public float Progress { get; set; }
+
+	public string LastCheckpoint { get; set; }
+
+	public int EventsProcessedAfterRestart { get; set; }
+
+	public int BufferedEvents { get; set; }
+
+	public string CheckpointStatus { get; set; }
+
+	public int WritePendingEventsBeforeCheckpoint { get; set; }
+
+	public int WritePendingEventsAfterCheckpoint { get; set; }
+
+	public int PartitionsCached { get; set; }
+
+	public int ReadsInProgress { get; set; }
+
+	public int WritesInProgress { get; set; }
+
+	public string EffectiveName { get; set; }
+
+	public string ResultStreamName { get; set; }
+
+	public long CoreProcessingTime { get; set; }
+
+	public ProjectionStatistics Clone() {
+		return (ProjectionStatistics)MemberwiseClone();
+	}
+
+	protected bool Equals(ProjectionStatistics other) {
+		return string.Equals(Status, other.Status) && Enabled.Equals(other.Enabled)
+												   && LeaderStatus == other.LeaderStatus &&
+												   string.Equals(StateReason, other.StateReason)
+												   && string.Equals(Name, other.Name) &&
+												   ProjectionId == other.ProjectionId && Epoch == other.Epoch
+												   && Version == other.Version && Mode == other.Mode &&
+												   Equals(Position, other.Position)
+												   && Progress.Equals(other.Progress) &&
+												   string.Equals(LastCheckpoint, other.LastCheckpoint)
+												   && EventsProcessedAfterRestart ==
+												   other.EventsProcessedAfterRestart
+												   && BufferedEvents == other.BufferedEvents &&
+												   string.Equals(CheckpointStatus, other.CheckpointStatus)
+												   && WritePendingEventsBeforeCheckpoint ==
+												   other.WritePendingEventsBeforeCheckpoint
+												   && WritePendingEventsAfterCheckpoint ==
+												   other.WritePendingEventsAfterCheckpoint
+												   && PartitionsCached == other.PartitionsCached &&
+												   ReadsInProgress == other.ReadsInProgress
+												   && WritesInProgress == other.WritesInProgress &&
+												   string.Equals(EffectiveName, other.EffectiveName)
+												   && string.Equals(ResultStreamName, other.ResultStreamName) &&
+												   CoreProcessingTime == other.CoreProcessingTime;
+	}
+
+	public override bool Equals(object obj) {
+		if (ReferenceEquals(null, obj))
+			return false;
+		if (ReferenceEquals(this, obj))
+			return true;
+		if (obj.GetType() != this.GetType())
+			return false;
+		return Equals((ProjectionStatistics)obj);
+	}
+
+	public override int GetHashCode() {
+		unchecked {
+			int hashCode = (Status != null ? Status.GetHashCode() : 0);
+			hashCode = (hashCode * 397) ^ Enabled.GetHashCode();
+			hashCode = (hashCode * 397) ^ (int)LeaderStatus;
+			hashCode = (hashCode * 397) ^ (StateReason != null ? StateReason.GetHashCode() : 0);
+			hashCode = (hashCode * 397) ^ (Name != null ? Name.GetHashCode() : 0);
+			hashCode = (hashCode * 397) ^ ProjectionId.GetHashCode();
+			hashCode = (hashCode * 397) ^ Epoch.GetHashCode();
+			hashCode = (hashCode * 397) ^ Version.GetHashCode();
+			hashCode = (hashCode * 397) ^ (int)Mode;
+			hashCode = (hashCode * 397) ^ (Position != null ? Position.GetHashCode() : 0);
+			hashCode = (hashCode * 397) ^ Progress.GetHashCode();
+			hashCode = (hashCode * 397) ^ (LastCheckpoint != null ? LastCheckpoint.GetHashCode() : 0);
+			hashCode = (hashCode * 397) ^ EventsProcessedAfterRestart;
+			hashCode = (hashCode * 397) ^ BufferedEvents;
+			hashCode = (hashCode * 397) ^ (CheckpointStatus != null ? CheckpointStatus.GetHashCode() : 0);
+			hashCode = (hashCode * 397) ^ WritePendingEventsBeforeCheckpoint;
+			hashCode = (hashCode * 397) ^ WritePendingEventsAfterCheckpoint;
+			hashCode = (hashCode * 397) ^ PartitionsCached;
+			hashCode = (hashCode * 397) ^ ReadsInProgress;
+			hashCode = (hashCode * 397) ^ WritesInProgress;
+			hashCode = (hashCode * 397) ^ (EffectiveName != null ? EffectiveName.GetHashCode() : 0);
+			hashCode = (hashCode * 397) ^ (ResultStreamName != null ? ResultStreamName.GetHashCode() : 0);
+			hashCode = (hashCode * 397) ^ CoreProcessingTime.GetHashCode();
+			return hashCode;
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/ReadWrite.cs b/src/KurrentDB.Projections.Core/Services/ReadWrite.cs
new file mode 100644
index 00000000000..e6a47cb2bed
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/ReadWrite.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Services;
+
+public enum ReadWrite {
+	Read,
+	Write
+}
diff --git a/src/KurrentDB.Projections.Core/Services/ReaderSubscriptionDispatcher.cs b/src/KurrentDB.Projections.Core/Services/ReaderSubscriptionDispatcher.cs
new file mode 100644
index 00000000000..a69e5042823
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/ReaderSubscriptionDispatcher.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Settings;
+using KurrentDB.Projections.Core.Messages;
+
+namespace KurrentDB.Projections.Core.Services;
+
+public sealed class ReaderSubscriptionDispatcher {
+	private readonly ConcurrentDictionary<Guid, object> _map = new();
+	private readonly IPublisher _publisher;
+	private readonly IEnvelope _publishEnvelope;
+	private readonly TimeSpan _readerSubscriptionTimeout =
+		TimeSpan.FromMilliseconds(ESConsts.ReadRequestTimeout);
+
+	public ReaderSubscriptionDispatcher(IPublisher publisher) {
+		_publisher = publisher;
+		_publishEnvelope = _publisher;
+	}
+
+	/// <summary>
+	/// Publishes the <see cref="ReaderSubscriptionManagement.Subscribe"/> message to be handled later.
+	/// The caller must wait for further <see cref="EventReaderSubscriptionMessage"/>s to determine whether
+	/// the subscription was successful.
+	/// </summary>
+	/// <param name="request">The subscription to request</param>
+	/// <param name="subscriber">The subscriber to call with any responses for this subscription</param>
+	/// <param name="scheduleTimeout">Whether to schedule a <see cref="EventReaderSubscriptionMessage.SubscribeTimeout"/> message for this subscription</param>
+	/// <returns></returns>
+	public void PublishSubscribe(
+		ReaderSubscriptionManagement.Subscribe request, object subscriber, bool scheduleTimeout) {
+		_map.TryAdd(request.SubscriptionId, subscriber);
+		_publisher.Publish(request);
+		if (scheduleTimeout)
+			ScheduleSubscriptionTimeout(request.SubscriptionId);
+	}
+
+	private void ScheduleSubscriptionTimeout(Guid subscriptionId) {
+		_publisher.Publish(TimerMessage.Schedule.Create(
+			_readerSubscriptionTimeout, _publishEnvelope,
+			new EventReaderSubscriptionMessage.SubscribeTimeout(subscriptionId)));
+	}
+
+	public void Cancel(Guid requestId) {
+		_map.TryRemove(requestId, out _);
+	}
+
+	public IHandle<T> CreateSubscriber<T>() where T : EventReaderSubscriptionMessageBase {
+		return new Subscriber<T>(this);
+	}
+
+	private void Handle<T>(T message) where T : EventReaderSubscriptionMessageBase {
+		var correlationId = message.SubscriptionId;
+		if (_map.TryGetValue(correlationId, out var subscriber)) {
+			if (subscriber is IHandle<T> h) {
+				h.Handle(message);
+			} else if (subscriber is IAsyncHandle<T>) {
+				throw new Exception($"ReaderSubscriptionDispatcher does not support asynchronous subscribers. Subscriber: {subscriber}");
+			}
+		}
+	}
+
+	public void Subscribed(Guid correlationId, object subscriber) {
+		_map.TryAdd(correlationId, subscriber);
+	}
+
+	private class Subscriber<T> : IHandle<T> where T : EventReaderSubscriptionMessageBase {
+		private readonly ReaderSubscriptionDispatcher _host;
+
+		public Subscriber(
+			ReaderSubscriptionDispatcher host) {
+			_host = host;
+		}
+
+		public void Handle(T message) {
+			_host.Handle(message);
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Services/SystemNames.cs b/src/KurrentDB.Projections.Core/Services/SystemNames.cs
new file mode 100644
index 00000000000..234b6fc1e88
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Services/SystemNames.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Services;
+
+public static class ProjectionEventTypes {
+	public const string ProjectionCheckpoint = "$ProjectionCheckpoint";
+	public const string PartitionCheckpoint = "$Checkpoint";
+	public const string StreamTracked = "$StreamTracked";
+
+	public const string ProjectionCreated = "$ProjectionCreated";
+	public const string ProjectionDeleted = "$ProjectionDeleted";
+	public const string ProjectionsInitialized = "$ProjectionsInitialized";
+	public const string ProjectionUpdated = "$ProjectionUpdated";
+}
diff --git a/src/KurrentDB.Projections.Core/Standard/ByCorrelationId.cs b/src/KurrentDB.Projections.Core/Standard/ByCorrelationId.cs
new file mode 100644
index 00000000000..ec327ecc53e
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Standard/ByCorrelationId.cs
@@ -0,0 +1,152 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Services;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace KurrentDB.Projections.Core.Standard;
+
+public class ByCorrelationId : IProjectionStateHandler {
+	private readonly string _corrIdStreamPrefix;
+
+	public ByCorrelationId(string source, Action<string, object[]> logger) {
+		if (!string.IsNullOrWhiteSpace(source)) {
+			string correlationIdProperty;
+			if (!TryParseCorrelationIdProperty(source, out correlationIdProperty)) {
+				throw new InvalidOperationException(
+					"Could not parse projection source. Please make sure the source is a valid JSON string with a property: 'correlationIdProperty' having a string value");
+			}
+
+			CorrelationIdPropertyContext.CorrelationIdProperty = correlationIdProperty;
+		}
+
+		_corrIdStreamPrefix = "$bc-";
+	}
+
+	private bool TryParseCorrelationIdProperty(string source, out string correlationIdProperty) {
+		correlationIdProperty = null;
+		JObject obj = null;
+		try {
+			obj = JObject.Parse(source);
+			string prop = obj["correlationIdProperty"].Value<string>();
+			if (prop != null) {
+				correlationIdProperty = prop;
+				return true;
+			} else {
+				return false;
+			}
+		} catch (Exception) {
+			return false;
+		}
+	}
+
+	public void ConfigureSourceProcessingStrategy(SourceDefinitionBuilder builder) {
+		builder.FromAll();
+		builder.AllEvents();
+	}
+
+	public void Load(string state) {
+	}
+
+	public void LoadShared(string state) {
+		throw new NotImplementedException();
+	}
+
+	public void Initialize() {
+	}
+
+	public void InitializeShared() {
+	}
+
+	public string GetStatePartition(CheckpointTag eventPosition, string category, ResolvedEvent data) {
+		throw new NotImplementedException();
+	}
+
+	public bool ProcessEvent(
+		string partition, CheckpointTag eventPosition, string category1, ResolvedEvent data,
+		out string newState, out string newSharedState, out EmittedEventEnvelope[] emittedEvents) {
+		newSharedState = null;
+		emittedEvents = null;
+		newState = null;
+		if (data.EventStreamId != data.PositionStreamId)
+			return false;
+
+		if (data.Metadata == null)
+			return false;
+
+		JObject metadata = null;
+
+		try {
+			metadata = JObject.Parse(data.Metadata);
+		} catch (JsonReaderException) {
+			return false;
+		}
+
+		if (metadata[CorrelationIdPropertyContext.CorrelationIdProperty] == null)
+			return false;
+
+		string correlationId = metadata[CorrelationIdPropertyContext.CorrelationIdProperty].Value<string>();
+		if (correlationId == null)
+			return false;
+
+		string linkTarget;
+		if (data.EventType == SystemEventTypes.LinkTo)
+			linkTarget = data.Data;
+		else
+			linkTarget = data.EventSequenceNumber + "@" + data.EventStreamId;
+
+		var metadataDict = new Dictionary<string, string>();
+		metadataDict.Add("$eventTimestamp", "\"" + data.Timestamp.ToString("yyyy-MM-ddTHH:mm:ss.ffffffZ") + "\"");
+		if (data.EventType == SystemEventTypes.LinkTo) {
+			JObject linkObj = new JObject();
+			linkObj.Add("eventId", data.EventId);
+			linkObj.Add("metadata", metadata);
+			metadataDict.Add("$link", linkObj.ToJson());
+		}
+
+		var linkMetadata = new ExtraMetaData(metadataDict);
+
+		emittedEvents = new[] {
+			new EmittedEventEnvelope(
+				new EmittedDataEvent(
+					_corrIdStreamPrefix + correlationId, Guid.NewGuid(), "$>", false,
+					linkTarget,
+					linkMetadata,
+					eventPosition,
+					expectedTag: null))
+		};
+
+
+		return true;
+	}
+
+	public bool ProcessPartitionCreated(string partition, CheckpointTag createPosition, ResolvedEvent data,
+		out EmittedEventEnvelope[] emittedEvents) {
+		emittedEvents = null;
+		return false;
+	}
+
+	public bool ProcessPartitionDeleted(string partition, CheckpointTag deletePosition, out string newState) {
+		throw new NotImplementedException();
+	}
+
+	public string TransformStateToResult() {
+		throw new NotImplementedException();
+	}
+
+	public void Dispose() {
+	}
+
+	public IQuerySources GetSourceDefinition() {
+		return SourceDefinitionBuilder.From(ConfigureSourceProcessingStrategy);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Standard/CategorizeEventsByStreamPath.cs b/src/KurrentDB.Projections.Core/Standard/CategorizeEventsByStreamPath.cs
new file mode 100644
index 00000000000..7752f4835d2
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Standard/CategorizeEventsByStreamPath.cs
@@ -0,0 +1,100 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Services;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Standard;
+
+public class CategorizeEventsByStreamPath : IProjectionStateHandler {
+	private readonly string _categoryStreamPrefix;
+	private readonly StreamCategoryExtractor _streamCategoryExtractor;
+
+	public CategorizeEventsByStreamPath(string source, Action<string, object[]> logger) {
+		var extractor = StreamCategoryExtractor.GetExtractor(source, logger);
+		// we will need to declare event types we are interested in
+		_categoryStreamPrefix = "$ce-";
+		_streamCategoryExtractor = extractor;
+	}
+
+	public void ConfigureSourceProcessingStrategy(SourceDefinitionBuilder builder) {
+		builder.FromAll();
+		builder.AllEvents();
+		builder.SetIncludeLinks();
+	}
+
+	public void Load(string state) {
+	}
+
+	public void LoadShared(string state) {
+		throw new NotImplementedException();
+	}
+
+	public void Initialize() {
+	}
+
+	public void InitializeShared() {
+	}
+
+	public string GetStatePartition(CheckpointTag eventPosition, string category, ResolvedEvent data) {
+		throw new NotImplementedException();
+	}
+
+	public bool ProcessEvent(
+		string partition, CheckpointTag eventPosition, string category1, ResolvedEvent data,
+		out string newState, out string newSharedState, out EmittedEventEnvelope[] emittedEvents) {
+		newSharedState = null;
+		emittedEvents = null;
+		newState = null;
+		string deletedStreamId;
+		var isStreamDeletedEvent = StreamDeletedHelper.IsStreamDeletedEvent(
+			data.PositionStreamId, data.EventType, data.Data, out deletedStreamId);
+
+		var category = _streamCategoryExtractor.GetCategoryByStreamId(isStreamDeletedEvent ? deletedStreamId : data.PositionStreamId);
+		if (category == null)
+			return true; // handled but not interesting
+
+
+		string linkTarget;
+		if (data.EventType == SystemEventTypes.LinkTo)
+			linkTarget = data.Data;
+		else
+			linkTarget = data.EventSequenceNumber + "@" + data.EventStreamId;
+
+		emittedEvents = new[] {
+			new EmittedEventEnvelope(
+				new EmittedLinkToWithRecategorization(
+					_categoryStreamPrefix + category, Guid.NewGuid(), linkTarget, eventPosition, expectedTag: null,
+					originalStreamId: isStreamDeletedEvent?deletedStreamId:data.PositionStreamId, streamDeletedAt: isStreamDeletedEvent ? -1 : (int?)null))
+		};
+
+		return true;
+	}
+
+	public bool ProcessPartitionCreated(string partition, CheckpointTag createPosition, ResolvedEvent data,
+		out EmittedEventEnvelope[] emittedEvents) {
+		emittedEvents = null;
+		return false;
+	}
+
+	public bool ProcessPartitionDeleted(string partition, CheckpointTag deletePosition, out string newState) {
+		throw new NotImplementedException();
+	}
+
+	public string TransformStateToResult() {
+		throw new NotImplementedException();
+	}
+
+	public void Dispose() {
+	}
+
+	public IQuerySources GetSourceDefinition() {
+		return SourceDefinitionBuilder.From(ConfigureSourceProcessingStrategy);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Standard/CategorizeStreamByPath.cs b/src/KurrentDB.Projections.Core/Standard/CategorizeStreamByPath.cs
new file mode 100644
index 00000000000..70b2ed2d40c
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Standard/CategorizeStreamByPath.cs
@@ -0,0 +1,90 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Services;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+namespace KurrentDB.Projections.Core.Standard;
+
+public class CategorizeStreamByPath : IProjectionStateHandler {
+	private readonly StreamCategoryExtractor _streamCategoryExtractor;
+
+	public CategorizeStreamByPath(string source, Action<string, object[]> logger) {
+		var extractor = StreamCategoryExtractor.GetExtractor(source, logger);
+		// we will need to declare event types we are interested in
+		_streamCategoryExtractor = extractor;
+	}
+
+	public void ConfigureSourceProcessingStrategy(SourceDefinitionBuilder builder) {
+		builder.FromAll();
+		builder.AllEvents();
+		builder.SetIncludeLinks();
+	}
+
+	public void Load(string state) {
+	}
+
+	public void LoadShared(string state) {
+		throw new NotImplementedException();
+	}
+
+	public void Initialize() {
+	}
+
+	public void InitializeShared() {
+	}
+
+	public string GetStatePartition(CheckpointTag eventPosition, string category, ResolvedEvent data) {
+		throw new NotImplementedException();
+	}
+
+	public bool ProcessEvent(
+		string partition, CheckpointTag eventPosition, string category1, ResolvedEvent data,
+		out string newState, out string newSharedState, out EmittedEventEnvelope[] emittedEvents) {
+		newSharedState = null;
+		emittedEvents = null;
+		newState = null;
+
+		if (data.PositionSequenceNumber != 0)
+			return false; // not our event
+
+		var category = _streamCategoryExtractor.GetCategoryByStreamId(data.PositionStreamId);
+		if (category == null)
+			return true; // handled but not interesting
+
+		emittedEvents = new[] {
+			new EmittedEventEnvelope(
+				new EmittedDataEvent(
+					"$category" + "-" + category, Guid.NewGuid(), SystemEventTypes.StreamReference, false,
+					data.PositionStreamId, null, eventPosition, expectedTag: null))
+		};
+
+		return true;
+	}
+
+	public bool ProcessPartitionCreated(string partition, CheckpointTag createPosition, ResolvedEvent data,
+		out EmittedEventEnvelope[] emittedEvents) {
+		emittedEvents = null;
+		return false;
+	}
+
+	public bool ProcessPartitionDeleted(string partition, CheckpointTag deletePosition, out string newState) {
+		throw new NotImplementedException();
+	}
+
+	public string TransformStateToResult() {
+		throw new NotImplementedException();
+	}
+
+	public void Dispose() {
+	}
+
+	public IQuerySources GetSourceDefinition() {
+		return SourceDefinitionBuilder.From(ConfigureSourceProcessingStrategy);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Standard/IndexEventsByEventType.cs b/src/KurrentDB.Projections.Core/Standard/IndexEventsByEventType.cs
new file mode 100644
index 00000000000..38c3c518b53
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Standard/IndexEventsByEventType.cs
@@ -0,0 +1,113 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+using Newtonsoft.Json.Linq;
+
+namespace KurrentDB.Projections.Core.Standard;
+
+public class IndexEventsByEventType : IProjectionStateHandler, IProjectionCheckpointHandler {
+	private readonly string _indexStreamPrefix;
+	private readonly string _indexCheckpointStream;
+
+	public IndexEventsByEventType(string source, Action<string, object[]> logger) {
+		if (!string.IsNullOrWhiteSpace(source))
+			throw new InvalidOperationException("Empty source expected");
+		if (logger != null) {
+			//                logger("Index events by event type projection handler has been initialized");
+		}
+
+		// we will need to declare event types we are interested in
+		_indexStreamPrefix = "$et-";
+		_indexCheckpointStream = "$et";
+	}
+
+	public void ConfigureSourceProcessingStrategy(SourceDefinitionBuilder builder) {
+		builder.FromAll();
+		builder.AllEvents();
+	}
+
+	public void Load(string state) {
+	}
+
+	public void LoadShared(string state) {
+		throw new NotImplementedException();
+	}
+
+	public void Initialize() {
+	}
+
+	public void InitializeShared() {
+	}
+
+	public string GetStatePartition(CheckpointTag eventPosition, string category, ResolvedEvent data) {
+		throw new NotImplementedException();
+	}
+
+	public bool ProcessEvent(
+		string partition, CheckpointTag eventPosition, string category1, ResolvedEvent data,
+		out string newState, out string newSharedState, out EmittedEventEnvelope[] emittedEvents) {
+		newSharedState = null;
+		emittedEvents = null;
+		newState = null;
+		if (data.EventStreamId != data.PositionStreamId)
+			return false;
+		var indexedEventType = data.EventType;
+		if (indexedEventType == "$>")
+			return false;
+
+		string positionStreamId;
+		var isStreamDeletedEvent = StreamDeletedHelper.IsStreamDeletedEvent(
+			data.PositionStreamId, data.EventType, data.Data, out positionStreamId);
+		if (isStreamDeletedEvent)
+			indexedEventType = "$deleted";
+
+		emittedEvents = new[] {
+			new EmittedEventEnvelope(
+				new EmittedDataEvent(
+					_indexStreamPrefix + indexedEventType, Guid.NewGuid(), "$>", false,
+					data.EventSequenceNumber + "@" + positionStreamId,
+					isStreamDeletedEvent
+						? new ExtraMetaData(new Dictionary<string, JRaw> {{"$deleted", new JRaw(-1)}})
+						: null, eventPosition, expectedTag: null))
+		};
+
+		return true;
+	}
+
+	public bool ProcessPartitionCreated(string partition, CheckpointTag createPosition, ResolvedEvent data,
+		out EmittedEventEnvelope[] emittedEvents) {
+		emittedEvents = null;
+		return false;
+	}
+
+	public bool ProcessPartitionDeleted(string partition, CheckpointTag deletePosition, out string newState) {
+		throw new NotImplementedException();
+	}
+
+	public string TransformStateToResult() {
+		throw new NotImplementedException();
+	}
+
+	public void Dispose() {
+	}
+
+	public void ProcessNewCheckpoint(CheckpointTag checkpointPosition, out EmittedEventEnvelope[] emittedEvents) {
+		emittedEvents = new[] {
+			new EmittedEventEnvelope(
+				new EmittedDataEvent(
+					_indexCheckpointStream, Guid.NewGuid(), ProjectionEventTypes.PartitionCheckpoint,
+					true, checkpointPosition.ToJsonString(), null, checkpointPosition, expectedTag: null))
+		};
+	}
+
+	public IQuerySources GetSourceDefinition() {
+		return SourceDefinitionBuilder.From(ConfigureSourceProcessingStrategy);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Standard/IndexStreams.cs b/src/KurrentDB.Projections.Core/Standard/IndexStreams.cs
new file mode 100644
index 00000000000..2599cce80ce
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Standard/IndexStreams.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Services;
+using KurrentDB.Projections.Core.Messages;
+using KurrentDB.Projections.Core.Services;
+using KurrentDB.Projections.Core.Services.Processing;
+using KurrentDB.Projections.Core.Services.Processing.Checkpointing;
+using KurrentDB.Projections.Core.Services.Processing.Emitting.EmittedEvents;
+
+namespace KurrentDB.Projections.Core.Standard;
+
+public class IndexStreams : IProjectionStateHandler {
+	public IndexStreams(string source, Action<string, object[]> logger) {
+		var trimmedSource = source == null ? null : source.Trim();
+		if (!string.IsNullOrEmpty(trimmedSource))
+			throw new InvalidOperationException(
+				"Cannot initialize categorize stream projection handler.  No source is allowed.");
+		if (logger != null) {
+			//                logger(string.Format("Index streams projection handler has been initialized"));
+		}
+	}
+
+	public void ConfigureSourceProcessingStrategy(SourceDefinitionBuilder builder) {
+		builder.FromAll();
+		builder.AllEvents();
+		builder.SetIncludeLinks();
+	}
+
+	public void Load(string state) {
+	}
+
+	public void LoadShared(string state) {
+		throw new NotImplementedException();
+	}
+
+	public void Initialize() {
+	}
+
+	public void InitializeShared() {
+	}
+
+	public string GetStatePartition(CheckpointTag eventPosition, string category, ResolvedEvent data) {
+		throw new NotImplementedException();
+	}
+
+	public bool ProcessEvent(
+		string partition, CheckpointTag eventPosition, string category1, ResolvedEvent data,
+		out string newState, out string newSharedState, out EmittedEventEnvelope[] emittedEvents) {
+		newSharedState = null;
+		emittedEvents = null;
+		newState = null;
+		if (data.PositionSequenceNumber != 0)
+			return false; // not our event
+
+		emittedEvents = new[] {
+			new EmittedEventEnvelope(
+				new EmittedDataEvent(
+					SystemStreams.StreamsStream, Guid.NewGuid(), SystemEventTypes.LinkTo, false,
+					data.PositionSequenceNumber + "@" + data.PositionStreamId, null, eventPosition,
+					expectedTag: null))
+		};
+
+		return true;
+	}
+
+	public bool ProcessPartitionCreated(string partition, CheckpointTag createPosition, ResolvedEvent data,
+		out EmittedEventEnvelope[] emittedEvents) {
+		emittedEvents = null;
+		return false;
+	}
+
+	public bool ProcessPartitionDeleted(string partition, CheckpointTag deletePosition, out string newState) {
+		throw new NotImplementedException();
+	}
+
+	public string TransformStateToResult() {
+		throw new NotImplementedException();
+	}
+
+	public void Dispose() {
+	}
+
+	public IQuerySources GetSourceDefinition() {
+		return SourceDefinitionBuilder.From(ConfigureSourceProcessingStrategy);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Standard/StreamCategoryExtractor.cs b/src/KurrentDB.Projections.Core/Standard/StreamCategoryExtractor.cs
new file mode 100644
index 00000000000..af094f70917
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Standard/StreamCategoryExtractor.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Projections.Core.Standard;
+
+public abstract class StreamCategoryExtractor {
+	private const string ConfigurationFormatIs = "Configuration format is: \r\nfirst|last\r\nseparator";
+
+	public abstract string GetCategoryByStreamId(string streamId);
+
+	public static StreamCategoryExtractor GetExtractor(string source, Action<string, object[]> logger) {
+		var trimmedSource = source == null ? null : source.Trim();
+		if (string.IsNullOrEmpty(source))
+			throw new InvalidOperationException(
+				"Cannot initialize categorization projection handler.  "
+				+ "One symbol separator or configuration must be supplied in the source.  "
+				+ ConfigurationFormatIs);
+
+		if (trimmedSource.Length == 1) {
+			var separator = trimmedSource[0];
+			if (logger != null) {
+				/*
+									logger(
+										String.Format(
+											"Categorize stream projection handler has been initialized with separator: '{0}'", separator));
+				*/
+			}
+
+			var extractor = new StreamCategoryExtractorByLastSeparator(separator);
+			return extractor;
+		}
+
+		var parts = trimmedSource.Split(new[] { '\n' });
+
+		if (parts.Length != 2)
+			throw new InvalidOperationException(
+				"Cannot initialize categorization projection handler.  "
+				+ "Invalid configuration  "
+				+ ConfigurationFormatIs);
+
+		var direction = parts[0].ToLowerInvariant().Trim();
+		if (direction != "first" && direction != "last")
+			throw new InvalidOperationException(
+				"Cannot initialize categorization projection handler.  "
+				+ "Invalid direction specifier.  Expected 'first' or 'last'. "
+				+ ConfigurationFormatIs);
+
+		var separatorLine = parts[1];
+		if (separatorLine.Length != 1)
+			throw new InvalidOperationException(
+				"Cannot initialize categorization projection handler.  "
+				+ "Single separator expected. "
+				+ ConfigurationFormatIs);
+
+		switch (direction) {
+			case "first":
+				return new StreamCategoryExtractorByFirstSeparator(separatorLine[0]);
+			case "last":
+				return new StreamCategoryExtractorByLastSeparator(separatorLine[0]);
+			default:
+				throw new Exception();
+		}
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Standard/StreamCategoryExtractorByFirstSeparator.cs b/src/KurrentDB.Projections.Core/Standard/StreamCategoryExtractorByFirstSeparator.cs
new file mode 100644
index 00000000000..c30848f6ced
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Standard/StreamCategoryExtractorByFirstSeparator.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Standard;
+
+public class StreamCategoryExtractorByFirstSeparator : StreamCategoryExtractor {
+	private readonly char _separator;
+
+	public StreamCategoryExtractorByFirstSeparator(char separator) {
+		_separator = separator;
+	}
+
+	public override string GetCategoryByStreamId(string streamId) {
+		string category = null;
+		if (!streamId.StartsWith("$")) {
+			var lastSeparatorPosition = streamId.IndexOf(_separator);
+			if (lastSeparatorPosition > 0)
+				category = streamId.Substring(0, lastSeparatorPosition);
+		}
+
+		return category;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Standard/StreamCategoryExtractorByLastSeparator.cs b/src/KurrentDB.Projections.Core/Standard/StreamCategoryExtractorByLastSeparator.cs
new file mode 100644
index 00000000000..c1051c428d1
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Standard/StreamCategoryExtractorByLastSeparator.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Projections.Core.Standard;
+
+public class StreamCategoryExtractorByLastSeparator : StreamCategoryExtractor {
+	private readonly char _separator;
+
+	public StreamCategoryExtractorByLastSeparator(char separator) {
+		_separator = separator;
+	}
+
+	public override string GetCategoryByStreamId(string streamId) {
+		string category = null;
+		if (!streamId.StartsWith("$")) {
+			var lastSeparatorPosition = streamId.LastIndexOf(_separator);
+			if (lastSeparatorPosition > 0)
+				category = streamId.Substring(0, lastSeparatorPosition);
+		}
+
+		return category;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Standard/StreamDeletedHelper.cs b/src/KurrentDB.Projections.Core/Standard/StreamDeletedHelper.cs
new file mode 100644
index 00000000000..0914edf47dc
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Standard/StreamDeletedHelper.cs
@@ -0,0 +1,94 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services;
+using KurrentDB.Projections.Core.Utils;
+using ResolvedEvent = KurrentDB.Projections.Core.Services.Processing.ResolvedEvent;
+
+namespace KurrentDB.Projections.Core.Standard;
+
+public static class StreamDeletedHelper {
+	public static bool IsStreamDeletedEventOrLinkToStreamDeletedEvent(ResolvedEvent resolvedEvent,
+		ReadEventResult resolveResult, out string deletedPartitionStreamId) {
+		bool isDeletedStreamEvent;
+		// If the event didn't resolve, we can't rely on it as a deleted event
+		if (resolveResult != ReadEventResult.Success) {
+			deletedPartitionStreamId = null;
+			return false;
+		}
+
+		if (resolvedEvent.IsLinkToDeletedStreamTombstone) {
+			isDeletedStreamEvent = true;
+			deletedPartitionStreamId = resolvedEvent.EventStreamId;
+		} else {
+			isDeletedStreamEvent = IsStreamDeletedEvent(
+				resolvedEvent.EventStreamId, resolvedEvent.EventType, resolvedEvent.Data,
+				out deletedPartitionStreamId);
+		}
+
+		return isDeletedStreamEvent;
+	}
+
+	public static bool IsStreamDeletedEvent(
+		string streamOrMetaStreamId, string eventType, string eventData, out string deletedPartitionStreamId) {
+		if (string.IsNullOrEmpty(streamOrMetaStreamId)) {
+			deletedPartitionStreamId = null;
+			return false;
+		}
+
+		bool isMetaStream;
+		if (SystemStreams.IsMetastream(streamOrMetaStreamId)) {
+			isMetaStream = true;
+			deletedPartitionStreamId = streamOrMetaStreamId.Substring("$$".Length);
+		} else {
+			isMetaStream = false;
+			deletedPartitionStreamId = streamOrMetaStreamId;
+		}
+
+		var isStreamDeletedEvent = false;
+		if (isMetaStream) {
+			if (eventType == SystemEventTypes.StreamMetadata) {
+				var metadata = StreamMetadata.FromJson(eventData);
+				//NOTE: we do not ignore JSON deserialization exceptions here assuming that metadata stream events must be deserializable
+
+				if (metadata.TruncateBefore == EventNumber.DeletedStream)
+					isStreamDeletedEvent = true;
+			}
+		} else {
+			if (eventType == SystemEventTypes.StreamDeleted)
+				isStreamDeletedEvent = true;
+		}
+
+		return isStreamDeletedEvent;
+	}
+
+	public static bool IsStreamDeletedEvent(
+		string streamOrMetaStreamId, string eventType, ReadOnlyMemory<byte> eventData, out string deletedPartitionStreamId) {
+		bool isMetaStream;
+		if (SystemStreams.IsMetastream(streamOrMetaStreamId)) {
+			isMetaStream = true;
+			deletedPartitionStreamId = streamOrMetaStreamId.Substring("$$".Length);
+		} else {
+			isMetaStream = false;
+			deletedPartitionStreamId = streamOrMetaStreamId;
+		}
+
+		var isStreamDeletedEvent = false;
+		if (isMetaStream) {
+			if (eventType == SystemEventTypes.StreamMetadata) {
+				var metadata = StreamMetadata.FromJson(eventData.FromUtf8());
+				//NOTE: we do not ignore JSON deserialization exceptions here assuming that metadata stream events must be deserializable
+
+				if (metadata.TruncateBefore == EventNumber.DeletedStream)
+					isStreamDeletedEvent = true;
+			}
+		} else {
+			if (eventType == SystemEventTypes.StreamDeleted)
+				isStreamDeletedEvent = true;
+		}
+
+		return isStreamDeletedEvent;
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Utils/EncodingExtensions.cs b/src/KurrentDB.Projections.Core/Utils/EncodingExtensions.cs
new file mode 100644
index 00000000000..abb3c490d93
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Utils/EncodingExtensions.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Projections.Core.Utils;
+
+public static class EncodingExtensions {
+	public static string FromUtf8(this byte[] self) {
+		return Helper.UTF8NoBom.GetString(self);
+	}
+
+	public static string FromUtf8(this ReadOnlyMemory<byte> self) {
+		return Helper.UTF8NoBom.GetString(self.Span);
+	}
+
+	public static byte[] ToUtf8(this string self) {
+		return Helper.UTF8NoBom.GetBytes(self);
+	}
+
+	public static string Apply(this string format, params object[] args) {
+		return string.Format(format, args);
+	}
+}
diff --git a/src/KurrentDB.Projections.Core/Utils/EnumExtensions.cs b/src/KurrentDB.Projections.Core/Utils/EnumExtensions.cs
new file mode 100644
index 00000000000..dbd3dea2cd6
--- /dev/null
+++ b/src/KurrentDB.Projections.Core/Utils/EnumExtensions.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Projections.Core.Utils;
+
+public static class EnumExtensions {
+	public static string EnumValueName<T>(this T value) where T : struct {
+		return Enum.GetName(typeof(T), value);
+	}
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest.Tests/EncryptionAtRestPluginTests.cs b/src/KurrentDB.Security.EncryptionAtRest.Tests/EncryptionAtRestPluginTests.cs
new file mode 100644
index 00000000000..568cefde1a6
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest.Tests/EncryptionAtRestPluginTests.cs
@@ -0,0 +1,286 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Cryptography;
+using EventStore.Plugins;
+using EventStore.Plugins.Diagnostics;
+using EventStore.Plugins.Licensing;
+using EventStore.Plugins.Transforms;
+using FluentAssertions;
+using KurrentDB.Plugins.TestHelpers;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace KurrentDB.Security.EncryptionAtRest.Tests;
+
+public class EncryptionAtTestPluginTests {
+	[Theory]
+	[InlineData(true)]
+	[InlineData(false)]
+	public void can_collect_telemetry(bool enabled) {
+		using var sut = new EncryptionAtRestPlugin();
+		using var collector = PluginDiagnosticsDataCollector.Start(sut.DiagnosticsName);
+
+		IConfigurationBuilder configBuilder = new ConfigurationBuilder();
+
+		if (enabled)
+			configBuilder = configBuilder.AddInMemoryCollection(new Dictionary<string, string?> {
+				{$"{KurrentConfigurationConstants.Prefix}:EncryptionAtRest:Enabled", "true"},
+				{$"{KurrentConfigurationConstants.Prefix}:EncryptionAtRest:MasterKey:File:KeyPath", "./keys"},
+				{$"{KurrentConfigurationConstants.Prefix}:EncryptionAtRest:Encryption:AesGcm:Enabled", "true"},
+			});
+
+		var config = configBuilder.Build();
+
+		var builder = WebApplication.CreateBuilder();
+		builder.Services
+			.AddSingleton<ILicenseService>(new Fixtures.FakeLicenseService())
+			.AddSingleton<IReadOnlyList<IDbTransform>>([]);
+
+		// when
+		((IPlugableComponent)sut).ConfigureServices(
+			builder.Services,
+			config);
+
+		var app = builder.Build();
+		((IPlugableComponent)sut).ConfigureApplication(app, config);
+
+		// then
+		collector.CollectedEvents(sut.DiagnosticsName).Should().ContainSingle().Which
+			.Data["enabled"].Should().Be(enabled);
+	}
+
+	[Theory]
+	[InlineData(true, true, "ENCRYPTION_AT_REST", false)]
+	[InlineData(true, false, "ENCRYPTION_AT_REST", true)]
+	[InlineData(false, true, "ENCRYPTION_AT_REST", false)]
+	[InlineData(false, false, "ENCRYPTION_AT_REST", false)]
+	[InlineData(true, true, "NONE", true)]
+	[InlineData(true, false, "NONE", true)]
+	[InlineData(false, true, "NONE", false)]
+	[InlineData(false, false, "NONE", false)]
+	public void respects_license(bool enabled, bool licensePresent, string entitlement, bool expectedException) {
+		// given
+		using var sut = new EncryptionAtRestPlugin();
+
+		IConfigurationBuilder configBuilder = new ConfigurationBuilder();
+
+		if (enabled)
+			configBuilder = configBuilder.AddInMemoryCollection(new Dictionary<string, string?> {
+				{$"{KurrentConfigurationConstants.Prefix}:EncryptionAtRest:Enabled", "true"},
+				{$"{KurrentConfigurationConstants.Prefix}:EncryptionAtRest:MasterKey:File:KeyPath", "./keys"},
+				{$"{KurrentConfigurationConstants.Prefix}:EncryptionAtRest:Encryption:AesGcm:Enabled", "true"},
+			});
+
+		var config = configBuilder.Build();
+
+		var builder = WebApplication.CreateBuilder();
+		builder.Services.AddSingleton<IReadOnlyList<IDbTransform>>([]);
+
+		var licenseService = new Fixtures.FakeLicenseService(licensePresent, entitlement);
+		builder.Services.AddSingleton<ILicenseService>(licenseService);
+
+		((IPlugableComponent)sut).ConfigureServices(
+			builder.Services,
+			config);
+
+		var app = builder.Build();
+
+		// when
+		((IPlugableComponent)sut).ConfigureApplication(app, config);
+
+		// then
+		if (expectedException) {
+			Assert.NotNull(licenseService.RejectionException);
+		} else {
+			Assert.Null(licenseService.RejectionException);
+		}
+	}
+
+	[Fact]
+	public async Task works() {
+		// given
+		using var sut = new EncryptionAtRestPlugin();
+
+		IConfigurationBuilder configBuilder = new ConfigurationBuilder()
+			.AddInMemoryCollection(new Dictionary<string, string?> {
+				{$"{KurrentConfigurationConstants.Prefix}:EncryptionAtRest:Enabled", "true"},
+				{$"{KurrentConfigurationConstants.Prefix}:EncryptionAtRest:MasterKey:File:KeyPath", "./keys"},
+				{$"{KurrentConfigurationConstants.Prefix}:EncryptionAtRest:Encryption:AesGcm:Enabled", "true"},
+			});
+
+		var config = configBuilder.Build();
+
+		// when
+		var builder = WebApplication.CreateBuilder();
+		builder.Services.AddSingleton<ILicenseService>(new Fixtures.FakeLicenseService());
+		builder.Services.AddSingleton<IReadOnlyList<IDbTransform>>([]);
+
+		((IPlugableComponent)sut).ConfigureServices(
+			builder.Services,
+			config);
+
+		var app = builder.Build();
+		((IPlugableComponent)sut).ConfigureApplication(app, config);
+
+		// then
+		var transforms = app.Services.GetService<IReadOnlyList<IDbTransform>>();
+
+		Assert.NotNull(transforms);
+		Assert.Single(transforms);
+		Assert.Equal(TransformType.Encryption_AesGcm, transforms[0].Type);
+
+		var chunk = Path.GetTempFileName();
+		try {
+			await VerifyTransformWorks(transforms[0], chunk);
+		} finally {
+			File.Delete(chunk);
+		}
+	}
+
+	private static async Task VerifyTransformWorks(IDbTransform dbTransform, string chunk) {
+		const int dataSize = 1_000_000;
+		const int chunkHeaderSize = 128; // this value is hardcoded in the transform and cannot be changed in the test
+		const int footerSize = 128;
+		const int alignmentSize = 4096;
+
+		var writeHeader = new byte[chunkHeaderSize];
+		var writeData = new byte[dataSize];
+		var writeFooter = new byte[footerSize];
+
+		RandomNumberGenerator.Fill(writeHeader);
+		RandomNumberGenerator.Fill(writeData);
+		RandomNumberGenerator.Fill(writeFooter);
+
+		await WriteFirstPart(writeHeader, writeData[..(dataSize / 3)]);
+		await WriteMiddlePart(dataSize / 3, writeData[(dataSize / 3)..(dataSize * 2 / 3)]);
+		var writeHash = await WriteLastPart(dataSize * 2 / 3, writeData[(dataSize * 2 / 3)..], writeFooter);
+
+		await VerifyReads();
+		await VerifyRandomReads(numRandomReads: 1000);
+
+		return;
+
+		async Task WriteFirstPart(ReadOnlyMemory<byte> header, ReadOnlyMemory<byte> data) {
+			var transformHeader = new byte[dbTransform.ChunkFactory.TransformHeaderLength];
+			dbTransform.ChunkFactory.CreateTransformHeader(transformHeader);
+
+			var transform = dbTransform.ChunkFactory.CreateTransform(transformHeader);
+
+			using var fileStream = File.Open(chunk, FileMode.Open, FileAccess.ReadWrite, FileShare.None);
+			await fileStream.WriteAsync(header);
+			await fileStream.WriteAsync(transformHeader);
+
+			using var checksum = IncrementalHash.CreateHash(HashAlgorithmName.MD5);
+			checksum.AppendData(header.Span);
+			checksum.AppendData(transformHeader);
+
+			using var writeStream = transform.Write.TransformData(new ChunkDataWriteStream(fileStream, checksum));
+			await WriteData(writeStream, data);
+		}
+
+		async Task WriteMiddlePart(long writeResumePosition, ReadOnlyMemory<byte> data) {
+			using var fileStream = File.Open(chunk, FileMode.Open, FileAccess.ReadWrite, FileShare.None);
+			var (transform, _) = await CreateTransform(fileStream);
+
+			using var checksum = IncrementalHash.CreateHash(HashAlgorithmName.MD5);
+			fileStream.Position = 0;
+			using var writeStream = transform.Write.TransformData(new ChunkDataWriteStream(fileStream, checksum));
+			writeStream.Position = chunkHeaderSize + writeResumePosition;
+			await WriteData(writeStream, data);
+		}
+
+		async Task<byte[]> WriteLastPart(long writeResumePosition, ReadOnlyMemory<byte> data, ReadOnlyMemory<byte> footer) {
+			using var fileStream = File.Open(chunk, FileMode.Open, FileAccess.ReadWrite, FileShare.None);
+			var (transform, _) = await CreateTransform(fileStream);
+
+			using var checksum = IncrementalHash.CreateHash(HashAlgorithmName.MD5);
+			fileStream.Position = 0;
+			using var writeStream = transform.Write.TransformData(new ChunkDataWriteStream(fileStream, checksum));
+			writeStream.Position = chunkHeaderSize + writeResumePosition;
+			await WriteData(writeStream, data);
+
+			await transform.Write.CompleteData(footerSize, alignmentSize);
+			await transform.Write.WriteFooter(footer);
+			checksum.AppendData(footer.Span);
+
+			return checksum.GetCurrentHash();
+		}
+
+		async Task WriteData(Stream stream, ReadOnlyMemory<byte> data) {
+			while (data.Length > 0) {
+				var len = Random.Shared.Next(data.Length + 1);
+				await stream.WriteAsync(data[..len]);
+				await stream.FlushAsync();
+				data = data[len..];
+			}
+			await stream.FlushAsync();
+		}
+
+		async Task VerifyReads() {
+			using var fileStream = File.Open(chunk, FileMode.Open, FileAccess.Read, FileShare.None);
+			var fileData = new byte[fileStream.Length];
+			await fileStream.ReadExactlyAsync(fileData);
+			var stream = new MemoryStream(fileData);
+			var (transform, header) = await CreateTransform(stream);
+
+			var data = new byte[dataSize];
+			using (var readStream = transform.Read.TransformData(new ChunkDataReadStream(stream))) {
+				readStream.Position = chunkHeaderSize;
+				await readStream.ReadExactlyAsync(data);
+			}
+
+			var footer = new byte[footerSize];
+			fileData[^footer.Length..].AsSpan().CopyTo(footer);
+
+			using var checksum = MD5.Create();
+			checksum.ComputeHash(fileData);
+
+			Assert.True(new FileInfo(chunk).Length % alignmentSize == 0, "file size is not aligned");
+			Assert.True(header.SequenceEqual(writeHeader), "header does not match");
+			Assert.True(data.SequenceEqual(writeData), "data does not match");
+			Assert.True(footer.SequenceEqual(writeFooter), "footer does not match");
+			Assert.True(checksum.Hash!.SequenceEqual(writeHash), "checksum does not match");
+		}
+
+		async Task VerifyRandomReads(int numRandomReads) {
+			using var fileStream = File.Open(chunk, FileMode.Open, FileAccess.Read, FileShare.None);
+			var fileData = new byte[fileStream.Length];
+			await fileStream.ReadExactlyAsync(fileData);
+			var stream = new MemoryStream(fileData);
+			var (transform, _) = await CreateTransform(stream);
+
+			using (var readStream = transform.Read.TransformData(new ChunkDataReadStream(stream))) {
+				for (var i = 0; i < numRandomReads; i++) {
+					var startPos = Random.Shared.Next(dataSize);
+					var endPos = Math.Min(dataSize, startPos + Random.Shared.Next(10000));
+
+					var len = endPos - startPos;
+					var buffer = new byte[len];
+
+					readStream.Position = chunkHeaderSize + startPos;
+
+					// split the reads to cover more scenarios
+					var mem = buffer.AsMemory();
+					while (mem.Length > 0) {
+						var slice = mem[..Random.Shared.Next(1, mem.Length + 1)];
+						mem = mem[slice.Length..];
+						await readStream.ReadExactlyAsync(slice);
+					}
+
+					Assert.True(buffer.SequenceEqual(writeData[startPos..endPos]), "random data read does not match");
+				}
+			}
+		}
+
+		async Task<(IChunkTransform transform, byte[] chunkHeader)> CreateTransform(Stream stream) {
+			var chunkHeader = new byte[chunkHeaderSize];
+			await stream.ReadExactlyAsync(chunkHeader);
+			var transformHeader = new byte[dbTransform.ChunkFactory.TransformHeaderLength];
+			await dbTransform.ChunkFactory.ReadTransformHeader(stream, transformHeader);
+			return (dbTransform.ChunkFactory.CreateTransform(transformHeader), chunkHeader);
+		}
+	}
+
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest.Tests/KurrentDB.Security.EncryptionAtRest.Tests.csproj b/src/KurrentDB.Security.EncryptionAtRest.Tests/KurrentDB.Security.EncryptionAtRest.Tests.csproj
new file mode 100644
index 00000000000..38460ef5526
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest.Tests/KurrentDB.Security.EncryptionAtRest.Tests.csproj
@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+
+		<IsPackable>false</IsPackable>
+		<IsTestProject>true</IsTestProject>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="FluentAssertions" Version="6.12.2" />
+		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+		<PackageReference Include="xunit" Version="2.9.3" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="coverlet.collector" Version="6.0.4">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+	</ItemGroup>
+
+	<ItemGroup>
+		<Using Include="Xunit" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.Security.EncryptionAtRest\KurrentDB.Security.EncryptionAtRest.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <None Update="keys\1.esdb.master.key">
+	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	  </None>
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.Security.EncryptionAtRest.Tests/SieveBlockCacheTests.cs b/src/KurrentDB.Security.EncryptionAtRest.Tests/SieveBlockCacheTests.cs
new file mode 100644
index 00000000000..ccc6495284c
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest.Tests/SieveBlockCacheTests.cs
@@ -0,0 +1,108 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Security.EncryptionAtRest.Transforms.DataStructures;
+
+namespace KurrentDB.Security.EncryptionAtRest.Tests;
+
+public class SieveBlockCacheTests {
+	private const int DataSize = 10;
+
+	[Fact]
+	public void works() {
+		// example from: https://cachemon.github.io/SIEVE-website/blog/assets/sieve/sieve_diagram_animation.gif
+		var sut = new SieveBlockCache(7, DataSize);
+		var data = new byte[DataSize];
+
+		// set up
+		Put('A');
+		Put('B');
+		Put('C');
+		Put('D');
+		Put('E');
+		Put('F');
+		Put('G');
+		Get('A');
+		Get('B');
+		Get('G');
+
+		// tests
+		Put('H');
+		CantGet('C');
+
+		Put('A');
+		Put('D');
+		Put('I');
+		CantGet('E');
+
+		Put('B');
+		Put('J');
+		CantGet('F');
+
+		// final checks
+		CanGet('A');
+		CanGet('B');
+		CanGet('D');
+		CanGet('G');
+		CanGet('H');
+		CanGet('I');
+		CanGet('J');
+
+		return;
+
+		bool Get(char c) {
+			return sut.TryGet(c, data);
+		}
+
+		void Put(char c) {
+			if (!Get(c))
+				sut.Put(c, GenData(c));
+		}
+
+		void CanGet(char c) {
+			Assert.True(Get(c));
+			Assert.True(data.All(x => x == c));
+		}
+
+		void CantGet(char c) {
+			Assert.False(Get(c));
+		}
+
+		static ReadOnlySpan<byte> GenData(char c) {
+			var data = new byte[DataSize];
+			for (var i = 0; i < DataSize; i++)
+				data[i] = (byte)c;
+			return data;
+		}
+	}
+
+	[Fact]
+	public void works_with_cache_size_one() {
+		var sut = new SieveBlockCache(1, 0);
+		var data = Array.Empty<byte>();
+
+		sut.Put('A', data);
+		Assert.True(sut.TryGet('A', data));
+
+		sut.Put('B', data);
+		Assert.True(sut.TryGet('B', data));
+
+		sut.Put('C', data);
+		Assert.True(sut.TryGet('C', data));
+
+		sut.Put('D', data);
+		Assert.True(sut.TryGet('D', data));
+
+		Assert.False(sut.TryGet('A', data));
+		Assert.False(sut.TryGet('B', data));
+		Assert.False(sut.TryGet('C', data));
+	}
+
+	[Fact]
+	public void throws_with_cache_size_zero() =>
+		Assert.Throws<ArgumentOutOfRangeException>(() => new SieveBlockCache(0, 1));
+
+	[Fact]
+	public void throws_with_negative_block_data_size() =>
+		Assert.Throws<ArgumentOutOfRangeException>(() => new SieveBlockCache(1, -1));
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest.Tests/keys/1.esdb.master.key b/src/KurrentDB.Security.EncryptionAtRest.Tests/keys/1.esdb.master.key
new file mode 100644
index 00000000000..e46e230cff0
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest.Tests/keys/1.esdb.master.key
@@ -0,0 +1,3 @@
+-----BEGIN ESDB MASTER KEY-----
+HkqzPwpAc/NTCNsZawmGI4BG+nWP6sjxxRPiYV74ssE=
+-----END ESDB MASTER KEY-----
\ No newline at end of file
diff --git a/src/KurrentDB.Security.EncryptionAtRest/EncryptionAtRestOptions.cs b/src/KurrentDB.Security.EncryptionAtRest/EncryptionAtRestOptions.cs
new file mode 100644
index 00000000000..0d540cd2d1c
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/EncryptionAtRestOptions.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+
+namespace KurrentDB.Security.EncryptionAtRest;
+
+public class EncryptionAtRestOptions {
+	public bool Enabled { get; init; }
+
+	public MasterKeyOptions MasterKey { get; init; } = new();
+
+	public EncryptionOptions Encryption { get; init; } = new();
+
+	public class EncryptionOptions {
+		public AesGcmOptions AesGcm { get; init; } = new();
+	}
+
+	public class MasterKeyOptions {
+		public FileConfiguratorOptions? File { get; init; }
+	}
+
+	public class FileConfiguratorOptions {
+		public string KeyPath { get; init; } = "";
+	}
+
+	public class AesGcmOptions {
+		public bool Enabled { get; init; }
+		public int KeySize { get; init; } = 256;
+	}
+}
+
diff --git a/src/KurrentDB.Security.EncryptionAtRest/EncryptionAtRestPlugin.cs b/src/KurrentDB.Security.EncryptionAtRest/EncryptionAtRestPlugin.cs
new file mode 100644
index 00000000000..38232cdfeb0
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/EncryptionAtRestPlugin.cs
@@ -0,0 +1,107 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using EventStore.Plugins;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Security.EncryptionAtRest.EncryptionConfigurators;
+using KurrentDB.Security.EncryptionAtRest.MasterKeySourceConfigurators;
+using KurrentDB.Security.EncryptionAtRest.MasterKeySources;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Serilog;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Security.EncryptionAtRest;
+
+public class EncryptionAtRestPlugin() : SubsystemsPlugin(requiredEntitlements: ["ENCRYPTION_AT_REST"]) {
+	const string ConfigRoot = "KurrentDB:EncryptionAtRest";
+
+	private static readonly ILogger _logger = Log.ForContext<EncryptionAtRestPlugin>();
+
+	public override (bool Enabled, string EnableInstructions) IsEnabled(IConfiguration configuration) {
+		var enabled = configuration.GetValue($"{ConfigRoot}:Enabled", defaultValue: false);
+		return (enabled, $"Set '{ConfigRoot}:Enabled' to 'true' to enable the encryption at rest plugin");
+	}
+
+	public override void ConfigureServices(IServiceCollection services, IConfiguration config) {
+		var options = config.GetSection(ConfigRoot).Get<EncryptionAtRestOptions>() ?? new();
+
+		if (!TryConfigureMasterKeySource(
+				options: options.MasterKey,
+				out var masterKeySource))
+			return;
+
+		var masterKeys = LoadMasterKeys(masterKeySource);
+
+		if (!TryConfigureEncryptionAlgorithms(
+				options: options.Encryption,
+				masterKeys: masterKeys,
+				out var encryptionTransforms))
+			return;
+
+		services.Decorate<IReadOnlyList<IDbTransform>>((dbTransforms, _) =>
+			Decorate(dbTransforms, encryptionTransforms));
+	}
+
+	private static IReadOnlyList<IDbTransform> Decorate(IReadOnlyList<IDbTransform> dbTransforms, List<IDbTransform> encryptionTransforms) {
+		var newDbTransforms = dbTransforms.Concat(encryptionTransforms).ToList();
+		return newDbTransforms;
+	}
+
+	private static bool TryConfigureMasterKeySource(
+		EncryptionAtRestOptions.MasterKeyOptions options,
+		out IMasterKeySource masterKeySource) {
+
+		if (options.File is { } fileConfiguratorOptions) {
+			var configurator = new FileConfigurator();
+			_logger.Information("Encryption-At-Rest: Loaded master key source: {masterKeySource}", configurator.Name);
+			configurator.Configure(fileConfiguratorOptions, out masterKeySource);
+			return true;
+		}
+
+		masterKeySource = null;
+		LogErrorAndThrow($"Encryption-At-Rest: No supported master key source was specified");
+		return false;
+	}
+
+	private static IReadOnlyList<MasterKey> LoadMasterKeys(IMasterKeySource masterKeySource) {
+		var masterKeys = masterKeySource.LoadMasterKeys();
+		if (masterKeys.Count == 0)
+			LogErrorAndThrow("No master key loaded");
+
+		if (masterKeys.DistinctBy(x => x.Id).Count() != masterKeys.Count)
+			LogErrorAndThrow("All master keys should have a unique numeric ID");
+
+		_logger.Information($"Encryption-At-Rest: Active master key ID: {masterKeys[^1].Id}");
+		return masterKeys;
+	}
+
+	private static bool TryConfigureEncryptionAlgorithms(
+		EncryptionAtRestOptions.EncryptionOptions options,
+		IReadOnlyList<MasterKey> masterKeys,
+		out List<IDbTransform> encryptionTransforms) {
+
+		encryptionTransforms = [];
+
+		if (options.AesGcm.Enabled) {
+			var configurator = new AesGcmConfigurator();
+			_logger.Information("Encryption-At-Rest: Loaded encryption algorithm: {encryptionAlgorithm}", configurator.Name);
+			configurator.Configure(options.AesGcm, masterKeys, out var encryptionTransform);
+			encryptionTransforms.Add(encryptionTransform);
+		}
+
+		if (encryptionTransforms.Count == 0) {
+			LogErrorAndThrow($"Encryption-At-Rest: No supported encryption algorithm was specified");
+		}
+
+		return true;
+	}
+
+	private static void LogErrorAndThrow(string error) {
+		_logger.Error(error);
+		throw new Exception(error);
+	}
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/EncryptionConfigurators/AesGcmConfigurator.cs b/src/KurrentDB.Security.EncryptionAtRest/EncryptionConfigurators/AesGcmConfigurator.cs
new file mode 100644
index 00000000000..1ccc098ef5f
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/EncryptionConfigurators/AesGcmConfigurator.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Security.EncryptionAtRest.Transforms.AesGcm;
+using Serilog;
+
+namespace KurrentDB.Security.EncryptionAtRest.EncryptionConfigurators;
+
+public class AesGcmConfigurator : IEncryptionConfigurator<EncryptionAtRestOptions.AesGcmOptions> {
+	private static readonly ILogger _logger = Log.ForContext<AesGcmConfigurator>();
+	public string Name => "AesGcm";
+
+	public void Configure(EncryptionAtRestOptions.AesGcmOptions options, IReadOnlyList<MasterKey> masterKeys, out IDbTransform encryptionTransform) {
+		_logger.Information($"Encryption-At-Rest: ({Name}) Using key size: {options.KeySize} bits");
+
+		try {
+			encryptionTransform = new AesGcmDbTransform(masterKeys, options.KeySize);
+		} catch (Exception exc) {
+			_logger.Error(exc, $"Encryption-At-Rest: ({Name}) Error while creating encryption transform.");
+			throw;
+		}
+	}
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/EncryptionConfigurators/IEncryptionConfigurator.cs b/src/KurrentDB.Security.EncryptionAtRest/EncryptionConfigurators/IEncryptionConfigurator.cs
new file mode 100644
index 00000000000..ed6a6865c52
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/EncryptionConfigurators/IEncryptionConfigurator.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Security.EncryptionAtRest.EncryptionConfigurators;
+
+public interface IEncryptionConfigurator<TOptions> {
+	public string Name { get; }
+	public void Configure(
+		TOptions options,
+		IReadOnlyList<MasterKey> masterKeys,
+		out IDbTransform encryptionTransform);
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/KurrentDB.Security.EncryptionAtRest.csproj b/src/KurrentDB.Security.EncryptionAtRest/KurrentDB.Security.EncryptionAtRest.csproj
new file mode 100644
index 00000000000..b3db30f2d55
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/KurrentDB.Security.EncryptionAtRest.csproj
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<OutputType>Library</OutputType>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
+	</PropertyGroup>
+	<PropertyGroup>
+		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+	  <DebugSymbols>true</DebugSymbols>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="EventStore.Plugins" Version="25.2.5" />
+		<PackageReference Include="Scrutor" Version="5.0.2" />
+		<PackageReference Include="Serilog" Version="4.0.1" />
+	</ItemGroup>
+	<ItemGroup>
+	  <None Update="encryption-at-rest-plugin-example.yaml">
+	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	  </None>
+	  <None Update="encryption-at-rest-plugin-example.json">
+	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	  </None>
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.Security.EncryptionAtRest/MasterKey.cs b/src/KurrentDB.Security.EncryptionAtRest/MasterKey.cs
new file mode 100644
index 00000000000..51cabd6abef
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/MasterKey.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Security.EncryptionAtRest;
+
+public readonly record struct MasterKey {
+	public ushort Id { get; }
+	public ReadOnlyMemory<byte> Key { get; }
+
+	public MasterKey(int id, ReadOnlyMemory<byte> key) {
+		ArgumentOutOfRangeException.ThrowIfNegativeOrZero(id);
+		ArgumentOutOfRangeException.ThrowIfGreaterThan(id, ushort.MaxValue);
+
+		Id = (ushort)id;
+		Key = key;
+	}
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/MasterKeySourceConfigurators/FileConfigurator.cs b/src/KurrentDB.Security.EncryptionAtRest/MasterKeySourceConfigurators/FileConfigurator.cs
new file mode 100644
index 00000000000..75b19a6abbb
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/MasterKeySourceConfigurators/FileConfigurator.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Security.EncryptionAtRest.MasterKeySources;
+using KurrentDB.Security.EncryptionAtRest.MasterKeySources.File;
+using Serilog;
+
+namespace KurrentDB.Security.EncryptionAtRest.MasterKeySourceConfigurators;
+
+public class FileConfigurator : IMasterKeySourceConfigurator<EncryptionAtRestOptions.FileConfiguratorOptions> {
+	private static readonly ILogger _logger = Log.ForContext<FileConfigurator>();
+	public string Name => "File";
+
+	public void Configure(EncryptionAtRestOptions.FileConfiguratorOptions options, out IMasterKeySource masterKeySource) {
+		if (string.IsNullOrWhiteSpace(options.KeyPath))
+			LogErrorAndThrow($"Encryption-At-Rest: ({Name}) '{nameof(options.KeyPath)}' not specified.");
+
+		try {
+			masterKeySource = new FileSource(options.KeyPath);
+		} catch (Exception exc) {
+			_logger.Error(exc, $"Encryption-At-Rest: ({Name}) Error while configuring master key source.");
+			throw;
+		}
+	}
+
+	private static void LogErrorAndThrow(string error) {
+		_logger.Error(error);
+		throw new Exception(error);
+	}
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/MasterKeySourceConfigurators/IMasterKeySourceConfigurator.cs b/src/KurrentDB.Security.EncryptionAtRest/MasterKeySourceConfigurators/IMasterKeySourceConfigurator.cs
new file mode 100644
index 00000000000..1b88be93301
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/MasterKeySourceConfigurators/IMasterKeySourceConfigurator.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Security.EncryptionAtRest.MasterKeySources;
+
+namespace KurrentDB.Security.EncryptionAtRest.MasterKeySourceConfigurators;
+
+public interface IMasterKeySourceConfigurator<TOptions> {
+	public string Name { get; }
+	public void Configure(TOptions options, out IMasterKeySource masterKeySource);
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/MasterKeySources/File/FileSource.cs b/src/KurrentDB.Security.EncryptionAtRest/MasterKeySources/File/FileSource.cs
new file mode 100644
index 00000000000..ff9b3b1df32
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/MasterKeySources/File/FileSource.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Serilog;
+
+namespace KurrentDB.Security.EncryptionAtRest.MasterKeySources.File;
+
+public class FileSource(string path) : IMasterKeySource {
+	private static readonly ILogger _logger = Log.ForContext<FileSource>();
+
+	public string Name => "File";
+	private readonly string _path = VerifyPath(path);
+	private const string KeyFileExtension = ".esdb.master.key";
+
+	public IReadOnlyList<MasterKey> LoadMasterKeys() {
+		var masterKeyFiles = Directory
+			.EnumerateFiles(_path, $"*{KeyFileExtension}")
+			.Where(HasValidKeyId)
+			.ToArray();
+
+		var masterKeys = new List<MasterKey>(masterKeyFiles.Length);
+		masterKeys.AddRange(
+			masterKeyFiles
+				.Select(ReadMasterKey)
+				.OrderBy(x => x.Id));
+
+		return masterKeys;
+	}
+
+	private static bool HasValidKeyId(string keyFilePath) => GetKeyId(keyFilePath) > 0;
+
+	private static int GetKeyId(string keyFilePath) {
+		var keyFileName = Path.GetFileName(keyFilePath);
+		var dotIndex = keyFileName.IndexOf('.');
+		if (dotIndex < 0)
+			return -1;
+
+		if (!int.TryParse(keyFileName[..dotIndex], out var keyId))
+			return -1;
+
+		return keyId;
+	}
+
+	private MasterKey ReadMasterKey(string file) {
+		var lines = System.IO.File.ReadAllLines(file);
+		if (lines[0] != "-----BEGIN ESDB MASTER KEY-----" ||
+			lines[^1] != "-----END ESDB MASTER KEY-----")
+			throw new Exception($"Invalid master key file: {Path.GetFileName(file)}");
+
+		var keyId = GetKeyId(file);
+		var key = Convert.FromBase64String(string.Join(string.Empty, lines[1..^1]));
+
+		_logger.Information($"Encryption-At-Rest: ({Name}) Loaded master key: {keyId} ({key.Length * 8} bits)");
+		return new MasterKey(keyId, key);
+	}
+
+	private static string VerifyPath(string path) {
+		try {
+			path = Path.GetFullPath(path);
+		} catch {
+			throw new Exception($"The specified path '{path}' is invalid.");
+		}
+
+		if (!Path.Exists(path))
+			throw new Exception($"The specified path '{path}' does not exist.");
+
+		var dirInfo = new DirectoryInfo(path);
+		if (!dirInfo.Exists)
+			throw new Exception($"The specified path '{path}' is not a directory.");
+
+		return path;
+	}
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/MasterKeySources/IMasterKeySource.cs b/src/KurrentDB.Security.EncryptionAtRest/MasterKeySources/IMasterKeySource.cs
new file mode 100644
index 00000000000..75e0b796e8d
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/MasterKeySources/IMasterKeySource.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+
+namespace KurrentDB.Security.EncryptionAtRest.MasterKeySources;
+
+public interface IMasterKeySource {
+	public string Name { get; }
+
+	// the interface supports loading multiple master keys to cater for scenarios where a master key is compromised:
+	// a new master key with a new, higher, ID can be generated to encrypt new data. however, old data must still be
+	// decrypted using the old master key(s). the master key with the highest ID is always the active one.
+	// master key sources are responsible for sorting the resulting list of master keys by increasing ID.
+	public IReadOnlyList<MasterKey> LoadMasterKeys();
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmBlockInfo.cs b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmBlockInfo.cs
new file mode 100644
index 00000000000..8d95e00e3be
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmBlockInfo.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Security.EncryptionAtRest.Transforms.AesGcm;
+
+public static class AesGcmBlockInfo {
+	public const int BlockSize = 512;
+	public const int HeaderSize = 2;
+	public const int DataSize = BlockSize - HeaderSize - TagSize;
+	public const int TagSize = 14; // so that `DataSize` is aligned to the AES block size: 16 bytes
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmChunkReadStream.cs b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmChunkReadStream.cs
new file mode 100644
index 00000000000..a82e1f81c26
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmChunkReadStream.cs
@@ -0,0 +1,287 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Security.Cryptography;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Security.EncryptionAtRest.Transforms.DataStructures;
+
+namespace KurrentDB.Security.EncryptionAtRest.Transforms.AesGcm;
+
+using AesGcm = System.Security.Cryptography.AesGcm;
+using BlockInfo = AesGcmBlockInfo;
+
+public sealed class AesGcmChunkReadStream : ChunkDataReadStream {
+	private const int ChunkHeaderSize = 128;
+
+	private readonly AesGcmReadBlock _block;
+	private readonly SieveBlockCache _blockCache;
+
+	private int _curBlockNumber;
+
+	private int BlockSize { get; }
+	private int DataSize { get; }
+	private int TransformHeaderSize { get; }
+
+	// plaintext of the last read block
+	private readonly Memory<byte> _lastBlock;
+
+	// size of the plaintext of the last read block
+	private int _lastBlockDataSize;
+
+	// position that the stream has reached within the last plaintext block
+	private int _lastBlockPos;
+
+	// pending position that the stream needs to be set to
+	private long? _positionToApply;
+
+	// keeps track of the base stream's position for performance reasons: when we read from the cache, we don't move
+	// the base stream's position but we update this value instead.
+	private long _basePosition;
+
+	public AesGcmChunkReadStream(
+		ChunkDataReadStream stream,
+		ReadOnlySpan<byte> key,
+		int transformHeaderSize) :
+		base(stream.ChunkFileStream) {
+		ArgumentNullException.ThrowIfNull(stream);
+		ArgumentOutOfRangeException.ThrowIfNegative(transformHeaderSize);
+
+		var aesGcm = new AesGcm(key, BlockInfo.TagSize);
+		_block = new AesGcmReadBlock(aesGcm, ReadFileStream);
+		_blockCache = new SieveBlockCache(cacheSize: 15, blockDataSize: BlockInfo.DataSize);
+		_curBlockNumber = 0;
+
+		BlockSize = BlockInfo.BlockSize;
+		DataSize = BlockInfo.DataSize;
+		TransformHeaderSize = transformHeaderSize;
+
+		_lastBlock = new byte[BlockInfo.DataSize];
+		_lastBlockDataSize = DataSize;
+		_lastBlockPos = 0;
+
+		_basePosition = base.Position;
+	}
+
+	public override async ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken ct = default) {
+		await ApplyPosition(ct);
+
+		var count = buffer.Length;
+
+		// if the last block we've read was incomplete and the read is requesting for more data than it contains,
+		// then read the last block again. note that this code path is executed only when reading from the same stream
+		// that we're writing to, e.g when using --mem-db on the server.
+		if (_lastBlockDataSize < DataSize &&
+			_lastBlockDataSize - _lastBlockPos < count) {
+			await ReadLastBlockAgain(ct);
+		}
+
+		// first, read data from the last plaintext block, if available, into the output buffer
+		if (_lastBlockPos > 0) {
+			var numCopied = Copy(_lastBlock.Span[_lastBlockPos.._lastBlockDataSize], buffer.Span);
+
+			buffer = buffer[numCopied..];
+			_lastBlockPos += numCopied;
+
+			// if all data from the last plaintext block has been read, clear it
+			if (_lastBlockPos == DataSize)
+				ClearLastBlock();
+		}
+
+		// now, decrypt as many full blocks as possible directly into the output buffer
+		while (buffer.Length >= DataSize) {
+			await ReadBlock(buffer[..DataSize], ct);
+			buffer = buffer[DataSize..];
+		}
+
+		// finally, decrypt one last block and copy the required amount of data to the output buffer
+		if (buffer.Length > 0) {
+			await ReadLastBlock(ct);
+			_lastBlockPos = Copy(_lastBlock.Span[.._lastBlockDataSize], buffer.Span);
+		}
+
+		return count;
+	}
+
+	public override long Seek(long offset, SeekOrigin origin) {
+		if (origin != SeekOrigin.Begin)
+			throw new NotSupportedException();
+		SetPosition(offset);
+		return offset;
+	}
+
+	public override long Position {
+		get => GetPosition();
+		set => SetPosition(value);
+	}
+
+	protected override void Dispose(bool disposing) {
+		try {
+			if (!disposing)
+				return;
+
+			_block.Dispose();
+		} finally {
+			base.Dispose(disposing);
+		}
+	}
+
+	public async Task PeekBlock(int blockNumber, Memory<byte> plaintext, CancellationToken ct) {
+		var originalPos = _basePosition;
+		var originalBlockNumber = _curBlockNumber;
+
+		_curBlockNumber = blockNumber;
+		await ReadBlock(plaintext, ct);
+
+		_curBlockNumber = originalBlockNumber;
+		_basePosition = originalPos;
+
+		// immediately apply the pending seek as the base stream is used externally
+		base.Position = _basePosition;
+	}
+
+	private static int Copy(ReadOnlySpan<byte> input, Span<byte> output) {
+		var numToCopy = Math.Min(input.Length, output.Length);
+		input[..numToCopy].CopyTo(output);
+		return numToCopy;
+	}
+
+	private void ClearLastBlock() {
+		_lastBlockPos = 0;
+	}
+
+	private async ValueTask<int> ReadBlock(Memory<byte> plaintext, CancellationToken ct) {
+		var blockNumber = _curBlockNumber++;
+
+		// first, try to obtain the block data from the cache
+		if (_blockCache.TryGet(blockNumber, plaintext.Span)) {
+			_basePosition += BlockSize;
+			return BlockInfo.DataSize; // we cache only complete blocks
+		}
+
+		// otherwise read the block from the base stream
+		var dataSize = await _block.Read(blockNumber, plaintext, ct);
+
+		if (dataSize == BlockInfo.DataSize) // cache only complete blocks
+			_blockCache.Put(blockNumber, plaintext.Span);
+
+		return dataSize;
+	}
+
+	private async ValueTask ReadLastBlock(CancellationToken ct) {
+		int retries = 20;
+		do {
+			try {
+				_lastBlockDataSize = await ReadBlock(_lastBlock, ct);
+				break;
+			} catch (AuthenticationTagMismatchException) {
+				// the block was either:
+				// i)  updated while we were reading it (this can usually happen when using --mem-db)
+				// ii) really corrupted
+				if (retries-- == 0)
+					throw;
+
+				// retry
+				_basePosition -= BlockSize;
+				_curBlockNumber--;
+			}
+		} while (true);
+	}
+
+	private ValueTask ReadLastBlockAgain(CancellationToken ct) {
+		_basePosition -= BlockSize;
+		_curBlockNumber--;
+		return ReadLastBlock(ct);
+	}
+
+	private async ValueTask ReadFileStream(Memory<byte> output, CancellationToken ct) {
+		ApplyBasePosition();
+
+		var slice = output;
+		while (slice.Length > 0) {
+			var read = await base.ReadAsync(slice, ct);
+			if (read == 0)
+				throw new EndOfStreamException();
+
+			slice = slice[read..];
+		}
+
+		_basePosition += output.Length;
+	}
+
+	private long GetPosition() {
+		if (_positionToApply is { } positionToApply)
+			return positionToApply;
+
+		var position = UntransformPosition(_basePosition);
+		if (_lastBlockPos > 0) {
+			position -= DataSize; // we need to subtract DataSize as we had read one additional block
+			position += _lastBlockPos;
+		}
+		return position;
+	}
+
+	private void SetPosition(long position) {
+		_positionToApply = position;
+	}
+
+	private async ValueTask ApplyPosition(CancellationToken ct) {
+		if (_positionToApply is null)
+			return;
+
+		var (blockNumber, blockStartPosition, remainder) = TransformPosition(_positionToApply.Value);
+		_positionToApply = null;
+
+		// optimization to avoid a block read when we're already at the block we want to go to
+		if (remainder > 0 &&
+			_lastBlockPos > 0 &&
+			_curBlockNumber == blockNumber + 1) {
+			_lastBlockPos = remainder;
+
+			// this line is required because we're using DotNext.IO.StreamSource.AsSharedStream() on the server and
+			// not setting the base stream's position will cause it to have a value of zero.
+			_basePosition = blockStartPosition + BlockSize;
+			return;
+		}
+
+		ClearLastBlock();
+		_curBlockNumber = blockNumber;
+		_basePosition = blockStartPosition;
+
+		if (remainder > 0) {
+			await ReadLastBlock(ct);
+			_lastBlockPos = remainder;
+		}
+	}
+
+	private void ApplyBasePosition() {
+		base.Position = _basePosition;
+	}
+
+	private (int blockNumber, long blockStartPosition, int remainder) TransformPosition(long position) {
+		position -= ChunkHeaderSize;
+		var (blockNumber, remainder) = long.DivRem(position, DataSize);
+		Debug.Assert(blockNumber <= int.MaxValue);
+		Debug.Assert(remainder <= int.MaxValue);
+
+		position = blockNumber * BlockSize;
+		position += ChunkHeaderSize + TransformHeaderSize;
+		return ((int)blockNumber, position, (int)remainder);
+	}
+
+	private long UntransformPosition(long blockStartPosition) {
+		var position = blockStartPosition;
+
+		position -= ChunkHeaderSize + TransformHeaderSize;
+		var blockNumber = (int)(position / BlockSize);
+		Debug.Assert(position % BlockSize == 0);
+		position = blockNumber * DataSize;
+		position += ChunkHeaderSize;
+
+		return position;
+	}
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmChunkReadTransform.cs b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmChunkReadTransform.cs
new file mode 100644
index 00000000000..4b9f903b6f3
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmChunkReadTransform.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Security.EncryptionAtRest.Transforms.AesGcm;
+
+public sealed class AesGcmChunkReadTransform(ReadOnlyMemory<byte> key, int transformHeaderSize) : IChunkReadTransform {
+	public ChunkDataReadStream TransformData(ChunkDataReadStream dataStream) {
+		ArgumentNullException.ThrowIfNull(dataStream);
+		return new AesGcmChunkReadStream(dataStream, key.Span, transformHeaderSize);
+	}
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmChunkTransform.cs b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmChunkTransform.cs
new file mode 100644
index 00000000000..d51fd1920d4
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmChunkTransform.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Security.EncryptionAtRest.Transforms.AesGcm;
+
+public sealed class AesGcmChunkTransform : IChunkTransform {
+	public IChunkReadTransform Read { get; }
+	public IChunkWriteTransform Write { get; }
+
+	public AesGcmChunkTransform(ReadOnlyMemory<byte> key, int transformHeaderSize) {
+		ArgumentNullException.ThrowIfNull(key);
+		ArgumentOutOfRangeException.ThrowIfNegative(transformHeaderSize);
+
+		Read = new AesGcmChunkReadTransform(key, transformHeaderSize);
+		Write = new AesGcmChunkWriteTransform(key, transformHeaderSize, Read);
+	}
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmChunkTransformFactory.cs b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmChunkTransformFactory.cs
new file mode 100644
index 00000000000..11556f61387
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmChunkTransformFactory.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+using KurrentDB.Security.EncryptionAtRest.Transforms.Common;
+
+namespace KurrentDB.Security.EncryptionAtRest.Transforms.AesGcm;
+
+using BlockInfo = AesGcmBlockInfo;
+
+public sealed class AesGcmChunkTransformFactory(IReadOnlyList<MasterKey> masterKeys, int keySize) : IChunkTransformFactory {
+	private const int ChunkHeaderSize = 128;
+	private const int TransformHeaderSize = EncryptionHeader.Size + AesGcmHeader.Size;
+
+	static AesGcmChunkTransformFactory() {
+		ArgumentOutOfRangeException.ThrowIfLessThan(TransformHeaderSize, EncryptionHeader.Size + AesGcmHeader.Size);
+	}
+
+	public TransformType Type => TransformType.Encryption_AesGcm;
+	public int TransformHeaderLength => TransformHeaderSize;
+
+	public int TransformDataPosition(int dataPosition) {
+		var numBlocks = dataPosition / BlockInfo.DataSize;
+		if (dataPosition % BlockInfo.DataSize != 0)
+			numBlocks++;
+
+		return TransformHeaderSize + numBlocks * BlockInfo.BlockSize;
+	}
+
+	public void CreateTransformHeader(Span<byte> transformHeader) {
+		var header = transformHeader;
+
+		var encryptionHeader = header[..EncryptionHeader.Size];
+		EncryptionHeader.Write(encryptionHeader, EncryptionHeader.CurrentVersion, masterKeys[^1]);
+		header = header[EncryptionHeader.Size..];
+
+		var aesGcmHeader = header[..AesGcmHeader.Size];
+		AesGcmHeader.Write(aesGcmHeader, AesGcmHeader.CurrentVersion, keySize * 8);
+	}
+
+	public ValueTask ReadTransformHeader(Stream stream, Memory<byte> transformHeader, CancellationToken token = new CancellationToken()) {
+		return stream.ReadExactlyAsync(transformHeader, token);
+	}
+
+	public IChunkTransform CreateTransform(ReadOnlySpan<byte> transformHeader) {
+		var header = transformHeader;
+
+		var encryptionHeader = header[..EncryptionHeader.Size];
+		EncryptionHeader.Read(encryptionHeader, out _, out var masterKeyId, out var salt);
+		var masterKey = masterKeys.FirstOrDefault(x => x.Id == masterKeyId);
+		if (masterKey == default)
+			throw new Exception($"Failed to load master key with ID: {masterKeyId}");
+		header = header[EncryptionHeader.Size..];
+
+		var aesGcmHeader = header[..AesGcmHeader.Size];
+		AesGcmHeader.Read(aesGcmHeader, out _, out var aesKeySizeInBits);
+		var dataKey = DeriveDataKey(
+			dataKeySize: aesKeySizeInBits / 8,
+			masterKey: masterKey.Key.Span,
+			salt: salt);
+
+		return new AesGcmChunkTransform(dataKey, TransformHeaderSize);
+	}
+
+	private static ReadOnlyMemory<byte> DeriveDataKey(int dataKeySize, ReadOnlySpan<byte> masterKey, ReadOnlySpan<byte> salt) {
+		var dataKey = new byte[dataKeySize].AsMemory();
+
+		// see: https://soatok.blog/2021/11/17/understanding-hkdf/ about why passing the salt to the info parameter
+		// is important to have "KDF security" guarantees.
+		HKDF.DeriveKey(HashAlgorithmName.SHA256, masterKey, dataKey.Span, "AesGcm-Chunk"u8, salt);
+		return dataKey;
+	}
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmChunkWriteStream.cs b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmChunkWriteStream.cs
new file mode 100644
index 00000000000..3a5cfe80526
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmChunkWriteStream.cs
@@ -0,0 +1,223 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Security.EncryptionAtRest.Transforms.AesGcm;
+using AesGcm = System.Security.Cryptography.AesGcm;
+using BlockInfo = AesGcmBlockInfo;
+
+public sealed class AesGcmChunkWriteStream : ChunkDataWriteStream {
+	private const int ChunkHeaderSize = 128;
+
+	private readonly AesGcmWriteBlock _block;
+	private int _curBlockNumber;
+
+	private int BlockSize { get; }
+	private int DataSize { get; }
+	private int TransformHeaderSize { get; }
+
+	// plaintext of the last, incomplete, block
+	private readonly Memory<byte> _lastBlock;
+
+	// position that the stream has reached within the last plaintext block
+	private int _lastBlockPos;
+
+	// pending position that the stream needs to be set to
+	private long? _positionToApply;
+
+	private readonly IChunkReadTransform _readTransform;
+
+	public AesGcmChunkWriteStream(
+		ChunkDataWriteStream stream,
+		ReadOnlySpan<byte> key,
+		int transformHeaderSize,
+		IChunkReadTransform readTransform) :
+		base(stream.ChunkFileStream, stream.ChecksumAlgorithm) {
+		ArgumentNullException.ThrowIfNull(stream);
+		ArgumentOutOfRangeException.ThrowIfNegative(transformHeaderSize);
+		ArgumentNullException.ThrowIfNull(readTransform);
+
+		var aesGcm = new AesGcm(key, BlockInfo.TagSize);
+		_block = new AesGcmWriteBlock(aesGcm, WriteToFileStream);
+		_curBlockNumber = 0;
+		_positionToApply = null;
+
+		BlockSize = BlockInfo.BlockSize;
+		DataSize = BlockInfo.DataSize;
+		TransformHeaderSize = transformHeaderSize;
+
+		_lastBlock = new byte[BlockInfo.DataSize];
+		_lastBlockPos = 0;
+
+		_readTransform = readTransform;
+	}
+
+	public override async ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken ct = default) {
+		await ApplyInitialPosition(ct);
+
+		// first, continue filling up the last plaintext block with data if it's not empty
+		if (_lastBlockPos > 0) {
+			var lastBlock = _lastBlock[_lastBlockPos..];
+			var numCopied = Copy(buffer.Span, lastBlock.Span);
+
+			buffer = buffer[numCopied..];
+			_lastBlockPos += numCopied;
+
+			// if the last block becomes full, write it to disk
+			if (_lastBlockPos == DataSize) {
+				await WriteCompleteBlock(_lastBlock, ct);
+				ClearLastBlock();
+			}
+		}
+
+		// now, write as many full blocks as possible directly to disk
+		while (buffer.Length >= DataSize) {
+			await WriteCompleteBlock(buffer[..DataSize], ct);
+			buffer = buffer[DataSize..];
+		}
+
+		// finally, copy any remaining data to the last plaintext block
+		if (buffer.Length > 0) {
+			_lastBlockPos = Copy(buffer.Span, _lastBlock.Span);
+		}
+	}
+
+	public override async Task FlushAsync(CancellationToken ct) {
+		await ApplyInitialPosition(ct);
+
+		// write the last block to disk before flushing for proper recovery on startup but don't commit the changes
+		await WriteLastBlock(commit: false, ct);
+		await base.FlushAsync(ct);
+	}
+
+	public override long Position {
+		get => GetPosition();
+		set => SetPosition(value);
+	}
+
+	public override long Length => throw new NotSupportedException();
+
+	protected override void Dispose(bool disposing) {
+		try {
+			if (!disposing)
+				return;
+
+			_block.Dispose();
+		} finally {
+			base.Dispose(disposing);
+		}
+	}
+
+	private static int Copy(ReadOnlySpan<byte> input, Span<byte> output) {
+		var numToCopy = Math.Min(input.Length, output.Length);
+		input[..numToCopy].CopyTo(output);
+		return numToCopy;
+	}
+
+	private void ClearLastBlock() {
+		_lastBlockPos = 0;
+	}
+
+	public async ValueTask WriteLastBlock(bool commit, CancellationToken ct) {
+		if (_lastBlockPos == 0) {
+			// the last block is empty, we don't need to write anything
+			return;
+		}
+
+		if (commit) {
+			PadLastBlock(); // if committing, pad the last block with zeroes as there'll be no additional data
+			await WriteCompleteBlock(_lastBlock, ct);
+			ClearLastBlock();
+		} else {
+			await WriteIncompleteBlock(_lastBlock[.._lastBlockPos], ct);
+		}
+	}
+
+	private void PadLastBlock() {
+		_lastBlock[_lastBlockPos..].Span.Clear();
+		_lastBlockPos = DataSize;
+	}
+
+	private async ValueTask WriteCompleteBlock(ReadOnlyMemory<byte> data, CancellationToken ct) {
+		await _block.Write(_curBlockNumber++, data, updateChecksum: true, ct);
+	}
+
+	private async ValueTask WriteIncompleteBlock(ReadOnlyMemory<byte> data, CancellationToken ct) {
+		// write the block without:
+		// 1) updating the checksum
+		// 2) changing the stream position
+		// 3) incrementing the block number
+
+		var fileStreamPos = ChunkFileStream.Position;
+		await _block.Write(_curBlockNumber, data, updateChecksum: false, ct);
+		ChunkFileStream.Position = fileStreamPos;
+	}
+
+	private async ValueTask WriteToFileStream(ReadOnlyMemory<byte> data, bool updateChecksum, CancellationToken ct) {
+		await ChunkFileStream.WriteAsync(data, ct);
+		if (updateChecksum)
+			ChecksumAlgorithm.AppendData(data.Span);
+	}
+
+	private long GetPosition() {
+		return _positionToApply ?? UntransformPosition(base.Position) + _lastBlockPos;
+	}
+
+	private void SetPosition(long position) {
+		_positionToApply = position;
+	}
+
+	private async ValueTask ApplyInitialPosition(CancellationToken ct) {
+		if (_positionToApply is null)
+			return;
+
+		Debug.Assert(_curBlockNumber == 0);
+		Debug.Assert(_lastBlockPos == 0);
+
+		(_curBlockNumber, base.Position, _lastBlockPos) = TransformPosition(_positionToApply.Value);
+		_positionToApply = null;
+
+		// force the base stream's position to be set to compute the hash at the current position
+		await base.WriteAsync(ReadOnlyMemory<byte>.Empty, ct);
+
+		if (_lastBlockPos == 0)
+			return;
+
+		// create a temporary stream to decrypt the last block from the file stream without closing it
+		var fileStream = new NonClosingStreamWrapper(ChunkFileStream);
+		await using var stream = (AesGcmChunkReadStream)_readTransform.TransformData(new ChunkDataReadStream(fileStream));
+
+		// note: truncation is done at block boundaries, so the block that's decrypted below may contain more data than
+		// what we need. but this doesn't matter as we have already set _lastBlockPos to the correct position in the
+		// plaintext block and we won't use this excessive data.
+		await stream.PeekBlock(_curBlockNumber, _lastBlock, ct);
+	}
+
+	private (int blockNumber, long blockStartPosition, int remainder) TransformPosition(long position) {
+		position -= ChunkHeaderSize;
+		var (blockNumber, remainder) = long.DivRem(position, DataSize);
+		Debug.Assert(blockNumber <= int.MaxValue);
+		Debug.Assert(remainder <= int.MaxValue);
+
+		position = blockNumber * BlockSize;
+		position += ChunkHeaderSize + TransformHeaderSize;
+		return ((int)blockNumber, position, (int)remainder);
+	}
+
+	private long UntransformPosition(long blockStartPosition) {
+		var position = blockStartPosition;
+
+		position -= ChunkHeaderSize + TransformHeaderSize;
+		var blockNumber = (int)(position / BlockSize);
+		Debug.Assert(position % BlockSize == 0);
+		position = blockNumber * DataSize;
+		position += ChunkHeaderSize;
+
+		return position;
+	}
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmChunkWriteTransform.cs b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmChunkWriteTransform.cs
new file mode 100644
index 00000000000..a2caf64921c
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmChunkWriteTransform.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Security.EncryptionAtRest.Transforms.AesGcm;
+
+public sealed class AesGcmChunkWriteTransform(ReadOnlyMemory<byte> key, int transformHeaderSize, IChunkReadTransform readTransform) : IChunkWriteTransform {
+	private AesGcmChunkWriteStream _transformedStream;
+
+	public ChunkDataWriteStream TransformData(ChunkDataWriteStream dataStream) {
+		ArgumentNullException.ThrowIfNull(dataStream);
+
+		_transformedStream = new AesGcmChunkWriteStream(dataStream, key.Span, transformHeaderSize, readTransform);
+		return _transformedStream;
+	}
+
+	public async ValueTask CompleteData(int footerSize, int alignmentSize, CancellationToken ct) {
+		await _transformedStream.WriteLastBlock(commit: true, ct);
+
+		var chunkHeaderAndDataSize = (int)_transformedStream.ChunkFileStream.Position;
+		var alignedSize = GetAlignedSize(chunkHeaderAndDataSize + footerSize, alignmentSize);
+		var paddingSize = alignedSize - chunkHeaderAndDataSize - footerSize;
+		if (paddingSize > 0) {
+			var padding = new byte[paddingSize];
+			await _transformedStream.ChunkFileStream.WriteAsync(padding, ct);
+			_transformedStream.ChecksumAlgorithm.AppendData(padding);
+		}
+	}
+
+	public async ValueTask<int> WriteFooter(ReadOnlyMemory<byte> footer, CancellationToken ct) {
+		await _transformedStream.ChunkFileStream.WriteAsync(footer, ct);
+		await _transformedStream.ChunkFileStream.FlushAsync(ct);
+		return (int)_transformedStream.ChunkFileStream.Position;
+	}
+
+	private static int GetAlignedSize(int size, int alignmentSize) {
+		if (size % alignmentSize == 0)
+			return size;
+		return (size / alignmentSize + 1) * alignmentSize;
+	}
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmDbTransform.cs b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmDbTransform.cs
new file mode 100644
index 00000000000..4e8ae7b6fd6
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmDbTransform.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using EventStore.Plugins.Transforms;
+
+namespace KurrentDB.Security.EncryptionAtRest.Transforms.AesGcm;
+
+public sealed class AesGcmDbTransform : IDbTransform {
+	public string Name => "aes-gcm";
+	public TransformType Type => TransformType.Encryption_AesGcm;
+	public IChunkTransformFactory ChunkFactory { get; }
+
+	private readonly int[] _keySizesInBits = { 128, 192, 256 };
+
+	public AesGcmDbTransform(IReadOnlyList<MasterKey> masterKeys, int keySizeInBits) {
+		ArgumentOutOfRangeException.ThrowIfZero(masterKeys.Count);
+
+		if (!_keySizesInBits.Contains(keySizeInBits))
+			throw new ArgumentOutOfRangeException(nameof(keySizeInBits), $"Key size not supported: {keySizeInBits}");
+
+		ChunkFactory = new AesGcmChunkTransformFactory(masterKeys, keySizeInBits / 8);
+	}
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmHeader.cs b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmHeader.cs
new file mode 100644
index 00000000000..0e5e84e776c
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmHeader.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Security.EncryptionAtRest.Transforms.AesGcm;
+
+public static class AesGcmHeader {
+	private const int VersionSize = 1; // byte
+	private const int AesKeySize = 1;
+
+	public const byte CurrentVersion = 1;
+	public const int Size = 32;
+
+	private enum KeySize {
+		None = 0,
+		Aes128 = 1,
+		Aes192 = 2,
+		Aes256 = 3
+	}
+
+	public static void Write(Span<byte> header, byte version, int aesKeySizeInBits) {
+		header[0] = version;
+		header = header[VersionSize..];
+
+		var keySize = aesKeySizeInBits switch {
+			128 => KeySize.Aes128,
+			192 => KeySize.Aes192,
+			256 => KeySize.Aes256,
+			_ => throw new ArgumentOutOfRangeException(nameof(aesKeySizeInBits), $"Key size not supported: {aesKeySizeInBits}")
+		};
+
+		header[..AesKeySize][0] = (byte)keySize;
+	}
+
+	public static void Read(ReadOnlySpan<byte> header, out byte version, out int aesKeySizeInBits) {
+		version = header[0];
+		header = header[VersionSize..];
+
+		var keySize = (KeySize)header[..AesKeySize][0];
+		aesKeySizeInBits = keySize switch {
+			KeySize.Aes128 => 128,
+			KeySize.Aes192 => 192,
+			KeySize.Aes256 => 256,
+			_ => throw new ArgumentOutOfRangeException(nameof(keySize), $"Unexpected key size value: {keySize}")
+		};
+	}
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmReadBlock.cs b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmReadBlock.cs
new file mode 100644
index 00000000000..9d667531aac
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmReadBlock.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Buffers.Binary;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Security.EncryptionAtRest.Transforms.AesGcm;
+
+using AesGcm = System.Security.Cryptography.AesGcm;
+using BlockInfo = AesGcmBlockInfo;
+
+public sealed class AesGcmReadBlock : IDisposable {
+	private readonly AesGcm _aesGcm;
+
+	private readonly byte[] _block;
+	private readonly ReadOnlyMemory<byte> _header;
+	private readonly ReadOnlyMemory<byte> _data;
+	private readonly ReadOnlyMemory<byte> _tag;
+
+	private const int NonceSize = 12;
+	private readonly Memory<byte> _nonce = new byte[NonceSize];
+
+	private readonly Func<Memory<byte>, CancellationToken, ValueTask> _readBlock;
+
+	public AesGcmReadBlock(AesGcm aesGcm, Func<Memory<byte>, CancellationToken, ValueTask> readBlock) {
+		ArgumentNullException.ThrowIfNull(aesGcm);
+		ArgumentNullException.ThrowIfNull(readBlock);
+
+		_aesGcm = aesGcm;
+		_readBlock = readBlock;
+
+		_block = new byte[BlockInfo.BlockSize];
+
+		var block = _block.AsMemory();
+
+		_header = block[..BlockInfo.HeaderSize];
+		block = block[BlockInfo.HeaderSize..];
+
+		_data = block[..BlockInfo.DataSize];
+		block = block[BlockInfo.DataSize..];
+
+		_tag = block[..BlockInfo.TagSize];
+		block = block[BlockInfo.TagSize..];
+
+		Debug.Assert(block.Length == 0);
+	}
+
+	public async ValueTask<int> Read(int blockNumber, Memory<byte> plaintext, CancellationToken ct) {
+		await _readBlock(_block, ct);
+		var dataSize = BinaryPrimitives.ReadUInt16LittleEndian(_header.Span);
+		CalcNonce(blockNumber, dataSize);
+		Decrypt(dataSize, plaintext.Span);
+		return dataSize;
+	}
+
+	private void Decrypt(int dataSize, Span<byte> plaintext) {
+		_aesGcm.Decrypt(_nonce.Span, _data.Span[..dataSize], _tag.Span, plaintext[..dataSize]);
+	}
+
+	private void CalcNonce(int blockNumber, int dataSize) {
+		var uniquePosition = (long)blockNumber * BlockInfo.DataSize + dataSize;
+		BinaryPrimitives.WriteInt64LittleEndian(_nonce.Span, uniquePosition);
+	}
+
+	public void Dispose() {
+		_aesGcm.Dispose();
+	}
+
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmWriteBlock.cs b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmWriteBlock.cs
new file mode 100644
index 00000000000..a38cd759e0e
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/AesGcmWriteBlock.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Buffers.Binary;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Security.EncryptionAtRest.Transforms.AesGcm;
+
+using AesGcm = System.Security.Cryptography.AesGcm;
+using BlockInfo = AesGcmBlockInfo;
+
+public sealed class AesGcmWriteBlock : IDisposable {
+	private readonly AesGcm _aesGcm;
+
+	private readonly byte[] _block;
+	private readonly Memory<byte> _header;
+	private readonly Memory<byte> _data;
+	private readonly Memory<byte> _tag;
+
+	private const int NonceSize = 12;
+	private readonly Memory<byte> _nonce = new byte[NonceSize];
+
+	private readonly Func<ReadOnlyMemory<byte>, bool, CancellationToken, ValueTask> _writeBlock;
+
+	public AesGcmWriteBlock(AesGcm aesGcm, Func<ReadOnlyMemory<byte>, bool, CancellationToken, ValueTask> writeBlock) {
+		ArgumentNullException.ThrowIfNull(aesGcm);
+		ArgumentNullException.ThrowIfNull(writeBlock);
+
+		_aesGcm = aesGcm;
+		_writeBlock = writeBlock;
+
+		_block = new byte[BlockInfo.BlockSize];
+
+		var block = _block.AsMemory();
+
+		_header = block[..BlockInfo.HeaderSize];
+		block = block[BlockInfo.HeaderSize..];
+
+		_data = block[..BlockInfo.DataSize];
+		block = block[BlockInfo.DataSize..];
+
+		_tag = block[..BlockInfo.TagSize];
+		block = block[BlockInfo.TagSize..];
+
+		Debug.Assert(block.Length == 0);
+	}
+
+	public async ValueTask Write(int blockNumber, ReadOnlyMemory<byte> plaintext, bool updateChecksum, CancellationToken ct) {
+		var dataSize = plaintext.Length;
+		BinaryPrimitives.WriteUInt16LittleEndian(_header.Span, (ushort)dataSize);
+		CalcNonce(blockNumber, dataSize);
+		Encrypt(plaintext.Span, dataSize);
+		await _writeBlock(_block, updateChecksum, ct);
+	}
+
+	private void Encrypt(ReadOnlySpan<byte> plaintext, int dataSize) {
+		// note: for performance reasons, we do not clear the unused portion of _data with zeroes.
+		// so, some ciphertext from the previous block may be present after the ciphertext of the current block.
+		// security-wise, it doesn't matter as we have already written the previous ciphertext block to disk,
+		// so we're not leaking any new information.
+
+		_aesGcm.Encrypt(_nonce.Span, plaintext, _data.Span[..dataSize], _tag.Span);
+	}
+
+	private void CalcNonce(int blockNumber, int dataSize) {
+		var uniquePosition = (long)blockNumber * BlockInfo.DataSize + dataSize;
+		BinaryPrimitives.WriteInt64LittleEndian(_nonce.Span, uniquePosition);
+	}
+
+	public void Dispose() {
+		_aesGcm.Dispose();
+	}
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/NonClosingStreamWrapper.cs b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/NonClosingStreamWrapper.cs
new file mode 100644
index 00000000000..b174576e21d
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/Transforms/AesGcm/NonClosingStreamWrapper.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+
+namespace KurrentDB.Security.EncryptionAtRest.Transforms.AesGcm;
+
+
+public sealed class NonClosingStreamWrapper(Stream innerStream) : Stream {
+	public override void Flush() => innerStream.Flush();
+	public override int Read(byte[] buffer, int offset, int count) => innerStream.Read(buffer, offset, count);
+	public override long Seek(long offset, SeekOrigin origin) => innerStream.Seek(offset, origin);
+	public override void SetLength(long value) => innerStream.SetLength(value);
+	public override void Write(byte[] buffer, int offset, int count) => innerStream.Write(buffer, offset, count);
+
+	public override bool CanRead => innerStream.CanRead;
+	public override bool CanSeek => innerStream.CanSeek;
+	public override bool CanWrite => innerStream.CanWrite;
+	public override long Length => innerStream.Length;
+	public override long Position { get => innerStream.Position; set => innerStream.Position = value; }
+
+	protected override void Dispose(bool disposing) {
+		// we don't dispose the inner stream
+	}
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/Transforms/Common/EncryptionHeader.cs b/src/KurrentDB.Security.EncryptionAtRest/Transforms/Common/EncryptionHeader.cs
new file mode 100644
index 00000000000..10cf7ff69a6
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/Transforms/Common/EncryptionHeader.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Buffers.Binary;
+using System.Security.Cryptography;
+
+namespace KurrentDB.Security.EncryptionAtRest.Transforms.Common;
+
+public static class EncryptionHeader {
+	private const int VersionSize = 1; // byte
+	private const int MasterKeyIdSize = 2; // ushort
+	private const int SaltSize = 16; // 128 random bits, to have an extremely low probability of reusing the same salt
+
+	public const byte CurrentVersion = 1;
+	public const int Size = 32;
+
+	public static void Write(Span<byte> header, byte version, MasterKey masterKey) {
+		header[0] = version;
+		header = header[VersionSize..];
+
+		var masterKeyIdSpan = header[..MasterKeyIdSize];
+		BinaryPrimitives.WriteUInt16LittleEndian(masterKeyIdSpan, masterKey.Id);
+		header = header[MasterKeyIdSize..];
+
+		var saltSpan = header[..SaltSize];
+		RandomNumberGenerator.Fill(saltSpan);
+	}
+
+	public static void Read(ReadOnlySpan<byte> header, out byte version, out ushort masterKeyId, out ReadOnlySpan<byte> salt) {
+		version = header[0];
+		header = header[VersionSize..];
+
+		masterKeyId = BinaryPrimitives.ReadUInt16LittleEndian(header[..MasterKeyIdSize]);
+		header = header[MasterKeyIdSize..];
+
+		salt = header[..SaltSize];
+	}
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/Transforms/DataStructures/SieveBlockCache.cs b/src/KurrentDB.Security.EncryptionAtRest/Transforms/DataStructures/SieveBlockCache.cs
new file mode 100644
index 00000000000..097dc22e94a
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/Transforms/DataStructures/SieveBlockCache.cs
@@ -0,0 +1,107 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+
+namespace KurrentDB.Security.EncryptionAtRest.Transforms.DataStructures;
+
+// implements the SIEVE cache eviction algorithm: https://cachemon.github.io/SIEVE-website/
+
+public class SieveBlockCache {
+	private readonly int _cacheSize;
+	private readonly int _blockDataSize;
+
+	private readonly Dictionary<int, CacheItem> _cacheDict = new();
+	private int _count;
+	private CacheItem _first, _last, _hand;
+
+	public SieveBlockCache(int cacheSize, int blockDataSize) {
+		ArgumentOutOfRangeException.ThrowIfNegativeOrZero(cacheSize);
+		ArgumentOutOfRangeException.ThrowIfNegative(blockDataSize);
+
+		_cacheSize = cacheSize;
+		_blockDataSize = blockDataSize;
+	}
+
+	public void Put(int blockNumber, ReadOnlySpan<byte> blockData) {
+		CacheItem item;
+		if (_count >= _cacheSize) {
+			var o = _hand ?? _last;
+
+			while (o!.Visited) {
+				o.Visited = false;
+				o = o.Previous ?? _last;
+			}
+
+			_hand = o.Previous;
+			Remove(o);
+			item = o;
+		} else {
+			item = new CacheItem {
+				BlockNumber = -1,
+				BlockData = new byte[_blockDataSize],
+				Visited = false
+			};
+		}
+
+		item.BlockNumber = blockNumber;
+		blockData.CopyTo(item.BlockData.Span);
+		item.Visited = false;
+
+		Add(item);
+	}
+
+
+	private void Add(CacheItem item) {
+		_cacheDict.Add(item.BlockNumber, item);
+
+		if (_first is not null)
+			_first.Previous = item;
+
+		item.Previous = null;
+		item.Next = _first;
+		_first = item;
+		_last ??= item;
+
+		_count++;
+	}
+
+	private void Remove(CacheItem item) {
+		_cacheDict.Remove(item.BlockNumber);
+
+		if (_first == _last) {
+			_first = null;
+			_last = null;
+		} else if (item == _first) {
+			_first = item.Next;
+			_first.Previous = null;
+		} else if (item == _last) {
+			_last = item.Previous;
+			_last.Next = null;
+		} else {
+			item.Previous.Next = item.Next;
+			item.Next.Previous = item.Previous;
+		}
+
+		_count--;
+	}
+
+	public bool TryGet(int blockNumber, Span<byte> blockData) {
+		if (!_cacheDict.TryGetValue(blockNumber, out var item))
+			return false;
+
+		item.BlockData.Span.CopyTo(blockData);
+		item.Visited = true;
+		return true;
+	}
+
+	private class CacheItem {
+		public int BlockNumber { get; set; }
+		public Memory<byte> BlockData { get; init; }
+		public bool Visited { get; set; }
+
+		public CacheItem Next { get; set; }
+		public CacheItem Previous { get; set; }
+	}
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/encryption-at-rest-plugin-example.json b/src/KurrentDB.Security.EncryptionAtRest/encryption-at-rest-plugin-example.json
new file mode 100644
index 00000000000..80c8aeb24f4
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/encryption-at-rest-plugin-example.json
@@ -0,0 +1,17 @@
+{
+  "KurrentDB": {
+    "EncryptionAtRest": {
+      "Enabled": true,
+      "MasterKey": {
+        "File": {
+          "KeyPath": "./keys"
+        }
+      },
+      "Encryption": {
+        "AesGcm": {
+          "Enabled": true
+        }
+      }
+    }
+  }
+}
diff --git a/src/KurrentDB.Security.EncryptionAtRest/encryption-at-rest-plugin-example.yaml b/src/KurrentDB.Security.EncryptionAtRest/encryption-at-rest-plugin-example.yaml
new file mode 100644
index 00000000000..348e3e009b3
--- /dev/null
+++ b/src/KurrentDB.Security.EncryptionAtRest/encryption-at-rest-plugin-example.yaml
@@ -0,0 +1,8 @@
+EncryptionAtRest:
+  Enabled: true
+  MasterKey:
+    File:
+      KeyPath: ./keys
+  Encryption:
+    AesGcm:
+      Enabled: true
diff --git a/src/KurrentDB.SourceGenerators.Tests/KurrentDB.SourceGenerators.Tests.csproj b/src/KurrentDB.SourceGenerators.Tests/KurrentDB.SourceGenerators.Tests.csproj
new file mode 100644
index 00000000000..5f30584d735
--- /dev/null
+++ b/src/KurrentDB.SourceGenerators.Tests/KurrentDB.SourceGenerators.Tests.csproj
@@ -0,0 +1,106 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+	</PropertyGroup>
+	<ItemGroup>
+		<Compile Remove="Messaging\Cases\AbstractWithGroup.NOTCOMPILED.g.cs" />
+		<Compile Remove="Messaging\Cases\ConcreteWithoutGroup.NOTCOMPILED.g.cs" />
+		<Compile Remove="Messaging\Cases\Impartial.NOTCOMPILED.g.cs" />
+		<Compile Remove="Messaging\Cases\ImpartialNested.NOTCOMPILED.g.cs" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="Messaging\Cases\AbstractWithGroup.NOTCOMPILED.g.cs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Include="Messaging\Cases\ConcreteWithoutGroup.NOTCOMPILED.g.cs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Include="Messaging\Cases\Impartial.NOTCOMPILED.g.cs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Include="Messaging\Cases\ImpartialNested.NOTCOMPILED.g.cs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.1" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+		<!-- upgrade because of transitive dependency vulnerability -->
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+		<!-- upgrade because of transitive dependency vulnerability -->
+		<PackageReference Include="NuGet.Protocol" Version="6.7.1" />
+		<!-- upgrade because of transitive dependency vulnerability https://github.com/advisories/GHSA-447r-wph3-92pm -->
+		<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
+		<PackageReference Include="System.Linq.Async" Version="6.0.1" />
+		<!-- upgrade because of transitive dependency vulnerability -->
+		<PackageReference Include="System.Net.Http" Version="4.3.4" />
+		<!-- upgrade because of transitive dependency vulnerability -->
+		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
+		<PackageReference Include="xunit" Version="2.9.3" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="coverlet.collector" Version="6.0.4">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.SourceGenerators\KurrentDB.SourceGenerators.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+		<Compile Update="Messaging\Cases\AbstractWithGroup.cs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Compile>
+		<Compile Update="Messaging\Cases\FileScopedNamespace.g.cs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Compile>
+		<Compile Update="Messaging\Cases\ConcreteWithoutGroup.cs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Compile>
+		<Compile Update="Messaging\Cases\ImpartialNested.cs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Compile>
+		<Compile Update="Messaging\Cases\Nested.g.cs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Compile>
+		<Compile Update="Messaging\Cases\NestedDerived.g.cs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Compile>
+		<Compile Update="Messaging\Cases\Impartial.cs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Compile>
+		<Compile Update="Messaging\Cases\Simple.g.cs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Compile>
+		<Compile Update="Messaging\Cases\Abstract.cs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Compile>
+		<Compile Update="Messaging\Cases\Abstract.g.cs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Compile>
+		<Compile Update="Messaging\Cases\FileScopedNamespace.cs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Compile>
+		<Compile Update="Messaging\Cases\Message.cs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Compile>
+		<Compile Update="Messaging\Cases\Message.g.cs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Compile>
+		<Compile Update="Messaging\Cases\Nested.cs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Compile>
+		<Compile Update="Messaging\Cases\NestedDerived.cs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Compile>
+		<Compile Update="Messaging\Cases\Simple.cs">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Compile>
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.SourceGenerators.Tests/Messaging/CSharpSourceGeneratorVerifier.cs b/src/KurrentDB.SourceGenerators.Tests/Messaging/CSharpSourceGeneratorVerifier.cs
new file mode 100644
index 00000000000..2181cf4ddb0
--- /dev/null
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/CSharpSourceGeneratorVerifier.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Testing;
+using Microsoft.CodeAnalysis.Testing.Verifiers;
+
+namespace KurrentDB.SourceGenerators.Tests.Messaging;
+
+// https://github.com/dotnet/roslyn/blob/main/docs/features/source-generators.cookbook.md#unit-testing-of-generators
+public static class CSharpSourceGeneratorVerifier<TSourceGenerator>
+	where TSourceGenerator : ISourceGenerator, new() {
+
+	public class Test : CSharpSourceGeneratorTest<TSourceGenerator, XUnitVerifier> {
+		public Test() {
+		}
+
+		protected override CompilationOptions CreateCompilationOptions() {
+			var compilationOptions = base.CreateCompilationOptions();
+			return compilationOptions.WithSpecificDiagnosticOptions(
+				 compilationOptions.SpecificDiagnosticOptions.SetItems(GetNullableWarningsFromCompiler()));
+		}
+
+		public LanguageVersion LanguageVersion { get; set; } = LanguageVersion.Default;
+
+		private static ImmutableDictionary<string, ReportDiagnostic> GetNullableWarningsFromCompiler() {
+			string[] args = { "/warnaserror:nullable" };
+			var commandLineArguments = CSharpCommandLineParser.Default.Parse(
+				args: args,
+				baseDirectory: Environment.CurrentDirectory,
+				sdkDirectory: Environment.CurrentDirectory);
+			var nullableWarnings = commandLineArguments.CompilationOptions.SpecificDiagnosticOptions;
+
+			return nullableWarnings;
+		}
+
+		protected override ParseOptions CreateParseOptions() {
+			return ((CSharpParseOptions)base.CreateParseOptions()).WithLanguageVersion(LanguageVersion);
+		}
+	}
+}
diff --git a/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/.editorconfig b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/.editorconfig
new file mode 100644
index 00000000000..7030881b399
--- /dev/null
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/.editorconfig
@@ -0,0 +1,8 @@
+[*.cs]
+
+# adding the license header to the test cases would make the tests more complicated
+dotnet_diagnostic.IDE0073.severity = none
+
+# let namespaces be filed/blocked scoped as necessary for the tests
+dotnet_diagnostic.IDE0160.severity = none
+dotnet_diagnostic.IDE0161.severity = none
diff --git a/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Abstract.cs b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Abstract.cs
new file mode 100644
index 00000000000..da8c380481a
--- /dev/null
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Abstract.cs
@@ -0,0 +1,8 @@
+namespace KurrentDB.SourceGenerators.Tests.Messaging.Abstract {
+	[DerivedMessage]
+	abstract partial class B : Message {
+		[DerivedMessage(TestMessageGroup.Abstract)]
+		private partial class A : B {
+		}
+	}
+}
diff --git a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Abstract.g.cs b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Abstract.g.cs
similarity index 86%
rename from src/EventStore.SourceGenerators.Tests/Messaging/Cases/Abstract.g.cs
rename to src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Abstract.g.cs
index 07d924843e3..c3193c3663f 100644
--- a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Abstract.g.cs
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Abstract.g.cs
@@ -2,7 +2,7 @@
 using System.Threading;
 
 #pragma warning disable CS0108 // Member hides inherited member; missing new keyword
-namespace EventStore.SourceGenerators.Tests.Messaging.Abstract
+namespace KurrentDB.SourceGenerators.Tests.Messaging.Abstract
 {
 	abstract partial class B
 	{
diff --git a/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/AbstractWithGroup.NOTCOMPILED.g.cs b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/AbstractWithGroup.NOTCOMPILED.g.cs
new file mode 100644
index 00000000000..9e5a73e22c9
--- /dev/null
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/AbstractWithGroup.NOTCOMPILED.g.cs
@@ -0,0 +1,10 @@
+// autogenerated
+using System.Threading;
+
+#pragma warning disable CS0108 // Member hides inherited member; missing new keyword
+namespace KurrentDB.SourceGenerators.Tests.Messaging.AbstractWithGroup
+{
+	public abstract partial class A
+	{
+	}
+}
diff --git a/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/AbstractWithGroup.cs b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/AbstractWithGroup.cs
new file mode 100644
index 00000000000..54de7cf4fd3
--- /dev/null
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/AbstractWithGroup.cs
@@ -0,0 +1,5 @@
+namespace KurrentDB.SourceGenerators.Tests.Messaging.AbstractWithGroup {
+	[DerivedMessage(TestMessageGroup.AbstractWithGroup)]
+	public abstract partial class A : Message {
+	}
+}
diff --git a/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/ConcreteWithoutGroup.NOTCOMPILED.g.cs b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/ConcreteWithoutGroup.NOTCOMPILED.g.cs
new file mode 100644
index 00000000000..ae01e5c78eb
--- /dev/null
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/ConcreteWithoutGroup.NOTCOMPILED.g.cs
@@ -0,0 +1,10 @@
+// autogenerated
+using System.Threading;
+
+#pragma warning disable CS0108 // Member hides inherited member; missing new keyword
+namespace KurrentDB.SourceGenerators.Tests.Messaging.ConcreteWithoutGroup
+{
+	public partial class A
+	{
+	}
+}
diff --git a/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/ConcreteWithoutGroup.cs b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/ConcreteWithoutGroup.cs
new file mode 100644
index 00000000000..e49bcba83c3
--- /dev/null
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/ConcreteWithoutGroup.cs
@@ -0,0 +1,5 @@
+namespace KurrentDB.SourceGenerators.Tests.Messaging.ConcreteWithoutGroup {
+	[DerivedMessage]
+	public partial class A : Message {
+	}
+}
diff --git a/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/FileScopedNamespace.cs b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/FileScopedNamespace.cs
new file mode 100644
index 00000000000..702ffed0fbd
--- /dev/null
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/FileScopedNamespace.cs
@@ -0,0 +1,9 @@
+namespace KurrentDB.SourceGenerators.Tests.Messaging.FileScopedNamespace;
+
+[DerivedMessage(TestMessageGroup.FileScopedNamespace)]
+public partial class A : Message {
+}
+
+[DerivedMessage(TestMessageGroup.FileScopedNamespace)]
+public partial class B : Message {
+}
diff --git a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/FileScopedNamespace.g.cs b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/FileScopedNamespace.g.cs
similarity index 89%
rename from src/EventStore.SourceGenerators.Tests/Messaging/Cases/FileScopedNamespace.g.cs
rename to src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/FileScopedNamespace.g.cs
index ce0e87ef776..34110d3e7dd 100644
--- a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/FileScopedNamespace.g.cs
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/FileScopedNamespace.g.cs
@@ -2,7 +2,7 @@
 using System.Threading;
 
 #pragma warning disable CS0108 // Member hides inherited member; missing new keyword
-namespace EventStore.SourceGenerators.Tests.Messaging.FileScopedNamespace;
+namespace KurrentDB.SourceGenerators.Tests.Messaging.FileScopedNamespace;
 public partial class A
 {
 	public static string OriginalLabelStatic { get; } = "TestMessageGroup-FileScopedNamespace-A";
diff --git a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Impartial.NOTCOMPILED.g.cs b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Impartial.NOTCOMPILED.g.cs
similarity index 85%
rename from src/EventStore.SourceGenerators.Tests/Messaging/Cases/Impartial.NOTCOMPILED.g.cs
rename to src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Impartial.NOTCOMPILED.g.cs
index df47f03d21d..726db2aae18 100644
--- a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Impartial.NOTCOMPILED.g.cs
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Impartial.NOTCOMPILED.g.cs
@@ -2,7 +2,7 @@
 using System.Threading;
 
 #pragma warning disable CS0108 // Member hides inherited member; missing new keyword
-namespace EventStore.SourceGenerators.Tests.Messaging.Impartial
+namespace KurrentDB.SourceGenerators.Tests.Messaging.Impartial
 {
 	public class A
 	{
diff --git a/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Impartial.cs b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Impartial.cs
new file mode 100644
index 00000000000..3e83688e62b
--- /dev/null
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Impartial.cs
@@ -0,0 +1,5 @@
+namespace KurrentDB.SourceGenerators.Tests.Messaging.Impartial {
+	[DerivedMessage(TestMessageGroup.Impartial)]
+	public class A : Message {
+	}
+}
diff --git a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/ImpartialNested.NOTCOMPILED.g.cs b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/ImpartialNested.NOTCOMPILED.g.cs
similarity index 85%
rename from src/EventStore.SourceGenerators.Tests/Messaging/Cases/ImpartialNested.NOTCOMPILED.g.cs
rename to src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/ImpartialNested.NOTCOMPILED.g.cs
index b806d8289e4..65e713ca8e7 100644
--- a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/ImpartialNested.NOTCOMPILED.g.cs
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/ImpartialNested.NOTCOMPILED.g.cs
@@ -2,7 +2,7 @@
 using System.Threading;
 
 #pragma warning disable CS0108 // Member hides inherited member; missing new keyword
-namespace EventStore.SourceGenerators.Tests.Messaging.ImpartialNested
+namespace KurrentDB.SourceGenerators.Tests.Messaging.ImpartialNested
 {
 	public class N
 	{
diff --git a/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/ImpartialNested.cs b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/ImpartialNested.cs
new file mode 100644
index 00000000000..5b53fce3305
--- /dev/null
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/ImpartialNested.cs
@@ -0,0 +1,7 @@
+namespace KurrentDB.SourceGenerators.Tests.Messaging.ImpartialNested {
+	public class N {
+		[DerivedMessage(TestMessageGroup.ImpartialNested)]
+		public partial class A : Message {
+		}
+	}
+}
diff --git a/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Message.cs b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Message.cs
new file mode 100644
index 00000000000..7d5c410b484
--- /dev/null
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Message.cs
@@ -0,0 +1,34 @@
+using System;
+
+namespace KurrentDB.SourceGenerators.Tests.Messaging {
+	[AttributeUsage(AttributeTargets.Class)]
+	public class BaseMessageAttribute : Attribute {
+		public BaseMessageAttribute() {
+		}
+	}
+
+	[AttributeUsage(AttributeTargets.Class)]
+	public class DerivedMessageAttribute : Attribute {
+		public DerivedMessageAttribute() {
+		}
+
+		public DerivedMessageAttribute(object messageGroup) {
+		}
+	}
+
+	[BaseMessage]
+	public abstract partial class Message {
+	}
+
+	enum TestMessageGroup {
+		None,
+		Abstract,
+		AbstractWithGroup,
+		FileScopedNamespace,
+		Impartial,
+		ImpartialNested,
+		Nested,
+		NestedDerived,
+		Simple,
+	}
+}
diff --git a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Message.g.cs b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Message.g.cs
similarity index 79%
rename from src/EventStore.SourceGenerators.Tests/Messaging/Cases/Message.g.cs
rename to src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Message.g.cs
index 01c1cfae272..21a53a1663d 100644
--- a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Message.g.cs
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Message.g.cs
@@ -2,7 +2,7 @@
 using System.Threading;
 
 #pragma warning disable CS0108 // Member hides inherited member; missing new keyword
-namespace EventStore.SourceGenerators.Tests.Messaging
+namespace KurrentDB.SourceGenerators.Tests.Messaging
 {
 	public abstract partial class Message
 	{
diff --git a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Nested.cs b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Nested.cs
similarity index 76%
rename from src/EventStore.SourceGenerators.Tests/Messaging/Cases/Nested.cs
rename to src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Nested.cs
index 98e1da98dd5..6cd660e88e1 100644
--- a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Nested.cs
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Nested.cs
@@ -1,4 +1,4 @@
-namespace EventStore.SourceGenerators.Tests.Messaging.Nested {
+namespace KurrentDB.SourceGenerators.Tests.Messaging.Nested {
 	public partial class N {
 		[DerivedMessage(TestMessageGroup.Nested)]
 		public partial class A : Message {
diff --git a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Nested.g.cs b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Nested.g.cs
similarity index 91%
rename from src/EventStore.SourceGenerators.Tests/Messaging/Cases/Nested.g.cs
rename to src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Nested.g.cs
index 2b7bd0c4cd5..62adf8b7a5a 100644
--- a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Nested.g.cs
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Nested.g.cs
@@ -2,7 +2,7 @@
 using System.Threading;
 
 #pragma warning disable CS0108 // Member hides inherited member; missing new keyword
-namespace EventStore.SourceGenerators.Tests.Messaging.Nested
+namespace KurrentDB.SourceGenerators.Tests.Messaging.Nested
 {
 	public partial class N
 	{
diff --git a/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/NestedDerived.cs b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/NestedDerived.cs
new file mode 100644
index 00000000000..6af1a657b71
--- /dev/null
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/NestedDerived.cs
@@ -0,0 +1,8 @@
+namespace KurrentDB.SourceGenerators.Tests.Messaging.NestedDerived {
+	[DerivedMessage(TestMessageGroup.NestedDerived)]
+	partial class B : Message {
+		[DerivedMessage(TestMessageGroup.NestedDerived)]
+		private partial class A : B {
+		}
+	}
+}
diff --git a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/NestedDerived.g.cs b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/NestedDerived.g.cs
similarity index 90%
rename from src/EventStore.SourceGenerators.Tests/Messaging/Cases/NestedDerived.g.cs
rename to src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/NestedDerived.g.cs
index 547ca927a25..dbb764c6a10 100644
--- a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/NestedDerived.g.cs
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/NestedDerived.g.cs
@@ -2,7 +2,7 @@
 using System.Threading;
 
 #pragma warning disable CS0108 // Member hides inherited member; missing new keyword
-namespace EventStore.SourceGenerators.Tests.Messaging.NestedDerived
+namespace KurrentDB.SourceGenerators.Tests.Messaging.NestedDerived
 {
 	partial class B
 	{
diff --git a/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Simple.cs b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Simple.cs
new file mode 100644
index 00000000000..81c24c5d3f5
--- /dev/null
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Simple.cs
@@ -0,0 +1,9 @@
+namespace KurrentDB.SourceGenerators.Tests.Messaging.Simple {
+	[DerivedMessage(TestMessageGroup.Simple)]
+	public partial class A : Message {
+	}
+
+	[DerivedMessage(TestMessageGroup.Simple)]
+	public partial class B : Message {
+	}
+}
diff --git a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Simple.g.cs b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Simple.g.cs
similarity index 90%
rename from src/EventStore.SourceGenerators.Tests/Messaging/Cases/Simple.g.cs
rename to src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Simple.g.cs
index 041c7b6815e..1e5ae2a7287 100644
--- a/src/EventStore.SourceGenerators.Tests/Messaging/Cases/Simple.g.cs
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/Cases/Simple.g.cs
@@ -2,7 +2,7 @@
 using System.Threading;
 
 #pragma warning disable CS0108 // Member hides inherited member; missing new keyword
-namespace EventStore.SourceGenerators.Tests.Messaging.Simple
+namespace KurrentDB.SourceGenerators.Tests.Messaging.Simple
 {
 	public partial class A
 	{
diff --git a/src/KurrentDB.SourceGenerators.Tests/Messaging/GeneratorTests.cs b/src/KurrentDB.SourceGenerators.Tests/Messaging/GeneratorTests.cs
new file mode 100644
index 00000000000..d9f42c03021
--- /dev/null
+++ b/src/KurrentDB.SourceGenerators.Tests/Messaging/GeneratorTests.cs
@@ -0,0 +1,124 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using KurrentDB.SourceGenerators.Messaging;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Testing;
+using Microsoft.CodeAnalysis.Text;
+using Xunit;
+
+namespace KurrentDB.SourceGenerators.Tests.Messaging;
+
+using Test = CSharpSourceGeneratorVerifier<MessageSourceGenerator>.Test;
+
+public class GeneratorTests {
+	private static uint GenHash(int fileNumber) => (uint)$"/0/Test{fileNumber}.cs".GetHashCode();
+	private static string ReadFile(string fileName) => File.ReadAllText($"./Messaging/Cases/{fileName}");
+
+	private static async Task RunTestAsync(
+		string sourcePath,
+		string expectedPath,
+		params DiagnosticResult[] expectedDiagnostics) {
+
+		var test = new Test() {
+			TestState = {
+				Sources = {
+					ReadFile("Message.cs"),
+					ReadFile(sourcePath),
+				},
+				GeneratedSources = {
+					(
+						typeof(MessageSourceGenerator),
+						$"Test0-{GenHash(0)}.g.cs",
+						SourceText.From(ReadFile("Message.g.cs"), Encoding.UTF8, SourceHashAlgorithm.Sha256)
+					),
+					(
+						typeof(MessageSourceGenerator),
+						$"Test1-{GenHash(1)}.g.cs",
+						SourceText.From(ReadFile(expectedPath), Encoding.UTF8, SourceHashAlgorithm.Sha256)
+					)
+				},
+				AdditionalReferences = {
+					typeof(DerivedMessageAttribute).Assembly,
+				},
+			}
+		};
+
+		test.TestState.ExpectedDiagnostics.AddRange(expectedDiagnostics);
+
+		await test.RunAsync();
+	}
+
+	[Fact]
+	public async Task Simple() =>
+		await RunTestAsync("Simple.cs", "Simple.g.cs");
+
+	[Fact]
+	public async Task Abstract() =>
+		await RunTestAsync("Abstract.cs", "Abstract.g.cs");
+
+	[Fact]
+	public async Task FileScopedNamespace() =>
+		await RunTestAsync("FileScopedNamespace.cs", "FileScopedNamespace.g.cs");
+
+	[Fact]
+	public async Task Nested() =>
+		await RunTestAsync("Nested.cs", "Nested.g.cs");
+
+	[Fact]
+	public async Task NestedDerived() =>
+		await RunTestAsync("NestedDerived.cs", "NestedDerived.g.cs");
+
+	[Fact]
+	public async Task Impartial() =>
+		await RunTestAsync(
+			"Impartial.cs",
+			"Impartial.NOTCOMPILED.g.cs",
+			new DiagnosticResult("ESGEN001", DiagnosticSeverity.Error)
+				.WithSpan("/0/Test1.cs", 2, 2, 4, 3)
+				.WithMessage("Class \"A\" is not partial"),
+			new DiagnosticResult("CS0101", DiagnosticSeverity.Error)
+				.WithSpan(
+					$"KurrentDB.SourceGenerators{Path.DirectorySeparatorChar}" +
+					$"KurrentDB.SourceGenerators.Messaging.{nameof(MessageSourceGenerator)}{Path.DirectorySeparatorChar}" +
+					$"Test1-{GenHash(1)}.g.cs", 7, 15, 7, 16)
+				.WithArguments("A", "KurrentDB.SourceGenerators.Tests.Messaging.Impartial"));
+
+	[Fact]
+	public async Task ImpartialNested() =>
+		await RunTestAsync(
+			"ImpartialNested.cs",
+			"ImpartialNested.NOTCOMPILED.g.cs",
+			new DiagnosticResult("ESGEN001", DiagnosticSeverity.Error)
+				.WithSpan("/0/Test1.cs", 2, 2, 6, 3)
+				.WithMessage("Class \"N\" is not partial"),
+			new DiagnosticResult("CS0101", DiagnosticSeverity.Error)
+				.WithSpan(
+					$"KurrentDB.SourceGenerators{Path.DirectorySeparatorChar}" +
+					$"KurrentDB.SourceGenerators.Messaging.{nameof(MessageSourceGenerator)}{Path.DirectorySeparatorChar}" +
+					$"Test1-{GenHash(1)}.g.cs", 7, 15, 7, 16)
+				.WithArguments("N", "KurrentDB.SourceGenerators.Tests.Messaging.ImpartialNested"));
+
+	[Fact]
+	public async Task AbstractWithGroup() =>
+		await RunTestAsync(
+			"AbstractWithGroup.cs",
+			"AbstractWithGroup.NOTCOMPILED.g.cs",
+			new DiagnosticResult("ESGEN002", DiagnosticSeverity.Error)
+				.WithSpan("/0/Test1.cs", 2, 2, 4, 3)
+				.WithMessage("Abstract class \"A\" has a group specified")
+				.WithArguments("A"));
+
+	[Fact]
+	public async Task ConcreteWithoutGroup() =>
+		await RunTestAsync(
+			"ConcreteWithoutGroup.cs",
+			"ConcreteWithoutGroup.NOTCOMPILED.g.cs",
+			new DiagnosticResult("ESGEN003", DiagnosticSeverity.Error)
+				.WithSpan("/0/Test1.cs", 2, 2, 4, 3)
+				.WithMessage("Concrete class \"A\" does not have a group specified")
+				.WithArguments("A"));
+}
diff --git a/src/EventStore.SourceGenerators/EventStore.SourceGenerators.csproj b/src/KurrentDB.SourceGenerators/KurrentDB.SourceGenerators.csproj
similarity index 100%
rename from src/EventStore.SourceGenerators/EventStore.SourceGenerators.csproj
rename to src/KurrentDB.SourceGenerators/KurrentDB.SourceGenerators.csproj
diff --git a/src/KurrentDB.SourceGenerators/Messaging/ClassDeclarationGenerationExtensions.cs b/src/KurrentDB.SourceGenerators/Messaging/ClassDeclarationGenerationExtensions.cs
new file mode 100644
index 00000000000..7b7c2954a70
--- /dev/null
+++ b/src/KurrentDB.SourceGenerators/Messaging/ClassDeclarationGenerationExtensions.cs
@@ -0,0 +1,102 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace KurrentDB.SourceGenerators.Messaging;
+
+static class ClassDeclarationGenerationExtensions {
+	enum Kind {
+		None,
+		Base,
+		Derived,
+	};
+
+	public static bool TryGetBaseMessageAttribute(this ClassDeclarationSyntax node, out AttributeSyntax attributeSyntax) =>
+		node.TryGetAttribute("BaseMessage", minArgCount: 0, maxArgCount: 0, attributeSyntax: out attributeSyntax);
+
+	public static bool TryGetDerivedMessageAttribute(this ClassDeclarationSyntax node, out AttributeSyntax attributeSyntax) =>
+		node.TryGetAttribute("DerivedMessage", minArgCount: 0, maxArgCount: 1, attributeSyntax: out attributeSyntax);
+
+	public static ClassDeclarationSyntax AddGeneratedMembers(
+		this ClassDeclarationSyntax node,
+		GeneratorExecutionContext context,
+		ClassDeclarationSyntax originalNode) =>
+
+		GetStatsAttribute(originalNode) switch {
+			(Kind.None, _) => node,
+			(Kind.Base, _) => node.AddBaseStatsMembers(),
+			(Kind.Derived, var derivedMessageAttribute) =>
+				node.AddDerivedStatsMembers(context, originalNode, derivedMessageAttribute),
+			_ => throw new InvalidOperationException(),
+		};
+
+	static (Kind, AttributeSyntax) GetStatsAttribute(
+		ClassDeclarationSyntax node) {
+
+		if (node.TryGetBaseMessageAttribute(out var attributeSyntax)) {
+			return (Kind.Base, attributeSyntax);
+		}
+
+		if (node.TryGetDerivedMessageAttribute(out attributeSyntax)) {
+			return (Kind.Derived, attributeSyntax);
+		}
+
+		return (Kind.None, default);
+	}
+
+	public static ClassDeclarationSyntax AddBaseStatsMembers(this ClassDeclarationSyntax node) =>
+		node.AddMembers(AbstractLabel);
+
+	public static ClassDeclarationSyntax AddDerivedStatsMembers(
+		this ClassDeclarationSyntax node,
+		GeneratorExecutionContext context,
+		ClassDeclarationSyntax originalNode,
+		AttributeSyntax derivedMessageAttribute) {
+		var args = derivedMessageAttribute.ArgumentList;
+		var argsCount = args?.Arguments.Count ?? 0;
+		var isAbstract = node.Modifiers.Any(SyntaxKind.AbstractKeyword);
+		if (isAbstract) {
+			if (argsCount > 0) {
+				context.ReportAbstractMessageWithGroup(originalNode);
+			}
+		} else {
+			if (argsCount != 1) {
+				context.ReportConcreteMessageWithoutGroup(originalNode);
+			} else {
+				var label = $"{args.Arguments[0]}.{node.Identifier}"
+					.Replace('.', '-'); // because . would make for messy regexps
+				node = node.AddMembers(RegisterConcreteLabel(label));
+			}
+		}
+
+		return node;
+	}
+
+	private static readonly string[] AbstractLabel = new[] {
+		$"public virtual string Label => \"\";",
+	};
+
+	private static string[] RegisterConcreteLabel(string label) => new[] {
+		$"public static string OriginalLabelStatic {{ get; }} = \"{label}\";",
+		$"public static string LabelStatic {{ get; set; }} = \"{label}\";",
+		$"public override string Label => LabelStatic;",
+	};
+
+	public static ClassDeclarationSyntax AddMembers(this ClassDeclarationSyntax node, params string[] members) {
+		var parsed = members
+			.Select(static x => SyntaxFactory.ParseMemberDeclaration(x))
+			.ToArray();
+
+		for (var i = 0; i < parsed.Length; i++) {
+			if (parsed[i] is null)
+				throw new Exception($"Could not parse member: {members[i]}");
+		}
+
+		return node.AddMembers(parsed);
+	}
+}
\ No newline at end of file
diff --git a/src/KurrentDB.SourceGenerators/Messaging/ContextReportingExtensions.cs b/src/KurrentDB.SourceGenerators/Messaging/ContextReportingExtensions.cs
new file mode 100644
index 00000000000..bf98b8b2457
--- /dev/null
+++ b/src/KurrentDB.SourceGenerators/Messaging/ContextReportingExtensions.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace KurrentDB.SourceGenerators.Messaging;
+
+static class ContextReportingExtensions {
+	static readonly DiagnosticDescriptor _impartialMessage = new(
+		id: "ESGEN001",
+		title: "Messages must be partial classes",
+		messageFormat: "Class \"{0}\" is not partial",
+		category: "KurrentDB.Messaging",
+		DiagnosticSeverity.Error,
+		isEnabledByDefault: true);
+
+	static readonly DiagnosticDescriptor _abstractWithGroupMessage = new(
+		id: "ESGEN002",
+		title: "Abstract messages must not have a group specified",
+		messageFormat: "Abstract class \"{0}\" has a group specified",
+		category: "KurrentDB.Messaging",
+		DiagnosticSeverity.Error,
+		isEnabledByDefault: true);
+
+	static readonly DiagnosticDescriptor _concreteWithoutGroupMessage = new(
+		id: "ESGEN003",
+		title: "Concrete messages must have a group specified",
+		messageFormat: "Concrete class \"{0}\" does not have a group specified",
+		category: "KurrentDB.Messaging",
+		DiagnosticSeverity.Error,
+		isEnabledByDefault: true);
+
+	private static void Report(
+		this GeneratorExecutionContext context,
+		ClassDeclarationSyntax node,
+		DiagnosticDescriptor descriptor,
+		params object[] messageArgs) =>
+
+		context.ReportDiagnostic(Diagnostic.Create(descriptor, node.GetLocation(), messageArgs));
+
+	public static void ReportImpartialMessage(
+		this GeneratorExecutionContext context, ClassDeclarationSyntax node) =>
+		Report(context, node, _impartialMessage, node.Identifier);
+
+	public static void ReportAbstractMessageWithGroup(
+		this GeneratorExecutionContext context, ClassDeclarationSyntax node) =>
+		Report(context, node, _abstractWithGroupMessage, node.Identifier);
+
+	public static void ReportConcreteMessageWithoutGroup(
+		this GeneratorExecutionContext context, ClassDeclarationSyntax node) =>
+		Report(context, node, _concreteWithoutGroupMessage, node.Identifier);
+}
\ No newline at end of file
diff --git a/src/KurrentDB.SourceGenerators/Messaging/MessageSourceGenerator.cs b/src/KurrentDB.SourceGenerators/Messaging/MessageSourceGenerator.cs
new file mode 100644
index 00000000000..5adaaccf7c6
--- /dev/null
+++ b/src/KurrentDB.SourceGenerators/Messaging/MessageSourceGenerator.cs
@@ -0,0 +1,164 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+
+// for speed and simplicity this does all its generation based on the syntax tree and not on the semantic model
+// there are essentially three phases:
+// 1. use a SyntaxReceiver to detect and record uses of the attributes that we will generate code for
+// 2. Register each usage, discovering how they are related to each other in the abstract syntax tree, bottom-up
+// 3. Process the resulting relationship tree top-down, adding in the extra generated code that we want.
+// todo: consider incremental generators if necessary. for now it looks like the generator is run
+// only on build which could be sufficient for us
+namespace KurrentDB.SourceGenerators.Messaging;
+
+[Generator]
+public class MessageSourceGenerator : ISourceGenerator {
+	GeneratorExecutionContext _context;
+
+	public void Initialize(GeneratorInitializationContext context) {
+		context.RegisterForSyntaxNotifications(() => new SyntaxReceiver());
+	}
+
+	public void Execute(GeneratorExecutionContext context) {
+		try {
+			ExecuteImpl(context);
+		} catch (Exception ex) {
+			// tooling only shows the first line of the exception, so make the most of it
+			var stack = ex.StackTrace.Replace("\r\n", " >> ");
+			throw new Exception($"{ex.Message}. Stack: {stack}", ex);
+		}
+	}
+
+	void ExecuteImpl(GeneratorExecutionContext context) {
+		_context = context;
+
+		if (context.SyntaxReceiver is not SyntaxReceiver syntaxReceiver) {
+			throw new Exception("Unexpected syntax receiver");
+		}
+
+		var roots = new HashSet<CompilationUnitSyntax>();
+		var members = new MemberTree();
+		foreach (var candidate in syntaxReceiver.Candidates) {
+			RegisterMember(candidate, members, roots);
+		}
+
+		foreach (var node in roots) {
+			context.AddSource(
+				GenFileName(node),
+				SourceText.From(
+					GenSource(node, members),
+					Encoding.UTF8, SourceHashAlgorithm.Sha256));
+		}
+	}
+
+	string GenSource(CompilationUnitSyntax node, MemberTree members) => $@"// autogenerated
+using System.Threading;
+
+#pragma warning disable CS0108 // Member hides inherited member; missing new keyword
+{Transform(node, members).NormalizeWhitespace(indentation: "\t", eol: Environment.NewLine).ToFullString()}
+";
+
+	string GenFileName(SyntaxNode node) {
+		var path = node.SyntaxTree.FilePath;
+		var fileName = Path.GetFileNameWithoutExtension(path);
+		return $"{fileName}-{(uint)path.GetHashCode()}.g.cs";
+	}
+
+	void RegisterMember(MemberDeclarationSyntax member, MemberTree members, HashSet<CompilationUnitSyntax> roots) {
+		if (members.TryGetValue(member.Parent, out var siblings)) {
+			siblings.Add(member);
+		} else {
+			members[member.Parent] = new HashSet<MemberDeclarationSyntax> { member };
+			if (member.Parent is MemberDeclarationSyntax mds) {
+				RegisterMember(mds, members, roots);
+			} else if (member.Parent is CompilationUnitSyntax cus) {
+				roots.Add(cus);
+			} else {
+				throw new Exception($"Unexpected parent: \"{member.Parent.Kind()}\"");
+			}
+		}
+	}
+
+	CompilationUnitSyntax Transform(CompilationUnitSyntax node, MemberTree members) =>
+		SyntaxFactory
+			.CompilationUnit()
+			.AddMembers(TransformChildren(node, members));
+
+	MemberDeclarationSyntax[] TransformChildren(SyntaxNode node, MemberTree members) =>
+		members.TryGetValue(node, out var children)
+			? children
+				.Select(x => Transform(x, members))
+				.ToArray()
+			: Array.Empty<MemberDeclarationSyntax>();
+
+	MemberDeclarationSyntax Transform(MemberDeclarationSyntax node, MemberTree members) =>
+		node switch {
+			NamespaceDeclarationSyntax x => Transform(x, members),
+			FileScopedNamespaceDeclarationSyntax x => Transform(x, members),
+			ClassDeclarationSyntax x => Transform(x, members),
+			_ => throw new Exception($"Unexpected MemberDeclarationSyntax syntax: \"{node.Kind()}\"")
+		};
+
+	NamespaceDeclarationSyntax Transform(NamespaceDeclarationSyntax node, MemberTree members) =>
+		SyntaxFactory
+			.NamespaceDeclaration(
+				name: node.Name,
+				externs: default,
+				usings: node.Usings,
+				members: default)
+			.AddMembers(TransformChildren(node, members));
+
+	FileScopedNamespaceDeclarationSyntax Transform(FileScopedNamespaceDeclarationSyntax node, MemberTree members) =>
+		SyntaxFactory
+			.FileScopedNamespaceDeclaration(
+				attributeLists: default,
+				modifiers: default,
+				name: node.Name,
+				externs: default,
+				usings: node.Usings,
+				members: default)
+			.AddMembers(TransformChildren(node, members));
+
+	ClassDeclarationSyntax Transform(ClassDeclarationSyntax node, MemberTree members) {
+		if (!node.Modifiers.Any(SyntaxKind.PartialKeyword))
+			_context.ReportImpartialMessage(node);
+
+		return SyntaxFactory
+			.ClassDeclaration(
+				attributeLists: default,
+				modifiers: node.Modifiers,
+				identifier: node.Identifier,
+				typeParameterList: node.TypeParameterList,
+				baseList: default,
+				constraintClauses: default,
+				members: default)
+			.AddMembers(TransformChildren(node, members))
+			.AddGeneratedMembers(_context, node)
+			.WithoutTrivia();
+	}
+
+	class SyntaxReceiver : ISyntaxReceiver {
+		public List<MemberDeclarationSyntax> Candidates { get; } = new();
+
+		public void OnVisitSyntaxNode(SyntaxNode syntaxNode) {
+			if (syntaxNode is ClassDeclarationSyntax classDeclarationSyntax &&
+				(classDeclarationSyntax.TryGetDerivedMessageAttribute(out _) ||
+				 classDeclarationSyntax.TryGetBaseMessageAttribute(out _))) {
+
+				Candidates.Add(classDeclarationSyntax);
+			}
+		}
+	}
+
+	class MemberTree : Dictionary<SyntaxNode, HashSet<MemberDeclarationSyntax>> {
+	}
+}
\ No newline at end of file
diff --git a/src/KurrentDB.SourceGenerators/Messaging/SyntaxExtensions.cs b/src/KurrentDB.SourceGenerators/Messaging/SyntaxExtensions.cs
new file mode 100644
index 00000000000..57fcec021a3
--- /dev/null
+++ b/src/KurrentDB.SourceGenerators/Messaging/SyntaxExtensions.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace KurrentDB.SourceGenerators.Messaging;
+
+static class SyntaxExtensions {
+	public static bool TryGetAttribute(
+		this MemberDeclarationSyntax node,
+		string attributeName,
+		int minArgCount,
+		int maxArgCount,
+		out AttributeSyntax attributeSyntax) {
+
+		foreach (var attributeList in node.AttributeLists) {
+			foreach (var candidate in attributeList.Attributes) {
+				var actualArgCount = candidate.ArgumentList?.Arguments.Count ?? 0;
+				if (candidate.Name.ToString() == attributeName &&
+					actualArgCount >= minArgCount &&
+					actualArgCount <= maxArgCount) {
+
+					attributeSyntax = candidate;
+					return true;
+				}
+			}
+		}
+
+		attributeSyntax = default;
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/src/KurrentDB.SystemRuntime.Tests/KurrentDB.SystemRuntime.Tests.csproj b/src/KurrentDB.SystemRuntime.Tests/KurrentDB.SystemRuntime.Tests.csproj
new file mode 100644
index 00000000000..c8a850b1ee0
--- /dev/null
+++ b/src/KurrentDB.SystemRuntime.Tests/KurrentDB.SystemRuntime.Tests.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+		<!-- CVE-2018-8292 -->
+		<PackageReference Include="System.Net.Http" Version="4.3.4" />
+		<!-- CVE-2019-0820 -->
+		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
+		<PackageReference Include="xunit" Version="2.9.3" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="coverlet.collector" Version="6.0.4">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.SystemRuntime\KurrentDB.SystemRuntime.csproj" />
+		<ProjectReference Include="..\KurrentDB.Core\KurrentDB.Core.csproj" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.SystemRuntime.Tests/ProcessStatsTests.cs b/src/KurrentDB.SystemRuntime.Tests/ProcessStatsTests.cs
new file mode 100644
index 00000000000..3bbe654af45
--- /dev/null
+++ b/src/KurrentDB.SystemRuntime.Tests/ProcessStatsTests.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime;
+using System.Text;
+using KurrentDB.Core.TransactionLog.Unbuffered;
+using Xunit;
+
+namespace KurrentDB.SystemRuntime.Tests;
+
+public sealed class ProcessStatsTests : IDisposable {
+	private readonly DirectoryInfo _directory;
+
+	public ProcessStatsTests() {
+		string directoryPath = Path.Combine(Path.GetTempPath(), string.Format("ESX-{0}-{1}", Guid.NewGuid(), nameof(ProcessStatsTests)));
+		_directory = Directory.CreateDirectory(directoryPath);
+		var filePath = Path.Combine(directoryPath, "file.txt");
+		WriteAllText(filePath, "the data");
+		ReadAllText(filePath);
+	}
+
+	private static void ReadAllText(string path) {
+		// use UnbufferedFileStream to attempt to skip the OS's file cache
+		using var stream =
+			UnbufferedFileStream.Create(path, FileMode.Open, FileAccess.Read, FileShare.Read,
+				internalWriteBufferSize: 1024, internalReadBufferSize: 1024, writeThrough: false, minBlockSize: 1024);
+		var buffer = new byte[8];
+		stream.ReadExactly(buffer);
+		Assert.Equal("the data", Encoding.UTF8.GetString(buffer));
+	}
+
+	private static void WriteAllText(string path, string data) {
+		using var handle = File.OpenHandle(path, FileMode.Create, FileAccess.Write, FileShare.Read, FileOptions.WriteThrough);
+		RandomAccess.Write(handle, Encoding.UTF8.GetBytes(data), 0L);
+		RandomAccess.FlushToDisk(handle);
+	}
+
+	public void Dispose() {
+		_directory.Delete(recursive: true);
+	}
+
+	[Fact]
+	public void TestProcessStats() {
+		var diskIo = ProcessStats.GetDiskIo();
+
+		Assert.True(diskIo.ReadBytes > 0);
+		Assert.True(diskIo.WrittenBytes > 0);
+
+		if (RuntimeInformation.OsPlatform != RuntimeOSPlatform.OSX) {
+			// ops not supported on OSX
+			Assert.True(diskIo.ReadOps > 0);
+			Assert.True(diskIo.WriteOps > 0);
+		}
+	}
+}
diff --git a/src/KurrentDB.SystemRuntime.Tests/RuntimeInformationTests.cs b/src/KurrentDB.SystemRuntime.Tests/RuntimeInformationTests.cs
new file mode 100644
index 00000000000..7d2853d223a
--- /dev/null
+++ b/src/KurrentDB.SystemRuntime.Tests/RuntimeInformationTests.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Runtime;
+using Xunit;
+
+namespace KurrentDB.SystemRuntime.Tests;
+
+public class RuntimeInformationTests {
+	[Fact]
+	public void can_get_runtime_version() {
+		Assert.NotNull(RuntimeInformation.RuntimeVersion);
+	}
+
+	[Fact]
+	public void can_get_runtime_mode() {
+		Assert.True(RuntimeInformation.RuntimeMode > 0);
+	}
+}
diff --git a/src/KurrentDB.SystemRuntime/Diagnostics/DriveStats.cs b/src/KurrentDB.SystemRuntime/Diagnostics/DriveStats.cs
new file mode 100644
index 00000000000..a374cda74f9
--- /dev/null
+++ b/src/KurrentDB.SystemRuntime/Diagnostics/DriveStats.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+// ReSharper disable CheckNamespace
+
+using Serilog;
+
+namespace System.Diagnostics;
+
+public class DriveStats {
+	public static readonly ILogger Log = Serilog.Log.ForContext<DriveStats>();
+
+	public static DriveData GetDriveInfo(string path) {
+		try {
+			var info = new DriveInfo(Path.GetFullPath(path));
+			var target = info.Name;
+			var diskName = "";
+
+			// info.VolumeLabel looks like what we want but on linux it is just the name again.
+			// so we find the best match in the list of drives.
+			foreach (var candidate in DriveInfo.GetDrives()) {
+				if (target.StartsWith(candidate.Name, StringComparison.InvariantCultureIgnoreCase) &&
+					candidate.Name.StartsWith(diskName, StringComparison.InvariantCultureIgnoreCase)) {
+					diskName = candidate.Name;
+				}
+			}
+
+			return new DriveData(diskName, info.TotalSize, info.AvailableFreeSpace);
+
+		} catch (Exception ex) {
+			Log.Warning(ex, "Failed to retrieve drive stats for {Path}", path);
+			return new DriveData("Unknown", 0, 0);
+		}
+	}
+}
+
+/// <summary>
+/// Represents a data structure for drive information.
+/// </summary>
+/// <param name="DiskName">The name of the disk.</param>
+/// <param name="TotalBytes">The total size of the disk in bytes.</param>
+/// <param name="AvailableBytes">The available free space on the disk in bytes.</param>
+public readonly record struct DriveData(string DiskName, long TotalBytes, long AvailableBytes) {
+	/// <summary>
+	/// The used space on the disk in bytes.
+	/// </summary>
+	public long UsedBytes { get; } = TotalBytes - AvailableBytes;
+
+	/// <summary>
+	/// The usage of the disk as a percentage of the total size.
+	/// </summary>
+	public int Usage { get; } = (int)(TotalBytes != 0 ? (TotalBytes - AvailableBytes) * 100 / TotalBytes : 0);
+}
diff --git a/src/KurrentDB.SystemRuntime/Diagnostics/Interop/OsxNative.cs b/src/KurrentDB.SystemRuntime/Diagnostics/Interop/OsxNative.cs
new file mode 100644
index 00000000000..e08d019be0c
--- /dev/null
+++ b/src/KurrentDB.SystemRuntime/Diagnostics/Interop/OsxNative.cs
@@ -0,0 +1,138 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+// ReSharper disable InconsistentNaming
+// ReSharper disable CheckNamespace
+
+using System.Runtime;
+using System.Runtime.InteropServices;
+
+namespace System.Diagnostics.Interop;
+
+public static partial class OsxNative {
+	public static partial class IO {
+		public static DiskIoData GetDiskIo(int processId) {
+			const int PROC_PID_RUSAGE = 2;
+			const int PROC_PID_RUSAGE_SIZE = 232;
+
+			var buffer = Marshal.AllocHGlobal(PROC_PID_RUSAGE_SIZE);
+			try {
+				if (proc_pidinfo(processId, PROC_PID_RUSAGE, 0, buffer, PROC_PID_RUSAGE_SIZE) != PROC_PID_RUSAGE_SIZE)
+					throw GetLastExternalException($"Failed to get {RuntimeOSPlatform.OSX} usage info to extract disk I/O");
+
+				var info = Marshal.PtrToStructure<rusage_info_v4>(buffer);
+				return new(info.ri_diskio_bytesread, info.ri_diskio_byteswritten, 0, 0);
+			} finally {
+				Marshal.FreeHGlobal(buffer);
+			}
+		}
+
+		#region . native .
+
+		[LibraryImport("libproc.dylib", SetLastError = true)]
+		private static partial int proc_pidinfo(int pid, int flavor, ulong arg, IntPtr buffer, int buffersize);
+
+		[StructLayout(LayoutKind.Sequential)]
+		private struct rusage_info_v4 {
+			[MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+			public byte[] ri_uuid;
+
+			public ulong ri_user_time;
+			public ulong ri_system_time;
+			public ulong ri_pkg_idle_wkups;
+			public ulong ri_interrupt_wkups;
+			public ulong ri_pageins;
+			public ulong ri_wired_size;
+			public ulong ri_resident_size;
+			public ulong ri_phys_footprint;
+			public ulong ri_proc_start_abstime;
+			public ulong ri_proc_exit_abstime;
+			public ulong ri_child_user_time;
+			public ulong ri_child_system_time;
+			public ulong ri_child_pkg_idle_wkups;
+			public ulong ri_child_interrupt_wkups;
+			public ulong ri_child_pageins;
+			public ulong ri_child_elapsed_abstime;
+			public ulong ri_diskio_bytesread;
+			public ulong ri_diskio_byteswritten;
+			public ulong ri_cpu_time_qos_default;
+			public ulong ri_cpu_time_qos_maintenance;
+			public ulong ri_cpu_time_qos_background;
+			public ulong ri_cpu_time_qos_utility;
+			public ulong ri_cpu_time_qos_legacy;
+			public ulong ri_cpu_time_qos_user_initiated;
+			public ulong ri_cpu_time_qos_user_interactive;
+			public ulong ri_billed_system_time;
+			public ulong ri_serviced_system_time;
+			public ulong ri_logical_writes;
+		}
+
+		#endregion
+	}
+
+	public static partial class Memory {
+		public static long GetFreeMemory() {
+			const int HOST_VM_INFO64 = 4;
+			const int KERN_SUCCESS = 0;
+
+			var host = mach_host_self();
+
+			if (host_page_size(host, out var page_size) != KERN_SUCCESS)
+				throw GetLastExternalException($"Failed to get {RuntimeOSPlatform.OSX} host page size to calculate free memory");
+
+			var count = (uint)Marshal.SizeOf<vm_statistics64>() / sizeof(uint);
+			if (host_statistics64(host, HOST_VM_INFO64, out var vmStats, ref count) != KERN_SUCCESS)
+				throw GetLastExternalException($"Failed to get {RuntimeOSPlatform.OSX} host statistics to calculate free memory");
+
+			return (long)vmStats.free_count * page_size;
+		}
+
+		#region . native .
+
+		[LibraryImport("libSystem.dylib", SetLastError = true)]
+		private static partial IntPtr mach_host_self();
+
+		[LibraryImport("libSystem.dylib", SetLastError = true)]
+		private static partial int host_page_size(IntPtr host, out uint page_size);
+
+		[LibraryImport("libSystem.dylib", SetLastError = true)]
+		private static partial int host_statistics64(IntPtr host, int flavor, out vm_statistics64 vmStats, ref uint count);
+
+		[StructLayout(LayoutKind.Sequential)]
+		private struct vm_statistics64 {
+			public uint free_count;                             // # of pages free
+			public uint active_count;                           // # of pages active
+			public uint inactive_count;                         // # of pages inactive
+			public uint wire_count;                             // # of pages wired down
+			public uint zero_fill_count;                        // # of zero fill pages
+			public uint reactivations;                          // # of pages reactivated
+			public uint pageins;                                // # of pageins
+			public uint pageouts;                               // # of pageouts
+			public uint faults;                                 // # of faults
+			public uint cow_faults;                             // # of copy-on-writes
+			public uint lookups;                                // object cache lookups
+			public uint hits;                                   // object cache hits
+			public uint purges;                                 // # of pages purged
+			public uint purgeable_count;                        // # of pages purgeable
+			public uint speculative_count;                      // # of pages speculative
+			public ulong decompressions;                         // # of pages decompressed
+			public ulong compressions;                           // # of pages compressed
+			public ulong swapins;                                // # of pages swapped in (via compression segments)
+			public ulong swapouts;                               // # of pages swapped out (via compression segments)
+			public uint compressor_page_count;                  // # of pages used by the compressed pager to hold all the compressed data
+			public uint throttled_count;                        // # of pages throttled
+			public uint external_page_count;                    // # of pages that are file-backed (non-swap)
+			public uint internal_page_count;                    // # of pages that are anonymous
+			public uint total_uncompressed_pages_in_compressor; // # of pages (uncompressed) held within the compressor.
+		}
+
+		#endregion
+	}
+
+	static ExternalException GetLastExternalException(string errorMessage) {
+		var errorCode = Marshal.GetLastPInvokeError();
+		return errorCode != 0
+			? new ExternalException($"{errorMessage}. P/Invoke error code: {errorCode}. Message: {Marshal.GetLastPInvokeErrorMessage()}")
+			: new ExternalException(errorMessage);
+	}
+}
diff --git a/src/KurrentDB.SystemRuntime/Diagnostics/Interop/WindowsNative.cs b/src/KurrentDB.SystemRuntime/Diagnostics/Interop/WindowsNative.cs
new file mode 100644
index 00000000000..b0d08d895d5
--- /dev/null
+++ b/src/KurrentDB.SystemRuntime/Diagnostics/Interop/WindowsNative.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+// ReSharper disable CheckNamespace
+// ReSharper disable InconsistentNaming
+
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+
+namespace System.Diagnostics.Interop;
+
+public static partial class WindowsNative {
+	public static partial class IO {
+		public static DiskIoData GetDiskIo(Process process) {
+			if (GetProcessIoCounters(process.Handle, out var counters)) {
+				return new() {
+					ReadBytes = counters.ReadTransferCount,
+					WrittenBytes = counters.WriteTransferCount,
+					ReadOps = counters.ReadOperationCount,
+					WriteOps = counters.WriteOperationCount
+				};
+			}
+
+			throw new Win32Exception();
+		}
+
+		public static DiskIoData GetDiskIo() =>
+			GetDiskIo(Process.GetCurrentProcess());
+
+		#region . native .
+
+		// http://msdn.microsoft.com/en-us/library/ms683218%28VS.85%29.aspx
+		[StructLayout(LayoutKind.Sequential)]
+		private struct IO_COUNTERS {
+			public ulong ReadOperationCount;
+			public ulong WriteOperationCount;
+			public ulong OtherOperationCount;
+			public ulong ReadTransferCount;
+			public ulong WriteTransferCount;
+			public ulong OtherTransferCount;
+		}
+
+		[return: MarshalAs(UnmanagedType.Bool)]
+		[LibraryImport("kernel32.dll", SetLastError = true)]
+		private static partial bool GetProcessIoCounters(IntPtr processHandle, out IO_COUNTERS ioCounters);
+
+		#endregion
+	}
+}
diff --git a/src/KurrentDB.SystemRuntime/Diagnostics/Interop/WindowsProcessUtil.cs b/src/KurrentDB.SystemRuntime/Diagnostics/Interop/WindowsProcessUtil.cs
new file mode 100644
index 00000000000..c2b44ee3f73
--- /dev/null
+++ b/src/KurrentDB.SystemRuntime/Diagnostics/Interop/WindowsProcessUtil.cs
@@ -0,0 +1,168 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+// ReSharper disable CheckNamespace
+
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.ComTypes;
+using Serilog;
+using RuntimeInformation = System.Runtime.RuntimeInformation;
+
+namespace System.Diagnostics;
+
+/*Courtesy of Eric Johannsen: https://stackoverflow.com/a/20623311*/
+public static class WindowsProcessUtil {
+	[StructLayout(LayoutKind.Sequential)]
+	struct RM_UNIQUE_PROCESS {
+		public int dwProcessId;
+		public FILETIME ProcessStartTime;
+	}
+
+	const int RmRebootReasonNone = 0;
+	const int CCH_RM_MAX_APP_NAME = 255;
+	const int CCH_RM_MAX_SVC_NAME = 63;
+
+	enum RM_APP_TYPE {
+		RmUnknownApp = 0,
+		RmMainWindow = 1,
+		RmOtherWindow = 2,
+		RmService = 3,
+		RmExplorer = 4,
+		RmConsole = 5,
+		RmCritical = 1000
+	}
+
+	[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+	struct RM_PROCESS_INFO {
+		public RM_UNIQUE_PROCESS Process;
+
+		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = CCH_RM_MAX_APP_NAME + 1)]
+		public string strAppName;
+
+		[MarshalAs(UnmanagedType.ByValTStr, SizeConst = CCH_RM_MAX_SVC_NAME + 1)]
+		public string strServiceShortName;
+
+		public RM_APP_TYPE ApplicationType;
+		public uint AppStatus;
+		public uint TSSessionId;
+		[MarshalAs(UnmanagedType.Bool)] public bool bRestartable;
+	}
+
+	[DllImport("rstrtmgr.dll", CharSet = CharSet.Unicode)]
+	static extern int RmRegisterResources(uint pSessionHandle,
+		UInt32 nFiles,
+		string[] rgsFilenames,
+		UInt32 nApplications,
+		[In] RM_UNIQUE_PROCESS[] rgApplications,
+		UInt32 nServices,
+		string[] rgsServiceNames);
+
+	[DllImport("rstrtmgr.dll", CharSet = CharSet.Auto)]
+	static extern int RmStartSession(out uint pSessionHandle, int dwSessionFlags, string strSessionKey);
+
+	[DllImport("rstrtmgr.dll")]
+	static extern int RmEndSession(uint pSessionHandle);
+
+	[DllImport("rstrtmgr.dll")]
+	static extern int RmGetList(uint dwSessionHandle,
+		out uint pnProcInfoNeeded,
+		ref uint pnProcInfo,
+		[In, Out] RM_PROCESS_INFO[] rgAffectedApps,
+		ref uint lpdwRebootReasons);
+
+	/// <summary>
+	/// Find out what process(es) have a lock on the specified file.
+	/// </summary>
+	/// <param name="path">Path of the file.</param>
+	/// <returns>Processes locking the file</returns>
+	/// <remarks>See also:
+	/// http://msdn.microsoft.com/en-us/library/windows/desktop/aa373661(v=vs.85).aspx
+	/// </remarks>
+	static List<Process> WhoIsLocking(string path) {
+		uint handle;
+		var key = Guid.NewGuid().ToString();
+		List<Process> processes = [];
+
+		var res = RmStartSession(out handle, 0, key);
+		if (res != 0)
+			throw new Exception("Could not begin restart session.  Unable to determine file locker.");
+
+		try {
+			const int ERROR_MORE_DATA = 234;
+
+			uint pnProcInfoNeeded = 0,
+				pnProcInfo = 0,
+				lpdwRebootReasons = RmRebootReasonNone;
+
+			var resources = new string[] { path }; // Just checking on one resource.
+
+			res = RmRegisterResources(handle, (uint)resources.Length, resources, 0, null!, 0, null!);
+
+			if (res != 0)
+				throw new Exception("Could not register resource.");
+
+			//Note: there's a race condition here -- the first call to RmGetList() returns
+			//      the total number of process. However, when we call RmGetList() again to get
+			//      the actual processes this number may have increased.
+			res = RmGetList(handle, out pnProcInfoNeeded, ref pnProcInfo, null!, ref lpdwRebootReasons);
+
+			if (res == ERROR_MORE_DATA) {
+				// Create an array to store the process results
+				RM_PROCESS_INFO[] processInfo = new RM_PROCESS_INFO[pnProcInfoNeeded];
+				pnProcInfo = pnProcInfoNeeded;
+
+				// Get the list
+				res = RmGetList(handle, out pnProcInfoNeeded, ref pnProcInfo, processInfo, ref lpdwRebootReasons);
+				if (res == 0) {
+					processes = new((int)pnProcInfo);
+
+					// Enumerate all the results and add them to the
+					// list to be returned
+					for (var i = 0; i < pnProcInfo; i++) {
+						try {
+							processes.Add(Process.GetProcessById(processInfo[i].Process.dwProcessId));
+						}
+						// catch the error -- in case the process is no longer running
+						catch (ArgumentException) {
+						}
+					}
+				} else
+					throw new Exception("Could not list processes locking resource.");
+			} else if (res != 0)
+				throw new Exception("Could not list processes locking resource. Failed to get size of result.");
+		} finally {
+			RmEndSession(handle);
+		}
+
+		return processes;
+	}
+
+	public static bool TryGetWhoIsLocking(string path, out List<Process> processes, out Exception? error) {
+		if (!RuntimeInformation.IsWindows) {
+			processes = [];
+			error = null;
+			return false;
+		}
+
+		try {
+			processes = WhoIsLocking(path);
+			error = null;
+			return true;
+		} catch (Exception ex) {
+			processes = [];
+			error = ex;
+			return false;
+		}
+	}
+
+	public static void PrintWhoIsLocking(string path, ILogger logger) {
+		logger.Information("Trying to retrieve list of processes having a file handle open on {Path} (requires admin privileges)", path);
+		if (TryGetWhoIsLocking(path, out var processes, out var error))
+			logger.Information(
+				$"Processes locking {{Path}}:{Environment.NewLine}{{ProcessList}}",
+				path, string.Join(Environment.NewLine, processes.Select(x => $"[{x.Id}] {x.MainModule?.FileName}"))
+			);
+		else
+			logger.Error(error, "Could not retrieve list of processes using file handle {Path}", path);
+	}
+}
diff --git a/src/KurrentDB.SystemRuntime/Diagnostics/ProcessStats.cs b/src/KurrentDB.SystemRuntime/Diagnostics/ProcessStats.cs
new file mode 100644
index 00000000000..930d9197822
--- /dev/null
+++ b/src/KurrentDB.SystemRuntime/Diagnostics/ProcessStats.cs
@@ -0,0 +1,107 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+// ReSharper disable CheckNamespace
+
+using System.Runtime;
+using OsxNative = System.Diagnostics.Interop.OsxNative;
+using WindowsNative = System.Diagnostics.Interop.WindowsNative;
+
+namespace System.Diagnostics;
+
+[PublicAPI]
+public static class ProcessStats {
+	public static DiskIoData GetDiskIo(Process process) {
+		return RuntimeInformation.OsPlatform switch {
+			RuntimeOSPlatform.Linux => GetDiskIoLinux(process),
+			RuntimeOSPlatform.OSX => GetDiskIoOsx(process),
+			RuntimeOSPlatform.Windows => GetDiskIoWindows(process),
+			RuntimeOSPlatform.FreeBSD => default,
+			_ => throw new NotSupportedException("Operating system not supported")
+		};
+
+		static DiskIoData GetDiskIoLinux(Process process) {
+			var procIoFile = $"/proc/{process.Id}/io";
+
+			try {
+				var result = new DiskIoData();
+
+				foreach (var line in File.ReadLines(procIoFile)) {
+					if (TryExtractIoValue(line, "read_bytes", out var readBytes))
+						result = result with { ReadBytes = readBytes };
+					else if (TryExtractIoValue(line, "write_bytes", out var writeBytes))
+						result = result with { WrittenBytes = writeBytes };
+					else if (TryExtractIoValue(line, "syscr", out var readOps))
+						result = result with { ReadOps = readOps };
+					else if (TryExtractIoValue(line, "syscw", out var writeOps)) {
+						result = result with { WriteOps = writeOps };
+					}
+
+					if (result.ReadBytes is not 0 &&
+						result.WrittenBytes is not 0 &&
+						result.ReadOps is not 0 &&
+						result.WriteOps is not 0)
+						break;
+				}
+
+				return result;
+			} catch (Exception ex) {
+				throw new ApplicationException("Failed to get Linux process I/O info", ex);
+			}
+
+			static bool TryExtractIoValue(string line, string key, out ulong value) {
+				if (line.StartsWith(key)) {
+					var rawValue = line[(key.Length + 1)..].Trim(); // handle the `:` character
+					value = Convert.ToUInt64(rawValue);
+					return true;
+				}
+
+				value = 0;
+				return false;
+			}
+		}
+
+		static DiskIoData GetDiskIoOsx(Process process) =>
+			OsxNative.IO.GetDiskIo(process.Id);
+
+		static DiskIoData GetDiskIoWindows(Process process) =>
+			WindowsNative.IO.GetDiskIo(process);
+	}
+
+	public static DiskIoData GetDiskIo() =>
+		GetDiskIo(Process.GetCurrentProcess());
+}
+
+/// <summary>
+/// Represents a record struct for Disk I/O data.
+/// </summary>
+public readonly record struct DiskIoData {
+	public DiskIoData() { }
+
+	public DiskIoData(ulong readBytes, ulong writtenBytes, ulong readOps, ulong writeOps) {
+		ReadBytes = readBytes;
+		WrittenBytes = writtenBytes;
+		ReadOps = readOps;
+		WriteOps = writeOps;
+	}
+
+	/// <summary>
+	/// Gets or sets the number of bytes read.
+	/// </summary>
+	public ulong ReadBytes { get; init; }
+
+	/// <summary>
+	/// Gets or sets the number of bytes written.
+	/// </summary>
+	public ulong WrittenBytes { get; init; }
+
+	/// <summary>
+	/// Gets or sets the number of read operations.
+	/// </summary>
+	public ulong ReadOps { get; init; }
+
+	/// <summary>
+	/// Gets or sets the number of write operations.
+	/// </summary>
+	public ulong WriteOps { get; init; }
+}
diff --git a/src/KurrentDB.SystemRuntime/Diagnostics/RuntimeStats.cs b/src/KurrentDB.SystemRuntime/Diagnostics/RuntimeStats.cs
new file mode 100644
index 00000000000..f33717131ad
--- /dev/null
+++ b/src/KurrentDB.SystemRuntime/Diagnostics/RuntimeStats.cs
@@ -0,0 +1,186 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+// ReSharper disable CheckNamespace
+
+using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.Interop;
+using System.Runtime;
+using static System.Convert;
+using static System.Globalization.CultureInfo;
+using static System.Reflection.BindingFlags;
+
+namespace System.Diagnostics;
+
+[PublicAPI]
+public static class RuntimeStats {
+	static RuntimeStats() {
+		GetCpuUsageInternal = typeof(GC)
+			.Assembly
+			.GetType("System.Diagnostics.Tracing.RuntimeEventSourceHelper")!
+			.GetMethod("GetCpuUsage", Static | NonPublic)!
+			.CreateDelegate<Func<double>>();
+
+		GetExceptionCountInternal = typeof(Exception)
+			.GetMethod("GetExceptionCount", Static | NonPublic)!
+			.CreateDelegate<Func<uint>>();
+
+		GetLastGCPercentTimeInGCInternal = typeof(GC)
+			.GetMethod("GetLastGCPercentTimeInGC", Static | NonPublic)!
+			.CreateDelegate<Func<int>>();
+	}
+
+	static Func<double> GetCpuUsageInternal { get; }
+	static Func<uint> GetExceptionCountInternal { get; }
+	static Func<int> GetLastGCPercentTimeInGCInternal { get; }
+
+	public static double GetCpuUsage() => GetCpuUsageInternal();
+
+	public static int GetExceptionCount() => (int)GetExceptionCountInternal();
+
+	public static int GetLastGCPercentTimeInGC() => GetLastGCPercentTimeInGCInternal();
+
+	public static long GetTotalMemory() =>
+		GC.GetGCMemoryInfo(GCKind.Background).TotalAvailableMemoryBytes;
+
+	public static ValueTask<long> GetFreeMemoryAsync() {
+		return RuntimeInformation.OsPlatform switch {
+			RuntimeOSPlatform.Linux => GetFreeMemoryLinux(),
+			RuntimeOSPlatform.FreeBSD => GetFreeMemoryLinux(),
+			RuntimeOSPlatform.OSX => GetFreeMemoryOSX(true),
+			RuntimeOSPlatform.Windows => GetFreeMemoryWindows(),
+			_ => throw new NotSupportedException("Operating system not supported")
+		};
+
+		static async ValueTask<long> GetFreeMemoryLinux() {
+			var output = await ExecuteShellCommandAsync("grep MemAvailable /proc/meminfo");
+			var parts = output.Split(' ', StringSplitOptions.RemoveEmptyEntries);
+			var value = ToInt64(parts[1]) * 1024; // Convert KB to bytes
+			return value;
+		}
+
+		static async ValueTask<long> GetFreeMemoryOSX(bool native = false) {
+			if (native)
+				return OsxNative.Memory.GetFreeMemory();
+
+			var output = await ExecuteShellCommandAsync("vm_stat | head -n 2");
+
+			var lines = output.Split('\n');
+			var value = ParseFreePages(lines[1]) * ParsePageSize(lines[0]);
+
+			return value;
+
+			static long ParsePageSize(string line) =>
+				ToInt64(line.Split(' ', StringSplitOptions.RemoveEmptyEntries)[7]);
+
+			static long ParseFreePages(string line) =>
+				ToInt64(line.Split(' ', StringSplitOptions.RemoveEmptyEntries)[2].TrimEnd('.'));
+		}
+
+		[SuppressMessage("Interoperability", "CA1416:Validate platform compatibility")]
+		static ValueTask<long> GetFreeMemoryWindows() {
+			using var counter = new PerformanceCounter("Memory", "Available Bytes");
+			var value = ToInt64(counter.NextValue());
+			return ValueTask.FromResult(value);
+		}
+	}
+
+	public static ValueTask<(double OneMinute, double FiveMinutes, double FifteenMinutes)> GetCpuLoadAveragesAsync() {
+		return RuntimeInformation.OsPlatform switch {
+			RuntimeOSPlatform.Linux => GetLoadAveragesLinux(),
+			RuntimeOSPlatform.FreeBSD => GetLoadAveragesFreeBSD(),
+			RuntimeOSPlatform.OSX => GetLoadAveragesMac(),
+			RuntimeOSPlatform.Windows => default,
+			_ => throw new NotSupportedException("Operating system not supported")
+		};
+
+		static async ValueTask<(double OneMinute, double FiveMinutes, double FifteenMinutes)> GetLoadAveragesLinux() {
+			// On Linux, the /proc/loadavg file provides load averages along with some additional scheduling information.
+			// The file typically looks something like this:
+			//
+			// 0.01 0.05 0.05 1/789 12345
+			//
+			// Here:
+			//
+			// - 0.01 is the 1-minute load average.
+			// - 0.05 is the 5-minute load average.
+			// - 0.05 is the 15-minute load average.
+			// - 1/789 indicates the number of currently running processes over the total number of processes.
+			// - 12345 is the last process ID used.
+
+			var output = await ExecuteShellCommandAsync("grep -Eo '^[^ ]+ [^ ]+ [^ ]+' /proc/loadavg");
+			var values = output.Split(' ');
+
+			return (
+				OneMinute: ToDouble(values[0], InvariantCulture),
+				FiveMinutes: ToDouble(values[1], InvariantCulture),
+				FifteenMinutes: ToDouble(values[2], InvariantCulture)
+			);
+		}
+
+		static async ValueTask<(double OneMinute, double FiveMinutes, double FifteenMinutes)> GetLoadAveragesMac() {
+			// On macOS, the uptime command might give you something like this:
+			//
+			// 14:55  up 10 days,  4:02, 4 users, load averages: 2.43 2.72 2.89
+			//
+			// Here:
+			//
+			// - 2.43 is the 1-minute load average.
+			// - 2.72 is the 5-minute load average.
+			// - 2.89 is the 15-minute load average.
+
+			var output = await ExecuteShellCommandAsync("uptime");
+			var startIndex = output.LastIndexOf(':') + 1; // find the last colon and start right after it
+			var loadAverages = output[startIndex..].Trim();
+			var values = loadAverages.Split(' ', StringSplitOptions.RemoveEmptyEntries);
+
+			return (
+				OneMinute: ToDouble(values[0], InvariantCulture),
+				FiveMinutes: ToDouble(values[1], InvariantCulture),
+				FifteenMinutes: ToDouble(values[2], InvariantCulture)
+			);
+		}
+
+		static async ValueTask<(double OneMinute, double FiveMinutes, double FifteenMinutes)> GetLoadAveragesFreeBSD() {
+			// works on macOS as well
+			// Example output: "{ 0.12 0.26 0.21 }"
+			var output = await ExecuteShellCommandAsync("sysctl -n vm.loadavg");
+			var values = output.Trim('{', '}', ' ').Split(' ');
+
+			return (
+				OneMinute: ToDouble(values[0], InvariantCulture),
+				FiveMinutes: ToDouble(values[1], InvariantCulture),
+				FifteenMinutes: ToDouble(values[2], InvariantCulture)
+			);
+		}
+	}
+
+	public static long GetFreeMemory() =>
+		GetFreeMemoryAsync().AsTask().GetAwaiter().GetResult();
+
+	public static (double OneMinute, double FiveMinutes, double FifteenMinutes) GetCpuLoadAverages() =>
+		GetCpuLoadAveragesAsync().AsTask().GetAwaiter().GetResult();
+
+	static async ValueTask<string> ExecuteShellCommandAsync(string command) {
+		var escapedArgs = command.Replace(@"\", @"\\");
+
+		var psi = new ProcessStartInfo {
+			FileName = "/bin/sh",
+			Arguments = $"-c \"{escapedArgs}\"",
+			RedirectStandardOutput = true,
+			UseShellExecute = false,
+			CreateNoWindow = true,
+		};
+
+		using var process = Process.Start(psi);
+
+		if (process is null)
+			throw new InvalidOperationException($"Could not start sh process to execute: {psi.FileName} {psi.Arguments}");
+
+		var result = await process.StandardOutput.ReadToEndAsync();
+
+		await process.WaitForExitAsync();
+
+		return result.Trim();
+	}
+}
diff --git a/src/KurrentDB.SystemRuntime/KurrentDB.SystemRuntime.csproj b/src/KurrentDB.SystemRuntime/KurrentDB.SystemRuntime.csproj
new file mode 100644
index 00000000000..83af62117f0
--- /dev/null
+++ b/src/KurrentDB.SystemRuntime/KurrentDB.SystemRuntime.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+	</PropertyGroup>
+
+	<ItemGroup>
+	  <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
+	  <PackageReference Include="Serilog" Version="4.0.1" />
+	  <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Using Include="JetBrains.Annotations" />
+	</ItemGroup>
+
+</Project>
diff --git a/src/KurrentDB.SystemRuntime/RuntimeInformation.cs b/src/KurrentDB.SystemRuntime/RuntimeInformation.cs
new file mode 100644
index 00000000000..33b1ad7c964
--- /dev/null
+++ b/src/KurrentDB.SystemRuntime/RuntimeInformation.cs
@@ -0,0 +1,136 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+// ReSharper disable CheckNamespace
+// ReSharper disable InconsistentNaming
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+using static System.Environment;
+using static System.Runtime.InteropServices.RuntimeInformation;
+using static System.String;
+
+namespace System.Runtime;
+
+[PublicAPI]
+public static class RuntimeInformation {
+	static RuntimeInformation() {
+		if (IsOSPlatform(OSPlatform.OSX)) {
+			OsPlatform = RuntimeOSPlatform.OSX;
+			IsOSX = true;
+		} else if (IsOSPlatform(OSPlatform.Linux)) {
+			OsPlatform = RuntimeOSPlatform.Linux;
+			IsLinux = true;
+		} else if (IsOSPlatform(OSPlatform.Windows)) {
+			OsPlatform = RuntimeOSPlatform.Windows;
+			IsWindows = true;
+		} else if (IsOSPlatform(OSPlatform.FreeBSD)) {
+			OsPlatform = RuntimeOSPlatform.FreeBSD;
+			IsFreeBSD = true;
+		} else
+			OsPlatform = RuntimeOSPlatform.Unknown;
+
+		IsUnix = IsLinux || IsFreeBSD || IsOSX;
+
+		IsRunningInContainer = !IsNullOrEmpty(GetEnvironmentVariable("DOTNET_RUNNING_IN_CONTAINER"));
+		IsRunningInKubernetes = !IsNullOrEmpty(GetEnvironmentVariable("KUBERNETES_SERVICE_HOST"));
+
+		Host = DotNetHostInfo.Collect();
+		RuntimeVersion = Host.RuntimeVersion;
+		RuntimeMode = Host.Mode;
+
+		HomeFolder = GetFolderPath(SpecialFolder.UserProfile);
+	}
+
+	/// <summary>
+	/// Indicates if the current process is running in a container.
+	/// </summary>
+	public static readonly bool IsRunningInContainer;
+
+	/// <summary>
+	/// Indicates if the current process is running in a Kubernetes cluster.
+	/// </summary>
+	public static readonly bool IsRunningInKubernetes;
+
+	/// <summary>
+	/// The operating system platform the current process is running on.
+	/// </summary>
+	public static readonly RuntimeOSPlatform OsPlatform;
+
+	/// <summary>
+	/// Indicates if the current operating system is Linux.
+	/// </summary>
+	public static readonly bool IsLinux;
+
+	/// <summary>
+	/// Indicates if the current operating system is Windows.
+	/// </summary>
+	public static readonly bool IsWindows;
+
+	/// <summary>
+	/// Indicates if the current operating system is macOS.
+	/// </summary>
+	public static readonly bool IsOSX;
+
+	/// <summary>
+	/// Indicates if the current operating system is FreeBSD.
+	/// </summary>
+	public static readonly bool IsFreeBSD;
+
+	/// <summary>
+	/// Indicates if the current operating system is a Unix-based system (Linux, FreeBSD or macOS).
+	/// </summary>
+	public static readonly bool IsUnix;
+
+	/// <summary>
+	/// Information about the .NET host environment.
+	/// This includes details such as the version of the .NET runtime, the architecture, the mode (e.g., 64 for a 64-bit runtime), the commit hash of the .NET runtime, and a custom runtime version of the .NET host.
+	/// </summary>
+	public static readonly DotNetHostInfo Host;
+
+	/// <summary>
+	/// The user's profile folder.
+	/// </summary>
+	/// <remarks>
+	/// Applications should not create files or folders at this level; they should put their data under the locations referred to by <see cref="F:System.Environment.SpecialFolder.ApplicationData" />.
+	/// </remarks>
+	public static readonly string HomeFolder;
+
+	/// <summary>
+	/// Custom runtime version of the .NET host.
+	/// </summary>
+	public static readonly string RuntimeVersion;
+
+	/// <summary>
+	/// The mode of the .NET runtime, represented as the size of a pointer (e.g., 64 for a 64-bit runtime).
+	/// </summary>
+	public static readonly int RuntimeMode;
+}
+
+/// <summary>
+/// Represents information about the .NET host environment.
+/// </summary>
+/// <param name="Version">The version of the .NET runtime.</param>
+/// <param name="Architecture">The architecture of the .NET runtime (e.g., x64, arm64).</param>
+/// <param name="Mode">The mode of the .NET runtime, represented as the size of a pointer (e.g., 64 for a 64-bit runtime).</param>
+/// <param name="Commit">The commit hash of the .NET runtime.</param>
+/// <param name="RuntimeVersion">Custom runtime version of the .NET host.</param>
+public readonly record struct DotNetHostInfo(string Version, Architecture Architecture, int Mode, string Commit, string RuntimeVersion) {
+	public override string ToString() => RuntimeVersion;
+
+	public static DotNetHostInfo Collect() {
+		var assemblyVersion = typeof(object).Assembly
+			.GetCustomAttribute<AssemblyInformationalVersionAttribute>()
+			?.InformationalVersion!;
+
+		var commit = assemblyVersion.Substring(assemblyVersion.IndexOf('+') + 1, 9);
+
+		return new() {
+			Version = Environment.Version.ToString(),
+			Architecture = OSArchitecture,
+			Mode = IntPtr.Size * 8,
+			Commit = commit,
+			RuntimeVersion = $"{FrameworkDescription}/{commit}"
+		};
+	}
+}
diff --git a/src/KurrentDB.SystemRuntime/RuntimeOSPlatform.cs b/src/KurrentDB.SystemRuntime/RuntimeOSPlatform.cs
new file mode 100644
index 00000000000..3d52e37be92
--- /dev/null
+++ b/src/KurrentDB.SystemRuntime/RuntimeOSPlatform.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+// ReSharper disable InconsistentNaming
+// ReSharper disable CheckNamespace
+
+namespace System.Runtime;
+
+/// <summary>
+/// Enum representing the operating system platform.
+/// </summary>
+public enum RuntimeOSPlatform {
+	/// <summary>
+	/// Represents an unknown operating system platform.
+	/// </summary>
+	Unknown,
+
+	/// <summary>
+	/// Represents the FreeBSD operating system platform.
+	/// </summary>
+	FreeBSD,
+
+	/// <summary>
+	/// Represents the Linux operating system platform.
+	/// </summary>
+	Linux,
+
+	/// <summary>
+	/// Represents the OSX (macOS) operating system platform.
+	/// </summary>
+	OSX,
+
+	/// <summary>
+	/// Represents the Windows operating system platform.
+	/// </summary>
+	Windows
+}
diff --git a/src/KurrentDB.TcpPlugin.Tests/EventStoreOptionsTests.cs b/src/KurrentDB.TcpPlugin.Tests/EventStoreOptionsTests.cs
new file mode 100644
index 00000000000..37a8005370b
--- /dev/null
+++ b/src/KurrentDB.TcpPlugin.Tests/EventStoreOptionsTests.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Net;
+using KurrentDB.Core.Configuration;
+using KurrentDB.Core.Configuration.Sources;
+using Microsoft.Extensions.Configuration;
+using Xunit;
+
+namespace KurrentDB.TcpPlugin.Tests;
+
+public class EventStoreOptionsTests {
+	static EventStoreOptionsTests() {
+		TypeDescriptor.AddAttributes(typeof(IPAddress), new TypeConverterAttribute(typeof(IPAddressConverter)));
+	}
+
+	private EventStoreOptions CreateSut(params (string Key, string? Value)[] options) {
+		var sut = new ConfigurationBuilder()
+			.AddInMemoryCollection(options.Select(
+				pair => new KeyValuePair<string, string?>(pair.Key, pair.Value)))
+			.Build()
+			.GetSection(KurrentConfigurationKeys.Prefix)
+			.Get<EventStoreOptions>() ?? new();
+
+		return sut;
+	}
+
+	[Fact]
+	public void when_empty_configuration() {
+		var sut = CreateSut();
+		Assert.False(sut.Insecure);
+		Assert.False(sut.TcpPlugin.EnableExternalTcp);
+	}
+
+	[Fact]
+	public void can_be_enabled() {
+		var sut = CreateSut(
+			($"{KurrentConfigurationKeys.Prefix}:TcpPlugin:EnableExternalTcp", "true"));
+		Assert.True(sut.TcpPlugin.EnableExternalTcp);
+	}
+
+	[Fact]
+	public void can_be_insecure() {
+		var sut = CreateSut(
+			($"{KurrentConfigurationKeys.Prefix}:Insecure", "true"));
+		Assert.True(sut.Insecure);
+	}
+
+	[Fact]
+	public void can_set_ip() {
+		var sut = CreateSut(
+			($"{KurrentConfigurationKeys.Prefix}:NodeIp", "1.2.3.4"));
+		Assert.Equal(IPAddress.Parse("1.2.3.4"), sut.NodeIp);
+	}
+}
diff --git a/src/KurrentDB.TcpPlugin.Tests/FakeLicenseService.cs b/src/KurrentDB.TcpPlugin.Tests/FakeLicenseService.cs
new file mode 100644
index 00000000000..d08aca635a7
--- /dev/null
+++ b/src/KurrentDB.TcpPlugin.Tests/FakeLicenseService.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Reactive.Subjects;
+using EventStore.Plugins.Licensing;
+
+namespace KurrentDB.TcpPlugin.Tests;
+
+class FakeLicenseService : ILicenseService {
+	public FakeLicenseService(string token) {
+		SelfLicense = new License(new(token));
+		CurrentLicense = SelfLicense; // they wouldn't normally be the same
+		Licenses = new BehaviorSubject<License>(CurrentLicense);
+	}
+
+	public License SelfLicense { get; }
+
+	public License? CurrentLicense { get; }
+
+	public IObservable<License> Licenses { get; }
+
+	public void RejectLicense(Exception ex) {
+	}
+}
diff --git a/src/KurrentDB.TcpPlugin.Tests/KurrentDB.TcpPlugin.Tests.csproj b/src/KurrentDB.TcpPlugin.Tests/KurrentDB.TcpPlugin.Tests.csproj
new file mode 100644
index 00000000000..96ee8202739
--- /dev/null
+++ b/src/KurrentDB.TcpPlugin.Tests/KurrentDB.TcpPlugin.Tests.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="EventStore.Client" Version="22.0.0" />
+		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+		<PackageReference Include="xunit" Version="2.6.1" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="coverlet.collector" Version="6.0.0">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+	</ItemGroup>
+	<ItemGroup>
+	  <ProjectReference Include="..\KurrentDB.Core.Tests\KurrentDB.Core.Tests.csproj" />
+	  <ProjectReference Include="..\KurrentDB.TcpPlugin\KurrentDB.TcpPlugin.csproj" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.TcpPlugin.Tests/TcpApiPluginTests.cs b/src/KurrentDB.TcpPlugin.Tests/TcpApiPluginTests.cs
new file mode 100644
index 00000000000..b99e4ac9b34
--- /dev/null
+++ b/src/KurrentDB.TcpPlugin.Tests/TcpApiPluginTests.cs
@@ -0,0 +1,165 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+using DotNext.Net.Http;
+using EventStore.ClientAPI;
+using EventStore.Plugins;
+using EventStore.Plugins.Authentication;
+using EventStore.Plugins.Licensing;
+using KurrentDB.Core;
+using KurrentDB.Core.Authentication;
+using KurrentDB.Core.Authentication.DelegatedAuthentication;
+using KurrentDB.Core.Authentication.PassthroughAuthentication;
+using KurrentDB.Core.Authorization;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Certificates;
+using KurrentDB.Core.Configuration.Sources;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Core.Metrics;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.TimerService;
+using KurrentDB.Core.Services.Transport.Http;
+using KurrentDB.Core.Tests.Helpers;
+using KurrentDB.Core.Tests.TransactionLog;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Serilog;
+using Xunit;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.TcpPlugin.Tests;
+
+public class TcpApiPluginTests {
+	private const string LicenseToken = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJlc2RiIiwiaXNzIjoiZXNkYiIsImV4cCI6MTgyNDQ1NjgyOSwianRpIjoiOTVmZTY2YzAtMDRkMi00MjExLWI1ZGQtNTAyM2MyYTAxMGFiIiwic3ViIjoiRVNEQiBUZXN0cyIsIklzVHJpYWwiOiJUcnVlIiwiSXNFeHBpcmVkIjoiRmFsc2UiLCJJc1ZhbGlkIjoiVHJ1ZSIsIklzRmxvYXRpbmciOiJUcnVlIiwiRGF5c1JlbWFpbmluZyI6IjEiLCJTdGFydERhdGUiOiIyNi8wNC8yMDI0IDAwOjAwOjAwICswMTowMCIsIk5PTkUiOiJ0cnVlIiwiaWF0IjoxNzI5ODQ4ODI5LCJuYmYiOjE3Mjk4NDg4Mjl9.R24i-ZAow3BhRaST3n25Uc_nQ184k83YRZZ0oRcWbU9B9XNLRH0Iegj0HmkyzkT50I4gcIJOIfcO6mIPp4Y959CP7aTAlt7XEnXoGF0GwsfXatAxy4iXG8Gpya7INgMoWEeN0v8eDH8_OVmnieOxeba9ex5j1oAW_FtQDMzcFjAeErpW__8zmkCsn6GzvlhdLE4e3r2wjshvrTTcS_1fvSVjQZov5ce2sVBJPegjCLO_QGiIBK9QTnpHrhe6KCYje6fSTjgty0V1Qj22bftvrXreYzQijPrnC_ek1BwV-A1JvacZugMCPIy8WvE5jE3hVYRWGGUzQZ-CibPGsjudYA";
+	private static readonly ILogger _logger = Log.ForContext<TcpApiPluginTests>();
+	private readonly TcpApiPlugin _sut;
+	private readonly StandardComponents _components;
+	private readonly int _port;
+	private readonly WebApplicationBuilder _builder;
+	private readonly WebApplication _app;
+	private readonly List<Message> _buffer;
+	private readonly TcpMessageCollector _collector;
+
+	public TcpApiPluginTests() {
+		_collector = new TcpMessageCollector();
+		_buffer = new List<Message>();
+		_builder = WebApplication.CreateBuilder();
+		_sut = new TcpApiPlugin();
+		_port = PortsHelper.GetAvailablePort(IPAddress.Loopback);
+		var httpPort = PortsHelper.GetAvailablePort(IPAddress.Loopback);
+
+		_builder.Configuration.AddInMemoryCollection(new KeyValuePair<string, string?>[] {
+			new($"{KurrentConfigurationKeys.Prefix}:Insecure", "true"),
+			new($"{KurrentConfigurationKeys.Prefix}:TcpPlugin:NodeTcpPort", _port.ToString()),
+			new($"{KurrentConfigurationKeys.Prefix}:TcpPlugin:EnableExternalTcp", "true"),
+		});
+		var workerThreadsCount = 2;
+		var workerBuses = Enumerable.Range(0, workerThreadsCount).Select(queueNum =>
+			new InMemoryBus($"Worker #{queueNum + 1} Bus",
+				watchSlowMsg: true,
+				slowMsgThreshold: TimeSpan.FromMilliseconds(200))).ToArray();
+
+
+		_components = CreateStandardComponents(workerThreadsCount, workerBuses);
+		var httpPipe = new HttpMessagePipe();
+		var httpSendService = new HttpSendService(httpPipe, true, delegate { return (true, ""); });
+		var httpService = new KestrelHttpService(ServiceAccessibility.Public, _components.MainQueue, new TrieUriRouter(),
+			false,
+			"localhost",
+			_port,
+			new HttpEndPoint(IPAddress.Loopback, httpPort, false));
+
+		var components = new AuthenticationProviderFactoryComponents {
+			MainBus = _components.MainBus,
+			MainQueue = _components.MainQueue,
+			WorkerBuses = workerBuses,
+			WorkersQueue = _components.NetworkSendService,
+			HttpSendService = httpSendService,
+			HttpService = httpService,
+		};
+
+		var authorizationProviderFactory =
+			new AuthorizationProviderFactory(_ => new PassthroughAuthorizationProviderFactory());
+		var authenticationProviderFactory =
+			new AuthenticationProviderFactory(_ => new PassthroughAuthenticationProviderFactory());
+
+		var authenticationProvider = new DelegatedAuthenticationProvider(
+			authenticationProviderFactory.GetFactory(components).Build(false));
+
+		var authorizationProvider = authorizationProviderFactory.GetFactory(
+			new AuthorizationProviderFactoryComponents {
+				MainQueue = _components.MainQueue,
+				MainBus = _components.MainBus
+			}).Build();
+		var authGateway = new AuthorizationGateway(authorizationProvider);
+		var licenseService = new FakeLicenseService(LicenseToken);
+
+		_components.MainBus.Subscribe(_collector);
+
+		_builder.Services.AddSingleton(_components);
+		_builder.Services.AddSingleton<IAuthenticationProvider>(authenticationProvider);
+		_builder.Services.AddSingleton(authorizationProvider);
+		_builder.Services.AddSingleton(authGateway);
+		_builder.Services.AddSingleton<CertificateProvider>(_ => null!);
+		_builder.Services.AddSingleton<ILicenseService>(licenseService);
+
+		((IPlugableComponent)_sut).ConfigureServices(_builder.Services, _builder.Configuration);
+		_app = _builder.Build();
+		((IPlugableComponent)_sut).ConfigureApplication(_app, _builder.Configuration);
+		_app.StartAsync();
+		_components.MainQueue.Publish(new SystemMessage.SystemInit());
+	}
+
+	private static StandardComponents CreateStandardComponents(int workerThreadsCount, InMemoryBus[] workerBuses) {
+		var queueStatsManager = new QueueStatsManager();
+		var queueTrackers = new QueueTrackers();
+		var workersHandler = new MultiQueuedHandler(
+			workerThreadsCount,
+			queueNum => new QueuedHandlerThreadPool(workerBuses[queueNum],
+				$"Worker #{queueNum + 1}",
+				queueStatsManager,
+				queueTrackers,
+				groupName: "Workers",
+				watchSlowMsg: true,
+				slowMsgThreshold: TimeSpan.FromMilliseconds(200)));
+
+		var dbConfig = TFChunkHelper.CreateDbConfig(Path.GetTempPath(), 0);
+		var mainBus = new InMemoryBus("mainBus");
+		var mainQueue = new QueuedHandlerThreadPool(
+			mainBus, "MainQueue", queueStatsManager, queueTrackers);
+		mainQueue.Start();
+		var threadBasedScheduler = new ThreadBasedScheduler(queueStatsManager, queueTrackers);
+		var timerService = new TimerService(threadBasedScheduler);
+
+		return new StandardComponents(dbConfig, mainQueue, mainBus,
+			timerService, timeProvider: null, httpForwarder: null, httpServices: [],
+			networkSendService: workersHandler, queueStatsManager: queueStatsManager,
+			trackers: queueTrackers,
+			metricsConfiguration: new());
+	}
+
+	[Fact]
+	public async Task can_receive_tcp_connection() {
+		var connection = EventStoreConnection.Create(
+			$"ConnectTo=tcp://admin:changeit@localhost:{_port}; UseSslConnection=false"
+		);
+
+		await connection.ConnectAsync();
+		_ = Task.Run(() => connection.ReadEventAsync("foobar", 42, true));
+
+		var msg = await _collector.Message.WaitAsync(TimeSpan.FromSeconds(30));
+		Assert.Equal("foobar", msg.EventStreamId);
+		Assert.Equal(42, msg.EventNumber);
+		Assert.True(msg.ResolveLinkTos);
+
+		_components.MainQueue.Publish(new SystemMessage.BecomeShuttingDown(Guid.NewGuid(), true, true));
+	}
+}
diff --git a/src/KurrentDB.TcpPlugin.Tests/TcpMessageCollector.cs b/src/KurrentDB.TcpPlugin.Tests/TcpMessageCollector.cs
new file mode 100644
index 00000000000..6a8e812283a
--- /dev/null
+++ b/src/KurrentDB.TcpPlugin.Tests/TcpMessageCollector.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading.Tasks;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Messages;
+
+namespace KurrentDB.TcpPlugin.Tests;
+
+public class TcpMessageCollector : IHandle<ClientMessage.ReadEvent> {
+	private TaskCompletionSource<ClientMessage.ReadEvent> _source = new();
+
+	public Task<ClientMessage.ReadEvent> Message => _source.Task;
+	public void Handle(ClientMessage.ReadEvent message) {
+		_source.TrySetResult(message);
+	}
+}
diff --git a/src/KurrentDB.TcpPlugin/EventStoreOptions.cs b/src/KurrentDB.TcpPlugin/EventStoreOptions.cs
new file mode 100644
index 00000000000..de6c33003d9
--- /dev/null
+++ b/src/KurrentDB.TcpPlugin/EventStoreOptions.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net;
+
+namespace KurrentDB.TcpPlugin;
+
+public class EventStoreOptions {
+	public int ConnectionPendingSendBytesThreshold { get; init; } = 10 * 1_024 * 1_024;
+	public int ConnectionQueueSizeThreshold { get; init; } = 50_000;
+	public int WriteTimeoutMs { get; init; } = 2_000;
+	public bool Insecure { get; init; }
+	public IPAddress NodeIp { get; init; } = IPAddress.Loopback;
+	public TcpPluginOptions TcpPlugin { get; init; } = new();
+
+	public class TcpPluginOptions {
+		public bool EnableExternalTcp { get; init; }
+		public int NodeTcpPort { get; init; } = 1113;
+		public int NodeHeartbeatInterval { get; init; } = 2_000;
+		public int NodeHeartbeatTimeout { get; init; } = 1_000;
+	}
+}
diff --git a/src/KurrentDB.TcpPlugin/KurrentDB.TcpPlugin.csproj b/src/KurrentDB.TcpPlugin/KurrentDB.TcpPlugin.csproj
new file mode 100644
index 00000000000..e052664d578
--- /dev/null
+++ b/src/KurrentDB.TcpPlugin/KurrentDB.TcpPlugin.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.Core\KurrentDB.Core.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <None Update="tcp-plugin-example.yaml">
+	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	  </None>
+	  <None Update="tcp-plugin-example.json">
+	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	  </None>
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.TcpPlugin/PublicTcpApiService.cs b/src/KurrentDB.TcpPlugin/PublicTcpApiService.cs
new file mode 100644
index 00000000000..2231595107d
--- /dev/null
+++ b/src/KurrentDB.TcpPlugin/PublicTcpApiService.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net;
+using System.Security.Cryptography.X509Certificates;
+using EventStore.Plugins.Authentication;
+using KurrentDB.Core;
+using KurrentDB.Core.Certificates;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Services;
+using KurrentDB.Core.Services.Transport.Tcp;
+using Microsoft.Extensions.Hosting;
+
+namespace KurrentDB.TcpPlugin;
+
+public class PublicTcpApiService : IHostedService {
+	public PublicTcpApiService(
+		StandardComponents components,
+		EventStoreOptions options,
+		AuthorizationGateway authGateway,
+		IAuthenticationProvider authProvider,
+		CertificateProvider? certificateProvider) {
+
+		var endpoint = new IPEndPoint(options.NodeIp, options.TcpPlugin.NodeTcpPort);
+		if (options.Insecure) {
+			var extTcpService = new TcpService(
+				components.MainQueue, endpoint, components.NetworkSendService,
+				TcpServiceType.External, TcpSecurityType.Normal,
+				new ClientTcpDispatcher(options.WriteTimeoutMs),
+				TimeSpan.FromMilliseconds(options.TcpPlugin.NodeHeartbeatInterval),
+				TimeSpan.FromMilliseconds(options.TcpPlugin.NodeHeartbeatTimeout),
+				authProvider,
+				authGateway,
+				null,
+				null,
+				null,
+				options.ConnectionPendingSendBytesThreshold,
+				options.ConnectionQueueSizeThreshold);
+
+			components.MainBus.Subscribe<SystemMessage.SystemInit>(extTcpService);
+			components.MainBus.Subscribe<SystemMessage.SystemStart>(extTcpService);
+			components.MainBus.Subscribe<SystemMessage.BecomeShuttingDown>(extTcpService);
+		} else {
+			var extTcpSecureService = new TcpService(
+				components.MainQueue, endpoint, components.NetworkSendService,
+				TcpServiceType.External, TcpSecurityType.Secure,
+				new ClientTcpDispatcher(options.WriteTimeoutMs),
+				TimeSpan.FromMilliseconds(options.TcpPlugin.NodeHeartbeatInterval),
+				TimeSpan.FromMilliseconds(options.TcpPlugin.NodeHeartbeatTimeout),
+				authProvider,
+				authGateway,
+				() => certificateProvider?.Certificate,
+				() => {
+					var intermediates = certificateProvider?.IntermediateCerts;
+					return intermediates == null
+						? null
+						: new X509Certificate2Collection(intermediates);
+				},
+				delegate { return (true, null); },
+				options.ConnectionPendingSendBytesThreshold,
+				options.ConnectionQueueSizeThreshold);
+
+			components.MainBus.Subscribe<SystemMessage.SystemInit>(extTcpSecureService);
+			components.MainBus.Subscribe<SystemMessage.SystemStart>(extTcpSecureService);
+			components.MainBus.Subscribe<SystemMessage.BecomeShuttingDown>(extTcpSecureService);
+		}
+	}
+
+	public Task StartAsync(CancellationToken cancellationToken) {
+		return Task.CompletedTask;
+	}
+
+	public Task StopAsync(CancellationToken cancellationToken) {
+		return Task.CompletedTask;
+	}
+}
diff --git a/src/KurrentDB.TcpPlugin/TcpApiPlugin.cs b/src/KurrentDB.TcpPlugin/TcpApiPlugin.cs
new file mode 100644
index 00000000000..255a6a45a20
--- /dev/null
+++ b/src/KurrentDB.TcpPlugin/TcpApiPlugin.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins;
+using KurrentDB.Core.Configuration.Sources;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace KurrentDB.TcpPlugin;
+
+public class TcpApiPlugin : SubsystemsPlugin {
+	public TcpApiPlugin() : base(requiredEntitlements: ["TCP_CLIENT_PLUGIN"]) {
+	}
+
+	public override (bool Enabled, string EnableInstructions) IsEnabled(IConfiguration configuration) {
+		var enabled = configuration.GetValue($"{KurrentConfigurationKeys.Prefix}:TcpPlugin:EnableExternalTcp", defaultValue: false);
+		return (enabled, $"Set '{KurrentConfigurationKeys.Prefix}:TcpPlugin:EnableExternalTcp' to 'true' to enable");
+	}
+
+	public override void ConfigureServices(IServiceCollection services, IConfiguration configuration) {
+		var options = configuration.GetSection(KurrentConfigurationKeys.Prefix).Get<EventStoreOptions>() ?? new();
+		services.AddSingleton(options);
+		services.AddHostedService<PublicTcpApiService>();
+	}
+}
diff --git a/src/KurrentDB.TcpPlugin/tcp-plugin-example.json b/src/KurrentDB.TcpPlugin/tcp-plugin-example.json
new file mode 100644
index 00000000000..096b97c7e78
--- /dev/null
+++ b/src/KurrentDB.TcpPlugin/tcp-plugin-example.json
@@ -0,0 +1,11 @@
+{
+  "KurrentDB": {
+    "TcpPlugin": {
+      "EnableExternalTcp": true,
+      "NodeTcpPort": 1113,
+      "NodeTcpPortAdvertiseAs": 1113,
+      "NodeHeartbeatInterval": 2000,
+      "NodeHeartbeatTimeout": 1000
+    }
+  }
+}
diff --git a/src/KurrentDB.TcpPlugin/tcp-plugin-example.yaml b/src/KurrentDB.TcpPlugin/tcp-plugin-example.yaml
new file mode 100644
index 00000000000..1d301be8e78
--- /dev/null
+++ b/src/KurrentDB.TcpPlugin/tcp-plugin-example.yaml
@@ -0,0 +1,6 @@
+TcpPlugin:
+  EnableExternalTcp: true
+  NodeTcpPort: 1113
+  NodeTcpPortAdvertiseAs: 1113
+  NodeHeartbeatInterval: 2000
+  NodeHeartbeatTimeout: 1000
diff --git a/src/KurrentDB.TestClient/Client.cs b/src/KurrentDB.TestClient/Client.cs
new file mode 100644
index 00000000000..13f76a20628
--- /dev/null
+++ b/src/KurrentDB.TestClient/Client.cs
@@ -0,0 +1,146 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using KurrentDB.Common.Utils;
+using KurrentDB.TestClient.Commands;
+using KurrentDB.TestClient.Commands.DvuBasic;
+using ILogger = Serilog.ILogger;
+#pragma warning disable 1591
+
+namespace KurrentDB.TestClient;
+
+public class Client {
+	public static readonly TimeSpan ConnectionTimeout = TimeSpan.FromMilliseconds(1000);
+	private static readonly ILogger Log = Serilog.Log.ForContext<Client>();
+
+	public readonly bool InteractiveMode;
+
+	public readonly ClientOptions Options;
+
+	public readonly TcpTestClient _tcpTestClient;
+	public readonly GrpcTestClient _grpcTestClient;
+	public readonly ClientApiTcpTestClient _clientApiTestClient;
+
+	private readonly CommandsProcessor _commands = new CommandsProcessor(Log);
+
+	public Client(ClientOptions options, CancellationTokenSource cancellationTokenSource) {
+		Options = options;
+
+		var interactiveMode = options.Command.IsEmpty();
+
+		InteractiveMode = options.Command.IsEmpty();
+
+		_tcpTestClient = new TcpTestClient(options, interactiveMode, Log);
+		_grpcTestClient = new GrpcTestClient(options, Log);
+		_clientApiTestClient = new ClientApiTcpTestClient(options, Log);
+
+		RegisterProcessors(cancellationTokenSource);
+	}
+
+	private void RegisterProcessors(CancellationTokenSource cancellationTokenSource) {
+		_commands.Register(new UsageProcessor(_commands), usageProcessor: true);
+		_commands.Register(new ExitProcessor(cancellationTokenSource));
+
+		_commands.Register(new PingProcessor());
+		_commands.Register(new PingFloodProcessor());
+		_commands.Register(new PingFloodWaitingProcessor());
+
+		_commands.Register(new WriteProcessor());
+		_commands.Register(new WriteJsonProcessor());
+		_commands.Register(new WriteFloodProcessor());
+		_commands.Register(new WriteFloodClientApiProcessor());
+		_commands.Register(new WriteFloodWaitingProcessor());
+
+		_commands.Register(new MultiWriteProcessor());
+		_commands.Register(new MultiWriteFloodWaitingProcessor());
+
+		_commands.Register(new TransactionWriteProcessor());
+
+		_commands.Register(new DeleteProcessor());
+
+		_commands.Register(new ReadAllProcessor());
+		_commands.Register(new ReadProcessor());
+		_commands.Register(new ReadFloodProcessor());
+
+		_commands.Register(new WriteLongTermProcessor());
+
+		_commands.Register(new DvuBasicProcessor());
+		_commands.Register(new RunTestScenariosProcessor());
+
+		_commands.Register(new SubscribeToStreamProcessor());
+
+		_commands.Register(new ScavengeProcessor());
+
+		_commands.Register(new TcpSanitazationCheckProcessor());
+
+		_commands.Register(new SubscriptionStressTestProcessor());
+
+		// gRPC
+		_commands.Register(new GrpcCommands.ReadAllProcessor());
+		_commands.Register(new GrpcCommands.WriteFloodProcessor());
+
+		// TCP Client API
+		_commands.Register(new ClientApiTcpCommands.WriteFloodProcessor());
+	}
+
+	public string GetCommandList() {
+		var sb = new StringBuilder();
+		_commands.RegisteredProcessors.Select(x => x.Usage.ToUpper()).ToList().ForEach(s => sb.AppendLine(s));
+		return sb.ToString();
+	}
+
+	public int Run(CancellationToken cancellationToken) {
+		if (!InteractiveMode) {
+			var args = ParseCommandLine(Options.Command[0]);
+			return Execute(args, cancellationToken);
+		}
+
+		new Thread(() => {
+			Thread.Sleep(100);
+			Console.WriteLine(GetCommandList());
+			Console.Write(">>> ");
+
+			string line;
+			while ((line = Console.ReadLine()) != null) {
+				try {
+					if (string.IsNullOrWhiteSpace(line))
+						continue;
+
+					try {
+						var args = ParseCommandLine(line);
+						Execute(args, cancellationToken);
+					} catch (Exception exc) {
+						Log.Error(exc, "Error during executing command.");
+					}
+				} finally {
+					Thread.Sleep(100);
+					Console.Write(">>> ");
+				}
+			}
+		}) { IsBackground = true, Name = "Client Main Loop Thread" }.Start();
+		return 0;
+	}
+
+	private static string[] ParseCommandLine(string line) {
+		return line.Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+	}
+
+	private int Execute(string[] args, CancellationToken cancellationToken) {
+		Log.Information("Processing command: {command}.", string.Join(" ", args));
+
+		var context = new CommandProcessorContext(_tcpTestClient, _grpcTestClient, _clientApiTestClient, Options.Timeout,
+			Log, Options.StatsLog, Options.OutputCsv, new ManualResetEventSlim(true), cancellationToken);
+
+		int exitCode;
+		if (_commands.TryProcess(context, args, out exitCode)) {
+			Log.Information("Command exited with code {exitCode}.", exitCode);
+			return exitCode;
+		}
+
+		return exitCode;
+	}
+}
diff --git a/src/KurrentDB.TestClient/ClientApiLoggerBridge.cs b/src/KurrentDB.TestClient/ClientApiLoggerBridge.cs
new file mode 100644
index 00000000000..d6e7d2e14c8
--- /dev/null
+++ b/src/KurrentDB.TestClient/ClientApiLoggerBridge.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+using Serilog;
+using Serilog.Core;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.TestClient;
+
+internal class ClientApiLoggerBridge : EventStore.ClientAPI.ILogger {
+	public static readonly ClientApiLoggerBridge Default =
+		new ClientApiLoggerBridge(Log.ForContext(Constants.SourceContextPropertyName,
+			"client-api"));
+
+	private readonly ILogger _log;
+
+	public ClientApiLoggerBridge(ILogger log) {
+		Ensure.NotNull(log, "log");
+		_log = log;
+	}
+
+	public void Error(string format, params object[] args) {
+		if (args.Length == 0)
+			_log.Error(format);
+		else
+			_log.Error(format, args);
+	}
+
+	public void Error(Exception ex, string format, params object[] args) {
+		if (args.Length == 0)
+			_log.Error(ex, format);
+		else
+			_log.Error(ex, format, args);
+	}
+
+	public void Info(string format, params object[] args) {
+		if (args.Length == 0)
+			_log.Information(format);
+		else
+			_log.Information(format, args);
+	}
+
+	public void Info(Exception ex, string format, params object[] args) {
+		if (args.Length == 0)
+			_log.Information(ex, format);
+		else
+			_log.Information(ex, format, args);
+	}
+
+	public void Debug(string format, params object[] args) {
+		if (args.Length == 0)
+			_log.Debug(format);
+		else
+			_log.Debug(format, args);
+	}
+
+	public void Debug(Exception ex, string format, params object[] args) {
+		if (args.Length == 0)
+			_log.Debug(ex, format);
+		else
+			_log.Debug(ex, format, args);
+	}
+}
diff --git a/src/KurrentDB.TestClient/ClientApiTcpCommands/WriteFloodProcessor.cs b/src/KurrentDB.TestClient/ClientApiTcpCommands/WriteFloodProcessor.cs
new file mode 100644
index 00000000000..225b7d61fb7
--- /dev/null
+++ b/src/KurrentDB.TestClient/ClientApiTcpCommands/WriteFloodProcessor.cs
@@ -0,0 +1,226 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Exceptions;
+using KurrentDB.Common.Utils;
+using KurrentDB.TestClient.Commands;
+using KurrentDB.TestClient.Statistics;
+using EventData = EventStore.ClientAPI.EventData;
+using ExpectedVersion = KurrentDB.Core.Data.ExpectedVersion;
+using StreamDeletedException = EventStore.ClientAPI.Exceptions.StreamDeletedException;
+using WrongExpectedVersionException = EventStore.ClientAPI.Exceptions.WrongExpectedVersionException;
+
+namespace KurrentDB.TestClient.ClientApiTcpCommands;
+
+internal class WriteFloodProcessor : ICmdProcessor {
+	public string Usage {
+		//                        0          1            2           3          4              5
+		get { return "WRFLTCP [<clients> <requests> [<streams-cnt> [<size> [<batchsize> [<stream-prefix>]]]]]"; }
+	}
+
+	public string Keyword {
+		get { return "WRFLTCP"; }
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		int clientsCnt = 1;
+		long requestsCnt = 5000;
+		int streamsCnt = 1000;
+		int size = 256;
+		int batchSize = 1;
+		string streamPrefix = "";
+		if (args.Length > 0) {
+			if (args.Length < 2 || args.Length > 6)
+				return false;
+
+			try {
+				clientsCnt = MetricPrefixValue.ParseInt(args[0]);
+				requestsCnt = MetricPrefixValue.ParseLong(args[1]);
+				if (args.Length >= 3)
+					streamsCnt = MetricPrefixValue.ParseInt(args[2]);
+				if (args.Length >= 4)
+					size = MetricPrefixValue.ParseInt(args[3]);
+				if (args.Length >= 5)
+					batchSize = MetricPrefixValue.ParseInt(args[4]);
+				if (args.Length >= 6)
+					streamPrefix = args[5];
+			} catch {
+				return false;
+			}
+		}
+
+		var stats = new WriteFloodStats(Keyword, context.OutputCsv, args);
+		var monitor = new RequestMonitor();
+		WriteFlood(context, stats, clientsCnt, requestsCnt, streamsCnt, size, batchSize, streamPrefix, monitor)
+			.GetAwaiter().GetResult();
+		return true;
+	}
+
+	private async Task WriteFlood(CommandProcessorContext context, WriteFloodStats stats, int clientsCnt, long requestsCnt, int streamsCnt,
+		int size, int batchSize, string streamPrefix, RequestMonitor monitor) {
+		context.IsAsync();
+
+		var doneEvent = new ManualResetEventSlim(false);
+		var clients = new List<IEventStoreConnection>();
+
+		long last = 0;
+
+		var streams = Enumerable.Range(0, streamsCnt).Select(x =>
+			string.IsNullOrWhiteSpace(streamPrefix)
+				? Guid.NewGuid().ToString()
+				: $"{streamPrefix}-{x}").ToArray();
+
+		context.Log.Information("Writing streams randomly between {first} and {last}",
+			streams.FirstOrDefault(),
+			streams.LastOrDefault());
+
+		var start = new TaskCompletionSource();
+		stats.StartTime = DateTime.UtcNow;
+		var sw2 = new Stopwatch();
+		var capacity = 2000 / clientsCnt;
+		var clientTasks = new List<Task>();
+		for (int i = 0; i < clientsCnt; i++) {
+			var count = requestsCnt / clientsCnt + ((i == clientsCnt - 1) ? requestsCnt % clientsCnt : 0);
+
+			var client = context._clientApiTestClient.CreateConnection();
+			await client.ConnectAsync();
+			clientTasks.Add(RunClient(client, count));
+		}
+
+		async Task RunClient(IEventStoreConnection client, long count) {
+			var rnd = new Random();
+			List<Task> pending = new List<Task>(capacity);
+			await start.Task;
+
+			for (int j = 0; j < count; ++j) {
+				var events = new EventData[batchSize];
+				for (int q = 0; q < batchSize; q++) {
+					events[q] = new EventData(Guid.NewGuid(),
+						"TakeSomeSpaceEvent", false,
+						Helper.UTF8NoBom.GetBytes(
+							"{ \"DATA\" : \"" + new string('*', size) + "\"}"),
+						Helper.UTF8NoBom.GetBytes(
+							"{ \"METADATA\" : \"" + new string('$', 100) + "\"}"));
+				}
+
+				var corrid = Guid.NewGuid();
+				monitor.StartOperation(corrid);
+
+				pending.Add(client.AppendToStreamAsync(streams[rnd.Next(streamsCnt)], ExpectedVersion.Any, events)
+					.ContinueWith(t => {
+						monitor.EndOperation(corrid);
+						if (t.IsCompletedSuccessfully)
+							Interlocked.Add(ref stats.Succ, batchSize);
+						else {
+							if (Interlocked.Increment(ref stats.Fail) % 1000 == 0) {
+								Console.Write("#");
+							}
+
+							if (t.Exception != null) {
+								var exception = t.Exception.Flatten();
+								switch (exception.InnerException) {
+									case WrongExpectedVersionException _:
+										Interlocked.Increment(ref stats.WrongExpVersion);
+										break;
+									case StreamDeletedException _:
+										Interlocked.Increment(ref stats.StreamDeleted);
+										break;
+									case OperationTimedOutException _:
+										Interlocked.Increment(ref stats.CommitTimeout);
+										break;
+								}
+							}
+						}
+
+						Interlocked.Add(ref stats.Succ, batchSize);
+						if (stats.Succ - last > 1000) {
+							last = stats.Succ;
+							Console.Write(".");
+						}
+
+						var localAll = Interlocked.Add(ref stats.All, batchSize);
+						if (localAll % 100000 == 0) {
+							stats.Elapsed = sw2.Elapsed;
+							stats.Rate = 1000.0 * 100000 / stats.Elapsed.TotalMilliseconds;
+							sw2.Restart();
+							context.Log.Debug(
+								"\nDONE TOTAL {writes} WRITES IN {elapsed} ({rate:0.0}/s) [S:{success}, F:{failures} (WEV:{wrongExpectedVersion}, P:{prepareTimeout}, C:{commitTimeout}, F:{forwardTimeout}, D:{streamDeleted})].",
+								localAll, stats.Elapsed, stats.Rate,
+								stats.Succ, stats.Fail,
+								stats.WrongExpVersion, stats.PrepTimeout, stats.CommitTimeout, stats.ForwardTimeout, stats.StreamDeleted);
+							stats.WriteStatsToFile(context.StatsLogger);
+						}
+
+						if (localAll >= requestsCnt) {
+							context.Success();
+							doneEvent.Set();
+						}
+					}));
+				if (pending.Count == capacity) {
+					await Task.WhenAny(pending);
+
+					while (pending.Count > 0 && Task.WhenAny(pending).IsCompleted) {
+						pending.RemoveAll(x => x.IsCompleted);
+						if (stats.Succ - last > 1000) {
+							Console.Write(".");
+							last = stats.Succ;
+						}
+					}
+				}
+			}
+
+			if (pending.Count > 0)
+				await Task.WhenAll(pending);
+		}
+
+		var sw = Stopwatch.StartNew();
+		sw2.Start();
+		start.SetResult();
+		await Task.WhenAll(clientTasks);
+		sw.Stop();
+
+		clients.ForEach(client => client.Close());
+
+		context.Log.Information(
+			"Completed. Successes: {success}, failures: {failures} (WRONG VERSION: {wrongExpectedVersion}, P: {prepareTimeout}, C: {commitTimeout}, F: {forwardTimeout}, D: {streamDeleted})",
+			stats.Succ, stats.Fail,
+			stats.WrongExpVersion, stats.PrepTimeout, stats.CommitTimeout, stats.ForwardTimeout, stats.StreamDeleted);
+		stats.WriteStatsToFile(context.StatsLogger);
+
+		var reqPerSec = (stats.All + 0.0) / sw.ElapsedMilliseconds * 1000;
+		context.Log.Information("{requests} requests completed in {elapsed}ms ({rate:0.00} reqs per sec).", stats.All,
+			sw.ElapsedMilliseconds, reqPerSec);
+
+		PerfUtils.LogData(
+			Keyword,
+			PerfUtils.Row(PerfUtils.Col("clientsCnt", clientsCnt),
+				PerfUtils.Col("requestsCnt", requestsCnt),
+				PerfUtils.Col("ElapsedMilliseconds", sw.ElapsedMilliseconds)),
+			PerfUtils.Row(PerfUtils.Col("successes", stats.Succ), PerfUtils.Col("failures", stats.Fail)));
+
+		var failuresRate = (int)(100 * stats.Fail / (stats.Fail + stats.Succ));
+		PerfUtils.LogTeamCityGraphData(string.Format("{0}-{1}-{2}-reqPerSec", Keyword, clientsCnt, requestsCnt),
+			(int)reqPerSec);
+		PerfUtils.LogTeamCityGraphData(
+			string.Format("{0}-{1}-{2}-failureSuccessRate", Keyword, clientsCnt, requestsCnt), failuresRate);
+		PerfUtils.LogTeamCityGraphData(
+			string.Format("{0}-c{1}-r{2}-st{3}-s{4}-reqPerSec", Keyword, clientsCnt, requestsCnt, streamsCnt,
+				size),
+			(int)reqPerSec);
+		PerfUtils.LogTeamCityGraphData(
+			string.Format("{0}-c{1}-r{2}-st{3}-s{4}-failureSuccessRate", Keyword, clientsCnt, requestsCnt,
+				streamsCnt, size), failuresRate);
+		monitor.GetMeasurementDetails();
+		if (Interlocked.Read(ref stats.Succ) != requestsCnt)
+			context.Fail(reason: "There were errors or not all requests completed.");
+		else
+			context.Success();
+	}
+}
diff --git a/src/KurrentDB.TestClient/ClientApiTcpTestClient.cs b/src/KurrentDB.TestClient/ClientApiTcpTestClient.cs
new file mode 100644
index 00000000000..61dc0eaade7
--- /dev/null
+++ b/src/KurrentDB.TestClient/ClientApiTcpTestClient.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.ClientAPI;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.TestClient;
+
+/// <summary>
+/// A test client that connects using the legacy dotnet TCP client
+/// </summary>
+public class ClientApiTcpTestClient {
+	/// <summary>
+	/// The options specified when starting the KurrentDB.TestClient
+	/// </summary>
+	public ClientOptions Options { get; set; }
+	private ILogger _log;
+
+	/// <summary>
+	/// Constructs a new <see cref="ClientApiTcpTestClient"/>
+	/// </summary>
+	/// <param name="options"></param>
+	/// <param name="log"></param>
+	public ClientApiTcpTestClient(ClientOptions options, ILogger log) {
+		Options = options;
+		_log = log;
+	}
+
+	/// <summary>
+	/// Creates a new TCP connection.
+	/// </summary>
+	/// <returns></returns>
+	public IEventStoreConnection CreateConnection() {
+		var connectionString = string.IsNullOrWhiteSpace(Options.ConnectionString)
+			? $"ConnectTo=tcp://{Options.Host}:{Options.TcpPort};UseSslConnection={Options.UseTls};ValidateServer={Options.TlsValidateServer}"
+			: Options.ConnectionString;
+		_log.Debug("Creating TCP client with connection string '{connectionString}.", connectionString);
+
+		var connectionSettings = ConnectionSettings.Create()
+			.LimitRetriesForOperationTo(0)
+			.KeepReconnecting();
+		return EventStoreConnection.Create(connectionString, connectionSettings);
+	}
+}
diff --git a/src/KurrentDB.TestClient/ClientOptions.cs b/src/KurrentDB.TestClient/ClientOptions.cs
new file mode 100644
index 00000000000..3edc32f7016
--- /dev/null
+++ b/src/KurrentDB.TestClient/ClientOptions.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections;
+using System.Linq;
+using System.Net;
+using System.Reflection;
+using System.Text;
+using Serilog;
+
+#pragma warning disable 1591
+
+namespace KurrentDB.TestClient;
+
+/// <summary>
+/// Data contract for the command-line options accepted by test client.
+/// This contract is handled by CommandLine project for .NET
+/// </summary>
+public sealed record ClientOptions {
+	public string Host { get; init; }
+	public int TcpPort { get; init; }
+	public int HttpPort { get; init; }
+	public int Timeout { get; init; }
+	public int ReadWindow { get; init; }
+	public int WriteWindow { get; init; }
+	public int PingWindow { get; init; }
+	public string[] Command { get; init; }
+	public bool Reconnect { get; set; }
+
+	public bool UseTls { get; init; }
+	public bool TlsValidateServer { get; init; }
+
+	public string ConnectionString { get; set; }
+	public bool OutputCsv { get; set; }
+	public ILogger StatsLog { get; set; }
+
+	public ClientOptions() {
+		Command = Array.Empty<string>();
+		Host = IPAddress.Loopback.ToString();
+		TcpPort = 1113;
+		HttpPort = 2113;
+		Timeout = -1;
+		ReadWindow = 2000;
+		WriteWindow = 2000;
+		PingWindow = 2000;
+		Reconnect = true;
+		UseTls = false;
+		TlsValidateServer = false;
+		ConnectionString = string.Empty;
+		OutputCsv = true;
+	}
+
+	public override string ToString() {
+		return GetType()
+			.GetProperties()
+			.Aggregate(new StringBuilder(),
+				(builder, option) => builder.AppendLine($"{option.Name}: {GetValue(option)}"))
+			.ToString();
+
+		object GetValue(PropertyInfo propertyInfo) => propertyInfo.PropertyType.IsArray
+			? string.Join(",", ((IEnumerable)propertyInfo.GetValue(this)).OfType<object>())
+			: propertyInfo.GetValue(this);
+	}
+}
diff --git a/src/KurrentDB.TestClient/CommandProcessorContext.cs b/src/KurrentDB.TestClient/CommandProcessorContext.cs
new file mode 100644
index 00000000000..33b454b0930
--- /dev/null
+++ b/src/KurrentDB.TestClient/CommandProcessorContext.cs
@@ -0,0 +1,100 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using ILogger = Serilog.ILogger;
+#pragma warning disable 1591
+
+namespace KurrentDB.TestClient;
+
+/// <summary>
+/// This context is passed to the instances of <see cref="ICmdProcessor"/>
+/// when they are executed. It can also be used for async synchronization
+/// </summary>
+public class CommandProcessorContext {
+	public int ExitCode;
+	public Exception Error;
+	public string Reason;
+
+	/// <summary>
+	/// Current logger of the test client
+	/// </summary>
+	public readonly ILogger Log;
+
+	/// <summary>
+	/// Stats logger for the test client
+	/// </summary>
+	public readonly ILogger StatsLogger;
+
+	/// <summary>
+	/// Whether stats should be CSV or Json
+	/// </summary>
+	public bool OutputCsv = false;
+
+	public readonly TcpTestClient _tcpTestClient;
+	public readonly GrpcTestClient _grpcTestClient;
+	public readonly ClientApiTcpTestClient _clientApiTestClient;
+
+	private readonly ManualResetEventSlim _doneEvent;
+	private readonly CancellationToken _cancellationToken;
+	private int _completed;
+	private int _timeout;
+
+	public CommandProcessorContext(TcpTestClient tcpTestClient, GrpcTestClient grpcTestClient,
+		ClientApiTcpTestClient clientApiTestClient, int timeout, ILogger log, ILogger statsLogger, bool outputCsv,
+		ManualResetEventSlim doneEvent, CancellationToken cancellationToken) {
+
+		_tcpTestClient = tcpTestClient;
+		_grpcTestClient = grpcTestClient;
+		_clientApiTestClient = clientApiTestClient;
+		Log = log;
+		StatsLogger = statsLogger;
+		_doneEvent = doneEvent;
+		_cancellationToken = cancellationToken;
+		_timeout = timeout;
+		OutputCsv = outputCsv;
+	}
+
+	public void Completed(int exitCode = (int)Common.Utils.ExitCode.Success, Exception error = null,
+		string reason = null) {
+
+		if (Interlocked.CompareExchange(ref _completed, 1, 0) == 0) {
+			ExitCode = exitCode;
+
+			Error = error ?? Error;
+			Reason = reason ?? Reason;
+
+			_doneEvent.Set();
+		}
+	}
+
+	public void Fail(Exception exc = null, string reason = null) {
+		Completed((int)Common.Utils.ExitCode.Error, exc, reason);
+	}
+
+	public void Success() {
+		Completed();
+	}
+
+	public void IsAsync() {
+		_doneEvent.Reset();
+	}
+
+	public void WaitForCompletion() {
+		if (_timeout < 0)
+			_doneEvent.Wait(_cancellationToken);
+		else {
+			if (!_doneEvent.Wait(_timeout * 1000, _cancellationToken))
+				throw new TimeoutException("Command didn't finished within timeout.");
+		}
+	}
+
+	public TimeSpan Time(Action action) {
+		var sw = Stopwatch.StartNew();
+		action();
+		sw.Stop();
+		return sw.Elapsed;
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/DeleteProcessor.cs b/src/KurrentDB.TestClient/Commands/DeleteProcessor.cs
new file mode 100644
index 00000000000..fc5d3cc27f0
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/DeleteProcessor.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using EventStore.Client.Messages;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Transport.Tcp;
+using OperationResult = EventStore.Client.Messages.OperationResult;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class DeleteProcessor : ICmdProcessor {
+	public string Usage {
+		get { return "DEL [<stream-id> [<expected-version>]]"; }
+	}
+
+	public string Keyword {
+		get { return "DEL"; }
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		var eventStreamId = "test-stream";
+		var expectedVersion = ExpectedVersion.Any;
+
+		if (args.Length > 0) {
+			if (args.Length > 2)
+				return false;
+			eventStreamId = args[0];
+			if (args.Length == 2)
+				expectedVersion = args[1].Trim().ToUpper() == "ANY" ? ExpectedVersion.Any : int.Parse(args[1]);
+		}
+
+		context.IsAsync();
+		var sw = new Stopwatch();
+		context._tcpTestClient.CreateTcpConnection(
+			context,
+			connectionEstablished: conn => {
+				context.Log.Information(
+					"[{remoteEndPoint}, L{localEndPoint}]: Trying to delete event stream '{stream}'...",
+					conn.RemoteEndPoint, conn.LocalEndPoint, eventStreamId);
+				var corrid = Guid.NewGuid();
+				var deleteDto = new DeleteStream(eventStreamId, expectedVersion, false, true);
+				var package = new TcpPackage(TcpCommand.DeleteStream, corrid, deleteDto.Serialize()).AsByteArray();
+				sw.Start();
+				conn.EnqueueSend(package);
+			},
+			handlePackage: (conn, pkg) => {
+				sw.Stop();
+				context.Log.Information("Delete request took: {elapsed}.", sw.Elapsed);
+
+				if (pkg.Command != TcpCommand.DeleteStreamCompleted) {
+					context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
+					return;
+				}
+
+				var dto = pkg.Data.Deserialize<DeleteStreamCompleted>();
+				if (dto.Result == OperationResult.Success) {
+					context.Log.Information("DELETED event stream {stream}.", eventStreamId);
+					PerfUtils.LogTeamCityGraphData(string.Format("{0}-latency-ms", Keyword),
+						(int)Math.Round(sw.Elapsed.TotalMilliseconds));
+					context.Success();
+				} else {
+					context.Log.Information("DELETION FAILED for event stream {stream}: {message} ({e}).", eventStreamId,
+						dto.Message, dto.Result);
+					context.Fail();
+				}
+
+				conn.Close();
+			},
+			connectionClosed: (connection, error) => context.Fail(reason: "Connection was closed prematurely."));
+
+		context.WaitForCompletion();
+		return true;
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/DvuBasic/BankAccountBasicProducer.cs b/src/KurrentDB.TestClient/Commands/DvuBasic/BankAccountBasicProducer.cs
new file mode 100644
index 00000000000..563c17b184a
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/DvuBasic/BankAccountBasicProducer.cs
@@ -0,0 +1,228 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Globalization;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Transport.Http.Codecs;
+using ILogger = Serilog.ILogger;
+#pragma warning disable 1591
+
+namespace KurrentDB.TestClient.Commands.DvuBasic;
+
+internal class BankAccountBasicProducer : IBasicProducer {
+	private static readonly ILogger Log = Serilog.Log.ForContext<BankAccountBasicProducer>();
+
+	public string Name {
+		get { return "account"; }
+	}
+
+	public Event Create(int version) {
+		var accountObject = BankAccountEventFactory.CreateAccountObject(version);
+
+		var serializedObject = Codec.Json.To(accountObject);
+		var @event = new Event(Guid.NewGuid(), accountObject.GetType().Name, true,
+			Helper.UTF8NoBom.GetBytes(serializedObject), new byte[0]);
+
+		return @event;
+	}
+
+	public bool Equal(int eventVersion, string eventType, byte[] actualData) {
+		var generated = BankAccountEventFactory.CreateAccountObject(eventVersion);
+		object deserialized;
+
+		bool isEqual;
+		string reason;
+		if (actualData == null) {
+			isEqual = false;
+			reason = "Null received";
+		} else {
+			deserialized = Deserialize(eventType, actualData);
+
+			if (deserialized.GetType() != generated.GetType()) {
+				isEqual = false;
+				reason = string.Format("Type does not match, actual type is {0}", deserialized.GetType().Name);
+			} else {
+				isEqual = generated.Equals(deserialized);
+				reason = "Value differs";
+			}
+		}
+
+		if (!isEqual) {
+			LogExpected(generated, actualData, reason);
+		}
+
+		return isEqual;
+	}
+
+	private object Deserialize(string eventType, byte[] actualData) {
+		object result = null;
+		var strData = Helper.UTF8NoBom.GetString(actualData);
+		if (eventType == typeof(AccountCreated).FullName) {
+			result = Codec.Json.From<AccountCreated>(strData);
+		} else {
+			if (eventType == typeof(AccountCredited).Name) {
+				result = Codec.Json.From<AccountCredited>(strData);
+			} else {
+				if (eventType == typeof(AccountDebited).Name) {
+					result = Codec.Json.From<AccountDebited>(strData);
+				} else {
+					if (eventType == typeof(AccountCheckPoint).Name) {
+						result = Codec.Json.From<AccountCheckPoint>(strData);
+					} else {
+						throw new NotSupportedException(string.Format("Event type {0} is not recognized.",
+							eventType));
+					}
+				}
+			}
+		}
+
+		return result;
+	}
+
+	private static void LogExpected(object generated, object actual, string reason) {
+		Log.Information("Expected: {expected}\n" +
+				 "  Actual: {actual}\n" +
+				 " Details: {reason}",
+			generated.ToString(),
+			(actual == null ? "<null>" : actual.ToString()),
+			reason
+		);
+	}
+}
+
+public class AccountCreated {
+	public readonly string AccountNumber;
+
+	public AccountCreated(string accountNumber) {
+		AccountNumber = accountNumber;
+	}
+
+	public override bool Equals(object obj) {
+		if (obj == null)
+			return false;
+
+		if (obj.GetType() != GetType())
+			return false;
+
+		var casted = (AccountCreated)obj;
+		return Equals(casted);
+	}
+
+	protected bool Equals(AccountCreated other) {
+		return string.Equals(AccountNumber, other.AccountNumber);
+	}
+
+	public override int GetHashCode() {
+		return (AccountNumber != null ? AccountNumber.GetHashCode() : 0);
+	}
+
+	public override string ToString() {
+		return string.Format("Type: {0}; AccountNumber: {1}", GetType().Name, AccountNumber);
+	}
+}
+
+public class AccountCredited {
+	public readonly decimal CreditedAmount;
+	public readonly string Kind;
+
+	public AccountCredited(decimal creditedAmount, int kind) {
+		CreditedAmount = creditedAmount;
+		Kind = kind.ToString(CultureInfo.InvariantCulture);
+	}
+
+	public override bool Equals(object obj) {
+		if (obj == null)
+			return false;
+
+		if (obj.GetType() != GetType())
+			return false;
+
+		var casted = (AccountCredited)obj;
+		return Equals(casted);
+	}
+
+	protected bool Equals(AccountCredited other) {
+		return CreditedAmount == other.CreditedAmount;
+	}
+
+	public override int GetHashCode() {
+		return CreditedAmount.GetHashCode();
+	}
+
+	public override string ToString() {
+		return string.Format("Type: {0}; CreditedAmount: {1}", GetType().Name, CreditedAmount);
+	}
+}
+
+public class AccountDebited {
+	public readonly decimal DebitedAmount;
+	public readonly string Kind;
+
+	public AccountDebited(decimal debitedAmount, int kind) {
+		DebitedAmount = debitedAmount;
+		Kind = kind.ToString(CultureInfo.InvariantCulture);
+	}
+
+	public override bool Equals(object obj) {
+		if (obj == null)
+			return false;
+
+		if (obj.GetType() != GetType())
+			return false;
+
+		var casted = (AccountDebited)obj;
+		return Equals(casted);
+	}
+
+	protected bool Equals(AccountDebited other) {
+		return DebitedAmount == other.DebitedAmount;
+	}
+
+	public override int GetHashCode() {
+		return DebitedAmount.GetHashCode();
+	}
+
+	public override string ToString() {
+		return string.Format("Type: {0}; DebitedAmount: {1}", GetType().Name, DebitedAmount);
+	}
+}
+
+public class AccountCheckPoint {
+	public readonly decimal CreditedAmount;
+	public readonly decimal DebitedAmount;
+
+	public AccountCheckPoint(decimal creditedAmount, decimal debitedAmount) {
+		CreditedAmount = creditedAmount;
+		DebitedAmount = debitedAmount;
+	}
+
+	public override bool Equals(object obj) {
+		if (obj == null)
+			return false;
+
+		if (obj.GetType() != GetType())
+			return false;
+
+		var casted = (AccountCheckPoint)obj;
+		return Equals(casted);
+	}
+
+	protected bool Equals(AccountCheckPoint other) {
+		return CreditedAmount == other.CreditedAmount && DebitedAmount == other.DebitedAmount;
+	}
+
+	public override int GetHashCode() {
+		unchecked {
+			return (CreditedAmount.GetHashCode() * 397) ^ DebitedAmount.GetHashCode();
+		}
+	}
+
+	public override string ToString() {
+		return string.Format("Type: {0}; CreditedAmount: {1}, DebitedAmount: {2}",
+			GetType().Name,
+			CreditedAmount,
+			DebitedAmount);
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/DvuBasic/BankAccountEventFactory.cs b/src/KurrentDB.TestClient/Commands/DvuBasic/BankAccountEventFactory.cs
new file mode 100644
index 00000000000..605f27a1d5e
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/DvuBasic/BankAccountEventFactory.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.TestClient.Commands.DvuBasic;
+
+internal static class BankAccountEventFactory {
+	public static object CreateAccountObject(int version) {
+		object accountObject = null;
+
+		var internalCounter = version + 1;
+
+		{
+			const int checkpointVersion = 10;
+
+			var checkPointModVersion = internalCounter % checkpointVersion;
+			if (checkPointModVersion == 0) {
+				int otherCheckPointsCount = internalCounter / checkpointVersion;
+
+				var elementsCount = internalCounter / 2;
+
+				var creditedSum = ComputeSum(20, elementsCount, 20) - ComputeSum(100, otherCheckPointsCount, 100);
+				var debitedSum = ComputeSum(10, elementsCount, 20);
+
+				var checkpoint = new AccountCheckPoint(creditedSum, debitedSum);
+
+				accountObject = checkpoint;
+			} else {
+				var modVersion = internalCounter % 2;
+				if (modVersion == 0) {
+					var credited = new AccountCredited(internalCounter * 10, internalCounter % 17);
+					accountObject = credited;
+				} else {
+					var debited = new AccountDebited(internalCounter * 10, internalCounter % 17);
+					accountObject = debited;
+				}
+			}
+		}
+		return accountObject;
+	}
+
+	private static int ComputeSum(int first, int count, int step) {
+		var sum = count * (2 * first + step * (count - 1)) / 2;
+		return sum;
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/DvuBasic/DvuBasicProcessor.cs b/src/KurrentDB.TestClient/Commands/DvuBasic/DvuBasicProcessor.cs
new file mode 100644
index 00000000000..979d25fdf74
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/DvuBasic/DvuBasicProcessor.cs
@@ -0,0 +1,417 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Sockets;
+using System.Threading;
+using EventStore.Client.Messages;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.Transport.Tcp;
+using OperationResult = EventStore.Client.Messages.OperationResult;
+
+namespace KurrentDB.TestClient.Commands.DvuBasic;
+
+internal class DvuBasicProcessor : ICmdProcessor {
+	public string Keyword {
+		get { return "verify"; }
+	}
+
+	public string Usage {
+		get {
+			return string.Format("{0} " +
+								 "<writers, default = 20> " +
+								 "<readers, default = 30> " +
+								 "<events, default = 1000000> " +
+								 "<streams per plugin, default = 1000> " +
+								 "<producers, default = [bank], available = [{1}]>",
+				Keyword,
+				string.Join(",", AvailableProducers));
+		}
+	}
+
+	public IEnumerable<string> AvailableProducers {
+		get { yield return "bank"; }
+	}
+
+	public IBasicProducer[] Producers { get; set; }
+
+	private int _writers;
+	private string[] _streams;
+	private int[] _heads;
+
+	private volatile bool _stopReading;
+	private readonly object _factoryLock = new object();
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		var writers = 20;
+		var readers = 30;
+		var events = 1000000;
+		var streams = 1000;
+		var producers = new[] { "bank" };
+
+		if (args.Length != 0 && args.Length != 5) {
+			context.Log.Error("Invalid number of arguments. Should be 0 or 5");
+			return false;
+		}
+
+		if (args.Length > 0) {
+			int writersArg;
+			int readersArg;
+			int eventsArg;
+			int streamsArg;
+
+			if (!int.TryParse(args[0], out writersArg)) {
+				context.Log.Error("Invalid argument value for <writers>");
+				return false;
+			}
+
+			if (!int.TryParse(args[1], out readersArg)) {
+				context.Log.Error("Invalid argument value for <readers>");
+				return false;
+			}
+
+			if (!int.TryParse(args[2], out eventsArg)) {
+				context.Log.Error("Invalid argument value for <events>");
+				return false;
+			}
+
+			if (!int.TryParse(args[3], out streamsArg)) {
+				context.Log.Error("Invalid argument value for <streams>");
+				return false;
+			}
+
+			string[] producersArg = args[4].Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries)
+				.Select(p => p.Trim().ToLower()).Distinct().ToArray();
+			if (producersArg.Length <= 0) {
+				context.Log.Error("Invalid argument value for <plugins>");
+				return false;
+			}
+
+			if (producersArg.Any(p => !AvailableProducers.Contains(p))) {
+				context.Log.Error("Invalid producers argument. Pass comma-separated subset of [{producers}]",
+					string.Join(",", AvailableProducers));
+				return false;
+			}
+
+			writers = writersArg;
+			readers = readersArg;
+			events = eventsArg;
+			streams = streamsArg;
+			producers = producersArg;
+		}
+
+		_writers = writers;
+		return InitProducers(producers) && Run(context, writers, readers, events, streams);
+	}
+
+	private bool InitProducers(string[] producers) {
+		if (producers.Length == 1 && producers[0] == "bank") {
+			Producers = new IBasicProducer[] { new BankAccountBasicProducer() };
+			return true;
+		}
+
+		return false;
+	}
+
+	private bool Run(CommandProcessorContext context, int writers, int readers, int events, int streams) {
+		context.IsAsync();
+
+		_streams = new string[streams * Producers.Length];
+		for (var i = 0; i < Producers.Length; i++) {
+			for (var j = i * streams; j < streams * (i + 1); j++) {
+				_streams[j] = StreamNamesGenerator.GenerateName(Producers[i].Name, j - i * streams);
+			}
+		}
+
+		_heads = Enumerable.Repeat(-1, streams * Producers.Length).ToArray();
+
+		return Verify(context, writers, readers, events);
+	}
+
+	private bool Verify(CommandProcessorContext context, int writers, int readers, int events) {
+		var readStatuses = Enumerable.Range(0, readers).Select(x => new Status(context.Log)).ToArray();
+		var readNotifications = Enumerable.Range(0, readers).Select(x => new ManualResetEventSlim(false)).ToArray();
+		var writeStatuses = Enumerable.Range(0, writers).Select(x => new Status(context.Log)).ToArray();
+		var writeNotifications =
+			Enumerable.Range(0, writers).Select(x => new ManualResetEventSlim(false)).ToArray();
+
+		for (int i = 0; i < readers; i++) {
+			var i1 = i;
+			var thread = new Thread(() => Read(readStatuses[i1], i1, context, readNotifications[i1]));
+			thread.IsBackground = true;
+			thread.Start();
+		}
+
+		for (int i = 0; i < writers; i++) {
+			var i1 = i;
+			var thread = new Thread(() =>
+				Write(writeStatuses[i1], i1, context, events / writers, writeNotifications[i1]));
+			thread.IsBackground = true;
+			thread.Start();
+		}
+
+		foreach (var writeNotification in writeNotifications) {
+			writeNotification.Wait();
+		}
+
+		_stopReading = true;
+		foreach (var readNotification in readNotifications) {
+			readNotification.Wait();
+		}
+
+		context.Log.Information("dvub finished execution : ");
+
+		var writersTable = new ConsoleTable("WRITER ID", "Status");
+
+		foreach (var ws in writeStatuses) {
+			writersTable.AppendRow(ws.ThreadId.ToString(), ws.Success ? "Success" : "Fail");
+		}
+
+		var readersTable = new ConsoleTable("READER ID", "Status");
+		foreach (var rs in readStatuses) {
+			readersTable.AppendRow(rs.ThreadId.ToString(), rs.Success ? "Success" : "Fail");
+		}
+
+		context.Log.Information(writersTable.CreateIndentedTable());
+		context.Log.Information(readersTable.CreateIndentedTable());
+
+		var success = writeStatuses.All(s => s.Success) && readStatuses.All(s => s.Success);
+		if (success)
+			context.Success();
+		else
+			context.Fail();
+		return success;
+	}
+
+	private void Write(Status status, int writerIdx, CommandProcessorContext context, int requests,
+		ManualResetEventSlim finish) {
+		TcpTypedConnection<byte[]> connection;
+		var iteration = new AutoResetEvent(false);
+
+		var sent = 0;
+
+		var prepareTimeouts = 0;
+		var commitTimeouts = 0;
+		var forwardTimeouts = 0;
+		var wrongExpectedVersion = 0;
+		var streamsDeleted = 0;
+
+		var failed = 0;
+
+		var rnd = new Random(writerIdx);
+
+		var streamIdx = -1;
+		var head = -1;
+
+		Action<TcpTypedConnection<byte[]>, TcpPackage> packageHandler = (conn, pkg) => {
+			var dto = pkg.Data.Deserialize<WriteEventsCompleted>();
+			switch (dto.Result) {
+				case OperationResult.Success:
+					lock (_heads) {
+						var currentHead = _heads[streamIdx];
+						Ensure.Equal(currentHead, head, "currentHead");
+						_heads[streamIdx]++;
+					}
+
+					break;
+				case OperationResult.PrepareTimeout:
+					prepareTimeouts++;
+					failed++;
+					break;
+				case OperationResult.CommitTimeout:
+					commitTimeouts++;
+					failed++;
+					break;
+				case OperationResult.ForwardTimeout:
+					forwardTimeouts++;
+					failed++;
+					break;
+				case OperationResult.WrongExpectedVersion:
+					wrongExpectedVersion++;
+					failed++;
+					break;
+				case OperationResult.StreamDeleted:
+					streamsDeleted++;
+					failed++;
+					break;
+				default:
+					throw new ArgumentOutOfRangeException();
+			}
+
+			sent++;
+			if (sent % 1000 == 0)
+				status.ReportWritesProgress(writerIdx, sent, prepareTimeouts, commitTimeouts, forwardTimeouts,
+					wrongExpectedVersion, streamsDeleted, failed, requests);
+			iteration.Set();
+		};
+
+		Action<TcpTypedConnection<byte[]>> established = _ => { };
+		Action<TcpTypedConnection<byte[]>, SocketError> closed = null;
+		closed = (_, __) => {
+			if (!context._tcpTestClient.Options.Reconnect)
+				return;
+			Thread.Sleep(TimeSpan.FromSeconds(1));
+			connection =
+				context._tcpTestClient.CreateTcpConnection(context, packageHandler, cn => iteration.Set(), closed, false);
+		};
+
+		connection = context._tcpTestClient.CreateTcpConnection(context, packageHandler, established, closed, false);
+
+		for (var i = 0; i < requests; ++i) {
+			streamIdx = NextStreamForWriting(rnd, writerIdx);
+			lock (_heads) {
+				head = _heads[streamIdx];
+			}
+
+			var evnt = CreateEvent(_streams[streamIdx], head + 1);
+			var write = new WriteEvents(
+				_streams[streamIdx],
+				head,
+				new[] {
+					new NewEvent(evnt.EventId.ToByteArray(), evnt.EventType,
+						evnt.IsJson ? 1 : 0, 0, evnt.Data, evnt.Metadata)
+				},
+				false);
+
+			var package = new TcpPackage(TcpCommand.WriteEvents, Guid.NewGuid(), write.Serialize());
+			connection.EnqueueSend(package.AsByteArray());
+			iteration.WaitOne();
+		}
+
+		status.ReportWritesProgress(writerIdx, sent, prepareTimeouts, commitTimeouts, forwardTimeouts,
+			wrongExpectedVersion, streamsDeleted, failed, requests);
+		status.FinilizeStatus(writerIdx, failed != sent);
+		context._tcpTestClient.Options.Reconnect = false;
+		connection.Close();
+		finish.Set();
+	}
+
+	private void Read(Status status, int readerIdx, CommandProcessorContext context,
+		ManualResetEventSlim finishedEvent) {
+		TcpTypedConnection<byte[]> connection;
+		var iteration = new AutoResetEvent(false);
+
+		var successes = 0;
+		var fails = 0;
+
+		var rnd = new Random(readerIdx);
+
+		var streamIdx = -1;
+		var eventidx = -1;
+
+		Action<TcpTypedConnection<byte[]>, TcpPackage> packageReceived = (conn, pkg) => {
+			var dto = pkg.Data.Deserialize<ReadEventCompleted>();
+			switch (dto.Result) {
+				case ReadEventCompleted.Types.ReadEventResult.Success:
+					if (Equal(_streams[streamIdx], eventidx, dto.Event.Event.EventType, dto.Event.Event.Data.ToByteArray())) {
+						successes++;
+						if (successes % 1000 == 0)
+							status.ReportReadsProgress(readerIdx, successes, fails);
+					} else {
+						fails++;
+						status.ReportReadError(readerIdx, _streams[streamIdx], eventidx);
+					}
+
+					break;
+				case ReadEventCompleted.Types.ReadEventResult.NotFound:
+				case ReadEventCompleted.Types.ReadEventResult.NoStream:
+				case ReadEventCompleted.Types.ReadEventResult.StreamDeleted:
+				case ReadEventCompleted.Types.ReadEventResult.Error:
+				case ReadEventCompleted.Types.ReadEventResult.AccessDenied:
+					fails++;
+					status.ReportNotFoundOnRead(readerIdx, _streams[streamIdx], eventidx);
+					break;
+				default:
+					throw new ArgumentOutOfRangeException();
+			}
+
+			iteration.Set();
+		};
+		Action<TcpTypedConnection<byte[]>> established = _ => { };
+		Action<TcpTypedConnection<byte[]>, SocketError> closed = null;
+		closed = (_, __) => {
+			if (!context._tcpTestClient.Options.Reconnect)
+				return;
+			Thread.Sleep(TimeSpan.FromSeconds(1));
+			connection =
+				context._tcpTestClient.CreateTcpConnection(context, packageReceived, cn => iteration.Set(), closed, false);
+		};
+
+		connection = context._tcpTestClient.CreateTcpConnection(context, packageReceived, established, closed, false);
+
+		while (!_stopReading) {
+			streamIdx = NextStreamForReading(rnd, readerIdx);
+			int head;
+			lock (_heads)
+				head = _heads[streamIdx];
+
+			if (head > 0) {
+				eventidx = NextRandomEventVersion(rnd, head);
+				var stream = _streams[streamIdx];
+				var corrid = Guid.NewGuid();
+				var read = new ReadEvent(stream, eventidx, resolveLinkTos: false,
+					requireLeader: false);
+				var package = new TcpPackage(TcpCommand.ReadEvent, corrid, read.Serialize());
+
+				connection.EnqueueSend(package.AsByteArray());
+				iteration.WaitOne();
+			} else
+				Thread.Sleep(100);
+		}
+
+		status.ReportReadsProgress(readerIdx, successes, fails);
+		status.FinilizeStatus(readerIdx, fails == 0);
+		context._tcpTestClient.Options.Reconnect = false;
+		connection.Close();
+		finishedEvent.Set();
+	}
+
+	private int NextStreamForWriting(Random rnd, int writerIdx) {
+		if (_writers >= _streams.Length) {
+			if (_writers > _streams.Length)
+				return writerIdx % _streams.Length;
+
+			return writerIdx;
+		}
+
+		return rnd.Next(_streams.Length);
+	}
+
+	private int NextStreamForReading(Random rnd, int readerIdx) {
+		return rnd.Next(_streams.Length);
+	}
+
+	private int NextRandomEventVersion(Random rnd, int head) {
+		return head % 2 == 0 ? head : rnd.Next(1, head);
+	}
+
+	private IBasicProducer CorrespondingProducer(string stream) {
+		return Producers.Single(f => string.Equals(f.Name, stream, StringComparison.OrdinalIgnoreCase));
+	}
+
+	private Event CreateEvent(string stream, int version) {
+		var originalName = StreamNamesGenerator.GetOriginalName(stream);
+		var factory = CorrespondingProducer(originalName);
+
+		Event generated;
+		lock (_factoryLock)
+			generated = factory.Create(version);
+
+		return generated;
+	}
+
+	private bool Equal(string stream, int expectedIdx, string eventType, byte[] actual) {
+		var originalName = StreamNamesGenerator.GetOriginalName(stream);
+		var producer = CorrespondingProducer(originalName);
+
+		bool equal;
+		lock (_factoryLock)
+			equal = producer.Equal(expectedIdx, eventType, actual);
+
+		return equal;
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/DvuBasic/IBasicProducer.cs b/src/KurrentDB.TestClient/Commands/DvuBasic/IBasicProducer.cs
new file mode 100644
index 00000000000..f1fd0ae1418
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/DvuBasic/IBasicProducer.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Core.Data;
+
+#pragma warning disable 1591
+
+namespace KurrentDB.TestClient.Commands.DvuBasic;
+
+public interface IBasicProducer {
+	string Name { get; }
+
+	Event Create(int version);
+	bool Equal(int eventVersion, string eventType, byte[] actualData);
+}
diff --git a/src/KurrentDB.TestClient/Commands/DvuBasic/Status.cs b/src/KurrentDB.TestClient/Commands/DvuBasic/Status.cs
new file mode 100644
index 00000000000..e1850f9ca55
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/DvuBasic/Status.cs
@@ -0,0 +1,82 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.Common.Utils;
+using ILogger = Serilog.ILogger;
+#pragma warning disable 1591
+
+namespace KurrentDB.TestClient.Commands.DvuBasic;
+
+public class Status {
+	private readonly ILogger _log;
+
+	public int ThreadId { get; private set; }
+	public bool Success { get; private set; }
+
+	public Status(ILogger log) {
+		Ensure.NotNull(log, "log");
+		_log = log;
+	}
+
+	public void ReportWritesProgress(int threadId,
+		int sent,
+		int prepareTimeouts,
+		int commitTimeouts,
+		int forwardTimeouts,
+		int wrongExpctdVersions,
+		int streamsDeleted,
+		int fails,
+		int requests) {
+		var sentP = ToPercent(sent, requests);
+		var failsP = ToPercent(fails, sent);
+
+		var table = new ConsoleTable("WRITER ID", "Completed %", "Completed/Total",
+			"Failed %", "Failed/Sent", "Prepare Timeouts",
+			"Commit Timeouts", "Forward Timeouts",
+			"Wrong Versions", "Stream Deleted");
+		table.AppendRow(threadId.ToString(), string.Format("{0:0.0}%", sentP),
+			string.Format("{0}/{1}", sent, requests),
+			string.Format("{0:0.0}%", failsP), string.Format("{0}/{1}", fails, sent), prepareTimeouts.ToString(),
+			commitTimeouts.ToString(), forwardTimeouts.ToString(),
+			wrongExpctdVersions.ToString(), streamsDeleted.ToString());
+
+		if (failsP > 50d)
+			_log.Fatal(table.CreateIndentedTable());
+		else
+			_log.Information(table.CreateIndentedTable());
+	}
+
+	public void ReportReadsProgress(int threadId, int successes, int fails) {
+		var all = successes + fails;
+
+		var table = new ConsoleTable("READER ID", "Fails", "Total Random Reads");
+		table.AppendRow(threadId.ToString(), fails.ToString(), all.ToString());
+
+		if (fails != 0)
+			_log.Fatal(table.CreateIndentedTable());
+		else
+			_log.Information(table.CreateIndentedTable());
+	}
+
+	public void ReportReadError(int threadId, string stream, int indx) {
+		_log.Fatal("FATAL : READER [{threadId}] encountered an error in {stream} ({index})", threadId, stream,
+			indx);
+	}
+
+	public void ReportNotFoundOnRead(int threadId, string stream, int indx) {
+		_log.Fatal(
+			"FATAL : READER [{threadId}] asked for event {index} in '{stream}' but server returned 'Not Found'",
+			threadId,
+			indx, stream);
+	}
+
+	public void FinilizeStatus(int threadId, bool success) {
+		ThreadId = threadId;
+		Success = success;
+	}
+
+	private double ToPercent(int value, int max) {
+		var approx = (value / (double)max) * 100d;
+		return approx <= 100d ? approx : 100;
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/DvuBasic/StreamNamesGenerator.cs b/src/KurrentDB.TestClient/Commands/DvuBasic/StreamNamesGenerator.cs
new file mode 100644
index 00000000000..0c95079080d
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/DvuBasic/StreamNamesGenerator.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.TestClient.Commands.DvuBasic;
+
+internal static class StreamNamesGenerator {
+	public static string GenerateName(string original, int index) {
+		return string.Format("{0}-{1}", original, index);
+	}
+
+	public static string GetOriginalName(string autogenerated) {
+		return autogenerated.Substring(0, autogenerated.LastIndexOf('-'));
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/ExitProcessor.cs b/src/KurrentDB.TestClient/Commands/ExitProcessor.cs
new file mode 100644
index 00000000000..86e7b392641
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/ExitProcessor.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class ExitProcessor : ICmdProcessor {
+	private readonly CancellationTokenSource _cancellationTokenSource;
+
+	public ExitProcessor(CancellationTokenSource cancellationTokenSource) {
+		_cancellationTokenSource = cancellationTokenSource;
+	}
+
+	public string Usage {
+		get { return Keyword; }
+	}
+
+	public string Keyword {
+		get { return "EXIT"; }
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		context.Log.Information("Exiting...");
+		_cancellationTokenSource.Cancel();
+		return true;
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/MultiWriteFloodWaiting.cs b/src/KurrentDB.TestClient/Commands/MultiWriteFloodWaiting.cs
new file mode 100644
index 00000000000..4dad0612b1b
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/MultiWriteFloodWaiting.cs
@@ -0,0 +1,141 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using EventStore.Client.Messages;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.Transport.Tcp;
+using OperationResult = EventStore.Client.Messages.OperationResult;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class MultiWriteFloodWaitingProcessor : ICmdProcessor {
+	public string Usage {
+		get { return "MWRFLW [<events-count> [<clients> <requests>]]"; }
+	}
+
+	public string Keyword {
+		get { return "MWRFLW"; }
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		int clientsCnt = 1;
+		long requestsCnt = 5000;
+		var writeCount = 10;
+
+		if (args.Length > 0) {
+			if (args.Length != 1 && args.Length != 3)
+				return false;
+			try {
+				writeCount = MetricPrefixValue.ParseInt(args[0]);
+				if (args.Length > 1) {
+					clientsCnt = MetricPrefixValue.ParseInt(args[1]);
+					requestsCnt = MetricPrefixValue.ParseLong(args[2]);
+				}
+			} catch {
+				return false;
+			}
+		}
+
+		WriteFlood(context, writeCount, clientsCnt, requestsCnt);
+		return true;
+	}
+
+	private void WriteFlood(CommandProcessorContext context, int writeCnt, int clientsCnt, long requestsCnt) {
+		const string data = "test-data";
+
+		context.IsAsync();
+
+		var clients = new List<TcpTypedConnection<byte[]>>();
+		var threads = new List<Thread>();
+		var doneEvent = new ManualResetEventSlim(false);
+		long succ = 0;
+		long fail = 0;
+		long all = 0;
+
+		for (int i = 0; i < clientsCnt; i++) {
+			var count = requestsCnt / clientsCnt + ((i == clientsCnt - 1) ? requestsCnt % clientsCnt : 0);
+			var localDoneEvent = new AutoResetEvent(false);
+			var eventStreamId = "es" + Guid.NewGuid();
+			var client = context._tcpTestClient.CreateTcpConnection(
+				context,
+				(conn, pkg) => {
+					if (pkg.Command != TcpCommand.WriteEventsCompleted) {
+						context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
+						return;
+					}
+
+					var dto = pkg.Data.Deserialize<WriteEventsCompleted>();
+					if (dto.Result == OperationResult.Success) {
+						if (Interlocked.Increment(ref succ) % 1000 == 0)
+							Console.Write(".");
+					} else {
+						if (Interlocked.Increment(ref fail) % 1000 == 0)
+							Console.Write("#");
+					}
+
+					if (Interlocked.Increment(ref all) == requestsCnt) {
+						context.Success();
+						doneEvent.Set();
+					}
+
+					localDoneEvent.Set();
+				},
+				connectionClosed: (conn, err) => context.Fail(reason: "Connection was closed prematurely."));
+			clients.Add(client);
+
+			threads.Add(new Thread(() => {
+				for (int j = 0; j < count; ++j) {
+					var writeDto = new WriteEvents(
+						eventStreamId,
+						ExpectedVersion.Any,
+						Enumerable.Range(0, writeCnt).Select(x =>
+							new NewEvent(Guid.NewGuid().ToByteArray(),
+								"type",
+								0, 0,
+								Helper.UTF8NoBom.GetBytes(data),
+								new byte[0])).ToArray(),
+						false);
+					var package = new TcpPackage(TcpCommand.WriteEvents, Guid.NewGuid(), writeDto.Serialize());
+					client.EnqueueSend(package.AsByteArray());
+					localDoneEvent.WaitOne();
+				}
+			}) { IsBackground = true });
+		}
+
+		var sw = Stopwatch.StartNew();
+		threads.ForEach(thread => thread.Start());
+		doneEvent.Wait();
+		sw.Stop();
+		clients.ForEach(client => client.Close());
+
+		var reqPerSec = (all + 0.0) / sw.ElapsedMilliseconds * 1000;
+		context.Log.Information("Completed. Successes: {success}, failures: {failures}", succ, fail);
+		context.Log.Information("{requests} requests completed in {elapsed}ms ({rate:0.00} reqs per sec).", all,
+			sw.ElapsedMilliseconds, reqPerSec);
+
+		PerfUtils.LogData(Keyword,
+			PerfUtils.Row(PerfUtils.Col("clientsCnt", clientsCnt),
+				PerfUtils.Col("requestsCnt", requestsCnt),
+				PerfUtils.Col("ElapsedMilliseconds", sw.ElapsedMilliseconds)),
+			PerfUtils.Row(PerfUtils.Col("successes", succ), PerfUtils.Col("failures", fail)));
+		PerfUtils.LogTeamCityGraphData(string.Format("{0}-{1}-{2}-reqPerSec", Keyword, clientsCnt, requestsCnt),
+			(int)reqPerSec);
+		PerfUtils.LogTeamCityGraphData(
+			string.Format("{0}-{1}-{2}-failureSuccessRate", Keyword, clientsCnt, requestsCnt),
+			(int)(100.0 * fail / (fail + succ)));
+		PerfUtils.LogTeamCityGraphData(string.Format("{0}-latency-ms", Keyword),
+			(int)Math.Round(sw.Elapsed.TotalMilliseconds / requestsCnt));
+
+		if (succ != requestsCnt)
+			context.Fail(reason: "There were errors or not all requests completed.");
+		else
+			context.Success();
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/MultiWriteProcessor.cs b/src/KurrentDB.TestClient/Commands/MultiWriteProcessor.cs
new file mode 100644
index 00000000000..ca957a42558
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/MultiWriteProcessor.cs
@@ -0,0 +1,90 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using EventStore.Client.Messages;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Transport.Tcp;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class MultiWriteProcessor : ICmdProcessor {
+	public string Usage {
+		get { return "MWR [<write-count=10> [<stream=test-stream> [<expected-version=ANY>]]"; }
+	}
+
+	public string Keyword {
+		get { return "MWR"; }
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		const string data = "test-data";
+		var eventStreamId = "test-stream";
+		var writeCount = 10;
+		var expectedVersion = ExpectedVersion.Any;
+
+		if (args.Length > 0) {
+			if (args.Length > 3)
+				return false;
+			writeCount = MetricPrefixValue.ParseInt(args[0]);
+			if (args.Length >= 2)
+				eventStreamId = args[1];
+			if (args.Length >= 3)
+				expectedVersion = args[2].Trim().ToUpper() == "ANY"
+					? ExpectedVersion.Any
+					: int.Parse(args[2].Trim());
+		}
+
+		context.IsAsync();
+		var sw = new Stopwatch();
+		context._tcpTestClient.CreateTcpConnection(
+			context,
+			connectionEstablished: conn => {
+				context.Log.Information("[{remoteEndPoint}, L{localEndPoint}]: Writing...", conn.RemoteEndPoint,
+					conn.LocalEndPoint);
+				var writeDto = new WriteEvents(
+					eventStreamId,
+					expectedVersion,
+					Enumerable.Range(0, writeCount).Select(x => new NewEvent(
+						Guid.NewGuid().ToByteArray(),
+						"type",
+						0, 0,
+						Helper.UTF8NoBom.GetBytes(data),
+						new byte[0])).ToArray(),
+					false);
+				var package = new TcpPackage(TcpCommand.WriteEvents, Guid.NewGuid(), writeDto.Serialize())
+					.AsByteArray();
+				sw.Start();
+				conn.EnqueueSend(package);
+			},
+			handlePackage: (conn, pkg) => {
+				sw.Stop();
+				context.Log.Information("Write request took: {elapsed}.", sw.Elapsed);
+
+				if (pkg.Command != TcpCommand.WriteEventsCompleted) {
+					context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
+					return;
+				}
+
+				var dto = pkg.Data.Deserialize<WriteEventsCompleted>();
+				if (dto.Result == OperationResult.Success) {
+					context.Log.Information("Successfully written {writeCount} events.", writeCount);
+					PerfUtils.LogTeamCityGraphData(string.Format("{0}-latency-ms", Keyword),
+						(int)Math.Round(sw.Elapsed.TotalMilliseconds));
+					context.Success();
+				} else {
+					context.Log.Information("Error while writing: {e}.", dto.Result);
+					context.Fail();
+				}
+
+				conn.Close();
+			},
+			connectionClosed: (connection, error) => context.Fail(reason: "Connection was closed prematurely."));
+
+		context.WaitForCompletion();
+		return true;
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/PingFloodProcessor.cs b/src/KurrentDB.TestClient/Commands/PingFloodProcessor.cs
new file mode 100644
index 00000000000..50ab2c0c007
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/PingFloodProcessor.cs
@@ -0,0 +1,104 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.Transport.Tcp;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class PingFloodProcessor : ICmdProcessor {
+	private static readonly byte[] Payload = new byte[0];
+
+	public string Usage {
+		get { return "PINGFL [<clients> <messages>]"; }
+	}
+
+	public string Keyword {
+		get { return "PINGFL"; }
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		int clientsCnt = 1;
+		long requestsCnt = 1000000;
+		if (args.Length > 0) {
+			if (args.Length != 2)
+				return false;
+			try {
+				clientsCnt = MetricPrefixValue.ParseInt(args[0]);
+				requestsCnt = MetricPrefixValue.ParseLong(args[1]);
+			} catch {
+				return false;
+			}
+		}
+
+		PingFlood(context, clientsCnt, requestsCnt);
+		return true;
+	}
+
+	private void PingFlood(CommandProcessorContext context, int clientsCnt, long requestsCnt) {
+		context.IsAsync();
+
+		var doneEvent = new ManualResetEventSlim(false);
+		var clients = new List<TcpTypedConnection<byte[]>>();
+		var threads = new List<Thread>();
+		long all = 0;
+
+		for (int i = 0; i < clientsCnt; i++) {
+			var count = requestsCnt / clientsCnt + ((i == clientsCnt - 1) ? requestsCnt % clientsCnt : 0);
+			long received = 0;
+			long sent = 0;
+			var client = context._tcpTestClient.CreateTcpConnection(
+				context,
+				(conn, msg) => {
+					Interlocked.Increment(ref received);
+					var pongs = Interlocked.Increment(ref all);
+					if (pongs % 10000 == 0)
+						Console.Write('.');
+					if (pongs == requestsCnt) {
+						context.Success();
+						doneEvent.Set();
+					}
+				},
+				connectionClosed: (conn, err) => context.Fail(reason: "Connection was closed prematurely."));
+			clients.Add(client);
+
+			threads.Add(new Thread(() => {
+				for (int j = 0; j < count; ++j) {
+					var package = new TcpPackage(TcpCommand.Ping, Guid.NewGuid(), Payload);
+					client.EnqueueSend(package.AsByteArray());
+
+					var localSent = Interlocked.Increment(ref sent);
+					while (localSent - Interlocked.Read(ref received) >
+						   context._tcpTestClient.Options.PingWindow / clientsCnt) {
+						Thread.Sleep(1);
+					}
+				}
+			}) { IsBackground = true });
+		}
+
+		var sw = Stopwatch.StartNew();
+		threads.ForEach(thread => thread.Start());
+		doneEvent.Wait();
+		sw.Stop();
+		clients.ForEach(client => client.Close());
+
+		var reqPerSec = (all + 0.0) / sw.ElapsedMilliseconds * 1000;
+		context.Log.Information("{requests} requests completed in {elapsed}ms ({rate:0.00} reqs per sec).", all,
+			sw.ElapsedMilliseconds, reqPerSec);
+		PerfUtils.LogData(Keyword,
+			PerfUtils.Row(PerfUtils.Col("clientsCnt", clientsCnt),
+				PerfUtils.Col("requestsCnt", requestsCnt),
+				PerfUtils.Col("ElapsedMilliseconds", sw.ElapsedMilliseconds)));
+		PerfUtils.LogTeamCityGraphData(string.Format("{0}-{1}-{2}-reqPerSec", Keyword, clientsCnt, requestsCnt),
+			(int)reqPerSec);
+
+		if (Interlocked.Read(ref all) == requestsCnt)
+			context.Success();
+		else
+			context.Fail();
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/PingFloodWaitingProcessor.cs b/src/KurrentDB.TestClient/Commands/PingFloodWaitingProcessor.cs
new file mode 100644
index 00000000000..30b6a755b4d
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/PingFloodWaitingProcessor.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.Transport.Tcp;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class PingFloodWaitingProcessor : ICmdProcessor {
+	public string Usage {
+		get { return "PINGFLW [<clients> <messages>]"; }
+	}
+
+	public string Keyword {
+		get { return "PINGFLW"; }
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		int clientsCnt = 1;
+		long requestsCnt = 100000;
+		if (args.Length > 0) {
+			if (args.Length != 2)
+				return false;
+			try {
+				clientsCnt = MetricPrefixValue.ParseInt(args[0]);
+				requestsCnt = MetricPrefixValue.ParseLong(args[1]);
+			} catch {
+				return false;
+			}
+		}
+
+		PingFloodWaiting(context, clientsCnt, requestsCnt);
+		return true;
+	}
+
+	private void PingFloodWaiting(CommandProcessorContext context, int clientsCnt, long requestsCnt) {
+		context.IsAsync();
+
+		var clients = new List<TcpTypedConnection<byte[]>>();
+		var threads = new List<Thread>();
+		var doneEvent = new ManualResetEventSlim(false);
+		var clientsDone = 0;
+		long all = 0;
+		for (int i = 0; i < clientsCnt; i++) {
+			var autoResetEvent = new AutoResetEvent(false);
+			var client = context._tcpTestClient.CreateTcpConnection(
+				context,
+				(_, __) => {
+					Interlocked.Increment(ref all);
+					autoResetEvent.Set();
+				},
+				connectionClosed: (conn, err) => context.Fail(reason: "Connection was closed prematurely."));
+			clients.Add(client);
+
+			var count = requestsCnt / clientsCnt + ((i == clientsCnt - 1) ? requestsCnt % clientsCnt : 0);
+			threads.Add(new Thread(() => {
+				for (int j = 0; j < count; ++j) {
+					var package = new TcpPackage(TcpCommand.Ping, Guid.NewGuid(), null);
+					client.EnqueueSend(package.AsByteArray());
+					autoResetEvent.WaitOne();
+				}
+
+				if (Interlocked.Increment(ref clientsDone) == clientsCnt) {
+					context.Success();
+					doneEvent.Set();
+				}
+			}) { IsBackground = true });
+		}
+
+		var sw = Stopwatch.StartNew();
+		threads.ForEach(thread => thread.Start());
+		doneEvent.Wait();
+		sw.Stop();
+		clients.ForEach(x => x.Close());
+
+		var reqPerSec = (all + 0.0) / sw.ElapsedMilliseconds * 1000;
+		context.Log.Information("{requests} requests completed in {elapsed}ms ({rate:0.00} reqs per sec).", all,
+			sw.ElapsedMilliseconds, reqPerSec);
+		PerfUtils.LogData(Keyword,
+			PerfUtils.Row(PerfUtils.Col("clientsCnt", clientsCnt),
+				PerfUtils.Col("requestsCnt", requestsCnt),
+				PerfUtils.Col("ElapsedMilliseconds", sw.ElapsedMilliseconds)));
+		PerfUtils.LogTeamCityGraphData(string.Format("{0}-{1}-{2}-reqPerSec", Keyword, clientsCnt, requestsCnt),
+			(int)reqPerSec);
+		PerfUtils.LogTeamCityGraphData(string.Format("{0}-latency-ms", Keyword),
+			(int)Math.Round(sw.Elapsed.TotalMilliseconds / all));
+
+		if (Interlocked.Read(ref all) == requestsCnt)
+			context.Success();
+		else
+			context.Fail();
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/PingProcessor.cs b/src/KurrentDB.TestClient/Commands/PingProcessor.cs
new file mode 100644
index 00000000000..237f5979d97
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/PingProcessor.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Core.Services.Transport.Tcp;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class PingProcessor : ICmdProcessor {
+	public string Usage {
+		get { return Keyword; }
+	}
+
+	public string Keyword {
+		get { return "PING"; }
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		context.IsAsync();
+
+		context._tcpTestClient.CreateTcpConnection(
+			context,
+			connectionEstablished: conn => {
+				var package = new TcpPackage(TcpCommand.Ping, Guid.NewGuid(), null);
+				context.Log.Information("[{ip}:{tcpPort}]: PING...", context._tcpTestClient.Options.Host,
+					context._tcpTestClient.Options.TcpPort);
+				conn.EnqueueSend(package.AsByteArray());
+			},
+			handlePackage: (conn, pkg) => {
+				if (pkg.Command != TcpCommand.Pong) {
+					context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
+					return;
+				}
+
+				context.Log.Information("[{ip}:{tcpPort}]: PONG!", context._tcpTestClient.Options.Host,
+					context._tcpTestClient.Options.TcpPort);
+				context.Success();
+				conn.Close();
+			},
+			connectionClosed: (typedConnection, error) =>
+				context.Fail(reason: "Connection was closed prematurely."));
+		context.WaitForCompletion();
+		return true;
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/ReadAllProcessor.cs b/src/KurrentDB.TestClient/Commands/ReadAllProcessor.cs
new file mode 100644
index 00000000000..97accf9910f
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/ReadAllProcessor.cs
@@ -0,0 +1,102 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using EventStore.Client.Messages;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Services.Transport.Tcp;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class ReadAllProcessor : ICmdProcessor {
+	public string Usage {
+		get { return "RDALL [[F|B] [<commit pos> <prepare pos> [<only-if-leader>]]]"; }
+	}
+
+	public string Keyword {
+		get { return "RDALL"; }
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		bool forward = true;
+		long commitPos = 0;
+		long preparePos = 0;
+		bool posOverriden = false;
+		bool resolveLinkTos = false;
+		bool requireLeader = false;
+
+		if (args.Length > 0) {
+			if (args.Length != 1 && args.Length != 3 && args.Length != 4)
+				return false;
+
+			if (args[0].ToUpper() == "F")
+				forward = true;
+			else if (args[0].ToUpper() == "B")
+				forward = false;
+			else
+				return false;
+
+			if (args.Length >= 3) {
+				posOverriden = true;
+				if (!long.TryParse(args[1], out commitPos) || !long.TryParse(args[2], out preparePos))
+					return false;
+			}
+
+			if (args.Length >= 4)
+				requireLeader = bool.Parse(args[3]);
+		}
+
+		if (!posOverriden) {
+			commitPos = forward ? 0 : -1;
+			preparePos = forward ? 0 : -1;
+		}
+
+		context.IsAsync();
+
+		int total = 0;
+		var sw = new Stopwatch();
+		var tcpCommand = forward ? TcpCommand.ReadAllEventsForward : TcpCommand.ReadAllEventsBackward;
+		var tcpCommandToReceive = forward ? TcpCommand.ReadAllEventsForwardCompleted : TcpCommand.ReadAllEventsBackwardCompleted;
+
+		context._tcpTestClient.CreateTcpConnection(
+			context,
+			connectionEstablished: conn => {
+				context.Log.Information("[{remoteEndPoint}, L{localEndPoint}]: Reading all {readDirection}...",
+					conn.RemoteEndPoint, conn.LocalEndPoint, forward ? "FORWARD" : "BACKWARD");
+
+				var readDto =
+					new ReadAllEvents(commitPos, preparePos, 10, resolveLinkTos, requireLeader);
+				var package = new TcpPackage(tcpCommand, Guid.NewGuid(), readDto.Serialize()).AsByteArray();
+				sw.Start();
+				conn.EnqueueSend(package);
+			},
+			handlePackage: (conn, pkg) => {
+				if (pkg.Command != tcpCommandToReceive) {
+					context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
+					return;
+				}
+
+				var dto = pkg.Data.Deserialize<ReadAllEventsCompleted>();
+				if (dto.Events.IsEmpty()) {
+					sw.Stop();
+					context.Log.Information("=== Reading ALL {readDirection} completed in {elapsed}. Total read: {total}",
+						forward ? "FORWARD" : "BACKWARD", sw.Elapsed, total);
+					context.Success();
+					conn.Close();
+					return;
+				}
+
+				total += dto.Events.Count;
+
+				var readDto = new ReadAllEvents(dto.NextCommitPosition, dto.NextPreparePosition,
+					10, resolveLinkTos, requireLeader);
+				var package = new TcpPackage(tcpCommand, Guid.NewGuid(), readDto.Serialize()).AsByteArray();
+				conn.EnqueueSend(package);
+			},
+			connectionClosed: (connection, error) => context.Fail(reason: "Connection was closed prematurely."));
+
+		context.WaitForCompletion();
+		return true;
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/ReadFloodProcessor.cs b/src/KurrentDB.TestClient/Commands/ReadFloodProcessor.cs
new file mode 100644
index 00000000000..61db80166cb
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/ReadFloodProcessor.cs
@@ -0,0 +1,165 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using EventStore.Client.Messages;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.Transport.Tcp;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class ReadFloodProcessor : ICmdProcessor {
+	public string Usage {
+		//                     0          1           2               3                  4
+		get { return "RDFL [<clients> <requests> [<streams-cnt> [<stream-prefix> [<require-leader>]]]]"; }
+	}
+
+	public string Keyword {
+		get { return "RDFL"; }
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		int clientsCnt = 1;
+		long requestsCnt = 5000;
+		int streamsCnt = 1;
+		var streamPrefix = "test-stream";
+		bool resolveLinkTos = false;
+		bool requireLeader = false;
+		if (args.Length > 0) {
+			if (args.Length != 2 && args.Length != 3 && args.Length != 4 && args.Length != 5)
+				return false;
+
+			try {
+				clientsCnt = MetricPrefixValue.ParseInt(args[0]);
+				requestsCnt = MetricPrefixValue.ParseLong(args[1]);
+				if (args.Length >= 3)
+					streamsCnt = MetricPrefixValue.ParseInt(args[2]);
+				if (args.Length >= 4)
+					streamPrefix = args[3];
+				if (args.Length >= 5)
+					requireLeader = bool.Parse(args[4]);
+			} catch {
+				return false;
+			}
+		}
+
+		RequestMonitor monitor = new RequestMonitor();
+		ReadFlood(context, streamPrefix, clientsCnt, requestsCnt, streamsCnt, resolveLinkTos, requireLeader, monitor);
+		return true;
+	}
+
+	private void ReadFlood(CommandProcessorContext context, string streamPrefix, int clientsCnt, long requestsCnt, int streamsCnt,
+		bool resolveLinkTos, bool requireLeader, RequestMonitor monitor) {
+		context.IsAsync();
+
+		string[] streams = streamsCnt == 1
+			? new[] { streamPrefix }
+			: Enumerable.Range(0, streamsCnt).Select(x => $"{streamPrefix}-{x}").ToArray();
+
+		context.Log.Information("Reading streams {first} through to {last}",
+			streams.FirstOrDefault(),
+			streams.LastOrDefault());
+
+		var clients = new List<TcpTypedConnection<byte[]>>();
+		var threads = new List<Thread>();
+		var doneEvent = new ManualResetEventSlim(false);
+		var sw2 = new Stopwatch();
+		long succ = 0;
+		long fail = 0;
+		long all = 0;
+		for (int i = 0; i < clientsCnt; i++) {
+			var count = requestsCnt / clientsCnt + ((i == clientsCnt - 1) ? requestsCnt % clientsCnt : 0);
+			long received = 0;
+			long sent = 0;
+			var client = context._tcpTestClient.CreateTcpConnection(
+				context,
+				(conn, pkg) => {
+					if (pkg.Command != TcpCommand.ReadEventCompleted) {
+						context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
+						return;
+					}
+
+					var dto = pkg.Data.Deserialize<ReadEventCompleted>();
+					monitor.EndOperation(pkg.CorrelationId);
+					if (dto.Result == ReadEventCompleted.Types.ReadEventResult.Success) {
+						if (Interlocked.Increment(ref succ) % 1000 == 0)
+							Console.Write(".");
+					} else {
+						if (Interlocked.Increment(ref fail) % 1000 == 0)
+							Console.Write("#");
+					}
+
+					Interlocked.Increment(ref received);
+					var localAll = Interlocked.Increment(ref all);
+					if (localAll % 100000 == 0) {
+						var elapsed = sw2.Elapsed;
+						sw2.Restart();
+						context.Log.Information("\nDONE TOTAL {reads} READS IN {elapsed} ({rate:0.0}/s).", localAll,
+							elapsed, 1000.0 * 100000 / elapsed.TotalMilliseconds);
+					}
+
+					if (localAll == requestsCnt) {
+						doneEvent.Set();
+					}
+				},
+				connectionClosed: (conn, err) => context.Fail(reason: "Connection was closed prematurely."));
+			clients.Add(client);
+
+			var clientNum = i;
+			threads.Add(new Thread(() => {
+				int streamIndex = (streamsCnt / clientsCnt) * clientNum;
+				context.Log.Information("Reader #{clientNum} performing {count} reads on {streamsCnt} streams starting at stream index {streamIndex}",
+					clientNum, count, streamsCnt, streamIndex);
+				for (int j = 0; j < count; ++j) {
+					var corrId = Guid.NewGuid();
+
+					var eventStreamId = streams[streamIndex++];
+					if (streamIndex >= streamsCnt)
+						streamIndex = 0;
+					var read = new ReadEvent(eventStreamId, 0, resolveLinkTos, requireLeader);
+					var package = new TcpPackage(TcpCommand.ReadEvent, corrId, read.Serialize());
+					monitor.StartOperation(corrId);
+					client.EnqueueSend(package.AsByteArray());
+
+					var localSent = Interlocked.Increment(ref sent);
+					while (localSent - Interlocked.Read(ref received) >
+						   context._tcpTestClient.Options.ReadWindow / clientsCnt) {
+						Thread.Sleep(1);
+					}
+				}
+				context.Log.Information("Reader #{clientNum} done", clientNum);
+
+			}) { IsBackground = true });
+		}
+
+		var sw = Stopwatch.StartNew();
+		sw2.Start();
+		threads.ForEach(thread => thread.Start());
+		doneEvent.Wait();
+		sw.Stop();
+		clients.ForEach(client => client.Close());
+
+		var reqPerSec = (all + 0.0) / sw.ElapsedMilliseconds * 1000;
+		context.Log.Information("Completed. READS succ: {success}, fail: {failures}.", Interlocked.Read(ref succ),
+			Interlocked.Read(ref fail));
+		context.Log.Information("{requests} requests completed in {elapsed}ms ({rate:0.00} reqs per sec).", all,
+			sw.ElapsedMilliseconds, reqPerSec);
+		monitor.GetMeasurementDetails();
+		PerfUtils.LogData(Keyword,
+			PerfUtils.Row(PerfUtils.Col("clientsCnt", clientsCnt),
+				PerfUtils.Col("requestsCnt", requestsCnt),
+				PerfUtils.Col("ElapsedMilliseconds", sw.ElapsedMilliseconds)),
+			PerfUtils.Row(PerfUtils.Col("readsCnt", all)));
+		PerfUtils.LogTeamCityGraphData(string.Format("{0}-{1}-{2}-reqPerSec", Keyword, clientsCnt, requestsCnt),
+			(int)reqPerSec);
+
+		if (succ != requestsCnt)
+			context.Fail(reason: "There were errors or not all requests completed.");
+		else
+			context.Success();
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/ReadProcessor.cs b/src/KurrentDB.TestClient/Commands/ReadProcessor.cs
new file mode 100644
index 00000000000..7b33fcac6e7
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/ReadProcessor.cs
@@ -0,0 +1,91 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using EventStore.Client.Messages;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Services.Transport.Tcp;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class ReadProcessor : ICmdProcessor {
+	public string Usage {
+		get { return "RD [<stream-id> [<from-number> [<only-if-leader>]]]"; }
+	}
+
+	public string Keyword {
+		get { return "RD"; }
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		var eventStreamId = "test-stream";
+		var fromNumber = 0;
+		const bool resolveLinkTos = false;
+		var requireLeader = false;
+
+		if (args.Length > 0) {
+			if (args.Length > 3)
+				return false;
+			eventStreamId = args[0];
+			if (args.Length >= 2)
+				fromNumber = MetricPrefixValue.ParseInt(args[1]);
+			if (args.Length >= 3)
+				requireLeader = bool.Parse(args[2]);
+		}
+
+		context.IsAsync();
+
+		var sw = new Stopwatch();
+		context._tcpTestClient.CreateTcpConnection(
+			context,
+			connectionEstablished: conn => {
+				context.Log.Information("[{remoteEndPoint}, L{localEndPoint}]: Reading...", conn.RemoteEndPoint,
+					conn.LocalEndPoint);
+				var readDto =
+					new ReadEvent(eventStreamId, fromNumber, resolveLinkTos, requireLeader);
+				var package =
+					new TcpPackage(TcpCommand.ReadEvent, Guid.NewGuid(), readDto.Serialize()).AsByteArray();
+				sw.Start();
+				conn.EnqueueSend(package);
+			},
+			handlePackage: (conn, pkg) => {
+				sw.Stop();
+				context.Log.Information("Read request took: {elapsed}.", sw.Elapsed);
+
+				if (pkg.Command != TcpCommand.ReadEventCompleted) {
+					context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
+					return;
+				}
+
+				var dto = pkg.Data.Deserialize<ReadEventCompleted>();
+				context.Log.Information("READ events from <{stream}>:\n\n"
+								 + "\tEventStreamId: {stream}\n"
+								 + "\tEventNumber:   {eventNumber}\n"
+								 + "\tReadResult:    {readResult}\n"
+								 + "\tEventType:     {eventType}\n"
+								 + "\tData:          {data}\n"
+								 + "\tMetadata:      {metadata}\n",
+					eventStreamId,
+					eventStreamId,
+					dto.Event.Event.EventNumber,
+					dto.Result,
+					dto.Event.Event.EventType,
+					Helper.UTF8NoBom.GetString(dto.Event.Event.Data.ToByteArray()),
+					Helper.UTF8NoBom.GetString(dto.Event.Event.Metadata.ToByteArray()));
+
+
+				if (dto.Result == ReadEventCompleted.Types.ReadEventResult.Success) {
+					PerfUtils.LogTeamCityGraphData(string.Format("{0}-latency-ms", Keyword),
+						(int)Math.Round(sw.Elapsed.TotalMilliseconds));
+					context.Success();
+				} else
+					context.Fail();
+
+				conn.Close();
+			},
+			connectionClosed: (connection, error) => context.Fail(reason: "Connection was closed prematurely."));
+
+		return true;
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/RequestMonitor.cs b/src/KurrentDB.TestClient/Commands/RequestMonitor.cs
new file mode 100644
index 00000000000..a2e6981267c
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/RequestMonitor.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Diagnostics;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class RequestMonitor {
+	private ConcurrentQueue<int> _measurements = new ConcurrentQueue<int>();
+	private ConcurrentDictionary<Guid, Operation> _operations = new ConcurrentDictionary<Guid, Operation>();
+	Stopwatch _watch = new Stopwatch();
+
+	public RequestMonitor() {
+		_watch.Start();
+	}
+
+	public void StartOperation(Guid id) {
+		var record = new Operation();
+		record.Start = _watch.ElapsedTicks;
+		_operations.AddOrUpdate(id, record, (q, val) => record);
+	}
+
+	public void EndOperation(Guid id) {
+		Operation record;
+		if (_operations.TryRemove(id, out record)) {
+			var current = _watch.ElapsedTicks;
+			var time = current - record.Start;
+			var ms = time / TimeSpan.TicksPerMillisecond;
+			_measurements.Enqueue((int)ms);
+		} else {
+			Console.Write("x");
+		}
+	}
+
+	public void PrintRawMeasurementDetails() {
+		foreach (var i in _measurements) {
+			Console.Write(i + ",");
+		}
+	}
+
+	public void GetMeasurementDetails() {
+		var items = _measurements.ToArray();
+		Array.Sort(items);
+		Console.WriteLine("fastest: " + items[0]);
+		Console.WriteLine("quintiles");
+		for (int i = 20; i <= 100; i += 20) {
+			Console.WriteLine(i + "% : " + items[GetPercentile((decimal)i - 20, items.Length)] + "-" +
+							  items[GetPercentile((decimal)i, items.Length)]);
+		}
+
+		Console.WriteLine("90% : " + items[GetPercentile(90m, items.Length)]);
+		Console.WriteLine("95% : " + items[GetPercentile(95m, items.Length)]);
+		Console.WriteLine("98% : " + items[GetPercentile(98m, items.Length)]);
+		Console.WriteLine("99% : " + items[GetPercentile(99m, items.Length)]);
+		Console.WriteLine("99.5% : " + items[GetPercentile(99.5m, items.Length)]);
+		Console.WriteLine("99.9% : " + items[GetPercentile(99.9m, items.Length)]);
+		Console.WriteLine("99.99% : " + items[GetPercentile(99.99m, items.Length)]);
+		Console.WriteLine("99.999% : " + items[GetPercentile(99.999m, items.Length)]);
+		Console.WriteLine("99.9999% : " + items[GetPercentile(99.9999m, items.Length)]);
+		Console.WriteLine("99.99999% : " + items[GetPercentile(99.99999m, items.Length)]);
+		Console.WriteLine("Highest : " + items[items.Length - 1]);
+	}
+
+	private int GetPercentile(decimal percentile, int size) {
+		decimal percent = 0;
+		percent = percentile / 100m;
+		var ret = (int)(percent * size);
+		if (ret == size)
+			ret -= 1;
+		return ret;
+	}
+
+	struct Operation {
+		public long Start;
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/RunTestScenarios/BankAccountEvent.cs b/src/KurrentDB.TestClient/Commands/RunTestScenarios/BankAccountEvent.cs
new file mode 100644
index 00000000000..10550594dc9
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/RunTestScenarios/BankAccountEvent.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using EventStore.ClientAPI;
+using KurrentDB.Common.Utils;
+using KurrentDB.Transport.Http.Codecs;
+
+namespace KurrentDB.TestClient.Commands.RunTestScenarios;
+
+internal class BankAccountEvent {
+	public static EventData FromEvent(object accountObject) {
+		if (accountObject == null)
+			throw new ArgumentNullException("accountObject");
+
+		var type = accountObject.GetType().Name;
+		var encodedData = Helper.UTF8NoBom.GetBytes(Codec.Json.To(accountObject));
+		var encodedMetadata =
+			Helper.UTF8NoBom.GetBytes(Codec.Json.To(new Dictionary<string, object> { { "IsEmpty", true } }));
+
+		return new EventData(Guid.NewGuid(), type, true, encodedData, encodedMetadata);
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/RunTestScenarios/IScenario.cs b/src/KurrentDB.TestClient/Commands/RunTestScenarios/IScenario.cs
new file mode 100644
index 00000000000..bbdecd66092
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/RunTestScenarios/IScenario.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.TestClient.Commands.RunTestScenarios;
+
+internal interface IScenario : IDisposable {
+	void Run();
+	void Clean();
+}
diff --git a/src/KurrentDB.TestClient/Commands/RunTestScenarios/JsonEventContainer.cs b/src/KurrentDB.TestClient/Commands/RunTestScenarios/JsonEventContainer.cs
new file mode 100644
index 00000000000..4a49b08d4d7
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/RunTestScenarios/JsonEventContainer.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using EventStore.ClientAPI;
+using KurrentDB.Common.Utils;
+using KurrentDB.Transport.Http.Codecs;
+
+namespace KurrentDB.TestClient.Commands.RunTestScenarios;
+
+internal static class JsonEventContainer {
+	public static EventData ForEvent(object @event) {
+		if (@event == null)
+			throw new ArgumentNullException("event");
+
+		var encodedData = Helper.UTF8NoBom.GetBytes(Codec.Json.To(@event));
+		var encodedMetadata =
+			Helper.UTF8NoBom.GetBytes(Codec.Json.To(new Dictionary<string, object> { { "IsEmpty", true } }));
+
+		return new EventData(Guid.NewGuid(), @event.GetType().Name, true, encodedData, encodedMetadata);
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/RunTestScenarios/LoopingProjTranWriteScenario.cs b/src/KurrentDB.TestClient/Commands/RunTestScenarios/LoopingProjTranWriteScenario.cs
new file mode 100644
index 00000000000..ac92e1f3a4f
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/RunTestScenarios/LoopingProjTranWriteScenario.cs
@@ -0,0 +1,244 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+
+namespace KurrentDB.TestClient.Commands.RunTestScenarios;
+
+internal class LoopingProjTranWriteScenario : ProjectionsScenarioBase {
+	private readonly TimeSpan _executionPeriod;
+
+	private readonly Random _random;
+
+	public LoopingProjTranWriteScenario(Action<IPEndPoint, byte[]> directSendOverTcp,
+		int maxConcurrentRequests,
+		int connections,
+		int streams,
+		int eventsPerStream,
+		int streamDeleteStep,
+		TimeSpan executionPeriod,
+		string dbParentPath,
+		NodeConnectionInfo customNode)
+		: base(directSendOverTcp, maxConcurrentRequests, connections, streams, eventsPerStream, streamDeleteStep,
+			dbParentPath, customNode) {
+		_executionPeriod = executionPeriod;
+		_random = new Random();
+	}
+
+	private EventData CreateEventA(int version) {
+		var @event = JsonEventContainer.ForEvent(new VersionnedEventA(version));
+		return @event;
+	}
+
+	private EventData CreateEventB(int version) {
+		var @event = JsonEventContainer.ForEvent(new VersionnedEventB(version));
+		return @event;
+	}
+
+	internal class VersionnedEvent {
+		public readonly int Version;
+
+		public VersionnedEvent(int version) {
+			Version = version;
+		}
+	}
+
+	internal class VersionnedEventA : VersionnedEvent {
+		public VersionnedEventA(int version) : base(version) {
+		}
+	}
+
+	internal class VersionnedEventB : VersionnedEvent {
+		public VersionnedEventB(int version) : base(version) {
+		}
+	}
+
+	protected override void RunInternal() {
+		var stopWatch = Stopwatch.StartNew();
+
+		var runIndex = 0;
+		while (stopWatch.Elapsed < _executionPeriod) {
+			var msg = string.Format(
+				"=================== Start run #{0}, elapsed {1} of {2} minutes, {3} =================== ",
+				runIndex,
+				(int)stopWatch.Elapsed.TotalMinutes,
+				_executionPeriod.TotalMinutes,
+				GetType().Name);
+			Log.Information(
+				"=================== Start run #{runIndex}, elapsed {elapsed} of {executionPeriod} minutes, {type} =================== ",
+				runIndex,
+				(int)stopWatch.Elapsed.TotalMinutes,
+				_executionPeriod.TotalMinutes,
+				GetType().Name);
+			Log.Information("##teamcity[message '{message}']", msg);
+
+			InnerRun(runIndex);
+			runIndex += 1;
+		}
+	}
+
+	private void InnerRun(int runIndex) {
+		var nodeId = StartNode();
+
+		try {
+			EnableProjectionByCategory();
+
+			var streamA = string.Format("numberedevents{0}-stream_a", runIndex);
+			var streamB = string.Format("numberedevents{0}-stream_b", runIndex);
+
+			var store = GetConnection();
+
+			var writtenCountA = 0;
+			var writtenCountB = 0;
+			while (writtenCountA + writtenCountB < EventsPerStream) {
+				var batchSizeA = _random.Next(1, EventsPerStream / 10);
+				var batchSizeB = _random.Next(1, EventsPerStream / 10);
+
+				var transactionA = store.StartTransactionAsync(streamA, ExpectedVersion.Any).Result;
+
+				var w1 = WriteTransactionData(transactionA, writtenCountA, batchSizeA, CreateEventA);
+				w1.Wait();
+
+				var transactionB = store.StartTransactionAsync(streamB, ExpectedVersion.Any).Result;
+				var w2 = WriteTransactionData(transactionB, writtenCountB, batchSizeB, CreateEventB);
+				w2.Wait();
+
+				var cB = CommitTransaction(transactionB);
+				cB.Wait();
+
+				var cA = CommitTransaction(transactionA);
+				cA.Wait();
+
+				writtenCountA += batchSizeA;
+				writtenCountB += batchSizeB;
+			}
+
+			var projectionName = string.Format("NumberedByType{0}", runIndex);
+			var projection = string.Format(@"
+                fromCategory('numberedevents{0}')
+                    .when({{
+                        $init: function() {{ 
+                            return {{aVer:0, aList:'', bVer:0, bList:''}}; 
+                        }},
+                        VersionnedEventA: function(state, event) {{
+                            state.aVer += 1;
+                            if (state.aVer != event.body.version) {{
+                                throw JSON.stringify({{
+                                    message: 'Version in A is incorrect. ',
+                                    stream: event.streamId,
+                                    seqNumber: event.sequenceNumber,
+                                    eventType: event.eventType,
+                                    eventInternalVer: event.body.version,
+                                    detailsAVer: state.aVer,
+                                    detailsBVer: state.bVer}});
+                            }}
+                            return state;
+                        }},
+                        VersionnedEventB: function(state, event) {{  
+                            state.bVer += 1;
+                            if (state.bVer != event.body.version) {{
+                                throw JSON.stringify({{
+                                    message: 'Version in B is incorrect. ',
+                                    stream: event.streamId,
+                                    seqNumber: event.sequenceNumber,
+                                    eventType: event.eventType,
+                                    eventInternalVer: event.body.version,
+                                    detailsAVer: state.aVer,
+                                    detailsBVer: state.bVer }});
+                            }}
+                            return state;
+                        }}
+                    }})   
+", runIndex);
+
+			var projectionManager = GetProjectionsManager();
+			projectionManager.CreateContinuousAsync(projectionName, projection, AdminCredentials).Wait();
+
+			WaitAndCheckIfIsFaulted(projectionName);
+
+			Log.Debug("Done iteration {runIndex}", runIndex);
+		} finally {
+			KillNode(nodeId);
+		}
+	}
+
+	private Task<object> WriteTransactionData(EventStoreTransaction transaction, int startingVersion,
+		int eventCount, Func<int, EventData> createEvent) {
+		Log.Information("Starting to write {eventCount} events in transaction {transactionId}", eventCount,
+			transaction.TransactionId);
+
+		var resSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+		Action<Task> fail = prevTask => {
+			Log.Information("WriteEventsInTransactionalWay for transaction {transactionId} failed.",
+				transaction.TransactionId);
+			resSource.SetException(prevTask.Exception);
+		};
+
+		int version = startingVersion;
+
+		Action<Task> writeTransactionEvent = null;
+		writeTransactionEvent = _ => {
+			if (version == startingVersion + eventCount) {
+				resSource.SetResult(null);
+				return;
+			}
+
+			version += 1;
+
+			var writeTask = transaction.WriteAsync(new[] { createEvent(version) });
+			writeTask.ContinueWith(fail, TaskContinuationOptions.OnlyOnFaulted);
+			writeTask.ContinueWith(writeTransactionEvent, TaskContinuationOptions.OnlyOnRanToCompletion);
+		};
+
+		Task.Factory.StartNew(() => writeTransactionEvent(null));
+
+		return resSource.Task;
+	}
+
+	private Task<object> CommitTransaction(EventStoreTransaction transaction) {
+		var resSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+		Action<Task> fail = prevTask => {
+			Log.Information("WriteEventsInTransactionalWay for transaction {transactionId} failed",
+				transaction.TransactionId);
+			resSource.SetException(prevTask.Exception);
+		};
+
+		var commitTask = transaction.CommitAsync();
+		commitTask.ContinueWith(fail, TaskContinuationOptions.OnlyOnFaulted);
+		commitTask.ContinueWith(t => {
+			Log.Information("Committed transaction {transactionId}", transaction.TransactionId);
+			resSource.SetResult(null);
+		}, TaskContinuationOptions.OnlyOnRanToCompletion);
+
+		return resSource.Task;
+	}
+
+	private void WaitAndCheckIfIsFaulted(string projectionName) {
+		var stopWatch = Stopwatch.StartNew();
+
+		var waitDuration = TimeSpan.FromMilliseconds(20 * 1000 + 5 * Streams * EventsPerStream);
+		while (stopWatch.Elapsed < waitDuration) {
+			string reason;
+			var failed = GetProjectionIsFaulted(projectionName, out reason);
+			if (failed) {
+				var message = string.Format("Projection {0} failed, reason:\n{1}", projectionName, reason);
+				throw new ApplicationException(message);
+			}
+
+			var position = GetProjectionPosition(projectionName);
+			if (position >= (EventsPerStream - 1)) {
+				Log.Debug("Expected position reached, done.");
+				break;
+			}
+
+			Thread.Sleep(2000);
+		}
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/RunTestScenarios/LoopingProjectionKillScenario.cs b/src/KurrentDB.TestClient/Commands/RunTestScenarios/LoopingProjectionKillScenario.cs
new file mode 100644
index 00000000000..2a202584b12
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/RunTestScenarios/LoopingProjectionKillScenario.cs
@@ -0,0 +1,123 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.TestClient.Commands.RunTestScenarios;
+
+internal class LoopingProjectionKillScenario : ProjectionsKillScenario {
+	private TimeSpan _executionPeriod;
+
+	private int _iterationCode;
+	private readonly TimeSpan _iterationLoopDuration;
+	private readonly TimeSpan _firstKillInterval;
+
+	public LoopingProjectionKillScenario(Action<IPEndPoint, byte[]> directSendOverTcp, int maxConcurrentRequests,
+		int connections, int streams, int eventsPerStream, int streamDeleteStep, TimeSpan executionPeriod,
+		string dbParentPath, NodeConnectionInfo customNode)
+		: base(directSendOverTcp, maxConcurrentRequests, connections, streams, eventsPerStream, streamDeleteStep,
+			dbParentPath, customNode) {
+		_executionPeriod = executionPeriod;
+
+		_iterationLoopDuration = TimeSpan.FromMilliseconds(10 * (Streams * EventsPerStream + Streams) + 20 * 1000);
+		_firstKillInterval = TimeSpan.FromSeconds(_iterationLoopDuration.TotalSeconds / 2);
+	}
+
+	protected override int GetIterationCode() {
+		return _iterationCode;
+	}
+
+	protected void SetNextIterationCode() {
+		_iterationCode += 1;
+	}
+
+	protected override void RunInternal() {
+		var nodeProcessId = StartNode();
+		EnableProjectionByCategory();
+
+		var stopWatch = Stopwatch.StartNew();
+
+		while (stopWatch.Elapsed < _executionPeriod) {
+			var msg = string.Format(
+				"=================== Start run #{0}, elapsed {1} of {2} minutes, {3} =================== ",
+				GetIterationCode(),
+				(int)stopWatch.Elapsed.TotalMinutes,
+				_executionPeriod.TotalMinutes,
+				GetType().Name);
+			Log.Information(
+				"=================== Start run #{iteration}, elapsed {elapsed} of {executionPeriod} minutes, {type} =================== ",
+				GetIterationCode(),
+				(int)stopWatch.Elapsed.TotalMinutes,
+				_executionPeriod.TotalMinutes,
+				GetType().Name);
+			Log.Information("##teamcity[message '{message}']", msg);
+
+			var iterationTask = RunIteration();
+
+			Thread.Sleep(_firstKillInterval);
+
+			KillNode(nodeProcessId);
+			nodeProcessId = StartNode();
+
+			if (!iterationTask.Wait(_iterationLoopDuration))
+				throw new TimeoutException("Iteration execution timeout.");
+
+			if (iterationTask.Result != true)
+				throw new ApplicationException("Iteration faulted.", iterationTask.Exception);
+
+			SetNextIterationCode();
+		}
+	}
+
+	private Task<bool> RunIteration() {
+		var countItem = CreateCountItem();
+		var sumCheckForBankAccount0 = CreateSumCheckForBankAccount0();
+
+		var writeTask = WriteData();
+
+		var expectedAllEventsCount = (Streams * EventsPerStream).ToString();
+		var lastExpectedEventVersion = (EventsPerStream - 1).ToString();
+
+		var successTask = Task.Factory.StartNew(() => {
+			var success = false;
+			var stopWatch = new Stopwatch();
+			while (stopWatch.Elapsed < _iterationLoopDuration) {
+				if (writeTask.IsFaulted)
+					throw new ApplicationException("Failed to write data");
+
+				if (writeTask.IsCompleted && !stopWatch.IsRunning) {
+					stopWatch.Start();
+				}
+
+				success = CheckProjectionState(countItem, "count", x => x == expectedAllEventsCount)
+						  && CheckProjectionState(sumCheckForBankAccount0, "success",
+							  x => x == lastExpectedEventVersion);
+
+				if (success)
+					break;
+
+				Thread.Sleep(4000);
+			}
+
+			if (!CheckProjectionState(countItem, "count", x => x == expectedAllEventsCount))
+				Log.Error(
+					"Projection '{projection}' has not completed with expected result {expectedCount} in time. ",
+					countItem, expectedAllEventsCount);
+
+			if (!CheckProjectionState(sumCheckForBankAccount0, "success", x => x == lastExpectedEventVersion))
+				Log.Error(
+					"Projection '{projection}' has not completed with expected result {lastExpectedEventVersion} in time.",
+					sumCheckForBankAccount0, lastExpectedEventVersion);
+
+			return success;
+		});
+
+		writeTask.Wait();
+
+		return successTask;
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/RunTestScenarios/LoopingScenario.cs b/src/KurrentDB.TestClient/Commands/RunTestScenarios/LoopingScenario.cs
new file mode 100644
index 00000000000..41fead7d41d
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/RunTestScenarios/LoopingScenario.cs
@@ -0,0 +1,185 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+
+namespace KurrentDB.TestClient.Commands.RunTestScenarios;
+
+internal class LoopingScenario : ScenarioBase {
+	private readonly TimeSpan _executionPeriod;
+
+	private readonly Random _rnd = new Random();
+	private volatile bool _stopParalleWrites;
+	private TimeSpan _startupWaitInterval;
+
+	protected override TimeSpan StartupWaitInterval {
+		get { return _startupWaitInterval; }
+	}
+
+	public LoopingScenario(Action<IPEndPoint, byte[]> directSendOverTcp,
+		int maxConcurrentRequests,
+		int connections,
+		int streams,
+		int eventsPerStream,
+		int streamDeleteStep,
+		TimeSpan executionPeriod,
+		string dbParentPath,
+		NodeConnectionInfo customNodeConnection)
+		: base(directSendOverTcp, maxConcurrentRequests, connections, streams, eventsPerStream, streamDeleteStep,
+			dbParentPath, customNodeConnection) {
+		_executionPeriod = executionPeriod;
+		SetStartupWaitInterval(TimeSpan.FromSeconds(10));
+	}
+
+	private void SetStartupWaitInterval(TimeSpan interval) {
+		_startupWaitInterval = interval;
+	}
+
+	protected override void RunInternal() {
+		var stopWatch = Stopwatch.StartNew();
+
+		var runIndex = 0;
+		while (stopWatch.Elapsed < _executionPeriod) {
+			var msg = string.Format(
+				"=================== Start run #{0}, elapsed {1} of {2} minutes, {3} =================== ",
+				runIndex,
+				(int)stopWatch.Elapsed.TotalMinutes,
+				_executionPeriod.TotalMinutes,
+				GetType().Name);
+			Log.Information(
+				"=================== Start run #{runIndex}, elapsed {elapsed} of {executionPeriod} minutes, {type} =================== ",
+				runIndex,
+				(int)stopWatch.Elapsed.TotalMinutes,
+				_executionPeriod.TotalMinutes,
+				GetType().Name);
+			Log.Information("##teamcity[message '{message}']", msg);
+
+			SetStartupWaitInterval(TimeSpan.FromSeconds(10 + (2 * (runIndex % 200))));
+			InnerRun(runIndex);
+			runIndex += 1;
+		}
+	}
+
+	protected virtual void InnerRun(int runIndex) {
+		var nodeProcessId = StartNode();
+
+		var parallelWritesTimeout = TimeSpan.FromMinutes((EventsPerStream / 1000.0) * 10);
+
+		var parallelWriteTask = RunParallelWrites(runIndex);
+
+		var streams = Enumerable.Range(0, Streams).Select(i => FormatStreamName(runIndex, i)).ToArray();
+
+		var slices = Split(streams, 3);
+		var singleEventSlice = slices.Take(1).SelectMany(x => x).ToArray();
+		var batchSlice = slices.Skip(1).Take(1).SelectMany(x => x).ToArray();
+		var transSlice = slices.Skip(2).Take(1).SelectMany(x => x).ToArray();
+
+		var wr1 = Write(WriteMode.SingleEventAtTime, singleEventSlice, EventsPerStream);
+		var wr2 = Write(WriteMode.Bucket, batchSlice, EventsPerStream);
+		var wr3 = Write(WriteMode.Transactional, transSlice, EventsPerStream);
+
+		if (runIndex % 4 == 0)
+			Scavenge();
+
+		Task.WaitAll(wr1, wr2, wr3);
+
+		var deleted = streams.Where((s, i) => i % StreamDeleteStep == 0).ToArray();
+		DeleteStreams(deleted);
+
+		_stopParalleWrites = true;
+		if (!parallelWriteTask.Wait(parallelWritesTimeout))
+			throw new ApplicationException("Parallel writes stop timed out, 1.");
+
+		KillNode(nodeProcessId);
+		nodeProcessId = StartNode();
+
+		parallelWriteTask = RunParallelWrites(runIndex);
+
+		var dl1 = CheckStreamsDeleted(deleted);
+
+		var exceptDeleted = streams.Except(deleted).ToArray();
+
+		var readCnt = Math.Min(100, EventsPerStream / 3);
+		var rd1 = Read(exceptDeleted, from: 0, count: readCnt);
+		var rd2 = Read(exceptDeleted, from: EventsPerStream - readCnt, count: readCnt);
+		var rd3 = Read(exceptDeleted, from: EventsPerStream / 2,
+			count: Math.Min(readCnt, EventsPerStream - EventsPerStream / 2));
+
+		Log.Information("== READ from picked ALL ==");
+
+		var allExistingStreamsSlice = (from run in Enumerable.Range(0, runIndex + 1)
+									   from streamNum in Enumerable.Range(0, Streams)
+									   where streamNum % StreamDeleteStep != 0
+									   where _rnd.NextDouble() < 0.1
+									   select FormatStreamName(run, streamNum)).ToArray();
+
+		var allDeletedStreamsSlice = (from run in Enumerable.Range(0, runIndex + 1)
+									  from streamNum in Enumerable.Range(0, Streams)
+									  where streamNum % StreamDeleteStep == 0
+									  where _rnd.NextDouble() < 0.1
+									  select FormatStreamName(run, streamNum)).ToArray();
+
+		var prevCheckTasks = new List<Task>();
+		if (allExistingStreamsSlice.Length > 0) {
+			var rd4 = Read(allExistingStreamsSlice, 0, Math.Max(1, EventsPerStream / 5));
+			var rd5 = Read(allExistingStreamsSlice, EventsPerStream / 2, Math.Max(1, EventsPerStream / 5));
+
+			prevCheckTasks.Add(rd4);
+			prevCheckTasks.Add(rd5);
+		}
+
+		if (allDeletedStreamsSlice.Length > 0) {
+			var dl2 = CheckStreamsDeleted(allDeletedStreamsSlice);
+			prevCheckTasks.Add(dl2);
+		}
+
+		Task.WaitAll(new[] { dl1, rd1, rd2, rd3 }.Union(prevCheckTasks).ToArray());
+
+		_stopParalleWrites = true;
+		if (!parallelWriteTask.Wait(parallelWritesTimeout))
+			throw new ApplicationException("Parallel writes stop timed out, 2.");
+
+		KillNode(nodeProcessId);
+	}
+
+	protected virtual Task RunParallelWrites(int runIndex) {
+		_stopParalleWrites = false;
+
+		return Task.Factory.StartNew(() => {
+			int index = 0;
+			while (!_stopParalleWrites) {
+				Log.Debug("Start RunParallelWrites #{index} for runIndex {runIndex}", index, runIndex);
+
+				var parallelStreams = Enumerable.Range(0, 2)
+					.Select(x => string.Format("parallel-write-stream-in{0}-{1}-{2}",
+						runIndex,
+						x,
+						string.Format("rnd{0}-{1}", _rnd.Next(), DateTime.UtcNow.Ticks)))
+					.ToArray();
+
+				var wr = Write(WriteMode.SingleEventAtTime, parallelStreams, EventsPerStream);
+				wr.Wait();
+
+				Log.Debug("Wrote RunParallelWrites #{index} for runIndex {runIndex}", index, runIndex);
+
+				var rd1 = Read(parallelStreams, 0, EventsPerStream / 6);
+				var rd2 = Read(parallelStreams, EventsPerStream / 3, EventsPerStream / 6);
+				var rd3 = Read(parallelStreams, EventsPerStream - EventsPerStream / 10, EventsPerStream / 10);
+				Task.WaitAll(rd1, rd2, rd3);
+
+				Log.Debug("Done RunParallelWrites #{index} for runIndex {runIndex}", index, runIndex);
+
+				index += 1;
+			}
+		}, TaskCreationOptions.LongRunning);
+	}
+
+	protected static string FormatStreamName(int runIndex, int i) {
+		return string.Format("stream-in{0}-{1}", runIndex, i);
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/RunTestScenarios/MassProjectionsScenario.cs b/src/KurrentDB.TestClient/Commands/RunTestScenarios/MassProjectionsScenario.cs
new file mode 100644
index 00000000000..d2303915cb5
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/RunTestScenarios/MassProjectionsScenario.cs
@@ -0,0 +1,183 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.TestClient.Commands.RunTestScenarios;
+
+internal class MassProjectionsScenario : ProjectionsKillScenario {
+	private readonly Random _random = new Random();
+
+	public MassProjectionsScenario(Action<IPEndPoint, byte[]> directSendOverTcp, int maxConcurrentRequests,
+		int threads, int streams, int eventsPerStream, int streamDeleteStep, string dbParentPath,
+		NodeConnectionInfo customNode)
+		: base(directSendOverTcp, maxConcurrentRequests, threads, streams, eventsPerStream, streamDeleteStep,
+			dbParentPath, customNode) {
+	}
+
+	protected override void RunInternal() {
+		var success = true;
+
+		var nodeProcessId = StartNode();
+		EnableProjectionByCategory();
+
+		var countProjections = new List<string>();
+		var bankProjections = new List<string>();
+
+		var writeTasks = new List<Task>();
+
+		while (GetIterationCode() < Streams / 3) {
+			writeTasks.Add(WriteData());
+
+			SetNextIterationCode();
+
+			countProjections.Add(CreateCountItem());
+			bankProjections.Add(CreateSumCheckForBankAccount0());
+
+			Log.Information("Created {bankProjections} and {countProjections}", bankProjections[bankProjections.Count - 1],
+				countProjections[countProjections.Count - 1]);
+		}
+
+		KillNode(nodeProcessId);
+		nodeProcessId = StartNode();
+
+		writeTasks.Add(WriteData());
+
+		var writeTask = Task.Factory.ContinueWhenAll(writeTasks.ToArray(), tsks => Log.Information("All Data written"));
+
+		KillNode(nodeProcessId);
+		nodeProcessId = StartNode();
+
+		int count = 10;
+		while (count > 0) {
+			Log.Information("Stop and start projection, remaining iterations {count}, waiting for data to be written.",
+				count);
+
+			StartOrStopProjection(countProjections, false);
+			StartOrStopProjection(bankProjections, false);
+
+			Thread.Sleep(TimeSpan.FromSeconds(10));
+
+			StartOrStopProjection(countProjections, true);
+			StartOrStopProjection(bankProjections, true);
+
+			if (writeTask.IsCompleted)
+				count -= 1;
+
+			if (writeTask.IsFaulted)
+				throw new ApplicationException("Failed to write data", writeTask.Exception);
+
+			success = CheckProjectionState(bankProjections[bankProjections.Count - 1],
+				"success",
+				x => x == (EventsPerStream - 1).ToString());
+			if (success)
+				break;
+
+			var sleepTimeSeconds = 10 + Streams * EventsPerStream / 1000.0;
+			Log.Information("Sleep 1 for {sleepTime} seconds, remaining count {count}", sleepTimeSeconds, count);
+			Thread.Sleep(TimeSpan.FromSeconds(sleepTimeSeconds));
+		}
+
+		writeTask.Wait();
+
+		count = 20;
+		success = false;
+		while (!success && count > 0) {
+			Log.Information("Wait until projections are computed, remaining iterations {count}", count);
+			KillNode(nodeProcessId);
+			nodeProcessId = StartNode();
+
+			success = CheckProjectionState(bankProjections[bankProjections.Count - 1],
+				"success",
+				x => x == (EventsPerStream - 1).ToString());
+
+			if (success)
+				break;
+
+			var sleepTimeSeconds = 10 + (Streams * EventsPerStream) / 500;
+			Log.Information("Sleep 2 for {sleepTime} seconds, remaining count {count}", sleepTimeSeconds, count);
+			Thread.Sleep(TimeSpan.FromSeconds(sleepTimeSeconds));
+
+			count -= 1;
+		}
+
+		if (!success)
+			throw new ApplicationException("Last bank projection failed");
+	}
+
+	private void StartOrStopProjection(IEnumerable<string> projections, bool enable) {
+		var manager = GetProjectionsManager();
+		const int retriesNumber = 5;
+
+		foreach (var projection in projections.ToArray()) {
+			var retry = 0;
+
+			int shortWait = 50 + _random.Next(100);
+			Log.Debug("Wait for {waitTime}ms before next enable/disable projection", shortWait);
+			Thread.Sleep(shortWait);
+
+			while (retry <= retriesNumber) {
+				var isRunning = GetProjectionIsRunning(projection);
+
+				try {
+					if (enable) {
+						if (!isRunning)
+							manager.EnableAsync(projection, AdminCredentials).Wait();
+						else
+							Log.Information("Projection '{projection}' is already running and will not be enabled.",
+								projection);
+					} else {
+						if (isRunning)
+							manager.DisableAsync(projection, AdminCredentials).Wait();
+						else
+							Log.Information(
+								"Projection '{projection}' is already not running and will not be disabled again.",
+								projection);
+					}
+
+					break;
+				} catch (Exception ex) {
+					var waitForMs = 5000 + (retry * (3000 + _random.Next(2000)));
+
+					Log.Information(ex,
+						"Failed to StartOrStopProjection (enable:{enable}; isRunning:{isRunning}) projection {projection}, retry #{retry}, wait {waitTime}ms",
+						enable,
+						isRunning,
+						projection,
+						retry,
+						waitForMs);
+
+					if (retry != 0)
+						Thread.Sleep(waitForMs);
+
+					if (retry == retriesNumber)
+						throw new ApplicationException(string.Format(
+								"Failed to StartOrStopProjection (enable:{0}) projection {1}," +
+								" max number ({2}) of retries reached.",
+								enable,
+								projection,
+								retry),
+							ex);
+				}
+
+
+				retry++;
+			}
+		}
+	}
+
+	private int _iterationCode;
+
+	protected override int GetIterationCode() {
+		return _iterationCode;
+	}
+
+	private void SetNextIterationCode() {
+		_iterationCode += 1;
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/RunTestScenarios/NodeConnectionInfo.cs b/src/KurrentDB.TestClient/Commands/RunTestScenarios/NodeConnectionInfo.cs
new file mode 100644
index 00000000000..f5ae6a85cbf
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/RunTestScenarios/NodeConnectionInfo.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Net;
+
+namespace KurrentDB.TestClient.Commands.RunTestScenarios;
+
+internal class NodeConnectionInfo {
+	public IPAddress IpAddress { get; private set; }
+	public int TcpPort { get; private set; }
+	public int HttpPort { get; private set; }
+
+	public NodeConnectionInfo(IPAddress ipAddress, int tcpPort, int httPort) {
+		IpAddress = ipAddress;
+		TcpPort = tcpPort;
+		HttpPort = httPort;
+	}
+
+	public override string ToString() {
+		return string.Format("[{0}:{1}:{2}]", IpAddress, TcpPort, HttpPort);
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/RunTestScenarios/ProjForeachForcedCommonNameScenario.cs b/src/KurrentDB.TestClient/Commands/RunTestScenarios/ProjForeachForcedCommonNameScenario.cs
new file mode 100644
index 00000000000..a90dd02b8ea
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/RunTestScenarios/ProjForeachForcedCommonNameScenario.cs
@@ -0,0 +1,246 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.TestClient.Commands.DvuBasic;
+
+namespace KurrentDB.TestClient.Commands.RunTestScenarios;
+
+internal class ProjForeachForcedCommonNameScenario : ProjectionsScenarioBase {
+	private int _iterationCode = 0;
+	private TimeSpan _executionPeriod;
+
+	public ProjForeachForcedCommonNameScenario(Action<IPEndPoint, byte[]> directSendOverTcp,
+		int maxConcurrentRequests, int connections, int streams, int eventsPerStream, int streamDeleteStep,
+		TimeSpan executionPeriod, string dbParentPath, NodeConnectionInfo customNode)
+		: base(directSendOverTcp, maxConcurrentRequests, connections, streams, eventsPerStream, streamDeleteStep,
+			dbParentPath, customNode) {
+		_executionPeriod = executionPeriod;
+	}
+
+	private EventData CreateBankEvent(int version) {
+		var accountObject = BankAccountEventFactory.CreateAccountObject(version);
+		var @event = BankAccountEvent.FromEvent(accountObject);
+		return @event;
+	}
+
+	protected virtual int GetIterationCode() {
+		return _iterationCode;
+	}
+
+	protected virtual bool ShouldRestartNode {
+		get { return true; }
+	}
+
+	protected override void RunInternal() {
+		var started = DateTime.UtcNow;
+
+		while ((DateTime.UtcNow - started) < _executionPeriod) {
+			var msg = string.Format(
+				"=================== Start run #{0}, elapsed {1} of {2} minutes, {3} =================== ",
+				GetIterationCode(),
+				(int)(DateTime.Now - started).TotalMinutes,
+				_executionPeriod.TotalMinutes,
+				GetType().Name);
+			Log.Information(
+				"=================== Start run #{iteration}, elapsed {elapsed} of {executionPeriod} minutes, {type} =================== ",
+				GetIterationCode(),
+				(int)(DateTime.Now - started).TotalMinutes,
+				_executionPeriod.TotalMinutes,
+				GetType().Name);
+			Log.Information("##teamcity[message '{message}']", msg);
+
+
+			InnerRun();
+			_iterationCode += 1;
+		}
+	}
+
+	private void InnerRun() {
+		int nodeProcessId = -1;
+
+		if (ShouldRestartNode)
+			nodeProcessId = StartNode();
+
+		EnableProjectionByCategory();
+
+		var sumCheckForBankAccounts = CreateSumCheckForBankAccounts("sumCheckForBankAccounts", "1");
+		var sumCheckForBankAccounts2 = CreateSumCheckForBankAccounts("sumCheckForBankAccounts", "2");
+
+		var projections = new[] { sumCheckForBankAccounts, sumCheckForBankAccounts2 };
+
+		var writeTask = WriteData();
+
+		bool failed = false;
+		string failReason = null;
+
+		var isWatchStarted = false;
+		var expectedAllEventsCount = Streams + (Streams * EventsPerStream);
+
+		var stopWatch = new Stopwatch();
+
+		var waitDuration = TimeSpan.FromMilliseconds(20 * 1000 + 5 * Streams * EventsPerStream);
+		while (stopWatch.Elapsed < waitDuration) {
+			if (writeTask.IsFaulted)
+				throw new ApplicationException("Failed to write data");
+
+			if (writeTask.IsCompleted && !stopWatch.IsRunning) {
+				stopWatch.Start();
+				isWatchStarted = true;
+			}
+
+			if (isWatchStarted)
+				stopWatch.Stop();
+
+			failed = CheckIsFaulted(projections, out failReason);
+			if (failed)
+				break;
+
+			if (CheckIsCompleted(projections, expectedAllEventsCount))
+				break;
+
+			Thread.Sleep((int)(waitDuration.TotalMilliseconds / 6));
+
+			failed = CheckIsFaulted(projections, out failReason);
+			if (failed)
+				break;
+
+			if (ShouldRestartNode) {
+				KillNode(nodeProcessId);
+				nodeProcessId = StartNode();
+			}
+
+			if (isWatchStarted)
+				stopWatch.Start();
+		}
+
+		writeTask.Wait();
+
+		for (int i = 3; i < 11; ++i) {
+			var newSumCheckForBankAccounts = CreateSumCheckForBankAccounts("sumCheckForBankAccounts", i.ToString());
+			Thread.Sleep(200);
+			failed = CheckIsFaulted(new[] { newSumCheckForBankAccounts }, out failReason);
+
+			if (failed)
+				break;
+		}
+
+		if (ShouldRestartNode)
+			KillNode(nodeProcessId);
+
+		if (failed)
+			throw new ApplicationException(string.Format("Projection failed due to reason: {0}.", failReason));
+	}
+
+	private bool CheckIsFaulted(IEnumerable<string> projectionsNames, out string failReason) {
+		var faulted = false;
+		failReason = null;
+		foreach (var projectionName in projectionsNames) {
+			faulted = faulted || GetProjectionIsFaulted(projectionName, out failReason);
+		}
+
+		return faulted;
+	}
+
+	private bool CheckIsCompleted(IEnumerable<string> projectionsNames, int expectedAllEventsCount) {
+		var completed = false;
+		foreach (var projectionName in projectionsNames) {
+			var position = GetProjectionPosition(projectionName);
+			if (position == expectedAllEventsCount) {
+				Log.Debug("Expected position reached in {projection}, done.", projectionName);
+				completed = true;
+			}
+		}
+
+		return completed;
+	}
+
+	protected Task WriteData() {
+		var streams = Enumerable.Range(0, Streams)
+			.Select(i => string.Format("bank_account_it{0}-{1}", GetIterationCode(), i)).ToArray();
+		var slices = Split(streams, 3);
+
+		var w1 = Write(WriteMode.SingleEventAtTime, slices[0], EventsPerStream, CreateBankEvent);
+		var w2 = Write(WriteMode.Bucket, slices[1], EventsPerStream, CreateBankEvent);
+		var w3 = Write(WriteMode.Transactional, slices[2], EventsPerStream, CreateBankEvent);
+
+		var task = Task.Factory.ContinueWhenAll(new[] { w1, w2, w3 }, Task.WaitAll);
+		return task.ContinueWith(x => Log.Information("Data written for iteration {iteration}.", GetIterationCode()));
+	}
+
+	protected string CreateSumCheckForBankAccounts(string projectionName, string suffix = "") {
+		var fullProjectionName = string.Format("{0}_it{1}_{2}", projectionName, GetIterationCode(), suffix);
+		var countItemsProjection = string.Format(@"
+                fromCategory('bank_account_it{1}').foreachStream().when({{
+                    $init: function() {{ 
+                        return {{credited:0, credsum:'', debited:0, debsum:''}}; 
+                    }},
+                    AccountCredited: function (state, event) {{ 
+                        state.credited += event.body.creditedAmount; 
+                        /*state.credsum += '#' + event.sequenceNumber + ':' + event.body.creditedAmount + ';'*/ 
+                    }},
+                    AccountDebited: function (state, event) {{ 
+                        state.debited += event.body.debitedAmount; 
+                        /*state.debsum += '#' + event.sequenceNumber + ':' + event.body.debitedAmount + ';'*/ 
+                    }},
+                    AccountCheckPoint: function(state, event) {{ 
+                        if (state.credited != event.body.creditedAmount) {{
+                            throw JSON.stringify({{
+                                message: 'Credited amount is incorrect. ',
+                                expected: event.body.creditedAmount,
+                                actual: state.credited,
+                                stream: event.streamId,
+                                ver: event.sequenceNumber,
+                                details: state.credsum }});
+                        }}
+                        if (state.debited != event.body.debitedAmount) {{
+                            throw JSON.stringify({{
+                                message: 'Debited amount is incorrect. ',
+                                expected: event.body.debitedAmount,
+                                actual: state.debited,
+                                stream: event.streamId,
+                                ver: event.sequenceNumber,
+                                details: state.debsum }});
+                        }}
+                        state.success=event.sequenceNumber;
+                    }}
+                }})
+", projectionName, GetIterationCode());
+
+		GetProjectionsManager().CreateContinuousAsync(fullProjectionName, countItemsProjection, AdminCredentials)
+			.Wait();
+
+		return fullProjectionName;
+	}
+}
+
+internal class ProjForeachForcedCommonNameNoRestartScenario : ProjForeachForcedCommonNameScenario {
+	public ProjForeachForcedCommonNameNoRestartScenario(Action<IPEndPoint, byte[]> directSendOverTcp,
+		int maxConcurrentRequests,
+		int connections,
+		int streams,
+		int eventsPerStream,
+		int streamDeleteStep,
+		TimeSpan executionPeriod,
+		string dbParentPath,
+		NodeConnectionInfo customNode)
+		: base(directSendOverTcp, maxConcurrentRequests, connections, streams, eventsPerStream, streamDeleteStep,
+			executionPeriod, dbParentPath, customNode) {
+	}
+
+	protected override bool ShouldRestartNode {
+		get { return false; }
+	}
+
+	protected override void RunInternal() {
+		StartNode();
+		base.RunInternal();
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/RunTestScenarios/ProjectionWrongTagCheck.cs b/src/KurrentDB.TestClient/Commands/RunTestScenarios/ProjectionWrongTagCheck.cs
new file mode 100644
index 00000000000..6ab6b33d238
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/RunTestScenarios/ProjectionWrongTagCheck.cs
@@ -0,0 +1,131 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.TestClient.Commands.RunTestScenarios;
+
+internal class ProjectionWrongTagCheck : ProjectionsKillScenario {
+	private TimeSpan _executionPeriod;
+
+	public ProjectionWrongTagCheck(Action<IPEndPoint, byte[]> directSendOverTcp, int maxConcurrentRequests,
+		int connections, int streams, int eventsPerStream, int streamDeleteStep, TimeSpan executionPeriod,
+		string dbParentPath, NodeConnectionInfo customNode)
+		: base(directSendOverTcp, maxConcurrentRequests, connections, streams, eventsPerStream, streamDeleteStep,
+			dbParentPath, customNode) {
+		_executionPeriod = executionPeriod;
+	}
+
+	private int _iterationCode = 0;
+
+	protected override int GetIterationCode() {
+		return _iterationCode;
+	}
+
+	protected void SetNextIterationCode() {
+		_iterationCode += 1;
+	}
+
+	protected override void RunInternal() {
+		var nodeProcessId = StartNode();
+		EnableProjectionByCategory();
+		KillNode(nodeProcessId);
+
+		var stopWatch = Stopwatch.StartNew();
+
+		while (stopWatch.Elapsed < _executionPeriod) {
+			var msg = string.Format(
+				"=================== Start run #{0}, elapsed {1} of {2} minutes, {3} =================== ",
+				GetIterationCode(),
+				(int)stopWatch.Elapsed.TotalMinutes,
+				_executionPeriod.TotalMinutes,
+				GetType().Name);
+
+			Log.Information(
+				"=================== Start run #{iteration}, elapsed {elapsed} of {executionPeriod} minutes, {type} =================== ",
+				GetIterationCode(),
+				(int)stopWatch.Elapsed.TotalMinutes,
+				_executionPeriod.TotalMinutes,
+				GetType().Name);
+			Log.Information("##teamcity[message '{message}']", msg);
+
+			var iterationTask = RunIteration();
+			iterationTask.Wait();
+
+			SetNextIterationCode();
+		}
+	}
+
+	private Task RunIteration() {
+		var nodeProcessId = StartNode();
+
+
+		var sumCheckForBankAccount0 = CreateSumCheckForBankAccount0();
+
+		var writeTask = WriteData();
+
+		var lastExpectedEventVersion = (EventsPerStream - 1).ToString();
+
+		var successTask = Task.Factory.StartNew<bool>(() => {
+			var success = true;
+			var stopWatch = new Stopwatch();
+
+			var wasLessLastTime = false;
+			while (stopWatch.Elapsed < TimeSpan.FromMilliseconds(10 * (Streams * EventsPerStream + Streams))) {
+				if (!wasLessLastTime) {
+					KillNode(nodeProcessId);
+					nodeProcessId = StartNode();
+				}
+
+				if (writeTask.IsFaulted)
+					throw new ApplicationException("Failed to write data");
+
+				if (writeTask.IsCompleted && !stopWatch.IsRunning) {
+					stopWatch.Start();
+				}
+
+				var count1 = GetProjectionStateValue(sumCheckForBankAccount0, "success", int.Parse, -1);
+				for (var i = 0; i < 5; ++i) {
+					Thread.Sleep(TimeSpan.FromSeconds(1));
+					var count2 = GetProjectionStateValue(sumCheckForBankAccount0, "success", int.Parse, -1);
+
+					if (count1 > count2) {
+						if (wasLessLastTime) {
+							success = false;
+							break;
+						}
+
+						wasLessLastTime = true;
+					}
+
+					count1 = count2;
+				}
+
+				if (!success)
+					break;
+
+				if (CheckProjectionState(sumCheckForBankAccount0, "success", x => x == lastExpectedEventVersion))
+					break;
+			}
+
+			KillNode(nodeProcessId);
+
+			if (!success)
+				throw new ApplicationException(string.Format(
+					"Projection {0} has not completed with expected result {1} in time.", sumCheckForBankAccount0,
+					lastExpectedEventVersion));
+
+			return success;
+		});
+
+		return Task.Factory.ContinueWhenAll(new[] { writeTask, successTask }, tasks => {
+			Log.Information("Iteration {iteration} tasks completed", GetIterationCode());
+			Task.WaitAll(tasks);
+			Log.Information("Iteration {iteration} successful", GetIterationCode());
+		});
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/RunTestScenarios/ProjectionsKillScenario.cs b/src/KurrentDB.TestClient/Commands/RunTestScenarios/ProjectionsKillScenario.cs
new file mode 100644
index 00000000000..1f4472714ca
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/RunTestScenarios/ProjectionsKillScenario.cs
@@ -0,0 +1,174 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.TestClient.Commands.DvuBasic;
+
+namespace KurrentDB.TestClient.Commands.RunTestScenarios;
+
+internal class ProjectionsKillScenario : ProjectionsScenarioBase {
+	public ProjectionsKillScenario(Action<IPEndPoint, byte[]> directSendOverTcp,
+		int maxConcurrentRequests,
+		int connections,
+		int streams,
+		int eventsPerStream,
+		int streamDeleteStep,
+		string dbParentPath,
+		NodeConnectionInfo customNode)
+		: base(directSendOverTcp, maxConcurrentRequests, connections, streams, eventsPerStream, streamDeleteStep,
+			dbParentPath, customNode) {
+	}
+
+	private EventData CreateBankEvent(int version) {
+		var accountObject = BankAccountEventFactory.CreateAccountObject(version);
+		var @event = BankAccountEvent.FromEvent(accountObject);
+		return @event;
+	}
+
+	protected virtual int GetIterationCode() {
+		return 0;
+	}
+
+	protected override void RunInternal() {
+		var nodeProcessId = StartNode();
+		EnableProjectionByCategory();
+
+		var countItem = CreateCountItem();
+		var sumCheckForBankAccount0 = CreateSumCheckForBankAccount0();
+
+		var writeTask = WriteData();
+
+		var success = false;
+		var expectedAllEventsCount = (Streams * EventsPerStream).ToString();
+		var lastExpectedEventVersion = (EventsPerStream - 1).ToString();
+
+		var isWatchStarted = false;
+
+		var stopWatch = new Stopwatch();
+
+		var waitDuration = TimeSpan.FromMilliseconds(20 * 1000 + 5 * Streams * EventsPerStream);
+		while (stopWatch.Elapsed < waitDuration) {
+			if (writeTask.IsFaulted)
+				throw new ApplicationException("Failed to write data");
+
+			if (writeTask.IsCompleted && !stopWatch.IsRunning) {
+				stopWatch.Start();
+				isWatchStarted = true;
+			}
+
+			success = CheckProjectionState(countItem, "count", x => x == expectedAllEventsCount)
+					  && CheckProjectionState(sumCheckForBankAccount0, "success",
+						  x => x == lastExpectedEventVersion);
+
+			if (success)
+				break;
+
+			if (isWatchStarted)
+				stopWatch.Stop();
+
+			Thread.Sleep((int)(waitDuration.TotalMilliseconds / 10));
+
+			KillNode(nodeProcessId);
+			nodeProcessId = StartNode();
+
+			if (isWatchStarted)
+				stopWatch.Start();
+		}
+
+		writeTask.Wait();
+
+		KillNode(nodeProcessId);
+
+		if (!success)
+			throw new ApplicationException(
+				string.Format("Projections did not complete with expected result in time"));
+	}
+
+	protected Task WriteData() {
+		var streams = Enumerable.Range(0, Streams)
+			.Select(i => string.Format("bank_account_it{0}-{1}", GetIterationCode(), i)).ToArray();
+		var slices = Split(streams, 3);
+
+		var w1 = Write(WriteMode.SingleEventAtTime, slices[0], EventsPerStream, CreateBankEvent);
+		var w2 = Write(WriteMode.Bucket, slices[1], EventsPerStream, CreateBankEvent);
+		var w3 = Write(WriteMode.Transactional, slices[2], EventsPerStream, CreateBankEvent);
+
+		var task = Task.Factory.ContinueWhenAll(new[] { w1, w2, w3 }, Task.WaitAll);
+		return task.ContinueWith(x => Log.Information("Data written for iteration {iteration}.", GetIterationCode()));
+	}
+
+	protected string CreateCountItem() {
+		var projectionManager = GetProjectionsManager();
+
+		string countItemsProjectionName = string.Format("CountItems_it{0}", GetIterationCode());
+		string countItemsProjection = string.Format(@"
+                fromCategory('bank_account_it{0}').when({{
+                $init: function() {{ return {{count:0}}; }},
+                AccountCredited: function (state, event) {{ 
+                                        state.count += 1; 
+                                    }},
+                AccountDebited: function (state, event) {{ 
+                                        state.count += 1; 
+                                    }},
+                AccountCheckPoint: function (state, event) {{ 
+                                        state.count += 1; 
+                                    }}
+                }})
+", GetIterationCode());
+
+		projectionManager.CreateContinuousAsync(countItemsProjectionName, countItemsProjection, AdminCredentials)
+			.Wait();
+		return countItemsProjectionName;
+	}
+
+	protected string CreateSumCheckForBankAccount0() {
+		string countItemsProjectionName = string.Format("CheckSumsInAccounts_it{0}", GetIterationCode());
+		string countItemsProjection = string.Format(@"
+                fromStream('bank_account_it{0}-0').when({{
+                    $init: function() {{ 
+                        return {{credited:0, credsum:'', debited:0, debsum:''}}; 
+                    }},
+                    AccountCredited: function (state, event) {{ 
+                        state.credited += event.body.creditedAmount; 
+                        /*state.credsum += '#' + event.sequenceNumber + ':' + event.body.creditedAmount + ';'*/ 
+                    }},
+                    AccountDebited: function (state, event) {{ 
+                        state.debited += event.body.debitedAmount; 
+                        /*state.debsum += '#' + event.sequenceNumber + ':' + event.body.debitedAmount + ';'*/ 
+                    }},
+                    AccountCheckPoint: function(state, event) {{ 
+                        if (state.credited != event.body.creditedAmount) {{
+                            throw JSON.stringify({{
+                                message: 'Credited amount is incorrect. ',
+                                expected: event.body.creditedAmount,
+                                actual: state.credited,
+                                stream: event.streamId,
+                                ver: event.sequenceNumber,
+                                details: state.credsum }});
+                        }}
+                        if (state.debited != event.body.debitedAmount) {{
+                            throw JSON.stringify({{
+                                message: 'Debited amount is incorrect. ',
+                                expected: event.body.debitedAmount,
+                                actual: state.debited,
+                                stream: event.streamId,
+                                ver: event.sequenceNumber,
+                                details: state.debsum }});
+                        }}
+                        state.success=event.sequenceNumber;
+                    }}
+                }})                
+", GetIterationCode());
+
+		GetProjectionsManager()
+			.CreateContinuousAsync(countItemsProjectionName, countItemsProjection, AdminCredentials).Wait();
+
+		return countItemsProjectionName;
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/RunTestScenarios/ProjectionsScenarioBase.cs b/src/KurrentDB.TestClient/Commands/RunTestScenarios/ProjectionsScenarioBase.cs
new file mode 100644
index 00000000000..33738a1fb4a
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/RunTestScenarios/ProjectionsScenarioBase.cs
@@ -0,0 +1,169 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Threading;
+using KurrentDB.Transport.Http.Codecs;
+
+namespace KurrentDB.TestClient.Commands.RunTestScenarios;
+
+internal abstract class ProjectionsScenarioBase : ScenarioBase {
+	protected ProjectionsScenarioBase(Action<IPEndPoint, byte[]> directSendOverTcp, int maxConcurrentRequests,
+		int connections, int streams, int eventsPerStream, int streamDeleteStep, string dbParentPath,
+		NodeConnectionInfo customNode)
+		: base(directSendOverTcp, maxConcurrentRequests, connections, streams, eventsPerStream, streamDeleteStep,
+			dbParentPath, customNode) {
+	}
+
+	protected bool CheckProjectionState(string projectionName, string key, Func<string, bool> checkValue) {
+		var state = GetProjectionState(projectionName);
+		string value;
+		return state != null && state.Count > 0 && state.TryGetValue(key, out value) && checkValue(value);
+	}
+
+	protected T GetProjectionStateValue<T>(string projectionName, string key, Func<string, T> convert,
+		T defaultValue) {
+		var result = defaultValue;
+
+		var state = GetProjectionState(projectionName);
+		string value;
+		if (state != null && state.Count > 0 && state.TryGetValue(key, out value))
+			result = convert(value);
+
+		return result;
+	}
+
+	protected bool GetProjectionIsRunning(string projectionName) {
+		var dic = GetProjectionStatistics(projectionName);
+
+		string value;
+		var isRunning = dic != null && dic.TryGetValue("status", out value) && value == "Running";
+
+		return isRunning;
+	}
+
+	protected long GetProjectionPosition(string projectionName) {
+		var dic = GetProjectionStatistics(projectionName);
+
+		long result = -1;
+
+		string value;
+		if (dic != null && dic.TryGetValue("position", out value)) {
+			if (!string.IsNullOrWhiteSpace(value)) {
+				var subpositions = value.Split(':');
+				var positionString = subpositions.Length == 2 ? subpositions[1] : value;
+				result = long.Parse(positionString);
+			} else {
+				result = -1;
+			}
+
+			return result;
+		}
+
+		return result;
+	}
+
+	protected bool GetProjectionIsFaulted(string projectionName, out string reason) {
+		var dic = GetProjectionStatistics(projectionName);
+
+		string status;
+		var isFaulted = dic != null && dic.TryGetValue("status", out status) && status.StartsWith("Faulted");
+
+		if (isFaulted)
+			dic.TryGetValue("stateReason", out reason);
+		else
+			reason = null;
+
+		return isFaulted;
+	}
+
+	private Dictionary<string, string> GetProjectionStatistics(string projectionName) {
+		string rawState;
+		try {
+			rawState = GetProjectionsManager().GetStatisticsAsync(projectionName, AdminCredentials).Result;
+		} catch (Exception ex) {
+			Log.Information(ex, "Failed to read projection statistics. Will continue.");
+			rawState = null;
+		}
+
+		Log.Information("Raw {projection} stats: {rawState}", projectionName, rawState);
+
+		if (string.IsNullOrEmpty(rawState))
+			return null;
+
+		if (rawState == "*** UNKNOWN ***")
+			return null;
+
+		var start = rawState.IndexOf('[');
+		var end = rawState.IndexOf(']');
+
+		if (start == -1 || end == -1)
+			return null;
+
+		var statDic = rawState.Substring(start + 1, end - start - 1);
+
+		var state = Codec.Json.From<Dictionary<string, string>>(statDic);
+		return state;
+	}
+
+	private Dictionary<string, string> GetProjectionState(string projectionName) {
+		var rawState = GetProjectionStateSafe(projectionName);
+
+		Log.Information("Raw {projection} state: {rawState}", projectionName, rawState);
+
+		if (string.IsNullOrEmpty(rawState))
+			return null;
+
+		if (rawState == "*** UNKNOWN ***")
+			return null;
+
+		var state = Codec.Json.From<Dictionary<string, string>>(rawState);
+		return state;
+	}
+
+	private string GetProjectionStateSafe(string projectionName) {
+		string rawState;
+		try {
+			rawState = GetProjectionsManager().GetStateAsync(projectionName, AdminCredentials).Result;
+		} catch (Exception ex) {
+			rawState = null;
+			Log.Information(ex, "Failed to get projection state");
+		}
+
+		return rawState;
+	}
+
+	protected void EnableProjectionByCategory() {
+		const string byCategoryProjection = "$by_category";
+
+		var retryCount = 0;
+		Exception exception = null;
+		while (retryCount < 5) {
+			Thread.Sleep(250 * (retryCount * retryCount));
+			try {
+				var isRunning = GetProjectionIsRunning(byCategoryProjection);
+
+				if (!isRunning) {
+					Log.Debug("Enable *{projection}* projection", byCategoryProjection);
+					GetProjectionsManager().EnableAsync(byCategoryProjection, AdminCredentials).Wait();
+				} else {
+					Log.Debug("Already enabled *{projection}* projection", byCategoryProjection);
+				}
+
+				exception = null;
+				break;
+			} catch (Exception ex) {
+				exception = new ApplicationException("Failed to enable by_category.", ex);
+				Log.Error(ex, "Failed to enable *$by_category* projection, retry #{retryCount}.",
+					retryCount);
+			}
+
+			retryCount += 1;
+		}
+
+		if (exception != null)
+			throw exception;
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/RunTestScenarios/ScenarioBase.cs b/src/KurrentDB.TestClient/Commands/RunTestScenarios/ScenarioBase.cs
new file mode 100644
index 00000000000..c3d7c69b01e
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/RunTestScenarios/ScenarioBase.cs
@@ -0,0 +1,605 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using EventStore.ClientAPI.Projections;
+using EventStore.ClientAPI.SystemData;
+using KurrentDB.Core.Services;
+using Serilog.Core;
+using ConsoleLogger = EventStore.ClientAPI.Common.Log.ConsoleLogger;
+using ILogger = Serilog.ILogger;
+using TcpCommand = KurrentDB.Core.Services.Transport.Tcp.TcpCommand;
+using TcpPackage = KurrentDB.Core.Services.Transport.Tcp.TcpPackage;
+
+namespace KurrentDB.TestClient.Commands.RunTestScenarios;
+
+internal abstract class ScenarioBase : IScenario {
+	protected static readonly ILogger Log = Serilog.Log.ForContext<ScenarioBase>();
+
+	protected static readonly EventStore.ClientAPI.ILogger ApiLogger =
+		new ClientApiLoggerBridge(Serilog.Log.ForContext(Constants.SourceContextPropertyName,
+			"client-api"));
+
+	protected readonly UserCredentials AdminCredentials =
+		new UserCredentials(SystemUsers.Admin, SystemUsers.DefaultAdminPassword);
+
+	protected readonly Action<IPEndPoint, byte[]> DirectSendOverTcp;
+	protected readonly int MaxConcurrentRequests;
+	protected readonly int Connections;
+	protected readonly int Streams;
+	protected readonly int EventsPerStream;
+	protected readonly int StreamDeleteStep;
+
+	private readonly NodeConnectionInfo _customNodeConnection;
+	private readonly NodeConnectionInfo _nodeConnection;
+
+	private readonly HashSet<int> _startedNodesProcIds;
+
+	private readonly string _dbPath;
+
+	private readonly Dictionary<WriteMode, Func<string, int, Func<int, EventData>, Task>> _writeHandlers;
+	private readonly IEventStoreConnection[] _connections;
+	private int _nextConnectionNum = -1;
+	private readonly ProjectionsManager _projectionsManager;
+
+	protected virtual TimeSpan StartupWaitInterval {
+		get { return TimeSpan.FromSeconds(12); }
+	}
+
+	protected ScenarioBase(Action<IPEndPoint, byte[]> directSendOverTcp,
+		int maxConcurrentRequests,
+		int connections,
+		int streams,
+		int eventsPerStream,
+		int streamDeleteStep,
+		string dbParentPath,
+		NodeConnectionInfo customNodeConnection) {
+		DirectSendOverTcp = directSendOverTcp;
+		MaxConcurrentRequests = maxConcurrentRequests;
+		Connections = connections;
+		Streams = streams;
+		EventsPerStream = eventsPerStream;
+		StreamDeleteStep = streamDeleteStep;
+		_customNodeConnection = customNodeConnection;
+
+		_startedNodesProcIds = new HashSet<int>();
+
+		var ipAddress = IPAddress.Loopback;
+
+		if (_customNodeConnection != null) {
+			_nodeConnection = _customNodeConnection;
+			_dbPath = null;
+		} else {
+			_dbPath = CreateNewDbPath(dbParentPath);
+			_nodeConnection = new NodeConnectionInfo(ipAddress,
+				PortsHelper.GetAvailablePort(ipAddress),
+				PortsHelper.GetAvailablePort(ipAddress));
+		}
+
+		_connections = new IEventStoreConnection[connections];
+
+		Log.Information("Projection manager points to {nodeConnection}.", _nodeConnection);
+		_projectionsManager = new ProjectionsManager(new ConsoleLogger(),
+			new IPEndPoint(_nodeConnection.IpAddress, _nodeConnection.HttpPort), TimeSpan.FromMilliseconds(5000));
+
+		_writeHandlers = new Dictionary<WriteMode, Func<string, int, Func<int, EventData>, Task>> {
+			{WriteMode.SingleEventAtTime, WriteSingleEventAtTime},
+			{WriteMode.Bucket, WriteBucketOfEventsAtTime},
+			{WriteMode.Transactional, WriteEventsInTransactionalWay}
+		};
+	}
+
+	private static string CreateNewDbPath(string dbParentPath) {
+		var dbParent = dbParentPath ?? Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+
+		var dataFolder = Path.Combine(dbParent, "data");
+		var idx = 0;
+		var dbPath = Path.Combine(dataFolder, string.Format("es_{0}", idx));
+
+		while (Directory.Exists(dbPath)) {
+			idx += 1;
+			dbPath = Path.Combine(dataFolder, string.Format("es_{0}", idx));
+		}
+
+		return dbPath;
+	}
+
+	protected IEventStoreConnection GetConnection() {
+		var connectionNum = (int)(((uint)Interlocked.Increment(ref _nextConnectionNum)) % Connections);
+		return _connections[connectionNum];
+	}
+
+	protected ProjectionsManager GetProjectionsManager() {
+		return _projectionsManager;
+	}
+
+	public void Run() {
+		const int maxReconnections = 200;
+		const int maxOperationRetries = 200;
+
+		for (int i = 0; i < Connections; ++i) {
+			_connections[i] = EventStoreConnection.Create(
+				ConnectionSettings.Create()
+					.UseCustomLogger(ApiLogger)
+					.LimitConcurrentOperationsTo(MaxConcurrentRequests)
+					.LimitRetriesForOperationTo(maxReconnections)
+					.LimitReconnectionsTo(maxOperationRetries)
+					.FailOnNoServerResponse(),
+				new Uri(string.Format("tcp://admin:changeit@{0}:{1}", _nodeConnection.IpAddress,
+					_nodeConnection.TcpPort)),
+				string.Format("ESConn-{0}", i));
+			_connections[i].Closed += (s, e) =>
+				Log.Debug("[SCENARIO] {connection} closed.", e.Connection.ConnectionName);
+			_connections[i].Connected += (s, e) =>
+				Log.Debug("[SCENARIO] {connection} connected to [{remoteEndPoint}].", e.Connection.ConnectionName,
+					e.RemoteEndPoint);
+			_connections[i].Disconnected += (s, e) =>
+				Log.Debug("[SCENARIO] {connection} disconnected from [{remoteEndPoint}].",
+					e.Connection.ConnectionName, e.RemoteEndPoint);
+			_connections[i].Reconnecting += (s, e) =>
+				Log.Debug("[SCENARIO] {connection} reconnecting.", e.Connection.ConnectionName);
+			_connections[i].ErrorOccurred += (s, e) => Log.Debug(e.Exception,
+				"[SCENARIO] {connection} error occurred.", e.Connection.ConnectionName);
+			_connections[i].ConnectAsync().Wait();
+		}
+
+		RunInternal();
+	}
+
+	protected abstract void RunInternal();
+
+	public void Clean() {
+		CloseConnections();
+		KillStartedNodes();
+		DeleteDatabase();
+	}
+
+	private void DeleteDatabase() {
+		try {
+			if (_dbPath != null) {
+				Log.Information("Deleting {dbPath}...", _dbPath);
+				Directory.Delete(_dbPath, true);
+				Log.Information("Deleted {dbPath}", _dbPath);
+			}
+		} catch (IOException ex) {
+			Log.Error(ex, "Failed to delete dir {dbPath}, IOException was raised", _dbPath);
+		} catch (UnauthorizedAccessException ex) {
+			Log.Error(ex, "Failed to delete dir {dbPath}, UnauthorizedAccessException was raised",
+				_dbPath);
+		}
+	}
+
+	protected T[][] Split<T>(IEnumerable<T> sequence, int parts) {
+		return sequence.Select((x, i) => new { GroupNum = i % parts, Item = x })
+			.GroupBy(x => x.GroupNum, y => y.Item)
+			.Select(x => x.ToArray())
+			.ToArray();
+	}
+
+
+	protected Task Write(WriteMode mode, string[] streams, int eventsPerStream) {
+		Func<int, EventData> createEvent = TestEvent.NewTestEvent;
+		return Write(mode, streams, eventsPerStream, createEvent);
+	}
+
+	protected Task Write(WriteMode mode, string[] streams, int eventsPerStream, Func<int, EventData> createEvent) {
+		Log.Information(
+			"Writing. Mode : {mode,-15} Streams : {streamsLength,-10} Events per stream : {eventsPerStream,-10}",
+			mode,
+			streams.Length,
+			eventsPerStream);
+
+		Func<string, int, Func<int, EventData>, Task> handler;
+		if (!_writeHandlers.TryGetValue(mode, out handler))
+			throw new ArgumentOutOfRangeException("mode");
+
+		var tasks = new List<Task>();
+		for (var i = 0; i < streams.Length; i++) {
+			//Console.WriteLine("WRITING TO {0}", streams[i]);
+			tasks.Add(handler(streams[i], eventsPerStream, createEvent));
+		}
+
+		return Task.Factory.ContinueWhenAll(tasks.ToArray(), tsks => {
+			Task.WaitAll(tsks);
+			Log.Information(
+				"Finished writing. Mode : {mode,-15} Streams : {streamsLength,-10} Events per stream : {eventsPerStream,-10}",
+				mode,
+				streams.Length,
+				eventsPerStream);
+		});
+	}
+
+	protected void DeleteStreams(IEnumerable<string> streams) {
+		Log.Information("Deleting streams...");
+		var store = GetConnection();
+
+		var tasks = new List<Task>();
+		foreach (var stream in streams) {
+			var s = stream;
+			Log.Information("Deleting stream {stream}...", stream);
+			var task = store.DeleteStreamAsync(stream, (EventsPerStream - 1), hardDelete: true)
+				.ContinueWith(x => Log.Information("Stream {stream} successfully deleted", s));
+
+			tasks.Add(task);
+		}
+
+		Task.WaitAll(tasks.ToArray());
+
+		Log.Information("All streams successfully deleted");
+	}
+
+	protected Task CheckStreamsDeleted(IEnumerable<string> streams) {
+		Log.Information("Verifying streams are deleted...");
+
+		var store = GetConnection();
+		var tasks = new List<Task>();
+
+		foreach (var stream in streams) {
+			var s = stream;
+			var task = store.ReadStreamEventsForwardAsync(stream, 0, 1, resolveLinkTos: false).ContinueWith(t => {
+				if (t.Result.Status != SliceReadStatus.StreamDeleted)
+					throw new Exception(string.Format("Stream '{0}' is not deleted, but should be!", s));
+			});
+
+			tasks.Add(task);
+		}
+
+		return Task.Factory.ContinueWhenAll(tasks.ToArray(), tsks => {
+			Task.WaitAll(tsks);
+			Log.Information("Stream deletion verification succeeded.");
+		});
+	}
+
+	protected Task Read(string[] streams, int @from, int count) {
+		if (streams.Length == 0) {
+			Debugger.Break();
+			throw new Exception("Streams shouldn't be empty.");
+		}
+
+		Log.Information("Reading [{streams}]\nfrom {from,-10} count {count,-10}", string.Join(",", streams), from, count);
+
+		var tasks = new List<Task>();
+
+		for (int i = 0; i < streams.Length; i++) {
+			var task = ReadStream(streams[i], from, count);
+			tasks.Add(task);
+		}
+
+		return Task.Factory.ContinueWhenAll(tasks.ToArray(), tsks => {
+			Task.WaitAll(tsks);
+			Log.Information("Done reading [{streams}]", string.Join(",", streams));
+		});
+	}
+
+	private bool TryGetPathToMono(out string pathToMono) {
+		const string monopathVariable = "EVENTSTORE_MONOPATH";
+		pathToMono = Environment.GetEnvironmentVariable(monopathVariable);
+		return !string.IsNullOrEmpty(pathToMono);
+	}
+
+	protected int StartNode() {
+		int processId = -1;
+		if (_customNodeConnection == null)
+			processId = StartNewNode();
+
+		return processId;
+	}
+
+	private int StartNewNode() {
+		var clientFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+		//../../KurrentDB/net471/KurrentDB.exe
+		var clusterNodeFolder = Directory.GetParent(Directory.GetParent(clientFolder).FullName)
+								+ "/KurrentDB/net471/";
+		string fileName;
+		string argumentsHead;
+
+		string pathToMono;
+		if (TryGetPathToMono(out pathToMono)) {
+			Log.Information("Mono at {pathToMono} will be used.", pathToMono);
+			fileName = pathToMono;
+			argumentsHead = string.Format("--debug --gc=sgen {0}",
+				Path.Combine(clusterNodeFolder, "KurrentDB.exe"));
+		} else {
+			fileName = Path.Combine(clusterNodeFolder, "KurrentDB.exe");
+			argumentsHead = "";
+		}
+
+		var arguments = string.Format(
+			"{0} --run-projections=all --ext-ip {1} --ext-tcp-port {2} --ext-http-port {3} --db {4}",
+			argumentsHead,
+			_nodeConnection.IpAddress,
+			_nodeConnection.TcpPort,
+			_nodeConnection.HttpPort,
+			_dbPath);
+
+		Log.Information("Starting [{fileName} {arguments}]...", fileName, arguments);
+
+		var startInfo = new ProcessStartInfo(fileName, arguments);
+
+		var nodeProcess = Process.Start(startInfo);
+		if (nodeProcess == null || nodeProcess.HasExited)
+			throw new ApplicationException(string.Format("Process was not started [{0} {1}].", fileName,
+				arguments));
+
+		Thread.Sleep(3000);
+		Process tmp;
+		var running = TryGetProcessById(nodeProcess.Id, out tmp);
+		if (!running || tmp.HasExited)
+			throw new ApplicationException(string.Format("Process was not started [{0} {1}].", fileName,
+				arguments));
+
+		_startedNodesProcIds.Add(nodeProcess.Id);
+
+		Log.Information("Started node with process id {id}", nodeProcess.Id);
+
+		Thread.Sleep(StartupWaitInterval);
+		Log.Information("Started [{fileName} {arguments}]", fileName, arguments);
+
+		return nodeProcess.Id;
+	}
+
+	private bool TryGetProcessById(int processId, out Process process) {
+		process = null;
+
+		try {
+			process = Process.GetProcessById(processId);
+		} catch (ArgumentException) {
+			return false;
+		} catch (InvalidOperationException) {
+			return false;
+		}
+
+		return true;
+	}
+
+	protected void KillNode(int processId) {
+		if (processId != -1)
+			KillStartedNode(processId);
+		else
+			Log.Information("Skip killing, procId -1");
+	}
+
+	private void KillStartedNode(int processId) {
+		Log.Information("Killing {processId}...", processId);
+
+		Process process;
+		if (TryGetProcessById(processId, out process)) {
+			process.Kill();
+
+			var waitCount = 200;
+			while (!process.HasExited && waitCount > 0) {
+				Thread.Sleep(250);
+				waitCount -= 1;
+			}
+
+			if (process.HasExited) {
+				_startedNodesProcIds.Remove(processId);
+
+				PortsHelper.ReturnPort(_nodeConnection.TcpPort);
+				PortsHelper.ReturnPort(_nodeConnection.HttpPort);
+
+				Log.Information("Killed process {processId}, wait a bit.", processId);
+				Thread.Sleep(1000); // wait for system to release port used by HttpListener.
+			} else {
+				Process temp;
+				if (TryGetProcessById(processId, out temp))
+					Log.Error(
+						"Process {processId} did not report about exit in time and is still present in processes list.",
+						processId);
+				else
+					Log.Information("Process {processId} did not report about exit in time but is not found again.",
+						processId);
+			}
+		} else
+			Log.Error("Process {processId} was not found to be killed.", processId);
+	}
+
+	public void Dispose() {
+		CloseConnections();
+		Thread.Sleep(2 * 1000);
+		KillStartedNodes();
+	}
+
+	private void CloseConnections() {
+		for (int i = 0; i < _connections.Length; ++i) {
+			_connections[i].Close();
+		}
+	}
+
+	private void KillStartedNodes() {
+		Log.Information("Killing remaining nodes...");
+		try {
+			_startedNodesProcIds.ToList().ForEach(KillNode);
+		} catch (Exception ex) {
+			Log.Error("Failed to kill started nodes: {e}.", ex.Message);
+		}
+	}
+
+	protected void Scavenge() {
+		Log.Information("Send scavenge command...");
+		var package = new TcpPackage(TcpCommand.ScavengeDatabase, Guid.NewGuid(), null).AsByteArray();
+		DirectSendOverTcp(new IPEndPoint(_nodeConnection.IpAddress, _nodeConnection.TcpPort), package);
+		Log.Information("Scavenge command was sent.");
+	}
+
+	private Task WriteSingleEventAtTime(string stream, int events, Func<int, EventData> createEvent) {
+		var resSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+		Log.Information("Starting to write {events} events to [{stream}]", events, stream);
+		var store = GetConnection();
+		int eventVersion = 0;
+
+		Action<Task> fail = prevTask => {
+			Log.Information("WriteSingleEventAtTime for stream {stream} failed.", stream);
+			resSource.SetException(prevTask.Exception);
+		};
+
+		Action<Task> writeSingleEvent = null;
+		writeSingleEvent = _ => {
+			if (eventVersion == events) {
+				Log.Information("Wrote {events} events to [{stream}]", events, stream);
+				resSource.SetResult(null);
+				return;
+			}
+
+			var writeTask = store.AppendToStreamAsync(stream,
+				eventVersion - 1,
+				new[] { createEvent(eventVersion) });
+
+			eventVersion += 1;
+
+			writeTask.ContinueWith(fail, TaskContinuationOptions.OnlyOnFaulted);
+			writeTask.ContinueWith(writeSingleEvent, TaskContinuationOptions.OnlyOnRanToCompletion);
+		};
+
+		writeSingleEvent(null);
+
+		return resSource.Task;
+	}
+
+	private Task WriteBucketOfEventsAtTime(string stream, int eventCount, Func<int, EventData> createEvent) {
+		const int bucketSize = 25;
+		Log.Information("Starting to write {eventCount} events to [{stream}] ({bucketSize} events at once)", eventCount,
+			stream, bucketSize);
+
+		var resSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
+		var store = GetConnection();
+		int writtenCount = 0;
+
+		Action<Task> fail = prevTask => {
+			Log.Information("WriteBucketOfEventsAtTime for stream {stream} failed.", stream);
+			resSource.SetException(prevTask.Exception);
+		};
+
+		Action<Task> writeBatch = null;
+		writeBatch = _ => {
+			if (writtenCount == eventCount) {
+				Log.Information("Wrote {eventCount} events to [{stream}] ({bucketSize} events at once)", eventCount,
+					stream, bucketSize);
+				resSource.SetResult(null);
+				return;
+			}
+
+			var startIndex = writtenCount;
+			var endIndex = Math.Min(eventCount, startIndex + bucketSize);
+			var events = Enumerable.Range(startIndex, endIndex - startIndex).Select(createEvent).ToArray();
+
+			writtenCount = endIndex;
+
+			var expectedVersion = startIndex - 1;
+			var writeTask = store.AppendToStreamAsync(stream, expectedVersion, events);
+
+			writeTask.ContinueWith(fail, TaskContinuationOptions.OnlyOnFaulted);
+			writeTask.ContinueWith(writeBatch, TaskContinuationOptions.OnlyOnRanToCompletion);
+		};
+
+		writeBatch(null);
+
+		return resSource.Task;
+	}
+
+	private Task WriteEventsInTransactionalWay(string stream, int eventCount, Func<int, EventData> createEvent) {
+		Log.Information("Starting to write {eventCount} events to [{stream}] (in single transaction)", eventCount, stream);
+
+		var resSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
+		var store = GetConnection();
+
+		Action<Task> fail = prevTask => {
+			Log.Information("WriteEventsInTransactionalWay for stream {stream} failed.", stream);
+			resSource.SetException(prevTask.Exception);
+		};
+
+		int writtenCount = 0;
+		EventStoreTransaction transaction = null;
+
+		Action<Task> writeTransactionEvent = null;
+		writeTransactionEvent = prevTask => {
+			if (writtenCount == eventCount) {
+				var commitTask = transaction.CommitAsync();
+				commitTask.ContinueWith(fail, TaskContinuationOptions.OnlyOnFaulted);
+				commitTask.ContinueWith(t => {
+					Log.Information("Wrote {eventCount} events to [{stream}] (in single transaction)", eventCount, stream);
+					resSource.SetResult(null);
+				}, TaskContinuationOptions.OnlyOnRanToCompletion);
+				return;
+			}
+
+			var writeTask = transaction.WriteAsync(createEvent(writtenCount));
+
+			writtenCount += 1;
+
+			writeTask.ContinueWith(fail, TaskContinuationOptions.OnlyOnFaulted);
+			writeTask.ContinueWith(writeTransactionEvent, TaskContinuationOptions.OnlyOnRanToCompletion);
+		};
+
+		var startTask = store.StartTransactionAsync(stream, -1);
+		startTask.ContinueWith(fail, TaskContinuationOptions.OnlyOnFaulted);
+		startTask.ContinueWith(t => {
+			transaction = t.Result;
+			writeTransactionEvent(t);
+		}, TaskContinuationOptions.OnlyOnRanToCompletion);
+
+		return resSource.Task;
+	}
+
+	private Task ReadStream(string stream, int from, int count) {
+		Log.Information("Reading [{stream}] from {from,-10} count {count,-10}", stream, from, count);
+		var resSource = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
+		var store = GetConnection();
+
+		Action<Task> fail = prevTask => {
+			Log.Information("ReadStream for stream {stream} failed.", stream);
+			resSource.SetException(prevTask.Exception);
+		};
+
+		var readTask = store.ReadStreamEventsForwardAsync(stream, @from, count, resolveLinkTos: false);
+		readTask.ContinueWith(fail, TaskContinuationOptions.OnlyOnFaulted);
+		readTask.ContinueWith(t => {
+			try {
+				var slice = t.Result;
+				if (slice?.Events == null || slice.Events.Length != count) {
+					throw new Exception(string.Format(
+						"Tried to read {0} events from event number {1} from stream '{2}' but failed. Reason: {3}.",
+						count,
+						from,
+						stream,
+						slice == null ? "slice == null"
+						: slice.Events == null ? "slive.Events == null"
+						: slice.Events.Length != count ? string.Format("Expected count: {0}, actual count: {1}.",
+							count, slice.Events.Length)
+						: "WAT?!?"));
+				}
+
+				for (int i = 0; i < count; ++i) {
+					var evnt = slice.Events[i].Event;
+					if (evnt.EventNumber != i + from) {
+						throw new Exception(string.Format(
+							"Received event with wrong event number. Expected: {0}, actual: {1}.\nEvent: {2}.",
+							from + i,
+							evnt.EventNumber,
+							evnt));
+					}
+
+					TestEvent.VerifyIfMatched(evnt);
+				}
+
+				Log.Information("Done reading [{stream}] from {from,-10} count {count,-10}", stream, from, count);
+				resSource.SetResult(null);
+			} catch (Exception exc) {
+				Log.Information("ReadStream for stream {stream} failed.", stream);
+				resSource.SetException(exc);
+			}
+		}, TaskContinuationOptions.OnlyOnRanToCompletion);
+
+		return resSource.Task;
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/RunTestScenarios/TestEvent.cs b/src/KurrentDB.TestClient/Commands/RunTestScenarios/TestEvent.cs
new file mode 100644
index 00000000000..c3e1f59a58c
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/RunTestScenarios/TestEvent.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using EventStore.ClientAPI;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.TestClient.Commands.RunTestScenarios;
+
+internal class TestEvent {
+	public static EventData NewTestEvent(int index) {
+		var subIndex = (index % 50);
+		var type = "TestEvent-" + subIndex.ToString();
+		var body = new string('#', 1 + subIndex * subIndex);
+		var encodedData = Helper.UTF8NoBom.GetBytes(string.Format("{0}-{1}-{2}", index, body.Length, body));
+
+		return new EventData(Guid.NewGuid(), type, false, encodedData, new byte[0]);
+	}
+
+	public static void VerifyIfMatched(RecordedEvent evnt) {
+		if (evnt.EventType.StartsWith("TestEvent")) {
+			var data = Helper.UTF8NoBom.GetString(evnt.Data);
+			var atoms = data.Split('-');
+			if (atoms.Length != 3)
+				throw new ApplicationException(string.Format("Invalid TestEvent object: currupted data format: {0}",
+					RecordDetailsString(evnt)));
+
+			var expectedLength = int.Parse(atoms[1]);
+			if (expectedLength != atoms[2].Length)
+				throw new ApplicationException(string.Format(
+					"Invalid TestEvent object: not expected data length: {0}",
+					RecordDetailsString(evnt)));
+
+			if (new string('#', expectedLength) != atoms[2])
+				throw new ApplicationException(string.Format("Invalid TestEvent object: currupted data: {0}",
+					RecordDetailsString(evnt)));
+		}
+	}
+
+	private static string RecordDetailsString(RecordedEvent evnt) {
+		var data = Helper.UTF8NoBom.GetString(evnt.Data);
+		return string.Format("[stream:{0}; eventNumber:{1}; type:{2}; data:{3}]",
+			evnt.EventStreamId,
+			evnt.EventNumber,
+			evnt.EventType,
+			data.Length > 12 ? (data.Substring(0, 12) + "...") : data);
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/RunTestScenarios/WriteMode.cs b/src/KurrentDB.TestClient/Commands/RunTestScenarios/WriteMode.cs
new file mode 100644
index 00000000000..44ebe482013
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/RunTestScenarios/WriteMode.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.TestClient.Commands.RunTestScenarios;
+
+internal enum WriteMode {
+	SingleEventAtTime,
+	Bucket,
+	Transactional
+}
diff --git a/src/KurrentDB.TestClient/Commands/RunTestScenariosProcessor.cs b/src/KurrentDB.TestClient/Commands/RunTestScenariosProcessor.cs
new file mode 100644
index 00000000000..9c76e1ff302
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/RunTestScenariosProcessor.cs
@@ -0,0 +1,251 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.TestClient.Commands.RunTestScenarios;
+using KurrentDB.Transport.Tcp;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class RunTestScenariosProcessor : ICmdProcessor {
+	private static readonly ILogger Log = Serilog.Log.ForContext<RunTestScenariosProcessor>();
+	private const string AllScenariosFlag = "ALL";
+
+	public string Keyword {
+		get { return "RT"; }
+	}
+
+	public string Usage {
+		get {
+			const string usage = "<max concurrent requests, int> " +
+								 "\n<connections, int> " +
+								 "\n<streams count, int> " +
+								 "\n<eventsPerStream, int> " +
+								 "\n<streams delete step, int> " +
+								 "\n<scenario name, string, " + AllScenariosFlag + " for all scenarios>" +
+								 "\n<execution period minutes, int>" +
+								 "\n<dbParentPath or custom node, string or ip:tcp:http>";
+
+			return usage;
+		}
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		if (args.Length != 0 && false == (args.Length == 7 || args.Length == 8))
+			return false;
+
+		var maxConcurrentRequests = 20;
+		var connections = 10;
+		var streams = 100;
+		var eventsPerStream = 400;
+		var streamDeleteStep = 7;
+		var scenarioName = "";
+		var executionPeriodMinutes = 2;
+		string dbParentPath = null;
+		NodeConnectionInfo customNode = null;
+
+		{
+			if (args.Length == 9) {
+				throw new ArgumentException(
+					"Not compatible arguments, only one of <dbPath> or <custom node> can be specified.");
+			}
+
+			if (args.Length == 8) {
+				IPAddress ip;
+				int tcpPort;
+				int httpPort;
+
+				var atoms = args[7].Split(':');
+				if (atoms.Length == 3
+					&& IPAddress.TryParse(atoms[0], out ip)
+					&& int.TryParse(atoms[1], out tcpPort)
+					&& int.TryParse(atoms[2], out httpPort)) {
+					customNode = new NodeConnectionInfo(ip, tcpPort, httpPort);
+
+					args = CutLastArgument(args);
+				}
+			}
+
+			if (args.Length == 7 || args.Length == 8) {
+				try {
+					maxConcurrentRequests = int.Parse(args[0]);
+					connections = int.Parse(args[1]);
+					streams = int.Parse(args[2]);
+					eventsPerStream = int.Parse(args[3]);
+					streamDeleteStep = int.Parse(args[4]);
+					scenarioName = args[5];
+					executionPeriodMinutes = int.Parse(args[6]);
+
+					if (args.Length == 8) {
+						dbParentPath = args[7];
+					} else {
+						var envDbPath = Environment.GetEnvironmentVariable("KURRENTDB_DATABASEPATH");
+						if (!string.IsNullOrEmpty(envDbPath))
+							dbParentPath = envDbPath;
+					}
+				} catch (Exception e) {
+					Log.Error("Invalid arguments ({e})", e.Message);
+					return false;
+				}
+			}
+		}
+
+		context.IsAsync();
+
+		Log.Information("\n---" +
+				 "\nRunning scenario {scenario} using {connections} connections with {maxConcurrentRequests} max concurrent requests," +
+				 "\nfor {streams} streams {eventsPerStream} events each deleting every {streamDeleteStep}th stream. " +
+				 "\nExecution period {executionPeriod} minutes. " +
+				 "\nDatabase path {dbParentPath};" +
+				 "\nCustom Node {customNode};" +
+				 "\n---",
+			scenarioName,
+			connections,
+			maxConcurrentRequests,
+			streams,
+			eventsPerStream,
+			streamDeleteStep,
+			executionPeriodMinutes,
+			dbParentPath,
+			customNode);
+
+		var directTcpSender = CreateDirectTcpSender(context);
+		var allScenarios = new IScenario[] {
+			new LoopingScenario(directTcpSender,
+				maxConcurrentRequests,
+				connections,
+				streams,
+				eventsPerStream,
+				streamDeleteStep,
+				TimeSpan.FromMinutes(executionPeriodMinutes),
+				dbParentPath,
+				customNode),
+			new ProjectionsKillScenario(directTcpSender,
+				maxConcurrentRequests,
+				connections,
+				streams,
+				eventsPerStream,
+				streamDeleteStep,
+				dbParentPath,
+				customNode),
+			new ProjForeachForcedCommonNameScenario(directTcpSender,
+				maxConcurrentRequests,
+				connections,
+				streams,
+				eventsPerStream,
+				streamDeleteStep,
+				TimeSpan.FromMinutes(executionPeriodMinutes),
+				dbParentPath,
+				customNode),
+			new ProjForeachForcedCommonNameNoRestartScenario(directTcpSender,
+				maxConcurrentRequests,
+				connections,
+				streams,
+				eventsPerStream,
+				streamDeleteStep,
+				TimeSpan.FromMinutes(executionPeriodMinutes),
+				dbParentPath,
+				customNode),
+			new LoopingProjTranWriteScenario(directTcpSender,
+				maxConcurrentRequests,
+				connections,
+				streams,
+				eventsPerStream,
+				streamDeleteStep,
+				TimeSpan.FromMinutes(executionPeriodMinutes),
+				dbParentPath,
+				customNode),
+			new LoopingProjectionKillScenario(directTcpSender,
+				maxConcurrentRequests,
+				connections,
+				streams,
+				eventsPerStream,
+				streamDeleteStep,
+				TimeSpan.FromMinutes(executionPeriodMinutes),
+				dbParentPath,
+				customNode),
+			new MassProjectionsScenario(directTcpSender,
+				maxConcurrentRequests,
+				connections,
+				streams,
+				eventsPerStream,
+				streamDeleteStep,
+				dbParentPath,
+				customNode),
+			new ProjectionWrongTagCheck(directTcpSender,
+				maxConcurrentRequests,
+				connections,
+				streams,
+				eventsPerStream,
+				streamDeleteStep,
+				TimeSpan.FromMinutes(executionPeriodMinutes),
+				dbParentPath,
+				customNode),
+		};
+
+		Log.Information("Found scenarios {scenariosCount} total :\n{scenarios}.", allScenarios.Length,
+			allScenarios.Aggregate(new StringBuilder(),
+				(sb, s) => sb.AppendFormat("{0}, ", s.GetType().Name)));
+		var scenarios = allScenarios.Where(x => scenarioName == AllScenariosFlag
+												|| x.GetType().Name.Equals(scenarioName,
+													StringComparison.InvariantCultureIgnoreCase))
+			.ToArray();
+
+		Log.Information("Running test scenarios ({scenarios} total)...", scenarios.Length);
+
+		foreach (var scenario in scenarios) {
+			using (scenario) {
+				try {
+					Log.Information("Run scenario {type}", scenario.GetType().Name);
+					scenario.Run();
+					scenario.Clean();
+					Log.Information("Scenario run successfully");
+				} catch (Exception e) {
+					context.Fail(e);
+				}
+			}
+		}
+
+		Log.Information("Finished running test scenarios");
+
+		if (context.ExitCode == 0)
+			context.Success();
+
+		return true;
+	}
+
+	private static string[] CutLastArgument(string[] args) {
+		var cutArgs = new string[7];
+		Array.Copy(args, cutArgs, 7);
+		return cutArgs;
+	}
+
+	private Action<IPEndPoint, byte[]> CreateDirectTcpSender(CommandProcessorContext context) {
+		const int timeoutMilliseconds = 4000;
+
+		Action<IPEndPoint, byte[]> sender = (tcpEndPoint, bytes) => {
+			var sent = new AutoResetEvent(false);
+
+			Action<TcpTypedConnection<byte[]>, TcpPackage> handlePackage = (_, __) => { };
+			Action<TcpTypedConnection<byte[]>> established = connection => {
+				connection.EnqueueSend(bytes);
+				connection.Close();
+				sent.Set();
+			};
+			Action<TcpTypedConnection<byte[]>, SocketError> closed = (_, __) => sent.Set();
+
+			context._tcpTestClient.CreateTcpConnection(context, handlePackage, established, closed, false, tcpEndPoint);
+			if (!sent.WaitOne(timeoutMilliseconds))
+				throw new ApplicationException("Connection to server was not closed in time.");
+		};
+
+		return sender;
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/ScavengeProcessor.cs b/src/KurrentDB.TestClient/Commands/ScavengeProcessor.cs
new file mode 100644
index 00000000000..3ccb4cf7926
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/ScavengeProcessor.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net.Sockets;
+using KurrentDB.Core.Services.Transport.Tcp;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class ScavengeProcessor : ICmdProcessor {
+	public string Usage {
+		get { return Keyword; }
+	}
+
+	public string Keyword {
+		get { return "SCAVENGE"; }
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		var package = new TcpPackage(TcpCommand.ScavengeDatabase, Guid.NewGuid(), null);
+		context.Log.Information("Sending SCAVENGE request...");
+
+		var connection = context._tcpTestClient.CreateTcpConnection(
+			context,
+			(conn, pkg) => { },
+			null,
+			(typedConnection, error) => {
+				if (error == SocketError.Success)
+					context.Success();
+				else
+					context.Fail();
+			});
+		connection.EnqueueSend(package.AsByteArray());
+		connection.Close("OK");
+		return true;
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/SubscribeToStreamProcessor.cs b/src/KurrentDB.TestClient/Commands/SubscribeToStreamProcessor.cs
new file mode 100644
index 00000000000..c00c4bad166
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/SubscribeToStreamProcessor.cs
@@ -0,0 +1,93 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Net.Sockets;
+using EventStore.Client.Messages;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Services.Transport.Tcp;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class SubscribeToStreamProcessor : ICmdProcessor {
+	public string Usage {
+		get { return "SUBSCR [<stream_1> <stream_2> ... <stream_n>]"; }
+	}
+
+	public string Keyword {
+		get { return "SUBSCR"; }
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		context.IsAsync();
+
+		var streamByCorrId = new Dictionary<Guid, string>();
+
+		var connection = context._tcpTestClient.CreateTcpConnection(
+			context,
+			connectionEstablished: conn => { },
+			handlePackage: (conn, pkg) => {
+				switch (pkg.Command) {
+					case TcpCommand.SubscriptionConfirmation: {
+						var dto = pkg.Data.Deserialize<SubscriptionConfirmation>();
+						context.Log.Information(
+							"Subscription to <{stream}> WAS CONFIRMED! Subscribed at {lastIndexedPosition} ({lastEventNumber})",
+							streamByCorrId[pkg.CorrelationId], dto.LastCommitPosition, dto.LastEventNumber);
+						break;
+					}
+					case TcpCommand.StreamEventAppeared: {
+						var dto = pkg.Data.Deserialize<StreamEventAppeared>();
+						context.Log.Information("NEW EVENT:\n\n"
+										 + "\tEventStreamId: {stream}\n"
+										 + "\tEventNumber:   {eventNumber}\n"
+										 + "\tEventType:     {eventType}\n"
+										 + "\tData:          {data}\n"
+										 + "\tMetadata:      {metadata}\n",
+							dto.Event.Event.EventStreamId,
+							dto.Event.Event.EventNumber,
+							dto.Event.Event.EventType,
+							Helper.UTF8NoBom.GetString(dto.Event.Event.Data.ToByteArray()),
+							Helper.UTF8NoBom.GetString(dto.Event.Event.Metadata.ToByteArray()));
+						break;
+					}
+					case TcpCommand.SubscriptionDropped: {
+						pkg.Data.Deserialize<SubscriptionDropped>();
+						context.Log.Error("Subscription to <{stream}> WAS DROPPED!",
+							streamByCorrId[pkg.CorrelationId]);
+						break;
+					}
+					default:
+						context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
+						break;
+				}
+			},
+			connectionClosed: (c, error) => {
+				if (error == SocketError.Success)
+					context.Success();
+				else
+					context.Fail();
+			});
+
+		if (args.Length == 0) {
+			context.Log.Information("SUBSCRIBING TO ALL STREAMS...");
+			var cmd = new SubscribeToStream(string.Empty, resolveLinkTos: false);
+			Guid correlationId = Guid.NewGuid();
+			streamByCorrId[correlationId] = "$all";
+			connection.EnqueueSend(new TcpPackage(TcpCommand.SubscribeToStream, correlationId, cmd.Serialize())
+				.AsByteArray());
+		} else {
+			foreach (var stream in args) {
+				context.Log.Information("SUBSCRIBING TO STREAM <{stream}>...", stream);
+				var cmd = new SubscribeToStream(stream, resolveLinkTos: false);
+				var correlationId = Guid.NewGuid();
+				streamByCorrId[correlationId] = stream;
+				connection.EnqueueSend(new TcpPackage(TcpCommand.SubscribeToStream, correlationId, cmd.Serialize())
+					.AsByteArray());
+			}
+		}
+
+		context.WaitForCompletion();
+		return true;
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/SubscriptionStressTestProcessor.cs b/src/KurrentDB.TestClient/Commands/SubscriptionStressTestProcessor.cs
new file mode 100644
index 00000000000..378291cb850
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/SubscriptionStressTestProcessor.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.ClientAPI;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class SubscriptionStressTestProcessor : ICmdProcessor {
+	public string Usage {
+		get { return "SST [<subscription-count>]"; }
+	}
+
+	public string Keyword {
+		get { return "SST"; }
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		int subscriptionCount = 5000;
+
+		if (args.Length > 0) {
+			if (args.Length > 1)
+				return false;
+			subscriptionCount = MetricPrefixValue.ParseInt(args[0]);
+		}
+
+		context.IsAsync();
+
+		var conn = EventStoreConnection.Create(ConnectionSettings.Create()
+				.UseCustomLogger(new ClientApiLoggerBridge(context.Log))
+				.FailOnNoServerResponse()
+			/*.EnableVerboseLogging()*/,
+			new Uri($"tcp://{context._tcpTestClient.TcpEndpoint.GetHost()}:{context._tcpTestClient.TcpEndpoint.GetPort()}"));
+		conn.ConnectAsync().Wait();
+
+		long appearedCnt = 0;
+		var sw = Stopwatch.StartNew();
+		for (int i = 0; i < subscriptionCount; ++i) {
+			conn.SubscribeToStreamAsync(
+				string.Format("stream-{0}", i),
+				false,
+				(s, e) => {
+					var c = Interlocked.Increment(ref appearedCnt);
+					if (c % 1000 == 0)
+						Console.Write('\'');
+					if (c % 100000 == 0) {
+						context.Log.Debug("Received total {events} events ({rate} per sec)...", c,
+							100000.0 / sw.Elapsed.TotalSeconds);
+						sw.Restart();
+					}
+
+					return Task.CompletedTask;
+				}).Wait();
+		}
+
+		context.Log.Information("Subscribed to {subscriptionCount} streams...", subscriptionCount);
+		return true;
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/TcpSanitazationCheckProcessor.cs b/src/KurrentDB.TestClient/Commands/TcpSanitazationCheckProcessor.cs
new file mode 100644
index 00000000000..2eab0e93cb8
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/TcpSanitazationCheckProcessor.cs
@@ -0,0 +1,116 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Services.Transport.Tcp;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class TcpSanitazationCheckProcessor : ICmdProcessor {
+	private static readonly ILogger Log = Serilog.Log.ForContext<TcpSanitazationCheckProcessor>();
+
+	public string Keyword {
+		get { return "CHKTCP"; }
+	}
+
+	public string Usage {
+		get { return Keyword; }
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		context.IsAsync();
+
+		var commandsToCheck = new[] {
+			(byte)TcpCommand.WriteEvents,
+			(byte)TcpCommand.TransactionStart,
+			(byte)TcpCommand.TransactionWrite,
+			(byte)TcpCommand.TransactionCommit,
+			(byte)TcpCommand.DeleteStream,
+			(byte)TcpCommand.ReadEvent,
+			(byte)TcpCommand.ReadStreamEventsForward,
+			(byte)TcpCommand.ReadStreamEventsBackward,
+			(byte)TcpCommand.ReadAllEventsForward,
+			(byte)TcpCommand.ReadAllEventsBackward,
+			(byte)TcpCommand.SubscribeToStream,
+			(byte)TcpCommand.UnsubscribeFromStream,
+		};
+
+		var packages = commandsToCheck.Select(c =>
+				new TcpPackage((TcpCommand)c, Guid.NewGuid(), new byte[] { 0, 1, 0, 1 }).AsByteArray())
+			.Union(new[] {
+				BitConverter.GetBytes(int.MaxValue).Union(new byte[] {1, 2, 3, 4}).ToArray(),
+				BitConverter.GetBytes(int.MinValue).Union(new byte[] {1, 2, 3, 4}).ToArray(),
+				BitConverter.GetBytes(0).Union(Enumerable.Range(0, 256).Select(x => (byte)x)).ToArray()
+			});
+
+		int step = 0;
+		foreach (var pkg in packages) {
+			var established = new AutoResetEvent(false);
+			var dropped = new AutoResetEvent(false);
+
+			if (step < commandsToCheck.Length)
+				Console.WriteLine("{0} Starting step {1} ({2}) {0}", new string('#', 20), step,
+					(TcpCommand)commandsToCheck[step]);
+			else
+				Console.WriteLine("{0} Starting step {1} (RANDOM BYTES) {0}", new string('#', 20), step);
+
+			var connection = context._tcpTestClient.CreateTcpConnection(
+				context,
+				(conn, package) => {
+					if (package.Command != TcpCommand.BadRequest)
+						context.Fail(null, string.Format("Bad request expected, got {0}!", package.Command));
+				},
+				conn => established.Set(),
+				(conn, err) => dropped.Set());
+
+			established.WaitOne();
+			connection.EnqueueSend(pkg);
+			dropped.WaitOne();
+
+			if (step < commandsToCheck.Length)
+				Console.WriteLine("{0} Step {1} ({2}) Completed {0}", new string('#', 20), step,
+					(TcpCommand)commandsToCheck[step]);
+			else
+				Console.WriteLine("{0} Step {1} (RANDOM BYTES) Completed {0}", new string('#', 20), step);
+
+			step++;
+		}
+
+		Log.Information(
+			"Sent {packages} packages. {commandsToCheck} invalid dtos, {barFormattedPackages} bar formatted packages. Got {badRequests} BadRequests. Success",
+			packages.Count(),
+			commandsToCheck.Length,
+			packages.Count() - commandsToCheck.Length,
+			packages.Count());
+
+		Log.Information("Now sending raw bytes...");
+		try {
+			SendRaw(context._tcpTestClient.TcpEndpoint, BitConverter.GetBytes(int.MaxValue));
+			SendRaw(context._tcpTestClient.TcpEndpoint, BitConverter.GetBytes(int.MinValue));
+
+			SendRaw(context._tcpTestClient.TcpEndpoint, BitConverter.GetBytes(double.MinValue));
+			SendRaw(context._tcpTestClient.TcpEndpoint, BitConverter.GetBytes(double.MinValue));
+
+			SendRaw(context._tcpTestClient.TcpEndpoint, BitConverter.GetBytes(new Random().NextDouble()));
+		} catch (Exception e) {
+			context.Fail(e, "Raw bytes sent failed");
+			return false;
+		}
+
+		context.Success();
+		return true;
+	}
+
+	private void SendRaw(EndPoint endPoint, byte[] package) {
+		using var client = new TcpClient();
+		client.Connect(endPoint.ResolveDnsToIPAddress());
+		using var stream = client.GetStream();
+		stream.Write(package, 0, package.Length);
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/TransactionWriteProcessor.cs b/src/KurrentDB.TestClient/Commands/TransactionWriteProcessor.cs
new file mode 100644
index 00000000000..30180805ded
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/TransactionWriteProcessor.cs
@@ -0,0 +1,167 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using EventStore.Client.Messages;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Transport.Tcp;
+using OperationResult = EventStore.Client.Messages.OperationResult;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class TransactionWriteProcessor : ICmdProcessor {
+	public string Usage {
+		get { return "TWR [<stream-id> [<expected-version> [<events-cnt>]]]"; }
+	}
+
+	public string Keyword {
+		get { return "TWR"; }
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		var eventStreamId = "test-stream";
+		var expectedVersion = ExpectedVersion.Any;
+		int eventsCnt = 10;
+
+		if (args.Length > 0) {
+			if (args.Length > 3)
+				return false;
+			eventStreamId = args[0];
+			if (args.Length > 1)
+				expectedVersion = args[1].ToUpper() == "ANY" ? ExpectedVersion.Any : int.Parse(args[1]);
+			if (args.Length > 2)
+				eventsCnt = MetricPrefixValue.ParseInt(args[1]);
+		}
+
+		context.IsAsync();
+
+		var sw = new Stopwatch();
+		var stage = Stage.AcquiringTransactionId;
+		long transactionId = -1;
+		var writtenEvents = 0;
+		context._tcpTestClient.CreateTcpConnection(
+			context,
+			connectionEstablished: conn => {
+				context.Log.Information("[{remoteEndPoint}, L{localEndPoint}]: Starting transaction...",
+					conn.RemoteEndPoint, conn.LocalEndPoint);
+				sw.Start();
+
+				var tranStart = new TransactionStart(eventStreamId, expectedVersion, false);
+				var package = new TcpPackage(TcpCommand.TransactionStart, Guid.NewGuid(), tranStart.Serialize());
+				conn.EnqueueSend(package.AsByteArray());
+			},
+			handlePackage: (conn, pkg) => {
+				switch (stage) {
+					case Stage.AcquiringTransactionId: {
+						if (pkg.Command != TcpCommand.TransactionStartCompleted) {
+							context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
+							return;
+						}
+
+						var dto = pkg.Data.Deserialize<TransactionStartCompleted>();
+						if (dto.Result != OperationResult.Success) {
+							var msg = string.Format("Error while starting transaction: {0} ({1}).", dto.Message,
+								dto.Result);
+							context.Log.Information("Error while starting transaction: {message} ({e}).", dto.Message,
+								dto.Result);
+							context.Fail(reason: msg);
+						} else {
+							context.Log.Information("Successfully started transaction. TransactionId: {transactionId}.",
+								dto.TransactionId);
+							context.Log.Information("Now sending transactional events. TransactionId: {transactionId}",
+								dto.TransactionId);
+
+							transactionId = dto.TransactionId;
+							stage = Stage.Writing;
+							for (int i = 0; i < eventsCnt; ++i) {
+								var writeDto = new TransactionWrite(
+									transactionId,
+									new[] {
+										new NewEvent(Guid.NewGuid().ToByteArray(),
+											"TakeSomeSpaceEvent",
+											0, 0,
+											Helper.UTF8NoBom.GetBytes(Guid.NewGuid().ToString()),
+											Helper.UTF8NoBom.GetBytes(Guid.NewGuid().ToString()))
+									},
+									false);
+								var package = new TcpPackage(TcpCommand.TransactionWrite, Guid.NewGuid(),
+									writeDto.Serialize());
+								conn.EnqueueSend(package.AsByteArray());
+							}
+						}
+
+						break;
+					}
+					case Stage.Writing: {
+						if (pkg.Command != TcpCommand.TransactionWriteCompleted) {
+							context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
+							return;
+						}
+
+						var dto = pkg.Data.Deserialize<TransactionWriteCompleted>();
+						if (dto.Result != OperationResult.Success) {
+							context.Log.Information("Error while writing transactional event: {message} ({e}).",
+								dto.Message, dto.Result);
+							var msg = String.Format("Error while writing transactional event: {0} ({1}).",
+								dto.Message, dto.Result);
+							context.Fail(reason: msg);
+						} else {
+							writtenEvents += 1;
+							if (writtenEvents == eventsCnt) {
+								context.Log.Information("Written all events. Committing...");
+
+								stage = Stage.Committing;
+								var commitDto = new TransactionCommit(transactionId, false);
+								var package = new TcpPackage(TcpCommand.TransactionCommit, Guid.NewGuid(),
+									commitDto.Serialize());
+								conn.EnqueueSend(package.AsByteArray());
+							}
+						}
+
+						break;
+					}
+					case Stage.Committing: {
+						if (pkg.Command != TcpCommand.TransactionCommitCompleted) {
+							context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
+							return;
+						}
+
+						sw.Stop();
+
+						var dto = pkg.Data.Deserialize<TransactionCommitCompleted>();
+						if (dto.Result != OperationResult.Success) {
+							var msg = string.Format("Error while committing transaction: {0} ({1}).", dto.Message,
+								dto.Result);
+							context.Log.Information("Error while committing transaction: {message} ({e}).", dto.Message,
+								dto.Result);
+							context.Log.Information("Transaction took: {elapsed}.", sw.Elapsed);
+							context.Fail(reason: msg);
+						} else {
+							context.Log.Information("Successfully committed transaction [{transactionId}]!",
+								dto.TransactionId);
+							context.Log.Information("Transaction took: {elapsed}.", sw.Elapsed);
+							PerfUtils.LogTeamCityGraphData(string.Format("{0}-latency-ms", Keyword),
+								(int)Math.Round(sw.Elapsed.TotalMilliseconds));
+							context.Success();
+						}
+
+						conn.Close();
+						break;
+					}
+					default:
+						throw new ArgumentOutOfRangeException();
+				}
+			},
+			connectionClosed: (connection, error) => context.Fail(reason: "Connection was closed prematurely."));
+		context.WaitForCompletion();
+		return true;
+	}
+
+	private enum Stage {
+		AcquiringTransactionId,
+		Writing,
+		Committing
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/UsageProcessor.cs b/src/KurrentDB.TestClient/Commands/UsageProcessor.cs
new file mode 100644
index 00000000000..b6c6be2d155
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/UsageProcessor.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class UsageProcessor : ICmdProcessor {
+	public string Keyword {
+		get { return "USAGE"; }
+	}
+
+	public string Usage {
+		get { return "USAGE"; }
+	}
+
+	private readonly CommandsProcessor _commands;
+
+	public UsageProcessor(CommandsProcessor commands) {
+		_commands = commands;
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		var allCommands = _commands.RegisteredProcessors.Select(x => x.Usage.ToUpper());
+		context.Log.Information("Available commands:");
+
+		foreach (var command in allCommands) {
+			context.Log.Information("    {command}", command);
+		}
+
+		return true;
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/WriteFloodClientApiProcessor.cs b/src/KurrentDB.TestClient/Commands/WriteFloodClientApiProcessor.cs
new file mode 100644
index 00000000000..d1ed468bb2c
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/WriteFloodClientApiProcessor.cs
@@ -0,0 +1,154 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using EventStore.ClientAPI;
+using KurrentDB.Common.Utils;
+using ExpectedVersion = KurrentDB.Core.Data.ExpectedVersion;
+using Stopwatch = System.Diagnostics.Stopwatch;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class WriteFloodClientApiProcessor : ICmdProcessor {
+	public string Usage {
+		get { return "WRFLCA [<clients> <requests> [<streams-cnt> [<size>]]]"; }
+	}
+
+	public string Keyword {
+		get { return "WRFLCA"; }
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		int clientsCnt = 1;
+		long requestsCnt = 5000;
+		int streamsCnt = 1000;
+		int size = 256;
+		if (args.Length > 0) {
+			if (args.Length < 2 || args.Length > 4)
+				return false;
+
+			try {
+				clientsCnt = MetricPrefixValue.ParseInt(args[0]);
+				requestsCnt = MetricPrefixValue.ParseLong(args[1]);
+				if (args.Length >= 3)
+					streamsCnt = MetricPrefixValue.ParseInt(args[2]);
+				if (args.Length >= 4)
+					size = MetricPrefixValue.ParseInt(args[3]);
+			} catch {
+				return false;
+			}
+		}
+
+		WriteFlood(context, clientsCnt, requestsCnt, streamsCnt, size);
+		return true;
+	}
+
+	private void WriteFlood(CommandProcessorContext context, int clientsCnt, long requestsCnt, int streamsCnt,
+		int size) {
+		context.IsAsync();
+
+		var doneEvent = new ManualResetEventSlim(false);
+		var clients = new List<IEventStoreConnection>();
+		var threads = new List<Thread>();
+
+		long succ = 0;
+
+		var streams = Enumerable.Range(0, streamsCnt).Select(x => Guid.NewGuid().ToString()).ToArray();
+		var sw2 = new Stopwatch();
+		for (int i = 0; i < clientsCnt; i++) {
+			var count = requestsCnt / clientsCnt + ((i == clientsCnt - 1) ? requestsCnt % clientsCnt : 0);
+			var rnd = new Random();
+
+			var settings = ConnectionSettings.Create()
+				.UseConsoleLogger()
+				.PerformOnAnyNode()
+				.LimitReconnectionsTo(10)
+				.LimitRetriesForOperationTo(10)
+				.LimitOperationsQueueTo(10000)
+				.LimitConcurrentOperationsTo(context._tcpTestClient.Options.WriteWindow / clientsCnt)
+				.FailOnNoServerResponse();
+
+			var client = EventStoreConnection.Create(settings,
+				new Uri($"tcp://{context._tcpTestClient.TcpEndpoint.GetHost()}:{context._tcpTestClient.TcpEndpoint.GetPort()}"));
+			clients.Add(client);
+
+			threads.Add(new Thread(_ => {
+				client.ErrorOccurred += (s, e) => context.Fail(e.Exception, "Error on connection");
+				client.ConnectAsync().Wait();
+
+				for (int j = 0; j < count; ++j) {
+					var task = client.AppendToStreamAsync(streams[rnd.Next(streamsCnt)],
+						ExpectedVersion.Any,
+						new EventData(Guid.NewGuid(),
+							"TakeSomeSpaceEvent",
+							false,
+							Helper.UTF8NoBom.GetBytes("DATA" + new string('*', size)),
+							Helper.UTF8NoBom.GetBytes("METADATA" + new string('$', 100))));
+					task.ContinueWith(x => {
+						if (x.IsFaulted) {
+							context.Fail(x.Exception.InnerException, "Error on writing operation.");
+							return;
+						}
+
+						var localAll = Interlocked.Increment(ref succ);
+						if (localAll % 1000 == 0)
+							Console.Write('.');
+						if (localAll % 100000 == 0) {
+							var elapsed = sw2.Elapsed;
+							sw2.Restart();
+							context.Log.Debug("\nDONE TOTAL {writes} WRITES IN {elapsed} ({rate:0.0}/s).",
+								localAll,
+								elapsed,
+								1000.0 * 100000 / elapsed.TotalMilliseconds);
+						}
+
+						if (localAll == requestsCnt) {
+							context.Success();
+							doneEvent.Set();
+						}
+					});
+				}
+			}) { IsBackground = true });
+		}
+
+		var sw = Stopwatch.StartNew();
+		sw2.Start();
+		threads.ForEach(thread => thread.Start());
+		doneEvent.Wait();
+		clients.ForEach(x => x.Close());
+		sw.Stop();
+
+		context.Log.Information("Completed. Successes: {success}.", succ);
+
+		var reqPerSec = (succ + 0.0) / sw.ElapsedMilliseconds * 1000;
+		context.Log.Information("{requests} requests completed in {elapsed}ms ({rate:0.00} reqs per sec).", succ,
+			sw.ElapsedMilliseconds, reqPerSec);
+
+		var fail = requestsCnt - succ;
+		PerfUtils.LogData(
+			Keyword,
+			PerfUtils.Row(PerfUtils.Col("clientsCnt", clientsCnt),
+				PerfUtils.Col("requestsCnt", requestsCnt),
+				PerfUtils.Col("ElapsedMilliseconds", sw.ElapsedMilliseconds)),
+			PerfUtils.Row(PerfUtils.Col("successes", succ), PerfUtils.Col("failures", fail)));
+		var failuresRate = (int)(100 * fail / (fail + succ));
+		PerfUtils.LogTeamCityGraphData(string.Format("{0}-{1}-{2}-reqPerSec", Keyword, clientsCnt, requestsCnt),
+			(int)reqPerSec);
+		PerfUtils.LogTeamCityGraphData(
+			string.Format("{0}-{1}-{2}-failureSuccessRate", Keyword, clientsCnt, requestsCnt), failuresRate);
+		PerfUtils.LogTeamCityGraphData(
+			string.Format("{0}-c{1}-r{2}-st{3}-s{4}-reqPerSec", Keyword, clientsCnt, requestsCnt, streamsCnt, size),
+			(int)reqPerSec);
+		PerfUtils.LogTeamCityGraphData(
+			string.Format("{0}-c{1}-r{2}-st{3}-s{4}-failureSuccessRate", Keyword, clientsCnt, requestsCnt,
+				streamsCnt, size), failuresRate);
+
+		if (Interlocked.Read(ref succ) != requestsCnt)
+			context.Fail(reason: "There were errors or not all requests completed.");
+		else
+			context.Success();
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/WriteFloodProcessor.cs b/src/KurrentDB.TestClient/Commands/WriteFloodProcessor.cs
new file mode 100644
index 00000000000..445c3d389ec
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/WriteFloodProcessor.cs
@@ -0,0 +1,225 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using EventStore.Client.Messages;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.TestClient.Statistics;
+using KurrentDB.Transport.Tcp;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class WriteFloodProcessor : ICmdProcessor {
+	public string Usage {
+		//                     0          1            2           3          4             5
+		get { return "WRFL [<clients> <requests> [<streams-cnt> [<size> [<batchsize> [<stream-prefix>]]]]]"; }
+	}
+
+	public string Keyword {
+		get { return "WRFL"; }
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		int clientsCnt = 1;
+		long requestsCnt = 5000;
+		int streamsCnt = 1000;
+		int size = 256;
+		int batchSize = 1;
+		string streamNamePrefix = string.Empty;
+		if (args.Length > 0) {
+			if (args.Length < 2 || args.Length > 6)
+				return false;
+
+			try {
+				clientsCnt = MetricPrefixValue.ParseInt(args[0]);
+				requestsCnt = MetricPrefixValue.ParseLong(args[1]);
+				if (args.Length >= 3)
+					streamsCnt = MetricPrefixValue.ParseInt(args[2]);
+				if (args.Length >= 4)
+					size = MetricPrefixValue.ParseInt(args[3]);
+				if (args.Length >= 5)
+					batchSize = MetricPrefixValue.ParseInt(args[4]);
+				if (args.Length >= 6)
+					streamNamePrefix = args[5];
+			} catch {
+				return false;
+			}
+		}
+
+		var stats = new WriteFloodStats(Keyword, context.OutputCsv, args);
+		var monitor = new RequestMonitor();
+		WriteFlood(context, stats, clientsCnt, requestsCnt, streamsCnt, size, batchSize, streamNamePrefix, monitor);
+		return true;
+	}
+
+	private void WriteFlood(CommandProcessorContext context, WriteFloodStats stats, int clientsCnt, long requestsCnt, int streamsCnt,
+		int size, int batchSize, string streamNamePrefix, RequestMonitor monitor) {
+		context.IsAsync();
+
+		var doneEvent = new ManualResetEventSlim(false);
+		var clients = new List<TcpTypedConnection<byte[]>>();
+		var threads = new List<Thread>();
+
+		long last = 0;
+
+		string[] streams = Enumerable.Range(0, streamsCnt).Select(x =>
+			string.IsNullOrWhiteSpace(streamNamePrefix)
+				? Guid.NewGuid().ToString()
+				: $"{streamNamePrefix}-{x}"
+		).ToArray();
+
+		context.Log.Information("Writing streams randomly between {first} and {last}",
+			streams.FirstOrDefault(),
+			streams.LastOrDefault());
+
+		Console.WriteLine($"Last stream: {streams.LastOrDefault()}");
+		stats.StartTime = DateTime.UtcNow;
+		var sw2 = new Stopwatch();
+		for (int i = 0; i < clientsCnt; i++) {
+			var count = requestsCnt / clientsCnt + ((i == clientsCnt - 1) ? requestsCnt % clientsCnt : 0);
+			long sent = 0;
+			long received = 0;
+			var rnd = new Random();
+			var client = context._tcpTestClient.CreateTcpConnection(
+				context,
+				(conn, pkg) => {
+					if (pkg.Command != TcpCommand.WriteEventsCompleted) {
+						context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
+						return;
+					}
+
+					var dto = pkg.Data.Deserialize<WriteEventsCompleted>();
+					monitor.EndOperation(pkg.CorrelationId);
+					switch (dto.Result) {
+						case OperationResult.Success:
+							Interlocked.Add(ref stats.Succ, batchSize);
+							if (stats.Succ - last > 1000) {
+								last = stats.Succ;
+								Console.Write(".");
+							}
+
+							break;
+						case OperationResult.PrepareTimeout:
+							Interlocked.Increment(ref stats.PrepTimeout);
+							break;
+						case OperationResult.CommitTimeout:
+							Interlocked.Increment(ref stats.CommitTimeout);
+							break;
+						case OperationResult.ForwardTimeout:
+							Interlocked.Increment(ref stats.ForwardTimeout);
+							break;
+						case OperationResult.WrongExpectedVersion:
+							Interlocked.Increment(ref stats.WrongExpVersion);
+							break;
+						case OperationResult.StreamDeleted:
+							Interlocked.Increment(ref stats.StreamDeleted);
+							break;
+						default:
+							throw new ArgumentOutOfRangeException();
+					}
+
+					if (dto.Result != OperationResult.Success)
+						if (Interlocked.Increment(ref stats.Fail) % 1000 == 0)
+							Console.Write('#');
+					Interlocked.Increment(ref received);
+					var localAll = Interlocked.Add(ref stats.All, batchSize);
+					if (localAll % 100000 == 0) {
+						stats.Elapsed = sw2.Elapsed;
+						stats.Rate = 1000.0 * 100000 / stats.Elapsed.TotalMilliseconds;
+						sw2.Restart();
+						context.Log.Debug(
+							"\nDONE TOTAL {writes} WRITES IN {elapsed} ({rate:0.0}/s) [S:{success}, F:{failures} (WEV:{wrongExpectedVersion}, " +
+							"P:{prepareTimeout}, C:{commitTimeout}, F:{forwardTimeout}, D:{streamDeleted})].",
+							localAll, stats.Elapsed, stats.Rate, stats.Succ, stats.Fail,
+							stats.WrongExpVersion, stats.PrepTimeout, stats.CommitTimeout, stats.ForwardTimeout, stats.StreamDeleted);
+						stats.WriteStatsToFile(context.StatsLogger);
+					}
+
+					if (localAll >= requestsCnt) {
+						context.Success();
+						doneEvent.Set();
+					}
+				},
+				connectionClosed: (conn, err) => context.Fail(reason: "Connection was closed prematurely."));
+			clients.Add(client);
+
+			threads.Add(new Thread(() => {
+				for (int j = 0; j < count; ++j) {
+					var events = new NewEvent[batchSize];
+					for (int q = 0; q < batchSize; q++) {
+						events[q] = new NewEvent(Guid.NewGuid().ToByteArray(),
+							"TakeSomeSpaceEvent",
+							1, 0,
+							Helper.UTF8NoBom.GetBytes(
+								"{ \"DATA\" : \"" + new string('*', size) + "\"}"),
+							Helper.UTF8NoBom.GetBytes(
+								"{ \"METADATA\" : \"" + new string('$', 100) + "\"}"));
+					}
+
+					var corrid = Guid.NewGuid();
+					var write = new WriteEvents(
+						streams[rnd.Next(streamsCnt)],
+						ExpectedVersion.Any,
+						events,
+						false);
+					var package = new TcpPackage(TcpCommand.WriteEvents, corrid, write.Serialize());
+					monitor.StartOperation(corrid);
+					client.EnqueueSend(package.AsByteArray());
+
+					var localSent = Interlocked.Increment(ref sent);
+					while (localSent - Interlocked.Read(ref received) >
+						   context._tcpTestClient.Options.WriteWindow / clientsCnt) {
+						Thread.Sleep(1);
+					}
+				}
+			}) { IsBackground = true });
+		}
+
+		var sw = Stopwatch.StartNew();
+		sw2.Start();
+		threads.ForEach(thread => thread.Start());
+		doneEvent.Wait();
+		sw.Stop();
+		clients.ForEach(client => client.Close());
+
+		stats.WriteStatsToFile(context.StatsLogger);
+		context.Log.Information(
+			"Completed. Successes: {success}, failures: {failures} (WRONG VERSION: {wrongExpectedVersion}, P: {prepareTimeout}, " +
+			"C: {commitTimeout}, F: {forwardTimeout}, D: {streamDeleted})",
+			stats.Succ, stats.Fail, stats.WrongExpVersion, stats.PrepTimeout, stats.CommitTimeout, stats.ForwardTimeout, stats.StreamDeleted);
+
+		var reqPerSec = (stats.All + 0.0) / sw.ElapsedMilliseconds * 1000;
+		context.Log.Information("{requests} requests completed in {elapsed}ms ({rate:0.00} reqs per sec).", stats.All,
+			sw.ElapsedMilliseconds, reqPerSec);
+
+		PerfUtils.LogData(
+			Keyword,
+			PerfUtils.Row(PerfUtils.Col("clientsCnt", clientsCnt),
+				PerfUtils.Col("requestsCnt", requestsCnt),
+				PerfUtils.Col("ElapsedMilliseconds", sw.ElapsedMilliseconds)),
+			PerfUtils.Row(PerfUtils.Col("successes", stats.Succ), PerfUtils.Col("failures", stats.Fail)));
+
+		var failuresRate = (int)(100 * stats.Fail / (stats.Fail + stats.Succ));
+		PerfUtils.LogTeamCityGraphData(string.Format("{0}-{1}-{2}-reqPerSec", Keyword, clientsCnt, requestsCnt),
+			(int)reqPerSec);
+		PerfUtils.LogTeamCityGraphData(
+			string.Format("{0}-{1}-{2}-failureSuccessRate", Keyword, clientsCnt, requestsCnt), failuresRate);
+		PerfUtils.LogTeamCityGraphData(
+			string.Format("{0}-c{1}-r{2}-st{3}-s{4}-reqPerSec", Keyword, clientsCnt, requestsCnt, streamsCnt, size),
+			(int)reqPerSec);
+		PerfUtils.LogTeamCityGraphData(
+			string.Format("{0}-c{1}-r{2}-st{3}-s{4}-failureSuccessRate", Keyword, clientsCnt, requestsCnt,
+				streamsCnt, size), failuresRate);
+		monitor.GetMeasurementDetails();
+		if (Interlocked.Read(ref stats.Succ) != requestsCnt)
+			context.Fail(reason: "There were errors or not all requests completed.");
+		else
+			context.Success();
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/WriteFloodWaitingProcessor.cs b/src/KurrentDB.TestClient/Commands/WriteFloodWaitingProcessor.cs
new file mode 100644
index 00000000000..a5c9792590e
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/WriteFloodWaitingProcessor.cs
@@ -0,0 +1,140 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+using EventStore.Client.Messages;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.Transport.Tcp;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class WriteFloodWaitingProcessor : ICmdProcessor {
+	public string Usage {
+		get { return "WRFLW [<clients> <requests> [payload-size]]"; }
+	}
+
+	public string Keyword {
+		get { return "WRFLW"; }
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		int clientsCnt = 1;
+		int requestsCnt = 5000;
+		int payloadSize = 256 + 100;
+		if (args.Length > 0) {
+			if (args.Length > 3 || args.Length < 2)
+				return false;
+
+			try {
+				clientsCnt = MetricPrefixValue.ParseInt(args[0]);
+				requestsCnt = MetricPrefixValue.ParseInt(args[1]);
+				if (args.Length == 3)
+					payloadSize = MetricPrefixValue.ParseInt(args[2]);
+			} catch {
+				return false;
+			}
+		}
+
+		WriteFlood(context, clientsCnt, requestsCnt, payloadSize);
+		return true;
+	}
+
+	private void WriteFlood(CommandProcessorContext context, int clientsCnt, int requestsCnt, int payloadSize) {
+		context.IsAsync();
+
+		var dataSize = Math.Max(0, payloadSize - 100);
+		var metadataSize = Math.Min(100, payloadSize);
+
+		var clients = new List<TcpTypedConnection<byte[]>>();
+		var threads = new List<Thread>();
+		var doneEvent = new ManualResetEventSlim(false);
+		var succ = 0;
+		var fail = 0;
+		var all = 0;
+		for (int i = 0; i < clientsCnt; i++) {
+			var count = requestsCnt / clientsCnt + ((i == clientsCnt - 1) ? requestsCnt % clientsCnt : 0);
+			var autoEvent = new AutoResetEvent(false);
+			var eventStreamId = "es" + Guid.NewGuid();
+			var received = 0;
+			var client = context._tcpTestClient.CreateTcpConnection(
+				context,
+				(conn, pkg) => {
+					if (pkg.Command != TcpCommand.WriteEventsCompleted) {
+						context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
+						return;
+					}
+
+					Interlocked.Increment(ref received);
+					var dto = pkg.Data.Deserialize<WriteEventsCompleted>();
+					if (dto.Result == OperationResult.Success) {
+						if (Interlocked.Increment(ref succ) % 1000 == 0)
+							Console.Write(".");
+					} else {
+						if (Interlocked.Increment(ref fail) % 1000 == 0)
+							Console.Write("#");
+					}
+
+					if (Interlocked.Increment(ref all) == requestsCnt) {
+						doneEvent.Set();
+					}
+
+					autoEvent.Set();
+				},
+				connectionClosed: (conn, err) => context.Fail(reason: "Connection was closed prematurely."));
+			clients.Add(client);
+
+			threads.Add(new Thread(() => {
+				for (int j = 0; j < count; ++j) {
+					var write = new WriteEvents(
+						eventStreamId,
+						ExpectedVersion.Any,
+						new[] {
+							new NewEvent(Guid.NewGuid().ToByteArray(),
+								"TakeSomeSpaceEvent",
+								0, 0,
+								Helper.UTF8NoBom.GetBytes("DATA" + new string('*', dataSize)),
+								Helper.UTF8NoBom.GetBytes("METADATA" + new string('$', metadataSize)))
+						},
+						false);
+					var package = new TcpPackage(TcpCommand.WriteEvents, Guid.NewGuid(), write.Serialize());
+					client.EnqueueSend(package.AsByteArray());
+					autoEvent.WaitOne();
+				}
+			}) { IsBackground = true });
+		}
+
+		var sw = Stopwatch.StartNew();
+		threads.ForEach(thread => thread.Start());
+		doneEvent.Wait();
+		sw.Stop();
+		clients.ForEach(client => client.Close());
+
+		var reqPerSec = (all + 0.0) / sw.ElapsedMilliseconds * 1000;
+		context.Log.Information("Completed. Successes: {success}, failures: {failures}", succ, fail);
+		context.Log.Information(
+			"{requests} requests completed in {elapsed}ms ({rate:0.00} reqs per sec, latency: {latency:0.00} ms).",
+			all, sw.ElapsedMilliseconds, reqPerSec, (sw.Elapsed.TotalMilliseconds + 0.0) / requestsCnt);
+		PerfUtils.LogData(Keyword,
+			PerfUtils.Row(PerfUtils.Col("clientsCnt", clientsCnt),
+				PerfUtils.Col("requestsCnt", requestsCnt),
+				PerfUtils.Col("ElapsedMilliseconds", sw.ElapsedMilliseconds)),
+			PerfUtils.Row(PerfUtils.Col("successes", succ), PerfUtils.Col("failures", fail)));
+		PerfUtils.LogTeamCityGraphData(string.Format("{0}-{1}-{2}-reqPerSec", Keyword, clientsCnt, requestsCnt),
+			(int)reqPerSec);
+		PerfUtils.LogTeamCityGraphData(
+			string.Format("{0}-{1}-{2}-failureSuccessRate", Keyword, clientsCnt, requestsCnt),
+			(int)(100.0 * fail / (fail + succ)));
+		PerfUtils.LogTeamCityGraphData(string.Format("{0}-latency-ms", Keyword),
+			(int)Math.Round(sw.Elapsed.TotalMilliseconds / requestsCnt));
+
+		if (succ != requestsCnt)
+			context.Fail(reason: "There were errors or not all requests completed.");
+		else
+			context.Success();
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/WriteJsonProcessor.cs b/src/KurrentDB.TestClient/Commands/WriteJsonProcessor.cs
new file mode 100644
index 00000000000..fde1e62b019
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/WriteJsonProcessor.cs
@@ -0,0 +1,116 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using System.Net.Sockets;
+using EventStore.Client.Messages;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.Transport.Http.Codecs;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class WriteJsonProcessor : ICmdProcessor {
+	public string Usage {
+		get { return "WRJ [<stream-id> <expected-version> <data> [<metadata>]]"; }
+	}
+
+	public string Keyword {
+		get { return "WRJ"; }
+	}
+
+	private readonly Random _random = new Random();
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		var eventStreamId = "test-stream";
+		var expectedVersion = ExpectedVersion.Any;
+		var data = GenerateTestData();
+		string metadata = null;
+
+		if (args.Length > 0) {
+			if (args.Length < 3 || args.Length > 4)
+				return false;
+			eventStreamId = args[0];
+			expectedVersion = args[1].ToUpper() == "ANY" ? ExpectedVersion.Any : int.Parse(args[1]);
+			data = args[2];
+			if (args.Length == 4)
+				metadata = args[3];
+		}
+
+		context.IsAsync();
+		var writeDto = new WriteEvents(
+			eventStreamId,
+			expectedVersion,
+			new[] {
+				new NewEvent(Guid.NewGuid().ToByteArray(),
+					"JsonDataEvent",
+					1, 0,
+					Helper.UTF8NoBom.GetBytes(data),
+					Helper.UTF8NoBom.GetBytes(metadata ?? string.Empty))
+			},
+			false);
+		var package = new TcpPackage(TcpCommand.WriteEvents, Guid.NewGuid(), writeDto.Serialize());
+
+		var sw = new Stopwatch();
+		bool dataReceived = false;
+
+		context._tcpTestClient.CreateTcpConnection(
+			context,
+			connectionEstablished: conn => {
+				context.Log.Information("[{remoteEndPoint}, L{localEndPoint}]: Writing...", conn.RemoteEndPoint,
+					conn.LocalEndPoint);
+				sw.Start();
+				conn.EnqueueSend(package.AsByteArray());
+			},
+			handlePackage: (conn, pkg) => {
+				if (pkg.Command != TcpCommand.WriteEventsCompleted) {
+					context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
+					return;
+				}
+
+				dataReceived = true;
+				sw.Stop();
+
+				var dto = pkg.Data.Deserialize<WriteEventsCompleted>();
+				if (dto.Result == OperationResult.Success) {
+					context.Log.Information("Successfully written. EventId: {correlationId}.", package.CorrelationId);
+					PerfUtils.LogTeamCityGraphData(string.Format("{0}-latency-ms", Keyword),
+						(int)Math.Round(sw.Elapsed.TotalMilliseconds));
+				} else {
+					context.Log.Information("Error while writing: {message} ({e}).", dto.Message, dto.Result);
+				}
+
+				context.Log.Information("Write request took: {elapsed}.", sw.Elapsed);
+				conn.Close();
+				context.Success();
+			},
+			connectionClosed: (connection, error) => {
+				if (dataReceived && error == SocketError.Success)
+					context.Success();
+				else
+					context.Fail();
+			});
+
+		context.WaitForCompletion();
+		return true;
+	}
+
+	private string GenerateTestData() {
+		return Codec.Json.To(new TestData(Guid.NewGuid().ToString(), _random.Next(1, 101)));
+	}
+}
+
+internal class TestData {
+	public string Name { get; set; }
+	public int Version { get; set; }
+
+	public TestData() {
+	}
+
+	public TestData(string name, int version) {
+		Name = name;
+		Version = version;
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/WriteLongTermProcessor.cs b/src/KurrentDB.TestClient/Commands/WriteLongTermProcessor.cs
new file mode 100644
index 00000000000..6fff5e298ff
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/WriteLongTermProcessor.cs
@@ -0,0 +1,217 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+using EventStore.Client.Messages;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.Transport.Tcp;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class WriteLongTermProcessor : ICmdProcessor {
+	public string Usage {
+		get {
+			return
+				"WRLT <clients> <min req. per second> <max req. per second> <run for n minutes> [<event-stream>]";
+		}
+	}
+
+	public string Keyword {
+		get { return "WRLT"; }
+	}
+
+	private readonly object _randomLockRoot = new object();
+	private readonly Random _random = new Random();
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		int clientsCnt = 1;
+		int minPerSecond = 1;
+		int maxPerSecond = 2;
+		int runTimeMinutes = 1;
+		string eventStreamId = null;
+
+		if (args.Length > 0) {
+			if (args.Length != 4 && args.Length != 5)
+				return false;
+
+			try {
+				clientsCnt = MetricPrefixValue.ParseInt(args[0]);
+				minPerSecond = MetricPrefixValue.ParseInt(args[1]);
+				maxPerSecond = MetricPrefixValue.ParseInt(args[2]);
+				runTimeMinutes = MetricPrefixValue.ParseInt(args[3]);
+				if (args.Length == 5)
+					eventStreamId = args[4];
+			} catch {
+				return false;
+			}
+		}
+
+		Flood(context, eventStreamId, clientsCnt, minPerSecond, maxPerSecond, runTimeMinutes);
+		return true;
+	}
+
+	private void Flood(CommandProcessorContext context,
+		string eventStreamId,
+		int clientsCnt,
+		int minPerSecond,
+		int maxPerSecond,
+		int runTimeMinutes) {
+		context.IsAsync();
+
+		var clients = new List<TcpTypedConnection<byte[]>>();
+		var threads = new List<Thread>();
+		var doneEvent = new ManualResetEvent(false);
+		var done = false;
+
+		var succ = 0;
+		var fail = 0;
+
+		var requestsCnt = 0;
+
+		int sent = 0;
+		int received = 0;
+
+		var watchLockRoot = new object();
+		var sw = Stopwatch.StartNew();
+		for (int i = 0; i < clientsCnt; i++) {
+			var esId = eventStreamId ?? "Stream-" + Thread.CurrentThread.ManagedThreadId % 3;
+
+			var client = context._tcpTestClient.CreateTcpConnection(
+				context,
+				(conn, pkg) => {
+					if (pkg.Command != TcpCommand.WriteEventsCompleted) {
+						context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
+						return;
+					}
+
+					var dto = pkg.Data.Deserialize<WriteEventsCompleted>();
+					if (dto.Result == OperationResult.Success) {
+						var succDone = Interlocked.Increment(ref succ);
+						if (succDone % maxPerSecond == 0)
+							Console.Write(".");
+
+						Interlocked.Increment(ref requestsCnt);
+					} else
+						Interlocked.Increment(ref fail);
+
+					Interlocked.Increment(ref received);
+				},
+				connectionClosed: (conn, err) => {
+					if (!done)
+						context.Fail(reason: "Socket was closed, but not all requests were completed.");
+					else
+						context.Success();
+				});
+			clients.Add(client);
+
+			threads.Add(new Thread(() => {
+				var sentCount = 0;
+				var sleepTime = 0;
+
+				var dataSizeCoefficient = 1;
+				var currentMinute = -1;
+
+				while (true) {
+					TimeSpan elapsed;
+					lock (watchLockRoot)
+						elapsed = sw.Elapsed;
+
+					if (elapsed.TotalMinutes > runTimeMinutes) {
+						done = true;
+						doneEvent.Set();
+						break;
+					}
+
+					if (sentCount == 0) {
+						int elapsedMinutesInt = (int)elapsed.TotalMinutes;
+						lock (_randomLockRoot) {
+							sentCount = minPerSecond == maxPerSecond
+								? maxPerSecond
+								: _random.Next(minPerSecond, maxPerSecond);
+							dataSizeCoefficient = _random.Next(8, 256);
+						}
+
+						if (currentMinute != elapsedMinutesInt) {
+							currentMinute = elapsedMinutesInt;
+							context.Log.Information(
+								"\nElapsed {elapsed} of {runTime} minutes, sent {sent}; next block coef. {dataSizeCoefficient}",
+								elapsedMinutesInt,
+								runTimeMinutes,
+								sent,
+								dataSizeCoefficient);
+						}
+
+						sleepTime = 1000 / sentCount;
+					}
+
+					var dataSize = dataSizeCoefficient * 8;
+					var write = new WriteEvents(
+						esId,
+						ExpectedVersion.Any,
+						new[] {
+							new NewEvent(
+								Guid.NewGuid().ToByteArray(),
+								"TakeSomeSpaceEvent",
+								0, 0,
+								Helper.UTF8NoBom.GetBytes(
+									"DATA" + dataSize.ToString(" 00000 ") + new string('*', dataSize)),
+								Helper.UTF8NoBom.GetBytes("METADATA" + new string('$', 100)))
+						},
+						false);
+					var package = new TcpPackage(TcpCommand.WriteEvents, Guid.NewGuid(), write.Serialize());
+					client.EnqueueSend(package.AsByteArray());
+
+					Interlocked.Increment(ref sent);
+
+					Thread.Sleep(sleepTime);
+					sentCount -= 1;
+
+					while (sent - received > context._tcpTestClient.Options.WriteWindow / clientsCnt) {
+						Thread.Sleep(1);
+					}
+				}
+			}));
+		}
+
+		foreach (var thread in threads) {
+			thread.IsBackground = true;
+			thread.Start();
+		}
+
+		doneEvent.WaitOne();
+		sw.Stop();
+
+		foreach (var client in clients) {
+			client.Close();
+		}
+
+		context.Log.Information("Completed. Successes: {success}, failures: {failures}", succ, fail);
+		var reqPerSec = (requestsCnt + 0.0) / sw.ElapsedMilliseconds * 1000;
+		context.Log.Information("{requests} requests completed in {elapsed}ms ({rate:0.00} reqs per sec).",
+			requestsCnt,
+			sw.ElapsedMilliseconds,
+			reqPerSec);
+
+		PerfUtils.LogData(
+			Keyword,
+			PerfUtils.Row(PerfUtils.Col("clientsCnt", clientsCnt),
+				PerfUtils.Col("requestsCnt", requestsCnt),
+				PerfUtils.Col("ElapsedMilliseconds", sw.ElapsedMilliseconds)),
+			PerfUtils.Row(PerfUtils.Col("successes", succ), PerfUtils.Col("failures", fail))
+		);
+
+		PerfUtils.LogTeamCityGraphData(string.Format("{0}-{1}-{2}-reqPerSec", Keyword, clientsCnt, requestsCnt),
+			(int)reqPerSec);
+
+		PerfUtils.LogTeamCityGraphData(
+			string.Format("{0}-{1}-{2}-failureSuccessRate", Keyword, clientsCnt, requestsCnt),
+			100 * fail / (fail + succ));
+
+		context.Success();
+	}
+}
diff --git a/src/KurrentDB.TestClient/Commands/WriteProcessor.cs b/src/KurrentDB.TestClient/Commands/WriteProcessor.cs
new file mode 100644
index 00000000000..aa6f41cfb3f
--- /dev/null
+++ b/src/KurrentDB.TestClient/Commands/WriteProcessor.cs
@@ -0,0 +1,101 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+using EventStore.Client.Messages;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Data;
+using KurrentDB.Core.Services.Transport.Tcp;
+
+namespace KurrentDB.TestClient.Commands;
+
+internal class WriteProcessor : ICmdProcessor {
+	public string Usage {
+		get { return "WR [<stream-id> <expected-version> <data> [<metadata> [<is-json> [<login> <pass>]]]"; }
+	}
+
+	public string Keyword {
+		get { return "WR"; }
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		var eventStreamId = "test-stream";
+		var expectedVersion = ExpectedVersion.Any;
+		var data = "test-data";
+		string metadata = null;
+		bool isJson = false;
+		string login = null;
+		string pass = null;
+
+		if (args.Length > 0) {
+			if (args.Length < 3 || args.Length > 7 || args.Length == 6)
+				return false;
+			eventStreamId = args[0];
+			expectedVersion = args[1].ToUpper() == "ANY" ? ExpectedVersion.Any : int.Parse(args[1]);
+			data = args[2];
+			if (args.Length >= 4)
+				metadata = args[3];
+			if (args.Length >= 5)
+				isJson = bool.Parse(args[4]);
+			if (args.Length >= 7) {
+				login = args[5];
+				pass = args[6];
+			}
+		}
+
+		context.IsAsync();
+		var sw = new Stopwatch();
+		context._tcpTestClient.CreateTcpConnection(
+			context,
+			connectionEstablished: conn => {
+				context.Log.Information("[{remoteEndPoint}, L{localEndPoint}]: Writing...", conn.RemoteEndPoint,
+					conn.LocalEndPoint);
+				var writeDto = new WriteEvents(
+					eventStreamId,
+					expectedVersion,
+					new[] {
+						new NewEvent(Guid.NewGuid().ToByteArray(),
+							"TakeSomeSpaceEvent",
+							isJson ? 1 : 0, 0,
+							Helper.UTF8NoBom.GetBytes(data),
+							Helper.UTF8NoBom.GetBytes(metadata ?? string.Empty))
+					},
+					false);
+				var package = new TcpPackage(TcpCommand.WriteEvents,
+					login == null ? TcpFlags.None : TcpFlags.Authenticated,
+					Guid.NewGuid(),
+					login,
+					pass,
+					writeDto.Serialize()).AsByteArray();
+				sw.Start();
+				conn.EnqueueSend(package);
+			},
+			handlePackage: (conn, pkg) => {
+				sw.Stop();
+				context.Log.Information("Write request took: {elapsed}.", sw.Elapsed);
+
+				if (pkg.Command != TcpCommand.WriteEventsCompleted) {
+					context.Fail(reason: string.Format("Unexpected TCP package: {0}.", pkg.Command));
+					return;
+				}
+
+				var dto = pkg.Data.Deserialize<WriteEventsCompleted>();
+				if (dto.Result == OperationResult.Success) {
+					context.Log.Information("Successfully written.");
+					PerfUtils.LogTeamCityGraphData(string.Format("{0}-latency-ms", Keyword),
+						(int)Math.Round(sw.Elapsed.TotalMilliseconds));
+					context.Success();
+				} else {
+					context.Log.Information("Error while writing: {message} ({e}).", dto.Message, dto.Result);
+					context.Fail();
+				}
+
+				conn.Close();
+			},
+			connectionClosed: (connection, error) => context.Fail(reason: "Connection was closed prematurely."));
+
+		context.WaitForCompletion();
+		return true;
+	}
+}
diff --git a/src/KurrentDB.TestClient/CommandsProcessor.cs b/src/KurrentDB.TestClient/CommandsProcessor.cs
new file mode 100644
index 00000000000..72b31b66800
--- /dev/null
+++ b/src/KurrentDB.TestClient/CommandsProcessor.cs
@@ -0,0 +1,119 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.TestClient;
+
+internal class CommandsProcessor {
+	public IEnumerable<ICmdProcessor> RegisteredProcessors {
+		get { return _processors.Values; }
+	}
+
+	private readonly ILogger _log;
+	private readonly IDictionary<string, ICmdProcessor> _processors = new Dictionary<string, ICmdProcessor>();
+	private ICmdProcessor _regCommandsProcessor;
+
+	public CommandsProcessor(ILogger log) {
+		_log = log;
+	}
+
+	public void Register(ICmdProcessor processor, bool usageProcessor = false) {
+		var cmd = processor.Keyword.ToUpper();
+
+		if (_processors.ContainsKey(cmd))
+			throw new InvalidOperationException(
+				string.Format("The processor for command '{0}' is already registered.", cmd));
+
+		_processors[cmd] = processor;
+
+		if (usageProcessor)
+			_regCommandsProcessor = processor;
+	}
+
+	public bool TryProcess(CommandProcessorContext context, string[] args, out int exitCode) {
+		var commandName = args[0].ToUpper();
+		var commandArgs = args.Skip(1).ToArray();
+
+		ICmdProcessor commandProcessor;
+		if (!_processors.TryGetValue(commandName, out commandProcessor)) {
+			_log.Information("Unknown command: {command}.", commandName);
+			if (_regCommandsProcessor != null)
+				_regCommandsProcessor.Execute(context, new string[0]);
+			exitCode = 1;
+			return false;
+		}
+
+		int exitC = 0;
+		var executedEvent = new AutoResetEvent(false);
+
+		ThreadPool.QueueUserWorkItem(_ => {
+			try {
+				var syntaxOk = commandProcessor.Execute(context, commandArgs);
+				if (syntaxOk) {
+					exitC = context.ExitCode;
+				} else {
+					exitC = 1;
+					_log.Information("Usage of {command}:", commandName);
+
+					foreach (var s in commandProcessor.Usage.Split("\n")) {
+						_log.Information("    {usage}", s);
+					}
+				}
+
+				executedEvent.Set();
+			} catch (Exception exc) {
+				_log.Error(exc, "Error while executing command {command}.", commandName);
+				exitC = -1;
+				executedEvent.Set();
+			}
+		});
+
+		executedEvent.WaitOne(1000);
+		context.WaitForCompletion();
+
+		if (!string.IsNullOrWhiteSpace(context.Reason))
+			_log.Error("Error during execution of command: {e}.", context.Reason);
+		if (context.Error != null) {
+			_log.Error(context.Error, "Error during execution of command");
+
+			var details = new StringBuilder();
+			BuildFullException(context.Error, details);
+			_log.Error("Details: {details}", details.ToString());
+		}
+
+		exitCode = exitC == 0 ? context.ExitCode : exitC;
+		return true;
+	}
+
+	private static void BuildFullException(Exception ex, StringBuilder details, int level = 0) {
+		const int maxLevel = 3;
+
+		if (details == null)
+			throw new ArgumentNullException("details");
+
+		if (level > maxLevel)
+			return;
+
+		while (ex != null) {
+			details.AppendFormat("\n{0}-->{1}", new string(' ', level * 2), ex.Message);
+
+			var aggregated = ex as AggregateException;
+			if (aggregated?.InnerExceptions != null) {
+				if (level > maxLevel)
+					break;
+
+				foreach (var innerException in aggregated.InnerExceptions.Take(2))
+					BuildFullException(innerException, details, level + 1);
+			} else
+				ex = ex.InnerException;
+
+			level += 1;
+		}
+	}
+}
diff --git a/src/KurrentDB.TestClient/ConsoleTable.cs b/src/KurrentDB.TestClient/ConsoleTable.cs
new file mode 100644
index 00000000000..b0a6f8a7897
--- /dev/null
+++ b/src/KurrentDB.TestClient/ConsoleTable.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using KurrentDB.Common.Utils;
+
+#pragma warning disable 1591
+
+namespace KurrentDB.TestClient;
+
+public class ConsoleTable {
+	private readonly string[] _header;
+	private readonly int[] _columnWidths;
+	private readonly List<string> _rows;
+
+	public ConsoleTable(params string[] header) {
+		Ensure.NotNull(header, "header");
+
+		_header = header;
+		_columnWidths = _header.Select(s => s.Length + 4).ToArray();
+		_rows = new List<string>();
+
+		AppendRow(_header);
+	}
+
+	public string CreateIndentedTable() {
+		return string.Format("{0}{1}{0}", Environment.NewLine, CreateTable());
+	}
+
+	public string CreateTable() {
+		var lineSeparator = RowSeparator(_columnWidths.Sum() + _columnWidths.Length + 1);
+
+		var table = new StringBuilder();
+		foreach (var row in _rows) {
+			table.AppendLine(lineSeparator);
+			table.AppendLine(row);
+		}
+
+		table.Append(lineSeparator);
+
+		return table.ToString();
+	}
+
+	private string RowSeparator(int width) {
+		return new string('-', width);
+	}
+
+	public void AppendRow(params string[] cells) {
+		if (cells == null || cells.Length != _header.Length)
+			return;
+
+		var row = new StringBuilder();
+		for (int i = 0; i < cells.Length; i++) {
+			var format = "|{0," + _columnWidths[i] + "}";
+			row.AppendFormat(format, cells[i]);
+		}
+
+		row.Append("|");
+
+		_rows.Add(row.ToString());
+	}
+}
diff --git a/src/KurrentDB.TestClient/GrpcCommands/ReadAllProcessor.cs b/src/KurrentDB.TestClient/GrpcCommands/ReadAllProcessor.cs
new file mode 100644
index 00000000000..0e55b4b0531
--- /dev/null
+++ b/src/KurrentDB.TestClient/GrpcCommands/ReadAllProcessor.cs
@@ -0,0 +1,137 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Client;
+using Serilog;
+
+namespace KurrentDB.TestClient.GrpcCommands;
+
+internal class ReadAllProcessor : ICmdProcessor {
+	public string Usage {
+		get { return "RDALLGRPC [[F|B] [clients] [<commit pos> <prepare pos>]]"; }
+	}
+
+	public string Keyword {
+		get { return "RDALLGRPC"; }
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		Direction direction = Direction.Forwards;
+		Position position = Position.Start;
+		bool forward = true;
+		bool posOverriden = false;
+		int clientCount = 1;
+
+		if (args.Length > 0) {
+			if (args.Length > 4)
+				return false;
+
+			if (args[0].ToUpper() == "F")
+				forward = true;
+			else if (args[0].ToUpper() == "B")
+				forward = false;
+			else
+				return false;
+
+			if (args.Length > 1) {
+				clientCount = MetricPrefixValue.ParseInt(args[1]);
+			}
+
+			if (args.Length == 4) {
+				posOverriden = true;
+				if (!ulong.TryParse(args[2], out var commitPos) || !ulong.TryParse(args[3], out var preparePos))
+					return false;
+
+				position = new Position(commitPos, preparePos);
+			}
+		}
+
+		if (!posOverriden) {
+			position = forward ? Position.Start : Position.End;
+		}
+
+		context.IsAsync();
+
+		if (context._grpcTestClient.AreCredentialsMissing) {
+			context.Fail(reason: "Credentials are needed in order to read from the $all stream, specify a connection string with credentials!");
+			return true;
+		}
+
+		var task = ReadAll(context, clientCount, direction, position);
+		task.Wait();
+
+		return true;
+	}
+
+	private async Task ReadAll(CommandProcessorContext context, int clientCount, Direction direction, Position position) {
+
+		var cts = new CancellationTokenSource();
+
+		ProgressMonitor monitor = new ProgressMonitor(context.Log);
+
+		var clientTasks = new List<Task>();
+		for (int i = 0; i < clientCount; i++) {
+			if (i > 0) {
+				await Task.Delay(TimeSpan.FromSeconds(30));
+			}
+
+			EventStoreClient client = context._grpcTestClient.CreateGrpcClient();
+			clientTasks.Add(ReadAllTask(client));
+		}
+
+		await Task.WhenAll(clientTasks);
+
+		monitor.Stop();
+		context.Log.Information("=== Reading ALL {readDirection} completed in {elapsed}. Total read: {total}",
+			direction, monitor.Duration, monitor.Total);
+		context.Success();
+
+		async Task ReadAllTask(EventStoreClient c) {
+			var r = c.ReadAllAsync(direction, position, cancellationToken: cts.Token);
+			await foreach (var _ in r.Messages.WithCancellation(cts.Token)) {
+				monitor.Increment();
+			}
+		}
+	}
+
+	class ProgressMonitor {
+		private ulong _i;
+		private readonly ILogger _log;
+		private readonly Stopwatch _duration;
+		private readonly Stopwatch _interval;
+
+		public ProgressMonitor(ILogger log) {
+			_log = log;
+			_duration = Stopwatch.StartNew();
+			_interval = Stopwatch.StartNew();
+		}
+
+		public TimeSpan Duration => _duration.Elapsed;
+		public ulong Total => _i;
+
+		public void Increment() {
+			var result = Interlocked.Increment(ref _i);
+
+			if (result % 1000 == 0) {
+				Console.Write(".");
+			}
+
+			if (result % 100_000 == 0) {
+				_log.Information(
+					"\nDONE TOTAL {reads} READ IN {elapsed} ({rate:0.0}/s)",
+					_i, _interval.Elapsed, 1000.0 * (_i / _duration.Elapsed.TotalMilliseconds));
+				_interval.Restart();
+			}
+		}
+
+		public void Stop() {
+			_duration.Stop();
+			_interval.Stop();
+		}
+	}
+}
diff --git a/src/KurrentDB.TestClient/GrpcCommands/WriteFloodProcessor.cs b/src/KurrentDB.TestClient/GrpcCommands/WriteFloodProcessor.cs
new file mode 100644
index 00000000000..68d0b4ed91c
--- /dev/null
+++ b/src/KurrentDB.TestClient/GrpcCommands/WriteFloodProcessor.cs
@@ -0,0 +1,205 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Client;
+using KurrentDB.TestClient.Commands;
+using KurrentDB.TestClient.Statistics;
+
+namespace KurrentDB.TestClient.GrpcCommands;
+
+internal class WriteFloodProcessor : ICmdProcessor {
+	private static readonly UTF8Encoding UTF8NoBom = new UTF8Encoding(false);
+
+	public string Usage {
+		//                         0          1            2           3          4              5
+		get { return "WRFLGRPC [<clients> <requests> [<streams-cnt> [<size> [<batchsize> [<stream-prefix>]]]]]"; }
+	}
+
+	public string Keyword {
+		get { return "WRFLGRPC"; }
+	}
+
+	public bool Execute(CommandProcessorContext context, string[] args) {
+		int clientsCnt = 1;
+		long requestsCnt = 5000;
+		int streamsCnt = 1000;
+		int size = 256;
+		int batchSize = 1;
+		string streamNamePrefix = string.Empty;
+		if (args.Length > 0) {
+			if (args.Length < 2 || args.Length > 6)
+				return false;
+
+			try {
+				clientsCnt = MetricPrefixValue.ParseInt(args[0]);
+				requestsCnt = MetricPrefixValue.ParseLong(args[1]);
+				if (args.Length >= 3)
+					streamsCnt = MetricPrefixValue.ParseInt(args[2]);
+				if (args.Length >= 4)
+					size = MetricPrefixValue.ParseInt(args[3]);
+				if (args.Length >= 5)
+					batchSize = MetricPrefixValue.ParseInt(args[4]);
+				if (args.Length >= 6)
+					streamNamePrefix = args[5];
+			} catch {
+				return false;
+			}
+		}
+
+		var stats = new WriteFloodStats(Keyword, context.OutputCsv, args);
+		var monitor = new RequestMonitor();
+		try {
+			var task = WriteFlood(context, stats, clientsCnt, requestsCnt, streamsCnt, size, batchSize, streamNamePrefix, monitor);
+			task.Wait();
+		} catch (Exception ex) {
+			context.Fail(ex);
+		}
+
+		return true;
+	}
+
+	private async Task WriteFlood(CommandProcessorContext context, WriteFloodStats stats, int clientsCnt, long requestsCnt, int streamsCnt,
+		int size, int batchSize, string streamNamePrefix, RequestMonitor monitor) {
+		context.IsAsync();
+
+		long last = 0;
+		long currentInterval = 0;
+		long interval = 100000;
+		byte[] data = UTF8NoBom.GetBytes("{ \"DATA\" : \"" + new string('*', size) + "\"}");
+		byte[] metadata = UTF8NoBom.GetBytes("{ \"METADATA\" : \"" + new string('$', 100) + "\"}");
+
+		string[] streams = Enumerable.Range(0, streamsCnt).Select(x =>
+			string.IsNullOrWhiteSpace(streamNamePrefix)
+				? Guid.NewGuid().ToString()
+				: $"{streamNamePrefix}-{x}"
+		).ToArray();
+
+		context.Log.Information("Writing streams randomly between {first} and {last}",
+			streams.FirstOrDefault(),
+			streams.LastOrDefault());
+
+		var start = new TaskCompletionSource();
+		stats.StartTime = DateTime.UtcNow;
+		var sw2 = new Stopwatch();
+		var capacity = 2000 / clientsCnt;
+		var clientTasks = new List<Task>();
+		for (int i = 0; i < clientsCnt; i++) {
+			var count = requestsCnt / clientsCnt + ((i == clientsCnt - 1) ? requestsCnt % clientsCnt : 0);
+			var client = context._grpcTestClient.CreateGrpcClient();
+			clientTasks.Add(RunClient(client, count));
+		}
+
+		async Task RunClient(EventStoreClient client, long count) {
+			var rnd = new Random();
+			List<Task> pending = new List<Task>(capacity);
+			await start.Task;
+			for (int j = 0; j < count; ++j) {
+				var events = new EventData[batchSize];
+
+				for (int q = 0; q < batchSize; q++) {
+					events[q] = new EventData(Uuid.FromGuid(Guid.NewGuid()), "TakeSomeSpaceEvent", data, metadata);
+				}
+
+				var corrid = Guid.NewGuid();
+				monitor.StartOperation(corrid);
+
+				pending.Add(client.AppendToStreamAsync(streams[rnd.Next(streamsCnt)], StreamState.Any, events).ContinueWith(t => {
+					if (t.IsCompletedSuccessfully)
+						Interlocked.Increment(ref stats.Succ);
+					else {
+						if (Interlocked.Increment(ref stats.Fail) % 1000 == 0) {
+							Console.Write("#");
+							if (t.Exception != null) {
+								var msg = string.Join("\n", t.Exception.ToString().Split("\n").Take(5));
+								context.Log.Error(msg);
+							}
+						}
+					}
+					var localAll = Interlocked.Add(ref stats.All, batchSize);
+					if (localAll - currentInterval > interval) {
+						var localInterval = Interlocked.Exchange(ref currentInterval, localAll);
+						stats.Elapsed = sw2.Elapsed;
+						stats.Rate = 1000.0 * (localAll - localInterval) / stats.Elapsed.TotalMilliseconds;
+						sw2.Restart();
+						context.Log.Information(
+							"\nDONE TOTAL {writes} WRITES IN {elapsed} ({rate:0.0}/s) [S:{success}, F:{failures} (WEV:{wrongExpectedVersion}, " +
+							"P:{prepareTimeout}, C:{commitTimeout}, F:{forwardTimeout}, D:{streamDeleted})].",
+							localAll, stats.Elapsed, stats.Rate, stats.Succ, stats.Fail,
+							stats.WrongExpVersion, stats.PrepTimeout, stats.CommitTimeout, stats.ForwardTimeout, stats.StreamDeleted);
+						stats.WriteStatsToFile(context.StatsLogger);
+					}
+
+					monitor.EndOperation(corrid);
+				}));
+
+				if (pending.Count >= capacity) {
+					await Task.WhenAny(pending);
+
+					while (pending.Count > 0 && Task.WhenAny(pending).IsCompleted) {
+						pending
+							.Where(x => x.IsCompleted).ToList()
+							.ForEach(p => {
+								p.Dispose();
+								pending.Remove(p);
+							});
+
+						if (stats.Succ - last > 1000) {
+							Console.Write(".");
+							last = stats.Succ;
+						}
+					}
+				}
+			}
+
+			if (pending.Count > 0)
+				await Task.WhenAll(pending);
+		}
+
+		var sw = Stopwatch.StartNew();
+		sw2.Start();
+		start.SetResult();
+		await Task.WhenAll(clientTasks);
+		sw.Stop();
+
+		context.Log.Information(
+			"Completed. Successes: {success}, failures: {failures} (WRONG VERSION: {wrongExpectedVersion}, P: {prepareTimeout}, C: {commitTimeout}, F: {forwardTimeout}, D: {streamDeleted})",
+			stats.Succ, stats.Fail,
+			stats.WrongExpVersion, stats.PrepTimeout, stats.CommitTimeout, stats.ForwardTimeout, stats.StreamDeleted);
+		stats.WriteStatsToFile(context.StatsLogger);
+
+		var reqPerSec = (stats.All + 0.0) / sw.ElapsedMilliseconds * 1000;
+		context.Log.Information("{requests} requests completed in {elapsed}ms ({rate:0.00} reqs per sec).", stats.All,
+			sw.ElapsedMilliseconds, reqPerSec);
+
+		PerfUtils.LogData(
+			Keyword,
+			PerfUtils.Row(PerfUtils.Col("clientsCnt", clientsCnt),
+				PerfUtils.Col("requestsCnt", requestsCnt),
+				PerfUtils.Col("ElapsedMilliseconds", sw.ElapsedMilliseconds)),
+			PerfUtils.Row(PerfUtils.Col("successes", stats.Succ), PerfUtils.Col("failures", stats.Fail)));
+
+		var failuresRate = (int)(100 * stats.Fail / (stats.Fail + stats.Succ));
+		PerfUtils.LogTeamCityGraphData(string.Format("{0}-{1}-{2}-reqPerSec", Keyword, clientsCnt, requestsCnt),
+			(int)reqPerSec);
+		PerfUtils.LogTeamCityGraphData(
+			string.Format("{0}-{1}-{2}-failureSuccessRate", Keyword, clientsCnt, requestsCnt), failuresRate);
+		PerfUtils.LogTeamCityGraphData(
+			string.Format("{0}-c{1}-r{2}-st{3}-s{4}-reqPerSec", Keyword, clientsCnt, requestsCnt, streamsCnt, size),
+			(int)reqPerSec);
+		PerfUtils.LogTeamCityGraphData(
+			string.Format("{0}-c{1}-r{2}-st{3}-s{4}-failureSuccessRate", Keyword, clientsCnt, requestsCnt,
+				streamsCnt, size), failuresRate);
+		monitor.GetMeasurementDetails();
+		if (Interlocked.Read(ref stats.Succ) != requestsCnt)
+			context.Fail(reason: "There were errors or not all requests completed.");
+		else
+			context.Success();
+	}
+}
diff --git a/src/KurrentDB.TestClient/GrpcTestClient.cs b/src/KurrentDB.TestClient/GrpcTestClient.cs
new file mode 100644
index 00000000000..97c574557c3
--- /dev/null
+++ b/src/KurrentDB.TestClient/GrpcTestClient.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Client;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.TestClient;
+
+/// <summary>
+/// A test client that connects using the dotnet gRPC client
+/// </summary>
+public class GrpcTestClient {
+	private ClientOptions _options;
+	private ILogger _log;
+
+	/// <summary>
+	/// Constructs a new <see cref="GrpcTestClient"/>
+	/// </summary>
+	/// <param name="options"></param>
+	/// <param name="log"></param>
+	public GrpcTestClient(ClientOptions options, ILogger log) {
+		_options = options;
+		_log = log;
+	}
+
+	/// <summary>
+	/// Creates a new gRPC client
+	/// </summary>
+	/// <returns></returns>
+	public EventStoreClient CreateGrpcClient() {
+		_log.Debug("Creating gRPC client with connection string '{connectionString}'.", ConnectionString);
+		return new EventStoreClient(Settings);
+	}
+
+	/// <summary>
+	/// True in case username and/or password are not specified.
+	/// </summary>
+	public bool AreCredentialsMissing =>
+		string.IsNullOrWhiteSpace(Settings.DefaultCredentials?.Username) ||
+		string.IsNullOrWhiteSpace(Settings.DefaultCredentials?.Password);
+
+	private EventStoreClientSettings Settings => EventStoreClientSettings.Create(ConnectionString);
+
+	private string ConnectionString => string.IsNullOrWhiteSpace(_options.ConnectionString)
+		? $"esdb://{_options.Host}:{_options.HttpPort}?tls={_options.UseTls}&tlsVerifyCert={_options.TlsValidateServer}"
+		: _options.ConnectionString;
+
+}
diff --git a/src/KurrentDB.TestClient/ICmdProcessor.cs b/src/KurrentDB.TestClient/ICmdProcessor.cs
new file mode 100644
index 00000000000..cff1028423c
--- /dev/null
+++ b/src/KurrentDB.TestClient/ICmdProcessor.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#pragma warning disable 1591
+namespace KurrentDB.TestClient;
+
+/// <summary>
+/// Standalone command executable within the test client
+/// </summary>
+public interface ICmdProcessor {
+	/// <summary>
+	/// Keyword associated with this command (to start it)
+	/// </summary>
+	string Keyword { get; }
+
+	/// <summary>
+	/// Short usage string with optional and required parameters
+	/// </summary>
+	string Usage { get; }
+
+	bool Execute(CommandProcessorContext context, string[] args);
+}
diff --git a/src/KurrentDB.TestClient/KurrentDB.TestClient.csproj b/src/KurrentDB.TestClient/KurrentDB.TestClient.csproj
new file mode 100644
index 00000000000..4b39a3587e8
--- /dev/null
+++ b/src/KurrentDB.TestClient/KurrentDB.TestClient.csproj
@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<OutputType>Exe</OutputType>
+		<GenerateSupportedRuntime>false</GenerateSupportedRuntime>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+		<NoWarn>1701;1702;1591</NoWarn>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="EventStore.Client" Version="21.2.0" />
+		<PackageReference Include="EventStore.Client.Grpc.Streams" Version="23.3.3" />
+		<PackageReference Include="Google.Protobuf" Version="3.27.2" />
+		<PackageReference Include="Grpc.Net.Client" Version="2.64.0" />
+		<PackageReference Include="Grpc.Tools" Version="2.65.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="System.CommandLine.DragonFruit" Version="0.3.0-alpha.21216.1" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.BufferManagement\KurrentDB.BufferManagement.csproj" />
+		<ProjectReference Include="..\KurrentDB.Common\KurrentDB.Common.csproj" />
+		<ProjectReference Include="..\KurrentDB.Core\KurrentDB.Core.csproj" />
+		<ProjectReference Include="..\KurrentDB.Transport.Http\KurrentDB.Transport.Http.csproj" />
+		<ProjectReference Include="..\KurrentDB.Transport.Tcp\KurrentDB.Transport.Tcp.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+	  <None Include="..\KurrentDB\logconfig.json">
+	    <Link>logconfig.json</Link>
+	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	  </None>
+	</ItemGroup>
+</Project>
diff --git a/src/EventStore.TestClient/MetricPrefixValue.cs b/src/KurrentDB.TestClient/MetricPrefixValue.cs
similarity index 80%
rename from src/EventStore.TestClient/MetricPrefixValue.cs
rename to src/KurrentDB.TestClient/MetricPrefixValue.cs
index 672cd6158b8..29d3b796003 100644
--- a/src/EventStore.TestClient/MetricPrefixValue.cs
+++ b/src/KurrentDB.TestClient/MetricPrefixValue.cs
@@ -1,7 +1,10 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
 using System.Collections.Generic;
 using System.Linq;
 
-namespace EventStore.TestClient;
+namespace KurrentDB.TestClient;
 
 /// <summary>
 ///	Helps making it easier to specify large values without making a mistake.
@@ -9,7 +12,7 @@ namespace EventStore.TestClient;
 /// instead of: WRFLGRPC 10 5000000 500000 100 1 perftest
 /// </summary>
 internal static class MetricPrefixValue {
-	private static readonly Dictionary<char, long> _metricPrefixes = new () {
+	private static readonly Dictionary<char, long> _metricPrefixes = new() {
 		{'k', 1_000},
 		{'m', 1_000_000},
 		{'g', 1_000_000_000},
@@ -18,10 +21,10 @@ internal static class MetricPrefixValue {
 	public static int ParseInt(string value) => int.Parse(Expand(value));
 
 	public static long ParseLong(string value) => long.Parse(Expand(value));
-	
+
 	private static string Expand(string value) {
 		value = value.ToLower();
-		
+
 		if (!_metricPrefixes.Keys.Any(k => value.EndsWith(k))) {
 			return value;
 		}
diff --git a/src/KurrentDB.TestClient/PerfUtils.cs b/src/KurrentDB.TestClient/PerfUtils.cs
new file mode 100644
index 00000000000..802c32ac2ad
--- /dev/null
+++ b/src/KurrentDB.TestClient/PerfUtils.cs
@@ -0,0 +1,70 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text;
+using ILogger = Serilog.ILogger;
+#pragma warning disable 1591
+
+namespace KurrentDB.TestClient;
+
+public static class PerfUtils {
+	private static readonly ILogger Log = Serilog.Log.ForContext(typeof(PerfUtils));
+
+	private const string ColumnSplitter = ";";
+	private const string PairSplitter = ":";
+
+	public static NameValue Col(string name, object value) {
+		return new NameValue(name, value);
+	}
+
+	public static NameValue[] Row(params NameValue[] nameValuesList) {
+		return nameValuesList;
+	}
+
+	public static void LogData(string dataName, params NameValue[][] rows) {
+		var sb = new StringBuilder();
+
+		sb.AppendLine("[[begin");
+		sb.AppendLine(Format("DataName", dataName));
+		foreach (var cols in rows) {
+			foreach (var nameValue in cols) {
+				sb.Append(Format(nameValue.Name, nameValue.Value));
+			}
+
+			sb.AppendLine();
+		}
+
+		sb.AppendLine("end]]");
+
+		Log.Debug(sb.ToString());
+	}
+
+	private static string Format(string name, object value) {
+		return string.Format("{0}{1}{2}{3}", name, PairSplitter, value, ColumnSplitter);
+	}
+
+	/// <summary>
+	/// Prints key-value point to the log in a way that TeamCity build server
+	/// would be able to capture and then plot on build statistics page,
+	/// tracking performance across multiple builds (need server-side config per project).
+	/// </summary>
+	public static void LogTeamCityGraphData(string key, long value) {
+		if (value < 0) {
+			Log.Error("Value is {value}, however TeamCity requires Value as a positive (non negative) integer.",
+				value);
+			return;
+		}
+
+		Log.Debug("\n##teamcity[buildStatisticValue key='{key}' value='{value}']", key, value);
+	}
+
+	public class NameValue {
+		public readonly string Name;
+		public readonly object Value;
+
+		public NameValue(string name, object value) {
+			Name = name;
+			Value = value;
+		}
+	}
+}
diff --git a/src/KurrentDB.TestClient/PortsHelper.cs b/src/KurrentDB.TestClient/PortsHelper.cs
new file mode 100644
index 00000000000..d8bfcd72351
--- /dev/null
+++ b/src/KurrentDB.TestClient/PortsHelper.cs
@@ -0,0 +1,153 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Diagnostics;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Sockets;
+using System.Threading.Tasks;
+using Serilog.Core;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.TestClient;
+
+internal static class PortsHelper {
+	private static readonly ILogger Log =
+		Serilog.Log.ForContext(Constants.SourceContextPropertyName, "PortsHelper");
+
+	public const int PortStart = 45000;
+	public const int PortCount = 200;
+
+	private static readonly ConcurrentQueue<int> AvailablePorts =
+		new ConcurrentQueue<int>(Enumerable.Range(PortStart, PortCount));
+
+	public static void InitPorts(IPAddress ip) {
+		var sw = Stopwatch.StartNew();
+
+		int p;
+		while (AvailablePorts.TryDequeue(out p)) {
+		}
+
+		Log.Verbose("PortsHelper: starting to examine ports at [{ip}].", ip);
+
+		int succ = 0;
+		for (int port = PortStart; port < PortStart + PortCount; ++port) {
+			try {
+				var listener = new TcpListener(ip, port);
+				listener.Start();
+				listener.Stop();
+			} catch (Exception exc) {
+				Log.Verbose(exc, "PortsHelper: port {port} unavailable for TcpListener. Error: {e}.", port,
+					exc.Message);
+				continue;
+			}
+
+			try {
+				var httpListener = new HttpListener();
+				httpListener.Prefixes.Add(string.Format("http://+:{0}/", port));
+				httpListener.Start();
+
+				Exception httpListenerError = null;
+				var listenTask = Task.Factory.StartNew(() => {
+					try {
+						var context = httpListener.GetContext();
+						context.Response.Close(new byte[] { 1, 2, 3 }, true);
+					} catch (Exception exc) {
+						httpListenerError = exc;
+					}
+				});
+				var client = new HttpClient();
+				var request = client.GetAsync(string.Format("http://{0}:{1}/", ip, port)).Result;
+				var buffer = new byte[256];
+				var read = request.Content.ReadAsStream().Read(buffer, 0, buffer.Length);
+				if (read != 3 || buffer[0] != 1 || buffer[1] != 2 || buffer[2] != 3)
+					throw new Exception(string.Format("Unexpected response received from HTTP on port {0}.", port));
+
+				if (!listenTask.Wait(5000))
+					throw new Exception("PortsHelper: time out waiting for HttpListener to return.");
+				if (httpListenerError != null)
+					throw httpListenerError;
+
+				httpListener.Stop();
+			} catch (Exception exc) {
+				Log.Verbose(exc, "PortsHelper: port {port} unavailable for HttpListener. Error: {e}.", port,
+					exc.Message);
+				continue;
+			}
+
+			AvailablePorts.Enqueue(port);
+			succ += 1;
+		}
+
+		Log.Verbose("PortsHelper: {ports} ports are available at [{ip}].", succ, ip);
+		if (succ <= PortCount / 2)
+			throw new Exception("More than half requested ports are unavailable.");
+
+		Log.Verbose("PortsHelper: test took {elapsed}.", sw.Elapsed);
+	}
+
+	public static int GetAvailablePort(IPAddress ip) {
+		for (int i = 0; i < 50; ++i) {
+			int port;
+			if (!AvailablePorts.TryDequeue(out port))
+				throw new Exception("Couldn't get free TCP port for MiniNode.");
+
+			/*
+							try
+							{
+								var listener = new TcpListener(ip, port);
+								listener.Start();
+								listener.Stop();
+							}
+							catch (Exception)
+							{
+								AvailablePorts.Enqueue(port);
+								continue;
+							}
+			*/
+
+			try {
+				var httpListener = new HttpListener();
+				httpListener.Prefixes.Add(string.Format("http://127.0.0.1:{0}/", port));
+				httpListener.Start();
+				httpListener.Stop();
+			} catch (Exception) {
+				AvailablePorts.Enqueue(port);
+				continue;
+				//                    throw new Exception(
+				//                        string.Format("HttpListener couldn't listen on port {0}, but TcpListener was OK.\nError: {1}", port, exc), exc);
+			}
+
+			return port;
+		}
+
+		throw new Exception("Reached trials limit while trying to get free port for MiniNode");
+	}
+
+	public static void ReturnPort(int port) {
+		AvailablePorts.Enqueue(port);
+	}
+
+	/*
+			private static int[] GetRandomPorts(int from, int portCount)
+			{
+				var res = new int[portCount];
+				var rnd = new Random(Math.Abs(Guid.NewGuid().GetHashCode()));
+				for (int i = 0; i < portCount; ++i)
+				{
+					res[i] = from + i;
+				}
+				for (int i = 0; i < portCount; ++i)
+				{
+					int index = rnd.Next(portCount - i);
+					int tmp = res[i];
+					res[i] = res[i + index];
+					res[i + index] = tmp;
+				}
+				return res;
+			}
+	*/
+}
diff --git a/src/KurrentDB.TestClient/Program.cs b/src/KurrentDB.TestClient/Program.cs
new file mode 100644
index 00000000000..f4de7fe57d0
--- /dev/null
+++ b/src/KurrentDB.TestClient/Program.cs
@@ -0,0 +1,110 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Log;
+using KurrentDB.Common.Options;
+using KurrentDB.Common.Utils;
+using KurrentDB.TestClient.Statistics;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Serilog;
+using Serilog.Core;
+
+namespace KurrentDB.TestClient;
+
+internal enum StatsFormat {
+	Csv,
+	Json
+}
+internal static class Program {
+	/// <summary>
+	///
+	/// </summary>
+	/// <param name="version">Show version.</param>
+	/// <param name="log">Path where to keep log files.</param>
+	/// <param name="whatIf">Print effective configuration to console and then exit.</param>
+	/// <param name="command"></param>
+	/// <param name="host">The host to bind to.</param>
+	/// <param name="tcpPort">The port to run the TCP server on.</param>
+	/// <param name="httpPort">The port to run the HTTP server on.</param>
+	/// <param name="timeout"></param>
+	/// <param name="readWindow"></param>
+	/// <param name="writeWindow"></param>
+	/// <param name="pingWindow"></param>
+	/// <param name="reconnect"></param>
+	/// <param name="useTls"></param>
+	/// <param name="tlsValidateServer"></param>
+	/// <param name="connectionString">The connection string to use when connecting to the server. Not used by the raw TCP client</param>
+	/// <param name="statsFormat">The format for the stats log.</param>
+	/// <returns></returns>
+	public static async Task<int> Main(bool version = false, FileInfo? log = null, bool whatIf = false,
+		string[]? command = null, string host = "localhost", int tcpPort = 1113, int httpPort = 2113,
+		int timeout = Timeout.Infinite, int readWindow = 2000, int writeWindow = 2000, int pingWindow = 2000,
+		bool reconnect = true, bool useTls = false, bool tlsValidateServer = false, string connectionString = "",
+		StatsFormat statsFormat = StatsFormat.Csv) {
+		Log.Logger = EventStoreLoggerConfiguration.ConsoleLog;
+
+		try {
+			var logsDirectory = log?.FullName ?? Locations.DefaultTestClientLogDirectory;
+			EventStoreLoggerConfiguration.Initialize(logsDirectory, "client", LogConsoleFormat.Plain,
+				1024 * 1024 * 1024, RollingInterval.Day, 31, false);
+			var statsLog = statsFormat == StatsFormat.Csv
+				? TestClientCsvLoggerConfiguration.Initialize(logsDirectory, "client")
+				: Log.ForContext(Constants.SourceContextPropertyName, "REGULAR-STATS-LOGGER");
+
+			var options = new ClientOptions {
+				Timeout = timeout,
+				HttpPort = httpPort,
+				Host = host,
+				TcpPort = tcpPort,
+				Reconnect = reconnect,
+				PingWindow = pingWindow,
+				ReadWindow = readWindow,
+				WriteWindow = writeWindow,
+				UseTls = useTls,
+				TlsValidateServer = tlsValidateServer,
+				ConnectionString = connectionString,
+				Command = command ?? Array.Empty<string>(),
+				OutputCsv = statsFormat == StatsFormat.Csv,
+				StatsLog = statsLog
+			};
+
+			var hostedService = new TestClientHostedService(options);
+
+			if (whatIf) {
+				await Console.Out.WriteLineAsync(options.ToString());
+			}
+
+			if (version || whatIf) {
+				await Console.Out.WriteLineAsync(VersionInfo.Text);
+
+				await Console.Out.FlushAsync();
+
+				return 0;
+			}
+			await CreateHostBuilder(hostedService, Environment.GetCommandLineArgs())
+				.RunConsoleAsync(options => options.SuppressStatusMessages = true, hostedService.CancellationToken);
+			return await hostedService.Exited;
+		} catch (Exception ex) {
+			Log.Fatal(ex, "Host terminated unexpectedly.");
+			return 1;
+		} finally {
+			await Log.CloseAndFlushAsync();
+		}
+	}
+
+	private static IHostBuilder CreateHostBuilder(IHostedService hostedService, string[] args) =>
+		new HostBuilder()
+			.ConfigureHostConfiguration(builder =>
+				builder.AddEnvironmentVariables("DOTNET_").AddCommandLine(args))
+			.ConfigureAppConfiguration(builder =>
+				builder.AddEnvironmentVariables().AddCommandLine(args))
+			.ConfigureServices(services => services.AddSingleton(hostedService))
+			.ConfigureLogging(logging => logging.AddSerilog());
+}
diff --git a/src/KurrentDB.TestClient/Statistics/StatsCsvEncoder.cs b/src/KurrentDB.TestClient/Statistics/StatsCsvEncoder.cs
new file mode 100644
index 00000000000..94124be79fa
--- /dev/null
+++ b/src/KurrentDB.TestClient/Statistics/StatsCsvEncoder.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+
+namespace KurrentDB.TestClient.Statistics;
+
+public static class StatsCsvEncoder {
+	private const string Comma = ",";
+	private const string CommaEscapeSymbol = ";";
+
+	public static string GetHeader(Dictionary<string, object> stats) {
+		return Join(stats.Keys).Prepend("Time");
+	}
+
+	public static string GetLine(Dictionary<string, object> stats) {
+		return Join(stats.Values).PrependTime();
+	}
+
+	private static string Prepend(this string csvLine, string column) {
+		return string.Format("{0}{1}{2}", column, Comma, csvLine);
+	}
+
+	private static string PrependTime(this string csvLine) {
+		return csvLine.Prepend(DateTime.UtcNow.ToString("O", CultureInfo.InvariantCulture));
+	}
+
+	private static string Join(IEnumerable<object> items) {
+		var strValues = items.Select(TryGetInvariantString);
+		var escapedValues = strValues.Select(str => str.Replace(Comma, CommaEscapeSymbol)); //extra safety
+
+		return string.Join(Comma, escapedValues);
+	}
+
+	private static string TryGetInvariantString(object obj) {
+		if (obj == null)
+			return string.Empty;
+
+		var convertible = obj as IConvertible;
+		if (convertible != null)
+			return convertible.ToString(CultureInfo.InvariantCulture);
+
+		return obj.ToString();
+	}
+}
diff --git a/src/KurrentDB.TestClient/Statistics/TestClientCsvLoggerConfiguration.cs b/src/KurrentDB.TestClient/Statistics/TestClientCsvLoggerConfiguration.cs
new file mode 100644
index 00000000000..bd648249f59
--- /dev/null
+++ b/src/KurrentDB.TestClient/Statistics/TestClientCsvLoggerConfiguration.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Threading;
+using KurrentDB.Common.Exceptions;
+using Serilog;
+
+namespace KurrentDB.TestClient.Statistics;
+
+/// <summary>
+/// Csv logger configuration for the TestClient
+/// </summary>
+public class TestClientCsvLoggerConfiguration {
+	private static int Initialized;
+	private static readonly string outputTemplate = "{Message}{NewLine}";
+
+	/// <summary>
+	/// Initialize the csv logger
+	/// </summary>
+	/// <param name="logsDirectory"></param>
+	/// <param name="componentName"></param>
+	public static ILogger Initialize(string logsDirectory, string componentName) {
+		if (Interlocked.Exchange(ref Initialized, 1) == 1) {
+			throw new InvalidOperationException($"{nameof(Initialize)} may not be called more than once.");
+		}
+
+		if (logsDirectory.StartsWith("~")) {
+			throw new ApplicationInitializationException(
+				"The given log path starts with a '~'. KurrentDB does not expand '~'.");
+		}
+
+		var filename = Path.Combine(logsDirectory, $"{componentName}/log-stats.csv");
+		return new LoggerConfiguration()
+			.WriteTo.File(filename, outputTemplate: outputTemplate)
+			.CreateLogger();
+	}
+}
diff --git a/src/KurrentDB.TestClient/Statistics/WriteFloodStats.cs b/src/KurrentDB.TestClient/Statistics/WriteFloodStats.cs
new file mode 100644
index 00000000000..06b9bef469d
--- /dev/null
+++ b/src/KurrentDB.TestClient/Statistics/WriteFloodStats.cs
@@ -0,0 +1,147 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using KurrentDB.Core.Services.Monitoring.Stats;
+using Serilog;
+
+namespace KurrentDB.TestClient.Statistics;
+
+/// <summary>
+/// Statistics for WriteFlood
+/// </summary>
+public class WriteFloodStats {
+	/// <summary>
+	/// The number of successful writes
+	/// </summary>
+	public long Succ = 0;
+	/// <summary>
+	/// The number of failing writes
+	/// </summary>
+	public long Fail = 0;
+	/// <summary>
+	/// The number of writes that failed with PrepareTimeout
+	/// </summary>
+	public long PrepTimeout = 0;
+	/// <summary>
+	/// The number of writes that failed with CommitTimeout
+	/// </summary>
+	public long CommitTimeout = 0;
+	/// <summary>
+	/// The number of writes that failed with ForwardTimeout
+	/// </summary>
+	public long ForwardTimeout = 0;
+	/// <summary>
+	/// The number of writes that failed with WrongExpectedVersion
+	/// </summary>
+	public long WrongExpVersion = 0;
+	/// <summary>
+	/// The number of writes that failed with StreamDeleted
+	/// </summary>
+	public long StreamDeleted = 0;
+	/// <summary>
+	/// The total number of completed writes
+	/// </summary>
+	public long All = 0;
+	/// <summary>
+	/// The amount of time that has elapsed since the last measurement
+	/// </summary>
+	public TimeSpan Elapsed = TimeSpan.Zero;
+	/// <summary>
+	/// The time in UTC that the command was started
+	/// </summary>
+	public DateTime StartTime = DateTime.UtcNow;
+	/// <summary>
+	/// The command that was run
+	/// </summary>
+	public string Command;
+	/// <summary>
+	/// The current write rate
+	/// </summary>
+	public double Rate;
+	/// <summary>
+	/// The command and arguments used to run this command
+	/// </summary>
+	public string CommandString;
+
+	private bool _csv;
+
+	/// <summary>
+	/// </summary>
+	/// <param name="command"></param>
+	/// <param name="csv"></param>
+	/// <param name="args"></param>
+	public WriteFloodStats(string command, bool csv, string[] args) {
+		Command = command;
+		_csv = csv;
+		CommandString = $"{Command} {string.Join(" ", args)}";
+	}
+
+	private Dictionary<string, object> GetStats() {
+		var stats = new Dictionary<string, object>();
+		stats[$"{Command}-starttime"] = StartTime.ToString("O", CultureInfo.InvariantCulture);
+		stats[$"{Command}-succ"] = Succ;
+		stats[$"{Command}-fail"] = Fail;
+		stats[$"{Command}-prepTimeout"] = PrepTimeout;
+		stats[$"{Command}-commitTimeout"] = CommitTimeout;
+		stats[$"{Command}-forwardTimeout"] = ForwardTimeout;
+		stats[$"{Command}-wrongExpVersion"] = WrongExpVersion;
+		stats[$"{Command}-streamDeleted"] = StreamDeleted;
+		stats[$"{Command}-all"] = All;
+		stats[$"{Command}-elapsed"] = Elapsed;
+		stats[$"{Command}-rate"] = Rate;
+		stats[$"{Command}-command"] = CommandString;
+
+		return stats;
+	}
+
+	private string _lastWrittenCsvHeader = string.Empty;
+	/// <summary>
+	/// Write the current round of stats to the log
+	/// </summary>
+	/// <param name="log">The logger to write to</param>
+	public void WriteStatsToFile(ILogger log) {
+		try {
+			var statsContainer = new StatsContainer();
+			statsContainer.Add(GetStats());
+			var rawStats = statsContainer.GetStats(useGrouping: false, useMetadata: false);
+			if (!_csv) {
+				rawStats.Add("timestamp", DateTime.UtcNow.ToString("O", CultureInfo.InvariantCulture));
+				log.Information("{@stats}", rawStats);
+			} else {
+				var writeHeader = false;
+				var header = StatsCsvEncoder.GetHeader(rawStats);
+				if (header != _lastWrittenCsvHeader) {
+					_lastWrittenCsvHeader = header;
+					writeHeader = true;
+				}
+
+				var line = StatsCsvEncoder.GetLine(rawStats);
+				var timestamp = GetTimestamp(line);
+
+				if (writeHeader) {
+					log.Information(Environment.NewLine);
+					log.Information(header);
+				}
+				log.Information(line);
+			}
+
+		} catch (Exception ex) {
+			Log.Error(ex, "Error on regular stats collection.");
+		}
+	}
+
+	private DateTime? GetTimestamp(string line) {
+		var separatorIdx = line.IndexOf(',');
+		if (separatorIdx == -1)
+			return null;
+
+		try {
+			return DateTime.Parse(line.Substring(0, separatorIdx)).ToUniversalTime();
+		} catch {
+			return null;
+		}
+	}
+}
diff --git a/src/KurrentDB.TestClient/TcpTestClient.cs b/src/KurrentDB.TestClient/TcpTestClient.cs
new file mode 100644
index 00000000000..68feee52bff
--- /dev/null
+++ b/src/KurrentDB.TestClient/TcpTestClient.cs
@@ -0,0 +1,175 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using System.Net.Security;
+using System.Net.Sockets;
+using System.Threading;
+using KurrentDB.BufferManagement;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core.Services.Transport.Tcp;
+using KurrentDB.Transport.Tcp;
+using KurrentDB.Transport.Tcp.Formatting;
+using KurrentDB.Transport.Tcp.Framing;
+using Connection = KurrentDB.Transport.Tcp.TcpTypedConnection<byte[]>;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.TestClient;
+
+/// <summary>
+/// A test client that connects over Raw TCP connections
+/// </summary>
+public class TcpTestClient {
+	private readonly BufferManager _bufferManager =
+		new BufferManager(TcpConfiguration.BufferChunksCount, TcpConfiguration.SocketBufferSize);
+
+	private readonly TcpClientConnector _connector = new TcpClientConnector();
+
+	private readonly bool _validateServer;
+	private readonly bool _useSsl;
+	private readonly ILogger _log;
+	private readonly bool _interactiveMode;
+	/// <summary>
+	/// The TCP EndPoint of the Event Store node
+	/// </summary>
+	public readonly EndPoint TcpEndpoint;
+	/// <summary>
+	/// The Client Options used to start KurrentDB.TestClient
+	/// </summary>
+	public readonly ClientOptions Options;
+
+	/// <summary>
+	/// Constructs a new <see cref="TcpTestClient"/>
+	/// </summary>
+	/// <param name="options"></param>
+	/// <param name="interactiveMode"></param>
+	/// <param name="log"></param>
+	public TcpTestClient(ClientOptions options, bool interactiveMode, ILogger log) {
+		_interactiveMode = interactiveMode;
+		_log = log;
+		_useSsl = options.UseTls;
+		TcpEndpoint = new DnsEndPoint(options.Host, options.TcpPort);
+		_validateServer = options.TlsValidateServer;
+		Options = options;
+	}
+
+	/// <summary>
+	/// Creates a new raw TCP connection
+	/// </summary>
+	/// <param name="context"></param>
+	/// <param name="handlePackage"></param>
+	/// <param name="connectionEstablished"></param>
+	/// <param name="connectionClosed"></param>
+	/// <param name="failContextOnError"></param>
+	/// <param name="tcpEndPoint"></param>
+	/// <returns></returns>
+	/// <exception cref="Exception"></exception>
+	public Connection CreateTcpConnection(CommandProcessorContext context,
+		Action<Connection, TcpPackage> handlePackage,
+		Action<Connection> connectionEstablished = null,
+		Action<Connection, SocketError> connectionClosed = null,
+		bool failContextOnError = true,
+		IPEndPoint tcpEndPoint = null) {
+		var connectionCreatedEvent = new ManualResetEventSlim(false);
+		Connection typedConnection = null;
+
+		Action<ITcpConnection> onConnectionEstablished = conn => {
+			// we execute callback on ThreadPool because on FreeBSD it can be called synchronously
+			// causing deadlock
+			ThreadPool.QueueUserWorkItem(_ => {
+				if (!_interactiveMode)
+					_log.Information(
+						"TcpTypedConnection: connected to [{remoteEndPoint}, L{localEndPoint}, {connectionId:B}].",
+						conn.RemoteEndPoint, conn.LocalEndPoint, conn.ConnectionId);
+				if (connectionEstablished != null) {
+					if (!connectionCreatedEvent.Wait(10000))
+						throw new Exception("TcpTypedConnection: creation took too long!");
+					connectionEstablished(typedConnection);
+				}
+			});
+		};
+		Action<ITcpConnection, SocketError> onConnectionFailed = (conn, error) => {
+			_log.Error(
+				"TcpTypedConnection: connection to [{remoteEndPoint}, L{localEndPoint}, {connectionId:B}] failed. Error: {e}.",
+				conn.RemoteEndPoint, conn.LocalEndPoint, conn.ConnectionId, error);
+
+			if (connectionClosed != null)
+				connectionClosed(null, error);
+
+			if (failContextOnError)
+				context.Fail(reason: string.Format("Socket connection failed with error {0}.", error));
+		};
+
+		var endpoint = tcpEndPoint ?? TcpEndpoint;
+		ITcpConnection connection;
+		if (_useSsl) {
+			connection = _connector.ConnectSslTo(
+				Guid.NewGuid(),
+				endpoint.GetHost(),
+				endpoint.GetOtherNames(),
+				endpoint.ResolveDnsToIPAddress(),
+				TcpConnectionManager.ConnectionTimeout,
+				(_, _, err, _) => (err == SslPolicyErrors.None || !_validateServer, err.ToString()),
+				() => null,
+				onConnectionEstablished,
+				onConnectionFailed,
+				verbose: false);
+		} else {
+			connection = _connector.ConnectTo(
+				Guid.NewGuid(),
+				endpoint.ResolveDnsToIPAddress(),
+				TcpConnectionManager.ConnectionTimeout,
+				onConnectionEstablished,
+				onConnectionFailed,
+				verbose: false);
+		}
+
+		typedConnection = new Connection(connection, new RawMessageFormatter(_bufferManager),
+			new LengthPrefixMessageFramer());
+		typedConnection.ConnectionClosed +=
+			(conn, error) => {
+				if (!_interactiveMode || error != SocketError.Success) {
+					_log.Information(
+						"TcpTypedConnection: connection [{remoteEndPoint}, L{localEndPoint}] was closed {status}",
+						conn.RemoteEndPoint, conn.LocalEndPoint,
+						error == SocketError.Success ? "cleanly." : "with error: " + error + ".");
+				}
+
+				if (connectionClosed != null)
+					connectionClosed(conn, error);
+				else
+					_log.Information("connectionClosed callback was null");
+			};
+		connectionCreatedEvent.Set();
+
+		typedConnection.ReceiveAsync(
+			(conn, pkg) => {
+				var package = new TcpPackage();
+				bool validPackage = false;
+				try {
+					package = TcpPackage.FromArraySegment(new ArraySegment<byte>(pkg));
+					validPackage = true;
+
+					if (package.Command == TcpCommand.HeartbeatRequestCommand) {
+						var resp = new TcpPackage(TcpCommand.HeartbeatResponseCommand, Guid.NewGuid(), null);
+						conn.EnqueueSend(resp.AsByteArray());
+						return;
+					}
+
+					handlePackage(conn, package);
+				} catch (Exception ex) {
+					_log.Information(ex,
+						"TcpTypedConnection: [{remoteEndPoint}, L{localEndPoint}] ERROR for {package}. Connection will be closed.",
+						conn.RemoteEndPoint, conn.LocalEndPoint,
+						validPackage ? package.Command as object : "<invalid package>");
+					conn.Close(ex.Message);
+
+					if (failContextOnError)
+						context.Fail(ex);
+				}
+			});
+
+		return typedConnection;
+	}
+}
diff --git a/src/KurrentDB.TestClient/TestClientHostedService.cs b/src/KurrentDB.TestClient/TestClientHostedService.cs
new file mode 100644
index 00000000000..1e3b5fd6f50
--- /dev/null
+++ b/src/KurrentDB.TestClient/TestClientHostedService.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Hosting;
+
+namespace KurrentDB.TestClient;
+
+internal class TestClientHostedService : IHostedService {
+	private readonly Client _client;
+	private readonly CancellationTokenSource _stopped;
+	private readonly TaskCompletionSource<int> _exitCode;
+
+	public Task<int> Exited => _exitCode.Task;
+
+	public CancellationToken CancellationToken => _stopped.Token;
+
+	public TestClientHostedService(ClientOptions options) {
+		_exitCode = new TaskCompletionSource<int>();
+		_stopped = new CancellationTokenSource();
+		_stopped.Token.Register(() => _exitCode.TrySetResult(0));
+		_client = new Client(options, _stopped);
+	}
+	public Task StartAsync(CancellationToken cancellationToken) {
+		cancellationToken.Register(_stopped.Cancel);
+		return Task.Run(() => {
+			_exitCode.SetResult(_client.Run(cancellationToken));
+			if (!_client.InteractiveMode) {
+				_stopped.Cancel();
+			}
+		}, _stopped.Token);
+	}
+
+	public Task StopAsync(CancellationToken cancellationToken) {
+		_stopped.Cancel();
+		return Task.CompletedTask;
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/AsyncQueuedBufferWriter.cs b/src/KurrentDB.Transport.Http/AsyncQueuedBufferWriter.cs
new file mode 100644
index 00000000000..c66d8be02cf
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/AsyncQueuedBufferWriter.cs
@@ -0,0 +1,124 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.IO;
+using System.Threading;
+
+namespace KurrentDB.Transport.Http;
+
+/// <summary>
+/// Manages a queue of buffers to send to output stream and
+/// sens them to the output stream as previous requests complete
+/// </summary>
+public class AsyncQueuedBufferWriter : IDisposable {
+	private class Item {
+		public readonly byte[] Buffer;
+		public readonly Action<Exception> OnCompletion;
+
+		public Item(byte[] buffer, Action<Exception> onCompletion) {
+			Buffer = buffer;
+			OnCompletion = onCompletion;
+		}
+	}
+
+	private readonly Stream _outputStream;
+	private readonly Action _onDispose;
+	private readonly ConcurrentQueue<Item> _queue = new ConcurrentQueue<Item>();
+
+	private int _processing;
+	private Exception _error;
+	private int _disposed;
+
+	/// <param name="outputStream">NOTE: outputStream is NOT auto-disposed.</param>
+	/// <param name="onDispose">Use to dispose response streams and close connections.</param>
+	public AsyncQueuedBufferWriter(Stream outputStream, Action onDispose) {
+		_outputStream = outputStream;
+		_onDispose = onDispose;
+	}
+
+	public void Append(byte[] buffer, Action<Exception> onCompletion) {
+		var item = new Item(buffer, onCompletion);
+		_queue.Enqueue(item);
+
+		if (Interlocked.CompareExchange(ref _processing, 1, 0) == 0)
+			BeginProcessing();
+	}
+
+	/// <summary>
+	/// Schedules auto-dispose when all previous writes are completed
+	/// </summary>
+	/// <param name="onCompletion">onCompletion handler is called after the object has been disposed</param>
+	public void AppendDispose(Action<Exception> onCompletion) {
+		var item = new Item(null, onCompletion);
+		_queue.Enqueue(item);
+
+		if (Interlocked.CompareExchange(ref _processing, 1, 0) == 0)
+			BeginProcessing();
+	}
+
+	private void BeginProcessing() {
+		if (_processing != 1)
+			throw new InvalidOperationException();
+		ContinueWriteOrStop();
+	}
+
+	private void ContinueWriteOrStop() {
+		bool proceed = true;
+		while (proceed) {
+			Item item;
+			if (_queue.TryDequeue(out item)) {
+				try {
+					if (item.Buffer != null)
+						_outputStream.BeginWrite(item.Buffer, 0, item.Buffer.Length, WriteCompleted, item);
+					else {
+						Dispose();
+						if (item.OnCompletion != null)
+							item.OnCompletion(null);
+					}
+				} catch (Exception ex) {
+					_error = ex;
+					Dispose();
+				}
+
+				return;
+			}
+
+			Interlocked.Exchange(ref _processing, 0);
+			proceed = !_queue.IsEmpty && Interlocked.CompareExchange(ref _processing, 1, 0) == 0;
+		}
+	}
+
+	private void WriteCompleted(IAsyncResult ar) {
+		var item = (Item)ar.AsyncState;
+		EndWrite(ar);
+		RaiseCompletion(item);
+		ContinueWriteOrStop();
+	}
+
+	private void EndWrite(IAsyncResult ar) {
+		try {
+			_outputStream.EndWrite(ar);
+		} catch (Exception ex) {
+			_error = ex;
+			Dispose();
+		}
+	}
+
+	private void RaiseCompletion(Item item) {
+		try {
+			if (item.OnCompletion != null)
+				item.OnCompletion(_error);
+		} catch (Exception ex) {
+			_error = ex;
+		}
+	}
+
+	public void Dispose() {
+		if (Interlocked.CompareExchange(ref _disposed, 1, 0) != 0)
+			return;
+		if (_onDispose != null)
+			_onDispose();
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/AsyncStreamCopier.cs b/src/KurrentDB.Transport.Http/AsyncStreamCopier.cs
new file mode 100644
index 00000000000..7dbd5ba5472
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/AsyncStreamCopier.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Transport.Http;
+
+public class AsyncStreamCopier<T> {
+	public Exception Error { get; private set; }
+	public readonly T AsyncState;
+
+	private readonly byte[] _buffer = new byte[4096];
+	private readonly Stream _input;
+	private readonly Stream _output;
+	private readonly Action<AsyncStreamCopier<T>> _onCompleted;
+
+	public AsyncStreamCopier(Stream input, Stream output, T state, Action<AsyncStreamCopier<T>> onCompleted) {
+		Ensure.NotNull(input, "input");
+		Ensure.NotNull(output, "output");
+		Ensure.NotNull(onCompleted, "onCompleted");
+
+		_input = input;
+		_output = output;
+		_onCompleted = onCompleted;
+
+		AsyncState = state;
+		Error = null;
+	}
+
+	public void Start() {
+		GetNextChunk();
+	}
+
+	private void GetNextChunk() {
+		try {
+			_input.BeginRead(_buffer, 0, _buffer.Length, InputReadCompleted, null);
+		} catch (Exception e) {
+			Error = e;
+			OnCompleted();
+		}
+	}
+
+	private void InputReadCompleted(IAsyncResult ar) {
+		try {
+			int bytesRead = _input.EndRead(ar);
+			if (bytesRead <= 0) // mono can return -1
+			{
+				OnCompleted();
+				return;
+			}
+
+			_output.BeginWrite(_buffer, 0, bytesRead, OutputWriteCompleted, null);
+		} catch (Exception e) {
+			Error = e;
+			OnCompleted();
+		}
+	}
+
+	private void OutputWriteCompleted(IAsyncResult ar) {
+		try {
+			_output.EndWrite(ar);
+			GetNextChunk();
+		} catch (Exception e) {
+			Error = e;
+			OnCompleted();
+		}
+	}
+
+	private void OnCompleted() {
+		if (_onCompleted != null)
+			_onCompleted(this);
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/Atom/AtomExceptions.cs b/src/KurrentDB.Transport.Http/Atom/AtomExceptions.cs
new file mode 100644
index 00000000000..c3b6ed97bed
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/Atom/AtomExceptions.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Transport.Http.Atom;
+
+public class AtomSpecificationViolationException : Exception {
+	public AtomSpecificationViolationException(string message) : base(message) {
+	}
+}
+
+public class ThrowHelper {
+	public static void ThrowSpecificationViolation(string message) {
+		throw new AtomSpecificationViolationException(message);
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/Atom/AtomSpecs.cs b/src/KurrentDB.Transport.Http/Atom/AtomSpecs.cs
new file mode 100644
index 00000000000..f736a076650
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/Atom/AtomSpecs.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Transport.Http.Atom;
+
+public class AtomSpecs {
+	public const int FeedPageSize = 20;
+
+	public const string Author = "Kurrent";
+
+	public const string AtomV1Namespace = "http://www.w3.org/2005/Atom";
+	public const string AtomPubV1Namespace = "http://www.w3.org/2007/app";
+}
diff --git a/src/KurrentDB.Transport.Http/Atom/Feed.cs b/src/KurrentDB.Transport.Http/Atom/Feed.cs
new file mode 100644
index 00000000000..afa99c618df
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/Atom/Feed.cs
@@ -0,0 +1,330 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Xml;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+using KurrentDB.Common.Utils;
+using Newtonsoft.Json;
+
+namespace KurrentDB.Transport.Http.Atom;
+
+public class FeedElement : IXmlSerializable {
+	public string Title { get; set; }
+	public string Id { get; set; }
+	public string Updated { get; set; }
+	public string StreamId { get; set; }
+	public PersonElement Author { get; set; }
+	public bool HeadOfStream { get; set; }
+	public string SelfUrl { get; set; }
+	public string ETag { get; set; }
+
+	public List<LinkElement> Links { get; set; }
+	public List<EntryElement> Entries { get; set; }
+
+	public FeedElement() {
+		Links = new List<LinkElement>();
+		Entries = new List<EntryElement>();
+	}
+
+	public void SetTitle(string title) {
+		Ensure.NotNull(title, "title");
+		Title = title;
+	}
+
+	public void SetId(string id) {
+		Ensure.NotNull(id, "id");
+		Id = id;
+	}
+
+	public void SetUpdated(DateTime dateTime) {
+		Updated = XmlConvert.ToString(dateTime, XmlDateTimeSerializationMode.Utc);
+	}
+
+	public void SetAuthor(string name) {
+		Ensure.NotNull(name, "name");
+		Author = new PersonElement(name);
+	}
+
+	public void SetHeadOfStream(bool headOfStream) {
+		this.HeadOfStream = headOfStream;
+	}
+
+	public void SetSelfUrl(string self) {
+		this.SelfUrl = self;
+	}
+
+	public void SetETag(string etag) {
+		this.ETag = etag;
+	}
+
+	public void AddLink(string relation, string uri, string contentType = null) {
+		Ensure.NotNull(uri, "uri");
+		Links.Add(new LinkElement(uri, relation, contentType));
+	}
+
+	public void AddEntry(EntryElement entry) {
+		Ensure.NotNull(entry, "entry");
+		Entries.Add(entry);
+	}
+
+	public XmlSchema GetSchema() {
+		return null;
+	}
+
+	public void ReadXml(XmlReader reader) {
+		throw new NotImplementedException();
+	}
+
+	public void WriteXml(XmlWriter writer) {
+		if (string.IsNullOrEmpty(Title))
+			ThrowHelper.ThrowSpecificationViolation(
+				"atom:feed elements MUST contain exactly one atom:title element.");
+		if (string.IsNullOrEmpty(Id))
+			ThrowHelper.ThrowSpecificationViolation("atom:feed elements MUST contain exactly one atom:id element.");
+		if (string.IsNullOrEmpty(Updated))
+			ThrowHelper.ThrowSpecificationViolation(
+				"atom:feed elements MUST contain exactly one atom:updated element.");
+		if (Author == null)
+			ThrowHelper.ThrowSpecificationViolation(
+				"atom:feed elements MUST contain one or more atom:author elements");
+		if (Links.Count == 0)
+			ThrowHelper.ThrowSpecificationViolation(
+				"atom:feed elements SHOULD contain one atom:link element with a "
+				+ "rel attribute value of 'self'. This is the preferred URI for retrieving Atom Feed Documents representing this Atom feed.");
+
+		writer.WriteStartElement("feed", AtomSpecs.AtomV1Namespace);
+
+		writer.WriteElementString("title", AtomSpecs.AtomV1Namespace, Title);
+		writer.WriteElementString("id", AtomSpecs.AtomV1Namespace, Id);
+		writer.WriteElementString("updated", AtomSpecs.AtomV1Namespace, Updated);
+		Author.WriteXml(writer);
+
+		Links.ForEach(link => link.WriteXml(writer));
+		Entries.ForEach(entry => entry.WriteXml(writer, usePrefix: false));
+
+		writer.WriteEndElement();
+	}
+}
+
+public class EntryElement : IXmlSerializable {
+	private object _content;
+	public string Title { get; set; }
+	public string Id { get; set; }
+	public string Updated { get; set; }
+	public PersonElement Author { get; set; }
+	public string Summary { get; set; }
+	public int? RetryCount { get; set; }
+
+	public object Content {
+		get { return _content; }
+		set { throw new NotSupportedException(); }
+	}
+
+	public List<LinkElement> Links { get; set; }
+
+	public EntryElement() {
+		Links = new List<LinkElement>();
+	}
+
+	public void SetTitle(string title) {
+		Ensure.NotNull(title, "title");
+		Title = title;
+	}
+
+	public void SetId(string id) {
+		Ensure.NotNull(id, "id");
+		Id = id;
+	}
+
+	public void SetUpdated(DateTime dateTime) {
+		Updated = XmlConvert.ToString(dateTime, XmlDateTimeSerializationMode.Utc);
+	}
+
+	public void SetAuthor(string name) {
+		Ensure.NotNull(name, "name");
+		Author = new PersonElement(name);
+	}
+
+	public void SetSummary(string summary) {
+		Ensure.NotNull(summary, "summary");
+		Summary = summary;
+	}
+
+	public void AddLink(string relation, string uri, string type = null) {
+		Ensure.NotNull(uri, "uri");
+		Links.Add(new LinkElement(uri, relation, type));
+	}
+
+	public void AddRetryCount(int value) {
+		RetryCount = value;
+	}
+
+	public XmlSchema GetSchema() {
+		return null;
+	}
+
+	public void ReadXml(XmlReader reader) {
+		reader.ReadStartElement("entry");
+
+		Title = reader.ReadElementString("title");
+		Id = reader.ReadElementString("id");
+		Updated = reader.ReadElementString("updated");
+		Author.ReadXml(reader);
+		Summary = reader.ReadElementString("summary");
+		Links.ForEach(l => l.ReadXml(reader));
+
+		reader.ReadEndElement();
+	}
+
+	public void WriteXml(XmlWriter writer) {
+		WriteXml(writer, usePrefix: true);
+	}
+
+	public void WriteXml(XmlWriter writer, bool usePrefix) {
+		if (string.IsNullOrEmpty(Title))
+			ThrowHelper.ThrowSpecificationViolation(
+				"atom:entry elements MUST contain exactly one atom:title element.");
+		if (string.IsNullOrEmpty(Id))
+			ThrowHelper.ThrowSpecificationViolation(
+				"atom:entry elements MUST contain exactly one atom:id element.");
+		if (string.IsNullOrEmpty(Updated))
+			ThrowHelper.ThrowSpecificationViolation(
+				"atom:entry elements MUST contain exactly one atom:updated element.");
+		if (Author == null)
+			ThrowHelper.ThrowSpecificationViolation(
+				"atom:entry elements MUST contain one or more atom:author elements");
+		if (string.IsNullOrEmpty(Summary))
+			ThrowHelper.ThrowSpecificationViolation("atom:entry elements MUST contain an atom:summary element");
+
+		if (usePrefix)
+			writer.WriteStartElement("atom", "entry", AtomSpecs.AtomV1Namespace);
+		else
+			writer.WriteStartElement("entry", AtomSpecs.AtomV1Namespace);
+
+		writer.WriteElementString("title", AtomSpecs.AtomV1Namespace, Title);
+		writer.WriteElementString("id", AtomSpecs.AtomV1Namespace, Id);
+		writer.WriteElementString("updated", AtomSpecs.AtomV1Namespace, Updated);
+		Author.WriteXml(writer);
+		writer.WriteElementString("summary", AtomSpecs.AtomV1Namespace, Summary);
+
+		if (RetryCount != null) {
+			writer.WriteElementString("retryCount", RetryCount.Value.ToString());
+		}
+
+		Links.ForEach(link => link.WriteXml(writer));
+		if (Content != null) {
+			var serializeObject = JsonConvert.SerializeObject(Content);
+			var deserializeXmlNode = JsonConvert.DeserializeXmlNode(serializeObject, "content");
+			writer.WriteStartElement("content", AtomSpecs.AtomV1Namespace);
+			writer.WriteAttributeString("type", ContentType.ApplicationXml);
+			deserializeXmlNode.DocumentElement.WriteContentTo(writer);
+			writer.WriteEndElement();
+		}
+
+		writer.WriteEndElement();
+	}
+
+	public void SetContent(object content) {
+		_content = content;
+	}
+}
+
+public class RichEntryElement : EntryElement {
+	public Guid EventId { get; set; }
+	public string EventType { get; set; }
+	public long EventNumber { get; set; }
+	public string Data { get; set; }
+	public string MetaData { get; set; }
+	public string LinkMetaData { get; set; }
+
+	public string StreamId { get; set; }
+
+	public bool IsJson { get; set; }
+
+	public bool IsMetaData { get; set; }
+	public bool IsLinkMetaData { get; set; }
+	public bool IsRedacted { get; set; }
+
+	public long PositionEventNumber { get; set; }
+
+	public string PositionStreamId { get; set; }
+}
+
+public class LinkElement : IXmlSerializable {
+	public string Uri { get; set; }
+	public string Relation { get; set; }
+	public string Type { get; set; }
+
+	public LinkElement(string uri) : this(uri, null, null) {
+	}
+
+	public LinkElement(string uri, string relation) : this(uri, relation, null) {
+	}
+
+	public LinkElement(string uri, string relation, string type) {
+		Uri = uri;
+		Relation = relation;
+		Type = type;
+	}
+
+	public XmlSchema GetSchema() {
+		return null;
+	}
+
+	public void ReadXml(XmlReader reader) {
+		reader.ReadStartElement("link");
+
+		Uri = reader.GetAttribute("href");
+		Relation = reader.GetAttribute("rel");
+		Type = reader.GetAttribute("type");
+
+		reader.ReadEndElement();
+	}
+
+	public void WriteXml(XmlWriter writer) {
+		if (string.IsNullOrEmpty(Uri))
+			ThrowHelper.ThrowSpecificationViolation(
+				"atom:link elements MUST have an href attribute, whose value MUST be a URI reference");
+
+		writer.WriteStartElement("link", AtomSpecs.AtomV1Namespace);
+		writer.WriteAttributeString("href", Uri);
+
+		if (Relation != null)
+			writer.WriteAttributeString("rel", Relation);
+		if (Type != null)
+			writer.WriteAttributeString("type", Type);
+
+		writer.WriteEndElement();
+	}
+}
+
+public class PersonElement : IXmlSerializable {
+	public string Name { get; set; }
+
+	public PersonElement(string name) {
+		Name = name;
+	}
+
+	public XmlSchema GetSchema() {
+		return null;
+	}
+
+	public void ReadXml(XmlReader reader) {
+		reader.ReadStartElement("author");
+		Name = reader.ReadElementString("name");
+		reader.ReadEndElement();
+	}
+
+	public void WriteXml(XmlWriter writer) {
+		if (string.IsNullOrEmpty(Name))
+			ThrowHelper.ThrowSpecificationViolation(
+				"Person constructs MUST contain exactly one 'atom:name' element.");
+
+		writer.WriteStartElement("author", AtomSpecs.AtomV1Namespace);
+		writer.WriteElementString("name", AtomSpecs.AtomV1Namespace, Name);
+		writer.WriteEndElement();
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/Atom/ServiceDocument.cs b/src/KurrentDB.Transport.Http/Atom/ServiceDocument.cs
new file mode 100644
index 00000000000..b5be0da34b6
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/Atom/ServiceDocument.cs
@@ -0,0 +1,157 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Xml;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Transport.Http.Atom;
+
+public class ServiceDocument : IXmlSerializable {
+	public List<WorkspaceElement> Workspaces { get; set; }
+
+	public ServiceDocument() {
+		Workspaces = new List<WorkspaceElement>();
+	}
+
+	public void AddWorkspace(WorkspaceElement workspace) {
+		Ensure.NotNull(workspace, "workspace");
+		Workspaces.Add(workspace);
+	}
+
+	public XmlSchema GetSchema() {
+		return null;
+	}
+
+	public void ReadXml(XmlReader reader) {
+		throw new NotImplementedException();
+	}
+
+	public void WriteXml(XmlWriter writer) {
+		if (Workspaces.Count == 0)
+			ThrowHelper.ThrowSpecificationViolation(
+				"An app:service element MUST contain one or more app:workspace elements.");
+
+		writer.WriteStartElement("service", AtomSpecs.AtomPubV1Namespace);
+		writer.WriteAttributeString("xmlns", "atom", null, AtomSpecs.AtomV1Namespace);
+		Workspaces.ForEach(w => w.WriteXml(writer));
+
+		writer.WriteEndElement();
+	}
+}
+
+public class WorkspaceElement : IXmlSerializable {
+	public string Title { get; set; }
+	public List<CollectionElement> Collections { get; set; }
+
+	public WorkspaceElement() {
+		Collections = new List<CollectionElement>();
+	}
+
+	public void SetTitle(string title) {
+		Ensure.NotNull(title, "title");
+		Title = title;
+	}
+
+	public void AddCollection(CollectionElement collection) {
+		Ensure.NotNull(collection, "collection");
+		Collections.Add(collection);
+	}
+
+	public XmlSchema GetSchema() {
+		return null;
+	}
+
+	public void ReadXml(XmlReader reader) {
+		throw new NotImplementedException();
+	}
+
+	public void WriteXml(XmlWriter writer) {
+		if (string.IsNullOrEmpty(Title))
+			ThrowHelper.ThrowSpecificationViolation(
+				"The app:workspace element MUST contain one 'atom:title' element");
+
+		writer.WriteStartElement("workspace");
+
+		writer.WriteElementString("atom", "title", AtomSpecs.AtomV1Namespace, Title);
+		Collections.ForEach(c => c.WriteXml(writer));
+
+		writer.WriteEndElement();
+	}
+}
+
+public class CollectionElement : IXmlSerializable {
+	public string Title { get; set; }
+	public string Uri { get; set; }
+
+	public List<AcceptElement> Accepts { get; set; }
+
+	public CollectionElement() {
+		Accepts = new List<AcceptElement>();
+	}
+
+	public void SetTitle(string title) {
+		Ensure.NotNull(title, "title");
+		Title = title;
+	}
+
+	public void SetUri(string uri) {
+		Ensure.NotNull(uri, "uri");
+		Uri = uri;
+	}
+
+	public void AddAcceptType(string type) {
+		Ensure.NotNull(type, "type");
+		Accepts.Add(new AcceptElement(type));
+	}
+
+	public XmlSchema GetSchema() {
+		return null;
+	}
+
+	public void ReadXml(XmlReader reader) {
+		throw new NotImplementedException();
+	}
+
+	public void WriteXml(XmlWriter writer) {
+		if (string.IsNullOrEmpty(Title))
+			ThrowHelper.ThrowSpecificationViolation(
+				"The app: collection element MUST contain one atom:title element.");
+		if (string.IsNullOrEmpty(Uri))
+			ThrowHelper.ThrowSpecificationViolation(
+				"The app:collection element MUST contain an 'href' attribute, " +
+				"whose value gives the IRI of the Collection.");
+
+		writer.WriteStartElement("collection");
+		writer.WriteAttributeString("href", Uri);
+		writer.WriteElementString("atom", "title", AtomSpecs.AtomV1Namespace, Title);
+		Accepts.ForEach(a => a.WriteXml(writer));
+
+		writer.WriteEndElement();
+	}
+}
+
+public class AcceptElement : IXmlSerializable {
+	public string Type { get; set; }
+
+	public AcceptElement(string type) {
+		Type = type;
+	}
+
+	public XmlSchema GetSchema() {
+		return null;
+	}
+
+	public void ReadXml(XmlReader reader) {
+		throw new NotImplementedException();
+	}
+
+	public void WriteXml(XmlWriter writer) {
+		if (string.IsNullOrEmpty(Type))
+			ThrowHelper.ThrowSpecificationViolation("atom:accept element MUST contain value");
+		writer.WriteElementString("accept", Type);
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/Client/ClientOperationState.cs b/src/KurrentDB.Transport.Http/Client/ClientOperationState.cs
new file mode 100644
index 00000000000..865911c2865
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/Client/ClientOperationState.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net.Http;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Transport.Http.Client;
+
+public class ClientOperationState {
+	public readonly HttpRequestMessage Request;
+	public readonly Action<HttpResponse> OnSuccess;
+	public readonly Action<Exception> OnError;
+
+	public HttpResponse Response { get; set; }
+
+	public ClientOperationState(HttpRequestMessage request, Action<HttpResponse> onSuccess,
+		Action<Exception> onError) {
+		Ensure.NotNull(request, "request");
+		Ensure.NotNull(onSuccess, "onSuccess");
+		Ensure.NotNull(onError, "onError");
+
+		Request = request;
+		OnSuccess = onSuccess;
+		OnError = onError;
+	}
+
+	public void Dispose() {
+		Request.Dispose();
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/Client/HttpAsyncClient.cs b/src/KurrentDB.Transport.Http/Client/HttpAsyncClient.cs
new file mode 100644
index 00000000000..75a87f2dfe7
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/Client/HttpAsyncClient.cs
@@ -0,0 +1,133 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Transport.Http.Client;
+
+public class HttpAsyncClient : IHttpClient {
+	private readonly HttpClient _client;
+
+	static HttpAsyncClient() {
+		ServicePointManager.MaxServicePointIdleTime = 10000;
+		ServicePointManager.DefaultConnectionLimit = 500;
+	}
+
+	public HttpAsyncClient(TimeSpan timeout, HttpMessageHandler httpMessageHandler = null) {
+		_client = httpMessageHandler == null ? new HttpClient() : new HttpClient(httpMessageHandler);
+		_client.Timeout = timeout;
+	}
+
+	public void Get(string url, Action<HttpResponse> onSuccess, Action<Exception> onException) {
+		Get(url, null, onSuccess, onException);
+	}
+
+	public void Get(string url, IEnumerable<KeyValuePair<string, string>> headers, Action<HttpResponse> onSuccess,
+		Action<Exception> onException) {
+		Ensure.NotNull(url, "url");
+		Ensure.NotNull(onSuccess, "onSuccess");
+		Ensure.NotNull(onException, "onException");
+
+		Receive(HttpMethod.Get, url, headers, onSuccess, onException);
+	}
+
+	public void Post(string url, string body, string contentType, Action<HttpResponse> onSuccess,
+		Action<Exception> onException) {
+		Post(url, body, contentType, null, onSuccess, onException);
+	}
+
+	public void Post(string url, string body, string contentType, IEnumerable<KeyValuePair<string, string>> headers,
+		Action<HttpResponse> onSuccess, Action<Exception> onException) {
+		Ensure.NotNull(url, "url");
+		Ensure.NotNull(body, "body");
+		Ensure.NotNull(contentType, "contentType");
+		Ensure.NotNull(onSuccess, "onSuccess");
+		Ensure.NotNull(onException, "onException");
+
+		Send(HttpMethod.Post, url, body, contentType, headers, onSuccess, onException);
+	}
+
+	public void Delete(string url, Action<HttpResponse> onSuccess, Action<Exception> onException) {
+		Ensure.NotNull(url, "url");
+		Ensure.NotNull(onSuccess, "onSuccess");
+		Ensure.NotNull(onException, "onException");
+
+		Receive(HttpMethod.Delete, url, null, onSuccess, onException);
+	}
+
+	public void Put(string url, string body, string contentType, Action<HttpResponse> onSuccess,
+		Action<Exception> onException) {
+		Ensure.NotNull(url, "url");
+		Ensure.NotNull(body, "body");
+		Ensure.NotNull(contentType, "contentType");
+		Ensure.NotNull(onSuccess, "onSuccess");
+		Ensure.NotNull(onException, "onException");
+
+		Send(HttpMethod.Put, url, body, contentType, null, onSuccess, onException);
+	}
+
+	public void Dispose() {
+		_client.Dispose();
+	}
+
+	private void Receive(string method, string url, IEnumerable<KeyValuePair<string, string>> headers,
+		Action<HttpResponse> onSuccess, Action<Exception> onException) {
+		var request = new HttpRequestMessage();
+		request.Method = new System.Net.Http.HttpMethod(method);
+		request.RequestUri = new Uri(url);
+
+		if (headers != null) {
+			foreach (var header in headers) {
+				request.Headers.Add(header.Key, header.Value);
+			}
+		}
+
+		Task.Run(() => SendRequest(request, onSuccess, onException));
+	}
+
+	private void Send(string method, string url, string body, string contentType,
+		IEnumerable<KeyValuePair<string, string>> headers,
+		Action<HttpResponse> onSuccess, Action<Exception> onException) {
+		var bodyBytes = Helper.UTF8NoBom.GetBytes(body);
+		var stream = new MemoryStream(bodyBytes);
+		var request = new HttpRequestMessage {
+			Method = new System.Net.Http.HttpMethod(method),
+			RequestUri = new Uri(url),
+			Content = new StreamContent(stream) {
+				Headers = {
+					ContentType = new MediaTypeHeaderValue(contentType),
+					ContentLength = bodyBytes.Length
+				}
+			}
+		};
+
+		if (headers != null) {
+			foreach (var (key, value) in headers) {
+				request.Headers.Add(key, value);
+			}
+		}
+
+		Task.Run(() => SendRequest(request, onSuccess, onException));
+	}
+
+	private async Task SendRequest(HttpRequestMessage request, Action<HttpResponse> onSuccess, Action<Exception> onException) {
+		try {
+			using var response = await _client.SendAsync(request);
+			onSuccess(new HttpResponse(response) {
+				Body = await response.Content.ReadAsStringAsync()
+			});
+		} catch (Exception ex) {
+			onException(ex);
+			throw;
+		} finally {
+			request.Dispose();
+		}
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/Client/IHttpClient.cs b/src/KurrentDB.Transport.Http/Client/IHttpClient.cs
new file mode 100644
index 00000000000..6ca25e871d0
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/Client/IHttpClient.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Transport.Http.Client;
+
+public interface IHttpClient {
+	void Get(string url, Action<HttpResponse> onSuccess, Action<Exception> onException);
+
+	void Post(string url, string request, string contentType, Action<HttpResponse> onSuccess,
+		Action<Exception> onException);
+
+	void Delete(string url, Action<HttpResponse> onSuccess, Action<Exception> onException);
+
+	void Put(string url, string request, string contentType, Action<HttpResponse> onSuccess,
+		Action<Exception> onException);
+}
diff --git a/src/KurrentDB.Transport.Http/Codecs/Codec.cs b/src/KurrentDB.Transport.Http/Codecs/Codec.cs
new file mode 100644
index 00000000000..d9eeefa389e
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/Codecs/Codec.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Transport.Http.Codecs;
+
+public static class Codec {
+	public static readonly NoCodec NoCodec = new NoCodec();
+	public static readonly ICodec[] NoCodecs = new ICodec[0];
+	public static readonly ManualEncoding ManualEncoding = new ManualEncoding();
+
+	public static readonly JsonCodec Json = new JsonCodec();
+	public static readonly XmlCodec Xml = new XmlCodec();
+
+	public static readonly CustomCodec ApplicationXml =
+		new CustomCodec(Xml, ContentType.ApplicationXml, Helper.UTF8NoBom, false, false);
+
+	public static readonly CustomCodec EventXml =
+		new CustomCodec(Xml, ContentType.EventXml, Helper.UTF8NoBom, true, true);
+
+	public static readonly CustomCodec EventJson =
+		new CustomCodec(Json, ContentType.EventJson, Helper.UTF8NoBom, true, true);
+
+	public static readonly CustomCodec LegacyEventJson =
+		new CustomCodec(Json, ContentType.LegacyEventJson, Helper.UTF8NoBom, true, true);
+
+	public static readonly CustomCodec EventsXml =
+		new CustomCodec(Xml, ContentType.EventsXml, Helper.UTF8NoBom, true, true);
+
+	public static readonly CustomCodec EventsJson =
+		new CustomCodec(Json, ContentType.EventsJson, Helper.UTF8NoBom, true, true);
+
+	public static readonly CustomCodec LegacyEventsJson =
+		new CustomCodec(Json, ContentType.LegacyEventsJson, Helper.UTF8NoBom, true, true);
+
+	public static readonly ICodec EventStoreXmlCodec =
+		CreateCustom(Xml, ContentType.Atom, Helper.UTF8NoBom, false, false);
+
+	public static readonly ICodec KurrentJsonCodec =
+		CreateCustom(Json, ContentType.AtomJson, Helper.UTF8NoBom, false, false);
+
+	public static readonly ICodec LegacyEventStoreJsonCodec =
+		CreateCustom(Json, ContentType.LegacyAtomJson, Helper.UTF8NoBom, false, false);
+
+	public static readonly CustomCodec DescriptionJson =
+		new CustomCodec(Json, ContentType.DescriptionDocJson, Helper.UTF8NoBom, true, true);
+
+	public static readonly CustomCodec LegacyDescriptionJson =
+		new CustomCodec(Json, ContentType.LegacyDescriptionDocJson, Helper.UTF8NoBom, true, true);
+
+	public static readonly CustomCodec CompetingXml =
+		new CustomCodec(Xml, ContentType.Competing, Helper.UTF8NoBom, true, true);
+
+	public static readonly CustomCodec CompetingJson =
+		new CustomCodec(Json, ContentType.CompetingJson, Helper.UTF8NoBom, true, true);
+
+	public static readonly CustomCodec LegacyCompetingJson =
+		new CustomCodec(Json, ContentType.LegacyCompetingJson, Helper.UTF8NoBom, true, true);
+
+	public static readonly CustomCodec Raw = new CustomCodec(NoCodec, ContentType.Raw, null, false, false);
+	public static readonly TextCodec Text = new TextCodec();
+
+	public static ICodec CreateCustom(ICodec codec, string contentType, Encoding encoding, bool hasEventIds,
+		bool hasEventTypes) {
+		return new CustomCodec(codec, contentType, encoding, hasEventIds, hasEventTypes);
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/Codecs/CustomCodec.cs b/src/KurrentDB.Transport.Http/Codecs/CustomCodec.cs
new file mode 100644
index 00000000000..76ecdb0d49f
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/Codecs/CustomCodec.cs
@@ -0,0 +1,73 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Transport.Http.Codecs;
+
+public class CustomCodec : ICodec {
+	public ICodec BaseCodec {
+		get { return _codec; }
+	}
+
+	public string ContentType {
+		get { return _contentType; }
+	}
+
+	public Encoding Encoding {
+		get { return _encoding; }
+	}
+
+	public bool HasEventIds {
+		get { return _hasEventIds; }
+	}
+
+	public bool HasEventTypes {
+		get { return _hasEventTypes; }
+	}
+
+	private readonly ICodec _codec;
+	private readonly string _contentType;
+	private readonly string _type;
+	private readonly string _subtype;
+	private readonly Encoding _encoding;
+	private readonly bool _hasEventIds;
+	private readonly bool _hasEventTypes;
+
+	internal CustomCodec(ICodec codec, string contentType, Encoding encoding, bool hasEventIds,
+		bool hasEventTypes) {
+		Ensure.NotNull(codec, "codec");
+		Ensure.NotNull(contentType, "contentType");
+		_hasEventTypes = hasEventTypes;
+		_hasEventIds = hasEventIds;
+		_codec = codec;
+		_contentType = contentType;
+		_encoding = encoding;
+		var parts = contentType.Split(new[] { '/' }, 2);
+		if (parts.Length != 2)
+			throw new ArgumentException("contentType");
+		_type = parts[0];
+		_subtype = parts[1];
+	}
+
+	public bool CanParse(MediaType format) {
+		return format != null && format.Matches(ContentType, Encoding);
+	}
+
+	public bool SuitableForResponse(MediaType component) {
+		return component.Type == "*"
+			   || (string.Equals(component.Type, _type, StringComparison.OrdinalIgnoreCase)
+				   && (component.Subtype == "*"
+					   || string.Equals(component.Subtype, _subtype, StringComparison.OrdinalIgnoreCase)));
+	}
+
+	public T From<T>(string text) {
+		return _codec.From<T>(text);
+	}
+
+	public string To<T>(T value) {
+		return _codec.To(value);
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/Codecs/JsonCodec.cs b/src/KurrentDB.Transport.Http/Codecs/JsonCodec.cs
new file mode 100644
index 00000000000..3e0176184e6
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/Codecs/JsonCodec.cs
@@ -0,0 +1,93 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+using KurrentDB.Common.Utils;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Serialization;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Transport.Http.Codecs;
+
+public class JsonCodec : ICodec {
+	public static Formatting Formatting = Formatting.Indented;
+
+	private static readonly ILogger Log = Serilog.Log.ForContext<JsonCodec>();
+
+	private static readonly JsonSerializerSettings FromSettings = new JsonSerializerSettings {
+		ContractResolver = new CamelCasePropertyNamesContractResolver(),
+		DateParseHandling = DateParseHandling.None,
+		NullValueHandling = NullValueHandling.Ignore,
+		DefaultValueHandling = DefaultValueHandling.Include,
+		MissingMemberHandling = MissingMemberHandling.Ignore,
+		TypeNameHandling = TypeNameHandling.None,
+		MetadataPropertyHandling = MetadataPropertyHandling.Ignore,
+		Converters = new JsonConverter[] {
+			new StringEnumConverter()
+		}
+	};
+
+	public static readonly JsonSerializerSettings ToSettings = new JsonSerializerSettings {
+		ContractResolver = new CamelCasePropertyNamesContractResolver(),
+		DateFormatHandling = DateFormatHandling.IsoDateFormat,
+		NullValueHandling = NullValueHandling.Include,
+		DefaultValueHandling = DefaultValueHandling.Include,
+		MissingMemberHandling = MissingMemberHandling.Ignore,
+		TypeNameHandling = TypeNameHandling.None,
+		Converters = new JsonConverter[] { new StringEnumConverter() }
+	};
+
+
+	public string ContentType {
+		get { return Http.ContentType.Json; }
+	}
+
+	public Encoding Encoding {
+		get { return Helper.UTF8NoBom; }
+	}
+
+	public bool HasEventIds {
+		get { return false; }
+	}
+
+	public bool HasEventTypes {
+		get { return false; }
+	}
+
+	public bool CanParse(MediaType format) {
+		return format != null && format.Matches(ContentType, Encoding);
+	}
+
+	public bool SuitableForResponse(MediaType component) {
+		return component.Type == "*"
+			   || (string.Equals(component.Type, "application", StringComparison.OrdinalIgnoreCase)
+				   && (component.Subtype == "*"
+					   || string.Equals(component.Subtype, "json", StringComparison.OrdinalIgnoreCase)));
+	}
+
+	public T From<T>(string text) {
+		try {
+			return JsonConvert.DeserializeObject<T>(text, FromSettings);
+		} catch (Exception e) {
+			Log.Error(e, "'{text}' is not a valid serialized {type}", text, typeof(T).FullName);
+			return default(T);
+		}
+	}
+
+	public string To<T>(T value) {
+		if (value == null)
+			return "";
+
+		if ((object)value == Empty.Result)
+			return Empty.Json;
+
+		try {
+			return JsonConvert.SerializeObject(value, Formatting, ToSettings);
+		} catch (Exception ex) {
+			Log.Error(ex, "Error serializing object {value}", value);
+			return null;
+		}
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/Codecs/ManualEncoding.cs b/src/KurrentDB.Transport.Http/Codecs/ManualEncoding.cs
new file mode 100644
index 00000000000..d1e9f165a56
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/Codecs/ManualEncoding.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+
+namespace KurrentDB.Transport.Http.Codecs;
+
+public class ManualEncoding : ICodec {
+	public string ContentType {
+		get { throw new InvalidOperationException(); }
+	}
+
+	public Encoding Encoding {
+		get { throw new InvalidOperationException(); }
+	}
+
+	public bool HasEventIds {
+		get { return false; }
+	}
+
+	public bool HasEventTypes {
+		get { return false; }
+	}
+
+	public bool CanParse(MediaType format) {
+		return true;
+	}
+
+	public bool SuitableForResponse(MediaType component) {
+		return true;
+	}
+
+	public T From<T>(string text) {
+		throw new InvalidOperationException();
+	}
+
+	public string To<T>(T value) {
+		throw new InvalidOperationException();
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/Codecs/NoCodec.cs b/src/KurrentDB.Transport.Http/Codecs/NoCodec.cs
new file mode 100644
index 00000000000..e8287dc97d0
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/Codecs/NoCodec.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+
+namespace KurrentDB.Transport.Http.Codecs;
+
+public class NoCodec : ICodec {
+	public string ContentType {
+		get { throw new NotSupportedException(); }
+	}
+
+	public Encoding Encoding {
+		get { throw new NotSupportedException(); }
+	}
+
+	public bool HasEventIds {
+		get { return false; }
+	}
+
+	public bool HasEventTypes {
+		get { return false; }
+	}
+
+	public bool CanParse(MediaType format) {
+		return false;
+	}
+
+	public bool SuitableForResponse(MediaType component) {
+		return false;
+	}
+
+	public T From<T>(string text) {
+		throw new NotSupportedException();
+	}
+
+	public string To<T>(T value) {
+		throw new NotSupportedException();
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/Codecs/TextCodec.cs b/src/KurrentDB.Transport.Http/Codecs/TextCodec.cs
new file mode 100644
index 00000000000..aa697da68fe
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/Codecs/TextCodec.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Text;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Transport.Http.Codecs;
+
+public class TextCodec : ICodec {
+	public string ContentType {
+		get { return Http.ContentType.PlainText; }
+	}
+
+	public Encoding Encoding {
+		get { return Helper.UTF8NoBom; }
+	}
+
+	public bool HasEventIds {
+		get { return false; }
+	}
+
+	public bool HasEventTypes {
+		get { return false; }
+	}
+
+	public bool CanParse(MediaType format) {
+		return format != null && format.Matches(ContentType, Encoding);
+	}
+
+	public bool SuitableForResponse(MediaType component) {
+		return component.Type == "*"
+			   || (string.Equals(component.Type, "text", StringComparison.OrdinalIgnoreCase)
+				   && (component.Subtype == "*"
+					   || string.Equals(component.Subtype, "plain", StringComparison.OrdinalIgnoreCase)));
+	}
+
+	public T From<T>(string text) {
+		throw new NotSupportedException();
+	}
+
+	public string To<T>(T value) {
+		return ((object)value) != null ? value.ToString() : null;
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/Codecs/XmlCodec.cs b/src/KurrentDB.Transport.Http/Codecs/XmlCodec.cs
new file mode 100644
index 00000000000..a1466e9b050
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/Codecs/XmlCodec.cs
@@ -0,0 +1,85 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Text;
+using System.Xml;
+using System.Xml.Serialization;
+using KurrentDB.Common.Utils;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Transport.Http.Codecs;
+
+public class XmlCodec : ICodec {
+	private static readonly ILogger Log = Serilog.Log.ForContext<XmlCodec>();
+
+	public string ContentType {
+		get { return Http.ContentType.Xml; }
+	}
+
+	public Encoding Encoding {
+		get { return Helper.UTF8NoBom; }
+	}
+
+	public bool HasEventIds {
+		get { return false; }
+	}
+
+	public bool HasEventTypes {
+		get { return false; }
+	}
+
+	public bool CanParse(MediaType format) {
+		return format != null && format.Matches(ContentType, Encoding);
+	}
+
+	public bool SuitableForResponse(MediaType component) {
+		return component.Type == "*"
+			   || (string.Equals(component.Type, "text", StringComparison.OrdinalIgnoreCase)
+				   && (component.Subtype == "*"
+					   || string.Equals(component.Subtype, "xml", StringComparison.OrdinalIgnoreCase)));
+	}
+
+	public T From<T>(string text) {
+		if (string.IsNullOrEmpty(text))
+			return default(T);
+
+		try {
+			using (var reader = new StringReader(text)) {
+				return (T)new XmlSerializer(typeof(T)).Deserialize(reader);
+			}
+		} catch (Exception e) {
+			Log.Error(e, "'{text}' is not a valid serialized {type}", text, typeof(T).FullName);
+			return default(T);
+		}
+	}
+
+	public string To<T>(T value) {
+		if ((object)value == null)
+			return null;
+
+		if ((object)value == Empty.Result)
+			return Empty.Xml;
+
+		try {
+			using (var memory = new MemoryStream())
+			using (var writer = new XmlTextWriter(memory, Helper.UTF8NoBom)) {
+				var serializable = value as IXmlSerializable;
+				if (serializable != null) {
+					writer.WriteStartDocument();
+					serializable.WriteXml(writer);
+					writer.WriteEndDocument();
+				} else {
+					new XmlSerializer(typeof(T)).Serialize(writer, value);
+				}
+
+				writer.Flush();
+				return Helper.UTF8NoBom.GetString(memory.GetBuffer(), 0, (int)memory.Length);
+			}
+		} catch (Exception exc) {
+			Log.Error(exc, "Error serializing object of type {type}", value.GetType().FullName);
+			return null;
+		}
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/CompressionAlgorithms.cs b/src/KurrentDB.Transport.Http/CompressionAlgorithms.cs
new file mode 100644
index 00000000000..ffdb773b832
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/CompressionAlgorithms.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Transport.Http;
+
+public class CompressionAlgorithms {
+	public const string Gzip = "gzip";
+	public const string Deflate = "deflate";
+}
diff --git a/src/KurrentDB.Transport.Http/ContentType.cs b/src/KurrentDB.Transport.Http/ContentType.cs
new file mode 100644
index 00000000000..8986d734cf3
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/ContentType.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Transport.Http;
+
+public static class ContentType {
+	public const string Any = "*/*";
+
+	public const string Json = "application/json";
+	public const string Xml = "text/xml";
+	public const string ApplicationXml = "application/xml";
+	public const string PlainText = "text/plain";
+	public const string Html = "text/html";
+
+	public const string Atom = "application/atom+xml";
+	public const string AtomJson = "application/vnd.kurrent.atom+json";
+	public const string LegacyAtomJson = "application/vnd.eventstore.atom+json";
+
+	public const string AtomServiceDoc = "application/atomsvc+xml";
+	public const string AtomServiceDocJson = "application/vnd.kurrent.atomsvc+json";
+
+	public const string EventJson = "application/vnd.kurrent.event+json";
+	public const string LegacyEventJson = "application/vnd.eventstore.event+json";
+	public const string EventXml = "application/vnd.eventstore.event+xml";
+
+	public const string EventsJson = "application/vnd.kurrent.events+json";
+	public const string LegacyEventsJson = "application/vnd.eventstore.events+json";
+	public const string EventsXml = "application/vnd.eventstore.events+xml";
+
+	public const string DescriptionDocJson = "application/vnd.kurrent.streamdesc+json";
+	public const string LegacyDescriptionDocJson = "application/vnd.eventstore.streamdesc+json";
+
+	public const string Competing = "application/vnd.eventstore.competingatom+xml";
+	public const string CompetingJson = "application/vnd.kurrent.competingatom+json";
+	public const string LegacyCompetingJson = "application/vnd.eventstore.competingatom+json";
+
+	public const string Raw = "application/octet-stream";
+
+	public const string OpenMetricsText = "application/openmetrics-text";
+}
diff --git a/src/KurrentDB.Transport.Http/EntityManagement/CoreHttpRequestAdapter.cs b/src/KurrentDB.Transport.Http/EntityManagement/CoreHttpRequestAdapter.cs
new file mode 100644
index 00000000000..fa723960f14
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/EntityManagement/CoreHttpRequestAdapter.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Primitives;
+
+namespace KurrentDB.Transport.Http.EntityManagement;
+
+public class CoreHttpRequestAdapter : IHttpRequest {
+	private readonly HttpRequest _inner;
+
+	public CoreHttpRequestAdapter(HttpRequest inner) {
+		_inner = inner;
+	}
+
+	public string[] AcceptTypes => _inner.Headers.GetCommaSeparatedValues("accept");
+
+	public long ContentLength64 => _inner.ContentLength ?? 0;
+
+	public string ContentType => _inner.ContentType;
+
+	public string HttpMethod => _inner.Method;
+
+	public Stream InputStream => _inner.Body;
+
+	public string RawUrl => _inner.Path + (_inner.QueryString.HasValue ? _inner.QueryString.Value : null);
+
+	public IPEndPoint RemoteEndPoint => _inner.HttpContext.Connection.RemoteIpAddress != null ? new IPEndPoint(
+		_inner.HttpContext.Connection.RemoteIpAddress, _inner.HttpContext.Connection.RemotePort) : null;
+
+	public Uri Url => new Uri(new Uri($"{_inner.Scheme}://{_inner.Host}"), RawUrl);
+
+	public IEnumerable<string> GetQueryStringKeys() => _inner.Query.Keys;
+
+	public StringValues GetQueryStringValues(string key) => _inner.Query[key];
+
+	public IEnumerable<string> GetHeaderKeys() => _inner.Headers.Keys;
+	public StringValues GetHeaderValues(string key) => _inner.Headers[key];
+}
diff --git a/src/KurrentDB.Transport.Http/EntityManagement/CoreHttpResponseAdapter.cs b/src/KurrentDB.Transport.Http/EntityManagement/CoreHttpResponseAdapter.cs
new file mode 100644
index 00000000000..40caca2212f
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/EntityManagement/CoreHttpResponseAdapter.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+
+namespace KurrentDB.Transport.Http.EntityManagement;
+
+public class CoreHttpResponseAdapter : IHttpResponse {
+	private readonly Microsoft.AspNetCore.Http.HttpResponse _inner;
+
+	public CoreHttpResponseAdapter(Microsoft.AspNetCore.Http.HttpResponse inner) {
+		_inner = inner;
+	}
+	public void AddHeader(string name, string value) => _inner.Headers.Append(name, value);
+
+	public void Close() {
+		_inner.Body.Close();
+	}
+
+	public long ContentLength64 {
+		get => _inner.ContentLength.GetValueOrDefault();
+		set => _inner.ContentLength = value;
+	}
+
+	public string ContentType {
+		get => _inner.ContentType;
+		set => _inner.ContentType = value;
+	}
+
+	public Stream OutputStream => _inner.Body;
+
+	public int StatusCode {
+		get => _inner.StatusCode;
+		set => _inner.StatusCode = value;
+	}
+
+	public string StatusDescription {
+		get => _inner.HttpContext.Features.Get<IHttpResponseFeature>().ReasonPhrase;
+		set => _inner.HttpContext.Features.Get<IHttpResponseFeature>().ReasonPhrase = value;
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/EntityManagement/HttpEntity.cs b/src/KurrentDB.Transport.Http/EntityManagement/HttpEntity.cs
new file mode 100644
index 00000000000..0de0ce40769
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/EntityManagement/HttpEntity.cs
@@ -0,0 +1,99 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Security.Claims;
+using KurrentDB.Common.Utils;
+using KurrentDB.Transport.Http.Codecs;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Primitives;
+
+namespace KurrentDB.Transport.Http.EntityManagement;
+
+public class HttpEntity {
+	public readonly HttpContext Context;
+	private readonly bool _logHttpRequests;
+	public readonly Action OnComplete;
+	public readonly Uri RequestedUrl;
+	public readonly Uri ResponseUrl;
+
+	public readonly IHttpRequest Request;
+	internal readonly IHttpResponse Response;
+	public ClaimsPrincipal User => Context.User;
+
+	public HttpEntity(HttpContext context, bool logHttpRequests, string advertiseAsHost, int advertiseAsPort,
+		Action onComplete) {
+		Context = context;
+		Ensure.NotNull(context, nameof(context));
+		Ensure.NotNull(onComplete, nameof(onComplete));
+
+		var request = new CoreHttpRequestAdapter(context.Request);
+		var response = new CoreHttpResponseAdapter(context.Response);
+		_logHttpRequests = logHttpRequests;
+		OnComplete = onComplete;
+		RequestedUrl = BuildRequestedUrl(request, advertiseAsHost, advertiseAsPort);
+		ResponseUrl = BuildRequestedUrl(request, advertiseAsHost, advertiseAsPort, true);
+		Request = request;
+		Response = response;
+		Context = context;
+	}
+
+	public static Uri BuildRequestedUrl(IHttpRequest request,
+		string advertiseAsAddress, int advertiseAsPort, bool overridePath = false) {
+		var uriBuilder = new UriBuilder(request.Url);
+		if (overridePath) {
+			uriBuilder.Path = string.Empty;
+		}
+
+		if (advertiseAsAddress != null) {
+			uriBuilder.Host = advertiseAsAddress.ToString();
+		}
+
+		if (advertiseAsPort > 0) {
+			uriBuilder.Port = advertiseAsPort;
+		}
+
+		var forwardedPortHeaderValue = request.GetHeaderValues(ProxyHeaders.XForwardedPort);
+		if (!StringValues.IsNullOrEmpty(forwardedPortHeaderValue)) {
+			if (int.TryParse(forwardedPortHeaderValue.First(), out var requestPort)) {
+				uriBuilder.Port = requestPort;
+			}
+		}
+
+		var forwardedProtoHeaderValue = request.GetHeaderValues(ProxyHeaders.XForwardedProto);
+
+		if (!StringValues.IsNullOrEmpty(forwardedProtoHeaderValue)) {
+			uriBuilder.Scheme = forwardedProtoHeaderValue.First();
+		}
+
+		var forwardedHostHeaderValue = request.GetHeaderValues(ProxyHeaders.XForwardedHost);
+
+		if (!StringValues.IsNullOrEmpty(forwardedHostHeaderValue)) {
+			var host = forwardedHostHeaderValue.First();
+			if (!string.IsNullOrEmpty(host)) {
+				var parts = host.Split(new[] { ":" }, StringSplitOptions.RemoveEmptyEntries);
+				uriBuilder.Host = parts[0];
+				if (parts.Length > 1 && int.TryParse(parts[1], out var port)) {
+					uriBuilder.Port = port;
+				}
+			}
+		}
+
+		var forwardedPrefixHeaderValue = request.GetHeaderValues(ProxyHeaders.XForwardedPrefix);
+		if (!string.IsNullOrEmpty(forwardedPrefixHeaderValue)) {
+			uriBuilder.Path = forwardedPrefixHeaderValue + uriBuilder.Path;
+		}
+
+		return uriBuilder.Uri;
+	}
+
+	public HttpEntityManager CreateManager(
+		ICodec requestCodec, ICodec responseCodec, string[] allowedMethods, Action<HttpEntity> onRequestSatisfied) {
+		return new HttpEntityManager(this, allowedMethods, onRequestSatisfied, requestCodec, responseCodec,
+			_logHttpRequests, OnComplete);
+	}
+
+	public HttpEntityManager CreateManager()
+		=> CreateManager(Codec.NoCodec, Codec.NoCodec, Array.Empty<string>(), _ => { });
+}
diff --git a/src/KurrentDB.Transport.Http/EntityManagement/HttpEntityManager.cs b/src/KurrentDB.Transport.Http/EntityManagement/HttpEntityManager.cs
new file mode 100644
index 00000000000..00f29a2d71c
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/EntityManagement/HttpEntityManager.cs
@@ -0,0 +1,471 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Security.Claims;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.BufferManagement;
+using KurrentDB.Common.Utils;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Transport.Http.EntityManagement;
+
+public sealed class HttpEntityManager {
+	private static readonly ILogger Log = Serilog.Log.ForContext<HttpEntityManager>();
+
+	public object AsyncState { get; set; }
+	public readonly HttpEntity HttpEntity;
+
+	public bool IsProcessing {
+		get { return _processing != 0; }
+	}
+
+	private int _processing;
+	private readonly string[] _allowedMethods;
+	private readonly Action<HttpEntity> _onRequestSatisfied;
+	private readonly ICodec _requestCodec;
+	private readonly ICodec _responseCodec;
+	private readonly Uri _responseUrl;
+	private readonly Uri _requestedUrl;
+	private readonly string _responseContentEncoding;
+
+	private static readonly string[] SupportedCompressionAlgorithms =
+		{CompressionAlgorithms.Gzip, CompressionAlgorithms.Deflate};
+
+	private static readonly BufferManager
+		_compressionBufferManager = new BufferManager(20, 50 * 1024); //create 20 50KB buffers (1MB total)
+
+	private readonly bool _logHttpRequests;
+	private readonly Action _onComplete;
+
+	public readonly DateTime TimeStamp;
+
+
+	internal HttpEntityManager(HttpEntity httpEntity, string[] allowedMethods,
+		Action<HttpEntity> onRequestSatisfied, ICodec requestCodec,
+		ICodec responseCodec, bool logHttpRequests, Action onComplete) {
+		Ensure.NotNull(httpEntity, "httpEntity");
+		Ensure.NotNull(allowedMethods, "allowedMethods");
+		Ensure.NotNull(onRequestSatisfied, "onRequestSatisfied");
+		Ensure.NotNull(onComplete, nameof(onComplete));
+
+		HttpEntity = httpEntity;
+		TimeStamp = DateTime.UtcNow;
+
+		_allowedMethods = allowedMethods;
+		_onRequestSatisfied = onRequestSatisfied;
+		_requestCodec = requestCodec;
+		_responseCodec = responseCodec;
+		_responseUrl = httpEntity.ResponseUrl;
+		_requestedUrl = httpEntity.RequestedUrl;
+		_responseContentEncoding = GetRequestedContentEncoding(httpEntity);
+		_logHttpRequests = logHttpRequests;
+		_onComplete = onComplete;
+
+		if (HttpEntity.Request != null && HttpEntity.Request.ContentLength64 == 0) {
+			LogRequest(new byte[0]);
+		}
+	}
+
+	public ICodec RequestCodec {
+		get { return _requestCodec; }
+	}
+
+	public ICodec ResponseCodec {
+		get { return _responseCodec; }
+	}
+
+	public Uri ResponseUrl {
+		get { return _responseUrl; }
+	}
+
+	public Uri RequestedUrl {
+		get { return _requestedUrl; }
+	}
+
+	public ClaimsPrincipal User {
+		get { return HttpEntity.User; }
+	}
+
+	private void SetResponseCode(int code) {
+		try {
+			HttpEntity.Response.StatusCode = code;
+		} catch (ObjectDisposedException) {
+			// ignore
+		} catch (ProtocolViolationException e) {
+			Log.Error(e, "Attempt to set invalid HTTP status code occurred.");
+		}
+	}
+
+	private void SetResponseDescription(string desc) {
+		try {
+			HttpEntity.Response.StatusDescription = desc;
+		} catch (ObjectDisposedException) {
+			// ignore
+		} catch (ArgumentException e) {
+			Log.Error(e,
+				"Description string '{description}' did not pass validation. Status description was not set.",
+				desc);
+		}
+	}
+
+	private void SetContentType(string contentType, Encoding encoding) {
+		if (contentType == null)
+			return;
+		try {
+			HttpEntity.Response.ContentType =
+				contentType + (encoding != null ? ("; charset=" + encoding.WebName) : "");
+		} catch (ObjectDisposedException) {
+			// ignore
+		} catch (InvalidOperationException e) {
+			Log.Debug("Error during setting content type on HTTP response: {e}.", e.Message);
+		} catch (ArgumentOutOfRangeException e) {
+			Log.Error(e, "Invalid response type.");
+		}
+	}
+
+	private void SetResponseLength(long length) {
+		try {
+			HttpEntity.Response.ContentLength64 = length;
+		} catch (ObjectDisposedException) {
+			// ignore
+		} catch (InvalidOperationException e) {
+			Log.Debug("Error during setting content length on HTTP response: {e}.", e.Message);
+		} catch (ArgumentOutOfRangeException e) {
+			Log.Error(e, "Attempt to set invalid value '{length}' as content length.", length);
+		}
+	}
+
+	private void SetRequiredHeaders() {
+		try {
+			HttpEntity.Response.AddHeader("Access-Control-Allow-Methods", string.Join(", ", _allowedMethods));
+			HttpEntity.Response.AddHeader("Access-Control-Allow-Headers",
+				"Content-Type, X-Requested-With, X-Forwarded-Host, X-Forwarded-Prefix, X-PINGOTHER, Authorization, " +
+				"Kurrent-LongPoll, Kurrent-ExpectedVersion, Kurrent-EventId, Kurrent-EventType, Kurrent-RequireLeader, Kurrent-HardDelete, Kurrent-ResolveLinkTos, " +
+				"ES-LongPoll, ES-ExpectedVersion, ES-EventId, ES-EventType, ES-RequireMaster, ES-RequireLeader, ES-HardDelete, ES-ResolveLinkTos");
+			HttpEntity.Response.AddHeader("Access-Control-Allow-Origin", "*");
+			HttpEntity.Response.AddHeader("Access-Control-Expose-Headers",
+				"Location, " +
+				"Kurrent-Position, Kurrent-CurrentVersion, " +
+				"ES-Position, ES-CurrentVersion, ");
+			if (HttpEntity.Response.StatusCode == HttpStatusCode.Unauthorized) {
+				HttpEntity.Response.AddHeader("WWW-Authenticate", "BasicCustom realm=\"Kurrent\"");
+				HttpEntity.Response.AddHeader("WWW-Authenticate", "BasicCustom realm=\"ES\"");
+			}
+		} catch (ObjectDisposedException) {
+			// ignore
+		} catch (Exception e) {
+			Log.Debug("Failed to set required response headers: {e}.", e.Message);
+		}
+	}
+
+	private void SetContentEncodingHeader(String contentEncoding) {
+		try {
+			HttpEntity.Response.AddHeader("Content-Encoding", contentEncoding);
+		} catch (Exception e) {
+			Log.Debug("Failed to set Content-Encoding header: {e}.", e.Message);
+		}
+	}
+
+	private void SetAdditionalHeaders(IEnumerable<KeyValuePair<string, string>> headers) {
+		try {
+			foreach (var kvp in headers) {
+				HttpEntity.Response.AddHeader(kvp.Key, kvp.Value);
+			}
+		} catch (ObjectDisposedException) {
+			// ignore
+		} catch (Exception e) {
+			Log.Debug("Failed to set additional response headers: {e}.", e.Message);
+		}
+	}
+
+	public void ReadRequestAsync(Action<HttpEntityManager, byte[]> onReadSuccess, Action<Exception> onError) {
+		Ensure.NotNull(onReadSuccess, "OnReadSuccess");
+		Ensure.NotNull(onError, "onError");
+
+		var state = new ManagerOperationState(
+			HttpEntity.Request.InputStream, new MemoryStream(), onReadSuccess, onError);
+		var copier = new AsyncStreamCopier<ManagerOperationState>(
+			state.InputStream, state.OutputStream, state, RequestRead);
+		copier.Start();
+	}
+
+	public bool BeginReply(
+		int code, string description, string contentType, Encoding encoding,
+		IEnumerable<KeyValuePair<string, string>> headers) {
+		if (HttpEntity.Response == null) // test instance
+			return false;
+
+		bool isAlreadyProcessing = Interlocked.CompareExchange(ref _processing, 1, 0) == 1;
+		if (isAlreadyProcessing)
+			return false;
+
+		SetResponseCode(code);
+		SetResponseDescription(description);
+		SetContentType(contentType, encoding);
+
+		SetRequiredHeaders();
+		if (!string.IsNullOrEmpty(_responseContentEncoding))
+			SetContentEncodingHeader(_responseContentEncoding);
+
+		SetAdditionalHeaders(headers.Safe());
+		return true;
+	}
+
+	public void ContinueReply(byte[] response, Action<Exception> onError, Action onCompleted) {
+		Ensure.NotNull(onError, "onError");
+		Ensure.NotNull(onCompleted, "onCompleted");
+
+		Task.Run(async () => {
+			try {
+				await HttpEntity.Response.OutputStream.WriteAsync(response);
+				onCompleted();
+			} catch (Exception ex) {
+				onError(ex);
+			}
+		});
+	}
+
+	public void EndReply() {
+	}
+
+	public void Reply(
+		byte[] response, int code, string description, string contentType, Encoding encoding,
+		IEnumerable<KeyValuePair<string, string>> headers, Action<Exception> onError) {
+		Ensure.NotNull(onError, "onError");
+
+		if (!BeginReply(code, description, contentType, encoding, headers))
+			return;
+
+		if (response == null || response.Length == 0) {
+			LogResponse(Array.Empty<byte>());
+			SetResponseLength(0);
+			_onComplete();
+			CloseConnection(onError);
+		} else {
+			LogResponse(response);
+			if (!string.IsNullOrEmpty(_responseContentEncoding))
+				response = CompressResponse(response, _responseContentEncoding);
+			SetResponseLength(response.Length);
+			ContinueReply(response, onError, _onComplete);
+		}
+	}
+
+	public void ForwardReply(HttpResponseMessage response, Action<Exception> onError) {
+		Ensure.NotNull(response, "response");
+		Ensure.NotNull(onError, "onError");
+
+		if (Interlocked.CompareExchange(ref _processing, 1, 0) != 0)
+			return;
+
+		try {
+			HttpEntity.Response.StatusCode = (int)response.StatusCode;
+			HttpEntity.Response.StatusDescription = response.ReasonPhrase;
+			if (response.Content != null) {
+				if (response.Content.Headers.ContentType != null) {
+					HttpEntity.Response.ContentType = response.Content.Headers.ContentType.MediaType;
+				}
+
+				IEnumerable<string> values;
+				if (response.Content.Headers.TryGetValues("Content-Encoding", out values)) {
+					HttpEntity.Response.AddHeader("Content-Encoding", values.FirstOrDefault());
+				}
+
+				HttpEntity.Response.ContentLength64 = response.Content.Headers.ContentLength.GetValueOrDefault();
+			}
+
+			foreach (var header in response.Headers) {
+				string headerValue;
+				switch (header.Key) {
+					case "Content-Length":
+						break;
+					case "Keep-Alive":
+						break;
+					case "Transfer-Encoding":
+						break;
+					case "WWW-Authenticate":
+						headerValue = header.Value.FirstOrDefault();
+						HttpEntity.Response.AddHeader(header.Key, headerValue);
+						break;
+
+					default:
+						headerValue = header.Value.FirstOrDefault();
+						HttpEntity.Response.AddHeader(header.Key, headerValue);
+						break;
+				}
+			}
+
+			if (HttpEntity.Response.ContentLength64 > 0) {
+				response.Content.ReadAsStreamAsync()
+					.ContinueWith(task => {
+						new AsyncStreamCopier<IHttpResponse>(
+							task.Result,
+							HttpEntity.Response.OutputStream,
+							HttpEntity.Response,
+							copier => { Helper.EatException(_onComplete); }).Start();
+					});
+			} else {
+				Helper.EatException(_onComplete);
+			}
+		} catch (Exception e) {
+			Log.Error(e, "Failed to set up forwarded response parameters for '{requestedUrl}'.",
+				RequestedUrl);
+		}
+	}
+
+	private void RequestRead(AsyncStreamCopier<ManagerOperationState> copier) {
+		var state = copier.AsyncState;
+
+		if (copier.Error != null) {
+			state.Dispose();
+			CloseConnection(exc =>
+				Log.Debug("Close connection error (after crash in read request): {e}", exc.Message));
+
+			state.OnError(copier.Error);
+			return;
+		}
+
+		state.OutputStream.Seek(0, SeekOrigin.Begin);
+		var memory = (MemoryStream)state.OutputStream;
+
+		var request = memory.GetBuffer();
+		if (memory.Length != memory.GetBuffer().Length) {
+			request = new byte[memory.Length];
+			Buffer.BlockCopy(memory.GetBuffer(), 0, request, 0, (int)memory.Length);
+		}
+
+		LogRequest(request);
+		state.OnReadSuccess(this, request);
+	}
+
+	private void CloseConnection(Action<Exception> onError) {
+		try {
+			_onRequestSatisfied(HttpEntity);
+			_onComplete();
+		} catch (Exception e) {
+			onError(e);
+		}
+	}
+
+	private string CreateHeaderLog() {
+		var logBuilder = new StringBuilder();
+		foreach (var header in HttpEntity.Request.GetHeaderKeys()) {
+			logBuilder.AppendFormat("{0}: {1}\n", header, HttpEntity.Request.GetHeaderValues(header));
+		}
+
+		return logBuilder.ToString();
+	}
+
+	private Dictionary<string, object> CreateHeaderLogStructured() {
+		var dict = new Dictionary<string, object>();
+		foreach (var header in HttpEntity.Request.GetHeaderKeys()) {
+			dict.Add(header, HttpEntity.Request.GetHeaderValues(header));
+		}
+
+		return dict;
+	}
+
+	private void LogRequest(byte[] body) {
+		if (_logHttpRequests) {
+			var bodyStr = "";
+			if (body != null && body.Length > 0) {
+				bodyStr = Encoding.Default.GetString(body);
+			}
+
+			Log.Debug("HTTP Request Received\n{dateTime}\nFrom: {remoteEndPoint}\n{httpMethod} {requestUrl}\n{headers}" + "\n{body}"
+				, DateTime.Now
+				, HttpEntity.Request.RemoteEndPoint.ToString()
+				, HttpEntity.Request.HttpMethod
+				, HttpEntity.Request.Url
+				, CreateHeaderLogStructured()
+				, bodyStr
+			);
+		}
+	}
+
+	private void LogResponse(byte[] body) {
+		if (_logHttpRequests) {
+			var bodyStr = "";
+			if (body != null && body.Length > 0) {
+				bodyStr = Encoding.Default.GetString(body);
+			}
+
+			Log.Debug(
+				"HTTP Response\n{dateTime}\n{statusCode} {statusDescription}\n{headers}\n{body}",
+				DateTime.Now,
+				HttpEntity.Response.StatusCode,
+				HttpEntity.Response.StatusDescription,
+				CreateHeaderLogStructured(),
+				bodyStr
+			);
+		}
+	}
+
+	public static byte[] CompressResponse(byte[] response, string compressionAlgorithm) {
+		if (string.IsNullOrEmpty(compressionAlgorithm) ||
+			!SupportedCompressionAlgorithms.Contains(compressionAlgorithm))
+			return response;
+
+		MemoryStream outputStream;
+		var useBufferManager =
+			10L * response.Length <=
+			9L * _compressionBufferManager
+				.ChunkSize; //in some rare cases, compression can result in larger outputs. Added a 10% overhead just to be sure.
+		var bufferManagerArraySegment = new ArraySegment<byte>();
+
+		if (useBufferManager) {
+			//use buffer manager to handle responses less than ~50kb long to prevent excessive memory allocations
+			bufferManagerArraySegment = _compressionBufferManager.CheckOut();
+			outputStream = new MemoryStream(bufferManagerArraySegment.Array, bufferManagerArraySegment.Offset,
+				bufferManagerArraySegment.Count);
+			outputStream.SetLength(0);
+		} else {
+			//since Gzip/Deflate compression ratio doesn't go below 20% in most cases, we can initialize the array to a quarter of the original response length
+			//this also limits memory stream growth operations to at most 2.
+			outputStream = new MemoryStream((response.Length + 4 - 1) / 4);
+		}
+
+		using (outputStream) {
+			Stream compressedStream = null;
+			if (compressionAlgorithm.Equals(CompressionAlgorithms.Gzip))
+				compressedStream = new GZipStream(outputStream, CompressionLevel.Fastest);
+			else if (compressionAlgorithm.Equals(CompressionAlgorithms.Deflate))
+				compressedStream = new DeflateStream(outputStream, CompressionLevel.Fastest);
+
+			using (compressedStream)
+			using (var dataStream = new MemoryStream(response)) {
+				dataStream.CopyTo(compressedStream);
+			}
+
+			var result = outputStream.ToArray();
+			if (useBufferManager)
+				_compressionBufferManager.CheckIn(bufferManagerArraySegment);
+			return result;
+		}
+	}
+
+	private string GetRequestedContentEncoding(HttpEntity httpEntity) {
+		if (httpEntity?.Request == null)
+			return null;
+
+		var httpEntityRequest = httpEntity.Request;
+		string contentEncoding = null;
+		var values = httpEntityRequest.GetHeaderValues("Accept-Encoding");
+		foreach (string value in values) {
+			if (SupportedCompressionAlgorithms.Contains(value)) {
+				contentEncoding = value;
+				break;
+			}
+		}
+
+		return contentEncoding;
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/EntityManagement/HttpEntityManagerExtensions.cs b/src/KurrentDB.Transport.Http/EntityManagement/HttpEntityManagerExtensions.cs
new file mode 100644
index 00000000000..b757c3a3832
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/EntityManagement/HttpEntityManagerExtensions.cs
@@ -0,0 +1,59 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Transport.Http.EntityManagement;
+
+public static class HttpEntityManagerExtensions {
+	public static void ReplyStatus(this HttpEntityManager self, int code, string description,
+		Action<Exception> onError, IEnumerable<KeyValuePair<string, string>> headers = null) {
+		self.Reply(null, code, description, null, null, null, onError);
+	}
+
+	public static void ReplyContent(this HttpEntityManager self,
+		byte[] response,
+		int code,
+		string description,
+		string type,
+		IEnumerable<KeyValuePair<string, string>> headers,
+		Action<Exception> onError) {
+		self.Reply(response, code, description, type, null, headers, onError);
+	}
+
+	public static void ReplyTextContent(this HttpEntityManager self,
+		string response,
+		int code,
+		string description,
+		string type,
+		IEnumerable<KeyValuePair<string, string>> headers,
+		Action<Exception> onError) {
+		//TODO: add encoding header???
+		self.Reply(Helper.UTF8NoBom.GetBytes(response ?? string.Empty), code, description, type, Helper.UTF8NoBom,
+			headers, onError);
+	}
+
+	public static void ContinueReplyTextContent(
+		this HttpEntityManager self, string response, Action<Exception> onError, Action completed) {
+		//TODO: add encoding header???
+		var bytes = Helper.UTF8NoBom.GetBytes(response ?? string.Empty);
+		self.ContinueReply(bytes, onError, completed);
+	}
+
+	public static void ReadTextRequestAsync(
+		this HttpEntityManager self, Action<HttpEntityManager, string> onSuccess, Action<Exception> onError) {
+		self.ReadRequestAsync(
+			(manager, bytes) => {
+				int offset = 0;
+
+				// check for UTF-8 BOM (0xEF, 0xBB, 0xBF) and skip it safely, if any
+				if (bytes.Length >= 3 && bytes[0] == 0xEF && bytes[1] == 0xBB && bytes[2] == 0xBF)
+					offset = 3;
+
+				onSuccess(manager, Helper.UTF8NoBom.GetString(bytes, offset, bytes.Length - offset));
+			},
+			onError);
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/EntityManagement/HttpListenerRequestAdapter.cs b/src/KurrentDB.Transport.Http/EntityManagement/HttpListenerRequestAdapter.cs
new file mode 100644
index 00000000000..d796ac1a6d9
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/EntityManagement/HttpListenerRequestAdapter.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using Microsoft.Extensions.Primitives;
+
+namespace KurrentDB.Transport.Http.EntityManagement;
+
+public class HttpListenerRequestAdapter : IHttpRequest {
+	private readonly HttpListenerRequest _inner;
+
+	public string[] AcceptTypes => _inner.AcceptTypes;
+	public long ContentLength64 => _inner.ContentLength64;
+	public string ContentType => _inner.ContentType;
+	public string HttpMethod => _inner.HttpMethod;
+	public Stream InputStream => _inner.InputStream;
+	public string RawUrl => _inner.RawUrl;
+	public IPEndPoint RemoteEndPoint => _inner.RemoteEndPoint;
+	public Uri Url => _inner.Url;
+
+	public HttpListenerRequestAdapter(HttpListenerRequest inner) {
+		_inner = inner;
+	}
+
+	public IEnumerable<string> GetHeaderKeys() => _inner.Headers.AllKeys;
+	public StringValues GetHeaderValues(string key) => _inner.Headers.GetValues(key);
+
+	public IEnumerable<string> GetQueryStringKeys() => _inner.QueryString.AllKeys;
+	public StringValues GetQueryStringValues(string key) => _inner.QueryString.GetValues(key);
+
+}
diff --git a/src/KurrentDB.Transport.Http/EntityManagement/HttpListenerResponseAdapter.cs b/src/KurrentDB.Transport.Http/EntityManagement/HttpListenerResponseAdapter.cs
new file mode 100644
index 00000000000..abb7b0dafbd
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/EntityManagement/HttpListenerResponseAdapter.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+using System.Net;
+using System.Text;
+
+namespace KurrentDB.Transport.Http.EntityManagement;
+
+public class HttpListenerResponseAdapter : IHttpResponse {
+	private readonly HttpListenerResponse _inner;
+
+	public void AddHeader(string name, string value) => _inner.AddHeader(name, value);
+
+	public void Close() => _inner.Close();
+
+	public Encoding ContentEncoding {
+		get => _inner.ContentEncoding;
+		set => _inner.ContentEncoding = value;
+	}
+
+	public long ContentLength64 {
+		get => _inner.ContentLength64;
+		set => _inner.ContentLength64 = value;
+	}
+
+	public string ContentType {
+		get => _inner.ContentType;
+		set => _inner.ContentType = value;
+	}
+
+	public Stream OutputStream => _inner.OutputStream;
+
+	public int StatusCode {
+		get => _inner.StatusCode;
+		set => _inner.StatusCode = value;
+	}
+
+	public string StatusDescription {
+		get => _inner.StatusDescription;
+		set => _inner.StatusDescription = value;
+	}
+
+	public HttpListenerResponseAdapter(HttpListenerResponse inner) {
+		_inner = inner;
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/EntityManagement/IHttpRequest.cs b/src/KurrentDB.Transport.Http/EntityManagement/IHttpRequest.cs
new file mode 100644
index 00000000000..6d761cf61c1
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/EntityManagement/IHttpRequest.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using Microsoft.Extensions.Primitives;
+
+namespace KurrentDB.Transport.Http.EntityManagement;
+
+public interface IHttpRequest {
+	string[] AcceptTypes { get; }
+	long ContentLength64 { get; }
+	string ContentType { get; }
+	string HttpMethod { get; }
+	Stream InputStream { get; }
+	string RawUrl { get; }
+	IPEndPoint RemoteEndPoint { get; }
+	Uri Url { get; }
+	IEnumerable<string> GetHeaderKeys();
+	StringValues GetHeaderValues(string key);
+	IEnumerable<string> GetQueryStringKeys();
+	StringValues GetQueryStringValues(string key);
+}
diff --git a/src/KurrentDB.Transport.Http/EntityManagement/IHttpResponse.cs b/src/KurrentDB.Transport.Http/EntityManagement/IHttpResponse.cs
new file mode 100644
index 00000000000..8b7027826b0
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/EntityManagement/IHttpResponse.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.IO;
+
+namespace KurrentDB.Transport.Http.EntityManagement;
+
+public interface IHttpResponse {
+	void AddHeader(string name, string value);
+	void Close();
+	long ContentLength64 { get; set; }
+	string ContentType { get; set; }
+	Stream OutputStream { get; }
+	int StatusCode { get; set; }
+	string StatusDescription { get; set; }
+}
diff --git a/src/KurrentDB.Transport.Http/EntityManagement/ManagerOperationState.cs b/src/KurrentDB.Transport.Http/EntityManagement/ManagerOperationState.cs
new file mode 100644
index 00000000000..c8409b73e8d
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/EntityManagement/ManagerOperationState.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Transport.Http.EntityManagement;
+
+internal class ManagerOperationState : IDisposable {
+	public readonly Action<HttpEntityManager, byte[]> OnReadSuccess;
+	public readonly Action<Exception> OnError;
+
+	public readonly Stream InputStream;
+	public readonly Stream OutputStream;
+
+	public ManagerOperationState(Stream inputStream,
+		Stream outputStream,
+		Action<HttpEntityManager, byte[]> onReadSuccess,
+		Action<Exception> onError) {
+		Ensure.NotNull(inputStream, "inputStream");
+		Ensure.NotNull(outputStream, "outputStream");
+		Ensure.NotNull(onReadSuccess, "onReadSuccess");
+		Ensure.NotNull(onError, "onError");
+
+		InputStream = inputStream;
+		OutputStream = outputStream;
+		OnReadSuccess = onReadSuccess;
+		OnError = onError;
+	}
+
+	public void Dispose() {
+		IOStreams.SafelyDispose(InputStream, OutputStream);
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/HttpMethod.cs b/src/KurrentDB.Transport.Http/HttpMethod.cs
new file mode 100644
index 00000000000..d6924b6ca28
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/HttpMethod.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Transport.Http;
+
+public static class HttpMethod {
+	public const string Get = "GET";
+	public const string Post = "POST";
+	public const string Put = "PUT";
+	public const string Delete = "DELETE";
+	public const string Options = "OPTIONS";
+	public const string Head = "HEAD";
+	public const string Patch = "PATCH";
+}
diff --git a/src/KurrentDB.Transport.Http/HttpResponse.cs b/src/KurrentDB.Transport.Http/HttpResponse.cs
new file mode 100644
index 00000000000..f819408d084
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/HttpResponse.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Headers;
+
+namespace KurrentDB.Transport.Http;
+
+public class HttpResponse {
+	public string CharacterSet { get; private set; }
+
+	public string ContentEncoding { get; private set; }
+	public long ContentLength { get; private set; }
+	public string ContentType { get; private set; }
+
+	//public CookieCollection Cookies { get; private set; }
+	public HttpResponseHeaders Headers { get; private set; }
+
+	//public bool IsFromCache { get; private set; }
+	//public bool IsMutuallyAuthenticated { get; private set; }//TODO TR: not implemented in mono
+	//public DateTime LastModified { get; private set; }
+
+	public string Method { get; private set; }
+	//public Version ProtocolVersion { get; private set; }
+
+	//public Uri ResponseUri { get; private set; }
+	//public string Server { get; private set; }
+
+	public int HttpStatusCode { get; private set; }
+	public string StatusDescription { get; private set; }
+
+	public string Body { get; internal set; }
+
+	public HttpResponse(HttpResponseMessage responseMessage) {
+		ContentEncoding = responseMessage.Content.Headers.ContentEncoding.FirstOrDefault();
+		ContentLength = responseMessage.Content.Headers.ContentLength.Value;
+
+		if (responseMessage.Content.Headers.ContentType != null) {
+			CharacterSet = responseMessage.Content.Headers.ContentType.CharSet;
+			ContentType = responseMessage.Content.Headers.ContentType.MediaType;
+		}
+
+		//Cookies = httpWebResponse.Cookies;
+		Headers = responseMessage.Headers;
+
+		//IsFromCache = httpWebResponse.IsFromCache;
+		//IsMutuallyAuthenticated = httpWebResponse.IsMutuallyAuthenticated;
+
+		//LastModified = httpWebResponse.LastModified;
+
+		Method = responseMessage.RequestMessage.Method.ToString();
+		//ProtocolVersion = httpWebResponse.ProtocolVersion;
+
+		//ResponseUri = httpWebResponse.ResponseUri;
+		//Server = httpWebResponse.Server;
+
+		HttpStatusCode = (int)responseMessage.StatusCode;
+		StatusDescription = responseMessage.ReasonPhrase;
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/HttpStatusCode.cs b/src/KurrentDB.Transport.Http/HttpStatusCode.cs
new file mode 100644
index 00000000000..6863d867be1
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/HttpStatusCode.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Transport.Http;
+
+public static class HttpStatusCode {
+	public const int Continue = (int)System.Net.HttpStatusCode.Continue;
+	public const int SwitchingProtocols = (int)System.Net.HttpStatusCode.SwitchingProtocols;
+	public const int OK = (int)System.Net.HttpStatusCode.OK;
+	public const int Created = (int)System.Net.HttpStatusCode.Created;
+	public const int Accepted = (int)System.Net.HttpStatusCode.Accepted;
+	public const int NonAuthoritativeInformation = (int)System.Net.HttpStatusCode.NonAuthoritativeInformation;
+	public const int NoContent = (int)System.Net.HttpStatusCode.NoContent;
+	public const int ResetContent = (int)System.Net.HttpStatusCode.ResetContent;
+	public const int PartialContent = (int)System.Net.HttpStatusCode.PartialContent;
+	public const int Ambiguous = (int)System.Net.HttpStatusCode.Ambiguous;
+	public const int MultipleChoices = (int)System.Net.HttpStatusCode.MultipleChoices;
+	public const int Moved = (int)System.Net.HttpStatusCode.Moved;
+	public const int MovedPermanently = (int)System.Net.HttpStatusCode.MovedPermanently;
+	public const int Found = (int)System.Net.HttpStatusCode.Found;
+	public const int Redirect = (int)System.Net.HttpStatusCode.Redirect;
+	public const int RedirectMethod = (int)System.Net.HttpStatusCode.RedirectMethod;
+	public const int SeeOther = (int)System.Net.HttpStatusCode.SeeOther;
+	public const int NotModified = (int)System.Net.HttpStatusCode.NotModified;
+	public const int UseProxy = (int)System.Net.HttpStatusCode.UseProxy;
+	public const int Unused = (int)System.Net.HttpStatusCode.Unused;
+	public const int RedirectKeepVerb = (int)System.Net.HttpStatusCode.RedirectKeepVerb;
+	public const int TemporaryRedirect = (int)System.Net.HttpStatusCode.TemporaryRedirect;
+	public const int BadRequest = (int)System.Net.HttpStatusCode.BadRequest;
+	public const int Unauthorized = (int)System.Net.HttpStatusCode.Unauthorized;
+	public const int PaymentRequired = (int)System.Net.HttpStatusCode.PaymentRequired;
+	public const int Forbidden = (int)System.Net.HttpStatusCode.Forbidden;
+	public const int NotFound = (int)System.Net.HttpStatusCode.NotFound;
+	public const int MethodNotAllowed = (int)System.Net.HttpStatusCode.MethodNotAllowed;
+	public const int NotAcceptable = (int)System.Net.HttpStatusCode.NotAcceptable;
+	public const int ProxyAuthenticationRequired = (int)System.Net.HttpStatusCode.ProxyAuthenticationRequired;
+	public const int RequestTimeout = (int)System.Net.HttpStatusCode.RequestTimeout;
+	public const int Conflict = (int)System.Net.HttpStatusCode.Conflict;
+	public const int Gone = (int)System.Net.HttpStatusCode.Gone;
+	public const int LengthRequired = (int)System.Net.HttpStatusCode.LengthRequired;
+	public const int PreconditionFailed = (int)System.Net.HttpStatusCode.PreconditionFailed;
+	public const int RequestEntityTooLarge = (int)System.Net.HttpStatusCode.RequestEntityTooLarge;
+	public const int RequestUriTooLong = (int)System.Net.HttpStatusCode.RequestUriTooLong;
+	public const int UnsupportedMediaType = (int)System.Net.HttpStatusCode.UnsupportedMediaType;
+	public const int RequestedRangeNotSatisfiable = (int)System.Net.HttpStatusCode.RequestedRangeNotSatisfiable;
+	public const int ExpectationFailed = (int)System.Net.HttpStatusCode.ExpectationFailed;
+	public const int InternalServerError = (int)System.Net.HttpStatusCode.InternalServerError;
+	public const int NotImplemented = (int)System.Net.HttpStatusCode.NotImplemented;
+	public const int BadGateway = (int)System.Net.HttpStatusCode.BadGateway;
+	public const int ServiceUnavailable = (int)System.Net.HttpStatusCode.ServiceUnavailable;
+	public const int GatewayTimeout = (int)System.Net.HttpStatusCode.GatewayTimeout;
+	public const int HttpVersionNotSupported = (int)System.Net.HttpStatusCode.HttpVersionNotSupported;
+}
diff --git a/src/KurrentDB.Transport.Http/ICodec.cs b/src/KurrentDB.Transport.Http/ICodec.cs
new file mode 100644
index 00000000000..42ea184d173
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/ICodec.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Text;
+
+namespace KurrentDB.Transport.Http;
+
+public interface ICodec {
+	string ContentType { get; }
+	Encoding Encoding { get; }
+	bool CanParse(MediaType format);
+	bool SuitableForResponse(MediaType component);
+	bool HasEventIds { get; }
+	bool HasEventTypes { get; }
+	T From<T>(string text);
+	string To<T>(T value);
+}
diff --git a/src/KurrentDB.Transport.Http/IOStreams.cs b/src/KurrentDB.Transport.Http/IOStreams.cs
new file mode 100644
index 00000000000..54ba5d3a992
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/IOStreams.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Transport.Http;
+
+public class IOStreams {
+	private static readonly ILogger Log = Serilog.Log.ForContext<IOStreams>();
+
+	public static void SafelyDispose(params Stream[] streams) {
+		if (streams == null || streams.Length == 0)
+			return;
+
+		foreach (var stream in streams) {
+			try {
+				if (stream != null)
+					stream.Dispose();
+			} catch (Exception e) {
+				//Exceptions may be thrown when client shutdowned and we were unable to write all the data,
+				//Nothing we can do, ignore (another option - globally ignore write errors)
+				Log.Information("Error while closing stream : {e}", e.Message);
+			}
+		}
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/KurrentDB.Transport.Http.csproj b/src/KurrentDB.Transport.Http/KurrentDB.Transport.Http.csproj
new file mode 100644
index 00000000000..125ff099f72
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/KurrentDB.Transport.Http.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+	</PropertyGroup>
+	<ItemGroup>
+		<FrameworkReference Include="Microsoft.AspNetCore.App" />
+		<PackageReference Include="Microsoft.Net.Http.Headers" Version="8.0.0" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.BufferManagement\KurrentDB.BufferManagement.csproj" />
+		<ProjectReference Include="..\KurrentDB.Common\KurrentDB.Common.csproj" />
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.Transport.Http/MediaType.cs b/src/KurrentDB.Transport.Http/MediaType.cs
new file mode 100644
index 00000000000..fd482992fc1
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/MediaType.cs
@@ -0,0 +1,114 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Globalization;
+using System.Text;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Transport.Http;
+
+public class MediaType {
+	public readonly string Range;
+	public readonly string Type;
+	public readonly string Subtype;
+	public readonly float Priority;
+	public readonly bool EncodingSpecified;
+	public readonly Encoding Encoding;
+
+	public MediaType(string range, string type, string subtype, float priority, bool encodingSpecified,
+		Encoding encoding) {
+		Range = range;
+		Type = type;
+		Subtype = subtype;
+		Priority = priority;
+		EncodingSpecified = encodingSpecified;
+		Encoding = encoding;
+	}
+
+	public MediaType(string range, string type, string subtype, float priority)
+		: this(range, type, subtype, priority, false, null) {
+	}
+
+	public bool Matches(string mediaRange, Encoding encoding) {
+		if (EncodingSpecified)
+			return Range == mediaRange && Encoding.Equals(encoding);
+
+		return Range == mediaRange;
+	}
+
+	public static bool TryParse(string componentText, out MediaType result) {
+		return TryParseInternal(componentText, false, out result);
+	}
+
+	public static MediaType TryParse(string componentText) {
+		MediaType result;
+		return TryParseInternal(componentText, false, out result) ? result : null;
+	}
+
+	public static MediaType Parse(string componentText) {
+		MediaType result;
+		if (!TryParseInternal(componentText, true, out result))
+			throw new Exception("This should never happen!");
+		return result;
+	}
+
+	private static bool TryParseInternal(string componentText, bool throwExceptions, out MediaType result) {
+		result = null;
+
+		if (componentText == null) {
+			if (throwExceptions)
+				throw new ArgumentNullException("componentText");
+			return false;
+		}
+
+		if (componentText == "") {
+			if (throwExceptions)
+				throw new ArgumentException("componentText");
+			return false;
+		}
+
+		var priority = 1.0f; // default priority
+		var encodingSpecified = false;
+		Encoding encoding = null;
+
+		var parts = componentText.Split(';');
+		var mediaRange = parts[0];
+
+		var typeParts = mediaRange.Split(new[] { '/' }, 2);
+		if (typeParts.Length != 2) {
+			if (throwExceptions)
+				throw new ArgumentException("componentText");
+			return false;
+		}
+
+		var mediaType = typeParts[0];
+		var mediaSubtype = typeParts[1];
+
+		if (parts.Length > 1) {
+			for (var i = 1; i < parts.Length; i++) {
+				var part = parts[i].ToLowerInvariant().Trim();
+				if (part.StartsWith("q=")) {
+					var quality = part.Substring(2);
+					float q;
+					if (float.TryParse(quality, NumberStyles.Float, CultureInfo.InvariantCulture, out q)) {
+						priority = q;
+					}
+				} else if (part.StartsWith("charset=")) {
+					encodingSpecified = true;
+					try {
+						var encName = part.Substring(8);
+						encoding = encName.Equals("utf-8", StringComparison.OrdinalIgnoreCase)
+							? Helper.UTF8NoBom
+							: Encoding.GetEncoding(encName);
+					} catch (ArgumentException) {
+						encoding = null;
+					}
+				}
+			}
+		}
+
+		result = new MediaType(mediaRange, mediaType, mediaSubtype, priority, encodingSpecified, encoding);
+		return true;
+	}
+}
diff --git a/src/KurrentDB.Transport.Http/ProxyHeaders.cs b/src/KurrentDB.Transport.Http/ProxyHeaders.cs
new file mode 100644
index 00000000000..a780a514bc7
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/ProxyHeaders.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Transport.Http;
+
+public static class ProxyHeaders {
+	public const string XForwardedPort = "X-Forwarded-Port";
+	public const string XForwardedProto = "X-Forwarded-Proto";
+	public const string XForwardedHost = "X-Forwarded-Host";
+	public const string XForwardedPrefix = "X-Forwarded-Prefix";
+}
+
+public static class ProxyHeaderValues {
+	public const string XForwardedProtoHttp = "http";
+	public const string XForwardedProtoHttps = "https";
+}
diff --git a/src/KurrentDB.Transport.Http/WebRequestExtensions.cs b/src/KurrentDB.Transport.Http/WebRequestExtensions.cs
new file mode 100644
index 00000000000..29ed0bfa157
--- /dev/null
+++ b/src/KurrentDB.Transport.Http/WebRequestExtensions.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+
+namespace KurrentDB.Transport.Http;
+
+public static class WebRequestExtensions {
+	public static WebResponse EndGetResponseExtended(this WebRequest request, IAsyncResult asyncResult) {
+		try {
+			return request.EndGetResponse(asyncResult);
+		} catch (WebException e) {
+			if (e.Response != null)
+				return e.Response; //for 404 and 500
+
+			throw;
+		}
+	}
+}
diff --git a/src/KurrentDB.Transport.Tcp/Formatting/FormatterBase.cs b/src/KurrentDB.Transport.Tcp/Formatting/FormatterBase.cs
new file mode 100644
index 00000000000..0f0e9e2b796
--- /dev/null
+++ b/src/KurrentDB.Transport.Tcp/Formatting/FormatterBase.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using KurrentDB.BufferManagement;
+
+namespace KurrentDB.Transport.Tcp.Formatting;
+
+public abstract class FormatterBase<T> : IMessageFormatter<T> {
+	/// <summary>
+	/// Gets a <see cref="BufferPool"></see> representing the IMessage provided.
+	/// </summary>
+	/// <param name="message">The message.</param>
+	/// <returns>A <see cref="BufferPool"></see> with a representation of the message</returns>
+	public abstract BufferPool ToBufferPool(T message);
+
+	/// <summary>
+	/// converts the message to a <see cref="ArraySegment{T}"></see>
+	/// </summary>
+	/// <param name="message">The message.</param>
+	/// <returns></returns>
+	public virtual ArraySegment<byte> ToArraySegment(T message) {
+		return new ArraySegment<byte>(ToArray(message));
+	}
+
+	/// <summary>
+	/// Converts the message to a byte array
+	/// </summary>
+	/// <param name="message">The message.</param>
+	/// <returns></returns>
+	public virtual byte[] ToArray(T message) {
+		using (BufferPool pool = ToBufferPool(message)) {
+			return pool.ToByteArray();
+		}
+	}
+
+	/// <summary>
+	/// Gets a message from a <see cref="BufferPool"/>
+	/// </summary>
+	/// <param name="bufferPool">The BufferPool to get data from.</param>
+	/// <returns></returns>
+	public virtual T From(BufferPool bufferPool) {
+		if (bufferPool == null)
+			throw new ArgumentNullException("bufferPool");
+		var stream = new BufferPoolStream(bufferPool);
+		return From(stream);
+	}
+
+	/// <summary>
+	/// Gets a message from a <see cref="ArraySegment{Byte}"></see>
+	/// </summary>
+	/// <param name="segment">The segment containing the raw data.</param>
+	/// <returns></returns>
+	public virtual T From(ArraySegment<byte> segment) {
+		using (var stream = new MemoryStream(segment.Array, segment.Offset, segment.Count, false)) {
+			return From(stream);
+		}
+	}
+
+	/// <summary>
+	/// Gets a message from a byte array
+	/// </summary>
+	/// <param name="array">The byte array.</param>
+	/// <returns></returns>
+	public virtual T From(byte[] array) {
+		if (array == null)
+			throw new ArgumentNullException("array");
+		using (var stream = new MemoryStream(array, 0, array.Length, false)) {
+			return From(stream);
+		}
+	}
+
+	/// <summary>
+	/// Creates a message object from the specified stream
+	/// </summary>
+	/// <param name="stream">The stream.</param>
+	/// <returns></returns>
+	public abstract T From(Stream stream);
+}
diff --git a/src/KurrentDB.Transport.Tcp/Formatting/IMessageFormatter.cs b/src/KurrentDB.Transport.Tcp/Formatting/IMessageFormatter.cs
new file mode 100644
index 00000000000..bf86345e81c
--- /dev/null
+++ b/src/KurrentDB.Transport.Tcp/Formatting/IMessageFormatter.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.BufferManagement;
+
+namespace KurrentDB.Transport.Tcp.Formatting;
+
+public interface IMessageFormatter<T> {
+	/// <summary>
+	/// Converts the object to a <see cref="BufferPool"></see> representing a binary format of it.
+	/// </summary>
+	/// <param name="message">The message to convert.</param>
+	/// <returns>A <see cref="BufferPool"></see> containing the data representing the object.</returns>
+	BufferPool ToBufferPool(T message);
+
+	/// <summary>
+	/// Converts the object to a <see cref="ArraySegment{Byte}"></see> representing a binary format of it.
+	/// </summary>
+	/// <param name="message">The message to convert.</param>
+	/// <returns>A <see cref="BufferPool"></see> containing the data representing the object.</returns>
+	ArraySegment<byte> ToArraySegment(T message);
+
+	/// <summary>
+	/// Converts the object to a byte array representing a binary format of it.
+	/// </summary>
+	/// <param name="message">The message to convert.</param>
+	/// <returns>A <see cref="BufferPool"></see> containing the data representing the object.</returns>
+	byte[] ToArray(T message);
+
+	/// <summary>
+	/// Takes a <see cref="BufferPool"></see> and converts its contents to a message object
+	/// </summary>
+	/// <param name="bufferPool">The buffer pool.</param>
+	/// <returns>A message representing the data given</returns>
+	T From(BufferPool bufferPool);
+
+	/// <summary>
+	/// Takes an ArraySegment and converts its contents to a message object
+	/// </summary>
+	/// <param name="segment">The buffer pool.</param>
+	/// <returns>A message representing the data given</returns>
+	T From(ArraySegment<byte> segment);
+
+	/// <summary>
+	/// Takes an Array and converts its contents to a message object
+	/// </summary>
+	/// <param name="array">The buffer pool.</param>
+	/// <returns>A message representing the data given</returns>
+	T From(byte[] array);
+}
diff --git a/src/KurrentDB.Transport.Tcp/Formatting/RawMessageFormatter.cs b/src/KurrentDB.Transport.Tcp/Formatting/RawMessageFormatter.cs
new file mode 100644
index 00000000000..df1f2c9947c
--- /dev/null
+++ b/src/KurrentDB.Transport.Tcp/Formatting/RawMessageFormatter.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.BufferManagement;
+
+namespace KurrentDB.Transport.Tcp.Formatting;
+
+/// <summary>
+/// Formatter which does not format anything, actually. Just outputs raw byte[].
+/// </summary>
+public class RawMessageFormatter : IMessageFormatter<byte[]> {
+	private readonly BufferManager _bufferManager;
+	private readonly int _initialBuffers;
+
+	/// <summary>
+	/// Initializes a new instance of the <see cref="RawMessageFormatter"/> class.
+	/// </summary>
+	public RawMessageFormatter() : this(BufferManager.Default, 2) {
+	}
+
+
+	/// <summary>
+	/// Initializes a new instance of the <see cref="RawMessageFormatter"/> class.
+	/// </summary>
+	/// <param name="bufferManager">The buffer manager.</param>
+	public RawMessageFormatter(BufferManager bufferManager) : this(bufferManager, 2) {
+	}
+
+
+	/// <summary>
+	/// Initializes a new instance of the <see cref="RawMessageFormatter"/> class.
+	/// </summary>
+	/// <param name="bufferManager">The buffer manager.</param>
+	/// <param name="initialBuffers">The number of initial buffers.</param>
+	public RawMessageFormatter(BufferManager bufferManager, int initialBuffers) {
+		_bufferManager = bufferManager;
+		_initialBuffers = initialBuffers;
+	}
+
+	public BufferPool ToBufferPool(byte[] message) {
+		if (message == null)
+			throw new ArgumentNullException("message");
+
+		var bufferPool = new BufferPool(_initialBuffers, _bufferManager);
+		var stream = new BufferPoolStream(bufferPool);
+		stream.Write(message, 0, message.Length);
+		return bufferPool;
+	}
+
+	public ArraySegment<byte> ToArraySegment(byte[] message) {
+		if (message == null)
+			throw new ArgumentNullException("message");
+		return new ArraySegment<byte>(message, 0, message.Length);
+	}
+
+	public byte[] ToArray(byte[] message) {
+		if (message == null)
+			throw new ArgumentNullException("message");
+		return message;
+	}
+
+	public byte[] From(BufferPool bufferPool) {
+		return bufferPool.ToByteArray();
+	}
+
+	public byte[] From(ArraySegment<byte> segment) {
+		var msg = new byte[segment.Count];
+		Buffer.BlockCopy(segment.Array, segment.Offset, msg, 0, segment.Count);
+		return msg;
+	}
+
+	public byte[] From(byte[] array) {
+		return array;
+	}
+}
diff --git a/src/KurrentDB.Transport.Tcp/Framing/IMessageFramer.cs b/src/KurrentDB.Transport.Tcp/Framing/IMessageFramer.cs
new file mode 100644
index 00000000000..e168fb2414a
--- /dev/null
+++ b/src/KurrentDB.Transport.Tcp/Framing/IMessageFramer.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace KurrentDB.Transport.Tcp.Framing;
+
+public interface IMessageFramer {
+	bool HasData { get; }
+	IEnumerable<ArraySegment<byte>> FrameData(ArraySegment<byte> data);
+	void Reset();
+}
+
+/// <summary>
+/// Encodes outgoing messages in frames and decodes incoming frames.
+/// For decoding it uses an internal state, raising a registered
+/// callback, once full message arrives
+/// </summary>
+public interface IMessageFramer<out TMessage> : IMessageFramer {
+	void UnFrameData(IEnumerable<ArraySegment<byte>> data);
+	void UnFrameData(ArraySegment<byte> data);
+	void RegisterMessageArrivedCallback(Action<TMessage> handler);
+}
+
+public interface IAsyncMessageFramer<out TMessage> : IMessageFramer {
+	ValueTask UnFrameData(IEnumerable<ArraySegment<byte>> data, CancellationToken token);
+	ValueTask UnFrameData(ArraySegment<byte> data, CancellationToken token);
+	void RegisterMessageArrivedCallback(Func<TMessage, CancellationToken, ValueTask> handler);
+}
diff --git a/src/KurrentDB.Transport.Tcp/Framing/LengthPrefixMessageFramer.cs b/src/KurrentDB.Transport.Tcp/Framing/LengthPrefixMessageFramer.cs
new file mode 100644
index 00000000000..5b7e0c6f102
--- /dev/null
+++ b/src/KurrentDB.Transport.Tcp/Framing/LengthPrefixMessageFramer.cs
@@ -0,0 +1,111 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.Common.Utils;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Transport.Tcp.Framing;
+
+/// <summary>
+/// Uses length-prefixed framing to encode outgoing messages and decode
+/// incoming messages, using internal state and raising a callback once
+/// full message arrives.
+/// </summary>
+public class LengthPrefixMessageFramer : IMessageFramer<ArraySegment<byte>> {
+	private static readonly ILogger Log = Serilog.Log.ForContext<LengthPrefixMessageFramer>();
+
+	public const int HeaderLength = sizeof(Int32);
+
+	private byte[] _messageBuffer;
+	private int _bufferIndex = 0;
+	private Action<ArraySegment<byte>> _receivedHandler;
+	private readonly int _maxPackageSize;
+
+	private int _headerBytes = 0;
+	private int _packageLength = 0;
+
+	/// <summary>
+	/// Initializes a new instance of the <see cref="LengthPrefixMessageFramer"/> class.
+	/// </summary>
+	public LengthPrefixMessageFramer(int maxPackageSize = 64 * 1024 * 1024) {
+		Ensure.Positive(maxPackageSize, "maxPackageSize");
+		_maxPackageSize = maxPackageSize;
+	}
+
+	public bool HasData => _headerBytes > 0;
+
+	public void Reset() {
+		_messageBuffer = null;
+		_headerBytes = 0;
+		_packageLength = 0;
+		_bufferIndex = 0;
+	}
+
+	public void UnFrameData(IEnumerable<ArraySegment<byte>> data) {
+		if (data == null)
+			throw new ArgumentNullException("data");
+
+		foreach (ArraySegment<byte> buffer in data) {
+			Parse(buffer);
+		}
+	}
+
+	public void UnFrameData(ArraySegment<byte> data) {
+		Parse(data);
+	}
+
+	/// <summary>
+	/// Parses a stream chunking based on length-prefixed framing.
+	/// Calls are re-entrant and hold state internally. Once full message arrives,
+	/// callback is raised (it is registered via <see cref="RegisterMessageArrivedCallback"/>
+	/// </summary>
+	/// <param name="bytes">A byte array of data to append</param>
+	private void Parse(ArraySegment<byte> bytes) {
+		byte[] data = bytes.Array;
+		for (int i = bytes.Offset, n = bytes.Offset + bytes.Count; i < n; i++) {
+			if (_headerBytes < HeaderLength) {
+				_packageLength |= (data[i] << (_headerBytes * 8)); // little-endian order
+				++_headerBytes;
+				if (_headerBytes == HeaderLength) {
+					if (_packageLength <= 0 || _packageLength > _maxPackageSize) {
+						Log.Error("FRAMING ERROR! Data:\n {data}", Common.Utils.Helper.FormatBinaryDump(bytes));
+						throw new PackageFramingException(string.Format(
+							"Package size is out of bounds: {0} (max: {1}).",
+							_packageLength, _maxPackageSize));
+					}
+
+					_messageBuffer = new byte[_packageLength];
+				}
+			} else {
+				int copyCnt = Math.Min(bytes.Count + bytes.Offset - i, _packageLength - _bufferIndex);
+				Buffer.BlockCopy(bytes.Array, i, _messageBuffer, _bufferIndex, copyCnt);
+				_bufferIndex += copyCnt;
+				i += copyCnt - 1;
+
+				if (_bufferIndex == _packageLength) {
+					if (_receivedHandler != null)
+						_receivedHandler(new ArraySegment<byte>(_messageBuffer, 0, _bufferIndex));
+					_messageBuffer = null;
+					_headerBytes = 0;
+					_packageLength = 0;
+					_bufferIndex = 0;
+				}
+			}
+		}
+	}
+
+	public IEnumerable<ArraySegment<byte>> FrameData(ArraySegment<byte> data) {
+		var length = data.Count;
+
+		yield return new ArraySegment<byte>(
+			new[] { (byte)length, (byte)(length >> 8), (byte)(length >> 16), (byte)(length >> 24) });
+		yield return data;
+	}
+
+	public void RegisterMessageArrivedCallback(Action<ArraySegment<byte>> handler) {
+		Ensure.NotNull(handler, nameof(handler));
+		_receivedHandler = handler;
+	}
+}
diff --git a/src/KurrentDB.Transport.Tcp/Framing/LengthPrefixMessageFramerWithBufferPool.cs b/src/KurrentDB.Transport.Tcp/Framing/LengthPrefixMessageFramerWithBufferPool.cs
new file mode 100644
index 00000000000..bdea4a4a070
--- /dev/null
+++ b/src/KurrentDB.Transport.Tcp/Framing/LengthPrefixMessageFramerWithBufferPool.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using KurrentDB.BufferManagement;
+using KurrentDB.Common.Utils;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Transport.Tcp.Framing;
+
+public class LengthPrefixMessageFramerWithBufferPool {
+	private static readonly ILogger Log = Serilog.Log.ForContext<LengthPrefixMessageFramerWithBufferPool>();
+
+	private const int PrefixLength = sizeof(int);
+
+	private readonly int _maxPackageSize;
+	private readonly BufferManager _bufferManager;
+	private BufferPool _messageBuffer;
+	private Action<BufferPool> _receivedHandler;
+
+	private int _headerBytes;
+	private int _packageLength;
+
+	/// <summary>
+	/// Initializes a new instance of the <see cref="LengthPrefixMessageFramerWithBufferPool"/> class.
+	/// </summary>
+	public LengthPrefixMessageFramerWithBufferPool(BufferManager bufferManager,
+		int maxPackageSize = 16 * 1024 * 1024) {
+		Ensure.NotNull(bufferManager, "bufferManager");
+		Ensure.Positive(maxPackageSize, "maxPackageSize");
+		_bufferManager = bufferManager;
+		_maxPackageSize = maxPackageSize;
+	}
+
+	public void Reset() {
+		_messageBuffer = null;
+		_headerBytes = 0;
+		_packageLength = 0;
+	}
+
+	public void UnFrameData(IEnumerable<ArraySegment<byte>> data) {
+		if (data == null)
+			throw new ArgumentNullException("data");
+
+		foreach (ArraySegment<byte> buffer in data) {
+			Parse(buffer);
+		}
+	}
+
+	public void UnFrameData(ArraySegment<byte> data) {
+		Parse(data);
+	}
+
+	/// <summary>
+	/// Parses a stream chunking based on length-prefixed framing. Calls are re-entrant and hold state internally.
+	/// </summary>
+	/// <param name="bytes">A byte array of data to append</param>
+	private void Parse(ArraySegment<byte> bytes) {
+		byte[] data = bytes.Array;
+		for (int i = bytes.Offset; i < bytes.Offset + bytes.Count;) {
+			if (_headerBytes < PrefixLength) {
+				_packageLength |= (data[i] << (_headerBytes * 8)); // little-endian order
+				++_headerBytes;
+				i += 1;
+				if (_headerBytes == PrefixLength) {
+					if (_packageLength <= 0 || _packageLength > _maxPackageSize) {
+						Log.Error("FRAMING ERROR! Data:\n {data}", Common.Utils.Helper.FormatBinaryDump(bytes));
+						throw new PackageFramingException(string.Format(
+							"Package size is out of bounds: {0} (max: {1}).",
+							_packageLength, _maxPackageSize));
+					}
+
+					_messageBuffer = new BufferPool(_bufferManager);
+				}
+			} else {
+				int copyCnt = Math.Min(bytes.Count + bytes.Offset - i, _packageLength - _messageBuffer.Length);
+				_messageBuffer.Append(bytes.Array, i, copyCnt);
+				i += copyCnt;
+
+				if (_messageBuffer.Length == _packageLength) {
+					if (_receivedHandler != null)
+						_receivedHandler(_messageBuffer);
+					_messageBuffer = null;
+					_headerBytes = 0;
+					_packageLength = 0;
+				}
+			}
+		}
+	}
+
+	public IEnumerable<ArraySegment<byte>> FrameData(ArraySegment<byte> data) {
+		var length = data.Count;
+
+		yield return new ArraySegment<byte>(
+			new[] { (byte)length, (byte)(length >> 8), (byte)(length >> 16), (byte)(length >> 24) });
+		yield return data;
+	}
+
+	public void RegisterMessageArrivedCallback(Action<BufferPool> handler) {
+		if (handler == null)
+			throw new ArgumentNullException("handler");
+
+		_receivedHandler = handler;
+	}
+}
diff --git a/src/KurrentDB.Transport.Tcp/Framing/PackageFramingException.cs b/src/KurrentDB.Transport.Tcp/Framing/PackageFramingException.cs
new file mode 100644
index 00000000000..0accb6c0f74
--- /dev/null
+++ b/src/KurrentDB.Transport.Tcp/Framing/PackageFramingException.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Transport.Tcp.Framing;
+
+public class PackageFramingException : Exception {
+	public PackageFramingException(string message) : base(message) {
+	}
+}
diff --git a/src/KurrentDB.Transport.Tcp/Helper.cs b/src/KurrentDB.Transport.Tcp/Helper.cs
new file mode 100644
index 00000000000..935c81c8369
--- /dev/null
+++ b/src/KurrentDB.Transport.Tcp/Helper.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Transport.Tcp;
+
+internal static class Helper {
+	public static void EatException(Action action) {
+		try {
+			action();
+		} catch (Exception) {
+		}
+	}
+
+	public static T EatException<T>(Func<T> func, T defaultValue = default(T)) {
+		Ensure.NotNull(func, "func");
+		try {
+			return func();
+		} catch (Exception) {
+			return defaultValue;
+		}
+	}
+}
diff --git a/src/KurrentDB.Transport.Tcp/IMonitoredTcpConnection.cs b/src/KurrentDB.Transport.Tcp/IMonitoredTcpConnection.cs
new file mode 100644
index 00000000000..4c74221ac63
--- /dev/null
+++ b/src/KurrentDB.Transport.Tcp/IMonitoredTcpConnection.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Transport.Tcp;
+
+public interface IMonitoredTcpConnection {
+	bool IsReadyForSend { get; }
+	bool IsReadyForReceive { get; }
+	bool IsInitialized { get; }
+	bool IsFaulted { get; }
+	bool IsClosed { get; }
+
+	bool InSend { get; }
+	bool InReceive { get; }
+
+	DateTime? LastSendStarted { get; }
+	DateTime? LastReceiveStarted { get; }
+
+	int PendingSendBytes { get; }
+	int InSendBytes { get; }
+	int PendingReceivedBytes { get; }
+
+	long TotalBytesSent { get; }
+	long TotalBytesReceived { get; }
+}
diff --git a/src/KurrentDB.Transport.Tcp/ITcpConnection.cs b/src/KurrentDB.Transport.Tcp/ITcpConnection.cs
new file mode 100644
index 00000000000..49c2110a190
--- /dev/null
+++ b/src/KurrentDB.Transport.Tcp/ITcpConnection.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+
+namespace KurrentDB.Transport.Tcp;
+
+public interface ITcpConnection {
+	event Action<ITcpConnection, SocketError> ConnectionClosed;
+
+	Guid ConnectionId { get; }
+	string ClientConnectionName { get; }
+	IPEndPoint RemoteEndPoint { get; }
+	IPEndPoint LocalEndPoint { get; }
+	int SendQueueSize { get; }
+	int PendingSendBytes { get; }
+	long TotalBytesSent { get; }
+	long TotalBytesReceived { get; }
+	bool IsClosed { get; }
+
+	void ReceiveAsync(Action<ITcpConnection, IEnumerable<ArraySegment<byte>>> callback);
+	void EnqueueSend(IEnumerable<ArraySegment<byte>> data);
+	void Close(string reason);
+	void SetClientConnectionName(string clientConnectionName);
+}
diff --git a/src/KurrentDB.Transport.Tcp/KurrentDB.Transport.Tcp.csproj b/src/KurrentDB.Transport.Tcp/KurrentDB.Transport.Tcp.csproj
new file mode 100644
index 00000000000..2b1f6e865e0
--- /dev/null
+++ b/src/KurrentDB.Transport.Tcp/KurrentDB.Transport.Tcp.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+	</PropertyGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.BufferManagement\KurrentDB.BufferManagement.csproj" />
+		<ProjectReference Include="..\KurrentDB.Common\KurrentDB.Common.csproj" />
+	</ItemGroup>
+	<ItemGroup />
+</Project>
diff --git a/src/KurrentDB.Transport.Tcp/SocketArgsPool.cs b/src/KurrentDB.Transport.Tcp/SocketArgsPool.cs
new file mode 100644
index 00000000000..c640a456108
--- /dev/null
+++ b/src/KurrentDB.Transport.Tcp/SocketArgsPool.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Net.Sockets;
+
+namespace KurrentDB.Transport.Tcp;
+
+internal class SocketArgsPool {
+	public readonly string Name;
+
+	private readonly Func<SocketAsyncEventArgs> _socketArgsCreator;
+
+	private readonly ConcurrentStack<SocketAsyncEventArgs> _socketArgsPool =
+		new ConcurrentStack<SocketAsyncEventArgs>();
+
+	public SocketArgsPool(string name, int initialCount, Func<SocketAsyncEventArgs> socketArgsCreator) {
+		if (socketArgsCreator == null)
+			throw new ArgumentNullException("socketArgsCreator");
+		if (initialCount < 0)
+			throw new ArgumentOutOfRangeException("initialCount");
+
+		Name = name;
+		_socketArgsCreator = socketArgsCreator;
+
+		for (int i = 0; i < initialCount; ++i) {
+			_socketArgsPool.Push(socketArgsCreator());
+		}
+	}
+
+	public SocketAsyncEventArgs Get() {
+		SocketAsyncEventArgs result;
+		if (_socketArgsPool.TryPop(out result))
+			return result;
+		return _socketArgsCreator();
+	}
+
+	public void Return(SocketAsyncEventArgs socketArgs) {
+		_socketArgsPool.Push(socketArgs);
+	}
+}
diff --git a/src/KurrentDB.Transport.Tcp/TcpClientConnector.cs b/src/KurrentDB.Transport.Tcp/TcpClientConnector.cs
new file mode 100644
index 00000000000..95921f88bbd
--- /dev/null
+++ b/src/KurrentDB.Transport.Tcp/TcpClientConnector.cs
@@ -0,0 +1,195 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Net;
+using System.Net.Sockets;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading;
+using KurrentDB.Common.Utils;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Transport.Tcp;
+
+public class TcpClientConnector {
+	private const int CheckPeriodMs = 200;
+
+	private readonly SocketArgsPool _connectSocketArgsPool;
+	private readonly ConcurrentDictionary<Guid, PendingConnection> _pendingConections;
+	private readonly Timer _timer;
+
+	private static readonly ILogger Log = Serilog.Log.ForContext<TcpClientConnector>();
+
+	public TcpClientConnector() {
+		_connectSocketArgsPool = new SocketArgsPool("TcpClientConnector._connectSocketArgsPool",
+			TcpConfiguration.ConnectPoolSize,
+			CreateConnectSocketArgs);
+		_pendingConections = new ConcurrentDictionary<Guid, PendingConnection>();
+		_timer = new Timer(TimerCallback);
+		// prevent possible null reference exceptions in case of slow initialization
+		_timer.Change(CheckPeriodMs, Timeout.Infinite);
+	}
+
+	private SocketAsyncEventArgs CreateConnectSocketArgs() {
+		var socketArgs = new SocketAsyncEventArgs();
+		socketArgs.Completed += ConnectCompleted;
+		socketArgs.UserToken = new CallbacksStateToken();
+		return socketArgs;
+	}
+
+	public ITcpConnection ConnectTo(Guid connectionId,
+		IPEndPoint remoteEndPoint,
+		TimeSpan connectionTimeout,
+		Action<ITcpConnection> onConnectionEstablished = null,
+		Action<ITcpConnection, SocketError> onConnectionFailed = null,
+		bool verbose = true) {
+		Ensure.NotNull(remoteEndPoint, "remoteEndPoint");
+		return TcpConnection.CreateConnectingTcpConnection(connectionId, remoteEndPoint, this, connectionTimeout,
+			onConnectionEstablished, onConnectionFailed, verbose);
+	}
+
+	public ITcpConnection ConnectSslTo(Guid connectionId,
+		string targetHost,
+		string[] otherNames,
+		IPEndPoint remoteEndPoint,
+		TimeSpan connectionTimeout,
+		CertificateDelegates.ServerCertificateValidator sslServerCertValidator,
+		Func<X509CertificateCollection> clientCertificatesSelector,
+		Action<ITcpConnection> onConnectionEstablished = null,
+		Action<ITcpConnection, SocketError> onConnectionFailed = null,
+		bool verbose = true) {
+		Ensure.NotNull(remoteEndPoint, "remoteEndPoint");
+		return TcpConnectionSsl.CreateConnectingConnection(connectionId, targetHost, otherNames, remoteEndPoint, sslServerCertValidator,
+			clientCertificatesSelector, this, connectionTimeout, onConnectionEstablished, onConnectionFailed, verbose);
+	}
+
+	internal void InitConnect(IPEndPoint serverEndPoint,
+		Action<Socket> onSocketAssigned,
+		Action<IPEndPoint, Socket> onConnectionEstablished,
+		Action<IPEndPoint, SocketError> onConnectionFailed,
+		ITcpConnection connection,
+		TimeSpan connectionTimeout) {
+		if (serverEndPoint == null)
+			throw new ArgumentNullException("serverEndPoint");
+		if (onSocketAssigned == null)
+			throw new ArgumentNullException("onSocketAssigned");
+		if (onConnectionEstablished == null)
+			throw new ArgumentNullException("onConnectionEstablished");
+		if (onConnectionFailed == null)
+			throw new ArgumentNullException("onConnectionFailed");
+
+		var socketArgs = _connectSocketArgsPool.Get();
+		var connectingSocket = new Socket(serverEndPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
+		onSocketAssigned(connectingSocket);
+		socketArgs.RemoteEndPoint = serverEndPoint;
+		socketArgs.AcceptSocket = connectingSocket;
+		var callbacks = (CallbacksStateToken)socketArgs.UserToken;
+		callbacks.OnConnectionEstablished = onConnectionEstablished;
+		callbacks.OnConnectionFailed = onConnectionFailed;
+		callbacks.PendingConnection = new PendingConnection(connection, DateTime.UtcNow.Add(connectionTimeout));
+
+		AddToConnecting(callbacks.PendingConnection);
+
+		try {
+			var firedAsync = connectingSocket.ConnectAsync(socketArgs);
+			if (!firedAsync)
+				ProcessConnect(socketArgs);
+		} catch (ObjectDisposedException) {
+			HandleBadConnect(socketArgs);
+		}
+	}
+
+	private void ConnectCompleted(object sender, SocketAsyncEventArgs e) {
+		ProcessConnect(e);
+	}
+
+	private void ProcessConnect(SocketAsyncEventArgs e) {
+		if (e.SocketError != SocketError.Success)
+			HandleBadConnect(e);
+		else
+			OnSocketConnected(e);
+	}
+
+	private void HandleBadConnect(SocketAsyncEventArgs socketArgs) {
+		var serverEndPoint = socketArgs.RemoteEndPoint;
+		var socketError = socketArgs.SocketError;
+		var callbacks = (CallbacksStateToken)socketArgs.UserToken;
+		var onConnectionFailed = callbacks.OnConnectionFailed;
+		var pendingConnection = callbacks.PendingConnection;
+
+		Helper.EatException(() => socketArgs.AcceptSocket.Close());
+		socketArgs.AcceptSocket = null;
+		callbacks.Reset();
+		_connectSocketArgsPool.Return(socketArgs);
+
+		if (RemoveFromConnecting(pendingConnection))
+			onConnectionFailed((IPEndPoint)serverEndPoint, socketError);
+	}
+
+	private void OnSocketConnected(SocketAsyncEventArgs socketArgs) {
+		var remoteEndPoint = (IPEndPoint)socketArgs.RemoteEndPoint;
+		var socket = socketArgs.AcceptSocket;
+		var callbacks = (CallbacksStateToken)socketArgs.UserToken;
+		var onConnectionEstablished = callbacks.OnConnectionEstablished;
+		var pendingConnection = callbacks.PendingConnection;
+
+		socketArgs.AcceptSocket = null;
+		callbacks.Reset();
+		_connectSocketArgsPool.Return(socketArgs);
+
+		if (RemoveFromConnecting(pendingConnection))
+			onConnectionEstablished(remoteEndPoint, socket);
+	}
+
+	private void TimerCallback(object state) {
+		foreach (var pendingConnection in _pendingConections.Values) {
+			if (DateTime.UtcNow >= pendingConnection.WhenToKill && RemoveFromConnecting(pendingConnection))
+				Helper.EatException(() => pendingConnection.Connection.Close("Connection establishment timeout."));
+		}
+
+		try {
+			_timer.Change(CheckPeriodMs, Timeout.Infinite);
+		} catch (ObjectDisposedException) {
+			// ignore
+		}
+	}
+
+	private void AddToConnecting(PendingConnection pendingConnection) {
+		_pendingConections.TryAdd(pendingConnection.Connection.ConnectionId, pendingConnection);
+	}
+
+	private bool RemoveFromConnecting(PendingConnection pendingConnection) {
+		PendingConnection conn;
+		if (pendingConnection.Connection == null) {
+			Log.Warning("Network Card disconnected");
+			return false;
+		}
+
+		return _pendingConections.TryRemove(pendingConnection.Connection.ConnectionId, out conn)
+			   && Interlocked.CompareExchange(ref conn.Done, 1, 0) == 0;
+	}
+
+	private class CallbacksStateToken {
+		public Action<IPEndPoint, Socket> OnConnectionEstablished;
+		public Action<IPEndPoint, SocketError> OnConnectionFailed;
+		public PendingConnection PendingConnection;
+
+		public void Reset() {
+			OnConnectionEstablished = null;
+			OnConnectionFailed = null;
+			PendingConnection = null;
+		}
+	}
+
+	private class PendingConnection {
+		public readonly ITcpConnection Connection;
+		public readonly DateTime WhenToKill;
+		public int Done;
+
+		public PendingConnection(ITcpConnection connection, DateTime whenToKill) {
+			Connection = connection;
+			WhenToKill = whenToKill;
+		}
+	}
+}
diff --git a/src/KurrentDB.Transport.Tcp/TcpConfiguration.cs b/src/KurrentDB.Transport.Tcp/TcpConfiguration.cs
new file mode 100644
index 00000000000..7083093cbae
--- /dev/null
+++ b/src/KurrentDB.Transport.Tcp/TcpConfiguration.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.Transport.Tcp;
+
+public static class TcpConfiguration {
+	public const int SocketCloseTimeoutSecs = 1;
+
+	public const int AcceptBacklogCount = 128;
+	public const int ConcurrentAccepts = 1;
+	public const int AcceptPoolSize = ConcurrentAccepts * 2;
+
+	public const int ConnectPoolSize = 32;
+	public const int SendReceivePoolSize = 512;
+
+	public const int BufferChunksCount = 512;
+	public const int SocketBufferSize = 8 * 1024;
+}
diff --git a/src/KurrentDB.Transport.Tcp/TcpConnection.cs b/src/KurrentDB.Transport.Tcp/TcpConnection.cs
new file mode 100644
index 00000000000..062fe83ccf2
--- /dev/null
+++ b/src/KurrentDB.Transport.Tcp/TcpConnection.cs
@@ -0,0 +1,443 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using KurrentDB.BufferManagement;
+using KurrentDB.Common.Utils;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Transport.Tcp;
+
+public class TcpConnection : TcpConnectionBase, ITcpConnection {
+	internal const int MaxSendPacketSize = 65535 /*Max IP packet size*/ - 20 /*IP packet header size*/ - 32 /*TCP min header size*/;
+
+	internal static readonly BufferManager BufferManager =
+		new BufferManager(TcpConfiguration.BufferChunksCount, TcpConfiguration.SocketBufferSize);
+
+	private static readonly ILogger Log = Serilog.Log.ForContext<TcpConnection>();
+
+	private static readonly SocketArgsPool SocketArgsPool = new SocketArgsPool("TcpConnection.SocketArgsPool",
+		TcpConfiguration.SendReceivePoolSize,
+		() => new SocketAsyncEventArgs());
+
+	public static ITcpConnection CreateConnectingTcpConnection(Guid connectionId,
+		IPEndPoint remoteEndPoint,
+		TcpClientConnector connector,
+		TimeSpan connectionTimeout,
+		Action<ITcpConnection> onConnectionEstablished,
+		Action<ITcpConnection, SocketError> onConnectionFailed,
+		bool verbose) {
+		var connection = new TcpConnection(connectionId, remoteEndPoint, verbose);
+		// ReSharper disable ImplicitlyCapturedClosure
+		connector.InitConnect(remoteEndPoint,
+			(socket) => {
+				connection.InitSocket(socket);
+			},
+			(_, socket) => {
+				connection.InitSendReceive();
+				if (onConnectionEstablished != null)
+					onConnectionEstablished(connection);
+			},
+			(_, socketError) => {
+				if (onConnectionFailed != null)
+					onConnectionFailed(connection, socketError);
+			}, connection, connectionTimeout);
+		// ReSharper restore ImplicitlyCapturedClosure
+		return connection;
+	}
+
+	public static ITcpConnection CreateAcceptedTcpConnection(Guid connectionId, IPEndPoint remoteEndPoint,
+		Socket socket, bool verbose) {
+		var connection = new TcpConnection(connectionId, remoteEndPoint, verbose);
+		connection.InitSocket(socket);
+		connection.InitSendReceive();
+		return connection;
+	}
+
+	public event Action<ITcpConnection, SocketError> ConnectionClosed;
+
+	public Guid ConnectionId {
+		get { return _connectionId; }
+	}
+
+	public int SendQueueSize {
+		get { return _sendQueue.Count; }
+	}
+
+	public string ClientConnectionName {
+		get { return _clientConnectionName; }
+	}
+
+	private readonly Guid _connectionId;
+	private readonly bool _verbose;
+	private string _clientConnectionName;
+
+	private Socket _socket;
+	private SocketAsyncEventArgs _receiveSocketArgs;
+	private SocketAsyncEventArgs _sendSocketArgs;
+
+	private readonly ConcurrentQueueWrapper<ArraySegment<byte>> _sendQueue =
+		new ConcurrentQueueWrapper<ArraySegment<byte>>();
+
+	private readonly Queue<ReceivedData> _receiveQueue = new Queue<ReceivedData>();
+	private readonly MemoryStream _memoryStream = new MemoryStream();
+	private long _memoryStreamOffset = 0L;
+
+	private readonly object _receivingLock = new object();
+	private readonly object _sendLock = new object();
+	private readonly object _closeLock = new object();
+	private bool _isSending;
+	private volatile bool _isClosed;
+	private volatile bool _isClosing;
+
+	private Action<ITcpConnection, IEnumerable<ArraySegment<byte>>> _receiveCallback;
+
+	private TcpConnection(Guid connectionId, IPEndPoint remoteEndPoint, bool verbose) : base(remoteEndPoint) {
+		Ensure.NotEmptyGuid(connectionId, "connectionId");
+
+		_connectionId = connectionId;
+		_verbose = verbose;
+	}
+
+	private void InitSocket(Socket socket) {
+		_socket = socket;
+	}
+
+	private void InitSendReceive() {
+		InitConnectionBase(_socket);
+		lock (_sendLock) {
+			try {
+				_socket.NoDelay = true;
+			} catch (ObjectDisposedException) {
+				CloseInternal(SocketError.Shutdown, "Socket disposed.");
+				return;
+			} catch (SocketException) {
+				CloseInternal(SocketError.Shutdown, "Socket is disposed.");
+				return;
+			}
+
+			var receiveSocketArgs = SocketArgsPool.Get();
+			_receiveSocketArgs = receiveSocketArgs;
+			_receiveSocketArgs.AcceptSocket = _socket;
+			_receiveSocketArgs.Completed += OnReceiveAsyncCompleted;
+
+			var sendSocketArgs = SocketArgsPool.Get();
+			_sendSocketArgs = sendSocketArgs;
+			_sendSocketArgs.AcceptSocket = _socket;
+			_sendSocketArgs.Completed += OnSendAsyncCompleted;
+		}
+
+		StartReceive();
+		TrySend();
+	}
+
+	public void EnqueueSend(IEnumerable<ArraySegment<byte>> data) {
+		lock (_sendLock) {
+			int bytes = 0;
+			foreach (var segment in data) {
+				_sendQueue.Enqueue(segment);
+				bytes += segment.Count;
+			}
+
+			NotifySendScheduled(bytes);
+		}
+
+		TrySend();
+	}
+
+	private void TrySend() {
+		bool continueSendSynchronously = true;
+		try {
+			do {
+				lock (_sendLock) {
+					if (_isSending || (_sendQueue.IsEmpty && _memoryStreamOffset >= _memoryStream.Length) || _sendSocketArgs == null)
+						return;
+					if (TcpConnectionMonitor.Default.IsSendBlocked())
+						return;
+					_isSending = true;
+				}
+
+				if (_memoryStreamOffset >= _memoryStream.Length) {
+					_memoryStream.SetLength(0);
+					_memoryStreamOffset = 0L;
+
+					ArraySegment<byte> sendPiece;
+					while (_sendQueue.TryDequeue(out sendPiece)) {
+						_memoryStream.Write(sendPiece.Array, sendPiece.Offset, sendPiece.Count);
+						if (_memoryStream.Length >= MaxSendPacketSize)
+							break;
+					}
+				}
+
+				int sendingBytes = Math.Min((int)_memoryStream.Length - (int)_memoryStreamOffset, MaxSendPacketSize);
+
+				_sendSocketArgs.SetBuffer(_memoryStream.GetBuffer(), (int)_memoryStreamOffset, sendingBytes);
+				_memoryStreamOffset += sendingBytes;
+
+				NotifySendStarting(_sendSocketArgs.Count);
+				var firedAsync = _sendSocketArgs.AcceptSocket.SendAsync(_sendSocketArgs);
+				if (firedAsync) {
+					continueSendSynchronously = false;
+				} else {
+					continueSendSynchronously = ProcessSend(_sendSocketArgs);
+				}
+			} while (continueSendSynchronously);
+		} catch (ObjectDisposedException) {
+			ReturnSendingSocketArgs();
+		}
+	}
+
+	private void OnSendAsyncCompleted(object sender, SocketAsyncEventArgs e) {
+		if (ProcessSend(e)) {
+			TrySend();
+		}
+	}
+
+	private bool ProcessSend(SocketAsyncEventArgs socketArgs) {
+		if (socketArgs.SocketError != SocketError.Success) {
+			NotifySendCompleted(0);
+			ReturnSendingSocketArgs();
+			CloseInternal(socketArgs.SocketError, "Socket send error.");
+			return false;
+		} else {
+			NotifySendCompleted(socketArgs.Count);
+
+			if (_isClosed) {
+				ReturnSendingSocketArgs();
+				return false;
+			} else {
+				lock (_sendLock) {
+					_isSending = false;
+				}
+
+				return true;
+			}
+		}
+	}
+
+	public void ReceiveAsync(Action<ITcpConnection, IEnumerable<ArraySegment<byte>>> callback) {
+		if (callback == null)
+			throw new ArgumentNullException("callback");
+
+		lock (_receivingLock) {
+			if (_receiveCallback != null) {
+				Log.Fatal("ReceiveAsync called again while previous call was not fulfilled");
+				throw new InvalidOperationException(
+					"ReceiveAsync called again while previous call was not fulfilled");
+			}
+
+			_receiveCallback = callback;
+		}
+
+		TryDequeueReceivedData();
+	}
+
+	private void StartReceive() {
+		try {
+			bool continueReceiveSynchronously = true;
+
+			do {
+				var buffer = BufferManager.CheckOut();
+				if (buffer.Array == null || buffer.Count == 0 || buffer.Array.Length < buffer.Offset + buffer.Count)
+					throw new Exception("Invalid buffer allocated");
+				// TODO AN: do we need to lock on _receiveSocketArgs?..
+				lock (_receiveSocketArgs) {
+					_receiveSocketArgs.SetBuffer(buffer.Array, buffer.Offset, buffer.Count);
+					if (_receiveSocketArgs.Buffer == null)
+						throw new Exception("Buffer was not set");
+				}
+
+				NotifyReceiveStarting();
+				bool firedAsync;
+				lock (_receiveSocketArgs) {
+					if (_receiveSocketArgs.Buffer == null)
+						throw new Exception("Buffer was lost");
+					firedAsync = _receiveSocketArgs.AcceptSocket.ReceiveAsync(_receiveSocketArgs);
+				}
+
+				if (firedAsync) {
+					continueReceiveSynchronously = false;
+				} else {
+					var processReceiveSuccess = ProcessReceive(_receiveSocketArgs);
+					if (processReceiveSuccess) {
+						TryDequeueReceivedData();
+					}
+
+					continueReceiveSynchronously = processReceiveSuccess;
+				}
+			} while (continueReceiveSynchronously);
+		} catch (ObjectDisposedException) {
+			ReturnReceivingSocketArgs();
+		}
+	}
+
+	private void OnReceiveAsyncCompleted(object sender, SocketAsyncEventArgs e) {
+		if (ProcessReceive(e)) {
+			TryDequeueReceivedData();
+			StartReceive();
+		}
+	}
+
+	private bool ProcessReceive(SocketAsyncEventArgs socketArgs) {
+		// socket closed normally or some error occurred
+		if (socketArgs.BytesTransferred == 0 || socketArgs.SocketError != SocketError.Success) {
+			NotifyReceiveCompleted(0);
+			ReturnReceivingSocketArgs();
+			CloseInternal(socketArgs.SocketError,
+				socketArgs.SocketError != SocketError.Success ? "Socket receive error" : "Socket closed");
+			return false;
+		}
+
+		NotifyReceiveCompleted(socketArgs.BytesTransferred);
+
+		lock (_receivingLock) {
+			var buf = new ArraySegment<byte>(socketArgs.Buffer, socketArgs.Offset, socketArgs.Count);
+			_receiveQueue.Enqueue(new ReceivedData(buf, socketArgs.BytesTransferred));
+		}
+
+		lock (_receiveSocketArgs) {
+			if (socketArgs.Buffer == null)
+				throw new Exception("Cleaning already null buffer");
+			socketArgs.SetBuffer(null, 0, 0);
+		}
+
+		return true;
+	}
+
+	private void TryDequeueReceivedData() {
+		Action<ITcpConnection, IEnumerable<ArraySegment<byte>>> callback;
+		List<ReceivedData> res;
+		lock (_receivingLock) {
+			// no awaiting callback or no data to dequeue
+			if (_receiveCallback == null || _receiveQueue.Count == 0)
+				return;
+
+			res = new List<ReceivedData>(_receiveQueue.Count);
+			while (_receiveQueue.Count > 0) {
+				res.Add(_receiveQueue.Dequeue());
+			}
+
+			callback = _receiveCallback;
+			_receiveCallback = null;
+		}
+
+		var data = new ArraySegment<byte>[res.Count];
+		int bytes = 0;
+		for (int i = 0; i < data.Length; ++i) {
+			var d = res[i];
+			bytes += d.DataLen;
+			data[i] = new ArraySegment<byte>(d.Buf.Array, d.Buf.Offset, d.DataLen);
+		}
+
+		lock (_closeLock) {
+			if (!_isClosed)
+				callback(this, data);
+		}
+
+		for (int i = 0, n = res.Count; i < n; ++i) {
+			BufferManager.CheckIn(res[i].Buf); // dispose buffers
+		}
+
+		NotifyReceiveDispatched(bytes);
+	}
+
+	public void Close(string reason) {
+		CloseInternal(SocketError.Success, reason ?? "Normal socket close."); // normal socket closing
+	}
+
+	private void CloseInternal(SocketError socketError, string reason) {
+		lock (_closeLock) {
+			if (_isClosing)
+				return;
+			_isClosing = true;
+		}
+
+		if (_socket != null) {
+			Helper.EatException(() => _socket.Shutdown(SocketShutdown.Both));
+			Helper.EatException(() => _socket.Close());
+		}
+
+		lock (_closeLock) {
+			_isClosed = true;
+		}
+
+		NotifyClosed();
+
+		if (_verbose) {
+			Log.Information(
+				"DB {connectionType} closed [{dateTime:HH:mm:ss.fff}: N{remoteEndPoint}, L{localEndPoint}, {connectionId:B}]:Received bytes: {totalBytesReceived}, Sent bytes: {totalBytesSent}",
+				GetType().Name, DateTime.UtcNow, RemoteEndPoint, LocalEndPoint, _connectionId,
+				TotalBytesReceived, TotalBytesSent);
+			Log.Information(
+				"DB {connectionType} closed [{dateTime:HH:mm:ss.fff}: N{remoteEndPoint}, L{localEndPoint}, {connectionId:B}]:Send calls: {sendCalls}, callbacks: {sendCallbacks}",
+				GetType().Name, DateTime.UtcNow, RemoteEndPoint, LocalEndPoint, _connectionId,
+				SendCalls, SendCallbacks);
+			Log.Information(
+				"DB {connectionType} closed [{dateTime:HH:mm:ss.fff}: N{remoteEndPoint}, L{localEndPoint}, {connectionId:B}]:Receive calls: {receiveCalls}, callbacks: {receiveCallbacks}",
+				GetType().Name, DateTime.UtcNow, RemoteEndPoint, LocalEndPoint, _connectionId,
+				ReceiveCalls, ReceiveCallbacks);
+			Log.Information(
+				"DB {connectionType} closed [{dateTime:HH:mm:ss.fff}: N{remoteEndPoint}, L{localEndPoint}, {connectionId:B}]:Close reason: [{socketError}] {reason}",
+				GetType().Name, DateTime.UtcNow, RemoteEndPoint, LocalEndPoint, _connectionId,
+				socketError, reason);
+		}
+
+		lock (_sendLock) {
+			if (!_isSending)
+				ReturnSendingSocketArgs();
+		}
+
+		var handler = ConnectionClosed;
+		if (handler != null)
+			handler(this, socketError);
+	}
+
+	private void ReturnSendingSocketArgs() {
+		var socketArgs = Interlocked.Exchange(ref _sendSocketArgs, null);
+		if (socketArgs != null) {
+			socketArgs.Completed -= OnSendAsyncCompleted;
+			socketArgs.AcceptSocket = null;
+			if (socketArgs.Buffer != null)
+				socketArgs.SetBuffer(null, 0, 0);
+			SocketArgsPool.Return(socketArgs);
+		}
+	}
+
+	private void ReturnReceivingSocketArgs() {
+		var socketArgs = Interlocked.Exchange(ref _receiveSocketArgs, null);
+		if (socketArgs != null) {
+			socketArgs.Completed -= OnReceiveAsyncCompleted;
+			socketArgs.AcceptSocket = null;
+			if (socketArgs.Buffer != null) {
+				BufferManager.CheckIn(
+					new ArraySegment<byte>(socketArgs.Buffer, socketArgs.Offset, socketArgs.Count));
+				socketArgs.SetBuffer(null, 0, 0);
+			}
+
+			SocketArgsPool.Return(socketArgs);
+		}
+	}
+
+	public void SetClientConnectionName(string clientConnectionName) {
+		_clientConnectionName = clientConnectionName;
+	}
+
+	public override string ToString() {
+		return RemoteEndPoint.ToString();
+	}
+
+	private struct ReceivedData {
+		public readonly ArraySegment<byte> Buf;
+		public readonly int DataLen;
+
+		public ReceivedData(ArraySegment<byte> buf, int dataLen) {
+			Buf = buf;
+			DataLen = dataLen;
+		}
+	}
+}
diff --git a/src/KurrentDB.Transport.Tcp/TcpConnectionBase.cs b/src/KurrentDB.Transport.Tcp/TcpConnectionBase.cs
new file mode 100644
index 00000000000..18cfd9ad7a1
--- /dev/null
+++ b/src/KurrentDB.Transport.Tcp/TcpConnectionBase.cs
@@ -0,0 +1,194 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using KurrentDB.Common.Utils;
+
+namespace KurrentDB.Transport.Tcp;
+
+public class TcpConnectionBase : IMonitoredTcpConnection {
+	public IPEndPoint RemoteEndPoint {
+		get { return _remoteEndPoint; }
+	}
+
+	public IPEndPoint LocalEndPoint {
+		get { return _localEndPoint; }
+	}
+
+	public bool IsInitialized {
+		get { return _socket != null; }
+	}
+
+	public bool IsClosed {
+		get { return _isClosed; }
+	}
+
+	public bool InSend {
+		get { return Interlocked.Read(ref _lastSendStarted) >= 0; }
+	}
+
+	public bool InReceive {
+		get { return Interlocked.Read(ref _lastReceiveStarted) >= 0; }
+	}
+
+	public int PendingSendBytes {
+		get { return _pendingSendBytes; }
+	}
+
+	public int InSendBytes {
+		get { return _inSendBytes; }
+	}
+
+	public int PendingReceivedBytes {
+		get { return _pendingReceivedBytes; }
+	}
+
+	public long TotalBytesSent {
+		get { return Interlocked.Read(ref _totalBytesSent); }
+	}
+
+	public long TotalBytesReceived {
+		get { return Interlocked.Read(ref _totalBytesReceived); }
+	}
+
+	public int SendCalls {
+		get { return _sentAsyncs; }
+	}
+
+	public int SendCallbacks {
+		get { return _sentAsyncCallbacks; }
+	}
+
+	public int ReceiveCalls {
+		get { return _recvAsyncs; }
+	}
+
+	public int ReceiveCallbacks {
+		get { return _recvAsyncCallbacks; }
+	}
+
+	public bool IsReadyForSend {
+		get {
+			try {
+				return !_isClosed && _socket.Poll(0, SelectMode.SelectWrite);
+			} catch (ObjectDisposedException) {
+				//TODO: why do we get this?
+				return false;
+			}
+		}
+	}
+
+	public bool IsReadyForReceive {
+		get {
+			try {
+				return !_isClosed && _socket.Poll(0, SelectMode.SelectRead);
+			} catch (ObjectDisposedException) {
+				//TODO: why do we get this?
+				return false;
+			}
+		}
+	}
+
+	public bool IsFaulted {
+		get {
+			try {
+				return !_isClosed && _socket.Poll(0, SelectMode.SelectError);
+			} catch (ObjectDisposedException) {
+				//TODO: why do we get this?
+				return false;
+			}
+		}
+	}
+
+	public DateTime? LastSendStarted {
+		get {
+			var ticks = Interlocked.Read(ref _lastSendStarted);
+			return ticks >= 0 ? new DateTime(ticks) : (DateTime?)null;
+		}
+	}
+
+	public DateTime? LastReceiveStarted {
+		get {
+			var ticks = Interlocked.Read(ref _lastReceiveStarted);
+			return ticks >= 0 ? new DateTime(ticks) : (DateTime?)null;
+		}
+	}
+
+	private Socket _socket;
+	protected readonly IPEndPoint _remoteEndPoint;
+	private IPEndPoint _localEndPoint;
+
+	private long _lastSendStarted = -1;
+	private long _lastReceiveStarted = -1;
+	private bool _isClosed;
+
+	private int _pendingSendBytes;
+	private int _inSendBytes;
+	private int _pendingReceivedBytes;
+	private long _totalBytesSent;
+	private long _totalBytesReceived;
+
+	private int _sentAsyncs;
+	private int _sentAsyncCallbacks;
+	private int _recvAsyncs;
+	private int _recvAsyncCallbacks;
+
+	public TcpConnectionBase(IPEndPoint remoteEndPoint) {
+		Ensure.NotNull(remoteEndPoint, "remoteEndPoint");
+		_remoteEndPoint = remoteEndPoint;
+
+		TcpConnectionMonitor.Default.Register(this);
+	}
+
+	protected void InitConnectionBase(Socket socket) {
+		Ensure.NotNull(socket, "socket");
+
+		_socket = socket;
+		_localEndPoint = Helper.EatException(() => (IPEndPoint)socket.LocalEndPoint);
+	}
+
+	protected void NotifySendScheduled(int bytes) {
+		Interlocked.Add(ref _pendingSendBytes, bytes);
+	}
+
+	protected void NotifySendStarting(int bytes) {
+		if (Interlocked.CompareExchange(ref _lastSendStarted, DateTime.UtcNow.Ticks, -1) != -1)
+			throw new Exception("Concurrent send detected.");
+		Interlocked.Add(ref _pendingSendBytes, -bytes);
+		Interlocked.Add(ref _inSendBytes, bytes);
+		Interlocked.Increment(ref _sentAsyncs);
+	}
+
+	protected void NotifySendCompleted(int bytes) {
+		Interlocked.Exchange(ref _lastSendStarted, -1);
+		Interlocked.Add(ref _inSendBytes, -bytes);
+		Interlocked.Add(ref _totalBytesSent, bytes);
+		Interlocked.Increment(ref _sentAsyncCallbacks);
+	}
+
+	protected void NotifyReceiveStarting() {
+		if (Interlocked.CompareExchange(ref _lastReceiveStarted, DateTime.UtcNow.Ticks, -1) != -1)
+			throw new Exception("Concurrent receive detected.");
+
+		Interlocked.Increment(ref _recvAsyncs);
+	}
+
+	protected void NotifyReceiveCompleted(int bytes) {
+		Interlocked.Exchange(ref _lastReceiveStarted, -1);
+		Interlocked.Add(ref _pendingReceivedBytes, bytes);
+		Interlocked.Add(ref _totalBytesReceived, bytes);
+		Interlocked.Increment(ref _recvAsyncCallbacks);
+	}
+
+	protected void NotifyReceiveDispatched(int bytes) {
+		Interlocked.Add(ref _pendingReceivedBytes, -bytes);
+	}
+
+	protected void NotifyClosed() {
+		_isClosed = true;
+		TcpConnectionMonitor.Default.Unregister(this);
+	}
+}
diff --git a/src/KurrentDB.Transport.Tcp/TcpConnectionMonitor.cs b/src/KurrentDB.Transport.Tcp/TcpConnectionMonitor.cs
new file mode 100644
index 00000000000..9a1a512151d
--- /dev/null
+++ b/src/KurrentDB.Transport.Tcp/TcpConnectionMonitor.cs
@@ -0,0 +1,191 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Linq;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Transport.Tcp;
+
+public class TcpConnectionMonitor {
+	public static readonly TcpConnectionMonitor Default = new TcpConnectionMonitor();
+	private static readonly ILogger Log = Serilog.Log.ForContext<TcpConnectionMonitor>();
+
+	private readonly object _statsLock = new object();
+
+	private readonly ConcurrentDictionary<IMonitoredTcpConnection, ConnectionData> _connections =
+		new ConcurrentDictionary<IMonitoredTcpConnection, ConnectionData>();
+
+	private long _sentTotal;
+	private long _receivedTotal;
+	private long _sentSinceLastRun;
+	private long _receivedSinceLastRun;
+	private long _pendingSendOnLastRun;
+	private long _inSendOnLastRun;
+	private long _pendingReceivedOnLastRun;
+
+	private bool _anySendBlockedOnLastRun;
+	private DateTime _lastUpdateTime;
+
+	private TcpConnectionMonitor() {
+	}
+
+	public void Register(IMonitoredTcpConnection connection) {
+		_connections.TryAdd(connection, new ConnectionData(connection));
+	}
+
+	public void Unregister(IMonitoredTcpConnection connection) {
+		ConnectionData data;
+		_connections.TryRemove(connection, out data);
+	}
+
+	public TcpStats GetTcpStats() {
+		ConnectionData[] connections = _connections.Values.ToArray();
+		lock (_statsLock) {
+			var stats = AnalyzeConnections(connections, DateTime.UtcNow - _lastUpdateTime);
+			_lastUpdateTime = DateTime.UtcNow;
+			return stats;
+		}
+	}
+
+	public IMonitoredTcpConnection[] GetTcpConnectionStats() {
+		GetTcpStats();
+		var monitoredConnections = _connections.Values.Select(conn => conn.Connection).ToArray();
+		return monitoredConnections;
+	}
+
+	private TcpStats AnalyzeConnections(ConnectionData[] connections, TimeSpan measurePeriod) {
+		_receivedSinceLastRun = 0;
+		_sentSinceLastRun = 0;
+		_pendingSendOnLastRun = 0;
+		_inSendOnLastRun = 0;
+		_pendingReceivedOnLastRun = 0;
+		_anySendBlockedOnLastRun = false;
+
+		foreach (var connection in connections) {
+			AnalyzeConnection(connection);
+		}
+
+		var stats = new TcpStats(connections.Length,
+			_sentTotal,
+			_receivedTotal,
+			_sentSinceLastRun,
+			_receivedSinceLastRun,
+			_pendingSendOnLastRun,
+			_inSendOnLastRun,
+			_pendingReceivedOnLastRun,
+			measurePeriod);
+
+		return stats;
+	}
+
+	private void AnalyzeConnection(ConnectionData connectionData) {
+		var connection = connectionData.Connection;
+		if (!connection.IsInitialized)
+			return;
+
+		if (connection.IsFaulted) {
+			Log.Information("# {connection} is faulted", connection);
+			return;
+		}
+
+		UpdateStatistics(connectionData);
+
+		CheckPendingReceived(connection);
+		CheckPendingSend(connection);
+		CheckMissingSendCallback(connectionData, connection);
+		CheckMissingReceiveCallback(connectionData, connection);
+	}
+
+	private void UpdateStatistics(ConnectionData connectionData) {
+		var connection = connectionData.Connection;
+		long totalBytesSent = connection.TotalBytesSent;
+		long totalBytesReceived = connection.TotalBytesReceived;
+		long pendingSend = connection.PendingSendBytes;
+		long inSend = connection.InSendBytes;
+		long pendingReceived = connection.PendingReceivedBytes;
+
+		_sentSinceLastRun += totalBytesSent - connectionData.LastTotalBytesSent;
+		_receivedSinceLastRun += totalBytesReceived - connectionData.LastTotalBytesReceived;
+
+		_sentTotal += _sentSinceLastRun;
+		_receivedTotal += _receivedSinceLastRun;
+
+		_pendingSendOnLastRun += pendingSend;
+		_inSendOnLastRun += inSend;
+		_pendingReceivedOnLastRun = pendingReceived;
+
+		connectionData.LastTotalBytesSent = totalBytesSent;
+		connectionData.LastTotalBytesReceived = totalBytesReceived;
+	}
+
+	private static void CheckMissingReceiveCallback(ConnectionData connectionData,
+		IMonitoredTcpConnection connection) {
+		bool inReceive = connection.InReceive;
+		bool isReadyForReceive = connection.IsReadyForReceive;
+		DateTime? lastReceiveStarted = connection.LastReceiveStarted;
+
+		int sinceLastReceive = (int)(DateTime.UtcNow - lastReceiveStarted.GetValueOrDefault()).TotalMilliseconds;
+		bool missingReceiveCallback = inReceive && isReadyForReceive && sinceLastReceive > 500;
+
+		if (missingReceiveCallback && connectionData.LastMissingReceiveCallBack) {
+			Log.Error(
+				"# {connection} {sinceLastReceive}ms since last Receive started. No completion callback received, but socket status is READY_FOR_RECEIVE",
+				connection, sinceLastReceive);
+		}
+
+		connectionData.LastMissingReceiveCallBack = missingReceiveCallback;
+	}
+
+	private void CheckMissingSendCallback(ConnectionData connectionData, IMonitoredTcpConnection connection) {
+		// snapshot all data?
+		bool inSend = connection.InSend;
+		bool isReadyForSend = connection.IsReadyForSend;
+		DateTime? lastSendStarted = connection.LastSendStarted;
+		int inSendBytes = connection.InSendBytes;
+
+		int sinceLastSend = (int)(DateTime.UtcNow - lastSendStarted.GetValueOrDefault()).TotalMilliseconds;
+		bool missingSendCallback = inSend && isReadyForSend && sinceLastSend > 500;
+
+		if (missingSendCallback && connectionData.LastMissingSendCallBack) {
+			// _anySendBlockedOnLastRun = true;
+			Log.Error(
+				"# {connection} {sinceLastSend}ms since last send started. No completion callback received, but socket status is READY_FOR_SEND. In send: {inSendBytes}",
+				connection, sinceLastSend, inSendBytes);
+		}
+
+		connectionData.LastMissingSendCallBack = missingSendCallback;
+	}
+
+	private static void CheckPendingSend(IMonitoredTcpConnection connection) {
+		int pendingSendBytes = connection.PendingSendBytes;
+		if (pendingSendBytes > 128 * 1024) {
+			Log.Information("# {connection} {pendingSendKiloBytes}kb pending send", connection, pendingSendBytes / 1024);
+		}
+	}
+
+	private static void CheckPendingReceived(IMonitoredTcpConnection connection) {
+		int pendingReceivedBytes = connection.PendingReceivedBytes;
+		if (pendingReceivedBytes > 128 * 1024) {
+			Log.Information("# {connection} {pendingReceivedKiloBytes}kb are not dispatched", connection,
+				pendingReceivedBytes / 1024);
+		}
+	}
+
+	public bool IsSendBlocked() {
+		return _anySendBlockedOnLastRun;
+	}
+
+	private class ConnectionData {
+		public readonly IMonitoredTcpConnection Connection;
+		public bool LastMissingSendCallBack;
+		public bool LastMissingReceiveCallBack;
+		public long LastTotalBytesSent;
+		public long LastTotalBytesReceived;
+
+		public ConnectionData(IMonitoredTcpConnection connection) {
+			Connection = connection;
+		}
+	}
+}
diff --git a/src/KurrentDB.Transport.Tcp/TcpConnectionSsl.cs b/src/KurrentDB.Transport.Tcp/TcpConnectionSsl.cs
new file mode 100644
index 00000000000..ea83b840863
--- /dev/null
+++ b/src/KurrentDB.Transport.Tcp/TcpConnectionSsl.cs
@@ -0,0 +1,620 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Net.Security;
+using System.Net.Sockets;
+using System.Security.Authentication;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Common.Utils;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Transport.Tcp;
+
+public class TcpConnectionSsl : TcpConnectionBase, ITcpConnection {
+	private static readonly ILogger Log = Serilog.Log.ForContext<TcpConnectionSsl>();
+
+	public static ITcpConnection CreateConnectingConnection(Guid connectionId,
+		string targetHost,
+		string[] otherNames,
+		IPEndPoint remoteEndPoint,
+		CertificateDelegates.ServerCertificateValidator serverCertValidator,
+		Func<X509CertificateCollection> clientCertificatesSelector,
+		TcpClientConnector connector,
+		TimeSpan connectionTimeout,
+		Action<ITcpConnection> onConnectionEstablished,
+		Action<ITcpConnection, SocketError> onConnectionFailed,
+		bool verbose) {
+		var connection = new TcpConnectionSsl(connectionId, remoteEndPoint, verbose);
+		// ReSharper disable ImplicitlyCapturedClosure
+		connector.InitConnect(remoteEndPoint,
+			(socket) => {
+				connection.InitClientSocket(socket);
+			},
+			(_, socket) => {
+				connection.InitSslStream(targetHost, otherNames, serverCertValidator, clientCertificatesSelector, verbose);
+				if (onConnectionEstablished != null)
+					onConnectionEstablished(connection);
+			},
+			(_, socketError) => {
+				if (onConnectionFailed != null)
+					onConnectionFailed(connection, socketError);
+			}, connection, connectionTimeout);
+		// ReSharper restore ImplicitlyCapturedClosure
+		return connection;
+	}
+
+	public static ITcpConnection CreateServerFromSocket(Guid connectionId,
+		IPEndPoint remoteEndPoint,
+		Socket socket,
+		Func<X509Certificate2> serverCertificateSelector,
+		Func<X509Certificate2Collection> intermediatesSelector,
+		CertificateDelegates.ClientCertificateValidator clientCertValidator,
+		bool verbose) {
+		var connection = new TcpConnectionSsl(connectionId, remoteEndPoint, verbose);
+		connection.InitServerSocket(socket, serverCertificateSelector, intermediatesSelector, clientCertValidator, verbose);
+		return connection;
+	}
+
+	public event Action<ITcpConnection, SocketError> ConnectionClosed;
+
+	public Guid ConnectionId {
+		get { return _connectionId; }
+	}
+
+	public int SendQueueSize {
+		get { return _sendQueue.Count; }
+	}
+
+	public string ClientConnectionName {
+		get { return _clientConnectionName; }
+	}
+
+	private readonly Guid _connectionId;
+	private readonly bool _verbose;
+	public string _clientConnectionName;
+
+	private Socket _socket;
+
+	private readonly ConcurrentQueueWrapper<ArraySegment<byte>> _sendQueue =
+		new ConcurrentQueueWrapper<ArraySegment<byte>>();
+
+	private readonly ConcurrentQueueWrapper<ReceivedData>
+		_receiveQueue = new ConcurrentQueueWrapper<ReceivedData>();
+
+	private readonly MemoryStream _memoryStream = new MemoryStream();
+	private long _memoryStreamOffset = 0L;
+
+	private readonly object _streamLock = new object();
+	private readonly object _closeLock = new object();
+	private bool _isSending;
+	private int _receiveHandling;
+	private volatile bool _isClosed;
+	private volatile bool _isClosing;
+
+	private Action<ITcpConnection, IEnumerable<ArraySegment<byte>>> _receiveCallback;
+
+	private SslStream _sslStream;
+	private bool _isAuthenticated;
+	private int _sendingBytes;
+	private CertificateDelegates.ServerCertificateValidator _serverCertValidator;
+	private CertificateDelegates.ClientCertificateValidator _clientCertValidator;
+	private string[] _otherNames;
+	private readonly byte[] _receiveBuffer = new byte[TcpConnection.BufferManager.ChunkSize];
+
+	private TcpConnectionSsl(Guid connectionId, IPEndPoint remoteEndPoint, bool verbose) : base(remoteEndPoint) {
+		Ensure.NotEmptyGuid(connectionId, "connectionId");
+
+		_connectionId = connectionId;
+		_verbose = verbose;
+	}
+
+	private void InitServerSocket(
+		Socket socket,
+		Func<X509Certificate2> serverCertificateSelector,
+		Func<X509Certificate2Collection> intermediatesSelector,
+		CertificateDelegates.ClientCertificateValidator clientCertValidator,
+		bool verbose) {
+		InitConnectionBase(socket);
+		if (verbose)
+			Console.WriteLine("TcpConnectionSsl::InitClientSocket({0}, L{1})", RemoteEndPoint, LocalEndPoint);
+
+		_clientCertValidator = clientCertValidator;
+
+		lock (_streamLock) {
+			try {
+				socket.NoDelay = true;
+			} catch (ObjectDisposedException) {
+				CloseInternal(SocketError.Shutdown, "Socket is disposed.");
+				return;
+			} catch (SocketException) {
+				CloseInternal(SocketError.Shutdown, "Socket is disposed.");
+				return;
+			}
+
+			try {
+				_sslStream = new SslStream(new NetworkStream(socket, true), false);
+			} catch (IOException exc) {
+				Log.Debug(exc, "[S{remoteEndPoint}, L{localEndPoint}]: IOException on NetworkStream. The socket has already been disposed.", RemoteEndPoint,
+					LocalEndPoint);
+				return;
+			}
+
+			Task.Run(async () => await AuthenticateAsServerAsync(serverCertificateSelector, intermediatesSelector));
+		}
+	}
+
+	private async Task AuthenticateAsServerAsync(
+		Func<X509Certificate2> serverCertificateSelector,
+		Func<X509Certificate2Collection> intermediatesSelector) {
+		try {
+			var enabledSslProtocols = SslProtocols.Tls12 | SslProtocols.Tls13;
+			var certificate = serverCertificateSelector?.Invoke();
+			var intermediates = intermediatesSelector?.Invoke();
+			Ensure.NotNull(certificate, "certificate");
+
+			await _sslStream.AuthenticateAsServerAsync(new SslServerAuthenticationOptions {
+				ServerCertificateContext = SslStreamCertificateContext.Create(
+					certificate!, intermediates, offline: true),
+				ClientCertificateRequired = true,
+				EnabledSslProtocols = enabledSslProtocols,
+				CertificateRevocationCheckMode = X509RevocationMode.NoCheck,
+				RemoteCertificateValidationCallback = ValidateClientCertificate,
+				ApplicationProtocols = new List<SslApplicationProtocol>(),
+				AllowRenegotiation = false,
+			});
+
+			lock (_streamLock) {
+				if (_verbose)
+					DisplaySslStreamInfo(_sslStream);
+				_isAuthenticated = true;
+			}
+		} catch (AuthenticationException exc) {
+			Log.Information(exc,
+				"[S{remoteEndPoint}, L{localEndPoint}]: Authentication exception on AuthenticateAsServerAsync.",
+				RemoteEndPoint, LocalEndPoint);
+			CloseInternal(SocketError.SocketError, exc.Message);
+		} catch (ObjectDisposedException) {
+			CloseInternal(SocketError.SocketError, "SslStream disposed.");
+		} catch (Exception exc) {
+			Log.Information(exc,
+				"[S{remoteEndPoint}, L{localEndPoint}]: Exception on AuthenticateAsServerAsync.",
+				RemoteEndPoint, LocalEndPoint);
+			CloseInternal(SocketError.SocketError, exc.Message);
+		}
+
+		StartReceive();
+		TrySend();
+	}
+
+	private void InitClientSocket(Socket socket) {
+		_socket = socket;
+	}
+
+	private void InitSslStream(string targetHost, string[] otherNames, CertificateDelegates.ServerCertificateValidator serverCertValidator, Func<X509CertificateCollection> clientCertificatesSelector, bool verbose) {
+		Ensure.NotNull(targetHost, "targetHost");
+		InitConnectionBase(_socket);
+		if (verbose)
+			Console.WriteLine("TcpConnectionSsl::InitClientSslStream({0}, L{1})", RemoteEndPoint, LocalEndPoint);
+
+		_serverCertValidator = serverCertValidator;
+		_otherNames = otherNames;
+
+		lock (_streamLock) {
+			try {
+				_socket.NoDelay = true;
+			} catch (ObjectDisposedException) {
+				CloseInternal(SocketError.Shutdown, "Socket is disposed.");
+				return;
+			} catch (SocketException) {
+				CloseInternal(SocketError.Shutdown, "Socket is disposed.");
+				return;
+			}
+
+			try {
+				_sslStream = new SslStream(new NetworkStream(_socket, true), false, ValidateServerCertificate, null);
+			} catch (IOException exc) {
+				Log.Debug(exc, "[S{remoteEndPoint}, L{localEndPoint}]: IOException on NetworkStream. The socket has already been disposed.", RemoteEndPoint,
+					LocalEndPoint);
+				return;
+			}
+
+			try {
+				var enabledSslProtocols = SslProtocols.Tls12 | SslProtocols.Tls13;
+				var clientCertificates = clientCertificatesSelector?.Invoke();
+				_sslStream.BeginAuthenticateAsClient(targetHost, clientCertificates, enabledSslProtocols, false, OnEndAuthenticateAsClient, _sslStream);
+			} catch (AuthenticationException exc) {
+				Log.Information(exc,
+					"[S{remoteEndPoint}, L{localEndPoint}]: Authentication exception on BeginAuthenticateAsClient.",
+					RemoteEndPoint, LocalEndPoint);
+				CloseInternal(SocketError.SocketError, exc.Message);
+			} catch (ObjectDisposedException) {
+				CloseInternal(SocketError.SocketError, "SslStream disposed.");
+			} catch (Exception exc) {
+				Log.Information(exc,
+					"[S{remoteEndPoint}, {localEndPoint}]: Exception on BeginAuthenticateAsClient.", RemoteEndPoint,
+					LocalEndPoint);
+				CloseInternal(SocketError.SocketError, exc.Message);
+			}
+		}
+	}
+
+	private void OnEndAuthenticateAsClient(IAsyncResult ar) {
+		try {
+			lock (_streamLock) {
+				var sslStream = (SslStream)ar.AsyncState;
+				sslStream.EndAuthenticateAsClient(ar);
+				if (_verbose)
+					DisplaySslStreamInfo(sslStream);
+				_isAuthenticated = true;
+			}
+
+			StartReceive();
+			TrySend();
+		} catch (AuthenticationException exc) {
+			Log.Information(exc,
+				"[S{remoteEndPoint}, L{localEndPoint}]: Authentication exception on EndAuthenticateAsClient.",
+				RemoteEndPoint, LocalEndPoint);
+			CloseInternal(SocketError.SocketError, exc.Message);
+		} catch (ObjectDisposedException) {
+			CloseInternal(SocketError.SocketError, "SslStream disposed.");
+		} catch (Exception exc) {
+			Log.Information(exc, "[S{remoteEndPoint}, L{localEndPoint}]: Exception on EndAuthenticateAsClient.",
+				RemoteEndPoint, LocalEndPoint);
+			CloseInternal(SocketError.SocketError, exc.Message);
+		}
+	}
+
+	// The following method is invoked by the RemoteCertificateValidationDelegate.
+	public bool ValidateServerCertificate(object sender, X509Certificate certificate, X509Chain chain,
+		SslPolicyErrors sslPolicyErrors) {
+		var (isValid, error) = _serverCertValidator(certificate, chain, sslPolicyErrors, _otherNames);
+		if (!isValid && error != null) {
+			Log.Error("Server certificate validation error: {e}", error);
+		}
+		return isValid;
+	}
+
+	public bool ValidateClientCertificate(object sender, X509Certificate certificate, X509Chain chain,
+		SslPolicyErrors sslPolicyErrors) {
+		var (isValid, error) = _clientCertValidator(certificate, chain, sslPolicyErrors);
+		if (!isValid && error != null) {
+			Log.Error("Client certificate validation error: {e}", error);
+		}
+		return isValid;
+	}
+
+	private void DisplaySslStreamInfo(SslStream stream) {
+		Log.Information("[S{remoteEndPoint}, L{localEndPoint}]", RemoteEndPoint, LocalEndPoint);
+		Log.Verbose("Cipher: {cipherAlgorithm}", stream.CipherAlgorithm);
+		try {
+			Log.Verbose("Cipher strength: {cipherStrength}", stream.CipherStrength);
+		} catch (NotImplementedException) {
+		}
+
+		Log.Verbose("Hash: {hashAlgorithm}", stream.HashAlgorithm);
+		try {
+			Log.Verbose("Hash strength: {hashStrength}", stream.HashStrength);
+		} catch (NotImplementedException) {
+		}
+
+		Log.Verbose("Key exchange: {keyExchangeAlgorithm}", stream.KeyExchangeAlgorithm);
+		try {
+			Log.Verbose("Key exchange strength: {keyExchangeStrength}", stream.KeyExchangeStrength);
+		} catch (NotImplementedException) {
+		}
+
+		Log.Information("Protocol: {sslProtocol}", stream.SslProtocol);
+		Log.Information("Is authenticated: {isAuthenticated} as server? {isServer}", stream.IsAuthenticated,
+			stream.IsServer);
+		Log.Information("IsSigned: {isSigned}", stream.IsSigned);
+		Log.Information("Is Encrypted: {isEncrypted}", stream.IsEncrypted);
+		Log.Information("Can read: {canRead}, write {canWrite}", stream.CanRead, stream.CanWrite);
+		Log.Information("Can timeout: {canTimeout}", stream.CanTimeout);
+		try {
+			Log.Information("Certificate revocation list checked: {checkCertRevocationStatus}",
+				stream.CheckCertRevocationStatus);
+		} catch (NotImplementedException) {
+		}
+
+		X509Certificate localCert = stream.LocalCertificate;
+		if (localCert != null)
+			Log.Information(
+				"Local certificate was issued to {subject} and is valid from {effectiveDate} until {expirationDate}.",
+				localCert.Subject, localCert.GetEffectiveDateString(), localCert.GetExpirationDateString());
+		else
+			Log.Information("Local certificate is null.");
+
+		// Display the properties of the client's certificate.
+		X509Certificate remoteCert = stream.RemoteCertificate;
+		if (remoteCert != null)
+			Log.Information(
+				"Remote certificate was issued to {subject} and is valid from {remoteCertEffectiveDate} until {remoteCertExpirationDate}.",
+				remoteCert.Subject, remoteCert.GetEffectiveDateString(), remoteCert.GetExpirationDateString());
+		else
+			Log.Information("Remote certificate is null.");
+	}
+
+	public void EnqueueSend(IEnumerable<ArraySegment<byte>> data) {
+		lock (_streamLock) {
+			int bytes = 0;
+			foreach (var segment in data) {
+				_sendQueue.Enqueue(segment);
+				bytes += segment.Count;
+			}
+
+			NotifySendScheduled(bytes);
+		}
+
+		TrySend();
+	}
+
+	private void TrySend() {
+		bool continueSendSynchronously = true;
+		try {
+			do {
+				lock (_streamLock) {
+					if (_isSending || (_sendQueue.IsEmpty && _memoryStreamOffset >= _memoryStream.Length) || _sslStream == null || !_isAuthenticated)
+						return;
+					if (TcpConnectionMonitor.Default.IsSendBlocked())
+						return;
+					_isSending = true;
+				}
+
+				if (_memoryStreamOffset >= _memoryStream.Length) {
+					_memoryStream.SetLength(0);
+					_memoryStreamOffset = 0L;
+
+					ArraySegment<byte> sendPiece;
+					while (_sendQueue.TryDequeue(out sendPiece)) {
+						_memoryStream.Write(sendPiece.Array, sendPiece.Offset, sendPiece.Count);
+						if (_memoryStream.Length >= TcpConnection.MaxSendPacketSize)
+							break;
+					}
+				}
+
+				_sendingBytes = Math.Min((int)_memoryStream.Length - (int)_memoryStreamOffset, TcpConnection.MaxSendPacketSize);
+
+				NotifySendStarting(_sendingBytes);
+				var result = _sslStream.BeginWrite(_memoryStream.GetBuffer(), (int)_memoryStreamOffset, _sendingBytes, OnEndWrite, null);
+				_memoryStreamOffset += _sendingBytes;
+				continueSendSynchronously = result.CompletedSynchronously;
+				if (continueSendSynchronously) {
+					EndWrite(result);
+				}
+			} while (continueSendSynchronously);
+		} catch (SocketException exc) {
+			Log.Debug(exc, "SocketException '{e}' during BeginWrite.", exc.SocketErrorCode);
+			CloseInternal(exc.SocketErrorCode, "SocketException during BeginWrite.");
+		} catch (ObjectDisposedException) {
+			CloseInternal(SocketError.SocketError, "SslStream disposed.");
+		} catch (Exception exc) {
+			Log.Debug(exc, "Exception during BeginWrite.");
+			CloseInternal(SocketError.SocketError, "Exception during BeginWrite");
+		}
+	}
+
+	private void OnEndWrite(IAsyncResult ar) {
+		if (ar.CompletedSynchronously)
+			return;
+
+		EndWrite(ar);
+		TrySend();
+	}
+
+	private void EndWrite(IAsyncResult ar) {
+		try {
+			_sslStream.EndWrite(ar);
+			NotifySendCompleted(_sendingBytes);
+
+			lock (_streamLock) {
+				_isSending = false;
+			}
+		} catch (SocketException exc) {
+			Log.Debug(exc, "SocketException '{e}' during EndWrite.", exc.SocketErrorCode);
+			NotifySendCompleted(0);
+			CloseInternal(exc.SocketErrorCode, "SocketException during EndWrite.");
+		} catch (ObjectDisposedException) {
+			NotifySendCompleted(0);
+			CloseInternal(SocketError.SocketError, "SslStream disposed.");
+		} catch (Exception exc) {
+			Log.Debug(exc, "Exception during EndWrite.");
+			NotifySendCompleted(0);
+			CloseInternal(SocketError.SocketError, "Exception during EndWrite.");
+		}
+	}
+
+	public void ReceiveAsync(Action<ITcpConnection, IEnumerable<ArraySegment<byte>>> callback) {
+		Ensure.NotNull(callback, "callback");
+
+		if (Interlocked.Exchange(ref _receiveCallback, callback) != null) {
+			Log.Fatal("ReceiveAsync called again while previous call wasn't fulfilled");
+			throw new InvalidOperationException("ReceiveAsync called again while previous call wasn't fulfilled");
+		}
+
+		TryDequeueReceivedData();
+	}
+
+	private void StartReceive() {
+		try {
+			bool continueReceiveSynchronously = true;
+
+			do {
+				NotifyReceiveStarting();
+				var result = _sslStream.BeginRead(_receiveBuffer, 0, _receiveBuffer.Length, OnEndRead, null);
+				continueReceiveSynchronously = result.CompletedSynchronously;
+				if (continueReceiveSynchronously) {
+					EndRead(result);
+				}
+			} while (continueReceiveSynchronously);
+		} catch (SocketException exc) {
+			Log.Debug(exc, "SocketException '{e}' during BeginRead.", exc.SocketErrorCode);
+			CloseInternal(exc.SocketErrorCode, "SocketException during BeginRead.");
+		} catch (ObjectDisposedException) {
+			CloseInternal(SocketError.SocketError, "SslStream disposed.");
+		} catch (Exception exc) {
+			Log.Debug(exc, "Exception during BeginRead.");
+			CloseInternal(SocketError.SocketError, "Exception during BeginRead.");
+		}
+	}
+
+	private void OnEndRead(IAsyncResult ar) {
+		if (ar.CompletedSynchronously)
+			return;
+
+		EndRead(ar);
+		StartReceive();
+	}
+
+	private void EndRead(IAsyncResult ar) {
+		int bytesRead;
+		try {
+			bytesRead = _sslStream.EndRead(ar);
+		} catch (SocketException exc) {
+			Log.Debug(exc, "SocketException '{e}' during EndRead.", exc.SocketErrorCode);
+			NotifyReceiveCompleted(0);
+			CloseInternal(exc.SocketErrorCode, "SocketException during EndRead.");
+			return;
+		} catch (ObjectDisposedException) {
+			NotifyReceiveCompleted(0);
+			CloseInternal(SocketError.SocketError, "SslStream disposed.");
+			return;
+		} catch (Exception exc) {
+			Log.Debug(exc, "Exception during EndRead.");
+			NotifyReceiveCompleted(0);
+			CloseInternal(SocketError.SocketError, "Exception during EndRead.");
+			return;
+		}
+
+		if (bytesRead <= 0) // socket closed normally
+		{
+			NotifyReceiveCompleted(0);
+			CloseInternal(SocketError.Success, "Socket closed.");
+			return;
+		}
+
+		NotifyReceiveCompleted(bytesRead);
+
+		var buffer = TcpConnection.BufferManager.CheckOut();
+		if (buffer.Array == null || buffer.Count == 0 || buffer.Array.Length < buffer.Offset + buffer.Count)
+			throw new Exception("Invalid buffer allocated.");
+		Buffer.BlockCopy(_receiveBuffer, 0, buffer.Array, buffer.Offset, bytesRead);
+		var buf = new ArraySegment<byte>(buffer.Array, buffer.Offset, buffer.Count);
+		_receiveQueue.Enqueue(new ReceivedData(buf, bytesRead));
+
+		TryDequeueReceivedData();
+	}
+
+	private void TryDequeueReceivedData() {
+		if (Interlocked.CompareExchange(ref _receiveHandling, 1, 0) != 0)
+			return;
+		do {
+			if (!_receiveQueue.IsEmpty && _receiveCallback != null) {
+				var callback = Interlocked.Exchange(ref _receiveCallback, null);
+				if (callback == null) {
+					Log.Fatal("Some threading issue in TryDequeueReceivedData! Callback is null!");
+					throw new Exception("Some threading issue in TryDequeueReceivedData! Callback is null!");
+				}
+
+				var res = new List<ReceivedData>(_receiveQueue.Count);
+				ReceivedData piece;
+				while (_receiveQueue.TryDequeue(out piece)) {
+					res.Add(piece);
+				}
+
+				var data = new ArraySegment<byte>[res.Count];
+				int bytes = 0;
+				for (int i = 0; i < data.Length; ++i) {
+					var d = res[i];
+					bytes += d.DataLen;
+					data[i] = new ArraySegment<byte>(d.Buf.Array, d.Buf.Offset, d.DataLen);
+				}
+
+				lock (_closeLock) {
+					if (!_isClosed)
+						callback(this, data);
+				}
+
+				for (int i = 0, n = res.Count; i < n; ++i) {
+					TcpConnection.BufferManager.CheckIn(res[i].Buf); // dispose buffers
+				}
+
+				NotifyReceiveDispatched(bytes);
+			}
+
+			Interlocked.Exchange(ref _receiveHandling, 0);
+		} while (!_receiveQueue.IsEmpty
+				 && _receiveCallback != null
+				 && Interlocked.CompareExchange(ref _receiveHandling, 1, 0) == 0);
+	}
+
+	public void Close(string reason) {
+		CloseInternal(SocketError.Success, reason ?? "Normal socket close."); // normal socket closing
+	}
+
+	private void CloseInternal(SocketError socketError, string reason) {
+		lock (_closeLock) {
+			if (_isClosing)
+				return;
+			_isClosing = true;
+		}
+
+		if (_sslStream != null)
+			Helper.EatException(() => _sslStream.Close());
+
+		if (_socket != null)
+			Helper.EatException(() => _socket.Dispose());
+
+		lock (_closeLock) {
+			_isClosed = true;
+		}
+
+		NotifyClosed();
+
+		if (_verbose) {
+			Log.Information(
+				"DB {connectionType} closed [{dateTime:HH:mm:ss.fff}: N{remoteEndPoint}, L{localEndPoint}, {connectionId:B}]:Received bytes: {totalBytesReceived}, Sent bytes: {totalBytesSent}",
+				GetType().Name, DateTime.UtcNow, RemoteEndPoint, LocalEndPoint, _connectionId,
+				TotalBytesReceived, TotalBytesSent);
+			Log.Information(
+				"DB {connectionType} closed [{dateTime:HH:mm:ss.fff}: N{remoteEndPoint}, L{localEndPoint}, {connectionId:B}]:Send calls: {sendCalls}, callbacks: {sendCallbacks}",
+				GetType().Name, DateTime.UtcNow, RemoteEndPoint, LocalEndPoint, _connectionId,
+				SendCalls, SendCallbacks);
+			Log.Information(
+				"DB {connectionType} closed [{dateTime:HH:mm:ss.fff}: N{remoteEndPoint}, L{localEndPoint}, {connectionId:B}]:Receive calls: {receiveCalls}, callbacks: {receiveCallbacks}",
+				GetType().Name, DateTime.UtcNow, RemoteEndPoint, LocalEndPoint, _connectionId,
+				ReceiveCalls, ReceiveCallbacks);
+			Log.Information(
+				"DB {connectionType} closed [{dateTime:HH:mm:ss.fff}: N{remoteEndPoint}, L{localEndPoint}, {connectionId:B}]:Close reason: [{e}] {reason}",
+				GetType().Name, DateTime.UtcNow, RemoteEndPoint, LocalEndPoint, _connectionId,
+				socketError, reason);
+		}
+
+		var handler = ConnectionClosed;
+		if (handler != null)
+			handler(this, socketError);
+	}
+
+	public void SetClientConnectionName(string clientConnectionName) {
+		_clientConnectionName = clientConnectionName;
+	}
+
+	public override string ToString() {
+		return "S" + RemoteEndPoint;
+	}
+
+	private struct ReceivedData {
+		public readonly ArraySegment<byte> Buf;
+		public readonly int DataLen;
+
+		public ReceivedData(ArraySegment<byte> buf, int dataLen) {
+			Buf = buf;
+			DataLen = dataLen;
+		}
+	}
+}
diff --git a/src/KurrentDB.Transport.Tcp/TcpServerListener.cs b/src/KurrentDB.Transport.Tcp/TcpServerListener.cs
new file mode 100644
index 00000000000..bac76fff2f6
--- /dev/null
+++ b/src/KurrentDB.Transport.Tcp/TcpServerListener.cs
@@ -0,0 +1,114 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Net;
+using System.Net.Sockets;
+using KurrentDB.Common.Utils;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Transport.Tcp;
+
+public class TcpServerListener {
+	private static readonly ILogger Log = Serilog.Log.ForContext<TcpServerListener>();
+
+	private readonly IPEndPoint _serverEndPoint;
+	private readonly Socket _listeningSocket;
+	private readonly SocketArgsPool _acceptSocketArgsPool;
+	private Action<IPEndPoint, Socket> _onSocketAccepted;
+
+	public TcpServerListener(IPEndPoint serverEndPoint) {
+		Ensure.NotNull(serverEndPoint, "serverEndPoint");
+
+		_serverEndPoint = serverEndPoint;
+
+		_listeningSocket = new Socket(serverEndPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
+
+		_acceptSocketArgsPool = new SocketArgsPool("TcpServerListener.AcceptSocketArgsPool",
+			TcpConfiguration.ConcurrentAccepts * 2,
+			CreateAcceptSocketArgs);
+	}
+
+	private SocketAsyncEventArgs CreateAcceptSocketArgs() {
+		var socketArgs = new SocketAsyncEventArgs();
+		socketArgs.Completed += AcceptCompleted;
+		return socketArgs;
+	}
+
+	public void StartListening(Action<IPEndPoint, Socket> callback, string securityType) {
+		Ensure.NotNull(callback, "callback");
+
+		_onSocketAccepted = callback;
+
+		Log.Information("Starting {securityType} TCP listening on TCP endpoint: {serverEndPoint}.", securityType,
+			_serverEndPoint);
+		try {
+			_listeningSocket.ExclusiveAddressUse = true;
+			_listeningSocket.Bind(_serverEndPoint);
+			_listeningSocket.Listen(TcpConfiguration.AcceptBacklogCount);
+		} catch (Exception) {
+			Log.Information("Failed to listen on TCP endpoint: {serverEndPoint}.", _serverEndPoint);
+			Helper.EatException(() => _listeningSocket.Close(TcpConfiguration.SocketCloseTimeoutSecs));
+			throw;
+		}
+
+		for (int i = 0; i < TcpConfiguration.ConcurrentAccepts; ++i) {
+			StartAccepting();
+		}
+	}
+
+	private void StartAccepting() {
+		var socketArgs = _acceptSocketArgsPool.Get();
+
+		try {
+			var firedAsync = _listeningSocket.AcceptAsync(socketArgs);
+			if (!firedAsync)
+				ProcessAccept(socketArgs);
+		} catch (ObjectDisposedException) {
+			HandleBadAccept(socketArgs);
+		}
+	}
+
+	private void AcceptCompleted(object sender, SocketAsyncEventArgs e) {
+		ProcessAccept(e);
+	}
+
+	private void ProcessAccept(SocketAsyncEventArgs e) {
+		if (e.SocketError != SocketError.Success) {
+			HandleBadAccept(e);
+		} else {
+			var acceptSocket = e.AcceptSocket;
+			e.AcceptSocket = null;
+			_acceptSocketArgsPool.Return(e);
+
+			OnSocketAccepted(acceptSocket);
+		}
+
+		StartAccepting();
+	}
+
+	private void HandleBadAccept(SocketAsyncEventArgs socketArgs) {
+		Helper.EatException(
+			() => {
+				if (socketArgs.AcceptSocket != null) // avoid annoying exceptions
+					socketArgs.AcceptSocket.Close(TcpConfiguration.SocketCloseTimeoutSecs);
+			});
+		socketArgs.AcceptSocket = null;
+		_acceptSocketArgsPool.Return(socketArgs);
+	}
+
+	private void OnSocketAccepted(Socket socket) {
+		IPEndPoint socketEndPoint;
+		try {
+			socketEndPoint = (IPEndPoint)socket.RemoteEndPoint;
+		} catch (Exception) {
+			return;
+		}
+
+		_onSocketAccepted(socketEndPoint, socket);
+	}
+
+	public void Stop() {
+		Helper.EatException(() => _listeningSocket.Close(TcpConfiguration.SocketCloseTimeoutSecs));
+	}
+}
diff --git a/src/KurrentDB.Transport.Tcp/TcpStats.cs b/src/KurrentDB.Transport.Tcp/TcpStats.cs
new file mode 100644
index 00000000000..98090c460c6
--- /dev/null
+++ b/src/KurrentDB.Transport.Tcp/TcpStats.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+namespace KurrentDB.Transport.Tcp;
+
+public class TcpStats {
+	///<summary>
+	///Number of TCP connections to Event Store
+	///</summary>
+	public readonly int Connections;
+	///<summary>
+	///Total bytes sent from TCP connections
+	///</summary>
+	public readonly long SentBytesTotal;
+	///<summary>
+	///Total bytes received by TCP connections
+	///</summary>
+	public readonly long ReceivedBytesTotal;
+	///<summary>
+	///Total bytes sent to TCP connections since last run
+	///</summary>
+	public readonly long SentBytesSinceLastRun;
+	///<summary>
+	///Total bytes received by TCP connections since last run
+	///</summary>
+	public readonly long ReceivedBytesSinceLastRun;
+	///<summary>
+	///Sending speed in bytes per second
+	///</summary>
+	public readonly double SendingSpeed;
+	///<summary>
+	///Receiving speed in bytes per second.
+	///</summary>
+	public readonly double ReceivingSpeed;
+	///<summary>
+	///Number of bytes waiting to be sent to connections
+	///</summary>
+	public readonly long PendingSend;
+	///<summary>
+	///Number of bytes sent to connections but not yet acknowledged by the receiving party
+	///</summary>
+	public readonly long InSend;
+	///<summary>
+	///Number of bytes waiting to be received by connections
+	///</summary>
+	public readonly long PendingReceived;
+	///<summary>
+	///Time elapsed since last stats read
+	///</summary>
+	public readonly TimeSpan MeasureTime;
+
+	public TcpStats(int connections,
+		long sentBytesTotal,
+		long receivedBytesTotal,
+		long sentBytesSinceLastRunSinceLastRun,
+		long receivedBytesSinceLastRun,
+		long pendingSend,
+		long inSend,
+		long pendingReceived,
+		TimeSpan measureTime) {
+		Connections = connections;
+		SentBytesTotal = sentBytesTotal;
+		ReceivedBytesTotal = receivedBytesTotal;
+		SentBytesSinceLastRun = sentBytesSinceLastRunSinceLastRun;
+		ReceivedBytesSinceLastRun = receivedBytesSinceLastRun;
+		PendingSend = pendingSend;
+		InSend = inSend;
+		PendingReceived = pendingReceived;
+		MeasureTime = measureTime;
+		SendingSpeed = (MeasureTime.TotalSeconds < 0.00001) ? 0 : SentBytesSinceLastRun / MeasureTime.TotalSeconds;
+		ReceivingSpeed = (MeasureTime.TotalSeconds < 0.00001)
+			? 0
+			: ReceivedBytesSinceLastRun / MeasureTime.TotalSeconds;
+	}
+}
diff --git a/src/KurrentDB.Transport.Tcp/TcpTypedConnection.cs b/src/KurrentDB.Transport.Tcp/TcpTypedConnection.cs
new file mode 100644
index 00000000000..f13d802f0e4
--- /dev/null
+++ b/src/KurrentDB.Transport.Tcp/TcpTypedConnection.cs
@@ -0,0 +1,101 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+using KurrentDB.Transport.Tcp.Formatting;
+using KurrentDB.Transport.Tcp.Framing;
+using Serilog.Core;
+using ILogger = Serilog.ILogger;
+
+namespace KurrentDB.Transport.Tcp;
+
+public class TcpTypedConnection<T> {
+	private static readonly ILogger Log =
+		Serilog.Log.ForContext(Constants.SourceContextPropertyName, "TcpTypedConnection");
+
+	public event Action<TcpTypedConnection<T>, SocketError> ConnectionClosed;
+
+	private readonly ITcpConnection _connection;
+	private readonly IMessageFormatter<T> _formatter;
+	private readonly IMessageFramer<ArraySegment<byte>> _framer;
+
+	private Action<TcpTypedConnection<T>, T> _receiveCallback;
+
+	public EndPoint RemoteEndPoint {
+		get { return _connection.RemoteEndPoint; }
+	}
+
+	public EndPoint LocalEndPoint {
+		get { return _connection.LocalEndPoint; }
+	}
+
+	public int SendQueueSize {
+		get { return _connection.SendQueueSize; }
+	}
+
+	public TcpTypedConnection(ITcpConnection connection,
+		IMessageFormatter<T> formatter,
+		IMessageFramer<ArraySegment<byte>> framer) {
+		if (formatter == null)
+			throw new ArgumentNullException("formatter");
+		if (framer == null)
+			throw new ArgumentNullException("framer");
+
+		_connection = connection;
+		_formatter = formatter;
+		_framer = framer;
+
+		connection.ConnectionClosed += OnConnectionClosed;
+
+		//Setup callback for incoming messages
+		framer.RegisterMessageArrivedCallback(IncomingMessageArrived);
+	}
+
+	private void OnConnectionClosed(ITcpConnection connection, SocketError socketError) {
+		connection.ConnectionClosed -= OnConnectionClosed;
+
+		var handler = ConnectionClosed;
+		if (handler != null)
+			handler(this, socketError);
+	}
+
+	public void EnqueueSend(T message) {
+		var data = _formatter.ToArraySegment(message);
+		_connection.EnqueueSend(_framer.FrameData(data));
+	}
+
+	public void ReceiveAsync(Action<TcpTypedConnection<T>, T> callback) {
+		if (_receiveCallback != null)
+			throw new InvalidOperationException("ReceiveAsync should be called just once.");
+
+		if (callback == null)
+			throw new ArgumentNullException("callback");
+
+		_receiveCallback = callback;
+
+		_connection.ReceiveAsync(OnRawDataReceived);
+	}
+
+	private void OnRawDataReceived(ITcpConnection connection, IEnumerable<ArraySegment<byte>> data) {
+		try {
+			_framer.UnFrameData(data);
+		} catch (PackageFramingException exc) {
+			Log.Information(exc, "Invalid TCP frame received.");
+			Close("Invalid TCP frame received.");
+			return;
+		}
+
+		connection.ReceiveAsync(OnRawDataReceived);
+	}
+
+	private void IncomingMessageArrived(ArraySegment<byte> message) {
+		_receiveCallback(this, _formatter.From(message));
+	}
+
+	public void Close(string reason = null) {
+		_connection.Close(reason);
+	}
+}
diff --git a/src/KurrentDB.UI/KurrentDB.UI.csproj b/src/KurrentDB.UI/KurrentDB.UI.csproj
new file mode 100644
index 00000000000..e8b5b0d8d0e
--- /dev/null
+++ b/src/KurrentDB.UI/KurrentDB.UI.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
+		<StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.13"/>
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.13" PrivateAssets="all"/>
+		<PackageReference Include="Extensions.MudBlazor.StaticInput" Version="3.2.0"/>
+		<PackageReference Include="MudBlazor" Version="8.3.0"/>
+	</ItemGroup>
+</Project>
diff --git a/src/KurrentDB.UI/Layout/MainLayout.razor b/src/KurrentDB.UI/Layout/MainLayout.razor
new file mode 100644
index 00000000000..bce4d7bb353
--- /dev/null
+++ b/src/KurrentDB.UI/Layout/MainLayout.razor
@@ -0,0 +1,126 @@
+@* Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements. *@
+@* Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md). *@
+@inherits LayoutComponentBase
+
+<MudThemeProvider @ref="@_mudThemeProvider" Theme="@_theme" IsDarkMode="_darkMode"/>
+<MudLayout>
+	<MudAppBar Elevation="1">
+		<MudStaticNavDrawerToggle DrawerId="nav-drawer" Icon="@Icons.Material.Filled.Menu" Color="Color.Inherit" Edge="Edge.Start" />
+		<img alt="Kurrent logo" src="@(_darkMode ? "logo_white.svg" : "logo_plum.svg")" height="32"/>
+		@* <MudText Typo="Typo.h5" Class="ml-3">KurrentDB @VersionInfo.Version</MudText> *@
+		<MudText Typo="Typo.h5" Class="ml-3">KurrentDB</MudText>
+		<MudSpacer/>
+		<AuthorizeView>
+			<Authorized>
+				<MudIconButton Icon="@(Icons.Material.Filled.Logout)" Color="Color.Inherit" Href="/ui/logout"/>
+			</Authorized>
+		</AuthorizeView>
+		@* <MudIconButton Icon="@(DarkLightModeButtonIcon)" Color="Color.Inherit" OnClick="@DarkModeToggle"/> *@
+	</MudAppBar>
+	<MudDrawer id="nav-drawer" @bind-Open="_drawerOpen" Elevation="1" Variant="@DrawerVariant.Responsive" Breakpoint="@Breakpoint.Md" ClipMode="DrawerClipMode.Always">
+		<NavMenu/>
+	</MudDrawer>
+	<MudMainContent Class="mt-16 pa-4">
+		@Body
+	</MudMainContent>
+</MudLayout>
+
+<div id="blazor-error-ui">
+	An unhandled error has occurred.
+	<a href="" class="reload">Reload</a>
+	<a class="dismiss">🗙</a>
+</div>
+
+@code {
+	bool _drawerOpen = true;
+	bool _darkMode = true;
+	MudTheme _theme = null!;
+
+	[Inject] private NavigationManager NavigationManager { get; set; } = null!;
+
+	// protected override async Task OnAfterRenderAsync(bool firstRender) {
+	// 	if (!firstRender) return;
+	//
+	// 	Preferences.SetTheme(await _mudThemeProvider.GetSystemPreference());
+	// 	StateHasChanged();
+	// }
+
+	protected override void OnInitialized() {
+		base.OnInitialized();
+
+		_theme = new() {
+			PaletteLight = _lightPalette,
+			PaletteDark = _darkPalette,
+			LayoutProperties = new(),
+			Typography = new() {
+				Default = new DefaultTypography {
+					FontFamily = [
+						"Solina",
+						"-apple-system",
+						"BlinkMacSystemFont",
+						"Segoe UI",
+						"Roboto",
+						"Helvetica Neue",
+						"Arial",
+						"Noto Sans",
+						"STHeiti",
+						"Microsoft YaHei",
+						"SimSun", "sans - serif", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"
+					]
+				},
+			}
+		};
+	}
+
+	// Remove it until we figure out how to make SSR work with dynamic actions
+	// private void DarkModeToggle() {
+	// 	Preferences.ToggleTheme();
+	// }
+
+	private readonly PaletteLight _lightPalette = new() {
+		Black = "#110e2d",
+		AppbarText = "#424242",
+		AppbarBackground = "rgba(255,255,255,0.8)",
+		DrawerBackground = "#ffffff",
+		GrayLight = "#e8e8e8",
+		GrayLighter = "#f9f9f9",
+	};
+
+	private readonly PaletteDark _darkPalette = new() {
+		Primary = "#ded9ff",
+		Secondary = "#631b3a",
+		Surface = "#1e1e2d",
+		Background = "#000",
+		BackgroundGray = "#151521",
+		AppbarText = "#9FBBC5",
+		AppbarBackground = "#000000",
+		DrawerBackground = "#000000",
+		ActionDefault = "#74718e",
+		ActionDisabled = "#9999994d",
+		ActionDisabledBackground = "#605f6d4d",
+		TextPrimary = "#9FBBC5",
+		TextSecondary = "#92929f",
+		TextDisabled = "#ffffff33",
+		DrawerIcon = "#9FBBC5",
+		DrawerText = "#9FBBC5",
+		GrayLight = "#2a2833",
+		GrayLighter = "#1e1e2d",
+		Info = "#4a86ff",
+		Success = "#3dcb6c",
+		Warning = "#ffb545",
+		Error = "#ff3f5f",
+		LinesDefault = "#33323e",
+		TableLines = "#33323e",
+		Divider = "#292838",
+		OverlayLight = "#1e1e2d80",
+	};
+
+	MudThemeProvider _mudThemeProvider = null!;
+
+	// string DarkLightModeButtonIcon => Preferences.DarkMode switch {
+	// 	true => Icons.Material.Rounded.AutoMode,
+	// 	false => Icons.Material.Outlined.DarkMode,
+	// };
+}
+
+
diff --git a/src/KurrentDB.UI/Layout/NavMenu.razor b/src/KurrentDB.UI/Layout/NavMenu.razor
new file mode 100644
index 00000000000..5437c07ebe4
--- /dev/null
+++ b/src/KurrentDB.UI/Layout/NavMenu.razor
@@ -0,0 +1,11 @@
+@* Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements. *@
+@* Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md). *@
+
+<MudNavMenu>
+	<MudNavLink Href="/ui/cluster" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.Thermostat">Status</MudNavLink>
+	<MudNavLink Href="/ui/logs" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.ManageSearch">Logs</MudNavLink>
+	<MudNavLink Href="/ui/config" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.Settings">Config</MudNavLink>
+	<MudNavLink Href="/ui/license" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.Verified">License</MudNavLink>
+	<MudNavLink Href="/ui/navigator" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.Stream">Navigator</MudNavLink>
+	<MudNavLink Href="/web" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.Code">Legacy UI</MudNavLink>
+</MudNavMenu>
diff --git a/src/KurrentDB.UI/Program.cs b/src/KurrentDB.UI/Program.cs
new file mode 100644
index 00000000000..1d98d0d6d15
--- /dev/null
+++ b/src/KurrentDB.UI/Program.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using KurrentDB.UI.Services;
+using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using MudBlazor.Services;
+
+var builder = WebAssemblyHostBuilder.CreateDefault(args);
+builder.Services.AddMudServices();
+builder.Services.AddAuthorizationCore();
+builder.Services.AddCascadingAuthenticationState();
+builder.Services.AddSingleton<AuthenticationStateProvider, PersistentAuthenticationStateProvider>();
+
+await builder.Build().RunAsync();
diff --git a/src/KurrentDB.UI/RedirectToLogin.razor b/src/KurrentDB.UI/RedirectToLogin.razor
new file mode 100644
index 00000000000..914ded40858
--- /dev/null
+++ b/src/KurrentDB.UI/RedirectToLogin.razor
@@ -0,0 +1,10 @@
+@* Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements. *@
+@* Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md). *@
+
+@inject NavigationManager NavigationManager
+
+@code {
+	protected override void OnInitialized() {
+		NavigationManager.NavigateTo($"ui/login?returnUrl={Uri.EscapeDataString(NavigationManager.Uri)}", forceLoad: true);
+	}
+}
diff --git a/src/KurrentDB.UI/Routes.razor b/src/KurrentDB.UI/Routes.razor
new file mode 100644
index 00000000000..263c8ceed56
--- /dev/null
+++ b/src/KurrentDB.UI/Routes.razor
@@ -0,0 +1,13 @@
+@* Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements. *@
+@* Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md). *@
+
+<Router AppAssembly="typeof(Program).Assembly">
+	<Found Context="routeData">
+		<AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(MainLayout)">
+			<NotAuthorized>
+				<RedirectToLogin/>
+			</NotAuthorized>
+		</AuthorizeRouteView>
+		<FocusOnNavigate RouteData="routeData" Selector="h1"/>
+	</Found>
+</Router>
diff --git a/src/KurrentDB.UI/Services/PersistentAuthenticationStateProvider.cs b/src/KurrentDB.UI/Services/PersistentAuthenticationStateProvider.cs
new file mode 100644
index 00000000000..7eb31be7b86
--- /dev/null
+++ b/src/KurrentDB.UI/Services/PersistentAuthenticationStateProvider.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Claims;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Authorization;
+
+namespace KurrentDB.UI.Services;
+
+class PersistentAuthenticationStateProvider : AuthenticationStateProvider {
+	static readonly Task<AuthenticationState> DefaultUnauthenticatedTask = Task.FromResult(new AuthenticationState(new(new ClaimsIdentity())));
+
+	readonly Task<AuthenticationState> _authenticationStateTask = DefaultUnauthenticatedTask;
+
+	public PersistentAuthenticationStateProvider(PersistentComponentState state) {
+		if (!state.TryTakeFromJson<UserInfo>(nameof(UserInfo), out var userInfo) || userInfo is null) {
+			return;
+		}
+
+		Claim[] claims = [new(ClaimTypes.NameIdentifier, userInfo.UserId), new(ClaimTypes.Name, userInfo.UserId)];
+
+		_authenticationStateTask = Task.FromResult(new AuthenticationState(new(new ClaimsIdentity(claims, authenticationType: nameof(PersistentAuthenticationStateProvider)))));
+	}
+
+	public override Task<AuthenticationState> GetAuthenticationStateAsync() => _authenticationStateTask;
+}
diff --git a/src/KurrentDB.UI/Services/Preferences.cs b/src/KurrentDB.UI/Services/Preferences.cs
new file mode 100644
index 00000000000..33ceeead9dc
--- /dev/null
+++ b/src/KurrentDB.UI/Services/Preferences.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.UI.Services;
+
+public class Preferences {
+	public void ToggleTheme() => SetTheme(!DarkMode);
+
+	public void SetTheme(bool darkMode) {
+		DarkMode = darkMode;
+		ThemeChanged?.Invoke(this, EventArgs.Empty);
+	}
+
+	public bool DarkMode { get; private set; } = true;
+
+	public event EventHandler? ThemeChanged;
+}
diff --git a/src/KurrentDB.UI/Services/UserInfo.cs b/src/KurrentDB.UI/Services/UserInfo.cs
new file mode 100644
index 00000000000..1178dc34dbf
--- /dev/null
+++ b/src/KurrentDB.UI/Services/UserInfo.cs
@@ -0,0 +1,8 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+namespace KurrentDB.UI.Services;
+
+public class UserInfo {
+	public required string UserId { get; set; }
+}
diff --git a/src/KurrentDB.UI/_Imports.razor b/src/KurrentDB.UI/_Imports.razor
new file mode 100644
index 00000000000..7c5ec31f643
--- /dev/null
+++ b/src/KurrentDB.UI/_Imports.razor
@@ -0,0 +1,14 @@
+@using System.Net.Http
+@using System.Net.Http.Json
+@using Microsoft.AspNetCore.Components.Authorization
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Web.Virtualization
+@using static Microsoft.AspNetCore.Components.Web.RenderMode
+@using Microsoft.JSInterop
+@using MudBlazor.StaticInput
+@using MudBlazor
+@using MudBlazor.Services
+@using KurrentDB.UI
+@using KurrentDB.UI.Layout
diff --git a/src/KurrentDB.UI/wwwroot/appsettings.json b/src/KurrentDB.UI/wwwroot/appsettings.json
new file mode 100644
index 00000000000..0c208ae9181
--- /dev/null
+++ b/src/KurrentDB.UI/wwwroot/appsettings.json
@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}
diff --git a/src/KurrentDB.sln b/src/KurrentDB.sln
new file mode 100644
index 00000000000..81f9a7e13f3
--- /dev/null
+++ b/src/KurrentDB.sln
@@ -0,0 +1,817 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32929.385
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.BufferManagement", "KurrentDB.BufferManagement\KurrentDB.BufferManagement.csproj", "{C7B79854-21DB-48A9-89E3-136404F13DF5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.BufferManagement.Tests", "KurrentDB.BufferManagement.Tests\KurrentDB.BufferManagement.Tests.csproj", "{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.Projections.Core.Tests", "KurrentDB.Projections.Core.Tests\KurrentDB.Projections.Core.Tests.csproj", "{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.ClusterNode.Web", "KurrentDB.ClusterNode.Web\KurrentDB.ClusterNode.Web.csproj", "{401862D3-E12F-470C-9137-B9DE10591AC6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.Common", "KurrentDB.Common\KurrentDB.Common.csproj", "{3F955137-DC23-4AC1-B7F8-6D0857234CCB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.Core.Tests", "KurrentDB.Core.Tests\KurrentDB.Core.Tests.csproj", "{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.Projections.Core", "KurrentDB.Projections.Core\KurrentDB.Projections.Core.csproj", "{800E7456-4BC4-49B5-940F-1D634B687C6E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.TestClient", "KurrentDB.TestClient\KurrentDB.TestClient.csproj", "{68011903-5E41-41E2-891B-2C0B3B13C189}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.Transport.Http", "KurrentDB.Transport.Http\KurrentDB.Transport.Http.csproj", "{EB8587FE-7805-4306-AD50-EBE45AB0A189}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.Core", "KurrentDB.Core\KurrentDB.Core.csproj", "{9957CA10-8A8A-419F-92BD-7A8BE3014345}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.Transport.Tcp", "KurrentDB.Transport.Tcp\KurrentDB.Transport.Tcp.csproj", "{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB", "KurrentDB\KurrentDB.csproj", "{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.Native", "KurrentDB.Native\KurrentDB.Native.csproj", "{03FA0763-6D41-44C0-911D-662AE2B10084}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A19631BB-65CF-4726-8732-4EFD977E9B32}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		..\.github\CODEOWNERS = ..\.github\CODEOWNERS
+		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
+		..\Dockerfile = ..\Dockerfile
+		..\qodana.yaml = ..\qodana.yaml
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.NETCore.Compatibility", "KurrentDB.NETCore.Compatibility\KurrentDB.NETCore.Compatibility.csproj", "{066B6514-86A0-41D8-BB6A-D9B05141D026}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.LogV3", "KurrentDB.LogV3\KurrentDB.LogV3.csproj", "{0A8829D0-0A6F-43A5-ACD4-970690296C52}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.LogV3.Tests", "KurrentDB.LogV3.Tests\KurrentDB.LogV3.Tests.csproj", "{97EDD08B-0E2F-4445-A4CA-36285954BBDC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.LogCommon", "KurrentDB.LogCommon\KurrentDB.LogCommon.csproj", "{B1185D46-45AE-49DD-99BF-602B9359BACF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.Core.XUnit.Tests", "KurrentDB.Core.XUnit.Tests\KurrentDB.Core.XUnit.Tests.csproj", "{101DD668-2140-4183-8C97-F641173AF736}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.Projections.Core.Javascript.Tests", "KurrentDB.Projections.Core.Javascript.Tests\KurrentDB.Projections.Core.Javascript.Tests.csproj", "{1826D544-16E6-460F-A8F2-1D56B5041AE7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.MicroBenchmarks", "KurrentDB.MicroBenchmarks\KurrentDB.MicroBenchmarks.csproj", "{87F81751-192B-4263-A658-6DFC51EA557C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.SourceGenerators", "KurrentDB.SourceGenerators\KurrentDB.SourceGenerators.csproj", "{24BA3208-F690-4DD4-AECB-E339DEE0C69E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.SourceGenerators.Tests", "KurrentDB.SourceGenerators.Tests\KurrentDB.SourceGenerators.Tests.csproj", "{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.Common.Tests", "KurrentDB.Common.Tests\KurrentDB.Common.Tests.csproj", "{58219323-BD46-4F67-A83A-410F56F84EE3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.PluginHosting", "KurrentDB.PluginHosting\KurrentDB.PluginHosting.csproj", "{8B021F57-D4B1-47D6-85AA-DE2D20486840}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.SystemRuntime", "KurrentDB.SystemRuntime\KurrentDB.SystemRuntime.csproj", "{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.Projections.Core.XUnit.Tests", "KurrentDB.Projections.Core.XUnit.Tests\KurrentDB.Projections.Core.XUnit.Tests.csproj", "{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.Licensing", "KurrentDB.Licensing\KurrentDB.Licensing.csproj", "{6178EDA1-DBC7-4A15-86E7-BF2B8F6681D2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.Licensing.Tests", "KurrentDB.Licensing.Tests\KurrentDB.Licensing.Tests.csproj", "{414B49B4-D789-4832-B257-B1F344D57C32}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KurrentDB.SystemRuntime.Tests", "KurrentDB.SystemRuntime.Tests\KurrentDB.SystemRuntime.Tests.csproj", "{D6FD1EBC-53E8-442C-8E5B-815F6B527B07}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{CB56B2BD-5ABA-49C7-BD57-21B9CD5C3205}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.OtlpExporterPlugin.Tests", "KurrentDB.OtlpExporterPlugin.Tests\KurrentDB.OtlpExporterPlugin.Tests.csproj", "{8E183DF4-F8E5-4421-AECC-B54CBA7BF138}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.OtlpExporterPlugin", "KurrentDB.OtlpExporterPlugin\KurrentDB.OtlpExporterPlugin.csproj", "{D180755E-8D2A-462F-9E67-55ED985D2465}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.Plugins.TestHelpers", "KurrentDB.Plugins.TestHelpers\KurrentDB.Plugins.TestHelpers.csproj", "{A93A3CAF-C3ED-4CC8-84E3-7F2641405837}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.Auth.Ldaps", "KurrentDB.Auth.Ldaps\KurrentDB.Auth.Ldaps.csproj", "{674714F6-247F-4C0F-AD59-E25AFE1145F6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.Auth.Ldaps.Tests", "KurrentDB.Auth.Ldaps.Tests\KurrentDB.Auth.Ldaps.Tests.csproj", "{BE4C3C46-D39C-4F8D-B85F-93B8656EABEA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled", "KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled\KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled.csproj", "{62748E08-EAC6-4796-A900-6879CE1CFD15}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled.Tests", "KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled.Tests\KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled.Tests.csproj", "{609FAD32-F476-4F4F-9CE7-694EECB23B34}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.Auth.OAuth", "KurrentDB.Auth.OAuth\KurrentDB.Auth.OAuth.csproj", "{72106D64-1BBD-4998-B19C-07244CBA2961}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.Auth.OAuth.Tests", "KurrentDB.Auth.OAuth.Tests\KurrentDB.Auth.OAuth.Tests.csproj", "{E75E364B-C6F4-4EA1-AB70-F16D44CA2C43}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.Auth.UserCertificates", "KurrentDB.Auth.UserCertificates\KurrentDB.Auth.UserCertificates.csproj", "{5C9FA440-04EC-42AB-935D-77B635156CAB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.Auth.UserCertificates.Tests", "KurrentDB.Auth.UserCertificates.Tests\KurrentDB.Auth.UserCertificates.Tests.csproj", "{3D693070-6D3D-4703-8998-662D81D154F4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.Diagnostics.LogsEndpointPlugin", "KurrentDB.Diagnostics.LogsEndpointPlugin\KurrentDB.Diagnostics.LogsEndpointPlugin.csproj", "{5934B795-F37F-4AF1-B8AE-4995880902C8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.Diagnostics.LogsEndpointPlugin.Tests", "KurrentDB.Diagnostics.LogsEndpointPlugin.Tests\KurrentDB.Diagnostics.LogsEndpointPlugin.Tests.csproj", "{075374EB-BAE0-4068-A4A8-DAA3E8B21D2F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.Security.EncryptionAtRest", "KurrentDB.Security.EncryptionAtRest\KurrentDB.Security.EncryptionAtRest.csproj", "{AD062E9D-BA0E-4811-B58D-1BAFC86A023D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.Security.EncryptionAtRest.Tests", "KurrentDB.Security.EncryptionAtRest.Tests\KurrentDB.Security.EncryptionAtRest.Tests.csproj", "{B5129263-F7A0-4E1F-A916-20B1B93FA707}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.POC.IO.Core", "KurrentDB.POC.IO.Core\KurrentDB.POC.IO.Core.csproj", "{0D5FE925-39F2-4E59-AE15-C0C15DE907B4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.POC.ConnectedSubsystemsPlugin", "KurrentDB.POC.ConnectedSubsystemsPlugin\KurrentDB.POC.ConnectedSubsystemsPlugin.csproj", "{F6093B93-A18B-42DA-9D37-D54BDBCB31B4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.AutoScavenge", "KurrentDB.AutoScavenge\KurrentDB.AutoScavenge.csproj", "{84A20321-B8F9-4568-B3B5-8E4895BC6E6C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.AutoScavenge.Tests", "KurrentDB.AutoScavenge.Tests\KurrentDB.AutoScavenge.Tests.csproj", "{A3CCCE65-38B3-4987-999D-1ADD6EB0FA36}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.Auth.StreamPolicyPlugin", "KurrentDB.Auth.StreamPolicyPlugin\KurrentDB.Auth.StreamPolicyPlugin.csproj", "{2D48AB5B-5C16-4E8F-9F7B-A35D034DCA8E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.Auth.StreamPolicyPlugin.Tests", "KurrentDB.Auth.StreamPolicyPlugin.Tests\KurrentDB.Auth.StreamPolicyPlugin.Tests.csproj", "{E130C6E8-7CDE-4D60-AA33-A366D5D63C5C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.TcpPlugin", "KurrentDB.TcpPlugin\KurrentDB.TcpPlugin.csproj", "{C548296F-C21A-413B-9CBC-1877F50940DC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.TcpPlugin.Tests", "KurrentDB.TcpPlugin.Tests\KurrentDB.TcpPlugin.Tests.csproj", "{7D9F393E-3E64-450D-9DA5-6C61CDC508F0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{C60E0774-AB19-49D0-AAB4-D804E5EF1C3F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Auth", "Auth", "{830D29DF-0648-46A7-9E51-412217E434A8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KurrentDB.UI", "KurrentDB.UI\KurrentDB.UI.csproj", "{B375CE7A-AF32-4A62-9443-B21100C1227B}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM64 = Debug|ARM64
+		Debug|x64 = Debug|x64
+		Release|Any CPU = Release|Any CPU
+		Release|ARM64 = Release|ARM64
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Debug|ARM64.Build.0 = Debug|ARM64
+		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Debug|x64.ActiveCfg = Debug|x64
+		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Debug|x64.Build.0 = Debug|x64
+		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Release|ARM64.ActiveCfg = Release|ARM64
+		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Release|ARM64.Build.0 = Release|ARM64
+		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Release|x64.ActiveCfg = Release|x64
+		{C7B79854-21DB-48A9-89E3-136404F13DF5}.Release|x64.Build.0 = Release|x64
+		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Debug|ARM64.Build.0 = Debug|ARM64
+		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Debug|x64.ActiveCfg = Debug|x64
+		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Debug|x64.Build.0 = Debug|x64
+		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Release|ARM64.ActiveCfg = Release|ARM64
+		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Release|ARM64.Build.0 = Release|ARM64
+		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Release|x64.ActiveCfg = Release|x64
+		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD}.Release|x64.Build.0 = Release|x64
+		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Debug|ARM64.Build.0 = Debug|ARM64
+		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Debug|x64.ActiveCfg = Debug|x64
+		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Debug|x64.Build.0 = Debug|x64
+		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Release|ARM64.ActiveCfg = Release|ARM64
+		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Release|ARM64.Build.0 = Release|ARM64
+		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Release|x64.ActiveCfg = Release|x64
+		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187}.Release|x64.Build.0 = Release|x64
+		{401862D3-E12F-470C-9137-B9DE10591AC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{401862D3-E12F-470C-9137-B9DE10591AC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{401862D3-E12F-470C-9137-B9DE10591AC6}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{401862D3-E12F-470C-9137-B9DE10591AC6}.Debug|ARM64.Build.0 = Debug|ARM64
+		{401862D3-E12F-470C-9137-B9DE10591AC6}.Debug|x64.ActiveCfg = Debug|x64
+		{401862D3-E12F-470C-9137-B9DE10591AC6}.Debug|x64.Build.0 = Debug|x64
+		{401862D3-E12F-470C-9137-B9DE10591AC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{401862D3-E12F-470C-9137-B9DE10591AC6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{401862D3-E12F-470C-9137-B9DE10591AC6}.Release|ARM64.ActiveCfg = Release|ARM64
+		{401862D3-E12F-470C-9137-B9DE10591AC6}.Release|ARM64.Build.0 = Release|ARM64
+		{401862D3-E12F-470C-9137-B9DE10591AC6}.Release|x64.ActiveCfg = Release|x64
+		{401862D3-E12F-470C-9137-B9DE10591AC6}.Release|x64.Build.0 = Release|x64
+		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Debug|ARM64.Build.0 = Debug|ARM64
+		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Debug|x64.ActiveCfg = Debug|x64
+		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Debug|x64.Build.0 = Debug|x64
+		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Release|ARM64.ActiveCfg = Release|ARM64
+		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Release|ARM64.Build.0 = Release|ARM64
+		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Release|x64.ActiveCfg = Release|x64
+		{3F955137-DC23-4AC1-B7F8-6D0857234CCB}.Release|x64.Build.0 = Release|x64
+		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Debug|ARM64.Build.0 = Debug|ARM64
+		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Debug|x64.ActiveCfg = Debug|x64
+		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Debug|x64.Build.0 = Debug|x64
+		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Release|ARM64.ActiveCfg = Release|ARM64
+		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Release|ARM64.Build.0 = Release|ARM64
+		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Release|x64.ActiveCfg = Release|x64
+		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134}.Release|x64.Build.0 = Release|x64
+		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Debug|ARM64.Build.0 = Debug|ARM64
+		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Debug|x64.ActiveCfg = Debug|x64
+		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Debug|x64.Build.0 = Debug|x64
+		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Release|ARM64.ActiveCfg = Release|ARM64
+		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Release|ARM64.Build.0 = Release|ARM64
+		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Release|x64.ActiveCfg = Release|x64
+		{800E7456-4BC4-49B5-940F-1D634B687C6E}.Release|x64.Build.0 = Release|x64
+		{68011903-5E41-41E2-891B-2C0B3B13C189}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{68011903-5E41-41E2-891B-2C0B3B13C189}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{68011903-5E41-41E2-891B-2C0B3B13C189}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{68011903-5E41-41E2-891B-2C0B3B13C189}.Debug|ARM64.Build.0 = Debug|ARM64
+		{68011903-5E41-41E2-891B-2C0B3B13C189}.Debug|x64.ActiveCfg = Debug|x64
+		{68011903-5E41-41E2-891B-2C0B3B13C189}.Debug|x64.Build.0 = Debug|x64
+		{68011903-5E41-41E2-891B-2C0B3B13C189}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{68011903-5E41-41E2-891B-2C0B3B13C189}.Release|Any CPU.Build.0 = Release|Any CPU
+		{68011903-5E41-41E2-891B-2C0B3B13C189}.Release|ARM64.ActiveCfg = Release|ARM64
+		{68011903-5E41-41E2-891B-2C0B3B13C189}.Release|ARM64.Build.0 = Release|ARM64
+		{68011903-5E41-41E2-891B-2C0B3B13C189}.Release|x64.ActiveCfg = Release|x64
+		{68011903-5E41-41E2-891B-2C0B3B13C189}.Release|x64.Build.0 = Release|x64
+		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Debug|ARM64.Build.0 = Debug|ARM64
+		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Debug|x64.ActiveCfg = Debug|x64
+		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Debug|x64.Build.0 = Debug|x64
+		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Release|ARM64.ActiveCfg = Release|ARM64
+		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Release|ARM64.Build.0 = Release|ARM64
+		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Release|x64.ActiveCfg = Release|x64
+		{EB8587FE-7805-4306-AD50-EBE45AB0A189}.Release|x64.Build.0 = Release|x64
+		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Debug|ARM64.Build.0 = Debug|ARM64
+		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Debug|x64.ActiveCfg = Debug|x64
+		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Debug|x64.Build.0 = Debug|x64
+		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Release|ARM64.ActiveCfg = Release|ARM64
+		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Release|ARM64.Build.0 = Release|ARM64
+		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Release|x64.ActiveCfg = Release|x64
+		{9957CA10-8A8A-419F-92BD-7A8BE3014345}.Release|x64.Build.0 = Release|x64
+		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Debug|ARM64.Build.0 = Debug|ARM64
+		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Debug|x64.ActiveCfg = Debug|x64
+		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Debug|x64.Build.0 = Debug|x64
+		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Release|ARM64.ActiveCfg = Release|ARM64
+		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Release|ARM64.Build.0 = Release|ARM64
+		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Release|x64.ActiveCfg = Release|x64
+		{DCAD0184-4AFE-49EA-BE31-5D68CA4B59CA}.Release|x64.Build.0 = Release|x64
+		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Debug|ARM64.Build.0 = Debug|ARM64
+		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Debug|x64.ActiveCfg = Debug|x64
+		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Debug|x64.Build.0 = Debug|x64
+		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Release|ARM64.ActiveCfg = Release|ARM64
+		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Release|ARM64.Build.0 = Release|ARM64
+		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Release|x64.ActiveCfg = Release|x64
+		{FDFCE363-84A4-4A6F-B97C-D9F57D8D124F}.Release|x64.Build.0 = Release|x64
+		{03FA0763-6D41-44C0-911D-662AE2B10084}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03FA0763-6D41-44C0-911D-662AE2B10084}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03FA0763-6D41-44C0-911D-662AE2B10084}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{03FA0763-6D41-44C0-911D-662AE2B10084}.Debug|ARM64.Build.0 = Debug|ARM64
+		{03FA0763-6D41-44C0-911D-662AE2B10084}.Debug|x64.ActiveCfg = Debug|x64
+		{03FA0763-6D41-44C0-911D-662AE2B10084}.Debug|x64.Build.0 = Debug|x64
+		{03FA0763-6D41-44C0-911D-662AE2B10084}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03FA0763-6D41-44C0-911D-662AE2B10084}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03FA0763-6D41-44C0-911D-662AE2B10084}.Release|ARM64.ActiveCfg = Release|ARM64
+		{03FA0763-6D41-44C0-911D-662AE2B10084}.Release|ARM64.Build.0 = Release|ARM64
+		{03FA0763-6D41-44C0-911D-662AE2B10084}.Release|x64.ActiveCfg = Release|x64
+		{03FA0763-6D41-44C0-911D-662AE2B10084}.Release|x64.Build.0 = Release|x64
+		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Debug|ARM64.Build.0 = Debug|ARM64
+		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Debug|x64.ActiveCfg = Debug|x64
+		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Debug|x64.Build.0 = Debug|x64
+		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Release|Any CPU.Build.0 = Release|Any CPU
+		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Release|ARM64.ActiveCfg = Release|ARM64
+		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Release|ARM64.Build.0 = Release|ARM64
+		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Release|x64.ActiveCfg = Release|x64
+		{066B6514-86A0-41D8-BB6A-D9B05141D026}.Release|x64.Build.0 = Release|x64
+		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Debug|ARM64.Build.0 = Debug|ARM64
+		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Debug|x64.ActiveCfg = Debug|x64
+		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Debug|x64.Build.0 = Debug|x64
+		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Release|ARM64.ActiveCfg = Release|ARM64
+		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Release|ARM64.Build.0 = Release|ARM64
+		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Release|x64.ActiveCfg = Release|x64
+		{0A8829D0-0A6F-43A5-ACD4-970690296C52}.Release|x64.Build.0 = Release|x64
+		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Debug|ARM64.Build.0 = Debug|ARM64
+		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Debug|x64.ActiveCfg = Debug|x64
+		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Debug|x64.Build.0 = Debug|x64
+		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Release|ARM64.ActiveCfg = Release|ARM64
+		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Release|ARM64.Build.0 = Release|ARM64
+		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Release|x64.ActiveCfg = Release|x64
+		{97EDD08B-0E2F-4445-A4CA-36285954BBDC}.Release|x64.Build.0 = Release|x64
+		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Debug|ARM64.Build.0 = Debug|ARM64
+		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Debug|x64.ActiveCfg = Debug|x64
+		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Debug|x64.Build.0 = Debug|x64
+		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Release|ARM64.ActiveCfg = Release|ARM64
+		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Release|ARM64.Build.0 = Release|ARM64
+		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Release|x64.ActiveCfg = Release|x64
+		{B1185D46-45AE-49DD-99BF-602B9359BACF}.Release|x64.Build.0 = Release|x64
+		{101DD668-2140-4183-8C97-F641173AF736}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{101DD668-2140-4183-8C97-F641173AF736}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{101DD668-2140-4183-8C97-F641173AF736}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{101DD668-2140-4183-8C97-F641173AF736}.Debug|ARM64.Build.0 = Debug|ARM64
+		{101DD668-2140-4183-8C97-F641173AF736}.Debug|x64.ActiveCfg = Debug|x64
+		{101DD668-2140-4183-8C97-F641173AF736}.Debug|x64.Build.0 = Debug|x64
+		{101DD668-2140-4183-8C97-F641173AF736}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{101DD668-2140-4183-8C97-F641173AF736}.Release|Any CPU.Build.0 = Release|Any CPU
+		{101DD668-2140-4183-8C97-F641173AF736}.Release|ARM64.ActiveCfg = Release|ARM64
+		{101DD668-2140-4183-8C97-F641173AF736}.Release|ARM64.Build.0 = Release|ARM64
+		{101DD668-2140-4183-8C97-F641173AF736}.Release|x64.ActiveCfg = Release|x64
+		{101DD668-2140-4183-8C97-F641173AF736}.Release|x64.Build.0 = Release|x64
+		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Debug|ARM64.Build.0 = Debug|ARM64
+		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Debug|x64.ActiveCfg = Debug|x64
+		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Debug|x64.Build.0 = Debug|x64
+		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Release|ARM64.ActiveCfg = Release|ARM64
+		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Release|ARM64.Build.0 = Release|ARM64
+		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Release|x64.ActiveCfg = Release|x64
+		{1826D544-16E6-460F-A8F2-1D56B5041AE7}.Release|x64.Build.0 = Release|x64
+		{87F81751-192B-4263-A658-6DFC51EA557C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87F81751-192B-4263-A658-6DFC51EA557C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87F81751-192B-4263-A658-6DFC51EA557C}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{87F81751-192B-4263-A658-6DFC51EA557C}.Debug|ARM64.Build.0 = Debug|ARM64
+		{87F81751-192B-4263-A658-6DFC51EA557C}.Debug|x64.ActiveCfg = Debug|x64
+		{87F81751-192B-4263-A658-6DFC51EA557C}.Debug|x64.Build.0 = Debug|x64
+		{87F81751-192B-4263-A658-6DFC51EA557C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{87F81751-192B-4263-A658-6DFC51EA557C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{87F81751-192B-4263-A658-6DFC51EA557C}.Release|ARM64.ActiveCfg = Release|ARM64
+		{87F81751-192B-4263-A658-6DFC51EA557C}.Release|ARM64.Build.0 = Release|ARM64
+		{87F81751-192B-4263-A658-6DFC51EA557C}.Release|x64.ActiveCfg = Release|x64
+		{87F81751-192B-4263-A658-6DFC51EA557C}.Release|x64.Build.0 = Release|x64
+		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Debug|ARM64.Build.0 = Debug|ARM64
+		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Debug|x64.ActiveCfg = Debug|x64
+		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Debug|x64.Build.0 = Debug|x64
+		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Release|ARM64.ActiveCfg = Release|ARM64
+		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Release|ARM64.Build.0 = Release|ARM64
+		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Release|x64.ActiveCfg = Release|x64
+		{24BA3208-F690-4DD4-AECB-E339DEE0C69E}.Release|x64.Build.0 = Release|x64
+		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Debug|ARM64.Build.0 = Debug|ARM64
+		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Debug|x64.ActiveCfg = Debug|x64
+		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Debug|x64.Build.0 = Debug|x64
+		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Release|ARM64.ActiveCfg = Release|ARM64
+		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Release|ARM64.Build.0 = Release|ARM64
+		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Release|x64.ActiveCfg = Release|x64
+		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522}.Release|x64.Build.0 = Release|x64
+		{58219323-BD46-4F67-A83A-410F56F84EE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58219323-BD46-4F67-A83A-410F56F84EE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58219323-BD46-4F67-A83A-410F56F84EE3}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{58219323-BD46-4F67-A83A-410F56F84EE3}.Debug|ARM64.Build.0 = Debug|ARM64
+		{58219323-BD46-4F67-A83A-410F56F84EE3}.Debug|x64.ActiveCfg = Debug|x64
+		{58219323-BD46-4F67-A83A-410F56F84EE3}.Debug|x64.Build.0 = Debug|x64
+		{58219323-BD46-4F67-A83A-410F56F84EE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{58219323-BD46-4F67-A83A-410F56F84EE3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{58219323-BD46-4F67-A83A-410F56F84EE3}.Release|ARM64.ActiveCfg = Release|ARM64
+		{58219323-BD46-4F67-A83A-410F56F84EE3}.Release|ARM64.Build.0 = Release|ARM64
+		{58219323-BD46-4F67-A83A-410F56F84EE3}.Release|x64.ActiveCfg = Release|x64
+		{58219323-BD46-4F67-A83A-410F56F84EE3}.Release|x64.Build.0 = Release|x64
+		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Debug|ARM64.Build.0 = Debug|ARM64
+		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Debug|x64.ActiveCfg = Debug|x64
+		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Debug|x64.Build.0 = Debug|x64
+		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Release|ARM64.ActiveCfg = Release|ARM64
+		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Release|ARM64.Build.0 = Release|ARM64
+		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Release|x64.ActiveCfg = Release|x64
+		{8B021F57-D4B1-47D6-85AA-DE2D20486840}.Release|x64.Build.0 = Release|x64
+		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Debug|ARM64.Build.0 = Debug|ARM64
+		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Debug|x64.ActiveCfg = Debug|x64
+		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Debug|x64.Build.0 = Debug|x64
+		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Release|ARM64.ActiveCfg = Release|ARM64
+		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Release|ARM64.Build.0 = Release|ARM64
+		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Release|x64.ActiveCfg = Release|x64
+		{8A023103-C4C8-4ECA-A78C-2D1BCF7A7BDB}.Release|x64.Build.0 = Release|x64
+		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Debug|ARM64.Build.0 = Debug|ARM64
+		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Debug|x64.ActiveCfg = Debug|x64
+		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Debug|x64.Build.0 = Debug|x64
+		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Release|ARM64.ActiveCfg = Release|ARM64
+		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Release|ARM64.Build.0 = Release|ARM64
+		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Release|x64.ActiveCfg = Release|x64
+		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5}.Release|x64.Build.0 = Release|x64
+		{6178EDA1-DBC7-4A15-86E7-BF2B8F6681D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6178EDA1-DBC7-4A15-86E7-BF2B8F6681D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6178EDA1-DBC7-4A15-86E7-BF2B8F6681D2}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{6178EDA1-DBC7-4A15-86E7-BF2B8F6681D2}.Debug|ARM64.Build.0 = Debug|ARM64
+		{6178EDA1-DBC7-4A15-86E7-BF2B8F6681D2}.Debug|x64.ActiveCfg = Debug|x64
+		{6178EDA1-DBC7-4A15-86E7-BF2B8F6681D2}.Debug|x64.Build.0 = Debug|x64
+		{6178EDA1-DBC7-4A15-86E7-BF2B8F6681D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6178EDA1-DBC7-4A15-86E7-BF2B8F6681D2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6178EDA1-DBC7-4A15-86E7-BF2B8F6681D2}.Release|ARM64.ActiveCfg = Release|ARM64
+		{6178EDA1-DBC7-4A15-86E7-BF2B8F6681D2}.Release|ARM64.Build.0 = Release|ARM64
+		{6178EDA1-DBC7-4A15-86E7-BF2B8F6681D2}.Release|x64.ActiveCfg = Release|x64
+		{6178EDA1-DBC7-4A15-86E7-BF2B8F6681D2}.Release|x64.Build.0 = Release|x64
+		{414B49B4-D789-4832-B257-B1F344D57C32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{414B49B4-D789-4832-B257-B1F344D57C32}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{414B49B4-D789-4832-B257-B1F344D57C32}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{414B49B4-D789-4832-B257-B1F344D57C32}.Debug|ARM64.Build.0 = Debug|ARM64
+		{414B49B4-D789-4832-B257-B1F344D57C32}.Debug|x64.ActiveCfg = Debug|x64
+		{414B49B4-D789-4832-B257-B1F344D57C32}.Debug|x64.Build.0 = Debug|x64
+		{414B49B4-D789-4832-B257-B1F344D57C32}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{414B49B4-D789-4832-B257-B1F344D57C32}.Release|Any CPU.Build.0 = Release|Any CPU
+		{414B49B4-D789-4832-B257-B1F344D57C32}.Release|ARM64.ActiveCfg = Release|ARM64
+		{414B49B4-D789-4832-B257-B1F344D57C32}.Release|ARM64.Build.0 = Release|ARM64
+		{414B49B4-D789-4832-B257-B1F344D57C32}.Release|x64.ActiveCfg = Release|x64
+		{414B49B4-D789-4832-B257-B1F344D57C32}.Release|x64.Build.0 = Release|x64
+		{D6FD1EBC-53E8-442C-8E5B-815F6B527B07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6FD1EBC-53E8-442C-8E5B-815F6B527B07}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6FD1EBC-53E8-442C-8E5B-815F6B527B07}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{D6FD1EBC-53E8-442C-8E5B-815F6B527B07}.Debug|ARM64.Build.0 = Debug|ARM64
+		{D6FD1EBC-53E8-442C-8E5B-815F6B527B07}.Debug|x64.ActiveCfg = Debug|x64
+		{D6FD1EBC-53E8-442C-8E5B-815F6B527B07}.Debug|x64.Build.0 = Debug|x64
+		{D6FD1EBC-53E8-442C-8E5B-815F6B527B07}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6FD1EBC-53E8-442C-8E5B-815F6B527B07}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6FD1EBC-53E8-442C-8E5B-815F6B527B07}.Release|ARM64.ActiveCfg = Release|ARM64
+		{D6FD1EBC-53E8-442C-8E5B-815F6B527B07}.Release|ARM64.Build.0 = Release|ARM64
+		{D6FD1EBC-53E8-442C-8E5B-815F6B527B07}.Release|x64.ActiveCfg = Release|x64
+		{D6FD1EBC-53E8-442C-8E5B-815F6B527B07}.Release|x64.Build.0 = Release|x64
+		{8E183DF4-F8E5-4421-AECC-B54CBA7BF138}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E183DF4-F8E5-4421-AECC-B54CBA7BF138}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E183DF4-F8E5-4421-AECC-B54CBA7BF138}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{8E183DF4-F8E5-4421-AECC-B54CBA7BF138}.Debug|ARM64.Build.0 = Debug|ARM64
+		{8E183DF4-F8E5-4421-AECC-B54CBA7BF138}.Debug|x64.ActiveCfg = Debug|x64
+		{8E183DF4-F8E5-4421-AECC-B54CBA7BF138}.Debug|x64.Build.0 = Debug|x64
+		{8E183DF4-F8E5-4421-AECC-B54CBA7BF138}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E183DF4-F8E5-4421-AECC-B54CBA7BF138}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E183DF4-F8E5-4421-AECC-B54CBA7BF138}.Release|ARM64.ActiveCfg = Release|ARM64
+		{8E183DF4-F8E5-4421-AECC-B54CBA7BF138}.Release|ARM64.Build.0 = Release|ARM64
+		{8E183DF4-F8E5-4421-AECC-B54CBA7BF138}.Release|x64.ActiveCfg = Release|x64
+		{8E183DF4-F8E5-4421-AECC-B54CBA7BF138}.Release|x64.Build.0 = Release|x64
+		{D180755E-8D2A-462F-9E67-55ED985D2465}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D180755E-8D2A-462F-9E67-55ED985D2465}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D180755E-8D2A-462F-9E67-55ED985D2465}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{D180755E-8D2A-462F-9E67-55ED985D2465}.Debug|ARM64.Build.0 = Debug|ARM64
+		{D180755E-8D2A-462F-9E67-55ED985D2465}.Debug|x64.ActiveCfg = Debug|x64
+		{D180755E-8D2A-462F-9E67-55ED985D2465}.Debug|x64.Build.0 = Debug|x64
+		{D180755E-8D2A-462F-9E67-55ED985D2465}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D180755E-8D2A-462F-9E67-55ED985D2465}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D180755E-8D2A-462F-9E67-55ED985D2465}.Release|ARM64.ActiveCfg = Release|ARM64
+		{D180755E-8D2A-462F-9E67-55ED985D2465}.Release|ARM64.Build.0 = Release|ARM64
+		{D180755E-8D2A-462F-9E67-55ED985D2465}.Release|x64.ActiveCfg = Release|x64
+		{D180755E-8D2A-462F-9E67-55ED985D2465}.Release|x64.Build.0 = Release|x64
+		{A93A3CAF-C3ED-4CC8-84E3-7F2641405837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A93A3CAF-C3ED-4CC8-84E3-7F2641405837}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A93A3CAF-C3ED-4CC8-84E3-7F2641405837}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{A93A3CAF-C3ED-4CC8-84E3-7F2641405837}.Debug|ARM64.Build.0 = Debug|ARM64
+		{A93A3CAF-C3ED-4CC8-84E3-7F2641405837}.Debug|x64.ActiveCfg = Debug|x64
+		{A93A3CAF-C3ED-4CC8-84E3-7F2641405837}.Debug|x64.Build.0 = Debug|x64
+		{A93A3CAF-C3ED-4CC8-84E3-7F2641405837}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A93A3CAF-C3ED-4CC8-84E3-7F2641405837}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A93A3CAF-C3ED-4CC8-84E3-7F2641405837}.Release|ARM64.ActiveCfg = Release|ARM64
+		{A93A3CAF-C3ED-4CC8-84E3-7F2641405837}.Release|ARM64.Build.0 = Release|ARM64
+		{A93A3CAF-C3ED-4CC8-84E3-7F2641405837}.Release|x64.ActiveCfg = Release|x64
+		{A93A3CAF-C3ED-4CC8-84E3-7F2641405837}.Release|x64.Build.0 = Release|x64
+		{674714F6-247F-4C0F-AD59-E25AFE1145F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{674714F6-247F-4C0F-AD59-E25AFE1145F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{674714F6-247F-4C0F-AD59-E25AFE1145F6}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{674714F6-247F-4C0F-AD59-E25AFE1145F6}.Debug|ARM64.Build.0 = Debug|ARM64
+		{674714F6-247F-4C0F-AD59-E25AFE1145F6}.Debug|x64.ActiveCfg = Debug|x64
+		{674714F6-247F-4C0F-AD59-E25AFE1145F6}.Debug|x64.Build.0 = Debug|x64
+		{674714F6-247F-4C0F-AD59-E25AFE1145F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{674714F6-247F-4C0F-AD59-E25AFE1145F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{674714F6-247F-4C0F-AD59-E25AFE1145F6}.Release|ARM64.ActiveCfg = Release|ARM64
+		{674714F6-247F-4C0F-AD59-E25AFE1145F6}.Release|ARM64.Build.0 = Release|ARM64
+		{674714F6-247F-4C0F-AD59-E25AFE1145F6}.Release|x64.ActiveCfg = Release|x64
+		{674714F6-247F-4C0F-AD59-E25AFE1145F6}.Release|x64.Build.0 = Release|x64
+		{BE4C3C46-D39C-4F8D-B85F-93B8656EABEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE4C3C46-D39C-4F8D-B85F-93B8656EABEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE4C3C46-D39C-4F8D-B85F-93B8656EABEA}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{BE4C3C46-D39C-4F8D-B85F-93B8656EABEA}.Debug|ARM64.Build.0 = Debug|ARM64
+		{BE4C3C46-D39C-4F8D-B85F-93B8656EABEA}.Debug|x64.ActiveCfg = Debug|x64
+		{BE4C3C46-D39C-4F8D-B85F-93B8656EABEA}.Debug|x64.Build.0 = Debug|x64
+		{BE4C3C46-D39C-4F8D-B85F-93B8656EABEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BE4C3C46-D39C-4F8D-B85F-93B8656EABEA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BE4C3C46-D39C-4F8D-B85F-93B8656EABEA}.Release|ARM64.ActiveCfg = Release|ARM64
+		{BE4C3C46-D39C-4F8D-B85F-93B8656EABEA}.Release|ARM64.Build.0 = Release|ARM64
+		{BE4C3C46-D39C-4F8D-B85F-93B8656EABEA}.Release|x64.ActiveCfg = Release|x64
+		{BE4C3C46-D39C-4F8D-B85F-93B8656EABEA}.Release|x64.Build.0 = Release|x64
+		{62748E08-EAC6-4796-A900-6879CE1CFD15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62748E08-EAC6-4796-A900-6879CE1CFD15}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62748E08-EAC6-4796-A900-6879CE1CFD15}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{62748E08-EAC6-4796-A900-6879CE1CFD15}.Debug|ARM64.Build.0 = Debug|ARM64
+		{62748E08-EAC6-4796-A900-6879CE1CFD15}.Debug|x64.ActiveCfg = Debug|x64
+		{62748E08-EAC6-4796-A900-6879CE1CFD15}.Debug|x64.Build.0 = Debug|x64
+		{62748E08-EAC6-4796-A900-6879CE1CFD15}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62748E08-EAC6-4796-A900-6879CE1CFD15}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62748E08-EAC6-4796-A900-6879CE1CFD15}.Release|ARM64.ActiveCfg = Release|ARM64
+		{62748E08-EAC6-4796-A900-6879CE1CFD15}.Release|ARM64.Build.0 = Release|ARM64
+		{62748E08-EAC6-4796-A900-6879CE1CFD15}.Release|x64.ActiveCfg = Release|x64
+		{62748E08-EAC6-4796-A900-6879CE1CFD15}.Release|x64.Build.0 = Release|x64
+		{609FAD32-F476-4F4F-9CE7-694EECB23B34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{609FAD32-F476-4F4F-9CE7-694EECB23B34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{609FAD32-F476-4F4F-9CE7-694EECB23B34}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{609FAD32-F476-4F4F-9CE7-694EECB23B34}.Debug|ARM64.Build.0 = Debug|ARM64
+		{609FAD32-F476-4F4F-9CE7-694EECB23B34}.Debug|x64.ActiveCfg = Debug|x64
+		{609FAD32-F476-4F4F-9CE7-694EECB23B34}.Debug|x64.Build.0 = Debug|x64
+		{609FAD32-F476-4F4F-9CE7-694EECB23B34}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{609FAD32-F476-4F4F-9CE7-694EECB23B34}.Release|Any CPU.Build.0 = Release|Any CPU
+		{609FAD32-F476-4F4F-9CE7-694EECB23B34}.Release|ARM64.ActiveCfg = Release|ARM64
+		{609FAD32-F476-4F4F-9CE7-694EECB23B34}.Release|ARM64.Build.0 = Release|ARM64
+		{609FAD32-F476-4F4F-9CE7-694EECB23B34}.Release|x64.ActiveCfg = Release|x64
+		{609FAD32-F476-4F4F-9CE7-694EECB23B34}.Release|x64.Build.0 = Release|x64
+		{72106D64-1BBD-4998-B19C-07244CBA2961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72106D64-1BBD-4998-B19C-07244CBA2961}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72106D64-1BBD-4998-B19C-07244CBA2961}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{72106D64-1BBD-4998-B19C-07244CBA2961}.Debug|ARM64.Build.0 = Debug|ARM64
+		{72106D64-1BBD-4998-B19C-07244CBA2961}.Debug|x64.ActiveCfg = Debug|x64
+		{72106D64-1BBD-4998-B19C-07244CBA2961}.Debug|x64.Build.0 = Debug|x64
+		{72106D64-1BBD-4998-B19C-07244CBA2961}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72106D64-1BBD-4998-B19C-07244CBA2961}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72106D64-1BBD-4998-B19C-07244CBA2961}.Release|ARM64.ActiveCfg = Release|ARM64
+		{72106D64-1BBD-4998-B19C-07244CBA2961}.Release|ARM64.Build.0 = Release|ARM64
+		{72106D64-1BBD-4998-B19C-07244CBA2961}.Release|x64.ActiveCfg = Release|x64
+		{72106D64-1BBD-4998-B19C-07244CBA2961}.Release|x64.Build.0 = Release|x64
+		{E75E364B-C6F4-4EA1-AB70-F16D44CA2C43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E75E364B-C6F4-4EA1-AB70-F16D44CA2C43}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E75E364B-C6F4-4EA1-AB70-F16D44CA2C43}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{E75E364B-C6F4-4EA1-AB70-F16D44CA2C43}.Debug|ARM64.Build.0 = Debug|ARM64
+		{E75E364B-C6F4-4EA1-AB70-F16D44CA2C43}.Debug|x64.ActiveCfg = Debug|x64
+		{E75E364B-C6F4-4EA1-AB70-F16D44CA2C43}.Debug|x64.Build.0 = Debug|x64
+		{E75E364B-C6F4-4EA1-AB70-F16D44CA2C43}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E75E364B-C6F4-4EA1-AB70-F16D44CA2C43}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E75E364B-C6F4-4EA1-AB70-F16D44CA2C43}.Release|ARM64.ActiveCfg = Release|ARM64
+		{E75E364B-C6F4-4EA1-AB70-F16D44CA2C43}.Release|ARM64.Build.0 = Release|ARM64
+		{E75E364B-C6F4-4EA1-AB70-F16D44CA2C43}.Release|x64.ActiveCfg = Release|x64
+		{E75E364B-C6F4-4EA1-AB70-F16D44CA2C43}.Release|x64.Build.0 = Release|x64
+		{5C9FA440-04EC-42AB-935D-77B635156CAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C9FA440-04EC-42AB-935D-77B635156CAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5C9FA440-04EC-42AB-935D-77B635156CAB}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{5C9FA440-04EC-42AB-935D-77B635156CAB}.Debug|ARM64.Build.0 = Debug|ARM64
+		{5C9FA440-04EC-42AB-935D-77B635156CAB}.Debug|x64.ActiveCfg = Debug|x64
+		{5C9FA440-04EC-42AB-935D-77B635156CAB}.Debug|x64.Build.0 = Debug|x64
+		{5C9FA440-04EC-42AB-935D-77B635156CAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5C9FA440-04EC-42AB-935D-77B635156CAB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5C9FA440-04EC-42AB-935D-77B635156CAB}.Release|ARM64.ActiveCfg = Release|ARM64
+		{5C9FA440-04EC-42AB-935D-77B635156CAB}.Release|ARM64.Build.0 = Release|ARM64
+		{5C9FA440-04EC-42AB-935D-77B635156CAB}.Release|x64.ActiveCfg = Release|x64
+		{5C9FA440-04EC-42AB-935D-77B635156CAB}.Release|x64.Build.0 = Release|x64
+		{3D693070-6D3D-4703-8998-662D81D154F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D693070-6D3D-4703-8998-662D81D154F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D693070-6D3D-4703-8998-662D81D154F4}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{3D693070-6D3D-4703-8998-662D81D154F4}.Debug|ARM64.Build.0 = Debug|ARM64
+		{3D693070-6D3D-4703-8998-662D81D154F4}.Debug|x64.ActiveCfg = Debug|x64
+		{3D693070-6D3D-4703-8998-662D81D154F4}.Debug|x64.Build.0 = Debug|x64
+		{3D693070-6D3D-4703-8998-662D81D154F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D693070-6D3D-4703-8998-662D81D154F4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D693070-6D3D-4703-8998-662D81D154F4}.Release|ARM64.ActiveCfg = Release|ARM64
+		{3D693070-6D3D-4703-8998-662D81D154F4}.Release|ARM64.Build.0 = Release|ARM64
+		{3D693070-6D3D-4703-8998-662D81D154F4}.Release|x64.ActiveCfg = Release|x64
+		{3D693070-6D3D-4703-8998-662D81D154F4}.Release|x64.Build.0 = Release|x64
+		{5934B795-F37F-4AF1-B8AE-4995880902C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5934B795-F37F-4AF1-B8AE-4995880902C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5934B795-F37F-4AF1-B8AE-4995880902C8}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{5934B795-F37F-4AF1-B8AE-4995880902C8}.Debug|ARM64.Build.0 = Debug|ARM64
+		{5934B795-F37F-4AF1-B8AE-4995880902C8}.Debug|x64.ActiveCfg = Debug|x64
+		{5934B795-F37F-4AF1-B8AE-4995880902C8}.Debug|x64.Build.0 = Debug|x64
+		{5934B795-F37F-4AF1-B8AE-4995880902C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5934B795-F37F-4AF1-B8AE-4995880902C8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5934B795-F37F-4AF1-B8AE-4995880902C8}.Release|ARM64.ActiveCfg = Release|ARM64
+		{5934B795-F37F-4AF1-B8AE-4995880902C8}.Release|ARM64.Build.0 = Release|ARM64
+		{5934B795-F37F-4AF1-B8AE-4995880902C8}.Release|x64.ActiveCfg = Release|x64
+		{5934B795-F37F-4AF1-B8AE-4995880902C8}.Release|x64.Build.0 = Release|x64
+		{075374EB-BAE0-4068-A4A8-DAA3E8B21D2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{075374EB-BAE0-4068-A4A8-DAA3E8B21D2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{075374EB-BAE0-4068-A4A8-DAA3E8B21D2F}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{075374EB-BAE0-4068-A4A8-DAA3E8B21D2F}.Debug|ARM64.Build.0 = Debug|ARM64
+		{075374EB-BAE0-4068-A4A8-DAA3E8B21D2F}.Debug|x64.ActiveCfg = Debug|x64
+		{075374EB-BAE0-4068-A4A8-DAA3E8B21D2F}.Debug|x64.Build.0 = Debug|x64
+		{075374EB-BAE0-4068-A4A8-DAA3E8B21D2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{075374EB-BAE0-4068-A4A8-DAA3E8B21D2F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{075374EB-BAE0-4068-A4A8-DAA3E8B21D2F}.Release|ARM64.ActiveCfg = Release|ARM64
+		{075374EB-BAE0-4068-A4A8-DAA3E8B21D2F}.Release|ARM64.Build.0 = Release|ARM64
+		{075374EB-BAE0-4068-A4A8-DAA3E8B21D2F}.Release|x64.ActiveCfg = Release|x64
+		{075374EB-BAE0-4068-A4A8-DAA3E8B21D2F}.Release|x64.Build.0 = Release|x64
+		{AD062E9D-BA0E-4811-B58D-1BAFC86A023D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD062E9D-BA0E-4811-B58D-1BAFC86A023D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD062E9D-BA0E-4811-B58D-1BAFC86A023D}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{AD062E9D-BA0E-4811-B58D-1BAFC86A023D}.Debug|ARM64.Build.0 = Debug|ARM64
+		{AD062E9D-BA0E-4811-B58D-1BAFC86A023D}.Debug|x64.ActiveCfg = Debug|x64
+		{AD062E9D-BA0E-4811-B58D-1BAFC86A023D}.Debug|x64.Build.0 = Debug|x64
+		{AD062E9D-BA0E-4811-B58D-1BAFC86A023D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD062E9D-BA0E-4811-B58D-1BAFC86A023D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD062E9D-BA0E-4811-B58D-1BAFC86A023D}.Release|ARM64.ActiveCfg = Release|ARM64
+		{AD062E9D-BA0E-4811-B58D-1BAFC86A023D}.Release|ARM64.Build.0 = Release|ARM64
+		{AD062E9D-BA0E-4811-B58D-1BAFC86A023D}.Release|x64.ActiveCfg = Release|x64
+		{AD062E9D-BA0E-4811-B58D-1BAFC86A023D}.Release|x64.Build.0 = Release|x64
+		{B5129263-F7A0-4E1F-A916-20B1B93FA707}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5129263-F7A0-4E1F-A916-20B1B93FA707}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5129263-F7A0-4E1F-A916-20B1B93FA707}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{B5129263-F7A0-4E1F-A916-20B1B93FA707}.Debug|ARM64.Build.0 = Debug|ARM64
+		{B5129263-F7A0-4E1F-A916-20B1B93FA707}.Debug|x64.ActiveCfg = Debug|x64
+		{B5129263-F7A0-4E1F-A916-20B1B93FA707}.Debug|x64.Build.0 = Debug|x64
+		{B5129263-F7A0-4E1F-A916-20B1B93FA707}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B5129263-F7A0-4E1F-A916-20B1B93FA707}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B5129263-F7A0-4E1F-A916-20B1B93FA707}.Release|ARM64.ActiveCfg = Release|ARM64
+		{B5129263-F7A0-4E1F-A916-20B1B93FA707}.Release|ARM64.Build.0 = Release|ARM64
+		{B5129263-F7A0-4E1F-A916-20B1B93FA707}.Release|x64.ActiveCfg = Release|x64
+		{B5129263-F7A0-4E1F-A916-20B1B93FA707}.Release|x64.Build.0 = Release|x64
+		{0D5FE925-39F2-4E59-AE15-C0C15DE907B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0D5FE925-39F2-4E59-AE15-C0C15DE907B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0D5FE925-39F2-4E59-AE15-C0C15DE907B4}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{0D5FE925-39F2-4E59-AE15-C0C15DE907B4}.Debug|ARM64.Build.0 = Debug|ARM64
+		{0D5FE925-39F2-4E59-AE15-C0C15DE907B4}.Debug|x64.ActiveCfg = Debug|x64
+		{0D5FE925-39F2-4E59-AE15-C0C15DE907B4}.Debug|x64.Build.0 = Debug|x64
+		{0D5FE925-39F2-4E59-AE15-C0C15DE907B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0D5FE925-39F2-4E59-AE15-C0C15DE907B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0D5FE925-39F2-4E59-AE15-C0C15DE907B4}.Release|ARM64.ActiveCfg = Release|ARM64
+		{0D5FE925-39F2-4E59-AE15-C0C15DE907B4}.Release|ARM64.Build.0 = Release|ARM64
+		{0D5FE925-39F2-4E59-AE15-C0C15DE907B4}.Release|x64.ActiveCfg = Release|x64
+		{0D5FE925-39F2-4E59-AE15-C0C15DE907B4}.Release|x64.Build.0 = Release|x64
+		{F6093B93-A18B-42DA-9D37-D54BDBCB31B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6093B93-A18B-42DA-9D37-D54BDBCB31B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6093B93-A18B-42DA-9D37-D54BDBCB31B4}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{F6093B93-A18B-42DA-9D37-D54BDBCB31B4}.Debug|ARM64.Build.0 = Debug|ARM64
+		{F6093B93-A18B-42DA-9D37-D54BDBCB31B4}.Debug|x64.ActiveCfg = Debug|x64
+		{F6093B93-A18B-42DA-9D37-D54BDBCB31B4}.Debug|x64.Build.0 = Debug|x64
+		{F6093B93-A18B-42DA-9D37-D54BDBCB31B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6093B93-A18B-42DA-9D37-D54BDBCB31B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6093B93-A18B-42DA-9D37-D54BDBCB31B4}.Release|ARM64.ActiveCfg = Release|ARM64
+		{F6093B93-A18B-42DA-9D37-D54BDBCB31B4}.Release|ARM64.Build.0 = Release|ARM64
+		{F6093B93-A18B-42DA-9D37-D54BDBCB31B4}.Release|x64.ActiveCfg = Release|x64
+		{F6093B93-A18B-42DA-9D37-D54BDBCB31B4}.Release|x64.Build.0 = Release|x64
+		{84A20321-B8F9-4568-B3B5-8E4895BC6E6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84A20321-B8F9-4568-B3B5-8E4895BC6E6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84A20321-B8F9-4568-B3B5-8E4895BC6E6C}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{84A20321-B8F9-4568-B3B5-8E4895BC6E6C}.Debug|ARM64.Build.0 = Debug|ARM64
+		{84A20321-B8F9-4568-B3B5-8E4895BC6E6C}.Debug|x64.ActiveCfg = Debug|x64
+		{84A20321-B8F9-4568-B3B5-8E4895BC6E6C}.Debug|x64.Build.0 = Debug|x64
+		{84A20321-B8F9-4568-B3B5-8E4895BC6E6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{84A20321-B8F9-4568-B3B5-8E4895BC6E6C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84A20321-B8F9-4568-B3B5-8E4895BC6E6C}.Release|ARM64.ActiveCfg = Release|ARM64
+		{84A20321-B8F9-4568-B3B5-8E4895BC6E6C}.Release|ARM64.Build.0 = Release|ARM64
+		{84A20321-B8F9-4568-B3B5-8E4895BC6E6C}.Release|x64.ActiveCfg = Release|x64
+		{84A20321-B8F9-4568-B3B5-8E4895BC6E6C}.Release|x64.Build.0 = Release|x64
+		{A3CCCE65-38B3-4987-999D-1ADD6EB0FA36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3CCCE65-38B3-4987-999D-1ADD6EB0FA36}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3CCCE65-38B3-4987-999D-1ADD6EB0FA36}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{A3CCCE65-38B3-4987-999D-1ADD6EB0FA36}.Debug|ARM64.Build.0 = Debug|ARM64
+		{A3CCCE65-38B3-4987-999D-1ADD6EB0FA36}.Debug|x64.ActiveCfg = Debug|x64
+		{A3CCCE65-38B3-4987-999D-1ADD6EB0FA36}.Debug|x64.Build.0 = Debug|x64
+		{A3CCCE65-38B3-4987-999D-1ADD6EB0FA36}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3CCCE65-38B3-4987-999D-1ADD6EB0FA36}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3CCCE65-38B3-4987-999D-1ADD6EB0FA36}.Release|ARM64.ActiveCfg = Release|ARM64
+		{A3CCCE65-38B3-4987-999D-1ADD6EB0FA36}.Release|ARM64.Build.0 = Release|ARM64
+		{A3CCCE65-38B3-4987-999D-1ADD6EB0FA36}.Release|x64.ActiveCfg = Release|x64
+		{A3CCCE65-38B3-4987-999D-1ADD6EB0FA36}.Release|x64.Build.0 = Release|x64
+		{2D48AB5B-5C16-4E8F-9F7B-A35D034DCA8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D48AB5B-5C16-4E8F-9F7B-A35D034DCA8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D48AB5B-5C16-4E8F-9F7B-A35D034DCA8E}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{2D48AB5B-5C16-4E8F-9F7B-A35D034DCA8E}.Debug|ARM64.Build.0 = Debug|ARM64
+		{2D48AB5B-5C16-4E8F-9F7B-A35D034DCA8E}.Debug|x64.ActiveCfg = Debug|x64
+		{2D48AB5B-5C16-4E8F-9F7B-A35D034DCA8E}.Debug|x64.Build.0 = Debug|x64
+		{2D48AB5B-5C16-4E8F-9F7B-A35D034DCA8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D48AB5B-5C16-4E8F-9F7B-A35D034DCA8E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D48AB5B-5C16-4E8F-9F7B-A35D034DCA8E}.Release|ARM64.ActiveCfg = Release|ARM64
+		{2D48AB5B-5C16-4E8F-9F7B-A35D034DCA8E}.Release|ARM64.Build.0 = Release|ARM64
+		{2D48AB5B-5C16-4E8F-9F7B-A35D034DCA8E}.Release|x64.ActiveCfg = Release|x64
+		{2D48AB5B-5C16-4E8F-9F7B-A35D034DCA8E}.Release|x64.Build.0 = Release|x64
+		{E130C6E8-7CDE-4D60-AA33-A366D5D63C5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E130C6E8-7CDE-4D60-AA33-A366D5D63C5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E130C6E8-7CDE-4D60-AA33-A366D5D63C5C}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{E130C6E8-7CDE-4D60-AA33-A366D5D63C5C}.Debug|ARM64.Build.0 = Debug|ARM64
+		{E130C6E8-7CDE-4D60-AA33-A366D5D63C5C}.Debug|x64.ActiveCfg = Debug|x64
+		{E130C6E8-7CDE-4D60-AA33-A366D5D63C5C}.Debug|x64.Build.0 = Debug|x64
+		{E130C6E8-7CDE-4D60-AA33-A366D5D63C5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E130C6E8-7CDE-4D60-AA33-A366D5D63C5C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E130C6E8-7CDE-4D60-AA33-A366D5D63C5C}.Release|ARM64.ActiveCfg = Release|ARM64
+		{E130C6E8-7CDE-4D60-AA33-A366D5D63C5C}.Release|ARM64.Build.0 = Release|ARM64
+		{E130C6E8-7CDE-4D60-AA33-A366D5D63C5C}.Release|x64.ActiveCfg = Release|x64
+		{E130C6E8-7CDE-4D60-AA33-A366D5D63C5C}.Release|x64.Build.0 = Release|x64
+		{C548296F-C21A-413B-9CBC-1877F50940DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C548296F-C21A-413B-9CBC-1877F50940DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C548296F-C21A-413B-9CBC-1877F50940DC}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{C548296F-C21A-413B-9CBC-1877F50940DC}.Debug|ARM64.Build.0 = Debug|ARM64
+		{C548296F-C21A-413B-9CBC-1877F50940DC}.Debug|x64.ActiveCfg = Debug|x64
+		{C548296F-C21A-413B-9CBC-1877F50940DC}.Debug|x64.Build.0 = Debug|x64
+		{C548296F-C21A-413B-9CBC-1877F50940DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C548296F-C21A-413B-9CBC-1877F50940DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C548296F-C21A-413B-9CBC-1877F50940DC}.Release|ARM64.ActiveCfg = Release|ARM64
+		{C548296F-C21A-413B-9CBC-1877F50940DC}.Release|ARM64.Build.0 = Release|ARM64
+		{C548296F-C21A-413B-9CBC-1877F50940DC}.Release|x64.ActiveCfg = Release|x64
+		{C548296F-C21A-413B-9CBC-1877F50940DC}.Release|x64.Build.0 = Release|x64
+		{7D9F393E-3E64-450D-9DA5-6C61CDC508F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D9F393E-3E64-450D-9DA5-6C61CDC508F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D9F393E-3E64-450D-9DA5-6C61CDC508F0}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{7D9F393E-3E64-450D-9DA5-6C61CDC508F0}.Debug|ARM64.Build.0 = Debug|ARM64
+		{7D9F393E-3E64-450D-9DA5-6C61CDC508F0}.Debug|x64.ActiveCfg = Debug|x64
+		{7D9F393E-3E64-450D-9DA5-6C61CDC508F0}.Debug|x64.Build.0 = Debug|x64
+		{7D9F393E-3E64-450D-9DA5-6C61CDC508F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D9F393E-3E64-450D-9DA5-6C61CDC508F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D9F393E-3E64-450D-9DA5-6C61CDC508F0}.Release|ARM64.ActiveCfg = Release|ARM64
+		{7D9F393E-3E64-450D-9DA5-6C61CDC508F0}.Release|ARM64.Build.0 = Release|ARM64
+		{7D9F393E-3E64-450D-9DA5-6C61CDC508F0}.Release|x64.ActiveCfg = Release|x64
+		{7D9F393E-3E64-450D-9DA5-6C61CDC508F0}.Release|x64.Build.0 = Release|x64
+		{B375CE7A-AF32-4A62-9443-B21100C1227B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B375CE7A-AF32-4A62-9443-B21100C1227B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B375CE7A-AF32-4A62-9443-B21100C1227B}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{B375CE7A-AF32-4A62-9443-B21100C1227B}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{B375CE7A-AF32-4A62-9443-B21100C1227B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B375CE7A-AF32-4A62-9443-B21100C1227B}.Debug|x64.Build.0 = Debug|Any CPU
+		{B375CE7A-AF32-4A62-9443-B21100C1227B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B375CE7A-AF32-4A62-9443-B21100C1227B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B375CE7A-AF32-4A62-9443-B21100C1227B}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{B375CE7A-AF32-4A62-9443-B21100C1227B}.Release|ARM64.Build.0 = Release|Any CPU
+		{B375CE7A-AF32-4A62-9443-B21100C1227B}.Release|x64.ActiveCfg = Release|Any CPU
+		{B375CE7A-AF32-4A62-9443-B21100C1227B}.Release|x64.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{289B2A5C-9EC6-47C4-9C1B-15D4C2ADFDCD} = {CB56B2BD-5ABA-49C7-BD57-21B9CD5C3205}
+		{96FC74C3-8E5D-4090-B4C7-2B7ED46AE187} = {CB56B2BD-5ABA-49C7-BD57-21B9CD5C3205}
+		{F0E1719C-88FF-4E44-BCBE-8B59ADA29134} = {CB56B2BD-5ABA-49C7-BD57-21B9CD5C3205}
+		{97EDD08B-0E2F-4445-A4CA-36285954BBDC} = {CB56B2BD-5ABA-49C7-BD57-21B9CD5C3205}
+		{101DD668-2140-4183-8C97-F641173AF736} = {CB56B2BD-5ABA-49C7-BD57-21B9CD5C3205}
+		{1826D544-16E6-460F-A8F2-1D56B5041AE7} = {CB56B2BD-5ABA-49C7-BD57-21B9CD5C3205}
+		{3C9DCA10-0006-4FA5-88CB-9CCEC1B2C522} = {CB56B2BD-5ABA-49C7-BD57-21B9CD5C3205}
+		{58219323-BD46-4F67-A83A-410F56F84EE3} = {CB56B2BD-5ABA-49C7-BD57-21B9CD5C3205}
+		{41EEB66F-D77B-4FF3-BF68-DA3748C80BB5} = {CB56B2BD-5ABA-49C7-BD57-21B9CD5C3205}
+		{414B49B4-D789-4832-B257-B1F344D57C32} = {CB56B2BD-5ABA-49C7-BD57-21B9CD5C3205}
+		{D6FD1EBC-53E8-442C-8E5B-815F6B527B07} = {CB56B2BD-5ABA-49C7-BD57-21B9CD5C3205}
+		{8E183DF4-F8E5-4421-AECC-B54CBA7BF138} = {CB56B2BD-5ABA-49C7-BD57-21B9CD5C3205}
+		{D180755E-8D2A-462F-9E67-55ED985D2465} = {C60E0774-AB19-49D0-AAB4-D804E5EF1C3F}
+		{A93A3CAF-C3ED-4CC8-84E3-7F2641405837} = {CB56B2BD-5ABA-49C7-BD57-21B9CD5C3205}
+		{674714F6-247F-4C0F-AD59-E25AFE1145F6} = {830D29DF-0648-46A7-9E51-412217E434A8}
+		{BE4C3C46-D39C-4F8D-B85F-93B8656EABEA} = {830D29DF-0648-46A7-9E51-412217E434A8}
+		{62748E08-EAC6-4796-A900-6879CE1CFD15} = {830D29DF-0648-46A7-9E51-412217E434A8}
+		{609FAD32-F476-4F4F-9CE7-694EECB23B34} = {830D29DF-0648-46A7-9E51-412217E434A8}
+		{72106D64-1BBD-4998-B19C-07244CBA2961} = {830D29DF-0648-46A7-9E51-412217E434A8}
+		{E75E364B-C6F4-4EA1-AB70-F16D44CA2C43} = {830D29DF-0648-46A7-9E51-412217E434A8}
+		{5C9FA440-04EC-42AB-935D-77B635156CAB} = {830D29DF-0648-46A7-9E51-412217E434A8}
+		{3D693070-6D3D-4703-8998-662D81D154F4} = {830D29DF-0648-46A7-9E51-412217E434A8}
+		{5934B795-F37F-4AF1-B8AE-4995880902C8} = {C60E0774-AB19-49D0-AAB4-D804E5EF1C3F}
+		{075374EB-BAE0-4068-A4A8-DAA3E8B21D2F} = {C60E0774-AB19-49D0-AAB4-D804E5EF1C3F}
+		{AD062E9D-BA0E-4811-B58D-1BAFC86A023D} = {C60E0774-AB19-49D0-AAB4-D804E5EF1C3F}
+		{B5129263-F7A0-4E1F-A916-20B1B93FA707} = {C60E0774-AB19-49D0-AAB4-D804E5EF1C3F}
+		{F6093B93-A18B-42DA-9D37-D54BDBCB31B4} = {C60E0774-AB19-49D0-AAB4-D804E5EF1C3F}
+		{84A20321-B8F9-4568-B3B5-8E4895BC6E6C} = {C60E0774-AB19-49D0-AAB4-D804E5EF1C3F}
+		{A3CCCE65-38B3-4987-999D-1ADD6EB0FA36} = {C60E0774-AB19-49D0-AAB4-D804E5EF1C3F}
+		{2D48AB5B-5C16-4E8F-9F7B-A35D034DCA8E} = {830D29DF-0648-46A7-9E51-412217E434A8}
+		{E130C6E8-7CDE-4D60-AA33-A366D5D63C5C} = {830D29DF-0648-46A7-9E51-412217E434A8}
+		{C548296F-C21A-413B-9CBC-1877F50940DC} = {C60E0774-AB19-49D0-AAB4-D804E5EF1C3F}
+		{7D9F393E-3E64-450D-9DA5-6C61CDC508F0} = {C60E0774-AB19-49D0-AAB4-D804E5EF1C3F}
+		{830D29DF-0648-46A7-9E51-412217E434A8} = {C60E0774-AB19-49D0-AAB4-D804E5EF1C3F}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {CD63E89D-F4FA-42A7-A10B-50CF854078FA}
+	EndGlobalSection
+EndGlobal
diff --git a/src/KurrentDB/AuthorizationPolicyRegistryFactory.cs b/src/KurrentDB/AuthorizationPolicyRegistryFactory.cs
new file mode 100644
index 00000000000..d54bb240801
--- /dev/null
+++ b/src/KurrentDB/AuthorizationPolicyRegistryFactory.cs
@@ -0,0 +1,107 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using EventStore.Plugins;
+using EventStore.Plugins.Subsystems;
+using KurrentDB.Auth.StreamPolicyPlugin;
+using KurrentDB.Common.Exceptions;
+using KurrentDB.Core;
+using KurrentDB.Core.Authorization.AuthorizationPolicies;
+using KurrentDB.Core.Bus;
+using KurrentDB.Core.Configuration.Sources;
+using KurrentDB.PluginHosting;
+using Microsoft.Extensions.Configuration;
+using Serilog;
+
+namespace KurrentDB;
+
+public class AuthorizationPolicyRegistryFactory : SubsystemsPlugin {
+	private readonly ILogger _logger = Log.ForContext<AuthorizationPolicyRegistryFactory>();
+	private readonly IPolicySelectorFactory[] _pluginSelectorFactories = [];
+	private readonly Func<IPublisher, IAuthorizationPolicyRegistry> _createRegistry;
+	private IAuthorizationPolicyRegistry? _authorizationPolicyRegistry;
+
+	public AuthorizationPolicyRegistryFactory(ClusterVNodeOptions options, IConfiguration configuration, PluginLoader pluginLoader) {
+		if (options.Application.Insecure) {
+			_createRegistry = _ => new StaticAuthorizationPolicyRegistry([]);
+			return;
+		}
+
+		// Load up all policy selectors in the plugins directory
+		var factories = pluginLoader.Load<IPolicySelectorFactory>().ToList();
+		factories.Add(new StreamPolicySelectorFactory());
+
+		_pluginSelectorFactories = factories?
+			.Select(x => {
+				_logger.Information("Loaded Authorization Policy plugin: {plugin}.", x.CommandLineName);
+				return x;
+			}).ToArray() ?? [];
+
+		// Set up the legacy policy selector factory
+		var allowAnonymousEndpointAccess = options.Application.AllowAnonymousEndpointAccess;
+		var allowAnonymousStreamAccess = options.Application.AllowAnonymousStreamAccess;
+		var overrideAnonymousGossipEndpointAccess = options.Application.OverrideAnonymousEndpointAccessForGossip;
+		var legacyPolicyFactory = new LegacyPolicySelectorFactory(
+			allowAnonymousEndpointAccess,
+			allowAnonymousStreamAccess,
+			overrideAnonymousGossipEndpointAccess);
+
+		// Check if there is a default policy type. Use this if the settings stream is empty
+		var defaultPolicyType =
+			configuration.GetValue<string>($"{KurrentConfigurationKeys.Prefix}:Authorization:DefaultPolicyType") ?? string.Empty;
+		AuthorizationPolicySettings defaultSettings;
+		if (!string.IsNullOrEmpty(defaultPolicyType)) {
+			if (_pluginSelectorFactories.Any(x => x.CommandLineName == defaultPolicyType)) {
+				defaultSettings = new AuthorizationPolicySettings(defaultPolicyType);
+			} else {
+				throw new InvalidConfigurationException(
+					$"No authorization policy with the name '{defaultPolicyType}' has been registered. " +
+					$"Available authorization policies are: {string.Join(", ", _pluginSelectorFactories.Select(x => x.CommandLineName))}");
+			}
+		} else {
+			// No default policy type configured. Use ACLs.
+			defaultSettings = new AuthorizationPolicySettings(LegacyPolicySelectorFactory.LegacyPolicySelectorName);
+		}
+
+		// There are no plugins and a default policy type wasn't configured.
+		// Don't use the stream based registry
+		if (_pluginSelectorFactories.Length == 0) {
+			_logger.Information("No authorization policy plugins found. Only ACLs will be used.");
+			_createRegistry = publisher => new StaticAuthorizationPolicyRegistry([legacyPolicyFactory.Create(publisher)]);
+			return;
+		}
+
+		_logger.Information("The default authorization policy settings are: {settings}", defaultSettings);
+		_createRegistry = publisher => new StreamBasedAuthorizationPolicyRegistry(publisher, legacyPolicyFactory.Create(publisher), _pluginSelectorFactories, defaultSettings);
+	}
+
+	// Use a factory rather than ConfigureApplication because the authorization providers
+	// are built (and requires this registry) before ConfigureApplication is called
+	public IAuthorizationPolicyRegistry Create(IPublisher publisher) {
+		if (_authorizationPolicyRegistry is not null) {
+			return _authorizationPolicyRegistry;
+		}
+		_authorizationPolicyRegistry = _createRegistry(publisher);
+		return _authorizationPolicyRegistry;
+	}
+
+	public override IReadOnlyList<ISubsystem> GetSubsystems() {
+		var subsystems = new List<ISubsystem> { this };
+		// ReSharper disable once SuspiciousTypeConversion.Global
+		subsystems.AddRange(_pluginSelectorFactories.OfType<ISubsystem>());
+		return subsystems.ToArray();
+	}
+
+	public override Task Start() {
+		return _authorizationPolicyRegistry!.Start();
+	}
+
+	public override Task Stop() {
+		return _authorizationPolicyRegistry!.Stop();
+	}
+}
diff --git a/src/KurrentDB/ClusterVNodeHostedService.cs b/src/KurrentDB/ClusterVNodeHostedService.cs
new file mode 100644
index 00000000000..36af72b8565
--- /dev/null
+++ b/src/KurrentDB/ClusterVNodeHostedService.cs
@@ -0,0 +1,353 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.ComponentModel.Composition.Hosting;
+using System.IO;
+using System.Linq;
+using System.Runtime;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Plugins;
+using EventStore.Plugins.Authentication;
+using EventStore.Plugins.Authorization;
+using EventStore.Plugins.MD5;
+using EventStore.Plugins.Subsystems;
+using KurrentDB.Auth.Ldaps;
+using KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled;
+using KurrentDB.Auth.OAuth;
+using KurrentDB.Auth.UserCertificates;
+using KurrentDB.AutoScavenge;
+using KurrentDB.Common.Exceptions;
+using KurrentDB.Common.Options;
+using KurrentDB.Common.Utils;
+using KurrentDB.Core;
+using KurrentDB.Core.Authentication;
+using KurrentDB.Core.Authentication.InternalAuthentication;
+using KurrentDB.Core.Authentication.PassthroughAuthentication;
+using KurrentDB.Core.Authorization;
+using KurrentDB.Core.Certificates;
+using KurrentDB.Core.Hashing;
+using KurrentDB.Core.LogAbstraction;
+using KurrentDB.Core.PluginModel;
+using KurrentDB.Core.Services.PersistentSubscription.ConsumerStrategy;
+using KurrentDB.Core.Services.Transport.Http.Controllers;
+using KurrentDB.Diagnostics.LogsEndpointPlugin;
+using KurrentDB.PluginHosting;
+using KurrentDB.POC.ConnectedSubsystemsPlugin;
+using KurrentDB.Projections.Core;
+using KurrentDB.Security.EncryptionAtRest;
+using KurrentDB.TcpPlugin;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
+using Serilog;
+
+namespace KurrentDB;
+
+public class ClusterVNodeHostedService : IHostedService, IDisposable {
+	private static readonly ILogger Log = Serilog.Log.ForContext<ClusterVNodeHostedService>();
+
+	private readonly ClusterVNodeOptions _options;
+	private readonly ExclusiveDbLock _dbLock;
+	private readonly ClusterNodeMutex _clusterNodeMutex;
+
+	public ClusterVNode Node { get; }
+
+	public ClusterVNodeHostedService(
+		ClusterVNodeOptions options,
+		CertificateProvider certificateProvider,
+		IConfiguration configuration) {
+
+		if (options == null)
+			throw new ArgumentNullException(nameof(options));
+
+		// two plugin mechanisms; pluginLoader is the new one
+		var pluginLoader = new PluginLoader(new DirectoryInfo(Locations.PluginsDirectory));
+		var plugInContainer = FindPlugins();
+
+		options = LoadSubsystemsPlugins(pluginLoader, options);
+
+		try {
+			options = options.WithPlugableComponent(ConfigureMD5());
+		} catch {
+			throw new
+				InvalidConfigurationException(
+					"Failed to configure MD5. If FIPS mode is enabled in your OS, please use the MD5 commercial plugin.");
+		}
+
+		var projectionMode = options.DevMode.Dev && options.Projection.RunProjections == ProjectionType.None
+			? ProjectionType.System
+			: options.Projection.RunProjections;
+		var startStandardProjections = options.Projection.StartStandardProjections || options.DevMode.Dev;
+		_options = projectionMode >= ProjectionType.System
+			? options.WithPlugableComponent(new ProjectionsSubsystem(
+				new ProjectionSubsystemOptions(
+					options.Projection.ProjectionThreads,
+					projectionMode,
+					startStandardProjections,
+					TimeSpan.FromMinutes(options.Projection.ProjectionsQueryExpiry),
+					options.Projection.FaultOutOfOrderProjections,
+					options.Projection.ProjectionCompilationTimeout,
+					options.Projection.ProjectionExecutionTimeout,
+					options.Projection.MaxProjectionStateSize)))
+			: options;
+
+		if (!_options.Database.MemDb) {
+			var absolutePath = Path.GetFullPath(_options.Database.Db);
+			if (RuntimeInformation.IsWindows)
+				absolutePath = absolutePath.ToLower();
+
+			_dbLock = new ExclusiveDbLock(absolutePath);
+			if (!_dbLock.Acquire())
+				throw new InvalidConfigurationException($"Couldn't acquire exclusive lock on DB at '{_options.Database.Db}'.");
+		}
+
+		_clusterNodeMutex = new ClusterNodeMutex();
+		if (!_clusterNodeMutex.Acquire())
+			throw new InvalidConfigurationException($"Couldn't acquire exclusive Cluster Node mutex '{_clusterNodeMutex.MutexName}'.");
+
+		var authorizationConfig = string.IsNullOrEmpty(_options.Auth.AuthorizationConfig)
+			? _options.Application.Config
+			: _options.Auth.AuthorizationConfig;
+
+		var authenticationConfig = string.IsNullOrEmpty(_options.Auth.AuthenticationConfig)
+			? _options.Application.Config
+			: _options.Auth.AuthenticationConfig;
+
+
+		(_options, var authProviderFactory) = GetAuthorizationProviderFactory();
+		if (_options.Database.DbLogFormat == DbLogFormat.V2) {
+			var logFormatFactory = new LogV2FormatAbstractorFactory();
+			Node = ClusterVNode.Create(_options, logFormatFactory, GetAuthenticationProviderFactory(),
+				authProviderFactory,
+				GetPersistentSubscriptionConsumerStrategyFactories(), certificateProvider,
+				configuration);
+		} else if (_options.Database.DbLogFormat == DbLogFormat.ExperimentalV3) {
+			var logFormatFactory = new LogV3FormatAbstractorFactory();
+			Node = ClusterVNode.Create(_options, logFormatFactory, GetAuthenticationProviderFactory(),
+				authProviderFactory,
+				GetPersistentSubscriptionConsumerStrategyFactories(), certificateProvider,
+				configuration);
+		} else {
+			throw new ArgumentOutOfRangeException(nameof(_options.Database.DbLogFormat), "Unexpected log format specified.");
+		}
+
+		var enabledNodeSubsystems = projectionMode >= ProjectionType.System
+			? new[] { NodeSubsystems.Projections }
+			: Array.Empty<NodeSubsystems>();
+
+		RegisterWebControllers(enabledNodeSubsystems);
+		return;
+
+		(ClusterVNodeOptions, AuthorizationProviderFactory) GetAuthorizationProviderFactory() {
+			if (_options.Application.Insecure) {
+				return (_options, new AuthorizationProviderFactory(_ => new PassthroughAuthorizationProviderFactory()));
+			}
+
+			var modifiedOptions = _options;
+			if (_options.Auth.AuthorizationType.Equals("internal", StringComparison.InvariantCultureIgnoreCase)) {
+				var registryFactory = new AuthorizationPolicyRegistryFactory(_options, configuration, pluginLoader);
+				foreach (var authSubsystem in registryFactory.GetSubsystems()) {
+					modifiedOptions = modifiedOptions.WithPlugableComponent(authSubsystem);
+				}
+
+				var internalFactory = new AuthorizationProviderFactory(components =>
+					new InternalAuthorizationProviderFactory(registryFactory.Create(components.MainQueue)));
+				return (modifiedOptions, internalFactory);
+			}
+
+			var authorizationTypeToPlugin = new Dictionary<string, AuthorizationProviderFactory> { };
+			var authzPlugins = pluginLoader.Load<IAuthorizationPlugin>().ToList();
+			authzPlugins.Add(new LegacyAuthorizationWithStreamAuthorizationDisabledPlugin());
+
+			foreach (var potentialPlugin in authzPlugins) {
+				try {
+					var commandLine = potentialPlugin.CommandLineName.ToLowerInvariant();
+					Log.Information(
+						"Loaded authorization plugin: {plugin} version {version} (Command Line: {commandLine})",
+						potentialPlugin.Name, potentialPlugin.Version, commandLine);
+					authorizationTypeToPlugin.Add(commandLine,
+						new AuthorizationProviderFactory(
+							_ => potentialPlugin.GetAuthorizationProviderFactory(authorizationConfig)
+						));
+				} catch (CompositionException ex) {
+					Log.Error(ex, "Error loading authentication plugin.");
+				}
+			}
+
+			if (!authorizationTypeToPlugin.TryGetValue(_options.Auth.AuthorizationType.ToLowerInvariant(),
+				out var factory)) {
+				throw new ApplicationInitializationException(
+					$"The authorization type {_options.Auth.AuthorizationType} is not recognised. If this is supposed " +
+					$"to be provided by an authorization plugin, confirm the plugin DLL is located in {Locations.PluginsDirectory}." +
+					Environment.NewLine +
+					$"Valid options for authorization are: {string.Join(", ", authorizationTypeToPlugin.Keys)}.");
+			}
+
+			return (modifiedOptions, factory);
+		}
+
+		static CompositionContainer FindPlugins() {
+			var catalog = new AggregateCatalog();
+
+			catalog.Catalogs.Add(new AssemblyCatalog(typeof(ClusterVNodeHostedService).Assembly));
+
+			if (Directory.Exists(Locations.PluginsDirectory)) {
+				Log.Information("Plugins path: {pluginsDirectory}", Locations.PluginsDirectory);
+
+				Log.Information("Adding: {pluginsDirectory} to the plugin catalog.", Locations.PluginsDirectory);
+				catalog.Catalogs.Add(new DirectoryCatalog(Locations.PluginsDirectory));
+
+				foreach (string dirPath in Directory.GetDirectories(Locations.PluginsDirectory, "*",
+					SearchOption.TopDirectoryOnly)) {
+					Log.Information("Adding: {pluginsDirectory} to the plugin catalog.", dirPath);
+					catalog.Catalogs.Add(new DirectoryCatalog(dirPath));
+				}
+			} else {
+				Log.Information("Cannot find plugins path: {pluginsDirectory}", Locations.PluginsDirectory);
+			}
+
+			return new CompositionContainer(catalog);
+		}
+
+		IPersistentSubscriptionConsumerStrategyFactory[] GetPersistentSubscriptionConsumerStrategyFactories() {
+			var allPlugins = plugInContainer.GetExports<IPersistentSubscriptionConsumerStrategyPlugin>();
+
+			var strategyFactories = new List<IPersistentSubscriptionConsumerStrategyFactory>();
+
+			foreach (var potentialPlugin in allPlugins) {
+				try {
+					var plugin = potentialPlugin.Value;
+					Log.Information("Loaded consumer strategy plugin: {plugin} version {version}.", plugin.Name,
+						plugin.Version);
+					strategyFactories.Add(plugin.GetConsumerStrategyFactory());
+				} catch (CompositionException ex) {
+					Log.Error(ex, "Error loading consumer strategy plugin.");
+				}
+			}
+
+			return strategyFactories.ToArray();
+		}
+
+		AuthenticationProviderFactory GetAuthenticationProviderFactory() {
+			if (_options.Application.Insecure) {
+				return new AuthenticationProviderFactory(_ => new PassthroughAuthenticationProviderFactory());
+			}
+
+			var authenticationTypeToPlugin = new Dictionary<string, AuthenticationProviderFactory> {
+				{
+					"internal", new AuthenticationProviderFactory(components =>
+						new InternalAuthenticationProviderFactory(components, _options.DefaultUser))
+				}
+			};
+
+			var authPlugins = pluginLoader.Load<IAuthenticationPlugin>().ToList();
+			authPlugins.Add(new LdapsAuthenticationPlugin());
+			authPlugins.Add(new OAuthAuthenticationPlugin());
+
+			foreach (var potentialPlugin in authPlugins) {
+				try {
+					var commandLine = potentialPlugin.CommandLineName.ToLowerInvariant();
+					Log.Information(
+						"Loaded authentication plugin: {plugin} version {version} (Command Line: {commandLine})",
+						potentialPlugin.Name, potentialPlugin.Version, commandLine);
+					authenticationTypeToPlugin.Add(commandLine,
+						new AuthenticationProviderFactory(_ =>
+							potentialPlugin.GetAuthenticationProviderFactory(authenticationConfig)));
+				} catch (CompositionException ex) {
+					Log.Error(ex, "Error loading authentication plugin.");
+				}
+			}
+
+			return authenticationTypeToPlugin.TryGetValue(_options.Auth.AuthenticationType.ToLowerInvariant(),
+				out var factory)
+				? factory
+				: throw new ApplicationInitializationException(
+					$"The authentication type {_options.Auth.AuthenticationType} is not recognised. If this is supposed " +
+					$"to be provided by an authentication plugin, confirm the plugin DLL is located in {Locations.PluginsDirectory}." +
+					Environment.NewLine +
+					$"Valid options for authentication are: {string.Join(", ", authenticationTypeToPlugin.Keys)}.");
+		}
+
+		static ClusterVNodeOptions LoadSubsystemsPlugins(PluginLoader pluginLoader, ClusterVNodeOptions options) {
+			var plugins = pluginLoader.Load<ISubsystemsPlugin>().ToList();
+			plugins.Add(new OtlpExporterPlugin.OtlpExporterPlugin());
+			plugins.Add(new UserCertificatesPlugin());
+			plugins.Add(new LogsEndpointPlugin());
+			plugins.Add(new EncryptionAtRestPlugin());
+			plugins.Add(new ConnectedSubsystemsPlugin());
+			plugins.Add(new AutoScavengePlugin());
+			plugins.Add(new TcpApiPlugin());
+
+			foreach (var plugin in plugins) {
+				Log.Information("Loaded SubsystemsPlugin plugin: {plugin} {version}.",
+					plugin.CommandLineName,
+					plugin.Version);
+				var subsystems = plugin.GetSubsystems();
+				foreach (var subsystem in subsystems) {
+					options = options.WithPlugableComponent(subsystem);
+				}
+			}
+			return options;
+		}
+
+		IPlugableComponent ConfigureMD5() {
+			IMD5Provider provider;
+			try {
+				// use the default net md5 provider if we can - i.e. in non fips environments.
+				provider = new NetMD5Provider();
+				MD5.UseProvider(provider);
+			} catch {
+				// didn't work, we are probably in a fips environment, try to load a plugin
+				provider = GetMD5ProviderFactories().FirstOrDefault()?.Build() ??
+					throw new ApplicationInitializationException("Could not find an enabled FileHashProviderFactory");
+				MD5.UseProvider(provider);
+			}
+
+			Log.Information("Using {Name} FileHashProvider.", provider.Name);
+			return provider;
+		}
+
+		IEnumerable<IMD5ProviderFactory> GetMD5ProviderFactories() {
+			var md5ProviderFactories = new List<IMD5ProviderFactory>();
+
+			foreach (var plugin in pluginLoader.Load<IMD5Plugin>()) {
+				try {
+					var commandLine = plugin.CommandLineName.ToLowerInvariant();
+					Log.Information(
+						"Loaded MD5 plugin: {plugin} version {version} (Command Line: {commandLine})",
+						plugin.Name, plugin.Version, commandLine);
+					md5ProviderFactories.Add(plugin.GetMD5ProviderFactory());
+				} catch (CompositionException ex) {
+					Log.Error(ex, "Error loading MD5 plugin: {plugin}.", plugin.Name);
+				}
+			}
+
+			return md5ProviderFactories.ToArray();
+		}
+	}
+
+	private void RegisterWebControllers(NodeSubsystems[] enabledNodeSubsystems) {
+		if (!_options.Interface.DisableAdminUi) {
+			Node.HttpService.SetupController(new ClusterWebUiController(Node.MainQueue,
+				enabledNodeSubsystems));
+		}
+	}
+
+	public Task StartAsync(CancellationToken cancellationToken) =>
+		_options.Application.WhatIf ? Task.CompletedTask : Node.StartAsync(waitUntilReady: false, cancellationToken);
+
+	public Task StopAsync(CancellationToken cancellationToken) =>
+		Node.StopAsync(cancellationToken: cancellationToken);
+
+	public void Dispose() {
+		if (_dbLock is not { IsAcquired: true }) {
+			return;
+		}
+		using (_dbLock) {
+			_dbLock.Release();
+		}
+	}
+}
diff --git a/src/KurrentDB/Components/App.razor b/src/KurrentDB/Components/App.razor
new file mode 100644
index 00000000000..916db6ea2c4
--- /dev/null
+++ b/src/KurrentDB/Components/App.razor
@@ -0,0 +1,36 @@
+@* Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements. *@
+@* Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md). *@
+
+@using KurrentDB.UI
+@using Microsoft.AspNetCore.Http
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+	<meta charset="utf-8"/>
+	<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+	<base href="/"/>
+	<link href="css/app.css" rel="stylesheet"/>
+	<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet"/>
+	<link href="_content/MudBlazor/MudBlazor.min.css" rel="stylesheet"/>
+	<link href="_content/MudBlazor.Markdown/MudBlazor.Markdown.min.css" rel="stylesheet"/>
+	<link rel="icon" type="image/png" href="favicon.png"/>
+	<HeadOutlet @rendermode="PageRenderMode" />
+</head>
+
+<body>
+<Routes @rendermode="PageRenderMode" />
+<script src="_framework/blazor.web.js"></script>
+<script src="_content/MudBlazor/MudBlazor.min.js"></script>
+<script src="_content/MudBlazor.Markdown/MudBlazor.Markdown.min.js"></script>
+<script src="_content/Extensions.MudBlazor.StaticInput/NavigationObserver.js"></script>
+</body>
+
+</html>
+
+@code {
+	[CascadingParameter] private HttpContext HttpContext { get; set; } = default!;
+
+	private IComponentRenderMode PageRenderMode =>
+		HttpContext.AcceptsInteractiveRouting() ? InteractiveAuto : null;
+}
diff --git a/src/KurrentDB/Components/Auth/Login.razor b/src/KurrentDB/Components/Auth/Login.razor
new file mode 100644
index 00000000000..0ffd87636d6
--- /dev/null
+++ b/src/KurrentDB/Components/Auth/Login.razor
@@ -0,0 +1,99 @@
+@* Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements. *@
+@* Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md). *@
+
+@page "/ui/login"
+@using System.ComponentModel.DataAnnotations
+@using System.Security.Claims
+@using EventStore.Plugins.Authentication
+@using KurrentDB.Services
+@using Microsoft.AspNetCore.Authentication
+@using Microsoft.AspNetCore.Http
+@using MudBlazor.StaticInput
+@attribute [ExcludeFromInteractiveRouting]
+
+<PageTitle>Log in</PageTitle>
+<MudSnackbarProvider/>
+
+<MudGrid>
+	<MudItem md="6">
+		<EditForm Model="Input" method="post" OnValidSubmit="LoginUser" FormName="login">
+			<DataAnnotationsValidator/>
+
+			<MudText GutterBottom="true" Typo="Typo.body1">Use a local account to log in.</MudText>
+
+			<MudGrid>
+				<MudItem md="12">
+					<MudStaticTextField For="@(() => Input.Username)" @bind-Value="Input.Username"
+					                    Label="Username" Placeholder="admin"
+					                    UserAttributes="@(new() { { "autocomplete", "username" }, { "aria-required", "true" } })"/>
+				</MudItem>
+				<MudItem md="12">
+					<MudStaticTextField For="@(() => Input.Password)" @bind-Value="Input.Password"
+					                    Label="Password" InputType="InputType.Password" Placeholder="password"
+					                    UserAttributes="@(new() { { "autocomplete", "current-password" }, { "aria-required", "true" } })"/>
+				</MudItem>
+				<MudItem md="12">
+					<MudStaticButton Variant="Variant.Filled" Color="Color.Secondary" FullWidth="true"
+					                 FormAction="FormAction.Submit">
+						Log in
+					</MudStaticButton>
+				</MudItem>
+			</MudGrid>
+		</EditForm>
+
+	</MudItem>
+</MudGrid>
+
+@code {
+	[Inject] NavigationManager NavigationManager { get; set; }
+	[Inject] IAuthenticationProvider AuthProvider { get; set; }
+	[Inject] ISnackbar Snackbar { get; set; }
+	[SupplyParameterFromForm] LoginInputModel Input { get; set; } = new();
+	[SupplyParameterFromQuery] string ReturnUrl { get; set; }
+	[CascadingParameter] HttpContext HttpContext { get; set; } = default!;
+
+	protected override async Task OnAfterRenderAsync(bool firstRender) {
+		var authenticated = HttpContext.User.Identity?.IsAuthenticated == true;
+		Console.WriteLine(authenticated);
+		if (firstRender && !authenticated) {
+			// Try to log in with a dummy user that will always work in insecure mode
+			var dummy = RandomService.GenerateRandomString(10);
+			var (status, principal) = await LoginUser(dummy, dummy);
+			if (status == HttpAuthenticationRequestStatus.Authenticated) {
+				await HttpContext.SignInAsync(principal);
+				Redirect();
+			}
+		}
+	}
+
+	public async Task LoginUser() {
+		var (status, principal) = await LoginUser(Input.Username, Input.Password);
+		if (status != HttpAuthenticationRequestStatus.Authenticated) {
+			Snackbar.Add("Invalid username or password", Severity.Error);
+			return;
+		}
+
+		await HttpContext.SignInAsync(principal);
+
+		Redirect();
+	}
+
+	async Task<(HttpAuthenticationRequestStatus, ClaimsPrincipal)> LoginUser(string username, string password) {
+		var request = new HttpAuthenticationRequest(HttpContext, username, password);
+		AuthProvider.Authenticate(request);
+		return await request.AuthenticateAsync();
+	}
+
+	void Redirect() {
+		var redirectUrl = string.IsNullOrWhiteSpace(ReturnUrl) ? "/ui/cluster" : ReturnUrl;
+		NavigationManager.NavigateTo(redirectUrl);
+	}
+
+	private sealed class LoginInputModel {
+		[Required] public string Username { get; set; } = "";
+
+		[Required]
+		[DataType(DataType.Password)]
+		public string Password { get; set; } = "";
+	}
+}
diff --git a/src/KurrentDB/Components/Auth/Logout.razor b/src/KurrentDB/Components/Auth/Logout.razor
new file mode 100644
index 00000000000..b5a12e59949
--- /dev/null
+++ b/src/KurrentDB/Components/Auth/Logout.razor
@@ -0,0 +1,28 @@
+@* Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements. *@
+@* Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md). *@
+
+@page "/ui/logout"
+@using Microsoft.AspNetCore.Authentication
+@using Microsoft.AspNetCore.Authentication.Cookies
+@using Microsoft.AspNetCore.Authentication.OpenIdConnect
+@using Microsoft.AspNetCore.Http
+@using Microsoft.Extensions.Options
+@attribute [ExcludeFromInteractiveRouting]
+@rendermode InteractiveServer
+@inject IOptions<AuthenticationOptions> AuthOptions
+
+<p>Log out</p>
+
+@code {
+	[Inject] private NavigationManager NavigationManager { get; set; }
+	[CascadingParameter] HttpContext HttpContext { get; set; } = default!;
+
+	protected override async Task OnInitializedAsync() {
+		await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+		if (AuthOptions.Value.DefaultChallengeScheme == OpenIdConnectDefaults.AuthenticationScheme) {
+			await HttpContext.SignOutAsync(OpenIdConnectDefaults.AuthenticationScheme);
+		}
+
+		NavigationManager.NavigateTo("/ui/cluster", true);
+	}
+}
diff --git a/src/KurrentDB/Components/Cluster/Cluster.razor b/src/KurrentDB/Components/Cluster/Cluster.razor
new file mode 100644
index 00000000000..a5145ab00cf
--- /dev/null
+++ b/src/KurrentDB/Components/Cluster/Cluster.razor
@@ -0,0 +1,142 @@
+@* Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements. *@
+@* Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md). *@
+
+@page "/ui/cluster"
+@using KurrentDB.Common.Utils
+@using KurrentDB.Components.Cluster.Monitoring
+@using KurrentDB.Components.Licensed
+@using KurrentDB.Core.Bus
+@using KurrentDB.Core.Metrics
+@using KurrentDB.Services
+@using KurrentDB.Tools
+@using Microsoft.AspNetCore.Authorization
+@inherits KurrentDB.Components.Licensed.WithLicense
+@attribute [Authorize]
+@attribute [ExcludeFromInteractiveRouting]
+@rendermode InteractiveServer
+@inject IPublisher Publisher
+@inject MonitoringService MonitoringService
+@inject InternalExporter InternalExporter
+@inject MetricsObserver MetricsObserver
+
+<PageTitle>KurrentDB: Cluster</PageTitle>
+
+<MudGrid>
+	<MudItem xs="12">
+		<MudDivider/>
+		<MudText>Node status</MudText>
+	</MudItem>
+	<MudItem xs="12">
+		<MudCard Class="ma-2">
+			<MudCardHeader>
+				<CardHeaderAvatar>
+					<MudAvatar Color="@ClusterIconColor">
+						<MudIcon Icon="@ClusterIcon"/>
+					</MudAvatar>
+				</CardHeaderAvatar>
+				<CardHeaderContent>
+					<MudText Typo="Typo.body1">
+						Server address: @_clusterInfo?.ServerIp:@_clusterInfo?.ServerPort
+					</MudText>
+				</CardHeaderContent>
+				<CardHeaderActions>
+					@* <MudIconButton Icon="@Icons.Material.Filled.Settings" Color="Color.Default"/> *@
+				</CardHeaderActions>
+			</MudCardHeader>
+			<MudCardContent>
+				<MudText>Version: @VersionInfo.Text</MudText>
+				<MudText>OS: @LocalOs</MudText>
+			</MudCardContent>
+		</MudCard>
+	</MudItem>
+	<MudItem xs="12">
+		<MudDivider/>
+		<MudText>Cluster status</MudText>
+	</MudItem>
+	@foreach (var member in _clusterInfo?.Members ?? []) {
+		<MudItem xs="@CardWidth">
+			<ClusterMember Member="member"></ClusterMember>
+		</MudItem>
+	}
+	<MudItem xs="12">
+		<MudDivider/>
+		<MudText>Resources</MudText>
+	</MudItem>
+	<MudItem xs="3">
+		<MudPaper Class="pa-16 ma-2" Outlined="true">
+			<div class="mud-chart mud-chart-legend-bottom">
+				<MudText Typo="Typo.h3" Align="Align.Center" Color="Color.Primary">
+					@MetricsObserver.ActiveConnections
+				</MudText>
+				<div class="mud-chart-legend">
+					<div class="mud-chart-legend-item">
+						<span class="mud-typography mud-typography-body2">Connections</span>
+					</div>
+				</div>
+			</div>
+		</MudPaper>
+	</MudItem>
+	<MudItem xs="3">
+		<MetricDonut Value="@_cpu" Name="CPU"></MetricDonut>
+	</MudItem>
+	<MudItem xs="3">
+		<MetricDonut Value="@_ram" Name="Memory"></MetricDonut>
+	</MudItem>
+	<MudItem xs="3">
+		<MetricDonut Value="@_disk" Name="Disk"></MetricDonut>
+	</MudItem>
+	<LicensedContent>
+		<MudItem xs="6">
+			<MudPaper Outlined="true">
+				<MudTimeSeriesChart
+					ChartSeries="@_cpuSeries"
+					@bind-SelectedIndex="_index"
+					Width="100%"
+					Height="350px"
+					ChartOptions="@_options"
+					TimeLabelSpacing="TimeSpan.FromMinutes(5)"/>
+			</MudPaper>
+		</MudItem>
+		<MudItem xs="6">
+			<MudPaper Outlined="true">
+				<MudTimeSeriesChart
+					ChartSeries="@_ramSeries"
+					@bind-SelectedIndex="_index"
+					Width="100%"
+					Height="350px"
+					ChartOptions="@_options"
+					TimeLabelSpacing="TimeSpan.FromMinutes(5)"/>
+			</MudPaper>
+		</MudItem>
+	</LicensedContent>
+	<LicensedContent>
+		<MudItem xs="12">
+			<MudDivider/>
+			<MudText>Throughput</MudText>
+		</MudItem>
+		<MudItem xs="6">
+			<MudPaper Outlined="true">
+				<MudTimeSeriesChart
+					ChartSeries="@_eventsSeries"
+					@bind-SelectedIndex="_index"
+					Width="100%"
+					Height="350px"
+					ChartOptions="@_options"
+					CanHideSeries
+					TimeLabelSpacing="TimeSpan.FromMinutes(5)"/>
+			</MudPaper>
+		</MudItem>
+		<MudItem xs="6">
+			<MudPaper Outlined="true">
+				<MudTimeSeriesChart
+					ChartSeries="@_eventBytesSeries"
+					@bind-SelectedIndex="_index"
+					Width="100%"
+					Height="350px"
+					ChartOptions="@_options"
+					CanHideSeries
+					TimeLabelSpacing="TimeSpan.FromMinutes(5)"/>
+			</MudPaper>
+		</MudItem>
+	</LicensedContent>
+</MudGrid>
diff --git a/src/KurrentDB/Components/Cluster/Cluster.razor.cs b/src/KurrentDB/Components/Cluster/Cluster.razor.cs
new file mode 100644
index 00000000000..cdf4212ce28
--- /dev/null
+++ b/src/KurrentDB/Components/Cluster/Cluster.razor.cs
@@ -0,0 +1,109 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB.Components.Licensed;
+using KurrentDB.Core.Cluster;
+using KurrentDB.Core.Messages;
+using KurrentDB.Core.Messaging;
+using KurrentDB.Tools;
+using MudBlazor;
+using ChartSeries = KurrentDB.Tools.ChartSeries;
+
+namespace KurrentDB.Components.Cluster;
+
+public partial class Cluster : WithLicense, IDisposable {
+	ClientClusterInfo _clusterInfo;
+	Timer _timer;
+
+	protected override async Task OnInitializedAsync() {
+		await base.OnInitializedAsync();
+		_cpuChart = _cpuSeries.Add("CPU %");
+		_ramChart = _ramSeries.Add("RAM %");
+		_eventsRead = _eventsSeries.Add("Events read");
+		_eventsWritten = _eventsSeries.Add("Events written");
+		_eventBytesRead = _eventBytesSeries.Add("Event kb read");
+		_eventBytesWritten = _eventBytesSeries.Add("Event kb written");
+
+		_timer = new(Callback, null, 0, 1000);
+		MetricsObserver.DataUpdated += MonitoringServiceOnDataUpdated;
+		_hasLicense = LicenseService.CurrentLicense != null;
+	}
+
+	async Task RefreshStatus() {
+		using var cts = new CancellationTokenSource(1000);
+		var r = await RequestClient.RequestAsync<GossipMessage.ClientGossip, GossipMessage.SendClientGossip>(Publisher, env => new(env), cts.Token);
+		_clusterInfo = r.ClusterInfo;
+	}
+
+	void Callback(object state) {
+		Task.Run(RefreshStatus);
+		InternalExporter.Collect?.Invoke(100);
+		_cpu = MonitoringService.CalculateCpu() * 100;
+		var ram = MonitoringService.CalculateRam();
+		_ram = ram.Used / ram.Total * 100;
+		_cpuChart.AddData(_cpu);
+		_ramChart.AddData(_ram);
+
+		_disk = (double)InternalExporter.Snapshot.DiskUsedBytes / InternalExporter.Snapshot.DiskTotalBytes * 100;
+
+		_eventsRead.AddData(InternalExporter.Snapshot.EventsRead);
+		_eventsWritten.AddData(InternalExporter.Snapshot.EventsWritten);
+		_eventBytesRead.AddData((double)InternalExporter.Snapshot.EventBytesRead / 1024);
+		_eventBytesWritten.AddData((double)InternalExporter.Snapshot.EventBytesWritten / 1024);
+
+		Refresh();
+	}
+
+	void MonitoringServiceOnDataUpdated(object sender, EventArgs e) {
+		Refresh();
+	}
+
+	void Refresh() {
+		Task.Run(() => InvokeAsync(StateHasChanged));
+	}
+
+	readonly ChartOptions _options = new() {
+		YAxisLines = false,
+		YAxisTicks = 100,
+		MaxNumYAxisTicks = 10,
+		YAxisRequireZeroPoint = true,
+		XAxisLines = false,
+		LineStrokeWidth = 1,
+	};
+
+	// System graphs
+	readonly ChartSeries _cpuSeries = [];
+	ChartSeriesValues _cpuChart;
+	readonly ChartSeries _ramSeries = [];
+	ChartSeriesValues _ramChart;
+
+	// Events graph
+	readonly ChartSeries _eventsSeries = [];
+	ChartSeriesValues _eventsRead;
+	ChartSeriesValues _eventsWritten;
+	readonly ChartSeries _eventBytesSeries = [];
+	ChartSeriesValues _eventBytesRead;
+	ChartSeriesValues _eventBytesWritten;
+
+	int _index = -1;
+
+	bool IsClusterHealthy => _clusterInfo?.Members?.All(x => x.IsAlive) ?? true;
+	string ClusterIcon => IsClusterHealthy ? Icons.Material.Filled.Check : Icons.Material.Filled.Warning;
+	Color ClusterIconColor => IsClusterHealthy ? Color.Success : Color.Warning;
+	int CardWidth => 12 / (_clusterInfo?.Members?.Length ?? 1);
+	static string LocalOs => RuntimeInformation.OSDescription;
+	double _cpu;
+	double _ram;
+	double _disk;
+	bool _hasLicense;
+
+	public void Dispose() {
+		_timer.Dispose();
+		MetricsObserver.DataUpdated -= MonitoringServiceOnDataUpdated;
+	}
+}
diff --git a/src/KurrentDB/Components/Cluster/ClusterMember.razor b/src/KurrentDB/Components/Cluster/ClusterMember.razor
new file mode 100644
index 00000000000..10e385fbacb
--- /dev/null
+++ b/src/KurrentDB/Components/Cluster/ClusterMember.razor
@@ -0,0 +1,51 @@
+@* Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements. *@
+@* Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md). *@
+
+@using KurrentDB.Core.Cluster
+@using KurrentDB.Core.Data
+
+<MudCard Class="ma-2">
+	<MudCardHeader>
+		<CardHeaderAvatar>
+			<MudAvatar Color="@MemberIconColor">
+				<MudIcon Icon="@MemberIcon" Title="@(Member.IsAlive ? "Alive" : "Dead")"/>
+			</MudAvatar>
+		</CardHeaderAvatar>
+		<CardHeaderContent>
+			<MudText Typo="Typo.h6">@Member.State.ToString()</MudText>
+		</CardHeaderContent>
+		<CardHeaderActions>
+			@* <MudIconButton Icon="@Icons.Material.Filled.Settings" Color="Color.Default"/> *@
+		</CardHeaderActions>
+	</MudCardHeader>
+	<MudCardContent>
+		<MudText Typo="Typo.body1">@Member.HttpEndPointIp:@Member.HttpEndPointPort</MudText>
+		<MudText>Version: @Member.ESVersion</MudText>
+	</MudCardContent>
+</MudCard>
+
+@code {
+	[Parameter] public ClientClusterInfo.ClientMemberInfo Member { get; set; }
+
+	Color MemberIconColor => Member.IsAlive ? Color.Info : Color.Error;
+
+	string MemberIcon => Member.State switch {
+		VNodeState.Initializing => Icons.Material.Filled.Info,
+		VNodeState.DiscoverLeader => Icons.Material.Filled.Info,
+		VNodeState.Unknown => Icons.Material.Filled.Error,
+		VNodeState.PreReplica => Icons.Material.Filled.CompareArrows,
+		VNodeState.CatchingUp => Icons.Material.Filled.Info,
+		VNodeState.Clone => Icons.Material.Filled.Error,
+		VNodeState.Follower => Icons.Material.Filled.FileDownload,
+		VNodeState.PreLeader => Icons.Material.Filled.Warning,
+		VNodeState.Leader => Icons.Material.Filled.FileUpload,
+		VNodeState.Manager => Icons.Material.Filled.Error,
+		VNodeState.ShuttingDown => Icons.Material.Filled.Warning,
+		VNodeState.Shutdown => Icons.Material.Filled.Warning,
+		VNodeState.ReadOnlyLeaderless => Icons.Material.Filled.Warning,
+		VNodeState.PreReadOnlyReplica => Icons.Material.Filled.Info,
+		VNodeState.ReadOnlyReplica => Icons.Material.Filled.FileCopy,
+		VNodeState.ResigningLeader => Icons.Material.Filled.Warning,
+		_ => throw new ArgumentOutOfRangeException()
+	};
+}
diff --git a/src/KurrentDB/Components/Cluster/Monitoring/MetricDonut.razor b/src/KurrentDB/Components/Cluster/Monitoring/MetricDonut.razor
new file mode 100644
index 00000000000..557e4f76796
--- /dev/null
+++ b/src/KurrentDB/Components/Cluster/Monitoring/MetricDonut.razor
@@ -0,0 +1,29 @@
+@* Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements. *@
+@* Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md). *@
+
+<MudPaper Class="pa-2 ma-2" Outlined="true">
+	<MudChart
+		ChartType="ChartType.Donut"
+		InputData="@_values" InputLabels="@(new[] { $"Used {Name}", $"Total {Name}" })">
+		<CustomGraphics>
+			<text class="donut-inner-text" x="50%" y="35%" dominant-baseline="middle" text-anchor="middle"
+			      fill="var(--mud-palette-text-primary)" font-family="Helvetica" font-size="2">@Name usage
+			</text>
+			<text class="donut-inner-text" x="50%" y="50%" dominant-baseline="middle" text-anchor="middle"
+			      fill="var(--mud-palette-text-primary)" font-family="Helvetica"
+			      font-size="5">@((Value / 100).ToString("P1"))</text>
+		</CustomGraphics>
+	</MudChart>
+</MudPaper>
+
+@code {
+	[Parameter] public double Value { get; set; }
+	[Parameter] public string Name { get; set; }
+
+	double[] _values = [0, 100];
+
+	protected override void OnParametersSet() {
+		base.OnParametersSet();
+		_values = [Value, 100-Value];
+	}
+}
diff --git a/src/KurrentDB/Components/Licensed/LicensedContent.razor b/src/KurrentDB/Components/Licensed/LicensedContent.razor
new file mode 100644
index 00000000000..1e718269f38
--- /dev/null
+++ b/src/KurrentDB/Components/Licensed/LicensedContent.razor
@@ -0,0 +1,13 @@
+@* Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements. *@
+@* Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md). *@
+
+@inherits WithLicense
+
+@if (HasLicense) {
+	@ChildContent
+}
+
+@code {
+	[Parameter]
+    public RenderFragment ChildContent { get; set; }
+}
diff --git a/src/KurrentDB/Components/Licensed/LicensedPage.cs b/src/KurrentDB/Components/Licensed/LicensedPage.cs
new file mode 100644
index 00000000000..6d32923d438
--- /dev/null
+++ b/src/KurrentDB/Components/Licensed/LicensedPage.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Rendering;
+
+namespace KurrentDB.Components.Licensed;
+
+public abstract class LicensedPage : LicensedPageCore {
+	private protected sealed override RenderFragment Body => BuildRenderTree;
+
+	// Allow content to be provided by a .razor file but without
+	// overriding the content of the base class
+	protected new virtual void BuildRenderTree(RenderTreeBuilder builder) {
+	}
+}
diff --git a/src/KurrentDB/Components/Licensed/LicensedPageCore.razor b/src/KurrentDB/Components/Licensed/LicensedPageCore.razor
new file mode 100644
index 00000000000..21a63da799f
--- /dev/null
+++ b/src/KurrentDB/Components/Licensed/LicensedPageCore.razor
@@ -0,0 +1,21 @@
+@* Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements. *@
+@* Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md). *@
+
+@inherits WithLicense
+@attribute [ExcludeFromInteractiveRouting]
+
+<PageTitle>KurrentDB: @PageName</PageTitle>
+<MudPopoverProvider/>
+
+@if (HasLicense) {
+	@Body
+} else {
+	<MudText>
+		@PageName page requires a valid <MudLink Href="/ui/license">license</MudLink>.
+	</MudText>
+}
+
+@code {
+	protected virtual string PageName => string.Empty;
+	private protected virtual RenderFragment Body => null;
+}
diff --git a/src/KurrentDB/Components/Licensed/WithLicense.cs b/src/KurrentDB/Components/Licensed/WithLicense.cs
new file mode 100644
index 00000000000..81cb42ec420
--- /dev/null
+++ b/src/KurrentDB/Components/Licensed/WithLicense.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using EventStore.Plugins.Licensing;
+using Microsoft.AspNetCore.Components;
+
+namespace KurrentDB.Components.Licensed;
+
+public abstract class WithLicense : ComponentBase {
+	[Inject] public ILicenseService LicenseService { get; set; }
+
+
+	protected override void OnInitialized() {
+		HasLicense = LicenseService.CurrentLicense != null;
+		base.OnInitialized();
+	}
+
+	protected bool HasLicense;
+}
diff --git a/src/KurrentDB/Components/Pages/Config.razor b/src/KurrentDB/Components/Pages/Config.razor
new file mode 100644
index 00000000000..023b1185938
--- /dev/null
+++ b/src/KurrentDB/Components/Pages/Config.razor
@@ -0,0 +1,42 @@
+@* Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements. *@
+@* Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md). *@
+
+@page "/ui/config"
+@rendermode InteractiveServer
+@attribute [Authorize]
+@using KurrentDB.Core
+@using Microsoft.AspNetCore.Authorization
+@inherits KurrentDB.Components.Licensed.LicensedPage
+@inject ClusterVNodeOptions Configuration
+
+<MudDataGrid Items="@_items" Dense="true" Filterable="true">
+	<Columns>
+		<PropertyColumn Property="x => x.Metadata.Name" Title="Option"/>
+		<TemplateColumn>
+			<CellTemplate>
+				<MudTooltip Text="@context.Item.Metadata.Description">
+					<MudIcon Icon="@Icons.Material.Outlined.Info"/>
+				</MudTooltip>
+			</CellTemplate>
+		</TemplateColumn>
+		<PropertyColumn Property="x => x.DisplayValue" Title="Value"/>
+		<PropertyColumn Property="x => x.SourceDisplayName" Title="Source"/>
+		<TemplateColumn Title="Default">
+			<CellTemplate>
+				<MudCheckBox Disabled="true" Value="context.Item.IsDefault"></MudCheckBox>
+			</CellTemplate>
+		</TemplateColumn>
+	</Columns>
+</MudDataGrid>
+
+@code {
+	IReadOnlyCollection<LoadedOption> _items;
+
+	protected override string PageName => "Configuration";
+
+	protected override void OnInitialized() {
+		base.OnInitialized();
+		_items = Configuration.LoadedOptions.Select(x => x.Value).ToList();
+	}
+
+}
diff --git a/src/KurrentDB/Components/Pages/Error.razor b/src/KurrentDB/Components/Pages/Error.razor
new file mode 100644
index 00000000000..b6ce7938a4c
--- /dev/null
+++ b/src/KurrentDB/Components/Pages/Error.razor
@@ -0,0 +1,40 @@
+@* Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements. *@
+@* Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md). *@
+
+@page "/Error"
+@using System.Diagnostics
+@using Microsoft.AspNetCore.Http
+
+<PageTitle>Error</PageTitle>
+
+<h1 class="text-danger">Error.</h1>
+<h2 class="text-danger">An error occurred while processing your request.</h2>
+
+@if (ShowRequestId)
+{
+    <p>
+        <strong>Request ID:</strong> <code>@RequestId</code>
+    </p>
+}
+
+<h3>Development Mode</h3>
+<p>
+    Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
+</p>
+<p>
+    <strong>The Development environment shouldn't be enabled for deployed applications.</strong>
+    It can result in displaying sensitive information from exceptions to end users.
+    For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
+    and restarting the app.
+</p>
+
+@code{
+    [CascadingParameter]
+    private HttpContext HttpContext { get; set; }
+
+    private string RequestId { get; set; }
+    private bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+
+    protected override void OnInitialized() =>
+        RequestId = Activity.Current?.Id ?? HttpContext?.TraceIdentifier;
+}
diff --git a/src/KurrentDB/Components/Pages/License.razor b/src/KurrentDB/Components/Pages/License.razor
new file mode 100644
index 00000000000..8aa60c1ffb6
--- /dev/null
+++ b/src/KurrentDB/Components/Pages/License.razor
@@ -0,0 +1,98 @@
+@* Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements. *@
+@* Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md). *@
+
+@page "/ui/license"
+@using EventStore.Plugins.Licensing
+@using JetBrains.Annotations
+@using KurrentDB.Licensing
+@using Microsoft.AspNetCore.Authorization
+@inherits KurrentDB.Components.ServerSide.ServerSideBase
+@attribute [Authorize]
+
+<PageTitle>KurrentDB: License</PageTitle>
+
+<MudCard>
+	<MudCardHeader>
+		<CardHeaderContent>
+			<MudText Typo="Typo.h6">License information</MudText>
+		</CardHeaderContent>
+	</MudCardHeader>
+	@if (_licenseSummary == null) {
+		<MudCardContent>
+			<MudAlert Severity="Severity.Warning">License not found</MudAlert>
+		</MudCardContent>
+		<MudCardActions>
+			<MudButton Variant="Variant.Filled" Href="https://www.kurrent.io/kurrent_free_trial">
+				Get free trial license
+			</MudButton>
+		</MudCardActions>
+	} else {
+		<MudCardContent>
+			<MudSimpleTable Dense="true">
+				<tbody>
+				<tr>
+					<td>License ID</td>
+					<td>@_licenseSummary["licenseId"]</td>
+				</tr>
+				<tr>
+					<td>Licensee</td>
+					<td>@Licensee</td>
+				</tr>
+				<tr>
+					<td>Validity</td>
+					<td>@Validity</td>
+				</tr>
+				<tr>
+					<td>Expiration</td>
+					<td>@Expiration</td>
+				</tr>
+				<tr>
+					<td>License type</td>
+					<td>@LicenseType</td>
+				</tr>
+				</tbody>
+			</MudSimpleTable>
+			@if (!IsTrial && IsValid) {
+				<MudAlert Severity="Severity.Success">Your deployment is fully licensed</MudAlert>
+			}
+			@if (!IsValid) {
+				<MudAlert Severity="Severity.Error">The license is applied but it is not valid</MudAlert>
+			}
+			@if (PendingRenewal) {
+				<MudAlert Severity="Severity.Warning">
+					The license is expiring soon, contact Kurrent for renewal
+				</MudAlert>
+			}
+			@if (HasExpired) {
+				<MudAlert Severity="Severity.Warning">The license has expired</MudAlert>
+			}
+		</MudCardContent>
+	}
+</MudCard>
+
+@code {
+	[Inject] ILicenseService LicenseService { get; set; }
+
+	[CanBeNull] Dictionary<string, object> _licenseSummary;
+
+	protected override void OnInitialized() {
+		base.OnInitialized();
+		if (LicenseService.CurrentLicense == null) {
+			return;
+		}
+
+		_licenseSummary = LicenseSummary.SelectForEndpoint(LicenseService.CurrentLicense);
+	}
+
+	string GetValue(string key) => _licenseSummary?[key]?.ToString() ?? string.Empty;
+
+	string Licensee => GetValue("company");
+	bool IsValid => GetValue("isValid") == "true";
+	string Validity => IsValid ? "Valid" : "Invalid";
+	bool HasExpired => GetValue("isExpired") == "true";
+	string Expiration => HasExpired ? "Expired" : $"Expires in {DaysRemaining} days";
+	bool IsTrial => GetValue("isTrial") == "true";
+	string LicenseType => IsTrial ? "Trial" : "Full";
+	int DaysRemaining => (int)Convert.ToDecimal(GetValue("daysRemaining"));
+	bool PendingRenewal => !IsTrial && DaysRemaining <= 30 && !HasExpired;
+}
diff --git a/src/KurrentDB/Components/Pages/Logging.razor b/src/KurrentDB/Components/Pages/Logging.razor
new file mode 100644
index 00000000000..37628301302
--- /dev/null
+++ b/src/KurrentDB/Components/Pages/Logging.razor
@@ -0,0 +1,75 @@
+@* Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements. *@
+@* Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md). *@
+
+@page "/ui/logs"
+@rendermode InteractiveServer
+@attribute [Authorize]
+@inject LogObserver LogObserver
+@inherits KurrentDB.Components.Licensed.LicensedPage
+@using System.ComponentModel
+@using KurrentDB.Tools
+@using Microsoft.AspNetCore.Authorization
+@using Serilog.Events
+@implements IDisposable
+
+<MudDataGrid @ref="_dataGrid" Items="@LogObserver.Items" Dense="@true" Filterable="true">
+	<Columns>
+		<PropertyColumn Property="x => x.Timestamp" Title="Timestamp" Format="HH:mm:ss" Filterable="@false"/>
+		<PropertyColumn Property="x => x.Level" Title="Level" CellStyleFunc="_cellStyleFunc"/>
+		<PropertyColumn Property="x => x.MessageTemplate.Render(x.Properties, null)" Title="Message"
+		                CellStyleFunc="_cellStyleFunc"/>
+	</Columns>
+</MudDataGrid>
+@if (LogObserver.Items.Count == 0) {
+	<MudText>Waiting for log events...</MudText>
+}
+
+@code {
+	MudDataGrid<LogEvent> _dataGrid;
+	bool _defaultSortingApplied;
+
+	protected override async Task OnInitializedAsync() {
+		await base.OnInitializedAsync();
+		if (HasLicense) {
+			LogObserver.PropertyChanged += HandleUpdate;
+		}
+	}
+
+	protected override async Task OnAfterRenderAsync(bool firstRender) {
+		await base.OnAfterRenderAsync(firstRender);
+		if (!_defaultSortingApplied && _dataGrid != null) {
+			await _dataGrid.SetSortAsync(nameof(LogEvent.Timestamp), SortDirection.Descending, x => x.Timestamp);
+			_defaultSortingApplied = true;
+			StateHasChanged();
+		}
+	}
+	void HandleUpdate(object sender, PropertyChangedEventArgs e) {
+		Task.Run(() => InvokeAsync(Update));
+	}
+
+	Func<LogEvent, string> _cellStyleFunc => x => {
+		var color = x.Level switch {
+			LogEventLevel.Verbose => "--mud-palette-text-disabled",
+			LogEventLevel.Debug => "--mud-palette-text-secondary",
+			LogEventLevel.Information => "--mud-palette-text-primary",
+			LogEventLevel.Warning => "--mud-palette-warning",
+			LogEventLevel.Error => "--mud-palette-error",
+			LogEventLevel.Fatal => "--mud-palette-error",
+			_ => throw new ArgumentOutOfRangeException()
+		};
+		var style = color != "" ? $"color: var({color});" : "";
+		return style;
+	};
+
+	public void Dispose() {
+		if (HasLicense) {
+			LogObserver.PropertyChanged -= HandleUpdate;
+		}
+	}
+
+	void Update() {
+		StateHasChanged();
+	}
+
+	protected override string PageName => "Read-time logs";
+}
diff --git a/src/KurrentDB/Components/Pages/Navigator.razor b/src/KurrentDB/Components/Pages/Navigator.razor
new file mode 100644
index 00000000000..9fffb39f023
--- /dev/null
+++ b/src/KurrentDB/Components/Pages/Navigator.razor
@@ -0,0 +1,17 @@
+@* Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements. *@
+@* Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md). *@
+
+@page "/ui/navigator"
+@rendermode InteractiveServer
+@attribute [ExcludeFromInteractiveRouting]
+
+<PageTitle>KurrentDB: Navigator</PageTitle>
+
+<MudPaper Class="pa-8 ma-2" Outlined="true">
+	<MudText>Kurrent Navigator is a replacement for the legacy admin UI of the database.</MudText>
+	<br/>
+	<MudLink Href="https://navigator.kurrent.io" Target="_blank">Download Navigator here</MudLink>
+</MudPaper>
+
+@code {
+}
diff --git a/src/KurrentDB/Components/ServerSide/ServerSideBase.razor b/src/KurrentDB/Components/ServerSide/ServerSideBase.razor
new file mode 100644
index 00000000000..02c299922b0
--- /dev/null
+++ b/src/KurrentDB/Components/ServerSide/ServerSideBase.razor
@@ -0,0 +1,12 @@
+@* Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements. *@
+@* Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md). *@
+
+@attribute [ExcludeFromInteractiveRouting]
+@rendermode InteractiveServer
+
+<MudPopoverProvider/>
+@ChildContent
+
+@code {
+	[Parameter] public RenderFragment ChildContent { get; set; }
+}
diff --git a/src/KurrentDB/Components/_Imports.razor b/src/KurrentDB/Components/_Imports.razor
new file mode 100644
index 00000000000..66d1b238e98
--- /dev/null
+++ b/src/KurrentDB/Components/_Imports.razor
@@ -0,0 +1,12 @@
+@* Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements. *@
+@* Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md). *@
+
+@using System.Net.Http
+@using System.Net.Http.Json
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using static Microsoft.AspNetCore.Components.Web.RenderMode
+@using Microsoft.AspNetCore.Components.Web.Virtualization
+@using Microsoft.JSInterop
+@using MudBlazor
diff --git a/src/KurrentDB/KurrentDB.csproj b/src/KurrentDB/KurrentDB.csproj
new file mode 100644
index 00000000000..3e06a055f04
--- /dev/null
+++ b/src/KurrentDB/KurrentDB.csproj
@@ -0,0 +1,76 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+	<PropertyGroup>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<OutputType>Exe</OutputType>
+		<ApplicationIcon>app2.ico</ApplicationIcon>
+		<GenerateSupportedRuntime>false</GenerateSupportedRuntime>
+		<ServerGarbageCollection>false</ServerGarbageCollection>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="Extensions.MudBlazor.StaticInput" Version="3.2.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.13" />
+		<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.6.0" />
+		<PackageReference Include="MudBlazor.Markdown" Version="8.0.0" />
+		<PackageReference Include="MudBlazor" Version="8.3.0" />
+		<PackageReference Include="SharpDotYaml.Extensions.Configuration" Version="0.3.1" />
+		<PackageReference Include="System.ComponentModel.Composition" Version="8.0.0" />
+		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.6.0" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\KurrentDB.Auth.Ldaps\KurrentDB.Auth.Ldaps.csproj" />
+		<ProjectReference Include="..\KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled\KurrentDB.Auth.LegacyAuthorizationWithStreamAuthorizationDisabled.csproj" />
+		<ProjectReference Include="..\KurrentDB.Auth.OAuth\KurrentDB.Auth.OAuth.csproj" />
+		<ProjectReference Include="..\KurrentDB.Auth.StreamPolicyPlugin\KurrentDB.Auth.StreamPolicyPlugin.csproj" />
+		<ProjectReference Include="..\KurrentDB.Auth.UserCertificates\KurrentDB.Auth.UserCertificates.csproj" />
+		<ProjectReference Include="..\KurrentDB.ClusterNode.Web\KurrentDB.ClusterNode.Web.csproj" />
+		<ProjectReference Include="..\KurrentDB.Common\KurrentDB.Common.csproj" />
+		<ProjectReference Include="..\KurrentDB.Core\KurrentDB.Core.csproj" />
+		<ProjectReference Include="..\KurrentDB.Diagnostics.LogsEndpointPlugin\KurrentDB.Diagnostics.LogsEndpointPlugin.csproj" />
+		<ProjectReference Include="..\KurrentDB.OtlpExporterPlugin\KurrentDB.OtlpExporterPlugin.csproj" />
+		<ProjectReference Include="..\KurrentDB.PluginHosting\KurrentDB.PluginHosting.csproj" />
+		<ProjectReference Include="..\KurrentDB.POC.ConnectedSubsystemsPlugin\KurrentDB.POC.ConnectedSubsystemsPlugin.csproj" />
+		<ProjectReference Include="..\KurrentDB.Projections.Core\KurrentDB.Projections.Core.csproj" />
+		<ProjectReference Include="..\KurrentDB.Security.EncryptionAtRest\KurrentDB.Security.EncryptionAtRest.csproj" />
+		<ProjectReference Include="..\KurrentDB.AutoScavenge\KurrentDB.AutoScavenge.csproj" />
+		<ProjectReference Include="..\KurrentDB.TcpPlugin\KurrentDB.TcpPlugin.csproj" />
+		<ProjectReference Include="..\KurrentDB.UI\KurrentDB.UI.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Update="..\..\LICENSE.md">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Update="..\..\LICENSE_CONTRIBUTIONS.md">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Update="..\..\NOTICE.html">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Update="metricsconfig.json">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Update="kestrelsettings.json">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="logconfig.json">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Include="..\KurrentDB.Common\Utils\version.properties">
+		  <Link>version.properties</Link>
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+	<ItemGroup>
+		<Content Include="app2.ico" />
+		<None Remove="certs\**\*" />
+		<Content Include="certs\**\*" CopyToOutputDirectory="PreserveNewest" />
+	</ItemGroup>
+	<ItemGroup>
+	  <_ContentIncludedByDefault Remove="Components\Layout\CheckAuthorization.razor" />
+	</ItemGroup>
+	<!-- TODO(jen20): Investigate which of these are correct -->
+	<PropertyGroup>
+		<IsMac>false</IsMac>
+		<IsMac Condition="('$(OS)' == 'Unix') And (Exists ('/Library/Frameworks'))">true</IsMac>
+	</PropertyGroup>
+
+</Project>
diff --git a/src/KurrentDB/Polyfills/ExcludeFromInteractiveRoutingAttribute.cs b/src/KurrentDB/Polyfills/ExcludeFromInteractiveRoutingAttribute.cs
new file mode 100644
index 00000000000..5ca262b228b
--- /dev/null
+++ b/src/KurrentDB/Polyfills/ExcludeFromInteractiveRoutingAttribute.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+
+// ReSharper disable once CheckNamespace
+namespace Microsoft.AspNetCore.Components;
+
+/// <summary>
+/// When applied to a page component, indicates that the interactive <see cref="T:Microsoft.AspNetCore.Components.Routing.Router" /> component should
+/// ignore that page. This means that navigations to the page will not be resolved by interactive routing,
+/// but instead will cause a full page reload.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class)]
+public sealed class ExcludeFromInteractiveRoutingAttribute : Attribute;
diff --git a/src/KurrentDB/Polyfills/RazorComponentsEndpointHttpContextExtensions.cs b/src/KurrentDB/Polyfills/RazorComponentsEndpointHttpContextExtensions.cs
new file mode 100644
index 00000000000..7b8e2639f0d
--- /dev/null
+++ b/src/KurrentDB/Polyfills/RazorComponentsEndpointHttpContextExtensions.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Concurrent;
+using System.Reflection;
+using System.Reflection.Metadata;
+using Microsoft.AspNetCore.Components.Endpoints;
+using Microsoft.AspNetCore.Components.Routing;
+using Microsoft.AspNetCore.Http;
+
+[assembly: MetadataUpdateHandler(typeof(RazorComponentsEndpointHttpContextExtensions.MetadataUpdateHandler))]
+
+// ReSharper disable once CheckNamespace
+namespace Microsoft.AspNetCore.Components.Routing;
+
+public static class RazorComponentsEndpointHttpContextExtensions {
+	static readonly ConcurrentDictionary<Type, bool> AcceptsInteractiveRoutingCache = new();
+
+	/// <summary>
+	/// Determines whether the current endpoint is a Razor component that can be reached through
+	/// interactive routing. This is true for all page components except if they declare the
+	/// attribute <see cref="ExcludeFromInteractiveRoutingAttribute"/>.
+	/// </summary>
+	/// <param name="context">The <see cref="HttpContext"/>.</param>
+	/// <returns>True if the current endpoint is a Razor component that does not declare <see cref="ExcludeFromInteractiveRoutingAttribute"/>.</returns>
+	public static bool AcceptsInteractiveRouting(this HttpContext context) {
+		ArgumentNullException.ThrowIfNull(context);
+
+		var pageType = context.GetEndpoint()?.Metadata.GetMetadata<ComponentTypeMetadata>()?.Type;
+
+		return pageType is not null
+			   && AcceptsInteractiveRoutingCache.GetOrAdd(
+				   pageType,
+				   static pageType => !pageType.IsDefined(typeof(ExcludeFromInteractiveRoutingAttribute)));
+	}
+
+	internal static class MetadataUpdateHandler {
+		/// <summary>
+		/// Invoked as part of <see cref="MetadataUpdateHandlerAttribute" /> contract for hot reload.
+		/// </summary>
+		public static void ClearCache(Type[] _) => AcceptsInteractiveRoutingCache.Clear();
+	}
+}
diff --git a/src/KurrentDB/Program.cs b/src/KurrentDB/Program.cs
new file mode 100644
index 00000000000..67c89a102e7
--- /dev/null
+++ b/src/KurrentDB/Program.cs
@@ -0,0 +1,374 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Net.Security;
+using System.Runtime;
+using System.Security.Authentication;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading;
+using System.Threading.Tasks;
+using KurrentDB;
+using KurrentDB.Common.DevCertificates;
+using KurrentDB.Common.Exceptions;
+using KurrentDB.Common.Log;
+using KurrentDB.Common.Utils;
+using KurrentDB.Components;
+using KurrentDB.Core;
+using KurrentDB.Core.Certificates;
+using KurrentDB.Core.Configuration;
+using KurrentDB.Core.Configuration.Sources;
+using KurrentDB.Core.Services.Transport.Http;
+using KurrentDB.Services;
+using KurrentDB.Tools;
+using KurrentDB.UI.Services;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Server.Kestrel.Core;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using MudBlazor;
+using MudBlazor.Services;
+using Serilog;
+using Serilog.Events;
+using _Imports = KurrentDB.UI._Imports;
+using RuntimeInformation = System.Runtime.RuntimeInformation;
+
+var optionsWithLegacyDefaults = LocationOptionWithLegacyDefault.SupportedLegacyLocations;
+var configuration = KurrentConfiguration.Build(optionsWithLegacyDefaults, args);
+
+ThreadPool.SetMaxThreads(1000, 1000);
+var exitCodeSource = new TaskCompletionSource<int>();
+
+Log.Logger = EventStoreLoggerConfiguration.ConsoleLog;
+try {
+	var options = ClusterVNodeOptions.FromConfiguration(configuration);
+
+	EventStoreLoggerConfiguration.Initialize(options.Logging.Log, options.GetComponentName(),
+		options.Logging.LogConsoleFormat,
+		options.Logging.LogFileSize,
+		options.Logging.LogFileInterval,
+		options.Logging.LogFileRetentionCount,
+		options.Logging.DisableLogFile,
+		options.Logging.LogConfig);
+
+	if (options.Application.Help) {
+		await Console.Out.WriteLineAsync(ClusterVNodeOptions.HelpText);
+		return 0;
+	}
+
+	if (options.Application.Version) {
+		await Console.Out.WriteLineAsync(VersionInfo.Text);
+		return 0;
+	}
+
+	if (options.DevMode.RemoveDevCerts) {
+		Log.Information("Removing KurrentDB dev certs.");
+		CertificateManager.Instance.CleanupHttpsCertificates();
+		Log.Information("Dev certs removed. Exiting.");
+		return 0;
+	}
+
+	Log.Information(
+		"{description,-25} {version} {edition} ({buildId}/{commitSha}, {timestamp})", "DB VERSION:",
+		VersionInfo.Version, VersionInfo.Edition, VersionInfo.BuildId, VersionInfo.CommitSha, VersionInfo.Timestamp
+	);
+
+	Log.Information("{description,-25} {osArchitecture} ", "OS ARCHITECTURE:", System.Runtime.InteropServices.RuntimeInformation.OSArchitecture);
+	Log.Information("{description,-25} {osFlavor} ({osVersion})", "OS:", RuntimeInformation.OsPlatform, Environment.OSVersion);
+	Log.Information("{description,-25} {osRuntimeVersion} ({architecture}-bit)", "RUNTIME:", RuntimeInformation.RuntimeVersion, RuntimeInformation.RuntimeMode);
+	Log.Information("{description,-25} {maxGeneration} IsServerGC: {isServerGC} Latency Mode: {latencyMode}", "GC:",
+		GC.MaxGeneration == 0 ? "NON-GENERATION (PROBABLY BOEHM)" : $"{GC.MaxGeneration + 1} GENERATIONS",
+		GCSettings.IsServerGC,
+		GCSettings.LatencyMode);
+	Log.Information("{description,-25} {logsDirectory}", "LOGS:", options.Logging.Log);
+
+	var gcSettings = string.Join($"{Environment.NewLine}    ", GC.GetConfigurationVariables().Select(kvp => $"{kvp.Key}: {kvp.Value}"));
+	Log.Information($"GC Configuration settings:{Environment.NewLine}    {{settings}}", gcSettings);
+
+	Log.Information(options.DumpOptions()!);
+
+	var level = options.Application.AllowUnknownOptions
+		? LogEventLevel.Warning
+		: LogEventLevel.Fatal;
+
+	foreach (var (option, suggestion) in options.Unknown.Options) {
+		if (string.IsNullOrEmpty(suggestion)) {
+			Log.Write(level, "The option {option} is not a known option.", option);
+		} else {
+			Log.Write(level, "The option {option} is not a known option. Did you mean {suggestion}?", option, suggestion);
+		}
+	}
+
+	if (options.UnknownOptionsDetected && !options.Application.AllowUnknownOptions) {
+		Log.Fatal(
+			$"Found unknown options. To continue anyway, set {nameof(ClusterVNodeOptions.ApplicationOptions.AllowUnknownOptions)} to true.");
+		Log.Information("Use the --help option in the command line to see the full list of KurrentDB configuration options.");
+		return 1;
+	}
+
+	CertificateProvider certificateProvider;
+	if (options.DevMode.Dev) {
+		Log.Information("Dev mode is enabled.");
+		Log.Warning(
+			"\n==============================================================================================================\n" +
+			"DEV MODE IS ON. THIS MODE IS *NOT* RECOMMENDED FOR PRODUCTION USE.\n" +
+			"DEV MODE WILL GENERATE AND TRUST DEV CERTIFICATES FOR RUNNING A SINGLE SECURE NODE ON LOCALHOST.\n" +
+			"==============================================================================================================\n");
+		var manager = CertificateManager.Instance;
+		var result = manager.EnsureDevelopmentCertificate(DateTimeOffset.UtcNow, DateTimeOffset.UtcNow.AddMonths(1));
+		if (result is not (EnsureCertificateResult.Succeeded or EnsureCertificateResult.ValidCertificatePresent)) {
+			Log.Fatal("Could not ensure dev certificate is available. Reason: {result}", result);
+			return 1;
+		}
+
+		var userCerts = manager.ListCertificates(StoreName.My, StoreLocation.CurrentUser, true);
+		var machineCerts = manager.ListCertificates(StoreName.My, StoreLocation.LocalMachine, true);
+		var certs = userCerts.Concat(machineCerts).ToList();
+
+		if (!certs.Any()) {
+			Log.Fatal("Could not create dev certificate.");
+			return 1;
+		}
+
+		if (!manager.IsTrusted(certs[0]) && RuntimeInformation.IsWindows) {
+			Log.Information("Dev certificate {cert} is not trusted. Adding it to the trusted store.", certs[0]);
+			manager.TrustCertificate(certs[0]);
+		} else {
+			Log.Warning("Automatically trusting dev certs is only supported on Windows.\n" +
+						"Please trust certificate {cert} if it's not trusted already.", certs[0]);
+		}
+
+		Log.Information("Running in dev mode using certificate '{cert}'", certs[0]);
+		certificateProvider = new DevCertificateProvider(certs[0]);
+	} else {
+		certificateProvider = new OptionsCertificateProvider();
+	}
+
+	var defaultLocationWarnings = options.CheckForLegacyDefaultLocations(optionsWithLegacyDefaults);
+	foreach (var locationWarning in defaultLocationWarnings) {
+		Log.Warning(locationWarning);
+	}
+
+	var eventStoreOptionWarnings = options.CheckForLegacyEventStoreConfiguration();
+	if (eventStoreOptionWarnings.Any()) {
+		Log.Warning(
+			$"The \"{KurrentConfigurationKeys.LegacyEventStorePrefix}\" configuration root " +
+			$"has been deprecated and renamed to \"{KurrentConfigurationKeys.Prefix}\". " +
+			"The following settings will still be used, but will stop working in a future release:");
+		foreach (var warning in eventStoreOptionWarnings) {
+			Log.Warning(warning);
+		}
+	}
+
+	var deprecationWarnings = options.GetDeprecationWarnings();
+	if (deprecationWarnings != null) {
+		Log.Warning($"DEPRECATED{Environment.NewLine}{deprecationWarnings}");
+	}
+
+	if (!ClusterVNodeOptionsValidator.ValidateForStartup(options)) {
+		return 1;
+	}
+
+	if (options.Application.Insecure) {
+		Log.Warning(
+			"\n==============================================================================================================\n" +
+			"INSECURE MODE IS ON. THIS MODE IS *NOT* RECOMMENDED FOR PRODUCTION USE.\n" +
+			"INSECURE MODE WILL DISABLE ALL AUTHENTICATION, AUTHORIZATION AND TRANSPORT SECURITY FOR ALL CLIENTS AND NODES.\n" +
+			"==============================================================================================================\n");
+	}
+
+	if (options.Application.WhatIf) {
+		return 0;
+	}
+
+	using var cts = new CancellationTokenSource();
+	var token = cts.Token;
+	Application.RegisterExitAction(code => {
+		// add a small delay to allow the host to start up in case there's a premature shutdown
+		cts.CancelAfter(TimeSpan.FromSeconds(1));
+		exitCodeSource.SetResult(code);
+	});
+
+	using (var hostedService = new ClusterVNodeHostedService(options, certificateProvider, configuration)) {
+		// Synchronous Wait() because ClusterVNodeHostedService must be disposed on the same thread
+		// that it was constructed on, because it makes use of ExclusiveDbLock which uses a Mutex.
+		// ReSharper disable once MethodHasAsyncOverloadWithCancellation
+		// ReSharper disable once MethodSupportsCancellation
+		Run(hostedService).Wait();
+	}
+
+	return await exitCodeSource.Task;
+
+	async Task Run(ClusterVNodeHostedService hostedService) {
+		var monitoringService = new MonitoringService();
+		var metricsObserver = new MetricsObserver();
+		try {
+			var applicationOptions = new WebApplicationOptions {
+				Args = args,
+				ContentRootPath = AppDomain.CurrentDomain.BaseDirectory
+			};
+
+			var builder = WebApplication.CreateBuilder(applicationOptions);
+			builder.Configuration.AddConfiguration(configuration);
+			builder.Logging.ClearProviders().AddSerilog();
+			builder.Services.Configure<KestrelServerOptions>(configuration.GetSection("Kestrel"));
+			builder.Services.Configure<HostOptions>(x => {
+				x.ShutdownTimeout = ClusterVNode.ShutdownTimeout + TimeSpan.FromSeconds(1);
+#if DEBUG
+				x.BackgroundServiceExceptionBehavior = BackgroundServiceExceptionBehavior.StopHost;
+#else
+				x.BackgroundServiceExceptionBehavior = BackgroundServiceExceptionBehavior.Ignore;
+#endif
+			});
+			builder.WebHost.ConfigureKestrel(
+				server => {
+					server.Limits.Http2.KeepAlivePingDelay = TimeSpan.FromMilliseconds(options.Grpc.KeepAliveInterval);
+					server.Limits.Http2.KeepAlivePingTimeout = TimeSpan.FromMilliseconds(options.Grpc.KeepAliveTimeout);
+
+					server.Listen(options.Interface.NodeIp, options.Interface.NodePort, listenOptions =>
+						ConfigureHttpOptions(listenOptions, hostedService, useHttps: !hostedService.Node.DisableHttps));
+
+					if (hostedService.Node.EnableUnixSocket)
+						TryListenOnUnixSocket(hostedService, server);
+				});
+			hostedService.Node.Startup.ConfigureServices(builder.Services);
+			// Order is important, configure IHostedService after the WebHost to make the sure
+			// ClusterVNodeHostedService and the subsystems are started after configuration is finished.
+			// Allows the subsystems to resolve dependencies out of the DI in Configure() before being started.
+			// Later it may be possible to use constructor injection instead if it fits with the bootstrapping strategy.
+			builder.Services.AddSingleton<IHostedService>(hostedService);
+			builder.Services.AddSingleton<Preferences>();
+			builder.Services
+				.AddRazorComponents()
+				.AddInteractiveServerComponents()
+				.AddInteractiveWebAssemblyComponents();
+			builder.Services.AddCascadingAuthenticationState();
+			builder.Services.AddMudServices();
+			builder.Services.AddMudMarkdownServices();
+			builder.Services.AddSingleton(options);
+			builder.Services.AddScoped<LogObserver>();
+			builder.Services.AddScoped<IdentityRedirectManager>();
+			builder.Services.AddSingleton(monitoringService);
+			builder.Services.AddSingleton(metricsObserver);
+
+			Log.Information("Environment Name: {0}", builder.Environment.EnvironmentName);
+			Log.Information("ContentRoot Path: {0}", builder.Environment.ContentRootPath);
+
+			var app = builder.Build();
+			if (app.Environment.IsDevelopment()) {
+				app.UseWebAssemblyDebugging();
+			}
+
+			hostedService.Node.Startup.Configure(app);
+			app.MapRazorComponents<App>()
+				.DisableAntiforgery()
+				.AddInteractiveServerRenderMode()
+				.AddInteractiveWebAssemblyRenderMode()
+				.AddAdditionalAssemblies(typeof(_Imports).Assembly);
+			await app.RunAsync(token);
+
+			exitCodeSource.TrySetResult(0);
+		} catch (OperationCanceledException) {
+			exitCodeSource.TrySetResult(0);
+		} catch (Exception ex) {
+			Log.Fatal(ex, "Exiting");
+			exitCodeSource.TrySetResult(1);
+		}
+	}
+} catch (InvalidConfigurationException ex) {
+	Log.Fatal("Invalid Configuration: " + ex.Message);
+	return 1;
+} catch (Exception ex) {
+	Log.Fatal(ex, "Host terminated unexpectedly.");
+	return 1;
+} finally {
+	await Log.CloseAndFlushAsync();
+}
+
+static void ConfigureHttpOptions(ListenOptions listenOptions, ClusterVNodeHostedService hostedService, bool useHttps) {
+	if (useHttps)
+		listenOptions.UseHttps(CreateServerOptionsSelectionCallback(hostedService), null);
+	else
+		listenOptions.Use(next => new ClearTextHttpMultiplexingMiddleware(next).OnConnectAsync);
+}
+
+static void TryListenOnUnixSocket(ClusterVNodeHostedService hostedService, KestrelServerOptions server) {
+	if (hostedService.Node.Db.Config.InMemDb) {
+		Log.Information("Not listening on a UNIX domain socket since the database is running in memory.");
+		return;
+	}
+
+	if (!RuntimeInformation.IsLinux && !OperatingSystem.IsWindowsVersionAtLeast(10, 0, 17063)) {
+		Log.Error("Not listening on a UNIX domain socket since it is not supported by the operating system.");
+		return;
+	}
+
+	try {
+		var legacyUnixSocket = Path.GetFullPath(Path.Combine(hostedService.Node.Db.Config.Path, "eventstore.sock"));
+		var unixSocket = Path.GetFullPath(Path.Combine(hostedService.Node.Db.Config.Path, "kurrent.sock"));
+
+		CleanupStaleSocket(legacyUnixSocket);
+		CleanupStaleSocket(unixSocket);
+
+		server.ListenUnixSocket(unixSocket, listenOptions => {
+			listenOptions.Use(next => new UnixSocketConnectionMiddleware(next).OnConnectAsync);
+			ConfigureHttpOptions(listenOptions, hostedService, useHttps: false);
+		});
+		Log.Information("Listening on UNIX domain socket: {unixSocket}", unixSocket);
+	} catch (Exception ex) {
+		Log.Error(ex, "Failed to listen on UNIX domain socket.");
+		throw;
+	}
+
+	return;
+
+	void CleanupStaleSocket(string socketPath) {
+		if (File.Exists(socketPath)) {
+			try {
+				File.Delete(socketPath);
+				Log.Information("Cleaned up stale UNIX domain socket: {unixSocket}", socketPath);
+			} catch (Exception ex) {
+				Log.Error(ex, "Failed to clean up stale UNIX domain socket: {unixSocket}. Please delete the file manually.", socketPath);
+				throw;
+			}
+		}
+	}
+}
+
+static ServerOptionsSelectionCallback CreateServerOptionsSelectionCallback(ClusterVNodeHostedService hostedService) {
+	return (_, _, _, _) => {
+		var serverOptions = new SslServerAuthenticationOptions {
+			ServerCertificateContext = SslStreamCertificateContext.Create(
+				hostedService.Node.CertificateSelector(),
+				hostedService.Node.IntermediateCertificatesSelector(),
+				offline: true),
+			ClientCertificateRequired = true, // request a client certificate but it's not necessary for the client to supply one
+			RemoteCertificateValidationCallback = (_, certificate, chain, sslPolicyErrors) => {
+				if (certificate == null) // not necessary to have a client certificate
+					return true;
+
+				var (isValid, error) =
+					hostedService.Node.InternalClientCertificateValidator(
+						certificate,
+						chain,
+						sslPolicyErrors);
+				if (!isValid && error != null) {
+					Log.Error("Client certificate validation error: {e}", error);
+				}
+
+				return isValid;
+			},
+			CertificateRevocationCheckMode = X509RevocationMode.NoCheck,
+			EnabledSslProtocols = SslProtocols.None, // let the OS choose a secure TLS protocol
+			ApplicationProtocols = [SslApplicationProtocol.Http2, SslApplicationProtocol.Http11],
+			AllowRenegotiation = false
+		};
+
+		return ValueTask.FromResult(serverOptions);
+	};
+}
diff --git a/src/KurrentDB/Services/IdentityRedirectManager.cs b/src/KurrentDB/Services/IdentityRedirectManager.cs
new file mode 100644
index 00000000000..d04d28421a7
--- /dev/null
+++ b/src/KurrentDB/Services/IdentityRedirectManager.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Http;
+
+namespace KurrentDB.Services;
+
+sealed class IdentityRedirectManager(NavigationManager navigationManager) {
+	public const string StatusCookieName = "Identity.StatusMessage";
+
+	private static readonly CookieBuilder StatusCookieBuilder = new() {
+		SameSite = SameSiteMode.Strict,
+		HttpOnly = true,
+		IsEssential = true,
+		MaxAge = TimeSpan.FromSeconds(5),
+	};
+
+	[DoesNotReturn]
+	public void RedirectTo(string uri) {
+		uri ??= "";
+
+		if (!Uri.IsWellFormedUriString(uri, UriKind.Relative)) {
+			uri = navigationManager.ToBaseRelativePath(uri);
+		}
+
+		navigationManager.NavigateTo(uri);
+		throw new InvalidOperationException($"{nameof(IdentityRedirectManager)} can only be used during static rendering.");
+	}
+
+	[DoesNotReturn]
+	public void RedirectTo(string uri, Dictionary<string, object> queryParameters) {
+		var uriWithoutQuery = navigationManager.ToAbsoluteUri(uri).GetLeftPart(UriPartial.Path);
+		var newUri = navigationManager.GetUriWithQueryParameters(uriWithoutQuery, queryParameters);
+		RedirectTo(newUri);
+	}
+
+	[DoesNotReturn]
+	public void RedirectToWithStatus(string uri, string message, HttpContext context) {
+		context.Response.Cookies.Append(StatusCookieName, message, StatusCookieBuilder.Build(context));
+		RedirectTo(uri);
+	}
+
+	private string CurrentPath => navigationManager.ToAbsoluteUri(navigationManager.Uri).GetLeftPart(UriPartial.Path);
+
+	[DoesNotReturn]
+	public void RedirectToCurrentPage() => RedirectTo(CurrentPath);
+
+	[DoesNotReturn]
+	public void RedirectToCurrentPageWithStatus(string message, HttpContext context)
+		=> RedirectToWithStatus(CurrentPath, message, context);
+}
diff --git a/src/KurrentDB/Services/MonitoringService.cs b/src/KurrentDB/Services/MonitoringService.cs
new file mode 100644
index 00000000000..4ceeee5a267
--- /dev/null
+++ b/src/KurrentDB/Services/MonitoringService.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Diagnostics;
+
+namespace KurrentDB.Services;
+
+public sealed class MonitoringService {
+	DateTime _lastTime = DateTime.MinValue;
+	readonly Process _process = Process.GetCurrentProcess();
+	TimeSpan _lastTotalProcessorTime;
+	DateTime _curTime;
+	TimeSpan _curTotalProcessorTime;
+
+	public double CalculateCpu() {
+		if (_lastTime == DateTime.MinValue) {
+			_lastTime = DateTime.Now;
+			_lastTotalProcessorTime = _process.TotalProcessorTime;
+			return 0;
+		}
+
+		_curTime = DateTime.Now;
+		_curTotalProcessorTime = _process.TotalProcessorTime;
+
+		double cpuUsage = (_curTotalProcessorTime.TotalMilliseconds - _lastTotalProcessorTime.TotalMilliseconds) / _curTime.Subtract(_lastTime).TotalMilliseconds;
+
+		_lastTime = _curTime;
+		_lastTotalProcessorTime = _curTotalProcessorTime;
+		return cpuUsage;
+	}
+
+	public (double Total, double Used) CalculateRam() {
+		var processRam = _process.WorkingSet64;
+		var total = GC.GetGCMemoryInfo().TotalAvailableMemoryBytes;
+		var totalGb = (double)total / 1024 / 1024 / 1024;
+		var processGb = (double)processRam / 1024 / 1024 / 1024;
+		return (totalGb, processGb);
+	}
+}
diff --git a/src/KurrentDB/Services/RandomService.cs b/src/KurrentDB/Services/RandomService.cs
new file mode 100644
index 00000000000..d686b3a78d7
--- /dev/null
+++ b/src/KurrentDB/Services/RandomService.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System.Security.Cryptography;
+
+namespace KurrentDB.Services;
+
+public static class RandomService {
+	public static string GenerateRandomString(int length) {
+		var bytes = new byte[length];
+		using (var rng = RandomNumberGenerator.Create()) {
+			rng.GetBytes(bytes);
+		}
+
+		var chars = new char[length];
+		for (int i = 0; i < length; i++) {
+			chars[i] = GetRandomChar(bytes[i]);
+		}
+
+		return new(chars);
+	}
+
+	static char GetRandomChar(byte b) {
+		if (b < 26)
+			return (char)('a' + b);
+		if (b < 52)
+			return (char)('A' + b - 26);
+		if (b < 62)
+			return (char)('0' + b - 52);
+		if (b < 94)
+			return (char)('!' + b - 62);
+		return (char)(' ' + b - 94);
+	}
+}
diff --git a/src/KurrentDB/Tools/ChartSeries.cs b/src/KurrentDB/Tools/ChartSeries.cs
new file mode 100644
index 00000000000..8d1b839952c
--- /dev/null
+++ b/src/KurrentDB/Tools/ChartSeries.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MudBlazor;
+
+namespace KurrentDB.Tools;
+
+public class ChartSeries : List<TimeSeriesChartSeries> {
+	readonly DateTime _now = DateTime.Now;
+
+	public ChartSeriesValues Add(string name) {
+		var series = new ChartSeriesValues(name, _now);
+		Add(series);
+		return series;
+	}
+}
+
+public class ChartSeriesValues : TimeSeriesChartSeries {
+	public ChartSeriesValues(string name, DateTime now) {
+		var empty = Enumerable.Range(-120, 120).Select(x => new TimeValue(now.AddSeconds(x * 10), 0)).ToList();
+		Index = 0;
+		Name = name;
+		Data = empty;
+		IsVisible = true;
+		Type = TimeSeriesDisplayType.Area;
+	}
+
+	public void AddData(double value) {
+		Data = [.. Data.Skip(1), new(DateTime.Now, value)];
+	}
+}
diff --git a/src/KurrentDB/Tools/LogObserver.cs b/src/KurrentDB/Tools/LogObserver.cs
new file mode 100644
index 00000000000..f46eebecd96
--- /dev/null
+++ b/src/KurrentDB/Tools/LogObserver.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using KurrentDB.Common.Log;
+using Serilog.Events;
+
+namespace KurrentDB.Tools;
+
+class LogObserver : IObserver<LogEvent>, IDisposable {
+	const int MaxCount = 200;
+	public readonly ObservableCollection<LogEvent> Items = [];
+	readonly IDisposable _sub;
+
+	public LogObserver() => _sub = ObservableSerilogSink.Instance.Subscribe(this);
+
+	public event PropertyChangedEventHandler PropertyChanged;
+
+	public void OnCompleted() {
+	}
+
+	public void OnError(Exception error) {
+	}
+
+	public void OnNext(LogEvent value) {
+		Items.Add(value);
+		if (Items.Count > MaxCount) {
+			Items.RemoveAt(0);
+		}
+
+		PropertyChanged?.Invoke(this, new(nameof(Items)));
+	}
+
+	public void Dispose() {
+		_sub?.Dispose();
+	}
+}
+
+public delegate void LogEntryAdded(LogEvent entry);
diff --git a/src/KurrentDB/Tools/MetricsObserver.cs b/src/KurrentDB/Tools/MetricsObserver.cs
new file mode 100644
index 00000000000..2d5de6d0555
--- /dev/null
+++ b/src/KurrentDB/Tools/MetricsObserver.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Kurrent, Inc and/or licensed to Kurrent, Inc under one or more agreements.
+// Kurrent, Inc licenses this file to you under the Kurrent License v1 (see LICENSE.md).
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Metrics;
+using System.Threading;
+
+namespace KurrentDB.Tools;
+
+public sealed class MetricsObserver : IDisposable {
+	readonly MeterListener _meterListener = new();
+
+	public MetricsObserver() {
+		_meterListener.InstrumentPublished = (instrument, listener) => {
+			if (instrument.Name.StartsWith("kestrel")) {
+				listener.EnableMeasurementEvents(instrument);
+			}
+		};
+		_meterListener.SetMeasurementEventCallback<long>(OnMeasurementRecorded);
+		_meterListener.Start();
+	}
+
+	public event EventHandler<EventArgs> DataUpdated;
+
+	void OnMeasurementRecorded<T>(
+		Instrument instrument,
+		T measurement,
+		ReadOnlySpan<KeyValuePair<string, object>> tags,
+		object state) {
+		if (measurement is not long value)
+			return;
+		if (instrument.Name == "kestrel.active_connections") {
+			Interlocked.Add(ref _nrActiveConnections, value);
+			DataUpdated?.Invoke(null, EventArgs.Empty);
+		}
+	}
+
+	public long ActiveConnections => _nrActiveConnections;
+
+	long _nrActiveConnections;
+
+	public void Dispose() {
+		_meterListener?.Dispose();
+	}
+}
diff --git a/src/EventStore.Common/app2.ico b/src/KurrentDB/app2.ico
similarity index 100%
rename from src/EventStore.Common/app2.ico
rename to src/KurrentDB/app2.ico
diff --git a/src/EventStore.ClusterNode/kestrelsettings.json b/src/KurrentDB/kestrelsettings.json
similarity index 100%
rename from src/EventStore.ClusterNode/kestrelsettings.json
rename to src/KurrentDB/kestrelsettings.json
diff --git a/src/KurrentDB/logconfig.json b/src/KurrentDB/logconfig.json
new file mode 100644
index 00000000000..77d7423870c
--- /dev/null
+++ b/src/KurrentDB/logconfig.json
@@ -0,0 +1,12 @@
+{
+	"Logging": {
+		"LogLevel": {
+			"Amazon": "Warning",
+			"Default": "Debug",
+			"KurrentDB.Core.Services.Transport.Enumerators": "Information",
+			"Grpc": "Critical",
+			"Microsoft": "Warning",
+			"System": "Warning"
+		}
+	}
+}
diff --git a/src/EventStore.ClusterNode/metricsconfig.json b/src/KurrentDB/metricsconfig.json
similarity index 97%
rename from src/EventStore.ClusterNode/metricsconfig.json
rename to src/KurrentDB/metricsconfig.json
index 2cd39b98857..7435fcc8be9 100644
--- a/src/EventStore.ClusterNode/metricsconfig.json
+++ b/src/KurrentDB/metricsconfig.json
@@ -3,8 +3,11 @@
 	"ExpectedScrapeIntervalSeconds": 15,
 
 	"Meters": [
-		"EventStore.Core",
-		"EventStore.Projections.Core"
+		"KurrentDB.Core",
+		"KurrentDB.Projections.Core",
+		"Kurrent",
+		"Kurrent.Connectors",
+		"Kurrent.Connectors.Sinks"
 	],
 
 	"Statuses": {
diff --git a/src/KurrentDB/wwwroot/css/app.css b/src/KurrentDB/wwwroot/css/app.css
new file mode 100644
index 00000000000..e46a73e3ee7
--- /dev/null
+++ b/src/KurrentDB/wwwroot/css/app.css
@@ -0,0 +1,35 @@
+.monaco-editor-container {
+    height: 200px;
+}
+
+@font-face {
+    font-family: "Solina";
+    src: url("/fonts/Solina-Light.woff2") format("woff2"),
+    url("/fonts/Solina-Light.woff") format("woff");
+    font-weight: 300;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: "Solina";
+    src: url("/fonts/Solina-Regular.woff2") format("woff2"),
+    url("/fonts/Solina-Regular.woff") format("woff");
+    font-weight: 400;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: "Solina";
+    src: url("/fonts/Solina-Medium.woff2") format("woff2"),
+    url("/fonts/Solina-Medium.woff") format("woff");
+    font-weight: 500;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: "Solina";
+    src: url("/fonts/Solina-Bold.woff2") format("woff2"),
+    url("/fonts/Solina-Bold.woff") format("woff");
+    font-weight: 700;
+    font-style: normal;
+}
diff --git a/src/KurrentDB/wwwroot/favicon.png b/src/KurrentDB/wwwroot/favicon.png
new file mode 100644
index 00000000000..b7c63c88d2a
Binary files /dev/null and b/src/KurrentDB/wwwroot/favicon.png differ
diff --git a/src/KurrentDB/wwwroot/fonts/Solina-Bold.woff b/src/KurrentDB/wwwroot/fonts/Solina-Bold.woff
new file mode 100644
index 00000000000..83746eecdd1
Binary files /dev/null and b/src/KurrentDB/wwwroot/fonts/Solina-Bold.woff differ
diff --git a/src/KurrentDB/wwwroot/fonts/Solina-Bold.woff2 b/src/KurrentDB/wwwroot/fonts/Solina-Bold.woff2
new file mode 100644
index 00000000000..813770ef1b2
Binary files /dev/null and b/src/KurrentDB/wwwroot/fonts/Solina-Bold.woff2 differ
diff --git a/src/KurrentDB/wwwroot/fonts/Solina-Light.woff b/src/KurrentDB/wwwroot/fonts/Solina-Light.woff
new file mode 100644
index 00000000000..236d5011ce7
Binary files /dev/null and b/src/KurrentDB/wwwroot/fonts/Solina-Light.woff differ
diff --git a/src/KurrentDB/wwwroot/fonts/Solina-Light.woff2 b/src/KurrentDB/wwwroot/fonts/Solina-Light.woff2
new file mode 100644
index 00000000000..3566766cf5d
Binary files /dev/null and b/src/KurrentDB/wwwroot/fonts/Solina-Light.woff2 differ
diff --git a/src/KurrentDB/wwwroot/fonts/Solina-Medium.woff b/src/KurrentDB/wwwroot/fonts/Solina-Medium.woff
new file mode 100644
index 00000000000..e9d8fc9b33e
Binary files /dev/null and b/src/KurrentDB/wwwroot/fonts/Solina-Medium.woff differ
diff --git a/src/KurrentDB/wwwroot/fonts/Solina-Medium.woff2 b/src/KurrentDB/wwwroot/fonts/Solina-Medium.woff2
new file mode 100644
index 00000000000..8598d1216ef
Binary files /dev/null and b/src/KurrentDB/wwwroot/fonts/Solina-Medium.woff2 differ
diff --git a/src/KurrentDB/wwwroot/fonts/Solina-Regular.woff b/src/KurrentDB/wwwroot/fonts/Solina-Regular.woff
new file mode 100644
index 00000000000..2753ec2fd2d
Binary files /dev/null and b/src/KurrentDB/wwwroot/fonts/Solina-Regular.woff differ
diff --git a/src/KurrentDB/wwwroot/fonts/Solina-Regular.woff2 b/src/KurrentDB/wwwroot/fonts/Solina-Regular.woff2
new file mode 100644
index 00000000000..29565392eed
Binary files /dev/null and b/src/KurrentDB/wwwroot/fonts/Solina-Regular.woff2 differ
diff --git a/src/KurrentDB/wwwroot/logo_plum.svg b/src/KurrentDB/wwwroot/logo_plum.svg
new file mode 100644
index 00000000000..41189496fda
--- /dev/null
+++ b/src/KurrentDB/wwwroot/logo_plum.svg
@@ -0,0 +1,25 @@
+<svg width="855" height="189" viewBox="0 0 855 189" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_6115_7827)">
+<path d="M1.15479 187.841L1.15478 0.000183105L16.8082 25.437L16.8082 162.404L1.15479 187.841Z" fill="#631B3A"/>
+<path d="M25.8613 187.841L25.8613 0.000183105L41.5147 35.2204L41.5148 152.621L25.8613 187.841Z" fill="#631B3A"/>
+<path d="M50.5669 187.841L50.5669 0.000183105L66.2203 45.0038L66.2203 142.838L50.5669 187.841Z" fill="#631B3A"/>
+<path d="M75.2734 187.841L75.2734 0.000183105L90.9269 54.7872L90.9269 133.054L75.2734 187.841Z" fill="#631B3A"/>
+<path d="M99.979 187.841L99.979 0.000183105L115.632 64.5706L115.632 123.271L99.979 187.841Z" fill="#631B3A"/>
+<path d="M124.686 187.841L124.686 0.000183105L140.339 74.354L140.339 113.488L124.686 187.841Z" fill="#631B3A"/>
+<path d="M149.391 187.841L149.391 0.000183105L165.044 84.1374L165.044 103.704L149.391 187.841Z" fill="#631B3A"/>
+<path d="M174.098 187.841L174.098 0.000183105L189.751 93.9207L174.098 187.841Z" fill="#631B3A"/>
+</g>
+<path d="M399.178 164.347V152.664C395.512 157.572 391.291 161.238 386.513 163.659C381.8 166.016 376.401 167.194 370.314 167.194C356.765 167.194 346.359 163.038 339.094 154.725C331.829 146.413 328.196 134.468 328.196 118.891V56.3526H353.624V104.852C353.624 119.447 355.293 129.429 358.631 134.796C361.969 140.162 367.728 142.846 375.91 142.846C384.287 142.846 390.276 139.835 393.876 133.814C397.541 127.792 399.374 117.582 399.374 103.183V56.3526H424.114V164.347H399.178Z" fill="#631B3A"/>
+<path d="M496.568 78.246C486.816 79.0314 480.009 81.5839 476.148 85.9037C472.286 90.2235 470.355 98.0121 470.355 109.27V164.347H445.222V56.3526H468.785V68.821C472.581 63.9777 476.737 60.4433 481.253 58.218C485.769 55.9272 490.874 54.7818 496.568 54.7818V78.246Z" fill="#631B3A"/>
+<path d="M560.776 78.246C551.024 79.0314 544.217 81.5839 540.355 85.9037C536.494 90.2235 534.563 98.0121 534.563 109.27V164.347H509.43V56.3526H532.992V68.821C536.788 63.9777 540.944 60.4433 545.46 58.218C549.976 55.9272 555.082 54.7818 560.776 54.7818V78.246Z" fill="#631B3A"/>
+<path d="M650.018 98.3721C647.858 91.1725 644.226 85.7074 639.121 81.9767C634.081 78.1805 627.699 76.2824 619.976 76.2824C613.3 76.2824 607.311 78.3114 602.01 82.3694C596.708 86.4273 593.141 91.7616 591.309 98.3721H650.018ZM590.425 118.302C591.276 126.091 594.352 132.243 599.654 136.759C605.021 141.21 611.926 143.435 620.369 143.435C625.998 143.435 631.037 142.257 635.488 139.901C640.004 137.544 643.571 134.239 646.189 129.985H673.286C668.704 141.766 661.832 150.929 652.669 157.474C643.571 163.954 633.034 167.194 621.056 167.194C613.006 167.194 605.577 165.787 598.77 162.972C592.029 160.092 585.974 155.871 580.607 150.307C575.502 145.006 571.542 138.886 568.728 131.948C565.914 124.945 564.506 117.778 564.506 110.448C564.506 102.921 565.783 95.8522 568.335 89.2417C570.953 82.5657 574.782 76.577 579.822 71.2754C585.32 65.4503 591.538 60.9669 598.476 57.8253C605.413 54.6836 612.58 53.1128 619.976 53.1128C629.336 53.1128 638.073 55.24 646.189 59.4943C654.305 63.7486 661.21 69.7373 666.904 77.4605C670.373 82.1076 672.926 87.3109 674.562 93.0706C676.264 98.8303 677.115 105.441 677.115 112.902C677.115 113.491 677.082 114.408 677.017 115.651C676.951 116.829 676.918 117.713 676.918 118.302H590.425Z" fill="#631B3A"/>
+<path d="M717.465 56.3526V68.6247C721.13 63.7159 725.319 60.0833 730.032 57.7271C734.81 55.3709 740.242 54.1928 746.329 54.1928C754.118 54.1928 760.892 55.6654 766.652 58.6107C772.477 61.556 777.32 65.9739 781.182 71.8645C783.669 75.7915 785.436 80.2749 786.483 85.3146C787.596 90.2889 788.152 97.5867 788.152 107.208V164.347H763.019V116.535C763.019 102.07 761.35 92.1543 758.012 86.7873C754.674 81.4203 748.914 78.7368 740.733 78.7368C732.355 78.7368 726.334 81.7148 722.669 87.6709C719.003 93.5615 717.171 103.706 717.171 118.106V164.347H692.921V56.3526H717.465Z" fill="#631B3A"/>
+<path d="M805.731 164.347V78.7368V56.3526V21.4019H830.864V56.3526H855V78.7368H823.031L830.864 89.8048V164.347H805.731Z" fill="#631B3A"/>
+<rect x="226.315" y="21.4019" width="24.1402" height="143.333" fill="#631B3A"/>
+<path d="M281.988 108.079L319.058 56.4036H292.051L268.484 89.2644L254.981 108.079L268.484 126.893L295.401 164.401H322.407L281.988 108.079Z" fill="#631B3A"/>
+<defs>
+<clipPath id="clip0_6115_7827">
+<rect width="188.596" height="190.104" fill="white" transform="translate(0 188.595) rotate(-90)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/KurrentDB/wwwroot/logo_white.svg b/src/KurrentDB/wwwroot/logo_white.svg
new file mode 100644
index 00000000000..52da70459d2
--- /dev/null
+++ b/src/KurrentDB/wwwroot/logo_white.svg
@@ -0,0 +1,25 @@
+<svg width="855" height="189" viewBox="0 0 855 189" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_6115_7855)">
+<path d="M1.15479 187.841L1.15478 0.000183105L16.8082 25.437L16.8082 162.404L1.15479 187.841Z" fill="white"/>
+<path d="M25.8613 187.841L25.8613 0.000183105L41.5147 35.2204L41.5148 152.621L25.8613 187.841Z" fill="white"/>
+<path d="M50.5669 187.841L50.5669 0.000183105L66.2203 45.0038L66.2203 142.838L50.5669 187.841Z" fill="white"/>
+<path d="M75.2734 187.841L75.2734 0.000183105L90.9269 54.7872L90.9269 133.054L75.2734 187.841Z" fill="white"/>
+<path d="M99.979 187.841L99.979 0.000183105L115.632 64.5706L115.632 123.271L99.979 187.841Z" fill="white"/>
+<path d="M124.686 187.841L124.686 0.000183105L140.339 74.354L140.339 113.488L124.686 187.841Z" fill="white"/>
+<path d="M149.391 187.841L149.391 0.000183105L165.044 84.1374L165.044 103.704L149.391 187.841Z" fill="white"/>
+<path d="M174.098 187.841L174.098 0.000183105L189.751 93.9207L174.098 187.841Z" fill="white"/>
+</g>
+<path d="M399.178 164.347V152.664C395.512 157.572 391.291 161.238 386.513 163.659C381.8 166.016 376.401 167.194 370.314 167.194C356.765 167.194 346.359 163.038 339.094 154.725C331.829 146.413 328.196 134.468 328.196 118.891V56.3526H353.624V104.852C353.624 119.447 355.293 129.429 358.631 134.796C361.969 140.162 367.728 142.846 375.91 142.846C384.287 142.846 390.276 139.835 393.876 133.814C397.541 127.792 399.374 117.582 399.374 103.183V56.3526H424.114V164.347H399.178Z" fill="white"/>
+<path d="M496.568 78.246C486.816 79.0314 480.009 81.5839 476.148 85.9037C472.286 90.2235 470.355 98.0121 470.355 109.27V164.347H445.222V56.3526H468.785V68.821C472.581 63.9777 476.737 60.4433 481.253 58.218C485.769 55.9272 490.874 54.7818 496.568 54.7818V78.246Z" fill="white"/>
+<path d="M560.776 78.246C551.024 79.0314 544.217 81.5839 540.355 85.9037C536.494 90.2235 534.563 98.0121 534.563 109.27V164.347H509.43V56.3526H532.992V68.821C536.788 63.9777 540.944 60.4433 545.46 58.218C549.976 55.9272 555.082 54.7818 560.776 54.7818V78.246Z" fill="white"/>
+<path d="M650.018 98.3721C647.858 91.1725 644.226 85.7074 639.121 81.9767C634.081 78.1805 627.699 76.2824 619.976 76.2824C613.3 76.2824 607.311 78.3114 602.01 82.3694C596.708 86.4273 593.141 91.7616 591.309 98.3721H650.018ZM590.425 118.302C591.276 126.091 594.352 132.243 599.654 136.759C605.021 141.21 611.926 143.435 620.369 143.435C625.998 143.435 631.037 142.257 635.488 139.901C640.004 137.544 643.571 134.239 646.189 129.985H673.286C668.704 141.766 661.832 150.929 652.669 157.474C643.571 163.954 633.034 167.194 621.056 167.194C613.006 167.194 605.577 165.787 598.77 162.972C592.029 160.092 585.974 155.871 580.607 150.307C575.502 145.006 571.542 138.886 568.728 131.948C565.914 124.945 564.506 117.778 564.506 110.448C564.506 102.921 565.783 95.8522 568.335 89.2417C570.953 82.5657 574.782 76.577 579.822 71.2754C585.32 65.4503 591.538 60.9669 598.476 57.8253C605.413 54.6836 612.58 53.1128 619.976 53.1128C629.336 53.1128 638.073 55.24 646.189 59.4943C654.305 63.7486 661.21 69.7373 666.904 77.4605C670.373 82.1076 672.926 87.3109 674.562 93.0706C676.264 98.8303 677.115 105.441 677.115 112.902C677.115 113.491 677.082 114.408 677.017 115.651C676.951 116.829 676.918 117.713 676.918 118.302H590.425Z" fill="white"/>
+<path d="M717.465 56.3526V68.6247C721.13 63.7159 725.319 60.0833 730.032 57.7271C734.81 55.3709 740.242 54.1928 746.329 54.1928C754.118 54.1928 760.892 55.6654 766.652 58.6107C772.477 61.556 777.32 65.9739 781.182 71.8645C783.669 75.7915 785.436 80.2749 786.483 85.3146C787.596 90.2889 788.152 97.5867 788.152 107.208V164.347H763.019V116.535C763.019 102.07 761.35 92.1543 758.012 86.7873C754.674 81.4203 748.914 78.7368 740.733 78.7368C732.355 78.7368 726.334 81.7148 722.669 87.6709C719.003 93.5615 717.171 103.706 717.171 118.106V164.347H692.921V56.3526H717.465Z" fill="white"/>
+<path d="M805.731 164.347V78.7368V56.3526V21.4019H830.864V56.3526H855V78.7368H823.031L830.864 89.8048V164.347H805.731Z" fill="white"/>
+<rect x="226.315" y="21.4019" width="24.1402" height="143.333" fill="white"/>
+<path d="M281.988 108.079L319.058 56.4036H292.051L268.484 89.2644L254.981 108.079L268.484 126.893L295.401 164.401H322.407L281.988 108.079Z" fill="white"/>
+<defs>
+<clipPath id="clip0_6115_7855">
+<rect width="188.596" height="190.104" fill="white" transform="translate(0 188.595) rotate(-90)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/Protos/Grpc/redaction.proto b/src/Protos/Grpc/redaction.proto
index b242198ab71..0208c904091 100644
--- a/src/Protos/Grpc/redaction.proto
+++ b/src/Protos/Grpc/redaction.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
-package event_store.client.redaction;
-option java_package = "com.eventstore.dbclient.proto.redaction";
+package kurrent.client.redaction;
+option java_package = "com.kurrent.dbclient.proto.redaction";
 
 import "shared.proto";
 
diff --git a/src/Protos/Grpc/shared.proto b/src/Protos/Grpc/shared.proto
index 2b113aed85e..d5335abbd2f 100644
--- a/src/Protos/Grpc/shared.proto
+++ b/src/Protos/Grpc/shared.proto
@@ -56,6 +56,12 @@ message MaximumAppendSizeExceeded {
 	uint32 maxAppendSize = 1;
 }
 
+message MaximumAppendEventSizeExceeded {
+	string eventId = 1;
+	uint32 proposedEventSize = 2;
+	uint32 maxAppendEventSize = 3;
+}
+
 message BadRequest {
 	string message = 1;
 }